Request 1450 (accepted)

Overview

Request 1450 (accepted)

update to 0.10.0

Created by seife almost 10 years ago
In state accepted
Package maintainers: dnh, frispete, and pbleser

Submit handbrake

Submit package home:seife:branches:Multimedia / handbrake to package Multimedia / handbrake

handbrake.changes Changed

@@ -1,4 +1,30 @@
 -------------------------------------------------------------------
+Tue Dec  2 12:55:15 UTC 2014 - seife+obs@b1-systems.com
+
+- fix "no return in nonvoid function" compiler error from embedded
+  libdvdnav libdvdnav-5.0.1-noreturninnonvoidfunction.patch
+
+-------------------------------------------------------------------
+Tue Dec  2 10:48:00 UTC 2014 - seife+obs@b1-systems.com
+
+- adjust debug config from max to std to avoid ffmpeg assert aborts
+
+-------------------------------------------------------------------
+Tue Nov 25 19:19:39 UTC 2014 - seife+obs@b1-systems.com
+
+- update to 0.10.0:
+- remove obsolete patches, update support tarballs, only add
+  the really needed stuff
+- more build date removal
+- important change: due to GTK3 version dependencies, the GUI
+  is only built for distributions newer than openSUSE 12.3
+
+-------------------------------------------------------------------
+Fri Apr 18 18:52:38 UTC 2014 - seife+obs@b1-systems.com
+
+- remove build date from binaries to avoid republishing
+
+-------------------------------------------------------------------
 Sun Dec  1 08:28:12 UTC 2013 - obs@botter.cc
 
 - add patch to fix compiling libx264: HandBrake-0.9.9_libx264-gcc-488-fix.patch

handbrake.spec Changed

@@ -1,6 +1,7 @@
 # vim: set sw=4 ts=4 et:
 
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
+# Copyright (c) 2014 B1 Systems GmbH, Vobhurg, Germany
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -11,11 +12,11 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.links2linux.org/
 
 Name: handbrake
-Version: 0.9.9
-Release: 1.pm.1
+Version: 0.10.0
+Release: 0
 License: GPL-2.0+
 Summary: Multithreaded Video Transcoder
 Url: http://handbrake.fr/
@@ -23,78 +24,44 @@
 # svn://svn.handbrake.fr/HandBrake/trunk#%{rev}
 #Source: HandBrake-svn%{rev}.tar.bz2
 Source: http://prdownloads.sourceforge.net/handbrake/HandBrake-%{version}.tar.bz2
-Source101: http://download.handbrake.fr/handbrake/contrib/a52dec-0.7.4.tar.gz
-Source102: http://download.handbrake.fr/handbrake/contrib/faac-1.28.tar.gz
-#Source103: http://download.handbrake.fr/handbrake/contrib/faad2-2.7.tar.gz
-Source104: http://download.handbrake.fr/handbrake/contrib/libav-v9.6.tar.bz2
-Source105: http://download.handbrake.fr/handbrake/contrib/yasm-1.2.0.tar.gz
-Source106: http://download.handbrake.fr/handbrake/contrib/lame-3.98.tar.gz
-Source107: http://download.handbrake.fr/handbrake/contrib/libdvdread-svn1168.tar.gz
-Source108: http://download.handbrake.fr/handbrake/contrib/libdvdnav-svn1168.tar.gz
-Source109: http://download.handbrake.fr/handbrake/contrib/libmkv-0.6.5-0-g82075ae.tar.gz
-Source110: http://download.handbrake.fr/handbrake/contrib/mp4v2-trunk-r355.tar.bz2
-Source111: http://download.handbrake.fr/handbrake/contrib/mpeg2dec-0.5.1.tar.gz
-Source112: http://download.handbrake.fr/handbrake/contrib/x264-r2273-b3065e6.tar.gz
-Source113: http://download.handbrake.fr/handbrake/contrib/libbluray-0.2.3.tar.bz2
-#Source120: http://download.handbrake.fr/handbrake/contrib/libdca-r81-strapped.tar.gz
-Source151: handbrake-ffmpeg_fix_missing_return_in_nonvoid_function.patch
-Source152: handbrake-libmkv_no_return_in_nonvoid_function.patch
-%if 0%{?suse_version} <= 1140
-Source153: handbrake-libbluray-glibc_older_2_12.patch
-%endif
+Source101: http://download.handbrake.fr/handbrake/contrib/fdk-aac-v0.1.1-6-gbae4553.tar.bz2
+Source102: http://download.handbrake.fr/handbrake/contrib/cmake-3.0.1.tar.gz
+Source103: http://download.handbrake.fr/handbrake/contrib/libav-v10.1.tar.bz2
+Source104: http://download.handbrake.fr/handbrake/contrib/libdvdnav-5.0.1-0-gaa3659d.tar.gz
+Source105: http://download.handbrake.fr/handbrake/contrib/libdvdread-5.0.0-6-gcb1ae87.tar.gz
+Source106: http://download.handbrake.fr/contrib/libmfx-v2014.tar.bz2
+Source107: http://download.handbrake.fr/contrib/libvpx-v1.3.0.tar.bz2
+Source108: http://download.handbrake.fr/contrib/x265-8768-5e604833c5aa-1.4.tar.bz2
+Source109: http://download.handbrake.fr/handbrake/contrib/libbluray-0.5.0.tar.bz2
+##
+## libdvnav has "assert(0)" as default in some error paths, which is a nop with -DNDEBUG...
+Source200: libdvdnav-5.0.1-noreturninnonvoidfunction.patch
 Source99: handbrake-rpmlintrc
-%if 0%{?suse_version} >= 1310
-# PATCH-FIX-PACKMAN fix libx264 with newer version of gcc
-Patch0: HandBrake-0.9.9_libx264-gcc-488-fix.patch
-%endif
-BuildRequires: alsa-devel
-BuildRequires: curl
-BuildRequires: fribidi-devel
-BuildRequires: gstreamer-0_10-plugins-base-devel
-BuildRequires: gtkhtml2-devel
-BuildRequires: libbz2-devel
-BuildRequires: libcurl-devel
-BuildRequires: libicu-devel
-BuildRequires: libxslt-devel
-BuildRequires: python
-BuildRequires: sqlite3-devel
-BuildRequires: subversion
-BuildRequires: wget
-BuildRequires: zlib-devel
-%if 0%{?suse_version} == 1210
-BuildRequires: gstreamer-utils
-%endif
-BuildRequires: pkgconfig(gstreamer-0.10)
-BuildRequires: pkgconfig(gtk+-2.0) >= 2.24
-# systemd-mini/udev-mini currently missing in Factory-repo
+
+Patch0: HandBrake-0.10.0-no-builddate.patch
+Patch1: handbrake-enable_local_fribidi.patch
+BuildRequires: python curl wget subversion
+BuildRequires: libbz2-devel zlib-devel libgudev-1_0-devel
 %if 0%{?suse_version} > 1230
-BuildRequires: libudev1 libudev-devel
-BuildRequires: libgudev-1_0-0 libgudev-1_0-devel
-%else
-BuildRequires: pkgconfig(gudev-1.0)
+BuildRequires: gtk3-devel >= 3.10
+BuildRequires: gtkhtml-devel
 %endif
-BuildRequires: pkgconfig(libnotify)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: fribidi-devel
+BuildRequires: dbus-1-glib-devel
+BuildRequires: libicu-devel libnotify-devel
 %if 0%{?suse_version} <= 1140
-BuildRequires: pkgconfig(hal)
-%endif
-BuildRequires: pkgconfig(dbus-glib-1)
-%if 0%{?suse_version} >= 1110
+BuildRequires: hal-devel
 BuildRequires: libwebkit-devel
 %else
-BuildRequires: WebKitGtk-devel
+BuildRequires: libwebkitgtk3-devel
 %endif
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: glibc-devel
-BuildRequires: intltool
-BuildRequires: libtool
-BuildRequires: make
+BuildRequires: sqlite3-devel libcurl-devel libxslt-devel
+BuildRequires: gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel
+BuildRequires: gcc gcc-c++ make glibc-devel yasm nasm
+BuildRequires: autoconf automake libtool intltool
 BuildRequires: update-desktop-files
-BuildRequires: fontconfig-devel freetype2-devel libxml2-devel libass-devel
-BuildRequires: libogg-devel libvorbis-devel libtheora-devel libsamplerate-devel
+BuildRequires: libvorbis-devel libass-devel x264-devel libmp3lame-devel libtheora-devel
+BuildRequires: libsamplerate-devel
 
 %description
 HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video
@@ -111,6 +78,7 @@
 
 This package contains a command-line interface for Handbrake.
 
+%if 0%{?suse_version} > 1230
 %package gtk
 Summary: Multithreaded Video Transcoder
 Group: Productivity/Multimedia/Video/Editors and Convertors
@@ -121,57 +89,55 @@
 transcoder.
 
 This package contains a GTK+ graphical user interface for Handbrake.
+%endif
 
 %prep
 %if 0%{?rev:1}
 %setup -q -n "HandBrake-svn%{rev}"
 %else
 %setup -q -n "HandBrake-%{version}"
-%if 0%{?suse_version} >= 1310
-%patch0 -p1
-%endif
 %endif
+%patch0 -p1
 
-# unstable, so patch from 0.9.8 did not apply, use the script
-# used to generate the patch instead
-mv -i libhb/hb.h libhb/handbrake.h
-mv -i gtk/src/hb-backend.h gtk/src/handbrake-backend.h
-find $ -name '*.h' -o -name '*.c' $ -exec \
- grep -l 'include.*"hb.h\|hb-backend.h"' {} + | \
- xargs perl -pi -e 's/include\s*"hb.h"/include "handbrake.h"/;
- s/include\s*"hb-backend.h"/include "handbrake-backend.h"/'
+%if 0%{?suse_version} < 1200
+%patch1 -p1
+%endif
 
 # Copy 3rd party dependencies into expected locations:
-mkdir download
-# 
+%__mkdir download
 for f in \
-%{S:101} %{S:102} %{S:104} %{S:105} %{S:106} \
-%{S:107} %{S:108} %{S:109} %{S:110} %{S:111} %{S:112} \
-%{S:113} \
+%{S:101} %{S:102} %{S:103} \
+%{S:104} %{S:105} %{S:106} \
+%{S:107} %{S:108} %{S:109} \
 ; do
- ln -s "$f" download/
+ %__ln_s "$f" download/
 done
 
 # check beforehand that the versions match what the
 # build system expects:
 missing=$PWD/.missing
-grep -hE '\.FETCH\.url *=' contrib/*/module.defs \
-| gawk -F' =' '{print $2}' \
+%__grep -hE '\.FETCH\.url *=' contrib/*/module.defs \
+| %__awk -F' =' '{print $2}' \
 | while read url; do
- f=$(echo "$url" | sed 's|^.*/||')
- case $f in
- 	 bzip2*|libiconv*|pthreads*|zlib*|autoconf*|automake*|\
- fdk-aac*|fontconfig*|freetype*|libass*|libogg*|libsamplerate*|\
- libtheora*|libtool*|libvorbis*|libxml2*|m4*)
- continue ;;
- esac
- [ -e "$RPM_SOURCE_DIR/$f" ] || echo "$url">>"$missing"
+ f=$(echo "$url" | sed 's|^.*/||')
+ case $f in
+ bzip2*|libiconv*|pthreads*|zlib*) continue ;;
+ autoconf*|automake*|libtool*|m4*) continue ;;
+ pkg-config*) continue ;;
+ fontconfig*|freetype*|fribidi*|libass*) continue ;;
+ libogg*|libtheora*|libvorbis*|libsamplerate*) continue ;;
+ libxml2*) continue ;;
+ x264*|lame*) continue ;;
+ yasm*) continue ;;
+ mingw-libgnurx*) continue ;;
+ esac
+ [ -e "download/$f" ] || echo "$url">>"$missing"
 done
 
 if test -e "$missing"; then
- echo "ERROR: missing contrib source archives:" >&2
- cat "$missing" >&2
- exit 1
+ echo "ERROR: missing contrib source archives:" >&2
+ cat "$missing" >&2
+ exit 1
 fi
 
 
@@ -180,59 +146,73 @@
 export CXXFLAGS="$CFLAGS -Wno-reorder"
 export PATH="%{_builddir}/HandBrake-%{version}/build/contrib/bin:$PATH"
 
-cp %{S:152} contrib/libmkv/A99-fix-missing-return-in-nonvoid-function.patch
-%if 0%{?suse_version} <= 1140
-cp %{S:153} contrib/libbluray/A99-glibc_older_2_12.patch
-%endif
+cp %{S:200} contrib/libdvdnav/A99-fix-missing-return-in-nonvoid-function.patch
+
+# try to remove build date from binaries... -- seife+obs@b1-systems.com
+PKGDATE=$(date -r %{_sourcedir}/handbrake.changes +%Y%m%d)
+sed -i -e "s/@BUILD@/$PKGDATE/" make/configure.py
 
-mkdir -p build
+%__mkdir build
 ./configure \
- --force \
- --build="$PWD/build" \
- --prefix="%{buildroot}%{_prefix}" \
- --strip="/bin/true" \
- --optimize=speed \
- --enable-ff-mpeg2 \
- --debug=max
-
-GHB_PKGS="dbus-glib-1 glib-2.0 gdk-pixbuf-2.0 gudev-1.0 webkit-1.0 libnotify"
-GHB_PKGS="$GHB_PKGS gstreamer-interfaces-0.10 gstreamer-0.10 gstreamer-pbutils-0.10 gstreamer-video-0.10"
-%if 0%{?suse_version} >= 1230
-GHB_PKGS="$GHB_PKGS harfbuzz"
+ --force \
+ --build="$PWD/build" \
+ --prefix="%{buildroot}%{_prefix}" \
+ --strip="/bin/true" \
+ --optimize=speed \
+%if 0%{?suse_version} <= 1230
+ --disable-gtk \
 %endif
+ --debug=std ### debug=max removes -DNDEBUG from ffmpeg, leading to asserts aborting build...
+
 pushd build
-make libhb/project.h
-make %{?_smp_mflags} V=1 \
- GHB_CFLAGS="$(pkg-config --cflags $GHB_PKGS) -I../../libhb -I../../contrib/include" \
- GHB_LIBS="$(pkg-config --libs $GHB_PKGS)"
+#### get rid of __DATE__ and __TIME__ in fdk-aac
+%__mkdir contrib
+%__mkdir contrib/fdkaac
+tar -xf %{S:101} -C contrib/fdkaac
+find contrib/fdkaac/ -type f | xargs sed -i -e "s/__DATE__/\"$PKGDATE\"/"
+find contrib/fdkaac/ -type f | xargs sed -i -e 's/__TIME__/"00:00:00"/'
+touch contrib/fdkaac/.stamp.extract
+pushd contrib/fdkaac/fdk-aac-v0.1.1-6-gbae4553
+autoreconf -fi
+popd
+
+%__make libhb/project.h
+%__make %{?_smp_mflags} V=1
+
 popd #build
 
 
 %install
 pushd build
-make install
+%__make install
 popd #build
 
-ln -s ghb "%{buildroot}%{_bindir}/HandBrakeGUI"
+if [ -e %{buildroot}%{_bindir}/ghb ]; then
+ %__ln_s ghb "%{buildroot}%{_bindir}/HandBrakeGUI"
+fi
 
 %suse_update_desktop_file -r ghb AudioVideo AudioVideoEditing
 
-rm "%{buildroot}%{_datadir}/icons"/*/*.cache
+# -f because it might not be there if built without gtk...
+%__rm -f "%{buildroot}%{_datadir}/icons"/*/*.cache
 
 %clean
-%{?buildroot:rm -rf %{buildroot}}
+%{?buildroot:%__rm -rf "%{buildroot}"}
 
 %files cli
 %defattr(-,root,root)
 %doc AUTHORS COPYING CREDITS NEWS THANKS
 %{_bindir}/HandBrakeCLI
 
+%if 0%{?suse_version} > 1230
 %files gtk
 %defattr(-,root,root)
 %doc AUTHORS COPYING CREDITS NEWS THANKS
 %{_bindir}/HandBrakeGUI
 %{_bindir}/ghb
 %{_datadir}/applications/ghb.desktop
-%{_datadir}/icons/*/*/apps/hb-icon.png
+%{_datadir}/icons/*/*/apps/hb-icon.*
+/usr/share/locale/*/LC_MESSAGES/ghb.mo
+%endif
 
 %changelog

HandBrake-0.10.0-no-builddate.patch Added

@@ -0,0 +1,45 @@
+Index: b/make/configure.py
+===================================================================
+--- a/make/configure.py
++++ b/make/configure.py
+@@ -807,19 +807,19 @@ class Project( Action ):
+             self.version = '%d.%d.%d' % (self.vmajor,self.vminor,self.vpoint)
+             url_ctype = ''
+             url_ntype = 'stable'
+-            self.build = time.strftime('%Y%m%d') + '00'
++            self.build = '@BUILD@' + '00'
+             self.title = '%s %s (%s)' % (self.name,self.version,self.build)
+         elif repo.type == 'developer':
+             self.version = '%dsvn' % (repo.rev)
+             url_ctype = '_unstable'
+             url_ntype = 'unstable'
+-            self.build = time.strftime('%Y%m%d') + '01'
++            self.build = '@BUILD@' + '01'
+             self.title = '%s svn%d (%s)' % (self.name,repo.rev,self.build)
+         else:
+             self.version = 'rev%d' % (repo.rev)
+             url_ctype = '_unofficial'
+             url_ntype = 'unofficial'
+-            self.build = time.strftime('%Y%m%d') + '99'
++            self.build = '@BUILD@' + '99'
+             self.title = '%s rev%d (%s)' % (self.name,repo.rev,self.build)
+ 
+         self.url_appcast = 'https://handbrake.fr/appcast%s%s.xml' % (url_ctype,url_arch)
+@@ -1621,7 +1621,7 @@ int main()
+ 
+     ## create document object
+     doc = ConfigDocument()
+-    doc.addComment( 'generated by configure on %s', time.strftime( '%c' ))
++    # doc.addComment( 'generated by configure on %s', time.strftime( '%c' ))
+ 
+     ## add configure line for reconfigure purposes
+     doc.addBlank()
+@@ -1690,7 +1690,7 @@ int main()
+     else:
+         doc.add( 'BUILD.cross.prefix', '' )
+ 
+-    doc.add( 'BUILD.date',   time.strftime('%c') )
++    # doc.add( 'BUILD.date',   time.strftime('%c') )
+     doc.add( 'BUILD.arch',   arch.mode.mode )
+ 
+     doc.addBlank()

HandBrake-0.9.9_libx264-gcc-488-fix.patch Deleted

handbrake-enable_local_fribidi.patch Added

handbrake-ffmpeg_fix_missing_return_in_nonvoid_function.patch Deleted

handbrake-libmkv_no_return_in_nonvoid_function.patch Deleted

libdvdnav-5.0.1-noreturninnonvoidfunction.patch Added

HandBrake-0.9.9.tar.bz2/CREDITS -> HandBrake-0.10.0.tar.bz2/CREDITS Changed

HandBrake-0.9.9.tar.bz2/NEWS -> HandBrake-0.10.0.tar.bz2/NEWS Changed

@@ -1,7 +1,91 @@
 NEWS file for HandBrake <http://handbrake.fr/>
 
+Changes between 0.9.9 and 0.10
+
+ Core
+ - Intel QuickSync Video Encode / Decode support. (Beta)
+ Windows only currently. We hope to bring this to Linux user in the future.
+ - DXVA Hardware Decode support (Experimental)
+ Windows Only.
+ Suitable only for slower machines so disabled in preferences by default.
+ - Choice of Scalers
+ Lanczos
+ HandBrakes? default scaler.
+ Bicubic (OpenCL) (Experimental)
+ Available on the Command Line (All Platforms) and Windows GUI. (Mac / Linux GUI's will come in a later release)
+ Currently only available in OpenCL form so requires a AMD or Intel GPU supporting OpenCL 1.1 or later. Nvidia GPU's are not currently supported.
+ When downscaling, up to 5% performance improvement can be achieved. No benefit when not downscaling.
+ Small loss in quality over the Lanczos scaler.
+ - Denoise
+ hqdn3d filter now accepts individual settings for both chroma channels (Cr, Cb)
+ New NlMeans? denoiser. This is very slow, but results are significantly better than hqdn3d.
+ - Presets
+ Added Windows Phone 8 Preset
+ - Updated Libraries
+ x264 r2479-dd79a61
+ Libav v10.1
+ libbluray 0.5.0
+ - Libavformat is now used for muxing instead of mp4v2 and libmkv
+ "Large File Size" checkbox has now bee removed for mp4, as the new muxer will transition to 64bit files automatically.
+ mpeg2dec has also been replaced in favour of using libav
+ - The LibAV AAC encoder is now the default as FAAC has been removed.
+ This encoder is adequate for most, but until it improves a bit further, we have enabled support for the FDK-AAC encoder also.
+ This FDK option is a temporary measure until the LibAV encoder improves.
+ Note that FDK-AAC is much slower and will likely bottleneck the encode process, but will produce better quality audio.
+ - H.265 encoder
+ Using x265 v1.4
+ This encoder is still early in it's development, so is missing many H.265 features and optimisations.
+ - Added VP8 Encoder (using libvpx)
+ Available in MKV files only.
+ - Removed mcdeint deinterlace and decomb modes. This relied on the snow encoder in libav which has been was removed by upstream.
+ - Bug fixes and Misc Improvements
+
+ Windows
+ - Accessibility / Usability Improvements
+ Added option to 'Use System Colors'. The app should now be usable in a High Contrast mode.
+ Fixed Tab ordering to make the app more keyboard friendly.
+ - LibHB is now used for scanning instead of the CLI.
+ Experiential Preview window is now available as a result. (Can be enabled via preferences)
+ - Improved the layout and design of the Audio and Subtitle tabs.
+ Split buttons similar to the old 0.9.8 WinForms? GUI
+ Improved layout on the track listbox to make better use of the space.
+ - Improvements to Auto-Naming feature.
+ - When Done
+ Added an option that will reset this to 'Do nothing' when the app is closed and restarted.
+ - Presets
+ New 'Presets' Menu
+ Presets bar can now be hidden if it's not wanted.
+ - Numerous bug fixes
+ Fixed the Issue in the source dropdown where the drive menu items did not work when clicked.
+ Numerous fixes in the Picture settings panel around resolution calculation.
+ Numerous fixes around the way Presets are loaded and saved, particularly around Picture settings.
+ Removed Growl for Windows support due to bugs and issues with this library that remain unfixed. Project appears abandoned.
+ Many misc other fixes.
+ - Windows XP is no longer supported. Windows Vista with Service Pack 2 or later is now a requirement.
+ - The 32bit build of the application is now considered deprecated. This is due to 32bit process memory limitations.
+
+ Mac
+ - Build system updates to compiled under OS X 10.9 / 10.10
+ - Automatic audio and subtitle track selection behaviours which can be stored per preset.
+ - Improvements to Auto-Naming feature.
+ - Misc UI enhancements.
+ - Bug fixes and Misc Improvements
+ 
+ Linux
+ - Automatic audio and subtitle track selection behaviours which can be stored per preset.
+ - Improvements to Auto-Naming feature.
+ - Batch Add to queue by list selection.
+ - Russian and Czech Translations
+ - Bug fixes and Misc Improvements
+ - Requires GTK3
+
+ Command Line Interface
+ - Basic support for return codes from the CLI. (0 = No Error, 1 = Cancelled, 2 = Invalid Input, 3 = Initialization error, 4 = Unknown Error")
+ - Bug fixes and Misc Improvements
 
-Changes betwen 0.9.8 and 0.9.9:
+ 
+ 
+Changes between 0.9.8 and 0.9.9:
 
 General
 - Improved HandBrake pineapple icon by Matt Johnson

HandBrake-0.9.9.tar.bz2/THANKS -> HandBrake-0.10.0.tar.bz2/THANKS Changed

HandBrake-0.9.9.tar.bz2/TRANSLATIONS -> HandBrake-0.10.0.tar.bz2/TRANSLATIONS Changed

HandBrake-0.10.0.tar.bz2/contrib/cmake Added

HandBrake-0.10.0.tar.bz2/contrib/cmake/module.defs Added

HandBrake-0.10.0.tar.bz2/contrib/cmake/module.rules Added

HandBrake-0.9.9.tar.bz2/contrib/fdk-aac/module.defs -> HandBrake-0.10.0.tar.bz2/contrib/fdk-aac/module.defs Changed

HandBrake-0.10.0.tar.bz2/contrib/ffmpeg/A00-qsv.patch Added

@@ -0,0 +1,2317 @@
+diff --git a/configure b/configure
+index 05acff5..e71aad5 100755
+--- a/configure
++++ b/configure
+@@ -132,6 +132,7 @@ Component options:
+ 
+ Hardware accelerators:
+ --enable-dxva2 enable DXVA2 code
++ --enable-qsv enable QSV code
+ --enable-vaapi enable VAAPI code
+ --enable-vda enable VDA code
+ --enable-vdpau enable VDPAU code
+@@ -1139,6 +1140,7 @@ EXTERNAL_LIBRARY_LIST="
+ 
+ HWACCEL_LIST="
+ dxva2
++ qsv
+ vaapi
+ vda
+ vdpau
+@@ -1800,6 +1802,7 @@ zmbv_encoder_deps="zlib"
+ 
+ # hardware accelerators
+ dxva2_deps="dxva2api_h"
++qsv_deps="msdk_mfxvideo_h"
+ vaapi_deps="va_va_h"
+ vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
+ vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
+@@ -1811,6 +1814,8 @@ h263_vdpau_hwaccel_deps="vdpau"
+ h263_vdpau_hwaccel_select="h263_decoder"
+ h264_dxva2_hwaccel_deps="dxva2"
+ h264_dxva2_hwaccel_select="h264_decoder"
++h264_qsv_decoder_deps="qsv"
++h264_qsv_decoder_select="h264_decoder"
+ h264_vaapi_hwaccel_deps="vaapi"
+ h264_vaapi_hwaccel_select="h264_decoder"
+ h264_vda_hwaccel_deps="vda"
+@@ -3861,6 +3866,7 @@ check_header dxva.h
+ check_header dxva2api.h
+ check_header io.h
+ check_header malloc.h
++check_header msdk/mfxvideo.h
+ check_header poll.h
+ check_header sys/mman.h
+ check_header sys/param.h
+diff --git a/libavcodec/Makefile b/libavcodec/Makefile
+index 9e4dd25..1fbee4a 100644
+--- a/libavcodec/Makefile
++++ b/libavcodec/Makefile
+@@ -4,6 +4,7 @@ FFLIBS = avutil
+ HEADERS = avcodec.h \
+ avfft.h \
+ dxva2.h \
++ qsv.h \
+ vaapi.h \
+ vda.h \
+ vdpau.h \
+@@ -60,6 +61,7 @@ OBJS-$(CONFIG_MPEGAUDIODSP) += mpegaudiodsp.o \
+ OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o mpegvideo_motion.o
+ OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \
+ motion_est.o ratecontrol.o
++OBJS-$(CONFIG_QSV) += qsv.o
+ OBJS-$(CONFIG_RANGECODER) += rangecoder.o
+ RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o
+ OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes)
+@@ -199,6 +201,7 @@ OBJS-$(CONFIG_H264_DECODER) += h264.o \
+ h264_loopfilter.o h264_direct.o \
+ cabac.o h264_sei.o h264_ps.o \
+ h264_refs.o h264_cavlc.o h264_cabac.o
++OBJS-$(CONFIG_H264_QSV_DECODER) += qsv_h264.o
+ 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
+@@ -692,6 +695,7 @@ SKIPHEADERS += %_tablegen.h \
+ SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h
+ SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h
+ SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
++SKIPHEADERS-$(CONFIG_QSV) += qsv.h
+ SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h
+ SKIPHEADERS-$(CONFIG_VDA) += vda.h
+ SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h
+diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
+index b6c27c0..287b912 100644
+--- a/libavcodec/allcodecs.c
++++ b/libavcodec/allcodecs.c
+@@ -155,6 +155,7 @@ void avcodec_register_all(void)
+ REGISTER_DECODER(H263I, h263i);
+ REGISTER_ENCODER(H263P, h263p);
+ REGISTER_DECODER(H264, h264);
++ REGISTER_DECODER(H264_QSV, h264_qsv);
+ REGISTER_DECODER(HEVC, hevc);
+ REGISTER_DECODER(HNM4_VIDEO, hnm4_video);
+ REGISTER_ENCDEC (HUFFYUV, huffyuv);
+diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
+new file mode 100644
+index 0000000..2c46111
+--- /dev/null
++++ b/libavcodec/qsv.c
+@@ -0,0 +1,646 @@
++/* ********************************************************************* *\
++
++Copyright (C) 2013 Intel Corporation. All rights reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions are met:
++- Redistributions of source code must retain the above copyright notice,
++this list of conditions and the following disclaimer.
++- Redistributions in binary form must reproduce the above copyright notice,
++this list of conditions and the following disclaimer in the documentation
++and/or other materials provided with the distribution.
++- Neither the name of Intel Corporation nor the names of its contributors
++may be used to endorse or promote products derived from this software
++without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" AND ANY EXPRESS OR
++IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT,
++INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++
++\* ********************************************************************* */
++
++#include "qsv.h"
++
++#include "avcodec.h"
++#include "internal.h"
++
++int av_qsv_get_free_encode_task(av_qsv_list * tasks)
++{
++ int ret = MFX_ERR_NOT_FOUND;
++ int i = 0;
++ if (tasks)
++ for (i = 0; i < av_qsv_list_count(tasks); i++) {
++ av_qsv_task *task = av_qsv_list_item(tasks, i);
++ if (task->stage && task->stage->out.sync)
++ if (!(*task->stage->out.sync->p_sync)) {
++ ret = i;
++ break;
++ }
++ }
++ return ret;
++}
++
++int av_qsv_get_free_sync(av_qsv_space * space, av_qsv_context * qsv)
++{
++ int ret = -1;
++ int counter = 0;
++
++ while (1) {
++ for (int i = 0; i < space->sync_num; i++) {
++ if (!(*(space->p_syncp[i]->p_sync)) &&
++ 0 == space->p_syncp[i]->in_use ) {
++ if (i > space->sync_num_max_used)
++ space->sync_num_max_used = i;
++ ff_qsv_atomic_inc(&space->p_syncp[i]->in_use);
++ return i;
++ }
++ }
++#if HAVE_THREADS
++ if (++counter >= AV_QSV_REPEAT_NUM_DEFAULT) {
++#endif
++ av_log(NULL, AV_LOG_FATAL, "not enough to have %d sync point(s) allocated\n",
++ space->sync_num);
++ break;
++#if HAVE_THREADS
++ }
++ av_qsv_sleep(5);
++#endif
++ }
++ return ret;
++}
++
++int av_qsv_get_free_surface(av_qsv_space * space, av_qsv_context * qsv,
++ mfxFrameInfo * info, av_qsv_split part)
++{
++ int ret = -1;
++ int from = 0;
++ int up = space->surface_num;
++ int counter = 0;
++
++ while (1) {
++ from = 0;
++ up = space->surface_num;
++ if (part == QSV_PART_LOWER)
++ up /= 2;
++ if (part == QSV_PART_UPPER)
++ from = up / 2;
++
++ for (int i = from; i < up; i++) {
++ if (0 == space->p_surfaces[i]->Data.Locked) {
++ memcpy(&(space->p_surfaces[i]->Info), info,
++ sizeof(mfxFrameInfo));
++ if (i > space->surface_num_max_used)
++ space->surface_num_max_used = i;
++ return i;
++ }
++ }
++#if HAVE_THREADS
++ if (++counter >= AV_QSV_REPEAT_NUM_DEFAULT) {
++#endif
++ av_log(NULL, AV_LOG_FATAL,
++ "not enough to have %d surface(s) allocated\n", up);
++ break;
++#if HAVE_THREADS
++ }
++ av_qsv_sleep(5);
++#endif
++ }
++ return ret;
++}
++
++int ff_qsv_is_surface_in_pipe(mfxFrameSurface1 * p_surface, av_qsv_context * qsv)
++{
++ int ret = 0;
++ int a, b,i;
++ av_qsv_list *list = 0;
++ av_qsv_stage *stage = 0;
++
++ if (!p_surface)
++ return ret;
++ if (!qsv->pipes)
++ return ret;
++
++ for (a = 0; a < av_qsv_list_count(qsv->pipes); a++) {
++ list = av_qsv_list_item(qsv->pipes, a);
++ for (b = 0; b < av_qsv_list_count(list); b++) {
++ stage = av_qsv_list_item(list, b);
++ if (p_surface == stage->out.p_surface)
++ return (stage->type << 16) | 2;
++ if (p_surface == stage->in.p_surface)
++ return (stage->type << 16) | 1;
++ }
++ }
++ return ret;
++}
++
++int ff_qsv_is_sync_in_pipe(mfxSyncPoint * sync, av_qsv_context * qsv)
++{
++ int ret = 0;
++ int a, b;
++ av_qsv_list *list = 0;
++ av_qsv_stage *stage = 0;
++
++ if (!sync)
++ return ret;
++ if (!qsv->pipes)
++ return ret;
++
++ for (a = 0; a < av_qsv_list_count(qsv->pipes); a++) {
++ list = av_qsv_list_item(qsv->pipes, a);
++ for (b = 0; b < av_qsv_list_count(list); b++) {
++ stage = av_qsv_list_item(list, b);
++ if (sync == stage->out.sync->p_sync) {
++ return 1;
++ }
++ }
++ }
++ return ret;
++}
++
++av_qsv_stage *av_qsv_stage_init(void)
++{
++ av_qsv_stage *stage = av_mallocz(sizeof(av_qsv_stage));
++ return stage;
++}
++
++void av_qsv_stage_clean(av_qsv_stage ** stage)
++{
++ if ((*stage)->out.sync) {
++ if ((*stage)->out.sync->p_sync)
++ *(*stage)->out.sync->p_sync = 0;
++ if ((*stage)->out.sync->in_use > 0)
++ ff_qsv_atomic_dec(&(*stage)->out.sync->in_use);
++ (*stage)->out.sync = 0;
++ }
++ if ((*stage)->out.p_surface) {
++ (*stage)->out.p_surface = 0;
++
++ }
++ if ((*stage)->in.p_surface) {
++ (*stage)->in.p_surface = 0;
++ }
++
++ av_freep(stage);
++}
++
++void av_qsv_add_context_usage(av_qsv_context * qsv, int is_threaded)
++{
++ int is_active = 0;
++#if HAVE_THREADS
++ int mut_ret = 0;
++#endif
++
++ is_active = ff_qsv_atomic_inc(&qsv->is_context_active);
++ if (is_active == 1) {
++ memset(&qsv->mfx_session, 0, sizeof(mfxSession));
++ av_qsv_pipe_list_create(&qsv->pipes, is_threaded);
++
++ qsv->dts_seq = av_qsv_list_init(is_threaded);
++
++#if HAVE_THREADS
++ if (is_threaded) {
++ qsv->qts_seq_mutex = av_mallocz(sizeof(pthread_mutex_t));
++ if (qsv->qts_seq_mutex){
++ mut_ret = pthread_mutex_init(qsv->qts_seq_mutex, NULL);
++ if(mut_ret)
++ av_log(NULL, AV_LOG_ERROR, "pthread_mutex_init issue[%d] at %s\n",mut_ret,__FUNCTION__);
++ }
++
++ } else
++#endif
++ qsv->qts_seq_mutex = 0;
++ }
++}
++
++int av_qsv_context_clean(av_qsv_context * qsv)
++{
++ int is_active = 0;
++ mfxStatus sts = MFX_ERR_NONE;
++#if HAVE_THREADS
++ int mut_ret = 0;
++#endif
++
++ is_active = ff_qsv_atomic_dec(&qsv->is_context_active);
++
++ // spaces would have to be cleaned on the own,
++ // here we care about the rest, common stuff
++ if (is_active == 0) {
++
++ if (qsv->dts_seq) {
++ while (av_qsv_list_count(qsv->dts_seq))
++ av_qsv_dts_pop(qsv);
++
++ av_qsv_list_close(&qsv->dts_seq);
++ }
++#if HAVE_THREADS
++ if (qsv->qts_seq_mutex) {
++ mut_ret = pthread_mutex_destroy(qsv->qts_seq_mutex);
++ if(mut_ret)
++ av_log(NULL, AV_LOG_ERROR, "pthread_mutex_destroy issue[%d] at %s\n", mut_ret,__FUNCTION__);
++#endif
++ qsv->qts_seq_mutex = 0;
++#if HAVE_THREADS
++ }
++#endif
++
++ if (qsv->pipes)
++ av_qsv_pipe_list_clean(&qsv->pipes);
++
++ if (qsv->mfx_session) {
++ sts = MFXClose(qsv->mfx_session);
++ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
++ qsv->mfx_session = 0;
++ }
++ }
++ return 0;
++}
++
++void av_qsv_pipe_list_create(av_qsv_list ** list, int is_threaded)
++{
++ if (!*list)
++ *list = av_qsv_list_init(is_threaded);
++}
++
++void av_qsv_pipe_list_clean(av_qsv_list ** list)
++{
++ av_qsv_list *stage;
++ int i = 0;
++ if (*list) {
++ for (i = av_qsv_list_count(*list); i > 0; i--) {
++ stage = av_qsv_list_item(*list, i - 1);
++ av_qsv_flush_stages(*list, &stage);
++ }
++ av_qsv_list_close(list);
++ }
++}
++
++void av_qsv_add_stagee(av_qsv_list ** list, av_qsv_stage * stage, int is_threaded)
++{
++ if (!*list)
++ *list = av_qsv_list_init(is_threaded);
++ av_qsv_list_add(*list, stage);
++}
++
++av_qsv_stage *av_qsv_get_last_stage(av_qsv_list * list)
++{
++ av_qsv_stage *stage = 0;
++ int size = 0;
++
++ av_qsv_list_lock(list);
++ size = av_qsv_list_count(list);
++ if (size > 0)
++ stage = av_qsv_list_item(list, size - 1);
++ av_qsv_list_unlock(list);
++
++ return stage;
++}
++
++void av_qsv_flush_stages(av_qsv_list * list, av_qsv_list ** item)
++{
++ int i = 0;
++ int x = 0;
++ av_qsv_stage *stage = 0;
++ av_qsv_list *to_remove_list = 0;
++ av_qsv_list *to_remove_atom_list = 0;
++ av_qsv_list *to_remove_atom = 0;
++
++ for (i = 0; i < av_qsv_list_count(*item); i++) {
++ stage = av_qsv_list_item(*item, i);
++ if(stage->pending){
++ if(!to_remove_list)
++ to_remove_list = av_qsv_list_init(0);
++ av_qsv_list_add(to_remove_list, stage->pending);
++ }
++ av_qsv_stage_clean(&stage);
++ // should actually remove from the list but ok...
++ }
++ av_qsv_list_rem(list, *item);
++ av_qsv_list_close(item);
++
++ if(to_remove_list){
++ for (i = av_qsv_list_count(to_remove_list); i > 0; i--){
++ to_remove_atom_list = av_qsv_list_item(to_remove_list, i-1);
++ for (x = av_qsv_list_count(to_remove_atom_list); x > 0; x--){
++ to_remove_atom = av_qsv_list_item(to_remove_atom_list, x-1);
++ av_qsv_flush_stages(list,&to_remove_atom);
++ }
++ }
++ av_qsv_list_close(&to_remove_list);
++ }
++}
++
++av_qsv_list *av_qsv_pipe_by_stage(av_qsv_list * list, av_qsv_stage * stage)
++{
++ av_qsv_list *item = 0;
++ av_qsv_stage *cur_stage = 0;
++ int i = 0;
++ int a = 0;
++ for (i = 0; i < av_qsv_list_count(list); i++) {
++ item = av_qsv_list_item(list, i);
++ for (a = 0; a < av_qsv_list_count(item); a++) {
++ cur_stage = av_qsv_list_item(item, a);
++ if (cur_stage == stage)
++ return item;
++ }
++ }
++ return 0;
++}
++
++// no duplicate of the same value, if end == 0 : working over full length
++void av_qsv_dts_ordered_insert(av_qsv_context * qsv, int start, int end,
++ int64_t dts, int iter)
++{
++ av_qsv_dts *cur_dts = 0;
++ av_qsv_dts *new_dts = 0;
++ int i = 0;
++#if HAVE_THREADS
++ int mut_ret = 0;
++#endif
++
++
++#if HAVE_THREADS
++ if (iter == 0 && qsv->qts_seq_mutex){
++ mut_ret = pthread_mutex_lock(qsv->qts_seq_mutex);
++ if(mut_ret)
++ av_log(NULL, AV_LOG_ERROR, "pthread_mutex_lock issue[%d] at %s\n",mut_ret, __FUNCTION__);
++ }
++#endif
++
++ if (end == 0)
++ end = av_qsv_list_count(qsv->dts_seq);
++
++ if (end <= start) {
++ new_dts = av_mallocz(sizeof(av_qsv_dts));
++ if( new_dts ) {
++ new_dts->dts = dts;
++ av_qsv_list_add(qsv->dts_seq, new_dts);
++ }
++ } else
++ for (i = end; i > start; i--) {
++ cur_dts = av_qsv_list_item(qsv->dts_seq, i - 1);
++ if (cur_dts->dts < dts) {
++ new_dts = av_mallocz(sizeof(av_qsv_dts));
++ if( new_dts ) {
++ new_dts->dts = dts;
++ av_qsv_list_insert(qsv->dts_seq, i, new_dts);
++ }
++ break;
++ } else if (cur_dts->dts == dts)
++ break;
++ }
++#if HAVE_THREADS
++ if (iter == 0 && qsv->qts_seq_mutex){
++ mut_ret = pthread_mutex_unlock(qsv->qts_seq_mutex);
++ if(mut_ret)
++ av_log(NULL, AV_LOG_ERROR, "pthread_mutex_unlock issue[%d] at %s\n",mut_ret, __FUNCTION__);
++ }
++#endif
++}
++
++void av_qsv_dts_pop(av_qsv_context * qsv)
++{
++ av_qsv_dts *item = 0;
++#if HAVE_THREADS
++ int mut_ret = 0;
++#endif
++
++#if HAVE_THREADS
++ if (qsv && qsv->qts_seq_mutex){
++ mut_ret = pthread_mutex_lock(qsv->qts_seq_mutex);
++ if(mut_ret)
++ av_log(NULL, AV_LOG_ERROR, "pthread_mutex_lock issue[%d] at %s\n",mut_ret, __FUNCTION__);
++ }
++#endif
++
++ if (av_qsv_list_count(qsv->dts_seq)) {
++ item = av_qsv_list_item(qsv->dts_seq, 0);
++ av_qsv_list_rem(qsv->dts_seq, item);
++ av_free(item);
++ }
++#if HAVE_THREADS
++ if (qsv && qsv->qts_seq_mutex){
++ mut_ret = pthread_mutex_unlock(qsv->qts_seq_mutex);
++ if(mut_ret)
++ av_log(NULL, AV_LOG_ERROR, "pthread_mutex_lock issue[%d] at %s\n",mut_ret, __FUNCTION__);
++ }
++#endif
++}
++
++
++av_qsv_list *av_qsv_list_init(int is_threaded)
++{
++ av_qsv_list *l;
++#if HAVE_THREADS
++ int mut_ret;
++#endif
++
++ l = av_mallocz(sizeof(av_qsv_list));
++ if (!l)
++ return 0;
++ l->items = av_mallocz(AV_QSV_JOB_SIZE_DEFAULT * sizeof(void *));
++ if (!l->items)
++ return 0;
++ l->items_alloc = AV_QSV_JOB_SIZE_DEFAULT;
++
++#if HAVE_THREADS
++ if (is_threaded) {
++ l->mutex = av_mallocz(sizeof(pthread_mutex_t));
++ if (l->mutex){
++ mut_ret = pthread_mutexattr_init(&l->mta);
++ if( mut_ret )
++ av_log(NULL, AV_LOG_ERROR, "pthread_mutexattr_init issue[%d] at %s\n",mut_ret, __FUNCTION__);
++ mut_ret = pthread_mutexattr_settype(&l->mta, PTHREAD_MUTEX_RECURSIVE /*PTHREAD_MUTEX_ERRORCHECK*/);
++ if( mut_ret )
++ av_log(NULL, AV_LOG_ERROR, "pthread_mutexattr_settype issue[%d] at %s\n",mut_ret, __FUNCTION__);
++ mut_ret = pthread_mutex_init(l->mutex, &l->mta);
++ if( mut_ret )
++ av_log(NULL, AV_LOG_ERROR, "pthread_mutex_init issue[%d] at %s\n",mut_ret, __FUNCTION__);
++ }
++ } else
++#endif
++ l->mutex = 0;
++ return l;
++}
++
++int av_qsv_list_count(av_qsv_list * l)
++{
++ int count;
++
++ av_qsv_list_lock(l);
++ count = l->items_count;
++ av_qsv_list_unlock(l);
++ return count;
++}
++
++int av_qsv_list_add(av_qsv_list * l, void *p)
++{
++ int pos = -1;
++
++ if (!p) {
++ return pos;
++ }
++
++ av_qsv_list_lock(l);
++
++ if (l->items_count == l->items_alloc) {
++ /* We need a bigger boat */
++ l->items_alloc += AV_QSV_JOB_SIZE_DEFAULT;
++ l->items = av_realloc(l->items, l->items_alloc * sizeof(void *));
++ }
++
++ l->items[l->items_count] = p;
++ pos = (l->items_count);
++ l->items_count++;
++
++ av_qsv_list_unlock(l);
++
++ return pos;
++}
++
++void av_qsv_list_rem(av_qsv_list * l, void *p)
++{
++ int i;
++
++ av_qsv_list_lock(l);
++
++ /* Find the item in the list */
++ for (i = 0; i < l->items_count; i++) {
++ if (l->items[i] == p) {
++ /* Shift all items after it sizeof( void * ) bytes earlier */
++ memmove(&l->items[i], &l->items[i + 1],
++ (l->items_count - i - 1) * sizeof(void *));
++
++ l->items_count--;
++ break;
++ }
++ }
++
++ av_qsv_list_unlock(l);
++}
++
++void *av_qsv_list_item(av_qsv_list * l, int i)
++{
++ void *ret = NULL;
++
++ if (i < 0)
++ return NULL;
++
++ av_qsv_list_lock(l);
++ if( i < l->items_count)
++ ret = l->items[i];
++ av_qsv_list_unlock(l);
++ return ret;
++}
++
++void av_qsv_list_insert(av_qsv_list * l, int pos, void *p)
++{
++
++ if (!p)
++ return;
++
++ av_qsv_list_lock(l);
++
++ if (l->items_count == l->items_alloc) {
++ l->items_alloc += AV_QSV_JOB_SIZE_DEFAULT;
++ l->items = av_realloc(l->items, l->items_alloc * sizeof(void *));
++ }
++
++ if (l->items_count != pos) {
++ memmove(&l->items[pos + 1], &l->items[pos],
++ (l->items_count - pos) * sizeof(void *));
++ }
++
++ l->items[pos] = p;
++ l->items_count--;
++
++ av_qsv_list_unlock(l);
++}
++
++void av_qsv_list_close(av_qsv_list ** _l)
++{
++ av_qsv_list *l = *_l;
++#if HAVE_THREADS
++ int mut_ret;
++#endif
++
++ av_qsv_list_lock(l);
++
++ av_free(l->items);
++
++#if HAVE_THREADS
++ if (l->mutex){
++ mut_ret = pthread_mutex_unlock(l->mutex);
++ if( mut_ret )
++ av_log(NULL, AV_LOG_ERROR, "pthread_mutex_unlock issue[%d] at %s\n",mut_ret, __FUNCTION__);
++ mut_ret = pthread_mutex_destroy(&l->mutex);
++ mut_ret = pthread_mutexattr_destroy(&l->mta);
++ }
++#endif
++ av_freep(_l);
++}
++
++int av_qsv_list_lock(av_qsv_list *l){
++ int ret = 0;
++#if HAVE_THREADS
++ if (l->mutex){
++ ret = pthread_mutex_lock(l->mutex);
++ if( ret )
++ av_log(NULL, AV_LOG_ERROR, "pthread_mutex_lock issue[%d] at %s\n",ret, __FUNCTION__);
++ }
++#endif
++ return ret;
++}
++
++int av_qsv_list_unlock(av_qsv_list *l){
++ int ret = 0;
++#if HAVE_THREADS
++ if (l->mutex){
++ ret = pthread_mutex_unlock(l->mutex);
++ if( ret )
++ av_log(NULL, AV_LOG_ERROR, "pthread_mutex_unlock issue[%d] at %s\n",ret, __FUNCTION__);
++ }
++#endif
++ return ret;
++}
++
++int av_is_qsv_available(mfxIMPL impl, mfxVersion * ver)
++{
++ mfxStatus sts = MFX_ERR_NONE;
++ mfxSession mfx_session;
++
++ memset(&mfx_session, 0, sizeof(mfxSession));
++ sts = MFXInit(impl, ver, &mfx_session);
++ if (sts >= 0)
++ MFXClose(mfx_session);
++ return sts;
++}
++
++void av_qsv_wait_on_sync(av_qsv_context *qsv, av_qsv_stage *stage)
++{
++ int iter = 0;
++ mfxStatus sts = MFX_ERR_NONE;
++ if( stage )
++ if(*stage->out.sync->p_sync){
++ while(1){
++ iter++;
++ sts = MFXVideoCORE_SyncOperation(qsv->mfx_session,*stage->out.sync->p_sync, AV_QSV_SYNC_TIME_DEFAULT);
++ if(MFX_WRN_IN_EXECUTION == sts){
++
++ if(iter>20)
++ AV_QSV_DEBUG_ASSERT(1, "Sync failed");
++
++ av_qsv_sleep(10);
++ continue;
++ }
++ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
++ break;
++ }
++ }
++}
+\ No newline at end of file
+diff --git a/libavcodec/qsv.h b/libavcodec/qsv.h
+new file mode 100644
+index 0000000..52378cf
+--- /dev/null
++++ b/libavcodec/qsv.h
+@@ -0,0 +1,494 @@
++/* ********************************************************************* *\
++
++Copyright (C) 2013 Intel Corporation. All rights reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions are met:
++- Redistributions of source code must retain the above copyright notice,
++this list of conditions and the following disclaimer.
++- Redistributions in binary form must reproduce the above copyright notice,
++this list of conditions and the following disclaimer in the documentation
++and/or other materials provided with the distribution.
++- Neither the name of Intel Corporation nor the names of its contributors
++may be used to endorse or promote products derived from this software
++without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" AND ANY EXPRESS OR
++IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT,
++INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++
++\* ********************************************************************* */
++
++#ifndef AVCODEC_QSV_H
++#define AVCODEC_QSV_H
++
++/**
++ * @file
++ * @ingroup lavc_codec_hwaccel_qsv
++ * Common header for QSV/MediaSDK acceleration
++ */
++
++/**
++ * @defgroup lavc_codec_hwaccel_qsv QSV/MediaSDK based Decode/Encode and VPP
++ * @ingroup lavc_codec_hwaccel
++ *
++ * As Intel Quick Sync Video (QSV) can decode/preprocess/encode with HW
++ * acceleration.
++ *
++ * Supported features:
++ * - access:
++ * - format AV_PIX_FMT_QSV_H264, AVCodec decoder based implementation
++ * - name "h264_qsv", avcodec_find_decoder_by_name( "h264_qsv")
++ * - IO Pattern:
++ * - Opaque memory: MFX_IOPATTERN_OUT_OPAQUE_MEMORY // Video memory is
++ * MFX_IMPL_HARDWARE or MFX_IMPL_AUTO and runtime support,
++ * otherwise: System Memory
++ * - System memory: MFX_IOPATTERN_OUT_SYSTEM_MEMORY
++ * - Allocators:
++ * - default allocator for System memory: MFX_MEMTYPE_SYSTEM_MEMORY
++ * - details:
++ * implementation as "per frame"
++ *
++ * TODO list:
++ * - access:
++ * - format AV_PIX_FMT_QSV_MPEG2
++ * - format AV_PIX_FMT_QSV_VC1
++ * - format AV_PIX_FMT_QSV, see "details" below
++ * - IO Pattern:
++ * - VIDEO_MEMORY // MFX_IOPATTERN_OUT_VIDEO_MEMORY
++ * - Allocators:
++ * - Video memory: MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET /
++ * MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET
++ * - details:
++ * "per slice" support: AV_PIX_FMT_QSV with AVHWAccel based implementation
++ *
++ * Note av_qsv_config struct required to fill in via
++ * AVCodecContext.hwaccel_context
++ *
++ * As per frame, note AVFrame.data[2] (qsv_atom) used for frame atom id,
++ * data/linesize should be used together with SYSTEM_MEMORY and tested
++ *
++ * Note: Compilation would require:
++ * - Intel MediaSDK headers, Full SDK is avaialble from the original web site:
++ * http://software.intel.com/en-us/vcsource/tools/media-SDK
++ * Will be referenced as msdk/*.h (mfxdefs.h, mfxstructures.h, ... )
++ * and
++ * - Final application has to link against Intel MediaSDK dispatcher, available
++ * at MediaSDK as well
++ *
++ * Target OS: as per available dispatcher and driver support
++ *
++ * Implementation details:
++ * Provided struct av_qsv_context contain several struct av_qsv_space(s) for decode,
++ * VPP and encode.
++ * av_qsv_space just contain needed environment for the appropriate action.
++ * Based on this - pipeline (see pipes) will be build to pass details such as
++ * mfxFrameSurface1* and mfxSyncPoint* from one action to the next.
++ *
++ * Resources re-usage (av_qsv_flush_stages):
++ * av_qsv_context *qsv = (av_qsv_context *)video_codec_ctx->priv_data;
++ * av_qsv_list *pipe = (av_qsv_list *)video_frame->data[2];
++ * av_qsv_flush_stages( qsv->pipes, &pipe );
++ *
++ * DTS re-usage:
++ * av_qsv_dts_pop(qsv);
++ *
++ * for video,DX9/11 memory it has to be Unlock'ed as well
++ *
++ * Implementation is thread aware and uses synchronization point(s) from MediaSDK
++ * as per configuration.
++ *
++ * For the details of MediaSDK usage and options available - please refer to the
++ * available documentation at MediaSDK.
++ *
++ * Feature set used from MSDK is defined by AV_QSV_MSDK_VERSION_MAJOR and
++ * AV_QSV_MSDK_VERSION_MINOR
++ *
++ * @{
++ */
++
++#include <stdint.h>
++#include <string.h>
++#include "msdk/mfxvideo.h"
++#include "libavutil/mem.h"
++#include "libavutil/time.h"
++
++#ifdef HAVE_AV_CONFIG_H
++#include "config.h"
++#endif
++
++#if HAVE_THREADS
++#if defined (__GNUC__)
++#include <pthread.h>
++#define ff_qsv_atomic_inc(ptr) __sync_add_and_fetch(ptr,1)
++#define ff_qsv_atomic_dec(ptr) __sync_sub_and_fetch (ptr,1)
++#elif HAVE_WINDOWS_H // MSVC case
++#include <windows.h>
++#if HAVE_PTHREADS
++#include <pthread.h>
++#elif HAVE_W32THREADS
++#include "w32pthreads.h"
++#endif
++#define ff_qsv_atomic_inc(ptr) InterlockedIncrement(ptr)
++#define ff_qsv_atomic_dec(ptr) InterlockedDecrement (ptr)
++#else
++// targeting only for MinGW or MSVC
++#endif
++
++#else
++#define ff_qsv_atomic_inc(ptr) ((*ptr)++)
++#define ff_qsv_atomic_dec(ptr) ((*ptr)--)
++#endif
++
++
++// sleep is defined in milliseconds
++#define av_qsv_sleep(x) av_usleep((x)*1000)
++
++#define AV_QSV_ZERO_MEMORY(VAR) {memset(&VAR, 0, sizeof(VAR));}
++#define AV_QSV_ALIGN32(X) (((mfxU32)((X)+31)) & (~ (mfxU32)31))
++#define AV_QSV_ALIGN16(value) (((value + 15) >> 4) << 4)
++#ifndef AV_QSV_PRINT_RET_MSG
++#define AV_QSV_PRINT_RET_MSG(ERR) { av_log(NULL, AV_LOG_FATAL,"Error code %d,\t%s\t%d\n", ERR, __FUNCTION__, __LINE__); }
++#endif
++
++#ifndef AV_QSV_DEBUG_ASSERT
++#define AV_QSV_DEBUG_ASSERT(x,y) {if ((x)) {av_log(NULL, AV_LOG_FATAL,"\nASSERT: %s\n",y);};}
++#endif
++
++#define AV_QSV_CHECK_RESULT(P, X, ERR) {if ((X) > (P)) {AV_QSV_PRINT_RET_MSG(ERR); return ERR;}}
++#define AV_QSV_CHECK_POINTER(P, ERR) {if (!(P)) {AV_QSV_PRINT_RET_MSG(ERR); return ERR;}}
++#define AV_QSV_IGNORE_MFX_STS(P, X) {if ((X) == (P)) {P = MFX_ERR_NONE;}}
++
++#define AV_QSV_ID_BUFFER MFX_MAKEFOURCC('B','U','F','F')
++#define AV_QSV_ID_FRAME MFX_MAKEFOURCC('F','R','M','E')
++
++#define AV_QSV_SURFACE_NUM 80
++#define AV_QSV_SYNC_NUM AV_QSV_SURFACE_NUM*3/4
++#define AV_QSV_BUF_SIZE_DEFAULT 4096*2160*10
++#define AV_QSV_JOB_SIZE_DEFAULT 10
++#define AV_QSV_SYNC_TIME_DEFAULT 10000
++// see av_qsv_get_free_sync, av_qsv_get_free_surface , 100 if usleep(10*1000)(10ms) == 1 sec
++#define AV_QSV_REPEAT_NUM_DEFAULT 100
++#define AV_QSV_ASYNC_DEPTH_DEFAULT 4
++
++// version of MSDK/QSV API currently used
++#define AV_QSV_MSDK_VERSION_MAJOR 1
++#define AV_QSV_MSDK_VERSION_MINOR 3
++
++typedef enum AV_QSV_STAGE_TYPE {
++
++#define AV_QSV_DECODE_MASK 0x001
++ AV_QSV_DECODE = 0x001,
++
++#define AV_QSV_VPP_MASK 0x0F0
++ // "Mandatory VPP filter" , might be with "Hint-based VPP filters"
++ AV_QSV_VPP_DEFAULT = 0x010,
++ // "User Modules" etc
++ AV_QSV_VPP_USER = 0x020,
++
++#define av_QSV_ENCODE_MASK 0x100
++ AV_QSV_ENCODE = 0x100
++#define AV_QSV_ANY_MASK 0xFFF
++} AV_QSV_STAGE_TYPE;
++
++
++typedef struct av_qsv_list {
++ // practically pthread_mutex_t
++ void *mutex;
++#if HAVE_THREADS
++ pthread_mutexattr_t mta;
++#endif
++
++ void **items;
++ int items_alloc;
++
++ int items_count;
++} av_qsv_list;
++
++typedef struct av_qsv_sync {
++ mfxSyncPoint* p_sync;
++ int in_use;
++} av_qsv_sync;
++
++typedef struct av_qsv_stage {
++ AV_QSV_STAGE_TYPE type;
++ struct {
++ mfxBitstream *p_bs;
++ mfxFrameSurface1 *p_surface;
++ } in;
++ struct {
++ mfxBitstream *p_bs;
++ mfxFrameSurface1 *p_surface;
++ av_qsv_sync *sync;
++ } out;
++ av_qsv_list *pending;
++} av_qsv_stage;
++
++typedef struct av_qsv_task {
++ mfxBitstream *bs;
++ av_qsv_stage *stage;
++} av_qsv_task;
++
++
++typedef struct av_qsv_space {
++
++ uint8_t is_init_done;
++
++ AV_QSV_STAGE_TYPE type;
++
++ mfxVideoParam m_mfxVideoParam;
++
++ mfxFrameAllocResponse response;
++ mfxFrameAllocRequest request[2]; // [0] - in, [1] - out, if needed
++
++ mfxExtOpaqueSurfaceAlloc ext_opaque_alloc;
++ mfxExtBuffer **p_ext_params;
++ uint16_t p_ext_param_num;
++
++ uint16_t surface_num_max_used;
++ uint16_t surface_num;
++ mfxFrameSurface1 *p_surfaces[AV_QSV_SURFACE_NUM];
++
++ uint16_t sync_num_max_used;
++ uint16_t sync_num;
++ av_qsv_sync *p_syncp[AV_QSV_SYNC_NUM];
++
++ mfxBitstream bs;
++ uint8_t *p_buf;
++ size_t p_buf_max_size;
++
++ // only for encode and tasks
++ av_qsv_list *tasks;
++
++ av_qsv_list *pending;
++
++ // storage for allocations/mfxMemId*
++ mfxMemId *mids;
++} av_qsv_space;
++
++typedef struct av_qsv_context {
++ volatile int is_context_active;
++
++ mfxIMPL impl;
++ mfxSession mfx_session;
++ mfxVersion ver;
++
++ // decode
++ av_qsv_space *dec_space;
++ // encode
++ av_qsv_space *enc_space;
++ // vpp
++ av_qsv_list *vpp_space;
++
++ av_qsv_list *pipes;
++
++ // MediaSDK starting from API version 1.6 includes DecodeTimeStamp
++ // in addition to TimeStamp
++ // see also AV_QSV_MSDK_VERSION_MINOR , AV_QSV_MSDK_VERSION_MAJOR
++ av_qsv_list *dts_seq;
++
++ // practically pthread_mutex_t
++ void *qts_seq_mutex;
++
++ int is_anex;
++
++ void *qsv_config;
++
++} av_qsv_context;
++
++typedef enum {
++ QSV_PART_ANY = 0,
++ QSV_PART_LOWER,
++ QSV_PART_UPPER
++} av_qsv_split;
++
++typedef struct {
++ int64_t dts;
++} av_qsv_dts;
++
++typedef struct av_qsv_alloc_frame {
++ mfxU32 id;
++ mfxFrameInfo info;
++} av_qsv_alloc_frame;
++
++typedef struct av_qsv_alloc_buffer {
++ mfxU32 id;
++ mfxU32 nbytes;
++ mfxU16 type;
++} av_qsv_alloc_buffer;
++
++typedef struct av_qsv_allocators_space {
++ av_qsv_space *space;
++ mfxFrameAllocator frame_alloc;
++ mfxBufferAllocator buffer_alloc;
++} av_qsv_allocators_space;
++
++typedef struct av_qsv_config {
++ /**
++ * Set asynch depth of processing with QSV
++ * Format: 0 and more
++ *
++ * - encoding: Set by user.
++ * - decoding: Set by user.
++ */
++ int async_depth;
++
++ /**
++ * Range of numbers that indicate trade-offs between quality and speed.
++ * Format: from 1/MFX_TARGETUSAGE_BEST_QUALITY to 7/MFX_TARGETUSAGE_BEST_SPEED inclusive
++ *
++ * - encoding: Set by user.
++ * - decoding: unused
++ */
++ int target_usage;
++
++ /**
++ * Number of reference frames; if NumRefFrame = 0, this parameter is not specified.
++ * Format: 0 and more
++ *
++ * - encoding: Set by user.
++ * - decoding: unused
++ */
++ int num_ref_frame;
++
++ /**
++ * Distance between I- or P- key frames; if it is zero, the GOP structure is unspecified.
++ * Note: If GopRefDist = 1, there are no B-frames used.
++ *
++ * - encoding: Set by user.
++ * - decoding: unused
++ */
++ int gop_ref_dist;
++
++ /**
++ * Number of pictures within the current GOP (Group of Pictures); if GopPicSize=0,
++ * then the GOP size is unspecified. If GopPicSize=1, only I-frames are used.
++ *
++ * - encoding: Set by user.
++ * - decoding: unused
++ */
++ int gop_pic_size;
++
++ /**
++ * Set type of surfaces used with QSV
++ * Format: "IOPattern enum" of Media SDK
++ *
++ * - encoding: Set by user.
++ * - decoding: Set by user.
++ */
++ int io_pattern;
++
++ /**
++ * Set amount of additional surfaces might be needed
++ * Format: ammount of additional buffers(surfaces+syncs)
++ * to allocate in advance
++ *
++ * - encoding: Set by user.
++ * - decoding: Set by user.
++ */
++ int additional_buffers;
++
++ /**
++ * If pipeline should be sync.
++ * Format: wait time in milliseconds,
++ * AV_QSV_SYNC_TIME_DEFAULT/10000 might be a good value
++ *
++ * - encoding: Set by user.
++ * - decoding: Set by user.
++ */
++ int sync_need;
++
++ /**
++ * Type of implementation needed
++ *
++ * - encoding: Set by user.
++ * - decoding: Set by user.
++ */
++ int impl_requested;
++
++ /**
++ * if QSV usage is multithreaded.
++ * Format: Yes/No, 1/0
++ *
++ * - encoding: Set by user.
++ * - decoding: Set by user.
++ */
++ int usage_threaded;
++
++ /**
++ * if QSV use an external allocation (valid per session/mfxSession)
++ * Format: pointer to allocators, if default: 0
++ *
++ * note that:
++ * System Memory: can be used without provided and external allocator,
++ * meaning MediaSDK will use an internal one
++ * Video Memory: in this case - we must provide an external allocator
++ * Also, Media SDK session doesn't require external allocator if the application
++ * uses opaque memory
++ *
++ * Calls SetFrameAllocator/SetBufferAllocator
++ * (MFXVideoCORE_SetFrameAllocator/MFXVideoCORE_SetBufferAllocator)
++ * are to pass allocators to Media SDK
++ *
++ * - encoding: Set by user.
++ * - decoding: Set by user.
++ */
++ av_qsv_allocators_space *allocators;
++
++} av_qsv_config;
++
++#define ANEX_UNKNOWN 0
++#define ANEX_PREFIX 1
++#define ANEX_NO_PREFIX 2
++
++static const uint8_t ff_prefix_code[] = { 0x00, 0x00, 0x00, 0x01 };
++
++int av_qsv_get_free_sync(av_qsv_space *, av_qsv_context *);
++int av_qsv_get_free_surface(av_qsv_space *, av_qsv_context *, mfxFrameInfo *,
++ av_qsv_split);
++int av_qsv_get_free_encode_task(av_qsv_list *);
++
++int av_is_qsv_available(mfxIMPL, mfxVersion *);
++void av_qsv_wait_on_sync(av_qsv_context *, av_qsv_stage *);
++
++void av_qsv_add_context_usage(av_qsv_context *, int);
++
++void av_qsv_pipe_list_create(av_qsv_list **, int);
++void av_qsv_pipe_list_clean(av_qsv_list **);
++
++void av_qsv_add_stagee(av_qsv_list **, av_qsv_stage *, int);
++av_qsv_stage *av_qsv_get_last_stage(av_qsv_list *);
++av_qsv_list *av_qsv_pipe_by_stage(av_qsv_list *, av_qsv_stage *);
++void av_qsv_flush_stages(av_qsv_list *, av_qsv_list **);
++
++void av_qsv_dts_ordered_insert(av_qsv_context *, int, int, int64_t, int);
++void av_qsv_dts_pop(av_qsv_context *);
++
++av_qsv_stage *av_qsv_stage_init(void);
++void av_qsv_stage_clean(av_qsv_stage **);
++int av_qsv_context_clean(av_qsv_context *);
++
++int ff_qsv_is_sync_in_pipe(mfxSyncPoint *, av_qsv_context *);
++int ff_qsv_is_surface_in_pipe(mfxFrameSurface1 *, av_qsv_context *);
++
++av_qsv_list *av_qsv_list_init(int);
++int av_qsv_list_lock(av_qsv_list *);
++int av_qsv_list_unlock(av_qsv_list *);
++int av_qsv_list_add(av_qsv_list *, void *);
++void av_qsv_list_rem(av_qsv_list *, void *);
++void av_qsv_list_insert(av_qsv_list *, int, void *);
++void av_qsv_list_close(av_qsv_list **);
++
++int av_qsv_list_count(av_qsv_list *);
++void *av_qsv_list_item(av_qsv_list *, int);
++
++/* @} */
++
++#endif //AVCODEC_QSV_H
+diff --git a/libavcodec/qsv_h264.c b/libavcodec/qsv_h264.c
+new file mode 100644
+index 0000000..53a9f16
+--- /dev/null
++++ b/libavcodec/qsv_h264.c
+@@ -0,0 +1,982 @@
++/* ********************************************************************* *\
++
++Copyright (C) 2013 Intel Corporation. All rights reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions are met:
++- Redistributions of source code must retain the above copyright notice,
++this list of conditions and the following disclaimer.
++- Redistributions in binary form must reproduce the above copyright notice,
++this list of conditions and the following disclaimer in the documentation
++and/or other materials provided with the distribution.
++- Neither the name of Intel Corporation nor the names of its contributors
++may be used to endorse or promote products derived from this software
++without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" AND ANY EXPRESS OR
++IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT,
++INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++
++\* ********************************************************************* */
++
++#include "h264.h"
++#include "h264data.h"
++#include "qsv_h264.h"
++
++static av_qsv_config av_qsv_default_config = {
++ .async_depth = AV_QSV_ASYNC_DEPTH_DEFAULT,
++ .target_usage = MFX_TARGETUSAGE_BALANCED,
++ .num_ref_frame = 0,
++ .gop_ref_dist = 0,
++ .gop_pic_size = 0,
++ .io_pattern = MFX_IOPATTERN_OUT_OPAQUE_MEMORY,
++ .additional_buffers = 0,
++ .sync_need = 0,
++ .impl_requested = MFX_IMPL_HARDWARE,
++ .usage_threaded = 0,
++ .allocators = 0,
++};
++
++static av_qsv_allocators_space av_qsv_default_system_allocators = {
++ // fill to access mids
++ .space = 0,
++
++ .frame_alloc = {
++ .pthis = &av_qsv_default_system_allocators,
++ .Alloc = ff_qsv_mem_frame_alloc,
++ .Lock = ff_qsv_mem_frame_lock,
++ .Unlock = ff_qsv_mem_frame_unlock,
++ .GetHDL = ff_qsv_mem_frame_getHDL,
++ .Free = ff_qsv_mem_frame_free,
++ },
++ .buffer_alloc = {
++ .pthis = &av_qsv_default_system_allocators,
++ .Alloc = ff_qsv_mem_buffer_alloc,
++ .Lock = ff_qsv_mem_buffer_lock,
++ .Unlock = ff_qsv_mem_buffer_unlock,
++ .Free = ff_qsv_mem_buffer_free,
++ },
++};
++
++static const uint8_t ff_slice_code[] = { 0x00, 0x00, 0x01, 0x65 };
++
++int ff_qsv_nal_find_start_code(uint8_t * pb, size_t size)
++{
++ if ((int) size < 4)
++ return 0;
++
++ while ((4 <= size) && ((0 != pb[0]) || (0 != pb[1]) || (0 != pb[2]) || (1 != pb[3]))) {
++ pb += 1;
++ size -= 1;
++ }
++
++ if (4 <= size)
++ return 1;
++
++ return 0;
++}
++
++int ff_qsv_dec_init_clean(AVCodecContext *avctx)
++{
++ av_qsv_context *qsv = avctx->priv_data;
++ av_qsv_context_clean(qsv);
++ av_freep(&avctx->priv_data);
++ return 0;
++}
++
++int ff_qsv_dec_init(AVCodecContext * avctx)
++{
++ int ret = 0;
++ mfxStatus sts = MFX_ERR_NONE;
++ size_t current_offset = 6;
++ int header_size = 0;
++ unsigned char *current_position;
++ size_t current_size;
++
++ av_qsv_context *qsv = avctx->priv_data;
++ av_qsv_space *qsv_decode = qsv->dec_space;
++ av_qsv_config *qsv_config_context = avctx->hwaccel_context;
++
++ qsv->impl = qsv_config_context->impl_requested;
++
++ memset(&qsv->mfx_session, 0, sizeof(mfxSession));
++ qsv->ver.Major = AV_QSV_MSDK_VERSION_MAJOR;
++ qsv->ver.Minor = AV_QSV_MSDK_VERSION_MINOR;
++
++ sts = MFXInit(qsv->impl, &qsv->ver, &qsv->mfx_session);
++ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
++
++ AV_QSV_ZERO_MEMORY(qsv_decode->m_mfxVideoParam);
++ AV_QSV_ZERO_MEMORY(qsv_decode->m_mfxVideoParam.mfx);
++ qsv_decode->m_mfxVideoParam.mfx.CodecId = MFX_CODEC_AVC;
++ qsv_decode->m_mfxVideoParam.IOPattern =
++ qsv_config_context->io_pattern;
++
++ qsv_decode->m_mfxVideoParam.AsyncDepth =
++ qsv_config_context->async_depth;
++
++ AV_QSV_ZERO_MEMORY(qsv_decode->bs);
++ {
++ current_position = avctx->extradata;
++ current_size = avctx->extradata_size;
++
++ if (!ff_qsv_nal_find_start_code(current_position, current_size)) {
++
++ while (current_offset <= current_size) {
++ int current_nal_size =
++ (unsigned char) current_position[current_offset] << 8 |
++ (unsigned char) current_position[current_offset + 1];
++ unsigned char nal_type =
++ (unsigned char) current_position[current_offset + 2] & 0x1F;
++
++ if (nal_type == NAL_SPS || nal_type == NAL_PPS) {
++ memcpy(&qsv_decode->p_buf[header_size], ff_prefix_code,
++ sizeof(ff_prefix_code));
++ header_size += sizeof(ff_prefix_code);
++ memcpy(&qsv_decode->p_buf[header_size],
++ &current_position[current_offset + 2],
++ current_nal_size);
++
++ // fix for PPS as it comes after SPS, so - last
++ if (nal_type == NAL_PPS) {
++ // fix of MFXVideoDECODE_DecodeHeader: needs one SLICE to find, any SLICE
++ memcpy(&qsv_decode->p_buf
++ [header_size + current_nal_size],
++ ff_slice_code, current_nal_size);
++ header_size += sizeof(ff_slice_code);
++ }
++ }
++
++ header_size += current_nal_size;
++ current_offset += current_nal_size + 3;
++ }
++ } else {
++ memcpy(&qsv_decode->p_buf[0], avctx->extradata,
++ avctx->extradata_size);
++ header_size = avctx->extradata_size;
++ memcpy(&qsv_decode->p_buf
++ [header_size], ff_slice_code, sizeof(ff_slice_code));
++ header_size += sizeof(ff_slice_code);
++ }
++ }
++
++ qsv_decode->bs.Data = qsv_decode->p_buf;
++ qsv_decode->bs.DataLength = header_size;
++ qsv_decode->bs.MaxLength = qsv_decode->p_buf_max_size;
++
++ if (qsv_decode->bs.DataLength > qsv_decode->bs.MaxLength) {
++ av_log(avctx, AV_LOG_FATAL, "DataLength > MaxLength\n");
++ return -1;
++ }
++
++ sts = MFXVideoDECODE_DecodeHeader(qsv->mfx_session, &qsv_decode->bs,
++ &qsv_decode->m_mfxVideoParam);
++ if (sts < MFX_ERR_NONE && avctx->height && avctx->width)
++ {
++ av_log(avctx, AV_LOG_QUIET,"DecodeHeader failed with result:%d\n",sts);
++ sts = MFX_ERR_NONE;
++
++ // to cover absents of SPS details
++ qsv_decode->m_mfxVideoParam.mfx.FrameInfo.FourCC = MFX_FOURCC_NV12;
++ qsv_decode->m_mfxVideoParam.mfx.FrameInfo.Width = AV_QSV_ALIGN16(avctx->width);
++ qsv_decode->m_mfxVideoParam.mfx.FrameInfo.Height = avctx->field_order > AV_FIELD_PROGRESSIVE ? AV_QSV_ALIGN32(avctx->height) : AV_QSV_ALIGN16(avctx->height);
++ qsv_decode->m_mfxVideoParam.mfx.FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
++ }
++ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
++
++ qsv_decode->bs.DataLength -= sizeof(ff_slice_code);
++
++ memset(&qsv_decode->request, 0, sizeof(mfxFrameAllocRequest) * 2);
++ sts = MFXVideoDECODE_QueryIOSurf(qsv->mfx_session,
++ &qsv_decode->m_mfxVideoParam,
++ &qsv_decode->request);
++
++ AV_QSV_IGNORE_MFX_STS(sts, MFX_WRN_PARTIAL_ACCELERATION);
++ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
++
++ qsv_decode->surface_num =
++ FFMIN(qsv_decode->request[0].NumFrameSuggested +
++ qsv_config_context->async_depth +
++ qsv_config_context->additional_buffers, AV_QSV_SURFACE_NUM);
++
++ if (qsv_decode->surface_num <= 0)
++ qsv_decode->surface_num = AV_QSV_SURFACE_NUM;
++
++ if (qsv_decode->m_mfxVideoParam.IOPattern ==
++ MFX_IOPATTERN_OUT_SYSTEM_MEMORY) {
++
++ // as per non-opaque memory:
++ if (!qsv_config_context->allocators) {
++ av_log(avctx, AV_LOG_INFO,
++ "Using default allocators for QSV decode\n");
++ ((av_qsv_config *) avctx->hwaccel_context)->allocators =
++ &av_qsv_default_system_allocators;
++ }
++
++ qsv_config_context->allocators->space = qsv_decode;
++
++ qsv_decode->request[0].NumFrameMin = qsv_decode->surface_num;
++ qsv_decode->request[0].NumFrameSuggested = qsv_decode->surface_num;
++
++ qsv_decode->request[0].Type = MFX_MEMTYPE_EXTERNAL_FRAME | MFX_MEMTYPE_FROM_DECODE;
++ // qsv_decode->request[0].Type |= m_bd3dAlloc ? MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET : MFX_MEMTYPE_SYSTEM_MEMORY;
++ qsv_decode->request[0].Type |= MFX_MEMTYPE_SYSTEM_MEMORY;
++
++ qsv_config_context->allocators->
++ frame_alloc.Alloc(qsv_config_context->allocators,
++ &qsv_decode->request[0],
++ &qsv_decode->response);
++ }
++
++ for (int i = 0; i < qsv_decode->surface_num; i++) {
++ qsv_decode->p_surfaces[i] = av_mallocz(sizeof(mfxFrameSurface1));
++ AV_QSV_CHECK_POINTER(qsv_decode->p_surfaces[i],
++ AVERROR(ENOMEM));
++ memcpy(&(qsv_decode->p_surfaces[i]->Info),
++ &(qsv_decode->request[0].Info), sizeof(mfxFrameInfo));
++
++ // for an external(like DX9/11) based allocation:
++ // we bind:
++ // m_pmfxSurfaces[i].Data.MemId = m_mfxResponse.mids[i];
++ // else, System memory:
++ if (qsv_decode->m_mfxVideoParam.IOPattern ==
++ MFX_IOPATTERN_OUT_SYSTEM_MEMORY) {
++ sts =
++ qsv_config_context->allocators->
++ frame_alloc.Lock(qsv_config_context->allocators,
++ qsv_decode->response.mids[i],
++ &(qsv_decode->p_surfaces[i]->Data));
++ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
++ }
++ }
++
++ qsv_decode->sync_num = FFMIN(qsv_decode->surface_num, AV_QSV_SYNC_NUM);
++ for (int i = 0; i < qsv_decode->sync_num; i++) {
++ qsv_decode->p_syncp[i] = av_mallocz(sizeof(av_qsv_sync));
++ AV_QSV_CHECK_POINTER(qsv_decode->p_syncp[i], AVERROR(ENOMEM));
++ qsv_decode->p_syncp[i]->p_sync = av_mallocz(sizeof(mfxSyncPoint));
++ AV_QSV_CHECK_POINTER(qsv_decode->p_syncp[i]->p_sync, AVERROR(ENOMEM));
++ }
++
++ memset(&qsv_decode->ext_opaque_alloc, 0,
++ sizeof(mfxExtOpaqueSurfaceAlloc));
++
++ if (qsv_decode->m_mfxVideoParam.IOPattern ==
++ MFX_IOPATTERN_OUT_OPAQUE_MEMORY) {
++ qsv_decode->m_mfxVideoParam.NumExtParam = qsv_decode->p_ext_param_num = 1;
++
++ qsv_decode->p_ext_params = av_mallocz(sizeof(mfxExtBuffer *)*qsv_decode->p_ext_param_num);
++ AV_QSV_CHECK_POINTER(qsv_decode->p_ext_params, AVERROR(ENOMEM));
++
++ qsv_decode->m_mfxVideoParam.ExtParam = qsv_decode->p_ext_params;
++
++ qsv_decode->ext_opaque_alloc.Out.Surfaces = qsv_decode->p_surfaces;
++ qsv_decode->ext_opaque_alloc.Out.NumSurface = qsv_decode->surface_num;
++ qsv_decode->ext_opaque_alloc.Out.Type = qsv_decode->request[0].Type;
++
++ qsv_decode->ext_opaque_alloc.Header.BufferId = MFX_EXTBUFF_OPAQUE_SURFACE_ALLOCATION;
++ qsv_decode->ext_opaque_alloc.Header.BufferSz = sizeof(mfxExtOpaqueSurfaceAlloc);
++ qsv_decode->p_ext_params[0] = (mfxExtBuffer *) &qsv_decode->ext_opaque_alloc;
++ }
++
++ sts =
++ MFXVideoDECODE_Init(qsv->mfx_session,
++ &qsv_decode->m_mfxVideoParam);
++
++ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
++
++ qsv_decode->is_init_done = 1;
++ return ret;
++}
++
++av_cold int ff_qsv_decode_init(AVCodecContext * avctx)
++{
++ av_qsv_context *qsv;
++ av_qsv_space *qsv_decode;
++ av_qsv_config **qsv_config_context =
++ (av_qsv_config **) & avctx->hwaccel_context;
++
++ qsv = avctx->priv_data;
++
++ if (qsv && qsv->dec_space && qsv->dec_space->is_init_done || !avctx->extradata_size)
++ return 0;
++
++ if(!qsv)
++ qsv = av_mallocz(sizeof(av_qsv_context));
++ if (!qsv)
++ return AVERROR(ENOMEM);
++
++ if(!qsv_decode)
++ qsv_decode = av_mallocz(sizeof(av_qsv_space));
++ if (!qsv_decode){
++ free(qsv);
++ return AVERROR(ENOMEM);
++ }
++ avctx->priv_data = qsv;
++ qsv->dec_space = qsv_decode;
++
++ qsv_decode->p_buf_max_size = AV_QSV_BUF_SIZE_DEFAULT;
++ if(!qsv_decode->p_buf)
++ qsv_decode->p_buf = av_malloc(qsv_decode->p_buf_max_size * sizeof(uint8_t));
++ if (!qsv_decode->p_buf)
++ return AVERROR(ENOMEM);
++
++ if (!(*qsv_config_context)) {
++ av_log(avctx, AV_LOG_INFO, "Using default config for QSV decode\n");
++ avctx->hwaccel_context = &av_qsv_default_config;
++ } else if ((*qsv_config_context)->io_pattern != MFX_IOPATTERN_OUT_OPAQUE_MEMORY &&
++ (*qsv_config_context)->io_pattern != MFX_IOPATTERN_OUT_SYSTEM_MEMORY) {
++ avpriv_report_missing_feature(avctx,
++ "Only MFX_IOPATTERN_OUT_OPAQUE_MEMORY"
++ " and MFX_IOPATTERN_OUT_SYSTEM_MEMORY"
++ " are currently supported\n");
++ return AVERROR_PATCHWELCOME;
++ }
++
++ qsv->qsv_config = avctx->hwaccel_context;
++
++ av_qsv_add_context_usage(qsv,
++ HAVE_THREADS
++ ? (*qsv_config_context)->usage_threaded :
++ HAVE_THREADS);
++
++ // allocation of p_syncp and p_surfaces inside of ff_qsv_dec_init
++ return ff_qsv_dec_init(avctx);
++}
++
++static av_cold int qsv_decode_end(AVCodecContext * avctx)
++{
++ mfxStatus sts = MFX_ERR_NONE;
++ av_qsv_context *qsv = avctx->priv_data;
++ av_qsv_config *qsv_config_context = avctx->hwaccel_context;
++
++ if (qsv) {
++ av_qsv_space *qsv_decode = qsv->dec_space;
++ if (qsv_decode && qsv_decode->is_init_done) {
++ // todo: change to AV_LOG_INFO
++ av_log(avctx, AV_LOG_QUIET,
++ "qsv_decode report done, max_surfaces: %u/%u , max_syncs: %u/%u\n",
++ qsv_decode->surface_num_max_used,
++ qsv_decode->surface_num, qsv_decode->sync_num_max_used,
++ qsv_decode->sync_num);
++ }
++
++ if (qsv_config_context
++ && qsv_config_context->io_pattern ==
++ MFX_IOPATTERN_OUT_SYSTEM_MEMORY) {
++ if (qsv_config_context->allocators) {
++ sts =
++ qsv_config_context->allocators->
++ frame_alloc.Free(qsv_config_context->allocators,
++ &qsv_decode->response);
++ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
++ } else {
++ av_log(avctx, AV_LOG_FATAL,
++ "No QSV allocators found for clean up\n");
++ }
++ }
++ // closing the own resources
++ av_freep(&qsv_decode->p_buf);
++
++ for (int i = 0; i < qsv_decode->surface_num; i++) {
++ av_freep(&qsv_decode->p_surfaces[i]);
++ }
++ qsv_decode->surface_num = 0;
++
++ if( qsv_decode->p_ext_param_num || qsv_decode->p_ext_params )
++ av_freep(&qsv_decode->p_ext_params);
++ qsv_decode->p_ext_param_num = 0;
++
++ for (int i = 0; i < qsv_decode->sync_num; i++) {
++ av_freep(&qsv_decode->p_syncp[i]->p_sync);
++ av_freep(&qsv_decode->p_syncp[i]);
++ }
++ qsv_decode->sync_num = 0;
++ qsv_decode->is_init_done = 0;
++
++ av_freep(&qsv->dec_space);
++
++ // closing commong stuff
++ av_qsv_context_clean(qsv);
++ }
++
++ return 0;
++}
++
++static int qsv_decode_frame(AVCodecContext * avctx, void *data,
++ int *data_size, AVPacket * avpkt)
++{
++ mfxStatus sts = MFX_ERR_NONE;
++ av_qsv_context *qsv = avctx->priv_data;
++ av_qsv_space *qsv_decode;
++ av_qsv_config *qsv_config_context = avctx->hwaccel_context;
++ int *got_picture_ptr = data_size;
++ int ret_value = 1;
++ uint8_t *current_position = avpkt->data;
++ int current_size = avpkt->size;
++ int frame_processed = 0;
++ size_t frame_length = 0;
++ int surface_idx = 0;
++ int extra_data_workaround = 0;
++
++ int sync_idx = 0;
++ int current_nal_size;
++ unsigned char nal_type;
++ av_qsv_stage *new_stage = 0;
++ mfxBitstream *input_bs = NULL;
++ size_t current_offset = 2;
++ av_qsv_list *qsv_atom = 0;
++ av_qsv_list *pipe = 0;
++
++ AVFrame *picture = (AVFrame *) data;
++
++ *got_picture_ptr = 0;
++
++ qsv = avctx->priv_data;
++ if(!qsv){
++ extra_data_workaround = !avctx->extradata_size;
++ if(extra_data_workaround){
++ avctx->extradata = avpkt->data;
++ avctx->extradata_size = avpkt->size;
++ }
++ sts = ff_qsv_decode_init(avctx);
++ qsv = avctx->priv_data;
++ if(extra_data_workaround){
++ avctx->extradata = 0;
++ avctx->extradata_size = 0;
++ }
++ if(sts<0){
++ ff_qsv_dec_init_clean(avctx);
++ *got_picture_ptr = 0;
++ return sts;
++ 	 }
++ }
++ qsv_decode = qsv->dec_space;
++
++ if (qsv_decode->bs.DataOffset + qsv_decode->bs.DataLength +
++ current_size > qsv_decode->bs.MaxLength) {
++ memmove(&qsv_decode->bs.Data[0],
++ qsv_decode->bs.Data + qsv_decode->bs.DataOffset,
++ qsv_decode->bs.DataLength);
++ qsv_decode->bs.DataOffset = 0;
++ }
++
++ if (current_size) {
++ if(qsv->is_anex == ANEX_UNKNOWN){
++ if (ff_qsv_nal_find_start_code(current_position, current_size) && current_position == avpkt->data)
++ qsv->is_anex = ANEX_PREFIX;
++ else
++ qsv->is_anex = ANEX_NO_PREFIX;
++ }
++ if (qsv->is_anex == ANEX_PREFIX){
++ memcpy(&qsv_decode->bs.Data[0] +
++ qsv_decode->bs.DataLength +
++ qsv_decode->bs.DataOffset,
++ avpkt->data,
++ avpkt->size);
++ qsv_decode->bs.DataLength += avpkt->size;
++ frame_length += avpkt->size;
++ }
++ else
++ while (current_offset <= current_size) {
++ current_nal_size =
++ ((unsigned char) current_position[current_offset - 2] << 24 |
++ (unsigned char) current_position[current_offset - 1] << 16 |
++ (unsigned char) current_position[current_offset] << 8 |
++ (unsigned char) current_position[current_offset + 1]) - 1;
++ nal_type =
++ (unsigned char) current_position[current_offset + 2] & 0x1F;
++ {
++ frame_length += current_nal_size;
++ memcpy(&qsv_decode->bs.Data[0] +
++ qsv_decode->bs.DataLength +
++ qsv_decode->bs.DataOffset, ff_prefix_code,
++ sizeof(ff_prefix_code));
++ qsv_decode->bs.DataLength += sizeof(ff_prefix_code);
++ memcpy(&qsv_decode->bs.Data[0] +
++ qsv_decode->bs.DataLength +
++ qsv_decode->bs.DataOffset,
++ &current_position[current_offset + 2],
++ current_nal_size + 1);
++ qsv_decode->bs.DataLength += current_nal_size + 1;
++ }
++ current_offset += current_nal_size + 5;
++ }
++
++ if (qsv_decode->bs.DataLength > qsv_decode->bs.MaxLength) {
++ av_log(avctx, AV_LOG_FATAL, "DataLength > MaxLength\n");
++ return -1;
++ }
++ }
++
++ if (frame_length || current_size == 0) {
++
++ qsv_decode->bs.TimeStamp = avpkt->pts;
++
++ //not a drain
++ if ((current_size || qsv_decode->bs.DataLength))
++ av_qsv_dts_ordered_insert(qsv, 0, 0, qsv_decode->bs.TimeStamp, 0);
++
++ sts = MFX_ERR_NONE;
++ // ignore warnings, where warnings >0 , and not error codes <0
++ while (MFX_ERR_NONE <= sts || MFX_ERR_MORE_SURFACE == sts
++ || MFX_WRN_DEVICE_BUSY == sts) {
++
++ if (MFX_ERR_MORE_SURFACE == sts || MFX_ERR_NONE == sts) {
++ surface_idx =
++ av_qsv_get_free_surface(qsv_decode, qsv,
++ &qsv_decode->request[0].Info,
++ QSV_PART_ANY);
++
++ if (surface_idx == -1) {
++ *got_picture_ptr = 0;
++ return 0;
++ }
++ }
++
++ if (MFX_WRN_DEVICE_BUSY == sts)
++ av_qsv_sleep(10);
++
++ sync_idx = av_qsv_get_free_sync(qsv_decode, qsv);
++
++ if (sync_idx == -1) {
++ *got_picture_ptr = 0;
++ return 0;
++ }
++ new_stage = av_qsv_stage_init();
++ input_bs = NULL;
++ // if to drain last ones
++ if (current_size || qsv_decode->bs.DataLength)
++ input_bs = &qsv_decode->bs;
++ // Decode a frame asynchronously (returns immediately)
++ // very first IDR / SLICE should be with SPS/PPS
++ sts = MFXVideoDECODE_DecodeFrameAsync(qsv->mfx_session, input_bs,
++ qsv_decode->p_surfaces
++ [surface_idx],
++ &new_stage->out.p_surface,
++ qsv_decode->p_syncp[sync_idx]->p_sync);
++
++ new_stage->out.sync = qsv_decode->p_syncp[sync_idx];
++ // have some results
++ if (MFX_ERR_NONE <= sts && MFX_WRN_DEVICE_BUSY != sts &&
++ MFX_WRN_VIDEO_PARAM_CHANGED != sts) {
++
++ ff_qsv_atomic_inc(&(new_stage->out.p_surface->Data.Locked));
++
++ new_stage->type = AV_QSV_DECODE;
++ new_stage->in.p_bs = input_bs;
++ new_stage->in.p_surface = qsv_decode->p_surfaces[surface_idx];
++
++ pipe = av_qsv_list_init(HAVE_THREADS ? qsv_config_context->usage_threaded : HAVE_THREADS);
++ av_qsv_add_stagee(&pipe, new_stage,
++ HAVE_THREADS ?
++ qsv_config_context->usage_threaded :
++ HAVE_THREADS);
++
++ av_qsv_list_add(qsv->pipes, pipe);
++ qsv_atom = pipe;
++
++ // usage for forced decode sync and results, can be avoided if sync done by next stage
++ // also note wait time for Sync and possible usage with MFX_WRN_IN_EXECUTION check
++ if (qsv_config_context->sync_need) {
++ sts =
++ MFXVideoCORE_SyncOperation(qsv->mfx_session,
++ qsv_decode->p_syncp[sync_idx]->p_sync,
++ qsv_config_context->sync_need);
++ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
++
++ // no need to wait more -> force off
++ ff_qsv_atomic_dec(&qsv_decode->p_syncp[sync_idx]->in_use);
++ new_stage->out.sync = 0;
++ }
++
++ sts = MFX_ERR_NONE;
++ break;
++ }
++ av_qsv_stage_clean(&new_stage);
++
++ /*
++ Can be because of:
++ - runtime situation:
++ - drain procedure:
++ At the end of the bitstream, the application continuously calls the MFXVideoDECODE_DecodeFrameAsync function with a
++ NULL bitstream pointer to drain any remaining frames cached within the Intel
++ Media SDK decoder, until the function returns MFX_ERR_MORE_DATA.
++ */
++ if (MFX_ERR_MORE_DATA == sts) {
++ // not a drain
++ if (current_size) {
++ *got_picture_ptr = 0;
++ return avpkt->size;
++ }
++ // drain
++ break;
++ }
++ if (MFX_ERR_MORE_SURFACE == sts ){
++ continue;
++ }
++
++ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
++ }
++
++ frame_processed = 1;
++ }
++
++ if (frame_processed) {
++
++ if (current_size) {
++ *got_picture_ptr = 1;
++ ret_value = avpkt->size;
++ } else {
++ if (MFX_ERR_MORE_DATA != sts) {
++ *got_picture_ptr = 1;
++ ret_value = avpkt->size;
++ } else {
++ *got_picture_ptr = 0;
++ return 0;
++ }
++ }
++
++ picture->pkt_pts = new_stage->out.p_surface->Data.TimeStamp;
++ picture->pts = new_stage->out.p_surface->Data.TimeStamp;
++
++ picture->repeat_pict = (qsv_decode->m_mfxVideoParam.mfx.FrameInfo.PicStruct & MFX_PICSTRUCT_FIELD_REPEATED);
++ picture->interlaced_frame = !(qsv_decode->m_mfxVideoParam.mfx.FrameInfo.PicStruct & MFX_PICSTRUCT_PROGRESSIVE);
++ picture->top_field_first = (qsv_decode->m_mfxVideoParam.mfx.FrameInfo.PicStruct & MFX_PICSTRUCT_FIELD_TFF);
++
++ // since we do not know it yet from MSDK, let's do just a simple way for now
++ picture->key_frame = (avctx->frame_number == 0) ? 1 : 0;
++
++ if (qsv_decode->m_mfxVideoParam.IOPattern == MFX_IOPATTERN_OUT_SYSTEM_MEMORY) {
++ picture->data[0] = new_stage->out.p_surface->Data.Y;
++ picture->data[1] = new_stage->out.p_surface->Data.VU;
++ picture->linesize[0] = new_stage->out.p_surface->Info.Width;
++ picture->linesize[1] = new_stage->out.p_surface->Info.Width;
++ } else {
++ picture->data[0] = 0;
++ picture->data[1] = 0;
++ picture->linesize[0] = 0;
++ picture->linesize[1] = 0;
++ }
++
++ picture->data[2] = qsv_atom;
++ picture->linesize[2] = 0;
++ }
++
++ return ret_value;
++}
++
++// Will be called when seeking
++static void qsv_flush_dpb(AVCodecContext * avctx)
++{
++ av_qsv_context *qsv = avctx->priv_data;
++ av_qsv_space *qsv_decode = qsv->dec_space;
++
++ qsv_decode->bs.DataOffset = 0;
++ qsv_decode->bs.DataLength = 0;
++ qsv_decode->bs.MaxLength = qsv_decode->p_buf_max_size;
++}
++
++
++mfxStatus ff_qsv_mem_frame_alloc(mfxHDL pthis,
++ mfxFrameAllocRequest * request,
++ mfxFrameAllocResponse * response)
++{
++ mfxStatus sts = MFX_ERR_NONE;
++
++ mfxU32 numAllocated = 0;
++
++ mfxU32 width = AV_QSV_ALIGN32(request->Info.Width);
++ mfxU32 height = AV_QSV_ALIGN32(request->Info.Height);
++ mfxU32 nbytes;
++
++ av_qsv_allocators_space *this_alloc = (av_qsv_allocators_space *) pthis;
++ av_qsv_alloc_frame *fs;
++
++ if (!this_alloc->space)
++ return MFX_ERR_NOT_INITIALIZED;
++
++ switch (request->Info.FourCC) {
++ case MFX_FOURCC_YV12:
++ case MFX_FOURCC_NV12:
++ nbytes =
++ width * height + (width >> 1) * (height >> 1) +
++ (width >> 1) * (height >> 1);
++ break;
++ case MFX_FOURCC_RGB3:
++ nbytes = width * height + width * height + width * height;
++ break;
++ case MFX_FOURCC_RGB4:
++ nbytes =
++ width * height + width * height + width * height +
++ width * height;
++ break;
++ case MFX_FOURCC_YUY2:
++ nbytes =
++ width * height + (width >> 1) * (height) +
++ (width >> 1) * (height);
++ break;
++ default:
++ return MFX_ERR_UNSUPPORTED;
++ }
++
++ this_alloc->space->mids =
++ av_malloc(sizeof(mfxMemId) * request->NumFrameSuggested);
++ if (!this_alloc->space->mids)
++ return MFX_ERR_MEMORY_ALLOC;
++
++ // allocate frames
++ for (numAllocated = 0; numAllocated < request->NumFrameSuggested;
++ numAllocated++) {
++ sts =
++ this_alloc->buffer_alloc.Alloc(this_alloc->buffer_alloc.pthis,
++ nbytes +
++ AV_QSV_ALIGN32(sizeof
++ (av_qsv_alloc_frame)),
++ request->Type,
++ &(this_alloc->
++ space->mids[numAllocated]));
++
++ if (MFX_ERR_NONE != sts)
++ break;
++
++ sts =
++ this_alloc->buffer_alloc.Lock(this_alloc->buffer_alloc.pthis,
++ this_alloc->
++ space->mids[numAllocated],
++ (mfxU8 **) & fs);
++
++ if (MFX_ERR_NONE != sts)
++ break;
++
++ fs->id = AV_QSV_ID_FRAME;
++ fs->info = request->Info;
++ this_alloc->buffer_alloc.Unlock(this_alloc->buffer_alloc.pthis,
++ this_alloc->
++ space->mids[numAllocated]);
++ }
++
++ // check the number of allocated frames
++ if (numAllocated < request->NumFrameMin)
++ return MFX_ERR_MEMORY_ALLOC;
++
++ response->NumFrameActual = (mfxU16) numAllocated;
++ response->mids = this_alloc->space->mids;
++
++ return MFX_ERR_NONE;
++}
++
++mfxStatus ff_qsv_mem_frame_lock(mfxHDL pthis, mfxMemId mid,
++ mfxFrameData * ptr)
++{
++ mfxStatus sts = MFX_ERR_NONE;
++ av_qsv_alloc_frame *fs = 0;
++ mfxU16 width;
++ mfxU16 height;
++
++ av_qsv_allocators_space *this_alloc = (av_qsv_allocators_space *) pthis;
++
++ if (!this_alloc->space)
++ return MFX_ERR_NOT_INITIALIZED;
++ if (!ptr)
++ return MFX_ERR_NULL_PTR;
++
++
++ sts =
++ this_alloc->buffer_alloc.Lock(this_alloc->buffer_alloc.pthis, mid,
++ (mfxU8 **) & fs);
++
++ if (MFX_ERR_NONE != sts)
++ return sts;
++
++ if (AV_QSV_ID_FRAME != fs->id) {
++ this_alloc->buffer_alloc.Unlock(this_alloc->buffer_alloc.pthis,
++ mid);
++ return MFX_ERR_INVALID_HANDLE;
++ }
++
++ width = (mfxU16) AV_QSV_ALIGN32(fs->info.Width);
++ height = (mfxU16) AV_QSV_ALIGN32(fs->info.Height);
++ ptr->B = ptr->Y =
++ (mfxU8 *) fs + AV_QSV_ALIGN32(sizeof(av_qsv_allocators_space));
++
++ switch (fs->info.FourCC) {
++ case MFX_FOURCC_NV12:
++ ptr->U = ptr->Y + width * height;
++ ptr->V = ptr->U + 1;
++ ptr->Pitch = width;
++ break;
++ case MFX_FOURCC_YV12:
++ ptr->V = ptr->Y + width * height;
++ ptr->U = ptr->V + (width >> 1) * (height >> 1);
++ ptr->Pitch = width;
++ break;
++ case MFX_FOURCC_YUY2:
++ ptr->U = ptr->Y + 1;
++ ptr->V = ptr->Y + 3;
++ ptr->Pitch = 2 * width;
++ break;
++ case MFX_FOURCC_RGB3:
++ ptr->G = ptr->B + 1;
++ ptr->R = ptr->B + 2;
++ ptr->Pitch = 3 * width;
++ break;
++ case MFX_FOURCC_RGB4:
++ ptr->G = ptr->B + 1;
++ ptr->R = ptr->B + 2;
++ ptr->A = ptr->B + 3;
++ ptr->Pitch = 4 * width;
++ break;
++ default:
++ return MFX_ERR_UNSUPPORTED;
++ }
++
++ return MFX_ERR_NONE;
++}
++
++mfxStatus ff_qsv_mem_frame_unlock(mfxHDL pthis, mfxMemId mid,
++ mfxFrameData * ptr)
++{
++ mfxStatus sts = MFX_ERR_NONE;
++ av_qsv_allocators_space *this_alloc = (av_qsv_allocators_space *) pthis;
++
++ sts =
++ this_alloc->buffer_alloc.Unlock(this_alloc->buffer_alloc.pthis,
++ mid);
++
++ if (MFX_ERR_NONE != sts)
++ return sts;
++
++ if (NULL != ptr) {
++ ptr->Pitch = 0;
++ ptr->Y = 0;
++ ptr->U = 0;
++ ptr->V = 0;
++ }
++
++ return MFX_ERR_NONE;
++}
++
++mfxStatus ff_qsv_mem_frame_getHDL(mfxHDL pthis, mfxMemId mid,
++ mfxHDL * handle)
++{
++ return MFX_ERR_UNSUPPORTED;
++}
++
++mfxStatus ff_qsv_mem_frame_free(mfxHDL pthis,
++ mfxFrameAllocResponse * response)
++{
++ mfxStatus sts = MFX_ERR_NONE;
++ av_qsv_allocators_space *this_alloc = (av_qsv_allocators_space *) pthis;
++ mfxU32 i;
++
++ if (!response)
++ return MFX_ERR_NULL_PTR;
++
++ if (!this_alloc->space)
++ return MFX_ERR_NOT_INITIALIZED;
++
++ if (response->mids)
++ for (i = 0; i < response->NumFrameActual; i++) {
++ if (response->mids[i]) {
++ sts =
++ this_alloc->buffer_alloc.Free(this_alloc->
++ buffer_alloc.pthis,
++ response->mids[i]);
++ if (MFX_ERR_NONE != sts)
++ return sts;
++ }
++ }
++
++ av_freep(&response->mids);
++
++ return sts;
++}
++
++
++mfxStatus ff_qsv_mem_buffer_alloc(mfxHDL pthis, mfxU32 nbytes, mfxU16 type,
++ mfxMemId * mid)
++{
++ av_qsv_alloc_buffer *bs;
++ mfxU32 header_size;
++ mfxU8 *buffer_ptr;
++
++ if (!mid)
++ return MFX_ERR_NULL_PTR;
++
++ if (0 == (type & MFX_MEMTYPE_SYSTEM_MEMORY))
++ return MFX_ERR_UNSUPPORTED;
++
++ header_size = AV_QSV_ALIGN32(sizeof(av_qsv_alloc_buffer));
++ buffer_ptr = (mfxU8 *) av_malloc(header_size + nbytes);
++
++ if (!buffer_ptr)
++ return MFX_ERR_MEMORY_ALLOC;
++
++ bs = (av_qsv_alloc_buffer *) buffer_ptr;
++ bs->id = AV_QSV_ID_BUFFER;
++ bs->type = type;
++ bs->nbytes = nbytes;
++ *mid = (mfxHDL) bs;
++ return MFX_ERR_NONE;
++}
++
++mfxStatus ff_qsv_mem_buffer_lock(mfxHDL pthis, mfxMemId mid, mfxU8 ** ptr)
++{
++ av_qsv_alloc_buffer *bs;
++
++ if (!ptr)
++ return MFX_ERR_NULL_PTR;
++
++ bs = (av_qsv_alloc_buffer *) mid;
++
++ if (!bs)
++ return MFX_ERR_INVALID_HANDLE;
++ if (AV_QSV_ID_BUFFER != bs->id)
++ return MFX_ERR_INVALID_HANDLE;
++
++ *ptr = (mfxU8 *) bs + AV_QSV_ALIGN32(sizeof(av_qsv_alloc_buffer));
++ return MFX_ERR_NONE;
++}
++
++mfxStatus ff_qsv_mem_buffer_unlock(mfxHDL pthis, mfxMemId mid)
++{
++ av_qsv_alloc_buffer *bs = (av_qsv_alloc_buffer *) mid;
++
++ if (!bs || AV_QSV_ID_BUFFER != bs->id)
++ return MFX_ERR_INVALID_HANDLE;
++
++ return MFX_ERR_NONE;
++}
++
++mfxStatus ff_qsv_mem_buffer_free(mfxHDL pthis, mfxMemId mid)
++{
++ av_qsv_alloc_buffer *bs = (av_qsv_alloc_buffer *) mid;
++ if (!bs || AV_QSV_ID_BUFFER != bs->id)
++ return MFX_ERR_INVALID_HANDLE;
++
++ av_freep(&bs);
++ return MFX_ERR_NONE;
++}
++
++
++AVCodec ff_h264_qsv_decoder = {
++ .name = "h264_qsv",
++ .type = AVMEDIA_TYPE_VIDEO,
++ .id = AV_CODEC_ID_H264,
++ .init = ff_qsv_decode_init,
++ .close = qsv_decode_end,
++ .decode = qsv_decode_frame,
++ .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
++ .flush = qsv_flush_dpb,
++ .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / Intel QSV"),
++ .pix_fmts = (const enum PixelFormat[]) {AV_PIX_FMT_QSV_H264,
++ AV_PIX_FMT_NONE},
++};
+diff --git a/libavcodec/qsv_h264.h b/libavcodec/qsv_h264.h
+new file mode 100644
+index 0000000..3cbdb3f
+--- /dev/null
++++ b/libavcodec/qsv_h264.h
+@@ -0,0 +1,65 @@
++/* ********************************************************************* *\
++
++Copyright (C) 2013 Intel Corporation. All rights reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions are met:
++- Redistributions of source code must retain the above copyright notice,
++this list of conditions and the following disclaimer.
++- Redistributions in binary form must reproduce the above copyright notice,
++this list of conditions and the following disclaimer in the documentation
++and/or other materials provided with the distribution.
++- Neither the name of Intel Corporation nor the names of its contributors
++may be used to endorse or promote products derived from this software
++without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" AND ANY EXPRESS OR
++IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT,
++INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++
++\* ********************************************************************* */
++
++#ifndef AVCODEC_QSV_H264_H
++#define AVCODEC_QSV_H264_H
++
++#include "qsv.h"
++
++int ff_qsv_dec_init(AVCodecContext *);
++int ff_qsv_nal_find_start_code(uint8_t * pb, size_t size);
++
++int ff_qsv_dec_init_clean(AVCodecContext *avctx);
++av_cold int ff_qsv_decode_init(AVCodecContext * avctx);
++static av_cold int qsv_decode_end(AVCodecContext * avctx);
++static int qsv_decode_frame(AVCodecContext * avctx, void *data,
++ int *data_size, AVPacket * avpkt);
++static void qsv_flush_dpb(AVCodecContext * avctx);
++
++
++// Default for SYSTEM MEMORY
++// as from MFXFrameAllocator
++mfxStatus ff_qsv_mem_frame_alloc(mfxHDL pthis,
++ mfxFrameAllocRequest * request,
++ mfxFrameAllocResponse * response);
++mfxStatus ff_qsv_mem_frame_lock(mfxHDL pthis, mfxMemId mid,
++ mfxFrameData * ptr);
++mfxStatus ff_qsv_mem_frame_unlock(mfxHDL pthis, mfxMemId mid,
++ mfxFrameData * ptr);
++mfxStatus ff_qsv_mem_frame_getHDL(mfxHDL pthis, mfxMemId mid,
++ mfxHDL * handle);
++mfxStatus ff_qsv_mem_frame_free(mfxHDL pthis,
++ mfxFrameAllocResponse * response);
++// as from mfxBufferAllocator
++mfxStatus ff_qsv_mem_buffer_alloc(mfxHDL pthis, mfxU32 nbytes, mfxU16 type,
++ mfxMemId * mid);
++mfxStatus ff_qsv_mem_buffer_lock(mfxHDL pthis, mfxMemId mid, mfxU8 ** ptr);
++mfxStatus ff_qsv_mem_buffer_unlock(mfxHDL pthis, mfxMemId mid);
++mfxStatus ff_qsv_mem_buffer_free(mfxHDL pthis, mfxMemId mid);
++
++#endif //AVCODEC_QSV_H264_H
+diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
+index 0d6e0a3..d2779b7 100644
+--- a/libavutil/pixfmt.h
++++ b/libavutil/pixfmt.h
+@@ -190,6 +190,7 @@ enum AVPixelFormat {
+ AV_PIX_FMT_NV16, ///< interleaved chroma YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
+ AV_PIX_FMT_NV20LE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ AV_PIX_FMT_NV20BE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
++ AV_PIX_FMT_QSV_H264, ///< H.264 HW decoding with QSV, data[2] contains qsv_atom information for MFX_IOPATTERN_OUT_OPAQUE_MEMORY, MFX_IOPATTERN_OUT_VIDEO_MEMORY
+ 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
+ 
+ #if FF_API_PIX_FMT

HandBrake-0.10.0.tar.bz2/contrib/ffmpeg/A01-multi-object-pgs.patch Added

@@ -0,0 +1,671 @@
+From 638cb29d7579ad76ea358ee30ab5e6069ee796c3 Mon Sep 17 00:00:00 2001
+From: John Stebbins <stebbins@jetheaddev.com>
+Date: Thu, 12 Jun 2014 15:24:26 -0700
+Subject: [PATCH] pgssubdec: handle more complex PGS scenarios
+
+Add ability to handle multiple palettes and objects simultaneously.
+Each simultaneous object is given its own AVSubtitleRect.
+Note that there can be up to 64 currently valid objects, but only
+2 at any one time can be "presented".
+---
+ libavcodec/pgssubdec.c | 424 ++++++++++++++++++++++++++++++++++---------------
+ 1 file changed, 294 insertions(+), 130 deletions(-)
+
+diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c
+index 4f175a3..1cafd9f 100644
+--- a/libavcodec/pgssubdec.c
++++ b/libavcodec/pgssubdec.c
+@@ -33,38 +33,104 @@
+ #include "libavutil/imgutils.h"
+ 
+ #define RGBA(r,g,b,a) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
++#define MAX_EPOCH_PALETTES 8 // Max 8 allowed per PGS epoch
++#define MAX_EPOCH_OBJECTS 64 // Max 64 allowed per PGS epoch
++#define MAX_OBJECT_REFS 2 // Max objects per display set
+ 
+ enum SegmentType {
+ PALETTE_SEGMENT = 0x14,
+- PICTURE_SEGMENT = 0x15,
++ OBJECT_SEGMENT = 0x15,
+ PRESENTATION_SEGMENT = 0x16,
+ WINDOW_SEGMENT = 0x17,
+ DISPLAY_SEGMENT = 0x80,
+ };
+ 
++typedef struct PGSSubObjectRef {
++ int id;
++ int window_id;
++ uint8_t composition_flag;
++ int x;
++ int y;
++ int crop_x;
++ int crop_y;
++ int crop_w;
++ int crop_h;
++} PGSSubObjectRef;
++
+ typedef struct PGSSubPresentation {
+- int x;
+- int y;
+ int id_number;
+- int object_number;
+- uint8_t composition_flag;
++ int palette_id;
++ int object_count;
++ PGSSubObjectRef objects[MAX_OBJECT_REFS];
+ int64_t pts;
+ } PGSSubPresentation;
+ 
+-typedef struct PGSSubPicture {
++typedef struct PGSSubObject {
++ int id;
+ int w;
+ int h;
+ uint8_t *rle;
+ unsigned int rle_buffer_size, rle_data_len;
+ unsigned int rle_remaining_len;
+-} PGSSubPicture;
++} PGSSubObject;
++
++typedef struct PGSSubObjects {
++ int count;
++ PGSSubObject object[MAX_EPOCH_OBJECTS];
++} PGSSubObjects;
++
++typedef struct PGSSubPalette {
++ int id;
++ uint32_t clut[256];
++} PGSSubPalette;
++
++typedef struct PGSSubPalettes {
++ int count;
++ PGSSubPalette palette[MAX_EPOCH_PALETTES];
++} PGSSubPalettes;
+ 
+ typedef struct PGSSubContext {
+ PGSSubPresentation presentation;
+- uint32_t clut[256];
+- PGSSubPicture picture;
++ PGSSubPalettes palettes;
++ PGSSubObjects objects;
+ } PGSSubContext;
+ 
++static void flush_cache(AVCodecContext *avctx)
++{
++ PGSSubContext *ctx = avctx->priv_data;
++ int i;
++
++ for (i = 0; i < ctx->objects.count; i++) {
++ av_freep(&ctx->objects.object[i].rle);
++ ctx->objects.object[i].rle_buffer_size = 0;
++ ctx->objects.object[i].rle_remaining_len = 0;
++ }
++ ctx->objects.count = 0;
++ ctx->palettes.count = 0;
++}
++
++static PGSSubObject * find_object(int id, PGSSubObjects *objects)
++{
++ int i;
++
++ for (i = 0; i < objects->count; i++) {
++ if (objects->object[i].id == id)
++ return &objects->object[i];
++ }
++ return NULL;
++}
++
++static PGSSubPalette * find_palette(int id, PGSSubPalettes *palettes)
++{
++ int i;
++
++ for (i = 0; i < palettes->count; i++) {
++ if (palettes->palette[i].id == id)
++ return &palettes->palette[i];
++ }
++ return NULL;
++}
++
+ static av_cold int init_decoder(AVCodecContext *avctx)
+ {
+ avctx->pix_fmt = AV_PIX_FMT_PAL8;
+@@ -74,10 +140,7 @@ static av_cold int init_decoder(AVCodecContext *avctx)
+ 
+ static av_cold int close_decoder(AVCodecContext *avctx)
+ {
+- PGSSubContext *ctx = avctx->priv_data;
+-
+- av_freep(&ctx->picture.rle);
+- ctx->picture.rle_buffer_size = 0;
++ flush_cache(avctx);
+ 
+ return 0;
+ }
+@@ -92,7 +155,7 @@ static av_cold int close_decoder(AVCodecContext *avctx)
+ * @param buf pointer to the RLE data to process
+ * @param buf_size size of the RLE data to process
+ */
+-static int decode_rle(AVCodecContext *avctx, AVSubtitle *sub,
++static int decode_rle(AVCodecContext *avctx, AVSubtitleRect *rect,
+ const uint8_t *buf, unsigned int buf_size)
+ {
+ const uint8_t *rle_bitmap_end;
+@@ -100,15 +163,15 @@ static int decode_rle(AVCodecContext *avctx, AVSubtitle *sub,
+ 
+ rle_bitmap_end = buf + buf_size;
+ 
+- sub->rects[0]->pict.data[0] = av_malloc(sub->rects[0]->w * sub->rects[0]->h);
++ rect->pict.data[0] = av_malloc(rect->w * rect->h);
+ 
+- if (!sub->rects[0]->pict.data[0])
+- return -1;
++ if (!rect->pict.data[0])
++ return AVERROR(ENOMEM);
+ 
+ pixel_count = 0;
+ line_count = 0;
+ 
+- while (buf < rle_bitmap_end && line_count < sub->rects[0]->h) {
++ while (buf < rle_bitmap_end && line_count < rect->h) {
+ uint8_t flags, color;
+ int run;
+ 
+@@ -123,27 +186,31 @@ static int decode_rle(AVCodecContext *avctx, AVSubtitle *sub,
+ color = flags & 0x80 ? bytestream_get_byte(&buf) : 0;
+ }
+ 
+- if (run > 0 && pixel_count + run <= sub->rects[0]->w * sub->rects[0]->h) {
+- memset(sub->rects[0]->pict.data[0] + pixel_count, color, run);
++ if (run > 0 && pixel_count + run <= rect->w * rect->h) {
++ memset(rect->pict.data[0] + pixel_count, color, run);
+ pixel_count += run;
+ } else if (!run) {
+ /*
+ * New Line. Check if correct pixels decoded, if not display warning
+ * and adjust bitmap pointer to correct new line position.
+ */
+- if (pixel_count % sub->rects[0]->w > 0)
++ if (pixel_count % rect->w > 0) {
+ av_log(avctx, AV_LOG_ERROR, "Decoded %d pixels, when line should be %d pixels\n",
+- pixel_count % sub->rects[0]->w, sub->rects[0]->w);
++ pixel_count % rect->w, rect->w);
++ if (avctx->err_recognition & AV_EF_EXPLODE) {
++ return AVERROR_INVALIDDATA;
++ }
++ }
+ line_count++;
+ }
+ }
+ 
+- if (pixel_count < sub->rects[0]->w * sub->rects[0]->h) {
++ if (pixel_count < rect->w * rect->h) {
+ av_log(avctx, AV_LOG_ERROR, "Insufficient RLE data for subtitle\n");
+- return -1;
++ return AVERROR_INVALIDDATA;
+ }
+ 
+- av_dlog(avctx, "Pixel Count = %d, Area = %d\n", pixel_count, sub->rects[0]->w * sub->rects[0]->h);
++ av_dlog(avctx, "Pixel Count = %d, Area = %d\n", pixel_count, rect->w * rect->h);
+ 
+ return 0;
+ }
+@@ -157,40 +224,52 @@ static int decode_rle(AVCodecContext *avctx, AVSubtitle *sub,
+ * @param avctx contains the current codec context
+ * @param buf pointer to the packet to process
+ * @param buf_size size of packet to process
+- * @todo TODO: Enable support for RLE data over multiple packets
+ */
+-static int parse_picture_segment(AVCodecContext *avctx,
++static int parse_object_segment(AVCodecContext *avctx,
+ const uint8_t *buf, int buf_size)
+ {
+ PGSSubContext *ctx = avctx->priv_data;
++ PGSSubObject *object;
+ 
+ uint8_t sequence_desc;
+ unsigned int rle_bitmap_len, width, height;
++ int id;
+ 
+ if (buf_size <= 4)
+- return -1;
++ return AVERROR_INVALIDDATA;
+ buf_size -= 4;
+ 
+- /* skip 3 unknown bytes: Object ID (2 bytes), Version Number */
+- buf += 3;
++ id = bytestream_get_be16(&buf);
++ object = find_object(id, &ctx->objects);
++ if (!object) {
++ if (ctx->objects.count >= MAX_EPOCH_OBJECTS) {
++ av_log(avctx, AV_LOG_ERROR, "Too many objects in epoch\n");
++ return AVERROR_INVALIDDATA;
++ }
++ object = &ctx->objects.object[ctx->objects.count++];
++ object->id = id;
++ }
++
++ /* skip object version number */
++ buf += 1;
+ 
+ /* Read the Sequence Description to determine if start of RLE data or appended to previous RLE */
+ sequence_desc = bytestream_get_byte(&buf);
+ 
+ if (!(sequence_desc & 0x80)) {
+ /* Additional RLE data */
+- if (buf_size > ctx->picture.rle_remaining_len)
+- return -1;
++ if (buf_size > object->rle_remaining_len)
++ return AVERROR_INVALIDDATA;
+ 
+- memcpy(ctx->picture.rle + ctx->picture.rle_data_len, buf, buf_size);
+- ctx->picture.rle_data_len += buf_size;
+- ctx->picture.rle_remaining_len -= buf_size;
++ memcpy(object->rle + object->rle_data_len, buf, buf_size);
++ object->rle_data_len += buf_size;
++ object->rle_remaining_len -= buf_size;
+ 
+ return 0;
+ }
+ 
+ if (buf_size <= 7)
+- return -1;
++ return AVERROR_INVALIDDATA;
+ buf_size -= 7;
+ 
+ /* Decode rle bitmap length, stored size includes width/height data */
+@@ -203,20 +282,20 @@ static int parse_picture_segment(AVCodecContext *avctx,
+ /* Make sure the bitmap is not too large */
+ if (avctx->width < width || avctx->height < height) {
+ av_log(avctx, AV_LOG_ERROR, "Bitmap dimensions larger than video.\n");
+- return -1;
++ return AVERROR_INVALIDDATA;
+ }
+ 
+- ctx->picture.w = width;
+- ctx->picture.h = height;
++ object->w = width;
++ object->h = height;
+ 
+- av_fast_malloc(&ctx->picture.rle, &ctx->picture.rle_buffer_size, rle_bitmap_len);
++ av_fast_malloc(&object->rle, &object->rle_buffer_size, rle_bitmap_len);
+ 
+- if (!ctx->picture.rle)
+- return -1;
++ if (!object->rle)
++ return AVERROR(ENOMEM);
+ 
+- memcpy(ctx->picture.rle, buf, buf_size);
+- ctx->picture.rle_data_len = buf_size;
+- ctx->picture.rle_remaining_len = rle_bitmap_len - buf_size;
++ memcpy(object->rle, buf, buf_size);
++ object->rle_data_len = buf_size;
++ object->rle_remaining_len = rle_bitmap_len - buf_size;
+ 
+ return 0;
+ }
+@@ -231,19 +310,32 @@ static int parse_picture_segment(AVCodecContext *avctx,
+ * @param buf pointer to the packet to process
+ * @param buf_size size of packet to process
+ */
+-static void parse_palette_segment(AVCodecContext *avctx,
++static int parse_palette_segment(AVCodecContext *avctx,
+ const uint8_t *buf, int buf_size)
+ {
+ PGSSubContext *ctx = avctx->priv_data;
++ PGSSubPalette *palette;
+ 
+ const uint8_t *buf_end = buf + buf_size;
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ int color_id;
+ int y, cb, cr, alpha;
+ int r, g, b, r_add, g_add, b_add;
++ int id;
++
++ id = bytestream_get_byte(&buf);
++ palette = find_palette(id, &ctx->palettes);
++ if (!palette) {
++ if (ctx->palettes.count >= MAX_EPOCH_PALETTES) {
++ av_log(avctx, AV_LOG_ERROR, "Too many palettes in epoch\n");
++ return AVERROR_INVALIDDATA;
++ }
++ palette = &ctx->palettes.palette[ctx->palettes.count++];
++ palette->id = id;
++ }
+ 
+- /* Skip two null bytes */
+- buf += 2;
++ /* Skip palette version */
++ buf += 1;
+ 
+ while (buf < buf_end) {
+ color_id = bytestream_get_byte(&buf);
+@@ -258,8 +350,9 @@ static void parse_palette_segment(AVCodecContext *avctx,
+ av_dlog(avctx, "Color %d := (%d,%d,%d,%d)\n", color_id, r, g, b, alpha);
+ 
+ /* Store color in palette */
+- ctx->clut[color_id] = RGBA(r,g,b,alpha);
++ palette->clut[color_id] = RGBA(r,g,b,alpha);
+ }
++ return 0;
+ }
+ 
+ /**
+@@ -272,7 +365,6 @@ static void parse_palette_segment(AVCodecContext *avctx,
+ * @param buf pointer to the packet to process
+ * @param buf_size size of packet to process
+ * @todo TODO: Implement cropping
+- * @todo TODO: Implement forcing of subtitles
+ */
+ static int parse_presentation_segment(AVCodecContext *avctx,
+ const uint8_t *buf, int buf_size,
+@@ -280,8 +372,9 @@ static int parse_presentation_segment(AVCodecContext *avctx,
+ {
+ PGSSubContext *ctx = avctx->priv_data;
+ 
+- int x, y, ret;
++ int i, state, ret;
+ 
++ // Video descriptor
+ int w = bytestream_get_be16(&buf);
+ int h = bytestream_get_be16(&buf);
+ 
+@@ -293,49 +386,75 @@ static int parse_presentation_segment(AVCodecContext *avctx,
+ if (ret < 0)
+ return ret;
+ 
+- /* Skip 1 bytes of unknown, frame rate? */
++ /* Skip 1 bytes of unknown, frame rate */
+ buf++;
+ 
++ // Composition descriptor
+ ctx->presentation.id_number = bytestream_get_be16(&buf);
+-
+ /*
+- * Skip 3 bytes of unknown:
+- * state
+- * palette_update_flag (0x80),
+- * palette_id_to_use,
++ * state is a 2 bit field that defines pgs epoch boundaries
++ * 00 - Normal, previously defined objects and palettes are still valid
++ * 01 - Acquisition point, previous objects and palettes can be released
++ * 10 - Epoch start, previous objects and palettes can be released
++ * 11 - Epoch continue, previous objects and palettes can be released
++ *
++ * reserved 6 bits discarded
+ */
+- buf += 3;
+-
+- ctx->presentation.object_number = bytestream_get_byte(&buf);
+- ctx->presentation.composition_flag = 0;
+- if (!ctx->presentation.object_number)
+- return 0;
++ state = bytestream_get_byte(&buf) >> 6;
++ if (state != 0) {
++ flush_cache(avctx);
++ }
+ 
+ /*
+- * Skip 3 bytes of unknown:
+- * object_id_ref (2 bytes),
+- * window_id_ref,
++ * skip palette_update_flag (0x80),
+ */
+- buf += 3;
+- ctx->presentation.composition_flag = bytestream_get_byte(&buf);
+-
+- x = bytestream_get_be16(&buf);
+- y = bytestream_get_be16(&buf);
+-
+- /* TODO If cropping, cropping_x, cropping_y, cropping_width, cropping_height (all 2 bytes).*/
++ buf += 1;
++ ctx->presentation.palette_id = bytestream_get_byte(&buf);
++ ctx->presentation.object_count = bytestream_get_byte(&buf);
++ if (ctx->presentation.object_count > MAX_OBJECT_REFS) {
++ av_log(avctx, AV_LOG_ERROR,
++ "Invalid number of presentation objects %d\n",
++ ctx->presentation.object_count);
++ ctx->presentation.object_count = 2;
++ if (avctx->err_recognition & AV_EF_EXPLODE) {
++ return AVERROR_INVALIDDATA;
++ }
++ }
+ 
+- av_dlog(avctx, "Subtitle Placement x=%d, y=%d\n", x, y);
++ for (i = 0; i < ctx->presentation.object_count; i++)
++ {
++ ctx->presentation.objects[i].id = bytestream_get_be16(&buf);
++ ctx->presentation.objects[i].window_id = bytestream_get_byte(&buf);
++ ctx->presentation.objects[i].composition_flag = bytestream_get_byte(&buf);
++
++ ctx->presentation.objects[i].x = bytestream_get_be16(&buf);
++ ctx->presentation.objects[i].y = bytestream_get_be16(&buf);
++
++ // If cropping
++ if (ctx->presentation.objects[i].composition_flag & 0x80) {
++ ctx->presentation.objects[i].crop_x = bytestream_get_be16(&buf);
++ ctx->presentation.objects[i].crop_y = bytestream_get_be16(&buf);
++ ctx->presentation.objects[i].crop_w = bytestream_get_be16(&buf);
++ ctx->presentation.objects[i].crop_h = bytestream_get_be16(&buf);
++ }
+ 
+- if (x > avctx->width || y > avctx->height) {
+- av_log(avctx, AV_LOG_ERROR, "Subtitle out of video bounds. x = %d, y = %d, video width = %d, video height = %d.\n",
+- x, y, avctx->width, avctx->height);
+- x = 0; y = 0;
++ av_dlog(avctx, "Subtitle Placement x=%d, y=%d\n",
++ ctx->presentation.objects[i].x, ctx->presentation.objects[i].y);
++
++ if (ctx->presentation.objects[i].x > avctx->width ||
++ ctx->presentation.objects[i].y > avctx->height) {
++ av_log(avctx, AV_LOG_ERROR, "Subtitle out of video bounds. x = %d, y = %d, video width = %d, video height = %d.\n",
++ ctx->presentation.objects[i].x,
++ ctx->presentation.objects[i].y,
++ avctx->width, avctx->height);
++ ctx->presentation.objects[i].x = 0;
++ ctx->presentation.objects[i].y = 0;
++ if (avctx->err_recognition & AV_EF_EXPLODE) {
++ return AVERROR_INVALIDDATA;
++ }
++ }
+ }
+ 
+- /* Fill in dimensions */
+- ctx->presentation.x = x;
+- ctx->presentation.y = y;
+-
+ return 0;
+ }
+ 
+@@ -348,64 +467,105 @@ static int parse_presentation_segment(AVCodecContext *avctx,
+ * @param data pointer to the data pertaining the subtitle to display
+ * @param buf pointer to the packet to process
+ * @param buf_size size of packet to process
+- * @todo TODO: Fix start time, relies on correct PTS, currently too late
+- *
+- * @todo TODO: Fix end time, normally cleared by a second display
+- * @todo segment, which is currently ignored as it clears
+- * @todo the subtitle too early.
+ */
+ static int display_end_segment(AVCodecContext *avctx, void *data,
+ const uint8_t *buf, int buf_size)
+ {
+ AVSubtitle *sub = data;
+ PGSSubContext *ctx = avctx->priv_data;
+-
+- /*
+- * The end display time is a timeout value and is only reached
+- * if the next subtitle is later then timeout or subtitle has
+- * not been cleared by a subsequent empty display command.
+- */
++ PGSSubPalette *palette;
++ int i, ret;
+ 
+ memset(sub, 0, sizeof(*sub));
+ sub->pts = ctx->presentation.pts;
+-
+- // Blank if last object_number was 0.
+- // Note that this may be wrong for more complex subtitles.
+- if (!ctx->presentation.object_number)
+- return 1;
+ sub->start_display_time = 0;
+- sub->end_display_time = 20000;
++ // There is no explicit end time for PGS subtitles. The end time
++ // is defined by the start of the next sub which may contain no
++ // objects (i.e. clears the previous sub)
++ sub->end_display_time = UINT32_MAX;
+ sub->format = 0;
+ 
+- sub->rects = av_mallocz(sizeof(*sub->rects));
+- sub->rects[0] = av_mallocz(sizeof(*sub->rects[0]));
+- sub->num_rects = 1;
+-
+- if (ctx->presentation.composition_flag & 0x40)
+- sub->rects[0]->flags |= AV_SUBTITLE_FLAG_FORCED;
++ // Blank if last object_count was 0.
++ if (!ctx->presentation.object_count)
++ return 1;
++ sub->rects = av_mallocz(sizeof(*sub->rects) * ctx->presentation.object_count);
++ if (!sub->rects) {
++ return AVERROR(ENOMEM);
++ }
++ palette = find_palette(ctx->presentation.palette_id, &ctx->palettes);
++ if (!palette) {
++ // Missing palette. Should only happen with damaged streams.
++ av_log(avctx, AV_LOG_ERROR, "Invalid palette id %d\n",
++ ctx->presentation.palette_id);
++ avsubtitle_free(sub);
++ return AVERROR_INVALIDDATA;
++ }
++ for (i = 0; i < ctx->presentation.object_count; i++) {
++ PGSSubObject *object;
+ 
+- sub->rects[0]->x = ctx->presentation.x;
+- sub->rects[0]->y = ctx->presentation.y;
+- sub->rects[0]->w = ctx->picture.w;
+- sub->rects[0]->h = ctx->picture.h;
+- sub->rects[0]->type = SUBTITLE_BITMAP;
++ sub->rects[i] = av_mallocz(sizeof(*sub->rects[0]));
++ if (!sub->rects[i]) {
++ avsubtitle_free(sub);
++ return AVERROR(ENOMEM);
++ }
++ sub->num_rects++;
++ sub->rects[i]->type = SUBTITLE_BITMAP;
++
++ /* Process bitmap */
++ object = find_object(ctx->presentation.objects[i].id, &ctx->objects);
++ if (!object) {
++ // Missing object. Should only happen with damaged streams.
++ av_log(avctx, AV_LOG_ERROR, "Invalid object id %d\n",
++ ctx->presentation.objects[i].id);
++ if (avctx->err_recognition & AV_EF_EXPLODE) {
++ avsubtitle_free(sub);
++ return AVERROR_INVALIDDATA;
++ }
++ // Leaves rect empty with 0 width and height.
++ continue;
++ }
++ if (ctx->presentation.objects[i].composition_flag & 0x40)
++ sub->rects[i]->flags |= AV_SUBTITLE_FLAG_FORCED;
++
++ sub->rects[i]->x = ctx->presentation.objects[i].x;
++ sub->rects[i]->y = ctx->presentation.objects[i].y;
++ sub->rects[i]->w = object->w;
++ sub->rects[i]->h = object->h;
++
++ sub->rects[i]->pict.linesize[0] = object->w;
++
++ if (object->rle) {
++ if (object->rle_remaining_len) {
++ av_log(avctx, AV_LOG_ERROR, "RLE data length %u is %u bytes shorter than expected\n",
++ object->rle_data_len, object->rle_remaining_len);
++ if (avctx->err_recognition & AV_EF_EXPLODE) {
++ avsubtitle_free(sub);
++ return AVERROR_INVALIDDATA;
++ }
++ }
++ ret = decode_rle(avctx, sub->rects[i], object->rle, object->rle_data_len);
++ if (ret < 0) {
++ if ((avctx->err_recognition & AV_EF_EXPLODE) ||
++ ret == AVERROR(ENOMEM)) {
++ avsubtitle_free(sub);
++ return ret;
++ }
++ sub->rects[i]->w = 0;
++ sub->rects[i]->h = 0;
++ continue;
++ }
++ }
++ /* Allocate memory for colors */
++ sub->rects[i]->nb_colors = 256;
++ sub->rects[i]->pict.data[1] = av_mallocz(AVPALETTE_SIZE);
++ if (!sub->rects[i]->pict.data[1]) {
++ avsubtitle_free(sub);
++ return AVERROR(ENOMEM);
++ }
+ 
+- /* Process bitmap */
+- sub->rects[0]->pict.linesize[0] = ctx->picture.w;
++ memcpy(sub->rects[i]->pict.data[1], palette->clut, sub->rects[i]->nb_colors * sizeof(uint32_t));
+ 
+- if (ctx->picture.rle) {
+- if (ctx->picture.rle_remaining_len)
+- av_log(avctx, AV_LOG_ERROR, "RLE data length %u is %u bytes shorter than expected\n",
+- ctx->picture.rle_data_len, ctx->picture.rle_remaining_len);
+- if(decode_rle(avctx, sub, ctx->picture.rle, ctx->picture.rle_data_len) < 0)
+- return 0;
+ }
+- /* Allocate memory for colors */
+- sub->rects[0]->nb_colors = 256;
+- sub->rects[0]->pict.data[1] = av_mallocz(AVPALETTE_SIZE);
+-
+- memcpy(sub->rects[0]->pict.data[1], ctx->clut, sub->rects[0]->nb_colors * sizeof(uint32_t));
+-
+ return 1;
+ }
+ 
+@@ -449,17 +609,16 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size,
+ if (segment_type != DISPLAY_SEGMENT && segment_length > buf_end - buf)
+ break;
+ 
++ ret = 0;
+ switch (segment_type) {
+ case PALETTE_SEGMENT:
+- parse_palette_segment(avctx, buf, segment_length);
++ ret = parse_palette_segment(avctx, buf, segment_length);
+ break;
+- case PICTURE_SEGMENT:
+- parse_picture_segment(avctx, buf, segment_length);
++ case OBJECT_SEGMENT:
++ ret = parse_object_segment(avctx, buf, segment_length);
+ break;
+ case PRESENTATION_SEGMENT:
+ ret = parse_presentation_segment(avctx, buf, segment_length, avpkt->pts);
+- if (ret < 0)
+- return ret;
+ break;
+ case WINDOW_SEGMENT:
+ /*
+@@ -472,13 +631,18 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size,
+ */
+ break;
+ case DISPLAY_SEGMENT:
+- *data_size = display_end_segment(avctx, data, buf, segment_length);
++ ret = display_end_segment(avctx, data, buf, segment_length);
++ if (ret >= 0)
++ *data_size = ret;
+ break;
+ default:
+ av_log(avctx, AV_LOG_ERROR, "Unknown subtitle segment type 0x%x, length %d\n",
+ segment_type, segment_length);
++ ret = AVERROR_INVALIDDATA;
+ break;
+ }
++ if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE))
++ return ret;
+ 
+ buf += segment_length;
+ }
+-- 
+1.9.3
+

HandBrake-0.10.0.tar.bz2/contrib/ffmpeg/A02-disable-nero-chpl.patch Added

@@ -0,0 +1,65 @@
+From 189f0b725a268374647d251f8732b51dd29d4b15 Mon Sep 17 00:00:00 2001
+From: John Stebbins <stebbins@jetheaddev.com>
+Date: Mon, 4 Aug 2014 08:32:56 -0700
+Subject: [PATCH] movenc: Add option to disable nero chapters
+
+And add flag to muxer documentation.
+Nero chapters break some taggers (mp3tag and iTunes).
+---
+ doc/muxers.texi | 5 +++++
+ libavformat/movenc.c | 3 ++-
+ libavformat/movenc.h | 1 +
+ 3 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/doc/muxers.texi b/doc/muxers.texi
+index 0ca8d3f..54109c7 100644
+--- a/doc/muxers.texi
++++ b/doc/muxers.texi
+@@ -330,6 +330,11 @@ This option is implicitly set when writing ismv (Smooth Streaming) files.
+ Run a second pass moving the index (moov atom) to the beginning of the file.
+ This operation can take a while, and will not work in various situations such
+ as fragmented output, thus it is not enabled by default.
++@item -movflags disable_chpl
++Disable Nero chapter markers (chpl atom). Normally, both Nero chapters
++and a QuickTime chapter track are written to the file. With this option
++set, only the QuickTime chapter track will be written. Nero chapters can
++cause failures when the file is reprocessed with certain tagging programs.
+ @end table
+ 
+ Smooth Streaming content can be pushed in real time to a publishing
+diff --git a/libavformat/movenc.c b/libavformat/movenc.c
+index f16e851..73a78d8 100644
+--- a/libavformat/movenc.c
++++ b/libavformat/movenc.c
+@@ -57,6 +57,7 @@ static const AVOption options[] = {
+ { "isml", "Create a live smooth streaming feed (for pushing to a publishing point)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_ISML}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },
+ { "faststart", "Run a second pass to put the index (moov atom) at the beginning of the file", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_FASTSTART}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },
+ { "omit_tfhd_offset", "Omit the base data offset in tfhd atoms", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_OMIT_TFHD_OFFSET}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },
++ { "disable_chpl", "Disable Nero chapter atom", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_DISABLE_CHPL}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },
+ FF_RTP_FLAG_OPTS(MOVMuxContext, rtp_flags),
+ { "skip_iods", "Skip writing iods atom.", offsetof(MOVMuxContext, iods_skip), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
+ { "iods_audio_profile", "iods audio profile atom.", offsetof(MOVMuxContext, iods_audio_profile), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 255, AV_OPT_FLAG_ENCODING_PARAM},
+@@ -2076,7 +2077,7 @@ static int mov_write_udta_tag(AVIOContext *pb, MOVMuxContext *mov,
+ mov_write_meta_tag(pb_buf, mov, s);
+ }
+ 
+- if (s->nb_chapters)
++ if (s->nb_chapters && !(mov->flags & FF_MOV_FLAG_DISABLE_CHPL))
+ mov_write_chpl_tag(pb_buf, s);
+ 
+ if ((size = avio_close_dyn_buf(pb_buf, &buf)) > 0) {
+diff --git a/libavformat/movenc.h b/libavformat/movenc.h
+index 35be781..0d3eb34 100644
+--- a/libavformat/movenc.h
++++ b/libavformat/movenc.h
+@@ -175,6 +175,7 @@ typedef struct MOVMuxContext {
+ #define FF_MOV_FLAG_ISML 64
+ #define FF_MOV_FLAG_FASTSTART 128
+ #define FF_MOV_FLAG_OMIT_TFHD_OFFSET 256
++#define FF_MOV_FLAG_DISABLE_CHPL 512
+ 
+ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt);
+ 
+-- 
+1.9.3
+

HandBrake-0.10.0.tar.bz2/contrib/ffmpeg/A03-mp4-track-title.patch Added

@@ -0,0 +1,133 @@
+diff --git a/libavformat/movenc.c b/libavformat/movenc.c
+index 0c688f6..f89b630 100644
+--- a/libavformat/movenc.c
++++ b/libavformat/movenc.c
+@@ -76,6 +76,17 @@ static const AVClass flavor ## _muxer_class = {\
+ .version = LIBAVUTIL_VERSION_INT,\
+ };
+ 
++static int utf8len(const uint8_t *b)
++{
++ int len = 0;
++ int val;
++ while (*b) {
++ GET_UTF8(val, *b++, return -1;)
++ len++;
++ }
++ return len;
++}
++
+ //FIXME support 64 bit variant with wide placeholders
+ static int64_t update_size(AVIOContext *pb, int64_t pos)
+ {
+@@ -1325,6 +1336,15 @@ static int mov_write_hdlr_tag(AVIOContext *pb, MOVTrack *track)
+ "Unknown hldr_type for %s / 0x%04X, writing dummy values\n",
+ tag_buf, track->enc->codec_tag);
+ }
++ if (track->st) {
++ // hdlr.name is used by some players to identify the content title
++ // of the track. So if an alternate handler description is
++ // specified, use it.
++ AVDictionaryEntry *t;
++ t = av_dict_get(track->st->metadata, "handler", NULL, 0);
++ if (t && utf8len(t->value))
++ descr = t->value;
++ }
+ }
+ 
+ avio_wb32(pb, 0); /* size */
+@@ -1623,6 +1643,47 @@ static int mov_write_udta_sdp(AVIOContext *pb, MOVTrack *track)
+ return len + 24;
+ }
+ 
++static int mov_write_track_metadata(AVIOContext *pb, AVStream *st,
++ const char *tag, const char *str)
++{
++ int64_t pos = avio_tell(pb);
++ AVDictionaryEntry *t = av_dict_get(st->metadata, str, NULL, 0);
++ if (!t || !utf8len(t->value))
++ return 0;
++
++ avio_wb32(pb, 0); /* size */
++ ffio_wfourcc(pb, tag); /* type */
++ avio_write(pb, t->value, strlen(t->value)); /* UTF8 string value */
++ return update_size(pb, pos);
++}
++
++static int mov_write_track_udta_tag(AVIOContext *pb, MOVMuxContext *mov,
++ AVStream *st)
++{
++ AVIOContext *pb_buf;
++ int ret, size;
++ uint8_t *buf;
++
++ if (st == NULL)
++ return 0;
++
++ ret = avio_open_dyn_buf(&pb_buf);
++ if (ret < 0)
++ return ret;
++
++ if (mov->mode & MODE_MP4)
++ mov_write_track_metadata(pb_buf, st, "name", "title");
++
++ if ((size = avio_close_dyn_buf(pb_buf, &buf)) > 0) {
++ avio_wb32(pb, size + 8);
++ ffio_wfourcc(pb, "udta");
++ avio_write(pb, buf, size);
++ }
++ av_free(buf);
++
++ return 0;
++}
++
+ static int mov_write_trak_tag(AVIOContext *pb, MOVMuxContext *mov,
+ MOVTrack *track, AVStream *st)
+ {
+@@ -1647,6 +1708,7 @@ static int mov_write_trak_tag(AVIOContext *pb, MOVMuxContext *mov,
+ if (0.0 != sample_aspect_ratio && 1.0 != sample_aspect_ratio)
+ mov_write_tapt_tag(pb, track);
+ }
++ mov_write_track_udta_tag(pb, mov, st);
+ return update_size(pb, pos);
+ }
+ 
+@@ -1904,17 +1966,6 @@ static int mov_write_meta_tag(AVIOContext *pb, MOVMuxContext *mov,
+ return size;
+ }
+ 
+-static int utf8len(const uint8_t *b)
+-{
+- int len = 0;
+- int val;
+- while (*b) {
+- GET_UTF8(val, *b++, return -1;)
+- len++;
+- }
+- return len;
+-}
+-
+ static int ascii_to_wc(AVIOContext *pb, const uint8_t *b)
+ {
+ int val;
+@@ -3266,6 +3317,7 @@ static int mov_write_header(AVFormatContext *s)
+ MOVTrack *track= &mov->tracks[i];
+ AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL,0);
+ 
++ track->st = st;
+ track->enc = st->codec;
+ track->language = ff_mov_iso639_to_lang(lang?lang->value:"und", mov->mode!=MODE_MOV);
+ if (track->language < 0)
+diff --git a/libavformat/movenc.h b/libavformat/movenc.h
+index 226a28f..687299e 100644
+--- a/libavformat/movenc.h
++++ b/libavformat/movenc.h
+@@ -133,6 +133,8 @@ typedef struct MOVTrack {
+ int packet_entry;
+ int slices;
+ } vc1_info;
++
++ AVStream *st;
+ } MOVTrack;
+ 
+ typedef struct MOVMuxContext {

HandBrake-0.10.0.tar.bz2/contrib/ffmpeg/A04-mp4-chap-char-encoding.patch Added

@@ -0,0 +1,37 @@
+From bfdfd6c70e717c0ef8a89327931e8905f95eba7c Mon Sep 17 00:00:00 2001
+From: John Stebbins <stebbins@jetheaddev.com>
+Date: Thu, 31 Jul 2014 11:51:40 -0700
+Subject: [PATCH 3/3] movenc: fix QT chapter track character encoding
+
+An encoding ("encd") box is required to tell QT that the string is UTF8
+---
+ libavformat/movenc.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/libavformat/movenc.c b/libavformat/movenc.c
+index c9b0f6e..4d487e9 100644
+--- a/libavformat/movenc.c
++++ b/libavformat/movenc.c
+@@ -3196,13 +3196,18 @@ static int mov_create_chapter_track(AVFormatContext *s, int tracknum)
+ pkt.duration = end - pkt.dts;
+ 
+ if ((t = av_dict_get(c->metadata, "title", NULL, 0))) {
++ const char encd[12] = {
++ 0x00, 0x00, 0x00, 0x0C,
++ 'e', 'n', 'c', 'd',
++ 0x00, 0x00, 0x01, 0x00 };
+ len = strlen(t->value);
+- pkt.size = len + 2;
++ pkt.size = len + 2 + 12;
+ pkt.data = av_malloc(pkt.size);
+ if (!pkt.data)
+ return AVERROR(ENOMEM);
+ AV_WB16(pkt.data, len);
+ memcpy(pkt.data + 2, t->value, len);
++ memcpy(pkt.data + len + 2, encd, sizeof(encd));
+ ff_mov_write_packet(s, &pkt);
+ av_freep(&pkt.data);
+ }
+-- 
+1.9.3
+

HandBrake-0.10.0.tar.bz2/contrib/ffmpeg/A05-mpeg4-initialization.patch Added

@@ -0,0 +1,41 @@
+diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
+index f6c79af..70522ee 100644
+--- a/libavcodec/h263dec.c
++++ b/libavcodec/h263dec.c
+@@ -414,17 +414,7 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
+ 
+ if (!s->context_initialized)
+ // 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,
+- * otherwise we cannot store anyting 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];
+- }
++ ff_dsputil_init(&s->dsp, avctx);
+ 
+ /* let's go :-) */
+ if (CONFIG_WMV2_DECODER && s->msmpeg4_version == 5) {
+@@ -459,6 +449,17 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
+ return ret;
+ }
+ 
++ if (!s->context_initialized)
++ if ((ret = ff_MPV_common_init(s)) < 0)
++ return ret;
++
++ 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];
++ }
++
+ avctx->has_b_frames = !s->low_delay;
+ 
+ #define SET_QPEL_FUNC(postfix1, postfix2) \

HandBrake-0.10.0.tar.bz2/contrib/ffmpeg/A06-frame-threading-state.patch Added

@@ -0,0 +1,110 @@
+Received: from oboro.libav.org (77.109.144.72) by cas.jetheaddev.com
+ (192.168.13.27) with Microsoft SMTP Server id 14.3.195.1; Fri, 22 Aug 2014
+ 04:13:09 -0700
+Received: from oboro.libav.org (localhost [127.0.0.1])	by oboro.libav.org
+ (Postfix) with ESMTP id 54F155DBA3;	Fri, 22 Aug 2014 13:13:06 +0200 (CEST)
+X-Original-To: libav-commits@libav.org
+Delivered-To: libav-commits@libav.org
+Received: from localhost (localhost [127.0.0.1]) by oboro.libav.org (Postfix)
+ with ESMTP id A5E705DBA3 for <libav-commits@libav.org>; Fri, 22 Aug 2014
+ 13:13:04 +0200 (CEST)
+Received: from oboro.libav.org ([127.0.0.1]) by localhost (oboro.libav.org
+ [127.0.0.1]) (amavisd-new, port 10024) with LMTP id q_DABqtOoALY for
+ <libav-commits@libav.org>; Fri, 22 Aug 2014 13:13:04 +0200 (CEST)
+Received: from aruru.libav.org (aruru.libav.org [77.109.144.70]) by
+ oboro.libav.org (Postfix) with ESMTP id 8C8AA5DB88 for
+ <libav-commits@libav.org>; Fri, 22 Aug 2014 13:13:04 +0200 (CEST)
+Received: by aruru.libav.org (Postfix, from userid 106) id 8436F5DD71; Fri, 22
+ Aug 2014 13:13:04 +0200 (CEST)
+To: <libav-commits@libav.org>
+From: "Janne Grunau " <git@libav.org>
+Message-ID: <20140822111304.8436F5DD71@aruru.libav.org>
+Date: Fri, 22 Aug 2014 13:13:04 +0200
+Subject: [libav-commits] rv34: use ff_mpeg_update_thread_context only when
+	decoder is fully initialized
+X-BeenThere: libav-commits@libav.org
+X-Mailman-Version: 2.1.15
+Precedence: list
+Reply-To: <libav-devel@libav.org>
+List-Id: libav commit notifications <libav-commits.libav.org>
+List-Unsubscribe: <https://lists.libav.org/mailman/options/libav-commits>,
+ <mailto:libav-commits-request@libav.org?subject=unsubscribe>
+List-Archive: <http://lists.libav.org/pipermail/libav-commits/>
+List-Post: <mailto:libav-commits@libav.org>
+List-Help: <mailto:libav-commits-request@libav.org?subject=help>
+List-Subscribe: <https://lists.libav.org/mailman/listinfo/libav-commits>,
+ <mailto:libav-commits-request@libav.org?subject=subscribe>
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+Errors-To: libav-commits-bounces@libav.org
+Sender: libav-commits <libav-commits-bounces@libav.org>
+Return-Path: libav-commits-bounces@libav.org
+X-MS-Exchange-Organization-AuthSource: cas.jetheaddev.com
+X-MS-Exchange-Organization-AuthAs: Anonymous
+X-MS-Exchange-Organization-PRD: libav.org
+X-MS-Exchange-Organization-SenderIdResult: None
+Received-SPF: None (cas.jetheaddev.com: libav-commits-bounces@libav.org does
+ not designate permitted sender hosts)
+X-MS-Exchange-Organization-SCL: 0
+X-MS-Exchange-Organization-PCL: 2
+X-MS-Exchange-Organization-Antispam-Report: DV:3.3.14004.476;SID:SenderIDStatus None;OrigIP:77.109.144.72
+MIME-Version: 1.0
+
+Module: libav
+Branch: master
+Commit: dc4b2e7d33903a6b9380e8a84b22b3a20facbb08
+
+Author: Janne Grunau <janne-libav@jannau.net>
+Committer: Janne Grunau <janne-libav@jannau.net>
+Date: Thu Aug 21 13:26:33 2014 +0200
+
+rv34: use ff_mpeg_update_thread_context only when decoder is fully initialized
+
+MpegEncContext based decoders are only fully initialized after the first
+ff_thread_get_buffer() call. The RV30/40 decoders may fail before a frame
+buffer was requested. ff_mpeg_update_thread_context() fails on half
+initialized MpegEncContexts. Since this can only happen before a the
+first frame was decoded there is no need to call
+ff_mpeg_update_thread_context().
+
+Based on patches by John Stebbins and tested by John Stebbins.
+
+CC: libav-stable@libav.org
+
+---
+
+ libavcodec/rv34.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
+index 4ed2a33..26ab7e4 100644
+--- a/libavcodec/rv34.c
++++ b/libavcodec/rv34.c
+@@ -1555,16 +1555,18 @@ int ff_rv34_decode_update_thread_context(AVCodecContext *dst, const AVCodecConte
+ return err;
+ }
+ 
+- if ((err = ff_mpeg_update_thread_context(dst, src)))
+- return err;
+-
+ r->cur_pts = r1->cur_pts;
+ r->last_pts = r1->last_pts;
+ r->next_pts = r1->next_pts;
+ 
+ memset(&r->si, 0, sizeof(r->si));
+ 
+- return 0;
++ // Do no call ff_mpeg_update_thread_context on a partially initialized
++ // decoder context.
++ if (!s1->linesize)
++ return 0;
++
++ return ff_mpeg_update_thread_context(dst, src);
+ }
+ 
+ static int get_slice_offset(AVCodecContext *avctx, const uint8_t *buf, int n)
+
+_______________________________________________
+libav-commits mailing list
+libav-commits@libav.org
+https://lists.libav.org/mailman/listinfo/libav-commits

HandBrake-0.10.0.tar.bz2/contrib/ffmpeg/A07-movenc-Add-dvd-subtitle-support.patch Added

@@ -0,0 +1,142 @@
+From 6adf3bc42e36242d487636786e995149bbb849fe Mon Sep 17 00:00:00 2001
+From: John Stebbins <stebbins@jetheaddev.com>
+Date: Tue, 18 Mar 2014 08:50:25 -0600
+Subject: [PATCH] movenc: Add dvd subtitle support
+
+Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
+---
+ libavformat/movenc.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 78 insertions(+), 5 deletions(-)
+
+diff --git a/libavformat/movenc.c b/libavformat/movenc.c
+index 0c688f6..a6a55d5 100644
+--- a/libavformat/movenc.c
++++ b/libavformat/movenc.c
+@@ -309,7 +309,9 @@ static int mov_write_esds_tag(AVIOContext *pb, MOVTrack *track) // Basic
+ 
+ // the following fields is made of 6 bits to identify the streamtype (4 for video, 5 for audio)
+ // plus 1 bit to indicate upstream and 1 bit set to 1 (reserved)
+- if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO)
++ if (track->enc->codec_id == AV_CODEC_ID_DVD_SUBTITLE)
++ avio_w8(pb, (0x38 << 2) | 1); // flags (= NeroSubpicStream)
++ else if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO)
+ avio_w8(pb, 0x15); // flags (= Audiostream)
+ else
+ avio_w8(pb, 0x11); // flags (= Visualstream)
+@@ -760,6 +762,7 @@ static int mp4_get_codec_tag(AVFormatContext *s, MOVTrack *track)
+ else if (track->enc->codec_id == AV_CODEC_ID_VC1) tag = MKTAG('v','c','-','1');
+ else if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO) tag = MKTAG('m','p','4','v');
+ else if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO) tag = MKTAG('m','p','4','a');
++ else if (track->enc->codec_id == AV_CODEC_ID_DVD_SUBTITLE) tag = MKTAG('m','p','4','s');
+ 
+ return tag;
+ }
+@@ -976,7 +979,9 @@ static int mov_write_subtitle_tag(AVIOContext *pb, MOVTrack *track)
+ avio_wb16(pb, 0); /* Reserved */
+ avio_wb16(pb, 1); /* Data-reference index */
+ 
+- if (track->enc->extradata_size)
++ if (track->enc->codec_id == AV_CODEC_ID_DVD_SUBTITLE)
++ mov_write_esds_tag(pb, track);
++ else if (track->enc->extradata_size)
+ avio_write(pb, track->enc->extradata, track->enc->extradata_size);
+ 
+ return update_size(pb, pos);
+@@ -1308,6 +1313,7 @@ static int mov_write_hdlr_tag(AVIOContext *pb, MOVTrack *track)
+ descr = "SoundHandler";
+ } else if (track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE) {
+ if (track->tag == MKTAG('t','x','3','g')) hdlr_type = "sbtl";
++ if (track->tag == MKTAG('m','p','4','s')) hdlr_type = "subp";
+ else hdlr_type = "text";
+ descr = "SubtitleHandler";
+ } else if (track->enc->codec_tag == MKTAG('r','t','p',' ')) {
+@@ -3178,6 +3184,69 @@ static void mov_free(AVFormatContext *s)
+ av_freep(&mov->tracks);
+ }
+ 
++static uint32_t rgb_to_yuv(uint32_t rgb)
++{
++ uint8_t r, g, b;
++ int y, cb, cr;
++
++ r = (rgb >> 16) & 0xFF;
++ g = (rgb >> 8) & 0xFF;
++ b = (rgb ) & 0xFF;
++
++ y = av_clip_uint8( 16. + 0.257 * r + 0.504 * g + 0.098 * b);
++ cb = av_clip_uint8(128. - 0.148 * r - 0.291 * g + 0.439 * b);
++ cr = av_clip_uint8(128. + 0.439 * r - 0.368 * g - 0.071 * b);
++
++ return (y << 16) | (cr << 8) | cb;
++}
++
++static int mov_create_dvd_sub_decoder_specific_info(MOVTrack *track,
++ AVStream *st)
++{
++ int i, width = 720, height = 480;
++ int have_palette = 0, have_size = 0;
++ uint32_t palette[16];
++ char *cur = st->codec->extradata;
++
++ while (cur && *cur) {
++ if (strncmp("palette:", cur, 8) == 0) {
++ int i, count;
++ count = sscanf(cur + 8,
++ "%06x, %06x, %06x, %06x, %06x, %06x, %06x, %06x, "
++ "%06x, %06x, %06x, %06x, %06x, %06x, %06x, %06x",
++ &palette[ 0], &palette[ 1], &palette[ 2], &palette[ 3],
++ &palette[ 4], &palette[ 5], &palette[ 6], &palette[ 7],
++ &palette[ 8], &palette[ 9], &palette[10], &palette[11],
++ &palette[12], &palette[13], &palette[14], &palette[15]);
++
++ for (i = 0; i < count; i++) {
++ palette[i] = rgb_to_yuv(palette[i]);
++ }
++ have_palette = 1;
++ } else if (!strncmp("size:", cur, 5)) {
++ sscanf(cur + 5, "%dx%d", &width, &height);
++ have_size = 1;
++ }
++ if (have_palette && have_size)
++ break;
++ cur += strcspn(cur, "\n\r");
++ cur += strspn(cur, "\n\r");
++ }
++ if (have_palette) {
++ track->vos_data = av_malloc(16*4);
++ if (!track->vos_data)
++ return AVERROR(ENOMEM);
++ for (i = 0; i < 16; i++) {
++ AV_WB32(track->vos_data + i * 4, palette[i]);
++ }
++ track->vos_len = 16 * 4;
++ }
++ st->codec->width = width;
++ st->codec->height = track->height = height;
++
++ return 0;
++}
++
+ static int mov_write_header(AVFormatContext *s)
+ {
+ AVIOContext *pb = s->pb;
+@@ -3334,9 +3403,13 @@ static int mov_write_header(AVFormatContext *s)
+ 
+ /* copy extradata if it exists */
+ if (st->codec->extradata_size) {
+- track->vos_len = st->codec->extradata_size;
+- track->vos_data = av_malloc(track->vos_len);
+- memcpy(track->vos_data, st->codec->extradata, track->vos_len);
++ if (st->codec->codec_id == AV_CODEC_ID_DVD_SUBTITLE)
++ mov_create_dvd_sub_decoder_specific_info(track, st);
++ else {
++ track->vos_len = st->codec->extradata_size;
++ track->vos_data = av_malloc(track->vos_len);
++ memcpy(track->vos_data, st->codec->extradata, track->vos_len);
++ }
+ }
+ }
+ 
+-- 
+1.9.3
+

HandBrake-0.10.0.tar.bz2/contrib/ffmpeg/A08-movenc-unbreak-sbtl.patch Added

@@ -0,0 +1,27 @@
+commit f94371b1db89bf65173a763a49175ce549466602
+Author: Michael Niedermayer <michaelni@gmx.at>
+Date: Sat Mar 29 15:56:03 2014 +0100
+
+ mov: Unbreak sbtl writing
+
+diff --git a/libavformat/movenc.c b/libavformat/movenc.c
+index a6a55d5..889f15c 100644
+--- a/libavformat/movenc.c
++++ b/libavformat/movenc.c
+@@ -1312,9 +1312,13 @@ static int mov_write_hdlr_tag(AVIOContext *pb, MOVTrack *track)
+ hdlr_type = "soun";
+ descr = "SoundHandler";
+ } else if (track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE) {
+- if (track->tag == MKTAG('t','x','3','g')) hdlr_type = "sbtl";
+- if (track->tag == MKTAG('m','p','4','s')) hdlr_type = "subp";
+- else hdlr_type = "text";
++ if (track->tag == MKTAG('t','x','3','g')) {
++ hdlr_type = "sbtl";
++ } else if (track->tag == MKTAG('m','p','4','s')) {
++ hdlr_type = "subp";
++ } else {
++ hdlr_type = "text";
++ }
+ descr = "SubtitleHandler";
+ } else if (track->enc->codec_tag == MKTAG('r','t','p',' ')) {
+ hdlr_type = "hint";

HandBrake-0.10.0.tar.bz2/contrib/ffmpeg/A09-matroskaenc-pgs-duration.patch Added

@@ -0,0 +1,31 @@
+From dab79ea5cd01187567b1761aaf1c329926483786 Mon Sep 17 00:00:00 2001
+From: John Stebbins <stebbins@jetheaddev.com>
+Date: Wed, 29 Oct 2014 10:54:44 -0700
+Subject: [PATCH] matroskaenc: Fix writing zero duration subtitles
+
+The matroska spec says blockduration == 0 means the frame is not a
+keyframe. Since all subtitles are "keyframes", 0 blockduration should
+not be written.
+
+Fixes mkvalidator error messages for PGS subtitles.
+---
+ libavformat/matroskaenc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
+index 4ec474d..628300b 100644
+--- a/libavformat/matroskaenc.c
++++ b/libavformat/matroskaenc.c
+@@ -1487,7 +1487,8 @@ static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
+ mkv_blockgroup_size(pkt->size));
+ duration = pkt->convergence_duration;
+ mkv_write_block(s, pb, MATROSKA_ID_BLOCK, pkt, 0);
+- put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration);
++ if (duration > 0)
++ put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration);
+ end_ebml_master(pb, blockgroup);
+ }
+ 
+-- 
+1.9.3
+

HandBrake-0.10.0.tar.bz2/contrib/ffmpeg/A10-h264-extradata.patch Added

HandBrake-0.9.9.tar.bz2/contrib/ffmpeg/P01-solaris.patch -> HandBrake-0.10.0.tar.bz2/contrib/ffmpeg/P01-solaris.patch Changed

HandBrake-0.9.9.tar.bz2/contrib/ffmpeg/P02-darwin-pic.patch -> HandBrake-0.10.0.tar.bz2/contrib/ffmpeg/P02-darwin-pic.patch Changed

@@ -1,21 +1,21 @@
 diff --git a/configure b/configure
-index 6ab04ae..fa9f980 100755
+index c6789d5..d041718 100755
 --- a/configure
 +++ b/configure
-@@ -2893,6 +2893,7 @@ case $target_os in
-         AVSERVERLDFLAGS=-Wl,-bind_at_load
+@@ -3276,6 +3276,7 @@ case $target_os in
+         SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)'
          objformat="macho"
          enabled x86_64 && objformat="macho64"
 +        enabled x86_64 && enable pic
          enabled_any pic shared ||
              { check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
          ;;
-@@ -3095,7 +3096,7 @@ esc(){
+@@ -3515,7 +3516,7 @@ esc(){
  
  echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $LIBAV_CONFIGURATION)" >config.fate
  
--check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic
-+#check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic
+-check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic
++#check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic
  
  set_default $PATHS_LIST
  set_default nm

HandBrake-0.9.9.tar.bz2/contrib/ffmpeg/module.defs -> HandBrake-0.10.0.tar.bz2/contrib/ffmpeg/module.defs Changed

@@ -1,11 +1,17 @@
-$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,YASM BZIP2 ZLIB FDKAAC))
+__deps__ := YASM BZIP2 ZLIB FDKAAC LIBVPX
+ifeq (1,$(FEATURE.qsv))
+__deps__ += PTHREADW32 LIBMFX
+endif
+
+$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,FFMPEG))
 
-FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v9.6.tar.bz2
+FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v10.1.tar.bz2
 
-FFMPEG.CONFIGURE.deps =
-FFMPEG.CONFIGURE.env  =
-FFMPEG.CONFIGURE.host =
+FFMPEG.CONFIGURE.deps  =
+FFMPEG.CONFIGURE.env   =
+FFMPEG.CONFIGURE.host  =
+FFMPEG.CONFIGURE.build =
 
 FFMPEG.CONFIGURE.extra = \
     --enable-gpl \
@@ -26,7 +32,9 @@
     --enable-encoder=flac \
     --enable-encoder=mpeg2video \
     --enable-encoder=mpeg4 \
-    --enable-encoder=snow \
+    --enable-libvpx \
+    --enable-encoder=libvpx_vp8 \
+    --disable-decoder=libvpx_vp8 \
     --enable-zlib \
     --enable-bzlib \
     --cc="$(FFMPEG.GCC.gcc)" \
@@ -39,6 +47,14 @@
     --enable-encoder=libfdk_aac
 endif
 
+FFMPEG.CONFIGURE.extra += \
+    --enable-muxer=matroska \
+    --enable-muxer=webm \
+    --enable-muxer=mov \
+    --enable-muxer=mp4 \
+    --enable-muxer=psp \
+    --enable-muxer=ipod
+
 ## check against tuple: B-SYSTEM where B is { 0 | 1 } for cross-compiling flag
 ifeq (0-cygwin,$(BUILD.cross)-$(BUILD.system))
     FFMPEG.CONFIGURE.extra += --enable-pthreads --enable-memalign-hack
@@ -50,6 +66,11 @@
     FFMPEG.CONFIGURE.extra += \
         --enable-w32threads \
         --enable-memalign-hack \
+        --enable-dxva2 \
+        --enable-hwaccel=h264_dxva2 \
+        --enable-hwaccel=mpeg2_dxva2 \
+        --enable-hwaccel=vc1_dxva2 \
+        --enable-hwaccel=wmv3_dxva2 \
         --target-os=mingw32 \
         --arch=i386 \
         --enable-cross-compile --cross-prefix=$(BUILD.cross.prefix)
@@ -76,6 +97,10 @@
 	FFMPEG.CONFIGURE.extra += --disable-optimizations
 endif
 
+ifeq (1,$(FEATURE.qsv))
+   FFMPEG.CONFIGURE.extra += --enable-qsv
+endif
+
 ## enable compile verbosity
 FFMPEG.BUILD.extra = V=1

HandBrake-0.9.9.tar.bz2/contrib/fontconfig/module.defs -> HandBrake-0.10.0.tar.bz2/contrib/fontconfig/module.defs Changed

@@ -53,14 +53,14 @@
 # 
 ifeq (max,$(FONTCONFIG.GCC.g))
     ifeq (none,$(FONTCONFIG.GCC.O))
-        FONTCONFIG.CONFIGURE.env.CFLAGS   = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g .O)"
+        FONTCONFIG.CONFIGURE.env.CFLAGS   = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?c_std ?extra .g .O)"
         FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g .O)"
     else
-        FONTCONFIG.CONFIGURE.env.CFLAGS   = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g)"
+        FONTCONFIG.CONFIGURE.env.CFLAGS   = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?c_std ?extra .g)"
         FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g)"
     endif
 else
-    FONTCONFIG.CONFIGURE.env.CFLAGS   = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)"
+    FONTCONFIG.CONFIGURE.env.CFLAGS   = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?c_std ?extra)"
     FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include $(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)"
 endif

HandBrake-0.10.0.tar.bz2/contrib/libbluray/A02-m2ts-trace.patch Added

HandBrake-0.9.9.tar.bz2/contrib/libbluray/module.defs -> HandBrake-0.10.0.tar.bz2/contrib/libbluray/module.defs Changed

HandBrake-0.9.9.tar.bz2/contrib/libdvdnav/module.defs -> HandBrake-0.10.0.tar.bz2/contrib/libdvdnav/module.defs Changed

@@ -1,13 +1,14 @@
-$(eval $(call import.MODULE.defs,LIBDVDNAV,libdvdnav,LIBDVDREAD))
+$(eval $(call import.MODULE.defs,LIBDVDNAV,libdvdnav,PKGCONFIG LIBDVDREAD))
 $(eval $(call import.CONTRIB.defs,LIBDVDNAV))
 
-LIBDVDNAV.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libdvdnav-svn1168.tar.gz
-LIBDVDNAV.EXTRACT.tarbase = libdvdnav
+LIBDVDNAV.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libdvdnav-5.0.1-0-gaa3659d.tar.gz
+LIBDVDNAV.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -I m4 -fiv;
 
 ifneq (max,$(LIBDVDNAV.GCC.g))
     LIBDVDNAV.GCC.D += NDEBUG
 endif
 
-LIBDVDNAV.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; autoreconf -fiv;
-
-LIBDVDNAV.CONFIGURE.extra += --with-dvdread-config=$(call fn.ABSOLUTE,$(CONTRIB.build/)bin/dvdread-config)
+ifeq (1,$(FEATURE.local_pkgconfig))
+    LIBDVDNAV.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+    LIBDVDNAV.BUILD.env     = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+endif

HandBrake-0.9.9.tar.bz2/contrib/libdvdread/module.defs -> HandBrake-0.10.0.tar.bz2/contrib/libdvdread/module.defs Changed

HandBrake-0.10.0.tar.bz2/contrib/libgnurx Added

HandBrake-0.10.0.tar.bz2/contrib/libgnurx/P00-mingw-static.patch Added

@@ -0,0 +1,42 @@
+diff -ur mingw-libgnurx-2.5.1.orig/Makefile.in mingw-libgnurx-2.5.1/Makefile.in
+--- mingw-libgnurx-2.5.1.orig/Makefile.in	2007-05-07 15:28:28.000000000 -0400
++++ mingw-libgnurx-2.5.1/Makefile.in	2014-10-26 02:56:15.000000000 -0400
+@@ -38,6 +38,7 @@
+ bindir = @bindir@
+ mandir = @mandir@
+ 
++AR = @AR@
+ CC = @CC_QUALIFIED@
+ CFLAGS = @CFLAGS@ -I ${srcdir}
+ LDFLAGS = @LDFLAGS@
+@@ -72,11 +73,19 @@
+ libregex.a: libgnurx.dll.a
+ 	cp -p libgnurx.dll.a $@
+ 
++libregex.a-static: $(OBJECTS)
++	$(AR) rcsu libregex.a $(OBJECTS)
++
+ gnurx.lib: libgnurx-$(DLLVERSION).dll
+ 	$(MSVCLIB) -def:libgnurx.def -out:gnurx.lib
+ 
+ install: install-dll @install_dev@
+ 
++install-static: libregex.a
++	mkdir -p ${includedir} ${libdir}
++	cp -p ${srcdir}/regex.h ${includedir}
++	cp -p ${srcdir}/libregex.a ${libdir}
++
+ install-dll:
+ 	mkdir -p ${bindir}
+ 	cp -p $(BINDIST_FILES) ${bindir}
+diff -ur mingw-libgnurx-2.5.1.orig/configure.ac mingw-libgnurx-2.5.1/configure.ac
+--- mingw-libgnurx-2.5.1.orig/configure.ac	2014-10-26 02:48:55.000000000 -0400
++++ mingw-libgnurx-2.5.1/configure.ac	2014-10-26 02:49:13.000000000 -0400
+@@ -75,6 +75,7 @@
+ #
+   AC_SUBST([GNURX_LIB])
+   AC_SUBST([CC_QUALIFIED], ["$CC $CC_QUALIFIED"])
++  AC_SUBST([AR])
+   LDFLAGS="$LDFLAGS -Wl,--enable-auto-image-base -Wl,--out-implib,libgnurx.dll.a"
+   test -n "${GNURX_LIB}" && LDFLAGS="$LDFLAGS -Wl,--output-def,libgnurx.def"
+   AC_CONFIG_FILES([Makefile])

HandBrake-0.10.0.tar.bz2/contrib/libgnurx/module.defs Added

@@ -0,0 +1,27 @@
+$(eval $(call import.MODULE.defs,LIBGNURX,libgnurx))
+$(eval $(call import.CONTRIB.defs,LIBGNURX))
+
+LIBGNURX.FETCH.url = http://download.handbrake.fr/handbrake/contrib/mingw-libgnurx-2.5.1-src.tar.gz
+LIBGNURX.EXTRACT.tarbase = mingw-libgnurx-2.5.1
+
+LIBGNURX.CONFIGURE.env += AR="$(AR.exe)"
+LIBGNURX.CONFIGURE.bootstrap = autoreconf -fiv;
+
+LIBGNURX.BUILD.ntargets = libregex.a-static
+
+define LIBGNURX.INSTALL
+    $(CP.exe) $(LIBGNURX.EXTRACT.dir/)libregex.a $(CONTRIB.build/)lib/
+    $(CP.exe) $(LIBGNURX.EXTRACT.dir/)regex.h $(CONTRIB.build/)include/
+    $(TOUCH.exe) $@
+endef
+
+define LIBGNURX.UNINSTALL
+    $(RM.exe) -f $(CONTRIB.build/)lib/libregex.a
+    $(RM.exe) -f $(CONTRIB.build/)include/regex.h
+    $(RM.exe) -f $(LIBGNURX.INSTALL.target)
+endef
+
+ifeq (1,$(FEATURE.local_pkgconfig))
+    LIBGNURX.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+    LIBGNURX.BUILD.env     = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+endif

HandBrake-0.10.0.tar.bz2/contrib/libgnurx/module.rules Added

HandBrake-0.9.9.tar.bz2/contrib/libiconv/module.defs -> HandBrake-0.10.0.tar.bz2/contrib/libiconv/module.defs Changed

HandBrake-0.10.0.tar.bz2/contrib/libmfx Added

HandBrake-0.10.0.tar.bz2/contrib/libmfx/module.defs Added

HandBrake-0.10.0.tar.bz2/contrib/libmfx/module.rules Added

HandBrake-0.10.0.tar.bz2/contrib/libtheora/P00-darwin-configure-clang.patch Added

HandBrake-0.10.0.tar.bz2/contrib/libvpx Added

HandBrake-0.10.0.tar.bz2/contrib/libvpx/module.defs Added

HandBrake-0.10.0.tar.bz2/contrib/libvpx/module.rules Added

HandBrake-0.10.0.tar.bz2/contrib/pkgconfig Added

HandBrake-0.10.0.tar.bz2/contrib/pkgconfig/module.defs Added

HandBrake-0.10.0.tar.bz2/contrib/pkgconfig/module.rules Added

HandBrake-0.9.9.tar.bz2/contrib/x264/A00-version-string.patch -> HandBrake-0.10.0.tar.bz2/contrib/x264/A00-version-string.patch Changed

HandBrake-0.9.9.tar.bz2/contrib/x264/module.defs -> HandBrake-0.10.0.tar.bz2/contrib/x264/module.defs Changed

HandBrake-0.10.0.tar.bz2/contrib/x265 Added

HandBrake-0.10.0.tar.bz2/contrib/x265/A00-maxCUSize-idiocy.patch Added

HandBrake-0.10.0.tar.bz2/contrib/x265/module.defs Added

@@ -0,0 +1,35 @@
+__deps__ := YASM CMAKE
+$(eval $(call import.MODULE.defs,X265,x265,$(__deps__)))
+$(eval $(call import.CONTRIB.defs,X265))
+
+X265.FETCH.url = http://download.handbrake.fr/contrib/x265-8768-5e604833c5aa-1.4.tar.bz2
+
+X265.CONFIGURE.exe         = cmake
+X265.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(X265.CONFIGURE.prefix)"
+X265.CONFIGURE.deps        =
+X265.CONFIGURE.static      =
+X265.CONFIGURE.shared      = -DENABLE_SHARED=OFF
+X265.CONFIGURE.extra       = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=OFF
+
+ifeq (1,$(BUILD.cross))
+    ifeq (mingw,$(BUILD.system))
+        X265.CONFIGURE.extra += -DWIN32=ON -DWINXP_SUPPORT=ON
+    endif
+    X265.CONFIGURE.args.host  = -DCMAKE_SYSTEM_NAME="$(X265.CONFIGURE.host)"
+    X265.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265.CONFIGURE.build)"
+else
+    X265.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(X265.CONFIGURE.host)"
+    ifeq (1,$(FEATURE.local_yasm))
+        X265.CONFIGURE.env.LOCAL_PATH = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+        X265.BUILD.env                = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+    endif
+endif
+
+## find CMakeLists.txt
+X265.CONFIGURE.extra += "$(call fn.ABSOLUTE,$(X265.EXTRACT.dir/)source/)"
+
+## optional static libs need to be marked
+X265.OSL.libs  = x265
+X265.OSL.files = $(foreach i,$(X265.OSL.libs),$(call fn.ABSOLUTE,$(CONTRIB.build/)lib/lib$(i).a))
+
+

HandBrake-0.10.0.tar.bz2/contrib/x265/module.rules Added

HandBrake-0.9.9.tar.bz2/doc/BUILD-Linux -> HandBrake-0.10.0.tar.bz2/doc/BUILD-Linux Changed

@@ -1,149 +1,111 @@
-Guide to Building HandBrake svn5208 (2013012701) on Linux
+Guide to Building HandBrake svn6419 (2014093001) on Linux
 *********************************************************
 
-Table of Contents
-*****************
-
 1 Introduction
 2 Prerequisites
 3 QuickStart
 4 Overview
 5 Building via Terminal
-  5.1 Checkout Sources
-  5.2 Configure
-  5.3 Build
-  5.4 Make Targets
-    5.4.1 Global
-    5.4.2 General Modules
-    5.4.3 Contrib Modules
-    5.4.4 Contrib Touch and Untouch
-    5.4.5 Contrib Aggregates
-  5.5 Customizing Make
+5.1 Checkout Sources
+5.2 Configure
+5.3 Build
+5.4 Make Targets
+  5.4.1 Global
+  5.4.2 General Modules
+  5.4.3 Contrib Modules
+  5.4.4 Contrib Touch and Untouch
+  5.4.5 Contrib Aggregates
+5.5 Customizing Make
 6 Troubleshooting
 Appendix A Project Repository Details
 
-
 1 Introduction
 **************
 
-This guide documents the recommended process to build HandBrake on
-Linux hosts from the official source-code repository. Building from any
-other source is not supported.
+This guide documents the recommended process to build HandBrake on Linux
+hosts from the official source-code repository.  Building from any other
+source is not supported.
 
 2 Prerequisites
 ***************
 
-The following are the recommended specifications for building on
-Linux; but is not necessarily the only configuration that is possible:
+The following are the recommended specifications for building on Linux;
+but is not necessarily the only configuration that is possible:
 
    * Intel 32-bit or 64-bit kernel
-
-   * Ubuntu 12.04, gcc 4.5, yasm 1.2.x
-
-   * Fedora 17 and 18, gcc 4.5, yasm 1.2.x
-
-   * gcc 4.5 or higher is reported to work
-
-     Note: It is recommended to use the platform distribution's
-     standard compiler for maximum C++ compatibility. If you build with
-     a custom compiler it will likely introduce non-standard runtime
-     requirements and have new/delete, exception and RTTI
-     incompatibilities. There are of course many valid reasons to build
-     with unbundled compilers, but be aware it is generally unsupported
-     and left as an exercise to the reader.
+   * Ubuntu 14.04, gcc 4.8, yasm 1.3.x
+   * Fedora 20, gcc 4.8, yasm 1.3.x
+   * gcc 4.7 or higher is reported to work
+
+     Note: It is recommended to use the platform distribution's standard
+     compiler for maximum C++ compatibility.  If you build with a custom
+     compiler it will likely introduce non-standard runtime requirements
+     and have new/delete, exception and RTTI incompatibilities.  There
+     are of course many valid reasons to build with unbundled compilers,
+     but be aware it is generally unsupported and left as an exercise to
+     the reader.
 
 The following general tools are used on various platforms and it is
 recommended you use these versions or similar:
 
    * subversion - 1.6.16
-
    * python - Python 2.7.1
-
    * curl - curl 7.21.4 (or wget)
-
    * m4 - GNU M4 1.4.6
-
    * make - GNU Make 3.81
-
    * patch - Patch 2.5.8
-
    * tar - GNU tar 1.26
-
    * wget - GNU Wget 1.13.4 (or curl)
 
-The GTK UI introduces some significant extra build requirements. If you
-intend to disable building the GUI with `configure --disable-gtk' you
-will not need many of these packages installed:
+The GTK UI introduces some significant extra build requirements.  GTK
+version 3.10+ is required to build the GTK UI. If you intend to disable
+building the GUI with 'configure --disable-gtk' you will not need many
+of these packages installed:
 
-Ubuntu 12+ packages:
+Ubuntu 14.04 packages:
    * subversion (cli/gui)
-
+   * cmake (cli/gui)
    * yasm (cli/gui)
-
    * build-essential (cli/gui)
-
    * autoconf (cli/gui)
-
    * libtool (cli/gui)
-
    * zlib1g-dev (cli/gui)
-
    * libbz2-dev (cli/gui)
-
    * libxml2-dev (cli/gui)
-
    * libogg-dev (cli/gui)
-
    * libtheora-dev (cli/gui)
-
    * libvorbis-dev (cli/gui)
-
    * libsamplerate-dev (cli/gui)
-
    * libfribidi-dev (cli/gui)
-
    * libfreetype6-dev (cli/gui)
-
    * libfontconfig1-dev (cli/gui)
-
    * libass-dev (cli/gui)
-
+   * libmp3lame-dev (cli/gui)
+   * libx264-dev (cli/gui)
    * intltool (gui)
-
    * libglib2.0-dev (gui)
-
    * libdbus-glib-1-dev (gui)
-
-   * libgtk2.0-dev (gui)
-
+   * libgtk-3-dev (gui)
    * libgudev-1.0-dev (gui)
-
-   * libwebkit-dev (gui)
-
+   * libwebkitgtk-3.0-dev (gui)
    * libnotify-dev (gui)
-
-   * libgstreamer0.10-dev (gui)
-
-   * libgstreamer-plugins-base0.10-dev (gui)
-
-Ubuntu 12+ packages:
+   * libgstreamer1.0-dev (gui)
+   * libgstreamer-plugins-base1.0-dev (gui)
    * libappindicator-dev (gui)
 
 To install these packages:
-     sudo apt-get install subversion yasm build-essential autoconf libtool \
+     sudo apt-get install subversion cmake yasm build-essential autoconf libtool \
      zlib1g-dev libbz2-dev libogg-dev libtheora-dev libvorbis-dev \
      libsamplerate-dev libxml2-dev libfribidi-dev libfreetype6-dev \
-     libfontconfig1-dev libass-dev intltool libglib2.0-dev libdbus-glib-1-dev \
-     libgtk2.0-dev libgudev-1.0-dev libwebkit-dev libnotify-dev \
-     libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev libappindicator-dev
+     libfontconfig1-dev libass-dev libmp3lame-dev libx264-dev intltool \
+     libglib2.0-dev libdbus-glib-1-dev libgtk-3-dev libgudev-1.0-dev \
+     libwebkitgtk-3.0-dev libnotify-dev libgstreamer1.0-dev \
+     libgstreamer-plugins-base1.0-dev libappindicator-dev
 
-Fedora 17+ package groups:
+Fedora 20 package groups:
    * Development Tools
-
    * Development Libraries
-
    * X Software Development (gui)
-
    * GNOME Software Development (gui)
 
 To install these package groups:
@@ -151,86 +113,69 @@
      "X Software Development" "GNOME Software Development"
 
 Additional Fedora packages:
+   * patch (cli/gui)
+   * intltool (cli/gui)
+   * libtool (cli/gui)
+   * cmake (cli/gui)
+   * gcc-c++ (cli/gui)
    * yasm (cli/gui)
-
    * zlib-devel (cli/gui)
-
    * bzip2-devel (cli/gui)
-
    * libogg-devel (cli/gui)
-
    * libtheora-devel (cli/gui)
-
    * libvorbis-devel (cli/gui)
-
    * libsamplerate-devel (cli/gui)
-
    * libxml2-devel (cli/gui)
-
    * fribidi-devel (cli/gui)
-
    * freetype-devel (cli/gui)
-
    * fontconfig-devel (cli/gui)
-
    * libass-devel (cli/gui)
-
+   * lame-devel (cli/gui)
+   * x264-devel (cli/gui)
    * dbus-glib-devel (gui)
-
    * libgudev1-devel (gui)
-
-   * webkitgtk-devel (gui)
-
+   * webkitgtk3-devel (gui)
    * libnotify-devel (gui)
-
-   * gstreamer-devel (gui)
-
-   * gstreamer-plugins-base-devel (gui)
+   * gstreamer1-devel (gui)
+   * gstreamer1-plugins-base-devel (gui)
 
 To install these packages:
-     sudo yum install yasm zlib-devel bzip2-devel libogg-devel libtheora-devel \
-     libvorbis-devel libsamplerate-devel libxml2-devel fribidi-devel \
-     freetype-devel fontconfig-devel libass-devel dbus-glib-devel \
-     libgudev1-devel webkitgtk-devel libnotify-devel \
-     gstreamer-devel gstreamer-plugins-base-devel
+     sudo yum install patch intltool libtool cmake gcc-c++ yasm zlib-devel \
+     bzip2-devel libogg-devel libtheora-devel libvorbis-devel libsamplerate-devel \
+     libxml2-devel fribidi-devel freetype-devel fontconfig-devel libass-devel \
+     lame-devel x264-devel dbus-glib-devel libgudev1-devel webkitgtk3-devel \
+     libnotify-devel gstreamer1-devel gstreamer1-plugins-base-devel
 
 3 QuickStart
 ************
 
-This chapter is for building from a terminal/shell environment in as
-few commands as possible. Upon completion of the following commands you
-should have a fresh build of HandBrake. Further instructions are
-available beginning with *Note overview:: which describes procedures
-suitable for repeating builds. This chapter should be skipped by those
+This chapter is for building from a terminal/shell environment in as few
+commands as possible.  Upon completion of the following commands you
+should have a fresh build of HandBrake.  Further instructions are
+available beginning with *note overview:: which describes procedures
+suitable for repeating builds.  This chapter should be skipped by those
 seeking more than a minimalist build.
 
      svn checkout svn://svn.handbrake.fr/HandBrake/trunk hb-trunk
      cd hb-trunk
      ./configure --launch
 
-The special option `--launch' selects launch mode and performs the
+The special option '--launch' selects launch mode and performs the
 following steps:
 
-   * assert scratch directory `build/' does not exist
-
-   * create scratch directory `build/'
-
-   * change to directory `build/'
-
-   * launch `make'
-
-   * capture build output to `build/log/build.txt'
-
+   * assert scratch directory 'build/' does not exist
+   * create scratch directory 'build/'
+   * change to directory 'build/'
+   * launch 'make'
+   * capture build output to 'build/log/build.txt'
    * echo build output
-
    * print elapsed time
-
    * indicate if build ultimately succeeded or failed
 
 4 Overview
 **********
 
-Linux builds are performed from a terminal. There is no support for
+Linux builds are performed from a terminal.  There is no support for
 building from any IDEs.
 
 5 Building via Terminal
@@ -244,13 +189,13 @@
      svn checkout svn://svn.handbrake.fr/HandBrake/trunk hb-trunk
      cd hb-trunk
 
-Sources are checked out from the `trunk' branch. This document was
+Sources are checked out from the 'trunk' branch.  This document was
 generated from that very branch, and for example purposes, we will use
 exactly the same branch.
 
 If you have write-access to the repository, then you may add the
-appropriate login/password information as needed. It is recommended to
-use Subversion 1.6.0 or higher. Lower versions should also work.
+appropriate login/password information as needed.  It is recommended to
+use Subversion 1.6.0 or higher.  Lower versions may also work.
 
 5.2 Configure
 =============
@@ -259,101 +204,98 @@
 
      ./configure
 
-Configure will automatically create a scratch build directory `build'
-unless you use GNU-style build procedures and first `cd' to a directory
-other than top-level source. Additionally you may use `--build' to
-specify the directory. The name of the directory is arbitrary but it is
+Configure will automatically create a scratch build directory 'build'
+unless you use GNU-style build procedures and first 'cd' to a directory
+other than top-level source.  Additionally you may use '--build' to
+specify the directory.  The name of the directory is arbitrary but it is
 recommended to use something which indicates transient files which are
 not checked into the repository.
 
-The `configure' utility accepts many options. It is recommended that
-you specify `--help' for the complete list of options. The following
+The 'configure' utility accepts many options.  It is recommended that
+you specify '--help' for the complete list of options.  The following
 options are also documented here:
 
-`--help'
+'--help'
      List available options.
 
-`--src=DIR'
+'--src=DIR'
      Specify top-level source directory for HandBrake sources.
 
-`--build=DIR'
-     Specify destination directory for final product install. The
-     default is to use either `build' if in the top-level source
-     directory, otherwise `.'
+'--build=DIR'
+     Specify destination directory for final product install.  The
+     default is to use either 'build' if in the top-level source
+     directory, otherwise '.'
 
-`--prefix=DIR'
+'--prefix=DIR'
      Specify destination directory for final product install.  This
      defaults to a reasonable platform-specific value.
 
-`--launch'
+'--launch'
      All-in-one option which launches the build and logs output
      automatically.  Useful for novices and quick-start procedures.
 
-`--disable-gtk'
-     Disable building the GTK GUI on applicable platforms such as
-     Linux.
+'--disable-gtk'
+     Disable building the GTK GUI on applicable platforms such as Linux.
 
-`--debug=MODE'
-     Select debug mode. Must be one of `none', `min', `std', `max'.
-     This generally maps to gcc options `-g0', `-g1', `-g2', `-g3'.
+'--debug=MODE'
+     Select debug mode.  Must be one of 'none', 'min', 'std', 'max'.
+     This generally maps to gcc options '-g0', '-g1', '-g2', '-g3'.
 
-`--optimize=MODE'
-     Select optimize mode. Must be one of `none', `speed', `size'.
-     This generally maps to gcc options `-g0', `-O0', `-O3', `-Os'.
+'--optimize=MODE'
+     Select optimize mode.  Must be one of 'none', 'speed', 'size'.
+     This generally maps to gcc options '-g0', '-O0', '-O3', '-Os'.
 
-`--arch=MODE'
-     Select build architecture. The available architectures vary by
-     platform. Most platforms support exactly one architecture except
+'--arch=MODE'
+     Select build architecture.  The available architectures vary by
+     platform.  Most platforms support exactly one architecture except
      Mac OS X which has support for various universal binary
-     architectures. The available choices are hard-coded per platform
+     architectures.  The available choices are hard-coded per platform
      and no sanity checks for the required tools are performed.
 
-`--disable-xcode'
-     Disable shunting the build through `xcodebuild'. If this option is
-     applied, `HandBrakeCLI' will be produced in a similar fashion as
-     it is on other platforms; sans Xcode and the Cocoa application
-     will not be produced. Mac OS X only.
+'--disable-xcode'
+     Disable shunting the build through 'xcodebuild'.  If this option is
+     applied, 'HandBrakeCLI' will be produced in a similar fashion as it
+     is on other platforms; sans Xcode and the Cocoa application will
+     not be produced.  Mac OS X only.
 
-`--xcconfig=MODE'
-     Select Xcode project configuration file. The available modes are
-     the basenames of files located in `macosx/xcconfig/*.xcconfig'
-     which direct Xcode to build using various architecture and Mac OS
-     X deployment options. Mac OS X only.
+'--xcconfig=MODE'
+     Select Xcode project configuration file.  The available modes are
+     the basenames of files located in 'macosx/xcconfig/*.xcconfig'
+     which direct Xcode to build using various architecture and Mac OS X
+     deployment options.  Mac OS X only.
 
 Clean-room procedures dictate that when certain factors change, old
-builds should be scrapped and new builds configured. This is the main
+builds should be scrapped and new builds configured.  This is the main
 reason for requiring a scratch directory; to promote consistent,
-reliable and clean software builds. The following is a short list of
+reliable and clean software builds.  The following is a short list of
 some of the reasons why someone may choose to scrap an existing build:
 
    * configure with different options
-
    * subversion working dir is updated and you want configure to
      re-evaluate working dir metadata.
-
    * build corruption is suspected
 
-There are generally two methods for scrapping a build. The `build'
+There are generally two methods for scrapping a build.  The 'build'
 directory can be recursively removed which has the effect of loosing
 your existing configuration but does guarantee no residuals are left
-behind. The other method is to ask the build system to perform an `make
-xclean'. This is known to work well but will leave empty directories
-behind. However, the configuration is left intact.
+behind.  The other method is to ask the build system to perform an 'make
+xclean'.  This is known to work well but will leave empty directories
+behind.  However, the configuration is left intact.
 
 5.3 Build
 =========
 
-Build main product. All necessary dependencies are also built if
+Build main product.  All necessary dependencies are also built if
 required.
 
      make
 
-Parallel builds may optionally be enabled. Be aware that while a
+Parallel builds may optionally be enabled.  Be aware that while a
 parallel build may save time on systems with additional cores, the
 output is often mixed, overlapped and sometimes even corrupted with
-binary characters. Thus if you experience a build issue, you should
+binary characters.  Thus if you experience a build issue, you should
 clean and redo the build in default serial mode to produce a readable
-log. The following command allows for up to 4 concurrent jobs via make:
+log.  The following command allows for up to 4 concurrent jobs via make:
 
      make -j4
 
@@ -361,105 +303,103 @@
 ================
 
 The build system supports passing many kinds of targets some of which
-become very useful in normal development cycles. The targets by
-convention are lower-case words passed to `make'. Global targets are
-one-word targets. Scoped targets are usually two-words separated by a
+become very useful in normal development cycles.  The targets by
+convention are lower-case words passed to 'make'.  Global targets are
+one-word targets.  Scoped targets are usually two-words separated by a
 period.
 
 5.4.1 Global
 ------------
 
-`make'
-     Alias for `make build'.
+'make'
+     Alias for 'make build'.
 
-`make build'
-     Build main product. All necessary dependencies are also built if
+'make build'
+     Build main product.  All necessary dependencies are also built if
      required.
 
-`make clean'
-     Clean all build output excluding contrib modules. Configuration is
+'make clean'
+     Clean all build output excluding contrib modules.  Configuration is
      retained.
 
-`make install'
-     Perform final product(s) install.  This will install build
-     products to a standard directory or one specified via `configure
-     --prefix' option.
+'make install'
+     Perform final product(s) install.  This will install build products
+     to a standard directory or one specified via 'configure --prefix'
+     option.
 
-`make uninstall'
+'make uninstall'
      Perform final product(s) uninstall.  This will uninstall any
      products which may have been previously installed.
 
-`make xclean'
-     Clean all build output including contrib modules. Configuration is
+'make xclean'
+     Clean all build output including contrib modules.  Configuration is
      retained.
 
-`make doc'
-     Build auto-generated project documentation. Various articles are
-     produced and may be found in `build/doc/articles'.
+'make doc'
+     Build auto-generated project documentation.  Various articles are
+     produced and may be found in 'build/doc/articles'.
 
-`make doc.post'
+'make doc.post'
      Build auto-generated project documentation and post produced
      articles directly to source tree.
 
-`make report.help'
+'make report.help'
      Print list of available makefile vars report targets.  These
      reports detail var definitions and expanded values used by the
      build system.  For experts only.
 
-`make report.all'
+'make report.all'
      Convenience target which aggregates all reports.  For experts only.
 
 5.4.2 General Modules
 ---------------------
 
-General modules such as `libhb', `test' and `gtk' have the following
+General modules such as 'libhb', 'test' and 'gtk' have the following
 scoped targets:
 
-`make MODULE.build'
+'make MODULE.build'
      Build MODULE.
 
-`make MODULE.clean'
+'make MODULE.clean'
      Clean build output for MODULE.
 
 5.4.3 Contrib Modules
 ---------------------
 
-Contrib modules such as `a52dec', `bzip2', `faac', `faad2', `ffmpeg',
-`fontconfig', `freetype', `fribidi', `lame', `libass', `libbluray',
-`libdca', `libdvdnav', `libdvdread', `libdvdread', `libiconv',
-`libmkv', `libogg', `libsamplerate', `libtheora', `libvorbis',
-`libxml2', `mp4v2', `mpeg2dec', `x264', `yasm' and `zlib' have the
-following scoped targets:
+Contrib modules such as 'bzip2', 'ffmpeg', 'fontconfig', 'freetype',
+'fribidi', 'lame', 'libass', 'libbluray', 'libdvdnav', 'libdvdread',
+'libiconv', 'libogg', 'libsamplerate', 'libtheora', 'libvorbis',
+'libxml2', 'x264', 'yasm' and 'zlib' have the following scoped targets:
 
-`make MODULE.fetch'
+'make MODULE.fetch'
      Download source tarball from the Internet and save to
-     `TOP/downloads' directory. No check-summing is performed.
+     'TOP/downloads' directory.  No check-summing is performed.
 
-`make MODULE.extract'
-     Extract source tarball into `build' tree.
+'make MODULE.extract'
+     Extract source tarball into 'build' tree.
 
-`make MODULE.patch'
+'make MODULE.patch'
      Apply appropriate patches (if any) to module sources.
 
-`make MODULE.configure'
+'make MODULE.configure'
      Configure module sources.  This usually invokes autotool configure.
 
-`make MODULE.build'
+'make MODULE.build'
      Build module.  This usually invokes autotool build.
 
-`make MODULE.install'
-     Install module products such as headers and libraries into `build'
+'make MODULE.install'
+     Install module products such as headers and libraries into 'build'
      tree.  This usually invokes autotool install.
 
-`make MODULE.uninstall'
+'make MODULE.uninstall'
      Uninstall module products; generally the reverse of install.  This
      usually invokes autotool uninstall.
 
-`make MODULE.clean'
-     Clean module; generally the reverse of build.  This usually
-     invokes autotool clean.
+'make MODULE.clean'
+     Clean module; generally the reverse of build.  This usually invokes
+     autotool clean.
 
-`make MODULE.xclean'
+'make MODULE.xclean'
      Extra clean module; first invokes uninstall then recursively
      removes the module build directory.
 
@@ -467,29 +407,20 @@
 -------------------------------
 
 Also available are some very granular targets which help force builds
-from specific cycle points. The following targets are available to
+from specific cycle points.  The following targets are available to
 touch and untouch the respective module target; this will force the
 build system to treat the target as satisfied after a touch or
 unsatisfied after an untouch:
 
    * make MODULE.extract.touch
-
    * make MODULE.extract.untouch
-
    * make MODULE.patch.touch
-
    * make MODULE.patch.untouch
-
    * make MODULE.configure.touch
-
    * make MODULE.configure.untouch
-
    * make MODULE.build.touch
-
    * make MODULE.build.untouch
-
    * make MODULE.install.touch
-
    * make MODULE.install.untouch
 
 5.4.5 Contrib Aggregates
@@ -499,55 +430,45 @@
 modules' respective targets together:
 
    * make contrib.fetch
-
    * make contrib.extract
-
    * make contrib.patch
-
    * make contrib.configure
-
    * make contrib.build
-
    * make contrib.install
-
    * make contrib.uninstall
-
    * make contrib.clean
-
    * make contrib.xclean
 
 5.5 Customizing Make
 ====================
 
-If the need arises to override settings in the build system
-(essentially gnu-make variables) the recommended method is to create
-optional include files which are automatically included if present and
-follow this naming convention; Do not check these files into the
-repository:
+If the need arises to override settings in the build system (essentially
+gnu-make variables) the recommended method is to create optional include
+files which are automatically included if present and follow this naming
+convention; Do not check these files into the repository:
 
-`_SRC_/custom.defs'
-     Custom makevar definitions outside `build'. Suitable for settings
+'_SRC_/custom.defs'
+     Custom makevar definitions outside 'build'.  Suitable for settings
      which apply across all builds for a particular checkout; or which
-     survives manual removal of `build'.
+     survives manual removal of 'build'.
 
-`_SRC_/custom.rules'
-     Custom make rules outside `build'. Suitable for rules which apply
+'_SRC_/custom.rules'
+     Custom make rules outside 'build'.  Suitable for rules which apply
      across all builds for a particular checkout; or which survives
-     manual removal of `build'.
+     manual removal of 'build'.
 
-`_BUILD_/GNUmakefile.custom.defs'
-     Custom makevar definitions specific to a `build' directory.
-
-`_BUILD_/GNUmakefile.custom.rules'
-     Custom makevar rules specific to a `build' directory.
+'_BUILD_/GNUmakefile.custom.defs'
+     Custom makevar definitions specific to a 'build' directory.
 
+'_BUILD_/GNUmakefile.custom.rules'
+     Custom makevar rules specific to a 'build' directory.
 
 The purpose is to allow a place to store local build settings for
 testing, tweaking, and experimenting with build configuration without
-losing your settings if `configure' is invoked; ie: `configure' would
-overwrite `GNUmakefile' and any customizations contained therein would
-be lost. Here is a short example of what the contents of
-`_SRC_/custom.defs' might contain:
+losing your settings if 'configure' is invoked; ie: 'configure' would
+overwrite 'GNUmakefile' and any customizations contained therein would
+be lost.  Here is a short example of what the contents of
+'_SRC_/custom.defs' might contain:
 
      ## bump to gcc-4.6 in current path
      GCC.gcc = /usr/bin/gcc-4.6
@@ -555,33 +476,33 @@
      ## replace optimize for 'speed' with more aggressive settings
      GCC.args.O.speed = -O3 -fomit-frame-pointer -msse4.2
 
-See also `make report.help' which displays a set of reports used to
-dump makefile vars.
+See also 'make report.help' which displays a set of reports used to dump
+makefile vars.
 
 6 Troubleshooting
 *****************
 
 When troubleshooting build issues, the following files relative to the
-`build/' directory may be especially useful:
+'build/' directory may be especially useful:
 
-`GNUmakefile'
+'GNUmakefile'
      Top-level makefile which contains build settings generated via
      configure.
 
-`log/config.info.txt'
+'log/config.info.txt'
      Record of output from configure.
 
-`log/config.verbose.txt'
+'log/config.verbose.txt'
      Record of verbose output from configure.
 
-`log/build.txt'
-     Record of output from `configure --launch'. Similar output may be
-     recorded using `make' depending on which shell is in use, eg:
-     `make >& log/build.txt' or `make > log/build.txt 2>&1'.
+'log/build.txt'
+     Record of output from 'configure --launch'.  Similar output may be
+     recorded using 'make' depending on which shell is in use, eg: 'make
+     >& log/build.txt' or 'make > log/build.txt 2>&1'.
 
-`log/xcodemake.env.txt'
-     Environment (variables) dump as seen when Xcode forks `make'.
-     Mac OS X only.
+'log/xcodemake.env.txt'
+     Environment (variables) dump as seen when Xcode forks 'make'.  Mac
+     OS X only.
 
 Appendix A Project Repository Details
 *************************************
@@ -590,7 +511,6 @@
      root:   svn://svn.handbrake.fr/HandBrake
      branch: trunk
      uuid:   b64f7644-9d1e-0410-96f1-a4d463321fa5
-     rev:    5208
-     date:   2013-01-26 18:47:13 +0000
+     rev:    6419
+     date:   2014-09-21 09:44:45 -0700
      type:   developer
-

HandBrake-0.9.9.tar.bz2/doc/BUILD-Mac -> HandBrake-0.10.0.tar.bz2/doc/BUILD-Mac Changed

@@ -1,145 +1,118 @@
-Build Guide for HandBrake 5388svn on Mac OS X
+Build Guide for HandBrake 6163svn on Mac OS X
 *********************************************
 
-Table of Contents
-*****************
-
 1 Introduction
 2 Prerequisites
 3 QuickStart
 4 Overview
 5 Building via Terminal
-  5.1 Checkout Sources
-  5.2 Configure
-  5.3 Build
-  5.4 Make Targets
-    5.4.1 Global
-    5.4.2 General Modules
-    5.4.3 Contrib Modules
-    5.4.4 Contrib Touch and Untouch
-    5.4.5 Contrib Aggregates
-  5.5 Customizing Make
-  5.6 Universal Binaries
+5.1 Checkout Sources
+5.2 Configure
+5.3 Build
+5.4 Make Targets
+  5.4.1 Global
+  5.4.2 General Modules
+  5.4.3 Contrib Modules
+  5.4.4 Contrib Touch and Untouch
+  5.4.5 Contrib Aggregates
+5.5 Customizing Make
+5.6 Universal Binaries
 6 Building via Xcode.app
-  6.1 Checkout Sources
-  6.2 Build
-  6.3 Note: Finding Built Products
-  6.4 Note: Workspace Log Behaviors
-  6.5 External Target
-  6.6 User-Defined Settings
+6.1 Checkout Sources
+6.2 Build
+6.3 Note: Finding Built Products
+6.4 Note: Workspace Log Behaviors
+6.5 External Target
+6.6 User-Defined Settings
 7 Troubleshooting
 Appendix A Project Repository Details
 
-
 1 Introduction
 **************
 
-This guide documents the recommended process to build HandBrake on
-Mac OS X hosts from the official source-code repository. Building from
-any other source is not supported.
+This guide documents the recommended process to build HandBrake on Mac
+OS X hosts from the official source-code repository.  Building from any
+other source is not supported.
 
 2 Prerequisites
 ***************
 
-Building on Mac OS X is well supported. It is the reference platform
-for HandBrake. The following are the recommended specifications for
+Building on Mac OS X is well supported.  It is the reference platform
+for HandBrake.  The following are the recommended specifications for
 this platform; but is not necessarily the only configuration that is
 possible:
 
    * Mac Intel hardware
-
    * Mac OS X 10.7.5 or Mac OS X 10.8.3
-
    * Xcode 4.6.1 (4H512)
-
-   * llvm-gcc-4.2 version 4.2.1 (Based on Apple Inc. build 5658) (LLVM
+   * llvm-gcc-4.2 version 4.2.1 (Based on Apple Inc.  build 5658) (LLVM
      build 2336.11.00)
-
    * Xcode command-line tools (installed via Preferences > Downloads >
      Components)
-
    * XQuartz (http://xquartz.macosforge.org/landing/)
 
 The following tools are compiled during the build process if necessary,
 but you can speed up your build by installing them:
 
    * yasm 1.2.0 or later
-
    * autoconf
-
    * automake
-
    * libtool
 
-     Note: It is recommended to use the platform distribution's
-     standard compiler for maximum C++ compatibility. If you build with
-     a custom compiler it will likely introduce non-standard runtime
-     requirements and have new/delete, exception and RTTI
-     incompatibilities. There are of course many valid reasons to build
-     with unbundled compilers, but be aware it is generally unsupported
-     and left as an exercise to the reader.
-
+     Note: It is recommended to use the platform distribution's standard
+     compiler for maximum C++ compatibility.  If you build with a custom
+     compiler it will likely introduce non-standard runtime requirements
+     and have new/delete, exception and RTTI incompatibilities.  There
+     are of course many valid reasons to build with unbundled compilers,
+     but be aware it is generally unsupported and left as an exercise to
+     the reader.
 The following general tools are used on various platforms and it is
 recommended you use these versions or similar:
 
    * subversion - 1.6.16
-
    * python - Python 2.7.1
-
    * curl - curl 7.21.4 (or wget)
-
    * m4 - GNU M4 1.4.6
-
    * make - GNU Make 3.81
-
    * patch - Patch 2.5.8
-
    * tar - GNU tar 1.26
-
    * wget - GNU Wget 1.13.4 (or curl)
 
 3 QuickStart
 ************
 
-This chapter is for building from a terminal/shell environment in as
-few commands as possible. Upon completion of the following commands you
-should have a fresh build of HandBrake. Further instructions are
-available beginning with *Note overview:: which describes procedures
-suitable for repeating builds. This chapter should be skipped by those
+This chapter is for building from a terminal/shell environment in as few
+commands as possible.  Upon completion of the following commands you
+should have a fresh build of HandBrake.  Further instructions are
+available beginning with *note overview:: which describes procedures
+suitable for repeating builds.  This chapter should be skipped by those
 seeking more than a minimalist build.
 
      svn checkout svn://svn.handbrake.fr/HandBrake/trunk hb-trunk
      cd hb-trunk
      ./configure --launch
 
-The special option `--launch' selects launch mode and performs the
+The special option '--launch' selects launch mode and performs the
 following steps:
 
-   * assert scratch directory `build/' does not exist
-
-   * create scratch directory `build/'
-
-   * change to directory `build/'
-
-   * launch `make'
-
-   * capture build output to `build/log/build.txt'
-
+   * assert scratch directory 'build/' does not exist
+   * create scratch directory 'build/'
+   * change to directory 'build/'
+   * launch 'make'
+   * capture build output to 'build/log/build.txt'
    * echo build output
-
    * print elapsed time
-
    * indicate if build ultimately succeeded or failed
 
 4 Overview
 **********
 
 The two general methods to build on Mac OS X are from terminal or
-Xcode.app. The preferred method for automated and repeatable builds is
-to use the terminal. Otherwise the choice is generally up to the
-individual. To be extra clear, building from the terminal by default
-actually invokes `xcodebuild' to build the very same targets contained
-in the Xcode project. Think of it as building with Xcode but without
+Xcode.app.  The preferred method for automated and repeatable builds is
+to use the terminal.  Otherwise the choice is generally up to the
+individual.  To be extra clear, building from the terminal by default
+actually invokes 'xcodebuild' to build the very same targets contained
+in the Xcode project.  Think of it as building with Xcode but without
 the GUI.
 
 5 Building via Terminal
@@ -153,13 +126,13 @@
      svn checkout svn://svn.handbrake.fr/HandBrake/trunk hb-trunk
      cd hb-trunk
 
-Sources are checked out from the `trunk' branch. This document was
+Sources are checked out from the 'trunk' branch.  This document was
 generated from that very branch, and for example purposes, we will use
 exactly the same branch.
 
 If you have write-access to the repository, then you may add the
-appropriate login/password information as needed. It is recommended to
-use Subversion 1.6.0 or higher. Lower versions should also work.
+appropriate login/password information as needed.  It is recommended to
+use Subversion 1.6.0 or higher.  Lower versions should also work.
 
 5.2 Configure
 =============
@@ -168,101 +141,98 @@
 
      ./configure
 
-Configure will automatically create a scratch build directory `build'
-unless you use GNU-style build procedures and first `cd' to a directory
-other than top-level source. Additionally you may use `--build' to
-specify the directory. The name of the directory is arbitrary but it is
+Configure will automatically create a scratch build directory 'build'
+unless you use GNU-style build procedures and first 'cd' to a directory
+other than top-level source.  Additionally you may use '--build' to
+specify the directory.  The name of the directory is arbitrary but it is
 recommended to use something which indicates transient files which are
 not checked into the repository.
 
-The `configure' utility accepts many options. It is recommended that
-you specify `--help' for the complete list of options. The following
+The 'configure' utility accepts many options.  It is recommended that
+you specify '--help' for the complete list of options.  The following
 options are also documented here:
 
-`--help'
+'--help'
      List available options.
 
-`--src=DIR'
+'--src=DIR'
      Specify top-level source directory for HandBrake sources.
 
-`--build=DIR'
-     Specify destination directory for final product install. The
-     default is to use either `build' if in the top-level source
-     directory, otherwise `.'
+'--build=DIR'
+     Specify destination directory for final product install.  The
+     default is to use either 'build' if in the top-level source
+     directory, otherwise '.'
 
-`--prefix=DIR'
+'--prefix=DIR'
      Specify destination directory for final product install.  This
      defaults to a reasonable platform-specific value.
 
-`--launch'
+'--launch'
      All-in-one option which launches the build and logs output
      automatically.  Useful for novices and quick-start procedures.
 
-`--disable-gtk'
-     Disable building the GTK GUI on applicable platforms such as
-     Linux.
+'--disable-gtk'
+     Disable building the GTK GUI on applicable platforms such as Linux.
 
-`--debug=MODE'
-     Select debug mode. Must be one of `none', `min', `std', `max'.
-     This generally maps to gcc options `-g0', `-g1', `-g2', `-g3'.
+'--debug=MODE'
+     Select debug mode.  Must be one of 'none', 'min', 'std', 'max'.
+     This generally maps to gcc options '-g0', '-g1', '-g2', '-g3'.
 
-`--optimize=MODE'
-     Select optimize mode. Must be one of `none', `speed', `size'.
-     This generally maps to gcc options `-g0', `-O0', `-O3', `-Os'.
+'--optimize=MODE'
+     Select optimize mode.  Must be one of 'none', 'speed', 'size'.
+     This generally maps to gcc options '-g0', '-O0', '-O3', '-Os'.
 
-`--arch=MODE'
-     Select build architecture. The available architectures vary by
-     platform. Most platforms support exactly one architecture except
+'--arch=MODE'
+     Select build architecture.  The available architectures vary by
+     platform.  Most platforms support exactly one architecture except
      Mac OS X which has support for various universal binary
-     architectures. The available choices are hard-coded per platform
+     architectures.  The available choices are hard-coded per platform
      and no sanity checks for the required tools are performed.
 
-`--disable-xcode'
-     Disable shunting the build through `xcodebuild'. If this option is
-     applied, `HandBrakeCLI' will be produced in a similar fashion as
-     it is on other platforms; sans Xcode and the Cocoa application
-     will not be produced. Mac OS X only.
+'--disable-xcode'
+     Disable shunting the build through 'xcodebuild'.  If this option is
+     applied, 'HandBrakeCLI' will be produced in a similar fashion as it
+     is on other platforms; sans Xcode and the Cocoa application will
+     not be produced.  Mac OS X only.
 
-`--xcconfig=MODE'
-     Select Xcode project configuration file. The available modes are
-     the basenames of files located in `macosx/xcconfig/*.xcconfig'
-     which direct Xcode to build using various architecture and Mac OS
-     X deployment options. Mac OS X only.
+'--xcconfig=MODE'
+     Select Xcode project configuration file.  The available modes are
+     the basenames of files located in 'macosx/xcconfig/*.xcconfig'
+     which direct Xcode to build using various architecture and Mac OS X
+     deployment options.  Mac OS X only.
 
 Clean-room procedures dictate that when certain factors change, old
-builds should be scrapped and new builds configured. This is the main
+builds should be scrapped and new builds configured.  This is the main
 reason for requiring a scratch directory; to promote consistent,
-reliable and clean software builds. The following is a short list of
+reliable and clean software builds.  The following is a short list of
 some of the reasons why someone may choose to scrap an existing build:
 
    * configure with different options
-
    * subversion working dir is updated and you want configure to
      re-evaluate working dir metadata.
-
    * build corruption is suspected
 
-There are generally two methods for scrapping a build. The `build'
+There are generally two methods for scrapping a build.  The 'build'
 directory can be recursively removed which has the effect of loosing
 your existing configuration but does guarantee no residuals are left
-behind. The other method is to ask the build system to perform an `make
-xclean'. This is known to work well but will leave empty directories
-behind. However, the configuration is left intact.
+behind.  The other method is to ask the build system to perform an 'make
+xclean'.  This is known to work well but will leave empty directories
+behind.  However, the configuration is left intact.
 
 5.3 Build
 =========
 
-Build main product. All necessary dependencies are also built if
+Build main product.  All necessary dependencies are also built if
 required.
 
      make
 
-Parallel builds may optionally be enabled. Be aware that while a
+Parallel builds may optionally be enabled.  Be aware that while a
 parallel build may save time on systems with additional cores, the
 output is often mixed, overlapped and sometimes even corrupted with
-binary characters. Thus if you experience a build issue, you should
+binary characters.  Thus if you experience a build issue, you should
 clean and redo the build in default serial mode to produce a readable
-log. The following command allows for up to 4 concurrent jobs via make:
+log.  The following command allows for up to 4 concurrent jobs via make:
 
      make -j4
 
@@ -270,105 +240,104 @@
 ================
 
 The build system supports passing many kinds of targets some of which
-become very useful in normal development cycles. The targets by
-convention are lower-case words passed to `make'. Global targets are
-one-word targets. Scoped targets are usually two-words separated by a
+become very useful in normal development cycles.  The targets by
+convention are lower-case words passed to 'make'.  Global targets are
+one-word targets.  Scoped targets are usually two-words separated by a
 period.
 
 5.4.1 Global
 ------------
 
-`make'
-     Alias for `make build'.
+'make'
+     Alias for 'make build'.
 
-`make build'
-     Build main product. All necessary dependencies are also built if
+'make build'
+     Build main product.  All necessary dependencies are also built if
      required.
 
-`make clean'
-     Clean all build output excluding contrib modules. Configuration is
+'make clean'
+     Clean all build output excluding contrib modules.  Configuration is
      retained.
 
-`make install'
-     Perform final product(s) install.  This will install build
-     products to a standard directory or one specified via `configure
-     --prefix' option.
+'make install'
+     Perform final product(s) install.  This will install build products
+     to a standard directory or one specified via 'configure --prefix'
+     option.
 
-`make uninstall'
+'make uninstall'
      Perform final product(s) uninstall.  This will uninstall any
      products which may have been previously installed.
 
-`make xclean'
-     Clean all build output including contrib modules. Configuration is
+'make xclean'
+     Clean all build output including contrib modules.  Configuration is
      retained.
 
-`make doc'
-     Build auto-generated project documentation. Various articles are
-     produced and may be found in `build/doc/articles'.
+'make doc'
+     Build auto-generated project documentation.  Various articles are
+     produced and may be found in 'build/doc/articles'.
 
-`make doc.post'
+'make doc.post'
      Build auto-generated project documentation and post produced
      articles directly to source tree.
 
-`make report.help'
+'make report.help'
      Print list of available makefile vars report targets.  These
      reports detail var definitions and expanded values used by the
      build system.  For experts only.
 
-`make report.all'
+'make report.all'
      Convenience target which aggregates all reports.  For experts only.
 
 5.4.2 General Modules
 ---------------------
 
-General modules such as `libhb', `test' and `gtk' have the following
+General modules such as 'libhb', 'test' and 'gtk' have the following
 scoped targets:
 
-`make MODULE.build'
+'make MODULE.build'
      Build MODULE.
 
-`make MODULE.clean'
+'make MODULE.clean'
      Clean build output for MODULE.
 
 5.4.3 Contrib Modules
 ---------------------
 
-Contrib modules such as `a52dec', `bzip2', `faac', `faad2', `ffmpeg',
-`fontconfig', `freetype', `fribidi', `lame', `libass', `libbluray',
-`libdca', `libdvdnav', `libdvdread', `libdvdread', `libiconv',
-`libmkv', `libogg', `libsamplerate', `libtheora', `libvorbis',
-`libxml2', `mp4v2', `mpeg2dec', `x264', `yasm' and `zlib' have the
-following scoped targets:
+Contrib modules such as 'a52dec', 'bzip2', 'faac', 'faad2', 'ffmpeg',
+'fontconfig', 'freetype', 'fribidi', 'lame', 'libass', 'libbluray',
+'libdca', 'libdvdnav', 'libdvdread', 'libiconv', 'libmkv', 'libogg',
+'libsamplerate', 'libtheora', 'libvorbis', 'libxml2', 'mp4v2',
+'mpeg2dec', 'x264', 'yasm' and 'zlib' have the following scoped targets:
 
-`make MODULE.fetch'
+'make MODULE.fetch'
      Download source tarball from the Internet and save to
-     `TOP/downloads' directory. No check-summing is performed.
+     'TOP/downloads' directory.  No check-summing is performed.
 
-`make MODULE.extract'
-     Extract source tarball into `build' tree.
+'make MODULE.extract'
+     Extract source tarball into 'build' tree.
 
-`make MODULE.patch'
+'make MODULE.patch'
      Apply appropriate patches (if any) to module sources.
 
-`make MODULE.configure'
+'make MODULE.configure'
      Configure module sources.  This usually invokes autotool configure.
 
-`make MODULE.build'
+'make MODULE.build'
      Build module.  This usually invokes autotool build.
 
-`make MODULE.install'
-     Install module products such as headers and libraries into `build'
+'make MODULE.install'
+     Install module products such as headers and libraries into 'build'
      tree.  This usually invokes autotool install.
 
-`make MODULE.uninstall'
+'make MODULE.uninstall'
      Uninstall module products; generally the reverse of install.  This
      usually invokes autotool uninstall.
 
-`make MODULE.clean'
-     Clean module; generally the reverse of build.  This usually
-     invokes autotool clean.
+'make MODULE.clean'
+     Clean module; generally the reverse of build.  This usually invokes
+     autotool clean.
 
-`make MODULE.xclean'
+'make MODULE.xclean'
      Extra clean module; first invokes uninstall then recursively
      removes the module build directory.
 
@@ -376,29 +345,20 @@
 -------------------------------
 
 Also available are some very granular targets which help force builds
-from specific cycle points. The following targets are available to
+from specific cycle points.  The following targets are available to
 touch and untouch the respective module target; this will force the
 build system to treat the target as satisfied after a touch or
 unsatisfied after an untouch:
 
    * make MODULE.extract.touch
-
    * make MODULE.extract.untouch
-
    * make MODULE.patch.touch
-
    * make MODULE.patch.untouch
-
    * make MODULE.configure.touch
-
    * make MODULE.configure.untouch
-
    * make MODULE.build.touch
-
    * make MODULE.build.untouch
-
    * make MODULE.install.touch
-
    * make MODULE.install.untouch
 
 5.4.5 Contrib Aggregates
@@ -408,55 +368,45 @@
 modules' respective targets together:
 
    * make contrib.fetch
-
    * make contrib.extract
-
    * make contrib.patch
-
    * make contrib.configure
-
    * make contrib.build
-
    * make contrib.install
-
    * make contrib.uninstall
-
    * make contrib.clean
-
    * make contrib.xclean
 
 5.5 Customizing Make
 ====================
 
-If the need arises to override settings in the build system
-(essentially gnu-make variables) the recommended method is to create
-optional include files which are automatically included if present and
-follow this naming convention; Do not check these files into the
-repository:
+If the need arises to override settings in the build system (essentially
+gnu-make variables) the recommended method is to create optional include
+files which are automatically included if present and follow this naming
+convention; Do not check these files into the repository:
 
-`_SRC_/custom.defs'
-     Custom makevar definitions outside `build'. Suitable for settings
+'_SRC_/custom.defs'
+     Custom makevar definitions outside 'build'.  Suitable for settings
      which apply across all builds for a particular checkout; or which
-     survives manual removal of `build'.
+     survives manual removal of 'build'.
 
-`_SRC_/custom.rules'
-     Custom make rules outside `build'. Suitable for rules which apply
+'_SRC_/custom.rules'
+     Custom make rules outside 'build'.  Suitable for rules which apply
      across all builds for a particular checkout; or which survives
-     manual removal of `build'.
+     manual removal of 'build'.
 
-`_BUILD_/GNUmakefile.custom.defs'
-     Custom makevar definitions specific to a `build' directory.
-
-`_BUILD_/GNUmakefile.custom.rules'
-     Custom makevar rules specific to a `build' directory.
+'_BUILD_/GNUmakefile.custom.defs'
+     Custom makevar definitions specific to a 'build' directory.
 
+'_BUILD_/GNUmakefile.custom.rules'
+     Custom makevar rules specific to a 'build' directory.
 
 The purpose is to allow a place to store local build settings for
 testing, tweaking, and experimenting with build configuration without
-losing your settings if `configure' is invoked; ie: `configure' would
-overwrite `GNUmakefile' and any customizations contained therein would
-be lost. Here is a short example of what the contents of
-`_SRC_/custom.defs' might contain:
+losing your settings if 'configure' is invoked; ie: 'configure' would
+overwrite 'GNUmakefile' and any customizations contained therein would
+be lost.  Here is a short example of what the contents of
+'_SRC_/custom.defs' might contain:
 
      ## bump to gcc-4.6 in current path
      GCC.gcc = /usr/bin/gcc-4.6
@@ -464,8 +414,8 @@
      ## replace optimize for 'speed' with more aggressive settings
      GCC.args.O.speed = -O3 -fomit-frame-pointer -msse4.2
 
-See also `make report.help' which displays a set of reports used to
-dump makefile vars.
+See also 'make report.help' which displays a set of reports used to dump
+makefile vars.
 
 5.6 Universal Binaries
 ======================
@@ -474,8 +424,8 @@
 Binaries for all the architectures.
 
      Note: The dummy (container) build configuration uses
-     `--disable-xcode'; but the nested architecture builds will all
-     make full use of Xcode.
+     '--disable-xcode'; but the nested architecture builds will all make
+     full use of Xcode.
 
 Create a dummy (container) build configuration and use it to launch a
 nested-build for each architecture:
@@ -487,7 +437,7 @@
 
 The list of architectures is hard coded to HandBrake's desired product
 and currently is composed of combining the binaries produced from two
-xcconfigs: osx106.i386 and osx106.x86_64. The following example shows
+xcconfigs: osx106.i386 and osx106.x86_64.  The following example shows
 how to specify a different list of xcconfigs:
 
      ./configure --disable-xcode
@@ -506,72 +456,60 @@
      svn checkout svn://svn.handbrake.fr/HandBrake/trunk hb-trunk
      cd hb-trunk
 
-Sources are checked out from the `trunk' branch. This document was
+Sources are checked out from the 'trunk' branch.  This document was
 generated from that very branch, and for example purposes, we will use
 exactly the same branch.
 
 If you have write-access to the repository, then you may add the
-appropriate login/password information as needed. It is recommended to
-use Subversion 1.6.0 or higher. Lower versions should also work.
+appropriate login/password information as needed.  It is recommended to
+use Subversion 1.6.0 or higher.  Lower versions should also work.
 
 6.2 Build
 =========
 
 Perform the following steps to build:
 
-   * Finder - navigate to `macosx/' in the HandBrake source tree
-
-   * Finder - open `HandBrake.xcodeproj'
-
+   * Finder - navigate to 'macosx/' in the HandBrake source tree
+   * Finder - open 'HandBrake.xcodeproj'
    * Xcode workspace - select scheme HandBrake [RELEASE]
-
    * Xcode menu - select Product -> Build
-
    * Xcode workspace - Show the Log navigator
-
    * Xcode workspace Log navigator - select top Build item
 
 6.3 Note: Finding Built Products
 ================================
 
-Under default Xcode.app options the products from a build are managed
-by the Xcode Organizer. Perform the following steps to open Finder at
-top of build tree and navigate to release products:
+Under default Xcode.app options the products from a build are managed by
+the Xcode Organizer.  Perform the following steps to open Finder at top
+of build tree and navigate to release products:
 
    * Xcode menu - select Window -> Organizer
-
    * Xcode organizer - select Projects tab
-
    * Xcode organizer Projects - select HandBrake item
-
    * HandBrake item - click Derived Data location arrow (immediately
      right of path)
-
    * Finder - navigate to Build -> Products -> release
 
-     Note: There is a bug with Xcode Organizer. The very first time an
+     Note: There is a bug with Xcode Organizer.  The very first time an
      Xcode project is opened the Project view Derived Data is
-     greyed-out. Workaround glitch by selecting any other tab and then
+     greyed-out.  Workaround glitch by selecting any other tab and then
      reselecting Projects tab.
 
 6.4 Note: Workspace Log Behaviors
 =================================
 
 The default Workspace behavior does not display latest Build log in the
-navigator and quickly becomes tedious. To automatically switch to Log
+navigator and quickly becomes tedious.  To automatically switch to Log
 navigator and show current log:
 
    * Xcode menu - select Behaviors -> Edit Behaviors
-
    * Xcode behaviors - select Build starts
-
    * navigator - enable, select Show, select Log Navigator
-
    * nagivate to - select current log
 
      Note: The Log navigator supports some possibly confusing options.
      It is recommended to only show results for the last build by
-     selecting Recent. If All is selected then it will look as though
+     selecting Recent.  If All is selected then it will look as though
      Xcode is performing a build, but in reality it is bringing forward
      log output from prior builds and it becomes impossible to tell if
      any single log entry represents actual work performed or if it was
@@ -579,39 +517,35 @@
 
      Note: When building external target, many 3rd-party contributed
      modules have warnings and errors which may safely be ignored and
-     are ignored by the external build system. Ultimately, look to the
+     are ignored by the external build system.  Ultimately, look to the
      workspace status indicator for Build Succeeded.
 
 6.5 External Target
 ===================
 
 The external target mechanism is used to launch a full terminal-based
-build from within Xcode. Unfortunately, we do not have hooks in place
-to offer finer-grained control over per-module make actions. However,
-you can still use terminal to accomplish those tasks after launching
-the build at least once or doing a clean from within Xcode. Be careful
-to not issue terminal commands simultaneously with Xcode tasks.
+build from within Xcode.  Unfortunately, we do not have hooks in place
+to offer finer-grained control over per-module make actions.  However,
+you can still use terminal to accomplish those tasks after launching the
+build at least once or doing a clean from within Xcode.  Be careful to
+not issue terminal commands simultaneously with Xcode tasks.
 
 Invoking a clean from Xcode always destroys the entire external build
-tree and subsequently configures it. Changing settings in Xcode such as
-selecting xcconfig files should always be followed by a clean. This
+tree and subsequently configures it.  Changing settings in Xcode such as
+selecting xcconfig files should always be followed by a clean.  This
 allows the external build system configuration to accurately reflect
 Xcode project changes.
 
-The following are some examples of using `make' from the terminal to
-effect various components of the external build. But first, you must
-open a terminal at the top of the external build output tree. Here we
+The following are some examples of using 'make' from the terminal to
+effect various components of the external build.  But first, you must
+open a terminal at the top of the external build output tree.  Here we
 navigate to external build configured for release:
 
    * Xcode menu - select Window -> Organizer
-
    * Xcode organizer - select Projects tab
-
    * Xcode organizer Projects - select HandBrake item
-
    * HandBrake item - click Derived Data location arrow (immediately
      right of path)
-
    * Finder - navigate to Build -> Products -> release -> external
 
 Example; external build failed but error is buried in a parallelized
@@ -638,59 +572,57 @@
 6.6 User-Defined Settings
 =========================
 
-The following user defined settings are visible in Xcode project and
-are used for the external build system.
+The following user defined settings are visible in Xcode project and are
+used for the external build system.
 
-`EXTERNAL_BUILD'
+'EXTERNAL_BUILD'
      Do not modify; used to specify the build (scratch) directory.
 
-`EXTERNAL_DRIVER'
+'EXTERNAL_DRIVER'
      Do not modify; used for internal/external build coordination and
-     must always be `xcode'.
-
-`EXTERNAL_JOBS'
-     Specifies the concurrency factor for the external build system
-     when builds are launched from within Xcode.  Modify for faster
-     external builds if your system has the horsepower and resources.
-     Specifying a value greater than the number of CPU cores (or
-     virtual cores) in your system is unlikely to produce gains and
-     will needlessly consume extra resources. A special string value of
-     auto sets the factor to the number of active CPUs on the host
-     system.
-
-`EXTERNAL_SRC'
+     must always be 'xcode'.
+
+'EXTERNAL_JOBS'
+     Specifies the concurrency factor for the external build system when
+     builds are launched from within Xcode.  Modify for faster external
+     builds if your system has the horsepower and resources.  Specifying
+     a value greater than the number of CPU cores (or virtual cores) in
+     your system is unlikely to produce gains and will needlessly
+     consume extra resources.  A special string value of auto sets the
+     factor to the number of active CPUs on the host system.
+
+'EXTERNAL_SRC'
      Do not modify; specifies the top-level source directory for
      HandBrake, relative to Xcode project.
 
-`EXTERNAL_XCCONFIG'
-     Do not modify; specifies which xcconfig file is active. Defined
+'EXTERNAL_XCCONFIG'
+     Do not modify; specifies which xcconfig file is active.  Defined
      inside xcconfig file.
 
-
 7 Troubleshooting
 *****************
 
 When troubleshooting build issues, the following files relative to the
-`build/' directory may be especially useful:
+'build/' directory may be especially useful:
 
-`GNUmakefile'
+'GNUmakefile'
      Top-level makefile which contains build settings generated via
      configure.
 
-`log/config.info.txt'
+'log/config.info.txt'
      Record of output from configure.
 
-`log/config.verbose.txt'
+'log/config.verbose.txt'
      Record of verbose output from configure.
 
-`log/build.txt'
-     Record of output from `configure --launch'. Similar output may be
-     recorded using `make' depending on which shell is in use, eg:
-     `make >& log/build.txt' or `make > log/build.txt 2>&1'.
+'log/build.txt'
+     Record of output from 'configure --launch'.  Similar output may be
+     recorded using 'make' depending on which shell is in use, eg: 'make
+     >& log/build.txt' or 'make > log/build.txt 2>&1'.
 
-`log/xcodemake.env.txt'
-     Environment (variables) dump as seen when Xcode forks `make'.
-     Mac OS X only.
+'log/xcodemake.env.txt'
+     Environment (variables) dump as seen when Xcode forks 'make'.  Mac
+     OS X only.
 
 Appendix A Project Repository Details
 *************************************
@@ -699,7 +631,6 @@
      root:   svn://svn.handbrake.fr/HandBrake
      branch: trunk
      uuid:   b64f7644-9d1e-0410-96f1-a4d463321fa5
-     rev:    5388
-     date:   2013-04-09 14:21:38 +0200
+     rev:    6163
+     date:   2014-04-13 09:22:16 -0700
      type:   developer
-

HandBrake-0.9.9.tar.bz2/doc/BUILD-MinGW -> HandBrake-0.10.0.tar.bz2/doc/BUILD-MinGW Changed

@@ -1,66 +1,60 @@
-Guide to Building HandBrake svn5208 (2013012701) on MinGW
+Guide to Building HandBrake svn6163 (2014041401) on MinGW
 *********************************************************
 
-Table of Contents
-*****************
-
 1 Introduction
 2 Prerequisites
 3 QuickStart
 4 Overview
 5 Building via Terminal
-  5.1 Checkout Sources
-  5.2 Configure
-  5.3 Build
-  5.4 Make Targets
-    5.4.1 Global
-    5.4.2 General Modules
-    5.4.3 Contrib Modules
-    5.4.4 Contrib Touch and Untouch
-    5.4.5 Contrib Aggregates
-  5.5 Customizing Make
+5.1 Checkout Sources
+5.2 Configure
+5.3 Build
+5.4 Make Targets
+  5.4.1 Global
+  5.4.2 General Modules
+  5.4.3 Contrib Modules
+  5.4.4 Contrib Touch and Untouch
+  5.4.5 Contrib Aggregates
+5.5 Customizing Make
 6 Troubleshooting
 Appendix A Project Repository Details
 
-
 1 Introduction
 **************
 
-This guide documents the recommended process to build HandBrake on
-MinGW hosts from the official source-code repository. Building from any
-other source is not supported.
+This guide documents the recommended process to build HandBrake on MinGW
+hosts from the official source-code repository.  Building from any other
+source is not supported.
 
 2 Prerequisites
 ***************
 
-The following are the recommended specifications for building on
-MinGW; but is not necessarily the only configuration that is possible:
+The following are the recommended specifications for building on MinGW;
+but is not necessarily the only configuration that is possible:
 
    * Intel 32-bit or 64-bit hardware
-
-   * MinGW on Fedora 17+, Ubuntu 12+ or Debian, gcc 4.5+
-
+   * MinGW on Fedora 17+, Ubuntu 12+ or Debian, gcc 4.6+
    * yasm 1.2.x (for i386 or x86_64 architectures)
 
-     Note: It is recommended to use the platform distribution's
-     standard compiler for maximum C++ compatibility. If you build with
-     a custom compiler it will likely introduce non-standard runtime
-     requirements and have new/delete, exception and RTTI
-     incompatibilities. There are of course many valid reasons to build
-     with unbundled compilers, but be aware it is generally unsupported
-     and left as an exercise to the reader.
+     Note: It is recommended to use the platform distribution's standard
+     compiler for maximum C++ compatibility.  If you build with a custom
+     compiler it will likely introduce non-standard runtime requirements
+     and have new/delete, exception and RTTI incompatibilities.  There
+     are of course many valid reasons to build with unbundled compilers,
+     but be aware it is generally unsupported and left as an exercise to
+     the reader.
 
      Note: You must set the -cross flag with configure to cross compile
-     with windows.  See the Example below. Note that the cross compiler
+     with windows.  See the Example below.  Note that the cross compiler
      name varies between distributions.
 
      As of this writing, MinGW has available to it several versions of
-     gcc; only one of which may be found and used in the path as `gcc'
-     and `g++'. Configure will thus find what is probably the older
-     version of gcc in a typical MinGW environment. If you desire to
-     build with the newer gcc, it is found in the path as `gcc-4' and
-     `g++-4' respectively and you must indicate to configure the
-     desired versions. The following syntax should do the trick:
+     gcc; only one of which may be found and used in the path as 'gcc'
+     and 'g++'.  Configure will thus find what is probably the older
+     version of gcc in a typical MinGW environment.  If you desire to
+     build with the newer gcc, it is found in the path as 'gcc-4' and
+     'g++-4' respectively and you must indicate to configure the desired
+     versions.  The following syntax should do the trick:
 
      ../configure --cross=i686-w64-mingw32 --gcc=gcc-4
 
@@ -68,58 +62,44 @@
 recommended you use these versions or similar:
 
    * subversion - 1.6.16
-
    * python - Python 2.7.1
-
    * curl - curl 7.21.4 (or wget)
-
    * m4 - GNU M4 1.4.6
-
    * make - GNU Make 3.81
-
    * patch - Patch 2.5.8
-
    * tar - GNU tar 1.26
-
    * wget - GNU Wget 1.13.4 (or curl)
 
 3 QuickStart
 ************
 
-This chapter is for building from a terminal/shell environment in as
-few commands as possible. Upon completion of the following commands you
-should have a fresh build of HandBrake. Further instructions are
-available beginning with *Note overview:: which describes procedures
-suitable for repeating builds. This chapter should be skipped by those
+This chapter is for building from a terminal/shell environment in as few
+commands as possible.  Upon completion of the following commands you
+should have a fresh build of HandBrake.  Further instructions are
+available beginning with *note overview:: which describes procedures
+suitable for repeating builds.  This chapter should be skipped by those
 seeking more than a minimalist build.
 
      svn checkout svn://svn.handbrake.fr/HandBrake/trunk hb-trunk
      cd hb-trunk
      ./configure --launch
 
-The special option `--launch' selects launch mode and performs the
+The special option '--launch' selects launch mode and performs the
 following steps:
 
-   * assert scratch directory `build/' does not exist
-
-   * create scratch directory `build/'
-
-   * change to directory `build/'
-
-   * launch `make'
-
-   * capture build output to `build/log/build.txt'
-
+   * assert scratch directory 'build/' does not exist
+   * create scratch directory 'build/'
+   * change to directory 'build/'
+   * launch 'make'
+   * capture build output to 'build/log/build.txt'
    * echo build output
-
    * print elapsed time
-
    * indicate if build ultimately succeeded or failed
 
 4 Overview
 **********
 
-MinGW builds are performed from a terminal. There is no support for
+MinGW builds are performed from a terminal.  There is no support for
 building from any IDEs.
 
 5 Building via Terminal
@@ -133,13 +113,13 @@
      svn checkout svn://svn.handbrake.fr/HandBrake/trunk hb-trunk
      cd hb-trunk
 
-Sources are checked out from the `trunk' branch. This document was
+Sources are checked out from the 'trunk' branch.  This document was
 generated from that very branch, and for example purposes, we will use
 exactly the same branch.
 
 If you have write-access to the repository, then you may add the
-appropriate login/password information as needed. It is recommended to
-use Subversion 1.6.0 or higher. Lower versions should also work.
+appropriate login/password information as needed.  It is recommended to
+use Subversion 1.6.0 or higher.  Lower versions should also work.
 
 5.2 Configure
 =============
@@ -148,101 +128,98 @@
 
      ./configure
 
-Configure will automatically create a scratch build directory `build'
-unless you use GNU-style build procedures and first `cd' to a directory
-other than top-level source. Additionally you may use `--build' to
-specify the directory. The name of the directory is arbitrary but it is
+Configure will automatically create a scratch build directory 'build'
+unless you use GNU-style build procedures and first 'cd' to a directory
+other than top-level source.  Additionally you may use '--build' to
+specify the directory.  The name of the directory is arbitrary but it is
 recommended to use something which indicates transient files which are
 not checked into the repository.
 
-The `configure' utility accepts many options. It is recommended that
-you specify `--help' for the complete list of options. The following
+The 'configure' utility accepts many options.  It is recommended that
+you specify '--help' for the complete list of options.  The following
 options are also documented here:
 
-`--help'
+'--help'
      List available options.
 
-`--src=DIR'
+'--src=DIR'
      Specify top-level source directory for HandBrake sources.
 
-`--build=DIR'
-     Specify destination directory for final product install. The
-     default is to use either `build' if in the top-level source
-     directory, otherwise `.'
+'--build=DIR'
+     Specify destination directory for final product install.  The
+     default is to use either 'build' if in the top-level source
+     directory, otherwise '.'
 
-`--prefix=DIR'
+'--prefix=DIR'
      Specify destination directory for final product install.  This
      defaults to a reasonable platform-specific value.
 
-`--launch'
+'--launch'
      All-in-one option which launches the build and logs output
      automatically.  Useful for novices and quick-start procedures.
 
-`--disable-gtk'
-     Disable building the GTK GUI on applicable platforms such as
-     Linux.
+'--disable-gtk'
+     Disable building the GTK GUI on applicable platforms such as Linux.
 
-`--debug=MODE'
-     Select debug mode. Must be one of `none', `min', `std', `max'.
-     This generally maps to gcc options `-g0', `-g1', `-g2', `-g3'.
+'--debug=MODE'
+     Select debug mode.  Must be one of 'none', 'min', 'std', 'max'.
+     This generally maps to gcc options '-g0', '-g1', '-g2', '-g3'.
 
-`--optimize=MODE'
-     Select optimize mode. Must be one of `none', `speed', `size'.
-     This generally maps to gcc options `-g0', `-O0', `-O3', `-Os'.
+'--optimize=MODE'
+     Select optimize mode.  Must be one of 'none', 'speed', 'size'.
+     This generally maps to gcc options '-g0', '-O0', '-O3', '-Os'.
 
-`--arch=MODE'
-     Select build architecture. The available architectures vary by
-     platform. Most platforms support exactly one architecture except
+'--arch=MODE'
+     Select build architecture.  The available architectures vary by
+     platform.  Most platforms support exactly one architecture except
      Mac OS X which has support for various universal binary
-     architectures. The available choices are hard-coded per platform
+     architectures.  The available choices are hard-coded per platform
      and no sanity checks for the required tools are performed.
 
-`--disable-xcode'
-     Disable shunting the build through `xcodebuild'. If this option is
-     applied, `HandBrakeCLI' will be produced in a similar fashion as
-     it is on other platforms; sans Xcode and the Cocoa application
-     will not be produced. Mac OS X only.
+'--disable-xcode'
+     Disable shunting the build through 'xcodebuild'.  If this option is
+     applied, 'HandBrakeCLI' will be produced in a similar fashion as it
+     is on other platforms; sans Xcode and the Cocoa application will
+     not be produced.  Mac OS X only.
 
-`--xcconfig=MODE'
-     Select Xcode project configuration file. The available modes are
-     the basenames of files located in `macosx/xcconfig/*.xcconfig'
-     which direct Xcode to build using various architecture and Mac OS
-     X deployment options. Mac OS X only.
+'--xcconfig=MODE'
+     Select Xcode project configuration file.  The available modes are
+     the basenames of files located in 'macosx/xcconfig/*.xcconfig'
+     which direct Xcode to build using various architecture and Mac OS X
+     deployment options.  Mac OS X only.
 
 Clean-room procedures dictate that when certain factors change, old
-builds should be scrapped and new builds configured. This is the main
+builds should be scrapped and new builds configured.  This is the main
 reason for requiring a scratch directory; to promote consistent,
-reliable and clean software builds. The following is a short list of
+reliable and clean software builds.  The following is a short list of
 some of the reasons why someone may choose to scrap an existing build:
 
    * configure with different options
-
    * subversion working dir is updated and you want configure to
      re-evaluate working dir metadata.
-
    * build corruption is suspected
 
-There are generally two methods for scrapping a build. The `build'
+There are generally two methods for scrapping a build.  The 'build'
 directory can be recursively removed which has the effect of loosing
 your existing configuration but does guarantee no residuals are left
-behind. The other method is to ask the build system to perform an `make
-xclean'. This is known to work well but will leave empty directories
-behind. However, the configuration is left intact.
+behind.  The other method is to ask the build system to perform an 'make
+xclean'.  This is known to work well but will leave empty directories
+behind.  However, the configuration is left intact.
 
 5.3 Build
 =========
 
-Build main product. All necessary dependencies are also built if
+Build main product.  All necessary dependencies are also built if
 required.
 
      make
 
-Parallel builds may optionally be enabled. Be aware that while a
+Parallel builds may optionally be enabled.  Be aware that while a
 parallel build may save time on systems with additional cores, the
 output is often mixed, overlapped and sometimes even corrupted with
-binary characters. Thus if you experience a build issue, you should
+binary characters.  Thus if you experience a build issue, you should
 clean and redo the build in default serial mode to produce a readable
-log. The following command allows for up to 4 concurrent jobs via make:
+log.  The following command allows for up to 4 concurrent jobs via make:
 
      make -j4
 
@@ -250,105 +227,104 @@
 ================
 
 The build system supports passing many kinds of targets some of which
-become very useful in normal development cycles. The targets by
-convention are lower-case words passed to `make'. Global targets are
-one-word targets. Scoped targets are usually two-words separated by a
+become very useful in normal development cycles.  The targets by
+convention are lower-case words passed to 'make'.  Global targets are
+one-word targets.  Scoped targets are usually two-words separated by a
 period.
 
 5.4.1 Global
 ------------
 
-`make'
-     Alias for `make build'.
+'make'
+     Alias for 'make build'.
 
-`make build'
-     Build main product. All necessary dependencies are also built if
+'make build'
+     Build main product.  All necessary dependencies are also built if
      required.
 
-`make clean'
-     Clean all build output excluding contrib modules. Configuration is
+'make clean'
+     Clean all build output excluding contrib modules.  Configuration is
      retained.
 
-`make install'
-     Perform final product(s) install.  This will install build
-     products to a standard directory or one specified via `configure
-     --prefix' option.
+'make install'
+     Perform final product(s) install.  This will install build products
+     to a standard directory or one specified via 'configure --prefix'
+     option.
 
-`make uninstall'
+'make uninstall'
      Perform final product(s) uninstall.  This will uninstall any
      products which may have been previously installed.
 
-`make xclean'
-     Clean all build output including contrib modules. Configuration is
+'make xclean'
+     Clean all build output including contrib modules.  Configuration is
      retained.
 
-`make doc'
-     Build auto-generated project documentation. Various articles are
-     produced and may be found in `build/doc/articles'.
+'make doc'
+     Build auto-generated project documentation.  Various articles are
+     produced and may be found in 'build/doc/articles'.
 
-`make doc.post'
+'make doc.post'
      Build auto-generated project documentation and post produced
      articles directly to source tree.
 
-`make report.help'
+'make report.help'
      Print list of available makefile vars report targets.  These
      reports detail var definitions and expanded values used by the
      build system.  For experts only.
 
-`make report.all'
+'make report.all'
      Convenience target which aggregates all reports.  For experts only.
 
 5.4.2 General Modules
 ---------------------
 
-General modules such as `libhb', `test' and `gtk' have the following
+General modules such as 'libhb', 'test' and 'gtk' have the following
 scoped targets:
 
-`make MODULE.build'
+'make MODULE.build'
      Build MODULE.
 
-`make MODULE.clean'
+'make MODULE.clean'
      Clean build output for MODULE.
 
 5.4.3 Contrib Modules
 ---------------------
 
-Contrib modules such as `a52dec', `bzip2', `faac', `faad2', `ffmpeg',
-`fontconfig', `freetype', `fribidi', `lame', `libass', `libbluray',
-`libdca', `libdvdnav', `libdvdread', `libdvdread', `libiconv',
-`libmkv', `libogg', `libsamplerate', `libtheora', `libvorbis',
-`libxml2', `mp4v2', `mpeg2dec', `x264', `yasm' and `zlib' have the
-following scoped targets:
+Contrib modules such as 'a52dec', 'bzip2', 'faac', 'faad2', 'ffmpeg',
+'fontconfig', 'freetype', 'fribidi', 'lame', 'libass', 'libbluray',
+'libdca', 'libdvdnav', 'libdvdread', 'libiconv', 'libmkv', 'libogg',
+'libsamplerate', 'libtheora', 'libvorbis', 'libxml2', 'mp4v2',
+'mpeg2dec', 'x264', 'yasm' and 'zlib' have the following scoped targets:
 
-`make MODULE.fetch'
+'make MODULE.fetch'
      Download source tarball from the Internet and save to
-     `TOP/downloads' directory. No check-summing is performed.
+     'TOP/downloads' directory.  No check-summing is performed.
 
-`make MODULE.extract'
-     Extract source tarball into `build' tree.
+'make MODULE.extract'
+     Extract source tarball into 'build' tree.
 
-`make MODULE.patch'
+'make MODULE.patch'
      Apply appropriate patches (if any) to module sources.
 
-`make MODULE.configure'
+'make MODULE.configure'
      Configure module sources.  This usually invokes autotool configure.
 
-`make MODULE.build'
+'make MODULE.build'
      Build module.  This usually invokes autotool build.
 
-`make MODULE.install'
-     Install module products such as headers and libraries into `build'
+'make MODULE.install'
+     Install module products such as headers and libraries into 'build'
      tree.  This usually invokes autotool install.
 
-`make MODULE.uninstall'
+'make MODULE.uninstall'
      Uninstall module products; generally the reverse of install.  This
      usually invokes autotool uninstall.
 
-`make MODULE.clean'
-     Clean module; generally the reverse of build.  This usually
-     invokes autotool clean.
+'make MODULE.clean'
+     Clean module; generally the reverse of build.  This usually invokes
+     autotool clean.
 
-`make MODULE.xclean'
+'make MODULE.xclean'
      Extra clean module; first invokes uninstall then recursively
      removes the module build directory.
 
@@ -356,29 +332,20 @@
 -------------------------------
 
 Also available are some very granular targets which help force builds
-from specific cycle points. The following targets are available to
+from specific cycle points.  The following targets are available to
 touch and untouch the respective module target; this will force the
 build system to treat the target as satisfied after a touch or
 unsatisfied after an untouch:
 
    * make MODULE.extract.touch
-
    * make MODULE.extract.untouch
-
    * make MODULE.patch.touch
-
    * make MODULE.patch.untouch
-
    * make MODULE.configure.touch
-
    * make MODULE.configure.untouch
-
    * make MODULE.build.touch
-
    * make MODULE.build.untouch
-
    * make MODULE.install.touch
-
    * make MODULE.install.untouch
 
 5.4.5 Contrib Aggregates
@@ -388,55 +355,45 @@
 modules' respective targets together:
 
    * make contrib.fetch
-
    * make contrib.extract
-
    * make contrib.patch
-
    * make contrib.configure
-
    * make contrib.build
-
    * make contrib.install
-
    * make contrib.uninstall
-
    * make contrib.clean
-
    * make contrib.xclean
 
 5.5 Customizing Make
 ====================
 
-If the need arises to override settings in the build system
-(essentially gnu-make variables) the recommended method is to create
-optional include files which are automatically included if present and
-follow this naming convention; Do not check these files into the
-repository:
+If the need arises to override settings in the build system (essentially
+gnu-make variables) the recommended method is to create optional include
+files which are automatically included if present and follow this naming
+convention; Do not check these files into the repository:
 
-`_SRC_/custom.defs'
-     Custom makevar definitions outside `build'. Suitable for settings
+'_SRC_/custom.defs'
+     Custom makevar definitions outside 'build'.  Suitable for settings
      which apply across all builds for a particular checkout; or which
-     survives manual removal of `build'.
+     survives manual removal of 'build'.
 
-`_SRC_/custom.rules'
-     Custom make rules outside `build'. Suitable for rules which apply
+'_SRC_/custom.rules'
+     Custom make rules outside 'build'.  Suitable for rules which apply
      across all builds for a particular checkout; or which survives
-     manual removal of `build'.
+     manual removal of 'build'.
 
-`_BUILD_/GNUmakefile.custom.defs'
-     Custom makevar definitions specific to a `build' directory.
-
-`_BUILD_/GNUmakefile.custom.rules'
-     Custom makevar rules specific to a `build' directory.
+'_BUILD_/GNUmakefile.custom.defs'
+     Custom makevar definitions specific to a 'build' directory.
 
+'_BUILD_/GNUmakefile.custom.rules'
+     Custom makevar rules specific to a 'build' directory.
 
 The purpose is to allow a place to store local build settings for
 testing, tweaking, and experimenting with build configuration without
-losing your settings if `configure' is invoked; ie: `configure' would
-overwrite `GNUmakefile' and any customizations contained therein would
-be lost. Here is a short example of what the contents of
-`_SRC_/custom.defs' might contain:
+losing your settings if 'configure' is invoked; ie: 'configure' would
+overwrite 'GNUmakefile' and any customizations contained therein would
+be lost.  Here is a short example of what the contents of
+'_SRC_/custom.defs' might contain:
 
      ## bump to gcc-4.6 in current path
      GCC.gcc = /usr/bin/gcc-4.6
@@ -444,33 +401,33 @@
      ## replace optimize for 'speed' with more aggressive settings
      GCC.args.O.speed = -O3 -fomit-frame-pointer -msse4.2
 
-See also `make report.help' which displays a set of reports used to
-dump makefile vars.
+See also 'make report.help' which displays a set of reports used to dump
+makefile vars.
 
 6 Troubleshooting
 *****************
 
 When troubleshooting build issues, the following files relative to the
-`build/' directory may be especially useful:
+'build/' directory may be especially useful:
 
-`GNUmakefile'
+'GNUmakefile'
      Top-level makefile which contains build settings generated via
      configure.
 
-`log/config.info.txt'
+'log/config.info.txt'
      Record of output from configure.
 
-`log/config.verbose.txt'
+'log/config.verbose.txt'
      Record of verbose output from configure.
 
-`log/build.txt'
-     Record of output from `configure --launch'. Similar output may be
-     recorded using `make' depending on which shell is in use, eg:
-     `make >& log/build.txt' or `make > log/build.txt 2>&1'.
+'log/build.txt'
+     Record of output from 'configure --launch'.  Similar output may be
+     recorded using 'make' depending on which shell is in use, eg: 'make
+     >& log/build.txt' or 'make > log/build.txt 2>&1'.
 
-`log/xcodemake.env.txt'
-     Environment (variables) dump as seen when Xcode forks `make'.
-     Mac OS X only.
+'log/xcodemake.env.txt'
+     Environment (variables) dump as seen when Xcode forks 'make'.  Mac
+     OS X only.
 
 Appendix A Project Repository Details
 *************************************
@@ -479,7 +436,6 @@
      root:   svn://svn.handbrake.fr/HandBrake
      branch: trunk
      uuid:   b64f7644-9d1e-0410-96f1-a4d463321fa5
-     rev:    5208
-     date:   2013-01-26 18:47:13 +0000
+     rev:    6163
+     date:   2014-04-13 09:22:16 -0700
      type:   developer
-

HandBrake-0.9.9.tar.bz2/doc/texi/Building.linux.texi -> HandBrake-0.10.0.tar.bz2/doc/texi/Building.linux.texi Changed

@@ -1,38 +1,40 @@
-@input texinfo @c -*- Texinfo -*-
+\input texinfo @c -*- Texinfo -*-
 @c %**start of header
 @setfilename Building.linux.info
 @include base/article.texi
 @include building/command.texi
 @paragraphindent none
 
-@set BG.platform linux
+@set BG-platform @value{OS-linux}
 @c %**end of header
 
-@majorheading Guide to Building @value{HB.title} on @value{OS.@value{BG.platform}}
+@majorheading Guide to Building @value{HB-title} on @value{BG-platform}
 @contents
+@sp 1
 @include building/chapter.introduction.texi
 
 @c %**-------------------------------------------------------------------------
 @anchor{prerequisites}
 @chapter Prerequisites
-The following are the recommended specifications for building on @value{OS.linux}; but is not necessarily the only configuration that is possible:
+The following are the recommended specifications for building on @value{OS-linux}; but is not necessarily the only configuration that is possible:
 
 @itemize @bullet
 @item Intel 32-bit or 64-bit kernel
-@item Ubuntu 12.04, gcc 4.5, yasm 1.2.x
-@item Fedora 17 and 18, gcc 4.5, yasm 1.2.x
-@item gcc 4.5 or higher is reported to work
+@item Ubuntu 14.04, gcc 4.8, yasm 1.3.x
+@item Fedora 20, gcc 4.8, yasm 1.3.x
+@item gcc 4.7 or higher is reported to work
 @end itemize
 
 @include building/prerequisites.bundled.texi
 
 @include building/prerequisites.common.texi
 
-The @b{GTK UI} introduces some significant extra build requirements. If you intend to disable building the GUI with @command{configure --disable-gtk} you will not need many of these packages installed:
+The @b{GTK UI} introduces some significant extra build requirements. GTK version 3.10+ is required to build the GTK UI. If you intend to disable building the GUI with @command{configure --disable-gtk} you will not need many of these packages installed:
 
-Ubuntu 12+ packages:
+Ubuntu 14.04 packages:
 @itemize @bullet
 @item subversion (cli/gui)
+@item cmake (cli/gui)
 @item yasm (cli/gui)
 @item build-essential (cli/gui)
 @item autoconf (cli/gui)
@@ -48,33 +50,32 @@
 @item libfreetype6-dev (cli/gui)
 @item libfontconfig1-dev (cli/gui)
 @item libass-dev (cli/gui)
+@item libmp3lame-dev (cli/gui)
+@item libx264-dev (cli/gui)
 @item intltool (gui)
 @item libglib2.0-dev (gui)
 @item libdbus-glib-1-dev (gui)
-@item libgtk2.0-dev (gui)
+@item libgtk-3-dev (gui)
 @item libgudev-1.0-dev (gui)
-@item libwebkit-dev (gui)
+@item libwebkitgtk-3.0-dev (gui)
 @item libnotify-dev (gui)
-@item libgstreamer0.10-dev (gui)
-@item libgstreamer-plugins-base0.10-dev (gui)
-@end itemize
-
-Ubuntu 12+ packages:
-@itemize @bullet
+@item libgstreamer1.0-dev (gui)
+@item libgstreamer-plugins-base1.0-dev (gui)
 @item libappindicator-dev (gui)
 @end itemize
 
 To install these packages:
 @example
-sudo apt-get install subversion yasm build-essential autoconf libtool \
+sudo apt-get install subversion cmake yasm build-essential autoconf libtool \
 zlib1g-dev libbz2-dev libogg-dev libtheora-dev libvorbis-dev \
 libsamplerate-dev libxml2-dev libfribidi-dev libfreetype6-dev \
-libfontconfig1-dev libass-dev intltool libglib2.0-dev libdbus-glib-1-dev \
-libgtk2.0-dev libgudev-1.0-dev libwebkit-dev libnotify-dev \
-libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev libappindicator-dev
+libfontconfig1-dev libass-dev libmp3lame-dev libx264-dev intltool \
+libglib2.0-dev libdbus-glib-1-dev libgtk-3-dev libgudev-1.0-dev \
+libwebkitgtk-3.0-dev libnotify-dev libgstreamer1.0-dev \
+libgstreamer-plugins-base1.0-dev libappindicator-dev
 @end example
 
-Fedora 17+ package groups:
+Fedora 20 package groups:
 @itemize @bullet
 @item Development Tools
 @item Development Libraries
@@ -90,6 +91,11 @@
 
 Additional Fedora packages:
 @itemize @bullet
+@item patch (cli/gui)
+@item intltool (cli/gui)
+@item libtool (cli/gui)
+@item cmake (cli/gui)
+@item gcc-c++ (cli/gui)
 @item yasm (cli/gui)
 @item zlib-devel (cli/gui)
 @item bzip2-devel (cli/gui)
@@ -102,21 +108,23 @@
 @item freetype-devel (cli/gui)
 @item fontconfig-devel (cli/gui)
 @item libass-devel (cli/gui)
+@item lame-devel (cli/gui)
+@item x264-devel (cli/gui)
 @item dbus-glib-devel (gui)
 @item libgudev1-devel (gui)
-@item webkitgtk-devel (gui)
+@item webkitgtk3-devel (gui)
 @item libnotify-devel (gui)
-@item gstreamer-devel (gui)
-@item gstreamer-plugins-base-devel (gui)
+@item gstreamer1-devel (gui)
+@item gstreamer1-plugins-base-devel (gui)
 @end itemize
 
 To install these packages:
 @example
-sudo yum install yasm zlib-devel bzip2-devel libogg-devel libtheora-devel \
-libvorbis-devel libsamplerate-devel libxml2-devel fribidi-devel \
-freetype-devel fontconfig-devel libass-devel dbus-glib-devel \
-libgudev1-devel webkitgtk-devel libnotify-devel \
-gstreamer-devel gstreamer-plugins-base-devel
+sudo yum install patch intltool libtool cmake gcc-c++ yasm zlib-devel \
+bzip2-devel libogg-devel libtheora-devel libvorbis-devel libsamplerate-devel \
+libxml2-devel fribidi-devel freetype-devel fontconfig-devel libass-devel \
+lame-devel x264-devel dbus-glib-devel libgudev1-devel webkitgtk3-devel \
+libnotify-devel gstreamer1-devel gstreamer1-plugins-base-devel
 @end example
 
 @c %**-------------------------------------------------------------------------
@@ -124,7 +132,7 @@
 
 @anchor{overview}
 @chapter Overview
-@value{OS.linux} builds are performed from a @b{terminal}. There is no support for building from any IDEs.
+@value{OS-linux} builds are performed from a @b{terminal}. There is no support for building from any IDEs.
 
 @c %**-------------------------------------------------------------------------
 @include building/chapter.via.terminal.texi

HandBrake-0.9.9.tar.bz2/doc/texi/Building.mingw.texi -> HandBrake-0.10.0.tar.bz2/doc/texi/Building.mingw.texi Changed

@@ -1,26 +1,28 @@
-@input texinfo @c -*- Texinfo -*-
+\input texinfo @c -*- Texinfo -*-
 @c %**start of header
 @setfilename Building.mingw.info
 @include base/article.texi
 @include building/command.texi
 @paragraphindent none
 
-@set BG.platform mingw
+@set BG-platform @value{OS-mingw}
 @c %**end of header
 
-@majorheading Guide to Building @value{HB.title} on @value{OS.@value{BG.platform}}
+@majorheading Guide to Building @value{HB-title} on @value{BG-platform}
 @contents
+@sp 1
 @include building/chapter.introduction.texi
 
 @c %**-------------------------------------------------------------------------
 @anchor{prerequisites}
 @chapter Prerequisites
-The following are the recommended specifications for building on @value{OS.mingw}; but is not necessarily the only configuration that is possible:
+The following are the recommended specifications for building on @value{OS-mingw}; but is not necessarily the only configuration that is possible:
 
 @itemize @bullet
-@item Intel 32-bit or 64-bit hardware
-@item @value{OS.mingw} on Fedora 17+, Ubuntu 12+ or Debian, gcc 4.6+
-@item yasm 1.2.x (for i386 or x86_64 architectures)
+@item Intel 64-bit hardware
+@item @value{OS-mingw} on Fedora 20+, Ubuntu 14+ or Debian 7+ using gcc 4.7+
+@item Official MinGW-w64 builds are recommended over those provided by distributions.
+@item yasm 1.3.x 
 @end itemize
 
 @include building/prerequisites.bundled.texi
@@ -29,11 +31,11 @@
 You must set the --cross flag with configure to cross compile with windows.
 See the Example below. Note that the cross compiler name varies between distributions.
 
-As of this writing, @value{OS.mingw} has available to it several versions of gcc; only one of which may be found and used in the path as @code{gcc} and @code{g++}. Configure will thus find what is probably the older version of gcc in a typical @value{OS.mingw} environment. If you desire to build with the newer gcc, it is found in the path as @command{gcc-4} and @command{g++-4} respectively and you must indicate to configure the desired versions. The following syntax should do the trick:
+The following is an example:
 @end quotation
 
 @example
-../configure --cross=i686-w64-mingw32 --gcc=gcc-4
+../configure --cross=x86_64-w64-mingw32
 @end example
 
 @include building/prerequisites.common.texi
@@ -43,7 +45,7 @@
 
 @anchor{overview}
 @chapter Overview
-@value{OS.mingw} builds are performed from a @b{terminal}. There is no support for building from any IDEs.
+@value{OS-mingw} builds are performed from a @b{terminal}. There is no support for building from any IDEs.
 
 @c %**-------------------------------------------------------------------------
 @include building/chapter.via.terminal.texi

HandBrake-0.9.9.tar.bz2/doc/texi/Building.osx.texi -> HandBrake-0.10.0.tar.bz2/doc/texi/Building.osx.texi Changed

@@ -1,36 +1,35 @@
-@input texinfo @c -*- Texinfo -*-
+\input texinfo @c -*- Texinfo -*-
 @c %**start of header
 @setfilename Building.osx.info
 @include base/article.texi
 @include building/command.texi
 @paragraphindent none
 
-@set BG.platform osx
+@set BG-platform @value{OS-osx}
 @c %**end of header
 
-@majorheading Build Guide for @value{HB.name} @value{HB.version} on @value{OS.@value{BG.platform}}
-
+@majorheading Build Guide for @value{HB-name} @value{HB-version} on @value{BG-platform}
 @contents
+@sp 1
 @include building/chapter.introduction.texi
 
 @c %**-------------------------------------------------------------------------
 @anchor{prerequisites}
 @chapter Prerequisites
-Building on @value{OS.osx} is well supported. It is the reference platform for @value{HB.name}. The following are the recommended specifications for this platform; but is not necessarily the only configuration that is possible:
+Building on @value{OS-osx} is well supported. It is the reference platform for @value{HB-name}. The following are the recommended specifications for this platform; but is not necessarily the only configuration that is possible:
 
 @itemize @bullet
 @item Mac Intel hardware
-@item @value{OS.osx} 10.7.5 or @value{OS.osx} 10.8.3
-@item Xcode 4.6.1 (4H512)
-@item llvm-gcc-4.2 version 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.11.00)
-@item Xcode command-line tools (installed via Preferences > Downloads > Components)
+@item @value{OS-osx} 10.9.4 or later
+@item Xcode 6.0.1
+@item Xcode command-line tools (installed via Preferences > Downloads > Components) or download via Appla Developer website.
 @item XQuartz (http://xquartz.macosforge.org/landing/)
 @end itemize
 
 The following tools are compiled during the build process if necessary, but you can speed up your build by installing them:
 
 @itemize @bullet
-@item yasm 1.2.0 or later
+@item yasm 1.3.0 or later
 @item autoconf
 @item automake
 @item libtool
@@ -45,7 +44,7 @@
 @c %**-------------------------------------------------------------------------
 @anchor{overview}
 @chapter Overview
-The two general methods to build on @value{OS.osx} are from @b{terminal} or @b{Xcode.app}. The preferred method for automated and repeatable builds is to use the terminal. Otherwise the choice is generally up to the individual. To be extra clear, building from the terminal by default actually invokes @command{xcodebuild} to build the very same targets contained in the Xcode project. Think of it as building with Xcode but without the GUI.
+The two general methods to build on @value{OS-osx} are from @b{terminal} or @b{Xcode.app}. The preferred method for automated and repeatable builds is to use the terminal. Otherwise the choice is generally up to the individual. To be extra clear, building from the terminal by default actually invokes @command{xcodebuild} to build the very same targets contained in the Xcode project. Think of it as building with Xcode but without the GUI.
 
 @c %**-------------------------------------------------------------------------
 @include building/chapter.via.terminal.texi
@@ -68,7 +67,7 @@
 make ub.combine
 @end example
 
-The list of architectures is hard coded to @value{HB.name}'s desired product and currently is composed of combining the binaries produced from two xcconfigs: osx106.i386 and osx106.x86_64. The following example shows how to specify a different list of xcconfigs:
+The list of architectures is hard coded to @value{HB-name}'s desired product and currently is composed of combining the binaries produced from two xcconfigs: osx106.i386 and osx106.x86_64. The following example shows how to specify a different list of xcconfigs:
 
 @example
 ./configure --disable-xcode

HandBrake-0.9.9.tar.bz2/doc/texi/base/glossary.texi -> HandBrake-0.10.0.tar.bz2/doc/texi/base/glossary.texi Changed

HandBrake-0.9.9.tar.bz2/doc/texi/base/handbrake.texi.m4 -> HandBrake-0.10.0.tar.bz2/doc/texi/base/handbrake.texi.m4 Changed

@@ -3,27 +3,27 @@
 dnl
 dnl
 dnl
-@set HB.title           __HB_title
-@set HB.name            __HB_name
-@set HB.name.lower      __HB_name_lower
-@set HB.name.upper      __HB_name_upper
-@set HB.acro.lower      __HB_acro_lower
-@set HB.acro.upper      __HB_acro_upper
-@set HB.url.website     __HB_url_website
-@set HB.url.community   __HB_url_community
-@set HB.url.irc         __HB_url_irc
-@set HB.url.appcast     __HB_url_appcast
-@set HB.version.major   __HB_version_major
-@set HB.version.minor   __HB_version_minor
-@set HB.version.point   __HB_version_point
-@set HB.version         __HB_version
-@set HB.version.hex     __HB_version_hex
-@set HB.build           __HB_build
-@set HB.repo.url        __HB_repo_url
-@set HB.repo.root       __HB_repo_root
-@set HB.repo.branch     __HB_repo_branch
-@set HB.repo.uuid       __HB_repo_uuid
-@set HB.repo.rev        __HB_repo_rev
-@set HB.repo.date       __HB_repo_date
-@set HB.repo.official   __HB_repo_official
-@set HB.repo.type       __HB_repo_type
+@set HB-title           __HB_title
+@set HB-name            __HB_name
+@set HB-name-lower      __HB_name_lower
+@set HB-name-upper      __HB_name_upper
+@set HB-acro-lower      __HB_acro_lower
+@set HB-acro-upper      __HB_acro_upper
+@set HB-url-website     __HB_url_website
+@set HB-url-community   __HB_url_community
+@set HB-url-irc         __HB_url_irc
+@set HB-url-appcast     __HB_url_appcast
+@set HB-version-major   __HB_version_major
+@set HB-version-minor   __HB_version_minor
+@set HB-version-point   __HB_version_point
+@set HB-version         __HB_version
+@set HB-version-hex     __HB_version_hex
+@set HB-build           __HB_build
+@set HB-repo-url        __HB_repo_url
+@set HB-repo-root       __HB_repo_root
+@set HB-repo-branch     __HB_repo_branch
+@set HB-repo-uuid       __HB_repo_uuid
+@set HB-repo-rev        __HB_repo_rev
+@set HB-repo-date       __HB_repo_date
+@set HB-repo-official   __HB_repo_official
+@set HB-repo-type       __HB_repo_type

HandBrake-0.9.9.tar.bz2/doc/texi/building/appendix.repo.texi -> HandBrake-0.10.0.tar.bz2/doc/texi/building/appendix.repo.texi Changed

HandBrake-0.9.9.tar.bz2/doc/texi/building/chapter.introduction.texi -> HandBrake-0.10.0.tar.bz2/doc/texi/building/chapter.introduction.texi Changed

HandBrake-0.9.9.tar.bz2/doc/texi/building/chapter.quickstart.texi -> HandBrake-0.10.0.tar.bz2/doc/texi/building/chapter.quickstart.texi Changed

HandBrake-0.9.9.tar.bz2/doc/texi/building/chapter.troubleshooting.texi -> HandBrake-0.10.0.tar.bz2/doc/texi/building/chapter.troubleshooting.texi Changed

HandBrake-0.9.9.tar.bz2/doc/texi/building/chapter.via.terminal.texi -> HandBrake-0.10.0.tar.bz2/doc/texi/building/chapter.via.terminal.texi Changed

@@ -24,7 +24,7 @@
 List available options.
 
 @item --src=DIR
-Specify top-level source directory for @value{HB.name} sources.
+Specify top-level source directory for @value{HB-name} sources.
 
 @item --build=DIR
 Specify destination directory for final product install. The default is to use either @file{build} if in the top-level source directory, otherwise @file{.} 
@@ -38,7 +38,7 @@
 Useful for novices and quick-start procedures.
 
 @item --disable-gtk
-Disable building the GTK GUI on applicable platforms such as @value{OS.linux}.
+Disable building the GTK GUI on applicable platforms such as @value{OS-linux}.
 
 @item --debug=MODE
 Select debug mode. Must be one of @samp{none}, @samp{min}, @samp{std}, @samp{max}.
@@ -49,13 +49,13 @@
 This generally maps to gcc options @samp{-g0}, @samp{-O0}, @samp{-O3}, @samp{-Os}.
 
 @item --arch=MODE
-Select build architecture. The available architectures vary by platform. Most platforms support exactly one architecture except @value{OS.osx} which has support for various universal binary architectures. The available choices are hard-coded per platform and no sanity checks for the required tools are performed.
+Select build architecture. The available architectures vary by platform. Most platforms support exactly one architecture except @value{OS-osx} which has support for various universal binary architectures. The available choices are hard-coded per platform and no sanity checks for the required tools are performed.
 
 @item --disable-xcode
-Disable shunting the build through @command{xcodebuild}. If this option is applied, @command{HandBrakeCLI} will be produced in a similar fashion as it is on other platforms; sans Xcode and the Cocoa application will not be produced. @value{OS.osx} only.
+Disable shunting the build through @command{xcodebuild}. If this option is applied, @command{HandBrakeCLI} will be produced in a similar fashion as it is on other platforms; sans Xcode and the Cocoa application will not be produced. @value{OS-osx} only.
 
 @item --xcconfig=MODE
-Select Xcode project configuration file. The available modes are the basenames of files located in @file{macosx/xcconfig/*.xcconfig} which direct Xcode to build using various architecture and @value{OS.osx} deployment options. @value{OS.osx} only.
+Select Xcode project configuration file. The available modes are the basenames of files located in @file{macosx/xcconfig/*.xcconfig} which direct Xcode to build using various architecture and @value{OS-osx} deployment options. @value{OS-osx} only.
 @end table
 
 Clean-room procedures dictate that when certain factors change, old builds should be scrapped and new builds configured. This is the main reason for requiring a scratch directory; to promote consistent, reliable and clean software builds. The following is a short list of some of the reasons why someone may choose to scrap an existing build:
@@ -145,7 +145,7 @@
 @anchor{terminal.targets.contrib}
 @subsection Contrib Modules
 
-Contrib modules such as @samp{a52dec}, @samp{bzip2}, @samp{faac}, @samp{faad2}, @samp{ffmpeg}, @samp{fontconfig}, @samp{freetype}, @samp{fribidi}, @samp{lame}, @samp{libass}, @samp{libbluray}, @samp{libdca}, @samp{libdvdnav}, @samp{libdvdread}, @samp{libdvdread}, @samp{libiconv}, @samp{libmkv}, @samp{libogg}, @samp{libsamplerate}, @samp{libtheora}, @samp{libvorbis}, @samp{libxml2}, @samp{mp4v2}, @samp{mpeg2dec}, @samp{x264}, @samp{yasm} and @samp{zlib} have the following scoped targets:
+Contrib modules such as @samp{bzip2}, @samp{ffmpeg}, @samp{fontconfig}, @samp{freetype}, @samp{fribidi}, @samp{lame}, @samp{libass}, @samp{libbluray}, @samp{libdvdnav}, @samp{libdvdread}, @samp{libiconv}, @samp{libogg}, @samp{libsamplerate}, @samp{libtheora}, @samp{libvorbis}, @samp{libxml2}, @samp{x264}, @samp{yasm} and @samp{zlib} have the following scoped targets:
 
 @table @samp
 @item make @i{MODULE}.fetch

HandBrake-0.9.9.tar.bz2/doc/texi/building/chapter.via.xcode.texi -> HandBrake-0.10.0.tar.bz2/doc/texi/building/chapter.via.xcode.texi Changed

@@ -12,7 +12,7 @@
 Perform the following steps to build:
 
 @itemize
-@item Finder - navigate to @file{macosx/} in the @value{HB.name} source tree
+@item Finder - navigate to @file{macosx/} in the @value{HB-name} source tree
 @item Finder - open @file{HandBrake.xcodeproj}
 @item Xcode workspace - select scheme @b{HandBrake [RELEASE]}
 @item Xcode menu - select Product -> Build
@@ -28,8 +28,8 @@
 @itemize
 @item Xcode menu - select Window -> Organizer
 @item Xcode organizer - select Projects tab
-@item Xcode organizer Projects - select @value{HB.name} item
-@item @value{HB.name} item - click Derived Data location arrow (immediately right of path)
+@item Xcode organizer Projects - select @value{HB-name} item
+@item @value{HB-name} item - click Derived Data location arrow (immediately right of path)
 @item Finder - navigate to Build -> Products -> release
 @end itemize
 
@@ -69,8 +69,8 @@
 @itemize
 @item Xcode menu - select Window -> Organizer
 @item Xcode organizer - select Projects tab
-@item Xcode organizer Projects - select @value{HB.name} item
-@item @value{HB.name} item - click Derived Data location arrow (immediately right of path)
+@item Xcode organizer Projects - select @value{HB-name} item
+@item @value{HB-name} item - click Derived Data location arrow (immediately right of path)
 @item Finder - navigate to Build -> Products -> release -> external
 @end itemize
 
@@ -120,7 +120,7 @@
 Modify for faster external builds if your system has the horsepower and resources. Specifying a value greater than the number of CPU cores (or virtual cores) in your system is unlikely to produce gains and will needlessly consume extra resources. A special string value of @b{auto} sets the factor to the number of active CPUs on the host system.
 
 @item EXTERNAL_SRC
-Do not modify; specifies the top-level source directory for @value{HB.name}, relative to Xcode project.
+Do not modify; specifies the top-level source directory for @value{HB-name}, relative to Xcode project.
 
 @item EXTERNAL_XCCONFIG
 Do not modify; specifies which xcconfig file is active. Defined inside xcconfig file.

HandBrake-0.9.9.tar.bz2/doc/texi/building/command.texi -> HandBrake-0.10.0.tar.bz2/doc/texi/building/command.texi Changed

HandBrake-0.9.9.tar.bz2/doc/texi/building/method.checkout.texi -> HandBrake-0.10.0.tar.bz2/doc/texi/building/method.checkout.texi Changed

HandBrake-0.10.0.tar.bz2/gfx/icons/EncodeComplete.pdf Added

HandBrake-0.10.0.tar.bz2/gfx/icons/EncodeWorking.pdf Added

HandBrake-0.10.0.tar.bz2/gfx/icons/file.png Added

HandBrake-0.10.0.tar.bz2/gfx/icons/folder.png Added

HandBrake-0.10.0.tar.bz2/gfx/icons/stopEncode.pdf Added

HandBrake-0.9.9.tar.bz2/gtk/autogen.sh -> HandBrake-0.10.0.tar.bz2/gtk/autogen.sh Changed

HandBrake-0.9.9.tar.bz2/gtk/configure.ac -> HandBrake-0.10.0.tar.bz2/gtk/configure.ac Changed

@@ -60,6 +60,10 @@
 	AS_HELP_STRING([--enable-fdk-aac], [enable fdk aac encoder]),
 	use_fdk_aac=yes, use_fdk_aac=no)
 
+AC_ARG_ENABLE(x265,
+	AS_HELP_STRING([--enable-x265], [enable x265 encoder]),
+	use_x265=yes, use_x265=no)
+
 AC_ARG_ENABLE(gst,
 	AS_HELP_STRING([--disable-gst], [disable gstreamer (live preview)]),
 	gst_disable=yes, gst_disable=no)
@@ -87,7 +91,7 @@
 
 case $host in
   *-*-mingw*)
-    GHB_PACKAGES="gthread-2.0 gio-2.0"
+    GHB_PACKAGES="gthread-2.0 gio-2.0 gmodule-2.0"
 	mingw_flag=yes
     ;;
   *)
@@ -96,18 +100,13 @@
 	  pkg_gudev="gudev-1.0"
 	  ;;
     esac
-    GHB_PACKAGES="gthread-2.0 gio-2.0 libnotify dbus-glib-1 $pkg_gudev"
+    GHB_PACKAGES="gthread-2.0 gio-2.0 libnotify dbus-glib-1 gmodule-2.0 $pkg_gudev"
 	mingw_flag=no
     ;;
 esac
 
 PKG_PROG_PKG_CONFIG
-PKG_CHECK_MODULES(Gtk3, [gtk+-3.0], use_gtk3=yes, use_gtk3=no)
-if test "x$use_gtk3" = "xyes" ; then
-    GHB_PACKAGES="gtk+-3.0 $GHB_PACKAGES"
-else
-    GHB_PACKAGES="gtk+-2.0 >= 2.10 $GHB_PACKAGES"
-fi
+GHB_PACKAGES="gtk+-3.0 $GHB_PACKAGES"
 
 GST1_MODULES="gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 gstreamer-pbutils-1.0"
 GST0_MODULES="gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-audio-0.10 gstreamer-pbutils-0.10"
@@ -132,53 +131,22 @@
 fi
 
 if test "x$update_checks" = "xyes" ; then
-    if test "x$use_gtk3" = "xyes" ; then
-        PKG_CHECK_MODULES(WebKitGtk3, webkitgtk-3.0, use_webkitgtk3=yes, use_webkitgtk3=no)
-        if test "x$use_webkitgtk3" = "xyes" ; then
-            GHB_PACKAGES="$GHB_PACKAGES webkitgtk-3.0"
-        else
-            update_checks="no"
-	        CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
-        fi
+    PKG_CHECK_MODULES(WebKitGtk3, webkitgtk-3.0, use_webkitgtk3=yes, use_webkitgtk3=no)
+    if test "x$use_webkitgtk3" = "xyes" ; then
+        GHB_PACKAGES="$GHB_PACKAGES webkitgtk-3.0"
     else
-        PKG_CHECK_MODULES(OldWebKitGtk1, WebKitGtk, old_webkit=yes, old_webkit=no)
-        if test "x$old_webkit" = "xyes" ; then
-            if test "x$mingw_flag" = "xno" ; then
-                GHB_PACKAGES="$GHB_PACKAGES WebKitGtk"
-                CXXFLAGS="$CXXFLAGS -D_OLD_WEBKIT"
-                CFLAGS="$CFLAGS -D_OLD_WEBKIT"
-            else
-                update_checks="no"
-                CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
-            fi
-        else
-            PKG_CHECK_MODULES(WebKitGtk1, webkit-1.0, use_webkit1=yes, use_webkit1=no)
-            if test "x$use_webkit1" = "xyes" ; then
-                GHB_PACKAGES="$GHB_PACKAGES webkit-1.0"
-            else
-                update_checks="no"
-                CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
-            fi
-        fi
+        update_checks="no"
+        CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
     fi
 else
 	CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
 fi
 
-if test "x$use_gtk3" = "xyes" ; then
-    PKG_CHECK_MODULES(libappindicator3, appindicator3-0.1, have_appind=yes, have_appind=no)
-    if test "x$have_appind" = "xyes" ; then
-        GHB_PACKAGES="$GHB_PACKAGES appindicator3-0.1"
-        CXXFLAGS="$CXXFLAGS -D_USE_APP_IND"
-        CFLAGS="$CFLAGS -D_USE_APP_IND"
-    fi
-else
-    PKG_CHECK_MODULES(libappindicator, appindicator-0.1, have_appind=yes, have_appind=no)
-    if test "x$have_appind" = "xyes" ; then
-        GHB_PACKAGES="$GHB_PACKAGES appindicator-0.1"
-        CXXFLAGS="$CXXFLAGS -D_USE_APP_IND"
-        CFLAGS="$CFLAGS -D_USE_APP_IND"
-    fi
+PKG_CHECK_MODULES(libappindicator3, appindicator3-0.1, have_appind=yes, have_appind=no)
+if test "x$have_appind" = "xyes" ; then
+    GHB_PACKAGES="$GHB_PACKAGES appindicator3-0.1"
+    CXXFLAGS="$CXXFLAGS -D_USE_APP_IND"
+    CFLAGS="$CFLAGS -D_USE_APP_IND"
 fi
 
 AM_CONDITIONAL([MINGW], [test "x$mingw_flag" = "xyes"])
@@ -195,20 +163,28 @@
 GHB_TOOLS_CFLAGS=`$BUILD_PKG_CONFIG --cflags glib-2.0 gdk-pixbuf-2.0`
 GHB_TOOLS_LIBS=`$BUILD_PKG_CONFIG --libs glib-2.0 gdk-pixbuf-2.0`
 
+HB_LIBS="-lhandbrake -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2"
+
 case $host in
   *-*-mingw*)
     if test "x$use_libdl" = "xyes" ; then
-		GHB_LIBS="$GHB_LIBS -ldl"
+		HB_LIBS+=" -ldl -lpthreadGC2"
 	fi
+    HB_LIBS+=" -lpthreadGC2"
+    ;;
+  *)
+    HB_LIBS+=" -ldl -lpthread"
     ;;
 esac
 
-HB_LIBS="-lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2"
-
 if test "x$use_fdk_aac" = "xyes" ; then
     HB_LIBS+=" -lfdk-aac"
 fi
 
+if test "x$use_x265" = "xyes" ; then
+    HB_LIBS+=" -lx265"
+fi
+
 AC_SUBST(HB_LIBS)
 AC_SUBST(GHB_TOOLS_CFLAGS)
 AC_SUBST(GHB_TOOLS_LIBS)

HandBrake-0.9.9.tar.bz2/gtk/ghb.spec -> HandBrake-0.10.0.tar.bz2/gtk/ghb.spec Changed

HandBrake-0.9.9.tar.bz2/gtk/module.defs -> HandBrake-0.10.0.tar.bz2/gtk/module.defs Changed

HandBrake-0.9.9.tar.bz2/gtk/po/LINGUAS -> HandBrake-0.10.0.tar.bz2/gtk/po/LINGUAS Changed

HandBrake-0.9.9.tar.bz2/gtk/po/POTFILES.in -> HandBrake-0.10.0.tar.bz2/gtk/po/POTFILES.in Changed

HandBrake-0.10.0.tar.bz2/gtk/po/cs.po Added

@@ -0,0 +1,2655 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Czech X Team <info@czechxteam.net>, 2013
+# fri, 2013-2014
+# fri, 2013-2014
+# fri, 2013-2014
+# fri, 2013-2014
+msgid ""
+msgstr ""
+"Project-Id-Version: HandBrake-0.10\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-10 21:39+0400\n"
+"PO-Revision-Date: 2014-10-15 19:09+0000\n"
+"Last-Translator: fri\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/handbrake/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid "Off"
+msgstr "Vypnuto"
+
+msgid "Quality: "
+msgstr "Jakost:"
+
+#, c-format
+msgid "Bitrate: %dkbps"
+msgstr "Datový tok: %dkb/s"
+
+#, c-format
+msgid "Bitrate: %.4gkbps"
+msgstr "Datový tok: %.4gkb/s"
+
+msgid "Passthrough"
+msgstr "Průchod"
+
+#, c-format
+msgid ""
+"%s\n"
+"Gain: %s\n"
+"DRC: %s\n"
+"Track Name: %s"
+msgstr "%s\nZesílení: %s\nDRC: %s\nNázev stopy: %s"
+
+#, c-format
+msgid ""
+"%s\n"
+"Gain: %s\n"
+"DRC: %s"
+msgstr "%s\nZesílení: %s\nDRC: %s"
+
+msgid "Add"
+msgstr "Přidat"
+
+msgid ""
+"Add an audio encoder.\n"
+"Each selected source track will be encoded with all selected encoders."
+msgstr "Přidat kodér zvuku.\nKaždá vybraná zdrojová stopa bude zakódována pomocí všech vybraných kodérů."
+
+msgid "Set the audio codec to encode this track with."
+msgstr "Nastavit zvukový kodek, kterým se má tato stopa zakódovat."
+
+msgid "Bitrate"
+msgstr "Datový tok"
+
+msgid "Quality"
+msgstr "Jakost"
+
+msgid "Set the bitrate to encode this track with."
+msgstr "Nastavit datový tok, ve kterém se má tato stopa zakódovat."
+
+msgid ""
+"Audio Quality:\n"
+"For encoders that support it, adjust the quality of the output."
+msgstr "Kvalita zvuku:\nU výstupních kodeků, jež to podporují upravit jakost výstupu."
+
+msgid "Set the mixdown of the output audio track."
+msgstr "Nastavit finální mixáž výstupní zvukové stopy."
+
+msgid "Set the sample rate of the output audio track."
+msgstr "Nastavit vzorkovací kmitočet výstupní zvukové stopy."
+
+msgid ""
+"Audio Gain:\n"
+"Adjust the amplification or attenuation of the output audio track."
+msgstr "Zesílení zvuku:\nUpravit zesílení nebo zeslabení výstupní zvukové stopy."
+
+msgid ""
+"Audio Gain: Adjust the amplification or attenuation of the output "
+"audio track."
+msgstr "Zesílení zvuku:\nUpravit zesílení nebo zeslabení výstupní zvukové stopy."
+
+msgid ""
+"Dynamic Range Compression:\n"
+"Adjust the dynamic range of the output audio track.\n"
+"For source audio that has a wide dynamic range,\n"
+"very loud and very soft sequences, DRC allows you\n"
+"to 'compress' the range by making loud sounds\n"
+"softer and soft sounds louder.\n"
+msgstr "Komprese dynamického rozsahu:\nUpravit dynamický rozsah výstupní zvukové stopy.\nU zdrojového zvuku, který má široký dynamický rozsah\n(velmi hlasité a velmi slabé sekvence), vám komprese\ndynamického rozsahu (DRC - Dynamic Range Compression)\n'stlačit' rozsah tím, že udělá hlasité oblasti slabšími a slabé\noblasti hlasitějšími.\n"
+
+msgid ""
+"Dynamic Range Compression: Adjust the dynamic range of the output audio track. \n"
+"\n"
+" For source audio that has a wide dynamic range (very loud and very soft sequences), DRC allows you to 'compress' the range by making loud sections softer and soft sections louder."
+msgstr "Komprese dynamického rozsahu: Upravit dynamický rozsah výstupní zvukové stopy. \n\n U zdrojového zvuku, který má široký dynamický rozsah (velmi hlasité a velmi slabé sekvence), vám komprese dynamického rozsahu (DRC - Dynamic Range Compression) 'stlačit' rozsah tím, že udělá hlasité oblasti slabšími a slabé oblasti hlasitějšími."
+
+msgid ""
+"Dynamic Range Compression: Adjust the dynamic range of the output audio track. \n"
+"\n"
+" For source audio that has a wide dynamic range (very loud and very soft sequences), DRC allows you to 'compress' the range by making loud sections softer and soft sections louder."
+msgstr "Komprese dynamického rozsahu: Upravit dynamický rozsah výstupní zvukové stopy. \n\n U zdrojového zvuku, který má široký dynamický rozsah (velmi hlasité a velmi slabé sekvence), vám komprese dynamického rozsahu (DRC - Dynamic Range Compression) 'stlačit' rozsah tím, že udělá hlasité oblasti slabšími a slabé oblasti hlasitějšími."
+
+msgid "Remove this audio encoder"
+msgstr "Odstranit tento kodér zvuku"
+
+msgid "Failed to find widget"
+msgstr "Nepodařilo se najít doplněk"
+
+#, c-format
+msgid "Failed to find dependent widget %s"
+msgstr "Nepodařilo se najít závislý doplněk %s"
+
+msgid "Closing HandBrake will terminate encoding.\n"
+msgstr "Zavření programu HandBrake povede k ukončení kódování.\n"
+
+msgid "{source}"
+msgstr "{Zdroj}"
+
+msgid "{title}"
+msgstr "{Název}"
+
+msgid "{chapters}"
+msgstr "{Kapitoly}"
+
+msgid "{time}"
+msgstr "{Čas}"
+
+msgid "{date}"
+msgstr "{Datum}"
+
+msgid "{bitrate}"
+msgstr "{Datový tok}"
+
+msgid "No Title Found"
+msgstr "Nenalezen žádný název"
+
+msgid "Not Selected"
+msgstr "Nevybráno"
+
+msgid "Scanning ..."
+msgstr "Prohledává se..."
+
+msgid "Stop Scan"
+msgstr "Zastavit prohledávání"
+
+msgid "Choose Destination"
+msgstr "Vybrat cíl"
+
+msgid "On"
+msgstr "Zapnuto"
+
+msgid "Strict"
+msgstr "Přísný"
+
+msgid "Loose"
+msgstr "Volně"
+
+msgid "Custom"
+msgstr "Vlastní"
+
+msgid "Unknown"
+msgstr "Neznámý"
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s in %d seconds ..."
+msgstr "%s\n\n%s za %d sekund..."
+
+#, c-format
+msgid "%sYour movie will be lost if you don't continue encoding."
+msgstr "%s Váš film bude ztracen, pokud nebudete pokračovat v kódování."
+
+msgid "Cancel Current and Stop"
+msgstr "Zrušit nynější a zastavit"
+
+msgid "Cancel Current, Start Next"
+msgstr "Zrušit nynější, začít další"
+
+msgid "Finish Current, then Stop"
+msgstr "Dokončit nynější, potom zastavit"
+
+msgid "Continue Encoding"
+msgstr "Pokračovat v kódování"
+
+msgid "Custom "
+msgstr "Vlastní"
+
+msgid "Modified "
+msgstr "Změněno "
+
+#, c-format
+msgid "%s%sPreset: %s"
+msgstr "%s%s Přednastavenít: %s"
+
+#, c-format
+msgid "Handbrake Version: %s (%d)\n"
+msgstr "Verze Handbrake: %s (%d)\n"
+
+#, c-format
+msgid "%d encode(s) pending"
+msgstr "%d kódování čeká na vyřízení"
+
+#, c-format
+msgid "job %d of %d, "
+msgstr "Úkol %d z %d, "
+
+#, c-format
+msgid "pass %d (subtitle scan) of %d, "
+msgstr "Průchod %d (hledání titulků) z %d, "
+
+#, c-format
+msgid "pass %d of %d, "
+msgstr "Průchod %d z %d, "
+
+#, c-format
+msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
+msgstr "Kódování: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
+
+#, c-format
+msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
+msgstr "Kódování: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
+
+#, c-format
+msgid "Encoding: %s%s%.2f %%"
+msgstr "Kódování: %s%s%.2f %%"
+
+msgid "Searching for start time, "
+msgstr "Hledá se čas začátku, "
+
+msgid "Scanning..."
+msgstr "Prohledává se..."
+
+#, c-format
+msgid "Scanning title %d of %d..."
+msgstr "Prohledává se název %d z %d..."
+
+#, c-format
+msgid "Scanning title %d of %d preview %d..."
+msgstr "Prohledává se název %d z %d náhled %d..."
+
+msgid "Source"
+msgstr "Zdroj"
+
+msgid "Choose Video Source"
+msgstr "Vybrat zdroj obrazu"
+
+msgid "Paused"
+msgstr "Pozastaveno"
+
+msgid "Encode Done!"
+msgstr "Kódování hotovo!"
+
+msgid "Encode Canceled."
+msgstr "Kódování zrušeno."
+
+msgid "Encode Failed."
+msgstr "Kódování selhalo"
+
+msgid "Muxing: This may take a while..."
+msgstr "Muxing: Může to chvíli trvat..."
+
+msgid "Encode Complete"
+msgstr "Kódování dokončeno"
+
+msgid "HandBrake"
+msgstr "HandBrake"
+
+msgid "Updating preview\n"
+msgstr "Obnovuje se náhled\n"
+
+msgid "Error while reading activity from pipe"
+msgstr "Chyba při čtení činnosti z kanálu"
+
+msgid "Suspend"
+msgstr "Odložit"
+
+#, c-format
+msgid "Suspend failed: %s"
+msgstr "Nepodařilo se odložit: %s"
+
+msgid "Suspend failed"
+msgstr "Nepodařilo se odložit"
+
+msgid "CanShutdown"
+msgstr "Vypnout"
+
+#, c-format
+msgid "CanShutdown failed: %s"
+msgstr "Nepodařilo se vypnout: %s"
+
+msgid "CanShutdown failed"
+msgstr "Nepodařilo se vypnout"
+
+msgid "Shutdown"
+msgstr "Vypnout"
+
+#, c-format
+msgid "Shutdown failed: %s"
+msgstr "Nepodařilo se vypnout: %s"
+
+msgid "Shutdown failed"
+msgstr "Nepodařilo se vypnout"
+
+msgid "Encoding"
+msgstr "Kódování"
+
+#, c-format
+msgid "Inhibit failed: %s"
+msgstr "Nepodařilo se zabránit: %s"
+
+msgid "Inhibit failed"
+msgstr "Nepodařilo se zabránit"
+
+msgid "UnInhibit"
+msgstr "Zrušit bránění"
+
+#, c-format
+msgid "UnInhibit failed: %s"
+msgstr "Nepodařilo se zrušit bránění: %s"
+
+msgid "UnInhibit failed"
+msgstr "Nepodařilo se zrušit bránění"
+
+msgid "Uninhibit"
+msgstr "Zrušit bránění"
+
+#, c-format
+msgid "press %d %d"
+msgstr "Stisknutí %d %d"
+
+#, c-format
+msgid ""
+"Invalid Settings:\n"
+"%s"
+msgstr "Neplatné nastavení:\n%s"
+
+msgid "Cancel"
+msgstr "Zrušit"
+
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s: %.4g (Varování: bezztrátové"
+
+#, c-format
+msgid "HandBrake %s/%s is now available (you have %s/%d)."
+msgstr "HandBrake %s/%s je nyní dostupný (máte %s/%d)."
+
+msgid "Put down that cocktail, Your HandBrake queue is done!"
+msgstr "Dejte si koktejl. Vaše řada HandBrake je hotová!"
+
+msgid "Your encode is complete."
+msgstr "Kódování je dokončeno."
+
+msgid "Shutting down the computer"
+msgstr "Vypíná se počítač"
+
+msgid "Putting computer to sleep"
+msgstr "Uspává se počítač"
+
+msgid "Quiting Handbrake"
+msgstr "Ukončuje se Handbrake"
+
+msgid "Bottom"
+msgstr "Dole"
+
+#, c-format
+msgid "open failed: %s\n"
+msgstr "Nepodařilo se otevřít: %s\n"
+
+msgid "No key for dictionary item"
+msgstr "Žádná klávesa pro slovníkovou položku"
+
+msgid "Invalid container type. This shouldn't happen"
+msgstr "Neplatný typ kontejneru. To by se nemělo stát"
+
+#, c-format
+msgid "%s:missing a requried attribute"
+msgstr "%s: Chybí požadovaná vlastnost"
+
+#, c-format
+msgid ""
+"Usage: %s [-I <inc path>] <in resource list> <out resource plist>\n"
+"Summary:\n"
+" Creates a resource plist from a resource list\n"
+"Options:\n"
+" I - Include path to search for files\n"
+" <in resource list> Input resources file\n"
+" <out resource plist> Output resources plist file\n"
+msgstr "Použití: %s [-I <inc path>] <in resource list> <out resource plist>\nPřehled:\n Vytvoří zdrojový plist ze zdrojového seznamu\nVolby:\n I - zahrnout cestu pro hledání souborů\n <in resource list> Vstupní soubor se zdroji\n <out resource plist> Výstupní soubor se zdroji plist\n"
+
+msgid ""
+"The language this text is in, as an ISO code. Pango can use this as a hint "
+"when rendering the text. If you don't understand this parameter, you "
+"probably don't need it"
+msgstr "Jazyk, v němž je tento text, jako kód ISO. Pango jej může použít při vykreslování textu jako nápovědu. Pokud tomuto parametru nerozumíte, pravděpodobně jej nepotřebujete."
+
+msgid ""
+"The preferred place to ellipsize the string, if the cell renderer does not "
+"have enough room to display the entire string"
+msgstr "Upřednostňované místo pro výpustku (tři tečky) v řetězci, pokud vykreslovač buňky nemá dostatek místa pro zobrazení celého řetězce."
+
+msgid ""
+"How to break the string into multiple lines, if the cell renderer does not "
+"have enough room to display the entire string"
+msgstr "Jak řetězec zalomit do více řádků, pokud vykreslovač buňky nemá dostatek místa pro zobrazení celého řetězce."
+
+#, c-format
+msgid "Failed to set text from markup due to error parsing markup: %s"
+msgstr "Text ze značení se nepodařilo nastavit kvůli chybě při zpracování značení: %s"
+
+#, c-format
+msgid "Don't know color `%s'"
+msgstr "Neví se, jaká je to barva `%s'"
+
+msgid "_Open"
+msgstr "_Otevřít"
+
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+msgid "_Save"
+msgstr "_Uložit"
+
+msgid ""
+"Render the subtitle over the video.\n"
+"\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr "Vložit titulky do videa.\n\nTitulky budou součástí obrazového záznamu a nepůjde je zakázat."
+
+msgid "Burned In"
+msgstr "Vloženo"
+
+msgid ""
+"Set the default output subtitle track.\n"
+"\n"
+"Most players will automatically display this\n"
+"subtitle track whenever the video is played.\n"
+"\n"
+"This is useful for creating a \"forced\" track\n"
+"in your output."
+msgstr "Nastavit výchozí výstupní stopu titulků.\n\nVětšina přehrávačů automaticky zobrazí tuto\nstopu titulků vždycky, když je obraz přehráván.\n\nToto je užitečné při vytváření \"vynucené\" stopy\nve vašem výstupu."
+
+msgid "Default"
+msgstr "Výchozí"
+
+msgid ""
+"Use only subtitles that have been flagged\n"
+"as forced in the source subtitle track\n"
+"\n"
+"\"Forced\" subtitles are usually used to show\n"
+"subtitles during scenes where someone is speaking\n"
+"a foreign language."
+msgstr "Použít pouze titulky označené příznakem\njako vynucené ve zdrojové stopě titulků\n\n\"Vynucené\" titulky se obvykle používají na zobrazení\ntitulků během scén, kde někdo mluví cizím\njazykem."
+
+msgid "Forced Only"
+msgstr "Vynuceno pouze"
+
+msgid ""
+"Add (or subtract) an offset (in milliseconds)\n"
+"to the start of the SRT subtitle track.\n"
+"\n"
+"Often, the start of an external SRT file\n"
+"does not coincide with the start of the video.\n"
+"This setting allows you to synchronize the files."
+msgstr "Přidat (nebo odečíst) posun (v milisekundách)\nna začátek stopy titulku SRT.\n\nČasto se začátek vnějšího souboru SRT\nčasově neshoduje se začátkem obrazu.\nToto nastavení umožňuje soubory srovnat."
+
+msgid "SRT Offset"
+msgstr "Posun SRT"
+
+msgid ""
+"The source subtitle track\n"
+"\n"
+"You can choose any of the subtitles\n"
+"recognized in your source file.\n"
+"\n"
+"In addition, there is a special track option\n"
+"\"Foreign Audio Search\". This option will add\n"
+"an extra pass to the encode that searches for\n"
+"subtitles that may correspond to a foreign\n"
+"language scene. This option is best used in\n"
+"conjunction with the \"Forced\" option."
+msgstr "Stopa titulků zdroje\n\nMůžete vybrat kterékoli z titulků\nrozpoznaných ve vašem zdrojovém souboru.\n\nNavíc je tu ještě zvláštní volba pro stopu, kterou\nje hledání zvuku v cizím jazyce. Tato volba přidá\ndo zakódování další průchod, jenž vyhledá\ntitulky, jež odpovídají výstupu v cizím\njazyce. Tuto volbu je nejlepší použít\nve spojení s volbou \"Vynuceno\"."
+
+msgid "Track"
+msgstr "Stopa"
+
+msgid "About HandBrake"
+msgstr "O programu HandBrake"
+
+msgid ""
+"Copyright © 2008 - 2013 John Stebbins\n"
+"Copyright © 2004 - 2013, HandBrake Devs"
+msgstr "Autorské právo © 2008 - 2013 John Stebbins\nAutorské právo © 2004 - 2013, HandBrake Devs"
+
+msgid ""
+"HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
+msgstr "HandBrake je GPL licencovaný, multiplatformní, vícevláknový převaděč obrazu."
+
+msgid "http://handbrake.fr"
+msgstr "http://handbrake.fr"
+
+msgid ""
+"HandBrake 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.\n"
+"\n"
+"HandBrake 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.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr "HandBrake je svobodným programem; můžete jej rozdávat a/nebo upravovat za podmínek GNU General Public License (GPL), jak jsou zveřejněny Free Software Foundation; buď ve verzi 2 licence, nebo (podle své volby) v kterékoli pozdější verzi.\n\nHandBrake je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLI ZÁRUKY; také bez předpokládané záruky PRODEJNOSTI nebo POUŽITELNOSTI PRO NĚJAKÝ URČITÝ ÚČEL: Více podrobností naleznete v GNU General Public License.\n\nKopii GNU General Public License byste měl obdržet společně s Glade; a pokud ne, napište Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
+
+msgid "_Minimize/Maximize"
+msgstr "Zvě_tšit/Zmenšit"
+
+msgid "_Pause Queue"
+msgstr "P_ozastavit řadu"
+
+msgid "_Quit"
+msgstr "_Ukončit"
+
+msgid "_About"
+msgstr "O _programu"
+
+msgid "_File"
+msgstr "_Soubor"
+
+msgid "_Source"
+msgstr "_Zdroj"
+
+msgid "Single _Title"
+msgstr "Jeden _titul"
+
+msgid "_Destination"
+msgstr "_Cíl"
+
+msgid "_Preferences"
+msgstr "_Nastavení"
+
+msgid "_Queue"
+msgstr "Ř_ada"
+
+msgid "S_top Queue"
+msgstr "Z_astavit řadu"
+
+msgid "_Add"
+msgstr "_Přidat"
+
+msgid "Add _Multiple"
+msgstr "Přidat _více"
+
+msgid "_Start"
+msgstr "_Spustit"
+
+msgid "_Pause"
+msgstr "_Pozastavit"
+
+msgid "_View"
+msgstr "_Pohled"
+
+msgid "HandBrake For _Dumbies"
+msgstr "HandBrake pro natvrdlé"
+
+msgid "_Show Presets"
+msgstr "_Ukázat přednastavení"
+
+msgid "_Preview"
+msgstr "_Náhled"
+
+msgid "_Activity Window"
+msgstr "Č_innost"
+
+msgid "Show _Queue"
+msgstr "Ukázat ř_adu"
+
+msgid "_Presets"
+msgstr "_Přednastavení"
+
+msgid "_Delete"
+msgstr "_Smazat"
+
+msgid "_Make Default"
+msgstr "_Udělat výchozím"
+
+msgid "_New Folder"
+msgstr "_Nová složka"
+
+msgid "_Export"
+msgstr "_Vyvést"
+
+msgid "_Import"
+msgstr "_Zavést"
+
+msgid "_Update Built-in Presets"
+msgstr "_Obnovit vestavěná přednastavení"
+
+msgid "_Help"
+msgstr "_Nápověda"
+
+msgid "_Guide"
+msgstr "Pří_ručka"
+
+msgid "Start Encoding"
+msgstr "Spustit kódování"
+
+msgid "Start"
+msgstr "Spustit"
+
+msgid "Pause Encoding"
+msgstr "Pozastavit kódování"
+
+msgid "Pause"
+msgstr "Pozastavit"
+
+msgid "Add to Queue"
+msgstr "Přidat do řady"
+
+msgid "Enqueue"
+msgstr "Zařadit"
+
+msgid "Show Queue"
+msgstr "Ukázat řadu"
+
+msgid "Queue"
+msgstr "Řada"
+
+msgid ""
+"Open Picture Settings and Preview window.\n"
+"Here you can adjust cropping, resolution, aspect ratio, and filters."
+msgstr "Otevřít nastavení obrázku a okno s náhledem.\nZde můžete upravit ořez, rozlišení, poměr stran a filtry."
+
+msgid "Preview"
+msgstr "Náhled"
+
+msgid "Show Activity Window"
+msgstr "Zobrazit okno činností"
+
+msgid "Activity"
+msgstr "Činnost"
+
+msgid "Source:"
+msgstr "Zdroj:"
+
+msgid "None"
+msgstr "Žádný"
+
+msgid "Title:"
+msgstr "Název:"
+
+msgid ""
+"Set the title to encode.\n"
+"By default the longest title is chosen.\n"
+"This is often the feature title of a DVD."
+msgstr "Nastavit titul k zakódování.\nVe výchozím nastavení je vybrán nejdelší titul.\nTo je často hlavní titul DVD."
+
+msgid "Angle:"
+msgstr "Úhel:"
+
+msgid "For multi-angle DVD's, select the desired angle to encode."
+msgstr "Pro víceúhlová DVD, vyberte požadovaný úhel k zakódování."
+
+msgid "Reset All Titles"
+msgstr "Nastavit všechny názvy znovu"
+
+msgid "Apply current settings to all titles"
+msgstr "Použít nynější nastavení na všechny názvy"
+
+msgid "Range of title to encode. Can be chapters, seconds, or frames."
+msgstr "Rozsah titulu k zakódování. Můžou to být kapitoly, sekundy nebo snímky."
+
+msgid "Set the first chapter to encode."
+msgstr "Nastavit první kapitolu k zakódování."
+
+msgid "through"
+msgstr "až"
+
+msgid "Set the last chapter to encode."
+msgstr "Nastavit poslední kapitolu k zakódování."
+
+msgid "Duration:"
+msgstr "Doba trvání:"
+
+msgid "Destination"
+msgstr "Cíl"
+
+msgid "File:"
+msgstr "Soubor:"
+
+msgid "Destination filename for your encode."
+msgstr "Cílový souborový název pro zakódovaný soubor."
+
+msgid "Destination directory for your encode."
+msgstr "Cílový adresář pro zakódovaný soubor."
+
+msgid "Destination Directory"
+msgstr "Cílový adresář"
+
+msgid "Format:"
+msgstr "Formát:"
+
+msgid "Format to mux encoded tracks to."
+msgstr "Formátovat do mux zakódovaných stop."
+
+msgid "iPod 5G Support"
+msgstr "Podpora pro iPod 5G"
+
+msgid "Add iPod Atom needed by some older iPods."
+msgstr "Přidat iPod Atom, jenž je potřeba některými staršími zařízeními iPod."
+
+msgid "Web optimized"
+msgstr "Vyladěno pro internet"
+
+msgid ""
+"Optimize the layout of the MP4 file for progressive download.\n"
+"This allows a player to initiate playback before downloading the entire file."
+msgstr "Přizpůsobit uspořádání souboru MP4 pro postupné stahování.\nTo přehrávači umožní začít přehrávat před dokončením stahování celého souboru."
+
+msgid "Large file (>4GB)"
+msgstr "Velký soubor (>4GB)"
+
+msgid "Presets List"
+msgstr "Seznam přednastavení"
+
+msgid "Source Codec:"
+msgstr "Kodek zdroje:"
+
+msgid "Dimensions:"
+msgstr "Rozměry:"
+
+msgid "Aspect: "
+msgstr "Poměr:"
+
+msgid "Frame Rate:"
+msgstr "Snímková rychlost:"
+
+msgid "Source Picture Parameters"
+msgstr "Parametry zdrojového obrázku"
+
+msgid "Autocrop:"
+msgstr "Automatické oříznutí:"
+
+msgid "Crop:"
+msgstr "Ořez:"
+
+msgid "Crop Dimensions:"
+msgstr "Rozměry pro ořezání:"
+
+msgid "Cropping"
+msgstr "Ořezání"
+
+msgid "Scale Dimensions:"
+msgstr "Rozměry pro změnu velikosti:"
+
+msgid "Optimal for Source:"
+msgstr "Nejlepší pro zdroj:"
+
+msgid "Anamorphic:"
+msgstr "Pokřivené:"
+
+msgid "Scaling"
+msgstr "Změna velikosti"
+
+msgid "Presentation Dimensions:"
+msgstr "Rozměry při promítání:"
+
+msgid "Summary"
+msgstr "Shrnutí"
+
+msgid "Left Crop"
+msgstr "Ořezání vlevo"
+
+msgid "Top Crop"
+msgstr "Ořezání nahoře"
+
+msgid "Bottom Crop"
+msgstr "Ořezání dole"
+
+msgid "Right Crop"
+msgstr "Oříznout vpravo"
+
+msgid "Auto Crop"
+msgstr "Automaticky oříznout"
+
+msgid "Automatically crop black borders around edges of the video."
+msgstr "Automaticky oříznout černý lem okolo okrajů obrazu."
+
+msgid "Loose Crop"
+msgstr "Volné ořezání"
+
+msgid ""
+"When picture settings require that the image\n"
+"dimensions be rounded to some multiple number\n"
+"of pixels, this setting will crop a few extra pixels\n"
+"instead of doing exact cropping and then scaling to\n"
+"the required multiple."
+msgstr "Když nastavení obrázku vyžaduje, aby byly\nrozměry obrázku zaokrouhleny na určitý násobek\npixelů Toto nastavení ořeže několik pixelů navíc,\nmísto toho, aby se udělalo přesné ořezání, a potom\nse provedla změna velikosti na požadovaný násobek."
+
+msgid "width:"
+msgstr "Šířka:"
+
+msgid ""
+"This is the width that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr "Toto je šířka, se kterou bude obraz uložen.\nSkutečné rozměry zobrazení se budou lišit, pokud poměr strany pixelu není 1:1."
+
+msgid "height:"
+msgstr "Výška:"
+
+msgid ""
+"This is the height that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr "Toto je výška, se kterou bude obraz uložen.\nSkutečné rozměry zobrazení se budou lišit, pokud poměr strany pixelu není 1:1."
+
+msgid "Optimal for source"
+msgstr "Nejlepší pro zdroj"
+
+msgid ""
+"If enabled, select the 'optimal' storage resolution.\n"
+"This will be the resolution that most closely matches the source resolution after cropping."
+msgstr "Je-li povoleno, vybrat nejlepší rozlišení pro ukládání.\nToto bude rozlišení, které nejvíce odpovídá rozlišení zdroje po ořezání."
+
+msgid "Alignment:"
+msgstr "Zarovnání:"
+
+msgid ""
+"Align storage dimensions to multiples of this value.\n"
+"\n"
+"This setting is only necessary for compatibility with some devices.\n"
+"You should use 2 unless you experience compatibility issues."
+msgstr "Zarovnat rozměry ukládání na násobky této hodnoty.\n\nToto nastavení je nezbytné jen pro snášenlivost s některými zařízeními.\nMěl byste použít 2, dokud se nesetkáte s potížemi se snášenlivostí."
+
+msgid "Storage Geometry"
+msgstr "Uspořádání úložiště"
+
+msgid ""
+"This is the display width. It is the result of scaling the storage "
+"dimensions by the pixel aspect."
+msgstr "Toto je šířka zobrazení. Je to výsledek změny velikosti rozměrů pro ukládání pomocí stránky pixelu."
+
+msgid "Pixel Aspect:"
+msgstr "Strana pixelu:"
+
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr "Strana pixelu určuje tvar pixelů.\n\nPoměr 1:1 stanovuje čtvercový pixel. Jiné hodnoty stanovují obdélníkové tvary.\nPřehrávače změní velikost obrázku tak, aby dosáhly stanovené stránky."
+
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr "Strana pixelu určuje tvar pixelů.\nPoměr 1:1 stanovuje čtvercový pixel. Jiné hodnoty stanovují obdélníkové tvary.\nPřehrávače změní velikost obrázku tak, aby dosáhly stanovené stránky."
+
+msgid "Keep Aspect"
+msgstr "Zachovat poměr"
+
+msgid ""
+"If enabled, the original display aspect of the source will be maintained."
+msgstr "Je-li povoleno, bude zachován původní vzhled zobrazení zdroje."
+
+msgid "Display Aspect:"
+msgstr "Zobrazit poměr stran:"
+
+msgid "Display Geometry"
+msgstr "Uspořádání zobrazení"
+
+msgid "Grayscale"
+msgstr "Odstíny šedi"
+
+msgid "If enabled, filter colour components out of video."
+msgstr "Je-li povoleno, filtrovat složky barvy mimo obraz."
+
+msgid "Deblock:"
+msgstr "Odstranit bloky:"
+
+msgid ""
+"The deblocking filter removes a common type of compression artifact.\n"
+"If your source exhibits 'blockiness', this filter may help clean it up."
+msgstr "Filtr na odstranění bloků odstraňuje běžný typ kompresního artefaktu.\nPokud se u vašeho zdroje projevuje blokovitost, tento filtr může pomoci s jejím odstraněním."
+
+msgid "Denoise Filter:"
+msgstr "Filtr pro odstranění šumu:"
+
+msgid ""
+"Denoise filtering reduces or removes the appearance of noise and grain.\n"
+"Film grain and other types of high frequency noise are difficult to compress.\n"
+"Using this filter on such sources can result in smaller file sizes."
+msgstr "Filtr na odstranění šumu je nízkopásmový filtr, který zmenšuje nebo odstraňuje šum a zrnitost.\nZrnitost filmu a jiné typy vysokokmitočtového šumu je obtížné zkomprimovat.\nPoužití tohoto filtru na tyto zdroje může vést k menším velikostem souborů."
+
+msgid "Denoise Preset:"
+msgstr "Přednastavení pro odstranění šumu:"
+
+msgid "Denoise Tune:"
+msgstr "Vyladění dstranění šumu:"
+
+msgid ""
+"Custom denoise filter string format\n"
+"\n"
+"SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
+msgstr "Vlastní formát řetězce filtru na odstranění šumu\n \nSpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
+
+msgid "Detelecine:"
+msgstr "Odstranit filmové snímání:"
+
+msgid ""
+"This filter removes 'combing' artifacts that are the result of telecining.\n"
+"\n"
+"Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps."
+msgstr "Filtr odstraňuje 'česací' artefakty, které jsou výsledkem filmového snímání.\n\nFilmové snímání je proces, který upravuje rychlosti snímkování filmu, které jsou 24 snímků za sekundu (SZS) na rychlosti snímkování obrazu NTSC, které jsou 30 SZS."
+
+msgid ""
+"Custom detelecine filter string format\n"
+"\n"
+"JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
+msgstr "Vlastní formát řetězce filtru na odstranění filmového snímače\n \nJunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
+
+msgid "Decomb"
+msgstr "Odstranění hřebenu"
+
+msgid ""
+"Choose decomb or deinterlace filter options.\n"
+"\n"
+"The decomb filter selectively deinterlaces frames that appear to be interlaced.\n"
+"This will preserve quality in frames that are not interlaced.\n"
+"\n"
+"The classic deinterlace filter is applied to all frames.\n"
+"Frames that are not interlaced will suffer some quality degradation."
+msgstr "Vyberte volby pro filtr na odstranění hřebenu nebo odstranění prokládání.\n\nFiltr na odstranění hřebenu výběrově odstraňuje prokládání snímků, jež se jeví být prokládané. To uchová kvalitu snímků, které nejsou prokládány.\n\nKlasický filtr na odstranění prokládání je použit na všechny snímky.\nSnímky, které nejsou prokládány, utrpí určitým poklesem jakosti."
+
+msgid "Deinterlace"
+msgstr "Odstranit prokládání"
+
+msgid "Decomb:"
+msgstr "Odstranit hřeben:"
+
+msgid ""
+"The decomb filter selectively deinterlaces frames that appear to be interlaced.\n"
+"This will preserve quality in frames that are not interlaced."
+msgstr "Filtr na odstranění hřebenu výběrově odstraňuje prokládání snímků, jež se jeví být prokládané.\nTo uchová kvalitu snímků, které nejsou prokládány."
+
+msgid ""
+"Custom decomb filter string format\n"
+"\n"
+"Mode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:\n"
+"BlockHeight:MagnitudeThres:VarianceThres:LaplacianThresh:DilationThresh:\n"
+"ErosionThresh:NoiseThresh:MaxSearchDistance:PostProcessing:Parity"
+msgstr "Vlastní formát řetězce filtru na odstranění hřebenu\n Mode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:\nBlockHeight:MagnitudeThres:VarianceThres:LaplacianThresh:DilationThresh:\nErosionThresh:NoiseThresh:MaxSearchDistance:PostProcessing:Parity"
+
+msgid "Deinterlace:"
+msgstr "Odstranit prokládání:"
+
+msgid ""
+"The classic deinterlace filter is applied to all frames.\n"
+"Frames that are not interlaced will suffer some quality degradation."
+msgstr "Klasický filtr pro odstranění prokládání se používá na všechny snímky.\nSnímky, jež nejsou prokládané, zakouší určité zhoršení jakosti."
+
+msgid ""
+"Custom deinterlace filter string format\n"
+"\n"
+"YadifMode:YadifParity:McdintMode:McdeintQp"
+msgstr "Vlastní formát řetězce filtru pro odstranění prokládání.\n\nYadifMode:YadifParity:McdintMode:McdeintQp"
+
+msgid "Filters"
+msgstr "Filtry"
+
+msgid "Picture"
+msgstr "Obrázek"
+
+msgid "Video Encoder:"
+msgstr "Kodér obrazu:"
+
+msgid "Available video encoders."
+msgstr "Dostupné kodéry obrazu."
+
+msgid "Framerate:"
+msgstr "Rychlost snímkování:"
+
+msgid ""
+"Output framerate.\n"
+"\n"
+"'Same as source' is recommended. If your source video has\n"
+"a variable framerate, 'Same as source' will preserve it."
+msgstr "Výstupní rychlost snímkování.\n\nDoporučena je stejná, jakou má zdroj. Pokud má zdroj obrazu\nproměnlivou rychlost snímkování, volba Stejné jako zdroj ji zachová."
+
+msgid "Constant Framerate"
+msgstr "Stálá rychlost snímkování"
+
+msgid "Enables constant framerate output."
+msgstr "Povolí výstup se stálou rychlostí snímkování."
+
+msgid "Peak Framerate (VFR)"
+msgstr "Nejvyšší rychlost snímkování (PromRS)"
+
+msgid ""
+"Enables variable framerate output with a peak\n"
+"rate determined by the framerate setting.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr "Povolí výstup s proměnlivou rychlostí snímkování s nejvyšší\nrychlostí určenou nastavením rychlosti snímkování.\nProměnlivá rychlost snímkování (PromRS) se neslučuje s některými přehrávači."
+
+msgid "Variable Framerate"
+msgstr "Proměnlivá rychlost snímkování"
+
+msgid ""
+"Enables variable framerate output.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr "Povolí výstup s proměnlivou rychlostí snímkování.\nProměnlivá rychlost snímkování (PromRS) se neslučuje s některými přehrávači."
+
+msgid ""
+"Set the desired quality factor.\n"
+"The encoder targets a certain quality.\n"
+"The scale used by each video encoder is different.\n"
+"\n"
+"x264's scale is logarithmic and lower values correspond to higher quality.\n"
+"So small decreases in value will result in progressively larger increases\n"
+"in the resulting file size. A value of 0 means lossless and will result\n"
+"in a file size that is larger than the original source, unless the source\n"
+"was also lossless.\n"
+"\n"
+"FFMpeg's and Theora's scale is more linear.\n"
+"These encoders do not have a lossless mode."
+msgstr "Nastavit požadovaný koeficient kvality.\nKodér cílí na určitou jakost.\nMěřítko používané každým kodérem obrazu je jiné. \n\nMěřítko x264 je logaritmické a nižší hodnoty odpovídají vyšší kvalitě.\nMalý pokles hodnoty tedy povede k progresivně většímu růstu velikosti\nvýsledného souboru. Hodnota 0 znamená, že kvalita je bezztrátová,\na výsledkem je velikost souboru větší, než jakou měl původní soubor,\nledaže by byl zdroj rovněž bezztrátový.\n\nMěřítko u FFMpeg a Theory je více lineární.\nTyto kodéry nemají bezztrátový režim."
+
+msgid "Constant Quality:"
+msgstr "Stálá jakost:"
+
+msgid "Bitrate (kbps): "
+msgstr "Datový tok (kB/s): "
+
+msgid ""
+"Set the average bitrate.\n"
+"\n"
+"The instantaneous bitrate can be much higher or lower at any point in time.\n"
+"But the average over a long duration will be the value set here. If you need\n"
+"to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings."
+msgstr "Nastavit průměrný datový tok.\n\nOkamžitý datový tok může být vyšší nebo nižší v kterémkoli časovém bodě.\nAle průměr pro dlouhou dobu trvání bude hodnota nastavená zde.\nPokud okamžitý datový tok potřebujete omezit, podívejte se na nastavení x264 vbv-bufsize a vbv-maxrate."
+
+msgid "2-Pass Encoding"
+msgstr "Dvouprůchodové kódování"
+
+msgid ""
+"Perform 2 Pass Encoding.\n"
+"\n"
+"The 'Bitrate' option is prerequisite. During the 1st pass, statistics about\n"
+"the video are collected. Then in the second pass, those statistics are used\n"
+"to make bitrate allocation decisions."
+msgstr "Provést dvouprůchodové kódování.\n\nPředpokladem je volba Datový tok. Během prvního průchodu jsou\nshromažďovány statistiky o obrazu. Při druhém průchodu jsou tyto\nstatistiky použity při rozhodování o rozvržení datového toku."
+
+msgid "Turbo First Pass"
+msgstr "Rychlý první průchod"
+
+msgid ""
+"During the 1st pass of a 2 pass encode, use settings that speed things "
+"along."
+msgstr "Během prvního průchodu dvouprůchodového kódování použít nastavení, která věci dál urychlí."
+
+msgid "Use Advanced Options"
+msgstr "Použít rozšířené volby"
+
+msgid ""
+"Use advanced options Tab for x264 settings.\n"
+"\n"
+"Use at your own risk!"
+msgstr "Použít kartu s pokročilými volbami k nastavení x264.\n\nPoužijte na vlastní nebezpečí!"
+
+msgid "Preset:"
+msgstr "Přednastavení:"
+
+msgid ""
+"Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
+"\n"
+"This establishes your default encoder settings.\n"
+"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"You should generally set this option to the slowest you can bear since slower\n"
+"settings will result in better quality or smaller files."
+msgstr "Upraví nastavení kodéru pro vzdání se účinnosti komprese oproti rychlosti kódování.\n\nTímto se zřídí vaše výchozí nastavení kodéru.\nSeřízení, profily, úrovně a rozšířené volby budou použity na toto.\n\nObecně byste tuto volbu měl nastavit na nejpomalejší, kterou snesete,\nprotože pomalejší nastavení dávají ve výsledku lepší kvalitu nebo menší soubory."
+
+msgid "Tune:"
+msgstr "Naladění:"
+
+msgid ""
+"Tune settings to optimize for common scenarios.\n"
+"\n"
+"This can improve effeciency for particular source characteristics or set\n"
+"characteristics of the output file. Changes will be applied after the\n"
+"preset but before all other parameters."
+msgstr "Přizpůsobit nastavení, aby byla vyladěna pro běžné scénáře.\n\nToto může zlepšit účinnost pro vlastnosti určitého zdroje nebo nastavit\nvlastnosti výstupního souboru. Změny se použijí po přednastavení\nale přede všemi ostatními parametry."
+
+msgid "Fast Decode"
+msgstr "Rychlé dekódování"
+
+msgid ""
+"Reduce decoder CPU usage.\n"
+"\n"
+"Set this if your device is struggling to play the output (dropped frames)."
+msgstr "Omezit využití CPU dekodérem.\n\nNastavte, pokud se vaše zařízení potýká s přehráváním výstupu (zahozené snímky)."
+
+msgid "Zero Latency"
+msgstr "Nulová prodleva"
+
+msgid ""
+"Minimize latency between input to encoder and output of decoder.\n"
+"\n"
+"This is useful for broadcast of live streams.\n"
+"\n"
+"Since HandBrake is not suitable for live stream broadcast purposes,\n"
+"this setting is of little value here."
+msgstr "Zmenšit prodlevu mezi vstupem do kodéru a výstupem dekodéru.\n\nToto je užitečné pro přenos živých proudů.\n\nProtože HandBrake není vhodný pro přenos živých proudů,\nmá toto nastavení zde malý význam."
+
+msgid "Profile:"
+msgstr "Profil:"
+
+msgid ""
+"Sets and ensures compliance with the specified profile.\n"
+"\n"
+"Overrides all other settings."
+msgstr "Nastaví a zajistí shodu se zadaným profilem.\n\nPotlačí všechna ostatní nastavení."
+
+msgid "Level:"
+msgstr "Úroveň:"
+
+msgid ""
+"Sets and ensures compliance with the specified level.\n"
+"\n"
+"Overrides all other settings."
+msgstr "Nastaví a zajistí shodu se zadanou úrovní .\n\nPotlačí všechna ostatní nastavení."
+
+msgid "More Settings:"
+msgstr "Další nastavení:"
+
+msgid ""
+"Additional encoder settings.\n"
+"\n"
+"Colon separated list of encoder options."
+msgstr "Dodatečné nastavení kodéru.\n\nDvojtečkou oddělený seznam voleb pro kodér."
+
+msgid "Video"
+msgstr "Obraz"
+
+msgid "Selection Behavior:"
+msgstr "Chování výběru"
+
+msgid "Remove"
+msgstr "Odstranit"
+
+msgid "Available Languages"
+msgstr "Dostupné jazyky"
+
+msgid "Selected Languages"
+msgstr "Vybrané jazyky"
+
+msgid "Use only first encoder for secondary audio"
+msgstr "Použít pouze první kodér pro doplňkový zvuk"
+
+msgid ""
+"Only the primary audio track will be encoded with the full encoder list.\n"
+"All other secondary audio output tracks will be encoded with first encoder only."
+msgstr "Pouze hlavní zvuková stopa bude zakódována pomocí celého seznamu pro kodér.\nVšechny vedlejší zvukové výstupní stopy budou zakódovány pouze pomocí prvního kodéru."
+
+msgid "Auto Passthru:"
+msgstr "Automatický průchod:"
+
+msgid "MP3"
+msgstr "MP3"
+
+msgid ""
+"Enable this if your playback device supports MP3.\n"
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+msgstr "Toto povolit, pokud vaše zařízení pro přehrávání podporuje MP3.\nToto dovolí, aby byl vybrán průchod MP3 passthru, když je povolen automatický výběr průchodu."
+
+msgid "AAC"
+msgstr "AAC"
+
+msgid ""
+"Enable this if your playback device supports AAC.\n"
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
+msgstr "Toto povolit, pokud vaše zařízení pro přehrávání podporuje AAC.\nToto dovolí, aby byl vybrán průchod AAC, když je povolen automatický výběr průchodu."
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid ""
+"Enable this if your playback device supports AC-3.\n"
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+msgstr "Toto povolit, pokud vaše zařízení pro přehrávání podporuje AC-3.\nToto dovolí, aby bylo vybráno AC-3 passthru, když je povolen automatický výběr passthru."
+
+msgid "DTS"
+msgstr "DTS"
+
+msgid ""
+"Enable this if your playback device supports DTS.\n"
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
+msgstr "Toto povolit, pokud vaše zařízení pro přehrávání podporuje DTS.\nToto dovolí, aby bylo vybráno DTS passthru, když je povolen automatický výběr passthru."
+
+msgid "DTS-HD"
+msgstr "DTS-HD"
+
+msgid ""
+"Enable this if your playback device supports DTS-HD.\n"
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+msgstr "Toto povolit, pokud vaše zařízení pro přehrávání podporuje DTS-HD.\nToto dovolí, aby bylo vybráno DTS-HD passthru, když je povolen automatický výběr passthru."
+
+msgid "Passthru Fallback:"
+msgstr "Nouzový passthru:"
+
+msgid ""
+"Set the audio codec to encode with when a suitable track can not be found "
+"for audio passthru."
+msgstr "Nastavit zvukový kodek, který se má použít při kódování, když nelze najít vhodnou stopu pro \"audio passthru\"."
+
+msgid "Audio Encoder Settings:"
+msgstr "Nastavení kódování zvuku:"
+
+msgid "Encoder"
+msgstr "Kodér"
+
+msgid "Bitrate/Quality"
+msgstr "Datový tok/Jakost"
+
+msgid "Mixdown"
+msgstr "Závěrečné smíchání"
+
+msgid "Samplerate"
+msgstr "Vzorkovací kmitočet"
+
+msgid "Gain"
+msgstr "Zesílení"
+
+msgid "Gain:"
+msgstr "Zesílení:"
+
+msgid "DRC"
+msgstr "DRC"
+
+msgid "Audio Defaults"
+msgstr "Výchozí nastavení zvuku"
+
+msgid "Add new audio settings to the list"
+msgstr "Přidat nové nastavení zvuku do seznamu"
+
+msgid "Add All"
+msgstr "Přidat vše"
+
+msgid "Add all audio tracks to the list"
+msgstr "Přidat všechny zvukové stopy do seznamu"
+
+msgid "Reload Defaults"
+msgstr "Nahrát výchozí hodnoty znovu"
+
+msgid "Reload all audio settings from defaults"
+msgstr "Nahrát znovu všechna nastavení zvuku z výchozích hodnot"
+
+msgid "Audio List"
+msgstr "Seznam zvukových stop"
+
+msgid "Preferred Language: None"
+msgstr "Upřednostňovaný jazyk: Žádný"
+
+msgid "Add Foreign Audio Search Pass"
+msgstr "Přidat cestu pro hledání zvuku v cizím jazyce"
+
+msgid ""
+"Add \"Foreign Audio Search\" when the default audio track is your preferred language.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them."
+msgstr "Přidat hledání zvuku v cizím jazyce, když výchozí zvuková stopa je ve vámi upřednostňovaném jazyce.\nToto hledání nalezne krátké úryvky zvuku v cizím jazyce a poskytne pro ně titulky."
+
+msgid "Add subtitle track if default audio is foreign"
+msgstr "Přidat stopu titulků, pokud je výchozí zvuk v cizím jazyce"
+
+msgid ""
+"When the default audio track is not your preferred language, add a subtitle "
+"track."
+msgstr "Přidat stopu titulků, pokud výchozí zvuk není ve vámi upřednostňované jazyce."
+
+msgid "Add Closed Captions when available"
+msgstr "Přidat skryté titulky, když jsou dostupné"
+
+msgid ""
+"Closed captions are text subtitles that can be added to any container as a "
+"soft subtitle track (not burned)"
+msgstr "Zavřené titulky jsou textové titulky, které je možné přidat do kteréhokoli kontejneru jako měkkou stopu s titulky (nevypálenoo)"
+
+msgid "Subtitle Defaults"
+msgstr "Výchozí nastavení titulků"
+
+msgid "Add new subtitle settings to the list"
+msgstr "Přidat nastavení pro nové titulky do seznamu"
+
+msgid "Add all subtitle tracks to the list"
+msgstr "Přidat všechny titulkové stopy do seznamu"
+
+msgid "Reload all subtitle settings from defaults"
+msgstr "Nahrát znovu všechna nastavení titulků z výchozích hodnot"
+
+msgid "Subtitle List"
+msgstr "Seznam titulků"
+
+msgid "Reference Frames:"
+msgstr "Referenční snímky:"
+
+msgid ""
+"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
+"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
+"\n"
+"Note that many hardware devices have limitations on the number of supported reference\n"
+"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
+"you're absolutely sure you know what you're doing!"
+msgstr "Rozumné hodnoty jsou ~1-6. Čím více přidáte, tím lepší komprese, ale pomalejší kódování.\nAnimace má sklon mít užitek z více referenčních snímků mnohem více než obsah filmu.\nVšimněte si, že mnohá zařízení mají omezení na počet referenčních snímků,\ntakže pokud provádíte zakódování pro počítač do ruky nebo samostatný přehrávač,\nnešahejte na to, pokud si nejste naprosto jistí, co děláte!"
+
+msgid "Maximum B-Frames:"
+msgstr "Maximum B-snímky:"
+
+msgid ""
+"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
+"\n"
+"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
+"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
+"values.\n"
+"\n"
+"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
+msgstr "Rozumné hodnoty jsou ~2-5. Toto udává největší počet sekvenčních B-snímků, které může kodér použít.\nVelké počty obecně moc nepomáhají, dokud nejsou přizpůsobivé B-snímky nastaveny na nejvýhodnější.\nCel-animovaný zdrojový materiál a B-jehlan také podstatně zvětšují prospěšnost větších hodnot.\n\nZákladní profil, požadovaný iPody a podobnými zařízeními, vyžaduje, aby byly B-snímky nastaveny na 0 (vypnuto)."
+
+msgid "Pyramidal B-Frames:"
+msgstr "Jehlanovité B-snímky:"
+
+msgid ""
+"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
+"of B-frames, allowing B-frames to reference each other to improve compression.\n"
+"\n"
+"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
+msgstr "B-jehlan zlepšuje kompresi vytvořením jehlanovité stavby (odtud název) z\nB-snímků, dovoluje B-snímkům, aby jeden na druhý odkazovaly kvůli zlepšení\nkomprese.\n\nVyžaduje Max B-snímky větší než 1; nejvýhodnější přizpůsobivé B-snímky se doporučují kvůli plnému užitku z komprese."
+
+msgid "Weighted P-Frames:"
+msgstr "Vážené P-snímky:"
+
+msgid ""
+"Performs extra analysis to decide upon weighting parameters for each frame.\n"
+"\n"
+"This improves overall compression slightly and improves the quality of fades greatly.\n"
+"\n"
+"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
+"prediction to be disabled. Note that some devices and players, even those that support\n"
+"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
+"completely incompatible with it, for example."
+msgstr "Provede další rozbor kvůli rozhodnutí o zvážení parametrů pro každý snímek.\n\nTo lehce zlepší celkovou kompresi a značně vylepší kvalitu prolínání.\nZákladní profil, požadovaný iPody a podobnými zařízeními, vyžaduje, aby bylo\nvážené předvídání P-snímku zakázáno. Všimněte si, že některá zařízení a přehrávače,\ndokonce ty, které podporují hlavní profil, mohou mít s předvídáním váženého\nP-snímku potíže: například Apple TV se s ním naprosto neslučuje."
+
+msgid "8x8 Transform"
+msgstr "Transformace 8x8"
+
+msgid ""
+"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
+"\n"
+"It improves compression by at least 5% at a very small speed cost and may\n"
+"provide an unusually high visual quality benefit compared to its compression\n"
+"gain. However, it requires High Profile, which many devices may not support."
+msgstr "Transformace 8x8 je jedna z nejužitečnějších vlastností x264 pokud jde o rychlost komprese.\n\nZlepšuje kompresi alespoň o 5% za velmi malou cenu, pokud jde o rychlost,\na může poskytnout neobyčejně velký zisk, pokud jde o obrazovou kvalitu,\nve srovnání s kompresním ziskem. Nicméně vyžaduje nejvyšší kvalitu, což mnohá\nzařízení nemusí podporovat."
+
+msgid "CABAC Entropy Encoding"
+msgstr "Kódování CABAC Entropy"
+
+msgid ""
+"After the encoder has done its work, it has a bunch of data that\n"
+"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
+"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
+"compresses significantly better (10-30%), especially at lower bitrates.\n"
+"\n"
+"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
+"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
+msgstr "Když kodér udělal svoji práci, má hromadu dat, která je potřeba bezztrátově\nzkomprimovat, což je podobné ZIP nebo RAR. H.264 pro to poskytuje dvě volby:\nCAVLC a CABAC. CABAC dekóduje o hodně pomaleji ale komprimuje podstatně lépe\n(10-30%), obzvláště při nižších datových tocích.\n\nPokud hledáte něco, co zmenší nároky CPU na přehrávání obrazu, tuto volbu zakažte.\nZákladní profil, požadovaný iPody a podobnými zařízeními, vyžaduje, aby byl CABAC zakázán."
+
+msgid "Encoding Features"
+msgstr "Volby pro kódování"
+
+msgid "Motion Est. Method:"
+msgstr "Způsob odhadování pohybu:"
+
+msgid ""
+"Controls the motion estimation method.\n"
+"\n"
+"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
+"A better motion search method improves compression at the cost of speed.\n"
+"\n"
+"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
+"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
+"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
+"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
+"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
+msgstr "Ovládá způsob odhadování pohybu.\n\nOdhad pohybu je to, jak kodér odhaduje, jak se každý blok pixelů pohnul.\nLepší způsob hledání pohybu zlepšuje kompresi za cenu rychlosti.\n\nDiamant: provádí nesmírně rychlé a jednoduché hledání pomocí diamantového vzoru.\nŠestiúhelník: provádí poněkud účinnější ale lehce pomalejší hledání pomocí šestiúhelníkového vzoru.\n\nNerovnoměrný Multi-Hex: provádí velice široké hledání pomocí různých druhů vzorů, přesnější zachycení složitého pohybu.\nDůkladné: provádí vyčerpávající hledání každého pixelu v široké oblasti. Podstatně pomalejší, přitom kompresní zisk je malý.\nTransformované důkladné: podobá se důkladnému, ale dělá ještě přesnější rozhodnutí. Podle toho je poněkud pomalé, a zlepšení je jen malé."
+
+msgid "Subpel ME &amp; Mode:"
+msgstr "Subpixel ME &amp; režim:"
+
+msgid "Motion Est. Range:"
+msgstr "Rozsah odhadování pohybu:"
+
+msgid ""
+"This is the distance x264 searches from its initial guess at the\n"
+"motion of a block in order to try to find its actual motion.\n"
+"\n"
+"The default is fine for most content, but extremely high motion video,\n"
+"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
+"a high speed cost."
+msgstr "Toto je vzdálenost hledání x264 od svého počátečního odhadu pohybu bloku,\naby se pokusil najít jeho skutečný pohyb.\n\nPro většinu obsahu je výchozí dobrá, ale obraz s mimořádně velkým pohybem,\nobzvláště při rozlišení HD, může mít užitek z větších rozsahů, třebaže za cenu rychlosti."
+
+msgid "Adaptive Direct Mode:"
+msgstr "Přizpůsobivý přímý režim:"
+
+msgid ""
+"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
+"\n"
+"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
+"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
+"adaptively select which is better for each particular frame."
+msgstr "H.264 umožňuje v B-snímcích dva odlišné režimy předpovídání, prostorový a časový.\n\nProstorový, který je výchozím režimem, je skoro vždy lepší, ale časový je někdy také užitečný.\nx264 může, za cenu malé ztráty na rychlosti (a podle toho za malý zisk na kompresi), podle\nokolností vybrat, který je lepší, pro každý jednotlivý snímek."
+
+msgid "Adaptive B-Frames:"
+msgstr "Přizpůsobivé B-snímky:"
+
+msgid "Partitions:"
+msgstr "Úseky:"
+
+msgid ""
+"Mode decision picks from a variety of options to make its decision:\n"
+"this option chooses what options those are.\n"
+"\n"
+"Fewer partitions to check means faster encoding, at the cost of worse\n"
+"decisions, since the best option might have been one that was turned off."
+msgstr "Režimové rozhodnutí volí z mnoha druhů voleb, aby učinilo své rozhodnutí:\nTato volba vybírá, které volby to jsou.\nMenší počet částí ke kontrole znamená rychlejší kódování za cenu\nhorších rozhodnutí, protože ta nejlepší volba mohla být tou, jež byla vypnuta."
+
+msgid "Trellis:"
+msgstr "Mříž:"
+
+msgid ""
+"Trellis fine-tunes the rounding of transform coefficients to\n"
+"squeeze out 3-5% more compression at the cost of some speed.\n"
+"\n"
+"\"Always\" uses trellis not only during the main encoding process, but also\n"
+"during analysis, which improves compression even more, albeit at great speed cost.\n"
+"\n"
+"Trellis costs more speed at higher bitrates and requires CABAC."
+msgstr "Mříž jemně naladí zaokrouhlení transformačních koeficientů, aby\nvymačkala o 3-5 % větší kompresi za cenu nějaké rychlosti.\n\n\"Vždy\" používá mříž nejen během hlavního procesu kódování, ale i během\nrozboru, což zlepšuje kompresi ještě víc, i když za velkou cenu na rychlosti.\n\nMříž stojí více rychlosti při vyšších datových tocích a vyžaduje CABAC."
+
+msgid "Analysis"
+msgstr "Rozbor"
+
+msgid "Adaptive Quantization Strength:"
+msgstr "Přizpůsobivá síla kvantizace:"
+
+msgid ""
+"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
+"\n"
+"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
+msgstr "Přizpůsobivá kvantizace řídí to, jak kodér rozmísťuje bity napříč snímkem.\n\nVyšší hodnoty odvádějí více bitů z okrajů a složitých oblastí kvůli zlepšení oblastí s jemnější podrobností."
+
+msgid "Psychovisual Rate Distortion:"
+msgstr "Psychozrakové zkreslení rychlosti:"
+
+msgid ""
+"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
+"vision to dramatically improve apparent detail and sharpness.\n"
+"The effect can be made weaker or stronger by adjusting the strength.\n"
+"Being an RD algorithm, it requires mode decision to be at least \"6\"."
+msgstr "Přizpůsobení psychozrakového zkreslení rychlosti těží z vlastnosti lidského\nzraku na dramatické zlepšení zjevných podrobností a ostrosti.\nÚčinek může být udělán slabší nebo silnější upravením jeho síly.\n Algoritmus vyžaduje, aby rozhodnutí režimu bylo alespoň \"6\"."
+
+msgid "Psychovisual Trellis:"
+msgstr "Psychozraková mříž:"
+
+msgid ""
+"Psychovisual trellis is an experimental algorithm to further\n"
+"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
+"\n"
+"Recommended values are around 0.2, though higher values may help for very\n"
+"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
+"and other sharp-edged graphics."
+msgstr "Psychozraková mříž je pokusný algoritmus pro další zlepšení ostrosti\na uchování podrobnosti, které jde dál, než k tomu, co dělá Psychozrakové zkreslení rychlosti.\n\nDoporučené hodnoty se pohybují okolo 0.2, ačkoliv vyšší hodnoty mohou\npomoci v případě velmi for very zrnitého obrazu nebo při kódování s nižším\ndatovým tokem. Nedoporučuje se použít na cel animace a jinou grafiku\ns ostrými okraji."
+
+msgid "Deblocking: "
+msgstr "Odstranění bloků:"
+
+msgid "No DCT Decimate"
+msgstr "Žádné ničení DCT"
+
+msgid ""
+"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
+"be better used for some other purpose in the video. However, this can\n"
+"sometimes have slight negative effects on retention of subtle grain and\n"
+"dither.\n"
+"\n"
+"Don't touch this unless you're having banding issues or other such cases\n"
+"where you are having trouble keeping fine noise."
+msgstr "x264 normálně nuluje téměř prázdné datové bloky, aby ušetřil bity, které tak\nmohou být v obrazu využity pro nějaký jiný účel. Toto však může mít někdy\nzáporný účinek na uchování jemné zrnitosti a roztřesení.\n\nNešahejte na to, pokud nemáte potíže s odstupňováním nebo s jinými\ntakovými případy, kde máte potíže se zachováním jemného šumu."
+
+msgid "Psychovisual"
+msgstr "Psychozrakový"
+
+msgid ""
+"Your selected options will appear here.\n"
+"You can edit these and add additional options.\n"
+"\n"
+"Default values will not be shown. The defaults are:\n"
+"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
+"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
+"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
+"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
+"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
+msgstr "Vámi vybrané volby se objeví zde. \n Můžete je upravovat a přidávat dodatečné volby. \n\n Výchozí hodnoty nebudou zobrazeny. Výchozí jsou:\n ref=3:bframes=3:b-adapt=fast:direct=spatial:\n b-pyramid=normal:weightp=2:me=hex:merange=16:\n subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n no-fast-pskip=0:no-dct-decimate=0:cabac=1"
+
+msgid "Current x264 Advanced Option String"
+msgstr "Rozšířené volby pro x264"
+
+msgid "Advanced Video"
+msgstr "Pokročilý obraz"
+
+msgid "Chapter Markers"
+msgstr "Značky kapitol"
+
+msgid "Add chapter markers to output file."
+msgstr "Přidat značky kapitol do výstupního souboru."
+
+msgid "Chapters"
+msgstr "Kapitoly"
+
+msgid "Actors:"
+msgstr "Herci:"
+
+msgid "Director:"
+msgstr "Režisér:"
+
+msgid "Release Date:"
+msgstr "Datum vydání:"
+
+msgid "Comment:"
+msgstr "Poznámka:"
+
+msgid "Genre:"
+msgstr "Žánr:"
+
+msgid "Description:"
+msgstr "Popis:"
+
+msgid "Plot:"
+msgstr "Zápletka:"
+
+msgid "Tags"
+msgstr "Značky"
+
+msgid "Settings"
+msgstr "Nastavení"
+
+msgid "Edit"
+msgstr "Upravit"
+
+msgid "Reload"
+msgstr "Nahrát znovu"
+
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr "Označit vybraný záznam řady jako čekající na vyřízení.\nNastaví znovu zařazený úkol jako čekající na vyřízení a připravený k opětovnému spuštění."
+
+msgid "Reload All"
+msgstr "Nahrát vše znovu"
+
+msgid ""
+"Mark all queue entries as pending.\n"
+"Resets all queue jobs to pending and ready to run again."
+msgstr "Označit všechny záznamy v řadě jako čekající na vyřízení.\nNastaví znovu všechny zařazené úkoly jako čekající na vyřízení a připravené k opětovnému spuštění."
+
+msgid "Select All"
+msgstr "Vybrat vše"
+
+msgid "Mark all titles for adding to the queue"
+msgstr "Označit všechny názvy pro přidání do řady"
+
+msgid "Clear All"
+msgstr "Vyprázdnit vše"
+
+msgid "Unmark all titles"
+msgstr "Odznačit všechny názvy"
+
+msgid "Destination files OK. No duplicates detected."
+msgstr "Cílové soubory jsou v pořádku. Nebylo zjištěno, že by byly některé soubory dvakrát."
+
+msgid "Preferences"
+msgstr "Nastavení"
+
+msgid "Automatically check for updates"
+msgstr "Automaticky ověřit dostupnost aktualizací"
+
+msgid "When all encodes are complete"
+msgstr "Když byla všechna kódování dokončena"
+
+msgid "Use automatic naming (uses modified source name)"
+msgstr "Použít automatické pojmenovávání (používá změněný název zdroje)"
+
+msgid "Auto-Name Template"
+msgstr "Pojmenovat předlohu automaticky"
+
+msgid ""
+"Available Options: {source} {title} {chapters} {date} {time} {quality} "
+"{bitrate}"
+msgstr "Dostupné volby: {source} {title} {chapters} {date} {time} {quality} {bitrate}"
+
+msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
+msgstr "Použít souborovou příponu iPod/iTunes friendly (.m4v) pro MP4"
+
+msgid "Number of previews"
+msgstr "Počet náhledů"
+
+msgid "Filter short titles (seconds)"
+msgstr "Filtrovat krátké tituly (sekundy)"
+
+msgid "Show system tray icon"
+msgstr "Ukázat ikonu v oznamovací oblasti panelu"
+
+msgid "General"
+msgstr "Obecné"
+
+msgid "Constant Quality fractional granularity"
+msgstr "Nepatrná zrnitost při stálé kvalitě"
+
+msgid "Use dvdnav (instead of libdvdread)"
+msgstr "Použít dvdnav (namísto libdvdread)"
+
+msgid "Put individual encode logs in same location as movie"
+msgstr "Dát jednotlivé záznamy o kódování do stejného umístění, kde je film"
+
+msgid "Activity Log Verbosity Level"
+msgstr "Úroveň podrobnosti zápisu o činnosti"
+
+msgid "Activity Log Longevity"
+msgstr "Délka života zápisu o činnosti"
+
+msgid "Scale down High Definition previews"
+msgstr "Zmenšit rozlišení náhledů ve vysokém rozlišení"
+
+msgid "Automatically Scan DVD when loaded"
+msgstr "Automaticky prohledat DVD při nahrání"
+
+msgid "Scans the DVD whenever a new disc is loaded"
+msgstr "Při nahrání disku prohlédne DVD"
+
+msgid "Hide Advanced Video Options Tab"
+msgstr "Skrýt kartu s pokročilými volbami pro obraz"
+
+msgid ""
+"Use advanced video options at your own risk.\n"
+"We recommend that you use the controls available\n"
+"on the Video tab instead."
+msgstr "Použít pokročilé volby pro obraz na vlastní nebezpečí.\nDoporučuje se namísto toho použít ovladače dostupné na kartě Obraz."
+
+msgid "Delete completed jobs from queue"
+msgstr "Odmazat dokončené úkoly z řady"
+
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr "Ve výchozím nastavení zůstávají dokončené úkoly v řadě a jsou označeny jako hotové.\nZaškrtněte, pokud chcete řadu uklidit sami, tím že smažete hotové úkoly."
+
+msgid "Allow Tweaks"
+msgstr "Povolit vyladění"
+
+msgid "Allow HandBrake For Dummies"
+msgstr "Povolit HandBrake pro natvrdlé"
+
+msgid "Advanced"
+msgstr "Pokročilé"
+
+msgid "Folder Name:"
+msgstr "Název složky:"
+
+msgid "Description"
+msgstr "Popis"
+
+msgid "Preset Name:"
+msgstr "Název přednastavení:"
+
+msgid "Custom Picture Dimensions"
+msgstr "Vlastní rozměry obrázku"
+
+msgid "Maximum Width:"
+msgstr "Největší šířka:"
+
+msgid "Enable maximum width limit."
+msgstr "Povolit nejzazší mez pro šířku."
+
+msgid ""
+"This is the maximum width that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source width is greater.\n"
+"Setting this to 0 means there is no maximum width."
+msgstr "Toto je největší šířka, se kterou bude obraz ukládán.\n\nVždy když je nahrán nový zdroj, použije se tato hodnota, pokud je šířka zdroje větší. Nastavení této hodnoty na 0 znamená, že není žádná největší šířka."
+
+msgid "Maximum Height:"
+msgstr "Největší výška:"
+
+msgid "Enable maximum height limit."
+msgstr "Povolit nejzazší mez pro výšku."
+
+msgid ""
+"This is the maximum height that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source height is greater.\n"
+"Setting this to 0 means there is no maximum height."
+msgstr "Toto je největší výška, se kterou bude obraz ukládán.\nVždy když je nahrán nový zdroj, použije se tato hodnota, pokud je šířka zdroje větší.\nNastavení této hodnoty na 0 znamená, že není žádná největší výška."
+
+msgid "Select preview frames."
+msgstr "Vybrat náhledové snímky."
+
+msgid ""
+"Encode and play a short sequence of video starting from the current preview "
+"position."
+msgstr "Zakódovat a přehrát krátký úryvek obrazu počínaje nynějším místem náhledu."
+
+msgid "Duration:"
+msgstr "Doba trvání"
+
+msgid "Set the duration of the live preview in seconds."
+msgstr "Nastavit dobu trvání živého náhledu v sekundách."
+
+msgid "Show Crop"
+msgstr "Ukázat oříznutí"
+
+msgid "Show Cropped area of the preview"
+msgstr "Ukázat oříznutou oblast v náhledu"
+
+msgid "Fullscreen"
+msgstr "Celá obrazovka"
+
+msgid "View Fullscreen Preview"
+msgstr "Zobrazit náhled celé obrazovky"
+
+msgid "Title Number:"
+msgstr "Název titulu:"
+
+msgid "Detected DVD devices:"
+msgstr "Zjištěná zařízení DVD:"
+
+msgid "Setting:"
+msgstr "Nastavení:"
+
+msgid "Import SRT"
+msgstr "Zavést SRT"
+
+msgid "Enable settings to import an SRT subtitle file"
+msgstr "Povolit nastavení pro zavedení souboru s titulky SRT"
+
+msgid "Embedded Subtitle List"
+msgstr "Vložený seznam titulků"
+
+msgid "Enable settings to select embedded subtitles"
+msgstr "Povolit nastavení pro vybrání vložených titulků"
+
+msgid "Language"
+msgstr "Jazyk"
+
+msgid "Character Code"
+msgstr "Kód znaku"
+
+msgid "Offset (ms)"
+msgstr "Posun (ms)"
+
+msgid ""
+"Set the language of this subtitle.\n"
+"This value will be used by players in subtitle menus."
+msgstr "Nastavit jazyk těchto titulků.\nTato hodnota bude používána přehrávači v nabídkách s titulky."
+
+msgid ""
+"Set the character code used by the SRT file you are importing.\n"
+"\n"
+"SRTs come in all flavours of character sets.\n"
+"We translate the character set to UTF-8.\n"
+"The source's character code is needed in order to perform this translation."
+msgstr "Nastavit znakový kód používaný souborem SRT, který zavádíte.\n\nSoubory SRTs přichází ve všech druzích znakových sad.\nZnakovou sadu překládáme do UTF-8.\nZnakový kód zdroje je potřeba za účelem provedení tohoto překódování znaků."
+
+msgid "Select the SRT file to import."
+msgstr "Vybrat soubor titulků SRT k zavedení."
+
+msgid "Srt File"
+msgstr "Soubor SRT"
+
+msgid "Adjust the offset in milliseconds between video and SRT timestamps"
+msgstr "Upravit posun v milisekundách mezi časovými razítky obrazu a souborem titulků SRT"
+
+msgid "Track"
+msgstr "Stopa"
+
+msgid "List of subtitle tracks available from your source."
+msgstr "Seznam stop s titulky dostupných ze zdroje."
+
+msgid "Forced Subtitles Only"
+msgstr "Pouze vynuceno titulky"
+
+msgid "Burn into video"
+msgstr "Vypálit do obrazu"
+
+msgid ""
+"Render the subtitle over the video.\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr "Vložit titulky do obrazu.\nTitulky budou součástí obrazu a nepůjde je zakázat."
+
+msgid "Set Default Track"
+msgstr "Nastavit výchozí stopu"
+
+msgid "Source Track"
+msgstr "Zdrojová stopa"
+
+msgid "List of audio tracks available from your source."
+msgstr "Seznam zvukových stop dostupných ze zdroje."
+
+msgid "Track Name:"
+msgstr "Název stopy:"
+
+msgid ""
+"Set the audio track name.\n"
+"\n"
+"Players may use this in the audio selection list."
+msgstr "Nastavit název zvukové stopy.\n\nTento mohou použít přehrávače v seznamu pro výběr zvuku."
+
+msgid "Mix"
+msgstr "Smíchání"
+
+msgid "Sample Rate"
+msgstr "Vzorkovací kmitočet"
+
+msgid "Sample Rate:"
+msgstr "Vzorkovací kmitočet:"
+
+msgid "Enable bitrate setting"
+msgstr "Povolit nastavení datového toku"
+
+msgid "Enable quality setting"
+msgstr "Povolit nastavení jakosti"
+
+msgid "Skip This Version"
+msgstr "Přeskočit tuto verzi"
+
+msgid "Remind Me Later"
+msgstr "Připomenout později"
+
+msgid "A new version of HandBrake is available!"
+msgstr "Je dostupná nová verze HandBrake!"
+
+msgid "HandBrake xxx is now available (you have yyy)."
+msgstr "HandBrake xxx je nyní dostupný (máte yyy)."
+
+msgid "Release Notes"
+msgstr "Poznámky k vydání"
+
+msgid "none"
+msgstr "Žádný"
+
+msgid "First Track Matching Selected Languages"
+msgstr "První stopa odpovídá vybraným jazykům"
+
+msgid "All Tracks Matching Selected Languages"
+msgstr "Všechny stopy odpovídají vybraným jazykům"
+
+msgid "Chapters:"
+msgstr "Kapitoly:"
+
+msgid "Seconds:"
+msgstr "Sekundy:"
+
+msgid "Frames:"
+msgstr "Snímky:"
+
+msgid "Do Nothing"
+msgstr "Nedělat nic"
+
+msgid "Show Notification"
+msgstr "Ukázat oznámení"
+
+msgid "Quit Handbrake"
+msgstr "Ukončit Handbrake"
+
+msgid "Put Computer To Sleep"
+msgstr "Uspat počítač"
+
+msgid "Shutdown Computer"
+msgstr "Vypnout počítač"
+
+msgid "Week"
+msgstr "Týden"
+
+msgid "Year"
+msgstr "Rok"
+
+msgid "Immortal"
+msgstr "Už nikdy"
+
+msgid "Never"
+msgstr "Nikdy"
+
+msgid "Daily"
+msgstr "Denně"
+
+msgid "Weekly"
+msgstr "Týdně"
+
+msgid "Monthly"
+msgstr "Měsíčně"
+
+msgid "Month"
+msgstr "Měsíc"
+
+msgid "Default"
+msgstr "Výchozí"
+
+msgid "Fast"
+msgstr "Rychlý"
+
+msgid "Bob"
+msgstr ""
+
+msgid "Slow"
+msgstr "Pomalý"
+
+msgid "Slower"
+msgstr "Pomalejší"
+
+msgid "NLMeans"
+msgstr "NLMeans"
+
+msgid "HQDN3D"
+msgstr "HQDN3D"
+
+msgid "Ultralight"
+msgstr "Ultralehký"
+
+msgid "Light"
+msgstr "Lehký"
+
+msgid "Medium"
+msgstr "Střední"
+
+msgid "medium"
+msgstr "Střední"
+
+msgid "Strong"
+msgstr "Silný"
+
+msgid "Film"
+msgstr "Film"
+
+msgid "Grain"
+msgstr "Zrnitost"
+
+msgid "High Motion"
+msgstr ""
+
+msgid "Animation"
+msgstr "Animace"
+
+msgid "Spatial"
+msgstr "Prostorový"
+
+msgid "Temporal"
+msgstr "Časový"
+
+msgid "Automatic"
+msgstr "Automaticky"
+
+msgid "Optimal"
+msgstr "Nejlepší"
+
+msgid "Normal"
+msgstr "Normální"
+
+msgid "Simple"
+msgstr "Jednoduchý"
+
+msgid "Smart"
+msgstr "Chytrý"
+
+msgid "Diamond"
+msgstr "Kosočtverec"
+
+msgid "Hexagon"
+msgstr "Šestiúhelník"
+
+msgid "Uneven Multi-Hexagon"
+msgstr "Nestejnoměrný více-šestiúhelník"
+
+msgid "Exhaustive"
+msgstr "Vyčerpávající"
+
+msgid "Hadamard Exhaustive"
+msgstr "Vyčerpávající Hadamard"
+
+msgid "Some"
+msgstr "Některý"
+
+msgid "All"
+msgstr "Vše"
+
+msgid "Encode only"
+msgstr "Pouze zakódovat"
+
+msgid "Always"
+msgstr "Vždy"
+
+msgid "Same as source"
+msgstr "Stejné jako zdroj"
+
+msgid "Same as source:"
+msgstr "Stejné jako zdroj:"
+
+msgid "(NTSC Film)"
+msgstr "(Film NTSC)"
+
+msgid "(PAL Film/Video)"
+msgstr "(Film/Video PAL)"
+
+msgid "(NTSC Video)"
+msgstr "(Video NTSC)"
+
+#, c-format
+msgid "%d - Unknown Length"
+msgstr "%d - Neznámá délka"
+
+msgid "No Titles"
+msgstr "Žádné názvy"
+
+msgid "No Audio"
+msgstr "Žádný zvuk"
+
+msgid "Foreign Audio Search"
+msgstr "Hledání zvuku v cizím jazyce"
+
+#, c-format
+msgid "Chapter %2d"
+msgstr "Kapitola %2d"
+
+#, c-format
+msgid "N/A"
+msgstr "Nedostupné"
+
+#, c-format
+msgid ""
+"Invalid Deinterlace Settings:\n"
+"\n"
+"%s\n"
+msgstr "Neplatné nastavení prokládání:\n\n%s\n"
+
+#, c-format
+msgid ""
+"Invalid Detelecine Settings:\n"
+"\n"
+"%s\n"
+msgstr "Neplatné nastavení odstranění filmového snímání:\n\n%s\n"
+
+#, c-format
+msgid ""
+"Invalid Decomb Settings:\n"
+"\n"
+"%s\n"
+msgstr "Neplatné nastavení odstranění hřebenu:\n\n%s\n"
+
+msgid ""
+"Theora is not supported in the MP4 container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, FFMPEG will be chosen for you."
+msgstr "Theora není v kontejneru MP4 podporována.\n\nMěl byste zvolit jiný obrazový kodek nebo kontejner.\nPokud budete pokračovat, bude vybrán FFMPEG."
+
+msgid "Continue"
+msgstr "Pokračovat"
+
+msgid "No title found.\n"
+msgstr "Nenalezen žádný název.\n"
+
+msgid ""
+"Only one subtitle may be burned into the video.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr "Do obrazu můžou být vypáleny pouze jedny titulky.\n\nMěl byste změnit výběr titulků.\nPokud budete pokračovat, budou některé titulky ztraceny."
+
+msgid ""
+"Srt file does not exist or not a regular file.\n"
+"\n"
+"You should choose a valid file.\n"
+"If you continue, this subtitle will be ignored."
+msgstr "Soubor SRT neexistuje, anebo není pravidelným souborem.\n\nMěl byste vybrat platný soubor.\nPokud budete pokračovat, budou tyto titulky přehlíženy."
+
+msgid ""
+"The source does not support Pass-Thru.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr "Zdroj nepodporuje průchod (Pass-Thru).\n\nMěl byste zvolit jiný zvukový kodek.\nPokud budete pokračovat, bude pro vás jeden vybrán."
+
+#, c-format
+msgid ""
+"%s is not supported in the %s container.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr "%s není podporován v kontejneru %s.\n\nMěl byste zvolit jiný zvukový kodek.\nPokud budete pokračovat, bude pro vás jeden vybrán."
+
+#, c-format
+msgid ""
+"The source audio does not support %s mixdown.\n"
+"\n"
+"You should choose a different mixdown.\n"
+"If you continue, one will be chosen for you."
+msgstr "Zdrojový zvuk nepodporuje %s smíchání.\n\nMěl byste zvolit jiné smíchání (finální mixáž).\nPokud budete pokračovat, bude pro vás jedno vybráno."
+
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr "<big>Nelze vytvořit %s.</big>\n\nVnitřní chyba. Nepodařilo se zpracovat popis UI.\n%s"
+
+#, c-format
+msgid "Signal handler (%s) not found"
+msgstr "Obsluha signálu (%s) nenalezena"
+
+msgid "Index"
+msgstr "Rejstřík"
+
+msgid "Duration"
+msgstr "Trvání"
+
+msgid "Title"
+msgstr "Název"
+
+msgid "Done\n"
+msgstr "Hotovo\n"
+
+msgid "DATA"
+msgstr "DATA"
+
+msgid "Job Information"
+msgstr "Informace o úkolu"
+
+msgid "Track Information"
+msgstr "Informace o stopě"
+
+msgid "Preset Name"
+msgstr "Název přednastavení"
+
+msgid "The device or file to encode"
+msgstr "Zařízení nebo soubor k zakódování"
+
+msgid "The preset values to use for encoding"
+msgstr "Hodnoty přednastavení, které se mají použít k zakódování"
+
+msgid "Spam a lot"
+msgstr ""
+
+msgid "- Transcode media formats"
+msgstr "- Překódovat multimediální formáty"
+
+msgid "Globals"
+msgstr "Celková nastavení"
+
+msgid "Presets"
+msgstr "Přednastavení"
+
+msgid "Folder"
+msgstr "Složka"
+
+#, c-format
+msgid "%s path: (%s)"
+msgstr "%s cesta: (%s)"
+
+#, c-format
+msgid "%s indices: len %d"
+msgstr "%s rejstříky: len %d"
+
+msgid "Type"
+msgstr "Typ"
+
+msgid "Failed to find parent folder when adding child."
+msgstr "Při přidávání potomka se nepodařilo najít rodičovskou složku."
+
+msgid "Failed to find parent folder while adding child."
+msgstr "Při přidávání potomka se nepodařilo najít rodičovskou složku."
+
+#, c-format
+msgid "Can't map language value: (%s)"
+msgstr "Nelze přiřadit hodnotu jazyka: (%s)"
+
+#, c-format
+msgid "Can't map value: (%s)"
+msgstr "Nelze přiřadit hodnotu: (%s)"
+
+msgid "Subtitles"
+msgstr "Titulky"
+
+#, c-format
+msgid "Superfluous tunes! %s"
+msgstr "Nadbytečný zvuk! %s"
+
+#, c-format
+msgid ""
+"%s: Folder already exists.\n"
+"You can not replace it with a preset."
+msgstr "%s: Složka již existuje.\nNemůžete ji nahradit přednastavením."
+
+#, c-format
+msgid ""
+"%s: Preset already exists.\n"
+"You can not replace it with a folder."
+msgstr "%s: Přednastavení již existuje.\nNemůžete ji nahradit složkou."
+
+msgid "Import Preset"
+msgstr "Zavést přednastavení"
+
+msgid "All (*)"
+msgstr "Vše (*)"
+
+msgid "Presets (*.plist)"
+msgstr "Přednastavení (*.plist)"
+
+msgid "Export Preset"
+msgstr "Vyvést přednastavení"
+
+#, c-format
+msgid ""
+"Confirm deletion of %s:\n"
+"\n"
+"%s"
+msgstr "Potvrdit smazání %s:\n\n%s"
+
+msgid "No selection??? Perhaps unselected."
+msgstr "Žádný výběr? Patrně není vybráno."
+
+msgid "Couldn't create native window for GstXOverlay. Disabling live preview."
+msgstr "Nepodařilo se vytvořit nativní okno pro GstXOverlay. Zakazuje se živý náhled."
+
+msgid "Couldn't initialize gstreamer. Disabling live preview."
+msgstr "Nepodařilo se spustit gstreamer. Zakazuje se živý náhled."
+
+#, c-format
+msgid "Gstreamer Error: %s"
+msgstr "Chyba Gstreameru: %s"
+
+#, c-format
+msgid ""
+"Missing GStreamer plugin\n"
+"Audio or Video may not play as expected\n"
+"\n"
+"%s"
+msgstr "Chybí přídavný modul GStreameru\nZvuk nebo obraz nemusí být přehrávány tak, jak je očekáváno\n\n%s"
+
+msgid "Ok"
+msgstr "OK"
+
+msgid "Done"
+msgstr "Hotovo"
+
+msgid "Seconds"
+msgstr "Sekundy"
+
+msgid "Frames"
+msgstr "Snímky"
+
+#, c-format
+msgid ""
+"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
+" %s"
+msgstr "<big>%s</big> (Název %d, %s %d skrz %d, 2 průchody obrazu) --> %s"
+
+#, c-format
+msgid ""
+"<big>%s</big> (Title %d, %s %d through %d) --> %s"
+msgstr "<big>%s</big> (název %d, %s %d skrz %d) --> %s"
+
+#, c-format
+msgid "Modified Preset Based On: %s\n"
+msgstr "Změněné přednastavení založené na: %s\n"
+
+#, c-format
+msgid "Preset: %s\n"
+msgstr "Přednastavení: %s\n"
+
+#, c-format
+msgid "Format: %s Container\n"
+msgstr "Formát: %s Kontejner\n"
+
+msgid "Container Options:"
+msgstr "Volby pro kontejner:"
+
+#, c-format
+msgid "%sChapter Markers"
+msgstr "%s Značky kapitol"
+
+#, c-format
+msgid "%siPod 5G Support"
+msgstr "%s Podpora pro iPod 5G"
+
+#, c-format
+msgid "%sWeb Optimized"
+msgstr "%s Vyladěno pro internet"
+
+#, c-format
+msgid "%sLarge File Size (>4GB)"
+msgstr "%s Velikost velkých souborů (> 4GB)"
+
+#, c-format
+msgid "Destination: %s\n"
+msgstr "Cíl: %s\n"
+
+msgid "(Aspect Preserved)"
+msgstr "(Poměr stran zachován)"
+
+msgid "(Aspect Lost)"
+msgstr "(Poměr stran ztracen)"
+
+msgid "(Anamorphic)"
+msgstr "(Pokřivené)"
+
+msgid "(Custom Anamorphic)"
+msgstr "(Vlastní anamorfický)"
+
+msgid "Picture: "
+msgstr "Obrázek: "
+
+#, c-format
+msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
+msgstr "Zdroj: %d x %d, Výstup %d x %d %s, Ořez %d:%d:%d:%d"
+
+#, c-format
+msgid ", Display %d x %d"
+msgstr ", Zobrazení %d x %d"
+
+msgid "Filters:"
+msgstr "Filtry:"
+
+#, c-format
+msgid "%sDetelecine"
+msgstr "%s Odstranit filmové snímání"
+
+#, c-format
+msgid "%sDecomb"
+msgstr "%s Odstranění hřebenu"
+
+#, c-format
+msgid "%sDeinterlace"
+msgstr "%s Odstranit prokládání"
+
+#, c-format
+msgid "%sDenoise Filter %s:"
+msgstr "%s Filtr pro odstranění šumu %s:"
+
+#, c-format
+msgid "%sDeblock: %d"
+msgstr "%s Odstranit bloky: %d"
+
+#, c-format
+msgid "%sGrayscale"
+msgstr "%s Odstíny šedi"
+
+#, c-format
+msgid "Video: %s"
+msgstr "Obraz: %s"
+
+#, c-format
+msgid ", Framerate: %s %s"
+msgstr ", Rychlost snímkování: %s %s"
+
+#, c-format
+msgid ", Framerate: Peak %s (may be lower)"
+msgstr ", Rychlost snímkování: Vrchol %s (může být nižší)"
+
+#, c-format
+msgid ", Framerate: %s (constant frame rate)"
+msgstr ", Rychlost snímkování: %s (stálý datový tok)"
+
+msgid "Error"
+msgstr "Chyba"
+
+msgid "Bitrate:"
+msgstr "Datový tok:"
+
+msgid "Turbo 1st Pass: On\n"
+msgstr "Turbo 1 průchod: Zapnuto\n"
+
+#, c-format
+msgid "Video Options: Preset: %s"
+msgstr "Volby pro obraz: Přednastavení: %s"
+
+msgid " - Tune: "
+msgstr " - Naladění: "
+
+#, c-format
+msgid " - Profile: %s"
+msgstr " - Profil: %s"
+
+#, c-format
+msgid " - Level: %s"
+msgstr " - Úroveň: %s"
+
+#, c-format
+msgid "Advanced Options: %s\n"
+msgstr "Pokročilé volby: %s\n"
+
+msgid "Audio: "
+msgstr "Zvuk: "
+
+#, c-format
+msgid "Audio Tracks: %d"
+msgstr "Zvukové stopy: %d"
+
+#, c-format
+msgid "Bitrate: %d"
+msgstr "Datový tok: %d"
+
+#, c-format
+msgid "%s --> Encoder: %s"
+msgstr "%s --> Kodér: %s"
+
+#, c-format
+msgid "%s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
+msgstr "%s --> Kodér: %s, Finální mixáž: %s, Vzorkovací kmitočet: %s, %s"
+
+msgid "Subtitle: "
+msgstr "Titulky: "
+
+#, c-format
+msgid "Subtitle Tracks: %d\n"
+msgstr "Titulkové stopy: %d\n"
+
+msgid " (Force)"
+msgstr " (Vynutit)"
+
+msgid " (Burn)"
+msgstr " (Vypálit)"
+
+msgid " (Default)"
+msgstr " (Výchozí)"
+
+#, c-format
+msgid " %s (%s), %s, Offset (ms) %d%s\n"
+msgstr " %s (%s), %s, Posun (ms) %d%s\n"
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Another queued job has specified the same destination.\n"
+"Do you want to overwrite?"
+msgstr "Cíl: %s\n\nJiná zařazená úloha má stanoven stejný cíl.\nChcete jej přepsat?"
+
+msgid "Overwrite"
+msgstr "Přepsat"
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"This is not a valid directory."
+msgstr "Cíl: %s\n\nToto není platný adresář."
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Can not read or write the directory."
+msgstr "Cíl: %s\n\nNelze přečíst nebo zapisovat do adresáře."
+
+#, c-format
+msgid ""
+"Destination filesystem is almost full: %uM free\n"
+"\n"
+"Encode may be incomplete if you proceed.\n"
+msgstr "Cílový souborový systém je skoro plný: %uM volné\n\npokud budete pokračovat, zakódování může být nedokončeno.\n"
+
+msgid "Proceed"
+msgstr "Pokračovat"
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"File already exists.\n"
+"Do you want to overwrite?"
+msgstr "Cíl: %s\n\nSoubor již existuje.\nPřejete si jej přepsat?"
+
+msgid ""
+"Duplicate destination files detected.\n"
+"Duplicates will not be added to the queue."
+msgstr "Bylo zjištěno, že některé cílové soubory jsou dvakrát.\nSoubory, které jsou dvakrát, do řady přidány nebudou."
+
+msgid "No Title"
+msgstr "Žádný název"
+
+msgid ""
+"There is another title with the same destination file name.\n"
+"This title will not be added to the queue unless you change\n"
+"the output file name.\n"
+msgstr "Je tu další název se stejným cílovým souborovým názvem.\nTento název do řady přidán nebude, dokud název\nvýstupního souboru nezměníte.\n"
+
+msgid "Stop"
+msgstr "Zastavit"
+
+msgid "Stop Encoding"
+msgstr "Zastavit kódování"
+
+msgid "Resume"
+msgstr "Pokračovat"
+
+msgid "Resume Encoding"
+msgstr "Pokračovat v kódování"
+
+msgid "_Start Queue"
+msgstr "_Spustit řadu"
+
+msgid "_Resume Queue"
+msgstr "Po_kračovat v řadě"
+
+msgid ""
+"You are currently encoding. What would you like to do?\n"
+"\n"
+msgstr "Nyní provádíte zakódování. Co chcete dělat?\n\n"
+
+#, c-format
+msgid ""
+"You have %d unfinished job(s) in a saved queue.\n"
+"\n"
+"Would you like to reload them?"
+msgstr "Máte %d nezařazených úloh v uložené řadě.\n\nChcete je nahrát znovu?"
+
+msgid "No"
+msgstr "Ne"
+
+msgid "Yes"
+msgstr "Ano"
+
+#, c-format
+msgid "Usage: %s infile [outfile]\n"
+msgstr "Použití: %s infile [outfile]\n"
+
+#, c-format
+msgid "Attempt to set unknown widget type: %s\n"
+msgstr "Pokus o nastavení neznámého typu doplňku: %s\n"
+
+#, c-format
+msgid "No value found for %s\n"
+msgstr "Pro %s nebyla nalezena žádná hodnota.\n"
+
+msgid "Attempt to set unknown widget type"
+msgstr "Pokus o nastavení neznámého typu doplňku"
+
+#, c-format
+msgid "Failed to find widget for key: %s\n"
+msgstr "Nepodařilo se najít doplněk pro klíč: %s\n"
+
+#, c-format
+msgid "Offset: %dms"
+msgstr "Posun: %dms"
+
+msgid "Burned Into Video"
+msgstr "Vypáleno do obrazu"
+
+msgid "Passthrough"
+msgstr "Průchod"
+
+msgid "(Forced Subtitles Only)"
+msgstr "(Pouze vynucené titulky)"
+
+msgid "(Default)"
+msgstr "(Výchozí)"
+
+msgid "Error!"
+msgstr "Chyba!"
+
+#, c-format
+msgid "Preferred Language: %s"
+msgstr "Upřednostňovaný jazyk: %s"
+
+#, c-format
+msgid "Add %s subtitle track if default audio is not %s"
+msgstr "Přidat %s stopu titulků, pokud výchozí zvuk není %s"
+
+#, c-format
+msgid "Type %s"
+msgstr "Typ %s"
+
+#, c-format
+msgid "Type %s value %s"
+msgstr "Typ %s hodnota %s"
+
+#, c-format
+msgid "Type %s value %d"
+msgstr "Typ %s hodnota %d"
+
+#, c-format
+msgid "Type %s value %<PRId64>"
+msgstr "Typ %s hodnota %<PRId64>"
+
+#, c-format
+msgid "Type %s value %f"
+msgstr "Typ %s hodnota %f"
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"%s\""
+msgstr "%s\n\nRozšířené volby:\n\"%s\""
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"\""
+msgstr "%s\n\nRozšířené volby:\n\"\""
+
+msgid "ERROR"
+msgstr "Chyba"
+
+msgid ""
+"Anamorphic Modes:\n"
+"<tt>\n"
+"None - Force pixel aspect ratio to 1:1.\n"
+"Loose - Align dimensions to chosen 'Alignment' value \n"
+" and pick pixel aspect ratio that preserves the\n"
+" original display aspect ratio\n"
+"Strict - Keep original source dimensions and pixel \n"
+" aspect ratio</tt>"
+msgstr "Pokřivené režimy:\n<tt>\nŽádný - Vynutit poměr stran pixelu 1:1.\nLoose - Zarovnat rozměry na zvolenou hodnotu zarovnání \n a zvolit poměr stran pixelu, jenž zachovává\n původní poměr stran zobrazení\nPřísný - Zachovat původní rozměry zdroje a poměr \n stran pixelu</tt>"
+
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Pavel Fric"
+
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "fripohled.blogspot.com"

HandBrake-0.10.0.tar.bz2/gtk/po/da.po Added

HandBrake-0.10.0.tar.bz2/gtk/po/de.po Added

@@ -0,0 +1,2652 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
+# mod16 <neo.mmi@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: HandBrake-0.10\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-10 21:39+0400\n"
+"PO-Revision-Date: 2014-10-15 13:05+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/handbrake/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Off"
+msgstr "Aus"
+
+msgid "Quality: "
+msgstr "Qualität: "
+
+#, c-format
+msgid "Bitrate: %dkbps"
+msgstr "Bitrate: %dkbps"
+
+#, c-format
+msgid "Bitrate: %.4gkbps"
+msgstr "Bitrate: %.4gkbps"
+
+msgid "Passthrough"
+msgstr "Durchleiten"
+
+#, c-format
+msgid ""
+"%s\n"
+"Gain: %s\n"
+"DRC: %s\n"
+"Track Name: %s"
+msgstr "%s\nVerstärkung: %s\nDRC: %s\nSpurname: %s"
+
+#, c-format
+msgid ""
+"%s\n"
+"Gain: %s\n"
+"DRC: %s"
+msgstr "%s\nVerstärkung: %s\nDRC: %s"
+
+msgid "Add"
+msgstr "Hinzufügen"
+
+msgid ""
+"Add an audio encoder.\n"
+"Each selected source track will be encoded with all selected encoders."
+msgstr "Fügen Sie einen Audiokodierer hinzu.\nJede ausgewählte Quellspur wird mit allen ausgewählten Kodierern kodiert."
+
+msgid "Set the audio codec to encode this track with."
+msgstr "Legen Sie den Audiocodec fest, mit dem diese Spur kodiert wird."
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Quality"
+msgstr "Qualität"
+
+msgid "Set the bitrate to encode this track with."
+msgstr "Legen Sie die Bitrate fest, mit der diese Spur kodiert wird."
+
+msgid ""
+"Audio Quality:\n"
+"For encoders that support it, adjust the quality of the output."
+msgstr ""
+
+msgid "Set the mixdown of the output audio track."
+msgstr "Legen Sie die Abmischung der Ausgabeaudiospur fest."
+
+msgid "Set the sample rate of the output audio track."
+msgstr "Legen Sie die Abtastrate der Ausgabeaudiospur fest."
+
+msgid ""
+"Audio Gain:\n"
+"Adjust the amplification or attenuation of the output audio track."
+msgstr ""
+
+msgid ""
+"Audio Gain: Adjust the amplification or attenuation of the output "
+"audio track."
+msgstr ""
+
+msgid ""
+"Dynamic Range Compression:\n"
+"Adjust the dynamic range of the output audio track.\n"
+"For source audio that has a wide dynamic range,\n"
+"very loud and very soft sequences, DRC allows you\n"
+"to 'compress' the range by making loud sounds\n"
+"softer and soft sounds louder.\n"
+msgstr ""
+
+msgid ""
+"Dynamic Range Compression: Adjust the dynamic range of the output audio track. \n"
+"\n"
+" For source audio that has a wide dynamic range (very loud and very soft sequences), DRC allows you to 'compress' the range by making loud sections softer and soft sections louder."
+msgstr ""
+
+msgid ""
+"Dynamic Range Compression: Adjust the dynamic range of the output audio track. \n"
+"\n"
+" For source audio that has a wide dynamic range (very loud and very soft sequences), DRC allows you to 'compress' the range by making loud sections softer and soft sections louder."
+msgstr ""
+
+msgid "Remove this audio encoder"
+msgstr "Diesen Audiokodierer entfernen"
+
+msgid "Failed to find widget"
+msgstr ""
+
+#, c-format
+msgid "Failed to find dependent widget %s"
+msgstr ""
+
+msgid "Closing HandBrake will terminate encoding.\n"
+msgstr "Das Schließen von HandBrake wird die Kodierung abbrechen.\n"
+
+msgid "{source}"
+msgstr "{source}"
+
+msgid "{title}"
+msgstr "{title}"
+
+msgid "{chapters}"
+msgstr "{chapters}"
+
+msgid "{time}"
+msgstr "{time}"
+
+msgid "{date}"
+msgstr "{date}"
+
+msgid "{bitrate}"
+msgstr "{bitrate}"
+
+msgid "No Title Found"
+msgstr "Kein Titel gefunden"
+
+msgid "Not Selected"
+msgstr "Nicht ausgewählt"
+
+msgid "Scanning ..."
+msgstr "Abtasten ..."
+
+msgid "Stop Scan"
+msgstr "Abtasten stoppen"
+
+msgid "Choose Destination"
+msgstr "Ziel auswählen"
+
+msgid "On"
+msgstr "Ein"
+
+msgid "Strict"
+msgstr "Genau"
+
+msgid "Loose"
+msgstr "Frei"
+
+msgid "Custom"
+msgstr "Benutzerdefiniert"
+
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s in %d seconds ..."
+msgstr "%s\n\n%s in %d Sekunden ..."
+
+#, c-format
+msgid "%sYour movie will be lost if you don't continue encoding."
+msgstr "%sIhr Film wird verloren gehen, wenn Sie die Kodierung nicht fortsetzen."
+
+msgid "Cancel Current and Stop"
+msgstr "Aktuelles abbrechen und anhalten"
+
+msgid "Cancel Current, Start Next"
+msgstr "Aktuelles abbrechen, nächstes starten"
+
+msgid "Finish Current, then Stop"
+msgstr "Aktuelles fertigstellen, anschließend anhalten"
+
+msgid "Continue Encoding"
+msgstr "Kodierung fortsetzen"
+
+msgid "Custom "
+msgstr "Benutzerdefiniert"
+
+msgid "Modified "
+msgstr "Verändert"
+
+#, c-format
+msgid "%s%sPreset: %s"
+msgstr "%s%sVoreinstellung: %s"
+
+#, c-format
+msgid "Handbrake Version: %s (%d)\n"
+msgstr "Handbrake-Version: %s (%d)\n"
+
+#, c-format
+msgid "%d encode(s) pending"
+msgstr "%d Kodierung(en) ausstehend"
+
+#, c-format
+msgid "job %d of %d, "
+msgstr "Aufgabe %d von %d, "
+
+#, c-format
+msgid "pass %d (subtitle scan) of %d, "
+msgstr "Durchgang %d (Untertitelabtastung) von %d, "
+
+#, c-format
+msgid "pass %d of %d, "
+msgstr "Durchgang %d von %d, "
+
+#, c-format
+msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
+msgstr "Kodieren: %s%s%.2f %% (%.2f BpS, durchschn. %.2f BpS, ETA %02dh%02dm%02ds)"
+
+#, c-format
+msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
+msgstr "Kodieren: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
+
+#, c-format
+msgid "Encoding: %s%s%.2f %%"
+msgstr "Kodieren: %s%s%.2f %%"
+
+msgid "Searching for start time, "
+msgstr "Suche nach der Startzeit, "
+
+msgid "Scanning..."
+msgstr "Abtasten..."
+
+#, c-format
+msgid "Scanning title %d of %d..."
+msgstr "Titel %d von %d wird abgetastet..."
+
+#, c-format
+msgid "Scanning title %d of %d preview %d..."
+msgstr "Titel %d von %d Vorschau %d wird abgetastet..."
+
+msgid "Source"
+msgstr "Quelle"
+
+msgid "Choose Video Source"
+msgstr "Quellvideo auswählen"
+
+msgid "Paused"
+msgstr "Pausiert"
+
+msgid "Encode Done!"
+msgstr "Kodieren fertig!"
+
+msgid "Encode Canceled."
+msgstr "Kodieren abgebrochen."
+
+msgid "Encode Failed."
+msgstr "Kodieren fehlgeschlagen."
+
+msgid "Muxing: This may take a while..."
+msgstr "Multiplexen: Dies kann eine Weile dauern..."
+
+msgid "Encode Complete"
+msgstr "Kodieren abgeschlossen"
+
+msgid "HandBrake"
+msgstr "HandBrake"
+
+msgid "Updating preview\n"
+msgstr "Vorschau wird aktualisiert\n"
+
+msgid "Error while reading activity from pipe"
+msgstr ""
+
+msgid "Suspend"
+msgstr "Unterbrechen"
+
+#, c-format
+msgid "Suspend failed: %s"
+msgstr "Unterbrechen fehlgeschlagen: %s"
+
+msgid "Suspend failed"
+msgstr "Unterbrechen fehlgeschlagen"
+
+msgid "CanShutdown"
+msgstr ""
+
+#, c-format
+msgid "CanShutdown failed: %s"
+msgstr ""
+
+msgid "CanShutdown failed"
+msgstr ""
+
+msgid "Shutdown"
+msgstr "Herunterfahren"
+
+#, c-format
+msgid "Shutdown failed: %s"
+msgstr "Herunterfahren fehlgeschlagen: %s"
+
+msgid "Shutdown failed"
+msgstr "Herunterfahren fehlgeschlagen"
+
+msgid "Encoding"
+msgstr "Kodieren"
+
+#, c-format
+msgid "Inhibit failed: %s"
+msgstr ""
+
+msgid "Inhibit failed"
+msgstr ""
+
+msgid "UnInhibit"
+msgstr ""
+
+#, c-format
+msgid "UnInhibit failed: %s"
+msgstr ""
+
+msgid "UnInhibit failed"
+msgstr ""
+
+msgid "Uninhibit"
+msgstr ""
+
+#, c-format
+msgid "press %d %d"
+msgstr "drücken Sie %d %d"
+
+#, c-format
+msgid ""
+"Invalid Settings:\n"
+"%s"
+msgstr "Ungültige Einstellungen:\n%s"
+
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s: %.4g (Warnung: verlustfrei)"
+
+#, c-format
+msgid "HandBrake %s/%s is now available (you have %s/%d)."
+msgstr "HandBrake %s/%s ist jetzt verfügbar (Sie haben %s/%d)."
+
+msgid "Put down that cocktail, Your HandBrake queue is done!"
+msgstr "Stellen Sie Ihren Cocktail ab, Ihre HandBrake-Warteschlange ist fertig!"
+
+msgid "Your encode is complete."
+msgstr "Ihr Kodieren ist abgeschlossen."
+
+msgid "Shutting down the computer"
+msgstr "Der Computer wird heruntergefahren"
+
+msgid "Putting computer to sleep"
+msgstr "Computer wird in den Ruhezustand versetzt"
+
+msgid "Quiting Handbrake"
+msgstr "Handbrake wird beendet"
+
+msgid "Bottom"
+msgstr "Unterseite"
+
+#, c-format
+msgid "open failed: %s\n"
+msgstr "Öffnen fehlgeschlagen: %s\n"
+
+msgid "No key for dictionary item"
+msgstr "Kein Schlüssel für Wörterbuchelement"
+
+msgid "Invalid container type. This shouldn't happen"
+msgstr "Ungültiger Containertyp. Das sollte nicht passieren"
+
+#, c-format
+msgid "%s:missing a requried attribute"
+msgstr "%s:ein erforderliches Attribut fehlt"
+
+#, c-format
+msgid ""
+"Usage: %s [-I <inc path>] <in resource list> <out resource plist>\n"
+"Summary:\n"
+" Creates a resource plist from a resource list\n"
+"Options:\n"
+" I - Include path to search for files\n"
+" <in resource list> Input resources file\n"
+" <out resource plist> Output resources plist file\n"
+msgstr "Aufruf: %s [-I <Include-Pfad>] <in Ressourcenliste> <aus Ressource plist>\nZusammenfassung:\n Erstellt eine Ressource plist aus einer Ressourcenliste\nOptionen:\n I - Include-Pfad, um nach Dateien zu suchen\n <in Ressourcenliste> Eingaberessourcendatei\n <aus Ressource plist> Ausgaberessourcen-plist-datei\n"
+
+msgid ""
+"The language this text is in, as an ISO code. Pango can use this as a hint "
+"when rendering the text. If you don't understand this parameter, you "
+"probably don't need it"
+msgstr ""
+
+msgid ""
+"The preferred place to ellipsize the string, if the cell renderer does not "
+"have enough room to display the entire string"
+msgstr ""
+
+msgid ""
+"How to break the string into multiple lines, if the cell renderer does not "
+"have enough room to display the entire string"
+msgstr ""
+
+#, c-format
+msgid "Failed to set text from markup due to error parsing markup: %s"
+msgstr ""
+
+#, c-format
+msgid "Don't know color `%s'"
+msgstr "Farbe `%s' ist nicht bekannt"
+
+msgid "_Open"
+msgstr "_Öffnen"
+
+msgid "_Cancel"
+msgstr "Abbre_chen"
+
+msgid "_Save"
+msgstr "_Speichern"
+
+msgid ""
+"Render the subtitle over the video.\n"
+"\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr "Untertitel über das Video legen.\n\nDie Untertitel werden dadurch Teil des Videobilds und können nicht abgeschaltet werden."
+
+msgid "Burned In"
+msgstr "Eingebrannt"
+
+msgid ""
+"Set the default output subtitle track.\n"
+"\n"
+"Most players will automatically display this\n"
+"subtitle track whenever the video is played.\n"
+"\n"
+"This is useful for creating a \"forced\" track\n"
+"in your output."
+msgstr ""
+
+msgid "Default"
+msgstr "Standard"
+
+msgid ""
+"Use only subtitles that have been flagged\n"
+"as forced in the source subtitle track\n"
+"\n"
+"\"Forced\" subtitles are usually used to show\n"
+"subtitles during scenes where someone is speaking\n"
+"a foreign language."
+msgstr ""
+
+msgid "Forced Only"
+msgstr "Nur Erzwungene>"
+
+msgid ""
+"Add (or subtract) an offset (in milliseconds)\n"
+"to the start of the SRT subtitle track.\n"
+"\n"
+"Often, the start of an external SRT file\n"
+"does not coincide with the start of the video.\n"
+"This setting allows you to synchronize the files."
+msgstr ""
+
+msgid "SRT Offset"
+msgstr "SRT-Versatz"
+
+msgid ""
+"The source subtitle track\n"
+"\n"
+"You can choose any of the subtitles\n"
+"recognized in your source file.\n"
+"\n"
+"In addition, there is a special track option\n"
+"\"Foreign Audio Search\". This option will add\n"
+"an extra pass to the encode that searches for\n"
+"subtitles that may correspond to a foreign\n"
+"language scene. This option is best used in\n"
+"conjunction with the \"Forced\" option."
+msgstr ""
+
+msgid "Track"
+msgstr "Spur"
+
+msgid "About HandBrake"
+msgstr "Über HandBrake"
+
+msgid ""
+"Copyright © 2008 - 2013 John Stebbins\n"
+"Copyright © 2004 - 2013, HandBrake Devs"
+msgstr "Copyright © 2008 - 2013 John Stebbins\nCopyright © 2004 - 2013, HandBrake-Entwickler"
+
+msgid ""
+"HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
+msgstr "HandBrake ist ein GPL-lizenzierter, plattformübergreifender, mehrprozessgestützter Videotranskodierer."
+
+msgid "http://handbrake.fr"
+msgstr "http://handbrake.fr"
+
+msgid ""
+"HandBrake 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.\n"
+"\n"
+"HandBrake 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.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+
+msgid "_Minimize/Maximize"
+msgstr "_Minimieren/Maximieren"
+
+msgid "_Pause Queue"
+msgstr "Warteschlange _pausieren"
+
+msgid "_Quit"
+msgstr "_Beenden"
+
+msgid "_About"
+msgstr "_Über"
+
+msgid "_File"
+msgstr "_Datei"
+
+msgid "_Source"
+msgstr "_Quelle"
+
+msgid "Single _Title"
+msgstr "Einzelner _Titel"
+
+msgid "_Destination"
+msgstr "_Ziel"
+
+msgid "_Preferences"
+msgstr "_Einstellungen"
+
+msgid "_Queue"
+msgstr "_Warteschlange"
+
+msgid "S_top Queue"
+msgstr "Warteschlange s_toppen"
+
+msgid "_Add"
+msgstr "_HInzufügen"
+
+msgid "Add _Multiple"
+msgstr "_Mehrere hinzufügen"
+
+msgid "_Start"
+msgstr "_Start"
+
+msgid "_Pause"
+msgstr "_Pause"
+
+msgid "_View"
+msgstr "_Ansicht"
+
+msgid "HandBrake For _Dumbies"
+msgstr "HandBrake für _Dumbies"
+
+msgid "_Show Presets"
+msgstr "Voreinstellungen an_zeigen"
+
+msgid "_Preview"
+msgstr "_Vorschau"
+
+msgid "_Activity Window"
+msgstr "_Aktivitätsfenster"
+
+msgid "Show _Queue"
+msgstr "_Warteschlange anzeigen"
+
+msgid "_Presets"
+msgstr "_Voreinstellungen"
+
+msgid "_Delete"
+msgstr "_Löschen"
+
+msgid "_Make Default"
+msgstr "Als _Standard festlegen"
+
+msgid "_New Folder"
+msgstr "_Neuer Ordner"
+
+msgid "_Export"
+msgstr "_Exportieren"
+
+msgid "_Import"
+msgstr "_Importieren"
+
+msgid "_Update Built-in Presets"
+msgstr "Integrierte Voreinstellungen akt_ualisieren"
+
+msgid "_Help"
+msgstr "_Hilfe"
+
+msgid "_Guide"
+msgstr "An_leitung"
+
+msgid "Start Encoding"
+msgstr "Kodierung starten"
+
+msgid "Start"
+msgstr "Start"
+
+msgid "Pause Encoding"
+msgstr "Kodierung pausieren"
+
+msgid "Pause"
+msgstr "Pause"
+
+msgid "Add to Queue"
+msgstr "In Warteschlange einreihen"
+
+msgid "Enqueue"
+msgstr "Hinzufügen"
+
+msgid "Show Queue"
+msgstr "Warteschlange anzeigen"
+
+msgid "Queue"
+msgstr "Warteschlange"
+
+msgid ""
+"Open Picture Settings and Preview window.\n"
+"Here you can adjust cropping, resolution, aspect ratio, and filters."
+msgstr ""
+
+msgid "Preview"
+msgstr "Vorschau"
+
+msgid "Show Activity Window"
+msgstr "Aktivitätslog in eigenem Fenster anzeigen"
+
+msgid "Activity"
+msgstr "Aktivität"
+
+msgid "Source:"
+msgstr "Quelle:"
+
+msgid "None"
+msgstr "Kein"
+
+msgid "Title:"
+msgstr "Titel:"
+
+msgid ""
+"Set the title to encode.\n"
+"By default the longest title is chosen.\n"
+"This is often the feature title of a DVD."
+msgstr ""
+
+msgid "Angle:"
+msgstr "Perspektive:"
+
+msgid "For multi-angle DVD's, select the desired angle to encode."
+msgstr ""
+
+msgid "Reset All Titles"
+msgstr "Alle Titel zurücksetzen"
+
+msgid "Apply current settings to all titles"
+msgstr "Aktuelle Einstellungen auf alle Titel anwenden"
+
+msgid "Range of title to encode. Can be chapters, seconds, or frames."
+msgstr ""
+
+msgid "Set the first chapter to encode."
+msgstr "Legen Sie das erste Kapitel zum Kodieren fest."
+
+msgid "through"
+msgstr "Nein"
+
+msgid "Set the last chapter to encode."
+msgstr "Legen Sie das letzte Kapitel zum Kodieren fest."
+
+msgid "Duration:"
+msgstr "Laufzeit:"
+
+msgid "Destination"
+msgstr "Ziel"
+
+msgid "File:"
+msgstr "Datei:"
+
+msgid "Destination filename for your encode."
+msgstr "Zieldateiname für Ihre kodieren Dateien."
+
+msgid "Destination directory for your encode."
+msgstr "Zielverzeichnis für Ihre kodieren Dateien."
+
+msgid "Destination Directory"
+msgstr "Zielverzeichnis"
+
+msgid "Format:"
+msgstr "Format:"
+
+msgid "Format to mux encoded tracks to."
+msgstr "Format, in das kodierte Spuren gemultiplext werden."
+
+msgid "iPod 5G Support"
+msgstr "iPod 5G-Unterstützung"
+
+msgid "Add iPod Atom needed by some older iPods."
+msgstr "Das von einigen älteren iPods benötigte iPod Atom hinzufügen."
+
+msgid "Web optimized"
+msgstr "weboptimiert"
+
+msgid ""
+"Optimize the layout of the MP4 file for progressive download.\n"
+"This allows a player to initiate playback before downloading the entire file."
+msgstr ""
+
+msgid "Large file (>4GB)"
+msgstr "Große Datei (>4GB)"
+
+msgid "Presets List"
+msgstr "Voreinstellungsliste"
+
+msgid "Source Codec:"
+msgstr "Quellcodec:"
+
+msgid "Dimensions:"
+msgstr "Format:"
+
+msgid "Aspect: "
+msgstr "Seitenverhältnis:"
+
+msgid "Frame Rate:"
+msgstr "Bildwechselfrequenz:"
+
+msgid "Source Picture Parameters"
+msgstr "Quellbildparameter"
+
+msgid "Autocrop:"
+msgstr "Automatisch zuschneiden:"
+
+msgid "Crop:"
+msgstr "Zuschneiden"
+
+msgid "Crop Dimensions:"
+msgstr "Format zuschneiden:"
+
+msgid "Cropping"
+msgstr "Zuschneiden"
+
+msgid "Scale Dimensions:"
+msgstr "Format skalieren:"
+
+msgid "Optimal for Source:"
+msgstr "Optimal für Quelle:"
+
+msgid "Anamorphic:"
+msgstr "Anamorph:"
+
+msgid "Scaling"
+msgstr "Skalierung"
+
+msgid "Presentation Dimensions:"
+msgstr "Darstellungsformat:"
+
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+msgid "Left Crop"
+msgstr "Links abschneiden"
+
+msgid "Top Crop"
+msgstr "Oben abschneiden"
+
+msgid "Bottom Crop"
+msgstr "Unten abschneiden"
+
+msgid "Right Crop"
+msgstr "Rechts abschneiden"
+
+msgid "Auto Crop"
+msgstr "Automatisch abschneiden"
+
+msgid "Automatically crop black borders around edges of the video."
+msgstr "Schwarze Ränder an den Kanten des Videos automatisch abschneiden."
+
+msgid "Loose Crop"
+msgstr "Freies Abschneiden"
+
+msgid ""
+"When picture settings require that the image\n"
+"dimensions be rounded to some multiple number\n"
+"of pixels, this setting will crop a few extra pixels\n"
+"instead of doing exact cropping and then scaling to\n"
+"the required multiple."
+msgstr ""
+
+msgid "width:"
+msgstr "Breite:"
+
+msgid ""
+"This is the width that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+
+msgid "height:"
+msgstr "Höhe:"
+
+msgid ""
+"This is the height that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+
+msgid "Optimal for source"
+msgstr "Optimal für Quelle"
+
+msgid ""
+"If enabled, select the 'optimal' storage resolution.\n"
+"This will be the resolution that most closely matches the source resolution after cropping."
+msgstr ""
+
+msgid "Alignment:"
+msgstr "Ausrichtung:"
+
+msgid ""
+"Align storage dimensions to multiples of this value.\n"
+"\n"
+"This setting is only necessary for compatibility with some devices.\n"
+"You should use 2 unless you experience compatibility issues."
+msgstr ""
+
+msgid "Storage Geometry"
+msgstr "Speichergeometrie"
+
+msgid ""
+"This is the display width. It is the result of scaling the storage "
+"dimensions by the pixel aspect."
+msgstr "Dies ist die Anzeigenbreite. Sie ist das Ergebnis der Skalierung der Speichermaße durch das Pixelseitenverhältnis."
+
+msgid "Pixel Aspect:"
+msgstr "Pixelseitenverhältnis:"
+
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+
+msgid "Keep Aspect"
+msgstr "Seitenverhältnis bewahren"
+
+msgid ""
+"If enabled, the original display aspect of the source will be maintained."
+msgstr ""
+
+msgid "Display Aspect:"
+msgstr "Bildschirmseitenverhältnis:"
+
+msgid "Display Geometry"
+msgstr "Bildschirmgeometrie"
+
+msgid "Grayscale"
+msgstr "Graustufen"
+
+msgid "If enabled, filter colour components out of video."
+msgstr ""
+
+msgid "Deblock:"
+msgstr "Entblocken:"
+
+msgid ""
+"The deblocking filter removes a common type of compression artifact.\n"
+"If your source exhibits 'blockiness', this filter may help clean it up."
+msgstr ""
+
+msgid "Denoise Filter:"
+msgstr "Entrauschen-Filter:"
+
+msgid ""
+"Denoise filtering reduces or removes the appearance of noise and grain.\n"
+"Film grain and other types of high frequency noise are difficult to compress.\n"
+"Using this filter on such sources can result in smaller file sizes."
+msgstr ""
+
+msgid "Denoise Preset:"
+msgstr "Entrauschen-Voreinstellung:"
+
+msgid "Denoise Tune:"
+msgstr "Entrauschen-Abstimmung:"
+
+msgid ""
+"Custom denoise filter string format\n"
+"\n"
+"SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
+msgstr "Benutzerdefiniertes Entrauschen-Filter-Zeichenkettenformat\n\nSpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
+
+msgid "Detelecine:"
+msgstr ""
+
+msgid ""
+"This filter removes 'combing' artifacts that are the result of telecining.\n"
+"\n"
+"Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps."
+msgstr ""
+
+msgid ""
+"Custom detelecine filter string format\n"
+"\n"
+"JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
+msgstr ""
+
+msgid "Decomb"
+msgstr ""
+
+msgid ""
+"Choose decomb or deinterlace filter options.\n"
+"\n"
+"The decomb filter selectively deinterlaces frames that appear to be interlaced.\n"
+"This will preserve quality in frames that are not interlaced.\n"
+"\n"
+"The classic deinterlace filter is applied to all frames.\n"
+"Frames that are not interlaced will suffer some quality degradation."
+msgstr ""
+
+msgid "Deinterlace"
+msgstr "Zeilenentflechtung"
+
+msgid "Decomb:"
+msgstr ""
+
+msgid ""
+"The decomb filter selectively deinterlaces frames that appear to be interlaced.\n"
+"This will preserve quality in frames that are not interlaced."
+msgstr ""
+
+msgid ""
+"Custom decomb filter string format\n"
+"\n"
+"Mode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:\n"
+"BlockHeight:MagnitudeThres:VarianceThres:LaplacianThresh:DilationThresh:\n"
+"ErosionThresh:NoiseThresh:MaxSearchDistance:PostProcessing:Parity"
+msgstr ""
+
+msgid "Deinterlace:"
+msgstr "Zeilenentflechtung:"
+
+msgid ""
+"The classic deinterlace filter is applied to all frames.\n"
+"Frames that are not interlaced will suffer some quality degradation."
+msgstr "Der klassische Zeilenentflechtungsfilter wird auf alle Bilder angewandt.\nNicht verflochtene Bilder werden einen Qualitätsverlust erleiden."
+
+msgid ""
+"Custom deinterlace filter string format\n"
+"\n"
+"YadifMode:YadifParity:McdintMode:McdeintQp"
+msgstr "Benutzerdefiniertes Zeilenentflechtungsfilter-Zeichenkettenformat\n\nYadifMode:YadifParity:McdintMode:McdeintQp"
+
+msgid "Filters"
+msgstr "Filter"
+
+msgid "Picture"
+msgstr "Bild"
+
+msgid "Video Encoder:"
+msgstr "Videokodierer:"
+
+msgid "Available video encoders."
+msgstr "Verfügbare Videokodierer."
+
+msgid "Framerate:"
+msgstr "Bildwechselfrequenz::"
+
+msgid ""
+"Output framerate.\n"
+"\n"
+"'Same as source' is recommended. If your source video has\n"
+"a variable framerate, 'Same as source' will preserve it."
+msgstr "Ausgabebildwechselfrequenz.\n\n\"Gleiche wie Quelle\" wird hier empfohlen. Eine variable Framerate im Quellvideo bleibt bei \"Gleiche wie Quelle\" erhalten."
+
+msgid "Constant Framerate"
+msgstr "Konstante Bildwechselfrequenz"
+
+msgid "Enables constant framerate output."
+msgstr "Aktiviert eine konstante Bildwechselfrequenzausgabe."
+
+msgid "Peak Framerate (VFR)"
+msgstr "Bildwechselfrequenz-Spitzenwert (VFR)"
+
+msgid ""
+"Enables variable framerate output with a peak\n"
+"rate determined by the framerate setting.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr ""
+
+msgid "Variable Framerate"
+msgstr "Variable Bildwechselfrequenz"
+
+msgid ""
+"Enables variable framerate output.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr "Aktiviert eine variable Bildwechselfrequenzausgabe.\n\nVFR ist mit manchen Abspielern nicht kompatibel."
+
+msgid ""
+"Set the desired quality factor.\n"
+"The encoder targets a certain quality.\n"
+"The scale used by each video encoder is different.\n"
+"\n"
+"x264's scale is logarithmic and lower values correspond to higher quality.\n"
+"So small decreases in value will result in progressively larger increases\n"
+"in the resulting file size. A value of 0 means lossless and will result\n"
+"in a file size that is larger than the original source, unless the source\n"
+"was also lossless.\n"
+"\n"
+"FFMpeg's and Theora's scale is more linear.\n"
+"These encoders do not have a lossless mode."
+msgstr ""
+
+msgid "Constant Quality:"
+msgstr "Konstante Qualität:"
+
+msgid "Bitrate (kbps): "
+msgstr "Bitrate (kbps): "
+
+msgid ""
+"Set the average bitrate.\n"
+"\n"
+"The instantaneous bitrate can be much higher or lower at any point in time.\n"
+"But the average over a long duration will be the value set here. If you need\n"
+"to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings."
+msgstr ""
+
+msgid "2-Pass Encoding"
+msgstr "Kodieren in 2 Durchgängen"
+
+msgid ""
+"Perform 2 Pass Encoding.\n"
+"\n"
+"The 'Bitrate' option is prerequisite. During the 1st pass, statistics about\n"
+"the video are collected. Then in the second pass, those statistics are used\n"
+"to make bitrate allocation decisions."
+msgstr ""
+
+msgid "Turbo First Pass"
+msgstr ""
+
+msgid ""
+"During the 1st pass of a 2 pass encode, use settings that speed things "
+"along."
+msgstr ""
+
+msgid "Use Advanced Options"
+msgstr "Erweiterte Optionen verwenden"
+
+msgid ""
+"Use advanced options Tab for x264 settings.\n"
+"\n"
+"Use at your own risk!"
+msgstr ""
+
+msgid "Preset:"
+msgstr "Voreinstellung:"
+
+msgid ""
+"Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
+"\n"
+"This establishes your default encoder settings.\n"
+"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"You should generally set this option to the slowest you can bear since slower\n"
+"settings will result in better quality or smaller files."
+msgstr ""
+
+msgid "Tune:"
+msgstr "Abstimmung:"
+
+msgid ""
+"Tune settings to optimize for common scenarios.\n"
+"\n"
+"This can improve effeciency for particular source characteristics or set\n"
+"characteristics of the output file. Changes will be applied after the\n"
+"preset but before all other parameters."
+msgstr ""
+
+msgid "Fast Decode"
+msgstr "Schnelles Dekodieren"
+
+msgid ""
+"Reduce decoder CPU usage.\n"
+"\n"
+"Set this if your device is struggling to play the output (dropped frames)."
+msgstr ""
+
+msgid "Zero Latency"
+msgstr "Null Latenz"
+
+msgid ""
+"Minimize latency between input to encoder and output of decoder.\n"
+"\n"
+"This is useful for broadcast of live streams.\n"
+"\n"
+"Since HandBrake is not suitable for live stream broadcast purposes,\n"
+"this setting is of little value here."
+msgstr ""
+
+msgid "Profile:"
+msgstr "Profil:"
+
+msgid ""
+"Sets and ensures compliance with the specified profile.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+
+msgid "Level:"
+msgstr "Stufe:"
+
+msgid ""
+"Sets and ensures compliance with the specified level.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+
+msgid "More Settings:"
+msgstr "Weitere Einstellungen:"
+
+msgid ""
+"Additional encoder settings.\n"
+"\n"
+"Colon separated list of encoder options."
+msgstr "Zusätzliche Kodierereinstellungen.\n\nDurch Doppelpunkte getrennte Liste von Kodiereroptionen."
+
+msgid "Video"
+msgstr "Video"
+
+msgid "Selection Behavior:"
+msgstr "Auswahlverhalten:"
+
+msgid "Remove"
+msgstr "Entfernen"
+
+msgid "Available Languages"
+msgstr "Verfügbare Sprachen"
+
+msgid "Selected Languages"
+msgstr "Ausgewählte Sprachen"
+
+msgid "Use only first encoder for secondary audio"
+msgstr "Nur ersten Kodierer für sekundäres Audio verwenden"
+
+msgid ""
+"Only the primary audio track will be encoded with the full encoder list.\n"
+"All other secondary audio output tracks will be encoded with first encoder only."
+msgstr ""
+
+msgid "Auto Passthru:"
+msgstr "Automatisches Durchleiten:"
+
+msgid "MP3"
+msgstr "MP3"
+
+msgid ""
+"Enable this if your playback device supports MP3.\n"
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "AAC"
+msgstr "AAC"
+
+msgid ""
+"Enable this if your playback device supports AAC.\n"
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid ""
+"Enable this if your playback device supports AC-3.\n"
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "DTS"
+msgstr "DTS"
+
+msgid ""
+"Enable this if your playback device supports DTS.\n"
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "DTS-HD"
+msgstr "DTS-HD"
+
+msgid ""
+"Enable this if your playback device supports DTS-HD.\n"
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "Passthru Fallback:"
+msgstr "Durchleiten-Reservesystem:"
+
+msgid ""
+"Set the audio codec to encode with when a suitable track can not be found "
+"for audio passthru."
+msgstr ""
+
+msgid "Audio Encoder Settings:"
+msgstr "Audiokodierereinstellungen:"
+
+msgid "Encoder"
+msgstr "Kodierer"
+
+msgid "Bitrate/Quality"
+msgstr "Bitrate/Qualität"
+
+msgid "Mixdown"
+msgstr "Abmischung"
+
+msgid "Samplerate"
+msgstr "Abtastrate"
+
+msgid "Gain"
+msgstr "Verstärkung"
+
+msgid "Gain:"
+msgstr ""
+
+msgid "DRC"
+msgstr "DRC"
+
+msgid "Audio Defaults"
+msgstr "Audiostandardeinstellungen"
+
+msgid "Add new audio settings to the list"
+msgstr "Neue Audioeinstellungen zur Liste hinzufügen"
+
+msgid "Add All"
+msgstr "Alle hinzufügen"
+
+msgid "Add all audio tracks to the list"
+msgstr "Alle Audiostücke zur Liste hinzufügen"
+
+msgid "Reload Defaults"
+msgstr "Standardeinstellungen erneut laden"
+
+msgid "Reload all audio settings from defaults"
+msgstr "Alle Audioeinstellungen aus den Standardeinstellungen neu laden"
+
+msgid "Audio List"
+msgstr "Audioliste"
+
+msgid "Preferred Language: None"
+msgstr "Bevorzugte Sprache: Keine"
+
+msgid "Add Foreign Audio Search Pass"
+msgstr ""
+
+msgid ""
+"Add \"Foreign Audio Search\" when the default audio track is your preferred language.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them."
+msgstr ""
+
+msgid "Add subtitle track if default audio is foreign"
+msgstr "Untertitelspur hinzufügen, wenn das voreingestellte Audio in einer fremden Sprache ist"
+
+msgid ""
+"When the default audio track is not your preferred language, add a subtitle "
+"track."
+msgstr "Eine Untertitelspur hinzufügen, wenn die Standardaudiospur nicht in Ihrer bevorzugten Sprache ist."
+
+msgid "Add Closed Captions when available"
+msgstr "Wenn verfügbar, geschlossene Untertitel hinzufügen"
+
+msgid ""
+"Closed captions are text subtitles that can be added to any container as a "
+"soft subtitle track (not burned)"
+msgstr ""
+
+msgid "Subtitle Defaults"
+msgstr "Untertitelstandardeinstellungen"
+
+msgid "Add new subtitle settings to the list"
+msgstr "Neue Untertiteleinstellungen zur Liste hinzufügen"
+
+msgid "Add all subtitle tracks to the list"
+msgstr "Alle Untertitelspuren zur Liste hinzufügen"
+
+msgid "Reload all subtitle settings from defaults"
+msgstr "Alle Untertiteleinstellungen aus den Standardeinstellungen neu laden"
+
+msgid "Subtitle List"
+msgstr "Untertitelliste"
+
+msgid "Reference Frames:"
+msgstr "Referenzbilder:"
+
+msgid ""
+"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
+"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
+"\n"
+"Note that many hardware devices have limitations on the number of supported reference\n"
+"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
+"you're absolutely sure you know what you're doing!"
+msgstr ""
+
+msgid "Maximum B-Frames:"
+msgstr "Größtmögliche B-Bilder:"
+
+msgid ""
+"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
+"\n"
+"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
+"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
+"values.\n"
+"\n"
+"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
+msgstr ""
+
+msgid "Pyramidal B-Frames:"
+msgstr "Pyramidenförmige B-Bilder:"
+
+msgid ""
+"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
+"of B-frames, allowing B-frames to reference each other to improve compression.\n"
+"\n"
+"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
+msgstr ""
+
+msgid "Weighted P-Frames:"
+msgstr "Gewichtete P-Bilder:"
+
+msgid ""
+"Performs extra analysis to decide upon weighting parameters for each frame.\n"
+"\n"
+"This improves overall compression slightly and improves the quality of fades greatly.\n"
+"\n"
+"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
+"prediction to be disabled. Note that some devices and players, even those that support\n"
+"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
+"completely incompatible with it, for example."
+msgstr ""
+
+msgid "8x8 Transform"
+msgstr "8x8 Transformierung"
+
+msgid ""
+"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
+"\n"
+"It improves compression by at least 5% at a very small speed cost and may\n"
+"provide an unusually high visual quality benefit compared to its compression\n"
+"gain. However, it requires High Profile, which many devices may not support."
+msgstr ""
+
+msgid "CABAC Entropy Encoding"
+msgstr "CABAC-Entropiekodierung"
+
+msgid ""
+"After the encoder has done its work, it has a bunch of data that\n"
+"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
+"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
+"compresses significantly better (10-30%), especially at lower bitrates.\n"
+"\n"
+"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
+"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
+msgstr ""
+
+msgid "Encoding Features"
+msgstr "Kodierungsmerkmale"
+
+msgid "Motion Est. Method:"
+msgstr "Bewegungsabschätzungsverfahren:"
+
+msgid ""
+"Controls the motion estimation method.\n"
+"\n"
+"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
+"A better motion search method improves compression at the cost of speed.\n"
+"\n"
+"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
+"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
+"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
+"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
+"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
+msgstr ""
+
+msgid "Subpel ME &amp; Mode:"
+msgstr "Teilbildpunkt-Bewegungsvorhersage &amp; Modus:"
+
+msgid "Motion Est. Range:"
+msgstr "Bewegungsabschätzungsreichweite:"
+
+msgid ""
+"This is the distance x264 searches from its initial guess at the\n"
+"motion of a block in order to try to find its actual motion.\n"
+"\n"
+"The default is fine for most content, but extremely high motion video,\n"
+"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
+"a high speed cost."
+msgstr ""
+
+msgid "Adaptive Direct Mode:"
+msgstr "Adaptiver Direktmodus:"
+
+msgid ""
+"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
+"\n"
+"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
+"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
+"adaptively select which is better for each particular frame."
+msgstr ""
+
+msgid "Adaptive B-Frames:"
+msgstr "Adaptive B-Bilder:"
+
+msgid "Partitions:"
+msgstr "Teile:"
+
+msgid ""
+"Mode decision picks from a variety of options to make its decision:\n"
+"this option chooses what options those are.\n"
+"\n"
+"Fewer partitions to check means faster encoding, at the cost of worse\n"
+"decisions, since the best option might have been one that was turned off."
+msgstr ""
+
+msgid "Trellis:"
+msgstr "Trellis:"
+
+msgid ""
+"Trellis fine-tunes the rounding of transform coefficients to\n"
+"squeeze out 3-5% more compression at the cost of some speed.\n"
+"\n"
+"\"Always\" uses trellis not only during the main encoding process, but also\n"
+"during analysis, which improves compression even more, albeit at great speed cost.\n"
+"\n"
+"Trellis costs more speed at higher bitrates and requires CABAC."
+msgstr ""
+
+msgid "Analysis"
+msgstr "Analyse"
+
+msgid "Adaptive Quantization Strength:"
+msgstr "Adaptive Quantisierungsstärke:"
+
+msgid ""
+"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
+"\n"
+"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
+msgstr ""
+
+msgid "Psychovisual Rate Distortion:"
+msgstr "Psychovisuelle Ratenverzerrung:"
+
+msgid ""
+"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
+"vision to dramatically improve apparent detail and sharpness.\n"
+"The effect can be made weaker or stronger by adjusting the strength.\n"
+"Being an RD algorithm, it requires mode decision to be at least \"6\"."
+msgstr ""
+
+msgid "Psychovisual Trellis:"
+msgstr "Psychovisuelles Trellis:"
+
+msgid ""
+"Psychovisual trellis is an experimental algorithm to further\n"
+"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
+"\n"
+"Recommended values are around 0.2, though higher values may help for very\n"
+"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
+"and other sharp-edged graphics."
+msgstr ""
+
+msgid "Deblocking: "
+msgstr "Entblocken:"
+
+msgid "No DCT Decimate"
+msgstr "Keine DCT-Dezimierung"
+
+msgid ""
+"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
+"be better used for some other purpose in the video. However, this can\n"
+"sometimes have slight negative effects on retention of subtle grain and\n"
+"dither.\n"
+"\n"
+"Don't touch this unless you're having banding issues or other such cases\n"
+"where you are having trouble keeping fine noise."
+msgstr ""
+
+msgid "Psychovisual"
+msgstr "Psychovisuell"
+
+msgid ""
+"Your selected options will appear here.\n"
+"You can edit these and add additional options.\n"
+"\n"
+"Default values will not be shown. The defaults are:\n"
+"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
+"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
+"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
+"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
+"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
+msgstr ""
+
+msgid "Current x264 Advanced Option String"
+msgstr "Aktuelle x264 Erweiterte Option-Zeichenkette"
+
+msgid "Advanced Video"
+msgstr "Erweitertes Video"
+
+msgid "Chapter Markers"
+msgstr "Kapitelmarkierungen"
+
+msgid "Add chapter markers to output file."
+msgstr "Der Ausgabedatei Kapitelmarkierungen hinzufügen"
+
+msgid "Chapters"
+msgstr "Kapitel"
+
+msgid "Actors:"
+msgstr "Schauspieler:"
+
+msgid "Director:"
+msgstr "Regisseur:"
+
+msgid "Release Date:"
+msgstr "Veröffentlichungsdatum:"
+
+msgid "Comment:"
+msgstr "Anmerkung:"
+
+msgid "Genre:"
+msgstr "Genre:"
+
+msgid "Description:"
+msgstr "Beschreibung:"
+
+msgid "Plot:"
+msgstr "Handlung:"
+
+msgid "Tags"
+msgstr "Schlagwörter"
+
+msgid "Settings"
+msgstr "Einstellungen"
+
+msgid "Edit"
+msgstr "Bearbeiten"
+
+msgid "Reload"
+msgstr "Erneut laden"
+
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+
+msgid "Reload All"
+msgstr "Alle erneut laden"
+
+msgid ""
+"Mark all queue entries as pending.\n"
+"Resets all queue jobs to pending and ready to run again."
+msgstr ""
+
+msgid "Select All"
+msgstr "Alle auswählen"
+
+msgid "Mark all titles for adding to the queue"
+msgstr "Markieren Sie alle Titel für die Aufnahme in die Warteschlange"
+
+msgid "Clear All"
+msgstr "Alle löschen"
+
+msgid "Unmark all titles"
+msgstr "Markierung aller Titel löschen"
+
+msgid "Destination files OK. No duplicates detected."
+msgstr "Zieldateien OK. Keine Duplikate erkannt."
+
+msgid "Preferences"
+msgstr "Einstellungen"
+
+msgid "Automatically check for updates"
+msgstr "Automatisch nach Updates suchen"
+
+msgid "When all encodes are complete"
+msgstr "Wenn alle Kodierungsvorgänge abgeschlossen sind"
+
+msgid "Use automatic naming (uses modified source name)"
+msgstr "Automatische Benennung verwenden (auf Basis der Quelle)"
+
+msgid "Auto-Name Template"
+msgstr ""
+
+msgid ""
+"Available Options: {source} {title} {chapters} {date} {time} {quality} "
+"{bitrate}"
+msgstr "Verfügbare Optionen: {source} {title} {chapters} {date} {time} {quality} {bitrate}"
+
+msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
+msgstr "iPod/iTunes-freundliche Dateierweiterung (.m4v) für MP4 verwenden"
+
+msgid "Number of previews"
+msgstr "Anzahl der Vorschaubilder"
+
+msgid "Filter short titles (seconds)"
+msgstr "Kurztitel (Sekunden) filtern"
+
+msgid "Show system tray icon"
+msgstr "Taskleistensymbol anzeigen"
+
+msgid "General"
+msgstr "Allgemein"
+
+msgid "Constant Quality fractional granularity"
+msgstr "Schrittweite für den CQ-Faktor"
+
+msgid "Use dvdnav (instead of libdvdread)"
+msgstr "dvdnav verwenden (anstatt libdvdread)"
+
+msgid "Put individual encode logs in same location as movie"
+msgstr "Zugehörige Kodierungsprotokolle im gleichen Verzeichnis des Films ablegen"
+
+msgid "Activity Log Verbosity Level"
+msgstr "Aktivitätsprotokoll-Ausführlichkeitsstufe"
+
+msgid "Activity Log Longevity"
+msgstr "Aktivitätsprotokoll-Lebensdauer"
+
+msgid "Scale down High Definition previews"
+msgstr "Hochauflösende Vorschauen herunterskalieren"
+
+msgid "Automatically Scan DVD when loaded"
+msgstr "DVD beim Laden automatisch durchsuchen"
+
+msgid "Scans the DVD whenever a new disc is loaded"
+msgstr "Durchsucht die DVD, immer wenn eine neue Disc geladen ist"
+
+msgid "Hide Advanced Video Options Tab"
+msgstr ""
+
+msgid ""
+"Use advanced video options at your own risk.\n"
+"We recommend that you use the controls available\n"
+"on the Video tab instead."
+msgstr ""
+
+msgid "Delete completed jobs from queue"
+msgstr "Abgeschlossene Aufgaben aus der Warteschlange löschen"
+
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+
+msgid "Allow Tweaks"
+msgstr "Optimierungen erlauben"
+
+msgid "Allow HandBrake For Dummies"
+msgstr "HandBrake für Dummköpfe erlauben"
+
+msgid "Advanced"
+msgstr "Erweitert"
+
+msgid "Folder Name:"
+msgstr "Ordnername:"
+
+msgid "Description"
+msgstr "Beschreibung"
+
+msgid "Preset Name:"
+msgstr "Voreinstellungsname:"
+
+msgid "Custom Picture Dimensions"
+msgstr "Benutzerdefiniertes Bildformat"
+
+msgid "Maximum Width:"
+msgstr "Maximale Breite:"
+
+msgid "Enable maximum width limit."
+msgstr "Maximale Breitenbegrenzung aktivieren"
+
+msgid ""
+"This is the maximum width that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source width is greater.\n"
+"Setting this to 0 means there is no maximum width."
+msgstr ""
+
+msgid "Maximum Height:"
+msgstr "Maximale Höhe:"
+
+msgid "Enable maximum height limit."
+msgstr "Maximale Höhenbegrenzung aktivieren"
+
+msgid ""
+"This is the maximum height that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source height is greater.\n"
+"Setting this to 0 means there is no maximum height."
+msgstr ""
+
+msgid "Select preview frames."
+msgstr "Vorschaubilder auswählen."
+
+msgid ""
+"Encode and play a short sequence of video starting from the current preview "
+"position."
+msgstr ""
+
+msgid "Duration:"
+msgstr "Laufzeit:"
+
+msgid "Set the duration of the live preview in seconds."
+msgstr "Legen Sie die Dauer der Live-Vorschau in Sekunden fest."
+
+msgid "Show Crop"
+msgstr "Zuschneiden anzeigen"
+
+msgid "Show Cropped area of the preview"
+msgstr "Zugeschnittenen Bereich in der Vorschau anzeigen"
+
+msgid "Fullscreen"
+msgstr "Vollbild"
+
+msgid "View Fullscreen Preview"
+msgstr "Vollbildvorschau ansehen"
+
+msgid "Title Number:"
+msgstr "Titelnummer:"
+
+msgid "Detected DVD devices:"
+msgstr "Erkannte DVD-Geräte:"
+
+msgid "Setting:"
+msgstr "Einstellung:"
+
+msgid "Import SRT"
+msgstr "SRT importieren"
+
+msgid "Enable settings to import an SRT subtitle file"
+msgstr "Einstellungen zum Importieren einer SRT-Untertiteldatei aktivieren"
+
+msgid "Embedded Subtitle List"
+msgstr "Eingebettete Untertitelliste"
+
+msgid "Enable settings to select embedded subtitles"
+msgstr "Einstellungen zum Auswählen von eingebetteten Untertiteln aktivieren"
+
+msgid "Language"
+msgstr ""
+
+msgid "Character Code"
+msgstr "Zeichencode"
+
+msgid "Offset (ms)"
+msgstr "Versatz (ms)"
+
+msgid ""
+"Set the language of this subtitle.\n"
+"This value will be used by players in subtitle menus."
+msgstr "Legen Sie die Sprache dieses Untertitels fest.\nDieser Wert wird von Abspielern in den Untertitelmenüs verwendet werden."
+
+msgid ""
+"Set the character code used by the SRT file you are importing.\n"
+"\n"
+"SRTs come in all flavours of character sets.\n"
+"We translate the character set to UTF-8.\n"
+"The source's character code is needed in order to perform this translation."
+msgstr ""
+
+msgid "Select the SRT file to import."
+msgstr "Wählen Sie die SRT-Datei zum Importieren aus."
+
+msgid "Srt File"
+msgstr "SRT-Datei"
+
+msgid "Adjust the offset in milliseconds between video and SRT timestamps"
+msgstr "Stellen Sie den Versatz zwischen Video- und SRT-Zeitstempel in Millisekunden ein"
+
+msgid "Track"
+msgstr "Spur"
+
+msgid "List of subtitle tracks available from your source."
+msgstr "Liste der von Ihrer Quelle verfügbaren Untertitelspuren."
+
+msgid "Forced Subtitles Only"
+msgstr "Nur erzwungene Untertitel"
+
+msgid "Burn into video"
+msgstr "Ins Video einbrennen"
+
+msgid ""
+"Render the subtitle over the video.\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr ""
+
+msgid "Set Default Track"
+msgstr "Standardspur festlegen"
+
+msgid "Source Track"
+msgstr "Quellspur"
+
+msgid "List of audio tracks available from your source."
+msgstr "Liste der von Ihrer Quelle verfügbaren Audiospuren."
+
+msgid "Track Name:"
+msgstr "Spurname:"
+
+msgid ""
+"Set the audio track name.\n"
+"\n"
+"Players may use this in the audio selection list."
+msgstr "Legen Sie den Audiospurnamen fest.\n\nAbspieler können diese in der Audio-Auswahlliste verwenden."
+
+msgid "Mix"
+msgstr "Mischung"
+
+msgid "Sample Rate"
+msgstr "Abtastrate"
+
+msgid "Sample Rate:"
+msgstr ""
+
+msgid "Enable bitrate setting"
+msgstr "Bitrateneinstellung aktivieren"
+
+msgid "Enable quality setting"
+msgstr "Qualitätseinstellung aktivieren"
+
+msgid "Skip This Version"
+msgstr "Diese Version überspringen"
+
+msgid "Remind Me Later"
+msgstr "Später nochmal erinnern"
+
+msgid "A new version of HandBrake is available!"
+msgstr "Eine neue Version von HandBrake ist verfügbar!"
+
+msgid "HandBrake xxx is now available (you have yyy)."
+msgstr "HandBrake xxx ist jetzt verfügbar (aktuell: yyy)"
+
+msgid "Release Notes"
+msgstr "Versionshinweise"
+
+msgid "none"
+msgstr "kein"
+
+msgid "First Track Matching Selected Languages"
+msgstr "Erste Spur mit den ausgewählten Sprachen"
+
+msgid "All Tracks Matching Selected Languages"
+msgstr "Alle Spuren mit den ausgewählten Sprachen"
+
+msgid "Chapters:"
+msgstr "Kapitel:"
+
+msgid "Seconds:"
+msgstr "Sekunden:"
+
+msgid "Frames:"
+msgstr "Einzelbilder:"
+
+msgid "Do Nothing"
+msgstr "Nichts tun"
+
+msgid "Show Notification"
+msgstr "Benachrichtigung anzeigen"
+
+msgid "Quit Handbrake"
+msgstr "Handbrake beenden"
+
+msgid "Put Computer To Sleep"
+msgstr "Computer in den Ruhezustand versetzen"
+
+msgid "Shutdown Computer"
+msgstr "Computer herunterfahren"
+
+msgid "Week"
+msgstr "Woche"
+
+msgid "Year"
+msgstr "Jahr"
+
+msgid "Immortal"
+msgstr "Unvergänglich"
+
+msgid "Never"
+msgstr "Niemals"
+
+msgid "Daily"
+msgstr "Täglich"
+
+msgid "Weekly"
+msgstr "Wöchentlich"
+
+msgid "Monthly"
+msgstr "Monatlich"
+
+msgid "Month"
+msgstr ""
+
+msgid "Default"
+msgstr "Standard"
+
+msgid "Fast"
+msgstr "Schnell"
+
+msgid "Bob"
+msgstr ""
+
+msgid "Slow"
+msgstr "Langsam"
+
+msgid "Slower"
+msgstr "Langsamer"
+
+msgid "NLMeans"
+msgstr "Nicht-lokale Mittelwerte"
+
+msgid "HQDN3D"
+msgstr "HQDN3D"
+
+msgid "Ultralight"
+msgstr ""
+
+msgid "Light"
+msgstr ""
+
+msgid "Medium"
+msgstr "Mittel"
+
+msgid "medium"
+msgstr "mittel"
+
+msgid "Strong"
+msgstr "Stark"
+
+msgid "Film"
+msgstr "Film"
+
+msgid "Grain"
+msgstr "Körnigkeit"
+
+msgid "High Motion"
+msgstr ""
+
+msgid "Animation"
+msgstr "Animation"
+
+msgid "Spatial"
+msgstr "Räumlich"
+
+msgid "Temporal"
+msgstr "Zeitlich"
+
+msgid "Automatic"
+msgstr "Automatisch"
+
+msgid "Optimal"
+msgstr "Optimal"
+
+msgid "Normal"
+msgstr "Normal"
+
+msgid "Simple"
+msgstr "Einfach"
+
+msgid "Smart"
+msgstr ""
+
+msgid "Diamond"
+msgstr "Diamant"
+
+msgid "Hexagon"
+msgstr "Sechseck"
+
+msgid "Uneven Multi-Hexagon"
+msgstr ""
+
+msgid "Exhaustive"
+msgstr "Erschöpfend"
+
+msgid "Hadamard Exhaustive"
+msgstr ""
+
+msgid "Some"
+msgstr "Manche"
+
+msgid "All"
+msgstr "Alle"
+
+msgid "Encode only"
+msgstr "Nur Kodieren"
+
+msgid "Always"
+msgstr "Immer"
+
+msgid "Same as source"
+msgstr "Wie Quelle"
+
+msgid "Same as source:"
+msgstr ""
+
+msgid "(NTSC Film)"
+msgstr "(NTSC-Film)"
+
+msgid "(PAL Film/Video)"
+msgstr "(PAL-Film/Video)"
+
+msgid "(NTSC Video)"
+msgstr "(NTSC-Video)"
+
+#, c-format
+msgid "%d - Unknown Length"
+msgstr "%d - Unbekannte Länge"
+
+msgid "No Titles"
+msgstr "Keine Titel"
+
+msgid "No Audio"
+msgstr "Kein Audio"
+
+msgid "Foreign Audio Search"
+msgstr ""
+
+#, c-format
+msgid "Chapter %2d"
+msgstr "Kapitel %2d"
+
+#, c-format
+msgid "N/A"
+msgstr "N/V"
+
+#, c-format
+msgid ""
+"Invalid Deinterlace Settings:\n"
+"\n"
+"%s\n"
+msgstr "Ungültige Zeilenentflechtungseinstellungen:\n\n%s\n"
+
+#, c-format
+msgid ""
+"Invalid Detelecine Settings:\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Invalid Decomb Settings:\n"
+"\n"
+"%s\n"
+msgstr ""
+
+msgid ""
+"Theora is not supported in the MP4 container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, FFMPEG will be chosen for you."
+msgstr ""
+
+msgid "Continue"
+msgstr "Fortsetzen"
+
+msgid "No title found.\n"
+msgstr "Kein Titel gefunden.\n"
+
+msgid ""
+"Only one subtitle may be burned into the video.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+msgid ""
+"Srt file does not exist or not a regular file.\n"
+"\n"
+"You should choose a valid file.\n"
+"If you continue, this subtitle will be ignored."
+msgstr ""
+
+msgid ""
+"The source does not support Pass-Thru.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s is not supported in the %s container.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#, c-format
+msgid ""
+"The source audio does not support %s mixdown.\n"
+"\n"
+"You should choose a different mixdown.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "Signal handler (%s) not found"
+msgstr ""
+
+msgid "Index"
+msgstr "Index"
+
+msgid "Duration"
+msgstr "Laufzeit"
+
+msgid "Title"
+msgstr "Titel"
+
+msgid "Done\n"
+msgstr "Fertig\n"
+
+msgid "DATA"
+msgstr "DATEN"
+
+msgid "Job Information"
+msgstr "Aufgabeninformation"
+
+msgid "Track Information"
+msgstr "Spurinformation"
+
+msgid "Preset Name"
+msgstr "Voreinstellungsname"
+
+msgid "The device or file to encode"
+msgstr "Das Gerät oder die Datei zum Kodieren"
+
+msgid "The preset values to use for encoding"
+msgstr "Die voreingestellten Werte für die Kodierung"
+
+msgid "Spam a lot"
+msgstr ""
+
+msgid "- Transcode media formats"
+msgstr "- Medienformate transkodieren"
+
+msgid "Globals"
+msgstr ""
+
+msgid "Presets"
+msgstr "Voreinstellungen"
+
+msgid "Folder"
+msgstr "Ordner"
+
+#, c-format
+msgid "%s path: (%s)"
+msgstr "%s Pfad: (%s)"
+
+#, c-format
+msgid "%s indices: len %d"
+msgstr ""
+
+msgid "Type"
+msgstr "Typ"
+
+msgid "Failed to find parent folder when adding child."
+msgstr ""
+
+msgid "Failed to find parent folder while adding child."
+msgstr ""
+
+#, c-format
+msgid "Can't map language value: (%s)"
+msgstr ""
+
+#, c-format
+msgid "Can't map value: (%s)"
+msgstr ""
+
+msgid "Subtitles"
+msgstr "Untertitel"
+
+#, c-format
+msgid "Superfluous tunes! %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s: Folder already exists.\n"
+"You can not replace it with a preset."
+msgstr "%s: Ordner bereits vorhanden.\nSie können ihn nicht mit einer Voreinstellung ersetzen."
+
+#, c-format
+msgid ""
+"%s: Preset already exists.\n"
+"You can not replace it with a folder."
+msgstr "%s: Voreinstellung bereits vorhanden.\nSie können sie nicht mit einem Ordner ersetzen."
+
+msgid "Import Preset"
+msgstr "Voreinstellung importieren"
+
+msgid "All (*)"
+msgstr "Alle (*)"
+
+msgid "Presets (*.plist)"
+msgstr "Voreinstellungen (*.plist)"
+
+msgid "Export Preset"
+msgstr "Voreinstellung exportieren"
+
+#, c-format
+msgid ""
+"Confirm deletion of %s:\n"
+"\n"
+"%s"
+msgstr "Löschen von %s bestätigen:\n\n%s"
+
+msgid "No selection??? Perhaps unselected."
+msgstr "Keine Auswahl??? Vielleicht abgewählt."
+
+msgid "Couldn't create native window for GstXOverlay. Disabling live preview."
+msgstr "Natives Fenster für GstXOverlay konnte nicht erstellt werden. Live-Vorschau wird deaktiviert."
+
+msgid "Couldn't initialize gstreamer. Disabling live preview."
+msgstr "Gstreamer konnte nicht initialisiert werden. Live-Vorschau wird deaktiviert."
+
+#, c-format
+msgid "Gstreamer Error: %s"
+msgstr "Gstreamer-Fehler: %s"
+
+#, c-format
+msgid ""
+"Missing GStreamer plugin\n"
+"Audio or Video may not play as expected\n"
+"\n"
+"%s"
+msgstr ""
+
+msgid "Ok"
+msgstr "Ok"
+
+msgid "Done"
+msgstr "Fertig"
+
+msgid "Seconds"
+msgstr "Sekunden"
+
+msgid "Frames"
+msgstr "Einzelbilder"
+
+#, c-format
+msgid ""
+"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
+" %s"
+msgstr "<big>%s</big> (Titel %d, %s %d durch %d, 2 Videodurchgänge) --> %s"
+
+#, c-format
+msgid ""
+"<big>%s</big> (Title %d, %s %d through %d) --> %s"
+msgstr "<big>%s</big> (Titel %d, %s %d durch %d) --> %s"
+
+#, c-format
+msgid "Modified Preset Based On: %s\n"
+msgstr "Geänderte Voreinstellung basierend auf: %s\n"
+
+#, c-format
+msgid "Preset: %s\n"
+msgstr "Voreinstellung: %s\n"
+
+#, c-format
+msgid "Format: %s Container\n"
+msgstr "Format: %s Container\n"
+
+msgid "Container Options:"
+msgstr "Containeroptionen:"
+
+#, c-format
+msgid "%sChapter Markers"
+msgstr "%sKapitelmarkierungen"
+
+#, c-format
+msgid "%siPod 5G Support"
+msgstr "%siPod 5G-Unterstützung"
+
+#, c-format
+msgid "%sWeb Optimized"
+msgstr "%sweboptimiert"
+
+#, c-format
+msgid "%sLarge File Size (>4GB)"
+msgstr "%sGroße Dateigröße (>4GB)"
+
+#, c-format
+msgid "Destination: %s\n"
+msgstr "Ziel: %s\n"
+
+msgid "(Aspect Preserved)"
+msgstr "(Seitenverhältnis erhalten)"
+
+msgid "(Aspect Lost)"
+msgstr "(Seitenverhältnis verloren)"
+
+msgid "(Anamorphic)"
+msgstr "(Anamorph)"
+
+msgid "(Custom Anamorphic)"
+msgstr "(Benutzerdefiniert anamorph)"
+
+msgid "Picture: "
+msgstr "Bild: "
+
+#, c-format
+msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
+msgstr "Quelle: %d x %d, Ausgabe %d x %d %s, Zuschneiden %d:%d:%d:%d"
+
+#, c-format
+msgid ", Display %d x %d"
+msgstr ", Anzeige %d x %d"
+
+msgid "Filters:"
+msgstr "Filter:"
+
+#, c-format
+msgid "%sDetelecine"
+msgstr ""
+
+#, c-format
+msgid "%sDecomb"
+msgstr ""
+
+#, c-format
+msgid "%sDeinterlace"
+msgstr "%sZeilenentflechtung"
+
+#, c-format
+msgid "%sDenoise Filter %s:"
+msgstr "%sEntrauschen-Filter %s:"
+
+#, c-format
+msgid "%sDeblock: %d"
+msgstr "%sEntblocken: %d"
+
+#, c-format
+msgid "%sGrayscale"
+msgstr "%sGraustufen"
+
+#, c-format
+msgid "Video: %s"
+msgstr "Video: %s"
+
+#, c-format
+msgid ", Framerate: %s %s"
+msgstr ", Bildwechselfrequenz: %s %s"
+
+#, c-format
+msgid ", Framerate: Peak %s (may be lower)"
+msgstr ", Bildwechselfrequenz: Spitzenwert %s (kann niedriger sein)"
+
+#, c-format
+msgid ", Framerate: %s (constant frame rate)"
+msgstr ", Bildwechselfrequenz: %s (konstante Bildwechselfrequenz)"
+
+msgid "Error"
+msgstr "Fehler"
+
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+msgid "Turbo 1st Pass: On\n"
+msgstr ""
+
+#, c-format
+msgid "Video Options: Preset: %s"
+msgstr "Videooptionen: Voreinstellung: %s"
+
+msgid " - Tune: "
+msgstr " - Abstimmen: "
+
+#, c-format
+msgid " - Profile: %s"
+msgstr " - Profil: %s"
+
+#, c-format
+msgid " - Level: %s"
+msgstr " - Stufe: %s"
+
+#, c-format
+msgid "Advanced Options: %s\n"
+msgstr "Erweiterte Optionen: %s\n"
+
+msgid "Audio: "
+msgstr "Audio: "
+
+#, c-format
+msgid "Audio Tracks: %d"
+msgstr "Audiospuren: %d"
+
+#, c-format
+msgid "Bitrate: %d"
+msgstr "Bitrate: %d"
+
+#, c-format
+msgid "%s --> Encoder: %s"
+msgstr "%s --> Kodierer: %s"
+
+#, c-format
+msgid "%s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
+msgstr "%s --> Kodierer: %s, Abmischung: %s, Abtastrate: %s, %s"
+
+msgid "Subtitle: "
+msgstr "Untertitel: "
+
+#, c-format
+msgid "Subtitle Tracks: %d\n"
+msgstr "Untertitelspuren: %d\n"
+
+msgid " (Force)"
+msgstr " (Erzwingen)"
+
+msgid " (Burn)"
+msgstr " (Brennen)"
+
+msgid " (Default)"
+msgstr " (Standard)"
+
+#, c-format
+msgid " %s (%s), %s, Offset (ms) %d%s\n"
+msgstr " %s (%s), %s, Versatz (ms) %d%s\n"
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Another queued job has specified the same destination.\n"
+"Do you want to overwrite?"
+msgstr "Ziel: %s\n\nEine weitere Aufgabe in der Warteschlange hat das gleiche Ziel angegeben.\nMöchten Sie es überschreiben?"
+
+msgid "Overwrite"
+msgstr "Überschreiben"
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"This is not a valid directory."
+msgstr "Ziel: %s\n\nDies ist kein gültiges Verzeichnis."
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Can not read or write the directory."
+msgstr "Ziel: %s\n\nVerzeichnis nicht lesbar oder beschreibbar."
+
+#, c-format
+msgid ""
+"Destination filesystem is almost full: %uM free\n"
+"\n"
+"Encode may be incomplete if you proceed.\n"
+msgstr "Zieldateisystem ist fast voll: %uM frei\n\nKodieren könnte unvollständig sein, wenn Sie fortfahren.\n"
+
+msgid "Proceed"
+msgstr "Fortfahren"
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"File already exists.\n"
+"Do you want to overwrite?"
+msgstr "Ziel: %s\n\nDie Datei existiert bereits.\nSoll sie überschrieben werden?"
+
+msgid ""
+"Duplicate destination files detected.\n"
+"Duplicates will not be added to the queue."
+msgstr "Doppelte Zieldateien erkannt.\nDuplikate werden nicht in die Warteschlange aufgenommen."
+
+msgid "No Title"
+msgstr "Kein Titel"
+
+msgid ""
+"There is another title with the same destination file name.\n"
+"This title will not be added to the queue unless you change\n"
+"the output file name.\n"
+msgstr ""
+
+msgid "Stop"
+msgstr "Stopp"
+
+msgid "Stop Encoding"
+msgstr "Kodierung stoppen"
+
+msgid "Resume"
+msgstr "Fortsetzen"
+
+msgid "Resume Encoding"
+msgstr "Kodierung fortsetzen"
+
+msgid "_Start Queue"
+msgstr "Warteschlange _abarbeiten"
+
+msgid "_Resume Queue"
+msgstr "Warteschlange fo_rtsetzen"
+
+msgid ""
+"You are currently encoding. What would you like to do?\n"
+"\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"You have %d unfinished job(s) in a saved queue.\n"
+"\n"
+"Would you like to reload them?"
+msgstr ""
+
+msgid "No"
+msgstr "Nein"
+
+msgid "Yes"
+msgstr "Ja"
+
+#, c-format
+msgid "Usage: %s infile [outfile]\n"
+msgstr "Aufruf: %s Eingabedatei [Ausgabedatei]\n"
+
+#, c-format
+msgid "Attempt to set unknown widget type: %s\n"
+msgstr ""
+
+#, c-format
+msgid "No value found for %s\n"
+msgstr "Kein Wert gefunden für %s\n"
+
+msgid "Attempt to set unknown widget type"
+msgstr ""
+
+#, c-format
+msgid "Failed to find widget for key: %s\n"
+msgstr ""
+
+#, c-format
+msgid "Offset: %dms"
+msgstr "Versatz: %dms"
+
+msgid "Burned Into Video"
+msgstr "Ins Video gebrannt"
+
+msgid "Passthrough"
+msgstr "Durchleiten"
+
+msgid "(Forced Subtitles Only)"
+msgstr "(Nur erzwungene Untertitel)"
+
+msgid "(Default)"
+msgstr "(Standard)"
+
+msgid "Error!"
+msgstr "Fehler!"
+
+#, c-format
+msgid "Preferred Language: %s"
+msgstr "Bevorzugte Sprache: %s"
+
+#, c-format
+msgid "Add %s subtitle track if default audio is not %s"
+msgstr "%s Untertitelspur hinzufügen, wenn das voreingestellte Audio nicht %s ist"
+
+#, c-format
+msgid "Type %s"
+msgstr "Typ %s"
+
+#, c-format
+msgid "Type %s value %s"
+msgstr "Typ %s Wert %s"
+
+#, c-format
+msgid "Type %s value %d"
+msgstr "Typ %s Wert %d"
+
+#, c-format
+msgid "Type %s value %<PRId64>"
+msgstr "Typ %s Wert %<PRId64>"
+
+#, c-format
+msgid "Type %s value %f"
+msgstr "Typ %s Wert %f"
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"%s\""
+msgstr "%s\n\nErweiterte Optionen:\n\"%s\""
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"\""
+msgstr "%s\n\nErweiterte Optionen:\n\"\""
+
+msgid "ERROR"
+msgstr "FEHLER"
+
+msgid ""
+"Anamorphic Modes:\n"
+"<tt>\n"
+"None - Force pixel aspect ratio to 1:1.\n"
+"Loose - Align dimensions to chosen 'Alignment' value \n"
+" and pick pixel aspect ratio that preserves the\n"
+" original display aspect ratio\n"
+"Strict - Keep original source dimensions and pixel \n"
+" aspect ratio</tt>"
+msgstr ""
+
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Ihre Namen"
+
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "Ihre E-Mail-Adressen"

HandBrake-0.10.0.tar.bz2/gtk/po/es.po Added

HandBrake-0.10.0.tar.bz2/gtk/po/fr.po Added

@@ -0,0 +1,2652 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# exceed73 <cedric.archambeau@gmail.com>, 2014
+# sebasthug <sebhug@free.fr>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: HandBrake-0.10\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-10 21:39+0400\n"
+"PO-Revision-Date: 2014-10-14 23:26+0000\n"
+"Last-Translator: VictorR2007 <victorr2007@yandex.ru>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/handbrake/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgid "Off"
+msgstr "Off"
+
+msgid "Quality: "
+msgstr "Qualité: "
+
+#, c-format
+msgid "Bitrate: %dkbps"
+msgstr ""
+
+#, c-format
+msgid "Bitrate: %.4gkbps"
+msgstr ""
+
+msgid "Passthrough"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s\n"
+"Gain: %s\n"
+"DRC: %s\n"
+"Track Name: %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s\n"
+"Gain: %s\n"
+"DRC: %s"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid ""
+"Add an audio encoder.\n"
+"Each selected source track will be encoded with all selected encoders."
+msgstr ""
+
+msgid "Set the audio codec to encode this track with."
+msgstr "Définit le codec audio à utiliser pour l'encodage de cette piste."
+
+msgid "Bitrate"
+msgstr "Débit"
+
+msgid "Quality"
+msgstr ""
+
+msgid "Set the bitrate to encode this track with."
+msgstr "Définit le débit à utiliser pour l'encodage de cette piste."
+
+msgid ""
+"Audio Quality:\n"
+"For encoders that support it, adjust the quality of the output."
+msgstr ""
+
+msgid "Set the mixdown of the output audio track."
+msgstr "Définit le mixage de la piste audio."
+
+msgid "Set the sample rate of the output audio track."
+msgstr "Définit la fréquence d'échantillonnage de la piste audio encodée."
+
+msgid ""
+"Audio Gain:\n"
+"Adjust the amplification or attenuation of the output audio track."
+msgstr ""
+
+msgid ""
+"Audio Gain: Adjust the amplification or attenuation of the output "
+"audio track."
+msgstr ""
+
+msgid ""
+"Dynamic Range Compression:\n"
+"Adjust the dynamic range of the output audio track.\n"
+"For source audio that has a wide dynamic range,\n"
+"very loud and very soft sequences, DRC allows you\n"
+"to 'compress' the range by making loud sounds\n"
+"softer and soft sounds louder.\n"
+msgstr ""
+
+msgid ""
+"Dynamic Range Compression: Adjust the dynamic range of the output audio track. \n"
+"\n"
+" For source audio that has a wide dynamic range (very loud and very soft sequences), DRC allows you to 'compress' the range by making loud sections softer and soft sections louder."
+msgstr ""
+
+msgid ""
+"Dynamic Range Compression: Adjust the dynamic range of the output audio track. \n"
+"\n"
+" For source audio that has a wide dynamic range (very loud and very soft sequences), DRC allows you to 'compress' the range by making loud sections softer and soft sections louder."
+msgstr ""
+
+msgid "Remove this audio encoder"
+msgstr ""
+
+msgid "Failed to find widget"
+msgstr ""
+
+#, c-format
+msgid "Failed to find dependent widget %s"
+msgstr ""
+
+msgid "Closing HandBrake will terminate encoding.\n"
+msgstr ""
+
+msgid "{source}"
+msgstr ""
+
+msgid "{title}"
+msgstr ""
+
+msgid "{chapters}"
+msgstr ""
+
+msgid "{time}"
+msgstr ""
+
+msgid "{date}"
+msgstr ""
+
+msgid "{bitrate}"
+msgstr ""
+
+msgid "No Title Found"
+msgstr ""
+
+msgid "Not Selected"
+msgstr ""
+
+msgid "Scanning ..."
+msgstr ""
+
+msgid "Stop Scan"
+msgstr "Stopper Scan"
+
+msgid "Choose Destination"
+msgstr ""
+
+msgid "On"
+msgstr "On"
+
+msgid "Strict"
+msgstr "Strict"
+
+msgid "Loose"
+msgstr "Loose"
+
+msgid "Custom"
+msgstr "Custom"
+
+msgid "Unknown"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s in %d seconds ..."
+msgstr "%s\n\n%s en %d secondes ..."
+
+#, c-format
+msgid "%sYour movie will be lost if you don't continue encoding."
+msgstr "%sVotre vidéo sera perdue si vous ne continuez pas l'encodage."
+
+msgid "Cancel Current and Stop"
+msgstr "Annuler En Cours et Stopper"
+
+msgid "Cancel Current, Start Next"
+msgstr "Annuler En Cours, Démarrer Suivant"
+
+msgid "Finish Current, then Stop"
+msgstr "Terminer En Cours, puis Stopper"
+
+msgid "Continue Encoding"
+msgstr "Continuer Encodage"
+
+msgid "Custom "
+msgstr "Custom "
+
+msgid "Modified "
+msgstr "Modifié"
+
+#, c-format
+msgid "%s%sPreset: %s"
+msgstr "%s%sPréréglage: %s"
+
+#, c-format
+msgid "Handbrake Version: %s (%d)\n"
+msgstr "Version Handbrake: %s (%d)\n"
+
+#, c-format
+msgid "%d encode(s) pending"
+msgstr "%d encodage(s) en attente"
+
+#, c-format
+msgid "job %d of %d, "
+msgstr ""
+
+#, c-format
+msgid "pass %d (subtitle scan) of %d, "
+msgstr ""
+
+#, c-format
+msgid "pass %d of %d, "
+msgstr ""
+
+#, c-format
+msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
+msgstr ""
+
+#, c-format
+msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
+msgstr ""
+
+#, c-format
+msgid "Encoding: %s%s%.2f %%"
+msgstr "Encodage: %s%s%.2f %%"
+
+msgid "Searching for start time, "
+msgstr "Recherche de l'heure de début,"
+
+msgid "Scanning..."
+msgstr "Scan en cours..."
+
+#, c-format
+msgid "Scanning title %d of %d..."
+msgstr ""
+
+#, c-format
+msgid "Scanning title %d of %d preview %d..."
+msgstr ""
+
+msgid "Source"
+msgstr "Source"
+
+msgid "Choose Video Source"
+msgstr "Choisir Vidéo Source"
+
+msgid "Paused"
+msgstr "En Pause"
+
+msgid "Encode Done!"
+msgstr "Encodage Terminé!"
+
+msgid "Encode Canceled."
+msgstr "Encodage Annulé."
+
+msgid "Encode Failed."
+msgstr "Echec de l'Encodage."
+
+msgid "Muxing: This may take a while..."
+msgstr "Multiplexage: Opération longue..."
+
+msgid "Encode Complete"
+msgstr "Encodage Terminé"
+
+msgid "HandBrake"
+msgstr ""
+
+msgid "Updating preview\n"
+msgstr "Mise à jour de la prévisiualisation\n"
+
+msgid "Error while reading activity from pipe"
+msgstr "Erreur de lecture sur le pipe "
+
+msgid "Suspend"
+msgstr ""
+
+#, c-format
+msgid "Suspend failed: %s"
+msgstr ""
+
+msgid "Suspend failed"
+msgstr ""
+
+msgid "CanShutdown"
+msgstr ""
+
+#, c-format
+msgid "CanShutdown failed: %s"
+msgstr ""
+
+msgid "CanShutdown failed"
+msgstr ""
+
+msgid "Shutdown"
+msgstr ""
+
+#, c-format
+msgid "Shutdown failed: %s"
+msgstr ""
+
+msgid "Shutdown failed"
+msgstr ""
+
+msgid "Encoding"
+msgstr "Encodage"
+
+#, c-format
+msgid "Inhibit failed: %s"
+msgstr ""
+
+msgid "Inhibit failed"
+msgstr ""
+
+msgid "UnInhibit"
+msgstr ""
+
+#, c-format
+msgid "UnInhibit failed: %s"
+msgstr ""
+
+msgid "UnInhibit failed"
+msgstr ""
+
+msgid "Uninhibit"
+msgstr ""
+
+#, c-format
+msgid "press %d %d"
+msgstr ""
+
+#, c-format
+msgid ""
+"Invalid Settings:\n"
+"%s"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr ""
+
+#, c-format
+msgid "HandBrake %s/%s is now available (you have %s/%d)."
+msgstr ""
+
+msgid "Put down that cocktail, Your HandBrake queue is done!"
+msgstr "Posez ce cocktail, HandBrake a terminé son travail!"
+
+msgid "Your encode is complete."
+msgstr "Votre encodage est terminé."
+
+msgid "Shutting down the computer"
+msgstr "Eteindre l'ordinateur"
+
+msgid "Putting computer to sleep"
+msgstr "Mettre l'ordinateur en veille"
+
+msgid "Quiting Handbrake"
+msgstr "Quitter Handbrake"
+
+msgid "Bottom"
+msgstr ""
+
+#, c-format
+msgid "open failed: %s\n"
+msgstr ""
+
+msgid "No key for dictionary item"
+msgstr "Pas de clé pour l'entrée de dictionnaire"
+
+msgid "Invalid container type. This shouldn't happen"
+msgstr "Type de conteneur invalide. "
+
+#, c-format
+msgid "%s:missing a requried attribute"
+msgstr "%s:attribut requis manquant"
+
+#, c-format
+msgid ""
+"Usage: %s [-I <inc path>] <in resource list> <out resource plist>\n"
+"Summary:\n"
+" Creates a resource plist from a resource list\n"
+"Options:\n"
+" I - Include path to search for files\n"
+" <in resource list> Input resources file\n"
+" <out resource plist> Output resources plist file\n"
+msgstr ""
+
+msgid ""
+"The language this text is in, as an ISO code. Pango can use this as a hint "
+"when rendering the text. If you don't understand this parameter, you "
+"probably don't need it"
+msgstr ""
+
+msgid ""
+"The preferred place to ellipsize the string, if the cell renderer does not "
+"have enough room to display the entire string"
+msgstr ""
+
+msgid ""
+"How to break the string into multiple lines, if the cell renderer does not "
+"have enough room to display the entire string"
+msgstr ""
+
+#, c-format
+msgid "Failed to set text from markup due to error parsing markup: %s"
+msgstr ""
+
+#, c-format
+msgid "Don't know color `%s'"
+msgstr ""
+
+msgid "_Open"
+msgstr ""
+
+msgid "_Cancel"
+msgstr ""
+
+msgid "_Save"
+msgstr "_Enregistrer"
+
+msgid ""
+"Render the subtitle over the video.\n"
+"\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr "Fusionne les sous-titres dans la vidéo.\n\nLes sous-titres feront partie de le vidéo et ne pourront être désactivés."
+
+msgid "Burned In"
+msgstr "Gravés"
+
+msgid ""
+"Set the default output subtitle track.\n"
+"\n"
+"Most players will automatically display this\n"
+"subtitle track whenever the video is played.\n"
+"\n"
+"This is useful for creating a \"forced\" track\n"
+"in your output."
+msgstr ""
+
+msgid "Default"
+msgstr "Défaut"
+
+msgid ""
+"Use only subtitles that have been flagged\n"
+"as forced in the source subtitle track\n"
+"\n"
+"\"Forced\" subtitles are usually used to show\n"
+"subtitles during scenes where someone is speaking\n"
+"a foreign language."
+msgstr ""
+
+msgid "Forced Only"
+msgstr "Forcée Uniquement"
+
+msgid ""
+"Add (or subtract) an offset (in milliseconds)\n"
+"to the start of the SRT subtitle track.\n"
+"\n"
+"Often, the start of an external SRT file\n"
+"does not coincide with the start of the video.\n"
+"This setting allows you to synchronize the files."
+msgstr "Ajoute (ou soustrait) un décalage (en millisecondes)\nau démarrage de la piste sous-titre SRT.\n\nSouvent, le début d'un fichier SRT externe\nne coïncide pas avec le début d'une vidéo.\nCe réglage vous permet de synchroniser les fichiers."
+
+msgid "SRT Offset"
+msgstr "Décalage SRT"
+
+msgid ""
+"The source subtitle track\n"
+"\n"
+"You can choose any of the subtitles\n"
+"recognized in your source file.\n"
+"\n"
+"In addition, there is a special track option\n"
+"\"Foreign Audio Search\". This option will add\n"
+"an extra pass to the encode that searches for\n"
+"subtitles that may correspond to a foreign\n"
+"language scene. This option is best used in\n"
+"conjunction with the \"Forced\" option."
+msgstr "Piste de sous-titres source\n\nVous pouvez choisir chacun des sous-titres\ndétectés dans votre fichier source.\n\nDe plus, vous disposez d'une option spéciale\n\"Recherche Audio Langue Etrangère\". Cette option\najoute une passe supplémentaire à l'encodage\ncherchant des sous-titres correspondant aux scènes\nen langue étrangère. Cette option a un meilleur\nrésultat utilisée conjointement à l'option \"Forcée\"."
+
+msgid "Track"
+msgstr "Piste"
+
+msgid "About HandBrake"
+msgstr "A propos d'HandBrake"
+
+msgid ""
+"Copyright © 2008 - 2013 John Stebbins\n"
+"Copyright © 2004 - 2013, HandBrake Devs"
+msgstr ""
+
+msgid ""
+"HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
+msgstr ""
+
+msgid "http://handbrake.fr"
+msgstr ""
+
+msgid ""
+"HandBrake 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.\n"
+"\n"
+"HandBrake 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.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+
+msgid "_Minimize/Maximize"
+msgstr "_Réduire/Agrandir"
+
+msgid "_Pause Queue"
+msgstr "_Pause Liste"
+
+msgid "_Quit"
+msgstr "_Quitter"
+
+msgid "_About"
+msgstr "_A Propos"
+
+msgid "_File"
+msgstr "_Fichier"
+
+msgid "_Source"
+msgstr "_Source"
+
+msgid "Single _Title"
+msgstr "_Titre unique"
+
+msgid "_Destination"
+msgstr "_Destination"
+
+msgid "_Preferences"
+msgstr "_Préférences"
+
+msgid "_Queue"
+msgstr "_Liste"
+
+msgid "S_top Queue"
+msgstr "S_topper Liste"
+
+msgid "_Add"
+msgstr ""
+
+msgid "Add _Multiple"
+msgstr ""
+
+msgid "_Start"
+msgstr "_Démarrer"
+
+msgid "_Pause"
+msgstr "_Pause"
+
+msgid "_View"
+msgstr "_Voir"
+
+msgid "HandBrake For _Dumbies"
+msgstr "HandBrake pour les _Idiots"
+
+msgid "_Show Presets"
+msgstr "_Afficher Préglages"
+
+msgid "_Preview"
+msgstr ""
+
+msgid "_Activity Window"
+msgstr "Fenêtre d'Activité"
+
+msgid "Show _Queue"
+msgstr "Montrer _Liste"
+
+msgid "_Presets"
+msgstr ""
+
+msgid "_Delete"
+msgstr ""
+
+msgid "_Make Default"
+msgstr "_Par défaut"
+
+msgid "_New Folder"
+msgstr ""
+
+msgid "_Export"
+msgstr "_Exporter"
+
+msgid "_Import"
+msgstr "_Importer"
+
+msgid "_Update Built-in Presets"
+msgstr "_MAJ Préréglages Inclus"
+
+msgid "_Help"
+msgstr "_Aide"
+
+msgid "_Guide"
+msgstr "_Guide"
+
+msgid "Start Encoding"
+msgstr "Démarrer Encodage"
+
+msgid "Start"
+msgstr "Démarrer"
+
+msgid "Pause Encoding"
+msgstr "Pause Encodage"
+
+msgid "Pause"
+msgstr "Pause"
+
+msgid "Add to Queue"
+msgstr "_Ajouter à la Liste"
+
+msgid "Enqueue"
+msgstr "Placer dans la liste"
+
+msgid "Show Queue"
+msgstr "Montrer Liste"
+
+msgid "Queue"
+msgstr "Liste"
+
+msgid ""
+"Open Picture Settings and Preview window.\n"
+"Here you can adjust cropping, resolution, aspect ratio, and filters."
+msgstr ""
+
+msgid "Preview"
+msgstr "Prévisualisation"
+
+msgid "Show Activity Window"
+msgstr "Afficher Fenêtre d'Activité"
+
+msgid "Activity"
+msgstr "Activité"
+
+msgid "Source:"
+msgstr "Source:"
+
+msgid "None"
+msgstr "Aucun"
+
+msgid "Title:"
+msgstr "Titre:"
+
+msgid ""
+"Set the title to encode.\n"
+"By default the longest title is chosen.\n"
+"This is often the feature title of a DVD."
+msgstr ""
+
+msgid "Angle:"
+msgstr "Angle:"
+
+msgid "For multi-angle DVD's, select the desired angle to encode."
+msgstr "Pour les DVD multi-angles, selectionner l'angle à encoder."
+
+msgid "Reset All Titles"
+msgstr ""
+
+msgid "Apply current settings to all titles"
+msgstr ""
+
+msgid "Range of title to encode. Can be chapters, seconds, or frames."
+msgstr "Plage de titre à encoder. Cela peut être des chapitres, des secondes ou des images."
+
+msgid "Set the first chapter to encode."
+msgstr "Définissez le premier chapitre à encoder."
+
+msgid "through"
+msgstr "entre"
+
+msgid "Set the last chapter to encode."
+msgstr "Définissez le dernier chapitre à encoder."
+
+msgid "Duration:"
+msgstr "Durée:"
+
+msgid "Destination"
+msgstr ""
+
+msgid "File:"
+msgstr "Fichier:"
+
+msgid "Destination filename for your encode."
+msgstr "Fichier de destination pour votre encodage"
+
+msgid "Destination directory for your encode."
+msgstr "Dossier de destination pour votre encodage."
+
+msgid "Destination Directory"
+msgstr "Dossier de destination"
+
+msgid "Format:"
+msgstr "Format:"
+
+msgid "Format to mux encoded tracks to."
+msgstr "Format de sortie des pistes encodées."
+
+msgid "iPod 5G Support"
+msgstr "iPod 5G Support"
+
+msgid "Add iPod Atom needed by some older iPods."
+msgstr "Ajoute l'iPod Atom requis par certains iPods anciens."
+
+msgid "Web optimized"
+msgstr "Optimisé pour le Web"
+
+msgid ""
+"Optimize the layout of the MP4 file for progressive download.\n"
+"This allows a player to initiate playback before downloading the entire file."
+msgstr ""
+
+msgid "Large file (>4GB)"
+msgstr "Gros fichier (>4GB)"
+
+msgid "Presets List"
+msgstr ""
+
+msgid "Source Codec:"
+msgstr "Codec Source:"
+
+msgid "Dimensions:"
+msgstr "Dimensions:"
+
+msgid "Aspect: "
+msgstr "Aspect: "
+
+msgid "Frame Rate:"
+msgstr "Débit d'images:"
+
+msgid "Source Picture Parameters"
+msgstr "Paramètres Image Source"
+
+msgid "Autocrop:"
+msgstr "Rognage auto:"
+
+msgid "Crop:"
+msgstr "Rognage:"
+
+msgid "Crop Dimensions:"
+msgstr "Dimensions de rognage:"
+
+msgid "Cropping"
+msgstr "Rognage"
+
+msgid "Scale Dimensions:"
+msgstr "Echelle:"
+
+msgid "Optimal for Source:"
+msgstr "Optimal pour la Source:"
+
+msgid "Anamorphic:"
+msgstr "Anamorphique:"
+
+msgid "Scaling"
+msgstr "Dimensionnement"
+
+msgid "Presentation Dimensions:"
+msgstr "Dimensions de Presentation:"
+
+msgid "Summary"
+msgstr "Résumé"
+
+msgid "Left Crop"
+msgstr "Rognage Gauche"
+
+msgid "Top Crop"
+msgstr "Rognage Haut"
+
+msgid "Bottom Crop"
+msgstr "Rognage Bas"
+
+msgid "Right Crop"
+msgstr "Rognage Droit"
+
+msgid "Auto Crop"
+msgstr "Auto Rognage"
+
+msgid "Automatically crop black borders around edges of the video."
+msgstr "Rogner automatiquement les bordures noires de la vidéo."
+
+msgid "Loose Crop"
+msgstr "Rognage loose"
+
+msgid ""
+"When picture settings require that the image\n"
+"dimensions be rounded to some multiple number\n"
+"of pixels, this setting will crop a few extra pixels\n"
+"instead of doing exact cropping and then scaling to\n"
+"the required multiple."
+msgstr ""
+
+msgid "width:"
+msgstr "largeur:"
+
+msgid ""
+"This is the width that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+
+msgid "height:"
+msgstr "hauteur:"
+
+msgid ""
+"This is the height that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+
+msgid "Optimal for source"
+msgstr "Optimal pour la source"
+
+msgid ""
+"If enabled, select the 'optimal' storage resolution.\n"
+"This will be the resolution that most closely matches the source resolution after cropping."
+msgstr ""
+
+msgid "Alignment:"
+msgstr "Alignement:"
+
+msgid ""
+"Align storage dimensions to multiples of this value.\n"
+"\n"
+"This setting is only necessary for compatibility with some devices.\n"
+"You should use 2 unless you experience compatibility issues."
+msgstr ""
+
+msgid "Storage Geometry"
+msgstr ""
+
+msgid ""
+"This is the display width. It is the result of scaling the storage "
+"dimensions by the pixel aspect."
+msgstr "Largeur affichée. C'est le résultat du redimensionnement des dimensions de stockage par l'aspect de pixel."
+
+msgid "Pixel Aspect:"
+msgstr "Aspect de Pixel:"
+
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+
+msgid "Keep Aspect"
+msgstr "Conserver l'Aspect"
+
+msgid ""
+"If enabled, the original display aspect of the source will be maintained."
+msgstr "Si activé, l'aspect d'affichage original de la source sera maintenu."
+
+msgid "Display Aspect:"
+msgstr "Aspect d'Affichage:"
+
+msgid "Display Geometry"
+msgstr ""
+
+msgid "Grayscale"
+msgstr "Niveaux de gris"
+
+msgid "If enabled, filter colour components out of video."
+msgstr "Si activé, filtre et enlève les couleurs de la vidéo."
+
+msgid "Deblock:"
+msgstr "Deblock:"
+
+msgid ""
+"The deblocking filter removes a common type of compression artifact.\n"
+"If your source exhibits 'blockiness', this filter may help clean it up."
+msgstr ""
+
+msgid "Denoise Filter:"
+msgstr ""
+
+msgid ""
+"Denoise filtering reduces or removes the appearance of noise and grain.\n"
+"Film grain and other types of high frequency noise are difficult to compress.\n"
+"Using this filter on such sources can result in smaller file sizes."
+msgstr ""
+
+msgid "Denoise Preset:"
+msgstr ""
+
+msgid "Denoise Tune:"
+msgstr ""
+
+msgid ""
+"Custom denoise filter string format\n"
+"\n"
+"SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
+msgstr ""
+
+msgid "Detelecine:"
+msgstr "Detelecine:"
+
+msgid ""
+"This filter removes 'combing' artifacts that are the result of telecining.\n"
+"\n"
+"Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps."
+msgstr ""
+
+msgid ""
+"Custom detelecine filter string format\n"
+"\n"
+"JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
+msgstr ""
+
+msgid "Decomb"
+msgstr "Decomb"
+
+msgid ""
+"Choose decomb or deinterlace filter options.\n"
+"\n"
+"The decomb filter selectively deinterlaces frames that appear to be interlaced.\n"
+"This will preserve quality in frames that are not interlaced.\n"
+"\n"
+"The classic deinterlace filter is applied to all frames.\n"
+"Frames that are not interlaced will suffer some quality degradation."
+msgstr ""
+
+msgid "Deinterlace"
+msgstr "Désentrelace"
+
+msgid "Decomb:"
+msgstr ""
+
+msgid ""
+"The decomb filter selectively deinterlaces frames that appear to be interlaced.\n"
+"This will preserve quality in frames that are not interlaced."
+msgstr ""
+
+msgid ""
+"Custom decomb filter string format\n"
+"\n"
+"Mode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:\n"
+"BlockHeight:MagnitudeThres:VarianceThres:LaplacianThresh:DilationThresh:\n"
+"ErosionThresh:NoiseThresh:MaxSearchDistance:PostProcessing:Parity"
+msgstr ""
+
+msgid "Deinterlace:"
+msgstr ""
+
+msgid ""
+"The classic deinterlace filter is applied to all frames.\n"
+"Frames that are not interlaced will suffer some quality degradation."
+msgstr ""
+
+msgid ""
+"Custom deinterlace filter string format\n"
+"\n"
+"YadifMode:YadifParity:McdintMode:McdeintQp"
+msgstr ""
+
+msgid "Filters"
+msgstr ""
+
+msgid "Picture"
+msgstr ""
+
+msgid "Video Encoder:"
+msgstr "Encodeur Vidéo:"
+
+msgid "Available video encoders."
+msgstr "Encodeurs vidéo disponibles."
+
+msgid "Framerate:"
+msgstr "Débit d'images:"
+
+msgid ""
+"Output framerate.\n"
+"\n"
+"'Same as source' is recommended. If your source video has\n"
+"a variable framerate, 'Same as source' will preserve it."
+msgstr ""
+
+msgid "Constant Framerate"
+msgstr "Débit Constant"
+
+msgid "Enables constant framerate output."
+msgstr ""
+
+msgid "Peak Framerate (VFR)"
+msgstr "Pic de débit (VFR)"
+
+msgid ""
+"Enables variable framerate output with a peak\n"
+"rate determined by the framerate setting.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr ""
+
+msgid "Variable Framerate"
+msgstr "Débit Variable"
+
+msgid ""
+"Enables variable framerate output.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr ""
+
+msgid ""
+"Set the desired quality factor.\n"
+"The encoder targets a certain quality.\n"
+"The scale used by each video encoder is different.\n"
+"\n"
+"x264's scale is logarithmic and lower values correspond to higher quality.\n"
+"So small decreases in value will result in progressively larger increases\n"
+"in the resulting file size. A value of 0 means lossless and will result\n"
+"in a file size that is larger than the original source, unless the source\n"
+"was also lossless.\n"
+"\n"
+"FFMpeg's and Theora's scale is more linear.\n"
+"These encoders do not have a lossless mode."
+msgstr ""
+
+msgid "Constant Quality:"
+msgstr "Qualité Constante:"
+
+msgid "Bitrate (kbps): "
+msgstr "Débit (kbps): "
+
+msgid ""
+"Set the average bitrate.\n"
+"\n"
+"The instantaneous bitrate can be much higher or lower at any point in time.\n"
+"But the average over a long duration will be the value set here. If you need\n"
+"to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings."
+msgstr ""
+
+msgid "2-Pass Encoding"
+msgstr "Encodage 2 Passes"
+
+msgid ""
+"Perform 2 Pass Encoding.\n"
+"\n"
+"The 'Bitrate' option is prerequisite. During the 1st pass, statistics about\n"
+"the video are collected. Then in the second pass, those statistics are used\n"
+"to make bitrate allocation decisions."
+msgstr ""
+
+msgid "Turbo First Pass"
+msgstr "Première Passe Turbo"
+
+msgid ""
+"During the 1st pass of a 2 pass encode, use settings that speed things "
+"along."
+msgstr "Pour la 1ère passe d'un encodage en 2 passes, utilise des réglages qui accélèrent la tâche."
+
+msgid "Use Advanced Options"
+msgstr "Activer Options Avancées"
+
+msgid ""
+"Use advanced options Tab for x264 settings.\n"
+"\n"
+"Use at your own risk!"
+msgstr ""
+
+msgid "Preset:"
+msgstr ""
+
+msgid ""
+"Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
+"\n"
+"This establishes your default encoder settings.\n"
+"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"You should generally set this option to the slowest you can bear since slower\n"
+"settings will result in better quality or smaller files."
+msgstr ""
+
+msgid "Tune:"
+msgstr ""
+
+msgid ""
+"Tune settings to optimize for common scenarios.\n"
+"\n"
+"This can improve effeciency for particular source characteristics or set\n"
+"characteristics of the output file. Changes will be applied after the\n"
+"preset but before all other parameters."
+msgstr ""
+
+msgid "Fast Decode"
+msgstr "Décodage Rapide"
+
+msgid ""
+"Reduce decoder CPU usage.\n"
+"\n"
+"Set this if your device is struggling to play the output (dropped frames)."
+msgstr ""
+
+msgid "Zero Latency"
+msgstr "Latence Nulle"
+
+msgid ""
+"Minimize latency between input to encoder and output of decoder.\n"
+"\n"
+"This is useful for broadcast of live streams.\n"
+"\n"
+"Since HandBrake is not suitable for live stream broadcast purposes,\n"
+"this setting is of little value here."
+msgstr ""
+
+msgid "Profile:"
+msgstr ""
+
+msgid ""
+"Sets and ensures compliance with the specified profile.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+
+msgid "Level:"
+msgstr ""
+
+msgid ""
+"Sets and ensures compliance with the specified level.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+
+msgid "More Settings:"
+msgstr "Réglages Supplémentaires:"
+
+msgid ""
+"Additional encoder settings.\n"
+"\n"
+"Colon separated list of encoder options."
+msgstr ""
+
+msgid "Video"
+msgstr "Vidéo"
+
+msgid "Selection Behavior:"
+msgstr ""
+
+msgid "Remove"
+msgstr ""
+
+msgid "Available Languages"
+msgstr ""
+
+msgid "Selected Languages"
+msgstr ""
+
+msgid "Use only first encoder for secondary audio"
+msgstr ""
+
+msgid ""
+"Only the primary audio track will be encoded with the full encoder list.\n"
+"All other secondary audio output tracks will be encoded with first encoder only."
+msgstr ""
+
+msgid "Auto Passthru:"
+msgstr "Auto Direct:"
+
+msgid "MP3"
+msgstr ""
+
+msgid ""
+"Enable this if your playback device supports MP3.\n"
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "AAC"
+msgstr ""
+
+msgid ""
+"Enable this if your playback device supports AAC.\n"
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "AC-3"
+msgstr ""
+
+msgid ""
+"Enable this if your playback device supports AC-3.\n"
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "DTS"
+msgstr ""
+
+msgid ""
+"Enable this if your playback device supports DTS.\n"
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "DTS-HD"
+msgstr ""
+
+msgid ""
+"Enable this if your playback device supports DTS-HD.\n"
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "Passthru Fallback:"
+msgstr "Alternative au Direct:"
+
+msgid ""
+"Set the audio codec to encode with when a suitable track can not be found "
+"for audio passthru."
+msgstr "Définit le codec audio à utiliser pour encoder si aucune piste n'est disponible pour le direct audio."
+
+msgid "Audio Encoder Settings:"
+msgstr ""
+
+msgid "Encoder"
+msgstr "Encodeur"
+
+msgid "Bitrate/Quality"
+msgstr ""
+
+msgid "Mixdown"
+msgstr ""
+
+msgid "Samplerate"
+msgstr ""
+
+msgid "Gain"
+msgstr "Gain"
+
+msgid "Gain:"
+msgstr ""
+
+msgid "DRC"
+msgstr ""
+
+msgid "Audio Defaults"
+msgstr ""
+
+msgid "Add new audio settings to the list"
+msgstr "Ajouter de nouveaus réglages audio à la liste"
+
+msgid "Add All"
+msgstr ""
+
+msgid "Add all audio tracks to the list"
+msgstr ""
+
+msgid "Reload Defaults"
+msgstr ""
+
+msgid "Reload all audio settings from defaults"
+msgstr ""
+
+msgid "Audio List"
+msgstr ""
+
+msgid "Preferred Language: None"
+msgstr ""
+
+msgid "Add Foreign Audio Search Pass"
+msgstr ""
+
+msgid ""
+"Add \"Foreign Audio Search\" when the default audio track is your preferred language.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them."
+msgstr ""
+
+msgid "Add subtitle track if default audio is foreign"
+msgstr ""
+
+msgid ""
+"When the default audio track is not your preferred language, add a subtitle "
+"track."
+msgstr ""
+
+msgid "Add Closed Captions when available"
+msgstr "Ajouter des sous-titres codés si disponibles"
+
+msgid ""
+"Closed captions are text subtitles that can be added to any container as a "
+"soft subtitle track (not burned)"
+msgstr ""
+
+msgid "Subtitle Defaults"
+msgstr ""
+
+msgid "Add new subtitle settings to the list"
+msgstr ""
+
+msgid "Add all subtitle tracks to the list"
+msgstr ""
+
+msgid "Reload all subtitle settings from defaults"
+msgstr ""
+
+msgid "Subtitle List"
+msgstr ""
+
+msgid "Reference Frames:"
+msgstr "Images de Référence:"
+
+msgid ""
+"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
+"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
+"\n"
+"Note that many hardware devices have limitations on the number of supported reference\n"
+"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
+"you're absolutely sure you know what you're doing!"
+msgstr ""
+
+msgid "Maximum B-Frames:"
+msgstr ""
+
+msgid ""
+"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
+"\n"
+"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
+"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
+"values.\n"
+"\n"
+"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
+msgstr ""
+
+msgid "Pyramidal B-Frames:"
+msgstr ""
+
+msgid ""
+"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
+"of B-frames, allowing B-frames to reference each other to improve compression.\n"
+"\n"
+"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
+msgstr ""
+
+msgid "Weighted P-Frames:"
+msgstr ""
+
+msgid ""
+"Performs extra analysis to decide upon weighting parameters for each frame.\n"
+"\n"
+"This improves overall compression slightly and improves the quality of fades greatly.\n"
+"\n"
+"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
+"prediction to be disabled. Note that some devices and players, even those that support\n"
+"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
+"completely incompatible with it, for example."
+msgstr ""
+
+msgid "8x8 Transform"
+msgstr ""
+
+msgid ""
+"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
+"\n"
+"It improves compression by at least 5% at a very small speed cost and may\n"
+"provide an unusually high visual quality benefit compared to its compression\n"
+"gain. However, it requires High Profile, which many devices may not support."
+msgstr ""
+
+msgid "CABAC Entropy Encoding"
+msgstr ""
+
+msgid ""
+"After the encoder has done its work, it has a bunch of data that\n"
+"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
+"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
+"compresses significantly better (10-30%), especially at lower bitrates.\n"
+"\n"
+"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
+"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
+msgstr ""
+
+msgid "Encoding Features"
+msgstr ""
+
+msgid "Motion Est. Method:"
+msgstr ""
+
+msgid ""
+"Controls the motion estimation method.\n"
+"\n"
+"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
+"A better motion search method improves compression at the cost of speed.\n"
+"\n"
+"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
+"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
+"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
+"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
+"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
+msgstr ""
+
+msgid "Subpel ME &amp; Mode:"
+msgstr ""
+
+msgid "Motion Est. Range:"
+msgstr ""
+
+msgid ""
+"This is the distance x264 searches from its initial guess at the\n"
+"motion of a block in order to try to find its actual motion.\n"
+"\n"
+"The default is fine for most content, but extremely high motion video,\n"
+"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
+"a high speed cost."
+msgstr ""
+
+msgid "Adaptive Direct Mode:"
+msgstr ""
+
+msgid ""
+"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
+"\n"
+"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
+"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
+"adaptively select which is better for each particular frame."
+msgstr ""
+
+msgid "Adaptive B-Frames:"
+msgstr ""
+
+msgid "Partitions:"
+msgstr ""
+
+msgid ""
+"Mode decision picks from a variety of options to make its decision:\n"
+"this option chooses what options those are.\n"
+"\n"
+"Fewer partitions to check means faster encoding, at the cost of worse\n"
+"decisions, since the best option might have been one that was turned off."
+msgstr ""
+
+msgid "Trellis:"
+msgstr ""
+
+msgid ""
+"Trellis fine-tunes the rounding of transform coefficients to\n"
+"squeeze out 3-5% more compression at the cost of some speed.\n"
+"\n"
+"\"Always\" uses trellis not only during the main encoding process, but also\n"
+"during analysis, which improves compression even more, albeit at great speed cost.\n"
+"\n"
+"Trellis costs more speed at higher bitrates and requires CABAC."
+msgstr ""
+
+msgid "Analysis"
+msgstr ""
+
+msgid "Adaptive Quantization Strength:"
+msgstr ""
+
+msgid ""
+"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
+"\n"
+"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
+msgstr ""
+
+msgid "Psychovisual Rate Distortion:"
+msgstr ""
+
+msgid ""
+"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
+"vision to dramatically improve apparent detail and sharpness.\n"
+"The effect can be made weaker or stronger by adjusting the strength.\n"
+"Being an RD algorithm, it requires mode decision to be at least \"6\"."
+msgstr ""
+
+msgid "Psychovisual Trellis:"
+msgstr ""
+
+msgid ""
+"Psychovisual trellis is an experimental algorithm to further\n"
+"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
+"\n"
+"Recommended values are around 0.2, though higher values may help for very\n"
+"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
+"and other sharp-edged graphics."
+msgstr ""
+
+msgid "Deblocking: "
+msgstr ""
+
+msgid "No DCT Decimate"
+msgstr ""
+
+msgid ""
+"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
+"be better used for some other purpose in the video. However, this can\n"
+"sometimes have slight negative effects on retention of subtle grain and\n"
+"dither.\n"
+"\n"
+"Don't touch this unless you're having banding issues or other such cases\n"
+"where you are having trouble keeping fine noise."
+msgstr ""
+
+msgid "Psychovisual"
+msgstr ""
+
+msgid ""
+"Your selected options will appear here.\n"
+"You can edit these and add additional options.\n"
+"\n"
+"Default values will not be shown. The defaults are:\n"
+"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
+"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
+"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
+"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
+"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
+msgstr ""
+
+msgid "Current x264 Advanced Option String"
+msgstr ""
+
+msgid "Advanced Video"
+msgstr ""
+
+msgid "Chapter Markers"
+msgstr "Repères de Chapitre"
+
+msgid "Add chapter markers to output file."
+msgstr "Ajouter des repères de chapitre sur le fichier de sortie."
+
+msgid "Chapters"
+msgstr "Chapitres"
+
+msgid "Actors:"
+msgstr "Acteurs:"
+
+msgid "Director:"
+msgstr "Réalisateur:"
+
+msgid "Release Date:"
+msgstr "Date de Sortie:"
+
+msgid "Comment:"
+msgstr "Commentaire:"
+
+msgid "Genre:"
+msgstr "Genre:"
+
+msgid "Description:"
+msgstr "Description:"
+
+msgid "Plot:"
+msgstr "Résumé:"
+
+msgid "Tags"
+msgstr "Tags"
+
+msgid "Settings"
+msgstr ""
+
+msgid "Edit"
+msgstr "Edition"
+
+msgid "Reload"
+msgstr ""
+
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+
+msgid "Reload All"
+msgstr ""
+
+msgid ""
+"Mark all queue entries as pending.\n"
+"Resets all queue jobs to pending and ready to run again."
+msgstr ""
+
+msgid "Select All"
+msgstr ""
+
+msgid "Mark all titles for adding to the queue"
+msgstr ""
+
+msgid "Clear All"
+msgstr ""
+
+msgid "Unmark all titles"
+msgstr ""
+
+msgid "Destination files OK. No duplicates detected."
+msgstr ""
+
+msgid "Preferences"
+msgstr ""
+
+msgid "Automatically check for updates"
+msgstr "Vérifier automatiquement les mises à jour"
+
+msgid "When all encodes are complete"
+msgstr "Lorsque tous les encodages sont terminés"
+
+msgid "Use automatic naming (uses modified source name)"
+msgstr "Utiliser le nommage automatique (utilise des noms de sources modifiés)"
+
+msgid "Auto-Name Template"
+msgstr ""
+
+msgid ""
+"Available Options: {source} {title} {chapters} {date} {time} {quality} "
+"{bitrate}"
+msgstr ""
+
+msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
+msgstr "Utilise les extensions compatibles iPod/iTunes (.m4v) pour le MP4"
+
+msgid "Number of previews"
+msgstr "Nombre de prévisualisations"
+
+msgid "Filter short titles (seconds)"
+msgstr "Filtrer les titres courts (secondes)"
+
+msgid "Show system tray icon"
+msgstr "Afficher l'icône dans la barre système"
+
+msgid "General"
+msgstr "Général"
+
+msgid "Constant Quality fractional granularity"
+msgstr ""
+
+msgid "Use dvdnav (instead of libdvdread)"
+msgstr "Utiliser dvdnav (plutôt que libdvdread)"
+
+msgid "Put individual encode logs in same location as movie"
+msgstr "Ecrire les logs d'encodage dans le même dossier que les films"
+
+msgid "Activity Log Verbosity Level"
+msgstr "Niveau de Verbosité des Logs d'Activité"
+
+msgid "Activity Log Longevity"
+msgstr "Durée de Conservation des Logs d'Activité"
+
+msgid "Scale down High Definition previews"
+msgstr "Réduit la prévisualisation Haute Définition"
+
+msgid "Automatically Scan DVD when loaded"
+msgstr "Scanner automatiquement les DVD insérés"
+
+msgid "Scans the DVD whenever a new disc is loaded"
+msgstr "Scanner les DVD même si un nouveau disque est inséré"
+
+msgid "Hide Advanced Video Options Tab"
+msgstr "Cacher Onglet Options Vidéo Avancées"
+
+msgid ""
+"Use advanced video options at your own risk.\n"
+"We recommend that you use the controls available\n"
+"on the Video tab instead."
+msgstr "Vous prenez un rique en utilisant les options vidéo avancées.\nNous vous recommandons d'utiliser plutôt les contrôles\ndisponibles dans l'onglet Vidéo."
+
+msgid "Delete completed jobs from queue"
+msgstr ""
+
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+
+msgid "Allow Tweaks"
+msgstr "Autoriser Paramétrage"
+
+msgid "Allow HandBrake For Dummies"
+msgstr "Autoriser HandBrake pour les Idiots "
+
+msgid "Advanced"
+msgstr "Avancé"
+
+msgid "Folder Name:"
+msgstr "Nom du Dossier:"
+
+msgid "Description"
+msgstr "Description"
+
+msgid "Preset Name:"
+msgstr "Nom du préréglage:"
+
+msgid "Custom Picture Dimensions"
+msgstr "Dimensions Image Personnalisées"
+
+msgid "Maximum Width:"
+msgstr "Largeur Maximale:"
+
+msgid "Enable maximum width limit."
+msgstr "Activer une limite pour la largeur."
+
+msgid ""
+"This is the maximum width that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source width is greater.\n"
+"Setting this to 0 means there is no maximum width."
+msgstr ""
+
+msgid "Maximum Height:"
+msgstr "Hauteur Maximale:"
+
+msgid "Enable maximum height limit."
+msgstr "Active une limite de hauteur."
+
+msgid ""
+"This is the maximum height that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source height is greater.\n"
+"Setting this to 0 means there is no maximum height."
+msgstr ""
+
+msgid "Select preview frames."
+msgstr "Selectionne les images de prévisualisation"
+
+msgid ""
+"Encode and play a short sequence of video starting from the current preview "
+"position."
+msgstr "Encode et lit une courte séquence de la vidéo en démarrant de la position en cours."
+
+msgid "Duration:"
+msgstr "Durée:"
+
+msgid "Set the duration of the live preview in seconds."
+msgstr "Definit la durée de la prévisualisation en secondes."
+
+msgid "Show Crop"
+msgstr "Voir Rognage"
+
+msgid "Show Cropped area of the preview"
+msgstr "Affiche la zone de rognage dans la prévisualisation"
+
+msgid "Fullscreen"
+msgstr "Plein Ecran"
+
+msgid "View Fullscreen Preview"
+msgstr "Prévisualisation Plein Ecran"
+
+msgid "Title Number:"
+msgstr "Numéro de Titre:"
+
+msgid "Detected DVD devices:"
+msgstr "Lecteurs DVD détectés:"
+
+msgid "Setting:"
+msgstr "Réglage:"
+
+msgid "Import SRT"
+msgstr "Importer SRT"
+
+msgid "Enable settings to import an SRT subtitle file"
+msgstr ""
+
+msgid "Embedded Subtitle List"
+msgstr ""
+
+msgid "Enable settings to select embedded subtitles"
+msgstr ""
+
+msgid "Language"
+msgstr ""
+
+msgid "Character Code"
+msgstr "Jeu de Caractères"
+
+msgid "Offset (ms)"
+msgstr "Décalage (ms)"
+
+msgid ""
+"Set the language of this subtitle.\n"
+"This value will be used by players in subtitle menus."
+msgstr ""
+
+msgid ""
+"Set the character code used by the SRT file you are importing.\n"
+"\n"
+"SRTs come in all flavours of character sets.\n"
+"We translate the character set to UTF-8.\n"
+"The source's character code is needed in order to perform this translation."
+msgstr ""
+
+msgid "Select the SRT file to import."
+msgstr "Selectionner le fichier SRT à importer. "
+
+msgid "Srt File"
+msgstr "Fichier SRT"
+
+msgid "Adjust the offset in milliseconds between video and SRT timestamps"
+msgstr "Ajuste le décalage en millisecondes entre la vidéo et le fichier SRT"
+
+msgid "Track"
+msgstr "Piste"
+
+msgid "List of subtitle tracks available from your source."
+msgstr "Liste des sous-titres disponibles dans votre source."
+
+msgid "Forced Subtitles Only"
+msgstr ""
+
+msgid "Burn into video"
+msgstr ""
+
+msgid ""
+"Render the subtitle over the video.\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr ""
+
+msgid "Set Default Track"
+msgstr ""
+
+msgid "Source Track"
+msgstr ""
+
+msgid "List of audio tracks available from your source."
+msgstr "Liste des pistes audio disponibles dans votre source."
+
+msgid "Track Name:"
+msgstr "Nom de Piste:"
+
+msgid ""
+"Set the audio track name.\n"
+"\n"
+"Players may use this in the audio selection list."
+msgstr ""
+
+msgid "Mix"
+msgstr "Mix"
+
+msgid "Sample Rate"
+msgstr "Fréquence d'Echantillonnage"
+
+msgid "Sample Rate:"
+msgstr ""
+
+msgid "Enable bitrate setting"
+msgstr ""
+
+msgid "Enable quality setting"
+msgstr ""
+
+msgid "Skip This Version"
+msgstr "Ignorer Cette Version"
+
+msgid "Remind Me Later"
+msgstr "Redemander Plus Tard"
+
+msgid "A new version of HandBrake is available!"
+msgstr "Une nouvelle version d'HandBrake est disponible!"
+
+msgid "HandBrake xxx is now available (you have yyy)."
+msgstr "HandBrake xxx est disponible (vous utilisez la yyy)."
+
+msgid "Release Notes"
+msgstr ""
+
+msgid "none"
+msgstr ""
+
+msgid "First Track Matching Selected Languages"
+msgstr ""
+
+msgid "All Tracks Matching Selected Languages"
+msgstr ""
+
+msgid "Chapters:"
+msgstr "Chapitres:"
+
+msgid "Seconds:"
+msgstr "Secondes:"
+
+msgid "Frames:"
+msgstr "Images:"
+
+msgid "Do Nothing"
+msgstr "Ne Rien Faire"
+
+msgid "Show Notification"
+msgstr "Afficher Notification"
+
+msgid "Quit Handbrake"
+msgstr "Quitter Handbrake"
+
+msgid "Put Computer To Sleep"
+msgstr "Mettre l'ordinateur en veille"
+
+msgid "Shutdown Computer"
+msgstr "Eteindre l'ordinateur"
+
+msgid "Week"
+msgstr "Semaine"
+
+msgid "Year"
+msgstr "Année"
+
+msgid "Immortal"
+msgstr "Infini"
+
+msgid "Never"
+msgstr "Jamais"
+
+msgid "Daily"
+msgstr "Quotidien"
+
+msgid "Weekly"
+msgstr "Hebdomadaire"
+
+msgid "Monthly"
+msgstr "Mensuel"
+
+msgid "Month"
+msgstr ""
+
+msgid "Default"
+msgstr "Défaut"
+
+msgid "Fast"
+msgstr "Rapide"
+
+msgid "Bob"
+msgstr ""
+
+msgid "Slow"
+msgstr ""
+
+msgid "Slower"
+msgstr "Lent"
+
+msgid "NLMeans"
+msgstr ""
+
+msgid "HQDN3D"
+msgstr ""
+
+msgid "Ultralight"
+msgstr ""
+
+msgid "Light"
+msgstr ""
+
+msgid "Medium"
+msgstr "Moyen"
+
+msgid "medium"
+msgstr ""
+
+msgid "Strong"
+msgstr "Fort"
+
+msgid "Film"
+msgstr ""
+
+msgid "Grain"
+msgstr ""
+
+msgid "High Motion"
+msgstr ""
+
+msgid "Animation"
+msgstr ""
+
+msgid "Spatial"
+msgstr "Spatial"
+
+msgid "Temporal"
+msgstr "Temporel"
+
+msgid "Automatic"
+msgstr "Automatique"
+
+msgid "Optimal"
+msgstr "Optimal"
+
+msgid "Normal"
+msgstr "Normal"
+
+msgid "Simple"
+msgstr "Simple"
+
+msgid "Smart"
+msgstr "Intelligent"
+
+msgid "Diamond"
+msgstr "Diamant"
+
+msgid "Hexagon"
+msgstr "Hexagone"
+
+msgid "Uneven Multi-Hexagon"
+msgstr "Multi-Hexagone Irrégulier"
+
+msgid "Exhaustive"
+msgstr "Exhaustive"
+
+msgid "Hadamard Exhaustive"
+msgstr "Hadamard Exhaustive"
+
+msgid "Some"
+msgstr "Certains"
+
+msgid "All"
+msgstr "Tous"
+
+msgid "Encode only"
+msgstr "Encoder seulement"
+
+msgid "Always"
+msgstr "Toujours"
+
+msgid "Same as source"
+msgstr "Identique à la Source"
+
+msgid "Same as source:"
+msgstr ""
+
+msgid "(NTSC Film)"
+msgstr ""
+
+msgid "(PAL Film/Video)"
+msgstr ""
+
+msgid "(NTSC Video)"
+msgstr ""
+
+#, c-format
+msgid "%d - Unknown Length"
+msgstr ""
+
+msgid "No Titles"
+msgstr "Aucun Titre"
+
+msgid "No Audio"
+msgstr "Pas d'Audio"
+
+msgid "Foreign Audio Search"
+msgstr ""
+
+#, c-format
+msgid "Chapter %2d"
+msgstr ""
+
+#, c-format
+msgid "N/A"
+msgstr ""
+
+#, c-format
+msgid ""
+"Invalid Deinterlace Settings:\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Invalid Detelecine Settings:\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Invalid Decomb Settings:\n"
+"\n"
+"%s\n"
+msgstr ""
+
+msgid ""
+"Theora is not supported in the MP4 container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, FFMPEG will be chosen for you."
+msgstr ""
+
+msgid "Continue"
+msgstr ""
+
+msgid "No title found.\n"
+msgstr ""
+
+msgid ""
+"Only one subtitle may be burned into the video.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+msgid ""
+"Srt file does not exist or not a regular file.\n"
+"\n"
+"You should choose a valid file.\n"
+"If you continue, this subtitle will be ignored."
+msgstr ""
+
+msgid ""
+"The source does not support Pass-Thru.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s is not supported in the %s container.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#, c-format
+msgid ""
+"The source audio does not support %s mixdown.\n"
+"\n"
+"You should choose a different mixdown.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "Signal handler (%s) not found"
+msgstr ""
+
+msgid "Index"
+msgstr "Index"
+
+msgid "Duration"
+msgstr "Durée"
+
+msgid "Title"
+msgstr "Titre"
+
+msgid "Done\n"
+msgstr ""
+
+msgid "DATA"
+msgstr ""
+
+msgid "Job Information"
+msgstr ""
+
+msgid "Track Information"
+msgstr ""
+
+msgid "Preset Name"
+msgstr "Nom du Préréglage"
+
+msgid "The device or file to encode"
+msgstr "Périphérique ou fichier à encoder"
+
+msgid "The preset values to use for encoding"
+msgstr "Valeurs du préréglage à utiliser pour l'encodage"
+
+msgid "Spam a lot"
+msgstr ""
+
+msgid "- Transcode media formats"
+msgstr ""
+
+msgid "Globals"
+msgstr ""
+
+msgid "Presets"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+#, c-format
+msgid "%s path: (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s indices: len %d"
+msgstr ""
+
+msgid "Type"
+msgstr ""
+
+msgid "Failed to find parent folder when adding child."
+msgstr ""
+
+msgid "Failed to find parent folder while adding child."
+msgstr ""
+
+#, c-format
+msgid "Can't map language value: (%s)"
+msgstr "Impossible d'associer la langue: (%s)"
+
+#, c-format
+msgid "Can't map value: (%s)"
+msgstr ""
+
+msgid "Subtitles"
+msgstr ""
+
+#, c-format
+msgid "Superfluous tunes! %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s: Folder already exists.\n"
+"You can not replace it with a preset."
+msgstr "%s: Le dossier existe déjà.\nVous ne pouvez pas le remplacer par un préréglage."
+
+#, c-format
+msgid ""
+"%s: Preset already exists.\n"
+"You can not replace it with a folder."
+msgstr "%s: Le préréglage existe déjà.\nVous ne pouvez pas le remplacer par un dossier."
+
+msgid "Import Preset"
+msgstr "Importer Préréglage"
+
+msgid "All (*)"
+msgstr "Tous (*)"
+
+msgid "Presets (*.plist)"
+msgstr "Préréglages (*.plist)"
+
+msgid "Export Preset"
+msgstr "Exporter Préréglage"
+
+#, c-format
+msgid ""
+"Confirm deletion of %s:\n"
+"\n"
+"%s"
+msgstr "Confirmer la suppression de %s:\n\n%s"
+
+msgid "No selection??? Perhaps unselected."
+msgstr ""
+
+msgid "Couldn't create native window for GstXOverlay. Disabling live preview."
+msgstr "Impossible de créer la fenêtre pour GstXOverlay. Prévisualisation désactivée."
+
+msgid "Couldn't initialize gstreamer. Disabling live preview."
+msgstr ""
+
+#, c-format
+msgid "Gstreamer Error: %s"
+msgstr "Gstreamer Erreur: %s"
+
+#, c-format
+msgid ""
+"Missing GStreamer plugin\n"
+"Audio or Video may not play as expected\n"
+"\n"
+"%s"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
+msgid "Done"
+msgstr "Fait"
+
+msgid "Seconds"
+msgstr "Secondes"
+
+msgid "Frames"
+msgstr "Images"
+
+#, c-format
+msgid ""
+"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
+" %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"<big>%s</big> (Title %d, %s %d through %d) --> %s"
+msgstr ""
+
+#, c-format
+msgid "Modified Preset Based On: %s\n"
+msgstr "Préglage Modifié Basé Sur: %s\n"
+
+#, c-format
+msgid "Preset: %s\n"
+msgstr "Préglage: %s\n"
+
+#, c-format
+msgid "Format: %s Container\n"
+msgstr "Format: %s Conteneur\n"
+
+msgid "Container Options:"
+msgstr ""
+
+#, c-format
+msgid "%sChapter Markers"
+msgstr ""
+
+#, c-format
+msgid "%siPod 5G Support"
+msgstr ""
+
+#, c-format
+msgid "%sWeb Optimized"
+msgstr ""
+
+#, c-format
+msgid "%sLarge File Size (>4GB)"
+msgstr ""
+
+#, c-format
+msgid "Destination: %s\n"
+msgstr "Destination: %s\n"
+
+msgid "(Aspect Preserved)"
+msgstr ""
+
+msgid "(Aspect Lost)"
+msgstr ""
+
+msgid "(Anamorphic)"
+msgstr ""
+
+msgid "(Custom Anamorphic)"
+msgstr "(Anamorphie Personnalisée)"
+
+msgid "Picture: "
+msgstr ""
+
+#, c-format
+msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
+msgstr ""
+
+#, c-format
+msgid ", Display %d x %d"
+msgstr ""
+
+msgid "Filters:"
+msgstr "Filtres:"
+
+#, c-format
+msgid "%sDetelecine"
+msgstr ""
+
+#, c-format
+msgid "%sDecomb"
+msgstr ""
+
+#, c-format
+msgid "%sDeinterlace"
+msgstr ""
+
+#, c-format
+msgid "%sDenoise Filter %s:"
+msgstr ""
+
+#, c-format
+msgid "%sDeblock: %d"
+msgstr ""
+
+#, c-format
+msgid "%sGrayscale"
+msgstr ""
+
+#, c-format
+msgid "Video: %s"
+msgstr ""
+
+#, c-format
+msgid ", Framerate: %s %s"
+msgstr ""
+
+#, c-format
+msgid ", Framerate: Peak %s (may be lower)"
+msgstr ""
+
+#, c-format
+msgid ", Framerate: %s (constant frame rate)"
+msgstr ""
+
+msgid "Error"
+msgstr "Erreur"
+
+msgid "Bitrate:"
+msgstr "Débit:"
+
+msgid "Turbo 1st Pass: On\n"
+msgstr ""
+
+#, c-format
+msgid "Video Options: Preset: %s"
+msgstr ""
+
+msgid " - Tune: "
+msgstr ""
+
+#, c-format
+msgid " - Profile: %s"
+msgstr ""
+
+#, c-format
+msgid " - Level: %s"
+msgstr ""
+
+#, c-format
+msgid "Advanced Options: %s\n"
+msgstr "Options Avancées: %s\n"
+
+msgid "Audio: "
+msgstr ""
+
+#, c-format
+msgid "Audio Tracks: %d"
+msgstr ""
+
+#, c-format
+msgid "Bitrate: %d"
+msgstr ""
+
+#, c-format
+msgid "%s --> Encoder: %s"
+msgstr ""
+
+#, c-format
+msgid "%s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
+msgstr ""
+
+msgid "Subtitle: "
+msgstr ""
+
+#, c-format
+msgid "Subtitle Tracks: %d\n"
+msgstr ""
+
+msgid " (Force)"
+msgstr " (Forcer)"
+
+msgid " (Burn)"
+msgstr ""
+
+msgid " (Default)"
+msgstr " (Défaut)"
+
+#, c-format
+msgid " %s (%s), %s, Offset (ms) %d%s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Another queued job has specified the same destination.\n"
+"Do you want to overwrite?"
+msgstr "Destination: %s\n\nUn autre travail de la liste a la même destination.\nVoulez-vous l'écraser?"
+
+msgid "Overwrite"
+msgstr "Ecraser"
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"This is not a valid directory."
+msgstr "Destination: %s\n\nDossier invalide."
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Can not read or write the directory."
+msgstr "Destination: %s\n\nImpossible de lire ou d'écrire le dossier."
+
+#, c-format
+msgid ""
+"Destination filesystem is almost full: %uM free\n"
+"\n"
+"Encode may be incomplete if you proceed.\n"
+msgstr "Le volume de destination est presque plein: %uM free\n\nL'encodage serait incomplet si vous continuez.\n"
+
+msgid "Proceed"
+msgstr "Exécuter"
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"File already exists.\n"
+"Do you want to overwrite?"
+msgstr "Destination: %s\n\nLe fichier existe déjà.\nVoulez-vous l'écraser?"
+
+msgid ""
+"Duplicate destination files detected.\n"
+"Duplicates will not be added to the queue."
+msgstr ""
+
+msgid "No Title"
+msgstr ""
+
+msgid ""
+"There is another title with the same destination file name.\n"
+"This title will not be added to the queue unless you change\n"
+"the output file name.\n"
+msgstr ""
+
+msgid "Stop"
+msgstr ""
+
+msgid "Stop Encoding"
+msgstr "Stopper l'encodage"
+
+msgid "Resume"
+msgstr ""
+
+msgid "Resume Encoding"
+msgstr "Reprendre Encodage"
+
+msgid "_Start Queue"
+msgstr "_Démarrer la liste"
+
+msgid "_Resume Queue"
+msgstr "_Redémarrer Liste"
+
+msgid ""
+"You are currently encoding. What would you like to do?\n"
+"\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"You have %d unfinished job(s) in a saved queue.\n"
+"\n"
+"Would you like to reload them?"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+#, c-format
+msgid "Usage: %s infile [outfile]\n"
+msgstr "Usage: %s infile [outfile]\n"
+
+#, c-format
+msgid "Attempt to set unknown widget type: %s\n"
+msgstr ""
+
+#, c-format
+msgid "No value found for %s\n"
+msgstr "Pas de valeur trouvée pour %s\n"
+
+msgid "Attempt to set unknown widget type"
+msgstr ""
+
+#, c-format
+msgid "Failed to find widget for key: %s\n"
+msgstr ""
+
+#, c-format
+msgid "Offset: %dms"
+msgstr ""
+
+msgid "Burned Into Video"
+msgstr ""
+
+msgid "Passthrough"
+msgstr ""
+
+msgid "(Forced Subtitles Only)"
+msgstr ""
+
+msgid "(Default)"
+msgstr ""
+
+msgid "Error!"
+msgstr ""
+
+#, c-format
+msgid "Preferred Language: %s"
+msgstr ""
+
+#, c-format
+msgid "Add %s subtitle track if default audio is not %s"
+msgstr ""
+
+#, c-format
+msgid "Type %s"
+msgstr ""
+
+#, c-format
+msgid "Type %s value %s"
+msgstr ""
+
+#, c-format
+msgid "Type %s value %d"
+msgstr ""
+
+#, c-format
+msgid "Type %s value %<PRId64>"
+msgstr ""
+
+#, c-format
+msgid "Type %s value %f"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"%s\""
+msgstr "%s\n\nOptions Etendues:\n\"%s\""
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"\""
+msgstr ""
+
+msgid "ERROR"
+msgstr ""
+
+msgid ""
+"Anamorphic Modes:\n"
+"<tt>\n"
+"None - Force pixel aspect ratio to 1:1.\n"
+"Loose - Align dimensions to chosen 'Alignment' value \n"
+" and pick pixel aspect ratio that preserves the\n"
+" original display aspect ratio\n"
+"Strict - Keep original source dimensions and pixel \n"
+" aspect ratio</tt>"
+msgstr "Modes Anamorphiques:\n<tt>\nAucun - Force le rapport d'aspect de pixel à 1:1.\nLoose - Dimensionne à la valeur d' 'Alignement' choisie \net ajuste le rapport d'aspect de pixel qui préserve\nle rapport d'aspect d'affichage original\nStrict - Conserve les dimensions originales de la source\net le rapport d'aspect de pixel</tt>"
+
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr ""
+
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr ""

HandBrake-0.10.0.tar.bz2/gtk/po/it_IT.po Added

@@ -0,0 +1,2652 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Alexandru Grigoras <alexandru.grigoras86@gmail.com>, 2014
+# Giuseppe Pignataro <anubisteam01@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: HandBrake-0.10\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-10 21:39+0400\n"
+"PO-Revision-Date: 2014-10-14 23:26+0000\n"
+"Last-Translator: VictorR2007 <victorr2007@yandex.ru>\n"
+"Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/handbrake/language/it_IT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it_IT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Off"
+msgstr "Off"
+
+msgid "Quality: "
+msgstr "Qualità:"
+
+#, c-format
+msgid "Bitrate: %dkbps"
+msgstr ""
+
+#, c-format
+msgid "Bitrate: %.4gkbps"
+msgstr ""
+
+msgid "Passthrough"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s\n"
+"Gain: %s\n"
+"DRC: %s\n"
+"Track Name: %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s\n"
+"Gain: %s\n"
+"DRC: %s"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid ""
+"Add an audio encoder.\n"
+"Each selected source track will be encoded with all selected encoders."
+msgstr ""
+
+msgid "Set the audio codec to encode this track with."
+msgstr ""
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Quality"
+msgstr ""
+
+msgid "Set the bitrate to encode this track with."
+msgstr ""
+
+msgid ""
+"Audio Quality:\n"
+"For encoders that support it, adjust the quality of the output."
+msgstr ""
+
+msgid "Set the mixdown of the output audio track."
+msgstr ""
+
+msgid "Set the sample rate of the output audio track."
+msgstr ""
+
+msgid ""
+"Audio Gain:\n"
+"Adjust the amplification or attenuation of the output audio track."
+msgstr ""
+
+msgid ""
+"Audio Gain: Adjust the amplification or attenuation of the output "
+"audio track."
+msgstr ""
+
+msgid ""
+"Dynamic Range Compression:\n"
+"Adjust the dynamic range of the output audio track.\n"
+"For source audio that has a wide dynamic range,\n"
+"very loud and very soft sequences, DRC allows you\n"
+"to 'compress' the range by making loud sounds\n"
+"softer and soft sounds louder.\n"
+msgstr ""
+
+msgid ""
+"Dynamic Range Compression: Adjust the dynamic range of the output audio track. \n"
+"\n"
+" For source audio that has a wide dynamic range (very loud and very soft sequences), DRC allows you to 'compress' the range by making loud sections softer and soft sections louder."
+msgstr ""
+
+msgid ""
+"Dynamic Range Compression: Adjust the dynamic range of the output audio track. \n"
+"\n"
+" For source audio that has a wide dynamic range (very loud and very soft sequences), DRC allows you to 'compress' the range by making loud sections softer and soft sections louder."
+msgstr ""
+
+msgid "Remove this audio encoder"
+msgstr ""
+
+msgid "Failed to find widget"
+msgstr ""
+
+#, c-format
+msgid "Failed to find dependent widget %s"
+msgstr ""
+
+msgid "Closing HandBrake will terminate encoding.\n"
+msgstr ""
+
+msgid "{source}"
+msgstr ""
+
+msgid "{title}"
+msgstr ""
+
+msgid "{chapters}"
+msgstr ""
+
+msgid "{time}"
+msgstr ""
+
+msgid "{date}"
+msgstr ""
+
+msgid "{bitrate}"
+msgstr ""
+
+msgid "No Title Found"
+msgstr ""
+
+msgid "Not Selected"
+msgstr ""
+
+msgid "Scanning ..."
+msgstr ""
+
+msgid "Stop Scan"
+msgstr ""
+
+msgid "Choose Destination"
+msgstr ""
+
+msgid "On"
+msgstr "On"
+
+msgid "Strict"
+msgstr ""
+
+msgid "Loose"
+msgstr ""
+
+msgid "Custom"
+msgstr "Personalizzato"
+
+msgid "Unknown"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s in %d seconds ..."
+msgstr ""
+
+#, c-format
+msgid "%sYour movie will be lost if you don't continue encoding."
+msgstr ""
+
+msgid "Cancel Current and Stop"
+msgstr ""
+
+msgid "Cancel Current, Start Next"
+msgstr ""
+
+msgid "Finish Current, then Stop"
+msgstr ""
+
+msgid "Continue Encoding"
+msgstr ""
+
+msgid "Custom "
+msgstr "Personalizzato"
+
+msgid "Modified "
+msgstr "Modificato"
+
+#, c-format
+msgid "%s%sPreset: %s"
+msgstr ""
+
+#, c-format
+msgid "Handbrake Version: %s (%d)\n"
+msgstr ""
+
+#, c-format
+msgid "%d encode(s) pending"
+msgstr ""
+
+#, c-format
+msgid "job %d of %d, "
+msgstr ""
+
+#, c-format
+msgid "pass %d (subtitle scan) of %d, "
+msgstr ""
+
+#, c-format
+msgid "pass %d of %d, "
+msgstr ""
+
+#, c-format
+msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
+msgstr ""
+
+#, c-format
+msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
+msgstr ""
+
+#, c-format
+msgid "Encoding: %s%s%.2f %%"
+msgstr ""
+
+msgid "Searching for start time, "
+msgstr ""
+
+msgid "Scanning..."
+msgstr "Scansione..."
+
+#, c-format
+msgid "Scanning title %d of %d..."
+msgstr ""
+
+#, c-format
+msgid "Scanning title %d of %d preview %d..."
+msgstr ""
+
+msgid "Source"
+msgstr ""
+
+msgid "Choose Video Source"
+msgstr "Seleziona sorgente video"
+
+msgid "Paused"
+msgstr ""
+
+msgid "Encode Done!"
+msgstr ""
+
+msgid "Encode Canceled."
+msgstr ""
+
+msgid "Encode Failed."
+msgstr ""
+
+msgid "Muxing: This may take a while..."
+msgstr ""
+
+msgid "Encode Complete"
+msgstr ""
+
+msgid "HandBrake"
+msgstr ""
+
+msgid "Updating preview\n"
+msgstr ""
+
+msgid "Error while reading activity from pipe"
+msgstr ""
+
+msgid "Suspend"
+msgstr ""
+
+#, c-format
+msgid "Suspend failed: %s"
+msgstr ""
+
+msgid "Suspend failed"
+msgstr ""
+
+msgid "CanShutdown"
+msgstr ""
+
+#, c-format
+msgid "CanShutdown failed: %s"
+msgstr ""
+
+msgid "CanShutdown failed"
+msgstr ""
+
+msgid "Shutdown"
+msgstr ""
+
+#, c-format
+msgid "Shutdown failed: %s"
+msgstr ""
+
+msgid "Shutdown failed"
+msgstr ""
+
+msgid "Encoding"
+msgstr ""
+
+#, c-format
+msgid "Inhibit failed: %s"
+msgstr ""
+
+msgid "Inhibit failed"
+msgstr ""
+
+msgid "UnInhibit"
+msgstr ""
+
+#, c-format
+msgid "UnInhibit failed: %s"
+msgstr ""
+
+msgid "UnInhibit failed"
+msgstr ""
+
+msgid "Uninhibit"
+msgstr ""
+
+#, c-format
+msgid "press %d %d"
+msgstr ""
+
+#, c-format
+msgid ""
+"Invalid Settings:\n"
+"%s"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr ""
+
+#, c-format
+msgid "HandBrake %s/%s is now available (you have %s/%d)."
+msgstr ""
+
+msgid "Put down that cocktail, Your HandBrake queue is done!"
+msgstr ""
+
+msgid "Your encode is complete."
+msgstr ""
+
+msgid "Shutting down the computer"
+msgstr ""
+
+msgid "Putting computer to sleep"
+msgstr ""
+
+msgid "Quiting Handbrake"
+msgstr ""
+
+msgid "Bottom"
+msgstr ""
+
+#, c-format
+msgid "open failed: %s\n"
+msgstr ""
+
+msgid "No key for dictionary item"
+msgstr ""
+
+msgid "Invalid container type. This shouldn't happen"
+msgstr ""
+
+#, c-format
+msgid "%s:missing a requried attribute"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [-I <inc path>] <in resource list> <out resource plist>\n"
+"Summary:\n"
+" Creates a resource plist from a resource list\n"
+"Options:\n"
+" I - Include path to search for files\n"
+" <in resource list> Input resources file\n"
+" <out resource plist> Output resources plist file\n"
+msgstr ""
+
+msgid ""
+"The language this text is in, as an ISO code. Pango can use this as a hint "
+"when rendering the text. If you don't understand this parameter, you "
+"probably don't need it"
+msgstr ""
+
+msgid ""
+"The preferred place to ellipsize the string, if the cell renderer does not "
+"have enough room to display the entire string"
+msgstr ""
+
+msgid ""
+"How to break the string into multiple lines, if the cell renderer does not "
+"have enough room to display the entire string"
+msgstr ""
+
+#, c-format
+msgid "Failed to set text from markup due to error parsing markup: %s"
+msgstr ""
+
+#, c-format
+msgid "Don't know color `%s'"
+msgstr ""
+
+msgid "_Open"
+msgstr ""
+
+msgid "_Cancel"
+msgstr ""
+
+msgid "_Save"
+msgstr "_Salva"
+
+msgid ""
+"Render the subtitle over the video.\n"
+"\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr ""
+
+msgid "Burned In"
+msgstr ""
+
+msgid ""
+"Set the default output subtitle track.\n"
+"\n"
+"Most players will automatically display this\n"
+"subtitle track whenever the video is played.\n"
+"\n"
+"This is useful for creating a \"forced\" track\n"
+"in your output."
+msgstr ""
+
+msgid "Default"
+msgstr "Default"
+
+msgid ""
+"Use only subtitles that have been flagged\n"
+"as forced in the source subtitle track\n"
+"\n"
+"\"Forced\" subtitles are usually used to show\n"
+"subtitles during scenes where someone is speaking\n"
+"a foreign language."
+msgstr ""
+
+msgid "Forced Only"
+msgstr "Solo forzato"
+
+msgid ""
+"Add (or subtract) an offset (in milliseconds)\n"
+"to the start of the SRT subtitle track.\n"
+"\n"
+"Often, the start of an external SRT file\n"
+"does not coincide with the start of the video.\n"
+"This setting allows you to synchronize the files."
+msgstr ""
+
+msgid "SRT Offset"
+msgstr "SRT Offset"
+
+msgid ""
+"The source subtitle track\n"
+"\n"
+"You can choose any of the subtitles\n"
+"recognized in your source file.\n"
+"\n"
+"In addition, there is a special track option\n"
+"\"Foreign Audio Search\". This option will add\n"
+"an extra pass to the encode that searches for\n"
+"subtitles that may correspond to a foreign\n"
+"language scene. This option is best used in\n"
+"conjunction with the \"Forced\" option."
+msgstr ""
+
+msgid "Track"
+msgstr "Traccia"
+
+msgid "About HandBrake"
+msgstr "Info su HandBrake"
+
+msgid ""
+"Copyright © 2008 - 2013 John Stebbins\n"
+"Copyright © 2004 - 2013, HandBrake Devs"
+msgstr ""
+
+msgid ""
+"HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
+msgstr ""
+
+msgid "http://handbrake.fr"
+msgstr ""
+
+msgid ""
+"HandBrake 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.\n"
+"\n"
+"HandBrake 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.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+
+msgid "_Minimize/Maximize"
+msgstr "_Minimizza/Massimizza"
+
+msgid "_Pause Queue"
+msgstr "_Pausa coda"
+
+msgid "_Quit"
+msgstr ""
+
+msgid "_About"
+msgstr ""
+
+msgid "_File"
+msgstr "_File"
+
+msgid "_Source"
+msgstr "_Sorgente"
+
+msgid "Single _Title"
+msgstr "Titolo_Singlolo"
+
+msgid "_Destination"
+msgstr "_Destinazione"
+
+msgid "_Preferences"
+msgstr "_Preferenze"
+
+msgid "_Queue"
+msgstr "_Coda"
+
+msgid "S_top Queue"
+msgstr ""
+
+msgid "_Add"
+msgstr ""
+
+msgid "Add _Multiple"
+msgstr ""
+
+msgid "_Start"
+msgstr "_Inizia"
+
+msgid "_Pause"
+msgstr "_Pausa"
+
+msgid "_View"
+msgstr "_Visualizza"
+
+msgid "HandBrake For _Dumbies"
+msgstr ""
+
+msgid "_Show Presets"
+msgstr ""
+
+msgid "_Preview"
+msgstr ""
+
+msgid "_Activity Window"
+msgstr "Finestra _attività"
+
+msgid "Show _Queue"
+msgstr "Mostra _coda"
+
+msgid "_Presets"
+msgstr ""
+
+msgid "_Delete"
+msgstr ""
+
+msgid "_Make Default"
+msgstr "_Imposta come predefinito"
+
+msgid "_New Folder"
+msgstr ""
+
+msgid "_Export"
+msgstr "_Esporta"
+
+msgid "_Import"
+msgstr "_Importa"
+
+msgid "_Update Built-in Presets"
+msgstr ""
+
+msgid "_Help"
+msgstr "_Aiuto"
+
+msgid "_Guide"
+msgstr "_Guida"
+
+msgid "Start Encoding"
+msgstr "Inizia la codifica"
+
+msgid "Start"
+msgstr "Inizia"
+
+msgid "Pause Encoding"
+msgstr "Pausa la codifica"
+
+msgid "Pause"
+msgstr "Pausa"
+
+msgid "Add to Queue"
+msgstr "Aggiungi alla coda"
+
+msgid "Enqueue"
+msgstr ""
+
+msgid "Show Queue"
+msgstr "Mostra coda"
+
+msgid "Queue"
+msgstr "Coda"
+
+msgid ""
+"Open Picture Settings and Preview window.\n"
+"Here you can adjust cropping, resolution, aspect ratio, and filters."
+msgstr ""
+
+msgid "Preview"
+msgstr "Anteprima"
+
+msgid "Show Activity Window"
+msgstr "Mostra finestra attività"
+
+msgid "Activity"
+msgstr "Attività"
+
+msgid "Source:"
+msgstr "Sorgente:"
+
+msgid "None"
+msgstr "Vuoto"
+
+msgid "Title:"
+msgstr "Titolo:"
+
+msgid ""
+"Set the title to encode.\n"
+"By default the longest title is chosen.\n"
+"This is often the feature title of a DVD."
+msgstr ""
+
+msgid "Angle:"
+msgstr "Angolo:"
+
+msgid "For multi-angle DVD's, select the desired angle to encode."
+msgstr ""
+
+msgid "Reset All Titles"
+msgstr ""
+
+msgid "Apply current settings to all titles"
+msgstr ""
+
+msgid "Range of title to encode. Can be chapters, seconds, or frames."
+msgstr ""
+
+msgid "Set the first chapter to encode."
+msgstr "Imposta il primo capitolo da codificare."
+
+msgid "through"
+msgstr ""
+
+msgid "Set the last chapter to encode."
+msgstr "Imposta l'ultimo capitolo da codificare."
+
+msgid "Duration:"
+msgstr "Durata:"
+
+msgid "Destination"
+msgstr ""
+
+msgid "File:"
+msgstr "File:"
+
+msgid "Destination filename for your encode."
+msgstr ""
+
+msgid "Destination directory for your encode."
+msgstr ""
+
+msgid "Destination Directory"
+msgstr "Cartella di destinazione"
+
+msgid "Format:"
+msgstr "Format:"
+
+msgid "Format to mux encoded tracks to."
+msgstr ""
+
+msgid "iPod 5G Support"
+msgstr "Supporto iPod 5G"
+
+msgid "Add iPod Atom needed by some older iPods."
+msgstr ""
+
+msgid "Web optimized"
+msgstr "Ottimizzato per il web"
+
+msgid ""
+"Optimize the layout of the MP4 file for progressive download.\n"
+"This allows a player to initiate playback before downloading the entire file."
+msgstr ""
+
+msgid "Large file (>4GB)"
+msgstr ""
+
+msgid "Presets List"
+msgstr ""
+
+msgid "Source Codec:"
+msgstr "Sorgente codec:"
+
+msgid "Dimensions:"
+msgstr "Dimensioni:"
+
+msgid "Aspect: "
+msgstr "Aspetto:"
+
+msgid "Frame Rate:"
+msgstr "Frame Rate:"
+
+msgid "Source Picture Parameters"
+msgstr ""
+
+msgid "Autocrop:"
+msgstr ""
+
+msgid "Crop:"
+msgstr ""
+
+msgid "Crop Dimensions:"
+msgstr ""
+
+msgid "Cropping"
+msgstr ""
+
+msgid "Scale Dimensions:"
+msgstr ""
+
+msgid "Optimal for Source:"
+msgstr ""
+
+msgid "Anamorphic:"
+msgstr "Anamorfico:"
+
+msgid "Scaling"
+msgstr ""
+
+msgid "Presentation Dimensions:"
+msgstr ""
+
+msgid "Summary"
+msgstr "Sommario"
+
+msgid "Left Crop"
+msgstr ""
+
+msgid "Top Crop"
+msgstr ""
+
+msgid "Bottom Crop"
+msgstr ""
+
+msgid "Right Crop"
+msgstr ""
+
+msgid "Auto Crop"
+msgstr ""
+
+msgid "Automatically crop black borders around edges of the video."
+msgstr ""
+
+msgid "Loose Crop"
+msgstr ""
+
+msgid ""
+"When picture settings require that the image\n"
+"dimensions be rounded to some multiple number\n"
+"of pixels, this setting will crop a few extra pixels\n"
+"instead of doing exact cropping and then scaling to\n"
+"the required multiple."
+msgstr ""
+
+msgid "width:"
+msgstr ""
+
+msgid ""
+"This is the width that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+
+msgid "height:"
+msgstr ""
+
+msgid ""
+"This is the height that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+
+msgid "Optimal for source"
+msgstr ""
+
+msgid ""
+"If enabled, select the 'optimal' storage resolution.\n"
+"This will be the resolution that most closely matches the source resolution after cropping."
+msgstr ""
+
+msgid "Alignment:"
+msgstr "Allineamento:"
+
+msgid ""
+"Align storage dimensions to multiples of this value.\n"
+"\n"
+"This setting is only necessary for compatibility with some devices.\n"
+"You should use 2 unless you experience compatibility issues."
+msgstr ""
+
+msgid "Storage Geometry"
+msgstr ""
+
+msgid ""
+"This is the display width. It is the result of scaling the storage "
+"dimensions by the pixel aspect."
+msgstr ""
+
+msgid "Pixel Aspect:"
+msgstr "Aspetto pixel:"
+
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+
+msgid "Keep Aspect"
+msgstr "Mantieni aspetti"
+
+msgid ""
+"If enabled, the original display aspect of the source will be maintained."
+msgstr ""
+
+msgid "Display Aspect:"
+msgstr ""
+
+msgid "Display Geometry"
+msgstr ""
+
+msgid "Grayscale"
+msgstr "Scala di grigio"
+
+msgid "If enabled, filter colour components out of video."
+msgstr ""
+
+msgid "Deblock:"
+msgstr ""
+
+msgid ""
+"The deblocking filter removes a common type of compression artifact.\n"
+"If your source exhibits 'blockiness', this filter may help clean it up."
+msgstr ""
+
+msgid "Denoise Filter:"
+msgstr ""
+
+msgid ""
+"Denoise filtering reduces or removes the appearance of noise and grain.\n"
+"Film grain and other types of high frequency noise are difficult to compress.\n"
+"Using this filter on such sources can result in smaller file sizes."
+msgstr ""
+
+msgid "Denoise Preset:"
+msgstr ""
+
+msgid "Denoise Tune:"
+msgstr ""
+
+msgid ""
+"Custom denoise filter string format\n"
+"\n"
+"SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
+msgstr ""
+
+msgid "Detelecine:"
+msgstr ""
+
+msgid ""
+"This filter removes 'combing' artifacts that are the result of telecining.\n"
+"\n"
+"Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps."
+msgstr ""
+
+msgid ""
+"Custom detelecine filter string format\n"
+"\n"
+"JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
+msgstr ""
+
+msgid "Decomb"
+msgstr ""
+
+msgid ""
+"Choose decomb or deinterlace filter options.\n"
+"\n"
+"The decomb filter selectively deinterlaces frames that appear to be interlaced.\n"
+"This will preserve quality in frames that are not interlaced.\n"
+"\n"
+"The classic deinterlace filter is applied to all frames.\n"
+"Frames that are not interlaced will suffer some quality degradation."
+msgstr ""
+
+msgid "Deinterlace"
+msgstr ""
+
+msgid "Decomb:"
+msgstr ""
+
+msgid ""
+"The decomb filter selectively deinterlaces frames that appear to be interlaced.\n"
+"This will preserve quality in frames that are not interlaced."
+msgstr ""
+
+msgid ""
+"Custom decomb filter string format\n"
+"\n"
+"Mode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:\n"
+"BlockHeight:MagnitudeThres:VarianceThres:LaplacianThresh:DilationThresh:\n"
+"ErosionThresh:NoiseThresh:MaxSearchDistance:PostProcessing:Parity"
+msgstr ""
+
+msgid "Deinterlace:"
+msgstr ""
+
+msgid ""
+"The classic deinterlace filter is applied to all frames.\n"
+"Frames that are not interlaced will suffer some quality degradation."
+msgstr ""
+
+msgid ""
+"Custom deinterlace filter string format\n"
+"\n"
+"YadifMode:YadifParity:McdintMode:McdeintQp"
+msgstr ""
+
+msgid "Filters"
+msgstr ""
+
+msgid "Picture"
+msgstr ""
+
+msgid "Video Encoder:"
+msgstr ""
+
+msgid "Available video encoders."
+msgstr ""
+
+msgid "Framerate:"
+msgstr "Framerate:"
+
+msgid ""
+"Output framerate.\n"
+"\n"
+"'Same as source' is recommended. If your source video has\n"
+"a variable framerate, 'Same as source' will preserve it."
+msgstr ""
+
+msgid "Constant Framerate"
+msgstr "Framerate costante"
+
+msgid "Enables constant framerate output."
+msgstr ""
+
+msgid "Peak Framerate (VFR)"
+msgstr ""
+
+msgid ""
+"Enables variable framerate output with a peak\n"
+"rate determined by the framerate setting.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr ""
+
+msgid "Variable Framerate"
+msgstr "Framerate variabile"
+
+msgid ""
+"Enables variable framerate output.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr ""
+
+msgid ""
+"Set the desired quality factor.\n"
+"The encoder targets a certain quality.\n"
+"The scale used by each video encoder is different.\n"
+"\n"
+"x264's scale is logarithmic and lower values correspond to higher quality.\n"
+"So small decreases in value will result in progressively larger increases\n"
+"in the resulting file size. A value of 0 means lossless and will result\n"
+"in a file size that is larger than the original source, unless the source\n"
+"was also lossless.\n"
+"\n"
+"FFMpeg's and Theora's scale is more linear.\n"
+"These encoders do not have a lossless mode."
+msgstr ""
+
+msgid "Constant Quality:"
+msgstr ""
+
+msgid "Bitrate (kbps): "
+msgstr "Bitrate (kbps): "
+
+msgid ""
+"Set the average bitrate.\n"
+"\n"
+"The instantaneous bitrate can be much higher or lower at any point in time.\n"
+"But the average over a long duration will be the value set here. If you need\n"
+"to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings."
+msgstr ""
+
+msgid "2-Pass Encoding"
+msgstr ""
+
+msgid ""
+"Perform 2 Pass Encoding.\n"
+"\n"
+"The 'Bitrate' option is prerequisite. During the 1st pass, statistics about\n"
+"the video are collected. Then in the second pass, those statistics are used\n"
+"to make bitrate allocation decisions."
+msgstr ""
+
+msgid "Turbo First Pass"
+msgstr ""
+
+msgid ""
+"During the 1st pass of a 2 pass encode, use settings that speed things "
+"along."
+msgstr ""
+
+msgid "Use Advanced Options"
+msgstr "Usa opzioni avanzate"
+
+msgid ""
+"Use advanced options Tab for x264 settings.\n"
+"\n"
+"Use at your own risk!"
+msgstr ""
+
+msgid "Preset:"
+msgstr ""
+
+msgid ""
+"Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
+"\n"
+"This establishes your default encoder settings.\n"
+"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"You should generally set this option to the slowest you can bear since slower\n"
+"settings will result in better quality or smaller files."
+msgstr ""
+
+msgid "Tune:"
+msgstr ""
+
+msgid ""
+"Tune settings to optimize for common scenarios.\n"
+"\n"
+"This can improve effeciency for particular source characteristics or set\n"
+"characteristics of the output file. Changes will be applied after the\n"
+"preset but before all other parameters."
+msgstr ""
+
+msgid "Fast Decode"
+msgstr ""
+
+msgid ""
+"Reduce decoder CPU usage.\n"
+"\n"
+"Set this if your device is struggling to play the output (dropped frames)."
+msgstr ""
+
+msgid "Zero Latency"
+msgstr ""
+
+msgid ""
+"Minimize latency between input to encoder and output of decoder.\n"
+"\n"
+"This is useful for broadcast of live streams.\n"
+"\n"
+"Since HandBrake is not suitable for live stream broadcast purposes,\n"
+"this setting is of little value here."
+msgstr ""
+
+msgid "Profile:"
+msgstr ""
+
+msgid ""
+"Sets and ensures compliance with the specified profile.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+
+msgid "Level:"
+msgstr ""
+
+msgid ""
+"Sets and ensures compliance with the specified level.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+
+msgid "More Settings:"
+msgstr ""
+
+msgid ""
+"Additional encoder settings.\n"
+"\n"
+"Colon separated list of encoder options."
+msgstr ""
+
+msgid "Video"
+msgstr "Video"
+
+msgid "Selection Behavior:"
+msgstr ""
+
+msgid "Remove"
+msgstr ""
+
+msgid "Available Languages"
+msgstr ""
+
+msgid "Selected Languages"
+msgstr ""
+
+msgid "Use only first encoder for secondary audio"
+msgstr ""
+
+msgid ""
+"Only the primary audio track will be encoded with the full encoder list.\n"
+"All other secondary audio output tracks will be encoded with first encoder only."
+msgstr ""
+
+msgid "Auto Passthru:"
+msgstr ""
+
+msgid "MP3"
+msgstr ""
+
+msgid ""
+"Enable this if your playback device supports MP3.\n"
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "AAC"
+msgstr ""
+
+msgid ""
+"Enable this if your playback device supports AAC.\n"
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "AC-3"
+msgstr ""
+
+msgid ""
+"Enable this if your playback device supports AC-3.\n"
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "DTS"
+msgstr ""
+
+msgid ""
+"Enable this if your playback device supports DTS.\n"
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "DTS-HD"
+msgstr ""
+
+msgid ""
+"Enable this if your playback device supports DTS-HD.\n"
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "Passthru Fallback:"
+msgstr ""
+
+msgid ""
+"Set the audio codec to encode with when a suitable track can not be found "
+"for audio passthru."
+msgstr ""
+
+msgid "Audio Encoder Settings:"
+msgstr ""
+
+msgid "Encoder"
+msgstr ""
+
+msgid "Bitrate/Quality"
+msgstr ""
+
+msgid "Mixdown"
+msgstr ""
+
+msgid "Samplerate"
+msgstr ""
+
+msgid "Gain"
+msgstr ""
+
+msgid "Gain:"
+msgstr ""
+
+msgid "DRC"
+msgstr ""
+
+msgid "Audio Defaults"
+msgstr ""
+
+msgid "Add new audio settings to the list"
+msgstr ""
+
+msgid "Add All"
+msgstr ""
+
+msgid "Add all audio tracks to the list"
+msgstr ""
+
+msgid "Reload Defaults"
+msgstr ""
+
+msgid "Reload all audio settings from defaults"
+msgstr ""
+
+msgid "Audio List"
+msgstr ""
+
+msgid "Preferred Language: None"
+msgstr ""
+
+msgid "Add Foreign Audio Search Pass"
+msgstr ""
+
+msgid ""
+"Add \"Foreign Audio Search\" when the default audio track is your preferred language.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them."
+msgstr ""
+
+msgid "Add subtitle track if default audio is foreign"
+msgstr ""
+
+msgid ""
+"When the default audio track is not your preferred language, add a subtitle "
+"track."
+msgstr ""
+
+msgid "Add Closed Captions when available"
+msgstr ""
+
+msgid ""
+"Closed captions are text subtitles that can be added to any container as a "
+"soft subtitle track (not burned)"
+msgstr ""
+
+msgid "Subtitle Defaults"
+msgstr ""
+
+msgid "Add new subtitle settings to the list"
+msgstr ""
+
+msgid "Add all subtitle tracks to the list"
+msgstr ""
+
+msgid "Reload all subtitle settings from defaults"
+msgstr ""
+
+msgid "Subtitle List"
+msgstr ""
+
+msgid "Reference Frames:"
+msgstr ""
+
+msgid ""
+"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
+"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
+"\n"
+"Note that many hardware devices have limitations on the number of supported reference\n"
+"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
+"you're absolutely sure you know what you're doing!"
+msgstr ""
+
+msgid "Maximum B-Frames:"
+msgstr ""
+
+msgid ""
+"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
+"\n"
+"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
+"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
+"values.\n"
+"\n"
+"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
+msgstr ""
+
+msgid "Pyramidal B-Frames:"
+msgstr ""
+
+msgid ""
+"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
+"of B-frames, allowing B-frames to reference each other to improve compression.\n"
+"\n"
+"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
+msgstr ""
+
+msgid "Weighted P-Frames:"
+msgstr ""
+
+msgid ""
+"Performs extra analysis to decide upon weighting parameters for each frame.\n"
+"\n"
+"This improves overall compression slightly and improves the quality of fades greatly.\n"
+"\n"
+"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
+"prediction to be disabled. Note that some devices and players, even those that support\n"
+"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
+"completely incompatible with it, for example."
+msgstr ""
+
+msgid "8x8 Transform"
+msgstr ""
+
+msgid ""
+"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
+"\n"
+"It improves compression by at least 5% at a very small speed cost and may\n"
+"provide an unusually high visual quality benefit compared to its compression\n"
+"gain. However, it requires High Profile, which many devices may not support."
+msgstr ""
+
+msgid "CABAC Entropy Encoding"
+msgstr ""
+
+msgid ""
+"After the encoder has done its work, it has a bunch of data that\n"
+"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
+"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
+"compresses significantly better (10-30%), especially at lower bitrates.\n"
+"\n"
+"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
+"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
+msgstr ""
+
+msgid "Encoding Features"
+msgstr ""
+
+msgid "Motion Est. Method:"
+msgstr ""
+
+msgid ""
+"Controls the motion estimation method.\n"
+"\n"
+"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
+"A better motion search method improves compression at the cost of speed.\n"
+"\n"
+"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
+"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
+"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
+"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
+"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
+msgstr ""
+
+msgid "Subpel ME &amp; Mode:"
+msgstr ""
+
+msgid "Motion Est. Range:"
+msgstr ""
+
+msgid ""
+"This is the distance x264 searches from its initial guess at the\n"
+"motion of a block in order to try to find its actual motion.\n"
+"\n"
+"The default is fine for most content, but extremely high motion video,\n"
+"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
+"a high speed cost."
+msgstr ""
+
+msgid "Adaptive Direct Mode:"
+msgstr ""
+
+msgid ""
+"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
+"\n"
+"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
+"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
+"adaptively select which is better for each particular frame."
+msgstr ""
+
+msgid "Adaptive B-Frames:"
+msgstr ""
+
+msgid "Partitions:"
+msgstr ""
+
+msgid ""
+"Mode decision picks from a variety of options to make its decision:\n"
+"this option chooses what options those are.\n"
+"\n"
+"Fewer partitions to check means faster encoding, at the cost of worse\n"
+"decisions, since the best option might have been one that was turned off."
+msgstr ""
+
+msgid "Trellis:"
+msgstr ""
+
+msgid ""
+"Trellis fine-tunes the rounding of transform coefficients to\n"
+"squeeze out 3-5% more compression at the cost of some speed.\n"
+"\n"
+"\"Always\" uses trellis not only during the main encoding process, but also\n"
+"during analysis, which improves compression even more, albeit at great speed cost.\n"
+"\n"
+"Trellis costs more speed at higher bitrates and requires CABAC."
+msgstr ""
+
+msgid "Analysis"
+msgstr "Analisi"
+
+msgid "Adaptive Quantization Strength:"
+msgstr ""
+
+msgid ""
+"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
+"\n"
+"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
+msgstr ""
+
+msgid "Psychovisual Rate Distortion:"
+msgstr ""
+
+msgid ""
+"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
+"vision to dramatically improve apparent detail and sharpness.\n"
+"The effect can be made weaker or stronger by adjusting the strength.\n"
+"Being an RD algorithm, it requires mode decision to be at least \"6\"."
+msgstr ""
+
+msgid "Psychovisual Trellis:"
+msgstr ""
+
+msgid ""
+"Psychovisual trellis is an experimental algorithm to further\n"
+"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
+"\n"
+"Recommended values are around 0.2, though higher values may help for very\n"
+"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
+"and other sharp-edged graphics."
+msgstr ""
+
+msgid "Deblocking: "
+msgstr ""
+
+msgid "No DCT Decimate"
+msgstr ""
+
+msgid ""
+"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
+"be better used for some other purpose in the video. However, this can\n"
+"sometimes have slight negative effects on retention of subtle grain and\n"
+"dither.\n"
+"\n"
+"Don't touch this unless you're having banding issues or other such cases\n"
+"where you are having trouble keeping fine noise."
+msgstr ""
+
+msgid "Psychovisual"
+msgstr ""
+
+msgid ""
+"Your selected options will appear here.\n"
+"You can edit these and add additional options.\n"
+"\n"
+"Default values will not be shown. The defaults are:\n"
+"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
+"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
+"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
+"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
+"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
+msgstr ""
+
+msgid "Current x264 Advanced Option String"
+msgstr ""
+
+msgid "Advanced Video"
+msgstr ""
+
+msgid "Chapter Markers"
+msgstr ""
+
+msgid "Add chapter markers to output file."
+msgstr ""
+
+msgid "Chapters"
+msgstr "Capitoli"
+
+msgid "Actors:"
+msgstr "Attori:"
+
+msgid "Director:"
+msgstr "Regista:"
+
+msgid "Release Date:"
+msgstr "Data di rilascio:"
+
+msgid "Comment:"
+msgstr "Commento:"
+
+msgid "Genre:"
+msgstr "Genere:"
+
+msgid "Description:"
+msgstr "Descrizione:"
+
+msgid "Plot:"
+msgstr ""
+
+msgid "Tags"
+msgstr "Tag"
+
+msgid "Settings"
+msgstr ""
+
+msgid "Edit"
+msgstr "Modifica"
+
+msgid "Reload"
+msgstr ""
+
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+
+msgid "Reload All"
+msgstr ""
+
+msgid ""
+"Mark all queue entries as pending.\n"
+"Resets all queue jobs to pending and ready to run again."
+msgstr ""
+
+msgid "Select All"
+msgstr ""
+
+msgid "Mark all titles for adding to the queue"
+msgstr ""
+
+msgid "Clear All"
+msgstr ""
+
+msgid "Unmark all titles"
+msgstr ""
+
+msgid "Destination files OK. No duplicates detected."
+msgstr ""
+
+msgid "Preferences"
+msgstr ""
+
+msgid "Automatically check for updates"
+msgstr ""
+
+msgid "When all encodes are complete"
+msgstr ""
+
+msgid "Use automatic naming (uses modified source name)"
+msgstr ""
+
+msgid "Auto-Name Template"
+msgstr ""
+
+msgid ""
+"Available Options: {source} {title} {chapters} {date} {time} {quality} "
+"{bitrate}"
+msgstr ""
+
+msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
+msgstr ""
+
+msgid "Number of previews"
+msgstr "Numero di anteprime"
+
+msgid "Filter short titles (seconds)"
+msgstr ""
+
+msgid "Show system tray icon"
+msgstr ""
+
+msgid "General"
+msgstr "Generale"
+
+msgid "Constant Quality fractional granularity"
+msgstr ""
+
+msgid "Use dvdnav (instead of libdvdread)"
+msgstr ""
+
+msgid "Put individual encode logs in same location as movie"
+msgstr ""
+
+msgid "Activity Log Verbosity Level"
+msgstr ""
+
+msgid "Activity Log Longevity"
+msgstr ""
+
+msgid "Scale down High Definition previews"
+msgstr ""
+
+msgid "Automatically Scan DVD when loaded"
+msgstr ""
+
+msgid "Scans the DVD whenever a new disc is loaded"
+msgstr ""
+
+msgid "Hide Advanced Video Options Tab"
+msgstr ""
+
+msgid ""
+"Use advanced video options at your own risk.\n"
+"We recommend that you use the controls available\n"
+"on the Video tab instead."
+msgstr ""
+
+msgid "Delete completed jobs from queue"
+msgstr ""
+
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+
+msgid "Allow Tweaks"
+msgstr ""
+
+msgid "Allow HandBrake For Dummies"
+msgstr ""
+
+msgid "Advanced"
+msgstr "Avanzato"
+
+msgid "Folder Name:"
+msgstr "Nome cartella:"
+
+msgid "Description"
+msgstr ""
+
+msgid "Preset Name:"
+msgstr ""
+
+msgid "Custom Picture Dimensions"
+msgstr ""
+
+msgid "Maximum Width:"
+msgstr ""
+
+msgid "Enable maximum width limit."
+msgstr ""
+
+msgid ""
+"This is the maximum width that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source width is greater.\n"
+"Setting this to 0 means there is no maximum width."
+msgstr ""
+
+msgid "Maximum Height:"
+msgstr ""
+
+msgid "Enable maximum height limit."
+msgstr ""
+
+msgid ""
+"This is the maximum height that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source height is greater.\n"
+"Setting this to 0 means there is no maximum height."
+msgstr ""
+
+msgid "Select preview frames."
+msgstr ""
+
+msgid ""
+"Encode and play a short sequence of video starting from the current preview "
+"position."
+msgstr ""
+
+msgid "Duration:"
+msgstr "Durata:"
+
+msgid "Set the duration of the live preview in seconds."
+msgstr ""
+
+msgid "Show Crop"
+msgstr ""
+
+msgid "Show Cropped area of the preview"
+msgstr ""
+
+msgid "Fullscreen"
+msgstr "Tutto schermo"
+
+msgid "View Fullscreen Preview"
+msgstr ""
+
+msgid "Title Number:"
+msgstr ""
+
+msgid "Detected DVD devices:"
+msgstr ""
+
+msgid "Setting:"
+msgstr "Impostazioni:"
+
+msgid "Import SRT"
+msgstr "Importa SRT"
+
+msgid "Enable settings to import an SRT subtitle file"
+msgstr ""
+
+msgid "Embedded Subtitle List"
+msgstr ""
+
+msgid "Enable settings to select embedded subtitles"
+msgstr ""
+
+msgid "Language"
+msgstr ""
+
+msgid "Character Code"
+msgstr ""
+
+msgid "Offset (ms)"
+msgstr ""
+
+msgid ""
+"Set the language of this subtitle.\n"
+"This value will be used by players in subtitle menus."
+msgstr ""
+
+msgid ""
+"Set the character code used by the SRT file you are importing.\n"
+"\n"
+"SRTs come in all flavours of character sets.\n"
+"We translate the character set to UTF-8.\n"
+"The source's character code is needed in order to perform this translation."
+msgstr ""
+
+msgid "Select the SRT file to import."
+msgstr "Seleziona il file SRT da importare"
+
+msgid "Srt File"
+msgstr "File srt"
+
+msgid "Adjust the offset in milliseconds between video and SRT timestamps"
+msgstr ""
+
+msgid "Track"
+msgstr "Traccia"
+
+msgid "List of subtitle tracks available from your source."
+msgstr ""
+
+msgid "Forced Subtitles Only"
+msgstr ""
+
+msgid "Burn into video"
+msgstr ""
+
+msgid ""
+"Render the subtitle over the video.\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr ""
+
+msgid "Set Default Track"
+msgstr ""
+
+msgid "Source Track"
+msgstr ""
+
+msgid "List of audio tracks available from your source."
+msgstr ""
+
+msgid "Track Name:"
+msgstr "Nome traccia:"
+
+msgid ""
+"Set the audio track name.\n"
+"\n"
+"Players may use this in the audio selection list."
+msgstr ""
+
+msgid "Mix"
+msgstr "Mix"
+
+msgid "Sample Rate"
+msgstr ""
+
+msgid "Sample Rate:"
+msgstr ""
+
+msgid "Enable bitrate setting"
+msgstr ""
+
+msgid "Enable quality setting"
+msgstr ""
+
+msgid "Skip This Version"
+msgstr "Salta questa versione"
+
+msgid "Remind Me Later"
+msgstr "Ricorda dopo"
+
+msgid "A new version of HandBrake is available!"
+msgstr "Una nuova versione di HandBrake è disponibile!"
+
+msgid "HandBrake xxx is now available (you have yyy)."
+msgstr ""
+
+msgid "Release Notes"
+msgstr ""
+
+msgid "none"
+msgstr ""
+
+msgid "First Track Matching Selected Languages"
+msgstr ""
+
+msgid "All Tracks Matching Selected Languages"
+msgstr ""
+
+msgid "Chapters:"
+msgstr "Capitoli:"
+
+msgid "Seconds:"
+msgstr "Secondi:"
+
+msgid "Frames:"
+msgstr ""
+
+msgid "Do Nothing"
+msgstr ""
+
+msgid "Show Notification"
+msgstr "Mostra notifica"
+
+msgid "Quit Handbrake"
+msgstr "Chiudi Handbrake"
+
+msgid "Put Computer To Sleep"
+msgstr ""
+
+msgid "Shutdown Computer"
+msgstr ""
+
+msgid "Week"
+msgstr "Settimana"
+
+msgid "Year"
+msgstr "Anno"
+
+msgid "Immortal"
+msgstr "Immortale"
+
+msgid "Never"
+msgstr "Mai"
+
+msgid "Daily"
+msgstr "Giornalmente"
+
+msgid "Weekly"
+msgstr "Settimanalmente"
+
+msgid "Monthly"
+msgstr "Mensilmente"
+
+msgid "Month"
+msgstr ""
+
+msgid "Default"
+msgstr ""
+
+msgid "Fast"
+msgstr "Veloce"
+
+msgid "Bob"
+msgstr ""
+
+msgid "Slow"
+msgstr ""
+
+msgid "Slower"
+msgstr "Lento"
+
+msgid "NLMeans"
+msgstr ""
+
+msgid "HQDN3D"
+msgstr ""
+
+msgid "Ultralight"
+msgstr ""
+
+msgid "Light"
+msgstr ""
+
+msgid "Medium"
+msgstr "Medio"
+
+msgid "medium"
+msgstr ""
+
+msgid "Strong"
+msgstr "Forte"
+
+msgid "Film"
+msgstr ""
+
+msgid "Grain"
+msgstr ""
+
+msgid "High Motion"
+msgstr ""
+
+msgid "Animation"
+msgstr ""
+
+msgid "Spatial"
+msgstr "Spaziale"
+
+msgid "Temporal"
+msgstr "Temporale"
+
+msgid "Automatic"
+msgstr "Automatico"
+
+msgid "Optimal"
+msgstr "Ottimale"
+
+msgid "Normal"
+msgstr "Normale"
+
+msgid "Simple"
+msgstr "Semplice"
+
+msgid "Smart"
+msgstr "Intelligente"
+
+msgid "Diamond"
+msgstr "Diamante"
+
+msgid "Hexagon"
+msgstr "Esagono"
+
+msgid "Uneven Multi-Hexagon"
+msgstr ""
+
+msgid "Exhaustive"
+msgstr ""
+
+msgid "Hadamard Exhaustive"
+msgstr ""
+
+msgid "Some"
+msgstr ""
+
+msgid "All"
+msgstr "Tutti"
+
+msgid "Encode only"
+msgstr ""
+
+msgid "Always"
+msgstr "Sempre"
+
+msgid "Same as source"
+msgstr ""
+
+msgid "Same as source:"
+msgstr ""
+
+msgid "(NTSC Film)"
+msgstr ""
+
+msgid "(PAL Film/Video)"
+msgstr ""
+
+msgid "(NTSC Video)"
+msgstr ""
+
+#, c-format
+msgid "%d - Unknown Length"
+msgstr ""
+
+msgid "No Titles"
+msgstr "Nessun Titolo"
+
+msgid "No Audio"
+msgstr "Nessun audio"
+
+msgid "Foreign Audio Search"
+msgstr ""
+
+#, c-format
+msgid "Chapter %2d"
+msgstr ""
+
+#, c-format
+msgid "N/A"
+msgstr ""
+
+#, c-format
+msgid ""
+"Invalid Deinterlace Settings:\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Invalid Detelecine Settings:\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Invalid Decomb Settings:\n"
+"\n"
+"%s\n"
+msgstr ""
+
+msgid ""
+"Theora is not supported in the MP4 container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, FFMPEG will be chosen for you."
+msgstr ""
+
+msgid "Continue"
+msgstr ""
+
+msgid "No title found.\n"
+msgstr ""
+
+msgid ""
+"Only one subtitle may be burned into the video.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+msgid ""
+"Srt file does not exist or not a regular file.\n"
+"\n"
+"You should choose a valid file.\n"
+"If you continue, this subtitle will be ignored."
+msgstr ""
+
+msgid ""
+"The source does not support Pass-Thru.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s is not supported in the %s container.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#, c-format
+msgid ""
+"The source audio does not support %s mixdown.\n"
+"\n"
+"You should choose a different mixdown.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "Signal handler (%s) not found"
+msgstr ""
+
+msgid "Index"
+msgstr "Indice"
+
+msgid "Duration"
+msgstr "Durata"
+
+msgid "Title"
+msgstr "Titolo"
+
+msgid "Done\n"
+msgstr ""
+
+msgid "DATA"
+msgstr ""
+
+msgid "Job Information"
+msgstr ""
+
+msgid "Track Information"
+msgstr ""
+
+msgid "Preset Name"
+msgstr ""
+
+msgid "The device or file to encode"
+msgstr ""
+
+msgid "The preset values to use for encoding"
+msgstr ""
+
+msgid "Spam a lot"
+msgstr ""
+
+msgid "- Transcode media formats"
+msgstr ""
+
+msgid "Globals"
+msgstr ""
+
+msgid "Presets"
+msgstr ""
+
+msgid "Folder"
+msgstr ""
+
+#, c-format
+msgid "%s path: (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s indices: len %d"
+msgstr ""
+
+msgid "Type"
+msgstr ""
+
+msgid "Failed to find parent folder when adding child."
+msgstr ""
+
+msgid "Failed to find parent folder while adding child."
+msgstr ""
+
+#, c-format
+msgid "Can't map language value: (%s)"
+msgstr ""
+
+#, c-format
+msgid "Can't map value: (%s)"
+msgstr ""
+
+msgid "Subtitles"
+msgstr ""
+
+#, c-format
+msgid "Superfluous tunes! %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s: Folder already exists.\n"
+"You can not replace it with a preset."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s: Preset already exists.\n"
+"You can not replace it with a folder."
+msgstr ""
+
+msgid "Import Preset"
+msgstr ""
+
+msgid "All (*)"
+msgstr "Tutti (*)"
+
+msgid "Presets (*.plist)"
+msgstr ""
+
+msgid "Export Preset"
+msgstr ""
+
+#, c-format
+msgid ""
+"Confirm deletion of %s:\n"
+"\n"
+"%s"
+msgstr ""
+
+msgid "No selection??? Perhaps unselected."
+msgstr ""
+
+msgid "Couldn't create native window for GstXOverlay. Disabling live preview."
+msgstr ""
+
+msgid "Couldn't initialize gstreamer. Disabling live preview."
+msgstr ""
+
+#, c-format
+msgid "Gstreamer Error: %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Missing GStreamer plugin\n"
+"Audio or Video may not play as expected\n"
+"\n"
+"%s"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
+msgid "Done"
+msgstr "Fatto"
+
+msgid "Seconds"
+msgstr "Secondi"
+
+msgid "Frames"
+msgstr ""
+
+#, c-format
+msgid ""
+"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
+" %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"<big>%s</big> (Title %d, %s %d through %d) --> %s"
+msgstr ""
+
+#, c-format
+msgid "Modified Preset Based On: %s\n"
+msgstr ""
+
+#, c-format
+msgid "Preset: %s\n"
+msgstr ""
+
+#, c-format
+msgid "Format: %s Container\n"
+msgstr ""
+
+msgid "Container Options:"
+msgstr ""
+
+#, c-format
+msgid "%sChapter Markers"
+msgstr ""
+
+#, c-format
+msgid "%siPod 5G Support"
+msgstr ""
+
+#, c-format
+msgid "%sWeb Optimized"
+msgstr ""
+
+#, c-format
+msgid "%sLarge File Size (>4GB)"
+msgstr ""
+
+#, c-format
+msgid "Destination: %s\n"
+msgstr ""
+
+msgid "(Aspect Preserved)"
+msgstr ""
+
+msgid "(Aspect Lost)"
+msgstr ""
+
+msgid "(Anamorphic)"
+msgstr ""
+
+msgid "(Custom Anamorphic)"
+msgstr ""
+
+msgid "Picture: "
+msgstr ""
+
+#, c-format
+msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
+msgstr ""
+
+#, c-format
+msgid ", Display %d x %d"
+msgstr ""
+
+msgid "Filters:"
+msgstr ""
+
+#, c-format
+msgid "%sDetelecine"
+msgstr ""
+
+#, c-format
+msgid "%sDecomb"
+msgstr ""
+
+#, c-format
+msgid "%sDeinterlace"
+msgstr ""
+
+#, c-format
+msgid "%sDenoise Filter %s:"
+msgstr ""
+
+#, c-format
+msgid "%sDeblock: %d"
+msgstr ""
+
+#, c-format
+msgid "%sGrayscale"
+msgstr ""
+
+#, c-format
+msgid "Video: %s"
+msgstr ""
+
+#, c-format
+msgid ", Framerate: %s %s"
+msgstr ""
+
+#, c-format
+msgid ", Framerate: Peak %s (may be lower)"
+msgstr ""
+
+#, c-format
+msgid ", Framerate: %s (constant frame rate)"
+msgstr ""
+
+msgid "Error"
+msgstr "Errore"
+
+msgid "Bitrate:"
+msgstr ""
+
+msgid "Turbo 1st Pass: On\n"
+msgstr ""
+
+#, c-format
+msgid "Video Options: Preset: %s"
+msgstr ""
+
+msgid " - Tune: "
+msgstr ""
+
+#, c-format
+msgid " - Profile: %s"
+msgstr ""
+
+#, c-format
+msgid " - Level: %s"
+msgstr ""
+
+#, c-format
+msgid "Advanced Options: %s\n"
+msgstr ""
+
+msgid "Audio: "
+msgstr ""
+
+#, c-format
+msgid "Audio Tracks: %d"
+msgstr ""
+
+#, c-format
+msgid "Bitrate: %d"
+msgstr ""
+
+#, c-format
+msgid "%s --> Encoder: %s"
+msgstr ""
+
+#, c-format
+msgid "%s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
+msgstr ""
+
+msgid "Subtitle: "
+msgstr ""
+
+#, c-format
+msgid "Subtitle Tracks: %d\n"
+msgstr ""
+
+msgid " (Force)"
+msgstr "(Forza)"
+
+msgid " (Burn)"
+msgstr ""
+
+msgid " (Default)"
+msgstr ""
+
+#, c-format
+msgid " %s (%s), %s, Offset (ms) %d%s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Another queued job has specified the same destination.\n"
+"Do you want to overwrite?"
+msgstr ""
+
+msgid "Overwrite"
+msgstr "Sovrascrivi"
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"This is not a valid directory."
+msgstr ""
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Can not read or write the directory."
+msgstr ""
+
+#, c-format
+msgid ""
+"Destination filesystem is almost full: %uM free\n"
+"\n"
+"Encode may be incomplete if you proceed.\n"
+msgstr ""
+
+msgid "Proceed"
+msgstr ""
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"File already exists.\n"
+"Do you want to overwrite?"
+msgstr ""
+
+msgid ""
+"Duplicate destination files detected.\n"
+"Duplicates will not be added to the queue."
+msgstr ""
+
+msgid "No Title"
+msgstr ""
+
+msgid ""
+"There is another title with the same destination file name.\n"
+"This title will not be added to the queue unless you change\n"
+"the output file name.\n"
+msgstr ""
+
+msgid "Stop"
+msgstr ""
+
+msgid "Stop Encoding"
+msgstr "Ferma la codifica"
+
+msgid "Resume"
+msgstr ""
+
+msgid "Resume Encoding"
+msgstr "Riprendi la codifica"
+
+msgid "_Start Queue"
+msgstr "_Avvia coda"
+
+msgid "_Resume Queue"
+msgstr "_Riprendi coda"
+
+msgid ""
+"You are currently encoding. What would you like to do?\n"
+"\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"You have %d unfinished job(s) in a saved queue.\n"
+"\n"
+"Would you like to reload them?"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+#, c-format
+msgid "Usage: %s infile [outfile]\n"
+msgstr ""
+
+#, c-format
+msgid "Attempt to set unknown widget type: %s\n"
+msgstr ""
+
+#, c-format
+msgid "No value found for %s\n"
+msgstr ""
+
+msgid "Attempt to set unknown widget type"
+msgstr ""
+
+#, c-format
+msgid "Failed to find widget for key: %s\n"
+msgstr ""
+
+#, c-format
+msgid "Offset: %dms"
+msgstr ""
+
+msgid "Burned Into Video"
+msgstr ""
+
+msgid "Passthrough"
+msgstr ""
+
+msgid "(Forced Subtitles Only)"
+msgstr ""
+
+msgid "(Default)"
+msgstr ""
+
+msgid "Error!"
+msgstr ""
+
+#, c-format
+msgid "Preferred Language: %s"
+msgstr ""
+
+#, c-format
+msgid "Add %s subtitle track if default audio is not %s"
+msgstr ""
+
+#, c-format
+msgid "Type %s"
+msgstr ""
+
+#, c-format
+msgid "Type %s value %s"
+msgstr ""
+
+#, c-format
+msgid "Type %s value %d"
+msgstr ""
+
+#, c-format
+msgid "Type %s value %<PRId64>"
+msgstr ""
+
+#, c-format
+msgid "Type %s value %f"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"%s\""
+msgstr ""
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"\""
+msgstr ""
+
+msgid "ERROR"
+msgstr ""
+
+msgid ""
+"Anamorphic Modes:\n"
+"<tt>\n"
+"None - Force pixel aspect ratio to 1:1.\n"
+"Loose - Align dimensions to chosen 'Alignment' value \n"
+" and pick pixel aspect ratio that preserves the\n"
+" original display aspect ratio\n"
+"Strict - Keep original source dimensions and pixel \n"
+" aspect ratio</tt>"
+msgstr ""
+
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr ""
+
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr ""

HandBrake-0.10.0.tar.bz2/gtk/po/ru.po Added

@@ -0,0 +1,2651 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# VictorR2007 <victorr2007@yandex.ru>, 2013-2014
+msgid ""
+msgstr ""
+"Project-Id-Version: HandBrake-0.10\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-10 21:39+0400\n"
+"PO-Revision-Date: 2014-10-14 23:26+0000\n"
+"Last-Translator: VictorR2007 <victorr2007@yandex.ru>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/handbrake/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgid "Off"
+msgstr "Вкл"
+
+msgid "Quality: "
+msgstr "Качество: "
+
+#, c-format
+msgid "Bitrate: %dkbps"
+msgstr "Битрейт: %dkbps"
+
+#, c-format
+msgid "Bitrate: %.4gkbps"
+msgstr "Битрейт: %.4gkbps"
+
+msgid "Passthrough"
+msgstr "Передача"
+
+#, c-format
+msgid ""
+"%s\n"
+"Gain: %s\n"
+"DRC: %s\n"
+"Track Name: %s"
+msgstr "%s\nУсиление: %s\nDRC: %s\nНазвание дорожки: %s"
+
+#, c-format
+msgid ""
+"%s\n"
+"Gain: %s\n"
+"DRC: %s"
+msgstr "%s\nУсиление: %s\nDRC: %s"
+
+msgid "Add"
+msgstr "Добавить"
+
+msgid ""
+"Add an audio encoder.\n"
+"Each selected source track will be encoded with all selected encoders."
+msgstr "Добавить аудио кодек.\nКаждая дорожка выбранного источника будет закодирована со всеми выбранными кодеками."
+
+msgid "Set the audio codec to encode this track with."
+msgstr "Установить аудио кодек для кодирования этой дорожки."
+
+msgid "Bitrate"
+msgstr "Битрейт"
+
+msgid "Quality"
+msgstr "Качество"
+
+msgid "Set the bitrate to encode this track with."
+msgstr "Установить битрейт для кодирования этой дорожки."
+
+msgid ""
+"Audio Quality:\n"
+"For encoders that support it, adjust the quality of the output."
+msgstr "Качество звука:\nДля выходного кодека, который поддерживают это, установить качество вывода."
+
+msgid "Set the mixdown of the output audio track."
+msgstr "Установить смешивание каналов выходной звуковой дорожки."
+
+msgid "Set the sample rate of the output audio track."
+msgstr "Установить частоту дискретизации дорожки вывода звука."
+
+msgid ""
+"Audio Gain:\n"
+"Adjust the amplification or attenuation of the output audio track."
+msgstr "Усиление звука: \nРегулирует усиление или ослабление звуковой дорожки вывода."
+
+msgid ""
+"Audio Gain: Adjust the amplification or attenuation of the output "
+"audio track."
+msgstr "Усиление звука: Регулирует усиление или ослабление звуковой дорожки вывода."
+
+msgid ""
+"Dynamic Range Compression:\n"
+"Adjust the dynamic range of the output audio track.\n"
+"For source audio that has a wide dynamic range,\n"
+"very loud and very soft sequences, DRC allows you\n"
+"to 'compress' the range by making loud sounds\n"
+"softer and soft sounds louder.\n"
+msgstr "Динамическое сжатие диапазона:\nУстанавливает динамический диапазон для звуковой дорожки вывода.\nДля источника звука, который имеет широкий динамический диапазон.\nОчень громкие и очень мягкие последовательности, DRC позволяет сжимать\nдиапазон, делая громкие разделы мягче и мягкие разделы громче.\n"
+
+msgid ""
+"Dynamic Range Compression: Adjust the dynamic range of the output audio track. \n"
+"\n"
+" For source audio that has a wide dynamic range (very loud and very soft sequences), DRC allows you to 'compress' the range by making loud sections softer and soft sections louder."
+msgstr "Динамическое сжатие диапазона: Устанавливает динамический диапазон для звуковой дорожки вывода. \n\n Для источника звука, который имеет широкий динамический диапазон (очень громкие и очень мягкие последовательности), DRC позволяет «сжимать» диапазон, делая громкие разделы мягче и мягкие разделы громче."
+
+msgid ""
+"Dynamic Range Compression: Adjust the dynamic range of the output audio track. \n"
+"\n"
+" For source audio that has a wide dynamic range (very loud and very soft sequences), DRC allows you to 'compress' the range by making loud sections softer and soft sections louder."
+msgstr "Динамическое сжатие диапазона: Устанавливает динамический диапазон для звуковой дорожки вывода. \n\n Для источника звука, который имеет широкий динамический диапазон (очень громкие и очень мягкие последовательности), DRC позволяет «сжимать» диапазон, делая громкие разделы мягче и мягкие разделы громче."
+
+msgid "Remove this audio encoder"
+msgstr "Удалить этот аудио кодек"
+
+msgid "Failed to find widget"
+msgstr "Не удалось найти виджет"
+
+#, c-format
+msgid "Failed to find dependent widget %s"
+msgstr "Failed to find dependent widget %s"
+
+msgid "Closing HandBrake will terminate encoding.\n"
+msgstr "Закрытие HandBrake прекратит кодирование.\n"
+
+msgid "{source}"
+msgstr "{Источник}"
+
+msgid "{title}"
+msgstr "{Название}"
+
+msgid "{chapters}"
+msgstr "{Главы}"
+
+msgid "{time}"
+msgstr "{Время}"
+
+msgid "{date}"
+msgstr "{Дата}"
+
+msgid "{bitrate}"
+msgstr "{Битрейт}"
+
+msgid "No Title Found"
+msgstr "Название не найдено"
+
+msgid "Not Selected"
+msgstr "Не выбрано"
+
+msgid "Scanning ..."
+msgstr "Сканирование…"
+
+msgid "Stop Scan"
+msgstr "Остановить сканирование"
+
+msgid "Choose Destination"
+msgstr "Выберите назначение"
+
+msgid "On"
+msgstr "Вкл"
+
+msgid "Strict"
+msgstr "Строгий"
+
+msgid "Loose"
+msgstr "Произвольно"
+
+msgid "Custom"
+msgstr "Другое"
+
+msgid "Unknown"
+msgstr "Неизвестно"
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s in %d seconds ..."
+msgstr "%s\n\n%s в %d секунды ..."
+
+#, c-format
+msgid "%sYour movie will be lost if you don't continue encoding."
+msgstr "%sВаш фильм будет потерян, если вы не продолжать кодировку."
+
+msgid "Cancel Current and Stop"
+msgstr "Отменить текущий и остановить"
+
+msgid "Cancel Current, Start Next"
+msgstr "Отменить текущий, начать следующий"
+
+msgid "Finish Current, then Stop"
+msgstr "Закончить текущий, затем остановить"
+
+msgid "Continue Encoding"
+msgstr "Продолжить кодирование"
+
+msgid "Custom "
+msgstr "Другое "
+
+msgid "Modified "
+msgstr "Изменён "
+
+#, c-format
+msgid "%s%sPreset: %s"
+msgstr "%s%sПредустановка: %s"
+
+#, c-format
+msgid "Handbrake Version: %s (%d)\n"
+msgstr "Версия Handbrake: %s (%d)\n"
+
+#, c-format
+msgid "%d encode(s) pending"
+msgstr "%d в ожидании кодирования"
+
+#, c-format
+msgid "job %d of %d, "
+msgstr "задание %d из %d, "
+
+#, c-format
+msgid "pass %d (subtitle scan) of %d, "
+msgstr "проход %d (сканирование субтитров) из %d, "
+
+#, c-format
+msgid "pass %d of %d, "
+msgstr "проход %d из %d, "
+
+#, c-format
+msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
+msgstr "Кодирование: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
+
+#, c-format
+msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
+msgstr "Кодирование: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
+
+#, c-format
+msgid "Encoding: %s%s%.2f %%"
+msgstr "Кодирование: %s%s%.2f %%"
+
+msgid "Searching for start time, "
+msgstr "Поиск времени начала, "
+
+msgid "Scanning..."
+msgstr "Сканирование…"
+
+#, c-format
+msgid "Scanning title %d of %d..."
+msgstr "Сканирование фильма %d из %d..."
+
+#, c-format
+msgid "Scanning title %d of %d preview %d..."
+msgstr "Сканирование фильма %d из %d просмотр %d..."
+
+msgid "Source"
+msgstr "Источник"
+
+msgid "Choose Video Source"
+msgstr "Выбрать исходное видео"
+
+msgid "Paused"
+msgstr "Приостановлено"
+
+msgid "Encode Done!"
+msgstr "Кодирование завершено!"
+
+msgid "Encode Canceled."
+msgstr "Кодирование отменено."
+
+msgid "Encode Failed."
+msgstr "Ошибка кодирования."
+
+msgid "Muxing: This may take a while..."
+msgstr "Мультиплексирование: Это может занять некоторое время..."
+
+msgid "Encode Complete"
+msgstr "Кодирование завершено"
+
+msgid "HandBrake"
+msgstr "HandBrake"
+
+msgid "Updating preview\n"
+msgstr "Обновление просмотра\n"
+
+msgid "Error while reading activity from pipe"
+msgstr "Ошибка при чтении активности с канала"
+
+msgid "Suspend"
+msgstr "Ждущий режим"
+
+#, c-format
+msgid "Suspend failed: %s"
+msgstr "Не удалось перейти в ждущий режим: %s"
+
+msgid "Suspend failed"
+msgstr "Не удалось перейти в ждущий режим"
+
+msgid "CanShutdown"
+msgstr ""
+
+#, c-format
+msgid "CanShutdown failed: %s"
+msgstr ""
+
+msgid "CanShutdown failed"
+msgstr ""
+
+msgid "Shutdown"
+msgstr "Выключить компьютер"
+
+#, c-format
+msgid "Shutdown failed: %s"
+msgstr "Ошибка выключения компьютера: %s"
+
+msgid "Shutdown failed"
+msgstr "Ошибка выключения компьютера"
+
+msgid "Encoding"
+msgstr "Кодирование"
+
+#, c-format
+msgid "Inhibit failed: %s"
+msgstr ""
+
+msgid "Inhibit failed"
+msgstr ""
+
+msgid "UnInhibit"
+msgstr "Отмена запрещения"
+
+#, c-format
+msgid "UnInhibit failed: %s"
+msgstr ""
+
+msgid "UnInhibit failed"
+msgstr ""
+
+msgid "Uninhibit"
+msgstr ""
+
+#, c-format
+msgid "press %d %d"
+msgstr "проход %d %d, "
+
+#, c-format
+msgid ""
+"Invalid Settings:\n"
+"%s"
+msgstr "Недопустимые настройки:\n%s"
+
+msgid "Cancel"
+msgstr "Отмена"
+
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s: %.4g (Предупреждение: без потерь)"
+
+#, c-format
+msgid "HandBrake %s/%s is now available (you have %s/%d)."
+msgstr "Доступна новая версия HandBrake %s/%s (у вас версия %s/%d)."
+
+msgid "Put down that cocktail, Your HandBrake queue is done!"
+msgstr "HandBrake завершил кодировать этот коктейль!"
+
+msgid "Your encode is complete."
+msgstr "Кодирование завершено."
+
+msgid "Shutting down the computer"
+msgstr "Выключение компьютера"
+
+msgid "Putting computer to sleep"
+msgstr "Переход в спящий режим"
+
+msgid "Quiting Handbrake"
+msgstr "Очередь Handbrake"
+
+msgid "Bottom"
+msgstr "Снизу"
+
+#, c-format
+msgid "open failed: %s\n"
+msgstr "не удалось открыть: %s\n"
+
+msgid "No key for dictionary item"
+msgstr "Нет ключа элемента словаря"
+
+msgid "Invalid container type. This shouldn't happen"
+msgstr "Неправильный тип контейнера. Этого не должно быть"
+
+#, c-format
+msgid "%s:missing a requried attribute"
+msgstr "%s:отсутствует нужный атрибут"
+
+#, c-format
+msgid ""
+"Usage: %s [-I <inc path>] <in resource list> <out resource plist>\n"
+"Summary:\n"
+" Creates a resource plist from a resource list\n"
+"Options:\n"
+" I - Include path to search for files\n"
+" <in resource list> Input resources file\n"
+" <out resource plist> Output resources plist file\n"
+msgstr "Используется: %s [-I <inc path>] <in resource list> <out resource plist>\nСводка:\n Создает плейлист ресурса из списка ресурсов\nOptions:\n I - Включить путь для поиска файлов\n <in resource list> Входной файл ресурсов\n <out resource plist> Выходной плейлист файлов ресурсов\n"
+
+msgid ""
+"The language this text is in, as an ISO code. Pango can use this as a hint "
+"when rendering the text. If you don't understand this parameter, you "
+"probably don't need it"
+msgstr "Язык, на котором написан текст, в виде ISO-кода. Pango может использовать это значение как подсказку (hint) при отрисовке текста. Если вы не понимаете, что это за параметр, то он вам, скорее всего, не нужен."
+
+msgid ""
+"The preferred place to ellipsize the string, if the cell renderer does not "
+"have enough room to display the entire string"
+msgstr "Желаемое место эллиптизации строки, если механизму отображения строки в ячейке, не хватает места для отображения всей строки."
+
+msgid ""
+"How to break the string into multiple lines, if the cell renderer does not "
+"have enough room to display the entire string"
+msgstr "Как разделить строку на несколько строк, если механизму отображения строки не хватает места для отображения всей строки"
+
+#, c-format
+msgid "Failed to set text from markup due to error parsing markup: %s"
+msgstr "Не удалось установить текст из разметки, за ошибки разбора разметки: %s"
+
+#, c-format
+msgid "Don't know color `%s'"
+msgstr "Не знаю цвет `%s'"
+
+msgid "_Open"
+msgstr "_Открыть"
+
+msgid "_Cancel"
+msgstr "_Отмена"
+
+msgid "_Save"
+msgstr "_Сохранить"
+
+msgid ""
+"Render the subtitle over the video.\n"
+"\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr "Отображение субтитров на видео.\n\nСубтитры будут на части видео и не могут быть отключены."
+
+msgid "Burned In"
+msgstr "Встроенные"
+
+msgid ""
+"Set the default output subtitle track.\n"
+"\n"
+"Most players will automatically display this\n"
+"subtitle track whenever the video is played.\n"
+"\n"
+"This is useful for creating a \"forced\" track\n"
+"in your output."
+msgstr "Устанавливает выходную дорожку субтитров по умолчанию.\n\nБольшинство проигрывателей будет автоматически отображать эту\nдорожку субтитров, при воспроизводится видео.\n\nЭто эффективно для создания \"принудительной\" дорожки\nв выводе."
+
+msgid "Default"
+msgstr "По умолчанию"
+
+msgid ""
+"Use only subtitles that have been flagged\n"
+"as forced in the source subtitle track\n"
+"\n"
+"\"Forced\" subtitles are usually used to show\n"
+"subtitles during scenes where someone is speaking\n"
+"a foreign language."
+msgstr "Использует только те субтитры, которые были помечены\nкак принудительные, в треке субтитров источника\n\n\"Принудительные\" субтитры, как правило, используется, чтобы показать\nсубтитры во время сцен, где кто-то говорит\nна иностранном языке."
+
+msgid "Forced Only"
+msgstr "Только принудительные"
+
+msgid ""
+"Add (or subtract) an offset (in milliseconds)\n"
+"to the start of the SRT subtitle track.\n"
+"\n"
+"Often, the start of an external SRT file\n"
+"does not coincide with the start of the video.\n"
+"This setting allows you to synchronize the files."
+msgstr "Добавить (или вычесть) смещение (в миллисекундах)\nс начала дорожки SRT субтитров.\n\nЧасто, начало внешнего SRT файла\nне совпадает с началом видео.\nЭтот параметр позволяет синхронизировать файлы."
+
+msgid "SRT Offset"
+msgstr "Смещение SRT"
+
+msgid ""
+"The source subtitle track\n"
+"\n"
+"You can choose any of the subtitles\n"
+"recognized in your source file.\n"
+"\n"
+"In addition, there is a special track option\n"
+"\"Foreign Audio Search\". This option will add\n"
+"an extra pass to the encode that searches for\n"
+"subtitles that may correspond to a foreign\n"
+"language scene. This option is best used in\n"
+"conjunction with the \"Forced\" option."
+msgstr "Дорожка субтитров источника\n\nВы можете выбрать любые из субтитров,\nраспознанных в исходном файле.\n\nКроме того, есть специальный вариант дорожки\n\"Поиск иностранного языка\". Эта опция добавит\nдополнительный проход в кодирование, который ищет\nсубтитры, которые могут соответствовать сцене с\nиностранным языком.Эту опцию лучше всего использовать в\nсочетании с опцией «Принудительные»."
+
+msgid "Track"
+msgstr "Дорожка"
+
+msgid "About HandBrake"
+msgstr "О программе"
+
+msgid ""
+"Copyright © 2008 - 2013 John Stebbins\n"
+"Copyright © 2004 - 2013, HandBrake Devs"
+msgstr "Copyright © 2008 - 2013 John Stebbins\nCopyright © 2004 - 2013, HandBrake Devs"
+
+msgid ""
+"HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
+msgstr "HandBrake, это GPL-лицензированный, мультиплатформенный, многопоточный видео транскодер."
+
+msgid "http://handbrake.fr"
+msgstr "http://handbrake.fr"
+
+msgid ""
+"HandBrake 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.\n"
+"\n"
+"HandBrake 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.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr "HandBrake― свободное программное обеспечение. Вы можете распространять или изменять его при условиях соответствия GNU General Public License опубликованной Free Software Foundation; либо версии 2 лицензии, либо (на ваше усмотрение) любой более поздней версии.\n\nHandBrake распространяется в надежде на то, что приложение будет полезно, но БЕЗ ВСЯКИХ ГАРАНТИЙ; не гарантируется даже ПРИГОДНОСТЬ или СООТВЕТСТВИЕ КАКИМ-ЛИБО ТРЕБОВАНИЯМ. Для получения дополнительной информации ознакомьтесь с GNU General Public License.\n\nВы должны получить копию GNU General Public License вместе с этой программой. Если этого не произошло, напишите to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA."
+
+msgid "_Minimize/Maximize"
+msgstr "_Свернуть/распахнуть"
+
+msgid "_Pause Queue"
+msgstr "_Приостановить очередь"
+
+msgid "_Quit"
+msgstr "_Выход"
+
+msgid "_About"
+msgstr "_О программе"
+
+msgid "_File"
+msgstr "_Файл"
+
+msgid "_Source"
+msgstr "_Источник"
+
+msgid "Single _Title"
+msgstr "Один _файл"
+
+msgid "_Destination"
+msgstr "_Файл выхода"
+
+msgid "_Preferences"
+msgstr "_Параметры"
+
+msgid "_Queue"
+msgstr "_Очередь"
+
+msgid "S_top Queue"
+msgstr "О_становить очередь"
+
+msgid "_Add"
+msgstr "_Добавить"
+
+msgid "Add _Multiple"
+msgstr "Добавить _несколько"
+
+msgid "_Start"
+msgstr "_Старт"
+
+msgid "_Pause"
+msgstr "_Пауза"
+
+msgid "_View"
+msgstr "_Вид"
+
+msgid "HandBrake For _Dumbies"
+msgstr "HandBrake для чайников"
+
+msgid "_Show Presets"
+msgstr "_Показать предустановки"
+
+msgid "_Preview"
+msgstr "_Просмотр"
+
+msgid "_Activity Window"
+msgstr "_Окно процесса обработки"
+
+msgid "Show _Queue"
+msgstr "Показать _очередь"
+
+msgid "_Presets"
+msgstr "_Предустановки"
+
+msgid "_Delete"
+msgstr "_Удалить"
+
+msgid "_Make Default"
+msgstr "_Сделать по умолчанию"
+
+msgid "_New Folder"
+msgstr "_Новая папка"
+
+msgid "_Export"
+msgstr "_Экспорт"
+
+msgid "_Import"
+msgstr "_Импорт"
+
+msgid "_Update Built-in Presets"
+msgstr "_Обновить предустановки"
+
+msgid "_Help"
+msgstr "_Помощь"
+
+msgid "_Guide"
+msgstr "_Руководство"
+
+msgid "Start Encoding"
+msgstr "Начать кодирование"
+
+msgid "Start"
+msgstr "Старт"
+
+msgid "Pause Encoding"
+msgstr "Приостановить кодирование"
+
+msgid "Pause"
+msgstr "Пауза"
+
+msgid "Add to Queue"
+msgstr "Добавить в очередь"
+
+msgid "Enqueue"
+msgstr "Поставить в очередь"
+
+msgid "Show Queue"
+msgstr "Показать очередь"
+
+msgid "Queue"
+msgstr "Очередь"
+
+msgid ""
+"Open Picture Settings and Preview window.\n"
+"Here you can adjust cropping, resolution, aspect ratio, and filters."
+msgstr "Открыть настройки изображения и окно просмотра.\nЗдесь вы можете отрегулировать обрезку, разрешение, соотношение сторон и фильтры."
+
+msgid "Preview"
+msgstr "Предварительный просмотр"
+
+msgid "Show Activity Window"
+msgstr "Показать окно процесса обработки"
+
+msgid "Activity"
+msgstr "Активность"
+
+msgid "Source:"
+msgstr "Источник:"
+
+msgid "None"
+msgstr "Нет"
+
+msgid "Title:"
+msgstr "Название:"
+
+msgid ""
+"Set the title to encode.\n"
+"By default the longest title is chosen.\n"
+"This is often the feature title of a DVD."
+msgstr "Установить название для кодирования.\nПо умолчанию выбрано длинное название.\nЧасто это название функций DVD."
+
+msgid "Angle:"
+msgstr "Угол:"
+
+msgid "For multi-angle DVD's, select the desired angle to encode."
+msgstr "Для нескольких ракурсов DVD, выберите нужный ракурс для кодирования."
+
+msgid "Reset All Titles"
+msgstr "Сбросить все"
+
+msgid "Apply current settings to all titles"
+msgstr "Применить текущие настройки ко всем названиям."
+
+msgid "Range of title to encode. Can be chapters, seconds, or frames."
+msgstr "Диапазон заглавий для кодирования. Могут быть главы, секунды или кадры."
+
+msgid "Set the first chapter to encode."
+msgstr "Установить первую главу для кодирования."
+
+msgid "through"
+msgstr "по"
+
+msgid "Set the last chapter to encode."
+msgstr "Установить последнюю главу для кодирования."
+
+msgid "Duration:"
+msgstr "Продолжительность:"
+
+msgid "Destination"
+msgstr "Назначение"
+
+msgid "File:"
+msgstr "Файл:"
+
+msgid "Destination filename for your encode."
+msgstr "Название папки для перекодированных файлов."
+
+msgid "Destination directory for your encode."
+msgstr "Папка назначения для перекодированных файлов."
+
+msgid "Destination Directory"
+msgstr "Каталог назначения"
+
+msgid "Format:"
+msgstr "Формат:"
+
+msgid "Format to mux encoded tracks to."
+msgstr "Формат мультиплексора кодирования треков."
+
+msgid "iPod 5G Support"
+msgstr "Поддержка iPod 5G"
+
+msgid "Add iPod Atom needed by some older iPods."
+msgstr "Добавить iPod Atom, необходимый некоторым старым плеерам."
+
+msgid "Web optimized"
+msgstr "Оптимизация для интернет-трансляции"
+
+msgid ""
+"Optimize the layout of the MP4 file for progressive download.\n"
+"This allows a player to initiate playback before downloading the entire file."
+msgstr "Оптимизировать структуру файлов MP4 для последовательной загрузки.\nЭто позволяет проигрывателю начать воспроизведение до загрузки всего файла."
+
+msgid "Large file (>4GB)"
+msgstr "Большой файл (>4GB)"
+
+msgid "Presets List"
+msgstr "Список предустановок"
+
+msgid "Source Codec:"
+msgstr "Кодек источника:"
+
+msgid "Dimensions:"
+msgstr "Размер:"
+
+msgid "Aspect: "
+msgstr "Пропорции: "
+
+msgid "Frame Rate:"
+msgstr "Частота кадров:"
+
+msgid "Source Picture Parameters"
+msgstr "Параметры изображения источника"
+
+msgid "Autocrop:"
+msgstr "Автокадрирование:"
+
+msgid "Crop:"
+msgstr "Кадрирование:"
+
+msgid "Crop Dimensions:"
+msgstr "Размер:"
+
+msgid "Cropping"
+msgstr "Кадрирование"
+
+msgid "Scale Dimensions:"
+msgstr "Масштаб:"
+
+msgid "Optimal for Source:"
+msgstr "Оптимально для источника:"
+
+msgid "Anamorphic:"
+msgstr "Анаморфотный:"
+
+msgid "Scaling"
+msgstr "Масштабирование"
+
+msgid "Presentation Dimensions:"
+msgstr "Размеры презентации:"
+
+msgid "Summary"
+msgstr "Описание"
+
+msgid "Left Crop"
+msgstr "Обрезка слева"
+
+msgid "Top Crop"
+msgstr "Обрезка сверху"
+
+msgid "Bottom Crop"
+msgstr "Обрезка снизу"
+
+msgid "Right Crop"
+msgstr "Обрезка справа"
+
+msgid "Auto Crop"
+msgstr "Автокадрирование"
+
+msgid "Automatically crop black borders around edges of the video."
+msgstr "Автоматически обрезает черные полосы по краям видео."
+
+msgid "Loose Crop"
+msgstr "Произвольное кадрирование"
+
+msgid ""
+"When picture settings require that the image\n"
+"dimensions be rounded to some multiple number\n"
+"of pixels, this setting will crop a few extra pixels\n"
+"instead of doing exact cropping and then scaling to\n"
+"the required multiple."
+msgstr "Когда настройки изображения требуют, чтобы размеры\nизображения округлялись до некоторого многократного числа\nпикселей, эта установка будет обрезать несколько дополнительных\nпикселей, а не делать точную обрезку и затем масштабирование\nдо требуемого числа пикселей."
+
+msgid "width:"
+msgstr "Ширина:"
+
+msgid ""
+"This is the width that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr "Это ширина, в которой будет храниться видео.\nФактические размеры дисплей будут отличаться, если соотношение сторон пикселя не равно 1:1."
+
+msgid "height:"
+msgstr "Высота:"
+
+msgid ""
+"This is the height that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr "Это высота, в которой будет храниться видео.\nФактические размеры дисплей будут отличаться, если соотношение сторон пикселя не равно 1:1."
+
+msgid "Optimal for source"
+msgstr "Оптимально для источника"
+
+msgid ""
+"If enabled, select the 'optimal' storage resolution.\n"
+"This will be the resolution that most closely matches the source resolution after cropping."
+msgstr "Если включено, выберет \"оптимальное\" разрешение для сохранения.\nЭто будет разрешение, наиболее точно соответствующее исходному разрешению после обрезания."
+
+msgid "Alignment:"
+msgstr "Выравнивание:"
+
+msgid ""
+"Align storage dimensions to multiples of this value.\n"
+"\n"
+"This setting is only necessary for compatibility with some devices.\n"
+"You should use 2 unless you experience compatibility issues."
+msgstr "Выравнивание размеров сохранения в несколько раз этого значения.\n\nЭтот параметр необходим только для совместимости с некоторыми устройствами.\nСледует использовать 2, если вы не испытываете проблем с совместимостью."
+
+msgid "Storage Geometry"
+msgstr "Геометрия хранения"
+
+msgid ""
+"This is the display width. It is the result of scaling the storage "
+"dimensions by the pixel aspect."
+msgstr "Это ширина дисплея. Это является результатом изменения размеров сохранения пропорций пикселей."
+
+msgid "Pixel Aspect:"
+msgstr "Формат пикселя:"
+
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr "Пропорция пикселей определяет форму пикселей.\n\nСоотношение 1:1 определяет квадратный пиксель. Другие значения определяют прямоугольные формы.\nПроигрыватели будут масштабировать изображение, чтобы достичь указанного соотношения."
+
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr "Пропорция пикселей определяет форму пикселей.\nСоотношение 1:1 определяет квадратный пиксель. Другие значения определяют прямоугольные формы.\nПроигрыватели будут масштабировать изображение, чтобы достичь указанного соотношения."
+
+msgid "Keep Aspect"
+msgstr "Сохранять пропорции"
+
+msgid ""
+"If enabled, the original display aspect of the source will be maintained."
+msgstr "Если включено, оригинальное отображение пропорций источника будет сохранено."
+
+msgid "Display Aspect:"
+msgstr "Соотношение дисплея:"
+
+msgid "Display Geometry"
+msgstr "Геометрия отображения"
+
+msgid "Grayscale"
+msgstr "Градации серого"
+
+msgid "If enabled, filter colour components out of video."
+msgstr "Если включено, фильтр компонентов цвета вывода видео."
+
+msgid "Deblock:"
+msgstr "Уровень блочности:"
+
+msgid ""
+"The deblocking filter removes a common type of compression artifact.\n"
+"If your source exhibits 'blockiness', this filter may help clean it up."
+msgstr "Фильтр деблокирования удаляет распространенный тип артефакта сжатия.\nЕсли источник \"блочность\", этот фильтр может помочь в ее очистке."
+
+msgid "Denoise Filter:"
+msgstr "Фильтр шумоподавления:"
+
+msgid ""
+"Denoise filtering reduces or removes the appearance of noise and grain.\n"
+"Film grain and other types of high frequency noise are difficult to compress.\n"
+"Using this filter on such sources can result in smaller file sizes."
+msgstr "Фильтрация шумоподавления уменьшает или устраняет появление шума и зернистости.\nЗернистость фильма и другие виды высокочастотного шума сложно сжимать.\nИспользование этого фильтра на таких источниках может привести к уменьшению размеров файлов."
+
+msgid "Denoise Preset:"
+msgstr "Предустановки шумоподавления:"
+
+msgid "Denoise Tune:"
+msgstr "Настройка шумоподавления:"
+
+msgid ""
+"Custom denoise filter string format\n"
+"\n"
+"SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
+msgstr "Пользовательский фильтр удаления шумов\n\nSpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
+
+msgid "Detelecine:"
+msgstr "Детелесин:"
+
+msgid ""
+"This filter removes 'combing' artifacts that are the result of telecining.\n"
+"\n"
+"Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps."
+msgstr "Этот фильтр удаляет артефакты 'гребенки', которые являются результатом телесина.\n\nТелесин, это процесс, который регулирует частоту кадров фильма 24fps в NTSC, в видео с частотй кадров 30fps."
+
+msgid ""
+"Custom detelecine filter string format\n"
+"\n"
+"JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
+msgstr "Пользовательский фильтр детелесина\n\nJunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
+
+msgid "Decomb"
+msgstr "Убрать гребенку"
+
+msgid ""
+"Choose decomb or deinterlace filter options.\n"
+"\n"
+"The decomb filter selectively deinterlaces frames that appear to be interlaced.\n"
+"This will preserve quality in frames that are not interlaced.\n"
+"\n"
+"The classic deinterlace filter is applied to all frames.\n"
+"Frames that are not interlaced will suffer some quality degradation."
+msgstr "Выберите опции фильтра \"Убрать гребенку\" или \"Деинтерлейсинг\".\n\nФильтр удаления гребенки избирательно убирает чересстрочность кадров, которые могут оказаться чересстрочными.\nЭто позволит сохранить качество кадров, которые с нечересстрочной разверткой.\n\nКлассический фильтр деинтерлейсинга применяется ко всем кадрам.\nКадры, которые не чересстрочные, пострадают от некоторого ухудшение качества."
+
+msgid "Deinterlace"
+msgstr "Деинтерлейсинг"
+
+msgid "Decomb:"
+msgstr "Убрать гребенку:"
+
+msgid ""
+"The decomb filter selectively deinterlaces frames that appear to be interlaced.\n"
+"This will preserve quality in frames that are not interlaced."
+msgstr "Фильтр удаления гребенки избирательно убирает чересстрочность кадров, которые могут оказаться чересстрочными.\nЭто позволит сохранить качество кадров, которые с нечересстрочной разверткой."
+
+msgid ""
+"Custom decomb filter string format\n"
+"\n"
+"Mode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:\n"
+"BlockHeight:MagnitudeThres:VarianceThres:LaplacianThresh:DilationThresh:\n"
+"ErosionThresh:NoiseThresh:MaxSearchDistance:PostProcessing:Parity"
+msgstr "Пользовательский фильтр удаления гребенки\n\nMode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:\nBlockHeight:MagnitudeThres:VarianceThres:LaplacianThresh:DilationThresh:\nErosionThresh:NoiseThresh:MaxSearchDistance:PostProcessing:Parity"
+
+msgid "Deinterlace:"
+msgstr "Деинтерлейсинг:"
+
+msgid ""
+"The classic deinterlace filter is applied to all frames.\n"
+"Frames that are not interlaced will suffer some quality degradation."
+msgstr "Классический фильтр деинтерлейсинга применяется ко всем кадрам.\nКадры, которые не чересстрочные, пострадают от некоторого ухудшение качества."
+
+msgid ""
+"Custom deinterlace filter string format\n"
+"\n"
+"YadifMode:YadifParity:McdintMode:McdeintQp"
+msgstr "Пользовательский фильтр деинтерлейсинга\n\nYadifMode:YadifParity:McdintMode:McdeintQp"
+
+msgid "Filters"
+msgstr "Фильтры:"
+
+msgid "Picture"
+msgstr "Изображение"
+
+msgid "Video Encoder:"
+msgstr "Видео кодеки:"
+
+msgid "Available video encoders."
+msgstr "Доступные видео кодеки."
+
+msgid "Framerate:"
+msgstr "Частота кадров:"
+
+msgid ""
+"Output framerate.\n"
+"\n"
+"'Same as source' is recommended. If your source video has\n"
+"a variable framerate, 'Same as source' will preserve it."
+msgstr "Частота кадров на выходе.\n\n Рекомендуется 'Так же, как в источнике'. Если исходное видео имеет\nпеременную частоту кадров, выбор 'Так же, как в источнике' сохранит ее."
+
+msgid "Constant Framerate"
+msgstr "Постоянная частота кадров"
+
+msgid "Enables constant framerate output."
+msgstr "Включает постоянную частоту кадров."
+
+msgid "Peak Framerate (VFR)"
+msgstr "Пик частоты кадров (VFR)"
+
+msgid ""
+"Enables variable framerate output with a peak\n"
+"rate determined by the framerate setting.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr "Включает переменную частоту кадров на выходе с пиковой\nскоростью, определенной настройкой частоты кадров.\n\nVFR не совместим с некоторыми проигрывателями."
+
+msgid "Variable Framerate"
+msgstr "Переменная частота кадров"
+
+msgid ""
+"Enables variable framerate output.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr "Включает переменную частоту кадров.\n\nVFR не совместим с некоторыми проигрывателями."
+
+msgid ""
+"Set the desired quality factor.\n"
+"The encoder targets a certain quality.\n"
+"The scale used by each video encoder is different.\n"
+"\n"
+"x264's scale is logarithmic and lower values correspond to higher quality.\n"
+"So small decreases in value will result in progressively larger increases\n"
+"in the resulting file size. A value of 0 means lossless and will result\n"
+"in a file size that is larger than the original source, unless the source\n"
+"was also lossless.\n"
+"\n"
+"FFMpeg's and Theora's scale is more linear.\n"
+"These encoders do not have a lossless mode."
+msgstr "Установите требуемый коэффициент качества.\nКонкретное качество для кодировщика целевого файла.\nШкала, используемая каждым видео кодировщиком, различается.\n\nШкала X264 является логарифмической и более низкие значения соответствуют более\nвысокому качеству. Так, небольшое снижение значения приведет к прогрессивно более значительному\nувеличению размера файла. Значение 0 означает без потерь и приведет к размеру файла не больше, чем\nу источника, если только источник также без потерь.\n\nУ FFMpeg и Theora шкала является более линейной.\nЭти кодировщики не имеет режима без потерь."
+
+msgid "Constant Quality:"
+msgstr "Постоянное качество:"
+
+msgid "Bitrate (kbps): "
+msgstr "Битрейт (кбит/с): "
+
+msgid ""
+"Set the average bitrate.\n"
+"\n"
+"The instantaneous bitrate can be much higher or lower at any point in time.\n"
+"But the average over a long duration will be the value set here. If you need\n"
+"to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings."
+msgstr "Установите средний битрейт.\n\nКратковременный битрейт может быть намного выше или ниже, в любой момент времени.\nНо средний, на протяжении длительного срока будет на установленном здесь значении.\nЕсли нужно ограничить кратковременный битрейт, смотрите настройки x264 vbv-bufsize и vbv-maxrate."
+
+msgid "2-Pass Encoding"
+msgstr "Кодирование в 2 прохода"
+
+msgid ""
+"Perform 2 Pass Encoding.\n"
+"\n"
+"The 'Bitrate' option is prerequisite. During the 1st pass, statistics about\n"
+"the video are collected. Then in the second pass, those statistics are used\n"
+"to make bitrate allocation decisions."
+msgstr "Кодирование в 2 прохода.\n\nОпция 'Битрейт' является обязательным условием. В 1-ый проход собирается\nстатистика о видео. Тогда на втором проходе, используются эти статистические\nданные в решении распределения битрейта."
+
+msgid "Turbo First Pass"
+msgstr "Первый проход быстро"
+
+msgid ""
+"During the 1st pass of a 2 pass encode, use settings that speed things "
+"along."
+msgstr "Во время 1-го проход при 2-х проходном кодировании используйте настройки скоростного прохода."
+
+msgid "Use Advanced Options"
+msgstr "Использовать дополнительные параметры"
+
+msgid ""
+"Use advanced options Tab for x264 settings.\n"
+"\n"
+"Use at your own risk!"
+msgstr "Используйте вкладку дополнительных настроек для настройки x264. \n\n Используйте на свой страх и риск!"
+
+msgid "Preset:"
+msgstr "Предустановка:"
+
+msgid ""
+"Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
+"\n"
+"This establishes your default encoder settings.\n"
+"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"You should generally set this option to the slowest you can bear since slower\n"
+"settings will result in better quality or smaller files."
+msgstr "Регулирует настройки кодера, балансируя между эффективностью сжатия и скоростью кодирования.\n\nЭто определяют настройки кодера по умолчанию.\nРегулировка, профили, уровни и дополнительные параметры строки, будут применять это.\nКак правило, нужно установить этот параметр на самый медленный, Медленная настройка\nприведёт к улучшению качества или несколько меньшему размеру файла."
+
+msgid "Tune:"
+msgstr "Настройки:"
+
+msgid ""
+"Tune settings to optimize for common scenarios.\n"
+"\n"
+"This can improve effeciency for particular source characteristics or set\n"
+"characteristics of the output file. Changes will be applied after the\n"
+"preset but before all other parameters."
+msgstr "Настройки оптимизированных параметров для выполнения типовых сценариев.\n\nЭто может улучшить содержание для конкретных характеристик исходного или заданных\nхарактеристик выходного файла. Изменения вступят в силу по завершении установленных\nзаранее, но перед всеми другими параметрами."
+
+msgid "Fast Decode"
+msgstr "Быстрое кодирование"
+
+msgid ""
+"Reduce decoder CPU usage.\n"
+"\n"
+"Set this if your device is struggling to play the output (dropped frames)."
+msgstr "Уменьшает использование CPU при декодировании.\n\nУстановите ее, если ваше устройство испытывает затруднения с воспроизведением на выходе (пропускает кадры)."
+
+msgid "Zero Latency"
+msgstr "Нулевая задержка"
+
+msgid ""
+"Minimize latency between input to encoder and output of decoder.\n"
+"\n"
+"This is useful for broadcast of live streams.\n"
+"\n"
+"Since HandBrake is not suitable for live stream broadcast purposes,\n"
+"this setting is of little value here."
+msgstr "Минимизация задержки между входом в кодер и выходом декодера.\n\nЭто полезно для трансляции потокового вещания.\n\nПоскольку HandBrake не подходит трансляции потокового вещания,\nэтот параметр не имеет здесь большого значения."
+
+msgid "Profile:"
+msgstr "Профиль:"
+
+msgid ""
+"Sets and ensures compliance with the specified profile.\n"
+"\n"
+"Overrides all other settings."
+msgstr "Устанавливает и обеспечивает соблюдение указанного профиля.\n\nПодавляет все другие настройки."
+
+msgid "Level:"
+msgstr "Уровень:"
+
+msgid ""
+"Sets and ensures compliance with the specified level.\n"
+"\n"
+"Overrides all other settings."
+msgstr "Устанавливает и обеспечивает соблюдение указанного уровня.\n\nПодавляет все другие настройки."
+
+msgid "More Settings:"
+msgstr "Дополнительно:"
+
+msgid ""
+"Additional encoder settings.\n"
+"\n"
+"Colon separated list of encoder options."
+msgstr "Дополнительные настройки кодирования.\n\nСписок вариантов опций разделять двоеточиями."
+
+msgid "Video"
+msgstr "Видео"
+
+msgid "Selection Behavior:"
+msgstr "Выбор поведения:"
+
+msgid "Remove"
+msgstr "Удалить"
+
+msgid "Available Languages"
+msgstr "Доступные языки"
+
+msgid "Selected Languages"
+msgstr "Выбранные языки"
+
+msgid "Use only first encoder for secondary audio"
+msgstr "Использовать только первый кодер для вторичного аудиосигнала"
+
+msgid ""
+"Only the primary audio track will be encoded with the full encoder list.\n"
+"All other secondary audio output tracks will be encoded with first encoder only."
+msgstr "Только основная звуковая дорожка будет закодирован полным списком кодеров.\nВсе другие, вторичные аудиодорожки будут закодированы только первым кодером."
+
+msgid "Auto Passthru:"
+msgstr "Автовыбор декодера:"
+
+msgid "MP3"
+msgstr "MP3"
+
+msgid ""
+"Enable this if your playback device supports MP3.\n"
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+msgstr "Включите это, если ваше устройство воспроизведения поддерживает MP3.\nЭто позволяет при необходимости вызвать MP3, если включен автоматический выбор."
+
+msgid "AAC"
+msgstr "AAC"
+
+msgid ""
+"Enable this if your playback device supports AAC.\n"
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
+msgstr "Включите это, если ваше устройство воспроизведения поддерживает AAC.\nЭто позволяет при необходимости вызвать AAC, если включен автоматический выбор."
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid ""
+"Enable this if your playback device supports AC-3.\n"
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+msgstr "Включите это, если ваше устройство воспроизведения поддерживает AC-3.\nЭто позволяет при необходимости вызвать AC-3, если включен автоматический выбор."
+
+msgid "DTS"
+msgstr "DTS"
+
+msgid ""
+"Enable this if your playback device supports DTS.\n"
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
+msgstr "Включите это, если ваше устройство воспроизведения поддерживает DTS.\nЭто позволяет при необходимости вызвать DTS, если включен автоматический выбор."
+
+msgid "DTS-HD"
+msgstr "DTS-HD"
+
+msgid ""
+"Enable this if your playback device supports DTS-HD.\n"
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+msgstr "Включите это, если ваше устройство воспроизведения поддерживает DTS-HD.\nЭто позволяет при необходимости вызвать DTS-HD, если включен автоматический выбор."
+
+msgid "Passthru Fallback:"
+msgstr "Резервный декодер:"
+
+msgid ""
+"Set the audio codec to encode with when a suitable track can not be found "
+"for audio passthru."
+msgstr "Установить аудио кодек для кодирования с тем, что бы использовать когда подходящий декодер не найден."
+
+msgid "Audio Encoder Settings:"
+msgstr "Параметры кодирования звука:"
+
+msgid "Encoder"
+msgstr "Кодек"
+
+msgid "Bitrate/Quality"
+msgstr "Битрейт/Качество"
+
+msgid "Mixdown"
+msgstr "Смешивание каналов"
+
+msgid "Samplerate"
+msgstr "Частота дискретизации"
+
+msgid "Gain"
+msgstr "Усиление"
+
+msgid "Gain:"
+msgstr "Усиление:"
+
+msgid "DRC"
+msgstr "DRC"
+
+msgid "Audio Defaults"
+msgstr "Аудио по умолчанию"
+
+msgid "Add new audio settings to the list"
+msgstr "Добавить новые настройки аудио в список"
+
+msgid "Add All"
+msgstr "Добавить все"
+
+msgid "Add all audio tracks to the list"
+msgstr "Добавить все аудиодорожки в список"
+
+msgid "Reload Defaults"
+msgstr "Перезагрузить по умолчанию"
+
+msgid "Reload all audio settings from defaults"
+msgstr "Перезагрузить все настройки звука по умолчанию"
+
+msgid "Audio List"
+msgstr "Список аудио"
+
+msgid "Preferred Language: None"
+msgstr "Предпочитаемый язык: нет"
+
+msgid "Add Foreign Audio Search Pass"
+msgstr "Добавить поиск иностранного языка в проход"
+
+msgid ""
+"Add \"Foreign Audio Search\" when the default audio track is your preferred language.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them."
+msgstr "Добавить \"Поиск иностранного языка\", когда для звуковой дорожки у вас выбран предпочитаемый по умолчанию язык.\nЭтот проход поиска находит короткие последовательности иностранного звука и предоставляет для них субтитры."
+
+msgid "Add subtitle track if default audio is foreign"
+msgstr "Добавить дорожку субтитров, если по умолчанию будет иностранный звук"
+
+msgid ""
+"When the default audio track is not your preferred language, add a subtitle "
+"track."
+msgstr "Когда для звуковой дорожки по умолчанию нет нужного языка, добавить дорожку субтитров."
+
+msgid "Add Closed Captions when available"
+msgstr "Добавлять скрытые субтитры, когда возможно"
+
+msgid ""
+"Closed captions are text subtitles that can be added to any container as a "
+"soft subtitle track (not burned)"
+msgstr "Текстовые субтитры, которые могут быть добавлены в любой контейнер, как дорожка мягких субтитров (не записывая)"
+
+msgid "Subtitle Defaults"
+msgstr "Субтитры по умолчанию"
+
+msgid "Add new subtitle settings to the list"
+msgstr "Добавить новые настройки субтитров в список"
+
+msgid "Add all subtitle tracks to the list"
+msgstr "Добавить все дорожки субтитров в список"
+
+msgid "Reload all subtitle settings from defaults"
+msgstr "Перезагрузить все настройки субтитров по умолчанию"
+
+msgid "Subtitle List"
+msgstr "Список субтитров"
+
+msgid "Reference Frames:"
+msgstr "Рефернсные кадры:"
+
+msgid ""
+"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
+"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
+"\n"
+"Note that many hardware devices have limitations on the number of supported reference\n"
+"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
+"you're absolutely sure you know what you're doing!"
+msgstr ""
+
+msgid "Maximum B-Frames:"
+msgstr "Количество B-кадров:"
+
+msgid ""
+"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
+"\n"
+"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
+"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
+"values.\n"
+"\n"
+"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
+msgstr ""
+
+msgid "Pyramidal B-Frames:"
+msgstr "Пирамидальные B-кадры:"
+
+msgid ""
+"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
+"of B-frames, allowing B-frames to reference each other to improve compression.\n"
+"\n"
+"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
+msgstr ""
+
+msgid "Weighted P-Frames:"
+msgstr "Взвешенные P-кадры:"
+
+msgid ""
+"Performs extra analysis to decide upon weighting parameters for each frame.\n"
+"\n"
+"This improves overall compression slightly and improves the quality of fades greatly.\n"
+"\n"
+"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
+"prediction to be disabled. Note that some devices and players, even those that support\n"
+"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
+"completely incompatible with it, for example."
+msgstr ""
+
+msgid "8x8 Transform"
+msgstr "Умное преобразование 8x8 "
+
+msgid ""
+"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
+"\n"
+"It improves compression by at least 5% at a very small speed cost and may\n"
+"provide an unusually high visual quality benefit compared to its compression\n"
+"gain. However, it requires High Profile, which many devices may not support."
+msgstr ""
+
+msgid "CABAC Entropy Encoding"
+msgstr "Контекстно-адаптивное кодирование"
+
+msgid ""
+"After the encoder has done its work, it has a bunch of data that\n"
+"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
+"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
+"compresses significantly better (10-30%), especially at lower bitrates.\n"
+"\n"
+"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
+"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
+msgstr "После того, как кодер сделал свое дело, он имеет много данных, которые\nдолжна быть сжаты без потерь, подобно ZIP или RAR. H.264 обеспечивает\nдля этого два варианта: CAVLC и CABAC. CABAC декодирует намного медленнее,\nно сжимает значительно лучше (10-30%), особенно по более низким битрейте.\n\nЕсли хотите минимизировать требования к процессору при воспроизведении видео, отключить эту опцию.\nБазовый профиль, требуемый для iPod и аналогичных устройств, требует чтобы CABAC быть отключен."
+
+msgid "Encoding Features"
+msgstr "Особенности кодирования"
+
+msgid "Motion Est. Method:"
+msgstr "Метод движения Est.:"
+
+msgid ""
+"Controls the motion estimation method.\n"
+"\n"
+"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
+"A better motion search method improves compression at the cost of speed.\n"
+"\n"
+"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
+"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
+"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
+"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
+"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
+msgstr ""
+
+msgid "Subpel ME &amp; Mode:"
+msgstr "Режим &amp; Subpel ME:"
+
+msgid "Motion Est. Range:"
+msgstr "Диапазон движения Est.:"
+
+msgid ""
+"This is the distance x264 searches from its initial guess at the\n"
+"motion of a block in order to try to find its actual motion.\n"
+"\n"
+"The default is fine for most content, but extremely high motion video,\n"
+"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
+"a high speed cost."
+msgstr ""
+
+msgid "Adaptive Direct Mode:"
+msgstr "Прямой адаптивный режим:"
+
+msgid ""
+"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
+"\n"
+"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
+"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
+"adaptively select which is better for each particular frame."
+msgstr ""
+
+msgid "Adaptive B-Frames:"
+msgstr "Адаптивные B-кадры:"
+
+msgid "Partitions:"
+msgstr "Блоки:"
+
+msgid ""
+"Mode decision picks from a variety of options to make its decision:\n"
+"this option chooses what options those are.\n"
+"\n"
+"Fewer partitions to check means faster encoding, at the cost of worse\n"
+"decisions, since the best option might have been one that was turned off."
+msgstr ""
+
+msgid "Trellis:"
+msgstr "Треллис:"
+
+msgid ""
+"Trellis fine-tunes the rounding of transform coefficients to\n"
+"squeeze out 3-5% more compression at the cost of some speed.\n"
+"\n"
+"\"Always\" uses trellis not only during the main encoding process, but also\n"
+"during analysis, which improves compression even more, albeit at great speed cost.\n"
+"\n"
+"Trellis costs more speed at higher bitrates and requires CABAC."
+msgstr ""
+
+msgid "Analysis"
+msgstr "Анализ"
+
+msgid "Adaptive Quantization Strength:"
+msgstr "Адаптивная сила квантования:"
+
+msgid ""
+"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
+"\n"
+"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
+msgstr "Адаптивное квантование контролирует, как кодер распределяет биты по всем кадрам.\n\nВысокие значения считают больше битов от краев и сложных областей для улучшения участков с четкими деталями."
+
+msgid "Psychovisual Rate Distortion:"
+msgstr "Степень восприятия искажений:"
+
+msgid ""
+"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
+"vision to dramatically improve apparent detail and sharpness.\n"
+"The effect can be made weaker or stronger by adjusting the strength.\n"
+"Being an RD algorithm, it requires mode decision to be at least \"6\"."
+msgstr "Психовизуальная оптимизация соотношению сигнал-шум использует преимущества характеристик человеческого зрения,\nчтобы значительно улучшить детали и резкость.\nЭффект можно ослабить или усилить, регулируя силу. Алгоритм RD\nтребует по меньшей мере установки режима \"6\"."
+
+msgid "Psychovisual Trellis:"
+msgstr "Психовизуальный треллис:"
+
+msgid ""
+"Psychovisual trellis is an experimental algorithm to further\n"
+"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
+"\n"
+"Recommended values are around 0.2, though higher values may help for very\n"
+"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
+"and other sharp-edged graphics."
+msgstr ""
+
+msgid "Deblocking: "
+msgstr "Деблокирование: "
+
+msgid "No DCT Decimate"
+msgstr "Не опустошать DCT"
+
+msgid ""
+"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
+"be better used for some other purpose in the video. However, this can\n"
+"sometimes have slight negative effects on retention of subtle grain and\n"
+"dither.\n"
+"\n"
+"Don't touch this unless you're having banding issues or other such cases\n"
+"where you are having trouble keeping fine noise."
+msgstr "x264 обычно обнуляет почти пустые блоки данных для сохранения битов, которые\nбудут лучше использовать для других целей в видео. Тем не менее, иногда это\nможет иметь небольшое отрицательное воздействие на сохранение тонких мелких\nчастиц и размытие. Не касайтесь этого, если не имеете проблем с сохранением мелких\nшумов."
+
+msgid "Psychovisual"
+msgstr "Восприятие"
+
+msgid ""
+"Your selected options will appear here.\n"
+"You can edit these and add additional options.\n"
+"\n"
+"Default values will not be shown. The defaults are:\n"
+"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
+"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
+"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
+"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
+"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
+msgstr "Выбранные опции появятся здесь.\nВы можете их отредактировать и добавить в дополнительные опции.\n\nЗначение по умолчанию не будет показано. По умолчанию это:\nref=3:bframes=3:b-adapt=fast:direct=spatial:\nb-pyramid=normal:weightp=2:me=hex:merange=16:\nsubme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\ndeblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\nno-fast-pskip=0:no-dct-decimate=0:cabac=1"
+
+msgid "Current x264 Advanced Option String"
+msgstr "Дополнительная строка текущей опции x264"
+
+msgid "Advanced Video"
+msgstr "Дополнительно"
+
+msgid "Chapter Markers"
+msgstr "Маркеры глав"
+
+msgid "Add chapter markers to output file."
+msgstr "Добавить маркеры глав в выходной файл."
+
+msgid "Chapters"
+msgstr "Главы"
+
+msgid "Actors:"
+msgstr "Актеры:"
+
+msgid "Director:"
+msgstr "Режиссёр:"
+
+msgid "Release Date:"
+msgstr "Дата выпуска:"
+
+msgid "Comment:"
+msgstr "Комментарий:"
+
+msgid "Genre:"
+msgstr "Жанр:"
+
+msgid "Description:"
+msgstr "Описание:"
+
+msgid "Plot:"
+msgstr "Сюжет:"
+
+msgid "Tags"
+msgstr "Теги"
+
+msgid "Settings"
+msgstr "Настройки"
+
+msgid "Edit"
+msgstr "Изменить"
+
+msgid "Reload"
+msgstr "Перезагрузить"
+
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr "Отметить выбранные записи очереди, как в ожидании.\nСбросить ожидание очереди заданий и продолжить выполнять задание снова."
+
+msgid "Reload All"
+msgstr "Обновить все"
+
+msgid ""
+"Mark all queue entries as pending.\n"
+"Resets all queue jobs to pending and ready to run again."
+msgstr "Отметить все записи очереди, как в ожидании.\nСбросить ожидание все заданий очереди и продолжить выполнять задание снова."
+
+msgid "Select All"
+msgstr "Выбрать все"
+
+msgid "Mark all titles for adding to the queue"
+msgstr "Отметить все названия для добавления в очередь"
+
+msgid "Clear All"
+msgstr "Очистить все"
+
+msgid "Unmark all titles"
+msgstr "Снять все названия"
+
+msgid "Destination files OK. No duplicates detected."
+msgstr "Файлы назначения в ОК. Дубликаты не обнаружены."
+
+msgid "Preferences"
+msgstr "Параметры"
+
+msgid "Automatically check for updates"
+msgstr "Автоматически проверять наличие обновлений"
+
+msgid "When all encodes are complete"
+msgstr "Когда все кодирование завершено"
+
+msgid "Use automatic naming (uses modified source name)"
+msgstr "Использовать автоматический идентификатор (использует измененное исходное имя)"
+
+msgid "Auto-Name Template"
+msgstr "Шаблон автонаименования"
+
+msgid ""
+"Available Options: {source} {title} {chapters} {date} {time} {quality} "
+"{bitrate}"
+msgstr "Доступные параметры: {источник} {название} {главы} {дата} {время} {качаство} {битрейт}"
+
+msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
+msgstr "Использовать дружественное iPod/iTunes расширение файла (.m4v) для MP4"
+
+msgid "Number of previews"
+msgstr "Число миниатюр"
+
+msgid "Filter short titles (seconds)"
+msgstr "Фильтр коротких наименований (в секундах)"
+
+msgid "Show system tray icon"
+msgstr "Показывать значек в системном лотке"
+
+msgid "General"
+msgstr "Общие"
+
+msgid "Constant Quality fractional granularity"
+msgstr "Незначительная зернистость на постоянном качестве"
+
+msgid "Use dvdnav (instead of libdvdread)"
+msgstr "Использовать dvdnav (вместо libdvdread)"
+
+msgid "Put individual encode logs in same location as movie"
+msgstr "Помещать индивидуальные логи кодирования в то же расположение, что и фильм"
+
+msgid "Activity Log Verbosity Level"
+msgstr "Подробный журнал уровня деятельности"
+
+msgid "Activity Log Longevity"
+msgstr "Долговечный журнала операций"
+
+msgid "Scale down High Definition previews"
+msgstr "Уменьшать высокую четкость просмотра"
+
+msgid "Automatically Scan DVD when loaded"
+msgstr "Автоматически сканировать DVD при загрузке"
+
+msgid "Scans the DVD whenever a new disc is loaded"
+msgstr "Сканировать DVD после загрузки нового диска"
+
+msgid "Hide Advanced Video Options Tab"
+msgstr "Скрывать вкладку дополнительной настройки видео"
+
+msgid ""
+"Use advanced video options at your own risk.\n"
+"We recommend that you use the controls available\n"
+"on the Video tab instead."
+msgstr "Используйте дополнительные параметры видео на свой страх и риск.\nМы рекомендуем вам использовать доступные элементы управления на\nна вкладке \"Видео\"."
+
+msgid "Delete completed jobs from queue"
+msgstr "Удалять завершённые задачи из очереди"
+
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr "По умолчанию, выполненные задания остаются в очереди и помечаются как завершенные.\nОтметьте это, если хотите очищать очередь до окончания выполнения задания."
+
+msgid "Allow Tweaks"
+msgstr "Разрешить тонкие настройки"
+
+msgid "Allow HandBrake For Dummies"
+msgstr "Сделать HandBrake для чайников"
+
+msgid "Advanced"
+msgstr "Дополнительно"
+
+msgid "Folder Name:"
+msgstr "Имя папки:"
+
+msgid "Description"
+msgstr "Описание"
+
+msgid "Preset Name:"
+msgstr "Название предустановки:"
+
+msgid "Custom Picture Dimensions"
+msgstr "Пользовательский размер изображения"
+
+msgid "Maximum Width:"
+msgstr "Максимальная ширина:"
+
+msgid "Enable maximum width limit."
+msgstr "Включить лимит максимальной ширины."
+
+msgid ""
+"This is the maximum width that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source width is greater.\n"
+"Setting this to 0 means there is no maximum width."
+msgstr "Это максимальная ширина, в которой будет сохраняться видео.\n\nВсякий раз, когда загружается новый источник, это значение будет применяться, если ширина источника больше.\nЗначение 0 означает, что максимальной ширины нет."
+
+msgid "Maximum Height:"
+msgstr "Максимальная высота:"
+
+msgid "Enable maximum height limit."
+msgstr "Включить лимит максимальной высоты."
+
+msgid ""
+"This is the maximum height that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source height is greater.\n"
+"Setting this to 0 means there is no maximum height."
+msgstr "Это максимальная высота, в которой будет сохраняться видео.\n\nВсякий раз, когда загружается новый источник, это значение будет применяться, если высота источника больше.\nЗначение 0 означает, что максимальной высоты нет."
+
+msgid "Select preview frames."
+msgstr "Выбор кадра для миниатюры."
+
+msgid ""
+"Encode and play a short sequence of video starting from the current preview "
+"position."
+msgstr "Кодировать и воспроизводить короткие последовательности видео, начиная с текущего положения просмотра."
+
+msgid "Duration:"
+msgstr "Продолжительность:"
+
+msgid "Set the duration of the live preview in seconds."
+msgstr "Установить продолжительность предварительного просмотра в секундах."
+
+msgid "Show Crop"
+msgstr "Показать кадрирование"
+
+msgid "Show Cropped area of the preview"
+msgstr "Показать просмотр обрезанных областей"
+
+msgid "Fullscreen"
+msgstr "Полный экран"
+
+msgid "View Fullscreen Preview"
+msgstr "Вид просмотра в полный экран"
+
+msgid "Title Number:"
+msgstr "Количество названий:"
+
+msgid "Detected DVD devices:"
+msgstr "Обнаружено устройство DVD:"
+
+msgid "Setting:"
+msgstr "Настройка:"
+
+msgid "Import SRT"
+msgstr "Импорт SRT"
+
+msgid "Enable settings to import an SRT subtitle file"
+msgstr "Включить настройки импорта файла субтитров SRT"
+
+msgid "Embedded Subtitle List"
+msgstr "Список встроенных субтитров"
+
+msgid "Enable settings to select embedded subtitles"
+msgstr "Включить настройки выбранных встроенных субтитров"
+
+msgid "Language"
+msgstr "Язык"
+
+msgid "Character Code"
+msgstr "Кодировка"
+
+msgid "Offset (ms)"
+msgstr "Смещение (мс)"
+
+msgid ""
+"Set the language of this subtitle.\n"
+"This value will be used by players in subtitle menus."
+msgstr "Установить язык этих субтитров.\nЭто значение будет использоваться проигрывателями в меню субтитров."
+
+msgid ""
+"Set the character code used by the SRT file you are importing.\n"
+"\n"
+"SRTs come in all flavours of character sets.\n"
+"We translate the character set to UTF-8.\n"
+"The source's character code is needed in order to perform this translation."
+msgstr "Установить кодирокау символов, используемую SRT для импортируемого файла.\n\nSRT бывают для всех разновидностей кодировок.\nМы переводим набор символов в UTF-8.\nКодировка источника необходима для того, чтобы выполнить этот перевод."
+
+msgid "Select the SRT file to import."
+msgstr "Выберите файл srt для импорта."
+
+msgid "Srt File"
+msgstr "Файл srt"
+
+msgid "Adjust the offset in milliseconds between video and SRT timestamps"
+msgstr "Установить смещение в миллисекундах между видео и метками времени SRT"
+
+msgid "Track"
+msgstr "Дорожка"
+
+msgid "List of subtitle tracks available from your source."
+msgstr "Список дорожек субтитров доступных в источнике."
+
+msgid "Forced Subtitles Only"
+msgstr "Только принудительные субтитры"
+
+msgid "Burn into video"
+msgstr "Записать в видео"
+
+msgid ""
+"Render the subtitle over the video.\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr "Отображение субтитров на видео.\nСубтитры будут на части видео и не могут быть отключены."
+
+msgid "Set Default Track"
+msgstr "Установить дорожку по умолчанию"
+
+msgid "Source Track"
+msgstr "Дорожка источника"
+
+msgid "List of audio tracks available from your source."
+msgstr "Список доступных в источнике звуковых дорожек."
+
+msgid "Track Name:"
+msgstr "Название дорожки:"
+
+msgid ""
+"Set the audio track name.\n"
+"\n"
+"Players may use this in the audio selection list."
+msgstr "Установить название звуковой дорожки.\n\nПроигрыватели могут использовать это списке выбора звука. "
+
+msgid "Mix"
+msgstr "Микшер"
+
+msgid "Sample Rate"
+msgstr "Частота дискретизации"
+
+msgid "Sample Rate:"
+msgstr "Частота дискретизации:"
+
+msgid "Enable bitrate setting"
+msgstr "Включить настройку битрейта"
+
+msgid "Enable quality setting"
+msgstr "Включить настройку качества"
+
+msgid "Skip This Version"
+msgstr "Пропустить эту версию"
+
+msgid "Remind Me Later"
+msgstr "Напомнить позже"
+
+msgid "A new version of HandBrake is available!"
+msgstr "Доступна новая версия HandBrake!"
+
+msgid "HandBrake xxx is now available (you have yyy)."
+msgstr "Доступна новая версия HandBrake xxx (у вас версия yyy)."
+
+msgid "Release Notes"
+msgstr "Заметки о релизе"
+
+msgid "none"
+msgstr "нет"
+
+msgid "First Track Matching Selected Languages"
+msgstr "Первая дорожка соответствующая выбранным языкам"
+
+msgid "All Tracks Matching Selected Languages"
+msgstr "Все дорожки соответствующие выбранным языкам"
+
+msgid "Chapters:"
+msgstr "Главы:"
+
+msgid "Seconds:"
+msgstr "Секунды:"
+
+msgid "Frames:"
+msgstr "Кадры:"
+
+msgid "Do Nothing"
+msgstr "Ничего не делать"
+
+msgid "Show Notification"
+msgstr "Показать уведомление"
+
+msgid "Quit Handbrake"
+msgstr "Выйти из Handbrake"
+
+msgid "Put Computer To Sleep"
+msgstr "Перейти в спящий режим"
+
+msgid "Shutdown Computer"
+msgstr "Выключить компьютер"
+
+msgid "Week"
+msgstr "Неделя"
+
+msgid "Year"
+msgstr "Год"
+
+msgid "Immortal"
+msgstr "Вечно"
+
+msgid "Never"
+msgstr "Никогда"
+
+msgid "Daily"
+msgstr "Ежедневно"
+
+msgid "Weekly"
+msgstr "Еженедельно"
+
+msgid "Monthly"
+msgstr "Ежемесячно"
+
+msgid "Month"
+msgstr "Месяц"
+
+msgid "Default"
+msgstr "По умолчанию"
+
+msgid "Fast"
+msgstr "Быстро"
+
+msgid "Bob"
+msgstr ""
+
+msgid "Slow"
+msgstr "Медленно"
+
+msgid "Slower"
+msgstr "Медленно"
+
+msgid "NLMeans"
+msgstr ""
+
+msgid "HQDN3D"
+msgstr ""
+
+msgid "Ultralight"
+msgstr "Очень легкое"
+
+msgid "Light"
+msgstr "Легкое"
+
+msgid "Medium"
+msgstr "Среднее"
+
+msgid "medium"
+msgstr "Среднее"
+
+msgid "Strong"
+msgstr "Сильное"
+
+msgid "Film"
+msgstr "Фильм"
+
+msgid "Grain"
+msgstr "Зернистость"
+
+msgid "High Motion"
+msgstr "Высокое движение"
+
+msgid "Animation"
+msgstr "Анимация"
+
+msgid "Spatial"
+msgstr "Пространственный"
+
+msgid "Temporal"
+msgstr "Временной"
+
+msgid "Automatic"
+msgstr "Автоматически"
+
+msgid "Optimal"
+msgstr "Оптимально"
+
+msgid "Normal"
+msgstr "Стандартный"
+
+msgid "Simple"
+msgstr "Простой"
+
+msgid "Smart"
+msgstr "Интеллектуальный"
+
+msgid "Diamond"
+msgstr "Ромб"
+
+msgid "Hexagon"
+msgstr "Шестиугольник"
+
+msgid "Uneven Multi-Hexagon"
+msgstr "Неравный мультишестиугольник"
+
+msgid "Exhaustive"
+msgstr "Исчерпывающий"
+
+msgid "Hadamard Exhaustive"
+msgstr "Преобразовано-исчерпывающий"
+
+msgid "Some"
+msgstr "Некоторые"
+
+msgid "All"
+msgstr "Все"
+
+msgid "Encode only"
+msgstr "Только кодирование"
+
+msgid "Always"
+msgstr "Всегда"
+
+msgid "Same as source"
+msgstr "Так же, как в источнике"
+
+msgid "Same as source:"
+msgstr "Так же, как в источнике:"
+
+msgid "(NTSC Film)"
+msgstr "(Фильм NTSC)"
+
+msgid "(PAL Film/Video)"
+msgstr "(Фильм/видео PAL)"
+
+msgid "(NTSC Video)"
+msgstr "(Видео NTSC)"
+
+#, c-format
+msgid "%d - Unknown Length"
+msgstr "%d - Продолжительность неизвестна\t"
+
+msgid "No Titles"
+msgstr "Без названия"
+
+msgid "No Audio"
+msgstr "Нет звука"
+
+msgid "Foreign Audio Search"
+msgstr "Поиск иностранного языка"
+
+#, c-format
+msgid "Chapter %2d"
+msgstr "Глава %2d"
+
+#, c-format
+msgid "N/A"
+msgstr "Н/Д"
+
+#, c-format
+msgid ""
+"Invalid Deinterlace Settings:\n"
+"\n"
+"%s\n"
+msgstr "Недопустимые настройки деинтерлейсинга:\n\n%s\n"
+
+#, c-format
+msgid ""
+"Invalid Detelecine Settings:\n"
+"\n"
+"%s\n"
+msgstr "Недопустимые настройки детелесина:\n\n%s\n"
+
+#, c-format
+msgid ""
+"Invalid Decomb Settings:\n"
+"\n"
+"%s\n"
+msgstr "Недопустимые настройки удаления гребенки:\n\n%s\n"
+
+msgid ""
+"Theora is not supported in the MP4 container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, FFMPEG will be chosen for you."
+msgstr "Theora не поддерживается в контейнере MP4.\n\nНеобходимо выбрать другой видеокодек или контейнер.\nЕсли продолжите, для вас будет выбран ffmpeg."
+
+msgid "Continue"
+msgstr "Продолжить"
+
+msgid "No title found.\n"
+msgstr "Название не найдено.\n"
+
+msgid ""
+"Only one subtitle may be burned into the video.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr "Только одни субтитры могут быть записаны в видео.\n\nВы должны изменить настройки субтитров.\nЕсли продолжите, некоторые субтитры будут потеряны."
+
+msgid ""
+"Srt file does not exist or not a regular file.\n"
+"\n"
+"You should choose a valid file.\n"
+"If you continue, this subtitle will be ignored."
+msgstr "Srt файл не существует или неправильный файл.\n\nВам следует выбрать правильный файл.\nЕсли продолжите, эти субтитры будут игнорироваться."
+
+msgid ""
+"The source does not support Pass-Thru.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr "Источника не поддерживает %s автовыбор кодека.\n\nВы должны выбрать другой кодек.\nЕсли вы продолжите, один из них будет выбран для вас."
+
+#, c-format
+msgid ""
+"%s is not supported in the %s container.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr "%s не поддерживается в контейнере %s.\n\nВам следует выбрать другой аудио кодек.\nЕсли продолжите, один будет выбран для вас."
+
+#, c-format
+msgid ""
+"The source audio does not support %s mixdown.\n"
+"\n"
+"You should choose a different mixdown.\n"
+"If you continue, one will be chosen for you."
+msgstr "Аудио источника не поддерживает %s смешивания каналов.\n\nВы должны выбрать другое смешивание каналов.\nЕсли вы продолжите, одно из них будет выбрано для вас."
+
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr "<big>Не удалось создать %s.</big>\n\nВнутренняя ошибка. Не удалось разобрать описание пользовательского интерфейса.\n%s"
+
+#, c-format
+msgid "Signal handler (%s) not found"
+msgstr "Обработчик сигнала (%s) не найден"
+
+msgid "Index"
+msgstr "Индекс"
+
+msgid "Duration"
+msgstr "Продолжительность"
+
+msgid "Title"
+msgstr "Название"
+
+msgid "Done\n"
+msgstr "Готово\n"
+
+msgid "DATA"
+msgstr "Данные"
+
+msgid "Job Information"
+msgstr "Сведения о задании"
+
+msgid "Track Information"
+msgstr "Информация о дорожке"
+
+msgid "Preset Name"
+msgstr "Название предустановки"
+
+msgid "The device or file to encode"
+msgstr "Устройство или файл для кодирования"
+
+msgid "The preset values to use for encoding"
+msgstr "Использовать для кодирования заданные значения"
+
+msgid "Spam a lot"
+msgstr "Много спама"
+
+msgid "- Transcode media formats"
+msgstr "- Форматы перекодирования"
+
+msgid "Globals"
+msgstr "Глобальные"
+
+msgid "Presets"
+msgstr "Предустановки"
+
+msgid "Folder"
+msgstr "Папка"
+
+#, c-format
+msgid "%s path: (%s)"
+msgstr "%s путь: (%s)"
+
+#, c-format
+msgid "%s indices: len %d"
+msgstr "%s индексов: len %d"
+
+msgid "Type"
+msgstr "Тип"
+
+msgid "Failed to find parent folder when adding child."
+msgstr "Не удалось найти родительскую папку."
+
+msgid "Failed to find parent folder while adding child."
+msgstr "Не удалось найти родительскую папку при добавлении вложенной."
+
+#, c-format
+msgid "Can't map language value: (%s)"
+msgstr "Не удается отобразить значение языка: (%s)"
+
+#, c-format
+msgid "Can't map value: (%s)"
+msgstr "Не удается отобразить значение: (%s)"
+
+msgid "Subtitles"
+msgstr "Субтитры"
+
+#, c-format
+msgid "Superfluous tunes! %s"
+msgstr "Ненужные мелодии! %s"
+
+#, c-format
+msgid ""
+"%s: Folder already exists.\n"
+"You can not replace it with a preset."
+msgstr "%s: Папка уже существует.\n Вы не можете изменить это с предустановки."
+
+#, c-format
+msgid ""
+"%s: Preset already exists.\n"
+"You can not replace it with a folder."
+msgstr "%s: Предустановка уже существует.\nВы не можете изменить это с папки."
+
+msgid "Import Preset"
+msgstr "Импорт предустановки"
+
+msgid "All (*)"
+msgstr "Все (*)"
+
+msgid "Presets (*.plist)"
+msgstr "Предустановки (*.plist)"
+
+msgid "Export Preset"
+msgstr "Экспорт предустановки"
+
+#, c-format
+msgid ""
+"Confirm deletion of %s:\n"
+"\n"
+"%s"
+msgstr "Подтвердите удаление %s:\n\n%s"
+
+msgid "No selection??? Perhaps unselected."
+msgstr "Нет выбора ??? Возможно, не выбрано."
+
+msgid "Couldn't create native window for GstXOverlay. Disabling live preview."
+msgstr "Не удалось создать собственное окно для GstXOverlay. Отключение просмотра."
+
+msgid "Couldn't initialize gstreamer. Disabling live preview."
+msgstr "Не удалось инициализировать gstreamer. Отключение просмотра."
+
+#, c-format
+msgid "Gstreamer Error: %s"
+msgstr "Ошибка Gstreamer: %s"
+
+#, c-format
+msgid ""
+"Missing GStreamer plugin\n"
+"Audio or Video may not play as expected\n"
+"\n"
+"%s"
+msgstr "Отсутствует плагин GStreamer\nАудио или видео не сможет проигрываться, как ожидалось\n\n%s"
+
+msgid "Ok"
+msgstr "Ok"
+
+msgid "Done"
+msgstr "Готово"
+
+msgid "Seconds"
+msgstr "Секунды"
+
+msgid "Frames"
+msgstr "Кадры"
+
+#, c-format
+msgid ""
+"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
+" %s"
+msgstr "<big>%s</big> (Название %d, %s %d через %d, 2 проход видео) --> %s"
+
+#, c-format
+msgid ""
+"<big>%s</big> (Title %d, %s %d through %d) --> %s"
+msgstr "<big>%s</big> (Название %d, %s %d через %d) --> %s"
+
+#, c-format
+msgid "Modified Preset Based On: %s\n"
+msgstr "Изменен шаблон на основе: %s\n"
+
+#, c-format
+msgid "Preset: %s\n"
+msgstr "Предустановка: %s\n"
+
+#, c-format
+msgid "Format: %s Container\n"
+msgstr "Формат: %s Контейнер\n"
+
+msgid "Container Options:"
+msgstr "Параметры контейнера:"
+
+#, c-format
+msgid "%sChapter Markers"
+msgstr "%sМаркеры глав"
+
+#, c-format
+msgid "%siPod 5G Support"
+msgstr "%sПоддержка iPod 5G"
+
+#, c-format
+msgid "%sWeb Optimized"
+msgstr "%sОптимизация для интернет-трансляции"
+
+#, c-format
+msgid "%sLarge File Size (>4GB)"
+msgstr "%sБольшой размер файла (>4GB)"
+
+#, c-format
+msgid "Destination: %s\n"
+msgstr "Назначение: %s\n"
+
+msgid "(Aspect Preserved)"
+msgstr "(Соотношение сохранилось)"
+
+msgid "(Aspect Lost)"
+msgstr "(Соотношение потерялось)"
+
+msgid "(Anamorphic)"
+msgstr "(Анаморфотный)"
+
+msgid "(Custom Anamorphic)"
+msgstr "(Пользовательский анаморфотный)"
+
+msgid "Picture: "
+msgstr "Изображение:"
+
+#, c-format
+msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
+msgstr "Источник: %d x %d, Вывод %d x %d %s, Обрезка %d:%d:%d:%d"
+
+#, c-format
+msgid ", Display %d x %d"
+msgstr ", Дисплей %d x %d"
+
+msgid "Filters:"
+msgstr "Фильтры:"
+
+#, c-format
+msgid "%sDetelecine"
+msgstr "%sДетелесин"
+
+#, c-format
+msgid "%sDecomb"
+msgstr "%sУбрать гребенку"
+
+#, c-format
+msgid "%sDeinterlace"
+msgstr "%sДеинтерлейсинг"
+
+#, c-format
+msgid "%sDenoise Filter %s:"
+msgstr "%sФильтр шумоподавления %s:"
+
+#, c-format
+msgid "%sDeblock: %d"
+msgstr "%sУровень блочности: %d"
+
+#, c-format
+msgid "%sGrayscale"
+msgstr "%sГрадации серого"
+
+#, c-format
+msgid "Video: %s"
+msgstr "Видео: %s"
+
+#, c-format
+msgid ", Framerate: %s %s"
+msgstr ", Частота кадров: %s %s"
+
+#, c-format
+msgid ", Framerate: Peak %s (may be lower)"
+msgstr ", Частота кадров: Пик %s (может быть ниже)"
+
+#, c-format
+msgid ", Framerate: %s (constant frame rate)"
+msgstr ", Частота кадров: %s (включает постоянную частоту кадров)"
+
+msgid "Error"
+msgstr "Ошибка"
+
+msgid "Bitrate:"
+msgstr "Битрейт:"
+
+msgid "Turbo 1st Pass: On\n"
+msgstr "Turbo 1 проход: На\n"
+
+#, c-format
+msgid "Video Options: Preset: %s"
+msgstr "Параметры видео: Предустановка: %s"
+
+msgid " - Tune: "
+msgstr " - Настройки: "
+
+#, c-format
+msgid " - Profile: %s"
+msgstr " - Профиль: %s"
+
+#, c-format
+msgid " - Level: %s"
+msgstr " - Уровень: %s"
+
+#, c-format
+msgid "Advanced Options: %s\n"
+msgstr "Дополнительные опции: %s\n"
+
+msgid "Audio: "
+msgstr "Аудио: "
+
+#, c-format
+msgid "Audio Tracks: %d"
+msgstr "Звуковые дорожки: %d"
+
+#, c-format
+msgid "Bitrate: %d"
+msgstr "Битрейт: %d"
+
+#, c-format
+msgid "%s --> Encoder: %s"
+msgstr "%s --> Кодировщик: %s"
+
+#, c-format
+msgid "%s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
+msgstr "%s --> Кодировщик: %s, Смешивание каналов: %s, Частота дискредитации: %s, %s"
+
+msgid "Subtitle: "
+msgstr "Субтитры:"
+
+#, c-format
+msgid "Subtitle Tracks: %d\n"
+msgstr "Дорожки субтитров: %d\n"
+
+msgid " (Force)"
+msgstr " (Принудительно)"
+
+msgid " (Burn)"
+msgstr " (Записать)"
+
+msgid " (Default)"
+msgstr " (По умолчанию)"
+
+#, c-format
+msgid " %s (%s), %s, Offset (ms) %d%s\n"
+msgstr " %s (%s), %s, Смещение (мс) %d%s\n"
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Another queued job has specified the same destination.\n"
+"Do you want to overwrite?"
+msgstr "Назначение: %s\n\nДругое задание в очереди имеет это же назначение.\nХотите его перезаписать?"
+
+msgid "Overwrite"
+msgstr "Перезаписать"
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"This is not a valid directory."
+msgstr "Назначение: %s\n\nЭто не допустимый каталог."
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Can not read or write the directory."
+msgstr "Назначение: %s\n\nНе удается чтение или запись в папку."
+
+#, c-format
+msgid ""
+"Destination filesystem is almost full: %uM free\n"
+"\n"
+"Encode may be incomplete if you proceed.\n"
+msgstr "Файловая система почти заполнена: %uM свободно\n\nКодирование может быть неполным, если продолжите.\n"
+
+msgid "Proceed"
+msgstr "Продолжить"
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"File already exists.\n"
+"Do you want to overwrite?"
+msgstr "Назначение: %s\n\nФайл уже существует.\nХотите его переписать?"
+
+msgid ""
+"Duplicate destination files detected.\n"
+"Duplicates will not be added to the queue."
+msgstr "Обнаружены повторяющиеся целевые файлы.\nДубликаты не будут добавлены в очередь."
+
+msgid "No Title"
+msgstr "Без названия"
+
+msgid ""
+"There is another title with the same destination file name.\n"
+"This title will not be added to the queue unless you change\n"
+"the output file name.\n"
+msgstr "Существует еще одно название с тем же именем файла назначения.\nЭто название не будет добавлено в очередь, если не изменить\nимя выходного файла.\n"
+
+msgid "Stop"
+msgstr "Остановить"
+
+msgid "Stop Encoding"
+msgstr "Остановить кодирование"
+
+msgid "Resume"
+msgstr "Продолжить"
+
+msgid "Resume Encoding"
+msgstr "Продолжить кодирование"
+
+msgid "_Start Queue"
+msgstr "_Запустить очередь"
+
+msgid "_Resume Queue"
+msgstr "_Продолжить очередь"
+
+msgid ""
+"You are currently encoding. What would you like to do?\n"
+"\n"
+msgstr "Вы сейчас кодируете. Что бы вы хотели сделать?\n\n"
+
+#, c-format
+msgid ""
+"You have %d unfinished job(s) in a saved queue.\n"
+"\n"
+"Would you like to reload them?"
+msgstr "У вас есть %d незаконченное задание(я) в сохраненной очереди.\n\nХотите их перезапустить?"
+
+msgid "No"
+msgstr "Нет"
+
+msgid "Yes"
+msgstr "Да"
+
+#, c-format
+msgid "Usage: %s infile [outfile]\n"
+msgstr "Используется: %s infile [outfile]\n"
+
+#, c-format
+msgid "Attempt to set unknown widget type: %s\n"
+msgstr "Попытка установить неизвестный тип виджета: %s\n"
+
+#, c-format
+msgid "No value found for %s\n"
+msgstr "Не найдено значение для %s\n"
+
+msgid "Attempt to set unknown widget type"
+msgstr "Попытка установить неизвестный тип виджета"
+
+#, c-format
+msgid "Failed to find widget for key: %s\n"
+msgstr "Не удалось найти виджет для ключа: %s\n"
+
+#, c-format
+msgid "Offset: %dms"
+msgstr "Смещение: %dms"
+
+msgid "Burned Into Video"
+msgstr "Сведения о записываемом видео"
+
+msgid "Passthrough"
+msgstr "Передача"
+
+msgid "(Forced Subtitles Only)"
+msgstr "(Только принудительные субтитры)"
+
+msgid "(Default)"
+msgstr "(По умолчанию)"
+
+msgid "Error!"
+msgstr "Ошибка!"
+
+#, c-format
+msgid "Preferred Language: %s"
+msgstr "Предпочитаемый язык: %s"
+
+#, c-format
+msgid "Add %s subtitle track if default audio is not %s"
+msgstr "Добавить %s дорожку субтитров, если не звука по умолчанию %s"
+
+#, c-format
+msgid "Type %s"
+msgstr "Тип %s"
+
+#, c-format
+msgid "Type %s value %s"
+msgstr "Тип %s значение %s"
+
+#, c-format
+msgid "Type %s value %d"
+msgstr "Тип %s значение %d"
+
+#, c-format
+msgid "Type %s value %<PRId64>"
+msgstr "Тип %s значение %<PRId64>"
+
+#, c-format
+msgid "Type %s value %f"
+msgstr "Тип %s значение %f"
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"%s\""
+msgstr "%s\n\nРасширенные параметры:\n\"%s\""
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"\""
+msgstr "%s\n\nРасширенные параметры:\n\"\""
+
+msgid "ERROR"
+msgstr "ОШИБКА"
+
+msgid ""
+"Anamorphic Modes:\n"
+"<tt>\n"
+"None - Force pixel aspect ratio to 1:1.\n"
+"Loose - Align dimensions to chosen 'Alignment' value \n"
+" and pick pixel aspect ratio that preserves the\n"
+" original display aspect ratio\n"
+"Strict - Keep original source dimensions and pixel \n"
+" aspect ratio</tt>"
+msgstr "Анаморфные режимы:\n<tt>\nНет - Принудительное соотношение сторон 1:1.\nПроизвольно - Выровнять размеры выбрав 'Выравнивание' \n чтобы значение и соотношение сторон соответствовало \n соотношению сторон оригинала\nСтрого - Держать исходные размеры и исходное \n соотношение сторон</tt>"
+
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Виктор Рыжих"
+
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "victorr2007@yandex.ru"

HandBrake-0.9.9.tar.bz2/gtk/src/Makefile.am -> HandBrake-0.10.0.tar.bz2/gtk/src/Makefile.am Changed

@@ -1,49 +1,21 @@
 ## Process this file with automake to produce Makefile.in
 
 icons =	\
-	hb-icon.256.png \
-	hb-icon.128.png \
-	hb-icon.64.png \
-	hb-icon.48.png \
-	hb-icon.32.png \
-	hb-icon.24.png \
-	hb-icon.22.png \
-	hb-icon.16.png
+	hb-icon.svg
 
 icons_dep =	\
-	hb-activity.32.png \
-	hb-activity.64.png \
-	hb-add-queue.32.png \
-	hb-add-queue.64.png \
-	hb-canceled.16.png \
-	hb-complete.16.png \
-	hb-status.32.png \
-	hb-status-empty.32.png \
-	hb-icon.128.png \
-	hb-icon.64.png \
-	hb-pause.32.png \
-	hb-pause.64.png \
-	hb-start.32.png \
-	hb-start.64.png \
-	hb-pref.32.png \
-	hb-showqueue.32.png \
-	hb-showqueue.64.png \
-	hb-remove.24.png \
-	hb-remove.48.png \
-	hb-queue-job.16.png \
-	hb-queue-pass1.16.png \
-	hb-queue-pass2.16.png \
-	hb-queue-subtitle.16.png \
-	hb-source.32.png \
-	hb-source.64.png \
-	hb-stop.32.png \
-	hb-stop.64.png \
-	hb-working0.16.png \
-	hb-working1.16.png \
-	hb-working2.16.png \
-	hb-working3.16.png \
-	hb-working4.16.png \
-	hb-working5.16.png
+	hb-icon.svg \
+	hb-start.svg \
+	hb-pause.svg \
+	hb-stop.svg \
+	hb-add-queue.svg \
+	hb-showqueue.svg \
+	hb-picture.svg \
+	hb-activity.svg \
+	hb-source.svg \
+	hb-remove.svg \
+	hb-edit.svg \
+	hb-complete.svg
 
 hb_menu = ghb.desktop
 
@@ -55,7 +27,7 @@
 
 AM_CFLAGS = -Wall -g
 
-bin_PROGRAMS = ghb 
+bin_PROGRAMS = ghb
 
 # Dummy file, not built. Forces g++ linking
 nodist_EXTRA_ghb_SOURCES = dummy.cpp
@@ -65,6 +37,8 @@
 	callbacks.h \
 	queuehandler.c \
 	queuehandler.h \
+	videohandler.c \
+	videohandler.h \
 	audiohandler.c \
 	audiohandler.h \
 	subtitlehandler.c \
@@ -81,8 +55,6 @@
 	preview.c \
 	icons.c \
 	icons.h \
-	icon_tools.c \
-	icon_tools.h \
 	values.c \
 	values.h \
 	appcast.c \
@@ -112,16 +84,16 @@
 
 ghb_LDADD = $(HB_LIBS) $(GHB_LIBS)
 
-ghb_DEPENDENCIES = $(HB_DIR)/libhb/libhb.a
+ghb_DEPENDENCIES = $(HB_DIR)/libhb/libhandbrake.a
 
 resources.o: resource_data.h
 
 resource_data.h: resources.plist
-	python $(srcdir)/quotestring.py resources.plist resource_data.h
+	python2 $(srcdir)/quotestring.py resources.plist resource_data.h
 
 widget_reverse.deps: makedeps.py
 widget.deps: makedeps.py
-	python $(srcdir)/makedeps.py
+	python2 $(srcdir)/makedeps.py
 
 resources.plist: create_resources resources.list $(icons_dep) internal_defaults.xml standard_presets.xml ghb.ui widget.deps widget_reverse.deps
 	./create_resources -I$(srcdir) $(srcdir)/resources.list resources.plist
@@ -129,15 +101,15 @@
 CREATE_RES.c = \
 	create_resources.c \
 	plist.c \
-	values.c 
+	values.c
 
 CREATE_RES.c.o = $(patsubst %.c,%-native.o,$(CREATE_RES.c))
 
 create_resources: $(CREATE_RES.c.o)
-	$(CC_FOR_BUILD) -o $@ $^ $(GHB_TOOLS_LIBS)
- 
+	$(CC_FOR_BUILD) -g -o $@ $^ $(GHB_TOOLS_LIBS)
+
 $(CREATE_RES.c.o): %-native.o: %.c
-	$(CC_FOR_BUILD) $(GHB_TOOLS_CFLAGS) -c -o $@ $<
+	$(CC_FOR_BUILD) $(GHB_TOOLS_CFLAGS) -g -c -o $@ $<
 
 ghbcellrenderertext.$(OBJEXT): marshalers.h

HandBrake-0.9.9.tar.bz2/gtk/src/appcast.c -> HandBrake-0.10.0.tar.bz2/gtk/src/appcast.c Changed

@@ -2,9 +2,9 @@
 /*
 * appcast.c
 * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
- * 
+ *
 * appcast.c is free software.
- * 
+ *
 * You may 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)
@@ -15,7 +15,6 @@
 #include <string.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include "icon_tools.h"
 #include "plist.h"
 #include "values.h"
 
@@ -55,8 +54,8 @@
 
 static const gchar*
 lookup_attr_value(
- const gchar *name, 
- const gchar **attr_names, 
+ const gchar *name,
+ const gchar **attr_names,
 const gchar **attr_values)
 {
 gint ii;
@@ -69,18 +68,18 @@
 }
 return NULL;
 }
- 
+
 static void
 start_element(
- GMarkupParseContext *ctx, 
- const gchar *tag, 
+ GMarkupParseContext *ctx,
+ const gchar *tag,
 const gchar **attr_names,
 const gchar **attr_values,
 gpointer ud,
 GError **error)
 {
 parse_data_t *pd = (parse_data_t*)ud;
- union 
+ union
 {
 gint id;
 gpointer pid;
@@ -124,14 +123,14 @@
 
 static void
 end_element(
- GMarkupParseContext *ctx, 
- const gchar *tag, 
+ GMarkupParseContext *ctx,
+ const gchar *tag,
 gpointer ud,
 GError **error)
 {
 parse_data_t *pd = (parse_data_t*)ud;
 gint id;
- union 
+ union
 {
 gint id;
 gpointer pid;
@@ -169,14 +168,14 @@
 
 static void
 text_data(
- GMarkupParseContext *ctx, 
- const gchar *text, 
+ GMarkupParseContext *ctx,
+ const gchar *text,
 gsize len,
 gpointer ud,
 GError **error)
 {
 parse_data_t *pd = (parse_data_t*)ud;
- union 
+ union
 {
 gint id;
 gpointer pid;
@@ -202,8 +201,8 @@
 
 static void
 passthrough(
- GMarkupParseContext *ctx, 
- const gchar *text, 
+ GMarkupParseContext *ctx,
+ const gchar *text,
 gsize len,
 gpointer ud,
 GError **error)
@@ -220,7 +219,7 @@
 }
 
 // This is required or the parser crashes
-static void 
+static void
 destroy_notify(gpointer data)
 { // Do nothing
 //g_debug("destroy parser");

HandBrake-0.9.9.tar.bz2/gtk/src/appcast.h -> HandBrake-0.10.0.tar.bz2/gtk/src/appcast.h Changed

HandBrake-0.9.9.tar.bz2/gtk/src/audiohandler.c -> HandBrake-0.10.0.tar.bz2/gtk/src/audiohandler.c Changed

@@ -2,15 +2,16 @@
 /*
 * audiohandler.c
 * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
- * 
+ *
 * audiohandler.c is free software.
- * 
+ *
 * You may 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.
 */
 
+#include <glib/gi18n.h>
 #include "ghbcompat.h"
 #include "hb.h"
 #include "settings.h"
@@ -19,38 +20,88 @@
 #include "callbacks.h"
 #include "preview.h"
 #include "audiohandler.h"
+#include "presets.h"
 
-static gboolean ghb_add_audio_to_settings(GValue *settings, GValue *asettings);
-static void ghb_add_audio_to_ui(GtkBuilder *builder, const GValue *settings);
-static GValue* get_selected_asettings(signal_user_data_t *ud);
+static void audio_add_to_settings(GValue *settings, GValue *asettings);
+static void ghb_add_audio_to_ui(signal_user_data_t *ud, const GValue *settings);
+static GValue* audio_get_selected_settings(signal_user_data_t *ud, int *index);
 static void ghb_clear_audio_list_settings(GValue *settings);
 static void ghb_clear_audio_list_ui(GtkBuilder *builder);
 
 static gboolean block_updates = FALSE;
 
-void
-ghb_show_hide_advanced_audio( signal_user_data_t *ud )
+static void enable_quality_widget(signal_user_data_t *ud, int acodec)
 {
- GtkWidget *widget;
+ GtkWidget *widget1, *widget2;
 
- g_debug("audio_advanced_clicked_cb ()");
- widget = GHB_WIDGET(ud->builder, "AdvancedAudioPassTable");
- if (!ghb_settings_get_boolean(ud->settings, "AdvancedAutoPassthru"))
- gtk_widget_hide(widget);
+ widget1 = GHB_WIDGET(ud->builder, "AudioTrackQualityEnable");
+ widget2 = GHB_WIDGET(ud->builder, "AudioTrackBitrateEnable");
+ if (hb_audio_quality_get_default(acodec) == HB_INVALID_AUDIO_QUALITY)
+ {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget2), TRUE);
+ gtk_widget_set_sensitive(widget1, FALSE);
+ }
 else
- gtk_widget_show(widget);
+ {
+ gtk_widget_set_sensitive(widget1, TRUE);
+ }
 }
 
-void
-check_list_full(signal_user_data_t *ud)
+static void audio_deps(signal_user_data_t *ud, GValue *asettings, GtkWidget *widget)
 {
- GValue *audio_list;
- gint count;
+ ghb_adjust_audio_rate_combos(ud);
+ ghb_grey_combo_options (ud);
+ if (widget != NULL)
+ ghb_check_dependency(ud, widget, NULL);
 
- audio_list = ghb_settings_get_value(ud->settings, "audio_list");
- count = ghb_array_len(audio_list);
- GtkWidget * widget = GHB_WIDGET(ud->builder, "audio_add");
- gtk_widget_set_sensitive(widget, count != 99);
+ gint track = -1, codec = 0;
+ hb_audio_config_t *aconfig = NULL;
+ int title_id;
+ gint titleindex;
+ const hb_title_t *title;
+
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+
+ if (asettings != NULL)
+ {
+ track = ghb_settings_get_int(asettings, "AudioTrack");
+ codec = ghb_settings_audio_encoder_codec(asettings, "AudioEncoder");
+ aconfig = ghb_get_audio_info(title, track);
+ }
+
+ gboolean is_passthru = (codec & HB_ACODEC_PASS_FLAG);
+ gboolean enable_drc = TRUE;
+ if (aconfig != NULL)
+ {
+ enable_drc = hb_audio_can_apply_drc(aconfig->in.codec,
+ aconfig->in.codec_param, codec) &&
+ !is_passthru;
+ }
+
+ widget = GHB_WIDGET(ud->builder, "AudioTrackDRCSlider");
+ gtk_widget_set_sensitive(widget, enable_drc);
+ widget = GHB_WIDGET(ud->builder, "AudioTrackDRCSliderLabel");
+ gtk_widget_set_sensitive(widget, enable_drc);
+ widget = GHB_WIDGET(ud->builder, "AudioTrackDRCValue");
+ gtk_widget_set_sensitive(widget, enable_drc);
+
+ enable_quality_widget(ud, codec);
+
+ widget = GHB_WIDGET(ud->builder, "AudioBitrate");
+ gtk_widget_set_sensitive(widget, !is_passthru);
+ widget = GHB_WIDGET(ud->builder, "AudioTrackQualityEnableBox");
+ gtk_widget_set_sensitive(widget, !is_passthru);
+ widget = GHB_WIDGET(ud->builder, "AudioTrackQualityBox");
+ gtk_widget_set_sensitive(widget, !is_passthru);
+ widget = GHB_WIDGET(ud->builder, "AudioMixdown");
+ gtk_widget_set_sensitive(widget, !is_passthru);
+ widget = GHB_WIDGET(ud->builder, "AudioSamplerate");
+ gtk_widget_set_sensitive(widget, !is_passthru);
+ widget = GHB_WIDGET(ud->builder, "AudioTrackGainSlider");
+ gtk_widget_set_sensitive(widget, !is_passthru);
+ widget = GHB_WIDGET(ud->builder, "AudioTrackGainValue");
+ gtk_widget_set_sensitive(widget, !is_passthru);
 }
 
 gint
@@ -63,17 +114,18 @@
 return hb_autopassthru_get_encoder(in_codec, copy_mask, fallback, mux);
 }
 
- gint ii;
 // Sanitize fallback
- for (ii = 0; ii < hb_audio_encoders_count; ii++)
+ const hb_encoder_t *enc;
+ for (enc = hb_audio_encoder_get_next(NULL); enc != NULL;
+ enc = hb_audio_encoder_get_next(enc))
 {
- if (hb_audio_encoders[ii].encoder == fallback &&
- !(hb_audio_encoders[ii].muxers & mux))
+ if (enc->codec == fallback &&
+ !(enc->muxers & mux))
 {
- if ( mux == HB_MUX_MKV )
+ if ( mux & HB_MUX_MASK_MKV )
 fallback = HB_ACODEC_LAME;
 else
- fallback = HB_ACODEC_FAAC;
+ fallback = HB_ACODEC_FFAAC;
 break;
 }
 }
@@ -82,10 +134,11 @@
 {
 return fallback;
 }
- for (ii = 0; ii < hb_audio_encoders_count; ii++)
+ for (enc = hb_audio_encoder_get_next(NULL); enc != NULL;
+ enc = hb_audio_encoder_get_next(enc))
 {
- if (hb_audio_encoders[ii].encoder == acodec &&
- !(hb_audio_encoders[ii].muxers & mux))
+ if (enc->codec == acodec &&
+ !(enc->muxers & mux))
 {
 return fallback;
 }
@@ -120,7 +173,7 @@
 return mask;
 }
 
-int ghb_select_fallback( GValue *settings, int mux, int acodec )
+int ghb_select_fallback(GValue *settings, int acodec)
 {
 gint fallback = 0;
 
@@ -130,45 +183,59 @@
 return HB_ACODEC_LAME;
 
 case HB_ACODEC_AAC_PASS:
- return HB_ACODEC_FAAC;
+ return HB_ACODEC_FFAAC;
 
 case HB_ACODEC_AC3_PASS:
 return HB_ACODEC_AC3;
 
 default:
 {
- fallback = ghb_settings_combo_int(settings, "AudioEncoderFallback");
- return hb_autopassthru_get_encoder(acodec, 0, fallback, mux);
+ const char *mux_id;
+ const hb_container_t *mux;
+
+ mux_id = ghb_settings_get_const_string(settings, "FileFormat");
+ mux = ghb_lookup_container_by_name(mux_id);
+
+ fallback = ghb_settings_audio_encoder_codec(settings,
+ "AudioEncoderFallback");
+ return hb_autopassthru_get_encoder(acodec, 0, fallback, mux->format);
 }
 }
 }
 
 void
-ghb_sanitize_audio(GValue *settings, GValue *asettings)
+audio_sanitize_settings(GValue *settings, GValue *asettings)
 {
+ int title_id;
 gint titleindex, track, acodec, select_acodec, mix;
+ const hb_title_t *title;
 hb_audio_config_t *aconfig;
- gint mux;
 gint bitrate;
 gint sr;
- 
- g_debug("ghb_santiize_audio ()");
- mux = ghb_settings_combo_int(settings, "FileFormat");
- titleindex = ghb_settings_get_int(settings, "title_no");
- track = ghb_settings_combo_int(asettings, "AudioTrack");
- acodec = ghb_settings_combo_int(asettings, "AudioEncoder");
- mix = ghb_settings_combo_int(asettings, "AudioMixdown");
- bitrate = ghb_settings_combo_int(asettings, "AudioBitrate");
- sr = ghb_settings_combo_int(asettings, "AudioSamplerate");
-
- aconfig = ghb_get_scan_audio_info(titleindex, track);
+
+ const char *mux_id;
+ const hb_container_t *mux;
+
+ mux_id = ghb_settings_get_const_string(settings, "FileFormat");
+ mux = ghb_lookup_container_by_name(mux_id);
+
+ title_id = ghb_settings_get_int(settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ track = ghb_settings_get_int(asettings, "AudioTrack");
+ acodec = ghb_settings_audio_encoder_codec(asettings, "AudioEncoder");
+ mix = ghb_settings_mixdown_mix(asettings, "AudioMixdown");
+ bitrate = ghb_settings_audio_bitrate_rate(asettings, "AudioBitrate");
+ sr = ghb_settings_audio_samplerate_rate(asettings, "AudioSamplerate");
+
+ aconfig = ghb_get_audio_info(title, track);
 if (sr == 0)
 {
 sr = aconfig ? aconfig->in.samplerate : 48000;
 }
- gint fallback = ghb_select_fallback(settings, mux, acodec);
+ gint fallback = ghb_select_fallback(settings, acodec);
 gint copy_mask = ghb_get_copy_mask(settings);
- select_acodec = ghb_select_audio_codec(mux, aconfig, acodec, fallback, copy_mask);
+ select_acodec = ghb_select_audio_codec(mux->format, aconfig, acodec,
+ fallback, copy_mask);
 if (ghb_audio_is_passthru (select_acodec))
 {
 if (aconfig)
@@ -176,85 +243,73 @@
 bitrate = aconfig->in.bitrate / 1000;
 
 // Set the values for bitrate and samplerate to the input rates
- mix = 0;
+ mix = HB_AMIXDOWN_NONE;
 ghb_settings_set_string(asettings, "AudioMixdown",
- ghb_lookup_combo_string("AudioMixdown", ghb_int_value(mix)));
+ hb_mixdown_get_short_name(mix));
 select_acodec &= aconfig->in.codec | HB_ACODEC_PASS_FLAG;
 ghb_settings_set_string(asettings, "AudioSamplerate",
- ghb_lookup_combo_string("AudioSamplerate", ghb_int_value(0)));
+ ghb_audio_samplerate_get_short_name(0));
 }
 else
 {
- mix = 0;
+ mix = HB_AMIXDOWN_NONE;
 ghb_settings_set_string(asettings, "AudioMixdown",
- ghb_lookup_combo_string("AudioMixdown", ghb_int_value(mix)));
+ hb_mixdown_get_short_name(mix));
 ghb_settings_set_string(asettings, "AudioSamplerate",
- ghb_lookup_combo_string("AudioSamplerate", ghb_int_value(0)));
+ ghb_audio_samplerate_get_short_name(0));
 bitrate = 448;
 }
 ghb_settings_set_double(asettings, "AudioTrackDRCSlider", 0.0);
 }
 else
 {
- if (mix == 0)
- mix = ghb_get_best_mix( aconfig, select_acodec, 0);
- bitrate = hb_get_best_audio_bitrate(select_acodec, bitrate, sr, mix);
+ if (mix == HB_AMIXDOWN_NONE)
+ mix = ghb_get_best_mix(aconfig, select_acodec, mix);
+ bitrate = hb_audio_bitrate_get_best(select_acodec, bitrate, sr, mix);
 ghb_settings_set_string(asettings, "AudioMixdown",
- ghb_lookup_combo_string("AudioMixdown", ghb_int_value(mix)));
+ hb_mixdown_get_short_name(mix));
 }
 ghb_settings_set_string(asettings, "AudioBitrate",
- ghb_lookup_combo_string("AudioBitrate", ghb_int_value(bitrate)));
+ ghb_audio_bitrate_get_short_name(bitrate));
 
- ghb_settings_take_value(asettings, "AudioEncoderActual", 
- ghb_lookup_acodec_value(select_acodec));
+ ghb_settings_set_string(asettings, "AudioEncoder",
+ hb_audio_encoder_get_short_name(select_acodec));
 }
 
 void
 ghb_adjust_audio_rate_combos(signal_user_data_t *ud)
 {
- gint titleindex, track, acodec, select_acodec, mix;
+ int title_id, titleindex;
+ const hb_title_t *title;
+ gint track, acodec, select_acodec, mix;
 hb_audio_config_t *aconfig;
- GtkWidget *widget;
- GValue *gval;
- gint mux;
 gint bitrate;
 gint sr = 48000;
- 
- g_debug("ghb_adjust_audio_rate_combos ()");
- mux = ghb_settings_combo_int(ud->settings, "FileFormat");
- titleindex = ghb_settings_combo_int(ud->settings, "title");
-
- widget = GHB_WIDGET(ud->builder, "AudioTrack");
- gval = ghb_widget_value(widget);
- track = ghb_lookup_combo_int("AudioTrack", gval);
- ghb_value_free(gval);
-
- widget = GHB_WIDGET(ud->builder, "AudioEncoder");
- gval = ghb_widget_value(widget);
- acodec = ghb_lookup_combo_int("AudioEncoder", gval);
- ghb_value_free(gval);
- widget = GHB_WIDGET(ud->builder, "AudioMixdown");
- gval = ghb_widget_value(widget);
- mix = ghb_lookup_combo_int("AudioMixdown", gval);
- ghb_value_free(gval);
 
- widget = GHB_WIDGET(ud->builder, "AudioBitrate");
- gval = ghb_widget_value(widget);
- bitrate = ghb_lookup_combo_int("AudioBitrate", gval);
+ const char *mux_id;
+ const hb_container_t *mux;
 
- widget = GHB_WIDGET(ud->builder, "AudioSamplerate");
- gval = ghb_widget_value(widget);
- sr = ghb_lookup_combo_int("AudioSamplerate", gval);
+ mux_id = ghb_settings_get_const_string(ud->settings, "FileFormat");
+ mux = ghb_lookup_container_by_name(mux_id);
+
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
 
+ track = ghb_settings_get_int(ud->settings, "AudioTrack");
+ acodec = ghb_settings_audio_encoder_codec(ud->settings, "AudioEncoder");
+ mix = ghb_settings_mixdown_mix(ud->settings, "AudioMixdown");
+ bitrate = ghb_settings_audio_bitrate_rate(ud->settings, "AudioBitrate");
+ sr = ghb_settings_audio_samplerate_rate(ud->settings, "AudioSamplerate");
 
- aconfig = ghb_get_scan_audio_info(titleindex, track);
+ aconfig = ghb_get_audio_info(title, track);
 if (sr == 0)
 {
 sr = aconfig ? aconfig->in.samplerate : 48000;
 }
- gint fallback = ghb_select_fallback( ud->settings, mux, acodec );
+ gint fallback = ghb_select_fallback(ud->settings, acodec);
 gint copy_mask = ghb_get_copy_mask(ud->settings);
- select_acodec = ghb_select_audio_codec(mux, aconfig, acodec, fallback, copy_mask);
+ select_acodec = ghb_select_audio_codec(mux->format, aconfig, acodec,
+ fallback, copy_mask);
 gboolean codec_defined_bitrate = FALSE;
 if (ghb_audio_is_passthru (select_acodec))
 {
@@ -264,47 +319,133 @@
 
 // Set the values for bitrate and samplerate to the input rates
 ghb_set_bitrate_opts (ud->builder, bitrate, bitrate, bitrate);
- mix = 0;
- ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(mix));
+ mix = HB_AMIXDOWN_NONE;
+ ghb_ui_update(ud, "AudioMixdown",
+ ghb_string_value(hb_mixdown_get_short_name(mix)));
 select_acodec &= aconfig->in.codec | HB_ACODEC_PASS_FLAG;
 codec_defined_bitrate = TRUE;
- ghb_ui_update(ud, "AudioSamplerate", ghb_int64_value(0));
+ ghb_ui_update(ud, "AudioSamplerate",
+ ghb_string_value(
+ ghb_audio_samplerate_get_short_name(0)));
 }
 else
 {
- ghb_ui_update(ud, "AudioSamplerate", ghb_int64_value(0));
- mix = 0;
- ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(mix));
+ ghb_ui_update(ud, "AudioSamplerate",
+ ghb_string_value(
+ ghb_audio_samplerate_get_short_name(0)));
+ mix = HB_AMIXDOWN_NONE;
+ ghb_ui_update(ud, "AudioMixdown",
+ ghb_string_value(hb_mixdown_get_short_name(mix)));
 bitrate = 448;
 }
 ghb_ui_update(ud, "AudioTrackDRCSlider", ghb_double_value(0));
 }
 else
 {
- if (mix == 0)
- mix = ghb_get_best_mix( aconfig, select_acodec, 0);
- bitrate = hb_get_best_audio_bitrate(select_acodec, bitrate, sr, mix);
- ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(mix));
+ if (mix == HB_AMIXDOWN_NONE)
+ mix = ghb_get_best_mix( aconfig, select_acodec, mix);
+ bitrate = hb_audio_bitrate_get_best(select_acodec, bitrate, sr, mix);
+ ghb_ui_update(ud, "AudioMixdown",
+ ghb_string_value(hb_mixdown_get_short_name(mix)));
 }
 if (!codec_defined_bitrate)
 {
 int low, high;
 mix = ghb_get_best_mix( aconfig, select_acodec, mix);
- hb_get_audio_bitrate_limits(select_acodec, sr, mix, &low, &high);
- ghb_set_bitrate_opts (ud->builder, low, high, -1);
+ hb_audio_bitrate_get_limits(select_acodec, sr, mix, &low, &high);
+ ghb_set_bitrate_opts(ud->builder, low, high, -1);
 }
- ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(bitrate));
+ ghb_ui_update(ud, "AudioBitrate",
+ ghb_string_value(ghb_audio_bitrate_get_short_name(bitrate)));
 
- ghb_settings_take_value(ud->settings, "AudioEncoderActual", 
- ghb_lookup_acodec_value(select_acodec));
- GValue *asettings = get_selected_asettings(ud);
+ ghb_settings_set_string(ud->settings, "AudioEncoder",
+ hb_audio_encoder_get_short_name(select_acodec));
+ GValue *asettings = audio_get_selected_settings(ud, NULL);
 if (asettings)
 {
- ghb_settings_take_value(asettings, "AudioEncoderActual", 
- ghb_lookup_acodec_value(select_acodec));
+ ghb_settings_set_string(asettings, "AudioEncoder",
+ hb_audio_encoder_get_short_name(select_acodec));
 }
 ghb_audio_list_refresh_selected(ud);
- ghb_check_dependency(ud, NULL, "AudioEncoderActual");
+}
+
+static char * get_drc_string(gdouble drc)
+{
+ char *s_drc;
+ if (drc < 0.99)
+ s_drc = g_strdup(_("Off"));
+ else
+ s_drc = g_strdup_printf("%.1f", drc);
+ return s_drc;
+}
+
+static char * get_gain_string(gdouble gain)
+{
+ char *s_gain;
+ if ( gain >= 21.0 )
+ s_gain = g_strdup_printf("*11*");
+ else
+ s_gain = g_strdup_printf(_("%ddB"), (int)gain);
+ return s_gain;
+}
+
+static char * get_quality_string(GValue *settings, gdouble quality)
+{
+ float low, high, gran;
+ int dir;
+ int codec = ghb_settings_audio_encoder_codec(settings, "AudioEncoder");
+ hb_audio_quality_get_limits(codec, &low, &high, &gran, &dir);
+ if (dir)
+ {
+ // Quality values are inverted
+ quality = high - quality + low;
+ }
+ char *s_quality = ghb_format_quality("", codec, quality);
+ return s_quality;
+}
+
+static void
+audio_update_dialog_widgets(signal_user_data_t *ud, GValue *asettings)
+{
+ if (asettings != NULL)
+ {
+ double gain, drc, quality;
+ char *s_gain, *s_drc, *s_quality;
+
+ block_updates = TRUE;
+ ghb_ui_update(ud, "AudioTrack",
+ ghb_settings_get_value(asettings, "AudioTrack"));
+ ghb_ui_update(ud, "AudioEncoder",
+ ghb_settings_get_value(asettings, "AudioEncoder"));
+ ghb_ui_update(ud, "AudioBitrate",
+ ghb_settings_get_value(asettings, "AudioBitrate"));
+ ghb_ui_update(ud, "AudioTrackName",
+ ghb_settings_get_value(asettings, "AudioTrackName"));
+ ghb_ui_update(ud, "AudioSamplerate",
+ ghb_settings_get_value(asettings, "AudioSamplerate"));
+ ghb_ui_update(ud, "AudioMixdown",
+ ghb_settings_get_value(asettings, "AudioMixdown"));
+ ghb_ui_update(ud, "AudioTrackDRCSlider",
+ ghb_settings_get_value(asettings, "AudioTrackDRCSlider"));
+ drc = ghb_settings_get_double(asettings, "AudioTrackDRCSlider");
+ s_drc = get_drc_string(drc);
+ ghb_ui_update(ud, "AudioTrackDRCValue", ghb_string_value(s_drc));
+ ghb_ui_update(ud, "AudioTrackGainSlider",
+ ghb_settings_get_value(asettings, "AudioTrackGainSlider"));
+ gain = ghb_settings_get_double(asettings, "AudioTrackGainSlider");
+ s_gain = get_gain_string(gain);
+ ghb_ui_update(ud, "AudioTrackGainValue", ghb_string_value(s_gain));
+
+ ghb_ui_update(ud, "AudioTrackQuality",
+ ghb_settings_get_value(asettings, "AudioTrackQuality"));
+ quality = ghb_settings_get_double(asettings, "AudioTrackQuality");
+ s_quality = get_quality_string(asettings, quality);
+ ghb_ui_update(ud, "AudioTrackQualityValue", ghb_string_value(s_quality));
+ ghb_ui_update(ud, "AudioTrackQualityEnable",
+ ghb_settings_get_value(asettings, "AudioTrackQualityEnable"));
+ block_updates = FALSE;
+ }
+ audio_deps(ud, asettings, NULL);
 }
 
 static void
@@ -314,7 +455,7 @@
 }
 
 const gchar*
-ghb_get_user_audio_lang(GValue *settings, gint titleindex, gint track)
+ghb_get_user_audio_lang(GValue *settings, const hb_title_t *title, gint track)
 {
 GValue *audio_list, *asettings;
 const gchar *lang;
@@ -324,401 +465,557 @@
 return "und";
 asettings = ghb_array_get_nth(audio_list, track);
 track = ghb_settings_get_int(asettings, "AudioTrack");
- lang = ghb_get_source_audio_lang(titleindex, track);
+ lang = ghb_get_source_audio_lang(title, track);
 return lang;
 }
 
-void
-ghb_set_pref_audio_settings(gint titleindex, GValue *settings)
+static gboolean*
+get_track_used(gint settings, GHashTable *track_indices, gint count)
 {
- gint track;
- gchar *source_lang;
- hb_audio_config_t *aconfig;
- GHashTable *track_indices;
- gint mux;
-
- const GValue *pref_audio;
- const GValue *audio, *drc, *gain, *enable_qual;
- gint acodec, bitrate, mix;
- gdouble rate, quality;
- gint count, ii, list_count;
- 
- g_debug("set_pref_audio");
- mux = ghb_settings_combo_int(settings, "FileFormat");
- track_indices = g_hash_table_new_full(g_int_hash, g_int_equal, 
- free_audio_hash_key_value, free_audio_hash_key_value);
- // Clear the audio list
- ghb_clear_audio_list_settings(settings);
+ gboolean *used;
 
- // Find "best" audio based on audio preferences
- if (!ghb_settings_get_boolean(settings, "AudioDUB"))
+ used = g_hash_table_lookup(track_indices, &settings);
+ if (used == NULL)
 {
- source_lang = g_strdup(ghb_get_source_audio_lang(titleindex, 0));
+ gint *key;
+
+ used = g_malloc0(count * sizeof(gboolean));
+ key = g_malloc(sizeof(gint));
+ *key = settings;
+ g_hash_table_insert(track_indices, key, used);
 }
- else
+ return used;
+}
+
+static GValue*
+audio_add_track(
+ GValue *settings,
+ const hb_title_t *title,
+ int track,
+ int encoder,
+ gboolean enable_quality,
+ gdouble quality,
+ int bitrate,
+ int samplerate,
+ int mix,
+ gdouble drc,
+ gdouble gain)
+{
+ GValue *asettings;
+ hb_audio_config_t *aconfig = NULL;
+
+ aconfig = ghb_get_audio_info(title, track);
+ asettings = ghb_dict_value_new();
+
+ ghb_settings_set_int(asettings, "AudioTrack", track);
+
+ ghb_settings_set_string(asettings, "AudioEncoder",
+ hb_audio_encoder_get_short_name(encoder));
+
+ ghb_settings_set_boolean(asettings,
+ "AudioTrackQualityEnable", enable_quality);
+ ghb_settings_set_double(asettings, "AudioTrackQuality", quality);
+
+ ghb_settings_set_string(asettings, "AudioBitrate",
+ ghb_audio_bitrate_get_short_name(bitrate));
+
+ ghb_settings_set_string(asettings, "AudioSamplerate",
+ ghb_audio_samplerate_get_short_name(samplerate));
+
+ if (aconfig != NULL)
 {
- source_lang = ghb_settings_get_string(settings, "PreferredLanguage");
+ mix = ghb_get_best_mix(aconfig, encoder, mix);
 }
+ ghb_settings_set_string(asettings, "AudioMixdown",
+ hb_mixdown_get_short_name(mix));
 
- pref_audio = ghb_settings_get_value(settings, "AudioList");
+ ghb_settings_set_double(asettings, "AudioTrackDRCSlider", drc);
 
- list_count = 0;
- count = ghb_array_len(pref_audio);
- for (ii = 0; ii < count; ii++)
+ ghb_settings_set_double(asettings, "AudioTrackGainSlider", gain);
+
+ audio_sanitize_settings(settings, asettings);
+ audio_add_to_settings(settings, asettings);
+
+ return asettings;
+}
+
+static GValue*
+audio_select_and_add_track(
+ const hb_title_t *title,
+ GValue *settings,
+ GValue *pref_audio,
+ const char *lang,
+ int pref_index,
+ int start_track)
+{
+ GValue *audio, *asettings = NULL;
+ gdouble drc, gain, quality;
+ gboolean enable_quality;
+ gint track, acodec, bitrate, samplerate, mix;
+
+ gint select_acodec;
+ gint fallback;
+
+ const char *mux_id;
+ const hb_container_t *mux;
+
+ mux_id = ghb_settings_get_const_string(settings, "FileFormat");
+ mux = ghb_lookup_container_by_name(mux_id);
+
+ gint copy_mask = ghb_get_copy_mask(settings);
+
+ audio = ghb_array_get_nth(pref_audio, pref_index);
+
+ acodec = ghb_settings_audio_encoder_codec(audio, "AudioEncoder");
+ fallback = ghb_select_fallback(settings, acodec);
+
+ bitrate = ghb_settings_audio_bitrate_rate(audio, "AudioBitrate");
+ samplerate = ghb_settings_audio_samplerate_rate(audio, "AudioSamplerate");
+ mix = ghb_settings_mixdown_mix(audio, "AudioMixdown");
+ drc = ghb_settings_get_double(audio, "AudioTrackDRCSlider");
+ gain = ghb_settings_get_double(audio, "AudioTrackGainSlider");
+ enable_quality = ghb_settings_get_boolean(audio, "AudioTrackQualityEnable");
+ quality = ghb_settings_get_double(audio, "AudioTrackQuality");
+
+ track = ghb_find_audio_track(title, lang, start_track);
+ if (track >= 0)
 {
- gint select_acodec;
- gint fallback;
-
- audio = ghb_array_get_nth(pref_audio, ii);
- acodec = ghb_settings_combo_int(audio, "AudioEncoder");
- fallback = ghb_select_fallback(settings, mux, acodec);
- gint copy_mask = ghb_get_copy_mask(settings);
- select_acodec = ghb_select_audio_codec(mux, NULL, acodec, fallback, copy_mask);
- bitrate = ghb_settings_combo_int(audio, "AudioBitrate");
- rate = ghb_settings_combo_double(audio, "AudioSamplerate");
- mix = ghb_settings_combo_int(audio, "AudioMixdown");
- drc = ghb_settings_get_value(audio, "AudioTrackDRCSlider");
- gain = ghb_settings_get_value(audio, "AudioTrackGain");
- enable_qual = ghb_settings_get_value(audio, "AudioTrackQualityEnable");
- quality = ghb_settings_get_double(audio, "AudioTrackQuality");
- // If there are multiple audios using the same codec, then
- // select sequential tracks for each. The hash keeps track 
- // of the tracks used for each codec.
- track = ghb_find_audio_track(titleindex, source_lang, 
- select_acodec, fallback, track_indices);
 // Check to see if:
 // 1. pref codec is passthru
 // 2. source codec is not passthru
 // 3. next pref is enabled
- aconfig = ghb_get_scan_audio_info(titleindex, track);
- if (aconfig && ghb_audio_is_passthru (acodec))
+ hb_audio_config_t *aconfig;
+ aconfig = hb_list_audio_config_item(title->list_audio, track);
+ select_acodec = ghb_select_audio_codec(
+ mux->format, aconfig, acodec, fallback, copy_mask);
+
+ asettings = audio_add_track(settings, title, track, select_acodec,
+ enable_quality, quality, bitrate,
+ samplerate, mix, drc, gain);
+ }
+ return asettings;
+}
+
+static void set_pref_audio_with_lang(
+ const hb_title_t *title,
+ GValue *settings,
+ const char *lang,
+ int behavior,
+ gboolean secondary_audio_track_mode,
+ GHashTable *track_used)
+{
+ const GValue *pref_audio, *audio_list;
+ int count, ii, track, track_count, audio_count;
+
+ audio_list = ghb_settings_get_value(settings, "audio_list");
+
+ const char *mux_id;
+ const hb_container_t *mux;
+
+ mux_id = ghb_settings_get_const_string(settings, "FileFormat");
+ mux = ghb_lookup_container_by_name(mux_id);
+
+ pref_audio = ghb_settings_get_value(settings, "AudioList");
+ audio_count = hb_list_count(title->list_audio);
+ count = ghb_array_len(pref_audio);
+ int next_track = 0;
+ track = ghb_find_audio_track(title, lang, next_track);
+ while (track >= 0)
+ {
+ track_count = ghb_array_len(audio_list);
+ count = (track_count && secondary_audio_track_mode) ? 1 : count;
+ for (ii = 0; ii < count; ii++)
 {
- // HB_ACODEC_* are bit fields. Treat acodec as mask
- if (!(aconfig->in.codec & select_acodec & HB_ACODEC_PASS_MASK))
- {
- if (acodec != HB_ACODEC_AUTO_PASS)
- acodec = fallback;
- // If we can't substitute the passthru with a suitable
- // encoder and
- // If there's more audio to process, or we've already
- // placed one in the list, then we can skip this one
- if (!(select_acodec & fallback) && 
- ((ii + 1 < count) || (list_count != 0)))
- {
- // Skip this audio
- acodec = 0;
- }
- }
- else
+ const GValue *audio;
+ gint acodec, fallback, copy_mask, bitrate, samplerate, mix;
+ gint select_acodec;
+ gdouble drc, gain, quality;
+ gboolean enable_quality;
+
+ audio = ghb_array_get_nth(pref_audio, ii);
+ acodec = ghb_settings_audio_encoder_codec(audio, "AudioEncoder");
+ fallback = ghb_select_fallback(settings, acodec);
+ copy_mask = ghb_get_copy_mask(settings);
+ bitrate = ghb_settings_audio_bitrate_rate(audio, "AudioBitrate");
+ samplerate = ghb_settings_audio_samplerate_rate(audio,
+ "AudioSamplerate");
+ mix = ghb_settings_mixdown_mix(audio, "AudioMixdown");
+ drc = ghb_settings_get_double(audio, "AudioTrackDRCSlider");
+ gain = ghb_settings_get_double(audio, "AudioTrackGainSlider");
+ enable_quality = ghb_settings_get_boolean(audio,
+ "AudioTrackQualityEnable");
+ quality = ghb_settings_get_double(audio, "AudioTrackQuality");
+
+ // Check to see if:
+ // 1. pref codec is passthru
+ // 2. source codec is not passthru
+ // 3. next pref is enabled
+ hb_audio_config_t *aconfig;
+ aconfig = hb_list_audio_config_item(title->list_audio, track);
+ select_acodec = ghb_select_audio_codec(
+ mux->format, aconfig, acodec, fallback, copy_mask);
+
+ // Was the source track already encoded
+ // with the selected encode settings.
+ gboolean *used = get_track_used(ii, track_used, audio_count);
+ if (!used[track])
 {
- select_acodec &= aconfig->in.codec | HB_ACODEC_PASS_FLAG;
+ used[track] = TRUE;
+ audio_add_track(settings, title, track, select_acodec,
+ enable_quality, quality, bitrate,
+ samplerate, mix, drc, gain);
 }
 }
- if (titleindex >= 0 && track < 0)
- acodec = 0;
- if (acodec != 0)
+
+ next_track = track + 1;
+ if (behavior == 2)
 {
- GValue *asettings = ghb_dict_value_new();
- ghb_settings_set_int(asettings, "AudioTrack", track);
- ghb_settings_set_string(asettings, "AudioEncoder", 
- ghb_lookup_combo_string("AudioEncoder", ghb_int_value(acodec)));
- ghb_settings_set_value(asettings, "AudioEncoderActual", 
- ghb_lookup_acodec_value(select_acodec));
- ghb_settings_set_value(asettings, "AudioTrackQualityEnable", enable_qual);
- ghb_settings_set_double(asettings, "AudioTrackQuality", quality);
-
- // This gets set autimatically if the codec is passthru
- ghb_settings_set_string(asettings, "AudioBitrate",
- ghb_lookup_combo_string("AudioBitrate", ghb_int_value(bitrate)));
- ghb_settings_set_string(asettings, "AudioSamplerate",
- ghb_lookup_combo_string("AudioSamplerate", ghb_int_value(rate)));
- mix = ghb_get_best_mix( aconfig, select_acodec, mix);
- ghb_settings_set_string(asettings, "AudioMixdown",
- ghb_lookup_combo_string("AudioMixdown", ghb_int_value(mix)));
- ghb_settings_set_value(asettings, "AudioTrackDRCSlider", drc);
- ghb_settings_set_value(asettings, "AudioTrackGain", gain);
- ghb_sanitize_audio(settings, asettings);
- ghb_add_audio_to_settings(settings, asettings);
+ track = ghb_find_audio_track(title, lang, next_track);
+ }
+ else
+ {
+ break;
 }
 }
- g_free(source_lang);
- g_hash_table_destroy(track_indices);
+}
+
+void ghb_audio_title_change(signal_user_data_t *ud, gboolean title_valid)
+{
+ GtkWidget *w = GHB_WIDGET(ud->builder, "audio_add");
+ gtk_widget_set_sensitive(w, title_valid);
+ w = GHB_WIDGET(ud->builder, "audio_add_all");
+ gtk_widget_set_sensitive(w, title_valid);
+ w = GHB_WIDGET(ud->builder, "audio_reset");
+ gtk_widget_set_sensitive(w, title_valid);
 }
 
 void
-ghb_set_pref_audio_from_settings(signal_user_data_t *ud, GValue *settings)
+ghb_set_pref_audio_settings(GValue *settings)
 {
- const GValue *audio_list, *audio;
- gint count, ii;
+ GHashTable *track_used;
+ int title_id, titleindex;
+ const hb_title_t *title;
+
+ const GValue *lang_list;
+ gint behavior;
+ gint ii, audio_count, lang_count;
+
+ g_debug("set_pref_audio");
+ behavior = ghb_settings_combo_int(settings, "AudioTrackSelectionBehavior");
 
 // Clear the audio list
- ghb_clear_audio_list_ui(ud->builder);
+ ghb_clear_audio_list_settings(settings);
 
- audio_list = ghb_settings_get_value(settings, "audio_list");
- count = ghb_array_len(audio_list);
- for (ii = 0; ii < count; ii++)
+ title_id = ghb_settings_get_int(settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ if (behavior == 0 || title == NULL)
+ {
+ // None or no source title
+ return;
+ }
+ audio_count = hb_list_count(title->list_audio);
+ if (audio_count == 0)
 {
- audio = ghb_array_get_nth(audio_list, ii);
- ghb_add_audio_to_ui(ud->builder, audio);
- ghb_adjust_audio_rate_combos(ud);
+ // No source audio
+ return;
+ }
+
+ track_used = g_hash_table_new_full(g_int_hash, g_int_equal,
+ free_audio_hash_key_value, free_audio_hash_key_value);
+
+ // Find "best" audio based on audio preset defaults
+ lang_list = ghb_settings_get_value(settings, "AudioLanguageList");
+
+ lang_count = ghb_array_len(lang_list);
+ for (ii = 0; ii < lang_count; ii++)
+ {
+ const gchar *lang;
+ gboolean mode;
+ GValue *glang = ghb_array_get_nth(lang_list, ii);
+ lang = g_value_get_string(glang);
+ mode = ghb_settings_get_boolean(settings, "AudioSecondaryEncoderMode");
+ set_pref_audio_with_lang(title, settings, lang, behavior, mode, track_used);
+ }
+ GValue *audio_list = ghb_settings_get_value(settings, "audio_list");
+ if (audio_list == NULL || ghb_array_len(audio_list) == 0)
+ {
+ // No matching audio tracks found. Add first track matching
+ // any language.
+ set_pref_audio_with_lang(title, settings, "und", 1, FALSE, track_used);
 }
- check_list_full(ud);
+ g_hash_table_destroy(track_used);
 }
 
 static GValue*
-get_selected_asettings(signal_user_data_t *ud)
+audio_get_selected_settings(signal_user_data_t *ud, int *index)
 {
- GtkTreeView *treeview;
- GtkTreePath *treepath;
- GtkTreeSelection *selection;
- GtkTreeModel *store;
- GtkTreeIter iter;
+ GtkTreeView *tv;
+ GtkTreePath *tp;
+ GtkTreeSelection *ts;
+ GtkTreeModel *tm;
+ GtkTreeIter ti;
 gint *indices;
 gint row;
 GValue *asettings = NULL;
 const GValue *audio_list;
- 
- g_debug("get_selected_asettings ()");
- treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
- selection = gtk_tree_view_get_selection (treeview);
- if (gtk_tree_selection_get_selected(selection, &store, &iter))
+
+ tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
+ ts = gtk_tree_view_get_selection (tv);
+ if (gtk_tree_selection_get_selected(ts, &tm, &ti))
 {
 // Get the row number
- treepath = gtk_tree_model_get_path (store, &iter);
- indices = gtk_tree_path_get_indices (treepath);
+ tp = gtk_tree_model_get_path (tm, &ti);
+ indices = gtk_tree_path_get_indices (tp);
 row = indices[0];
- gtk_tree_path_free(treepath);
+ gtk_tree_path_free(tp);
 // find audio settings
 if (row < 0) return NULL;
+
 audio_list = ghb_settings_get_value(ud->settings, "audio_list");
 if (row >= ghb_array_len(audio_list))
 return NULL;
+
 asettings = ghb_array_get_nth(audio_list, row);
+ if (index != NULL)
+ *index = row;
 }
 return asettings;
 }
 
-void
-ghb_audio_list_refresh_selected(signal_user_data_t *ud)
+static void
+audio_refresh_list_row_ui(
+ GtkTreeModel *tm,
+ GtkTreeIter *ti,
+ signal_user_data_t *ud,
+ const GValue *settings)
 {
- GtkTreeView *treeview;
- GtkTreePath *treepath;
- GtkTreeSelection *selection;
- GtkTreeModel *store;
- GtkTreeIter iter;
- gint *indices;
- gint row;
- GValue *asettings = NULL;
- const GValue *audio_list;
- 
- g_debug("ghb_audio_list_refresh_selected ()");
- treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
- selection = gtk_tree_view_get_selection (treeview);
- if (gtk_tree_selection_get_selected(selection, &store, &iter))
- {
- const gchar *track, *codec, *br = NULL, *sr, *mix;
- gchar *s_drc, *s_gain, *s_quality = NULL;
- gdouble drc, gain;
- // Get the row number
- treepath = gtk_tree_model_get_path (store, &iter);
- indices = gtk_tree_path_get_indices (treepath);
- row = indices[0];
- gtk_tree_path_free(treepath);
- // find audio settings
- if (row < 0) return;
- audio_list = ghb_settings_get_value(ud->settings, "audio_list");
- if (row >= ghb_array_len(audio_list))
- return;
- asettings = ghb_array_get_nth(audio_list, row);
+ GtkTreeIter cti;
+ char *info_src, *info_src_2;
+ char *info_dst, *info_dst_2;
 
- track = ghb_settings_combo_option(asettings, "AudioTrack");
- codec = ghb_settings_combo_option(asettings, "AudioEncoderActual");
- double quality = ghb_settings_get_double(asettings, "AudioTrackQuality");
- if (ghb_settings_get_boolean(asettings, "AudioTrackQualityEnable") &&
- quality != HB_INVALID_AUDIO_QUALITY)
- {
- int codec = ghb_settings_combo_int(asettings, "AudioEncoderActual");
- s_quality = ghb_format_quality("Q/", codec, quality);
- }
- else
- {
- br = ghb_settings_combo_option(asettings, "AudioBitrate");
- }
- sr = ghb_settings_combo_option(asettings, "AudioSamplerate");
- mix = ghb_settings_combo_option(asettings, "AudioMixdown");
- gain = ghb_settings_get_double(asettings, "AudioTrackGain");
- s_gain = g_strdup_printf("%ddB", (int)gain);
 
- drc = ghb_settings_get_double(asettings, "AudioTrackDRCSlider");
- if (drc < 1.0)
- s_drc = g_strdup("Off");
- else
- s_drc = g_strdup_printf("%.1f", drc);
+ info_src_2 = NULL;
+ info_dst_2 = NULL;
 
- gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
- // These are displayed in list
- 0, track,
- 1, codec,
- 2, s_quality ? s_quality : br,
- 3, sr,
- 4, mix,
- 5, s_gain,
- 6, s_drc,
- -1);
- g_free(s_drc);
- g_free(s_gain);
- g_free(s_quality);
+ const gchar *s_track;
+ gchar *s_drc, *s_gain, *s_br_quality, *s_sr, *s_track_name;
+ gdouble drc, gain;
+ hb_audio_config_t *aconfig;
+ int track, sr;
+ int title_id, titleindex;
+ const hb_title_t *title;
+ const hb_encoder_t *encoder;
+
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ track = ghb_settings_get_int(settings, "AudioTrack");
+ aconfig = ghb_get_audio_info(title, track);
+ if (aconfig == NULL)
+ {
+ return;
 }
-}
 
-void
-ghb_audio_list_refresh(signal_user_data_t *ud)
-{
- GtkTreeView *treeview;
- GtkTreeIter iter;
- GtkListStore *store;
- gboolean done;
- gint row = 0;
- const GValue *audio_list;
 
- g_debug("ghb_audio_list_refresh ()");
- treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
- store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
- if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
+ s_track = aconfig->lang.description;
+ encoder = ghb_settings_audio_encoder(settings, "AudioEncoder");
+
+ double quality = ghb_settings_get_double(settings, "AudioTrackQuality");
+ if (ghb_settings_get_boolean(settings, "AudioTrackQualityEnable") &&
+ quality != HB_INVALID_AUDIO_QUALITY)
 {
- do
- {
- const gchar *track, *codec, *br = NULL, *sr, *mix;
- gchar *s_drc, *s_gain, *s_quality = NULL;
- gdouble drc, gain;
- GValue *asettings;
-
- audio_list = ghb_settings_get_value(ud->settings, "audio_list");
- if (row >= ghb_array_len(audio_list))
- return;
- asettings = ghb_array_get_nth(audio_list, row);
+ s_br_quality = ghb_format_quality(_("Quality: "), encoder->codec, quality);
+ }
+ else
+ {
+ s_br_quality = g_strdup_printf(_("Bitrate: %dkbps"),
+ ghb_settings_audio_bitrate_rate(settings, "AudioBitrate"));
+ }
 
- track = ghb_settings_combo_option(asettings, "AudioTrack");
- codec = ghb_settings_combo_option(asettings, "AudioEncoderActual");
- double quality = ghb_settings_get_double(asettings, "AudioTrackQuality");
- if (ghb_settings_get_boolean(asettings, "AudioTrackQualityEnable") &&
- quality != HB_INVALID_AUDIO_QUALITY)
- {
- int codec = ghb_settings_combo_int(asettings, "AudioEncoderActual");
- s_quality = ghb_format_quality("Q/", codec, quality);
- }
- else
- {
- br = ghb_settings_get_string(asettings, "AudioBitrate");
- }
- sr = ghb_settings_combo_option(asettings, "AudioSamplerate");
- mix = ghb_settings_combo_option(asettings, "AudioMixdown");
- gain = ghb_settings_get_double(asettings, "AudioTrackGain");
- s_gain = g_strdup_printf("%.fdB", gain);
-
- drc = ghb_settings_get_double(asettings, "AudioTrackDRCSlider");
- if (drc < 1.0)
- s_drc = g_strdup("Off");
- else
- s_drc = g_strdup_printf("%.1f", drc);
-
- gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
- // These are displayed in list
- 0, track,
- 1, codec,
- 2, s_quality ? s_quality : br,
- 3, sr,
- 4, mix,
- 5, s_gain,
- 6, s_drc,
- -1);
- g_free(s_drc);
- g_free(s_gain);
- done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
- row++;
- } while (!done);
+ sr = ghb_settings_audio_samplerate_rate(settings, "AudioSamplerate");
+ if (sr == 0)
+ {
+ sr = aconfig->in.samplerate;
 }
-}
+ s_sr = g_strdup_printf(_("%.4gkHz"), (double)sr/1000);
 
-G_MODULE_EXPORT void
-audio_codec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
- static gint prev_acodec = 0;
- gint acodec_code;
- GValue *asettings, *gval;
- 
- g_debug("audio_codec_changed_cb ()");
- gval = ghb_widget_value(widget);
- acodec_code = ghb_lookup_combo_int("AudioEncoder", gval);
- ghb_value_free(gval);
+ const hb_mixdown_t *mix;
+ mix = ghb_settings_mixdown(settings, "AudioMixdown");
+ gain = ghb_settings_get_double(settings, "AudioTrackGainSlider");
+ s_gain = g_strdup_printf(_("%ddB"), (int)gain);
 
- if (block_updates)
+ drc = ghb_settings_get_double(settings, "AudioTrackDRCSlider");
+ if (drc < 1.0)
+ s_drc = g_strdup(_("Off"));
+ else
+ s_drc = g_strdup_printf("%.1f", drc);
+
+ s_track_name = ghb_settings_get_string(settings, "AudioTrackName");
+
+ info_src = g_strdup_printf(_("%d - %s (%.4gkHz)"),
+ track + 1, s_track, (double)aconfig->in.samplerate / 1000);
+ if (aconfig->in.bitrate > 0)
 {
- prev_acodec = acodec_code;
- ghb_grey_combo_options (ud);
- ghb_check_dependency(ud, widget, NULL);
- return;
+ info_src_2 = g_strdup_printf(
+ _("Bitrate: %.4gkbps"),
+ (double)aconfig->in.bitrate / 1000);
 }
 
- asettings = get_selected_asettings(ud);
- if (ghb_audio_is_passthru (prev_acodec) && 
- !ghb_audio_is_passthru (acodec_code))
+ if (ghb_audio_is_passthru(encoder->codec))
 {
- // Transition from passthru to not, put some audio settings back to 
- // pref settings
- gint titleindex;
- gint track;
- gint br, sr, mix_code;
-
- if (asettings != NULL)
+ info_dst = g_strdup_printf(_("Passthrough"));
+ }
+ else
+ {
+ info_dst = g_strdup_printf("%s (%s) (%s)",
+ encoder->name, mix->name, s_sr);
+ if (s_track_name && s_track_name[0])
 {
- br = ghb_settings_get_int(asettings, "AudioBitrate");
- sr = ghb_settings_combo_int(asettings, "AudioSamplerate");
- mix_code = ghb_settings_combo_int(asettings, "AudioMixdown");
+ info_dst_2 = g_strdup_printf(
+ _("%s\nGain: %s\nDRC: %s\nTrack Name: %s"),
+ s_br_quality, s_gain, s_drc, s_track_name);
 }
 else
 {
- br = 160;
- sr = 0;
- mix_code = 0;
+ info_dst_2 = g_strdup_printf(_("%s\nGain: %s\nDRC: %s"),
+ s_br_quality, s_gain, s_drc);
 }
+ }
+ gtk_tree_store_set(GTK_TREE_STORE(tm), ti,
+ // These are displayed in list
+ 0, info_src,
+ 1, "-->",
+ 2, info_dst,
+ 3, "hb-edit",
+ 4, "hb-remove",
+ 5, 0.5,
+ -1);
 
- titleindex = ghb_settings_combo_int(ud->settings, "title");
- track = ghb_settings_combo_int(ud->settings, "AudioTrack");
- if (sr)
+ if (info_src_2 != NULL || info_dst_2 != NULL)
+ {
+ if (info_src_2 == NULL)
+ info_src_2 = g_strdup("");
+ if (info_dst_2 == NULL)
+ info_dst_2 = g_strdup("");
+
+ // Get the child of the selection
+ if (!gtk_tree_model_iter_children(tm, &cti, ti))
 {
- sr = ghb_find_closest_audio_rate(sr);
+ gtk_tree_store_append(GTK_TREE_STORE(tm), &cti, ti);
 }
- ghb_ui_update(ud, "AudioSamplerate", ghb_int64_value(sr));
-
- hb_audio_config_t *aconfig;
- aconfig = ghb_get_scan_audio_info(titleindex, track);
- if (sr == 0)
+ gtk_tree_store_set(GTK_TREE_STORE(tm), &cti,
+ // These are displayed in list
+ 0, info_src_2,
+ 2, info_dst_2,
+ 5, 0.0,
+ -1);
+ }
+ else
+ {
+ if(gtk_tree_model_iter_children(tm, &cti, ti))
 {
- sr = aconfig ? aconfig->in.samplerate : 48000;
+ gtk_tree_store_remove(GTK_TREE_STORE(tm), &cti);
 }
- mix_code = ghb_get_best_mix( aconfig, acodec_code, mix_code);
- br = hb_get_best_audio_bitrate(acodec_code, br, sr, mix_code);
- ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(br));
+ }
+
+ g_free(info_src);
+ g_free(info_src_2);
+ g_free(info_dst);
+ g_free(info_dst_2);
+
+ g_free(s_sr);
+ g_free(s_drc);
+ g_free(s_gain);
+ g_free(s_br_quality);
+ g_free(s_track_name);
+}
+
+void
+ghb_audio_list_refresh_selected(signal_user_data_t *ud)
+{
+ GtkTreeView *tv;
+ GtkTreePath *tp;
+ GtkTreeSelection *ts;
+ GtkTreeModel *tm;
+ GtkTreeIter ti;
+ gint *indices;
+ gint row;
+ GValue *asettings = NULL;
+ const GValue *audio_list;
+
+ g_debug("ghb_audio_list_refresh_selected ()");
+ tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
+ ts = gtk_tree_view_get_selection (tv);
+ if (gtk_tree_selection_get_selected(ts, &tm, &ti))
+ {
+ // Get the row number
+ tp = gtk_tree_model_get_path (tm, &ti);
+ indices = gtk_tree_path_get_indices (tp);
+ row = indices[0];
+ gtk_tree_path_free(tp);
+ if (row < 0) return;
+
+ audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+ if (row >= ghb_array_len(audio_list))
+ return;
+
+ asettings = ghb_array_get_nth(audio_list, row);
+ audio_refresh_list_row_ui(tm, &ti, ud, asettings);
+ }
+}
+
+static void
+audio_refresh_list_ui(signal_user_data_t *ud)
+{
+ GValue *audio_list;
+ GValue *asettings;
+ gint ii, count, tm_count;
+ GtkTreeView *tv;
+ GtkTreeModel *tm;
+ GtkTreeIter ti;
 
- ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(mix_code));
+ tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
+ tm = gtk_tree_view_get_model(tv);
+
+ tm_count = gtk_tree_model_iter_n_children(tm, NULL);
+
+ audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+ count = ghb_array_len(audio_list);
+ if (count != tm_count)
+ {
+ ghb_clear_audio_list_ui(ud->builder);
+ for (ii = 0; ii < count; ii++)
+ {
+ gtk_tree_store_append(GTK_TREE_STORE(tm), &ti, NULL);
+ }
 }
- ghb_adjust_audio_rate_combos(ud);
- ghb_grey_combo_options (ud);
- ghb_check_dependency(ud, widget, NULL);
- prev_acodec = acodec_code;
- if (asettings != NULL)
+ for (ii = 0; ii < count; ii++)
 {
- ghb_widget_to_setting(asettings, widget);
- ghb_settings_set_value(asettings, "AudioEncoderActual", ghb_settings_get_value(ud->settings, "AudioEncoderActual"));
- ghb_audio_list_refresh_selected(ud);
+ gtk_tree_model_iter_nth_child(tm, &ti, NULL, ii);
+ asettings = ghb_array_get_nth(audio_list, ii);
+ audio_refresh_list_row_ui(tm, &ti, ud, asettings);
 }
- ghb_live_reset(ud);
+}
+
+void
+ghb_audio_list_refresh_all(signal_user_data_t *ud)
+{
+ audio_refresh_list_ui(ud);
+}
+
+G_MODULE_EXPORT void
+audio_codec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ static gint prev_acodec = 0;
+ gint acodec;
+ GValue *asettings;
+
+ ghb_widget_to_setting(ud->settings, widget);
+ acodec = ghb_settings_audio_encoder_codec(ud->settings, "AudioEncoder");
 
 float low, high, gran, defval;
 int dir;
- hb_get_audio_quality_limits(acodec_code, &low, &high, &gran, &dir);
- defval = hb_get_default_audio_quality(acodec_code);
+ hb_audio_quality_get_limits(acodec, &low, &high, &gran, &dir);
+ defval = hb_audio_quality_get_default(acodec);
 GtkScaleButton *sb;
 GtkAdjustment *adj;
 sb = GTK_SCALE_BUTTON(GHB_WIDGET(ud->builder, "AudioTrackQuality"));
@@ -729,6 +1026,72 @@
 defval = high - defval + low;
 }
 gtk_adjustment_configure (adj, defval, low, high, gran, gran * 10, 0);
+
+ if (block_updates)
+ {
+ prev_acodec = acodec;
+ return;
+ }
+
+ asettings = audio_get_selected_settings(ud, NULL);
+ if (ghb_audio_is_passthru(prev_acodec) &&
+ !ghb_audio_is_passthru(acodec))
+ {
+ // Transition from passthru to not, put some audio settings back to
+ // pref settings
+ int title_id;
+ const hb_title_t *title;
+ gint titleindex;
+ gint track;
+ gint br, sr, mix;
+
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+
+ if (asettings != NULL)
+ {
+ br = ghb_settings_audio_bitrate_rate(asettings, "AudioBitrate");
+ sr = ghb_settings_audio_samplerate_rate(asettings,
+ "AudioSamplerate");
+ mix = ghb_settings_mixdown_mix(asettings, "AudioMixdown");
+ }
+ else
+ {
+ br = 160;
+ sr = 0;
+ mix = HB_AMIXDOWN_NONE;
+ }
+
+ track = ghb_settings_get_int(ud->settings, "AudioTrack");
+ if (sr)
+ {
+ sr = ghb_find_closest_audio_samplerate(sr);
+ }
+ ghb_ui_update(ud, "AudioSamplerate",
+ ghb_string_value(ghb_audio_samplerate_get_short_name(sr)));
+
+ hb_audio_config_t *aconfig;
+ aconfig = ghb_get_audio_info(title, track);
+ if (sr == 0)
+ {
+ sr = aconfig ? aconfig->in.samplerate : 48000;
+ }
+ mix = ghb_get_best_mix( aconfig, acodec, mix);
+ br = hb_audio_bitrate_get_best(acodec, br, sr, mix);
+ ghb_ui_update(ud, "AudioBitrate",
+ ghb_string_value(ghb_audio_bitrate_get_short_name(br)));
+
+ ghb_ui_update(ud, "AudioMixdown",
+ ghb_string_value(hb_mixdown_get_short_name(mix)));
+ }
+ prev_acodec = acodec;
+ if (asettings != NULL)
+ {
+ ghb_widget_to_setting(asettings, widget);
+ audio_deps(ud, asettings, widget);
+ ghb_audio_list_refresh_selected(ud);
+ ghb_live_reset(ud);
+ }
 }
 
 G_MODULE_EXPORT void
@@ -737,27 +1100,39 @@
 GValue *asettings;
 
 g_debug("audio_track_changed_cb ()");
+ ghb_widget_to_setting(ud->settings, widget);
 if (block_updates)
 {
- ghb_check_dependency(ud, widget, NULL);
- ghb_grey_combo_options (ud);
 return;
 }
 
- ghb_adjust_audio_rate_combos(ud);
- ghb_check_dependency(ud, widget, NULL);
- ghb_grey_combo_options(ud);
- asettings = get_selected_asettings(ud);
+ asettings = audio_get_selected_settings(ud, NULL);
 if (asettings != NULL)
 {
- const gchar *track;
-
 ghb_widget_to_setting(asettings, widget);
+ audio_deps(ud, asettings, widget);
 ghb_audio_list_refresh_selected(ud);
- track = ghb_settings_combo_option(asettings, "AudioTrack");
- ghb_settings_set_string(asettings, "AudioTrackDescription", track);
+ ghb_live_reset(ud);
+
+ // Update the track description used by the queue
+ int title_id, titleindex;
+ const hb_title_t *title;
+ int track;
+ hb_audio_config_t *aconfig;
+
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ track = ghb_settings_get_int(ud->settings, "AudioTrack");
+ aconfig = ghb_get_audio_info(title, track);
+ if (aconfig != NULL)
+ {
+ char *desc;
+ desc = g_strdup_printf("%d - %s", track + 1,
+ aconfig->lang.description);
+ ghb_settings_set_string(asettings, "AudioTrackDescription", desc);
+ g_free(desc);
+ }
 }
- ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT void
@@ -765,22 +1140,20 @@
 {
 GValue *asettings;
 
- g_debug("audio_mix_changed_cb ()");
+ ghb_widget_to_setting(ud->settings, widget);
 if (block_updates)
 {
- ghb_check_dependency(ud, widget, NULL);
 return;
 }
 
- ghb_adjust_audio_rate_combos(ud);
- ghb_check_dependency(ud, widget, NULL);
- asettings = get_selected_asettings(ud);
+ asettings = audio_get_selected_settings(ud, NULL);
 if (asettings != NULL)
 {
 ghb_widget_to_setting(asettings, widget);
+ audio_deps(ud, asettings, widget);
 ghb_audio_list_refresh_selected(ud);
+ ghb_live_reset(ud);
 }
- ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT void
@@ -788,46 +1161,41 @@
 {
 GValue *asettings;
 
- g_debug("audio_widget_changed_cb ()");
+ ghb_widget_to_setting(ud->settings, widget);
 if (block_updates)
 {
- ghb_check_dependency(ud, widget, NULL);
 return;
 }
 
- ghb_adjust_audio_rate_combos(ud);
- asettings = get_selected_asettings(ud);
+ asettings = audio_get_selected_settings(ud, NULL);
 if (asettings != NULL)
 {
 ghb_widget_to_setting(asettings, widget);
+ audio_deps(ud, asettings, widget);
 ghb_audio_list_refresh_selected(ud);
+ ghb_live_reset(ud);
 }
- ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT void
-global_audio_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+audio_quality_radio_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
- g_debug("global_audio_widget_changed_cb ()");
- if (block_updates)
- {
- ghb_check_dependency(ud, widget, NULL);
- return;
- }
-
 ghb_check_dependency(ud, widget, NULL);
+ audio_widget_changed_cb(widget, ud);
+}
+
+G_MODULE_EXPORT void
+audio_passthru_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
 ghb_widget_to_setting(ud->settings, widget);
- ghb_adjust_audio_rate_combos(ud);
- ghb_grey_combo_options (ud);
- ghb_audio_list_refresh_selected(ud);
- ghb_live_reset(ud);
+ ghb_clear_presets_selection(ud);
 }
 
 G_MODULE_EXPORT gchar*
 format_drc_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
 {
 if (val < 1.0)
- return g_strdup_printf("%-7s", "Off");
+ return g_strdup_printf("%-7s", _("Off"));
 else
 return g_strdup_printf("%-7.1f", val);
 }
@@ -843,7 +1211,7 @@
 {
 float low, high, gran;
 int dir;
- hb_get_audio_quality_limits(codec, &low, &high, &gran, &dir);
+ hb_audio_quality_get_limits(codec, &low, &high, &gran, &dir);
 
 int digits = 0;
 float tmp = gran;
@@ -862,25 +1230,14 @@
 {
 GValue *asettings;
 
- g_debug("quality_widget_changed_cb ()");
-
 ghb_check_dependency(ud, widget, NULL);
- float low, high, gran;
- int dir;
- int codec = ghb_settings_combo_int(ud->settings, "AudioEncoderActual");
- hb_get_audio_quality_limits(codec, &low, &high, &gran, &dir);
- if (dir)
- {
- // Quality values are inverted
- quality = high - quality + low;
- }
- char *s_quality = ghb_format_quality("", codec, quality);
+ char *s_quality = get_quality_string(ud->settings, quality);
 ghb_ui_update( ud, "AudioTrackQualityValue", ghb_string_value(s_quality));
 g_free(s_quality);
 
 if (block_updates) return;
 
- asettings = get_selected_asettings(ud);
+ asettings = audio_get_selected_settings(ud, NULL);
 if (asettings != NULL)
 {
 ghb_settings_set_double(asettings, "AudioTrackQuality", quality);
@@ -896,24 +1253,24 @@
 
 g_debug("drc_widget_changed_cb ()");
 
- ghb_check_dependency(ud, widget, NULL);
- if (block_updates) return;
+ ghb_widget_to_setting(ud->settings, widget);
+ if (block_updates)
+ {
+ return;
+ }
 
- char *s_drc;
- if (drc < 0.99)
- s_drc = g_strdup("Off");
- else
- s_drc = g_strdup_printf("%.1f", drc);
+ char *s_drc = get_drc_string(drc);
 ghb_ui_update( ud, "AudioTrackDRCValue", ghb_string_value(s_drc));
 g_free(s_drc);
 
- asettings = get_selected_asettings(ud);
+ asettings = audio_get_selected_settings(ud, NULL);
 if (asettings != NULL)
 {
 ghb_widget_to_setting(asettings, widget);
+ audio_deps(ud, asettings, widget);
 ghb_audio_list_refresh_selected(ud);
+ ghb_live_reset(ud);
 }
- ghb_live_reset(ud);
 }
 
 G_MODULE_EXPORT gchar*
@@ -921,7 +1278,7 @@
 {
 if ( val >= 21.0 )
 return g_strdup_printf("*11*");
- return g_strdup_printf("%ddB", (int)val);
+ return g_strdup_printf(_("%ddB"), (int)val);
 }
 
 G_MODULE_EXPORT void
@@ -931,31 +1288,30 @@
 
 g_debug("gain_widget_changed_cb ()");
 
- ghb_check_dependency(ud, widget, NULL);
- if (block_updates) return;
- asettings = get_selected_asettings(ud);
-
- char *s_gain;
- if ( gain >= 21.0 )
- s_gain = g_strdup_printf("*11*");
- else
- s_gain = g_strdup_printf("%ddB", (int)gain);
+ ghb_widget_to_setting(ud->settings, widget);
+ if (block_updates)
+ {
+ return;
+ }
+ char *s_gain = get_gain_string(gain);
 ghb_ui_update( ud, "AudioTrackGainValue", ghb_string_value(s_gain));
 g_free(s_gain);
 
+ asettings = audio_get_selected_settings(ud, NULL);
 if (asettings != NULL)
 {
 ghb_widget_to_setting(asettings, widget);
+ audio_deps(ud, asettings, widget);
 ghb_audio_list_refresh_selected(ud);
+ ghb_live_reset(ud);
 }
- ghb_live_reset(ud);
 }
 
 void
 ghb_clear_audio_list_settings(GValue *settings)
 {
 GValue *audio_list;
- 
+
 g_debug("clear_audio_list_settings ()");
 audio_list = ghb_settings_get_value(settings, "audio_list");
 if (audio_list == NULL)
@@ -970,320 +1326,1192 @@
 void
 ghb_clear_audio_list_ui(GtkBuilder *builder)
 {
- GtkTreeView *treeview;
- GtkListStore *store;
- 
+ GtkTreeView *tv;
+ GtkTreeStore *ts;
+ GtkTreeSelection *tsel;
+
 g_debug("clear_audio_list_ui ()");
- treeview = GTK_TREE_VIEW(GHB_WIDGET(builder, "audio_list"));
- store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
- gtk_list_store_clear (store);
+ tv = GTK_TREE_VIEW(GHB_WIDGET(builder, "audio_list"));
+ ts = GTK_TREE_STORE(gtk_tree_view_get_model(tv));
+ // Clear tree selection so that updates are not triggered
+ // that cause a recursive attempt to clear the tree selection (crasher)
+ tsel = gtk_tree_view_get_selection(tv);
+ gtk_tree_selection_unselect_all(tsel);
+ gtk_tree_store_clear(ts);
 }
 
 static void
-ghb_add_audio_to_ui(GtkBuilder *builder, const GValue *settings)
-{
- GtkTreeView *treeview;
- GtkTreeIter iter;
- GtkListStore *store;
- GtkTreeSelection *selection;
- const gchar *track, *codec, *br = NULL, *sr, *mix;
- gchar *s_drc, *s_gain, *s_quality = NULL;
- gdouble drc;
- gdouble gain;
- 
- g_debug("ghb_add_audio_to_ui ()");
- treeview = GTK_TREE_VIEW(GHB_WIDGET(builder, "audio_list"));
- selection = gtk_tree_view_get_selection (treeview);
- store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-
- track = ghb_settings_combo_option(settings, "AudioTrack");
- codec = ghb_settings_combo_option(settings, "AudioEncoderActual");
- double quality = ghb_settings_get_double(settings, "AudioTrackQuality");
- if (ghb_settings_get_boolean(settings, "AudioTrackQualityEnable") &&
- quality != HB_INVALID_AUDIO_QUALITY)
- {
- int codec = ghb_settings_combo_int(settings, "AudioEncoderActual");
- s_quality = ghb_format_quality("Q/", codec, quality);
- }
- else
- {
- br = ghb_settings_combo_option(settings, "AudioBitrate");
- }
- sr = ghb_settings_combo_option(settings, "AudioSamplerate");
- mix = ghb_settings_combo_option(settings, "AudioMixdown");
- gain = ghb_settings_get_double(settings, "AudioTrackGain");
- s_gain = g_strdup_printf("%ddB", (int)gain);
+ghb_add_audio_to_ui(signal_user_data_t *ud, const GValue *asettings)
+{
+ GtkTreeView *tv;
+ GtkTreeIter ti;
+ GtkTreeModel *tm;
+ GtkTreeSelection *ts;
 
- drc = ghb_settings_get_double(settings, "AudioTrackDRCSlider");
- if (drc < 1.0)
- s_drc = g_strdup("Off");
- else
- s_drc = g_strdup_printf("%.1f", drc);
+ if (asettings == NULL)
+ return;
 
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
- // These are displayed in list
- 0, track,
- 1, codec,
- 2, s_quality ? s_quality : br,
- 3, sr,
- 4, mix,
- 5, s_gain,
- 6, s_drc,
- -1);
- gtk_tree_selection_select_iter(selection, &iter);
- g_free(s_drc);
- g_free(s_gain);
- g_free(s_quality);
+ tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
+ ts = gtk_tree_view_get_selection (tv);
+ tm = gtk_tree_view_get_model(tv);
+
+ gtk_tree_store_append(GTK_TREE_STORE(tm), &ti, NULL);
+ gtk_tree_selection_select_iter(ts, &ti);
+
+ audio_refresh_list_row_ui(tm, &ti, ud, asettings);
 }
 
 G_MODULE_EXPORT void
-audio_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
+audio_list_selection_changed_cb(GtkTreeSelection *ts, signal_user_data_t *ud)
 {
- GtkTreeModel *store;
- GtkTreeIter iter;
- GtkWidget *widget;
- 
- GtkTreePath *treepath;
- gint *indices;
- gint row;
+ GtkTreeModel *tm;
+ GtkTreeIter ti;
 GValue *asettings = NULL;
+ gint row;
 
- const GValue *audio_list;
 g_debug("audio_list_selection_changed_cb ()");
- if (gtk_tree_selection_get_selected(selection, &store, &iter))
+ if (gtk_tree_selection_get_selected(ts, &tm, &ti))
 {
- //const gchar *actual_codec, *track, *codec, *bitrate, *sample_rate, *mix;
- //gdouble drc;
+ GtkTreeIter pti;
+
+ if (gtk_tree_model_iter_parent(tm, &pti, &ti))
+ {
+ GtkTreePath *path;
+ GtkTreeView *tv;
+
+ gtk_tree_selection_select_iter(ts, &pti);
+ path = gtk_tree_model_get_path(tm, &pti);
+ tv = gtk_tree_selection_get_tree_view(ts);
+ // Make the parent visible in scroll window if it is not.
+ gtk_tree_view_scroll_to_cell(tv, path, NULL, FALSE, 0, 0);
+ gtk_tree_path_free(path);
+ return;
+ }
+
+ GtkTreePath *tp;
+ gint *indices;
+ GValue *audio_list;
 
 // Get the row number
- treepath = gtk_tree_model_get_path (store, &iter);
- indices = gtk_tree_path_get_indices (treepath);
+ tp = gtk_tree_model_get_path (tm, &ti);
+ indices = gtk_tree_path_get_indices (tp);
 row = indices[0];
- gtk_tree_path_free(treepath);
- // find audio settings
+ gtk_tree_path_free(tp);
+
 if (row < 0) return;
 audio_list = ghb_settings_get_value(ud->settings, "audio_list");
- if (row >= ghb_array_len(audio_list))
- return;
- asettings = ghb_array_get_nth(audio_list, row);
-
- block_updates = TRUE;
- ghb_ui_update(ud, "AudioTrack", ghb_settings_get_value(asettings, "AudioTrack"));
- ghb_ui_update(ud, "AudioEncoder", ghb_settings_get_value(asettings, "AudioEncoder"));
- ghb_settings_set_value(ud->settings, "AudioEncoderActual", ghb_settings_get_value(asettings, "AudioEncoderActual"));
- ghb_check_dependency(ud, NULL, "AudioEncoderActual");
- ghb_ui_update(ud, "AudioBitrate", ghb_settings_get_value(asettings, "AudioBitrate"));
- ghb_ui_update(ud, "AudioTrackName", ghb_settings_get_value(asettings, "AudioTrackName"));
- ghb_ui_update(ud, "AudioSamplerate", ghb_settings_get_value(asettings, "AudioSamplerate"));
- ghb_ui_update(ud, "AudioMixdown", ghb_settings_get_value(asettings, "AudioMixdown"));
- ghb_ui_update(ud, "AudioTrackDRCSlider", ghb_settings_get_value(asettings, "AudioTrackDRCSlider"));
- ghb_ui_update(ud, "AudioTrackGain", ghb_settings_get_value(asettings, "AudioTrackGain"));
- ghb_ui_update(ud, "AudioTrackQuality", ghb_settings_get_value(asettings, "AudioTrackQuality"));
- ghb_ui_update(ud, "AudioTrackQualityEnable", ghb_settings_get_value(asettings, "AudioTrackQualityEnable"));
- block_updates = FALSE;
- widget = GHB_WIDGET (ud->builder, "audio_remove");
- gtk_widget_set_sensitive(widget, TRUE);
-
- ghb_adjust_audio_rate_combos(ud);
- }
- else
- {
- widget = GHB_WIDGET (ud->builder, "audio_remove");
- gtk_widget_set_sensitive(widget, FALSE);
+ if (row >= 0 && row < ghb_array_len(audio_list))
+ asettings = ghb_array_get_nth(audio_list, row);
 }
+ audio_update_dialog_widgets(ud, asettings);
 }
 
-static gboolean
-ghb_add_audio_to_settings(GValue *settings, GValue *asettings)
+static void
+audio_add_to_settings(GValue *settings, GValue *asettings)
 {
 GValue *audio_list;
- const gchar * track;
- int count;
+ int title_id;
+ const hb_title_t *title;
+ gint titleindex;
+ hb_audio_config_t *aconfig;
 
+ title_id = ghb_settings_get_int(settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
 audio_list = ghb_settings_get_value(settings, "audio_list");
 if (audio_list == NULL)
 {
 audio_list = ghb_array_value_new(8);
 ghb_settings_set_value(settings, "audio_list", audio_list);
 }
- count = ghb_array_len(audio_list);
- // Don't allow more than 99
- // This is a hard limit imposed by libhb/reader.c:GetFifoForId()
- if (count >= 99)
+
+ int track = ghb_settings_get_int(asettings, "AudioTrack");
+ aconfig = ghb_get_audio_info(title, track);
+ if (aconfig != NULL)
 {
- ghb_value_free(asettings);
- return FALSE;
+ char *desc;
+ desc = g_strdup_printf("%d - %s", track + 1, aconfig->lang.description);
+ ghb_settings_set_string(asettings, "AudioTrackDescription", desc);
+ g_free(desc);
 }
 
- int title_no = ghb_settings_get_int(settings, "title_no");
- int track_no = ghb_settings_get_int(asettings, "AudioTrack");
- track = ghb_audio_track_description(track_no, title_no);
- ghb_settings_set_string(asettings, "AudioTrackDescription", track);
-
 GValue *aname;
 aname = ghb_dict_lookup(asettings, "AudioTrackName");
 if (aname == NULL)
 {
 ghb_settings_set_string(asettings, "AudioTrackName", "");
 }
- if (ghb_array_len(audio_list) >= 99)
- {
- ghb_value_free(asettings);
- return FALSE;
- }
 ghb_array_append(audio_list, asettings);
- return TRUE;
 }
 
 G_MODULE_EXPORT void
 audio_add_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
 // Add the current audio settings to the list.
- GValue *asettings;
- GtkWidget *widget;
- 
- g_debug("audio_add_clicked_cb ()");
- asettings = ghb_dict_value_new();
- widget = GHB_WIDGET(ud->builder, "AudioTrack");
- ghb_settings_take_value(asettings, "AudioTrack", ghb_widget_value(widget));
- widget = GHB_WIDGET(ud->builder, "AudioEncoder");
- ghb_settings_take_value(asettings, "AudioEncoder", ghb_widget_value(widget));
- ghb_settings_set_value(asettings, "AudioEncoderActual", 
- ghb_settings_get_value(ud->settings, "AudioEncoderActual"));
- widget = GHB_WIDGET(ud->builder, "AudioTrackQualityEnable");
- ghb_settings_take_value(asettings, "AudioTrackQualityEnable", ghb_widget_value(widget));
- widget = GHB_WIDGET(ud->builder, "AudioTrackQuality");
- ghb_settings_take_value(asettings, "AudioTrackQuality", ghb_widget_value(widget));
- widget = GHB_WIDGET(ud->builder, "AudioBitrate");
- ghb_settings_take_value(asettings, "AudioBitrate", ghb_widget_value(widget));
- widget = GHB_WIDGET(ud->builder, "AudioSamplerate");
- ghb_settings_take_value(asettings, "AudioSamplerate", ghb_widget_value(widget));
- widget = GHB_WIDGET(ud->builder, "AudioMixdown");
- ghb_settings_take_value(asettings, "AudioMixdown", ghb_widget_value(widget));
- widget = GHB_WIDGET(ud->builder, "AudioTrackGain");
- ghb_settings_take_value(asettings, "AudioTrackGain", ghb_widget_value(widget));
- widget = GHB_WIDGET(ud->builder, "AudioTrackDRCSlider");
- ghb_settings_take_value(asettings, "AudioTrackDRCSlider", ghb_widget_value(widget));
-
- if (!ghb_add_audio_to_settings(ud->settings, asettings))
- return;
+ GValue *asettings, *backup;
+ int title_id, titleindex;
+ const hb_title_t *title;
 
- ghb_add_audio_to_ui(ud->builder, asettings);
- check_list_full(ud);
-}
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
 
-G_MODULE_EXPORT void
-audio_remove_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
- GtkTreeView *treeview;
- GtkTreePath *treepath;
- GtkTreeSelection *selection;
- GtkTreeModel *store;
- GtkTreeIter iter, nextIter;
- gint *indices;
- gint row;
- GValue *audio_list;
+ // Back up settings in case we need to revert.
+ backup = ghb_value_dup(
+ ghb_settings_get_value(ud->settings, "audio_list"));
+ GValue *pref_audio = ghb_settings_get_value(ud->settings, "AudioList");
+ asettings = audio_select_and_add_track(title, ud->settings, pref_audio,
+ "und", 0, 0);
+ ghb_add_audio_to_ui(ud, asettings);
 
- g_debug("audio_remove_clicked_cb ()");
- treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
- selection = gtk_tree_view_get_selection (treeview);
- if (gtk_tree_selection_get_selected(selection, &store, &iter))
+ if (asettings != NULL)
 {
- nextIter = iter;
- if (!gtk_tree_model_iter_next(store, &nextIter))
+ // Pop up the edit dialog
+ GtkResponseType response;
+ GtkWidget *dialog = GHB_WIDGET(ud->builder, "audio_dialog");
+ response = gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_hide(dialog);
+ if (response != GTK_RESPONSE_OK)
 {
- nextIter = iter;
- if (gtk_tree_model_get_iter_first(store, &nextIter))
+ ghb_settings_take_value(ud->settings, "audio_list", backup);
+ asettings = audio_get_selected_settings(ud, NULL);
+ if (asettings != NULL)
 {
- gtk_tree_selection_select_iter (selection, &nextIter);
+ audio_update_dialog_widgets(ud, asettings);
 }
+ audio_refresh_list_ui(ud);
 }
 else
 {
- gtk_tree_selection_select_iter (selection, &nextIter);
+ ghb_value_free(backup);
 }
- // Get the row number
- treepath = gtk_tree_model_get_path (store, &iter);
- indices = gtk_tree_path_get_indices (treepath);
- row = indices[0];
- gtk_tree_path_free(treepath);
- if (row < 0) return;
+ }
+}
 
- audio_list = ghb_settings_get_value(ud->settings, "audio_list");
- if (row >= ghb_array_len(audio_list))
- return;
+G_MODULE_EXPORT void
+audio_add_all_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
+ int title_id, titleindex;
+ const hb_title_t *title;
 
- // Update our settings list before removing the row from the
- // treeview. Removing from the treeview sometimes provokes an
- // immediate selection change, so the list needs to be up to date
- // when this happens.
+ // Add the current audio settings to the list.
+ ghb_clear_audio_list_settings(ud->settings);
+ ghb_clear_audio_list_ui(ud->builder);
+
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ GValue *pref_audio = ghb_settings_get_value(ud->settings, "AudioList");
+
+ int pref_count = ghb_array_len(pref_audio);
+
+ int ii;
+ for (ii = 0; ii < pref_count; ii++)
+ {
+ GValue *asettings;
+ int track = 0;
+
+ do
+ {
+
+ asettings = audio_select_and_add_track(title, ud->settings,
+ pref_audio, "und", ii,
+ track);
+ if (asettings != NULL)
+ {
+ track = ghb_settings_get_int(asettings, "AudioTrack") + 1;
+ }
+ } while (asettings != NULL);
+ }
+ audio_refresh_list_ui(ud);
+}
+
+G_MODULE_EXPORT void
+audio_edit_clicked_cb(GtkWidget *widget, gchar *path, signal_user_data_t *ud)
+{
+ GtkTreeView *tv;
+ GtkTreePath *tp;
+ GtkTreeModel *tm;
+ GtkTreeSelection *ts;
+ GtkTreeIter ti;
+
+ tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
+ ts = gtk_tree_view_get_selection(tv);
+ tm = gtk_tree_view_get_model(tv);
+ tp = gtk_tree_path_new_from_string (path);
+ if (gtk_tree_path_get_depth(tp) > 1) return;
+ if (gtk_tree_model_get_iter(tm, &ti, tp))
+ {
+ GValue *asettings, *backup;
+
+ gtk_tree_selection_select_iter(ts, &ti);
+
+ // Back up settings in case we need to revert.
+ backup = ghb_value_dup(
+ ghb_settings_get_value(ud->settings, "audio_list"));
+
+ // Pop up the edit dialog
+ GtkResponseType response;
+ GtkWidget *dialog = GHB_WIDGET(ud->builder, "audio_dialog");
+ response = gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_hide(dialog);
+ if (response != GTK_RESPONSE_OK)
+ {
+ ghb_settings_take_value(ud->settings, "audio_list", backup);
+ asettings = audio_get_selected_settings(ud, NULL);
+ if (asettings != NULL)
+ {
+ audio_update_dialog_widgets(ud, asettings);
+ }
+ audio_refresh_list_ui(ud);
+ }
+ else
+ {
+ ghb_value_free(backup);
+ }
+ }
+}
+
+G_MODULE_EXPORT void
+audio_remove_clicked_cb(GtkWidget *widget, gchar *path, signal_user_data_t *ud)
+{
+ GtkTreeView *tv;
+ GtkTreePath *tp;
+ GtkTreeModel *tm;
+ GtkTreeSelection *ts;
+ GtkTreeIter ti, nextIter;
+ gint row;
+ gint *indices;
+ GValue *audio_list;
+
+ tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
+ ts = gtk_tree_view_get_selection(tv);
+ tm = gtk_tree_view_get_model(tv);
+ tp = gtk_tree_path_new_from_string (path);
+ if (gtk_tree_path_get_depth(tp) > 1) return;
+ if (gtk_tree_model_get_iter(tm, &ti, tp))
+ {
+ nextIter = ti;
+ if (!gtk_tree_model_iter_next(tm, &nextIter))
+ {
+ nextIter = ti;
+ if (gtk_tree_model_get_iter_first(tm, &nextIter))
+ {
+ gtk_tree_selection_select_iter(ts, &nextIter);
+ }
+ }
+ else
+ {
+ gtk_tree_selection_select_iter(ts, &nextIter);
+ }
+
+ audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+
+ // Get the row number
+ indices = gtk_tree_path_get_indices (tp);
+ row = indices[0];
+ if (row < 0 || row >= ghb_array_len(audio_list))
+ {
+ gtk_tree_path_free(tp);
+ return;
+ }
+
+ // Update our settings list before removing the row from the
+ // treeview. Removing from the treeview sometimes provokes an
+ // immediate selection change, so the list needs to be up to date
+ // when this happens.
 GValue *old = ghb_array_get_nth(audio_list, row);
 ghb_value_free(old);
 ghb_array_remove(audio_list, row);
 
 // Remove the selected item
- gtk_list_store_remove (GTK_LIST_STORE(store), &iter);
- // remove from audio settings list
- widget = GHB_WIDGET (ud->builder, "audio_add");
- gtk_widget_set_sensitive(widget, TRUE);
+ gtk_tree_store_remove(GTK_TREE_STORE(tm), &ti);
+
+ ghb_live_reset(ud);
 }
+ gtk_tree_path_free(tp);
 }
 
-void
-ghb_set_audio(signal_user_data_t *ud, GValue *settings)
+G_MODULE_EXPORT void
+audio_reset_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ ghb_set_pref_audio_settings(ud->settings);
+ audio_refresh_list_ui(ud);
+}
+
+static GtkWidget *find_widget(GtkWidget *widget, gchar *name)
+{
+ const char *wname;
+ GtkWidget *result = NULL;
+
+ if (widget == NULL || name == NULL)
+ return NULL;
+
+ wname = gtk_widget_get_name(widget);
+ if (wname != NULL && !strncmp(wname, name, 80))
+ {
+ return widget;
+ }
+ if (GTK_IS_CONTAINER(widget))
+ {
+ GList *list, *link;
+ link = list = gtk_container_get_children(GTK_CONTAINER(widget));
+ while (link)
+ {
+ result = find_widget(GTK_WIDGET(link->data), name);
+ if (result != NULL)
+ break;
+ link = link->next;
+ }
+ g_list_free(list);
+ }
+ return result;
+}
+
+static void audio_def_update_widgets(GtkWidget *row, GValue *adict)
+{
+ GHashTableIter ti;
+ gchar *key;
+ GValue *gval;
+ GtkWidget *widget;
+
+ ghb_dict_iter_init(&ti, adict);
+
+ block_updates = TRUE;
+ while (g_hash_table_iter_next(&ti, (gpointer*)&key, (gpointer*)&gval))
+ {
+ widget = find_widget(row, key);
+ if (widget != NULL)
+ {
+ ghb_update_widget(widget, gval);
+ }
+ }
+ block_updates = FALSE;
+}
+
+static GtkListBoxRow*
+audio_settings_get_row(GtkWidget *widget)
+{
+ while (widget != NULL && G_OBJECT_TYPE(widget) != GTK_TYPE_LIST_BOX_ROW)
+ {
+ widget = gtk_widget_get_parent(widget);
+ }
+ return GTK_LIST_BOX_ROW(widget);
+}
+
+static void audio_def_settings_bitrate_show(GtkWidget *widget, gboolean show)
+{
+ GtkWidget *bitrate_widget;
+ GtkWidget *quality_widget;
+
+ bitrate_widget = find_widget(widget, "AudioBitrate");
+ quality_widget = find_widget(widget, "AudioTrackQualityBox");
+
+ if (show)
+ {
+ gtk_widget_hide(quality_widget);
+ gtk_widget_show(bitrate_widget);
+ }
+ else
+ {
+ gtk_widget_hide(bitrate_widget);
+ gtk_widget_show(quality_widget);
+ }
+}
+
+static void audio_def_settings_quality_set_sensitive(GtkWidget *w, gboolean s)
+{
+ GtkWidget *bitrate_widget;
+ GtkWidget *quality_widget;
+
+ bitrate_widget = find_widget(w, "AudioTrackBitrateEnable");
+ quality_widget = find_widget(w, "AudioTrackQualityEnable");
+ if (!s)
+ {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bitrate_widget), TRUE);
+ }
+ gtk_widget_set_sensitive(GTK_WIDGET(quality_widget), s);
+}
+
+static void audio_def_settings_show(GtkWidget *widget, gboolean show)
+{
+ GtkWidget *settings_box;
+ GtkWidget *add_button;
+
+ settings_box = find_widget(widget, "settings_box");
+ add_button = find_widget(widget, "add_button");
+
+ if (show)
+ {
+ gtk_widget_hide(add_button);
+ gtk_widget_show(settings_box);
+ }
+ else
+ {
+ gtk_widget_hide(settings_box);
+ gtk_widget_show(add_button);
+ }
+}
+
+static void
+audio_def_settings_init_row(GValue *adict, GtkWidget *row)
+{
+ GtkWidget *widget;
+
+ widget = find_widget(row, "AudioEncoder");
+ ghb_widget_to_setting(adict, widget);
+ widget = find_widget(row, "AudioBitrate");
+ ghb_widget_to_setting(adict, widget);
+ widget = find_widget(row, "AudioMixdown");
+ ghb_widget_to_setting(adict, widget);
+ widget = find_widget(row, "AudioSamplerate");
+ ghb_widget_to_setting(adict, widget);
+ widget = find_widget(row, "AudioTrackGainSlider");
+ ghb_widget_to_setting(adict, widget);
+ widget = find_widget(row, "AudioTrackDRCSlider");
+ ghb_widget_to_setting(adict, widget);
+ widget = find_widget(row, "AudioTrackQuality");
+ ghb_widget_to_setting(adict, widget);
+ widget = find_widget(row, "AudioTrackQualityEnable");
+ ghb_widget_to_setting(adict, widget);
+}
+
+G_MODULE_EXPORT void
+audio_def_setting_add_cb(GtkWidget *w, signal_user_data_t *ud);
+G_MODULE_EXPORT void
+audio_def_setting_remove_cb(GtkWidget *w, signal_user_data_t *ud);
+G_MODULE_EXPORT void
+audio_def_encoder_changed_cb(GtkWidget *w, signal_user_data_t *ud);
+G_MODULE_EXPORT void
+audio_def_encode_setting_changed_cb(GtkWidget *w, signal_user_data_t *ud);
+G_MODULE_EXPORT void
+audio_def_drc_changed_cb(GtkWidget *w, gdouble drc, signal_user_data_t *ud);
+G_MODULE_EXPORT void
+audio_def_gain_changed_cb(GtkWidget *w, gdouble gain, signal_user_data_t *ud);
+G_MODULE_EXPORT void
+audio_def_quality_changed_cb(GtkWidget *w, gdouble quality, signal_user_data_t *ud);
+G_MODULE_EXPORT void
+audio_def_quality_enable_changed_cb(GtkWidget *w, signal_user_data_t *ud);
+
+GtkWidget * ghb_create_audio_settings_row(signal_user_data_t *ud)
+{
+ GtkBox *box, *box2, *box3;
+ GtkComboBox *combo;
+ GtkScaleButton *scale;
+ GtkLabel *label;
+ GtkRadioButton *radio;
+ GtkButton *button;
+ GtkImage *image;
+
+ box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));
+
+ // Add Button
+ button = GTK_BUTTON(gtk_button_new_with_label(_("Add")));
+ gtk_widget_set_tooltip_markup(GTK_WIDGET(button),
+ _("Add an audio encoder.\n"
+ "Each selected source track will be encoded with all selected encoders."));
+ gtk_widget_set_valign(GTK_WIDGET(button), GTK_ALIGN_CENTER);
+ gtk_widget_set_name(GTK_WIDGET(button), "add_button");
+ gtk_widget_hide(GTK_WIDGET(button));
+ g_signal_connect(button, "clicked", (GCallback)audio_def_setting_add_cb, ud);
+ gtk_box_pack_start(box, GTK_WIDGET(button), FALSE, FALSE, 0);
+
+ // Hidden widgets box
+ box2 = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));
+ gtk_widget_set_name(GTK_WIDGET(box2), "settings_box");
+
+ // Audio Encoder ComboBox
+ combo = GTK_COMBO_BOX(gtk_combo_box_new());
+ ghb_init_combo_box(combo);
+ ghb_audio_encoder_opts_set(combo);
+ // Init to first audio encoder
+ const hb_encoder_t *aud_enc = hb_audio_encoder_get_next(NULL);
+ ghb_update_widget(GTK_WIDGET(combo), ghb_int64_value(aud_enc->codec));
+ gtk_widget_set_tooltip_markup(GTK_WIDGET(combo),
+ _("Set the audio codec to encode this track with."));
+ gtk_widget_set_valign(GTK_WIDGET(combo), GTK_ALIGN_CENTER);
+ gtk_widget_set_name(GTK_WIDGET(combo), "AudioEncoder");
+ gtk_widget_show(GTK_WIDGET(combo));
+ g_signal_connect(combo, "changed", (GCallback)audio_def_encoder_changed_cb, ud);
+ gtk_box_pack_start(box2, GTK_WIDGET(combo), FALSE, FALSE, 0);
+
+ box3 = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));
+ gtk_widget_set_name(GTK_WIDGET(box3), "br_q_box");
+ gtk_widget_show(GTK_WIDGET(box3));
+
+ // Bitrate vs Quality RadioButton
+ GtkBox *vbox;
+ vbox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
+ radio = GTK_RADIO_BUTTON(gtk_radio_button_new_with_label(NULL, _("Bitrate")));
+ gtk_widget_set_name(GTK_WIDGET(radio), "AudioTrackBitrateEnable");
+ gtk_widget_show(GTK_WIDGET(radio));
+ gtk_box_pack_start(vbox, GTK_WIDGET(radio), FALSE, FALSE, 0);
+ radio = GTK_RADIO_BUTTON(
+ gtk_radio_button_new_with_label_from_widget(radio, _("Quality")));
+ gtk_widget_set_name(GTK_WIDGET(radio), "AudioTrackQualityEnable");
+ g_signal_connect(radio, "toggled", (GCallback)audio_def_quality_enable_changed_cb, ud);
+ gtk_widget_show(GTK_WIDGET(radio));
+ gtk_box_pack_start(vbox, GTK_WIDGET(radio), FALSE, FALSE, 0);
+ gtk_widget_show(GTK_WIDGET(vbox));
+ gtk_box_pack_start(box3, GTK_WIDGET(vbox), FALSE, FALSE, 0);
+
+ // Audio Bitrate ComboBox
+ combo = GTK_COMBO_BOX(gtk_combo_box_new());
+ ghb_init_combo_box(combo);
+ ghb_audio_bitrate_opts_set(combo, FALSE);
+ ghb_update_widget(GTK_WIDGET(combo), ghb_int64_value(192));
+ gtk_widget_set_tooltip_markup(GTK_WIDGET(combo),
+ _("Set the bitrate to encode this track with."));
+ gtk_widget_set_valign(GTK_WIDGET(combo), GTK_ALIGN_CENTER);
+ gtk_widget_set_name(GTK_WIDGET(combo), "AudioBitrate");
+ gtk_widget_show(GTK_WIDGET(combo));
+ g_signal_connect(combo, "changed", (GCallback)audio_def_encode_setting_changed_cb, ud);
+ gtk_box_pack_start(box3, GTK_WIDGET(combo), FALSE, FALSE, 0);
+
+ GtkBox *qbox;
+ qbox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));
+ gtk_widget_set_name(GTK_WIDGET(qbox), "AudioTrackQualityBox");
+
+ // Audio Quality ScaleButton
+ const gchar *quality_icons[] = {
+ "weather-storm",
+ "weather-clear",
+ "weather-storm",
+ "weather-showers-scattered",
+ "weather-showers",
+ "weather-overcast",
+ "weather-few-clouds",
+ "weather-clear",
+ NULL
+ };
+ scale = GTK_SCALE_BUTTON(gtk_scale_button_new(GTK_ICON_SIZE_BUTTON,
+ 0, 10, 0.1, quality_icons));
+ gtk_widget_set_tooltip_markup(GTK_WIDGET(scale),
+ _("Audio Quality:\n"
+ "For encoders that support it, adjust the quality of the output."));
+
+ gtk_widget_set_valign(GTK_WIDGET(scale), GTK_ALIGN_CENTER);
+ gtk_widget_set_name(GTK_WIDGET(scale), "AudioTrackQuality");
+ gtk_widget_show(GTK_WIDGET(scale));
+ g_signal_connect(scale, "value-changed", (GCallback)audio_def_quality_changed_cb, ud);
+ gtk_box_pack_start(qbox, GTK_WIDGET(scale), FALSE, FALSE, 0);
+
+ // Audio Quality Label
+ label = GTK_LABEL(gtk_label_new("0.00"));
+ gtk_label_set_width_chars(label, 4);
+ gtk_widget_set_halign(GTK_WIDGET(label), GTK_ALIGN_START);
+ gtk_widget_set_valign(GTK_WIDGET(label), GTK_ALIGN_CENTER);
+ gtk_widget_set_name(GTK_WIDGET(label), "AudioTrackQualityValue");
+ gtk_widget_show(GTK_WIDGET(label));
+ gtk_box_pack_start(qbox, GTK_WIDGET(label), FALSE, FALSE, 0);
+ gtk_widget_hide(GTK_WIDGET(qbox));
+ gtk_box_pack_start(box3, GTK_WIDGET(qbox), FALSE, FALSE, 0);
+ gtk_box_pack_start(box2, GTK_WIDGET(box3), FALSE, FALSE, 0);
+
+ // Audio Mix ComboBox
+ combo = GTK_COMBO_BOX(gtk_combo_box_new());
+ ghb_init_combo_box(combo);
+ ghb_mix_opts_set(combo);
+ ghb_update_widget(GTK_WIDGET(combo), ghb_int64_value(HB_AMIXDOWN_5POINT1));
+ gtk_widget_set_tooltip_markup(GTK_WIDGET(combo),
+ _("Set the mixdown of the output audio track."));
+ gtk_widget_set_valign(GTK_WIDGET(combo), GTK_ALIGN_CENTER);
+ gtk_widget_set_name(GTK_WIDGET(combo), "AudioMixdown");
+ gtk_widget_show(GTK_WIDGET(combo));
+ g_signal_connect(combo, "changed", (GCallback)audio_def_encode_setting_changed_cb, ud);
+ gtk_box_pack_start(box2, GTK_WIDGET(combo), FALSE, FALSE, 0);
+
+ // Audio Sample Rate ComboBox
+ combo = GTK_COMBO_BOX(gtk_combo_box_new());
+ ghb_init_combo_box(combo);
+ ghb_audio_samplerate_opts_set(combo);
+ ghb_update_widget(GTK_WIDGET(combo), ghb_int64_value(0));
+ gtk_widget_set_tooltip_markup(GTK_WIDGET(combo),
+ _("Set the sample rate of the output audio track."));
+ gtk_widget_set_valign(GTK_WIDGET(combo), GTK_ALIGN_CENTER);
+ gtk_widget_set_name(GTK_WIDGET(combo), "AudioSamplerate");
+ gtk_widget_show(GTK_WIDGET(combo));
+ g_signal_connect(combo, "changed", (GCallback)audio_def_encode_setting_changed_cb, ud);
+ gtk_box_pack_start(box2, GTK_WIDGET(combo), FALSE, FALSE, 0);
+
+ box3 = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));
+ gtk_widget_set_name(GTK_WIDGET(box3), "gain_box");
+ gtk_widget_show(GTK_WIDGET(box3));
+
+ // Audio Gain ScaleButton
+ const gchar *gain_icons[] = {
+ "audio-volume-muted",
+ "audio-volume-high",
+ "audio-volume-low",
+ "audio-volume-medium",
+ NULL
+ };
+ scale = GTK_SCALE_BUTTON(gtk_scale_button_new(GTK_ICON_SIZE_BUTTON,
+ -20, 21, 1, gain_icons));
+ gtk_widget_set_tooltip_markup(GTK_WIDGET(scale),
+ _("Audio Gain:\n"
+ "Adjust the amplification or attenuation of the output audio track."));
+
+ gtk_widget_set_valign(GTK_WIDGET(scale), GTK_ALIGN_CENTER);
+ gtk_widget_set_name(GTK_WIDGET(scale), "AudioTrackGainSlider");
+ gtk_widget_show(GTK_WIDGET(scale));
+ g_signal_connect(scale, "value-changed", (GCallback)audio_def_gain_changed_cb, ud);
+ gtk_box_pack_start(box3, GTK_WIDGET(scale), FALSE, FALSE, 0);
+
+ // Audio Gain Label
+ label = GTK_LABEL(gtk_label_new(_("0dB")));
+ gtk_label_set_width_chars(label, 6);
+ gtk_widget_set_halign(GTK_WIDGET(label), GTK_ALIGN_START);
+ gtk_widget_set_valign(GTK_WIDGET(label), GTK_ALIGN_CENTER);
+ gtk_widget_set_name(GTK_WIDGET(label), "AudioTrackGainValue");
+ gtk_widget_show(GTK_WIDGET(label));
+ gtk_box_pack_start(box3, GTK_WIDGET(label), FALSE, FALSE, 0);
+ gtk_box_pack_start(box2, GTK_WIDGET(box3), FALSE, FALSE, 0);
+
+ box3 = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));
+ gtk_widget_set_name(GTK_WIDGET(box3), "drc_box");
+ gtk_widget_show(GTK_WIDGET(box3));
+
+ // Audio DRC ComboBox
+ const gchar *drc_icons[] = {
+ "audio-input-microphone",
+ NULL
+ };
+ scale = GTK_SCALE_BUTTON(gtk_scale_button_new(GTK_ICON_SIZE_BUTTON,
+ 0.9, 4, 0.1, drc_icons));
+ gtk_widget_set_tooltip_markup(GTK_WIDGET(scale),
+ _("Dynamic Range Compression:\n"
+ "Adjust the dynamic range of the output audio track.\n"
+ "For source audio that has a wide dynamic range,\n"
+ "very loud and very soft sequences, DRC allows you\n"
+ "to 'compress' the range by making loud sounds\n"
+ "softer and soft sounds louder.\n"));
+
+ gtk_widget_set_valign(GTK_WIDGET(scale), GTK_ALIGN_CENTER);
+ gtk_widget_set_name(GTK_WIDGET(scale), "AudioTrackDRCSlider");
+ gtk_widget_show(GTK_WIDGET(scale));
+ g_signal_connect(scale, "value-changed", (GCallback)audio_def_drc_changed_cb, ud);
+ gtk_box_pack_start(box3, GTK_WIDGET(scale), FALSE, FALSE, 0);
+
+ // Audio DRC Label
+ label = GTK_LABEL(gtk_label_new(_("Off")));
+ gtk_label_set_width_chars(label, 4);
+ gtk_widget_set_halign(GTK_WIDGET(label), GTK_ALIGN_START);
+ gtk_widget_set_valign(GTK_WIDGET(label), GTK_ALIGN_CENTER);
+ gtk_widget_set_name(GTK_WIDGET(label), "AudioTrackDRCValue");
+ gtk_widget_show(GTK_WIDGET(label));
+ gtk_box_pack_start(box3, GTK_WIDGET(label), FALSE, FALSE, 0);
+ gtk_box_pack_start(box2, GTK_WIDGET(box3), FALSE, FALSE, 0);
+
+ // Remove button
+ image = GTK_IMAGE(gtk_image_new_from_icon_name("hb-remove",
+ GTK_ICON_SIZE_BUTTON));
+ button = GTK_BUTTON(gtk_button_new());
+ gtk_button_set_image(button, GTK_WIDGET(image));
+ gtk_widget_set_tooltip_markup(GTK_WIDGET(button),
+ _("Remove this audio encoder"));
+ gtk_button_set_relief(button, GTK_RELIEF_NONE);
+ gtk_widget_set_valign(GTK_WIDGET(button), GTK_ALIGN_CENTER);
+ gtk_widget_set_halign(GTK_WIDGET(button), GTK_ALIGN_END);
+ gtk_widget_set_name(GTK_WIDGET(button), "remove_button");
+ gtk_widget_show(GTK_WIDGET(button));
+ g_signal_connect(button, "clicked", (GCallback)audio_def_setting_remove_cb, ud);
+ gtk_box_pack_start(box2, GTK_WIDGET(button), TRUE, TRUE, 0);
+
+ gtk_widget_show(GTK_WIDGET(box2));
+ gtk_box_pack_start(box, GTK_WIDGET(box2), TRUE, TRUE, 0);
+
+ gtk_widget_show(GTK_WIDGET(box));
+
+ GtkWidget *widget;
+
+ int width;
+ widget = find_widget(GTK_WIDGET(box), "AudioEncoder");
+ gtk_widget_get_preferred_width(widget, NULL, &width);
+
+ widget = GHB_WIDGET(ud->builder, "audio_defaults_encoder_label");
+ gtk_widget_set_size_request(widget, width, -1);
+ widget = find_widget(GTK_WIDGET(box), "br_q_box");
+ gtk_widget_get_preferred_width(widget, NULL, &width);
+ widget = GHB_WIDGET(ud->builder, "audio_defaults_bitrate_label");
+ gtk_widget_set_size_request(widget, width, -1);
+ widget = find_widget(GTK_WIDGET(box), "AudioMixdown");
+ gtk_widget_get_preferred_width(widget, NULL, &width);
+ widget = GHB_WIDGET(ud->builder, "audio_defaults_mixdown_label");
+ gtk_widget_set_size_request(widget, width, -1);
+ widget = find_widget(GTK_WIDGET(box), "AudioSamplerate");
+ gtk_widget_get_preferred_width(widget, NULL, &width);
+ widget = GHB_WIDGET(ud->builder, "audio_defaults_samplerate_label");
+ gtk_widget_set_size_request(widget, width, -1);
+ widget = find_widget(GTK_WIDGET(box), "gain_box");
+ gtk_widget_get_preferred_width(widget, NULL, &width);
+ widget = GHB_WIDGET(ud->builder, "audio_defaults_gain_label");
+ gtk_widget_set_size_request(widget, width, -1);
+ widget = find_widget(GTK_WIDGET(box), "drc_box");
+ gtk_widget_get_preferred_width(widget, NULL, &width);
+ widget = GHB_WIDGET(ud->builder, "audio_defaults_drc_label");
+ gtk_widget_set_size_request(widget, width, -1);
+
+ return GTK_WIDGET(box);
+}
+
+static void
+audio_def_setting_update(signal_user_data_t *ud, GtkWidget *widget)
+{
+ GtkListBoxRow *row = audio_settings_get_row(widget);
+ gint index = gtk_list_box_row_get_index(row);
+
+ GValue *alist = ghb_settings_get_value(ud->settings, "AudioList");
+ int count = ghb_array_len(alist);
+ if (!block_updates && index >= 0 && index < count)
+ {
+ GValue *adict = ghb_array_get_nth(alist, index);
+ ghb_widget_to_setting(adict, widget);
+ }
+}
+
+G_MODULE_EXPORT void
+audio_add_lang_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ GtkListBox *avail = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "audio_avail_lang"));
+ GtkListBox *selected = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "audio_selected_lang"));
+ GtkListBoxRow *row;
+ GtkWidget *label;
+
+ row = gtk_list_box_get_selected_row(avail);
+ if (row != NULL)
+ {
+ int idx;
+ const iso639_lang_t *lang;
+ GValue *glang, *alang_list;
+
+ // Remove from UI available language list box
+ label = gtk_bin_get_child(GTK_BIN(row));
+ g_object_ref(G_OBJECT(label));
+ gtk_widget_destroy(GTK_WIDGET(row));
+ gtk_widget_show(label);
+ // Add to UI selected language list box
+ gtk_list_box_insert(selected, label, -1);
+
+ // Add to preset language list
+ idx = (intptr_t)g_object_get_data(G_OBJECT(label), "lang_idx");
+ lang = ghb_iso639_lookup_by_int(idx);
+ glang = ghb_string_value_new(lang->iso639_2);
+ alang_list = ghb_settings_get_value(ud->settings, "AudioLanguageList");
+ ghb_array_append(alang_list, glang);
+ ghb_clear_presets_selection(ud);
+ }
+}
+
+G_MODULE_EXPORT void
+audio_remove_lang_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+
+ GtkListBox *avail, *selected;
+ GtkListBoxRow *row;
+ GtkWidget *label;
+
+ avail = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "audio_avail_lang"));
+ selected = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "audio_selected_lang"));
+ row = gtk_list_box_get_selected_row(selected);
+ if (row != NULL)
+ {
+ gint index;
+ GValue *alang_list;
+
+ index = gtk_list_box_row_get_index(row);
+
+ // Remove from UI selected language list box
+ label = gtk_bin_get_child(GTK_BIN(row));
+ g_object_ref(G_OBJECT(label));
+ int idx = (intptr_t)g_object_get_data(G_OBJECT(label), "lang_idx");
+ gtk_widget_destroy(GTK_WIDGET(row));
+ gtk_widget_show(label);
+ // Add to UI available language list box
+ gtk_list_box_insert(avail, label, idx);
+
+ // Remove from preset language list
+ alang_list = ghb_settings_get_value(ud->settings, "AudioLanguageList");
+ GValue *glang = ghb_array_get_nth(alang_list, index);
+ ghb_array_remove(alang_list, index);
+ ghb_value_free(glang);
+ ghb_clear_presets_selection(ud);
+ }
+}
+
+static void audio_quality_update_limits(
+ GtkWidget *widget,
+ int encoder,
+ gboolean set_default,
+ gdouble value)
+{
+ float low, high, gran;
+ int dir;
+
+ hb_audio_quality_get_limits(encoder, &low, &high, &gran, &dir);
+ if (set_default)
+ {
+ value = hb_audio_quality_get_default(encoder);
+ if (dir)
+ {
+ // Quality values are inverted
+ value = high - value + low;
+ }
+ }
+ GtkScaleButton *sb;
+ GtkAdjustment *adj;
+ sb = GTK_SCALE_BUTTON(widget);
+ adj = gtk_scale_button_get_adjustment(sb);
+ gtk_adjustment_configure (adj, value, low, high, gran, gran * 10, 0);
+}
+
+void audio_def_set_limits(signal_user_data_t *ud, GtkWidget *widget, gboolean set_default)
+{
+ GtkListBoxRow *row = audio_settings_get_row(widget);
+ gint index = gtk_list_box_row_get_index(row);
+
+ GValue *alist = ghb_settings_get_value(ud->settings, "AudioList");
+ int count = ghb_array_len(alist);
+ if (index < 0 || index >= count)
+ return;
+
+ GValue *adict = ghb_array_get_nth(alist, index);
+
+ int codec = ghb_settings_audio_encoder_codec(adict, "AudioEncoder");
+ int fallback = ghb_settings_audio_encoder_codec(ud->settings,
+ "AudioEncoderFallback");
+ gdouble quality = ghb_settings_get_double(adict, "AudioTrackQuality");
+
+ // Allow quality settings if the current encoder supports quality
+ // or if the encoder is auto-passthru and the fallback encoder
+ // supports quality.
+ gboolean sensitive =
+ hb_audio_quality_get_default(codec) != HB_INVALID_AUDIO_QUALITY ||
+ (codec == HB_ACODEC_AUTO_PASS &&
+ hb_audio_quality_get_default(fallback) != HB_INVALID_AUDIO_QUALITY);
+ audio_def_settings_quality_set_sensitive(GTK_WIDGET(row), sensitive);
+
+ int enc;
+ if (sensitive)
+ {
+ enc = codec;
+ if (hb_audio_quality_get_default(codec) == HB_INVALID_AUDIO_QUALITY)
+ {
+ enc = fallback;
+ }
+ audio_quality_update_limits(find_widget(GTK_WIDGET(row),
+ "AudioTrackQuality"), enc,
+ set_default, quality);
+ }
+
+ enc = codec;
+ if (enc & HB_ACODEC_PASS_FLAG)
+ {
+ enc = ghb_select_fallback(ud->settings, enc);
+ }
+ int sr = ghb_settings_audio_samplerate_rate(adict, "AudioSamplerate");
+ if (sr == 0)
+ {
+ sr = 48000;
+ }
+ int mix = ghb_settings_mixdown_mix(adict, "AudioMixdown");
+ int low, high;
+ hb_audio_bitrate_get_limits(enc, sr, mix, &low, &high);
+ GtkWidget *w = find_widget(GTK_WIDGET(row), "AudioBitrate");
+ ghb_audio_bitrate_opts_filter(GTK_COMBO_BOX(w), low, high);
+ w = find_widget(GTK_WIDGET(row), "AudioMixdown");
+ ghb_mix_opts_filter(GTK_COMBO_BOX(w), enc);
+}
+
+void audio_def_set_all_limits_cb(GtkWidget *widget, gpointer data)
+{
+ signal_user_data_t *ud = (signal_user_data_t*)data;
+ audio_def_set_limits(ud, widget, FALSE);
+}
+
+void audio_def_set_all_limits(signal_user_data_t *ud)
+{
+ GtkListBox *list_box;
+
+ list_box = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "audio_list_default"));
+ gtk_container_foreach(GTK_CONTAINER(list_box),
+ audio_def_set_all_limits_cb, (gpointer)ud);
+}
+
+G_MODULE_EXPORT void
+audio_def_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ ghb_widget_to_setting(ud->settings, widget);
+ ghb_clear_presets_selection(ud);
+}
+
+G_MODULE_EXPORT void
+audio_fallback_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ ghb_widget_to_setting(ud->settings, widget);
+ audio_def_set_all_limits(ud);
+ ghb_clear_presets_selection(ud);
+}
+
+G_MODULE_EXPORT void
+audio_def_quality_enable_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
- gint acodec_code;
+ audio_def_setting_update(ud, widget);
+
+ GtkListBoxRow *row = audio_settings_get_row(widget);
+ gint index = gtk_list_box_row_get_index(row);
 
+ GValue *alist = ghb_settings_get_value(ud->settings, "AudioList");
+ GValue *adict = ghb_array_get_nth(alist, index);
+
+ audio_def_settings_bitrate_show(GTK_WIDGET(row),
+ !ghb_settings_get_boolean(adict, "AudioTrackQualityEnable"));
+ ghb_clear_presets_selection(ud);
+}
+
+G_MODULE_EXPORT void
+audio_def_quality_changed_cb(GtkWidget *widget, gdouble quality, signal_user_data_t *ud)
+{
+ audio_def_setting_update(ud, widget);
+
+ GtkListBoxRow *row = audio_settings_get_row(widget);
+ GtkWidget *quality_label = find_widget(GTK_WIDGET(row),
+ "AudioTrackQualityValue");
+ gint index = gtk_list_box_row_get_index(row);
+
+ GValue *alist = ghb_settings_get_value(ud->settings, "AudioList");
+ GValue *adict = ghb_array_get_nth(alist, index);
+ char *s_quality = get_quality_string(adict, quality);
+ ghb_update_widget(quality_label, ghb_string_value(s_quality));
+ g_free(s_quality);
+ ghb_clear_presets_selection(ud);
+}
+
+G_MODULE_EXPORT void
+audio_def_gain_changed_cb(GtkWidget *widget, gdouble gain, signal_user_data_t *ud)
+{
+ audio_def_setting_update(ud, widget);
+
+ GtkListBoxRow *row = audio_settings_get_row(widget);
+ GtkWidget *gain_label = find_widget(GTK_WIDGET(row), "AudioTrackGainValue");
+ char *s_gain = get_gain_string(gain);
+ ghb_update_widget(gain_label, ghb_string_value(s_gain));
+ g_free(s_gain);
+ ghb_clear_presets_selection(ud);
+}
+
+G_MODULE_EXPORT void
+audio_def_drc_changed_cb(GtkWidget *widget, gdouble drc, signal_user_data_t *ud)
+{
+ audio_def_setting_update(ud, widget);
+
+ GtkListBoxRow *row = audio_settings_get_row(widget);
+ GtkWidget *drc_label = find_widget(GTK_WIDGET(row), "AudioTrackDRCValue");
+
+ char *s_drc = get_drc_string(drc);
+ ghb_update_widget(drc_label, ghb_string_value(s_drc));
+ g_free(s_drc);
+ ghb_clear_presets_selection(ud);
+}
+
+G_MODULE_EXPORT void
+audio_def_setting_add_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ GtkListBoxRow *row = audio_settings_get_row(widget);
+
+ GValue *adict;
+ GValue *alist = ghb_settings_get_value(ud->settings, "AudioList");
+ int count = ghb_array_len(alist);
+ if (count > 0)
+ {
+ // Use first item in list as defaults for new entries.
+ adict = ghb_value_dup(ghb_array_get_nth(alist, 0));
+ audio_def_update_widgets(GTK_WIDGET(row), adict);
+ }
+ else
+ {
+ // Use hard coded defaults
+ adict = ghb_dict_value_new();
+ audio_def_settings_init_row(adict, GTK_WIDGET(row));
+ }
+ ghb_array_append(alist, adict);
+ audio_def_settings_show(GTK_WIDGET(row), TRUE);
+
+ // Add new "Add" button
+ widget = ghb_create_audio_settings_row(ud);
+ audio_def_settings_show(widget, FALSE);
+ GtkListBox *list_box;
+ list_box = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "audio_list_default"));
+ gtk_list_box_insert(list_box, widget, -1);
+ ghb_clear_presets_selection(ud);
+}
+
+G_MODULE_EXPORT void
+audio_def_setting_remove_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ GtkListBoxRow *row = audio_settings_get_row(widget);
+ gint index = gtk_list_box_row_get_index(row);
+
+ GValue *alist = ghb_settings_get_value(ud->settings, "AudioList");
+ int count = ghb_array_len(alist);
+ if (index < 0 || index >= count)
+ {
+ return;
+ }
+ gtk_widget_destroy(GTK_WIDGET(row));
+ GValue *asettings = ghb_array_get_nth(alist, index);
+ ghb_array_remove(alist, index);
+ ghb_value_free(asettings);
+ ghb_clear_presets_selection(ud);
+}
+
+G_MODULE_EXPORT void
+audio_def_encoder_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ audio_def_setting_update(ud, widget);
+ audio_def_set_limits(ud, widget, TRUE);
+ ghb_clear_presets_selection(ud);
+}
+
+G_MODULE_EXPORT void
+audio_def_encode_setting_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ audio_def_setting_update(ud, widget);
+ audio_def_set_limits(ud, widget, FALSE);
+ ghb_clear_presets_selection(ud);
+}
+
+GtkListBoxRow* ghb_find_lang_row(GtkListBox *list_box, int lang_idx)
+{
+ GList *list, *link;
+ GtkListBoxRow *result = NULL;
+
+ list = link = gtk_container_get_children(GTK_CONTAINER(list_box));
+ while (link != NULL)
+ {
+ GtkListBoxRow *row = (GtkListBoxRow*)link->data;
+ GtkWidget *label = gtk_bin_get_child(GTK_BIN(row));
+ int idx = (intptr_t)g_object_get_data(G_OBJECT(label), "lang_idx");
+ if (idx == lang_idx)
+ {
+ result = row;
+ break;
+ }
+ link = link->next;
+ }
+ g_list_free(list);
+
+ return result;
+}
+
+static void audio_def_lang_list_clear_cb(GtkWidget *row, gpointer data)
+{
+ GtkListBox *avail = (GtkListBox*)data;
+ GtkWidget *label = gtk_bin_get_child(GTK_BIN(row));
+ g_object_ref(G_OBJECT(label));
+ gtk_widget_destroy(GTK_WIDGET(row));
+ gtk_widget_show(label);
+ int idx = (intptr_t)g_object_get_data(G_OBJECT(label), "lang_idx");
+ gtk_list_box_insert(avail, label, idx);
+}
+
+static void
+audio_def_selected_lang_list_clear(signal_user_data_t *ud)
+{
+ GtkListBox *avail, *selected;
+ avail = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "audio_avail_lang"));
+ selected = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "audio_selected_lang"));
+ gtk_container_foreach(GTK_CONTAINER(selected),
+ audio_def_lang_list_clear_cb, (gpointer)avail);
+}
+
+static void
+audio_def_lang_list_init(signal_user_data_t *ud)
+{
+ GValue *lang_list;
+
+ // Clear selected languages.
+ audio_def_selected_lang_list_clear(ud);
+
+ lang_list = ghb_settings_get_value(ud->settings, "AudioLanguageList");
+ if (lang_list == NULL)
+ {
+ lang_list = ghb_array_value_new(8);
+ ghb_settings_set_value(ud->settings, "AudioLanguageList", lang_list);
+ }
+
+ int ii, count;
+ count = ghb_array_len(lang_list);
+ for (ii = 0; ii < count; )
+ {
+ GValue *lang_val = ghb_array_get_nth(lang_list, ii);
+ int idx = ghb_lookup_audio_lang(lang_val);
+
+ GtkListBox *avail, *selected;
+ GtkListBoxRow *row;
+ avail = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "audio_avail_lang"));
+ selected = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "audio_selected_lang"));
+ row = ghb_find_lang_row(avail, idx);
+ if (row)
+ {
+ GtkWidget *label = gtk_bin_get_child(GTK_BIN(row));
+ g_object_ref(G_OBJECT(label));
+ gtk_widget_destroy(GTK_WIDGET(row));
+ gtk_widget_show(label);
+ gtk_list_box_insert(selected, label, -1);
+ ii++;
+ }
+ else
+ {
+ // Error in list. Probably duplicate languages. Remove
+ // this item from the list.
+ GValue *glang = ghb_array_get_nth(lang_list, ii);
+ ghb_array_remove(lang_list, ii);
+ ghb_value_free(glang);
+ count--;
+ }
+ }
+}
+
+void ghb_audio_defaults_to_ui(signal_user_data_t *ud)
+{
+ GtkListBox *list_box;
 GValue *alist;
- GValue *track, *audio, *acodec, *acodec_actual, *bitrate, *rate, 
- *mix, *drc, *gain, *quality, *enable_quality;
- gint count, ii;
- 
- g_debug("set_audio");
- // Clear the audio list
- ghb_clear_audio_list_settings(ud->settings);
- ghb_clear_audio_list_ui(ud->builder);
- alist = ghb_settings_get_value(settings, "audio_list");
+ int count, ii;
+
+ audio_def_lang_list_init(ud);
 
+ // Init the AudioList settings if necessary
+ alist = ghb_settings_get_value(ud->settings, "AudioList");
+ if (alist == NULL)
+ {
+ alist = ghb_array_value_new(8);
+ ghb_settings_set_value(ud->settings, "AudioList", alist);
+ }
+
+ // Empty the current list
+ list_box = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "audio_list_default"));
+ ghb_container_empty(GTK_CONTAINER(list_box));
+
+ GtkWidget *widget;
+ // Populate with new values
 count = ghb_array_len(alist);
 for (ii = 0; ii < count; ii++)
 {
- audio = ghb_array_get_nth(alist, ii);
- track = ghb_settings_get_value(audio, "AudioTrack");
- acodec = ghb_settings_get_value(audio, "AudioEncoder");
- acodec_actual = ghb_settings_get_value(audio, "AudioEncoderActual");
- enable_quality = ghb_settings_get_value(audio, "AudioTrackQualityEnable");
- quality = ghb_settings_get_value(audio, "AudioTrackQuality");
- bitrate = ghb_settings_get_value(audio, "AudioBitrate");
- rate = ghb_settings_get_value(audio, "AudioSamplerate");
- mix = ghb_settings_get_value(audio, "AudioMixdown");
- gain = ghb_settings_get_value(audio, "AudioTrackGain");
- drc = ghb_settings_get_value(audio, "AudioTrackDRCSlider");
- acodec_code = ghb_lookup_combo_int("AudioEncoder", acodec);
-
- if (acodec_code != 0)
- {
- GValue *asettings = ghb_dict_value_new();
- ghb_settings_set_value(asettings, "AudioTrack", track);
- ghb_settings_set_value(asettings, "AudioEncoder", acodec);
- ghb_settings_set_value(asettings, "AudioEncoderActual", acodec_actual);
- ghb_settings_set_value(asettings, "AudioTrackQualityEnable", enable_quality);
- ghb_settings_set_value(asettings, "AudioTrackQuality", quality);
-
- // This gets set autimatically if the codec is passthru
- ghb_settings_set_value(asettings, "AudioBitrate", bitrate);
- ghb_settings_set_value(asettings, "AudioSamplerate", rate);
- ghb_settings_set_value(asettings, "AudioMixdown", mix);
- ghb_settings_set_value(asettings, "AudioTrackGain", gain);
- ghb_settings_set_value(asettings, "AudioTrackDRCSlider", drc);
-
- ghb_add_audio_to_settings(ud->settings, asettings);
-
- ghb_add_audio_to_ui(ud->builder, asettings);
- ghb_adjust_audio_rate_combos(ud);
- }
+ GValue *adict;
+
+ adict = ghb_array_get_nth(alist, ii);
+ widget = ghb_create_audio_settings_row(ud);
+ gtk_list_box_insert(list_box, widget, -1);
+ audio_def_update_widgets(widget, adict);
 }
- check_list_full(ud);
+ // Add row with "Add" button
+ widget = ghb_create_audio_settings_row(ud);
+ audio_def_settings_show(widget, FALSE);
+ gtk_list_box_insert(list_box, widget, -1);
 }
 
+void ghb_init_audio_defaults_ui(signal_user_data_t *ud)
+{
+ GtkListBox *list_box;
+
+ list_box = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "audio_avail_lang"));
+ ghb_init_lang_list_box(list_box);
+}

HandBrake-0.9.9.tar.bz2/gtk/src/audiohandler.h -> HandBrake-0.10.0.tar.bz2/gtk/src/audiohandler.h Changed

@@ -2,19 +2,19 @@
 /*
 * audiohandler.h
 * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
- * 
+ *
 * audiohandler.h is free software.
- * 
+ *
 * You may 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.
- * 
+ *
 * callbacks.h 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.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with callbacks.h. If not, write to:
 * The Free Software Foundation, Inc.,
@@ -28,16 +28,17 @@
 #include "settings.h"
 
 void ghb_adjust_audio_rate_combos(signal_user_data_t *ud);
-void ghb_set_pref_audio_settings(gint titleindex, GValue *settings);
-void ghb_set_pref_audio_from_settings(signal_user_data_t *ud, GValue *settings);
-void ghb_set_audio(signal_user_data_t *ud, GValue *settings);
-const gchar* ghb_get_user_audio_lang(GValue *settings, gint titleindex, gint track);
+void ghb_set_pref_audio_settings(GValue *settings);
+const gchar* ghb_get_user_audio_lang(GValue *settings, const hb_title_t *title, gint track);
 void ghb_audio_list_refresh_selected(signal_user_data_t *ud);
 gint ghb_select_audio_codec(gint mux, hb_audio_config_t *aconfig, gint acodec, gint fallback_acodec, gint copy_mask);
-int ghb_select_fallback( GValue *settings, int mux, int acodec );
+int ghb_select_fallback( GValue *settings, int acodec );
 int ghb_get_copy_mask(GValue *settings);
-void ghb_audio_list_refresh(signal_user_data_t *ud);
+void ghb_audio_list_refresh_all(signal_user_data_t *ud);
 char * ghb_format_quality( const char *prefix, int codec, double quality );
-void ghb_show_hide_advanced_audio( signal_user_data_t *ud );
+void ghb_init_audio_defaults_ui(signal_user_data_t *ud);
+void ghb_audio_defaults_to_ui(signal_user_data_t *ud);
+GtkListBoxRow* ghb_find_lang_row(GtkListBox *list_box, int lang_idx);
+void ghb_audio_title_change(signal_user_data_t *ud, gboolean title_valid);
 
 #endif // _AUDIOHANDLER_H_

HandBrake-0.9.9.tar.bz2/gtk/src/callbacks.c -> HandBrake-0.10.0.tar.bz2/gtk/src/callbacks.c Changed

@@ -2,9 +2,9 @@
 /*
 * callbacks.c
 * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
- * 
+ *
 * callbacks.c is free software.
- * 
+ *
 * You may 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)
@@ -21,6 +21,7 @@
 #include <time.h>
 
 #include <glib/gstdio.h>
+#include <glib/gi18n.h>
 #include <gio/gio.h>
 
 #include "ghbcompat.h"
@@ -55,7 +56,6 @@
 #define NOTIFY_CHECK_VERSION(x,y,z) 0
 #endif
 #else
-#define WINVER 0x0500
 #include <winsock2.h>
 #include <dbt.h>
 #endif
@@ -81,8 +81,7 @@
 #include "ghbcellrenderertext.h"
 #include "x264handler.h"
 
-static void reset_chapter_list(signal_user_data_t *ud, GValue *settings);
-static void update_chapter_list_from_settings(GtkBuilder *builder, GValue *settings);
+static void load_all_titles(signal_user_data_t *ud, int titleindex);
 static void update_chapter_list_settings(GValue *settings);
 static GList* dvd_device_list();
 static void prune_logs(signal_user_data_t *ud);
@@ -121,7 +120,7 @@
 gboolean result = TRUE;
 GValue *array, *data;
 gchar *widget_name;
- 
+
 g_debug("dep_check () %s", name);
 
 if (rev_map == NULL) return TRUE;
@@ -135,7 +134,10 @@
 widget = GHB_WIDGET(ud->builder, widget_name);
 dep_object = gtk_builder_get_object(ud->builder, name);
 if (widget != NULL && !gtk_widget_is_sensitive(widget))
+ {
+ g_free(widget_name);
 continue;
+ }
 if (dep_object == NULL)
 {
 g_message("Failed to find widget");
@@ -203,8 +205,8 @@
 
 void
 ghb_check_dependency(
- signal_user_data_t *ud, 
- GtkWidget *widget, 
+ signal_user_data_t *ud,
+ GtkWidget *widget,
 const char *alt_name)
 {
 GObject *dep_object;
@@ -244,27 +246,19 @@
 continue;
 }
 sensitive = dep_check(ud, dep_name, &hide);
- if (GTK_IS_ACTION(dep_object))
+ gtk_widget_set_sensitive(GTK_WIDGET(dep_object), sensitive);
+ if (!sensitive && hide)
 {
- gtk_action_set_sensitive(GTK_ACTION(dep_object), sensitive);
- gtk_action_set_visible(GTK_ACTION(dep_object), sensitive || !hide);
+ if (gtk_widget_get_visible(GTK_WIDGET(dep_object)))
+ {
+ gtk_widget_hide(GTK_WIDGET(dep_object));
+ }
 }
 else
 {
- gtk_widget_set_sensitive(GTK_WIDGET(dep_object), sensitive);
- if (!sensitive && hide)
+ if (!gtk_widget_get_visible(GTK_WIDGET(dep_object)))
 {
- if (gtk_widget_get_visible(GTK_WIDGET(dep_object)))
- {
- gtk_widget_hide(GTK_WIDGET(dep_object));
- }
- }
- else
- {
- if (!gtk_widget_get_visible(GTK_WIDGET(dep_object)))
- {
- gtk_widget_show_now(GTK_WIDGET(dep_object));
- }
+ gtk_widget_show_now(GTK_WIDGET(dep_object));
 }
 }
 g_free(dep_name);
@@ -297,22 +291,14 @@
 continue;
 }
 sensitive = dep_check(ud, dep_name, &hide);
- if (GTK_IS_ACTION(dep_object))
+ gtk_widget_set_sensitive(GTK_WIDGET(dep_object), sensitive);
+ if (!sensitive && hide)
 {
- gtk_action_set_sensitive(GTK_ACTION(dep_object), sensitive);
- gtk_action_set_visible(GTK_ACTION(dep_object), sensitive || !hide);
+ gtk_widget_hide(GTK_WIDGET(dep_object));
 }
 else
 {
- gtk_widget_set_sensitive(GTK_WIDGET(dep_object), sensitive);
- if (!sensitive && hide)
- {
- gtk_widget_hide(GTK_WIDGET(dep_object));
- }
- else
- {
- gtk_widget_show_now(GTK_WIDGET(dep_object));
- }
+ gtk_widget_show_now(GTK_WIDGET(dep_object));
 }
 }
 }
@@ -324,7 +310,7 @@
 g_debug("on_quit1_activate ()");
 if (state & (GHB_STATE_WORKING|GHB_STATE_SEARCHING))
 {
- if (ghb_cancel_encode2(ud, "Closing HandBrake will terminate encoding.\n"))
+ if (ghb_cancel_encode2(ud, _("Closing HandBrake will terminate encoding.\n")))
 {
 ghb_hb_cleanup(FALSE);
 prune_logs(ud);
@@ -368,7 +354,7 @@
 camel_convert(gchar *str)
 {
 gint state = CAMEL_OTHER;
- 
+
 if (str == NULL) return;
 while (*str)
 {
@@ -381,7 +367,7 @@
 state = CAMEL_FIRST_UPPER;
 else
 state = CAMEL_OTHER;
- 
+
 } break;
 case CAMEL_FIRST_UPPER:
 {
@@ -546,7 +532,7 @@
 if (name != NULL)
 g_free(name);
 }
- 
+
 free_drive(link->data);
 link = link->next;
 }
@@ -560,82 +546,148 @@
 }
 
 static const gchar*
-get_extension(GValue *settings)
+get_extension(signal_user_data_t *ud, GValue *settings)
 {
- int container;
- const gchar *extension = "error";
+ const char *mux_id;
+ const hb_container_t *mux;
+
+ mux_id = ghb_settings_get_const_string(settings, "FileFormat");
+ mux = ghb_lookup_container_by_name(mux_id);
 
- container = ghb_settings_combo_int(settings, "FileFormat");
- if (container == HB_MUX_MP4)
+ if ((mux->format & HB_MUX_MASK_MP4) &&
+ ghb_settings_get_boolean(ud->prefs, "UseM4v"))
 {
- extension = "mp4";
- if (ghb_settings_get_boolean(settings, "UseM4v"))
- {
- extension = "m4v";
- }
+ return "m4v";
 }
- else if (container == HB_MUX_MKV)
+ return mux->default_extension;
+}
+
+static gboolean
+check_name_template(signal_user_data_t *ud, const char *str)
+{
+ if (ghb_settings_get_boolean(ud->prefs, "auto_name"))
 {
- extension = "mkv";
+ const gchar *template;
+
+ template = ghb_settings_get_const_string(ud->prefs, "auto_name_template");
+ if (strstr(template, str) != NULL)
+ return TRUE;
 }
- return extension;
+ return FALSE;
 }
 
 static void
-set_destination_settings(GValue *settings)
+set_destination_settings(signal_user_data_t *ud, GValue *settings)
 {
+ const gchar *extension;
+ gchar *filename;
+
+ extension = get_extension(ud, settings);
+
 g_debug("set_destination_settings");
- if (ghb_settings_get_boolean(settings, "use_source_name"))
+ if (ghb_settings_get_boolean(ud->prefs, "auto_name"))
 {
 GString *str = g_string_new("");
- gchar *vol_name;
- const gchar *extension;
- gchar *new_name;
- gint title;
- 
- extension = get_extension(settings);
- vol_name = ghb_settings_get_string(settings, "volume_label");
- g_string_append_printf(str, "%s", vol_name);
- title = ghb_settings_get_int(settings, "title_no");
- if (title >= 0)
+ gchar *p;
+ gchar *template;
+
+ p = template = ghb_settings_get_string(ud->prefs, "auto_name_template");
+ while (*p)
 {
- if (ghb_settings_get_boolean(settings, "title_no_in_destination"))
+ if (!strncmp(p, "{source}", strlen("{source}")))
 {
-
- g_string_append_printf(str, " - %d", title+1);
+ gchar *vol_name;
+ vol_name = ghb_settings_get_string(settings, "volume_label");
+ g_string_append_printf(str, "%s", vol_name);
+ g_free(vol_name);
+ p += strlen("{source}");
 }
- if (ghb_settings_combo_int(settings, "PtoPType") == 0 && 
- ghb_settings_get_boolean(
- settings, "chapters_in_destination"))
+ else if (!strncmp(p, "{title}", strlen("{title}")))
 {
- gint start, end;
-
- if (!ghb_settings_get_boolean(
- settings, "title_no_in_destination"))
+ gint title = ghb_settings_get_int(settings, "title");
+ if (title >= 0)
+ g_string_append_printf(str, "%d", title);
+ p += strlen("{title}");
+ }
+ else if (!strncmp(p, "{chapters}", strlen("{chapters}")))
+ {
+ if (ghb_settings_combo_int(settings, "PtoPType") == 0)
 {
- g_string_append_printf(str, " -");
+ gint start, end;
+ start = ghb_settings_get_int(settings, "start_point");
+ end = ghb_settings_get_int(settings, "end_point");
+ if (start == end)
+ g_string_append_printf(str, "%d", start);
+ else
+ g_string_append_printf(str, "%d-%d", start, end);
 }
- start = ghb_settings_get_int(settings, "start_point");
- end = ghb_settings_get_int(settings, "end_point");
- if (start == end)
- g_string_append_printf(str, " Ch %d", start);
- else
- g_string_append_printf(str, " Ch %d-%d", start, end);
+ p += strlen("{chapters}");
+ }
+ else if (!strncmp(p, "{time}", strlen("{time}")))
+ {
+ char st[6];
+ struct tm *lt;
+ time_t t = time(NULL);
+ lt = localtime(&t);
+ st[0] = 0;
+ strftime(st, 6, "%R", lt);
+ g_string_append_printf(str, "%s", st);
+ p += strlen("{time}");
+ }
+ else if (!strncmp(p, "{date}", strlen("{date}")))
+ {
+ char dt[11];
+ struct tm *lt;
+ time_t t = time(NULL);
+ lt = localtime(&t);
+ dt[0] = 0;
+ strftime(dt, 11, "%F", lt);
+ g_string_append_printf(str, "%s", dt);
+ p += strlen("{date}");
+ }
+ else if (!strncmp(p, "{quality}", strlen("{quality}")))
+ {
+ if (ghb_settings_get_boolean(settings, "vquality_type_constant"))
+ {
+ gint vcodec;
+ const char *vqname;
+ double vquality;
+ vcodec = ghb_settings_video_encoder_codec(settings, "VideoEncoder");
+ vqname = hb_video_quality_get_name(vcodec);
+ vquality = ghb_settings_get_double(settings, "VideoQualitySlider");
+ g_string_append_printf(str, "%s%.3g", vqname, vquality);
+ }
+ p += strlen("{quality}");
+ }
+ else if (!strncmp(p, "{bitrate}", strlen("{bitrate}")))
+ {
+ if (ghb_settings_get_boolean(settings, "vquality_type_bitrate"))
+ {
+ int vbitrate;
+ vbitrate = ghb_settings_get_int(settings, "VideoAvgBitrate");
+ g_string_append_printf(str, "%dkbps", vbitrate);
+ }
+ p += strlen("{bitrate}");
+ }
+ else
+ {
+ g_string_append_printf(str, "%c", *p);
+ p++;
 }
 }
 g_string_append_printf(str, ".%s", extension);
- new_name = g_string_free(str, FALSE);
- ghb_settings_set_string(settings, "dest_file", new_name);
- g_free(vol_name);
- g_free(new_name);
+ filename = g_string_free(str, FALSE);
+ ghb_settings_set_string(settings, "dest_file", filename);
+ g_free(template);
+ g_free(filename);
 }
 }
 
 static void
 set_destination(signal_user_data_t *ud)
 {
- set_destination_settings(ud->settings);
- ghb_ui_update(ud, "dest_file", 
+ set_destination_settings(ud, ud->settings);
+ ghb_ui_update(ud, "dest_file",
 ghb_settings_get_value(ud->settings, "dest_file"));
 }
 
@@ -672,7 +724,7 @@
 if (dtype == DRIVE_CDROM)
 {
 gchar vname[51], fsname[51];
- GetVolumeInformation(drive, vname, 50, NULL, 
+ GetVolumeInformation(drive, vname, 50, NULL,
 NULL, NULL, fsname, 50);
 name = g_strdup(vname);
 return name;
@@ -685,14 +737,14 @@
 }
 
 static gboolean
-update_source_label(signal_user_data_t *ud, const gchar *source, gboolean update_dest)
+update_source_label(signal_user_data_t *ud, const gchar *source)
 {
 gchar *label = NULL;
 gint len;
 gchar **path;
 gchar *start;
 gchar *filename = g_strdup(source);
- 
+
 g_debug("update_source_label()");
 len = strlen(filename);
 if (g_file_test(filename, G_FILE_TEST_IS_DIR))
@@ -718,7 +770,7 @@
 start++;
 else
 start = filename;
- 
+
 path = g_strsplit(start, G_DIR_SEPARATOR_S, -1);
 len = g_strv_length (path);
 if ((len > 1) && (strcmp("VIDEO_TS", path[len-1]) == 0))
@@ -765,18 +817,16 @@
 }
 }
 g_free(filename);
- GtkWidget *widget = GHB_WIDGET (ud->builder, "source_title");
+ GtkWidget *widget = GHB_WIDGET (ud->builder, "volume_label");
 if (label != NULL)
 {
 gtk_label_set_text (GTK_LABEL(widget), label);
 ghb_settings_set_string(ud->settings, "volume_label", label);
 g_free(label);
- if (update_dest)
- set_destination(ud);
 }
 else
 {
- label = "No Title Found";
+ label = _("No Title Found");
 gtk_label_set_text (GTK_LABEL(widget), label);
 ghb_settings_set_string(ud->settings, "volume_label", label);
 return FALSE;
@@ -793,7 +843,7 @@
 const gchar *device;
 gboolean foundit = FALSE;
 GtkComboBox *combo;
- 
+
 g_debug("chooser_file_selected_cb ()");
 
 if (name == NULL) return;
@@ -853,14 +903,14 @@
 {
 GtkComboBoxText *combo;
 GList *drives, *link;
- 
+
 g_debug("source_dialog_extra_widgets ()");
 combo = GTK_COMBO_BOX_TEXT(GHB_WIDGET(ud->builder, "source_device"));
 gtk_list_store_clear(GTK_LIST_STORE(
 gtk_combo_box_get_model(GTK_COMBO_BOX(combo))));
 
 link = drives = dvd_device_list();
- gtk_combo_box_text_append_text (combo, "Not Selected");
+ gtk_combo_box_text_append_text (combo, _("Not Selected"));
 while (link != NULL)
 {
 gchar *name = get_dvd_device_name(link->data);
@@ -873,10 +923,294 @@
 gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
 }
 
-extern GValue *ghb_queue_edit_settings;
-static gchar *last_scan_file = NULL;
+static void break_duration(gint64 duration, gint *hh, gint *mm, gint *ss)
+{
+ *hh = duration / (60*60);
+ *mm = (duration / 60) % 60;
+ *ss = duration % 60;
+}
+
+static void
+update_title_duration(signal_user_data_t *ud)
+{
+ gint hh, mm, ss, start, end;
+ gchar *text;
+ GtkWidget *widget;
+ int title_id, titleindex;
+ const hb_title_t *title;
+
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ widget = GHB_WIDGET (ud->builder, "title_duration");
+
+ if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
+ {
+ start = ghb_settings_get_int(ud->settings, "start_point");
+ end = ghb_settings_get_int(ud->settings, "end_point");
+ ghb_part_duration(title, start, end, &hh, &mm, &ss);
+ }
+ else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
+ {
+ gint duration;
+
+ start = ghb_settings_get_int(ud->settings, "start_point");
+ end = ghb_settings_get_int(ud->settings, "end_point");
+ duration = end - start;
+ break_duration(duration, &hh, &mm, &ss);
+ }
+ else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
+ {
+ if (title != NULL)
+ {
+ gint64 frames;
+ gint duration;
+
+ start = ghb_settings_get_int(ud->settings, "start_point");
+ end = ghb_settings_get_int(ud->settings, "end_point");
+ frames = end - start + 1;
+ duration = frames * title->rate_base / title->rate;
+ break_duration(duration, &hh, &mm, &ss);
+ }
+ else
+ {
+ hh = mm = ss = 0;
+ }
+ }
+ text = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
+ gtk_label_set_text(GTK_LABEL(widget), text);
+ g_free(text);
+}
+
+void ghb_show_container_options(signal_user_data_t *ud)
+{
+ GtkWidget *w1, *w2, *w3;
+ w1 = GHB_WIDGET(ud->builder, "Mp4LargeFile");
+ w2 = GHB_WIDGET(ud->builder, "Mp4HttpOptimize");
+ w3 = GHB_WIDGET(ud->builder, "Mp4iPodCompatible");
+
+ const char *mux_id;
+ const hb_container_t *mux;
+
+ mux_id = ghb_settings_get_const_string(ud->settings, "FileFormat");
+ mux = ghb_lookup_container_by_name(mux_id);
+
+ gint enc = ghb_settings_video_encoder_codec(ud->settings, "VideoEncoder");
+
+ gtk_widget_set_visible(w1, (mux->format == HB_MUX_MP4V2));
+ gtk_widget_set_visible(w2, (mux->format & HB_MUX_MASK_MP4));
+ gtk_widget_set_visible(w3, (mux->format & HB_MUX_MASK_MP4) &&
+ (enc == HB_VCODEC_X264));
+}
+
+static void
+adjustment_configure(
+ GtkAdjustment *adj,
+ double val,
+ double min, double max,
+ double step, double page, double page_sz)
+{
+ gtk_adjustment_configure(adj, val, min, max, step, page, page_sz);
+}
+
+static void
+spin_configure(signal_user_data_t *ud, char *name, double val, double min, double max)
+{
+ GtkSpinButton *spin;
+ GtkAdjustment *adj;
+ double step, page, page_sz;
+
+ spin = GTK_SPIN_BUTTON(GHB_WIDGET(ud->builder, name));
+
+ adj = gtk_spin_button_get_adjustment(spin);
+ step = gtk_adjustment_get_step_increment(adj);
+ page = gtk_adjustment_get_page_increment(adj);
+ page_sz = gtk_adjustment_get_page_size(adj);
+
+ adjustment_configure(adj, val, min, max, step, page, page_sz);
+}
+
+void
+ghb_scale_configure(
+ signal_user_data_t *ud,
+ char *name,
+ double val, double min, double max,
+ double step, double page,
+ int digits, gboolean inverted)
+{
+ GtkScale *scale;
+ GtkAdjustment *adj;
+ double page_sz;
+
+ scale = GTK_SCALE(GHB_WIDGET(ud->builder, name));
 
-static void 
+ adj = gtk_range_get_adjustment(GTK_RANGE(scale));
+ page_sz = gtk_adjustment_get_page_size(adj);
+
+ adjustment_configure(adj, val, min, max, step, page, page_sz);
+
+ gtk_scale_set_digits(scale, digits);
+ gtk_range_set_inverted(GTK_RANGE(scale), inverted);
+}
+
+void
+ghb_set_widget_ranges(signal_user_data_t *ud, GValue *settings)
+{
+ int title_id, titleindex;
+ const hb_title_t * title;
+ double val;
+
+ title_id = ghb_settings_get_int(settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+
+ // Reconfigure the UI combo boxes
+ ghb_update_ui_combo_box(ud, "AudioTrack", title, FALSE);
+ ghb_update_ui_combo_box(ud, "SubtitleTrack", title, FALSE);
+
+ if (title != NULL)
+ {
+
+ // Set the limits of cropping. hb_set_anamorphic_size crashes if
+ // you pass it a cropped width or height == 0.
+ gint vbound, hbound;
+ vbound = title->height;
+ hbound = title->width;
+
+ val = ghb_settings_get_int(ud->settings, "PictureTopCrop");
+ spin_configure(ud, "PictureTopCrop", val, 0, vbound);
+ val = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
+ spin_configure(ud, "PictureBottomCrop", val, 0, vbound);
+ val = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
+ spin_configure(ud, "PictureLeftCrop", val, 0, hbound);
+ val = ghb_settings_get_int(ud->settings, "PictureRightCrop");
+ spin_configure(ud, "PictureRightCrop", val, 0, hbound);
+
+ gint duration = title->duration / 90000;
+
+ if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
+ {
+ gint num_chapters = hb_list_count(title->list_chapter);
+
+ val = ghb_settings_get_int(ud->settings, "start_point");
+ spin_configure(ud, "start_point", val, 1, num_chapters);
+ val = ghb_settings_get_int(ud->settings, "end_point");
+ spin_configure(ud, "end_point", val, 1, num_chapters);
+ }
+ else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
+ {
+ val = ghb_settings_get_int(ud->settings, "start_point");
+ spin_configure(ud, "start_point", val, 0, duration-1);
+ val = ghb_settings_get_int(ud->settings, "end_point");
+ spin_configure(ud, "end_point", val, 0, duration);
+ }
+ else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
+ {
+ gdouble max_frames;
+ max_frames = (gdouble)duration * title->rate / title->rate_base;
+
+ val = ghb_settings_get_int(ud->settings, "start_point");
+ spin_configure(ud, "start_point", val, 1, max_frames);
+ val = ghb_settings_get_int(ud->settings, "end_point");
+ spin_configure(ud, "end_point", val, 1, max_frames);
+ }
+
+ val = ghb_settings_get_int(ud->settings, "angle");
+ spin_configure(ud, "angle", val, 1, title->angle_count);
+ }
+
+ float vqmin, vqmax, step, page;
+ int inverted, digits;
+
+ ghb_vquality_range(ud, &vqmin, &vqmax, &step, &page, &digits, &inverted);
+ val = ghb_settings_get_double(ud->settings, "VideoQualitySlider");
+ ghb_scale_configure(ud, "VideoQualitySlider", val, vqmin, vqmax,
+ step, page, digits, inverted);
+}
+
+static void
+check_chapter_markers(signal_user_data_t *ud)
+{
+ GtkWidget *widget;
+ gint start, end;
+
+ if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
+ {
+ start = ghb_settings_get_int(ud->settings, "start_point");
+ end = ghb_settings_get_int(ud->settings, "end_point");
+ widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
+ gtk_widget_set_sensitive(widget, end > start);
+ }
+}
+
+#if 0
+void
+show_settings(GValue *settings)
+{
+ GHashTableIter iter;
+ gchar *key;
+ GValue *gval;
+
+ ghb_dict_iter_init(&iter, settings);
+ // middle (void*) cast prevents gcc warning "defreferencing type-punned
+ // pointer will break strict-aliasing rules"
+ while (g_hash_table_iter_next(
+ &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
+ {
+ char *str = ghb_value_string(gval);
+ printf("show key %s val %s\n", key, str);
+ g_free(str);
+ }
+}
+#endif
+
+void
+ghb_load_settings(signal_user_data_t * ud)
+{
+ GValue *preset;
+ gboolean preset_modified;
+ static gboolean busy = FALSE;
+
+ if (busy)
+ return;
+ busy = TRUE;
+
+ preset = ghb_settings_get_value(ud->settings, "preset");
+ preset_modified = ghb_settings_get_boolean(ud->settings, "preset_modified");
+ if (preset_modified)
+ {
+ ghb_clear_presets_selection(ud);
+ }
+ else
+ {
+ ghb_settings_set_boolean(ud->settings, "preset_reload", TRUE);
+ ghb_select_preset(ud->builder, preset);
+ ghb_settings_set_boolean(ud->settings, "preset_reload", FALSE);
+ }
+
+ ud->dont_clear_presets = TRUE;
+ ud->scale_busy = TRUE;
+
+ ghb_set_widget_ranges(ud, ud->settings);
+ ghb_check_all_depencencies(ud);
+ ghb_show_container_options(ud);
+ check_chapter_markers(ud);
+
+ ghb_settings_to_ui(ud, ud->settings);
+ ghb_audio_defaults_to_ui(ud);
+ ghb_subtitle_defaults_to_ui(ud);
+ ghb_audio_list_refresh_all(ud);
+ ghb_subtitle_list_refresh_all(ud);
+ ghb_chapter_list_refresh_all(ud);
+ update_title_duration(ud);
+ ghb_update_title_info(ud);
+
+ ud->dont_clear_presets = FALSE;
+ ud->scale_busy = FALSE;
+ busy = FALSE;
+
+ ghb_picture_settings_deps(ud);
+}
+
+static void
 show_scan_progress(signal_user_data_t *ud)
 {
 GtkProgressBar *progress;
@@ -886,19 +1220,18 @@
 gtk_progress_bar_set_fraction (progress, 0);
 gtk_widget_show(GTK_WIDGET(progress));
 
- label = GTK_LABEL(GHB_WIDGET(ud->builder, "source_title"));
- gtk_label_set_text( label, "Scanning ..." );
+ label = GTK_LABEL(GHB_WIDGET(ud->builder, "volume_label"));
+ gtk_label_set_text( label, _("Scanning ...") );
 }
 
 static void
 start_scan(
- signal_user_data_t *ud, 
- const gchar *path, 
- gint titlenum, 
+ signal_user_data_t *ud,
+ const gchar *path,
+ gint title_id,
 gint preview_count)
 {
 GtkWidget *widget;
- GtkAction *action;
 ghb_status_t status;
 
 ghb_get_status(&status);
@@ -907,48 +1240,61 @@
 
 widget = GHB_WIDGET(ud->builder, "sourcetoolbutton");
 gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-stop");
- gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Stop Scan");
- gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Stop Scan");
- //gtk_widget_set_sensitive(widget, FALSE);
-
- action = GHB_ACTION(ud->builder, "source_action");
- gtk_action_set_sensitive(action, FALSE);
- action = GHB_ACTION(ud->builder, "source_single_action");
- gtk_action_set_sensitive(action, FALSE);
- ghb_backend_scan(path, titlenum, preview_count, 
- 90000L * ghb_settings_get_int64(ud->settings, "MinTitleDuration"));
+ gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Stop Scan"));
+ gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), _("Stop Scan"));
+
+ widget = GHB_WIDGET(ud->builder, "source_open");
+ gtk_widget_set_sensitive(widget, FALSE);
+ widget = GHB_WIDGET(ud->builder, "source_title_open");
+ gtk_widget_set_sensitive(widget, FALSE);
+ ghb_backend_scan(path, title_id, preview_count,
+ 90000L * ghb_settings_get_int64(ud->prefs, "MinTitleDuration"));
 }
 
 gboolean
 ghb_idle_scan(signal_user_data_t *ud)
 {
 gchar *path;
- path = ghb_settings_get_string( ud->settings, "scan_source");
+ path = ghb_settings_get_string(ud->globals, "scan_source");
 ghb_do_scan(ud, path, 0, TRUE);
 g_free(path);
 return FALSE;
 }
 
+extern GValue *ghb_queue_edit_settings;
+static gchar *last_scan_file = NULL;
+
 void
 ghb_do_scan(
- signal_user_data_t *ud, 
- const gchar *filename, 
- gint titlenum, 
+ signal_user_data_t *ud,
+ const gchar *filename,
+ gint title_id,
 gboolean force)
 {
+ int titleindex;
+ const hb_title_t *title;
+
+ (void)title; // Silence "unused variable" warning
+
 g_debug("ghb_do_scan()");
 if (!force && last_scan_file != NULL &&
 strcmp(last_scan_file, filename) == 0)
 {
- if (ghb_queue_edit_settings)
+ if (ghb_queue_edit_settings != NULL)
 {
- ghb_settings_to_ui(ud, ghb_queue_edit_settings);
- ghb_set_audio(ud, ghb_queue_edit_settings);
- ghb_reset_subtitles(ud, ghb_queue_edit_settings);
- reset_chapter_list(ud, ghb_queue_edit_settings);
- ghb_value_free(ghb_queue_edit_settings);
+ title_id = ghb_settings_get_int(ghb_queue_edit_settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ ghb_array_replace(ud->settings_array, titleindex,
+ ghb_queue_edit_settings);
+ ud->settings = ghb_queue_edit_settings;
+ ghb_load_settings(ud);
 ghb_queue_edit_settings = NULL;
 }
+ else
+ {
+ title = ghb_lookup_title(title_id, &titleindex);
+ load_all_titles(ud, titleindex);
+ }
 return;
 }
 if (last_scan_file != NULL)
@@ -957,18 +1303,18 @@
 if (filename != NULL)
 {
 last_scan_file = g_strdup(filename);
- ghb_settings_set_string(ud->settings, "scan_source", filename);
- if (update_source_label(ud, filename, TRUE))
+ ghb_settings_set_string(ud->globals, "scan_source", filename);
+ if (update_source_label(ud, filename))
 {
 gchar *path;
 gint preview_count;
 
 show_scan_progress(ud);
- path = ghb_settings_get_string( ud->settings, "scan_source");
+ path = ghb_settings_get_string(ud->globals, "scan_source");
 prune_logs(ud);
 
- preview_count = ghb_settings_get_int(ud->settings, "preview_count");
- start_scan(ud, path, titlenum, preview_count);
+ preview_count = ghb_settings_get_int(ud->prefs, "preview_count");
+ start_scan(ud, path, title_id, preview_count);
 g_free(path);
 }
 else
@@ -986,7 +1332,7 @@
 gint response;
 
 g_debug("source_browse_clicked_cb ()");
- sourcename = ghb_settings_get_string(ud->settings, "scan_source");
+ sourcename = ghb_settings_get_string(ud->globals, "scan_source");
 GtkWidget *widget;
 widget = GHB_WIDGET(ud->builder, "single_title_box");
 if (single)
@@ -996,7 +1342,6 @@
 dialog = GHB_WIDGET(ud->builder, "source_dialog");
 source_dialog_extra_widgets(ud, dialog);
 
-#if GTK_CHECK_VERSION(3, 0, 0)
 // gtk3 has a STUPID BUG! If you select the "same_path" it ends
 // up selecting the "Recent Files" shortcut instead of taking you
 // to the directory and file THAT YOU ASKED FOR!!! FUUUUK!!!
@@ -1005,12 +1350,12 @@
 // optimal because if you are processing several files in the same
 // folder, you want the selection to return to where you were last
 // in the list, but there's not much else I can do at this point.
+ //gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), sourcename);
+
 gchar *dirname = g_path_get_dirname(sourcename);
 gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), dirname);
 g_free(dirname);
-#else
- gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), sourcename);
-#endif
+
 response = gtk_dialog_run(GTK_DIALOG (dialog));
 gtk_widget_hide(dialog);
 if (response == GTK_RESPONSE_NO)
@@ -1020,19 +1365,18 @@
 filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
 if (filename != NULL)
 {
- gint titlenum;
+ gint title_id;
 
 if (single)
- titlenum = ghb_settings_get_int(ud->settings, "single_title");
+ title_id = ghb_settings_get_int(ud->settings, "single_title");
 else
- titlenum = 0;
- ghb_do_scan(ud, filename, titlenum, TRUE);
+ title_id = 0;
+ ghb_do_scan(ud, filename, title_id, TRUE);
 if (strcmp(sourcename, filename) != 0)
 {
- ghb_settings_set_string (ud->settings, 
- "default_source", filename);
- ghb_pref_save (ud->settings, "default_source");
- ghb_dvd_set_current (filename, ud);
+ ghb_settings_set_string(ud->prefs, "default_source", filename);
+ ghb_pref_save(ud->prefs, "default_source");
+ ghb_dvd_set_current(filename, ud);
 }
 g_free(filename);
 }
@@ -1062,19 +1406,19 @@
 }
 
 G_MODULE_EXPORT void
-dvd_source_activate_cb(GtkAction *action, signal_user_data_t *ud)
+dvd_source_activate_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 const gchar *filename;
 gchar *sourcename;
 
- sourcename = ghb_settings_get_string(ud->settings, "scan_source");
- filename = gtk_buildable_get_name(GTK_BUILDABLE(action));
+ sourcename = ghb_settings_get_string(ud->globals, "scan_source");
+ filename = gtk_buildable_get_name(GTK_BUILDABLE(widget));
 ghb_do_scan(ud, filename, 0, TRUE);
 if (strcmp(sourcename, filename) != 0)
 {
- ghb_settings_set_string (ud->settings, "default_source", filename);
- ghb_pref_save (ud->settings, "default_source");
- ghb_dvd_set_current (filename, ud);
+ ghb_settings_set_string(ud->prefs, "default_source", filename);
+ ghb_pref_save(ud->prefs, "default_source");
+ ghb_dvd_set_current(filename, ud);
 }
 g_free(sourcename);
 }
@@ -1082,7 +1426,7 @@
 void
 ghb_update_destination_extension(signal_user_data_t *ud)
 {
- static gchar *containers[] = {".mkv", ".mp4", ".m4v", NULL};
+ static gchar *containers[] = {".mkv", ".mp4", ".m4v", ".error", NULL};
 gchar *filename;
 const gchar *extension;
 gint ii;
@@ -1096,7 +1440,7 @@
 if (busy)
 return;
 busy = TRUE;
- extension = get_extension(ud->settings);
+ extension = get_extension(ud, ud->settings);
 entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "dest_file"));
 filename = g_strdup(gtk_entry_get_text(entry));
 for (ii = 0; containers[ii] != NULL; ii++)
@@ -1105,7 +1449,7 @@
 {
 gchar *pos;
 gchar *new_name;
- 
+
 pos = g_strrstr( filename, "." );
 if (pos == NULL)
 {
@@ -1118,7 +1462,7 @@
 // Extension is already correct
 break;
 }
- new_name = g_strjoin(".", filename, extension, NULL); 
+ new_name = g_strjoin(".", filename, extension, NULL);
 ghb_ui_update(ud, "dest_file", ghb_string_value(new_name));
 g_free(new_name);
 break;
@@ -1159,7 +1503,7 @@
 
 G_MODULE_EXPORT gboolean
 destination_grab_cb(
- GtkEntry *entry, 
+ GtkEntry *entry,
 signal_user_data_t *ud)
 {
 destination_select_title(entry);
@@ -1172,7 +1516,7 @@
 dest_dir_set_cb(GtkFileChooserButton *dest_chooser, signal_user_data_t *ud)
 {
 gchar *dest_file, *dest_dir, *dest;
- 
+
 g_debug("dest_dir_set_cb ()");
 ghb_widget_to_setting(ud->settings, (GtkWidget*)dest_chooser);
 dest_file = ghb_settings_get_string(ud->settings, "dest_file");
@@ -1189,7 +1533,7 @@
 dest_file_changed_cb(GtkEntry *entry, signal_user_data_t *ud)
 {
 gchar *dest_file, *dest_dir, *dest;
- 
+
 g_debug("dest_file_changed_cb ()");
 ghb_update_destination_extension(ud);
 ghb_widget_to_setting(ud->settings, (GtkWidget*)entry);
@@ -1218,8 +1562,8 @@
 dialog = gtk_file_chooser_dialog_new ("Choose Destination",
 NULL,
 GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ GHB_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GHB_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
 NULL);
 gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), destname);
 basename = g_path_get_basename(destname);
@@ -1230,7 +1574,7 @@
 {
 char *filename, *dirname;
 GtkFileChooser *dest_chooser;
- 
+
 filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
 basename = g_path_get_basename(filename);
 dirname = g_path_get_dirname(filename);
@@ -1262,7 +1606,7 @@
 g_debug("window_delete_event_cb ()");
 if (state & (GHB_STATE_WORKING|GHB_STATE_SEARCHING))
 {
- if (ghb_cancel_encode2(ud, "Closing HandBrake will terminate encoding.\n"))
+ if (ghb_cancel_encode2(ud, _("Closing HandBrake will terminate encoding.\n")))
 {
 ghb_hb_cleanup(FALSE);
 prune_logs(ud);
@@ -1278,7 +1622,7 @@
 }
 
 static void
-update_acodec_combo(signal_user_data_t *ud)
+update_acodec(signal_user_data_t *ud)
 {
 ghb_adjust_audio_rate_combos(ud);
 ghb_grey_combo_options (ud);
@@ -1290,12 +1634,13 @@
 g_debug("container_changed_cb ()");
 ghb_widget_to_setting(ud->settings, widget);
 ghb_check_dependency(ud, widget, NULL);
- update_acodec_combo(ud);
+ ghb_show_container_options(ud);
+ update_acodec(ud);
 ghb_update_destination_extension(ud);
 ghb_clear_presets_selection(ud);
 ghb_live_reset(ud);
 ghb_subtitle_prune(ud);
- ghb_subtitle_list_refresh_selected(ud);
+ ghb_subtitle_list_refresh_all(ud);
 ghb_audio_list_refresh_selected(ud);
 }
 
@@ -1327,96 +1672,112 @@
 }
 
 static void
-update_title_duration(signal_user_data_t *ud)
+update_aspect_info(signal_user_data_t *ud)
 {
- gint ti;
- gint hh, mm, ss, start, end;
- gchar *text;
 GtkWidget *widget;
+ gchar *text;
 
- ti = ghb_settings_combo_int(ud->settings, "title");
- widget = GHB_WIDGET (ud->builder, "title_duration");
-
- if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
+ text = ghb_settings_get_boolean(ud->settings, "PictureAutoCrop") ? _("On") : _("Off");
+ widget = GHB_WIDGET(ud->builder, "crop_auto");
+ gtk_label_set_text(GTK_LABEL(widget), text);
+ text = ghb_settings_get_boolean(ud->settings, "autoscale") ? _("On") : _("Off");
+ widget = GHB_WIDGET(ud->builder, "scale_auto");
+ gtk_label_set_text(GTK_LABEL(widget), text);
+ switch (ghb_settings_combo_int(ud->settings, "PicturePAR"))
 {
- start = ghb_settings_get_int(ud->settings, "start_point");
- end = ghb_settings_get_int(ud->settings, "end_point");
- ghb_part_duration(ti, start, end, &hh, &mm, &ss);
+ case 0:
+ text = _("Off");
+ break;
+ case 1:
+ text = _("Strict");
+ break;
+ case 2:
+ text = _("Loose");
+ break;
+ case 3:
+ text = _("Custom");
+ break;
+ default:
+ text = _("Unknown");
+ break;
 }
- else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
- {
- gint duration;
+ widget = GHB_WIDGET(ud->builder, "scale_anamorphic");
+ gtk_label_set_text(GTK_LABEL(widget), text);
+}
 
- start = ghb_settings_get_int(ud->settings, "start_point");
- end = ghb_settings_get_int(ud->settings, "end_point");
- duration = end - start;
- hh = duration / (60*60);
- mm = (duration / 60) % 60;
- ss = duration % 60;
- }
- else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
- {
- hb_title_t * title = ghb_get_title_info (ti);
- if (title != NULL)
- {
- gint64 frames;
- gint duration;
+static void
+update_crop_info(signal_user_data_t *ud)
+{
+ GtkWidget *widget;
+ gchar *text;
+ gint width, height, crop[4] = {0,};
+ gint title_id, titleindex;
+ const hb_title_t *title;
 
- start = ghb_settings_get_int(ud->settings, "start_point");
- end = ghb_settings_get_int(ud->settings, "end_point");
- frames = end - start + 1;
- duration = frames * title->rate_base / title->rate;
- hh = duration / (60*60);
- mm = (duration / 60) % 60;
- ss = duration % 60;
- }
- else
- {
- hh = mm = ss = 0;
- }
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ if (title != NULL)
+ {
+ crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
+ crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
+ crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
+ crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
+ width = title->width - crop[2] - crop[3];
+ height = title->height - crop[0] - crop[1];
+ widget = GHB_WIDGET(ud->builder, "crop_dimensions");
+ text = g_strdup_printf ("%d x %d", width, height);
+ gtk_label_set_text(GTK_LABEL(widget), text);
+ widget = GHB_WIDGET(ud->builder, "crop_dimensions2");
+ gtk_label_set_text(GTK_LABEL(widget), text);
+ g_free(text);
 }
- text = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
+ widget = GHB_WIDGET (ud->builder, "crop_values");
+ text = g_strdup_printf ("%d:%d:%d:%d", crop[0], crop[1], crop[2], crop[3]);
 gtk_label_set_text (GTK_LABEL(widget), text);
 g_free(text);
 }
 
 static void
-show_title_info(signal_user_data_t *ud, hb_title_t *title)
+update_scale_info(signal_user_data_t *ud)
 {
 GtkWidget *widget;
 gchar *text;
 
- ghb_settings_set_string(ud->settings, "source", title->path);
- if (title->type == HB_STREAM_TYPE || title->type == HB_FF_STREAM_TYPE)
- {
- GtkWidget *widget = GHB_WIDGET (ud->builder, "source_title");
- if (title->name != NULL && title->name[0] != 0)
- {
- gtk_label_set_text (GTK_LABEL(widget), title->name);
- ghb_settings_set_string(ud->settings, "volume_label", title->name);
- set_destination(ud);
- }
- else
- {
- gchar *label = "No Title Found";
- gtk_label_set_text (GTK_LABEL(widget), label);
- ghb_settings_set_string(ud->settings, "volume_label", label);
- }
- }
- ud->dont_clear_presets = TRUE;
- ud->scale_busy = TRUE;
+ gint width = ghb_settings_get_int(ud->settings, "scale_width");
+ gint height = ghb_settings_get_int(ud->settings, "scale_height");
+ widget = GHB_WIDGET(ud->builder, "scale_dimensions");
+ text = g_strdup_printf("%d x %d", width, height);
+ gtk_label_set_text(GTK_LABEL(widget), text);
+ g_free(text);
+}
+
+void
+ghb_update_title_info(signal_user_data_t *ud)
+{
+ GtkWidget *widget;
+ gchar *text;
+
+ int title_id, titleindex;
+ const hb_title_t * title;
+
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ if (title == NULL)
+ return;
+
 update_title_duration(ud);
- widget = GHB_WIDGET (ud->builder, "source_codec");
+
+ widget = GHB_WIDGET (ud->builder, "source_video_codec");
 if ( title->video_codec_name )
 gtk_label_set_text (GTK_LABEL(widget), title->video_codec_name);
 else
- gtk_label_set_text (GTK_LABEL(widget), "Unknown");
+ gtk_label_set_text (GTK_LABEL(widget), _("Unknown"));
+
 widget = GHB_WIDGET (ud->builder, "source_dimensions");
 text = g_strdup_printf ("%d x %d", title->width, title->height);
 gtk_label_set_text (GTK_LABEL(widget), text);
- ghb_settings_set_int(ud->settings, "source_width", title->width);
- ghb_settings_set_int(ud->settings, "source_height", title->height);
 g_free(text);
+
 widget = GHB_WIDGET (ud->builder, "source_aspect");
 gint aspect_n, aspect_d;
 hb_reduce(&aspect_n, &aspect_d,
@@ -1434,137 +1795,28 @@
 //widget = GHB_WIDGET (ud->builder, "source_interlaced");
 //gtk_label_set_text (GTK_LABEL(widget), title->interlaced ? "Yes" : "No");
 
- ghb_ui_update(ud, "scale_width", 
- ghb_int64_value(title->width - title->crop[2] - title->crop[3]));
- // If anamorphic or keep_aspect, the hight will be automatically calculated
- gboolean keep_aspect;
- gint pic_par;
- keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio");
- pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR");
- if (!(keep_aspect || pic_par) || pic_par == 3)
- {
- ghb_ui_update(ud, "scale_height", 
- ghb_int64_value(title->height - title->crop[0] - title->crop[1]));
- }
-
- // Set the limits of cropping. hb_set_anamorphic_size crashes if
- // you pass it a cropped width or height == 0.
- gint bound;
- bound = title->height / 2 - 8;
- widget = GHB_WIDGET (ud->builder, "PictureTopCrop");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
- widget = GHB_WIDGET (ud->builder, "PictureBottomCrop");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
- bound = title->width / 2 - 8;
- widget = GHB_WIDGET (ud->builder, "PictureLeftCrop");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
- widget = GHB_WIDGET (ud->builder, "PictureRightCrop");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
- if (ghb_settings_get_boolean(ud->settings, "PictureAutoCrop"))
- {
- ghb_ui_update(ud, "PictureTopCrop", ghb_int64_value(title->crop[0]));
- ghb_ui_update(ud, "PictureBottomCrop", ghb_int64_value(title->crop[1]));
- ghb_ui_update(ud, "PictureLeftCrop", ghb_int64_value(title->crop[2]));
- ghb_ui_update(ud, "PictureRightCrop", ghb_int64_value(title->crop[3]));
- }
- ud->scale_busy = FALSE;
- ghb_set_scale (ud, GHB_PIC_KEEP_PAR|GHB_PIC_USE_MAX);
- gint width, height, crop[4];
- crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
- crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
- crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
- crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
- width = title->width - crop[2] - crop[3];
- height = title->height - crop[0] - crop[1];
- widget = GHB_WIDGET (ud->builder, "crop_dimensions");
- text = g_strdup_printf ("%d x %d", width, height);
- gtk_label_set_text (GTK_LABEL(widget), text);
- g_free(text);
+ ghb_update_display_aspect_label(ud);
 
-
- gint duration = title->duration / 90000;
-
- gint num_chapters = hb_list_count(title->list_chapter);
- if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
- {
- widget = GHB_WIDGET (ud->builder, "start_point");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, num_chapters);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
-
- widget = GHB_WIDGET (ud->builder, "end_point");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, num_chapters);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), num_chapters);
- }
- else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
- {
-
- widget = GHB_WIDGET (ud->builder, "start_point");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, duration-1);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 0);
-
- widget = GHB_WIDGET (ud->builder, "end_point");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, duration);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), duration);
- }
- else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
- {
- gdouble max_frames = (gdouble)duration * title->rate / title->rate_base;
- widget = GHB_WIDGET (ud->builder, "start_point");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, max_frames);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
-
- widget = GHB_WIDGET (ud->builder, "end_point");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, max_frames);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), max_frames);
- }
-
- widget = GHB_WIDGET (ud->builder, "angle");
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, title->angle_count);
- ghb_settings_set_int(ud->settings, "angle_count", title->angle_count);
- ud->dont_clear_presets = FALSE;
- // Set default metadata name
- ghb_ui_update(ud, "MetaName", ghb_string_value(title->name));
- if (title->metadata)
- {
- if (title->metadata->name)
- {
- ghb_ui_update(ud, "MetaName",
- ghb_string_value(title->metadata->name));
- }
- ghb_ui_update(ud, "MetaArtist",
- ghb_string_value(title->metadata->artist));
- ghb_ui_update(ud, "MetaReleaseDate",
- ghb_string_value(title->metadata->release_date));
- ghb_ui_update(ud, "MetaComment",
- ghb_string_value(title->metadata->comment));
- if (!title->metadata->name && title->metadata->album)
- {
- ghb_ui_update(ud, "MetaName",
- ghb_string_value(title->metadata->album));
- }
- ghb_ui_update(ud, "MetaAlbumArtist",
- ghb_string_value(title->metadata->album_artist));
- ghb_ui_update(ud, "MetaGenre",
- ghb_string_value(title->metadata->genre));
- ghb_ui_update(ud, "MetaDescription",
- ghb_string_value(title->metadata->description));
- ghb_ui_update(ud, "MetaLongDescription",
- ghb_string_value(title->metadata->long_description));
- }
+ update_crop_info(ud);
+ update_aspect_info(ud);
+ update_scale_info(ud);
 }
 
 void
-set_title_settings(GValue *settings, gint titleindex)
+set_title_settings(signal_user_data_t *ud, GValue *settings)
 {
- ghb_settings_set_int(settings, "title", titleindex);
- ghb_settings_set_int(settings, "title_no", titleindex);
+ int title_id, titleindex;
+ const hb_title_t * title;
 
- hb_title_t * title = ghb_get_title_info(titleindex);
+ title_id = ghb_settings_get_int(settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+
+ ghb_subtitle_set_pref_lang(settings);
 if (title != NULL)
 {
 gint num_chapters = hb_list_count(title->list_chapter);
 
+ ghb_settings_set_int(settings, "angle", 1);
 ghb_settings_set_int(settings, "PtoPType", 0);
 ghb_settings_set_int(settings, "start_point", 1);
 ghb_settings_set_int(settings, "end_point", num_chapters);
@@ -1579,14 +1831,19 @@
 }
 else
 {
- gchar *label = "No Title Found";
+ gchar *label = _("No Title Found");
 ghb_settings_set_string(settings, "volume_label", label);
 }
 }
+ else
+ {
+ ghb_settings_set_value(settings, "volume_label",
+ ghb_settings_get_value(ud->settings, "volume_label"));
+ }
 ghb_settings_set_int(settings, "scale_width",
 title->width - title->crop[2] - title->crop[3]);
 
- // If anamorphic or keep_aspect, the hight will 
+ // If anamorphic or keep_aspect, the hight will
 // be automatically calculated
 gboolean keep_aspect;
 gint pic_par;
@@ -1600,11 +1857,43 @@
 
 ghb_set_scale_settings(settings, GHB_PIC_KEEP_PAR|GHB_PIC_USE_MAX);
 ghb_settings_set_int(settings, "angle_count", title->angle_count);
- }
- update_chapter_list_settings(settings);
- ghb_set_pref_audio_settings(titleindex, settings);
- ghb_set_pref_subtitle_settings(titleindex, settings);
- set_destination_settings(settings);
+
+ ghb_settings_set_string(settings, "MetaName", title->name);
+ if (title->metadata)
+ {
+ if (title->metadata->name)
+ {
+ ghb_settings_set_string(settings, "MetaName",
+ title->metadata->name);
+ }
+ ghb_settings_set_string(settings, "MetaArtist",
+ title->metadata->artist);
+ ghb_settings_set_string(settings, "MetaReleaseDate",
+ title->metadata->release_date);
+ ghb_settings_set_string(settings, "MetaComment",
+ title->metadata->comment);
+ if (!title->metadata->name && title->metadata->album)
+ {
+ ghb_settings_set_string(settings, "MetaName",
+ title->metadata->album);
+ }
+ ghb_settings_set_string(settings, "MetaAlbumArtist",
+ title->metadata->album_artist);
+ ghb_settings_set_string(settings, "MetaGenre",
+ title->metadata->genre);
+ ghb_settings_set_string(settings, "MetaDescription",
+ title->metadata->description);
+ ghb_settings_set_string(settings, "MetaLongDescription",
+ title->metadata->long_description);
+ }
+ update_chapter_list_settings(settings);
+ ghb_set_pref_audio_settings(settings);
+ ghb_set_pref_subtitle_settings(ud, title, settings);
+ }
+
+ set_destination_settings(ud, settings);
+ ghb_settings_set_value(settings, "dest_dir",
+ ghb_settings_get_value(ud->prefs, "destination_dir"));
 
 char *dest_file, *dest_dir, *dest;
 dest_file = ghb_settings_get_string(settings, "dest_file");
@@ -1614,31 +1903,64 @@
 g_free(dest_file);
 g_free(dest_dir);
 g_free(dest);
+
+ ghb_settings_set_int(settings, "preview_frame", 2);
 }
 
 void
-ghb_add_all_titles(signal_user_data_t *ud)
+ghb_set_current_title_settings(signal_user_data_t *ud)
 {
- gint ii;
- gint count = ghb_get_title_count();
+ set_title_settings(ud, ud->settings);
+}
 
- for (ii = 0; ii < count; ii++)
+static void
+load_all_titles(signal_user_data_t *ud, int titleindex)
+{
+ gint ii, count;
+ GValue *preset, *preset_path = NULL;
+ GValue *settings_array;
+ const hb_title_t *title;
+
+ hb_list_t *list = ghb_get_title_list();
+ count = hb_list_count(list);
+
+ if (count == 0)
+ count = 1;
+
+ settings_array = ghb_array_value_new(count);
+
+ preset = ghb_get_current_preset(ud);
+ if (preset != NULL)
 {
- GValue *settings = ghb_value_dup(ud->settings);
- ghb_settings_set_boolean(settings, "use_source_name", TRUE);
- hb_title_t * title = ghb_get_title_info(ii);
- if (title != NULL)
- {
- if (title->type == HB_DVD_TYPE ||
- title->type == HB_BD_TYPE)
- {
- ghb_settings_set_boolean(settings, 
- "title_no_in_destination", TRUE);
- }
- }
- set_title_settings(settings, ii);
- ghb_queue_add(ud, settings, ii);
+ preset_path = ghb_get_current_preset_path(ud);
 }
+ else
+ {
+ preset = ud->settings;
+ }
+ for (ii = 0; ii < count; ii++)
+ {
+ int index;
+ GValue *settings = ghb_settings_new();
+
+ title = hb_list_item(list, ii);
+ index = (title != NULL) ? title->index : -1;
+
+ ghb_settings_init(settings, "Initialization");
+ ghb_preset_to_settings(settings, preset);
+ ghb_settings_set_value(settings, "preset", preset_path);
+ ghb_settings_set_int(settings, "title", index);
+ set_title_settings(ud, settings);
+ ghb_array_append(settings_array, settings);
+ }
+ ghb_value_free(preset_path);
+ if (titleindex < 0 || titleindex >= count)
+ {
+ titleindex = 0;
+ }
+ ghb_value_free(ud->settings_array);
+ ud->settings_array = settings_array;
+ ud->settings = ghb_array_get_nth(ud->settings_array, titleindex);
 }
 
 static gboolean update_preview = FALSE;
@@ -1646,107 +1968,84 @@
 G_MODULE_EXPORT void
 title_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
- gint titleindex;
+ gint title_id, titleindex, count;
+ const hb_title_t * title;
 
 g_debug("title_changed_cb ()");
- ghb_widget_to_setting(ud->settings, widget);
+ title_id = ghb_widget_int(widget);
+ title = ghb_lookup_title(title_id, &titleindex);
 
- titleindex = ghb_settings_combo_int(ud->settings, "title");
- ghb_settings_set_int(ud->settings, "title_no", titleindex);
- ghb_update_ui_combo_box (ud, "AudioTrack", titleindex, FALSE);
- ghb_update_ui_combo_box (ud, "SubtitleTrack", titleindex, FALSE);
+ count = ghb_array_len(ud->settings_array);
+ int idx = (titleindex >= 0 && titleindex < count) ? titleindex : 0;
+ ud->settings = ghb_array_get_nth(ud->settings_array, idx);
+ ghb_load_settings(ud);
+
+ ghb_audio_title_change(ud, title != NULL);
+ ghb_subtitle_title_change(ud, title != NULL);
+ ghb_grey_combo_options(ud);
 
- hb_title_t * title = ghb_get_title_info(titleindex);
 if (title != NULL)
 {
- show_title_info(ud, title);
+ ghb_set_preview_image(ud);
+ ghb_preview_set_visible(ud);
 }
- ghb_check_dependency(ud, widget, NULL);
- update_chapter_list_settings(ud->settings);
- update_chapter_list_from_settings(ud->builder, ud->settings);
- ghb_set_pref_audio_settings(titleindex, ud->settings);
- ghb_set_pref_audio_from_settings(ud, ud->settings);
- ghb_set_pref_subtitle(titleindex, ud);
- ghb_grey_combo_options (ud);
-
- // Unfortunately, there is no way to query how many frames were
- // actually generated during the scan.
- // If I knew how many were generated, I would adjust the spin
- // control range here.
- // I do know how many were asked for.
- gint preview_count;
- preview_count = ghb_settings_get_int(ud->settings, "preview_count");
- widget = GHB_WIDGET(ud->builder, "preview_frame");
- gtk_range_set_range (GTK_RANGE(widget), 1, preview_count);
- ghb_ui_update(ud, "preview_frame", ghb_int64_value(2));
+}
 
- ghb_set_preview_image (ud);
- if (ghb_settings_get_boolean(ud->settings, "title_no_in_destination"))
- {
- set_destination(ud);
- }
- ghb_preview_set_visible(ud);
+G_MODULE_EXPORT void
+title_reset_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ int title_id, titleindex;
+ const hb_title_t *title;
 
- gint end;
- widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
- end = ghb_settings_get_int(ud->settings, "end_point");
- if (1 == end)
- {
- gtk_widget_set_sensitive(widget, FALSE);
- }
- else
- {
- gtk_widget_set_sensitive(widget, TRUE);
- }
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ (void)title; // Silence "unused variable" warning
+ load_all_titles(ud, titleindex);
+ ghb_load_settings(ud);
 }
 
 G_MODULE_EXPORT void
 ptop_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
- gint ti;
- hb_title_t * title;
+ gint title_id, titleindex;
+ const hb_title_t * title;
+ gboolean numeric = TRUE;
+ GtkSpinButton *spin;
 
 ghb_widget_to_setting(ud->settings, widget);
 ghb_check_dependency(ud, widget, NULL);
 ghb_live_reset(ud);
 
- ti = ghb_settings_combo_int(ud->settings, "title");
- title = ghb_get_title_info(ti);
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
 if (title == NULL)
 return;
 
- gint num_chapters = hb_list_count(title->list_chapter);
+ if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
+ numeric = FALSE;
+
+ spin = GTK_SPIN_BUTTON(GHB_WIDGET(ud->builder, "start_point"));
+ gtk_spin_button_set_numeric(spin, numeric);
+ spin = GTK_SPIN_BUTTON(GHB_WIDGET(ud->builder, "end_point"));
+ gtk_spin_button_set_numeric(spin, numeric);
+
 gint duration = title->duration / 90000;
 if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
 {
- widget = GHB_WIDGET (ud->builder, "start_point");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, num_chapters);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
-
- widget = GHB_WIDGET (ud->builder, "end_point");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, num_chapters);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), num_chapters);
+ gint num_chapters = hb_list_count(title->list_chapter);
+ spin_configure(ud, "start_point", 1, 1, num_chapters);
+ spin_configure(ud, "end_point", num_chapters, 1, num_chapters);
 }
 else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
 {
- widget = GHB_WIDGET (ud->builder, "start_point");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, duration-1);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 0);
-
- widget = GHB_WIDGET (ud->builder, "end_point");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, duration);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), duration);
+ spin_configure(ud, "start_point", 0, 0, duration-1);
+ spin_configure(ud, "end_point", duration, 0, duration);
 }
 else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
 {
 gdouble max_frames = (gdouble)duration * title->rate / title->rate_base;
- widget = GHB_WIDGET (ud->builder, "start_point");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, max_frames);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
-
- widget = GHB_WIDGET (ud->builder, "end_point");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, max_frames);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), max_frames);
+ spin_configure(ud, "start_point", 1, 1, max_frames);
+ spin_configure(ud, "end_point", max_frames, 1, max_frames);
 }
 }
 
@@ -1755,14 +2054,14 @@
 {
 ghb_widget_to_setting(ud->settings, widget);
 
- if (ghb_settings_combo_int(ud->settings, "VideoFramerate") != 0)
+ if (ghb_settings_video_framerate_rate(ud->settings, "VideoFramerate") != 0)
 {
 if (!ghb_settings_get_boolean(ud->settings, "VideoFrameratePFR"))
 {
 ghb_ui_update(ud, "VideoFramerateCFR", ghb_boolean_value(TRUE));
 }
 }
- if (ghb_settings_combo_int(ud->settings, "VideoFramerate") == 0 &&
+ if (ghb_settings_video_framerate_rate(ud->settings, "VideoFramerate") == 0 &&
 ghb_settings_get_boolean(ud->settings, "VideoFrameratePFR"))
 {
 ghb_ui_update(ud, "VideoFramerateVFR", ghb_boolean_value(TRUE));
@@ -1782,7 +2081,7 @@
 }
 
 G_MODULE_EXPORT gboolean
-meta_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
+meta_focus_out_cb(GtkWidget *widget, GdkEventFocus *event,
 signal_user_data_t *ud)
 {
 ghb_widget_to_setting(ud->settings, widget);
@@ -1805,6 +2104,29 @@
 }
 
 G_MODULE_EXPORT void
+vquality_type_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ ghb_widget_to_setting(ud->settings, widget);
+ ghb_check_dependency(ud, widget, NULL);
+ ghb_clear_presets_selection(ud);
+ ghb_live_reset(ud);
+ if (check_name_template(ud, "{quality}") ||
+ check_name_template(ud, "{bitrate}"))
+ set_destination(ud);
+}
+
+G_MODULE_EXPORT void
+vbitrate_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ ghb_widget_to_setting(ud->settings, widget);
+ ghb_check_dependency(ud, widget, NULL);
+ ghb_clear_presets_selection(ud);
+ ghb_live_reset(ud);
+ if (check_name_template(ud, "{bitrate}"))
+ set_destination(ud);
+}
+
+G_MODULE_EXPORT void
 vquality_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 ghb_widget_to_setting(ud->settings, widget);
@@ -1815,15 +2137,15 @@
 double vquality = ghb_settings_get_double(ud->settings, "VideoQualitySlider");
 if (vquality < 1.0)
 {
- ghb_ui_update(ud, "h264Profile", ghb_string_value("auto"));
+ ghb_ui_update(ud, "VideoProfile", ghb_string_value("auto"));
 }
 
- gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
+ gint vcodec;
 gdouble step;
+ vcodec = ghb_settings_video_encoder_codec(ud->settings, "VideoEncoder");
 if (vcodec == HB_VCODEC_X264)
 {
- step = ghb_settings_combo_double(ud->settings, 
- "VideoQualityGranularity");
+ step = ghb_settings_combo_double(ud->prefs, "VideoQualityGranularity");
 }
 else
 {
@@ -1832,6 +2154,8 @@
 gdouble val = gtk_range_get_value(GTK_RANGE(widget));
 val = ((int)((val + step / 2) / step)) * step;
 gtk_range_set_value(GTK_RANGE(widget), val);
+ if (check_name_template(ud, "{quality}"))
+ set_destination(ud);
 }
 
 G_MODULE_EXPORT void
@@ -1845,32 +2169,60 @@
 ghb_grey_combo_options (ud);
 }
 
-G_MODULE_EXPORT void
-vcodec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+G_MODULE_EXPORT gboolean
+ptop_input_cb(GtkWidget *widget, gdouble *val, signal_user_data_t *ud)
 {
- gdouble vqmin, vqmax, step, page;
- gboolean inverted;
- gint digits;
+ if (ghb_settings_combo_int(ud->settings, "PtoPType") != 1)
+ return FALSE;
 
- ghb_widget_to_setting(ud->settings, widget);
- ghb_check_dependency(ud, widget, NULL);
- ghb_clear_presets_selection(ud);
- ghb_live_reset(ud);
- ghb_vquality_range(ud, &vqmin, &vqmax, &step, &page, &digits, &inverted);
- GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
- gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
- gtk_range_set_increments (GTK_RANGE(qp), step, page);
- gtk_scale_set_digits(GTK_SCALE(qp), digits);
- gtk_range_set_inverted (GTK_RANGE(qp), inverted);
+ const gchar *text;
+ int result;
+ double ss = 0;
+ int hh = 0, mm = 0;
+
+ text = gtk_entry_get_text(GTK_ENTRY(widget));
+ result = sscanf(text, "%2d:%2d:%lf", &hh, &mm, &ss);
+ if (result <= 0)
+ return FALSE;
+ if (result == 1)
+ {
+ result = sscanf(text, "%lf", val);
+ return TRUE;
+ }
+ *val = hh * 3600 + mm * 60 + ss;
+ return TRUE;
+}
+
+G_MODULE_EXPORT gboolean
+ptop_output_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ if (ghb_settings_combo_int(ud->settings, "PtoPType") != 1)
+ return FALSE;
+
+ GtkAdjustment *adjustment;
+ gchar *text;
+ double value, ss;
+ int hh, mm;
+
+ adjustment = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(widget));
+ value = gtk_adjustment_get_value(adjustment);
+ hh = value / 3600;
+ value = value - hh * 3600;
+ mm = value / 60;
+ value = value - mm * 60;
+ ss = value;
+ text = g_strdup_printf ("%02d:%02d:%05.2f", hh, mm, ss);
+ gtk_entry_set_text(GTK_ENTRY(widget), text);
+ g_free (text);
+
+ return TRUE;
 }
 
 G_MODULE_EXPORT void
 start_point_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 gint start, end;
- const gchar *name = ghb_get_setting_key(widget);
 
- g_debug("start_point_changed_cb () %s", name);
 ghb_widget_to_setting(ud->settings, widget);
 if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
 {
@@ -1879,21 +2231,12 @@
 if (start > end)
 ghb_ui_update(ud, "end_point", ghb_int_value(start));
 ghb_check_dependency(ud, widget, NULL);
- if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
- {
+ if (check_name_template(ud, "{chapters}"))
 set_destination(ud);
- }
 widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
 // End may have been changed above, get it again
 end = ghb_settings_get_int(ud->settings, "end_point");
- if (start == end)
- {
- gtk_widget_set_sensitive(widget, FALSE);
- }
- else
- {
- gtk_widget_set_sensitive(widget, TRUE);
- }
+ gtk_widget_set_sensitive(widget, end > start);
 update_title_duration(ud);
 }
 else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
@@ -1920,9 +2263,7 @@
 end_point_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 gint start, end;
- const gchar *name = ghb_get_setting_key(widget);
 
- g_debug("end_point_changed_cb () %s", name);
 ghb_widget_to_setting(ud->settings, widget);
 if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
 {
@@ -1931,21 +2272,12 @@
 if (start > end)
 ghb_ui_update(ud, "start_point", ghb_int_value(end));
 ghb_check_dependency(ud, widget, NULL);
- if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
- {
+ if (check_name_template(ud, "{chapters}"))
 set_destination(ud);
- }
 widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
 // Start may have been changed above, get it again
 start = ghb_settings_get_int(ud->settings, "start_point");
- if (start == end)
- {
- gtk_widget_set_sensitive(widget, FALSE);
- }
- else
- {
- gtk_widget_set_sensitive(widget, TRUE);
- }
+ gtk_widget_set_sensitive(widget, end > start);
 update_title_duration(ud);
 }
 else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
@@ -1976,16 +2308,11 @@
 ghb_check_dependency(ud, widget, NULL);
 ghb_clear_presets_selection(ud);
 if (gtk_widget_is_sensitive(widget))
- ghb_set_scale (ud, GHB_PIC_KEEP_WIDTH);
+ ghb_set_scale(ud, GHB_PIC_KEEP_WIDTH);
 update_preview = TRUE;
- gchar *text;
- gint width = ghb_settings_get_int(ud->settings, "scale_width");
- gint height = ghb_settings_get_int(ud->settings, "scale_height");
- widget = GHB_WIDGET (ud->builder, "scale_dimensions");
- text = g_strdup_printf ("%d x %d", width, height);
- gtk_label_set_text (GTK_LABEL(widget), text);
- g_free(text);
 ghb_live_reset(ud);
+
+ update_scale_info(ud);
 }
 
 G_MODULE_EXPORT void
@@ -1996,57 +2323,27 @@
 ghb_check_dependency(ud, widget, NULL);
 ghb_clear_presets_selection(ud);
 if (gtk_widget_is_sensitive(widget))
- ghb_set_scale (ud, GHB_PIC_KEEP_HEIGHT);
+ ghb_set_scale(ud, GHB_PIC_KEEP_HEIGHT);
+
 update_preview = TRUE;
- gchar *text;
- gint width = ghb_settings_get_int(ud->settings, "scale_width");
- gint height = ghb_settings_get_int(ud->settings, "scale_height");
- widget = GHB_WIDGET (ud->builder, "scale_dimensions");
- text = g_strdup_printf ("%d x %d", width, height);
- gtk_label_set_text (GTK_LABEL(widget), text);
- g_free(text);
 ghb_live_reset(ud);
+
+ update_scale_info(ud);
 }
 
 G_MODULE_EXPORT void
 crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
- gint titleindex, crop[4];
- 
 g_debug("crop_changed_cb ()");
 ghb_widget_to_setting(ud->settings, widget);
 ghb_check_dependency(ud, widget, NULL);
 ghb_clear_presets_selection(ud);
 if (gtk_widget_is_sensitive(widget))
- ghb_set_scale (ud, 0);
-
- crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
- crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
- crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
- crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
- titleindex = ghb_settings_combo_int(ud->settings, "title");
- hb_title_t * title = ghb_get_title_info(titleindex);
- if (title != NULL)
- {
- gint width, height;
- gchar *text;
- 
- width = title->width - crop[2] - crop[3];
- height = title->height - crop[0] - crop[1];
- widget = GHB_WIDGET (ud->builder, "crop_dimensions");
- text = g_strdup_printf ("%d x %d", width, height);
- gtk_label_set_text (GTK_LABEL(widget), text);
- widget = GHB_WIDGET (ud->builder, "crop_dimensions2");
- gtk_label_set_text (GTK_LABEL(widget), text);
- g_free(text);
- }
- gchar *text;
- widget = GHB_WIDGET (ud->builder, "crop_values");
- text = g_strdup_printf ("%d:%d:%d:%d", crop[0], crop[1], crop[2], crop[3]);
- gtk_label_set_text (GTK_LABEL(widget), text);
- g_free(text);
+ ghb_set_scale(ud, 0);
 update_preview = TRUE;
 ghb_live_reset(ud);
+
+ update_crop_info(ud);
 }
 
 G_MODULE_EXPORT void
@@ -2058,7 +2355,7 @@
 ghb_clear_presets_selection(ud);
 ghb_live_reset(ud);
 if (gtk_widget_is_sensitive(widget))
- ghb_set_scale (ud, GHB_PIC_KEEP_DISPLAY_WIDTH);
+ ghb_set_scale(ud, GHB_PIC_KEEP_DISPLAY_WIDTH);
 
 update_preview = TRUE;
 }
@@ -2072,7 +2369,7 @@
 ghb_clear_presets_selection(ud);
 ghb_live_reset(ud);
 if (gtk_widget_is_sensitive(widget))
- ghb_set_scale (ud, GHB_PIC_KEEP_DISPLAY_HEIGHT);
+ ghb_set_scale(ud, GHB_PIC_KEEP_DISPLAY_HEIGHT);
 
 update_preview = TRUE;
 }
@@ -2086,7 +2383,7 @@
 ghb_clear_presets_selection(ud);
 ghb_live_reset(ud);
 if (gtk_widget_is_sensitive(widget))
- ghb_set_scale (ud, GHB_PIC_KEEP_PAR);
+ ghb_set_scale(ud, GHB_PIC_KEEP_PAR);
 
 update_preview = TRUE;
 }
@@ -2100,48 +2397,22 @@
 ghb_clear_presets_selection(ud);
 ghb_live_reset(ud);
 if (gtk_widget_is_sensitive(widget))
- ghb_set_scale (ud, 0);
+ ghb_set_scale(ud, 0);
 update_preview = TRUE;
- 
- gchar *text;
- 
- text = ghb_settings_get_boolean(ud->settings, "PictureAutoCrop") ? "On" : "Off";
- widget = GHB_WIDGET (ud->builder, "crop_auto");
- gtk_label_set_text (GTK_LABEL(widget), text);
- text = ghb_settings_get_boolean(ud->settings, "autoscale") ? "On" : "Off";
- widget = GHB_WIDGET (ud->builder, "scale_auto");
- gtk_label_set_text (GTK_LABEL(widget), text);
- switch (ghb_settings_combo_int(ud->settings, "PicturePAR"))
- {
- case 0:
- text = "Off";
- break;
- case 1:
- text = "Strict";
- break;
- case 2:
- text = "Loose";
- break;
- case 3:
- text = "Custom";
- break;
- default:
- text = "Unknown";
- break;
- }
- widget = GHB_WIDGET (ud->builder, "scale_anamorphic");
- gtk_label_set_text (GTK_LABEL(widget), text);
+
+ update_aspect_info(ud);
 }
 
 G_MODULE_EXPORT void
 show_crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 g_debug("show_crop_changed_cb ()");
- ghb_widget_to_setting(ud->settings, widget);
+ ghb_widget_to_setting(ud->prefs, widget);
 ghb_check_dependency(ud, widget, NULL);
 ghb_live_reset(ud);
 if (gtk_widget_is_sensitive(widget))
- ghb_set_scale (ud, 0);
+ ghb_set_scale(ud, 0);
+ ghb_pref_save(ud->prefs, "preview_show_crop");
 update_preview = TRUE;
 }
 
@@ -2171,6 +2442,7 @@
 dialog = GHB_WIDGET(ud->builder, "prefs_dialog");
 gtk_dialog_run(GTK_DIALOG(dialog));
 gtk_widget_hide(dialog);
+ ghb_prefs_store();
 }
 
 typedef struct
@@ -2197,7 +2469,7 @@
 gtk_main_quit();
 return FALSE;
 }
- str = g_strdup_printf("%s\n\n%s in %d seconds ...", 
+ str = g_strdup_printf(_("%s\n\n%s in %d seconds ..."),
 cd->msg, cd->action, cd->timeout);
 gtk_message_dialog_set_markup(cd->dlg, str);
 g_free(str);
@@ -2219,7 +2491,7 @@
 gtk_main_quit();
 return FALSE;
 }
- str = g_strdup_printf("%s\n\n%s in %d seconds ...", 
+ str = g_strdup_printf(_("%s\n\n%s in %d seconds ..."),
 cd->msg, cd->action, cd->timeout);
 gtk_message_dialog_set_markup(cd->dlg, str);
 g_free(str);
@@ -2238,7 +2510,7 @@
 ghb_suspend_gpm();
 return FALSE;
 }
- str = g_strdup_printf("%s\n\n%s in %d seconds ...", 
+ str = g_strdup_printf(_("%s\n\n%s in %d seconds ..."),
 cd->msg, cd->action, cd->timeout);
 gtk_message_dialog_set_markup(cd->dlg, str);
 g_free(str);
@@ -2247,10 +2519,10 @@
 
 void
 ghb_countdown_dialog(
- GtkMessageType type, 
- const gchar *message, 
- const gchar *action, 
- const gchar *cancel, 
+ GtkMessageType type,
+ const gchar *message,
+ const gchar *action,
+ const gchar *cancel,
 GSourceFunc action_func,
 signal_user_data_t *ud,
 gint timeout)
@@ -2259,7 +2531,7 @@
 GtkResponseType response;
 guint timeout_id;
 countdown_t cd;
- 
+
 cd.msg = message;
 cd.action = action;
 cd.timeout = timeout;
@@ -2268,9 +2540,9 @@
 // Toss up a warning dialog
 dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
 type, GTK_BUTTONS_NONE,
- "%s\n\n%s in %d seconds ...", 
+ _("%s\n\n%s in %d seconds ..."),
 message, action, timeout);
- gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
+ gtk_dialog_add_buttons( GTK_DIALOG(dialog),
 cancel, GTK_RESPONSE_CANCEL,
 NULL);
 
@@ -2295,12 +2567,12 @@
 {
 GtkWidget *dialog;
 GtkResponseType response;
- 
+
 // Toss up a warning dialog
 dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
 type, GTK_BUTTONS_NONE,
 "%s", message);
- gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
+ gtk_dialog_add_buttons( GTK_DIALOG(dialog),
 no, GTK_RESPONSE_NO,
 yes, GTK_RESPONSE_YES, NULL);
 response = gtk_dialog_run(GTK_DIALOG(dialog));
@@ -2321,7 +2593,7 @@
 dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
 type, GTK_BUTTONS_NONE,
 "%s", message);
- gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
+ gtk_dialog_add_buttons( GTK_DIALOG(dialog),
 cancel, GTK_RESPONSE_CANCEL, NULL);
 gtk_dialog_run(GTK_DIALOG(dialog));
 gtk_widget_destroy (dialog);
@@ -2332,18 +2604,18 @@
 {
 GtkWidget *dialog;
 GtkResponseType response;
- 
+
 if (extra_msg == NULL) extra_msg = "";
 // Toss up a warning dialog
 dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
 GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
- "%sYour movie will be lost if you don't continue encoding.",
+ _("%sYour movie will be lost if you don't continue encoding."),
 extra_msg);
- gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
- "Cancel Current and Stop", 1,
- "Cancel Current, Start Next", 2,
- "Finish Current, then Stop", 3,
- "Continue Encoding", 4,
+ gtk_dialog_add_buttons( GTK_DIALOG(dialog),
+ _("Cancel Current and Stop"), 1,
+ _("Cancel Current, Start Next"), 2,
+ _("Finish Current, then Stop"), 3,
+ _("Continue Encoding"), 4,
 NULL);
 response = gtk_dialog_run(GTK_DIALOG(dialog));
 gtk_widget_destroy (dialog);
@@ -2372,16 +2644,16 @@
 {
 GtkWidget *dialog;
 GtkResponseType response;
- 
+
 if (extra_msg == NULL) extra_msg = "";
 // Toss up a warning dialog
 dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
 GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
- "%sYour movie will be lost if you don't continue encoding.",
+ _("%sYour movie will be lost if you don't continue encoding."),
 extra_msg);
- gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
- "Cancel Current and Stop", 1,
- "Continue Encoding", 4,
+ gtk_dialog_add_buttons( GTK_DIALOG(dialog),
+ _("Cancel Current and Stop"), 1,
+ _("Continue Encoding"), 4,
 NULL);
 response = gtk_dialog_run(GTK_DIALOG(dialog));
 gtk_widget_destroy (dialog);
@@ -2398,12 +2670,39 @@
 return FALSE;
 }
 
+static gint
+find_queue_job(GValue *queue, gint unique_id, GValue **job)
+{
+ GValue *js;
+ gint ii, count;
+ gint job_unique_id;
+
+ *job = NULL;
+ g_debug("find_queue_job");
+ if (unique_id == 0) // Invalid Id
+ return -1;
+
+ count = ghb_array_len(queue);
+ for (ii = 0; ii < count; ii++)
+ {
+ js = ghb_array_get_nth(queue, ii);
+ job_unique_id = ghb_settings_get_int(js, "job_unique_id");
+ if (job_unique_id == unique_id)
+ {
+ *job = js;
+ return ii;
+ }
+ }
+ return -1;
+}
+
 static void
-submit_job(GValue *settings)
+submit_job(signal_user_data_t *ud, GValue *settings)
 {
 static gint unique_id = 1;
 gchar *type, *modified, *preset;
 const GValue *path;
+ GValue *js;
 gboolean preset_modified;
 
 g_debug("submit_job");
@@ -2420,6 +2719,25 @@
 ghb_settings_set_int(settings, "job_status", GHB_QUEUE_RUNNING);
 ghb_add_job (settings, unique_id);
 ghb_start_queue();
+
+ // Start queue activity spinner
+ int index = find_queue_job(ud->queue, unique_id, &js);
+ if (index >= 0)
+ {
+ GtkTreeView *treeview;
+ GtkTreeModel *store;
+ GtkTreeIter iter;
+
+ treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
+ store = gtk_tree_view_get_model(treeview);
+ gchar *path = g_strdup_printf ("%d", index);
+ if (gtk_tree_model_get_iter_from_string(store, &iter, path))
+ {
+ gtk_tree_store_set(GTK_TREE_STORE(store), &iter, 0, TRUE, -1);
+ }
+ g_free(path);
+ }
+
 unique_id++;
 }
 
@@ -2430,7 +2748,7 @@
 gint days;
 
 // Only prune logs stored in the default config dir location
- days = ghb_settings_combo_int(ud->settings, "LogLongevity");
+ days = ghb_settings_combo_int(ud->prefs, "LogLongevity");
 if (days > 365)
 return;
 
@@ -2439,7 +2757,7 @@
 {
 const gchar *file;
 gint duration = days * 24 * 60 * 60;
- 
+
 GDir *gdir = g_dir_open(dest_dir, 0, NULL);
 time_t now;
 
@@ -2469,7 +2787,7 @@
 queue_scan(signal_user_data_t *ud, GValue *js)
 {
 gchar *path;
- gint titlenum;
+ gint title_id;
 time_t _now;
 struct tm *now;
 gchar *log_path, *pos, *destname, *basename, *dest_dir;
@@ -2478,7 +2796,7 @@
 now = localtime(&_now);
 destname = ghb_settings_get_string(js, "destination");
 basename = g_path_get_basename(destname);
- if (ghb_settings_get_boolean(ud->settings, "EncodeLogLocation"))
+ if (ghb_settings_get_boolean(ud->prefs, "EncodeLogLocation"))
 {
 dest_dir = g_path_get_dirname (destname);
 }
@@ -2506,17 +2824,17 @@
 {
 gchar *ver_str;
 
- ver_str = g_strdup_printf("Handbrake Version: %s (%d)\n", 
+ ver_str = g_strdup_printf("Handbrake Version: %s (%d)\n",
 hb_get_version(NULL), hb_get_build(NULL));
- g_io_channel_write_chars (ud->job_activity_log, ver_str, 
+ g_io_channel_write_chars (ud->job_activity_log, ver_str,
 -1, NULL, NULL);
 g_free(ver_str);
 }
 g_free(log_path);
 
 path = ghb_settings_get_string( js, "source");
- titlenum = ghb_settings_get_int(js, "titlenum");
- ghb_backend_queue_scan(path, titlenum);
+ title_id = ghb_settings_get_int(js, "title");
+ ghb_backend_queue_scan(path, title_id);
 g_free(path);
 }
 
@@ -2551,118 +2869,60 @@
 
 label = GTK_LABEL(GHB_WIDGET(ud->builder, "pending_status"));
 pending = queue_pending_count(ud->queue);
- str = g_strdup_printf("%d encode(s) pending", pending);
+ str = g_strdup_printf(_("%d encode(s) pending"), pending);
 gtk_label_set_text(label, str);
 g_free(str);
 }
 
-GValue* 
-ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
+GValue*
+ghb_start_next_job(signal_user_data_t *ud)
 {
- static gint current = 0;
- gint count, ii, jj;
+ gint count, ii;
 GValue *js;
 gint status;
- GtkWidget *prog;
+ GtkWidget *progress;
 
 g_debug("start_next_job");
- prog = GHB_WIDGET(ud->builder, "progressbar");
- gtk_widget_show(prog);
+ progress = GHB_WIDGET(ud->builder, "progressbar");
+ gtk_widget_show(progress);
 
 count = ghb_array_len(ud->queue);
- if (find_first)
- { // Start the first pending item in the queue
- current = 0;
- for (ii = 0; ii < count; ii++)
- {
-
- js = ghb_array_get_nth(ud->queue, ii);
- status = ghb_settings_get_int(js, "job_status");
- if (status == GHB_QUEUE_PENDING)
- {
- current = ii;
- ghb_inhibit_gsm(ud);
- queue_scan(ud, js);
- ghb_update_pending(ud);
- return js;
- }
- }
- // Nothing pending
- ghb_uninhibit_gsm();
- ghb_notify_done(ud);
- return NULL;
- }
- // Find the next pending item after the current running item
- for (ii = 0; ii < count-1; ii++)
- {
- js = ghb_array_get_nth(ud->queue, ii);
- status = ghb_settings_get_int(js, "job_status");
- if (status == GHB_QUEUE_RUNNING)
- {
- for (jj = ii+1; jj < count; jj++)
- {
- js = ghb_array_get_nth(ud->queue, jj);
- status = ghb_settings_get_int(js, "job_status");
- if (status == GHB_QUEUE_PENDING)
- {
- current = jj;
- ghb_inhibit_gsm(ud);
- queue_scan(ud, js);
- ghb_update_pending(ud);
- return js;
- }
- }
- }
- }
- // No running item found? Maybe it was deleted
- // Look for a pending item starting from the last index we started
- for (ii = current; ii < count; ii++)
+ for (ii = 0; ii < count; ii++)
 {
+
 js = ghb_array_get_nth(ud->queue, ii);
 status = ghb_settings_get_int(js, "job_status");
 if (status == GHB_QUEUE_PENDING)
 {
- current = ii;
 ghb_inhibit_gsm(ud);
 queue_scan(ud, js);
 ghb_update_pending(ud);
+
+ // Start queue activity spinner
+ GtkTreeView *treeview;
+ GtkTreeModel *store;
+ GtkTreeIter iter;
+
+ treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
+ store = gtk_tree_view_get_model(treeview);
+ gchar *path = g_strdup_printf ("%d", ii);
+ if (gtk_tree_model_get_iter_from_string(store, &iter, path))
+ {
+ gtk_tree_store_set(GTK_TREE_STORE(store), &iter, 0, TRUE, -1);
+ }
+ g_free(path);
+
 return js;
 }
 }
- // Nothing found
+ // Nothing pending
 ghb_uninhibit_gsm();
 ghb_notify_done(ud);
 ghb_update_pending(ud);
- gtk_widget_hide(prog);
+ gtk_widget_hide(progress);
 return NULL;
 }
 
-static gint
-find_queue_job(GValue *queue, gint unique_id, GValue **job)
-{
- GValue *js;
- gint ii, count;
- gint job_unique_id;
- 
- *job = NULL;
- g_debug("find_queue_job");
- if (unique_id == 0) // Invalid Id
- return -1;
-
- count = ghb_array_len(queue);
- for (ii = 0; ii < count; ii++)
- {
- js = ghb_array_get_nth(queue, ii);
- job_unique_id = ghb_settings_get_int(js, "job_unique_id");
- if (job_unique_id == unique_id)
- {
- *job = js;
- return ii;
- }
- }
- return -1;
-}
-
 gchar*
 working_status_string(signal_user_data_t *ud, ghb_instance_status_t *status)
 {
@@ -2680,7 +2940,7 @@
 }
 if (qcount > 1)
 {
- job_str = g_strdup_printf("job %d of %d, ", index+1, qcount);
+ job_str = g_strdup_printf(_("job %d of %d, "), index+1, qcount);
 }
 else
 {
@@ -2690,12 +2950,12 @@
 {
 if (status->job_cur == 1 && subtitle_scan)
 {
- task_str = g_strdup_printf("pass %d (subtitle scan) of %d, ", 
+ task_str = g_strdup_printf(_("pass %d (subtitle scan) of %d, "),
 status->job_cur, status->job_count);
 }
 else
 {
- task_str = g_strdup_printf("pass %d of %d, ", 
+ task_str = g_strdup_printf(_("pass %d of %d, "),
 status->job_cur, status->job_count);
 }
 }
@@ -2708,18 +2968,18 @@
 if (status->rate_cur > 0.0)
 {
 status_str= g_strdup_printf(
- "Encoding: %s%s%.2f %%"
- " (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)",
+ _("Encoding: %s%s%.2f %%"
+ " (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"),
 job_str, task_str,
 100.0 * status->progress,
- status->rate_cur, status->rate_avg, status->hours, 
+ status->rate_cur, status->rate_avg, status->hours,
 status->minutes, status->seconds );
 }
 else
 {
 status_str= g_strdup_printf(
- "Encoding: %s%s%.2f %%"
- " (ETA %02dh%02dm%02ds)",
+ _("Encoding: %s%s%.2f %%"
+ " (ETA %02dh%02dm%02ds)"),
 job_str, task_str,
 100.0 * status->progress,
 status->hours, status->minutes, status->seconds );
@@ -2728,7 +2988,7 @@
 else
 {
 status_str= g_strdup_printf(
- "Encoding: %s%s%.2f %%",
+ _("Encoding: %s%s%.2f %%"),
 job_str, task_str,
 100.0 * status->progress );
 }
@@ -2749,18 +3009,18 @@
 index = find_queue_job(ud->queue, status->unique_id, &js);
 if (qcount > 1)
 {
- job_str = g_strdup_printf("job %d of %d, ", index+1, qcount);
+ job_str = g_strdup_printf(_("job %d of %d, "), index+1, qcount);
 }
 else
 {
 job_str = g_strdup("");
 }
- task_str = g_strdup_printf("Searching for start time, ");
+ task_str = g_strdup_printf(_("Searching for start time, "));
 if(status->seconds > -1)
 {
 status_str= g_strdup_printf(
- "Encoding: %s%s%.2f %%"
- " (ETA %02dh%02dm%02ds)",
+ _("Encoding: %s%s%.2f %%"
+ " (ETA %02dh%02dm%02ds)"),
 job_str, task_str,
 100.0 * status->progress,
 status->hours, status->minutes, status->seconds );
@@ -2768,7 +3028,7 @@
 else
 {
 status_str= g_strdup_printf(
- "Encoding: %s%s%.2f %%",
+ _("Encoding: %s%s%.2f %%"),
 job_str, task_str,
 100.0 * status->progress );
 }
@@ -2784,15 +3044,14 @@
 gchar *status_str;
 GtkProgressBar *progress;
 GtkLabel *work_status;
- gint titleindex;
 GValue *js;
 gint index;
 GtkTreeView *treeview;
- GtkTreeStore *store;
+ GtkTreeModel *store;
 GtkTreeIter iter;
- static gint prev_scan_state = 0;
- static gint prev_queue_state = 0;
- 
+ static gint prev_scan_state = -1;
+ static gint prev_queue_state = -1;
+
 ghb_track_status();
 ghb_get_status(&status);
 if (prev_scan_state != status.scan.state ||
@@ -2804,11 +3063,11 @@
 }
 progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
 work_status = GTK_LABEL(GHB_WIDGET (ud->builder, "work_status"));
- if (status.scan.state == GHB_STATE_IDLE && 
+ if (status.scan.state == GHB_STATE_IDLE &&
 status.queue.state == GHB_STATE_IDLE)
 {
 static gboolean prev_dvdnav;
- gboolean dvdnav = ghb_settings_get_boolean(ud->settings, "use_dvdnav");
+ gboolean dvdnav = ghb_settings_get_boolean(ud->prefs, "use_dvdnav");
 if (dvdnav != prev_dvdnav)
 {
 hb_dvd_set_dvdnav(dvdnav);
@@ -2823,20 +3082,20 @@
 GtkLabel *label;
 
 scan_prog = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "scan_prog"));
- label = GTK_LABEL(GHB_WIDGET (ud->builder, "source_title"));
+ label = GTK_LABEL(GHB_WIDGET (ud->builder, "volume_label"));
 
 if (status.scan.title_cur == 0)
 {
- status_str = g_strdup ("Scanning...");
+ status_str = g_strdup (_("Scanning..."));
 }
 else
 {
 if (status.scan.preview_cur == 0)
- status_str = g_strdup_printf("Scanning title %d of %d...",
+ status_str = g_strdup_printf(_("Scanning title %d of %d..."),
 status.scan.title_cur, status.scan.title_count );
 else
 status_str = g_strdup_printf(
- "Scanning title %d of %d preview %d...",
+ _("Scanning title %d of %d preview %d..."),
 status.scan.title_cur, status.scan.title_count,
 status.scan.preview_cur);
 
@@ -2855,107 +3114,115 @@
 GtkLabel *label;
 
 GtkWidget *widget;
- GtkAction *action;
 
 widget = GHB_WIDGET(ud->builder, "sourcetoolbutton");
 gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(widget), "hb-source");
- gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), "Source");
- gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), "Choose Video Source");
+ gtk_tool_button_set_label(GTK_TOOL_BUTTON(widget), _("Source"));
+ gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), _("Choose Video Source"));
 
- action = GHB_ACTION(ud->builder, "source_action");
- gtk_action_set_sensitive(action, TRUE);
- action = GHB_ACTION(ud->builder, "source_single_action");
- gtk_action_set_sensitive(action, TRUE);
+ widget = GHB_WIDGET(ud->builder, "source_open");
+ gtk_widget_set_sensitive(widget, TRUE);
+ widget = GHB_WIDGET(ud->builder, "source_title_open");
+ gtk_widget_set_sensitive(widget, TRUE);
 
- source = ghb_settings_get_string(ud->settings, "scan_source");
- update_source_label(ud, source, FALSE);
+ source = ghb_settings_get_string(ud->globals, "scan_source");
+ update_source_label(ud, source);
+ g_free(source);
 
 scan_prog = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "scan_prog"));
 gtk_progress_bar_set_fraction (scan_prog, 1.0);
 gtk_widget_hide(GTK_WIDGET(scan_prog));
 
- if (!ghb_settings_get_boolean(ud->settings, "preset_modified"))
- {
- ghb_refresh_preset(ud);
- }
+ int title_id, titleindex;
+ const hb_title_t *title;
+ title_id = ghb_longest_title();
+ title = ghb_lookup_title(title_id, &titleindex);
+ ghb_update_ui_combo_box(ud, "title", NULL, FALSE);
+ load_all_titles(ud, titleindex);
 
- ghb_update_ui_combo_box(ud, "title", 0, FALSE);
- titleindex = ghb_longest_title();
- ghb_ui_update(ud, "title", ghb_int64_value(titleindex));
+ label = GTK_LABEL(GHB_WIDGET (ud->builder, "volume_label"));
 
- label = GTK_LABEL(GHB_WIDGET (ud->builder, "source_title"));
+ ghb_clear_scan_state(GHB_STATE_SCANDONE);
 // Are there really any titles.
- hb_title_t * title = ghb_get_title_info(titleindex);
 if (title == NULL)
 {
- gtk_label_set_text(label, "None");
+ gtk_label_set_text(label, _("No Title Found"));
+ ghb_ui_update(ud, "title", ghb_int64_value(-1));
 }
- ghb_clear_scan_state(GHB_STATE_SCANDONE);
- if (ghb_queue_edit_settings)
+ else
+ {
+ ghb_ui_update(ud, "title", ghb_int64_value(title->index));
+ }
+
+ if (ghb_queue_edit_settings != NULL)
 {
- ghb_settings_to_ui(ud, ghb_queue_edit_settings);
- ghb_set_audio(ud, ghb_queue_edit_settings);
- ghb_reset_subtitles(ud, ghb_queue_edit_settings);
- reset_chapter_list(ud, ghb_queue_edit_settings);
- ghb_value_free(ghb_queue_edit_settings);
+ // Switch to the correct title in the list
+ ghb_ui_update(ud, "title",
+ ghb_settings_get_value(ghb_queue_edit_settings, "title"));
+
+ // The above should cause the current title index to update
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ ghb_array_replace(ud->settings_array, titleindex,
+ ghb_queue_edit_settings);
+ ud->settings = ghb_queue_edit_settings;
+ ghb_load_settings(ud);
 ghb_queue_edit_settings = NULL;
 }
 }
 
+ if (status.queue.unique_id != 0)
+ {
+ index = find_queue_job(ud->queue, status.queue.unique_id, &js);
+ if (index >= 0)
+ {
+ treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
+ store = gtk_tree_view_get_model(treeview);
+ gchar *path = g_strdup_printf ("%d", index);
+ if (gtk_tree_model_get_iter_from_string(store, &iter, path))
+ {
+ if ((status.queue.state & GHB_STATE_WORKDONE) ||
+ (status.queue.state & GHB_STATE_SCANDONE))
+ {
+ gtk_tree_store_set(GTK_TREE_STORE(store), &iter,
+ 0, FALSE, -1);
+ }
+ else if (!(status.queue.state & GHB_STATE_PAUSED))
+ {
+ gint pulse;
+ gtk_tree_model_get(store, &iter, 4, &pulse, -1);
+ gtk_tree_store_set(GTK_TREE_STORE(store), &iter,
+ 4, pulse+1, -1);
+ }
+ }
+ g_free(path);
+ }
+ }
+
 if (status.queue.state & GHB_STATE_SCANNING)
 {
 // This needs to be in scanning and working since scanning
 // happens fast enough that it can be missed
- gtk_label_set_text (work_status, "Scanning ...");
+ gtk_label_set_text (work_status, _("Scanning ..."));
 gtk_progress_bar_set_fraction (progress, 0);
 }
 else if (status.queue.state & GHB_STATE_SCANDONE)
 {
 ghb_clear_queue_state(GHB_STATE_SCANDONE);
 usleep(2000000);
- submit_job(ud->current_job);
+ submit_job(ud, ud->current_job);
 ghb_update_pending(ud);
 }
 else if (status.queue.state & GHB_STATE_PAUSED)
 {
- gtk_label_set_text (work_status, "Paused");
+ gtk_label_set_text (work_status, _("Paused"));
 }
 else if (status.queue.state & GHB_STATE_SEARCHING)
 {
- static gint working = 0;
-
- // This needs to be in scanning and working since scanning
- // happens fast enough that it can be missed
- index = find_queue_job(ud->queue, status.queue.unique_id, &js);
- if (status.queue.unique_id != 0 && index >= 0)
- {
- gchar working_icon[] = "hb-working0";
- working_icon[10] = '0' + working;
- working = (working+1) % 6;
- treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
- store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
- gchar *path = g_strdup_printf ("%d", index);
- if (gtk_tree_model_get_iter_from_string(
- GTK_TREE_MODEL(store), &iter, path))
- {
- gtk_tree_store_set(store, &iter, 0, working_icon, -1);
- }
- g_free(path);
- }
- GtkLabel *label;
 gchar *status_str;
 
- status_str = searching_status_string(ud, &status.queue);
- label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
- gtk_label_set_text (label, status_str);
- if (ghb_settings_get_boolean(ud->settings, "show_status"))
+ if (ghb_settings_get_boolean(ud->prefs, "show_status"))
 {
-#if !GTK_CHECK_VERSION(2, 16, 0)
- GtkStatusIcon *si;
-
- si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
- gtk_status_icon_set_tooltip(si, status_str);
-#endif
 #if defined(_USE_APP_IND)
 char * ai_status_str= g_strdup_printf(
 "%.2f%%",
@@ -2964,39 +3231,16 @@
 g_free(ai_status_str);
 #endif
 }
+ status_str = searching_status_string(ud, &status.queue);
 gtk_label_set_text (work_status, status_str);
 gtk_progress_bar_set_fraction (progress, status.queue.progress);
 g_free(status_str);
 }
 else if (status.queue.state & GHB_STATE_WORKING)
 {
- static gint working = 0;
-
- // This needs to be in scanning and working since scanning
- // happens fast enough that it can be missed
- index = find_queue_job(ud->queue, status.queue.unique_id, &js);
- if (status.queue.unique_id != 0 && index >= 0)
- {
- gchar working_icon[] = "hb-working0";
- working_icon[10] = '0' + working;
- working = (working+1) % 6;
- treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
- store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
- gchar *path = g_strdup_printf ("%d", index);
- if (gtk_tree_model_get_iter_from_string(
- GTK_TREE_MODEL(store), &iter, path))
- {
- gtk_tree_store_set(store, &iter, 0, working_icon, -1);
- }
- g_free(path);
- }
- GtkLabel *label;
 gchar *status_str;
 
- status_str = working_status_string(ud, &status.queue);
- label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
- gtk_label_set_text (label, status_str);
- if (ghb_settings_get_boolean(ud->settings, "show_status"))
+ if (ghb_settings_get_boolean(ud->prefs, "show_status"))
 {
 #if defined(_USE_APP_IND)
 char * ai_status_str= g_strdup_printf(
@@ -3004,15 +3248,9 @@
 100.0 * status.queue.progress);
 app_indicator_set_label( ud->ai, ai_status_str, "99.99%");
 g_free(ai_status_str);
-#else
-#if !GTK_CHECK_VERSION(2, 16, 0)
- GtkStatusIcon *si;
-
- si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
- gtk_status_icon_set_tooltip(si, status_str);
-#endif
 #endif
 }
+ status_str = working_status_string(ud, &status.queue);
 gtk_label_set_text (work_status, status_str);
 gtk_progress_bar_set_fraction (progress, status.queue.progress);
 g_free(status_str);
@@ -3020,66 +3258,58 @@
 else if (status.queue.state & GHB_STATE_WORKDONE)
 {
 gint qstatus;
+ const gchar *status_icon;
 
 index = find_queue_job(ud->queue, status.queue.unique_id, &js);
 treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
- store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
- if (ud->cancel_encode == GHB_CANCEL_ALL || 
+ store = gtk_tree_view_get_model(treeview);
+ if (ud->cancel_encode == GHB_CANCEL_ALL ||
 ud->cancel_encode == GHB_CANCEL_CURRENT)
 status.queue.error = GHB_ERROR_CANCELED;
 switch( status.queue.error )
 {
 case GHB_ERROR_NONE:
- gtk_label_set_text (work_status, "Encode Done!");
+ gtk_label_set_text (work_status, _("Encode Done!"));
 qstatus = GHB_QUEUE_DONE;
- if (js != NULL)
- {
- gchar *path = g_strdup_printf ("%d", index);
- if (gtk_tree_model_get_iter_from_string(
- GTK_TREE_MODEL(store), &iter, path))
- {
- gtk_tree_store_set(store, &iter, 0, "hb-complete", -1);
- }
- g_free(path);
- }
+ status_icon = "hb-complete";
 break;
 case GHB_ERROR_CANCELED:
- gtk_label_set_text (work_status, "Encode Canceled.");
+ gtk_label_set_text (work_status, _("Encode Canceled."));
 qstatus = GHB_QUEUE_CANCELED;
- if (js != NULL)
- {
- gchar *path = g_strdup_printf ("%d", index);
- if (gtk_tree_model_get_iter_from_string(
- GTK_TREE_MODEL(store), &iter, path))
- {
- gtk_tree_store_set(store, &iter, 0, "hb-canceled", -1);
- }
- g_free(path);
- }
+ status_icon = "hb-stop";
 break;
+ case GHB_ERROR_FAIL:
 default:
- gtk_label_set_text (work_status, "Encode Failed.");
- qstatus = GHB_QUEUE_CANCELED;
- if (js != NULL)
- {
- gchar *path = g_strdup_printf ("%d", index);
- if (gtk_tree_model_get_iter_from_string(
- GTK_TREE_MODEL(store), &iter, path))
- {
- gtk_tree_store_set(store, &iter, 0, "hb-canceled", -1);
- }
- g_free(path);
- }
+ gtk_label_set_text (work_status, _("Encode Failed."));
+ qstatus = GHB_QUEUE_FAIL;
+ status_icon = "hb-stop";
+ }
+ if (js != NULL)
+ {
+ gchar *path = g_strdup_printf ("%d", index);
+ if (gtk_tree_model_get_iter_from_string(store, &iter, path))
+ {
+ gtk_tree_store_set(GTK_TREE_STORE(store), &iter,
+ 1, status_icon, -1);
+ }
+ g_free(path);
 }
 gtk_progress_bar_set_fraction (progress, 1.0);
 ghb_clear_queue_state(GHB_STATE_WORKDONE);
 if (ud->job_activity_log)
 g_io_channel_unref(ud->job_activity_log);
 ud->job_activity_log = NULL;
+ if (js)
+ ghb_settings_set_int(js, "job_status", qstatus);
+ if (ghb_settings_get_boolean(ud->prefs, "RemoveFinishedJobs") &&
+ status.queue.error == GHB_ERROR_NONE)
+ {
+ ghb_queue_remove_row(ud, index);
+ }
 if (ud->cancel_encode != GHB_CANCEL_ALL &&
 ud->cancel_encode != GHB_CANCEL_FINISH)
 {
- ud->current_job = ghb_start_next_job(ud, FALSE);
+ ud->current_job = ghb_start_next_job(ud);
 }
 else
 {
@@ -3087,24 +3317,15 @@
 ud->current_job = NULL;
 gtk_widget_hide(GTK_WIDGET(progress));
 }
- if (js)
- ghb_settings_set_int(js, "job_status", qstatus);
 ghb_save_queue(ud->queue);
 ud->cancel_encode = GHB_CANCEL_NONE;
 #if defined(_USE_APP_IND)
 app_indicator_set_label( ud->ai, "", "99.99%");
-#else
-#if !GTK_CHECK_VERSION(2, 16, 0)
- GtkStatusIcon *si;
-
- si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
- gtk_status_icon_set_tooltip(si, "HandBrake");
-#endif
 #endif
 }
 else if (status.queue.state & GHB_STATE_MUXING)
 {
- gtk_label_set_text (work_status, "Muxing: This may take a while...");
+ gtk_label_set_text (work_status, _("Muxing: This may take a while..."));
 }
 
 if (status.scan.state & GHB_STATE_WORKING)
@@ -3134,36 +3355,6 @@
 }
 }
 
-#if GTK_CHECK_VERSION(2, 16, 0)
-G_MODULE_EXPORT gboolean
-status_icon_query_tooltip_cb(
- GtkStatusIcon *si,
- gint x,
- gint y,
- gboolean kbd_mode,
- GtkTooltip *tt,
- signal_user_data_t *ud)
-{
- ghb_status_t status;
- gchar *status_str;
-
- ghb_get_status(&status);
- if (status.queue.state & GHB_STATE_WORKING)
- status_str = working_status_string(ud, &status.queue);
- else if (status.queue.state & GHB_STATE_SEARCHING)
- status_str = searching_status_string(ud, &status.queue);
- else if (status.queue.state & GHB_STATE_WORKDONE)
- status_str = g_strdup("Encode Complete");
- else
- status_str = g_strdup("HandBrake");
-
- gtk_tooltip_set_text(tt, status_str);
- gtk_tooltip_set_icon_from_icon_name(tt, "hb-icon", GTK_ICON_SIZE_BUTTON);
- g_free(status_str);
- return TRUE;
-}
-#endif
-
 G_MODULE_EXPORT gboolean
 ghb_timer_cb(gpointer data)
 {
@@ -3176,11 +3367,11 @@
 gchar *dest, *dest_dir, *def_dest;
 dest = ghb_settings_get_string(ud->settings, "destination");
 dest_dir = g_path_get_dirname (dest);
- def_dest = ghb_settings_get_string(ud->settings, "destination_dir");
+ def_dest = ghb_settings_get_string(ud->prefs, "destination_dir");
 if (strcmp(dest_dir, def_dest) != 0)
 {
- ghb_settings_set_string (ud->settings, "destination_dir", dest_dir);
- ghb_pref_save (ud->settings, "destination_dir");
+ ghb_settings_set_string (ud->prefs, "destination_dir", dest_dir);
+ ghb_pref_save(ud->prefs, "destination_dir");
 }
 g_free(dest);
 g_free(dest_dir);
@@ -3198,7 +3389,7 @@
 if (!appcast_busy)
 {
 gchar *updates;
- updates = ghb_settings_get_string(ud->settings, "check_updates");
+ updates = ghb_settings_get_string(ud->prefs, "check_updates");
 gint64 duration = 0;
 if (strcmp(updates, "daily") == 0)
 duration = 60 * 60 * 24;
@@ -3213,13 +3404,13 @@
 gint64 last;
 time_t tt;
 
- last = ghb_settings_get_int64(ud->settings, "last_update_check");
+ last = ghb_settings_get_int64(ud->prefs, "last_update_check");
 time(&tt);
 if (last + duration < tt)
 {
- ghb_settings_set_int64(ud->settings, 
+ ghb_settings_set_int64(ud->prefs,
 "last_update_check", tt);
- ghb_pref_save(ud->settings, "last_update_check");
+ ghb_pref_save(ud->prefs, "last_update_check");
 GHB_THREAD_NEW("Update Check", (GThreadFunc)ghb_check_update, ud);
 }
 }
@@ -3239,7 +3430,7 @@
 GtkTextMark *mark;
 GError *gerror = NULL;
 GIOStatus status;
- 
+
 signal_user_data_t *ud = (signal_user_data_t*)data;
 
 status = g_io_channel_read_line (source, &text, &length, NULL, &gerror);
@@ -3258,15 +3449,15 @@
 textview = GTK_TEXT_VIEW(GHB_WIDGET (ud->builder, "activity_view"));
 buffer = gtk_text_view_get_buffer (textview);
 // I would like to auto-scroll the window when the scrollbar
- // is at the bottom, 
+ // is at the bottom,
 // must determine whether the insert point is at
- // the bottom of the window 
+ // the bottom of the window
 window = gtk_text_view_get_window(textview, GTK_TEXT_WINDOW_TEXT);
 if (window != NULL)
 {
 width = gdk_window_get_width(window);
 height = gdk_window_get_height(window);
- gtk_text_view_window_to_buffer_coords(textview, 
+ gtk_text_view_window_to_buffer_coords(textview,
 GTK_TEXT_WINDOW_TEXT, width, height, &x, &y);
 gtk_text_view_get_iter_at_location(textview, &iter, x, y);
 if (gtk_text_iter_is_end(&iter))
@@ -3296,19 +3487,19 @@
 gsize one = 1;
 utf8_text[length-1] = '\r';
 #endif
- g_io_channel_write_chars (ud->activity_log, utf8_text, 
+ g_io_channel_write_chars (ud->activity_log, utf8_text,
 length, &outlength, NULL);
 #if defined(_WIN32)
- g_io_channel_write_chars (ud->activity_log, "\n", 
+ g_io_channel_write_chars (ud->activity_log, "\n",
 one, &one, NULL);
 #endif
 g_io_channel_flush(ud->activity_log, NULL);
 if (ud->job_activity_log)
 {
- g_io_channel_write_chars (ud->job_activity_log, utf8_text, 
+ g_io_channel_write_chars (ud->job_activity_log, utf8_text,
 length, &outlength, NULL);
 #if defined(_WIN32)
- g_io_channel_write_chars (ud->activity_log, "\n", 
+ g_io_channel_write_chars (ud->activity_log, "\n",
 one, &outlength, NULL);
 #endif
 g_io_channel_flush(ud->job_activity_log, NULL);
@@ -3336,24 +3527,11 @@
 return TRUE;
 }
 
-static void
-set_visible(GtkWidget *widget, gboolean visible)
-{
- if (visible)
- {
- gtk_widget_show_now(widget);
- }
- else
- {
- gtk_widget_hide(widget);
- }
-}
-
 G_MODULE_EXPORT void
 show_activity_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
 GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
- set_visible(widget, gtk_toggle_tool_button_get_active(
+ gtk_widget_set_visible(widget, gtk_toggle_tool_button_get_active(
 GTK_TOGGLE_TOOL_BUTTON(xwidget)));
 }
 
@@ -3361,7 +3539,7 @@
 show_activity_menu_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
 GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
- set_visible(widget, TRUE);
+ gtk_widget_set_visible(widget, TRUE);
 widget = GHB_WIDGET (ud->builder, "show_activity");
 gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), TRUE);
 }
@@ -3369,7 +3547,7 @@
 G_MODULE_EXPORT gboolean
 activity_window_delete_cb(GtkWidget *xwidget, GdkEvent *event, signal_user_data_t *ud)
 {
- set_visible(xwidget, FALSE);
+ gtk_widget_set_visible(xwidget, FALSE);
 GtkWidget *widget = GHB_WIDGET (ud->builder, "show_activity");
 gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
 return TRUE;
@@ -3385,7 +3563,7 @@
 
 _now = time(NULL);
 now = localtime( &_now );
- snprintf(fmt, 362, "[%02d:%02d:%02d] gtkgui: %s\n", 
+ snprintf(fmt, 362, "[%02d:%02d:%02d] gtkgui: %s\n",
 now->tm_hour, now->tm_min, now->tm_sec, log);
 va_start(args, log);
 vfprintf(stderr, fmt, args);
@@ -3396,11 +3574,10 @@
 browse_url(const gchar *url)
 {
 #if defined(_WIN32)
- HINSTANCE r;
- r = ShellExecute(NULL, "open", url, NULL, NULL, SW_SHOWNORMAL);
+ ShellExecute(NULL, "open", url, NULL, NULL, SW_SHOWNORMAL);
 #else
 gboolean result;
- char *argv[] = 
+ char *argv[] =
 {"xdg-open",NULL,NULL,NULL};
 argv[1] = (gchar*)url;
 result = g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
@@ -3449,9 +3626,9 @@
 #endif
 gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), ver);
 g_free(ver);
- gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), 
+ gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget),
 HB_PROJECT_URL_WEBSITE);
- gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(widget), 
+ gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(widget),
 HB_PROJECT_URL_WEBSITE);
 gtk_widget_show (widget);
 }
@@ -3471,215 +3648,144 @@
 G_MODULE_EXPORT void
 show_queue_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
- GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
- set_visible(widget, gtk_toggle_tool_button_get_active(
- GTK_TOGGLE_TOOL_BUTTON(xwidget)));
+ GtkWidget *widget;
+ GtkStack *stack;
+
+ stack = GTK_STACK(GHB_WIDGET(ud->builder, "QueueStack"));
+ if (gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(xwidget)))
+ widget = GHB_WIDGET(ud->builder, "queue_tab");
+ else
+ widget = GHB_WIDGET(ud->builder, "settings_tab");
+ gtk_stack_set_visible_child(stack, widget);
 }
 
 G_MODULE_EXPORT void
 show_queue_menu_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
- GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
- set_visible(widget, TRUE);
- widget = GHB_WIDGET (ud->builder, "show_queue");
+ GtkWidget *widget = GHB_WIDGET(ud->builder, "show_queue");
 gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), TRUE);
 }
 
-G_MODULE_EXPORT gboolean
-queue_window_delete_cb(GtkWidget *xwidget, GdkEvent *event, signal_user_data_t *ud)
-{
- set_visible(xwidget, FALSE);
- GtkWidget *widget = GHB_WIDGET (ud->builder, "show_queue");
- gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
- return TRUE;
-}
-
 G_MODULE_EXPORT void
-show_presets_toggled_cb(GtkWidget *action, signal_user_data_t *ud)
+show_presets_toggled_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
- GtkWidget *widget;
+ GtkWidget *frame;
 GtkWindow *hb_window;
- 
+
 g_debug("show_presets_clicked_cb ()");
- widget = GHB_WIDGET (ud->builder, "presets_frame");
- ghb_widget_to_setting(ud->settings, action);
- if (ghb_settings_get_boolean(ud->settings, "show_presets"))
+ frame = GHB_WIDGET (ud->builder, "presets_frame");
+ ghb_widget_to_setting(ud->prefs, widget);
+ if (ghb_settings_get_boolean(ud->prefs, "show_presets"))
 {
- gtk_widget_show_now(widget);
+ gtk_widget_show_now(frame);
 }
 else
 {
- gtk_widget_hide(widget);
+ gtk_widget_hide(frame);
 hb_window = GTK_WINDOW(GHB_WIDGET (ud->builder, "hb_window"));
 gtk_window_resize(hb_window, 16, 16);
 }
- ghb_pref_save(ud->settings, "show_presets");
+ ghb_pref_save(ud->prefs, "show_presets");
+}
+
+static void
+chapter_refresh_list_row_ui(
+ GtkTreeModel *tm,
+ GtkTreeIter *ti,
+ GValue *chapter_list,
+ const hb_title_t *title,
+ int index)
+{
+ gchar *chapter, *s_duration, *s_start;
+ gint hh, mm, ss;
+ gint64 duration, start;
+
+ // Update row with settings data
+ g_debug("Updating chapter row ui");
+ chapter = ghb_value_string(ghb_array_get_nth(chapter_list, index));
+ duration = ghb_get_chapter_duration(title, index) / 90000;
+ break_duration(duration, &hh, &mm, &ss);
+ s_duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
+ start = ghb_get_chapter_start(title, index) / 90000;
+ break_duration(start, &hh, &mm, &ss);
+ s_start = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
+ gtk_list_store_set(GTK_LIST_STORE(tm), ti,
+ 0, index+1,
+ 1, s_start,
+ 2, s_duration,
+ 3, chapter,
+ 4, TRUE,
+ -1);
+ g_free(chapter);
+ g_free(s_duration);
+ g_free(s_start);
 }
 
 static void
-reset_chapter_list(signal_user_data_t *ud, GValue *settings)
+ghb_clear_chapter_list_ui(GtkBuilder *builder)
 {
- GtkTreeView *treeview;
- GtkTreeIter iter;
- GtkListStore *store;
- gboolean done;
- GValue *chapters;
- gint titleindex, ii;
- gint count;
- 
- g_debug("reset_chapter_list ()");
- chapters = ghb_value_dup(ghb_settings_get_value(settings, "chapter_list"));
- count = ghb_array_len(chapters);
- ghb_settings_set_value(ud->settings, "chapter_list", chapters);
- titleindex = ghb_settings_combo_int(ud->settings, "title");
- 
- treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "chapters_list"));
- store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
- ii = 0;
- if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
- {
- do
- {
+ GtkTreeView *tv;
+ GtkListStore *ts;
 
- if (ii < count)
- {
- gchar *chapter, *duration;
- gint hh, mm, ss;
+ tv = GTK_TREE_VIEW(GHB_WIDGET(builder, "chapters_list"));
+ ts = GTK_LIST_STORE(gtk_tree_view_get_model(tv));
+ gtk_list_store_clear(ts);
+}
 
- // Update row with settings data
- g_debug("Updating row");
- chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
- ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
- duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
- gtk_list_store_set(store, &iter, 
- 0, ii+1,
- 1, duration,
- 2, chapter,
- 3, TRUE,
- -1);
- g_free(chapter);
- g_free(duration);
- ii++;
- done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
- }
- else
- {
- // No more settings data, remove row
- g_debug("Removing row");
- done = !gtk_list_store_remove(store, &iter);
- }
- } while (!done);
+static void
+chapter_refresh_list_ui(signal_user_data_t *ud)
+{
+ GValue *chapter_list;
+ gint ii, count, tm_count;
+ GtkTreeView *tv;
+ GtkTreeModel *tm;
+ GtkTreeIter ti;
+ int title_id, titleindex;
+ const hb_title_t *title;
+
+ tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "chapters_list"));
+ tm = gtk_tree_view_get_model(tv);
+
+ tm_count = gtk_tree_model_iter_n_children(tm, NULL);
+
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ chapter_list = ghb_settings_get_value(ud->settings, "chapter_list");
+ count = ghb_array_len(chapter_list);
+ if (count != tm_count)
+ {
+ ghb_clear_chapter_list_ui(ud->builder);
+ for (ii = 0; ii < count; ii++)
+ {
+ gtk_list_store_append(GTK_LIST_STORE(tm), &ti);
+ }
 }
- while (ii < count)
+ for (ii = 0; ii < count; ii++)
 {
- gchar *chapter, *duration;
- gint hh, mm, ss;
-
- // Additional settings, add row
- g_debug("Adding row");
- chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
- ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
- duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
- 0, ii+1,
- 1, duration,
- 2, chapter,
- 3, TRUE,
- -1);
- g_free(chapter);
- g_free(duration);
- ii++;
+ gtk_tree_model_iter_nth_child(tm, &ti, NULL, ii);
+ chapter_refresh_list_row_ui(tm, &ti, chapter_list, title, ii);
 }
 }
 
-static void
-update_chapter_list_settings(GValue *settings)
+void
+ghb_chapter_list_refresh_all(signal_user_data_t *ud)
 {
- GValue *chapters;
- gint titleindex;
- 
- g_debug("update_chapter_list_settings ()");
- titleindex = ghb_settings_get_int(settings, "title_no");
- chapters = ghb_get_chapters(titleindex);
- if (chapters)
- ghb_settings_set_value(settings, "chapter_list", chapters);
+ chapter_refresh_list_ui(ud);
 }
 
 static void
-update_chapter_list_from_settings(GtkBuilder *builder, GValue *settings)
+update_chapter_list_settings(GValue *settings)
 {
- GtkTreeView *treeview;
- GtkTreeIter iter;
- GtkListStore *store;
- gboolean done;
 GValue *chapters;
- gint titleindex, ii;
- gint count;
- 
- g_debug("update_chapter_list ()");
- titleindex = ghb_settings_get_int(settings, "title_no");
- chapters = ghb_settings_get_value(settings, "chapter_list");
- count = ghb_array_len(chapters);
- 
- treeview = GTK_TREE_VIEW(GHB_WIDGET(builder, "chapters_list"));
- store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
- ii = 0;
- if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
- {
- do
- {
+ gint title_id, titleindex;
+ const hb_title_t *title;
 
- if (ii < count)
- {
- gchar *chapter, *duration;
- gint hh, mm, ss;
-
- // Update row with settings data
- g_debug("Updating row");
- chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
- ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
- duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
- gtk_list_store_set(store, &iter, 
- 0, ii+1,
- 1, duration,
- 2, chapter,
- 3, TRUE,
- -1);
- g_free(chapter);
- g_free(duration);
- ii++;
- done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
- }
- else
- {
- // No more settings data, remove row
- g_debug("Removing row");
- done = !gtk_list_store_remove(store, &iter);
- }
- } while (!done);
- }
- while (ii < count)
- {
- gchar *chapter, *duration;
- gint hh, mm, ss;
-
- // Additional settings, add row
- g_debug("Adding row");
- chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
- ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
- duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
- 0, ii+1,
- 1, duration,
- 2, chapter,
- 3, TRUE,
- -1);
- g_free(chapter);
- g_free(duration);
- ii++;
- }
+ g_debug("update_chapter_list_settings ()");
+ title_id = ghb_settings_get_int(settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ chapters = ghb_get_chapters(title);
+ if (chapters)
+ ghb_settings_take_value(settings, "chapter_list", chapters);
 }
 
 static gint chapter_edit_key = 0;
@@ -3696,9 +3802,9 @@
 
 G_MODULE_EXPORT void
 chapter_edited_cb(
- GhbCellRendererText *cell, 
- gchar *path, 
- gchar *text, 
+ GhbCellRendererText *cell,
+ gchar *path,
+ gchar *text,
 signal_user_data_t *ud)
 {
 GtkTreePath *treepath;
@@ -3708,7 +3814,7 @@
 gint index;
 gint *pi;
 gint row;
- 
+
 g_debug("chapter_edited_cb ()");
 g_debug("path (%s)", path);
 g_debug("text (%s)", text);
@@ -3718,9 +3824,9 @@
 pi = gtk_tree_path_get_indices(treepath);
 row = pi[0];
 gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath);
- gtk_list_store_set(store, &iter, 
- 2, text,
- 3, TRUE,
+ gtk_list_store_set(store, &iter,
+ 3, text,
+ 4, TRUE,
 -1);
 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, &index, -1);
 
@@ -3749,7 +3855,7 @@
 //
 // Now, you might be asking why I don't catch the keypress
 // event and determine what action to take based on that.
- // The Gtk developers in their infinite wisdom have made the 
+ // The Gtk developers in their infinite wisdom have made the
 // actual GtkEdit widget being used a private member of
 // GtkCellRendererText, so it can not be accessed to hang a
 // signal handler off of. And they also do not propagate the
@@ -3760,14 +3866,14 @@
 // I got industrious and made my own CellTextRendererText that
 // passes on the key-press-event. So now I have much better
 // control of this.
- column = gtk_tree_view_get_column(treeview, 2);
+ column = gtk_tree_view_get_column(treeview, 3);
 gtk_tree_view_set_cursor(treeview, treepath, column, TRUE);
 }
 else if (chapter_edit_key == GDK_KEY_Up && row > 0)
 {
 GtkTreeViewColumn *column;
 gtk_tree_path_prev(treepath);
- column = gtk_tree_view_get_column(treeview, 2);
+ column = gtk_tree_view_get_column(treeview, 3);
 gtk_tree_view_set_cursor(treeview, treepath, column, TRUE);
 }
 gtk_tree_path_free (treepath);
@@ -3777,7 +3883,7 @@
 debug_log_handler(const gchar *domain, GLogLevelFlags flags, const gchar *msg, gpointer data)
 {
 signal_user_data_t *ud = (signal_user_data_t*)data;
- 
+
 if (ud->debug)
 {
 printf("%s: %s\n", domain, msg);
@@ -3796,24 +3902,26 @@
 GtkWidget *widget;
 g_debug("ghb_hbfd");
 widget = GHB_WIDGET(ud->builder, "queue_pause1");
- set_visible(widget, !hbfd);
+ gtk_widget_set_visible(widget, !hbfd);
 widget = GHB_WIDGET(ud->builder, "queue_add");
- set_visible(widget, !hbfd);
+ gtk_widget_set_visible(widget, !hbfd);
 widget = GHB_WIDGET(ud->builder, "show_queue");
- set_visible(widget, !hbfd);
+ gtk_widget_set_visible(widget, !hbfd);
 widget = GHB_WIDGET(ud->builder, "show_activity");
- set_visible(widget, !hbfd);
+ gtk_widget_set_visible(widget, !hbfd);
 
 widget = GHB_WIDGET(ud->builder, "chapter_box");
- set_visible(widget, !hbfd);
+ gtk_widget_set_visible(widget, !hbfd);
 widget = GHB_WIDGET(ud->builder, "container_box");
- set_visible(widget, !hbfd);
- widget = GHB_WIDGET(ud->builder, "SettingsNotebook");
- set_visible(widget, !hbfd);
+ gtk_widget_set_visible(widget, !hbfd);
+ widget = GHB_WIDGET(ud->builder, "SettingsStackSwitcher");
+ gtk_widget_set_visible(widget, !hbfd);
+ widget = GHB_WIDGET(ud->builder, "SettingsStack");
+ gtk_widget_set_visible(widget, !hbfd);
 widget = GHB_WIDGET(ud->builder, "presets_save");
- set_visible(widget, !hbfd);
+ gtk_widget_set_visible(widget, !hbfd);
 widget = GHB_WIDGET(ud->builder, "presets_remove");
- set_visible(widget, !hbfd);
+ gtk_widget_set_visible(widget, !hbfd);
 widget = GHB_WIDGET (ud->builder, "hb_window");
 gtk_window_resize(GTK_WINDOW(widget), 16, 16);
 
@@ -3823,52 +3931,45 @@
 hbfd_toggled_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 g_debug("hbfd_toggled_cb");
- ghb_widget_to_setting (ud->settings, widget);
- gboolean hbfd = ghb_settings_get_boolean(ud->settings, "hbfd");
+ ghb_widget_to_setting(ud->prefs, widget);
+ gboolean hbfd = ghb_settings_get_boolean(ud->prefs, "hbfd");
 ghb_hbfd(ud, hbfd);
- ghb_pref_save(ud->settings, "hbfd");
-}
-
-G_MODULE_EXPORT void
-advanced_audio_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
- g_debug("advanced_audio_changed_cb");
- ghb_widget_to_setting (ud->settings, widget);
- ghb_check_dependency(ud, widget, NULL);
- const gchar *name = ghb_get_setting_key(widget);
- ghb_pref_save(ud->settings, name);
- ghb_show_hide_advanced_audio( ud );
+ ghb_pref_save(ud->prefs, "hbfd");
 }
 
 G_MODULE_EXPORT void
 advanced_video_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 g_debug("advanced_video_changed_cb");
- ghb_widget_to_setting (ud->settings, widget);
- ghb_check_dependency(ud, widget, NULL);
+ ghb_widget_to_setting(ud->prefs, widget);
 const gchar *name = ghb_get_setting_key(widget);
- ghb_pref_save(ud->settings, name);
- ghb_show_hide_advanced_video( ud );
+ ghb_pref_set(ud->prefs, name);
+ ghb_show_hide_advanced_video(ud);
 }
 
 G_MODULE_EXPORT void
 pref_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
- g_debug("pref_changed_cb");
- ghb_widget_to_setting (ud->settings, widget);
+ ghb_widget_to_setting (ud->prefs, widget);
+// FIXME?
 ghb_check_dependency(ud, widget, NULL);
 const gchar *name = ghb_get_setting_key(widget);
- ghb_pref_save(ud->settings, name);
+ ghb_pref_set(ud->prefs, name);
+
+ gint preview_count;
+ preview_count = ghb_settings_get_int(ud->prefs, "preview_count");
+ widget = GHB_WIDGET(ud->builder, "preview_frame");
+ gtk_range_set_range(GTK_RANGE(widget), 1, preview_count);
 }
 
 G_MODULE_EXPORT void
 use_m4v_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 g_debug("use_m4v_changed_cb");
- ghb_widget_to_setting (ud->settings, widget);
+ ghb_widget_to_setting (ud->prefs, widget);
 ghb_check_dependency(ud, widget, NULL);
 const gchar *name = ghb_get_setting_key(widget);
- ghb_pref_save(ud->settings, name);
+ ghb_pref_set(ud->prefs, name);
 ghb_update_destination_extension(ud);
 }
 
@@ -3876,15 +3977,15 @@
 show_status_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 g_debug("show_status_cb");
- ghb_widget_to_setting (ud->settings, widget);
+ ghb_widget_to_setting (ud->prefs, widget);
 ghb_check_dependency(ud, widget, NULL);
 const gchar *name = ghb_get_setting_key(widget);
- ghb_pref_save(ud->settings, name);
+ ghb_pref_set(ud->prefs, name);
 
 #if defined(_USE_APP_IND)
 if (ud->ai)
 {
- if (ghb_settings_get_boolean(ud->settings, "show_status"))
+ if (ghb_settings_get_boolean(ud->prefs, "show_status"))
 {
 app_indicator_set_status(ud->ai, APP_INDICATOR_STATUS_ACTIVE);
 }
@@ -3893,12 +3994,6 @@
 app_indicator_set_status(ud->ai, APP_INDICATOR_STATUS_PASSIVE);
 }
 }
-#else
- GtkStatusIcon *si;
-
- si = GTK_STATUS_ICON(GHB_OBJECT (ud->builder, "hb_status"));
- gtk_status_icon_set_visible(si,
- ghb_settings_get_boolean(ud->settings, "show_status"));
 #endif
 }
 
@@ -3906,110 +4001,107 @@
 vqual_granularity_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 g_debug("vqual_granularity_changed_cb");
- ghb_widget_to_setting (ud->settings, widget);
+ ghb_widget_to_setting (ud->prefs, widget);
 ghb_check_dependency(ud, widget, NULL);
 
 const gchar *name = ghb_get_setting_key(widget);
- ghb_pref_save(ud->settings, name);
+ ghb_pref_set(ud->prefs, name);
 
- gdouble vqmin, vqmax, step, page;
- gboolean inverted;
- gint digits;
+ float val, vqmin, vqmax, step, page;
+ int inverted, digits;
 
 ghb_vquality_range(ud, &vqmin, &vqmax, &step, &page, &digits, &inverted);
- GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
- gtk_range_set_increments (GTK_RANGE(qp), step, page);
- gtk_scale_set_digits(GTK_SCALE(qp), digits);
+ val = ghb_settings_get_double(ud->settings, "VideoQualitySlider");
+ ghb_scale_configure(ud, "VideoQualitySlider", val, vqmin, vqmax,
+ step, page, digits, inverted);
 }
 
 G_MODULE_EXPORT void
 tweaks_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 g_debug("tweaks_changed_cb");
- ghb_widget_to_setting (ud->settings, widget);
+ ghb_widget_to_setting (ud->prefs, widget);
 const gchar *name = ghb_get_setting_key(widget);
- ghb_pref_save(ud->settings, name);
+ ghb_pref_set(ud->prefs, name);
 }
 
 G_MODULE_EXPORT void
 hbfd_feature_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 g_debug("hbfd_feature_changed_cb");
- ghb_widget_to_setting (ud->settings, widget);
+ ghb_widget_to_setting (ud->prefs, widget);
 const gchar *name = ghb_get_setting_key(widget);
- ghb_pref_save(ud->settings, name);
+ ghb_pref_set(ud->prefs, name);
 
- gboolean hbfd = ghb_settings_get_boolean(ud->settings, "hbfd_feature");
- GtkAction *action;
+ gboolean hbfd = ghb_settings_get_boolean(ud->prefs, "hbfd_feature");
 if (hbfd)
 {
 const GValue *val;
- val = ghb_settings_get_value(ud->settings, "hbfd");
- ghb_ui_update(ud, "hbfd", val);
+ val = ghb_settings_get_value(ud->prefs, "hbfd");
+ ghb_ui_settings_update(ud, ud->prefs, "hbfd", val);
 }
- action = GHB_ACTION (ud->builder, "hbfd");
- gtk_action_set_visible(action, hbfd);
+ widget = GHB_WIDGET(ud->builder, "hbfd");
+ gtk_widget_set_visible(widget, hbfd);
 }
 
 gboolean
 ghb_file_menu_add_dvd(signal_user_data_t *ud)
 {
 GList *link, *drives;
- static GtkActionGroup *agroup = NULL;
- static gint merge_id;
+ static GList *dvd_items = NULL;
 
 g_debug("ghb_file_menu_add_dvd()");
+ GtkMenu *menu = GTK_MENU(GHB_WIDGET(ud->builder, "file_submenu"));
+
+ // Clear previous dvd items from list
+ link = dvd_items;
+ while (link != NULL)
+ {
+ GtkWidget * widget = GTK_WIDGET(link->data);
+ // widget_destroy automatically removes widget from container.
+ gtk_widget_destroy(widget);
+ link = link->next;
+ }
+ g_list_free(dvd_items);
+ dvd_items = NULL;
+
+ int pos = 5;
 link = drives = dvd_device_list();
 if (drives != NULL)
 {
- GtkUIManager *ui = GTK_UI_MANAGER(
- gtk_builder_get_object(ud->builder, "uimanager1"));
-
- if (agroup == NULL)
- {
- agroup = gtk_action_group_new("dvdgroup");
- gtk_ui_manager_insert_action_group(ui, agroup, 0);
- }
- else
- gtk_ui_manager_remove_ui(ui, merge_id);
+ GtkWidget *widget = gtk_separator_menu_item_new();
+ dvd_items = g_list_append(dvd_items, (gpointer)widget);
 
- merge_id = gtk_ui_manager_new_merge_id(ui);
- // Add separator
- gtk_ui_manager_add_ui(ui, merge_id, 
- "ui/menubar1/menuitem1/quit1", "dvdsep", NULL,
- GTK_UI_MANAGER_SEPARATOR, TRUE);
+ gtk_menu_shell_insert(GTK_MENU_SHELL(menu), widget, pos++);
+ gtk_widget_set_visible(widget, TRUE);
 
 while (link != NULL)
 {
- GtkAction *action;
+ GtkWidget *widget;
 gchar *drive = get_dvd_device_name(link->data);
 gchar *name = get_dvd_volume_name(link->data);
- 
- action = gtk_action_group_get_action(agroup, drive);
- if (action != NULL)
- {
- gtk_action_group_remove_action(agroup, action);
- g_object_unref(G_OBJECT(action));
- }
- // Create action for this drive
- action = gtk_action_new(drive, name,
- "Scan this DVD source", "gtk-cdrom");
- // Add action to action group
- gtk_action_group_add_action_with_accel(agroup, action, NULL);
- // Add to ui manager
- gtk_ui_manager_add_ui(ui, merge_id, 
- "ui/menubar1/menuitem1/dvdsep", drive, drive,
- GTK_UI_MANAGER_AUTO, TRUE);
+
+ widget = gtk_menu_item_new_with_label(name);
+ gtk_buildable_set_name(GTK_BUILDABLE(widget), drive);
+ gtk_widget_set_tooltip_text(widget, _("Scan this DVD source"));
+
+ dvd_items = g_list_append(dvd_items, (gpointer)widget);
+ gtk_menu_shell_insert(GTK_MENU_SHELL(menu), widget, pos++);
+
+ gtk_widget_set_visible(widget, TRUE);
+
 // Connect signal to action (menu item)
- g_signal_connect(action, "activate", 
+ g_signal_connect(widget, "activate",
 (GCallback)dvd_source_activate_cb, ud);
 g_free(name);
 g_free(drive);
 free_drive(link->data);
 link = link->next;
 }
+
 g_list_free(drives);
 }
+
 return FALSE;
 }
 
@@ -4036,7 +4128,7 @@
 dtype = GetDriveType(drive);
 if (dtype == DRIVE_CDROM)
 {
- dvd_devices = g_list_append(dvd_devices, 
+ dvd_devices = g_list_append(dvd_devices,
 (gpointer)g_strdup(drive));
 }
 }
@@ -4045,14 +4137,14 @@
 #else
 GVolumeMonitor *gvm;
 GList *drives, *link;
- 
+
 gvm = g_volume_monitor_get ();
 drives = g_volume_monitor_get_connected_drives (gvm);
 link = drives;
 while (link != NULL)
 {
 GDrive *gd;
- 
+
 gd = (GDrive*)link->data;
 if (ghb_is_cd(gd))
 {
@@ -4097,6 +4189,7 @@
 
 gint val;
 val = g_udev_device_get_property_as_int(udd, "ID_CDROM_DVD");
+ g_object_unref(udd);
 if (val == 1)
 return TRUE;
 
@@ -4136,15 +4229,15 @@
 {
 GHB_THREAD_NEW("Cache Volume Names",
 (GThreadFunc)ghb_cache_volnames, ud);
- if (ghb_settings_get_boolean(ud->settings, "AutoScan") &&
+ if (ghb_settings_get_boolean(ud->prefs, "AutoScan") &&
 ud->current_dvd_device != NULL &&
 strcmp(device, ud->current_dvd_device) == 0)
 {
 show_scan_progress(ud);
- update_source_label(ud, device, TRUE);
+ update_source_label(ud, device);
 gint preview_count;
- preview_count = ghb_settings_get_int(ud->settings, "preview_count");
- ghb_settings_set_string(ud->settings, "scan_source", device);
+ preview_count = ghb_settings_get_int(ud->prefs, "preview_count");
+ ghb_settings_set_string(ud->globals, "scan_source", device);
 start_scan(ud, device, 0, preview_count);
 }
 }
@@ -4162,7 +4255,7 @@
 {
 ghb_hb_cleanup(TRUE);
 prune_logs(ud);
- ghb_settings_set_string(ud->settings, "scan_source", "/dev/null");
+ ghb_settings_set_string(ud->globals, "scan_source", "/dev/null");
 start_scan(ud, "/dev/null", 0, 1);
 }
 }
@@ -4243,13 +4336,13 @@
 }
 if (g_drive_has_media(gd))
 {
- if (ghb_settings_get_boolean(ud->settings, "AutoScan"))
+ if (ghb_settings_get_boolean(ud->prefs, "AutoScan"))
 {
 show_scan_progress(ud);
- update_source_label(ud, device, TRUE);
+ update_source_label(ud, device);
 gint preview_count;
- preview_count = ghb_settings_get_int(ud->settings, "preview_count");
- ghb_settings_set_string(ud->settings, "scan_source", device);
+ preview_count = ghb_settings_get_int(ud->prefs, "preview_count");
+ ghb_settings_set_string(ud->globals, "scan_source", device);
 start_scan(ud, device, 0, preview_count);
 }
 }
@@ -4257,7 +4350,7 @@
 {
 ghb_hb_cleanup(TRUE);
 prune_logs(ud);
- ghb_settings_set_string(ud->settings, "scan_source", "/dev/null");
+ ghb_settings_set_string(ud->globals, "scan_source", "/dev/null");
 start_scan(ud, "/dev/null", 0, 1);
 }
 }
@@ -4268,7 +4361,7 @@
 #define GPM_DBUS_PM_PATH "/org/freedesktop/PowerManagement"
 #define GPM_DBUS_PM_INTERFACE "org.freedesktop.PowerManagement"
 #define GPM_DBUS_INHIBIT_PATH "/org/freedesktop/PowerManagement/Inhibit"
-#define GPM_DBUS_INHIBIT_INTERFACE "org.freedesktop.PowerManagement.Inhibit" 
+#define GPM_DBUS_INHIBIT_INTERFACE "org.freedesktop.PowerManagement.Inhibit"
 static gboolean gpm_inhibited = FALSE;
 static guint gpm_cookie = -1;
 #endif
@@ -4282,7 +4375,7 @@
 DBusGProxy *proxy;
 GError *error = NULL;
 gboolean res;
- 
+
 
 g_debug("ghb_can_suspend_gpm()");
 conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
@@ -4330,7 +4423,7 @@
 DBusGProxy *proxy;
 GError *error = NULL;
 gboolean res;
- 
+
 
 g_debug("ghb_suspend_gpm()");
 conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
@@ -4375,7 +4468,7 @@
 DBusGProxy *proxy;
 GError *error = NULL;
 gboolean res;
- 
+
 
 g_debug("ghb_can_shutdown_gpm()");
 conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
@@ -4423,7 +4516,7 @@
 DBusGProxy *proxy;
 GError *error = NULL;
 gboolean res;
- 
+
 
 g_debug("ghb_shutdown_gpm()");
 conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
@@ -4467,7 +4560,7 @@
 DBusGProxy *proxy;
 GError *error = NULL;
 gboolean res;
- 
+
 
 if (gpm_inhibited)
 {
@@ -4523,7 +4616,7 @@
 DBusGProxy *proxy;
 GError *error = NULL;
 gboolean res;
- 
+
 g_debug("ghb_uninhibit_gpm() gpm_cookie %u", gpm_cookie);
 
 if (!gpm_inhibited)
@@ -4584,7 +4677,7 @@
 DBusGProxy *proxy;
 GError *error = NULL;
 gboolean res;
- 
+
 
 g_debug("ghb_can_shutdown_gpm()");
 conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
@@ -4631,7 +4724,7 @@
 DBusGProxy *proxy;
 GError *error = NULL;
 gboolean res;
- 
+
 
 g_debug("ghb_shutdown_gpm()");
 conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
@@ -4676,7 +4769,7 @@
 gboolean res;
 guint xid;
 GtkWidget *widget;
- 
+
 
 if (gpm_inhibited)
 {
@@ -4735,7 +4828,7 @@
 DBusGProxy *proxy;
 GError *error = NULL;
 gboolean res;
- 
+
 g_debug("ghb_uninhibit_gsm() gpm_cookie %u", gpm_cookie);
 
 if (!gpm_inhibited)
@@ -4776,10 +4869,10 @@
 #endif
 }
 
-G_MODULE_EXPORT gboolean 
+G_MODULE_EXPORT gboolean
 tweak_setting_cb(
- GtkWidget *widget, 
- GdkEventButton *event, 
+ GtkWidget *widget,
+ GdkEventButton *event,
 signal_user_data_t *ud)
 {
 const gchar *name;
@@ -4788,7 +4881,7 @@
 gboolean allow_tweaks;
 
 g_debug("press %d %d", event->type, event->button);
- allow_tweaks = ghb_settings_get_boolean(ud->settings, "allow_tweaks");
+ allow_tweaks = ghb_settings_get_boolean(ud->prefs, "allow_tweaks");
 if (allow_tweaks && event->type == GDK_BUTTON_PRESS && event->button == 3)
 { // Its a right mouse click
 GtkWidget *dialog;
@@ -4826,9 +4919,9 @@
 {
 gchar *message;
 message = g_strdup_printf(
- "Invalid Settings:\n%s",
+ _("Invalid Settings:\n%s"),
 tweak);
- ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+ ghb_message_dialog(GTK_MESSAGE_ERROR, message, _("Cancel"), NULL);
 g_free(message);
 }
 }
@@ -4838,10 +4931,10 @@
 return ret;
 }
 
-G_MODULE_EXPORT gboolean 
+G_MODULE_EXPORT gboolean
 easter_egg_cb(
- GtkWidget *widget, 
- GdkEventButton *event, 
+ GtkWidget *widget,
+ GdkEventButton *event,
 signal_user_data_t *ud)
 {
 g_debug("press %d %d", event->type, event->button);
@@ -4869,7 +4962,7 @@
 {
 if (val < 5.0)
 {
- return g_strdup_printf("Off");
+ return g_strdup_printf(_("Off"));
 }
 else
 {
@@ -4880,37 +4973,34 @@
 G_MODULE_EXPORT gchar*
 format_vquality_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
 {
- gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
+ gint vcodec;
+ const char *vqname;
+
+ vcodec = ghb_settings_video_encoder_codec(ud->settings, "VideoEncoder");
+ vqname = hb_video_quality_get_name(vcodec);
 switch (vcodec)
 {
- case HB_VCODEC_X264:
- {
- if (val == 0.0)
- {
- return g_strdup_printf("RF: %.4g (Warning: lossless)", val);
- }
- else
- {
- return g_strdup_printf("RF: %.4g", val);
- }
- } break;
-
 case HB_VCODEC_FFMPEG_MPEG4:
 case HB_VCODEC_FFMPEG_MPEG2:
- {
- return g_strdup_printf("QP: %d", (int)val);
- } break;
-
+ case HB_VCODEC_FFMPEG_VP8:
 case HB_VCODEC_THEORA:
 {
- return g_strdup_printf("QP: %d", (int)val);
+ return g_strdup_printf("%s: %d", vqname, (int)val);
 } break;
 
+ case HB_VCODEC_X264:
+ {
+ if (val == 0.0)
+ {
+ return g_strdup_printf(_("%s: %.4g (Warning: lossless)"),
+ vqname, val);
+ }
+ } // Falls through to default
 default:
 {
+ return g_strdup_printf("%s: %.4g", vqname, val);
 } break;
 }
- return g_strdup_printf("QP: %.4g", val);
 }
 
 static void
@@ -4924,7 +5014,7 @@
 GtkWidget *dialog, *label;
 gint response, ibuild = 0, skip;
 
- if (ud->appcast == NULL || ud->appcast_len < 15 || 
+ if (ud->appcast == NULL || ud->appcast_len < 15 ||
 strncmp(&(ud->appcast[9]), "200 OK", 6))
 {
 goto done;
@@ -4932,13 +5022,13 @@
 ghb_appcast_parse(ud->appcast, &description, &build, &version);
 if (build)
 ibuild = g_strtod(build, NULL);
- skip = ghb_settings_get_int(ud->settings, "update_skip_version");
- if (description == NULL || build == NULL || version == NULL 
+ skip = ghb_settings_get_int(ud->prefs, "update_skip_version");
+ if (description == NULL || build == NULL || version == NULL
 || ibuild <= hb_get_build(NULL) || skip == ibuild)
 {
 goto done;
 }
- msg = g_strdup_printf("HandBrake %s/%s is now available (you have %s/%d).",
+ msg = g_strdup_printf(_("HandBrake %s/%s is now available (you have %s/%d)."),
 version, build, hb_get_version(NULL), hb_get_build(NULL));
 label = GHB_WIDGET(ud->builder, "update_message");
 gtk_label_set_text(GTK_LABEL(label), msg);
@@ -4961,8 +5051,8 @@
 if (response == GTK_RESPONSE_OK)
 {
 // Skip
- ghb_settings_set_int(ud->settings, "update_skip_version", ibuild);
- ghb_pref_save(ud->settings, "update_skip_version");
+ ghb_settings_set_int(ud->prefs, "update_skip_version", ibuild);
+ ghb_pref_save(ud->prefs, "update_skip_version");
 }
 g_free(msg);
 
@@ -4995,7 +5085,7 @@
 gsize len;
 GError *gerror = NULL;
 GIOStatus status;
- 
+
 g_debug("ghb_net_recv_cb");
 signal_user_data_t *ud = (signal_user_data_t*)data;
 
@@ -5111,8 +5201,8 @@
 
 G_MODULE_EXPORT gboolean
 hb_visibility_event_cb(
- GtkWidget *widget, 
- GdkEventVisibility *vs, 
+ GtkWidget *widget,
+ GdkEventVisibility *vs,
 signal_user_data_t *ud)
 {
 ud->hb_visibility = vs->state;
@@ -5120,27 +5210,6 @@
 }
 
 G_MODULE_EXPORT void
-status_activate_cb(GtkStatusIcon *si, signal_user_data_t *ud)
-{
- GtkWindow *window;
- GdkWindowState state;
-
- window = GTK_WINDOW(GHB_WIDGET(ud->builder, "hb_window"));
- state = gdk_window_get_state(gtk_widget_get_window(GTK_WIDGET(window)));
- if ((state & GDK_WINDOW_STATE_ICONIFIED) ||
- (ud->hb_visibility != GDK_VISIBILITY_UNOBSCURED))
- {
- gtk_window_present(window);
- gtk_window_set_skip_taskbar_hint(window, FALSE);
- }
- else
- {
- gtk_window_set_skip_taskbar_hint(window, TRUE);
- gtk_window_iconify(window);
- }
-}
-
-G_MODULE_EXPORT void
 show_hide_toggle_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
 GtkWindow *window;
@@ -5173,22 +5242,19 @@
 ghb_notify_done(signal_user_data_t *ud)
 {
 
- if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 0)
+ if (ghb_settings_combo_int(ud->prefs, "WhenComplete") == 0)
 return;
 
 #if !defined(_WIN32)
 NotifyNotification *notification;
 notification = notify_notification_new(
- "Encode Complete",
- "Put down that cocktail, Your HandBrake queue is done!",
+ _("Encode Complete"),
+ _("Put down that cocktail, Your HandBrake queue is done!"),
 NULL
 #if NOTIFY_CHECK_VERSION (0, 7, 0)
 );
 #else
 ,NULL);
-
- GtkStatusIcon *si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
- notify_notification_attach_to_status_icon(notification, si);
 #endif
 GtkIconTheme *theme = gtk_icon_theme_get_default();
 GdkPixbuf *pb = gtk_icon_theme_load_icon(theme, "hb-icon", 32,
@@ -5199,32 +5265,32 @@
 g_object_unref(G_OBJECT(pb));
 #endif
 
- if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 3)
+ if (ghb_settings_combo_int(ud->prefs, "WhenComplete") == 3)
 {
 if (ghb_can_shutdown_gsm())
 {
- ghb_countdown_dialog(GTK_MESSAGE_WARNING, 
- "Your encode is complete.",
- "Shutting down the computer", 
- "Cancel", (GSourceFunc)shutdown_cb, ud, 60);
+ ghb_countdown_dialog(GTK_MESSAGE_WARNING,
+ _("Your encode is complete."),
+ _("Shutting down the computer"),
+ _("Cancel"), (GSourceFunc)shutdown_cb, ud, 60);
 }
 }
- if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 2)
+ if (ghb_settings_combo_int(ud->prefs, "WhenComplete") == 2)
 {
 if (ghb_can_suspend_gpm())
 {
- ghb_countdown_dialog(GTK_MESSAGE_WARNING, 
- "Your encode is complete.",
- "Putting computer to sleep", 
- "Cancel", (GSourceFunc)suspend_cb, ud, 60);
+ ghb_countdown_dialog(GTK_MESSAGE_WARNING,
+ _("Your encode is complete."),
+ _("Putting computer to sleep"),
+ _("Cancel"), (GSourceFunc)suspend_cb, ud, 60);
 }
 }
- if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 4)
- {
- ghb_countdown_dialog(GTK_MESSAGE_WARNING, 
- "Your encode is complete.",
- "Quiting Handbrake", 
- "Cancel", (GSourceFunc)quit_cb, ud, 60);
+ if (ghb_settings_combo_int(ud->prefs, "WhenComplete") == 4)
+ {
+ ghb_countdown_dialog(GTK_MESSAGE_WARNING,
+ _("Your encode is complete."),
+ _("Quiting Handbrake"),
+ _("Cancel"), (GSourceFunc)quit_cb, ud, 60);
 }
 }
 
@@ -5238,18 +5304,28 @@
 if (gtk_widget_get_visible(widget))
 {
 gint w, h;
- w = ghb_settings_get_int(ud->settings, "window_width");
- h = ghb_settings_get_int(ud->settings, "window_height");
+ w = ghb_settings_get_int(ud->prefs, "window_width");
+ h = ghb_settings_get_int(ud->prefs, "window_height");
 
 if ( w != event->width || h != event->height )
 {
- ghb_settings_set_int(ud->settings, "window_width", event->width);
- ghb_settings_set_int(ud->settings, "window_height", event->height);
- ghb_pref_set(ud->settings, "window_width");
- ghb_pref_set(ud->settings, "window_height");
+ ghb_settings_set_int(ud->prefs, "window_width", event->width);
+ ghb_settings_set_int(ud->prefs, "window_height", event->height);
+ ghb_pref_set(ud->prefs, "window_width");
+ ghb_pref_set(ud->prefs, "window_height");
 ghb_prefs_store();
 }
 }
 return FALSE;
 }
 
+static void container_empty_cb(GtkWidget *widget, gpointer data)
+{
+ gtk_widget_destroy(widget);
+}
+
+void ghb_container_empty(GtkContainer *c)
+{
+ gtk_container_foreach(c, container_empty_cb, NULL);
+}
+

HandBrake-0.9.9.tar.bz2/gtk/src/callbacks.h -> HandBrake-0.10.0.tar.bz2/gtk/src/callbacks.h Changed

@@ -2,19 +2,19 @@
 /*
 * callbacks.h
 * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
- * 
+ *
 * callbacks.h is free software.
- * 
+ *
 * You may 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.
- * 
+ *
 * callbacks.h 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.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with callbacks.h. If not, write to:
 * The Free Software Foundation, Inc.,
@@ -30,6 +30,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include "hb.h"
 #include "settings.h"
 
 #if GLIB_CHECK_VERSION(2, 32, 0)
@@ -51,17 +52,17 @@
 gboolean ghb_file_menu_add_dvd(signal_user_data_t *ud);
 void ghb_udev_init(void);
 gboolean ghb_message_dialog(
- GtkMessageType type, const gchar *message, 
+ GtkMessageType type, const gchar *message,
 const gchar *no, const gchar *yes);
 void ghb_error_dialog(
 GtkMessageType type, const gchar *message, const gchar *cancel);
 void ghb_init_dep_map(void);
 void ghb_cancel_encode(signal_user_data_t *ud, const gchar *extra_msg);
 gboolean ghb_cancel_encode2(signal_user_data_t *ud, const gchar *extra_msg);
-GValue* ghb_start_next_job(signal_user_data_t *ud, gboolean find_first);
+GValue* ghb_start_next_job(signal_user_data_t *ud);
 void ghb_check_dependency(
 signal_user_data_t *ud, GtkWidget *widget, const gchar *alt_name);
-void ghb_do_scan( signal_user_data_t *ud, const gchar *filename, 
+void ghb_do_scan( signal_user_data_t *ud, const gchar *filename,
 gint titlenum, gboolean force);
 void ghb_log(gchar *log, ...);
 gpointer ghb_check_update(signal_user_data_t *ud);
@@ -76,6 +77,15 @@
 void ghb_update_pending(signal_user_data_t *ud);
 gboolean ghb_idle_scan(signal_user_data_t *ud);
 void ghb_add_all_titles(signal_user_data_t *ud);
+void ghb_update_title_info(signal_user_data_t *ud);
+void ghb_chapter_list_refresh_all(signal_user_data_t *ud);
+void ghb_load_settings(signal_user_data_t * ud);
+void ghb_set_current_title_settings(signal_user_data_t *ud);
+void ghb_container_empty(GtkContainer *c);
+void ghb_show_container_options(signal_user_data_t *ud);
+void ghb_scale_configure(signal_user_data_t *ud, char *name, double val,
+ double min, double max, double step, double page,
+ int digits, gboolean inverted);
 
 #endif // _CALLBACKS_H_

HandBrake-0.9.9.tar.bz2/gtk/src/create_resources.c -> HandBrake-0.10.0.tar.bz2/gtk/src/create_resources.c Changed

@@ -4,7 +4,6 @@
 #include <string.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include "icon_tools.h"
 #include "plist.h"
 #include "values.h"
 #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -76,8 +75,8 @@
 
 static const gchar*
 lookup_attr_value(
- const gchar *name, 
- const gchar **attr_names, 
+ const gchar *name,
+ const gchar **attr_names,
 const gchar **attr_values)
 {
 gint ii;
@@ -90,16 +89,16 @@
 }
 return NULL;
 }
- 
+
 static GValue*
-read_string_from_file(const gchar *filename)
+read_string_from_file(const gchar *fname)
 {
 gchar *buffer;
 size_t size;
 GValue *gval;
 FILE *fd;
 
- fd = g_fopen(filename, "r");
+ fd = g_fopen(fname, "r");
 if (fd == NULL)
 return NULL;
 fseek(fd, 0, SEEK_END);
@@ -114,17 +113,76 @@
 return gval;
 }
 
+static void add_icon(GValue *dict, const char *fname)
+{
+ FILE *f;
+
+ GdkPixbufFormat *pbf;
+ int width, height;
+ gboolean svg;
+
+ pbf = gdk_pixbuf_get_file_info(fname, &width, &height);
+ svg = gdk_pixbuf_format_is_scalable(pbf);
+
+ f = fopen(fname, "rb");
+ if (f == NULL)
+ {
+ fprintf(stderr, "open failed: %s\n", fname);
+ return;
+ }
+
+ ghb_rawdata_t *rd;
+ rd = g_malloc(sizeof(ghb_rawdata_t));
+ fseek(f, 0, SEEK_END);
+ rd->size = ftell(f);
+ fseek(f, 0, SEEK_SET);
+
+ rd->data = g_malloc(rd->size);
+ fread(rd->data, 1, rd->size, f);
+ 
+ GValue *data = ghb_rawdata_value_new(rd);
+ ghb_dict_insert(dict, g_strdup("svg"), ghb_boolean_value_new(svg));
+ ghb_dict_insert(dict, g_strdup("data"), data);
+}
+
+static void insert_value(GValue *container, const char *key, GValue *element)
+{
+ GType gtype;
+
+ gtype = G_VALUE_TYPE(container);
+ if (gtype == ghb_array_get_type())
+ {
+ ghb_array_append(container, element);
+ }
+ else if (gtype == ghb_dict_get_type())
+ {
+ if (key == NULL)
+ {
+ g_warning("No key for dictionary item");
+ ghb_value_free(element);
+ }
+ else
+ {
+ ghb_dict_insert(container, g_strdup(key), element);
+ }
+ }
+ else
+ {
+ g_error("Invalid container type. This shouldn't happen");
+ }
+}
+
 static void
 start_element(
- GMarkupParseContext *ctx, 
- const gchar *tag, 
+ GMarkupParseContext *ctx,
+ const gchar *tag,
 const gchar **attr_names,
 const gchar **attr_values,
 gpointer ud,
 GError **error)
 {
 parse_data_t *pd = (parse_data_t*)ud;
- union 
+ union
 {
 gint id;
 gpointer pid;
@@ -170,54 +228,20 @@
 } break;
 case R_ICON:
 {
- gchar *filename;
+ gchar *fname;
 const gchar *name;
 
 name = lookup_attr_value("file", attr_names, attr_values);
- filename = find_file(inc_list, name);
+ fname = find_file(inc_list, name);
 name = lookup_attr_value("name", attr_names, attr_values);
- if (filename && name)
+ if (fname && name)
 {
- ghb_rawdata_t *rd;
- GdkPixbuf *pb;
- GError *err = NULL;
-
- pb = gdk_pixbuf_new_from_file(filename, &err);
- if (pb == NULL)
- {
- g_warning("Failed to open icon file %s: %s", filename, err->message);
- break;
- }
 gval = ghb_dict_value_new();
- int colorspace = gdk_pixbuf_get_colorspace(pb);
- gboolean alpha = gdk_pixbuf_get_has_alpha(pb);
- int width = gdk_pixbuf_get_width(pb);
- int height = gdk_pixbuf_get_height(pb);
- int bps = gdk_pixbuf_get_bits_per_sample(pb);
- int rowstride = gdk_pixbuf_get_rowstride(pb);
-
- ghb_dict_insert(gval, g_strdup("colorspace"), 
- ghb_int_value_new(colorspace));
- ghb_dict_insert(gval, g_strdup("alpha"), 
- ghb_boolean_value_new(alpha));
- ghb_dict_insert(gval, g_strdup("width"), 
- ghb_int_value_new(width));
- ghb_dict_insert(gval, g_strdup("height"), 
- ghb_int_value_new(height));
- ghb_dict_insert(gval, g_strdup("bps"), 
- ghb_int_value_new(bps));
- ghb_dict_insert(gval, g_strdup("rowstride"), 
- ghb_int_value_new(rowstride));
-
- rd = g_malloc(sizeof(ghb_rawdata_t));
- rd->data = gdk_pixbuf_get_pixels(pb);
- rd->size = height * rowstride * bps / 8;
- GValue *data = ghb_rawdata_value_new(rd);
- ghb_dict_insert(gval, g_strdup("data"), data);
+ add_icon(gval, fname);
 
- if (pd->key) g_free(pd->key);
+ g_free(pd->key);
 pd->key = g_strdup(name);
- g_free(filename);
+ g_free(fname);
 }
 else
 {
@@ -227,18 +251,18 @@
 } break;
 case R_PLIST:
 {
- gchar *filename;
+ gchar *fname;
 const gchar *name;
 
 name = lookup_attr_value("file", attr_names, attr_values);
- filename = find_file(inc_list, name);
+ fname = find_file(inc_list, name);
 name = lookup_attr_value("name", attr_names, attr_values);
- if (filename && name)
+ if (fname && name)
 {
- gval = ghb_plist_parse_file(filename);
+ gval = ghb_plist_parse_file(fname);
 if (pd->key) g_free(pd->key);
 pd->key = g_strdup(name);
- g_free(filename);
+ g_free(fname);
 }
 else
 {
@@ -248,18 +272,18 @@
 } break;
 case R_STRING:
 {
- gchar *filename;
+ gchar *fname;
 const gchar *name;
 
 name = lookup_attr_value("file", attr_names, attr_values);
- filename = find_file(inc_list, name);
+ fname = find_file(inc_list, name);
 name = lookup_attr_value("name", attr_names, attr_values);
- if (filename && name)
+ if (fname && name)
 {
- gval = read_string_from_file(filename);
+ gval = read_string_from_file(fname);
 if (pd->key) g_free(pd->key);
 pd->key = g_strdup(name);
- g_free(filename);
+ g_free(fname);
 }
 else
 {
@@ -276,40 +300,20 @@
 pd->plist = gval;
 return;
 }
- gtype = G_VALUE_TYPE(current);
- if (gtype == ghb_array_get_type())
- {
- ghb_array_append(current, gval);
- }
- else if (gtype == ghb_dict_get_type())
- {
- if (pd->key == NULL)
- {
- g_warning("No key for dictionary item");
- ghb_value_free(gval);
- }
- else
- {
- ghb_dict_insert(current, g_strdup(pd->key), gval);
- }
- }
- else
- {
- g_error("Invalid container type. This shouldn't happen");
- }
+ insert_value(current, pd->key, gval);
 }
 }
 
 static void
 end_element(
- GMarkupParseContext *ctx, 
- const gchar *name, 
+ GMarkupParseContext *ctx,
+ const gchar *name,
 gpointer ud,
 GError **error)
 {
 parse_data_t *pd = (parse_data_t*)ud;
 gint id;
- union 
+ union
 {
 gint id;
 gpointer pid;
@@ -358,27 +362,7 @@
 pd->closed_top = TRUE;
 return;
 }
- gtype = G_VALUE_TYPE(current);
- if (gtype == ghb_array_get_type())
- {
- ghb_array_append(current, gval);
- }
- else if (gtype == ghb_dict_get_type())
- {
- if (pd->key == NULL)
- {
- g_warning("No key for dictionary item");
- ghb_value_free(gval);
- }
- else
- {
- ghb_dict_insert(current, g_strdup(pd->key), gval);
- }
- }
- else
- {
- g_error("Invalid container type. This shouldn't happen");
- }
+ insert_value(current, pd->key, gval);
 }
 if (g_queue_is_empty(pd->tag_stack))
 pd->closed_top = TRUE;
@@ -386,8 +370,8 @@
 
 static void
 text_data(
- GMarkupParseContext *ctx, 
- const gchar *text, 
+ GMarkupParseContext *ctx,
+ const gchar *text,
 gsize len,
 gpointer ud,
 GError **error)
@@ -399,8 +383,8 @@
 
 static void
 passthrough(
- GMarkupParseContext *ctx, 
- const gchar *text, 
+ GMarkupParseContext *ctx,
+ const gchar *text,
 gsize len,
 gpointer ud,
 GError **error)
@@ -417,7 +401,7 @@
 }
 
 // This is required or the parser crashes
-static void 
+static void
 destroy_notify(gpointer data)
 { // Do nothing
 //g_debug("destroy parser");
@@ -521,7 +505,10 @@
 src = argv[optind++];
 dst = argv[optind++];
 
+#if !GLIB_CHECK_VERSION(2, 36, 0)
 g_type_init();
+#endif
+
 file = g_fopen(src, "r");
 if (file == NULL)
 {

HandBrake-0.9.9.tar.bz2/gtk/src/create_resources.py -> HandBrake-0.10.0.tar.bz2/gtk/src/create_resources.py Changed

HandBrake-0.9.9.tar.bz2/gtk/src/ghb-dvd.c -> HandBrake-0.10.0.tar.bz2/gtk/src/ghb-dvd.c Changed

@@ -11,17 +11,17 @@
 * 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.
- * 
+ *
 * This program 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 Library General Public License for more details.
- * 
+ *
 * 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., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
 */
- 
+
 // Well, I waisted a bit of time on this. It seems libhb has a function for
 // this that I hadn't discovered yet. hb_dvd_name().
 
@@ -89,7 +89,7 @@
 } PACKED;
 
 #define VOLUME_ID_LABEL_SIZE 64
-typedef struct 
+typedef struct
 {
 gint fd;
 gchar label[VOLUME_ID_LABEL_SIZE+1];
@@ -128,14 +128,14 @@
 get_buffer(int fd, guint64 off, gsize len)
 {
 gint buf_len;
- 
- if (lseek(fd, off, SEEK_SET) < 0) 
+
+ if (lseek(fd, off, SEEK_SET) < 0)
 {
 return NULL;
 }
 guint8 *buffer = g_malloc(len);
 buf_len = read(fd, buffer, len);
- if (buf_len < 0) 
+ if (buf_len < 0)
 {
 g_free(buffer);
 return NULL;
@@ -143,7 +143,7 @@
 return buffer;
 }
 
-static gint 
+static gint
 set_unicode16(guint8 *str, gsize len, const guint8 *buf, gint endianess, gsize count)
 {
 gint ii, jj;
@@ -179,25 +179,25 @@
 return jj;
 }
 
-static void 
+static void
 set_label_string(guint8 *str, const guint8 *buf, gsize count)
 {
 gint ii;
 
 memcpy(str, buf, count);
 str[count] = 0;
- 
+
 /* remove trailing whitespace */
 ii = strlen((gchar*)str);
- while (ii--) 
+ while (ii--)
 {
 if (!g_ascii_isspace(str[ii]))
 break;
 }
 str[ii+1] = 0;
 }
- 
-static gint 
+
+static gint
 probe_udf(udf_info_t *id)
 {
 struct volume_descriptor *vd;
@@ -327,7 +327,7 @@
 GFile *gfile;
 
 gfile = g_file_new_for_path(name);
- info = g_file_query_info(gfile, 
+ info = g_file_query_info(gfile,
 G_FILE_ATTRIBUTE_STANDARD_NAME ","
 G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET ","
 G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK,
@@ -344,7 +344,7 @@
 g_object_unref(parent);
 
 g_object_unref(info);
- info = g_file_query_info(gfile, 
+ info = g_file_query_info(gfile,
 G_FILE_ATTRIBUTE_STANDARD_NAME ","
 G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET ","
 G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK,
@@ -377,18 +377,22 @@
 ud->current_dvd_device = NULL;
 }
 gfile = g_file_new_for_path(resolved);
- info = g_file_query_info(gfile, 
+ info = g_file_query_info(gfile,
 G_FILE_ATTRIBUTE_STANDARD_TYPE,
 G_FILE_QUERY_INFO_NONE, NULL, NULL);
 if (info != NULL)
 {
 if (g_file_info_get_file_type(info) == G_FILE_TYPE_SPECIAL)
 {
- // I could go through the trouble to scan the connected drives and 
- // verify that this device is connected and is a DVD. But I don't 
+ // I could go through the trouble to scan the connected drives and
+ // verify that this device is connected and is a DVD. But I don't
 // think its neccessary.
 ud->current_dvd_device = resolved;
 }
+ else
+ {
+ g_free(resolved);
+ }
 g_object_unref(info);
 }
 else

HandBrake-0.9.9.tar.bz2/gtk/src/ghb-dvd.h -> HandBrake-0.10.0.tar.bz2/gtk/src/ghb-dvd.h Changed

HandBrake-0.9.9.tar.bz2/gtk/src/ghb.desktop -> HandBrake-0.10.0.tar.bz2/gtk/src/ghb.desktop Changed

@@ -2,9 +2,9 @@
 Name=HandBrake
 GenericName=Media Transcoder
 Comment=Transcodes DVD, Bluray, and other media
-Exec=ghb
+Exec=ghb %f
 Icon=hb-icon
 Terminal=false
 Type=Application
 Categories=GTK;AudioVideo;Video;
-MimeType=application/ogg;application/x-extension-mp4;application/x-flac;application/x-matroska;application/x-ogg;audio/ac3;audio/mp4;audio/mpeg;audio/ogg;audio/x-flac;audio/x-matroska;audio/x-mp3;audio/x-mpeg;audio/x-vorbis;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/quicktime;video/vnd.divx;video/x-avi;video/x-m4v;video/x-matroska;video/x-mpeg;video/x-ogm+ogg;video/x-theora+ogg;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;
+MimeType=application/ogg;application/x-extension-mp4;application/x-flac;application/x-matroska;application/x-ogg;audio/ac3;audio/mp4;audio/mpeg;audio/ogg;audio/x-flac;audio/x-matroska;audio/x-mp3;audio/x-mpeg;audio/x-vorbis;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/quicktime;video/vnd.divx;video/x-avi;video/x-m4v;video/x-matroska;video/x-mpeg;video/ogg;video/x-ogm+ogg;video/x-theora+ogg;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;

HandBrake-0.9.9.tar.bz2/gtk/src/ghb.ui -> HandBrake-0.10.0.tar.bz2/gtk/src/ghb.ui Changed

@@ -1,4145 +1,5564 @@
-<?xml version="1.0"?>
-
+<?xml version="1.0" encoding="UTF-8"?>
+
 <interface>
- <object class="GtkLabel" id="SubTrackLabel">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Track&lt;/b&gt;</property>
- <property name="tooltip-text" translatable="yes">The source subtitle track
-
-You can choose any of the subtitles
-recognized in your source file.
-
-In addition, there is a special track option
-"Foreign Audio Search". This option will add
-an extra pass to the encode that searches for
-subtitles that may correspond to a foreign
-language scene. This option is best used in
-conjunction with the "Forced" option.</property>
- <property name="use_markup">True</property>
- </object>
- <object class="GtkLabel" id="SubForcedLabel">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Forced Only&lt;/b&gt;</property>
- <property name="tooltip-text" translatable="yes">Use only subtitles that have been flagged
-as forced in the source subtitle track
-
-"Forced" subtitles are usually used to show
-subtitles during scenes where someone is speaking
-a foreign language.</property>
- <property name="use_markup">True</property>
- </object>
+ 
+ <object class="GtkFileFilter" id="SourceFilterAVI"/>
+ <object class="GtkFileFilter" id="SourceFilterAll"/>
+ <object class="GtkFileFilter" id="SourceFilterEVO"/>
+ <object class="GtkFileFilter" id="SourceFilterFLV"/>
+ <object class="GtkFileFilter" id="SourceFilterMKV"/>
+ <object class="GtkFileFilter" id="SourceFilterMOV"/>
+ <object class="GtkFileFilter" id="SourceFilterMP4"/>
+ <object class="GtkFileFilter" id="SourceFilterMPG"/>
+ <object class="GtkFileFilter" id="SourceFilterOGG"/>
+ <object class="GtkFileFilter" id="SourceFilterTS"/>
+ <object class="GtkFileFilter" id="SourceFilterVOB"/>
+ <object class="GtkFileFilter" id="SourceFilterVideo"/>
+ <object class="GtkFileFilter" id="SourceFilterWMV"/>
 <object class="GtkLabel" id="SubBurnedLabel">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Burned In&lt;/b&gt;</property>
- <property name="tooltip-text" translatable="yes">Render the subtitle over the video.
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Render the subtitle over the video.
 
 The subtitle will be part of the video and can not be disabled.</property>
+ <property name="label" translatable="yes">&lt;b&gt;Burned In&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 <object class="GtkLabel" id="SubDefaultLabel">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Default&lt;/b&gt;</property>
- <property name="tooltip-text" translatable="yes">Set the default output subtitle track.
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Set the default output subtitle track.
 
 Most players will automatically display this
 subtitle track whenever the video is played.
 
-This is usefule for creating a "forced" track
+This is useful for creating a "forced" track
 in your output.</property>
+ <property name="label" translatable="yes">&lt;b&gt;Default&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ <object class="GtkLabel" id="SubForcedLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Use only subtitles that have been flagged
+as forced in the source subtitle track
+
+"Forced" subtitles are usually used to show
+subtitles during scenes where someone is speaking
+a foreign language.</property>
+ <property name="label" translatable="yes">&lt;b&gt;Forced Only&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 <object class="GtkLabel" id="SubSRTOffsetLabel">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;SRT Offset&lt;/b&gt;</property>
- <property name="tooltip-text" translatable="yes">Add (or subtract) an offset (in milliseconds)
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Add (or subtract) an offset (in milliseconds)
 to the start of the SRT subtitle track.
 
 Often, the start of an external SRT file
 does not coincide with the start of the video.
 This setting allows you to synchronize the files.</property>
+ <property name="label" translatable="yes">&lt;b&gt;SRT Offset&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ <object class="GtkLabel" id="SubTrackLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">The source subtitle track
+
+You can choose any of the subtitles
+recognized in your source file.
+
+In addition, there is a special track option
+"Foreign Audio Search". This option will add
+an extra pass to the encode that searches for
+subtitles that may correspond to a foreign
+language scene. This option is best used in
+conjunction with the "Forced" option.</property>
+ <property name="label" translatable="yes">&lt;b&gt;Track&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
+ <object class="GtkWindow" id="activity_window">
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="default_width">800</property>
+ <property name="default_height">600</property>
+ <property name="type_hint">utility</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="skip_pager_hint">True</property>
+ <property name="transient_for">hb_window</property>
+ <signal name="delete-event" handler="activity_window_delete_cb" swapped="no"/>
+ <child>
+ <object class="GtkBox" id="vbox37">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkLabel" id="activity_location">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="activity_scroll">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTextView" id="activity_view">
+ <property name="width_request">600</property>
+ <property name="height_request">600</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="editable">False</property>
+ <property name="wrap_mode">char</property>
+ <property name="cursor_visible">False</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
 <object class="GtkAdjustment" id="adjustment1">
- <property name="upper">100</property>
 <property name="lower">1</property>
- <property name="page_increment">1</property>
- <property name="step_increment">1</property>
- <property name="page_size">0</property>
+ <property name="upper">100</property>
 <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
 </object>
 <object class="GtkAdjustment" id="adjustment10">
- <property name="upper">64</property>
 <property name="lower">4</property>
- <property name="page_increment">10</property>
- <property name="step_increment">1</property>
- <property name="page_size">0</property>
+ <property name="upper">64</property>
 <property name="value">16</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
 </object>
 <object class="GtkAdjustment" id="adjustment11">
- <property name="upper">6</property>
 <property name="lower">-6</property>
- <property name="page_increment">10</property>
+ <property name="upper">6</property>
 <property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
+ <property name="page_increment">10</property>
 </object>
 <object class="GtkAdjustment" id="adjustment12">
- <property name="upper">6</property>
 <property name="lower">-6</property>
- <property name="page_increment">10</property>
+ <property name="upper">6</property>
 <property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
+ <property name="page_increment">10</property>
 </object>
 <object class="GtkAdjustment" id="adjustment13">
 <property name="upper">1000</property>
- <property name="lower">0</property>
- <property name="page_increment">10</property>
 <property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
+ <property name="page_increment">10</property>
 </object>
 <object class="GtkAdjustment" id="adjustment14">
 <property name="upper">1000</property>
- <property name="lower">0</property>
- <property name="page_increment">10</property>
 <property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
+ <property name="page_increment">10</property>
 </object>
 <object class="GtkAdjustment" id="adjustment15">
 <property name="upper">1000</property>
- <property name="lower">0</property>
- <property name="page_increment">10</property>
 <property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
+ <property name="page_increment">10</property>
 </object>
 <object class="GtkAdjustment" id="adjustment16">
 <property name="upper">1000</property>
- <property name="lower">0</property>
- <property name="page_increment">10</property>
 <property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
+ <property name="page_increment">10</property>
 </object>
 <object class="GtkAdjustment" id="adjustment17">
 <property name="upper">8000</property>
- <property name="lower">0</property>
- <property name="page_increment">16</property>
 <property name="step_increment">2</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
+ <property name="page_increment">16</property>
 </object>
 <object class="GtkAdjustment" id="adjustment18">
 <property name="upper">8000</property>
- <property name="lower">0</property>
- <property name="page_increment">16</property>
 <property name="step_increment">2</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
+ <property name="page_increment">16</property>
 </object>
 <object class="GtkAdjustment" id="adjustment19">
- <property name="upper">10</property>
 <property name="lower">1</property>
- <property name="page_increment">1</property>
- <property name="step_increment">1</property>
- <property name="page_size">0</property>
+ <property name="upper">10</property>
 <property name="value">1</property>
- </object>
- <object class="GtkAdjustment" id="adjustment2">
- <property name="upper">100</property>
- <property name="lower">1</property>
- <property name="page_increment">1</property>
 <property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">100</property>
- </object>
- <object class="GtkAdjustment" id="adjustment3">
- <property name="upper">20000</property>
- <property name="lower">0</property>
- <property name="page_increment">100</property>
- <property name="step_increment">10</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
- </object>
- <object class="GtkAdjustment" id="adjustment4">
- <property name="upper">50000</property>
- <property name="lower">0</property>
- <property name="page_increment">1000</property>
- <property name="step_increment">100</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
- </object>
- <object class="GtkAdjustment" id="adjustment5">
- <property name="upper">51</property>
- <property name="lower">0</property>
- <property name="page_increment">5</property>
- <property name="step_increment">0.25</property>
- <property name="page_size">0</property>
- <property name="value">20.25</property>
- </object>
- <object class="GtkAdjustment" id="x264PresetRange">
- <property name="upper">1</property>
- <property name="lower">0</property>
 <property name="page_increment">1</property>
- <property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
 </object>
- <object class="GtkAdjustment" id="adjustment8">
- <property name="upper">16</property>
+ <object class="GtkAdjustment" id="adjustment2">
 <property name="lower">1</property>
- <property name="page_increment">1</property>
+ <property name="upper">100</property>
+ <property name="value">100</property>
 <property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">3</property>
- </object>
- <object class="GtkAdjustment" id="adjustment9">
- <property name="upper">16</property>
- <property name="lower">0</property>
 <property name="page_increment">1</property>
- <property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
 </object>
 <object class="GtkAdjustment" id="adjustment20">
- <property name="upper">15</property>
 <property name="lower">4</property>
- <property name="page_increment">1</property>
+ <property name="upper">15</property>
 <property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
+ <property name="page_increment">1</property>
 </object>
 <object class="GtkAdjustment" id="adjustment21">
- <property name="value">15</property>
 <property name="lower">15</property>
 <property name="upper">240</property>
+ <property name="value">15</property>
 <property name="step_increment">15</property>
 <property name="page_increment">15</property>
- <property name="page_size">0</property>
 </object>
 <object class="GtkAdjustment" id="adjustment22">
 <property name="upper">2</property>
- <property name="lower">0</property>
- <property name="page_increment">0.5</property>
- <property name="step_increment">0.1</property>
- <property name="page_size">0</property>
 <property name="value">1</property>
+ <property name="step_increment">0.1</property>
+ <property name="page_increment">0.5</property>
 </object>
 <object class="GtkAdjustment" id="adjustment23">
 <property name="upper">1</property>
- <property name="lower">0</property>
- <property name="page_increment">0.5</property>
 <property name="step_increment">0.05</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
+ <property name="page_increment">0.5</property>
 </object>
 <object class="GtkAdjustment" id="adjustment24">
- <property name="upper">100</property>
 <property name="lower">1</property>
- <property name="page_increment">1</property>
- <property name="step_increment">1</property>
- <property name="page_size">0</property>
+ <property name="upper">100</property>
 <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
 </object>
 <object class="GtkAdjustment" id="adjustment25">
 <property name="upper">4096</property>
- <property name="lower">0</property>
- <property name="page_increment">16</property>
 <property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
+ <property name="page_increment">16</property>
 </object>
 <object class="GtkAdjustment" id="adjustment26">
 <property name="upper">4096</property>
- <property name="lower">0</property>
- <property name="page_increment">16</property>
 <property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
+ <property name="page_increment">16</property>
 </object>
 <object class="GtkAdjustment" id="adjustment27">
- <property name="upper">10</property>
 <property name="lower">1</property>
- <property name="page_increment">1</property>
- <property name="step_increment">1</property>
- <property name="page_size">0</property>
+ <property name="upper">10</property>
 <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
 </object>
 <object class="GtkAdjustment" id="adjustment28">
- <property name="upper">4</property>
 <property name="lower">0.9</property>
- <property name="page_increment">1</property>
+ <property name="upper">4</property>
 <property name="step_increment">0.1</property>
- <property name="page_size">0</property>
- <property name="value">0.0</property>
+ <property name="page_increment">1</property>
 </object>
 <object class="GtkAdjustment" id="adjustment29">
- <property name="upper">65535</property>
 <property name="lower">1</property>
- <property name="page_increment">16</property>
+ <property name="upper">65535</property>
 <property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
+ <property name="page_increment">16</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="upper">20000</property>
+ <property name="step_increment">10</property>
+ <property name="page_increment">100</property>
 </object>
 <object class="GtkAdjustment" id="adjustment30">
- <property name="upper">65535</property>
 <property name="lower">1</property>
- <property name="page_increment">16</property>
+ <property name="upper">65535</property>
 <property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
+ <property name="page_increment">16</property>
 </object>
 <object class="GtkAdjustment" id="adjustment31">
- <property name="upper">30000</property>
 <property name="lower">-30000</property>
- <property name="page_increment">100</property>
+ <property name="upper">30000</property>
 <property name="step_increment">10</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
+ <property name="page_increment">100</property>
 </object>
 <object class="GtkAdjustment" id="adjustment32">
 <property name="upper">8000</property>
- <property name="lower">0</property>
- <property name="page_increment">16</property>
 <property name="step_increment">2</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
+ <property name="page_increment">16</property>
 </object>
 <object class="GtkAdjustment" id="adjustment33">
 <property name="upper">8000</property>
- <property name="lower">0</property>
- <property name="page_increment">16</property>
 <property name="step_increment">2</property>
- <property name="page_size">0</property>
- <property name="value">0</property>
+ <property name="page_increment">16</property>
 </object>
 <object class="GtkAdjustment" id="adjustment34">
 <property name="upper">2</property>
- <property name="lower">0</property>
- <property name="page_increment">0.5</property>
- <property name="step_increment">0.1</property>
- <property name="page_size">0</property>
 <property name="value">1</property>
+ <property name="step_increment">0.1</property>
+ <property name="page_increment">0.5</property>
 </object>
 <object class="GtkAdjustment" id="adjustment35">
- <property name="upper">21</property>
 <property name="lower">-20</property>
- <property name="page_increment">1</property>
+ <property name="upper">21</property>
 <property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">0.0</property>
+ <property name="page_increment">1</property>
 </object>
- <object class="GtkAdjustment" id="preview_progress_adj">
- <property name="upper">100</property>
- <property name="lower">0</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="value">0</property>
+ <object class="GtkAdjustment" id="adjustment4">
+ <property name="upper">50000</property>
+ <property name="step_increment">100</property>
+ <property name="page_increment">1000</property>
 </object>
- <object class="GtkAdjustment" id="preview_count_adj">
- <property name="upper">60</property>
- <property name="lower">5</property>
- <property name="page_increment">10</property>
- <property name="step_increment">5</property>
- <property name="page_size">0</property>
- <property name="value">10</property>
+ <object class="GtkAdjustment" id="adjustment5">
+ <property name="upper">51</property>
+ <property name="value">20.25</property>
+ <property name="step_increment">0.25</property>
+ <property name="page_increment">5</property>
 </object>
- <object class="GtkAdjustment" id="min_title_adj">
- <property name="upper">7200</property>
- <property name="lower">0</property>
- <property name="page_increment">10</property>
- <property name="step_increment">5</property>
- <property name="page_size">0</property>
- <property name="value">10</property>
+ <object class="GtkAdjustment" id="adjustment8">
+ <property name="lower">1</property>
+ <property name="upper">16</property>
+ <property name="value">3</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment9">
+ <property name="upper">16</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
 </object>
 <object class="GtkAdjustment" id="audio_quality_adj">
 <property name="upper">10</property>
- <property name="lower">0</property>
- <property name="page_increment">1</property>
 <property name="step_increment">0.1</property>
- <property name="page_size">0</property>
- <property name="value">0.0</property>
- </object>
- <object class="GtkImage" id="subtitle_add_image">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="stock">gtk-add</property>
- </object>
- <object class="GtkImage" id="srt_add_image">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="stock">gtk-add</property>
- </object>
- <object class="GtkFileFilter" id="SourceFilterAll">
- </object>
- <object class="GtkFileFilter" id="SourceFilterTS">
- </object>
- <object class="GtkFileFilter" id="SourceFilterMPG">
- </object>
- <object class="GtkFileFilter" id="SourceFilterEVO">
- </object>
- <object class="GtkFileFilter" id="SourceFilterVOB">
- </object>
- <object class="GtkFileFilter" id="SourceFilterMKV">
- </object>
- <object class="GtkFileFilter" id="SourceFilterAVI">
- </object>
- <object class="GtkFileFilter" id="SourceFilterMP4">
- </object>
- <object class="GtkFileFilter" id="SourceFilterMOV">
- </object>
- <object class="GtkFileFilter" id="SourceFilterOGG">
- </object>
- <object class="GtkFileFilter" id="SourceFilterFLV">
- </object>
- <object class="GtkFileFilter" id="SourceFilterWMV">
- </object>
- <object class="GtkFileFilter" id="SourceFilterVideo">
+ <property name="page_increment">1</property>
 </object>
- <object class="GtkUIManager" id="uimanager1">
- <child>
- <object class="GtkActionGroup" id="actiongroup1">
- <child>
- <object class="GtkAction" id="menuitem1">
- <property name="name">menuitem1</property>
- <property name="label" translatable="yes">_File</property>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="source_action">
- <property name="stock_id">gtk-open</property>
- <property name="name">source_action</property>
- <property name="label">_Source</property>
- <signal handler="source_button_clicked_cb" name="activate"/>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="source_single_action">
- <property name="stock_id">gtk-open</property>
- <property name="name">source_single_action</property>
- <property name="label">Single _Title</property>
- <signal handler="single_title_source_cb" name="activate"/>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="destination1">
- <property name="stock_id">gtk-save-as</property>
- <property name="name">destination1</property>
- <property name="label">_Destination</property>
- <signal handler="destination_browse_clicked_cb" name="activate"/>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="preferences">
- <property name="stock_id">gtk-preferences</property>
- <property name="name">preferences</property>
- <signal handler="prefs_dialog_cb" name="activate"/>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="quit1">
- <property name="stock_id">gtk-quit</property>
- <property name="name">quit1</property>
- <signal handler="on_quit1_activate" name="activate"/>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="menuitem2">
- <property name="name">menuitem2</property>
- <property name="label" translatable="yes">_Queue</property>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="queue_add_menu">
- <property name="sensitive">False</property>
- <property name="icon-name">hb-add-queue</property>
- <property name="name">queue_add_menu</property>
- <property name="label">_Add Queue</property>
- <signal handler="queue_add_clicked_cb" name="activate"/>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="queue_add_all_menu">
- <property name="sensitive">False</property>
- <property name="icon-name">hb-add-queue</property>
- <property name="name">queue_add_all_menu</property>
- <property name="label">Add A_ll Queue</property>
- <signal handler="queue_add_all_clicked_cb" name="activate"/>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="queue_start_menu">
- <property name="sensitive">False</property>
- <property name="icon-name">hb-start</property>
- <property name="name">queue_start_menu</property>
- <property name="label">_Start Queue</property>
- <signal handler="queue_start_clicked_cb" name="activate"/>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="queue_pause_menu">
- <property name="sensitive">False</property>
- <property name="icon-name">hb-pause</property>
- <property name="name">queue_pause_menu</property>
- <property name="label" translatable="yes">_Pause Queue</property>
- <signal handler="queue_pause_clicked_cb" name="activate"/>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="menuitem3">
- <property name="name">menuitem3</property>
- <property name="label" translatable="yes">_View</property>
- </object>
- </child>
- <child>
- <object class="GtkToggleAction" id="hbfd">
- <property name="visible">False</property>
- <property name="name">hbfd</property>
- <property name="label" translatable="yes">HandBrake For _Dumbies</property>
- <signal handler="hbfd_toggled_cb" name="toggled"/>
- </object>
- </child>
- <child>
- <object class="GtkToggleAction" id="show_presets">
+ <object class="GtkAboutDialog" id="hb_about">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">About HandBrake</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="skip_pager_hint">True</property>
+ <property name="program_name">HandBrake</property>
+ <property name="version">0.9.2</property>
+ <property name="copyright" translatable="yes">Copyright © 2008 - 2013 John Stebbins
+Copyright © 2004 - 2013, HandBrake Devs</property>
+ <property name="comments" translatable="yes">HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.</property>
+ <property name="website">http://handbrake.fr</property>
+ <property name="website_label" translatable="yes">http://handbrake.fr</property>
+ <property name="license" translatable="yes">HandBrake 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.
+
+HandBrake 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.
+
+You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</property>
+ <property name="authors">ghb author:
+ John Stebbins
+
+HandBrake authors:
+ Eric Petit
+ Laurent Aimar
+ John Allen
+ Joe Crain
+ Damiano Galassi
+ Edward Groenendaal
+ Rodney Hester
+ Andrew Kimpton
+ Chris Lee
+ Chris Long
+ Brian Mario
+ Maurj
+ Mirkwood
+ Nyx
+ Philippe Rigaux
+ Jonathon Rubin
+ Scott
+ Chris Thoman
+ Mark Krenek
+ Van Jacobson
+
+libavcodec authors:
+ Fabrice Bellard
+ Alex Beregszaszi
+ Brian Foley
+ Arpad Gereoffy
+ Philip Gladstone
+ Falk Hueffner
+ Zdenek Kabelac
+ Nick Kurshev
+ Michael Niedermayer
+ François Revol
+ Dieter Shirley
+ Juan J. Sierralta
+ Lionel Ulmer
+
+libdts authors:
+ Gildas Bazin
+ Sam Hocevar
+
+libdvdcss authors:
+ Billy Biggs
+ Stéphane Borel
+ Håkan Hjort
+ Samuel Hocevar
+ Eugenio Jarosiewicz
+ Jon Lech Johansen
+ Markus Kuespert
+ Pascal Levesque
+ Steven M. Schultz
+ David Siebörger
+ Alex Strelnikov
+ German Tischler
+ Gildas Bazin
+
+libdvdread authors:
+ Björn Englund
+ Håkan Hjort
+ Billy Biggs
+ Christian Wolff
+
+libfaac authors:
+ M. Bakker
+ Tony Lenox
+ RageOMatic
+ thebard
+ Ivan Dimkovic
+ Krzysztof Nikiel
+
+libmp3lame authors:
+ Mike Cheng
+ Robert Hegemann
+ Frank Klemm
+ Alexander Leidinger
+ Naoki Shibata
+ Mark Taylor
+ Takehiro Tominiga
+ Iván Cavero Belaunde
+ Gabriel Bouvigne
+ Florian Bomers
+ CISC
+ John Dahlstrom
+ John Dee
+ Albert Faber
+ Peter Gubanov
+ Lars Magne Ingebrigtsen
+ Yosi Markovich
+ Zdenek Kabelac
+ Iwasa Kazmi
+ Guillaume Lessard
+ Steve Lhomme
+ Don Melton
+ Viral Shah
+ Acy Stapp
+ Roel VdB
+
+libmp4v2 authors:
+ Dave Mackie
+ Alix Marchandise-Franquet
+ Bill May
+ Massimo Villari
+ Waqar Mohsin
+ Richard Chen
+ Rob Arnold
+ Howdy Pierce
+ Steven Schultz
+ sergent@io.com
+ Sean Gilligan
+ Michael Rossberg
+ Luis F. Ramirez
+ Petter Reinholdtsen
+
+libmpeg2 authors:
+ Aaron Holtzman
+ Michel Lespinasse
+ Bruno Barreyra
+ Gildas Bazin
+ Alexander W. Chin
+ Stephen Crowley
+ Didier Gautheron
+ Ryan C. Gordon
+ Peter Gubanov
+ Håkan Hjort
+ Nicolas Joly
+ Gerd Knorr
+ David I. Lehn
+ Olie Lho
+ Rick Niles
+ Real Ouellet
+ Bajusz Peter
+ Franck Sicard
+ Brion Vibber
+ Martin Vogt
+ Fredrik Vraalsen
+
+libogg authors:
+ Christopher Montgomery
+
+libsamplerate authors:
+ Erik de Castro Lopo
+
+libvorbis authors:
+ Christopher Montgomery
+
+libx264 authors:
+ Laurent Aimar
+
+</property>
+ <property name="logo_icon_name">hb-icon</property>
+ <property name="wrap_license">True</property>
+ <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
+ <signal name="response" handler="hb_about_response_cb" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area4">
 <property name="visible">True</property>
- <property name="active">False</property>
- <property name="name">show_presets</property>
- <property name="label" translatable="yes">Show Presets</property>
- <signal handler="show_presets_toggled_cb" name="toggled"/>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="show_preview_menu">
- <property name="icon-name">hb-picture</property>
- <property name="name">show_preview_menu</property>
- <property name="label" translatable="yes">_Picture Settings</property>
- <signal handler="picture_settings_alt_clicked_cb" name="activate"/>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="show_activity_menu">
- <property name="icon-name">hb-activity</property>
- <property name="name">show_activity_menu</property>
- <property name="label" translatable="yes">_Activity Window</property>
- <signal handler="show_activity_menu_clicked_cb" name="activate"/>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="show_queue_menu">
- <property name="icon-name">hb-queue</property>
- <property name="name">show_queue_menu</property>
- <property name="label" translatable="yes">Show _Queue</property>
- <signal handler="show_queue_menu_clicked_cb" name="activate"/>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="menuitem4">
- <property name="name">menuitem4</property>
- <property name="label" translatable="yes">_Help</property>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="about">
- <property name="stock_id" translatable="yes">gtk-about</property>
- <property name="name">about</property>
- <signal handler="about_activate_cb" name="activate"/>
- </object>
- </child>
- <child>
- <object class="GtkAction" id="guide">
- <property name="name">guide</property>
- <property name="label" translatable="yes">_Guide</property>
- <signal handler="guide_activate_cb" name="activate"/>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
 </child>
 <child>
- <object class="GtkAction" id="show_hide">
- <property name="name">show_hide</property>
- <property name="label" translatable="yes">_Minimize/Maximize</property>
- <signal handler="show_hide_toggle_cb" name="activate"/>
- </object>
+ <placeholder/>
 </child>
 </object>
 </child>
- <ui>
- <menubar name="menubar1">
- <menu action="menuitem1">
- <menuitem action="source_action"/>
- <menuitem action="source_single_action"/>
- <menuitem action="destination1"/>
- <separator/>
- <menuitem action="preferences"/>
- <separator/>
- <menuitem action="quit1"/>
- </menu>
- <menu action="menuitem2">
- <menuitem action="queue_add_menu"/>
- <menuitem action="queue_add_all_menu"/>
- <menuitem action="queue_start_menu"/>
- <menuitem action="queue_pause_menu"/>
- </menu>
- <menu action="menuitem3">
- <menuitem action="hbfd"/>
- <menuitem action="show_presets"/>
- <menuitem action="show_queue_menu"/>
- <menuitem action="show_preview_menu"/>
- <menuitem action="show_activity_menu"/>
- </menu>
- <menu action="menuitem4">
- <menuitem action="about"/>
- <menuitem action="guide"/>
- </menu>
- </menubar>
- <popup name="tray_menu">
- <menuitem action="show_hide"/>
- <menuitem action="queue_pause_menu"/>
- <menuitem action="quit1"/>
- <menuitem action="about"/>
- </popup>
- </ui>
 </object>
 
- <object class="GtkMenu" id="presets_menu">
+ <object class="GtkMenu" id="tray_menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkImageMenuItem" id="presets_default">
- <property name="label">_Make Default</property>
- <property name="image">image12</property>
+ <object class="GtkMenuItem" id="show_hide">
+ <property name="label" translatable="yes">_Minimize/Maximize</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <signal name="activate" handler="presets_default_clicked_cb"/>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="presets_new_folder">
- <property name="label" translatable="yes">New _Folder</property>
- <property name="use-underline">True</property>
- <property name="visible">True</property>
- <property name="use_stock">True</property>
- <property name="image">image11</property>
- <signal name="activate" handler="presets_new_folder_clicked_cb"/>
+ <signal name="activate" handler="show_hide_toggle_cb" swapped="no"/>
 </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="preset_export">
- <property name="label" translatable="yes">_Export</property>
- <property name="use-underline">True</property>
+ <object class="GtkMenuItem" id="tray_queue_pause">
+ <property name="label" translatable="yes">_Pause Queue</property>
 <property name="visible">True</property>
- <property name="image">image13</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="preset_export_clicked_cb"/>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="queue_pause_clicked_cb" swapped="no"/>
 </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="preset_import">
- <property name="label" translatable="yes">_Import</property>
- <property name="use-underline">True</property>
+ <object class="GtkMenuItem" id="tray_quit">
+ <property name="label" translatable="yes">_Quit</property>
 <property name="visible">True</property>
- <property name="image">image14</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="preset_import_clicked_cb"/>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_quit1_activate" swapped="no"/>
 </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="presets_restore">
- <property name="label" translatable="yes">_Update Built-in Presets</property>
- <property name="image">image15</property>
+ <object class="GtkMenuItem" id="tray_about">
+ <property name="label" translatable="yes">_About</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <signal name="activate" handler="presets_restore_clicked_cb"/>
+ <signal name="activate" handler="about_activate_cb" swapped="no"/>
 </object>
 </child>
 </object>
 
 <object class="GtkWindow" id="hb_window">
- <property name="visible">False</property>
- <property name="resizable">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_VISIBILITY_NOTIFY_MASK</property>
 <property name="title" translatable="yes">HandBrake</property>
 <property name="default_width">500</property>
 <property name="default_height">400</property>
 <property name="icon_name">hb-icon</property>
- <property name="events">GDK_VISIBILITY_NOTIFY_MASK</property>
- <signal handler="hb_visibility_event_cb" name="visibility_notify_event"/>
- <signal handler="window_destroy_event_cb" name="destroy_event"/>
- <signal handler="window_delete_event_cb" name="delete_event"/>
- <signal handler="window_configure_cb" name="configure-event"/>
+ <signal name="configure-event" handler="window_configure_cb" swapped="no"/>
+ <signal name="delete-event" handler="window_delete_event_cb" swapped="no"/>
+ <signal name="destroy-event" handler="window_destroy_event_cb" swapped="no"/>
+ <signal name="visibility-notify-event" handler="hb_visibility_event_cb" swapped="no"/>
 <child>
- <object class="GtkVBox" id="vbox48">
+ <object class="GtkBox" id="vbox48">
 <property name="orientation">vertical</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <object class="GtkMenuBar" constructor="uimanager1" id="menubar1">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolbar" id="toolbar1">
+ <object class="GtkMenuBar" id="main_menu">
 <property name="visible">True</property>
- <property name="icon_size">5</property>
- <child>
- <object class="GtkToolButton" id="sourcetoolbutton">
- <property name="visible">True</property>
- <property name="is_important">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Choose Video Source</property>
- <property name="label" translatable="yes">Source</property>
- <property name="icon_name">hb-source</property>
- <signal handler="source_button_clicked_cb" name="clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="queue_start1">
- <property name="visible">True</property>
- <property name="is_important">True</property>
- <property name="sensitive">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Start Encoding</property>
- <property name="label" translatable="yes">Start</property>
- <property name="icon_name">hb-start</property>
- <signal handler="queue_start_clicked_cb" name="clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkToolButton" id="queue_pause1">
+ <object class="GtkMenuItem" id="file_menu">
 <property name="visible">True</property>
- <property name="is_important">True</property>
- <property name="sensitive">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Pause Encoding</property>
- <property name="label" translatable="yes">Pause</property>
- <property name="icon_name">hb-pause</property>
- <signal handler="queue_pause_clicked_cb" name="clicked"/>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_File</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="file_submenu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="source_open">
+ <property name="label" translatable="yes">_Source</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="source_button_clicked_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="source_title_open">
+ <property name="label" translatable="yes">Single _Title</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="single_title_source_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="destination">
+ <property name="label" translatable="yes">_Destination</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="destination_browse_clicked_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="preferences">
+ <property name="label" translatable="yes">_Preferences</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="prefs_dialog_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separatormenuitem2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="quit">
+ <property name="label" translatable="yes">_Quit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_quit1_activate" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ </child>
 </object>
- <packing>
- <property name="expand">False</property>
- </packing>
 </child>
 <child>
- <object class="GtkToolButton" id="queue_add">
+ <object class="GtkMenuItem" id="queue_menu">
 <property name="visible">True</property>
- <property name="is_important">True</property>
- <property name="sensitive">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Add to Queue</property>
- <property name="label" translatable="yes">Enqueue</property>
- <property name="icon_name">hb-add-queue</property>
- <signal handler="queue_add_clicked_cb" name="clicked"/>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Queue</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="queue_submenu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="queue_add_menu">
+ <property name="label" translatable="yes">_Add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="queue_add_clicked_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="queue_add_multiple_menu">
+ <property name="label" translatable="yes">Add _Multiple</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="queue_add_multiple_clicked_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="queue_start_menu">
+ <property name="label" translatable="yes">_Start</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="queue_start_clicked_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="queue_pause_menu">
+ <property name="label" translatable="yes">_Pause</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="queue_pause_clicked_cb" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ </child>
 </object>
- <packing>
- <property name="expand">False</property>
- </packing>
 </child>
 <child>
- <object class="GtkToggleToolButton" id="show_queue">
+ <object class="GtkMenuItem" id="view_menu">
 <property name="visible">True</property>
- <property name="is_important">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Show Queue</property>
- <property name="label" translatable="yes">Queue</property>
- <property name="icon_name">hb-queue</property>
- <signal handler="show_queue_clicked_cb" name="toggled"/>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_View</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="view_submenu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckMenuItem" id="hbfd">
+ <property name="label" translatable="yes">HandBrake For _Dumbies</property>
+ <property name="visible">False</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="toggled" handler="hbfd_toggled_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckMenuItem" id="show_presets">
+ <property name="label" translatable="yes">_Show Presets</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="toggled" handler="show_presets_toggled_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="show_preview_menu">
+ <property name="label" translatable="yes">_Preview</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="picture_settings_alt_clicked_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="show_activity_menu">
+ <property name="label" translatable="yes">_Activity Window</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="show_activity_menu_clicked_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="show_queue_menu">
+ <property name="label" translatable="yes">Show _Queue</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="show_queue_menu_clicked_cb" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ </child>
 </object>
- <packing>
- <property name="expand">False</property>
- </packing>
 </child>
 <child>
- <object class="GtkToggleToolButton" id="show_picture">
+ <object class="GtkMenuItem" id="presets_menu">
 <property name="visible">True</property>
- <property name="is_important">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Open Picture Settings and Preview window. Here you can adjust cropping, resolution, aspect ratio, and filters.</property>
- <property name="label" translatable="yes">Picture Settings</property>
- <property name="icon_name">hb-picture</property>
- <signal name="toggled" handler="picture_settings_clicked_cb"/>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Presets</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="presets_submenu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="presets_save">
+ <property name="label" translatable="yes">_Save</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="presets_save_clicked_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="presets_remove">
+ <property name="label" translatable="yes">_Delete</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="presets_remove_clicked_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="presets_default">
+ <property name="label" translatable="yes">_Make Default</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="presets_default_clicked_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="presets_new_folder">
+ <property name="label" translatable="yes">_New Folder</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="presets_new_folder_clicked_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="presets_export">
+ <property name="label" translatable="yes">_Export</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="preset_export_clicked_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="presets_import">
+ <property name="label" translatable="yes">_Import</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="preset_import_clicked_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="presets_restore">
+ <property name="label" translatable="yes">_Update Built-in Presets</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="presets_restore_clicked_cb" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ </child>
 </object>
- <packing>
- <property name="expand">False</property>
- </packing>
 </child>
 <child>
- <object class="GtkToggleToolButton" id="show_activity">
+ <object class="GtkMenuItem" id="help_menu">
 <property name="visible">True</property>
- <property name="is_important">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Show Activity Window</property>
- <property name="label" translatable="yes">Activity</property>
- <property name="icon_name">hb-activity</property>
- <signal handler="show_activity_clicked_cb" name="toggled"/>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Help</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="help_submenu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="about">
+ <property name="label" translatable="yes">_About</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="about_activate_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="guide">
+ <property name="label" translatable="yes">_Guide</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="guide_activate_cb" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ </child>
 </object>
- <packing>
- <property name="expand">False</property>
- </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="position">1</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkBox" id="hbox10">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <object class="GtkVBox" id="vbox14">
+ <object class="GtkBox" id="vbox11">
 <property name="orientation">vertical</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="margin-right">12</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <object class="GtkVBox" id="vbox15">
+ <object class="GtkToolbar" id="toolbar1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_size">5</property>
+ <child>
+ <object class="GtkToolButton" id="sourcetoolbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Choose Video Source</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Source</property>
+ <property name="icon_name">hb-source</property>
+ <signal name="clicked" handler="source_button_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="queue_start1">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Start Encoding</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Start</property>
+ <property name="icon_name">hb-start</property>
+ <signal name="clicked" handler="queue_start_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="queue_pause1">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Pause Encoding</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Pause</property>
+ <property name="icon_name">hb-pause</property>
+ <signal name="clicked" handler="queue_pause_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="queue_add">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Add to Queue</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Enqueue</property>
+ <property name="icon_name">hb-add-queue</property>
+ <signal name="clicked" handler="queue_add_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleToolButton" id="show_queue">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Show Queue</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Queue</property>
+ <property name="icon_name">hb-queue</property>
+ <signal name="toggled" handler="show_queue_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleToolButton" id="show_preview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Open Picture Settings and Preview window.
+Here you can adjust cropping, resolution, aspect ratio, and filters.</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Preview</property>
+ <property name="icon_name">hb-picture</property>
+ <signal name="toggled" handler="picture_settings_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleToolButton" id="show_activity">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Show Activity Window</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Activity</property>
+ <property name="icon_name">hb-activity</property>
+ <signal name="toggled" handler="show_activity_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox15">
 <property name="orientation">vertical</property>
+ <property name="hexpand">True</property>
+ <property name="halign">GTK_ALIGN_FILL</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
 <child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkBox" id="hbox54">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
- <property name="left_padding">6</property>
- <property name="right_padding">12</property>
- <property name="top_padding">12</property>
- <property name="bottom_padding">6</property>
- <property name="xalign">0</property>
- <property name="xscale">1</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">6</property>
+ <property name="margin-left">6</property>
 <child>
- <object class="GtkVBox" id="vbox16">
- <property name="orientation">vertical</property>
+ <object class="GtkLabel" id="label7">
 <property name="visible">True</property>
- <property name="spacing">2</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Source:&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="volume_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">None</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkProgressBar" id="scan_prog">
+ <property name="width_request">400</property>
+ <property name="height_request">10</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="table7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">5</property>
+ <property name="hexpand">True</property>
+ <property name="halign">GTK_ALIGN_FILL</property>
+ <property name="margin-left">6</property>
+ <child>
+ <object class="GtkLabel" id="label20">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Title:</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox42">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="hexpand">True</property>
+ <property name="halign">GTK_ALIGN_FILL</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkComboBox" id="title">
+ <property name="visible">True</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="tooltip_text" translatable="yes">Set the title to encode.
+By default the longest title is chosen.
+This is often the feature title of a DVD.</property>
+ <property name="has_frame">False</property>
+ <signal name="changed" handler="title_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="angle_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Angle:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
 <child>
- <object class="GtkHBox" id="hbox54">
+ <object class="GtkSpinButton" id="angle">
 <property name="visible">True</property>
+ <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">6</property>
+ <property name="tooltip_text" translatable="yes">For multi-angle DVD's, select the desired angle to encode.</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment27</property>
+ <property name="halign">end</property>
+ <signal name="value-changed" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="title_reset">
+ <property name="label" translatable="yes">Reset All Titles</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">Apply current settings to all titles</property>
+ <property name="receives_default">True</property>
+ <property name="halign">end</property>
+ <signal name="clicked" handler="title_reset_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="chapter_box">
+ <property name="halign">start</property>
+ <property name="valign">center</property>
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkComboBox" id="PtoPType">
+ <property name="visible">True</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Range of title to encode. Can be chapters, seconds, or frames.</property>
+ <signal name="changed" handler="ptop_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="start_point">
+ <property name="width-chars">10</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Set the first chapter to encode.</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="numeric">True</property>
+ <signal name="value-changed" handler="start_point_changed_cb" swapped="no"/>
+ <signal name="output" handler="ptop_output_cb" swapped="no"/>
+ <signal name="input" handler="ptop_input_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label56">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">through</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="end_point">
+ <property name="width-chars">10</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Set the last chapter to encode.</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="numeric">True</property>
+ <signal name="value-changed" handler="end_point_changed_cb" swapped="no"/>
+ <signal name="output" handler="ptop_output_cb" swapped="no"/>
+ <signal name="input" handler="ptop_input_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox47">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">7</property>
 <child>
- <object class="GtkLabel" id="label7">
+ <object class="GtkLabel" id="label6">
 <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Source:&lt;/b&gt;</property>
- <property name="use_markup">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Duration:</property>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="source_title">
+ <object class="GtkLabel" id="title_duration">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">None</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment68">
- <property name="visible">True</property>
- <property name="xscale">1</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkProgressBar" id="scan_prog">
- <property name="height_request">10</property>
- <property name="width_request">400</property>
- <property name="visible">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="text" translatable="yes"/>
- </object>
- </child>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">hh:mm:ss</property>
+ <property name="width_chars">8</property>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="position">2</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Destination&lt;/b&gt;</property>
+ <property name="halign">GTK_ALIGN_START</property>
+ <property name="use_markup">True</property>
+ <property name="margin-left">6</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox67">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <property name="margin-left">6</property>
+ <child>
+ <object class="GtkGrid" id="table4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin-bottom">6</property>
+ <child>
+ <object class="GtkLabel" id="label18">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">File:</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkEntry" id="dest_file">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">Destination filename for your encode.</property>
+ <property name="width_chars">40</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <accelerator key="d" signal="grab-focus" modifiers="GDK_MOD1_MASK"/>
+ <signal name="changed" handler="dest_file_changed_cb" swapped="no"/>
+ <signal name="grab-focus" handler="destination_grab_cb" after="yes" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFileChooserButton" id="dest_dir">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Destination directory for your encode.</property>
+ <property name="action">select-folder</property>
+ <property name="local_only">False</property>
+ <property name="title" translatable="yes">Destination Directory</property>
+ <signal name="selection-changed" handler="dest_dir_set_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="container_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">4</property>
 <child>
- <object class="GtkTable" id="table7">
+ <object class="GtkBox" id="hbox3">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column-spacing">5</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
 <child>
- <object class="GtkAlignment" id="alignment72">
+ <object class="GtkLabel" id="label45">
 <property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">6</property>
- <child>
- <object class="GtkLabel" id="label20">
- <property name="visible">True</property>
- <property name="xalign">0.1</property>
- <property name="label" translatable="yes">Title:</property>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Format:</property>
 </object>
 <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox42">
+ <object class="GtkComboBox" id="FileFormat">
 <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">5</property>
-
- <child>
- <object class="GtkAlignment" id="alignment75">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkComboBox" id="title">
- <property name="visible">True</property>
- <property name="has_frame">False</property>
- <property name="tooltip-text" translatable="yes">Set the title to encode. By default the longest title is chosen. This is often the feature title of a DVD.</property>
- <signal handler="title_changed_cb" name="changed"/>
- </object>
- </child>
-
- </object>
- </child>
-
- <child>
- <object class="GtkAlignment" id="alignment73">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox44">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">7</property>
- <child>
- <object class="GtkLabel" id="angle_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Angle:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="angle">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">For multi-angle DVD's, select the desired angle to encode.</property>
- <property name="adjustment">adjustment27</property>
- <signal name="value_changed" handler="setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Format to mux encoded tracks to.</property>
+ <signal name="changed" handler="container_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="Mp4iPodCompatible">
+ <property name="label" translatable="yes">iPod 5G Support</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Add iPod Atom needed by some older iPods.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="Mp4HttpOptimize">
+ <property name="label" translatable="yes">Web optimized</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Optimize the layout of the MP4 file for progressive download.
+This allows a player to initiate playback before downloading the entire file.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="http_opt_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="Mp4LargeFile">
+ <property name="label" translatable="yes">Large file (&gt;4GB)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_markup" translatable="yes">Allow 64 bit MP4 file which can be over 4GB.
 
- <child>
- <object class="GtkAlignment" id="alignment74">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox48">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">5</property>
-
- <child>
- <object class="GtkComboBox" id="PtoPType">
- <property name="visible">True</property>
- <property name="tooltip-text" translatable="yes">Range of title to encode. Can be chapters, seconds, or frames.</property>
- <signal handler="ptop_widget_changed_cb" name="changed"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="start_point">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Set the first chapter to encode.</property>
- <property name="adjustment">adjustment1</property>
- <signal handler="start_point_changed_cb" name="value_changed"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label56">
- <property name="visible">True</property>
- <property name="label" translatable="yes">through</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="end_point">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Set the last chapter to encode.</property>
- <property name="adjustment">adjustment2</property>
- <signal handler="end_point_changed_cb" name="value_changed"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox47">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">7</property>
- <child>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="xalign">0.1</property>
- <property name="label" translatable="yes">Duration:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="title_duration">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">hh:mm:ss</property>
- <property name="width_chars">8</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
+&lt;b&gt;Caution:&lt;/b&gt; This option may break device compatibility.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="setting_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
 </child>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
 </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="presets_frame">
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <property name="margin-right">6</property>
+ <property name="margin-bottom">6</property>
+ <signal name="size-allocate" handler="presets_frame_size_allocate_cb" swapped="no"/>
+ <child>
+ <object class="GtkScrolledWindow" id="presets_scroll">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">etched-in</property>
+ <property name="margin-top">6</property>
+ <property name="min_content_width">200</property>
+ <child>
+ <object class="GtkTreeView" id="presets_list">
+ <property name="width_request">206</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_visible">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection4"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label34">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">&lt;b&gt;Presets List&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkStack" id="QueueStack">
+ <property name="homogeneous">True</property>
+ <property name="transition-type">GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT</property>
+ <property name="transition-duration">400</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkBox" id="settings_tab">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkStackSwitcher" id="SettingsStackSwitcher">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="stack">SettingsStack</property>
+ <property name="hexpand">True</property>
+ <property name="halign">GTK_ALIGN_FILL</property>
+ <property name="margin-left">12</property>
+ <property name="margin-right">12</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkStack" id="SettingsStack">
+ <property name="homogeneous">True</property>
+ <property name="transition-type">GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT</property>
+ <property name="transition-duration">400</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="margin-left">12</property>
+ <property name="margin-right">12</property>
 <child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkBox" id="summary_tab">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">3</property>
 <child>
- <object class="GtkAlignment" id="alignment44">
+ <object class="GtkBox" id="picture_summary">
+ <property name="orientation">vertical</property>
 <property name="visible">True</property>
- <property name="left_padding">12</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">0</property>
+ <property name="margin-top">10</property>
+ <property name="margin-left">10</property>
 <child>
- <object class="GtkHBox" id="hbox67">
+ <object class="GtkFrame" id="frame5">
 <property name="visible">True</property>
- <property name="spacing">12</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
 <child>
- <object class="GtkTable" id="table4">
+ <object class="GtkGrid" id="table11">
 <property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="row_homogeneous">True</property>
+ <property name="column_homogeneous">True</property>
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">2</property>
+ <property name="margin-left">12</property>
 <child>
- <placeholder/>
+ <object class="GtkLabel" id="labela5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Source Codec:</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
 </child>
 <child>
- <object class="GtkFileChooserButton" id="dest_dir">
+ <object class="GtkLabel" id="source_video_codec">
 <property name="visible">True</property>
- <property name="local-only">False</property>
- <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
- <property name="title" translatable="yes">Destination Directory</property>
- <property name="tooltip-text" translatable="yes">Destination directory for your encode.</property>
- <signal name="selection_changed" handler="dest_dir_set_cb"/>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">--</property>
 </object>
 <packing>
+ <property name="top_attach">0</property>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkEntry" id="dest_file">
+ <object class="GtkLabel" id="label23">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="width_chars">40</property>
- <property name="tooltip-text" translatable="yes">Destination filename for your encode.</property>
- <signal name="changed" handler="dest_file_changed_cb"/>
- <signal name="grab_focus" handler="destination_grab_cb" after="yes"/>
- <accelerator key="d" signal="grab-focus" modifiers="GDK_MOD1_MASK"/>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Dimensions:</property>
 </object>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label18">
+ <object class="GtkLabel" id="source_dimensions">
 <property name="visible">True</property>
- <property name="label" translatable="yes">File:</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">--</property>
 </object>
 <packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="container_box">
- <property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">4</property>
 <child>
- <object class="GtkHBox" id="hbox3">
+ <object class="GtkLabel" id="label42">
 <property name="visible">True</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkLabel" id="label45">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Format:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="FileFormat">
- <property name="visible">True</property>
- <property name="tooltip-text" translatable="yes">Format to mux encoded tracks to.</property>
- <signal name="changed" handler="container_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Aspect: </property>
 </object>
 <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkCheckButton" id="Mp4iPodCompatible">
- <property name="label" translatable="yes">iPod 5G Support</property>
+ <object class="GtkLabel" id="source_aspect">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Add iPod Atom needed by some older iPods.</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="setting_widget_changed_cb"/>
+ <property name="label" translatable="yes">--</property>
 </object>
 <packing>
+ <property name="top_attach">2</property>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkCheckButton" id="Mp4HttpOptimize">
- <property name="label" translatable="yes">Web optimized</property>
+ <object class="GtkLabel" id="label43">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Optimize the layout of the MP4 file for progressive download. This allows a player to initiate playback before downloading the entire file.</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="http_opt_changed_cb"/>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Frame Rate:</property>
 </object>
 <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">3</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkCheckButton" id="Mp4LargeFile">
- <property name="label" translatable="yes">Large file (&gt;4GB)</property>
+ <object class="GtkLabel" id="source_frame_rate">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-markup" translatable="yes">Allow 64 bit MP4 file which can be over 4GB.
-
- &lt;b&gt;Caution:&lt;/b&gt; This option may break device compatibility.</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="setting_widget_changed_cb"/>
+ <property name="label" translatable="yes">--</property>
 </object>
 <packing>
+ <property name="top_attach">3</property>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 </object>
- <packing>
- <property name="position">1</property>
- <property name="expand">False</property>
- </packing>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label44">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">&lt;b&gt;Source Picture Parameters&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
 </child>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">2</property>
+ <property name="position">0</property>
+ </packing>
 </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;&lt;u&gt;D&lt;/u&gt;estination&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment67">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">0</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
- <child>
- <object class="GtkNotebook" id="SettingsNotebook">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child>
- <object class="GtkHBox" id="picture_tab">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">3</property>
-
 <child>
- <object class="GtkAlignment" id="picture_summary">
+ <object class="GtkFrame" id="Cropping1">
 <property name="visible">True</property>
- <property name="top_padding">10</property>
- <property name="left_padding">10</property>
-
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
 <child>
- <object class="GtkVBox" id="vbox43">
- <property name="orientation">vertical</property>
+ <object class="GtkGrid" id="table12">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">14</property>
+ <property name="row_homogeneous">True</property>
+ <property name="column_homogeneous">True</property>
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">2</property>
+ <property name="margin-left">12</property>
+ <property name="margin-right">2</property>
+ <child>
+ <object class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Autocrop:</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
 <child>
- <object class="GtkFrame" id="frame5">
+ <object class="GtkLabel" id="crop_auto">
 <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <child>
- <object class="GtkAlignment" id="alignment9">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkTable" id="table11">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">True</property>
-
- <child>
- <object class="GtkLabel" id="labela5">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Source Codec:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="source_codec">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">--</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label23">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Dimensions:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="source_dimensions">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">--</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label42">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Aspect: </property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="source_aspect">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">--</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label43">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Frame Rate:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="source_frame_rate">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">--</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label44">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">&lt;b&gt;Source Picture Parameters&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">On</property>
 </object>
 <packing>
- <property name="expand">False</property>
- <property name="padding">2</property>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkFrame" id="Cropping1">
+ <object class="GtkLabel" id="label12">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Crop:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="crop_values">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">--</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label76">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <child>
- <object class="GtkAlignment" id="alignment52">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">12</property>
- <property name="right_padding">2</property>
- <child>
- <object class="GtkTable" id="table12">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkLabel" id="label13">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Autocrop:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="crop_auto">
- <property name="visible">True</property>
- <property name="label" translatable="yes">On</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label12">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Crop:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="crop_values">
- <property name="visible">True</property>
- <property name="label" translatable="yes">--</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label76">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Crop Dimensions:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="crop_dimensions">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">--</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label16">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">&lt;b&gt;Cropping&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Crop Dimensions:</property>
 </object>
 <packing>
- <property name="expand">False</property>
- <property name="padding">2</property>
- <property name="position">1</property>
+ <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkFrame" id="frame16">
+ <object class="GtkLabel" id="crop_dimensions">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <child>
- <object class="GtkAlignment" id="alignment20">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">12</property>
- <property name="right_padding">2</property>
- <child>
- <object class="GtkTable" id="table13">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkLabel" id="label14">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Scale Dimensions:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="scale_dimensions">
- <property name="visible">True</property>
- <property name="label" translatable="yes">--</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label15">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Optimal for Source:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="scale_auto">
- <property name="visible">True</property>
- <property name="label" translatable="yes">On</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label17">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Anamorphic:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="scale_anamorphic">
- <property name="visible">True</property>
- <property name="label" translatable="yes">On</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND|GTK_FILL</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">&lt;b&gt;Scaling&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
+ <property name="label" translatable="yes">--</property>
 </object>
 <packing>
- <property name="expand">False</property>
- <property name="padding">2</property>
+ <property name="top_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 </object>
 </child>
-
+ <child type="label">
+ <object class="GtkLabel" id="label16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">&lt;b&gt;Cropping&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
 </object>
 <packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
 <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="padding">2</property>
+ <property name="position">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkAlignment" id="alignment56">
+ <object class="GtkFrame" id="frame16">
 <property name="visible">True</property>
- <property name="right_padding">12</property>
- <property name="top_padding">12</property>
- <property name="yalign">0.4</property>
- <property name="yscale">0</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
 <child>
- <object class="GtkVBox" id="vbox9">
- <property name="orientation">vertical</property>
+ <object class="GtkGrid" id="table13">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="row_homogeneous">True</property>
+ <property name="column_homogeneous">True</property>
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">2</property>
+ <property name="margin-left">12</property>
+ <property name="margin-right">2</property>
+ <child>
+ <object class="GtkLabel" id="label14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Scale Dimensions:</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
 <child>
- <object class="GtkAlignment" id="alignment19">
+ <object class="GtkLabel" id="scale_dimensions">
 <property name="visible">True</property>
- <property name="bottom_padding">4</property>
- <property name="left_padding">4</property>
- <property name="right_padding">4</property>
- <property name="yalign">1</property>
- <child>
- <object class="GtkImage" id="preview_button_image">
- <property name="width_request">448</property>
- <property name="height_request">200</property>
- <property name="visible">True</property>
- <property name="icon_name">hb-icon</property>
- <property name="pixel-size">128</property>
- <signal name="size_allocate" handler="preview_button_size_allocate_cb"/>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">--</property>
 </object>
 <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkAlignment" id="picture_summary2">
+ <object class="GtkLabel" id="label15">
 <property name="visible">True</property>
- <property name="yalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox7">
- <property name="visible">True</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Presentation Dimensions:</property>
- <property name="justify">right</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="preview_dims">
- <property name="width_request">85</property>
- <property name="visible">True</property>
- <property name="xalign">0.2</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes">--</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
-
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Optimal for Source:</property>
 </object>
 <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="scale_auto">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">On</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label17">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Anamorphic:</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
+ <child>
+ <object class="GtkLabel" id="scale_anamorphic">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">On</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">&lt;b&gt;Scaling&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
 <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="padding">2</property>
+ <property name="position">2</property>
 </packing>
 </child>
 </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
 </child>
- <child type="tab">
- <object class="GtkLabel" id="picture_label">
+ <child>
+ <object class="GtkBox" id="vbox9">
+ <property name="orientation">vertical</property>
 <property name="visible">True</property>
- <property name="label" translatable="yes">Summary</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="margin-top">12</property>
+ <property name="margin-right">12</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkImage" id="preview_button_image">
+ <property name="width_request">448</property>
+ <property name="height_request">200</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">end</property>
+ <property name="margin-bottom">4</property>
+ <property name="margin-left">4</property>
+ <property name="margin-right">4</property>
+ <property name="pixel_size">128</property>
+ <property name="icon_name">hb-icon</property>
+ <signal name="size-allocate" handler="preview_button_size_allocate_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="picture_summary2">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <property name="halign">center</property>
+ <property name="valign">start</property>
+ <child>
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Presentation Dimensions:</property>
+ <property name="justify">right</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="preview_dims">
+ <property name="width_request">85</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">start</property>
+ <property name="label" translatable="yes">--</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
 </object>
 <packing>
- <property name="tab_fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ <property name="name">summary_tab</property>
+ <property name="title" translatable="yes">Summary</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="picture_tab">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin-top">16</property>
+ <property name="margin-left">16</property>
+ <property name="spacing">16</property>
 <child>
- <object class="GtkVBox" id="vbox22">
+ <object class="GtkBox" id="hbox75">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-
- <property name="spacing">8</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">16</property>
 <child>
- <object class="GtkHBox" id="hbox17">
+ <object class="GtkFrame" id="Cropping2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-
- <property name="spacing">48</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
 <child>
- <object class="GtkAlignment" id="alignment14">
+ <object class="GtkBox" id="vbox6">
+ <property name="orientation">vertical</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin-top">6</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">48</property>
- <property name="left_padding">24</property>
 <child>
- <object class="GtkTable" id="table15">
- <property name="row_spacing">5</property>
- <property name="column_spacing">5</property>
- <property name="n_rows">6</property>
- <property name="n_columns">2</property>
+ <object class="GtkGrid" id="table2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <object class="GtkLabel" id="label46">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Video Encoder:</property>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="VideoEncoder">
- <property name="visible">True</property>
- <property name="tooltip-text" translatable="yes">Available video encoders.</property>
- <signal handler="vcodec_changed_cb" name="changed"/>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label47">
+ <object class="GtkSpinButton" id="PictureLeftCrop">
 <property name="visible">True</property>
+ <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Framerate:</property>
+ <property name="tooltip_text" translatable="yes">Left Crop</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment13</property>
+ <signal name="value-changed" handler="crop_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
 <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkComboBox" id="VideoFramerate">
+ <object class="GtkSpinButton" id="PictureTopCrop">
 <property name="visible">True</property>
+ <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Output framerate. 'Same as source' is recommended. If your source video has a variable framerate, 'Same as source' will preserve it.</property>
- <signal handler="framerate_changed_cb" name="changed"/>
+ <property name="tooltip_text" translatable="yes">Top Crop</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment14</property>
+ <signal name="value-changed" handler="crop_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">0</property>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkRadioButton" id="VideoFramerateCFR">
+ <object class="GtkSpinButton" id="PictureBottomCrop">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Enables constant framerate output.</property>
- <property name="label" translatable="yes">Constant Framerate</property>
- <property name="draw_indicator">True</property>
- <signal handler="setting_widget_changed_cb" name="toggled"/>
+ <property name="tooltip_text" translatable="yes">Bottom Crop</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment15</property>
+ <signal name="value-changed" handler="crop_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="left_attach">0</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkRadioButton" id="VideoFrameratePFR">
+ <object class="GtkSpinButton" id="PictureRightCrop">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Enables variable framerate output with a peak rate determined by the framerate setting. VFR is not compatible with some players.</property>
- <property name="label" translatable="yes">Peak Framerate (VFR)</property>
- <property name="draw_indicator">True</property>
- <property name="group">VideoFramerateCFR</property>
- <signal handler="setting_widget_changed_cb" name="toggled"/>
+ <property name="tooltip_text" translatable="yes">Right Crop</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment16</property>
+ <signal name="value-changed" handler="crop_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="left_attach">0</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
+ <property name="top_attach">1</property>
+ <property name="left_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkRadioButton" id="VideoFramerateVFR">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Enables variable framerate output. VFR is not compatible with some players.</property>
- <property name="label" translatable="yes">Variable Framerate</property>
- <property name="draw_indicator">True</property>
- <property name="group">VideoFramerateCFR</property>
- <signal handler="setting_widget_changed_cb" name="toggled"/>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="left_attach">0</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
- </packing>
+ <placeholder/>
 </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment10">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">48</property>
- <property name="right_padding">24</property>
- <child>
- <object class="GtkTable" id="table8">
- <property name="row_spacing">5</property>
- <property name="column_spacing">5</property>
- <property name="n_rows">6</property>
- <property name="n_columns">3</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <object class="GtkHScale" id="VideoQualitySlider">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Set the desired quality factor. The encoder targets a certain quality. The scale used by each video encoder is different. 
-
- x264's scale is logarithmic and lower values coorespond to higher quality. So small decreases in value will result in progressively larger increases in the resulting file size. A value of 0 means lossless and will result in a file size that is larger than the original source, unless the source was also lossless.
-
- FFMpeg's and Theora's scale is more linear. These encoders do not have a lossless mode.</property>
- <property name="adjustment">adjustment5</property>
- <property name="digits">3</property>
- <property name="value_pos">GTK_POS_TOP</property>
- <signal handler="vquality_changed_cb" name="value_changed"/>
- <signal handler="format_vquality_cb" name="format-value"/>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">3</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
- </packing>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
 </child>
 <child>
- <object class="GtkRadioButton" id="vquality_type_constant">
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="PictureAutoCrop">
+ <property name="label" translatable="yes">Auto Crop</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Set the desired quality factor. The encoder targets a certain quality. The scale used by each video encoder is different. 
-
- x264's scale is logarithmic and lower values coorespond to higher quality. So small decreases in value will result in progressively larger increases in the resulting file size. A value of 0 means lossless and will result in a file size that is larger than the original source, unless the source was also lossless.
-
- FFMpeg's and Theora's scale is more linear. These encoders do not have a lossless mode.</property>
- <property name="label" translatable="yes">Constant Quality:</property>
- <property name="active">True</property>
+ <property name="tooltip_text" translatable="yes">Automatically crop black borders around edges of the video.</property>
+ <property name="halign">start</property>
 <property name="draw_indicator">True</property>
- <signal handler="setting_widget_changed_cb" name="toggled"/>
+ <signal name="toggled" handler="scale_changed_cb" swapped="no"/>
 </object>
 <packing>
+ <property name="top_attach">3</property>
 <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkRadioButton" id="vquality_type_bitrate">
+ <object class="GtkCheckButton" id="PictureLooseCrop">
+ <property name="label" translatable="yes">Loose Crop</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Set the average bitrate. The instantaneous bitrate can be much higher or lower at any point in time. But the average over a long duration will be the value set here. If you need to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings.</property>
- <property name="label" translatable="yes">Bitrate (kbps): </property>
- <property name="group">vquality_type_constant</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">When picture settings require that the image
+dimensions be rounded to some multiple number
+of pixels, this setting will crop a few extra pixels
+instead of doing exact cropping and then scaling to
+the required multiple.</property>
+ <property name="halign">start</property>
 <property name="draw_indicator">True</property>
- <signal handler="setting_widget_changed_cb" name="toggled"/>
+ <signal name="toggled" handler="scale_changed_cb" swapped="no"/>
 </object>
 <packing>
+ <property name="top_attach">4</property>
 <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
 </packing>
 </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox78">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">4</property>
 <child>
- <object class="GtkSpinButton" id="VideoAvgBitrate">
+ <object class="GtkLabel" id="label97">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Set the average bitrate. The instantaneous bitrate can be much higher or lower at any point in time. But the average over a long duration will be the value set here. If you need to limit instantaneous bitrate, look into x264 vbv-bufsize and vbv-maxrate.</property>
- <property name="adjustment">adjustment3</property>
- <signal handler="setting_widget_changed_cb" name="value_changed"/>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Crop Dimensions:</property>
 </object>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- <property name="x_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="VideoTwoPass">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Perform 2 Pass Encoding. The 'Bitrate' option is prerequisite. During the 1st pass, statistics about the video are collected. Then in the second pass, those statistics are used to make bitrate allocation decisions.</property>
- <property name="label" translatable="yes">2-Pass Encoding</property>
- <property name="draw_indicator">True</property>
- <signal handler="setting_widget_changed_cb" name="toggled"/>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkAlignment" id="alignment13">
+ <object class="GtkLabel" id="crop_dimensions2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="left_padding">16</property>
- <child>
- <object class="GtkCheckButton" id="VideoTurboTwoPass">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">During the 1st pass of a 2 pass encode, use settings that speed things along.</property>
- <property name="label" translatable="yes">Turbo First Pass</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal handler="setting_widget_changed_cb" name="toggled"/>
- </object>
- </child>
+ <property name="label" translatable="yes">--</property>
 </object>
 <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
 </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
 </child>
 </object>
- <packing>
- <property name="padding">2</property>
- <property name="position">1</property>
- <property name="expand">True</property>
- </packing>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label26">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">&lt;b&gt;Cropping&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="padding">2</property>
 <property name="position">0</property>
- <property name="expand">False</property>
 </packing>
 </child>
 <child>
- <object class="GtkAlignment" id="alignment55">
+ <object class="GtkFrame" id="frame3">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="left_padding">24</property>
- <property name="right_padding">24</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
 <child>
- <object class="GtkVBox" id="x264VideoSettings">
+ <object class="GtkBox" id="vbox30">
 <property name="orientation">vertical</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
 <child>
- <object class="GtkCheckButton" id="x264UseAdvancedOptions">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Use advanced options Tab for x264 settings.
-
- Use at your own risk!</property>
- <property name="label" translatable="yes">Use Advanced Options</property>
- <property name="active">False</property>
- <property name="draw_indicator">True</property>
- <signal handler="x264_use_advanced_options_changed_cb" name="toggled"/>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="padding">2</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="x264VideoSettingsTable">
- <property name="row_spacing">5</property>
- <property name="column_spacing">5</property>
- <property name="n_rows">4</property>
- <property name="n_columns">6</property>
+ <object class="GtkBox" id="hbox51">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">4</property>
 <child>
- <object class="GtkLabel" id="x264PresetLabel">
+ <object class="GtkLabel" id="label27">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">x264 Preset:</property>
+ <property name="label" translatable="yes">width:</property>
 </object>
 <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkHScale" id="x264PresetSlider">
+ <object class="GtkSpinButton" id="scale_width">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Adjusts x264 settings to trade off compression efficiency against encoding speed.
-
- This establishes your default x264 settings. Tunes, profiles, levels and advanced option string will be applied to this.
-
- You should generally set this option to the slowest you can bear since slower settings will result in better quality or smaller files.</property>
- <property name="adjustment">x264PresetRange</property>
- <property name="digits">0</property>
- <property name="value_pos">GTK_POS_RIGHT</property>
- <signal handler="x264_setting_changed_cb" name="value_changed"/>
- <signal handler="format_x264_preset_cb" name="format-value"/>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">1</property>
- <property name="right_attach">6</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="x264TuneLabel">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">x264 Tune:</property>
+ <property name="tooltip_text" translatable="yes">This is the width that the video will be stored at.
+The actual display dimensions will differ if the pixel aspect ratio is not 1:1.</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment17</property>
+ <property name="snap_to_ticks">True</property>
+ <signal name="value-changed" handler="scale_width_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkComboBox" id="x264Tune">
+ <object class="GtkLabel" id="label28">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Tune settings to optimize for common scenarios.
-
- This can improve effeciency for particular source characteristics or set characteristics of the output file.
-
- Changes will be applied after the preset but before all other parameters.</property>
- <signal handler="x264_setting_changed_cb" name="changed"/>
+ <property name="label" translatable="yes">height:</property>
 </object>
 <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
 </packing>
 </child>
 <child>
- <object class="GtkCheckButton" id="x264FastDecode">
+ <object class="GtkSpinButton" id="scale_height">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Reduce decoder CPU usage.
-
- Set this if your device is struggling to play the output (dropped frames).</property>
- <property name="label" translatable="yes">Fast Decode</property>
- <property name="active">False</property>
- <property name="draw_indicator">True</property>
- <signal handler="x264_setting_changed_cb" name="toggled"/>
+ <property name="tooltip_text" translatable="yes">This is the height that the video will be stored at.
+The actual display dimensions will differ if the pixel aspect ratio is not 1:1.</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment18</property>
+ <signal name="value-changed" handler="scale_height_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL</property>
- <property name="x_padding">20</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
 </packing>
 </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox71">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <object class="GtkCheckButton" id="x264ZeroLatency">
- <property name="visible">False</property>
+ <object class="GtkCheckButton" id="autoscale">
+ <property name="label" translatable="yes">Optimal for source</property>
+ <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Minimize latency between input to encoder and output of decoder.
-
- This is useful for broadcast of live streams.
- Since HandBrake is not suitable for live stream broadcast purposes, this setting is of little value here.</property>
- <property name="label" translatable="yes">Zero Latency</property>
- <property name="active">False</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">If enabled, select the 'optimal' storage resolution.
+This will be the resolution that most closely matches the source resolution after cropping.</property>
+ <property name="halign">start</property>
 <property name="draw_indicator">True</property>
- <signal handler="x264_setting_changed_cb" name="toggled"/>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL</property>
- <property name="x_padding">20</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="h264ProfileLabel">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">H.264 Profile:</property>
+ <signal name="toggled" handler="scale_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox20">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">5</property>
 <child>
- <object class="GtkComboBox" id="h264Profile">
+ <object class="GtkLabel" id="label96">
 <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Limit the H.264 profile of the output stream.
-
- Overrides all other settings.</property>
- <signal handler="x264_setting_changed_cb" name="changed"/>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Anamorphic:</property>
 </object>
 <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="h264LevelLabel">
+ <object class="GtkComboBox" id="PicturePAR">
 <property name="visible">True</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">H.264 Level:</property>
+ <property name="tooltip_markup" translatable="yes">&lt;b&gt;Anamorphic Modes:&lt;/b&gt;
+&lt;small&gt;&lt;tt&gt;
+None - Force pixel aspect ratio to 1:1.
+Loose - Align dimensions to chosen 'Alignment' value
+ and pick pixel aspect ratio that preserves the
+ original display aspect ratio
+Strict - Keep original source dimensions and pixel
+ aspect ratio&lt;/tt&gt;&lt;/small&gt;</property>
+ <signal name="changed" handler="scale_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox72">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">5</property>
 <child>
- <object class="GtkComboBox" id="h264Level">
+ <object class="GtkLabel" id="label95">
 <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Sets and ensures compliance with the specified H.264 level.
-
- Overrides all other settings.</property>
- <signal handler="x264_setting_changed_cb" name="changed"/>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Alignment:</property>
 </object>
 <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox43">
+ <object class="GtkComboBox" id="PictureModulus">
 <property name="visible">True</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkLabel" id="x264OptionExtraLabel">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">More Settings:</property>
- </object>
- <packing>
- <property name="position">0</property>
- <property name="expand">False</property>
- <property name="padding">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow8">
- <property name="height_request">60</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <object class="GtkTextView" id="x264OptionExtra">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip-text" translatable="yes">Additional x264 settings.
+ <property name="tooltip_text" translatable="yes">Align storage dimensions to multiples of this value.
 
- Colon separated list of x264 options.</property>
- <property name="wrap_mode">GTK_WRAP_CHAR</property>
- <property name="accepts_tab">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+This setting is only necessary for compatibility with some devices.
+You should use 2 unless you experience compatibility issues.</property>
+ <signal name="changed" handler="scale_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">4</property>
- <property name="left_attach">2</property>
- <property name="right_attach">6</property>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
- <property name="expand">True</property>
- <property name="padding">2</property>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
 </packing>
 </child>
 </object>
 </child>
+ <child type="label">
+ <object class="GtkLabel" id="label25">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">&lt;b&gt;Storage Geometry&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
 </object>
 <packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="padding">2</property>
 <property name="position">1</property>
 </packing>
 </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label65">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Video</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="audio_tab">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <object class="GtkAlignment" id="alignment18">
+ <object class="GtkFrame" id="frame4">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">12</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">12</property>
- <property name="right_padding">2</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
 <child>
- <object class="GtkVBox" id="vbox17">
+ <object class="GtkBox" id="vbox10">
 <property name="orientation">vertical</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="spacing">2</property>
 <child>
- <object class="GtkTable" id="table16">
+ <object class="GtkBox" id="hbox52">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="row_spacing">5</property>
- <property name="column_spacing">5</property>
+ <property name="spacing">4</property>
 <child>
- <object class="GtkAlignment" id="alignment47">
+ <object class="GtkLabel" id="label91">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="yalign">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkButton" id="audio_add">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Add new audio settings to the list</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <signal handler="audio_add_clicked_cb" name="clicked"/>
- <child>
- <object class="GtkImage" id="image4">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="stock">gtk-add</property>
- </object>
- </child>
- </object>
- </child>
+ <property name="label" translatable="yes">width:</property>
 </object>
 <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkAlignment" id="alignment37">
+ <object class="GtkSpinButton" id="PictureDisplayWidth">
 <property name="visible">True</property>
+ <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="yalign">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkButton" id="audio_remove">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Remove the selected audio settings</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <signal handler="audio_remove_clicked_cb" name="clicked"/>
- <child>
- <object class="GtkImage" id="image8">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="stock">gtk-remove</property>
- </object>
- </child>
- </object>
- </child>
+ <property name="tooltip_text" translatable="yes">This is the display width. It is the result of scaling the storage dimensions by the pixel aspect.</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment25</property>
+ <property name="snap_to_ticks">True</property>
+ <signal name="value-changed" handler="display_width_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkExpander" id="AdvancedAudioExpander">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="expanded">False</property>
- <property name="label">Advanced</property>
 <child>
- <object class="GtkVBox" id="vbox44">
+ <object class="GtkLabel" id="label92">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkTable" id="AdvancedAudioPassTable">
- <property name="visible">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">2</property>
- <property name="n_columns">8</property>
- <property name="row_spacing">5</property>
- <property name="column_spacing">5</property>
- <child>
- <object class="GtkHBox" id="hbox40">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkLabel" id="labela3">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Auto Passthru:</property>
- </object>
- <packing>
- <property name="position">0</property>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="AudioAllowMP3Pass">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Enable this if your playback device supports AAC. This permits AAC passthru to be selected when automatic passthru selection is enabled.</property>
- <property name="label" translatable="yes">MP3</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal handler="global_audio_widget_changed_cb" name="toggled"/>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="AudioAllowAACPass">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Enable this if your playback device supports AAC. This permits AAC passthru to be selected when automatic passthru selection is enabled.</property>
- <property name="label" translatable="yes">AAC</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal handler="global_audio_widget_changed_cb" name="toggled"/>
- </object>
- <packing>
- <property name="position">2</property>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="AudioAllowAC3Pass">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Enable this if your playback device supports AC-3. This permits AC-3 passthru to be selected when automatic passthru selection is enabled.</property>
- <property name="label" translatable="yes">AC-3</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal handler="global_audio_widget_changed_cb" name="toggled"/>
- </object>
- <packing>
- <property name="position">3</property>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="AudioAllowDTSPass">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Enable this if your playback device supports DTS. This permits DTS passthru to be selected when automatic passthru selection is enabled.</property>
- <property name="label" translatable="yes">DTS</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal handler="global_audio_widget_changed_cb" name="toggled"/>
- </object>
- <packing>
- <property name="position">4</property>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="AudioAllowDTSHDPass">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Enable this if your playback device supports DTS-HD. This permits DTS-HD passthru to be selected when automatic passthru selection is enabled.</property>
- <property name="label" translatable="yes">DTS-HD</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal handler="global_audio_widget_changed_cb" name="toggled"/>
- </object>
- <packing>
- <property name="position">5</property>
- <property name="expand">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">0</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labela4">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Passthru Fallback:</property>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">4</property>
- <property name="right_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="AudioEncoderFallback">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Set the audio codec to encode with when a suitable track can not be found for audio passthru.</property>
- <signal handler="global_audio_widget_changed_cb" name="changed"/>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">7</property>
- <property name="right_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkHSeparator" id="separator1">
- <property name="visible">True</property>
- <property name="orientation">horizontal</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">0</property>
- <property name="right_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table14">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">2</property>
- <property name="n_columns">8</property>
- <property name="row_spacing">5</property>
- <property name="column_spacing">5</property>
- <child>
- <object class="GtkAlignment" id="alignment59">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="top_padding">8</property>
- <child>
- <object class="GtkLabel" id="audio_name_label">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="label" translatable="yes">Track Name:</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment25">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <child>
- <object class="GtkEntry" id="AudioTrackName">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="max_length">40</property>
- <property name="activates_default">True</property>
- <property name="width_chars">20</property>
- <property name="truncate_multiline">True</property>
- <property name="tooltip-text" translatable="yes">Set the audio track name. Players may use this in the audio selection list.</property>
- <signal handler="audio_widget_changed_cb" name="changed"/>
- </object>
- </child>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="AudioSamplerateLabel">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="label" translatable="yes">Sample Rate:</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment34">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0.5</property>
- <property name="xscale">0</property>
- <child>
- <object class="GtkComboBox" id="AudioSamplerate">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Set the sample rate of the output audio track.</property>
- <signal handler="audio_widget_changed_cb" name="changed"/>
- </object>
- </child>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="AudioTrackGainLabel">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="label" translatable="yes">Gain:</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox34">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">0</property>
- <child>
- <object class="GtkScaleButton" id="AudioTrackGain">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="icons">audio-volume-muted
- audio-volume-high
- audio-volume-low
- audio-volume-medium</property>
- <property name="adjustment">adjustment35</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-markup" translatable="yes">&lt;b&gt;Audio Gain:&lt;/b&gt; Adjust the amplification or attenuation of the output audio track.</property>
- <signal handler="gain_widget_changed_cb" name="value_changed"/>
- </object>
- <packing>
- <property name="position">0</property>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="AudioTrackGainValue">
- <property name="visible">True</property>
- <property name="width_chars">6</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">0dB</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="expand">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="AudioTrackDRCSliderLabel">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="label" translatable="yes">DRC:</property>
- <property name="tooltip-markup" translatable="yes">&lt;b&gt;Dynamic Range Compression:&lt;/b&gt; Adjust the dynamic range of the output audio track. 
-
- For source audio that has a wide dynamic range (very loud and very soft sequences), DRC allows you to 'compress' the range by making loud sections softer and soft sections louder.</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox33">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">0</property>
- <child>
- <object class="GtkScaleButton" id="AudioTrackDRCSlider">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="icons">audio-input-microphone</property>
- <property name="adjustment">adjustment28</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-markup" translatable="yes">&lt;b&gt;Dynamic Range Compression:&lt;/b&gt; Adjust the dynamic range of the output audio track. 
-
- For source audio that has a wide dynamic range (very loud and very soft sequences), DRC allows you to 'compress' the range by making loud sections softer and soft sections louder.</property>
- <signal handler="drc_widget_changed_cb" name="value_changed"/>
- </object>
- <packing>
- <property name="position">0</property>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="AudioTrackDRCValue">
- <property name="visible">True</property>
- <property name="width_chars">4</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Off</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="expand">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="AudioTrackQualityEnable">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Quality:</property>
- <property name="tooltip-markup" translatable="yes">&lt;b&gt;Quality:&lt;/b&gt; For output codec's that support it, adjust the quality of the output.</property>
- <property name="active">False</property>
- <property name="draw_indicator">True</property>
- <signal handler="audio_widget_changed_cb" name="toggled"/>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox32">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">0</property>
- <child>
- <object class="GtkScaleButton" id="AudioTrackQuality">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="icons">weather-storm
- weather-clear
- weather-storm
- weather-showers-scattered
- weather-showers
- weather-overcast
- weather-few-clouds
- weather-clear</property>
- <property name="adjustment">audio_quality_adj</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-markup" translatable="yes">&lt;b&gt;Quality:&lt;/b&gt; For output codec's that support it, adjust the quality of the output.</property>
- <signal handler="quality_widget_changed_cb" name="value_changed"/>
- </object>
- <packing>
- <property name="position">0</property>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="AudioTrackQualityValue">
- <property name="visible">True</property>
- <property name="width_chars">4</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">00.0</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="expand">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="filler_label0">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="xalign">0</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">5</property>
- <property name="right_attach">8</property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="filler_label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="xalign">0</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">5</property>
- <property name="right_attach">8</property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="expand">False</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">2</property>
- <property name="n_columns">4</property>
- <child>
- <object class="GtkLabel" id="label35">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Track</property>
+ <property name="label" translatable="yes">height:</property>
 </object>
 <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label68">
+ <object class="GtkSpinButton" id="PictureDisplayHeight">
 <property name="visible">True</property>
+ <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Encoder</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment26</property>
+ <signal name="value-changed" handler="display_height_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="x_padding">12</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
 </packing>
 </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox79">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">4</property>
 <child>
- <object class="GtkLabel" id="AudioBitrateLabel">
+ <object class="GtkLabel" id="label98">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Bitrate</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="label" translatable="yes">Pixel Aspect:</property>
 </object>
 <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="x_padding">10</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="AudioMixdownLabel">
+ <object class="GtkSpinButton" id="PicturePARWidth">
 <property name="visible">True</property>
+ <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Mix</property>
+ <property name="tooltip_text" translatable="yes">Pixel aspect defines the shape of the pixels.
+
+A 1:1 ratio defines a square pixel. Other values define rectangular shapes.
+Players will scale the image in order to achieve the specified aspect.</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment29</property>
+ <property name="snap_to_ticks">True</property>
+ <signal name="value-changed" handler="par_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkComboBox" id="AudioTrack">
- <property name="width_request">180</property>
+ <object class="GtkLabel" id="label99">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">List of audio tracks available from your source.</property>
- <signal handler="audio_track_changed_cb" name="changed"/>
+ <property name="label" translatable="yes">:</property>
 </object>
 <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
 </packing>
 </child>
 <child>
- <object class="GtkComboBox" id="AudioEncoder">
+ <object class="GtkSpinButton" id="PicturePARHeight">
 <property name="visible">True</property>
+ <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Set the audio codec to encode this track with.</property>
- <signal handler="audio_codec_changed_cb" name="changed"/>
+ <property name="tooltip_text" translatable="yes">Pixel aspect defines the shape of the pixels.
+A 1:1 ratio defines a square pixel. Other values define rectangular shapes.
+Players will scale the image in order to achieve the specified aspect.</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment30</property>
+ <signal name="value-changed" handler="par_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
 </packing>
 </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="PictureKeepRatio">
+ <property name="label" translatable="yes">Keep Aspect</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">If enabled, the original display aspect of the source will be maintained.</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="scale_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox53">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">4</property>
 <child>
- <object class="GtkComboBox" id="AudioBitrate">
+ <object class="GtkLabel" id="label93">
+ <property name="width_request">100</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Set the bitrate to encode this track with.</property>
- <signal handler="audio_widget_changed_cb" name="changed"/>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Display Aspect:</property>
 </object>
 <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkComboBox" id="AudioMixdown">
+ <object class="GtkLabel" id="display_aspect">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Set the mixdown of the output audio track.</property>
- <signal handler="audio_mix_changed_cb" name="changed"/>
+ <property name="label" translatable="yes">--:--</property>
 </object>
 <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="position">2</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
 </packing>
 </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label29">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">&lt;b&gt;Display Geometry&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">2</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="FiltersFrame">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkBox" id="hbox77">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">16</property>
+ <child>
+ <object class="GtkGrid" id="table90">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">5</property>
 <child>
- <object class="GtkScrolledWindow" id="scrolledwindow5">
+ <object class="GtkCheckButton" id="VideoGrayScale">
+ <property name="label" translatable="yes">Grayscale</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <child>
- <object class="GtkTreeView" id="audio_list">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_clickable">True</property>
- </object>
- </child>
+ <property name="tooltip_text" translatable="yes">If enabled, filter colour components out of video.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="setting_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="expand">True</property>
- <property name="position">3</property>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label41">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Deblock:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScale" id="PictureDeblock">
+ <property name="visible">True</property>
+ <property name="width_request">100</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">The deblocking filter removes a common type of compression artifact.
+If your source exhibits 'blockiness', this filter may help clean it up.</property>
+ <property name="adjustment">adjustment20</property>
+ <property name="digits">0</property>
+ <property name="value_pos">right</property>
+ <signal name="format-value" handler="format_deblock_cb" swapped="no"/>
+ <signal name="value-changed" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">2</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="table1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label32">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Denoise Filter:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="PictureDenoiseFilter">
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="width_request">100</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Denoise filtering reduces or removes the appearance of noise and grain.
+Film grain and other types of high frequency noise are difficult to compress.
+Using this filter on such sources can result in smaller file sizes.</property>
+ <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="PictureDenoisePresetLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Denoise Preset:</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="PictureDenoisePreset">
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="width_request">100</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Denoise filtering reduces or removes the appearance of noise and grain.
+Film grain and other types of high frequency noise are difficult to compress.
+Using this filter on such sources can result in smaller file sizes.</property>
+ <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="PictureDenoiseTuneLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Denoise Tune:</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="PictureDenoiseTune">
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="width_request">100</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Denoise filtering reduces or removes the appearance of noise and grain.
+Film grain and other types of high frequency noise are difficult to compress.
+Using this filter on such sources can result in smaller file sizes.</property>
+ <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="PictureDenoiseCustom">
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">Custom denoise filter string format
+
+SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma</property>
+ <property name="width_chars">8</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">2</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="table10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label86">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Detelecine:</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="PictureDetelecine">
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="width_request">100</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">This filter removes 'combing' artifacts that are the result of telecining.
+
+Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps.</property>
+ <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="PictureDetelecineCustom">
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">Custom detelecine filter string format
+
+JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity</property>
+ <property name="width_chars">8</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="PictureDecombDeinterlace">
+ <property name="label" translatable="yes">Decomb</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Choose decomb or deinterlace filter options.
+
+The decomb filter selectively deinterlaces frames that appear to be interlaced.
+This will preserve quality in frames that are not interlaced.
+
+The classic deinterlace filter is applied to all frames.
+Frames that are not interlaced will suffer some quality degradation.</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="PictureDeinterlaceDecomb">
+ <property name="label" translatable="yes">Deinterlace</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Choose decomb or deinterlace filter options.
+
+The decomb filter selectively deinterlaces frames that appear to be interlaced.
+This will preserve quality in frames that are not interlaced.
+
+The classic deinterlace filter is applied to all frames.
+Frames that are not interlaced will suffer some quality degradation.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">PictureDecombDeinterlace</property>
+ <signal name="toggled" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="PictureDecombLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Decomb:</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="PictureDecomb">
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="width_request">100</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">The decomb filter selectively deinterlaces frames that appear to be interlaced.
+This will preserve quality in frames that are not interlaced.</property>
+ <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="PictureDecombCustom">
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">Custom decomb filter string format
+
+Mode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:
+BlockHeight:MagnitudeThres:VarianceThres:LaplacianThresh:DilationThresh:
+ErosionThresh:NoiseThresh:MaxSearchDistance:PostProcessing:Parity</property>
+ <property name="width_chars">8</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="PictureDeinterlaceLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Deinterlace:</property>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="PictureDeinterlace">
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="width_request">100</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">The classic deinterlace filter is applied to all frames.
+Frames that are not interlaced will suffer some quality degradation.</property>
+ <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="PictureDeinterlaceCustom">
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">Custom deinterlace filter string format
+
+YadifMode:YadifParity:McdintMode:McdeintQp</property>
+ <property name="width_chars">8</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">6</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">2</property>
+ <property name="position">2</property>
+ </packing>
 </child>
 </object>
 </child>
+ <child type="label">
+ <object class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">&lt;b&gt;Filters&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
 </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
 </child>
- <child type="tab">
- <object class="GtkLabel" id="label48">
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="name">picture_tab</property>
+ <property name="title" translatable="yes">Picture</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="video_tab">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">0</property>
+ <child>
+ <object class="GtkBox" id="hbox17">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
- <property name="label" translatable="yes">Audio</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">48</property>
+ <child>
+ <object class="GtkGrid" id="table15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">2</property>
+ <property name="margin-top">12</property>
+ <property name="margin-left">24</property>
+ <child>
+ <object class="GtkLabel" id="label46">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Video Encoder:</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="VideoEncoder">
+ <property name="visible">True</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Available video encoders.</property>
+ <signal name="changed" handler="vcodec_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label47">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Framerate:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="VideoFramerate">
+ <property name="visible">True</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Output framerate.
+
+'Same as source' is recommended. If your source video has
+a variable framerate, 'Same as source' will preserve it.</property>
+ <signal name="changed" handler="framerate_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="VideoFramerateCFR">
+ <property name="label" translatable="yes">Constant Framerate</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Enables constant framerate output.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="VideoFrameratePFR">
+ <property name="label" translatable="yes">Peak Framerate (VFR)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Enables variable framerate output with a peak
+rate determined by the framerate setting.
+
+VFR is not compatible with some players.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">VideoFramerateCFR</property>
+ <signal name="toggled" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="VideoFramerateVFR">
+ <property name="label" translatable="yes">Variable Framerate</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Enables variable framerate output.
+
+VFR is not compatible with some players.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">VideoFramerateCFR</property>
+ <signal name="toggled" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="table8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">2</property>
+ <property name="margin-top">12</property>
+ <property name="margin-right">24</property>
+ <child>
+ <object class="GtkScale" id="VideoQualitySlider">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Set the desired quality factor.
+The encoder targets a certain quality.
+The scale used by each video encoder is different.
+
+x264's scale is logarithmic and lower values correspond to higher quality.
+So small decreases in value will result in progressively larger increases
+in the resulting file size. A value of 0 means lossless and will result
+in a file size that is larger than the original source, unless the source
+was also lossless.
+
+FFMpeg's and Theora's scale is more linear.
+These encoders do not have a lossless mode.</property>
+ <property name="adjustment">adjustment5</property>
+ <property name="digits">3</property>
+ <property name="hexpand">True</property>
+ <signal name="format-value" handler="format_vquality_cb" swapped="no"/>
+ <signal name="value-changed" handler="vquality_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="vquality_type_constant">
+ <property name="label" translatable="yes">Constant Quality:</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Set the desired quality factor.
+The encoder targets a certain quality.
+The scale used by each video encoder is different.
+
+x264's scale is logarithmic and lower values correspond to higher quality.
+So small decreases in value will result in progressively larger increases
+in the resulting file size. A value of 0 means lossless and will result
+in a file size that is larger than the original source, unless the source
+was also lossless.
+
+FFMpeg's and Theora's scale is more linear.
+These encoders do not have a lossless mode.</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="vquality_type_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="vquality_type_bitrate">
+ <property name="label" translatable="yes">Bitrate (kbps): </property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Set the average bitrate.
+
+The instantaneous bitrate can be much higher or lower at any point in time.
+But the average over a long duration will be the value set here. If you need
+to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">vquality_type_constant</property>
+ <signal name="toggled" handler="vquality_type_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="VideoAvgBitrate">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Set the average bitrate.
+
+The instantaneous bitrate can be much higher or lower at any point in time.
+But the average over a long duration will be the value set here. If you need
+to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings.</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment3</property>
+ <signal name="value-changed" handler="vbitrate_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="VideoTwoPass">
+ <property name="label" translatable="yes">2-Pass Encoding</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Perform 2 Pass Encoding.
+
+The 'Bitrate' option is prerequisite. During the 1st pass, statistics about
+the video are collected. Then in the second pass, those statistics are used
+to make bitrate allocation decisions.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="VideoTurboTwoPass">
+ <property name="label" translatable="yes">Turbo First Pass</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">During the 1st pass of a 2 pass encode, use settings that speed things along.</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">2</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
 </object>
 <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">0</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="subtitle_tab">
+ <object class="GtkBox" id="VideoSettings">
 <property name="orientation">vertical</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="margin-left">24</property>
+ <property name="margin-right">24</property>
+ <child>
+ <object class="GtkCheckButton" id="x264UseAdvancedOptions">
+ <property name="label" translatable="yes">Use Advanced Options</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Use advanced options Tab for x264 settings.
+
+Use at your own risk!</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="x264_use_advanced_options_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">2</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
 <child>
- <object class="GtkAlignment" id="alignment23">
+ <object class="GtkGrid" id="VideoSettingsTable">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">12</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">12</property>
- <property name="right_padding">2</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">2</property>
 <child>
- <object class="GtkVBox" id="vbox12">
- <property name="orientation">vertical</property>
+ <object class="GtkLabel" id="VideoPresetLabel">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">2</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Preset:</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScale" id="VideoPresetSlider">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Adjusts encoder settings to trade off compression efficiency against encoding speed.
+
+This establishes your default encoder settings.
+Tunes, profiles, levels and advanced option string will be applied to this.
+You should generally set this option to the slowest you can bear since slower
+settings will result in better quality or smaller files.</property>
+ <property name="adjustment">VideoPresetRange</property>
+ <property name="digits">0</property>
+ <property name="value_pos">right</property>
+ <property name="hexpand">True</property>
+ <signal name="format-value" handler="format_video_preset_cb" swapped="no"/>
+ <signal name="value-changed" handler="video_setting_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">5</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="VideoTuneLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Tune:</property>
+ <property name="margin_top">8</property>
+ <property name="margin_bottom">8</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="VideoTune">
+ <property name="visible">True</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Tune settings to optimize for common scenarios.
+
+This can improve effeciency for particular source characteristics or set
+characteristics of the output file. Changes will be applied after the
+preset but before all other parameters.</property>
+ <signal name="changed" handler="video_setting_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="x264FastDecode">
+ <property name="label" translatable="yes">Fast Decode</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Reduce decoder CPU usage.
+
+Set this if your device is struggling to play the output (dropped frames).</property>
+ <property name="halign">start</property>
+ <property name="margin_left">2</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="video_setting_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="x264ZeroLatency">
+ <property name="visible">False</property>
+ <property name="label" translatable="yes">Zero Latency</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Minimize latency between input to encoder and output of decoder.
+
+This is useful for broadcast of live streams.
+
+Since HandBrake is not suitable for live stream broadcast purposes,
+this setting is of little value here.</property>
+ <property name="halign">start</property>
+ <property name="margin_left">2</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="video_setting_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="VideoProfileLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Profile:</property>
+ <property name="margin_top">8</property>
+ <property name="margin_bottom">8</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="VideoProfile">
+ <property name="visible">True</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Sets and ensures compliance with the specified profile.
+
+Overrides all other settings.</property>
+ <signal name="changed" handler="video_setting_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="VideoLevelLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Level:</property>
+ <property name="margin_top">8</property>
+ <property name="margin_bottom">8</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="VideoLevel">
+ <property name="visible">True</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Sets and ensures compliance with the specified level.
+
+Overrides all other settings.</property>
+ <signal name="changed" handler="video_setting_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox43">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">5</property>
 <child>
- <object class="GtkHBox" id="hbox45">
+ <object class="GtkLabel" id="VideoOptionExtraLabel">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkButton" id="subtitle_add">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Add new subtitle to the list</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <property name="label">Subtitle</property>
- <property name="image">subtitle_add_image</property>
- <signal handler="subtitle_add_clicked_cb" name="clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="srt_add">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Add new SRT subtitle to the list</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <property name="label">Import SRT</property>
- <property name="image">srt_add_image</property>
- <signal handler="srt_add_clicked_cb" name="clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">More Settings:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="VideoOptionExtraWindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">etched-in</property>
+ <property name="hexpand">True</property>
 <child>
- <object class="GtkButton" id="subtitle_remove">
+ <object class="GtkTextView" id="VideoOptionExtra">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Remove the selected subtitle settings</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <signal handler="subtitle_remove_clicked_cb" name="clicked"/>
- <child>
- <object class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="stock">gtk-remove</property>
- </object>
- </child>
+ <property name="tooltip_text" translatable="yes">Additional encoder settings.
+
+Colon separated list of encoder options.</property>
+ <property name="wrap_mode">char</property>
+ <property name="accepts_tab">False</property>
 </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
 </child>
 </object>
 <packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="width">4</property>
+ <property name="height">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">0</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">2</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="name">video_tab</property>
+ <property name="title" translatable="yes">Video</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="audio_defaults_tab">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">12</property>
+ <property name="margin_top">12</property>
+ <property name="margin_bottom">12</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkBox" id="audio_defaults_box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">horizontal</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkBox" id="audio_defaults_box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">2</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Selection Behavior:</property>
+ <property name="justify">right</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="AudioTrackSelectionBehavior">
+ <property name="visible">True</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="audio_def_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">2</property>
+ <property name="halign">GTK_ALIGN_END</property>
+ <property name="margin_top">6</property>
+ <property name="margin_bottom">6</property>
 <child>
- <object class="GtkTable" id="subtitle_table">
+ <object class="GtkScrolledWindow" id="scrolledwindow10">
 <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">2</property>
- <property name="n_columns">5</property>
- <property name="column-spacing">4</property>
- <child>
- <object class="GtkLabel" id="subtitle_track_label">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Track</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="srt_lang_label">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Language</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- </packing>
- </child>
+ <property name="min_content_height">84</property>
 <child>
- <object class="GtkLabel" id="srt_code_label">
+ <object class="GtkListBox" id="audio_avail_lang">
 <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Character Code</property>
+ <property name="can_focus">False</property>
 </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="srt_file_label">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">File</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="srt_offset_label">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Offset (ms)</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="SubtitleTrack">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">List of subtitle tracks available from your source.</property>
- <signal handler="subtitle_track_changed_cb" name="changed"/>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="SrtLanguage">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Set the language of this subtitle. This value will be used by players in subtitle menus.</property>
- <signal handler="srt_lang_changed_cb" name="changed"/>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="SrtCodeset">
- <property name="width_request">150</property>
- <property name="has_entry">True</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Set the character code used by the SRT file you are importing. SRTs come in all flavours of character sets. We translate the character set to UTF-8. The source's character code is needed in order to perform this translation.</property>
- <signal handler="srt_changed_cb" name="changed"/>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
 </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow11">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <object class="GtkFileChooserButton" id="SrtFile">
+ <object class="GtkListBox" id="audio_selected_lang">
 <property name="visible">True</property>
- <property name="local-only">False</property>
- <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
- <property name="title" translatable="yes">Srt File</property>
- <property name="tooltip-text" translatable="yes">Select the SRT file to import.</property>
- <signal name="selection_changed" handler="srt_file_changed_cb"/>
+ <property name="can_focus">False</property>
 </object>
- <packing>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
- <property name="y_options"></property>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
 </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="audio_lang_add">
+ <property name="label" translatable="yes">Add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <signal name="clicked" handler="audio_add_lang_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="audio_lang_remove">
+ <property name="label" translatable="yes">Remove</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <signal name="clicked" handler="audio_remove_lang_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Available Languages</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label24">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Selected Languages</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="AudioSecondaryEncoderMode">
+ <property name="label" translatable="yes">Use only first encoder for secondary audio</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Only the primary audio track will be encoded with the full encoder list.
+All other secondary audio output tracks will be encoded with first encoder only.</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="audio_def_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="auto_pass_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="margin_left">6</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">2</property>
+ <property name="halign">end</property>
+ <child>
+ <object class="GtkLabel" id="labela3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Auto Passthru:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="AudioAllowMP3Pass">
+ <property name="label" translatable="yes">MP3</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Enable this if your playback device supports MP3.
+This permits MP3 passthru to be selected when automatic passthru selection is enabled.</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="AudioAllowAACPass">
+ <property name="label" translatable="yes">AAC</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Enable this if your playback device supports AAC.
+This permits AAC passthru to be selected when automatic passthru selection is enabled.</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="AudioAllowAC3Pass">
+ <property name="label" translatable="yes">AC-3</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Enable this if your playback device supports AC-3.
+This permits AC-3 passthru to be selected when automatic passthru selection is enabled.</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="AudioAllowDTSPass">
+ <property name="label" translatable="yes">DTS</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Enable this if your playback device supports DTS.
+This permits DTS passthru to be selected when automatic passthru selection is enabled.</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="AudioAllowDTSHDPass">
+ <property name="label" translatable="yes">DTS-HD</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Enable this if your playback device supports DTS-HD.
+This permits DTS-HD passthru to be selected when automatic passthru selection is enabled.</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="auto_fallback_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">horizontal</property>
+ <property name="spacing">6</property>
+ <property name="halign">end</property>
+ <child>
+ <object class="GtkLabel" id="labela4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Passthru Fallback:</property>
+ </object>
+ <packing>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="AudioEncoderFallback">
+ <property name="visible">True</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Set the audio codec to encode with when a suitable track can not be found for audio passthru.</property>
+ <signal name="changed" handler="audio_fallback_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="audio_def_settings_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">6</property>
+ <property name="halign">start</property>
+ <property name="use_markup">True</property>
+ <property name="label" translatable="yes">&lt;b&gt;Audio Encoder Settings:&lt;/b&gt;</property>
+ <property name="tooltip_markup" translatable="yes">Each selected source track will be encoded with all selected encoders</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="sep1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="audio_list_default_header">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkLabel" id="audio_defaults_encoder_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Encoder</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="audio_defaults_bitrate_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Bitrate/Quality</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="audio_defaults_mixdown_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Mixdown</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="audio_defaults_samplerate_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Samplerate</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="audio_defaults_gain_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Gain</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="audio_defaults_drc_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">DRC</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow12">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkListBox" id="audio_list_default">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="selection_mode">none</property>
+ <property name="activate_on_single_click">False</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="name">audio_defaults_tab</property>
+ <property name="title" translatable="yes">Audio Defaults</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="audio_list_tab">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkBox" id="vbox17">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">6</property>
+ <property name="margin-left">6</property>
+ <property name="margin-right">6</property>
+ <child>
+ <object class="GtkToolbar" id="audio_toolbar">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkToolButton" id="audio_add">
+ <property name="visible">True</property>
+ <property name="sensitive">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Add</property>
+ <property name="icon_name">list-add</property>
+ <property name="tooltip_text" translatable="yes">Add new audio settings to the list</property>
+ <signal name="clicked" handler="audio_add_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="audio_add_all">
+ <property name="visible">True</property>
+ <property name="sensitive">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Add All</property>
+ <property name="icon_name">list-add</property>
+ <property name="tooltip_text" translatable="yes">Add all audio tracks to the list</property>
+ <signal name="clicked" handler="audio_add_all_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="audio_reset">
+ <property name="visible">True</property>
+ <property name="sensitive">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Reload Defaults</property>
+ <property name="icon_name">emblem-default</property>
+ <property name="tooltip_text" translatable="yes">Reload all audio settings from defaults</property>
+ <signal name="clicked" handler="audio_reset_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow5">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkTreeView" id="audio_list">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ <property name="name">audio_list_tab</property>
+ <property name="title" translatable="yes">Audio List</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="subtitle_defaults_tab">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">12</property>
+ <property name="margin_top">12</property>
+ <property name="margin_bottom">12</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkBox" id="subtitle_defaults_box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">horizontal</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkBox" id="subtitle_defaults_box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkGrid" id="sub_grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">2</property>
+ <child>
+ <object class="GtkLabel" id="sub_label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Selection Behavior:</property>
+ <property name="justify">right</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="SubtitleTrackSelectionBehavior">
+ <property name="visible">True</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="subtitle_def_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="sub_grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">2</property>
+ <property name="halign">GTK_ALIGN_END</property>
+ <property name="margin_top">6</property>
+ <property name="margin_bottom">6</property>
+ <child>
+ <object class="GtkScrolledWindow" id="sub_scrolledwindow10">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="min_content_height">108</property>
 <child>
- <object class="GtkSpinButton" id="SrtOffset">
+ <object class="GtkListBox" id="subtitle_avail_lang">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Adjust the offset in milliseconds between video and SRT timestamps</property>
- <property name="adjustment">adjustment31</property>
- <signal handler="srt_changed_cb" name="value_changed"/>
+ <property name="can_focus">False</property>
 </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
 </child>
 </object>
 <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">4</property>
 </packing>
 </child>
 <child>
- <object class="GtkScrolledWindow" id="scrolledwindow4">
+ <object class="GtkScrolledWindow" id="sub_scrolledwindow11">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 <child>
- <object class="GtkTreeView" id="subtitle_list">
+ <object class="GtkListBox" id="subtitle_selected_lang">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_clickable">True</property>
+ <property name="can_focus">False</property>
 </object>
 </child>
 </object>
 <packing>
- <property name="position">2</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="subtitle_lang_add">
+ <property name="label" translatable="yes">Add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <signal name="clicked" handler="subtitle_add_lang_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="subtitle_lang_remove">
+ <property name="label" translatable="yes">Remove</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <signal name="clicked" handler="subtitle_remove_lang_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="sub_label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Available Languages</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="sub_label24">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Selected Languages</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="subtitle_preferred_language">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Preferred Language: None</property>
+ <property name="justify">right</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
 </child>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
 </child>
 </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
 </child>
- <child type="tab">
- <object class="GtkLabel" id="label9">
+ <child>
+ <object class="GtkCheckButton" id="SubtitleAddForeignAudioSearch">
+ <property name="label" translatable="yes">Add Foreign Audio Search Pass</property>
 <property name="visible">True</property>
- <property name="label" translatable="yes">Subtitles</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Add "Foreign Audio Search" when the default audio track is your preferred language.
+This search pass finds short sequences of foreign audio and provides subtitles for them.</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="subtitle_def_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="position">3</property>
- <property name="tab_fill">False</property>
+ <property name="position">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="advanced_tab">
+ <object class="GtkCheckButton" id="SubtitleAddForeignAudioSubtitle">
+ <property name="label" translatable="yes">Add subtitle track if default audio is foreign</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">When the default audio track is not your preferred language, add a subtitle track.</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="subtitle_def_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="SubtitleAddCC">
+ <property name="label" translatable="yes">Add Closed Captions when available</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Closed captions are text subtitles that can be added to any container as a soft subtitle track (not burned)</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="subtitle_def_widget_changed_cb" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ <property name="name">subtitle_defaults_tab</property>
+ <property name="title" translatable="yes">Subtitle Defaults</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="subtitle_list_tab">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkBox" id="vbox12">
 <property name="orientation">vertical</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">6</property>
+ <property name="margin-left">6</property>
+ <property name="margin-right">6</property>
 <child>
-
- <object class="GtkVBox" id="x264_tab">
+ <object class="GtkToolbar" id="subtitle_toolbar">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkToolButton" id="subtitle_add">
+ <property name="visible">True</property>
+ <property name="sensitive">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Add</property>
+ <property name="icon_name">list-add</property>
+ <property name="tooltip_text" translatable="yes">Add new subtitle settings to the list</property>
+ <signal name="clicked" handler="subtitle_add_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="subtitle_add_all">
+ <property name="visible">True</property>
+ <property name="sensitive">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Add All</property>
+ <property name="icon_name">list-add</property>
+ <property name="tooltip_text" translatable="yes">Add all subtitle tracks to the list</property>
+ <signal name="clicked" handler="subtitle_add_all_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="subtitle_reset">
+ <property name="visible">True</property>
+ <property name="sensitive">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Reload Defaults</property>
+ <property name="icon_name">emblem-default</property>
+ <property name="tooltip_text" translatable="yes">Reload all subtitle settings from defaults</property>
+ <signal name="clicked" handler="subtitle_reset_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkTreeView" id="subtitle_list">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">6</property>
+ <property name="name">subtitle_list_tab</property>
+ <property name="title" translatable="yes">Subtitle List</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="advanced_video_tab">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkBox" id="x264_box">
 <property name="orientation">vertical</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <object class="GtkHBox" id="hbox73">
+ <object class="GtkBox" id="hbox73">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="spacing">2</property>
 <child>
- <object class="GtkVBox" id="vbox21">
+ <object class="GtkBox" id="vbox21">
 <property name="orientation">vertical</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
 <object class="GtkFrame" id="frame10">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">none</property>
 <child>
- <object class="GtkAlignment" id="alignment26">
+ <object class="GtkGrid" id="table6">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">12</property>
- <property name="right_padding">2</property>
+ <property name="column_spacing">4</property>
+ <property name="row_spacing">2</property>
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">2</property>
+ <property name="margin-left">12</property>
+ <property name="margin-right">2</property>
 <child>
- <object class="GtkTable" id="table6">
+ <object class="GtkLabel" id="label49">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
- <property name="column-spacing">4</property>
- <property name="row-spacing">2</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">&lt;small&gt;Reference Frames:&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="x264_refs">
+ <property name="halign">center</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.
+Cel animation tends to benefit from more reference frames a lot more than film content.
+
+Note that many hardware devices have limitations on the number of supported reference
+frames, so if you're encoding for a handheld or standalone player, don't touch this unless
+you're absolutely sure you know what you're doing!</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment8</property>
+ <signal name="value-changed" handler="x264_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label51">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">&lt;small&gt;Maximum B-Frames:&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="x264_bframes">
+ <property name="halign">center</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.
+
+Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.
+Cel-animated source material and B-pyramid also significantly increase the usefulness of larger
+values.
+
+Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off).</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment9</property>
+ <signal name="value-changed" handler="x264_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label50">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">&lt;small&gt;Pyramidal B-Frames:&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="x264_bpyramid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">B-pyramid improves compression by creating a pyramidal structure (hence the name)
+of B-frames, allowing B-frames to reference each other to improve compression.
+
+Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit.</property>
+ <signal name="changed" handler="x264_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label40">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">&lt;small&gt;Weighted P-Frames:&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="x264_weighted_pframes">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Performs extra analysis to decide upon weighting parameters for each frame.
+
+This improves overall compression slightly and improves the quality of fades greatly.
+
+Baseline profile, as required for iPods and similar devices, requires weighted P-frame
+prediction to be disabled. Note that some devices and players, even those that support
+Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is
+completely incompatible with it, for example.</property>
+ <signal name="changed" handler="x264_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="x264_8x8dct">
+ <property name="label" translatable="yes">8x8 Transform</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.
+
+It improves compression by at least 5% at a very small speed cost and may
+provide an unusually high visual quality benefit compared to its compression
+gain. However, it requires High Profile, which many devices may not support.</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="x264_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="left_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="x264_cabac">
+ <property name="label" translatable="yes">CABAC Entropy Encoding</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">After the encoder has done its work, it has a bunch of data that
+needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides
+two options for this: CAVLC and CABAC. CABAC decodes a lot slower but
+compresses significantly better (10-30%), especially at lower bitrates.
+
+If you're looking to minimize CPU requirements for video playback, disable this option.
+Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled.</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="x264_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="left_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label53">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Encoding Features&lt;/b&gt;&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox25">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkFrame" id="frame12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkBox" id="hbox84">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="margin_left">12</property>
+ <child>
+ <object class="GtkGrid" id="table5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="column_spacing">4</property>
+ <property name="row_spacing">2</property>
 <child>
- <object class="GtkLabel" id="label49">
+ <object class="GtkLabel" id="label55">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;small&gt;Reference Frames:&lt;/small&gt;</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">&lt;small&gt;Motion Est. Method:&lt;/small&gt;</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
 <property name="left_attach">0</property>
- <property name="right_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkAlignment" id="alignment41">
+ <object class="GtkComboBox" id="x264_me">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <child>
- <object class="GtkSpinButton" id="x264_refs">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Sane values are ~1-6. The more you add, the better the compression, but the slower the encode. Cel animation tends to benefit from more reference frames a lot more than film content. Note that many hardware devices have limitations on the number of supported reference frames, so if you're encoding for a handheld or standalone player, don't touch this unless you're absolutely sure you know what you're doing!</property>
- <property name="adjustment">adjustment8</property>
- <signal handler="x264_widget_changed_cb" name="value_changed"/>
- </object>
- <packing>
- </packing>
- </child>
+ <property name="tooltip_text" translatable="yes">Controls the motion estimation method.
+
+Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.
+A better motion search method improves compression at the cost of speed.
+
+Diamond: performs an extremely fast and simple search using a diamond pattern.
+Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.
+Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.
+Exhaustive: performs a "dumb" search of every pixel in a wide area. Significantly slower for only a small compression gain.
+Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement.</property>
+ <signal name="changed" handler="x264_me_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label51">
+ <object class="GtkLabel" id="label58">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;small&gt;Maximum B-Frames:&lt;/small&gt;</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">&lt;small&gt;Subpel ME &amp;amp; Mode:&lt;/small&gt;</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL</property>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
 <property name="left_attach">0</property>
- <property name="right_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkAlignment" id="alignment38">
+ <object class="GtkComboBox" id="x264_subme">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <child>
- <object class="GtkSpinButton" id="x264_bframes">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use. Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal. Cel-animated source material and B-pyramid also significantly increase the usefulness of larger values. Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off).</property>
- <property name="adjustment">adjustment9</property>
- <signal handler="x264_widget_changed_cb" name="value_changed"/>
- </object>
- </child>
+ <property name="tooltip_markup" translatable="yes">This setting controls both subpixel-precision motion estimation and mode decision methods.
+
+Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.
+Mode decision is the method used to choose how to encode each block of the frame: a very important decision.
+SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.
+6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.
+11 disables all early terminations in analysis.
+10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode &gt; 0) and trellis 2 (always).</property>
+ <signal name="changed" handler="x264_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label50">
+ <object class="GtkLabel" id="label57">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;small&gt;Pyramidal B-Frames:&lt;/small&gt;</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">&lt;small&gt;Motion Est. Range:&lt;/small&gt;</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL</property>
 <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
 <property name="left_attach">0</property>
- <property name="right_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkComboBox" id="x264_bpyramid">
+ <object class="GtkSpinButton" id="x264_merange">
 <property name="visible">True</property>
+ <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">B-pyramid improves compression by creating a pyramidal structure (hence the name) of B-frames, allowing B-frames to reference each other to improve compression. Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit.</property>
- <signal handler="x264_widget_changed_cb" name="changed"/>
+ <property name="tooltip_text" translatable="yes">This is the distance x264 searches from its initial guess at the
+motion of a block in order to try to find its actual motion.
+
+The default is fine for most content, but extremely high motion video,
+especially at HD resolutions, may benefit from higher ranges, albeit at
+a high speed cost.</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment10</property>
+ <signal name="value-changed" handler="x264_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label40">
+ <object class="GtkLabel" id="label52">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;small&gt;Weighted P-Frames:&lt;/small&gt;</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">&lt;small&gt;Adaptive Direct Mode:&lt;/small&gt;</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
- <property name="y_options"></property>
- <property name="x_options">GTK_FILL</property>
 <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
 <property name="left_attach">0</property>
- <property name="right_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkComboBox" id="x264_weighted_pframes">
+ <object class="GtkComboBox" id="x264_direct">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Performs extra analysis to decide upon weighting parameters for each frame. This improves overall compression slightly and improves the quality of fades greatly. Baseline profile, as required for iPods and similar devices, requires weighted P-frame prediction to be disabled. Note that some devices and players, even those that support Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is completely incompatible with it, for example.</property>
- <signal handler="x264_widget_changed_cb" name="changed"/>
+ <property name="tooltip_text" translatable="yes">H.264 allows for two different prediction modes, spatial and temporal, in B-frames.
+
+Spatial, the default, is almost always better, but temporal is sometimes useful too.
+x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),
+adaptively select which is better for each particular frame.</property>
+ <signal name="changed" handler="x264_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkCheckButton" id="x264_8x8dct">
+ <object class="GtkLabel" id="label84">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed. It improves compression by at least 5% at a very small speed cost and may provide an unusually high visual quality benefit compared to its compression gain. However, it requires High Profile, which many devices may not support.</property>
- <property name="label" translatable="yes">8x8 Transform</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal handler="x264_widget_changed_cb" name="toggled"/>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">&lt;small&gt;Adaptive B-Frames:&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
 </object>
 <packing>
 <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
 <property name="left_attach">0</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkCheckButton" id="x264_cabac">
+ <object class="GtkComboBox" id="x264_b_adapt">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">After the encoder has done its work, it has a bunch of data that needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides two options for this: CAVLC and CABAC. CABAC decodes a lot slower but compresses significantly better (10-30%), especially at lower bitrates. If you're looking to minimize CPU requirements for video playback, disable this option. Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled.</property>
- <property name="label" translatable="yes">CABAC Entropy Encoding</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal handler="x264_widget_changed_cb" name="toggled"/>
+ <property name="tooltip_markup" translatable="yes">x264 has a variety of algorithms to decide when to use B-frames and how many to use.
+
+Fast mode takes roughly the same amount of time no matter how many B-frames you specify.
+However, while fast, its decisions are often suboptimal.
+
+Optimal mode gets slower as the maximum number of B-Frames increases,
+but makes much more accurate decisions, especially when used with B-pyramid.</property>
+ <signal name="changed" handler="x264_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="left_attach">0</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="top_attach">4</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
 </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label53">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Encoding Features&lt;/b&gt;&lt;/small&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox25">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <object class="GtkFrame" id="frame12">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkHBox" id="hbox84">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-
 <child>
- <object class="GtkAlignment" id="alignment30">
+ <object class="GtkGrid" id="table3">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">12</property>
- <property name="right_padding">2</property>
+ <property name="column_spacing">4</property>
+ <property name="row_spacing">2</property>
+ <property name="margin_left">6</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
 <child>
- <object class="GtkTable" id="table5">
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label59">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
- <property name="row-spacing">2</property>
- <property name="column-spacing">4</property>
- <child>
- <object class="GtkLabel" id="label55">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;small&gt;Motion Est. Method:&lt;/small&gt;</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="x264_me">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Controls the motion estimation method. Motion estimation is how the encoder estimates how each block of pixels in a frame has moved. A better motion search method improves compression at the cost of speed.
-
- Diamond: performs an extremely fast and simple search using a diamond pattern.
-
- Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.
-
- Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.
-
- Exhaustive: performs a "dumb" search of every pixel in a wide area. Significantly slower for only a small compression gain.
-
- Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement.</property>
- <signal handler="x264_me_changed_cb" name="changed"/>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label58">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;small&gt;Subpel ME &amp;amp; Mode:&lt;/small&gt;</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="x264_subme">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-markup" translatable="yes">This setting controls both subpixel-precision motion estimation and mode decision methods.
-
- Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.
-
- Mode decision is the method used to choose how to encode each block of the frame: a very important decision.
-
- SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.
-
- 6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.
-
- 11 disables all early terminations in analysis.
-
- 10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always).</property>
- <signal handler="x264_widget_changed_cb" name="changed"/>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label57">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;small&gt;Motion Est. Range:&lt;/small&gt;</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="x264_merange">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">This is the distance x264 searches from its best guess at the motion of a block in order to try to find its actual motion. The default is fine for most content, but extremely high motion video, especially at HD resolutions, may benefit from higher ranges, albeit at a high speed cost.</property>
- <property name="adjustment">adjustment10</property>
- <signal handler="x264_widget_changed_cb" name="value_changed"/>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label52">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;small&gt;Adaptive Direct Mode:&lt;/small&gt;</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment39">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <child>
- <object class="GtkComboBox" id="x264_direct">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">H.264 allows for two different prediction modes, spatial and temporal, in B-frames.
-
- Spatial, the default, is almost always better, but temporal is sometimes useful too.
-
- x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain), adaptively select which is better for each particular frame.</property>
- <signal handler="x264_widget_changed_cb" name="changed"/>
- </object>
- </child>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label84">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;small&gt;Adaptive B-Frames:&lt;/small&gt;</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment40">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <child>
- <object class="GtkComboBox" id="x264_b_adapt">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-markup" translatable="yes">x264 has a variety of algorithms to decide when to use B-frames and how many to use.
-
- Fast mode takes roughly the same amount of time no matter how many B-frames you specify. However, while fast, its decisions are often suboptimal.
-
- Optimal mode gets slower as the maximum number of B-Frames increases, but makes much more accurate decisions, especially when used with B-pyramid.</property>
- <signal handler="x264_widget_changed_cb" name="changed"/>
- </object>
- </child>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">&lt;small&gt;Partitions:&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
 </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="x264_analyse">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Mode decision picks from a variety of options to make its decision:
+this option chooses what options those are.
+
+Fewer partitions to check means faster encoding, at the cost of worse
+decisions, since the best option might have been one that was turned off.</property>
+ <signal name="changed" handler="x264_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
 </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment31">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">12</property>
- <property name="right_padding">2</property>
 <child>
- <object class="GtkTable" id="table3">
+ <object class="GtkLabel" id="label62">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
- <property name="row-spacing">2</property>
- <property name="column-spacing">4</property>
- <child>
- <object class="GtkLabel" id="label59">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;small&gt;Partitions:&lt;/small&gt;</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="x264_analyse">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Mode decision picks from a variety of options to make its decision: this option chooses what options those are. Fewer partitions to check means faster encoding, at the cost of worse decisions, since the best option might have been one that was turned off.</property>
- <signal handler="x264_widget_changed_cb" name="changed"/>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label62">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;small&gt;Trellis:&lt;/small&gt;</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="x264_trellis">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Trellis fine-tunes the rounding of transform coefficients to squeeze out 3-5% more compression at the cost of some speed. "Always" uses trellis not only during the main encoding process, but also during analysis, which improves compression even more, albeit at great speed cost. Trellis costs more speed at higher bitrates and requires CABAC.</property>
- <signal handler="x264_widget_changed_cb" name="changed"/>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">&lt;small&gt;Trellis:&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
 </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="x264_trellis">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Trellis fine-tunes the rounding of transform coefficients to
+squeeze out 3-5% more compression at the cost of some speed.
+
+"Always" uses trellis not only during the main encoding process, but also
+during analysis, which improves compression even more, albeit at great speed cost.
+
+Trellis costs more speed at higher bitrates and requires CABAC.</property>
+ <signal name="changed" handler="x264_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
- <packing>
- </packing>
 </child>
 <child type="label">
 <object class="GtkLabel" id="label60">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Analysis&lt;/b&gt;&lt;/small&gt;</property>
 <property name="use_markup">True</property>
@@ -4148,211 +5567,272 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="padding">2</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame13">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">none</property>
 <child>
- <object class="GtkAlignment" id="alignment35">
+ <object class="GtkBox" id="vbox27">
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">2</property>
+ <property name="margin-left">12</property>
+ <property name="margin-right">2</property>
+ <property name="orientation">vertical</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">12</property>
- <property name="right_padding">2</property>
 <child>
- <object class="GtkVBox" id="vbox27">
- <property name="orientation">vertical</property>
+ <object class="GtkGrid" id="table9">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <object class="GtkTable" id="table9">
+ <object class="GtkLabel" id="label73">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">&lt;small&gt;Adaptive Quantization Strength:&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScale" id="x264_aq_strength">
 <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label73">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;small&gt;Adaptive Quantization Strength:&lt;/small&gt;</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkHScale" id="x264_aq_strength">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Adaptive quantization controls how the encoder distributes bits across the frame. Higher values take more bits away from edges and complex areas to improve areas with finer detail.</property>
- <property name="adjustment">adjustment34</property>
- <property name="restrict_to_fill_level">False</property>
- <property name="value_pos">GTK_POS_RIGHT</property>
- <signal handler="x264_slider_changed_cb" name="value_changed"/>
- <signal name="format_value" handler="x264_format_slider_cb"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label82">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;small&gt;Psychovisual Rate Distortion:&lt;/small&gt;</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHScale" id="x264_psy_rd">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Psychovisual rate-distortion optimization takes advantage of the characteristics of human vision to dramatically improve apparent detail and sharpness. The effect can be made weaker or stronger by adjusting the strength. Being an RD algorithm, it requires mode decision to be at least "6".</property>
- <property name="adjustment">adjustment22</property>
- <property name="restrict_to_fill_level">False</property>
- <property name="value_pos">GTK_POS_RIGHT</property>
- <signal handler="x264_slider_changed_cb" name="value_changed"/>
- <signal name="format_value" handler="x264_format_slider_cb"/>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label83">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;small&gt;Psychovisual Trellis:&lt;/small&gt;</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkHScale" id="x264_psy_trell">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Psychovisual trellis is an experimental algorithm to further improve sharpness and detail retention beyond what Psychovisual RD does. Recommended values are around 0.2, though higher values may help for very grainy video or lower bitrate encodes. Not recommended for cel animation and other sharp-edged graphics.</property>
- <property name="adjustment">adjustment23</property>
- <property name="digits">2</property>
- <property name="restrict_to_fill_level">False</property>
- <property name="value_pos">GTK_POS_RIGHT</property>
- <signal handler="x264_slider_changed_cb" name="value_changed"/>
- <signal name="format_value" handler="x264_format_slider_cb"/>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Adaptive quantization controls how the encoder distributes bits across the frame.
+
+Higher values take more bits away from edges and complex areas to improve areas with finer detail.</property>
+ <property name="adjustment">adjustment34</property>
+ <property name="restrict_to_fill_level">False</property>
+ <property name="value_pos">right</property>
+ <signal name="format-value" handler="x264_format_slider_cb" swapped="no"/>
+ <signal name="value-changed" handler="x264_slider_changed_cb" swapped="no"/>
 </object>
 <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label82">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">&lt;small&gt;Psychovisual Rate Distortion:&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScale" id="x264_psy_rd">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Psychovisual rate-distortion optimization takes advantage of the characteristics of human
+vision to dramatically improve apparent detail and sharpness.
+The effect can be made weaker or stronger by adjusting the strength.
+Being an RD algorithm, it requires mode decision to be at least "6".</property>
+ <property name="adjustment">adjustment22</property>
+ <property name="restrict_to_fill_level">False</property>
+ <property name="value_pos">right</property>
+ <signal name="format-value" handler="x264_format_slider_cb" swapped="no"/>
+ <signal name="value-changed" handler="x264_slider_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label83">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">&lt;small&gt;Psychovisual Trellis:&lt;/small&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScale" id="x264_psy_trell">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Psychovisual trellis is an experimental algorithm to further
+improve sharpness and detail retention beyond what Psychovisual RD does.
+
+Recommended values are around 0.2, though higher values may help for very
+grainy video or lower bitrate encodes. Not recommended for cel animation
+and other sharp-edged graphics.</property>
+ <property name="adjustment">adjustment23</property>
+ <property name="restrict_to_fill_level">False</property>
+ <property name="digits">2</property>
+ <property name="value_pos">right</property>
+ <signal name="format-value" handler="x264_format_slider_cb" swapped="no"/>
+ <signal name="value-changed" handler="x264_slider_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox39">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkLabel" id="label61">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Deblocking: </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox39">
+ <object class="GtkSpinButton" id="x264_deblock_alpha">
 <property name="visible">True</property>
+ <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <object class="GtkLabel" id="label61">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Deblocking: </property>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="x264_deblock_alpha">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-markup" translatable="yes">H.264 has a built-in deblocking filter that smooths out blocking artifacts after decoding each frame. This not only improves visual quality, but also helps compression significantly. The deblocking filter takes a lot of CPU power, so if you're looking to minimize CPU requirements for video playback, disable it.
-
- The deblocking filter has two adjustable parameters, "strength" (Alpha) and "threshold" (Beta). The former controls how strong (or weak) the deblocker is, while the latter controls how many (or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking. The default is 0 (normal strength) for both parameters.</property>
- <property name="adjustment">adjustment11</property>
- <signal handler="x264_widget_changed_cb" name="value_changed"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="x264_deblock_beta">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-markup" translatable="yes">H.264 has a built-in deblocking filter that smooths out blocking artifacts after decoding each frame. This not only improves visual quality, but also helps compression significantly. The deblocking filter takes a lot of CPU power, so if you're looking to minimize CPU requirements for video playback, disable it.
-
- The deblocking filter has two adjustable parameters, "strength" (Alpha) and "threshold" (Beta). The former controls how strong (or weak) the deblocker is, while the latter controls how many (or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking. The default is 0 (normal strength) for both parameters.</property>
- <property name="adjustment">adjustment12</property>
- <signal handler="x264_widget_changed_cb" name="value_changed"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="x264_no_dct_decimate">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">x264 normally zeroes out nearly-empty data blocks to save bits to be better used for some other purpose in the video. However, this can sometimes have slight negative effects on retention of subtle grain and dither. Don't touch this unless you're having banding issues or other such cases where you are having trouble keeping fine noise.</property>
- <property name="label" translatable="yes">No DCT Decimate</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal handler="x264_widget_changed_cb" name="toggled"/>
- </object>
- <packing>
- <property name="padding">20</property>
- <property name="position">3</property>
- </packing>
- </child>
+ <property name="tooltip_markup" translatable="yes">H.264 deblocking filter.
+
+h.264 has a built-in deblocking filter that smooths out blocking artifacts
+after decoding each frame. This not only improves visual quality, but also
+helps compression significantly. The deblocking filter takes a lot of CPU power,
+so if you're looking to minimize CPU requirements for video playback, disable it.
+
+The deblocking filter has two adjustable parameters, "strength" (Alpha) and "threshold" (Beta).
+The former controls how strong (or weak) the deblocker is, while the latter controls how many
+(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.
+The default is 0 (normal strength) for both parameters.</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment11</property>
+ <signal name="value-changed" handler="x264_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
+ <child>
+ <object class="GtkSpinButton" id="x264_deblock_beta">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_markup" translatable="yes">H.264 deblocking filter.
+
+h.264 has a built-in deblocking filter that smooths out blocking artifacts
+after decoding each frame. This not only improves visual quality, but also
+helps compression significantly. The deblocking filter takes a lot of CPU power,
+so if you're looking to minimize CPU requirements for video playback, disable it.
+
+The deblocking filter has two adjustable parameters, "strength" (Alpha) and "threshold" (Beta).
+The former controls how strong (or weak) the deblocker is, while the latter controls how many
+(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.
+The default is 0 (normal strength) for both parameters.</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment12</property>
+ <signal name="value-changed" handler="x264_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="x264_no_dct_decimate">
+ <property name="label" translatable="yes">No DCT Decimate</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">x264 normally zeroes out nearly-empty data blocks to save bits to
+be better used for some other purpose in the video. However, this can
+sometimes have slight negative effects on retention of subtle grain and
+dither.
+
+Don't touch this unless you're having banding issues or other such cases
+where you are having trouble keeping fine noise.</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="x264_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">20</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
 </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
 </child>
 </object>
 </child>
 <child type="label">
 <object class="GtkLabel" id="label63">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Psychovisual&lt;/b&gt;&lt;/small&gt;</property>
 <property name="use_markup">True</property>
@@ -4361,72 +5841,55 @@
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox85">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">2</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
 <object class="GtkFrame" id="frame11">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="label_xalign">0</property>
 <property name="shadow_type">none</property>
 <child>
- <object class="GtkAlignment" id="alignment29">
+ <object class="GtkScrolledWindow" id="scrolledwindow6">
+ <property name="height_request">40</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">12</property>
 <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">12</property>
- <property name="right_padding">2</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">etched-in</property>
 <child>
- <object class="GtkScrolledWindow" id="scrolledwindow6">
- <property name="height_request">40</property>
+ <object class="GtkTextView" id="x264Option">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <object class="GtkTextView" id="x264Option">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip-text" translatable="yes">Your selected options will appear here. 
- You can edit these and add additional options. 
+ <property name="tooltip_text" translatable="yes">Your selected options will appear here.
+You can edit these and add additional options.
 
- Default values will not be shown. The defaults are:
- ref=3:bframes=3:b-adapt=fast:direct=spatial:
- b-pyramid=normal:weightp=2:me=hex:merange=16:
- subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:
- deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:
- no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
- <property name="wrap_mode">GTK_WRAP_CHAR</property>
- <property name="accepts_tab">False</property>
- <signal handler="x264_focus_out_cb" name="focus_out_event"/>
- </object>
- </child>
+Default values will not be shown. The defaults are:
+ref=3:bframes=3:b-adapt=fast:direct=spatial:
+b-pyramid=normal:weightp=2:me=hex:merange=16:
+subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:
+deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:
+no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
+ <property name="wrap_mode">char</property>
+ <property name="accepts_tab">False</property>
+ <signal name="focus-out-event" handler="x264_focus_out_cb" swapped="no"/>
 </object>
 </child>
 </object>
@@ -4434,6 +5897,7 @@
 <child type="label">
 <object class="GtkLabel" id="label54">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Current x264 Advanced Option String&lt;/b&gt;&lt;/small&gt;</property>
 <property name="use_markup">True</property>
@@ -4444,733 +5908,821 @@
 <property name="expand">False</property>
 <property name="fill">True</property>
 <property name="padding">2</property>
- <property name="position">2</property>
+ <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">True</property>
 <property name="fill">True</property>
- <property name="padding">0</property>
 <property name="position">0</property>
 </packing>
-
- </child>
+ </child>
+ </object>
+ <packing>
+ <property name="position">7</property>
+ <property name="name">advanced_video_tab</property>
+ <property name="title" translatable="yes">Advanced Video</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="chapters_tab">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="hbox30">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="lavc_mpeg4_tab">
- <property name="orientation">vertical</property>
+ <object class="GtkCheckButton" id="ChapterMarkers">
+ <property name="label" translatable="yes">Chapter Markers</property>
 <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <object class="GtkHBox" id="hbox86">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">2</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame18">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment33">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">12</property>
- <property name="right_padding">2</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow7">
- <property name="height_request">40</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <object class="GtkTextView" id="lavcOption">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip-text" translatable="yes">Your selected options will appear here. 
- You can edit these and add additional options.</property>
- <property name="wrap_mode">GTK_WRAP_CHAR</property>
- <property name="accepts_tab">False</property>
- <signal handler="lavc_focus_out_cb" name="focus_out_event"/>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label75">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">&lt;small&gt;&lt;b&gt;Current FFMpeg Advanced Option String&lt;/b&gt;&lt;/small&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">2</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="tooltip_text" translatable="yes">Add chapter markers to output file.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="chapter_markers_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
 <property name="fill">True</property>
- <property name="padding">0</property>
- <property name="position">1</property>
+ <property name="position">0</property>
 </packing>
 </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
 </object>
 <packing>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="advanced_tab_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Advanced</property>
- </object>
- <packing>
- <property name="position">4</property>
- <property name="tab_fill">False</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="chapters_tab">
- <property name="orientation">vertical</property>
+ <object class="GtkScrolledWindow" id="scrolledwindow3">
 <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <object class="GtkHBox" id="hbox30">
- <property name="visible">True</property>
- <child>
- <object class="GtkCheckButton" id="ChapterMarkers">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Add chapter markers to output file.</property>
- <property name="label" translatable="yes">Chapter Markers</property>
- <property name="draw_indicator">True</property>
- <signal handler="chapter_markers_changed_cb" name="toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow3">
+ <object class="GtkTreeView" id="chapters_list">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <child>
- <object class="GtkTreeView" id="chapters_list">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_clickable">True</property>
- <property name="rules_hint">True</property>
- <property name="enable-search">False</property>
- </object>
+ <property name="enable_search">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection3"/>
 </child>
 </object>
- <packing>
- <property name="position">1</property>
- </packing>
 </child>
 </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
 </child>
- <child type="tab">
- <object class="GtkLabel" id="chapters_label">
+ </object>
+ <packing>
+ <property name="position">8</property>
+ <property name="name">chapters_tab</property>
+ <property name="title" translatable="yes">Chapters</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="metadata_tab">
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">6</property>
+ <property name="margin-left">24</property>
+ <property name="margin-right">24</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="column_spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="tag_title_label">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Chapters</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Title:</property>
+ <property name="use_markup">True</property>
 </object>
 <packing>
- <property name="position">5</property>
- <property name="tab_fill">False</property>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkAlignment" id="alignment76">
+ <object class="GtkEntry" id="MetaName">
 <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">24</property>
- <property name="right_padding">24</property>
- <property name="left_padding">24</property>
- <property name="bottom_padding">24</property>
- <property name="yscale">1</property>
- <child>
- <object class="GtkTable" id="tags_table">
- <property name="n_rows">8</property>
- <property name="n_columns">2</property>
- <property name="visible">True</property>
- <property name="column_spacing">5</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <object class="GtkLabel" id="tag_title_label">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Title:</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="MetaName">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="max_length">80</property>
- <property name="activates_default">True</property>
- <property name="width_chars">50</property>
- <property name="truncate_multiline">True</property>
- <signal name="changed" handler="meta_setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="tag_actors_label">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Actors:</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="MetaArtist">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="max_length">80</property>
- <property name="activates_default">True</property>
- <property name="width_chars">50</property>
- <property name="truncate_multiline">True</property>
- <signal name="changed" handler="meta_setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="tag_director_label">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Director:</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="MetaAlbumArtist">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="max_length">80</property>
- <property name="activates_default">True</property>
- <property name="width_chars">50</property>
- <property name="truncate_multiline">True</property>
- <signal name="changed" handler="meta_setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="tag_release_date_label">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Release Date:</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="MetaReleaseDate">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="max_length">80</property>
- <property name="activates_default">True</property>
- <property name="width_chars">50</property>
- <property name="truncate_multiline">True</property>
- <signal name="changed" handler="meta_setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="tag_comment_label">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Comment:</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="MetaComment">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="max_length">80</property>
- <property name="activates_default">True</property>
- <property name="width_chars">50</property>
- <property name="truncate_multiline">True</property>
- <signal name="changed" handler="meta_setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="tag_genre_label">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Genre:</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="MetaGenre">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="max_length">80</property>
- <property name="activates_default">True</property>
- <property name="width_chars">50</property>
- <property name="truncate_multiline">True</property>
- <signal name="changed" handler="meta_setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="tag_description_label">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Description:</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="MetaDescription">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="max_length">80</property>
- <property name="activates_default">True</property>
- <property name="width_chars">50</property>
- <property name="truncate_multiline">True</property>
- <signal name="changed" handler="meta_setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="tag_long_description_label">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Plot:</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_EXPAND</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="MetaLongDescriptionScroll">
- <property name="height_request">80</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <object class="GtkTextView" id="MetaLongDescription">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="wrap_mode">GTK_WRAP_CHAR</property>
- <property name="accepts_tab">False</property>
- <signal handler="meta_focus_out_cb" name="focus_out_event"/>
- </object>
- </child>
- </object>
- <packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL|GTK_EXPAND</property>
- <property name="y_options">GTK_FILL|GTK_EXPAND</property>
- </packing>
- </child>
- </object>
- </child>
+ <property name="max_length">80</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">50</property>
+ <property name="truncate_multiline">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="meta_setting_widget_changed_cb" swapped="no"/>
 </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
 </child>
- <child type="tab">
- <object class="GtkLabel" id="metadata_label">
+ <child>
+ <object class="GtkLabel" id="tag_actors_label">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Tags</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Actors:</property>
+ <property name="use_markup">True</property>
 </object>
 <packing>
- <property name="position">6</property>
- <property name="tab_fill">False</property>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="position">1</property>
- </packing>
- </child>
-
- <child>
- <object class="GtkAlignment" id="alignment66">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">4</property>
- <property name="bottom_padding">4</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
- <property name="xalign">0.0</property>
- <property name="yalign">1.0</property>
- <child>
- <object class="GtkHBox" id="hbox46">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <object class="GtkLabel" id="work_status">
+ <object class="GtkEntry" id="MetaArtist">
 <property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="max_length">80</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">50</property>
+ <property name="truncate_multiline">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="meta_setting_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="position">0</property>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="pending_status">
+ <object class="GtkLabel" id="tag_director_label">
 <property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Director:</property>
+ <property name="use_markup">True</property>
 </object>
 <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
+ <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="MetaAlbumArtist">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="max_length">80</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">50</property>
+ <property name="truncate_multiline">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="meta_setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="tag_release_date_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Release Date:</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="MetaReleaseDate">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="max_length">80</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">50</property>
+ <property name="truncate_multiline">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="meta_setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="tag_comment_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Comment:</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="MetaComment">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="max_length">80</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">50</property>
+ <property name="truncate_multiline">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="meta_setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="tag_genre_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Genre:</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="MetaGenre">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="max_length">80</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">50</property>
+ <property name="truncate_multiline">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="meta_setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="tag_description_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Description:</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">6</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="MetaDescription">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="max_length">80</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">50</property>
+ <property name="truncate_multiline">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="meta_setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">6</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="tag_long_description_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Plot:</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">7</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="MetaLongDescriptionScroll">
+ <property name="height_request">40</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkTextView" id="MetaLongDescription">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="wrap_mode">char</property>
+ <property name="accepts_tab">False</property>
+ <signal name="focus-out-event" handler="meta_focus_out_cb" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">7</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 </object>
+ <packing>
+ <property name="position">9</property>
+ <property name="name">metadata_tab</property>
+ <property name="title" translatable="yes">Tags</property>
+ </packing>
 </child>
 </object>
 <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ <property name="name">settings_tab</property>
+ <property name="title" translatable="yes">Settings</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="queue_tab">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkSeparator" id="sep2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkAlignment" id="alignment71">
+ <object class="GtkToolbar" id="queue_toolbar">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
- <property name="bottom_padding">6</property>
 <child>
- <object class="GtkProgressBar" id="progressbar">
- <property name="height_request">10</property>
- <property name="visible">False</property>
+ <object class="GtkToolButton" id="queue_edit">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="text" translatable="yes"/>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Edit</property>
+ <property name="icon_name">hb-edit</property>
+ <signal name="clicked" handler="queue_edit_clicked_cb" swapped="no"/>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="queue_reload">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Reload</property>
+ <property name="icon_name">view-refresh</property>
+ <property name="tooltip_text" translatable="yes">Mark selected queue entry as pending.
+Resets the queue job to pending and ready to run again.</property>
+ <signal name="clicked" handler="queue_reload_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="queue_reload_all">
+ <property name="visible">True</property>
+ <property name="sensitive">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Reload All</property>
+ <property name="icon_name">view-refresh</property>
+ <property name="tooltip_text" translatable="yes">Mark all queue entries as pending.
+Resets all queue jobs to pending and ready to run again.</property>
+ <signal name="clicked" handler="queue_reload_all_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="position">3</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkTreeView" id="queue_list">
+ <property name="width_request">900</property>
+ <property name="height_request">300</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <signal name="key-press-event" handler="queue_key_press_cb" swapped="no"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection5"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="name">queue_tab</property>
+ <property name="title" translatable="yes">Queue</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox46">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="valign">end</property>
+ <property name="margin-top">4</property>
+ <property name="margin-bottom">4</property>
+ <property name="margin-left">12</property>
+ <property name="margin-right">12</property>
+ <property name="spacing">4</property>
+ <child>
+ <object class="GtkLabel" id="work_status">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="pending_status">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">end</property>
+ </object>
+ <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkProgressBar" id="progressbar">
+ <property name="height_request">10</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="margin-bottom">6</property>
+ <property name="margin-left">12</property>
+ <property name="margin-right">12</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <object class="GtkAdjustment" id="min_title_adj">
+ <property name="upper">7200</property>
+ <property name="value">10</property>
+ <property name="step_increment">5</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="preview_count_adj">
+ <property name="lower">5</property>
+ <property name="upper">60</property>
+ <property name="value">10</property>
+ <property name="step_increment">5</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkDialog" id="titla_add_multiple_dialog">
+ <property name="can_focus">False</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog_title_add_multiple_vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog_title_add_multiple_action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="title_add_multiple_cancel">
+ <property name="label" translatable="yes">Cancel</property>
+ <property name="image">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="title_add_multiple_ok">
+ <property name="label" translatable="yes">OK</property>
+ <property name="image">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="title_add_multiple_grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">12</property>
+ <property name="margin_top">12</property>
+ <property name="column_spacing">6</property>
 <child>
- <object class="GtkAlignment" id="alignment69">
+ <object class="GtkScrolledWindow" id="title_add_multiple_scrolledwindow">
 <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">6</property>
- <property name="right_padding">6</property>
+ <property name="min_content_height">400</property>
 <child>
- <object class="GtkFrame" id="presets_frame">
- <property name="visible">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <signal handler="presets_frame_size_allocate_cb" name="size_allocate"/>
+ <object class="GtkListBox" id="title_add_multiple_list">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="hexpand">True</property>
+ <property name="selection_mode">none</property>
+ <property name="activate_on_single_click">False</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">3</property>
+ <property name="height">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="title_add_multiple_hbox1">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="title_add_multiple_select_all">
+ <property name="label" translatable="yes">Select All</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Mark all titles for adding to the queue</property>
+ <property name="halign">start</property>
+ <property name="vexpand">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="title_add_multiple_select_all_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="title_add_multiple_clear_all">
+ <property name="label" translatable="yes">Clear All</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Unmark all titles</property>
+ <property name="halign">start</property>
+ <property name="vexpand">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="title_add_multiple_clear_all_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkInfoBar" id="title_add_multiple_infobar">
+ <property name="visible">True</property>
+ <property name="app_paintable">True</property>
+ <property name="can_focus">False</property>
+ <property name="message_type">info</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="title_add_multiple_infobar-action_area1">
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">end</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child internal-child="content_area">
+ <object class="GtkBox" id="title_add_multiple_infobar_content_area">
+ <property name="can_focus">False</property>
+ <property name="spacing">16</property>
 <child>
- <object class="GtkAlignment" id="alignment21">
+ <object class="GtkLabel" id="title_add_multiple_label1">
 <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">6</property>
- <property name="left_padding">8</property>
- <child>
- <object class="GtkVBox" id="presets_vbox">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <object class="GtkScrolledWindow" id="presets_scroll">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <object class="GtkTreeView" id="presets_list">
- <property name="width_request">206</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_visible">False</property>
- <property name="headers_clickable">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolbar" id="presets_toolbar">
- <property name="icon-size">2</property>
- <property name="visible">True</property>
- <property name="show_arrow">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <object class="GtkToolButton" id="presets_save">
- <property name="visible">True</property>
- <property name="sensitive">True</property>
- <property name="is_important">False</property>
- <property name="label" translatable="yes">_Save</property>
- <property name="use_underline">True</property>
- <property name="tooltip-text" translatable="yes">Save current settings to new preset.</property>
- <property name="stock_id">gtk-save</property>
- <signal name="clicked" handler="presets_save_clicked_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="presets_remove">
- <property name="visible">True</property>
- <property name="sensitive">True</property>
- <property name="is_important">False</property>
- <property name="label" translatable="yes">_Delete</property>
- <property name="use_underline">True</property>
- <property name="tooltip-text" translatable="yes">Delete the currently selected preset.</property>
- <property name="stock_id">gtk-delete</property>
- <signal name="clicked" handler="presets_remove_clicked_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparatorToolItem" id="toolbutton2">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="presets_menu_button">
- <property name="visible">True</property>
- <property name="sensitive">True</property>
- <property name="is_important">True</property>
- <property name="label" translatable="yes">_Options</property>
- <property name="use_underline">True</property>
- <property name="tooltip-text" translatable="yes">Preset Options</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="stock_id">gtk-preferences</property>
- <signal handler="presets_menu_clicked_cb" name="clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label34">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">&lt;b&gt;Presets&lt;/b&gt;</property>
- <property name="use_markup">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Destination files OK. No duplicates detected.</property>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
 </child>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
 </child>
 </object>
 <packing>
- <property name="position">1</property>
- <property name="expand">True</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
 </packing>
 </child>
+ <child>
+ <placeholder/>
+ </child>
 </object>
 <packing>
- <property name="position">2</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
 </object>
 </child>
+ <action-widgets>
+ <action-widget response="0">title_add_multiple_cancel</action-widget>
+ <action-widget response="-5">title_add_multiple_ok</action-widget>
+ </action-widgets>
 </object>
-
 <object class="GtkDialog" id="prefs_dialog">
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="title" translatable="yes">Preferences</property>
 <property name="modal">True</property>
@@ -5178,36 +6730,69 @@
 <property name="type_hint">dialog</property>
 <property name="skip_taskbar_hint">True</property>
 <property name="skip_pager_hint">True</property>
- <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
+ <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
 <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox6">
- <property name="orientation">vertical</property>
+ <object class="GtkBox" id="dialog-vbox6">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="pref_ok">
+ <property name="label" translatable="yes">OK</property>
+ <property name="image">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
 <child>
- <object class="GtkHBox" id="hbox59">
+ <object class="GtkBox" id="hbox59">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox20">
+ <object class="GtkBox" id="vbox20">
 <property name="orientation">vertical</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkEventBox" id="eventbox1">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
 <property name="above_child">True</property>
- <signal name="button_press_event" handler="easter_egg_cb"/>
+ <signal name="button-press-event" handler="easter_egg_cb" swapped="no"/>
 <child>
 <object class="GtkImage" id="image3">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="pixel_size">64</property>
 <property name="icon_name">hb-icon</property>
- <property name="pixel-size">64</property>
 </object>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -5216,929 +6801,755 @@
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkAlignment" id="alignment22">
+ <object class="GtkNotebook" id="PrefsNotebook">
 <property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="can_focus">True</property>
+ <property name="show_border">False</property>
+ <property name="margin-left">12</property>
 <child>
- <object class="GtkNotebook" id="PrefsNotebook">
+ <object class="GtkBox" id="vbox42">
+ <property name="orientation">vertical</property>
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show-border">False</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkVBox" id="vbox42">
- <property name="orientation">vertical</property>
+ <object class="GtkBox" id="check_updates_box">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">6</property>
+ <property name="margin-left">12</property>
 <child>
- <object class="GtkAlignment" id="check_updates_box">
+ <object class="GtkComboBox" id="check_updates">
+ <property name="valign">GTK_ALIGN_CENTER</property>
 <property name="visible">True</property>
- <property name="left_padding">12</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <child>
- <object class="GtkHBox" id="hbox80">
- <property name="visible">True</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkComboBox" id="check_updates">
- <property name="visible">True</property>
- <signal name="changed" handler="pref_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label74">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Automatically check for updates</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="pref_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkAlignment" id="alignment62">
+ <object class="GtkLabel" id="label74">
 <property name="visible">True</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <child>
- <object class="GtkHBox" id="hbox82">
- <property name="visible">True</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkComboBox" id="WhenComplete">
- <property name="visible">True</property>
- <signal name="changed" handler="pref_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labela1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">When all encodes are complete</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Automatically check for updates</property>
+ <property name="use_markup">True</property>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox82">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">6</property>
+ <property name="margin-left">12</property>
+ <property name="margin-right">12</property>
 <child>
- <object class="GtkAlignment" id="alignment5">
+ <object class="GtkComboBox" id="WhenComplete">
 <property name="visible">True</property>
- <property name="left_padding">12</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <child>
- <object class="GtkVBox" id="vbox5">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <child>
- <object class="GtkCheckButton" id="use_source_name">
- <property name="label" translatable="yes">Use automatic naming (uses modified source name)</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="pref_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment6">
- <property name="visible">True</property>
- <property name="left_padding">18</property>
- <child>
- <object class="GtkVBox" id="vbox29">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <child>
- <object class="GtkCheckButton" id="chapters_in_destination">
- <property name="label" translatable="yes">Add chapters to destination name</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="pref_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="title_no_in_destination">
- <property name="label" translatable="yes">Add title # to destination name</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="pref_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="UseM4v">
- <property name="label" translatable="yes">Use iPod/iTunes friendly (.m4v) file extension for MP4</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="use_m4v_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="pref_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="position">2</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkAlignment" id="alignment50">
+ <object class="GtkLabel" id="labela1">
 <property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkHBox" id="hbox66">
- <property name="visible">True</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkSpinButton" id="preview_count">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="max_length">2</property>
- <property name="invisible_char">&#x25CF;</property>
- <property name="shadow_type">none</property>
- <property name="adjustment">preview_count_adj</property>
- <property name="numeric">True</property>
- <signal name="value_changed" handler="pref_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label77">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Number of previews</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">When all encodes are complete</property>
+ <property name="use_markup">True</property>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="position">3</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox5">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">6</property>
+ <property name="margin-left">12</property>
 <child>
- <object class="GtkAlignment" id="alignment58">
+ <object class="GtkCheckButton" id="auto_name">
+ <property name="label" translatable="yes">Use automatic naming (uses modified source name)</property>
 <property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkHBox" id="hbox60">
- <property name="visible">True</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkSpinButton" id="MinTitleDuration">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="max_length">4</property>
- <property name="invisible_char">&#x25CF;</property>
- <property name="shadow_type">none</property>
- <property name="adjustment">min_title_adj</property>
- <property name="numeric">True</property>
- <signal name="value_changed" handler="pref_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label70">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Filter short titles (seconds)</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="pref_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="position">4</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkAlignment" id="alignment64">
+ <object class="GtkBox" id="autoname_box">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <property name="margin-left">18</property>
+ <property name="margin-right">8</property>
 <child>
- <object class="GtkCheckButton" id="show_status">
- <property name="label" translatable="yes">Show system tray icon</property>
+ <object class="GtkLabel" id="auto_name_template_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Auto-Name Template</property>
+ <property name="use_markup">True</property>
+
+ <property name="halign">end</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="auto_name_template">
+ <property name="tooltip_text" translatable="yes">Available Options: {source} {title} {chapters} {date} {time} {quality} {bitrate}</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="show_status_cb"/>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">40</property>
+ <property name="truncate_multiline">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="pref_changed_cb" swapped="no"/>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="position">5</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="UseM4v">
+ <property name="label" translatable="yes">Use iPod/iTunes friendly (.m4v) file extension for MP4</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="use_m4v_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
 </packing>
 </child>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
 </child>
- <child type="tab">
- <object class="GtkLabel" id="label2">
+ <child>
+ <object class="GtkBox" id="hbox66">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
- <property name="label" translatable="yes">General</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">6</property>
+ <property name="margin-left">12</property>
+ <child>
+ <object class="GtkSpinButton" id="preview_count">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">2</property>
+ <property name="invisible_char">●</property>
+ <property name="shadow_type">none</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">preview_count_adj</property>
+ <property name="numeric">True</property>
+ <signal name="value-changed" handler="pref_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label77">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Number of previews</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
 </object>
 <packing>
- <property name="tab_fill">False</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox18">
- <property name="orientation">vertical</property>
+ <object class="GtkBox" id="hbox60">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">6</property>
+ <property name="margin-left">12</property>
 <child>
- <object class="GtkAlignment" id="alignment61">
+ <object class="GtkSpinButton" id="MinTitleDuration">
 <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="yscale">0</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkVBox" id="vbox7">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <child>
- <object class="GtkHBox" id="hbox81">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkLabel" id="label87">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Preferred Language:</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="PreferredLanguage">
- <property name="width_request">150</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <signal name="changed" handler="pref_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment8">
- <property name="visible">True</property>
- <property name="left_padding">17</property>
- <child>
- <object class="GtkVBox" id="vbox49">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <object class="GtkRadioButton" id="AudioDUB">
- <property name="label" translatable="yes">DUB Foreign language audio</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="pref_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="NotAudioDUB">
- <property name="label" translatable="yes">Use foreign language audio and add subtitles</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">AudioDUB</property>
- <signal name="toggled" handler="pref_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="expand">False</property>
- </packing>
- </child>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="max_length">4</property>
+ <property name="invisible_char">●</property>
+ <property name="shadow_type">none</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">min_title_adj</property>
+ <property name="numeric">True</property>
+ <signal name="value-changed" handler="pref_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkAlignment" id="alignment70">
+ <object class="GtkLabel" id="label70">
 <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="yscale">0</property>
- <property name="left_padding">12</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <child>
- <object class="GtkCheckButton" id="AddCC">
- <property name="label" translatable="yes">Add Closed Captions when available</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="pref_changed_cb"/>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Filter short titles (seconds)</property>
+ <property name="use_markup">True</property>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
 </packing>
 </child>
- <child type="tab">
- <object class="GtkLabel" id="label3">
+ <child>
+ <object class="GtkCheckButton" id="show_status">
+ <property name="label" translatable="yes">Show system tray icon</property>
 <property name="visible">True</property>
- <property name="label" translatable="yes">Audio/Subtitles</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">6</property>
+ <property name="margin-left">12</property>
+ <signal name="toggled" handler="show_status_cb" swapped="no"/>
 </object>
 <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
 </packing>
 </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">General</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox1">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">6</property>
+ <property name="margin-left">12</property>
 <child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkGrid" id="AdvancedPrefsTable">
 <property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="row_spacing">2</property>
+ <child>
+ <object class="GtkBox" id="hbox6">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <object class="GtkComboBox" id="VideoQualityGranularity">
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="width_request">55</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="vqual_granularity_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label85">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Constant Quality fractional granularity</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="use_dvdnav">
+ <property name="label" translatable="yes">Use dvdnav (instead of libdvdread)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="pref_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
 <child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="vbox2">
 <property name="orientation">vertical</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkTable" id="AdvancedPrefsTable">
+ <object class="GtkCheckButton" id="EncodeLogLocation">
+ <property name="label" translatable="yes">Put individual encode logs in same location as movie</property>
 <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">9</property>
- <property name="n_columns">2</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkHBox" id="hbox6">
- <property name="visible">True</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkComboBox" id="VideoQualityGranularity">
- <property name="width_request">55</property>
- <property name="visible">True</property>
- <signal name="changed" handler="vqual_granularity_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label85">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Constant Quality fractional granularity</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="use_dvdnav">
- <property name="label" translatable="yes">Use dvdnav (instead of libdvdread)</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="pref_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox2">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <child>
- <object class="GtkCheckButton" id="EncodeLogLocation">
- <property name="label" translatable="yes">Put individual encode logs in same location as movie</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="pref_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment51">
- <property name="visible">True</property>
- <property name="left_padding">21</property>
- <child>
- <object class="GtkHBox" id="hbox50">
- <property name="visible">True</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkComboBox" id="LoggingLevel">
- <property name="width_request">55</property>
- <property name="visible">True</property>
- <signal name="changed" handler="pref_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Activity Log Verbosity Level</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment63">
- <property name="visible">True</property>
- <property name="left_padding">21</property>
- <child>
- <object class="GtkHBox" id="hbox83">
- <property name="visible">True</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkComboBox" id="LogLongevity">
- <property name="visible">True</property>
- <signal name="changed" handler="pref_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labela2">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Activity Log Longevity</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="reduce_hd_preview">
- <property name="label" translatable="yes">Scale down High Definition previews</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="pref_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="AutoScan">
- <property name="label" translatable="yes">Automatically Scan DVD when loaded</property>
- <property name="tooltip-text" translatable="yes">Scans the DVD whenever a new disc is loaded</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="pref_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="pref_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox50">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <property name="margin-left">21</property>
 <child>
- <object class="GtkCheckButton" id="AdvancedAutoPassthru">
- <property name="label" translatable="yes">Enable Advanced Auto-Passthru options</property>
- <property name="tooltip-text" translatable="yes">Enabling this adds extra widgets to the audio panel that allow
- you to specify which particular codecs shall be passed
- and which codec to use when passthru is not possible</property>
+ <object class="GtkComboBox" id="LoggingLevel">
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="width_request">55</property>
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="advanced_audio_changed_cb"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="pref_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkCheckButton" id="HideAdvancedVideoSettings">
- <property name="label" translatable="yes">Hide Advanced Video Options Tab</property>
- <property name="tooltip-text" translatable="yes">Use advanced video options at your own risk.
-We recommend that you use the controls available
-on the Video tab instead.</property>
- <property name="active">False</property>
+ <object class="GtkLabel" id="label1">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="advanced_video_changed_cb"/>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Activity Log Verbosity Level</property>
 </object>
 <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkTable" id="hidden_prefs">
+ <object class="GtkBox" id="hbox83">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">9</property>
- <property name="n_columns">2</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <property name="margin-left">21</property>
 <child>
- <object class="GtkCheckButton" id="allow_tweaks">
- <property name="label" translatable="yes">Allow Tweaks</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="tweaks_changed_cb"/>
+ <object class="GtkComboBox" id="LogLongevity">
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="pref_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkCheckButton" id="hbfd_feature">
- <property name="label" translatable="yes">Allow HandBrake For Dummies</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="hbfd_feature_changed_cb"/>
+ <object class="GtkLabel" id="labela2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Activity Log Longevity</property>
 </object>
 <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="position">1</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
 </packing>
 </child>
 </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="reduce_hd_preview">
+ <property name="label" translatable="yes">Scale down High Definition previews</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="pref_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="AutoScan">
+ <property name="label" translatable="yes">Automatically Scan DVD when loaded</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Scans the DVD whenever a new disc is loaded</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="pref_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="HideAdvancedVideoSettings">
+ <property name="label" translatable="yes">Hide Advanced Video Options Tab</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Use advanced video options at your own risk.
+We recommend that you use the controls available
+on the Video tab instead.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="advanced_video_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="RemoveFinishedJobs">
+ <property name="label" translatable="yes">Delete completed jobs from queue</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">By default, completed jobs remain in the queue and are marked as complete.
+Check this if you want the queue to clean itself up by deleting completed jobs.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="advanced_video_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">6</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
 </child>
 </object>
 <packing>
- <property name="position">2</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
- <child type="tab">
- <object class="GtkLabel" id="label36">
+ <child>
+ <object class="GtkGrid" id="hidden_prefs">
 <property name="visible">True</property>
- <property name="label" translatable="yes">Advanced</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkCheckButton" id="allow_tweaks">
+ <property name="label" translatable="yes">Allow Tweaks</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="tweaks_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="hbfd_feature">
+ <property name="label" translatable="yes">Allow HandBrake For Dummies</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="hbfd_feature_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
 </object>
 <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
 </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label36">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Advanced</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area5">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="pref_ok">
- <property name="label" translatable="yes">gtk-ok</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
 </object>
 </child>
 <action-widgets>
 <action-widget response="-5">pref_ok</action-widget>
 </action-widgets>
 </object>
- <object class="GtkDialog" id="tweak_dialog">
+ <object class="GtkDialog" id="preset_new_folder_dialog">
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="border_width">5</property>
 <property name="modal">True</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
 <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox7">
- <property name="orientation">vertical</property>
+ <object class="GtkBox" id="dialog-vbox2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="spacing">2</property>
- <child>
- <object class="GtkHBox" id="hbox9">
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="layout_style">end</property>
 <child>
- <object class="GtkLabel" id="label33">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Setting:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="tweak_setting">
+ <object class="GtkButton" id="preset_folder_cancel">
+ <property name="label" translatable="yes">Cancel</property>
+ <property name="image">gtk-cancel</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="max_length">40</property>
- <property name="activates_default">True</property>
- <property name="width_chars">30</property>
- <property name="truncate_multiline">True</property>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="position">1</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
 </packing>
 </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area7">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
 <child>
- <object class="GtkButton" id="tweak_cancel">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">gtk-cancel</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- <child>
- <object class="GtkButton" id="tweak_ok">
+ <object class="GtkButton" id="preset_folder_ok">
+ <property name="label" translatable="yes">OK</property>
+ <property name="image">gtk-ok</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
 <property name="receives_default">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">gtk-ok</property>
- <property name="use_stock">True</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
 </packing>
 </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="0">tweak_cancel</action-widget>
- <action-widget response="-5">tweak_ok</action-widget>
- </action-widgets>
- </object>
- <object class="GtkDialog" id="preset_new_folder_dialog">
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="border_width">5</property>
- <property name="modal">True</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox2">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">2</property>
 <child>
- <object class="GtkVBox" id="vbox26">
+ <object class="GtkBox" id="vbox26">
 <property name="orientation">vertical</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <object class="GtkHBox" id="hbox31">
+ <object class="GtkBox" id="hbox31">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
 <object class="GtkLabel" id="label30">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
 <property name="label" translatable="yes">Folder Name:</property>
- <property name="xalign">0</property>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
@@ -6150,47 +7561,48 @@
 <property name="activates_default">True</property>
 <property name="width_chars">30</property>
 <property name="truncate_multiline">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
 <property name="padding">10</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame17">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+ <property name="shadow_type">etched-out</property>
 <child>
- <object class="GtkAlignment" id="alignment32">
+ <object class="GtkTextView" id="FolderDescription">
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">4</property>
+ <property name="margin-left">12</property>
+ <property name="margin-right">4</property>
+ <property name="height_request">60</property>
 <property name="visible">True</property>
+ <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">4</property>
- <property name="left_padding">12</property>
- <property name="right_padding">4</property>
- <child>
- <object class="GtkTextView" id="FolderDescription">
- <property name="height_request">60</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="wrap_mode">GTK_WRAP_WORD</property>
- <property name="accepts_tab">False</property>
- </object>
- </child>
+ <property name="wrap_mode">word</property>
+ <property name="accepts_tab">False</property>
 </object>
 </child>
 <child type="label">
 <object class="GtkLabel" id="label21">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="label" translatable="yes">&lt;b&gt;Description&lt;/b&gt;</property>
 <property name="use_markup">True</property>
@@ -6198,87 +7610,108 @@
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="padding">10</property>
 <property name="position">2</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">preset_folder_cancel</action-widget>
+ <action-widget response="-5">preset_folder_ok</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="preset_save_dialog">
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="modal">True</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
 <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area2">
+ <object class="GtkButtonBox" id="dialog-action_area3">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
 <child>
- <object class="GtkButton" id="preset_folder_cancel">
+ <object class="GtkButton" id="preset_cancel">
+ <property name="label" translatable="yes">Cancel</property>
+ <property name="image">gtk-cancel</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">gtk-cancel</property>
- <property name="use_stock">True</property>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
 </child>
 <child>
- <object class="GtkButton" id="preset_folder_ok">
+ <object class="GtkButton" id="preset_ok">
+ <property name="label" translatable="yes">OK</property>
+ <property name="image">gtk-ok</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">gtk-ok</property>
- <property name="use_stock">True</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
 </packing>
 </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="0">preset_folder_cancel</action-widget>
- <action-widget response="-5">preset_folder_ok</action-widget>
- </action-widgets>
- </object>
- <object class="GtkDialog" id="preset_save_dialog">
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="border_width">5</property>
- <property name="modal">True</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox3">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">2</property>
 <child>
- <object class="GtkVBox" id="vbox28">
+ <object class="GtkBox" id="vbox28">
 <property name="orientation">vertical</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <object class="GtkHBox" id="hbox41">
+ <object class="GtkBox" id="hbox41">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
 <object class="GtkLabel" id="label64">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
 <property name="label" translatable="yes">Preset Name:</property>
- <property name="xalign">0</property>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
@@ -6290,52 +7723,59 @@
 <property name="activates_default">True</property>
 <property name="width_chars">30</property>
 <property name="truncate_multiline">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
 <property name="padding">10</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkTable" id="PicturePresetBox">
+ <object class="GtkGrid" id="PicturePresetBox">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
+ <child>
+ <placeholder/>
+ </child>
 <child>
 <object class="GtkLabel" id="UsingCurrentPicLabel">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
 <property name="label" translatable="yes">&lt;b&gt;Custom Picture Dimensions&lt;/b&gt;</property>
- <property name="xalign">0</property>
 <property name="use_markup">True</property>
 </object>
 <packing>
 <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
 <property name="left_attach">0</property>
- <property name="right_attach">3</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="fillerlabel1">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"></property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
 </object>
 <packing>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
 <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_EXPAND</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
@@ -6345,16 +7785,16 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Enable maximum width limit.</property>
+ <property name="tooltip_text" translatable="yes">Enable maximum width limit.</property>
+ <property name="halign">start</property>
 <property name="draw_indicator">True</property>
- <signal name="toggled" handler="setting_widget_changed_cb"/>
+ <signal name="toggled" handler="preset_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
 <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
@@ -6362,17 +7802,21 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">This is the maximum width that the video will be stored at. Whenever a new source is loaded, this value will be applied if the source width is greater. Setting this to 0 means there is no maximum width.</property>
+ <property name="tooltip_text" translatable="yes">This is the maximum width that the video will be stored at.
+
+Whenever a new source is loaded, this value will be applied if the source width is greater.
+Setting this to 0 means there is no maximum width.</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
 <property name="adjustment">adjustment32</property>
 <property name="snap_to_ticks">True</property>
- <signal name="value_changed" handler="setting_widget_changed_cb"/>
+ <signal name="value-changed" handler="preset_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options"></property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
@@ -6382,16 +7826,16 @@
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Enable maximum height limit.</property>
+ <property name="tooltip_text" translatable="yes">Enable maximum height limit.</property>
+ <property name="halign">start</property>
 <property name="draw_indicator">True</property>
- <signal name="toggled" handler="setting_widget_changed_cb"/>
+ <signal name="toggled" handler="preset_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
 <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
@@ -6399,52 +7843,54 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">This is the maximum height that the video will be stored at. Whenever a new source is loaded, this value will be applied if the source height is greater. Setting this to 0 means there is no maximum height.</property>
+ <property name="tooltip_text" translatable="yes">This is the maximum height that the video will be stored at.
+
+Whenever a new source is loaded, this value will be applied if the source height is greater.
+Setting this to 0 means there is no maximum height.</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
 <property name="adjustment">adjustment33</property>
- <signal name="value_changed" handler="setting_widget_changed_cb"/>
+ <signal name="value-changed" handler="preset_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
 <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options"></property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
 <object class="GtkFrame" id="frame14">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+ <property name="shadow_type">etched-out</property>
 <child>
- <object class="GtkAlignment" id="alignment36">
+ <object class="GtkTextView" id="PresetDescription">
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">4</property>
+ <property name="margin-left">12</property>
+ <property name="margin-right">4</property>
+ <property name="height_request">60</property>
 <property name="visible">True</property>
+ <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">4</property>
- <property name="left_padding">12</property>
- <property name="right_padding">4</property>
- <child>
- <object class="GtkTextView" id="PresetDescription">
- <property name="height_request">60</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="wrap_mode">GTK_WRAP_WORD</property>
- <property name="accepts_tab">False</property>
- </object>
- </child>
+ <property name="wrap_mode">word</property>
+ <property name="accepts_tab">False</property>
 </object>
 </child>
 <child type="label">
 <object class="GtkLabel" id="label67">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="label" translatable="yes">&lt;b&gt;Description&lt;/b&gt;</property>
 <property name="use_markup">True</property>
@@ -6452,49 +7898,19 @@
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="padding">10</property>
 <property name="position">2</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area3">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <child>
- <object class="GtkButton" id="preset_cancel">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">gtk-cancel</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- <child>
- <object class="GtkButton" id="preset_ok">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">gtk-ok</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
 </object>
 </child>
 <action-widgets>
@@ -6502,2077 +7918,1645 @@
 <action-widget response="-5">preset_ok</action-widget>
 </action-widgets>
 </object>
- <object class="GtkWindow" id="activity_window">
- <property name="visible">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
- <property name="default_width">800</property>
- <property name="default_height">600</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="skip_pager_hint">True</property>
- <property name="transient-for">hb_window</property>
- <signal handler="activity_window_delete_cb" name="delete_event"/>
+ <object class="GtkDrawingArea" id="preview_image">
+ <property name="visible">True</property>
+ <property name="app_paintable">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_LEAVE_NOTIFY_MASK</property>
+ <signal name="leave-notify-event" handler="preview_leave_cb" swapped="no"/>
+ <signal name="motion-notify-event" handler="preview_motion_cb" swapped="no"/>
+ </object>
+ <object class="GtkAdjustment" id="preview_progress_adj">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkEventBox" id="preview_hud">
+ <property name="visible">True</property>
+ <property name="app_paintable">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">end</property>
+ <property name="margin-bottom">30</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property>
+ <signal name="enter-notify-event" handler="hud_enter_cb" swapped="no"/>
+ <signal name="size-allocate" handler="preview_hud_size_alloc_cb" swapped="no"/>
 <child>
- <object class="GtkVBox" id="vbox37">
+ <object class="GtkBox" id="vbox35">
 <property name="orientation">vertical</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin-top">5</property>
+ <property name="margin-bottom">5</property>
+ <property name="margin-left">10</property>
+ <property name="margin-right">10</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <placeholder/>
+ <object class="GtkScale" id="preview_frame">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">Select preview frames.</property>
+ <property name="adjustment">adjustment19</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ <signal name="value-changed" handler="preview_frame_value_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
 </child>
 <child>
- <object class="GtkLabel" id="activity_location">
- <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <object class="GtkBox" id="live_preview_box">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkButton" id="live_preview_play">
+ <property name="height_request">30</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes">Encode and play a short sequence of video starting from the current preview position.</property>
+ <property name="relief">none</property>
+ <signal name="clicked" handler="live_preview_start_cb" swapped="no"/>
+ <child>
+ <object class="GtkImage" id="live_preview_play_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">gtk-media-play</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScale" id="live_preview_progress">
+ <property name="can_focus">True</property>
+ <property name="adjustment">preview_progress_adj</property>
+ <property name="draw_value">False</property>
+ <property name="value_pos">right</property>
+ <signal name="value-changed" handler="live_preview_seek_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="live_progress_box">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkProgressBar" id="live_encode_progress">
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
 </object>
 <packing>
- <property name="padding">5</property>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkScrolledWindow" id="activity_scroll">
+ <object class="GtkBox" id="hbox26">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
 <child>
- <object class="GtkTextView" id="activity_view">
- <property name="width_request">600</property>
- <property name="height_request">600</property>
+ <object class="GtkBox" id="live_preview_duration_box">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkLabel" id="label37">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Duration:&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="live_duration">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">Set the duration of the live preview in seconds.</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment21</property>
+ <property name="numeric">True</property>
+ <signal name="value-changed" handler="preview_duration_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="preview_show_crop">
+ <property name="label" translatable="yes">Show Crop</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="editable">False</property>
- <property name="cursor-visible">False</property>
- <property name="wrap_mode">GTK_WRAP_CHAR</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Show Cropped area of the preview</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="show_crop_changed_cb" swapped="no"/>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="preview_fullscreen">
+ <property name="label" translatable="yes">Fullscreen</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">View Fullscreen Preview</property>
+ <property name="relief">none</property>
+ <signal name="toggled" handler="fullscreen_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
- <child>
- <placeholder/>
- </child>
 </object>
 </child>
 </object>
- <object class="GtkWindow" id="queue_window">
- <property name="visible">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="title" translatable="yes">HandBrake Queue</property>
- <property name="icon_name">hb-queue</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
- <property name="default_width">800</property>
- <property name="default_height">600</property>
+ <object class="GtkWindow" id="preview_window">
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_STRUCTURE_MASK</property>
+ <property name="title" translatable="yes">Preview</property>
+ <property name="resizable">False</property>
+ <property name="window_position">center</property>
+ <property name="type_hint">utility</property>
 <property name="skip_taskbar_hint">True</property>
 <property name="skip_pager_hint">True</property>
- <property name="transient-for">hb_window</property>
- <signal handler="queue_window_delete_cb" name="delete_event"/>
+ <property name="transient_for">hb_window</property>
+ <signal name="configure-event" handler="preview_configure_cb" swapped="no"/>
+ <signal name="delete-event" handler="preview_window_delete_cb" swapped="no"/>
 <child>
- <object class="GtkVBox" id="vbox34">
- <property name="orientation">vertical</property>
+ <object class="GtkBox" id="preview_window_box">
 <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <object class="GtkToolbar" id="queue_toolbar">
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ </object>
+ <object class="GtkFileChooserDialog" id="source_dialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="modal">True</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="skip_pager_hint">True</property>
+ <property name="create_folders">False</property>
+ <property name="local_only">False</property>
+ <signal name="selection-changed" handler="chooser_file_selected_cb" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area6">
 <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <object class="GtkToolButton" id="queue_start2">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="is_important">True</property>
- <property name="label" translatable="yes">Start</property>
- <property name="icon_name">hb-start</property>
- <signal handler="queue_start_clicked_cb" name="clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
 <child>
- <object class="GtkToolButton" id="queue_pause2">
+ <object class="GtkButton" id="source_cancel">
+ <property name="label" translatable="yes">Cancel</property>
+ <property name="image">gtk-cancel</property>
 <property name="visible">True</property>
- <property name="is_important">True</property>
- <property name="sensitive">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Pause</property>
- <property name="icon_name">hb-pause</property>
- <signal handler="queue_pause_clicked_cb" name="clicked"/>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkToolButton" id="queue_edit">
+ <object class="GtkButton" id="source_ok">
+ <property name="label" translatable="yes">OK</property>
+ <property name="image">gtk-ok</property>
 <property name="visible">True</property>
- <property name="is_important">True</property>
- <property name="sensitive">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Edit</property>
- <property name="icon_name">hb-edit</property>
- <signal handler="queue_edit_clicked_cb" name="clicked"/>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox38">
+ <object class="GtkBox" id="source_extra">
 <property name="orientation">vertical</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkLabel" id="current_encode">
+ <object class="GtkBox" id="single_title_box">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <object class="GtkLabel" id="label89">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Title Number:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="single_title">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">start</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment24</property>
+ <signal name="value-changed" handler="setting_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
 </object>
 <packing>
- <property name="position">0</property>
 <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox28">
+ <object class="GtkBox" id="hbox74">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
 <child>
- <object class="GtkLabel" id="queue_status">
- <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <object class="GtkLabel" id="label90">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Detected DVD devices:</property>
 </object>
 <packing>
- <property name="padding">10</property>
 <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
+ <object class="GtkComboBoxText" id="source_device">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <signal name="changed" handler="dvd_device_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
 </child>
 </object>
 <packing>
- <property name="position">1</property>
 <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
- <property name="position">1</property>
 <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
 </packing>
 </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow2">
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">source_cancel</action-widget>
+ <action-widget response="-9">source_ok</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkImage" id="gtk-cancel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="icon_name">gtk-cancel</property>
+ </object>
+ <object class="GtkImage" id="gtk-ok">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="icon_name">gtk-ok</property>
+ </object>
+ <object class="GtkImage" id="srt_add_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="icon_name">gtk-add</property>
+ </object>
+ <object class="GtkImage" id="subtitle_add_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="icon_name">gtk-add</property>
+ </object>
+ <object class="GtkDialog" id="tweak_dialog">
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="modal">True</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area7">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="tweak_cancel">
+ <property name="label" translatable="yes">Cancel</property>
+ <property name="image">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
 <child>
- <object class="GtkTreeView" id="queue_list">
- <property name="width_request">900</property>
- <property name="height_request">300</property>
+ <object class="GtkButton" id="tweak_ok">
+ <property name="label" translatable="yes">OK</property>
+ <property name="image">gtk-ok</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_visible">False</property>
- <property name="headers_clickable">False</property>
- <property name="hover_expand">False</property>
- <signal handler="queue_key_press_cb" name="key-press-event"/>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
 </child>
 </object>
 <packing>
- <property name="position">2</property>
- <property name="expand">True</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <placeholder/>
+ <object class="GtkBox" id="hbox9">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkLabel" id="label33">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Setting:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="tweak_setting">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="max_length">40</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">30</property>
+ <property name="truncate_multiline">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
 </child>
 </object>
 </child>
+ <action-widgets>
+ <action-widget response="0">tweak_cancel</action-widget>
+ <action-widget response="-5">tweak_ok</action-widget>
+ </action-widgets>
 </object>
- <object class="GtkWindow" id="settings_window">
- <property name="visible">False</property>
- <property name="title" translatable="yes">Picture Settings</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
+ <object class="GtkDialog" id="subtitle_dialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="modal">True</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
 <property name="skip_taskbar_hint">True</property>
 <property name="skip_pager_hint">True</property>
- <property name="resizable">False</property>
- <property name="transient-for">preview_window</property>
- <property name="events">GDK_STRUCTURE_MASK</property>
- <signal handler="settings_configure_cb" name="configure-event"/>
- <signal handler="settings_window_delete_cb" name="delete_event"/>
- <child>
- <object class="GtkVBox" id="vbox40">
- <property name="orientation">vertical</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-subtitle-vbox">
 <property name="visible">True</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkCheckButton" id="show_preview">
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-subtitle-action_area">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip-text" translatable="yes">Open Preview Window</property>
- <property name="label" translatable="yes">Show Preview</property>
- <signal name="toggled" handler="preview_button_clicked_cb"/>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="subtitle_cancel">
+ <property name="label" translatable="yes">Cancel</property>
+ <property name="image">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="subtitle_ok">
+ <property name="label" translatable="yes">OK</property>
+ <property name="image">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkNotebook" id="notebook1">
+ <object class="GtkBox" id="subtitle_srt_switch_box">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
- <property name="can_focus">True</property>
-
+ <property name="can_focus">False</property>
+ <property name="margin_bottom">24</property>
+ <child>
+ <object class="GtkRadioButton" id="SubtitleSrtEnable">
+ <property name="label" translatable="yes">Import SRT</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Enable settings to import an SRT subtitle file</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="subtitle_srt_radio_toggled_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="SubtitleSrtDisable">
+ <property name="label" translatable="yes">Embedded Subtitle List</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Enable settings to select embedded subtitles</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">SubtitleSrtEnable</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
 <child>
- <object class="GtkAlignment" id="alignment54">
+ <object class="GtkBox" id="subtitle_settings_box">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
 <child>
- <object class="GtkHBox" id="hbox75">
+ <object class="GtkGrid" id="subtitle_srt_grid">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="column_spacing">4</property>
 <child>
- <object class="GtkFrame" id="Cropping2">
+ <object class="GtkLabel" id="srt_lang_label">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment46">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">12</property>
- <property name="right_padding">2</property>
-
- <child>
- <object class="GtkVBox" id="vbox6">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <object class="GtkTable" id="table2">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">5</property>
- <property name="n_columns">6</property>
- <child>
- <object class="GtkSpinButton" id="PictureLeftCrop">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Left Crop</property>
- <property name="adjustment">adjustment13</property>
- <signal name="value_changed" handler="crop_changed_cb"/>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="PictureTopCrop">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Top Crop</property>
- <property name="adjustment">adjustment14</property>
- <signal name="value_changed" handler="crop_changed_cb"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="PictureBottomCrop">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Bottom Crop</property>
- <property name="adjustment">adjustment15</property>
- <signal name="value_changed" handler="crop_changed_cb"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="PictureRightCrop">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Right Crop</property>
- <property name="adjustment">adjustment16</property>
- <signal name="value_changed" handler="crop_changed_cb"/>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="PictureAutoCrop">
- <property name="label" translatable="yes">Auto Crop</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Automatically crop black borders around edges of the video.</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="scale_changed_cb"/>
- </object>
- <packing>
- <property name="y_options"></property>
- <property name="left_attach">0</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="PictureLooseCrop">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text">When picture settings require that the image 
-dimensions be rounded to some multiple number
-of pixels. This setting will crop a few extra pixels
-instead of doing exact cropping and then scaling to
-the required multiple.</property>
- <property name="label" translatable="yes">Loose Crop</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="scale_changed_cb"/>
- </object>
- <packing>
- <property name="y_options"></property>
- <property name="left_attach">0</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox78">
- <property name="visible">True</property>
- <property name="spacing">4</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <object class="GtkLabel" id="label97">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Crop Dimensions:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="crop_dimensions2">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">--</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
+ <property name="label" translatable="yes">Language</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="srt_code_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Character Code</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="srt_file_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">File:</property>
+ <property name="halign">end</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="srt_offset_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Offset (ms)</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="SrtLanguage">
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Set the language of this subtitle.
+This value will be used by players in subtitle menus.</property>
+ <signal name="changed" handler="srt_lang_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="SrtCodeset">
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="width_request">150</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Set the character code used by the SRT file you are importing.
 
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label26">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">&lt;b&gt;Cropping&lt;/b&gt;</property>
- <property name="use_markup">True</property>
+SRTs come in all flavours of character sets.
+We translate the character set to UTF-8.
+The source's character code is needed in order to perform this translation.</property>
+ <property name="has_entry">True</property>
+ <signal name="changed" handler="srt_changed_cb" swapped="no"/>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="combobox-entry1">
+ <property name="can_focus">True</property>
 </object>
 </child>
 </object>
 <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFileChooserButton" id="SrtFile">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Select the SRT file to import.</property>
+ <property name="local_only">False</property>
+ <property name="hexpand">True</property>
+ <property name="title" translatable="yes">Srt File</property>
+ <signal name="selection-changed" handler="srt_file_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="SrtOffset">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Adjust the offset in milliseconds between video and SRT timestamps</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment31</property>
+ <signal name="value-changed" handler="srt_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="subtitle_track_box">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="subtitle_track_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Track</property>
+ </object>
+ <packing>
 <property name="expand">False</property>
- <property name="padding">2</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkFrame" id="frame3">
+ <object class="GtkComboBox" id="SubtitleTrack">
+ <property name="valign">GTK_ALIGN_CENTER</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">12</property>
- <property name="right_padding">2</property>
- <child>
- <object class="GtkVBox" id="vbox30">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkHBox" id="hbox51">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkLabel" id="label27">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">width:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="scale_width">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">This is the width that the video will be stored at. The actual display dimensions will differ if the pixel aspect ratio is not 1:1.</property>
- <property name="adjustment">adjustment17</property>
- <property name="snap_to_ticks">True</property>
- <signal name="value_changed" handler="scale_width_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label28">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">height:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="scale_height">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">This is the height that the video will be stored at. The actual display dimensions will differ if the pixel aspect ratio is not 1:1.</property>
- <property name="adjustment">adjustment18</property>
- <signal name="value_changed" handler="scale_height_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox71">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <object class="GtkCheckButton" id="autoscale">
- <property name="label" translatable="yes">Optimal for source</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip-text" translatable="yes">If enabled, select the 'optimal' storage resolution. This will be the resolution that most closely matches the source resolution after cropping.</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="scale_changed_cb"/>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox20">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkLabel" id="label96">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Anamorphic:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="PicturePAR">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-markup" translatable="yes">&lt;b&gt;Anamorphic Modes:&lt;/b&gt;
-&lt;small&gt;&lt;tt&gt;
-None - Force pixel aspect ratio to 1:1.
-Loose - Align dimensions to chosen 'Alignment' value 
- and pick pixel aspect ratio that preserves the
- original display aspect ratio
-Strict - Keep original source dimensions and pixel 
- aspect ratio&lt;/tt&gt;&lt;/small&gt;</property>
- <signal name="changed" handler="scale_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox72">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkLabel" id="label95">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Alignment:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="PictureModulus">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Align storage dimensions to multiples of this value.
+ <property name="tooltip_text" translatable="yes">List of subtitle tracks available from your source.</property>
+ <signal name="changed" handler="subtitle_track_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="subtitle_options_box">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckButton" id="SubtitleForced">
+ <property name="label" translatable="yes">Forced Subtitles Only</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Use only subtitles that have been flagged
+as forced in the source subtitle track
 
-Encoders are most effecient when the video dimensions are aligned to some specific value (usually 16). Setting this to some other value will result in slightly larger file size.</property>
- <signal name="changed" handler="scale_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label25">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">&lt;b&gt;Storage&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
+"Forced" subtitles are usually used to show
+subtitles during scenes where someone is speaking
+a foreign language.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="subtitle_forced_toggled_cb" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="padding">2</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="SubtitleBurned">
+ <property name="label" translatable="yes">Burn into video</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Render the subtitle over the video.
+The subtitle will be part of the video and can not be disabled.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="subtitle_burned_toggled_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkFrame" id="frame4">
+ <object class="GtkCheckButton" id="SubtitleDefaultTrack">
+ <property name="label" translatable="yes">Set Default Track</property>
 <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment7">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">12</property>
- <property name="right_padding">2</property>
- <child>
- <object class="GtkVBox" id="vbox10">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkHBox" id="hbox52">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkLabel" id="label91">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">width:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="PictureDisplayWidth">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">This is the display width. It is the result of scaling the storage dimensions by the pixel aspect.</property>
- <property name="adjustment">adjustment25</property>
- <property name="snap_to_ticks">True</property>
- <signal name="value_changed" handler="display_width_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label92">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">height:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="PictureDisplayHeight">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">adjustment26</property>
- <signal name="value_changed" handler="display_height_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox79">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkLabel" id="label98">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Pixel Aspect:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="PicturePARWidth">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Pixel aspect defines the shape of the pixels. A 1:1 ratio defines a square pixel. Other values define rectangular shapes. Players will scale the image in order to achieve the specified aspect.</property>
- <property name="adjustment">adjustment29</property>
- <property name="snap_to_ticks">True</property>
- <signal name="value_changed" handler="par_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label99">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="PicturePARHeight">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">Pixel aspect defines the shape of the pixels. A 1:1 ratio defines a square pixel. Other values define rectangular shapes. Players will scale the image in order to achieve the specified aspect.</property>
- <property name="adjustment">adjustment30</property>
- <signal name="value_changed" handler="par_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="PictureKeepRatio">
- <property name="label" translatable="yes">Keep Aspect</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">If enabled, the original display aspect of the source will be maintained.</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="scale_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox53">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkLabel" id="label93">
- <property name="width_request">100</property>
- <property name="xalign">0</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Display Aspect:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="display_aspect">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">--:--</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label29">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">&lt;b&gt;Display&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
+ <property name="tooltip_text" translatable="yes">Set the default output subtitle track.
+
+Most players will automatically display this
+subtitle track whenever the video is played.
+
+This is useful for creating a "forced" track
+in your output.</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="subtitle_default_toggled_cb" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
- <property name="padding">2</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
 </child>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
 </child>
- <child type="tab">
- <object class="GtkLabel" id="label79">
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">subtitle_cancel</action-widget>
+ <action-widget response="-5">subtitle_ok</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="audio_dialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="modal">True</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="skip_pager_hint">True</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-audio-vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-audio-action_area">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="audio_cancel">
+ <property name="label" translatable="yes">Cancel</property>
+ <property name="image">gtk-cancel</property>
 <property name="visible">True</property>
- <property name="label" translatable="yes">Dimensions</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
 </object>
 <packing>
- <property name="tab_fill">False</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
 </packing>
 </child>
-
- <child>
- <object class="GtkAlignment" id="alignment43">
- <property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">6</property>
- <property name="right_padding">6</property>
 <child>
- <object class="GtkHBox" id="hbox77">
+ <object class="GtkButton" id="audio_ok">
+ <property name="label" translatable="yes">OK</property>
+ <property name="image">gtk-ok</property>
 <property name="visible">True</property>
- <property name="spacing">16</property>
- <child>
- <object class="GtkVBox" id="vbox8">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <object class="GtkCheckButton" id="VideoGrayScale">
- <property name="label" translatable="yes">Grayscale</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">If enabled, filter colour components out of video.</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment27">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xscale">0</property>
-
- <child>
- <object class="GtkTable" id="table90">
- <property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">5</property>
-
- <child>
- <object class="GtkLabel" id="label41">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Deblock:</property>
- </object>
- </child>
- <child>
- <object class="GtkHScale" id="PictureDeblock">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustment20</property>
- <property name="digits">0</property>
- <property name="value_pos">right</property>
- <property name="tooltip-text" translatable="yes">The deblocking filter removes a common type of compression artifact. If your source exhibits 'blockiness', this filter may help clean it up.</property>
- <signal name="value_changed" handler="setting_widget_changed_cb"/>
- <signal name="format_value" handler="format_deblock_cb"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label32">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Denoise:</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="PictureDenoise">
- <property name="width_request">100</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">The denoise filter is a low pass filter that removes noise. Film grain and other types of high frequency noise are difficult to compress. Using this filter on such sources can result in smaller file sizes.</property>
- <signal name="changed" handler="setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkEntry" id="PictureDenoiseCustom">
- <property name="width_chars">8</property>
- <property name="tooltip-text" translatable="yes">Custom denoise filter string format
- SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma</property>
- <signal name="changed" handler="setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- </object>
- </child>
-
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="padding">2</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox39">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <object class="GtkAlignment" id="alignment45">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
-
- <child>
- <object class="GtkTable" id="table10">
- <property name="visible">True</property>
- <property name="n_rows">7</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">5</property>
-
- <child>
- <object class="GtkLabel" id="label86">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Detelecine:</property>
- </object>
- </child>
- <child>
- <object class="GtkComboBox" id="PictureDetelecine">
- <property name="width_request">100</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">This filter removes 'combing' artifacts that are the result of telecining. Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps.</property>
- <signal name="changed" handler="setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkEntry" id="PictureDetelecineCustom">
- <property name="width_chars">8</property>
- <property name="tooltip-text" translatable="yes">Custom detelecine filter string format
- JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity</property>
- <signal name="changed" handler="setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
-
- <child>
- <object class="GtkRadioButton" id="PictureDecombDeinterlace">
- <property name="label" translatable="yes">Decomb</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip-text" translatable="yes">Choose decomb or deinterlace filter options.
-
-The decomb filter selectively deinterlaces frames that appear to be interlaced. This will preserve quality in frames that are not interlaced.
-
-The classic deinterlace filter is applied to all frames. Frames that are not interlaced will suffer some quality degradation.</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="PictureDeinterlaceDecomb">
- <property name="label" translatable="yes">Deinterlace</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip-text" translatable="yes">Choose decomb or deinterlace filter options.
-
-The decomb filter selectively deinterlaces frames that appear to be interlaced. This will preserve quality in frames that are not interlaced.
-
-The classic deinterlace filter is applied to all frames. Frames that are not interlaced will suffer some quality degradation.</property>
- <property name="draw_indicator">True</property>
- <property name="group">PictureDecombDeinterlace</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="PictureDecombLabel">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Decomb:</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="PictureDecomb">
- <property name="width_request">100</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">The decomb filter selectively deinterlaces frames that appear to be interlaced. This will preserve quality in frames that are not interlaced.</property>
- <signal name="changed" handler="setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkEntry" id="PictureDecombCustom">
- <property name="width_chars">8</property>
- <property name="tooltip-text" translatable="yes">Custom decomb filter string format
- Mode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:BlockHeight:MagnitudeThres:VarianceThres:LaplacianThresh:DilationThresh:ErosionThresh:NoiseThresh:MaxSearchDistance:PostProcessing:Parity</property>
- <signal name="changed" handler="setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
-
- <child>
- <object class="GtkLabel" id="PictureDeinterlaceLabel">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Deinterlace:</property>
- </object>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="PictureDeinterlace">
- <property name="width_request">100</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip-text" translatable="yes">The classic deinterlace filter is applied to all frames. Frames that are not interlaced will suffer some quality degradation.</property>
- <signal name="changed" handler="setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkEntry" id="PictureDeinterlaceCustom">
- <property name="width_chars">8</property>
- <property name="tooltip-text" translatable="yes">Custom deinterlace filter string format
- YadifMode:YadifParity:McdintMode:McdeintQp</property>
- <signal name="changed" handler="setting_widget_changed_cb"/>
- </object>
- <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- </object>
- </child>
-
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="padding">2</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
 </child>
 </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
 </child>
-
- <child type="tab">
- <object class="GtkLabel" id="label81">
+ <child>
+ <object class="GtkGrid" id="audio_dialog_grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label35">
 <property name="visible">True</property>
- <property name="label" translatable="yes">Filters</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Source Track</property>
 </object>
 <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="AudioTrack">
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">List of audio tracks available from your source.</property>
+ <signal name="changed" handler="audio_track_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="audio_name_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Track Name:</property>
+ <property name="use_markup">True</property>
+ <property name="halign">center</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="AudioTrackName">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Set the audio track name.
+
+Players may use this in the audio selection list.</property>
+ <property name="max_length">40</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <property name="truncate_multiline">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <signal name="changed" handler="audio_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
- </object>
- </child>
- </object>
-
- <object class="GtkAlignment" id="preview_image_align">
- <property name="visible">True</property>
- <property name="xalign">.5</property>
- <property name="yalign">.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkDrawingArea" id="preview_image">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_LEAVE_NOTIFY_MASK</property>
- <property name="app_paintable">True</property>
- <signal name="motion-notify-event" handler="preview_motion_cb"/>
- <signal name="leave-notify-event" handler="preview_leave_cb"/>
- </object>
- </child>
- </object>
-
- <object class="GtkAlignment" id="preview_hud">
- <property name="visible">False</property>
- <property name="xalign">.5</property>
- <property name="yalign">.9</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkEventBox" id="preview_event_box">
- <property name="visible">True</property>
- <property name="app-paintable">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property>
- <signal name="enter-notify-event" handler="hud_enter_cb"/>
- <signal handler="preview_hud_size_alloc_cb" name="size-allocate"/>
 <child>
- <object class="GtkAlignment" id="alignment53">
+ <object class="GtkGrid" id="audio_dialog_grid2">
 <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="left_padding">10</property>
- <property name="right_padding">10</property>
- <property name="top_padding">5</property>
- <property name="bottom_padding">5</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">24</property>
 <child>
- <object class="GtkVBox" id="vbox35">
- <property name="orientation">vertical</property>
+ <object class="GtkLabel" id="AudioEncoderLabel">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Encoder</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="AudioBitrateLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Bitrate/Quality</property>
+ <property name="use_markup">True</property>
+ <property name="halign">center</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="AudioMixdownLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Mix</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="AudioSamplerateLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Sample Rate</property>
+ <property name="use_markup">True</property>
+ <property name="halign">center</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="AudioTrackGainLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Gain</property>
+ <property name="use_markup">True</property>
+ <property name="halign">center</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="AudioTrackDRCSliderLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">&lt;b&gt;Dynamic Range Compression:&lt;/b&gt; Adjust the dynamic range of the output audio track.
+
+For source audio that has a wide dynamic range (very loud and very soft sequences),
+DRC allows you to 'compress' the range by making loud sounds softer and soft sounds louder.</property>
+ <property name="label" translatable="yes">DRC</property>
+ <property name="use_markup">True</property>
+ <property name="halign">center</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="AudioEncoder">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Set the audio codec to encode this track with.</property>
+ <signal name="changed" handler="audio_codec_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="audio_dialog_hbox24">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHScale" id="preview_frame">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustment19</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- <property name="tooltip-text" translatable="yes">Select preview frames.</property>
- <signal name="value_changed" handler="preview_frame_value_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="live_preview_box">
+ <object class="GtkBox" id="AudioTrackQualityEnableBox">
+ <property name="orientation">vertical</property>
 <property name="visible">True</property>
- <property name="spacing">5</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkButton" id="live_preview_play">
- <property name="height_request">30</property>
+ <object class="GtkRadioButton" id="AudioTrackBitrateEnable">
+ <property name="label" translatable="yes">Bitrate</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
- <property name="tooltip-text" translatable="yes">Encode and play a short sequence of video starting from the current preview position.</property>
- <signal name="clicked" handler="live_preview_start_cb"/>
- <child>
- <object class="GtkImage" id="live_preview_play_image">
- <property name="visible">True</property>
- <property name="stock">gtk-media-play</property>
- </object>
- </child>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Enable bitrate setting</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="audio_quality_radio_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkHScale" id="live_preview_progress">
+ <object class="GtkRadioButton" id="AudioTrackQualityEnable">
+ <property name="label" translatable="yes">Quality</property>
+ <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="adjustment">preview_progress_adj</property>
- <property name="draw_value">False</property>
- <property name="value_pos">right</property>
- <signal name="value_changed" handler="live_preview_seek_cb"/>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Enable quality setting</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">AudioTrackBitrateEnable</property>
+ <signal name="toggled" handler="audio_quality_radio_changed_cb" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
- <child>
- <object class="GtkVBox" id="live_progress_box">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- 
- <child>
- <object class="GtkProgressBar" id="live_encode_progress">
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- 
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
 </object>
 <packing>
- <property name="position">1</property>
 <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox26">
+ <object class="GtkComboBox" id="AudioBitrate">
 <property name="visible">True</property>
- <property name="spacing">10</property>
+ <property name="can_focus">False</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Set the bitrate to encode this track with.</property>
+ <signal name="changed" handler="audio_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="AudioTrackQualityBox">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <object class="GtkHBox" id="live_preview_duration_box">
+ <object class="GtkScaleButton" id="AudioTrackQuality">
 <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkLabel" id="label37">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Duration:&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="live_duration">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustment21</property>
- <property name="numeric">True</property>
- <property name="tooltip-text" translatable="yes">Set the duration of the live preview in seconds.</property>
- <signal name="value_changed" handler="preview_duration_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_markup" translatable="yes">&lt;b&gt;Quality:&lt;/b&gt; For output codec's that support it, adjust the quality of the output.</property>
+ <property name="orientation">vertical</property>
+ <property name="adjustment">audio_quality_adj</property>
+ <property name="icons">weather-storm
+weather-clear
+weather-storm
+weather-showers-scattered
+weather-showers
+weather-overcast
+weather-few-clouds
+weather-clear</property>
+ <signal name="value-changed" handler="quality_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkCheckButton" id="preview_show_crop">
+ <object class="GtkLabel" id="AudioTrackQualityValue">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip-text" translatable="yes">Show Cropped area of the preview</property>
- <property name="label" translatable="yes">Show Crop</property>
- <signal name="toggled" handler="show_crop_changed_cb"/>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">00.0</property>
+ <property name="use_markup">True</property>
+ <property name="width_chars">4</property>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
- <child>
- <object class="GtkToggleButton" id="preview_fullscreen">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip-text" translatable="yes">View Fullscreen Preview</property>
- <property name="label" translatable="yes">Fullscreen</property>
- <property name="relief">none</property>
- <signal handler="fullscreen_clicked_cb" name="toggled"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleButton" id="hide_settings">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip-text" translatable="yes">Hide the picture settings window while leaving the preview visible.</property>
- <property name="label" translatable="yes">Hide Settings</property>
- <property name="relief">none</property>
- <signal handler="picture_settings_alt2_clicked_cb" name="clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
- </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">2</property>
 </packing>
 </child>
 </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
 </child>
- </object>
- </child>
- </object>
- </child>
- </object>
-
- <object class="GtkWindow" id="preview_window">
- <property name="visible">False</property>
- <property name="title" translatable="yes">Preview</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
- <property name="skip_pager_hint">True</property>
- <property name="resizable">False</property>
- <property name="transient-for">hb_window</property>
- <property name="events">GDK_STRUCTURE_MASK | GDK_POINTER_MOTION_MASK</property>
- <signal handler="preview_configure_cb" name="configure-event"/>
- <signal handler="preview_window_delete_cb" name="delete_event"/>
- <child>
- <object class="GtkAlignment" id="preview_window_alignment">
- <property name="visible">True</property>
- <property name="xalign">.5</property>
- <property name="yalign">.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- </object>
- </child>
- </object>
-
- <object class="GtkAboutDialog" id="hb_about">
- <property name="border_width">5</property>
- <property name="title" translatable="yes">About HandBrake</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="skip_pager_hint">True</property>
- <property name="program_name">HandBrake</property>
- <property name="version">0.9.2</property>
- <property name="copyright" translatable="yes">Copyright &#xA9; 2008 - 2013 John Stebbins
-Copyright &#xA9; 2004 - 2013, HandBrake Devs</property>
- <property name="comments" translatable="yes">HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.</property>
- <property name="website">http://handbrake.fr</property>
- <property name="website_label" translatable="yes">http://handbrake.fr</property>
- <property name="license" translatable="yes">HandBrake 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.
-
-HandBrake 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.
-
-You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</property>
- <property name="authors">ghb author:
- John Stebbins
-
-HandBrake authors:
- Eric Petit
- Laurent Aimar
- John Allen
- Joe Crain
- Damiano Galassi
- Edward Groenendaal
- Rodney Hester
- Andrew Kimpton
- Chris Lee
- Chris Long
- Brian Mario
- Maurj
- Mirkwood
- Nyx
- Philippe Rigaux
- Jonathon Rubin
- Scott
- Chris Thoman
- Mark Krenek
- Van Jacobson
-
-liba52 authors:
- Aaron Holtzman
- Michel Lespinasse
- Gildas Bazin
- Billy Biggs
- Eduard Hasenleithner
- H&#xE5;kan Hjort
- Charles M. Hannum
- Chris Hodges
- Michael Holzt
- Angelos Keromytis
- David I. Lehn
- Don Mahurin
- Jim Miller
- Takefumi Sayo
- Shoji Tokunaga
-
-libavcodec authors:
- Fabrice Bellard
- Alex Beregszaszi
- Brian Foley
- Arpad Gereoffy
- Philip Gladstone
- Falk Hueffner
- Zdenek Kabelac
- Nick Kurshev
- Michael Niedermayer
- Fran&#xE7;ois Revol
- Dieter Shirley
- Juan J. Sierralta
- Lionel Ulmer
-
-libdts authors:
- Gildas Bazin
- Sam Hocevar
-
-libdvdcss authors:
- Billy Biggs
- St&#xE9;phane Borel
- H&#xE5;kan Hjort
- Samuel Hocevar
- Eugenio Jarosiewicz
- Jon Lech Johansen
- Markus Kuespert
- Pascal Levesque
- Steven M. Schultz
- David Sieb&#xF6;rger
- Alex Strelnikov
- German Tischler
- Gildas Bazin
-
-libdvdread authors:
- Bj&#xF6;rn Englund
- H&#xE5;kan Hjort
- Billy Biggs
- Christian Wolff
-
-libfaac authors:
- M. Bakker
- Tony Lenox
- RageOMatic
- thebard
- Ivan Dimkovic
- Krzysztof Nikiel
-
-libmp3lame authors:
- Mike Cheng
- Robert Hegemann
- Frank Klemm
- Alexander Leidinger
- Naoki Shibata
- Mark Taylor
- Takehiro Tominiga
- Iv&#xE1;n Cavero Belaunde
- Gabriel Bouvigne
- Florian Bomers
- CISC
- John Dahlstrom
- John Dee
- Albert Faber
- Peter Gubanov
- Lars Magne Ingebrigtsen
- Yosi Markovich
- Zdenek Kabelac
- Iwasa Kazmi
- Guillaume Lessard
- Steve Lhomme
- Don Melton
- Viral Shah
- Acy Stapp
- Roel VdB
-
-libmp4v2 authors:
- Dave Mackie
- Alix Marchandise-Franquet
- Bill May
- Massimo Villari
- Waqar Mohsin
- Richard Chen
- Rob Arnold
- Howdy Pierce
- Steven Schultz
- sergent@io.com
- Sean Gilligan
- Michael Rossberg
- Luis F. Ramirez
- Petter Reinholdtsen
-
-libmpeg2 authors:
- Aaron Holtzman
- Michel Lespinasse
- Bruno Barreyra
- Gildas Bazin
- Alexander W. Chin
- Stephen Crowley
- Didier Gautheron
- Ryan C. Gordon
- Peter Gubanov
- H&#xE5;kan Hjort
- Nicolas Joly
- Gerd Knorr
- David I. Lehn
- Olie Lho
- Rick Niles
- Real Ouellet
- Bajusz Peter
- Franck Sicard
- Brion Vibber
- Martin Vogt
- Fredrik Vraalsen
-
-libogg authors:
- Christopher Montgomery
-
-libsamplerate authors:
- Erik de Castro Lopo
-
-libvorbis authors:
- Christopher Montgomery
-
-libx264 authors:
- Laurent Aimar
-
-</property>
- <property name="logo_icon_name">hb-icon</property>
- <property name="wrap_license">True</property>
- <signal handler="hb_about_response_cb" name="response"/>
- <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox4">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <placeholder/>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area4">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <object class="GtkStatusIcon" id="hb_status">
- <property name="visible">False</property>
- <property name="icon_name">hb-icon</property>
- <signal handler="status_activate_cb" name="activate"/>
- </object>
- <object class="GtkDialog" id="update_dialog">
- <property name="border_width">5</property>
- <property name="modal">True</property>
- <property name="window_position">center-on-parent</property>
- <property name="type_hint">dialog</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="skip_pager_hint">True</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox8">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkHBox" id="hbox24">
- <property name="visible">True</property>
 <child>
- <object class="GtkVBox" id="vbox19">
- <property name="orientation">vertical</property>
+ <object class="GtkComboBox" id="AudioMixdown">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Set the mixdown of the output audio track.</property>
+ <signal name="changed" handler="audio_mix_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="AudioSamplerate">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Set the sample rate of the output audio track.</property>
+ <signal name="changed" handler="audio_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox34">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <object class="GtkEventBox" id="eventbox2">
+ <object class="GtkScaleButton" id="AudioTrackGainSlider">
 <property name="visible">True</property>
- <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
- <property name="visible_window">False</property>
- <property name="above_child">True</property>
- <child>
- <object class="GtkImage" id="image10">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="icon_name">hb-icon</property>
- <property name="pixel-size">64</property>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_markup" translatable="yes">&lt;b&gt;Audio Gain:&lt;/b&gt; Adjust the amplification or attenuation of the output audio track.</property>
+ <property name="orientation">vertical</property>
+ <property name="adjustment">adjustment35</property>
+ <property name="icons">audio-volume-muted
+audio-volume-high
+audio-volume-low
+audio-volume-medium</property>
+ <signal name="value-changed" handler="gain_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <placeholder/>
+ <object class="GtkLabel" id="AudioTrackGainValue">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">0dB</property>
+ <property name="use_markup">True</property>
+ <property name="width_chars">6</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
 </child>
 </object>
 <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="top_attach">1</property>
+ <property name="left_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="vbox41">
- <property name="orientation">vertical</property>
+ <object class="GtkBox" id="hbox33">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <child>
- <object class="GtkLabel" id="label22">
+ <object class="GtkScaleButton" id="AudioTrackDRCSlider">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">10</property>
- <property name="ypad">5</property>
- <property name="label" translatable="yes">&lt;b&gt;A new version of HandBrake is available!&lt;/b&gt;</property>
- <property name="use_markup">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_markup" translatable="yes">&lt;b&gt;Dynamic Range Compression:&lt;/b&gt; Adjust the dynamic range of the output audio track.
+
+For source audio that has a wide dynamic range (very loud and very soft sequences),
+DRC allows you to 'compress' the range by making loud sounds softer and soft sounds louder.</property>
+ <property name="orientation">vertical</property>
+ <property name="adjustment">adjustment28</property>
+ <property name="icons">audio-input-microphone</property>
+ <signal name="value-changed" handler="drc_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="update_message">
+ <object class="GtkLabel" id="AudioTrackDRCValue">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">10</property>
- <property name="ypad">5</property>
- <property name="label" translatable="yes">HandBrake xxx is now available (you have yyy).</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Off</property>
+ <property name="use_markup">True</property>
+ <property name="width_chars">4</property>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
- <child>
- <object class="GtkFrame" id="frame15">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">etched-out</property>
- <child>
- <object class="GtkAlignment" id="alignment28">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkScrolledWindow" id="update_scroll">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label88">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Release Notes&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
 </object>
 <packing>
- <property name="position">1</property>
+ <property name="top_attach">1</property>
+ <property name="left_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 </object>
 <packing>
- <property name="position">1</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
 </packing>
 </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">audio_cancel</action-widget>
+ <action-widget response="-5">audio_ok</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="update_dialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="modal">True</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="skip_pager_hint">True</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
 <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area8">
+ <object class="GtkButtonBox" id="dialog-action_area8">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="layout_style">end</property>
 <child>
 <object class="GtkButton" id="update_skip">
+ <property name="label" translatable="yes">Skip This Version</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
- <property name="label" translatable="yes">Skip This Version</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkButton" id="update_remind">
+ <property name="label" translatable="yes">Remind Me Later</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
- <property name="label" translatable="yes">Remind Me Later</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="pack_type">end</property>
 <property name="position">0</property>
 </packing>
 </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-5">update_skip</action-widget>
- <action-widget response="0">update_remind</action-widget>
- </action-widgets>
- </object>
- <object class="GtkFileChooserDialog" id="source_dialog">
- <property name="border_width">5</property>
- <property name="local-only">False</property>
- <property name="create-folders">False</property>
- <property name="modal">True</property>
- <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
- <property name="type_hint">dialog</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="skip_pager_hint">True</property>
- <signal handler="chooser_file_selected_cb" name="selection-changed"/>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox9">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <property name="spacing">2</property>
 <child>
- <object class="GtkVBox" id="source_extra">
- <property name="orientation">vertical</property>
+ <object class="GtkBox" id="hbox24">
+ <property name="orientation">horizontal</property>
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkHBox" id="single_title_box">
+ <object class="GtkBox" id="vbox19">
+ <property name="orientation">vertical</property>
 <property name="visible">True</property>
- <property name="spacing">4</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkLabel" id="label89">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Title Number:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment24">
+ <object class="GtkEventBox" id="eventbox2">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xscale">0</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
+ <property name="visible_window">False</property>
+ <property name="above_child">True</property>
 <child>
- <object class="GtkSpinButton" id="single_title">
+ <object class="GtkImage" id="image10">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">adjustment24</property>
- <signal name="value_changed" handler="setting_widget_changed_cb"/>
+ <property name="pixel_size">64</property>
+ <property name="icon_name">hb-icon</property>
 </object>
 </child>
 </object>
 <packing>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
 </packing>
 </child>
+ <child>
+ <placeholder/>
+ </child>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="hbox74">
+ <object class="GtkBox" id="vbox41">
+ <property name="orientation">vertical</property>
 <property name="visible">True</property>
- <property name="spacing">4</property>
+ <property name="can_focus">False</property>
 <child>
- <object class="GtkLabel" id="label90">
+ <object class="GtkLabel" id="label22">
 <property name="visible">True</property>
- <property name="label" translatable="yes">Detected DVD devices:</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin-left">10</property>
+ <property name="margin-right">10</property>
+ <property name="margin-top">5</property>
+ <property name="margin-bottom">5</property>
+ <property name="label" translatable="yes">&lt;b&gt;A new version of HandBrake is available!&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
 </object>
 <packing>
 <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
- <object class="GtkAlignment" id="alignment42">
+ <object class="GtkLabel" id="update_message">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin-left">10</property>
+ <property name="margin-right">10</property>
+ <property name="margin-top">5</property>
+ <property name="margin-bottom">5</property>
+ <property name="label" translatable="yes">HandBrake xxx is now available (you have yyy).</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame15">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xscale">0</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">etched-out</property>
 <child>
- <object class="GtkComboBoxText" id="source_device">
+ <object class="GtkScrolledWindow" id="update_scroll">
+ <property name="margin-left">12</property>
+ <property name="halign">start</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label88">
 <property name="visible">True</property>
- <property name="entry-text-column">0</property>
- <signal handler="dvd_device_changed_cb" name="changed"/>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Release Notes&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
 </object>
 </child>
 </object>
 <packing>
- <property name="position">1</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
 </packing>
 </child>
 </object>
 <packing>
- <property name="position">1</property>
- <property name="expand">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area6">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="source_cancel">
- <property name="label" translatable="yes">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="source_ok">
- <property name="label" translatable="yes">gtk-ok</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
 </object>
 </child>
 <action-widgets>
- <action-widget response="-6">source_cancel</action-widget>
- <action-widget response="-9">source_ok</action-widget>
+ <action-widget response="-5">update_skip</action-widget>
+ <action-widget response="0">update_remind</action-widget>
 </action-widgets>
 </object>
- <object class="GtkImage" id="image11">
- <property name="visible">True</property>
- <property name="stock">gtk-new</property>
- </object>
- <object class="GtkImage" id="image12">
- <property name="visible">True</property>
- <property name="stock">gtk-apply</property>
- </object>
- <object class="GtkImage" id="image13">
- <property name="visible">True</property>
- <property name="stock">gtk-save-as</property>
- </object>
- <object class="GtkImage" id="image14">
- <property name="visible">True</property>
- <property name="stock">gtk-open</property>
- </object>
- <object class="GtkImage" id="image15">
- <property name="visible">True</property>
- <property name="stock">gtk-refresh</property>
+ <object class="GtkAdjustment" id="VideoPresetRange">
+ <property name="upper">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
 </object>
 </interface>

HandBrake-0.9.9.tar.bz2/gtk/src/ghbcellrenderertext.c -> HandBrake-0.10.0.tar.bz2/gtk/src/ghbcellrenderertext.c Changed

@@ -38,12 +38,7 @@
 #define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
 
 
-#if GTK_CHECK_VERSION(3, 0, 0)
 #define MyGdkRectangle  const GdkRectangle
-#else
-#define MyGdkRectangle  GdkRectangle
-#endif
-
 
 static void ghb_cell_renderer_text_finalize   (GObject                  *object);
 
@@ -62,23 +57,12 @@
                            gint                     *y_offset,
                            gint                     *width,
                            gint                     *height);
-#if GTK_CHECK_VERSION(3, 0, 0)
 static void ghb_cell_renderer_text_render     (GtkCellRenderer          *cell,
                            cairo_t                  *cr,
                            GtkWidget                *widget,
                            MyGdkRectangle           *background_area,
                            MyGdkRectangle           *cell_area,
                            GtkCellRendererState      flags);
-#else
-static void ghb_cell_renderer_text_render     (GtkCellRenderer          *cell,
-                           GdkWindow                *window,
-                           GtkWidget                *widget,
-                           MyGdkRectangle           *background_area,
-                           MyGdkRectangle           *cell_area,
-                           GdkRectangle             *expose_area,
-                           GtkCellRendererState      flags);
-#endif
-
 static GtkCellEditable *ghb_cell_renderer_text_start_editing (GtkCellRenderer      *cell,
                                   GdkEvent             *event,
                                   GtkWidget            *widget,
@@ -103,7 +87,7 @@
   PROP_WIDTH_CHARS,
   PROP_WRAP_WIDTH,
   PROP_ALIGN,
-  
+
   /* Style args */
   PROP_BACKGROUND,
   PROP_FOREGROUND,
@@ -126,7 +110,7 @@
   PROP_LANGUAGE,
   PROP_ELLIPSIZE,
   PROP_WRAP_MODE,
-  
+
   /* Whether-a-style-arg-is-set args */
   PROP_BACKGROUND_SET,
   PROP_FOREGROUND_SET,
@@ -160,20 +144,20 @@
   guint markup_set : 1;
   guint ellipsize_set : 1;
   guint align_set : 1;
-  
+
   gulong focus_out_id;
   PangoLanguage *language;
   PangoEllipsizeMode ellipsize;
   PangoWrapMode wrap_mode;
   PangoAlignment align;
-  
+
   gulong populate_popup_id;
   gulong entry_menu_popdown_timeout;
   gboolean in_entry_menu;
-  
+
   gint width_chars;
   gint wrap_width;
-  
+
   GtkWidget *entry;
 };
 
@@ -208,7 +192,7 @@
   GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class);
 
   object_class->finalize = ghb_cell_renderer_text_finalize;
-  
+
   object_class->get_property = ghb_cell_renderer_text_get_property;
   object_class->set_property = ghb_cell_renderer_text_set_property;
 
@@ -223,7 +207,7 @@
                                                         P_("Text to render"),
                                                         NULL,
                                                         GTK_PARAM_READWRITE));
-  
+
   g_object_class_install_property (object_class,
                                    PROP_MARKUP,
                                    g_param_spec_string ("markup",
@@ -248,7 +232,7 @@
                                                          FALSE,
                                                          GTK_PARAM_READWRITE));
 
-  
+
   g_object_class_install_property (object_class,
                                    PROP_BACKGROUND,
                                    g_param_spec_string ("background",
@@ -262,8 +246,8 @@
                                    g_param_spec_boxed ("background-gdk",
                                                        P_("Background color"),
                                                        P_("Background color as a GdkColor"),
-                                                       GDK_TYPE_COLOR,
-                                                       GTK_PARAM_READWRITE));  
+                                                       GDK_TYPE_RGBA,
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_FOREGROUND,
@@ -278,7 +262,7 @@
                                    g_param_spec_boxed ("foreground-gdk",
                                                        P_("Foreground color"),
                                                        P_("Foreground color as a GdkColor"),
-                                                       GDK_TYPE_COLOR,
+                                                       GDK_TYPE_RGBA,
                                                        GTK_PARAM_READWRITE));
 
 
@@ -306,7 +290,7 @@
                                                        PANGO_TYPE_FONT_DESCRIPTION,
                                                        GTK_PARAM_READWRITE));
 
-  
+
   g_object_class_install_property (object_class,
                                    PROP_FAMILY,
                                    g_param_spec_string ("family",
@@ -332,7 +316,7 @@
                                                       PANGO_TYPE_VARIANT,
                                                       PANGO_VARIANT_NORMAL,
                                                       GTK_PARAM_READWRITE));
-  
+
   g_object_class_install_property (object_class,
                                    PROP_WEIGHT,
                                    g_param_spec_int ("weight",
@@ -351,7 +335,7 @@
                                                       PANGO_TYPE_STRETCH,
                                                       PANGO_STRETCH_NORMAL,
                                                       GTK_PARAM_READWRITE));
-  
+
   g_object_class_install_property (object_class,
                                    PROP_SIZE,
                                    g_param_spec_int ("size",
@@ -370,7 +354,7 @@
                                                         0.0,
                                                         G_MAXDOUBLE,
                                                         0.0,
-                                                        GTK_PARAM_READWRITE));  
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_SCALE,
@@ -381,7 +365,7 @@
                                                         G_MAXDOUBLE,
                                                         1.0,
                                                         GTK_PARAM_READWRITE));
-  
+
   g_object_class_install_property (object_class,
                                    PROP_RISE,
                                    g_param_spec_int ("rise",
@@ -401,7 +385,7 @@
                                                          P_("Whether to strike through the text"),
                                                          FALSE,
                                                          GTK_PARAM_READWRITE));
-  
+
   g_object_class_install_property (object_class,
                                    PROP_UNDERLINE,
                                    g_param_spec_enum ("underline",
@@ -425,8 +409,8 @@
   /**
    * GhbCellRendererText:ellipsize:
    *
-   * Specifies the preferred place to ellipsize the string, if the cell renderer 
-   * does not have enough room to display the entire string. Setting it to 
+   * Specifies the preferred place to ellipsize the string, if the cell renderer
+   * does not have enough room to display the entire string. Setting it to
    * %PANGO_ELLIPSIZE_NONE turns off ellipsizing. See the wrap-width property
    * for another way of making the text fit into a given width.
    *
@@ -445,11 +429,11 @@
 
   /**
    * GhbCellRendererText:width-chars:
-   * 
+   *
    * The desired width of the cell, in characters. If this property is set to
    * -1, the width will be calculated automatically, otherwise the cell will
    * request either 3 characters or the property value, whichever is greater.
-   * 
+   *
    * Since: 2.6
    **/
   g_object_class_install_property (object_class,
@@ -461,12 +445,12 @@
                                                      G_MAXINT,
                                                      -1,
                                                      GTK_PARAM_READWRITE));
-  
+
   /**
    * GhbCellRendererText:wrap-mode:
    *
-   * Specifies how to break the string into multiple lines, if the cell 
-   * renderer does not have enough room to display the entire string. 
+   * Specifies how to break the string into multiple lines, if the cell
+   * renderer does not have enough room to display the entire string.
    * This property has no effect unless the wrap-width property is set.
    *
    * Since: 2.8
@@ -485,7 +469,7 @@
   /**
    * GhbCellRendererText:wrap-width:
    *
-   * Specifies the width at which the text is wrapped. The wrap-mode property can 
+   * Specifies the width at which the text is wrapped. The wrap-mode property can
    * be used to influence at what character positions the line breaks can be placed.
    * Setting wrap-width to -1 turns wrapping off.
    *
@@ -504,10 +488,10 @@
   /**
    * GhbCellRendererText:alignment:
    *
-   * Specifies how to align the lines of text with respect to each other. 
+   * Specifies how to align the lines of text with respect to each other.
    *
-   * Note that this property describes how to align the lines of text in 
-   * case there are several of them. The "xalign" property of #GtkCellRenderer, 
+   * Note that this property describes how to align the lines of text in
+   * case there are several of them. The "xalign" property of #GtkCellRenderer,
    * on the other hand, sets the horizontal alignment of the whole text.
    *
    * Since: 2.10
@@ -520,7 +504,7 @@
                               PANGO_TYPE_ALIGNMENT,
                               PANGO_ALIGN_LEFT,
                               GTK_PARAM_READWRITE));
-  
+
   /* Style props are set or not */
 
 #define ADD_SET_PROP(propname, propval, nick, blurb) g_object_class_install_property (object_class, propval, g_param_spec_boolean (propname, nick, blurb, FALSE, GTK_PARAM_READWRITE))
@@ -532,14 +516,14 @@
   ADD_SET_PROP ("foreground-set", PROP_FOREGROUND_SET,
                 P_("Foreground set"),
                 P_("Whether this tag affects the foreground color"));
-  
+
   ADD_SET_PROP ("editable-set", PROP_EDITABLE_SET,
                 P_("Editability set"),
                 P_("Whether this tag affects text editability"));
 
   ADD_SET_PROP ("family-set", PROP_FAMILY_SET,
                 P_("Font family set"),
-                P_("Whether this tag affects the font family"));  
+                P_("Whether this tag affects the font family"));
 
   ADD_SET_PROP ("style-set", PROP_STYLE_SET,
                 P_("Font style set"),
@@ -564,7 +548,7 @@
   ADD_SET_PROP ("scale-set", PROP_SCALE_SET,
                 P_("Font scale set"),
                 P_("Whether this tag scales the font size by a factor"));
-  
+
   ADD_SET_PROP ("rise-set", PROP_RISE_SET,
                 P_("Rise set"),
                 P_("Whether this tag affects the rise"));
@@ -695,11 +679,11 @@
     case PROP_BACKGROUND_GDK:
       {
         GdkColor color;
-        
+
         color.red = celltext->background.red;
         color.green = celltext->background.green;
         color.blue = celltext->background.blue;
-        
+
         g_value_set_boxed (value, &color);
       }
       break;
@@ -707,11 +691,11 @@
     case PROP_FOREGROUND_GDK:
       {
         GdkColor color;
-        
+
         color.red = celltext->foreground.red;
         color.green = celltext->foreground.green;
         color.blue = celltext->foreground.blue;
-        
+
         g_value_set_boxed (value, &color);
       }
       break;
@@ -719,7 +703,7 @@
     case PROP_FONT:
         g_value_take_string (value, pango_font_description_to_string (celltext->font));
       break;
-      
+
     case PROP_FONT_DESC:
       g_value_set_boxed (value, celltext->font);
       break;
@@ -755,7 +739,7 @@
     case PROP_SCALE:
       g_value_set_double (value, celltext->font_scale);
       break;
-      
+
     case PROP_EDITABLE:
       g_value_set_boolean (value, celltext->editable);
       break;
@@ -770,7 +754,7 @@
 
     case PROP_RISE:
       g_value_set_int (value, celltext->rise);
-      break;  
+      break;
 
     case PROP_LANGUAGE:
       g_value_set_static_string (value, pango_language_to_string (priv->language));
@@ -779,7 +763,7 @@
     case PROP_ELLIPSIZE:
       g_value_set_enum (value, priv->ellipsize);
       break;
-      
+
     case PROP_WRAP_MODE:
       g_value_set_enum (value, priv->wrap_mode);
       break;
@@ -787,7 +771,7 @@
     case PROP_WRAP_WIDTH:
       g_value_set_int (value, priv->wrap_width);
       break;
-      
+
     case PROP_ALIGN:
       g_value_set_enum (value, priv->align);
       break;
@@ -809,14 +793,14 @@
       {
     PangoFontMask mask = get_property_font_set_mask (param_id);
     g_value_set_boolean (value, (pango_font_description_get_set_fields (celltext->font) & mask) != 0);
-    
+
     break;
       }
 
     case PROP_SCALE_SET:
       g_value_set_boolean (value, celltext->scale_set);
       break;
-      
+
     case PROP_EDITABLE_SET:
       g_value_set_boolean (value, celltext->editable_set);
       break;
@@ -844,10 +828,10 @@
     case PROP_ALIGN_SET:
       g_value_set_boolean (value, priv->align_set);
       break;
-      
+
     case PROP_WIDTH_CHARS:
       g_value_set_int (value, priv->width_chars);
-      break;  
+      break;
 
     case PROP_BACKGROUND:
     case PROP_FOREGROUND:
@@ -861,19 +845,19 @@
 
 static void
 set_bg_color (GhbCellRendererText *celltext,
-              GdkColor            *color)
+              GdkRGBA             *rgba)
 {
-  if (color)
+  if (rgba)
     {
       if (!celltext->background_set)
         {
           celltext->background_set = TRUE;
           g_object_notify (G_OBJECT (celltext), "background-set");
         }
-      
-      celltext->background.red = color->red;
-      celltext->background.green = color->green;
-      celltext->background.blue = color->blue;
+
+      celltext->background.red = rgba->red;
+      celltext->background.green = rgba->green;
+      celltext->background.blue = rgba->blue;
     }
   else
     {
@@ -888,19 +872,19 @@
 
 static void
 set_fg_color (GhbCellRendererText *celltext,
-              GdkColor            *color)
+              GdkRGBA             *rgba)
 {
-  if (color)
+  if (rgba)
     {
       if (!celltext->foreground_set)
         {
           celltext->foreground_set = TRUE;
           g_object_notify (G_OBJECT (celltext), "foreground-set");
         }
-      
-      celltext->foreground.red = color->red;
-      celltext->foreground.green = color->green;
-      celltext->foreground.blue = color->blue;
+
+      celltext->foreground.red = rgba->red;
+      celltext->foreground.green = rgba->green;
+      celltext->foreground.blue = rgba->blue;
     }
   else
     {
@@ -917,7 +901,7 @@
               PangoFontMask         to_set)
 {
   PangoFontMask changed_mask = 0;
-  
+
   if (to_set & PANGO_FONT_MASK_FAMILY)
     {
       const char *family = pango_font_description_get_family (desc);
@@ -945,7 +929,7 @@
       size = 10 * PANGO_SCALE;
       changed_mask |= PANGO_FONT_MASK_SIZE;
     }
-      
+
       pango_font_description_set_size (desc, size);
     }
 
@@ -995,7 +979,7 @@
   GObject *object = G_OBJECT (celltext);
   PangoFontDescription *new_font_desc;
   PangoFontMask old_mask, new_mask, changed_mask, set_changed_mask;
-  
+
   if (font_desc)
     new_font_desc = pango_font_description_copy (font_desc);
   else
@@ -1009,12 +993,12 @@
 
   pango_font_description_free (celltext->font);
   celltext->font = new_font_desc;
-  
+
   g_object_freeze_notify (object);
 
   g_object_notify (object, "font-desc");
   g_object_notify (object, "font");
-  
+
   if (changed_mask & PANGO_FONT_MASK_FAMILY)
     g_object_notify (object, "family");
   if (changed_mask & PANGO_FONT_MASK_STYLE)
@@ -1032,7 +1016,7 @@
     }
 
   notify_set_changed (object, set_changed_mask);
-  
+
   g_object_thaw_notify (object);
 }
 
@@ -1108,30 +1092,30 @@
     case PROP_SINGLE_PARAGRAPH_MODE:
       priv->single_paragraph = g_value_get_boolean (value);
       break;
-      
+
     case PROP_BACKGROUND:
       {
-        GdkColor color;
+        GdkRGBA rgba;
 
         if (!g_value_get_string (value))
           set_bg_color (celltext, NULL);       /* reset to background_set to FALSE */
-        else if (gdk_color_parse (g_value_get_string (value), &color))
-          set_bg_color (celltext, &color);
+        else if (gdk_rgba_parse(&rgba, g_value_get_string(value)))
+          set_bg_color (celltext, &rgba);
         else
-          g_warning ("Don't know color `%s'", g_value_get_string (value));
+          g_warning ("Don't know color `%s'", g_value_get_string(value));
 
         g_object_notify (object, "background-gdk");
       }
       break;
-      
+
     case PROP_FOREGROUND:
       {
-        GdkColor color;
+        GdkRGBA  rgba;
 
         if (!g_value_get_string (value))
           set_fg_color (celltext, NULL);       /* reset to foreground_set to FALSE */
-        else if (gdk_color_parse (g_value_get_string (value), &color))
-          set_fg_color (celltext, &color);
+        else if (gdk_rgba_parse(&rgba, g_value_get_string(value)))
+          set_fg_color (celltext, &rgba);
         else
           g_warning ("Don't know color `%s'", g_value_get_string (value));
 
@@ -1162,7 +1146,7 @@
         set_font_description (celltext, font_desc);
 
     pango_font_description_free (font_desc);
-        
+
     if (celltext->fixed_height_rows != -1)
       celltext->calc_fixed_height = TRUE;
       }
@@ -1170,7 +1154,7 @@
 
     case PROP_FONT_DESC:
       set_font_description (celltext, g_value_get_boxed (value));
-      
+
       if (celltext->fixed_height_rows != -1)
     celltext->calc_fixed_height = TRUE;
       break;
@@ -1184,7 +1168,7 @@
     case PROP_SIZE_POINTS:
       {
     PangoFontMask old_set_mask = pango_font_description_get_set_fields (celltext->font);
-    
+
     switch (param_id)
       {
       case PROP_FAMILY:
@@ -1218,17 +1202,17 @@
         g_object_notify (object, "size");
         break;
       }
-    
+
     if (celltext->fixed_height_rows != -1)
       celltext->calc_fixed_height = TRUE;
-    
+
     notify_set_changed (object, old_set_mask & pango_font_description_get_set_fields (celltext->font));
     g_object_notify (object, "font-desc");
     g_object_notify (object, "font");
 
     break;
       }
-      
+
     case PROP_SCALE:
       celltext->font_scale = g_value_get_double (value);
       celltext->scale_set = TRUE;
@@ -1236,7 +1220,7 @@
     celltext->calc_fixed_height = TRUE;
       g_object_notify (object, "scale-set");
       break;
-      
+
     case PROP_EDITABLE:
       celltext->editable = g_value_get_boolean (value);
       celltext->editable_set = TRUE;
@@ -1257,7 +1241,7 @@
       celltext->underline_style = g_value_get_enum (value);
       celltext->underline_set = TRUE;
       g_object_notify (object, "underline-set");
-            
+
       break;
 
     case PROP_RISE:
@@ -1266,7 +1250,7 @@
       g_object_notify (object, "rise-set");
       if (celltext->fixed_height_rows != -1)
     celltext->calc_fixed_height = TRUE;
-      break;  
+      break;
 
     case PROP_LANGUAGE:
       priv->language_set = TRUE;
@@ -1281,18 +1265,18 @@
       priv->ellipsize_set = TRUE;
       g_object_notify (object, "ellipsize-set");
       break;
-      
+
     case PROP_WRAP_MODE:
       priv->wrap_mode = g_value_get_enum (value);
       break;
-      
+
     case PROP_WRAP_WIDTH:
       priv->wrap_width = g_value_get_int (value);
       break;
-            
+
     case PROP_WIDTH_CHARS:
       priv->width_chars = g_value_get_int (value);
-      break;  
+      break;
 
     case PROP_ALIGN:
       priv->align = g_value_get_enum (value);
@@ -1322,7 +1306,7 @@
       else
     {
       PangoFontMask changed_mask;
-      
+
       changed_mask = set_font_desc_fields (celltext->font,
                            get_property_font_set_mask (param_id));
       notify_fields_changed (G_OBJECT (celltext), changed_mask);
@@ -1332,7 +1316,7 @@
     case PROP_SCALE_SET:
       celltext->scale_set = g_value_get_boolean (value);
       break;
-      
+
     case PROP_EDITABLE_SET:
       celltext->editable_set = g_value_get_boolean (value);
       break;
@@ -1360,7 +1344,7 @@
     case PROP_ALIGN_SET:
       priv->align_set = g_value_get_boolean (value);
       break;
-      
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
       break;
@@ -1369,7 +1353,7 @@
 
 /**
  * ghb_cell_renderer_text_new:
- * 
+ *
  * Creates a new #GhbCellRendererText. Adjust how text is drawn using
  * object properties. Object properties can be
  * set globally (with g_object_set()). Also, with #GtkTreeViewColumn,
@@ -1377,7 +1361,7 @@
  * you can bind the "text" property on the cell renderer to a string
  * value in the model, thus rendering a different string in each row
  * of the #GtkTreeView
- * 
+ *
  * Return value: the new cell renderer
  **/
 GtkCellRenderer *
@@ -1392,7 +1376,7 @@
 {
   attr->start_index = 0;
   attr->end_index = G_MAXINT;
-  
+
   pango_attr_list_insert (attr_list, attr);
 }
 
@@ -1408,7 +1392,7 @@
   GhbCellRendererTextPrivate *priv;
 
   priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (celltext);
-  
+
   layout = gtk_widget_create_pango_layout (widget, celltext->text);
 
   if (celltext->extra_attrs)
@@ -1421,18 +1405,18 @@
   if (will_render)
     {
       /* Add options that affect appearance but not size */
-      
+
       /* note that background doesn't go here, since it affects
        * background_area not the PangoLayout area
        */
-      
+
       if (celltext->foreground_set
       && (flags & GTK_CELL_RENDERER_SELECTED) == 0)
         {
           PangoColor color;
 
           color = celltext->foreground;
-          
+
           add_attr (attr_list,
                     pango_attr_foreground_new (color.red, color.green, color.blue));
         }
@@ -1447,7 +1431,7 @@
   if (celltext->scale_set &&
       celltext->font_scale != 1.0)
     add_attr (attr_list, pango_attr_scale_new (celltext->font_scale));
-  
+
   if (celltext->underline_set)
     uline = celltext->underline_style;
   else
@@ -1455,7 +1439,7 @@
 
   if (priv->language_set)
     add_attr (attr_list, pango_attr_language_new (priv->language));
-  
+
   if ((flags & GTK_CELL_RENDERER_PRELIT) == GTK_CELL_RENDERER_PRELIT)
     {
       switch (uline)
@@ -1512,7 +1496,7 @@
   pango_layout_set_attributes (layout, attr_list);
 
   pango_attr_list_unref (attr_list);
-  
+
   return layout;
 }
 
@@ -1546,7 +1530,7 @@
       PangoFontDescription *font_desc;
       gint row_height;
 
-      font_desc = pango_font_description_copy_static(gtk_widget_get_style(widget)->font_desc);
+      font_desc = pango_font_description_copy_static(ghb_widget_get_font(widget));
       pango_font_description_merge_static(font_desc, celltext->font, TRUE);
 
       if (celltext->scale_set)
@@ -1567,7 +1551,7 @@
       gtk_cell_renderer_set_fixed_size (cell,
                     cell_width, 2*cell_ypad +
                     celltext->fixed_height_rows * PANGO_PIXELS (row_height));
-      
+
       if (height)
     {
           *height = cell_height;
@@ -1577,7 +1561,7 @@
       if (width == NULL)
     return;
     }
-  
+
   if (layout)
     g_object_ref (layout);
   else
@@ -1594,7 +1578,7 @@
     {
       if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
         *x_offset = (1.0 - cell_xalign) * (cell_area->width - (2 * cell_xpad));
-      else 
+      else
         *x_offset = cell_xalign * (cell_area->width - (2 * cell_xpad));
 
       if ((priv->ellipsize_set && priv->ellipsize != PANGO_ELLIPSIZE_NONE) || priv->wrap_width != -1)
@@ -1635,7 +1619,6 @@
         x_offset, y_offset, width, height);
 }
 
-#if GTK_CHECK_VERSION(3, 0, 0)
 static void ghb_cell_renderer_text_render(
     GtkCellRenderer          *cell,
     cairo_t                  *cr,
@@ -1646,8 +1629,8 @@
 {
     GhbCellRendererText *celltext = (GhbCellRendererText *) cell;
     PangoLayout *layout;
-    gint x_offset;
-    gint y_offset;
+    gint x_offset = 0;
+    gint y_offset = 0;
     GhbCellRendererTextPrivate *priv;
 
     priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (cell);
@@ -1661,7 +1644,7 @@
     gboolean sensitive;
 
     sensitive = gtk_cell_renderer_get_sensitive(cell);
-    if (!sensitive) 
+    if (!sensitive)
     {
       state = GTK_STATE_INSENSITIVE;
     }
@@ -1688,7 +1671,7 @@
 
     gtk_cell_renderer_get_padding(cell, &xpad, &ypad);
 
-    if (celltext->background_set && 
+    if (celltext->background_set &&
       (flags & GTK_CELL_RENDERER_SELECTED) == 0)
     {
         gdk_cairo_rectangle (cr, background_area);
@@ -1700,7 +1683,7 @@
     }
 
     if (priv->ellipsize_set && priv->ellipsize != PANGO_ELLIPSIZE_NONE)
-        pango_layout_set_width (layout, 
+        pango_layout_set_width (layout,
                 (cell_area->width - x_offset - 2 * xpad) * PANGO_SCALE);
     else if (priv->wrap_width == -1)
         pango_layout_set_width (layout, -1);
@@ -1713,98 +1696,6 @@
 
     g_object_unref (layout);
 }
-#else
-static void ghb_cell_renderer_text_render     (GtkCellRenderer          *cell,
-                           GdkWindow                *window,
-                           GtkWidget                *widget,
-                           MyGdkRectangle           *background_area,
-                           MyGdkRectangle           *cell_area,
-                           GdkRectangle             *expose_area,
-                           GtkCellRendererState      flags)
-{
-    GhbCellRendererText *celltext = (GhbCellRendererText *) cell;
-    PangoLayout *layout;
-    GtkStateType state;
-    gint x_offset;
-    gint y_offset;
-    GhbCellRendererTextPrivate *priv;
-
-    priv = GHB_CELL_RENDERER_TEXT_GET_PRIVATE (cell);
-
-    layout = get_layout (celltext, widget, TRUE, flags);
-    get_size(cell, widget, cell_area, layout, &x_offset, &y_offset, NULL, NULL);
-
-    gboolean sensitive;
-    gint xpad, ypad;
-
-    sensitive = gtk_cell_renderer_get_sensitive(cell);
-    if (!sensitive) 
-    {
-      state = GTK_STATE_INSENSITIVE;
-    }
-    else if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
-    {
-        if (gtk_widget_has_focus (widget))
-            state = GTK_STATE_SELECTED;
-        else
-            state = GTK_STATE_ACTIVE;
-    }
-    else if ((flags & GTK_CELL_RENDERER_PRELIT) == GTK_CELL_RENDERER_PRELIT &&
-       GTK_WIDGET_STATE (widget) == GTK_STATE_PRELIGHT)
-    {
-        state = GTK_STATE_PRELIGHT;
-    }
-    else
-    {
-        if (GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE)
-            state = GTK_STATE_INSENSITIVE;
-        else
-            state = GTK_STATE_NORMAL;
-    }
-
-    gtk_cell_renderer_get_padding(cell, &xpad, &ypad);
-
-    if (celltext->background_set && 
-      (flags & GTK_CELL_RENDERER_SELECTED) == 0)
-    {
-        cairo_t *cr = gdk_cairo_create (window);
-
-        if (expose_area)
-        {
-            gdk_cairo_rectangle (cr, expose_area);
-            cairo_clip (cr);
-        }
-
-        gdk_cairo_rectangle (cr, background_area);
-        cairo_set_source_rgb (cr,
-                celltext->background.red / 65535.,
-                celltext->background.green / 65535.,
-                celltext->background.blue / 65535.);
-        cairo_fill (cr);
-      
-        cairo_destroy (cr);
-    }
-
-    if (priv->ellipsize_set && priv->ellipsize != PANGO_ELLIPSIZE_NONE)
-        pango_layout_set_width (layout, 
-                (cell_area->width - x_offset - 2 * xpad) * PANGO_SCALE);
-    else if (priv->wrap_width == -1)
-        pango_layout_set_width (layout, -1);
-
-    gtk_paint_layout (widget->style,
-                      window,
-                      state,
-                      TRUE,
-                      expose_area,
-                      widget,
-                      "cellrenderertext",
-                      cell_area->x + x_offset + xpad,
-                      cell_area->y + y_offset + ypad,
-                      layout);
-
-    g_object_unref (layout);
-}
-#endif
 
 static gboolean
 ghb_cell_renderer_text_keypress(
@@ -1850,7 +1741,7 @@
 
   gboolean editing_canceled;
   g_object_get(entry, "editing-canceled", &editing_canceled, NULL);
-  gtk_cell_renderer_stop_editing (GTK_CELL_RENDERER (data), 
+  gtk_cell_renderer_stop_editing (GTK_CELL_RENDERER (data),
                   editing_canceled);
   if (editing_canceled)
     return;
@@ -1965,9 +1856,9 @@
 
     g_object_set_data_full (G_OBJECT (priv->entry),
             I_(GHB_CELL_RENDERER_TEXT_PATH), g_strdup (path), g_free);
-  
+
     gtk_editable_select_region (GTK_EDITABLE (priv->entry), 0, -1);
-  
+
 #if 0
     GtkRequisition min_size, size;
 
@@ -2023,7 +1914,7 @@
     priv->populate_popup_id = g_signal_connect (priv->entry, "populate_popup",
                       G_CALLBACK (ghb_cell_renderer_text_populate_popup),
                       celltext);
- 
+
     gtk_widget_show (priv->entry);
 
     return GTK_CELL_EDITABLE (priv->entry);
@@ -2033,7 +1924,7 @@
  * ghb_cell_renderer_text_set_fixed_height_from_font:
  * @renderer: A #GhbCellRendererText
  * @number_of_rows: Number of rows of text each cell renderer is allocated, or -1
- * 
+ *
  * Sets the height of a renderer to explicitly be determined by the "font" and
  * "y_pad" property set on it.  Further changes in these properties do not
  * affect the height, so they must be accompanied by a subsequent call to this

HandBrake-0.9.9.tar.bz2/gtk/src/ghbcellrenderertext.h -> HandBrake-0.10.0.tar.bz2/gtk/src/ghbcellrenderertext.h Changed

HandBrake-0.9.9.tar.bz2/gtk/src/ghbcompat.h -> HandBrake-0.10.0.tar.bz2/gtk/src/ghbcompat.h Changed

@@ -4,29 +4,43 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
-#if !GTK_CHECK_VERSION(3, 0, 0)
-#include <gdk/gdkkeysyms.h>
-#endif
+static inline PangoFontDescription* ghb_widget_get_font(GtkWidget *widget)
+{
+ PangoFontDescription *font = NULL;
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+ GtkStyleContext *style;
 
-#if !GTK_CHECK_VERSION(2, 22, 0)
-// Define any keys not defined by older GDK versions
-#define GDK_KEY_Delete GDK_Delete
-#define GDK_KEY_Return GDK_Return
-#define GDK_KEY_Down GDK_Down
-#define GDK_KEY_Up GDK_Up
+ style = gtk_widget_get_style_context(widget);
+
+#if GTK_CHECK_VERSION(3, 8, 0)
+ gtk_style_context_get(style, GTK_STATE_FLAG_NORMAL,
+ "font", &font, NULL);
+#else
+ font = gtk_style_context_get_font(style, GTK_STATE_FLAG_NORMAL);
+#endif
 #endif
 
-#if !GTK_CHECK_VERSION(2, 20, 0)
-// Replace simple accessor functions added to newer gtk versions
-static inline void gtk_widget_set_realized(GtkWidget *widget, gboolean realized)
-{
- GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED);
+ return font;
 }
 
-static inline gboolean gtk_widget_get_realized(GtkWidget *widget)
-{
- return GTK_WIDGET_REALIZED(widget);
-}
+#if !GTK_CHECK_VERSION(3, 10, 0)
+#define gtk_image_set_from_icon_name gtk_image_set_from_stock
+#define GHB_PLAY_ICON "gtk-media-play"
+#define GHB_PAUSE_ICON "gtk-media-pause"
+#else
+#define GHB_PLAY_ICON "media-playback-start"
+#define GHB_PAUSE_ICON "media-playback-pause"
+#endif
+
+#if !GTK_CHECK_VERSION(3, 10, 0)
+#define GHB_STOCK_OPEN GTK_STOCK_OPEN
+#define GHB_STOCK_CANCEL GTK_STOCK_CANCEL
+#define GHB_STOCK_SAVE GTK_STOCK_SAVE
+#else
+#define GHB_STOCK_OPEN "_Open"
+#define GHB_STOCK_CANCEL "_Cancel"
+#define GHB_STOCK_SAVE "_Save"
 #endif
 
 #endif // _GHB_COMPAT_H_

HandBrake-0.9.9.tar.bz2/gtk/src/ghbcompositor.c -> HandBrake-0.10.0.tar.bz2/gtk/src/ghbcompositor.c Changed

@@ -47,7 +47,6 @@
 static void     ghb_compositor_unrealize     (GtkWidget      *widget);
 static void     ghb_compositor_size_allocate (GtkWidget      *widget,
                                              GtkAllocation   *allocation);
-#if GTK_CHECK_VERSION(3, 0, 0)
 static gboolean ghb_compositor_draw          (GtkWidget      *widget,
                                              cairo_t         *cr);
 static void ghb_compositor_get_preferred_width(GtkWidget      *widget,
@@ -56,12 +55,6 @@
 static void ghb_compositor_get_preferred_height(GtkWidget      *widget,
                                              gint            *minimum_size,
                                              gint            *natural_size);
-#else
-static gboolean ghb_compositor_expose        (GtkWidget      *widget,
-                                             GdkEventExpose  *event);
-static void     ghb_compositor_size_request  (GtkWidget      *widget,
-                                             GtkRequisition  *requisition);
-#endif
 static void     ghb_compositor_set_property  (GObject        *object,
                                              guint            prop_id,
                                              const GValue    *value,
@@ -104,14 +97,9 @@
     gobject_class->set_property = ghb_compositor_set_property;
     gobject_class->get_property = ghb_compositor_get_property;
 
-#if GTK_CHECK_VERSION(3, 0, 0)
     widget_class->draw = ghb_compositor_draw;
     widget_class->get_preferred_width = ghb_compositor_get_preferred_width;
     widget_class->get_preferred_height = ghb_compositor_get_preferred_height;
-#else
-    widget_class->size_request = ghb_compositor_size_request;
-    widget_class->expose_event = ghb_compositor_expose;
-#endif
     widget_class->size_allocate = ghb_compositor_size_allocate;
 
     widget_class->realize = ghb_compositor_realize;
@@ -148,7 +136,7 @@
     return GTK_TYPE_WIDGET;
 }
 
-static void 
+static void
 ghb_compositor_get_property (
     GObject    *object,
     guint       prop_id,
@@ -163,7 +151,7 @@
     }
 }
 
-static void 
+static void
 ghb_compositor_set_property (
     GObject      *object,
     guint         prop_id,
@@ -189,7 +177,7 @@
     return (cca->z_pos - ccb->z_pos);
 }
 
-static void 
+static void
 ghb_compositor_set_child_property(
     GtkContainer *container,
     GtkWidget    *child,
@@ -231,7 +219,7 @@
         break;
     }
 
-    if (gtk_widget_get_visible (child) && 
+    if (gtk_widget_get_visible (child) &&
         gtk_widget_get_visible (GTK_WIDGET(compositor)))
     {
         gtk_widget_queue_resize (child);
@@ -239,7 +227,7 @@
 
 }
 
-static void 
+static void
 ghb_compositor_get_child_property(
     GtkContainer *container,
     GtkWidget    *child,
@@ -345,13 +333,13 @@
  * Insert in the given position of the zlist in the compositor.
  * All children in the zlist must have associated GdkDrawable's
  * This means they must be GtkDrawingArea or GtkEventBox
- * 
+ *
  **/
 void
 ghb_compositor_zlist_insert (
     GhbCompositor *compositor,
-    GtkWidget *child, 
-    gint z_pos, 
+    GtkWidget *child,
+    gint z_pos,
     gdouble opacity)
 {
     GhbCompositorChild *cc;
@@ -503,12 +491,7 @@
     GdkWindow *window;
     if (visible_window)
     {
-#if GTK_CHECK_VERSION(3, 0, 0)
         attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
-#else
-        attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-        attributes.colormap = gtk_widget_get_colormap (widget);
-#endif
         attributes.visual = gtk_widget_get_visual (widget);
         attributes.wclass = GDK_INPUT_OUTPUT;
 
@@ -524,14 +507,6 @@
         gtk_widget_set_window(widget, window);
         g_object_ref (window);
     }
-
-#if !GTK_CHECK_VERSION(3, 0, 0)
-    gtk_widget_style_attach(widget);
-
-    if (visible_window)
-        gtk_style_set_background(widget->style, window, 
-                                GTK_STATE_NORMAL);
-#endif
 }
 
 static void
@@ -540,7 +515,6 @@
     GTK_WIDGET_CLASS (ghb_compositor_parent_class)->unrealize (widget);
 }
 
-#if GTK_CHECK_VERSION(3, 0, 0)
 static void
 ghb_compositor_get_preferred_width(
         GtkWidget *widget,
@@ -592,35 +566,6 @@
     *minimum_size = height + gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2;
     *natural_size = height + gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2;
 }
-#else
-
-static void
-ghb_compositor_size_request(
-    GtkWidget      *widget,
-    GtkRequisition *requisition)
-{
-    GhbCompositor *compositor = GHB_COMPOSITOR (widget);
-    GList *link;
-    GhbCompositorChild *cc;
-    gint width = 0, height = 0;
-    GtkRequisition size;
-
-    for (link = compositor->children; link != NULL; link = link->next)
-    {
-        cc = (GhbCompositorChild*)link->data;
-        if (gtk_widget_get_visible(cc->widget))
-        {
-            //gtk_widget_size_request(cc->widget, NULL);
-            gtk_widget_size_request(cc->widget, &size);
-            width = MAX(size.width, width);
-            height = MAX(size.height, height);
-        }
-    }
-
-    requisition->width = width + gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2;
-    requisition->height = height + gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2;
-}
-#endif
 
 static void
 ghb_compositor_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
@@ -635,9 +580,9 @@
 
     if (!gtk_widget_get_has_window(widget))
     {
-        child_allocation.x = allocation->x + 
+        child_allocation.x = allocation->x +
                          gtk_container_get_border_width(GTK_CONTAINER(widget));
-        child_allocation.y = allocation->y + 
+        child_allocation.y = allocation->y +
                          gtk_container_get_border_width(GTK_CONTAINER(widget));
     }
     else
@@ -646,9 +591,9 @@
         child_allocation.y = 0;
     }
 
-    child_allocation.width = MAX (allocation->width - 
+    child_allocation.width = MAX (allocation->width -
                  gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2, 0);
-    child_allocation.height = MAX (allocation->height - 
+    child_allocation.height = MAX (allocation->height -
                  gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2, 0);
 
     if (gtk_widget_get_realized(widget))
@@ -687,7 +632,6 @@
 }
 #endif
 
-#if GTK_CHECK_VERSION(3, 0, 0)
 static void
 ghb_compositor_blend (GtkWidget *widget, cairo_t *cr)
 {
@@ -712,7 +656,7 @@
 
             if (
 //!gtk_cairo_should_draw_window(cr, gtk_widget_get_window(child)) ||
-                !gtk_widget_get_visible(cc->widget) || 
+                !gtk_widget_get_visible(cc->widget) ||
                 !gtk_widget_get_visible(child))
                 continue;
 
@@ -753,62 +697,7 @@
     }
     /* we're done */
 }
-#else
-static void
-ghb_compositor_blend (GtkWidget *widget, GdkEventExpose *event)
-{
-    GhbCompositor *compositor = GHB_COMPOSITOR (widget);
-    GList *link, *draw;
-    GdkRegion *region;
-    GtkWidget *child;
-    cairo_t *cr;
-    GhbCompositorChild *cc;
 
-    if (compositor->children == NULL) return;
-    /* create a cairo context to draw to the window */
-    cr = gdk_cairo_create (gtk_widget_get_window(widget));
-
-    for (link = compositor->children; link != NULL; link = link->next)
-    {
-
-        cc = (GhbCompositorChild*)link->data;
-        for (draw = cc->drawables; draw != NULL; draw = draw->next)
-        {
-            /* get our child */
-            child = GTK_WIDGET(draw->data);
-            if (!gtk_widget_get_visible(cc->widget) || 
-                !gtk_widget_get_visible(child))
-                continue;
-
-            /* the source data is the (composited) event box */
-            gdk_cairo_set_source_pixmap (cr, gtk_widget_get_window(child),
-                                        child->allocation.x,
-                                        child->allocation.y);
-            /* draw no more than our expose event intersects our child */
-            region = gdk_region_rectangle (&child->allocation);
-            gdk_region_intersect (region, event->region);
-
-            GdkRegion *dregion = gdk_drawable_get_visible_region(
-                                            gtk_widget_get_window(child));
-            gdk_region_offset(dregion, child->allocation.x, child->allocation.y);
-            gdk_region_intersect (region, dregion);
-            gdk_region_destroy(dregion);
-
-            gdk_cairo_region (cr, region);
-            gdk_region_destroy(region);
-            cairo_clip (cr);
-            /* composite, with an opacity */
-            cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-            cairo_paint_with_alpha (cr, cc->opacity);
-            gdk_cairo_reset_clip(cr, gtk_widget_get_window(widget));
-        }
-    }
-    /* we're done */
-    cairo_destroy (cr);
-}
-#endif
-
-#if GTK_CHECK_VERSION(3, 0, 0)
 static gboolean
 ghb_compositor_draw(GtkWidget *widget, cairo_t *cr)
 {
@@ -822,19 +711,3 @@
 
     return FALSE;
 }
-#else
-static gboolean
-ghb_compositor_expose (GtkWidget *widget, GdkEventExpose *event)
-{
-    if (GTK_WIDGET_DRAWABLE (widget))
-    {
-        if (gtk_widget_get_has_window(widget))
-            ghb_compositor_blend (widget, event);
-
-        GTK_WIDGET_CLASS(
-            ghb_compositor_parent_class)->expose_event(widget, event);
-    }
-
-    return FALSE;
-}
-#endif

HandBrake-0.9.9.tar.bz2/gtk/src/ghbcompositor.h -> HandBrake-0.10.0.tar.bz2/gtk/src/ghbcompositor.h Changed

HandBrake-0.10.0.tar.bz2/gtk/src/hb-activity.svg Added

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg6023"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ width="64"
+ height="64"
+ sodipodi:docname="hb-activity.64.png">
+ <metadata
+ id="metadata6029">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs6027" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="854"
+ inkscape:window-height="501"
+ id="namedview6025"
+ showgrid="false"
+ inkscape:zoom="3.6875"
+ inkscape:cx="32"
+ inkscape:cy="32"
+ inkscape:window-x="389"
+ inkscape:window-y="189"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg6023" />
+ <image
+ width="64"
+ height="64"
+ xlink:href="data:image/png;base64,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
+fwBP2Cl7eGSfjQAAAABJRU5ErkJggg==
+"
+ id="image6031"
+ x="0"
+ y="0" />
+ <path
+ style="fill:#454545"
+ d="M 32,54 8,54 6,52 4,50 4,32 4,14 l 2,-2 2,-2 24,0 24,0 2,2 2,2 0,18 0,18 -2,2 -2,2 -24,0 z m -1,-20 7,0 0,-1 0,-1 -7,0 -7,0 0,1 0,1 7,0 z M 15.997052,33 C 16.325431,33 18.351757,31.2 20.5,29 L 24.405896,25 20.5,21 16.594104,17 15.356069,17 c -0.680919,0 -1.53875,0.486567 -1.906291,1.08126 l -0.668255,1.081261 2.796329,2.918739 2.79633,2.91874 -2.684782,2.802309 -2.684782,2.802309 1.197691,1.197691 C 14.861039,32.461039 15.668674,33 15.997052,33 z"
+ id="path6033"
+ inkscape:connector-curvature="0" />
+</svg>

HandBrake-0.10.0.tar.bz2/gtk/src/hb-add-queue.svg Added

@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg5421"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ width="64"
+ height="64"
+ sodipodi:docname="hb-add-queue.2.svg">
+ <metadata
+ id="metadata5427">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs5425" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1485"
+ inkscape:window-height="1198"
+ id="namedview5423"
+ showgrid="false"
+ inkscape:zoom="3.6875"
+ inkscape:cx="32"
+ inkscape:cy="32"
+ inkscape:window-x="262"
+ inkscape:window-y="236"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg5421" />
+ <image
+ width="64"
+ height="64"
+ xlink:href="data:image/png;base64,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
+SUVORK5CYII=
+"
+ id="image5429"
+ x="0"
+ y="0" />
+ <path
+ style="fill:#484848"
+ d="M 54,58.95091 51.5,58.92913 49.110071,57.604494 46.720143,56.279858 45.395507,53.88993 c -0.72855,-1.314461 -1.340582,-3.381255 -1.360072,-4.592876 -0.01949,-1.211621 0.452911,-3.274749 1.049777,-4.584729 L 46.170425,42.330543 48.989504,40.665271 51.808584,39 l 2.048655,0 c 1.12676,0 3.228577,0.537608 4.670703,1.194685 l 2.622049,1.194686 1.425005,2.755654 L 64,46.90068 64,49.5 l 0,2.59932 -1.459952,2.823236 -1.459952,2.823236 -2.290048,0.613449 C 57.530522,58.696638 55.375,58.962889 54,58.95091 z M 54,55 l 2,0 0,-2 0,-2 2,0 2,0 0,-2 0,-2 -2,0 -2,0 0,-2 0,-2 -2,0 -2,0 0,2 0,2 -2,0 -2,0 0,2 0,2 2,0 2,0 0,2 0,2 2,0 z M 27,53 14,53 12,51 10,49 10,45 10,41 7,41 4,41 2,39 0,37 0,23 0,9 2,7 4,5 l 19,0 19,0 2,2 2,2 0,3 0,3 4,0 4,0 2,2 2,2 0,8 0,8 -3,0 -3,0 0,-7 0,-7 -18,0 -18,0 0,13 0,13 12,0 12,0 0,3 0,3 -13,0 z M 8,35 l 2,0 0,-8 0,-8 2,-2 2,-2 13,0 13,0 0,-2 0,-2 -17,0 -17,0 0,12 0,12 2,0 z m 21.325296,10 -11.353673,0 2.647075,-4 c 1.455891,-2.2 2.982176,-4 3.391744,-4 0.409568,0 1.310654,0.681971 2.002414,1.51549 l 1.257745,1.51549 3.427118,-2.61399 3.427117,-2.61399 1.943713,1.759036 c 1.069042,0.96747 2.106895,1.574295 2.30634,1.3485 0.199445,-0.225795 1.689185,-2.758281 3.310533,-5.627748 l 2.947906,-5.217212 2.106553,4.335922 2.106554,4.335921 -2.976117,2.200338 -2.976116,2.200337 -1.107616,2.430953 L 40.67897,45 29.325296,45 z M 24.742688,33 23.142857,33 21.571429,31.428571 20,29.857143 20,28 20,26.142857 21.571429,24.571429 23.142857,23 l 1.773584,0 1.773584,0 1.654987,1.828741 1.654988,1.82874 0,1.516272 0,1.516272 -1.828741,1.654987 L 26.342519,33 24.742688,33 z"
+ id="path5744"
+ inkscape:connector-curvature="0" />
+</svg>

HandBrake-0.9.9.tar.bz2/gtk/src/hb-backend.c -> HandBrake-0.10.0.tar.bz2/gtk/src/hb-backend.c Changed

@@ -11,12 +11,12 @@
 * 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.
- * 
+ *
 * This program 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 Library General Public License for more details.
- * 
+ *
 * 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., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
@@ -27,11 +27,13 @@
 #include "hb.h"
 #include "ghbcompat.h"
 #include <glib/gstdio.h>
+#include <glib/gi18n.h>
 #include "hb-backend.h"
 #include "settings.h"
 #include "callbacks.h"
 #include "subtitlehandler.h"
 #include "audiohandler.h"
+#include "videohandler.h"
 #include "x264handler.h"
 #include "preview.h"
 #include "values.h"
@@ -51,30 +53,35 @@
 options_map_t *map;
 } combo_opts_t;
 
-static gchar **index_str = NULL;
-static gint index_str_size = 0;
-
-static void 
-index_str_init(gint max_index)
+static options_map_t d_subtitle_track_sel_opts[] =
 {
- gint ii;
+ {N_("None"), "none", 0, "0"},
+ {N_("First Track Matching Selected Languages"), "first", 1, "1"},
+ {N_("All Tracks Matching Selected Languages"), "all", 2, "2"},
+};
+combo_opts_t subtitle_track_sel_opts =
+{
+ sizeof(d_subtitle_track_sel_opts)/sizeof(options_map_t),
+ d_subtitle_track_sel_opts
+};
 
- if (max_index+1 > index_str_size)
- {
- index_str = realloc(index_str, (max_index+1) * sizeof(char*));
- for (ii = index_str_size; ii <= max_index; ii++)
- {
- index_str[ii] = g_strdup_printf("%d", ii);
- }
- index_str_size = max_index + 1;
- }
-}
+static options_map_t d_audio_track_sel_opts[] =
+{
+ {N_("None"), "none", 0, "0"},
+ {N_("First Track Matching Selected Languages"), "first", 1, "1"},
+ {N_("All Tracks Matching Selected Languages"), "all", 2, "2"},
+};
+combo_opts_t audio_track_sel_opts =
+{
+ sizeof(d_audio_track_sel_opts)/sizeof(options_map_t),
+ d_audio_track_sel_opts
+};
 
 static options_map_t d_point_to_point_opts[] =
 {
- {"Chapters:", "chapter", 0, "0"},
- {"Seconds:", "time", 1, "1"},
- {"Frames:", "frame", 2, "2"},
+ {N_("Chapters:"), "chapter", 0, "0"},
+ {N_("Seconds:"), "time", 1, "1"},
+ {N_("Frames:"), "frame", 2, "2"},
 };
 combo_opts_t point_to_point_opts =
 {
@@ -84,11 +91,11 @@
 
 static options_map_t d_when_complete_opts[] =
 {
- {"Do Nothing", "nothing", 0, "0"},
- {"Show Notification", "notify", 1, "1"},
- {"Quit Handbrake", "quit", 4, "4"},
- {"Put Computer To Sleep", "sleep", 2, "2"},
- {"Shutdown Computer", "shutdown", 3, "3"},
+ {N_("Do Nothing"), "nothing", 0, "0"},
+ {N_("Show Notification"), "notify", 1, "1"},
+ {N_("Quit Handbrake"), "quit", 4, "4"},
+ {N_("Put Computer To Sleep"), "sleep", 2, "2"},
+ {N_("Shutdown Computer"), "shutdown", 3, "3"},
 };
 combo_opts_t when_complete_opts =
 {
@@ -98,10 +105,10 @@
 
 static options_map_t d_par_opts[] =
 {
- {"Off", "0", 0, "0"},
- {"Strict", "1", 1, "1"},
- {"Loose", "2", 2, "2"},
- {"Custom", "3", 3, "3"},
+ {N_("Off"), "0", 0, "0"},
+ {N_("Strict"), "1", 1, "1"},
+ {N_("Loose"), "2", 2, "2"},
+ {N_("Custom"), "3", 3, "3"},
 };
 combo_opts_t par_opts =
 {
@@ -136,10 +143,10 @@
 
 static options_map_t d_log_longevity_opts[] =
 {
- {"Week", "week", 7, "7"},
- {"Month", "month", 30, "30"},
- {"Year", "year", 365, "365"},
- {"Immortal", "immortal", 366, "366"},
+ {N_("Week"), "week", 7, "7"},
+ {N_("Month"), "month", 30, "30"},
+ {N_("Year"), "year", 365, "365"},
+ {N_("Immortal"), "immortal", 366, "366"},
 };
 combo_opts_t log_longevity_opts =
 {
@@ -149,10 +156,10 @@
 
 static options_map_t d_appcast_update_opts[] =
 {
- {"Never", "never", 0, "never"},
- {"Daily", "daily", 1, "daily"},
- {"Weekly", "weekly", 2, "weekly"},
- {"Monthly", "monthly", 3, "monthly"},
+ {N_("Never"), "never", 0, "never"},
+ {N_("Daily"), "daily", 1, "daily"},
+ {N_("Weekly"), "weekly", 2, "weekly"},
+ {N_("Monthly"), "monthly", 3, "monthly"},
 };
 combo_opts_t appcast_update_opts =
 {
@@ -173,22 +180,11 @@
 d_vqual_granularity_opts
 };
 
-static options_map_t d_container_opts[] =
-{
- {"MKV", "mkv", HB_MUX_MKV, "mkv"},
- {"MP4", "mp4", HB_MUX_MP4, "mp4"},
-};
-combo_opts_t container_opts =
-{
- sizeof(d_container_opts)/sizeof(options_map_t),
- d_container_opts
-};
-
 static options_map_t d_detel_opts[] =
 {
- {"Off", "off", 0, ""},
- {"Custom", "custom", 1, ""},
- {"Default","default",2, NULL},
+ {N_("Off"), "off", 0, ""},
+ {N_("Custom"), "custom", 1, ""},
+ {N_("Default"),"default",2, NULL},
 };
 combo_opts_t detel_opts =
 {
@@ -198,11 +194,11 @@
 
 static options_map_t d_decomb_opts[] =
 {
- {"Off", "off", 0, ""},
- {"Custom", "custom", 1, ""},
- {"Default","default",2, NULL},
- {"Fast", "fast", 3, "7:2:6:9:1:80"},
- {"Bob", "bob", 4, "455"},
+ {N_("Off"), "off", 0, ""},
+ {N_("Custom"), "custom", 1, ""},
+ {N_("Default"),"default",2, NULL},
+ {N_("Fast"), "fast", 3, "7:2:6:9:1:80"},
+ {N_("Bob"), "bob", 4, "455"},
 };
 combo_opts_t decomb_opts =
 {
@@ -212,12 +208,12 @@
 
 static options_map_t d_deint_opts[] =
 {
- {"Off", "off", 0, ""},
- {"Custom", "custom", 1, ""},
- {"Fast", "fast", 2, "0:-1:-1:0:1"},
- {"Slow", "slow", 3, "1:-1:-1:0:1"},
- {"Slower", "slower", 4, "3:-1:-1:0:1"},
- {"Bob", "bob", 5, "15:-1:-1:0:1"},
+ {N_("Off"), "off", 0, ""},
+ {N_("Custom"), "custom", 1, ""},
+ {N_("Fast"), "fast", 2, "0:-1:-1:0:1"},
+ {N_("Slow"), "slow", 3, "1:-1:-1:0:1"},
+ {N_("Slower"), "slower", 4, "3:-1:-1:0:1"},
+ {N_("Bob"), "bob", 5, "15:-1:-1:0:1"},
 };
 combo_opts_t deint_opts =
 {
@@ -227,11 +223,9 @@
 
 static options_map_t d_denoise_opts[] =
 {
- {"Off", "off", 0, ""},
- {"Custom", "custom", 1, ""},
- {"Weak", "weak", 2, "2:1:2:3"},
- {"Medium", "medium", 3, "3:2:2:3"},
- {"Strong", "strong", 4, "7:7:5:5"},
+ {N_("Off"), "off", 0, ""},
+ {N_("NLMeans"), "nlmeans", 1, ""},
+ {N_("HQDN3D"), "hqdn3d", 2, ""},
 };
 combo_opts_t denoise_opts =
 {
@@ -239,12 +233,40 @@
 d_denoise_opts
 };
 
+static options_map_t d_denoise_preset_opts[] =
+{
+ {N_("Custom"), "custom", 1, ""},
+ {N_("Ultralight"), "ultralight", 5, ""},
+ {N_("Light"), "light", 2, ""},
+ {N_("Medium"), "medium", 3, ""},
+ {N_("Strong"), "strong", 4, ""},
+};
+combo_opts_t denoise_preset_opts =
+{
+ sizeof(d_denoise_preset_opts)/sizeof(options_map_t),
+ d_denoise_preset_opts
+};
+
+static options_map_t d_nlmeans_tune_opts[] =
+{
+ {N_("None"), "none", 0, ""},
+ {N_("Film"), "film", 1, ""},
+ {N_("Grain"), "grain", 2, ""},
+ {N_("High Motion"), "highmotion", 3, ""},
+ {N_("Animation"), "animation", 4, ""},
+};
+combo_opts_t nlmeans_tune_opts =
+{
+ sizeof(d_nlmeans_tune_opts)/sizeof(options_map_t),
+ d_nlmeans_tune_opts
+};
+
 static options_map_t d_direct_opts[] =
 {
- {"None", "none", 0, "none"},
- {"Spatial", "spatial", 1, "spatial"},
- {"Temporal", "temporal", 2, "temporal"},
- {"Automatic", "auto", 3, "auto"},
+ {N_("None"), "none", 0, "none"},
+ {N_("Spatial"), "spatial", 1, "spatial"},
+ {N_("Temporal"), "temporal", 2, "temporal"},
+ {N_("Automatic"), "auto", 3, "auto"},
 };
 combo_opts_t direct_opts =
 {
@@ -254,9 +276,9 @@
 
 static options_map_t d_badapt_opts[] =
 {
- {"Off", "0", 0, "0"},
- {"Fast", "1", 1, "1"},
- {"Optimal", "2", 2, "2"},
+ {N_("Off"), "0", 0, "0"},
+ {N_("Fast"), "1", 1, "1"},
+ {N_("Optimal"), "2", 2, "2"},
 };
 combo_opts_t badapt_opts =
 {
@@ -266,9 +288,9 @@
 
 static options_map_t d_bpyramid_opts[] =
 {
- {"Off", "none", 0, "none"},
- {"Strict", "strict", 1, "strict"},
- {"Normal", "normal", 2, "normal"},
+ {N_("Off"), "none", 0, "none"},
+ {N_("Strict"), "strict", 1, "strict"},
+ {N_("Normal"), "normal", 2, "normal"},
 };
 combo_opts_t bpyramid_opts =
 {
@@ -278,9 +300,9 @@
 
 static options_map_t d_weightp_opts[] =
 {
- {"Off", "0", 0, "0"},
- {"Simple", "1", 1, "1"},
- {"Smart", "2", 2, "2"},
+ {N_("Off"), "0", 0, "0"},
+ {N_("Simple"), "1", 1, "1"},
+ {N_("Smart"), "2", 2, "2"},
 };
 combo_opts_t weightp_opts =
 {
@@ -290,11 +312,11 @@
 
 static options_map_t d_me_opts[] =
 {
- {"Diamond", "dia", 0, "dia"},
- {"Hexagon", "hex", 1, "hex"},
- {"Uneven Multi-Hexagon", "umh", 2, "umh"},
- {"Exhaustive", "esa", 3, "esa"},
- {"Hadamard Exhaustive", "tesa", 4, "tesa"},
+ {N_("Diamond"), "dia", 0, "dia"},
+ {N_("Hexagon"), "hex", 1, "hex"},
+ {N_("Uneven Multi-Hexagon"), "umh", 2, "umh"},
+ {N_("Exhaustive"), "esa", 3, "esa"},
+ {N_("Hadamard Exhaustive"), "tesa", 4, "tesa"},
 };
 combo_opts_t me_opts =
 {
@@ -304,18 +326,18 @@
 
 static options_map_t d_subme_opts[] =
 {
- {"0: SAD, no subpel", "0", 0, "0"},
- {"1: SAD, qpel", "1", 1, "1"},
- {"2: SATD, qpel", "2", 2, "2"},
- {"3: SATD: multi-qpel", "3", 3, "3"},
- {"4: SATD, qpel on all", "4", 4, "4"},
- {"5: SATD, multi-qpel on all", "5", 5, "5"},
- {"6: RD in I/P-frames", "6", 6, "6"},
- {"7: RD in all frames", "7", 7, "7"},
- {"8: RD refine in I/P-frames", "8", 8, "8"},
- {"9: RD refine in all frames", "9", 9, "9"},
- {"10: QPRD in all frames", "10", 10, "10"},
- {"11: No early terminations in analysis", "11", 11, "11"},
+ {N_("0: SAD, no subpel"), "0", 0, "0"},
+ {N_("1: SAD, qpel"), "1", 1, "1"},
+ {N_("2: SATD, qpel"), "2", 2, "2"},
+ {N_("3: SATD: multi-qpel"), "3", 3, "3"},
+ {N_("4: SATD, qpel on all"), "4", 4, "4"},
+ {N_("5: SATD, multi-qpel on all"), "5", 5, "5"},
+ {N_("6: RD in I/P-frames"), "6", 6, "6"},
+ {N_("7: RD in all frames"), "7", 7, "7"},
+ {N_("8: RD refine in I/P-frames"), "8", 8, "8"},
+ {N_("9: RD refine in all frames"), "9", 9, "9"},
+ {N_("10: QPRD in all frames"), "10", 10, "10"},
+ {N_("11: No early terminations in analysis"), "11", 11, "11"},
 };
 combo_opts_t subme_opts =
 {
@@ -325,11 +347,11 @@
 
 static options_map_t d_analyse_opts[] =
 {
- {"Most", "p8x8,b8x8,i8x8,i4x4", 0, "p8x8,b8x8,i8x8,i4x4"},
- {"None", "none", 1, "none"},
- {"Some", "i4x4,i8x8", 2, "i4x4,i8x8"},
- {"All", "all", 3, "all"},
- {"Custom", "custom", 4, "all"},
+ {N_("Most"), "p8x8,b8x8,i8x8,i4x4", 0, "p8x8,b8x8,i8x8,i4x4"},
+ {N_("None"), "none", 1, "none"},
+ {N_("Some"), "i4x4,i8x8", 2, "i4x4,i8x8"},
+ {N_("All"), "all", 3, "all"},
+ {N_("Custom"), "custom", 4, "all"},
 };
 combo_opts_t analyse_opts =
 {
@@ -339,9 +361,9 @@
 
 static options_map_t d_trellis_opts[] =
 {
- {"Off", "0", 0, "0"},
- {"Encode only", "1", 1, "1"},
- {"Always", "2", 2, "2"},
+ {N_("Off"), "0", 0, "0"},
+ {N_("Encode only"), "1", 1, "1"},
+ {N_("Always"), "2", 2, "2"},
 };
 combo_opts_t trellis_opts =
 {
@@ -349,24 +371,6 @@
 d_trellis_opts
 };
 
-combo_opts_t subtitle_opts =
-{
- 0,
- NULL
-};
-
-combo_opts_t title_opts =
-{
- 0,
- NULL
-};
-
-combo_opts_t audio_track_opts =
-{
- 0,
- NULL
-};
-
 typedef struct
 {
 const gchar *name;
@@ -375,6 +379,8 @@
 
 combo_name_map_t combo_name_map[] =
 {
+ {"SubtitleTrackSelectionBehavior", &subtitle_track_sel_opts},
+ {"AudioTrackSelectionBehavior", &audio_track_sel_opts},
 {"PtoPType", &point_to_point_opts},
 {"WhenComplete", &when_complete_opts},
 {"PicturePAR", &par_opts},
@@ -383,11 +389,12 @@
 {"LogLongevity", &log_longevity_opts},
 {"check_updates", &appcast_update_opts},
 {"VideoQualityGranularity", &vqual_granularity_opts},
- {"FileFormat", &container_opts},
 {"PictureDeinterlace", &deint_opts},
 {"PictureDecomb", &decomb_opts},
 {"PictureDetelecine", &detel_opts},
- {"PictureDenoise", &denoise_opts},
+ {"PictureDenoiseFilter", &denoise_opts},
+ {"PictureDenoisePreset", &denoise_preset_opts},
+ {"PictureDenoiseTune", &nlmeans_tune_opts},
 {"x264_direct", &direct_opts},
 {"x264_b_adapt", &badapt_opts},
 {"x264_bpyramid", &bpyramid_opts},
@@ -396,9 +403,6 @@
 {"x264_subme", &subme_opts},
 {"x264_analyse", &analyse_opts},
 {"x264_trellis", &trellis_opts},
- {"SubtitleTrack", &subtitle_opts},
- {"title", &title_opts},
- {"AudioTrack", &audio_track_opts},
 {NULL, NULL}
 };
 
@@ -455,7 +459,7 @@
 #endif
 
 const iso639_lang_t ghb_language_table[] =
-{ 
+{
 { "Any", "", "zz", "und" },
 { "Afar", "", "aa", "aar" },
 { "Abkhazian", "", "ab", "abk" },
@@ -681,59 +685,65 @@
 return hb_get_version(NULL);
 }
 
+float
+ghb_vquality_default(signal_user_data_t *ud)
+{
+ float quality;
+ gint vcodec;
+ vcodec = ghb_settings_video_encoder_codec(ud->settings, "VideoEncoder");
+
+ switch (vcodec)
+ {
+ case HB_VCODEC_X265:
+ case HB_VCODEC_X264:
+ return 20;
+ case HB_VCODEC_THEORA:
+ return 45;
+ case HB_VCODEC_FFMPEG_MPEG2:
+ case HB_VCODEC_FFMPEG_MPEG4:
+ return 3;
+ default:
+ {
+ float min, max, step;
+ int direction;
+
+ hb_video_quality_get_limits(vcodec, &min, &max, &step, &direction);
+ // Pick something that is 70% of max
+ // Probably too low for some and too high for others...
+ quality = (max - min) * 0.7;
+ if (direction)
+ quality = max - quality;
+ }
+ }
+ return quality;
+}
+
 void
 ghb_vquality_range(
- signal_user_data_t *ud, 
- gdouble *min, 
- gdouble *max,
- gdouble *step,
- gdouble *page,
+ signal_user_data_t *ud,
+ float *min,
+ float *max,
+ float *step,
+ float *page,
 gint *digits,
- gboolean *inverted)
+ int *direction)
 {
- gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
+ float min_step;
+ gint vcodec;
+ vcodec = ghb_settings_video_encoder_codec(ud->settings, "VideoEncoder");
+
 *page = 10;
 *digits = 0;
- switch (vcodec)
- {
- case HB_VCODEC_X264:
- {
- *min = 0;
- *max = 51;
- *step = ghb_settings_combo_double(ud->settings, 
- "VideoQualityGranularity");
- if (*step == 0.2 || *step == 0.5)
- *digits = 1;
- else if (*step == 0.25)
- *digits = 2;
- *inverted = TRUE;
- } break;
+ hb_video_quality_get_limits(vcodec, min, max, &min_step, direction);
+ *step = ghb_settings_combo_double(ud->prefs, "VideoQualityGranularity");
 
- case HB_VCODEC_FFMPEG_MPEG2:
- case HB_VCODEC_FFMPEG_MPEG4:
- {
- *min = 1;
- *max = 31;
- *step = 1;
- *inverted = TRUE;
- } break;
-
- case HB_VCODEC_THEORA:
- {
- *min = 0;
- *max = 63;
- *step = 1;
- *inverted = FALSE;
- } break;
+ if (*step < min_step)
+ *step = min_step;
 
- default:
- {
- *min = 0;
- *max = 100;
- *step = 1;
- *inverted = FALSE;
- } break;
- }
+ if ((int)(*step * 100) % 10 != 0)
+ *digits = 2;
+ else if ((int)(*step * 10) % 10 != 0)
+ *digits = 1;
 }
 
 gint
@@ -741,6 +751,9 @@
 {
 gint ii;
 
+ if (opts == NULL)
+ return 0;
+
 if (G_VALUE_TYPE(gval) == G_TYPE_STRING)
 {
 gchar *str;
@@ -806,6 +819,9 @@
 gint ii;
 gint result = -1;
 
+ if (opts == NULL)
+ return 0;
+
 ii = find_combo_entry(opts, gval);
 if (ii < opts->count)
 {
@@ -842,529 +858,95 @@
 return result;
 }
 
-static gint
-lookup_mix_int(const GValue *mix)
-{
- gint ii;
- gint result = 0;
-
-
- if (G_VALUE_TYPE(mix) == G_TYPE_STRING)
- {
- gchar * str = ghb_value_string(mix);
- for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
- {
- if (strcmp(hb_audio_mixdowns[ii].short_name, str) == 0)
- {
- result = hb_audio_mixdowns[ii].amixdown;
- break;
- }
- }
- g_free(str);
- }
- else if (G_VALUE_TYPE(mix) == G_TYPE_INT ||
- G_VALUE_TYPE(mix) == G_TYPE_INT64 ||
- G_VALUE_TYPE(mix) == G_TYPE_DOUBLE)
- {
- gint val = ghb_value_int(mix);
- for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
- {
- if (hb_audio_mixdowns[ii].amixdown == val)
- {
- result = hb_audio_mixdowns[ii].amixdown;
- break;
- }
- }
- }
- return result;
-}
-
-static const gchar*
-lookup_mix_option(const GValue *mix)
-{
- gint ii;
- const gchar *result = "None";
-
-
- if (G_VALUE_TYPE(mix) == G_TYPE_STRING)
- {
- gchar *str = ghb_value_string(mix);
- for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
- {
- if (strcmp(hb_audio_mixdowns[ii].short_name, str) == 0)
- {
- result = hb_audio_mixdowns[ii].human_readable_name;
- break;
- }
- }
- g_free(str);
- }
- else if (G_VALUE_TYPE(mix) == G_TYPE_INT ||
- G_VALUE_TYPE(mix) == G_TYPE_INT64 ||
- G_VALUE_TYPE(mix) == G_TYPE_DOUBLE)
- {
- gint val = ghb_value_int(mix);
- for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
- {
- if (hb_audio_mixdowns[ii].amixdown == val)
- {
- result = hb_audio_mixdowns[ii].human_readable_name;
- break;
- }
- }
- }
- return result;
-}
-
-static const gchar*
-lookup_mix_string(const GValue *mix)
-{
- gint ii;
- const gchar *result = "none";
-
-
- if (G_VALUE_TYPE(mix) == G_TYPE_STRING)
- {
- gchar *str = ghb_value_string(mix);
- for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
- {
- if (strcmp(hb_audio_mixdowns[ii].short_name, str) == 0)
- {
- result = hb_audio_mixdowns[ii].short_name;
- break;
- }
- }
- g_free(str);
- }
- else if (G_VALUE_TYPE(mix) == G_TYPE_INT ||
- G_VALUE_TYPE(mix) == G_TYPE_INT64 ||
- G_VALUE_TYPE(mix) == G_TYPE_DOUBLE)
- {
- gint val = ghb_value_int(mix);
- for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
- {
- if (hb_audio_mixdowns[ii].amixdown == val)
- {
- result = hb_audio_mixdowns[ii].short_name;
- break;
- }
- }
- }
- return result;
-}
-
-static gint
-lookup_video_rate_int(const GValue *vrate)
-{
- gint ii;
- gchar *str;
- gint result = 0;
-
- str = ghb_value_string(vrate);
- for (ii = 0; ii < hb_video_rates_count; ii++)
- {
- if (strcmp(hb_video_rates[ii].string, str) == 0)
- {
- result = hb_video_rates[ii].rate;
- break;
- }
- }
- g_free(str);
- // Default to "same as source"
- return result;
-}
-
-static const gchar*
-lookup_video_rate_option(const GValue *vrate)
-{
- gint ii;
- gchar *str;
- const gchar *result = "Same as source";
-
- str = ghb_value_string(vrate);
- for (ii = 0; ii < hb_video_rates_count; ii++)
- {
- if (strcmp(hb_video_rates[ii].string, str) == 0)
- {
- result = hb_video_rates[ii].string;
- break;
- }
- }
- g_free(str);
- // Default to "same as source"
- return result;
-}
-
-static gint
-lookup_audio_rate_int(const GValue *rate)
-{
- gint ii;
- gint result = 0;
-
- if (G_VALUE_TYPE(rate) == G_TYPE_STRING)
- {
- // Coincidentally, the string "source" will return 0
- // which is our flag to use "same as source"
- gchar * str = ghb_value_string(rate);
- for (ii = 0; ii < hb_audio_rates_count; ii++)
- {
- if (strcmp(hb_audio_rates[ii].string, str) == 0)
- {
- result = hb_audio_rates[ii].rate;
- break;
- }
- }
- g_free(str);
- }
- else if (G_VALUE_TYPE(rate) == G_TYPE_INT ||
- G_VALUE_TYPE(rate) == G_TYPE_INT64 ||
- G_VALUE_TYPE(rate) == G_TYPE_DOUBLE)
- {
- for (ii = 0; ii < hb_audio_rates_count; ii++)
- {
- gint val = ghb_value_int(rate);
- if (val == hb_audio_rates[ii].rate)
- {
- result = hb_audio_rates[ii].rate;
- break;
- }
- }
- }
- return result;
-}
-
-static const gchar*
-lookup_audio_rate(const GValue *rate, const char *def)
-{
- gint ii;
- const gchar *result = def;
-
- if (G_VALUE_TYPE(rate) == G_TYPE_STRING)
- {
- // Coincidentally, the string "source" will return 0
- // which is our flag to use "same as source"
- gchar *str = ghb_value_string(rate);
- for (ii = 0; ii < hb_audio_rates_count; ii++)
- {
- if (strcmp(hb_audio_rates[ii].string, str) == 0)
- {
- result = hb_audio_rates[ii].string;
- break;
- }
- }
- g_free(str);
- }
- else if (G_VALUE_TYPE(rate) == G_TYPE_INT ||
- G_VALUE_TYPE(rate) == G_TYPE_INT64 ||
- G_VALUE_TYPE(rate) == G_TYPE_DOUBLE)
- {
- for (ii = 0; ii < hb_audio_rates_count; ii++)
- {
- gint val = ghb_value_int(rate);
- if (val == hb_audio_rates[ii].rate)
- {
- result = hb_audio_rates[ii].string;
- break;
- }
- }
- }
- return result;
-}
-
-static const gchar*
-lookup_audio_rate_option(const GValue *rate)
-{
- return lookup_audio_rate(rate, "Same as Source");
-}
-
-static const gchar*
-lookup_audio_rate_string(const GValue *rate)
-{
- return lookup_audio_rate(rate, "source");
-}
-
 gint
-ghb_find_closest_audio_rate(gint rate)
+ghb_find_closest_audio_samplerate(gint irate)
 {
- gint ii;
 gint result;
+ const hb_rate_t *rate;
 
 result = 0;
- for (ii = 0; ii < hb_audio_rates_count; ii++)
+ for (rate = hb_audio_samplerate_get_next(NULL); rate != NULL;
+ rate = hb_audio_samplerate_get_next(rate))
 {
- if (rate <= hb_audio_rates[ii].rate)
+ if (irate <= rate->rate)
 {
- result = hb_audio_rates[ii].rate;
+ result = rate->rate;
 break;
 }
 }
 return result;
 }
 
-hb_rate_t *ghb_audio_bitrates;
-int ghb_audio_bitrates_count;
-
-static gint
-lookup_audio_bitrate_int(const GValue *rate)
+const iso639_lang_t* ghb_iso639_lookup_by_int(int idx)
 {
- gint ii;
- gint result = 160;
-
- if (G_VALUE_TYPE(rate) == G_TYPE_STRING)
- {
- // Coincidentally, the string "source" will return 0
- // which is our flag to use "same as source"
- gchar *str = ghb_value_string(rate);
- for (ii = 0; ii < ghb_audio_bitrates_count; ii++)
- {
- if (strcmp(ghb_audio_bitrates[ii].string, str) == 0)
- {
- result = ghb_audio_bitrates[ii].rate;
- break;
- }
- }
- g_free(str);
- }
- else if (G_VALUE_TYPE(rate) == G_TYPE_INT ||
- G_VALUE_TYPE(rate) == G_TYPE_INT64 ||
- G_VALUE_TYPE(rate) == G_TYPE_DOUBLE)
- {
- gint val = ghb_value_int(rate);
- for (ii = 0; ii < ghb_audio_bitrates_count; ii++)
- {
- if (ghb_audio_bitrates[ii].rate == val)
- {
- result = ghb_audio_bitrates[ii].rate;
- break;
- }
- }
- }
- return result;
+ return &ghb_language_table[idx];
 }
 
-static const gchar*
-lookup_audio_bitrate_option(const GValue *rate)
+int
+ghb_lookup_audio_lang(const GValue *glang)
 {
 gint ii;
- const gchar *result = "160";
+ gchar *str;
 
- if (G_VALUE_TYPE(rate) == G_TYPE_STRING)
+ str = ghb_value_string(glang);
+ for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
 {
- // Coincidentally, the string "source" will return 0
- // which is our flag to use "same as source"
- gchar *str = ghb_value_string(rate);
- for (ii = 0; ii < ghb_audio_bitrates_count; ii++)
+ if (ghb_language_table[ii].iso639_2 &&
+ strcmp(ghb_language_table[ii].iso639_2, str) == 0)
 {
- if (strcmp(ghb_audio_bitrates[ii].string, str) == 0)
- {
- result = ghb_audio_bitrates[ii].string;
- break;
- }
+ g_free(str);
+ return ii;
 }
- g_free(str);
- }
- else if (G_VALUE_TYPE(rate) == G_TYPE_INT ||
- G_VALUE_TYPE(rate) == G_TYPE_INT64 ||
- G_VALUE_TYPE(rate) == G_TYPE_DOUBLE)
- {
- gint val = ghb_value_int(rate);
- for (ii = 0; ii < ghb_audio_bitrates_count; ii++)
+ if (ghb_language_table[ii].iso639_2b &&
+ strcmp(ghb_language_table[ii].iso639_2b, str) == 0)
 {
- if (ghb_audio_bitrates[ii].rate == val)
- {
- result = ghb_audio_bitrates[ii].string;
- break;
- }
- }
- }
- return result;
-}
-
-static gint
-lookup_hb_encoder_int(const GValue *enc, hb_encoder_t *encoders, int len)
-{
- gint ii;
-
- if (G_VALUE_TYPE(enc) == G_TYPE_STRING)
- {
- gchar *str = ghb_value_string(enc);
- for (ii = 0; ii < len; ii++)
- {
- if (strcmp(encoders[ii].human_readable_name, str) == 0 ||
- strcmp(encoders[ii].short_name, str) == 0)
- {
- g_free(str);
- return encoders[ii].encoder;
- }
+ g_free(str);
+ return ii;
 }
- g_free(str);
- }
- else if (G_VALUE_TYPE(enc) == G_TYPE_INT ||
- G_VALUE_TYPE(enc) == G_TYPE_INT64 ||
- G_VALUE_TYPE(enc) == G_TYPE_DOUBLE)
- {
- int val = ghb_value_int(enc);
- for (ii = 0; ii < len; ii++)
+ if (ghb_language_table[ii].iso639_1 &&
+ strcmp(ghb_language_table[ii].iso639_1, str) == 0)
 {
- if (encoders[ii].encoder == val)
- {
- return encoders[ii].encoder;
- }
+ g_free(str);
+ return ii;
 }
- }
- return 0;
-}
-
-static const gchar*
-lookup_hb_encoder_option(const GValue *enc, hb_encoder_t *encoders, int len)
-{
- gint ii;
-
- if (G_VALUE_TYPE(enc) == G_TYPE_STRING)
- {
- gchar *str = ghb_value_string(enc);
- for (ii = 0; ii < len; ii++)
+ if (ghb_language_table[ii].native_name &&
+ strcmp(ghb_language_table[ii].native_name, str) == 0)
 {
- if (strcmp(encoders[ii].human_readable_name, str) == 0 ||
- strcmp(encoders[ii].short_name, str) == 0)
- {
- g_free(str);
- return encoders[ii].human_readable_name;
- }
+ g_free(str);
+ return ii;
 }
- g_free(str);
- }
- else if (G_VALUE_TYPE(enc) == G_TYPE_INT ||
- G_VALUE_TYPE(enc) == G_TYPE_INT64 ||
- G_VALUE_TYPE(enc) == G_TYPE_DOUBLE)
- {
- int val = ghb_value_int(enc);
- for (ii = 0; ii < len; ii++)
+ if (ghb_language_table[ii].eng_name &&
+ strcmp(ghb_language_table[ii].eng_name, str) == 0)
 {
- if (encoders[ii].encoder == val)
- {
- return encoders[ii].human_readable_name;
- }
+ g_free(str);
+ return ii;
 }
 }
- return 0;
+ g_free(str);
+ return -1;
 }
 
-static const gchar*
-lookup_hb_encoder_string(const GValue *enc, hb_encoder_t *encoders, int len)
+static int
+lookup_audio_lang_int(const GValue *glang)
 {
- gint ii;
-
- if (G_VALUE_TYPE(enc) == G_TYPE_STRING)
- {
- gchar *str = ghb_value_string(enc);
- for (ii = 0; ii < len; ii++)
- {
- if (strcmp(encoders[ii].human_readable_name, str) == 0 ||
- strcmp(encoders[ii].short_name, str) == 0)
- {
- g_free(str);
- return encoders[ii].short_name;
- }
- }
- g_free(str);
- }
- else if (G_VALUE_TYPE(enc) == G_TYPE_INT ||
- G_VALUE_TYPE(enc) == G_TYPE_INT64 ||
- G_VALUE_TYPE(enc) == G_TYPE_DOUBLE)
- {
- int val = ghb_value_int(enc);
- for (ii = 0; ii < len; ii++)
- {
- if (encoders[ii].encoder == val)
- {
- return encoders[ii].short_name;
- }
- }
- }
+ gint ii = ghb_lookup_audio_lang(glang);
+ if (ii >= 0)
+ return ii;
 return 0;
 }
 
-static gint
-lookup_audio_lang_int(const GValue *rate)
-{
- gint ii;
- gchar *str;
- gint result = 0;
-
- // Coincidentally, the string "source" will return 0
- // which is our flag to use "same as source"
- str = ghb_value_string(rate);
- for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
- {
- if (strcmp(ghb_language_table[ii].iso639_2, str) == 0)
- {
- result = ii;
- break;
- }
- }
- g_free(str);
- return result;
-}
-
 static const gchar*
-lookup_audio_lang_option(const GValue *rate)
-{
- gint ii;
- gchar *str;
- const gchar *result = "Same as source";
-
- // Coincidentally, the string "source" will return 0
- // which is our flag to use "same as source"
- str = ghb_value_string(rate);
- for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
- {
- if (strcmp(ghb_language_table[ii].iso639_2, str) == 0)
- {
- if (ghb_language_table[ii].native_name[0] != 0)
- result = ghb_language_table[ii].native_name;
- else
- result = ghb_language_table[ii].eng_name;
- break;
- }
- }
- g_free(str);
- return result;
-}
-
-GValue*
-ghb_lookup_acodec_value(gint val)
+lookup_audio_lang_option(const GValue *glang)
 {
- GValue *value = NULL;
- gint ii;
-
- for (ii = 0; ii < hb_audio_encoders_count; ii++)
+ gint ii = ghb_lookup_audio_lang(glang);
+ if (ii >= 0)
 {
- if ((int)hb_audio_encoders[ii].encoder == val)
- {
- value = ghb_string_value_new(hb_audio_encoders[ii].short_name);
- return value;
- }
- }
- value = ghb_string_value_new("copy");
- return value;
-}
-
-static GValue*
-get_amix_value(gint val)
-{
- GValue *value = NULL;
- gint ii;
-
- for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
- {
- if (hb_audio_mixdowns[ii].amixdown == val)
- {
- value = ghb_string_value_new(hb_audio_mixdowns[ii].short_name);
- break;
- }
+ if (ghb_language_table[ii].native_name[0] != 0)
+ return ghb_language_table[ii].native_name;
+ else
+ return ghb_language_table[ii].eng_name;
 }
- return value;
+ return "Any";
 }
 
 // Handle for libhb. Gets set by ghb_backend_init()
@@ -1394,22 +976,19 @@
 gint
 ghb_subtitle_track_source(GValue *settings, gint track)
 {
- gint titleindex;
+ gint title_id, titleindex;
+ const hb_title_t *title;
 
 if (track == -2)
 return SRTSUB;
 if (track < 0)
 return VOBSUB;
- titleindex = ghb_settings_combo_int(settings, "title");
- if (titleindex < 0)
+ title_id = ghb_settings_get_int(settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ if (title == NULL)
 return VOBSUB;
 
- hb_title_t * title;
 hb_subtitle_t * sub;
- 
- if (h_scan == NULL) return VOBSUB;
- title = ghb_get_title_info( titleindex );
- if (title == NULL) return VOBSUB; // Bad titleindex
 sub = hb_list_item( title->list_subtitle, track);
 if (sub != NULL)
 return sub->source;
@@ -1417,63 +996,22 @@
 return VOBSUB;
 }
 
-const char*
-ghb_subtitle_track_source_name(GValue *settings, gint track)
-{
- gint titleindex;
- const gchar * name = "Unknown";
-
- if (track == -2)
- {
- name = "SRT";
- goto done;
- }
- if (track == -1)
- {
- name = "Bitmap";
- goto done;
- }
-
- titleindex = ghb_settings_combo_int(settings, "title");
- if (titleindex < 0)
- goto done;
-
- hb_title_t * title;
- hb_subtitle_t * sub;
- 
- title = ghb_get_title_info( titleindex );
- if (title == NULL)
- goto done;
-
- sub = hb_list_item( title->list_subtitle, track);
- if (sub != NULL)
- {
- name = hb_subsource_name(sub->source);
- }
-
-done:
- return name;
-}
-
 const gchar*
 ghb_subtitle_track_lang(GValue *settings, gint track)
 {
- gint titleindex;
+ gint title_id, titleindex;
+ const hb_title_t * title;
 
- titleindex = ghb_settings_combo_int(settings, "title");
- if (titleindex < 0)
+ title_id = ghb_settings_get_int(settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ if (title == NULL) // Bad titleindex
 goto fail;
 if (track == -1)
- return ghb_get_user_audio_lang(settings, titleindex, 0);
+ return ghb_get_user_audio_lang(settings, title, 0);
 if (track < 0)
 goto fail;
 
- hb_title_t * title;
 hb_subtitle_t * sub;
- 
- title = ghb_get_title_info( titleindex );
- if (title == NULL) // Bad titleindex
- goto fail;
 sub = hb_list_item( title->list_subtitle, track);
 if (sub != NULL)
 return sub->iso639_2;
@@ -1482,182 +1020,154 @@
 return "und";
 }
 
-gint
-ghb_get_title_number(gint titleindex)
-{
- hb_title_t * title;
- 
- title = ghb_get_title_info( titleindex );
- if (title == NULL) return 1; // Bad titleindex
- return title->index;
-}
-
-static hb_audio_config_t*
-get_hb_audio(hb_handle_t *h, gint titleindex, gint track)
-{
- hb_list_t * list;
- hb_title_t * title;
- hb_audio_config_t *audio = NULL;
- 
- if (h == NULL) return NULL;
- list = hb_get_titles( h );
- if( !hb_list_count( list ) )
- {
- /* No valid title, stop right there */
- return NULL;
- }
- title = hb_list_item( list, titleindex );
- if (title == NULL) return NULL; // Bad titleindex
- if (!hb_list_count(title->list_audio))
- {
- return NULL;
- }
- audio = (hb_audio_config_t *)hb_list_audio_config_item(title->list_audio, track);
- return audio;
-}
-
 static gint
-search_rates(hb_rate_t *rates, gint rate, gint count)
+search_audio_bitrates(gint rate)
 {
- gint ii;
- for (ii = 0; ii < count; ii++)
+ const hb_rate_t *hbrate;
+ for (hbrate = hb_audio_bitrate_get_next(NULL); hbrate != NULL;
+ hbrate = hb_audio_bitrate_get_next(hbrate))
 {
- if (rates[ii].rate == rate)
- return ii;
+ if (hbrate->rate == rate)
+ return 1;
 }
- return -1;
+ return 0;
 }
 
 static gboolean find_combo_item_by_int(GtkTreeModel *store, gint value, GtkTreeIter *iter);
 
-static GtkListStore*
-get_combo_box_store(GtkBuilder *builder, const gchar *name)
+static void
+grey_combo_box_item(GtkComboBox *combo, gint value, gboolean grey)
 {
- GtkComboBox *combo;
 GtkListStore *store;
+ GtkTreeIter iter;
 
- g_debug("get_combo_box_store() %s\n", name);
- // First modify the combobox model to allow greying out of options
- combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
 store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
- return store;
+ if (find_combo_item_by_int(GTK_TREE_MODEL(store), value, &iter))
+ {
+ gtk_list_store_set(store, &iter,
+ 1, !grey,
+ -1);
+ }
 }
 
 static void
-grey_combo_box_item(GtkBuilder *builder, const gchar *name, gint value, gboolean grey)
+grey_builder_combo_box_item(GtkBuilder *builder, const gchar *name, gint value, gboolean grey)
 {
- GtkListStore *store;
- GtkTreeIter iter;
- 
- store = get_combo_box_store(builder, name);
- if (find_combo_item_by_int(GTK_TREE_MODEL(store), value, &iter))
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ grey_combo_box_item(combo, value, grey);
+}
+
+void
+ghb_mix_opts_filter(GtkComboBox *combo, gint acodec)
+{
+ g_debug("ghb_mix_opts_filter()\n");
+
+ const hb_mixdown_t *mix;
+ for (mix = hb_mixdown_get_next(NULL); mix != NULL;
+ mix = hb_mixdown_get_next(mix))
 {
- gtk_list_store_set(store, &iter, 
- 1, !grey, 
- -1);
+ grey_combo_box_item(combo, mix->amixdown,
+ !hb_mixdown_has_codec_support(mix->amixdown, acodec));
 }
 }
 
 static void
 grey_mix_opts(signal_user_data_t *ud, gint acodec, gint64 layout)
 {
- gint ii;
- 
 g_debug("grey_mix_opts()\n");
- for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
+
+ const hb_mixdown_t *mix;
+ for (mix = hb_mixdown_get_next(NULL); mix != NULL;
+ mix = hb_mixdown_get_next(mix))
 {
- grey_combo_box_item(ud->builder, "AudioMixdown",
- hb_audio_mixdowns[ii].amixdown,
- !hb_mixdown_is_supported(hb_audio_mixdowns[ii].amixdown,
- acodec, layout));
+ grey_builder_combo_box_item(ud->builder, "AudioMixdown", mix->amixdown,
+ !hb_mixdown_is_supported(mix->amixdown, acodec, layout));
 }
 }
 
 void
 ghb_grey_combo_options(signal_user_data_t *ud)
 {
- GtkWidget *widget;
- gint mux, track, titleindex, acodec, fallback;
+ gint track, title_id, titleindex, acodec, fallback;
+ const hb_title_t *title;
 hb_audio_config_t *aconfig = NULL;
- GValue *gval;
- int ii;
 
- widget = GHB_WIDGET (ud->builder, "title");
- gval = ghb_widget_value(widget);
- titleindex = ghb_lookup_combo_int("title", gval);
- ghb_value_free(gval);
- widget = GHB_WIDGET (ud->builder, "AudioTrack");
- gval = ghb_widget_value(widget);
- track = ghb_lookup_combo_int("AudioTrack", gval);
- ghb_value_free(gval);
- aconfig = get_hb_audio(h_scan, titleindex, track);
- widget = GHB_WIDGET (ud->builder, "FileFormat");
- gval = ghb_widget_value(widget);
- mux = ghb_lookup_combo_int("FileFormat", gval);
- ghb_value_free(gval);
-
- grey_combo_box_item(ud->builder, "x264_analyse", 4, TRUE);
- for (ii = 0; ii < hb_audio_encoders_count; ii++)
- {
- if (!(mux & hb_audio_encoders[ii].muxers))
- {
- grey_combo_box_item(ud->builder, "AudioEncoder", 
- hb_audio_encoders[ii].encoder, TRUE);
- grey_combo_box_item(ud->builder, "AudioEncoderFallback",
- hb_audio_encoders[ii].encoder, TRUE);
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+
+ track = ghb_settings_get_int(ud->settings, "AudioTrack");
+ aconfig = ghb_get_audio_info(title, track);
+
+ const char *mux_id;
+ const hb_container_t *mux;
+
+ mux_id = ghb_settings_get_const_string(ud->settings, "FileFormat");
+ mux = ghb_lookup_container_by_name(mux_id);
+
+ grey_builder_combo_box_item(ud->builder, "x264_analyse", 4, TRUE);
+
+ const hb_encoder_t *enc;
+ for (enc = hb_audio_encoder_get_next(NULL); enc != NULL;
+ enc = hb_audio_encoder_get_next(enc))
+ {
+ if (!(mux->format & enc->muxers))
+ {
+ grey_builder_combo_box_item(ud->builder, "AudioEncoder",
+ enc->codec, TRUE);
+ grey_builder_combo_box_item(ud->builder, "AudioEncoderFallback",
+ enc->codec, TRUE);
 }
 else
 {
- grey_combo_box_item(ud->builder, "AudioEncoder", 
- hb_audio_encoders[ii].encoder, FALSE);
- grey_combo_box_item(ud->builder, "AudioEncoderFallback",
- hb_audio_encoders[ii].encoder, FALSE);
+ grey_builder_combo_box_item(ud->builder, "AudioEncoder",
+ enc->codec, FALSE);
+ grey_builder_combo_box_item(ud->builder, "AudioEncoderFallback",
+ enc->codec, FALSE);
 }
 }
- for (ii = 0; ii < hb_video_encoders_count; ii++)
+ for (enc = hb_video_encoder_get_next(NULL); enc != NULL;
+ enc = hb_video_encoder_get_next(enc))
 {
- if (!(mux & hb_video_encoders[ii].muxers))
+ if (!(mux->format & enc->muxers))
 {
- grey_combo_box_item(ud->builder, "VideoEncoder", 
- hb_video_encoders[ii].encoder, TRUE);
+ grey_builder_combo_box_item(ud->builder, "VideoEncoder",
+ enc->codec, TRUE);
 }
 else
 {
- grey_combo_box_item(ud->builder, "VideoEncoder", 
- hb_video_encoders[ii].encoder, FALSE);
+ grey_builder_combo_box_item(ud->builder, "VideoEncoder",
+ enc->codec, FALSE);
 }
 }
 
 if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_MP3)
 {
- grey_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_MP3_PASS, TRUE);
+ grey_builder_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_MP3_PASS, TRUE);
 }
 if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_FFAAC)
 {
- grey_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_AAC_PASS, TRUE);
+ grey_builder_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_AAC_PASS, TRUE);
 }
 if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_AC3)
 {
- grey_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_AC3_PASS, TRUE);
+ grey_builder_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_AC3_PASS, TRUE);
 }
 if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_DCA)
 {
- grey_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_DCA_PASS, TRUE);
+ grey_builder_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_DCA_PASS, TRUE);
 }
 if (aconfig && (aconfig->in.codec & HB_ACODEC_MASK) != HB_ACODEC_DCA_HD)
 {
- grey_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_DCA_HD_PASS, TRUE);
+ grey_builder_combo_box_item(ud->builder, "AudioEncoder", HB_ACODEC_DCA_HD_PASS, TRUE);
 }
 
- widget = GHB_WIDGET (ud->builder, "AudioEncoder");
- gval = ghb_widget_value(widget);
- acodec = ghb_lookup_combo_int("AudioEncoder", gval);
- ghb_value_free(gval);
+ acodec = ghb_settings_audio_encoder_codec(ud->settings, "AudioEncoder");
 
 gint64 layout = aconfig != NULL ? aconfig->in.channel_layout : ~0;
- fallback = ghb_select_fallback(ud->settings, mux, acodec);
+ fallback = ghb_select_fallback(ud->settings, acodec);
 gint copy_mask = ghb_get_copy_mask(ud->settings);
- acodec = ghb_select_audio_codec(mux, aconfig, acodec, fallback, copy_mask);
+ acodec = ghb_select_audio_codec(mux->format, aconfig, acodec,
+ fallback, copy_mask);
 grey_mix_opts(ud, acodec, layout);
 }
 
@@ -1668,22 +1178,20 @@
 layout = aconfig ? aconfig->in.channel_layout : AV_CH_LAYOUT_5POINT1;
 
 if (mix == HB_AMIXDOWN_NONE)
- mix = hb_audio_mixdowns[hb_audio_mixdowns_count-1].amixdown;
- 
- return hb_get_best_mixdown( acodec, layout, mix );
+ mix = HB_INVALID_AMIXDOWN;
+
+ return hb_mixdown_get_best(acodec, layout, mix);
 }
 
 // Set up the model for the combo box
-static void
-init_combo_box(GtkBuilder *builder, const gchar *name)
+void
+ghb_init_combo_box(GtkComboBox *combo)
 {
- GtkComboBox *combo;
 GtkListStore *store;
 GtkCellRenderer *cell;
 
- g_debug("init_combo_box() %s\n", name);
+ g_debug("ghb_init_combo_box()\n");
 // First modify the combobox model to allow greying out of options
- combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
 if (combo == NULL)
 return;
 // Store contains:
@@ -1692,7 +1200,7 @@
 // 3 - String that is used for presets
 // 4 - Int value determined by backend
 // 5 - String value determined by backend
- store = gtk_list_store_new(5, G_TYPE_STRING, G_TYPE_BOOLEAN, 
+ store = gtk_list_store_new(5, G_TYPE_STRING, G_TYPE_BOOLEAN,
 G_TYPE_STRING, G_TYPE_DOUBLE, G_TYPE_STRING);
 gtk_combo_box_set_model(combo, GTK_TREE_MODEL(store));
 
@@ -1700,6 +1208,8 @@
 {
 gtk_cell_layout_clear(GTK_CELL_LAYOUT(combo));
 cell = GTK_CELL_RENDERER(gtk_cell_renderer_text_new());
+ g_object_set(cell, "max-width-chars", 60, NULL);
+ g_object_set(cell, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), cell, TRUE);
 gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), cell,
 "markup", 0, "sensitive", 1, NULL);
@@ -1708,190 +1218,570 @@
 { // Combo box entry
 gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(combo), 0);
 }
-} 
+}
 
+// Set up the model for the combo box
 static void
-audio_samplerate_opts_set(GtkBuilder *builder, const gchar *name, hb_rate_t *rates, gint count)
+init_combo_box(GtkBuilder *builder, const gchar *name)
+{
+ GtkComboBox *combo;
+
+ g_debug("init_combo_box() %s\n", name);
+ // First modify the combobox model to allow greying out of options
+ combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ ghb_init_combo_box(combo);
+}
+
+void
+ghb_audio_samplerate_opts_set(GtkComboBox *combo)
 {
 GtkTreeIter iter;
 GtkListStore *store;
- gint ii;
 gchar *str;
- 
+
 g_debug("audio_samplerate_opts_set ()\n");
- store = get_combo_box_store(builder, name);
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
 gtk_list_store_clear(store);
 // Add an item for "Same As Source"
 gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
- 0, "Same as source", 
- 1, TRUE, 
- 2, "source", 
- 3, 0.0, 
- 4, "source", 
+ str = g_strdup_printf("%s", _("Same as source"));
+ gtk_list_store_set(store, &iter,
+ 0, str,
+ 1, TRUE,
+ 2, "source",
+ 3, 0.0,
+ 4, "source",
 -1);
- for (ii = 0; ii < count; ii++)
+ g_free(str);
+
+ const hb_rate_t *rate;
+ for (rate = hb_audio_samplerate_get_next(NULL); rate != NULL;
+ rate = hb_audio_samplerate_get_next(rate))
 {
 gtk_list_store_append(store, &iter);
- str = g_strdup_printf("%s", rates[ii].string);
- gtk_list_store_set(store, &iter, 
+ str = g_strdup_printf("%s", rate->name);
+ gtk_list_store_set(store, &iter,
 0, str,
- 1, TRUE, 
- 2, rates[ii].string, 
- 3, (gdouble)rates[ii].rate, 
- 4, rates[ii].string, 
+ 1, TRUE,
+ 2, rate->name,
+ 3, (gdouble)rate->rate,
+ 4, rate->name,
 -1);
 g_free(str);
 }
 }
 
 static void
-video_rate_opts_set(GtkBuilder *builder, const gchar *name, hb_rate_t *rates, gint count)
+audio_samplerate_opts_set(GtkBuilder *builder, const gchar *name)
+{
+ g_debug("audio_samplerate_opts_set ()\n");
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ ghb_audio_samplerate_opts_set(combo);
+}
+
+const hb_rate_t sas_rate =
+{
+ .name = N_("Same as source"),
+ .rate = 0,
+};
+
+const char*
+ghb_audio_samplerate_get_short_name(int rate)
+{
+ const char *name;
+ name = hb_audio_samplerate_get_name(rate);
+ if (name == NULL)
+ name = "source";
+ return name;
+}
+
+const hb_rate_t*
+ghb_lookup_audio_samplerate(const char *name)
+{
+ // Check for special "Same as source" value
+ if (!strncmp(name, "source", 8))
+ return &sas_rate;
+
+ // First find an enabled rate
+ int rate = hb_audio_samplerate_get_from_name(name);
+
+ // Now find the matching rate info
+ const hb_rate_t *hb_rate, *first;
+ for (first = hb_rate = hb_audio_samplerate_get_next(NULL); hb_rate != NULL;
+ hb_rate = hb_audio_samplerate_get_next(hb_rate))
+ {
+ if (rate == hb_rate->rate)
+ {
+ return hb_rate;
+ }
+ }
+ // Return a default rate if nothing matches
+ return first;
+}
+
+int
+ghb_lookup_audio_samplerate_rate(const char *name)
+{
+ return ghb_lookup_audio_samplerate(name)->rate;
+}
+
+int
+ghb_settings_audio_samplerate_rate(const GValue *settings, const char *name)
+{
+ const char *rate_id = ghb_settings_get_const_string(settings, name);
+ return ghb_lookup_audio_samplerate_rate(rate_id);
+}
+
+const hb_rate_t*
+ghb_settings_audio_samplerate(const GValue *settings, const char *name)
+{
+ const char *rate_id = ghb_settings_get_const_string(settings, name);
+ return ghb_lookup_audio_samplerate(rate_id);
+}
+
+static void
+video_framerate_opts_set(GtkBuilder *builder, const gchar *name)
 {
 GtkTreeIter iter;
 GtkListStore *store;
- gint ii;
- 
- g_debug("video_rate_opts_set ()\n");
- store = get_combo_box_store(builder, name);
+
+ g_debug("video_framerate_opts_set ()\n");
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
 gtk_list_store_clear(store);
 // Add an item for "Same As Source"
 gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
- 0, "Same as source", 
- 1, TRUE, 
- 2, "source", 
- 3, 0.0, 
- 4, "source", 
+ gtk_list_store_set(store, &iter,
+ 0, _("Same as source"),
+ 1, TRUE,
+ 2, "source",
+ 3, 0.0,
+ 4, "source",
 -1);
- for (ii = 0; ii < count; ii++)
+
+ const hb_rate_t *rate;
+ for (rate = hb_video_framerate_get_next(NULL); rate != NULL;
+ rate = hb_video_framerate_get_next(rate))
 {
 gchar *desc = "";
 gchar *option;
- if (strcmp(rates[ii].string, "23.976") == 0)
+ if (strcmp(rate->name, "23.976") == 0)
 {
- desc = "(NTSC Film)";
+ desc = _("(NTSC Film)");
 }
- else if (strcmp(rates[ii].string, "25") == 0)
+ else if (strcmp(rate->name, "25") == 0)
 {
- desc = "(PAL Film/Video)";
+ desc = _("(PAL Film/Video)");
 }
- else if (strcmp(rates[ii].string, "29.97") == 0)
+ else if (strcmp(rate->name, "29.97") == 0)
 {
- desc = "(NTSC Video)";
+ desc = _("(NTSC Video)");
 }
- option = g_strdup_printf ("%s %s", rates[ii].string, desc);
+ option = g_strdup_printf ("%s %s", rate->name, desc);
 gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
- 0, option, 
- 1, TRUE, 
- 2, rates[ii].string, 
- 3, (gdouble)rates[ii].rate, 
- 4, rates[ii].string, 
+ gtk_list_store_set(store, &iter,
+ 0, option,
+ 1, TRUE,
+ 2, rate->name,
+ 3, (gdouble)rate->rate,
+ 4, rate->name,
 -1);
 g_free(option);
 }
 }
 
+const hb_rate_t*
+ghb_lookup_video_framerate(const char *name)
+{
+ // Check for special "Same as source" value
+ if (!strncmp(name, "source", 8))
+ return &sas_rate;
+
+ // First find an enabled rate
+ int rate = hb_video_framerate_get_from_name(name);
+
+ // Now find the matching rate info
+ const hb_rate_t *hb_rate, *first;
+ for (first = hb_rate = hb_video_framerate_get_next(NULL); hb_rate != NULL;
+ hb_rate = hb_video_framerate_get_next(hb_rate))
+ {
+ if (rate == hb_rate->rate)
+ {
+ return hb_rate;
+ }
+ }
+ // Return a default rate if nothing matches
+ return first;
+}
+
+int
+ghb_lookup_video_framerate_rate(const char *name)
+{
+ return ghb_lookup_video_framerate(name)->rate;
+}
+
+int
+ghb_settings_video_framerate_rate(const GValue *settings, const char *name)
+{
+ const char *rate_id = ghb_settings_get_const_string(settings, name);
+ return ghb_lookup_video_framerate_rate(rate_id);
+}
+
+const hb_rate_t*
+ghb_settings_video_framerate(const GValue *settings, const char *name)
+{
+ const char *rate_id = ghb_settings_get_const_string(settings, name);
+ return ghb_lookup_video_framerate(rate_id);
+}
+
 static void
-hb_encoder_opts_set_with_mask(
+video_encoder_opts_set(
 GtkBuilder *builder,
- const gchar *name,
- hb_encoder_t *encoders,
- int len,
+ const gchar *name)
+{
+ GtkTreeIter iter;
+ GtkListStore *store;
+ gchar *str;
+
+ g_debug("video_encoder_opts_set ()\n");
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
+ gtk_list_store_clear(store);
+
+ const hb_encoder_t *enc;
+ for (enc = hb_video_encoder_get_next(NULL); enc != NULL;
+ enc = hb_video_encoder_get_next(enc))
+ {
+ gtk_list_store_append(store, &iter);
+ str = g_strdup_printf("%s", enc->name);
+ gtk_list_store_set(store, &iter,
+ 0, str,
+ 1, TRUE,
+ 2, enc->short_name,
+ 3, (gdouble)enc->codec,
+ 4, enc->short_name,
+ -1);
+ g_free(str);
+ }
+}
+
+const hb_encoder_t*
+ghb_lookup_video_encoder(const char *name)
+{
+ // First find an enabled encoder
+ int codec = hb_video_encoder_get_from_name(name);
+
+ // Now find the matching encoder info
+ const hb_encoder_t *enc, *first;
+ for (first = enc = hb_video_encoder_get_next(NULL); enc != NULL;
+ enc = hb_video_encoder_get_next(enc))
+ {
+ if (codec == enc->codec)
+ {
+ return enc;
+ }
+ }
+ // Return a default encoder if nothing matches
+ return first;
+}
+
+int
+ghb_lookup_video_encoder_codec(const char *name)
+{
+ return ghb_lookup_video_encoder(name)->codec;
+}
+
+int
+ghb_settings_video_encoder_codec(const GValue *settings, const char *name)
+{
+ const char *encoder_id = ghb_settings_get_const_string(settings, name);
+ return ghb_lookup_video_encoder_codec(encoder_id);
+}
+
+const hb_encoder_t*
+ghb_settings_video_encoder(const GValue *settings, const char *name)
+{
+ const char *encoder_id = ghb_settings_get_const_string(settings, name);
+ return ghb_lookup_video_encoder(encoder_id);
+}
+
+void
+ghb_audio_encoder_opts_set_with_mask(
+ GtkComboBox *combo,
 int mask,
 int neg_mask)
 {
 GtkTreeIter iter;
 GtkListStore *store;
- gint ii;
 gchar *str;
- 
- g_debug("hb_encoder_opts_set ()\n");
- store = get_combo_box_store(builder, name);
+
+ g_debug("ghb_audio_encoder_opts_set_with_mask()\n");
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
 gtk_list_store_clear(store);
- for (ii = 0; ii < len; ii++)
+
+ const hb_encoder_t *enc;
+ for (enc = hb_audio_encoder_get_next(NULL); enc != NULL;
+ enc = hb_audio_encoder_get_next(enc))
 {
- if ((mask & encoders[ii].encoder) &&
- !(neg_mask & encoders[ii].encoder))
+ if ((mask & enc->codec) && !(neg_mask & enc->codec))
 {
 gtk_list_store_append(store, &iter);
- str = g_strdup_printf("%s",
- encoders[ii].human_readable_name);
- gtk_list_store_set(store, &iter, 
+ str = g_strdup_printf("%s", enc->name);
+ gtk_list_store_set(store, &iter,
 0, str,
- 1, TRUE, 
- 2, encoders[ii].short_name, 
- 3, (gdouble)encoders[ii].encoder, 
- 4, encoders[ii].short_name, 
+ 1, TRUE,
+ 2, enc->short_name,
+ 3, (gdouble)enc->codec,
+ 4, enc->short_name,
 -1);
 g_free(str);
 }
 }
 }
 
+const hb_encoder_t*
+ghb_lookup_audio_encoder(const char *name)
+{
+ // First find an enabled encoder
+ int codec = hb_audio_encoder_get_from_name(name);
+
+ // Now find the matching encoder info
+ const hb_encoder_t *enc, *first;
+ for (first = enc = hb_audio_encoder_get_next(NULL); enc != NULL;
+ enc = hb_audio_encoder_get_next(enc))
+ {
+ if (codec == enc->codec)
+ {
+ return enc;
+ }
+ }
+ // Return a default encoder if nothing matches
+ return first;
+}
+
+int
+ghb_lookup_audio_encoder_codec(const char *name)
+{
+ return ghb_lookup_audio_encoder(name)->codec;
+}
+
+int
+ghb_settings_audio_encoder_codec(const GValue *settings, const char *name)
+{
+ const char *encoder_id = ghb_settings_get_const_string(settings, name);
+ return ghb_lookup_audio_encoder_codec(encoder_id);
+}
+
+const hb_encoder_t*
+ghb_settings_audio_encoder(const GValue *settings, const char *name)
+{
+ const char *encoder_id = ghb_settings_get_const_string(settings, name);
+ return ghb_lookup_audio_encoder(encoder_id);
+}
+
 static void
-hb_encoder_opts_set(
+audio_encoder_opts_set_with_mask(
 GtkBuilder *builder,
 const gchar *name,
- hb_encoder_t *encoders,
- int len)
+ int mask,
+ int neg_mask)
 {
- hb_encoder_opts_set_with_mask(builder, name, encoders, len, ~0, 0);
+ g_debug("audio_encoder_opts_set_with_mask()\n");
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ ghb_audio_encoder_opts_set_with_mask(combo, mask, neg_mask);
+}
+
+void
+ghb_audio_encoder_opts_set(GtkComboBox *combo)
+{
+ ghb_audio_encoder_opts_set_with_mask(combo, ~0, 0);
+}
+
+static void
+audio_encoder_opts_set(
+ GtkBuilder *builder,
+ const gchar *name)
+{
+ GtkTreeIter iter;
+ GtkListStore *store;
+ gchar *str;
+
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
+ gtk_list_store_clear(store);
+
+ const hb_encoder_t *enc;
+ for (enc = hb_audio_encoder_get_next(NULL); enc != NULL;
+ enc = hb_audio_encoder_get_next(enc))
+ {
+ if (enc->codec != HB_ACODEC_AUTO_PASS)
+ {
+ gtk_list_store_append(store, &iter);
+ str = g_strdup_printf("%s", enc->name);
+ gtk_list_store_set(store, &iter,
+ 0, str,
+ 1, TRUE,
+ 2, enc->short_name,
+ 3, (gdouble)enc->codec,
+ 4, enc->short_name,
+ -1);
+ g_free(str);
+ }
+ }
 }
 
 static void
 acodec_fallback_opts_set(GtkBuilder *builder, const gchar *name)
 {
- hb_encoder_opts_set_with_mask(builder, name, hb_audio_encoders, 
- hb_audio_encoders_count, ~0, HB_ACODEC_PASS_FLAG);
+ audio_encoder_opts_set_with_mask(builder, name, ~0, HB_ACODEC_PASS_FLAG);
+}
+
+void
+ghb_mix_opts_set(GtkComboBox *combo)
+{
+ GtkTreeIter iter;
+ GtkListStore *store;
+ gchar *str;
+
+ g_debug("mix_opts_set ()\n");
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
+ gtk_list_store_clear(store);
+
+ const hb_mixdown_t *mix;
+ for (mix = hb_mixdown_get_next(NULL); mix != NULL;
+ mix = hb_mixdown_get_next(mix))
+ {
+ gtk_list_store_append(store, &iter);
+ str = g_strdup_printf("%s", mix->name);
+ gtk_list_store_set(store, &iter,
+ 0, str,
+ 1, TRUE,
+ 2, mix->short_name,
+ 3, (gdouble)mix->amixdown,
+ 4, mix->short_name,
+ -1);
+ g_free(str);
+ }
+}
+
+const hb_mixdown_t*
+ghb_lookup_mixdown(const char *name)
+{
+ // First find an enabled mixdown
+ int mix = hb_mixdown_get_from_name(name);
+
+ // Now find the matching mixdown info
+ const hb_mixdown_t *mixdown, *first;
+ for (first = mixdown = hb_mixdown_get_next(NULL); mixdown != NULL;
+ mixdown = hb_mixdown_get_next(mixdown))
+ {
+ if (mix == mixdown->amixdown)
+ {
+ return mixdown;
+ }
+ }
+ // Return a default mixdown if nothing matches
+ return first;
+}
+
+int
+ghb_lookup_mixdown_mix(const char *name)
+{
+ return ghb_lookup_mixdown(name)->amixdown;
+}
+
+int
+ghb_settings_mixdown_mix(const GValue *settings, const char *name)
+{
+ const char *mixdown_id = ghb_settings_get_const_string(settings, name);
+ return ghb_lookup_mixdown_mix(mixdown_id);
+}
+
+const hb_mixdown_t*
+ghb_settings_mixdown(const GValue *settings, const char *name)
+{
+ const char *mixdown_id = ghb_settings_get_const_string(settings, name);
+ return ghb_lookup_mixdown(mixdown_id);
 }
 
 static void
 mix_opts_set(GtkBuilder *builder, const gchar *name)
 {
+ g_debug("mix_opts_set ()\n");
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ ghb_mix_opts_set(combo);
+}
+
+static void
+container_opts_set(
+ GtkBuilder *builder,
+ const gchar *name)
+{
 GtkTreeIter iter;
 GtkListStore *store;
- gint ii;
 gchar *str;
- 
- g_debug("mix_opts_set ()\n");
- store = get_combo_box_store(builder, name);
+
+ g_debug("hb_container_opts_set ()\n");
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
 gtk_list_store_clear(store);
- for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
+
+ const hb_container_t *mux;
+ for (mux = hb_container_get_next(NULL); mux != NULL;
+ mux = hb_container_get_next(mux))
 {
 gtk_list_store_append(store, &iter);
- str = g_strdup_printf("%s",
- hb_audio_mixdowns[ii].human_readable_name);
- gtk_list_store_set(store, &iter, 
+ str = g_strdup_printf("%s", mux->name);
+ gtk_list_store_set(store, &iter,
 0, str,
- 1, TRUE, 
- 2, hb_audio_mixdowns[ii].short_name, 
- 3, (gdouble)hb_audio_mixdowns[ii].amixdown, 
- 4, hb_audio_mixdowns[ii].internal_name, 
+ 1, TRUE,
+ 2, mux->short_name,
+ 3, (gdouble)mux->format,
+ 4, mux->short_name,
 -1);
 g_free(str);
 }
 }
 
+const hb_container_t*
+ghb_lookup_container_by_name(const gchar *name)
+{
+ // First find an enabled muxer
+ int format = hb_container_get_from_name(name);
+
+ // Now find the matching muxer info
+ const hb_container_t *mux, *first;
+ for (first = mux = hb_container_get_next(NULL); mux != NULL;
+ mux = hb_container_get_next(mux))
+ {
+ if (format == mux->format)
+ {
+ return mux;
+ }
+ }
+ // Return a default container if nothing matches
+ return first;
+}
+
 static void
 srt_codeset_opts_set(GtkBuilder *builder, const gchar *name)
 {
 GtkTreeIter iter;
 GtkListStore *store;
 gint ii;
- 
+
 g_debug("srt_codeset_opts_set ()\n");
- store = get_combo_box_store(builder, name);
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
 gtk_list_store_clear(store);
 for (ii = 0; ii < SRT_TABLE_SIZE; ii++)
 {
 gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
+ gtk_list_store_set(store, &iter,
 0, srt_codeset_table[ii],
- 1, TRUE, 
+ 1, TRUE,
 2, srt_codeset_table[ii],
- 3, (gdouble)ii, 
+ 3, (gdouble)ii,
 4, srt_codeset_table[ii],
 -1);
 }
@@ -1903,9 +1793,10 @@
 GtkTreeIter iter;
 GtkListStore *store;
 gint ii;
- 
+
 g_debug("language_opts_set ()\n");
- store = get_combo_box_store(builder, name);
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
 gtk_list_store_clear(store);
 for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
 {
@@ -1915,19 +1806,90 @@
 lang = ghb_language_table[ii].native_name;
 else
 lang = ghb_language_table[ii].eng_name;
- 
+
 gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
+ gtk_list_store_set(store, &iter,
 0, lang,
- 1, TRUE, 
- 2, ghb_language_table[ii].iso639_2, 
- 3, (gdouble)ii, 
- 4, ghb_language_table[ii].iso639_1, 
+ 1, TRUE,
+ 2, ghb_language_table[ii].iso639_2,
+ 3, (gdouble)ii,
+ 4, ghb_language_table[ii].iso639_1,
 -1);
 }
 }
 
-static gchar **titles = NULL;
+const iso639_lang_t*
+ghb_lookup_lang(const char *name)
+{
+ int ii;
+ for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
+ {
+ if (!strncmp(name, ghb_language_table[ii].iso639_2, 4) ||
+ !strncmp(name, ghb_language_table[ii].iso639_1, 4) ||
+ !strncmp(name, ghb_language_table[ii].iso639_2b, 4) ||
+ !strncmp(name, ghb_language_table[ii].native_name, 4) ||
+ !strncmp(name, ghb_language_table[ii].eng_name, 4))
+ {
+ return &ghb_language_table[ii];
+ }
+ }
+ return NULL;
+}
+
+gchar*
+ghb_create_title_label(const hb_title_t *title)
+{
+ gchar *label;
+
+ if (title->type == HB_STREAM_TYPE || title->type == HB_FF_STREAM_TYPE)
+ {
+ if (title->duration != 0)
+ {
+ char *tmp;
+ tmp = g_strdup_printf (_("%d - %02dh%02dm%02ds - %s"),
+ title->index, title->hours, title->minutes, title->seconds,
+ title->name);
+ label = g_markup_escape_text(tmp, -1);
+ g_free(tmp);
+ }
+ else
+ {
+ char *tmp;
+ tmp = g_strdup_printf ("%d - %s",
+ title->index, title->name);
+ label = g_markup_escape_text(tmp, -1);
+ g_free(tmp);
+ }
+ }
+ else if (title->type == HB_BD_TYPE)
+ {
+ if (title->duration != 0)
+ {
+ label = g_strdup_printf(_("%d (%05d.MPLS) - %02dh%02dm%02ds"),
+ title->index, title->playlist, title->hours,
+ title->minutes, title->seconds);
+ }
+ else
+ {
+ label = g_strdup_printf(_("%d (%05d.MPLS) - Unknown Length"),
+ title->index, title->playlist);
+ }
+ }
+ else
+ {
+ if (title->duration != 0)
+ {
+ label = g_strdup_printf(_("%d - %02dh%02dm%02ds"),
+ title->index, title->hours, title->minutes, title->seconds);
+ }
+ else
+ {
+ label = g_strdup_printf(_("%d - Unknown Length"),
+ title->index);
+ }
+ }
+ return label;
+}
 
 void
 title_opts_set(GtkBuilder *builder, const gchar *name)
@@ -1935,136 +1897,152 @@
 GtkTreeIter iter;
 GtkListStore *store;
 hb_list_t * list = NULL;
- hb_title_t * title = NULL;
+ const hb_title_t * title = NULL;
 gint ii;
 gint count = 0;
- 
+
+
 g_debug("title_opts_set ()\n");
- store = get_combo_box_store(builder, name);
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
 gtk_list_store_clear(store);
 if (h_scan != NULL)
 {
 list = hb_get_titles( h_scan );
 count = hb_list_count( list );
 }
- if (titles) g_strfreev(titles);
- if (title_opts.map) g_free(title_opts.map);
- if (count > 0)
- {
- title_opts.count = count;
- title_opts.map = g_malloc(count*sizeof(options_map_t));
- titles = g_malloc((count+1) * sizeof(gchar*));
- }
- else
- {
- title_opts.count = 1;
- title_opts.map = g_malloc(sizeof(options_map_t));
- titles = NULL;
- }
 if( count <= 0 )
 {
+ char *opt;
+
 // No titles. Fill in a default.
 gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
- 0, "No Titles", 
- 1, TRUE, 
- 2, "none", 
- 3, -1.0, 
- 4, "none", 
+ opt = g_strdup_printf("%s", _("No Titles"));
+ gtk_list_store_set(store, &iter,
+ 0, opt,
+ 1, TRUE,
+ 2, "none",
+ 3, -1.0,
+ 4, "none",
 -1);
- title_opts.map[0].option = "No Titles";
- title_opts.map[0].shortOpt = "none";
- title_opts.map[0].ivalue = -1;
- title_opts.map[0].svalue = "none";
+ g_free(opt);
 return;
 }
 for (ii = 0; ii < count; ii++)
 {
- title = (hb_title_t*)hb_list_item(list, ii);
- if (title->type == HB_STREAM_TYPE || title->type == HB_FF_STREAM_TYPE)
- {
- if (title->duration != 0)
- {
- char *tmp;
- tmp = g_strdup_printf ("%d - %02dh%02dm%02ds - %s",
- title->index, title->hours, title->minutes, title->seconds, 
- title->name);
- titles[ii] = g_markup_escape_text(tmp, -1);
- g_free(tmp);
- }
- else
- {
- char *tmp;
- tmp = g_strdup_printf ("%d - %s", 
- title->index, title->name);
- titles[ii] = g_markup_escape_text(tmp, -1);
- g_free(tmp);
- }
- }
- else if (title->type == HB_BD_TYPE)
- {
- if (title->duration != 0)
- {
- titles[ii] = g_strdup_printf("%d (%05d.MPLS) - %02dh%02dm%02ds",
- title->index, title->playlist, title->hours, 
- title->minutes, title->seconds);
- }
- else
- {
- titles[ii] = g_strdup_printf("%d (%05d.MPLS) - Unknown Length",
- title->index, title->playlist);
- }
- }
- else
- {
- if (title->duration != 0)
- {
- titles[ii] = g_strdup_printf("%d - %02dh%02dm%02ds",
- title->index, title->hours, title->minutes, title->seconds);
- }
- else
- {
- titles[ii] = g_strdup_printf("%d - Unknown Length",
- title->index);
- }
- }
+ char *title_opt, *title_index, *opt;
+
+ title = hb_list_item(list, ii);
+ title_opt = ghb_create_title_label(title);
+ opt = g_strdup_printf("%s", title_opt);
+ title_index = g_strdup_printf("%d", title->index);
+
 gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
- 0, titles[ii], 
- 1, TRUE, 
- 2, titles[ii], 
- 3, (gdouble)ii, 
- 4, titles[ii], 
+ gtk_list_store_set(store, &iter,
+ 0, opt,
+ 1, TRUE,
+ 2, title_index,
+ 3, (gdouble)title->index,
+ 4, title_index,
 -1);
- title_opts.map[ii].option = titles[ii];
- title_opts.map[ii].shortOpt = titles[ii];
- title_opts.map[ii].ivalue = ii;
- title_opts.map[ii].svalue = titles[ii];
+ g_free(opt);
+ g_free(title_opt);
+ g_free(title_index);
+ }
+}
+
+static int
+lookup_title_index(hb_handle_t *h, int title_id)
+{
+ if (h == NULL)
+ return -1;
+
+ hb_list_t *list;
+ const hb_title_t *title;
+ int count, ii;
+
+ list = hb_get_titles(h);
+ count = hb_list_count(list);
+ for (ii = 0; ii < count; ii++)
+ {
+ title = hb_list_item(list, ii);
+ if (title_id == title->index)
+ {
+ return ii;
+ }
 }
- titles[ii] = NULL;
+ return -1;
+}
+
+const hb_title_t*
+lookup_title(hb_handle_t *h, int title_id, int *index)
+{
+ int ii = lookup_title_index(h, title_id);
+
+ if (index != NULL)
+ *index = ii;
+ if (ii < 0)
+ return NULL;
+
+ hb_list_t *list;
+ list = hb_get_titles(h);
+ return hb_list_item(list, ii);
+}
+
+int
+ghb_lookup_title_index(int title_id)
+{
+ return lookup_title_index(h_scan, title_id);
+}
+
+const hb_title_t*
+ghb_lookup_title(int title_id, int *index)
+{
+ return lookup_title(h_scan, title_id, index);
+}
+
+int
+ghb_lookup_queue_title_index(int title_id)
+{
+ return lookup_title_index(h_queue, title_id);
+}
+
+const hb_title_t*
+ghb_lookup_queue_title(int title_id, int *index)
+{
+ return lookup_title(h_queue, title_id, index);
 }
 
 static void
-x264_tune_opts_set(GtkBuilder *builder, const gchar *name)
+video_tune_opts_set(signal_user_data_t *ud, const gchar *name)
 {
 GtkTreeIter iter;
 GtkListStore *store;
 gint ii, count = 0;
 
+ // Check if encoder has been set yet.
+ // If not, bail
+ GValue *value = ghb_dict_lookup(ud->settings, "VideoEncoder");
+ if (value == NULL) return;
+
+ int encoder = ghb_get_video_encoder(ud->settings);
 const char * const *tunes;
- tunes = hb_x264_tunes();
+ tunes = hb_video_encoder_get_tunes(encoder);
+
 while (tunes && tunes[count]) count++;
+ if (count == 0) return;
 
- g_debug("x264_tune_opts_set ()\n");
- store = get_combo_box_store(builder, name);
+ g_debug("video_tune_opts_set ()\n");
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(ud->builder, name));
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
 gtk_list_store_clear(store);
 
 gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
- 0, "None",
- 1, TRUE, 
+ gtk_list_store_set(store, &iter,
+ 0, _("None"),
+ 1, TRUE,
 2, "none",
- 3, (gdouble)0, 
+ 3, (gdouble)0,
 4, "none",
 -1);
 
@@ -2073,9 +2051,9 @@
 if (strcmp(tunes[ii], "fastdecode") && strcmp(tunes[ii], "zerolatency"))
 {
 gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
+ gtk_list_store_set(store, &iter,
 0, tunes[ii],
- 1, TRUE, 
+ 1, TRUE,
 2, tunes[ii],
 3, (gdouble)ii + 1,
 4, tunes[ii],
@@ -2085,26 +2063,35 @@
 }
 
 static void
-h264_profile_opts_set(GtkBuilder *builder, const gchar *name)
+video_profile_opts_set(signal_user_data_t *ud, const gchar *name)
 {
 GtkTreeIter iter;
 GtkListStore *store;
 gint ii, count = 0;
 
+ // Check if encoder has been set yet.
+ // If not, bail
+ GValue *value = ghb_dict_lookup(ud->settings, "VideoEncoder");
+ if (value == NULL) return;
+
+ int encoder = ghb_get_video_encoder(ud->settings);
 const char * const *profiles;
- profiles = hb_h264_profiles();
+ profiles = hb_video_encoder_get_profiles(encoder);
+
 while (profiles && profiles[count]) count++;
+ if (count == 0) return;
 
- g_debug("h264_profile_opts_set ()\n");
- store = get_combo_box_store(builder, name);
+ g_debug("video_profile_opts_set ()\n");
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(ud->builder, name));
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
 gtk_list_store_clear(store);
 
 for (ii = 0; ii < count; ii++)
 {
 gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
+ gtk_list_store_set(store, &iter,
 0, profiles[ii],
- 1, TRUE, 
+ 1, TRUE,
 2, profiles[ii],
 3, (gdouble)ii,
 4, profiles[ii],
@@ -2113,26 +2100,35 @@
 }
 
 static void
-h264_level_opts_set(GtkBuilder *builder, const gchar *name)
+video_level_opts_set(signal_user_data_t *ud, const gchar *name)
 {
 GtkTreeIter iter;
 GtkListStore *store;
 gint ii, count = 0;
 
+ // Check if encoder has been set yet.
+ // If not, bail
+ GValue *value = ghb_dict_lookup(ud->settings, "VideoEncoder");
+ if (value == NULL) return;
+
+ int encoder = ghb_get_video_encoder(ud->settings);
 const char * const *levels;
- levels = hb_h264_levels();
+ levels = hb_video_encoder_get_levels(encoder);
+
 while (levels && levels[count]) count++;
+ if (count == 0) return;
 
- g_debug("h264_level_opts_set ()\n");
- store = get_combo_box_store(builder, name);
+ g_debug("video_level_opts_set ()\n");
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(ud->builder, name));
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
 gtk_list_store_clear(store);
 
 for (ii = 0; ii < count; ii++)
 {
 gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
+ gtk_list_store_set(store, &iter,
 0, levels[ii],
- 1, TRUE, 
+ 1, TRUE,
 2, levels[ii],
 3, (gdouble)ii,
 4, levels[ii],
@@ -2140,18 +2136,12 @@
 }
 }
 
-int
-ghb_get_title_count()
-{
- return title_opts.count;
-}
-
 static gboolean
 find_combo_item_by_int(GtkTreeModel *store, gint value, GtkTreeIter *iter)
 {
 gdouble ivalue;
 gboolean foundit = FALSE;
- 
+
 if (gtk_tree_model_get_iter_first (store, iter))
 {
 do
@@ -2168,239 +2158,160 @@
 }
 
 void
-audio_track_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex)
+audio_track_opts_set(GtkBuilder *builder, const gchar *name, const hb_title_t *title)
 {
 GtkTreeIter iter;
 GtkListStore *store;
- hb_title_t * title = NULL;
 hb_audio_config_t * audio;
 gint ii;
 gint count = 0;
- gchar *str;
- 
+ gchar *opt;
+
 g_debug("audio_track_opts_set ()\n");
- store = get_combo_box_store(builder, name);
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
 gtk_list_store_clear(store);
- title = ghb_get_title_info(titleindex);
 if (title != NULL)
 {
 count = hb_list_count( title->list_audio );
 }
- if (count > 100) count = 100;
- if (audio_track_opts.map)
- {
- for (ii = 0; ii < audio_track_opts.count; ii++)
- {
- if (audio_track_opts.map[ii].option)
- g_free(audio_track_opts.map[ii].option);
- }
- g_free(audio_track_opts.map);
- }
- if (count > 0)
- {
- audio_track_opts.count = count;
- audio_track_opts.map = g_malloc(count*sizeof(options_map_t));
- }
- else
- {
- audio_track_opts.count = 1;
- audio_track_opts.map = g_malloc(sizeof(options_map_t));
- }
 if( count <= 0 )
 {
 // No audio. set some default
+ opt = g_strdup_printf("%s", _("No Audio"));
+
 gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
- 0, "No Audio", 
- 1, TRUE, 
- 2, "none", 
- 3, -1.0, 
- 4, "none", 
+ gtk_list_store_set(store, &iter,
+ 0, opt,
+ 1, TRUE,
+ 2, "none",
+ 3, -1.0,
+ 4, "none",
 -1);
- audio_track_opts.map[0].option = g_strdup("No Audio");
- audio_track_opts.map[0].shortOpt = "none";
- audio_track_opts.map[0].ivalue = -1;
- audio_track_opts.map[0].svalue = "none";
+ g_free(opt);
 return;
 }
- index_str_init(count-1);
 for (ii = 0; ii < count; ii++)
 {
- audio = (hb_audio_config_t *) hb_list_audio_config_item( title->list_audio, ii );
+ char idx[4];
+ audio = hb_list_audio_config_item(title->list_audio, ii);
+ opt = g_strdup_printf("%d - %s",
+ ii + 1, audio->lang.description);
+ snprintf(idx, 4, "%d", ii);
+
 gtk_list_store_append(store, &iter);
- char *tmp = g_strdup_printf("%d - %s", ii + 1, audio->lang.description);
- str = g_strdup_printf("%s", tmp);
- gtk_list_store_set(store, &iter, 
- 0, str,
- 1, TRUE, 
- 2, index_str[ii], 
- 3, (gdouble)ii, 
- 4, index_str[ii], 
+ gtk_list_store_set(store, &iter,
+ 0, opt,
+ 1, TRUE,
+ 2, idx,
+ 3, (gdouble)ii,
+ 4, idx,
 -1);
- g_free(str);
- audio_track_opts.map[ii].option = g_strdup(tmp);
- g_free(tmp);
- audio_track_opts.map[ii].shortOpt = index_str[ii];
- audio_track_opts.map[ii].ivalue = ii;
- audio_track_opts.map[ii].svalue = index_str[ii];
+ g_free(opt);
 }
- GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
 gtk_combo_box_set_active (combo, 0);
 }
 
-const gchar*
-ghb_audio_track_description(gint track, int titleindex)
-{
- hb_title_t * title = NULL;
- hb_audio_config_t * audio;
- gchar * desc = "Unknown";
- 
- g_debug("ghb_audio_track_description ()\n");
-
- title = ghb_get_title_info( titleindex );
- if (title == NULL) return desc;
- if (track >= hb_list_count( title->list_audio )) return desc;
-
- audio = hb_list_audio_config_item(title->list_audio, track);
- if (audio == NULL) return desc;
- return audio->lang.description;
-}
-
 void
-subtitle_track_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex)
+subtitle_track_opts_set(
+ GtkBuilder *builder,
+ const gchar *name,
+ const hb_title_t *title)
 {
 GtkTreeIter iter;
 GtkListStore *store;
- hb_title_t * title = NULL;
 hb_subtitle_t * subtitle;
 gint ii, count = 0;
- static char ** options = NULL;
- 
- g_debug("subtitle_track_opts_set ()\n");
- store = get_combo_box_store(builder, name);
+
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
 gtk_list_store_clear(store);
- title = ghb_get_title_info(titleindex);
+
 if (title != NULL)
 {
 count = hb_list_count( title->list_subtitle );
 }
- if (count > 100) count = 100;
- if (subtitle_opts.map) g_free(subtitle_opts.map);
- if (count > 0)
- {
- subtitle_opts.count = count+1;
- subtitle_opts.map = g_malloc((count+1)*sizeof(options_map_t));
- }
- else
- {
- subtitle_opts.count = LANG_TABLE_SIZE+1;
- subtitle_opts.map = g_malloc((LANG_TABLE_SIZE+1)*sizeof(options_map_t));
- }
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
- 0, "Foreign Audio Search", 
- 1, TRUE, 
- 2, "-1", 
- 3, -1.0, 
- 4, "auto", 
- -1);
- subtitle_opts.map[0].option = "Foreign Audio Search";
- subtitle_opts.map[0].shortOpt = "-1";
- subtitle_opts.map[0].ivalue = -1;
- subtitle_opts.map[0].svalue = "auto";
 if (count > 0)
 {
- if (options != NULL)
- g_strfreev(options);
- options = g_malloc((count+1)*sizeof(gchar*));
- index_str_init(count-1);
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
+ 0, _("Foreign Audio Search"),
+ 1, TRUE,
+ 2, "-1",
+ 3, -1.0,
+ 4, "auto",
+ -1);
+
 for (ii = 0; ii < count; ii++)
 {
- subtitle = (hb_subtitle_t *)hb_list_item(title->list_subtitle, ii);
- options[ii] = g_strdup_printf("%d - %s (%s)", ii+1, 
- subtitle->lang, 
- hb_subsource_name(subtitle->source));
- subtitle_opts.map[ii+1].option = options[ii];
- subtitle_opts.map[ii+1].shortOpt = index_str[ii];
- subtitle_opts.map[ii+1].ivalue = ii;
- subtitle_opts.map[ii+1].svalue = subtitle->iso639_2;
+ gchar *opt;
+ char idx[4];
+
+ subtitle = hb_list_item(title->list_subtitle, ii);
+ opt = g_strdup_printf("%d - %s (%s)", ii+1, subtitle->lang,
+ hb_subsource_name(subtitle->source));
+ snprintf(idx, 4, "%d", ii);
+
 gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
- 0, options[ii], 
- 1, TRUE, 
- 2, index_str[ii], 
- 3, (gdouble)ii, 
- 4, subtitle->iso639_2, 
+ gtk_list_store_set(store, &iter,
+ 0, opt,
+ 1, TRUE,
+ 2, idx,
+ 3, (gdouble)ii,
+ 4, idx,
 -1);
+ g_free(opt);
 }
- options[count] = NULL;
 }
 else
 {
- index_str_init(LANG_TABLE_SIZE-1);
- for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
- {
- const gchar *lang;
-
- if (ghb_language_table[ii].native_name[0] != 0)
- lang = ghb_language_table[ii].native_name;
- else
- lang = ghb_language_table[ii].eng_name;
-
- subtitle_opts.map[ii+1].option = (gchar*)lang;
- subtitle_opts.map[ii+1].shortOpt = index_str[ii];
- subtitle_opts.map[ii+1].ivalue = ii;
- subtitle_opts.map[ii+1].svalue = ghb_language_table[ii].iso639_2;
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
- 0, lang,
- 1, TRUE, 
- 2, index_str[ii],
- 3, (gdouble)ii, 
- 4, ghb_language_table[ii].iso639_2, 
- -1);
- }
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
+ 0, _("None"),
+ 1, TRUE,
+ 2, "0",
+ 3, 0.0,
+ 4, "none",
+ -1);
 }
- GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
 gtk_combo_box_set_active (combo, 0);
 }
 
+// Get title id of feature or longest title
 gint
 ghb_longest_title()
 {
 hb_title_set_t * title_set;
- hb_title_t * title;
- gint ii;
- gint count = 0;
- gint feature;
- 
+ const hb_title_t * title;
+ gint count = 0, ii, longest = -1;
+ int64_t duration = 0;
+
 g_debug("ghb_longest_title ()\n");
 if (h_scan == NULL) return 0;
 title_set = hb_get_title_set( h_scan );
 count = hb_list_count( title_set->list_title );
- if (count < 1) return 0;
- title = (hb_title_t*)hb_list_item(title_set->list_title, 0);
- feature = title_set->feature;
+ if (count < 1) return -1;
+
+ // Check that the feature title in the title_set exists in the list
+ // of titles. If not, pick the longest.
 for (ii = 0; ii < count; ii++)
 {
- title = (hb_title_t*)hb_list_item(title_set->list_title, ii);
- if (title->index == feature)
- {
- return ii;
- }
+ title = hb_list_item(title_set->list_title, ii);
+ if (title->index == title_set->feature)
+ return title_set->feature;
+ if (title->duration > duration)
+ longest = title->index;
 }
- return 0;
+ return longest;
 }
 
 const gchar*
-ghb_get_source_audio_lang(gint titleindex, gint track)
+ghb_get_source_audio_lang(const hb_title_t *title, gint track)
 {
- hb_title_t * title;
 hb_audio_config_t * audio;
 const gchar *lang = "und";
- 
+
 g_debug("ghb_lookup_1st_audio_lang ()\n");
- title = ghb_get_title_info( titleindex );
 if (title == NULL)
 return lang;
 if (hb_list_count( title->list_audio ) <= track)
@@ -2414,362 +2325,75 @@
 return lang;
 }
 
-static gboolean*
-get_track_used(gint acodec, GHashTable *track_indices, gint count)
-{
- gboolean *used;
-
- used = g_hash_table_lookup(track_indices, &acodec);
- if (used == NULL)
- {
- gint *key;
-
- used = g_malloc0(count * sizeof(gboolean));
- key = g_malloc(sizeof(gint));
- *key = acodec;
- g_hash_table_insert(track_indices, key, used);
- }
- return used;
-}
-
 gint
-ghb_find_audio_track(
- gint titleindex, 
- const gchar *lang, 
- gint acodec,
- gint fallback_acodec,
- GHashTable *track_indices)
+ghb_find_audio_track(const hb_title_t *title, const gchar *lang, int start)
 {
- hb_title_t * title;
 hb_audio_config_t * audio;
- gint ii;
- gint count = 0;
- gint track = -1;
- gint max_chan;
- gboolean *used = NULL;
- gboolean *passthru_used;
- gint try_acodec;
- gint passthru_acodec;
- gboolean passthru;
- gint channels;
- 
- g_debug("find_audio_track ()\n");
- title = ghb_get_title_info( titleindex );
- if (title != NULL)
- {
- count = hb_list_count( title->list_audio );
- }
- if (count > 10) count = 10;
- // Try to find an item that matches the preferred language and
- // the passthru codec type
- max_chan = 0;
- passthru = (acodec & HB_ACODEC_PASS_FLAG) != 0;
- if (passthru)
- {
- for (ii = 0; ii < count; ii++)
- {
- audio = (hb_audio_config_t*)hb_list_audio_config_item( 
- title->list_audio, ii );
- passthru_acodec = HB_ACODEC_PASS_MASK & acodec & audio->in.codec;
- // Is the source track use a passthru capable codec?
- if (passthru_acodec == 0)
- continue;
- used = get_track_used(passthru_acodec, track_indices, count);
- // Has the track already been used with this codec?
- if (used[ii])
- continue;
-
- channels = av_get_channel_layout_nb_channels(
- audio->in.channel_layout);
- // Find a track that is not visually impaired or dirctor's
- // commentary, and has the highest channel count.
- if ((audio->lang.type < 2) &&
- ((strcmp(lang, audio->lang.iso639_2) == 0) ||
- (strcmp(lang, "und") == 0)))
- {
- if (channels > max_chan)
- {
- track = ii;
- max_chan = channels;
- }
- }
- }
- try_acodec = fallback_acodec;
- }
- else
- {
- try_acodec = acodec;
- }
- if (track > -1)
- {
- used[track] = TRUE;
- return track;
- }
- // Try to find an item that matches the preferred language
- max_chan = 0;
- used = get_track_used(try_acodec, track_indices, count);
- for (ii = 0; ii < count; ii++)
- {
- // Has the track already been used with this codec?
- if (used[ii])
- continue;
- audio = (hb_audio_config_t*)hb_list_audio_config_item( 
- title->list_audio, ii );
- passthru_acodec = HB_ACODEC_PASS_MASK & audio->in.codec;
- if (passthru_acodec && passthru)
- {
- passthru_used = get_track_used(passthru_acodec, track_indices, count);
- // Has the track already been used with this codec for passthru?
- if (passthru_used[ii])
- continue;
- }
- channels = av_get_channel_layout_nb_channels(
- audio->in.channel_layout);
- // Find a track that is not visually impaired or dirctor's commentary
- if ((audio->lang.type < 2) &&
- ((strcmp(lang, audio->lang.iso639_2) == 0) ||
- (strcmp(lang, "und") == 0)))
- {
- if (channels > max_chan)
- {
- track = ii;
- max_chan = channels;
- }
- }
- }
- if (track > -1)
- {
- used[track] = TRUE;
- return track;
- }
- // Try to fine an item that does not match the preferred language and
- // matches the passthru codec type
- max_chan = 0;
- if (passthru)
- {
- for (ii = 0; ii < count; ii++)
- {
- audio = (hb_audio_config_t*)hb_list_audio_config_item( 
- title->list_audio, ii );
- passthru_acodec = HB_ACODEC_PASS_MASK & acodec & audio->in.codec;
- // Is the source track use a passthru capable codec?
- if (passthru_acodec == 0)
- continue;
- used = get_track_used(passthru_acodec, track_indices, count);
- // Has the track already been used with this codec?
- if (used[ii])
- continue;
-
- channels = av_get_channel_layout_nb_channels(
- audio->in.channel_layout);
- // Find a track that is not visually impaired or dirctor's
- // commentary, and has the highest channel count.
- if (audio->lang.type < 2)
- {
- if (channels > max_chan)
- {
- track = ii;
- max_chan = channels;
- }
- }
- }
- try_acodec = fallback_acodec;
- }
- else
- {
- try_acodec = acodec;
- }
- if (track > -1)
- {
- used[track] = TRUE;
- return track;
- }
- // Try to fine an item that does not match the preferred language
- max_chan = 0;
- used = get_track_used(try_acodec, track_indices, count);
- for (ii = 0; ii < count; ii++)
- {
- // Has the track already been used with this codec?
- if (used[ii])
- continue;
- audio = (hb_audio_config_t*)hb_list_audio_config_item( 
- title->list_audio, ii );
- passthru_acodec = HB_ACODEC_PASS_MASK & audio->in.codec;
- channels = av_get_channel_layout_nb_channels(
- audio->in.channel_layout);
- if (passthru_acodec && passthru)
- {
- passthru_used = get_track_used(passthru_acodec, track_indices, count);
- // Has the track already been used with this codec for passthru?
- if (passthru_used[ii])
- continue;
- }
- // Find a track that is not visually impaired or dirctor's commentary
- if (audio->lang.type < 2)
- {
- if (channels > max_chan)
- {
- track = ii;
- max_chan = channels;
- }
- }
- }
- if (track > -1)
- {
- used[track] = TRUE;
- return track;
- }
- // Last ditch, anything goes
- for (ii = 0; ii < count; ii++)
- {
- audio = (hb_audio_config_t*)hb_list_audio_config_item( 
- title->list_audio, ii );
- passthru_acodec = HB_ACODEC_PASS_MASK & audio->in.codec;
- if (passthru_acodec && passthru)
- {
- passthru_used = get_track_used(passthru_acodec, track_indices, count);
- // Has the track already been used with this codec for passthru?
- if (passthru_used[ii])
- continue;
- }
- // Has the track already been used with this codec?
- if (!used[ii])
- {
- track = ii;
- break;
- }
- }
- if (track > -1)
- {
- used[track] = TRUE;
- }
- return track;
-}
+ gint ii, count = 0;
 
-gint
-ghb_find_pref_subtitle_track(const gchar *lang)
-{
- gint ii, count;
- count = subtitle_opts.count;
- for (ii = 0; ii < count; ii++)
+ if (title != NULL)
 {
- if (strcmp(lang, subtitle_opts.map[ii].svalue) == 0)
- {
- return subtitle_opts.map[ii].ivalue;
- }
+ count = hb_list_count(title->list_audio);
 }
- return -2;
-}
 
-gint
-ghb_find_cc_track(gint titleindex)
-{
- hb_title_t * title;
- hb_subtitle_t * subtitle;
- gint count, ii;
- 
- g_debug("ghb_find_cc_track ()\n");
- title = ghb_get_title_info( titleindex );
- if (title != NULL)
+ for (ii = start; ii < count; ii++)
 {
- count = hb_list_count( title->list_subtitle );
- // Try to find an item that matches the preferred language
- for (ii = 0; ii < count; ii++)
+ audio = hb_list_audio_config_item(title->list_audio, ii);
+ if (!strcmp(lang, audio->lang.iso639_2) || !strcmp(lang, "und"))
 {
- subtitle = (hb_subtitle_t*)hb_list_item( title->list_subtitle, ii );
- if (subtitle->source == CC608SUB || subtitle->source == CC708SUB)
- return ii;
+ return ii;
 }
 }
- return -2;
+ return -1;
 }
 
 gint
-ghb_find_subtitle_track(
- gint titleindex, 
- const gchar * lang, 
- gboolean burn,
- gboolean force,
- gint source,
- GHashTable * track_indices)
+ghb_find_subtitle_track(const hb_title_t * title, const gchar * lang, int start)
 {
- hb_title_t * title;
 hb_subtitle_t * subtitle;
 gint count, ii;
- gboolean *used;
-
- g_debug("find_subtitle_track ()\n");
- if (strcmp(lang, "auto") == 0)
- return -1;
-
- title = ghb_get_title_info( titleindex );
- if (title == NULL)
- return -2;
 
- count = hb_list_count( title->list_subtitle );
- used = g_hash_table_lookup(track_indices, lang);
- if (used == NULL)
- {
- used = g_malloc0(count * sizeof(gboolean));
- g_hash_table_insert(track_indices, g_strdup(lang), used);
- }
- // Try to find an item that matches the preferred language and source
- for (ii = 0; ii < count; ii++)
- {
- if (used[ii])
- continue;
+ count = hb_list_count(title->list_subtitle);
 
- subtitle = (hb_subtitle_t*)hb_list_item( title->list_subtitle, ii );
- if (source == subtitle->source &&
- ((strcmp(lang, subtitle->iso639_2) == 0) ||
- (strcmp(lang, "und") == 0)))
- {
- used[ii] = TRUE;
- return ii;
- }
- }
 // Try to find an item that matches the preferred language
- for (ii = 0; ii < count; ii++)
+ for (ii = start; ii < count; ii++)
 {
- if (used[ii])
- continue;
-
 subtitle = (hb_subtitle_t*)hb_list_item( title->list_subtitle, ii );
- if (((!force || (force && ghb_canForceSub(subtitle->source))) &&
- (!burn || (burn && ghb_canBurnSub(subtitle->source)))) &&
- ((strcmp(lang, subtitle->iso639_2) == 0) ||
- (strcmp(lang, "und") == 0)))
+ if (strcmp(lang, subtitle->iso639_2) == 0 ||
+ strcmp(lang, "und") == 0)
 {
- used[ii] = TRUE;
 return ii;
 }
 }
- return -2;
+ return -1;
 }
 
+#if 0
 static void
 generic_opts_set(GtkBuilder *builder, const gchar *name, combo_opts_t *opts)
 {
 GtkTreeIter iter;
 GtkListStore *store;
 gint ii;
- 
+
 g_debug("generic_opts_set ()\n");
 if (name == NULL || opts == NULL) return;
- store = get_combo_box_store(builder, name);
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
 gtk_list_store_clear(store);
 for (ii = 0; ii < opts->count; ii++)
 {
 gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
- 0, opts->map[ii].option, 
- 1, TRUE, 
- 2, opts->map[ii].shortOpt, 
- 3, opts->map[ii].ivalue, 
- 4, opts->map[ii].svalue, 
+ gtk_list_store_set(store, &iter,
+ 0, gettext(opts->map[ii].option),
+ 1, TRUE,
+ 2, opts->map[ii].shortOpt,
+ 3, opts->map[ii].ivalue,
+ 4, opts->map[ii].svalue,
 -1);
 }
 }
+#endif
 
 static void
 small_opts_set(GtkBuilder *builder, const gchar *name, combo_opts_t *opts)
@@ -2778,21 +2402,23 @@
 GtkListStore *store;
 gint ii;
 gchar *str;
- 
+
 g_debug("small_opts_set ()\n");
 if (name == NULL || opts == NULL) return;
- store = get_combo_box_store(builder, name);
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
 gtk_list_store_clear(store);
 for (ii = 0; ii < opts->count; ii++)
 {
 gtk_list_store_append(store, &iter);
- str = g_strdup_printf("%s", opts->map[ii].option);
- gtk_list_store_set(store, &iter, 
+ str = g_strdup_printf("%s",
+ gettext(opts->map[ii].option));
+ gtk_list_store_set(store, &iter,
 0, str,
- 1, TRUE, 
- 2, opts->map[ii].shortOpt, 
- 3, opts->map[ii].ivalue, 
- 4, opts->map[ii].svalue, 
+ 1, TRUE,
+ 2, opts->map[ii].shortOpt,
+ 3, opts->map[ii].ivalue,
+ 4, opts->map[ii].svalue,
 -1);
 g_free(str);
 }
@@ -2818,26 +2444,8 @@
 {
 if (gval == NULL)
 return 0;
- if (strcmp(name, "AudioBitrate") == 0)
- return lookup_audio_bitrate_int(gval);
- else if (strcmp(name, "AudioSamplerate") == 0)
- return lookup_audio_rate_int(gval);
- else if (strcmp(name, "VideoFramerate") == 0)
- return lookup_video_rate_int(gval);
- else if (strcmp(name, "AudioMixdown") == 0)
- return lookup_mix_int(gval);
 else if (strcmp(name, "SrtLanguage") == 0)
 return lookup_audio_lang_int(gval);
- else if (strcmp(name, "PreferredLanguage") == 0)
- return lookup_audio_lang_int(gval);
- else if (strcmp(name, "VideoEncoder") == 0)
- return lookup_hb_encoder_int(gval, hb_video_encoders, hb_video_encoders_count);
- else if (strcmp(name, "AudioEncoder") == 0)
- return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
- else if (strcmp(name, "AudioEncoderFallback") == 0)
- return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
- else if (strcmp(name, "AudioEncoderActual") == 0)
- return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
 else
 {
 return lookup_generic_int(find_combo_table(name), gval);
@@ -2851,26 +2459,8 @@
 {
 if (gval == NULL)
 return 0;
- if (strcmp(name, "AudioBitrate") == 0)
- return lookup_audio_bitrate_int(gval);
- else if (strcmp(name, "AudioSamplerate") == 0)
- return lookup_audio_rate_int(gval);
- else if (strcmp(name, "VideoFramerate") == 0)
- return lookup_video_rate_int(gval);
- else if (strcmp(name, "AudioMixdown") == 0)
- return lookup_mix_int(gval);
 else if (strcmp(name, "SrtLanguage") == 0)
 return lookup_audio_lang_int(gval);
- else if (strcmp(name, "PreferredLanguage") == 0)
- return lookup_audio_lang_int(gval);
- else if (strcmp(name, "VideoEncoder") == 0)
- return lookup_hb_encoder_int(gval, hb_video_encoders, hb_video_encoders_count);
- else if (strcmp(name, "AudioEncoder") == 0)
- return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
- else if (strcmp(name, "AudioEncoderFallback") == 0)
- return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
- else if (strcmp(name, "AudioEncoderActual") == 0)
- return lookup_hb_encoder_int(gval, hb_audio_encoders, hb_audio_encoders_count);
 else
 {
 return lookup_generic_double(find_combo_table(name), gval);
@@ -2884,26 +2474,8 @@
 {
 if (gval == NULL)
 return NULL;
- if (strcmp(name, "AudioBitrate") == 0)
- return lookup_audio_bitrate_option(gval);
- else if (strcmp(name, "AudioSamplerate") == 0)
- return lookup_audio_rate_option(gval);
- else if (strcmp(name, "VideoFramerate") == 0)
- return lookup_video_rate_option(gval);
- else if (strcmp(name, "AudioMixdown") == 0)
- return lookup_mix_option(gval);
 else if (strcmp(name, "SrtLanguage") == 0)
 return lookup_audio_lang_option(gval);
- else if (strcmp(name, "PreferredLanguage") == 0)
- return lookup_audio_lang_option(gval);
- else if (strcmp(name, "VideoEncoder") == 0)
- return lookup_hb_encoder_option(gval, hb_video_encoders, hb_video_encoders_count);
- else if (strcmp(name, "AudioEncoder") == 0)
- return lookup_hb_encoder_option(gval, hb_audio_encoders, hb_audio_encoders_count);
- else if (strcmp(name, "AudioEncoderFallback") == 0)
- return lookup_hb_encoder_option(gval, hb_audio_encoders, hb_audio_encoders_count);
- else if (strcmp(name, "AudioEncoderActual") == 0)
- return lookup_hb_encoder_option(gval, hb_audio_encoders, hb_audio_encoders_count);
 else
 {
 return lookup_generic_option(find_combo_table(name), gval);
@@ -2917,26 +2489,8 @@
 {
 if (gval == NULL)
 return NULL;
- if (strcmp(name, "AudioBitrate") == 0)
- return lookup_audio_bitrate_option(gval);
- else if (strcmp(name, "AudioSamplerate") == 0)
- return lookup_audio_rate_string(gval);
- else if (strcmp(name, "VideoFramerate") == 0)
- return lookup_video_rate_option(gval);
- else if (strcmp(name, "AudioMixdown") == 0)
- return lookup_mix_string(gval);
 else if (strcmp(name, "SrtLanguage") == 0)
 return lookup_audio_lang_option(gval);
- else if (strcmp(name, "PreferredLanguage") == 0)
- return lookup_audio_lang_option(gval);
- else if (strcmp(name, "VideoEncoder") == 0)
- return lookup_hb_encoder_string(gval, hb_video_encoders, hb_video_encoders_count);
- else if (strcmp(name, "AudioEncoder") == 0)
- return lookup_hb_encoder_string(gval, hb_audio_encoders, hb_audio_encoders_count);
- else if (strcmp(name, "AudioEncoderFallback") == 0)
- return lookup_hb_encoder_string(gval, hb_audio_encoders, hb_audio_encoders_count);
- else if (strcmp(name, "AudioEncoderActual") == 0)
- return lookup_hb_encoder_string(gval, hb_audio_encoders, hb_audio_encoders_count);
 else
 {
 return lookup_generic_string(find_combo_table(name), gval);
@@ -2945,11 +2499,34 @@
 return NULL;
 }
 
+void ghb_init_lang_list_box(GtkListBox *list_box)
+{
+ int ii;
+
+ for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
+ {
+ const char *lang;
+ if (ghb_language_table[ii].native_name != NULL &&
+ ghb_language_table[ii].native_name[0] != 0)
+ {
+ lang = ghb_language_table[ii].native_name;
+ }
+ else
+ {
+ lang = ghb_language_table[ii].eng_name;
+ }
+ GtkWidget *label = gtk_label_new(lang);
+ g_object_set_data(G_OBJECT(label), "lang_idx", (gpointer)(intptr_t)ii);
+ gtk_widget_show(label);
+ gtk_list_box_insert(list_box, label, -1);
+ }
+}
+
 void
 ghb_update_ui_combo_box(
- signal_user_data_t *ud, 
- const gchar *name, 
- gint user_data, 
+ signal_user_data_t *ud,
+ const gchar *name,
+ const void *user_data,
 gboolean all)
 {
 GtkComboBox *combo = NULL;
@@ -2957,7 +2534,7 @@
 gint handler_id = 0;
 
 if (name != NULL)
- { 
+ {
 g_debug("ghb_update_ui_combo_box() %s\n", name);
 // Clearing a combo box causes a rash of "changed" events, even when
 // the active item is -1 (inactive). To control things, I'm disabling
@@ -2967,7 +2544,7 @@
 if (signal_id > 0)
 {
 // Valid signal id found. This should always succeed.
- handler_id = g_signal_handler_find ((gpointer)combo, G_SIGNAL_MATCH_ID, 
+ handler_id = g_signal_handler_find ((gpointer)combo, G_SIGNAL_MATCH_ID,
 signal_id, 0, 0, 0, 0);
 if (handler_id > 0)
 {
@@ -2975,35 +2552,37 @@
 g_signal_handler_block ((gpointer)combo, handler_id);
 }
 }
- } 
+ }
 if (all)
 {
 audio_bitrate_opts_set(ud->builder, "AudioBitrate");
- audio_samplerate_opts_set(ud->builder, "AudioSamplerate", hb_audio_rates, hb_audio_rates_count);
- video_rate_opts_set(ud->builder, "VideoFramerate", hb_video_rates, hb_video_rates_count);
+ audio_samplerate_opts_set(ud->builder, "AudioSamplerate");
+ video_framerate_opts_set(ud->builder, "VideoFramerate");
 mix_opts_set(ud->builder, "AudioMixdown");
- hb_encoder_opts_set(ud->builder, "VideoEncoder", hb_video_encoders, hb_video_encoders_count);
- hb_encoder_opts_set(ud->builder, "AudioEncoder", hb_audio_encoders, hb_audio_encoders_count);
+ video_encoder_opts_set(ud->builder, "VideoEncoder");
+ audio_encoder_opts_set(ud->builder, "AudioEncoder");
 acodec_fallback_opts_set(ud->builder, "AudioEncoderFallback");
 language_opts_set(ud->builder, "SrtLanguage");
- language_opts_set(ud->builder, "PreferredLanguage");
 srt_codeset_opts_set(ud->builder, "SrtCodeset");
 title_opts_set(ud->builder, "title");
 audio_track_opts_set(ud->builder, "AudioTrack", user_data);
 subtitle_track_opts_set(ud->builder, "SubtitleTrack", user_data);
- generic_opts_set(ud->builder, "VideoQualityGranularity", &vqual_granularity_opts);
- generic_opts_set(ud->builder, "PtoPType", &point_to_point_opts);
- generic_opts_set(ud->builder, "WhenComplete", &when_complete_opts);
- generic_opts_set(ud->builder, "PicturePAR", &par_opts);
- generic_opts_set(ud->builder, "PictureModulus", &alignment_opts);
- generic_opts_set(ud->builder, "LoggingLevel", &logging_opts);
- generic_opts_set(ud->builder, "LogLongevity", &log_longevity_opts);
- generic_opts_set(ud->builder, "check_updates", &appcast_update_opts);
- generic_opts_set(ud->builder, "FileFormat", &container_opts);
- generic_opts_set(ud->builder, "PictureDeinterlace", &deint_opts);
- generic_opts_set(ud->builder, "PictureDetelecine", &detel_opts);
- generic_opts_set(ud->builder, "PictureDecomb", &decomb_opts);
- generic_opts_set(ud->builder, "PictureDenoise", &denoise_opts);
+ small_opts_set(ud->builder, "VideoQualityGranularity", &vqual_granularity_opts);
+ small_opts_set(ud->builder, "SubtitleTrackSelectionBehavior", &subtitle_track_sel_opts);
+ small_opts_set(ud->builder, "AudioTrackSelectionBehavior", &audio_track_sel_opts);
+ small_opts_set(ud->builder, "PtoPType", &point_to_point_opts);
+ small_opts_set(ud->builder, "WhenComplete", &when_complete_opts);
+ small_opts_set(ud->builder, "PicturePAR", &par_opts);
+ small_opts_set(ud->builder, "PictureModulus", &alignment_opts);
+ small_opts_set(ud->builder, "LoggingLevel", &logging_opts);
+ small_opts_set(ud->builder, "LogLongevity", &log_longevity_opts);
+ small_opts_set(ud->builder, "check_updates", &appcast_update_opts);
+ small_opts_set(ud->builder, "PictureDeinterlace", &deint_opts);
+ small_opts_set(ud->builder, "PictureDetelecine", &detel_opts);
+ small_opts_set(ud->builder, "PictureDecomb", &decomb_opts);
+ small_opts_set(ud->builder, "PictureDenoiseFilter", &denoise_opts);
+ small_opts_set(ud->builder, "PictureDenoisePreset", &denoise_preset_opts);
+ small_opts_set(ud->builder, "PictureDenoiseTune", &nlmeans_tune_opts);
 small_opts_set(ud->builder, "x264_direct", &direct_opts);
 small_opts_set(ud->builder, "x264_b_adapt", &badapt_opts);
 small_opts_set(ud->builder, "x264_bpyramid", &bpyramid_opts);
@@ -3012,30 +2591,29 @@
 small_opts_set(ud->builder, "x264_subme", &subme_opts);
 small_opts_set(ud->builder, "x264_analyse", &analyse_opts);
 small_opts_set(ud->builder, "x264_trellis", &trellis_opts);
- x264_tune_opts_set(ud->builder, "x264Tune");
- h264_profile_opts_set(ud->builder, "h264Profile");
- h264_level_opts_set(ud->builder, "h264Level");
+ video_tune_opts_set(ud, "VideoTune");
+ video_profile_opts_set(ud, "VideoProfile");
+ video_level_opts_set(ud, "VideoLevel");
+ container_opts_set(ud->builder, "FileFormat");
 }
 else
 {
 if (strcmp(name, "AudioBitrate") == 0)
 audio_bitrate_opts_set(ud->builder, "AudioBitrate");
 else if (strcmp(name, "AudioSamplerate") == 0)
- audio_samplerate_opts_set(ud->builder, "AudioSamplerate", hb_audio_rates, hb_audio_rates_count);
+ audio_samplerate_opts_set(ud->builder, "AudioSamplerate");
 else if (strcmp(name, "VideoFramerate") == 0)
- video_rate_opts_set(ud->builder, "VideoFramerate", hb_video_rates, hb_video_rates_count);
+ video_framerate_opts_set(ud->builder, "VideoFramerate");
 else if (strcmp(name, "AudioMixdown") == 0)
 mix_opts_set(ud->builder, "AudioMixdown");
 else if (strcmp(name, "VideoEncoder") == 0)
- hb_encoder_opts_set(ud->builder, "VideoEncoder", hb_video_encoders, hb_video_encoders_count);
+ video_encoder_opts_set(ud->builder, "VideoEncoder");
 else if (strcmp(name, "AudioEncoder") == 0)
- hb_encoder_opts_set(ud->builder, "AudioEncoder", hb_audio_encoders, hb_audio_encoders_count);
+ audio_encoder_opts_set(ud->builder, "AudioEncoder");
 else if (strcmp(name, "AudioEncoderFallback") == 0)
 acodec_fallback_opts_set(ud->builder, "AudioEncoderFallback");
 else if (strcmp(name, "SrtLanguage") == 0)
 language_opts_set(ud->builder, "SrtLanguage");
- else if (strcmp(name, "PreferredLanguage") == 0)
- language_opts_set(ud->builder, "PreferredLanguage");
 else if (strcmp(name, "SrtCodeset") == 0)
 srt_codeset_opts_set(ud->builder, "SrtCodeset");
 else if (strcmp(name, "title") == 0)
@@ -3044,21 +2622,23 @@
 subtitle_track_opts_set(ud->builder, "SubtitleTrack", user_data);
 else if (strcmp(name, "AudioTrack") == 0)
 audio_track_opts_set(ud->builder, "AudioTrack", user_data);
- else if (strcmp(name, "x264Tune") == 0)
- x264_tune_opts_set(ud->builder, "x264Tune");
- else if (strcmp(name, "h264Profile") == 0)
- h264_profile_opts_set(ud->builder, "h264Profile");
- else if (strcmp(name, "h264Level") == 0)
- h264_level_opts_set(ud->builder, "h264Level");
+ else if (strcmp(name, "VideoTune") == 0)
+ video_tune_opts_set(ud, "VideoTune");
+ else if (strcmp(name, "VideoProfile") == 0)
+ video_profile_opts_set(ud, "VideoProfile");
+ else if (strcmp(name, "VideoLevel") == 0)
+ video_level_opts_set(ud, "VideoLevel");
+ else if (strcmp(name, "FileFormat") == 0)
+ container_opts_set(ud->builder, "FileFormat");
 else
- generic_opts_set(ud->builder, name, find_combo_table(name));
+ small_opts_set(ud->builder, name, find_combo_table(name));
 }
 if (handler_id > 0)
 {
 g_signal_handler_unblock ((gpointer)combo, handler_id);
 }
 }
- 
+
 static void
 init_ui_combo_boxes(GtkBuilder *builder)
 {
@@ -3069,16 +2649,17 @@
 init_combo_box(builder, "VideoFramerate");
 init_combo_box(builder, "AudioMixdown");
 init_combo_box(builder, "SrtLanguage");
- init_combo_box(builder, "PreferredLanguage");
 init_combo_box(builder, "SrtCodeset");
 init_combo_box(builder, "title");
 init_combo_box(builder, "AudioTrack");
+ init_combo_box(builder, "SubtitleTrack");
 init_combo_box(builder, "VideoEncoder");
 init_combo_box(builder, "AudioEncoder");
 init_combo_box(builder, "AudioEncoderFallback");
- init_combo_box(builder, "x264Tune");
- init_combo_box(builder, "h264Profile");
- init_combo_box(builder, "h264Level");
+ init_combo_box(builder, "VideoTune");
+ init_combo_box(builder, "VideoProfile");
+ init_combo_box(builder, "VideoLevel");
+ init_combo_box(builder, "FileFormat");
 for (ii = 0; combo_name_map[ii].name != NULL; ii++)
 {
 init_combo_box(builder, combo_name_map[ii].name);
@@ -3090,95 +2671,70 @@
 gchar*
 ghb_build_advanced_opts_string(GValue *settings)
 {
- gchar *result;
-
- gint vcodec = ghb_settings_combo_int(settings, "VideoEncoder");
-
+ gint vcodec;
+ vcodec = ghb_settings_video_encoder_codec(settings, "VideoEncoder");
 switch (vcodec)
 {
 case HB_VCODEC_X264:
- {
- gchar *opts = ghb_settings_get_string(settings, "x264Option");
- if (opts != NULL)
- {
- result = opts;
- }
- else
- {
- result = g_strdup("");
- }
- } break;
-
- case HB_VCODEC_FFMPEG_MPEG2:
- case HB_VCODEC_FFMPEG_MPEG4:
- {
- gchar *opts = ghb_settings_get_string(settings, "lavcOption");
- if (opts != NULL)
- {
- result = opts;
- }
- else
- {
- result = g_strdup("");
- }
- } break;
+ return ghb_settings_get_string(settings, "x264Option");
 
- case HB_VCODEC_THEORA:
 default:
- {
- result = g_strdup("");
- } break;
+ return NULL;
 }
- return result;
 }
 
 void ghb_set_video_encoder_opts(hb_job_t *job, GValue *js)
 {
- gint vcodec = ghb_settings_combo_int(js, "VideoEncoder");
+ gint vcodec = ghb_settings_video_encoder_codec(js, "VideoEncoder");
 
 switch (vcodec)
 {
+ case HB_VCODEC_X265:
 case HB_VCODEC_X264:
 {
- if (ghb_settings_get_boolean(js, "x264UseAdvancedOptions"))
+ if (vcodec == HB_VCODEC_X264 &&
+ ghb_settings_get_boolean(js, "x264UseAdvancedOptions"))
 {
 char *opts = ghb_settings_get_string(js, "x264Option");
- hb_job_set_advanced_opts(job, opts);
+ hb_job_set_encoder_options(job, opts);
 g_free(opts);
 }
 else
 {
 GString *str = g_string_new("");
- char *preset = ghb_settings_get_string(js, "x264Preset");
- char *tune = ghb_settings_get_string(js, "x264Tune");
- char *profile = ghb_settings_get_string(js, "h264Profile");
- char *level = ghb_settings_get_string(js, "h264Level");
- char *opts = ghb_settings_get_string(js, "x264OptionExtra");
+ char *preset = ghb_settings_get_string(js, "VideoPreset");
+ char *tune = ghb_settings_get_string(js, "VideoTune");
+ char *profile = ghb_settings_get_string(js, "VideoProfile");
+ char *level = ghb_settings_get_string(js, "VideoLevel");
+ char *opts = ghb_settings_get_string(js, "VideoOptionExtra");
 char *tunes;
 
 g_string_append_printf(str, "%s", tune);
- if (ghb_settings_get_boolean(js, "x264FastDecode"))
+ if (vcodec == HB_VCODEC_X264)
 {
- g_string_append_printf(str, "%s%s", str->str[0] ? "," : "", "fastdecode");
- }
- if (ghb_settings_get_boolean(js, "x264ZeroLatency"))
- {
- g_string_append_printf(str, "%s%s", str->str[0] ? "," : "", "zerolatency");
+ if (ghb_settings_get_boolean(js, "x264FastDecode"))
+ {
+ g_string_append_printf(str, "%s%s", str->str[0] ? "," : "", "fastdecode");
+ }
+ if (ghb_settings_get_boolean(js, "x264ZeroLatency"))
+ {
+ g_string_append_printf(str, "%s%s", str->str[0] ? "," : "", "zerolatency");
+ }
 }
 tunes = g_string_free(str, FALSE);
 
- hb_job_set_x264_preset(job, preset);
+ hb_job_set_encoder_preset(job, preset);
 
 if (tunes != NULL && strcasecmp(tune, "none"))
- hb_job_set_x264_tune(job, tunes);
+ hb_job_set_encoder_tune(job, tunes);
 
 if (profile != NULL && strcasecmp(profile, "auto"))
- hb_job_set_h264_profile(job, profile);
+ hb_job_set_encoder_profile(job, profile);
 
 if (level != NULL && strcasecmp(level, "auto"))
- hb_job_set_h264_level(job, level);
+ hb_job_set_encoder_level(job, level);
 
- hb_job_set_advanced_opts(job, opts);
+ hb_job_set_encoder_options(job, opts);
 
 g_free(preset);
 g_free(tune);
@@ -3191,11 +2747,12 @@
 
 case HB_VCODEC_FFMPEG_MPEG2:
 case HB_VCODEC_FFMPEG_MPEG4:
+ case HB_VCODEC_FFMPEG_VP8:
 {
- gchar *opts = ghb_settings_get_string(js, "lavcOption");
+ gchar *opts = ghb_settings_get_string(js, "VideoOptionExtra");
 if (opts != NULL && opts[0])
 {
- hb_job_set_advanced_opts(job, opts);
+ hb_job_set_encoder_options(job, opts);
 }
 g_free(opts);
 } break;
@@ -3208,15 +2765,13 @@
 }
 
 void
-ghb_part_duration(gint tt, gint sc, gint ec, gint *hh, gint *mm, gint *ss)
+ghb_part_duration(const hb_title_t *title, gint sc, gint ec, gint *hh, gint *mm, gint *ss)
 {
- hb_title_t * title;
 hb_chapter_t * chapter;
 gint count, c;
 gint64 duration;
- 
+
 *hh = *mm = *ss = 0;
- title = ghb_get_title_info( tt );
 if (title == NULL) return;
 
 *hh = title->hours;
@@ -3242,38 +2797,47 @@
 *ss = (duration / 90000) % 60;
 }
 
-void
-ghb_get_chapter_duration(gint ti, gint ii, gint *hh, gint *mm, gint *ss)
+gint64
+ghb_get_chapter_duration(const hb_title_t *title, gint chap)
 {
- hb_title_t * title;
 hb_chapter_t * chapter;
 gint count;
- 
- g_debug("ghb_get_chapter_duration (title = %d)\n", ti);
- *hh = *mm = *ss = 0;
- title = ghb_get_title_info( ti );
- if (title == NULL) return;
+
+ if (title == NULL) return 0;
 count = hb_list_count( title->list_chapter );
- if (ii >= count) return;
- chapter = hb_list_item(title->list_chapter, ii);
- if (chapter == NULL) return;
- *hh = chapter->hours;
- *mm = chapter->minutes;
- *ss = chapter->seconds;
+ if (chap >= count) return 0;
+ chapter = hb_list_item(title->list_chapter, chap);
+ if (chapter == NULL) return 0;
+ return chapter->duration;
+}
+
+gint64
+ghb_get_chapter_start(const hb_title_t *title, gint chap)
+{
+ hb_chapter_t * chapter;
+ gint count, ii;
+ gint64 start = 0;
+
+ if (title == NULL) return 0;
+ count = hb_list_count( title->list_chapter );
+ if (chap > count) return chap = count;
+ for (ii = 0; ii < chap; ii++)
+ {
+ chapter = hb_list_item(title->list_chapter, ii);
+ start += chapter->duration;
+ }
+ return start;
 }
 
 GValue*
-ghb_get_chapters(gint titleindex)
+ghb_get_chapters(const hb_title_t *title)
 {
- hb_title_t * title;
 hb_chapter_t * chapter;
 gint count, ii;
 GValue *chapters = NULL;
- 
- g_debug("ghb_get_chapters (title = %d)\n", titleindex);
+
 chapters = ghb_array_value_new(0);
 
- title = ghb_get_title_info( titleindex );
 if (title == NULL) return chapters;
 count = hb_list_count( title->list_chapter );
 for (ii = 0; ii < count; ii++)
@@ -3283,11 +2847,11 @@
 if (chapter->title == NULL || chapter->title[0] == 0)
 {
 gchar *str;
- str = g_strdup_printf ("Chapter %2d", ii+1);
+ str = g_strdup_printf (_("Chapter %2d"), ii+1);
 ghb_array_append(chapters, ghb_string_value_new(str));
 g_free(str);
 }
- else 
+ else
 {
 ghb_array_append(chapters, ghb_string_value_new(chapter->title));
 }
@@ -3307,63 +2871,94 @@
 gint acodec;
 
 asettings = ghb_array_get_nth(audio_list, ii);
- acodec = ghb_settings_combo_int(asettings, "AudioEncoder");
+ acodec = ghb_settings_audio_encoder_codec(asettings, "AudioEncoder");
 if (acodec & HB_ACODEC_AC3)
 return TRUE;
 }
 return FALSE;
 }
 
+static char custom_audio_bitrate_str[8];
+static hb_rate_t custom_audio_bitrate =
+{
+ .name = custom_audio_bitrate_str,
+ .rate = 0
+};
+
 static void
 audio_bitrate_opts_add(GtkBuilder *builder, const gchar *name, gint rate)
 {
 GtkTreeIter iter;
 GtkListStore *store;
 gchar *str;
- 
+
 g_debug("audio_bitrate_opts_add ()\n");
 
 if (rate >= 0 && rate < 8) return;
 
- if (ghb_audio_bitrates[hb_audio_bitrates_count].string)
- {
- g_free((char*)ghb_audio_bitrates[hb_audio_bitrates_count].string);
- }
- ghb_audio_bitrates[hb_audio_bitrates_count].rate = rate;
+ custom_audio_bitrate.rate = rate;
 if (rate < 0)
 {
- ghb_audio_bitrates[hb_audio_bitrates_count].string = 
- g_strdup_printf("N/A");
+ snprintf(custom_audio_bitrate_str, 8, _("N/A"));
 }
 else
 {
- ghb_audio_bitrates[hb_audio_bitrates_count].string = 
- g_strdup_printf("%d", rate);
+ snprintf(custom_audio_bitrate_str, 8, "%d", rate);
 }
- ghb_audio_bitrates_count = hb_audio_bitrates_count + 1;
 
- store = get_combo_box_store(builder, name);
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
 if (!find_combo_item_by_int(GTK_TREE_MODEL(store), rate, &iter))
 {
- str = g_strdup_printf ("%s",
- ghb_audio_bitrates[hb_audio_bitrates_count].string);
+ str = g_strdup_printf ("%s", custom_audio_bitrate.name);
 gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
- 0, str, 
- 1, TRUE, 
- 2, ghb_audio_bitrates[hb_audio_bitrates_count].string, 
- 3, (gdouble)rate, 
- 4, ghb_audio_bitrates[hb_audio_bitrates_count].string, 
+ gtk_list_store_set(store, &iter,
+ 0, str,
+ 1, TRUE,
+ 2, custom_audio_bitrate.name,
+ 3, (gdouble)rate,
+ 4, custom_audio_bitrate.name,
 -1);
 g_free(str);
 }
 }
 
+void
+ghb_audio_bitrate_opts_filter(
+ GtkComboBox *combo,
+ gint first_rate,
+ gint last_rate)
+{
+ GtkTreeIter iter;
+ GtkListStore *store;
+ gdouble ivalue;
+ gboolean done = FALSE;
+
+ g_debug("audio_bitrate_opts_filter ()\n");
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
+ if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL(store), &iter))
+ {
+ do
+ {
+ gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 3, &ivalue, -1);
+ if ((int)ivalue < first_rate || (int)ivalue > last_rate)
+ {
+ gtk_list_store_set(store, &iter, 1, FALSE, -1);
+ }
+ else
+ {
+ gtk_list_store_set(store, &iter, 1, TRUE, -1);
+ }
+ done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
+ } while (!done);
+ }
+}
+
 static void
 audio_bitrate_opts_update(
- GtkBuilder *builder, 
- const gchar *name, 
- gint first_rate, 
+ GtkBuilder *builder,
+ const gchar *name,
+ gint first_rate,
 gint last_rate,
 gint extra_rate)
 {
@@ -3371,89 +2966,153 @@
 GtkListStore *store;
 gdouble ivalue;
 gboolean done = FALSE;
- gint ii = 0;
- guint last = (guint)last_rate;
- guint first = (guint)first_rate;
- 
- ghb_audio_bitrates_count = hb_audio_bitrates_count;
 
 g_debug("audio_bitrate_opts_clean ()\n");
- store = get_combo_box_store(builder, name);
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ ghb_audio_bitrate_opts_filter(combo, first_rate, last_rate);
+
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
 if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL(store), &iter))
 {
 do
 {
 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 3, &ivalue, -1);
- if (ivalue != first_rate && ivalue != last_rate && 
- !(ivalue == extra_rate && extra_rate >= first_rate) &&
- search_rates(
- ghb_audio_bitrates, ivalue, ghb_audio_bitrates_count) < 0)
+ if (!search_audio_bitrates(ivalue) && (ivalue != extra_rate))
 {
 done = !gtk_list_store_remove(store, &iter);
 }
- else if ((int)ivalue < first || (int)ivalue > last)
- {
- ii++;
- gtk_list_store_set(store, &iter, 1, FALSE, -1);
- done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
- }
 else
 {
- ii++;
- gtk_list_store_set(store, &iter, 1, TRUE, -1);
- done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
+ done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
 }
 } while (!done);
 }
- if (extra_rate >= first_rate)
+ if (extra_rate > 0 && !search_audio_bitrates(extra_rate))
+ {
 audio_bitrate_opts_add(builder, name, extra_rate);
+ }
+ else
+ {
+ custom_audio_bitrate.rate = 0;
+ custom_audio_bitrate_str[0] = 0;
+ }
 }
 
-static void
-audio_bitrate_opts_set(GtkBuilder *builder, const gchar *name)
+void
+ghb_audio_bitrate_opts_set(GtkComboBox *combo, gboolean extra)
 {
 GtkTreeIter iter;
 GtkListStore *store;
- gint ii;
 gchar *str;
- 
- ghb_audio_bitrates_count = hb_audio_bitrates_count;
- ghb_audio_bitrates = calloc(hb_audio_bitrates_count+1, sizeof(hb_rate_t));
-
- for (ii = 0; ii < hb_audio_bitrates_count; ii++)
- {
- ghb_audio_bitrates[ii] = hb_audio_bitrates[ii];
- }
 
 g_debug("audio_bitrate_opts_set ()\n");
- store = get_combo_box_store(builder, name);
+ store = GTK_LIST_STORE(gtk_combo_box_get_model (combo));
 gtk_list_store_clear(store);
- for (ii = 0; ii < ghb_audio_bitrates_count; ii++)
+
+ const hb_rate_t *rate;
+ for (rate = hb_audio_bitrate_get_next(NULL); rate != NULL;
+ rate = hb_audio_bitrate_get_next(rate))
 {
 gtk_list_store_append(store, &iter);
- str = g_strdup_printf ("%s", 
- ghb_audio_bitrates[ii].string);
- gtk_list_store_set(store, &iter, 
+ str = g_strdup_printf ("%s", rate->name);
+ gtk_list_store_set(store, &iter,
 0, str,
- 1, TRUE, 
- 2, ghb_audio_bitrates[ii].string, 
- 3, (gdouble)ghb_audio_bitrates[ii].rate, 
- 4, ghb_audio_bitrates[ii].string, 
+ 1, TRUE,
+ 2, rate->name,
+ 3, (gdouble)rate->rate,
+ 4, rate->name,
 -1);
 g_free(str);
 }
+ if (extra && custom_audio_bitrate.rate != 0)
+ {
+ gtk_list_store_append(store, &iter);
+ str = g_strdup_printf ("%s", custom_audio_bitrate.name);
+ gtk_list_store_set(store, &iter,
+ 0, str,
+ 1, TRUE,
+ 2, custom_audio_bitrate.name,
+ 3, (gdouble)custom_audio_bitrate.rate,
+ 4, custom_audio_bitrate.name,
+ -1);
+ g_free(str);
+ }
+}
+
+static void
+audio_bitrate_opts_set(GtkBuilder *builder, const gchar *name)
+{
+ GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name));
+ ghb_audio_bitrate_opts_set(combo, TRUE);
 }
 
 void
 ghb_set_bitrate_opts(
- GtkBuilder *builder, 
- gint first_rate, 
+ GtkBuilder *builder,
+ gint first_rate,
 gint last_rate,
 gint extra_rate)
 {
 audio_bitrate_opts_update(builder, "AudioBitrate", first_rate, last_rate, extra_rate);
 }
 
+const char*
+ghb_audio_bitrate_get_short_name(int rate)
+{
+ if (rate == custom_audio_bitrate.rate)
+ {
+ return custom_audio_bitrate.name;
+ }
+
+ const hb_rate_t *hb_rate, *first;
+ for (first = hb_rate = hb_audio_bitrate_get_next(NULL); hb_rate != NULL;
+ hb_rate = hb_audio_bitrate_get_next(hb_rate))
+ {
+ if (rate == hb_rate->rate)
+ {
+ return hb_rate->name;
+ }
+ }
+ return first->name;
+}
+
+const hb_rate_t*
+ghb_lookup_audio_bitrate(const char *name)
+{
+ // Now find the matching rate info
+ const hb_rate_t *hb_rate, *first;
+ for (first = hb_rate = hb_audio_bitrate_get_next(NULL); hb_rate != NULL;
+ hb_rate = hb_audio_bitrate_get_next(hb_rate))
+ {
+ if (!strncmp(name, hb_rate->name, 8))
+ {
+ return hb_rate;
+ }
+ }
+ // Return a default rate if nothing matches
+ return first;
+}
+
+int
+ghb_lookup_audio_bitrate_rate(const char *name)
+{
+ return ghb_lookup_audio_bitrate(name)->rate;
+}
+
+int
+ghb_settings_audio_bitrate_rate(const GValue *settings, const char *name)
+{
+ const char *rate_id = ghb_settings_get_const_string(settings, name);
+ return ghb_lookup_audio_bitrate_rate(rate_id);
+}
+
+const hb_rate_t*
+ghb_settings_audio_bitrate(const GValue *settings, const char *name)
+{
+ const char *rate_id = ghb_settings_get_const_string(settings, name);
+ return ghb_lookup_audio_bitrate(rate_id);
+}
+
 static ghb_status_t hb_status;
 
 void
@@ -3462,7 +3121,7 @@
 // Set up the list model for the combos
 init_ui_combo_boxes(ud->builder);
 // Populate all the combos
- ghb_update_ui_combo_box(ud, NULL, 0, TRUE);
+ ghb_update_ui_combo_box(ud, NULL, NULL, TRUE);
 }
 
 void
@@ -3550,7 +3209,7 @@
 memcpy(status, &hb_status, sizeof(ghb_status_t));
 }
 
-void 
+void
 ghb_track_status()
 {
 hb_state_t s_scan;
@@ -3597,7 +3256,7 @@
 case HB_STATE_PAUSED:
 hb_status.scan.state |= GHB_STATE_PAUSED;
 break;
- 
+
 case HB_STATE_MUXING:
 {
 hb_status.scan.state |= GHB_STATE_MUXING;
@@ -3629,7 +3288,7 @@
 // When a job is stopped, libhb removes it from the job list,
 // but does not remove other jobs that may be associated with it.
 // Associated jobs are taged in the sequence id.
- while ((job = hb_job(h_scan, 0)) != NULL) 
+ while ((job = hb_job(h_scan, 0)) != NULL)
 hb_rem( h_scan, job );
 } break;
 #undef p
@@ -3690,7 +3349,7 @@
 case HB_STATE_PAUSED:
 hb_status.queue.state |= GHB_STATE_PAUSED;
 break;
- 
+
 case HB_STATE_MUXING:
 {
 hb_status.queue.state |= GHB_STATE_MUXING;
@@ -3723,31 +3382,40 @@
 // When a job is stopped, libhb removes it from the job list,
 // but does not remove other jobs that may be associated with it.
 // Associated jobs are taged in the sequence id.
- while ((job = hb_job(h_queue, 0)) != NULL) 
+ while ((job = hb_job(h_queue, 0)) != NULL)
 hb_rem( h_queue, job );
 } break;
 #undef p
 }
 }
 
-hb_title_t *
-ghb_get_title_info(gint titleindex)
+hb_audio_config_t*
+ghb_get_audio_info(const hb_title_t *title, gint track)
 {
- hb_list_t * list;
+ if (title == NULL) return NULL;
+ if (!hb_list_count(title->list_audio))
+ {
+ return NULL;
+ }
+ return hb_list_audio_config_item(title->list_audio, track);
+}
 
- if (h_scan == NULL) return NULL;
- list = hb_get_titles( h_scan );
- if (list == NULL) return NULL;
- return hb_list_item( list, titleindex );
+hb_subtitle_t*
+ghb_get_subtitle_info(const hb_title_t *title, gint track)
+{
+ if (title == NULL) return NULL;
+ if (!hb_list_count(title->list_subtitle))
+ {
+ return NULL;
+ }
+ return hb_list_item(title->list_subtitle, track);
 }
 
-hb_audio_config_t*
-ghb_get_scan_audio_info(gint titleindex, gint audioindex)
+hb_list_t *
+ghb_get_title_list()
 {
- hb_audio_config_t *aconfig;
- 
- aconfig = get_hb_audio(h_scan, titleindex, audioindex);
- return aconfig;
+ if (h_scan == NULL) return NULL;
+ return hb_get_titles( h_scan );
 }
 
 gboolean
@@ -3767,11 +3435,11 @@
 gint
 ghb_get_default_acodec()
 {
- return HB_ACODEC_FAAC;
+ return HB_ACODEC_FFAAC;
 }
 
-static void
-picture_settings_deps(signal_user_data_t *ud)
+void
+ghb_picture_settings_deps(signal_user_data_t *ud)
 {
 gboolean autoscale, keep_aspect, enable_keep_aspect;
 gboolean enable_scale_width, enable_scale_height;
@@ -3780,20 +3448,21 @@
 GtkWidget *widget;
 
 pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR");
- enable_keep_aspect = (pic_par != 1 && pic_par != 2);
+ enable_keep_aspect = (pic_par != HB_ANAMORPHIC_STRICT &&
+ pic_par != HB_ANAMORPHIC_LOOSE);
 keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio");
 autoscale = ghb_settings_get_boolean(ud->settings, "autoscale");
 
- enable_scale_width = !autoscale && (pic_par != 1);
- enable_scale_height = !autoscale && (pic_par != 1);
- enable_disp_width = (pic_par == 3) && !keep_aspect;
- enable_par = (pic_par == 3) && !keep_aspect;
+ enable_scale_width = enable_scale_height =
+ !autoscale && (pic_par != HB_ANAMORPHIC_STRICT);
+ enable_disp_width = (pic_par == HB_ANAMORPHIC_CUSTOM) && !keep_aspect;
+ enable_par = (pic_par == HB_ANAMORPHIC_CUSTOM) && !keep_aspect;
 enable_disp_height = FALSE;
 
 widget = GHB_WIDGET(ud->builder, "PictureModulus");
- gtk_widget_set_sensitive(widget, pic_par != 1);
+ gtk_widget_set_sensitive(widget, pic_par != HB_ANAMORPHIC_STRICT);
 widget = GHB_WIDGET(ud->builder, "PictureLooseCrop");
- gtk_widget_set_sensitive(widget, pic_par != 1);
+ gtk_widget_set_sensitive(widget, pic_par != HB_ANAMORPHIC_STRICT);
 widget = GHB_WIDGET(ud->builder, "scale_width");
 gtk_widget_set_sensitive(widget, enable_scale_width);
 widget = GHB_WIDGET(ud->builder, "scale_height");
@@ -3809,7 +3478,7 @@
 widget = GHB_WIDGET(ud->builder, "PictureKeepRatio");
 gtk_widget_set_sensitive(widget, enable_keep_aspect);
 widget = GHB_WIDGET(ud->builder, "autoscale");
- gtk_widget_set_sensitive(widget, pic_par != 1);
+ gtk_widget_set_sensitive(widget, pic_par != HB_ANAMORPHIC_STRICT);
 }
 
 void
@@ -3835,52 +3504,57 @@
 void
 ghb_set_scale_settings(GValue *settings, gint mode)
 {
- hb_title_t * title;
- hb_job_t * job;
 gboolean keep_aspect;
 gint pic_par;
- gboolean autocrop, autoscale, noscale;
+ gboolean autocrop, autoscale, loosecrop;
 gint crop[4] = {0,};
- gint width, height, par_width, par_height;
+ gint width, height;
 gint crop_width, crop_height;
- gint aspect_n, aspect_d;
 gboolean keep_width = (mode & GHB_PIC_KEEP_WIDTH);
 gboolean keep_height = (mode & GHB_PIC_KEEP_HEIGHT);
 gint mod;
 gint max_width = 0;
 gint max_height = 0;
- 
+
 g_debug("ghb_set_scale ()\n");
 
 pic_par = ghb_settings_combo_int(settings, "PicturePAR");
- if (pic_par == 1)
+ if (pic_par == HB_ANAMORPHIC_STRICT)
 {
 ghb_settings_set_boolean(settings, "autoscale", TRUE);
 ghb_settings_set_int(settings, "PictureModulus", 2);
 ghb_settings_set_boolean(settings, "PictureLooseCrop", TRUE);
 }
- if (pic_par == 1 || pic_par == 2)
+ if (pic_par == HB_ANAMORPHIC_STRICT || pic_par == HB_ANAMORPHIC_LOOSE)
 {
 ghb_settings_set_boolean(settings, "PictureKeepRatio", TRUE);
 }
 
- gint titleindex;
+ int title_id, titleindex;
+ const hb_title_t * title;
 
- titleindex = ghb_settings_combo_int(settings, "title");
- title = ghb_get_title_info (titleindex);
+ title_id = ghb_settings_get_int(settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
 if (title == NULL) return;
 
- job = hb_job_init( title );
- if (job == NULL) return;
+ hb_geometry_t srcGeo, resultGeo;
+ hb_ui_geometry_t uiGeo;
+
+ srcGeo.width = title->width;
+ srcGeo.height = title->height;
+ srcGeo.par.num = title->pixel_aspect_width;
+ srcGeo.par.den = title->pixel_aspect_height;
 
 // First configure widgets
 mod = ghb_settings_combo_int(settings, "PictureModulus");
+ if (mod <= 0)
+ mod = 16;
 keep_aspect = ghb_settings_get_boolean(settings, "PictureKeepRatio");
 autocrop = ghb_settings_get_boolean(settings, "PictureAutoCrop");
 autoscale = ghb_settings_get_boolean(settings, "autoscale");
 // "Noscale" is a flag that says we prefer to crop extra to satisfy
 // alignment constraints rather than scaling to satisfy them.
- noscale = ghb_settings_get_boolean(settings, "PictureLooseCrop");
+ loosecrop = ghb_settings_get_boolean(settings, "PictureLooseCrop");
 // Align dimensions to either 16 or 2 pixels
 // The scaler crashes if the dimensions are not divisible by 2
 // x264 also will not accept dims that are not multiple of 2
@@ -3907,8 +3581,17 @@
 crop[1] = ghb_settings_get_int(settings, "PictureBottomCrop");
 crop[2] = ghb_settings_get_int(settings, "PictureLeftCrop");
 crop[3] = ghb_settings_get_int(settings, "PictureRightCrop");
+ // Prevent manual crop from creating too small an image
+ if (title->height - crop[0] < crop[1] + 16)
+ {
+ crop[0] = title->height - crop[1] - 16;
+ }
+ if (title->width - crop[2] < crop[3] + 16)
+ {
+ crop[2] = title->width - crop[3] - 16;
+ }
 }
- if (noscale)
+ if (loosecrop)
 {
 gint need1, need2;
 
@@ -3918,11 +3601,11 @@
 width = MOD_DOWN(crop_width, mod);
 height = MOD_DOWN(crop_height, mod);
 
- need1 = (crop_height - height) / 2;
+ need1 = EVEN((crop_height - height) / 2);
 need2 = crop_height - height - need1;
 crop[0] += need1;
 crop[1] += need2;
- need1 = (crop_width - width) / 2;
+ need1 = EVEN((crop_width - width) / 2);
 need2 = crop_width - width - need1;
 crop[2] += need1;
 crop[3] += need2;
@@ -3931,9 +3614,11 @@
 ghb_settings_set_int(settings, "PictureLeftCrop", crop[2]);
 ghb_settings_set_int(settings, "PictureRightCrop", crop[3]);
 }
- hb_reduce(&aspect_n, &aspect_d, 
- title->width * title->pixel_aspect_width, 
- title->height * title->pixel_aspect_height);
+ uiGeo.crop[0] = crop[0];
+ uiGeo.crop[1] = crop[1];
+ uiGeo.crop[2] = crop[2];
+ uiGeo.crop[3] = crop[3];
+
 crop_width = title->width - crop[2] - crop[3];
 crop_height = title->height - crop[0] - crop[1];
 if (autoscale)
@@ -3956,137 +3641,102 @@
 g_debug("max_width %d, max_height %d\n", max_width, max_height);
 
 if (width < 16)
- width = title->width - crop[2] - crop[3];
+ width = 16;
 if (height < 16)
- height = title->height - crop[0] - crop[1];
+ height = 16;
 
 width = MOD_ROUND(width, mod);
 height = MOD_ROUND(height, mod);
 
- job->anamorphic.mode = pic_par;
- if (pic_par)
+ uiGeo.mode = pic_par;
+ uiGeo.keep = 0;
+ if (keep_width)
+ uiGeo.keep |= HB_KEEP_WIDTH;
+ if (keep_height)
+ uiGeo.keep |= HB_KEEP_HEIGHT;
+ if (keep_aspect)
+ uiGeo.keep |= HB_KEEP_DISPLAY_ASPECT;
+ uiGeo.itu_par = 0;
+ uiGeo.modulus = mod;
+ uiGeo.width = width;
+ uiGeo.height = height;
+ uiGeo.maxWidth = max_width;
+ uiGeo.maxHeight = max_height;
+ uiGeo.par.num = title->pixel_aspect_width;
+ uiGeo.par.den = title->pixel_aspect_height;
+ uiGeo.dar.num = 0;
+ uiGeo.dar.den = 0;
+ if (pic_par != HB_ANAMORPHIC_NONE)
 {
- // The scaler crashes if the dimensions are not divisible by 2
- // Align mod 2. And so does something in x264_encoder_headers()
- job->modulus = mod;
- job->anamorphic.par_width = title->pixel_aspect_width;
- job->anamorphic.par_height = title->pixel_aspect_height;
- job->anamorphic.dar_width = 0;
- job->anamorphic.dar_height = 0;
-
- if (keep_height && pic_par == 2)
- {
- width = ((double)height * crop_width / crop_height);
- width = MOD_ROUND(width, mod);
- }
- job->width = width;
- job->height = height;
- job->maxWidth = max_width;
- job->maxHeight = max_height;
- job->crop[0] = crop[0];
- job->crop[1] = crop[1];
- job->crop[2] = crop[2];
- job->crop[3] = crop[3];
- if (job->anamorphic.mode == 3 && !keep_aspect)
+ if (pic_par == HB_ANAMORPHIC_CUSTOM && !keep_aspect)
 {
- job->anamorphic.keep_display_aspect = 0;
 if (mode & GHB_PIC_KEEP_PAR)
 {
- job->anamorphic.par_width = 
+ uiGeo.par.num =
 ghb_settings_get_int(settings, "PicturePARWidth");
- job->anamorphic.par_height = 
+ uiGeo.par.den =
 ghb_settings_get_int(settings, "PicturePARHeight");
 }
- else
+ else if (mode & (GHB_PIC_KEEP_DISPLAY_HEIGHT |
+ GHB_PIC_KEEP_DISPLAY_WIDTH))
 {
- job->anamorphic.dar_width = 
- ghb_settings_get_int(settings, "PictureDisplayWidth");
- job->anamorphic.dar_height = height;
+ uiGeo.dar.num =
+ ghb_settings_get_int(settings, "PictureDisplayWidth");
+ uiGeo.dar.den = height;
 }
 }
 else
 {
- job->anamorphic.keep_display_aspect = 1;
- }
- // hb_set_anamorphic_size will adjust par, dar, and width/height
- // to conform to job parameters that have been set, including 
- // maxWidth and maxHeight
- hb_set_anamorphic_size(job, &width, &height, &par_width, &par_height);
- if (job->anamorphic.mode == 3 && !keep_aspect && 
- mode & GHB_PIC_KEEP_PAR)
- {
- // hb_set_anamorphic_size reduces the par, which we
- // don't want in this case because the user is
- // explicitely specifying it.
- par_width = ghb_settings_get_int(settings, "PicturePARWidth");
- par_height = ghb_settings_get_int(settings, "PicturePARHeight");
- }
- }
- else 
- {
- // Adjust dims according to max values
- if (max_height) height = MIN(height, max_height);
- if (max_width) width = MIN(width, max_width);
-
- if (keep_aspect)
- {
- gdouble par;
- gint new_width, new_height;
- 
- // Compute pixel aspect ration. 
- par = (gdouble)(title->height * aspect_n) / (title->width * aspect_d);
- // Must scale so that par becomes 1:1
- // Try to keep largest dimension
- new_height = (crop_height * ((gdouble)width/crop_width) / par);
- new_width = (crop_width * ((gdouble)height/crop_height) * par);
-
- if (max_width && new_width > max_width)
- {
- height = new_height;
- }
- else if (max_height && new_height > max_height)
- {
- width = new_width;
- }
- else if (keep_width)
- {
- height = new_height;
- }
- else if (keep_height)
- {
- width = new_width;
- }
- else if (width > new_width)
- {
- height = new_height;
- }
- else
- {
- width = new_width;
- }
- g_debug("new w %d h %d\n", width, height);
+ uiGeo.keep |= HB_KEEP_DISPLAY_ASPECT;
 }
- width = MOD_ROUND(width, mod);
- height = MOD_ROUND(height, mod);
- if (max_height)
- height = MIN(height, max_height);
- if (max_width)
- width = MIN(width, max_width);
- par_width = par_height = 1;
 }
- ghb_settings_set_int(settings, "scale_width", width);
- ghb_settings_set_int(settings, "scale_height", height);
+ // hb_set_anamorphic_size will adjust par, dar, and width/height
+ // to conform to job parameters that have been set, including
+ // maxWidth and maxHeight
+ hb_set_anamorphic_size2(&srcGeo, &uiGeo, &resultGeo);
+
+ ghb_settings_set_int(settings, "scale_width", resultGeo.width);
+ ghb_settings_set_int(settings, "scale_height", resultGeo.height);
 
 gint disp_width;
 
- disp_width = ((gdouble)par_width / par_height) * width + 0.5;
- ghb_limit_rational(&par_width, &par_height, 65535);
+ disp_width = ((gdouble)resultGeo.par.num / resultGeo.par.den) *
+ resultGeo.width + 0.5;
 
- ghb_settings_set_int(settings, "PicturePARWidth", par_width);
- ghb_settings_set_int(settings, "PicturePARHeight", par_height);
+ ghb_settings_set_int(settings, "PicturePARWidth", resultGeo.par.num);
+ ghb_settings_set_int(settings, "PicturePARHeight", resultGeo.par.den);
 ghb_settings_set_int(settings, "PictureDisplayWidth", disp_width);
- ghb_settings_set_int(settings, "PictureDisplayHeight", height);
- hb_job_close( &job );
+ ghb_settings_set_int(settings, "PictureDisplayHeight", resultGeo.height);
+}
+
+void
+ghb_update_display_aspect_label(signal_user_data_t *ud)
+{
+ gint disp_width, disp_height, dar_width, dar_height;
+ gchar *str;
+
+ disp_width = ghb_settings_get_int(ud->settings, "PictureDisplayWidth");
+ disp_height = ghb_settings_get_int(ud->settings, "PictureDisplayHeight");
+ hb_reduce(&dar_width, &dar_height, disp_width, disp_height);
+ gint iaspect = dar_width * 9 / dar_height;
+ if (dar_width > 2 * dar_height)
+ {
+ str = g_strdup_printf("%.2f : 1", (gdouble)dar_width / dar_height);
+ }
+ else if (iaspect <= 16 && iaspect >= 15)
+ {
+ str = g_strdup_printf("%.2f : 9", (gdouble)dar_width * 9 / dar_height);
+ }
+ else if (iaspect <= 12 && iaspect >= 11)
+ {
+ str = g_strdup_printf("%.2f : 3", (gdouble)dar_width * 3 / dar_height);
+ }
+ else
+ {
+ str = g_strdup_printf("%d : %d", dar_width, dar_height);
+ }
+ ghb_ui_update(ud, "display_aspect", ghb_string_value(str));
+ g_free(str);
 }
 
 void
@@ -4096,7 +3746,7 @@
 ud->scale_busy = TRUE;
 
 ghb_set_scale_settings(ud->settings, mode);
- picture_settings_deps(ud);
+ ghb_picture_settings_deps(ud);
 
 // Step needs to be at least 2 because odd widths cause scaler crash
 // subsampled chroma requires even crop values.
@@ -4109,8 +3759,8 @@
 
 // "Noscale" is a flag that says we prefer to crop extra to satisfy
 // alignment constraints rather than scaling to satisfy them.
- gboolean noscale = ghb_settings_get_boolean(ud->settings, "PictureLooseCrop");
- if (noscale)
+ gboolean loosecrop = ghb_settings_get_boolean(ud->settings, "PictureLooseCrop");
+ if (loosecrop)
 {
 widget = GHB_WIDGET (ud->builder, "PictureTopCrop");
 gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
@@ -4133,113 +3783,68 @@
 gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), 2, 16);
 }
 
- ghb_ui_update_from_settings(ud->builder, "autoscale", ud->settings);
- ghb_ui_update_from_settings(ud->builder, "PictureModulus", ud->settings);
- ghb_ui_update_from_settings(ud->builder, "PictureLooseCrop", ud->settings);
- ghb_ui_update_from_settings(ud->builder, "PictureKeepRatio", ud->settings);
-
- ghb_ui_update_from_settings(ud->builder, "PictureTopCrop", ud->settings);
- ghb_ui_update_from_settings(ud->builder, "PictureBottomCrop", ud->settings);
- ghb_ui_update_from_settings(ud->builder, "PictureLeftCrop", ud->settings);
- ghb_ui_update_from_settings(ud->builder, "PictureRightCrop", ud->settings);
-
- ghb_ui_update_from_settings(ud->builder, "scale_width", ud->settings);
- ghb_ui_update_from_settings(ud->builder, "scale_height", ud->settings);
-
- ghb_ui_update_from_settings(ud->builder, "PicturePARWidth", ud->settings);
- ghb_ui_update_from_settings(ud->builder, "PicturePARHeight", ud->settings);
- ghb_ui_update_from_settings(ud->builder, "PictureDisplayWidth", ud->settings);
- ghb_ui_update_from_settings(ud->builder, "PictureDisplayHeight", ud->settings);
- gint disp_width, disp_height, dar_width, dar_height;
- gchar *str;
-
- disp_width = ghb_settings_get_int(ud->settings, "PictureDisplayWidth");
- disp_height = ghb_settings_get_int(ud->settings, "PictureDisplayHeight");
- hb_reduce(&dar_width, &dar_height, disp_width, disp_height);
- gint iaspect = dar_width * 9 / dar_height;
- if (dar_width > 2 * dar_height)
- {
- str = g_strdup_printf("%.2f : 1", (gdouble)dar_width / dar_height);
- }
- else if (iaspect <= 16 && iaspect >= 15)
- {
- str = g_strdup_printf("%.2f : 9", (gdouble)dar_width * 9 / dar_height);
- }
- else if (iaspect <= 12 && iaspect >= 11)
- {
- str = g_strdup_printf("%.2f : 3", (gdouble)dar_width * 3 / dar_height);
- }
- else
- {
- str = g_strdup_printf("%d : %d", dar_width, dar_height);
- }
- ghb_ui_update(ud, "display_aspect", ghb_string_value(str));
- g_free(str);
+ ghb_ui_update_from_settings(ud, "autoscale", ud->settings);
+ ghb_ui_update_from_settings(ud, "PictureModulus", ud->settings);
+ ghb_ui_update_from_settings(ud, "PictureLooseCrop", ud->settings);
+ ghb_ui_update_from_settings(ud, "PictureKeepRatio", ud->settings);
+
+ ghb_ui_update_from_settings(ud, "PictureTopCrop", ud->settings);
+ ghb_ui_update_from_settings(ud, "PictureBottomCrop", ud->settings);
+ ghb_ui_update_from_settings(ud, "PictureLeftCrop", ud->settings);
+ ghb_ui_update_from_settings(ud, "PictureRightCrop", ud->settings);
+
+ ghb_ui_update_from_settings(ud, "scale_width", ud->settings);
+ ghb_ui_update_from_settings(ud, "scale_height", ud->settings);
+
+ ghb_ui_update_from_settings(ud, "PicturePARWidth", ud->settings);
+ ghb_ui_update_from_settings(ud, "PicturePARHeight", ud->settings);
+ ghb_ui_update_from_settings(ud, "PictureDisplayWidth", ud->settings);
+ ghb_ui_update_from_settings(ud, "PictureDisplayHeight", ud->settings);
+ ghb_update_display_aspect_label(ud);
 ud->scale_busy = FALSE;
 }
 
 static void
-set_preview_job_settings(hb_job_t *job, GValue *settings)
+get_preview_geometry(signal_user_data_t *ud, const hb_title_t *title,
+ hb_geometry_t *srcGeo, hb_ui_geometry_t *uiGeo)
 {
- job->crop[0] = ghb_settings_get_int(settings, "PictureTopCrop");
- job->crop[1] = ghb_settings_get_int(settings, "PictureBottomCrop");
- job->crop[2] = ghb_settings_get_int(settings, "PictureLeftCrop");
- job->crop[3] = ghb_settings_get_int(settings, "PictureRightCrop");
-
- job->anamorphic.mode = ghb_settings_combo_int(settings, "PicturePAR");
- job->modulus = 
- ghb_settings_combo_int(settings, "PictureModulus");
- job->width = ghb_settings_get_int(settings, "scale_width");
- job->height = ghb_settings_get_int(settings, "scale_height");
- if (ghb_settings_get_boolean(settings, "preview_show_crop"))
- {
- gdouble xscale = (gdouble)job->width / 
- (gdouble)(job->title->width - job->crop[2] - job->crop[3]);
- gdouble yscale = (gdouble)job->height / 
- (gdouble)(job->title->height - job->crop[0] - job->crop[1]);
- 
- job->width += xscale * (job->crop[2] + job->crop[3]);
- job->height += yscale * (job->crop[0] + job->crop[1]);
- job->crop[0] = 0;
- job->crop[1] = 0;
- job->crop[2] = 0;
- job->crop[3] = 0;
- job->modulus = 2;
- }
-
- gboolean decomb_deint = ghb_settings_get_boolean(settings, "PictureDecombDeinterlace");
- if (decomb_deint)
- {
- gint decomb = ghb_settings_combo_int(settings, "PictureDecomb");
- job->deinterlace = (decomb == 0) ? 0 : 1;
- }
- else
- {
- gint deint = ghb_settings_combo_int(settings, "PictureDeinterlace");
- job->deinterlace = (deint == 0) ? 0 : 1;
- }
-
- gboolean keep_aspect;
- keep_aspect = ghb_settings_get_boolean(settings, "PictureKeepRatio");
- if (job->anamorphic.mode)
- {
- job->anamorphic.par_width = job->title->pixel_aspect_width;
- job->anamorphic.par_height = job->title->pixel_aspect_height;
- job->anamorphic.dar_width = 0;
- job->anamorphic.dar_height = 0;
-
- if (job->anamorphic.mode == 3 && !keep_aspect)
- {
- job->anamorphic.keep_display_aspect = 0;
- job->anamorphic.par_width = 
- ghb_settings_get_int(settings, "PicturePARWidth");
- job->anamorphic.par_height = 
- ghb_settings_get_int(settings, "PicturePARHeight");
- }
- else
- {
- job->anamorphic.keep_display_aspect = 1;
- }
+ srcGeo->width = title->width;
+ srcGeo->height = title->height;
+ srcGeo->par.num = title->pixel_aspect_width;
+ srcGeo->par.den = title->pixel_aspect_height;
+
+ uiGeo->mode = ghb_settings_combo_int(ud->settings, "PicturePAR");
+ uiGeo->keep = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio") ||
+ uiGeo->mode == HB_ANAMORPHIC_STRICT ||
+ uiGeo->mode == HB_ANAMORPHIC_LOOSE;
+ uiGeo->itu_par = 0;
+ uiGeo->modulus = ghb_settings_combo_int(ud->settings, "PictureModulus");
+ uiGeo->crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
+ uiGeo->crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
+ uiGeo->crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
+ uiGeo->crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
+ uiGeo->width = ghb_settings_get_int(ud->settings, "scale_width");
+ uiGeo->height = ghb_settings_get_int(ud->settings, "scale_height");
+ uiGeo->maxWidth = 0;
+ uiGeo->maxHeight = 0;
+ uiGeo->par.num = ghb_settings_get_int(ud->settings, "PicturePARWidth");
+ uiGeo->par.den = ghb_settings_get_int(ud->settings, "PicturePARHeight");
+ uiGeo->dar.num = 0;
+ uiGeo->dar.den = 0;
+ if (ghb_settings_get_boolean(ud->prefs, "preview_show_crop"))
+ {
+ gdouble xscale = (gdouble)uiGeo->width /
+ (title->width - uiGeo->crop[2] - uiGeo->crop[3]);
+ gdouble yscale = (gdouble)uiGeo->height /
+ (title->height - uiGeo->crop[0] - uiGeo->crop[1]);
+
+ uiGeo->width += xscale * (uiGeo->crop[2] + uiGeo->crop[3]);
+ uiGeo->height += yscale * (uiGeo->crop[0] + uiGeo->crop[1]);
+ uiGeo->crop[0] = 0;
+ uiGeo->crop[1] = 0;
+ uiGeo->crop[2] = 0;
+ uiGeo->crop[3] = 0;
+ uiGeo->modulus = 2;
 }
 }
 
@@ -4286,9 +3891,9 @@
 if (!ghb_validate_filter_string(str, -1))
 {
 message = g_strdup_printf(
- "Invalid Deinterlace Settings:\n\n%s\n",
+ _("Invalid Deinterlace Settings:\n\n%s\n"),
 str);
- ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+ ghb_message_dialog(GTK_MESSAGE_ERROR, message, _("Cancel"), NULL);
 g_free(message);
 g_free(str);
 return FALSE;
@@ -4303,9 +3908,9 @@
 if (!ghb_validate_filter_string(str, -1))
 {
 message = g_strdup_printf(
- "Invalid Detelecine Settings:\n\n%s\n",
+ _("Invalid Detelecine Settings:\n\n%s\n"),
 str);
- ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+ ghb_message_dialog(GTK_MESSAGE_ERROR, message, _("Cancel"), NULL);
 g_free(message);
 g_free(str);
 return FALSE;
@@ -4320,57 +3925,48 @@
 if (!ghb_validate_filter_string(str, -1))
 {
 message = g_strdup_printf(
- "Invalid Decomb Settings:\n\n%s\n",
+ _("Invalid Decomb Settings:\n\n%s\n"),
 str);
- ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+ ghb_message_dialog(GTK_MESSAGE_ERROR, message, _("Cancel"), NULL);
 g_free(message);
 g_free(str);
 return FALSE;
 }
 g_free(str);
 }
- // denois
- index = ghb_settings_combo_int(settings, "PictureDenoise");
- if (index == 1)
- {
- str = ghb_settings_get_string(settings, "PictureDenoiseCustom");
- if (!ghb_validate_filter_string(str, -1))
- {
- message = g_strdup_printf(
- "Invalid Denoise Settings:\n\n%s\n",
- str);
- ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
- g_free(str);
- g_free(message);
- return FALSE;
- }
- g_free(str);
- }
+ // denoise
+ // TODO
 return TRUE;
 }
 
 gboolean
 ghb_validate_video(GValue *settings)
 {
- gint vcodec, mux;
+ gint vcodec;
 gchar *message;
+ const char *mux_id;
+ const hb_container_t *mux;
+
+ mux_id = ghb_settings_get_const_string(settings, "FileFormat");
+ mux = ghb_lookup_container_by_name(mux_id);
 
- mux = ghb_settings_combo_int(settings, "FileFormat");
- vcodec = ghb_settings_combo_int(settings, "VideoEncoder");
- if ((mux == HB_MUX_MP4) && (vcodec == HB_VCODEC_THEORA))
+ vcodec = ghb_settings_video_encoder_codec(settings, "VideoEncoder");
+ if ((mux->format & HB_MUX_MASK_MP4) && (vcodec == HB_VCODEC_THEORA))
 {
 // mp4/theora combination is not supported.
 message = g_strdup_printf(
- "Theora is not supported in the MP4 container.\n\n"
+ _("Theora is not supported in the MP4 container.\n\n"
 "You should choose a different video codec or container.\n"
- "If you continue, FFMPEG will be chosen for you.");
- if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
+ "If you continue, FFMPEG will be chosen for you."));
+ if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, _("Cancel"), _("Continue")))
 {
 g_free(message);
 return FALSE;
 }
 g_free(message);
- ghb_settings_set_int(settings, "VideoEncoder", HB_VCODEC_FFMPEG_MPEG4);
+ vcodec = hb_video_encoder_get_default(mux->format);
+ ghb_settings_set_string(settings, "VideoEncoder",
+ hb_video_encoder_get_short_name(vcodec));
 }
 return TRUE;
 }
@@ -4378,17 +3974,16 @@
 gboolean
 ghb_validate_subtitles(GValue *settings)
 {
- hb_title_t * title;
+ gint title_id, titleindex;
+ const hb_title_t * title;
 gchar *message;
 
- gint titleindex;
-
- titleindex = ghb_settings_combo_int(settings, "title");
- title = ghb_get_title_info(titleindex);
+ title_id = ghb_settings_get_int(settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
 if (title == NULL)
 {
 /* No valid title, stop right there */
- g_message("No title found.\n");
+ g_message(_("No title found.\n"));
 return FALSE;
 }
 
@@ -4408,10 +4003,10 @@
 // MP4 can only handle burned vobsubs. make sure there isn't
 // already something burned in the list
 message = g_strdup_printf(
- "Only one subtitle may be burned into the video.\n\n"
+ _("Only one subtitle may be burned into the video.\n\n"
 "You should change your subtitle selections.\n"
- "If you continue, some subtitles will be lost.");
- if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
+ "If you continue, some subtitles will be lost."));
+ if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, _("Cancel"), _("Continue")))
 {
 g_free(message);
 return FALSE;
@@ -4431,11 +4026,11 @@
 if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR))
 {
 message = g_strdup_printf(
- "Srt file does not exist or not a regular file.\n\n"
+ _("Srt file does not exist or not a regular file.\n\n"
 "You should choose a valid file.\n"
- "If you continue, this subtitle will be ignored.");
- if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, 
- "Cancel", "Continue"))
+ "If you continue, this subtitle will be ignored."));
+ if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message,
+ _("Cancel"), _("Continue")))
 {
 g_free(message);
 return FALSE;
@@ -4451,21 +4046,24 @@
 gboolean
 ghb_validate_audio(GValue *settings)
 {
- hb_title_t * title;
+ gint title_id, titleindex;
+ const hb_title_t * title;
 gchar *message;
- GValue *value;
 
- gint titleindex;
-
- titleindex = ghb_settings_combo_int(settings, "title");
- title = ghb_get_title_info( titleindex );
+ title_id = ghb_settings_get_int(settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
 if (title == NULL)
 {
 /* No valid title, stop right there */
- g_message("No title found.\n");
+ g_message(_("No title found.\n"));
 return FALSE;
 }
- gint mux = ghb_settings_combo_int(settings, "FileFormat");
+
+ const char *mux_id;
+ const hb_container_t *mux;
+
+ mux_id = ghb_settings_get_const_string(settings, "FileFormat");
+ mux = ghb_lookup_container_by_name(mux_id);
 
 const GValue *audio_list;
 gint count, ii;
@@ -4476,25 +4074,26 @@
 {
 GValue *asettings;
 hb_audio_config_t *aconfig;
+ int track, codec;
 
 asettings = ghb_array_get_nth(audio_list, ii);
- gint track = ghb_settings_combo_int(asettings, "AudioTrack");
- gint codec = ghb_settings_combo_int(asettings, "AudioEncoder");
+ track = ghb_settings_get_int(asettings, "AudioTrack");
+ codec = ghb_settings_audio_encoder_codec(asettings, "AudioEncoder");
 if (codec == HB_ACODEC_AUTO_PASS)
 continue;
 
 aconfig = (hb_audio_config_t *) hb_list_audio_config_item(
 title->list_audio, track );
 if ( ghb_audio_is_passthru(codec) &&
- !(ghb_audio_can_passthru(aconfig->in.codec) && 
+ !(ghb_audio_can_passthru(aconfig->in.codec) &&
 (aconfig->in.codec & codec)))
 {
 // Not supported. AC3 is passthrough only, so input must be AC3
 message = g_strdup_printf(
- "The source does not support Pass-Thru.\n\n"
+ _("The source does not support Pass-Thru.\n\n"
 "You should choose a different audio codec.\n"
- "If you continue, one will be chosen for you.");
- if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
+ "If you continue, one will be chosen for you."));
+ if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, _("Cancel"), _("Continue")))
 {
 g_free(message);
 return FALSE;
@@ -4505,167 +4104,84 @@
 {
 codec = HB_ACODEC_AC3;
 }
- else if (mux == HB_MUX_MKV)
+ else if (mux->format & HB_MUX_MASK_MKV)
 {
 codec = HB_ACODEC_LAME;
 }
 else
 {
- codec = HB_ACODEC_FAAC;
+ codec = HB_ACODEC_FFAAC;
 }
- value = ghb_lookup_acodec_value(codec);
- ghb_settings_take_value(asettings, "AudioEncoder", value);
+ const char *name = hb_audio_encoder_get_short_name(codec);
+ ghb_settings_set_string(asettings, "AudioEncoder", name);
 }
 gchar *a_unsup = NULL;
 gchar *mux_s = NULL;
- if (mux == HB_MUX_MP4)
- { 
+ if (mux->format & HB_MUX_MASK_MP4)
+ {
 mux_s = "MP4";
 // mp4/vorbis|DTS combination is not supported.
 if (codec == HB_ACODEC_VORBIS)
 {
 a_unsup = "Vorbis";
- codec = HB_ACODEC_FAAC;
+ codec = HB_ACODEC_FFAAC;
 }
 }
 if (a_unsup)
 {
 message = g_strdup_printf(
- "%s is not supported in the %s container.\n\n"
+ _("%s is not supported in the %s container.\n\n"
 "You should choose a different audio codec.\n"
- "If you continue, one will be chosen for you.", a_unsup, mux_s);
- if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
+ "If you continue, one will be chosen for you."), a_unsup, mux_s);
+ if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, _("Cancel"), _("Continue")))
 {
 g_free(message);
 return FALSE;
 }
 g_free(message);
- value = ghb_lookup_acodec_value(codec);
- ghb_settings_take_value(asettings, "AudioEncoder", value);
+ const char *name = hb_audio_encoder_get_short_name(codec);
+ ghb_settings_set_string(asettings, "AudioEncoder", name);
 }
 
- gint mix = ghb_settings_combo_int (asettings, "AudioMixdown");
+ const hb_mixdown_t *mix;
+ mix = ghb_settings_mixdown(asettings, "AudioMixdown");
 
- gint jj;
 const gchar *mix_unsup = NULL;
- if (!hb_mixdown_is_supported(mix, codec, aconfig->in.channel_layout))
+ if (!hb_mixdown_is_supported(mix->amixdown, codec, aconfig->in.channel_layout))
 {
- for (jj = 0; jj < hb_audio_mixdowns_count; jj++)
- {
- if (mix == hb_audio_mixdowns[jj].amixdown)
- {
- {
- mix_unsup = hb_audio_mixdowns[jj].human_readable_name;
- }
- }
- }
+ mix_unsup = mix->name;
 }
 if (mix_unsup)
 {
 message = g_strdup_printf(
- "The source audio does not support %s mixdown.\n\n"
+ _("The source audio does not support %s mixdown.\n\n"
 "You should choose a different mixdown.\n"
- "If you continue, one will be chosen for you.", mix_unsup);
- if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
- {
- g_free(message);
- return FALSE;
- }
- g_free(message);
- mix = ghb_get_best_mix(aconfig, codec, mix);
- value = get_amix_value(mix);
- ghb_settings_take_value(asettings, "AudioMixdown", value);
- }
- }
- return TRUE;
-}
-
-gboolean
-ghb_validate_vquality(GValue *settings)
-{
- gint vcodec;
- gchar *message;
- gint min, max;
-
- if (ghb_settings_get_boolean(settings, "nocheckvquality")) return TRUE;
- vcodec = ghb_settings_combo_int(settings, "VideoEncoder");
- gdouble vquality;
- vquality = ghb_settings_get_double(settings, "VideoQualitySlider");
- if (ghb_settings_get_boolean(settings, "vquality_type_constant"))
- {
- switch (vcodec)
- {
- case HB_VCODEC_X264:
- {
- min = 16;
- max = 30;
- } break;
-
- case HB_VCODEC_FFMPEG_MPEG2:
- case HB_VCODEC_FFMPEG_MPEG4:
- {
- min = 1;
- max = 8;
- } break;
-
- case HB_VCODEC_THEORA:
- {
- min = 0;
- max = 63;
- } break;
-
- default:
- {
- min = 48;
- max = 62;
- } break;
- }
- if (vcodec == HB_VCODEC_X264 && vquality == 0.0)
- {
- message = g_strdup_printf(
- "Warning: lossless h.264 selected\n\n"
- "Lossless h.264 is not well supported by\n"
- "many players and editors.\n\n"
- "It will produce enormous output files.\n\n"
- "Are you sure you wish to use this setting?");
- if (!ghb_message_dialog(GTK_MESSAGE_QUESTION, message, 
- "Cancel", "Continue"))
- {
- g_free(message);
- return FALSE;
- }
- g_free(message);
- ghb_settings_set_string(settings, "h264Profile", "auto");
- }
- else if (vquality < min || vquality > max)
- {
- message = g_strdup_printf(
- "Interesting video quality choice: %d\n\n"
- "Typical values range from %d to %d.\n\n"
- "Are you sure you wish to use this setting?",
- (gint)vquality, min, max);
- if (!ghb_message_dialog(GTK_MESSAGE_QUESTION, message, 
- "Cancel", "Continue"))
+ "If you continue, one will be chosen for you."), mix_unsup);
+ if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, _("Cancel"), _("Continue")))
 {
 g_free(message);
 return FALSE;
 }
 g_free(message);
+ int amixdown = ghb_get_best_mix(aconfig, codec, mix->amixdown);
+ ghb_settings_set_string(asettings, "AudioMixdown",
+ hb_mixdown_get_short_name(amixdown));
 }
 }
 return TRUE;
 }
 
 static void
-add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
+add_job(hb_handle_t *h, GValue *js, gint unique_id, int titleindex)
 {
 hb_list_t * list;
- hb_title_t * title;
+ const hb_title_t * title;
 hb_job_t * job;
 gint sub_id = 0;
 hb_filter_object_t * filter;
 gchar *filter_str;
 gchar *dest_str = NULL;
+ GValue *prefs;
 
 g_debug("add_job()\n");
 if (h == NULL) return;
@@ -4680,19 +4196,26 @@
 if (title == NULL) return;
 
 /* Set job settings */
- job = hb_job_init( title );
+ job = hb_job_init( (hb_title_t*)title );
 if (job == NULL) return;
 
+ prefs = ghb_settings_get_value(js, "Preferences");
 job->angle = ghb_settings_get_int(js, "angle");
 job->start_at_preview = ghb_settings_get_int(js, "start_frame") + 1;
 if (job->start_at_preview)
 {
- job->seek_points = ghb_settings_get_int(js, "preview_count");
- job->pts_to_stop = ghb_settings_get_int(js, "live_duration") * 90000LL;
+ job->seek_points = ghb_settings_get_int(prefs, "preview_count");
+ job->pts_to_stop = ghb_settings_get_int(prefs, "live_duration") * 90000LL;
 }
 
- job->mux = ghb_settings_combo_int(js, "FileFormat");
- if (job->mux == HB_MUX_MP4)
+ const char *mux_id;
+ const hb_container_t *mux;
+
+ mux_id = ghb_settings_get_const_string(js, "FileFormat");
+ mux = ghb_lookup_container_by_name(mux_id);
+
+ job->mux = mux->format;
+ if (job->mux & HB_MUX_MASK_MP4)
 {
 job->largeFileSize = ghb_settings_get_boolean(js, "Mp4LargeFile");
 job->mp4_optimize = ghb_settings_get_boolean(js, "Mp4HttpOptimize");
@@ -4704,15 +4227,15 @@
 }
 if (!job->start_at_preview)
 {
- gint start, end;
 gint num_chapters = hb_list_count(title->list_chapter);
- gint duration = title->duration / 90000;
+ double duration = title->duration / 90000;
 job->chapter_markers = FALSE;
 job->chapter_start = 1;
 job->chapter_end = num_chapters;
 
 if (ghb_settings_combo_int(js, "PtoPType") == 0)
 {
+ gint start, end;
 start = ghb_settings_get_int(js, "start_point");
 end = ghb_settings_get_int(js, "end_point");
 job->chapter_start = MIN( num_chapters, start );
@@ -4721,20 +4244,22 @@
 }
 if (ghb_settings_combo_int(js, "PtoPType") == 1)
 {
- start = ghb_settings_get_int(js, "start_point");
- end = ghb_settings_get_int(js, "end_point");
- job->pts_to_start = (int64_t)MIN(duration-1, start) * 90000;
- job->pts_to_stop = (int64_t)MAX(start+1, end) * 90000 - 
- job->pts_to_start;
+ double start, end;
+ start = ghb_settings_get_double(js, "start_point");
+ end = ghb_settings_get_double(js, "end_point");
+ job->pts_to_start = (int64_t)(MIN(duration, start) * 90000);
+ job->pts_to_stop = (int64_t)(MAX(start, end) * 90000) -
+ job->pts_to_start;
 }
 if (ghb_settings_combo_int(js, "PtoPType") == 2)
 {
+ gint start, end;
 start = ghb_settings_get_int(js, "start_point");
 end = ghb_settings_get_int(js, "end_point");
 gint64 max_frames;
- max_frames = (gint64)duration * title->rate / title->rate_base;
+ max_frames = (gint64)(duration * title->rate / title->rate_base);
 job->frame_to_start = (int64_t)MIN(max_frames-1, start-1);
- job->frame_to_stop = (int64_t)MAX(start, end-1) - 
+ job->frame_to_stop = (int64_t)MAX(start, end-1) -
 job->frame_to_start;
 }
 if (job->chapter_start != job->chapter_end)
@@ -4759,10 +4284,10 @@
 
 name = NULL;
 chapter = ghb_array_get_nth(chapters, chap);
- name = ghb_value_string(chapter); 
+ name = ghb_value_string(chapter);
 if (name == NULL)
 {
- name = g_strdup_printf ("Chapter %2d", chap+1);
+ name = g_strdup_printf (_("Chapter %2d"), chap+1);
 }
 chapter_s = hb_list_item( job->list_chapter, chap);
 hb_chapter_set_title(chapter_s, name);
@@ -4770,7 +4295,7 @@
 }
 }
 }
- 
+
 gboolean decomb_deint = ghb_settings_get_boolean(js, "PictureDecombDeinterlace");
 gint decomb = ghb_settings_combo_int(js, "PictureDecomb");
 gint deint = ghb_settings_combo_int(js, "PictureDeinterlace");
@@ -4780,28 +4305,13 @@
 job->deinterlace = 0;
 job->grayscale = ghb_settings_get_boolean(js, "VideoGrayScale");
 
- gboolean keep_aspect;
- keep_aspect = ghb_settings_get_boolean(js, "PictureKeepRatio");
 job->anamorphic.mode = ghb_settings_combo_int(js, "PicturePAR");
 job->modulus = ghb_settings_combo_int(js, "PictureModulus");
- if (job->anamorphic.mode)
- {
- job->anamorphic.par_width = 
- ghb_settings_get_int(js, "PicturePARWidth");
- job->anamorphic.par_height = 
- ghb_settings_get_int(js, "PicturePARHeight");
- job->anamorphic.dar_width = 0;
- job->anamorphic.dar_height = 0;
-
- if (job->anamorphic.mode == 3 && !keep_aspect)
- {
- job->anamorphic.keep_display_aspect = 0;
- }
- else
- {
- job->anamorphic.keep_display_aspect = 1;
- }
- }
+ job->anamorphic.par_width = ghb_settings_get_int(js, "PicturePARWidth");
+ job->anamorphic.par_height = ghb_settings_get_int(js, "PicturePARHeight");
+ job->anamorphic.dar_width = job->anamorphic.dar_height = 0;
+ job->anamorphic.keep_display_aspect =
+ ghb_settings_get_boolean(js, "PictureKeepRatio");
 
 int width, height, crop[4];
 width = ghb_settings_get_int(js, "scale_width");
@@ -4812,7 +4322,7 @@
 crop[2] = ghb_settings_get_int(js, "PictureLeftCrop");
 crop[3] = ghb_settings_get_int(js, "PictureRightCrop");
 
- filter_str = g_strdup_printf("%d:%d:%d:%d:%d:%d", 
+ filter_str = g_strdup_printf("%d:%d:%d:%d:%d:%d",
 width, height, crop[0], crop[1], crop[2], crop[3]);
 filter = hb_filter_init(HB_FILTER_CROP_SCALE);
 hb_add_filter( job, filter, filter_str );
@@ -4862,20 +4372,29 @@
 hb_add_filter( job, filter, filter_str );
 g_free(filter_str);
 }
- gint denoise = ghb_settings_combo_int(js, "PictureDenoise");
- if( denoise )
+ if (strcmp(ghb_settings_get_const_string(js, "PictureDenoiseFilter"), "off"))
 {
- filter_str = NULL;
- if (denoise != 1)
- {
- if (denoise_opts.map[denoise].svalue != NULL)
- filter_str = g_strdup(denoise_opts.map[denoise].svalue);
+ int filter_id = HB_FILTER_HQDN3D;
+ if (!strcmp(ghb_settings_get_const_string(js, "PictureDenoiseFilter"), "nlmeans"))
+ filter_id = HB_FILTER_NLMEANS;
+
+ if (!strcmp(ghb_settings_get_const_string(js, "PictureDenoisePreset"), "custom"))
+ {
+ const char *filter_str;
+ filter_str = ghb_settings_get_const_string(js, "PictureDenoiseCustom");
+ filter = hb_filter_init(filter_id);
+ hb_add_filter( job, filter, filter_str );
 }
 else
- filter_str = ghb_settings_get_string(js, "PictureDenoiseCustom");
- filter = hb_filter_init(HB_FILTER_DENOISE);
- hb_add_filter( job, filter, filter_str );
- g_free(filter_str);
+ {
+ const char *preset, *tune;
+ preset = ghb_settings_get_const_string(js, "PictureDenoisePreset");
+ tune = ghb_settings_get_const_string(js, "PictureDenoiseTune");
+ filter_str = hb_generate_filter_settings(filter_id, preset, tune);
+ filter = hb_filter_init(filter_id);
+ hb_add_filter( job, filter, filter_str );
+ g_free(filter_str);
+ }
 }
 gint deblock = ghb_settings_get_int(js, "PictureDeblock");
 if( deblock >= 5 )
@@ -4887,13 +4406,13 @@
 g_free(filter_str);
 }
 
- job->vcodec = ghb_settings_combo_int(js, "VideoEncoder");
- if ((job->mux == HB_MUX_MP4 ) && (job->vcodec == HB_VCODEC_THEORA))
+ job->vcodec = ghb_settings_video_encoder_codec(js, "VideoEncoder");
+ if ((job->mux & HB_MUX_MASK_MP4 ) && (job->vcodec == HB_VCODEC_THEORA))
 {
 // mp4/theora combination is not supported.
 job->vcodec = HB_VCODEC_FFMPEG_MPEG4;
 }
- if ((job->vcodec == HB_VCODEC_X264) && (job->mux == HB_MUX_MP4))
+ if ((job->vcodec == HB_VCODEC_X264) && (job->mux & HB_MUX_MASK_MP4))
 {
 job->ipod_atom = ghb_settings_get_boolean(js, "Mp4iPodCompatible");
 }
@@ -4911,7 +4430,7 @@
 }
 
 gint vrate;
- gint vrate_base = ghb_settings_combo_int(js, "VideoFramerate");
+ gint vrate_base = ghb_settings_video_framerate_rate(js, "VideoFramerate");
 gint cfr;
 if (ghb_settings_get_boolean(js, "VideoFrameratePFR"))
 cfr = 2;
@@ -4944,7 +4463,7 @@
 const GValue *audio_list;
 gint count, ii;
 gint tcount = 0;
- 
+
 audio_list = ghb_settings_get_value(js, "audio_list");
 count = ghb_array_len(audio_list);
 for (ii = 0; ii < count; ii++)
@@ -4962,7 +4481,7 @@
 char * aname = ghb_settings_get_string(asettings, "AudioTrackName");
 if (aname && *aname)
 {
- // This leaks, but there is no easy way to clean up 
+ // This leaks, but there is no easy way to clean up
 // presently
 audio.out.name = aname;
 }
@@ -4974,16 +4493,16 @@
 aconfig = (hb_audio_config_t *) hb_list_audio_config_item(
 title->list_audio, audio.in.track );
 
- acodec = ghb_settings_combo_int(asettings, "AudioEncoder");
+ acodec = ghb_settings_audio_encoder_codec(asettings, "AudioEncoder");
 
- fallback = ghb_settings_combo_int(js, "AudioEncoderFallback");
+ fallback = ghb_settings_audio_encoder_codec(js, "AudioEncoderFallback");
 gint copy_mask = ghb_get_copy_mask(js);
 audio.out.codec = ghb_select_audio_codec(job->mux, aconfig, acodec, fallback, copy_mask);
 
- audio.out.gain = 
- ghb_settings_get_double(asettings, "AudioTrackGain");
+ audio.out.gain =
+ ghb_settings_get_double(asettings, "AudioTrackGainSlider");
 
- audio.out.dynamic_range_compression = 
+ audio.out.dynamic_range_compression =
 ghb_settings_get_double(asettings, "AudioTrackDRCSlider");
 if (audio.out.dynamic_range_compression < 1.0)
 audio.out.dynamic_range_compression = 0.0;
@@ -4995,11 +4514,13 @@
 }
 else
 {
- audio.out.mixdown = ghb_settings_combo_int(asettings, "AudioMixdown");
+ audio.out.mixdown = ghb_settings_mixdown_mix(asettings, "AudioMixdown");
 // Make sure the mixdown is valid and pick a new one if not.
- audio.out.mixdown = ghb_get_best_mix(aconfig, audio.out.codec, 
+ audio.out.mixdown = ghb_get_best_mix(aconfig, audio.out.codec,
 audio.out.mixdown);
- gint srate = ghb_settings_combo_int(asettings, "AudioSamplerate");
+ gint srate;
+ srate = ghb_settings_audio_samplerate_rate(
+ asettings, "AudioSamplerate");
 if (srate == 0) // 0 is same as source
 audio.out.samplerate = aconfig->in.samplerate;
 else
@@ -5014,11 +4535,11 @@
 else
 {
 audio.out.quality = HB_INVALID_AUDIO_QUALITY;
- audio.out.bitrate = 
- ghb_settings_combo_int(asettings, "AudioBitrate");
+ audio.out.bitrate =
+ ghb_settings_audio_bitrate_rate(asettings, "AudioBitrate");
 
- audio.out.bitrate = hb_get_best_audio_bitrate(
- audio.out.codec, audio.out.bitrate, 
+ audio.out.bitrate = hb_audio_bitrate_get_best(
+ audio.out.codec, audio.out.bitrate,
 audio.out.samplerate, audio.out.mixdown);
 }
 }
@@ -5035,7 +4556,7 @@
 const GValue *subtitle_list;
 gint subtitle;
 gboolean force, burned, def, one_burned = FALSE;
- 
+
 ghb_settings_set_boolean(js, "subtitle_scan", FALSE);
 subtitle_list = ghb_settings_get_value(js, "subtitle_list");
 count = ghb_array_len(subtitle_list);
@@ -5069,8 +4590,17 @@
 strncpy(sub_config.src_codeset, code, 39);
 sub_config.src_codeset[39] = 0;
 sub_config.force = 0;
- sub_config.dest = PASSTHRUSUB;
 sub_config.default_track = def;
+ if (burned && !one_burned && hb_subtitle_can_burn(SRTSUB))
+ {
+ // Only allow one subtitle to be burned into the video
+ sub_config.dest = RENDERSUB;
+ one_burned = TRUE;
+ }
+ else
+ {
+ sub_config.dest = PASSTHRUSUB;
+ }
 
 hb_srt_add( job, &sub_config, lang);
 
@@ -5083,18 +4613,16 @@
 subtitle = ghb_settings_get_int(ssettings, "SubtitleTrack");
 if (subtitle == -1)
 {
- if (!burned)
- {
- job->select_subtitle_config.dest = PASSTHRUSUB;
- }
- else if (burned)
+ if (burned && !one_burned)
 {
 // Only allow one subtitle to be burned into the video
- if (one_burned)
- continue;
 job->select_subtitle_config.dest = RENDERSUB;
 one_burned = TRUE;
 }
+ else
+ {
+ job->select_subtitle_config.dest = PASSTHRUSUB;
+ }
 job->select_subtitle_config.force = force;
 job->select_subtitle_config.default_track = def;
 job->indepth_scan = 1;
@@ -5105,22 +4633,20 @@
 hb_subtitle_t * subt;
 hb_subtitle_config_t sub_config;
 
- subt = (hb_subtitle_t *)hb_list_item(title->list_subtitle, subtitle);
+ subt = hb_list_item(title->list_subtitle, subtitle);
 if (subt != NULL)
 {
 sub_config = subt->config;
- if (!burned)
- {
- sub_config.dest = PASSTHRUSUB;
- }
- else if ( burned && ghb_canBurnSub(subt->source) )
+ if (burned && !one_burned && hb_subtitle_can_burn(subt->source))
 {
 // Only allow one subtitle to be burned into the video
- if (one_burned)
- continue;
 sub_config.dest = RENDERSUB;
 one_burned = TRUE;
 }
+ else
+ {
+ sub_config.dest = PASSTHRUSUB;
+ }
 sub_config.force = force;
 sub_config.default_track = def;
 hb_subtitle_add( job, &sub_config, subtitle );
@@ -5131,7 +4657,7 @@
 {
 // Add filter that renders vobsubs
 filter = hb_filter_init(HB_FILTER_RENDER_SUB);
- filter_str = g_strdup_printf("%d:%d:%d:%d", 
+ filter_str = g_strdup_printf("%d:%d:%d:%d",
 crop[0], crop[1], crop[2], crop[3]);
 hb_add_filter( job, filter, filter_str );
 g_free(filter_str);
@@ -5199,7 +4725,7 @@
 */
 job->pass = -1;
 job->indepth_scan = 1;
- hb_job_set_advanced_opts(job, NULL);
+ hb_job_set_encoder_options(job, NULL);
 
 /*
 * Add the pre-scan job
@@ -5223,8 +4749,8 @@
 /*
 * If turbo options have been selected then set job->fastfirstpass
 */
- if( ghb_settings_get_boolean(js, "VideoTurboTwoPass") &&
- job->vcodec == HB_VCODEC_X264 )
+ if(ghb_settings_get_boolean(js, "VideoTurboTwoPass") &&
+ (job->vcodec == HB_VCODEC_X264 || job->vcodec == HB_VCODEC_X265))
 {
 job->fastfirstpass = 1;
 }
@@ -5262,7 +4788,7 @@
 void
 ghb_add_job(GValue *js, gint unique_id)
 {
- // Since I'm doing a scan of the single title I want just prior 
+ // Since I'm doing a scan of the single title I want just prior
 // to adding the job, there is only the one title to choose from.
 add_job(h_queue, js, unique_id, 0);
 }
@@ -5270,7 +4796,12 @@
 void
 ghb_add_live_job(GValue *js, gint unique_id)
 {
- gint titleindex = ghb_settings_combo_int(js, "title");
+ int title_id, titleindex;
+ const hb_title_t *title;
+
+ title_id = ghb_settings_get_int(js, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ (void)title; // Silence "unused variable" warning
 add_job(h_scan, js, unique_id, titleindex);
 }
 
@@ -5279,7 +4810,7 @@
 {
 hb_job_t * job;
 gint ii;
- 
+
 // Multiples passes all get the same id
 // remove them all.
 // Go backwards through list, so reordering doesn't screw me.
@@ -5335,13 +4866,13 @@
 
 static void
 vert_line(
- GdkPixbuf * pb, 
- guint8 r, 
- guint8 g, 
- guint8 b, 
- gint x, 
- gint y, 
- gint len, 
+ GdkPixbuf * pb,
+ guint8 r,
+ guint8 g,
+ guint8 b,
+ gint x,
+ gint y,
+ gint len,
 gint width)
 {
 guint8 *pixels = gdk_pixbuf_get_pixels (pb);
@@ -5365,12 +4896,12 @@
 
 static void
 horz_line(
- GdkPixbuf * pb, 
- guint8 r, 
- guint8 g, 
- guint8 b, 
- gint x, 
- gint y, 
+ GdkPixbuf * pb,
+ guint8 r,
+ guint8 g,
+ guint8 b,
+ gint x,
+ gint y,
 gint len,
 gint width)
 {
@@ -5410,7 +4941,7 @@
 guint8 r;
 guint8 g;
 guint8 b;
- } c[4] = 
+ } c[4] =
 {{0x80, 0x80, 0x80},{0xC0, 0x80, 0x70},{0x80, 0xA0, 0x80},{0x70, 0x80, 0xA0}};
 
 if (!orientation)
@@ -5433,73 +4964,74 @@
 
 GdkPixbuf*
 ghb_get_preview_image(
- gint titleindex, 
- gint index, 
+ const hb_title_t *title,
+ gint index,
 signal_user_data_t *ud,
 gint *out_width,
 gint *out_height)
 {
- GValue *settings;
- hb_title_t *title;
- hb_job_t *job;
- 
- settings = ud->settings;
- title = ghb_get_title_info( titleindex );
- if( title == NULL ) return NULL;
-
- job = hb_job_init( title );
- if (job == NULL) return NULL;
+ hb_geometry_t srcGeo, resultGeo;
+ hb_ui_geometry_t uiGeo;
 
- set_preview_job_settings(job, settings);
+ if( title == NULL ) return NULL;
 
- // hb_get_preview doesn't compensate for anamorphic, so lets
- // calculate scale factors
- gint width, height, par_width = 1, par_height = 1;
- gint pic_par = ghb_settings_combo_int(settings, "PicturePAR");
- if (pic_par)
+ gboolean deinterlace;
+ if (ghb_settings_get_boolean(ud->settings, "PictureDecombDeinterlace"))
 {
- hb_set_anamorphic_size( job, &width, &height, 
- &par_width, &par_height );
+ deinterlace = ghb_settings_combo_int(ud->settings, "PictureDecomb")
+ == 0 ? 0 : 1;
 }
+ else
+ {
+ deinterlace = ghb_settings_combo_int(ud->settings, "PictureDeinterlace")
+ == 0 ? 0 : 1;
+ }
+ // Get the geometry settings for the preview. This will disable
+ // cropping if the setting to show the cropped region is enabled.
+ get_preview_geometry(ud, title, &srcGeo, &uiGeo);
 
- // Make sure we have a big enough buffer to receive the image from libhb
- gint dstWidth = job->width;
- gint dstHeight= job->height;
-
- static guint8 *buffer = NULL;
- static gint bufferSize = 0;
- gint newSize;
+ // hb_get_preview doesn't compensate for anamorphic, so lets
+ // calculate scale factors
+ hb_set_anamorphic_size2(&srcGeo, &uiGeo, &resultGeo);
 
- newSize = dstWidth * dstHeight * 4;
- if( bufferSize < newSize )
- {
- bufferSize = newSize;
- buffer = (guint8*) g_realloc( buffer, bufferSize );
+ // Rescale preview dimensions to adjust for screen PAR and settings PAR
+ ghb_par_scale(ud, &uiGeo.width, &uiGeo.height,
+ resultGeo.par.num, resultGeo.par.den);
+ uiGeo.par.num = 1;
+ uiGeo.par.den = 1;
+
+ GdkPixbuf *preview;
+ hb_image_t *image;
+ image = hb_get_preview2(h_scan, title->index, index, &uiGeo, deinterlace);
+
+ if (image == NULL)
+ {
+ preview = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8,
+ title->width, title->height);
+ return preview;
 }
- hb_get_preview( h_scan, job, index, buffer );
- hb_job_close( &job );
 
 // Create an GdkPixbuf and copy the libhb image into it, converting it from
 // libhb's format something suitable.
- 
- // The image data returned by hb_get_preview is 4 bytes per pixel, 
+ // The image data returned by hb_get_preview is 4 bytes per pixel,
 // BGRA format. Alpha is ignored.
+ preview = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8,
+ image->width, image->height);
+ guint8 *pixels = gdk_pixbuf_get_pixels(preview);
 
- GdkPixbuf *preview = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, dstWidth, dstHeight);
- guint8 *pixels = gdk_pixbuf_get_pixels (preview);
- 
- guint32 *src = (guint32*)buffer;
+ guint8 *src_line = image->data;
 guint8 *dst = pixels;
 
 gint ii, jj;
- gint channels = gdk_pixbuf_get_n_channels (preview);
- gint stride = gdk_pixbuf_get_rowstride (preview);
+ gint channels = gdk_pixbuf_get_n_channels(preview);
+ gint stride = gdk_pixbuf_get_rowstride(preview);
 guint8 *tmp;
 
- for (ii = 0; ii < dstHeight; ii++)
+ for (ii = 0; ii < image->height; ii++)
 {
+ guint32 *src = (guint32*)src_line;
 tmp = dst;
- for (jj = 0; jj < dstWidth; jj++)
+ for (jj = 0; jj < image->width; jj++)
 {
 tmp[0] = src[0] >> 16;
 tmp[1] = src[0] >> 8;
@@ -5507,75 +5039,87 @@
 tmp += channels;
 src++;
 }
+ src_line += image->plane[0].stride;
 dst += stride;
 }
- gint w = ghb_settings_get_int(settings, "scale_width");
- gint h = ghb_settings_get_int(settings, "scale_height");
- ghb_par_scale(ud, &w, &h, par_width, par_height);
+ gint w = ghb_settings_get_int(ud->settings, "scale_width");
+ gint h = ghb_settings_get_int(ud->settings, "scale_height");
+ ghb_par_scale(ud, &w, &h, resultGeo.par.num, resultGeo.par.den);
 
 gint c0, c1, c2, c3;
- c0 = ghb_settings_get_int(settings, "PictureTopCrop");
- c1 = ghb_settings_get_int(settings, "PictureBottomCrop");
- c2 = ghb_settings_get_int(settings, "PictureLeftCrop");
- c3 = ghb_settings_get_int(settings, "PictureRightCrop");
+ c0 = ghb_settings_get_int(ud->settings, "PictureTopCrop");
+ c1 = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
+ c2 = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
+ c3 = ghb_settings_get_int(ud->settings, "PictureRightCrop");
 
 gdouble xscale = (gdouble)w / (gdouble)(title->width - c2 - c3);
 gdouble yscale = (gdouble)h / (gdouble)(title->height - c0 - c1);
- 
- ghb_par_scale(ud, &dstWidth, &dstHeight, par_width, par_height);
+
 *out_width = w;
 *out_height = h;
- if (ghb_settings_get_boolean(settings, "reduce_hd_preview"))
+
+ int previewWidth = image->width;
+ int previewHeight = image->height;
+
+ // If the preview is too large to fit the screen, reduce it's size.
+ if (ghb_settings_get_boolean(ud->prefs, "reduce_hd_preview"))
 {
 GdkScreen *ss;
 gint s_w, s_h;
- gint orig_w, orig_h;
 gint factor = 80;
 
- if (ghb_settings_get_boolean(settings, "preview_fullscreen"))
+ if (ghb_settings_get_boolean(ud->prefs, "preview_fullscreen"))
 {
 factor = 100;
 }
 ss = gdk_screen_get_default();
 s_w = gdk_screen_get_width(ss);
 s_h = gdk_screen_get_height(ss);
- orig_w = dstWidth;
- orig_h = dstHeight;
 
- if (dstWidth > s_w * factor / 100)
- {
- dstWidth = s_w * factor / 100;
- dstHeight = dstHeight * dstWidth / orig_w;
- }
- if (dstHeight > s_h * factor / 100)
+ if (previewWidth > s_w * factor / 100 ||
+ previewHeight > s_h * factor / 100)
 {
- dstHeight = s_h * factor / 100;
- dstWidth = orig_w * dstHeight / orig_h;
+ GdkPixbuf *scaled_preview;
+ int orig_w = previewWidth;
+ int orig_h = previewHeight;
+
+ if (previewWidth > s_w * factor / 100)
+ {
+ previewWidth = s_w * factor / 100;
+ previewHeight = previewHeight * previewWidth / orig_w;
+ }
+ if (previewHeight > s_h * factor / 100)
+ {
+ previewHeight = s_h * factor / 100;
+ previewWidth = orig_w * previewHeight / orig_h;
+ }
+ xscale *= (gdouble)previewWidth / orig_w;
+ yscale *= (gdouble)previewHeight / orig_h;
+ w *= (gdouble)previewWidth / orig_w;
+ h *= (gdouble)previewHeight / orig_h;
+ scaled_preview = gdk_pixbuf_scale_simple(preview,
+ previewWidth, previewHeight, GDK_INTERP_HYPER);
+ g_object_unref(preview);
+ preview = scaled_preview;
 }
- xscale *= (gdouble)dstWidth / orig_w;
- yscale *= (gdouble)dstHeight / orig_h;
- w *= (gdouble)dstWidth / orig_w;
- h *= (gdouble)dstHeight / orig_h;
 }
- GdkPixbuf *scaled_preview;
- scaled_preview = gdk_pixbuf_scale_simple(preview, dstWidth, dstHeight, GDK_INTERP_HYPER);
- if (ghb_settings_get_boolean(settings, "preview_show_crop"))
+ if (ghb_settings_get_boolean(ud->prefs, "preview_show_crop"))
 {
 c0 *= yscale;
 c1 *= yscale;
 c2 *= xscale;
 c3 *= xscale;
 // Top
- hash_pixbuf(scaled_preview, c2, 0, w, c0, 32, 0);
+ hash_pixbuf(preview, c2, 0, w, c0, 32, 0);
 // Bottom
- hash_pixbuf(scaled_preview, c2, dstHeight-c1, w, c1, 32, 0);
+ hash_pixbuf(preview, c2, previewHeight-c1, w, c1, 32, 0);
 // Left
- hash_pixbuf(scaled_preview, 0, c0, c2, h, 32, 1);
+ hash_pixbuf(preview, 0, c0, c2, h, 32, 1);
 // Right
- hash_pixbuf(scaled_preview, dstWidth-c3, c0, c3, h, 32, 1);
+ hash_pixbuf(preview, previewWidth-c3, c0, c3, h, 32, 1);
 }
- g_object_unref (preview);
- return scaled_preview;
+ hb_image_close(&image);
+ return preview;
 }
 
 static void

HandBrake-0.9.9.tar.bz2/gtk/src/hb-backend.h -> HandBrake-0.10.0.tar.bz2/gtk/src/hb-backend.h Changed

@@ -3,22 +3,23 @@
  * 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.
- * 
+ *
  * This program 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 Library General Public License for more details.
- * 
+ *
  * 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., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
  */
- 
+
 #if !defined(_HBBACKEND_H_)
 #define _HBBACKEND_H_
 
 #include "settings.h"
 #include "hb.h"
+#include "lang.h"
 
 enum
 {
@@ -56,6 +57,10 @@
     ghb_instance_status_t queue;
 } ghb_status_t;
 
+#define MOD_ROUND(v,m) ((m==1)?v:(m * ((v + (m>>1)) / m)))
+#define MOD_DOWN(v,m)  (m * (v / m))
+#define MOD_UP(v,m)    (m * ((v + m - 1) / m))
+
 #define GHB_PIC_KEEP_WIDTH          0x01
 #define GHB_PIC_KEEP_HEIGHT         0x02
 #define GHB_PIC_KEEP_DISPLAY_WIDTH  0x04
@@ -70,14 +75,15 @@
 
 const gchar* ghb_version(void);
 void ghb_vquality_range(
-    signal_user_data_t *ud, 
-    gdouble *min, 
-    gdouble *max,
-    gdouble *step,
-    gdouble *page,
+    signal_user_data_t *ud,
+    float *min,
+    float *max,
+    float *step,
+    float *page,
     gint *digits,
-    gboolean *inverted);
-//const gchar* ghb_get_rate_string(gint rate, gint type);
+    int *direction);
+float ghb_vquality_default(signal_user_data_t *ud);
+
 void ghb_combo_init(signal_user_data_t *ud);
 void ghb_backend_init(gint debug);
 void ghb_backend_close(void);
@@ -102,46 +108,39 @@
 void ghb_backend_scan(const gchar *path, gint titleindex, gint preview_count, guint64 min_duration);
 void ghb_backend_scan_stop();
 void ghb_backend_queue_scan(const gchar *path, gint titleindex);
-hb_title_t* ghb_get_title_info(gint titleindex);
+hb_list_t * ghb_get_title_list();
 void ghb_par_init(signal_user_data_t *ud);
 void ghb_set_scale(signal_user_data_t *ud, gint mode);
 void ghb_set_scale_settings(GValue *settings, gint mode);
-GValue* ghb_get_chapters(gint titleindex);
-void ghb_get_chapter_duration(gint ti, gint ii, gint *hh, gint *mm, gint *ss);
-void ghb_part_duration(gint tt, gint sc, gint ec, gint *hh, gint *mm, gint *ss);
+void ghb_picture_settings_deps(signal_user_data_t *ud);
+GValue* ghb_get_chapters(const hb_title_t *title);
+gint64 ghb_get_chapter_duration(const hb_title_t *title, gint chap);
+gint64 ghb_get_chapter_start(const hb_title_t *title, gint chap);
+void ghb_part_duration(
+    const hb_title_t *title, gint sc, gint ec, gint *hh, gint *mm, gint *ss);
 gint ghb_get_best_mix(hb_audio_config_t *aconfig, gint acodec, gint mix);
 gboolean ghb_ac3_in_audio_list(const GValue *audio_list);
 gboolean ghb_audio_is_passthru(gint acodec);
 gboolean ghb_audio_can_passthru(gint acodec);
 gint ghb_get_default_acodec(void);
-hb_audio_config_t* ghb_get_scan_audio_info(gint titleindex, gint audioindex);
 void ghb_set_bitrate_opts(
     GtkBuilder *builder, gint first_rate, gint last_rate, gint extra_rate);
 void ghb_grey_combo_options(signal_user_data_t *ud);
 void ghb_update_ui_combo_box(
-    signal_user_data_t *ud, const gchar *name, gint user_data, gboolean all);
-const gchar* ghb_get_source_audio_lang(gint titleindex, gint track);
-gint ghb_find_audio_track(
-    gint titleindex, const gchar *lang, gint acodec, 
-    gint fallback_acodec, GHashTable *track_indices);
-const gchar* ghb_audio_track_description(gint track, int titleindex);
+    signal_user_data_t *ud, const gchar *name,
+    const void *user_data, gboolean all);
+const gchar* ghb_get_source_audio_lang(const hb_title_t *title, gint track);
+gint ghb_find_audio_track(const hb_title_t *title, const gchar *lang, int start);
 void ghb_add_all_subtitles(signal_user_data_t *ud, gint titleindex);
-gint ghb_find_pref_subtitle_track(const gchar *lang);
-gint ghb_find_subtitle_track(
-    gint titleindex, const gchar *lang, gboolean burn, 
-    gboolean force, gint source, GHashTable *track_indices);
+gint ghb_find_subtitle_track(const hb_title_t * title, const gchar * lang, int start);
 gint ghb_pick_subtitle_track(signal_user_data_t *ud);
-gint ghb_find_cc_track(gint titleindex);
 gint ghb_longest_title(void);
 gchar* ghb_build_advanced_opts_string(GValue *settings);
 GdkPixbuf* ghb_get_preview_image(
-    gint titleindex, gint index, signal_user_data_t *ud,
-    gint *width, gint *height);
+    const hb_title_t *title, gint index, signal_user_data_t *ud,
+    gint *out_width, gint *out_height);
 gchar* ghb_dvd_volname(const gchar *device);
-gint ghb_get_title_number(gint titleindex);
-int ghb_get_title_count();
 gint ghb_subtitle_track_source(GValue *settings, gint track);
-const char* ghb_subtitle_track_source_name(GValue *settings, gint track);
 const gchar* ghb_subtitle_track_lang(GValue *settings, gint track);
 
 gboolean ghb_validate_vquality(GValue *settings);
@@ -156,7 +155,60 @@
 const gchar* ghb_lookup_combo_option(const gchar *name, const GValue *gval);
 const gchar* ghb_lookup_combo_string(const gchar *name, const GValue *gval);
 gchar* ghb_get_tmp_dir();
-gint ghb_find_closest_audio_rate(gint rate);
-GValue* ghb_lookup_acodec_value(gint val);
+gint ghb_find_closest_audio_samplerate(gint rate);
+
+void ghb_init_lang_list_box(GtkListBox *list_box);
+
+void ghb_init_combo_box(GtkComboBox *combo);
+void ghb_audio_encoder_opts_set(GtkComboBox *combo);
+void ghb_audio_bitrate_opts_set(GtkComboBox *combo, gboolean extra);
+void ghb_audio_bitrate_opts_filter(GtkComboBox *combo, gint first_rate, gint last_rate);
+void ghb_mix_opts_set(GtkComboBox *combo);
+void ghb_mix_opts_filter(GtkComboBox *combo, gint acodec);
+void ghb_audio_samplerate_opts_set(GtkComboBox *combo);
+
+int ghb_lookup_audio_lang(const GValue *glang);
+const iso639_lang_t* ghb_iso639_lookup_by_int(int idx);
+void ghb_update_display_aspect_label(signal_user_data_t *ud);
+gchar* ghb_create_title_label(const hb_title_t *title);
+
+// libhb lookup helpers
+const hb_title_t* ghb_lookup_title(int title_id, int *index);
+const hb_container_t* ghb_lookup_container_by_name(const gchar *name);
+const hb_encoder_t* ghb_lookup_audio_encoder(const char *name);
+int ghb_lookup_audio_encoder_codec(const char *name);
+int ghb_settings_audio_encoder_codec(const GValue *settings, const char *name);
+const hb_encoder_t* ghb_settings_audio_encoder(
+    const GValue *settings, const char *name);
+const hb_encoder_t* ghb_lookup_video_encoder(const char *name);
+int ghb_lookup_video_encoder_codec(const char *name);
+int ghb_settings_video_encoder_codec(const GValue *settings, const char *name);
+const hb_encoder_t* ghb_settings_video_encoder(
+    const GValue *settings, const char *name);
+const hb_mixdown_t* ghb_lookup_mixdown(const char *name);
+int ghb_lookup_mixdown_mix(const char *name);
+int ghb_settings_mixdown_mix(const GValue *settings, const char *name);
+const hb_mixdown_t* ghb_settings_mixdown(
+    const GValue *settings, const char *name);
+const hb_rate_t* ghb_lookup_video_framerate(const char *name);
+int ghb_lookup_video_framerate_rate(const char *name);
+int ghb_settings_video_framerate_rate(const GValue *settings, const char *name);
+const hb_rate_t* ghb_settings_video_framerate(
+    const GValue *settings, const char *name);
+const hb_rate_t* ghb_lookup_audio_samplerate(const char *name);
+int ghb_lookup_audio_samplerate_rate(const char *name);
+int ghb_settings_audio_samplerate_rate(
+    const GValue *settings, const char *name);
+const hb_rate_t* ghb_settings_audio_samplerate(
+    const GValue *settings, const char *name);
+const char* ghb_audio_samplerate_get_short_name(int rate);
+const hb_rate_t* ghb_lookup_audio_bitrate(const char *name);
+int ghb_lookup_audio_bitrate_rate(const char *name);
+int ghb_settings_audio_bitrate_rate(const GValue *settings, const char *name);
+const hb_rate_t* ghb_settings_audio_bitrate(
+    const GValue *settings, const char *name);
+const char* ghb_audio_bitrate_get_short_name(int rate);
+hb_audio_config_t* ghb_get_audio_info(const hb_title_t *title, gint track);
+hb_subtitle_t* ghb_get_subtitle_info(const hb_title_t *title, gint track);
 
 #endif // _HBBACKEND_H_

HandBrake-0.10.0.tar.bz2/gtk/src/hb-complete.svg Added

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ width="63.923908"
+ height="63.937237"
+ sodipodi:docname="hb-complete.16.png">
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs6">
+ <linearGradient
+ id="linearGradient3781">
+ <stop
+ style="stop-color:#1bbf00;stop-opacity:1;"
+ offset="0"
+ id="stop3783" />
+ <stop
+ style="stop-color:#98ff87;stop-opacity:1;"
+ offset="1"
+ id="stop3785" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3781"
+ id="radialGradient3787"
+ cx="38.502785"
+ cy="21.131025"
+ fx="38.502785"
+ fy="21.131025"
+ r="19.893009"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.853633,-0.85991642,0.72456011,0.69956651,-7.5185257,44.001085)" />
+ </defs>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="2962"
+ inkscape:window-height="1266"
+ id="namedview4"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:zoom="14.75"
+ inkscape:cx="21.380388"
+ inkscape:cy="31.484599"
+ inkscape:window-x="66"
+ inkscape:window-y="248"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg2" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#1bbf00;fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path2987"
+ sodipodi:cx="44.305084"
+ sodipodi:cy="19.966103"
+ sodipodi:rx="19.830509"
+ sodipodi:ry="19.830509"
+ d="m 64.135593,19.966103 a 19.830509,19.830509 0 1 1 -39.661018,0 19.830509,19.830509 0 1 1 39.661018,0 z"
+ transform="matrix(1.6086049,0,0,1.608941,-39.307421,-0.1556618)" />
+ <path
+ transform="matrix(1.4482315,0,0,1.475884,-32.269855,2.4331712)"
+ d="m 64.135593,19.966103 a 19.830509,19.830509 0 1 1 -39.661018,0 19.830509,19.830509 0 1 1 39.661018,0 z"
+ sodipodi:ry="19.830509"
+ sodipodi:rx="19.830509"
+ sodipodi:cy="19.966103"
+ sodipodi:cx="44.305084"
+ id="path3779"
+ style="fill:url(#radialGradient3787);fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ sodipodi:type="arc" />
+ <text
+ xml:space="preserve"
+ style="font-size:62.36872864px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fefefe;fill-opacity:1;stroke:none;font-family:Sans"
+ x="8.7644606"
+ y="54.63208"
+ id="text2991"
+ sodipodi:linespacing="125%"
+ transform="scale(0.96989628,1.0310381)"><tspan
+ sodipodi:role="line"
+ id="tspan2993"
+ x="8.7644606"
+ y="54.63208">✔</tspan></text>
+</svg>

HandBrake-0.10.0.tar.bz2/gtk/src/hb-edit.svg Added

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ width="64.001312"
+ height="63.998154"
+ sodipodi:docname="hb-edit.svg">
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs6" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1950"
+ inkscape:window-height="1362"
+ id="namedview4"
+ showgrid="false"
+ inkscape:zoom="7.375"
+ inkscape:cx="39.136957"
+ inkscape:cy="20.379049"
+ inkscape:window-x="798"
+ inkscape:window-y="276"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg2"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
+ <g
+ id="g3801"
+ transform="matrix(0.91171267,-0.93439754,0.91171267,0.93439754,93.115545,15.138005)">
+ <path
+ sodipodi:type="star"
+ style="fill:#000000;fill-opacity:0.38823529;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path3023"
+ sodipodi:sides="3"
+ sodipodi:cx="-52.610168"
+ sodipodi:cy="-20.745764"
+ sodipodi:r1="7.5944309"
+ sodipodi:r2="3.7972155"
+ sodipodi:arg1="3.1237374"
+ sodipodi:arg2="4.170935"
+ inkscape:flatsided="true"
+ inkscape:rounded="0"
+ inkscape:randomized="0"
+ d="m -60.203389,-20.61017 11.272403,-6.779312 0.234855,13.151843 z"
+ inkscape:transform-center-x="2.8373957"
+ inkscape:transform-center-y="-0.084402081"
+ transform="matrix(1.5424065,0,0,1.2449419,16.819863,1.8438764)" />
+ <rect
+ style="fill:#000000;fill-opacity:0.38823529;stroke:#7d7d80;stroke-width:0.04319459;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect3021"
+ width="42.531689"
+ height="16.147442"
+ x="-58.539501"
+ y="-32.141743" />
+ <g
+ transform="translate(4.20339,-20.067796)"
+ id="g3013">
+ <rect
+ style="fill:#6476ae;fill-opacity:1;stroke:#7d7d80;stroke-width:0.03759439;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect3003"
+ width="40.129009"
+ height="12.964183"
+ x="-64.060852"
+ y="-11.9738" />
+ <path
+ sodipodi:type="star"
+ style="fill:#e07373;fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path3007"
+ sodipodi:sides="3"
+ sodipodi:cx="-52.610168"
+ sodipodi:cy="-20.745764"
+ sodipodi:r1="7.5944309"
+ sodipodi:r2="3.7972155"
+ sodipodi:arg1="3.1237374"
+ sodipodi:arg2="4.170935"
+ inkscape:flatsided="true"
+ inkscape:rounded="0"
+ inkscape:randomized="0"
+ d="m -60.203389,-20.61017 11.272403,-6.779312 0.234855,13.151843 z"
+ inkscape:transform-center-x="2.677108"
+ inkscape:transform-center-y="-0.067763776"
+ transform="matrix(1.4552737,0,0,0.99951775,7.2302233,15.311997)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#6476ae;fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path3009"
+ sodipodi:cx="-61.084747"
+ sodipodi:cy="-19.050848"
+ sodipodi:rx="2.1016948"
+ sodipodi:ry="2.1016948"
+ d="m -58.983052,-19.050848 c 0,1.160734 -0.940961,2.101695 -2.101695,2.101695 -1.160734,0 -2.101695,-0.940961 -2.101695,-2.101695 0,-1.160734 0.940961,-2.101695 2.101695,-2.101695 1.160734,0 2.101695,0.940961 2.101695,2.101695 z"
+ transform="matrix(1.1400463,0,0,0.86093756,-8.0940607,10.93816)" />
+ <path
+ style="fill:#373737;fill-opacity:1;stroke:#7d7d80;stroke-width:0.00420339;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m -78.689016,-3.8783433 c -0.542991,-0.168577 -1.233888,-0.857088 -1.32702,-1.322437 -0.202401,-1.011322 0.879053,-1.925354 2.282558,-1.929192 2.891309,-0.0079 3.110593,3.141685 0.231761,3.328793 -0.426937,0.02775 -0.961222,-0.007 -1.187299,-0.07716 z"
+ id="path3011"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+</svg>

HandBrake-0.10.0.tar.bz2/gtk/src/hb-icon.svg Added

@@ -0,0 +1,38849 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="1658"
+ height="1721"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="hb1.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.35"
+ inkscape:cx="689.71429"
+ inkscape:cy="63.357125"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1899"
+ inkscape:window-height="1636"
+ inkscape:window-x="373"
+ inkscape:window-y="105"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(309,1119.5664)">
+ <image
+ y="-1119.5664"
+ x="-309"
+ id="image3063"
+ xlink:href="data:image/png;base64,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
+zYWikzG+TJIq6sqggqvFzrFKo1Q1V1ur6KAr4yax7IROsDR3Y7JM4FFZ01yNOVDcqzxIjDSVjJXp
++8wO04VicvVm174lF25Ydr9IhYyqU+FYGxibZ1XJ4YmkLMtuxTimbFty9bEdo/aYOxwXEkxsc1Od
+uXmPtvZ8nJ4lpVRwsV+AJaKSihrvjk1c/TzDlP117SPpxHXs3d21mFWuXNf9duGKW6q7lYN+ppCY
+5L5kTBm2kcR7I/pYrrvX1D4xRhweHuIv//IvdT6fj6hnEok9ANCcM91gRlOujCISF4uF5Jwl1Dhk
+UkrREMJMq1olGkHU9hvTGYGRSKAbCRKtztG4s0ByxT/X6sKN/VGgubz0c0sCCNbHUErRUmVAJYSQ
+SH5Ym1t8HiNGivWVhBON7BLXLceUZ7pa3B+xtUqXjTyLi52t7Ry1wztaP0nIhFjZL2hV6mSpseGW
+1oeNq9hvBNU92a7buoft7RgjYozhHe94x+Lo6Oi1O3fuvLK/v793eHiIu3fv4pvf/Gay+T7r3yeb
+/gd1W+ku8nzdfCfdPyvtpvceVMc2rrf57LTvJ+V5GL+f1uZ1+niZ/V0n3Sb5tnF9Wpp17p1W3ln3
+z/NskzQ+3TppT8qzSb7zlH3aZ7LJ3iq27pq/jM9kk12mTetwssku2SaiZ7K3k236n5UT7W//9m8V
+AG7fvv3fHRwc4Mknn0RKiX4r75ZS/hMsULsHgAncOtC5PUMlO4D6BnLW6lZsyc2TA8YYf6fFyhBz
+d2ag8iCVoEkEK/m2OAFd6UogoAK9gYCiAdtUC4xSyY6CCnyTUAIqEUJCaGb9ZyydhAriElBrygPp
+ihwC/nyjv0gntFqAeywDgwRaBxsjuq0jMJhKKXSPxPhHiWPHN+Ctn7pCjkVzuRRUVRmbAkAchiHc
+uHHj8E/+5E/y+973PgLvbY4cYCniCAwAcOPFSwU7VP/64PN81kid1bW4hHQDS/lW0ou75serNdjv
+pfZh+XfBpyH47IkZVVWv4gJMLWXpGaup2BpQGNlg+VbBeRJnAeY6Sir52drGeTdQ2xM2VMJQFUdX
+VhGdVKR7OeYl4TSs9IFv+S/QlTh0mSbSlSktbosj8UjejDaAlD40920rRF7x/UIO2YZUAAAgAElE
+QVRfGtwvJI24BziOVBD5uFlsk2h3a+XjfHEPcTxZn7j66b7Kx3Px/+AmQUyXd0yiLIv9hFt3bj2z
+rZwj7sPGQkgnMP2aZWPv8w/s9oC6MfPrn67kWlwb1xc4JQ/33oi+9psrPu5LI4f0ySef1L/5m79J
+L7300r0QQrA1Kaixbeg6LZs6JRsZjdlsluysGSlHsfGPJDLsU5zSR4AaCyalFK0NIYRQRGQkmcOz
+y9rZyEY7+3zcpqbkiTGWYRgSAA0hlGEYqC4DgGju3irzEmN0/awB11Kqh3xKjRyytjGOHMl/Eika
+qhs6xiTiSwjZ1D4kcegSj2uWsYTUytVSSjFia5RKQGXuOa2u59o6tjEMRlyJ1UHCqqk5ZflcFJsX
+vX79elHV4fj4+PVSyp2joyMcHR3hlVde+Zef+MQn/hcs26b/YV03/TrpNi1nG89Oun9W2k3vPaiO
+bVxv89lp30/Kc1r+TcpdN+86bXhQmzdtyyb9Xff7tp5t6/qsNA+6t437D6pjk/w+zVnpLppn3fK2
+XfZkk51mp627N/Mz2WSPgk1re7LJHkKbiJ7JtmVvi0P7x3/8xwMA3L1793+9desWrly5gqtXr3o1
+z68D2CFoiA6w+rf/+YBqEwK4JAhEKlFTHNimMEWMEUEkgagwIGhFANCDrbBnOcZI12YEcoVgmtXh
+wXleiwFnCgd6sX3SSZz+6r57W5ukCkE0VLKILrb4pjfB7CTuLW++xW1vu/vxKqrKe0AlypbaYOBm
+c70kIjPpIHkDszm31rYdqhcq7xU0hBAODw/1937v9+7duHEDu7u7jBeUpMccaiSU5Qe6oqG50rJx
+oRsgjm8jf6wc//2+NSjLoPbSo5VrdW3j83YtKyoKccSiq4PKGH/dXPvZ/LGfzJdRSQ6xeSTQyrlr
+hI8sK2kUnURowLvd41/2samy0OPZcF45nnwj3xNpjJmVrP9UsKjNQ4tzIo5UceVxn9G1H93DiYgs
+PKjN8VHVubU9ujlfIjE5/uybWw8+FhDJqqZqs/Z5N2mtL9LdtdFdJMtkH5kv+/TosXRGV24juSy9
+j89C0ovPPIHFvQAs/3uj7Rl2lVvE9u6JRCfLWv3rnq8qepb+un3ZlHXCjbnsUpByP5F+9o1uTVLx
+grt37+KFF15QVJdlM+mkO/shKaUAIOSci4jk2WxGhUoQkXE2mw3SSeto32UYhsHGeQSM1SklG7fB
+3wzG/FGpPAzj7USxGzHGAkAsL6x/wv1XSgmllBJjjEaCwNZDiDFmkt72W6N2frFddCmn9pdnIlVO
+YuPRCENT9pAQI4nKPgkAZcwdEREjmtSpmYQu2xxJxH0TSynZ+qvo5JAMw8D5TpZXpJPSVLkurQFb
+k8Xq13EcXz86OirDMDw2n8/3VBV3797Fiy++SBXvpmDqOuDtWekummYbz066f1baTe89qI5tXG/z
+2Vnp1sl/VrkP+r5OmW/298vIs26+y7i+6L3z3OezizxfN81J6TfJ86AytlHeZG+snTZ/j+pnssne
+bjbtnckmewvbRPRM9ijaRf9jcW77nd/5nXLv3r3/9tatW/+ulILr16+3t6/HcfyPWt30jDAXUQTM
+CShaMQHdZRHjF8DyMC7PCCDZi8yeSGlAFSphQtLIuxjjm/5e/ULQWWGAOb8baBbEglujx+yAiDQC
+xYBJJqf7t+ZCyoDBLJ08WQWdU6joXJAeQJ7pBB2UT6iED9+2XyUW6GJotLKTAZ6MM8TYP8n6l1xb
++NY8QVzG6qB7uPbmvfUJMUb5zGc+c/hLv/RL+Z3vfCfbSZA1GCjLfnLcfJwZroOi9sa9VBILQItF
+fx+j49bFqcC2rxMnrG3rJ+vg7RYnxvqrXCtWRyMibTzbm/1uHJdccElXClCdQmLTkxZUvtClGPdB
+4dzZ2CaXJ7q6MteHI1hW+6voSjq1e23fSSUI2WeqHZT9kpNJCe/Oz7tB82MuqPs22PpqfXT7gWu3
+lWUT42MINYKD60RVuR+bGqmUskBVPFE1xHVOt3ZMz6HkX0/ckDTiXPCMYVsJ5vO+d4Hl05LcJVnS
+/uEv0qffrSOOtx8/pvVzsLTY/drvy2P5OfO3zrp9w+9GPMD2rdh4UznDsymKkbgi97tL9H2/du1a
+efHFF8PBwcGilDKG5bg0CnONZ3UEdJeAYmqUQc0VmaouTOBTRCTknHMVzKRkqplQShESf6GallI4
+j0BVrCRLw3UtrqwYYwwkXkREY4yScy5UQtr5xDZI6G45Q4xRLc4Nx4q/LYzl1GLpjOMo6MQLiSD+
+5oh0kjDyrKU6iGMIVJWRjV/bezlnxtdanX+ql+pAltIIYiN+1OY+WFlFupqL880zjWtdVDU/++yz
+ePrpp4/n8/n8pZde+v/29/dfOzo6gqri1q1bP8RYPc42/U/xumm3kWbbz866v417J9Wxzet10q6b
+76x0Z+V5O3y/rDybXp817+uUd1qaddI9KO1p6c/Ks87zddOspl03/YPyn7eMbdlpZ/P0Wf8z2WST
+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
+PwpkW9hfA1h1AAAAAElFTkSuQmCC
+"
+ height="1721"
+ width="1658" />
+ <path
+ style="fill:#000000"
+ d="m 135.5,574.1693 c -9.9,-0.01 -24.75,-0.3588 -33,-0.7814 -8.25,-0.4226 -23.1,-1.7052 -33,-2.8501 -9.9,-1.145 -24.08885,-3.1782 -31.53078,-4.5184 -7.44193,-1.3401 -20.71693,-4.2498 -29.5,-6.4659 -8.78307,-2.2162 -21.28873,-5.8298 -27.79035,-8.0303 l -11.82113,-4.0009 -12.67887,-5.7576 -12.67887,-5.7576 -10.44971,-6.4169 -10.44971,-6.4169 -7.75632,-6.4925 -7.75632,-6.4926 -5.62157,-6.6273 -5.62158,-6.6273 -4.27678,-8.5 c -2.35223,-4.675 -4.57589,-9.7375 -4.94145,-11.25 -0.36557,-1.5125 -0.49139,-2.75 -0.2796,-2.75 0.21178,0 1.34635,2.5875 2.52126,5.75 1.17492,3.1625 3.03234,6.875 4.12761,8.25 l 1.99141,2.5 -3.42927,-8.002 -3.42928,-8.0019 -0.89897,-8.4981 -0.89897,-8.498 0.72957,-3.5 c 0.40126,-1.925 1.01201,-5.3 1.35722,-7.5 l 0.62765,-4 -1.52259,1.9411 c -0.83743,1.0677 -1.5226,1.6851 -1.5226,1.3722 0,-0.313 0.68104,-2.199 1.51342,-4.1912 0.83238,-1.9921 1.71826,-3.6221 1.96862,-3.6221 0.25035,0 0.2167,0.7875 -0.0748,1.75 l -0.52997,1.75 2.01944,-3.5 2.01944,-3.5 0.12313,1 0.12314,1 1.44168,-3 1.44167,-3 -0.60241,5.1459 -0.60242,5.1459 1.709,3.3541 c 0.93994,1.8447 4.01323,5.8244 6.82952,8.8436 2.81628,3.0192 7.77778,7.5192 11.02555,10 3.24777,2.4808 9.09777,6.6148 13,9.1868 3.90223,2.572 10.74257,6.7227 15.20074,9.2238 4.45817,2.5011 8.67577,5.2342 9.37244,6.0737 l 1.26668,1.5262 1.41251,0 c 0.77688,0 4.75814,1.4386 8.84723,3.197 4.0891,1.7583 7.28536,3.3463 7.10282,3.5289 -0.18255,0.1825 -4.1064,-1.0761 -8.71968,-2.7969 -4.61327,-1.7209 -9.06277,-3.5308 -9.88777,-4.022 -0.825,-0.4912 -4.65,-2.5277 -8.5,-4.5256 -3.85,-1.9978 -8.2375,-4.5066 -9.75,-5.575 l -2.75,-1.9426 0,0.7592 c 0,0.4176 -0.70837,-0.1142 -1.57416,-1.1819 l -1.57415,-1.9411 0.64831,1.5 0.64831,1.5 -1.55826,-1.9194 c -0.85705,-1.0557 -3.08399,-2.8557 -4.94876,-4 -1.86478,-1.1443 -6.03443,-4.1111 -9.26589,-6.5928 -3.23147,-2.4818 -8.3486,-6.9818 -11.3714,-10 l -5.496,-5.4878 -1.82053,-4 -1.82052,-4 -0.8179,1.5 c -0.44985,0.825 -1.38497,4.7232 -2.07804,8.6628 l -1.26014,7.1627 1.07705,8.3436 1.07704,8.3435 3.04894,6.7955 3.04895,6.7955 4.42673,5.6982 c 2.43471,3.134 6.60557,7.7804 9.26858,10.3253 2.66301,2.545 7.7443,6.9325 11.29174,9.75 3.54745,2.8176 6.89414,5.1229 7.4371,5.1229 l 0.98718,0 -2.93499,-3.25 -2.935,-3.25 3.49791,3.0539 c 1.92384,1.6796 6.0854,4.7217 9.2479,6.7602 3.1625,2.0385 5.75,3.9324 5.75,4.2087 0,0.2762 -1.79106,-0.6284 -3.98013,-2.0103 -2.18907,-1.3819 -4.24063,-2.5125 -4.55902,-2.5125 l -0.57888,0 0.67969,1.0998 0.67969,1.0997 -2.37067,-1.2319 c -1.30388,-0.6776 -4.24641,-2.7475 -6.53898,-4.5998 -2.29256,-1.8523 -4.47006,-3.3678 -4.83889,-3.3678 -0.36883,0 0.55483,1.4563 2.05258,3.2363 l 2.72318,3.2363 7.61571,4.3981 c 4.18865,2.419 12.20684,6.5877 17.81822,9.2637 5.61137,2.6761 10.56137,4.8435 11,4.8164 0.43862,-0.027 -2.24,-1.6082 -5.9525,-3.5138 -3.7125,-1.9055 -6.75,-3.6555 -6.75,-3.8889 0,-0.2334 4.81423,1.5927 10.69829,4.0579 5.88406,2.4652 18.37156,7.1414 27.75,10.3915 9.37844,3.2502 20.65171,6.8015 25.05171,7.8918 4.4,1.0903 12.95,2.8676 19,3.9496 6.05,1.0819 14.375,2.4651 18.5,3.0738 4.125,0.6086 15.825,2.0069 26,3.1072 10.175,1.1003 24.575,2.4182 32,2.9286 l 13.5,0.9279 -16.5,-0.4239 -16.5,-0.424 -21.21982,-2.4876 c -11.67091,-1.3682 -25.62091,-3.2162 -31,-4.1066 -5.3791,-0.8904 -13.31979,-2.5003 -17.64599,-3.5775 -4.32619,-1.0772 -8.05845,-1.7659 -8.29391,-1.5304 -0.23545,0.2354 3.52916,1.38 8.36581,2.5434 4.83665,1.1634 15.09391,3.2192 22.79391,4.5685 l 14,2.4532 21,2.143 21,2.143 36,0.4305 c 19.8,0.2368 36.9,0.4924 38,0.5681 1.1,0.076 -2.725,0.4604 -8.5,0.8551 -5.775,0.3946 -18.6,0.7116 -28.5,0.7045 z M 8.41667,557.3547 l 1.91666,0.079 -0.60416,-0.6042 -0.60417,-0.6041 -1.3125,0.5252 -1.3125,0.5252 1.91667,0.079 z M 5,556.2961 c 0.825,-0.014 -1.85994,-1.0911 -5.96654,-2.3939 -4.1066,-1.3029 -7.63899,-2.1964 -7.84977,-1.9856 -0.21077,0.2108 2.47417,1.288 5.96654,2.3939 C 0.6426,555.4164 4.175,556.31 5,556.2961 z m -16,-4.8625 1.33333,0 -0.66666,-0.6667 -0.66667,-0.6666 -0.66667,0.6666 -0.66666,0.6667 1.33333,0 z m -2.5,-1.0856 1,0.055 -1.5,-0.9694 c -0.825,-0.5332 -2.175,-0.9446 -3,-0.9144 l -1.5,0.055 2,0.8594 c 1.1,0.4727 2.45,0.8842 3,0.9144 z m -6.5,-1.9144 1.33333,0 -0.66666,-0.6667 -0.66667,-0.6666 -0.66667,0.6666 -0.66666,0.6667 1.33333,0 z m -2.5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -2.5,-1 1.33333,0 -0.66666,-0.6667 -0.66667,-0.6666 -0.66667,0.6666 -0.66666,0.6667 1.33333,0 z m -3,-1 1.33333,0 -0.66666,-0.6667 -0.66667,-0.6666 -0.66667,0.6666 -0.66666,0.6667 1.33333,0 z m -2.5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -2.5,-1 1.33333,0 -0.66666,-0.6667 -0.66667,-0.6666 -0.66667,0.6666 -0.66666,0.6667 1.33333,0 z m -2.5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -31.37756,-19 c 0.48266,0 0.87756,-0.2092 0.87756,-0.4648 0,-0.2557 -1.0125,-1.0043 -2.25,-1.6637 l -2.25,-1.1989 1.37244,1.6637 c 0.75485,0.915 1.76735,1.6637 2.25,1.6637 z m -13.94098,-7 1.06343,0 -1.26495,-1.5242 c -0.69572,-0.8383 -1.47088,-1.3182 -1.72258,-1.0665 -0.2517,0.2517 -0.16101,0.9376 0.20152,1.5242 0.36254,0.5866 1.1377,1.0665 1.72258,1.0665 z m -4.47851,-3 c 0.23828,0 -0.44884,-1.2375 -1.52693,-2.75 -1.07809,-1.5125 -3.02123,-3.65 -4.31809,-4.75 l -2.35793,-2 1.75218,2.0812 1.75218,2.0811 -0.55484,0.5548 -0.55484,0.5549 2.68752,2.114 c 1.47813,1.1627 2.88247,2.114 3.12075,2.114 z m -4.20295,-4 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -6.23849,-6.0328 c 0.41883,0.018 -1.32794,-2.5547 -3.88171,-5.7172 -2.55376,-3.1625 -4.83272,-5.9613 -5.06436,-6.2195 -0.23163,-0.2583 -0.0909,0.4167 0.31282,1.5 0.40367,1.0832 2.33996,3.8672 4.30285,6.1867 1.96289,2.3195 3.91157,4.232 4.3304,4.25 z m 278.01281,69.0328 c -2.53421,0 -4.42015,-0.1673 -4.19099,-0.3719 0.22917,-0.2045 2.60222,-0.6893 5.27345,-1.0773 l 4.85678,-0.7054 -0.66579,1.0773 -0.6658,1.0773 -4.60765,0 z M 195,571.1438 l -5.5,0.5379 0.64224,-0.6829 c 0.35324,-0.3757 7.77824,-1.5887 16.5,-2.6956 8.72177,-1.1068 23.95776,-3.5648 33.85776,-5.462 9.9,-1.8973 23.175,-4.7783 29.5,-6.4023 6.325,-1.624 13.525,-3.6247 16,-4.446 l 4.5,-1.4933 -3.5,0.5175 -3.5,0.5175 17.5,-6.0457 c 9.625,-3.3251 17.725,-6.0409 18,-6.0352 0.275,0.01 -0.175,0.4467 -1,0.9799 l -1.5,0.9694 1,0 c 0.55,0 1.675,-0.4362 2.5,-0.9694 l 1.5,-0.9694 -1,-0.051 -1,-0.051 2.5,-1.4291 c 1.375,-0.786 2.95,-1.4291 3.5,-1.4291 0.55,0 -0.125,0.6431 -1.5,1.4291 -1.375,0.786 -2.18367,1.4451 -1.79705,1.4646 0.38662,0.019 1.83501,-0.4804 3.21864,-1.1108 l 2.5157,-1.1463 -0.52058,-0.8423 -0.52059,-0.8423 1.71599,0.6585 1.71598,0.6585 -0.72306,-1.17 -0.72306,-1.1699 1.30901,-0.1152 c 0.71996,-0.063 2.14571,-0.027 3.16833,0.081 l 1.85931,0.1966 -0.66125,-1.07 -0.66125,-1.0699 1.30194,0.4963 1.30194,0.4962 13,-7.0776 c 7.15,-3.8927 17.49367,-10.0837 22.98594,-13.7577 l 9.98595,-6.6801 6.51405,-6.3168 6.51406,-6.3168 -8,6.5636 c -4.4,3.61 -8.45,6.5493 -9,6.5319 l -1,-0.032 5,-4.1356 c 2.75,-2.2745 8.21236,-7.4281 12.13859,-11.4523 l 7.13858,-7.3169 4.68572,-7.5179 4.68571,-7.518 2.30666,-7.2447 c 1.26867,-3.9847 2.5744,-8.5948 2.90163,-10.2448 0.32723,-1.65 0.90168,-4.0829 1.27656,-5.4064 l 0.6816,-2.4063 -1.15753,0.7153 -1.15752,0.7154 0,-0.9756 c 0,-0.5367 0.52648,-1.1512 1.16996,-1.3657 l 1.16995,-0.39 -1.67136,-4.9434 c -0.91925,-2.7188 -2.35724,-7.4605 -3.19552,-10.5371 l -1.52414,-5.5938 -1.53286,-1.9062 -1.53285,-1.9062 0.61968,4.75 0.61969,4.75 -0.99389,0 -0.99388,0 -0.68515,2.1587 c -0.37683,1.1873 -2.72749,4.6748 -5.22369,7.75 -2.4962,3.0752 -7.31152,8.0663 -10.70071,11.0913 -3.38918,3.025 -6.80635,6.061 -7.59369,6.7466 -0.78735,0.6856 -4.13154,3.1932 -7.43154,5.5724 -3.3,2.3792 -8.1375,5.5497 -10.75,7.0455 -2.6125,1.4959 -4.75,2.4802 -4.75,2.1873 0,-0.2929 4.6125,-3.9099 10.25,-8.0379 5.6375,-4.128 10.89419,-8.0698 11.68154,-8.7596 0.78734,-0.6899 4.2264,-3.7401 7.64234,-6.7783 3.41594,-3.0382 8.07101,-7.8773 10.3446,-10.7537 2.27359,-2.8763 4.60971,-6.4655 5.19139,-7.9759 l 1.05759,-2.7464 -0.64942,-4.9856 -0.64942,-4.9855 -2.46717,-4.912 c -1.35694,-2.7017 -3.80238,-6.5979 -5.43431,-8.6584 C 396.33521,398.3304 395,396.4468 395,396.2052 c 0,-0.2417 0.70798,-0.4395 1.57329,-0.4395 l 1.57329,0 5.5359,7.0752 5.5359,7.0751 3.45946,6.8695 3.45946,6.8696 1.92456,8.8181 1.92457,8.818 -0.634,7.8206 -0.634,7.8206 -2.87769,7.3225 -2.87769,7.3226 -5.12576,7.6774 c -2.81917,4.2226 -6.29835,8.7226 -7.73152,9.9998 l -2.60577,2.3224 1.5,-0.7589 c 0.825,-0.4174 -1.38955,2.3626 -4.92121,6.1777 l -6.42122,6.9365 -10.17118,7.57 -10.17119,7.5701 -10.9076,6.1187 c -5.99918,3.3653 -16.0826,8.4548 -22.4076,11.31 -6.325,2.8552 -17.69366,7.3758 -25.26368,10.0458 -7.57002,2.67 -21.29502,6.8622 -30.5,9.3161 -9.20498,2.4538 -23.48632,5.8143 -31.73632,7.4677 -8.25,1.6534 -21.975,3.9664 -30.5,5.14 -8.525,1.1736 -17.975,2.3759 -21,2.6718 z m 97.41667,-20.7891 1.91666,0.079 -0.60416,-0.6042 -0.60417,-0.6041 -1.3125,0.5252 -1.3125,0.5252 1.91667,0.079 z M 296,549.4336 l 1.33333,0 -0.66666,-0.6667 -0.66667,-0.6666 -0.66667,0.6666 -0.66666,0.6667 1.33333,0 z m 2.5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2.5,-1 1.33333,0 -0.66666,-0.6667 -0.66667,-0.6666 -0.66667,0.6666 -0.66666,0.6667 1.33333,0 z m 3,-1 1.33333,0 -0.66666,-0.6667 -0.66667,-0.6666 -0.66667,0.6666 -0.66666,0.6667 1.33333,0 z m 3,-1 1.33333,0 -0.66666,-0.6667 -0.66667,-0.6666 -0.66667,0.6666 -0.66666,0.6667 1.33333,0 z m 2.5,-1.0306 c 0.55,0 1.675,-0.4362 2.5,-0.9694 l 1.5,-0.9694 -1,0 c -0.55,0 -1.675,0.4362 -2.5,0.9694 l -1.5,0.9694 1,0 z m 5.5,-1.9694 1.33333,0 -0.66666,-0.6667 -0.66667,-0.6666 -0.66667,0.6666 -0.66666,0.6667 1.33333,0 z m 16.5,-7 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 77.23861,-119.7158 0.38809,-1.1643 -1.627,-2.8099 -1.62701,-2.81 0.67711,2 c 0.37241,1.1 0.92992,2.8884 1.23892,3.9742 l 0.56181,1.9742 0.38808,-1.1642 z m -3.17959,-7.2842 c 0.24254,0 0.44098,-0.1984 0.44098,-0.441 0,-0.2425 -0.51953,-0.7621 -1.15451,-1.1545 l -1.15451,-0.7135 0.71353,1.1545 c 0.39244,0.635 0.91197,1.1545 1.15451,1.1545 z m -2,-3 c 0.24254,0 0.44098,-0.1984 0.44098,-0.441 0,-0.2425 -0.51953,-0.7621 -1.15451,-1.1545 l -1.15451,-0.7135 0.71353,1.1545 c 0.39244,0.635 0.91197,1.1545 1.15451,1.1545 z m -1.93658,-3 c 0.20766,0 0.37756,-0.1699 0.37756,-0.3776 0,-0.2076 -0.7875,-0.9951 -1.75,-1.75 l -1.75,-1.3724 1.37244,1.75 c 0.75485,0.9625 1.54235,1.75 1.75,1.75 z m -3.06342,-4 c 0.24254,0 0.44098,-0.1984 0.44098,-0.441 0,-0.2425 -0.51953,-0.7621 -1.15451,-1.1545 l -1.15451,-0.7135 0.71353,1.1545 c 0.39244,0.635 0.91197,1.1545 1.15451,1.1545 z m -160.05902,164 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 43.5,-10 -1.33333,0 0.66666,-0.6667 0.66667,-0.6666 0.66667,0.6666 0.66666,0.6667 -1.33333,0 z m 49.5,-20 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 2,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 1.62916,-1.0153 c -0.34604,-0.01 0.0458,-0.4765 0.87084,-1.0402 0.825,-0.5636 3.71145,-2.1768 6.41434,-3.5848 2.70289,-1.408 8.73001,-5.0215 13.39361,-8.03 4.6636,-3.0085 12.12715,-8.5202 16.58566,-12.2482 4.45852,-3.7279 10.24389,-9.1312 12.85639,-12.0071 2.6125,-2.876 4.75,-5.6443 4.75,-6.1517 0,-0.5075 0.45915,-0.9227 1.02032,-0.9227 l 1.02033,0 -1.93815,3.75 -1.93815,3.75 -8.83217,8.4849 -8.83218,8.4848 3.30758,-2.3439 c 1.81916,-1.2892 3.50368,-2.1479 3.74337,-1.9082 0.23969,0.2397 -1.37838,1.6236 -3.59571,3.0753 l -4.03151,2.6395 0.67733,-1.0959 0.67733,-1.096 -1.38919,0.5048 -1.3892,0.5047 0.19444,0.9583 0.19445,0.9584 -1.19445,0.017 c -0.65694,0.01 -5.46944,2.7103 -10.69444,6.0013 -5.225,3.2911 -12.14188,7.1832 -15.37084,8.6491 -3.22897,1.466 -6.15397,2.6585 -6.5,2.6501 z M -55.5,529.4336 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 28,-32 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z M 132.80902,489.3251 112.5,489.2167 101.83805,487.9253 c -5.86407,-0.7102 -13.96407,-2.0271 -18,-2.9263 C 79.80212,484.0998 72.45,482.1889 67.5,480.7525 c -4.95,-1.4363 -12.46667,-4.0947 -16.70371,-5.9075 -4.23704,-1.8127 -9.99,-4.8356 -12.78435,-6.7174 -2.79436,-1.8819 -7.54513,-5.7736 -10.55728,-8.6484 l -5.47662,-5.2269 -2.73902,-4.6594 -2.73902,-4.6593 0.0283,-7 0.0283,-7 3.18009,-6.2687 c 1.74906,-3.4478 5.01492,-8.831 7.25747,-11.9627 2.24255,-3.1317 6.64878,-8.5813 9.79163,-12.1103 3.14284,-3.529 7.73925,-8.5432 10.21425,-11.1427 2.475,-2.5996 6.29273,-6.704 8.48385,-9.121 2.19112,-2.417 7.74423,-8.3808 12.34024,-13.2529 l 8.35639,-8.8583 4.6272,-7.1417 c 2.54495,-3.9279 5.87119,-9.3917 7.39164,-12.1417 1.52045,-2.75 2.7726,-4.6446 2.78256,-4.2102 0.01,0.4344 -0.9411,2.6844 -2.11347,5 -1.17238,2.3156 -4.14927,7.3602 -6.61531,11.2102 -2.46605,3.85 -6.10516,8.9957 -8.08692,11.435 -1.98176,2.4392 -3.70079,5.0999 -3.82008,5.9126 -0.11928,0.8128 -1.29776,2.5586 -2.61883,3.8797 l -2.40194,2.4019 -1.70176,0.2498 -1.70175,0.2497 -4.46091,4.8589 C 55.00741,382.5936 53,385.1827 53,385.6749 l 0,0.8949 2.75,-1.9642 c 1.5125,-1.0803 5.72876,-4.697 9.36947,-8.0371 l 6.61948,-6.0729 6.38052,-9.2747 6.38053,-9.2746 5.21646,-10.0064 5.21645,-10.0063 0.0335,1.3238 c 0.0184,0.7281 -2.15971,5.6879 -4.84034,11.0217 -2.68064,5.3338 -7.05031,12.8381 -9.71037,16.6762 l -4.83649,6.9783 -7.70124,7.6239 -7.70124,7.6239 -5.83839,3.5522 -5.83839,3.5521 -4,4.7369 c -2.2,2.6052 -5.52143,6.351 -7.38097,8.3239 -1.85953,1.9729 -5.12702,5.9371 -7.26109,8.8094 -2.13408,2.8723 -5.56264,8.446 -7.61904,12.386 l -3.7389,7.1637 0.002,6.665 0.002,6.6651 2.99775,4.5668 2.99775,4.5669 5.5,4.9268 c 3.025,2.7097 7.75,6.3425 10.5,8.0728 2.75,1.7304 8.19969,4.5065 12.11043,6.1693 3.91074,1.6627 11.0677,4.1699 15.90436,5.5715 l 8.79392,2.5484 0.50363,-0.5036 0.50364,-0.5036 1.18198,0.9809 1.18198,0.981 11.70551,2.0011 11.70551,2.0012 18.70452,1.0773 18.70452,1.0773 5.15393,-0.6281 5.15393,-0.628 0.65509,1.0599 0.65508,1.06 -20.30901,-0.1085 z M 63.10767,374.4336 c 0.275,0 2.02655,-1.575 3.89233,-3.5 1.86578,-1.925 3.16733,-3.5 2.89233,-3.5 -0.275,0 -2.02655,1.575 -3.89233,3.5 -1.86578,1.925 -3.16733,3.5 -2.89233,3.5 z M 164.25,488.9954 l -9.25,0.6962 0,-0.9419 0,-0.9419 13.88048,-1.1889 c 7.63426,-0.6538 19.22176,-2.1049 25.75,-3.2245 6.52824,-1.1197 16.88011,-3.3611 23.00417,-4.9809 6.12406,-1.6198 14.86829,-4.3218 19.43164,-6.0043 4.56334,-1.6826 12.37775,-5.1105 17.36535,-7.6176 4.9876,-2.507 10.46797,-5.6131 12.1786,-6.9024 1.71063,-1.2893 5.67779,-4.9568 8.8159,-8.1499 l 5.70566,-5.8057 2.16954,-4.5 2.16953,-4.5 -0.0919,-5.6166 -0.0919,-5.6166 -2.89355,-5.7272 -2.89354,-5.7273 -6.17644,-7.7262 -6.17645,-7.7262 -21.42782,-20.93 -21.42782,-20.9299 -4.60284,-6 c -2.53156,-3.3 -6.87112,-10.05 -9.64345,-15 l -5.04061,-9 -0.008,2 c -0.004,1.1 -0.46068,3.6302 -1.01413,5.6227 l -1.00627,3.6226 -4.05717,4.6092 -4.05717,4.6092 -6.29614,3.0049 -6.29614,3.0049 -8.38485,1.9189 c -4.61166,1.0554 -11.45896,2.2026 -15.21622,2.5494 l -6.83138,0.6306 0.54997,-0.8899 0.54998,-0.8899 9.2814,-1.2624 9.28141,-1.2625 6.5,-1.9965 c 3.575,-1.0981 8.3,-2.8943 10.5,-3.9917 2.2,-1.0973 5.50193,-3.4091 7.33763,-5.1373 l 3.33763,-3.1422 1.91237,-3.7102 1.91237,-3.7101 0.116,-4.7899 0.116,-4.7898 0.48528,1.8951 0.48527,1.8952 0.79929,-1.2933 0.79928,-1.2932 3.84944,7.2269 c 2.11719,3.9749 6.63052,11.129 10.02962,15.8982 l 6.18017,8.6711 21.20784,20.5 21.20783,20.5 5.78778,7.0806 5.78779,7.0805 3.71924,6.7664 3.71925,6.7663 0.0352,6.6531 0.0352,6.6531 -2.32281,4.5 c -1.27754,2.475 -4.04616,6.4617 -6.15248,8.8592 -2.10632,2.3976 -6.43873,6.4476 -9.62757,9 l -5.7979,4.6408 -10.97988,5.1569 c -6.03893,2.8363 -15.02987,6.5289 -19.97987,8.2059 -4.95,1.6771 -15.075,4.4019 -22.5,6.0552 -7.425,1.6533 -18.675,3.6679 -25,4.4768 -6.325,0.8089 -15.6625,1.7841 -20.75,2.167 z m 228.25,-3.5618 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -33,-15 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -467.05136,-39 c -0.275,0 0.19811,-1.35 1.05136,-3 0.85325,-1.65 1.77636,-3 2.05136,-3 0.275,0 -0.19811,1.35 -1.05136,3 -0.85325,1.65 -1.77636,3 -2.05136,3 z m 4.05136,-7 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 890.9827,-55 -9.3866,0 -2.8755,-4.25 c -1.5814,-2.3375 -4.3376,-6.8402 -6.1248,-10.0059 l -3.2493,-5.7559 -1.8575,-0.9941 c -1.0216,-0.5468 -3.0688,-0.9941 -4.5493,-0.9941 l -2.6917,0 -9.0027,3.6019 -9.0026,3.6019 -2.1214,-0.9731 c -1.1667,-0.5352 -6.1234,-4.4061 -11.0148,-8.6019 -4.8914,-4.1958 -9.3213,-7.6288 -9.8441,-7.6288 -0.5228,0 -4.3957,2.5192 -8.6065,5.5983 l -7.6559,5.5984 -5,-0.4284 -5,-0.4283 -5.77188,-2.753 c -3.17454,-1.5141 -7.19023,-3.9464 -8.92377,-5.4051 l -3.15188,-2.6521 -3.83414,-5.9322 -3.83414,-5.9321 -10.05298,-10.3328 -10.05298,-10.3327 -2.04477,0 c -1.12462,0 -4.80973,0.733 -8.18912,1.629 l -6.14434,1.6289 -7.02789,0.096 -7.02789,0.096 -4.97211,-2.8893 -4.97211,-2.8893 -11.6175,-11.5859 -11.61751,-11.5859 -4.69197,-9.3484 c -2.58058,-5.1417 -6.47281,-11.9574 -8.64939,-15.1461 l -3.95742,-5.7976 -2.5067,-1.6425 -2.5067,-1.6424 -9.54216,-2.4206 -9.54216,-2.4206 -3.18781,-1.9701 c -1.75329,-1.0836 -6.83662,-5.7145 -11.29628,-10.291 l -8.10846,-8.3207 -3.68328,-5.7728 c -2.0258,-3.175 -4.56546,-7.8308 -5.64369,-10.3463 -1.07824,-2.5154 -3.35641,-8.4676 -5.06261,-13.2272 l -3.10218,-8.6537 -2.15061,-14.3909 -2.15061,-14.3909 -6.61345,-4.1091 -6.61346,-4.1091 -4.78178,-5.4565 c -2.62998,-3.0011 -6.71786,-8.4494 -9.08417,-12.1073 l -4.30239,-6.6508 -2.00847,-7.8927 c -1.10466,-4.341 -2.74963,-13.0565 -3.65549,-19.3678 l -1.64702,-11.475 0.65202,-22.525 c 0.35862,-12.3887 1.01967,-25.1944 1.469,-28.4572 l 0.81698,-5.9324 -4.44224,-5.7203 -4.44224,-5.7203 -0.8824,-6.8474 -0.88241,-6.8473 -0.0327,-12.7898 -0.0327,-12.7899 -2.17275,-4.2101 -2.17275,-4.2102 -1.07725,-11.6407 -1.07725,-11.6407 -9.68428,7.1407 c -5.32636,3.9274 -15.00136,10.4988 -21.5,14.6032 -6.49865,4.1043 -16.72806,10.3212 -22.73204,13.8152 -6.00398,3.4941 -18.33963,9.9254 -27.41256,14.2917 -9.07293,4.3663 -16.68077,7.7543 -16.90631,7.5287 -0.22553,-0.2255 5.81012,-3.4009 13.41257,-7.0565 7.60244,-3.6556 18.77262,-9.3974 24.82262,-12.7596 6.05,-3.3621 17.3,-10.1178 25,-15.0125 l 14,-8.8996 0.1141,-1.9481 0.11409,-1.9482 12.75876,-12.1958 12.75875,-12.1959 -0.98535,-0.3284 -0.98535,-0.3285 -3.47937,3.2875 c -1.91365,1.8081 -5.71677,5.425 -8.45137,8.0375 l -4.972,4.75 -1.19774,0 c -0.65876,0 -3.43444,1.4625 -6.16817,3.25 l -4.97042,3.25 -0.018,1.116 -0.018,1.116 -6.18536,2.384 c -3.40195,1.3112 -7.44835,2.8556 -8.99199,3.4319 -1.54365,0.5764 -3.37274,1.7366 -4.06464,2.5784 -0.69191,0.8417 -5.16423,4.5326 -9.9385,8.202 l -8.68048,6.6717 -1.44707,0 -1.44707,0 -1.33135,1.6042 c -0.73224,0.8823 -2.37409,2.0006 -3.64856,2.4852 -1.27447,0.4845 -3.31796,1.0895 -4.5411,1.3445 -1.22313,0.2549 -6.41791,2.0719 -11.54395,4.0377 -5.12604,1.9657 -10.30104,4.1983 -11.5,4.9613 -1.19896,0.7629 -9.37993,3.7153 -18.17993,6.5608 -8.8,2.8456 -24.00646,7.3734 -33.79213,10.0619 -9.78567,2.6885 -23.28567,6.0766 -30,7.5291 -6.71433,1.4525 -14.90787,3.255 -18.20787,4.0056 -3.3,0.7506 -17.025,2.9704 -30.5,4.9329 l -24.5,3.5682 -21,1.563 -21,1.5629 -27.5,-0.6106 c -15.125,-0.3358 -29.525,-0.8294 -32,-1.0969 -2.475,-0.2675 -11.925,-1.1718 -21,-2.0095 -9.075,-0.8377 -19.875,-2.173 -24,-2.9673 -4.125,-0.7943 -8.625,-1.6279 -10,-1.8524 l -2.5,-0.4082 5.5,-0.1124 5.5,-0.1123 4,0.9507 c 2.2,0.5229 11.2,1.6267 20,2.453 8.8,0.8262 23.19232,1.9627 31.98293,2.5254 l 15.98294,1.0232 19.01706,-0.021 19.01707,-0.02 18,-1.4282 18,-1.4281 22,-3.1068 22,-3.1068 21.5,-4.5385 c 11.825,-2.4962 28.025,-6.2761 36,-8.3998 7.975,-2.1238 23.05,-6.6256 33.5,-10.0042 10.45,-3.3785 20.575,-6.9871 22.5,-8.0191 1.925,-1.032 6.425,-2.9506 10,-4.2636 3.575,-1.313 10.72895,-4.7358 15.89766,-7.6062 5.16871,-2.8704 11.12227,-6.3076 13.23013,-7.6383 2.10785,-1.3306 4.17891,-2.4196 4.60234,-2.4199 0.42343,-4e-4 3.34899,-2.0254 6.50124,-4.5 3.15225,-2.4747 5.95758,-4.4994 6.23407,-4.4994 0.27648,0 3.20987,-1.3114 6.51863,-2.9142 3.30876,-1.6027 6.02961,-2.6152 6.04634,-2.25 0.0167,0.3653 0.48766,-0.1207 1.04651,-1.0801 0.55886,-0.9594 3.67634,-3.5509 6.92774,-5.7589 3.25139,-2.2079 7.05546,-4.4494 8.45348,-4.9809 l 2.54186,-0.9664 0,-0.8772 c 0,-0.4825 2.62415,-2.9389 5.83145,-5.4587 3.2073,-2.5198 6.9198,-5.7284 8.25,-7.1303 l 2.41855,-2.5487 1.25,-0.017 1.25,-0.017 0,-0.9866 0,-0.9866 3.25,-1.3845 3.25,-1.3845 2.16113,-2.3789 c 1.18863,-1.3084 3.88863,-4.6916 6,-7.5182 2.11138,-2.8267 5.92268,-7.5517 8.46957,-10.5 2.54688,-2.9484 7.85917,-9.0732 11.80509,-13.6107 3.94591,-4.5375 7.4297,-8.25 7.74175,-8.25 0.31204,0 -0.0503,0.7875 -0.8051,1.75 l -1.37244,1.75 1.59201,-1.24132 1.59201,-1.24133 0.55799,0.55799 0.55799,0.55799 -0.15,-1.81666 -0.15,-1.81667 1.32433,0.27478 1.32433,0.27477 -0.63062,-1.02036 -0.63061,-1.02036 2.80628,-2.66798 c 1.54346,-1.46739 2.24379,-2.34282 1.55629,-1.9454 l -1.25,0.72258 0,-0.65128 c 0,-0.35821 0.94076,-1.84727 2.09057,-3.30902 1.14981,-1.46175 2.37454,-2.54889 2.72162,-2.41587 l 0.63105,0.24187 0.0284,-2.22399 0.0284,-2.22398 1.78936,-0.34878 1.78936,-0.34879 -0.67725,2.83091 c -0.37248,1.55699 -1.10394,3.37369 -1.62545,4.0371 l -0.9482,1.20619 0.60056,0.97173 0.60056,0.97173 -5.0273,6.64198 c -2.76502,3.6531 -6.03744,8.52307 -7.27204,10.82207 -1.2346,2.2991 -3.79947,6.4301 -5.69971,9.1801 -1.90024,2.75 -4.78293,6.4639 -6.40597,8.2531 -1.62304,1.7893 -3.15664,3.0475 -3.408,2.7961 -0.25137,-0.2513 0.87724,-2.1652 2.508,-4.2531 1.63077,-2.0878 5.09646,-7.7336 7.70154,-12.5461 2.60508,-4.8125 4.50809,-8.75 4.22891,-8.75 -0.27917,0 -1.91676,2.463 -3.63908,5.4733 l -3.13149,5.4733 -2.93508,2.0899 -2.93507,2.09 -1.00683,-0.6223 -1.00682,-0.6222 -0.0765,0.809 c -0.0421,0.4449 -0.23971,1.6813 -0.43917,2.7474 l -0.36267,1.9385 -6.62351,6.3056 -6.62351,6.3056 0.53911,0.8723 0.5391,0.8723 -1.80757,1.6358 -1.80757,1.6359 -0.54424,-0.5443 -0.54423,-0.5442 -0.47059,2.4618 -0.4706,2.4617 6.59598,-5.2321 c 3.62779,-2.8777 7.27098,-5.6076 8.09598,-6.0666 l 1.5,-0.8345 -4,4.2391 c -2.2,2.3316 -5.93725,5.5864 -8.305,7.2328 l -4.305,2.9937 -1.36914,-0.5254 -1.36913,-0.5254 -2.56025,2.5602 -2.56026,2.5603 0.6389,1.0338 0.6389,1.0337 -0.98257,-0.6072 -0.98257,-0.6073 -5.55822,5.7027 c -3.05702,3.1366 -6.08481,6.8278 -6.7284,8.2028 l -1.17019,2.5 2.05647,-2.3608 c 1.13105,-1.2984 2.05646,-2.047 2.05646,-1.6634 0,0.3835 2.8125,-1.6191 6.25,-4.4502 3.4375,-2.8312 11.17377,-9.5076 17.1917,-14.8366 6.01794,-5.3289 15.79004,-14.639 21.71579,-20.689 l 10.77408,-11 0.0342,1.0796 c 0.0188,0.5938 -2.51839,3.9688 -5.63826,7.5 -3.11986,3.5312 -9.08236,9.9315 -13.25,14.2229 l -7.57752,7.8025 -12.34543,10.1975 -12.34543,10.1975 0.4161,11.5 0.41611,11.5 2.33776,4.5 2.33776,4.5 0.20115,14 c 0.11063,7.7 0.54433,16.6127 0.96378,19.806 l 0.76264,5.806 4.45021,6.0452 4.45021,6.0452 -0.82243,9.6488 -0.82243,9.6488 0.0744,23 c 0.0409,12.65 0.26683,24.6509 0.50204,26.6687 0.23522,2.0178 0.73324,3.9743 1.10672,4.3478 l 0.67906,0.679 -0.49517,1.2904 -0.49516,1.2904 2.09749,8.8315 2.09749,8.8316 4.40685,7.0705 4.40685,7.0705 5.92638,6.4598 5.92637,6.4598 4.13335,2.314 4.13335,2.314 0.0127,-0.814 c 0.007,-0.4477 -1.18452,-4.737 -2.64772,-9.5317 l -2.66037,-8.7177 -0.7475,0.4619 -0.74749,0.462 -0.60479,-1.576 c -0.33263,-0.8669 -0.57315,-2.1018 -0.53449,-2.7443 l 0.0703,-1.1682 0.95024,2 0.95024,2 -0.50687,-2.5 c -0.27878,-1.375 -0.55787,-3.4 -0.62021,-4.5 l -0.11333,-2 -0.74933,2.5 -0.74933,2.5 -0.75522,-4.6879 -0.75522,-4.6879 1.67559,-3.3121 1.67558,-3.3121 -3.70944,-3 c -2.0402,-1.65 -6.16011,-5.2385 -9.15535,-7.9745 -2.99524,-2.736 -7.4331,-7.618 -9.86191,-10.8491 -2.4288,-3.231 -4.39241,-6.3925 -4.36356,-7.0255 l 0.0525,-1.1509 1.69755,2.4847 c 0.93365,1.3666 4.24608,5.4593 7.36095,9.095 l 5.66339,6.6103 6.48015,5.1564 6.48015,5.1564 0.63057,1.6432 0.63056,1.6432 -1.4462,1.6054 c -0.79541,0.883 -1.75504,2.8429 -2.13252,4.3554 l -0.68632,2.75 1.10841,0 1.10841,0 0,-1.3257 0,-1.3257 2.25,-2.0253 c 1.2375,-1.1139 2.97959,-2.281 3.87132,-2.5935 l 1.62132,-0.5683 0.61329,-2.4435 c 0.33731,-1.344 2.42287,-5.5402 4.63458,-9.325 2.21171,-3.7848 5.17316,-9.8959 6.581,-13.5801 l 2.55971,-6.6987 3.90918,-3.5317 3.90918,-3.5317 2.54125,-0.6379 2.54126,-0.6378 2.23396,0.5725 2.23395,0.5725 -2.5,-1.9378 c -1.375,-1.0658 -3.04014,-1.9478 -3.70031,-1.9601 l -1.20031,-0.022 -1.01928,-1.75 -1.01928,-1.75 -0.0304,2.202 -0.0304,2.2019 -4.38777,3.0189 -4.38777,3.0189 -3.52668,8.4247 c -1.93967,4.6336 -5.61315,11.9593 -8.16329,16.2792 l -4.63661,7.8544 0.68952,-3 c 0.37924,-1.65 2.40009,-6.375 4.49078,-10.5 2.09069,-4.125 4.74763,-10.0525 5.90431,-13.1723 l 2.10305,-5.6723 3.81562,-3.4471 c 2.0986,-1.896 4.34728,-3.6244 4.99708,-3.841 l 1.18146,-0.3939 -1.78176,-4.9867 c -0.97997,-2.7427 -3.04115,-7.2367 -4.5804,-9.9867 -1.53926,-2.75 -3.65186,-6.8832 -4.69466,-9.1849 -1.04281,-2.3017 -3.27456,-8.7929 -4.95945,-14.4248 L 496,20.0842 l 0,-6.8253 0,-6.8253 0.75,0 0.75,0 -0.29345,6.2518 -0.29344,6.2518 1.0151,-1.5 1.01511,-1.5 -0.55448,4 -0.55448,4 1.17715,-1.5 1.17715,-1.5 -0.59344,1.8295 -0.59344,1.8294 0.60579,2.4137 0.60578,2.4136 0.88187,-0.545 0.88187,-0.5451 -0.58126,1.5148 -0.58127,1.5147 1.67566,5.045 1.67567,5.0449 0.9056,-0.5597 0.9056,-0.5597 -0.57223,1.4912 -0.57222,1.4912 1.13143,1.8108 1.13143,1.8107 -0.5955,-2.5 -0.5955,-2.5 1.10187,1.7579 1.10187,1.7579 -0.60448,0.9781 -0.60448,0.9781 2.64538,4.514 c 1.45496,2.4827 2.85418,4.514 3.10938,4.514 0.2552,0 0.14291,-0.5195 -0.24953,-1.1545 l -0.71353,-1.1545 1.11084,0.6865 1.11083,0.6866 -0.62626,1.632 -0.62627,1.632 1.03036,-0.6368 1.03035,-0.6368 1.79431,3.9791 1.79431,3.979 4.35699,3.5703 4.35698,3.5702 -0.65091,1.0532 -0.6509,1.0532 1.38919,-0.505 1.3892,-0.505 2.86141,2.6253 2.86142,2.6252 -0.69987,-3.291 -0.69986,-3.2909 1.3301,-1.6027 c 0.73156,-0.8815 3.05149,-2.3337 5.15541,-3.2273 l 3.8253,-1.6246 5.19901,-6.443 5.199,-6.4431 4.42392,-3.3742 4.42392,-3.3743 4.88175,-7.4361 4.88175,-7.4361 5.16502,-3.4784 c 2.84076,-1.9131 5.73353,-3.4783 6.42837,-3.4783 l 1.26335,0 -0.0213,-8.75 -0.0213,-8.75 -3.04244,-8.5 c -1.67334,-4.675 -4.61836,-12.9808 -6.54449,-18.4574 l -3.50204,-9.9575 -1.03744,-12.0425 -1.03743,-12.0426 1.72644,-15.879 1.72644,-15.879 -0.46103,-7.121 -0.46104,-7.121 -2.10775,-4.7541 -2.10776,-4.754 -2.80443,-1.0897 -2.80444,-1.0896 -7,2.2165 -7,2.2166 -4.66864,3.1272 -4.66863,3.1271 -4.2455,5.5 c -2.33503,3.025 -8.39562,9.775 -13.46799,15 -5.07236,5.225 -9.46297,10.175 -9.75691,11 l -0.53444,1.5 -0.0789,-2.9183 -0.0789,-2.9184 7.82078,-7.5816 c 4.30143,-4.17 9.92941,-10.3639 12.50663,-13.7644 2.57722,-3.4004 6.34434,-7.5497 8.37138,-9.2206 l 3.68553,-3.0379 6.48992,-2.5981 6.48992,-2.5981 4.81842,-0.5706 4.81842,-0.5707 3.29878,3.4977 3.29878,3.4978 1.20072,4.0076 1.20072,4.0076 0.18498,10.384 0.18498,10.384 0.30504,-5.5 c 0.16777,-3.025 0.81078,-9.8926 1.42891,-15.2614 l 1.12387,-9.7613 0.99324,-0.6139 0.99325,-0.6139 -0.55018,1.8753 c -0.30259,1.0313 -0.78601,3.9002 -1.07427,6.3752 -0.28826,2.475 -0.78059,8.55 -1.09408,13.5 -0.31348,4.95 -0.76668,17.0577 -1.00711,26.9061 l -0.43714,17.906 0.98498,6.945 0.98498,6.945 3.40567,10.149 c 1.87311,5.5819 4.48507,13.0739 5.80433,16.6489 1.31927,3.575 2.92712,9.2 3.57299,12.5 0.64588,3.3 1.2916,7.125 1.43494,8.5 l 0.26062,2.5 3.15159,-0.315 3.15159,-0.3151 4.02186,1.083 4.02187,1.083 5.32655,4.004 5.32654,4.004 0.57635,-2.7719 c 0.31699,-1.5246 1.10165,-3.7496 1.74368,-4.9444 0.64203,-1.1949 2.31539,-3.0756 3.71857,-4.1793 1.40318,-1.1037 5.67745,-3.2333 9.49836,-4.7324 l 6.94712,-2.7256 6.05862,-6.8171 6.05862,-6.817 6.51445,-4.2781 6.51444,-4.2781 4.05853,-6.4213 4.05854,-6.4212 4.76053,-4.7606 4.76054,-4.7605 9.24475,-4.643 9.2447,-4.6429 -0.666,-5.6664 -0.6659,-5.6663 -2.5028,-5.4667 c -1.3765,-3.0067 -3.5467,-6.8357 -4.8227,-8.5089 -1.2759,-1.6732 -3.67759,-5.7422 -5.33697,-9.0422 l -3.01705,-6 -1.17693,-7.033 -1.17694,-7.0329 -0.19625,-25.58848 -0.19626,-25.58846 -4.31172,-8.50187 -4.31172,-8.50187 -3.05694,-3.12671 -3.05693,-3.12671 -2.48673,0 c -1.3677,0 -6.37681,1.18539 -11.13135,2.6342 -4.75453,1.4488 -11.10823,3.79936 -14.11932,5.22346 l -5.4747,2.58927 -8.0253,8.50685 c -4.41391,4.67877 -10.96698,11.44071 -14.56237,15.02653 l -6.53708,6.51969 -7.46292,3.82442 c -4.10461,2.10343 -8.95295,4.74464 -10.7741,5.86937 l -3.31118,2.04491 0.54972,1.4326 0.54973,1.4326 -1.10035,-0.6801 -1.10035,-0.68 -0.83382,1.3491 -0.83382,1.3492 -0.59182,-0.5918 -0.59181,-0.5918 1.20914,-2.6538 1.20915,-2.65382 3.57369,-2.22544 c 1.96553,-1.22399 5.22068,-2.97188 7.23368,-3.88419 2.013,-0.91231 6.10653,-3.22378 9.09673,-5.13659 l 5.43674,-3.47783 10.65861,-11.86342 10.6586,-11.86341 4.95107,-3.37362 4.95108,-3.37361 10.29819,-3.42261 c 5.66401,-1.88244 12.1369,-3.67786 14.3842,-3.98983 l 4.08599,-0.56722 3.68167,3.23255 3.68167,3.23254 3.4554,6.17884 c 1.90048,3.39837 4.21979,8.18227 5.15403,10.6309 l 1.69863,4.45206 0.16986,26.5 0.16987,26.5 1.28282,5.5 1.28282,5.5 2.51749,5 c 1.38465,2.75 3.56995,6.3811 4.85625,8.069 1.2864,1.688 3.6353,5.963 5.22,9.5 l 2.8811,6.431 0.6337,4.1477 0.6336,4.1477 -0.5921,2.8523 -0.5922,2.8523 -8.6533,4.1658 -8.6533,4.1659 -4.15495,3.5807 -4.15494,3.5807 -5.55902,8.2535 -5.55902,8.2534 -4.58159,2.4131 -4.5816,2.4132 -7.93677,8.3846 -7.93677,8.3847 -5.61876,1.9331 c -3.09033,1.0632 -7.10037,2.8488 -8.91121,3.968 l -3.29245,2.0348 -1.60646,3.3854 -1.60646,3.3854 0,2.5988 0,2.5989 -1.68555,0 -1.68555,0 -2.50224,-2.25 -2.50223,-2.25 3.57247,4.5 c 1.96486,2.475 5.72365,7.8436 8.35287,11.9303 2.62922,4.0867 5.58507,9.4867 6.56854,12 l 1.78814,4.5697 0.0468,-1.5282 c 0.0257,-0.8405 -1.53418,-4.8271 -3.46646,-8.8591 -1.93227,-4.032 -4.40363,-8.4628 -5.4919,-9.8463 l -1.97867,-2.5155 0.61971,-4.1255 0.61971,-4.1254 2.11434,-3.8532 2.11434,-3.8532 3.71161,-1.8935 c 2.04139,-1.0415 6.31993,-2.8589 9.50786,-4.0389 l 5.79623,-2.1452 5.26025,-3.4621 5.26024,-3.462 5.59472,-6.1459 c 3.07709,-3.3803 8.66366,-10.4572 12.4146,-15.7264 l 6.81989,-9.5804 3.53541,-3.1042 c 1.94448,-1.7073 5.4658,-4.2146 7.82519,-5.5718 2.3593,-1.3572 7.579,-3.6366 11.5993,-5.0654 l 7.3096,-2.5978 4.9901,0 4.99,0 2.8498,1.4737 2.8497,1.4736 4.466,5.1053 4.466,5.1053 4.5451,8.171 c 2.4998,4.4941 5.2095,10.1961 6.0216,12.6711 l 1.4764,4.5 1.6619,13.1741 1.662,13.1741 1.8175,6.3556 c 0.9996,3.4956 3.6387,10.1673 5.8645,14.8259 l 4.047,8.4703 3.4441,4.5034 c 1.8942,2.4768 4.8937,6.8593 6.6655,9.7389 l 3.2215,5.2355 0,7.9789 c 0,4.3883 -0.2386,8.3649 -0.5302,8.8367 -0.2916,0.4718 -3.4651,2.3476 -7.0522,4.1683 l -6.5219,3.3103 -4.5608,4.4964 -4.5608,4.4963 -4.1435,7.1177 -4.1436,7.1176 -10.0725,9.8255 -10.0724,9.8256 -4,2.3348 c -2.2,1.2841 -7.6,3.5579 -12,5.0527 l -8,2.7179 -2.25,2.4275 -2.25,2.4275 0,1.4443 0,1.4442 -0.9737,0 -0.9737,0 4.3969,4.3969 4.3969,4.3969 2.0326,3.8531 c 1.1179,2.1192 2.0525,3.4977 2.0768,3.0633 0.024,-0.4344 -0.8079,-2.4594 -1.8494,-4.5 -1.0415,-2.0406 -2.8415,-4.5674 -4,-5.6152 l -2.1064,-1.905 0,-1.8946 c 0,-1.0421 0.6686,-3.1876 1.4858,-4.7679 l 1.4857,-2.8732 5.7643,-2.0968 c 3.1703,-1.1533 7.6272,-2.7814 9.9042,-3.6179 2.277,-0.8366 6.2941,-2.9478 8.927,-4.6918 l 4.787,-3.1707 6.573,-6.6123 6.573,-6.6123 4.5,-7.2654 c 2.475,-3.996 5.85,-9.0985 7.5,-11.3389 l 3,-4.0734 4.7608,-3.2696 4.7608,-3.2696 5.7392,-2.1934 5.7392,-2.1934 7.2604,-0.5066 7.2603,-0.5065 6.4373,3.169 6.4372,3.169 7.3872,7.9516 7.3872,7.9516 2.6789,4.9221 2.6789,4.922 2.4052,10.8395 c 1.3228,5.9617 3.1512,13.0895 4.0631,15.8395 0.912,2.75 3.4367,8.5276 5.6106,12.8391 2.1739,4.3115 6.9116,12.173 10.5283,17.4701 l 6.5759,9.6311 -0.4824,4.2798 -0.4824,4.2799 1.8771,0 1.8772,0 0,-4.9402 0,-4.9403 -4.8037,-6.3097 c -2.6421,-3.4704 -6.4709,-9.075 -8.5085,-12.4546 -2.0377,-3.3797 -4.882,-8.7797 -6.3208,-12 l -2.616,-5.8552 -3.7411,-15.1828 -3.741,-15.1827 -2.5899,-4.4193 c -1.4245,-2.4307 -4.1972,-6.3431 -6.1615,-8.6943 l -3.5716,-4.2749 0.634,-2.123 c 0.3487,-1.1677 1.4694,-4.0553 2.4903,-6.417 1.0209,-2.3617 2.8054,-5.6269 3.9655,-7.2561 l 2.1092,-2.9621 11.2962,-7.4279 c 6.213,-4.0853 14.0222,-9.6963 17.3539,-12.4689 l 6.0576,-5.0412 6.3849,-8.2749 c 3.5117,-4.5512 8.3219,-11.1999 10.6893,-14.7749 2.3675,-3.575 6.6149,-8.8924 9.4388,-11.8164 2.8239,-2.924 8.1018,-7.5271 11.7285,-10.2291 3.6268,-2.702 8.5768,-5.8122 11,-6.9116 l 4.4059,-1.999 4.7898,-0.022 4.7899,-0.022 3.7509,1.9136 3.751,1.9136 7.1764,7.5548 7.1763,7.5549 2.6178,5.1659 2.6177,5.1659 2.3652,12.3132 2.3651,12.3133 4.0366,10.3243 4.0366,10.3243 3.2633,5.2268 c 1.7949,2.8748 5.2884,7.7774 7.7634,10.8946 l 4.5,5.6676 0,6.7314 0,6.7313 -8.5,8.2105 -8.5,8.2104 6.577,-5.9122 6.5771,-5.9122 3.7207,-1.7656 3.7206,-1.7655 5.8807,-1.0937 5.8807,-1.0936 4.8216,1.8374 4.8216,1.8375 5.5854,5.3209 5.5854,5.321 2.5698,5.2548 2.5698,5.2548 1.1757,12 1.1757,12 1.9633,7.5077 1.9633,7.5078 5.4513,6.4406 c 2.9983,3.5423 5.7108,7.2578 6.0279,8.2567 l 0.5764,1.8162 0.928,-0.5735 0.928,-0.5735 0,-1.8185 0,-1.8185 -5.9533,-7.108 -5.9534,-7.1081 -1.921,-6.7644 -1.921,-6.7645 -0.9745,-13.1542 -0.9745,-13.1542 -2.556,-4.3458 c -1.4058,-2.3902 -3.7238,-5.4367 -5.1511,-6.7701 l -2.5952,-2.4243 0,-2.1457 0,-2.1457 3.5863,-4.43 3.5862,-4.43 -4.5636,4.9469 -4.5636,4.9468 -4.2726,-2.4468 -4.2727,-2.4469 -10.3558,0.03 -10.3557,0.03 0.6061,-4.422 0.606,-4.422 -1.0012,-3.7183 -1.0012,-3.7183 -3.8632,-4.3897 c -2.1248,-2.4144 -5.2752,-6.6167 -7.001,-9.3385 l -3.1377,-4.9487 -3.9126,-10.0513 -3.9125,-10.0513 -2.2198,-11.5 -2.2198,-11.5 -2.8199,-6 -2.82,-6 -4.0459,-4.8589 c -2.2252,-2.6724 -4.0359,-5.3724 -4.0238,-6 0.012,-0.6276 0.878,-3.0267 1.9243,-5.3314 l 1.9025,-4.1903 4.2186,-4.5767 4.2186,-4.5766 7.607,-5.3562 c 4.1838,-2.9459 9.69,-7.2035 12.2358,-9.4613 l 4.6288,-4.1052 4.5941,-6.7717 c 2.5267,-3.7244 5.2873,-8.4592 6.1346,-10.5217 0.8473,-2.0625 1.3482,-3.75 1.1132,-3.75 -0.2351,0 -2.073,2.9426 -4.0843,6.5391 l -3.6568,6.5391 -6.1445,6.5685 -6.1444,6.5684 -9.6847,6.8666 -9.6847,6.8666 -3.6906,4.2758 c -2.0298,2.3518 -4.6623,5.9599 -5.85,8.0182 l -2.1595,3.7423 -1.1276,0.01 c -0.6201,0 -1.7451,-0.7386 -2.5,-1.6508 -0.7548,-0.9121 -3.1724,-2.4773 -5.3724,-3.478 l -4,-1.8196 -6,0 -6,0 -4.3592,1.9781 c -2.3976,1.0879 -5.0246,1.978 -5.8379,1.978 l -1.4787,0 0.7302,-4.25 c 0.4016,-2.3375 0.6692,-6.05 0.5947,-8.25 l -0.1355,-4 -1.1873,-3 c -0.653,-1.65 -3.7435,-6.6 -6.8678,-11 -3.1243,-4.4 -6.4053,-9.35 -7.2911,-11 -0.8857,-1.65 -3.1532,-7.275 -5.0388,-12.5 -1.8856,-5.225 -3.6805,-10.4 -3.9886,-11.5 -0.3082,-1.1 -1.2726,-7.5475 -2.1433,-14.3279 l -1.583,-12.3278 -2.034,-5.4363 -2.034,-5.4363 -3.4228,-5.0863 -3.4229,-5.0864 0,-2.3625 0,-2.3625 2.0433,-5.1837 c 1.1237,-2.8511 3.3807,-7.04629 5.0155,-9.32267 l 2.9723,-4.13887 9.5644,-7.39833 9.5644,-7.39833 5.8903,-6.42824 c 3.2397,-3.53553 7.8792,-9.41526 10.3101,-13.06605 2.4309,-3.6508 6.6067,-10.42552 9.2797,-15.05493 l 4.86,-8.41712 4.942,-4.97725 4.942,-4.97724 6.558,-4.2161 6.558,-4.21611 3.8152,-1.23859 3.8152,-1.2386 3.589,0.67332 3.5891,0.67331 5.7612,5.76121 5.7612,5.76121 3.9342,6.08697 3.9342,6.08696 2.234,7.32757 c 1.2288,4.03017 3.3654,10.70258 4.7481,14.82758 1.3827,4.125 5.1891,13.125 8.4588,20 l 5.9449,12.5 5.8829,9 5.8829,9 1.1688,4.4571 1.1689,4.4571 -0.6821,6.3699 -0.6822,6.3699 -5.6621,6.2681 c -3.1142,3.4474 -6.7035,8.1378 -7.9762,10.423 -1.2727,2.2852 -2.136,4.1549 -1.9184,4.1549 0.2176,0 1.8285,-2.2114 3.5798,-4.9141 l 3.1843,-4.9141 5.4844,-5.0125 5.4844,-5.0124 5.5205,-2.701 5.5204,-2.7009 3.6677,0.5952 3.6676,0.5952 5.892,5.7823 c 3.2405,3.1803 8.4721,8.9676 11.6258,12.8606 l 5.7339,7.0784 2.0715,5.4216 c 1.1394,2.982 3.5203,10.5351 5.2909,16.7849 1.7707,6.2497 4.2578,13.6747 5.5271,16.5 l 2.3076,5.1368 7.0873,9.8707 7.0872,9.8707 0.079,3.6293 0.079,3.6293 1.0223,-2.8037 1.0222,-2.8036 -0.6074,-3.1964 -0.6074,-3.1963 -6.0156,-7.5 c -3.3086,-4.125 -7.0764,-9.3718 -8.3729,-11.6596 l -2.3573,-4.1596 -3.0361,-9.8404 c -1.6699,-5.4122 -4.0001,-13.3776 -5.1781,-17.7008 l -2.1419,-7.8605 -2.5314,-4.01 c -1.3923,-2.2055 -5.1916,-6.8694 -8.4429,-10.3643 l -5.9114,-6.3544 0,-1.4048 c 0,-0.7726 1.5458,-4.4965 3.435,-8.2752 l 3.435,-6.8704 -2.4448,3 c -1.3447,1.65 -2.9808,4.4625 -3.6359,6.25 l -1.1911,3.25 -1.3396,0 c -0.7368,0 -2.7093,-1.0125 -4.3834,-2.25 l -3.0439,-2.25 -4.3104,0.093 -4.3103,0.093 -4.2711,2.1132 -4.2711,2.1131 -0.9584,-0.5923 -0.9584,-0.5923 0.6014,-6.1143 0.6013,-6.1142 -0.8995,-3.8725 -0.8994,-3.8724 -6.4491,-9.6276 c -3.547,-5.29511 -7.3579,-11.4275 -8.4687,-13.6275 -1.1108,-2.2 -4.0559,-8.76939 -6.5448,-14.59864 l -4.5253,-10.59865 -3.1483,-10.89573 -3.1484,-10.89573 -3.0528,-5.00562 c -1.679,-2.7531 -4.6095,-6.92355 -6.5122,-9.26767 l -3.4594,-4.26203 0.7024,-3.19809 c 0.3863,-1.75894 1.5008,-5.06061 2.4766,-7.33703 l 1.7741,-4.13896 5.3503,-4.58612 c 2.9426,-2.52236 8.6418,-7.36137 12.6648,-10.75335 l 7.3146,-6.16724 3.4106,-4.64757 c 1.8759,-2.55616 3.4218,-5.0852 3.4354,-5.62008 0.014,-0.53487 -0.7167,0.14013 -1.623,1.5 -0.9063,1.35988 -3.4938,4.43023 -5.75,6.823 -2.2562,2.39277 -7.4772,6.94219 -11.6022,10.10981 -4.125,3.16763 -9.3139,7.73491 -11.531,10.14951 l -4.0309,4.39019 -1.1253,3 c -0.6189,1.65 -1.3784,3.7875 -1.6877,4.75 l -0.5623,1.75 -1.6371,0 -1.637,0 -2.9711,-2.5 -2.9711,-2.5 -4.9553,0 -4.9554,0 -3.59,1.5 c -1.9745,0.825 -4.2101,1.5 -4.9679,1.5 l -1.3779,0 -0.022,-8.75 -0.022,-8.75 -1.9319,-4.25615 c -1.0626,-2.34088 -3.9239,-7.06588 -6.3586,-10.5 -2.4346,-3.43412 -5.5513,-8.49385 -6.9259,-11.24385 -1.3746,-2.75 -3.6627,-8.6 -5.0848,-13 -1.4221,-4.4 -3.0837,-10.88244 -3.6924,-14.40543 -0.6088,-3.52298 -2.0221,-8.85151 -3.1407,-11.84118 l -2.0337,-5.43576 -4.4867,-5.50839 -4.4866,-5.50839 0.6048,-3.22387 0.6048,-3.22386 2.9343,-4.627 2.9344,-4.62699 3.8034,-2.41595 c 2.0919,-1.32877 6.7828,-4.04054 10.4241,-6.02614 l 6.6206,-3.61019 5.3794,-5.83992 5.3794,-5.83992 4.8974,-8.78188 c 2.6936,-4.83003 5.8436,-9.69094 7,-10.80202 1.1564,-1.11108 5.2399,-3.54182 9.0744,-5.40163 l 6.9718,-3.38148 3.8524,0 3.8525,0 6.1757,5.74418 c 3.3967,3.15931 5.1506,4.57926 3.8975,3.15546 l -2.2782,-2.58873 0.6876,-1.7919 0.6876,-1.79191 -1.4094,0.4876 -1.4093,0.4876 -2.8271,-2.35144 c -1.5549,-1.2933 -3.9064,-2.62235 -5.2256,-2.95345 l -2.3986,-0.60201 -4.7025,1.6023 c -2.5864,0.88127 -5.5223,1.6023 -6.5243,1.6023 l -1.8219,0 0,0.93602 0,0.93601 -3.7672,2.11727 -3.7672,2.11727 -2.0935,3.19672 c -1.1514,1.75819 -3.8105,6.34671 -5.9091,10.19671 l -3.8157,7 -6.1118,6.13074 -6.1118,6.13074 -7.2368,3.64439 -7.2368,3.64438 -3.8555,3.48323 -3.8555,3.48323 -2.1473,4.99165 -2.1474,4.99164 -0.943,0 c -0.5186,0 -3.0162,-1.46138 -5.5502,-3.2475 l -4.6073,-3.2475 -4.339,0.16793 -4.339,0.16792 -2.1036,1.12582 -2.1036,1.12582 -1.0947,-0.67656 -1.0947,-0.67656 0.5357,-4.61969 0.5357,-4.61968 -0.9779,-4.6321 -0.978,-4.6321 -4.958,-7.85178 -4.9581,-7.85177 -2.0794,-5.51612 c -1.1437,-3.03387 -2.6694,-8.44113 -3.3904,-12.01613 l -1.311,-6.5 -0.094,3.50318 -0.094,3.50318 1.8653,6.52264 c 1.0259,3.58744 2.8491,8.45097 4.0515,10.80782 1.2023,2.35686 3.6446,6.62025 5.4272,9.47419 1.7827,2.85394 3.7845,6.44766 4.4486,7.98604 l 1.2074,2.79706 0,4.82794 c 0,2.65537 -0.279,6.22319 -0.6201,7.92848 l -0.6201,3.10053 -7.1299,3.9417 -7.1299,3.94169 -4.5962,4.83278 c -2.5278,2.65802 -6.7371,7.67189 -9.3539,11.14192 l -4.7578,6.30914 -7.2564,6.19086 -7.2564,6.19085 -9.1324,5.35978 -9.1325,5.35978 -2.9317,3.33899 -2.9316,3.33899 -3.1081,6.5123 c -1.7094,3.58177 -3.4929,6.75021 -3.9634,7.04099 l -0.8555,0.52868 -3.5688,-4.3553 -3.5689,-4.3553 -3.5662,-1.69228 -3.5662,-1.69228 -4.477,0.67137 -4.477,0.67137 -0.027,-0.86355 c -0.015,-0.47495 -0.1415,-4.04311 -0.2814,-7.92926 l -0.2544,-7.06571 -2.5239,-4.93429 c -1.3882,-2.71385 -4.4705,-8.66995 -6.8497,-13.23576 l -4.3257,-8.30149 0.049,-5.4327 0.049,-5.43269 -0.9088,-2.76582 -0.9088,-2.76582 0.3388,9.5 0.3389,9.5 6.6522,12.74619 6.6522,12.74618 0,4.37882 c 0,2.40834 -0.2817,5.78746 -0.6261,7.50915 l -0.626,3.13034 -10.124,4.89006 -10.1239,4.89006 -3.8236,3.72424 c -2.103,2.04833 -6.4689,7.07902 -9.7019,11.17931 l -5.8782,7.45507 -10.483,9.88251 -10.4829,9.88251 -8.9259,4.48284 -8.92584,4.48284 -2.58594,3.07321 -2.58593,3.07321 -2.25023,6.98673 -2.25023,6.98673 -1.73578,0 -1.73577,0 -0.60551,-1.90777 -0.6055,-1.90778 -4.5677,-4.21035 -4.56769,-4.21035 -4.14419,0.55319 c -2.2793,0.30425 -5.79731,0.86071 -7.81779,1.23657 l -3.67361,0.68338 0.3593,-11.86845 0.3593,-11.86844 -1.03476,7.5 c -0.56911,4.125 -1.55268,9.75 -2.18569,12.5 l -1.15094,5 -9.5,4.60047 -9.5,4.60047 -12.78485,13.57469 -12.78485,13.5747 -9.90215,5.08638 c -5.44619,2.79752 -11.2805,6.2462 -12.96515,7.66373 l -3.063,2.57735 0,-1.13665 c 0,-0.62515 1.20071,-2.24942 2.66826,-3.60949 l 2.66825,-2.47286 8.93014,-4.70847 8.93014,-4.70848 3.25815,-3.02092 c 1.79198,-1.66151 7.66687,-7.87317 13.0553,-13.8037 l 9.79715,-10.78278 9.34704,-4.6401 9.34704,-4.64011 1.0948,-3.57712 1.09481,-3.57711 0.52735,-11.17299 0.52734,-11.17298 -1.84292,-8.82702 -1.84292,-8.82701 0.16614,-12.5 0.16615,-12.5 4.05389,-15.86928 4.05389,-15.86927 0,-5.19922 0,-5.19923 -1.49004,-5.01749 -1.49003,-5.0175 -1.85148,-1.67556 -1.85148,-1.67557 -3.93712,1.3891 c -2.16541,0.764 -7.52423,3.20499 -11.90848,5.42441 l -7.97137,4.03532 -4.45821,4.58714 -4.45821,4.58715 -1.43155,0 -1.43154,0 -1.3627,-1.75 -1.3627,-1.75 0.63699,2 0.63699,2 -1.60273,-2 c -0.88151,-1.1 -1.61704,-2.36406 -1.63454,-2.80902 l -0.0322,-0.81391 1,0.61803 1,0.61803 0,-0.94823 c 0,-0.52153 -0.85961,-2.01058 -1.91025,-3.30902 l -1.91024,-2.36078 -17.83976,-0.5 -17.83975,-0.5 -9.5,0.70556 c -5.225,0.38805 -16.74626,1.21353 -25.60281,1.83439 l -16.1028,1.12884 -18.3972,0.007 -18.39719,0.007 -9.89207,-1.61593 c -5.44064,-0.88876 -10.08883,-1.41917 -10.32931,-1.1787 -0.24048,0.24048 1.96096,0.93848 4.89207,1.55111 2.93112,0.61264 6.00431,1.54506 6.82931,2.07205 0.825,0.527 1.13883,0.96507 0.69741,0.97349 -0.44143,0.008 -3.92893,-0.69576 -7.75,-1.56484 L 458,-292.72671 l 0,-1.21181 c 0,-0.66649 2.29679,-5.24292 5.10397,-10.16984 2.80719,-4.92692 11.08061,-17.95804 18.38539,-28.95804 7.30478,-11 20.29905,-30.06368 28.87616,-42.36373 8.5771,-12.30006 16.84118,-24.33675 18.36461,-26.74822 l 2.76987,-4.38447 1.0372,-0.002 1.03719,-0.002 0.15136,-2.00934 0.15136,-2.00933 2.22505,-3.24067 c 1.22378,-1.78236 3.1375,-4.26128 4.2527,-5.50869 1.11521,-1.24742 2.14923,-3.06468 2.29782,-4.03835 0.14859,-0.97367 1.34567,-4.22805 2.66017,-7.23196 1.31451,-3.00391 2.68832,-6.69072 3.05292,-8.1929 l 0.66292,-2.73124 -3.62323,-4.01048 -3.62323,-4.01049 -0.82202,0.50804 -0.82201,0.50803 -0.72361,-1.17082 -0.72361,-1.17082 1.40451,0.76426 c 0.77248,0.42034 0.0545,-0.39547 -1.59549,-1.81291 l -3,-2.57717 -1.05038,0.35943 -1.05039,0.35944 -2.44961,-1.35658 -2.44962,-1.35658 1.40004,-0.0354 1.40004,-0.0354 -3.90004,-2.78971 c -2.14502,-1.53399 -6.15004,-4.10281 -8.90004,-5.70812 l -5,-2.91876 -10.31951,-3.14126 -10.3195,-3.14125 -2.05325,-3.40028 -2.05325,-3.40027 -13.47579,-13.25 c -7.41169,-7.2875 -13.8333,-13.25 -14.27026,-13.25 -0.43695,0 -1.06245,-0.69837 -1.39,-1.55194 l -0.59553,-1.55194 1.23854,0.65286 c 0.6812,0.35908 -1.68084,-2.09968 -5.24898,-5.4639 l -6.48752,-6.11676 -1.48199,0.56869 -1.482,0.5687 0.71084,-0.71085 0.71085,-0.71084 -1.11377,-1.34201 c -0.61257,-0.73811 -1.53523,-1.34201 -2.05034,-1.34201 l -0.93657,0 0.75097,1.25 0.75098,1.25 -1.68095,-1.36331 -1.68095,-1.3633 0.50963,-0.8246 0.50963,-0.82459 -6.18745,-5.0065 -6.18745,-5.00649 -1.08319,0.19439 -1.08319,0.1944 0.25,-1.25 0.25,-1.25 -1,0 c -0.55,0 -1.3375,-0.0444 -1.75,-0.0986 -0.4125,-0.0542 -1.5501,-0.52682 -2.52801,-1.05018 l -1.77801,-0.95156 0.52227,-0.84504 0.52226,-0.84504 -1.54619,-0.59333 -1.5462,-0.59333 0.61096,0.98854 0.61095,0.98855 -0.69098,0 c -0.38004,0 -2.2066,-0.9367 -4.05902,-2.08156 -1.85241,-1.14487 -3.36803,-2.28142 -3.36803,-2.52569 0,-0.24427 1.35,0.25399 3,1.10724 1.65,0.85325 3,1.32636 3,1.05136 0,-0.275 -1.32149,-1.18337 -2.93665,-2.0186 l -2.93666,-1.51861 -1.81334,0.58726 -1.81335,0.58725 1.5,-1.07901 c 0.825,-0.59347 2.12637,-1.08592 2.89194,-1.09434 0.76556,-0.008 4.36556,1.85393 8,4.13855 3.63443,2.28462 10.57259,7.46947 15.41813,11.52189 l 8.81007,7.36803 0.95624,-0.59099 0.95624,-0.59099 -0.72463,-1.17248 c -0.39855,-0.64487 2.81581,1.74872 7.14303,5.31909 4.32722,3.57038 13.53347,11.37578 20.45833,17.34535 l 12.59065,10.85376 -16.0882,-16.07436 -16.0882,-16.07436 1.0882,-0.38082 1.0882,-0.38082 3.33478,2.60142 c 1.83412,1.43078 8.39826,7.32642 14.58696,13.10142 6.1887,5.775 12.44495,11.30429 13.90279,12.28731 l 2.6506,1.7873 -0.23757,1.07986 -0.23756,1.07986 1.78696,0.29977 1.78696,0.29978 -6.24455,-6.66694 -6.24455,-6.66694 -0.86674,0.27478 -0.86674,0.27477 0.57388,-0.92855 0.57388,-0.92855 -12.99618,-12.03866 -12.99617,-12.03866 -15.25338,-11.35745 c -8.38935,-6.2466 -17.27837,-12.74025 -19.75337,-14.43033 -2.475,-1.69008 -8.775,-5.65225 -14,-8.80483 l -9.5,-5.73195 2.81402,2.97626 c 1.54772,1.63694 5.25828,4.72156 8.24571,6.85471 l 5.43168,3.87846 -0.55425,2.6548 -0.55425,2.6548 1.05854,0.65422 1.05855,0.65421 0,1.82436 0,1.82435 -1.83332,0.47942 -1.83332,0.47943 -5.72068,-3.3683 -5.72068,-3.36829 -2.30337,0.57811 -2.30338,0.57811 -0.61006,-3.75938 -0.61007,-3.75938 0.84863,-1.06323 0.84863,-1.06323 -0.32217,-4 c -0.17719,-2.2 -0.38315,-4 -0.4577,-4 -0.0745,0 -0.29234,-0.82873 -0.48399,-1.84163 -0.19165,-1.0129 -0.49472,-1.94442 -0.67348,-2.07005 -0.17877,-0.12563 -3.25004,-2.0343 -6.82504,-4.2415 -3.575,-2.2072 -10.69139,-5.93429 -15.8142,-8.28242 -5.1228,-2.34814 -9.51311,-4.07042 -9.75624,-3.8273 -0.24312,0.24313 1.61093,1.49793 4.12013,2.78845 2.50919,1.29053 4.78537,2.70757 5.05817,3.14898 l 0.49602,0.80256 -1.80194,-0.57019 -1.80194,-0.57018 2.5,2.01073 c 1.375,1.1059 3.4,2.76066 4.5,3.67726 l 2,1.66653 -3.5,-2.13632 c -1.925,-1.17498 -6.65,-3.7569 -10.5,-5.7376 -3.85,-1.9807 -11.45749,-5.27655 -16.90553,-7.32412 l -9.90553,-3.72285 1.40553,-0.6234 1.40553,-0.62341 -3.5,0.5489 -3.5,0.54891 1.33308,-0.92104 1.33308,-0.92104 -4.70472,-1.18466 -4.70472,-1.18466 -0.54503,0.54502 -0.54502,0.54503 1.83333,0 1.83333,0 -0.54866,0.54867 -0.54867,0.54867 -2.71302,-0.68093 -2.71302,-0.68092 1.34502,-0.95194 1.34502,-0.95193 -3.5,0.58279 -3.5,0.5828 1.29385,-0.83473 1.29385,-0.83472 -7.71294,-1.69479 -7.71294,-1.69479 -0.7105,0.78091 c -0.39077,0.4295 -3.01463,7.98091 -5.8308,16.78091 -2.81617,8.8 -9.74219,29.99149 -15.39116,47.09219 l -10.27085,31.0922 3.52074,-0.74526 c 1.93641,-0.4099 7.12075,-1.05899 11.52075,-1.44242 l 8,-0.69716 -0.52757,0.54446 c -0.29016,0.29945 -4.56516,1.09731 -9.5,1.77302 -4.93484,0.67572 -10.54743,1.34326 -12.47243,1.48344 -1.925,0.14017 -5.43906,0.28741 -7.80902,0.3272 l -4.30901,0.0723 0.54085,0.87512 0.54085,0.87511 -4.63167,-0.52206 -4.63166,-0.52205 0.65121,1.05368 0.65121,1.05368 -1.99879,-0.52269 -1.99878,-0.5227 -4.7526,1.53572 -4.75259,1.53571 -11.79771,1.1992 c -6.48874,0.65956 -12.00976,0.98715 -12.26893,0.72798 -0.25917,-0.25917 4.3748,-1.01167 10.29771,-1.67222 5.92291,-0.66054 12.00643,-1.43778 13.51893,-1.72719 l 2.75,-0.5262 0,-1.1636 c 0,-0.63998 7.23541,-23.19997 16.07868,-50.13331 8.84328,-26.93334 16.51268,-49.78064 17.04313,-50.77178 l 0.96444,-1.80207 -1.29313,-0.46043 c -0.71121,-0.25321 -8.49312,-1.32184 -17.29312,-2.3747 l -16,-1.9143 4,-0.10136 c 2.2,-0.0557 9.80051,0.58154 16.89003,1.4162 7.08952,0.83466 13.09471,1.31288 13.34488,1.06272 0.25016,-0.25016 9.63714,-28.6604 20.85996,-63.13385 11.22282,-34.47345 20.39081,-63.19326 20.3733,-63.82179 -0.0175,-0.62854 -2.19242,-3.5774 -4.83314,-6.55303 l -4.80131,-5.41024 -17.91686,2.66809 c -9.85427,1.46745 -18.46178,2.66456 -19.12779,2.66024 l -1.21093,-0.008 -10.61027,-15.25 c -5.83565,-8.3875 -10.94757,-15.83743 -11.35983,-16.5554 l -0.74955,-1.30541 -15.67021,1.76445 -15.6702,1.76444 -0.91378,-0.95904 c -0.50258,-0.52747 -3.93875,-7.70904 -7.63593,-15.95904 -3.69718,-8.25 -7.06218,-15.37464 -7.47778,-15.83253 l -0.75564,-0.83252 -8.44541,1.58252 c -4.64497,0.87039 -9.58939,1.58253 -10.98761,1.58253 l -2.54221,0 -1.71147,-11.75 c -0.94131,-6.4625 -1.94474,-12.58373 -2.22985,-13.60273 l -0.51839,-1.85273 -5.4,0.67469 -5.40001,0.67468 0,-1.99195 c 0,-1.09558 1.14094,-7.31546 2.53542,-13.82196 1.39448,-6.5065 2.75719,-12.56202 3.02825,-13.45671 l 0.49284,-1.62671 3.91365,-0.62582 3.91364,-0.62581 5.13566,-7.429 5.13566,-7.429 14.17244,0.54513 14.17244,0.54513 4.62625,-3.65097 4.62625,-3.65096 23.69507,2.53777 23.69506,2.53778 3.67869,-0.55394 3.67868,-0.55394 37,4.55318 c 20.35,2.50424 37.675,4.5527 38.5,4.55213 l 1.5,-10e-4 1.80024,-6.12578 1.80023,-6.12577 2.87284,-2.87284 2.87284,-2.87284 4.97159,0 4.97159,0 6.56322,2.02717 6.56322,2.02718 4.29212,3.2661 4.29211,3.2661 0.89087,3.56143 0.89087,3.56143 -2.13998,6.33683 -2.13998,6.33683 1.24911,0.80518 c 0.68701,0.44283 14.74911,8.75862 31.24911,18.47952 16.5,9.7209 30.225,17.96763 30.5,18.32607 0.275,0.35844 10.175,6.4237 22,13.47837 11.825,7.05466 22.23532,13.45694 23.13405,14.22727 l 1.63406,1.40061 1.26978,4.53522 1.26979,4.53523 13.34616,8.93239 13.34616,8.93239 0,8.4352 0,8.4352 4,3.21449 4,3.21449 0,1.95588 c 0,1.07574 -2.07887,7.75042 -4.6197,14.83264 l -4.61971,12.87675 -1.07557,0 c -0.59157,0 -2.33301,-1.20469 -3.86987,-2.6771 -1.53686,-1.4724 -2.93056,-2.4849 -3.09711,-2.25 -0.16656,0.23491 -3.82655,4.3646 -8.13333,9.1771 l -7.8305,8.75 -1.87711,0 -1.8771,0 -0.0332,-0.75 c -0.0183,-0.4125 -2.61034,-3.60115 -5.7601,-7.08588 l -5.72686,-6.33588 -14.88199,9.17881 -14.882,9.17881 -2.22521,-1.1909 c -1.22386,-0.65499 -6.36913,-5.35212 -11.43393,-10.43807 l -9.20873,-9.24717 -18.61207,6.89353 -18.61207,6.89352 -13.28198,-13.25464 -13.28198,-13.25464 -6.27992,1.29533 c -3.45395,0.71242 -11.10385,2.42362 -16.99977,3.80265 l -10.71987,2.50734 -18.53013,56.30923 C 311.33856,-636.09429 303,-610.33474 303,-609.82092 l 0,0.93421 7.25,1.26332 c 3.9875,0.69483 14,2.98911 22.25,5.0984 8.25,2.10929 19.61768,5.44618 25.2615,7.4153 5.64383,1.96912 13.29383,5.05671 17,6.86132 3.70618,1.80462 13.9385,7.49022 22.7385,12.63468 8.8,5.14446 19.15,11.49151 23,14.10457 3.85,2.61305 13.59199,9.63541 21.64887,15.60524 l 14.64886,10.85425 13.78254,12.99161 13.78254,12.99162 13.5686,15.54755 c 7.46272,8.55115 15.36859,18.08771 17.56859,21.19235 l 4,5.64481 2.5,1.14233 c 1.375,0.62828 6.1,3.5593 10.5,6.51337 4.4,2.95407 10.3625,7.55564 13.25,10.22572 l 5.25,4.85469 0,3.35983 0,3.35984 -3.10578,6.73807 -3.10578,6.73807 6.53394,15.34169 c 3.59366,8.43792 7.09124,17.26669 7.77239,19.61947 l 1.23846,4.2778 0.72793,-0.2778 c 0.40037,-0.15278 5.49177,-5.61611 11.31423,-12.14072 l 10.58629,-11.86293 4.51916,-3.52084 4.51916,-3.52085 0,-1.58914 0,-1.58914 6.82211,-10.02709 6.8221,-10.02708 2.30313,-5.5 c 1.26671,-3.025 4.00378,-8.875 6.08235,-13 2.07858,-4.125 5.16965,-9.40504 6.86904,-11.73343 l 3.08981,-4.23343 7.51227,-4.26657 7.51227,-4.26657 -0.45856,-1.92452 -0.45855,-1.92451 1.06229,-5.07549 1.06229,-5.07548 5.36844,-8.12258 5.36843,-8.12257 6.07829,-5.62743 c 3.34306,-3.09508 6.54902,-5.62742 7.12436,-5.62742 0.57534,0 3.3419,-2.06414 6.1479,-4.58699 l 5.10184,-4.58698 4.59779,-2.32988 c 2.52878,-1.28143 9.29908,-3.9681 15.0451,-5.97037 l 10.4473,-3.64049 6.5,-0.55711 6.5,-0.55712 5,-2.34463 5,-2.34463 7,-1.22437 7,-1.22438 6.1942,-5.73007 c 3.4068,-3.15154 8.3568,-7.23147 11,-9.06652 l 4.8058,-3.33646 17.5,0.1088 17.5,0.1088 6.7211,1.9989 6.721,1.99889 -0.6558,-1.1077 c -0.3608,-0.60923 -3.1061,-4.93269 -6.1007,-9.60769 -2.9947,-4.675 -9.3027,-13.9 -14.0178,-20.5 -4.7152,-6.6 -12.2375,-16.27833 -16.7163,-21.5074 -4.4789,-5.22907 -11.3609,-12.61368 -15.2935,-16.41026 l -7.1501,-6.90286 -6.504,-3.89515 -6.5039,-3.89515 0,-1.2896 c 0,-0.70928 0.8229,-2.03435 1.8287,-2.94459 l 1.8288,-1.65499 2.4594,0 2.4593,0 4.4619,2.41393 c 2.454,1.32766 8.1121,4.1948 12.5734,6.37141 4.4613,2.17661 8.4239,4.46292 8.8057,5.08069 0.3818,0.61777 1.6386,1.62864 2.7929,2.24639 l 2.0986,1.12317 -2.3399,-3.86779 c -1.2869,-2.12729 -7.3446,-11.5178 -13.4615,-20.8678 -6.1169,-9.35 -14.6122,-21.725 -18.8784,-27.5 -4.2662,-5.775 -11.8807,-15.2406 -16.9211,-21.03467 l -9.1642,-10.53466 -6.7341,-5.46534 -6.734,-5.46533 0.2223,-1.5 0.2223,-1.5 6.3159,-0.29969 6.3158,-0.29969 8.6741,4.66627 8.6741,4.66627 8,7.09948 c 4.4,3.90471 7.2893,6.21475 6.4207,5.13342 -0.8686,-1.08133 -4.2237,-6.24106 -7.4558,-11.46606 -3.232,-5.225 -9.9463,-15.34959 -14.9207,-22.4991 -4.9743,-7.1495 -12.8137,-17.4995 -17.4208,-23 l -8.3766,-10.0009 -7.4189,-6.36351 -7.41889,-6.36351 0.37486,-1.13649 0.37487,-1.13649 6.17876,-0.29793 6.1788,-0.29793 8.2418,4.50731 8.2419,4.5073 10.1406,10.29063 10.1406,10.29062 9.9106,13 9.9106,13 12.0378,18.5 c 6.6208,10.175 17.7868,28.36426 24.8135,40.42058 l 12.7757,21.92057 12.4635,24.31872 c 6.8549,13.3753 12.826,24.54282 13.2692,24.81671 l 0.8058,0.498 1.254,-3.02733 1.2539,-3.02734 -6.2676,-17.70996 c -3.4472,-9.74047 -12.7589,-35.03495 -20.6928,-56.20995 -7.9339,-21.175 -18.2638,-48.175 -22.9553,-60 l -8.53,-21.5 -8.752,-18.03609 -8.752,-18.03609 -8.0658,-11.96391 -8.0658,-11.96391 -7.0972,-6.97318 -7.0973,-6.97318 0,-1.27682 0,-1.27682 5.6962,0 5.6963,0 4.0537,2.71215 c 2.2296,1.49168 7.7909,5.36512 12.3585,8.60764 l 8.3048,5.89549 9.9949,11.6024 9.995,11.60239 8.1118,13.03996 c 4.4615,7.17199 8.4394,13.41776 8.8398,13.8795 l 0.7281,0.83953 -1.2595,-5.33953 c -0.6928,-2.93674 -3.3314,-13.21453 -5.8637,-22.83953 -2.5323,-9.625 -6.1283,-22 -7.9911,-27.5 -1.8627,-5.5 -5.943,-16.22579 -9.0672,-23.83508 l -5.6804,-13.83508 -6.1458,-11.66492 -6.1458,-11.66492 -5.8128,-7.69096 -5.8128,-7.69097 0,-1.55903 0,-1.55904 1.0445,0 c 0.5745,0 4.062,0.73786 7.75,1.63968 l 6.7055,1.63969 2.3509,2.11031 2.3509,2.11032 -1.988,-3.5 c -1.0934,-1.925 -4.1623,-8.45 -6.8198,-14.5 l -4.8318,-11 -8.1717,-14.11913 -8.1716,-14.11912 -7.1095,-8.69736 -7.1094,-8.69735 0,-1.43352 c 0,-0.78844 0.3088,-1.43352 0.6862,-1.43352 0.3774,0 4.0899,0.95173 8.25,2.11495 l 7.5638,2.11495 9.1065,7.63505 9.1066,7.63505 9.3934,12.75821 9.3935,12.75821 9.1949,16.74179 9.1949,16.74179 10.4239,24.5 c 5.7332,13.475 11.8796,28.91592 13.6587,34.31316 1.779,5.39724 3.4126,9.63522 3.63,9.41773 0.2175,-0.21748 -0.9875,-7.5584 -2.6777,-16.31316 -1.6903,-8.75475 -5.7155,-26.71773 -8.9448,-39.91773 l -5.8716,-24 -6.0007,-19.68715 -6.0007,-19.68716 -6.6309,-17.31284 -6.6309,-17.31285 -8.5823,-16.969 -8.5824,-16.969 -7.3402,-10.1216 c -4.0371,-5.5668 -7.3402,-10.6433 -7.3402,-11.281 0,-0.6377 0.3375,-1.164 0.75,-1.1695 0.4125,-0.01 3.675,0.9955 7.25,2.2246 l 6.5,2.2348 11.6395,11.739 11.6395,11.739 9.9675,15.7864 9.9675,15.7863 9.7,20.87227 9.7,20.87227 9.943,27.4126 c 5.4686,15.07693 9.943,28.16148 9.943,29.07677 l 0,1.66417 4.8456,4.55096 4.8457,4.55096 7.2636,10.5 7.2636,10.5 -0.5269,-2 c -0.2898,-1.1 -0.8165,-6.725 -1.1703,-12.5 -0.3539,-5.775 -1.9744,-22.14084 -3.6011,-36.36854 -1.6267,-14.22769 -4.5245,-35.60269 -6.4395,-47.5 -1.915,-11.8973 -5.5439,-31.30646 -8.0643,-43.13146 l -4.5825,-21.5 -5.5594,-19.5 -5.5594,-19.5 -5.9709,-15.5 -5.9708,-15.5 -5.8867,-10.7874 c -3.2377,-5.933 -5.8867,-11.2205 -5.8867,-11.75 l 0,-0.9626 1.5752,0 1.5751,0 6.7495,4.0098 6.7495,4.0098 7.8534,9.6429 7.8535,9.6429 7.9298,14.5973 c 4.3615,8.0285 8.5984,16.2678 9.4155,18.3096 l 1.4855,3.7123 1.8089,0.5741 1.8088,0.5741 8.3477,10.1032 8.3476,10.1031 7.5,14.0977 7.5,14.0978 4.257,2.3415 4.257,2.3415 6.1863,8.6712 6.1862,8.6712 5.8021,13.82955 5.802,13.82956 4.4161,15.67044 c 2.4289,8.61875 4.6197,16.79545 4.8685,18.17045 l 0.4524,2.5 0.1362,-2.50211 c 0.075,-1.37616 1.4752,-7.22616 3.1118,-13 1.6365,-5.77384 3.999,-13.10505 5.25,-16.29157 l 2.2744,-5.79368 2.1612,-0.54243 2.1611,-0.54243 6.1812,2.25376 6.1811,2.25375 3.9501,5.34702 c 2.1725,2.94086 4.8776,6.91917 6.0114,8.84069 l 2.0613,3.49367 4.2959,13.10579 4.2958,13.10579 2.7991,1.83615 2.799,1.83614 1.7194,3.29973 1.7193,3.29973 1.1867,-3 c 0.6527,-1.65 2.2308,-5.7 3.507,-9 1.2761,-3.3 6.1229,-15 10.7704,-26 4.6476,-11 11.6407,-26.86575 15.5402,-35.25723 3.8995,-8.39147 9.8677,-20.31647 13.2627,-26.5 l 6.1726,-11.24277 5.6123,-7.6472 5.6122,-7.6471 4.3184,-2.6196 4.3185,-2.6195 0.9458,0.5845 c 0.5202,0.3215 1.923,2.4666 3.1174,4.7667 l 2.1714,4.1822 0.4361,21.79477 0.436,21.79477 1.775,-1.60637 1.775,-1.60638 5.6182,-0.57984 5.6181,-0.57984 1.844,1.66877 1.844,1.66878 0.6299,6.77721 0.6298,6.77722 -1.4366,14.96356 c -0.7901,8.22996 -3.0529,25.75542 -5.0285,38.94546 -1.9755,13.19004 -3.8496,24.88189 -4.1646,25.98189 l -0.5727,2 0.9907,-1 c 0.5449,-0.55 3.3728,-4.375 6.2843,-8.5 2.9115,-4.125 10.5715,-14.025 17.0223,-22 l 11.7287,-14.5 11.3494,-11.07452 11.3494,-11.07451 8,-5.09134 8,-5.09134 6.9119,-1.0431 6.9119,-1.0431 0.9279,0.57348 0.9279,0.57347 -0.6652,3.54567 c -0.3658,1.95011 -6.2549,19.74985 -13.087,39.55496 -6.832,19.80511 -12.3091,36.12194 -12.1714,36.25962 0.1376,0.13768 8.0462,-8.37609 17.5746,-18.91948 l 17.3244,-19.16981 14.6725,-13.64792 14.6725,-13.64791 12.5,-9.24645 12.5,-9.24644 11.3719,-5.3752 11.372,-5.3752 8.878,-0.63018 8.8781,-0.63019 -0.04,1.39975 -0.04,1.39974 -6.1456,4.5 c -3.38,2.475 -11.5343,9.675 -18.1205,16 l -11.9751,11.5 -14.6028,17.5 c -8.0315,9.625 -15.6398,18.9625 -16.9073,20.75 -1.2675,1.7875 -1.9879,3.25 -1.601,3.25 0.3869,0 4.3901,-3.34699 8.896,-7.43775 l 8.1925,-7.43775 14.6942,-9.95574 14.6941,-9.95574 12.062,-5.17689 12.062,-5.17689 8.916,-0.57764 8.9159,-0.57764 0,1.55785 0,1.55785 -9.75,6.03045 -9.75,6.03044 -14,12.00801 -14,12.008 -9.5,10.25226 c -5.225,5.63874 -8.825,9.83874 -8,9.33333 l 1.5,-0.91894 9,0.25759 c 4.95,0.14168 9.7875,0.49528 10.75,0.78578 l 1.75,0.5282 0,1.19765 0,1.19765 -8.6393,5.44122 -8.6392,5.44122 -11.8832,10.98254 -11.8831,10.98254 -4.1369,5.47933 -4.137,5.47933 1.9094,-0.77533 c 1.0501,-0.42643 6.6445,-2.48334 12.432,-4.57091 l 10.5228,-3.79557 4.4772,0.4388 4.4773,0.43881 17.5,-13.58555 17.5,-13.58555 14.7879,-8.56525 14.7879,-8.56525 11.7121,-3.85568 11.7121,-3.85568 4.1033,-0.0296 c 2.2568,-0.0163 6.8693,0.25956 10.25,0.61291 l 6.1467,0.64245 0,1.12727 0,1.12727 -11.75,6.41031 -11.75,6.4103 -13.6823,10.29557 -13.6823,10.29556 -15.8177,14.50695 c -8.6997,7.97882 -21.9667,20.96247 -29.4821,28.85255 -7.5155,7.89008 -20.9735,22.86043 -29.9067,33.26745 -8.9333,10.40702 -23.7321,28.59686 -32.8864,40.42186 -9.1543,11.825 -20.6979,27.125 -25.6524,34 -4.9545,6.875 -9.3462,13.06334 -9.7593,13.75187 l -0.7511,1.25188 2.6463,1.00612 2.6463,1.00612 12.1638,-11.38821 c 6.6902,-6.26352 20.0968,-18.07961 29.7925,-26.25799 l 17.6287,-14.86979 16.8713,-11.90524 16.8714,-11.90524 12,-6.71432 c 6.6,-3.69287 15.15,-8.29459 19,-10.22603 l 7,-3.51171 10.2158,-2.2764 10.2159,-2.2764 6.4623,1.74927 6.4623,1.74927 0.4892,1.2748 0.4892,1.2748 -10.6674,4.20206 -10.6673,4.20205 -13.761,8.39494 -13.7609,8.39494 -13.2391,10.22593 c -7.2814,5.62426 -17.289,13.82039 -22.239,18.21363 -4.95,4.39323 -9.9,8.82116 -11,9.83985 l -2,1.85215 4,-1.9071 c 2.2,-1.04891 7.2996,-3.34458 11.3324,-5.1015 l 7.3324,-3.1944 11.2075,-1.91716 11.2076,-1.91716 6.8446,1.95738 c 3.7646,1.07656 7.0647,2.17743 7.3336,2.44636 0.2689,0.26894 0.2505,1.07088 -0.041,1.7821 l -0.5299,1.29313 -8.3437,3.44947 -8.3436,3.44948 -10.9812,6.92 c -6.0397,3.80601 -13.5772,8.91754 -16.75,11.35898 -3.1729,2.44143 -5.7688,4.67342 -5.7688,4.95997 0,0.28656 1.3511,0.22425 3.0025,-0.13845 l 3.0025,-0.65946 3.4975,2.16156 3.4975,2.16157 -0.01,1.66844 0,1.66844 -7.9596,2.38491 -7.9596,2.38491 -10.8346,6.18267 -10.8346,6.18267 -12.4508,9.35686 c -6.8479,5.14627 -20.0687,15.88711 -29.3794,23.86854 -9.3107,7.98143 -23.2607,20.44159 -31,27.68926 -7.7393,7.24766 -25.2612,24.15141 -38.9377,37.56387 l -24.8662,24.38631 0.3662,2.23387 0.3663,2.23387 13,-8.08839 13,-8.08838 13.5,-6.75094 c 7.425,-3.71302 16.6238,-7.9898 20.4417,-9.50397 3.818,-1.51416 8.543,-3.75739 10.5,-4.98495 1.9571,-1.22755 12.3333,-6.9129 23.0583,-12.6341 l 19.5,-10.40219 16.5,-7.28558 16.5,-7.28557 13.6721,-3.97183 13.6721,-3.97184 9.5558,0 9.5557,0 5.5221,2.70832 5.5222,2.70832 0,1.22429 0,1.22429 -1.75,0.49816 c -0.9625,0.27399 -5.35,1.27017 -9.75,2.21374 l -8,1.71557 -13.8079,5.37271 c -7.5944,2.95499 -17.9444,7.42623 -23,9.93609 -5.0557,2.50986 -15.1536,7.78879 -22.44,11.73095 l -13.2478,7.16756 0,1.11601 0,1.11601 -5.7908,2.11142 -5.7908,2.11143 -21.9592,13.58405 -21.9592,13.58405 -15.4932,11.68852 c -8.5213,6.42868 -21.0281,16.11913 -27.7929,21.53433 l -12.2997,9.84583 1.1653,1.40417 c 0.641,0.7723 1.7917,1.40418 2.5572,1.40418 0.7655,0 8.4433,-3.19044 17.0619,-7.08987 l 15.6702,-7.08987 16.5656,-5.95099 c 9.1111,-3.27305 19.7156,-6.66149 23.5656,-7.52987 3.85,-0.86839 7.7327,-1.96149 8.6282,-2.42913 0.8955,-0.46764 6.8294,-1.97478 13.1864,-3.34921 l 11.5582,-2.49895 6.6409,0.79949 6.6409,0.79949 2.3868,2.91946 c 1.3127,1.6057 2.4029,3.44613 2.4226,4.08986 l 0.036,1.1704 -6.75,0.58205 -6.75,0.58205 -11.5,2.62929 -11.5,2.62929 -14.5406,5.28131 c -7.9973,2.90471 -21.4973,8.40544 -30,12.22383 -8.5027,3.8184 -19.0594,8.75848 -23.4594,10.97797 l -8,4.03543 4.5,1.15106 c 2.475,0.63309 8.1,2.54502 12.5,4.24874 4.4,1.70372 10.7,4.44461 14,6.09087 3.3,1.64625 7.8784,4.28154 10.1743,5.8562 l 4.1743,2.86301 2.9532,5.25404 c 1.6243,2.88973 4.0983,8.17905 5.4977,11.75405 l 2.5444,6.5 1.0097,7.34834 c 0.5554,4.04159 1.153,7.44787 1.3281,7.5695 0.1751,0.12163 4.7213,2.63176 10.1028,5.57807 l 9.7845,5.35692 8.7643,8.59081 8.7643,8.59081 3.2486,5.98278 3.2485,5.98277 2.6224,9 2.6224,9 0.08,7 0.08,7 -2.1525,4.30652 -2.1525,4.30652 0.5123,10.19348 0.5123,10.19348 3.4762,6.4409 3.4762,6.44089 1.8425,8.55911 c 1.0133,4.7075 2.8317,14.61385 4.0407,22.01411 l 2.1983,13.45501 -1.1754,3.25055 -1.1754,3.25056 1.5047,2.90983 c 0.8276,1.6004 3.5749,9.8329 6.105,18.29443 2.5301,8.46154 5.2692,18.53461 6.0869,22.38461 l 1.4866,7 -0.6127,8 c -0.337,4.4 -1.2872,11.80003 -2.1116,16.4445 -0.8245,4.64448 -2.4236,11.16948 -3.5537,14.5 -1.1301,3.33053 -2.8361,7.4055 -3.7911,9.0555 l -1.7364,3 0.7036,6 0.7036,6 5.2814,17.99933 5.2814,17.99933 0.7486,16.00064 0.7486,16.0007 -0.5036,10.5 -0.5036,10.5 -0.9342,1.1795 -0.9341,1.1796 -0.2505,25.9393 -0.2505,25.9394 -2.7287,5.3811 c -1.5008,2.9596 -5.6641,9.4311 -9.2519,14.3811 -3.5877,4.95 -7.6666,10.6702 -9.0643,12.7116 l -2.5411,3.7116 0.151,20.3634 0.1511,20.3635 -1.6119,13.9249 c -0.8866,7.6588 -2.2505,16.9646 -3.0309,20.6796 l -1.4188,6.7546 -3.3947,8.79 c -1.8671,4.8345 -4.8315,11.6361 -6.5875,15.1148 l -3.1927,6.3248 -3.6204,3.3166 -3.6203,3.3167 -3.7928,1.7103 -3.7928,1.7104 -6.7619,13.574 -6.7619,13.574 -3.5003,3.5296 c -1.9252,1.9413 -4.8759,4.2463 -6.5573,5.1223 l -3.057,1.5927 -2.3119,8.7515 -2.3119,8.7515 -5.1701,10.1558 c -2.8436,5.5857 -9.1331,16.4558 -13.9768,24.1558 -4.8437,7.7 -11.2365,17.375 -14.2063,21.5 -2.9698,4.125 -6.7608,8.9478 -8.4244,10.7173 l -3.0248,3.2173 -6.7299,3.9791 c -3.7015,2.1886 -10.1049,5.3137 -14.2299,6.9448 l -7.5,2.9657 -6.6933,0.6983 -6.6933,0.6983 -7.7944,11.1396 -7.7945,11.1396 -9.6812,9.7178 -9.6813,9.7177 -6.831,4.4165 c -3.757,2.429 -9.614,5.5868 -13.0153,7.0172 -3.4014,1.4305 -9.6969,3.5645 -13.9899,4.7423 l -7.8055,2.1414 -7.0102,-0.6197 -7.0101,-0.6197 -4.7399,-1.4559 -4.7398,-1.4558 -4.7602,1.4224 -4.7601,1.4225 -5,3.3165 c -2.75,1.8241 -8.6711,5.8945 -13.158,9.0454 l -8.158,5.729 -6.842,2.8124 c -3.7631,1.5468 -10.442,3.7688 -14.842,4.9376 -4.4,1.1688 -10.3085,2.4206 -13.13,2.7817 l -5.13,0.6565 -5.37,-2.6753 c -2.9535,-1.4714 -6.945,-3.9068 -8.87,-5.412 -1.925,-1.5052 -5.3177,-4.1762 -7.5393,-5.9356 l -4.0393,-3.199 -10.9607,3.6532 -10.9607,3.6531 -5.6998,3.8481 -5.6999,3.8481 -7.1155,1.4968 -7.1156,1.4968 -9.3865,0 z m -2.4333,-2 c 2.6432,0 8.3259,-0.4891 12.6282,-1.0869 4.3023,-0.5978 8.2724,-1.4364 8.8224,-1.8637 0.55,-0.4272 1.675,-0.7667 2.5,-0.7544 l 1.5,0.022 5.702,-3.6587 c 3.136,-2.0123 6.1735,-3.6587 6.75,-3.6587 l 1.048,0 0,-1.107 0,-1.107 1.5519,0.5956 1.552,0.5955 -0.5612,-0.908 -0.5611,-0.9079 3.4896,-1.1517 3.4897,-1.1517 0.9755,0.6029 0.9756,0.6029 3.794,-1.6342 3.794,-1.6342 -1.5,-0.6476 -1.5,-0.6476 -0.4698,-3 c -0.2584,-1.65 -0.4631,-4.8 -0.4549,-7 0.01,-2.2 0.2196,-5.787 0.4698,-7.9711 L 839.5,325.9911 829,324.837 c -5.775,-0.6347 -12.5709,-1.7357 -15.102,-2.4467 l -4.6019,-1.2927 -4.2526,1.7015 c -2.3389,0.9359 -6.9763,3.5512 -10.3053,5.8119 -3.3291,2.2607 -6.7695,4.158 -7.6455,4.2163 -0.876,0.058 -3.1677,1.0801 -5.0927,2.2708 -1.925,1.1907 -6.3658,3.126 -9.8684,4.3005 l -6.3684,2.1356 -1.6316,-0.3494 -1.6316,-0.3494 5.5,-1.8403 c 3.025,-1.0121 8.1759,-3.1787 11.4464,-4.8146 3.2705,-1.6359 8.398,-4.7855 11.3944,-6.9991 2.9965,-2.2136 5.1316,-3.5125 4.7447,-2.8865 -0.387,0.6261 -0.4506,1.1383 -0.1416,1.1383 0.3091,0 2.6982,-1.3414 5.3091,-2.981 l 4.747,-2.981 -1.45,-0.019 -1.45,-0.019 1.146,-1.146 1.146,-1.146 -3.696,-3.8762 c -2.0328,-2.1319 -5.3892,-6.6572 -7.4586,-10.0561 l -3.7626,-6.18 -1.4667,-5.0478 c -0.8066,-2.7764 -2.1852,-7.71 -3.0635,-10.9638 l -1.5969,-5.9158 -6.1739,-6.435 -6.1738,-6.4349 -4,-2.3333 -4,-2.3333 -4.6855,-1.1684 -4.6855,-1.1684 -8.8145,1.167 -8.8145,1.167 -4.6694,2.988 -4.6694,2.9881 -1.7472,2.6974 c -0.9609,1.4836 -4.9347,6.0033 -8.8306,10.0436 l -7.0834,7.3462 -4.2221,2.4825 -4.2222,2.4826 -1.7778,-0.3823 -1.7779,-0.3823 4,-2.0908 4,-2.0907 6.5,-6.4373 c 3.575,-3.5406 9.4262,-9.6171 13.0027,-13.5035 l 6.5026,-7.0661 -2.6925,1.3924 -2.6925,1.3923 -4.3101,5.2534 c -2.3706,2.8894 -6.7852,7.6906 -9.8102,10.6694 -3.025,2.9788 -7.255,6.6922 -9.4,8.252 l -3.9001,2.8361 -2.5999,-0.039 -2.6,-0.039 3.02,-1.3159 3.02,-1.3158 6.3929,-5.5755 6.3929,-5.5754 4.5871,-5.925 c 2.5229,-3.2587 5.9371,-7.0517 7.5871,-8.4288 1.65,-1.3772 4.4402,-3.2422 6.2003,-4.1446 1.7602,-0.9024 3.9119,-1.6407 4.7814,-1.6407 l 1.5811,0 0.5094,-1.3276 0.5094,-1.3275 -1.0569,-2.7798 -1.0568,-2.7799 -8.7748,-8.6426 -8.7747,-8.6426 -3.1079,-6 c -1.7093,-3.3 -3.851,-8.2195 -4.7592,-10.9323 l -1.6513,-4.9323 -1.4683,-10.5677 -1.4682,-10.5677 -2.0719,-6.2759 -2.0719,-6.2759 -4.6598,-4.7839 -4.6599,-4.7839 -8.5,-4.1902 -8.5,-4.1901 -5.72232,-0.1309 -5.72231,-0.131 -5.75663,2.8165 -5.75663,2.8164 -4.34103,4.5645 c -2.38756,2.5104 -7.16282,8.6144 -10.61167,13.5644 l -6.27065,9 -4.75499,3.6204 -4.75499,3.6203 -4.15439,1.2329 c -2.28491,0.6781 -4.68408,1.6643 -5.33147,2.1916 l -1.17708,0.9587 0.55363,3.688 0.55364,3.6881 3.26999,3.5 3.26998,3.5 2.65747,5.3233 c 1.4616,2.9279 4.03378,9.2279 5.71595,14 1.68217,4.7722 4.63494,12.5017 6.56171,17.1767 1.92678,4.675 4.21868,9.85 5.09311,11.5 0.87444,1.65 1.51301,3.2906 1.41905,3.6457 -0.0939,0.3551 2.09586,2.7659 4.86626,5.3573 2.77039,2.5913 4.65688,4.5508 4.19219,4.3543 -0.46469,-0.1965 -2.91067,-1.9323 -5.43551,-3.8573 l -4.59062,-3.5 -2.48664,-3.5 c -1.36766,-1.925 -4.17901,-7.325 -6.24744,-12 -2.06843,-4.675 -4.55097,-10.75 -5.51675,-13.5 -0.96578,-2.75 -3.36831,-8.375 -5.33895,-12.5 l -3.583,-7.5 -3.10714,-3.7311 c -1.70894,-2.052 -7.37442,-7.2928 -12.58996,-11.6462 l -9.48282,-7.9151 -3.46234,-0.6496 -3.46235,-0.6495 -4.3686,1.9324 c -2.40273,1.0629 -4.65073,2.389 -4.99557,2.9469 -0.34483,0.558 -1.29143,4.4874 -2.10357,8.732 l -1.47661,7.7175 -2.56436,4.3758 -2.56437,4.3758 -3.08251,1.594 -3.0825,1.594 4.12139,4.1994 c 2.26677,2.3097 4.1214,4.5098 4.1214,4.8892 0,0.3794 -1.81183,-1.2758 -4.0263,-3.6782 l -4.0263,-4.368 -2.9737,-0.4365 c -1.63553,-0.24 -2.97317,-0.4019 -2.97252,-0.3596 6.5e-4,0.042 0.63105,3.3796 1.40089,7.4164 l 1.39972,7.3396 5.45788,4.8645 5.45788,4.8645 3.99514,6.7959 c 2.19733,3.7378 5.67341,10.0237 7.72461,13.9689 l 3.72946,7.1729 10.66662,10.3993 10.66662,10.3993 4.25385,2.8132 4.25384,2.8132 7.86026,0.033 7.86026,0.033 4.61774,-1.2929 4.61773,-1.2929 -0.51703,-0.8365 -0.51702,-0.8366 -11.71482,0.3976 -11.71481,0.3975 6,-0.8276 c 3.3,-0.4551 9.0375,-0.8764 12.75,-0.9361 l 6.75,-0.1093 0,1.475 0,1.475 2.75,-0.5412 2.75,-0.5413 8.96193,8.8163 c 4.92906,4.8489 7.85406,7.9162 6.5,6.8162 -1.35406,-1.1 0.12557,0.7791 3.28807,4.1758 3.1625,3.3966 5.75,6.5958 5.75,7.1092 0,0.5134 1.85856,3.0449 4.13014,5.6255 l 4.13015,4.6921 5.61985,2.8352 c 3.09092,1.5593 7.466,3.3876 9.72236,4.0628 l 4.1026,1.2276 2.3974,-1.2476 c 1.3186,-0.6861 5.4399,-3.4837 9.1585,-6.2168 l 6.7609,-4.9694 1.6158,0.6201 1.6158,0.62 1.5175,-1.2594 1.5175,-1.2594 -0.7116,2.2421 -0.7117,2.2422 0.9641,0 c 0.5302,0 4.432,3.15 8.6707,7 l 7.7067,7 1.2023,0 c 0.6613,0 5.1951,-1.61 10.0752,-3.5778 l 8.8728,-3.5778 3.5531,0.6666 c 1.9542,0.3666 4.3347,1.0849 5.2901,1.5962 l 1.737,0.9296 2.6606,4.7316 c 1.4634,2.6024 4.2323,7.0941 6.1532,9.9816 l 3.4926,5.25 4.8058,0 z m -66.6083,-38.0354 c -0.5176,-0.02 -2.0661,-0.6786 -3.4411,-1.4646 l -2.5,-1.4291 1.75,-0.035 1.75,-0.035 0,-0.7918 c 0,-0.4355 -2.0776,-2.798 -4.6168,-5.25 -2.5393,-2.452 -5.4626,-5.8082 -6.4963,-7.4582 -1.0337,-1.65 -1.8781,-2.55 -1.8766,-2 0,0.55 0.811,2.2255 1.7987,3.7232 0.9877,1.4978 3.5723,4.2654 5.7434,6.1501 l 3.9476,3.4269 -0.6549,0.6715 -0.655,0.6715 -2.286,-1.8216 c -1.2573,-1.0019 -3.4375,-3.0518 -4.845,-4.5555 L 703.5,316.4668 700,306.2999 696.5,296.133 688,293.4193 c -4.675,-1.4925 -12.1,-4.1635 -16.5,-5.9356 -4.4,-1.7722 -8.95335,-3.6776 -10.11856,-4.2343 l -2.11857,-1.0122 -1.88143,0.3583 -1.88144,0.3583 -2.91695,5.4337 -2.91696,5.4338 1.85251,1.0566 c 1.01888,0.5811 2.89848,2.1396 4.17688,3.4633 l 2.32438,2.4068 -0.51387,0.5138 -0.51388,0.5139 -2.3105,-2.1706 -2.31051,-2.1706 -1.71694,0 -1.71693,0 -0.60441,-1.5751 -0.60441,-1.575 1.18907,-3.9688 1.18908,-3.9688 2.78149,-3.113 2.78148,-3.1131 2.97772,0.085 2.97772,0.085 5.43752,2.4828 c 2.99063,1.3655 9.26251,3.714 13.93751,5.2189 4.675,1.5048 9.93689,3.354 11.6931,4.1093 l 3.1931,1.3732 2.0569,2.615 2.0569,2.6149 0,1.9242 0,1.9241 0.9171,-0.5667 0.917,-0.5668 1.6867,5.0782 1.6867,5.0781 3.1496,3.1796 c 1.7322,1.7488 4.8977,5.3268 7.0344,7.9512 l 3.8849,4.7717 -1.8882,-0.6033 -1.8882,-0.6033 1.9411,1.5817 1.9412,1.5816 -0.9412,-0.035 z m -15.7744,-20.2979 0.6666,-0.6667 -0.6666,-0.6667 -0.6667,-0.6666 0,1.3333 0,1.3333 0.6667,-0.6666 z m -1,-4 0.6666,-0.6667 -0.6666,-0.6667 -0.6667,-0.6666 0,1.3333 0,1.3333 0.6667,-0.6666 z m -6,-5 -0.6667,0.6666 0,-1.3333 0,-1.3333 0.6667,0.6666 0.6666,0.6667 -0.6666,0.6667 z m -52.98235,-3.6667 -1.38673,0 2.82968,-5.941 2.82968,-5.941 2.21007,-2.059 2.21007,-2.059 1.50761,0 1.5076,0 -3.1342,3.25 -3.1342,3.25 -2.02643,4.75 -2.02643,4.75 -1.38672,0 z m -15.62533,-1 c -0.51754,0 -1.2191,-0.45 -1.55902,-1 l -0.61803,-1 1.55901,0 1.55902,0 0,1 c 0,0.55 -0.42344,1 -0.94098,1 z m -30.55902,-11 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -2,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 57.80902,-2.0703 -2.19099,0.07 -0.61803,-1 -0.61803,-1 0.80901,0.07 c 0.44496,0.039 1.70902,0.457 2.80902,0.9297 l 2,0.8594 -2.19098,0.07 z m -73.78139,-25.9297 c -0.22528,0 -0.70621,-0.4799 -1.06875,-1.0665 -0.36253,-0.5866 -0.44468,-1.281 -0.18255,-1.5432 0.26212,-0.2621 0.74306,0.2179 1.06875,1.0666 0.32568,0.8487 0.40783,1.5431 0.18255,1.5431 z m -2.02763,-4 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -1,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -0.8545,-2 c -0.22034,0 -0.83565,-0.5625 -1.36736,-1.25 -0.5317,-0.6875 -1.28836,-1.8125 -1.68146,-2.5 -0.39309,-0.6875 -0.51491,-1.25 -0.27071,-1.25 0.24421,0 1.18114,1.125 2.08207,2.5 0.90094,1.375 1.45779,2.5 1.23746,2.5 z m 298.774,119.993 c 1.6943,0 6.7848,-0.8951 11.3122,-1.9805 4.5274,-1.0854 11.9106,-3.3922 16.407,-5.1263 l 8.1754,-3.1527 8.093,-5.4384 c 4.4511,-2.9911 9.1548,-6.6437 10.4526,-8.1168 1.2979,-1.473 2.0311,-2.0709 1.6294,-1.3285 l -0.7305,1.3497 2.1207,-1.1349 c 1.1664,-0.6242 2.1207,-1.3707 2.1207,-1.6588 0,-0.2881 -0.5625,-0.2089 -1.25,0.176 l -1.25,0.6999 1.7395,-1.8446 1.7394,-1.8446 4.1128,-0.1032 4.1127,-0.1031 1.1478,-1.9431 c 0.6313,-1.0687 1.391,-2.8341 1.6881,-3.923 l 0.5404,-1.9799 4.2874,-3.2701 4.2874,-3.2701 -2.8807,0 -2.8806,0 -8.2939,4.0108 -8.2939,4.0109 -5.1532,5.2505 c -2.8343,2.8879 -6.0532,5.8692 -7.1532,6.6253 -1.1,0.7561 1.6271,-2.2183 6.0602,-6.6096 l 8.0603,-7.9843 8.0466,-3.29 8.0466,-3.29 -0.1069,-1.6118 c -0.059,-0.8865 -0.8583,-2.6731 -1.7769,-3.9702 l -1.6701,-2.3584 -1.1797,0.7291 -1.1796,0.7291 1.0645,-1.9892 1.0646,-1.9892 -0.5205,-0.5205 -0.5205,-0.5205 2.1512,-9.1627 2.1511,-9.1626 -0.6638,-2.6447 -0.6638,-2.6447 -3.4918,-3.2932 -3.4917,-3.2932 -5.4635,-1.5882 -5.4634,-1.5883 -4.998,1.0718 -4.9979,1.0719 -4.7285,2.4074 -4.7285,2.4073 -7.8149,6.6835 -7.8148,6.6835 -5.6852,6.9747 -5.6851,6.9748 -5.0423,3.3559 -5.0424,3.356 -8.8833,2.5754 c -4.8859,1.4165 -9.0917,2.367 -9.3464,2.1124 -0.2546,-0.2547 0.7537,-0.9256 2.2408,-1.491 1.4871,-0.5654 3.3326,-1.028 4.1012,-1.028 0.7686,0 3.8807,-0.9291 6.9159,-2.0647 3.0352,-1.1356 5.8063,-2.5305 6.1582,-3.0998 l 0.6397,-1.035 -2.055,1.0997 c -1.1302,0.6049 -2.422,1.0912 -2.8707,1.0808 -0.4486,-0.011 1.2795,-1.3349 3.8402,-2.9433 2.5608,-1.6083 4.9484,-3.3974 5.3057,-3.9756 0.3574,-0.5782 1.6372,-1.5648 2.8441,-2.1924 l 2.1943,-1.1411 -2,2.3909 c -1.1,1.315 1.375,-1.1834 5.5,-5.5519 l 7.5,-7.9428 -0.2578,-1.1556 -0.2579,-1.1556 6.0025,-5.2209 c 3.3014,-2.8714 8.3674,-6.8095 11.2579,-8.7513 l 5.2553,-3.5304 0.7715,-2.0507 0.7715,-2.0507 -3.6211,-3.6048 -3.6211,-3.6048 -2.2724,-4.5 c -1.2499,-2.475 -3.0052,-7.0449 -3.9008,-10.1552 -0.8956,-3.1104 -2.4813,-9.8954 -3.5238,-15.0777 l -1.8955,-9.4225 -2.5177,-4.9223 -2.5178,-4.9223 -3.8364,-3.7006 -3.8364,-3.7007 -5,-2.2896 -5,-2.2896 -8.5,0 -8.5,0 -5,2.6571 -5,2.6571 -6.099,6.3288 c -3.3545,3.4809 -8.1861,9.0996 -10.737,12.486 l -4.6379,6.1571 -7.2155,6.5854 -7.2155,6.5855 -8.0475,3.8503 c -4.4262,2.1176 -11.3306,5.0932 -15.3433,6.6123 l -7.2956,2.762 -1.6067,2.4521 -1.6066,2.4521 4.0435,4.193 c 2.224,2.3062 4.708,5.5431 5.5201,7.1931 0.8121,1.65 2.2576,6.5588 3.2122,10.9085 0.9547,4.3496 2.5932,9.9089 3.6412,12.3538 1.0481,2.445 3.7667,7.0987 6.0415,10.3416 2.2747,3.2428 4.4124,5.8961 4.7504,5.8961 0.3381,0 1.1767,0.9 1.8636,2 0.687,1.1 1.0102,2 0.7182,2 -0.2919,0 -2.6528,-1.9125 -5.2463,-4.25 l -4.7155,-4.25 3.303,3.859 3.303,3.859 -0.4903,1.2778 -0.4904,1.2778 1.7912,-0.4684 1.7911,-0.4684 6.7394,2.0816 6.7394,2.0816 7.4604,0 7.4604,0 1.8648,0.998 1.8649,0.9981 -0.5833,11.0556 -0.5832,11.0557 2.2372,0.585 2.2372,0.5851 -1.3346,0.8459 -1.3345,0.846 1.931,0.015 1.931,0.015 7.4349,5.6947 c 4.0892,3.1321 9.484,6.7321 11.9885,8 l 4.5536,2.3053 3.0805,-0.01 z m 19.0873,-6.9956 c -1.3787,0.5242 -2.5068,0.7457 -2.5068,0.4922 0,-0.2534 2.7444,-1.8462 6.0987,-3.5394 l 6.0987,-3.0786 -0.6621,1.0713 c -0.3642,0.5892 -1.9805,1.7531 -3.5919,2.5864 -1.6114,0.8333 -4.0579,1.9439 -5.4366,2.4681 z m -48.2114,-14.9974 c -0.197,0 -0.6252,-0.6959 -0.9516,-1.5465 l -0.5934,-1.5464 0.5117,-4.5405 0.5118,-4.5405 1.0339,-1.0339 1.0339,-1.0339 -0.99,4.3708 -0.9899,4.3709 0.3959,2.75 c 0.2177,1.5125 0.2347,2.75 0.038,2.75 z m 81.0866,0 c -0.275,0 -0.2219,-0.45 0.118,-1 0.3399,-0.55 0.843,-1 1.118,-1 0.275,0 0.2219,0.45 -0.118,1 -0.3399,0.55 -0.843,1 -1.118,1 z m -69.823,-17 c -0.2425,0 -0.7621,-0.5195 -1.1545,-1.1545 l -0.7135,-1.1545 1.1545,0.7135 c 0.635,0.3924 1.1545,0.912 1.1545,1.1545 0,0.2426 -0.1984,0.441 -0.441,0.441 z m -26.059,28 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2.5,-1 1.3333,0 -0.6666,-0.6667 -0.6667,-0.6666 -0.6667,0.6666 -0.6666,0.6667 1.3333,0 z m 102.382,-15 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z m 30.9206,-0.1498 c 0.9914,0.082 4.9289,-0.5613 8.75,-1.4304 l 6.9474,-1.5801 0,-1.0268 0,-1.0269 1.5,0.5756 1.5,0.5756 0,-1.0756 0,-1.0756 1.5,0.5756 1.5,0.5756 0,-1.0276 0,-1.0276 1,0.618 1,0.618 0,-1.166 0,-1.166 1.5,0.5756 1.5,0.5756 0,-1.0276 0,-1.0276 1,0.618 1,0.618 0,-1.118 0,-1.118 1,0.618 1,0.618 0,-1.118 0,-1.118 0.8952,0.5532 0.8952,0.5533 0.5978,-1.5576 0.5977,-1.5577 0.9023,0.5577 0.9022,0.5576 0.5978,-1.5576 0.5977,-1.5577 0.9023,0.5577 0.9022,0.5576 0.5978,-1.5576 0.5977,-1.5577 1.007,0.6224 1.0071,0.6224 0,-1.118 0,-1.118 0.8195,0.5064 0.8194,0.5065 10.5769,-10.6975 10.5769,-10.6974 6.2813,-9 c 3.4547,-4.95 8.4884,-11.6712 11.186,-14.936 l 4.9047,-5.936 4.0871,-8.064 4.0871,-8.064 0.2921,-4.5 0.2922,-4.5 -1.4883,-5.7472 -1.4882,-5.7471 0.2767,-11.2529 0.2766,-11.2528 -1.9346,-3 c -1.0641,-1.65 -2.7966,-3.9769 -3.85,-5.1709 l -1.9154,-2.1709 -3.65,0.5635 c -2.0075,0.3099 -5.225,1.3892 -7.15,2.3984 -1.925,1.0092 -4.175,2.4075 -5,3.1074 -0.825,0.6999 -2.8331,3.0725 -4.4626,5.2725 -1.6294,2.2 -7.7044,9.3599 -13.5,15.911 -5.7955,6.551 -11.8428,13.076 -13.4384,14.5 -1.5955,1.4239 -6.5455,6.3542 -11,10.9562 l -8.099,8.3671 -5.5,3.6754 -5.5,3.6753 -7,2.222 c -3.85,1.2221 -7.7091,2.2155 -8.5757,2.2075 l -1.5757,-0.014 -2.1736,2.3137 -2.1735,2.3137 1.9992,4.138 1.9993,4.138 0,2.9832 c 0,1.6408 -0.487,4.25 -1.0823,5.7983 -0.5953,1.5483 -1.4864,5.268 -1.9803,8.266 l -0.8979,5.4508 2.1206,3.5492 2.1205,3.5491 0.3577,2.9 0.3576,2.9 -0.748,1.1472 c -0.4113,0.6309 0.038,0.2909 0.9978,-0.7555 l 1.7457,-1.9026 4.2543,0.6 c 2.3399,0.33 6.64,0.8851 9.5559,1.2336 l 5.3015,0.6335 6.6985,-2.7932 c 3.6841,-1.5363 12.6219,-5.9427 19.8618,-9.792 l 13.1634,-6.9988 6.3453,-6.0861 6.3453,-6.0861 5.9003,-8 c 3.2451,-4.4 6.3558,-8.45 6.9127,-9 0.5568,-0.55 0.054,0.575 -1.1169,2.5 -1.1712,1.925 -4.0609,6.1871 -6.4215,9.4712 -2.3606,3.2842 -7.442,9.1548 -11.292,13.0457 l -7,7.0745 -13.0153,6.6411 c -7.1584,3.6527 -16.2128,7.7946 -20.121,9.2043 -3.9081,1.4098 -8.0837,2.5632 -9.2792,2.5632 -1.1954,0 -5.097,-0.7344 -8.6701,-1.6319 l -6.4967,-1.6319 -3.7089,4.2845 c -2.0398,2.3564 -4.5016,5.5044 -5.4706,6.9955 l -1.7619,2.711 2.5469,-0.4869 2.5469,-0.4869 1.7149,1.5397 1.715,1.5396 3,0.4338 c 1.65,0.2386 3.8112,0.5013 4.8026,0.5837 z M 961,319.2016 l -3.5,0 1.75,-0.4573 c 0.9625,-0.2516 2.5375,-0.2516 3.5,0 l 1.75,0.4573 -3.5,0 z m -7.5,17.232 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -6.6207,-2 0.9497,0 2.5818,-4.75 2.5817,-4.75 -2.5457,3 c -1.4001,1.65 -2.9893,3.7875 -3.5314,4.75 l -0.9858,1.75 0.9497,0 z m -155.8793,-5 c 2.2,-1.7424 4,-3.3931 4,-3.6681 0,-0.275 -1.8,0.9257 -4,2.6681 -2.2,1.7424 -4,3.3931 -4,3.6681 0,0.275 1.8,-0.9257 4,-2.6681 z m 162.5,-11 c 0.825,0 1.5,-0.298 1.5,-0.6621 0,-0.3642 -1.0612,-2.5017 -2.3583,-4.75 l -2.3584,-4.0879 0.7121,-5.5 c 0.3917,-3.025 1.3336,-7.6835 2.0931,-10.3523 l 1.381,-4.8523 -2.7838,-4.9861 -2.7838,-4.9861 1.299,-1.6616 1.2991,-1.6616 -1.7491,1.3717 -1.7491,1.3717 -3.0009,-1.243 -3.0009,-1.243 0,-1.2908 0,-1.2908 4.1471,-0.7007 4.1472,-0.7006 0.9697,1.7327 0.9697,1.7328 0.6863,-1.1106 0.6864,-1.1106 7.9284,-2.0277 7.9285,-2.0278 5.4196,-3.2316 5.4197,-3.2317 11.3419,-10.8565 11.3419,-10.8564 -0.4518,-0.7311 -0.4518,-0.731 4.2023,-3.9125 4.2022,-3.9125 -2.9308,3.25 c -1.6119,1.7875 -2.7098,3.25 -2.4398,3.25 0.2701,0 2.0417,-1.6426 3.9371,-3.6502 1.8954,-2.0076 2.8837,-3.331 2.1962,-2.941 l -1.25,0.7092 0,-0.904 c 0,-0.4972 0.824,-1.6498 1.8312,-2.5612 1.0071,-0.9114 2.0503,-1.4379 2.3183,-1.17 0.268,0.268 2.0314,-1.1926 3.9189,-3.2457 l 3.4316,-3.7329 -3.25,2.935 c -1.7875,1.6142 -3.25,2.6223 -3.25,2.2402 0,-0.3821 4.3124,-5.7045 9.5831,-11.8274 l 9.583,-11.1325 1.5619,-3.2753 1.5619,-3.2753 -1.895,-2.4416 c -1.0422,-1.3429 -3.7748,-4.7551 -6.0725,-7.5827 l -4.1776,-5.141 -1.9885,-9.2518 c -1.0936,-5.0885 -2.427,-13.7857 -2.963,-19.3272 l -0.9745,-10.0754 -2.2128,-4.4246 -2.2128,-4.4246 -4.6466,-4.8308 -4.6466,-4.8307 -3.9473,-2.0403 -3.9474,-2.0402 -5.7312,0.5197 -5.7312,0.5197 -5.0399,2.7431 -5.0399,2.743 -6.8744,7.1083 -6.8743,7.1082 -5.6871,11.1413 c -3.128,6.1277 -7.3936,13.7814 -9.4792,17.0083 l -3.7921,5.867 -4.928,4.3422 c -2.7104,2.3882 -7.9566,6.143 -11.6582,8.3439 l -6.7303,4.0017 -8.6569,3.2572 -8.657,3.2572 -3.3769,2.6945 -3.3769,2.6945 3.9059,4.6961 c 2.1483,2.5828 4.8292,6.5408 5.9576,8.7954 l 2.0516,4.0992 2.0488,10.2203 c 1.1269,5.6211 2.7836,12.7764 3.6817,15.9007 0.8981,3.1243 2.3094,7.0305 3.1362,8.6805 0.8267,1.65 3.5052,5.3625 5.9521,8.25 l 4.4489,5.25 -1.1928,0 -1.1928,0 -3.987,-4.25 -3.987,-4.25 -2.3533,-5 -2.3532,-5 -1.9879,-8 c -1.0934,-4.4 -2.6838,-11.0918 -3.5344,-14.8707 l -1.5465,-6.8707 -2.2283,-4.4619 -2.2284,-4.4619 -3.7806,-3.6674 -3.7806,-3.6674 -9e-4,-1.1772 -9e-4,-1.1772 3.75,-3.2318 3.75,-3.2318 -3,1.7913 c -1.65,0.9853 -3.9378,2.6401 -5.084,3.6774 l -2.084,1.886 -3.6339,-1.5184 c -1.9986,-0.835 -4.2108,-1.5139 -4.916,-1.5085 l -1.2821,0.01 5.0381,2.3461 5.0381,2.346 4.3124,4.8942 c 2.3718,2.6918 4.9825,6.1874 5.8016,7.7679 l 1.4891,2.8738 2.4385,11.6262 c 1.3412,6.3945 3.1626,13.8763 4.0475,16.6263 0.8849,2.75 2.401,6.575 3.3692,8.5 0.9681,1.925 3.6799,5.6775 6.026,8.3388 l 4.2658,4.8388 -1.613,2.7307 -1.6131,2.7306 3.1999,-0.5124 3.1999,-0.5123 -1.75,-0.3804 c -0.9625,-0.2093 -1.75,-0.7424 -1.75,-1.1847 0,-0.4423 0.5625,-1.2454 1.25,-1.7846 l 1.25,-0.9803 5,0.7243 5,0.7243 -3.5,0.1805 -3.5,0.1805 7.5868,2.4436 7.5868,2.4435 3.6171,3.513 3.6172,3.5129 0.9822,3.5574 0.9822,3.5573 -1.9126,7.1893 c -1.0519,3.954 -1.9232,8.4682 -1.9362,10.0315 l -0.024,2.8422 2,2.5426 c 1.1,1.3985 2,3.1569 2,3.9078 l 0,1.3651 1.5,0 z m -24.618,-49 -1,0 0.618,-1 c 0.3399,-0.55 1.068,-1 1.618,-1 l 1,0 -0.618,1 c -0.3399,0.55 -1.068,1 -1.618,1 z m 85.618,-43 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -138.1224,86 c 0.2076,0 0.9951,-0.7875 1.75,-1.75 l 1.3724,-1.75 -1.75,1.3724 c -0.9625,0.7549 -1.75,1.5424 -1.75,1.75 0,0.2077 0.1699,0.3776 0.3776,0.3776 z m -75.9398,-4 c 0.166,0 -1.3947,-3.2625 -3.4682,-7.25 l -3.7699,-7.25 -1.7337,-8 -1.7337,-8 -1.7785,-3.5 -1.7785,-3.5 -3.5877,-3.4462 -3.5876,-3.4461 0,-2.3039 0,-2.3038 2,-2 c 1.1,-1.1 2.5625,-2.0069 3.25,-2.0153 l 1.25,-0.015 -1.472,-0.9309 -1.4719,-0.9309 1.9719,-0.7113 c 1.0846,-0.3912 6.1931,-2.662 11.3523,-5.0464 l 9.3802,-4.3351 6.7844,-5.4815 6.7844,-5.4816 4.5147,-5.2758 c 2.4831,-2.9018 6.931,-8.2009 9.8841,-11.7759 l 5.3692,-6.5 6.0446,-4.5 c 3.3244,-2.475 6.8187,-4.95 7.7649,-5.5 l 1.7205,-1 0.086,-3.1768 0.086,-3.1769 -7.5498,-11.3231 c -4.1524,-6.2278 -8.4397,-13.1232 -9.5273,-15.3232 -1.0877,-2.2 -3.111,-7.1595 -4.4963,-11.0211 -1.3852,-3.8616 -3.4796,-11.4561 -4.654,-16.8768 l -2.1353,-9.8556 -2.6397,-5.391 -2.6397,-5.3909 -7.2056,-7.7562 -7.2057,-7.7562 -4.8734,-2.6421 -4.8734,-2.6422 -3.6295,-0.6726 -3.6295,-0.6727 -6.3705,1.631 c -3.5038,0.8971 -8.7089,2.7011 -11.567,4.0089 l -5.1965,2.3779 -4.3067,4.3298 -4.3066,4.3298 -4.2216,7.1324 c -2.3219,3.9228 -6.4349,9.7811 -9.14,13.0185 l -4.9184,5.8861 -5.8568,4.5939 c -3.2213,2.5266 -8.1069,5.7284 -10.8569,7.1151 -2.75,1.3868 -7.8304,3.313 -11.2899,4.2806 l -6.2899,1.7593 -1.9601,2.4919 c -1.078,1.3706 -1.9601,3.0365 -1.9601,3.7021 0,0.6656 0.9479,2.0674 2.1064,3.1151 1.1585,1.0478 3.0027,3.6612 4.0983,5.8078 1.0955,2.1465 2.6174,5.6758 3.382,7.843 0.7646,2.1671 2.2989,9.3545 3.4096,15.9719 l 2.0193,12.0316 2.9136,5.6254 c 1.6025,3.0939 3.7912,7.6893 4.8638,10.2121 l 1.9501,4.5867 8.1484,8.6507 8.1485,8.6507 0.9552,2.5126 0.9553,2.5125 1.4777,0 c 0.8127,0 2.6239,0.5222 4.0247,1.1605 1.4009,0.6383 2.5471,1.5383 2.5471,2 l 0,0.8395 -3.75,0.1507 -3.75,0.1506 9,0.6839 9,0.6838 4.1719,2.146 4.172,2.146 6.1239,5.6697 6.1239,5.6696 2.339,4.0999 2.339,4.0998 1.5787,7.2114 1.5787,7.2113 2.6647,5.2887 c 1.4656,2.9087 3.5376,6.5261 4.6045,8.0386 1.067,1.5125 2.0756,2.75 2.2415,2.75 z m -25.2552,-49.0318 c -0.9254,-0.017 -2.5562,-0.6926 -3.624,-1.5002 l -1.9414,-1.4684 -0.2311,-1.5746 -0.2311,-1.5746 4.1725,0.689 c 2.2949,0.379 4.3261,0.8288 4.5138,0.9995 0.1877,0.1707 0.045,1.2443 -0.3174,2.3857 l -0.6587,2.0754 -1.6826,-0.032 z M 774.5,257.4336 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -2,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 6,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -2.5,-1 -1.3333,0 0.6666,-0.6667 0.6667,-0.6666 0.6667,0.6666 0.6666,0.6667 -1.3333,0 z m 120.1077,40 c 0.275,0 2.0265,-1.575 3.8923,-3.5 1.8658,-1.925 3.1673,-3.5 2.8923,-3.5 -0.275,0 -2.0265,1.575 -3.8923,3.5 -1.8658,1.925 -3.1673,3.5 -2.8923,3.5 z m 9.2699,-8 c 0.2076,0 0.9951,-0.7875 1.75,-1.75 l 1.3724,-1.75 -1.75,1.3724 c -0.9625,0.7549 -1.75,1.5424 -1.75,1.75 0,0.2077 0.1699,0.3776 0.3776,0.3776 z m 5.1224,-4 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 3,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 138.6639,-0.3709 5.6638,-0.6263 4.8362,-2.0729 4.8361,-2.0729 0.8521,-1.5222 0.8522,-1.5222 3.4418,-1.4381 3.4419,-1.4381 1.1105,0.6863 1.1105,0.6863 -0.8185,-1.3244 -0.8186,-1.3245 1.632,0.6263 1.632,0.6263 0.6866,-1.1109 0.6865,-1.1108 -1.2842,0.7937 -1.2843,0.7937 0.4626,-1.3892 0.4626,-1.3892 1.7856,-0.3461 1.7856,-0.3462 -0.773,1.2507 -0.7729,1.2506 1.1708,-0.7236 1.1708,-0.7236 -0.523,-0.8462 -0.523,-0.8463 2.7466,-3.3346 c 1.5107,-1.8341 3.6512,-4.0064 4.7567,-4.8274 1.1056,-0.821 2.4601,-1.496 3.0101,-1.5 l 1,-0.01 0,-1.207 0,-1.2069 2,-1.6172 2,-1.6172 -1.5,0.6609 -1.5,0.661 2.1134,-1.8368 c 1.1624,-1.0103 3.2999,-3.6288 4.75,-5.8189 1.4501,-2.1902 2.6366,-4.2992 2.6366,-4.6866 l 0,-0.7044 -9.3101,4.4102 -9.3101,4.4102 -9.4399,2.1457 -9.4399,2.1456 -1.75,1.5357 -1.75,1.5357 0,2.0293 0,2.0293 -2.1976,4.5396 -2.1976,4.5396 -4.2761,4.2761 -4.2761,4.2761 2.2237,0.076 2.2237,0.076 -3.2059,1.1739 c -1.7633,0.6456 -3.7883,1.7939 -4.5,2.5516 l -1.2941,1.3777 5.6639,-0.6263 z M 1095.5,251.4336 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -178,25 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 30,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -3,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -20,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 147.5,-1 1.3333,0 -0.6666,-0.6667 -0.6667,-0.6666 -0.6667,0.6666 -0.6666,0.6667 1.3333,0 z m 2.5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -18.3759,-1.7333 1.2426,-1.2334 -0.5598,-0.5598 -0.5598,-0.5598 -0.6828,1.7932 -0.6828,1.7931 1.2426,-1.2333 z m 20.3759,0.7333 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -19,-4 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -417.8545,-2 c 0.22033,0 -0.33652,-1.125 -1.23746,-2.5 -0.90093,-1.375 -1.83786,-2.5 -2.08207,-2.5 -0.2442,0 -0.12238,0.5625 0.27071,1.25 0.3931,0.6875 1.14976,1.8125 1.68146,2.5 0.53171,0.6875 1.14702,1.25 1.36736,1.25 z m 419.8545,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 28,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -27,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -425.83333,-1.3333 0.66666,-0.6667 -0.66666,-0.6667 -0.66667,-0.6666 0,1.3333 0,1.3333 0.66667,-0.6666 z m 455.71093,0.3333 c 0.2076,0 0.9951,-0.7875 1.75,-1.75 l 1.3724,-1.75 -1.75,1.3724 c -0.9625,0.7549 -1.75,1.5424 -1.75,1.75 0,0.2077 0.1699,0.3776 0.3776,0.3776 z m -357.8776,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 329.1667,-0.3333 0.6666,-0.6667 -0.6666,-0.6667 -0.6667,-0.6666 0,1.3333 0,1.3333 0.6667,-0.6666 z M 736,255.4336 l 1.3333,0 -0.6666,-0.6667 -0.6667,-0.6666 -0.6667,0.6666 -0.6666,0.6667 1.3333,0 z m -101.5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 106.3,0 3.2,0 0,-0.941 c 0,-0.5175 -0.4619,-1.2265 -1.0265,-1.5754 -0.5646,-0.3489 -0.9613,-1.163 -0.8815,-1.809 0.08,-0.646 0.092,-1.9434 0.026,-2.8831 l -0.1185,-1.7086 -9.4071,-9.5147 -9.4071,-9.5148 -1.7887,-4.7767 c -0.9838,-2.6272 -2.8004,-6.3517 -4.0368,-8.2767 l -2.2481,-3.5 -1.5345,-6 c -0.8439,-3.3 -2.0397,-9.2919 -2.6574,-13.3153 -0.6177,-4.0234 -1.3448,-7.0935 -1.6159,-6.8224 -0.2711,0.2711 0.051,4.688 0.715,9.8153 l 1.208,9.3224 1.85,6 1.85,6 3.5908,6 3.5908,6 7.8347,8 c 4.3091,4.4 8.3346,8.9829 8.9455,10.1843 0.6109,1.2013 1.1108,3.2488 1.1108,4.55 l 0,2.3657 -1.2,1.2 -1.2,1.2 3.2,0 z m 45.7,-0.031 c 0.55,0 1.675,-0.4362 2.5,-0.9694 l 1.5,-0.9694 -1,0 c -0.55,0 -1.675,0.4362 -2.5,0.9694 l -1.5,0.9694 1,0 z m 277.1738,-2.4694 c 0.2361,-1.1 0.9481,-3.0423 1.5822,-4.3162 l 1.1529,-2.3163 -1.927,-7.1837 -1.9269,-7.1838 0.25,-10.4337 0.2499,-10.4337 -2.6977,-5.5663 c -1.4837,-3.0615 -3.1836,-5.8969 -3.7775,-6.301 -0.5938,-0.4041 -2.4297,-0.7349 -4.0797,-0.7352 l -3,-6e-4 2.4723,1.251 2.4724,1.251 2.9374,4.3737 2.9375,4.3738 0.7289,3.9863 0.729,3.9864 -1.0942,6.3879 -1.0942,6.3879 1.9377,6.7362 1.9378,6.7363 -0.1101,5.5 -0.1101,5.5 0.4294,-2 z m -430.00713,0.1667 0.66666,-0.6667 -0.66666,-0.6667 -0.66667,-0.6666 0,1.3333 0,1.3333 0.66667,-0.6666 z M 792,252.4336 l 1.3333,0 -0.6666,-0.6667 -0.6667,-0.6666 -0.6667,0.6666 -0.6666,0.6667 1.3333,0 z m 2.5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -49,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 51,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -164,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 166,-0.031 c 0.55,0 1.675,-0.4362 2.5,-0.9694 l 1.5,-0.9694 -1,0 c -0.55,0 -1.675,0.4362 -2.5,0.9694 l -1.5,0.9694 1,0 z m -167,-1.969 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 172,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 261.902,0 c 0.242,0 4.1933,-0.8914 8.7806,-1.9809 4.5873,-1.0895 11.1795,-3.0934 14.6492,-4.4532 3.4698,-1.3598 9.1813,-4.0788 12.6922,-6.0422 l 6.3834,-3.5698 5.458,-8.8235 c 3.0019,-4.8529 7.3651,-12.605 9.696,-17.2269 l 4.238,-8.4035 3.873,-11.5 c 2.1302,-6.325 5.0745,-16.1899 6.543,-21.9221 l 2.6699,-10.4221 0.3639,1.0918 c 0.2002,0.6005 -0.572,5.0325 -1.7159,9.8489 l -2.0798,8.757 1.0233,1.0233 1.0232,1.0232 0,-1.2 0,-1.2 0.75,0.25 c 0.4125,0.1375 1.7625,-0.7625 3,-2 1.2375,-1.2375 1.939,-2.25 1.5589,-2.25 -0.3802,0 0.1823,-0.7084 1.25,-1.5742 l 1.9411,-1.5741 -1.3326,0.6842 -1.3326,0.6842 1.6083,-3.11 1.6083,-3.1101 0.9743,0 c 0.5359,0 0.921,-0.3375 0.8559,-0.75 -0.065,-0.4125 -0.065,-1.3391 0,-2.059 l 0.1184,-1.309 0.9885,0.6109 0.9886,0.611 -0.6585,-1.716 -0.6585,-1.716 1.1585,0.716 1.1585,0.716 -0.6585,-1.716 -0.6585,-1.716 1.3245,0.8186 1.3244,0.8185 -0.8073,-1.3062 -0.8073,-1.3062 1.4218,-1.0983 c 0.782,-0.6041 2.2665,-3.0049 3.2988,-5.3352 l 1.877,-4.237 5.104,-2.9784 c 2.8072,-1.6382 6.0738,-3.8191 7.2591,-4.8465 l 2.1551,-1.8681 4.1631,-8.2801 c 2.2898,-4.554 5.4684,-11.6697 7.0637,-15.8126 l 2.9005,-7.5325 -0.5278,-0.8539 -0.5277,-0.854 0.7616,-1.2324 c 0.419,-0.6778 0.8552,-1.9153 0.9694,-2.75 0.1143,-0.8347 0.4896,-2.6426 0.8341,-4.0176 0.3446,-1.375 1.3257,-7.45 2.1803,-13.5 l 1.5538,-11 0.1594,-15.5 c 0.088,-8.525 -0.2165,-28.096 -0.6759,-43.4912 l -0.8353,-27.9912 -0.7167,-1.2807 -0.7168,-1.2808 -1.2472,24.4035 c -0.686,13.422 -1.6525,28.3306 -2.1477,33.1303 l -0.9003,8.7267 -5.3004,8.4672 -5.3003,8.4672 -8.3021,10.1745 c -4.5661,5.596 -10.9724,13.436 -14.2361,17.4222 l -5.9341,7.2477 1.4222,6.2523 c 0.7822,3.4388 1.7218,9.8523 2.0881,14.2523 l 0.6658,8 -1.6383,9.5 c -0.9011,5.225 -1.8714,10.8397 -2.1562,12.4771 -0.2848,1.6374 -1.0593,4.1069 -1.7212,5.4877 l -1.2033,2.5107 -1.7424,0.3356 -1.7424,0.3355 0,-1.4638 c 0,-0.8051 1.1348,-5.8313 2.5217,-11.1694 l 2.5217,-9.7055 -0.6085,-5.1539 c -0.3347,-2.8347 -1.0347,-6.5566 -1.5554,-8.2709 -0.5207,-1.7144 -1.3379,-6.6045 -1.8159,-10.8671 l -0.8692,-7.7501 -1.4805,-1.4806 -1.4806,-1.4805 -2.3666,1.2225 c -1.3017,0.6725 -3.422,2.1789 -4.7117,3.3477 -1.2898,1.1687 -3.0105,3.4043 -3.8238,4.9679 l -1.4787,2.843 -0.5061,-0.5062 -0.5062,-0.5062 1.6661,-2.5428 1.6661,-2.5427 -0.5894,-0.9537 -0.5894,-0.9536 2.0891,-4.8404 2.0891,-4.8403 -0.4754,-3.5 -0.4753,-3.5 -3.6374,-6.3936 c -2.0006,-3.5165 -5.0499,-9.5915 -6.7762,-13.5 l -3.1388,-7.1064 -1.3649,-10.4247 -1.3648,-10.4247 -1.9136,-4.3261 -1.9136,-4.326 -5.1057,-5.3986 -5.1058,-5.3986 -2.9442,-1.2195 -2.9443,-1.2196 -2.2715,1.4884 -2.2715,1.4883 -5.4844,8.7831 c -3.0164,4.8307 -6.9436,11.302 -8.7271,14.3806 -1.7834,3.0785 -4.5954,8.8275 -6.2489,12.7754 -1.6535,3.9479 -4.4198,10.2479 -6.1473,14 l -3.141,6.822 -6.8551,10.1002 -6.855,10.1003 -5.4072,4.8997 c -2.9739,2.6949 -8.1275,6.7906 -11.4524,9.1015 l -6.0454,4.2018 -4.4865,5.7163 -4.4866,5.7164 3.4293,4.0063 c 1.8861,2.2035 4.4024,6.0167 5.5919,8.4737 l 2.1626,4.4674 0.7339,13.1082 0.734,13.1082 1.5136,5.2347 1.5137,5.2347 1.8446,2.3724 c 1.0145,1.3049 3.757,4.7272 6.0945,7.6051 l 4.25,5.2327 0,2.5957 0,2.5958 -2.1743,2.3144 -2.1743,2.3145 1.7333,0 1.7333,0 -0.6192,-1.0019 -0.6191,-1.0018 2.7482,-1.0449 2.7482,-1.0449 6.3291,0.2049 6.3292,0.2049 2.2328,-2.0452 c 1.228,-1.1249 4.7078,-3.4415 7.7328,-5.1482 l 5.5,-3.1029 14.6327,-14.76 14.6327,-14.76 5.0471,-8 5.0471,-8 3.4944,-11.5 c 1.9219,-6.325 4.1859,-13.075 5.0311,-15 0.8451,-1.925 1.5542,-3.1305 1.5758,-2.6789 0.022,0.4516 -1.7864,7.2016 -4.0176,15 l -4.0567,14.1789 -2.7922,4.5 c -1.5356,2.475 -3.9442,6.525 -5.3523,9 l -2.5601,4.5 -13.341,13.662 -13.341,13.6619 -4,1.9837 c -2.2,1.091 -6.514,3.9432 -9.5867,6.3381 l -5.5868,4.3543 2.3086,4.5 2.3086,4.5 0.028,11.5685 0.028,11.5685 1.5765,5.3086 1.5765,5.3087 -0.5956,2.3728 c -0.3275,1.3051 -0.3975,2.3729 -0.1554,2.3729 z m -436.902,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 178.75,-1.0909 c 1.2375,-0.6387 4.95,-3.4209 8.25,-6.1827 3.3,-2.7619 7.0451,-6.1926 8.3224,-7.624 1.2773,-1.4313 4.1501,-5.0774 6.384,-8.1024 2.2339,-3.025 6.5888,-8.2 9.6776,-11.5 l 5.616,-6 -6.3165,6 c -3.4741,3.3 -9.1905,9.6 -12.703,14 l -6.3866,8 -7.5469,5.8878 c -4.1509,3.2383 -7.547,6.0667 -7.547,6.2852 0,0.2186 1.0125,-0.1252 2.25,-0.7639 z m -179.58333,-1.2424 0.66666,-0.6667 -0.66666,-0.6667 -0.66667,-0.6666 0,1.3333 0,1.3333 0.66667,-0.6666 z m -74.03364,-0.757 c 0.0732,0.05 -0.43528,-1.5972 -1.1299,-3.6597 -0.69462,-2.0625 -1.58236,-6.4015 -1.97275,-9.6422 l -0.70981,-5.8921 3.97573,0.6357 3.97574,0.6358 3.86398,-3.7602 3.86398,-3.7601 1.75,-6.6476 c 0.9625,-3.6562 1.75,-7.6086 1.75,-8.7831 0,-1.1745 0.65771,-3.4074 1.46158,-4.9619 l 1.46158,-2.8264 4.05866,-1.6239 4.05865,-1.624 3.24458,0 3.24457,0 3.98519,2.1001 c 2.19185,1.1551 5.55925,3.5176 7.48309,5.25 l 3.49791,3.1499 -2.99791,-3.4047 -2.9979,-3.4046 1.5,0.8186 c 0.825,0.4502 2.69558,1.6456 4.15684,2.6564 l 2.65684,1.8378 -0.52347,-2.0017 -0.52347,-2.0018 1.00964,0 c 0.5553,0 1.28279,0.7118 1.61663,1.5818 0.33385,0.87 0.60699,2.187 0.60699,2.9267 l 0,1.3449 -1.56402,0.3233 -1.56402,0.3233 3.81402,3.4972 c 2.09771,1.9235 3.25152,2.846 2.56402,2.05 l -1.25,-1.4472 0,-5.2302 0,-5.2302 7.40998,-3.5641 7.40998,-3.5641 4.03208,-4.5807 c 2.21765,-2.5193 6.80338,-8.6268 10.19052,-13.5722 l 6.15844,-8.9916 4.1495,-3.0556 c 2.28223,-1.6806 6.3995,-4.1213 9.1495,-5.4237 l 5,-2.3681 6,-0.1778 6,-0.1779 -4,-0.3484 c -2.2,-0.1917 -4.96273,-0.5621 -6.13941,-0.8232 l -2.1394,-0.4748 -0.5878,-2.342 -0.5878,-2.342 -7.66564,-11.4167 -7.66564,-11.4167 -2.00027,-4.7736 c -1.10015,-2.6254 -2.16677,-4.607 -2.37028,-4.4035 -0.20351,0.2035 0.35292,2.1266 1.2365,4.2736 0.88359,2.1469 4.48302,8.2447 7.99875,13.5506 3.51572,5.3059 6.78281,10.7059 7.26018,12 0.47738,1.2941 1.16368,3.5755 1.52512,5.0697 l 0.65715,2.7169 -5.99839,2.9761 c -3.29912,1.6369 -7.84894,4.4633 -10.11073,6.2809 l -4.11234,3.3048 -5.53246,8.4009 -5.53247,8.401 -5.61754,5.3557 -5.61753,5.3558 -3.317,1.0952 -3.317,1.0952 -0.57169,-0.5717 -0.57169,-0.5716 2.69503,-1.0247 2.69503,-1.0246 5.58124,-5.2534 5.58125,-5.2533 5.19865,-8 5.19865,-8 4.57355,-4.1874 4.57355,-4.1875 5.34022,-2.6828 c 2.93711,-1.4756 5.44501,-2.7711 5.57311,-2.8788 0.12809,-0.1078 -0.20339,-1.7172 -0.73663,-3.5765 l -0.96952,-3.3805 -6.49222,-9.6283 c -3.57072,-5.2956 -7.38429,-11.645 -8.4746,-14.1098 -1.09032,-2.4649 -3.11954,-9.1811 -4.50939,-14.925 -1.38986,-5.7439 -2.9797,-12.4684 -3.53298,-14.9434 -0.55329,-2.475 -1.69768,-9.225 -2.5431,-15 l -1.53712,-10.5 -2.88227,-6.1776 c -1.58524,-3.3977 -4.78423,-9.0227 -7.10884,-12.5 -2.32462,-3.4773 -5.401,-7.6001 -6.83641,-9.1617 -1.4354,-1.5616 -3.82497,-3.4741 -5.31016,-4.25 l -2.70034,-1.4107 -3.39311,0 -3.39311,0 -5.87651,2.0218 c -3.23208,1.112 -7.30044,2.9975 -9.04082,4.1901 l -3.16431,2.1682 -8.17327,12.2111 -8.17327,12.2111 -4.17992,4.1386 -4.17992,4.1385 -5.21361,2.4665 c -2.86748,1.3565 -6.36063,2.9025 -7.76254,3.4355 L 539,76.3841 l 0,0.9026 c 0,0.4965 0.67768,2.5246 1.50596,4.5069 0.82827,1.9824 1.41755,3.9498 1.3095,4.3721 -0.10805,0.4224 0.16318,2.2903 0.60274,4.151 l 0.7992,3.3832 0.67134,-1.0863 0.67134,-1.0862 -0.2767,7.2031 -0.2767,7.2031 0.78565,-1.8239 0.78565,-1.8238 1.2223,8.3238 1.22229,8.3239 2.48268,7.9813 2.48267,7.9814 -0.60109,1.8939 -0.6011,1.8939 1.06891,-0.6607 1.06891,-0.6606 1.66502,5.7854 c 0.91576,3.182 2.52498,7.4883 3.57604,9.5697 l 1.91103,3.7843 -0.56583,0.9155 -0.56583,0.9156 2.05602,1.1003 2.05602,1.1003 -0.55196,0.8931 -0.55196,0.8931 4.16423,6.8068 c 2.29033,3.7437 5.72654,8.7146 7.63602,11.0465 l 3.47178,4.2397 0.77463,-0.4787 0.77463,-0.4788 1.27352,1.5345 1.27352,1.5345 1.28886,-0.4946 1.28885,-0.4945 -0.55606,1.449 c -0.30583,0.797 -0.9324,1.4491 -1.39236,1.4491 -0.45997,0 -1.57849,-1.0125 -2.4856,-2.25 l -1.64929,-2.25 0.64503,2.2029 0.64503,2.2029 -4.03782,2.06 -4.03782,2.0599 -1.45808,2.2372 -1.45809,2.2371 -0.99595,6.2188 -0.99596,6.2188 -1.99255,4.5045 -1.99256,4.5046 -3.27172,1.9896 c -1.79944,1.0943 -3.46156,1.7998 -3.6936,1.5678 -0.23203,-0.2321 1.04582,-1.6569 2.83967,-3.1663 l 3.26154,-2.7444 1.32465,-3.1704 c 0.72856,-1.7436 1.80046,-6.1487 2.382,-9.789 0.58154,-3.6404 1.58794,-7.7833 2.23644,-9.2066 l 1.17908,-2.5878 3.80294,-1.9401 C 575.28868,188.266 577,187.1572 577,186.869 c 0,-0.2882 -2.1375,-3.4057 -4.75,-6.9279 -2.6125,-3.5222 -7,-10.0571 -9.75,-14.522 -2.75,-4.465 -5.54886,-9.1007 -6.2197,-10.3018 -0.67083,-1.201 -1.85491,-3.7587 -2.63128,-5.6837 -0.77637,-1.925 -2.39678,-6.425 -3.60092,-10 -1.20413,-3.575 -3.05202,-9.65 -4.10642,-13.5 l -1.91708,-7 -1.06936,-14 -1.06935,-14 -1.43272,-2.1992 c -0.78799,-1.2096 -3.07835,-3.4596 -5.08968,-5 -2.01133,-1.5404 -5.33297,-4.2633 -7.38142,-6.0508 l -3.72447,-3.25 -1.68185,0 -1.68186,0 -3.53351,2.4011 c -1.94343,1.3206 -4.16871,3.3079 -4.94506,4.4163 -0.77635,1.1084 -2.90124,5.5404 -4.72197,9.849 -1.82073,4.3085 -5.18218,10.9836 -7.46988,14.8336 -2.2877,3.85 -4.54561,7.4597 -5.01758,8.0217 l -0.85812,1.0216 0.48873,1.4784 0.48874,1.4783 -1.51083,-1.2465 -1.51083,-1.2464 -1.53351,1.7464 c -0.84343,0.9606 -1.82298,2.6989 -2.17677,3.8629 l -0.64327,2.1164 3.33317,10.3836 c 1.83324,5.711 4.08927,13.5336 5.01341,17.3836 0.92413,3.85 2.3526,11.7298 3.17436,17.5108 l 1.49411,10.5107 2.89697,8.4893 c 1.59334,4.669 3.70665,10.5142 4.69626,12.9892 l 1.79928,4.5 1.3212,0.7997 1.32121,0.7997 0,1.9503 0,1.9503 1.05902,0 1.05901,0 -0.61803,1 -0.61803,1 1.05901,0 1.05902,0 0,1.5 0,1.5 1.03138,0 1.03139,0 0.63333,1.75 c 0.34833,0.9625 4.04671,5.2747 8.21862,9.5826 l 7.58528,7.8325 4,2.0791 c 2.2,1.1435 6.925,2.8658 10.5,3.8272 3.575,0.9614 6.55987,1.7887 6.63303,1.8383 z m -5.01407,-5.9097 c -0.28872,0 -0.99359,-1.6875 -1.56638,-3.75 -0.57278,-2.0625 -1.05083,-4.65 -1.06232,-5.75 -0.0115,-1.1 -0.35149,-2.4997 -0.75557,-3.1105 -0.40408,-0.6107 -2.30969,-1.9157 -4.23469,-2.8999 -1.925,-0.9842 -5.81212,-3.8595 -8.63805,-6.3895 -2.82592,-2.5301 -9.49562,-9.718 -14.82155,-15.9732 -5.32593,-6.2552 -10.03541,-12.3302 -10.46553,-13.5 -0.43011,-1.1698 -1.085,-3.4769 -1.45532,-5.1269 l -0.6733,-3 2.77687,5.2457 2.77688,5.2457 9.84978,11.4947 9.84977,11.4947 4.65023,3.8291 c 2.55762,2.1059 6.15058,4.4305 7.98435,5.1657 l 3.33412,1.3367 0.78195,2.0939 c 0.43007,1.1516 1.0996,4.6813 1.48783,7.8438 l 0.70588,5.75 -0.52495,0 z M 545.66667,101.1003 545,101.7669 l 0,-1.3333 0,-1.3333 0.66667,0.6666 0.66666,0.6667 -0.66666,0.6667 z M 538.5,91.4336 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 90,149 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -0.83333,-2.3333 0.66666,-0.6667 -0.66666,-0.6667 -0.66667,-0.6666 0,1.3333 0,1.3333 0.66667,-0.6666 z m -1,-3 0.66666,-0.6667 -0.66666,-0.6667 -0.66667,-0.6666 0,1.3333 0,1.3333 0.66667,-0.6666 z m -1,-3 0.66666,-0.6667 -0.66666,-0.6667 -0.66667,-0.6666 0,1.3333 0,1.3333 0.66667,-0.6666 z M 624.5,229.4336 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -1,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -0.94098,-2 c 0.24254,0 0.44098,-0.1984 0.44098,-0.441 0,-0.2425 -0.51953,-0.7621 -1.15451,-1.1545 l -1.15451,-0.7135 0.71353,1.1545 c 0.39244,0.635 0.91197,1.1545 1.15451,1.1545 z m 405.81858,0 c 0.2076,0 0.9951,-0.7875 1.75,-1.75 l 1.3724,-1.75 -1.75,1.3724 c -0.9625,0.7549 -1.75,1.5424 -1.75,1.75 0,0.2077 0.1699,0.3776 0.3776,0.3776 z m -407.75516,-3 c 0.20766,0 0.37756,-0.1699 0.37756,-0.3776 0,-0.2076 -0.7875,-0.9951 -1.75,-1.75 l -1.75,-1.3724 1.37244,1.75 c 0.75485,0.9625 1.54235,1.75 1.75,1.75 z m 411.66056,-2 c 0.1885,0 1.6362,-1.35 3.217,-3 l 2.8742,-3 -0.9991,0 c -0.5494,0 -1.9971,1.35 -3.217,3 -1.2199,1.65 -2.0637,3 -1.8751,3 z m -516.783,-4 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 338,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 3,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 184,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -160.0833,-1.0789 1.9166,0.079 -0.6041,-0.6042 -0.6042,-0.6041 -1.3125,0.5252 -1.3125,0.5252 1.9167,0.079 z m 11.2743,-0.045 c 0.655,0.068 1.4744,-0.3345 1.8208,-0.8949 0.3463,-0.5605 2.9503,-2.1949 5.7865,-3.6322 2.8362,-1.4372 7.6375,-3.4666 10.6696,-4.5098 l 5.5129,-1.8967 7.0054,-4.1618 7.0054,-4.1619 8.5928,-8.5593 8.5928,-8.5593 6.1842,-12.219 6.1841,-12.2189 6.046,-7.5156 6.046,-7.5156 3.941,-2.7655 3.941,-2.7654 0.4962,-2 c 0.273,-1.1 0.5649,-2.9 0.6487,-4 0.084,-1.1 0.081,-3.1572 -0.01,-4.5716 l -0.1584,-2.5715 -5.574,-6.9285 -5.574,-6.9284 -3.7998,-7.5 c -2.0899,-4.125 -4.9564,-10.7194 -6.37,-14.6542 l -2.5701,-7.1543 -2.1209,-11.3457 -2.1209,-11.3458 -2.4417,-5.3851 -2.4417,-5.3851 -8.2509,-8.2509 -8.2509,-8.251 -3.6913,-1.0192 -3.6912,-1.0192 -4.2536,0.9558 -4.2536,0.9557 -5.7297,3.4806 -5.7297,3.4806 -7.5729,7.0723 -7.573,7.0723 -5.4449,8.2679 c -2.9946,4.5474 -8.0869,11.5884 -11.3162,15.6466 l -5.8713,7.3787 -6.9289,5.5941 c -3.8108,3.0767 -11.5813,8.6367 -17.2677,12.3554 l -10.3389,6.7614 -2.9236,4.61 c -1.608,2.5356 -3.3438,6.1319 -3.8574,7.992 l -0.9338,3.3819 4.0182,5.0833 c 2.21,2.7959 4.8906,6.7935 5.9569,8.8836 l 1.9387,3.8002 2.9355,12.2691 c 1.6145,6.7479 3.8631,14.9368 4.9969,18.1974 1.1338,3.2606 3.9255,9.3356 6.2039,13.5 2.2783,4.1644 6.0309,10.0466 8.3391,13.0716 2.3082,3.025 4.7158,6.4829 5.3501,7.6843 l 1.1533,2.1842 0.01,3.3158 0.01,3.3157 8.2448,0.2242 8.2448,0.2242 5,1.4017 c 2.75,0.7709 5.5359,1.4575 6.191,1.5258 z m 155.309,0.1239 1.3333,0 -0.6666,-0.6667 -0.6667,-0.6666 -0.6667,0.6666 -0.6666,0.6667 1.3333,0 z m -175.5,-1.3099 6,0.01 -2.7321,-0.4148 c -1.5026,-0.2282 -4.2026,-0.2328 -6,-0.01 l -3.2679,0.4046 6,0.01 z m 170,0.3099 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 9,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -147,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2.5,-1 1.3333,0 -0.6666,-0.6667 -0.6667,-0.6666 -0.6667,0.6666 -0.6666,0.6667 1.3333,0 z m 3,-1 1.3333,0 -0.6666,-0.6667 -0.6667,-0.6666 -0.6667,0.6666 -0.6666,0.6667 1.3333,0 z m 2.5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2.5,-1 1.3333,0 -0.6666,-0.6667 -0.6667,-0.6666 -0.6667,0.6666 -0.6666,0.6667 1.3333,0 z m 3,-1 1.3333,0 -0.6666,-0.6667 -0.6667,-0.6666 -0.6667,0.6666 -0.6666,0.6667 1.3333,0 z m 4,-2 c 1.1,-0.5887 2,-1.2954 2,-1.5704 0,-0.275 -0.9,-0.018 -2,0.5704 -1.1,0.5887 -2,1.2954 -2,1.5704 0,0.275 0.9,0.018 2,-0.5704 z m 3.5,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1.882,-1 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z m 4.2664,-2.864 c 1.1817,-0.6037 4.6735,-3.4054 7.7596,-6.226 3.0862,-2.8205 6.5858,-6.5416 7.7769,-8.2691 l 2.1657,-3.1409 -8.4253,7.9475 c -4.6339,4.3712 -9.1003,8.5862 -9.9253,9.3668 l -1.5,1.4193 2.1484,-1.0976 z m -219.9796,-0.4714 c 0.2357,-0.2357 0.1276,-1.6277 -0.2402,-3.0932 -0.3678,-1.4655 -0.8616,-2.4717 -1.0974,-2.236 -0.2357,0.2357 -0.1276,1.6277 0.2402,3.0932 0.3678,1.4655 0.8616,2.4717 1.0974,2.236 z M 1145.5,170.4336 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -199,-6 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 203,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -202.118,-1 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z m -384.882,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 588,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -457.941,-2 c 0.2426,0 0.441,-0.1984 0.441,-0.441 0,-0.2425 -0.5195,-0.7621 -1.1545,-1.1545 l -1.15452,-0.7135 0.71352,1.1545 c 0.3924,0.635 0.912,1.1545 1.1545,1.1545 z m 256.941,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -260,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 4.75,-0.08 0.75,0.08 0,-1.5455 0,-1.5454 2.3116,-2.3116 2.3116,-2.3116 5.4384,-1.7747 c 2.9911,-0.9761 8.0838,-3.0712 11.317,-4.6558 l 5.8787,-2.8812 8.6213,-8.1245 8.6214,-8.1245 6.5874,-10.1126 6.5873,-10.1126 4.445,-4.07 4.445,-4.0699 5.692,-2.7849 5.692,-2.7848 0.6512,-3.4711 0.6511,-3.471 -0.6251,-4.5612 -0.6252,-4.5611 -2.7504,-4.2751 c -1.5126,-2.3513 -5.0431,-7.6232 -7.8455,-11.7153 l -5.0952,-7.4403 -3.1623,-7.5961 C 752.408,38.9549 750.3288,32.926 749.5267,29.7351 748.7247,26.5443 747.374,18.2026 746.5253,11.198 l -1.5432,-12.7357 -2.0357,-5.1647 c -1.1197,-2.8406 -3.8816,-8.2718 -6.1376,-12.0692 l -4.1019,-6.9045 -4.3861,-4.8784 -4.386,-4.8783 -3.4338,-1.1333 -3.4337,-1.1332 -6.2836,1.5932 -6.2837,1.5932 -7.0519,3.3299 -7.05197,3.3299 -3.77322,3.3129 -3.77321,3.313 -7.00392,9.8783 c -3.85216,5.4331 -9.68764,12.7473 -12.96773,16.2537 l -5.96381,6.3753 -4.78784,3.0724 -4.78785,3.0723 -5.41928,1.8821 c -2.9806,1.0351 -7.01157,2.6501 -8.95772,3.5887 l -3.53844,1.7067 -2.13993,3.1656 -2.13993,3.1657 -0.63915,3.5167 -0.63915,3.5167 3.56667,5.9231 c 1.96167,3.2576 4.43687,8.2488 5.50044,11.0914 l 1.93376,5.1685 1.10086,8.3918 c 0.60548,4.6155 2.23078,14.0168 3.61178,20.8918 1.381,6.875 2.98406,14.3 3.56237,16.5 0.5783,2.2 2.56837,7.0327 4.42238,10.7394 1.854,3.7066 6.12185,10.8306 9.48411,15.831 3.36225,5.0004 6.5711,10.4051 7.13076,12.0106 l 1.01757,2.919 3.72067,0 3.72068,0 4.9315,1.4846 4.9315,1.4846 5.5,3.4359 c 3.025,1.8898 5.8375,3.4717 6.25,3.5154 z m 256.25,0.08 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -390.94098,-1 c 0.24254,0 0.44098,-0.1984 0.44098,-0.441 0,-0.2425 -0.51953,-0.7621 -1.15451,-1.1545 l -1.15451,-0.7135 0.71353,1.1545 c 0.39244,0.635 0.91197,1.1545 1.15451,1.1545 z m 128,0 c 0.24254,0 0.44098,-0.1984 0.44098,-0.441 0,-0.2425 -0.51953,-0.7621 -1.15451,-1.1545 l -1.15451,-0.7135 0.71353,1.1545 c 0.39244,0.635 0.91197,1.1545 1.15451,1.1545 z m 263.94098,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -267,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -126.83333,-1.3333 0.66666,-0.6667 -0.66666,-0.6667 -0.66667,-0.6666 0,1.3333 0,1.3333 0.66667,-0.6666 z M 682.5,153.4336 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 270,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -272.5,-1 1.33333,0 -0.66666,-0.6667 -0.66667,-0.6666 -0.66667,0.6666 -0.66666,0.6667 1.33333,0 z m -3,-1 1.33333,0 -0.66666,-0.6667 -0.66667,-0.6666 -0.66667,0.6666 -0.66666,0.6667 1.33333,0 z m 276.5,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -397,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 398,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -398.83333,-1.3333 0.66666,-0.6667 -0.66666,-0.6667 -0.66667,-0.6666 0,1.3333 0,1.3333 0.66667,-0.6666 z M 955.5,147.4336 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 191.1667,-0.3333 0.6666,-0.6667 -0.6666,-0.6667 -0.6667,-0.6666 0,1.3333 0,1.3333 0.6667,-0.6666 z M 554.5,145.4336 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 402,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -403.83333,-1.3333 0.66666,-0.6667 -0.66666,-0.6667 -0.66667,-0.6666 0,1.3333 0,1.3333 0.66667,-0.6666 z m 594.00003,0 0.6666,-0.6667 -0.6666,-0.6667 -0.6667,-0.6666 0,1.3333 0,1.3333 0.6667,-0.6666 z M 959.5,140.4336 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 189.1667,-2.3333 0.6666,-0.6667 -0.6666,-0.6667 -0.6667,-0.6666 0,1.3333 0,1.3333 0.6667,-0.6666 z M 961.5,137.4336 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -410,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 598.1623,-0.75 0.5044,-1.25 -0.5044,-1.25 -0.5044,-1.25 0,2.5 0,2.5 0.5044,-1.25 z M 550.5,133.4336 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -1,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -0.83333,-3.3333 0.66666,-0.6667 -0.66666,-0.6667 -0.66667,-0.6666 0,1.3333 0,1.3333 0.66667,-0.6666 z M 547.5,123.4336 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 603.321,0 c 0.2277,0 0.097,-3.4875 -0.2914,-7.75 -0.388,-4.2625 -1.3132,-10.6855 -2.0561,-14.2733 -0.7428,-3.5878 -1.8036,-7.7146 -2.3572,-9.1707 l -1.0065,-2.6475 -1.9625,0.5132 -1.9624,0.5132 1.8021,1.8021 1.802,1.802 1.1055,5.1547 c 0.608,2.8351 1.1055,6.1126 1.1055,7.2832 0,1.1707 0.7666,5.4235 1.7035,9.4508 0.937,4.0273 1.8898,7.3223 2.1175,7.3223 z m -604.21683,-3.2708 0.60416,-0.6042 -0.52522,-1.3125 -0.52522,-1.3125 -0.0789,1.9167 -0.0789,1.9166 0.60417,-0.6041 z m 464.35433,-2.8382 c 0.2522,0.06 2.5283,-2.061 5.058,-4.7132 2.5297,-2.6523 9.4053,-8.5322 15.2791,-13.0667 l 10.6797,-8.2443 3.3963,-4.1834 c 1.868,-2.3009 5.6504,-7.6548 8.4053,-11.8976 l 5.0089,-7.7143 6.1932,-14.7857 6.1933,-14.7858 6.2353,-10 6.2352,-10 1.14,-4.5 c 0.627,-2.475 1.3901,-5.85 1.6957,-7.5 l 0.5557,-3 -1.9374,-3.5977 c -1.0656,-1.9787 -4.2702,-6.7037 -7.1215,-10.5 l -5.1841,-6.9023 -2.4812,-5.5 c -1.3646,-3.025 -3.7883,-10 -5.386,-15.5 -1.5976,-5.5 -3.5816,-12.2815 -4.4088,-15.0701 l -1.504,-5.0701 -3.2052,-4.8389 -3.2051,-4.8389 -9.0505,-9.3487 -9.0504,-9.3487 -2.9343,0.01 -2.9343,0.01 -4.5657,2.1859 -4.5657,2.186 -6.6255,6.586 -6.6254,6.5861 -4.4584,8.978 c -2.4521,4.9379 -5.9428,12.7131 -7.7572,17.2781 l -3.2987,8.3002 -3.9249,6.0726 -3.9249,6.0726 -5.1925,5.1851 -5.1925,5.1851 -8.2018,5.7416 -8.2018,5.7417 -4.4821,4.9851 -4.482,4.9851 -1.1438,3.4657 -1.1438,3.4657 3.6379,4.2497 3.6378,4.2497 2.9363,6 2.9364,6 2.5908,12.8624 2.5909,12.8623 4.0513,10.1377 4.0513,10.1376 2.6113,3.6208 c 1.4362,1.9914 4.6184,6.2075 7.0715,9.3692 l 4.4602,5.7486 0.3941,6.1887 0.394,6.1887 8.1458,-0.01 8.1457,-0.01 4,2.0886 c 2.2,1.1487 4.2063,2.1376 4.4585,2.1975 z m -465.29622,-2.641 0.50439,-1.25 -0.50439,-1.25 -0.50439,-1.25 0,2.5 0,2.5 0.50439,-1.25 z m 96.00439,-4.5833 0.66666,-0.6667 -0.66666,-0.6667 -0.66667,-0.6666 0,1.3333 0,1.3333 0.66667,-0.6666 z m 382.71093,-1.6667 c 0.2076,0 0.9951,-0.7875 1.75,-1.75 l 1.3724,-1.75 -1.75,1.3724 c -0.9625,0.7549 -1.75,1.5424 -1.75,1.75 0,0.2077 0.1699,0.3776 0.3776,0.3776 z m -383.71093,-1.3333 0.66666,-0.6667 -0.66666,-0.6667 -0.66667,-0.6666 0,1.3333 0,1.3333 0.66667,-0.6666 z m -1,-4 0.66666,-0.6667 -0.66666,-0.6667 -0.66667,-0.6666 0,1.3333 0,1.3333 0.66667,-0.6666 z M 1030.5,103.4336 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2.882,-2 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z m -394.71972,-2.75 0.50439,-1.25 -0.50439,-1.25 -0.50439,-1.25 0,2.5 0,2.5 0.50439,-1.25 z m 397.71532,0.75 c 0.2076,0 0.9951,-0.7875 1.75,-1.75 l 1.3724,-1.75 -1.75,1.3724 c -0.9625,0.7549 -1.75,1.5424 -1.75,1.75 0,0.2077 0.1699,0.3776 0.3776,0.3776 z m 96.1224,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -91.31,-1 c 0.275,0 1.3145,-0.9 2.31,-2 0.9955,-1.1 1.585,-2 1.31,-2 -0.275,0 -1.3145,0.9 -2.31,2 -0.9955,1.1 -1.585,2 -1.31,2 z m 93.3376,0 c 0.2253,0 0.1432,-0.6944 -0.1825,-1.5431 -0.3257,-0.8487 -0.8066,-1.3287 -1.0688,-1.0666 -0.2621,0.2622 -0.18,0.9566 0.1826,1.5432 0.3625,0.5866 0.8435,1.0665 1.0687,1.0665 z m -496.92343,-1.2708 0.60416,-0.6042 -0.52522,-1.3125 -0.52522,-1.3125 -0.0789,1.9167 -0.0789,1.9166 0.60417,-0.6041 z M 1137.5,93.4336 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 5.3681,-2.1877 3.5548,-1.8123 2.8476,0 2.8475,0 -0.7059,1.25 c -0.3883,0.6875 1.204,-0.55 3.5384,-2.75 2.3344,-2.2 6.113,-6.6031 8.3969,-9.7846 2.2839,-3.1815 5.7276,-7.9421 7.6526,-10.5791 1.925,-2.637 5.9021,-8.134 8.8381,-12.2154 2.9359,-4.0815 6.2128,-9.1186 7.2819,-11.1936 l 1.9438,-3.7726 1.4176,-14.2274 c 0.7796,-7.825 1.8384,-22.3273 2.3527,-32.2273 0.5143,-9.9 0.8335,-22.0516 0.7094,-27.0035 l -0.2257,-9.0036 -1.1103,-3.4964 c -0.6106,-1.9231 -1.6178,-6.4215 -2.2383,-9.9965 l -1.128,-6.5 -2.5714,-6.5 c -1.4143,-3.575 -4.1268,-8.975 -6.0279,-12 -1.901,-3.025 -4.5507,-6.668 -5.8883,-8.0956 -1.3376,-1.4276 -3.6886,-5.0276 -5.2246,-8 l -2.7926,-5.4044 -1.3673,0 -1.3673,0 -3.3016,4.3286 -3.3016,4.3287 -0.4155,2.1713 c -0.2285,1.1943 -0.85,11.1714 -1.3811,22.1714 l -0.9656,20 -2.2034,6.5 c -1.2118,3.575 -3.997,10.1814 -6.1893,14.6808 l -3.986,8.1808 -6.6789,7.672 c -3.6733,4.2195 -9.2274,10.8638 -12.3423,14.7651 l -5.6634,7.0931 -0.4055,3.4728 -0.4054,3.4727 3.2998,4.9034 3.2997,4.9034 0.8997,3.6779 c 0.4949,2.0229 1.5614,7.9661 2.3702,13.207 l 1.4705,9.5291 7.1489,14.2837 7.149,14.2838 -0.01,3.1872 -0.01,3.1872 -1.3372,2.5623 -1.3372,2.5624 3.5548,-1.8124 z m 9.2833,-1.8123 c -0.275,0 0.5569,-1.125 1.8486,-2.5 1.2917,-1.375 2.5736,-2.5 2.8486,-2.5 0.275,0 -0.5569,1.125 -1.8486,2.5 -1.2917,1.375 -2.5736,2.5 -2.8486,2.5 z m -512.54723,1.7292 0.60416,-0.6042 -0.52522,-1.3125 -0.52522,-1.3125 -0.0789,1.9167 -0.0789,1.9166 0.60417,-0.6041 z M 1047.382,88.4336 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z m 88.2847,-0.3333 0.6666,-0.6667 -0.6666,-0.6667 -0.6667,-0.6666 0,1.3333 0,1.3333 0.6667,-0.6666 z M 540.55902,86.4336 c 0.24254,0 0.44098,-0.1984 0.44098,-0.441 0,-0.2425 -0.51953,-0.7621 -1.15451,-1.1545 l -1.15451,-0.7135 0.71353,1.1545 c 0.39244,0.635 0.91197,1.1545 1.15451,1.1545 z m 95.10326,-1.75 0.50439,-1.25 -0.50439,-1.25 -0.50439,-1.25 0,2.5 0,2.5 0.50439,-1.25 z M 1050.5,84.4336 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 86.2297,-1.2448 0.4149,-1.7448 -7.1641,-14.2773 -7.1642,-14.2773 -1.3231,-5.4779 -1.3231,-5.4779 -0.085,4.3066 -0.085,4.3066 3.4017,8.1934 c 1.8709,4.5064 5.068,11.1184 7.1046,14.6934 2.0365,3.575 4.1766,7.625 4.7557,9 l 1.0528,2.5 0.4149,-1.7448 z m -598.03172,0.186 c 0.10889,0.032 -0.27459,-1.2968 -0.85219,-2.9537 l -1.05016,-3.0125 0.55854,-1.4556 0.55853,-1.4555 8.85292,-4.4462 8.85291,-4.4462 3.52947,-4.3357 c 1.9412,-2.3847 6.44502,-8.8358 10.00849,-14.3358 l 6.47902,-10 3.60028,-3.1475 3.60029,-3.1475 5.82109,-2.1779 5.8211,-2.178 4.70368,-0.5571 4.70367,-0.557 3.55719,2.0988 C 609.39927,28.4217 611,29.1627 611,28.9141 c 0,-0.2487 -1.82458,-1.6596 -4.05461,-3.1353 l -4.05461,-2.6833 -6.19072,-0.081 -6.19072,-0.081 -0.70271,-5.5 c -0.38649,-3.025 -1.11233,-7.3 -1.61297,-9.5 l -0.91026,-4 0.41924,10 0.41923,10 -0.81093,1 c -0.44602,0.55 -2.99713,2.125 -5.66914,3.5 l -4.85821,2.5 -3.46474,4 c -1.90561,2.2 -4.61342,6.025 -6.01735,8.5 l -2.5526,4.5 -4.39578,2.8423 -4.39577,2.8422 -5.22868,6.8362 -5.22867,6.8362 -5.26704,2.1946 c -2.89687,1.207 -5.49868,2.5694 -5.78181,3.0275 l -0.51477,0.833 1.53201,3.6666 1.53202,3.6666 -1.5002,-1.245 L 534,78.1886 l 0,0.8095 c 0,0.4453 -1.45547,-0.5121 -3.23437,-2.1275 l -3.23436,-2.9371 1.98436,2.3787 c 1.0914,1.3083 3.55937,3.4193 5.48437,4.6912 1.925,1.2718 3.58909,2.3389 3.69798,2.3713 z M 1052.5,81.4336 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -417.83772,-1.75 0.50439,-1.25 -0.50439,-1.25 -0.50439,-1.25 0,2.5 0,2.5 0.50439,-1.25 z m 419.71972,-1.25 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z m 2.118,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -422.81067,-3.25 c 0.25152,-0.9625 0.25152,-2.5375 0,-3.5 l -0.45733,-1.75 0,3.5 0,3.5 0.45733,-1.75 z m 424.81067,0.25 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -427.83772,-2.75 0.50439,-1.25 -0.50439,-1.25 -0.50439,-1.25 0,2.5 0,2.5 0.50439,-1.25 z m 428.83772,0.75 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z M 516.7407,65.0262 c 0.2287,-0.2287 -0.27638,-1.6931 -1.1224,-3.2542 -0.84603,-1.5611 -1.55624,-2.5221 -1.57826,-2.1355 -0.022,0.3867 0.48306,1.8511 1.1224,3.2543 0.63934,1.4032 1.34956,2.3641 1.57826,2.1354 z M 1062.5,64.4336 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-5 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-5 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 46.294,-2.1738 0.3241,-2.6738 -1.0782,-4.0041 -1.0782,-4.0042 -3.4808,-5.1726 -3.4809,-5.1725 0,-1.8995 0,-1.8995 -1.941,0 -1.941,0 -0.6224,-1.0071 c -0.3423,-0.5539 -1.8314,-1.6214 -3.309,-2.3722 l -2.6866,-1.3651 -1.9802,0.716 -1.9802,0.7161 3.6625,1.738 3.6626,1.738 4.9572,5.2415 4.9572,5.2415 2.084,4.0849 2.0839,4.0849 0.7615,4.3417 0.7614,4.3418 0.3241,-2.6738 z m -45.294,0.1738 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1.9182,-3.5573 c 0.7801,-1.0668 1.26,-2.0978 1.0666,-2.2913 -0.1935,-0.1934 -0.8317,-0.055 -1.4183,0.3075 l -1.0665,0.6591 0,1.6321 0,1.6322 1.4182,-1.9396 z m 108.6411,-1.4427 c 0.492,0 1.6883,-1.2375 2.6585,-2.75 0.9701,-1.5125 2.7945,-3.875 4.0543,-5.25 1.2597,-1.375 2.5493,-3.5094 2.8658,-4.7431 l 0.5754,-2.2431 0.8819,0.545 0.8819,0.5451 -0.5246,-1.3671 -0.5246,-1.367 2.4311,-2.6232 2.4311,-2.6232 -0.5382,-0.5381 -0.5382,-0.5382 1.6374,-0.6283 1.6374,-0.6284 -0.4707,-0.7615 -0.4706,-0.7616 2.0099,-1.8189 2.0099,-1.819 -0.6471,-4.3147 -0.647,-4.3147 0.9274,0 0.9273,0 -0.4203,-5.8102 -0.4202,-5.8102 1.0162,-6.9398 1.0162,-6.9398 -0.6598,-6.9164 -0.6597,-6.9164 -3.9621,4.9164 c -2.1791,2.704 -7.6916,9.0782 -12.25,14.1648 -4.5583,5.0866 -8.2879,9.5989 -8.2879,10.0275 0,0.4285 0.7109,1.7941 1.5799,3.0347 l 1.5799,2.2556 0.3559,5.7169 0.356,5.7169 -0.8559,-2.5 -0.8558,-2.5 0,18.25 0,18.25 0.8946,0 z m -103.7662,-2.5643 1.7932,-0.6828 -0.5598,-0.5598 -0.5598,-0.5598 -1.2334,1.2426 -1.2333,1.2426 1.7931,-0.6828 z M 1088.5,9.4336 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 28.9137,-12.1934 c 5.5475,-6.5323 12.1428,-14.3398 14.6564,-17.35 l 4.57,-5.4731 2.8437,-5.9496 2.8436,-5.9496 0.8249,0.5098 0.8248,0.5098 -0.5184,-1.3509 -0.5184,-1.3508 2.481,-6.4511 2.4809,-6.4511 0.1513,1.5 0.1512,1.5 0.8646,-3.5 c 0.4755,-1.925 1.0945,-8.45 1.3755,-14.5 0.2809,-6.05 0.8144,-14.6 1.1853,-19 0.371,-4.4 0.7803,-9.35 0.9096,-11 0.1293,-1.65 0.9752,-6.303 1.8798,-10.34 l 1.6447,-7.34 -2.527,-5.51961 -2.5269,-5.51961 -5.0584,-6.43664 c -2.7821,-3.54015 -6.4364,-8.77379 -8.1206,-11.63031 l -3.0623,-5.19367 -4.4348,-12.01008 c -2.4392,-6.60554 -5.113,-13.77116 -5.9418,-15.9236 -0.8289,-2.15243 -3.4789,-6.9616 -5.8888,-10.68704 l -4.3818,-6.77353 -2.4963,-1.63562 -2.4962,-1.63561 -2.8147,0.32266 -2.8146,0.32266 -3.7079,5.5 c -2.0393,3.025 -5.0727,8.24686 -6.7408,11.60413 l -3.033,6.10412 -3.0384,12.71398 -3.0385,12.71398 -4.5528,11.37707 -4.5528,11.37708 -3.2019,5.30482 c -1.7611,2.91762 -6.4654,9.29212 -10.4541,14.16552 -3.9886,4.8734 -8.0781,10.4984 -9.0876,12.5 -1.0096,2.0016 -2.1502,4.6568 -2.5348,5.9004 l -0.6992,2.261 6.4433,7.0598 6.4434,7.0598 2.501,5.1792 2.5011,5.1791 1.2134,5.5 c 0.6674,3.025 2.6011,10 4.2972,15.5 l 3.0838,10 2.9612,5 c 1.6286,2.75 4.6442,7.025 6.7014,9.5 2.0571,2.475 4.6961,6.075 5.8644,8 l 2.1241,3.5 0,4.3157 0,4.3158 -1.0101,1.8875 -1.0102,1.8874 3.478,-1.4532 c 1.913,-0.7993 4.5677,-1.4532 5.8994,-1.4532 l 2.4213,0 2.2745,1.8418 2.2745,1.8417 10.0863,-11.8769 z m 14.1909,-23.8066 -0.675,0 1.0406,-1.9443 c 0.5723,-1.0694 1.4881,-2.2209 2.0352,-2.559 l 0.9946,-0.6147 -0.032,0.809 c -0.017,0.4449 -0.6296,1.5965 -1.3602,2.559 -0.7307,0.9625 -1.6322,1.75 -2.0034,1.75 z M 938.2148,8.3494 c 0.3932,0.046 1.2503,-0.9164 1.9049,-2.1394 0.6545,-1.223 3.4828,-4.6552 6.2851,-7.6271 l 5.0952,-5.4035 7.5,-5.0451 7.5,-5.045 6,-6.0876 6,-6.0877 3.8699,-5.8403 3.8699,-5.8403 6.1926,-14.1499 c 3.406,-7.7825 7.4568,-16.1403 9.0019,-18.5729 1.5451,-2.4327 4.8651,-6.6209 7.3778,-9.3072 l 4.5686,-4.8842 0.4273,-5.9085 0.4274,-5.9086 -0.6475,-3.4518 -0.6476,-3.4517 -5.3871,-7.9106 c -2.963,-4.3509 -7.4366,-11.96794 -9.9415,-16.92686 -2.5049,-4.95892 -6.1223,-12.67953 -8.0387,-17.1569 -1.9164,-4.47737 -4.8768,-12.98492 -6.5786,-18.90566 l -3.0943,-10.76498 -3.2001,-5.40671 -3.2,-5.40672 -6,-6.28246 -6,-6.28247 -2.8406,-0.69196 -2.8406,-0.69197 -3.7362,1.11938 -3.7361,1.11939 -6.2912,4.06616 -6.2911,4.06617 -4.6321,4.77315 -4.6321,4.77315 -3.5,6.2524 c -1.925,3.43882 -6.0108,10.15392 -9.0796,14.92245 l -5.5796,8.67004 -5.4204,5.93258 -5.4204,5.93257 -9.7024,7.68417 c -5.3364,4.2263 -10.7874,8.98164 -12.1134,10.56743 -1.326,1.58579 -3.322,4.68325 -4.4356,6.88325 -1.1135,2.2 -2.4647,5.6004 -3.0026,7.5564 l -0.9779,3.5565 1.9762,2.4405 c 1.0869,1.3423 3.232,4.9282 4.7669,7.9688 1.5349,3.0405 3.2595,7.3169 3.8325,9.503 0.5731,2.1862 1.7223,9.2891 2.5538,15.7844 l 1.5118,11.8095 3.7021,10.6905 3.7021,10.6904 7.7536,11.7132 7.7535,11.7132 1.2022,3.6428 1.2023,3.6427 -0.4168,5.7612 -0.4167,5.7612 3.4373,-1.4362 3.4373,-1.4362 7.4386,-0.029 7.4385,-0.029 4.6783,2.514 c 2.5731,1.3827 5.0001,2.5519 5.3932,2.5982 z M 1111.5,8.4336 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z M 586.66667,3.1003 587.33333,2.4336 586.66667,1.7669 586,1.1003 l 0,1.3333 0,1.3333 0.66667,-0.6666 z M 1116.382,1.4336 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z M 585.66667,0.1003 586.33333,-0.5664 585.66667,-1.2331 585,-1.8997 l 0,1.3333 0,1.3333 0.66667,-0.6666 z m -1,-3 0.66666,-0.6667 -0.66666,-0.6667 L 584,-4.8997 l 0,1.3333 0,1.3333 0.66667,-0.6666 z M 1120.382,-3.5664 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z M 583.7152,-5.9483 c 0.25747,-0.2574 -0.009,-1.2893 -0.59313,-2.2931 -0.58369,-1.0037 -1.07494,-1.5243 -1.09166,-1.1568 -0.0167,0.3675 0.25018,1.3994 0.59313,2.2931 0.34294,0.8937 0.83419,1.4143 1.09166,1.1568 z M 1124.19,-8.5664 c 0.275,0 1.3145,-0.9 2.31,-2 0.9955,-1.1 1.585,-2 1.31,-2 -0.275,0 -1.3145,0.9 -2.31,2 -0.9955,1.1 -1.585,2 -1.31,2 z m -542.57327,-2.2834 c 0.20843,-0.2084 -0.7651,-3.7174 -2.1634,-7.7978 l -2.54236,-7.4188 -1.28571,-9 -1.28571,-9 0.20036,-10.2712 0.20036,-10.2713 -1.01675,-0.6284 -1.01675,-0.6284 0.59975,15.8997 0.59975,15.8996 1.05805,4.5 c 0.58193,2.475 2.23151,7.784 3.66575,11.7978 1.43423,4.0138 2.77823,7.1272 2.98666,6.9188 z m 551.76527,-7.7166 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z m -765.44985,-2.9654 c 2.16268,-1.1033 4.21424,-2.4625 4.55902,-3.0203 l 0.62686,-1.0143 -0.82688,0 c -0.45478,0 -2.50634,1.1412 -4.55902,2.5361 C 365.67946,-21.6355 364,-20.2764 364,-20.01 c 0,0.2663 1.76947,-0.4185 3.93215,-1.5218 z M 1136.5,-22.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -761.80576,-3.0318 c 0.65683,0.017 2.45683,-1.1204 4,-2.5285 l 2.80576,-2.5604 -2,0.9871 c -1.1,0.5429 -2.9,1.6807 -4,2.5285 l -2,1.5415 1.19424,0.032 z M 1138.5,-25.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 56.3069,-1.4735 0.5598,-0.5598 -1.2426,-1.2334 -1.2426,-1.2333 0.6828,1.7931 0.6828,1.7932 0.5598,-0.5598 z M 1139.5,-27.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 50,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 0.1559,-3.731 c 0.274,-0.677 0.2906,-2.027 0.037,-3 l -0.461,-1.769 -0.037,3 -0.037,3 0.498,-1.231 z m 3.3199,-1.8528 c 1.0251,-1.0539 5.9317,-6.8266 10.9036,-12.8281 l 9.0398,-10.912 2.7904,-5.588 2.7904,-5.5881 -0.1709,-23.6927 -0.1709,-23.69264 -2.1192,-8.45895 c -1.1655,-4.65243 -4.5358,-16.26573 -7.4894,-25.80734 -2.9537,-9.5416 -7.9379,-24.77337 -11.0761,-33.84837 -3.1382,-9.075 -6.3204,-19.07518 -7.0716,-22.22261 -0.7513,-3.14744 -2.3562,-7.82945 -3.5666,-10.40446 l -2.2008,-4.68185 -0.6559,1.86999 -0.656,1.86999 2.8272,13.03447 c 1.555,7.16896 3.4785,16.6401 4.2745,21.04697 l 1.4472,8.0125 -1.3512,11.62222 -1.3511,11.62221 -2.0783,7.40662 c -1.1431,4.07364 -3.4649,11.21302 -5.1596,15.86528 -1.6947,4.65227 -4.3036,10.48367 -5.7975,12.95867 -1.4938,2.475 -3.9351,7.2563 -5.4249,10.625 -1.4899,3.3688 -2.7089,6.5848 -2.7089,7.1467 0,0.5619 2.4507,4.1934 5.446,8.0701 2.9952,3.8767 6.1947,8.4965 7.1098,10.2662 0.9152,1.7697 2.507,5.6678 3.5373,8.6625 l 1.8733,5.4448 0.6541,6.6424 0.6542,6.6423 1.9581,5.3132 1.9582,5.3132 -0.04,5.1031 -0.04,5.103 1.8639,-1.9163 z m -51.4758,0.5838 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 47.1042,-1.2708 0.6041,-0.6042 -0.5252,-1.3125 -0.5252,-1.3125 -0.079,1.9167 -0.079,1.9166 0.6042,-0.6041 z M 1146.5,-43.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -154.8333,-1.3333 0.6666,-0.6667 -0.6666,-0.6667 -0.6667,-0.6666 0,1.3333 0,1.3333 0.6667,-0.6666 z M 423.5,-46.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 724,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -155,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 199,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -198,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 197,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -196,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -561.11803,-2 c 0.275,0 0.77811,-0.45 1.11803,-1 0.33992,-0.55 0.39303,-1 0.11803,-1 -0.275,0 -0.77811,0.45 -1.11803,1 -0.33992,0.55 -0.39303,1 -0.11803,1 z m 562.11803,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 194,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -193,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1.1667,-2.3333 0.6666,-0.6667 -0.6666,-0.6667 -0.6667,-0.6666 0,1.3333 0,1.3333 0.6667,-0.6666 z m 190.9375,-0.9375 0.6041,-0.6042 -0.5252,-1.3125 -0.5252,-1.3125 -0.079,1.9167 -0.079,1.9166 0.6042,-0.6041 z M 998.5,-61.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 188,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -612.78375,-3.25 c 0.22913,-1.5125 0.22913,-3.9875 0,-5.5 l -0.41659,-2.75 0,5.5 0,5.5 0.41659,-2.75 z m 611.78375,-0.75 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -1,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -734,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 733,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -732,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 5.16667,-1.3333 0.66666,-0.6667 -0.66666,-0.6667 -0.66667,-0.6666 0,1.3333 0,1.3333 0.66667,-0.6666 z m 726.01963,-0.02 c 0.2493,-0.2493 -0.5278,-2.3761 -1.7268,-4.7264 -1.199,-2.3503 -4.4212,-6.9662 -7.1604,-10.2577 l -4.9804,-5.9845 0.3817,-3.2691 0.3816,-3.269 -0.8189,0.5061 -0.819,0.5062 -1.9075,-2.3263 -1.9076,-2.3263 -1.7788,1.75 -1.7788,1.75 1.6417,0 1.6417,0 2.0726,2.6349 2.0726,2.6348 0.056,1.6152 0.056,1.6151 3.9638,5 c 2.1801,2.75 5.3575,7.16 7.0609,9.8001 1.7034,2.64 3.301,4.5961 3.5502,4.3469 z m -722.30874,-4.6467 c 0.20765,0 0.99515,-0.7875 1.75,-1.75 l 1.37244,-1.75 -1.75,1.3724 c -0.9625,0.7549 -1.75,1.5424 -1.75,1.75 0,0.2077 0.1699,0.3776 0.37756,0.3776 z m 563.58384,-9.2402 3.4615,-1.7598 5.0385,0 5.0386,0 3.0847,1.881 3.0846,1.881 1.7825,-3.3098 c 0.9803,-1.8203 6.221,-8.631 11.646,-15.1347 l 9.8636,-11.825 3.4115,-6.5 c 1.8763,-3.575 5.0487,-10.90428 7.0496,-16.28729 l 3.6381,-9.78729 1.987,-9.71271 c 1.0928,-5.34199 2.4799,-11.28771 3.0826,-13.21271 0.6026,-1.925 2.6779,-6.65 4.6118,-10.5 l 3.5161,-7 -0.5837,-8.29732 -0.5837,-8.29731 -4.4196,-6.70269 c -2.4308,-3.68647 -6.226,-9.91685 -8.4338,-13.84529 -2.2077,-3.92843 -5.1498,-10.00343 -6.5379,-13.5 -1.3881,-3.49656 -3.0488,-8.33736 -3.6905,-10.75732 -0.6417,-2.41996 -2.2049,-6.74731 -3.4737,-9.61633 l -2.3069,-5.21641 -7.3642,-5.78606 c -4.0502,-3.18234 -8.7936,-7.12376 -10.5407,-8.75872 l -3.1767,-2.97266 -3.3849,0.63502 -3.3849,0.63501 -5.5043,4.90586 -5.5042,4.90585 -3.0617,5.83419 -3.0616,5.83418 -3.7003,11 -3.7003,11 -2.8717,4.5 c -1.5793,2.475 -4.8068,6.33875 -7.1722,8.58611 -2.3653,2.24735 -6.5506,5.82104 -9.3006,7.94153 -2.75,2.12048 -7.1566,5.90673 -9.7925,8.41389 l -4.7924,4.55847 -1.5178,5.21312 -1.5178,5.21312 3.927,5.28688 c 2.1598,2.90779 5.0736,7.31188 6.4751,9.78688 l 2.5482,4.5 3.1373,10.95169 3.1374,10.9517 5.0296,11.71867 5.0295,11.71868 4.347,6.82963 c 2.3908,3.7563 6.0665,9.52963 8.1682,12.82963 l 3.8212,6 0,8.5098 0,8.5098 3.4614,-1.7598 z m -554.58384,-1.7598 c 0.20765,0 0.99515,-0.7875 1.75,-1.75 l 1.37244,-1.75 -1.75,1.3724 c -0.9625,0.7549 -1.75,1.5424 -1.75,1.75 0,0.2077 0.1699,0.3776 0.37756,0.3776 z m 684.12244,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -680.12244,-3 c 0.20765,0 0.99515,-0.7875 1.75,-1.75 l 1.37244,-1.75 -1.75,1.3724 c -0.9625,0.7549 -1.75,1.5424 -1.75,1.75 0,0.2077 0.1699,0.3776 0.37756,0.3776 z m 579.81244,-1 c 0.275,0 1.3145,-0.9 2.31,-2 0.9955,-1.1 1.585,-2 1.31,-2 -0.275,0 -1.3145,0.9 -2.31,2 -0.9955,1.1 -1.585,2 -1.31,2 z m 102.31,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 0.941,-5 c 0.2425,0 0.6999,-0.4189 1.0163,-0.9309 l 0.5753,-0.9309 -1.0163,-0.6281 -1.0163,-0.6281 0,1.559 c 0,0.8574 0.1984,1.559 0.441,1.559 z m -677.28963,-1 c 0.275,0 1.55688,-1.125 2.84863,-2.5 1.29175,-1.375 2.12363,-2.5 1.84863,-2.5 -0.275,0 -1.55688,1.125 -2.84863,2.5 -1.29175,1.375 -2.12363,2.5 -1.84863,2.5 z m 579.00003,0 c 0.275,0 1.5569,-1.125 2.8486,-2.5 1.2917,-1.375 2.1236,-2.5 1.8486,-2.5 -0.275,0 -1.5569,1.125 -2.8486,2.5 -1.2917,1.375 -2.1236,2.5 -1.8486,2.5 z m 112.3486,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -10.3823,-2.3699 2.3273,-1.6301 2.0775,0 2.0775,0 1.1316,1.1316 1.1316,1.1316 1.5416,-3.6896 c 0.8479,-2.0293 2.4881,-5.0188 3.6449,-6.64336 l 2.1032,-2.95376 1.0781,0.66627 1.078,0.66627 -0.7007,-1.13384 -0.7008,-1.13385 1.0964,-2.04867 1.0964,-2.04868 0.9384,0.57995 0.9384,0.57995 -0.6585,-1.71599 -0.6585,-1.71598 0.9971,0.61624 0.9971,0.61625 2.6105,-8.7022 c 1.4357,-4.78621 3.5164,-12.9772 4.6237,-18.2022 l 2.0133,-9.5 0.6333,-9 0.6333,-9 -3.6769,-19 -3.6769,-19 -0.1573,-5.13304 -0.1573,-5.13303 2.75,-2.75333 2.75,-2.75333 0,-3.62698 0,-3.62699 3.566,-5.29518 3.566,-5.29519 3.0267,-7.19146 c 1.6647,-3.95531 3.9311,-9.44147 5.0364,-12.19147 l 2.0096,-5 -0.6313,-6.26116 c -0.3473,-3.44363 -1.0276,-7.30317 -1.5118,-8.57676 -0.4842,-1.27358 -1.164,-4.98106 -1.5107,-8.23884 -0.3467,-3.25778 -1.2604,-8.94726 -2.0306,-12.64329 l -1.4002,-6.72004 -2.0368,-4.27996 c -1.1202,-2.35397 -2.966,-5.85495 -4.1019,-7.77995 l -2.0651,-3.5 0.4604,-2.5 0.4603,-2.5 -0.8846,-7.83689 -0.8846,-7.83689 1.4389,-2.19613 1.439,-2.19612 1.0266,-7.23843 1.0266,-7.23842 -1.0506,-4.68767 c -0.5778,-2.57821 -1.4335,-5.15606 -1.9016,-5.72855 -0.4681,-0.5725 -1.3801,-3.0659 -2.0267,-5.5409 -0.6465,-2.475 -2.3219,-6.975 -3.723,-10 l -2.5475,-5.5 -8.6247,-8.54721 -8.6248,-8.54721 -7.6231,-4.20279 c -4.1927,-2.31153 -7.8533,-4.20279 -8.1346,-4.20279 -0.2814,0 0.9737,2.8125 2.7889,6.25 l 3.3005,6.25 0.6218,5 0.6217,5 -3.3089,-8 c -1.8199,-4.4 -4.9996,-11.02108 -7.0661,-14.71351 l -3.7573,-6.71351 -5.7214,-4.33467 c -3.1468,-2.38407 -8.6465,-6.36937 -12.2215,-8.85621 -3.575,-2.48684 -9.425,-6.13341 -13,-8.10348 l -6.5,-3.58194 -9.202,-3.20693 -9.202,-3.20693 -2.6532,-5.14141 c -1.4594,-2.82777 -4.181,-7.12776 -6.0481,-9.55552 -1.8671,-2.42776 -3.3934,-4.67776 -3.3918,-5 0,-0.32224 2.1391,-1.801 4.75,-3.28614 2.6109,-1.48514 11.7446,-6.23184 20.2972,-10.54823 8.5525,-4.31639 20.9275,-10.12623 27.5,-12.91076 6.5724,-2.78453 12.8499,-5.42177 13.9499,-5.86053 1.1,-0.43876 2.3375,-0.72631 2.75,-0.63899 0.4125,0.0873 0.75,-0.3178 0.75,-0.90026 l 0,-1.05901 0.9309,0.57532 0.9309,0.57533 0.6382,-1.03262 0.6382,-1.03262 0.8618,0.53262 0.8618,0.53262 0.6382,-1.03262 0.6382,-1.03262 0.9309,0.57533 0.9309,0.57532 0,-1.22568 0,-1.22568 0.658,0.65799 0.658,0.65799 1.342,-1.11377 1.342,-1.11377 0,0.74489 0,0.74489 1.5,-1.24489 1.5,-1.24489 0,0.74489 0,0.74489 1.4562,-1.20854 1.4562,-1.20853 0.9747,0.6024 0.9747,0.6024 0.6703,-1.08448 0.6702,-1.08449 1.3989,0.53679 1.3988,0.53679 0,-1.08525 0,-1.08524 2,0.52301 2,0.52301 0,-1.02301 0,-1.02301 2.0014,0.52337 2.0014,0.52337 -0.65,-1.05173 -0.65,-1.05173 2.6183,0.50053 2.6184,0.50054 -0.4596,-0.74355 -0.4595,-0.74354 2.9898,-0.43881 2.9898,-0.4388 0,0.5768 0,0.57681 5.4537,-0.33979 5.4538,-0.33979 -1.1929,-1.91021 -1.193,-1.91021 -1.8185,0 -1.8184,0 0.723,1.16994 0.7231,1.16994 -1.7458,-0.66994 c -0.963,-0.36847 -2.1883,-0.66994 -2.7258,-0.66994 l -0.9772,0 0.618,-1 0.618,-1 -2.9246,0 c -1.6085,0 -8.0058,1.14701 -14.2161,2.54891 -6.2104,1.4019 -12.0084,2.90367 -12.8844,3.33726 -0.8761,0.4336 -4.2929,1.36738 -7.5929,2.07506 -3.3,0.70769 -13.875,4.10432 -23.5,7.54807 l -17.5,6.26136 -15.4047,7.11467 -15.4047,7.11467 -1.8009,0 -1.8009,0 -3.6839,2.5 c -2.0262,1.375 -4.2962,2.5 -5.0444,2.5 l -1.3605,0 0,-2.83897 0,-2.83897 2.6863,-3.41103 c 1.4775,-1.87607 6.315,-6.37879 10.75,-10.00605 4.435,-3.62725 16.7581,-13.23517 27.3845,-21.35092 l 19.3208,-14.75591 18.1792,-11.21579 c 9.9986,-6.16869 20.9106,-12.8116 24.249,-14.76204 3.3383,-1.95043 7.7258,-4.09281 9.75,-4.76083 l 3.6802,-1.21459 0,-0.81696 c 0,-0.44932 4.3875,-3.29043 9.75,-6.31358 5.3625,-3.02315 16.725,-9.00803 25.25,-13.29974 8.525,-4.2917 15.8375,-7.71569 16.25,-7.60886 0.4125,0.10683 0.75,-0.3039 0.75,-0.91275 l 0,-1.10699 1.5,0.57561 1.5,0.5756 0,-1.02763 0,-1.02763 0.9146,0.56524 0.9146,0.56525 0.3502,-1.05066 0.3502,-1.05067 2.2352,-0.16837 2.2352,-0.16837 0,-0.89418 0,-0.89419 1.5,0.57561 1.5,0.5756 0,-1.02763 0,-1.02763 1,0.61803 1,0.61803 0,-1.166 0,-1.16601 1.4354,0.55081 1.4354,0.55082 0.3563,-1.06883 0.3562,-1.06882 2.6901,0 2.6901,0 -0.5408,-0.875 -0.5407,-0.875 4.809,-0.0997 c 2.6449,-0.0548 5.8967,-0.4038 7.2261,-0.77551 l 2.4171,-0.67583 -2.6319,-1.72449 -2.6319,-1.72449 -9.6482,0 -9.6481,0 -12.637,3.62291 -12.6371,3.62292 -16.7599,7.31083 -16.76,7.31083 -20.74,11.18938 c -11.4071,6.15416 -21.8651,11.97493 -23.2401,12.93506 -1.375,0.96012 -3.625,2.08479 -5,2.49925 -1.375,0.41447 -8.575,4.57669 -16,9.24937 -7.425,4.67268 -15.975,10.09002 -19,12.03852 -3.025,1.94849 -11.4625,7.73482 -18.75,12.8585 -7.2875,5.12368 -13.25,8.95051 -13.25,8.50407 0,-0.44644 7.3125,-5.99672 16.25,-12.33396 8.9375,-6.33724 20.1875,-13.90607 25,-16.81961 4.8125,-2.91354 8.75,-5.42357 8.75,-5.57784 0,-0.15427 -3.9375,1.54503 -8.75,3.77623 l -8.75,4.05673 -16.0682,9.8784 c -8.8376,5.43313 -16.6001,9.87841 -17.25,9.87841 l -1.1818,0 0.052,-4.75 0.053,-4.75 18.568,-19 c 10.2124,-10.45 18.2408,-18.325 17.8408,-17.5 -0.4,0.825 3.0333,-2.30949 7.6295,-6.96553 4.5963,-4.65604 14.4318,-14.06739 21.8568,-20.91412 7.425,-6.84672 20.925,-18.8078 30,-26.58017 9.075,-7.77237 22.125,-18.37456 29,-23.56042 l 12.5,-9.42885 11.6326,-6.58159 11.6326,-6.58158 6.1103,-1.85003 6.1102,-1.85003 -1.0508,-1.26611 -1.0508,-1.26612 -10.692,0.38156 c -5.8807,0.20985 -13.3921,0.81234 -16.6921,1.33887 l -6,0.95731 -13.5,5.85862 -13.5,5.85862 -14,8.38443 c -7.7,4.61143 -20.3,12.8951 -28,18.40814 -7.7,5.51305 -15.4625,11.11962 -17.25,12.45905 -1.7875,1.33943 -3.25,2.2073 -3.25,1.9286 0,-0.27869 7.3125,-5.87998 16.25,-12.4473 l 16.25,-11.94058 16.5,-9.94291 16.5,-9.94291 13,-5.17754 13,-5.17754 4.7623,-0.66632 4.7623,-0.66633 0.5197,-0.84093 0.5198,-0.84094 1.7179,0.55066 1.718,0.55065 -1.3749,-0.98055 -1.3749,-0.98056 7.253,-5.09361 7.253,-5.09361 0.9157,0.56592 0.9157,0.56593 1.7062,-1.30583 1.7062,-1.30583 -2.4243,2.71974 c -1.3334,1.49586 -2.851,2.71974 -3.3725,2.71974 l -0.9481,0 1.3725,-1.71093 1.3724,-1.71093 -3.2198,2.25749 c -1.7708,1.24162 -3.5357,2.79904 -3.9219,3.46093 l -0.7021,1.20344 2.0006,-1.75 c 1.1004,-0.9625 2.391,-1.75 2.8681,-1.75 l 0.8674,0 -3.4461,3.70647 c -1.8954,2.03855 -2.7712,3.23131 -1.9462,2.65057 0.825,-0.58075 4.425,-3.30405 8,-6.05178 3.575,-2.74774 12.35,-8.72079 19.5,-13.27346 7.15,-4.55267 13.45,-8.36023 14,-8.46125 0.55,-0.10101 2.6875,-0.81111 4.75,-1.578 2.0625,-0.76688 3.75,-1.70051 3.75,-2.07472 0,-0.37422 -2.0022,-1.18457 -4.4494,-1.80078 l -4.4495,-1.12038 -10.1013,1.59989 -10.1013,1.59989 -13.4731,5.90817 c -7.4101,3.24949 -14.3511,6.45652 -15.4242,7.12673 l -1.9513,1.21857 -0.9833,-0.98332 -0.9833,-0.98332 0.7083,-0.99164 c 0.3896,-0.5454 6.7834,-6.4103 14.2084,-13.03311 7.425,-6.62282 19.575,-16.7271 27,-22.45398 l 13.5,-10.4125 13.5,-8.29994 13.5,-8.29994 8.2464,-3.24609 c 4.5355,-1.78534 8.248,-3.55601 8.25,-3.93481 l 0,-0.68872 -4.25,-0.6199 -4.25,-0.6199 -8.9177,2.13594 -8.9176,2.13595 -13.5824,6.96285 c -7.4703,3.82957 -16.1814,8.49933 -19.3581,10.37723 -3.1767,1.87791 -13.0767,8.57382 -22,14.87981 l -16.2207,11.46546 -17.5,14.67955 c -9.625,8.07375 -24.3254,21.15976 -32.6675,29.08001 l -15.1674,14.40047 -1.0826,0 -1.0825,0 0,-1.37756 0,-1.37755 1.489,-1.23575 1.489,-1.23575 -0.548,-0.8867 -0.548,-0.88669 -1.8747,0 -1.8746,0 -4.7139,6 c -2.5926,3.3 -4.8883,6 -5.1015,6 -0.2132,0 0.043,-0.7875 0.5701,-1.75 0.5268,-0.9625 2.5676,-3.99856 4.5352,-6.7468 1.9676,-2.74824 3.5774,-5.38222 3.5774,-5.85328 0,-0.47106 4.591,-7.2225 10.2023,-15.0032 5.6113,-7.78069 17.1731,-23.14672 25.6928,-34.14672 8.5197,-11 23.1662,-28.98653 32.5477,-39.97008 9.3814,-10.98354 24.2572,-27.50266 33.0572,-36.70916 l 16,-16.73909 14.5,-13.19706 14.5,-13.19707 13.7259,-10.35221 13.7259,-10.35221 8.6787,-4.74156 8.6788,-4.74156 -3.0851,-0.30817 -3.0851,-0.30817 -11.3196,5.44456 -11.3195,5.44457 -15,11.06992 -15,11.06992 -16.6064,15.29369 -16.6064,15.29368 -17.7534,18.75 c -9.7644,10.3125 -17.9906,18.75 -18.2805,18.75 -0.2898,0 1.4471,-2.13968 3.8599,-4.75484 2.4127,-2.61516 10.4215,-11.35963 17.7973,-19.43216 l 13.4106,-14.67733 16.4826,-15.31783 16.4826,-15.31784 14.3091,-10.71771 14.3091,-10.71771 11.1532,-5.59352 c 6.1342,-3.07644 10.9785,-5.76821 10.765,-5.98171 -0.2135,-0.21351 -5.9644,1.37812 -12.7798,3.53695 l -12.3915,3.92514 -14.908,8.59803 -14.9081,8.59803 -10.6676,8.234 c -5.8673,4.5287 -14.0104,10.82152 -18.0959,13.98405 l -7.4281,5.75005 -3.811,-0.64387 -3.8111,-0.64387 -9.7608,3.19575 -9.7608,3.19575 -6.2661,3.64032 -6.2662,3.64032 -13.3818,20.5 c -7.36,11.275 -16.8027,26.04643 -20.9839,32.82541 -4.1811,6.77897 -7.602,12.53984 -7.602,12.80192 0,0.26207 2.2269,-2.13436 4.9486,-5.32541 2.7218,-3.19106 11.9827,-13.00192 20.5799,-21.80192 l 15.6313,-16 -2.038,3 c -1.121,1.65 -3.7444,4.85462 -5.8299,7.12138 -2.0856,2.26675 -10.3169,11.22546 -18.2919,19.90824 -7.975,8.68278 -16.1762,17.62816 -18.225,19.87862 -2.0487,2.25047 -3.7362,3.81759 -3.75,3.48249 -0.014,-0.3351 1.5208,-2.56275 3.4102,-4.95033 l 3.4352,-4.34106 -0.4953,-0.8015 -0.4954,-0.8015 3.4296,-5.74817 c 1.8862,-3.16149 6.3531,-10.69817 9.9264,-16.74817 3.5732,-6.05 11.3945,-18.425 17.3805,-27.5 5.9861,-9.075 11.0696,-16.95 11.2967,-17.5 0.2271,-0.55 3.2441,-4.86057 6.7045,-9.57904 l 6.2916,-8.57905 12.2955,-10.98953 12.2955,-10.98953 6.8066,-4.55887 6.8067,-4.55886 -6.4892,-0.69493 -6.4892,-0.69493 -5.8174,1.70459 c -3.1996,0.93752 -8.5432,2.55289 -11.8746,3.58972 l -6.0572,1.88514 -14.0907,8.78142 -14.0906,8.78143 -15.8522,13.37418 -15.8522,13.37418 -15.3117,15.57704 c -8.4214,8.56737 -14.9739,14.90204 -14.5611,14.07704 0.4128,-0.825 6.4031,-7.50983 13.3117,-14.85517 l 12.5611,-13.35517 16.757,-14.43337 16.757,-14.43337 14.743,-9.33281 14.743,-9.3328 5.8429,-1.84057 5.8429,-1.84056 14.6571,-15.04953 14.6571,-15.04953 10,-8.4698 c 5.5,-4.65839 12.475,-10.08847 15.5,-12.06685 3.025,-1.97838 7.075,-4.60781 9,-5.84317 l 3.5,-2.24612 -6.5,0.64706 -6.5,0.64707 -11.1415,4.79558 -11.1414,4.79559 -13.6826,9.34972 -13.6826,9.34972 -13.4358,11.78204 c -7.3897,6.48012 -13.8814,11.78204 -14.426,11.78204 l -0.9901,0 0,-1.5802 0,-1.58021 5.9707,-8.66979 c 3.2838,-4.76839 8.7242,-11.8198 12.0896,-15.6698 3.3654,-3.85 7.9872,-9.25 10.2708,-12 l 4.1519,-5 -1.9723,1.5 -1.9724,1.5 3.3039,-4.23612 c 1.8171,-2.32987 3.8335,-4.53993 4.4808,-4.91125 0.6474,-0.37132 0.086,0.52243 -1.2473,1.98612 -1.3334,1.46369 -2.218,2.66125 -1.9659,2.66125 0.2522,0 2.9181,-2.58341 5.9244,-5.74091 l 5.4658,-5.74091 -3.75,3.43708 -3.75,3.43707 0,-1.02185 c 0,-0.56202 1.1054,-2.06032 2.4564,-3.32956 1.3511,-1.26923 3.6028,-3.9619 5.0039,-5.9837 l 2.5475,-3.676 9.1447,-7.94061 c 5.0295,-4.36733 10.0903,-8.48716 11.2461,-9.15517 l 2.1014,-1.21457 -3.4216,-0.0354 -3.4216,-0.0354 -11.4698,5.18416 -11.4697,5.18416 -12.1086,8.87653 -12.1087,8.87652 -13.8547,12.68932 -13.8547,12.68931 -17.1678,19 c -9.4423,10.45 -19.134,21.38868 -21.5372,24.30817 l -4.3693,5.30818 -1.0611,-1.06111 -1.0611,-1.06111 2.102,-6.24706 c 1.156,-3.43589 7.5473,-22.14579 14.2029,-41.57756 6.6555,-19.43177 12.101,-35.72307 12.101,-36.20289 l 0,-0.87239 -5.25,0.57951 -5.25,0.57951 -8.5,5.32718 -8.5,5.32717 -12.6116,12.7962 -12.6116,12.7962 -9.9427,12.5 c -5.4685,6.875 -12.6777,16.36792 -16.0205,21.09538 -3.3427,4.72745 -6.5966,9.56495 -7.2308,10.75 l -1.1532,2.15462 -1.4648,0 -1.4648,0 0,-2.61397 c 0,-1.43769 1.1104,-9.20019 2.4676,-17.25 1.3572,-8.04982 3.647,-23.39513 5.0885,-34.10071 l 2.6208,-19.46467 0.1616,-13.43847 0.1615,-13.43847 -1.0869,-0.37583 -1.087,-0.37583 -1.5612,3.77897 c -0.8587,2.07844 -3.6598,8.95398 -6.2247,15.27898 -2.5649,6.325 -5.0857,11.9275 -5.6018,12.45 -0.5161,0.5225 -0.9384,0.71382 -0.9384,0.42515 0,-0.28866 1.0658,-3.64116 2.3684,-7.45 1.3026,-3.80883 3.6141,-9.85015 5.1367,-13.42515 1.5226,-3.575 3.3756,-7.9332 4.1178,-9.68489 l 1.3495,-3.1849 -3.7362,0.56719 -3.7362,0.56718 -3.1833,2.36771 c -1.7508,1.30224 -3.6904,2.36771 -4.3102,2.36771 l -1.1269,0 0.668,-14.25 0.668,-14.24997 -1.1067,-9.7005 -1.1066,-9.7005 -1.1617,-2.5495 c -0.6389,-1.4023 -1.5182,-2.5496 -1.9541,-2.5496 -0.4358,0 -1.9386,0.5222 -3.3395,1.1605 l -2.547,1.1606 -5.8481,8.0894 -5.848,8.0895 -6.0316,11 c -3.3174,6.05 -9.8554,19.325 -14.5289,29.5 -4.6736,10.175 -12.1235,27.275 -16.5554,38 -4.4318,10.725 -9.3869,22.875 -11.0113,27 l -2.9534,7.5 -1.3482,0 -1.3482,0 -2.0221,-4.26767 -2.022,-4.26767 -2.8366,-1.73233 -2.8365,-1.73233 -4.8731,-14.35929 -4.8732,-14.35929 -4.7462,-6.94625 c -2.6104,-3.82044 -5.2121,-7.28893 -5.7817,-7.70775 -0.5695,-0.41883 -3.0046,-1.50487 -5.4113,-2.41343 l -4.3758,-1.65194 0.6205,3.71898 c 0.3413,2.04543 0.9156,8.10647 1.2761,13.46897 l 0.6556,9.75 -0.9979,0 -0.9979,0 -0.661,-11.25 c -0.3635,-6.1875 -0.9346,-12.2625 -1.269,-13.5 -0.3344,-1.2375 -0.9009,-2.25 -1.2587,-2.25 -0.3579,0 -1.6428,2.5875 -2.8554,5.75 -1.2126,3.1625 -3.5673,10.54215 -5.2327,16.39922 -1.6654,5.85708 -3.028,11.31448 -3.028,12.12756 l 0,1.47833 -1.5242,1.26495 c -0.8383,0.69572 -1.7407,1.04838 -2.0054,0.78369 -0.2647,-0.26469 -2.8753,-8.99131 -5.8014,-19.3925 l -5.3202,-18.91125 -5.7213,-13.5 -5.7213,-13.5 -5.7031,-7.91279 -5.7031,-7.91278 -4,-2.23523 -4,-2.2352 -1.6397,-2.352 c -0.9019,-1.2936 -4.6424,-8.095 -8.3123,-15.1142 l -6.6726,-12.7623 -8.0397,-9.4877 c -4.4219,-5.2183 -8.375,-9.4878 -8.7847,-9.4878 -0.4097,0 -1.7057,-0.8332 -2.8798,-1.8515 l -2.1348,-1.8515 0.7318,-0.8088 0.7318,-0.8089 -1.2218,0.7019 -1.2217,0.7019 -2.5283,-1.6566 -2.5282,-1.6565 0,0.7828 c 0,0.4305 1.9577,4.4198 4.3505,8.865 l 4.3504,8.0822 5.1374,15.5 5.1374,15.5 3.9916,17.18833 3.9917,17.18834 1.5321,12.31166 c 0.8427,6.77142 2.1975,22.88667 3.0107,35.81167 0.8132,12.925 1.483,24.8125 1.4884,26.41667 0.01,1.60416 -0.1591,2.72916 -0.3655,2.5 -0.2065,-0.22917 -0.8939,-8.51667 -1.5278,-18.41667 -0.6338,-9.9 -2.0755,-26.325 -3.2037,-36.5 l -2.0513,-18.5 -4.4418,-19.5 -4.4418,-19.5 -4.6219,-14 -4.622,-14 -4.8198,-9.6574 -4.8199,-9.6573 1.5351,-0.5891 1.5351,-0.589 2.0132,1.0774 c 1.1073,0.5926 2.1757,0.915 2.3743,0.7164 0.1986,-0.1986 -3.3555,-7.38 -7.898,-15.9587 l -8.259,-15.5975 -7.8008,-9.3724 c -4.2905,-5.1548 -8.2754,-9.5475 -8.8553,-9.7616 l -1.0545,-0.3892 2.0339,3.3892 c 1.1186,1.8641 3.8592,6.5392 6.0902,10.3892 l 4.0562,7 5.9231,15.5 5.923,15.5 5.6006,21 c 3.0804,11.55 6.5609,25.8764 7.7346,31.8365 l 2.134,10.8364 -0.5802,0.58022 -0.5802,0.58021 0,-1.06307 c 0,-0.58469 -1.0922,-6.22061 -2.427,-12.52426 -1.3349,-6.3036 -4.9511,-20.4128 -8.036,-31.3536 l -5.609,-19.8924 -5.5787,-14.5 -5.5786,-14.5 -6.3993,-11.1391 c -3.5195,-6.1265 -7.063,-11.69 -7.8743,-12.3633 l -1.4751,-1.2242 0.5053,-0.8176 0.5053,-0.8176 -0.9472,-0.5854 -0.9472,-0.5854 -0.643,1.0403 -0.643,1.0404 4.1838,7.726 4.1837,7.7259 5.9296,15.4275 5.9296,15.4276 5.4375,18.9715 5.4375,18.9716 4.4721,20.6009 c 2.4597,11.3305 6.0833,30.20451 8.0525,41.94226 1.9692,11.73774 4.9078,32.43774 6.5302,46 1.6224,13.56225 3.4789,32.53364 4.1255,42.15864 l 1.1757,17.5 5.4698,11 5.4698,11 -0.5991,-6 c -0.3295,-3.3 -0.812,-10.05 -1.0722,-15 l -0.4733,-9 0.8947,6 c 0.492,3.3 1.1189,10.84083 1.3931,16.7574 l 0.4984,10.75741 0.8045,1.24259 0.8044,1.2426 0.587,-5.5 0.587,-5.5 0.2333,7 0.2333,7 0.9357,2 0.9358,2 -0.4769,-5.5 c -0.2623,-3.025 -0.6823,-12.7 -0.9333,-21.5 l -0.4565,-16 0.8174,9.81433 c 0.4496,5.39789 1.1258,13.04789 1.5026,17 0.3768,3.95212 0.8595,10.78567 1.0725,15.18567 l 0.3874,8 7.4959,21.93979 7.4959,21.93979 0.4716,-1.43979 c 0.2594,-0.79188 1.2729,-4.98039 2.2521,-9.3078 l 1.7805,-7.86801 0.3754,1.12609 c 0.2064,0.61935 -0.5948,5.58559 -1.7806,11.0361 l -2.156,9.91002 4.683,17.3319 c 2.5757,9.53255 6.7861,27.08285 9.3566,39.00067 l 4.6735,21.66875 2.328,-6.16875 c 1.2804,-3.39282 6.0711,-13.4388 10.646,-22.3244 l 8.318,-16.15563 4.6541,-6.34437 4.6541,-6.34436 4.4916,-2.30896 4.4916,-2.30897 3.4217,2.60986 3.4217,2.60985 -0.015,2.19911 c -0.01,1.20951 -0.4515,2.87411 -0.9847,3.69911 l -0.9694,1.5 -0.015,-3.22695 -0.015,-3.22694 -2.5333,-1.6599 -2.5334,-1.6599 -3.7166,1.71597 -3.7167,1.71597 -4.6198,6.17087 c -2.5409,3.39399 -6.9008,10.44588 -9.6886,15.67088 -2.7879,5.225 -7.5439,15.35 -10.5691,22.5 -3.0251,7.15 -6.4277,14.78265 -7.5613,16.96144 -1.1337,2.17879 -2.0612,4.51474 -2.0612,5.19098 0,0.67625 -0.4057,1.48029 -0.9016,1.78676 l -0.9016,0.55721 1.5157,-4.74819 c 0.8336,-2.61151 1.4898,-5.4232 1.4582,-6.2482 -0.032,-0.825 -2.2729,-11.175 -4.9807,-23 -2.7078,-11.825 -7.4805,-31.175 -10.6061,-43 -3.1255,-11.825 -7.7349,-27.575 -10.2431,-35 -2.5082,-7.425 -6.7193,-19.125 -9.3581,-26 -2.6388,-6.875 -7.9875,-19.025 -11.8861,-27 l -7.0883,-14.5 -8.2541,-11.66313 -8.2542,-11.66313 -4.5085,-3.95924 -4.5084,-3.95925 -1.2675,-4.73892 c -0.6971,-2.60641 -5.3522,-16.05134 -10.3447,-29.87763 l -9.0781,-25.1387 -9.4957,-20.5 -9.4956,-20.5 -10.3478,-16.5 -10.3477,-16.5 -11.0535,-10.9829 -11.0534,-10.983 -0.015,0.983 -0.015,0.9829 -0.7347,-1.0204 c -0.4041,-0.5611 -2.0304,-1.5905 -3.6139,-2.2874 -1.5836,-0.6969 -3.0845,-1.0618 -3.3355,-0.8109 -0.2509,0.2509 2.4539,4.4303 6.0106,9.2875 l 6.4667,8.8312 8.0057,16.0127 8.0058,16.01263 6.9758,17.98734 6.9759,17.98733 6.2174,20.5 6.2175,20.5 5.8393,24 c 3.2116,13.2 7.4091,32.325 9.3279,42.5 1.9188,10.175 3.7484,20.75 4.0657,23.5 l 0.5769,5 -0.8685,1.37007 -0.8685,1.37008 -2.2281,-5.87008 c -1.2255,-3.22854 -4.4166,-12.05095 -7.0914,-19.60537 -2.6747,-7.55441 -9.1165,-23.75441 -14.315,-36 l -9.4518,-22.2647 -9.1945,-17 -9.1944,-17 -9.521,-12.93392 c -5.2366,-7.11365 -10.6947,-13.91825 -12.1291,-15.12133 -1.4345,-1.20308 -5.5332,-4.5854 -9.1082,-7.51628 l -6.5,-5.32887 2.4737,2.9502 c 1.3605,1.62261 4.811,5.4252 7.6676,8.4502 l 5.1939,5.5 8.7125,14.5 8.7124,14.5 8.4203,18.5 8.4202,18.5 8.8347,24.5 8.8347,24.5 7.1725,24.85919 c 3.9448,13.67255 6.9904,25.04125 6.7679,25.26378 -0.2226,0.22252 -2.1027,-5.33911 -4.1782,-12.35919 -2.0754,-7.02008 -5.4939,-18.53037 -7.5966,-25.57843 -2.1028,-7.04805 -7.5194,-23.02305 -12.037,-35.5 l -8.2138,-22.68535 -9.1221,-20 -9.1221,-20 -8.1586,-13.5 -8.1586,-13.5 -7.7259,-8.5 c -4.2493,-4.675 -8.5661,-8.97339 -9.5931,-9.55197 l -1.8671,-1.05197 0.7509,-0.75088 0.7508,-0.75089 -1.7195,0.65985 -1.7195,0.65984 0,-1.27366 0,-1.27365 -0.658,0.65799 -0.658,0.65799 -1.5339,-1.24133 -1.534,-1.24132 0.8763,1.45282 c 0.482,0.79905 3.607,4.84905 6.9445,9 l 6.0681,7.54718 7.7804,13.62203 7.7804,13.62203 7.0318,15.76328 7.0318,15.76328 -0.8277,0.82771 -0.8277,0.82772 -4.5338,-2.9492 -4.5338,-2.9492 -2.9985,-0.32825 c -1.6491,-0.18054 -3.61,-0.70629 -4.3576,-1.16834 l -1.3593,-0.84008 0.8185,1.40451 c 0.4501,0.77248 1.6956,2.67059 2.7678,4.21802 l 1.9493,2.8135 1.3659,-0.52412 1.3658,-0.52412 2.5102,3.29105 c 1.3806,1.81008 5.0426,8.65485 8.1378,15.21061 l 5.6277,11.91957 0.133,2.15404 0.133,2.15404 0.75,-0.46306 0.75,-0.46305 0.1276,1.30901 c 0.07,0.71996 0.2399,2.20902 0.3771,3.30902 0.1373,1.1 2.503,7.625 5.2572,14.5 l 5.0077,12.5 3.6197,12.65296 c 1.9909,6.95912 6.2539,22.93412 9.4733,35.5 l 5.8535,22.84704 12.487,26 c 6.8679,14.3 14.6497,30.6125 17.2929,36.25 l 4.8057,10.25 1.176,0 1.1759,0 -0.3024,-3.25 -0.3023,-3.25 0.8759,2.5 c 0.4817,1.375 0.9207,3.2875 0.9755,4.25 l 0.1,1.75 -2.4797,0 -2.4797,0 -1.9001,-3.75 c -1.045,-2.0625 -4.486,-9.825 -7.6467,-17.25 -3.1606,-7.425 -10.4867,-22.93351 -16.2801,-34.46337 -5.7934,-11.52985 -10.933,-21.42985 -11.4213,-22 -0.4883,-0.57014 -5.6685,-8.68663 -11.5117,-18.03663 l -10.6239,-17 -9.4924,-11 -9.4924,-11 -5.8468,-4.26934 c -3.2158,-2.34814 -8.2954,-5.83564 -11.288,-7.75 l -5.442,-3.48066 -2.2981,-0.0153 -2.298,-0.0153 1.5,-1.07902 1.5,-1.07901 -1.8318,0.59433 c -1.0075,0.32685 -2.3454,0.5943 -2.9732,0.5943 l -1.1414,0 6.6029,6.75 6.6028,6.75 7.0298,10.58172 7.0298,10.58171 7.4633,14.91829 c 4.1047,8.20505 10.1792,21.45931 13.4989,29.4539 3.3196,7.9946 10.0842,25.0946 15.0324,38 4.9482,12.90541 12.1361,31.78938 15.9732,41.96438 3.837,10.175 11.0797,29.84465 16.0949,43.71034 5.0151,13.86569 9.1184,26.0989 9.1184,27.1849 0,1.08601 0.4605,3.1859 1.0234,4.66642 0.5629,1.48053 1.4143,4.43133 1.892,6.55735 l 0.8685,3.86548 -0.7548,-0.46648 c -0.4151,-0.25657 -1.3282,-2.51467 -2.0291,-5.01801 -0.7009,-2.50334 -1.6104,-4.75921 -2.0211,-5.01305 l -0.7468,-0.46153 -1.2374,2.98729 c -0.6805,1.64301 -1.5952,2.98729 -2.0327,2.98729 -0.4374,0 -1.2187,1.2375 -1.736,2.75 l -0.9408,2.75 4.4115,8.83772 4.4115,8.83772 -0.3323,0.99688 -0.3323,0.99687 -4.8529,-9.20408 -4.8529,-9.20408 1.0876,-3.54388 1.0877,-3.54387 -13.127,-25.58664 -13.1269,-25.58664 -13.66,-23.5 c -7.513,-12.925 -18.9685,-31.6 -25.4567,-41.5 -6.4882,-9.9 -16.0685,-23.625 -21.2896,-30.5 l -9.4929,-12.5 -10.13,-10.28546 -10.13,-10.28545 -7,-3.83905 -7,-3.83905 -4.4573,0.0109 -4.4572,0.0109 5.8256,5.07512 5.8257,5.07512 8.1873,9.60238 c 4.503,5.28132 12.3574,15.5418 17.454,22.80107 5.0967,7.25928 13.5007,19.99965 18.6756,28.31193 l 9.4088,15.11325 -0.5419,0.8769 -0.542,0.87691 -1.6893,-0.95913 c -0.9291,-0.52752 -5.9643,-4.77754 -11.1893,-9.44449 l -9.5,-8.48536 -8.2715,-4.1173 -8.2715,-4.1173 -3.4946,0.30909 -3.4947,0.30908 3.2145,3 3.2145,3 -0.7825,-1.5 c -0.4304,-0.825 0.5712,0.075 2.2258,2 1.6546,1.925 4.505,4.79683 6.3342,6.38184 1.8292,1.58501 2.6508,2.50599 1.8258,2.04661 -0.825,-0.45937 1.6917,2.7438 5.5926,7.11816 3.901,4.37437 10.7482,12.72674 15.2162,18.56084 4.4679,5.8341 13.4579,18.8841 19.9777,29 6.5199,10.1159 13.2851,20.92233 15.0339,24.01428 1.7488,3.09195 3.1796,6.12945 3.1796,6.75 l 0,1.12827 -1.3361,0 -1.3361,0 -6.2311,-5.00075 -6.231,-5.00076 -7.1829,-3.56057 c -3.9505,-1.95831 -9.3801,-4.69456 -12.0658,-6.08055 l -4.883,-2.51998 -1.4028,1.40287 -1.4029,1.40286 5.1839,2.82141 5.1838,2.8214 7.7172,7.10704 7.7172,7.10703 8.4752,10 c 4.6613,5.5 12.5014,15.625 17.4223,22.5 4.9209,6.875 11.9603,17.31803 15.6432,23.20674 l 6.6962,10.70674 -0.6244,3.29326 c -0.3434,1.81129 -1.0071,3.78466 -1.4749,4.38527 l -0.8506,1.09201 0.5421,0.54218 0.5422,0.54218 -2.0508,8.03243 c -1.128,4.41783 -2.0509,9.15427 -2.0509,10.52543 l 0,2.49302 -7.0368,4.63589 c -3.8703,2.54974 -7.8078,4.86571 -8.75,5.14659 l -1.7132,0.5107 2.4634,-1.80622 c 1.3548,-0.99342 4.4789,-3.54502 6.9425,-5.67022 l 4.4792,-3.86399 2.3373,-9.02285 c 1.2855,-4.96256 2.1748,-9.18529 1.9762,-9.38385 -0.1985,-0.19855 -3.4744,0.71572 -7.2798,2.03171 -3.8053,1.31599 -7.8188,2.72556 -8.9188,3.13238 l -2,0.73967 2,-1.71617 2,-1.71617 -1.8318,0.58163 c -1.0075,0.3199 -2.2715,0.58164 -2.809,0.58164 l -0.9772,0 0.5677,0.91863 0.5678,0.91863 -2.7969,0.61428 -2.7968,0.61429 -6.4619,-1.96813 c -3.554,-1.08247 -7.5869,-2.01193 -8.9619,-2.06548 -1.375,-0.0536 -6.3967,-0.10187 -11.1594,-0.1074 l -8.6593,-0.01 -0.5991,-1.56114 -0.5991,-1.56115 -1.718,0.65928 -1.718,0.65927 1.9764,-2.36429 c 1.0871,-1.30036 0.4015,-0.69363 -1.5235,1.34828 l -3.5,3.71258 -8,1.61565 -8,1.61565 -5.1552,2.5961 -5.1552,2.5961 -4.2684,4.34921 -4.2684,4.3492 1.6104,0.618 1.6105,0.618 -0.4766,1.24209 c -0.2622,0.68315 -2.7065,2.94257 -5.4318,5.02093 l -4.9552,3.77885 0.6495,1.05081 0.6494,1.05082 -0.996,-0.6156 -0.9961,-0.6156 -3.0772,3.21109 c -1.6925,1.7661 -4.6888,5.67583 -6.6585,8.68829 -1.96965,3.01245 -3.5812,5.09223 -3.5812,4.62172 0,-0.47051 1.4306,-3.38524 3.1791,-6.47719 l 3.1791,-5.62173 6.7379,-6.67487 6.7378,-6.67487 -1.4987,-0.57513 c -0.8243,-0.31632 -4.9495,-0.49948 -9.167,-0.40702 l -7.6682,0.16811 5.5,0.7123 5.5,0.71231 -7,-0.25226 -7,-0.25226 -5,1.79434 c -2.75,0.98689 -4.51766,1.82922 -3.92814,1.87185 0.58952,0.0426 3.20141,-0.64811 5.8042,-1.53497 l 4.73234,-1.61247 0.54674,0.54675 0.54674,0.54674 -4.10094,1.10427 -4.10094,1.10427 0,0.93007 0,0.93007 -1.46176,-0.56093 -1.46177,-0.56093 -3.19187,1.59231 c -1.75553,0.87568 -3.5993,1.59222 -4.09726,1.59222 l -0.90537,0 0.57048,-0.92306 c 0.31377,-0.50769 2.02782,-1.25021 3.80902,-1.65005 l 3.23853,-0.72698 -1.36315,-0.47101 -1.36316,-0.471 1.21992,-0.75395 1.21992,-0.75395 -0.99684,-0.61608 -0.99683,-0.61607 -3.0742,3.14437 -3.07421,3.14437 0.4604,0.74495 0.4604,0.74494 -4.76971,3.06072 c -2.62334,1.68339 -6.10364,4.45303 -7.734,6.15476 -1.63036,1.70173 -3.0137,3.6327 -3.0741,4.29104 -0.0604,0.65835 -0.17835,1.7595 -0.26213,2.447 -0.0838,0.6875 -0.54043,1.25 -1.0148,1.25 l -0.86248,0 0.28412,-2.5883 0.28412,-2.58831 -0.60621,0.60622 c -0.33342,0.33341 -0.67307,2.03562 -0.75478,3.78268 l -0.14858,3.17648 -1.16685,0.38895 -1.16685,0.38895 0,1.44805 0,1.44805 -1.5,0.5756 c -0.825,0.31659 -1.5,1.00961 -1.5,1.54005 0,0.53044 -0.62143,1.58587 -1.38095,2.34539 l -1.38095,1.38095 -0.77938,-0.70238 -0.77937,-0.70238 0.74641,1.2938 0.74642,1.29381 -1.01734,1.22581 -1.01733,1.22582 -0.31876,4.40568 -0.31875,4.40569 -8,4.72311 -8,4.72311 -3.82042,7.10158 c -2.10124,3.90588 -3.54139,7.10159 -3.20034,7.10159 0.34104,0 2.06023,-0.69383 3.82042,-1.54185 l 3.20034,-1.54184 -3.15439,2.79184 c -1.73491,1.53552 -4.72405,5.12771 -6.64253,7.98265 l -3.48815,5.1908 -0.76779,-0.6908 -0.76779,-0.6908 0.70657,1.22933 0.70657,1.22934 -1.2587,2.27066 c -0.69228,1.24887 -1.16309,2.60817 -1.04624,3.02067 0.11685,0.4125 -0.23755,0.75 -0.78755,0.75 l -1,0 -0.0173,1.25 c -0.01,0.6875 -1.02981,2.20897 -2.26736,3.38105 -1.23755,1.17208 -2.91727,3.42208 -3.73272,5 -0.81545,1.57792 -2.27788,3.74961 -3.24984,4.82598 l -1.7672,1.95702 -0.94744,3.54298 c -0.52109,1.94863 -1.3323,8.04297 -1.80268,13.54297 -0.47038,5.5 -0.7397,12.7 -0.59848,16 l 0.25676,6 -1.00426,-5.5 -1.00426,-5.5 0.35273,-9.75 0.35272,-9.75 -0.70194,0 c -0.38606,0 -1.67285,1.2375 -2.85952,2.75 -1.18667,1.5125 -1.87264,2.1875 -1.52439,1.5 0.34826,-0.6875 0.47296,-1.25 0.27712,-1.25 -0.19583,0 -2.13489,1.86612 -4.30901,4.14692 l -3.95295,4.14693 1.5,-0.8232 c 0.825,-0.45276 -0.8625,1.32282 -3.75,3.94574 -2.8875,2.62292 -5.25,5.22498 -5.25,5.78236 0,0.55737 -1.12929,1.90171 -2.50953,2.9874 l -2.50953,1.974 0.51908,0.83985 0.51906,0.83985 -2.35193,1.85003 -2.35193,1.85003 0.26003,1.48004 c 0.14302,0.81403 1.42564,6.43005 2.85026,12.48005 1.42462,6.05 2.80043,11.9335 3.05736,13.07444 l 0.46713,2.07444 5.16914,-4.85304 c 2.84303,-2.66918 6.38728,-5.57262 7.87611,-6.45209 l 2.70696,-1.59905 3.26017,-5.12235 c 1.79309,-2.81729 2.9785,-4.28085 2.63424,-3.25236 l -0.62592,1.86999 2.16767,1.88001 2.16767,1.88001 -1.15301,0 -1.15301,0 0,3.54966 0,3.54966 -1.54259,2.98304 -1.54259,2.98303 -1.12735,-0.69674 -1.12735,-0.69674 0.5746,1.49738 0.5746,1.49738 -1.40466,0 c -0.77256,0 -1.40466,-0.095 -1.40466,-0.21121 0,-0.11617 0.675,-1.82671 1.5,-3.80122 0.825,-1.9745 1.5,-4.10872 1.5,-4.7427 l 0,-1.1527 -3.99889,4.12058 -3.99889,4.12058 -1.66778,0 c -0.91727,0 -1.48027,-0.15134 -1.25111,-0.33631 0.22917,-0.18498 3.22526,-2.88498 6.65798,-6 3.43272,-3.11503 5.95439,-5.66369 5.60371,-5.66369 -0.35069,0 -2.77274,1.9125 -5.38234,4.25 -2.6096,2.3375 -6.87288,6.01596 -9.47394,8.17436 l -4.7292,3.92436 0.65107,6.35485 c 0.35809,3.49517 0.91699,7.68441 1.24199,9.30941 l 0.59091,2.95456 0.97801,-0.60445 0.97802,-0.60444 -1.19941,2.24111 -1.19941,2.24112 0.71895,15.34041 0.71895,15.3404 5.13069,-0.0103 c 2.82188,-0.006 9.63069,0.45037 15.13069,1.01335 5.5,0.56299 10.31997,1.03522 10.71104,1.04941 0.39108,0.0142 1.63174,1.01404 2.75702,2.22189 l 2.04598,2.1961 3.74298,-3.53923 c 2.05864,-1.94658 5.18635,-4.52685 6.95048,-5.73393 1.76412,-1.20708 6.26412,-3.30084 10,-4.6528 l 6.7925,-2.45811 1.20829,-1.63815 c 0.66456,-0.90098 1.7561,-4.086 2.42564,-7.07781 l 1.21734,-5.43966 -1.73011,-7.17625 -1.73011,-7.17625 -0.52217,-11.5 -0.52217,-11.5 4.59288,-8.5 c 2.52609,-4.675 7.28558,-13.84899 10.57665,-20.38665 L 658,-399.8397 l 0,-3.17222 0,-3.17222 -1.25,-1.58757 -1.25,-1.58756 -9.54474,0.76461 -9.54475,0.76462 -3.14357,1.6256 -3.14357,1.6256 -3.31168,4.21872 c -1.82143,2.32029 -7.81169,8.62906 -13.31169,14.01949 -5.5,5.39042 -11.20636,10.54843 -12.68081,11.46223 l -2.68081,1.66147 -1.37442,3.57527 -1.37443,3.57526 -0.60151,-2.25138 -0.6015,-2.25138 0.81161,0.50161 0.81162,0.5016 -0.51173,-3.8152 -0.51172,-3.81521 11.09552,-9.81041 11.09553,-9.81041 5.56333,-6.88564 c 3.05984,-3.7871 6.70851,-7.63597 8.10816,-8.55306 l 2.54483,-1.66744 7.65316,-1.07154 7.65317,-1.07154 -0.12204,-4.5 c -0.0671,-2.475 -0.28296,-8.325 -0.47964,-13 l -0.35761,-8.5 1.54717,-7.10078 1.54718,-7.10078 2.69485,-4.59841 c 1.48216,-2.52912 4.9642,-7.43377 7.73786,-10.89922 2.77365,-3.46545 6.7712,-7.65081 8.88344,-9.30081 2.11224,-1.65 4.67481,-3.55934 5.69461,-4.24298 l 1.85418,-1.24299 -4,0.55655 -4,0.55655 -14.75,7.48562 -14.75,7.48563 0,-2.37488 0,-2.37487 2.27847,-2.14052 2.27847,-2.14051 4.37931,-1.54511 c 2.40862,-0.84981 6.44581,-2.78993 8.97153,-4.31137 2.52572,-1.52145 5.84663,-3.31441 7.37979,-3.98437 1.53317,-0.66996 5.33905,-1.51799 8.45753,-1.8845 l 5.66995,-0.66639 2.33793,-2.33793 c 1.28586,-1.28586 2.76747,-2.33793 3.29247,-2.33793 l 0.95455,0 0.0266,1.75 0.0266,1.75 1.56597,-2.5 c 0.86128,-1.375 2.73561,-3.37361 4.16521,-4.44136 l 2.5992,-1.94135 7.0582,-0.21361 7.0582,-0.21362 5.725,-2.09503 c 3.1488,-1.15227 6.4772,-2.09503 7.3966,-2.09503 0.9193,0 5.886,-1.35 11.0369,-3 l 9.3654,-3 6.0675,0 6.0675,0 6.353,2.54162 6.3531,2.54163 3.3175,-1.43052 3.3175,-1.43052 5.5,-5.69046 5.5,-5.69047 3.7102,-1.92064 c 2.0406,-1.05635 3.9531,-1.92064 4.25,-1.92064 0.2969,0 0.5398,0.635 0.5398,1.41111 l 0,1.4111 -3.1635,2.66195 c -1.74,1.46407 -3.9844,3.70541 -4.9876,4.98077 l -1.824,2.31882 3.7376,-0.86802 3.7375,-0.86802 6.6008,-0.0239 6.6008,-0.0239 2.8992,-0.98774 c 1.5945,-0.54326 6.4992,-1.58634 10.8992,-2.31797 l 8,-1.33022 0,-4.93204 0,-4.93203 -2.5,0.0727 c -1.375,0.04 -4.3003,0.34857 -6.5007,0.68572 -2.2004,0.33716 -4.9004,0.93899 -6,1.33741 l -1.9993,0.72441 2.3285,-2.55815 2.3285,-2.55816 2.6715,-0.51966 c 1.4693,-0.28582 4.3675,-0.96124 6.4404,-1.50093 l 3.7689,-0.98126 0.9295,1.73674 0.9294,1.73673 0.3017,7.91222 0.3016,7.91221 6.1465,0.5 6.1465,0.5 2.0121,1.82229 c 1.1067,1.00227 2.5608,3.14684 3.2314,4.76572 l 1.2192,2.94342 4.3721,-3.58266 4.3722,-3.58267 0,0.88695 c 0,0.48782 -1.6184,2.77771 -3.5965,5.08863 l -3.5965,4.20168 -1.1535,-0.2517 -1.1535,-0.2517 -4.1655,4.10763 -4.1656,4.10763 -4.7415,8.16046 c -2.6079,4.48825 -5.1209,8.39488 -5.5845,8.6814 -0.4636,0.28653 -0.8429,0.8933 -0.8429,1.34839 l 0,0.82744 4.5329,0.67975 4.5328,0.67974 1.1775,1.88541 1.1774,1.8854 5.5397,-5.28395 5.5397,-5.28395 12.9379,-6.1889 c 7.1159,-3.40389 13.049,-6.3 13.1848,-6.43579 0.1358,-0.13578 -0.6107,-3.38872 -1.6588,-7.22875 -1.0481,-3.84003 -1.9188,-7.31937 -1.9348,-7.73187 -0.016,-0.4125 0.3497,-0.75 0.8126,-0.75 l 0.8417,0 1.2001,4.25 c 0.66,2.3375 1.9109,5.90718 2.7798,7.93263 l 1.5797,3.68263 3.6285,0.51636 c 1.9957,0.284 6.3285,0.79801 9.6285,1.14225 l 6,0.62588 5.2623,2.37544 5.2623,2.37544 0.5947,1.54969 0.5947,1.54968 1.7984,0 1.7984,0 4.1892,-3.5 4.1892,-3.5 1.3464,0 c 0.7405,0 1.6245,0.45 1.9644,1 l 0.618,1 -1.3636,0 -1.3636,0 -3.8211,3.5 -3.8211,3.5 -1.7673,0 -1.7673,0 -0.5069,1.32089 -0.5069,1.32088 1.9336,10.42912 1.9335,10.42911 -0.6275,4.75 -0.6275,4.75 3.2,0 3.1999,0 3.8194,3.02503 3.8194,3.02504 0.4432,-0.77504 c 0.2437,-0.42626 1.0132,-2.57503 1.7098,-4.77503 0.6967,-2.2 2.1543,-5.8 3.2391,-8 1.0849,-2.2 3.2512,-5.35 4.814,-7 l 2.8415,-3 1.5646,-3.75106 1.5645,-3.75105 -3.0793,-6.10014 -3.0794,-6.10013 0.5143,-0.51428 0.5143,-0.51427 3.0909,4.86546 c 1.7,2.67601 3.3468,5.87809 3.6597,7.11573 l 0.5687,2.25027 -1.6832,4.24973 -1.6833,4.24974 -3.1752,3.5 -3.1752,3.5 3.7608,-3.45668 3.7609,-3.45668 2.1374,-4.41522 2.1373,-4.41522 6.4466,-3.01669 6.4465,-3.01669 5.9552,2.84635 c 3.2754,1.56549 6.4379,3.42785 7.0277,4.13859 l 1.0725,1.29224 2.3775,0 2.3776,0 1.75,-1.47959 c 0.9625,-0.81377 4.0467,-3.51377 6.8537,-6 2.807,-2.48622 5.383,-4.52041 5.7243,-4.52041 0.3414,0 1.329,1.4625 2.1947,3.25 l 1.5741,3.25 -1.4086,-1.75 c -0.7748,-0.9625 -1.6816,-1.75 -2.0151,-1.75 -0.3335,0 -2.8312,1.97603 -5.5506,4.39119 l -4.9442,4.39118 6.4382,7.74379 6.4382,7.74379 3.47262,7.21996 c 1.91,3.97097 3.4727,7.72613 3.4727,8.34479 0,0.61865 0.7356,2.96332 1.6347,5.21036 l 1.6347,4.08553 1.0653,-1.0653 1.0653,-1.06518 2.9713,0 2.9712,0 1.8809,1.70214 1.8808,1.70214 -1.0417,-2.73977 -1.0416,-2.73976 0.6048,-11.71238 0.6048,-11.71237 0.7271,-0.79238 0.7272,-0.79238 1.4076,1.69903 1.4076,1.69903 -0.2833,11.14601 -0.2834,11.14601 2.2962,3.40733 2.2962,3.40732 6.1808,2.12834 6.1808,2.12834 3.3839,2.58104 3.3839,2.58104 4.9225,6.50232 4.9224,6.50232 2.0172,1.1227 c 1.1094,0.61748 4.0344,3.59349 6.5,6.61335 l 4.4828,5.49066 6.1319,3.90586 6.1319,3.90587 1.9968,3.30909 c 1.0983,1.82001 2.5345,4.99106 3.1916,7.04678 l 1.1948,3.73768 2.8768,-1.48768 c 1.5823,-0.81822 3.7092,-1.48768 4.7265,-1.48768 l 1.8497,0 1.1206,1.12064 1.1207,1.12063 0.6781,-4.87063 c 0.3729,-2.67885 1.2798,-7.79564 2.0152,-11.37064 0.7355,-3.575 1.5256,-10.02065 1.7558,-14.32366 l 0.4187,-7.82366 -0.9489,1.32366 -0.9489,1.32366 0.5908,-1.82244 0.5907,-1.82244 -1.0316,-1.92756 c -0.5673,-1.06016 -1.4743,-1.92756 -2.0154,-1.92756 l -0.9839,0 0.6649,2.64915 0.6649,2.64916 -1.1459,-0.70817 -1.1458,-0.70817 0,-2.26285 c 0,-1.24456 -0.7402,-4.43533 -1.645,-7.09059 l -1.645,-4.82775 -6.9821,-7.35039 c -3.8402,-4.04272 -6.6299,-7.35039 -6.1994,-7.35039 0.4305,0 2.4002,1.22149 4.3771,2.71442 l 3.5944,2.71441 -5.5,-6.273 c -3.025,-3.45015 -5.9902,-7.14397 -6.5893,-8.20849 l -1.0892,-1.93549 -0.8084,0.74408 -0.8084,0.74407 0.569,-2.30715 0.569,-2.30715 -1.3323,1.10571 -1.3323,1.10571 -0.7436,-1.20307 -0.7435,-1.20307 1.1545,0.71353 c 0.635,0.39244 1.1545,0.47885 1.1545,0.19202 0,-0.28683 -0.9937,-3.12589 -2.2082,-6.30902 -1.2146,-3.18313 -2.0988,-6.17238 -1.9649,-6.64277 0.1338,-0.47039 -0.2834,-1.59539 -0.9271,-2.5 -0.6436,-0.90461 0.431,-0.002 2.3882,2.00678 l 3.5584,3.65153 1.984,6.61302 1.9839,6.61302 6.9967,7.76126 6.9967,7.76126 7.8461,1.92139 7.8462,1.9214 8.5,4.31704 8.5,4.31703 4.7576,4.38428 4.7575,4.38428 -0.6085,1.58572 -0.6085,1.58572 -4.149,-3.38288 c -2.282,-1.86059 -5.9491,-4.30543 -8.1491,-5.433 -2.2,-1.12756 -6.25,-3.02119 -9,-4.20807 -2.75,-1.18688 -7.3237,-2.97233 -10.1637,-3.96769 l -5.1637,-1.80972 1.8917,4.16644 c 1.0405,2.29155 1.9017,4.89326 1.9137,5.78159 l 0.022,1.61514 1.8684,2.38486 1.8684,2.38486 1.1316,5.29922 c 0.6224,2.91457 1.1316,6.81899 1.1316,8.67649 0,1.8575 -0.9,7.94343 -2,13.52429 l -2,10.14701 0,4.30603 0,4.30604 4.75,3.86892 c 2.6125,2.12791 5.8164,4.99461 7.1198,6.37046 1.3035,1.37585 4.6397,5.87654 7.4139,10.00154 l 5.0441,7.5 9.2857,9.72288 9.2857,9.72289 0.676,3.60364 0.6761,3.60364 -1.1299,2.47986 -1.1299,2.47987 -0.9103,-0.56262 -0.9104,-0.56262 -0.5736,1.25623 -0.5737,1.25623 0.5548,-3.19135 0.5548,-3.19135 -1.1949,-2.30865 c -0.6572,-1.26976 -4.6504,-5.90865 -8.8738,-10.30865 l -7.6789,-8 -4.6627,-7 c -2.5646,-3.85 -6.1388,-8.65775 -7.9428,-10.68388 -1.804,-2.02614 -6.8273,-6.65385 -11.1628,-10.28381 l -7.8828,-6.59992 -2.1172,1.35012 -2.1172,1.35012 -2.2012,4.43369 -2.2012,4.43368 -0.6303,10.5 -0.6302,10.5 -2.2706,6.5 c -1.2489,3.575 -3.4642,9.02271 -4.9231,12.10603 l -2.6524,5.60603 -5.8711,4.61261 -5.8712,4.61261 -3.1243,4.86891 c -1.7184,2.6779 -3.1244,5.33794 -3.1244,5.91121 l 0,1.04231 5.4383,4.10593 c 2.991,2.25826 6.5793,5.60191 7.9739,7.43032 l 2.5356,3.3244 1.9393,6.43982 c 1.0667,3.5419 2.2627,8.01482 2.6579,9.93982 0.3953,1.925 1.9198,5.975 3.3879,9 1.4682,3.025 4.5578,8.72675 6.8659,12.67056 2.3082,3.9438 5.3281,8.51529 6.7111,10.15885 l 2.5145,2.9883 1.5423,4.34115 1.5424,4.34114 -0.5747,3.11576 -0.5747,3.11575 0.6177,1.60951 0.6176,1.60951 3.0346,-1.56925 3.0346,-1.56925 3.1179,0.4416 c 1.7148,0.24288 3.8866,0.77609 4.826,1.18491 l 1.7082,0.7433 0.6029,-2.84092 c 0.3316,-1.56251 1.1949,-4.19092 1.9184,-5.84092 0.7235,-1.65 4.3216,-7.05 7.9957,-12 l 6.6803,-9 3.3783,-7 c 1.8581,-3.85 3.9204,-9.17489 4.5828,-11.83308 l 1.2046,-4.83308 0.908,1.33308 0.9081,1.33308 -0.2977,-24.15213 -0.2977,-24.15213 3.1886,-2.18473 3.1887,-2.18473 1.9429,0.61666 1.943,0.61666 0.6113,-1.59318 0.6114,-1.59318 0.9379,0.57969 0.938,0.57969 0.7236,-1.17082 0.7236,-1.17082 -1.1545,0.71353 -1.1545,0.71352 0,-0.93657 c 0,-0.51511 0.7614,-1.55417 1.692,-2.30902 l 1.6919,-1.37244 -0.8465,1.40451 -0.8464,1.40451 1.1708,-0.72361 1.1708,-0.72361 -0.5813,-0.94055 -0.5813,-0.94056 2.1556,-2.74035 c 1.1855,-1.50719 2.4057,-2.58358 2.7114,-2.39198 0.3058,0.19159 1.791,-1.49065 3.3005,-3.73833 l 2.7447,-4.08668 1.1868,-6.26167 c 0.6527,-3.44393 1.3811,-7.61168 1.6187,-9.26168 l 0.432,-3 -1.5302,-8.86842 -1.5302,-8.86843 -3.0259,-7.2684 -3.0258,-7.2684 -1.9538,-1.76816 -1.9538,-1.76817 0,-1.34501 c 0,-0.73975 -0.3539,-1.34501 -0.7865,-1.34501 -0.4326,0 -2.4947,-2.28795 -4.5824,-5.08432 -2.0877,-2.79638 -3.585,-5.29508 -3.3274,-5.55266 0.2575,-0.25759 1.4238,0.74633 2.5915,2.23093 l 2.1233,2.69928 2.1603,-1.89661 2.1603,-1.89662 -0.6186,1.69907 -0.6186,1.69907 1.2821,-0.49201 1.2822,-0.49202 -0.4212,2.87018 -0.4213,2.87018 2.8382,1.8016 c 1.5609,0.99088 5.0059,4.10612 7.6555,6.92276 2.6496,2.81665 5.4441,6.30162 6.2101,7.74439 l 1.3927,2.62321 -0.5816,0.58161 -0.5816,0.58162 2.6568,4.53341 2.6567,4.53342 0.7341,-0.23824 c 0.4038,-0.13104 1.997,0.75329 3.5404,1.96518 l 2.8063,2.20343 -0.3256,2.08618 -0.3257,2.08618 -1,0.13352 -1,0.13351 -6.1164,-9.14413 c -3.364,-5.02928 -8.314,-11.54291 -11,-14.47475 -2.686,-2.93183 -4.1523,-4.40738 -3.2586,-3.27899 0.8938,1.12839 2.1308,3.03367 2.749,4.23395 0.6182,1.20028 2.0212,5.92528 3.118,10.5 l 1.994,8.31767 0.01,6.67752 0.01,6.67752 -2.7714,7.82248 -2.7713,7.82248 -5.5368,7.5 c -3.0452,4.125 -6.4106,9.00897 -7.4786,10.85326 l -1.9419,3.35326 3.4828,2.64674 c 1.9156,1.45571 5.4099,4.39789 7.7653,6.53818 l 4.2825,3.89145 3.4711,7.10855 3.4711,7.10856 4.5136,15.11614 4.5136,15.11613 0,4.4672 0,4.4672 -1.3579,0 -1.3578,0 -1.1844,-6.58334 c -0.6514,-3.62083 -2.5524,-10.83386 -4.2244,-16.02894 -1.672,-5.19509 -4.152,-11.63986 -5.511,-14.32172 -1.359,-2.68186 -4.0292,-7.04517 -5.9338,-9.69623 l -3.4629,-4.82012 -7.4786,-6.69328 -7.4785,-6.69327 -1.2554,0.41859 -1.2553,0.4186 0.3312,19.91652 0.3312,19.91652 -1.1165,5 c -0.6141,2.75 -2.2243,7.925 -3.5782,11.5 l -2.4617,6.5 -4.753,7.14834 c -2.6141,3.93159 -6.5267,9.70302 -8.6946,12.8254 l -3.9417,5.67706 -0.4298,5.9419 -0.4298,5.94189 2.5032,3.78252 c 1.3767,2.08039 3.6417,6.02933 5.0332,8.77542 1.3916,2.74609 3.2905,7.60847 4.2198,10.8053 0.9294,3.19682 2.7579,8.1276 4.0634,10.95729 1.3055,2.82968 4.1255,7.61988 6.2667,10.64488 2.1411,3.025 5.5466,8.425 7.5677,12 2.0211,3.575 5.0766,8.75 6.79,11.5 l 3.1152,5 0.4538,5.1066 0.4538,5.1066 -1.2168,2.2735 -1.2168,2.2736 2.3274,-1.6302 z m -29.4792,-128.1301 -1.5749,2 -0.032,-1.51787 -0.032,-1.51786 2.6742,-3.98214 c 1.4707,-2.19017 2.9783,-4.20713 3.35,-4.48213 0.3718,-0.275 0.9329,-1.175 1.2469,-2 l 0.571,-1.5 0.079,1.69098 0.079,1.69099 -1.0152,0.62739 c -0.5583,0.34507 -1.6353,2.05913 -2.3932,3.80902 -0.758,1.74989 -2.0868,4.08162 -2.9531,5.18162 z M 579.5,-347.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 12,-28 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 501,-27 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 67,-6 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -99.8776,-44 c -0.2076,0 -0.9951,-0.7875 -1.75,-1.75 l -1.3724,-1.75 1.75,1.37244 c 0.9625,0.75485 1.75,1.54235 1.75,1.75 0,0.20766 -0.1699,0.37756 -0.3776,0.37756 z m -4.4589,-3 c -0.3952,0 -1.818,-0.77011 -3.1618,-1.71135 -1.3438,-0.94124 -7.6314,-4.5186 -13.9725,-7.94968 l -11.5292,-6.23835 -4.7004,4.61328 -4.7005,4.61327 -1.4807,-1.22888 -1.4807,-1.22888 -1.0504,-4.68471 c -0.5777,-2.57658 -1.3074,-5.8097 -1.6216,-7.1847 l -0.5712,-2.5 1.932,3.5 c 1.0626,1.925 2.2471,4.9625 2.6322,6.75 0.3851,1.7875 0.8895,3.25 1.1208,3.25 0.2313,0 2.2205,-1.8 4.4205,-4 l 4,-4 1.5332,0 c 0.8433,0 3.7027,1.09932 6.3542,2.44293 l 4.8209,2.44293 2.0731,-2.80403 2.0731,-2.80403 5.183,-1.69528 5.1831,-1.69529 0.5434,0.54343 0.5434,0.54344 -5.4801,2.42358 -5.4802,2.42358 -1.6359,2.49681 -1.636,2.49681 1.5143,0.5811 1.5144,0.58111 -0.5846,-0.94593 -0.5847,-0.94592 5.2827,1.82934 c 2.9055,1.00613 6.9702,2.8314 9.0327,4.05615 l 3.75,2.22682 0,1.10123 0,1.10122 -1.2,-1.2 c -0.66,-0.66 -1.6725,-1.19311 -2.25,-1.18469 l -1.05,0.0153 1.3781,0.87288 1.3781,0.87288 -0.6871,1.11181 c -0.3779,0.61149 -1.0104,1.1118 -1.4056,1.1118 z m 0.3365,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -2,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -3,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -5,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -2,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -412.61803,4 -1,0 0.61803,-1 c 0.33992,-0.55 1.06803,-1 1.61803,-1 l 1,0 -0.61803,1 c -0.33992,0.55 -1.06803,1 -1.61803,1 z m 5.99559,-4 c -0.48266,0 -0.87756,-0.20917 -0.87756,-0.46482 0,-0.25565 1.0125,-1.00432 2.25,-1.66372 l 2.25,-1.1989 -1.37244,1.66372 c -0.75485,0.91505 -1.76735,1.66372 -2.25,1.66372 z m 364.26464,-2 c -0.5105,0 -1.212,-0.73941 -1.5587,-1.64313 -0.3468,-0.90372 -0.4314,-1.84226 -0.1881,-2.08564 0.2434,-0.24339 0.9449,0.49602 1.5588,1.64312 l 1.1162,2.08565 -0.9282,0 z m -359.6422,-1.03063 -1,0 1.5,-0.96937 c 0.825,-0.53316 1.95,-0.96937 2.5,-0.96937 l 1,0 -1.5,0.96937 c -0.825,0.53316 -1.95,0.96937 -2.5,0.96937 z m 426.0643,-0.96937 c -0.2544,0 -1.554,-1.4625 -2.8879,-3.25 -1.334,-1.7875 -2.9319,-4.23292 -3.5509,-5.43426 -0.619,-1.20134 -1.1255,-2.88884 -1.1255,-3.75 l 0,-1.56574 1.4326,0 1.4326,0 0.5781,-1.82122 0.578,-1.82122 5.9777,-2.85708 5.9777,-2.85709 0.5572,0.55716 0.5571,0.55715 -5.6579,3.19317 -5.658,3.19316 -0.5042,1.92798 -0.5042,1.92799 -1.4064,0 -1.4064,0 1.4717,2.25 c 0.8094,1.2375 2.1759,3.9375 3.0365,6 0.8606,2.0625 1.3566,3.75 1.1022,3.75 z m -198.1053,-48 c -0.2414,0 -2.5215,-4.1625 -5.0669,-9.25 -2.5454,-5.0875 -8.2585,-15.1 -12.6958,-22.25 -4.4372,-7.15 -10.0218,-16.29689 -12.4102,-20.32642 -2.3883,-4.02952 -3.9064,-7.05696 -3.3736,-6.72764 0.5329,0.32933 6.1293,8.84294 12.4364,18.91913 6.3072,10.0762 13.0318,21.42864 14.9436,25.22764 1.9119,3.79901 4.1802,8.59479 5.0408,10.65729 0.8606,2.0625 1.3671,3.75 1.1257,3.75 z m -154.959,-5 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 6.9167,-2.07895 -1.9167,-0.0789 1.3125,-0.52522 1.3125,-0.52522 0.6042,0.60416 0.6041,0.60417 -1.9166,-0.0789 z m 2.0833,-1.92105 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 214.6481,-13.5 c -2.3441,2.75 -3.9414,4.325 -3.5495,3.5 0.392,-0.825 2.8751,-4.45642 5.5181,-8.06982 l 4.8055,-6.56983 6.7968,-6.04065 6.7968,-6.04064 5.2089,-2.63953 5.2088,-2.63953 5.5915,0 5.5914,0 4.6918,4.43451 4.6918,4.4345 -1.8172,0.69828 -1.8172,0.69828 -1.0021,-1.00209 c -0.5512,-0.55114 -1.1098,-1.73581 -1.2414,-2.63259 l -0.2393,-1.63051 -1.9414,-1.46839 -1.9414,-1.46838 -4.6256,-0.0318 -4.6255,-0.0318 -5.6086,2.48037 -5.6086,2.48037 -8.3107,8.26963 c -4.5709,4.5483 -10.2287,10.51963 -12.5729,13.26963 z m 47.4109,-20.5 c 0.2426,0 0.441,-0.19844 0.441,-0.44098 0,-0.24254 -0.5195,-0.76207 -1.1545,-1.15451 l -1.1545,-0.71353 0.7135,1.15451 c 0.3924,0.63498 0.912,1.15451 1.1545,1.15451 z m -187.059,21.80505 -3,-0.0371 1.769,-0.46099 c 0.973,-0.25354 2.323,-0.23687 3,0.0371 l 1.231,0.49805 -3,-0.0371 z m 5,-0.952 c -0.55,-0.064 -2.575,-0.44786 -4.5,-0.85305 l -3.5,-0.73672 3,-0.11633 3,-0.11632 1.5,0.96937 1.5,0.96937 -1,-0.11632 z m -54,-0.85305 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 6,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 3,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 8,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 2,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 7.5,-1.15789 -2.5,0 1.25,-0.50439 1.25,-0.50439 1.25,0.50439 1.25,0.50439 -2.5,0 z m -14,-1.14897 -11.5,-0.009 6.2122,-0.9246 6.2122,-0.92461 5.2878,0.93312 5.2878,0.93312 -11.5,-0.009 z m 22.5,-0.69314 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 140,-13 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 67.1475,-3.69497 -1.7514,0.67206 0.5582,-0.90313 0.5582,-0.90314 -1.2057,-0.40189 -1.2057,-0.40189 1.7514,-0.67207 1.7514,-0.67206 -0.5582,0.90313 -0.5582,0.90314 1.2057,0.40189 1.2057,0.40189 -1.7514,0.67207 z m 80.5871,-1.30503 c -0.1677,0 0.1341,-0.82039 0.6707,-1.82309 0.5366,-1.0027 4.94,-5.35763 9.7852,-9.67763 l 8.8095,-7.85454 -9.4802,9.67763 c -5.2142,5.3227 -9.6175,9.67763 -9.7852,9.67763 z m -56.7346,-13.27621 -9,7.44782 6.5,-6.1691 c 3.575,-3.393 13.4434,-11.39891 21.9298,-17.79092 l 15.4299,-11.62183 14.4219,-8.2338 14.4218,-8.23381 5.6483,-1.67734 c 3.1066,-0.92254 7.4483,-2.26836 9.6483,-2.99072 l 4,-1.31338 9.2045,-0.55622 9.2044,-0.55622 6.4895,3.38258 6.4896,3.38257 0.4198,-2.14671 0.4198,-2.14671 0.1209,2 c 0.066,1.1 -0.2294,2.55136 -0.6575,3.22524 l -0.7784,1.22524 -2.3461,0.27476 -2.346,0.27476 -0.4438,-1.25068 -0.4438,-1.25068 1.5835,0.60767 1.5836,0.60767 0,-0.59015 c 0,-0.32457 -2.235,-1.72272 -4.9668,-3.10698 l -4.9667,-2.51685 -7.988,0 -7.9879,0 -11.2551,4.01493 -11.2552,4.01492 -12.9852,7.15541 -12.9852,7.15541 -14.0549,9.96765 c -7.7303,5.48221 -18.105,13.31917 -23.055,17.41547 z m -96.8333,-5.05712 -0.6667,0.66666 0,-1.33333 0,-1.33333 0.6667,0.66666 0.6666,0.66667 -0.6666,0.66667 z M 917.5,-583.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -1,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -1,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -0.8333,-2.33333 -0.6667,0.66666 0,-1.33333 0,-1.33333 0.6667,0.66666 0.6666,0.66667 -0.6666,0.66667 z M 913.5,-594.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -1,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -0.855,-3.31169 c -0.2188,0.21887 -0.6785,-0.33327 -1.0215,-1.22697 -0.3429,-0.8937 -0.595,-2.15061 -0.5601,-2.79313 l 0.063,-1.16821 0.9581,2.39518 c 0.5269,1.31735 0.779,2.57426 0.5601,2.79313 z m -98.9112,-3.68831 c -0.1978,0 -1.6805,-1.37876 -3.295,-3.0639 l -2.9354,-3.0639 1.4983,0.6064 c 0.8241,0.33352 2.3068,1.71227 3.295,3.0639 0.9882,1.35162 1.6349,2.4575 1.4371,2.4575 z m 95.9329,-4.33333 -0.6667,0.66666 0,-1.33333 0,-1.33333 0.6667,0.66666 0.6666,0.66667 -0.6666,0.66667 z M 907.5,-611.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -106.5836,-6 c -0.275,0 -2.4874,-2.025 -4.9164,-4.5 -2.429,-2.475 -4.1914,-4.5 -3.9164,-4.5 0.275,0 2.4874,2.025 4.9164,4.5 2.429,2.475 4.1914,4.5 3.9164,4.5 z m 104.5836,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -0.7068,-2.45983 c -0.2029,0.20288 -0.9456,-0.55448 -1.6503,-1.68303 -0.7048,-1.12854 -1.0618,-2.27162 -0.7932,-2.54017 0.2685,-0.26854 1.0112,0.48882 1.6503,1.68303 0.6391,1.19421 0.996,2.33729 0.7932,2.54017 z m 223.1478,-2.54017 -1.059,0 0.618,-1 c 0.3399,-0.55 0.8165,-1 1.059,-1 0.2426,0 0.441,0.45 0.441,1 l 0,1 -1.059,0 z m -282.2787,-3.75 -0.5044,1.25 0,-2.5 0,-2.5 0.5044,1.25 0.5044,1.25 -0.5044,1.25 z m -56.1033,-2.25 c -0.2425,0 -0.7621,-0.51953 -1.1545,-1.15451 l -0.7135,-1.15451 1.1545,0.71353 c 0.635,0.39244 1.1545,0.91197 1.1545,1.15451 0,0.24254 -0.1984,0.44098 -0.441,0.44098 z m 25.941,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -1,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 30.0916,-0.25822 -0.5916,0.59155 0,-1.08652 c 0,-0.59758 -0.929,-7.44327 -2.0645,-15.21264 -1.1354,-7.76937 -1.9177,-14.88787 -1.7384,-15.8189 l 0.326,-1.69278 2.33,16.31387 2.33,16.31387 -0.5915,0.59155 z M 813.5,-632.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 287.882,0 c -0.275,0 -0.2219,-0.45 0.118,-1 0.3399,-0.55 0.843,-1 1.118,-1 0.275,0 0.2219,0.45 -0.118,1 -0.3399,0.55 -0.843,1 -1.118,1 z m -288.882,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -1,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 294.8776,0 c -0.2077,0 -0.3776,-0.1699 -0.3776,-0.37756 0,-0.20765 0.7875,-0.99515 1.75,-1.75 l 1.75,-1.37244 -1.3724,1.75 c -0.7549,0.9625 -1.5424,1.75 -1.75,1.75 z m -295.8776,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -0.8592,-2 c -0.2363,0 -6.1934,-10.2375 -13.238,-22.75 -7.0446,-12.5125 -18.9469,-32.65 -26.4496,-44.75 -7.5027,-12.1 -18.2259,-28.525 -23.8293,-36.5 l -10.188,-14.5 -9.718,-11.34717 -9.7179,-11.34718 -4.75,-3.48799 c -2.6125,-1.9184 -4.75,-3.70263 -4.75,-3.96496 0,-0.26234 2.0963,1.01349 4.6584,2.83516 l 4.6584,3.31214 9.9279,11 9.928,11 11.1817,16 c 6.15,8.8 16.8554,25.225 23.7896,36.5 6.9343,11.275 18.0003,30.175 24.5912,42 6.5908,11.825 12.5125,22.5125 13.1592,23.75 0.6468,1.2375 0.9827,2.25 0.7464,2.25 z m 301.7368,0 c -0.2077,0 -0.3776,-0.1699 -0.3776,-0.37756 0,-0.20765 0.7875,-0.99515 1.75,-1.75 l 1.75,-1.37244 -1.3724,1.75 c -0.7549,0.9625 -1.5424,1.75 -1.75,1.75 z m 4,-3 c -0.2077,0 -0.3776,-0.1699 -0.3776,-0.37756 0,-0.20765 0.7875,-0.99515 1.75,-1.75 l 1.75,-1.37244 -1.3724,1.75 c -0.7549,0.9625 -1.5424,1.75 -1.75,1.75 z m -12.9956,-14 c -0.275,0 -0.2219,-0.45 0.118,-1 0.3399,-0.55 0.843,-1 1.118,-1 0.275,0 0.2219,0.45 -0.118,1 -0.3399,0.55 -0.843,1 -1.118,1 z m 3.118,-4 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -265.8107,-4.25 -0.4573,1.75 0,-3.5 0,-3.5 0.4573,1.75 c 0.2516,0.9625 0.2516,2.5375 0,3.5 z m 268.8107,0.25 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -269.8107,-7.25 -0.4573,1.75 0,-3.5 0,-3.5 0.4573,1.75 c 0.2516,0.9625 0.2516,2.5375 0,3.5 z m 6.8184,-5.75 c -0.2569,0 -1.4286,-1.9125 -2.6039,-4.25 -1.1752,-2.3375 -2.8388,-5.04814 -3.6967,-6.02363 l -1.5599,-1.77364 -0.7273,1.17693 -0.7274,1.17692 0.1537,-2.65258 c 0.085,-1.45892 0.4216,-2.65291 0.7488,-2.65329 0.3273,-3.9e-4 1.3215,0.80208 2.2095,1.78328 0.888,0.98119 2.752,4.35619 4.1424,7.5 1.3903,3.1438 2.3177,5.71601 2.0608,5.71601 z m -7.8454,-2.75 -0.5044,1.25 0,-2.5 0,-2.5 0.5044,1.25 0.5044,1.25 -0.5044,1.25 z m 26.1229,-5.33945 c -0.1569,-0.0492 -2.8621,-1.59126 -6.0117,-3.42681 -3.1495,-1.83555 -6.7495,-4.07559 -8,-4.97786 l -2.2735,-1.6405 2,0.31731 2,0.31731 -0.2863,-8 c -0.1575,-4.4 -0.4935,-9.8 -0.7466,-12 l -0.4603,-4 0.9263,2 0.9263,2 0.1279,6.5 c 0.07,3.575 0.4463,8.29498 0.8355,10.48885 l 0.7075,3.98885 4.2418,2.33992 4.2418,2.33992 1.0283,1.92123 c 0.5655,1.05668 0.8998,1.88098 0.743,1.83178 z m -1.3024,-4.05999 c -0.2397,0.23963 -0.6512,-0.19121 -0.9146,-0.95743 -0.2634,-0.76622 -1.1557,-4.07397 -1.9828,-7.35056 -0.8271,-3.27659 -1.3078,-6.1535 -1.0682,-6.39313 0.2397,-0.23963 0.6512,0.19121 0.9146,0.95743 0.2634,0.76622 1.1557,4.07397 1.9828,7.35056 0.8271,3.27659 1.3078,6.1535 1.0682,6.39313 z m 289.8992,-3.85056 c -0.275,0 -0.2219,-0.45 0.118,-1 0.3399,-0.55 0.843,-1 1.118,-1 0.275,0 0.2219,0.45 -0.118,1 -0.3399,0.55 -0.843,1 -1.118,1 z m -315.882,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 8.1667,-8.33333 -0.6667,0.66666 0,-1.33333 0,-1.33333 0.6667,0.66666 0.6666,0.66667 -0.6666,0.66667 z M 858.5,-706.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 143,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -143.8333,-2.33333 -0.6667,0.66666 0,-1.33333 0,-1.33333 0.6667,0.66666 0.6666,0.66667 -0.6666,0.66667 z m 146.1496,-1.05313 -1.0158,0.62781 1.147,-2.14324 c 0.6309,-1.17878 5.0497,-7.87059 9.8197,-14.87068 4.77,-7.00008 14.4823,-20.15243 21.583,-29.22743 l 12.9103,-16.5 10.6197,-10.86526 10.6198,-10.86526 11.0107,-8.22293 11.0108,-8.22294 8.3079,-2.7668 8.3079,-2.76679 6.9314,1.79775 6.9313,1.79776 0,1.60429 0,1.60428 -4.1086,3.95295 c -2.2597,2.17412 -6.5787,7.0215 -9.5977,10.77196 l -5.489,6.81901 -0.5707,-0.57067 -0.5707,-0.57067 3.3169,-4.74834 c 1.8242,-2.61159 5.9791,-7.48985 9.2331,-10.84057 l 5.9162,-6.09224 -5.5542,-1.58002 -5.5541,-1.58001 -7.8945,2.42443 -7.8946,2.42443 -10.9557,7.92825 -10.9558,7.92824 -10.8093,11.31957 -10.8093,11.31958 -13.2069,16.5 c -7.2638,9.075 -17.3595,22.45929 -22.4349,29.74286 -5.0755,7.28357 -9.6852,13.52538 -10.2439,13.87068 z m -147.1065,-3.96976 -0.4778,1.85622 -0.116,-1.16821 c -0.064,-0.64252 -0.4072,-1.99252 -0.7632,-3 l -0.6472,-1.83179 1.241,1.14378 1.241,1.14378 -0.4778,1.85622 z M 1242.5,-716.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -397.5,-3 -1.3333,0 0.6666,-0.66667 0.6667,-0.66666 0.6667,0.66666 0.6666,0.66667 -1.3333,0 z m 9.6667,-0.33333 -0.6667,0.66666 0,-1.33333 0,-1.33333 0.6667,0.66666 0.6666,0.66667 -0.6666,0.66667 z m 391.8333,0.33333 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -392.8333,-4.33333 -0.6667,0.66666 0,-1.33333 0,-1.33333 0.6667,0.66666 0.6666,0.66667 -0.6666,0.66667 z m -1,-4 -0.6667,0.66666 0,-1.33333 0,-1.33333 0.6667,0.66666 0.6666,0.66667 -0.6666,0.66667 z M 1145.5,-748.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 1,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 1,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -298.191,-0.99938 c -0.105,-3.4e-4 -0.3933,-0.33812 -0.6405,-0.75062 -0.2473,-0.4125 -0.9592,-8.85 -1.5821,-18.75 -0.6229,-9.9 -1.837,-27.1477 -2.6979,-38.32823 -0.861,-11.18053 -1.3862,-20.50736 -1.1673,-20.72629 0.2189,-0.21894 1.1563,7.12876 2.0831,16.32823 0.9268,9.19946 2.137,24.60129 2.6893,34.22629 0.5523,9.625 1.1172,19.86278 1.2553,22.75062 0.1381,2.88784 0.1652,5.25034 0.06,5.25 z m 299.1206,-1.00062 c -0.275,0 -0.018,-0.9 0.5704,-2 0.5887,-1.1 1.2954,-2 1.5704,-2 0.275,0 0.018,0.9 -0.5704,2 -0.5887,1.1 -1.2954,2 -1.5704,2 z m -325.9296,-38 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 90.1042,-0.27083 -0.6042,0.60416 0.079,-1.91666 0.079,-1.91667 0.5252,1.3125 0.5252,1.3125 -0.6041,0.60417 z m 294.8958,0.27083 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -386,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 21.1623,-40.75 -0.5044,1.25 0,-2.5 0,-2.5 0.5044,1.25 0.5044,1.25 -0.5044,1.25 z m 80.9419,-6.52083 -0.6042,0.60416 0.079,-1.91666 0.079,-1.91667 0.5252,1.3125 0.5252,1.3125 -0.6041,0.60417 z m 0.8965,-4.22917 c -0.2616,0.55 -0.2101,-1.025 0.1144,-3.5 0.3246,-2.475 1.8939,-10.19725 3.4875,-17.16055 1.5936,-6.9633 2.9259,-13.9383 2.9608,-15.5 l 0.063,-2.83945 0.8485,2.0991 0.8486,2.0991 -3.9238,16.9009 c -2.1581,9.2955 -4.1378,17.3509 -4.3994,17.9009 z m -42.8965,-20.77083 -0.6042,0.60416 0.079,-1.91666 0.079,-1.91667 0.5252,1.3125 0.5252,1.3125 -0.6041,0.60417 z m 0,-5 -0.6042,0.60416 0.079,-1.91666 0.079,-1.91667 0.5252,1.3125 0.5252,1.3125 -0.6041,0.60417 z M 930.5,-887.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -102.75,-12.07029 c -0.1375,-0.0386 -1.15,-0.45702 -2.25,-0.92971 l -2,-0.85943 2.25,-0.0703 2.25,-0.0703 0,1 c 0,0.55 -0.1125,0.96837 -0.25,0.92971 z m 36.9167,-89.26304 -0.6667,0.66666 0,-1.33333 0,-1.33333 0.6667,0.66666 0.6666,0.66667 -0.6666,0.66667 z M 819.5,-1111.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 244.272,997.6409 c 0.6242,-0.3858 2.0865,-2.0378 3.2495,-3.6711 1.1631,-1.6334 1.9125,-2.9698 1.6653,-2.9698 -0.2472,0 -1.7095,1.652 -3.2495,3.6711 -1.5401,2.0192 -2.2895,3.3556 -1.6653,2.9698 z m 108.728,0.3591 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -687,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 688,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -686.11803,-2 c 0.275,0 0.77811,-0.45 1.11803,-1 0.33992,-0.55 0.39303,-1 0.11803,-1 -0.275,0 -0.77811,0.45 -1.11803,1 -0.33992,0.55 -0.39303,1 -0.11803,1 z m 687.11803,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -16.7509,-1.4157 c 0.2639,-0.264 -0.539,-2.6409 -1.7843,-5.28211 -1.2452,-2.6412 -3.2568,-6.15219 -4.4702,-7.80219 -1.2133,-1.65 -3.2258,-5.025 -4.4721,-7.5 -1.2464,-2.475 -4.2808,-7.343 -6.7432,-10.81778 l -4.4771,-6.31777 -0.5779,0.57787 -0.5778,0.57787 3.5324,6.73991 3.5324,6.7399 6.422,8.5 c 3.5321,4.675 7.0326,9.97693 7.7789,11.78206 0.7464,1.80514 1.5729,3.06614 1.8369,2.80224 z m 18.7509,-1.5843 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -107,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 108.882,-3 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z m -680.882,-4 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 577,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -571,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -3.11803,-1 c 0.275,0 0.77811,-0.45 1.11803,-1 0.33992,-0.55 0.39303,-1 0.11803,-1 -0.275,0 -0.77811,0.45 -1.11803,1 -0.33992,0.55 -0.39303,1 -0.11803,1 z m 575.11803,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-4 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 51,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -0.8333,-2.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z M 1084.5,-160.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 48,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -46,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 45,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -451.88399,-2.03279 c 0.0638,0.018 1.09675,-2.65698 2.29543,-5.94447 l 2.17942,-5.97727 2.46112,-2.92488 2.46113,-2.92488 9.11119,-4.70576 9.1112,-4.70576 10.8236,-10.1421 10.8235,-10.14209 4.9177,-6.5 c 2.7047,-3.575 7.2539,-8.67682 10.1093,-11.33739 l 5.1916,-4.83738 9.4494,-4.47623 9.4494,-4.47624 0,-6.36333 0,-6.36334 -6.0518,-11.5833 -6.0518,-11.5833 -1.0165,-5.77108 -1.0166,-5.77108 1.6639,-13.46867 c 0.9151,-7.40776 1.8894,-17.06866 2.1652,-21.46866 l 0.5015,-8 -2.1508,-5.70189 -2.1508,-5.70189 -2.8869,-3.09042 -2.8869,-3.09041 -5.3092,0.65709 c -2.9201,0.3614 -8.4492,1.2958 -12.2869,2.07643 l -6.9776,1.41934 -2.1922,1.43637 c -1.2057,0.79001 -5.9947,5.85293 -10.6422,11.25095 l -8.4499,9.81457 -7.8803,5.46279 c -4.33409,3.00454 -11.45439,7.30899 -15.82284,9.56545 l -7.94264,4.10264 -5.16387,8.6507 -5.16388,8.65069 -0.64826,6.97508 c -0.35655,3.8363 -2.182,14.74825 -4.05656,24.2488 -1.87456,9.50054 -3.6948,20.48693 -4.04498,24.41421 l -0.63669,7.1405 1.52066,8.8595 c 0.83637,4.87272 1.99302,14.79734 2.57035,22.0547 l 1.04967,13.19519 -0.64839,4.05481 -0.64839,4.0548 0.76179,0 c 0.41899,0 2.5015,-0.52123 4.62781,-1.15829 l 3.86602,-1.15829 3.95286,1.18431 3.95287,1.18431 3.79713,4.44119 c 2.08843,2.44265 3.84934,4.45594 3.91315,4.47398 z m 407.88399,0.0328 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 43.1667,-1.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z M 1087.5,-173.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 41.1667,-0.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m 79.8333,0.33333 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -120,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 39.1667,-0.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m 79.8333,0.33333 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 4.0716,-2.47536 c 0.656,-1.26442 1.9383,-4.54375 2.8496,-7.2874 l 1.6569,-4.98844 0.5662,-5.8744 0.5661,-5.8744 0.6518,-0.25234 0.6518,-0.25234 -0.3577,-4.49766 -0.3577,-4.49766 0.8507,8.6e-4 0.8507,8.5e-4 0,-7.99869 0,-7.99869 -0.6212,-0.002 c -0.3416,-0.001 -0.9381,-2.13967 -1.3256,-4.75217 -0.3874,-2.6125 -0.8762,-5.65553 -1.0863,-6.76229 -0.21,-1.10675 -1.9662,-7.46426 -3.9026,-14.1278 -1.9365,-6.66353 -4.0104,-13.40314 -4.6088,-14.97691 l -1.0879,-2.8614 -3.7555,7.9892 c -2.0656,4.39406 -5.3764,10.24504 -7.3574,13.00219 l -3.6018,5.01298 -0.6933,6.12813 -0.6933,6.12812 3.1946,11.35889 c 1.757,6.24739 4.0167,14.05889 5.0216,17.35889 l 1.8271,6 0.033,3.42561 0.033,3.42561 1.4503,0.81162 1.4503,0.81162 0.6267,2.497 c 0.3447,1.37335 1.8301,4.48941 3.301,6.92457 l 2.6744,4.42756 1.1927,-2.29895 z M 1089.5,-178.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 117,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -80,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 79,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -115,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 35,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -34.118,-2 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z m 33.4289,0 c 0.2126,0 -0.631,-1.6875 -1.8747,-3.75 -1.2438,-2.0625 -3.3018,-5.57321 -4.5734,-7.80158 l -2.312,-4.05158 -3.9701,-2.23134 -3.9702,-2.23135 -2.4009,0.6026 -2.4009,0.6026 -3.1544,3.34419 c -1.7349,1.83931 -3.1543,3.84795 -3.1543,4.46366 l 0,1.11947 3.5333,-3.53334 3.5334,-3.53333 2.5986,0 2.5986,0 3.3549,2.07345 3.355,2.07345 4.2252,6.42655 c 2.3238,3.5346 4.3992,6.42655 4.6119,6.42655 z m 78.8558,-2.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z M 1093.5,-186.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 108,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -107.118,-2 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z m 1.2847,-8.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m 103,0 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m -82.0044,-2.41667 0.5044,-1.25 -0.5044,-1.25 -0.5044,-1.25 0,2.5 0,2.5 0.5044,-1.25 z m 80.8377,-0.25 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -547.89583,-1.27083 0.60416,-0.60417 -0.52522,-1.3125 -0.52522,-1.3125 -0.0789,1.91667 -0.0789,1.91666 0.60417,-0.60416 z M 1197.5,-203.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -228.2614,-2.64748 c 0.4188,-0.2588 0.7614,-1.0309 0.7614,-1.71576 0,-0.68486 1.3203,-3.32716 2.9341,-5.87178 l 2.9341,-4.62659 11.8159,-9.39102 11.8159,-9.39102 2.694,-3.53797 c 1.4816,-1.94588 4.0012,-6.18856 5.5991,-9.42817 1.5978,-3.23962 4.1444,-9.80694 5.6591,-14.59405 l 2.754,-8.70385 4.5057,-6.79615 4.5056,-6.79616 0.6797,-5.51243 0.6797,-5.51243 -0.6786,-3.31788 -0.6786,-3.31788 -3.0897,-3.66969 c -1.6994,-2.01833 -7.1489,-10.07626 -12.1099,-17.90651 -4.9611,-7.83025 -9.0201,-14.47878 -9.0201,-14.77451 0,-0.29573 -1.7698,-3.33916 -3.933,-6.76318 l -3.9329,-6.22549 -8.176,-7.41667 -8.1759,-7.41666 -2.6439,0 -2.644,0 -7.9971,3.91666 -7.9972,3.91667 -5,9.46494 -5,9.46495 -7,7.13099 -7,7.131 -8.2834,4.28285 -8.2833,4.28284 -2.8251,3.42736 -2.8251,3.42735 -1.2628,3.8262 -1.2628,3.8262 4.0871,5.41324 c 2.2478,2.97728 4.9609,7.41772 6.0291,9.86766 l 1.942,4.45442 1.6533,8.5 c 0.9092,4.675 2.5877,11.425 3.7299,15 1.1422,3.575 2.9677,8.3 4.0567,10.5 1.089,2.2 4.805,8.29407 8.2579,13.54239 l 6.2778,9.54238 1.0988,3.95762 1.0987,3.95761 0.01,6.13303 0.01,6.13304 4.25,-1.47581 4.25,-1.47581 4.6498,0.43635 4.6497,0.43635 2.8389,2.06797 2.8388,2.06796 0.7614,-0.47056 z m 227.4281,-0.68585 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m -546.06253,-0.9375 0.60416,-0.60417 -0.52522,-1.3125 -0.52522,-1.3125 -0.0789,1.91667 -0.0789,1.91666 0.60417,-0.60416 z M 1118.5,-209.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 77.1667,-1.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z M 1119.5,-211.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -469.73046,-1.4362 c 0.23385,-0.23386 -0.0779,-4.39388 -0.69288,-9.2445 -0.61493,-4.85061 -1.25263,-11.0693 -1.41711,-13.8193 l -0.29905,-5 -0.18686,6.5 -0.18686,6.5 1.17879,7.74449 c 0.64833,4.25947 1.37012,7.55316 1.60397,7.31931 z m 446.01346,0.4362 c 0.1935,0 0.037,-1.0125 -0.3474,-2.25 -0.3846,-1.2375 -3.6448,-6.75 -7.245,-12.25 -3.6001,-5.5 -6.9867,-10.45 -7.5257,-11 -0.5391,-0.55 0.9454,2.6 3.2987,7 2.3533,4.4 5.0593,8.9 6.0133,10 0.954,1.1 2.5715,3.4625 3.5945,5.25 1.0229,1.7875 2.0181,3.25 2.2116,3.25 z m 25.717,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 73,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -71,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 70,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -68.118,-2 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z m 67.118,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -64,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 55,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2.5,-2 1.3333,0 -0.6666,-0.66667 -0.6667,-0.66666 -0.6667,0.66666 -0.6666,0.66667 1.3333,0 z m -55.5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 57.1042,-2.27083 0.6041,-0.60417 -0.5252,-1.3125 -0.5252,-1.3125 -0.079,1.91667 -0.079,1.91666 0.6042,-0.60416 z M 1134.5,-233.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 48.1042,-1.27083 0.6041,-0.60417 -0.5252,-1.3125 -0.5252,-1.3125 -0.079,1.91667 -0.079,1.91666 0.6042,-0.60416 z M 1136.5,-237.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -56.9724,-2 c 0.2253,0 0.1432,-0.69441 -0.1825,-1.54313 -0.3257,-0.84872 -0.8066,-1.32866 -1.0688,-1.06653 -0.2621,0.26213 -0.18,0.95654 0.1826,1.54313 0.3625,0.58659 0.8435,1.06653 1.0687,1.06653 z m 57.9724,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -338.8275,-7.9005 c 1.886,-3.61833 4.4188,-7.63691 5.6283,-8.9302 l 2.1992,-2.35142 10.3802,-6.15894 10.3802,-6.15894 6.959,-6.42623 6.959,-6.42623 5.8695,-7.71053 5.8696,-7.71052 4.0869,-3.49826 c 2.2478,-1.92404 6.7028,-4.8925 9.9,-6.59659 l 5.8131,-3.09834 0.5841,-4.93176 0.5841,-4.93176 -0.9322,-3.37599 c -0.5127,-1.85679 -2.5544,-6.05749 -4.5372,-9.33489 -1.9828,-3.27739 -4.6374,-7.9839 -5.8991,-10.4589 -1.2618,-2.475 -3.0348,-6.975 -3.9401,-10 l -1.6459,-5.5 -0.9634,-10 -0.9634,-10 -4.4401,-6.50339 c -2.442,-3.57686 -5.7924,-7.79907 -7.4454,-9.38268 l -3.0053,-2.8793 -4.8068,0.58145 c -2.6437,0.3198 -8.2247,1.22991 -12.4021,2.02246 l -7.5952,1.44101 -3.9048,2.50229 c -2.1476,1.37626 -7.1593,5.45529 -11.1371,9.06451 -3.9778,3.60922 -9.6028,8.34681 -12.5,10.52798 l -5.2676,3.96576 -7.5671,3.43972 -7.5671,3.43971 -2.1833,2.77564 -2.1834,2.77564 -1.1578,3.8646 -1.1579,3.8646 1.1583,3.86602 1.1583,3.86602 -0.024,7.88398 -0.024,7.88398 -0.9897,4 -0.9897,4 -0.6291,12.05274 -0.6291,12.05273 1.2608,3.94727 c 0.6934,2.17099 3.447,7.80722 6.1192,12.52495 l 4.8584,8.5777 1.619,6.31957 1.619,6.31957 -0.5706,2.85273 -0.5705,2.85274 4.5739,0 4.5738,0 3.4789,1.65082 3.4788,1.65081 2.544,3.18832 2.544,3.18831 3.4291,-6.57876 z m 339.8275,4.9005 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -60.6931,-1.47354 0.5598,-0.55979 -1.2426,-1.23334 -1.2426,-1.23333 0.6828,1.79313 0.6828,1.79313 0.5598,-0.5598 z m 104.8598,0.14021 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z M 1139.5,-244.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -490.5,-3.5 c 0.41985,-1.65 0.76337,-4.125 0.76337,-5.5 l 0,-2.5 -0.76337,3 c -0.41985,1.65 -0.76337,4.125 -0.76337,5.5 l 0,2.5 0.76337,-3 z m 360.5,1.5 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 66.1667,-1.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m 64.8333,0.33333 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -130,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 171,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -169.8333,-2.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m 62.8333,-0.66667 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 67.1667,-0.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m 38.8333,0.33333 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -168,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 61.1667,-1.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m 105.8333,0.33333 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -528.83333,-2.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z M 1013.5,-256.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 59.1042,-1.27083 0.6041,-0.60417 -0.5252,-1.3125 -0.5252,-1.3125 -0.079,1.91667 -0.079,1.91666 0.6042,-0.60416 z m 106.0625,-0.0625 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m -164,-2 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m -363.00003,-1 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z m 526.00003,0 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m -106.0941,-0.9059 c 0.2052,-0.20527 -0.1088,-2.14792 -0.6979,-4.317 l -1.0711,-3.94377 -2.4025,-3.1842 c -1.3214,-1.75132 -5.1368,-5.33236 -8.4786,-7.95789 l -6.0762,-4.77368 0.4399,-2.30086 0.4398,-2.30086 -1.3923,1.15552 -1.3923,1.15552 -2.2852,-2.14678 -2.2851,-2.14677 -3.7254,0 -3.7254,0 -3.9203,2 c -2.1562,1.1 -4.6133,2 -5.4602,2 l -1.5398,0 0,1.09563 c 0,0.6026 -1.0003,2.5151 -2.2228,4.25 l -2.2229,3.15437 4.9729,-4.38185 4.9728,-4.38184 3.2179,-1.36816 c 1.7698,-0.75248 4.1424,-1.36815 5.2723,-1.36815 l 2.0545,0 4.2276,3.80079 c 2.3253,2.09044 6.7027,5.71577 9.7277,8.0563 l 5.5,4.2555 2.7163,3.5767 c 1.494,1.96719 3.2264,5.12201 3.8497,7.01071 0.6233,1.8887 1.3013,3.26605 1.5066,3.06077 z M 1015.5,-263.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 161,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -524,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 364,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 159,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -158,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -364,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 521,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -156,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 153,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -518,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 366,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 148,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -515,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 514.0609,0 c 0.2697,0 -0.159,-1.2375 -0.9528,-2.75 -0.7938,-1.5125 -3.3753,-4.55 -5.7366,-6.75 l -4.2933,-4 4.0985,4.60571 c 2.2542,2.53315 4.6149,5.57065 5.2461,6.75 0.6312,1.17936 1.3683,2.14429 1.6381,2.14429 z m -557.94456,-7 c 0.33899,0 3.19679,-2.3625 6.35066,-5.25 l 5.73432,-5.25 9.66973,-4.31184 9.66973,-4.31184 3.13074,0.31184 3.13074,0.31184 1.90492,2.56355 1.90491,2.56355 1.20996,4.74304 1.20996,4.74303 1.54752,-3.4142 1.54751,-3.4142 -1.63433,0.42739 -1.63433,0.42738 -1.17055,-3.90697 -1.17056,-3.90697 -2.1235,-1.9128 -2.12351,-1.9128 -4.11273,0 -4.11273,0 -1.65207,1.62966 -1.65206,1.62967 -5.37033,1.74344 c -2.95369,0.95889 -6.94534,2.65729 -8.87034,3.77423 -1.925,1.11693 -5.4125,3.85522 -7.75,6.0851 l -4.25,4.05432 0,1.29179 c 0,0.71048 0.27735,1.29179 0.61634,1.29179 z m 416.88366,-4 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 7,-3.13724 4,-1.81884 3.5275,-0.022 3.5275,-0.022 2.3507,1.64653 2.3508,1.64653 0.9743,-1.89653 c 0.5359,-1.04309 5.2567,-6.06147 10.4907,-11.15195 l 9.5164,-9.25541 3.9352,-10.74459 3.9352,-10.74458 0.8676,-11 0.8676,-11 1.0278,-2.68245 1.0278,-2.68245 -0.942,-3.31755 c -0.5181,-1.82465 -1.4356,-4.52023 -2.0388,-5.99017 l -1.0968,-2.67261 -5.7803,-4.54121 -5.7802,-4.54122 -0.7138,0.71383 -0.7139,0.71383 0.3334,-1.03461 0.3333,-1.03461 -4.0928,-4.46539 c -2.251,-2.45596 -8.4888,-9.31732 -13.8617,-15.24745 l -9.7688,-10.78207 -2.8189,-1.45767 c -1.5503,-0.80172 -7.2376,-3.03715 -12.6383,-4.96763 -5.4007,-1.93049 -10.405,-3.51011 -11.1205,-3.51027 l -1.3011,-3e-4 -1.3907,3.32859 -1.3908,3.3286 1.0014,7.22593 1.0013,7.22594 -1.1808,3.69547 c -0.6495,2.03251 -2.132,5.27047 -3.2944,7.19547 -1.1625,1.925 -4.8947,6.5313 -8.2938,10.23622 l -6.1802,6.73622 -1.6652,5.0135 -1.6653,5.01351 5.964,5.96393 5.9639,5.96392 4.7456,8.28635 c 2.6101,4.55749 6.1817,10.53635 7.937,13.28635 1.7553,2.75 4.0597,6.7274 5.1208,8.83866 1.0611,2.11127 4.2847,6.56954 7.1635,9.90726 l 5.2342,6.0686 0.6162,3.2848 c 0.3389,1.80664 0.4586,5.48923 0.2658,8.18353 l -0.3504,4.89874 4,-1.81883 z m 19,2.13724 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 103.1224,-1 c 0.2077,0 0.3776,-0.1699 0.3776,-0.37756 0,-0.20765 -0.7875,-0.99515 -1.75,-1.75 l -1.75,-1.37244 1.3724,1.75 c 0.7549,0.9625 1.5424,1.75 1.75,1.75 z M 499.5,-293.81195 c 11,0.0273 22.925,-0.24379 26.5,-0.60241 l 6.5,-0.65204 0.29569,-6.75 0.29569,-6.75 -0.90411,0 c -0.49726,0 -2.53878,-2.46199 -4.53671,-5.4711 l -3.63261,-5.47109 -2.25338,0.83358 -2.25338,0.83358 -2.2828,6.88751 -2.2828,6.88752 0.62399,-4.98683 0.62399,-4.98682 1.4555,-2.81462 1.4555,-2.81463 1.44995,-0.5564 1.44995,-0.55639 2.24777,0.56448 2.24776,0.56449 1.9155,3.55827 c 1.05352,1.95704 2.6024,4.11406 3.44196,4.79336 l 1.52646,1.23509 -0.67999,-1.13513 -0.67998,-1.13513 1.08585,-3.11487 1.08585,-3.11487 1.27903,0 1.27903,0 2.01767,4.75 c 1.10972,2.6125 2.81114,7.225 3.78093,10.25 0.96979,3.025 1.91209,6.08584 2.09399,6.80187 l 0.33074,1.30187 4.26148,-0.41897 4.26148,-0.41897 -0.17812,-1.8683 -0.17813,-1.86831 1.15173,-0.71181 1.15173,-0.71181 0.76108,1.19722 0.76108,1.19721 0.0115,-4 c 0.006,-2.2 -0.65392,-8.05 -1.46723,-13 -0.8133,-4.95 -1.48659,-10.05 -1.49619,-11.33333 l -0.0175,-2.33334 1.25,0.45834 1.25,0.45833 -0.27478,1.19933 -0.27477,1.19933 1.10677,-0.68402 1.10677,-0.68403 -2.46486,-2.6403 -2.46486,-2.64031 -1.2309,-8.5 c -0.677,-4.675 -1.37599,-9.85 -1.5533,-11.5 -0.17732,-1.65 -0.35112,-4.48906 -0.38623,-6.30902 l -0.0638,-3.30901 -0.98855,0.61095 -0.98854,0.61096 0.55833,-1.45499 0.55833,-1.45499 -2.27193,-4.34695 c -1.24956,-2.39082 -2.17621,-4.69871 -2.05922,-5.12863 0.11698,-0.42993 -0.76672,-2.90493 -1.96378,-5.5 -1.19707,-2.59508 -2.9668,-6.74332 -3.93273,-9.21832 l -1.75625,-4.5 -2.12463,4.75 c -1.16854,2.6125 -2.28643,4.75 -2.4842,4.75 -0.19778,0 -0.13768,-1.0125 0.13354,-2.25 l 0.49312,-2.25 -1.11712,1.5 -1.11712,1.5 0.66719,-3 c 0.36696,-1.65 1.28478,-4.35 2.0396,-6 l 1.37239,-3 -0.50782,3.5 -0.50782,3.5 0.98329,-1.5 0.98329,-1.5 0.0153,-2.78518 0.0153,-2.78519 -1.60687,-2.4524 -1.60688,-2.45239 -8.42125,12.11127 -8.42126,12.11127 0.56935,1.79385 c 0.31314,0.98661 1.48684,2.96026 2.60823,4.38588 l 2.03889,2.59203 2.55476,-2.00957 2.55475,-2.00957 2.36514,0 2.36514,0 0,1.04384 0,1.04383 -1.25,-0.16232 c -0.6875,-0.0893 -1.81829,-0.109 -2.51288,-0.0438 -0.69458,0.0652 -3.05634,1.80598 -5.24835,3.86848 l -3.98548,3.75 -0.0321,3.5 -0.0321,3.5 -1.05327,-1.81074 -1.05327,-1.81074 0.50553,-1.3174 0.50554,-1.31741 -1.17185,-1.26856 -1.17186,-1.26856 1,0.51792 1,0.51791 2.33158,-2.23292 2.33157,-2.23292 -1.53065,-0.58736 -1.53064,-0.58736 0.6084,1.69907 0.6084,1.69907 -0.82649,-0.75049 c -0.45456,-0.41277 -0.91378,-1.53777 -1.02048,-2.5 -0.1067,-0.96223 -0.52963,-2.53701 -0.93983,-3.49951 -0.41021,-0.9625 -1.12076,-1.75 -1.579,-1.75 -0.45824,0 -3.2226,3.46377 -6.14301,7.69727 -2.92042,4.2335 -5.19735,8.0585 -5.05985,8.5 l 0.25012,0.8027 -0.91398,0 -0.91398,0 -14.91249,22.25 c -8.20187,12.2375 -17.24058,26.13749 -20.08602,30.88888 -2.84544,4.75138 -5.17353,8.88198 -5.17353,9.1791 0,0.29712 2.3625,1.00754 5.25,1.57869 2.8875,0.57116 6.825,1.21165 8.75,1.42331 1.925,0.21166 12.5,0.40717 23.5,0.43447 z m 15.16228,-6.50445 -0.50439,1.25 0,-2.5 0,-2.5 0.50439,1.25 0.50439,1.25 -0.50439,1.25 z m 38.83772,-2.25 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -39,-11 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -4,-4 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -3.6142,-1 c -0.32656,0 -1.89696,-1.22638 -3.48978,-2.72529 -1.59281,-1.49891 -3.23352,-2.62391 -3.64602,-2.5 -0.4125,0.12391 -0.75,-0.22471 -0.75,-0.77471 l 0,-1 1.5,0 1.5,0 0,0.95953 c 0,0.52774 1.2329,2.10274 2.73978,3.5 1.50688,1.39726 2.47259,2.54047 2.14602,2.54047 z m -8.21913,-2.33333 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z M 522.5,-322.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -2,-5 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -0.83333,-3.33333 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z m 0,-4 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z m 0,-9 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z m -0.94076,-3.05925 c -0.25542,0.25542 -0.92449,-1.34818 -1.48681,-3.56356 l -1.02241,-4.02797 0.81472,0.50352 c 0.44809,0.27694 1.11716,1.88054 1.48681,3.56356 0.36966,1.68302 0.46312,3.26903 0.20769,3.52445 z M 516.5,-355.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 30.02763,-1 c -0.22528,0 -0.70621,-0.47994 -1.06875,-1.06653 -0.36253,-0.58659 -0.44468,-1.281 -0.18255,-1.54313 0.26212,-0.26213 0.74306,0.21781 1.06875,1.06653 0.32568,0.84872 0.40783,1.54313 0.18255,1.54313 z m -2.02763,-4 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -33.02968,-2.5 -2.27934,0 0.46353,-0.75 c 0.25494,-0.4125 1.13852,-0.75 1.96352,-0.75 l 1.5,0 -0.71934,-1.25 -0.71934,-1.25 0.85594,0.77894 c 0.47076,0.42842 0.93658,1.32842 1.03514,2 l 0.17922,1.22106 -2.27933,0 z m 32.19635,-1.83333 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z m -22.28911,-9.66667 c -0.20766,0 -0.37756,-0.1699 -0.37756,-0.37756 0,-0.20765 0.7875,-0.99515 1.75,-1.75 l 1.75,-1.37244 -1.37244,1.75 c -0.75485,0.9625 -1.54235,1.75 -1.75,1.75 z m 534.00444,81 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z m -517.44102,-1 3.94099,0 0.44292,-0.75 0.44292,-0.75 -2.2744,-7 c -1.25093,-3.85 -2.9315,-8.50641 -3.73461,-10.34757 l -1.46021,-3.34756 -0.64929,4.73713 c -0.35712,2.60543 -0.6493,7.59934 -0.6493,11.09757 l 0,6.36043 3.94098,0 z m 22.97569,-1.01531 c 0.87083,-0.008 2.22948,-0.42418 3.01922,-0.92391 l 1.43589,-0.90859 -1.13529,-4.32609 c -0.62441,-2.37936 -2.49848,-8.1511 -4.16459,-12.8261 -1.66612,-4.675 -3.03889,-8.24083 -3.0506,-7.92407 -0.0117,0.31676 0.65641,5.40378 1.48472,11.30449 l 1.50602,10.72856 -0.97083,1.81403 -0.97084,1.81402 0.63148,0.63149 c 0.34732,0.34731 1.34398,0.62459 2.21482,0.61617 z M 556.5,-296.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 10,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2.59362,0 0.90638,0 0,-2 c 0,-1.1 -0.17252,-2 -0.38337,-2 -0.21085,0 -0.61872,0.9 -0.90638,2 l -0.52301,2 0.90638,0 z m 488.09638,0 c 0.275,0 1.3145,-0.9 2.31,-2 0.9955,-1.1 1.585,-2 1.31,-2 -0.275,0 -1.3145,0.9 -2.31,2 -0.9955,1.1 -1.585,2 -1.31,2 z m 96.6303,0 c 0.2693,0 -0.2551,-0.82293 -1.1653,-1.82874 l -1.655,-1.82874 0,-1.67126 0,-1.67126 -1.5,0 c -0.825,0 -1.5,0.2289 -1.5,0.50866 0,0.27976 1.1994,1.85476 2.6653,3.5 1.4659,1.64524 2.8857,2.99134 3.155,2.99134 z m -494.3203,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 370.1042,-0.27083 0.6041,-0.60417 -0.5252,-1.3125 -0.5252,-1.3125 -0.079,1.91667 -0.079,1.91666 0.6042,-0.60416 z M 660.5,-300.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -93.71482,-1.00071 1.28519,7.1e-4 -1.17064,-2.25 c -0.64385,-1.2375 -1.2889,-2.39171 -1.43344,-2.56492 -0.14454,-0.17321 -0.19609,0.83897 -0.11455,2.24929 l 0.14826,2.56422 1.28518,7e-4 z m 93.30503,-4.6146 c 1.58163,-2.68658 2.88336,-5.35891 2.89274,-5.93852 0.009,-0.57961 1.47955,-2.44611 3.26705,-4.14778 l 3.25,-3.09395 7,-3.56131 c 3.85,-1.95872 10.15,-5.7408 14,-8.40462 l 7,-4.84331 7.5,-9.27822 7.5,-9.27821 4,-2.41506 4,-2.41506 3.3222,-0.62916 3.3222,-0.62917 1.0205,-2.62516 1.0205,-2.62516 -0.5051,-8 c -0.2777,-4.4 -1.0538,-12.23848 -1.7246,-17.41883 l -1.2195,-9.41884 1.1219,-7.93311 1.1219,-7.93311 3.6243,-8.02718 3.6244,-8.02717 -0.5376,-4.00846 -0.5377,-4.00847 -1.4427,-1.4427 -1.4427,-1.44271 -3.884,1.0477 c -2.1362,0.57623 -8.2383,1.51266 -13.5601,2.08096 l -9.6761,1.03326 -7.8239,3.03052 c -4.3032,1.66678 -9.6239,3.91462 -11.8239,4.99519 -2.2,1.08057 -6.25,3.57101 -9,5.53431 -2.75,1.9633 -6.04088,4.59127 -7.31307,5.83993 l -2.31306,2.2703 -1.94014,8.9142 -1.94014,8.91421 -1.24679,1 c -0.68574,0.55 -3.44871,5.55125 -6.13994,11.11388 l -4.89314,10.11389 0.80346,1.38611 0.80347,1.38612 -0.81444,-0.73744 -0.81443,-0.73745 -2.98219,4.05515 -2.98219,4.05515 -1.4026,6.68229 -1.4026,6.6823 0.61741,5.5 c 0.33957,3.025 1.52749,10.45 2.63982,16.5 l 2.02242,11 -0.58559,5.75 -0.5856,5.75 2.81036,0 2.81035,0 2.04935,2.25 c 1.12715,1.2375 2.60386,3.32311 3.28158,4.63469 l 1.23223,2.38469 2.87568,-4.88469 z M 650.5,-342.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -1.88324,-2 c -0.30051,0 -0.94998,-0.7875 -1.44324,-1.75 -0.49327,-0.9625 -1.21223,-3.0654 -1.59769,-4.67311 -0.38546,-1.60771 -0.70083,-5.73301 -0.70083,-9.16733 l 0,-6.24422 2.08282,-4.08267 c 1.14556,-2.24547 2.304,-4.08267 2.57432,-4.08267 0.27032,0 0.19974,1.9125 -0.15684,4.25 -0.35659,2.3375 -1.07774,4.79531 -1.60257,5.46181 l -0.95422,1.2118 0.47794,5.7882 c 0.26287,3.1835 0.79041,7.47569 1.17233,9.53819 l 0.69438,3.75 -0.5464,0 z m 413.53464,43 c 0.275,0 1.5569,-1.125 2.8486,-2.5 1.2917,-1.375 2.1236,-2.5 1.8486,-2.5 -0.275,0 -1.5569,1.125 -2.8486,2.5 -1.2917,1.375 -2.1236,2.5 -1.8486,2.5 z m 84.3486,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -485,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -90.89583,-1.27083 0.60416,-0.60417 -0.52522,-1.3125 -0.52522,-1.3125 -0.0789,1.91667 -0.0789,1.91666 0.60417,-0.60416 z m 458.05633,0.27083 c 0.1867,0 0.3395,-0.6342 0.3395,-1.40934 l 0,-1.40934 -5.75,-6.96411 c -3.1625,-3.83026 -6.3189,-7.80855 -7.0142,-8.84066 l -1.2642,-1.87655 1.4998,3.17262 c 0.825,1.74493 3.3531,5.31377 5.6181,7.93073 2.2649,2.61697 4.5936,5.80179 5.1748,7.07739 0.5812,1.27559 1.2095,2.31926 1.3962,2.31926 z m 124.8395,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -490,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 491,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -86.3486,-1 c 0.275,0 1.5569,-1.125 2.8486,-2.5 1.2917,-1.375 2.1236,-2.5 1.8486,-2.5 -0.275,0 -1.5569,1.125 -2.8486,2.5 -1.2917,1.375 -2.1236,2.5 -1.8486,2.5 z m 76.3486,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -575.96687,-2.0275 1.46687,-1.21739 -0.0997,-10.12755 -0.0997,-10.12756 -0.85438,2.5 -0.85438,2.5 0.40735,-7 0.40734,-7 -0.83497,3 -0.83497,3 -0.11832,-2.80902 -0.11831,-2.80901 -0.97068,0.59991 -0.97069,0.59992 -0.48317,-2.2909 c -0.26575,-1.26 -0.95394,-4.67555 -1.52932,-7.59012 -0.57538,-2.91457 -1.00196,-5.83957 -0.94796,-6.5 0.054,-0.66043 0.68481,0.82422 1.40182,3.29922 l 1.30365,4.5 0.0982,-1.61248 c 0.054,-0.88687 -1.04748,-7.18687 -2.44772,-14 l -2.54589,-12.38752 0.40723,-2.25 0.40723,-2.25 -0.86133,0 -0.86133,0 -0.04,1.25 -0.04,1.25 -1.58512,-3 c -0.87181,-1.65 -2.27031,-3.78393 -3.10776,-4.74206 l -1.52264,-1.74206 -1.3522,2.60637 c -0.74371,1.4335 -1.3522,3.45493 -1.3522,4.49206 l 0,1.88569 -1.5,0 -1.5,0 0.0153,2.25 c 0.008,1.2375 0.49631,2.925 1.08419,3.75 l 1.06888,1.5 -0.51652,-3.5 -0.51653,-3.5 0.51775,1.25623 0.51774,1.25623 0.7056,-0.43608 0.7056,-0.43609 -0.40646,3.48167 -0.40647,3.48166 1.12367,4.19819 c 0.61801,2.30901 1.30696,5.85282 1.53098,7.87514 0.22403,2.02232 0.93035,7.19732 1.5696,11.5 l 1.16228,7.82305 1.63884,3.89364 c 0.90136,2.1415 1.68937,4.6165 1.75114,5.5 0.0618,0.8835 0.18927,2.42042 0.28335,3.41538 l 0.17105,1.80901 0.90674,-0.56039 0.90674,-0.5604 -0.56426,2.15775 -0.56427,2.15775 1.19761,-0.74016 1.1976,-0.74016 -0.62096,2.83379 -0.62097,2.83379 0.88527,-1.2425 0.88526,-1.24249 2.22875,4.58744 2.22875,4.58744 1.46687,-1.21739 z m -5.76684,-18.77138 -0.35558,1.06674 -1.62263,-1.62264 -1.62263,-1.62263 -1.51586,-6.7613 c -0.83372,-3.71871 -1.7836,-9.68629 -2.11085,-13.26129 l -0.595,-6.5 0.91943,-1.38314 0.91943,-1.38314 0.56837,2.88314 c 0.3126,1.58573 0.86947,5.58314 1.2375,8.88314 0.36802,3.3 1.53859,8.84274 2.60126,12.3172 1.06268,3.47445 1.77213,6.79722 1.57656,7.38392 z m 2.88965,-4.93209 -0.49805,1.23097 0.0371,-3 0.0371,-3 0.46099,1.76903 c 0.25354,0.97297 0.23687,2.32297 -0.0371,3 z M 664.5,-307.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 93.1042,-0.27083 0.6041,-0.60417 -0.5252,-1.3125 -0.5252,-1.3125 -0.079,1.91667 -0.079,1.91666 0.6042,-0.60416 z M 564.5,-308.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 102.82664,-3.25604 2.58905,-2.75603 7.29216,-3.35561 7.29215,-3.35561 8.5,-6.32066 8.5,-6.32066 7.3451,-8.9075 7.345,-8.90751 3.573,-2.10811 c 1.9651,-1.15945 4.2848,-2.16661 5.1549,-2.23812 0.8701,-0.0715 3.382,-0.49946 5.582,-0.95099 2.2,-0.45153 4.9,-0.97933 6,-1.1729 1.1,-0.19356 4.1857,-0.34158 6.8571,-0.32894 l 4.8572,0.023 1.8615,0.99623 1.8614,0.99623 2.6476,4.51765 c 1.4561,2.48471 3.2401,6.41393 3.9644,8.73161 l 1.317,4.21396 0.067,-1.62427 c 0.037,-0.89335 -0.584,-3.46918 -1.3796,-5.72406 l -1.4465,-4.09978 0.9465,-0.58496 c 0.5206,-0.32173 0.9465,-0.99428 0.9465,-1.49456 l 0,-0.9096 -1.5143,0.5811 -1.5143,0.58109 -3.8748,-4.36248 -3.8748,-4.36248 -5.3609,0.21923 c -2.9485,0.12057 -6.2609,0.34557 -7.3609,0.5 l -2,0.28077 -0.5033,-6.5 -0.5033,-6.5 -0.8047,5.63817 -0.8047,5.63817 -1.192,1.49912 -1.192,1.49913 -5.1934,1.67428 -5.1934,1.67428 -2.4884,1.95732 c -1.3686,1.07653 -5.4469,5.74624 -9.063,10.37714 l -6.5747,8.41982 -8.019,5.52393 c -4.41051,3.03816 -11.62729,7.40111 -16.0373,9.69545 l -8.0182,4.17153 -1.58751,3.11583 -1.5875,3.11583 2.58905,-2.75604 z M 563.5,-310.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 340.2123,-5.05021 2.4432,-4.90285 2.9047,-2.44414 c 1.5976,-1.34428 6.6022,-4.39234 11.1213,-6.77347 l 8.2165,-4.32933 5.5603,-5.65961 5.5602,-5.65961 4.3201,-8.10794 c 2.376,-4.45937 5.463,-9.4662 6.8598,-11.12631 1.3969,-1.6601 3.8362,-3.68876 5.4207,-4.50813 l 2.8809,-1.48976 0,-6.07319 0,-6.07319 -1.6221,-3.41824 -1.622,-3.41824 -5.3688,-5.73289 -5.3687,-5.73289 -3.4261,-7.11297 c -1.8843,-3.91213 -4.365,-10.26595 -5.5127,-14.11961 l -2.0866,-7.00663 -2.0613,-2.62044 -2.0612,-2.62044 -5.9888,-3.50995 -5.9889,-3.50996 -2.9862,0 -2.9863,0 -4.2101,2.09903 -4.2102,2.09904 -7.5,7.34941 -7.5,7.34941 -8.3729,4.61198 c -4.6051,2.53658 -10.7796,6.42902 -13.7211,8.64986 l -5.3481,4.03788 -3.0335,6.07039 -3.0334,6.07038 1.5045,2.33131 c 0.8275,1.28222 2.2113,3.42591 3.0753,4.76376 l 1.5707,2.43246 0.9409,10.00001 0.941,10.00002 1.9663,6.3662 1.9663,6.36621 5.1449,8.45132 c 2.8297,4.64823 5.7646,10.19541 6.522,12.32706 l 1.3771,3.87572 0,5.1293 0,5.12929 6.8694,-0.005 6.8693,-0.005 3.7652,2.67632 3.7652,2.67631 2.4432,-4.90284 z m 240.7877,4.05021 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -582,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 80,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 517.882,-1 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z m -17.882,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -498.83333,-1.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z M 1075.5,-316.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -316.8333,-2.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z M 1076.5,-319.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -433,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 434,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 60.2029,0 c 0.1634,0 0.2971,-0.13367 0.2971,-0.29705 0,-0.16338 -1.9125,-2.07588 -4.25,-4.25 l -4.25,-3.95295 3.9529,4.25 c 2.1742,2.3375 4.0867,4.25 4.25,4.25 z m -378.0362,-2.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m 254.8913,-0.66667 c 0.2086,0 0.089,-0.7875 -0.2658,-1.75 -0.3547,-0.9625 -1.643,-3.1 -2.8628,-4.75 -1.2199,-1.65 -4.7587,-7.57133 -7.8641,-13.15852 l -5.6461,-10.15852 -1.5936,-0.6115 -1.5935,-0.6115 2.4857,3.27002 c 1.3672,1.79851 3.2787,4.84502 4.2478,6.77002 0.9691,1.925 4.226,7.4375 7.2376,12.25 3.0116,4.8125 5.6463,8.75 5.8548,8.75 z m 63.942,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -437,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 438.1667,-1.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z M 641.5,-332.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 119,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 366.059,0 c 0.2426,0 0.441,-0.19844 0.441,-0.44098 0,-0.24254 -0.5195,-0.76207 -1.1545,-1.15451 l -1.1545,-0.71353 0.7135,1.15451 c 0.3924,0.63498 0.912,1.15451 1.1545,1.15451 z m -44.8923,-1.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m 42.8333,-1.66667 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -483.83333,-3.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z M 1122.5,-338.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -556.83333,-2.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z m 517.03723,-2.40292 c 0.2374,-1.22994 0.2435,-3.47994 0.014,-5 l -0.4179,-2.76375 -0.014,5 -0.014,5 0.4315,-2.23625 z m 37.7961,1.73625 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -552.89583,-1.27083 0.60416,-0.60417 -0.52522,-1.3125 -0.52522,-1.3125 -0.0789,1.91667 -0.0789,1.91666 0.60417,-0.60416 z M 1117.5,-345.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -478,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -72.83772,-2.75 0.50439,-1.25 -0.50439,-1.25 -0.50439,-1.25 0,2.5 0,2.5 0.50439,-1.25 z m 548.03392,-0.25 c 0.1671,0 0.3038,-0.13672 0.3038,-0.30383 0,-0.16711 -1.6875,-1.85461 -3.75,-3.75 l -3.75,-3.44617 3.4462,3.75 c 1.8954,2.0625 3.5829,3.75 3.75,3.75 z m -549.02953,-5.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z M 1083.5,-354.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 100,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -543.83333,-1.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z m 120.92193,-2.16667 c 0.914,-1.65 2.3929,-3.85482 3.2866,-4.89961 l 1.6248,-1.89961 9,-4.27727 9,-4.27727 4.6174,-3.82312 c 2.5396,-2.10272 8.2386,-7.04919 12.6645,-10.99217 4.4259,-3.94297 9.098,-7.73656 10.3826,-8.4302 1.2845,-0.69363 4.8105,-1.87495 7.8355,-2.62515 3.025,-0.7502 6.625,-1.53214 8,-1.73765 1.375,-0.20551 5.0093,-0.69051 8.0763,-1.07778 l 5.5763,-0.70412 3.526,3.09587 3.526,3.09587 5.1477,7.61973 c 2.8312,4.19086 5.1454,7.24011 5.1426,6.77611 0,-0.464 -1.1138,-2.64363 -2.4688,-4.84363 l -2.4637,-4 -0.031,-1.78138 -0.031,-1.78139 -1.4827,-0.56897 c -0.8155,-0.31293 -3.2841,-2.3704 -5.4859,-4.57215 l -4.0032,-4.0032 -6.7641,0.35355 -6.7641,0.35354 0.2213,-5 0.2213,-5 -1.3455,4.86321 -1.3454,4.8632 -1.3759,0.87148 c -0.7567,0.47932 -2.3066,0.87838 -3.4443,0.8868 -1.1377,0.008 -4.4363,0.71848 -7.3304,1.57791 l -5.2618,1.56261 -11.7327,11.27238 -11.7327,11.27239 -5.437,2.51736 c -2.9903,1.38455 -7.8147,3.56787 -10.7208,4.85183 l -5.2839,2.33446 -1.8521,3.06318 c -1.0186,1.68476 -2.1448,4.18819 -2.5026,5.56319 l -0.6506,2.5 1.6617,-3 z m -172.0886,1.5 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 405.35,-0.51667 0.5167,-0.51666 -1.1834,-1.18334 -1.1833,-1.18333 0,1.03333 c 0,0.56834 0.3,1.33334 0.6667,1.7 l 0.6666,0.66667 0.5167,-0.51667 z m -237.8009,-0.52397 c 0.302,0.0224 1.0875,-1.44824 1.7455,-3.26798 l 1.1964,-3.30862 2.8223,-2.70385 2.8222,-2.70384 8.2621,-3.43253 8.2622,-3.43254 4.1701,-3.46627 c 2.2935,-1.90645 8.0903,-7.30776 12.8816,-12.00292 l 8.7114,-8.53664 6.6439,-2.05209 c 3.6541,-1.12864 7.4642,-2.05208 8.4668,-2.05208 l 1.823,0 1.2427,-5.55322 1.2428,-5.55323 -2.7818,-9.63084 -2.7817,-9.63084 0.599,-4.37039 0.5991,-4.37039 4.5694,-6.40344 4.5694,-6.40343 0.8311,-2.89803 0.8311,-2.89802 -0.521,-2.72575 -0.5211,-2.72576 -2.1178,-0.82067 c -1.1648,-0.45138 -5.387,-1.55285 -9.3827,-2.44773 l -7.2648,-1.62705 -6.7352,2.44031 c -3.7043,1.34218 -13.2601,4.95984 -21.2351,8.03926 l -14.5,5.59894 -6.5765,0.87472 -6.5764,0.87472 -3.0435,1.57385 -3.0435,1.57386 -4.6166,5.13476 -4.6166,5.13476 -1.0773,4.1568 c -0.5924,2.28625 -2.3606,7.75681 -3.9292,12.15681 -1.5686,4.4 -3.4061,10.16535 -4.0835,12.81189 l -1.2315,4.8119 0.613,9.6881 c 0.3372,5.32846 1.3322,14.41311 2.2112,20.18811 l 1.5981,10.5 -0.3817,2.02239 -0.3816,2.0224 6.5678,-0.34615 6.5678,-0.34616 3.5,3.03312 c 1.925,1.66822 3.7471,3.05141 4.0491,3.07376 z m -14.3824,-36.29269 -0.6667,0.66666 0,-1.33333 0,-1.33333 0.6667,0.66666 0.6666,0.66667 -0.6666,0.66667 z m 0.3019,-3.66667 c -0.5672,0 -1.2847,-0.66015 -1.5943,-1.46701 l -0.563,-1.46701 0.5154,-1.28299 0.5154,-1.28299 0.094,2 0.094,2 0.9694,-1.5 0.9694,-1.5 0.015,2.25 0.015,2.25 -1.0314,0 z m -0.4686,-6 -1.5,0 0,-2.25 c 0,-1.2375 0.7775,-4.43307 1.7339,-7.10127 l 1.7389,-4.85127 3.9173,-3.10258 c 2.1546,-1.70642 3.7368,-2.66474 3.5161,-2.12961 -0.2207,0.53513 -1.8374,3.88937 -3.5925,7.45385 -1.7552,3.56448 -3.5142,7.38088 -3.9088,8.48088 -0.3946,1.1 -0.6461,2.3375 -0.5588,2.75 l 0.1539,0.75 -1.5,0 z m 9,-22 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 334,68 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 20.1224,-1 c 0.2077,0 0.3776,-0.1699 0.3776,-0.37756 0,-0.20765 -0.7875,-0.99515 -1.75,-1.75 l -1.75,-1.37244 1.3724,1.75 c 0.7549,0.9625 1.5424,1.75 1.75,1.75 z m -539.95573,-1.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z M 589.5,-359.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 496,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2.8145,-3.82569 2.3144,-2.17431 2.5507,0 2.5507,0 2.837,2.23159 2.837,2.23159 -0.8543,-1.48159 c -0.4698,-0.81488 -1.5305,-2.26909 -2.3571,-3.23159 l -1.5029,-1.75 -2.595,0.0316 -2.595,0.0316 -2.75,2.42044 c -1.5125,1.33123 -2.75,2.74545 -2.75,3.14271 0,0.39725 1.0415,-0.25616 2.3145,-1.45204 z M 563.5,-364.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 613,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -613.83333,-3.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z M 1084.5,-368.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 88.1224,-2 c 0.2077,0 0.3776,-0.1699 0.3776,-0.37756 0,-0.20765 -0.7875,-0.99515 -1.75,-1.75 l -1.75,-1.37244 1.3724,1.75 c 0.7549,0.9625 1.5424,1.75 1.75,1.75 z m -313.9185,-2.73625 c 0.2374,-1.22994 0.2435,-3.47994 0.014,-5 l -0.4179,-2.76375 -0.014,5 -0.014,5 0.4315,-2.23625 z m 125.2002,1.73625 c 0.3626,0 1.2551,-2.0178 1.9832,-4.484 l 1.324,-4.484 7.1444,-8.00283 7.1443,-8.00283 2.2622,-5.83401 2.2621,-5.83402 -0.2621,-10.58054 -0.2622,-10.58054 -0.6452,0.39564 -0.6452,0.39564 -0.6081,-1.5845 -0.608,-1.58449 0.6578,-1.06427 0.6577,-1.06427 -1.1662,0.72079 -1.1663,0.72078 -0.6132,-3.06627 -0.6133,-3.06628 -0.982,0 -0.982,0 0.5956,-1.55194 0.5955,-1.55194 -0.8133,0.50262 -0.8132,0.50261 -2.1977,-4.52354 -2.1977,-4.52354 1.1085,0.68509 c 0.6097,0.3768 -0.5053,-1.6108 -2.4776,-4.41688 C 990.6137,-456.25 989,-458.80206 989,-459.11516 l 0,-0.56927 1.25,0.71934 1.25,0.71934 -0.6667,-0.74366 c -0.3666,-0.40901 -1.0416,-0.75832 -1.5,-0.77623 -0.4583,-0.0179 -2.3227,-1.34033 -4.1432,-2.93869 l -3.3098,-2.9061 -0.8711,0.53833 -0.871,0.53832 -0.7236,-1.17082 -0.7236,-1.17082 1.309,0.80902 1.309,0.80902 -0.7135,-1.15451 -0.7135,-1.15451 -3.1266,0 -3.1265,0 -2.3568,-2.2141 -2.3568,-2.2141 -1.8156,1.13389 -1.8157,1.13388 -2.0245,-2.02447 -2.0244,-2.02448 -2.0667,0.65592 c -1.1366,0.36075 -3.4871,1.98286 -5.2232,3.60469 -1.7362,1.62182 -3.5591,2.94877 -4.051,2.94877 -0.4918,0 -0.8942,0.39398 -0.8942,0.87552 0,0.48154 -2.9305,4.14368 -6.5122,8.1381 l -6.5122,7.26257 -1.5832,5.44592 -1.5832,5.44593 1.9705,2.16598 c 1.0837,1.19129 2.4896,3.17321 3.1243,4.40427 0.6346,1.23107 2.0734,5.28107 3.1973,9 l 2.0434,6.76171 2.7933,4 c 1.5362,2.2 3.1372,5.1013 3.5576,6.44734 l 0.7644,2.44734 4.7447,5.05266 4.7447,5.05266 2.1393,4.23769 2.1394,4.2377 0.6337,6.06261 0.6336,6.06261 1.6023,-0.65445 c 0.8813,-0.35995 2.9473,-1.05701 4.5912,-1.54902 l 2.9889,-0.89456 3.1811,1.04986 c 1.7496,0.57743 3.7222,1.70185 4.3836,2.49871 0.6613,0.79687 1.499,1.44885 1.8616,1.44885 z m -7.1609,-35.32827 -0.4337,1.82827 -0.7783,-1.79313 -0.7783,-1.79313 0.6236,-0.62353 0.6235,-0.62354 0.5884,0.58839 0.5884,0.5884 -0.4336,1.82827 z m -3.0765,-2.00506 -0.6667,0.66666 0,-1.33333 0,-1.33333 0.6667,0.66666 0.6666,0.66667 -0.6666,0.66667 z M 971.5,-410.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 16,39 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -425.83333,-1.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z m 539.99563,-0.41667 0.5044,-1.25 -0.5044,-1.25 -0.5044,-1.25 0,2.5 0,2.5 0.5044,-1.25 z m -505.1623,-0.25 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 392,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 94,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 86.155,0 c 0.1897,0 0.345,-0.15526 0.345,-0.34501 0,-0.18976 -1.0125,-1.20226 -2.25,-2.25 l -2.25,-1.90499 1.905,2.25 c 1.0477,1.2375 2.0602,2.25 2.25,2.25 z m -568.83023,-2.7647 c 1.55363,-0.95441 4.36613,-3.52828 6.25,-5.71969 l 3.42523,-3.9844 -6.25,5.38436 c -3.4375,2.9614 -6.25,5.53527 -6.25,5.7197 0,0.18443 1.27115,-0.44555 2.82477,-1.39997 z M 989.5,-376.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 92.1743,0 c 0.1791,0 0.3257,-0.14656 0.3257,-0.32569 0,-0.17912 -1.2375,-1.41662 -2.75,-2.75 l -2.75,-2.42431 2.4243,2.75 c 1.3334,1.5125 2.5709,2.75 2.75,2.75 z m -534.92499,-2.25623 0.42151,-0.75623 0.74792,0.46224 0.74793,0.46224 0,-1.45601 0,-1.45601 -0.83334,0 c -0.45833,0 -0.83333,0.1882 -0.83333,0.41821 0,0.23002 -0.15125,1.01752 -0.3361,1.75 -0.18486,0.73249 -0.14643,0.99149 0.0854,0.57556 z m 184.91739,-0.0771 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m 264.215,-5.76794 6.1113,-6.39873 3.1505,-6.26969 3.1504,-6.2697 -0.541,-0.54106 -0.5411,-0.54106 -1.8288,4.81075 -1.8288,4.81076 -5.6625,6.10156 c -3.1143,3.35586 -6.2157,7.13529 -6.8919,8.39873 l -1.2294,2.29716 6.1113,-6.39872 z m -437.21503,4.76794 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z m -14.02814,-1.3582 1.45161,-0.55704 -1.94181,-1.36009 -1.94181,-1.3601 -0.48078,-8.26562 c -0.26442,-4.54609 -0.80264,-9.23708 -1.19604,-10.42443 l -0.71527,-2.1588 1.36505,-0.3412 1.36504,-0.34119 -1.06579,-4.95211 -1.06578,-4.95212 -2.26415,3.66347 -2.26415,3.66347 0.99767,3.61324 0.99766,3.61324 -0.60993,1.58945 -0.60993,1.58945 1.17181,-0.72422 1.17182,-0.72422 0.99812,2.62528 c 0.54897,1.4439 0.96158,3.15847 0.91691,3.81017 l -0.0812,1.1849 -1.37367,-3 c -0.75553,-1.65 -1.39398,-2.51766 -1.41879,-1.92814 -0.0248,0.58952 0.66729,3.28952 1.538,6 0.8707,2.71048 2.03776,6.13538 2.59346,7.61089 l 1.01037,2.68275 1.4516,-0.55703 z m 417.02817,-0.6418 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m 140.8333,0.33333 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -539.11803,-1 c 0.275,0 0.77811,-0.45 1.11803,-1 0.33992,-0.55 0.39303,-1 0.11803,-1 -0.275,0 -0.77811,0.45 -1.11803,1 -0.33992,0.55 -0.39303,1 -0.11803,1 z m 511.11803,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -526.99738,-2.00218 1.36882,-1.13602 0.6407,-2.91706 0.64069,-2.91707 3.01396,1.55858 3.01395,1.55858 -0.71868,-2.32242 c -0.39527,-1.27732 -1.55451,-3.97938 -2.57608,-6.00456 -1.02157,-2.02518 -2.26302,-3.93284 -2.75879,-4.23924 l -0.90138,-0.55709 0.0446,1.23924 c 0.0245,0.68158 -0.0611,2.13924 -0.19041,3.23924 l -0.23504,2 -1.84499,-5 c -1.01475,-2.75 -1.87987,-4.45162 -1.9225,-3.78138 l -0.0775,1.21861 -1.51865,-0.58276 -1.51864,-0.58276 1.08098,2.8432 1.08098,2.8432 -0.65985,4.79765 -0.65984,4.79765 1.66441,2.54022 1.66441,2.54021 1.36882,-1.13602 z m -0.003,-7.99782 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -1,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -1,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 4,15 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 7.5,0 c 0.55,0 1,-0.19844 1,-0.44098 0,-0.24254 -0.45,-0.7191 -1,-1.05902 l -1,-0.61803 0,1.05901 0,1.05902 1,0 z m 173.6667,-1.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m 340.8923,0.33333 c 0.2426,0 0.441,-0.19844 0.441,-0.44098 0,-0.24254 -0.5195,-0.76207 -1.1545,-1.15451 l -1.1545,-0.71353 0.7135,1.15451 c 0.3924,0.63498 0.912,1.15451 1.1545,1.15451 z m -520.89233,-1.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z M 960.5,-385.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 143,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -548.69098,-1.01531 c 0.16996,0.008 0.0309,-0.43469 -0.30902,-0.98469 -0.33992,-0.55 -1.15398,-0.99311 -1.80902,-0.98469 l -1.19098,0.0153 1.5,0.96937 c 0.825,0.53316 1.63906,0.97627 1.80902,0.98469 z m 56.34235,-0.98469 c 0.275,0 1.55688,-1.125 2.84863,-2.5 1.29175,-1.375 2.12363,-2.5 1.84863,-2.5 -0.275,0 -1.55688,1.125 -2.84863,2.5 -1.29175,1.375 -2.12363,2.5 -1.84863,2.5 z m -77.65137,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 425,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 146.2234,-3.75 c 0.2218,-1.7875 0.2218,-4.7125 0,-6.5 l -0.4033,-3.25 0,6.5 0,6.5 0.4033,-3.25 z m -375.0611,1 0.5044,-1.25 -0.5044,-1.25 -0.5044,-1.25 0,2.5 0,2.5 0.5044,-1.25 z m 228.1278,0.75 c 0.275,0 -1.8153,-2.44806 -4.645,-5.44014 l -5.1451,-5.44014 0,-1.30986 c 0,-0.72042 -0.9263,-2.82311 -2.0539,-4.67264 l -2.0502,-3.36278 -0.5158,0.51587 -0.5159,0.51588 2.1802,4.27353 2.1802,4.27353 5.0346,5.32338 c 2.769,2.92785 5.2596,5.32337 5.5346,5.32337 z m 105.8323,-1 c 0.2077,0 0.3776,-0.1699 0.3776,-0.37756 0,-0.20765 -0.7875,-0.99515 -1.75,-1.75 l -1.75,-1.37244 1.3724,1.75 c 0.7549,0.9625 1.5424,1.75 1.75,1.75 z m -443.1224,-4 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 233,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -2.9405,-3 c 0.1373,0 1.6069,-2.40499 3.2658,-5.34442 l 3.0162,-5.34441 3.0648,-2.57886 c 1.6856,-1.41838 8.3588,-5.8264 14.8292,-9.7956 l 11.7645,-7.21674 6.5,-6.61196 6.5,-6.61196 4.4857,-1.58576 4.4857,-1.58575 0.8779,-4.41227 0.8778,-4.41227 -1.7304,-10.12581 -1.7305,-10.12581 0.3881,-4.06868 0.388,-4.06868 -3.8008,-2.13617 -3.8009,-2.13618 -8.7203,-0.82657 c -4.7962,-0.45461 -9.1938,-0.98081 -9.7725,-1.16933 l -1.0522,-0.34277 -5.1978,2.42094 c -2.8588,1.33151 -5.1978,2.78246 -5.1978,3.22432 0,0.44186 -1.3995,1.5271 -3.1101,2.41166 l -3.11,1.60827 0.662,-1.07114 0.662,-1.07114 -1.5203,0.5834 c -0.8362,0.32087 -1.4221,0.94223 -1.302,1.38081 l 0.2184,0.79741 -5.8768,5.16774 c -3.2322,2.84226 -6.9587,5.87669 -8.2812,6.74319 l -2.4044,1.57546 -0.5146,-0.51463 -0.5147,-0.51462 5.7959,-5.2751 5.7958,-5.2751 -3.5,2.34094 c -1.925,1.28751 -6.0875,4.55146 -9.25,7.25321 l -5.75,4.91227 0,1.854 c 0,1.0197 -0.5505,3.11268 -1.2234,4.65106 -0.6728,1.53838 -2.4233,4.37205 -3.89,6.29705 l -2.6667,3.5 -1.2834,6.69989 -1.2835,6.69989 1.9235,6.30011 1.9235,6.30011 0,7.57943 0,7.57944 4.5844,-0.44075 4.5844,-0.44075 2.918,1.50893 c 1.6048,0.82992 3.7741,2.45501 4.8205,3.61132 1.0465,1.15631 2.015,2.10238 2.1522,2.10238 z m 0.1072,-35.33333 -0.6667,0.66666 0,-1.33333 0,-1.33333 0.6667,0.66666 0.6666,0.66667 -0.6666,0.66667 z M 862.5,-437.5664 c -0.825,0 -1.5,-0.17686 -1.5,-0.39301 0,-0.21616 0.675,-0.65203 1.5,-0.96862 l 1.5,-0.5756 0,0.96861 0,0.96862 -1.5,0 z m -17,-12 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0.6927,-4 -0.8073,0 0.1986,-2.86935 0.1987,-2.86935 1.658,-2.53041 1.658,-2.53041 4.0424,-2.67515 c 2.2233,-1.47133 4.2414,-2.47617 4.4846,-2.23297 0.2432,0.2432 -1.2983,2.63941 -3.4256,5.32491 -2.1273,2.6855 -4.6176,5.50033 -5.534,6.25517 l -1.6661,1.37245 0,1.37755 0,1.37756 -0.8073,0 z m 6.3073,-9 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,63 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -231.12244,-1 c 0.20765,0 0.99515,-0.7875 1.75,-1.75 l 1.37244,-1.75 -1.75,1.37244 c -0.9625,0.75485 -1.75,1.54235 -1.75,1.75 0,0.20766 0.1699,0.37756 0.37756,0.37756 z m 232.12244,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 199.059,0 c 0.2426,0 0.441,-0.19844 0.441,-0.44098 0,-0.24254 -0.5195,-0.76207 -1.1545,-1.15451 l -1.1545,-0.71353 0.7135,1.15451 c 0.3924,0.63498 0.912,1.15451 1.1545,1.15451 z m -506.059,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 112,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 199.3033,-3.63289 c 2.3088,-2.2731 7.01,-5.91277 10.4472,-8.08817 3.4372,-2.1754 8.8446,-5.4778 12.0165,-7.33867 l 5.7669,-3.38341 7.9474,-7.77843 7.9474,-7.77843 -1.2046,0 -1.2046,0 -6.0098,6.35321 -6.0097,6.35322 -12.5,7.76519 c -6.875,4.27085 -13.5565,8.72441 -14.8478,9.89678 -1.2912,1.17238 -3.2925,3.4816 -4.4472,5.1316 l -2.0995,3 4.1978,-4.13289 z M 547.5,-404.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 113,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -116,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2.52126,-1.0344 0.80261,-1.29865 -0.82317,-2.08348 c -0.45275,-1.14591 -1.44146,-3.51977 -2.19714,-5.27524 l -1.37395,-3.19178 -0.98536,0.69178 -0.98536,0.69177 1.05697,4.29691 1.05698,4.29691 0.62228,-0.62227 0.62227,-0.62227 0.70063,2.20749 0.70063,2.20749 0.80261,-1.29866 z M 546.5,-408.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 183,2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 321.059,0 c 0.2426,0 0.441,-0.19844 0.441,-0.44098 0,-0.24254 -0.5195,-0.76207 -1.1545,-1.15451 l -1.1545,-0.71353 0.7135,1.15451 c 0.3924,0.63498 0.912,1.15451 1.1545,1.15451 z m -418.059,-2.20667 3,-1.51572 9,-0.77666 c 4.95,-0.42717 9.99,-0.82713 11.2,-0.88881 l 2.2,-0.11214 -0.89327,-0.89327 c -0.4913,-0.4913 -2.27431,-1.00191 -3.96225,-1.1347 l -3.06897,-0.24142 -0.54677,0.88469 -0.54677,0.8847 -4.69099,0.006 -4.69098,0.006 -3.64176,1.01154 -3.64176,1.01155 -1.35824,1.63741 -1.35824,1.63741 3,-1.51573 z m 27,1.20667 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 3.10417,-2.27083 0.60416,-0.60417 -0.52522,-1.3125 -0.52522,-1.3125 -0.0789,1.91667 -0.0789,1.91666 0.60417,-0.60416 z m 471.05083,0.27083 c 0.1897,0 0.345,-0.15526 0.345,-0.34501 0,-0.18976 -1.0125,-1.20226 -2.25,-2.25 l -2.25,-1.90499 1.905,2.25 c 1.0477,1.2375 2.0602,2.25 2.25,2.25 z m -472.52312,-6.76552 c 0.34754,-2.60396 1.18138,-5.91516 1.85299,-7.35822 l 1.22111,-2.62374 3.70235,-2.08084 c 2.0363,-1.14447 5.41624,-3.44286 7.51098,-5.10756 2.09474,-1.66469 6.15953,-4.13886 9.03286,-5.49817 2.87334,-1.3593 8.74943,-3.65484 13.05813,-5.1012 l 7.8338,-2.62973 7.5238,-0.24993 7.5237,-0.24994 3.2788,-5.91757 3.2788,-5.91758 0.551,-4.5 c 0.3031,-2.475 1.0028,-6.77756 1.5549,-9.56124 l 1.0038,-5.06124 2.434,-3.58183 2.4339,-3.58183 4.5347,-2.19522 4.5347,-2.19522 4.6818,-5.48013 4.6818,-5.48012 3.4417,-1.76569 3.4417,-1.76569 -5.9372,-1.66589 -5.9372,-1.6659 -3.6724,0 -3.6725,0 -9.3654,3 c -5.1509,1.65 -10.0112,3 -10.8005,3 -0.7893,0 -3.1492,0.8739 -5.2442,1.942 -2.095,1.0681 -5.2277,2.278 -6.9615,2.68867 -1.7338,0.41067 -3.7482,0.63438 -4.4765,0.49713 -0.7283,-0.13725 -1.8533,0.15427 -2.5,0.64783 -0.6467,0.49356 -3.7382,1.91302 -6.87,3.15437 l -5.69421,2.257 -1.12311,-0.69412 -1.1231,-0.69411 -0.51847,1.85061 -0.51848,1.85062 -5.16421,2.42851 -5.16422,2.42851 -6.61761,6.58565 -6.6176,6.58565 -4.57436,7.07123 -4.57436,7.07124 -1.3806,5.97602 -1.38059,5.97602 1.57256,13.45747 1.57256,13.45748 1.75399,-0.34298 1.75398,-0.34298 1.74602,3.05857 1.74601,3.05858 0.63188,-4.73449 z M 667.5,-449.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -3.11803,-1 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 3.11803,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 2,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 5.57063,-2.11428 -0.82063,1.32781 -0.64131,-1.03767 -0.64131,-1.03766 1.08284,-0.66924 c 0.59556,-0.36808 1.25344,-0.49864 1.46194,-0.29014 0.2085,0.20851 0.01,0.97661 -0.44153,1.7069 z m 1.32238,-4.88572 c -0.21615,0 -0.39301,-0.42344 -0.39301,-0.94098 0,-0.51754 0.44485,-1.21592 0.98855,-1.55194 l 0.98854,-0.61096 -0.59553,1.55194 c -0.32755,0.85357 -0.77239,1.55194 -0.98855,1.55194 z m 370.10699,50 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -315.8333,-1.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z M 942.5,-412.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 65.1559,-0.73097 c 0.274,-0.67703 0.2906,-2.02703 0.037,-3 l -0.461,-1.76903 -0.037,3 -0.037,3 0.498,-1.23097 z m 36.9031,-0.26903 c 0.2426,0 0.441,-0.19844 0.441,-0.44098 0,-0.24254 -0.5195,-0.76207 -1.1545,-1.15451 l -1.1545,-0.71353 0.7135,1.15451 c 0.3924,0.63498 0.912,1.15451 1.1545,1.15451 z m 82.941,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -298.8377,-2.75 0.5044,-1.25 -0.5044,-1.25 -0.5044,-1.25 0,2.5 0,2.5 0.5044,-1.25 z m 111.8377,0.75 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 101,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 82,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -85,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 83,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -457,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 372,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 83,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -85,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 83,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -449.90013,-2.84253 c 1.59507,-1.23382 4.02513,-3.13539 5.40013,-4.22571 l 2.5,-1.98239 -4.92539,2.80148 -4.92539,2.80149 -0.47474,1.42422 -0.47474,1.42422 2.90013,-2.24331 z M 1007.5,-421.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 108,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -287.855,-1.31169 c 0.2189,-0.21887 -0.033,-1.47578 -0.5601,-2.79313 l -0.9581,-2.39518 -0.063,1.16821 c -0.035,0.64252 0.2172,1.89943 0.5601,2.79313 0.343,0.8937 0.8027,1.44584 1.0215,1.22697 z m 110.855,0.31169 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 89,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 86,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -3,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -99.6536,-3.17394 2.8464,-2.32606 -0.9042,-0.35262 -0.9043,-0.35262 -1.9422,1.75761 c -1.0681,0.96668 -1.9421,2.17209 -1.9421,2.67868 l 0,0.92107 2.8464,-2.32606 z m 12.6536,2.17394 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 85,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -457.83333,-1.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z M 1105.5,-425.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -3,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -9.75,-1.01531 c 0.4125,-0.008 1.4193,-0.4385 2.2374,-0.95574 l 1.4874,-0.94042 -2.2374,0.16854 -2.2374,0.16854 0,0.78719 c 0,0.43296 0.3375,0.78031 0.75,0.77189 z m 6.75,0.0153 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -273.8333,-1.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m -149.28914,-0.66667 c 0.20765,0 0.99515,-0.7875 1.75,-1.75 l 1.37244,-1.75 -1.75,1.37244 c -0.9625,0.75485 -1.75,1.54235 -1.75,1.75 0,0.20766 0.1699,0.37756 0.37756,0.37756 z m 328.12244,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 16,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -194.9412,-6.5 c 0.7447,-3.3 1.3593,-6.675 1.3658,-7.5 l 0.012,-1.5 -1.4682,1.94113 -1.4682,1.94113 0.1025,5.55887 0.1024,5.55887 1.3539,-6 z m -134.8088,-0.0891 10.75,-4.39098 5.5,-1.01144 c 3.025,-0.5563 7.3,-1.16014 9.5,-1.34187 l 4,-0.33041 -6.3734,-0.16811 -6.3733,-0.1681 -10.5665,3.53577 -10.56648,3.53577 -3.31016,2.04579 c -1.82059,1.12519 -3.31016,2.18952 -3.31016,2.36518 0,0.17566 4.8375,-1.65656 10.75,-4.07159 z m 243.75,4.5891 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -285,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 353.1667,-1.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z M 930.5,-436.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 89.1042,-0.27083 0.6041,-0.60417 -0.5252,-1.3125 -0.5252,-1.3125 -0.079,1.91667 -0.079,1.91666 0.6042,-0.60416 z M 737.441,-438.5664 c 0.2425,0 0.7191,-0.45 1.059,-1 l 0.618,-1 -1.059,0 -1.059,0 0,1 c 0,0.55 0.1984,1 0.441,1 z m -87.77433,-1.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z M 930.5,-439.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 71,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -96,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 17.059,0 c 0.2426,0 0.441,-0.19844 0.441,-0.44098 0,-0.24254 -0.5195,-0.76207 -1.1545,-1.15451 l -1.1545,-0.71353 0.7135,1.15451 c 0.3924,0.63498 0.912,1.15451 1.1545,1.15451 z m -15.059,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 91,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -265,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 174.882,0 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z m 9.118,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 12,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -207.8958,-1.27083 0.6041,-0.60417 -0.5252,-1.3125 -0.5252,-1.3125 -0.079,1.91667 -0.079,1.91666 0.6042,-0.60416 z m 1.8958,0.27083 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 15.6989,-4.30038 c 1.5114,-2.28304 3.7725,-4.96473 5.0246,-5.95931 1.2521,-0.99459 3.9436,-2.69176 5.9811,-3.7715 l 3.7047,-1.96316 6.98,-0.98995 6.98,-0.98994 12.3154,-4.58684 c 6.7734,-2.52276 15.4653,-5.74514 19.3153,-7.16086 l 7,-2.57402 5.3021,-0.27114 5.3021,-0.27114 2.5133,-1.64677 2.5133,-1.64677 5.4921,-8.42565 5.4921,-8.42565 4.6925,-2.68643 c 2.5809,-1.47753 4.8364,-2.78773 5.0123,-2.91155 0.1758,-0.12382 -0.5926,-2.01351 -1.7078,-4.19932 l -2.0274,-3.97418 -12.2923,-0.67496 c -6.7608,-0.37123 -17.4673,-0.85929 -23.7923,-1.08457 l -11.5,-0.4096 -5.7861,1.49857 -5.786,1.49857 -1.214,-0.69705 -1.2139,-0.69705 0.7972,0.87416 0.7971,0.87415 -5.2971,1.86682 c -2.9135,1.02675 -6.5402,2.10741 -8.0594,2.40146 l -2.7623,0.53465 -0.6369,1.03055 -0.6369,1.03055 2.6491,-0.64585 c 1.4571,-0.35521 3.8867,-0.8942 5.3992,-1.19775 l 2.75,-0.55191 -2.5,1.42158 c -1.375,0.78187 -4.911,2.02773 -7.8578,2.76858 l -5.3578,1.34701 -4.3758,5.12193 -4.3758,5.12194 -1.5012,3.59301 c -0.8257,1.97615 -1.9881,3.89384 -2.583,4.26152 l -1.0817,0.66852 -0.6383,-0.6383 -0.6383,-0.6383 1.118,-2.96184 c 0.6149,-1.629 0.9614,-2.96183 0.7699,-2.96183 -0.1914,0 -1.5647,0.46259 -3.0518,1.02798 l -2.7038,1.02798 0.6479,0.64783 0.6478,0.64784 -1.9084,2.07418 -1.9084,2.07419 -1.6008,4.78495 c -0.8804,2.63172 -1.6007,5.92738 -1.6007,7.32368 l 0,2.53874 -2.5713,7.65976 c -1.4142,4.21287 -3.0562,8.24404 -3.6489,8.95817 l -1.0776,1.29841 2.714,-1.03186 c 1.4927,-0.56752 3.3806,-1.03185 4.1954,-1.03185 l 1.4814,0 1.6789,2.9253 1.6789,2.9253 2.7481,-4.15098 z M 751.5,-474.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 2.3845,-1 c -0.3688,0 -0.9212,-0.65325 -1.2276,-1.45167 l -0.557,-1.45166 3.1037,-1.54834 c 1.707,-0.85158 3.2595,-1.54833 3.45,-1.54833 0.1905,0 0.3464,0.64948 0.3464,1.4433 l 0,1.44329 -2.2225,1.55671 c -1.2224,0.85618 -2.5242,1.5567 -2.893,1.5567 z m 162.5322,30.92105 1.9166,0.0789 -0.6041,-0.60417 -0.6042,-0.60416 -1.3125,0.52522 -1.3125,0.52522 1.9167,0.0789 z m 81.0833,0.079 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 145.1901,0 c 0.1261,0 0.135,-1.30616 0.02,-2.90257 l -0.2097,-2.90257 -0.6387,0.39281 -0.6387,0.39281 -3.0095,-6.24024 c -1.6552,-3.43213 -3.2215,-7.18883 -3.4805,-8.34821 l -0.4711,-2.10796 0.919,-1.64204 0.9189,-1.64203 -0.9413,0 -0.9413,0 -0.6298,-2.5092 -0.6297,-2.5092 -4.2287,-3.08373 c -2.3257,-1.69605 -6.3294,-4.15589 -8.897,-5.4663 -2.5676,-1.31042 -9.0926,-4.14044 -14.5,-6.28895 -5.4074,-2.1485 -12.3494,-4.46554 -15.4268,-5.14898 l -5.5952,-1.24261 -2.9048,1.82182 c -1.5976,1.00201 -3.0505,1.91621 -3.2285,2.03156 -0.1781,0.11535 0.4494,1.71405 1.3945,3.55266 0.945,1.83861 3.4211,5.85844 5.5024,8.93295 l 3.784,5.59002 7.8214,2.78896 7.8214,2.78896 13.0611,7.44359 c 7.1835,4.09398 15.7247,9.43594 18.9803,11.87102 3.2556,2.43509 6.0225,4.42743 6.1487,4.42743 z m -9.2967,-21.99341 -0.9934,0.99341 -1.2,-1.2 c -0.66,-0.66 -1.2,-1.77463 -1.2,-2.47695 l 0,-1.27694 -2.75,-1.73019 c -1.5125,-0.9516 -4.1,-2.82784 -5.75,-4.16942 l -3,-2.43924 2.5,0.77757 c 1.375,0.42766 3.625,1.5774 5,2.55499 1.375,0.97759 3.8245,3.17151 5.4434,4.8754 l 2.9434,3.09797 -0.9934,0.9934 z M 728.5,-445.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 5.809,-0.0153 0.809,0.0153 -0.618,-1 -0.618,-1 -1.691,0.0153 -1.691,0.0153 1.5,0.9694 c 0.825,0.53316 1.8641,0.97627 2.309,0.98469 z m 8.191,0.0153 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 190,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 64,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -274,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 19.6514,0 c 0.275,0 1.5569,-1.125 2.8486,-2.5 1.2917,-1.375 2.1236,-2.5 1.8486,-2.5 -0.275,0 -1.5569,1.125 -2.8486,2.5 -1.2917,1.375 -2.1236,2.5 -1.8486,2.5 z m 167.5153,-0.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m 85.8333,0.33333 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -64,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 61,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -163,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 103,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 139.1667,-0.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m -541.10768,-0.66667 c 0.24254,0 0.44098,-0.19844 0.44098,-0.44098 0,-0.24254 -0.51953,-0.76207 -1.15451,-1.15451 l -1.15451,-0.71353 0.71353,1.15451 c 0.39244,0.63498 0.91197,1.15451 1.15451,1.15451 z m 193.94098,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 24,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 242,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 150,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -390,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2.5,-1 1.3333,0 -0.6666,-0.66667 -0.6667,-0.66666 -0.6667,0.66666 -0.6666,0.66667 1.3333,0 z m 3,-1 1.3333,0 -0.6666,-0.66667 -0.6667,-0.66666 -0.6667,0.66666 -0.6666,0.66667 1.3333,0 z m 75.5,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 239,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 69,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -375.0833,-1.07895 1.9166,0.0789 -0.6041,-0.60417 -0.6042,-0.60416 -1.3125,0.52522 -1.3125,0.52522 1.9167,0.0789 z M 729.5,-459.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 42,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 301,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 69,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -367,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 58.8834,0 c 0.2109,0 0.5985,-1.125 0.8614,-2.5 l 0.4779,-2.5 -0.8614,0 -0.8613,0 0,2.5 c 0,1.375 0.1725,2.5 0.3834,2.5 z m 76.2833,-0.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m 159.8923,0.33333 c 0.2426,0 0.441,-0.19844 0.441,-0.44098 0,-0.24254 -0.5195,-0.76207 -1.1545,-1.15451 l -1.1545,-0.71353 0.7135,1.15451 c 0.3924,0.63498 0.912,1.15451 1.1545,1.15451 z m 68.941,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -361,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 208.1743,0 c 0.1791,0 0.3257,-0.14656 0.3257,-0.32569 0,-0.17912 -1.2375,-1.41662 -2.75,-2.75 l -2.75,-2.42431 2.4243,2.75 c 1.3334,1.5125 2.5709,2.75 2.75,2.75 z m -257.1743,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 52,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 8,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 48,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 72.1667,-0.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m 227.8333,0.33333 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -303.7595,-1 c 0.1427,0 0.2595,-0.62686 0.2595,-1.39301 l 0,-1.39301 -1.4854,-0.56999 -1.4853,-0.56999 1.2259,1.963 c 0.6742,1.07965 1.3426,1.963 1.4853,1.963 z M 514,-468.75991 c 0.275,0.0574 -0.52143,-0.66302 -1.76983,-1.60103 -1.24841,-0.938 -5.23572,-4.71124 -8.86069,-8.38497 l -6.59084,-6.67952 -1.80957,0.13631 -1.80956,0.13631 2.82598,3.54321 c 1.55429,1.94876 3.6559,4.37882 4.67024,5.40013 1.01435,1.02132 4.31927,3.09178 7.34427,4.60103 3.025,1.50926 5.725,2.7911 6,2.84853 z m 281.5,0.19351 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 45.8776,-1 c 0.2076,0 0.9951,-0.7875 1.75,-1.75 l 1.3724,-1.75 -1.75,1.37244 c -0.9625,0.75485 -1.75,1.54235 -1.75,1.75 0,0.20766 0.1699,0.37756 0.3776,0.37756 z m -111.8776,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 95,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 83.1667,-0.33333 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z M 805.5,-472.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 17.1334,-0.0703 c 0.073,0.0387 0.3427,-1.02426 0.5984,-2.36204 l 0.465,-2.43232 -2.2491,1.68232 -2.249,1.68233 1.6506,0.67971 c 0.9079,0.37385 1.7107,0.71135 1.7841,0.75 z M 809.5,-473.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -310.25,-1.06339 c 0.4125,0.0349 0.75,-0.10847 0.75,-0.31852 0,-0.21005 -1.99383,-2.55346 -4.43073,-5.20757 l -4.43073,-4.82567 0.58524,-0.94694 0.58524,-0.94693 -1.0412,0.6435 -1.04121,0.6435 -1.23575,-1.48899 -1.23575,-1.48899 0.79676,0 c 0.43822,0 -0.27258,-1.13826 -1.57956,-2.52947 l -2.37632,-2.52948 -1.18318,0.45403 -1.18318,0.45403 -2.62882,-2.74389 -2.62881,-2.74389 0.68067,-0.68066 0.68066,-0.68067 -1.58994,0 -1.58994,0 -3.07941,-2.59115 -3.07941,-2.59115 0.47911,-0.7752 0.4791,-0.77521 -1.90062,-1.72003 -1.90061,-1.72003 0.23955,1.63218 0.23956,1.63219 8.99663,9.2042 c 4.94814,5.06231 11.17522,11.83172 13.83794,15.04313 l 4.84131,5.83894 2.0967,0.84768 c 1.15319,0.46622 2.4342,0.8762 2.8467,0.91106 z m -11.48423,-13.93661 c -0.29931,0 -1.60655,-0.88503 -2.90499,-1.96673 l -2.36078,-1.96673 1.09501,-0.0333 c 0.60226,-0.0183 1.9095,0.86673 2.90499,1.96673 0.99549,1.1 1.56508,2 1.26577,2 z m -20.26577,-18 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 380,32 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -203,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 88,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -225,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 139,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 85,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 124,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -351.83045,-1 c 0.19776,0 -0.69143,-1.66065 -1.97599,-3.69033 l -2.33556,-3.69034 -1.429,-0.3677 -1.429,-0.36771 1.75,1.10773 c 0.9625,0.60925 1.75,1.61244 1.75,2.2293 0,0.61686 0.74474,1.9445 1.65499,2.95031 0.91024,1.00581 1.81679,1.82874 2.01456,1.82874 z m 145.83045,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 202,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 5.882,0 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z m -205.882,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 172,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 82,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -174,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 131,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -206,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 208,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -206,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -169,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 171,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 12.5,0 1.33333,0 -0.66666,-0.66667 -0.66667,-0.66666 -0.66667,0.66666 -0.66666,0.66667 1.33333,0 z m -181.5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 172,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 12,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -5.5,-1 1.33333,0 -0.66666,-0.66667 -0.66667,-0.66666 -0.66667,0.66666 -0.66666,0.66667 1.33333,0 z m 197.5,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -375.94098,-1 c 0.24254,0 0.44098,-0.19844 0.44098,-0.44098 0,-0.24254 -0.51953,-0.76207 -1.15451,-1.15451 l -1.15451,-0.71353 0.71353,1.15451 c 0.39244,0.63498 0.91197,1.15451 1.15451,1.15451 z m 182.94098,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -187.76787,-1 c 0.14733,0 0.26787,-0.12054 0.26787,-0.26787 0,-0.14732 -4.8375,-4.98482 -10.75,-10.75 l -10.75,-10.48213 10.48213,10.75 c 5.76518,5.9125 10.60268,10.75 10.75,10.75 z m 189.76787,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 194,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -187.11803,-1 c 0.275,0 0.77811,-0.45 1.11803,-1 0.33992,-0.55 0.39303,-1 0.11803,-1 -0.275,0 -0.77811,0.45 -1.11803,1 -0.33992,0.55 -0.39303,1 -0.11803,1 z m 3.11803,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2.5,-1 1.3333,0 -0.6666,-0.66667 -0.6667,-0.66666 -0.6667,0.66666 -0.6666,0.66667 1.3333,0 z m 141.5,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -193,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 50,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 146,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -194,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 55.5,-0.29966 5.5,0 -2.75,-0.41659 c -1.5125,-0.22913 -3.9875,-0.22913 -5.5,0 l -2.75,0.41659 5.5,0 z m 8.5,-0.70034 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 134,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -131,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -65,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 67,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 3,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -69,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 73,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 346,-2.1325 c 1.925,-1.13578 3.5,-2.21904 3.5,-2.40726 0,-0.18821 -0.5195,-0.66329 -1.1545,-1.05573 l -1.1545,-0.71353 0.7937,1.28424 0.7937,1.28424 -1.3892,-0.50473 -1.3892,-0.50473 0.324,-1.34694 0.324,-1.34694 -2.074,1.87693 -2.074,1.87693 0,1.81128 0,1.81129 3.5,-2.06505 z m -310,1.1325 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -31,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 28,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -25,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 23,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -3,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -505.69554,-1.56247 c 3.13255,-0.38103 8.82784,-1.20865 12.6562,-1.83916 l 6.96067,-1.14638 34.66918,-105.869 34.66918,-105.869 1.37015,-0.72777 c 0.75359,-0.40028 6.99516,-1.94454 13.87016,-3.4317 6.875,-1.48716 14.13493,-3.1235 16.13318,-3.63631 l 3.63317,-0.93238 0.58929,-7.24292 c 0.3241,-3.9836 0.71417,-31.09291 0.86682,-60.24291 l 0.27754,-53 -1.61446,-0.0151 c -0.88796,-0.008 -2.33075,-0.60953 -3.2062,-1.33609 l -1.59173,-1.32102 -0.86551,0.53491 -0.8655,0.53491 -2.79261,-1.44882 c -1.53593,-0.79685 -3.30367,-1.4509 -3.9283,-1.45345 -0.62463,-0.003 -2.59819,-1.37535 -4.38569,-3.05068 l -3.25,-3.04606 0,-2.93026 0,-2.93027 -2.25,-0.46599 c -1.2375,-0.2563 -17.90078,-2.33756 -37.02952,-4.62501 l -34.77951,-4.15902 -3.72049,0.46718 -3.72048,0.46718 -23.79807,-2.44989 -23.79808,-2.44989 -5.39048,3.71257 -5.39048,3.71257 -13.31555,-0.71317 -13.31555,-0.71318 -5.29883,7.58928 -5.29883,7.58927 -3.44706,0 c -1.89589,3e-5 -3.44707,0.18903 -3.44707,0.42003 0,0.231 -1.13969,5.6913 -2.53265,12.13402 -1.39295,6.44271 -2.32205,11.92461 -2.06467,12.182 0.25739,0.25739 1.49721,-0.25292 2.75516,-1.13402 1.25794,-0.8811 3.06049,-1.602 4.00565,-1.602 l 1.71848,0 0.6784,1.09767 c 0.37312,0.60372 1.66578,7.46622 2.87258,15.25 l 2.19419,14.15233 3.43643,-0.34278 3.43643,-0.34278 1.20201,-0.98984 1.20201,-0.98984 2.17322,0.68976 2.17322,0.68975 -0.78072,-1.26323 -0.78072,-1.26324 3.40549,0.6547 3.40549,0.65471 -1.25896,-0.81316 -1.25896,-0.81316 5.25896,-1.60262 c 2.89243,-0.88144 14.25896,-4.37846 25.25896,-7.77115 11,-3.39269 30.05402,-9.31343 42.34227,-13.15722 l 22.34227,-6.98869 0.5744,0.57439 0.57439,0.5744 -1.91666,0.0703 -1.91667,0.0703 1.78216,0.70408 1.78216,0.70408 -31.78216,10.33853 c -17.48019,5.68619 -37.51966,12.17201 -44.53216,14.41293 l -12.75,4.07441 0.0252,1.0627 c 0.0138,0.58448 3.07731,7.8127 6.80769,16.0627 l 6.7825,15 2.19232,0.31955 2.19232,0.31955 0,-1.13694 0,-1.13694 1.79528,0.56981 1.79529,0.5698 11.3162,-1.49253 11.3162,-1.49253 0.89249,0.55159 c 0.49087,0.30337 5.87198,7.72393 11.95802,16.49012 l 11.0655,15.93849 2.30536,0 c 1.26794,0 9.8742,-1.16308 19.12501,-2.58461 l 16.81966,-2.58462 5.76198,6.33462 5.76198,6.33461 0.0435,1.46362 c 0.0239,0.80499 -4.42273,14.97999 -9.88145,31.5 -5.45873,16.52001 -20.11449,61.08638 -32.56837,99.03638 -12.45387,37.95 -25.06314,76.34182 -28.02058,85.31515 l -5.37718,16.31515 5.69554,-0.69277 z m 85.3189,-213.43753 -1.74191,0 -4.51677,-5.25 c -2.48422,-2.8875 -5.3218,-6.4875 -6.30573,-8 -0.98393,-1.5125 -1.59165,-2.75 -1.35048,-2.75 0.24116,0 3.8626,3.6 8.04764,8 l 7.60915,8 -1.7419,0 z m -25.74139,-33 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 2.11803,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0.88197,-2 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 2.11803,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0.88197,-2 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 2.11803,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0.88197,-2 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 2.11803,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0.92963,-2 c -0.275,0 -0.0183,-0.9 0.57037,-2 0.5887,-1.1 1.29537,-2 1.57037,-2 0.275,0 0.0183,0.9 -0.57037,2 -0.5887,1.1 -1.29537,2 -1.57037,2 z m 3,-5 c -0.275,0 -0.0183,-0.9 0.57037,-2 0.5887,-1.1 1.29537,-2 1.57037,-2 0.275,0 0.0183,0.9 -0.57037,2 -0.5887,1.1 -1.29537,2 -1.57037,2 z m 3.95234,-7 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 2.11803,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0.88197,-2 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 2.11803,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0.88197,-2 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 2.11803,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0.88197,-2 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 2.11803,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 1,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0.88197,-2 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 2.11803,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0.88197,-2 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 2.11803,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 2,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 1,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0.88197,-2 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 3.11803,-5 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 3,-5 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -63.5,-6 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m 3,-1 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m -3,-1 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m 6,0 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m 62.5,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -65.5,-1 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m 6.5,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -3,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 6,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -3.5,-1 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m 6.5,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -2.5,-1 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m 5.5,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -2.5,-1 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m 56.5,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 6,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 373.5,342 1.3333,0 -0.6666,-0.66667 -0.6667,-0.66666 -0.6667,0.66666 -0.6666,0.66667 1.3333,0 z m 5.5,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -285.87756,-1 c 0.20766,0 0.37756,-0.1699 0.37756,-0.37756 0,-0.20765 -0.7875,-0.99515 -1.75,-1.75 l -1.75,-1.37244 1.37244,1.75 c 0.75485,0.9625 1.54235,1.75 1.75,1.75 z m 314.87756,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -123.18709,-1 c 0.1721,0 1.6346,-1.4625 3.25,-3.25 l 2.93709,-3.25 -3.25,2.93709 c -1.7875,1.6154 -3.25,3.0779 -3.25,3.25 0,0.1721 0.14081,0.31291 0.31291,0.31291 z m 153.18709,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 14,-0.25218 4,0.0202 -1.7383,-0.45508 c -0.9561,-0.25029 -2.7561,-0.25937 -4,-0.0202 l -2.2617,0.4349 4,0.0202 z m -363.81291,-0.74782 c 0.1721,0 0.31291,-0.12659 0.31291,-0.2813 0,-0.15472 -2.78736,-2.96722 -6.19414,-6.25 -3.40678,-3.28279 -5.60168,-5.1812 -4.87756,-4.2187 l 1.31659,1.75 -0.77743,0 -0.77744,0 1.78864,1.97642 1.78863,1.97642 0.71333,-0.44086 0.71333,-0.44086 2.84012,2.96444 c 1.56206,1.63044 2.98092,2.96444 3.15302,2.96444 z m -7.06465,-6 c -0.20765,0 -0.99515,-0.7875 -1.75,-1.75 l -1.37244,-1.75 1.75,1.37244 c 0.9625,0.75485 1.75,1.54235 1.75,1.75 0,0.20766 -0.1699,0.37756 -0.37756,0.37756 z m 361.37756,6 1.3333,0 -0.6666,-0.66667 -0.6667,-0.66666 -0.6667,0.66666 -0.6666,0.66667 1.3333,0 z m 5.5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -351.84501,-1 c 0.18975,0 0.34501,-0.15526 0.34501,-0.34501 0,-0.18976 -1.0125,-1.20226 -2.25,-2.25 l -2.25,-1.90499 1.90499,2.25 c 1.04774,1.2375 2.06024,2.25 2.25,2.25 z m 316.84501,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -121.11803,-2 c 0.275,0 0.77811,-0.45 1.11803,-1 0.33992,-0.55 0.39303,-1 0.11803,-1 -0.275,0 -0.77811,0.45 -1.11803,1 -0.33992,0.55 -0.39303,1 -0.11803,1 z m -200.69488,-2 c 0.1721,0 0.31291,-0.14081 0.31291,-0.31291 0,-0.1721 -1.4625,-1.6346 -3.25,-3.25 l -3.25,-2.93709 2.93709,3.25 c 1.6154,1.7875 3.0779,3.25 3.25,3.25 z m 203.81291,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -225,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 235.90063,-4.3235 c 0.92045,-0.3532 4.08823,-1.34416 7.03951,-2.20212 l 5.36598,-1.55993 6.93988,-0.24225 6.9398,-0.24224 5.097,-4.46498 5.097,-4.46498 -3.9399,-0.0487 -3.9399,-0.0487 0,0.91536 0,0.91535 -2.0014,-0.52337 -2.0014,-0.52337 0.4673,0.75602 0.4672,0.75603 -2.2158,1.05069 c -1.2188,0.57788 -4.787,1.80742 -7.9294,2.7323 l -5.71347,1.68161 -1.19102,-0.73609 -1.19103,-0.7361 0.81856,1.32445 0.81855,1.32445 -1.58129,-0.6068 -1.58128,-0.6068 -0.59119,1.54062 -0.59119,1.54061 -1.49157,-0.57237 -1.49157,-0.57237 0,0.96861 0,0.96862 -1.125,-0.25 -1.125,-0.25 -0.51145,1.40935 -0.51145,1.40935 1.67353,-0.6422 z M 823.5,-530.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -141,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 6,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -260,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 263,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -266.69098,-3.01531 c 0.16996,0.008 0.0309,-0.43469 -0.30902,-0.98469 -0.33992,-0.55 -1.15398,-0.99311 -1.80902,-0.98469 l -1.19098,0.0153 1.5,0.96937 c 0.825,0.53316 1.63906,0.97627 1.80902,0.98469 z m 365.72288,-12.53136 c 3.4959,-1.22153 7.9481,-3.20488 9.8938,-4.40744 l 3.5378,-2.18647 0.8533,0.52733 0.8532,0.52733 3.6274,-1.1133 3.6275,-1.11329 -0.5215,-0.84375 -0.5214,-0.84374 1.2256,0 1.2257,0 -0.6239,-0.62397 -0.624,-0.62397 -3.6687,2.16461 c -2.0178,1.19053 -3.8555,1.97789 -4.0837,1.74969 -0.2282,-0.22821 1.5034,-1.54777 3.8479,-2.93237 l 4.2628,-2.51746 -3.878,-1.07077 -3.878,-1.07078 -0.7748,0.47882 -0.7747,0.47882 -0.6382,-1.03262 -0.6382,-1.03262 -0.9788,0.60492 -0.9788,0.60493 -1.7021,-0.7222 c -0.9361,-0.39721 -3.7271,-0.9336 -6.2021,-1.19198 -2.475,-0.25838 -7.4019,-0.39424 -10.9488,-0.30193 l -6.4487,0.16784 -5.0513,1.33959 c -2.7781,0.73678 -6.245,1.805 -7.7041,2.37384 -1.459,0.56883 -2.9481,1.512 -3.309,2.09593 -0.3609,0.58392 -1.1061,1.06168 -1.6561,1.06168 l -1,0 0.7309,-1.25 0.7309,-1.25 -2.1483,1.88365 -2.1483,1.88364 0.4986,0.80674 0.4985,0.80674 -2.2721,2.20711 -2.2722,2.2071 2,-0.75833 c 1.1,-0.41709 5.0255,-0.99307 8.7234,-1.27996 l 6.7233,-0.52161 2.7729,1.81687 c 1.5251,0.99928 5.1767,2.56061 8.1146,3.46962 l 5.3417,1.65274 6.356,-2.22098 z m -35.1499,-7.45333 c -0.275,0 -0.2219,-0.45 0.118,-1 0.3399,-0.55 0.843,-1 1.118,-1 0.275,0 0.2219,0.45 -0.118,1 -0.3399,0.55 -0.843,1 -1.118,1 z m -344.432,7.98295 1.45,0.0171 -1.2,-1.2 c -0.66,-0.66 -1.2,-1.91626 -1.2,-2.79168 l 0,-1.59168 -5.33751,-2.61776 -5.33751,-2.61776 -1.41249,0.87192 -1.41249,0.87193 -0.10718,1.90655 -0.10718,1.90655 1.60718,-0.37986 1.60718,-0.37986 5,2.99377 c 2.75,1.64658 5.6525,3.00145 6.45,3.01083 z m 387.55,0.017 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -42.5,-1 1.3333,0 -0.6666,-0.66667 -0.6667,-0.66666 -0.6667,0.66666 -0.6666,0.66667 1.3333,0 z m 44.5,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2.5,-1 1.3333,0 -0.6666,-0.66667 -0.6667,-0.66666 -0.6667,0.66666 -0.6666,0.66667 1.3333,0 z m 2.5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 3,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -402.64018,-3.52649 c 0.26043,-0.26043 0.28601,-0.60169 0.0568,-0.75836 -0.22917,-0.15666 -2.5174,-1.95666 -5.08497,-4 -2.56751,-2.04333 -5.17084,-3.71515 -5.78513,-3.71515 l -1.11689,0 1.07037,2 c 0.5887,1.1 1.52841,2 2.08824,2 0.55983,0 2.65591,1.11308 4.65797,2.47351 2.00205,1.36043 3.85318,2.26043 4.11361,2 z M 1124.5,-577.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -760,-8.07087 c 0.55,0 -0.125,-0.64311 -1.5,-1.42913 -1.375,-0.78602 -2.95,-1.42913 -3.5,-1.42913 -0.55,0 0.125,0.64311 1.5,1.42913 1.375,0.78602 2.95,1.42913 3.5,1.42913 z m -7,-2.92913 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -1.69098,-1.01531 c 0.16996,0.008 0.0309,-0.43469 -0.30902,-0.98469 -0.33992,-0.55 -1.15398,-0.99311 -1.80902,-0.98469 l -1.19098,0.0153 1.5,0.96937 c 0.825,0.53316 1.63906,0.97627 1.80902,0.98469 z m -4.30902,-2.0602 1,0.0147 -1.5,-0.84863 c -0.825,-0.46674 -2.625,-1.1236 -4,-1.45967 l -2.5,-0.61105 3,1.44498 c 1.65,0.79474 3.45,1.4516 4,1.45968 z m -8.5,-2.92449 1.33333,0 -0.66666,-0.66667 -0.66667,-0.66666 -0.66667,0.66666 -0.66666,0.66667 1.33333,0 z m -3,-1 1.33333,0 -0.66666,-0.66667 -0.66667,-0.66666 -0.66667,0.66666 -0.66666,0.66667 1.33333,0 z m -3,-1 1.33333,0 -0.66666,-0.66667 -0.66667,-0.66666 -0.66667,0.66666 -0.66666,0.66667 1.33333,0 z m 121.07754,-103.01202 c 0.31765,0.007 6.61765,-3.62962 14,-8.08051 7.38235,-4.45089 13.76162,-8.41255 14.17615,-8.80369 l 0.75369,-0.71116 -15.162,-19.94631 c -8.33911,-10.97047 -30.91463,-40.87131 -50.16782,-66.44631 -19.2532,-25.575 -35.43705,-47.0625 -35.96413,-47.75 -0.52708,-0.6875 -0.70581,-1.25 -0.39718,-1.25 0.30863,0 23.45691,30.0375 51.44064,66.75 27.98372,36.7125 52.19881,68.10716 53.8113,69.76591 1.6125,1.65875 4.91564,5.21358 7.34033,7.89963 l 4.40852,4.88372 5.01013,-5.39963 c 2.75557,-2.9698 7.24184,-7.76213 9.96949,-10.64963 l 4.95936,-5.25 1.22733,0 1.22733,0 0.92993,3.24249 0.92994,3.24249 4.14176,-11.49249 4.14175,-11.49249 -3.96437,-3.5 -3.96438,-3.5 -0.60698,-8.69045 -0.60699,-8.69044 -12.69296,-8.4554 -12.69296,-8.4554 -1.91644,-5.33121 -1.91644,-5.33122 -21.49627,-12.78592 C 465.17332,-813.8387 454.825,-820.1575 454,-820.84822 c -0.825,-0.69072 -15.03166,-9.23487 -31.57036,-18.98702 -16.5387,-9.75214 -30.55306,-17.73116 -31.14301,-17.73116 l -1.07265,0 -0.57561,1.5 -0.5756,1.5 -1.78139,0.0153 c -0.97976,0.008 -2.34673,0.37425 -3.03772,0.81294 l -1.25634,0.79762 4.11592,9.43707 c 2.26375,5.19038 13.58105,31.93706 25.14955,59.43706 11.56849,27.5 22.17266,52.81964 23.56482,56.26586 l 2.53119,6.26586 10.5756,10.47212 c 5.81658,5.75967 10.83549,10.47753 11.15314,10.48414 z M 393.5,-832.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -1,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -0.75462,-2.41205 c -0.20249,0.20249 -1.37363,-1.70137 -2.60252,-4.23081 -1.2289,-2.52943 -2.04646,-4.78687 -1.81681,-5.01652 0.22964,-0.22965 1.40078,1.67422 2.60252,4.23081 1.20174,2.55659 2.01931,4.81403 1.81681,5.01652 z m -4.93851,-11.06149 -0.55979,0.5598 -0.68279,-1.79313 -0.68278,-1.79313 1.24258,1.23333 1.24258,1.23334 -0.5598,0.55979 z M 1225.19,-704.5664 c 0.275,0 1.3145,-0.9 2.31,-2 0.9955,-1.1 1.585,-2 1.31,-2 -0.275,0 -1.3145,0.9 -2.31,2 -0.9955,1.1 -1.585,2 -1.31,2 z m -811.94,-7.41766 c 6.7375,-2.40421 14.77581,-5.32804 17.86292,-6.49738 l 5.61291,-2.12608 -16.41989,-39.22944 c -9.03095,-21.57619 -21.41251,-51.15444 -27.51459,-65.72944 -6.10208,-14.575 -11.10144,-27.075 -11.10969,-27.77778 l -0.015,-1.27778 -1.05575,0.35192 -1.05575,0.35192 -0.58406,2.42586 -0.58405,2.42586 -0.87463,-2.5 -0.87464,-2.5 -0.64127,22 c -0.35269,12.1 -0.73557,39.0642 -0.85083,59.92045 l -0.20958,37.92045 12.53065,12.66417 12.53065,12.66418 0.5013,-0.50129 0.50129,-0.50129 0,1.14349 0,1.14349 12.25,-4.37131 z m -33.58333,-130.91567 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z M 379.5,-846.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 146.05902,126 c 0.24254,0 0.44098,-0.45 0.44098,-1 l 0,-1 -1.05902,0 -1.05901,0 0.61803,1 c 0.33992,0.55 0.81648,1 1.05902,1 z m 699.94098,-7 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z M 200,-813.72141 c 0.825,0 3.75,-0.83024 6.5,-1.84499 l 5,-1.84499 -1.5,0 c -0.825,0 -3.75,0.83024 -6.5,1.84499 l -5,1.84499 1.5,0 z m 12.54523,-3.92027 c 0.57488,0.0414 4.84988,-1.24084 9.5,-2.84944 4.65012,-1.60859 7.98442,-2.95859 7.40954,-3 -0.57488,-0.0414 -4.84988,1.24084 -9.5,2.84944 -4.65012,1.60859 -7.98442,2.95859 -7.40954,3 z m 678.12147,-4.25805 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m -659.1284,-1.74253 c 0.57107,0.0417 5.52107,-1.465 11,-3.34828 5.47894,-1.88328 9.49446,-3.45828 8.9234,-3.5 -0.57107,-0.0417 -5.52107,1.465 -11,3.34828 -5.47894,1.88328 -9.49446,3.45828 -8.9234,3.5 z m 597.0659,-1.19497 0.6041,-0.60417 -0.5252,-1.3125 -0.5252,-1.3125 -0.079,1.91667 -0.079,1.91666 0.6042,-0.60416 z m -0.9375,-5.0625 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z M 253.5,-830.68923 c 0.55,0.0455 8.425,-2.34215 17.5,-5.30585 9.075,-2.9637 16.05,-5.42838 15.5,-5.47705 -0.55,-0.0487 -8.425,2.33895 -17.5,5.30585 -9.075,2.9669 -16.05,5.43157 -15.5,5.47705 z m 572.1667,-6.2105 0.6666,-0.66667 -0.6666,-0.66667 -0.6667,-0.66666 0,1.33333 0,1.33333 0.6667,-0.66666 z m -443.53914,-18.8165 4.62755,0.14983 1.17295,-1.41331 c 0.64512,-0.77733 1.37222,-2.51224 1.61577,-3.85538 0.24356,-1.34313 1.12083,-4.36371 1.9495,-6.71241 l 1.50667,-4.27035 0,-3.37428 0,-3.37427 -2.10204,-2.10204 -2.10204,-2.10204 -5.25377,-2.40526 -5.25378,-2.40525 -5.58236,-1.03196 -5.58236,-1.03195 -3.4474,1.44041 -3.44741,1.44042 -2.24753,6.84884 c -1.23614,3.76685 -2.57263,7.29883 -2.96999,7.84883 -0.39735,0.55 -0.97233,2.0202 -1.27774,3.2671 l -0.55529,2.26711 3.25525,2.48289 3.25524,2.4829 1.53317,0 1.53316,0 1.24489,1.5 1.24489,1.5 2.17755,0 c 1.19766,0 2.60506,0.41537 3.12756,0.92305 0.5225,0.50768 2.3,1.11526 3.95,1.35017 1.65,0.23491 5.0824,0.49454 7.62756,0.57695 z m -1.81854,-22.92063 c -0.44496,-0.0388 -2.42631,-0.66589 -4.40299,-1.39363 -1.97668,-0.72775 -5.01418,-2.0576 -6.75,-2.95522 L 366,-884.61776 l 0,-0.95912 0,-0.95912 5.8737,2.9848 c 3.23054,1.64164 6.35398,2.9848 6.94099,2.9848 0.587,0 1.34539,0.45 1.68531,1 l 0.61803,1 -0.80901,-0.0705 z M 774.5,-878.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -0.9216,-2.24509 0.5314,-0.53136 -4.5981,-9.36177 -4.598,-9.36178 -1.648,-1.25 c -0.9064,-0.6875 -1.3211,-1.25 -0.9216,-1.25 l 0.7263,0 -1.0854,-2.02801 -1.0853,-2.02801 -1.1014,0.68066 -1.1013,0.68065 1.8426,1.34735 c 1.0135,0.74105 1.5643,1.34736 1.2241,1.34736 -0.3402,0 1.7354,4.1625 4.6125,9.25 2.877,5.0875 5.555,10.10191 5.9509,11.14313 l 0.72,1.89313 0.5313,-0.53135 z M 760.5,-904.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 323,24 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 64,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 56.882,-17 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z m 137.618,-2 1.3333,0 -0.6666,-0.66667 -0.6667,-0.66666 -0.6667,0.66666 -0.6666,0.66667 1.3333,0 z m -92.9059,-56 c 0.275,0 2.2577,-1.8 4.4059,-4 2.1482,-2.2 3.6809,-4 3.4059,-4 -0.275,0 -2.2577,1.8 -4.4059,4 -2.1482,2.2 -3.6809,4 -3.4059,4 z m 11.2835,-10 c 0.2076,0 0.9951,-0.7875 1.75,-1.75 l 1.3724,-1.75 -1.75,1.37244 c -0.9625,0.75485 -1.75,1.54235 -1.75,1.75 0,0.20766 0.1699,0.37756 0.3776,0.37756 z m 6.0044,-5 c 0.275,0 0.7781,-0.45 1.118,-1 0.3399,-0.55 0.393,-1 0.118,-1 -0.275,0 -0.7781,0.45 -1.118,1 -0.3399,0.55 -0.393,1 -0.118,1 z m -527.882,-10 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 85.059,-129 c 0.2426,0 0.441,-0.1984 0.441,-0.441 0,-0.2425 -0.5195,-0.7621 -1.1545,-1.1545 l -1.1545,-0.7135 0.7135,1.1545 c 0.3924,0.635 0.912,1.1545 1.1545,1.1545 z m -6.059,-4 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -675.19098,1469.9098 -7.80902,-0.09 -7.15843,-1.299 c -3.93713,-0.7144 -9.33713,-2.0252 -12,-2.9128 l -4.84157,-1.6138 -4.41986,-2.9334 -4.41987,-2.9335 -2.83013,-4.214 -2.83014,-4.214 0.0989,-3.5995 0.0989,-3.5995 1.37142,4.3667 1.37142,4.3666 2.54452,3.336 2.54452,3.3361 7.23519,3.5336 7.23519,3.5335 8.88099,1.5138 8.88099,1.5137 6.30999,0 6.31,0 0.61803,1 0.61803,1 -7.80901,-0.09 z M 91.47432,333.4336 C 91.21344,333.4336 91,333.2195 91,332.9578 c 0,-0.2617 0.89832,-1.9492 1.99626,-3.75 1.09795,-1.8008 1.99795,-2.9144 2,-2.4745 0.002,0.4398 -0.68282,2.1273 -1.52194,3.75 -0.83912,1.6226 -1.73912,2.9503 -2,2.9503 z m 95.02568,-68 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -0.83333,-4.3333 -0.66667,0.6666 0,-1.3333 0,-1.3333 0.66667,0.6666 0.66666,0.6667 -0.66666,0.6667 z m -0.29167,-3.6667 c -0.24078,0 -0.70424,-0.6944 -1.02992,-1.5431 -0.32569,-0.8487 -0.36872,-1.7666 -0.0956,-2.0397 0.27309,-0.2731 0.73656,0.4213 1.02992,1.5431 0.29336,1.1219 0.33639,2.0397 0.0956,2.0397 z m -6.77083,-2.2708 -0.60417,0.6041 0.079,-1.9166 0.0789,-1.9167 0.52522,1.3125 0.52522,1.3125 -0.60416,0.6042 z m 5.93975,-2.9398 c -0.18901,0.189 -0.61841,-0.1009 -0.95423,-0.6443 -0.33581,-0.5433 -1.27862,-8.5608 -2.09511,-17.8165 -0.8165,-9.2557 -1.4868,-19.0411 -1.48956,-21.7453 -0.003,-2.7041 0.17076,-4.7291 0.3856,-4.5 0.21485,0.2292 0.93574,8.5167 1.60199,18.4167 0.66625,9.9 1.59017,19.7878 2.05316,21.9729 0.46299,2.1851 0.68715,4.1275 0.49815,4.3165 z m -5.87725,-14.1227 -0.66667,0.6666 0,-1.3333 0,-1.3333 0.66667,0.6666 0.66666,0.6667 -0.66666,0.6667 z m 0.45852,-8.2106 -0.91101,4.0439 0.0194,-11 0.0194,-11 0.89161,6.9561 0.8916,6.956 -0.91101,4.044 z m -64.46291,-23.2061 -0.50439,1.25 0,-2.5 0,-2.5 0.50439,1.25 0.50439,1.25 -0.50439,1.25 z m -0.0799,-8.25 c -0.25541,0 -0.66449,-0.3375 -0.90907,-0.75 -0.24458,-0.4125 -0.70705,-3 -1.02771,-5.75 -0.32066,-2.75 -1.10533,-9.275 -1.74372,-14.5 -0.63839,-5.225 -2.46488,-15.35 -4.05886,-22.5 -1.59399,-7.15 -4.4628,-18.0194 -6.37512,-24.1542 L 96.99094,117.6251 91.97553,106.2795 C 89.21706,100.0394 84.65013,90.8838 81.8268,85.9337 79.00347,80.9837 73.66845,72.6586 69.97119,67.4336 l -6.72228,-9.5 -8.71844,-9.25 c -4.79514,-5.0875 -8.31039,-9.25 -7.81166,-9.25 0.49873,0 5.1824,4.3875 10.40816,9.75 l 9.50138,9.75 5.53483,8 c 3.04415,4.4 7.35243,11.15 9.57395,15 2.22152,3.85 5.6235,9.9424 7.55996,13.5386 1.93646,3.5963 5.0791,10.5713 6.98364,15.5 1.90454,4.9288 4.93566,13.4331 6.73583,18.8986 1.80018,5.4654 4.29611,14.2404 5.54651,19.5 1.25041,5.2595 2.31024,8.8149 2.35518,7.9008 0.0449,-0.9141 -0.59321,-5.1891 -1.41812,-9.5 -0.8249,-4.3109 -1.46123,-8.513 -1.41405,-9.338 l 0.0858,-1.5 0.95714,3 c 0.52643,1.65 2.00923,9.075 3.29512,16.5 1.28588,7.425 2.58133,16.65 2.87877,20.5 l 0.5408,7 -0.93813,-2 -0.93812,-2 0.53965,8.25 c 0.29681,4.5375 0.33069,8.25 0.0753,8.25 z m -0.80719,-17.8257 c 0.2429,-0.7287 0.12823,-4.2514 -0.25481,-7.8282 -0.38305,-3.5769 -0.8911,-6.3088 -1.129,-6.0709 -0.2379,0.2379 -0.12323,3.7607 0.25482,7.8283 l 0.68736,7.3957 0.44163,-1.3249 z m -2.11295,-15.9243 0.50439,-1.25 -0.50439,-1.25 -0.50439,-1.25 0,2.5 0,2.5 0.50439,-1.25 z m 70.25471,0.75 -0.85617,1.5 -0.0304,-1.1395 c -0.0167,-0.6268 0.67046,-4.8343 1.52709,-9.35 l 1.55749,-8.2105 -0.61817,-3.15 -0.61817,-3.15 1.04536,1.5 1.04536,1.5 0.0153,-2.3188 c 0.008,-1.2753 1.1536,-6.8093 2.54484,-12.2977 l 2.52953,-9.9789 -0.68986,-1.2023 -0.68985,-1.2023 0.8631,0.7861 0.8631,0.7861 1.24491,-4.2162 1.24491,-4.2163 -0.60219,-0.9743 -0.6022,-0.9744 1.32445,0.8185 1.32445,0.8186 -0.62627,-1.632 -0.62626,-1.632 0.95632,-0.5911 0.95633,-0.591 0,-3.4809 0,-3.4808 2,-3.9203 c 1.1,-2.1562 2,-4.6133 2,-5.4602 l 0,-1.5398 0.96862,0 0.96861,0 -0.52285,1.75 c -0.28757,0.9625 0.86747,-0.8547 2.56676,-4.0383 l 3.08961,-5.7882 -0.68988,-1.1163 -0.68989,-1.1162 1.15451,0.7135 1.15451,0.7135 0,-0.8939 c 0,-0.4916 2.28905,-4.6807 5.08677,-9.309 2.79772,-4.6283 7.23045,-11.37 9.85051,-14.9815 l 4.76373,-6.5663 -5.54729,1.8301 -5.54728,1.83 -14.55322,2.442 c -8.00427,1.3431 -19.72822,2.937 -26.05322,3.542 -6.325,0.605 -17.57955,1.4125 -25.01012,1.7943 l -13.51012,0.6943 -22.48282,-0.7929 -22.48282,-0.793 -0.81363,-0.8136 -0.81362,-0.8136 30.80656,0.4841 30.80657,0.4842 16,-1.6852 c 8.8,-0.9269 20.05,-2.3577 25,-3.1796 4.95,-0.8219 10.23091,-1.7012 11.73536,-1.9541 1.50446,-0.2528 6.45446,-1.6313 11,-3.0634 4.54555,-1.432 9.89642,-3.4324 11.89082,-4.4454 l 3.62618,-1.8418 0.64478,0.6448 0.64479,0.6448 4.22904,-4.0803 4.22903,-4.0803 2.5,-0.634 2.5,-0.634 -3.477,1.7767 -3.477,1.7766 -6.87839,8.5 c -3.78312,4.675 -9.70886,12.8018 -13.16831,18.0595 -3.45945,5.2578 -8.64763,14.2578 -11.52929,20 -2.88167,5.7423 -7.21382,15.549 -9.62702,21.7927 l -4.38762,11.3521 -3.37214,13.1479 c -1.85468,7.2313 -4.14568,17.8728 -5.09111,23.6478 -0.94543,5.775 -2.10424,11.175 -2.57513,12 z m 14.58305,-63 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1.16667,-2.3333 0.66666,-0.6667 -0.66666,-0.6667 L 199,90.1003 l 0,1.3333 0,1.3333 0.66667,-0.6666 z m 28.27431,-47.6667 1.05902,0 0,-1 c 0,-0.55 -0.19844,-1 -0.44098,-1 -0.24254,0 -0.7191,0.45 -1.05902,1 l -0.61803,1 1.05901,0 z m -46.44098,109 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 633.7943,-52.6819 -0.8711,0.5384 -5.2457,-3.5159 -5.2458,-3.516 -5.6238,-1.9766 -5.6238,-1.9766 -5.592,0.1462 c -3.0757,0.08 -6.1546,0.1093 -6.8421,0.064 l -1.25,-0.0816 0,-5.9651 0,-5.965 -1.6172,-4.785 -1.6172,-4.7849 -5.2585,-7.5 c -2.8922,-4.125 -6.8363,-10.65 -8.7646,-14.5 -1.9284,-3.85 -4.6348,-10.6 -6.0143,-15 l -2.5083,-8 -1.6545,-12.2185 -1.6545,-12.2184 -1.5662,-5.274 c -0.8614,-2.9007 -3.2715,-8.6657 -5.3558,-12.8111 l -3.7895,-7.5371 2.2878,-6.7983 2.2878,-6.7983 2.7909,-2.913 2.7908,-2.913 9.0716,-4.6463 c 4.9895,-2.5555 11.8034,-6.5747 15.1421,-8.9315 l 6.0705,-4.2853 5.6594,-6.1128 c 3.1127,-3.3621 8.8592,-10.5946 12.77,-16.0722 l 7.1106,-9.9594 4.6595,-4.1129 4.6596,-4.1129 8.5705,-4.3124 8.5705,-4.3124 5.7896,-1.6831 5.7897,-1.683 3.115,0.623 3.115,0.623 3.7711,2.6133 3.7711,2.6134 5.4474,7.1166 5.4473,7.1166 2.5889,5.6609 2.5889,5.6609 1.9424,14.3391 c 1.0683,7.8865 2.6698,17.0391 3.5587,20.3391 0.889,3.3 3.0893,9.1939 4.8896,13.0976 l 3.2733,7.0976 6.6012,9.6682 6.6012,9.6682 1.1259,4.1811 1.1259,4.1812 -1.0285,6.9293 -1.0285,6.9294 -8.8718,8.2785 -8.8719,8.2785 -7.4068,10.8452 -7.4068,10.8452 -9.5345,9.5522 -9.5344,9.5522 -11.5384,7.5519 -11.5384,7.552 -2.8511,3.3883 c -1.5681,1.8636 -3.6511,5.2547 -4.6288,7.5357 -0.9778,2.2811 -2.1698,4.3897 -2.649,4.6858 z m -1.2048,-3.3685 c 0.3242,0.028 1.1421,-1.1871 1.8176,-2.6996 0.6755,-1.5125 2.4049,-4.4676 3.843,-6.567 l 2.6148,-3.817 13.0675,-8.6235 13.0676,-8.6235 8,-8.0595 8,-8.0595 8.405,-12.3098 8.405,-12.3099 8.36,-7.6979 8.36,-7.6978 0.6198,-6.6372 0.6198,-6.6372 -0.6387,-2.5448 -0.6388,-2.5449 -6.356,-9.3102 c -3.4959,-5.1207 -7.7062,-12.0103 -9.3562,-15.3103 -1.6501,-3.3 -3.9488,-8.925 -5.1082,-12.5 -1.1595,-3.575 -2.5432,-8.525 -3.0749,-11 -0.5318,-2.475 -1.4771,-9.1894 -2.1008,-14.9208 l -1.134,-10.4209 -1.7778,-4.6789 c -0.9779,-2.5735 -3.3942,-7.1091 -5.3697,-10.0792 -1.9754,-2.9701 -5.8942,-7.747 -8.7083,-10.6152 l -5.1166,-5.2151 -3.5412,-0.6643 -3.5413,-0.6644 -4.1536,1.2011 c -2.2844,0.6606 -8.2035,3.1497 -13.1535,5.5314 l -9,4.3303 -4.7263,4.1621 -4.7264,4.1622 -5.701,8.1859 c -3.1356,4.5022 -8.2027,11.0762 -11.2603,14.6089 -3.0575,3.5328 -8.4269,8.7886 -11.9318,11.6797 l -6.3727,5.2565 -8.6408,4.2418 c -4.7524,2.3329 -10.1037,5.3129 -11.8918,6.622 l -3.251,2.3803 -1.6105,3.1144 c -0.8858,1.7129 -2.1617,4.9522 -2.8354,7.1983 l -1.2248,4.0839 3.721,7.5 c 2.0466,4.125 4.2304,9.3 4.8529,11.5 0.6225,2.2 2.035,10.1744 3.1389,17.7209 l 2.0071,13.7209 2.0901,6.767 c 1.1496,3.7218 3.4222,9.5863 5.0503,13.0322 1.6281,3.4458 5.4751,9.9763 8.5489,14.5121 3.0738,4.5358 6.4314,10.1476 7.4614,12.4706 l 1.8725,4.2238 0.5875,6.291 0.5875,6.291 3.8582,-0.368 3.8582,-0.3679 6.7692,2.0859 6.7691,2.0859 5,2.9669 c 2.75,1.6318 5.2653,2.9896 5.5895,3.0173 z M 105.5,87.4336 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 92.18146,-9 c -0.30988,0 -0.84169,-0.4502 -1.1818,-1.0005 L 195.88129,76.4325 191.44064,75.3143 187,74.1962 l 0,-0.7378 0,-0.7378 2.9017,0.1065 2.90169,0.1065 -0.41621,0.678 -0.41622,0.678 1.92421,0.6107 c 1.05832,0.3359 2.46996,1.2683 3.13697,2.072 0.66701,0.8037 0.95921,1.4613 0.64932,1.4613 z M 100.5,76.2387 l -3,-0.037 1.76903,-0.461 c 0.97297,-0.2535 2.32297,-0.2369 3,0.037 l 1.23097,0.498 -3,-0.037 z m 9,-1.0573 -4,-0.02 2.26166,-0.4349 c 1.24391,-0.2392 3.04391,-0.2301 4,0.02 l 1.73834,0.4551 -4,-0.02 z m 12,-1.0577 -6,-0.01 3.26791,-0.4046 c 1.79735,-0.2226 4.49735,-0.218 6,0.01 l 2.73209,0.4148 -6,-0.01 z m 8,0.3099 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 3.91667,-1.0789 -1.91667,-0.079 1.3125,-0.5252 1.3125,-0.5252 0.60417,0.6041 0.60416,0.6042 -1.91666,-0.079 z M 136.5,73.4336 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 19.45,-0.1248 -6.45,-0.1247 5.5,-0.8062 5.5,-0.8061 0.95,0.9309 0.95,0.9309 -6.45,-0.1248 z m 8.05,0.1248 -1.33333,0 0.66666,-0.6667 0.66667,-0.6666 0.66667,0.6666 0.66666,0.6667 -1.33333,0 z m 5.5,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 8.5,-0.3362 -7.5,0 3.75,-0.3923 c 2.0625,-0.2157 5.4375,-0.2157 7.5,0 l 3.75,0.3923 -7.5,0 z m -57.58333,-0.7427 -1.91667,-0.079 1.3125,-0.5252 1.3125,-0.5252 0.60417,0.6041 0.60416,0.6042 -1.91666,-0.079 z M 156.5,71.4336 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 24.5,-0.232 -3.5,0 1.75,-0.4573 c 0.9625,-0.2516 2.5375,-0.2516 3.5,0 l 1.75,0.4573 -3.5,0 z m -37,-2.768 c -0.55,0 -1,-0.45 -1,-1 0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1 z m -14.58333,-9.0789 -1.91667,-0.079 1.3125,-0.5252 1.3125,-0.5252 0.60417,0.6041 0.60416,0.6042 -1.91666,-0.079 z M 91.5,58.4336 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 78.5,0 -1.33333,0 0.66666,-0.6667 0.66667,-0.6666 0.66667,0.6666 0.66666,0.6667 -1.33333,0 z m 13.38197,-1 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 4.61803,-1 c -1.1,0 -2,-0.1725 -2,-0.3834 0,-0.2108 0.9,-0.6187 2,-0.9063 l 2,-0.5231 0,0.9064 0,0.9064 -2,0 z m 6.5,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 15.5,-2 -1.33333,0 0.66666,-0.6667 0.66667,-0.6666 0.66667,0.6666 0.66666,0.6667 -1.33333,0 z m 3.5,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 4,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 2,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z M 504.66667,39.1003 504,39.7669 l 0,-1.3333 0,-1.3333 0.66667,0.6666 0.66666,0.6667 -0.66666,0.6667 z m -1.01695,-3.379 -0.49183,1.2123 -0.0789,-1.1682 c -0.0434,-0.6425 -0.33793,-1.9925 -0.65446,-3 l -0.5755,-1.8318 1.14628,1.7877 1.14628,1.7877 -0.49183,1.2123 z M 246.5,32.403 l -1,0 1.5,-0.9694 c 0.825,-0.5332 1.95,-0.9694 2.5,-0.9694 l 1,0 -1.5,0.9694 c -0.825,0.5332 -1.95,0.9694 -2.5,0.9694 z m 5.44098,-0.9694 c -0.51754,0 -0.94098,-0.1769 -0.94098,-0.393 0,-0.2162 0.69837,-0.661 1.55194,-0.9886 l 1.55194,-0.5955 -0.61096,0.9886 c -0.33602,0.5437 -1.0344,0.9885 -1.55194,0.9885 z m 3.94099,-1 -1,0 0.61803,-1 c 0.33992,-0.55 1.06803,-1 1.61803,-1 l 1,0 -0.61803,1 c -0.33992,0.55 -1.06803,1 -1.61803,1 z m 3.80901,-1.0703 -0.80901,0.07 0.61803,-1 0.61803,-1 2.19099,0.07 2.19098,0.07 -2,0.8594 c -1.1,0.4727 -2.36406,0.8911 -2.80902,0.9297 z m 7.69099,-1.9297 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z M 114.47251,26.419 c -0.56513,0.01 -2.02763,-0.6859 -3.25,-1.5421 L 109,23.3202 l 0.0314,-1.1933 0.0314,-1.1933 2.47929,-1.8048 2.47929,-1.8047 10.23928,-1.5588 10.23929,-1.5587 17.73896,0.5504 17.73896,0.5505 3.01104,1.7786 3.01104,1.7787 0,1.1294 c 0,0.6212 -0.89261,1.9372 -1.98358,2.9245 l -1.98358,1.7952 -6.04444,-1.2828 -6.04444,-1.2827 -17.72198,0.5333 -17.72198,0.5332 -4.5,1.5948 c -2.475,0.8771 -4.96237,1.6013 -5.52749,1.6093 z m 0.51862,-0.9854 c 0.33488,0 1.03637,-0.4136 1.55887,-0.9191 0.5225,-0.5055 3.62015,-1.4055 6.88366,-2 l 5.93366,-1.0809 18.25124,0 18.25124,0 2.68674,1.0215 2.68673,1.0215 1.37837,-1.1439 C 173.37974,21.7035 174,20.7708 174,20.2601 l 0,-0.9286 -3.46788,-1.4489 -3.46788,-1.449 -19.78212,0.037 -19.78212,0.037 -6.82088,1.3198 -6.82087,1.3199 -1.67913,1.7045 -1.67912,1.7045 1.94113,1.4389 c 1.06762,0.7914 2.21512,1.4389 2.55,1.4389 z m 156.39084,1 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 3.55901,-1 c -0.51754,0 -0.94098,-0.1769 -0.94098,-0.393 0,-0.2162 0.69837,-0.661 1.55194,-0.9886 l 1.55194,-0.5955 -0.61096,0.9886 c -0.33602,0.5437 -1.0344,0.9885 -1.55194,0.9885 z M 25,20.2757 l -2.5,0 1.25,-0.5044 1.25,-0.5044 1.25,0.5044 1.25,0.5044 -2.5,0 z m -5.58333,-0.921 -1.91667,-0.079 1.3125,-0.5252 1.3125,-0.5252 0.60417,0.6041 0.60416,0.6042 -1.91666,-0.079 z M 299.5,17.4336 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 11,-4 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z M 143,12.403 c -0.275,0 -1.175,-0.4362 -2,-0.9694 l -1.5,-0.9694 3.5,0 3.5,0 -1.5,0.9694 c -0.825,0.5332 -1.725,0.9694 -2,0.9694 z m 170.5,0.0306 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -299,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 302,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -303.74963,-1 c -0.22096,0 -1.45696,-1.1232 -2.74667,-2.4961 C 8.714,6.5647 7.84805,5.274 8.07939,5.0693 c 0.23134,-0.2047 1.46734,0.9186 2.74667,2.4961 1.27933,1.5775 2.14527,2.8682 1.92431,2.8682 z m 306.74963,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -177,-1.0938 -4,-0.033 2.33812,-0.937 2.33812,-0.9369 1.66188,0.9699 1.66188,0.97 -4,-0.033 z m 184,-1.7095 -5,1.9554 1,-0.9155 c 0.55,-0.5035 4.97961,-2.5956 9.84357,-4.6491 4.86397,-2.0535 9.03707,-3.5402 9.27356,-3.3037 0.23649,0.2365 -1.94312,1.4487 -4.84358,2.6937 C 333.8731,4.6562 329.25,6.5548 326.5,7.6303 z m -359,0.8033 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -4,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -3.5,-1 -1.33333,0 0.66666,-0.6667 L -40,5.1003 l 0.66667,0.6666 0.66666,0.6667 -1.33333,0 z m -4,-1 -1.33333,0 0.66666,-0.6667 L -44,4.1003 l 0.66667,0.6666 0.66666,0.6667 -1.33333,0 z m -34.5,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 31.5,0 -1.33333,0 0.66666,-0.6667 L -47,3.1003 l 0.66667,0.6666 0.66666,0.6667 -1.33333,0 z m 544.5,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -578,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 30,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -32.5,-1 -1.33333,0 0.66666,-0.6667 L -83,1.1003 l 0.66667,0.6666 0.66666,0.6667 -1.33333,0 z m 576.5,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -579,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 28.5,0 -1.33333,0 0.66666,-0.6667 L -57,0.1003 l 0.66667,0.6666 0.66666,0.6667 -1.33333,0 z m 65.37756,0 C 8.1699,1.4336 8,1.2637 8,1.056 8,0.8484 8.7875,0.0609 9.75,-0.694 l 1.75,-1.3724 -1.37244,1.75 c -0.75485,0.9625 -1.54235,1.75 -1.75,1.75 z m -95.87756,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 27.5,0 -1.33333,0 0.66666,-0.6667 0.66667,-0.6666 0.66667,0.6666 0.66666,0.6667 -1.33333,0 z m -29.5,-1.0709 c -0.55,0 -2.125,-0.6431 -3.5,-1.4291 -1.375,-0.786 -2.05,-1.4291 -1.5,-1.4291 0.55,0 2.125,0.6431 3.5,1.4291 1.375,0.786 2.05,1.4291 1.5,1.4291 z m 26,0.071 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 535.62409,-0.7333 -1.24258,1.2333 0.68278,-1.7931 0.68279,-1.7932 0.55979,0.5598 0.5598,0.5598 -1.24258,1.2334 z M 12.94098,-1.5664 C 12.42344,-1.5664 12,-1.7433 12,-1.9594 c 0,-0.2162 0.69837,-0.661 1.55194,-0.9886 l 1.55194,-0.5955 -0.61096,0.9886 c -0.33602,0.5437 -1.0344,0.9885 -1.55194,0.9885 z m -80.94098,-1 -1.33333,0 0.66666,-0.6667 0.66667,-0.6666 0.66667,0.6666 0.66666,0.6667 -1.33333,0 z m -28.5,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 25.5,-0.075 c -0.825,0 -2.625,-0.6394 -4,-1.4254 -1.375,-0.786 -2.21416,-1.4451 -1.86481,-1.4646 0.34935,-0.019 2.14935,0.622 4,1.4255 l 3.36481,1.4608 -1.5,0 z m 87.5,0.075 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -115,-1.068 c -0.55,0.014 -5.5,-2.3541 -11,-5.2619 -5.5,-2.9078 -15.4,-8.3623 -22,-12.1212 -6.6,-3.7589 -16.09,-9.4096 -21.08889,-12.5572 -4.99889,-3.1475 -14.44889,-9.6745 -21,-14.5043 C -180.14,-53.9088 -187.3,-59.4393 -189.5,-61.369 c -2.2,-1.9297 -11.37939,-10.3011 -20.39864,-18.603 l -16.39863,-15.0944 -9.68566,-11.21 -9.68565,-11.21 -12.02097,-17.78999 -12.02096,-17.79001 -7.06429,-13.16951 -7.06429,-13.16951 -5.4953,-14.33049 -5.4953,-14.33049 -3.99577,-16.5 c -2.19768,-9.075 -4.49368,-18.75 -5.10223,-21.5 -0.60855,-2.75 -1.77018,-10.4 -2.58139,-17 -0.81122,-6.6 -1.41111,-14.025 -1.3331,-16.5 l 0.14184,-4.5 0.38508,3 c 0.21179,1.65 1.25524,9.975 2.31878,18.5 l 1.9337,15.5 4.55086,18.5 4.55086,18.5 5.07306,13 5.07306,13 6.81688,13.12005 c 3.74928,7.21603 9.41078,17.09968 12.5811,21.96366 3.17032,4.86398 9.56339,14.23647 14.20683,20.82776 4.64344,6.59128 12.16654,16.28263 16.71801,21.53633 l 8.2754,9.5522 19.21122,18 19.21121,18 13.64715,10.2406 13.64714,10.2406 12,7.3843 c 6.6,4.0613 18.3,10.9914 26,15.4003 7.7,4.4088 16.25,9.1692 19,10.5786 2.75,1.4093 4.55,2.5738 4,2.5876 z m 118,0.068 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -98,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -2,-1.1349 c -0.55,0.01 -7.075,-2.9042 -14.5,-6.4693 -7.425,-3.5651 -17.775,-8.9735 -23,-12.0186 -5.225,-3.0452 -15.96771,-9.331 -23.87268,-13.9685 l -14.37268,-8.4317 -9.62732,-7.1504 -9.62732,-7.1505 -9.5,-9.079 c -5.225,-4.9935 -14.75211,-14.5901 -21.17136,-21.3259 l -11.67137,-12.2467 -9.35679,-12.2623 c -5.14623,-6.7442 -12.10701,-16.57581 -15.46839,-21.84801 -3.36138,-5.27219 -9.25935,-15.84719 -13.10661,-23.5 -3.84725,-7.6528 -7.49875,-15.48919 -8.11444,-17.41419 -0.6157,-1.925 -2.01459,-4.85 -3.10865,-6.5 -1.09407,-1.65 -1.99218,-2.72474 -1.9958,-2.38832 -0.004,0.33643 1.36989,3.64745 3.05226,7.35783 1.68236,3.71037 2.86627,6.9387 2.6309,7.17407 -0.23536,0.23536 -1.11435,-1.05066 -1.9533,-2.85782 -0.83895,-1.80717 -2.53076,-5.53576 -3.75957,-8.28576 -1.22882,-2.75 -3.22776,-7.025 -4.4421,-9.5 -1.21434,-2.475 -4.27672,-8.55 -6.80528,-13.5 l -4.59739,-9 -3.06605,-15.15494 C -289.62027,-241.55656 -291,-249.7425 -291,-251.41232 l 0,-3.03605 0.91459,-0.56524 0.91459,-0.56525 0.42152,0.75623 0.42151,0.75623 -0.2808,-1.18765 c -0.15443,-0.65321 -0.72215,-3.80321 -1.26159,-7 -0.53945,-3.19679 -1.27247,-8.40593 -1.62896,-11.57585 l -0.64815,-5.76351 -0.85725,0.52982 -0.85726,0.52981 -0.5997,-0.97032 -0.59969,-0.97032 0.67382,-2.68472 0.67382,-2.68471 1.3,2.88872 1.29999,2.88873 0.13193,-17.5 c 0.0726,-9.625 0.34002,-19.75 0.59434,-22.5 0.25433,-2.75 0.45726,-6.6682 0.45096,-8.70712 l -0.0115,-3.70712 0.97756,-0.60416 0.97756,-0.60417 -0.61207,-2.43872 -0.61209,-2.43871 1.2154,0 1.2154,0 -0.62424,-1.62675 -0.62425,-1.62675 0.96006,-1.15679 0.96005,-1.15679 -0.92749,-1.46646 -0.92748,-1.46646 -0.0153,1.41667 -0.0153,1.41666 -0.54867,-0.54866 -0.54867,-0.54867 0.66509,-2.64992 0.66508,-2.64991 1.28907,1.7629 1.28906,1.7629 -0.52206,-2.73099 -0.52206,-2.73098 1.02296,0 1.02296,0 -0.52301,-2 -0.52302,-2 1.02302,0 1.02301,0 -0.52301,-2 -0.52302,-2 0.94344,0 0.94344,0 -0.47671,-3.24805 -0.47671,-3.24804 -0.77981,1.99804 -0.77981,1.99805 -0.0703,-1.72895 c -0.0387,-0.95092 1.07057,-5.22592 2.46494,-9.5 1.39438,-4.27408 3.2316,-9.68355 4.08271,-12.02105 l 1.54748,-4.25 0.95247,0 0.95248,0 -1.20948,2.25 c -0.66522,1.2375 -2.46412,6.27943 -3.99757,11.20428 -1.53345,4.92485 -2.58002,9.16235 -2.32571,9.41667 0.25432,0.25431 0.46239,-0.0892 0.46239,-0.7633 l 0,-1.22568 0.90674,0.56039 0.90674,0.5604 -0.56426,-2.15775 -0.56427,-2.15775 1.06427,0.65775 1.06426,0.65775 -0.56426,-2.15775 -0.56427,-2.15775 1.26466,0.7816 1.26466,0.7816 -0.67452,-2.12523 -0.67452,-2.12523 0.97376,0 0.97377,0 -0.5639,-2.15637 -0.56391,-2.15637 1.06427,0.65775 1.06426,0.65775 -0.52337,-2.00138 -0.52337,-2.00138 1.17565,0 1.17564,0 -0.61803,-1 -0.61803,-1 0.8434,0 c 0.46388,0 1.60358,-1.28686 2.53267,-2.85968 l 1.68926,-2.85969 -0.61678,-0.61678 -0.61678,-0.61677 1.65402,-0.63471 1.65402,-0.63471 6.87268,-8.71258 6.87268,-8.71259 4.36643,-3.39383 c 2.40154,-1.8666 7.1518,-5.72617 10.55614,-8.57682 l 6.18972,-5.183 16.08868,-8.7124 16.08867,-8.7124 17.54614,-7.35895 17.54613,-7.35895 22.45132,-6.06134 c 12.34822,-3.33374 27.72719,-7.12372 34.17547,-8.42218 6.44829,-1.29846 14.95871,-2.89443 18.91204,-3.5466 l 7.18789,-1.18577 7.31211,-5.07659 c 4.02167,-2.79213 11.50177,-7.70618 16.62244,-10.92013 5.12068,-3.21394 9.75974,-5.84353 10.30902,-5.84353 l 0.99869,0 -0.51959,0.84071 c -0.28577,0.4624 -4.24983,3.12971 -8.80901,5.92736 -4.55919,2.79765 -12.01904,7.78155 -16.57745,11.07534 l -8.28803,5.98871 -7.21197,1.18983 c -3.96659,0.65441 -12.38698,2.23394 -18.71198,3.51007 -6.325,1.27613 -21.50519,5.04178 -33.73374,8.36809 l -22.23375,6.04785 -17.26625,7.11017 -17.26626,7.11016 -16.41992,8.83154 -16.41991,8.83153 -11.17145,8.83432 -11.17146,8.83432 -2.40863,3.46135 c -1.32475,1.90374 -4.70245,6.17874 -7.506,9.5 -2.80355,3.32126 -5.89816,7.58924 -6.87691,9.4844 -0.97874,1.89516 -3.04766,7.52016 -4.59759,12.5 -1.54993,4.97984 -4.61349,16.92925 -6.80792,26.55425 l -3.98987,17.5 -1.10045,11 -1.10045,11 0.50747,19.5 0.50747,19.5 1.02781,5.38649 c 0.5653,2.96257 1.02781,5.65276 1.02781,5.9782 0,0.32545 1.95343,-1.53597 4.34096,-4.13649 l 4.34096,-4.7282 3.35244,0 3.35245,0 5.39129,5.56621 c 2.96522,3.06141 6.81569,6.47804 8.5566,7.5925 l 3.1653,2.02629 -3,-0.6727 -3,-0.6727 -6.59719,-6.36614 -6.59719,-6.36614 -2.12113,0.55469 -2.12113,0.55468 -3.59863,4.39166 -3.59863,4.39165 -1.50044,0 -1.50043,0 0.53529,1.75 c 0.29441,0.9625 1.50114,7.375 2.68163,14.25 1.18048,6.875 3.17904,16.6035 4.44123,21.61888 l 2.2949,9.11889 3.52949,7.38111 c 1.94122,4.05962 5.09621,10.30612 7.01109,13.88112 1.91488,3.575 7.54298,14.825 12.50689,25 l 9.02529,18.5 7.80448,11.19478 c 4.29246,6.15712 10.42749,14.81685 13.6334,19.24382 l 5.82892,8.0491 20.17108,20.6587 20.17108,20.6587 11.5,8.6847 11.5,8.6846 16,9.2695 c 8.8,5.0982 18.67898,10.909 21.95329,12.9128 3.27432,2.0038 12.94932,7.0976 21.5,11.3195 8.55069,4.2219 15.09671,7.6819 14.54671,7.6889 z m -197.7848,-200.24697 c 0.25747,-0.25747 -0.009,-1.28938 -0.59313,-2.29313 -0.58369,-1.00375 -1.07494,-1.5243 -1.09166,-1.15679 -0.0167,0.36752 0.25018,1.39943 0.59313,2.29313 0.34294,0.8937 0.83419,1.41426 1.09166,1.15679 z m -1.9576,-5.0424 c 0.238,-0.23799 0.12914,-1.8149 -0.24189,-3.50422 l -0.67462,-3.07151 -0.92054,0 c -0.5063,0 -0.92055,0.42883 -0.92055,0.95295 0,0.52412 0.5231,2.10102 1.16244,3.50422 0.63934,1.40321 1.35717,2.35656 1.59516,2.11856 z m -2.5576,-8.37573 1.2,-1.2 -1.2,-1.2 -1.2,-1.2 0,2.4 0,2.4 1.2,-1.2 z m -1.2,-4.7 c 0.55,-0.33992 1,-1.04148 1,-1.55902 0,-0.51754 -0.45,-0.94098 -1,-0.94098 l -1,0 0,1.55902 0,1.55901 1,-0.61803 z m -1,-5 c 0.55,-0.33992 1,-1.04148 1,-1.55902 0,-0.51754 -0.45,-0.94098 -1,-0.94098 l -1,0 0,1.55902 0,1.55901 1,-0.61803 z m -1,-5 c 0.55,-0.33992 1,-1.26648 1,-2.05902 l 0,-1.44098 -1,0 -1,0 0,2.05902 0,2.05901 1,-0.61803 z m -1,-5.5 c 0.53316,-0.825 0.96937,-2.4 0.96937,-3.5 l 0,-2 -0.96937,1.5 c -0.53316,0.825 -0.96937,2.4 -0.96937,3.5 l 0,2 0.96937,-1.5 z m -1.52037,-4.20364 c 0.13146,-0.163 0.51707,-1.45886 0.85692,-2.87969 l 0.61789,-2.58334 -1.27956,0 -1.27957,0 0.42265,2.8797 c 0.23246,1.58383 0.53021,2.74633 0.66167,2.58333 z M -281.5,-364.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 755,356 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 24,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0,-5 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0,-4 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -8.5,-2 -1.33333,0 0.66666,-0.6667 0.66667,-0.6666 0.66667,0.6666 0.66666,0.6667 -1.33333,0 z m -11.5,-5 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 259.4687,-1.3265 -1.4687,0.1889 -3.8508,-4.032 -3.8509,-4.0321 -4.5719,-2.0224 -4.572,-2.0223 -5.7375,0.5202 -5.7375,0.5203 -0.576,-2.1471 c -0.3169,-1.1808 -0.5822,-3.1707 -0.5897,-4.422 -0.01,-1.2512 -0.9143,-4.8373 -2.015,-7.969 l -2.0013,-5.694 -5.9364,-9.7019 -5.93653,-9.7019 -1.66837,-5.3291 -1.66838,-5.3291 -0.31764,-27.2222 -0.31764,-27.22214 -0.62779,-2.27783 c -0.34529,-1.25281 -1.56082,-4.37115 -2.70118,-6.92966 l -2.07338,-4.65183 2.09943,-6.21676 c 1.15468,-3.41921 3.19379,-8.07589 4.53133,-10.34817 l 2.43191,-4.13141 5.59364,-3.25 c 3.0765,-1.7875 8.1314,-4.7125 11.2331,-6.5 l 5.6395,-3.25 7.9125,-7.40281 7.9125,-7.4028 8.8329,-10.67199 8.8329,-10.67198 3.8651,-3.04214 c 2.1258,-1.67317 5.86,-4.05319 8.2982,-5.28893 2.4382,-1.23574 7.286,-3.32063 10.7728,-4.63308 l 6.3398,-2.38627 3.9742,0 3.9743,0 4.0485,3.65755 4.0485,3.65756 4.9864,8.09244 4.9865,8.09245 2.031,6.5 2.031,6.5 -0.05,8.51026 -0.05,8.51027 1.4421,9.48973 1.442,9.48974 2.4013,7 2.4013,7 5.3932,10.33022 5.3932,10.33021 0.3474,8.29223 0.3474,8.29223 -1.1402,5.49191 -1.1401,5.4919 -4.7741,2.5984 c -2.6258,1.4291 -6.8953,4.4655 -9.4878,6.7475 l -4.7136,4.1491 -6.1232,8.6381 c -3.3677,4.751 -8.5976,11.4662 -11.6219,14.9227 l -5.4987,6.2845 -6.4588,4.8369 -6.4587,4.8369 -10.4773,5.3113 -10.4773,5.3113 -2.3058,3.0673 -2.3059,3.0673 -1.387,4.9923 -1.387,4.9924 -1.4687,0.1888 z m 1.1504,-7.9909 1.6192,-4.8174 3.2376,-3.3403 3.2375,-3.3403 8.6433,-4.1847 8.6433,-4.1846 6.0704,-4.3301 6.0705,-4.33 5.6596,-6.1131 c 3.1128,-3.3622 8.7718,-10.5024 12.5755,-15.8672 l 6.9158,-9.7541 3.9975,-3.6114 c 2.1986,-1.9863 6.4738,-5.1956 9.5004,-7.1317 l 5.503,-3.5203 1.2192,-7.22775 1.2191,-7.22777 -0.6286,-4.58584 -0.6285,-4.58585 -5.1252,-10.01509 c -2.8189,-5.50831 -6.1523,-12.74317 -7.4077,-16.07748 -1.2554,-3.3343 -2.9604,-9.4093 -3.7888,-13.5 l -1.5062,-7.43762 -0.6314,-13.39282 -0.6313,-13.39282 -1.8244,-4.80135 c -1.0034,-2.64074 -3.5224,-7.83779 -5.5978,-11.54899 l -3.7735,-6.74763 -4.0682,-4.41342 -4.0681,-4.41342 -5.0257,0.45087 -5.0256,0.45087 -7.5,3.20065 -7.5,3.20065 -4.6215,3.3702 -4.6216,3.37019 -9.5532,11.39848 c -5.2543,6.26917 -12.5519,14.20357 -16.2169,17.63202 -3.665,3.42844 -8.9864,7.72047 -11.8252,9.53783 -2.8389,1.81737 -8.4054,5.17953 -12.3701,7.47147 l -7.2084,4.16717 -2.96605,6.23002 c -1.63132,3.42652 -3.25227,7.38174 -3.6021,8.78938 l -0.63606,2.55934 2.31055,5.44066 2.31056,5.44065 0.032,21.5 0.032,21.5 0.86864,9 0.86864,9 1.38219,3.9687 c 0.7602,2.1828 3.3404,7.1328 5.7338,11 2.3934,3.8672 5.4936,9.3098 6.8894,12.0946 l 2.5379,5.0633 1.2434,6.02 1.2434,6.0201 5.5844,0.01 5.5843,0.01 5,2.586 c 2.75,1.4223 6.35,3.8552 8,5.4064 l 3,2.8204 1.6191,-4.8174 z m -260.45243,6.9841 -0.66667,0.6666 0,-1.3333 0,-1.3333 0.66667,0.6666 0.66666,0.6667 -0.66666,0.6667 z m -0.32166,-17.6667 c -0.18975,0 -0.34501,-0.4342 -0.34501,-0.9648 0,-0.5307 1.0125,-1.4961 2.25,-2.1455 l 2.25,-1.1807 -1.90499,2.1455 c -1.04774,1.18 -2.06024,2.1455 -2.25,2.1455 z m -2.84501,-4 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 4.5,-4.1581 -3,2.218 0,-0.8144 c 0,-0.4478 1.35,-1.6117 3,-2.5864 1.65,-0.9747 3,-1.6064 3,-1.4037 0,0.2027 -1.35,1.3666 -3,2.5865 z m -38.61803,-2.8419 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 70.87438,-22.1643 c -1.79099,1.9553 -3.25635,3.1991 -3.25635,2.764 0,-0.4351 0.74454,-2.0515 1.65454,-3.592 l 1.65455,-2.801 4.09174,-2.3533 4.09175,-2.3534 4.50371,-4.9178 c 2.47704,-2.7048 6.78626,-7.2492 9.57605,-10.0985 l 5.07234,-5.1807 7.17459,-2.9015 7.17459,-2.9015 0.58986,-1.8111 0.58985,-1.81113 -1.6515,-7.68888 c -0.90832,-4.22889 -3.03899,-11.73889 -4.73481,-16.68889 l -3.0833,-9 -0.47453,-10.5 -0.47453,-10.5 0.70451,0.6653 0.70451,0.66529 0.8763,9.83471 0.8763,9.8347 4.12054,12.5 4.12054,12.5 0.54417,5.08596 0.54418,5.08594 -1.06049,1.9816 -1.06048,1.9815 -6.81249,2.6764 -6.81249,2.6764 -4.01503,3.7561 c -2.20827,2.0658 -5.80827,6.1607 -8,9.0997 l -3.98497,5.3435 -4.99365,2.5468 -4.99365,2.5467 -3.25635,3.5551 z m -62.06633,-2.8357 c -0.275,0 0.31449,-0.9 1.30998,-2 0.99549,-1.1 2.03498,-2 2.30998,-2 0.275,0 -0.31449,0.9 -1.30998,2 -0.99549,1.1 -2.03498,2 -2.30998,2 z m -46.77812,-4 -2.78363,2.5 4.3424,-5.25 c 2.38832,-2.8875 4.5276,-5.25 4.75396,-5.25 0.22636,0 -0.47509,1.2375 -1.55877,2.75 -1.08368,1.5125 -3.22296,3.875 -4.75396,5.25 z m 15.8381,-26.4791 c -5.0875,6.4321 -9.24334,11.3087 -9.2352,10.8369 0.008,-0.4718 4.54047,-6.4776 10.07184,-13.3463 5.53137,-6.86868 10.34073,-12.71868 10.68747,-13 0.34674,-0.28133 -0.0231,0.4619 -0.82183,1.65161 -0.79876,1.18971 -5.61478,7.42571 -10.70228,13.85779 z m 156.45167,7.4791 c -0.21543,0 -1.20868,-0.9028 -2.20722,-2.0061 -0.99854,-1.1034 -1.63078,-2.1843 -1.40499,-2.4021 0.2258,-0.2178 1.21905,0.685 2.20722,2.0061 0.98818,1.3212 1.62043,2.4021 1.40499,2.4021 z m 286.32583,-1.1079 -1.5275,-0.1078 -2.9987,-2.9044 -2.9986,-2.9044 -4.2638,-1.6284 -4.2638,-1.6283 -6.7376,1.7694 c -3.7056,0.9731 -7.8625,1.8239 -9.2375,1.8906 l -2.5,0.1212 0.3512,-8.64589 0.3512,-8.64589 -1.6676,-5.73641 -1.6676,-5.7364 -4.4229,-8.18021 c -2.4327,-4.49911 -5.3432,-10.85208 -6.4679,-14.1177 -1.1246,-3.26563 -2.7216,-8.85221 -3.5489,-12.41464 l -1.5041,-6.47713 -0.8887,-14.02304 -0.8888,-14.02303 -1.6643,-4.99983 c -0.9154,-2.74991 -2.7483,-6.87996 -4.073,-9.1779 l -2.4086,-4.17807 0,-2.04342 c 0,-1.12388 1.0977,-4.52543 2.4393,-7.55902 1.3416,-3.03358 3.6488,-7.10144 5.1272,-9.03969 l 2.6879,-3.52409 11.2256,-6.96524 11.2256,-6.96523 7.0479,-6.52532 7.048,-6.52532 6.5441,-8.78913 6.5441,-8.78913 4.5573,-3.27284 c 2.5066,-1.80007 7.427,-4.57401 10.9344,-6.16432 3.5074,-1.59032 8.4119,-3.40387 10.899,-4.03012 l 4.5219,-1.13864 3.6394,1.72701 3.6394,1.72701 6.3497,6.95722 6.3498,6.95723 2.6833,4.93024 2.6834,4.93024 1.926,9.57412 c 1.0592,5.26577 2.6576,12.11898 3.5519,15.22935 0.8942,3.11038 3.1199,8.80523 4.9459,12.65523 1.826,3.85 5.7679,10.68449 8.7598,15.18777 l 5.4398,8.18776 1.2428,5.18066 1.2428,5.18066 -0.5499,6.13157 -0.5499,6.13158 -4.3282,3.4715 c -2.3806,1.90933 -6.2889,5.50933 -8.6851,8 l -4.3569,4.5285 -6.8161,11.55468 -6.8162,11.55468 -6.4206,7.94532 -6.4206,7.94532 -10.6475,8.33066 -10.6475,8.33067 -3.4463,4.02613 -3.4462,4.02614 -2.7852,6.3932 -2.7851,6.3932 -1.5275,-0.1079 z m -0.4458,-2.8921 c 0.1494,0 1.4225,-2.5137 2.829,-5.5859 1.4065,-3.07224 3.93,-7.31903 5.6077,-9.43731 l 3.0504,-3.85143 7.3568,-5.53691 c 4.0463,-3.04531 9.8823,-7.84506 12.969,-10.66612 l 5.6122,-5.1292 5.7706,-7.65824 5.7707,-7.65824 4.9449,-8.98832 4.945,-8.98833 9.281,-9.23951 9.281,-9.2395 0,-7.04261 0,-7.04262 -1.3584,-3.21788 c -0.7471,-1.76983 -4.1317,-7.49288 -7.5214,-12.71788 l -6.1631,-9.5 -3.0914,-8 -3.0913,-8 -2.4178,-11.5 -2.4178,-11.5 -2.499,-5.16031 -2.4991,-5.16031 -6.4401,-6.95581 -6.44,-6.95581 -3.1143,-1.29001 -3.1144,-1.29001 -5.306,1.67256 c -2.9183,0.91992 -7.9429,3.07775 -11.1659,4.79519 -3.223,1.71745 -7.2883,4.29755 -9.034,5.73357 -1.7457,1.43602 -5.5207,5.76094 -8.3889,9.61094 -2.8682,3.85 -7.2899,9.1733 -9.826,11.82955 -2.5361,2.65625 -7.3111,6.96716 -10.6111,9.57981 -3.3,2.61264 -9.9361,7.10618 -14.7468,9.98565 l -8.7468,5.23539 -2.9729,4.32097 c -1.6351,2.37654 -3.8233,6.5097 -4.8627,9.1848 l -1.8897,4.86383 1.8656,3 c 1.0261,1.65 2.8145,5.475 3.9743,8.5 l 2.1087,5.5 1.3176,16.06862 1.3175,16.06863 2.1044,8.43137 2.1043,8.43138 6.4299,13 6.4299,13 0.9676,6.18685 0.9676,6.18685 -0.5741,5.56315 -0.5742,5.56315 0.5142,0 c 0.2828,0 2.4273,-0.675 4.7656,-1.5 l 4.2515,-1.5 5.1242,0.022 5.1243,0.022 4,1.83678 4,1.8368 1.905,2.1413 c 1.0477,1.1776 2.0272,2.1412 2.1767,2.1412 z m -284.91503,1.6667 -0.66667,0.6666 0,-1.3333 0,-1.3333 0.66667,0.6666 0.66666,0.6667 -0.66666,0.6667 z m 2.7153,-0.6667 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m -19.88197,-7 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 2,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -123.75,-27.85126 c -3.1625,5.03329 -5.75,8.83654 -5.75,8.45168 0,-0.38486 0.74272,-2.13989 1.65049,-3.90008 0.90776,-1.76019 4.73355,-7.70034 8.50174,-13.20034 3.76819,-5.5 8.42547,-12.18664 10.34951,-14.85919 l 3.49826,-4.85919 0,-1.91301 0,-1.913 4.01116,-7.97781 c 2.20614,-4.38779 4.21978,-7.9778 4.47475,-7.9778 0.25498,0 -1.15089,3.4875 -3.12416,7.75 -1.97326,4.2625 -3.94336,9.2296 -4.37801,11.038 -0.43464,1.8084 -1.39629,4.12307 -2.137,5.14371 -0.74071,1.02064 -3.59674,4.82794 -6.34674,8.46066 -2.75,3.63272 -7.5875,10.72309 -10.75,15.75637 z m -494.77305,5.85126 -1.97695,0 -2.09866,-2.09866 -2.09866,-2.09866 -2.26028,-5.15134 c -1.24315,-2.83324 -3.62105,-9.20134 -5.28422,-14.15134 -1.66317,-4.95 -3.69819,-11.475 -4.52226,-14.5 -0.82407,-3.025 -2.46206,-9.775 -3.63997,-15 -1.17791,-5.225 -2.83542,-13.325 -3.68335,-18 -0.84793,-4.675 -2.44285,-12.06824 -3.54425,-16.42942 -1.1014,-4.36118 -2.65891,-9.19868 -3.46113,-10.75 l -1.45858,-2.82058 -1.40152,0 -1.40151,0 -2.93658,3.56258 c -1.61511,1.95941 -5.4403,8.14691 -8.5004,13.75 l -5.56383,10.18742 -3.48137,3.35793 -3.48136,3.35794 -4.59104,-0.36514 -4.59103,-0.36514 0,0.52307 c 0,0.2877 1.79954,3.60254 3.99897,7.36633 2.19943,3.7638 6.04496,9.77008 8.54561,13.3473 l 4.54665,6.50403 -0.33794,1.01381 -0.33794,1.01381 -14.45767,5.94491 c -7.95173,3.2697 -22.91812,9.56155 -33.25865,13.98189 l -18.80098,8.03697 -2.09532,-1.85885 c -1.15243,-1.02237 -5.82893,-6.03551 -10.39223,-11.14029 -4.5633,-5.10479 -11.45651,-13.50359 -15.31824,-18.664 -3.86174,-5.16041 -9.1581,-12.68377 -11.76971,-16.71857 -2.61161,-4.0348 -7.11791,-11.836 -10.014,-17.336 -2.89609,-5.5 -5.27528,-9.64457 -5.28709,-9.21016 -0.0118,0.43441 0.88769,2.57191 1.99886,4.75 1.11118,2.17809 1.79376,3.96016 1.51685,3.96016 -0.27691,0 -1.5631,-2.1375 -2.85818,-4.75 -1.29509,-2.6125 -4.23254,-9.47646 -6.52767,-15.25323 -2.29514,-5.77678 -5.04301,-11.9339 -6.10639,-13.68249 l -1.93341,-3.17925 -3.30576,-0.40748 -3.30576,-0.40748 3.67742,-0.16003 3.67742,-0.16004 2.21823,2.75 2.21824,2.75 -0.69798,-2.5 c -0.38389,-1.375 -1.66484,-6.775 -2.84655,-12 l -2.14857,-9.5 8.6e-4,-18 8.6e-4,-18 2.22023,-10.25617 2.22022,-10.25617 3.35108,-9.25749 c 1.84309,-5.09162 5.49031,-13.52634 8.10494,-18.74383 2.61462,-5.21749 6.77653,-12.62132 9.24869,-16.45297 2.47216,-3.83164 7.23096,-10.58164 10.57511,-15 l 6.08027,-8.03337 12.04976,-12.3667 c 6.62738,-6.80169 15.87477,-15.61296 20.54977,-19.58061 4.675,-3.96765 12.05752,-9.83463 16.4056,-13.03773 4.34808,-3.20311 12.44637,-8.70285 17.99619,-12.22165 l 10.09058,-6.39782 1.58359,0.41412 c 0.87097,0.22777 12.01019,8.4322 24.75381,18.23207 L -79,-424.20677 l 0,1.16869 0,1.16869 -11.59673,11.4015 -11.59673,11.40149 -6.47245,8 c -3.55984,4.4 -9.17118,12.01164 -12.46964,16.91475 l -5.99719,8.91476 -5.39231,11.08524 c -2.96577,6.09689 -6.50794,14.46025 -7.87149,18.58525 -1.36354,4.125 -2.70029,8.625 -2.97055,10 -0.27026,1.375 -1.31073,6.1 -2.31215,10.5 l -1.82076,8 0.0457,20.5 0.0457,20.5 2.18219,10.04842 c 1.20021,5.52663 3.70717,14.58557 5.57102,20.13098 1.86384,5.54541 4.84099,13.23311 6.61588,17.08378 l 3.22707,7.00121 2.45331,1.11781 c 1.34932,0.61479 3.61651,1.1178 5.03819,1.1178 l 2.58487,0 3.30432,-3.50361 3.30433,-3.5036 5.25807,-10.05458 5.25807,-10.05458 3.05568,-3.37184 3.05568,-3.37184 2.16765,-0.61123 2.16764,-0.61122 2.44783,3.29125 2.44782,3.29125 2.62038,11 c 1.44122,6.05 3.33912,15.05 4.21756,20 0.87844,4.95 2.47288,12.6 3.54319,17 1.07031,4.4 2.45417,9.8 3.07523,12 0.62106,2.2 1.99826,6.7 3.06045,10 1.06218,3.3 3.24482,9.41268 4.85031,13.58373 l 2.91907,7.58374 2.32241,2.18178 2.3224,2.18179 1.71063,-1.89023 1.71062,-1.89022 1.93657,-6.87529 c 1.06511,-3.78142 3.72141,-17.0003 5.90289,-29.3753 2.18149,-12.375 4.63134,-25.425 5.44413,-29 0.81279,-3.575 1.98773,-8.525 2.61099,-11 0.62326,-2.475 2.44413,-8.42104 4.0464,-13.21342 1.60226,-4.79239 3.48979,-9.74239 4.19451,-11 0.70473,-1.25762 2.14726,-3.29908 3.20563,-4.53658 l 1.92432,-2.25 2.2531,0 2.25311,0 1.96155,2.49371 1.96156,2.49372 3.49948,10.25628 c 1.92472,5.64096 5.22677,15.65629 7.3379,22.25629 l 3.83841,12 4.30858,8.6751 4.30857,8.6751 5.84241,5.40905 5.84241,5.40904 8.66785,4.29384 8.66785,4.29385 4.28858,0.48338 4.28858,0.48339 3.0466,-1.57546 3.0466,-1.57546 2.63801,-3.1351 2.63801,-3.1351 3.86052,-8.15081 c 2.12329,-4.48295 6.22398,-14.67582 9.11265,-22.65082 2.88866,-7.975 6.72238,-17.425 8.51938,-21 l 3.26726,-6.5 2.3512,-2.11876 2.3512,-2.11876 2.67328,-0.63104 2.67328,-0.63103 2.83258,2.83257 2.83257,2.83258 2.68121,5.47573 c 1.47466,3.01165 4.31255,9.9494 6.30643,15.41722 1.99387,5.46782 5.66412,15.56649 8.15611,22.44149 2.49199,6.875 6.07558,15.65601 7.96352,19.51335 l 3.43262,7.01336 3.42322,3.73664 3.42321,3.73665 2.00393,0 c 1.10217,0 3.09282,-0.49613 4.42367,-1.10251 l 2.41974,-1.1025 3.54208,-4.6475 3.54208,-4.64749 7.7213,-14.5 c 4.24671,-7.975 9.68987,-17.55895 12.0959,-21.29767 l 4.3746,-6.79767 4.50314,-4.37655 4.50313,-4.37655 4.88105,-1.62122 4.88106,-1.62122 2.85514,0.66373 c 1.57033,0.36506 4.69637,1.7127 6.94674,2.99476 l 4.09159,2.33103 3.96024,5.30068 c 2.17812,2.91537 7.5272,11.52499 11.88682,19.13247 l 7.92659,13.83179 3.31972,3.41821 3.31973,3.41821 2.88491,0 2.88491,0 3.43861,-4.25 3.43861,-4.25 8.20427,-16 8.20427,-16 3.58366,-3.7056 3.58366,-3.70559 2.73682,-0.60111 2.73682,-0.60111 3.36214,1.4048 3.36214,1.40479 8.72416,7.60659 8.72416,7.60659 4.05227,1.21409 4.05227,1.21409 11.21502,-5.60122 11.21502,-5.60122 6.5,-1.6704 c 3.575,-0.91873 10.69398,-3.02172 15.81995,-4.67332 l 9.31995,-3.00292 7.21555,0.36437 7.21555,0.36437 7.25668,4.31112 7.25668,4.31111 3.20782,0.51168 3.20782,0.51168 3.49422,-2.36734 3.49423,-2.36733 3.58302,-6.16248 3.58302,-6.16249 3.77001,-10.30157 3.77,-10.30158 2.38867,-3.70728 2.38866,-3.70728 1.76409,-0.89611 1.76408,-0.8961 3.09743,0.84244 3.09744,0.84245 4.0258,5.76094 c 2.2142,3.16852 6.6445,10.61867 9.84513,16.5559 l 5.81932,10.79497 3.50681,4.09692 3.50681,4.09692 -2.23075,-1.19386 -2.23075,-1.19387 -3.05095,-4.19802 c -1.67802,-2.30891 -4.67282,-7.12302 -6.6551,-10.69802 -1.98228,-3.575 -5.62036,-9.5898 -8.0846,-13.36622 l -4.48046,-6.86621 -3.03009,-1.84271 -3.03009,-1.84271 -1.47465,1.20892 c -0.81106,0.66491 -2.91802,4.35893 -4.68214,8.20893 -1.76412,3.85 -4.22669,9.925 -5.47238,13.5 -1.24568,3.575 -3.57741,8.83484 -5.18161,11.68854 l -2.91672,5.18855 -3.94211,3.56145 -3.9421,3.56146 -4.0932,0 -4.09319,0 -8.60109,-4.68846 -8.60109,-4.68845 -4.42695,-0.67185 -4.42696,-0.67184 -9.12588,2.86726 c -5.01923,1.577 -12.05088,3.55045 -15.62588,4.38546 l -6.5,1.5182 -11.05362,5.47678 -11.05362,5.47678 -4.06105,0.56802 -4.06105,0.56803 -3.40968,-1.42466 -3.40969,-1.42466 -7.77346,-6.8953 c -4.2754,-3.79242 -9.13942,-7.64634 -10.80892,-8.56426 l -3.03546,-1.66895 -2.89877,1.01052 -2.89878,1.01051 -3.37132,4.65844 c -1.85423,2.56214 -6.45109,10.73343 -10.21524,18.15843 -3.76415,7.425 -8.21068,15.3 -9.88116,17.5 -1.67049,2.2 -3.71921,4.54819 -4.55272,5.2182 l -1.51546,1.21819 -3.92142,0.0318 -3.92141,0.0318 -4.07859,-4.30874 -4.07858,-4.30874 -7.31784,-13.0256 -7.31784,-13.0256 -4.51188,-5.7486 -4.51188,-5.7486 -5.02551,-2.32835 -5.02552,-2.32836 -3.14477,1.08149 c -1.72962,0.59483 -4.81471,2.17809 -6.85576,3.51838 l -3.711,2.43687 -3.92726,5.14293 c -2.15999,2.8286 -5.48187,7.61792 -7.38195,10.64292 -1.90008,3.025 -6.01693,10.38501 -9.14855,16.35557 -3.13162,5.97057 -7.19116,13.17057 -9.02121,16 -1.83005,2.82944 -4.44143,6.16768 -5.80307,7.41831 l -2.4757,2.27388 -2.98974,0.85745 -2.98973,0.85744 -2.96997,-1.24878 -2.96997,-1.24878 -2.86916,-3.38254 -2.86915,-3.38255 -4.20257,-9 c -2.31141,-4.95 -5.43322,-12.6 -6.93736,-17 -1.50414,-4.4 -5.10068,-14.3 -7.9923,-22 -2.89162,-7.7 -6.26455,-15.8 -7.49538,-18 -1.23084,-2.2 -2.93697,-4.7875 -3.7914,-5.75 l -1.55351,-1.75 -1.65792,0 -1.65792,0 -2.58137,2.75 -2.58136,2.75 -2.98081,6 c -1.63945,3.3 -4.11301,9.15 -5.49681,13 -1.3838,3.85 -4.16387,11.275 -6.17795,16.5 -2.01407,5.225 -5.05897,12.2 -6.76644,15.5 -1.70747,3.3 -4.37553,7.62956 -5.92902,9.62125 l -2.82453,3.62124 -3.02299,1.25217 -3.023,1.25216 -5.30413,-0.43986 -5.30413,-0.43986 -6.61846,-3.09715 c -3.64015,-1.70343 -9.34739,-4.95033 -12.68275,-7.21533 l -6.06431,-4.11819 -4.09812,-5.54742 -4.09812,-5.54743 -2.52955,-5.67079 c -1.39134,-3.11892 -3.40232,-8.14578 -4.46893,-11.17078 -1.06661,-3.025 -3.96267,-11.97921 -6.43569,-19.89824 -2.47302,-7.91903 -5.33862,-16.04914 -6.36801,-18.0669 -1.02938,-2.01776 -2.52864,-4.21395 -3.33168,-4.88041 l -1.46009,-1.21176 -2.43665,2.8958 c -1.34016,1.59269 -3.01143,4.41808 -3.71393,6.27865 -0.7025,1.86057 -1.6475,4.28286 -2.1,5.38286 -0.4525,1.1 -1.75708,5.11328 -2.89908,8.91841 -1.14199,3.80512 -2.07635,7.52373 -2.07635,8.26357 0,0.73984 -0.40879,2.12655 -0.90843,3.08159 -0.49964,0.95504 -1.61904,5.33643 -2.48756,9.73643 -0.86853,4.4 -3.16999,17 -5.11437,28 -1.94437,11 -4.40328,23.08339 -5.46424,26.85197 -1.06095,3.76858 -2.63607,7.93108 -3.50026,9.25 l -1.57125,2.39803 -1.97694,0 z m -100.74709,-20.43878 c 10.59858,-4.52588 25.16103,-10.61934 32.361,-13.54101 l 13.09085,-5.31213 -6.31125,-9.43964 -6.31125,-9.43965 -6.0161,-12.16439 -6.0161,-12.1644 -3.96809,-12 -3.96808,-12 -2.19106,-12 -2.19106,-12 -0.006,-16 -0.006,-16 1.68558,-9 c 0.92707,-4.95 3.29353,-14.175 5.25879,-20.5 l 3.57321,-11.5 4.7886,-10 4.7886,-10 6.92284,-10.5 6.92285,-10.5 7.56405,-9 c 4.16023,-4.95 12.15055,-13.44382 17.75627,-18.87515 l 10.19221,-9.87516 -0.82484,-0.7988 c -0.45367,-0.43934 -10.90962,-8.43588 -23.23545,-17.77008 l -22.41061,-16.97128 -8.40712,5.14524 c -4.62392,2.82987 -13.88915,9.22726 -20.5894,14.21642 l -12.18227,9.07118 -10.65407,9.64079 c -5.85974,5.30243 -14.29162,13.69779 -18.73751,18.65636 -4.44589,4.95856 -10.75309,12.61613 -14.01599,17.01681 -3.26291,4.40068 -8.2448,11.82928 -11.07088,16.50799 -2.82608,4.67872 -6.68231,11.84851 -8.5694,15.93288 -1.88709,4.08436 -4.77638,11.44156 -6.42063,16.34933 -1.64426,4.90777 -3.65014,12.06353 -4.45752,15.90168 -0.80738,3.83815 -1.95355,11.75218 -2.54704,17.58674 l -1.07908,10.60829 1.04872,11.12073 c 0.5768,6.1164 1.72031,14.36417 2.54114,18.32838 0.82083,3.96421 2.876,11.48265 4.56704,16.70765 l 3.07463,9.5 6.76295,14 6.76295,14 6.97265,10.5 c 3.83495,5.775 10.1883,14.50346 14.11854,19.39658 3.93024,4.89311 10.52479,12.60838 14.65456,17.14504 l 7.50866,8.24847 19.27014,-8.22887 z M -233.5,-226.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -0.7848,-2.38187 c 0.25747,-0.25747 -0.009,-1.28938 -0.59313,-2.29313 -0.58369,-1.00375 -1.07494,-1.5243 -1.09166,-1.15679 -0.0167,0.36752 0.25018,1.39943 0.59313,2.29313 0.34295,0.8937 0.83419,1.41426 1.09166,1.15679 z m -2.04853,-4.95146 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z M -237.5,-236.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -0.83333,-2.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z M -239.5,-241.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -1,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -0.83333,-2.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z M -246.5,-141.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 769,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -17.11803,-1 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 14.901,-0.0833 c -0.15563,0.22913 -0.28297,-0.0533 -0.28297,-0.62759 0,-0.57432 0.7875,-1.66182 1.75,-2.41667 l 1.75,-1.37244 -1.46703,2 c -0.80687,1.1 -1.59437,2.1875 -1.75,2.41667 z m 3.21703,-0.9167 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -772.86908,-1 c -0.21232,0 -0.95526,-0.68587 -1.65098,-1.52417 -0.69572,-0.83829 -1.07128,-1.71782 -0.83459,-1.95452 0.2367,-0.23669 0.97964,0.44918 1.65098,1.52417 0.67134,1.07499 1.04691,1.95452 0.83459,1.95452 z m 756.75105,-1 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 17.11803,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -776.59738,-4.56929 c -0.26308,0.26308 -1.07408,-0.5137 -1.80223,-1.72619 l -1.3239,-2.20452 1.80223,1.72619 c 0.99123,0.94941 1.58698,1.94144 1.3239,2.20452 z M -255.5,-156.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 785,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -12.39522,-2.56476 -0.89521,0.55327 -0.50944,-1.32759 -0.50945,-1.32759 1.40466,0 c 0.77256,0 1.40466,0.34845 1.40466,0.77432 0,0.42587 -0.40285,1.02329 -0.89522,1.32759 z M 530.5,-158.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -787.7593,-2.40737 c -0.2287,0.2287 -0.93892,-0.73225 -1.57826,-2.13546 -0.63934,-1.4032 -1.14442,-2.8676 -1.1224,-3.25422 0.022,-0.38662 0.73223,0.57433 1.57826,2.13546 0.84602,1.56112 1.3511,3.02552 1.1224,3.25422 z M 532.5,-162.5664 c -0.78602,1.375 -1.42913,2.05 -1.42913,1.5 0,-0.55 0.64311,-2.125 1.42913,-3.5 0.78602,-1.375 1.42913,-2.05 1.42913,-1.5 0,0.55 -0.64311,2.125 -1.42913,3.5 z m -13.87058,0 c -0.22849,0 -0.64113,-0.58813 -0.91697,-1.30695 l -0.50152,-1.30695 3.50933,-6.94305 c 1.93013,-3.81868 5.72605,-12.95328 8.43537,-20.29911 2.70933,-7.34583 6.48833,-16.45833 8.39778,-20.25 l 3.47173,-6.89394 1.58105,0 1.58105,0 0.50492,1.9308 0.50491,1.93081 1.32477,-0.50837 1.32478,-0.50836 1.03663,1.93697 1.03664,1.93698 -0.6033,3.71766 -0.60329,3.71766 -0.71073,-1.14999 -0.71073,-1.14999 -0.60962,4.44763 c -0.33529,2.44619 -1.9973,8.6665 -3.69336,13.82291 -1.69606,5.15641 -4.19363,11.62529 -5.55017,14.37529 -1.35654,2.75 -2.29694,4.325 -2.08979,3.5 0.20716,-0.825 0.6916,-2.625 1.07656,-4 l 0.69991,-2.5 -2.04045,2.5 -2.04045,2.5 -0.0222,-1.11514 c -0.0122,-0.61333 0.77214,-2.18833 1.74305,-3.5 0.97091,-1.31167 2.72513,-4.18486 3.89827,-6.38486 l 2.13297,-4 2.00665,-7.5 c 1.10365,-4.125 2.29342,-8.85 2.64393,-10.5 l 0.63729,-3 -8.15689,15 c -4.48629,8.25 -10.57019,18.7125 -13.51977,23.25 -2.94958,4.5375 -5.54983,8.25 -5.77832,8.25 z m -0.24745,-2 c 0.275,0 0.77811,-0.45 1.11803,-1 0.33992,-0.55 0.39303,-1 0.11803,-1 -0.275,0 -0.77811,0.45 -1.11803,1 -0.33992,0.55 -0.39303,1 -0.11803,1 z m 2.11803,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 5,-9 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2.98746,-6 c 0.2681,0 1.70094,-1.9125 3.18409,-4.25 l 2.69664,-4.25 -0.12357,-1.77161 -0.12358,-1.77162 1.09399,0.67613 1.09399,0.67612 -0.72361,-1.17082 -0.72361,-1.17082 -0.99907,0.61746 -0.99908,0.61746 0.53679,1.39885 0.53679,1.39885 -1.02763,0 -1.02763,0 0.72306,1.16994 0.72306,1.16994 -1.55086,-0.59512 -1.55086,-0.59512 0.47356,2.17518 0.47356,2.17518 -1.18108,-1.5 -1.18107,-1.5 0.56294,1.75 0.56295,1.75 -0.96861,0 -0.96862,0 0,1.5 c 0,0.825 0.21935,1.5 0.48746,1.5 z m 3.17921,-10.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z M 532.5,-195.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 4,0 c 0.21008,0 0.61373,-0.375 0.89699,-0.83333 l 0.51503,-0.83334 -1.41202,0 -1.41202,0 0.51503,0.83334 c 0.28326,0.45833 0.68691,0.83333 0.89699,0.83333 z m -3,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 5.41964,-5.5 2.87551,-5 0.6631,-3.5 0.6631,-3.5 -1.04536,1.5 c -0.57495,0.825 -1.05226,2.17858 -1.06068,3.00796 -0.008,0.82937 -1.14031,3.62126 -2.51531,6.20419 -1.375,2.58293 -2.49007,5.05435 -2.47794,5.49204 0.0121,0.4377 1.31604,-1.45419 2.89758,-4.20419 z m -0.41964,4.5 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -4,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 5,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 6,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 0.88197,-3 c 0.275,0 0.77811,-0.45 1.11803,-1 0.33992,-0.55 0.39303,-1 0.11803,-1 -0.275,0 -0.77811,0.45 -1.11803,1 -0.33992,0.55 -0.39303,1 -0.11803,1 z m 3.11803,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -8,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 1,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 3.16667,-1.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z M 541.5,-216.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -801.83949,49 c -0.18671,0 -0.86903,-1.2375 -1.51625,-2.75 l -1.17676,-2.75 1.51625,1.94113 c 0.83394,1.06762 1.51625,2.30512 1.51625,2.75 0,0.44488 -0.15277,0.80887 -0.33949,0.80887 z m 790.91315,-1.22619 -1.80729,1.72619 1.19784,-2.33565 1.19783,-2.33564 0.60946,0.60945 0.60945,0.60946 -1.80729,1.72619 z m 9.68982,-6.18606 -1.23651,1.91225 2.06631,-5.5 c 1.13648,-3.025 3.60541,-9.9216 5.48652,-15.32579 l 3.4202,-9.82579 0,-2.31722 0,-2.31722 1.5,-0.57561 1.5,-0.5756 0,-1.5904 0,-1.5904 -1,0.61803 -1,0.61803 0,-1.05901 0,-1.05902 1,0 1,0 0,-1.13365 c 0,-0.62351 1.2375,-2.19796 2.75,-3.49878 l 2.75,-2.36513 -3.5,-0.004 c -1.925,-0.002 -13.175,-0.45888 -25,-1.01489 -11.825,-0.55601 -28.025,-1.71355 -36,-2.57231 l -14.5,-1.56138 -7.69692,-1.87755 -7.69692,-1.87754 -4.28291,-2.18498 c -2.35561,-1.20174 -5.95189,-3.52621 -7.99175,-5.16548 l -3.70883,-2.9805 -1.56133,-3.90216 c -0.85874,-2.14619 -1.52266,-4.68056 -1.47539,-5.63193 l 0.086,-1.72976 0.77321,2.54678 c 0.42527,1.40072 1.96387,4.4329 3.41912,6.73816 l 2.64591,4.19139 6.18501,3.12218 c 3.40175,1.71721 8.23697,3.73006 10.74492,4.47301 2.50796,0.74296 8.83492,2.02436 14.05992,2.84756 l 9.5,1.49673 34,1.56959 34,1.5696 15,1.48752 c 8.25,0.81814 20.53966,2.41031 27.31036,3.53815 6.77069,1.12785 14.13977,2.69609 16.37572,3.48498 2.23596,0.78889 4.74836,1.43435 5.58313,1.43435 l 1.51775,0 -0.69419,-9.25 -0.69419,-9.25 -2.46681,-12.41881 c -1.35674,-6.83034 -3.80892,-16.71245 -5.44929,-21.96024 -1.64036,-5.24779 -2.94561,-10.45933 -2.90055,-11.58119 l 0.0819,-2.03976 2.40465,5.26389 2.40466,5.26388 2.49243,9.73612 c 1.37083,5.35486 3.15336,14.01111 3.96116,19.23611 0.80781,5.225 1.77296,13.18494 2.14477,17.68874 l 0.67602,8.18875 -0.61024,2.43139 -0.61024,2.4314 -5.60398,-1.84877 c -3.08219,-1.01682 -9.21299,-2.53338 -13.62401,-3.37014 -4.41101,-0.83675 -8.75782,-1.51448 -9.65956,-1.50606 l -1.63953,0.0154 1.5,0.96937 1.5,0.96937 -2,-0.004 c -1.1,-0.002 -7.85,-0.66592 -15,-1.4747 -7.15,-0.80877 -14.85791,-1.475 -17.12868,-1.48049 l -4.12868,-0.01 -1.28211,3.25 c -0.70517,1.7875 -4.35976,9.439 -8.12132,17.00333 -3.76157,7.56434 -6.83921,14.20184 -6.83921,14.75 0,0.54817 -0.7875,1.82366 -1.75,2.83442 -0.9625,1.01076 -2.30643,2.69826 -2.98652,3.75 z m 14.13461,-31.08775 c 1.88989,-3.85 3.74569,-8.06574 4.12398,-9.36831 l 0.68781,-2.36832 -1.21003,0.40335 -1.21002,0.40334 -2.26804,6.96497 c -1.24743,3.83073 -2.55871,7.86497 -2.91397,8.96497 -0.35525,1.1 0.90037,-1.15 2.79027,-5 z M 594,-215.72429 l 2.5,0 -1.25,-0.50439 -1.25,-0.50439 -1.25,0.50439 -1.25,0.50439 2.5,0 z m -7.5,-1.03706 3,0.0371 -1.23097,-0.49805 c -0.67703,-0.27392 -2.02703,-0.29059 -3,-0.0371 l -1.76903,0.461 3,0.0371 z m -9,-1.05723 4,0.0202 -1.73834,-0.45508 c -0.95609,-0.25029 -2.75609,-0.25937 -4,-0.0202 l -2.26166,0.4349 4,0.0202 z m -10,-1 4,0.0202 -1.73834,-0.45508 c -0.95609,-0.25029 -2.75609,-0.25937 -4,-0.0202 l -2.26166,0.4349 4,0.0202 z m -103.83333,19.91885 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z m 1.72001,-5.16667 -1.36607,3 0.61333,-2.5 c 0.33732,-1.375 1.22805,-3.85 1.97938,-5.5 l 1.36607,-3 -0.61333,2.5 c -0.33732,1.375 -1.22805,3.85 -1.97938,5.5 z m 3.27999,-8.83333 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z m -5.91241,-1.66667 -0.89712,0 1.6597,-1.6597 c 0.91283,-0.91283 2.75062,-3.38783 4.08397,-5.5 1.33335,-2.11216 2.65519,-3.8403 2.93741,-3.8403 0.28223,0 -0.22605,1.4625 -1.12951,3.25 -0.90346,1.7875 -2.56846,4.2625 -3.7,5.5 -1.13153,1.2375 -2.46104,2.25 -2.95445,2.25 z m 6.74574,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 81,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -80,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 1,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 1,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -14.15711,-4 c -0.55,0 -3.10484,-1.39419 -5.67742,-3.09819 l -4.67741,-3.09819 -3.656,-6.53754 -3.656,-6.53753 -3.87711,-12.10647 -3.87711,-12.10648 -2.57918,-13.5078 -2.57917,-13.5078 -0.50768,-20.25 -0.50767,-20.25 -0.62407,-4.7e-4 c -0.34324,-2.6e-4 -14.57407,3.5786 -31.62407,7.95302 l -31,7.9535 -26,4.5634 c -14.3,2.50988 -27.35,4.75593 -29,4.99124 l -3,0.42783 2,-0.94076 c 1.1,-0.51742 14.54717,-3.18563 29.88259,-5.92937 l 27.88259,-4.98861 28.11741,-7.05735 c 15.46458,-3.88155 29.50268,-7.55072 31.19579,-8.15372 l 3.07839,-1.09637 1.28856,-9.10424 1.28857,-9.10423 2.8102,-10.00694 c 1.54561,-5.50381 4.41798,-14.44811 6.38305,-19.87622 1.96507,-5.42811 3.57285,-10.00469 3.57285,-10.17017 0,-0.16549 -4.8375,1.00948 -10.75,2.61103 -5.9125,1.60155 -13.225,3.39023 -16.25,3.97484 l -5.5,1.06294 -17.43718,0.84211 -17.43718,0.84212 -1.39667,-0.53596 -1.39666,-0.53595 1.11401,-0.6885 1.11402,-0.68849 -6.27663,-1.74506 -6.27662,-1.74506 -5.97681,-3.17728 -5.9768,-3.17728 -6.31732,-5.90261 c -3.47452,-3.24644 -7.27363,-7.29644 -8.44247,-9 l -2.12516,-3.09739 7.69955,7.74415 7.69955,7.74416 9.21619,4.45257 9.21618,4.45257 9,1.67395 9,1.67395 12.5,-0.56493 12.5,-0.56493 10.5,-2.49067 c 5.775,-1.36987 13.65,-3.53246 17.5,-4.80575 l 7,-2.31507 2.24029,-4.75 c 1.23215,-2.6125 2.45852,-4.75 2.72524,-4.75 0.26673,0 0.017,1.23074 -0.55487,2.73498 -0.57191,1.50425 -1.65189,4.09175 -2.39994,5.75 -0.74806,1.65826 -3.35727,8.41502 -5.79825,15.01502 l -4.43815,12 -3.08256,12 -3.08256,12 -1.0546,9.71059 -1.0546,9.71058 0.0312,11.28942 0.0312,11.28941 1.39434,11.72187 c 0.76689,6.44704 2.13793,15.22204 3.04675,19.5 0.90882,4.27797 3.27012,13.07881 5.24734,19.55743 l 3.59494,11.7793 0.91387,-1.2793 0.91387,-1.2793 -0.50952,2.3127 -0.50952,2.3127 1.49254,3.57216 c 0.8209,1.96468 2.46555,4.88821 3.65478,6.49673 l 2.16223,2.92458 4.43944,2.94056 c 2.4417,1.61732 3.98945,2.94057 3.43945,2.94057 z M 379,-391.72429 l 2.5,0 -1.25,-0.50439 -1.25,-0.50439 -1.25,0.50439 -1.25,0.50439 2.5,0 z m -671.5,130.15789 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0.18933,-5.25 -0.45733,1.75 0,-3.5 0,-3.5 0.45733,1.75 c 0.25152,0.9625 0.25152,2.5375 0,3.5 z m 897.20944,-13.35763 c -0.21932,0.19612 -1.11097,0.0756 -1.98143,-0.2679 -0.87046,-0.34346 -3.53896,-2.31197 -5.93,-4.37447 l -4.34734,-3.75 1.93,0.041 1.93,0.041 4.39877,3.97688 c 2.41933,2.18728 4.21933,4.13734 4,4.33346 z M -293.5,-286.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 894.80902,-2.13164 c -0.44496,-0.0724 -2.38402,-0.46317 -4.30902,-0.86836 l -3.5,-0.73672 3.69098,-0.13164 3.69099,-0.13164 0.61803,1 0.61803,1 -0.80901,-0.13164 z M 116.5,-297.16226 c -26.95,0.18157 -53.275,0.17203 -58.5,-0.0212 -5.225,-0.19322 -21.875,-1.058 -37,-1.92174 -15.125,-0.86375 -38.975,-2.6802 -53,-4.03658 -14.025,-1.35637 -29.96175,-3.13104 -35.415,-3.94372 -5.45325,-0.81267 -10.17363,-1.73622 -10.48973,-2.05232 l -0.57473,-0.57473 7.98973,0.60915 c 4.39435,0.33503 9.56473,0.82124 11.48973,1.08047 1.925,0.25922 15.425,1.59127 30,2.96011 l 26.5,2.48881 5.5,-0.14166 5.5,-0.14166 -9.5,-0.73361 c -5.225,-0.40349 -14.675,-1.33514 -21,-2.07034 l -11.5,-1.33673 2.44455,-0.37925 c 1.3445,-0.20859 8.0945,0.10597 15,0.69903 6.9055,0.59305 25.15545,1.73484 40.55545,2.53732 15.4,0.80248 40.6,1.72427 56,2.04844 l 28,0.58939 35.5,-1.00562 c 19.525,-0.55308 41.125,-1.30495 48,-1.6708 l 12.5,-0.66519 -0.55146,0.60726 c -0.30331,0.334 -7.72831,1.12132 -16.5,1.7496 -8.7717,0.62829 -27.42354,1.49688 -41.44854,1.93021 l -25.5,0.78787 29,-0.39192 29,-0.39191 21.5,-1.46433 c 11.825,-0.80538 32.525,-2.38003 46,-3.49923 13.475,-1.11919 27.79506,-2.48813 31.82236,-3.04209 4.0273,-0.55395 8.0398,-1.00719 8.91667,-1.00719 0.87687,0 1.38308,0.21122 1.12492,0.46938 -0.25815,0.25816 -4.94565,1.13964 -10.41666,1.95886 -5.47101,0.81921 -21.64729,2.62371 -35.94729,4.01001 -14.3,1.38629 -37.25,3.22146 -51,4.07816 l -25,1.55762 -49,0.33011 z m -11,-1.7987 14,-0.003 -7.29375,-0.346 c -4.01156,-0.1903 -10.31156,-0.18902 -14,0.003 l -6.70625,0.34883 14,-0.003 z m -37.5,-0.94752 21.5,-0.0126 -24.5,-0.68367 c -13.475,-0.37601 -31.7,-0.93638 -40.5,-1.24527 l -16,-0.56161 19,1.25787 19,1.25787 21.5,-0.0126 z m 138.5,-3.65792 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 8,-1.19495 -3,-0.0371 1.76903,-0.46099 c 0.97297,-0.25354 2.32297,-0.23687 3,0.0371 l 1.23097,0.49805 -3,-0.0371 z m 11,-1 -3,-0.0371 1.76903,-0.46099 c 0.97297,-0.25354 2.32297,-0.23687 3,0.0371 l 1.23097,0.49805 -3,-0.0371 z m 4,0.19495 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -536.56618,-4 -0.86682,2.5 0.34153,-12.5 0.34152,-12.5 2.59009,-12.5 c 1.42455,-6.875 4.43522,-19.25 6.69038,-27.5 l 4.10028,-15 4.56379,-11.5 c 2.51009,-6.325 7.22429,-16.81775 10.476,-23.31721 l 5.91221,-11.81721 11.35134,-17.18279 11.35134,-17.18279 10.84273,-13.5 10.84274,-13.5 10.51453,-10.87682 10.51452,-10.87683 22.74767,-18.35501 22.74767,-18.35501 17.25233,-10.89249 c 9.48878,-5.99087 20.72359,-12.78081 24.96624,-15.08874 l 7.7139,-4.19625 -6.74384,-6.74384 -6.74384,-6.74384 -4.2505,-8.43559 -4.25051,-8.43558 -0.61315,-11.08913 -0.61314,-11.08914 1.24488,-6.91086 1.24489,-6.91087 2.89664,-5.70507 2.89664,-5.70508 -3.55271,-0.66649 -3.55271,-0.66649 -4.80918,0.63796 -4.80918,0.63796 -1.05565,-1.27199 c -0.58062,-0.69959 -1.36131,-2.48977 -1.73487,-3.97816 l -0.67921,-2.70618 -6.92686,5.96177 -6.92686,5.96177 -1.92511,0 c -1.0588,0 -4.26105,-0.50097 -7.11609,-1.11327 l -5.191,-1.11327 -3.63625,1.20007 -3.63624,1.20007 -5.49043,-1.92973 -5.49043,-1.92973 -2.31219,1.03173 -2.3122,1.03173 -3.16935,-1.28854 -3.16936,-1.28854 -3.78577,0.14236 -3.78578,0.14236 -2.8686,-2.04262 -2.86859,-2.04262 -2.59563,0 -2.59563,0 -1.90128,-1.90128 c -1.0457,-1.0457 -2.85769,-2.20483 -4.02664,-2.57584 l -2.12536,-0.67457 -1.6912,-2.67415 c -0.93016,-1.47079 -2.53549,-3.58981 -3.56741,-4.70893 l -1.87621,-2.03477 -6.40031,-19.46523 -6.40031,-19.46523 -1.12469,-6 c -0.61857,-3.3 -1.08288,-6.9 -1.03179,-8 0.0511,-1.1 0.37337,-3.87511 0.71616,-6.16692 l 0.62327,-4.16692 2.40288,-2.25739 2.40289,-2.2574 0,-1.66915 0,-1.66915 4.84009,-4.08122 4.84009,-4.08123 3.42984,-0.64344 3.42984,-0.64344 -0.37053,-3.88539 -0.37054,-3.88539 3.31023,-2.01306 c 1.82062,-1.10719 4.57371,-2.29058 6.11798,-2.62976 l 2.80776,-0.61669 1.47765,-2.85745 1.47765,-2.85746 6.92808,-2.23134 6.92808,-2.23134 1.25315,-2.34153 1.25315,-2.34154 4.90926,-1.45789 4.90926,-1.45789 3.38546,-2.97248 3.38546,-2.97247 6.17515,-1.21488 6.17515,-1.21489 3.23988,-2.84465 3.23988,-2.84465 4.7153,-0.64631 4.71531,-0.6463 2.88403,-2.42675 2.88403,-2.42675 3.26465,-0.84686 c 1.79556,-0.46578 5.55443,-1.13855 8.35304,-1.49505 l 5.08837,-0.64819 -4.03288,-12.79446 -4.03288,-12.79447 -9.12387,-0.64134 -9.12388,-0.64134 -5.93162,-1.50253 -5.93162,-1.50252 -8,-3.93096 -8,-3.93096 -5.64479,-4.8091 c -3.10464,-2.64501 -7.51266,-7.0591 -9.79562,-9.8091 -2.28295,-2.75 -5.43265,-7.25 -6.99933,-10 -1.56668,-2.75 -4.08648,-8.375 -5.59954,-12.5 l -2.75103,-7.5 -0.47292,-12.17048 -0.47292,-12.17048 1.69449,-7.6164 1.69449,-7.61639 4.10297,-8.19749 4.10298,-8.1975 8.57061,-8.6428 8.57061,-8.64281 9.5,-4.52639 9.5,-4.52639 5.5,-1.3077 5.5,-1.30769 10.5,0.0181 10.5,0.0181 6.5,1.7199 6.5,1.7199 7,3.32918 7,3.32918 6.30918,4.7733 6.30919,4.7733 4.98888,6.12075 4.98889,6.12075 3.94682,8 3.94683,8 1.70702,6.5 1.70703,6.5 -0.0423,11 -0.0423,11 -1.74062,6.5 c -0.95734,3.575 -3.05883,9.27413 -4.66997,12.66474 l -2.92936,6.16474 -4.60173,6.12165 -4.60173,6.12165 -5.20856,4.24287 -5.20857,4.24287 4.10984,13.47074 4.10985,13.47074 2.29072,0.33002 2.29073,0.33002 3.89868,-2.58002 3.89867,-2.58002 8.11707,0 8.11707,0 2.76476,-1.96869 2.76477,-1.96868 8.88961,0.24229 8.8896,0.24229 1.54878,3.07445 1.54879,3.07445 5.95121,-5.32379 5.95122,-5.32379 4,-4.1e-4 c 2.2,-2.2e-4 5.75308,0.40626 7.89574,0.9033 l 3.89574,0.9037 2.39035,-1.56621 2.39034,-1.56622 6.36978,1.72422 6.36977,1.72422 2.18487,-1.1693 2.18487,-1.16931 3.06604,1.27 3.06604,1.27 3.90386,-0.23035 3.90386,-0.23034 3.32663,2.05596 3.32662,2.05597 1.58736,-0.60913 1.58736,-0.60913 3.39342,2.09725 c 1.86638,1.15349 4.0555,2.09725 4.86471,2.09725 l 1.47128,0 3.18493,3.5 c 1.75171,1.925 3.57516,3.5 4.0521,3.5 l 0.86717,0 1.6791,4.19647 c 0.9235,2.30806 4.57236,14.06206 8.10858,26.12001 L 64,-770.32639 l -0.0222,6.13 -0.02227,6.12999 -1.95553,2.5 -1.95553,2.5 -0.0387,2 -0.0387,2 -4.4014,4.25 -4.40139,4.25 -2.5273,0 -2.5273,0 -0.30479,4.7283 -0.30479,4.7283 -5.81276,2.87166 -5.81275,2.87167 -0.8694,2.28668 -0.8694,2.28669 -7.14203,2.72912 -7.14204,2.72913 -1.09616,2.40581 -1.09616,2.40581 -5.1919,1.50933 -5.19189,1.50932 -2.49375,2.79881 -2.49375,2.79881 -4.894,1.268 c -2.69171,0.69739 -5.56901,1.48751 -6.39401,1.75581 l -1.5,0.48781 6,3.01029 6,3.01029 7.82964,7.65418 7.82964,7.65418 4.05993,8 4.05994,8 1.36009,11.68804 1.3601,11.68805 -1.87819,7.86367 -1.87819,7.86367 -2.20674,4.32557 -2.20674,4.32557 3.33526,-0.60838 c 1.83439,-0.33461 10.76026,-1.28871 19.83526,-2.12022 9.075,-0.83151 22.8,-2.00116 30.5,-2.59923 l 14,-1.0874 53.75,-0.54 53.75,-0.54 0,0.87033 1e-5,0.87033 -44.25001,0.18033 c -24.3375,0.0992 -49.425,0.48023 -55.75,0.84676 -6.325,0.36652 -14.65,0.86429 -18.5,1.10613 -3.85,0.24185 -10.15,0.6787 -14,0.97078 -3.85,0.29209 -9.475,0.74966 -12.5,1.01684 -3.025,0.26717 -7.75,0.71236 -10.5,0.98929 -2.75,0.27694 -7.025,0.74599 -9.5,1.04232 -2.475,0.29634 -6.07302,0.65562 -7.99559,0.79839 l -3.4956,0.25959 -3.0044,5.5328 -3.00441,5.53281 -9.5,8.60115 -9.5,8.60114 -6.75,3.56536 c -3.7125,1.96095 -6.75,3.78672 -6.75,4.05727 0,0.27055 3.56569,12.05852 7.92374,26.19548 4.35806,14.13696 9.1403,29.75356 10.6272,34.70356 l 2.70344,9 1.03901,0.66174 c 0.57146,0.36395 6.25172,1.03653 12.62281,1.49461 l 11.5838,0.83289 -7,0.57879 -7,0.5788 7,0.32388 7,0.32389 -8.5,0.6952 c -4.675,0.38236 -9.5125,1.0214 -10.75,1.42009 l -2.25,0.72489 0,1.60287 c 0,0.88158 1.8331,8.16375 4.07356,16.18261 2.24045,8.01886 6.94709,23.80474 10.45919,35.07974 3.51211,11.275 10.47006,34 15.46213,50.5 l 9.07649,30 -0.5406,2.19366 -0.54059,2.19366 -2.96827,3.24983 -2.96826,3.24983 -0.63265,-0.63265 -0.63265,-0.63265 3.11471,-4.33717 3.11472,-4.33716 -8.03963,-26.47368 c -4.4219,-14.56052 -11.39076,-37.27367 -15.48645,-50.47367 -4.09569,-13.2 -9.45275,-31.12654 -11.90458,-39.83675 l -4.45787,-15.83675 0.54231,-1.41325 c 0.29828,-0.77729 0.85816,-1.41325 1.2442,-1.41325 0.38603,0 1.57539,-0.65262 2.64301,-1.45026 l 1.94113,-1.45027 -2.25533,0.56829 -2.25532,0.56829 -1.39902,-1.16109 -1.39902,-1.16108 -2.60864,0.65473 -2.60864,0.65472 -1.2831,-1.06487 c -0.70571,-0.58569 -2.16236,-1.06988 -3.23702,-1.07598 -1.07465,-0.006 -3.75391,-0.23608 -5.95391,-0.51105 -2.2,-0.27497 -5.575,-0.7774 -7.5,-1.11652 l -3.5,-0.61657 -2.75,1.05608 -2.75,1.05608 0,1.71405 c 0,0.94273 1.83995,7.81637 4.08879,15.27475 2.24883,7.45839 7.62119,24.8107 11.93857,38.5607 4.31739,13.75 11.92743,38.33421 16.91122,54.63159 L 9,-364.80322 l -0.0153,2.86841 -0.0153,2.86841 -0.93089,1.47197 -0.93089,1.47198 -0.66652,-1.73692 -0.66652,-1.73692 0.55085,-2.10645 0.55085,-2.10645 -10.99308,-35.62861 c -6.04622,-19.59573 -13.42253,-43.2786 -16.39183,-52.6286 -2.9693,-9.35 -7.66957,-24.55534 -10.44505,-33.78964 C -33.72915,-495.09034 -36,-503.28048 -36,-504.05635 l 0,-1.41067 1.75,-1.01928 1.75,-1.01928 -3.30902,-0.0304 -3.30901,-0.0304 0.68557,-1.10928 0.68557,-1.10928 -4.37655,0.66832 -4.37656,0.66833 1.5,-1.07324 1.5,-1.07324 -4.5,0.59497 -4.5,0.59497 1.5,-1.11788 1.5,-1.11787 -3.89456,0.67551 -3.89456,0.67551 0.76979,-1.24554 0.76979,-1.24555 -1.95312,0.6199 -1.95312,0.6199 -9.42211,-1.98737 c -5.18216,-1.09305 -11.87618,-2.65722 -14.87561,-3.47593 -2.99942,-0.81871 -5.59706,-1.345 -5.77254,-1.16953 -0.17547,0.17548 4.9786,2.15591 11.4535,4.40097 6.4749,2.24506 14.24754,4.7866 17.27254,5.64788 3.025,0.86128 7.075,1.97369 9,2.47202 l 3.5,0.90605 -2.51165,0.0902 -2.51165,0.0902 -13.48835,-3.93793 C -74.43024,-510.67019 -85.225,-514.08567 -91,-516.09429 l -10.5,-3.65202 -6.75,-3.53392 -6.75,-3.53391 0,-1.26772 0,-1.26772 2.39314,-0.60064 2.39313,-0.60064 5.67297,2.50885 c 3.12014,1.37988 10.93072,4.10531 17.35687,6.05653 6.42614,1.95122 18.65889,5.04767 27.18389,6.881 8.525,1.83333 16.7375,3.54199 18.25,3.79703 l 2.75,0.46371 -0.002,-0.61133 c -5.9e-4,-0.33623 -2.49189,-8.71133 -5.53589,-18.61133 -3.044,-9.9 -6.86706,-22.32102 -8.49568,-27.60227 l -2.96114,-9.60227 -8.33384,-0.64059 c -4.58361,-0.35232 -11.91524,-1.26582 -16.29251,-2.02999 l -7.95868,-1.3894 -6.93686,-3.24324 -6.93686,-3.24324 -5.02327,2.76113 c -2.7628,1.51863 -7.18693,4.54895 -9.8314,6.73404 -2.64447,2.1851 -5.03163,3.7494 -5.3048,3.47623 -0.27318,-0.27317 1.44048,-2.05803 3.80812,-3.96634 2.36765,-1.90831 6.44231,-4.70141 9.05481,-6.20688 2.6125,-1.50547 4.75,-3.09632 4.75,-3.53521 0,-0.4389 -0.71561,-1.0726 -1.59024,-1.40823 l -1.59024,-0.61023 -1.06427,0.65775 -1.06427,0.65776 0.67082,-1.08541 0.67082,-1.08541 -0.84546,-0.52253 -0.84547,-0.52253 -5.92085,3.10336 c -3.25646,1.70684 -14.02084,8.28498 -23.92084,14.61807 l -18,11.51471 -21,16.75758 -21,16.75758 -14.57899,14.82778 -14.57899,14.82778 -7.98516,10 c -4.39183,5.5 -9.7731,12.475 -11.95837,15.5 -2.18527,3.025 -8.12124,11.89264 -13.19106,19.70587 l -9.21783,14.20586 -6.02545,12.24307 -6.02545,12.24306 0.5835,1.52059 0.58351,1.52059 -0.75471,-0.75471 -0.75471,-0.75471 -1.81087,4.6101 -1.81086,4.6101 0.66723,1.0796 0.66723,1.0796 -1.01615,-0.62802 -1.01615,-0.62801 -2.59638,8.22351 c -1.42801,4.52292 -4.17613,14.2985 -6.10693,21.7235 l -3.51055,13.5 -2.53143,14.81129 c -1.39229,8.14621 -2.57629,16.92121 -2.63111,19.5 -0.0548,2.57879 -0.48975,5.81371 -0.9665,7.18871 z m 297.56618,-196 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -7.5,-1 1.33333,0 -0.66666,-0.66667 -0.66667,-0.66666 -0.66667,0.66666 -0.66666,0.66667 1.33333,0 z m -14.5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 6.5,0 1.33333,0 -0.66666,-0.66667 -0.66667,-0.66666 -0.66667,0.66666 -0.66666,0.66667 1.33333,0 z m 18.25,-0.10861 2.75,0.10861 -0.0758,-0.75 c -0.0417,-0.4125 -4.66647,-15.6 -10.27733,-33.75 l -10.20156,-33 -1.97267,0.18534 c -1.08498,0.10194 -5.79468,1.35639 -10.46601,2.78767 l -8.49334,2.60232 -2.00666,-0.28767 -2.00663,-0.28766 8.5,-2.29748 8.5,-2.29748 11,-5.46044 11,-5.46043 9.41582,-8.3853 9.41583,-8.38529 5.7107,-10.2048 5.7107,-10.20479 1.7157,-7.94077 1.71571,-7.94077 -1.21258,-10.71123 -1.21258,-10.71122 -3.77167,-7.5 -3.77168,-7.5 -8.38654,-7.62382 -8.38654,-7.62383 -6.32913,-3.19493 -6.32912,-3.19493 -1.4172,2.02333 -1.41719,2.02333 -6.00995,1.18238 -6.00995,1.18239 -3.44487,2.73763 -3.44486,2.73764 -8.2703,1.2487 -8.2703,1.2487 -2.5,2.31986 -2.5,2.31985 -9,1.10711 -9,1.10712 -3.55375,2.44973 -3.55375,2.44974 -5.50197,0 -5.50197,0 -3.38856,2.5 -3.38856,2.5 -9.26161,0 -9.26161,0 -4.19248,7.17851 -4.19247,7.17852 -1.94356,8.57148 -1.94355,8.57149 1.17089,9.92926 1.17089,9.92926 3.84194,7.57074 3.84195,7.57074 8.34316,8.24323 8.34317,8.24322 6.98592,3.34553 c 3.84226,1.84004 9.23592,4.0616 11.98592,4.93681 2.75,0.8752 8.78405,2.07276 13.409,2.66124 4.62496,0.58848 11.05158,1.06997 14.28139,1.06997 l 5.87238,0 0.398,1.25 c 0.2189,0.6875 4.21244,13.77017 8.87454,29.0726 4.6621,15.30242 8.65053,27.99657 8.86318,28.20922 0.21264,0.21265 6.21747,1.2561 13.34407,2.31879 7.12659,1.06269 14.19494,1.98104 15.70744,2.04078 z m -54.25,-4.89139 1.33333,0 -0.66666,-0.66667 -0.66667,-0.66666 -0.66667,0.66666 -0.66666,0.66667 1.33333,0 z m -4.5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -4,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -4,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -3,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -10,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 6,0 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -7,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -4,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -3,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -2.5,-1.0856 1.5,-0.055 -2,-0.85943 c -1.1,-0.47269 -2.45,-0.88417 -3,-0.9144 l -1,-0.055 1.5,0.96943 c 0.825,0.53316 2.175,0.94464 3,0.9144 z m -6.5,-1.9144 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -55.5,-134 1.33333,0 -0.66666,-0.66667 -0.66667,-0.66666 -0.66667,0.66666 -0.66666,0.66667 1.33333,0 z m -22.45,-1.01531 c 0.5775,0.008 1.4775,-0.41166 2,-0.9335 0.5225,-0.52185 2.8625,-1.25437 5.2,-1.62781 l 4.25,-0.679 0.003,0.87781 0.003,0.87781 6.19063,0.18165 6.19062,0.18166 6.69059,-5.93166 c 3.67982,-3.26241 7,-5.93165 7.37818,-5.93165 0.37817,0 1.30823,0.62064 2.06679,1.3792 0.75856,0.75856 1.67057,2.5401 2.02668,3.95898 l 0.64749,2.57978 1.65188,1.29102 1.65189,1.29102 -1.5,-1.94196 -1.5,-1.94196 1.47391,0.88936 1.47391,0.88936 6.40104,-0.23633 6.40104,-0.23634 2.98313,-1.54264 2.98313,-1.54263 8.84862,-0.27505 8.84862,-0.27505 2.7933,-1.84884 2.7933,-1.84884 6.39043,-0.41998 6.39044,-0.41998 3.34356,-2.269 3.34356,-2.269 8.76601,-1.149 c 4.8213,-0.63195 9.26538,-1.46696 9.87573,-1.85556 0.61036,-0.38861 2.18536,-1.46606 3.5,-2.39433 l 2.39027,-1.68777 8.16286,-1.40001 8.16286,-1.40001 3.12963,-2.63341 3.12963,-2.63342 5.14809,-0.68292 5.14808,-0.68291 2.13423,-2.30287 2.13422,-2.30287 4.9252,-1.27644 c 2.70886,-0.70204 5.1502,-1.5089 5.4252,-1.79302 0.275,-0.28412 1.61725,-0.64234 2.98278,-0.79604 l 2.48279,-0.27945 3.10049,-3.00512 3.1005,-3.00512 3.91672,-1.06877 3.91672,-1.06878 3.02233,-3.27378 3.02233,-3.27379 5.85763,-1.84645 5.85764,-1.84646 0.918,-2.63338 0.918,-2.63339 6.04504,-2.6083 6.04504,-2.6083 -0.343,-4.76578 -0.34301,-4.76578 2,-0.30788 c 1.1,-0.16933 3.0309,-0.52855 4.2909,-0.79826 l 2.2909,-0.49038 -0.59992,-0.97069 -0.59991,-0.97068 1.13847,0 1.13847,0 -0.58438,-3.25 -0.58439,-3.25 0.97271,2.25 c 0.53498,1.2375 1.3472,2.25 1.80493,2.25 0.45772,0 1.37222,-0.54 2.03222,-1.2 l 1.2,-1.2 0,-2.16514 0,-2.16514 2,-2.54259 2,-2.54259 0,-4.71999 0,-4.71999 -6.47406,-22.12228 c -3.56074,-12.16725 -7.02027,-23.83918 -7.68784,-25.93762 l -1.21377,-3.81535 -2.04317,-1.09346 c -1.12374,-0.60141 -2.86509,-2.13838 -3.86966,-3.41549 -1.00458,-1.27712 -2.13813,-2.27736 -2.519,-2.22277 -0.38088,0.0546 -1.18615,0.046 -1.78949,-0.0192 -0.60334,-0.0651 -2.12691,-1.01167 -3.38571,-2.10341 l -2.28871,-1.98499 -2.19529,0.55098 -2.19529,0.55098 -3.6851,-2.17426 -3.6851,-2.17426 -3.33581,0.6258 -3.33581,0.6258 -2.71149,-1.40674 -2.71149,-1.40674 -2.81591,1.06289 -2.81591,1.06289 -5.82261,-1.65639 -5.82262,-1.65639 -2.40355,1.57487 -2.40355,1.57487 -4.33735,-1.09216 c -2.38629,-0.60066 -5.77643,-1.09213 -7.53438,-1.09213 l -3.19628,0 -6.207,5.44944 -6.207,5.44945 -2.15375,-0.16224 -2.15375,-0.16224 0.60698,-1.91243 0.60699,-1.91244 -1.10714,0.68425 -1.10713,0.68424 -0.11842,-1.30901 c -0.0651,-0.71996 -0.10467,-1.53402 -0.0879,-1.80902 0.0168,-0.275 -3.47563,-0.60746 -7.76098,-0.73879 l -7.79154,-0.23879 -2.52833,1.98879 -2.52834,1.98879 -8.45741,0 -8.45741,0 -2.54259,2 -2.54259,2 -2.01048,0 c -1.10577,0 -2.66902,0.2527 -3.47389,0.56156 l -1.4634,0.56156 3.51044,11.68844 c 1.93074,6.42864 4.0244,13.45268 4.65258,15.60898 l 1.14215,3.92054 3.97903,-3.42054 3.97908,-3.42054 -1.37244,1.75 -1.37245,1.75 0.73366,0 c 0.40352,0 2.82112,-1.69945 5.37245,-3.77656 2.55133,-2.0771 5.53878,-4.41514 6.63878,-5.19563 1.1,-0.7805 -0.3741,1.05735 -3.27578,4.0841 l -5.27578,5.50319 0.59231,0.59232 0.59231,0.59231 -1.22104,0.75464 -1.22104,0.75465 0.71353,-1.15451 0.71352,-1.15451 -0.68781,0 c -0.3783,0 -2.47776,1.6171 -4.66546,3.59356 l -3.97764,3.59356 -0.80422,-0.84356 c -0.44232,-0.46396 -4.95402,-14.34356 -10.02599,-30.84356 -5.07198,-16.5 -9.61488,-30.76295 -10.09533,-31.69545 l -0.87356,-1.69545 9.32495,-9.30455 9.32495,-9.30455 4.10462,-8.21312 4.10463,-8.21313 1.70048,-7.64333 1.70048,-7.64333 -0.4971,-10.64354 -0.49709,-10.64355 -2.61627,-8.07841 -2.61627,-8.07841 -4.10505,-6.42159 -4.10504,-6.42159 -5.15566,-5.37191 -5.15565,-5.3719 -7.36948,-4.87233 -7.36947,-4.87233 -8.13053,-2.63273 -8.13052,-2.63274 -10.64355,-0.49709 -10.64354,-0.4971 -7.64333,1.70048 -7.64333,1.70048 -8.21313,4.10747 -8.21312,4.10748 -8.01418,8.06611 -8.01418,8.06611 -3.37094,6.39348 c -1.85401,3.51641 -4.23767,9.14141 -5.29703,12.5 l -1.9261,6.10652 -0.57316,10.59722 -0.57316,10.59721 1.71645,7.71508 1.71644,7.71507 4.5136,9.01635 4.5136,9.01635 7.65433,7.67136 7.65433,7.67136 6.5,3.77559 6.5,3.77559 8,2.60138 8,2.60138 10.57537,0.49428 10.57537,0.49429 10.85192,35.38069 10.85192,35.3807 3.47887,0.96056 3.47886,0.96056 0.83184,-0.51411 c 0.45751,-0.28276 3.32596,-1.16374 6.37434,-1.95774 3.04838,-0.794 7.21628,-2.31328 9.26201,-3.37617 2.04572,-1.0629 5.04638,-2.97754 6.66813,-4.25477 1.62174,-1.27723 4.20924,-3.66002 5.75,-5.29509 l 2.80137,-2.97286 0,1.10041 c 0,0.60523 -0.675,1.66062 -1.5,2.34531 -0.825,0.68469 -1.5,1.78635 -1.5,2.44813 0,0.66178 -1.0125,2.13204 -2.25,3.26725 -1.2375,1.1352 -4.51922,3.19895 -7.29271,4.58611 -2.77349,1.38717 -7.70047,3.29475 -10.94883,4.23907 -3.24837,0.94433 -7.27915,2.4858 -8.95729,3.42549 -1.67814,0.93969 -3.83867,1.70675 -4.80117,1.70458 -0.9625,-0.002 -1.75,-0.0989 -1.75,-0.21485 0,-0.11599 0.76138,-0.82849 1.69196,-1.58334 l 1.69196,-1.37244 -0.83116,1.37973 -0.83115,1.37973 1.32669,-0.44223 c 0.72969,-0.24323 1.50483,-0.97661 1.72253,-1.62973 l 0.39584,-1.1875 -2.56028,0 -2.56028,0 -1.42667,-2.25 c -0.78467,-1.2375 -4.01633,-10.8 -7.18147,-21.25 -3.16515,-10.45 -5.8971,-19.17608 -6.07101,-19.39129 -0.17392,-0.21521 -3.81513,0.16364 -8.09159,0.84189 l -7.77537,1.23319 -2.58068,2.43297 -2.58067,2.43298 -5.51483,0.89756 -5.51483,0.89756 -2.95617,2.95616 -2.95616,2.95617 -4.44833,0.6913 c -2.44658,0.38022 -5.87397,1.13259 -7.61642,1.67193 l -3.16809,0.98062 -1.53172,2.3377 -1.53172,2.3377 -5.05297,1.21219 -5.05296,1.21218 -1.64951,2.7924 -1.64951,2.79239 -6.31541,1.7095 -6.31541,1.70951 -1.78231,3.00054 -1.7823,3.00053 -5.5,2.31992 -5.5,2.31991 -0.1219,3.32725 c -0.067,1.82998 -0.17954,3.83966 -0.25,4.46595 l -0.1281,1.13871 -3.54776,0.66556 -3.54776,0.66557 -4.45224,3.13822 -4.45224,3.13823 0,2.00278 0,2.00278 -2.6311,2.74628 -2.63109,2.74627 -0.26992,2.45889 c -0.14846,1.35239 -0.56979,3.40369 -0.93629,4.55845 l -0.66637,2.09955 1.1264,0 1.1264,0 -0.61803,1 -0.61803,1 1.30901,0.0153 1.30902,0.0153 -1.35722,0.85996 -1.35721,0.85997 1.68194,5.87472 c 0.92506,3.2311 4.37827,14.09526 7.67379,24.14259 l 5.99186,18.26787 0.90315,-0.55818 0.90316,-0.55819 1.47924,3.54032 1.47924,3.54031 2.01584,0 2.01584,0 1.07037,2 1.07037,2 2.97143,0 2.97143,0 2.21726,2.55007 2.21726,2.55008 3.52613,-0.59469 3.52612,-0.59468 1.90129,1.39182 1.90129,1.39182 5.84871,-0.44586 5.84871,-0.44587 0,1.20565 0,1.20564 1.55194,-0.59554 1.55194,-0.59553 -0.63573,1.02863 -0.63573,1.02862 2.83379,-0.62096 2.83379,-0.62097 -1.5,1.06557 -1.5,1.06557 1.05,0.0153 z m 40.95,-14.98469 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -7.83333,-25.33333 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z m -1.07815,-2.92185 c -0.19651,0.1965 -0.85931,-1.08285 -1.4729,-2.843 -0.61359,-1.76015 -1.10353,-3.92062 -1.08876,-4.80104 l 0.0269,-1.60078 6.53332,-7 6.53332,-7 -6.13131,7.66263 -6.1313,7.66264 1.04402,3.78113 c 0.57421,2.07963 0.88325,3.94192 0.68675,4.13842 z m -24.85652,-5.74482 -0.45964,2.5 -0.13618,-2.16821 c -0.0749,-1.19252 0.13492,-2.8747 0.46627,-3.73818 l 0.60245,-1.56996 14.14755,-11.80479 c 7.78115,-6.49263 19.54755,-16.26926 26.14755,-21.72585 6.6,-5.45659 11.36259,-9.12589 10.58354,-8.15401 -0.77905,0.97189 -12.02905,10.67119 -25,21.554 -12.97095,10.88282 -24.10292,20.42145 -24.73772,21.19697 -0.6348,0.77552 -1.36102,2.53503 -1.61382,3.91003 z m -67.232,-9 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 115.87756,-26 c -0.20766,0 -0.37756,-0.1699 -0.37756,-0.37756 0,-0.20765 0.7875,-0.99515 1.75,-1.75 l 1.75,-1.37244 -1.37244,1.75 c -0.75485,0.9625 -1.54235,1.75 -1.75,1.75 z m 182.28911,-8.33333 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z m -1.0625,-2.9375 -0.60417,0.60416 0.079,-1.91666 0.0789,-1.91667 0.52522,1.3125 0.52522,1.3125 -0.60416,0.60417 z M 48.5,-756.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -1,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 2.16667,-0.33333 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z m -1,-3 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z M 45.5,-766.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 2,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -2.83333,-3.33333 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z M 46.5,-769.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -186,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -23.08333,-1.07895 -1.91667,-0.0789 1.3125,-0.52522 1.3125,-0.52522 0.60417,0.60416 0.60416,0.60417 -1.91666,-0.079 z m 5.58333,0.0789 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m 200.66667,-0.33333 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z M -148.5,-773.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 194,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -178,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 175.16667,-1.33333 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z M 41.5,-779.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -75,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 63.30902,-2.01531 C 29.63906,-783.59013 28.825,-784.03324 28,-784.5664 l -1.5,-0.96937 1.19098,-0.0153 c 0.65504,-0.008 1.4691,0.43469 1.80902,0.98469 0.33992,0.55 0.47898,0.99311 0.30902,0.98469 z M 14,-784.5664 l -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m -30.5,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 6.5,-1 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m 5,-0.232 -3.5,0 1.75,-0.45733 c 0.9625,-0.25152 2.5375,-0.25152 3.5,0 l 1.75,0.45733 -3.5,0 z m 11,-1.30162 -7.5,0.43413 15,-1.86535 c 8.25,-1.02594 17.11094,-1.90356 19.69098,-1.95025 l 4.69099,-0.0849 0.68424,1.10713 0.68425,1.10714 -2.01085,-0.63822 -2.01085,-0.63822 -10.86438,1.0472 C 18.38897,-789.0054 10.125,-788.3388 6,-788.10002 z m -72.61803,-18.46638 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 114.11803,-6 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -99,-16 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -128,168 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 9.5,0 1.33333,0 -0.66666,-0.66667 -0.66667,-0.66666 -0.66667,0.66666 -0.66666,0.66667 1.33333,0 z m 9.15137,0 c 0.275,0 1.55688,-1.125 2.84863,-2.5 1.29175,-1.375 2.12363,-2.5 1.84863,-2.5 -0.275,0 -1.55688,1.125 -2.84863,2.5 -1.29175,1.375 -2.12363,2.5 -1.84863,2.5 z m 32.34863,-3 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 3.5,-1 1.33333,0 -0.66666,-0.66667 -0.66667,-0.66666 -0.66667,0.66666 -0.66666,0.66667 1.33333,0 z m -27.80998,-3 c 0.275,0 1.31449,-0.9 2.30998,-2 0.99549,-1.1 1.58498,-2 1.30998,-2 -0.275,0 -1.31449,0.9 -2.30998,2 -0.99549,1.1 -1.58498,2 -1.30998,2 z m 64.96135,-123 c 0.275,0 1.55688,-1.125 2.84863,-2.5 1.29175,-1.375 2.12363,-2.5 1.84863,-2.5 -0.275,0 -1.55688,1.125 -2.84863,2.5 -1.29175,1.375 -2.12363,2.5 -1.84863,2.5 z m 50.84863,483 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m -59,-6 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m 399.5,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -404.08333,-1.09686 c -1.60417,-0.0533 -6.74167,-0.69385 -11.41667,-1.42351 -4.675,-0.72966 -11.875,-2.22013 -16,-3.31215 l -7.5,-1.98548 2.0066,-0.091 c 1.10363,-0.0501 3.57863,0.36167 5.5,0.91494 1.92137,0.55327 9.3434,1.94823 16.4934,3.0999 7.15,1.15168 13.1875,2.274 13.41667,2.49406 0.22916,0.22005 -0.89584,0.35652 -2.5,0.30324 z M -136.5,-321.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 168.5,-30 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m -317.33333,-7.33333 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z m 10.79268,-33.66667 c -0.275,0 0.41829,-1.8 1.54065,-4 1.12236,-2.2 2.26565,-4 2.54065,-4 0.275,0 -0.41829,1.8 -1.54065,4 -1.12236,2.2 -2.26565,4 -2.54065,4 z m 645.54065,0 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m -4.5,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -3.08333,-1.07064 c -0.50417,-0.0389 -2.82917,-0.9204 -5.16667,-1.95899 -2.3375,-1.0386 -4.25,-2.11582 -4.25,-2.39383 0,-0.278 2.12828,0.40682 4.72951,1.52184 2.60123,1.11502 4.92623,2.22402 5.16666,2.46446 0.24044,0.24044 0.0247,0.40537 -0.4795,0.36652 z m -10.85765,-4.92936 c -0.24254,0 -0.76207,-0.51953 -1.15451,-1.15451 l -0.71353,-1.15451 1.15451,0.71353 c 0.63498,0.39244 1.15451,0.91197 1.15451,1.15451 0,0.24254 -0.19844,0.44098 -0.44098,0.44098 z m -621.55902,-3 -0.96937,1.5 0,-1 c 0,-0.55 0.43621,-1.675 0.96937,-2.5 l 0.96937,-1.5 0,1 c 0,0.55 -0.43621,1.675 -0.96937,2.5 z m 2.66667,-4.33333 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z m 607.15664,-2.15665 c -0.25801,0.25802 -1.61555,-0.76369 -3.01676,-2.27045 -1.4012,-1.50676 -3.3697,-4.08957 -4.37444,-5.73957 -1.00473,-1.65 -1.58969,-2.775 -1.29991,-2.5 0.28978,0.275 2.46938,2.6467 4.84355,5.27045 2.37417,2.62375 4.10557,4.98156 3.84756,5.23957 z m -605.4303,-5.51002 c -0.21615,0 -0.39301,-0.42344 -0.39301,-0.94098 0,-0.51754 0.44485,-1.21592 0.98855,-1.55194 l 0.98854,-0.61096 -0.59553,1.55194 c -0.32755,0.85357 -0.77239,1.55194 -0.98855,1.55194 z m 2.10699,-4 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 1.94538,-3.76673 -1.69147,2.26673 0.68679,-2 c 0.37774,-1.1 3.92061,-7.32918 7.87305,-13.84262 3.95244,-6.51344 8.98625,-14.46151 11.18625,-17.66238 2.2,-3.20087 7.23523,-10.04945 11.18941,-15.21908 l 7.18941,-9.39933 15.44346,-16.5115 c 8.49391,-9.08132 17.39837,-18.05356 19.7877,-19.93829 2.38934,-1.88474 7.05454,-5.85071 10.36713,-8.81326 3.31259,-2.96256 9.62289,-7.72023 14.02289,-10.57262 4.4,-2.85239 10.75886,-6.84098 14.13081,-8.86354 3.37195,-2.02256 6.74695,-3.67441 7.5,-3.67079 0.75305,0.004 2.71919,0.90066 4.36919,1.99341 1.65,1.09275 2.64805,1.98979 2.21788,1.99341 -0.43016,0.004 -2.24419,-0.6043 -4.03117,-1.35095 l -3.24906,-1.35754 -3.2101,2.19959 -3.2101,2.1996 0.71079,0.7108 0.7108,0.7108 -1.61837,-0.62103 -1.61837,-0.62103 -0.75566,1.22268 -0.75566,1.22269 1.15451,-0.71353 1.15451,-0.71352 0,1.166 0,1.16601 -1.58883,-0.60969 -1.58884,-0.6097 -2.66116,2.09328 c -1.46365,1.1513 -2.43617,2.24001 -2.16117,2.41937 0.275,0.17935 0.0904,0.70109 -0.41033,1.15943 l -0.91032,0.83333 0.71934,-1.25 0.71934,-1.25 -0.69098,0 c -0.38004,0 -2.2094,0.93843 -4.06525,2.08541 l -3.37426,2.08541 0.55817,0.90314 0.55817,0.90313 -1.39173,-0.53405 -1.39172,-0.53406 -1.41022,1.79551 -1.41021,1.79551 2,-1.5 2,-1.5 -1.34591,1.71803 c -0.74025,0.94492 -1.64025,1.66097 -2,1.59124 -0.35975,-0.0697 -1.43901,0.21681 -2.39835,0.63676 l -1.74425,0.76354 0.56858,0.91999 0.56859,0.91999 -1.32433,-0.27477 -1.32433,-0.27478 0.21031,1.13093 0.21031,1.13093 -2.0653,1.86907 c -1.13591,1.02799 -2.24305,1.75657 -2.46031,1.61907 -0.21725,-0.1375 -0.87157,-0.25 -1.45403,-0.25 l -1.05901,0 0.71352,1.15451 0.71353,1.15451 -1.00283,-0.61979 -1.00284,-0.61978 -5.40167,4.91988 -5.40168,4.91988 1.25,0.0454 1.25,0.0454 0,-1 0,-1 1.15499,0 1.15499,0 -1.83137,2.02363 -1.83136,2.02364 -0.71182,-1.15175 -0.71182,-1.15175 -1.11181,0.68713 c -0.61149,0.37791 -1.1118,1.13712 -1.1118,1.68712 l 0,1 1.17085,-0.72362 1.17085,-0.72362 -1.92085,2.63318 c -1.05647,1.44825 -2.32809,2.64732 -2.82584,2.66461 l -0.90499,0.0314 1.80998,-2 1.80998,-2 -0.91445,0 c -0.50294,0 -1.56811,1.0125 -2.36705,2.25 -0.79893,1.2375 -1.34603,2.62095 -1.21577,3.07433 l 0.23684,0.82433 -0.87175,-0.53877 -0.87175,-0.53877 -2.66703,2.78377 -2.66702,2.78378 0.764,0.764 0.764,0.764 -1.11128,-0.33334 -1.11128,-0.33333 -9.13872,9.81829 c -5.0263,5.40006 -9.19201,10.35006 -9.25714,11 -0.0651,0.64994 -0.054,1.55266 0.0248,2.00604 l 0.1432,0.82433 -0.95568,-0.59064 -0.95568,-0.59064 -0.71216,1.15229 c -0.39168,0.63376 -0.77851,2.1036 -0.85961,3.26631 l -0.14746,2.11402 -1.07674,-0.20575 -1.07674,-0.20575 -2.20533,2.34747 -2.20534,2.34747 -0.31025,1.85828 -0.31024,1.85828 -1.11717,-0.25 -1.11716,-0.25 -0.125,1 c -0.0687,0.55 -0.18125,1.5625 -0.25,2.25 l -0.125,1.25 -1.5,0.0241 -1.5,0.0241 0.1371,1.71511 0.13709,1.71512 -0.65296,-0.40356 -0.65297,-0.40355 -5.44819,9.16431 -5.44819,9.16432 -2.3e-4,1.67857 -2.2e-4,1.67857 -0.91072,-0.17857 -0.91071,-0.17852 -0.50473,1.3892 -0.50473,1.38919 1.28424,-0.7937 1.28424,-0.79371 -0.72361,1.17082 -0.72361,1.17082 -0.86248,-0.53304 -0.86248,-0.53304 -1.69146,2.26673 z M -241.5,-451.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 3,-4 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 7.16667,-8.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z m 51.71089,-54.66667 c 0.20765,0 0.99515,-0.7875 1.75,-1.75 l 1.37244,-1.75 -1.75,1.37244 c -0.9625,0.75485 -1.75,1.54235 -1.75,1.75 0,0.20766 0.1699,0.37756 0.37756,0.37756 z m 510.19002,97 c -0.25833,0 -2.11846,-2.94826 -4.13361,-6.55169 -2.01516,-3.60343 -3.49968,-6.71485 -3.29894,-6.91426 0.20073,-0.19941 2.06086,2.74885 4.13361,6.55169 2.07276,3.80284 3.55728,6.91426 3.29894,6.91426 z m 2.99144,0 c -0.24254,0 -0.76207,-0.51953 -1.15451,-1.15451 l -0.71353,-1.15451 1.15451,0.71353 c 0.63498,0.39244 1.15451,0.91197 1.15451,1.15451 0,0.24254 -0.19844,0.44098 -0.44098,0.44098 z m -1.98865,-3 c -0.275,0 -0.98167,-0.9 -1.57037,-2 -0.5887,-1.1 -0.84537,-2 -0.57037,-2 0.275,0 0.98167,0.9 1.57037,2 0.5887,1.1 0.84537,2 0.57037,2 z m -3.07037,-5 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -1,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -1,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -4,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -2,-5 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -0.83333,-2.33333 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z m -76.61472,-0.66667 c -0.48691,0 -1.03528,-0.3375 -1.21862,-0.75 -0.18333,-0.4125 -1.99081,-1.9875 -4.01661,-3.5 -2.0258,-1.5125 -4.0508,-2.75215 -4.5,-2.75478 -0.4492,-0.003 -2.50422,-1.55468 -4.56672,-3.44901 l -3.75,-3.44424 0,-1.42526 c 0,-0.78389 0.70628,-3.39433 1.5695,-5.80098 l 1.56951,-4.37573 1.41061,-13 c 0.77584,-7.15 1.41957,-13.3375 1.4305,-13.75 l 0.0199,-0.75 -3.75,-0.11831 -3.75,-0.11832 3,-0.6949 c 1.65,-0.38219 3.5625,-0.5058 4.25,-0.27469 l 1.25,0.4202 -0.0433,4.14301 c -0.0238,2.27865 -0.68112,9.09301 -1.4607,15.14301 -0.77957,6.05 -1.97879,12.91523 -2.66493,15.25607 l -1.24752,4.25608 1.90345,1.74392 1.90344,1.74393 -1.44523,-1.94196 -1.44523,-1.94196 1.25378,0.75332 1.25379,0.75331 7.8968,-0.0173 c 4.34325,-0.01 8.98727,-0.29104 10.32006,-0.62555 l 2.42325,-0.6082 2.15327,-6.68581 2.15327,-6.6858 1.03817,-10.5 c 0.571,-5.775 1.22801,-11.9625 1.46002,-13.75 l 0.42185,-3.25 -3.18713,-0.0703 c -1.7529,-0.0387 -4.08711,-0.4707 -5.18711,-0.96005 l -2,-0.88973 6,0.21002 6,0.21001 -0.27049,4 c -0.14877,2.2 -0.7783,8.95 -1.39896,15 l -1.12846,11 -1.85533,5.41899 -1.85532,5.419 1.30815,2.081 1.30816,2.08101 -0.3772,1.75 -0.3772,1.75 -0.95143,0 -0.95142,0 -0.97338,-2.56017 -0.97337,-2.56018 -1.25188,0.78801 -1.25187,0.788 -8.3128,0.52217 -8.3128,0.52217 5.50187,4.5 c 3.02604,2.475 5.74017,5.0625 6.03142,5.75 l 0.52954,1.25 -0.88528,0 z m 75.52061,-2.23923 c -0.20528,0.20528 -0.91293,-1.26207 -1.57256,-3.26077 l -1.19933,-3.634 0.52677,-0.52677 0.52677,-0.52677 1.04579,3.78754 c 0.57518,2.08315 0.87784,3.9555 0.67256,4.16077 z m 63.34411,0.13955 c -1.87917,-0.0548 -4.54167,-0.47506 -5.91667,-0.93385 l -2.5,-0.83417 5.5,0.56932 c 3.025,0.31312 5.6875,0.73336 5.91667,0.93385 0.22916,0.20049 -1.12084,0.31967 -3,0.26485 z M 370.5,-448.7108 c -1.1,0.006 -3.8,-0.56015 -6,-1.25775 -2.2,-0.69759 -5.8,-2.20133 -8,-3.34163 -2.2,-1.14031 -5.91174,-3.46672 -8.24832,-5.16981 -2.33657,-1.70308 -4.14627,-3.43174 -4.02155,-3.84146 0.12472,-0.40972 -2.23854,-3.18154 -5.25169,-6.1596 -3.01314,-2.97805 -4.35344,-4.56698 -2.97844,-3.53094 1.375,1.03604 3.9625,3.2234 5.75,4.86081 l 3.25,2.97711 0.19889,-3.94616 c 0.10939,-2.17039 0.22189,-12.14005 0.25,-22.15479 l 0.0511,-18.20863 -0.73525,1.70863 -0.73526,1.70862 0.60175,-6.75 0.60175,-6.75 -1.02287,0 -1.02288,0 0.5244,-2.00533 0.52441,-2.00532 -1.24047,-1.49468 -1.24047,-1.49467 1.08726,0 1.08726,0 0.98729,1.84477 0.98729,1.84476 1.24825,15.17039 c 0.68653,8.34372 1.49559,15.51811 1.79789,15.9431 l 0.54965,0.77269 22,3.81568 22,3.81568 17.5,4.42253 c 9.625,2.43239 20.875,5.54283 25,6.91209 4.125,1.36926 8.175,2.94108 9,3.49294 l 1.5,1.00338 -1.75612,1.34571 c -0.96586,0.74014 -6.36586,3.17615 -12,5.41335 -5.63413,2.23719 -13.79122,4.99155 -18.12686,6.12078 -4.33564,1.12923 -11.51434,2.50849 -15.95265,3.065 l -8.06967,1.01185 -0.99735,-0.99735 -0.99734,-0.99735 3.45,-0.0157 c 1.8975,-0.009 7.58744,-0.88907 12.64431,-1.95657 5.05687,-1.06749 12.48187,-3.05029 16.5,-4.40622 4.01813,-1.35592 10.42629,-3.80272 14.24035,-5.43733 l 6.93465,-2.97201 -9.55355,-3.06027 c -5.25446,-1.68315 -15.96101,-4.67387 -23.79235,-6.64604 l -14.2388,-3.58575 -23.64231,-4.33209 c -13.00326,-2.38266 -23.71431,-4.27719 -23.80233,-4.21007 -0.088,0.0671 -0.29542,6.15107 -0.4609,13.51991 l -0.30087,13.39789 3.45315,2.36614 3.45316,2.36614 1.30968,-0.50258 1.30969,-0.50257 -0.5462,0.88376 -0.54619,0.88376 1.54619,0.59333 1.5462,0.59333 -0.61565,-0.99613 -0.61564,-0.99614 2.53235,1.15382 2.53235,1.15382 -0.63269,1.02371 -0.63269,1.02371 1.88356,-0.72279 1.88357,-0.7228 -0.77995,0.77995 -0.77995,0.77995 4.81043,1.6954 4.81043,1.6954 -2,0.0106 z m -11,-4.8556 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -12.79607,-37.73625 c 0.23736,-1.22994 0.24351,-3.47994 0.0136,-5 l -0.41792,-2.76375 -0.0136,5 -0.0136,5 0.43157,-2.23625 z m 72.68038,40.73625 c -0.76137,0 -1.38431,-0.18831 -1.38431,-0.41847 0,-0.23016 2.8329,-1.3612 6.29533,-2.51342 3.46243,-1.15222 11.44993,-4.29189 17.75,-6.97704 6.30007,-2.68515 15.05467,-6.49862 19.45467,-8.47437 4.4,-1.97576 8.81406,-3.59778 9.80902,-3.60449 l 1.80901,-0.0122 -0.64317,-1.04068 -0.64317,-1.04067 -1.90727,0.60534 c -1.049,0.33294 -3.00261,0.80397 -4.34137,1.04673 -1.33876,0.24276 -6.18012,2.04155 -10.75858,3.99732 l -8.32447,3.55593 1.09698,-1.10896 c 0.60333,-0.60993 5.14492,-2.85413 10.09242,-4.98711 4.94749,-2.13298 10.64136,-4.18693 12.65302,-4.56432 l 3.65758,-0.68617 0.1508,2.36129 c 0.0829,1.29871 0.0507,3.71129 -0.0717,5.36129 l -0.22252,3 -2.37296,5.25 c -1.30512,2.8875 -2.63142,5.25 -2.94733,5.25 l -0.57437,0 0.61287,-2.75 c 0.33708,-1.5125 1.28411,-4.24905 2.10451,-6.08121 0.82039,-1.83217 1.29824,-3.5246 1.06188,-3.76097 -0.23637,-0.23636 -2.18732,0.76967 -4.33546,2.23563 l -3.9057,2.66537 -6.24677,0.32711 -6.24677,0.3271 -4.75323,2.39074 c -2.61428,1.31491 -9.41779,4.02323 -15.11892,6.01849 -5.70115,1.99526 -10.98865,3.62774 -11.75002,3.62774 z m 41.61569,-15 1.33333,0 -0.66666,-0.66667 -0.66667,-0.66666 -0.66667,0.66666 -0.66666,0.66667 1.33333,0 z m 2.5,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 4,-2 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 3,-1 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m -704,16 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 545.25,-3.00497 c -0.1375,-0.003 -1.6,-1.16492 -3.25,-2.58264 l -3,-2.57768 3.25,2.15074 c 1.7875,1.18291 3.25,2.3451 3.25,2.58264 0,0.23755 -0.1125,0.42967 -0.25,0.42694 z m -547.36803,-0.99503 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 5,0 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m 542.9722,-3.29901 -1.14584,0.39623 -6.35416,-6.36267 -6.35417,-6.36267 -2.78514,-5.43594 c -1.53182,-2.98977 -2.20682,-4.58328 -1.5,-3.54113 0.70683,1.04214 3.59049,4.64214 6.40814,8 2.81765,3.35785 6.75515,7.5786 8.75,9.37944 1.99485,1.80084 3.62022,3.15084 3.61194,3 -0.008,-0.15084 -0.66353,-2.07425 -1.4561,-4.27425 l -1.44105,-4 0.0455,-3 0.0455,-3 1.50951,5 c 0.83023,2.75 1.57749,6.08107 1.66059,7.40238 l 0.15107,2.40239 -1.14583,0.39622 z m 4.35436,-5.07618 c -0.26741,0.2674 -1.03002,-3.34489 -1.69469,-8.02732 -0.66467,-4.68244 -1.01774,-9.0858 -0.78458,-9.78526 l 0.42391,-1.27174 1.27078,9.29906 c 0.69892,5.11448 1.05199,9.51785 0.78458,9.78526 z M 509.5,-465.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -730,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 519.79676,0 c -0.57853,0 -1.49726,-0.5625 -2.04163,-1.25 -0.54437,-0.6875 -1.55455,-2.375 -2.24485,-3.75 l -1.25509,-2.5 0.88738,1 c 0.48807,0.55 1.97159,2.2375 3.29672,3.75 l 2.40934,2.75 -1.05187,0 z m -517.79676,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 3,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 703.25,-1.07029 -2.25,-0.0703 2,-0.79492 2,-0.79493 -2,-0.51879 -2,-0.51879 2.25,-0.116 2.25,-0.116 0,1.5 0,1.5 -2.25,-0.0703 z m -196.14548,-4.92971 c -0.14915,0 -0.57119,-0.3 -0.93785,-0.66667 -0.36667,-0.36666 -0.66667,-1.26666 -0.66667,-2 0,-0.73333 0.35424,-1.33333 0.7872,-1.33333 l 0.78719,0 0.15066,2 c 0.0829,1.1 0.0286,2 -0.12053,2 z m -498.22255,-3 c -0.275,0 -0.22189,-0.45 0.11803,-1 0.33992,-0.55 0.84303,-1 1.11803,-1 0.275,0 0.22189,0.45 -0.11803,1 -0.33992,0.55 -0.84303,1 -1.11803,1 z m -6.88197,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 7,-6 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 518.20573,-7.75 -0.43337,2.25 0,-4.5 0,-4.5 0.43337,2.25 c 0.23836,1.2375 0.23836,3.2625 0,4.5 z m 179.79427,1.75 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -354,-4.30987 -6,-0.0102 3.26791,-0.40466 c 1.79735,-0.22256 4.49735,-0.21797 6,0.0102 l 2.73209,0.41487 -6,-0.0102 z m 95.93139,-0.16632 -10.93139,0.29945 2,-0.78025 c 1.1,-0.42914 6.40603,-1.57084 11.79117,-2.53713 5.38514,-0.96628 9.99299,-1.55505 10.23967,-1.30838 0.24667,0.24668 -0.14023,1.25363 -0.85979,2.23768 l -1.30828,1.78918 -10.93138,0.29945 z m 3.06861,-0.71876 3,0.0371 -1.23097,-0.49805 c -0.67703,-0.27392 -2.02703,-0.29059 -3,-0.0371 l -1.76903,0.461 3,0.0371 z m 6.91667,-0.884 1.91666,0.0789 -0.60416,-0.60417 -0.60417,-0.60416 -1.3125,0.52522 -1.3125,0.52522 1.91667,0.0789 z m 6.08333,2.07895 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 65.18933,-3.25 -0.45733,1.75 0,-3.5 0,-3.5 0.45733,1.75 c 0.25152,0.9625 0.25152,2.5375 0,3.5 z m -121.18933,0.25 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 1,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 97,-4 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -480.60699,-1 c -0.49115,0 -0.89301,-0.1699 -0.89301,-0.37756 0,-0.20765 0.6853,-0.9463 1.52289,-1.64144 l 1.52289,-1.26389 -0.62988,1.64145 c -0.34643,0.90279 -1.03173,1.64144 -1.52289,1.64144 z m 501.60699,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -30.08333,-1.07895 -1.91667,-0.0789 1.3125,-0.52522 1.3125,-0.52522 0.60417,0.60416 0.60416,0.60417 -1.91666,-0.0789 z m 30.5,-5.42105 -0.76913,5 0.40755,-9.5 0.40755,-9.5 1.57955,-9 c 0.86876,-4.95 2.94536,-13.725 4.61466,-19.5 1.66931,-5.775 4.1278,-12.81644 5.46332,-15.64764 1.33552,-2.83119 3.1536,-5.74964 4.04018,-6.48544 l 1.61196,-1.3378 -2.51217,4.98544 c -1.38168,2.74199 -3.71775,8.34351 -5.19126,12.44781 l -2.67909,7.46236 0.58548,2.53764 0.58548,2.53763 -1.1052,-1.5 -1.10519,-1.5 0.56437,3.5 0.56437,3.5 -0.96874,3 -0.96875,3 0.43274,-4.5 0.43274,-4.5 -1.4668,5.5 -1.46679,5.5 0.3323,2.69719 0.33231,2.69718 -0.68629,-0.42415 -0.68629,-0.42415 -0.63276,4.61654 C 314.28474,-528.3647 314,-525.19851 314,-523.86781 l 0,2.41944 1,-0.61803 1,-0.61803 -0.0153,1.30901 c -0.008,0.71996 -0.45154,1.98402 -0.9847,2.80902 l -0.96937,1.5 -0.17242,-2 -0.17242,-2 -0.76912,5 z m -16.66667,-0.0178 -5.25,0.70546 0.0368,-3.34384 c 0.0202,-1.83911 0.63363,-6.26884 1.36314,-9.84384 0.72951,-3.575 2.54804,-11 4.04118,-16.5 l 2.71479,-10 3.08835,-6.30894 3.08836,-6.30894 5.28188,-5.36693 5.28187,-5.36694 8.48759,-4.20577 8.48759,-4.20577 1.40836,0.54045 1.40837,0.54044 0.68793,10.8412 c 0.37836,5.96266 1.74209,18.7162 3.03051,28.3412 1.28842,9.625 2.174,17.6875 1.96795,17.91667 -0.20604,0.22916 -0.59867,0.19262 -0.8725,-0.0812 -0.27383,-0.27382 -1.65693,-8.11132 -3.07357,-17.41666 -1.41663,-9.30534 -2.83009,-19.5063 -3.14101,-22.6688 l -0.56533,-5.75 -2.80909,0 -2.80909,0 1.06925,-3.06726 1.06926,-3.06726 1.87872,-1.17329 c 1.03326,-0.6453 1.87869,-1.47594 1.87869,-1.84586 l 0,-0.67259 -3.25,1.03873 c -1.7875,0.5713 -5.07142,1.83212 -7.2976,2.80181 l -4.0476,1.76307 -5.73825,5.24444 -5.73826,5.24444 -2.47469,4.22274 c -1.36108,2.32251 -3.52375,7.32511 -4.80595,11.11689 -1.28219,3.79178 -2.63601,8.13165 -3.0085,9.64415 l -0.67725,2.75 1.51905,0 1.51905,0 0,1.5151 c 0,0.8333 -0.74739,4.20332 -1.66087,7.48893 l -1.66088,5.97383 -1.33912,-1.11137 -1.33913,-1.11138 0.13618,3.87245 0.13618,3.87244 0.43337,-2.25 c 0.23836,-1.2375 0.76171,-2.25 1.16302,-2.25 l 0.72965,0 -0.42589,3.64807 -0.42589,3.64806 4.37669,-0.6463 4.37669,-0.6463 -1.5,0.88662 c -0.825,0.48764 -3.8625,1.20407 -6.75,1.59207 z m -2.58333,-1.81553 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z m 1.9375,-10.9375 0.60416,-0.60417 -0.52522,-1.3125 -0.52522,-1.3125 -0.0789,1.91667 -0.0789,1.91666 0.60417,-0.60416 z m 1.0625,-5.0625 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z M 297.5,-536.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 36.16667,-41.33333 0.66666,-0.66667 -0.66666,-0.66667 -0.66667,-0.66666 0,1.33333 0,1.33333 0.66667,-0.66666 z M 319.5,-521.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 2.5,-1 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m -6.34406,-1.73097 -0.49805,1.23097 0.0371,-3 0.0371,-3 0.46099,1.76903 c 0.25354,0.97297 0.23687,2.32297 -0.0371,3 z m 9.84406,0.73097 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 20.5,-5.60882 -2.5,0.61204 4.00416,-1.8562 c 2.20229,-1.0209 5.12729,-2.14103 6.5,-2.48917 l 2.49584,-0.63297 -4,1.87713 c -2.2,1.03242 -5.125,2.15255 -6.5,2.48917 z m -458.75,-1.42901 c -0.4125,-0.0208 -3.51358,-1.7083 -6.89128,-3.75 l -6.14129,-3.71217 -2.58059,-3.11094 c -1.41933,-1.71101 -3.04325,-4.32781 -3.60872,-5.8151 -0.56547,-1.48729 -0.99641,-3.46236 -0.95766,-4.38906 l 0.0705,-1.6849 1.45992,3.98895 1.45992,3.98894 3.71962,3.82227 3.71962,3.82226 5.25,3.01218 c 2.8875,1.6567 5.25,3.20416 5.25,3.43879 0,0.23464 -0.3375,0.40959 -0.75,0.38878 z m 480.12688,-3.47345 -2.62313,1.71873 0.67882,-1.09835 c 0.37335,-0.60409 1.55375,-1.5666 2.62312,-2.13891 1.06937,-0.5723 1.94431,-0.85148 1.94431,-0.62038 0,0.23109 -1.18041,1.1936 -2.62312,2.13891 z m -9.87688,0.46681 -1,0 2.5,-1.95553 c 1.375,-1.07554 2.95,-1.95553 3.5,-1.95553 l 1,0 -2.5,1.95553 c -1.375,1.07554 -2.95,1.95553 -3.5,1.95553 z m -507,-2.95553 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 515.95601,-1.33333 -1.45601,0 0,-0.80766 c 0,-0.44421 1.4625,-1.56374 3.25,-2.48786 l 3.25,-1.68021 -1.29174,1.55729 -1.29174,1.55728 1.29174,0.58801 1.29174,0.58802 -2.37523,-0.5979 -2.37523,-0.59791 0.58124,0.94047 0.58124,0.94047 -1.45601,0 z M -146.5,-538.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 464.16667,-1.33333 -0.66667,0.66666 0,-1.33333 0,-1.33333 0.66667,0.66666 0.66666,0.66667 -0.66666,0.66667 z M -143.5,-540.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 518.19284,-1.01531 c -0.10606,-0.008 -0.80459,-0.40292 -1.55229,-0.87666 l -1.35944,-0.86135 4.85944,-3.31988 c 2.6727,-1.82594 5.44826,-4.01895 6.16791,-4.87335 0.71966,-0.8544 2.20322,-3.46595 3.2968,-5.80345 l 1.98833,-4.25 0.92182,0 0.92182,0 -0.54094,1.40966 -0.54093,1.40966 2.07232,0.65773 2.07232,0.65773 0,1.43261 0,1.43261 -1,0 -1,0 0,1.63084 0,1.63084 -3.28179,-0.53256 -3.28179,-0.53256 0.0318,2.5541 0.0318,2.55411 -1.3892,0.47734 -1.38919,0.47735 0.7937,-1.28424 0.79371,-1.28424 -1.17082,0.72361 -1.17082,0.72361 0.51482,0.833 0.51483,0.833 -3.55568,2.0979 c -1.95562,1.15385 -3.64245,2.09101 -3.74851,2.08259 z M 374.5,-542.5664 c 0.275,0 0.5,-0.225 0.5,-0.5 0,-0.275 -0.225,-0.5 -0.5,-0.5 -0.275,0 -0.5,0.225 -0.5,0.5 0,0.275 0.225,0.5 0.5,0.5 z m 2.79313,-1.56429 1.79313,-0.68279 -0.5598,-0.55979 -0.55979,-0.5598 -1.23334,1.24258 -1.23333,1.24258 1.79313,-0.68278 z m 12.08443,-9.43571 c 0.20765,0 0.93775,-0.675 1.62244,-1.5 l 1.24489,-1.5 -1.62245,0 -1.62244,0 0,1.5 c 0,0.825 0.1699,1.5 0.37756,1.5 z m -519.10851,4.99998 c -0.12702,10e-6 -0.48772,-1.02306 -0.80156,-2.27349 l -0.57061,-2.2735 0.95267,-2.4765 0.95267,-2.47649 -0.15111,4.74998 c -0.0831,2.61249 -0.25504,4.74999 -0.38206,4.75 z m -2.66488,-5.27081 -0.60417,0.60416 0.0789,-1.91666 0.0789,-1.91667 0.52522,1.3125 0.52522,1.3125 -0.60416,0.60417 z M 385.5,-559.5664 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 0.30687,-4.47354 -0.55979,0.5598 -0.68279,-1.79313 -0.68278,-1.79313 1.24258,1.23333 1.24258,1.23334 -0.5598,0.55979 z m 2.75215,0.47354 c -0.24254,0 -0.69988,-0.41891 -1.01631,-0.9309 l -0.57533,-0.9309 1.01631,-0.62812 1.01631,-0.62811 0,1.55901 c 0,0.85746 -0.19844,1.55902 -0.44098,1.55902 z m -487.05902,-10 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -15.75,-3.46549 -3.25,1.58588 2.5,-2.03796 c 1.375,-1.12088 2.8375,-2.04796 3.25,-2.06019 0.4125,-0.0122 0.75,0.1912 0.75,0.45208 0,0.26088 -1.4625,1.18796 -3.25,2.06019 z m 478.75,-0.53451 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 13,0 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -24.5,-5 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m -6.5,-2 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -8,-3 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -4,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -3.5,-1 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m -13,-3 -1.33333,0 0.66666,-0.66667 0.66667,-0.66666 0.66667,0.66666 0.66666,0.66667 -1.33333,0 z m -4.5,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m -5,-1 c -0.275,0 -0.5,-0.225 -0.5,-0.5 0,-0.275 0.225,-0.5 0.5,-0.5 0.275,0 0.5,0.225 0.5,0.5 0,0.275 -0.225,0.5 -0.5,0.5 z m 19.91667,-5.07895 -1.91667,-0.0789 1.3125,-0.52522 1.3125,-0.52522 0.60417,0.60416 0.60416,0.60417 -1.91666,-0.0789 z M 230,-616.93151 c -5.775,-0.0742 -11.85,-0.41915 -13.5,-0.76658 l -3,-0.63168 6,0.0124 c 3.3,0.007 9.375,0.35177 13.5,0.76657 l 7.5,0.75419 -10.5,-0.13489 z m -23,-1.46465 -5.5,0.44634 -4,-0.66638 -4,-0.66639 9.91667,-0.1419 c 5.45416,-0.0781 9.72916,0.021 9.5,0.22004 -0.22917,0.19907 -2.89167,0.5628 -5.91667,0.80829 z"
+ id="path3917"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>

HandBrake-0.10.0.tar.bz2/gtk/src/hb-pause.svg Added

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="64.039505"
+ height="63.091442"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="hb-pause.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4106">
+ <stop
+ style="stop-color:#98cc69;stop-opacity:1;"
+ offset="0"
+ id="stop4108" />
+ <stop
+ style="stop-color:#98cc69;stop-opacity:0;"
+ offset="1"
+ id="stop4110" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4092">
+ <stop
+ style="stop-color:#6e9e41;stop-opacity:1;"
+ offset="0"
+ id="stop4094" />
+ <stop
+ style="stop-color:#6e9e41;stop-opacity:0;"
+ offset="1"
+ id="stop4096" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4092"
+ id="linearGradient4098"
+ x1="47.222271"
+ y1="25.042967"
+ x2="42.65625"
+ y2="11.961781"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.4542086,0,0,2.4207748,-48.773934,985.73331)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4106"
+ id="linearGradient4112"
+ x1="41.413502"
+ y1="12.430531"
+ x2="42.273998"
+ y2="-5.2882195"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.313709"
+ inkscape:cx="-2.963498"
+ inkscape:cy="14.251699"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="2985"
+ inkscape:window-height="1606"
+ inkscape:window-x="169"
+ inkscape:window-y="88"
+ inkscape:window-maximized="0"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-33.518748,-986.11151)">
+ <path
+ sodipodi:type="arc"
+ style="fill:url(#linearGradient4112);fill-opacity:1;stroke:#7d7d80;stroke-width:1.04799998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path3096"
+ sodipodi:cx="46.578125"
+ sodipodi:cy="13.180531"
+ sodipodi:rx="12.515625"
+ sodipodi:ry="12.515625"
+ d="m 59.09375,13.180531 c 0,6.912188 -5.603436,12.515625 -12.515625,12.515625 -6.912189,0 -12.515625,-5.603437 -12.515625,-12.515625 0,-6.9121893 5.603436,-12.51562545 12.515625,-12.51562545 6.912189,0 12.515625,5.60343615 12.515625,12.51562545 z"
+ transform="matrix(2.4542086,0,0,2.4207748,-48.773934,985.73326)" />
+ <path
+ style="opacity:0;fill:none;stroke:#000000;stroke-width:2.4374342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 37.813612,1027.7016 c 27.609847,-21.2574 55.526469,-19.8956 55.526469,-19.8956"
+ id="path4068"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:url(#linearGradient4098);fill-opacity:1;stroke:#7d7d80;stroke-width:0.07556046;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 63.104846,1046.5393 c -1.150252,-0.1051 -2.87356,-0.3639 -3.834702,-0.5731 -9.131727,-1.9878 -16.778886,-8.1344 -20.584912,-16.5457 -0.381156,-0.8425 -0.413139,-0.9508 -0.23877,-0.808 0.09466,0.078 0.381477,-0.1027 1.706441,-1.0744 4.32925,-3.1744 7.884669,-5.4105 12.50085,-7.8622 8.960431,-4.7591 19.123843,-8.1529 29.049394,-9.7003 3.788721,-0.5905 6.947442,-0.8708 11.005589,-0.9759 l 0.651899,-0.024 0.04003,-0.2647 c 0.03419,-0.2249 0.08725,-0.098 0.362968,0.8698 0.860355,3.0233 1.128237,4.9393 1.126336,8.0567 -0.0013,2.1542 -0.09635,3.3071 -0.420071,5.0954 -0.702826,3.8827 -2.194424,7.5466 -4.439182,10.9045 -3.597826,5.3819 -9.019159,9.476 -15.230031,11.5016 -1.935985,0.6313 -3.637313,1.0097 -5.790398,1.2876 -1.12016,0.1442 -4.77869,0.2102 -5.905439,0.1051 z"
+ id="path4074"
+ inkscape:connector-curvature="0" />
+ <rect
+ style="fill:#384c25;fill-opacity:1;stroke:#7d7d80;stroke-width:0.11172702;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect4137"
+ width="7.0125442"
+ height="23.877636"
+ x="57.243675"
+ y="1005.7939" />
+ <rect
+ style="fill:#384c25;fill-opacity:1;stroke:#7d7d80;stroke-width:0.10703696;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect4139"
+ width="6.9940414"
+ height="23.877363"
+ x="68.396469"
+ y="1005.7939" />
+ </g>
+</svg>

HandBrake-0.10.0.tar.bz2/gtk/src/hb-picture.svg Added

@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg5880"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ width="64"
+ height="64"
+ sodipodi:docname="hb-picture.64.png">
+ <metadata
+ id="metadata5886">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs5884" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="854"
+ inkscape:window-height="501"
+ id="namedview5882"
+ showgrid="false"
+ inkscape:zoom="3.6875"
+ inkscape:cx="32"
+ inkscape:cy="32"
+ inkscape:window-x="423"
+ inkscape:window-y="172"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg5880" />
+ <image
+ width="64"
+ height="64"
+ xlink:href="data:image/png;base64,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
+"
+ id="image5888"
+ x="0"
+ y="0" />
+ <path
+ style="fill:#434343"
+ d="M 32,59 6,59 4,57 2,55 2,38 2,21 4,19 6,17 16,17 26,17 26,15.281445 26,13.562891 20.78416,8.2814453 15.56832,3 l 2.156315,0 2.156314,0 4.216062,5 4.216062,5 3.787983,0 3.787982,0 L 40.194519,8.0004909 44.5,3.0009817 46.468697,3.0004909 48.437393,3 42.835757,8.75 37.23412,14.5 37.700393,15.75 38.166667,17 48.083333,17 58,17 l 2,2 2,2 0,17 0,17 -2,2 -2,2 -26,0 z m -4,-6 13.2,0 3.4,-3.4 3.4,-3.4 0,-7.552947 0,-7.552947 L 46.805315,28.472058 45.610629,25.850009 42.854975,24.425004 40.09932,23 28,23 15.90068,23 13.145025,24.425004 10.389371,25.850009 9.1946853,28.472058 8,31.094106 8,38.647053 8,46.2 11.4,49.6 14.8,53 28,53 z m 26,-4 1.755111,0 1.20502,-1.451961 1.20502,-1.45196 L 57.832576,44.405223 57.5,42.714367 55.75,41.612298 54,40.51023 l -1.75,1.102068 -1.75,1.102069 -0.332576,1.690856 -0.332575,1.690856 1.20502,1.45196 L 52.244889,49 54,49 z m 0,-10 1.755111,0 1.20502,-1.451961 1.20502,-1.45196 L 57.832576,34.405223 57.5,32.714367 55.75,31.612298 54,30.51023 l -1.75,1.102068 -1.75,1.102069 -0.332576,1.690856 -0.332575,1.690856 1.20502,1.45196 L 52.244889,39 54,39 z"
+ id="path5890"
+ inkscape:connector-curvature="0" />
+</svg>

HandBrake-0.10.0.tar.bz2/gtk/src/hb-remove.svg Added

@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg6954"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ width="63.984646"
+ height="63.995045"
+ sodipodi:docname="hb-remove.svg">
+ <metadata
+ id="metadata6960">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs6958">
+ <linearGradient
+ id="linearGradient7588">
+ <stop
+ style="stop-color:#910303;stop-opacity:1;"
+ offset="0"
+ id="stop7590" />
+ <stop
+ style="stop-color:#ffebeb;stop-opacity:1;"
+ offset="1"
+ id="stop7592" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient7516">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop7518" />
+ <stop
+ id="stop7526"
+ offset="0.8599655"
+ style="stop-color:#414141;stop-opacity:1;" />
+ <stop
+ id="stop7524"
+ offset="0.96385676"
+ style="stop-color:#868686;stop-opacity:1;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="1"
+ id="stop7520" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7516"
+ id="radialGradient7522"
+ cx="75.102837"
+ cy="102.94545"
+ fx="75.102837"
+ fy="102.94545"
+ r="15.520127"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.6507957,-2.9715901,3.1350878,2.7967413,-434.97784,28.415628)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7588"
+ id="linearGradient7657"
+ gradientUnits="userSpaceOnUse"
+ x1="-25.424635"
+ y1="-78.221901"
+ x2="-55.220131"
+ y2="-77.516251" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7588"
+ id="linearGradient7659"
+ gradientUnits="userSpaceOnUse"
+ x1="-25.424635"
+ y1="-78.221901"
+ x2="-55.220131"
+ y2="-77.516251" />
+ </defs>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="2608"
+ inkscape:window-height="1185"
+ id="namedview6956"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:zoom="4.9166667"
+ inkscape:cx="39.86331"
+ inkscape:cy="65.963829"
+ inkscape:window-x="223"
+ inkscape:window-y="284"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="g7646" />
+ <image
+ width="48"
+ height="48"
+ xlink:href="data:image/png;base64,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 "
+ id="image6962"
+ x="-254.18425"
+ y="-27.392511" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path6968"
+ sodipodi:cx="111.15254"
+ sodipodi:cy="16.983051"
+ sodipodi:rx="66.203392"
+ sodipodi:ry="66.203392"
+ d="m 177.35593,16.983051 a 66.203392,66.203392 0 1 1 -132.40678,0 66.203392,66.203392 0 1 1 132.40678,0 z"
+ transform="matrix(0.48290299,0,0,0.4828676,-21.685362,23.796319)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:url(#radialGradient7522);fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path7514"
+ sodipodi:cx="84.610168"
+ sodipodi:cy="84.610168"
+ sodipodi:rx="53.694916"
+ sodipodi:ry="53.694916"
+ d="m 138.30508,84.610168 a 53.694916,53.694916 0 1 1 -107.389827,0 53.694916,53.694916 0 1 1 107.389827,0 z"
+ transform="matrix(0.48290299,0,0,0.4828676,-8.818862,-8.8095221)" />
+ <g
+ id="g7646"
+ transform="translate(-191.3368,11.658336)">
+ <g
+ transform="matrix(0.34146398,-0.34143897,0.34146398,0.34143897,140.08689,112.87016)"
+ id="g7629">
+ <g
+ id="g7596"
+ transform="matrix(0.75502291,-0.88915645,0.7272656,0.88775135,180.26389,29.369646)"
+ inkscape:transform-center-x="62.587435"
+ inkscape:transform-center-y="-16.746278">
+ <rect
+ inkscape:transform-center-x="64.08004"
+ transform="matrix(-0.69656068,0.71749789,-0.70759094,-0.70662229,0,0)"
+ ry="0"
+ y="-113.99992"
+ x="-44.207855"
+ height="81.640587"
+ width="19.558914"
+ id="rect7540"
+ style="fill:url(#linearGradient7657);fill-opacity:1;stroke:#7d7d80;stroke-width:0.03725971;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ inkscape:transform-center-y="32.741891" />
+ </g>
+ <rect
+ inkscape:transform-center-y="58.800787"
+ style="fill:#fb2828;fill-opacity:1;stroke:#7d7d80;stroke-width:0.03569389;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect7627"
+ width="17.948257"
+ height="81.646454"
+ x="-23.650179"
+ y="-297.9545"
+ ry="0"
+ transform="matrix(-0.00292286,0.99999573,-0.99999994,-3.3387877e-4,0,0)"
+ inkscape:transform-center-x="-31.707297" />
+ </g>
+ <g
+ id="g7636"
+ transform="matrix(0.34146398,0.34143897,-0.34146398,0.34143897,130.51304,-62.605357)">
+ <g
+ inkscape:transform-center-y="-16.746278"
+ inkscape:transform-center-x="62.587435"
+ transform="matrix(0.75502291,-0.88915645,0.7272656,0.88775135,180.26389,29.369646)"
+ id="g7638">
+ <rect
+ inkscape:transform-center-y="32.741891"
+ style="fill:url(#linearGradient7659);fill-opacity:1;stroke:#7d7d80;stroke-width:0.03725971;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect7640"
+ width="19.558914"
+ height="81.640587"
+ x="-44.207855"
+ y="-113.99992"
+ ry="0"
+ transform="matrix(-0.69656068,0.71749789,-0.70759094,-0.70662229,0,0)"
+ inkscape:transform-center-x="64.08004" />
+ </g>
+ <rect
+ inkscape:transform-center-x="-31.707297"
+ transform="matrix(-0.00292286,0.99999573,-0.99999994,-3.3387877e-4,0,0)"
+ ry="0"
+ y="-297.9545"
+ x="-23.650179"
+ height="81.646454"
+ width="17.948257"
+ id="rect7642"
+ style="fill:#fc2828;fill-opacity:1;stroke:#7d7d80;stroke-width:0.03569389;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ inkscape:transform-center-y="58.800787" />
+ </g>
+ <rect
+ inkscape:transform-center-y="8.7721117"
+ style="fill:#fc2727;fill-opacity:1;stroke:#7d7d80;stroke-width:0.01626823;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect7530"
+ width="8.1802607"
+ height="37.212177"
+ x="169.54268"
+ y="-163.1785"
+ ry="0"
+ transform="matrix(0.69865519,0.71545854,-0.69843341,0.71567505,0,0)"
+ inkscape:transform-center-x="-28.868328" />
+ </g>
+</svg>

HandBrake-0.10.0.tar.bz2/gtk/src/hb-showqueue.svg Added

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg5807"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ width="64"
+ height="64"
+ sodipodi:docname="hb-showqueue.64.png">
+ <metadata
+ id="metadata5813">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs5811" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1434"
+ inkscape:window-height="954"
+ id="namedview5809"
+ showgrid="false"
+ inkscape:zoom="3.6875"
+ inkscape:cx="32"
+ inkscape:cy="32"
+ inkscape:window-x="792"
+ inkscape:window-y="147"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg5807" />
+ <image
+ width="64"
+ height="64"
+ xlink:href="data:image/png;base64,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
+"
+ id="image5815"
+ x="0"
+ y="0" />
+ <path
+ style="fill:#474747"
+ d="M 40,60 20,60 18,58 16,56 16,53.206797 16,50.413593 12.75,49.456797 9.5,48.5 8.5432035,45.25 7.5864069,42 5.7932035,42 4,42 2,40 0,38 0,24 0,10 2,8 4,6 l 19,0 19,0 2,2 2,2 0,1.793203 0,1.793204 3.25,0.956796 L 52.5,15.5 53.456797,18.75 54.413593,22 57.206797,22 60,22 l 2,2 2,2 0,15 0,15 -2,2 -2,2 -20,0 z m 0,-6 18,0 0,-13 0,-13 -18,0 -18,0 0,13 0,13 18,0 z m -0.01419,-2 -16.014189,0 2.647075,-4 c 1.455891,-2.2 2.889342,-4 3.185448,-4 0.296105,0 1.300129,0.68938 2.231165,1.531956 l 1.692792,1.531956 1.659002,-2.531956 C 36.299555,43.13938 37.409691,42 37.854073,42 38.298455,42 39.264122,43.125 40,44.5 c 0.735878,1.375 1.657119,2.5 2.047202,2.5 0.390084,0 2.413841,-2.475 4.497238,-5.5 2.083397,-3.025 4.103201,-5.5 4.488452,-5.5 0.385252,0 1.660454,2.310009 2.833783,5.133353 L 56,46.266705 56,49.133353 56,52 39.985812,52 z M 30.742688,40 29.142857,40 27.571429,38.428571 26,36.857143 26,35 26,33.142857 27.571429,31.571429 29.142857,30 l 1.773584,0 1.773584,0 1.654987,1.828741 1.654988,1.82874 0,1.516272 0,1.516272 -1.828741,1.654987 L 32.342519,40 30.742688,40 z M 15,44 l 1,0 0,-9 0,-9 2,-2 2,-2 14,0 14,0 0,-1 0,-1 -17,0 -17,0 0,12 0,12 1,0 z m -8,-8 1,0 0,-9 0,-9 2,-2 2,-2 14,0 14,0 0,-1 0,-1 -17,0 -17,0 0,12 0,12 1,0 z"
+ id="path5817"
+ inkscape:connector-curvature="0" />
+</svg>

HandBrake-0.10.0.tar.bz2/gtk/src/hb-source.svg Added

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg6096"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ width="64"
+ height="64"
+ sodipodi:docname="hb-source.svg">
+ <metadata
+ id="metadata6102">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs6100" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="2084"
+ inkscape:window-height="1234"
+ id="namedview6098"
+ showgrid="false"
+ inkscape:zoom="7.375"
+ inkscape:cx="-8.1355932"
+ inkscape:cy="32"
+ inkscape:window-x="105"
+ inkscape:window-y="385"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg6096" />
+ <image
+ width="64"
+ height="64"
+ xlink:href="data:image/png;base64,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
+RU5ErkJggg==
+"
+ id="image6104"
+ x="0"
+ y="0" />
+ <path
+ style="fill:#474747"
+ d="M 32,58 6,58 3.0508475,57.084746 2,54 2,31 2,8 32,8 62,8 62,31 62,54 61.220339,56.949153 58,58 z m 0,-6 24,0 0,-3 0,-3 -24,0 -24,0 0,3 0,3 z m 0,-8 24,0 0,-4 0,-4 -24,0 -24,0 0,4 0,4 z m -17,-10 7,0 0,-4 0,-4 -7,0 -7,0 0,4 0,4 z m 17,0 8,0 0,-4 0,-4 -8,0 -8,0 0,4 0,4 z m 17,0 7,0 0,-4 0,-4 -7,0 -7,0 0,4 0,4 z m -34.136188,-10 3,0 L 20,21 l 2.136188,-3 -3,0 -3,0 L 14,21 11.863812,24 z m 16,0 3,0 L 36,21 l 2.136188,-3 -3,0 -3,0 L 30,21 27.863812,24 z m 16,0 3,0 L 52,21 l 2.136188,-3 -3,0 -3,0 L 46,21 43.863812,24 z m -27.727624,-8 3,0 L 20,13 l -2.136188,-3 -3,0 -3,0 L 14,13 l 2.136188,3 z m 16,0 3,0 L 36,13 l -2.136188,-3 -3,0 -3,0 L 30,13 l 2.136188,3 z m 16,0 3,0 L 52,13 l -2.136188,-3 -3,0 -3,0 L 46,13 l 2.136188,3 z"
+ id="path6715"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+</svg>

HandBrake-0.10.0.tar.bz2/gtk/src/hb-start.svg Added

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="64.03373"
+ height="63.961697"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="hb-start.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4106">
+ <stop
+ style="stop-color:#98cc69;stop-opacity:1;"
+ offset="0"
+ id="stop4108" />
+ <stop
+ style="stop-color:#98cc69;stop-opacity:0;"
+ offset="1"
+ id="stop4110" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4092">
+ <stop
+ style="stop-color:#6e9e41;stop-opacity:1;"
+ offset="0"
+ id="stop4094" />
+ <stop
+ style="stop-color:#6e9e41;stop-opacity:0;"
+ offset="1"
+ id="stop4096" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4092"
+ id="linearGradient4098"
+ x1="47.222271"
+ y1="25.042967"
+ x2="42.65625"
+ y2="11.961781"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.4539872,0,0,2.454166,-48.760714,984.90034)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4106"
+ id="linearGradient4112"
+ x1="41.413502"
+ y1="12.430531"
+ x2="42.273998"
+ y2="-5.2882195"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="16"
+ inkscape:cx="-2.8809072"
+ inkscape:cy="30.683019"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="2985"
+ inkscape:window-height="1606"
+ inkscape:window-x="79"
+ inkscape:window-y="82"
+ inkscape:window-maximized="0"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-33.524546,-985.28365)">
+ <path
+ sodipodi:type="arc"
+ style="fill:url(#linearGradient4112);fill-opacity:1;stroke:#7d7d80;stroke-width:1.04799998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path3096"
+ sodipodi:cx="46.578125"
+ sodipodi:cy="13.180531"
+ sodipodi:rx="12.515625"
+ sodipodi:ry="12.515625"
+ d="m 59.09375,13.180531 c 0,6.912188 -5.603436,12.515625 -12.515625,12.515625 -6.912189,0 -12.515625,-5.603437 -12.515625,-12.515625 0,-6.9121893 5.603436,-12.51562545 12.515625,-12.51562545 6.912189,0 12.515625,5.60343615 12.515625,12.51562545 z"
+ transform="matrix(2.4539873,0,0,2.4541658,-48.760716,984.90019)" />
+ <path
+ style="opacity:0;fill:none;stroke:#000000;stroke-width:2.45407653px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 37.819025,1027.4477 c 27.60736,-21.5508 55.521465,-20.1705 55.521465,-20.1705"
+ id="path4068"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:url(#linearGradient4098);fill-opacity:1;stroke:#7d7d80;stroke-width:0.07607639;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 63.107977,1046.5446 c -1.150144,-0.106 -2.873296,-0.3686 -3.834351,-0.581 -9.130906,-2.0151 -16.777376,-8.2465 -20.583059,-16.7737 -0.381123,-0.8538 -0.413103,-0.9638 -0.238747,-0.8191 0.09467,0.079 0.381441,-0.104 1.706284,-1.0895 4.328861,-3.2178 7.88396,-5.4846 12.499724,-7.9704 8.959623,-4.825 19.122121,-8.2654 29.046775,-9.834 3.788382,-0.5985 6.946818,-0.8829 11.0046,-0.9896 l 0.651841,-0.024 0.04003,-0.2682 c 0.03419,-0.2286 0.08726,-0.097 0.362938,0.882 0.860277,3.0647 1.128136,5.0075 1.126236,8.1676 -0.0013,2.184 -0.09636,3.3525 -0.420036,5.1653 -0.702762,3.9366 -2.194226,7.6509 -4.438785,11.0554 -3.597498,5.456 -9.018342,9.6068 -15.228656,11.6602 -1.93581,0.6399 -3.636986,1.0232 -5.789874,1.3054 -1.120061,0.1463 -4.778261,0.2133 -5.904912,0.1062 z"
+ id="path4074"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:type="star"
+ style="fill:#384c25;fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path4116"
+ sodipodi:sides="3"
+ sodipodi:cx="45.59375"
+ sodipodi:cy="10.180531"
+ sodipodi:r1="6.0857315"
+ sodipodi:r2="3.0596068"
+ sodipodi:arg1="2.0803885"
+ sodipodi:arg2="3.0635412"
+ inkscape:flatsided="false"
+ inkscape:rounded="0"
+ inkscape:randomized="0"
+ d="m 42.625001,15.49303 -0.08154,-5.073935 -0.06609,-5.4658267 4.434928,2.4663498 4.766592,2.6756749 -4.353386,2.607586 z"
+ transform="matrix(2.4539873,0,0,2.4541658,-46.153355,991.57212)"
+ inkscape:transform-center-x="-0.45436515"
+ inkscape:transform-center-y="-0.93242328" />
+ </g>
+</svg>

HandBrake-0.10.0.tar.bz2/gtk/src/hb-stop.svg Added

@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="64.138466"
+ height="64.204422"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="hb-stop.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient4812">
+ <stop
+ style="stop-color:#f43536;stop-opacity:0.96774191;"
+ offset="0"
+ id="stop4814" />
+ <stop
+ style="stop-color:#ef8283;stop-opacity:0.99641579;"
+ offset="1"
+ id="stop4816" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4796">
+ <stop
+ style="stop-color:#941010;stop-opacity:1;"
+ offset="0"
+ id="stop4798" />
+ <stop
+ style="stop-color:#f03030;stop-opacity:0.99283153;"
+ offset="1"
+ id="stop4800" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4796"
+ id="linearGradient4802"
+ x1="41.226849"
+ y1="24.896255"
+ x2="36.870567"
+ y2="13.563606"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.2914188,0,0,2.2834769,328.42436,490.39178)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4812"
+ id="linearGradient4818"
+ x1="38.954006"
+ y1="10.785687"
+ x2="33.934811"
+ y2="2.2940922"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.2914188,0,0,2.2834769,328.42436,490.39178)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="15.839192"
+ inkscape:cx="-6.9528851"
+ inkscape:cy="29.325436"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="3066"
+ inkscape:window-height="1678"
+ inkscape:window-x="44"
+ inkscape:window-y="76"
+ inkscape:window-maximized="0"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-387.73031,-488.0452)">
+ <path
+ sodipodi:type="star"
+ style="fill:#be3232;fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path4770"
+ sodipodi:sides="8"
+ sodipodi:cx="38.070126"
+ sodipodi:cy="2.5466304"
+ sodipodi:r1="13.571502"
+ sodipodi:r2="12.538433"
+ sodipodi:arg1="1.1768998"
+ sodipodi:arg2="1.5695989"
+ inkscape:flatsided="true"
+ inkscape:rounded="0"
+ inkscape:randomized="0"
+ d="m 43.278725,15.078835 -10.38717,0.01244 -7.353634,-7.3360434 -0.01244,-10.3871703 7.336043,-7.3536336 10.387171,-0.012438 7.353633,7.3360435 0.01244,10.3871702 z"
+ transform="matrix(2.5459342,0,0,2.5459004,322.89492,513.66332)" />
+ <path
+ sodipodi:type="star"
+ style="fill:#f63638;fill-opacity:1;stroke:#7d7d80;stroke-width:0.031;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="path4786"
+ sodipodi:sides="8"
+ sodipodi:cx="35.229069"
+ sodipodi:cy="5.1982808"
+ sodipodi:r1="9.8153391"
+ sodipodi:r2="9.0681906"
+ sodipodi:arg1="1.1675937"
+ sodipodi:arg2="1.5602928"
+ inkscape:flatsided="true"
+ inkscape:rounded="0"
+ inkscape:randomized="0"
+ d="m 39.080276,14.226519 -7.511921,0.07891 -5.367525,-5.2559363 -0.0789,-7.5119209 5.255936,-5.3675243 7.511921,-0.078905 5.367524,5.2559362 0.07891,7.5119209 z"
+ transform="matrix(3.1320997,0,0,3.0346077,309.47717,504.76027)" />
+ <path
+ style="opacity:0;fill:none;stroke:#000000;stroke-width:2.28744435px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 393.66948,534.19475 c 21.33847,-21.26451 54.32271,-25.44534 54.32271,-25.44534"
+ id="path4788"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:url(#linearGradient4818);fill-opacity:1;stroke:#7d7d80;stroke-width:0.00223848;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 392.22542,532.75113 -0.60356,-0.55698 -0.12491,-11.35308 -0.1249,-11.3531 6.91302,-6.84433 c 3.80215,-3.76439 7.50185,-7.42353 8.22155,-8.13139 l 1.30852,-1.28704 9.39689,-0.10224 c 5.16827,-0.0564 10.45474,-0.10109 11.74771,-0.0994 l 2.35084,0.002 7.69149,7.30539 c 4.23034,4.01795 7.69693,7.33159 7.70356,7.36364 0.007,0.0322 -0.24833,0.10018 -0.5666,0.15154 -1.07427,0.17332 -3.60755,0.67402 -5.06337,1.00081 -12.47298,2.7997 -24.2674,7.45681 -33.99689,13.42388 -4.88606,2.9966 -9.5559,6.57032 -13.3066,10.18321 -0.48898,0.47103 -0.90122,0.85565 -0.91611,0.85473 -0.0149,-9.2e-4 -0.29866,-0.2523 -0.63062,-0.55864 l 0,0 z"
+ id="path4792"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:url(#linearGradient4802);fill-opacity:1;stroke:#7d7d80;stroke-width:0.00223848;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 401.61754,541.67395 c -3.71976,-3.53335 -6.82712,-6.48705 -6.90523,-6.56379 -0.14083,-0.13846 -0.13362,-0.14763 0.868,-1.10069 6.52689,-6.21111 14.60479,-11.45739 24.1762,-15.70147 7.63917,-3.38731 16.44003,-6.14823 24.755,-7.76594 1.69053,-0.3289 3.46205,-0.62203 3.49767,-0.57875 0.0133,0.0161 0.0752,4.88792 0.13774,10.82628 l 0.11366,10.79706 -5.65398,5.59965 c -3.1097,3.07982 -6.80953,6.74043 -8.22185,8.13469 l -2.56785,2.53503 -8.57156,0.0807 c -4.71436,0.0442 -9.98749,0.0988 -11.71809,0.12105 l -3.14651,0.0405 -6.76321,-6.42425 z"
+ id="path4794"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>

HandBrake-0.9.9.tar.bz2/gtk/src/icons.c -> HandBrake-0.10.0.tar.bz2/gtk/src/icons.c Changed

@@ -1,5 +1,4 @@
 #include "ghbcompat.h"
-#include "icon_tools.h"
 #include "values.h"
 #include "resources.h"
 
@@ -17,11 +16,10 @@
     while (g_hash_table_iter_next(
             &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
     {
-        gint colorspace, bps, width, height, rowstride;
-        gboolean alpha;
         ghb_rawdata_t *rd;
         gint size;
         GdkPixbuf *pb;
+        gboolean svg;
         char *name = g_strdup(key);
         char *pos;
 
@@ -29,20 +27,35 @@
         if (pos != NULL)
             *pos = '\0';
 
-        colorspace = ghb_value_int(ghb_dict_lookup(gval, "colorspace"));
-        alpha = ghb_value_boolean(ghb_dict_lookup(gval, "alpha"));
-        bps = ghb_value_int(ghb_dict_lookup(gval, "bps"));
-        width = ghb_value_int(ghb_dict_lookup(gval, "width"));
-        height = ghb_value_int(ghb_dict_lookup(gval, "height"));
-        rowstride = ghb_value_int(ghb_dict_lookup(gval, "rowstride"));
+        GInputStream *gis;
+        svg = ghb_value_boolean(ghb_dict_lookup(gval, "svg"));
         rd = g_value_get_boxed(ghb_dict_lookup(gval, "data"));
-        pb = gdk_pixbuf_new_from_data(
-                rd->data, colorspace, alpha, bps,
-                width, height, rowstride,
-                NULL, NULL);
-        size = gdk_pixbuf_get_height(pb);
-        gtk_icon_theme_add_builtin_icon(name, size, pb);
-        g_object_unref(pb);
+        if (svg)
+        {
+            int ii;
+            int sizes[] = {16, 22, 24, 32, 48, 64, 128, 256, 0};
+            for (ii = 0; sizes[ii]; ii++)
+            {
+                gis = g_memory_input_stream_new_from_data(rd->data, rd->size,
+                                                          NULL);
+                pb = gdk_pixbuf_new_from_stream_at_scale(gis,
+                                                         sizes[ii], sizes[ii],
+                                                         TRUE, NULL, NULL);
+                g_input_stream_close(gis, NULL, NULL);
+                size = gdk_pixbuf_get_height(pb);
+                gtk_icon_theme_add_builtin_icon(name, size, pb);
+                g_object_unref(pb);
+            }
+        }
+        else
+        {
+            gis = g_memory_input_stream_new_from_data(rd->data, rd->size, NULL);
+            pb = gdk_pixbuf_new_from_stream(gis, NULL, NULL);
+            g_input_stream_close(gis, NULL, NULL);
+            size = gdk_pixbuf_get_height(pb);
+            gtk_icon_theme_add_builtin_icon(name, size, pb);
+            g_object_unref(pb);
+        }
         g_free(name);
     }
 }

HandBrake-0.9.9.tar.bz2/gtk/src/icons.h -> HandBrake-0.10.0.tar.bz2/gtk/src/icons.h Changed

HandBrake-0.9.9.tar.bz2/gtk/src/internal_defaults.xml -> HandBrake-0.10.0.tar.bz2/gtk/src/internal_defaults.xml Changed

@@ -2,28 +2,47 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+ <key>Globals</key>
+ <dict>
+ <key>show_preview</key>
+ <false />
+ <key>scan_source</key>
+ <string></string>
+ </dict>
 <key>Initialization</key>
 <dict>
+ <key>AudioBitrate</key>
+ <string>192</string>
+ <key>AudioEncoder</key>
+ <string>copy:ac3</string>
+ <key>AudioTrack</key>
+ <integer>0</integer>
+ <key>AudioTrackQualityEnable</key>
+ <false />
+ <key>AudioTrackQuality</key>
+ <real>-1</real>
+ <key>AudioTrackGainSlider</key>
+ <real>0</real>
+ <key>AudioTrackDRCSlider</key>
+ <real>0</real>
+ <key>AudioMixdown</key>
+ <string>dpl2</string>
+ <key>AudioSamplerate</key>
+ <string>source</string>
 <key>AudioTrackName</key>
 <string></string>
- <key>AudioEncoderActual</key>
- <string></string>
 <key>angle_count</key>
 <integer>1</integer>
 <key>angle</key>
 <integer>1</integer>
- <key>anamorphic</key>
- <true />
 <key>autoscale</key>
- <false />
+ <true />
 <key>dest_dir</key>
 <string></string>
 <key>dest_file</key>
 <string>new_video.mp4</string>
 <key>end_point</key>
- <integer>100</integer>
- <key>folder</key>
- <string></string>
+ <real>100</real>
 <key>MetaName</key>
 <string></string>
 <key>MetaArtist</key>
@@ -42,10 +61,16 @@
 <string></string>
 <key>preset</key>
 <array>
+ <string>Regular</string>
 <string>Normal</string>
 </array>
+ <key>preset_modified</key>
+ <false />
+ <key>preset_reload</key>
+ <false />
 <key>preset_selection</key>
 <array>
+ <string>Regular</string>
 <string>Normal</string>
 </array>
 <key>PictureDisplayWidth</key>
@@ -58,65 +83,24 @@
 <integer>0</integer>
 <key>scale_width</key>
 <integer>0</integer>
- <key>preview_show_crop</key>
- <false />
- <key>hide_settings</key>
- <false />
- <key>show_picture</key>
- <false />
 <key>single_title</key>
 <integer>1</integer>
 <key>start_point</key>
- <integer>1</integer>
+ <real>1</real>
 <key>start_frame</key>
 <integer>-1</integer>
- <key>title_no</key>
- <integer>0</integer>
 <key>title</key>
- <string>none</string>
- <key>volume_label</key>
- <string>New Video</string>
- <key>x264_8x8dct</key>
- <false />
- <key>x264_analyse</key>
- <string>some</string>
- <key>x264_bframes</key>
- <integer>0</integer>
- <key>x264_mbtree</key>
- <true />
- <key>x264_bpyramid</key>
- <false />
- <key>x264_cabac</key>
- <true />
- <key>x264_deblock_alpha</key>
- <integer>0</integer>
- <key>x264_deblock_beta</key>
 <integer>0</integer>
- <key>x264_direct</key>
- <string>spatial</string>
- <key>x264_b_adapt</key>
- <string>1</string>
- <key>x264_me</key>
- <string>hex</string>
- <key>x264_merange</key>
- <integer>16</integer>
- <key>x264_mixed_refs</key>
- <false />
- <key>x264_no_dct_decimate</key>
- <false />
- <key>x264_no_fast_pskip</key>
- <false />
- <key>x264_refs</key>
- <integer>1</integer>
- <key>x264_subme</key>
- <integer>6</integer>
- <key>x264_trellis</key>
- <integer>0</integer>
- <key>x264_weighted_bframes</key>
+ <key>title_selected</key>
 <false />
+ <key>volume_label</key>
+ <string>New Video</string>
 <key>audio_list</key>
 <array>
 </array>
+ <key>chapter_list</key>
+ <array>
+ </array>
 <key>subtitle_list</key>
 <array>
 </array>
@@ -137,14 +121,22 @@
 <key>VideoFrameratePFR</key>
 <false />
 <key>VideoFramerateVFR</key>
+ <true />
+ <key>PictureDeinterlaceDecomb</key>
+ <false />
+ <key>VideoPresetSlider</key>
+ <integer>0</integer>
+ <key>x264ZeroLatency</key>
+ <false />
+ <key>x264FastDecode</key>
 <false />
 </dict>
 <key>Preferences</key>
 <dict>
- <key>HideAdvancedVideoSettings</key>
- <false />
- <key>AdvancedAutoPassthru</key>
+ <key>RemoveFinishedJobs</key>
 <false />
+ <key>HideAdvancedVideoSettings</key>
+ <true />
 <key>AutoScan</key>
 <false />
 <key>AddCC</key>
@@ -155,14 +147,10 @@
 <true />
 <key>allow_tweaks</key>
 <false />
- <key>title_no_in_destination</key>
- <false />
 <key>last_update_check</key>
 <integer>0</integer>
 <key>check_updates</key>
 <string>weekly</string>
- <key>chapters_in_destination</key>
- <false />
 <key>default_source</key>
 <string>/dev/dvd</string>
 <key>ExportDirectory</key>
@@ -179,8 +167,6 @@
 <string>1</string>
 <key>LogLongevity</key>
 <string>immortal</string>
- <key>nocheckvquality</key>
- <false />
 <key>use_dvdnav</key>
 <true />
 <key>reduce_hd_preview</key>
@@ -191,22 +177,20 @@
 <integer>10</integer>
 <key>preview_fullscreen</key>
 <false />
+ <key>preview_show_crop</key>
+ <false />
 <key>preview_x</key>
 <integer>-1</integer>
 <key>preview_y</key>
 <integer>-1</integer>
- <key>settings_x</key>
- <integer>-1</integer>
- <key>settings_y</key>
- <integer>-1</integer>
 <key>show_presets</key>
 <true />
- <key>show_preview</key>
- <true />
 <key>UseM4v</key>
 <true />
- <key>use_source_name</key>
+ <key>auto_name</key>
 <true />
+ <key>auto_name_template</key>
+ <string>{source}</string>
 <key>update_skip_version</key>
 <integer>0</integer>
 <key>VideoQualityGranularity</key>
@@ -215,12 +199,6 @@
 <string>0.1</string>
 <key>PreferredLanguage</key>
 <string>und</string>
- <key>AudioDUB</key>
- <false />
- <key>NotAudioDUB</key>
- <true />
- <key>constant_rate_factor</key>
- <true />
 <key>WhenComplete</key>
 <string>notify</string>
 <key>SrtDir</key>
@@ -230,29 +208,6 @@
 <key>window_height</key>
 <integer>1</integer>
 </dict>
- <key>XlatPresets</key>
- <dict>
- <key>autoscale</key>
- <false />
- <key>vquality_type_bitrate</key>
- <false />
- <key>vquality_type_constant</key>
- <false />
- <key>VideoFramerateCFR</key>
- <false />
- <key>VideoFrameratePFR</key>
- <false />
- <key>VideoFramerateVFR</key>
- <false />
- <key>PictureDeinterlaceDecomb</key>
- <false />
- <key>x264PresetSlider</key>
- <integer>0</integer>
- <key>x264ZeroLatency</key>
- <false />
- <key>x264FastDecode</key>
- <false />
- </dict>
 <key>Presets</key>
 <dict>
 <key>PresetBuildNumber</key>
@@ -268,7 +223,7 @@
 <key>PictureLooseCrop</key>
 <false />
 <key>PictureModulus</key>
- <integer>16</integer>
+ <integer>2</integer>
 <key>PictureDeblock</key>
 <integer>0</integer>
 <key>PictureDecombDeinterlace</key>
@@ -291,8 +246,12 @@
 <string>off</string>
 <key>PictureDeinterlaceCustom</key>
 <string></string>
- <key>PictureDenoise</key>
+ <key>PictureDenoiseFilter</key>
 <string>off</string>
+ <key>PictureDenoisePreset</key>
+ <string>medium</string>
+ <key>PictureDenoiseTune</key>
+ <string>none</string>
 <key>PictureDenoiseCustom</key>
 <string></string>
 <key>PictureDetelecine</key>
@@ -335,6 +294,10 @@
 <true />
 <key>AudioEncoderFallback</key>
 <string>ffac3</string>
+ <key>AudioLanguageList</key>
+ <array>
+ <string>und</string>
+ </array>
 <key>AudioList</key>
 <array>
 <dict>
@@ -342,15 +305,11 @@
 <string>192</string>
 <key>AudioEncoder</key>
 <string>copy:ac3</string>
- <key>AudioTrack</key>
- <integer>1</integer>
- <key>AudioTrackDescription</key>
- <string></string>
 <key>AudioTrackQualityEnable</key>
 <false />
 <key>AudioTrackQuality</key>
 <real>-1</real>
- <key>AudioTrackGain</key>
+ <key>AudioTrackGainSlider</key>
 <real>0</real>
 <key>AudioTrackDRCSlider</key>
 <real>0</real>
@@ -360,35 +319,34 @@
 <string>source</string>
 </dict>
 </array>
+ <key>AudioSecondaryEncoderMode</key>
+ <true />
+ <key>AudioTrackSelectionBehavior</key>
+ <string>first</string>
 <key>PresetDescription</key>
 <string></string>
 <key>PresetName</key>
 <string>Name Missing</string>
 <key>Type</key>
 <integer>1</integer>
- <key>SubtitleList</key>
+ <key>SubtitleLanguageList</key>
 <array>
- <dict>
- <key>SubtitleLanguage</key>
- <string>und</string>
- <key>SubtitleForced</key>
- <true />
- <key>SubtitleSource</key>
- <integer>0</integer>
- <key>SubtitleBurned</key>
- <true />
- <key>SubtitleDefaultTrack</key>
- <false />
- </dict>
+ <string>und</string>
 </array>
+ <key>SubtitleTrackSelectionBehavior</key>
+ <string>none</string>
+ <key>SubtitleAddCC</key>
+ <false />
+ <key>SubtitleAddForeignAudioSearch</key>
+ <false />
+ <key>SubtitleAddForeignAudioSubtitle</key>
+ <false />
 <key>VideoTurboTwoPass</key>
 <false />
 <key>UsesPictureFilters</key>
 <true />
 <key>UsesPictureSettings</key>
 <integer>2</integer>
- <key>UsesMaxPictureSettings</key>
- <false />
 <key>VideoTwoPass</key>
 <false />
 <key>VideoAvgBitrate</key>
@@ -399,23 +357,19 @@
 <integer>2</integer>
 <key>VideoQualitySlider</key>
 <real>0.60</real>
- <key>VideoTargetSize</key>
- <integer>700</integer>
- <key>lavcOption</key>
- <string></string>
 <key>x264Option</key>
 <string></string>
- <key>x264Preset</key>
+ <key>VideoPreset</key>
 <string>custom</string>
- <key>x264Tune</key>
+ <key>VideoTune</key>
 <string></string>
- <key>h264Profile</key>
+ <key>VideoProfile</key>
 <string></string>
- <key>h264Level</key>
+ <key>VideoLevel</key>
 <string></string>
 <key>x264UseAdvancedOptions</key>
- <true />
- <key>x264OptionExtra</key>
+ <false />
+ <key>VideoOptionExtra</key>
 <string></string>
 </dict>
 </dict>

HandBrake-0.9.9.tar.bz2/gtk/src/main.c -> HandBrake-0.10.0.tar.bz2/gtk/src/main.c Changed

@@ -2,19 +2,19 @@
 /*
 * main.c
 * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
- * 
+ *
 * main.c is free software.
- * 
+ *
 * You may 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.
- * 
+ *
 * main.c 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.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with main.c. If not, write to:
 * The Free Software Foundation, Inc.,
@@ -52,6 +52,7 @@
 #endif
 
 #include <glib/gstdio.h>
+#include <glib/gi18n.h>
 #include <gio/gio.h>
 #include "hb.h"
 #include "renderer_button.h"
@@ -62,6 +63,8 @@
 #include "icons.h"
 #include "callbacks.h"
 #include "queuehandler.h"
+#include "audiohandler.h"
+#include "subtitlehandler.h"
 #include "x264handler.h"
 #include "settings.h"
 #include "resources.h"
@@ -73,16 +76,7 @@
 /*
 * Standard gettext macros.
 */
-#ifdef ENABLE_NLS
-# include <libintl.h>
-# undef _
-# define _(String) dgettext(PACKAGE, String)
-# ifdef gettext_noop
-# define N_(String) gettext_noop(String)
-# else
-# define N_(String) (String)
-# endif
-#else
+#ifndef ENABLE_NLS
 # define textdomain(String) (String)
 # define gettext(String) (String)
 # define dgettext(Domain,Message) (Message)
@@ -114,13 +108,13 @@
 ghb_ui = g_value_get_string(gval);
 if (xml != NULL)
 res = gtk_builder_add_from_string(xml, ghb_ui, -1, &error);
- if (!xml || !res) 
+ if (!xml || !res)
 {
 GtkWidget *dialog = gtk_message_dialog_new_with_markup(NULL,
 GTK_DIALOG_MODAL,
 GTK_MESSAGE_ERROR,
 GTK_BUTTONS_CLOSE,
- _(markup),
+ gettext(markup),
 name, error->message);
 gtk_dialog_run(GTK_DIALOG(dialog));
 gtk_widget_destroy(dialog);
@@ -164,16 +158,16 @@
 g_debug("handler_name %s", handler_name);
 g_debug("signal_name %s", signal_name);
 callback = self_symbol_lookup(handler_name);
- if (!callback) 
+ if (!callback)
 {
 g_message("Signal handler (%s) not found", handler_name);
 return;
 }
- if (connect_object) 
+ if (connect_object)
 {
 g_signal_connect_object(object, signal_name, callback, connect_object, flags);
 }
- else 
+ else
 {
 if (flags & G_CONNECT_AFTER)
 {
@@ -224,7 +218,7 @@
 
 g_debug("bind_chapter_tree_model()\n");
 treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "chapters_list"));
- treestore = gtk_list_store_new(4, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
+ treestore = gtk_list_store_new(5, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
 gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
 
 cell = ghb_cell_renderer_text_new();
@@ -234,12 +228,17 @@
 
 cell = ghb_cell_renderer_text_new();
 column = gtk_tree_view_column_new_with_attributes(
- _("Duration"), cell, "text", 1, NULL);
+ _("Start"), cell, "text", 1, NULL);
+ gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+
+ cell = ghb_cell_renderer_text_new();
+ column = gtk_tree_view_column_new_with_attributes(
+ _("Duration"), cell, "text", 2, NULL);
 gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
 
 cell = ghb_cell_renderer_text_new();
 column = gtk_tree_view_column_new_with_attributes(
- _("Title"), cell, "text", 2, "editable", 3, NULL);
+ _("Title"), cell, "text", 3, "editable", 4, NULL);
 gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
 
 g_signal_connect(cell, "key-press-event", chapter_keypress_cb, ud);
@@ -271,200 +270,171 @@
 g_debug("bind_queue_tree_model()\n");
 treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
 selection = gtk_tree_view_get_selection(treeview);
- treestore = gtk_tree_store_new(3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+ treestore = gtk_tree_store_new(5, G_TYPE_BOOLEAN, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
 gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
 
 column = gtk_tree_view_column_new();
 gtk_tree_view_column_set_title(column, _("Job Information"));
+ cell = gtk_cell_renderer_spinner_new();
+ gtk_tree_view_column_pack_start(column, cell, FALSE);
+ gtk_tree_view_column_add_attribute(column, cell, "active", 0);
+ gtk_tree_view_column_add_attribute(column, cell, "pulse", 4);
 cell = gtk_cell_renderer_pixbuf_new();
- g_object_set(cell, "yalign", 0.0, NULL);
 gtk_tree_view_column_pack_start(column, cell, FALSE);
- gtk_tree_view_column_add_attribute(column, cell, "icon-name", 0);
+ gtk_tree_view_column_add_attribute(column, cell, "icon-name", 1);
 textcell = gtk_cell_renderer_text_new();
 g_object_set(textcell, "wrap-mode", PANGO_WRAP_CHAR, NULL);
 g_object_set(textcell, "wrap-width", 500, NULL);
 gtk_tree_view_column_pack_start(column, textcell, TRUE);
- gtk_tree_view_column_add_attribute(column, textcell, "markup", 1);
+ gtk_tree_view_column_add_attribute(column, textcell, "markup", 2);
 gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
 gtk_tree_view_column_set_expand(column, TRUE);
 gtk_tree_view_column_set_max_width(column, 550);
+ g_signal_connect(treeview, "size-allocate", queue_list_size_allocate_cb,
+ textcell);
 
 cell = custom_cell_renderer_button_new();
- g_object_set(cell, "yalign", 0.0, NULL);
 column = gtk_tree_view_column_new_with_attributes(
- _(""), cell, "icon-name", 2, NULL);
+ _(""), cell, "icon-name", 3, NULL);
 gtk_tree_view_column_set_min_width(column, 24);
 gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
 
- gtk_tree_view_enable_model_drag_dest(treeview, &SrcEntry, 1, 
+ gtk_tree_view_enable_model_drag_dest(treeview, &SrcEntry, 1,
 GDK_ACTION_MOVE);
- gtk_tree_view_enable_model_drag_source(treeview, GDK_BUTTON1_MASK, 
+ gtk_tree_view_enable_model_drag_source(treeview, GDK_BUTTON1_MASK,
 &SrcEntry, 1, GDK_ACTION_MOVE);
 
 g_signal_connect(selection, "changed", queue_list_selection_changed_cb, ud);
 g_signal_connect(cell, "clicked", queue_remove_clicked_cb, ud);
- g_signal_connect(treeview, "size-allocate", queue_list_size_allocate_cb, 
- textcell);
 g_signal_connect(treeview, "drag_data_received", queue_drag_cb, ud);
 g_signal_connect(treeview, "drag_motion", queue_drag_motion_cb, ud);
 }
 
 extern G_MODULE_EXPORT void audio_list_selection_changed_cb(void);
+extern G_MODULE_EXPORT void audio_edit_clicked_cb(void);
+extern G_MODULE_EXPORT void audio_remove_clicked_cb(void);
 
 // Create and bind the tree model to the tree view for the audio track list
 // Also, connect up the signal that lets us know the selection has changed
 static void
 bind_audio_tree_model(signal_user_data_t *ud)
 {
- GtkCellRenderer *cell;
+ GtkCellRenderer *source_cell;
+ GtkCellRenderer *arrow_cell;
+ GtkCellRenderer *output_cell;
+ GtkCellRenderer *edit_cell;
+ GtkCellRenderer *delete_cell;
 GtkTreeViewColumn *column;
- GtkListStore *treestore;
+ GtkTreeStore *treestore;
 GtkTreeView *treeview;
 GtkTreeSelection *selection;
- GtkWidget *widget;
 
 g_debug("bind_audio_tree_model()\n");
 treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list"));
 selection = gtk_tree_view_get_selection(treeview);
- // 12 columns in model. 6 are visible, the other 6 are for storing
- // values that I need
- treestore = gtk_list_store_new(7, G_TYPE_STRING, G_TYPE_STRING, 
- G_TYPE_STRING, G_TYPE_STRING, 
- G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+ treestore = gtk_tree_store_new(6, G_TYPE_STRING, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_FLOAT);
 gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
 
- cell = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes(
- _("Track"), cell, "text", 0, NULL);
- gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
- gtk_tree_view_column_set_min_width(column, 200);
- gtk_tree_view_column_set_max_width(column, 200);
-
- cell = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes(
- _("Codec"), cell, "text", 1, NULL);
- gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
- gtk_tree_view_column_set_min_width(column, 110);
+ source_cell = gtk_cell_renderer_text_new();
+ arrow_cell = gtk_cell_renderer_text_new();
+ output_cell = gtk_cell_renderer_text_new();
+ edit_cell = custom_cell_renderer_button_new();
+ delete_cell = custom_cell_renderer_button_new();
 
- cell = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes(
- _("Bitrate"), cell, "text", 2, NULL);
- gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
- gtk_tree_view_column_set_min_width(column, 50);
-
- cell = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes(
- _("Sample Rate"), cell, "text", 3, NULL);
- gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
- gtk_tree_view_column_set_min_width(column, 100);
-
- cell = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes(
- _("Mix"), cell, "text", 4, NULL);
+ column = gtk_tree_view_column_new();
+ gtk_tree_view_column_set_spacing(column, 12);
+ gtk_tree_view_column_set_title(column, _("Track Information"));
+ gtk_tree_view_column_pack_start(column, source_cell, FALSE);
+ gtk_tree_view_column_add_attribute(column, source_cell, "markup", 0);
+ gtk_tree_view_column_add_attribute(column, source_cell, "yalign", 5);
+ gtk_tree_view_column_pack_start(column, arrow_cell, FALSE);
+ gtk_tree_view_column_add_attribute(column, arrow_cell, "text", 1);
+ gtk_tree_view_column_pack_start(column, output_cell, TRUE);
+ gtk_tree_view_column_add_attribute(column, output_cell, "markup", 2);
+ gtk_tree_view_column_add_attribute(column, output_cell, "yalign", 5);
 gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
- gtk_tree_view_column_set_min_width(column, 115);
+ gtk_tree_view_column_set_expand(column, TRUE);
+ gtk_tree_view_column_set_max_width(column, 400);
 
- cell = gtk_cell_renderer_text_new();
 column = gtk_tree_view_column_new_with_attributes(
- _("Gain"), cell, "text", 5, NULL);
+ _(""), edit_cell, "icon-name", 3, NULL);
+ //gtk_tree_view_column_set_min_width(column, 24);
 gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
 
- cell = gtk_cell_renderer_text_new();
 column = gtk_tree_view_column_new_with_attributes(
- _("DRC"), cell, "text", 6, NULL);
+ _(""), delete_cell, "icon-name", 4, NULL);
+ //gtk_tree_view_column_set_min_width(column, 24);
 gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
 
 g_signal_connect(selection, "changed", audio_list_selection_changed_cb, ud);
- // Need to disable remove and update buttons since there are initially
- // no selections
- widget = GHB_WIDGET(ud->builder, "audio_remove");
- gtk_widget_set_sensitive(widget, FALSE);
+ g_signal_connect(edit_cell, "clicked", audio_edit_clicked_cb, ud);
+ g_signal_connect(delete_cell, "clicked", audio_remove_clicked_cb, ud);
+
 g_debug("Done\n");
 }
 
 extern G_MODULE_EXPORT void subtitle_list_selection_changed_cb(void);
-extern G_MODULE_EXPORT void subtitle_forced_toggled_cb(void);
-extern G_MODULE_EXPORT void subtitle_burned_toggled_cb(void);
-extern G_MODULE_EXPORT void subtitle_default_toggled_cb(void);
+extern G_MODULE_EXPORT void subtitle_edit_clicked_cb(void);
+extern G_MODULE_EXPORT void subtitle_remove_clicked_cb(void);
 
 // Create and bind the tree model to the tree view for the subtitle track list
 // Also, connect up the signal that lets us know the selection has changed
 static void
 bind_subtitle_tree_model(signal_user_data_t *ud)
 {
- GtkCellRenderer *cell;
+ GtkCellRenderer *source_cell;
+ GtkCellRenderer *arrow_cell;
+ GtkCellRenderer *output_cell;
+ GtkCellRenderer *edit_cell;
+ GtkCellRenderer *delete_cell;
 GtkTreeViewColumn *column;
- GtkListStore *treestore;
+ GtkTreeStore *treestore;
 GtkTreeView *treeview;
 GtkTreeSelection *selection;
- GtkWidget *widget;
 
 g_debug("bind_subtitle_tree_model()\n");
 treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
 selection = gtk_tree_view_get_selection(treeview);
- // 6 columns in model. 5 are visible, the other 1 is for storing
- // values that I need
- // Track, force, burn, default, type, srt offset, track short, source
- // force visible, burn visible, offset visible
- treestore = gtk_list_store_new(10, 
- G_TYPE_STRING,
- G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
- G_TYPE_BOOLEAN,
- G_TYPE_INT, G_TYPE_STRING,
- G_TYPE_INT,
- G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
- G_TYPE_BOOLEAN);
+ treestore = gtk_tree_store_new(6, G_TYPE_STRING, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_FLOAT);
 gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
 
- cell = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes(
- _("Track"), cell, "text", 0, NULL);
- widget = GHB_WIDGET(ud->builder, "SubTrackLabel");
- gtk_tree_view_column_set_widget(column, widget);
- gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
- gtk_tree_view_column_set_min_width(column, 350);
- gtk_tree_view_column_set_max_width(column, 350);
-
- cell = gtk_cell_renderer_toggle_new();
- column = gtk_tree_view_column_new_with_attributes(
- _("Forced Only"), cell, "active", 1, "visible", 7, NULL);
- widget = GHB_WIDGET(ud->builder, "SubForcedLabel");
- gtk_tree_view_column_set_widget(column, widget);
- gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
- g_signal_connect(cell, "toggled", subtitle_forced_toggled_cb, ud);
+ source_cell = gtk_cell_renderer_text_new();
+ arrow_cell = gtk_cell_renderer_text_new();
+ output_cell = gtk_cell_renderer_text_new();
+ edit_cell = custom_cell_renderer_button_new();
+ delete_cell = custom_cell_renderer_button_new();
 
- cell = gtk_cell_renderer_toggle_new();
- gtk_cell_renderer_toggle_set_radio(GTK_CELL_RENDERER_TOGGLE(cell), TRUE);
- column = gtk_tree_view_column_new_with_attributes(
- _("Burned In"), cell, "active", 2, "visible", 8, NULL);
- widget = GHB_WIDGET(ud->builder, "SubBurnedLabel");
- gtk_tree_view_column_set_widget(column, widget);
+ column = gtk_tree_view_column_new();
+ gtk_tree_view_column_set_spacing(column, 12);
+ gtk_tree_view_column_set_title(column, _("Track Information"));
+ gtk_tree_view_column_pack_start(column, source_cell, FALSE);
+ gtk_tree_view_column_add_attribute(column, source_cell, "markup", 0);
+ gtk_tree_view_column_add_attribute(column, source_cell, "yalign", 5);
+ gtk_tree_view_column_pack_start(column, arrow_cell, FALSE);
+ gtk_tree_view_column_add_attribute(column, arrow_cell, "text", 1);
+ gtk_tree_view_column_pack_start(column, output_cell, TRUE);
+ gtk_tree_view_column_add_attribute(column, output_cell, "markup", 2);
+ gtk_tree_view_column_add_attribute(column, output_cell, "yalign", 5);
 gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
- g_signal_connect(cell, "toggled", subtitle_burned_toggled_cb, ud);
+ gtk_tree_view_column_set_expand(column, TRUE);
+ gtk_tree_view_column_set_max_width(column, 400);
 
- cell = gtk_cell_renderer_toggle_new();
- gtk_cell_renderer_toggle_set_radio(GTK_CELL_RENDERER_TOGGLE(cell), TRUE);
 column = gtk_tree_view_column_new_with_attributes(
- _("Default"), cell, "active", 3, NULL);
- widget = GHB_WIDGET(ud->builder, "SubDefaultLabel");
- gtk_tree_view_column_set_widget(column, widget);
+ _(""), edit_cell, "icon-name", 3, NULL);
 gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
- g_signal_connect(cell, "toggled", subtitle_default_toggled_cb, ud);
 
- cell = gtk_cell_renderer_text_new();
 column = gtk_tree_view_column_new_with_attributes(
- _("Srt Offset"), cell, "text", 4, "visible", 9, NULL);
- widget = GHB_WIDGET(ud->builder, "SubSRTOffsetLabel");
- gtk_tree_view_column_set_widget(column, widget);
+ _(""), delete_cell, "icon-name", 4, NULL);
 gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
 
-
 g_signal_connect(selection, "changed", subtitle_list_selection_changed_cb, ud);
- // Need to disable remove and update buttons since there are initially
- // no selections
- widget = GHB_WIDGET(ud->builder, "subtitle_remove");
- gtk_widget_set_sensitive(widget, FALSE);
- g_debug("Done\n");
+ g_signal_connect(edit_cell, "clicked", subtitle_edit_clicked_cb, ud);
+ g_signal_connect(delete_cell, "clicked", subtitle_remove_clicked_cb, ud);
 }
 
 extern G_MODULE_EXPORT void presets_list_selection_changed_cb(void);
@@ -491,13 +461,13 @@
 g_debug("bind_presets_tree_model()\n");
 treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
 selection = gtk_tree_view_get_selection(treeview);
- treestore = gtk_tree_store_new(6, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, 
+ treestore = gtk_tree_store_new(6, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT,
 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
 gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
 
 cell = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes(_("Preset Name"), cell, 
- "text", 0, "weight", 1, "style", 2, 
+ column = gtk_tree_view_column_new_with_attributes(_("Preset Name"), cell,
+ "text", 0, "weight", 1, "style", 2,
 "foreground", 3, "editable", 5, NULL);
 
 g_signal_connect(cell, "edited", preset_edited_cb, ud);
@@ -506,9 +476,9 @@
 gtk_tree_view_column_set_expand(column, TRUE);
 gtk_tree_view_set_tooltip_column(treeview, 4);
 
- gtk_tree_view_enable_model_drag_dest(treeview, &SrcEntry, 1, 
+ gtk_tree_view_enable_model_drag_dest(treeview, &SrcEntry, 1,
 GDK_ACTION_MOVE);
- gtk_tree_view_enable_model_drag_source(treeview, GDK_BUTTON1_MASK, 
+ gtk_tree_view_enable_model_drag_source(treeview, GDK_BUTTON1_MASK,
 &SrcEntry, 1, GDK_ACTION_MOVE);
 
 g_signal_connect(treeview, "drag_data_received", presets_drag_cb, ud);
@@ -686,11 +656,11 @@
 static gchar *arg_preset = NULL;
 static gboolean ghb_debug = FALSE;
 
-static GOptionEntry entries[] = 
+static GOptionEntry entries[] =
 {
- { "device", 'd', 0, G_OPTION_ARG_FILENAME, &dvd_device, "The device or file to encode", NULL },
- { "preset", 'p', 0, G_OPTION_ARG_STRING, &arg_preset, "The preset values to use for encoding", NULL },
- { "debug", 'x', 0, G_OPTION_ARG_NONE, &ghb_debug, "Spam a lot", NULL },
+ { "device", 'd', 0, G_OPTION_ARG_FILENAME, &dvd_device, N_("The device or file to encode"), NULL },
+ { "preset", 'p', 0, G_OPTION_ARG_STRING, &arg_preset, N_("The preset values to use for encoding"), NULL },
+ { "debug", 'x', 0, G_OPTION_ARG_NONE, &ghb_debug, N_("Spam a lot"), NULL },
 { NULL }
 };
 
@@ -730,18 +700,25 @@
 }
 
 G_MODULE_EXPORT void x264_entry_changed_cb(GtkWidget *widget, signal_user_data_t *ud);
-G_MODULE_EXPORT void x264_option_changed_cb(GtkWidget *widget, signal_user_data_t *ud);
+G_MODULE_EXPORT void video_option_changed_cb(GtkWidget *widget, signal_user_data_t *ud);
 G_MODULE_EXPORT void position_overlay_cb(GtkWidget *widget, signal_user_data_t *ud);
 G_MODULE_EXPORT void preview_hud_size_alloc_cb(GtkWidget *widget, signal_user_data_t *ud);
 
-#if GTK_CHECK_VERSION(3, 0, 0)
 const gchar *MyCSS =
 " \n\
+GtkRadioButton .button { \n\
+ border-width: 0px; \n\
+ padding: 0px; \n\
+} \n\
 GtkComboBox { \n\
- padding: 1px; \n\
+ padding: 0px; \n\
+} \n\
+GtkComboBox .button { \n\
+ padding: 2px; \n\
+ border-width: 0px; \n\
 } \n\
 GtkEntry { \n\
- padding: 4px; \n\
+ padding: 4px 4px; \n\
 } \n\
 \n\
 @define-color black #000000; \n\
@@ -753,11 +730,10 @@
 @define-color gray46 #757575; \n\
 @define-color white #ffffff; \n\
 \n\
-#preview_event_box, \n\
+#preview_hud, \n\
 #live_preview_play, \n\
 #live_duration, \n\
-#preview_fullscreen, \n\
-#hide_settings \n\
+#preview_fullscreen \n\
 { \n\
 background: @black; \n\
 background-color: @gray18; \n\
@@ -780,24 +756,21 @@
 color: @white; \n\
 } \n\
 \n\
-#preview_fullscreen:prelight, \n\
-#hide_settings:prelight \n\
+#preview_fullscreen:prelight \n\
 { \n\
 background: @black; \n\
 background-color: @gray32; \n\
 color: @white; \n\
 } \n\
 \n\
-#preview_fullscreen:active, \n\
-#hide_settings:selected:focused \n\
+#preview_fullscreen:active \n\
 { \n\
 background: @black; \n\
 background-color: @gray32; \n\
 color: @white; \n\
 } \n\
 \n\
-#preview_fullscreen:active, \n\
-#hide_settings:active \n\
+#preview_fullscreen:active \n\
 { \n\
 background: @black; \n\
 background-color: @gray32; \n\
@@ -805,41 +778,7 @@
 } \n\
 ";
 
-#else
-// Some style definitions for the preview window and hud
-const gchar *hud_rcstyle =
-"style \"ghb-entry\" {\n"
-"GtkEntry::inner-border = {2,2,1,1}\n"
-"}\n"
-"style \"ghb-combo\" {\n"
-"xthickness = 1\n"
-"ythickness = 1\n"
-"}\n"
-"style \"ghb-preview\" {\n"
-"bg[NORMAL]=\"black\"\n"
-"}\n"
-"style \"ghb-hud\" {\n"
-"bg[NORMAL]=\"gray18\"\n"
-"bg[ACTIVE]=\"gray32\"\n"
-"bg[PRELIGHT]=\"gray46\"\n"
-"bg[SELECTED]=\"black\"\n"
-"base[NORMAL]=\"gray40\"\n"
-"text[NORMAL]=\"white\"\n"
-"text[ACTIVE]=\"white\"\n"
-"fg[NORMAL]=\"white\"\n"
-"fg[ACTIVE]=\"white\"\n"
-"fg[PRELIGHT]=\"white\"\n"
-"}\n"
-"widget_class \"*.GtkComboBox.GtkToggleButton\" style \"ghb-combo\"\n"
-"widget_class \"*.GtkScaleButton\" style \"ghb-combo\"\n"
-"widget_class \"*.GtkEntry\" style \"ghb-entry\"\n"
-"widget \"preview_window.*.preview_hud.*\" style \"ghb-hud\"\n"
-"widget \"preview_window\" style \"ghb-preview\"\n";
-#endif
-
-#if GTK_CHECK_VERSION(2, 16, 0)
 extern G_MODULE_EXPORT void status_icon_query_tooltip_cb(void);
-#endif
 
 int
 main(int argc, char *argv[])
@@ -849,13 +788,15 @@
 GError *error = NULL;
 GOptionContext *context;
 
+ hb_global_init();
+
 #ifdef ENABLE_NLS
 bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
 bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
 textdomain(GETTEXT_PACKAGE);
 #endif
 
- context = g_option_context_new("- Transcode media formats");
+ context = g_option_context_new(_("- Transcode media formats"));
 g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE);
 g_option_context_add_group(context, gtk_get_option_group(TRUE));
 #if defined(_ENABLE_GST)
@@ -873,10 +814,9 @@
 {
 dvd_device = argv[1];
 }
- 
+
 gtk_init(&argc, &argv);
 
-#if GTK_CHECK_VERSION(3, 0, 0)
 GtkCssProvider *css = gtk_css_provider_new();
 error = NULL;
 gtk_css_provider_load_from_data(css, MyCSS, -1, &error);
@@ -891,12 +831,7 @@
 g_warning("%s: %s", G_STRFUNC, error->message);
 g_clear_error(&error);
 }
-#else
- gtk_rc_parse_string(hud_rcstyle);
-#endif
 
- g_type_class_unref(g_type_class_ref(GTK_TYPE_BUTTON));
- g_object_set(gtk_settings_get_default(), "gtk-button-images", TRUE, NULL);
 #if !defined(_WIN32)
 notify_init("HandBrake");
 #endif
@@ -915,7 +850,13 @@
 g_log_set_handler(NULL, G_LOG_LEVEL_DEBUG, debug_log_handler, ud);
 g_log_set_handler("Gtk", G_LOG_LEVEL_WARNING, warn_log_handler, ud);
 //g_log_set_handler("Gtk", G_LOG_LEVEL_CRITICAL, warn_log_handler, ud);
+
+ ud->globals = ghb_settings_new();
+ ud->prefs = ghb_settings_new();
+ ud->settings_array = ghb_array_value_new(1);
 ud->settings = ghb_settings_new();
+ ghb_array_append(ud->settings_array, ud->settings);
+
 ud->builder = create_builder_or_die(BUILDER_NAME);
 // Enable events that alert us to media change events
 watch_volumes(ud);
@@ -933,7 +874,7 @@
 
 // Must set the names of the widgets that I want to modify
 // style for.
- gtk_widget_set_name(GHB_WIDGET(ud->builder, "preview_event_box"), "preview_event_box");
+ gtk_widget_set_name(GHB_WIDGET(ud->builder, "preview_hud"), "preview_hud");
 gtk_widget_set_name(GHB_WIDGET(ud->builder, "preview_frame"), "preview_frame");
 gtk_widget_set_name(GHB_WIDGET(ud->builder, "live_preview_play"), "live_preview_play");
 gtk_widget_set_name(GHB_WIDGET(ud->builder, "live_preview_progress"), "live_preview_progress");
@@ -941,20 +882,19 @@
 gtk_widget_set_name(GHB_WIDGET(ud->builder, "live_duration"), "live_duration");
 gtk_widget_set_name(GHB_WIDGET(ud->builder, "preview_show_crop"), "preview_show_crop");
 gtk_widget_set_name(GHB_WIDGET(ud->builder, "preview_fullscreen"), "preview_fullscreen");
- gtk_widget_set_name(GHB_WIDGET(ud->builder, "hide_settings"), "hide_settings");
 widget = GHB_WIDGET(ud->builder, "preview_hud");
 gtk_widget_set_name(widget, "preview_hud");
 widget = GHB_WIDGET(ud->builder, "preview_window");
 gtk_widget_set_name(widget, "preview_window");
 
 // Set up the "hud" control overlay for the preview window
- GtkWidget *align, *draw, *hud, *blender;
+ GtkWidget *preview_box, *draw, *hud, *blender;
 
- align = GHB_WIDGET(ud->builder, "preview_window_alignment");
- draw = GHB_WIDGET(ud->builder, "preview_image_align");
+ preview_box = GHB_WIDGET(ud->builder, "preview_window_box");
+ draw = GHB_WIDGET(ud->builder, "preview_image");
 hud = GHB_WIDGET(ud->builder, "preview_hud");
 
-#if 0 // wGTK_CHECK_VERSION(3, 0, 0)
+#if 0 // GTK_CHECK_VERSION(3, 0, 0)
 // This uses the new GtkOverlay widget.
 //
 // Unfortunately, GtkOverlay is broken in a couple of ways.
@@ -968,7 +908,7 @@
 // So for now, I'll just continue using my home-grown overlay
 // widget (GhbCompositor).
 blender = gtk_overlay_new();
- gtk_container_add(GTK_CONTAINER(align), blender);
+ gtk_container_add(GTK_CONTAINER(preview_box), blender);
 gtk_container_add(GTK_CONTAINER(blender), draw);
 gtk_widget_set_valign (hud, GTK_ALIGN_END);
 gtk_widget_set_halign (hud, GTK_ALIGN_CENTER);
@@ -982,7 +922,7 @@
 // Set up compositing for hud
 blender = ghb_compositor_new();
 
- gtk_container_add(GTK_CONTAINER(align), blender);
+ gtk_container_add(GTK_CONTAINER(preview_box), blender);
 ghb_compositor_zlist_insert(GHB_COMPOSITOR(blender), draw, 1, 1);
 ghb_compositor_zlist_insert(GHB_COMPOSITOR(blender), hud, 2, .85);
 gtk_widget_show(blender);
@@ -1003,9 +943,9 @@
 buffer = gtk_text_view_get_buffer(textview);
 g_signal_connect(buffer, "changed", (GCallback)x264_entry_changed_cb, ud);
 
- textview = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "x264OptionExtra"));
+ textview = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "VideoOptionExtra"));
 buffer = gtk_text_view_get_buffer(textview);
- g_signal_connect(buffer, "changed", (GCallback)x264_option_changed_cb, ud);
+ g_signal_connect(buffer, "changed", (GCallback)video_option_changed_cb, ud);
 
 ghb_combo_init(ud);
 
@@ -1022,36 +962,47 @@
 // to the callbacks. Builder's standard autoconnect doesn't all this.
 gtk_builder_connect_signals_full(ud->builder, MyConnect, ud);
 
- GtkWidget *presetSlider = GHB_WIDGET(ud->builder, "x264PresetSlider");
- const char * const *x264_presets;
- int count = 0;
- x264_presets = hb_x264_presets();
- while (x264_presets && x264_presets[count]) count++;
- gtk_range_set_range(GTK_RANGE(presetSlider), 0, count-1);
+ ghb_init_audio_defaults_ui(ud);
+ ghb_init_subtitle_defaults_ui(ud);
 
- // Load all internal settings
- ghb_settings_init(ud);
+ // Parsing x264 options "" initializes x264 widgets to proper defaults
+ ghb_x264_init(ud);
+
+ // Load prefs before presets. Some preset defaults may depend
+ // on preference settings.
+ // First load default values
+ ghb_settings_init(ud->prefs, "Preferences");
+ ghb_settings_init(ud->globals, "Globals");
+ ghb_settings_init(ud->settings, "Initialization");
+ // Load user preferences file
+ ghb_prefs_load(ud);
+ // Store user preferences into ud->prefs
+ ghb_prefs_to_settings(ud->prefs);
+
+ // Load all settings with default preset values
+ ghb_settings_init(ud->settings, "Presets");
 // Load the presets files
 ghb_presets_load(ud);
- ghb_prefs_load(ud);
+ // Note that ghb_preset_to_settings(ud->settings) is called when
+ // the default preset is selected.
 
- ghb_prefs_to_ui(ud);
+ ghb_settings_to_ui(ud, ud->globals);
+ ghb_settings_to_ui(ud, ud->prefs);
+ // Note that ghb_settings_to_ui(ud->settings) happens when initial
+ // empty title is initialized.
 
 gint logLevel;
- logLevel = ghb_settings_get_int(ud->settings, "LoggingLevel");
+ logLevel = ghb_settings_get_int(ud->prefs, "LoggingLevel");
 ghb_backend_init(logLevel);
 
- if (ghb_settings_get_boolean(ud->settings, "hbfd"))
+ if (ghb_settings_get_boolean(ud->prefs, "hbfd"))
 {
 ghb_hbfd(ud, TRUE);
 }
- gchar *source = ghb_settings_get_string(ud->settings, "default_source");
+ gchar *source = ghb_settings_get_string(ud->prefs, "default_source");
 ghb_dvd_set_current(source, ud);
 g_free(source);
 
- // Parsing x264 options "" initializes x264 widgets to proper defaults
- ghb_x264_parse_options(ud, "");
-
 // Populate the presets tree view
 ghb_presets_list_init(ud, NULL, 0);
 // Get the first preset name
@@ -1075,9 +1026,14 @@
 if (dvd_device != NULL)
 {
 // Source overridden from command line option
- ghb_settings_set_string(ud->settings, "scan_source", dvd_device);
+ ghb_settings_set_string(ud->globals, "scan_source", dvd_device);
 g_idle_add((GSourceFunc)ghb_idle_scan, ud);
 }
+ else
+ {
+ GValue *gval = ghb_settings_get_value(ud->prefs, "default_source");
+ ghb_settings_set_value(ud->globals, "scan_source", gval);
+ }
 // Reload and check status of the last saved queue
 g_idle_add((GSourceFunc)ghb_reload_queue, ud);
 
@@ -1089,13 +1045,11 @@
 GHB_THREAD_NEW("Cache Volume Names", (GThreadFunc)ghb_cache_volnames, ud);
 
 #if defined(_USE_APP_IND)
- GtkUIManager * uim = GTK_UI_MANAGER(GHB_OBJECT(ud->builder, "uimanager1"));
-
- GtkMenu *ai_menu = GTK_MENU(gtk_ui_manager_get_widget(uim, "/ui/tray_menu"));
+ GtkMenu *ai_menu = GTK_MENU(GHB_OBJECT(ud->builder, "tray_menu"));
 ud->ai = app_indicator_new("HandBrake", "hb-icon", APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
 app_indicator_set_menu( ud->ai, ai_menu );
 app_indicator_set_label( ud->ai, "", "99.99%");
- if (ghb_settings_get_boolean(ud->settings, "show_status"))
+ if (ghb_settings_get_boolean(ud->prefs, "show_status"))
 {
 app_indicator_set_status( ud->ai, APP_INDICATOR_STATUS_ACTIVE );
 }
@@ -1103,65 +1057,24 @@
 {
 app_indicator_set_status( ud->ai, APP_INDICATOR_STATUS_PASSIVE );
 }
- GtkStatusIcon *si;
- si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
-
- gtk_status_icon_set_visible(si, FALSE );
-#else
- GtkStatusIcon *si;
- si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
-
- gtk_status_icon_set_visible(si,
- ghb_settings_get_boolean(ud->settings, "show_status"));
-
-#if GTK_CHECK_VERSION(2, 16, 0)
- gtk_status_icon_set_has_tooltip(si, TRUE);
- g_signal_connect(si, "query-tooltip", 
- status_icon_query_tooltip_cb, ud);
 #else
- gtk_status_icon_set_tooltip(si, "HandBrake");
-#endif
+ // gtk-3 has eliminated status icons. Remove the option from preferences
+ GtkWidget *status_icon_pref = GHB_WIDGET(ud->builder, "show_status");
+ gtk_widget_set_visible(status_icon_pref, FALSE);
 #endif
 
- // Ugly hack to keep subtitle table from bouncing around as I change
- // which set of controls are visible
- gint width, height;
-#if GTK_CHECK_VERSION(3, 0, 0)
- GtkRequisition min_size, size;
- 
- widget = GHB_WIDGET(ud->builder, "SrtCodeset");
- gtk_widget_get_preferred_size( widget, &min_size, &size );
- height = MAX(min_size.height, size.height);
- widget = GHB_WIDGET(ud->builder, "srt_code_label");
- gtk_widget_get_preferred_size( widget, &min_size, &size );
- height += MAX(min_size.height, size.height);
- widget = GHB_WIDGET(ud->builder, "subtitle_table");
- gtk_widget_set_size_request(widget, -1, height);
-#else
- GtkRequisition size;
- 
- widget = GHB_WIDGET(ud->builder, "SrtCodeset");
- gtk_widget_size_request( widget, &size );
- height = size.height;
- widget = GHB_WIDGET(ud->builder, "srt_code_label");
- gtk_widget_size_request( widget, &size );
- height += size.height;
- widget = GHB_WIDGET(ud->builder, "subtitle_table");
- gtk_widget_set_size_request(widget, -1, height);
-#endif
- 
- widget = GHB_WIDGET(ud->builder, "hb_window");
+ GtkWidget *ghb_window = GHB_WIDGET(ud->builder, "hb_window");
 
- GdkGeometry geo = { 
- -1, -1, 1024, 768, -1, -1, 10, 10, 0, 0, GDK_GRAVITY_NORTH_WEST
+ gint window_width, window_height;
+ GdkGeometry geo = {
+ -1, -1, 1920, 768, -1, -1, 10, 10, 0, 0, GDK_GRAVITY_NORTH_WEST
 };
 GdkWindowHints geo_mask;
 geo_mask = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE | GDK_HINT_BASE_SIZE;
- gtk_window_set_geometry_hints( GTK_WINDOW(widget), widget, &geo, geo_mask);
- width = ghb_settings_get_int(ud->settings, "window_width");
- height = ghb_settings_get_int(ud->settings, "window_height");
- gtk_window_resize(GTK_WINDOW(widget), width, height);
- gtk_widget_show(widget);
+ gtk_window_set_geometry_hints(GTK_WINDOW(ghb_window), ghb_window,
+ &geo, geo_mask);
+ window_width = ghb_settings_get_int(ud->prefs, "window_width");
+ window_height = ghb_settings_get_int(ud->prefs, "window_height");
 
 /*
 * Filter objects in GtkBuilder xml
@@ -1186,11 +1099,11 @@
 GtkFileChooser *chooser;
 chooser = GTK_FILE_CHOOSER(GHB_WIDGET(ud->builder, "source_dialog"));
 filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterAll"));
- gtk_file_filter_set_name(filter, "All");
+ gtk_file_filter_set_name(filter, _("All"));
 gtk_file_filter_add_pattern(filter, "*");
 gtk_file_chooser_add_filter(chooser, filter);
 filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterVideo"));
- gtk_file_filter_set_name(filter, "Video");
+ gtk_file_filter_set_name(filter, _("Video"));
 gtk_file_filter_add_mime_type(filter, "video/*");
 gtk_file_chooser_add_filter(chooser, filter);
 filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterTS"));
@@ -1269,22 +1182,52 @@
 PangoFontDescription *font_desc;
 font_desc = pango_font_description_from_string("monospace 10");
 textview = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "activity_view"));
- gtk_widget_modify_font(GTK_WIDGET(textview), font_desc); 
- pango_font_description_free(font_desc); 
+ gtk_widget_override_font(GTK_WIDGET(textview), font_desc);
+ pango_font_description_free(font_desc);
+
+ // Grrrr! Gtk developers !!!hard coded!!! the width of the
+ // radio buttons in GtkStackSwitcher to 100!!!
+ //
+ // Thankfully, GtkStackSwitcher is a regular container object
+ // and we can access the buttons to change their width.
+ GList *stack_switcher_children, *link;
+ GtkContainer * stack_switcher = GTK_CONTAINER(
+ GHB_WIDGET(ud->builder, "SettingsStackSwitcher"));
+ link = stack_switcher_children = gtk_container_get_children(stack_switcher);
+ while (link != NULL)
+ {
+ GtkWidget *widget = link->data;
+ gtk_widget_set_size_request(widget, -1, -1);
+ gtk_widget_set_hexpand(widget, TRUE);
+ gtk_widget_set_halign(widget, GTK_ALIGN_FILL);
+ link = link->next;
+ }
+ g_list_free(stack_switcher_children);
+
+ gtk_window_resize(GTK_WINDOW(ghb_window), window_width, window_height);
+ gtk_widget_show(ghb_window);
 
 // Everything should be go-to-go. Lets rock!
 
 gtk_main();
- gtk_status_icon_set_visible(si, FALSE);
 ghb_backend_close();
- if (ud->queue)
- ghb_value_free(ud->queue);
- ghb_value_free(ud->settings);
+
+ ghb_value_free(ud->queue);
+ ghb_value_free(ud->settings_array);
+ ghb_value_free(ud->prefs);
+ ghb_value_free(ud->globals);
+ ghb_value_free(ud->x264_priv);
+
 g_io_channel_unref(ud->activity_log);
 ghb_settings_close();
+ ghb_resource_free();
 #if !defined(_WIN32)
 notify_uninit();
 #endif
+
+ g_object_unref(ud->builder);
+
+ g_free(ud->current_dvd_device);
 g_free(ud);
 
 return 0;

HandBrake-0.9.9.tar.bz2/gtk/src/makedeps.py -> HandBrake-0.10.0.tar.bz2/gtk/src/makedeps.py Changed

@@ -2,15 +2,16 @@
 
 import collections
 import plistlib
+import sys
 
 DepEntry = collections.namedtuple('DepEntry', 'widget dep enable die hide')
 dep_map = (
 DepEntry("title", "queue_add", "none", True, False),
 DepEntry("title", "queue_add_menu", "none", True, False),
+ DepEntry("title", "queue_add_multiple_menu", "none", True, False),
 DepEntry("title", "preview_frame", "none", True, False),
 DepEntry("title", "picture_summary", "none", True, False),
 DepEntry("title", "picture_summary2", "none", True, False),
- DepEntry("title", "chapters_label", "none", True, False),
 DepEntry("title", "chapters_tab", "none", True, False),
 DepEntry("title", "start_point", "none", True, False),
 DepEntry("title", "end_point", "none", True, False),
@@ -27,9 +28,6 @@
 DepEntry("VideoFramerate", "VideoFrameratePFR", "source", True, True),
 DepEntry("VideoFramerate", "VideoFramerateVFR", "source", False, True),
 DepEntry("VideoTwoPass", "VideoTurboTwoPass", "TRUE", False, False),
- DepEntry("FileFormat", "Mp4LargeFile", "mp4", False, True),
- DepEntry("FileFormat", "Mp4HttpOptimize", "mp4", False, True),
- DepEntry("FileFormat", "Mp4iPodCompatible", "mp4", False, True),
 DepEntry("PictureDecombDeinterlace", "PictureDeinterlace", "TRUE", True, True),
 DepEntry("PictureDecombDeinterlace", "PictureDeinterlaceCustom", "TRUE", True, True),
 DepEntry("PictureDecombDeinterlace", "PictureDeinterlaceLabel", "TRUE", True, True),
@@ -37,7 +35,14 @@
 DepEntry("PictureDecombDeinterlace", "PictureDecombCustom", "FALSE", True, True),
 DepEntry("PictureDecombDeinterlace", "PictureDecombLabel", "FALSE", True, True),
 DepEntry("PictureDeinterlace", "PictureDeinterlaceCustom", "custom", False, True),
- DepEntry("PictureDenoise", "PictureDenoiseCustom", "custom", False, True),
+ DepEntry("PictureDenoiseFilter", "PictureDenoisePreset", "off", True, True),
+ DepEntry("PictureDenoiseFilter", "PictureDenoisePresetLabel", "off", True, True),
+ DepEntry("PictureDenoiseFilter", "PictureDenoiseTune", "nlmeans", False, True),
+ DepEntry("PictureDenoiseFilter", "PictureDenoiseTuneLabel", "nlmeans", False, True),
+ DepEntry("PictureDenoiseFilter", "PictureDenoiseCustom", "off", True, True),
+ DepEntry("PictureDenoisePreset", "PictureDenoiseCustom", "custom", False, True),
+ DepEntry("PictureDenoisePreset", "PictureDenoiseTune", "custom", True, True),
+ DepEntry("PictureDenoisePreset", "PictureDenoiseTuneLabel", "custom", True, True),
 DepEntry("PictureDecomb", "PictureDecombCustom", "custom", False, True),
 DepEntry("PictureDetelecine", "PictureDetelecineCustom", "custom", False, True),
 DepEntry("PictureWidthEnable", "PictureWidth", "TRUE", False, False),
@@ -46,45 +51,40 @@
 DepEntry("PictureAutoCrop", "PictureBottomCrop", "FALSE", False, False),
 DepEntry("PictureAutoCrop", "PictureLeftCrop", "FALSE", False, False),
 DepEntry("PictureAutoCrop", "PictureRightCrop", "FALSE", False, False),
- DepEntry("VideoEncoder", "x264_tab", "x264", False, True),
- DepEntry("VideoEncoder", "x264VideoSettings", "x264", False, True),
- DepEntry("VideoEncoder", "lavc_mpeg4_tab", "ffmpeg|ffmpeg4|ffmpeg2", False, True),
- DepEntry("VideoEncoder", "Mp4iPodCompatible", "x264", False, False),
- DepEntry("AudioTrackQualityEnable", "AudioTrackQuality", "FALSE", True, False),
- DepEntry("AudioTrackQualityEnable", "AudioTrackQualityValue", "FALSE", True, False),
- DepEntry("AudioTrackQualityEnable", "AudioBitrateLabel", "TRUE", True, False),
- DepEntry("AudioTrackQualityEnable", "AudioBitrate", "TRUE", True, False),
- DepEntry("AudioEncoderActual", "AudioTrackQualityEnable", "lame|vorbis", False, True),
- DepEntry("AudioEncoderActual", "AudioTrackQuality", "lame|vorbis", False, True),
- DepEntry("AudioEncoderActual", "AudioTrackQualityValue", "lame|vorbis", False, True),
- DepEntry("AudioEncoderActual", "AudioBitrateLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
- DepEntry("AudioEncoderActual", "AudioBitrate", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
- DepEntry("AudioEncoderActual", "AudioSamplerateLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
- DepEntry("AudioEncoderActual", "AudioSamplerate", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
- DepEntry("AudioEncoderActual", "AudioMixdownLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
- DepEntry("AudioEncoderActual", "AudioMixdown", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
- DepEntry("AudioEncoderActual", "AudioTrackDRCSliderLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
- DepEntry("AudioEncoderActual", "AudioTrackDRCSlider", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
- DepEntry("AudioEncoderActual", "AudioTrackDRCValue", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
- DepEntry("AudioEncoderActual", "AudioTrackGainLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
- DepEntry("AudioEncoderActual", "AudioTrackGain", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
- DepEntry("AudioEncoderActual", "AudioTrackGainValue", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
- DepEntry("AudioEncoder", "AudioAllowMP3Pass", "copy", False, False),
- DepEntry("AudioEncoder", "AudioAllowAACPass", "copy", False, False),
- DepEntry("AudioEncoder", "AudioAllowAC3Pass", "copy", False, False),
- DepEntry("AudioEncoder", "AudioAllowDTSPass", "copy", False, False),
- DepEntry("AudioEncoder", "AudioAllowDTSHDPass", "copy", False, False),
+ DepEntry("AudioTrackQualityEnable", "AudioBitrate", "TRUE", True, True),
+ DepEntry("AudioTrackQualityEnable", "AudioTrackQualityBox", "FALSE", True, True),
+ DepEntry("AudioEncoder", "AudioBitrateLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+ DepEntry("AudioEncoder", "AudioBitrate", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+ DepEntry("AudioEncoder", "AudioSamplerateLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+ DepEntry("AudioEncoder", "AudioSamplerate", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+ DepEntry("AudioEncoder", "AudioMixdownLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+ DepEntry("AudioEncoder", "AudioMixdown", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+ DepEntry("AudioEncoder", "AudioTrackGainLabel", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+ DepEntry("AudioEncoder", "AudioTrackGainSlider", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
+ DepEntry("AudioEncoder", "AudioTrackGainValue", "copy:mp3|copy:aac|copy:ac3|copy:dts|copy:dtshd", True, False),
 DepEntry("x264_bframes", "x264_bpyramid", "<2", True, False),
 DepEntry("x264_bframes", "x264_direct", "0", True, False),
 DepEntry("x264_bframes", "x264_b_adapt", "0", True, False),
 DepEntry("x264_subme", "x264_psy_rd", "<6", True, False),
 DepEntry("x264_subme", "x264_psy_trell", "<6", True, False),
 DepEntry("x264_trellis", "x264_psy_trell", "0", True, False),
- DepEntry("x264UseAdvancedOptions", "x264VideoSettingsTable", "TRUE", True, False),
- DepEntry("x264UseAdvancedOptions", "x264_tab", "FALSE", True, False),
+ DepEntry("VideoEncoder", "VideoPresetSlider", "x264|x265", False, True),
+ DepEntry("VideoEncoder", "VideoPresetLabel", "x264|x265", False, True),
+ DepEntry("VideoEncoder", "VideoTune", "x264|x265", False, True),
+ DepEntry("VideoEncoder", "VideoTuneLabel", "x264|x265", False, True),
+ DepEntry("VideoEncoder", "VideoProfile", "x264|x265", False, True),
+ DepEntry("VideoEncoder", "VideoProfileLabel", "x264|x265", False, True),
+ DepEntry("VideoEncoder", "VideoLevel", "x264|x265", False, True),
+ DepEntry("VideoEncoder", "VideoLevelLabel", "x264|x265", False, True),
+ DepEntry("VideoEncoder", "x264FastDecode", "x264", False, True),
+ DepEntry("VideoEncoder", "x264UseAdvancedOptions", "x264", False, True),
 DepEntry("HideAdvancedVideoSettings", "x264UseAdvancedOptions", "TRUE", True, True),
- DepEntry("use_source_name", "chapters_in_destination", "TRUE", False, False),
- DepEntry("use_source_name", "title_no_in_destination", "TRUE", False, False),
+ DepEntry("VideoEncoder", "VideoOptionExtraWindow", "x264|x265|mpeg4|mpeg2|VP8", False, True),
+ DepEntry("VideoEncoder", "VideoOptionExtraLabel", "x264|x265|mpeg4|mpeg2|VP8", False, True),
+ DepEntry("x264UseAdvancedOptions", "VideoSettingsTable", "TRUE", True, False),
+ DepEntry("VideoEncoder", "x264_box", "x264", False, True),
+ DepEntry("x264UseAdvancedOptions", "x264_box", "FALSE", True, False),
+ DepEntry("auto_name", "autoname_box", "TRUE", False, False),
 )
 
 def main():
@@ -127,6 +127,6 @@
 deps.append(rec)
 top[ii.dep] = deps
 plistlib.writePlist(top, revfile)
- 
+
 main()

HandBrake-0.9.9.tar.bz2/gtk/src/plist.c -> HandBrake-0.10.0.tar.bz2/gtk/src/plist.c Changed

@@ -11,11 +11,11 @@
 
 #define BUF_SZ (128*1024)
 
-static gchar *preamble = 
+static gchar *preamble =
 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
 "<plist version=\"1.0\">\n";
-static gchar *postfix = 
+static gchar *postfix =
 "</plist>\n";
 
 enum
@@ -68,15 +68,15 @@
 
 static void
 start_element(
- GMarkupParseContext *ctx, 
- const gchar *name, 
+ GMarkupParseContext *ctx,
+ const gchar *name,
 const gchar **attr_names,
 const gchar **attr_values,
 gpointer ud,
 GError **error)
 {
 parse_data_t *pd = (parse_data_t*)ud;
- union 
+ union
 {
 gint id;
 gpointer pid;
@@ -181,14 +181,14 @@
 
 static void
 end_element(
- GMarkupParseContext *ctx, 
- const gchar *name, 
+ GMarkupParseContext *ctx,
+ const gchar *name,
 gpointer ud,
 GError **error)
 {
 parse_data_t *pd = (parse_data_t*)ud;
 gint id;
- union 
+ union
 {
 gint id;
 gpointer pid;
@@ -315,8 +315,8 @@
 
 static void
 text_data(
- GMarkupParseContext *ctx, 
- const gchar *text, 
+ GMarkupParseContext *ctx,
+ const gchar *text,
 gsize len,
 gpointer ud,
 GError **error)
@@ -328,8 +328,8 @@
 
 static void
 passthrough(
- GMarkupParseContext *ctx, 
- const gchar *text, 
+ GMarkupParseContext *ctx,
+ const gchar *text,
 gsize len,
 gpointer ud,
 GError **error)
@@ -346,7 +346,7 @@
 }
 
 // This is required or the parser crashes
-static void 
+static void
 destroy_notify(gpointer data)
 { // Do nothing
 //g_debug("destroy parser");
@@ -498,7 +498,7 @@
 {
 GDate *date;
 date = g_value_get_boxed(gval);
- indent_fprintf(file, indent, "<date>%d-%d-%d</date>\n", 
+ indent_fprintf(file, indent, "<date>%d-%d-%d</date>\n",
 g_date_get_year(date),
 g_date_get_month(date),
 g_date_get_day(date)

HandBrake-0.9.9.tar.bz2/gtk/src/presets.c -> HandBrake-0.10.0.tar.bz2/gtk/src/presets.c Changed

@@ -2,14 +2,14 @@
 /*
 * presets.c
 * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
- * 
+ *
 * presets.c is free software.
- * 
+ *
 * You may 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.
- * 
+ *
 */
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -18,6 +18,7 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <glib/gstdio.h>
+#include <glib/gi18n.h>
 #include <string.h>
 #include "ghbcompat.h"
 #include "hb.h"
@@ -31,6 +32,7 @@
 #include "presets.h"
 #include "values.h"
 #include "lang.h"
+#include "videohandler.h"
 
 #define MAX_NESTED_PRESET 3
 
@@ -40,8 +42,8 @@
 PRESETS_CUSTOM
 };
 
+static GValue *presetsPlistFile = NULL;
 static GValue *presetsPlist = NULL;
-static GValue *internalPlist = NULL;
 static GValue *prefsPlist = NULL;
 static gboolean prefs_modified = FALSE;
 
@@ -50,6 +52,30 @@
 static void store_presets(void);
 static void store_prefs(void);
 
+static void
+dict_clean(GValue *dict, GValue *template)
+{
+ GValue *tmp = ghb_value_dup(dict);
+ GHashTableIter iter;
+ gchar *key;
+ GValue *value;
+ GValue *template_val;
+
+ ghb_dict_iter_init(&iter, tmp);
+ // middle (void*) cast prevents gcc warning "defreferencing type-punned
+ // pointer will break strict-aliasing rules"
+ while (g_hash_table_iter_next(
+ &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value))
+ {
+ template_val = ghb_dict_lookup(template, key);
+ if (template_val == NULL)
+ {
+ ghb_dict_remove(dict, key);
+ }
+ }
+ ghb_value_free(tmp);
+}
+
 gint
 preset_path_cmp(gint *indices1, gint len1, gint *indices2, gint len2)
 {
@@ -301,7 +327,7 @@
 {
 GValue *dict;
 gint count;
- 
+
 if (presets == NULL || pos < 0) return;
 count = ghb_array_len(presets);
 if (pos >= count) return;
@@ -312,7 +338,7 @@
 
 gboolean
 ghb_presets_remove(
- GValue *presets, 
+ GValue *presets,
 gint *indices,
 gint len)
 {
@@ -331,7 +357,7 @@
 
 static void
 ghb_presets_replace(
- GValue *presets, 
+ GValue *presets,
 GValue *dict,
 gint *indices,
 gint len)
@@ -349,7 +375,7 @@
 
 static void
 ghb_presets_insert(
- GValue *presets, 
+ GValue *presets,
 GValue *dict,
 gint *indices,
 gint len)
@@ -370,7 +396,7 @@
 {
 GValue *dict;
 gint count, ii;
- 
+
 g_debug("presets_find_element () (%s)", name);
 if (presets == NULL || name == NULL) return -1;
 count = ghb_array_len(presets);
@@ -392,7 +418,7 @@
 {
 GValue *dict;
 gint count, ii, ptype, last;
- 
+
 if (presets == NULL || name == NULL) return -1;
 last = count = ghb_array_len(presets);
 for (ii = 0; ii < count; ii++)
@@ -517,7 +543,7 @@
 {
 if (preset_is_default(dict))
 {
- ghb_dict_insert(dict, g_strdup("Default"), 
+ ghb_dict_insert(dict, g_strdup("Default"),
 ghb_boolean_value_new(FALSE));
 }
 }
@@ -541,7 +567,7 @@
 ptype = ghb_value_int(preset_dict_get_value(dict, "Type"));
 if (ptype != PRESETS_CUSTOM)
 {
- ghb_dict_insert(dict, g_strdup("Type"), 
+ ghb_dict_insert(dict, g_strdup("Type"),
 ghb_int64_value_new(PRESETS_CUSTOM));
 }
 folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
@@ -608,7 +634,7 @@
 
 gint*
 ghb_preset_indices_from_path(
- GValue *presets, 
+ GValue *presets,
 const GValue *path,
 gint *len)
 {
@@ -654,7 +680,7 @@
 
 static gint
 ghb_presets_get_type(
- GValue *presets, 
+ GValue *presets,
 gint *indices,
 gint len)
 {
@@ -675,7 +701,7 @@
 
 static gboolean
 ghb_presets_get_folder(
- GValue *presets, 
+ GValue *presets,
 gint *indices,
 gint len)
 {
@@ -698,7 +724,7 @@
 presets_set_default(gint *indices, gint len)
 {
 GValue *dict;
- 
+
 g_debug("presets_set_default ()");
 presets_clear_default(presetsPlist);
 dict = presets_get_dict(presetsPlist, indices, len);
@@ -713,12 +739,12 @@
 presets_set_folder_open(gboolean open, gint *indices, gint len)
 {
 GValue *dict;
- 
+
 g_debug("presets_set_folder_open ()");
 dict = presets_get_dict(presetsPlist, indices, len);
 if (dict)
 {
- ghb_dict_insert(dict, g_strdup("FolderOpen"), 
+ ghb_dict_insert(dict, g_strdup("FolderOpen"),
 ghb_boolean_value_new(open));
 }
 }
@@ -736,95 +762,119 @@
 static const GValue*
 preset_dict_get_value(GValue *dict, const gchar *key)
 {
- const GValue *gval = NULL;
+ return ghb_dict_lookup(dict, key);
+}
+
+static const char * dict_get_string(GValue *dict, const char *key)
+{
+ GValue *gval = ghb_dict_lookup(dict, key);
 
- if (dict)
- {
- gval = ghb_dict_lookup(dict, key);
- }
- if (internalPlist == NULL) return NULL;
 if (gval == NULL)
- {
- dict = plist_get_dict(internalPlist, "Presets");
- if (dict == NULL) return NULL;
- gval = ghb_dict_lookup(dict, key);
- }
- return gval;
+ return NULL;
+ return g_value_get_string(gval);
+}
+
+static gboolean dict_get_boolean(GValue *dict, const char *key)
+{
+ GValue *gval = ghb_dict_lookup(dict, key);
+
+ if (gval == NULL)
+ return FALSE;
+ return g_value_get_boolean(gval);
 }
 
 const gchar*
 ghb_presets_get_description(GValue *pdict)
 {
- const gchar *desc;
-
- if (pdict == NULL) return NULL;
- desc = g_value_get_string(
- preset_dict_get_value(pdict, "PresetDescription"));
- if (desc[0] == 0) return NULL;
- return desc;
+ return dict_get_string(pdict, "PresetDescription");
 }
 
 
 static void init_settings_from_dict(
- GValue *dest, GValue *internal, GValue *dict);
+ GValue *dest, GValue *template, GValue *dict, gboolean filter);
 
 static void
 init_settings_from_array(
- GValue *dest, 
- GValue *internal,
- GValue *array)
+ GValue *dest,
+ GValue *template,
+ GValue *array,
+ gboolean filter)
 {
- GValue *gval, *val;
+ GValue *gval, *val, *new_val;
 gint count, ii;
- 
+
+ if (ghb_array_len(template) == 0)
+ {
+ if (!filter)
+ {
+ count = ghb_array_len(array);
+ for (ii = 0; ii < count; ii++)
+ {
+ val = ghb_array_get_nth(array, ii);
+ ghb_array_append(dest, ghb_value_dup(val));
+ }
+ }
+ return;
+ }
+
 count = ghb_array_len(array);
- // The first element of the internal version is always the 
+ // The first element of the template array is always the
 // template for the allowed values
- gval = ghb_array_get_nth(internal, 0);
+ gval = ghb_array_get_nth(template, 0);
 for (ii = 0; ii < count; ii++)
 {
- val = NULL;
 val = ghb_array_get_nth(array, ii);
- if (val == NULL)
- val = gval;
 if (G_VALUE_TYPE(gval) == ghb_dict_get_type())
 {
 GValue *new_dict;
- new_dict = ghb_dict_value_new();
- ghb_array_append(dest, new_dict);
- if (G_VALUE_TYPE(val) == ghb_dict_get_type())
- init_settings_from_dict(new_dict, gval, val);
+ if (val != NULL && G_VALUE_TYPE(val) == ghb_dict_get_type())
+ {
+ new_dict = ghb_dict_value_new();
+ init_settings_from_dict(new_dict, gval, val, filter);
+ }
 else
- init_settings_from_dict(new_dict, gval, gval);
+ {
+ new_dict = ghb_value_dup(gval);
+ }
+ new_val = new_dict;
 }
 else if (G_VALUE_TYPE(gval) == ghb_array_get_type())
 {
 GValue *new_array;
- new_array = ghb_array_value_new(8);
- ghb_array_append(dest, new_array);
- if (G_VALUE_TYPE(val) == ghb_array_get_type())
- init_settings_from_array(new_array, gval, val);
+ if (val != NULL && G_VALUE_TYPE(val) == ghb_array_get_type())
+ {
+ new_array = ghb_array_value_new(8);
+ init_settings_from_array(new_array, gval, val, filter);
+ }
 else
- init_settings_from_array(new_array, gval, gval);
+ {
+ new_array = ghb_value_dup(gval);
+ }
+ new_val = new_array;
 }
 else
 {
- ghb_array_append(dest, val);
+ if (val == NULL)
+ new_val = ghb_value_dup(gval);
+ else
+ new_val = ghb_value_dup(val);
 }
+ ghb_array_append(dest, new_val);
 }
 }
 
 static void
 init_settings_from_dict(
- GValue *dest, 
- GValue *internal,
- GValue *dict)
+ GValue *dest,
+ GValue *template,
+ GValue *dict,
+ gboolean filter)
 {
 GHashTableIter iter;
 gchar *key;
- GValue *gval, *val;
+ GValue *gval, *val, *new_val;
 
- ghb_dict_iter_init(&iter, internal);
+ ghb_dict_iter_init(&iter, template);
 // middle (void*) cast prevents gcc warning "defreferencing type-punned
 // pointer will break strict-aliasing rules"
 while (g_hash_table_iter_next(
@@ -833,139 +883,101 @@
 val = NULL;
 if (dict)
 val = ghb_dict_lookup(dict, key);
- if (val == NULL)
- val = gval;
 if (G_VALUE_TYPE(gval) == ghb_dict_get_type())
 {
 GValue *new_dict;
- new_dict = ghb_dict_value_new();
- ghb_settings_take_value(dest, key, new_dict);
- if (G_VALUE_TYPE(val) == ghb_dict_get_type())
- init_settings_from_dict(new_dict, gval, val);
+ if (val != NULL && G_VALUE_TYPE(val) == ghb_dict_get_type())
+ {
+ new_dict = ghb_dict_value_new();
+ init_settings_from_dict(new_dict, gval, val, filter);
+ }
 else
- init_settings_from_dict(new_dict, gval, gval);
+ {
+ new_dict = ghb_value_dup(gval);
+ }
+ new_val = new_dict;
 }
 else if (G_VALUE_TYPE(gval) == ghb_array_get_type())
 {
 GValue *new_array;
- new_array = ghb_array_value_new(8);
- ghb_settings_take_value(dest, key, new_array);
- if (G_VALUE_TYPE(val) == ghb_array_get_type())
- init_settings_from_array(new_array, gval, val);
+ if (val != NULL && G_VALUE_TYPE(val) == ghb_array_get_type())
+ {
+ new_array = ghb_array_value_new(8);
+ init_settings_from_array(new_array, gval, val, filter);
+ }
 else
- init_settings_from_array(new_array, gval, gval);
- 
+ {
+ new_array = ghb_value_dup(gval);
+ }
+ new_val = new_array;
+
 }
 else
 {
- ghb_settings_set_value(dest, key, val);
+ if (val == NULL)
+ new_val = ghb_value_dup(gval);
+ else
+ new_val = ghb_value_dup(val);
 }
+ ghb_settings_take_value(dest, key, new_val);
 }
-}
 
-static const char * dict_get_string(GValue *dict, const char *key)
-{
- GValue *gval = ghb_dict_lookup(dict, key);
-
- if (gval == NULL)
- return NULL;
- return g_value_get_string(gval);
-}
-
-static gboolean dict_get_boolean(GValue *dict, const char *key)
-{
- GValue *gval = ghb_dict_lookup(dict, key);
-
- if (gval == NULL)
- return FALSE;
- return g_value_get_boolean(gval);
-}
+ if (filter || dict == NULL)
+ return;
 
-void
-init_ui_from_dict(
- signal_user_data_t *ud, 
- GValue *internal,
- GValue *dict)
-{
- GHashTableIter iter;
- gchar *key;
- GValue *gval, *val;
- 
- ghb_dict_iter_init(&iter, internal);
+ // If not filtering the source, copy source elements that
+ // were not in the template.
+ ghb_dict_iter_init(&iter, dict);
 // middle (void*) cast prevents gcc warning "defreferencing type-punned
 // pointer will break strict-aliasing rules"
 while (g_hash_table_iter_next(
 &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
 {
- if (!strcmp(key, "x264Option"))
- continue;
- val = NULL;
- if (dict)
- val = ghb_dict_lookup(dict, key);
+ val = ghb_dict_lookup(template, key);
 if (val == NULL)
- val = gval;
- ghb_ui_update(ud, key, val);
- }
-
- if (ghb_value_boolean(preset_dict_get_value(dict, "x264UseAdvancedOptions")))
-
- {
- val = ghb_dict_lookup(dict, "x264Option");
- if (val != NULL)
- ghb_ui_update(ud, "x264Option", val);
+ {
+ ghb_settings_set_value(dest, key, gval);
+ }
 }
 }
 
-static void
-preset_to_ui(signal_user_data_t *ud, GValue *dict)
+void
+ghb_preset_to_settings(GValue *settings, GValue *preset)
 {
- g_debug("preset_to_ui()\n");
 // Initialize the ui from presets file.
- GValue *internal, *hidden;
+ GValue *internal;
 
 // Get key list from internal default presets. This way we do not
 // load any unknown keys.
+ GValue *internalPlist = ghb_resource_get("internal-defaults");
 if (internalPlist == NULL) return;
 internal = plist_get_dict(internalPlist, "Presets");
- hidden = plist_get_dict(internalPlist, "XlatPresets");
- // Setting a ui widget will cause the corresponding setting
- // to be set, but it also triggers a callback that can 
- // have the side effect of using other settings values
- // that have not yet been set. So set *all* settings first
- // then update the ui.
- init_settings_from_dict(ud->settings, internal, dict);
- init_settings_from_dict(ud->settings, hidden, dict);
- init_ui_from_dict(ud, internal, dict);
- init_ui_from_dict(ud, hidden, dict);
-
- if (dict != NULL)
- {
- GValue *val;
- gboolean dd;
+ if (preset == NULL)
+ preset = internal;
 
- val = ghb_dict_lookup(dict, "PictureDecombDeinterlace");
- if (val != NULL)
- {
- dd = ghb_value_boolean(val);
- ghb_ui_update(ud, "PictureDeinterlaceDecomb", ghb_boolean_value(!dd));
- }
- val = ghb_dict_lookup(dict, "PictureHeight");
- if (val != NULL)
- {
- ghb_ui_update(ud, "scale_height", val);
- }
- val = ghb_dict_lookup(dict, "PictureWidth");
- if (val != NULL)
- {
- ghb_ui_update(ud, "scale_width", val);
- }
- }
+ init_settings_from_dict(settings, preset, NULL, TRUE);
 }
 
 void
 ghb_settings_to_ui(signal_user_data_t *ud, GValue *dict)
 {
- init_ui_from_dict(ud, dict, dict);
+ GHashTableIter iter;
+ gchar *key;
+ GValue *gval;
+ GValue *tmp = ghb_value_dup(dict);
+
+ if (dict == NULL)
+ return;
+
+ ghb_dict_iter_init(&iter, tmp);
+ // middle (void*) cast prevents gcc warning "defreferencing type-punned
+ // pointer will break strict-aliasing rules"
+ while (g_hash_table_iter_next(
+ &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
+ {
+ ghb_ui_settings_update(ud, dict, key, gval);
+ }
+ ghb_value_free(tmp);
 }
 
 static GValue *current_preset = NULL;
@@ -981,7 +993,10 @@
 }
 
 void
-ghb_set_preset_from_indices(signal_user_data_t *ud, gint *indices, gint len)
+ghb_set_preset_settings_from_indices(
+ signal_user_data_t *ud,
+ gint *indices,
+ gint len)
 {
 GValue *dict = NULL;
 gint fallback[2] = {0, -1};
@@ -996,7 +1011,7 @@
 }
 if (dict == NULL)
 {
- preset_to_ui(ud, NULL);
+ ghb_preset_to_settings(ud->settings, NULL);
 current_preset = NULL;
 }
 else
@@ -1007,9 +1022,9 @@
 current_preset = dict;
 folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
 if (folder)
- preset_to_ui(ud, NULL);
+ ghb_preset_to_settings(ud->settings, NULL);
 else
- preset_to_ui(ud, dict);
+ ghb_preset_to_settings(ud->settings, dict);
 path = preset_path_from_indices(presetsPlist, indices, len);
 ghb_settings_set_value(ud->settings, "preset", path);
 ghb_value_free(path);
@@ -1025,11 +1040,11 @@
 
 void
 ghb_update_from_preset(
- signal_user_data_t *ud, 
+ signal_user_data_t *ud,
 const gchar *key)
 {
 const GValue *gval;
- 
+
 g_debug("ghb_update_from_preset() %s", key);
 gval = curr_preset_get_value(key);
 if (gval != NULL)
@@ -1040,8 +1055,8 @@
 
 static void
 ghb_select_preset2(
- GtkBuilder *builder, 
- gint *indices, 
+ GtkBuilder *builder,
+ gint *indices,
 gint len)
 {
 GtkTreeView *treeview;
@@ -1049,7 +1064,7 @@
 GtkTreeModel *store;
 GtkTreeIter iter;
 GtkTreePath *path;
- 
+
 g_debug("ghb_select_preset2()");
 treeview = GTK_TREE_VIEW(GHB_WIDGET(builder, "presets_list"));
 selection = gtk_tree_view_get_selection (treeview);
@@ -1134,6 +1149,7 @@
 if (!g_file_test(config, G_FILE_TEST_IS_DIR))
 g_mkdir (config, 0755);
 }
+ g_strfreev(split);
 }
 return config;
 }
@@ -1314,94 +1330,6 @@
 g_free(config);
 }
 
-static gboolean prefs_initializing = FALSE;
-
-void
-ghb_prefs_to_ui(signal_user_data_t *ud)
-{
- const GValue *gval;
- gchar *key;
- gchar *str;
- GValue *internal, *dict;
- GHashTableIter iter;
- 
-
- g_debug("ghb_prefs_to_ui");
- prefs_initializing = TRUE;
-
- // Setting a ui widget will cause the corresponding setting
- // to be set, but it also triggers a callback that can 
- // have the side effect of using other settings values
- // that have not yet been set. So set *all* settings first
- // then update the ui.
- internal = plist_get_dict(internalPlist, "Initialization");
- ghb_dict_iter_init(&iter, internal);
- // middle (void*) cast prevents gcc warning "defreferencing type-punned
- // pointer will break strict-aliasing rules"
- while (g_hash_table_iter_next(
- &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
- {
- ghb_ui_update(ud, key, gval);
- }
-
- dict = plist_get_dict(prefsPlist, "Preferences");
- internal = plist_get_dict(internalPlist, "Preferences");
- ghb_dict_iter_init(&iter, internal);
- // middle (void*) cast prevents gcc warning "defreferencing type-punned
- // pointer will break strict-aliasing rules"
- while (g_hash_table_iter_next(
- &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
- {
- const GValue *value = NULL;
- if (dict)
- value = ghb_dict_lookup(dict, key);
- if (value == NULL)
- value = gval;
- ghb_settings_set_value(ud->settings, key, value);
- }
- internal = plist_get_dict(internalPlist, "Preferences");
- ghb_dict_iter_init(&iter, internal);
- // middle (void*) cast prevents gcc warning "defreferencing type-punned
- // pointer will break strict-aliasing rules"
- while (g_hash_table_iter_next(
- &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
- {
- const GValue *value = NULL;
- if (dict)
- value = ghb_dict_lookup(dict, key);
- if (value == NULL)
- value = gval;
- ghb_ui_update(ud, key, value);
- }
- const GValue *val;
- val = ghb_settings_get_value(ud->settings, "show_presets");
- ghb_ui_update(ud, "show_presets", val);
- if (ghb_settings_get_boolean(ud->settings, "hbfd_feature"))
- {
- GtkAction *action;
- val = ghb_settings_get_value(ud->settings, "hbfd");
- ghb_ui_update(ud, "hbfd", val);
- action = GHB_ACTION (ud->builder, "hbfd");
- gtk_action_set_visible(action, TRUE);
- }
- else
- {
- ghb_ui_update(ud, "hbfd", ghb_int64_value(0));
- }
- gval = ghb_settings_get_value(ud->settings, "default_source");
- ghb_settings_set_value (ud->settings, "scan_source", gval);
-
- str = ghb_settings_get_string(ud->settings, "destination_dir");
- ghb_ui_update(ud, "dest_dir", ghb_string_value(str));
-
- gchar *file = g_strdup_printf ("new_video.mp4");
- ghb_ui_update(ud, "dest_file", ghb_string_value(file));
- g_free(str);
- g_free(file);
-
- prefs_initializing = FALSE;
-}
-
 void
 ghb_prefs_save(GValue *settings)
 {
@@ -1410,8 +1338,8 @@
 GHashTableIter iter;
 gchar *key;
 const GValue *value;
- 
- if (prefs_initializing) return;
+
+ GValue *internalPlist = ghb_resource_get("internal-defaults");
 dict = plist_get_dict(internalPlist, "Preferences");
 if (dict == NULL) return;
 pref_dict = plist_get_dict(prefsPlist, "Preferences");
@@ -1433,11 +1361,10 @@
 }
 
 void
-ghb_pref_set(GValue *settings, const gchar *key)
+ghb_pref_save(GValue *settings, const gchar *key)
 {
 const GValue *value, *value2;
- 
- if (prefs_initializing) return;
+
 value = ghb_settings_get_value(settings, key);
 if (value != NULL)
 {
@@ -1449,17 +1376,16 @@
 {
 ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(value));
 store_prefs();
- prefs_modified = TRUE;
+ prefs_modified = FALSE;
 }
 }
 }
 
 void
-ghb_pref_save(GValue *settings, const gchar *key)
+ghb_pref_set(GValue *settings, const gchar *key)
 {
 const GValue *value, *value2;
- 
- if (prefs_initializing) return;
+
 value = ghb_settings_get_value(settings, key);
 if (value != NULL)
 {
@@ -1470,8 +1396,7 @@
 if (ghb_value_cmp(value, value2) != 0)
 {
 ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(value));
- store_prefs();
- prefs_modified = FALSE;
+ prefs_modified = TRUE;
 }
 }
 }
@@ -1487,60 +1412,34 @@
 }
 
 void
-ghb_settings_init(signal_user_data_t *ud)
+ghb_settings_init(GValue *settings, const char *name)
 {
 GValue *internal;
 GHashTableIter iter;
 gchar *key;
 GValue *gval;
 
-
 g_debug("ghb_settings_init");
- prefs_initializing = TRUE;
-
- internalPlist = ghb_resource_get("internal-defaults");
+ GValue *internalPlist = ghb_resource_get("internal-defaults");
 // Setting a ui widget will cause the corresponding setting
- // to be set, but it also triggers a callback that can 
+ // to be set, but it also triggers a callback that can
 // have the side effect of using other settings values
 // that have not yet been set. So set *all* settings first
 // then update the ui.
- internal = plist_get_dict(internalPlist, "Initialization");
- ghb_dict_iter_init(&iter, internal);
- // middle (void*) cast prevents gcc warning "defreferencing type-punned
- // pointer will break strict-aliasing rules"
- while (g_hash_table_iter_next(
- &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
- {
- ghb_settings_set_value(ud->settings, key, gval);
- }
-
- internal = plist_get_dict(internalPlist, "Presets");
+ internal = plist_get_dict(internalPlist, name);
 ghb_dict_iter_init(&iter, internal);
 // middle (void*) cast prevents gcc warning "defreferencing type-punned
 // pointer will break strict-aliasing rules"
 while (g_hash_table_iter_next(
 &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
 {
- ghb_settings_set_value(ud->settings, key, gval);
+ ghb_settings_set_value(settings, key, gval);
 }
-
- internal = plist_get_dict(internalPlist, "Preferences");
- ghb_dict_iter_init(&iter, internal);
- // middle (void*) cast prevents gcc warning "defreferencing type-punned
- // pointer will break strict-aliasing rules"
- while (g_hash_table_iter_next(
- &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
- {
- ghb_settings_set_value(ud->settings, key, gval);
- }
- prefs_initializing = FALSE;
 }
 
 void
 ghb_settings_close()
 {
- if (internalPlist)
- ghb_value_free(internalPlist);
 if (presetsPlist)
 ghb_value_free(presetsPlist);
 if (prefsPlist)
@@ -1581,9 +1480,10 @@
 GValue *dict, *internal;
 GHashTableIter iter;
 gchar *key;
- GValue *gval, *path;
- 
+ GValue *gval;
+
 g_debug("ghb_prefs_load");
+ GValue *internalPlist = ghb_resource_get("internal-defaults");
 prefsPlist = load_plist("preferences");
 if (prefsPlist == NULL)
 prefsPlist = ghb_dict_value_new();
@@ -1594,7 +1494,7 @@
 dict = ghb_dict_value_new();
 ghb_dict_insert(prefsPlist, g_strdup("Preferences"), dict);
 
- // Get defaults from internal defaults 
+ // Get defaults from internal defaults
 ghb_dict_iter_init(&iter, internal);
 // middle (void*) cast prevents gcc warning "defreferencing type-punned
 // pointer will break strict-aliasing rules"
@@ -1609,7 +1509,7 @@
 {
 dir = ".";
 }
- ghb_dict_insert(dict, 
+ ghb_dict_insert(dict,
 g_strdup("ExportDirectory"), ghb_value_dup(ghb_string_value(dir)));
 
 dir = g_get_user_special_dir (G_USER_DIRECTORY_VIDEOS);
@@ -1617,10 +1517,10 @@
 {
 dir = ".";
 }
- ghb_dict_insert(dict, 
+ ghb_dict_insert(dict,
 g_strdup("destination_dir"), ghb_value_dup(ghb_string_value(dir)));
 
- ghb_dict_insert(dict, 
+ ghb_dict_insert(dict,
 g_strdup("SrtDir"), ghb_value_dup(ghb_string_value(dir)));
 #if defined(_WIN32)
 gchar *source;
@@ -1630,38 +1530,35 @@
 {
 source = g_strdup("C:" G_DIR_SEPARATOR_S);
 }
- ghb_dict_insert(dict, g_strdup("default_source"), 
+ ghb_dict_insert(dict, g_strdup("default_source"),
 ghb_value_dup(ghb_string_value(source)));
 g_free(source);
 #endif
 store_prefs();
 }
- // Read legacy default_preset preference and update accordingly
- path = ghb_dict_lookup(dict, "default_preset");
- if (path)
- {
- gint *indices, len;
+}
 
- if (G_VALUE_TYPE(path) == G_TYPE_STRING)
- {
- GValue *str = path;
+void
+ghb_prefs_to_settings(GValue *settings)
+{
+ // Initialize the ui from presets file.
+ GValue *internal, *dict;
 
- path = ghb_array_value_new(1);
- ghb_array_append(path, ghb_value_dup(str));
- indices = ghb_preset_indices_from_path(presetsPlist, path, &len);
- ghb_value_free(path);
- }
- else
- indices = ghb_preset_indices_from_path(presetsPlist, path, &len);
+ if (prefsPlist == NULL)
+ return;
 
- if (indices)
- {
- presets_set_default(indices, len);
- g_free(indices);
- }
- ghb_dict_remove(dict, "default_preset");
- store_prefs();
- }
+ // Get key list from internal default presets. This way we do not
+ // load any unknown keys.
+ GValue *internalPlist = ghb_resource_get("internal-defaults");
+ if (internalPlist == NULL) return;
+ internal = plist_get_dict(internalPlist, "Preferences");
+ dict = plist_get_dict(prefsPlist, "Preferences");
+ // Setting a ui widget will cause the corresponding setting
+ // to be set, but it also triggers a callback that can
+ // have the side effect of using other settings values
+ // that have not yet been set. So set *all* settings first
+ // then update the ui.
+ init_settings_from_dict(settings, internal, dict, TRUE);
 }
 
 static const gchar*
@@ -1690,13 +1587,13 @@
 
 void
 ghb_presets_list_init(
- signal_user_data_t *ud, 
+ signal_user_data_t *ud,
 gint *indices,
 gint len)
 {
 GtkTreeView *treeview;
 GtkTreeIter iter, titer, *piter;
- 
+
 GtkTreeStore *store;
 const gchar *preset;
 GtkTreePath *parent_path;
@@ -1706,14 +1603,14 @@
 GValue *dict;
 gint *more_indices;
 GValue *presets = NULL;
- 
+
 g_debug("ghb_presets_list_init ()");
 more_indices = g_malloc((len+1)*sizeof(gint));
 memcpy(more_indices, indices, len*sizeof(gint));
 presets = presets_get_folder(presetsPlist, indices, len);
 if (presets == NULL)
 {
- g_warning("Failed to find parent folder when adding child.");
+ g_warning(_("Failed to find parent folder when adding child."));
 g_free(more_indices);
 return;
 }
@@ -1748,10 +1645,10 @@
 type = ghb_preset_type(dict);
 folder = ghb_preset_folder(dict);
 color = get_preset_color(type, folder);
- gtk_tree_store_set(store, &iter, 0, preset, 
- 1, def ? 800 : 400, 
+ gtk_tree_store_set(store, &iter, 0, preset,
+ 1, def ? 800 : 400,
 2, def ? 2 : 0,
- 3, color, 
+ 3, color,
 4, description,
 5, type == PRESETS_BUILTIN ? 0 : 1,
 -1);
@@ -1795,7 +1692,7 @@
 
 static void
 presets_list_update_item(
- signal_user_data_t *ud, 
+ signal_user_data_t *ud,
 gint *indices,
 gint len,
 gboolean recurse)
@@ -1810,7 +1707,7 @@
 gboolean def, folder;
 GValue *dict;
 const gchar *color;
- 
+
 g_debug("presets_list_update_item ()");
 dict = presets_get_dict(presetsPlist, indices, len);
 if (dict == NULL)
@@ -1827,8 +1724,8 @@
 type = ghb_preset_type(dict);
 folder = ghb_preset_folder(dict);
 color = get_preset_color(type, folder);
- gtk_tree_store_set(store, &iter, 0, name, 
- 1, def ? 800 : 400, 
+ gtk_tree_store_set(store, &iter, 0, name,
+ 1, def ? 800 : 400,
 2, def ? 2 : 0,
 3, color,
 4, description,
@@ -1842,7 +1739,7 @@
 
 static void
 presets_list_insert(
- signal_user_data_t *ud, 
+ signal_user_data_t *ud,
 gint *indices,
 gint len)
 {
@@ -1858,14 +1755,14 @@
 GtkTreePath *parent_path;
 GValue *dict;
 const gchar *color;
- 
+
 g_debug("presets_list_insert ()");
 treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
 store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
 presets = presets_get_folder(presetsPlist, indices, len-1);
 if (presets == NULL)
 {
- g_warning("Failed to find parent folder while adding child.");
+ g_warning(_("Failed to find parent folder while adding child."));
 return;
 }
 parent_path = ghb_tree_path_new_from_indices(indices, len-1);
@@ -1892,8 +1789,8 @@
 type = ghb_preset_type(dict);
 folder = ghb_preset_folder(dict);
 color = get_preset_color(type, folder);
- gtk_tree_store_set(store, &iter, 0, preset, 
- 1, def ? 800 : 400, 
+ gtk_tree_store_set(store, &iter, 0, preset,
+ 1, def ? 800 : 400,
 2, def ? 2 : 0,
 3, color,
 4, description,
@@ -1907,7 +1804,7 @@
 
 static void
 presets_list_remove(
- signal_user_data_t *ud, 
+ signal_user_data_t *ud,
 gint *indices,
 gint len)
 {
@@ -1915,7 +1812,7 @@
 GtkTreePath *treepath;
 GtkTreeIter iter;
 GtkTreeStore *store;
- 
+
 g_debug("presets_list_remove ()");
 treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
 store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
@@ -2018,126 +1915,6 @@
 const gchar *lin_val;
 } value_map_t;
 
-static value_map_t vcodec_xlat_compat[] =
-{
- {"MPEG-4 (FFmpeg)", "ffmpeg"},
- {"MPEG-4 (XviD)", "ffmpeg4"},
- {NULL,NULL}
-};
-
-static value_map_t *vcodec_xlat;
-
-static value_map_t acodec_xlat_compat[] =
-{
- {"AAC (CoreAudio)", "faac"},
- {"HE-AAC (CoreAudio)", "faac"},
- {"AC3 (ffmpeg)", "ac3"},
- {"AC3", "ac3"},
- {"MP3 Passthru", "mp3pass"},
- {"AAC Passthru", "aacpass"},
- {"AC3 Passthru", "ac3pass"},
- {"DTS Passthru", "dtspass"},
- {"DTS-HD Passthru", "dtshdpass"},
- {"Auto Passthru", "auto"},
- {NULL,NULL}
-};
-
-static value_map_t *acodec_xlat;
-
-static value_map_t * create_encoder_xlat_tbl(value_map_t *compat, hb_encoder_t *enc, int size)
-{
- value_map_t *out;
- int cc, ii;
-
- for (cc = 0; compat[cc].mac_val != NULL; cc++);
- 
- out = calloc(cc + size + 1, sizeof(value_map_t));
-
- for (ii = 0; ii < size; ii++)
- {
- out[ii].mac_val = enc[ii].human_readable_name;
- out[ii].lin_val = enc[ii].short_name;
- }
-
- for (ii = 0; ii < cc; ii++)
- out[ii+size] = compat[ii];
-
- return out;
-}
-
-static value_map_t * create_mix_xlat_tbl(value_map_t *compat, hb_mixdown_t * mix, int size)
-{
- value_map_t *out;
- int cc, ii;
-
- for (cc = 0; compat[cc].mac_val != NULL; cc++);
-
- out = calloc(cc + size + 1, sizeof(value_map_t));
-
- for (ii = 0; ii < size; ii++)
- {
- out[ii].mac_val = mix[ii].human_readable_name;
- out[ii].lin_val = mix[ii].short_name;
- }
-
- for (ii = 0; ii < cc; ii++)
- out[ii+size] = compat[ii];
-
- return out;
-}
-
-value_map_t container_xlat[] =
-{
- {"MP4 file", "mp4"},
- {"M4V file", "mp4"},
- {"MKV file", "mkv"},
- {"AVI file", "mkv"},
- {"OGM file", "mkv"},
- {NULL, NULL}
-};
-
-value_map_t framerate_xlat[] =
-{
- {"Same as source", "source"},
- {"5", "5"},
- {"10", "10"},
- {"12", "12"},
- {"15", "15"},
- {"23.976 (NTSC Film)", "23.976"},
- {"24", "24"},
- {"25 (PAL Film/Video)", "25"},
- {"29.97 (NTSC Video)", "29.97"},
- {"30", "30"},
- {"50", "50"},
- {"59.94", "59.94"},
- {"60", "60"},
- {NULL, NULL}
-};
-
-value_map_t samplerate_xlat[] =
-{
- {"Auto", "source"},
- {"22.05", "22.05"},
- {"24", "24"},
- {"32", "32"},
- {"44.1", "44.1"},
- {"48", "48"},
- {NULL, NULL}
-};
-
-// mix translation table filed in with hb_audio_mixdowns table contents
-value_map_t *mix_xlat;
-
-// Backwards compatibility mappings for audio mix
-value_map_t mix_xlat_compat[] =
-{
- {"6-channel discrete", "5point1"},
- {"AC3 Passthru", "none"},
- {"DTS Passthru", "none"},
- {"DTS-HD Passthru", "none"},
- {NULL, NULL}
-};
-
 value_map_t deint_xlat[] =
 {
 {"0", "off"},
@@ -2153,9 +1930,10 @@
 {
 {"0", "off"},
 {"1", "custom"},
- {"2", "weak"},
+ {"2", "light"},
 {"3", "medium"},
 {"4", "strong"},
+ {"5", "ultralight"},
 {NULL, NULL}
 };
 
@@ -2177,6 +1955,7 @@
 {NULL, NULL}
 };
 
+#if 0
 extern iso639_lang_t ghb_language_table[];
 
 static GValue*
@@ -2211,30 +1990,6 @@
 }
 
 static GValue*
-export_subtitle_xlat2(GValue *lin_val)
-{
- gchar *str;
- GValue *gval;
-
- if (lin_val == NULL) return NULL;
- str = ghb_value_string(lin_val);
- if (strcmp(str, "none") == 0)
- {
- gval = ghb_string_value_new("None");
- }
- else if (strcmp(str, "auto") == 0)
- {
- gval = ghb_string_value_new("Autoselect");
- }
- else
- {
- gval = export_lang_xlat2(lin_val);
- }
- g_free(str);
- return gval;
-}
-
-static GValue*
 import_lang_xlat2(GValue *mac_val)
 {
 GValue *gval;
@@ -2258,74 +2013,7 @@
 g_free(str);
 return NULL;
 }
-
-static GValue*
-import_subtitle_xlat2(GValue *mac_val)
-{
- gchar *str;
- GValue *gval;
-
- if (mac_val == NULL) return NULL;
- str = ghb_value_string(mac_val);
- if (strcmp(str, "None") == 0)
- {
- gval = ghb_string_value_new("none");
- }
- else if (strcmp(str, "Autoselect") == 0)
- {
- gval = ghb_string_value_new("auto");
- }
- else
- {
- gval = import_lang_xlat2(mac_val);
- }
- g_free(str);
- return gval;
-}
-
-static GValue*
-export_audio_track_xlat2(GValue *lin_val)
-{
- gchar *str;
- GValue *gval = NULL;
-
- if (lin_val == NULL) return NULL;
- str = ghb_value_string(lin_val);
- if (strcmp(str, "none") == 0)
- {
- gval = ghb_int_value_new(1);
- }
- else
- {
- gint val = ghb_value_int(lin_val) + 1;
- gval = ghb_int_value_new(val);
- }
- g_free(str);
- return gval;
-}
-
-static GValue*
-import_audio_track_xlat2(GValue *mac_val)
-{
- gint val;
- gchar *str;
- GValue *gval;
-
- if (mac_val == NULL) return NULL;
- val = ghb_value_int(mac_val);
- if (val <= 0)
- {
- val = 0;
- }
- else
- {
- val--;
- }
- str = g_strdup_printf("%d", val);
- gval = ghb_string_value_new(str);
- g_free(str);
- return gval;
-}
+#endif
 
 static GValue*
 export_value_xlat2(value_map_t *value_map, GValue *lin_val, GType mac_type)
@@ -2361,6 +2049,103 @@
 return NULL;
 }
 
+static GValue*
+export_value_video_framerate(GValue *lin_val)
+{
+ GValue *sval = NULL;
+ gchar *str;
+ const gchar *fr;
+
+ str = ghb_value_string(lin_val);
+ fr = hb_video_framerate_get_name(hb_video_framerate_get_from_name(str));
+ g_free(str);
+ if (fr != NULL)
+ sval = ghb_string_value_new(fr);
+
+ return sval;
+}
+
+static GValue*
+export_value_audio_samplerate(GValue *lin_val)
+{
+ GValue *sval = NULL;
+ gchar *str;
+ const gchar *sr;
+
+ str = ghb_value_string(lin_val);
+ sr = hb_audio_samplerate_get_name(hb_audio_samplerate_get_from_name(str));
+ g_free(str);
+ if (sr != NULL)
+ sval = ghb_string_value_new(sr);
+
+ return sval;
+}
+
+static GValue*
+export_value_mixdown(GValue *lin_val)
+{
+ GValue *sval = NULL;
+ gchar *str;
+ const gchar *mix;
+
+ str = ghb_value_string(lin_val);
+ mix = hb_mixdown_get_name(hb_mixdown_get_from_name(str));
+ g_free(str);
+ if (mix != NULL)
+ sval = ghb_string_value_new(mix);
+
+ return sval;
+}
+
+static GValue*
+export_value_video_encoder(GValue *lin_val)
+{
+ GValue *sval = NULL;
+ gchar *str;
+ const gchar *enc;
+
+ str = ghb_value_string(lin_val);
+ enc = hb_video_encoder_get_name(hb_video_encoder_get_from_name(str));
+ g_free(str);
+ if (enc != NULL)
+ sval = ghb_string_value_new(enc);
+
+ return sval;
+}
+
+static GValue*
+export_value_audio_encoder(GValue *lin_val)
+{
+ GValue *sval = NULL;
+ gchar *str;
+ const gchar *enc;
+
+ str = ghb_value_string(lin_val);
+ enc = hb_audio_encoder_get_name(hb_audio_encoder_get_from_name(str));
+ g_free(str);
+ if (enc != NULL)
+ sval = ghb_string_value_new(enc);
+
+ return sval;
+}
+
+static GValue*
+export_value_container(GValue *lin_val)
+{
+ GValue *sval = NULL;
+ gchar *str;
+ const gchar *mux;
+
+ str = ghb_value_string(lin_val);
+ mux = hb_container_get_name(hb_container_get_from_name(str));
+ g_free(str);
+ if (mux != NULL)
+ sval = ghb_string_value_new(mux);
+
+ return sval;
+}
+
+// Translate values for compatibility with other platforms
 static void
 export_value_xlat(GValue *dict)
 {
@@ -2369,17 +2154,17 @@
 
 key = "VideoEncoder";
 lin_val = ghb_dict_lookup(dict, key);
- gval = export_value_xlat2(vcodec_xlat, lin_val, G_TYPE_STRING);
+ gval = export_value_video_encoder(lin_val);
 if (gval)
 ghb_dict_insert(dict, g_strdup(key), gval);
 key = "FileFormat";
 lin_val = ghb_dict_lookup(dict, key);
- gval = export_value_xlat2(container_xlat, lin_val, G_TYPE_STRING);
+ gval = export_value_container(lin_val);
 if (gval)
 ghb_dict_insert(dict, g_strdup(key), gval);
 key = "VideoFramerate";
 lin_val = ghb_dict_lookup(dict, key);
- gval = export_value_xlat2(framerate_xlat, lin_val, G_TYPE_STRING);
+ gval = export_value_video_framerate(lin_val);
 if (gval)
 ghb_dict_insert(dict, g_strdup(key), gval);
 key = "PictureDetelecine";
@@ -2397,34 +2182,21 @@
 gval = export_value_xlat2(deint_xlat, lin_val, G_TYPE_INT);
 if (gval)
 ghb_dict_insert(dict, g_strdup(key), gval);
- key = "PictureDenoise";
+#if 0
+ key = "PictureDenoisePreset";
 lin_val = ghb_dict_lookup(dict, key);
 gval = export_value_xlat2(denoise_xlat, lin_val, G_TYPE_INT);
 if (gval)
 ghb_dict_insert(dict, g_strdup(key), gval);
+#endif
 
- GValue *slist;
- GValue *sdict;
 gint count, ii;
-
- slist = ghb_dict_lookup(dict, "SubtitleList");
- count = ghb_array_len(slist);
- for (ii = 0; ii < count; ii++)
- {
- sdict = ghb_array_get_nth(slist, ii);
- key = "SubtitleLanguage";
- lin_val = ghb_dict_lookup(sdict, key);
- gval = export_subtitle_xlat2(lin_val);
- if (gval)
- ghb_dict_insert(sdict, g_strdup(key), gval);
- }
-
 GValue *alist;
 GValue *adict;
 
 key = "AudioEncoderFallback";
 lin_val = ghb_dict_lookup(dict, key);
- gval = export_value_xlat2(acodec_xlat, lin_val, G_TYPE_STRING);
+ gval = export_value_audio_encoder(lin_val);
 if (gval)
 ghb_dict_insert(dict, g_strdup(key), gval);
 
@@ -2433,24 +2205,19 @@
 for (ii = 0; ii < count; ii++)
 {
 adict = ghb_array_get_nth(alist, ii);
- key = "AudioTrack";
- lin_val = ghb_dict_lookup(adict, key);
- gval = export_audio_track_xlat2(lin_val);
- if (gval)
- ghb_dict_insert(adict, g_strdup(key), gval);
 key = "AudioEncoder";
 lin_val = ghb_dict_lookup(adict, key);
- gval = export_value_xlat2(acodec_xlat, lin_val, G_TYPE_STRING);
+ gval = export_value_audio_encoder(lin_val);
 if (gval)
 ghb_dict_insert(adict, g_strdup(key), gval);
 key = "AudioSamplerate";
 lin_val = ghb_dict_lookup(adict, key);
- gval = export_value_xlat2(samplerate_xlat, lin_val, G_TYPE_STRING);
+ gval = export_value_audio_samplerate(lin_val);
 if (gval)
 ghb_dict_insert(adict, g_strdup(key), gval);
 key = "AudioMixdown";
 lin_val = ghb_dict_lookup(adict, key);
- gval = export_value_xlat2(mix_xlat, lin_val, G_TYPE_STRING);
+ gval = export_value_mixdown(lin_val);
 if (gval)
 ghb_dict_insert(adict, g_strdup(key), gval);
 }
@@ -2459,9 +2226,9 @@
 
 static GValue*
 import_value_xlat2(
- GValue *defaults, 
+ GValue *defaults,
 value_map_t *value_map,
- const gchar *key, 
+ const gchar *key,
 GValue *mac_val)
 {
 GValue *gval, *def_val;
@@ -2528,26 +2295,129 @@
 return NULL;
 }
 
+static GValue*
+import_value_video_framerate(GValue *mac_val)
+{
+ GValue *sval = NULL;
+ gchar *str;
+ const gchar *fr;
+
+ str = ghb_value_string(mac_val);
+ fr = hb_video_framerate_get_name(hb_video_framerate_get_from_name(str));
+ g_free(str);
+
+ if (fr != NULL)
+ sval = ghb_string_value_new(fr);
+
+ return sval;
+}
+
+static GValue*
+import_value_audio_samplerate(GValue *mac_val)
+{
+ GValue *sval = NULL;
+ gchar *str;
+ const gchar *sr;
+
+ str = ghb_value_string(mac_val);
+ sr = hb_audio_samplerate_get_name(hb_audio_samplerate_get_from_name(str));
+ g_free(str);
+
+ if (sr != NULL)
+ sval = ghb_string_value_new(sr);
+
+ return sval;
+}
+
+static GValue*
+import_value_mixdown(GValue *mac_val)
+{
+ GValue *sval = NULL;
+ gchar *str;
+ const gchar *mix;
+
+ str = ghb_value_string(mac_val);
+ mix = hb_mixdown_get_short_name(hb_mixdown_get_from_name(str));
+ g_free(str);
+
+ if (mix != NULL)
+ sval = ghb_string_value_new(mix);
+
+ return sval;
+}
+
+static GValue*
+import_value_video_encoder(GValue *mac_val)
+{
+ GValue *sval = NULL;
+ gchar *str;
+ const gchar *enc;
+
+ str = ghb_value_string(mac_val);
+ enc = hb_video_encoder_get_short_name(hb_video_encoder_get_from_name(str));
+ g_free(str);
+
+ if (enc != NULL)
+ sval = ghb_string_value_new(enc);
+
+ return sval;
+}
+
+static GValue*
+import_value_audio_encoder(GValue *mac_val)
+{
+ GValue *sval = NULL;
+ gchar *str;
+ const gchar *enc;
+
+ str = ghb_value_string(mac_val);
+ enc = hb_audio_encoder_get_short_name(hb_audio_encoder_get_from_name(str));
+ g_free(str);
+
+ if (enc != NULL)
+ sval = ghb_string_value_new(enc);
+
+ return sval;
+}
+
+static GValue*
+import_value_container(GValue *mac_val)
+{
+ GValue *sval = NULL;
+ gchar *str;
+ const gchar *mux;
+
+ str = ghb_value_string(mac_val);
+ mux = hb_container_get_short_name(hb_container_get_from_name(str));
+ g_free(str);
+
+ if (mux != NULL)
+ sval = ghb_string_value_new(mux);
+
+ return sval;
+}
+
 static void
 import_value_xlat(GValue *dict)
 {
 GValue *defaults, *mac_val, *gval;
 const gchar *key;
 
+ GValue *internalPlist = ghb_resource_get("internal-defaults");
 defaults = plist_get_dict(internalPlist, "Presets");
 key = "VideoEncoder";
 mac_val = ghb_dict_lookup(dict, key);
- gval = import_value_xlat2(defaults, vcodec_xlat, key, mac_val);
+ gval = import_value_video_encoder(mac_val);
 if (gval)
 ghb_dict_insert(dict, g_strdup(key), gval);
 key = "FileFormat";
 mac_val = ghb_dict_lookup(dict, key);
- gval = import_value_xlat2(defaults, container_xlat, key, mac_val);
+ gval = import_value_container(mac_val);
 if (gval)
 ghb_dict_insert(dict, g_strdup(key), gval);
 key = "VideoFramerate";
 mac_val = ghb_dict_lookup(dict, key);
- gval = import_value_xlat2(defaults, framerate_xlat, key, mac_val);
+ gval = import_value_video_framerate(mac_val);
 if (gval)
 ghb_dict_insert(dict, g_strdup(key), gval);
 key = "PictureDetelecine";
@@ -2565,81 +2435,16 @@
 gval = import_value_xlat2(defaults, deint_xlat, key, mac_val);
 if (gval)
 ghb_dict_insert(dict, g_strdup(key), gval);
- key = "PictureDenoise";
+ key = "PictureDenoisePreset";
 mac_val = ghb_dict_lookup(dict, key);
 gval = import_value_xlat2(defaults, denoise_xlat, key, mac_val);
 if (gval)
 ghb_dict_insert(dict, g_strdup(key), gval);
 
- GValue *sdeflist;
- GValue *slist;
- GValue *sdict;
- gint count, ii;
-
- sdeflist = ghb_dict_lookup(defaults, "SubtitleList");
- if (sdeflist)
- {
- slist = ghb_dict_lookup(dict, "SubtitleList");
- if (slist)
- {
- count = ghb_array_len(slist);
- for (ii = 0; ii < count; ii++)
- {
- sdict = ghb_array_get_nth(slist, ii);
- key = "SubtitleLanguage";
- mac_val = ghb_dict_lookup(sdict, key);
- gval = import_subtitle_xlat2(mac_val);
- if (gval)
- ghb_dict_insert(sdict, g_strdup(key), gval);
- }
- 
- }
- else
- {
- key = "Subtitles";
- mac_val = ghb_dict_lookup(dict, key);
- slist = ghb_array_value_new(8);
- ghb_dict_insert(dict, g_strdup("SubtitleList"), slist);
- if (mac_val)
- {
- gchar *lang;
- 
- gval = import_subtitle_xlat2(mac_val);
- lang = ghb_value_string(gval);
- if (lang && strcasecmp(lang, "none") != 0 && !slist)
- {
- sdict = ghb_dict_value_new();
- ghb_array_append(slist, sdict);
- ghb_dict_insert(sdict, g_strdup("SubtitleLanguage"), gval);
- gval = ghb_dict_lookup(dict, "SubtitlesForced");
- if (gval != NULL)
- {
- ghb_dict_insert(sdict, g_strdup("SubtitleForced"), 
- ghb_value_dup(gval));
- }
- else
- {
- ghb_dict_insert(sdict, g_strdup("SubtitleForced"), 
- ghb_boolean_value_new(FALSE));
- }
- ghb_dict_insert(sdict, g_strdup("SubtitleBurned"),
- ghb_boolean_value_new(TRUE));
- ghb_dict_insert(sdict, g_strdup("SubtitleDefaultTrack"),
- ghb_boolean_value_new(FALSE));
- }
- else
- {
- ghb_value_free(gval);
- }
- if (lang)
- g_free(lang);
- }
- }
- }
 ghb_dict_remove(dict, "Subtitles");
 ghb_dict_remove(dict, "SubtitlesForced");
 
-
+ gint count, ii;
 GValue *alist;
 GValue *adict;
 GValue *adefaults;
@@ -2647,7 +2452,7 @@
 
 key = "AudioEncoderFallback";
 mac_val = ghb_dict_lookup(dict, key);
- gval = import_value_xlat2(defaults, acodec_xlat, key, mac_val);
+ gval = import_value_audio_encoder(mac_val);
 if (gval)
 ghb_dict_insert(dict, g_strdup(key), gval);
 
@@ -2660,24 +2465,25 @@
 for (ii = 0; ii < count; ii++)
 {
 adict = ghb_array_get_nth(alist, ii);
- key = "AudioTrack";
- mac_val = ghb_dict_lookup(adict, key);
- gval = import_audio_track_xlat2(mac_val);
- if (gval)
- ghb_dict_insert(adict, g_strdup(key), gval);
 key = "AudioEncoder";
 mac_val = ghb_dict_lookup(adict, key);
- gval = import_value_xlat2(adefaults, acodec_xlat, key, mac_val);
+ gval = import_value_audio_encoder(mac_val);
+ if (gval == NULL)
+ gval = ghb_value_dup(ghb_dict_lookup(adefaults, key));
 if (gval)
 ghb_dict_insert(adict, g_strdup(key), gval);
 key = "AudioSamplerate";
 mac_val = ghb_dict_lookup(adict, key);
- gval = import_value_xlat2(adefaults, samplerate_xlat, key, mac_val);
+ gval = import_value_audio_samplerate(mac_val);
+ if (gval == NULL)
+ gval = ghb_value_dup(ghb_dict_lookup(adefaults, key));
 if (gval)
 ghb_dict_insert(adict, g_strdup(key), gval);
 key = "AudioMixdown";
 mac_val = ghb_dict_lookup(adict, key);
- gval = import_value_xlat2(adefaults, mix_xlat, key, mac_val);
+ gval = import_value_mixdown(mac_val);
+ if (gval == NULL)
+ gval = ghb_value_dup(ghb_dict_lookup(adefaults, key));
 if (gval)
 ghb_dict_insert(adict, g_strdup(key), gval);
 
@@ -2686,9 +2492,9 @@
 {
 gdouble drc;
 drc = ghb_value_double(mac_val);
- if (drc < 1.0 && drc > 0.0)
+ if (drc < 1.0)
 {
- ghb_dict_insert(adict, g_strdup("AudioTrackDRCSlider"), 
+ ghb_dict_insert(adict, g_strdup("AudioTrackDRCSlider"),
 ghb_double_value_new(0.0));
 }
 }
@@ -2696,247 +2502,259 @@
 }
 }
 
-static void
-import_xlat_preset(GValue *dict)
+static GValue*
+import_xlat_preset(GValue *user_preset)
 {
- gboolean uses_max;
- gint uses_pic;
- gint par;
- gint vqtype;
+ GValue *dict, *internal;
 
 g_debug("import_xlat_preset ()");
 
- uses_max = ghb_value_boolean(
- preset_dict_get_value(dict, "UsesMaxPictureSettings"));
- uses_pic = ghb_value_int(
- preset_dict_get_value(dict, "UsesPictureSettings"));
- par = ghb_value_int(preset_dict_get_value(dict, "PicturePAR"));
- vqtype = ghb_value_int(preset_dict_get_value(dict, "VideoQualityType"));
+ dict = ghb_dict_value_new();
 
- if (uses_max || uses_pic == 2)
+ // First, initialize the preset with defaults.
+ // Then import user presets over top of defaults
+ GValue *internalPlist = ghb_resource_get("internal-defaults");
+ internal = plist_get_dict(internalPlist, "Presets");
+ init_settings_from_dict(dict, internal, user_preset, FALSE);
+
+ // Initialize the AudioLanguageList from preferences PreferredLanguage
+ // and translate old AudioDUB preference option if found
+ GValue *list = ghb_dict_lookup(dict, "AudioLanguageList");
+ if (list == NULL)
 {
- ghb_dict_insert(dict, g_strdup("autoscale"), 
- ghb_boolean_value_new(TRUE));
+ list = ghb_array_value_new(8);
+ ghb_dict_insert(dict, g_strdup("AudioLanguageList"), list);
 }
- switch (par)
+ if (ghb_array_len(list) == 0)
 {
- case 0:
+ GValue *prefs = plist_get_dict(prefsPlist, "Preferences");
+ GValue *gdub = ghb_dict_lookup(prefs, "AudioDUB");
+ GValue *glang = ghb_dict_lookup(prefs, "PreferredLanguage");
+ const char *lang = NULL;
+ if (glang != NULL)
+ {
+ lang = g_value_get_string(glang);
+ }
+ if (gdub != NULL && !ghb_value_boolean(gdub))
+ {
+ if (lang == NULL || strncmp(lang, "und", 4))
+ {
+ ghb_array_append(list, ghb_string_value_new("und"));
+ }
+ }
+ if (glang != NULL)
+ {
+ ghb_array_append(list, ghb_value_dup(glang));
+ }
+ }
+
+ // Initialize the SubtitleLanguageList from preferences PreferredLanguage
+ // and translate old AudioDUB preference option if found
+ list = ghb_dict_lookup(dict, "SubtitleLanguageList");
+ if (list == NULL)
 {
- if (ghb_dict_lookup(dict, "PictureModulus") == NULL)
- ghb_dict_insert(dict, g_strdup("PictureModulus"), 
- ghb_int_value_new(16));
- } break;
- case 1:
+ list = ghb_array_value_new(8);
+ ghb_dict_insert(dict, g_strdup("SubtitleLanguageList"), list);
+ }
+ if (ghb_array_len(list) == 0)
 {
- ghb_dict_insert(dict, g_strdup("PictureModulus"), 
- ghb_int_value_new(1));
- } break;
- case 2:
+ GValue *prefs = plist_get_dict(prefsPlist, "Preferences");
+ GValue *val = ghb_dict_lookup(prefs, "PreferredLanguage");
+ if (val != NULL)
+ {
+ ghb_array_append(list, ghb_value_dup(val));
+
+ val = ghb_dict_lookup(prefs, "AudioDUB");
+ if (val != NULL && !ghb_value_boolean(val))
+ {
+ ghb_dict_insert(dict,
+ g_strdup("SubtitleAddForeignAudioSubtitle"),
+ ghb_boolean_value_new(TRUE));
+ }
+ }
+ }
+
+ GValue *addCC = ghb_dict_lookup(dict, "SubtitleAddCC");
+ if (addCC == NULL)
 {
- if (ghb_dict_lookup(dict, "PictureModulus") == NULL)
- ghb_dict_insert(dict, g_strdup("PictureModulus"), 
- ghb_int_value_new(16));
- } break;
- default:
+ GValue *prefs = plist_get_dict(prefsPlist, "Preferences");
+ GValue *val = ghb_dict_lookup(prefs, "AddCC");
+ if (val != NULL)
+ {
+ ghb_dict_insert(dict, g_strdup("SubtitleAddCC"),
+ ghb_value_dup(val));
+ }
+ }
+
+ import_value_xlat(dict);
+
+ // Fix up all the internal settings that are derived from preset values.
+ ghb_settings_set_boolean(dict, "PictureDeinterlaceDecomb",
+ !ghb_settings_get_boolean(dict, "PictureDecombDeinterlace"));
+
+ ghb_settings_set_value(dict, "scale_height",
+ ghb_settings_get_value(dict, "PictureHeight"));
+
+ ghb_settings_set_value(dict, "scale_width",
+ ghb_settings_get_value(dict, "PictureWidth"));
+
+ gint uses_pic;
+ gint vqtype;
+
+ uses_pic = ghb_settings_get_int(dict, "UsesPictureSettings");
+ vqtype = ghb_settings_get_int(dict, "VideoQualityType");
+
+ // "Use max" or "strict anamorphic" imply autoscale
+ if (uses_pic == 2)
 {
- if (ghb_dict_lookup(dict, "PictureModulus") == NULL)
- ghb_dict_insert(dict, g_strdup("PictureModulus"), 
- ghb_int_value_new(16));
- } break;
+ ghb_settings_set_boolean(dict, "autoscale", TRUE);
+ }
+ else if (uses_pic == 1)
+ {
+ ghb_settings_set_boolean(dict, "autoscale", FALSE);
 }
+
 // VideoQualityType/0/1/2 - vquality_type_/target/bitrate/constant
 // *note: target is no longer used
 switch (vqtype)
 {
 case 0:
 {
- ghb_dict_insert(dict, g_strdup("vquality_type_bitrate"), 
- ghb_boolean_value_new(TRUE));
- ghb_dict_insert(dict, g_strdup("vquality_type_constant"), 
- ghb_boolean_value_new(FALSE));
+ ghb_settings_set_boolean(dict, "vquality_type_bitrate", TRUE);
+ ghb_settings_set_boolean(dict, "vquality_type_constant", FALSE);
 } break;
 case 1:
 {
- ghb_dict_insert(dict, g_strdup("vquality_type_bitrate"), 
- ghb_boolean_value_new(TRUE));
- ghb_dict_insert(dict, g_strdup("vquality_type_constant"), 
- ghb_boolean_value_new(FALSE));
+ ghb_settings_set_boolean(dict, "vquality_type_bitrate", TRUE);
+ ghb_settings_set_boolean(dict, "vquality_type_constant", FALSE);
 } break;
 case 2:
 {
- ghb_dict_insert(dict, g_strdup("vquality_type_bitrate"), 
- ghb_boolean_value_new(FALSE));
- ghb_dict_insert(dict, g_strdup("vquality_type_constant"), 
- ghb_boolean_value_new(TRUE));
+ ghb_settings_set_boolean(dict, "vquality_type_bitrate", FALSE);
+ ghb_settings_set_boolean(dict, "vquality_type_constant", TRUE);
 } break;
 default:
 {
- ghb_dict_insert(dict, g_strdup("vquality_type_bitrate"), 
- ghb_boolean_value_new(FALSE));
- ghb_dict_insert(dict, g_strdup("vquality_type_constant"), 
- ghb_boolean_value_new(TRUE));
+ ghb_settings_set_boolean(dict, "vquality_type_bitrate", FALSE);
+ ghb_settings_set_boolean(dict, "vquality_type_constant", TRUE);
 } break;
 }
 
- import_value_xlat(dict);
-
- GValue *mode = ghb_dict_lookup(dict, "VideoFramerateMode");
- if (mode == NULL)
+ const gchar *mode = ghb_settings_get_const_string(dict, "VideoFramerateMode");
+ if (strcmp(mode, "cfr") == 0)
 {
- GValue *fr = ghb_dict_lookup(dict, "VideoFramerate");
- if (fr)
- {
- gchar *str;
- gboolean pfr = FALSE;
- GValue *pfr_val = ghb_dict_lookup(dict, "VideoFrameratePFR");
- if (pfr_val)
- {
- pfr = ghb_value_boolean(pfr_val);
- }
- str = ghb_value_string(fr);
- if (strcmp(str, "source") == 0)
- {
- ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
- ghb_boolean_value_new(FALSE));
- ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
- ghb_boolean_value_new(TRUE));
- }
- else if (!pfr)
- {
- ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
- ghb_boolean_value_new(TRUE));
- ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
- ghb_boolean_value_new(FALSE));
- }
- else
- {
- ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
- ghb_boolean_value_new(FALSE));
- ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
- ghb_boolean_value_new(FALSE));
- }
- g_free(str);
- }
+ ghb_settings_set_boolean(dict, "VideoFramerateCFR", TRUE);
+ ghb_settings_set_boolean(dict, "VideoFrameratePFR", FALSE);
+ ghb_settings_set_boolean(dict, "VideoFramerateVFR", FALSE);
+ }
+ else if (strcmp(mode, "pfr") == 0)
+ {
+ ghb_settings_set_boolean(dict, "VideoFramerateCFR", FALSE);
+ ghb_settings_set_boolean(dict, "VideoFrameratePFR", TRUE);
+ ghb_settings_set_boolean(dict, "VideoFramerateVFR", FALSE);
 }
 else
 {
- gchar *str;
- str = ghb_value_string(mode);
- if (strcmp(str, "cfr") == 0)
- {
- ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
- ghb_boolean_value_new(TRUE));
- ghb_dict_insert(dict, g_strdup("VideoFrameratePFR"), 
- ghb_boolean_value_new(FALSE));
- ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
- ghb_boolean_value_new(FALSE));
- }
- else if (strcmp(str, "pfr") == 0)
- {
- ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
- ghb_boolean_value_new(FALSE));
- ghb_dict_insert(dict, g_strdup("VideoFrameratePFR"), 
- ghb_boolean_value_new(TRUE));
- ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
- ghb_boolean_value_new(FALSE));
- }
- else
- {
- ghb_dict_insert(dict, g_strdup("VideoFramerateCFR"), 
- ghb_boolean_value_new(FALSE));
- ghb_dict_insert(dict, g_strdup("VideoFrameratePFR"), 
- ghb_boolean_value_new(FALSE));
- ghb_dict_insert(dict, g_strdup("VideoFramerateVFR"), 
- ghb_boolean_value_new(TRUE));
- }
- g_free(str);
+ ghb_settings_set_boolean(dict, "VideoFramerateCFR", FALSE);
+ ghb_settings_set_boolean(dict, "VideoFrameratePFR", FALSE);
+ ghb_settings_set_boolean(dict, "VideoFramerateVFR", TRUE);
 }
 
- const char * const *preset = hb_x264_presets();
- if (ghb_value_boolean(preset_dict_get_value(dict, "x264UseAdvancedOptions")))
+ if (ghb_settings_get_boolean(dict, "x264UseAdvancedOptions"))
 {
 // Force preset/tune/profile/level/opts to conform to option string
- ghb_dict_insert(dict, g_strdup("x264Preset"),
- ghb_string_value_new("medium"));
- ghb_dict_insert(dict, g_strdup("x264Tune"),
- ghb_string_value_new("none"));
- ghb_dict_insert(dict, g_strdup("h264Profile"),
- ghb_string_value_new("auto"));
- ghb_dict_insert(dict, g_strdup("h264Level"),
- ghb_string_value_new("auto"));
- GValue *opt = ghb_dict_lookup(dict, "x264Option");
- ghb_dict_insert(dict, g_strdup("x264OptionExtra"),
- ghb_value_dup(opt));
+ ghb_settings_set_string(dict, "VideoPreset", "medium");
+ ghb_settings_set_string(dict, "VideoTune", "none");
+ ghb_settings_set_string(dict, "VideoProfile", "auto");
+ ghb_settings_set_string(dict, "VideoLevel", "auto");
+ ghb_settings_set_value(dict, "VideoOptionExtra",
+ ghb_settings_get_value(dict, "x264Option"));
 }
-
- GValue *x264Preset = ghb_dict_lookup(dict, "x264Preset");
- if (x264Preset != NULL)
+ else
 {
- gchar *str;
- str = ghb_value_string(x264Preset);
- int ii;
- for (ii = 0; preset[ii]; ii++)
- {
- if (!strcasecmp(str, preset[ii]))
- {
- ghb_dict_insert(dict, g_strdup("x264PresetSlider"),
- ghb_int_value_new(ii));
- }
- }
- g_free(str);
+ ghb_dict_remove(dict, "x264Option");
 }
+
+ int encoder = ghb_get_video_encoder(dict);
+ const char * const *videoPresets;
+ videoPresets = hb_video_encoder_get_presets(encoder);
+ const char *videoPreset;
+ if (ghb_dict_lookup(user_preset, "x264Preset") != NULL)
+ videoPreset = ghb_settings_get_const_string(dict, "x264Preset");
 else
+ videoPreset = ghb_settings_get_const_string(dict, "VideoPreset");
+ int ii;
+ for (ii = 0; videoPreset && videoPresets && videoPresets[ii]; ii++)
 {
- int ii;
- for (ii = 0; preset[ii]; ii++)
+ if (!strcasecmp(videoPreset, videoPresets[ii]))
 {
- if (!strcasecmp("medium", preset[ii]))
- {
- ghb_dict_insert(dict, g_strdup("x264PresetSlider"),
- ghb_int_value_new(ii));
- }
+ ghb_settings_set_int(dict, "VideoPresetSlider", ii);
 }
- ghb_dict_insert(dict, g_strdup("x264UseAdvancedOptions"),
- ghb_boolean_value_new(TRUE));
 }
+ if (videoPreset != NULL)
+ ghb_settings_set_string(dict, "VideoPreset", videoPreset);
 
- const char *x264Tune = dict_get_string(dict, "x264Tune");
- if (x264Tune != NULL)
+ char *videoTune;
+ if (ghb_dict_lookup(user_preset, "x264Tune") != NULL)
+ videoTune = ghb_settings_get_string(dict, "x264Tune");
+ else
+ videoTune = ghb_settings_get_string(dict, "VideoTune");
+ char *tune = NULL;
+ char *saveptr;
+ char * tok = strtok_r(videoTune, ",./-+", &saveptr);
+ ghb_settings_set_boolean(dict, "x264FastDecode", FALSE);
+ ghb_settings_set_boolean(dict, "x264ZeroLatency", FALSE);
+ while (tok != NULL)
 {
- char *tune = NULL;
- char *tmp = g_strdup(x264Tune);
- char *saveptr;
-
- char * tok = strtok_r(tmp, ",./-+", &saveptr);
- while (tok != NULL)
+ if (!strcasecmp(tok, "fastdecode"))
 {
- if (!strcasecmp(tok, "fastdecode"))
- {
- ghb_dict_insert(dict, g_strdup("x264FastDecode"),
- ghb_boolean_value_new(TRUE));
- }
- else if (!strcasecmp(tok, "zerolatency"))
- {
- ghb_dict_insert(dict, g_strdup("x264ZeroLatency"),
- ghb_boolean_value_new(TRUE));
- }
- else if (tune == NULL)
- {
- tune = g_strdup(tok);
- }
- else
- {
- ghb_log("Superfluous tunes! %s", tok);
- }
- tok = strtok_r(NULL, ",./-+", &saveptr);
+ ghb_settings_set_boolean(dict, "x264FastDecode", TRUE);
+ }
+ else if (!strcasecmp(tok, "zerolatency"))
+ {
+ ghb_settings_set_boolean(dict, "x264ZeroLatency", TRUE);
 }
- if (tune != NULL)
+ else if (tune == NULL)
 {
- ghb_dict_insert(dict, g_strdup("x264Tune"),
- ghb_string_value_new(tune));
- g_free(tune);
+ tune = g_strdup(tok);
 }
+ else
+ {
+ ghb_log("Superfluous tunes! %s", tok);
+ }
+ tok = strtok_r(NULL, ",./-+", &saveptr);
+ }
+ g_free(videoTune);
+ if (tune != NULL)
+ {
+ ghb_settings_set_string(dict, "VideoTune", tune);
+ g_free(tune);
+ }
+
+ const char *videoProfile;
+ if (ghb_dict_lookup(user_preset, "x264Profile") != NULL)
+ videoProfile = ghb_settings_get_const_string(dict, "x264Profile");
+ else
+ videoProfile = ghb_settings_get_const_string(dict, "VideoProfile");
+ if (videoProfile != NULL)
+ ghb_settings_set_string(dict, "VideoProfile", videoProfile);
+
+ const char *videoLevel;
+ if (ghb_dict_lookup(user_preset, "x264Level") != NULL)
+ videoLevel = ghb_settings_get_const_string(dict, "x264Level");
+ else
+ videoLevel = ghb_settings_get_const_string(dict, "VideoLevel");
+ if (videoLevel != NULL)
+ ghb_settings_set_string(dict, "VideoLevel", videoLevel);
+
+ if (ghb_dict_lookup(user_preset, "x264OptionExtra") != NULL)
+ {
+ const char *optionExtra;
+ optionExtra = ghb_settings_get_const_string(dict, "x264OptionExtra");
+ ghb_settings_set_string(dict, "VideoOptionExtra", optionExtra);
 }
+
+ return dict;
 }
 
 static void
@@ -2962,11 +2780,13 @@
 }
 else
 {
- import_xlat_preset(dict);
+ GValue *import_dict = import_xlat_preset(dict);
+ ghb_array_replace(presets, ii, import_dict);
 }
 }
 }
 
+// Translate internal values to preset key, value pairs
 static void
 export_xlat_preset(GValue *dict)
 {
@@ -2980,41 +2800,50 @@
 preset_dict_get_value(dict, "vquality_type_constant"));
 
 if (autoscale)
- ghb_dict_insert(dict, g_strdup("UsesPictureSettings"), 
+ {
+ ghb_dict_insert(dict, g_strdup("UsesPictureSettings"),
 ghb_int_value_new(2));
+ }
 else
- ghb_dict_insert(dict, g_strdup("UsesPictureSettings"), 
+ {
+ ghb_dict_insert(dict, g_strdup("UsesPictureSettings"),
 ghb_int_value_new(1));
+ }
 
 // VideoQualityType/0/1/2 - vquality_type_/target/bitrate/constant
 // *note: target is no longer used
 if (br)
 {
- ghb_dict_insert(dict, g_strdup("VideoQualityType"), 
+ ghb_dict_insert(dict, g_strdup("VideoQualityType"),
 ghb_int_value_new(1));
 }
 else if (constant)
 {
- ghb_dict_insert(dict, g_strdup("VideoQualityType"), 
+ ghb_dict_insert(dict, g_strdup("VideoQualityType"),
 ghb_int_value_new(2));
 }
 
 if (ghb_value_boolean(preset_dict_get_value(dict, "VideoFramerateCFR")))
 {
- ghb_dict_insert(dict, g_strdup("VideoFramerateMode"), 
+ ghb_dict_insert(dict, g_strdup("VideoFramerateMode"),
 ghb_string_value_new("cfr"));
 }
 else if (ghb_value_boolean(preset_dict_get_value(dict, "VideoFrameratePFR")))
 {
- ghb_dict_insert(dict, g_strdup("VideoFramerateMode"), 
+ ghb_dict_insert(dict, g_strdup("VideoFramerateMode"),
 ghb_string_value_new("pfr"));
 }
 else
 {
- ghb_dict_insert(dict, g_strdup("VideoFramerateMode"), 
+ ghb_dict_insert(dict, g_strdup("VideoFramerateMode"),
 ghb_string_value_new("vfr"));
 }
 
+ if (ghb_value_int(preset_dict_get_value(dict, "PictureDeblock")) < 5)
+ {
+ ghb_dict_insert(dict, g_strdup("PictureDeblock"), ghb_int_value_new(0));
+ }
+
 GValue *alist, *adict;
 gint count, ii;
 
@@ -3027,22 +2856,22 @@
 adict = ghb_array_get_nth(alist, ii);
 drc = ghb_value_double(
 preset_dict_get_value(adict, "AudioTrackDRCSlider"));
- if (drc < 1.0 && drc > 0.0)
+ if (drc < 1.0)
 {
- ghb_dict_insert(adict, g_strdup("AudioTrackDRCSlider"), 
+ ghb_dict_insert(adict, g_strdup("AudioTrackDRCSlider"),
 ghb_double_value_new(0.0));
 }
 }
 
 if (ghb_value_boolean(preset_dict_get_value(dict, "x264UseAdvancedOptions")))
 {
- ghb_dict_remove(dict, "x264Preset");
- ghb_dict_remove(dict, "x264Tune");
- ghb_dict_remove(dict, "h264Profile");
- ghb_dict_remove(dict, "h264Level");
- ghb_dict_remove(dict, "x264OptionExtra");
+ ghb_dict_remove(dict, "VideoPreset");
+ ghb_dict_remove(dict, "VideoTune");
+ ghb_dict_remove(dict, "VideoProfile");
+ ghb_dict_remove(dict, "VideoLevel");
+ ghb_dict_remove(dict, "VideoOptionExtra");
 }
- const char *tune = dict_get_string(dict, "x264Tune");
+ const char *tune = dict_get_string(dict, "VideoTune");
 if (tune != NULL)
 {
 GString *str = g_string_new("");
@@ -3058,30 +2887,17 @@
 g_string_append_printf(str, ",%s", "zerolatency");
 }
 tunes = g_string_free(str, FALSE);
- ghb_dict_insert(dict, g_strdup("x264Tune"), 
+ ghb_dict_insert(dict, g_strdup("VideoTune"),
 ghb_string_value_new(tunes));
 
 g_free(tunes);
 }
 
+ // Remove everything from dist that isn't in "Presets"
 GValue *internal;
- GHashTableIter iter;
- gchar *key;
- GValue *value;
- internal = plist_get_dict(internalPlist, "XlatPresets");
- ghb_dict_iter_init(&iter, internal);
- // middle (void*) cast prevents gcc warning "defreferencing type-punned
- // pointer will break strict-aliasing rules"
- while (g_hash_table_iter_next(
- &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value))
- {
- ghb_dict_remove(dict, key);
- }
-
- // remove obsolete keys
- ghb_dict_remove(dict, "UsesMaxPictureSettings");
- ghb_dict_remove(dict, "VFR");
- ghb_dict_remove(dict, "VideoFrameratePFR");
+ GValue *internalPlist = ghb_resource_get("internal-defaults");
+ internal = plist_get_dict(internalPlist, "Presets");
+ dict_clean(dict, internal);
 
 export_value_xlat(dict);
 }
@@ -3158,7 +2974,7 @@
 int *indices, len;
 
 g_debug("ghb_presets_reload()\n");
- std_presets = ghb_resource_get("standard-presets");
+ std_presets = ghb_value_dup(ghb_resource_get("standard-presets"));
 if (std_presets == NULL) return;
 
 remove_std_presets(ud);
@@ -3178,27 +2994,28 @@
 
 std_dict = ghb_array_get_nth(std_presets, ii);
 copy_dict = ghb_value_dup(std_dict);
- ghb_dict_insert(copy_dict, g_strdup("PresetBuildNumber"), 
+ ghb_dict_insert(copy_dict, g_strdup("PresetBuildNumber"),
 ghb_int64_value_new(hb_get_build(NULL)));
 ghb_presets_insert(presetsPlist, copy_dict, &indices, 1);
 presets_list_insert(ud, &indices, 1);
 }
 import_xlat_presets(presetsPlist);
 store_presets();
+ ghb_value_free(std_presets);
 }
 
 static gboolean
-check_old_presets()
+check_old_presets(GValue *presetsArray)
 {
 gint count, ii;
 
- count = ghb_array_len(presetsPlist);
+ count = ghb_array_len(presetsArray);
 for (ii = count-1; ii >= 0; ii--)
 {
 GValue *dict;
 GValue *type;
 
- dict = ghb_array_get_nth(presetsPlist, ii);
+ dict = ghb_array_get_nth(presetsArray, ii);
 type = ghb_dict_lookup(dict, "Type");
 if (type == NULL)
 return TRUE;
@@ -3207,36 +3024,42 @@
 }
 
 static void
-replace_standard_presets()
+replace_standard_presets(GValue *presetsArray)
 {
- GValue *std_presets;
+ GValue *std_presets, *tmp;
 int *indices, len;
 gint count, ii;
 
- count = ghb_array_len(presetsPlist);
+ // Remove existing standard presets
+ count = ghb_array_len(presetsArray);
 for (ii = count-1; ii >= 0; ii--)
 {
 GValue *dict;
 gint ptype;
 
- dict = ghb_array_get_nth(presetsPlist, ii);
+ dict = ghb_array_get_nth(presetsArray, ii);
 ptype = ghb_value_int(preset_dict_get_value(dict, "Type"));
 if (ptype == PRESETS_BUILTIN)
 {
 gint indices = 0;
- ghb_presets_remove(presetsPlist, &indices, 1);
+ ghb_presets_remove(presetsArray, &indices, 1);
 }
 }
 
- std_presets = ghb_resource_get("standard-presets");
- if (std_presets == NULL) return;
+ // Get the default standard presets
+ tmp = ghb_resource_get("standard-presets");
+ if (tmp == NULL) return;
+ std_presets = ghb_value_dup(tmp);
 
- indices = presets_find_default(presetsPlist, &len);
+ // Clear the default in the standard presets if one is already set
+ // in custom presets
+ indices = presets_find_default(presetsArray, &len);
 if (indices)
 {
 presets_clear_default(std_presets);
 g_free(indices);
 }
+
 // Merge the keyfile contents into our presets
 count = ghb_array_len(std_presets);
 for (ii = count-1; ii >= 0; ii--)
@@ -3247,20 +3070,19 @@
 
 std_dict = ghb_array_get_nth(std_presets, ii);
 copy_dict = ghb_value_dup(std_dict);
- ghb_dict_insert(copy_dict, g_strdup("PresetBuildNumber"), 
+ ghb_dict_insert(copy_dict, g_strdup("PresetBuildNumber"),
 ghb_int64_value_new(hb_get_build(NULL)));
- ghb_presets_insert(presetsPlist, copy_dict, &indices, 1);
+ ghb_presets_insert(presetsArray, copy_dict, &indices, 1);
 }
- import_xlat_presets(presetsPlist);
- store_presets();
+ ghb_value_free(std_presets);
 }
 
 static int
-update_standard_presets(signal_user_data_t *ud)
+update_standard_presets(signal_user_data_t *ud, GValue *presetsArray)
 {
 gint count, ii;
 
- count = ghb_array_len(presetsPlist);
+ count = ghb_array_len(presetsArray);
 for (ii = count-1; ii >= 0; ii--)
 {
 GValue *dict;
@@ -3268,15 +3090,15 @@
 gint64 build;
 gint type;
 
- dict = ghb_array_get_nth(presetsPlist, ii);
+ dict = ghb_array_get_nth(presetsArray, ii);
 gval = ghb_dict_lookup(dict, "Type");
 if (gval == NULL)
 {
 // Old preset that doesn't have a Type
- replace_standard_presets();
+ replace_standard_presets(presetsArray);
 return 1;
 }
- 
+
 type = ghb_value_int(gval);
 if (type == 0)
 {
@@ -3284,7 +3106,7 @@
 if (gval == NULL)
 {
 // Old preset that doesn't have a build number
- replace_standard_presets();
+ replace_standard_presets(presetsArray);
 return 1;
 }
 
@@ -3292,7 +3114,7 @@
 if (build != hb_get_build(NULL))
 {
 // Build number does not match
- replace_standard_presets();
+ replace_standard_presets(presetsArray);
 return 1;
 }
 }
@@ -3303,53 +3125,36 @@
 void
 ghb_presets_load(signal_user_data_t *ud)
 {
- // Create translation tables from libhb tables
- mix_xlat = create_mix_xlat_tbl(mix_xlat_compat, hb_audio_mixdowns, hb_audio_mixdowns_count);
- acodec_xlat = create_encoder_xlat_tbl(acodec_xlat_compat, hb_audio_encoders, hb_audio_encoders_count);
- vcodec_xlat = create_encoder_xlat_tbl(vcodec_xlat_compat, hb_video_encoders, hb_video_encoders_count);
-
- presetsPlist = load_plist("presets");
- if (presetsPlist == NULL)
+ gboolean store = FALSE;
+ presetsPlistFile = load_plist("presets");
+ if ((presetsPlistFile == NULL) ||
+ (G_VALUE_TYPE(presetsPlistFile) == ghb_dict_get_type()) ||
+ (check_old_presets(presetsPlistFile)))
 {
- presetsPlist = ghb_value_dup(ghb_resource_get("standard-presets"));
- import_xlat_presets(presetsPlist);
- store_presets();
- }
- else if (G_VALUE_TYPE(presetsPlist) == ghb_dict_get_type())
- { // Presets is older dictionary format. Convert to array
- ghb_value_free(presetsPlist);
- presetsPlist = ghb_value_dup(ghb_resource_get("standard-presets"));
- import_xlat_presets(presetsPlist);
- store_presets();
- }
- else if (check_old_presets())
- {
- ghb_value_free(presetsPlist);
- presetsPlist = ghb_value_dup(ghb_resource_get("standard-presets"));
- import_xlat_presets(presetsPlist);
- store_presets();
+ presetsPlistFile = ghb_resource_get("standard-presets");
+ store = TRUE;
 }
 else
 {
- if (!update_standard_presets(ud))
- import_xlat_presets(presetsPlist);
+ update_standard_presets(ud, presetsPlistFile);
 }
- 
+ presetsPlist = ghb_value_dup(presetsPlistFile);
+ import_xlat_presets(presetsPlist);
+ if (store)
+ store_presets();
+
 }
 
 static void
 settings_save(signal_user_data_t *ud, const GValue *path)
 {
- GValue *dict, *internal;
- GHashTableIter iter;
- gchar *key;
- GValue *value;
+ GValue *dict;
 gint *indices, len, count;
- gint *def_indices, def_len;
 const gchar *name;
 gboolean replace = FALSE;
 
 g_debug("settings_save");
+ GValue *internalPlist = ghb_resource_get("internal-defaults");
 if (internalPlist == NULL) return;
 count = ghb_array_len(path);
 name = g_value_get_string(ghb_array_get_nth(path, count-1));
@@ -3360,14 +3165,14 @@
 {
 gchar *message;
 message = g_strdup_printf(
- "%s: Folder already exists.\n"
- "You can not replace it with a preset.",
+ _("%s: Folder already exists.\n"
+ "You can not replace it with a preset."),
 name);
- ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+ ghb_message_dialog(GTK_MESSAGE_ERROR, message, _("Cancel"), NULL);
 g_free(message);
 return;
 }
- dict = ghb_dict_value_new();
+ dict = ghb_value_dup(ud->settings);
 ghb_presets_replace(presetsPlist, dict, indices, len);
 replace = TRUE;
 }
@@ -3376,7 +3181,7 @@
 indices = presets_find_pos(path, PRESETS_CUSTOM, &len);
 if (indices)
 {
- dict = ghb_dict_value_new();
+ dict = ghb_value_dup(ud->settings);
 ghb_presets_insert(presetsPlist, dict, indices, len);
 }
 else
@@ -3386,75 +3191,46 @@
 }
 }
 current_preset = dict;
- ghb_settings_set_int64(ud->settings, "Type", PRESETS_CUSTOM);
- ghb_settings_set_int64(ud->settings, "PresetBuildNumber", hb_get_build(NULL));
+ ghb_settings_set_int64(dict, "Type", PRESETS_CUSTOM);
+ ghb_settings_set_int64(dict, "PresetBuildNumber", hb_get_build(NULL));
 
- internal = plist_get_dict(internalPlist, "Presets");
- ghb_dict_iter_init(&iter, internal);
- // middle (void*) cast prevents gcc warning "defreferencing type-punned
- // pointer will break strict-aliasing rules"
- while (g_hash_table_iter_next(
- &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value))
- {
- const GValue *gval;
-
- gval = ghb_settings_get_value(ud->settings, key);
- if (gval == NULL)
- {
- continue;
- }
- ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(gval));
- }
- internal = plist_get_dict(internalPlist, "XlatPresets");
- ghb_dict_iter_init(&iter, internal);
- // middle (void*) cast prevents gcc warning "defreferencing type-punned
- // pointer will break strict-aliasing rules"
- while (g_hash_table_iter_next(
- &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value))
- {
- const GValue *gval;
-
- gval = ghb_settings_get_value(ud->settings, key);
- if (gval == NULL)
- {
- continue;
- }
- ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(gval));
- }
 ghb_dict_insert(dict, g_strdup("PresetName"), ghb_string_value_new(name));
 if (replace)
 {
+ gint *def_indices, def_len;
 def_indices = presets_find_default(presetsPlist, &def_len);
- if (def_indices != NULL && 
+ if (def_indices != NULL &&
 preset_path_cmp(indices, len, def_indices, def_len) != 0)
 {
- ghb_dict_insert(dict, g_strdup("Default"), 
+ ghb_dict_insert(dict, g_strdup("Default"),
 ghb_boolean_value_new(FALSE));
 }
 presets_list_update_item(ud, indices, len, FALSE);
+ g_free(def_indices);
 }
 else
 {
- ghb_dict_insert(dict, g_strdup("Default"), 
+ ghb_dict_insert(dict, g_strdup("Default"),
 ghb_boolean_value_new(FALSE));
 presets_list_insert(ud, indices, len);
 }
- if (!ghb_settings_get_boolean( ud->settings, "PictureWidthEnable"))
+ if (!ghb_settings_get_boolean(ud->settings, "PictureWidthEnable"))
 {
 ghb_dict_remove(dict, "PictureWidth");
 }
- if (!ghb_settings_get_boolean( ud->settings, "PictureHeightEnable"))
+ if (!ghb_settings_get_boolean(ud->settings, "PictureHeightEnable"))
 {
 ghb_dict_remove(dict, "PictureHeight");
 }
- ghb_dict_insert(dict, g_strdup("autoscale"), 
+ ghb_dict_insert(dict, g_strdup("autoscale"),
 ghb_boolean_value_new(
- !ghb_settings_get_boolean( ud->settings, "PictureWidthEnable") &&
- !ghb_settings_get_boolean( ud->settings, "PictureHeightEnable")
+ !ghb_settings_get_boolean(ud->settings, "PictureWidthEnable") &&
+ !ghb_settings_get_boolean(ud->settings, "PictureHeightEnable")
 )
 );
 
 store_presets();
+
 ud->dont_clear_presets = TRUE;
 // Make the new preset the selected item
 ghb_select_preset2(ud->builder, indices, len);
@@ -3479,17 +3255,17 @@
 {
 gchar *message;
 message = g_strdup_printf(
- "%s: Preset already exists.\n"
- "You can not replace it with a folder.",
+ _("%s: Preset already exists.\n"
+ "You can not replace it with a folder."),
 name);
- ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+ ghb_message_dialog(GTK_MESSAGE_ERROR, message, _("Cancel"), NULL);
 g_free(message);
 g_free(indices);
 return;
 }
 // Already exists, update its description
 dict = presets_get_dict(presetsPlist, indices, len);
- ghb_dict_insert(dict, g_strdup("PresetDescription"), 
+ ghb_dict_insert(dict, g_strdup("PresetDescription"),
 ghb_value_dup(preset_dict_get_value(
 ud->settings, "PresetDescription")));
 presets_list_update_item(ud, indices, len, FALSE);
@@ -3511,7 +3287,7 @@
 return;
 }
 }
- ghb_dict_insert(dict, g_strdup("PresetDescription"), 
+ ghb_dict_insert(dict, g_strdup("PresetDescription"),
 ghb_value_dup(preset_dict_get_value(
 ud->settings, "PresetDescription")));
 ghb_dict_insert(dict, g_strdup("PresetName"), ghb_string_value_new(name));
@@ -3528,15 +3304,15 @@
 }
 
 void
-ghb_presets_list_default(signal_user_data_t *ud)
+ghb_presets_list_show_default(signal_user_data_t *ud)
 {
 GtkTreeView *treeview;
 GtkTreePath *treepath;
 GtkTreeIter iter;
 GtkTreeStore *store;
 gint *indices, len;
- 
- g_debug("ghb_presets_list_default ()");
+
+ g_debug("ghb_presets_list_show_default()");
 treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
 store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
 indices = presets_find_default(presetsPlist, &len);
@@ -3546,8 +3322,8 @@
 {
 if (gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath))
 {
- gtk_tree_store_set(store, &iter, 
- 1, 800, 
+ gtk_tree_store_set(store, &iter,
+ 1, 800,
 2, 2 ,
 -1);
 }
@@ -3564,7 +3340,7 @@
 GtkTreeIter iter;
 GtkTreeStore *store;
 gint *indices, len;
- 
+
 g_debug("ghb_presets_list_clear_default ()");
 treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
 store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
@@ -3575,8 +3351,8 @@
 {
 if (gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath))
 {
- gtk_tree_store_set(store, &iter, 
- 1, 400, 
+ gtk_tree_store_set(store, &iter,
+ 1, 400,
 2, 0 ,
 -1);
 }
@@ -3586,16 +3362,6 @@
 }
 
 static void
-update_audio_presets(signal_user_data_t *ud)
-{
- g_debug("update_audio_presets");
- const GValue *audio_list;
-
- audio_list = ghb_settings_get_value(ud->settings, "audio_list");
- ghb_settings_set_value(ud->settings, "AudioList", audio_list);
-}
-
-static void
 update_subtitle_presets(signal_user_data_t *ud)
 {
 g_debug("update_subtitle_presets");
@@ -3620,21 +3386,11 @@
 }
 
 G_MODULE_EXPORT void
-presets_menu_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
- GtkMenu *menu;
-
- menu = GTK_MENU(GHB_WIDGET(ud->builder, "presets_menu"));
- gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 1, 
- gtk_get_current_event_time());
-}
-
-G_MODULE_EXPORT void
 preset_import_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
 GtkWidget *dialog;
 GtkResponseType response;
- gchar *exportDir;
+ const gchar *exportDir;
 gchar *filename;
 GtkFileFilter *filter;
 
@@ -3642,28 +3398,27 @@
 
 dialog = gtk_file_chooser_dialog_new("Import Preset", NULL,
 GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ GHB_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GHB_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
 NULL);
 
 filter = gtk_file_filter_new();
- gtk_file_filter_set_name(filter, "All (*)");
+ gtk_file_filter_set_name(filter, _("All (*)"));
 gtk_file_filter_add_pattern(filter, "*");
 gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
 
 filter = gtk_file_filter_new();
- gtk_file_filter_set_name(filter, "Presets (*.plist)");
+ gtk_file_filter_set_name(filter, _("Presets (*.plist)"));
 gtk_file_filter_add_pattern(filter, "*.plist");
 gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
 gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter);
 
- exportDir = ghb_settings_get_string(ud->settings, "ExportDirectory");
+ exportDir = ghb_settings_get_const_string(ud->prefs, "ExportDirectory");
 if (exportDir == NULL || exportDir[0] == '\0')
 {
- exportDir = g_strdup(".");
+ exportDir = ".";
 }
 gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), exportDir);
- g_free(exportDir);
 
 response = gtk_dialog_run(GTK_DIALOG(dialog));
 gtk_widget_hide(dialog);
@@ -3722,24 +3477,50 @@
 ghb_presets_insert(presetsPlist, ghb_value_dup(dict), indices, len);
 presets_list_insert(ud, indices, len);
 ghb_value_free(path);
+ g_free(indices);
 }
 ghb_value_free(array);
 
- exportDir = ghb_settings_get_string(ud->settings, "ExportDirectory");
+ exportDir = ghb_settings_get_const_string(ud->prefs, "ExportDirectory");
 dir = g_path_get_dirname(filename);
 if (strcmp(dir, exportDir) != 0)
 {
- ghb_settings_set_string(ud->settings, "ExportDirectory", dir);
- ghb_pref_save(ud->settings, "ExportDirectory");
+ ghb_settings_set_string(ud->prefs, "ExportDirectory", dir);
+ ghb_pref_save(ud->prefs, "ExportDirectory");
 }
 g_free(filename);
- g_free(exportDir);
 g_free(dir);
 store_presets();
 }
 gtk_widget_destroy(dialog);
 }
 
+GValue*
+get_selected_path(signal_user_data_t *ud)
+{
+ GtkTreeView *treeview;
+ GtkTreeSelection *selection;
+ GtkTreeModel *store;
+ GtkTreeIter iter;
+
+ treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
+ selection = gtk_tree_view_get_selection(treeview);
+ if (gtk_tree_selection_get_selected(selection, &store, &iter))
+ {
+ GtkTreePath *treepath;
+ gint *indices, len;
+ GValue *path;
+
+ treepath = gtk_tree_model_get_path(store, &iter);
+ indices = gtk_tree_path_get_indices(treepath);
+ len = gtk_tree_path_get_depth(treepath);
+
+ path = preset_path_from_indices(presetsPlist, indices, len);
+ return path;
+ }
+ return NULL;
+}
+
 G_MODULE_EXPORT void
 preset_export_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
@@ -3748,40 +3529,45 @@
 GValue *preset;
 const gchar *name = "";
 gint count, *indices, len;
- gchar *exportDir;
+ const gchar *exportDir;
 gchar *filename;
 
 g_debug("preset_export_clicked_cb ()");
- preset = ghb_settings_get_value (ud->settings, "preset_selection");
+ preset = get_selected_path(ud);
 if (preset == NULL)
 return;
 
 count = ghb_array_len(preset);
 if (count <= 0)
+ {
+ ghb_value_free(preset);
 return;
+ }
 
 name = g_value_get_string(ghb_array_get_nth(preset, count-1));
 
- dialog = gtk_file_chooser_dialog_new("Export Preset", NULL,
+ dialog = gtk_file_chooser_dialog_new(_("Export Preset"), NULL,
 GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ GHB_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GHB_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
 NULL);
 
- exportDir = ghb_settings_get_string(ud->settings, "ExportDirectory");
+ exportDir = ghb_settings_get_const_string(ud->prefs, "ExportDirectory");
 if (exportDir == NULL || exportDir[0] == '\0')
 {
- exportDir = g_strdup(".");
+ exportDir = ".";
 }
 filename = g_strdup_printf("%s.plist", name);
 gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), exportDir);
 gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), filename);
 g_free(filename);
- g_free(exportDir);
 
 indices = ghb_preset_indices_from_path(presetsPlist, preset, &len);
 if (indices == NULL)
+ {
+ ghb_value_free(preset);
 return;
+ }
 
 response = gtk_dialog_run(GTK_DIALOG(dialog));
 gtk_widget_hide(dialog);
@@ -3811,19 +3597,19 @@
 }
 ghb_value_free(array);
 
- exportDir = ghb_settings_get_string(ud->settings, "ExportDirectory");
+ exportDir = ghb_settings_get_const_string(ud->prefs, "ExportDirectory");
 dir = g_path_get_dirname(filename);
 if (strcmp(dir, exportDir) != 0)
 {
- ghb_settings_set_string(ud->settings, "ExportDirectory", dir);
- ghb_pref_save(ud->settings, "ExportDirectory");
+ ghb_settings_set_string(ud->prefs, "ExportDirectory", dir);
+ ghb_pref_save(ud->prefs, "ExportDirectory");
 }
- g_free(exportDir);
 g_free(dir);
 g_free(filename);
 }
 gtk_widget_destroy(dialog);
 g_free(indices);
+ ghb_value_free(preset);
 }
 
 G_MODULE_EXPORT void
@@ -3839,8 +3625,7 @@
 gint count, *indices, len;
 
 g_debug("presets_new_folder_clicked_cb ()");
- preset = ghb_settings_get_value (ud->settings, "preset_selection");
-
+ preset = get_selected_path(ud);
 count = ghb_array_len(preset);
 if (count > 0)
 name = g_value_get_string(ghb_array_get_nth(preset, count-1));
@@ -3888,8 +3673,8 @@
 folder_save(ud, dest);
 ghb_value_free(dest);
 }
- if (indices != NULL)
- g_free(indices);
+ g_free(indices);
+ ghb_value_free(preset);
 }
 
 G_MODULE_EXPORT void
@@ -3904,7 +3689,9 @@
 gint count, *indices, len;
 
 g_debug("presets_save_clicked_cb ()");
- preset = ghb_settings_get_value (ud->settings, "preset_selection");
+ preset = get_selected_path(ud);
+ if (preset == NULL)
+ preset = ghb_value_dup(ghb_settings_get_value(ud->settings, "preset"));
 
 count = ghb_array_len(preset);
 if (count > 0)
@@ -3916,10 +3703,8 @@
 int width = ghb_settings_get_int(ud->settings, "PictureWidth");
 int height = ghb_settings_get_int(ud->settings, "PictureHeight");
 gboolean autoscale = ghb_settings_get_boolean(ud->settings, "autoscale");
- ghb_ui_update(ud, "PictureWidthEnable", 
- ghb_boolean_value(width!=0&&!autoscale));
- ghb_ui_update(ud, "PictureHeightEnable", 
- ghb_boolean_value(height!=0&&!autoscale));
+ ghb_ui_update(ud, "PictureWidthEnable", ghb_boolean_value(!autoscale));
+ ghb_ui_update(ud, "PictureHeightEnable", ghb_boolean_value(!autoscale));
 if (!width)
 {
 width = ghb_settings_get_int(ud->settings, "scale_width");
@@ -3958,12 +3743,11 @@
 
 ghb_widget_to_setting(ud->settings, GTK_WIDGET(desc));
 
- // Construct the audio settings presets from the current audio list
- update_audio_presets(ud);
 update_subtitle_presets(ud);
 settings_save(ud, dest);
 ghb_value_free(dest);
 }
+ ghb_value_free(preset);
 }
 
 G_MODULE_EXPORT void
@@ -3982,7 +3766,7 @@
 ghb_presets_reload(ud);
 // Updating the presets list shuffles things around
 // need to make sure the proper preset is selected
- preset = ghb_settings_get_value (ud->settings, "preset");
+ preset = ghb_settings_get_value(ud->settings, "preset");
 ghb_select_preset(ud->builder, preset);
 }
 
@@ -4014,8 +3798,8 @@
 folder = ghb_presets_get_folder(presetsPlist, indices, len);
 dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
 GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
- "Confirm deletion of %s:\n\n%s", 
- folder ? "folder" : "preset",
+ _("Confirm deletion of %s:\n\n%s"),
+ folder ? _("folder") : _("preset"),
 preset);
 response = gtk_dialog_run(GTK_DIALOG(dialog));
 gtk_widget_destroy (dialog);
@@ -4042,15 +3826,18 @@
 valid = gtk_tree_model_get_iter_first(store, &nextIter);
 if (valid)
 {
- gtk_tree_path_free(path);
+ GtkTreePath *path;
+ gint *indices;
+
 path = gtk_tree_model_get_path(store, &nextIter);
 indices = gtk_tree_path_get_indices(path);
 len = gtk_tree_path_get_depth(path);
 ghb_select_preset2(ud->builder, indices, len);
+ gtk_tree_path_free(path);
 }
 }
- g_free(preset);
 gtk_tree_path_free(path);
+ g_free(preset);
 }
 }
 
@@ -4128,6 +3915,7 @@
 len = gtk_tree_path_get_depth(path);
 dst_ptype = ghb_presets_get_type(presetsPlist, indices, len);
 dst_folder = ghb_presets_get_folder(presetsPlist, indices, len);
+
 // Don't allow mixing custom presets in the builtins
 if (dst_ptype != PRESETS_CUSTOM)
 {
@@ -4137,7 +3925,7 @@
 
 // Only allow *drop into* for folders
 if (!dst_folder)
- { 
+ {
 if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
 drop_pos = GTK_TREE_VIEW_DROP_BEFORE;
 if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER)
@@ -4151,13 +3939,13 @@
 return TRUE;
 }
 
-G_MODULE_EXPORT void 
+G_MODULE_EXPORT void
 presets_drag_cb(
- GtkTreeView *dstwidget, 
- GdkDragContext *dc, 
- gint x, gint y, 
- GtkSelectionData *selection_data, 
- guint info, guint t, 
+ GtkTreeView *dstwidget,
+ GdkDragContext *dc,
+ gint x, gint y,
+ GtkSelectionData *selection_data,
+ guint info, guint t,
 signal_user_data_t *ud)
 {
 GtkTreePath *path = NULL;
@@ -4166,9 +3954,9 @@
 gint *dst_indices, dst_len, *src_indices, src_len;
 gint src_ptype;
 gboolean src_folder, dst_folder;
- 
+
 GtkTreeModel *dstmodel = gtk_tree_view_get_model(dstwidget);
- 
+
 g_debug("preset_drag_cb ()");
 // This doesn't work here for some reason...
 // gtk_tree_view_get_drag_dest_row(dstwidget, &path, &drop_pos);
@@ -4235,9 +4023,10 @@
 dst_indices = gtk_tree_path_get_indices(path);
 dst_len = gtk_tree_path_get_depth(path);
 dst_folder = ghb_presets_get_folder(presetsPlist, dst_indices, dst_len);
+
 // Only allow *drop into* for folders
 if (!dst_folder)
- { 
+ {
 if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
 drop_pos = GTK_TREE_VIEW_DROP_BEFORE;
 if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER)
@@ -4251,22 +4040,22 @@
 switch (drop_pos)
 {
 case GTK_TREE_VIEW_DROP_BEFORE:
- gtk_tree_store_insert_before(GTK_TREE_STORE (dstmodel), 
+ gtk_tree_store_insert_before(GTK_TREE_STORE (dstmodel),
 &iter, NULL, &dstiter);
 break;
 
 case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
- gtk_tree_store_insert(GTK_TREE_STORE (dstmodel), 
+ gtk_tree_store_insert(GTK_TREE_STORE (dstmodel),
 &iter, &dstiter, 0);
 break;
 
 case GTK_TREE_VIEW_DROP_AFTER:
- gtk_tree_store_insert_after(GTK_TREE_STORE (dstmodel), 
+ gtk_tree_store_insert_after(GTK_TREE_STORE (dstmodel),
 &iter, NULL, &dstiter);
 break;
 
 case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
- gtk_tree_store_insert_after(GTK_TREE_STORE (dstmodel), 
+ gtk_tree_store_insert_after(GTK_TREE_STORE (dstmodel),
 &iter, &dstiter, 0);
 break;
 
@@ -4302,9 +4091,9 @@
 
 void
 presets_row_expanded_cb(
- GtkTreeView *treeview, 
- GtkTreeIter *iter, 
- GtkTreePath *path, 
+ GtkTreeView *treeview,
+ GtkTreeIter *iter,
+ GtkTreePath *path,
 signal_user_data_t *ud)
 {
 gint *indices, len;
@@ -4318,7 +4107,9 @@
 if (preset_folder_is_open(dict))
 {
 if (expanded)
+ {
 return;
+ }
 }
 else if (!expanded)
 {
@@ -4356,111 +4147,54 @@
 store_presets();
 }
 
-static void
-preset_update_title_deps(signal_user_data_t *ud, hb_title_t *title)
+GValue*
+ghb_get_current_preset(signal_user_data_t *ud)
 {
- GtkWidget *widget;
+ GtkTreeView *tv;
+ GtkTreeModel *tm;
+ GtkTreeSelection *ts;
+ GtkTreeIter ti;
+ GValue *preset = NULL;
+
+ tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
+ ts = gtk_tree_view_get_selection(tv);
+ if (gtk_tree_selection_get_selected(ts, &tm, &ti))
+ {
+ GtkTreePath *tp;
+ gint *indices, len;
 
- ghb_ui_update(ud, "scale_width", 
- ghb_int64_value(title->width - title->crop[2] - title->crop[3]));
- // If anamorphic or keep_aspect, the hight will be automatically calculated
- gboolean keep_aspect;
- gint pic_par;
- keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio");
- pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR");
- if (!(keep_aspect || pic_par) || pic_par == 3)
- {
- ghb_ui_update(ud, "scale_height", 
- ghb_int64_value(title->height - title->crop[0] - title->crop[1]));
- }
-
- // Set the limits of cropping. hb_set_anamorphic_size crashes if
- // you pass it a cropped width or height == 0.
- gint bound;
- bound = title->height / 2 - 2;
- widget = GHB_WIDGET (ud->builder, "PictureTopCrop");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
- widget = GHB_WIDGET (ud->builder, "PictureBottomCrop");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
- bound = title->width / 2 - 2;
- widget = GHB_WIDGET (ud->builder, "PictureLeftCrop");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
- widget = GHB_WIDGET (ud->builder, "PictureRightCrop");
- gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
- if (ghb_settings_get_boolean(ud->settings, "PictureAutoCrop"))
- {
- ghb_ui_update(ud, "PictureTopCrop", ghb_int64_value(title->crop[0]));
- ghb_ui_update(ud, "PictureBottomCrop", ghb_int64_value(title->crop[1]));
- ghb_ui_update(ud, "PictureLeftCrop", ghb_int64_value(title->crop[2]));
- ghb_ui_update(ud, "PictureRightCrop", ghb_int64_value(title->crop[3]));
+ tp = gtk_tree_model_get_path(tm, &ti);
+ indices = gtk_tree_path_get_indices(tp);
+ len = gtk_tree_path_get_depth(tp);
+ preset = presets_get_dict(presetsPlist, indices, len);
+ gtk_tree_path_free(tp);
 }
+ return preset;
 }
 
-void
-ghb_refresh_preset(signal_user_data_t *ud)
+GValue*
+ghb_get_current_preset_path(signal_user_data_t *ud)
 {
- GValue *preset;
- gint *indices, len;
-
- g_debug("ghb_refresh_preset ()");
- preset = ghb_settings_get_value(ud->settings, "preset_selection");
- indices = ghb_preset_indices_from_path(presetsPlist, preset, &len);
- if (indices)
+ GtkTreeView *tv;
+ GtkTreeModel *tm;
+ GtkTreeSelection *ts;
+ GtkTreeIter ti;
+ GValue *path = NULL;
+
+ tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
+ ts = gtk_tree_view_get_selection(tv);
+ if (gtk_tree_selection_get_selected(ts, &tm, &ti))
 {
- gboolean folder;
+ GtkTreePath *tp;
+ gint *indices, len;
 
- folder = ghb_presets_get_folder(presetsPlist, indices, len);
- if (!folder)
- {
- ud->dont_clear_presets = TRUE;
- ud->scale_busy = TRUE;
- // Temporarily set the video_quality range to (0,100)
- // This is needed so the video_quality value does not get
- // truncated when set. The range will be readjusted below
- GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
- gtk_range_set_range (GTK_RANGE(qp), 0, 100);
- gtk_scale_set_digits(GTK_SCALE(qp), 3);
- ghb_set_preset_from_indices(ud, indices, len);
- gint titleindex;
- titleindex = ghb_settings_combo_int(ud->settings, "title");
- ghb_set_pref_audio_settings(titleindex, ud->settings);
- ghb_set_pref_audio_from_settings(ud, ud->settings);
- ghb_set_pref_subtitle(titleindex, ud);
- ghb_settings_set_boolean(ud->settings, "preset_modified", FALSE);
- hb_title_t * title = ghb_get_title_info(titleindex);
- if (title != NULL)
- {
- preset_update_title_deps(ud, title);
- }
- ud->scale_busy = FALSE;
- ghb_set_scale (ud, GHB_PIC_KEEP_PAR|GHB_PIC_USE_MAX);
- ud->dont_clear_presets = FALSE;
-
- gdouble vqmin, vqmax, step, page;
- gint digits;
- gboolean inverted;
-
- ghb_vquality_range(ud, &vqmin, &vqmax, &step, 
- &page, &digits, &inverted);
- gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
- gtk_range_set_increments (GTK_RANGE(qp), step, page);
- gtk_scale_set_digits(GTK_SCALE(qp), digits);
- gtk_range_set_inverted (GTK_RANGE(qp), inverted);
-
- gchar *text;
- gint crop[4];
- GtkWidget *crop_widget;
- crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
- crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
- crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
- crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
- crop_widget = GHB_WIDGET (ud->builder, "crop_values");
- text = g_strdup_printf("%d:%d:%d:%d", 
- crop[0], crop[1], crop[2], crop[3]);
- gtk_label_set_text (GTK_LABEL(crop_widget), text);
- g_free(text);
- }
+ tp = gtk_tree_model_get_path(tm, &ti);
+ indices = gtk_tree_path_get_indices(tp);
+ len = gtk_tree_path_get_depth(tp);
+ path = preset_path_from_indices(presetsPlist, indices, len);
+ gtk_tree_path_free(tp);
 }
+ return path;
 }
 
 G_MODULE_EXPORT void
@@ -4469,97 +4203,37 @@
 GtkTreeModel *store;
 GtkTreeIter iter;
 GtkWidget *widget;
- 
+
 g_debug("presets_list_selection_changed_cb ()");
 widget = GHB_WIDGET (ud->builder, "presets_remove");
 if (gtk_tree_selection_get_selected(selection, &store, &iter))
 {
 GtkTreePath *treepath;
 gint *indices, len;
- GValue *path;
 gboolean folder;
 
 treepath = gtk_tree_model_get_path(store, &iter);
 indices = gtk_tree_path_get_indices(treepath);
 len = gtk_tree_path_get_depth(treepath);
 
- path = preset_path_from_indices(presetsPlist, indices, len);
- ghb_settings_take_value(ud->settings, "preset_selection", path);
-
 folder = ghb_presets_get_folder(presetsPlist, indices, len);
- if (!folder)
+ if (!folder && !ghb_settings_get_boolean(ud->settings, "preset_reload"))
 {
- ud->dont_clear_presets = TRUE;
- ud->scale_busy = TRUE;
- // Temporarily set the video_quality range to (0,100)
- // This is needed so the video_quality value does not get
- // truncated when set. The range will be readjusted below
- GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
- gtk_range_set_range (GTK_RANGE(qp), 0, 100);
- gtk_scale_set_digits(GTK_SCALE(qp), 3);
- ghb_set_preset_from_indices(ud, indices, len);
- gint titleindex;
- titleindex = ghb_settings_combo_int(ud->settings, "title");
- ghb_set_pref_audio_settings(titleindex, ud->settings);
- ghb_set_pref_audio_from_settings(ud, ud->settings);
- ghb_set_pref_subtitle(titleindex, ud);
+ ghb_set_preset_settings_from_indices(ud, indices, len);
 ghb_settings_set_boolean(ud->settings, "preset_modified", FALSE);
- hb_title_t * title = ghb_get_title_info(titleindex);
- if (title != NULL)
- {
- preset_update_title_deps(ud, title);
- }
- ud->scale_busy = FALSE;
- ghb_set_scale (ud, GHB_PIC_KEEP_PAR|GHB_PIC_USE_MAX);
- ud->dont_clear_presets = FALSE;
-
- gdouble vqmin, vqmax, step, page;
- gint digits;
- gboolean inverted;
-
- ghb_vquality_range(ud, &vqmin, &vqmax, &step, 
- &page, &digits, &inverted);
- gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
- gtk_range_set_increments (GTK_RANGE(qp), step, page);
- gtk_scale_set_digits(GTK_SCALE(qp), digits);
- gtk_range_set_inverted (GTK_RANGE(qp), inverted);
-
- gchar *text;
- gint crop[4];
- GtkWidget *crop_widget;
- crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
- crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
- crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
- crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
- crop_widget = GHB_WIDGET (ud->builder, "crop_values");
- text = g_strdup_printf("%d:%d:%d:%d", 
- crop[0], crop[1], crop[2], crop[3]);
- gtk_label_set_text (GTK_LABEL(crop_widget), text);
- g_free(text);
+ ghb_set_current_title_settings(ud);
+ ghb_load_settings(ud);
 }
+ ghb_settings_set_boolean(ud->settings, "preset_reload", FALSE);
+
 gtk_tree_path_free(treepath);
 gtk_widget_set_sensitive(widget, TRUE);
 }
 else
 {
- g_debug("No selection??? Perhaps unselected.");
+ g_debug(_("No selection??? Perhaps unselected."));
 gtk_widget_set_sensitive(widget, FALSE);
 }
- if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
- {
- gint start, end;
- start = ghb_settings_get_int(ud->settings, "start_point");
- end = ghb_settings_get_int(ud->settings, "end_point");
- widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
- gtk_widget_set_sensitive(widget, TRUE);
- if (start == end)
- {
- ud->dont_clear_presets = TRUE;
- ghb_ui_update(ud, "ChapterMarkers", ghb_boolean_value(FALSE));
- ud->dont_clear_presets = FALSE;
- gtk_widget_set_sensitive(widget, FALSE);
- }
- }
 }
 
 void
@@ -4567,7 +4241,7 @@
 {
 GtkTreeView *treeview;
 GtkTreeSelection *selection;
- 
+
 if (ud->dont_clear_presets) return;
 g_debug("ghb_clear_presets_selection()");
 treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
@@ -4583,7 +4257,7 @@
 GtkTreeSelection *selection;
 GtkTreeModel *store;
 GtkTreeIter iter;
- 
+
 treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
 selection = gtk_tree_view_get_selection(treeview);
 if (gtk_tree_selection_get_selected(selection, &store, &iter))
@@ -4603,7 +4277,7 @@
 gint *indices, len;
 
 g_debug("presets_default_clicked_cb ()");
- preset = ghb_settings_get_value(ud->settings, "preset_selection");
+ preset = get_selected_path(ud);
 indices = ghb_preset_indices_from_path(presetsPlist, preset, &len);
 if (indices)
 {
@@ -4611,17 +4285,18 @@
 {
 ghb_presets_list_clear_default(ud);
 presets_set_default(indices, len);
- ghb_presets_list_default(ud);
+ ghb_presets_list_show_default(ud);
 }
 g_free(indices);
 }
+ ghb_value_free(preset);
 }
 
 G_MODULE_EXPORT void
 preset_edited_cb(
- GtkCellRendererText *cell, 
- gchar *path, 
- gchar *text, 
+ GtkCellRendererText *cell,
+ gchar *path,
+ gchar *text,
 signal_user_data_t *ud)
 {
 GtkTreePath *treepath;
@@ -4631,12 +4306,12 @@
 gint *indices, len, count;
 GValue *dict;
 GValue *preset, *dest;
- 
+
 g_debug("preset_edited_cb ()");
 g_debug("path (%s)", path);
 g_debug("text (%s)", text);
 
- preset = ghb_settings_get_value (ud->settings, "preset_selection");
+ preset = get_selected_path(ud);
 dest = ghb_array_value_new(MAX_NESTED_PRESET);
 count = ghb_array_len(preset);
 ghb_array_copy(dest, preset, count-1);
@@ -4647,6 +4322,7 @@
 {
 // Already exists
 g_free(indices);
+ ghb_value_free(preset);
 return;
 }
 
@@ -4662,5 +4338,13 @@
 ghb_dict_insert(dict, g_strdup("PresetName"), ghb_string_value_new(text));
 store_presets();
 gtk_tree_path_free (treepath);
+ ghb_value_free(preset);
+}
+
+G_MODULE_EXPORT void
+preset_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ ghb_widget_to_setting(ud->settings, widget);
+ ghb_check_dependency(ud, widget, NULL);
 }

HandBrake-0.9.9.tar.bz2/gtk/src/presets.h -> HandBrake-0.10.0.tar.bz2/gtk/src/presets.h Changed

@@ -3,12 +3,12 @@
  * 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.
- * 
+ *
  * This program 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 Library General Public License for more details.
- * 
+ *
  * 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., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
@@ -19,12 +19,15 @@
 void ghb_settings_save(signal_user_data_t *ud, const gchar *name);
 void ghb_presets_load(signal_user_data_t *ud);
 void ghb_update_from_preset(signal_user_data_t *ud, const gchar *key);
-void ghb_prefs_load(signal_user_data_t *ud);
-void ghb_settings_init(signal_user_data_t *ud);
+void ghb_settings_init(GValue *settings, const char *name);
 void ghb_settings_close();
+void ghb_globals_to_ui(signal_user_data_t *ud);
+void ghb_prefs_load(signal_user_data_t *ud);
 void ghb_prefs_to_ui(signal_user_data_t *ud);
 void ghb_prefs_save(GValue *settings);
 void ghb_pref_save(GValue *settings, const gchar *key);
+void ghb_pref_set(GValue *settings, const gchar *key);
+void ghb_prefs_store(void);
 void ghb_save_queue(GValue *queue);
 GValue* ghb_load_queue();
 GValue* ghb_load_old_queue(int pid);
@@ -33,19 +36,20 @@
 gchar* ghb_get_user_config_dir(gchar *subdir);
 void ghb_settings_to_ui(signal_user_data_t *ud, GValue *dict);
 void ghb_clear_presets_selection(signal_user_data_t *ud);
-void ghb_select_preset(GtkBuilder *builder, 
-        const GValue *preset);
+void ghb_select_preset(GtkBuilder *builder, const GValue *preset);
 void ghb_select_default_preset(GtkBuilder *builder);
 void ghb_presets_list_init(signal_user_data_t *ud, gint *indices, gint len);
 GValue* ghb_parse_preset_path(const gchar *path);
 gchar* ghb_preset_path_string(const GValue *path);
 gboolean ghb_preset_is_custom(void);
-void ghb_prefs_store(void);
-void ghb_pref_set(GValue *settings, const gchar *key);
 gboolean ghb_lock_file(const gchar *name);
-void ghb_refresh_preset(signal_user_data_t *ud);
 int ghb_find_pid_file();
 void ghb_unlink_pid_file(int pid);
 void ghb_write_pid_file();
+GValue* ghb_get_current_preset(signal_user_data_t *ud);
+GValue* ghb_get_current_preset_path(signal_user_data_t *ud);
+void ghb_preset_to_settings(GValue *settings, GValue *preset);
+void ghb_prefs_to_settings(GValue *settings);
+void dump_preset_path(const gchar *msg, const GValue *path);
 
 #endif // _GHB_PRESETS_H_

HandBrake-0.9.9.tar.bz2/gtk/src/preview.c -> HandBrake-0.10.0.tar.bz2/gtk/src/preview.c Changed

@@ -2,18 +2,19 @@
 /*
 * preview.c
 * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
- * 
+ *
 * preview.c is free software.
- * 
+ *
 * You may 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.
- * 
+ *
 */
 #include <unistd.h>
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <glib/gi18n.h>
 #include <glib-object.h>
 #include "ghbcompat.h"
 
@@ -71,11 +72,11 @@
 
 #if defined(_ENABLE_GST)
 G_MODULE_EXPORT gboolean live_preview_cb(GstBus *bus, GstMessage *msg, gpointer data);
-static GstBusSyncReply create_window(GstBus *bus, GstMessage *msg, 
+static GstBusSyncReply create_window(GstBus *bus, GstMessage *msg,
 gpointer data);
 #endif
 
-G_MODULE_EXPORT gboolean preview_expose_cb(GtkWidget *widget, GdkEventExpose *event, 
+G_MODULE_EXPORT gboolean preview_expose_cb(GtkWidget *widget, GdkEventExpose *event,
 signal_user_data_t *ud);
 
 void
@@ -136,8 +137,11 @@
 gint64 num, den;
 
 ghb_screen_par(ud, &disp_par_n, &disp_par_d);
- if (disp_par_n < 1) disp_par_n = 1;
- if (disp_par_d < 1) disp_par_d = 1;
+ if (disp_par_n < 1 || disp_par_d < 1)
+ {
+ disp_par_n = 1;
+ disp_par_d = 1;
+ }
 num = par_n * disp_par_d;
 den = par_d * disp_par_n;
 
@@ -155,25 +159,19 @@
 ud->preview = g_malloc0(sizeof(preview_t));
 ud->preview->view = GHB_WIDGET(ud->builder, "preview_image");
 gtk_widget_realize(ud->preview->view);
-#if GTK_CHECK_VERSION(3, 0, 0)
 g_signal_connect(G_OBJECT(ud->preview->view), "draw",
 G_CALLBACK(preview_expose_cb), ud);
-#else
- g_signal_connect(G_OBJECT(ud->preview->view), "expose_event",
- G_CALLBACK(preview_expose_cb), ud);
-#endif
 
 ud->preview->pause = TRUE;
 ud->preview->encode_frame = -1;
 ud->preview->live_id = -1;
 widget = GHB_WIDGET (ud->builder, "preview_button_image");
 gtk_widget_get_size_request(widget, &ud->preview->button_width, &ud->preview->button_height);
- 
+
 #if defined(_ENABLE_GST)
 GstBus *bus;
 GstElement *xover;
 
-#if GTK_CHECK_VERSION(2,18,0)
 if (!gdk_window_ensure_native(gtk_widget_get_window(ud->preview->view)))
 {
 g_message("Couldn't create native window for GstXOverlay. Disabling live preview.");
@@ -183,7 +181,6 @@
 gtk_widget_hide (widget);
 return;
 }
-#endif
 
 #if !defined(_WIN32)
 ud->preview->xid = GDK_WINDOW_XID(gtk_widget_get_window(ud->preview->view));
@@ -213,7 +210,7 @@
 {
 
 g_object_set(G_OBJECT(ud->preview->play), "video-sink", xover, NULL);
- g_object_set(ud->preview->play, "subtitle-font-desc", 
+ g_object_set(ud->preview->play, "subtitle-font-desc",
 "sans bold 20", NULL);
 
 bus = gst_pipeline_get_bus(GST_PIPELINE(ud->preview->play));
@@ -239,8 +236,8 @@
 {
 if (ud->preview->current)
 {
- ud->preview->current = NULL;
 g_free(ud->preview->current);
+ ud->preview->current = NULL;
 }
 }
 
@@ -310,7 +307,7 @@
 else
 height = gst_util_uint64_scale_int(width, den, num);
 
- if (ghb_settings_get_boolean(ud->settings, "reduce_hd_preview"))
+ if (ghb_settings_get_boolean(ud->prefs, "reduce_hd_preview"))
 {
 GdkScreen *ss;
 gint s_w, s_h;
@@ -330,7 +327,7 @@
 width = gst_util_uint64_scale_int(height, num, den);
 }
 }
- 
+
 if (width != ud->preview->width || height != ud->preview->height)
 {
 gtk_widget_set_size_request(ud->preview->view, width, height);
@@ -377,26 +374,21 @@
 static GList *
 get_stream_info_objects_for_type (GstElement *play, const gchar *typestr)
 {
- GValueArray *info_arr = NULL;
+ GList *info_list = NULL, *link;
 GList *ret = NULL;
- guint ii;
 
 if (play == NULL)
 return NULL;
 
- g_object_get(play, "stream-info-value-array", &info_arr, NULL);
- if (info_arr == NULL)
+ g_object_get(play, "stream-info", &info_list, NULL);
+ if (info_list == NULL)
 return NULL;
 
- for (ii = 0; ii < info_arr->n_values; ++ii) 
+ link = info_list;
+ while (link)
 {
- GObject *info_obj;
- GValue *val;
-
- val = g_value_array_get_nth(info_arr, ii);
- //val = &((GValue*)info_arr->values)[ii];
- info_obj = g_value_get_object(val);
- if (info_obj) 
+ GObject *info_obj = (GObject*)link->data;
+ if (info_obj)
 {
 GParamSpec *pspec;
 GEnumValue *value;
@@ -407,17 +399,17 @@
 G_OBJECT_GET_CLASS (info_obj), "type");
 value = g_enum_get_value(
 G_PARAM_SPEC_ENUM (pspec)->enum_class, type);
- if (value) 
+ if (value)
 {
 if (g_ascii_strcasecmp (value->value_nick, typestr) == 0 ||
- g_ascii_strcasecmp (value->value_name, typestr) == 0) 
+ g_ascii_strcasecmp (value->value_name, typestr) == 0)
 {
 ret = g_list_prepend (ret, g_object_ref (info_obj));
 }
 }
 }
+ if (link) link = link->next;
 }
- g_value_array_free (info_arr);
 return g_list_reverse (ret);
 }
 
@@ -473,7 +465,7 @@
 
 //printf("eos");
 img = GTK_IMAGE(GHB_WIDGET(ud->builder, "live_preview_play_image"));
- gtk_image_set_from_stock(img, "gtk-media-play", GTK_ICON_SIZE_BUTTON);
+ gtk_image_set_from_icon_name(img, GHB_PLAY_ICON, GTK_ICON_SIZE_BUTTON);
 gst_element_set_state(ud->preview->play, GST_STATE_PAUSED);
 ud->preview->pause = TRUE;
 gst_element_seek(ud->preview->play, 1.0,
@@ -558,8 +550,8 @@
 gchar *message, *desc;
 desc = gst_missing_plugin_message_get_description(msg);
 message = g_strdup_printf(
- "Missing GStreamer plugin\n"
- "Audio or Video may not play as expected\n\n%s",
+ _("Missing GStreamer plugin\n"
+ "Audio or Video may not play as expected\n\n%s"),
 desc);
 ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Ok", NULL);
 g_free(message);
@@ -663,14 +655,14 @@
 img = GTK_IMAGE(GHB_WIDGET(ud->builder, "live_preview_play_image"));
 if (!ud->preview->encoded[ud->preview->frame])
 {
- gtk_image_set_from_stock(img, "gtk-media-play", GTK_ICON_SIZE_BUTTON);
+ gtk_image_set_from_icon_name(img, GHB_PLAY_ICON, GTK_ICON_SIZE_BUTTON);
 gst_element_set_state(ud->preview->play, GST_STATE_NULL);
 ud->preview->pause = TRUE;
 return;
 }
 
 uri = g_strdup_printf("file://%s", ud->preview->current);
- gtk_image_set_from_stock(img, "gtk-media-pause", GTK_ICON_SIZE_BUTTON);
+ gtk_image_set_from_icon_name(img, GHB_PAUSE_ICON, GTK_ICON_SIZE_BUTTON);
 ud->preview->state = PREVIEW_STATE_LIVE;
 g_object_set(G_OBJECT(ud->preview->play), "uri", uri, NULL);
 gst_element_set_state(ud->preview->play, GST_STATE_PLAYING);
@@ -687,7 +679,7 @@
 return;
 
 img = GTK_IMAGE(GHB_WIDGET(ud->builder, "live_preview_play_image"));
- gtk_image_set_from_stock(img, "gtk-media-play", GTK_ICON_SIZE_BUTTON);
+ gtk_image_set_from_icon_name(img, GHB_PLAY_ICON, GTK_ICON_SIZE_BUTTON);
 gst_element_set_state(ud->preview->play, GST_STATE_PAUSED);
 ud->preview->pause = TRUE;
 }
@@ -703,7 +695,7 @@
 return;
 
 img = GTK_IMAGE(GHB_WIDGET(ud->builder, "live_preview_play_image"));
- gtk_image_set_from_stock(img, "gtk-media-play", GTK_ICON_SIZE_BUTTON);
+ gtk_image_set_from_icon_name(img, GHB_PLAY_ICON, GTK_ICON_SIZE_BUTTON);
 #if defined(_ENABLE_GST)
 gst_element_set_state(ud->preview->play, GST_STATE_NULL);
 #endif
@@ -770,6 +762,7 @@
 ghb_settings_set_string(js, "destination", name);
 ghb_settings_set_int(js, "start_frame", ud->preview->frame);
 ud->preview->live_id = 0;
+ ghb_settings_set_value(js, "Preferences", ud->prefs);
 ghb_add_live_job(js, ud->preview->live_id);
 ghb_start_live_encode();
 ghb_value_free(js);
@@ -784,7 +777,7 @@
 
 ud->preview->live_id = -1;
 prog = GHB_WIDGET(ud->builder, "live_encode_progress");
- if (success && 
+ if (success &&
 ud->preview->encode_frame == ud->preview->frame)
 {
 gtk_progress_bar_set_text(GTK_PROGRESS_BAR(prog), "Done");
@@ -918,12 +911,14 @@
 gint preview_width, preview_height, target_height, width, height;
 
 g_debug("set_preview_button_image ()");
- gint titleindex;
+ gint title_id, titleindex;
+ const hb_title_t *title;
 
 live_preview_stop(ud);
 
- titleindex = ghb_settings_combo_int(ud->settings, "title");
- if (titleindex < 0) return;
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ if (title == NULL) return;
 widget = GHB_WIDGET (ud->builder, "preview_frame");
 ud->preview->frame = ghb_widget_int(widget) - 1;
 if (ud->preview->encoded[ud->preview->frame])
@@ -946,14 +941,13 @@
 if (ud->preview->pix != NULL)
 g_object_unref(ud->preview->pix);
 
- ud->preview->pix = 
- ghb_get_preview_image(titleindex, ud->preview->frame, 
- ud, &width, &height);
+ ud->preview->pix =
+ ghb_get_preview_image(title, ud->preview->frame, ud, &width, &height);
 if (ud->preview->pix == NULL) return;
 preview_width = gdk_pixbuf_get_width(ud->preview->pix);
 preview_height = gdk_pixbuf_get_height(ud->preview->pix);
 widget = GHB_WIDGET (ud->builder, "preview_image");
- if (preview_width != ud->preview->width || 
+ if (preview_width != ud->preview->width ||
 preview_height != ud->preview->height)
 {
 gtk_widget_set_size_request(widget, preview_width, preview_height);
@@ -966,7 +960,7 @@
 widget = GHB_WIDGET (ud->builder, "preview_dims");
 gtk_label_set_text(GTK_LABEL(widget), text);
 g_free(text);
- 
+
 g_debug("preview %d x %d", preview_width, preview_height);
 target_height = MIN(ud->preview->button_height, 200);
 height = target_height;
@@ -980,13 +974,13 @@
 if ((height >= 16) && (width >= 16))
 {
 GdkPixbuf *scaled_preview;
- scaled_preview = gdk_pixbuf_scale_simple (ud->preview->pix, width, 
+ scaled_preview = gdk_pixbuf_scale_simple (ud->preview->pix, width,
 height, GDK_INTERP_NEAREST);
 if (scaled_preview != NULL)
 {
 widget = GHB_WIDGET (ud->builder, "preview_button_image");
 gtk_image_set_from_pixbuf(GTK_IMAGE(widget), scaled_preview);
- g_object_unref (scaled_preview);
+ g_object_unref(scaled_preview);
 }
 }
 }
@@ -1043,12 +1037,15 @@
 #endif
 #endif
 
-#if GTK_CHECK_VERSION(3, 0, 0)
+#if 0 // GTK_CHECK_VERSION(3, 0, 0)
+//
+// Only needed if the problems with GtkOverlay are ever resolved
+//
 G_MODULE_EXPORT gboolean
 position_overlay_cb(
 GtkWidget *overlay,
- GtkWidget *widget, 
- GdkRectangle *rect, 
+ GtkWidget *widget,
+ GdkRectangle *rect,
 signal_user_data_t *ud)
 {
 GtkRequisition min_size, size;
@@ -1065,8 +1062,8 @@
 
 G_MODULE_EXPORT gboolean
 preview_expose_cb(
- GtkWidget *widget, 
- GdkEventExpose *event, 
+ GtkWidget *widget,
+ GdkEventExpose *event,
 signal_user_data_t *ud)
 {
 #if defined(_ENABLE_GST)
@@ -1138,82 +1135,43 @@
 g_debug("nothing to do");
 return;
 }
- g_debug("prev allocate %d x %d", ud->preview->button_width, 
+ g_debug("prev allocate %d x %d", ud->preview->button_width,
 ud->preview->button_height);
 ud->preview->button_width = allocation->width;
 ud->preview->button_height = allocation->height;
 ghb_set_preview_image(ud);
 }
 
-static void
-set_visible(GtkWidget *widget, gboolean visible)
-{
- if (visible)
- {
- gtk_widget_show_now(widget);
- }
- else
- {
- gtk_widget_hide(widget);
- }
-}
-
 void
 ghb_preview_set_visible(signal_user_data_t *ud)
 {
- gint titleindex;
+ gint title_id, titleindex;
+ const hb_title_t *title;
 GtkWidget *widget;
- gboolean settings_active;
+ gboolean active;
 
- settings_active = ghb_settings_get_boolean(ud->settings, "show_picture");
- widget = GHB_WIDGET (ud->builder, "preview_window");
- titleindex = ghb_settings_combo_int(ud->settings, "title");
- if (settings_active && titleindex >= 0)
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ active = ghb_settings_get_boolean(ud->globals, "show_preview") &&
+ title != NULL;
+ widget = GHB_WIDGET(ud->builder, "preview_window");
+ gtk_widget_set_visible(widget, active);
+ if (active)
 {
 gint x, y;
- x = ghb_settings_get_int(ud->settings, "preview_x");
- y = ghb_settings_get_int(ud->settings, "preview_y");
+ x = ghb_settings_get_int(ud->prefs, "preview_x");
+ y = ghb_settings_get_int(ud->prefs, "preview_y");
 if (x >= 0 && y >= 0)
 gtk_window_move(GTK_WINDOW(widget), x, y);
- set_visible(widget, 
- ghb_settings_get_boolean(ud->settings, "show_preview"));
- }
- else
- {
- set_visible(widget, FALSE);
 }
 }
 
 G_MODULE_EXPORT void
-preview_button_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
- g_debug("preview_button_clicked_cb()");
- ghb_widget_to_setting (ud->settings, xwidget);
- ghb_preview_set_visible(ud);
- ghb_check_dependency(ud, xwidget, NULL);
- const gchar *name = ghb_get_setting_key(xwidget);
- ghb_pref_save(ud->settings, name);
-}
-
-G_MODULE_EXPORT void
 picture_settings_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
- GtkWidget *widget;
- gboolean active, hide_settings;
- gint x, y;
-
 g_debug("picture_settings_clicked_cb()");
- ghb_widget_to_setting (ud->settings, xwidget);
-
- hide_settings = ghb_settings_get_boolean(ud->settings, "hide_settings");
+ ghb_widget_to_setting(ud->globals, xwidget);
 
- active = ghb_settings_get_boolean(ud->settings, "show_picture");
- widget = GHB_WIDGET (ud->builder, "settings_window");
- x = ghb_settings_get_int(ud->settings, "settings_x");
- y = ghb_settings_get_int(ud->settings, "settings_y");
- if (x >= 0 && y >= 0)
- gtk_window_move(GTK_WINDOW(widget), x, y);
- set_visible(widget, active && !hide_settings);
 ghb_preview_set_visible(ud);
 }
 
@@ -1224,7 +1182,7 @@
 gboolean active;
 
 g_debug("picture_settings_alt_clicked_cb()");
- toggle = GHB_WIDGET (ud->builder, "show_picture");
+ toggle = GHB_WIDGET (ud->builder, "show_preview");
 active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(toggle));
 gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(toggle), !active);
 }
@@ -1246,17 +1204,17 @@
 GtkWindow *window;
 
 g_debug("fullscreen_clicked_cb()");
- ghb_widget_to_setting (ud->settings, toggle);
+ ghb_widget_to_setting (ud->prefs, toggle);
 ghb_check_dependency(ud, toggle, NULL);
 const gchar *name = ghb_get_setting_key(toggle);
- ghb_pref_save(ud->settings, name);
+ ghb_pref_save(ud->prefs, name);
 
 window = GTK_WINDOW(GHB_WIDGET (ud->builder, "preview_window"));
 active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle));
 if (active)
 {
 gtk_window_set_resizable(window, TRUE);
- gtk_button_set_label(GTK_BUTTON(toggle), "Windowed");
+ gtk_button_set_label(GTK_BUTTON(toggle), _("Windowed"));
 // Changing resizable property doesn't take effect immediately
 // need to delay fullscreen till after this callback returns
 // to mainloop
@@ -1266,41 +1224,12 @@
 {
 gtk_window_unfullscreen(window);
 gtk_window_set_resizable(window, FALSE);
- gtk_button_set_label(GTK_BUTTON(toggle), "Fullscreen");
+ gtk_button_set_label(GTK_BUTTON(toggle), _("Fullscreen"));
 ghb_set_preview_image(ud);
 }
 }
 
 G_MODULE_EXPORT void
-picture_settings_alt2_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
- GtkWidget *toggle;
- gboolean active;
- GtkWidget *window;
-
- g_debug("picture_settings_alt2_clicked_cb()");
- ghb_widget_to_setting (ud->settings, xwidget);
- active = ghb_settings_get_boolean(ud->settings, "hide_settings");
-
- toggle = GHB_WIDGET (ud->builder, "hide_settings");
- window = GHB_WIDGET(ud->builder, "settings_window");
- if (!active)
- {
- gtk_button_set_label(GTK_BUTTON(toggle), "Hide Settings");
- gtk_widget_set_tooltip_text(toggle, 
- "Hide the picture settings window while "
- "leaving the preview visible.");
- gtk_widget_show(window);
- }
- else
- {
- gtk_button_set_label(GTK_BUTTON(toggle), "Show Settings");
- gtk_widget_set_tooltip_text(toggle, "Show picture settings.");
- gtk_widget_hide(window);
- }
-}
-
-G_MODULE_EXPORT void
 preview_frame_value_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 if (ud->preview->live_id >= 0)
@@ -1314,26 +1243,13 @@
 
 G_MODULE_EXPORT gboolean
 preview_window_delete_cb(
- GtkWidget *widget, 
- GdkEvent *event, 
- signal_user_data_t *ud)
-{
- live_preview_stop(ud);
- widget = GHB_WIDGET (ud->builder, "show_picture");
- gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
- return TRUE;
-}
-
-G_MODULE_EXPORT gboolean
-settings_window_delete_cb(
- GtkWidget *widget, 
- GdkEvent *event, 
+ GtkWidget *widget,
+ GdkEvent *event,
 signal_user_data_t *ud)
 {
 live_preview_stop(ud);
- widget = GHB_WIDGET (ud->builder, "show_picture");
+ widget = GHB_WIDGET(ud->builder, "show_preview");
 gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
-
 return TRUE;
 }
 
@@ -1342,10 +1258,10 @@
 {
 g_debug("preview_duration_changed_cb ()");
 ghb_live_reset(ud);
- ghb_widget_to_setting (ud->settings, widget);
+ ghb_widget_to_setting (ud->prefs, widget);
 ghb_check_dependency(ud, widget, NULL);
 const gchar *name = ghb_get_setting_key(widget);
- ghb_pref_save(ud->settings, name);
+ ghb_pref_save(ud->prefs, name);
 }
 
 static guint hud_timeout_id = 0;
@@ -1432,7 +1348,6 @@
 return FALSE;
 }
 
-#if GTK_CHECK_VERSION(3, 0, 0)
 cairo_region_t*
 ghb_curved_rect_mask(gint width, gint height, gint radius)
 {
@@ -1481,54 +1396,6 @@
 
 return shape;
 }
-#else
-GdkDrawable*
-ghb_curved_rect_mask(gint width, gint height, gint radius)
-{
- GdkDrawable *shape;
- cairo_t *cr;
- double w, h;
-
- if (!width || !height)
- return NULL;
-
- shape = (GdkDrawable *)gdk_pixmap_new (NULL, width, height, 1);
-
- cr = gdk_cairo_create (shape);
-
- w = width;
- h = height;
- if (radius > width / 2)
- radius = width / 2;
- if (radius > height / 2)
- radius = height / 2;
-
- // fill shape with black
- cairo_save(cr);
- cairo_rectangle (cr, 0, 0, width, height);
- cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
- cairo_fill (cr);
- cairo_restore (cr);
-
- cairo_move_to (cr, 0, radius);
- cairo_curve_to (cr, 0 , 0, 0 , 0, radius, 0);
- cairo_line_to (cr, w - radius, 0);
- cairo_curve_to (cr, w, 0, w, 0, w, radius);
- cairo_line_to (cr, w , h - radius);
- cairo_curve_to (cr, w, h, w, h, w - radius, h);
- cairo_line_to (cr, 0 + radius, h);
- cairo_curve_to (cr, 0, h, 0, h, 0, h - radius);
-
- cairo_close_path(cr);
-
- cairo_set_source_rgb(cr, 1, 1, 1);
- cairo_fill(cr);
-
- cairo_destroy(cr);
-
- return shape;
-}
-#endif
 
 G_MODULE_EXPORT void
 preview_hud_size_alloc_cb(
@@ -1536,26 +1403,17 @@
 GtkAllocation *allocation,
 signal_user_data_t *ud)
 {
-#if GTK_CHECK_VERSION(3, 0, 0)
 cairo_region_t *shape;
-#else
- GdkDrawable *shape;
-#endif
 
 //g_message("preview_hud_size_alloc_cb()");
 if (gtk_widget_get_visible(widget) && allocation->height > 50)
 {
- shape = ghb_curved_rect_mask(allocation->width, 
+ shape = ghb_curved_rect_mask(allocation->width,
 allocation->height, allocation->height/4);
 if (shape != NULL)
 {
-#if GTK_CHECK_VERSION(3, 0, 0)
 gtk_widget_shape_combine_region(widget, shape);
 cairo_region_destroy(shape);
-#else
- gtk_widget_shape_combine_mask(widget, shape, 0, 0);
- gdk_pixmap_unref(shape);
-#endif
 }
 }
 }
@@ -1572,31 +1430,10 @@
 if (gtk_widget_get_visible(widget))
 {
 gtk_window_get_position(GTK_WINDOW(widget), &x, &y);
- ghb_settings_set_int(ud->settings, "preview_x", x);
- ghb_settings_set_int(ud->settings, "preview_y", y);
- ghb_pref_set(ud->settings, "preview_x");
- ghb_pref_set(ud->settings, "preview_y");
- ghb_prefs_store();
- }
- return FALSE;
-}
-
-G_MODULE_EXPORT gboolean
-settings_configure_cb(
- GtkWidget *widget,
- GdkEventConfigure *event,
- signal_user_data_t *ud)
-{
- gint x, y;
-
- //g_message("settings_configure_cb()");
- if (gtk_widget_get_visible(widget))
- {
- gtk_window_get_position(GTK_WINDOW(widget), &x, &y);
- ghb_settings_set_int(ud->settings, "settings_x", x);
- ghb_settings_set_int(ud->settings, "settings_y", y);
- ghb_pref_set(ud->settings, "settings_x");
- ghb_pref_set(ud->settings, "settings_y");
+ ghb_settings_set_int(ud->prefs, "preview_x", x);
+ ghb_settings_set_int(ud->prefs, "preview_y", y);
+ ghb_pref_set(ud->prefs, "preview_x");
+ ghb_pref_set(ud->prefs, "preview_y");
 ghb_prefs_store();
 }
 return FALSE;

HandBrake-0.9.9.tar.bz2/gtk/src/preview.h -> HandBrake-0.10.0.tar.bz2/gtk/src/preview.h Changed

HandBrake-0.9.9.tar.bz2/gtk/src/queuehandler.c -> HandBrake-0.10.0.tar.bz2/gtk/src/queuehandler.c Changed

HandBrake-0.9.9.tar.bz2/gtk/src/queuehandler.h -> HandBrake-0.10.0.tar.bz2/gtk/src/queuehandler.h Changed

@@ -2,19 +2,19 @@
 /*
 * queuehandler.h
 * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
- * 
+ *
 * queuehandler.h is free software.
- * 
+ *
 * You may 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.
- * 
+ *
 * callbacks.h 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.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with callbacks.h. If not, write to:
 * The Free Software Foundation, Inc.,
@@ -30,6 +30,6 @@
 
 void ghb_queue_buttons_grey(signal_user_data_t *ud);
 gboolean ghb_reload_queue(signal_user_data_t *ud);
-gboolean ghb_queue_add(signal_user_data_t *ud, GValue *settings, gint batch);
+void ghb_queue_remove_row(signal_user_data_t *ud, int row);
 
 #endif // _QUEUEHANDLER_H_

HandBrake-0.9.9.tar.bz2/gtk/src/renderer_button.c -> HandBrake-0.10.0.tar.bz2/gtk/src/renderer_button.c Changed

HandBrake-0.9.9.tar.bz2/gtk/src/resources.c -> HandBrake-0.10.0.tar.bz2/gtk/src/resources.c Changed

HandBrake-0.9.9.tar.bz2/gtk/src/resources.h -> HandBrake-0.10.0.tar.bz2/gtk/src/resources.h Changed

HandBrake-0.9.9.tar.bz2/gtk/src/resources.list -> HandBrake-0.10.0.tar.bz2/gtk/src/resources.list Changed

@@ -1,47 +1,17 @@
 <resources>
 <section name="icons">
- <icon name="hb-activity.32" file="hb-activity.32.png" />
- <icon name="hb-activity.64" file="hb-activity.64.png" />
- <icon name="hb-add-queue.32" file="hb-add-queue.32.png" />
- <icon name="hb-add-queue.64" file="hb-add-queue.64.png" />
- <icon name="hb-canceled" file="hb-canceled.16.png" />
- <icon name="hb-complete" file="hb-complete.16.png" />
- <icon name="hb-icon.256" file="hb-icon.256.png" />
- <icon name="hb-icon.128" file="hb-icon.128.png" />
- <icon name="hb-icon.64" file="hb-icon.64.png" />
- <icon name="hb-icon.48" file="hb-icon.48.png" />
- <icon name="hb-icon.32" file="hb-icon.32.png" />
- <icon name="hb-icon.24" file="hb-icon.24.png" />
- <icon name="hb-icon.22" file="hb-icon.22.png" />
- <icon name="hb-icon.16" file="hb-icon.16.png" />
- <icon name="hb-status" file="hb-status.32.png" />
- <icon name="hb-status-empty" file="hb-status-empty.32.png" />
- <icon name="hb-pause.32" file="hb-pause.32.png" />
- <icon name="hb-pause.64" file="hb-pause.64.png" />
- <icon name="hb-start.32" file="hb-start.32.png" />
- <icon name="hb-start.64" file="hb-start.64.png" />
- <icon name="hb-pref" file="hb-pref.32.png" />
- <icon name="hb-picture.32" file="hb-picture.32.png" />
- <icon name="hb-picture.64" file="hb-picture.64.png" />
- <icon name="hb-queue.32" file="hb-showqueue.32.png" />
- <icon name="hb-queue.64" file="hb-showqueue.32.png" />
- <icon name="hb-queue-delete" file="hb-remove.24.png" />
- <icon name="hb-queue-job" file="hb-queue-job.16.png" />
- <icon name="hb-queue-pass1" file="hb-queue-pass1.16.png" />
- <icon name="hb-queue-pass2" file="hb-queue-pass2.16.png" />
- <icon name="hb-queue-subtitle" file="hb-queue-subtitle.16.png" />
- <icon name="hb-remove" file="hb-remove.48.png" />
- <icon name="hb-source.32" file="hb-source.32.png" />
- <icon name="hb-source.64" file="hb-source.64.png" />
- <icon name="hb-stop.32" file="hb-stop.32.png" />
- <icon name="hb-stop.64" file="hb-stop.64.png" />
- <icon name="hb-edit" file="hb-edit.32.png" />
- <icon name="hb-working0" file="hb-working0.16.png" />
- <icon name="hb-working1" file="hb-working1.16.png" />
- <icon name="hb-working2" file="hb-working2.16.png" />
- <icon name="hb-working3" file="hb-working3.16.png" />
- <icon name="hb-working4" file="hb-working4.16.png" />
- <icon name="hb-working5" file="hb-working5.16.png" />
+ <icon name="hb-icon" file="hb-icon.svg" />
+ <icon name="hb-start" file="hb-start.svg" />
+ <icon name="hb-pause" file="hb-pause.svg" />
+ <icon name="hb-stop" file="hb-stop.svg" />
+ <icon name="hb-add-queue" file="hb-add-queue.svg" />
+ <icon name="hb-queue" file="hb-showqueue.svg" />
+ <icon name="hb-picture" file="hb-picture.svg" />
+ <icon name="hb-activity" file="hb-activity.svg" />
+ <icon name="hb-source" file="hb-source.svg" />
+ <icon name="hb-remove" file="hb-remove.svg" />
+ <icon name="hb-complete" file="hb-complete.svg" />
+ <icon name="hb-edit" file="hb-edit.svg" />
 </section>
 <plist name="internal-defaults" file="internal_defaults.xml" />
 <plist name="standard-presets" file="standard_presets.xml" />

HandBrake-0.9.9.tar.bz2/gtk/src/settings.c -> HandBrake-0.10.0.tar.bz2/gtk/src/settings.c Changed

@@ -2,14 +2,14 @@
 /*
 * settings.c
 * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
- * 
+ *
 * settings.c is free software.
- * 
+ *
 * You may 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.
- * 
+ *
 */
 #include <fcntl.h>
 #include <unistd.h>
@@ -39,8 +39,8 @@
 
 void
 ghb_settings_set_value(
- GValue *settings, 
- const gchar *key, 
+ GValue *settings,
+ const gchar *key,
 const GValue *value)
 {
 if (key == NULL || value == NULL)
@@ -56,8 +56,8 @@
 
 void
 ghb_settings_set_string(
- GValue *settings, 
- const gchar *key, 
+ GValue *settings,
+ const gchar *key,
 const gchar *sval)
 {
 GValue *value;
@@ -143,6 +143,14 @@
 return ghb_value_double(value);
 }
 
+const gchar*
+ghb_settings_get_const_string(const GValue *settings, const gchar *key)
+{
+ const GValue* value;
+ value = ghb_settings_get_value(settings, key);
+ return g_value_get_string(value);
+}
+
 gchar*
 ghb_settings_get_string(const GValue *settings, const gchar *key)
 {
@@ -183,11 +191,15 @@
 ghb_get_setting_key(GtkWidget *widget)
 {
 const gchar *name;
- 
+
 g_debug("get_setting_key ()\n");
 if (widget == NULL) return NULL;
 name = gtk_buildable_get_name(GTK_BUILDABLE(widget));
- 
+
+ if (name == NULL || !strncmp(name, "Gtk", 3))
+ {
+ name = gtk_widget_get_name(widget);
+ }
 if (name == NULL)
 {
 // Bad widget pointer? Should never happen.
@@ -203,7 +215,7 @@
 GValue *value = NULL;
 const gchar *name;
 GType type;
- 
+
 if (widget == NULL)
 {
 g_debug("NULL widget\n");
@@ -254,13 +266,6 @@
 bval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
 value = ghb_boolean_value_new(bval);
 }
- else if (type == GTK_TYPE_TOGGLE_ACTION)
- {
- g_debug("\ttoggle action");
- gboolean bval;
- bval = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(widget));
- value = ghb_boolean_value_new(bval);
- }
 else if (type == GTK_TYPE_CHECK_MENU_ITEM)
 {
 g_debug("\tcheck_menu_item");
@@ -296,11 +301,11 @@
 }
 else if (type == GTK_TYPE_SPIN_BUTTON)
 {
- gint ival;
- ival = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
- value = ghb_int64_value_new(ival);
+ double val;
+ val = gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget));
+ value = ghb_double_value_new(val);
 }
- else if (type == GTK_TYPE_HSCALE)
+ else if (type == GTK_TYPE_SCALE)
 {
 gdouble dval;
 gint digits;
@@ -367,7 +372,7 @@
 {
 GValue *value;
 gchar *sval;
- 
+
 value = ghb_widget_value(widget);
 sval = ghb_value_string(value);
 ghb_value_free(value);
@@ -379,7 +384,7 @@
 {
 GValue *value;
 gdouble dval;
- 
+
 value = ghb_widget_value(widget);
 dval = ghb_value_double(value);
 ghb_value_free(value);
@@ -391,7 +396,7 @@
 {
 GValue *value;
 gint64 ival;
- 
+
 value = ghb_widget_value(widget);
 ival = ghb_value_int64(value);
 ghb_value_free(value);
@@ -403,7 +408,7 @@
 {
 GValue *value;
 gint ival;
- 
+
 value = ghb_widget_value(widget);
 ival = (gint)ghb_value_int64(value);
 ghb_value_free(value);
@@ -415,39 +420,19 @@
 {
 GValue *value;
 gboolean bval;
- 
+
 value = ghb_widget_value(widget);
 bval = ghb_value_boolean(value);
 ghb_value_free(value);
 return bval;
 }
 
-static void check_radio_consistency(GValue *settings, GtkWidget *widget)
-{
- const gchar *key = NULL;
- GValue *value;
-
- if (widget == NULL) return;
- if (G_OBJECT_TYPE(widget) == GTK_TYPE_RADIO_BUTTON)
- {
- // Find corresponding setting
- key = ghb_get_setting_key(widget);
- if (key == NULL) return;
- value = ghb_widget_value(widget);
- if (value == NULL) return;
- if (ghb_value_boolean(value) == ghb_settings_get_boolean(settings, key))
- {
- gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(widget), FALSE);
- }
- }
-}
-
 void
 ghb_widget_to_setting(GValue *settings, GtkWidget *widget)
 {
 const gchar *key = NULL;
 GValue *value;
- 
+
 if (widget == NULL) return;
 g_debug("ghb_widget_to_setting");
 // Find corresponding setting
@@ -456,7 +441,6 @@
 value = ghb_widget_value(widget);
 if (value != NULL)
 {
- check_radio_consistency(settings, widget);
 ghb_settings_take_value(settings, key, value);
 }
 else
@@ -465,15 +449,15 @@
 }
 }
 
-static void
-update_widget(GtkWidget *widget, const GValue *value)
+void
+ghb_update_widget(GtkWidget *widget, const GValue *value)
 {
 GType type;
 gchar *str;
 gint ival;
 gdouble dval;
 
- g_debug("update_widget");
+ g_debug("ghb_update_widget");
 type = G_VALUE_TYPE(value);
 if (type == ghb_array_get_type() || type == ghb_dict_get_type())
 return;
@@ -482,6 +466,7 @@
 ival = ghb_value_int(value);
 dval = ghb_value_double(value);
 type = G_OBJECT_TYPE(widget);
+
 if (type == GTK_TYPE_ENTRY)
 {
 g_debug("entry");
@@ -490,16 +475,8 @@
 else if (type == GTK_TYPE_RADIO_BUTTON)
 {
 g_debug("radio button");
- int cur_val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
- if (cur_val && !ival)
- {
- gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(widget), TRUE);
- }
- else
- {
- gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(widget), FALSE);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ival);
- }
+ if (ival)
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), !!ival);
 }
 else if (type == GTK_TYPE_CHECK_BUTTON)
 {
@@ -516,11 +493,6 @@
 g_debug("toggle button");
 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ival);
 }
- else if (type == GTK_TYPE_TOGGLE_ACTION)
- {
- g_debug("toggle action");
- gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(widget), ival);
- }
 else if (type == GTK_TYPE_CHECK_MENU_ITEM)
 {
 g_debug("check menu item");
@@ -591,7 +563,7 @@
 g_debug("spin (%s)", str);
 gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), dval);
 }
- else if (type == GTK_TYPE_HSCALE)
+ else if (type == GTK_TYPE_SCALE)
 {
 g_debug("hscale");
 gtk_range_set_value(GTK_RANGE(widget), dval);
@@ -661,7 +633,7 @@
 }
 
 int
-ghb_ui_update_from_settings(GtkBuilder *builder, const gchar *name, const GValue *settings)
+ghb_ui_update_from_settings(signal_user_data_t *ud, const gchar *name, const GValue *settings)
 {
 GObject *object;
 GValue * value;
@@ -672,13 +644,16 @@
 value = ghb_settings_get_value(settings, name);
 if (value == NULL)
 return 0;
- object = GHB_OBJECT(builder, name);
+ object = GHB_OBJECT(ud->builder, name);
 if (object == NULL)
 {
 g_debug("Failed to find widget for key: %s\n", name);
 return -1;
 }
- update_widget((GtkWidget*)object, value);
+ ghb_update_widget((GtkWidget*)object, value);
+ // Its possible the value hasn't changed. Since settings are only
+ // updated when the value changes, I'm initializing settings here as well.
+ ghb_widget_to_setting(ud->settings, (GtkWidget*)object);
 return 0;
 }
 
@@ -696,10 +671,35 @@
 g_debug("Failed to find widget for key: %s\n", name);
 return -1;
 }
- update_widget((GtkWidget*)object, value);
+ ghb_update_widget((GtkWidget*)object, value);
 // Its possible the value hasn't changed. Since settings are only
 // updated when the value changes, I'm initializing settings here as well.
 ghb_widget_to_setting(ud->settings, (GtkWidget*)object);
 return 0;
 }
 
+int
+ghb_ui_settings_update(
+ signal_user_data_t *ud,
+ GValue *settings,
+ const gchar *name,
+ const GValue *value)
+{
+ GObject *object;
+
+ g_debug("ghb_ui_update() %s", name);
+ if (name == NULL || value == NULL)
+ return 0;
+ object = GHB_OBJECT(ud->builder, name);
+ if (object == NULL)
+ {
+ g_debug("Failed to find widget for key: %s\n", name);
+ return -1;
+ }
+ ghb_update_widget((GtkWidget*)object, value);
+ // Its possible the value hasn't changed. Since settings are only
+ // updated when the value changes, I'm initializing settings here as well.
+ ghb_widget_to_setting(settings, (GtkWidget*)object);
+ return 0;
+}
+

HandBrake-0.9.9.tar.bz2/gtk/src/settings.h -> HandBrake-0.10.0.tar.bz2/gtk/src/settings.h Changed

@@ -3,12 +3,12 @@
  * 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.
- * 
+ *
  * This program 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 Library General Public License for more details.
- * 
+ *
  * 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., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
@@ -58,7 +58,11 @@
     gboolean scale_busy;
     gint cancel_encode;
     GtkBuilder *builder;
+    GValue *x264_priv;
+    GValue *globals;
+    GValue *prefs;
     GValue *settings;
+    GValue *settings_array;
     GValue *queue;
     GValue *current_job;
     GIOChannel *activity_log;
@@ -77,6 +81,7 @@
     GHB_QUEUE_PENDING,
     GHB_QUEUE_RUNNING,
     GHB_QUEUE_CANCELED,
+    GHB_QUEUE_FAIL,
     GHB_QUEUE_DONE,
 };
 
@@ -100,6 +105,8 @@
 gint ghb_settings_get_int(const GValue *settings, const gchar *key);
 gdouble ghb_settings_get_double(const GValue *settings, const gchar *key);
 gchar* ghb_settings_get_string(const GValue *settings, const gchar *key);
+const gchar* ghb_settings_get_const_string(
+    const GValue *settings, const gchar *key);
 gint ghb_settings_combo_int(const GValue *settings, const gchar *key);
 gdouble ghb_settings_combo_double(const GValue *settings, const gchar *key);
 const gchar* ghb_settings_combo_option(const GValue *settings, const gchar *key);
@@ -116,7 +123,11 @@
 int ghb_ui_update(
     signal_user_data_t *ud, const gchar *name, const GValue *value);
 int ghb_ui_update_from_settings(
-    GtkBuilder *builder, const gchar *name, const GValue *settings);
+    signal_user_data_t *ud, const gchar *name, const GValue *settings);
+int ghb_ui_settings_update(
+    signal_user_data_t *ud, GValue *settings, const gchar *name,
+    const GValue *value);
 const gchar* ghb_get_setting_key(GtkWidget *widget);
+void ghb_update_widget(GtkWidget *widget, const GValue *value);
 
 #endif // _SETTINGS_H_

HandBrake-0.9.9.tar.bz2/gtk/src/standard_presets.xml -> HandBrake-0.10.0.tar.bz2/gtk/src/standard_presets.xml Changed

@@ -24,7 +24,7 @@
 						<key>AudioBitrate</key>
 						<string>160</string>
 						<key>AudioEncoder</key>
-						<string>AAC (faac)</string>
+						<string>AAC (avcodec)</string>
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
@@ -83,8 +83,8 @@
 				<integer>0</integer>
 				<key>PictureDeinterlaceCustom</key>
 				<string></string>
-				<key>PictureDenoise</key>
-				<integer>0</integer>
+				<key>PictureDenoiseFilter</key>
+				<integer>off</integer>
 				<key>PictureDenoiseCustom</key>
 				<string></string>
 				<key>PictureDetelecine</key>
@@ -137,19 +137,17 @@
 				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
-				<key>h264Level</key>
+				<key>VideoLevel</key>
 				<string>3.0</string>
-				<key>h264Profile</key>
+				<key>VideoProfile</key>
 				<string>baseline</string>
-				<key>lavcOption</key>
-				<string></string>
 				<key>x264Option</key>
 				<string></string>
-				<key>x264OptionExtra</key>
+				<key>VideoOptionExtra</key>
 				<string></string>
-				<key>x264Preset</key>
+				<key>VideoPreset</key>
 				<string>fast</string>
-				<key>x264Tune</key>
+				<key>VideoTune</key>
 				<string></string>
 				<key>x264UseAdvancedOptions</key>
 				<integer>0</integer>
@@ -173,7 +171,7 @@
 						<key>AudioBitrate</key>
 						<string>160</string>
 						<key>AudioEncoder</key>
-						<string>AAC (faac)</string>
+						<string>AAC (avcodec)</string>
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
@@ -216,8 +214,8 @@
 				<integer>0</integer>
 				<key>PictureDeinterlaceCustom</key>
 				<string></string>
-				<key>PictureDenoise</key>
-				<integer>0</integer>
+				<key>PictureDenoiseFilter</key>
+				<integer>off</integer>
 				<key>PictureDenoiseCustom</key>
 				<string></string>
 				<key>PictureDetelecine</key>
@@ -270,19 +268,17 @@
 				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
-				<key>h264Level</key>
+				<key>VideoLevel</key>
 				<string>1.3</string>
-				<key>h264Profile</key>
+				<key>VideoProfile</key>
 				<string>baseline</string>
-				<key>lavcOption</key>
-				<string></string>
 				<key>x264Option</key>
 				<string></string>
-				<key>x264OptionExtra</key>
+				<key>VideoOptionExtra</key>
 				<string></string>
-				<key>x264Preset</key>
+				<key>VideoPreset</key>
 				<string>medium</string>
-				<key>x264Tune</key>
+				<key>VideoTune</key>
 				<string></string>
 				<key>x264UseAdvancedOptions</key>
 				<integer>0</integer>
@@ -306,7 +302,7 @@
 						<key>AudioBitrate</key>
 						<string>160</string>
 						<key>AudioEncoder</key>
-						<string>AAC (faac)</string>
+						<string>AAC (avcodec)</string>
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
@@ -349,8 +345,8 @@
 				<integer>0</integer>
 				<key>PictureDeinterlaceCustom</key>
 				<string></string>
-				<key>PictureDenoise</key>
-				<integer>0</integer>
+				<key>PictureDenoiseFilter</key>
+				<integer>off</integer>
 				<key>PictureDenoiseCustom</key>
 				<string></string>
 				<key>PictureDetelecine</key>
@@ -403,19 +399,17 @@
 				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
-				<key>h264Level</key>
+				<key>VideoLevel</key>
 				<string>3.1</string>
-				<key>h264Profile</key>
+				<key>VideoProfile</key>
 				<string>high</string>
-				<key>lavcOption</key>
-				<string></string>
 				<key>x264Option</key>
 				<string></string>
-				<key>x264OptionExtra</key>
+				<key>VideoOptionExtra</key>
 				<string></string>
-				<key>x264Preset</key>
+				<key>VideoPreset</key>
 				<string>medium</string>
-				<key>x264Tune</key>
+				<key>VideoTune</key>
 				<string></string>
 				<key>x264UseAdvancedOptions</key>
 				<integer>0</integer>
@@ -439,7 +433,7 @@
 						<key>AudioBitrate</key>
 						<string>160</string>
 						<key>AudioEncoder</key>
-						<string>AAC (faac)</string>
+						<string>AAC (avcodec)</string>
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
@@ -482,8 +476,8 @@
 				<integer>0</integer>
 				<key>PictureDeinterlaceCustom</key>
 				<string></string>
-				<key>PictureDenoise</key>
-				<integer>0</integer>
+				<key>PictureDenoiseFilter</key>
+				<integer>off</integer>
 				<key>PictureDenoiseCustom</key>
 				<string></string>
 				<key>PictureDetelecine</key>
@@ -536,19 +530,17 @@
 				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
-				<key>h264Level</key>
+				<key>VideoLevel</key>
 				<string>3.1</string>
-				<key>h264Profile</key>
+				<key>VideoProfile</key>
 				<string>high</string>
-				<key>lavcOption</key>
-				<string></string>
 				<key>x264Option</key>
 				<string></string>
-				<key>x264OptionExtra</key>
+				<key>VideoOptionExtra</key>
 				<string></string>
-				<key>x264Preset</key>
+				<key>VideoPreset</key>
 				<string>medium</string>
-				<key>x264Tune</key>
+				<key>VideoTune</key>
 				<string></string>
 				<key>x264UseAdvancedOptions</key>
 				<integer>0</integer>
@@ -572,7 +564,7 @@
 						<key>AudioBitrate</key>
 						<string>160</string>
 						<key>AudioEncoder</key>
-						<string>AAC (faac)</string>
+						<string>AAC (avcodec)</string>
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
@@ -631,8 +623,8 @@
 				<integer>0</integer>
 				<key>PictureDeinterlaceCustom</key>
 				<string></string>
-				<key>PictureDenoise</key>
-				<integer>0</integer>
+				<key>PictureDenoiseFilter</key>
+				<integer>off</integer>
 				<key>PictureDenoiseCustom</key>
 				<string></string>
 				<key>PictureDetelecine</key>
@@ -685,19 +677,17 @@
 				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
-				<key>h264Level</key>
+				<key>VideoLevel</key>
 				<string>3.1</string>
-				<key>h264Profile</key>
+				<key>VideoProfile</key>
 				<string>high</string>
-				<key>lavcOption</key>
-				<string></string>
 				<key>x264Option</key>
 				<string></string>
-				<key>x264OptionExtra</key>
+				<key>VideoOptionExtra</key>
 				<string>qpmin=4:cabac=0:ref=2:b-pyramid=none:weightb=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500</string>
-				<key>x264Preset</key>
+				<key>VideoPreset</key>
 				<string>medium</string>
-				<key>x264Tune</key>
+				<key>VideoTune</key>
 				<string></string>
 				<key>x264UseAdvancedOptions</key>
 				<integer>0</integer>
@@ -721,7 +711,7 @@
 						<key>AudioBitrate</key>
 						<string>160</string>
 						<key>AudioEncoder</key>
-						<string>AAC (faac)</string>
+						<string>AAC (avcodec)</string>
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
@@ -780,8 +770,8 @@
 				<integer>0</integer>
 				<key>PictureDeinterlaceCustom</key>
 				<string></string>
-				<key>PictureDenoise</key>
-				<integer>0</integer>
+				<key>PictureDenoiseFilter</key>
+				<integer>off</integer>
 				<key>PictureDenoiseCustom</key>
 				<string></string>
 				<key>PictureDetelecine</key>
@@ -834,19 +824,17 @@
 				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
-				<key>h264Level</key>
+				<key>VideoLevel</key>
 				<string>3.1</string>
-				<key>h264Profile</key>
+				<key>VideoProfile</key>
 				<string>high</string>
-				<key>lavcOption</key>
-				<string></string>
 				<key>x264Option</key>
 				<string></string>
-				<key>x264OptionExtra</key>
+				<key>VideoOptionExtra</key>
 				<string></string>
-				<key>x264Preset</key>
+				<key>VideoPreset</key>
 				<string>medium</string>
-				<key>x264Tune</key>
+				<key>VideoTune</key>
 				<string></string>
 				<key>x264UseAdvancedOptions</key>
 				<integer>0</integer>
@@ -870,7 +858,7 @@
 						<key>AudioBitrate</key>
 						<string>160</string>
 						<key>AudioEncoder</key>
-						<string>AAC (faac)</string>
+						<string>AAC (avcodec)</string>
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
@@ -929,8 +917,8 @@
 				<integer>0</integer>
 				<key>PictureDeinterlaceCustom</key>
 				<string></string>
-				<key>PictureDenoise</key>
-				<integer>0</integer>
+				<key>PictureDenoiseFilter</key>
+				<integer>off</integer>
 				<key>PictureDenoiseCustom</key>
 				<string></string>
 				<key>PictureDetelecine</key>
@@ -983,19 +971,17 @@
 				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
-				<key>h264Level</key>
+				<key>VideoLevel</key>
 				<string>4.0</string>
-				<key>h264Profile</key>
+				<key>VideoProfile</key>
 				<string>high</string>
-				<key>lavcOption</key>
-				<string></string>
 				<key>x264Option</key>
 				<string></string>
-				<key>x264OptionExtra</key>
+				<key>VideoOptionExtra</key>
 				<string></string>
-				<key>x264Preset</key>
+				<key>VideoPreset</key>
 				<string>medium</string>
-				<key>x264Tune</key>
+				<key>VideoTune</key>
 				<string></string>
 				<key>x264UseAdvancedOptions</key>
 				<integer>0</integer>
@@ -1019,7 +1005,7 @@
 						<key>AudioBitrate</key>
 						<string>128</string>
 						<key>AudioEncoder</key>
-						<string>AAC (faac)</string>
+						<string>AAC (avcodec)</string>
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
@@ -1062,8 +1048,8 @@
 				<integer>0</integer>
 				<key>PictureDeinterlaceCustom</key>
 				<string></string>
-				<key>PictureDenoise</key>
-				<integer>0</integer>
+				<key>PictureDenoiseFilter</key>
+				<integer>off</integer>
 				<key>PictureDenoiseCustom</key>
 				<string></string>
 				<key>PictureDetelecine</key>
@@ -1116,19 +1102,17 @@
 				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
-				<key>h264Level</key>
+				<key>VideoLevel</key>
 				<string>3.0</string>
-				<key>h264Profile</key>
+				<key>VideoProfile</key>
 				<string>main</string>
-				<key>lavcOption</key>
-				<string></string>
 				<key>x264Option</key>
 				<string></string>
-				<key>x264OptionExtra</key>
+				<key>VideoOptionExtra</key>
 				<string></string>
-				<key>x264Preset</key>
+				<key>VideoPreset</key>
 				<string>medium</string>
-				<key>x264Tune</key>
+				<key>VideoTune</key>
 				<string></string>
 				<key>x264UseAdvancedOptions</key>
 				<integer>0</integer>
@@ -1152,7 +1136,7 @@
 						<key>AudioBitrate</key>
 						<string>128</string>
 						<key>AudioEncoder</key>
-						<string>AAC (faac)</string>
+						<string>AAC (avcodec)</string>
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
@@ -1195,8 +1179,8 @@
 				<integer>0</integer>
 				<key>PictureDeinterlaceCustom</key>
 				<string></string>
-				<key>PictureDenoise</key>
-				<integer>0</integer>
+				<key>PictureDenoiseFilter</key>
+				<integer>off</integer>
 				<key>PictureDenoiseCustom</key>
 				<string></string>
 				<key>PictureDetelecine</key>
@@ -1249,19 +1233,148 @@
 				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
-				<key>h264Level</key>
+				<key>VideoLevel</key>
 				<string>3.1</string>
-				<key>h264Profile</key>
+				<key>VideoProfile</key>
 				<string>main</string>
-				<key>lavcOption</key>
+				<key>x264Option</key>
 				<string></string>
+				<key>VideoOptionExtra</key>
+				<string></string>
+				<key>VideoPreset</key>
+				<string>medium</string>
+				<key>VideoTune</key>
+				<string></string>
+				<key>x264UseAdvancedOptions</key>
+				<integer>0</integer>
+			</dict>
+			<dict>
+				<key>AudioAllowAACPass</key>
+				<integer>1</integer>
+				<key>AudioAllowAC3Pass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSHDPass</key>
+				<integer>1</integer>
+				<key>AudioAllowDTSPass</key>
+				<integer>1</integer>
+				<key>AudioAllowMP3Pass</key>
+				<integer>1</integer>
+				<key>AudioEncoderFallback</key>
+				<string>AC3 (ffmpeg)</string>
+				<key>AudioList</key>
+				<array>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>128</string>
+						<key>AudioEncoder</key>
+						<string>AAC (avcodec)</string>
+						<key>AudioMixdown</key>
+						<string>Dolby Pro Logic II</string>
+						<key>AudioSamplerate</key>
+						<string>Auto</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+						<key>AudioTrackGainSlider</key>
+						<real>0.0</real>
+					</dict>
+				</array>
+				<key>ChapterMarkers</key>
+				<integer>0</integer>
+				<key>Default</key>
+				<integer>0</integer>
+				<key>FileFormat</key>
+				<string>MP4 file</string>
+				<key>Folder</key>
+				<false/>
+				<key>Mp4HttpOptimize</key>
+				<integer>0</integer>
+				<key>Mp4LargeFile</key>
+				<integer>0</integer>
+				<key>Mp4iPodCompatible</key>
+				<integer>0</integer>
+				<key>PictureAutoCrop</key>
+				<integer>1</integer>
+				<key>PictureBottomCrop</key>
+				<integer>0</integer>
+				<key>PictureDeblock</key>
+				<integer>0</integer>
+				<key>PictureDecomb</key>
+				<integer>0</integer>
+				<key>PictureDecombCustom</key>
+				<string></string>
+				<key>PictureDecombDeinterlace</key>
+				<integer>1</integer>
+				<key>PictureDeinterlace</key>
+				<integer>0</integer>
+				<key>PictureDeinterlaceCustom</key>
+				<string></string>
+				<key>PictureDenoiseFilter</key>
+				<integer>off</integer>
+				<key>PictureDenoiseCustom</key>
+				<string></string>
+				<key>PictureDetelecine</key>
+				<integer>0</integer>
+				<key>PictureDetelecineCustom</key>
+				<string></string>
+				<key>PictureHeight</key>
+				<integer>720</integer>
+				<key>PictureKeepRatio</key>
+				<integer>1</integer>
+				<key>PictureLeftCrop</key>
+				<integer>0</integer>
+				<key>PictureModulus</key>
+				<integer>2</integer>
+				<key>PicturePAR</key>
+				<integer>0</integer>
+				<key>PictureRightCrop</key>
+				<integer>0</integer>
+				<key>PictureTopCrop</key>
+				<integer>0</integer>
+				<key>PictureWidth</key>
+				<integer>1280</integer>
+				<key>PresetDescription</key>
+				<string>HandBrake's preset for Windows Phone 8 devices</string>
+				<key>PresetName</key>
+				<string>Windows Phone 8</string>
+				<key>Subtitles</key>
+				<string>None</string>
+				<key>Type</key>
+				<integer>0</integer>
+				<key>UsesPictureFilters</key>
+				<integer>1</integer>
+				<key>UsesPictureSettings</key>
+				<integer>1</integer>
+				<key>VideoAvgBitrate</key>
+				<string>2500</string>
+				<key>VideoEncoder</key>
+				<string>H.264 (x264)</string>
+				<key>VideoFramerate</key>
+				<string>30</string>
+				<key>VideoFramerateMode</key>
+				<string>pfr</string>
+				<key>VideoGrayScale</key>
+				<integer>0</integer>
+				<key>VideoQualitySlider</key>
+				<real>22</real>
+				<key>VideoQualityType</key>
+				<integer>2</integer>
+				<key>VideoTurboTwoPass</key>
+				<integer>0</integer>
+				<key>VideoTwoPass</key>
+				<integer>0</integer>
+				<key>VideoLevel</key>
+				<string>3.1</string>
+				<key>VideoProfile</key>
+				<string>main</string>
 				<key>x264Option</key>
 				<string></string>
-				<key>x264OptionExtra</key>
+				<key>VideoOptionExtra</key>
 				<string></string>
-				<key>x264Preset</key>
+				<key>VideoPreset</key>
 				<string>medium</string>
-				<key>x264Tune</key>
+				<key>VideoTune</key>
 				<string></string>
 				<key>x264UseAdvancedOptions</key>
 				<integer>0</integer>
@@ -1272,7 +1385,7 @@
 		<key>Folder</key>
 		<true/>
 		<key>PresetBuildNumber</key>
-		<integer>2013030401</integer>
+		<integer>2013061301</integer>
 		<key>PresetName</key>
 		<string>Devices</string>
 		<key>Type</key>
@@ -1300,7 +1413,7 @@
 						<key>AudioBitrate</key>
 						<string>160</string>
 						<key>AudioEncoder</key>
-						<string>AAC (faac)</string>
+						<string>AAC (avcodec)</string>
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
@@ -1343,8 +1456,8 @@
 				<integer>0</integer>
 				<key>PictureDeinterlaceCustom</key>
 				<string></string>
-				<key>PictureDenoise</key>
-				<integer>0</integer>
+				<key>PictureDenoiseFilter</key>
+				<integer>off</integer>
 				<key>PictureDenoiseCustom</key>
 				<string></string>
 				<key>PictureDetelecine</key>
@@ -1397,19 +1510,17 @@
 				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
-				<key>h264Level</key>
+				<key>VideoLevel</key>
 				<string>4.0</string>
-				<key>h264Profile</key>
+				<key>VideoProfile</key>
 				<string>main</string>
-				<key>lavcOption</key>
-				<string></string>
 				<key>x264Option</key>
 				<string></string>
-				<key>x264OptionExtra</key>
+				<key>VideoOptionExtra</key>
 				<string></string>
-				<key>x264Preset</key>
+				<key>VideoPreset</key>
 				<string>veryfast</string>
-				<key>x264Tune</key>
+				<key>VideoTune</key>
 				<string></string>
 				<key>x264UseAdvancedOptions</key>
 				<integer>0</integer>
@@ -1433,7 +1544,7 @@
 						<key>AudioBitrate</key>
 						<string>160</string>
 						<key>AudioEncoder</key>
-						<string>AAC (faac)</string>
+						<string>AAC (avcodec)</string>
 						<key>AudioMixdown</key>
 						<string>Dolby Pro Logic II</string>
 						<key>AudioSamplerate</key>
@@ -1492,8 +1603,8 @@
 				<integer>0</integer>
 				<key>PictureDeinterlaceCustom</key>
 				<string></string>
-				<key>PictureDenoise</key>
-				<integer>0</integer>
+				<key>PictureDenoiseFilter</key>
+				<integer>off</integer>
 				<key>PictureDenoiseCustom</key>
 				<string></string>
 				<key>PictureDetelecine</key>
@@ -1546,19 +1657,17 @@
 				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
-				<key>h264Level</key>
+				<key>VideoLevel</key>
 				<string>4.1</string>
-				<key>h264Profile</key>
+				<key>VideoProfile</key>
 				<string>high</string>
-				<key>lavcOption</key>
-				<string></string>
 				<key>x264Option</key>
 				<string></string>
-				<key>x264OptionExtra</key>
+				<key>VideoOptionExtra</key>
 				<string></string>
-				<key>x264Preset</key>
+				<key>VideoPreset</key>
 				<string>medium</string>
-				<key>x264Tune</key>
+				<key>VideoTune</key>
 				<string></string>
 				<key>x264UseAdvancedOptions</key>
 				<integer>0</integer>
@@ -1569,7 +1678,7 @@
 		<key>Folder</key>
 		<true/>
 		<key>PresetBuildNumber</key>
-		<integer>2013030401</integer>
+		<integer>2013061301</integer>
 		<key>PresetName</key>
 		<string>Regular</string>
 		<key>Type</key>

HandBrake-0.9.9.tar.bz2/gtk/src/subtitlehandler.c -> HandBrake-0.10.0.tar.bz2/gtk/src/subtitlehandler.c Changed

@@ -2,15 +2,16 @@
 /*
 * subtitlehandler.c
 * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
- * 
+ *
 * subtitlehandler.c is free software.
- * 
+ *
 * You may 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.
 */
 
+#include <glib/gi18n.h>
 #include "ghbcompat.h"
 #include "hb.h"
 #include "settings.h"
@@ -22,118 +23,172 @@
 #include "audiohandler.h"
 #include "subtitlehandler.h"
 
-static gboolean ghb_add_subtitle_to_settings(GValue *settings, GValue *subsettings);
+static void subtitle_add_to_settings(GValue *settings, GValue *subsettings);
 static void ghb_add_subtitle_to_ui(signal_user_data_t *ud, GValue *subsettings);
-static void add_to_subtitle_list(signal_user_data_t *ud, GValue *settings);
-static void add_to_srt_list(signal_user_data_t *ud, GValue *settings);
+static void add_to_subtitle_list_ui(signal_user_data_t *ud, GValue *settings);
 static void ghb_clear_subtitle_list_settings(GValue *settings);
-static void ghb_clear_subtitle_list(signal_user_data_t *ud);
+static void ghb_clear_subtitle_list_ui(GtkBuilder *builder);
 
 static void
-free_subtitle_index_list(gpointer data)
+subtitle_refresh_list_row_ui(
+ GtkTreeModel *tm,
+ GtkTreeIter *ti,
+ GValue *subsettings)
 {
- g_free(data);
-}
+ GtkTreeIter cti;
+ gboolean forced, burned, def;
+ char *info_src, *info_src_2;
+ char *info_dst, *info_dst_2;
 
-static void
-free_subtitle_key(gpointer data)
-{
- if (data != NULL)
- g_free(data);
-}
 
-gboolean
-ghb_canPassSub(int source, int mux)
-{
- return hb_subtitle_can_pass(source, mux);
-}
+ info_src_2 = NULL;
+ info_dst_2 = NULL;
 
-gboolean
-ghb_canBurnSub(int source)
-{
- return hb_subtitle_can_burn(source);
-}
+ forced = ghb_settings_get_boolean(subsettings, "SubtitleForced");
+ burned = ghb_settings_get_boolean(subsettings, "SubtitleBurned");
+ def = ghb_settings_get_boolean(subsettings, "SubtitleDefaultTrack");
+ info_src = g_strdup_printf("%s",
+ ghb_settings_get_const_string(subsettings, "SubtitleTrackDescription"));
+ if (ghb_settings_get_int(subsettings, "SubtitleSource") == SRTSUB)
+ {
+ gint offset;
+ offset = ghb_settings_get_int(subsettings, "SrtOffset");
+ if (offset != 0)
+ {
+ info_dst_2 = g_strdup_printf("Offset: %dms", offset);
+ }
+ }
 
-gboolean
-ghb_canForceSub(int source)
-{
- return hb_subtitle_can_force(source);
-}
+ GString *str = g_string_new("");
+ g_string_append_printf(str, "%s ", burned ? "Burned Into Video" :
+ "Passthrough");
+ if (forced)
+ {
+ g_string_append_printf(str, "(Forced Subtitles Only)");
+ }
+ if (def)
+ {
+ g_string_append_printf(str, "(Default)");
+ }
+ g_string_append_printf(str, "");
 
-gboolean
-ghb_soft_in_subtitle_list(GValue *subtitle_list)
-{
- gint count, ii;
- GValue *settings;
+ info_dst = g_string_free(str, FALSE);
 
- count = ghb_array_len(subtitle_list);
- for (ii = 0; ii < count; ii++)
+ gtk_tree_store_set(GTK_TREE_STORE(tm), ti,
+ // These are displayed in list
+ 0, info_src,
+ 1, "-->",
+ 2, info_dst,
+ 3, "hb-edit",
+ 4, "hb-remove",
+ 5, 0.5,
+ -1);
+
+ if (info_src_2 != NULL || info_dst_2 != NULL)
 {
- settings = ghb_array_get_nth(subtitle_list, ii);
- if (!ghb_settings_get_boolean(settings, "SubtitleBurned"))
+ if (info_src_2 == NULL)
+ info_src_2 = g_strdup("");
+ if (info_dst_2 == NULL)
+ info_dst_2 = g_strdup("");
+
+ if (!gtk_tree_model_iter_children(tm, &cti, ti))
 {
- return TRUE;
+ gtk_tree_store_append(GTK_TREE_STORE(tm), &cti, ti);
+ }
+ gtk_tree_store_set(GTK_TREE_STORE(tm), &cti,
+ // These are displayed in list
+ 0, info_src_2,
+ 2, info_dst_2,
+ 5, 0.0,
+ -1);
+ }
+ else
+ {
+ if (gtk_tree_model_iter_children(tm, &cti, ti))
+ {
+ gtk_tree_store_remove(GTK_TREE_STORE(tm), &cti);
 }
 }
- return FALSE;
+
+ g_free(info_src);
+ g_free(info_src_2);
+ g_free(info_dst);
+ g_free(info_dst_2);
 }
 
-void
-ghb_subtitle_exclusive_burn_settings(GValue *settings, gint index)
+static void
+subtitle_refresh_list_ui_from_settings(signal_user_data_t *ud, GValue *settings)
 {
 GValue *subtitle_list;
 GValue *subsettings;
- gint ii, count;
+ gint ii, count, tm_count;
+ GtkTreeView *tv;
+ GtkTreeModel *tm;
+ GtkTreeIter ti;
+
+ tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+ tm = gtk_tree_view_get_model(tv);
+
+ tm_count = gtk_tree_model_iter_n_children(tm, NULL);
 
- g_debug("ghb_subtitle_exclusive_burn_settings");
 subtitle_list = ghb_settings_get_value(settings, "subtitle_list");
 count = ghb_array_len(subtitle_list);
- for (ii = 0; ii < count; ii++)
+ if (count != tm_count)
 {
- if (ii != index)
+ ghb_clear_subtitle_list_ui(ud->builder);
+ for (ii = 0; ii < count; ii++)
 {
- subsettings = ghb_array_get_nth(subtitle_list, ii);
- ghb_settings_set_boolean(subsettings, "SubtitleBurned", FALSE);
+ gtk_tree_store_append(GTK_TREE_STORE(tm), &ti, NULL);
 }
 }
+ for (ii = 0; ii < count; ii++)
+ {
+ g_return_if_fail(tv != NULL);
+ gtk_tree_model_iter_nth_child(tm, &ti, NULL, ii);
+ subsettings = ghb_array_get_nth(subtitle_list, ii);
+ subtitle_refresh_list_row_ui(tm, &ti, subsettings);
+ }
+}
+
+static void
+subtitle_refresh_list_ui(signal_user_data_t *ud)
+{
+ subtitle_refresh_list_ui_from_settings(ud, ud->settings);
 }
 
 void
-ghb_subtitle_exclusive_burn(signal_user_data_t *ud, gint index)
+ghb_subtitle_exclusive_burn_settings(GValue *settings, gint index)
 {
 GValue *subtitle_list;
 GValue *subsettings;
 gint ii, count;
- GtkTreeView *tv;
- GtkTreeModel *tm;
- GtkTreeIter ti;
 
- g_debug("ghb_subtitle_exclusive_burn");
- subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+ subtitle_list = ghb_settings_get_value(settings, "subtitle_list");
 count = ghb_array_len(subtitle_list);
 for (ii = 0; ii < count; ii++)
 {
- tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
- g_return_if_fail(tv != NULL);
- tm = gtk_tree_view_get_model(tv);
- gtk_tree_model_iter_nth_child(tm, &ti, NULL, ii);
 if (ii != index)
 {
 subsettings = ghb_array_get_nth(subtitle_list, ii);
 ghb_settings_set_boolean(subsettings, "SubtitleBurned", FALSE);
- gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 2, FALSE, -1);
 }
 }
 }
 
 void
+ghb_subtitle_exclusive_burn(signal_user_data_t *ud, gint index)
+{
+ ghb_subtitle_exclusive_burn_settings(ud->settings, index);
+ subtitle_refresh_list_ui(ud);
+}
+
+void
 ghb_subtitle_exclusive_default_settings(GValue *settings, gint index)
 {
 GValue *subtitle_list;
 GValue *subtitle;
 gint ii, count;
 
- g_debug("ghb_subtitle_exclusive_default");
 subtitle_list = ghb_settings_get_value(settings, "subtitle_list");
 count = ghb_array_len(subtitle_list);
 for (ii = 0; ii < count; ii++)
@@ -149,93 +204,29 @@
 void
 ghb_subtitle_exclusive_default(signal_user_data_t *ud, gint index)
 {
- GValue *subtitle_list;
- GValue *settings;
- gint ii, count;
- GtkTreeView *tv;
- GtkTreeModel *tm;
- GtkTreeIter ti;
- gboolean def;
-
- g_debug("ghb_subtitle_exclusive_default");
- subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
- count = ghb_array_len(subtitle_list);
- for (ii = 0; ii < count; ii++)
- {
- settings = ghb_array_get_nth(subtitle_list, ii);
- def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack");
-
- tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
- g_return_if_fail(tv != NULL);
- tm = gtk_tree_view_get_model(tv);
- gtk_tree_model_iter_nth_child(tm, &ti, NULL, ii);
- if (def && ii != index)
- {
-
- ghb_settings_set_boolean(settings, "SubtitleDefaultTrack", FALSE);
- gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 3, FALSE, -1);
- }
- }
+ ghb_subtitle_exclusive_default_settings(ud->settings, index);
+ subtitle_refresh_list_ui(ud);
 }
 
-void
-ghb_add_srt(signal_user_data_t *ud, GValue *settings)
+static void
+ghb_add_subtitle_to_ui(signal_user_data_t *ud, GValue *subsettings)
 {
- // Add the current subtitle settings to the list.
- GValue *subtitle_list;
- gint count;
- const gchar *lang;
- 
- g_debug("ghb_add_srt ()");
-
- ghb_settings_set_boolean(settings, "SubtitleBurned", FALSE);
- // Add the long track description so the queue can access it
- // when a different title is selected.
- lang = ghb_settings_combo_option(settings, "SrtLanguage");
- ghb_settings_set_string(settings, "SubtitleTrackDescription", lang);
-
- subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
- if (subtitle_list == NULL)
- {
- subtitle_list = ghb_array_value_new(8);
- ghb_settings_set_value(ud->settings, "subtitle_list", subtitle_list);
- }
- count = ghb_array_len(subtitle_list);
-
- // Don't allow more than 99
- // This is a had limit imposed by libhb/sync.c:GetFifoForId()
- if (count >= 99)
- {
- ghb_value_free(settings);
+ if (subsettings == NULL)
 return;
- }
-
- ghb_array_append(subtitle_list, settings);
- add_to_srt_list(ud, settings);
 
- if (count == 98)
- {
- GtkWidget *widget;
- widget = GHB_WIDGET (ud->builder, "subtitle_add");
- gtk_widget_set_sensitive(widget, FALSE);
- widget = GHB_WIDGET (ud->builder, "srt_add");
- gtk_widget_set_sensitive(widget, FALSE);
- }
+ // Add the current subtitle settings to the list.
+ add_to_subtitle_list_ui(ud, subsettings);
 ghb_live_reset(ud);
 }
 
-static gboolean
-ghb_add_subtitle_to_settings(GValue *settings, GValue *subsettings)
+static void
+subtitle_add_to_settings(GValue *settings, GValue *subsettings)
 {
 // Add the current subtitle settings to the list.
 GValue *subtitle_list;
 gint count;
- gboolean burned, forced;
- gint source, mux;
- const gchar *track;
- const gchar *lang;
- 
- g_debug("ghb_add_subtitle_to_settings ()");
+ gboolean burned, forced, def;
+ gint source;
 
 subtitle_list = ghb_settings_get_value(settings, "subtitle_list");
 if (subtitle_list == NULL)
@@ -244,39 +235,29 @@
 ghb_settings_set_value(settings, "subtitle_list", subtitle_list);
 }
 
- count = ghb_array_len(subtitle_list);
- // Don't allow more than 99
- // This is a hard limit imposed by libhb/reader.c:GetFifoForId()
- if (count >= 99)
- {
- ghb_value_free(subsettings);
- return FALSE;
- }
-
- // Add the long track description so the queue can access it
- // when a different title is selected.
- track = ghb_settings_combo_option(subsettings, "SubtitleTrack");
- ghb_settings_set_string(subsettings, "SubtitleTrackDescription", track);
+ // Validate some settings
+ const char *mux_id;
+ const hb_container_t *mux;
 
- lang = ghb_settings_combo_string(subsettings, "SubtitleTrack");
- ghb_settings_set_string(subsettings, "SubtitleLanguage", lang);
+ mux_id = ghb_settings_get_const_string(settings, "FileFormat");
+ mux = ghb_lookup_container_by_name(mux_id);
 
- mux = ghb_settings_combo_int(settings, "FileFormat");
 source = ghb_settings_get_int(subsettings, "SubtitleSource");
 burned = ghb_settings_get_boolean(subsettings, "SubtitleBurned");
- if (burned && !ghb_canBurnSub(source))
+ if (burned && !hb_subtitle_can_burn(source))
 {
 burned = FALSE;
 ghb_settings_set_boolean(subsettings, "SubtitleBurned", burned);
 }
- if (!burned && !ghb_canPassSub(source, mux))
+ if (!burned && !hb_subtitle_can_pass(source, mux->format))
 {
 burned = TRUE;
 ghb_settings_set_boolean(subsettings, "SubtitleBurned", burned);
 ghb_settings_set_boolean(subsettings, "SubtitleDefaultTrack", FALSE);
 }
+ def = ghb_settings_get_boolean(subsettings, "SubtitleDefaultTrack");
 forced = ghb_settings_get_boolean(subsettings, "SubtitleForced");
- if (forced && !ghb_canForceSub(source))
+ if (forced && !hb_subtitle_can_force(source))
 {
 forced = FALSE;
 ghb_settings_set_boolean(subsettings, "SubtitleForced", forced);
@@ -284,85 +265,219 @@
 
 ghb_array_append(subtitle_list, subsettings);
 
+ // Check consistancy of exclusive flags
+ count = ghb_array_len(subtitle_list);
 if (burned)
- ghb_subtitle_exclusive_burn_settings(settings, count);
- return TRUE;
+ ghb_subtitle_exclusive_burn_settings(settings, count-1);
+ if (def)
+ ghb_subtitle_exclusive_default_settings(settings, count-1);
 }
 
 static void
-ghb_add_subtitle_to_ui(signal_user_data_t *ud, GValue *subsettings)
+subtitle_set_track_description(GValue *settings, GValue *subsettings)
 {
- // Add the current subtitle settings to the list.
- GValue *subtitle_list;
- gint count;
- 
- g_debug("ghb_add_subtitle_to_ui ()");
- add_to_subtitle_list(ud, subsettings);
+ char *desc = NULL;
 
- subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
- count = ghb_array_len(subtitle_list);
- if (count == 99)
+ if (ghb_settings_get_int(subsettings, "SubtitleSource") == SRTSUB)
 {
- GtkWidget *widget;
- widget = GHB_WIDGET (ud->builder, "subtitle_add");
- gtk_widget_set_sensitive(widget, FALSE);
- widget = GHB_WIDGET (ud->builder, "srt_add");
- gtk_widget_set_sensitive(widget, FALSE);
+ gchar *filename, *code;
+ const gchar *lang;
+
+ lang = ghb_settings_combo_option(subsettings, "SrtLanguage");
+ code = ghb_settings_get_string(subsettings, "SrtCodeset");
+
+ filename = ghb_settings_get_string(subsettings, "SrtFile");
+ if (g_file_test(filename, G_FILE_TEST_IS_REGULAR))
+ {
+ gchar *basename;
+
+ basename = g_path_get_basename(filename);
+ desc = g_strdup_printf("%s (%s)(SRT)(%s)", lang, code, basename);
+ g_free(basename);
+ }
+ else
+ {
+ desc = g_strdup_printf("%s (%s)(SRT)", lang, code);
+ }
+ g_free(code);
 }
- ghb_live_reset(ud);
+ else
+ {
+ int title_id, titleindex;
+ const hb_title_t *title;
+ int track;
+ hb_subtitle_t *subtitle;
+
+ title_id = ghb_settings_get_int(settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ track = ghb_settings_get_int(subsettings, "SubtitleTrack");
+ if (track < 0)
+ {
+ desc = g_strdup(_("Foreign Audio Search"));
+ }
+ else
+ {
+ subtitle = ghb_get_subtitle_info(title, track);
+ if (subtitle != NULL)
+ {
+ desc = g_strdup_printf("%d - %s (%s)", track + 1,
+ subtitle->lang,
+ hb_subsource_name(subtitle->source));
+ }
+ }
+ }
+
+ if (desc != NULL)
+ {
+ ghb_settings_set_string(
+ subsettings, "SubtitleTrackDescription", desc);
+ }
+ else
+ {
+ ghb_settings_set_string(
+ subsettings, "SubtitleTrackDescription", "Error!");
+ }
+
+ g_free(desc);
 }
 
-static void
-add_all_pref_subtitles(signal_user_data_t *ud)
+static GValue* subtitle_add_track(
+ signal_user_data_t *ud,
+ GValue *settings,
+ const hb_title_t *title,
+ int track,
+ int mux,
+ gboolean default_track,
+ gboolean srt,
+ gboolean *burned)
 {
- const GValue *pref_subtitle;
- GValue *subtitle;
- gint count, ii, track;
- char *lang;
+ int source = 0;
 
- pref_subtitle = ghb_settings_get_value(ud->settings, "SubtitleList");
- count = ghb_array_len(pref_subtitle);
- for (ii = 0; ii < count; ii++)
+ if (track >= 0 && !srt)
 {
- subtitle = ghb_value_dup(ghb_array_get_nth(pref_subtitle, ii));
- lang = ghb_settings_get_string(subtitle, "SubtitleLanguage");
- // If there are multiple subtitles using the same language, then
- // select sequential tracks for each. The hash keeps track 
- // of the tracks used for each language.
- track = ghb_find_pref_subtitle_track(lang);
- g_free(lang);
- if (track >= -1)
- {
- int source;
+ hb_subtitle_t *subtitle = hb_list_item(title->list_subtitle, track);
+ source = subtitle->source;
+ }
+ else if (srt)
+ {
+ source = SRTSUB;
+ }
 
- // Add to subtitle list
- ghb_settings_set_int(subtitle, "SubtitleTrack", track);
- source = ghb_subtitle_track_source(ud->settings, track);
- ghb_settings_set_int(subtitle, "SubtitleSource", source);
+ if (*burned && !hb_subtitle_can_pass(source, mux))
+ {
+ // Can only burn one. Skip others that must be burned.
+ return NULL;
+ }
 
- if (!ghb_add_subtitle_to_settings(ud->settings, subtitle))
- return;
+ GValue *subsettings = ghb_dict_value_new();
+ ghb_settings_set_int(subsettings, "SubtitleTrack", track);
+ ghb_settings_set_int(subsettings, "SubtitleSource", source);
 
- ghb_add_subtitle_to_ui(ud, subtitle);
- }
+ // Set default SRT settings
+ gchar *pref_lang, *dir, *filename;
+
+ pref_lang = ghb_settings_get_string(settings, "PreferredLanguage");
+ ghb_settings_set_string(subsettings, "SrtLanguage", pref_lang);
+ g_free(pref_lang);
+
+ ghb_settings_set_string(subsettings, "SrtCodeset", "UTF-8");
+
+ dir = ghb_settings_get_string(ud->prefs, "SrtDir");
+ filename = g_strdup_printf("%s/none", dir);
+ ghb_settings_set_string(subsettings, "SrtFile", filename);
+ g_free(dir);
+ g_free(filename);
+
+ ghb_settings_set_int(subsettings, "SrtOffset", 0);
+
+ subtitle_set_track_description(settings, subsettings);
+
+ if (!hb_subtitle_can_pass(source, mux))
+ {
+ ghb_settings_set_boolean(subsettings, "SubtitleBurned", TRUE);
+ *burned = TRUE;
+ }
+ else
+ {
+ ghb_settings_set_boolean(subsettings, "SubtitleBurned", FALSE);
+ }
+ if (track == -1)
+ {
+ // Foreign audio search "track"
+ ghb_settings_set_boolean(subsettings, "SubtitleForced", TRUE);
+ }
+ else
+ {
+ ghb_settings_set_boolean(subsettings, "SubtitleForced", FALSE);
+ }
+ if (default_track)
+ {
+ ghb_settings_set_boolean(subsettings, "SubtitleDefaultTrack", TRUE);
+ }
+ else
+ {
+ ghb_settings_set_boolean(subsettings, "SubtitleDefaultTrack", FALSE);
+ }
+ subtitle_add_to_settings(settings, subsettings);
+
+ return subsettings;
+}
+
+void
+ghb_subtitle_title_change(signal_user_data_t *ud, gboolean show)
+{
+ GtkWidget *w = GHB_WIDGET(ud->builder, "subtitle_add");
+ gtk_widget_set_sensitive(w, show);
+ w = GHB_WIDGET(ud->builder, "subtitle_add_all");
+ gtk_widget_set_sensitive(w, show);
+ w = GHB_WIDGET(ud->builder, "subtitle_reset");
+ gtk_widget_set_sensitive(w, show);
+
+ int title_id, titleindex;
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ const hb_title_t *title = ghb_lookup_title(title_id, &titleindex);
+ if (title != NULL)
+ {
+ w = GHB_WIDGET(ud->builder, "SubtitleSrtDisable");
+ gtk_widget_set_sensitive(w, !!hb_list_count(title->list_subtitle));
 }
 }
 
 void
-ghb_set_pref_subtitle_settings(gint titleindex, GValue *settings)
+ghb_set_pref_subtitle_settings(signal_user_data_t *ud, const hb_title_t *title, GValue *settings)
 {
 gint track;
- GHashTable *track_indices;
- gchar *lang, *pref_lang = NULL;
- const gchar *audio_lang;
- gint foreign_lang_index = -1;
- gboolean found_cc = FALSE;
+ gboolean *used;
+ const gchar *audio_lang, *pref_lang = NULL;
+ gboolean foreign_audio_search, foreign_audio_subs;
+ gboolean one_burned = FALSE;
 
- const GValue *pref_subtitle;
- GValue *subtitle;
- gint count, ii, jj;
- 
- g_debug("ghb_set_pref_subtitle %d", titleindex);
+ const GValue *lang_list;
+ gint lang_count, sub_count, ii;
+ int behavior;
+
+ behavior = ghb_settings_combo_int(settings,
+ "SubtitleTrackSelectionBehavior");
+ // Clear the subtitle list
+ ghb_clear_subtitle_list_settings(settings);
+
+ if (title == NULL)
+ {
+ // no source title
+ return;
+ }
+ sub_count = hb_list_count(title->list_subtitle);
+ if (sub_count == 0)
+ {
+ // No source subtitles
+ return;
+ }
+
+ const char *mux_id;
+ const hb_container_t *mux;
+
+ mux_id = ghb_settings_get_const_string(settings, "FileFormat");
+ mux = ghb_lookup_container_by_name(mux_id);
 
 // Check to see if we need to add a subtitle track for foreign audio
 // language films. A subtitle track will be added if:
@@ -370,560 +485,445 @@
 // The first (default) audio track language does NOT match the users
 // chosen Preferred Language AND the Preferred Language is NOT Any (und).
 //
- audio_lang = ghb_get_user_audio_lang(settings, titleindex, 0);
- pref_lang = ghb_settings_get_string(settings, "PreferredLanguage");
-
- if (audio_lang != NULL && pref_lang != NULL &&
- (strcmp(audio_lang, pref_lang) == 0 || strcmp("und", pref_lang) == 0))
+ audio_lang = ghb_get_user_audio_lang(settings, title, 0);
+ foreign_audio_search = ghb_settings_get_boolean(
+ settings, "SubtitleAddForeignAudioSearch");
+ foreign_audio_subs = ghb_settings_get_boolean(
+ settings, "SubtitleAddForeignAudioSubtitle");
+ lang_list = ghb_settings_get_value(settings, "SubtitleLanguageList");
+ lang_count = ghb_array_len(lang_list);
+ if (lang_count > 0)
 {
- g_free(pref_lang);
- pref_lang = NULL;
+ GValue *glang = ghb_array_get_nth(lang_list, 0);
+ pref_lang = g_value_get_string(glang);
 }
 
- track_indices = g_hash_table_new_full(g_str_hash, g_str_equal, 
- free_subtitle_key, free_subtitle_index_list);
-
- ghb_settings_set_int(settings, "SubtitleTrack", 0);
-
- // Clear the subtitle list
- ghb_clear_subtitle_list_settings(settings);
- if (titleindex < 0)
+ if (pref_lang == NULL || !strncmp(pref_lang, "und", 4))
 {
- return;
+ foreign_audio_search = foreign_audio_subs = FALSE;
+ pref_lang = NULL;
 }
 
- // Find "best" subtitle based on subtitle preferences
- pref_subtitle = ghb_settings_get_value(settings, "SubtitleList");
+ used = g_malloc0(sub_count * sizeof(gboolean));
 
- count = ghb_array_len(pref_subtitle);
- jj = 0;
- for (ii = 0; ii < count; ii++)
+ if (foreign_audio_subs &&
+ (audio_lang == NULL || strncmp(audio_lang, pref_lang, 4)))
 {
- gint source;
- gboolean force, burn;
-
- subtitle = ghb_array_get_nth(pref_subtitle, ii);
- lang = ghb_settings_get_string(subtitle, "SubtitleLanguage");
- source = ghb_settings_get_int(subtitle, "SubtitleSource");
- burn = ghb_settings_get_boolean(subtitle, "SubtitleBurned");
- force = ghb_settings_get_boolean(subtitle, "SubtitleForced");
- // If there are multiple subtitles using the same language, then
- // select sequential tracks for each. The hash keeps track 
- // of the tracks used for each language.
- track = ghb_find_subtitle_track(titleindex, lang, burn, 
- force, source, track_indices);
- g_free(lang);
- if (track >= -1)
+ // Add preferred language subtitle since first audio track
+ // is foreign language.
+ foreign_audio_search = FALSE;
+ track = ghb_find_subtitle_track(title, pref_lang, 0);
+ if (track > 0)
 {
- const gchar *track_lang;
- GValue *dup = ghb_value_dup(subtitle);
- track_lang = ghb_subtitle_track_lang(settings, track);
- ghb_settings_set_int(dup, "SubtitleTrack", track);
- if (foreign_lang_index < 0 && pref_lang != NULL &&
- strcmp(track_lang, pref_lang) == 0 &&
- !ghb_settings_get_boolean(dup, "SubtitleBurned"))
- {
- foreign_lang_index = jj;
- ghb_settings_take_value(dup, "SubtitleForced", 
- ghb_boolean_value_new(FALSE));
- ghb_settings_take_value(dup, "SubtitleDefaultTrack", 
- ghb_boolean_value_new(TRUE));
- }
- source = ghb_subtitle_track_source(settings, track);
- ghb_settings_set_int(dup, "SubtitleSource", source);
- if (source == CC608SUB || source == CC708SUB)
- found_cc = TRUE;
- ghb_add_subtitle_to_settings(settings, dup);
- jj++;
+ used[track] = TRUE;
+ subtitle_add_track(ud, settings, title, track, mux->format,
+ TRUE, FALSE, &one_burned);
 }
 }
- if (foreign_lang_index < 0 && pref_lang != NULL)
+
+ if (foreign_audio_search &&
+ (audio_lang != NULL && !strncmp(audio_lang, pref_lang, 4)))
 {
- // Subtitle for foreign language audio not added yet
- GValue *subsettings;
- gboolean burn;
+ // Add search for foreign audio segments
+ subtitle_add_track(ud, settings, title, -1, mux->format,
+ TRUE, FALSE, &one_burned);
+ }
 
- track = ghb_find_subtitle_track(titleindex, pref_lang, FALSE, FALSE, PGSSUB, track_indices);
- if (track >= -1)
+ if (behavior != 0)
+ {
+ // Find "best" subtitle based on subtitle preferences
+ for (ii = 0; ii < lang_count; ii++)
 {
- int source;
+ GValue *glang = ghb_array_get_nth(lang_list, ii);
+ const gchar *lang = g_value_get_string(glang);
 
- subsettings = ghb_dict_value_new();
- ghb_settings_set_int(subsettings, "SubtitleTrack", track);
- source = ghb_subtitle_track_source(settings, track);
- ghb_settings_set_int(subsettings, "SubtitleSource", source);
- burn = FALSE;
- ghb_settings_take_value(subsettings, "SubtitleForced", 
- ghb_boolean_value_new(FALSE));
- ghb_settings_take_value(subsettings, "SubtitleBurned", 
- ghb_boolean_value_new(burn));
- ghb_settings_take_value(subsettings, "SubtitleDefaultTrack", 
- ghb_boolean_value_new(TRUE));
-
- ghb_add_subtitle_to_settings(settings, subsettings);
- foreign_lang_index = jj;
+ int next_track = 0;
+ track = ghb_find_subtitle_track(title, lang, next_track);
+ while (track >= 0)
+ {
+ if (!used[track])
+ {
+ used[track] = TRUE;
+ subtitle_add_track(ud, settings, title, track, mux->format,
+ FALSE, FALSE, &one_burned);
+ }
+ next_track = track + 1;
+ if (behavior == 2)
+ {
+ track = ghb_find_subtitle_track(title, lang, next_track);
+ }
+ else
+ {
+ break;
+ }
+ }
 }
 }
- if (foreign_lang_index >= 0)
- {
- GValue *subtitle_list;
- gboolean burn, def;
-
- subtitle_list = ghb_settings_get_value(settings, "subtitle_list");
- subtitle = ghb_array_get_nth(subtitle_list, foreign_lang_index);
 
- burn = ghb_settings_get_boolean(subtitle, "SubtitleBurned");
- def = ghb_settings_get_boolean(subtitle, "SubtitleDefaultTrack");
- if (burn)
- ghb_subtitle_exclusive_burn_settings(settings, foreign_lang_index);
- if (def)
- ghb_subtitle_exclusive_default_settings(settings, foreign_lang_index);
- ghb_log("adding subtitle for foreign language audio: %s", audio_lang);
- }
- if (ghb_settings_get_boolean(settings, "AddCC") && !found_cc)
+ if (ghb_settings_get_boolean(settings, "SubtitleAddCC"))
 {
- // Subtitle for foreign language audio not added yet
- GValue *subsettings;
+ for (track = 0; track < sub_count; track++)
+ {
+ hb_subtitle_t *subtitle = hb_list_item(title->list_subtitle, track);
+ if (subtitle->source == CC608SUB || subtitle->source == CC708SUB)
+ break;
+ }
 
- track = ghb_find_cc_track(titleindex);
- if (track >= 0)
+ if (track < sub_count && !used[track])
 {
- int source;
- subsettings = ghb_dict_value_new();
- ghb_settings_set_int(subsettings, "SubtitleTrack", track);
- source = ghb_subtitle_track_source(settings, track);
- ghb_settings_set_int(subsettings, "SubtitleSource", source);
- ghb_settings_take_value(subsettings, "SubtitleForced", 
- ghb_boolean_value_new(FALSE));
- ghb_settings_take_value(subsettings, "SubtitleBurned", 
- ghb_boolean_value_new(FALSE));
- ghb_settings_take_value(subsettings, "SubtitleDefaultTrack", 
- ghb_boolean_value_new(FALSE));
-
- ghb_add_subtitle_to_settings(settings, subsettings);
- ghb_log("adding Closed Captions: %s", audio_lang);
+ used[track] = TRUE;
+ subtitle_add_track(ud, settings, title, track, mux->format,
+ FALSE, FALSE, &one_burned);
 }
 }
- if (pref_lang != NULL)
- g_free(pref_lang);
- g_hash_table_destroy(track_indices);
+ g_free(used);
 }
 
 void
-ghb_set_pref_subtitle(gint titleindex, signal_user_data_t *ud)
+ghb_set_pref_subtitle(const hb_title_t *title, signal_user_data_t *ud)
 {
- ghb_set_pref_subtitle_settings(titleindex, ud->settings);
- ghb_clear_subtitle_list(ud);
- if (titleindex < 0)
+ int sub_count;
+ GtkWidget *widget;
+
+ ghb_clear_subtitle_list_ui(ud->builder);
+ if (title == NULL)
 {
- add_all_pref_subtitles(ud);
+ // Clear the subtitle list
+ ghb_clear_subtitle_list_settings(ud->settings);
 return;
 }
-
- gint count, ii;
- GValue *subtitle_list;
- subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
- count = ghb_array_len(subtitle_list);
- for (ii = 0; ii < count; ii++)
+ sub_count = hb_list_count(title->list_subtitle);
+ if (sub_count == 0)
+ {
+ // No source subtitles
+ widget = GHB_WIDGET(ud->builder, "SubtitleSrtDisable");
+ gtk_widget_set_sensitive(widget, FALSE);
+ }
+ else
 {
- GValue *subtitle;
- subtitle = ghb_array_get_nth(subtitle_list, ii);
- ghb_add_subtitle_to_ui(ud, subtitle);
+ widget = GHB_WIDGET(ud->builder, "SubtitleSrtDisable");
+ gtk_widget_set_sensitive(widget, TRUE);
 }
+ ghb_set_pref_subtitle_settings(ud, title, ud->settings);
+ subtitle_refresh_list_ui(ud);
 }
 
 gint
 ghb_selected_subtitle_row(signal_user_data_t *ud)
 {
- GtkTreeView *treeview;
- GtkTreePath *treepath;
- GtkTreeSelection *selection;
- GtkTreeModel *store;
+ GtkTreeView *tv;
+ GtkTreePath *tp;
+ GtkTreeSelection *ts;
+ GtkTreeModel *tm;
 GtkTreeIter iter;
 gint *indices;
 gint row = -1;
- 
+
 g_debug("ghb_selected_subtitle_row ()");
- treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
- selection = gtk_tree_view_get_selection (treeview);
- if (gtk_tree_selection_get_selected(selection, &store, &iter))
+ tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+ ts = gtk_tree_view_get_selection(tv);
+ if (gtk_tree_selection_get_selected(ts, &tm, &iter))
 {
 // Get the row number
- treepath = gtk_tree_model_get_path (store, &iter);
- indices = gtk_tree_path_get_indices (treepath);
+ tp = gtk_tree_model_get_path(tm, &iter);
+ indices = gtk_tree_path_get_indices(tp);
 row = indices[0];
- gtk_tree_path_free(treepath);
+ gtk_tree_path_free(tp);
 }
 return row;
 }
 
-GValue*
-ghb_selected_subtitle_settings(signal_user_data_t *ud)
+static GValue*
+subtitle_get_selected_settings(signal_user_data_t *ud, int *index)
 {
- GtkTreeView *treeview;
- GtkTreePath *treepath;
- GtkTreeSelection *selection;
- GtkTreeModel *store;
+ GtkTreeView *tv;
+ GtkTreePath *tp;
+ GtkTreeSelection *ts;
+ GtkTreeModel *tm;
 GtkTreeIter iter;
 gint *indices;
 gint row;
- GValue *settings = NULL;
+ GValue *subsettings = NULL;
 const GValue *subtitle_list;
- 
+
 g_debug("get_selected_settings ()");
- treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
- selection = gtk_tree_view_get_selection (treeview);
- if (gtk_tree_selection_get_selected(selection, &store, &iter))
+ tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+ ts = gtk_tree_view_get_selection(tv);
+ if (gtk_tree_selection_get_selected(ts, &tm, &iter))
 {
 // Get the row number
- treepath = gtk_tree_model_get_path (store, &iter);
- indices = gtk_tree_path_get_indices (treepath);
+ tp = gtk_tree_model_get_path(tm, &iter);
+ indices = gtk_tree_path_get_indices(tp);
 row = indices[0];
- gtk_tree_path_free(treepath);
- // find subtitle settings
+ gtk_tree_path_free(tp);
 if (row < 0) return NULL;
+
 subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
 if (row >= ghb_array_len(subtitle_list))
 return NULL;
- settings = ghb_array_get_nth(subtitle_list, row);
+
+ subsettings = ghb_array_get_nth(subtitle_list, row);
+ if (index != NULL)
+ *index = row;
 }
- return settings;
+ return subsettings;
 }
 
-G_MODULE_EXPORT void
-subtitle_forced_toggled_cb(
- GtkCellRendererToggle *cell, 
- gchar *path,
- signal_user_data_t *ud)
+static void
+subtitle_update_dialog_widgets(signal_user_data_t *ud, GValue *subsettings)
 {
- GtkTreeView *tv;
- GtkTreeModel *tm;
- GtkTreeIter ti;
- gboolean active;
- gint row;
- GtkTreePath *tp;
- gint *indices;
- GValue *subtitle_list, *settings;
- gint source;
+ GtkWidget *widget;
 
- g_debug("forced toggled");
- tp = gtk_tree_path_new_from_string (path);
- tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
- g_return_if_fail(tv != NULL);
- tm = gtk_tree_view_get_model(tv);
- g_return_if_fail(tm != NULL);
- gtk_tree_model_get_iter(tm, &ti, tp);
- gtk_tree_model_get(tm, &ti, 1, &active, -1);
- active ^= 1;
-
- // Get the row number
- indices = gtk_tree_path_get_indices (tp);
- row = indices[0];
- gtk_tree_path_free(tp);
+ if (subsettings != NULL)
+ {
+ // Update widgets with subsettings
+ gboolean burn, force, def;
 
- subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+ const char *mux_id;
+ const hb_container_t *mux;
 
- if (row < 0 || row >= ghb_array_len(subtitle_list))
- return;
+ mux_id = ghb_settings_get_const_string(ud->settings, "FileFormat");
+ mux = ghb_lookup_container_by_name(mux_id);
 
- settings = ghb_array_get_nth(subtitle_list, row);
+ int source = ghb_settings_get_int(subsettings, "SubtitleSource");
 
- source = ghb_settings_get_int(settings, "SubtitleSource");
- if (!ghb_canForceSub(source))
- {
- return;
- }
+ ghb_ui_update_from_settings(ud, "SubtitleTrack", subsettings);
+ ghb_ui_update_from_settings(ud, "SrtLanguage", subsettings);
+ ghb_ui_update_from_settings(ud, "SrtCodeset", subsettings);
+ ghb_ui_update_from_settings(ud, "SrtFile", subsettings);
+ ghb_ui_update_from_settings(ud, "SrtOffset", subsettings);
 
- ghb_settings_set_boolean(settings, "SubtitleForced", active);
- gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 1, active, -1);
- ghb_live_reset(ud);
-}
+ if (source == SRTSUB)
+ {
+ ghb_ui_update(ud, "SubtitleSrtEnable", ghb_boolean_value(TRUE));
+ }
+ else
+ {
+ ghb_ui_update(ud, "SubtitleSrtDisable", ghb_boolean_value(TRUE));
+ }
 
-G_MODULE_EXPORT void
-subtitle_burned_toggled_cb(
- GtkCellRendererToggle *cell, 
- gchar *path,
- signal_user_data_t *ud)
-{
- GtkTreeView *tv;
- GtkTreeModel *tm;
- GtkTreeIter ti;
- GtkTreePath *tp;
- gboolean active;
- gint row;
- gint *indices;
- GValue *subtitle_list;
- gint count;
- GValue *settings;
- gint source, mux;
+ widget = GHB_WIDGET(ud->builder, "SubtitleBurned");
+ gtk_widget_set_sensitive(widget, hb_subtitle_can_burn(source) &&
+ hb_subtitle_can_pass(source, mux->format));
+ widget = GHB_WIDGET(ud->builder, "SubtitleForced");
+ gtk_widget_set_sensitive(widget, hb_subtitle_can_force(source));
+ widget = GHB_WIDGET(ud->builder, "SubtitleDefaultTrack");
+ gtk_widget_set_sensitive(widget,
+ hb_subtitle_can_pass(source, mux->format));
 
- g_debug("burned toggled");
- tp = gtk_tree_path_new_from_string (path);
- tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
- g_return_if_fail(tv != NULL);
- tm = gtk_tree_view_get_model(tv);
- g_return_if_fail(tm != NULL);
- gtk_tree_model_get_iter(tm, &ti, tp);
- gtk_tree_model_get(tm, &ti, 2, &active, -1);
- active ^= 1;
-
- // Get the row number
- indices = gtk_tree_path_get_indices (tp);
- row = indices[0];
- gtk_tree_path_free(tp);
+ burn = ghb_settings_get_int(subsettings, "SubtitleBurned");
+ force = ghb_settings_get_int(subsettings, "SubtitleForced");
+ def = ghb_settings_get_int(subsettings, "SubtitleDefaultTrack");
 
- subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
- count = ghb_array_len(subtitle_list);
- if (row < 0 || row >= count)
- return;
+ if (!hb_subtitle_can_burn(source))
+ {
+ burn = FALSE;
+ }
+ if (!hb_subtitle_can_force(source))
+ {
+ force = FALSE;
+ }
+ if (!hb_subtitle_can_pass(source, mux->format))
+ {
+ def = FALSE;
+ burn = TRUE;
+ }
+ ghb_settings_set_boolean(subsettings, "SubtitleBurned", burn);
+ ghb_ui_update(ud, "SubtitleBurned", ghb_boolean_value(burn));
+ ghb_settings_set_boolean(subsettings, "SubtitleForced", force);
+ ghb_ui_update(ud, "SubtitleForced", ghb_boolean_value(force));
+ ghb_settings_set_boolean(subsettings, "SubtitleDefaultTrack", def);
+ ghb_ui_update(ud, "SubtitleDefaultTrack", ghb_boolean_value(def));
+
+ // Hide regular subtitle widgets
+ widget = GHB_WIDGET(ud->builder, "subtitle_track_box");
+ gtk_widget_set_visible(widget, source != SRTSUB);
+
+ // Show SRT subitle widgets
+ widget = GHB_WIDGET(ud->builder, "subtitle_srt_grid");
+ gtk_widget_set_visible(widget, source == SRTSUB);
+ }
+ else
+ {
+ // Hide SRT subitle widgets
+ widget = GHB_WIDGET(ud->builder, "subtitle_srt_grid");
+ gtk_widget_set_visible(widget, FALSE);
 
- settings = ghb_array_get_nth(subtitle_list, row);
- source = ghb_settings_get_int(settings, "SubtitleSource");
- if (!ghb_canBurnSub(source))
- return;
- mux = ghb_settings_combo_int(ud->settings, "FileFormat");
- if (!active && !hb_subtitle_can_pass(source, mux))
- return;
+ // Show regular subtitle widgets
+ widget = GHB_WIDGET(ud->builder, "subtitle_track_box");
+ gtk_widget_set_visible(widget, TRUE);
+ }
+}
 
- ghb_settings_set_boolean(settings, "SubtitleBurned", active);
- gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 2, active, -1);
+static GValue*
+subtitle_update_setting(GtkWidget *widget, signal_user_data_t *ud)
+{
+ GValue *subsettings;
 
- if (active)
+ ghb_widget_to_setting(ud->settings, widget);
+ subsettings = subtitle_get_selected_settings(ud, NULL);
+ if (subsettings != NULL)
 {
- ghb_settings_set_boolean(settings, "SubtitleDefaultTrack", !active);
- gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 3, !active, -1);
+ ghb_widget_to_setting(subsettings, widget);
+ ghb_subtitle_list_refresh_selected(ud);
+ ghb_live_reset(ud);
 }
+ return subsettings;
+}
 
- // Unburn the rest
- if (active)
- ghb_subtitle_exclusive_burn(ud, row);
- ghb_live_reset(ud);
+G_MODULE_EXPORT void
+subtitle_track_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ GValue *subsettings;
+
+ g_debug("subtitle_track_changed_cb()");
+ ghb_widget_to_setting(ud->settings, widget);
+ subsettings = subtitle_get_selected_settings(ud, NULL);
+ if (subsettings != NULL)
+ {
+ gint track, source;
+
+ ghb_widget_to_setting(subsettings, widget);
+ track = ghb_settings_get_int(subsettings, "SubtitleTrack");
+ source = ghb_subtitle_track_source(ud->settings, track);
+ ghb_settings_set_int(subsettings, "SubtitleSource", source);
+ subtitle_set_track_description(ud->settings, subsettings);
+ subtitle_update_dialog_widgets(ud, subsettings);
+ ghb_subtitle_list_refresh_selected(ud);
+ ghb_live_reset(ud);
+ }
 }
 
 G_MODULE_EXPORT void
-subtitle_default_toggled_cb(
- GtkCellRendererToggle *cell, 
- gchar *path,
- signal_user_data_t *ud)
+subtitle_forced_toggled_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
- GtkTreeView *tv;
- GtkTreeModel *tm;
- GtkTreeIter ti;
- GtkTreePath *tp;
- gboolean active;
- gint row;
- gint *indices;
- GValue *subtitle_list;
- gint count;
- GValue *settings;
+ subtitle_update_setting(widget, ud);
+}
 
- g_debug("default toggled");
- tp = gtk_tree_path_new_from_string (path);
- tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
- g_return_if_fail(tv != NULL);
- tm = gtk_tree_view_get_model(tv);
- g_return_if_fail(tm != NULL);
- gtk_tree_model_get_iter(tm, &ti, tp);
- gtk_tree_model_get(tm, &ti, 3, &active, -1);
- active ^= 1;
-
- // Get the row number
- indices = gtk_tree_path_get_indices (tp);
- row = indices[0];
- gtk_tree_path_free(tp);
+G_MODULE_EXPORT void
+subtitle_burned_toggled_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ GValue *subsettings;
+ int index;
 
- subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
- count = ghb_array_len(subtitle_list);
- if (row < 0 || row >= count)
- return;
+ ghb_widget_to_setting(ud->settings, widget);
+ subsettings = subtitle_get_selected_settings(ud, &index);
+ if (subsettings != NULL)
+ {
+ ghb_widget_to_setting(subsettings, widget);
+ if (ghb_settings_get_boolean(subsettings, "SubtitleBurned"))
+ {
+ ghb_ui_update(ud, "SubtitleDefaultTrack", ghb_boolean_value(FALSE));
+ ghb_subtitle_exclusive_burn(ud, index);
+ }
+ ghb_subtitle_list_refresh_selected(ud);
+ ghb_live_reset(ud);
+ }
+}
 
- settings = ghb_array_get_nth(subtitle_list, row);
+G_MODULE_EXPORT void
+subtitle_default_toggled_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ GValue *subsettings;
+ int index;
 
- int source, mux;
- source = ghb_settings_get_int(settings, "SubtitleSource");
- mux = ghb_settings_combo_int(ud->settings, "FileFormat");
- if (active && !hb_subtitle_can_pass(source, mux))
- return;
+ ghb_widget_to_setting(ud->settings, widget);
+ subsettings = subtitle_get_selected_settings(ud, &index);
+ if (subsettings != NULL)
+ {
+ ghb_widget_to_setting(subsettings, widget);
+ if (ghb_settings_get_boolean(subsettings, "SubtitleDefaultTrack"))
+ {
+ ghb_ui_update(ud, "SubtitleBurned", ghb_boolean_value(FALSE));
+ ghb_subtitle_exclusive_default(ud, index);
+ }
+ ghb_subtitle_list_refresh_selected(ud);
+ ghb_live_reset(ud);
+ }
+}
 
- ghb_settings_set_boolean(settings, "SubtitleDefaultTrack", active);
- gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 3, active, -1);
+G_MODULE_EXPORT void
+subtitle_srt_radio_toggled_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ GValue *subsettings;
 
- if (active)
+ ghb_widget_to_setting(ud->settings, widget);
+ subsettings = subtitle_get_selected_settings(ud, NULL);
+ if (subsettings != NULL)
 {
- ghb_settings_set_boolean(settings, "SubtitleBurned", !active);
- gtk_list_store_set(GTK_LIST_STORE(tm), &ti, 2, !active, -1);
+ if (ghb_settings_get_boolean(ud->settings, "SubtitleSrtEnable"))
+ {
+ ghb_settings_set_int(subsettings, "SubtitleSource", SRTSUB);
+ }
+ else
+ {
+ int track, source;
+
+ track = ghb_settings_get_int(subsettings, "SubtitleTrack");
+ source = ghb_subtitle_track_source(ud->settings, track);
+ ghb_settings_set_int(subsettings, "SubtitleSource", source);
+ }
+ subtitle_set_track_description(ud->settings, subsettings);
+ subtitle_update_dialog_widgets(ud, subsettings);
+ ghb_subtitle_list_refresh_selected(ud);
+ ghb_live_reset(ud);
 }
- // allow only one default
- ghb_subtitle_exclusive_default(ud, row);
- ghb_live_reset(ud);
 }
 
 void
 ghb_subtitle_list_refresh_selected(signal_user_data_t *ud)
 {
- GtkTreeView *treeview;
- GtkTreePath *treepath;
- GtkTreeSelection *selection;
- GtkTreeModel *store;
- GtkTreeIter iter;
+ GtkTreeView *tv;
+ GtkTreeModel *tm;
+ GtkTreePath *tp;
+ GtkTreeSelection *ts;
+ GtkTreeIter ti;
 gint *indices;
 gint row;
- GValue *settings = NULL;
+ GValue *subsettings = NULL;
 const GValue *subtitle_list;
- gboolean allow_force = FALSE;
- gboolean allow_burn = FALSE;
- 
- g_debug("subtitle_list_refresh_selected ()");
- treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
- selection = gtk_tree_view_get_selection (treeview);
- if (gtk_tree_selection_get_selected(selection, &store, &iter))
- {
- gchar *track, *source;
- gboolean forced, burned, def;
- gchar *s_track;
- gint offset = 0;
- 
+
+ g_debug("subtitle_list_refresh_selected()");
+ tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+ ts = gtk_tree_view_get_selection(tv);
+ if (gtk_tree_selection_get_selected(ts, &tm, &ti))
+ {
 // Get the row number
- treepath = gtk_tree_model_get_path (store, &iter);
- indices = gtk_tree_path_get_indices (treepath);
+ tp = gtk_tree_model_get_path(tm, &ti);
+ indices = gtk_tree_path_get_indices(tp);
 row = indices[0];
- gtk_tree_path_free(treepath);
+ gtk_tree_path_free(tp);
 if (row < 0) return;
+
 subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
 if (row >= ghb_array_len(subtitle_list))
 return;
- settings = ghb_array_get_nth(subtitle_list, row);
-
- burned = ghb_settings_get_boolean(settings, "SubtitleBurned");
 
- gint i_source;
- i_source = ghb_settings_get_int(settings, "SubtitleSource");
- if (!ghb_canBurnSub(i_source))
- {
- burned = FALSE;
- ghb_settings_set_boolean(settings, "SubtitleBurned", burned);
- }
-
- gint i_mux;
- i_mux = ghb_settings_combo_int(ud->settings, "FileFormat");
- if (!burned && !ghb_canPassSub(i_source, i_mux))
- {
- burned = TRUE;
- ghb_settings_set_boolean(settings, "SubtitleBurned", burned);
- ghb_settings_set_boolean(settings, "SubtitleDefaultTrack", FALSE);
- }
-
- forced = ghb_settings_get_boolean(settings, "SubtitleForced");
- if (!ghb_canForceSub(i_source))
- {
- forced = FALSE;
- ghb_settings_set_boolean(settings, "SubtitleForced", forced);
- }
-
- def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack");
-
- if (i_source == SRTSUB)
- {
- const gchar *lang;
- gchar *code;
-
- lang = ghb_settings_combo_option(settings, "SrtLanguage");
- code = ghb_settings_get_string(settings, "SrtCodeset");
-
- s_track = ghb_settings_get_string(settings, "SrtFile");
- if (g_file_test(s_track, G_FILE_TEST_IS_REGULAR))
- {
- gchar *basename;
-
- basename = g_path_get_basename(s_track);
- track = g_strdup_printf("%s (%s)(SRT)(%s)", lang, code, basename);
- source = g_strdup_printf("SRT (%s)", basename);
- g_free(basename);
- }
- else
- {
- track = g_strdup_printf("%s (%s)(SRT)", lang, code);
- source = g_strdup_printf("SRT (none)");
- }
- g_free(code);
- offset = ghb_settings_get_int(settings, "SrtOffset");
- }
- else
- {
- track = g_strdup(
- ghb_settings_combo_option(settings, "SubtitleTrack"));
- source = g_strdup(hb_subsource_name(i_source));
- s_track = ghb_settings_get_string(settings, "SubtitleTrack");
- }
-
- if (ghb_canBurnSub(i_source))
- allow_burn = TRUE;
- if (ghb_canForceSub(i_source))
- allow_force = TRUE;
-
- gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
- // These are displayed in list
- 0, track,
- 1, forced,
- 2, burned,
- 3, def,
- 4, offset,
- // These are used to set combo box values when a list item is selected
- 5, s_track,
- 6, i_source,
- 7, allow_force,
- 8, allow_burn,
- -1);
- g_free(track);
- g_free(source);
- g_free(s_track);
- if (burned)
- ghb_subtitle_exclusive_burn(ud, row);
+ subsettings = ghb_array_get_nth(subtitle_list, row);
+ subtitle_refresh_list_row_ui(tm, &ti, subsettings);
 }
 }
 
-G_MODULE_EXPORT void
-subtitle_track_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+void
+ghb_subtitle_list_refresh_all(signal_user_data_t *ud)
 {
- GValue *settings;
-
- g_debug("subtitle_track_changed_cb ()");
- ghb_check_dependency(ud, widget, NULL);
- ghb_widget_to_setting(ud->settings, widget);
- settings = ghb_selected_subtitle_settings(ud);
- if (settings != NULL)
- {
- const gchar *track, *lang;
- gint tt, source;
-
- ghb_widget_to_setting(settings, widget);
- track = ghb_settings_combo_option(settings, "SubtitleTrack");
- ghb_settings_set_string(settings, "SubtitleTrackDescription", track);
- tt = ghb_settings_get_int(settings, "SubtitleTrack");
- source = ghb_subtitle_track_source(ud->settings, tt);
- ghb_settings_set_int(settings, "SubtitleSource", source);
- lang = ghb_settings_combo_string(settings, "SubtitleTrack");
- ghb_settings_set_string(settings, "SubtitleLanguage", lang);
- ghb_subtitle_list_refresh_selected(ud);
- ghb_live_reset(ud);
- }
- ghb_live_reset(ud);
+ subtitle_refresh_list_ui(ud);
 }
 
 G_MODULE_EXPORT void
 srt_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
- GValue *settings;
+ GValue *subsettings;
 
- g_debug("srt_changed_cb ()");
+ g_debug("srt_changed_cb()");
 ghb_check_dependency(ud, widget, NULL);
 ghb_widget_to_setting(ud->settings, widget);
- settings = ghb_selected_subtitle_settings(ud);
- if (settings != NULL)
+ subsettings = subtitle_get_selected_settings(ud, NULL);
+ if (subsettings != NULL)
 {
- ghb_widget_to_setting(settings, widget);
+ ghb_widget_to_setting(subsettings, widget);
+ subtitle_set_track_description(ud->settings, subsettings);
 ghb_subtitle_list_refresh_selected(ud);
-
 ghb_live_reset(ud);
 }
 }
@@ -931,33 +931,34 @@
 G_MODULE_EXPORT void
 srt_file_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
- GValue *settings;
+ GValue *subsettings;
 
- g_debug("srt_file_changed_cb ()");
+ g_debug("srt_file_changed_cb()");
 ghb_check_dependency(ud, widget, NULL);
 ghb_widget_to_setting(ud->settings, widget);
- settings = ghb_selected_subtitle_settings(ud);
- if (settings != NULL)
+ subsettings = subtitle_get_selected_settings(ud, NULL);
+ if (subsettings != NULL)
 {
 gchar *filename, *dirname;
 
- ghb_widget_to_setting(settings, widget);
+ ghb_widget_to_setting(subsettings, widget);
+ subtitle_set_track_description(ud->settings, subsettings);
 ghb_subtitle_list_refresh_selected(ud);
-
 ghb_live_reset(ud);
 
- filename = ghb_settings_get_string(settings, "SrtFile");
+ // Update SrtDir preference
+ filename = ghb_settings_get_string(subsettings, "SrtFile");
 if (g_file_test(filename, G_FILE_TEST_IS_DIR))
 {
- ghb_settings_set_string(ud->settings, "SrtDir", filename);
+ ghb_settings_set_string(ud->prefs, "SrtDir", filename);
 }
 else
 {
 dirname = g_path_get_dirname(filename);
- ghb_settings_set_string(ud->settings, "SrtDir", dirname);
+ ghb_settings_set_string(ud->prefs, "SrtDir", dirname);
 g_free(dirname);
 }
- ghb_pref_save(ud->settings, "SrtDir");
+ ghb_pref_save(ud->prefs, "SrtDir");
 g_free(filename);
 }
 }
@@ -965,23 +966,18 @@
 G_MODULE_EXPORT void
 srt_lang_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
- GValue *settings;
+ GValue *subsettings;
 
- g_debug("srt_lang_changed_cb ()");
+ g_debug("srt_lang_changed_cb()");
 ghb_check_dependency(ud, widget, NULL);
 ghb_widget_to_setting(ud->settings, widget);
- settings = ghb_selected_subtitle_settings(ud);
- if (settings != NULL)
+ subsettings = subtitle_get_selected_settings(ud, NULL);
+ if (subsettings != NULL)
 {
- const gchar *lang;
-
- ghb_widget_to_setting(settings, widget);
+ ghb_widget_to_setting(subsettings, widget);
+ subtitle_set_track_description(ud->settings, subsettings);
 ghb_subtitle_list_refresh_selected(ud);
-
 ghb_live_reset(ud);
-
- lang = ghb_settings_combo_option(settings, "SrtLanguage");
- ghb_settings_set_string(settings, "SubtitleTrackDescription", lang);
 }
 }
 
@@ -990,7 +986,6 @@
 {
 GValue *subtitle_list;
 
- g_debug("clear_subtitle_list ()");
 subtitle_list = ghb_settings_get_value(settings, "subtitle_list");
 if (subtitle_list == NULL)
 {
@@ -1002,415 +997,266 @@
 }
 
 static void
-ghb_clear_subtitle_list(signal_user_data_t *ud)
+ghb_clear_subtitle_list_ui(GtkBuilder *builder)
 {
- GtkTreeView *treeview;
- GtkListStore *store;
- 
- g_debug("clear_subtitle_list ()");
- treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
- store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
- gtk_list_store_clear (store);
+ GtkTreeView *tv;
+ GtkTreeStore *ts;
+ GtkTreeSelection *tsel;
+
+ tv = GTK_TREE_VIEW(GHB_WIDGET(builder, "subtitle_list"));
+ ts = GTK_TREE_STORE(gtk_tree_view_get_model(tv));
+ // Clear tree selection so that updates are not triggered
+ // that cause a recursive attempt to clear the tree selection (crasher)
+ tsel = gtk_tree_view_get_selection(tv);
+ gtk_tree_selection_unselect_all(tsel);
+ gtk_tree_store_clear(ts);
 }
 
 static void
-add_to_subtitle_list(
- signal_user_data_t *ud, 
- GValue *settings)
+add_to_subtitle_list_ui(signal_user_data_t *ud, GValue *subsettings)
 {
- GtkTreeView *treeview;
- GtkTreeIter iter;
- GtkListStore *store;
- GtkTreeSelection *selection;
- const gchar *track;
- gboolean forced, burned, def;
- gchar *s_track;
- gint i_source;
- gboolean allow_force = FALSE;
- gboolean allow_burn = FALSE;
- 
- g_debug("add_to_subtitle_list ()");
- treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
- selection = gtk_tree_view_get_selection (treeview);
- store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-
- track = ghb_settings_combo_option(settings, "SubtitleTrack");
- forced = ghb_settings_get_boolean(settings, "SubtitleForced");
- burned = ghb_settings_get_boolean(settings, "SubtitleBurned");
- def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack");
-
- s_track = ghb_settings_get_string(settings, "SubtitleTrack");
- i_source = ghb_settings_get_int(settings, "SubtitleSource");
-
- if (ghb_canBurnSub(i_source))
- allow_burn = TRUE;
- if (ghb_canForceSub(i_source))
- allow_force = TRUE;
-
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
- // These are displayed in list
- 0, track,
- 1, forced,
- 2, burned,
- 3, def,
- // These are used to set combo box values when a list item is selected
- 5, s_track,
- 6, i_source,
- 7, allow_force,
- 8, allow_burn,
- 9, FALSE,
- -1);
- gtk_tree_selection_select_iter(selection, &iter);
- g_free(s_track);
-}
+ GtkTreeView *tv;
+ GtkTreeIter ti;
+ GtkTreeModel *tm;
+ GtkTreeSelection *ts;
 
-static void
-add_to_srt_list(
- signal_user_data_t *ud, 
- GValue *settings)
-{
- GtkTreeView *treeview;
- GtkTreeIter iter;
- GtkListStore *store;
- GtkTreeSelection *selection;
- const gchar *lang;
- gboolean forced, burned, def;
- gchar *filename, *code, *track, *source;
- gint i_source, offset;
- 
- g_debug("add_to_srt_list ()");
- treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
- selection = gtk_tree_view_get_selection (treeview);
- store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-
- lang = ghb_settings_combo_option(settings, "SrtLanguage");
- code = ghb_settings_get_string(settings, "SrtCodeset");
- forced = FALSE;
- burned = FALSE;
- def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack");
-
- filename = ghb_settings_get_string(settings, "SrtFile");
- if (g_file_test(filename, G_FILE_TEST_IS_REGULAR))
- {
- gchar *basename;
-
- basename = g_path_get_basename(filename);
- track = g_strdup_printf("%s (%s)(SRT)(%s)", lang, code, basename);
- source = g_strdup_printf("SRT (%s)", basename);
- g_free(basename);
- }
- else
- {
- track = g_strdup_printf("%s (%s)(SRT)", lang, code);
- source = g_strdup_printf("SRT (none)");
- }
- i_source = SRTSUB;
- offset = ghb_settings_get_int(settings, "SrtOffset");
+ tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+ ts = gtk_tree_view_get_selection(tv);
+ tm = gtk_tree_view_get_model(tv);
 
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 
- // These are displayed in list
- 0, track,
- 1, forced,
- 2, burned,
- 3, def,
- 4, offset,
- // These are used to set combo box values when a list item is selected
- 5, filename,
- 6, i_source,
- 7, FALSE,
- 8, FALSE,
- 9, TRUE,
- -1);
- gtk_tree_selection_select_iter(selection, &iter);
- g_free(code);
- g_free(track);
- g_free(filename);
- g_free(source);
+ gtk_tree_store_append(GTK_TREE_STORE(tm), &ti, NULL);
+ subtitle_refresh_list_row_ui(tm, &ti, subsettings);
+
+ gtk_tree_selection_select_iter(ts, &ti);
 }
 
 G_MODULE_EXPORT void
-subtitle_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
+subtitle_list_selection_changed_cb(GtkTreeSelection *ts, signal_user_data_t *ud)
 {
- GtkTreeModel *store;
+ GtkTreeModel *tm;
 GtkTreeIter iter;
- GtkWidget *widget;
- 
- g_debug("subtitle_list_selection_changed_cb ()");
- if (gtk_tree_selection_get_selected(selection, &store, &iter))
- {
- gint source;
- GtkTreePath *treepath;
- gint *indices, row;
- GValue *subtitle_list, *settings;
+ GValue *subsettings = NULL;
+ int row;
 
- treepath = gtk_tree_model_get_path (store, &iter);
- indices = gtk_tree_path_get_indices (treepath);
- row = indices[0];
- gtk_tree_path_free(treepath);
+ g_debug("subtitle_list_selection_changed_cb()");
+ if (gtk_tree_selection_get_selected(ts, &tm, &iter))
+ {
+ GtkTreeIter piter;
 
- subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
- if (row >= ghb_array_len(subtitle_list))
+ if (gtk_tree_model_iter_parent(tm, &piter, &iter))
+ {
+ GtkTreePath *path;
+ GtkTreeView *tv;
+
+ gtk_tree_selection_select_iter(ts, &piter);
+ path = gtk_tree_model_get_path(tm, &piter);
+ tv = gtk_tree_selection_get_tree_view(ts);
+ // Make the parent visible in scroll window if it is not.
+ gtk_tree_view_scroll_to_cell(tv, path, NULL, FALSE, 0, 0);
+ gtk_tree_path_free(path);
 return;
+ }
 
- settings = ghb_array_get_nth(subtitle_list, row);
+ GtkTreePath *tp;
+ gint *indices;
+ GValue *subtitle_list;
 
- source = ghb_settings_get_int(settings, "SubtitleSource");
- if (source == SRTSUB)
- {
- gchar *str;
- gint offset;
-
- str = ghb_settings_get_string(settings, "SrtLanguage");
- ghb_ui_update(ud, "SrtLanguage", ghb_string_value(str));
- g_free(str);
-
- str = ghb_settings_get_string(settings, "SrtCodeset");
- ghb_ui_update(ud, "SrtCodeset", ghb_string_value(str));
- g_free(str);
-
- str = ghb_settings_get_string(settings, "SrtFile");
- ghb_ui_update(ud, "SrtFile", ghb_string_value(str));
- g_free(str);
-
- offset = ghb_settings_get_int(settings, "SrtOffset");
- ghb_ui_update(ud, "SrtOffset", ghb_int_value(offset));
-
- widget = GHB_WIDGET(ud->builder, "subtitle_track_label");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "SubtitleTrack");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "srt_lang_label");
- gtk_widget_show(widget);
- widget = GHB_WIDGET(ud->builder, "srt_code_label");
- gtk_widget_show(widget);
- widget = GHB_WIDGET(ud->builder, "srt_file_label");
- gtk_widget_show(widget);
- widget = GHB_WIDGET(ud->builder, "srt_offset_label");
- gtk_widget_show(widget);
- widget = GHB_WIDGET(ud->builder, "SrtLanguage");
- gtk_widget_show(widget);
- widget = GHB_WIDGET(ud->builder, "SrtCodeset");
- gtk_widget_show(widget);
- widget = GHB_WIDGET(ud->builder, "SrtFile");
- gtk_widget_show(widget);
- widget = GHB_WIDGET(ud->builder, "SrtOffset");
- gtk_widget_show(widget);
- }
- else
- {
- gchar *track;
-
- track = ghb_settings_get_string(settings, "SubtitleTrack");
- ghb_ui_update(ud, "SubtitleTrack", ghb_string_value(track));
- g_free(track);
-
- widget = GHB_WIDGET(ud->builder, "srt_lang_label");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "srt_code_label");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "srt_file_label");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "srt_offset_label");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "SrtLanguage");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "SrtCodeset");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "SrtFile");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "SrtOffset");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "subtitle_track_label");
- gtk_widget_show(widget);
- widget = GHB_WIDGET(ud->builder, "SubtitleTrack");
- gtk_widget_show(widget);
- }
- widget = GHB_WIDGET (ud->builder, "subtitle_remove");
- gtk_widget_set_sensitive(widget, TRUE);
+ tp = gtk_tree_model_get_path(tm, &iter);
+ indices = gtk_tree_path_get_indices(tp);
+ row = indices[0];
+ gtk_tree_path_free(tp);
+
+ subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+ if (row >= 0 && row < ghb_array_len(subtitle_list))
+ subsettings = ghb_array_get_nth(subtitle_list, row);
 }
- else
+ subtitle_update_dialog_widgets(ud, subsettings);
+ if (subsettings)
 {
- widget = GHB_WIDGET(ud->builder, "srt_lang_label");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "srt_code_label");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "srt_file_label");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "srt_offset_label");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "SrtLanguage");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "SrtCodeset");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "SrtFile");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "SrtOffset");
- gtk_widget_hide(widget);
- widget = GHB_WIDGET(ud->builder, "subtitle_track_label");
- gtk_widget_show(widget);
- widget = GHB_WIDGET(ud->builder, "SubtitleTrack");
- gtk_widget_show(widget);
+ if (ghb_settings_get_boolean(subsettings, "SubtitleBurned"))
+ {
+ ghb_subtitle_exclusive_burn(ud, row);
+ }
 }
 }
 
-G_MODULE_EXPORT void
-srt_add_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+static gboolean subtitle_is_one_burned(GValue *settings)
 {
- // Add the current subtitle settings to the list.
- GValue *settings;
- gchar *dir, *filename, *lang;
- 
- g_debug("subtitle_add_clicked_cb ()");
-
- settings = ghb_dict_value_new();
- ghb_settings_set_int(settings, "SubtitleSource", SRTSUB);
- lang = ghb_settings_get_string(ud->settings, "PreferredLanguage");
- ghb_settings_set_string(settings, "SrtLanguage", lang);
- g_free(lang);
- ghb_settings_set_string(settings, "SrtCodeset", "UTF-8");
-
- dir = ghb_settings_get_string(ud->settings, "SrtDir");
- filename = g_strdup_printf("%s/none", dir);
- ghb_settings_set_string(settings, "SrtFile", filename);
- g_free(dir);
- g_free(filename);
+ GValue *subtitle_list, *subsettings;
+ int count, ii;
 
- ghb_settings_set_int(settings, "SrtOffset", 0);
- ghb_settings_take_value(settings, "SubtitleDefaultTrack", 
- ghb_boolean_value_new(FALSE));
+ subtitle_list = ghb_settings_get_value(settings, "subtitle_list");
+ if (subtitle_list == NULL)
+ return FALSE;
 
- ghb_add_srt(ud, settings);
+ count = ghb_array_len(subtitle_list);
+ for (ii = 0; ii < count; ii++)
+ {
+ subsettings = ghb_array_get_nth(subtitle_list, ii);
+ if (ghb_settings_get_boolean(subsettings, "SubtitleBurned"))
+ {
+ return TRUE;
+ }
+ }
+ return FALSE;
 }
 
 G_MODULE_EXPORT void
 subtitle_add_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
 // Add the current subtitle settings to the list.
- GValue *settings;
- gboolean burned = FALSE;
- gint track, source, mux;
- 
- g_debug("subtitle_add_clicked_cb ()");
-
- track = ghb_settings_get_int(ud->settings, "SubtitleTrack");
-
- settings = ghb_dict_value_new();
- ghb_settings_set_int(settings, "SubtitleTrack", track);
- source = ghb_subtitle_track_source(ud->settings, track);
-
- // Initialize to passthru if possible, else burn
- mux = ghb_settings_combo_int(ud->settings, "FileFormat");
- burned = !hb_subtitle_can_pass(source, mux);
-
- ghb_settings_set_int(settings, "SubtitleSource", source);
- ghb_settings_take_value(settings, "SubtitleForced", 
- ghb_boolean_value_new(FALSE));
- ghb_settings_take_value(settings, "SubtitleBurned", 
- ghb_boolean_value_new(burned));
- ghb_settings_take_value(settings, "SubtitleDefaultTrack", 
- ghb_boolean_value_new(FALSE));
-
- if (!ghb_add_subtitle_to_settings(ud->settings, settings))
+ GValue *subsettings, *backup;
+ gboolean one_burned;
+ gint track;
+
+ int title_id, titleindex;
+ const hb_title_t *title;
+
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ if (title == NULL)
+ {
 return;
+ }
 
- ghb_add_subtitle_to_ui(ud, settings);
-}
+ // Back up settings in case we need to revert.
+ backup = ghb_value_dup(
+ ghb_settings_get_value(ud->settings, "subtitle_list"));
 
-G_MODULE_EXPORT void
-subtitle_remove_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
- GtkTreeView *treeview;
- GtkTreePath *treepath;
- GtkTreeSelection *selection;
- GtkTreeModel *store;
- GtkTreeIter iter, nextIter;
- gint *indices;
- gint row;
- GValue *subtitle_list;
+ one_burned = subtitle_is_one_burned(ud->settings);
+
+ const char *mux_id;
+ const hb_container_t *mux;
 
- g_debug("subtitle_remove_clicked_cb ()");
- treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
- selection = gtk_tree_view_get_selection (treeview);
- if (gtk_tree_selection_get_selected(selection, &store, &iter))
+ mux_id = ghb_settings_get_const_string(ud->settings, "FileFormat");
+ mux = ghb_lookup_container_by_name(mux_id);
+
+ int count = hb_list_count(title->list_subtitle);
+ for (subsettings = NULL, track = 0;
+ subsettings == NULL && track < count; track++)
+ {
+ subsettings = subtitle_add_track(ud, ud->settings, title, track,
+ mux->format, FALSE, FALSE, &one_burned);
+ }
+ if (subsettings == NULL)
 {
- nextIter = iter;
- if (!gtk_tree_model_iter_next(store, &nextIter))
+ subsettings = subtitle_add_track(ud, ud->settings, title, 0,
+ mux->format, FALSE, TRUE, &one_burned);
+ }
+ ghb_add_subtitle_to_ui(ud, subsettings);
+
+ if (subsettings != NULL)
+ {
+ // Pop up the edit dialog
+ GtkResponseType response;
+ GtkWidget *dialog = GHB_WIDGET(ud->builder, "subtitle_dialog");
+ response = gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_hide(dialog);
+ if (response != GTK_RESPONSE_OK)
 {
- nextIter = iter;
- if (gtk_tree_model_get_iter_first(store, &nextIter))
+ ghb_settings_take_value(ud->settings, "subtitle_list", backup);
+ subsettings = subtitle_get_selected_settings(ud, NULL);
+ if (subsettings != NULL)
 {
- gtk_tree_selection_select_iter (selection, &nextIter);
+ subtitle_update_dialog_widgets(ud, subsettings);
 }
+ subtitle_refresh_list_ui(ud);
 }
 else
 {
- gtk_tree_selection_select_iter (selection, &nextIter);
+ ghb_value_free(backup);
 }
+ }
+}
 
- // Get the row number
- treepath = gtk_tree_model_get_path (store, &iter);
- indices = gtk_tree_path_get_indices (treepath);
- row = indices[0];
- gtk_tree_path_free(treepath);
- if (row < 0) return;
+G_MODULE_EXPORT void
+subtitle_add_all_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
+ // Add the current subtitle settings to the list.
+ gboolean one_burned = FALSE;
+ gint track;
 
- subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
- if (row >= ghb_array_len(subtitle_list))
- return;
+ const hb_title_t *title;
+ int title_id, titleindex;
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ if (title == NULL)
+ {
+ return;
+ }
 
- // Update our settings list before removing the row from the
- // treeview. Removing from the treeview sometimes provokes an
- // immediate selection change, so the list needs to be up to date
- // when this happens.
- GValue *old = ghb_array_get_nth(subtitle_list, row);
- ghb_value_free(old);
- ghb_array_remove(subtitle_list, row);
+ ghb_clear_subtitle_list_settings(ud->settings);
+ ghb_clear_subtitle_list_ui(ud->builder);
 
- // Remove the selected item
- gtk_list_store_remove (GTK_LIST_STORE(store), &iter);
- // remove from subtitle settings list
- widget = GHB_WIDGET (ud->builder, "subtitle_add");
- gtk_widget_set_sensitive(widget, TRUE);
- widget = GHB_WIDGET (ud->builder, "srt_add");
- gtk_widget_set_sensitive(widget, TRUE);
+ const char *mux_id;
+ const hb_container_t *mux;
 
- ghb_live_reset(ud);
+ mux_id = ghb_settings_get_const_string(ud->settings, "FileFormat");
+ mux = ghb_lookup_container_by_name(mux_id);
+
+ int count = hb_list_count(title->list_subtitle);
+ for (track = 0; track < count; track++)
+ {
+ subtitle_add_track(ud, ud->settings, title, track, mux->format,
+ FALSE, FALSE, &one_burned);
 }
+ subtitle_refresh_list_ui(ud);
+ ghb_live_reset(ud);
+}
+
+G_MODULE_EXPORT void
+subtitle_reset_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
+ int title_id, titleindex;
+ const hb_title_t *title;
+
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ ghb_set_pref_subtitle(title, ud);
 }
 
 void
 ghb_subtitle_prune(signal_user_data_t *ud)
 {
- GtkTreeView *tv;
 GValue *subtitle_list;
- gint count, ii;
- gint first_track = 0, one_burned = 0;
+ GValue *subsettings;
+ gint ii;
+ gboolean one_burned = FALSE;
 
 subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
 if (subtitle_list == NULL)
 return;
- count = ghb_array_len(subtitle_list);
 
- tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
- g_return_if_fail(tv != NULL);
- for (ii = count-1; ii >= 0; ii--)
+ const char *mux_id;
+ const hb_container_t *mux;
+
+ mux_id = ghb_settings_get_const_string(ud->settings, "FileFormat");
+ mux = ghb_lookup_container_by_name(mux_id);
+
+ for (ii = 0; ii < ghb_array_len(subtitle_list); )
 {
 gboolean burned;
- GValue *settings;
+ int source;
 
- settings = ghb_array_get_nth(subtitle_list, ii);
- burned = ghb_settings_get_boolean(settings, "SubtitleBurned");
- if (burned)
+ subsettings = ghb_array_get_nth(subtitle_list, ii);
+ burned = ghb_settings_get_boolean(subsettings, "SubtitleBurned");
+ source = ghb_settings_get_boolean(subsettings, "SubtitleSource");
+ burned = burned || !hb_subtitle_can_pass(source, mux->format);
+ if (burned && one_burned)
 {
- first_track = ii;
- one_burned++;
+ GValue *gsub = ghb_array_get_nth(subtitle_list, ii);
+ ghb_array_remove(subtitle_list, ii);
+ ghb_value_free(gsub);
+ continue;
 }
+ one_burned = one_burned || burned;
+ ghb_settings_set_boolean(subsettings, "SubtitleBurned", burned);
+ ii++;
 }
- if (one_burned)
+ subsettings = subtitle_get_selected_settings(ud, NULL);
+ if (subsettings != NULL)
 {
- ghb_subtitle_exclusive_burn(ud, first_track);
+ subtitle_update_dialog_widgets(ud, subsettings);
 }
 }
 
@@ -1420,31 +1266,377 @@
 GValue *slist;
 GValue *subtitle;
 gint count, ii;
- gint titleindex;
- 
+ gint title_id, titleindex;
+ const hb_title_t *title;
+
 g_debug("ghb_reset_subtitles");
 ghb_clear_subtitle_list_settings(ud->settings);
- ghb_clear_subtitle_list(ud);
- titleindex = ghb_settings_combo_int(ud->settings, "title");
- if (titleindex < 0)
+ ghb_clear_subtitle_list_ui(ud->builder);
+ title_id = ghb_settings_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ if (title == NULL)
 return;
 
 slist = ghb_settings_get_value(settings, "subtitle_list");
 count = ghb_array_len(slist);
 for (ii = 0; ii < count; ii++)
 {
- int source;
-
 subtitle = ghb_value_dup(ghb_array_get_nth(slist, ii));
- source = ghb_settings_get_int(subtitle, "SubtitleSource");
- if (source == SRTSUB)
- ghb_add_srt(ud, subtitle);
+ subtitle_add_to_settings(ud->settings, subtitle);
+ }
+ subtitle_refresh_list_ui(ud);
+}
+
+G_MODULE_EXPORT void
+subtitle_def_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ ghb_widget_to_setting(ud->settings, widget);
+ ghb_clear_presets_selection(ud);
+}
+
+static void
+subtitle_update_pref_lang(signal_user_data_t *ud, const iso639_lang_t *lang)
+{
+ GtkLabel *label;
+ GtkButton *button;
+ gchar *str;
+ const char * name = _("None");
+ const char * code = "und";
+
+ label = GTK_LABEL(GHB_WIDGET(ud->builder, "subtitle_preferred_language"));
+ if (lang != NULL)
+ {
+ code = lang->iso639_2;
+ if (strncmp(code, "und", 4))
+ {
+ name = lang->native_name && lang->native_name[0] ?
+ lang->native_name : lang->eng_name;
+ }
+ }
+
+ str = g_strdup_printf(_("Preferred Language: %s"), name);
+ gtk_label_set_text(label, str);
+ g_free(str);
+
+ ghb_settings_set_string(ud->settings, "PreferredLanguage", code);
+
+ button = GTK_BUTTON(GHB_WIDGET(ud->builder,
+ "SubtitleAddForeignAudioSubtitle"));
+ str = g_strdup_printf(_("Add %s subtitle track if default audio is not %s"),
+ name, name);
+ gtk_button_set_label(button, str);
+ g_free(str);
+
+ // If there is no preferred language, hide options that require
+ // a preferred language to be set.
+ gboolean visible = !(lang == NULL || !strncmp(code, "und", 4));
+ gtk_widget_set_visible(GTK_WIDGET(button), visible);
+ button = GTK_BUTTON(GHB_WIDGET(ud->builder,
+ "SubtitleAddForeignAudioSearch"));
+ gtk_widget_set_visible(GTK_WIDGET(button), visible);
+}
+
+void
+ghb_subtitle_set_pref_lang(GValue *settings)
+{
+ GValue *lang_list;
+ gboolean set = FALSE;
+ lang_list = ghb_settings_get_value(settings, "SubtitleLanguageList");
+ if (ghb_array_len(lang_list) > 0)
+ {
+ GValue *glang = ghb_array_get_nth(lang_list, 0);
+ if (glang != NULL)
+ {
+ ghb_settings_set_string(settings, "PreferredLanguage",
+ g_value_get_string(glang));
+ set = TRUE;
+ }
+ }
+ if (!set)
+ {
+ ghb_settings_set_string(settings, "PreferredLanguage", "und");
+ }
+}
+
+G_MODULE_EXPORT void
+subtitle_add_lang_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ GtkListBox *avail = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "subtitle_avail_lang"));
+ GtkListBox *selected = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "subtitle_selected_lang"));
+ GtkListBoxRow *row;
+ GtkWidget *label;
+
+ row = gtk_list_box_get_selected_row(avail);
+ if (row != NULL)
+ {
+ int idx;
+ const iso639_lang_t *lang;
+ GValue *glang, *lang_list;
+
+ // Remove from UI available language list box
+ label = gtk_bin_get_child(GTK_BIN(row));
+ g_object_ref(G_OBJECT(label));
+ gtk_widget_destroy(GTK_WIDGET(row));
+ gtk_widget_show(label);
+ // Add to UI selected language list box
+ gtk_list_box_insert(selected, label, -1);
+
+ // Add to preset language list
+ idx = (intptr_t)g_object_get_data(G_OBJECT(label), "lang_idx");
+ lang = ghb_iso639_lookup_by_int(idx);
+ glang = ghb_string_value_new(lang->iso639_2);
+ lang_list = ghb_settings_get_value(ud->settings, "SubtitleLanguageList");
+ if (ghb_array_len(lang_list) == 0)
+ {
+ subtitle_update_pref_lang(ud, lang);
+ }
+ ghb_array_append(lang_list, glang);
+ ghb_clear_presets_selection(ud);
+ }
+}
+
+G_MODULE_EXPORT void
+subtitle_remove_lang_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+
+ GtkListBox *avail, *selected;
+ GtkListBoxRow *row;
+ GtkWidget *label;
+
+ avail = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "subtitle_avail_lang"));
+ selected = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "subtitle_selected_lang"));
+ row = gtk_list_box_get_selected_row(selected);
+ if (row != NULL)
+ {
+ gint index;
+ GValue *lang_list;
+
+ index = gtk_list_box_row_get_index(row);
+
+ // Remove from UI selected language list box
+ label = gtk_bin_get_child(GTK_BIN(row));
+ g_object_ref(G_OBJECT(label));
+ int idx = (intptr_t)g_object_get_data(G_OBJECT(label), "lang_idx");
+ gtk_widget_destroy(GTK_WIDGET(row));
+ gtk_widget_show(label);
+ // Add to UI available language list box
+ gtk_list_box_insert(avail, label, idx);
+
+ // Remove from preset language list
+ lang_list = ghb_settings_get_value(ud->settings, "SubtitleLanguageList");
+ GValue *glang = ghb_array_get_nth(lang_list, index);
+ ghb_array_remove(lang_list, index);
+ ghb_value_free(glang);
+
+ ghb_clear_presets_selection(ud);
+
+ if (ghb_array_len(lang_list) > 0)
+ {
+ const iso639_lang_t *lang;
+ GValue *entry = ghb_array_get_nth(lang_list, 0);
+ lang = ghb_iso639_lookup_by_int(ghb_lookup_audio_lang(entry));
+ subtitle_update_pref_lang(ud, lang);
+ }
 else
 {
- if (!ghb_add_subtitle_to_settings(ud->settings, subtitle))
- return;
- ghb_add_subtitle_to_ui(ud, subtitle);
+ subtitle_update_pref_lang(ud, NULL);
 }
 }
 }
 
+static void subtitle_def_lang_list_clear_cb(GtkWidget *row, gpointer data)
+{
+ GtkListBox *avail = (GtkListBox*)data;
+ GtkWidget *label = gtk_bin_get_child(GTK_BIN(row));
+ g_object_ref(G_OBJECT(label));
+ gtk_widget_destroy(GTK_WIDGET(row));
+ gtk_widget_show(label);
+ int idx = (intptr_t)g_object_get_data(G_OBJECT(label), "lang_idx");
+ gtk_list_box_insert(avail, label, idx);
+}
+
+static void subtitle_def_selected_lang_list_clear(signal_user_data_t *ud)
+{
+ GtkListBox *avail, *selected;
+ avail = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "subtitle_avail_lang"));
+ selected = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "subtitle_selected_lang"));
+ gtk_container_foreach(GTK_CONTAINER(selected),
+ subtitle_def_lang_list_clear_cb, (gpointer)avail);
+}
+
+static void subtitle_def_lang_list_init(signal_user_data_t *ud)
+{
+ GValue *lang_list;
+
+ // Clear selected languages.
+ subtitle_def_selected_lang_list_clear(ud);
+
+ lang_list = ghb_settings_get_value(ud->settings, "SubtitleLanguageList");
+ if (lang_list == NULL)
+ {
+ lang_list = ghb_array_value_new(8);
+ ghb_settings_set_value(ud->settings, "SubtitleLanguageList", lang_list);
+ }
+
+ int ii, count;
+ count = ghb_array_len(lang_list);
+ for (ii = 0; ii < count; )
+ {
+ GValue *lang_val = ghb_array_get_nth(lang_list, ii);
+ int idx = ghb_lookup_audio_lang(lang_val);
+ if (ii == 0)
+ {
+ const iso639_lang_t *lang;
+ lang = ghb_iso639_lookup_by_int(idx);
+ subtitle_update_pref_lang(ud, lang);
+ }
+
+ GtkListBox *avail, *selected;
+ GtkListBoxRow *row;
+ avail = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "subtitle_avail_lang"));
+ selected = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "subtitle_selected_lang"));
+ row = ghb_find_lang_row(avail, idx);
+ if (row)
+ {
+ GtkWidget *label = gtk_bin_get_child(GTK_BIN(row));
+ g_object_ref(G_OBJECT(label));
+ gtk_widget_destroy(GTK_WIDGET(row));
+ gtk_widget_show(label);
+ gtk_list_box_insert(selected, label, -1);
+ ii++;
+ }
+ else
+ {
+ // Error in list. Probably duplicate languages. Remove
+ // this item from the list.
+ GValue *glang = ghb_array_get_nth(lang_list, ii);
+ ghb_array_remove(lang_list, ii);
+ ghb_value_free(glang);
+ count--;
+ }
+ }
+ if (count == 0)
+ {
+ subtitle_update_pref_lang(ud, NULL);
+ }
+}
+
+void ghb_subtitle_defaults_to_ui(signal_user_data_t *ud)
+{
+ subtitle_def_lang_list_init(ud);
+}
+
+void ghb_init_subtitle_defaults_ui(signal_user_data_t *ud)
+{
+ GtkListBox *list_box;
+
+ list_box = GTK_LIST_BOX(GHB_WIDGET(ud->builder, "subtitle_avail_lang"));
+ ghb_init_lang_list_box(list_box);
+}
+
+G_MODULE_EXPORT void
+subtitle_edit_clicked_cb(GtkWidget *widget, gchar *path, signal_user_data_t *ud)
+{
+ GtkTreeView *tv;
+ GtkTreePath *tp;
+ GtkTreeModel *tm;
+ GtkTreeSelection *ts;
+ GtkTreeIter ti;
+
+ tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+ ts = gtk_tree_view_get_selection(tv);
+ tm = gtk_tree_view_get_model(tv);
+ tp = gtk_tree_path_new_from_string (path);
+ if (gtk_tree_path_get_depth(tp) > 1) return;
+ if (gtk_tree_model_get_iter(tm, &ti, tp))
+ {
+ GValue *subsettings, *backup;
+
+ gtk_tree_selection_select_iter(ts, &ti);
+
+ // Back up settings in case we need to revert.
+ backup = ghb_value_dup(
+ ghb_settings_get_value(ud->settings, "subtitle_list"));
+
+ // Pop up the edit dialog
+ GtkResponseType response;
+ GtkWidget *dialog = GHB_WIDGET(ud->builder, "subtitle_dialog");
+ response = gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_hide(dialog);
+ if (response != GTK_RESPONSE_OK)
+ {
+ ghb_settings_take_value(ud->settings, "subtitle_list", backup);
+ subsettings = subtitle_get_selected_settings(ud, NULL);
+ if (subsettings != NULL)
+ {
+ subtitle_update_dialog_widgets(ud, subsettings);
+ }
+ subtitle_refresh_list_ui(ud);
+ }
+ else
+ {
+ ghb_value_free(backup);
+ }
+ }
+}
+
+G_MODULE_EXPORT void
+subtitle_remove_clicked_cb(GtkWidget *widget, gchar *path, signal_user_data_t *ud)
+{
+ GtkTreeView *tv;
+ GtkTreePath *tp;
+ GtkTreeModel *tm;
+ GtkTreeSelection *ts;
+ GtkTreeIter ti, nextIter;
+ gint row;
+ gint *indices;
+ GValue *subtitle_list;
+
+ tv = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "subtitle_list"));
+ ts = gtk_tree_view_get_selection(tv);
+ tm = gtk_tree_view_get_model(tv);
+ tp = gtk_tree_path_new_from_string (path);
+ if (gtk_tree_path_get_depth(tp) > 1) return;
+ if (gtk_tree_model_get_iter(tm, &ti, tp))
+ {
+ nextIter = ti;
+ if (!gtk_tree_model_iter_next(tm, &nextIter))
+ {
+ nextIter = ti;
+ if (gtk_tree_model_get_iter_first(tm, &nextIter))
+ {
+ gtk_tree_selection_select_iter(ts, &nextIter);
+ }
+ }
+ else
+ {
+ gtk_tree_selection_select_iter(ts, &nextIter);
+ }
+
+ subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
+
+ // Get the row number
+ indices = gtk_tree_path_get_indices (tp);
+ row = indices[0];
+ if (row < 0 || row >= ghb_array_len(subtitle_list))
+ {
+ gtk_tree_path_free(tp);
+ return;
+ }
+
+ // Update our settings list before removing the row from the
+ // treeview. Removing from the treeview sometimes provokes an
+ // immediate selection change, so the list needs to be up to date
+ // when this happens.
+ GValue *old = ghb_array_get_nth(subtitle_list, row);
+ ghb_array_remove(subtitle_list, row);
+ ghb_value_free(old);
+
+ // Remove the selected item
+ gtk_tree_store_remove(GTK_TREE_STORE(tm), &ti);
+
+ ghb_live_reset(ud);
+ }
+ gtk_tree_path_free(tp);
+}
+

HandBrake-0.9.9.tar.bz2/gtk/src/subtitlehandler.h -> HandBrake-0.10.0.tar.bz2/gtk/src/subtitlehandler.h Changed

@@ -2,19 +2,19 @@
 /*
 * subtitlehandler.h
 * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
- * 
+ *
 * audiohandler.h is free software.
- * 
+ *
 * You may 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.
- * 
+ *
 * callbacks.h 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.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with callbacks.h. If not, write to:
 * The Free Software Foundation, Inc.,
@@ -27,17 +27,15 @@
 
 #include "settings.h"
 
-void ghb_set_pref_subtitle(gint titleindex, signal_user_data_t *ud);
-void ghb_set_pref_subtitle_settings(gint titleindex, GValue *settings);
+void ghb_set_pref_subtitle_settings(signal_user_data_t *ud, const hb_title_t *title, GValue *settings);
 void ghb_set_subtitle(signal_user_data_t *ud, gint track, GValue *settings);
-GValue* ghb_selected_subtitle_settings(signal_user_data_t *ud);
-gint ghb_selected_subtitle_row(signal_user_data_t *ud);
 void ghb_reset_subtitles(signal_user_data_t *ud, GValue *settings);
 void ghb_subtitle_prune(signal_user_data_t *ud);
-gboolean ghb_soft_in_subtitle_list(GValue *subtitle_list);
-gboolean ghb_canBurnSub(int source);
-gboolean ghb_canForceSub(int source);
-gboolean ghb_canPassSub(int source, int mux);
 void ghb_subtitle_list_refresh_selected(signal_user_data_t *ud);
+void ghb_subtitle_list_refresh_all(signal_user_data_t *ud);
+void ghb_init_subtitle_defaults_ui(signal_user_data_t *ud);
+void ghb_subtitle_defaults_to_ui(signal_user_data_t *ud);
+void ghb_subtitle_title_change(signal_user_data_t *ud, gboolean show);
+void ghb_subtitle_set_pref_lang(GValue *settings);
 
 #endif // _SUBTITLEHANDLER_H_

HandBrake-0.9.9.tar.bz2/gtk/src/values.c -> HandBrake-0.10.0.tar.bz2/gtk/src/values.c Changed

@@ -2,18 +2,19 @@
 /*
 * presets.c
 * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
- * 
+ *
 * presets.c is free software.
- * 
+ *
 * You may 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.
- * 
+ *
 */
 
 #include <glib.h>
 #include <glib-object.h>
+#include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
 #include "values.h"
@@ -263,7 +264,7 @@
 {
 return 1;
 }
- 
+
 if (typa == G_TYPE_STRING)
 {
 char *stra, *strb;
@@ -287,7 +288,7 @@
 g_free(strb);
 return res;
 }
- else if (typa == G_TYPE_INT64 || typa == G_TYPE_INT || 
+ else if (typa == G_TYPE_INT64 || typa == G_TYPE_INT ||
 typa == G_TYPE_BOOLEAN)
 {
 return ghb_value_int64(vala) - ghb_value_int64(valb);
@@ -445,7 +446,7 @@
 g_value_take_boxed(gval, array);
 }
 
-GValue* 
+GValue*
 ghb_date_value_new(GDate *date)
 {
 GValue *gval = ghb_value_new(g_date_get_type());
@@ -453,7 +454,7 @@
 return gval;
 }
 
-GValue* 
+GValue*
 ghb_rawdata_value_new(ghb_rawdata_t *data)
 {
 GValue *gval = ghb_value_new(ghb_rawdata_get_type());
@@ -712,7 +713,11 @@
 // empty the first array if it is not already empty
 len = ghb_array_len(arr1);
 for (ii = 0; ii < len; ii++)
+ {
+ GValue *old = ghb_array_get_nth(arr1, 0);
 ghb_array_remove(arr1, 0);
+ ghb_value_free(old);
+ }
 
 len = ghb_array_len(arr2);
 count = MIN(count, len);
@@ -779,14 +784,14 @@
 void
 ghb_register_transforms()
 {
- g_value_register_transform_func(G_TYPE_STRING, G_TYPE_INT64, 
+ g_value_register_transform_func(G_TYPE_STRING, G_TYPE_INT64,
 xform_string_int64);
- g_value_register_transform_func(G_TYPE_STRING, G_TYPE_INT, 
+ g_value_register_transform_func(G_TYPE_STRING, G_TYPE_INT,
 xform_string_int);
- g_value_register_transform_func(G_TYPE_STRING, G_TYPE_DOUBLE, 
+ g_value_register_transform_func(G_TYPE_STRING, G_TYPE_DOUBLE,
 xform_string_double);
- g_value_register_transform_func(G_TYPE_BOOLEAN, G_TYPE_DOUBLE, 
+ g_value_register_transform_func(G_TYPE_BOOLEAN, G_TYPE_DOUBLE,
 xform_boolean_double);
- g_value_register_transform_func(G_TYPE_DOUBLE, G_TYPE_STRING, 
+ g_value_register_transform_func(G_TYPE_DOUBLE, G_TYPE_STRING,
 xform_double_string);
 }

HandBrake-0.9.9.tar.bz2/gtk/src/values.h -> HandBrake-0.10.0.tar.bz2/gtk/src/values.h Changed

HandBrake-0.10.0.tar.bz2/gtk/src/videohandler.c Added

@@ -0,0 +1,269 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * callbacks.c
+ * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
+ *
+ * callbacks.c is free software.
+ *
+ * You may 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.
+ */
+
+#include <glib/gi18n.h>
+#include "ghbcompat.h"
+#include <string.h>
+#include "settings.h"
+#include "values.h"
+#include "callbacks.h"
+#include "presets.h"
+#include "preview.h"
+#include "hb-backend.h"
+
+int ghb_get_video_encoder(GValue *settings)
+{
+ const char *encoder;
+ encoder = ghb_settings_get_const_string(settings, "VideoEncoder");
+ return hb_video_encoder_get_from_name(encoder);
+}
+
+G_MODULE_EXPORT void
+vcodec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ float val, vqmin, vqmax, step, page;
+ int inverted, digits;
+
+ ghb_widget_to_setting(ud->settings, widget);
+ ghb_check_dependency(ud, widget, NULL);
+ ghb_show_container_options(ud);
+ ghb_clear_presets_selection(ud);
+ ghb_live_reset(ud);
+
+ // Set the range of the video quality slider
+ val = ghb_vquality_default(ud);
+ ghb_vquality_range(ud, &vqmin, &vqmax, &step, &page, &digits, &inverted);
+ ghb_scale_configure(ud, "VideoQualitySlider", val, vqmin, vqmax,
+ step, page, digits, inverted);
+
+ ghb_update_ui_combo_box(ud, "VideoTune", NULL, FALSE);
+ ghb_update_ui_combo_box(ud, "VideoProfile", NULL, FALSE);
+ ghb_update_ui_combo_box(ud, "VideoLevel", NULL, FALSE);
+ ghb_ui_update(ud, "VideoTune", ghb_int_value(0));
+ ghb_ui_update(ud, "VideoProfile", ghb_int_value(0));
+ ghb_ui_update(ud, "VideoLevel", ghb_int_value(0));
+
+ // Set the range of the preset slider
+ int encoder = ghb_get_video_encoder(ud->settings);
+ GtkWidget *presetSlider = GHB_WIDGET(ud->builder, "VideoPresetSlider");
+ const char * const *video_presets;
+ int count = 0;
+ video_presets = hb_video_encoder_get_presets(encoder);
+ while (video_presets && video_presets[count]) count++;
+ if (count)
+ gtk_range_set_range(GTK_RANGE(presetSlider), 0, count-1);
+
+ // Advanced options are only for x264
+ if (encoder != HB_VCODEC_X264)
+ {
+ ghb_ui_update(ud, "x264UseAdvancedOptions", ghb_boolean_value(FALSE));
+ }
+}
+
+void
+ghb_video_setting_changed(GtkWidget *widget, signal_user_data_t *ud)
+{
+ static char *tt = NULL;
+
+
+ if (tt == NULL)
+ {
+ GtkWidget *eo = GTK_WIDGET(GHB_WIDGET(ud->builder, "VideoOptionExtra"));
+ tt = gtk_widget_get_tooltip_text(eo);
+ }
+
+ ghb_widget_to_setting(ud->settings, widget);
+
+ int encoder = ghb_get_video_encoder(ud->settings);
+ int presetIndex = ghb_settings_get_int(ud->settings, "VideoPresetSlider");
+ const char * const *video_presets;
+ const char *preset;
+ video_presets = hb_video_encoder_get_presets(encoder);
+ if (video_presets != NULL)
+ {
+ preset = video_presets[presetIndex];
+ ghb_settings_set_string(ud->settings, "VideoPreset", preset);
+ }
+
+ if (!ghb_settings_get_boolean(ud->settings, "x264UseAdvancedOptions") &&
+ encoder == HB_VCODEC_X264)
+ {
+ GString *str = g_string_new("");
+ char *preset;
+ char *tune;
+ char *profile;
+ char *level;
+ char *opts;
+ char *tunes;
+
+ preset = ghb_settings_get_string(ud->settings, "VideoPreset");
+ tune = ghb_settings_get_string(ud->settings, "VideoTune");
+ profile = ghb_settings_get_string(ud->settings, "VideoProfile");
+ level = ghb_settings_get_string(ud->settings, "VideoLevel");
+ opts = ghb_settings_get_string(ud->settings, "VideoOptionExtra");
+
+ if (tune[0] && strcmp(tune, "none"))
+ {
+ g_string_append_printf(str, "%s", tune);
+ }
+ if (ghb_settings_get_boolean(ud->settings, "x264FastDecode"))
+ {
+ g_string_append_printf(str, "%s%s", str->str[0] ? "," : "", "fastdecode");
+ }
+ if (ghb_settings_get_boolean(ud->settings, "x264ZeroLatency"))
+ {
+ g_string_append_printf(str, "%s%s", str->str[0] ? "," : "", "zerolatency");
+ }
+ tunes = g_string_free(str, FALSE);
+
+ char * new_opts;
+
+ int w = ghb_settings_get_int(ud->settings, "scale_width");
+ int h = ghb_settings_get_int(ud->settings, "scale_height");
+
+ if (w == 0 || h == 0)
+ {
+ if (!ghb_settings_get_boolean(ud->settings, "autoscale"))
+ {
+ w = ghb_settings_get_int(ud->settings, "PictureWidth");
+ h = ghb_settings_get_int(ud->settings, "PictureHeight");
+
+ if (h == 0 && w != 0)
+ {
+ h = w * 9 / 16;
+ }
+ if (w == 0 && h != 0)
+ {
+ w = h * 16 / 9;
+ }
+ }
+ if (w == 0 || h == 0)
+ {
+ w = 1280;
+ h = 720;
+ }
+ }
+
+ if (!strcasecmp(profile, "auto"))
+ {
+ profile[0] = 0;
+ }
+ if (!strcasecmp(level, "auto"))
+ {
+ level[0] = 0;
+ }
+ new_opts = hb_x264_param_unparse(
+ preset, tunes, opts, profile, level, w, h);
+ if (new_opts)
+ ghb_ui_update(ud, "x264Option", ghb_string_value(new_opts));
+ else
+ ghb_ui_update(ud, "x264Option", ghb_string_value(""));
+
+ GtkWidget *eo = GTK_WIDGET(GHB_WIDGET(ud->builder, "VideoOptionExtra"));
+
+ char * new_tt;
+ if (new_opts)
+ new_tt = g_strdup_printf(_("%s\n\nExpanded Options:\n\"%s\""), tt, new_opts);
+ else
+ new_tt = g_strdup_printf(_("%s\n\nExpanded Options:\n\"\""), tt);
+ gtk_widget_set_tooltip_text(eo, new_tt);
+
+ g_free(new_tt);
+ g_free(new_opts);
+
+ g_free(preset);
+ g_free(tune);
+ g_free(profile);
+ g_free(level);
+ g_free(opts);
+ g_free(tunes);
+ }
+ else if (ghb_settings_get_boolean(ud->settings, "x264UseAdvancedOptions"))
+ {
+ char *opts = ghb_settings_get_string(ud->settings, "x264Option");
+
+ GtkWidget *eo = GTK_WIDGET(GHB_WIDGET(ud->builder, "VideoOptionExtra"));
+ char * new_tt;
+ if (opts)
+ new_tt = g_strdup_printf(_("%s\n\nExpanded Options:\n\"%s\""), tt, opts);
+ else
+ new_tt = g_strdup_printf(_("%s\n\nExpanded Options:\n\"\""), tt);
+ gtk_widget_set_tooltip_text(eo, new_tt);
+ g_free(new_tt);
+
+ g_free(opts);
+ }
+
+ ghb_check_dependency(ud, widget, NULL);
+ ghb_clear_presets_selection(ud);
+}
+
+G_MODULE_EXPORT void
+video_setting_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ ghb_video_setting_changed(widget, ud);
+}
+
+G_MODULE_EXPORT void
+x264_use_advanced_options_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ ghb_widget_to_setting(ud->settings, widget);
+
+ if (ghb_settings_get_boolean(ud->prefs, "HideAdvancedVideoSettings") &&
+ ghb_settings_get_boolean(ud->settings, "x264UseAdvancedOptions"))
+ {
+ ghb_ui_update(ud, "x264UseAdvancedOptions", ghb_boolean_value(FALSE));
+ return;
+ }
+
+ if (ghb_settings_get_boolean(ud->settings, "x264UseAdvancedOptions"))
+ {
+ ghb_ui_update(ud, "VideoPresetSlider", ghb_int_value(5));
+ ghb_ui_update(ud, "VideoTune", ghb_string_value("none"));
+ ghb_ui_update(ud, "VideoProfile", ghb_string_value("auto"));
+ ghb_ui_update(ud, "VideoLevel", ghb_string_value("auto"));
+
+ char *options = ghb_settings_get_string(ud->settings, "x264Option");
+ ghb_ui_update(ud, "VideoOptionExtra", ghb_string_value(options));
+ g_free(options);
+ }
+
+ ghb_check_dependency(ud, widget, NULL);
+ ghb_clear_presets_selection(ud);
+}
+
+G_MODULE_EXPORT void
+video_option_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ GtkWidget *textview;
+
+ textview = GTK_WIDGET(GHB_WIDGET(ud->builder, "VideoOptionExtra"));
+ ghb_video_setting_changed(textview, ud);
+}
+
+G_MODULE_EXPORT gchar*
+format_video_preset_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
+{
+ const char * const *video_presets;
+ const char *preset;
+ int encoder = ghb_get_video_encoder(ud->settings);
+
+ video_presets = hb_video_encoder_get_presets(encoder);
+ if (video_presets != NULL)
+ {
+ preset = video_presets[(int)val];
+ return g_strdup_printf(" %-12s", preset);
+ }
+ return g_strdup_printf(" %-12s", "ERROR");
+}
+

HandBrake-0.10.0.tar.bz2/gtk/src/videohandler.h Added

@@ -0,0 +1,33 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * audiohandler.h
+ * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
+ *
+ * audiohandler.h is free software.
+ *
+ * You may 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.
+ *
+ * callbacks.h 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
+ */
+
+#if !defined(_VIDEOHANDLER_H_)
+#define _VIDEOHANDLER_H_
+
+#include "settings.h"
+
+int ghb_get_video_encoder(GValue *settings);
+void ghb_video_setting_changed(GtkWidget *widget, signal_user_data_t *ud);
+
+#endif // _VIDEOHANDLER_H_

HandBrake-0.9.9.tar.bz2/gtk/src/x264handler.c -> HandBrake-0.10.0.tar.bz2/gtk/src/x264handler.c Changed

@@ -2,15 +2,16 @@
 /*
 * x264handler.c
 * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
- * 
+ *
 * x264handler.c is free software.
- * 
+ *
 * You may 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.
 */
 
+#include <glib/gi18n.h>
 #include "ghbcompat.h"
 #include <string.h>
 #include "settings.h"
@@ -19,6 +20,7 @@
 #include "presets.h"
 #include "hb-backend.h"
 #include "x264handler.h"
+#include "videohandler.h"
 
 gint ghb_lookup_bframes(const gchar *options);
 static void x264_opt_update(signal_user_data_t *ud, GtkWidget *widget);
@@ -29,194 +31,26 @@
 
 void ghb_show_hide_advanced_video( signal_user_data_t *ud )
 {
- GtkWidget *nb = GHB_WIDGET(ud->builder, "SettingsNotebook");
- GtkWidget *at = GHB_WIDGET(ud->builder, "advanced_tab");
+ gboolean hide;
 
- int pgn = gtk_notebook_page_num(GTK_NOTEBOOK(nb), at);
-
- GtkWidget *pg;
- pg = gtk_notebook_get_nth_page(GTK_NOTEBOOK(nb), pgn);
- if (ghb_settings_get_boolean(ud->settings, "HideAdvancedVideoSettings"))
- {
- gtk_widget_hide(pg);
- ghb_ui_update(ud, "x264UseAdvancedOptions", ghb_boolean_value(FALSE));
- }
- else
- {
- gtk_widget_show(pg);
- }
-}
-
-G_MODULE_EXPORT void
-x264_use_advanced_options_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
- ghb_widget_to_setting(ud->settings, widget);
-
- if (ghb_settings_get_boolean(ud->settings, "HideAdvancedVideoSettings") &&
- ghb_settings_get_boolean(ud->settings, "x264UseAdvancedOptions"))
+ hide = ghb_settings_get_boolean(ud->prefs, "HideAdvancedVideoSettings");
+ if (hide)
 {
 ghb_ui_update(ud, "x264UseAdvancedOptions", ghb_boolean_value(FALSE));
- return;
- }
-
- if (ghb_settings_get_boolean(ud->settings, "x264UseAdvancedOptions"))
- {
- ghb_ui_update(ud, "x264PresetSlider", ghb_int_value(5));
- ghb_ui_update(ud, "x264Tune", ghb_string_value("none"));
- ghb_ui_update(ud, "h264Profile", ghb_string_value("auto"));
- ghb_ui_update(ud, "h264Level", ghb_string_value("auto"));
-
- char *options = ghb_settings_get_string(ud->settings, "x264Option");
- ghb_ui_update(ud, "x264OptionExtra", ghb_string_value(options));
- g_free(options);
 }
 
- ghb_check_dependency(ud, widget, NULL);
- ghb_clear_presets_selection(ud);
-}
-
-G_MODULE_EXPORT void
-x264_setting_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
- static char *tt = NULL;
-
-
- if (tt == NULL)
- {
- GtkWidget *eo = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264OptionExtra"));
- tt = gtk_widget_get_tooltip_text(eo);
- }
-
- ghb_widget_to_setting(ud->settings, widget);
-
- int x264Preset = ghb_settings_get_int(ud->settings, "x264PresetSlider");
- const char * preset = hb_x264_presets()[x264Preset];
- ghb_settings_set_string(ud->settings, "x264Preset", preset);
-
- if (!ghb_settings_get_boolean(ud->settings, "x264UseAdvancedOptions"))
- {
- GString *str = g_string_new("");
- char *preset;
- char *tune;
- char *profile;
- char *level;
- char *opts;
- char *tunes;
-
- preset = ghb_settings_get_string(ud->settings, "x264Preset");
- tune = ghb_settings_get_string(ud->settings, "x264Tune");
- profile = ghb_settings_get_string(ud->settings, "h264Profile");
- level = ghb_settings_get_string(ud->settings, "h264Level");
- opts = ghb_settings_get_string(ud->settings, "x264OptionExtra");
-
- if (tune[0] && strcmp(tune, "none"))
- {
- g_string_append_printf(str, "%s", tune);
- }
- if (ghb_settings_get_boolean(ud->settings, "x264FastDecode"))
- {
- g_string_append_printf(str, "%s%s", str->str[0] ? "," : "", "fastdecode");
- }
- if (ghb_settings_get_boolean(ud->settings, "x264ZeroLatency"))
- {
- g_string_append_printf(str, "%s%s", str->str[0] ? "," : "", "zerolatency");
- }
- tunes = g_string_free(str, FALSE);
-
- char * new_opts;
-
- int w = ghb_settings_get_int(ud->settings, "scale_width");
- int h = ghb_settings_get_int(ud->settings, "scale_height");
-
- if (w == 0 || h == 0)
- {
- if (!ghb_settings_get_boolean(ud->settings, "autoscale"))
- {
- w = ghb_settings_get_int(ud->settings, "PictureWidth");
- h = ghb_settings_get_int(ud->settings, "PictureHeight");
-
- if (h == 0 && w != 0)
- {
- h = w * 9 / 16;
- }
- if (w == 0 && h != 0)
- {
- w = h * 16 / 9;
- }
- }
- if (w == 0 || h == 0)
- {
- w = 1280;
- h = 720;
- }
- }
-
- if (!strcasecmp(profile, "auto"))
- {
- profile[0] = 0;
- }
- if (!strcasecmp(level, "auto"))
- {
- level[0] = 0;
- }
- new_opts = hb_x264_param_unparse(
- preset, tunes, opts, profile, level, w, h);
- if (new_opts)
- ghb_ui_update(ud, "x264Option", ghb_string_value(new_opts));
- else
- ghb_ui_update(ud, "x264Option", ghb_string_value(""));
-
- GtkWidget *eo = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264OptionExtra"));
-
- char * new_tt;
- if (new_opts)
- new_tt = g_strdup_printf("%s\n\nExpanded Options:\n\"%s\"", tt, new_opts);
- else
- new_tt = g_strdup_printf("%s\n\nExpanded Options:\n\"\"", tt);
- gtk_widget_set_tooltip_text(eo, new_tt);
-
- g_free(new_tt);
- g_free(new_opts);
-
- g_free(preset);
- g_free(tune);
- g_free(profile);
- g_free(level);
- g_free(opts);
- g_free(tunes);
- }
- else
- {
- char *opts = ghb_settings_get_string(ud->settings, "x264Option");
-
- GtkWidget *eo = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264OptionExtra"));
- char * new_tt;
- if (opts)
- new_tt = g_strdup_printf("%s\n\nExpanded Options:\n\"%s\"", tt, opts);
- else
- new_tt = g_strdup_printf("%s\n\nExpanded Options:\n\"\"", tt);
- gtk_widget_set_tooltip_text(eo, new_tt);
-
- g_free(opts);
- }
-
- ghb_check_dependency(ud, widget, NULL);
- ghb_clear_presets_selection(ud);
-}
-
-G_MODULE_EXPORT void
-x264_option_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
- GtkWidget *textview;
+ GtkWidget *widget;
+ GtkWidget *at = GHB_WIDGET(ud->builder, "advanced_video_tab");
 
- textview = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264OptionExtra"));
- x264_setting_changed_cb(textview, ud);
+ gtk_widget_set_visible(at, !hide);
+ widget = GHB_WIDGET(ud->builder, "x264UseAdvancedOptions");
+ gtk_widget_set_visible(widget, !hide);
 }
 
 G_MODULE_EXPORT void
 x264_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
- ghb_widget_to_setting(ud->settings, widget);
+ ghb_widget_to_setting(ud->x264_priv, widget);
 if (!ignore_options_update)
 {
 ignore_options_update = TRUE;
@@ -230,7 +64,7 @@
 G_MODULE_EXPORT void
 x264_slider_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
- ghb_widget_to_setting(ud->settings, widget);
+ ghb_widget_to_setting(ud->x264_priv, widget);
 
 // Lock slider values to multiples of step_increment
 GtkAdjustment * adj = gtk_range_get_adjustment(GTK_RANGE(widget));
@@ -264,7 +98,7 @@
 {
 gint me;
 
- ghb_widget_to_setting(ud->settings, widget);
+ ghb_widget_to_setting(ud->x264_priv, widget);
 if (!ignore_options_update)
 {
 ignore_options_update = TRUE;
@@ -274,7 +108,7 @@
 ghb_check_dependency(ud, widget, NULL);
 ghb_clear_presets_selection(ud);
 widget = GHB_WIDGET(ud->builder, "x264_merange");
- me = ghb_settings_combo_int(ud->settings, "x264_me");
+ me = ghb_settings_combo_int(ud->x264_priv, "x264_me");
 if (me < 2)
 { // me < umh
 // me_range 4 - 16
@@ -296,7 +130,7 @@
 
 if (tt == NULL)
 {
- GtkWidget *eo = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264OptionExtra"));
+ GtkWidget *eo = GTK_WIDGET(GHB_WIDGET(ud->builder, "VideoOptionExtra"));
 tt = gtk_widget_get_tooltip_text(eo);
 }
 
@@ -319,35 +153,25 @@
 ghb_ui_update(ud, "x264Option", ghb_string_value(sopts));
 ghb_x264_parse_options(ud, sopts);
 
- GtkWidget *eo = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264OptionExtra"));
+ GtkWidget *eo = GTK_WIDGET(GHB_WIDGET(ud->builder, "VideoOptionExtra"));
 char * new_tt;
 if (sopts)
- new_tt = g_strdup_printf("%s\n\nExpanded Options:\n\"%s\"", tt, sopts);
+ new_tt = g_strdup_printf(_("%s\n\nExpanded Options:\n\"%s\""), tt, sopts);
 else
- new_tt = g_strdup_printf("%s\n\nExpanded Options:\n\"\"", tt);
+ new_tt = g_strdup_printf(_("%s\n\nExpanded Options:\n\"\""), tt);
 gtk_widget_set_tooltip_text(eo, new_tt);
+ g_free(new_tt);
 
 g_free(options);
 options = sopts;
 }
-#if 0
- if (ghb_settings_get_boolean(ud->settings, "x264UseAdvancedOptions"))
- {
- ghb_ui_update(ud, "x264PresetSlider", ghb_int_value(5));
- ghb_ui_update(ud, "x264Tune", ghb_string_value("none"));
- ghb_ui_update(ud, "h264Profile", ghb_string_value("auto"));
- ghb_ui_update(ud, "h264Level", ghb_string_value("auto"));
-
- ghb_ui_update(ud, "x264OptionExtra", ghb_string_value(options));
- }
-#endif
 g_free(options);
 ignore_options_update = FALSE;
 }
 }
 
 G_MODULE_EXPORT gboolean
-x264_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
+x264_focus_out_cb(GtkWidget *widget, GdkEventFocus *event,
 signal_user_data_t *ud)
 {
 gchar *options, *sopts;
@@ -442,7 +266,7 @@
 static gchar *x264_ref_syns[] = {"ref", "frameref", NULL};
 static gchar *x264_bframes_syns[] = {"bframes", NULL};
 static gchar *x264_badapt_syns[] = {"b-adapt", "b_adapt", NULL};
-static gchar *x264_direct_syns[] = 
+static gchar *x264_direct_syns[] =
 {"direct", "direct-pred", "direct_pred", NULL};
 static gchar *x264_weightp_syns[] = {"weightp", NULL};
 static gchar *x264_bpyramid_syns[] = {"b-pyramid", "b_pyramid", NULL};
@@ -458,7 +282,7 @@
 static gchar *x264_psy_syns[] = {"psy-rd", "psy_rd", NULL};
 static gchar *x264_aq_strength_syns[] = {"aq-strength", "aq_strength", NULL};
 static gchar *x264_mbtree_syns[] = {"mbtree", NULL};
-static gchar *x264_decimate_syns[] = 
+static gchar *x264_decimate_syns[] =
 {"no-dct-decimate", "no_dct_decimate", NULL};
 static gchar *x264_cabac_syns[] = {"cabac", NULL};
 
@@ -522,7 +346,7 @@
 
 if (val == NULL) return;
 dval = g_strtod (val, NULL);
- ghb_ui_update(ud, name, ghb_double_value(dval));
+ ghb_settings_set_double(ud->x264_priv, name, dval);
 }
 
 static void
@@ -532,7 +356,7 @@
 
 if (val == NULL) return;
 ival = g_strtod (val, NULL);
- ghb_ui_update(ud, name, ghb_int64_value(ival));
+ ghb_settings_set_int(ud->x264_priv, name, ival);
 }
 
 static void
@@ -542,7 +366,7 @@
 
 if (val == NULL) return;
 ival = g_strtod (val, NULL);
- ghb_settings_set_value(ud->settings, name, ghb_int64_value(ival));
+ ghb_settings_set_value(ud->x264_priv, name, ghb_int64_value(ival));
 ghb_check_dependency(ud, NULL, name);
 }
 
@@ -554,7 +378,7 @@
 NULL
 };
 
-static gboolean 
+static gboolean
 str_is_true(const gchar *str)
 {
 gint ii;
@@ -570,18 +394,18 @@
 x264_update_bool(signal_user_data_t *ud, const gchar *name, const gchar *val)
 {
 if (val == NULL)
- ghb_ui_update(ud, name, ghb_boolean_value(1));
+ ghb_settings_set_boolean(ud->x264_priv, name, TRUE);
 else
- ghb_ui_update(ud, name, ghb_boolean_value(str_is_true(val)));
+ ghb_settings_set_boolean(ud->x264_priv, name, str_is_true(val));
 }
 
 static void
 x264_update_bool_setting(signal_user_data_t *ud, const gchar *name, const gchar *val)
 {
 if (val == NULL)
- ghb_settings_set_value(ud->settings, name, ghb_boolean_value(1));
+ ghb_settings_set_boolean(ud->x264_priv, name, TRUE);
 else
- ghb_settings_set_value(ud->settings, name, ghb_boolean_value(str_is_true(val)));
+ ghb_settings_set_boolean(ud->x264_priv, name, str_is_true(val));
 
 ghb_check_dependency(ud, NULL, name);
 }
@@ -589,64 +413,13 @@
 static void
 x264_update_combo(signal_user_data_t *ud, const gchar *name, const gchar *val)
 {
- GtkTreeModel *store;
- GtkTreeIter iter;
- gchar *shortOpt;
- gdouble ivalue;
- gboolean foundit = FALSE;
- GtkWidget *widget;
-
- if (val == NULL) return;
- widget = GHB_WIDGET(ud->builder, name);
- if (widget == NULL)
- {
- g_debug("Failed to find widget for key: %s\n", name);
- return;
- }
- store = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
- if (gtk_tree_model_get_iter_first (store, &iter))
- {
- do
- {
- gtk_tree_model_get(store, &iter, 2, &shortOpt, 3, &ivalue, -1);
- if (strcmp(shortOpt, val) == 0)
- {
- gtk_combo_box_set_active_iter (GTK_COMBO_BOX(widget), &iter);
- g_free(shortOpt);
- foundit = TRUE;
- break;
- }
- g_free(shortOpt);
- } while (gtk_tree_model_iter_next (store, &iter));
- }
- if (!foundit)
- {
- if (gtk_tree_model_get_iter_first (store, &iter))
- {
- do
- {
- gtk_tree_model_get(store, &iter, 2, &shortOpt, 3, &ivalue, -1);
- if (strcmp(shortOpt, "custom") == 0)
- {
- gtk_list_store_set(GTK_LIST_STORE(store), &iter, 4, val, -1);
- gtk_combo_box_set_active_iter (GTK_COMBO_BOX(widget), &iter);
- g_free(shortOpt);
- foundit = TRUE;
- break;
- }
- g_free(shortOpt);
- } while (gtk_tree_model_iter_next (store, &iter));
- }
- }
- // Its possible the value hasn't changed. Since settings are only
- // updated when the value changes, I'm initializing settings here as well.
- ghb_widget_to_setting(ud->settings, widget);
+ ghb_settings_set_string(ud->x264_priv, name, val);
 }
 
 static void
 x264_update_deblock(signal_user_data_t *ud, const gchar *xval)
 {
- gdouble avalue, bvalue;
+ int avalue, bvalue;
 gchar *end;
 gchar *val;
 gchar *bval = NULL;
@@ -654,7 +427,7 @@
 if (xval == NULL) return;
 val = g_strdup(xval);
 bvalue = avalue = 0;
- if (val != NULL) 
+ if (val != NULL)
 {
 gchar *pos = strchr(val, ',');
 if (pos != NULL)
@@ -662,15 +435,15 @@
 bval = pos + 1;
 *pos = 0;
 }
- avalue = g_strtod (val, &end);
+ avalue = (int)g_strtod(val, &end);
 if (bval != NULL)
 {
- bvalue = g_strtod (bval, &end);
+ bvalue = (int)g_strtod(bval, &end);
 }
 }
 g_free(val);
- ghb_ui_update(ud, "x264_deblock_alpha", ghb_int64_value(avalue));
- ghb_ui_update(ud, "x264_deblock_beta", ghb_int64_value(bvalue));
+ ghb_settings_set_int(ud->x264_priv, "x264_deblock_alpha", avalue);
+ ghb_settings_set_int(ud->x264_priv, "x264_deblock_beta", bvalue);
 }
 
 static void
@@ -692,8 +465,8 @@
 
 if (xval == NULL) return;
 x264_parse_psy(xval, &rd_value, &trell_value);
- ghb_ui_update(ud, "x264_psy_rd", ghb_double_value(rd_value));
- ghb_ui_update(ud, "x264_psy_trell", ghb_double_value(trell_value));
+ ghb_settings_set_double(ud->x264_priv, "x264_psy_rd", rd_value);
+ ghb_settings_set_double(ud->x264_priv, "x264_psy_trell", trell_value);
 }
 
 static void do_update(signal_user_data_t *ud, char *name, gint type, char *val)
@@ -783,7 +556,7 @@
 val = trans_x264_val(x264_opt_map[jj].translation, val);
 if (val != NULL)
 {
- do_update(ud, x264_opt_map[jj].name, 
+ do_update(ud, x264_opt_map[jj].name,
 x264_opt_map[jj].translation->ui_type, val);
 // TODO un-grey the ui control
 }
@@ -836,7 +609,7 @@
 val = g_strdup(trans_x264_val(x264_opt_map[jj].translation, val));
 if (val != NULL)
 {
- do_update(ud, x264_opt_map[jj].name, 
+ do_update(ud, x264_opt_map[jj].name,
 x264_opt_map[jj].translation->ui_type, val);
 // TODO un-grey the ui control
 }
@@ -851,6 +624,7 @@
 }
 }
 g_strfreev(split);
+ ghb_settings_to_ui(ud, ud->x264_priv);
 }
 
 gchar*
@@ -858,8 +632,8 @@
 {
 gchar *alpha, *beta;
 gchar *result;
- alpha = ghb_settings_get_string(ud->settings, "x264_deblock_alpha");
- beta = ghb_settings_get_string(ud->settings, "x264_deblock_beta");
+ alpha = ghb_settings_get_string(ud->x264_priv, "x264_deblock_alpha");
+ beta = ghb_settings_get_string(ud->x264_priv, "x264_deblock_beta");
 result = g_strdup_printf("%s,%s", alpha, beta);
 g_free(alpha);
 g_free(beta);
@@ -871,8 +645,8 @@
 {
 gdouble rd, trell;
 gchar *result;
- rd = ghb_settings_get_double(ud->settings, "x264_psy_rd");
- trell = ghb_settings_get_double(ud->settings, "x264_psy_trell");
+ rd = ghb_settings_get_double(ud->x264_priv, "x264_psy_rd");
+ trell = ghb_settings_get_double(ud->x264_priv, "x264_psy_trell");
 result = g_strdup_printf("%g|%g", rd, trell);
 return result;
 }
@@ -1107,7 +881,7 @@
 gint ret = 0;
 gchar *result;
 gchar **split;
- 
+
 if (options == NULL)
 options = "";
 
@@ -1129,7 +903,7 @@
 gint ret = 0;
 gchar *result;
 gchar **split;
- 
+
 if (options == NULL)
 options = "";
 
@@ -1151,7 +925,7 @@
 gint ret = 0;
 gchar *result;
 gchar **split;
- 
+
 if (options == NULL)
 options = "";
 
@@ -1173,7 +947,7 @@
 gint ret = ghb_lookup_bframes(options) != 0;
 gchar *result;
 gchar **split;
- 
+
 if (options == NULL)
 options = "";
 
@@ -1199,12 +973,12 @@
 gint ii;
 
 // Fix up option dependencies
- gint subme = ghb_settings_combo_int(ud->settings, "x264_subme");
+ gint subme = ghb_settings_combo_int(ud->x264_priv, "x264_subme");
 if (subme < 6)
 {
 x264_remove_opt(split, x264_psy_syns);
 }
- gint trell = ghb_settings_combo_int(ud->settings, "x264_trellis");
+ gint trell = ghb_settings_combo_int(ud->x264_priv, "x264_trellis");
 if (subme >= 10)
 {
 gint aqmode = ghb_lookup_aqmode(options);
@@ -1232,7 +1006,7 @@
 split[psy] = g_strdup_printf("psy-rd=%g|0", psy_rd);
 }
 }
- gint bframes = ghb_settings_get_int(ud->settings, "x264_bframes");
+ gint bframes = ghb_settings_get_int(ud->x264_priv, "x264_bframes");
 if (bframes == 0)
 {
 x264_remove_opt(split, x264_direct_syns);
@@ -1281,42 +1055,8 @@
 return result;
 }
 
-G_MODULE_EXPORT gboolean
-lavc_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
- signal_user_data_t *ud)
-{
- ghb_widget_to_setting(ud->settings, widget);
-
-#if 0
- gchar *options, *sopts;
- ****************************************************************
- When there are lavc widget in the future, this will be populated
- ****************************************************************
- options = ghb_settings_get_string(ud->settings, "x264Option");
- sopts = sanitize_x264opts(ud, options);
- ignore_options_update = TRUE;
- if (sopts != NULL && strcmp(sopts, options) != 0)
- {
- ghb_ui_update(ud, "x264Option", ghb_string_value(sopts));
- ghb_x264_parse_options(ud, sopts);
- }
- g_free(options);
- g_free(sopts);
- ignore_options_update = FALSE;
-#endif
- return FALSE;
-}
-
-G_MODULE_EXPORT gchar*
-format_x264_preset_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
+void
+ghb_x264_init(signal_user_data_t *ud)
 {
- const char * const *x264_presets;
- const char *preset = "medium";
-
- x264_presets = hb_x264_presets();
-
- preset = x264_presets[(int)val];
-
- return g_strdup_printf(" %-12s", preset);
+ ud->x264_priv = ghb_settings_new();
 }
-

HandBrake-0.9.9.tar.bz2/gtk/src/x264handler.h -> HandBrake-0.10.0.tar.bz2/gtk/src/x264handler.h Changed

@@ -2,19 +2,19 @@
 /*
 * x264handler.h
 * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
- * 
+ *
 * x264handler.h is free software.
- * 
+ *
 * You may 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.
- * 
+ *
 * callbacks.h 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.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with callbacks.h. If not, write to:
 * The Free Software Foundation, Inc.,
@@ -27,6 +27,7 @@
 
 #include "settings.h"
 
+void ghb_x264_init(signal_user_data_t *ud);
 void ghb_x264_parse_options(signal_user_data_t *ud, const gchar *options);
 gint ghb_lookup_badapt(const gchar *options);
 void ghb_show_hide_advanced_video( signal_user_data_t *ud );

HandBrake-0.9.9.tar.bz2/libhb/audio_remap.c -> HandBrake-0.10.0.tar.bz2/libhb/audio_remap.c Changed

@@ -1,6 +1,6 @@
 /* audio_remap.c
 *
- * Copyright (c) 2003-2013 HandBrake Team
+ * Copyright (c) 2003-2014 HandBrake Team
 * This file is part of the HandBrake source code
 * Homepage: <http://handbrake.fr/>
 * It may be used under the terms of the GNU General Public License v2.
@@ -246,19 +246,25 @@
 }
 
 void hb_audio_remap_set_channel_layout(hb_audio_remap_t *remap,
- uint64_t channel_layout,
- int channels)
+ uint64_t channel_layout)
 {
 if (remap != NULL)
 {
 int ii;
 remap->remap_needed = 0;
 
+ // sanitize the layout
+ if (channel_layout == AV_CH_LAYOUT_STEREO_DOWNMIX)
+ {
+ channel_layout = AV_CH_LAYOUT_STEREO;
+ }
+ remap->nchannels = av_get_channel_layout_nb_channels(channel_layout);
+
 // in some cases, remapping is not necessary and/or supported
- if (channels > HB_AUDIO_REMAP_MAX_CHANNELS)
+ if (remap->nchannels > HB_AUDIO_REMAP_MAX_CHANNELS)
 {
 hb_log("hb_audio_remap_set_channel_layout: too many channels (%d)",
- channels);
+ remap->nchannels);
 return;
 }
 if (remap->channel_map_in == remap->channel_map_out)
@@ -266,14 +272,6 @@
 return;
 }
 
- // sanitize the layout
- channel_layout = hb_ff_layout_xlat(channel_layout, channels);
- if (channel_layout == AV_CH_LAYOUT_STEREO_DOWNMIX)
- {
- channel_layout = AV_CH_LAYOUT_STEREO;
- }
- remap->nchannels = av_get_channel_layout_nb_channels(channel_layout);
-
 // build the table and check whether remapping is necessary
 hb_audio_remap_build_table(remap->channel_map_out,
 remap->channel_map_in, channel_layout,

HandBrake-0.9.9.tar.bz2/libhb/audio_remap.h -> HandBrake-0.10.0.tar.bz2/libhb/audio_remap.h Changed

HandBrake-0.9.9.tar.bz2/libhb/audio_resample.c -> HandBrake-0.10.0.tar.bz2/libhb/audio_resample.c Changed

@@ -1,6 +1,6 @@
 /* audio_resample.c
 *
- * Copyright (c) 2003-2013 HandBrake Team
+ * Copyright (c) 2003-2014 HandBrake Team
 * This file is part of the HandBrake source code
 * Homepage: <http://handbrake.fr/>
 * It may be used under the terms of the GNU General Public License v2.
@@ -62,6 +62,7 @@
 // set default input characteristics
 resample->in.sample_fmt = resample->out.sample_fmt;
 resample->in.channel_layout = resample->out.channel_layout;
+ resample->in.lfe_mix_level = HB_MIXLEV_ZERO;
 resample->in.center_mix_level = HB_MIXLEV_DEFAULT;
 resample->in.surround_mix_level = HB_MIXLEV_DEFAULT;
 
@@ -75,12 +76,10 @@
 }
 
 void hb_audio_resample_set_channel_layout(hb_audio_resample_t *resample,
- uint64_t channel_layout,
- int channels)
+ uint64_t channel_layout)
 {
 if (resample != NULL)
 {
- channel_layout = hb_ff_layout_xlat(channel_layout, channels);
 if (channel_layout == AV_CH_LAYOUT_STEREO_DOWNMIX)
 {
 // Dolby Surround is Stereo when it comes to remixing
@@ -92,10 +91,12 @@
 
 void hb_audio_resample_set_mix_levels(hb_audio_resample_t *resample,
 double surround_mix_level,
- double center_mix_level)
+ double center_mix_level,
+ double lfe_mix_level)
 {
 if (resample != NULL)
 {
+ resample->in.lfe_mix_level = lfe_mix_level;
 resample->in.center_mix_level = center_mix_level;
 resample->in.surround_mix_level = surround_mix_level;
 }
@@ -128,6 +129,7 @@
 (resample->resample_needed &&
 (resample->resample.sample_fmt != resample->in.sample_fmt ||
 resample->resample.channel_layout != resample->in.channel_layout ||
+ resample->resample.lfe_mix_level != resample->in.lfe_mix_level ||
 resample->resample.center_mix_level != resample->in.center_mix_level ||
 resample->resample.surround_mix_level != resample->in.surround_mix_level));
 
@@ -161,6 +163,8 @@
 resample->in.sample_fmt, 0);
 av_opt_set_int(resample->avresample, "in_channel_layout",
 resample->in.channel_layout, 0);
+ av_opt_set_double(resample->avresample, "lfe_mix_level",
+ resample->in.lfe_mix_level, 0);
 av_opt_set_double(resample->avresample, "center_mix_level",
 resample->in.center_mix_level, 0);
 av_opt_set_double(resample->avresample, "surround_mix_level",
@@ -181,6 +185,7 @@
 resample->resample.channel_layout = resample->in.channel_layout;
 resample->resample.channels =
 av_get_channel_layout_nb_channels(resample->in.channel_layout);
+ resample->resample.lfe_mix_level = resample->in.lfe_mix_level;
 resample->resample.center_mix_level = resample->in.center_mix_level;
 resample->resample.surround_mix_level = resample->in.surround_mix_level;
 }

HandBrake-0.9.9.tar.bz2/libhb/audio_resample.h -> HandBrake-0.10.0.tar.bz2/libhb/audio_resample.h Changed

@@ -1,6 +1,6 @@
 /* audio_resample.h
 *
- * Copyright (c) 2003-2013 HandBrake Team
+ * Copyright (c) 2003-2014 HandBrake Team
 * This file is part of the HandBrake source code
 * Homepage: <http://handbrake.fr/>
 * It may be used under the terms of the GNU General Public License v2.
@@ -24,6 +24,8 @@
 
 /* Default mix level for center and surround channels */
 #define HB_MIXLEV_DEFAULT ((double)M_SQRT1_2)
+/* Default mix level for LFE channel */
+#define HB_MIXLEV_ZERO ((double)0.0)
 
 typedef struct
 {
@@ -36,6 +38,7 @@
 struct
 {
 uint64_t channel_layout;
+ double lfe_mix_level;
 double center_mix_level;
 double surround_mix_level;
 enum AVSampleFormat sample_fmt;
@@ -45,6 +48,7 @@
 {
 int channels;
 uint64_t channel_layout;
+ double lfe_mix_level;
 double center_mix_level;
 double surround_mix_level;
 enum AVSampleFormat sample_fmt;
@@ -74,17 +78,15 @@
 *
 * They should be called whenever the relevant characteristic(s) differ from the
 * requested output characteristics, or if they may have changed in the source.
- *
- * Note: channel_layout is automatically sanitized.
 */
 
 void hb_audio_resample_set_channel_layout(hb_audio_resample_t *resample,
- uint64_t channel_layout,
- int channels);
+ uint64_t channel_layout);
 
 void hb_audio_resample_set_mix_levels(hb_audio_resample_t *resample,
 double surround_mix_level,
- double center_mix_level);
+ double center_mix_level,
+ double lfe_mix_level);
 
 void hb_audio_resample_set_sample_fmt(hb_audio_resample_t *resample,
 enum AVSampleFormat sample_fmt);

HandBrake-0.9.9.tar.bz2/libhb/batch.c -> HandBrake-0.10.0.tar.bz2/libhb/batch.c Changed

@@ -1,6 +1,6 @@
 /* batch.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -16,6 +16,11 @@
 hb_list_t * list_file;
 };
 
+static int compare_str(const void *a, const void *b)
+{
+ return strncmp(*(const char**)a, *(const char**)b, PATH_MAX);
+}
+
 /***********************************************************************
 * hb_batch_init
 ***********************************************************************
@@ -24,28 +29,38 @@
 hb_batch_t * hb_batch_init( char * path )
 {
 hb_batch_t * d;
- struct stat sb;
- DIR * dir;
+ hb_stat_t sb;
+ HB_DIR * dir;
 struct dirent * entry;
 char * filename;
+ int count, ii;
+ char ** files;
 
- if ( stat( path, &sb ) )
+ if ( hb_stat( path, &sb ) )
 return NULL;
 
 if ( !S_ISDIR( sb.st_mode ) )
 return NULL;
 
- dir = opendir( path );
+ dir = hb_opendir(path);
 if ( dir == NULL )
 return NULL;
 
- d = calloc( sizeof( hb_batch_t ), 1 );
- d->list_file = hb_list_init();
+ // Count the total number of entries
+ count = 0;
+ while ( (entry = hb_readdir( dir ) ) )
+ {
+ count++;
+ }
+ files = malloc(count * sizeof(char*));
 
- while ( (entry = readdir( dir ) ) )
+ // Find all regular files
+ ii = 0;
+ hb_rewinddir(dir);
+ while ( (entry = hb_readdir( dir ) ) )
 {
 filename = hb_strdup_printf( "%s" DIR_SEP_STR "%s", path, entry->d_name );
- if ( stat( filename, &sb ) )
+ if ( hb_stat( filename, &sb ) )
 {
 free( filename );
 continue;
@@ -57,10 +72,23 @@
 continue;
 }
 
- hb_list_add( d->list_file, filename );
+ files[ii++] = filename;
+ }
+ count = ii;
+
+ // Sort the files
+ qsort(files, count, sizeof(char*), compare_str);
+
+ // Create file list
+ d = calloc( sizeof( hb_batch_t ), 1 );
+ d->list_file = hb_list_init();
+ for (ii = 0; ii < count; ii++)
+ {
+ hb_list_add( d->list_file, files[ii] );
 }
+ hb_closedir( dir );
+ free(files);
 
- closedir( dir );
 if ( hb_list_count( d->list_file ) == 0 )
 {
 hb_list_close( &d->list_file );

HandBrake-0.9.9.tar.bz2/libhb/bd.c -> HandBrake-0.10.0.tar.bz2/libhb/bd.c Changed

@@ -1,6 +1,6 @@
 /* dvd.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -19,7 +19,7 @@
 BLURAY * bd;
 int title_count;
 BLURAY_TITLE_INFO ** title_info;
- uint64_t pkt_count;
+ int64_t duration;
 hb_stream_t * stream;
 int chapter;
 int next_chap;
@@ -194,12 +194,9 @@
 strlen( lang->native_name ) ? lang->native_name : lang->eng_name );
 snprintf( audio->config.lang.iso639_2, 
 sizeof( audio->config.lang.iso639_2 ), "%s", lang->iso639_2 );
- snprintf( audio->config.lang.description,
- sizeof( audio->config.lang.description ), "%s (%s)",
- audio->config.lang.simple, codec_name );
 
- hb_log( "bd: audio id=0x%x, lang=%s, 3cc=%s", audio->id,
- audio->config.lang.description, audio->config.lang.iso639_2 );
+ hb_log("bd: audio id=0x%x, lang=%s (%s), 3cc=%s", audio->id,
+ audio->config.lang.simple, codec_name, audio->config.lang.iso639_2);
 
 audio->config.in.track = track;
 hb_list_add( list_audio, audio );
@@ -249,21 +246,22 @@
 hb_log( "bd: scanning title %d", tt );
 
 title = hb_title_init( d->path, tt );
- title->demuxer = HB_MPEG_DEMUXER;
+ title->demuxer = HB_TS_DEMUXER;
 title->type = HB_BD_TYPE;
 title->reg_desc = STR4_TO_UINT32("HDMV");
 
 char * p_cur, * p_last = d->path;
 for( p_cur = d->path; *p_cur; p_cur++ )
 {
- if( p_cur[0] == '/' && p_cur[1] )
+ if( IS_DIR_SEP(p_cur[0]) && p_cur[1] )
 {
 p_last = &p_cur[1];
 }
 }
 snprintf( title->name, sizeof( title->name ), "%s", p_last );
- strncpy( title->path, d->path, 1024 );
- title->path[1023] = 0;
+ char *dot_term = strrchr(title->name, '.');
+ if (dot_term)
+ *dot_term = '\0';
 
 title->vts = 0;
 title->ttn = 0;
@@ -336,21 +334,12 @@
 "Unknown"
 );
 
- if ( bdvideo->coding_type == BLURAY_STREAM_TYPE_VIDEO_VC1 &&
- ( bdvideo->format == BLURAY_VIDEO_FORMAT_480I ||
- bdvideo->format == BLURAY_VIDEO_FORMAT_576I ||
- bdvideo->format == BLURAY_VIDEO_FORMAT_1080I ) )
- {
- hb_log( "bd: Interlaced VC-1 not supported" );
- goto fail;
- }
-
 switch( bdvideo->coding_type )
 {
 case BLURAY_STREAM_TYPE_VIDEO_MPEG1:
 case BLURAY_STREAM_TYPE_VIDEO_MPEG2:
- title->video_codec = WORK_DECMPEG2;
- title->video_codec_param = 0;
+ title->video_codec = WORK_DECAVCODECV;
+ title->video_codec_param = AV_CODEC_ID_MPEG2VIDEO;
 break;
 
 case BLURAY_STREAM_TYPE_VIDEO_VC1:
@@ -361,7 +350,6 @@
 case BLURAY_STREAM_TYPE_VIDEO_H264:
 title->video_codec = WORK_DECAVCODECV;
 title->video_codec_param = AV_CODEC_ID_H264;
- title->flags |= HBTF_NO_IDR;
 break;
 
 default:
@@ -385,30 +373,39 @@
 hb_log( "bd: aspect = %g", title->container_aspect );
 
 /* Detect audio */
- // All BD clips are not all required to have the same audio.
- // But clips that have seamless transition are required
- // to have the same audio as the previous clip.
- // So find the clip that has the most other clips with the 
- // matching audio.
 // Max primary BD audios is 32
 int matches;
 int most_audio = 0;
 int audio_clip_index = 0;
- for ( ii = 0; ii < ti->clip_count; ii++ )
+ if (ti->clip_count > 2)
 {
- matches = 0;
- for ( jj = 0; jj < ti->clip_count; jj++ )
+ // All BD clips are not all required to have the same audio.
+ // But clips that have seamless transition are required
+ // to have the same audio as the previous clip.
+ // So find the clip that has the most other clips with the 
+ // matching audio.
+ for ( ii = 0; ii < ti->clip_count; ii++ )
 {
- if ( bd_audio_equal( &ti->clips[ii], &ti->clips[jj] ) )
+ matches = 0;
+ for ( jj = 0; jj < ti->clip_count; jj++ )
+ {
+ if ( bd_audio_equal( &ti->clips[ii], &ti->clips[jj] ) )
+ {
+ matches++;
+ }
+ }
+ if ( matches > most_audio )
 {
- matches++;
+ most_audio = matches;
+ audio_clip_index = ii;
 }
 }
- if ( matches > most_audio )
- {
- most_audio = matches;
- audio_clip_index = ii;
- }
+ }
+ else if (ti->clip_count == 2)
+ {
+ // If there are only 2 clips, pick audios from the longer clip
+ if (ti->clips[0].pkt_count < ti->clips[1].pkt_count)
+ audio_clip_index = 1;
 }
 
 // Add all the audios found in the above clip.
@@ -423,7 +420,7 @@
 case BLURAY_STREAM_TYPE_AUDIO_TRUHD:
 // Add 2 audio tracks. One for TrueHD and one for AC-3
 add_audio(ii, title->list_audio, bdaudio, HB_SUBSTREAM_BD_AC3,
- HB_ACODEC_AC3, 0);
+ HB_ACODEC_AC3, AV_CODEC_ID_AC3);
 add_audio(ii, title->list_audio, bdaudio, HB_SUBSTREAM_BD_TRUEHD,
 HB_ACODEC_FFMPEG, AV_CODEC_ID_TRUEHD);
 break;
@@ -451,7 +448,7 @@
 
 case BLURAY_STREAM_TYPE_AUDIO_AC3:
 add_audio(ii, title->list_audio, bdaudio, 0,
- HB_ACODEC_AC3, 0);
+ HB_ACODEC_AC3, AV_CODEC_ID_AC3);
 break;
 
 case BLURAY_STREAM_TYPE_AUDIO_DTSHD_MASTER:
@@ -493,18 +490,59 @@
 }
 
 /* Chapters */
- for ( ii = 0; ii < ti->chapter_count; ii++ )
+ for ( ii = 0, jj = 0; ii < ti->chapter_count; ii++ )
 {
 char chapter_title[80];
+
+ // Sanity check start time of this chapter.
+ // If it is beyond the end of the title, drop it.
+ if (ti->chapters[ii].start > ti->duration)
+ {
+ hb_log("bd: chapter %d invalid start %ld, dropping", ii+1,
+ ti->chapters[ii].start);
+ continue;
+ }
+
 chapter = calloc( sizeof( hb_chapter_t ), 1 );
 
- chapter->index = ii + 1;
+ chapter->index = ++jj;
 sprintf( chapter_title, "Chapter %d", chapter->index );
 hb_chapter_set_title( chapter, chapter_title );
 
 chapter->duration = ti->chapters[ii].duration;
 chapter->block_start = ti->chapters[ii].offset;
 
+ // Sanity check chapter duration and start times
+ // Have seen some invalid durations in the wild
+ if (ii < ti->chapter_count - 1)
+ {
+ // Validate start time
+ if (ti->chapters[ii+1].start < ti->chapters[ii].start)
+ {
+ hb_log("bd: chapter %d invalid start %ld", ii+1,
+ ti->chapters[ii+1].start);
+ ti->chapters[ii+1].start = ti->chapters[ii].start +
+ chapter->duration;
+ }
+ if (ti->chapters[ii+1].start - ti->chapters[ii].start !=
+ chapter->duration)
+ {
+ hb_log("bd: chapter %d invalid duration %ld", ii+1,
+ chapter->duration);
+ chapter->duration = ti->chapters[ii+1].start -
+ ti->chapters[ii].start;
+ }
+ }
+ else
+ {
+ if (ti->duration - ti->chapters[ii].start != chapter->duration)
+ {
+ hb_log("bd: chapter %d invalid duration %ld", ii+1,
+ chapter->duration);
+ chapter->duration = ti->duration - ti->chapters[ii].start;
+ }
+ }
+
 int seconds = ( chapter->duration + 45000 ) / 90000;
 chapter->hours = ( seconds / 3600 );
 chapter->minutes = ( seconds % 3600 ) / 60;
@@ -588,7 +626,7 @@
 {
 BD_EVENT event;
 
- d->pkt_count = title->block_count;
+ d->duration = title->duration;
 
 // Calling bd_get_event initializes libbluray event queue.
 bd_select_title( d->bd, d->title_info[title->index - 1]->idx );
@@ -619,9 +657,9 @@
 **********************************************************************/
 int hb_bd_seek( hb_bd_t * d, float f )
 {
- uint64_t packet = f * d->pkt_count;
+ uint64_t pos = f * d->duration;
 
- bd_seek(d->bd, packet * 192);
+ bd_seek_time(d->bd, pos);
 d->next_chap = bd_get_current_chapter( d->bd ) + 1;
 hb_ts_stream_reset(d->stream);
 return 1;

HandBrake-0.9.9.tar.bz2/libhb/bits.h -> HandBrake-0.10.0.tar.bz2/libhb/bits.h Changed

HandBrake-0.10.0.tar.bz2/libhb/colormap.c Added

@@ -0,0 +1,721 @@
+/* colormap.c
+ *
+ * Copyright (c) 2003-2014 HandBrake Team
+ * This file is part of the HandBrake source code
+ * Homepage: <http://handbrake.fr/>.
+ * It may be used under the terms of the GNU General Public License v2.
+ * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <strings.h>
+#include "colormap.h"
+
+typedef struct
+{
+ char *name;
+ uint32_t rgb;
+} hb_colormap_t;
+
+static hb_colormap_t colormap[] =
+{
+ { "none", 0xFFFFFF },
+ { "black", 0x000000 },
+ { "white", 0xFFFFFF },
+ { "red", 0xFF0000 },
+ { "green", 0x00FF00 },
+ { "blue", 0x0000FF },
+ { "aliceblue", 0xF0F8FF },
+ { "antiquewhite", 0xFAEBD7 },
+ { "antiquewhite1", 0xFFEFDB },
+ { "antiquewhite2", 0xEEDFCC },
+ { "antiquewhite3", 0xCDC0B0 },
+ { "antiquewhite4", 0x8B8378 },
+ { "aqua", 0x00FFFF },
+ { "aquamarine", 0x7FFFD4 },
+ { "aquamarine1", 0x7FFFD4 },
+ { "aquamarine2", 0x76EEC6 },
+ { "aquamarine3", 0x66CDAA },
+ { "aquamarine4", 0x458B74 },
+ { "azure", 0xF0FFFF },
+ { "azure1", 0xF0FFFF },
+ { "azure2", 0xE0EEEE },
+ { "azure3", 0xC1CDCD },
+ { "azure4", 0x838B8B },
+ { "beige", 0xF5F5DC },
+ { "bisque", 0xFFE4C4 },
+ { "bisque1", 0xFFE4C4 },
+ { "bisque2", 0xEED5B7 },
+ { "bisque3", 0xCDB79E },
+ { "bisque4", 0x8B7D6B },
+ { "black", 0x000000 },
+ { "blanchedalmond", 0xFFEBCD },
+ { "blue", 0x0000FF },
+ { "blue1", 0x0000FF },
+ { "blue2", 0x0000EE },
+ { "blue3", 0x0000CD },
+ { "blue4", 0x00008B },
+ { "blueviolet", 0x8A2BE2 },
+ { "brown", 0xA52A2A },
+ { "brown1", 0xFF4040 },
+ { "brown2", 0xEE3B3B },
+ { "brown3", 0xCD3333 },
+ { "brown4", 0x8B2323 },
+ { "burlywood", 0xDEB887 },
+ { "burlywood1", 0xFFD39B },
+ { "burlywood2", 0xEEC591 },
+ { "burlywood3", 0xCDAA7D },
+ { "burlywood4", 0x8B7355 },
+ { "cadetblue", 0x5F9EA0 },
+ { "cadetblue", 0x5F9EA0 },
+ { "cadetblue1", 0x98F5FF },
+ { "cadetblue2", 0x8EE5EE },
+ { "cadetblue3", 0x7AC5CD },
+ { "cadetblue4", 0x53868B },
+ { "chartreuse", 0x7FFF00 },
+ { "chartreuse1", 0x7FFF00 },
+ { "chartreuse2", 0x76EE00 },
+ { "chartreuse3", 0x66CD00 },
+ { "chartreuse4", 0x458B00 },
+ { "chocolate", 0xD2691E },
+ { "chocolate1", 0xFF7F24 },
+ { "chocolate2", 0xEE7621 },
+ { "chocolate3", 0xCD661D },
+ { "chocolate4", 0x8B4513 },
+ { "coral", 0xFF7F50 },
+ { "coral1", 0xFF7256 },
+ { "coral2", 0xEE6A50 },
+ { "coral3", 0xCD5B45 },
+ { "coral4", 0x8B3E2F },
+ { "cornflowerblue", 0x6495ED },
+ { "cornsilk", 0xFFF8DC },
+ { "cornsilk1", 0xFFF8DC },
+ { "cornsilk2", 0xEEE8CD },
+ { "cornsilk3", 0xCDC8B1 },
+ { "cornsilk4", 0x8B8878 },
+ { "crimson", 0xDC143C },
+ { "cyan", 0x00FFFF },
+ { "cyan1", 0x00FFFF },
+ { "cyan2", 0x00EEEE },
+ { "cyan3", 0x00CDCD },
+ { "cyan4", 0x008B8B },
+ { "darkblue", 0x00008B },
+ { "darkcyan", 0x008B8B },
+ { "darkgoldenrod", 0xB8860B },
+ { "darkgoldenrod1", 0xFFB90F },
+ { "darkgoldenrod2", 0xEEAD0E },
+ { "darkgoldenrod3", 0xCD950C },
+ { "darkgoldenrod4", 0x8B6508 },
+ { "darkgray", 0xA9A9A9 },
+ { "darkgreen", 0x006400 },
+ { "darkgrey", 0xA9A9A9 },
+ { "darkkhaki", 0xBDB76B },
+ { "darkmagenta", 0x8B008B },
+ { "darkolivegreen", 0x556B2F },
+ { "darkolivegreen1", 0xCAFF70 },
+ { "darkolivegreen2", 0xBCEE68 },
+ { "darkolivegreen3", 0xA2CD5A },
+ { "darkolivegreen4", 0x6E8B3D },
+ { "darkorange", 0xFF8C00 },
+ { "darkorange1", 0xFF7F00 },
+ { "darkorange2", 0xEE7600 },
+ { "darkorange3", 0xCD6600 },
+ { "darkorange4", 0x8B4500 },
+ { "darkorchid", 0x9932CC },
+ { "darkorchid1", 0xBF3EFF },
+ { "darkorchid2", 0xB23AEE },
+ { "darkorchid3", 0x9A32CD },
+ { "darkorchid4", 0x68228B },
+ { "darkred", 0x8B0000 },
+ { "darksalmon", 0xE9967A },
+ { "darkseagreen", 0x8FBC8F },
+ { "darkseagreen1", 0xC1FFC1 },
+ { "darkseagreen2", 0xB4EEB4 },
+ { "darkseagreen3", 0x9BCD9B },
+ { "darkseagreen4", 0x698B69 },
+ { "darkslateblue", 0x483D8B },
+ { "darkslategray", 0x2F4F4F },
+ { "darkslategray1", 0x97FFFF },
+ { "darkslategray2", 0x8DEEEE },
+ { "darkslategray3", 0x79CDCD },
+ { "darkslategray4", 0x528B8B },
+ { "darkslategrey", 0x2F4F4F },
+ { "darkturquoise", 0x00CED1 },
+ { "darkviolet", 0x9400D3 },
+ { "darkviolet", 0x9400D3 },
+ { "deeppink", 0xFF1493 },
+ { "deeppink1", 0xFF1493 },
+ { "deeppink2", 0xEE1289 },
+ { "deeppink3", 0xCD1076 },
+ { "deeppink4", 0x8B0A50 },
+ { "deepskyblue", 0x00BFFF },
+ { "deepskyblue1", 0x00BFFF },
+ { "deepskyblue2", 0x00B2EE },
+ { "deepskyblue3", 0x009ACD },
+ { "deepskyblue4", 0x00688B },
+ { "dimgray", 0x696969 },
+ { "dimgrey", 0x696969 },
+ { "dodgerblue", 0x1E90FF },
+ { "dodgerblue1", 0x1E90FF },
+ { "dodgerblue2", 0x1C86EE },
+ { "dodgerblue3", 0x1874CD },
+ { "dodgerblue4", 0x104E8B },
+ { "firebrick", 0xB22222 },
+ { "firebrick1", 0xFF3030 },
+ { "firebrick2", 0xEE2C2C },
+ { "firebrick3", 0xCD2626 },
+ { "firebrick4", 0x8B1A1A },
+ { "floralwhite", 0xFFFAF0 },
+ { "forestgreen", 0x228B22 },
+ { "fractal", 0x808080 },
+ { "fuchsia", 0xFF00FF },
+ { "gainsboro", 0xDCDCDC },
+ { "ghostwhite", 0xF8F8FF },
+ { "gold", 0xFFD700 },
+ { "gold1", 0xFFD700 },
+ { "gold2", 0xEEC900 },
+ { "gold3", 0xCDAD00 },
+ { "gold4", 0x8B7500 },
+ { "goldenrod", 0xDAA520 },
+ { "goldenrod1", 0xFFC125 },
+ { "goldenrod2", 0xEEB422 },
+ { "goldenrod3", 0xCD9B1D },
+ { "goldenrod4", 0x8B6914 },
+ { "gray", 0x7E7E7E },
+ { "gray", 0xBEBEBE },
+ { "gray0", 0x000000 },
+ { "gray1", 0x030303 },
+ { "gray10", 0x1A1A1A },
+ { "gray100", 0xFFFFFF },
+ { "gray11", 0x1C1C1C },
+ { "gray12", 0x1F1F1F },
+ { "gray13", 0x212121 },
+ { "gray14", 0x242424 },
+ { "gray15", 0x262626 },
+ { "gray16", 0x292929 },
+ { "gray17", 0x2B2B2B },
+ { "gray18", 0x2E2E2E },
+ { "gray19", 0x303030 },
+ { "gray2", 0x050505 },
+ { "gray20", 0x333333 },
+ { "gray21", 0x363636 },
+ { "gray22", 0x383838 },
+ { "gray23", 0x3B3B3B },
+ { "gray24", 0x3D3D3D },
+ { "gray25", 0x404040 },
+ { "gray26", 0x424242 },
+ { "gray27", 0x454545 },
+ { "gray28", 0x474747 },
+ { "gray29", 0x4A4A4A },
+ { "gray3", 0x080808 },
+ { "gray30", 0x4D4D4D },
+ { "gray31", 0x4F4F4F },
+ { "gray32", 0x525252 },
+ { "gray33", 0x545454 },
+ { "gray34", 0x575757 },
+ { "gray35", 0x595959 },
+ { "gray36", 0x5C5C5C },
+ { "gray37", 0x5E5E5E },
+ { "gray38", 0x616161 },
+ { "gray39", 0x636363 },
+ { "gray4", 0x0A0A0A },
+ { "gray40", 0x666666 },
+ { "gray41", 0x696969 },
+ { "gray42", 0x6B6B6B },
+ { "gray43", 0x6E6E6E },
+ { "gray44", 0x707070 },
+ { "gray45", 0x737373 },
+ { "gray46", 0x757575 },
+ { "gray47", 0x787878 },
+ { "gray48", 0x7A7A7A },
+ { "gray49", 0x7D7D7D },
+ { "gray5", 0x0D0D0D },
+ { "gray50", 0x7F7F7F },
+ { "gray51", 0x828282 },
+ { "gray52", 0x858585 },
+ { "gray53", 0x878787 },
+ { "gray54", 0x8A8A8A },
+ { "gray55", 0x8C8C8C },
+ { "gray56", 0x8F8F8F },
+ { "gray57", 0x919191 },
+ { "gray58", 0x949494 },
+ { "gray59", 0x969696 },
+ { "gray6", 0x0F0F0F },
+ { "gray60", 0x999999 },
+ { "gray61", 0x9C9C9C },
+ { "gray62", 0x9E9E9E },
+ { "gray63", 0xA1A1A1 },
+ { "gray64", 0xA3A3A3 },
+ { "gray65", 0xA6A6A6 },
+ { "gray66", 0xA8A8A8 },
+ { "gray67", 0xABABAB },
+ { "gray68", 0xADADAD },
+ { "gray69", 0xB0B0B0 },
+ { "gray7", 0x121212 },
+ { "gray70", 0xB3B3B3 },
+ { "gray71", 0xB5B5B5 },
+ { "gray72", 0xB8B8B8 },
+ { "gray73", 0xBABABA },
+ { "gray74", 0xBDBDBD },
+ { "gray75", 0xBFBFBF },
+ { "gray76", 0xC2C2C2 },
+ { "gray77", 0xC4C4C4 },
+ { "gray78", 0xC7C7C7 },
+ { "gray79", 0xC9C9C9 },
+ { "gray8", 0x141414 },
+ { "gray80", 0xCCCCCC },
+ { "gray81", 0xCFCFCF },
+ { "gray82", 0xD1D1D1 },
+ { "gray83", 0xD4D4D4 },
+ { "gray84", 0xD6D6D6 },
+ { "gray85", 0xD9D9D9 },
+ { "gray86", 0xDBDBDB },
+ { "gray87", 0xDEDEDE },
+ { "gray88", 0xE0E0E0 },
+ { "gray89", 0xE3E3E3 },
+ { "gray9", 0x171717 },
+ { "gray90", 0xE5E5E5 },
+ { "gray91", 0xE8E8E8 },
+ { "gray92", 0xEBEBEB },
+ { "gray93", 0xEDEDED },
+ { "gray94", 0xF0F0F0 },
+ { "gray95", 0xF2F2F2 },
+ { "gray96", 0xF5F5F5 },
+ { "gray97", 0xF7F7F7 },
+ { "gray98", 0xFAFAFA },
+ { "gray99", 0xFCFCFC },
+ { "green", 0x008000 },
+ { "green", 0x00FF00 },
+ { "green1", 0x00FF00 },
+ { "green2", 0x00EE00 },
+ { "green3", 0x00CD00 },
+ { "green4", 0x008B00 },
+ { "greenyellow", 0xADFF2F },
+ { "grey", 0xBEBEBE },
+ { "grey0", 0x000000 },
+ { "grey1", 0x030303 },
+ { "grey10", 0x1A1A1A },
+ { "grey100", 0xFFFFFF },
+ { "grey11", 0x1C1C1C },
+ { "grey12", 0x1F1F1F },
+ { "grey13", 0x212121 },
+ { "grey14", 0x242424 },
+ { "grey15", 0x262626 },
+ { "grey16", 0x292929 },
+ { "grey17", 0x2B2B2B },
+ { "grey18", 0x2E2E2E },
+ { "grey19", 0x303030 },
+ { "grey2", 0x050505 },
+ { "grey20", 0x333333 },
+ { "grey21", 0x363636 },
+ { "grey22", 0x383838 },
+ { "grey23", 0x3B3B3B },
+ { "grey24", 0x3D3D3D },
+ { "grey25", 0x404040 },
+ { "grey26", 0x424242 },
+ { "grey27", 0x454545 },
+ { "grey28", 0x474747 },
+ { "grey29", 0x4A4A4A },
+ { "grey3", 0x080808 },
+ { "grey30", 0x4D4D4D },
+ { "grey31", 0x4F4F4F },
+ { "grey32", 0x525252 },
+ { "grey33", 0x545454 },
+ { "grey34", 0x575757 },
+ { "grey35", 0x595959 },
+ { "grey36", 0x5C5C5C },
+ { "grey37", 0x5E5E5E },
+ { "grey38", 0x616161 },
+ { "grey39", 0x636363 },
+ { "grey4", 0x0A0A0A },
+ { "grey40", 0x666666 },
+ { "grey41", 0x696969 },
+ { "grey42", 0x6B6B6B },
+ { "grey43", 0x6E6E6E },
+ { "grey44", 0x707070 },
+ { "grey45", 0x737373 },
+ { "grey46", 0x757575 },
+ { "grey47", 0x787878 },
+ { "grey48", 0x7A7A7A },
+ { "grey49", 0x7D7D7D },
+ { "grey5", 0x0D0D0D },
+ { "grey50", 0x7F7F7F },
+ { "grey51", 0x828282 },
+ { "grey52", 0x858585 },
+ { "grey53", 0x878787 },
+ { "grey54", 0x8A8A8A },
+ { "grey55", 0x8C8C8C },
+ { "grey56", 0x8F8F8F },
+ { "grey57", 0x919191 },
+ { "grey58", 0x949494 },
+ { "grey59", 0x969696 },
+ { "grey6", 0x0F0F0F },
+ { "grey60", 0x999999 },
+ { "grey61", 0x9C9C9C },
+ { "grey62", 0x9E9E9E },
+ { "grey63", 0xA1A1A1 },
+ { "grey64", 0xA3A3A3 },
+ { "grey65", 0xA6A6A6 },
+ { "grey66", 0xA8A8A8 },
+ { "grey67", 0xABABAB },
+ { "grey68", 0xADADAD },
+ { "grey69", 0xB0B0B0 },
+ { "grey7", 0x121212 },
+ { "grey70", 0xB3B3B3 },
+ { "grey71", 0xB5B5B5 },
+ { "grey72", 0xB8B8B8 },
+ { "grey73", 0xBABABA },
+ { "grey74", 0xBDBDBD },
+ { "grey75", 0xBFBFBF },
+ { "grey76", 0xC2C2C2 },
+ { "grey77", 0xC4C4C4 },
+ { "grey78", 0xC7C7C7 },
+ { "grey79", 0xC9C9C9 },
+ { "grey8", 0x141414 },
+ { "grey80", 0xCCCCCC },
+ { "grey81", 0xCFCFCF },
+ { "grey82", 0xD1D1D1 },
+ { "grey83", 0xD4D4D4 },
+ { "grey84", 0xD6D6D6 },
+ { "grey85", 0xD9D9D9 },
+ { "grey86", 0xDBDBDB },
+ { "grey87", 0xDEDEDE },
+ { "grey88", 0xE0E0E0 },
+ { "grey89", 0xE3E3E3 },
+ { "grey9", 0x171717 },
+ { "grey90", 0xE5E5E5 },
+ { "grey91", 0xE8E8E8 },
+ { "grey92", 0xEBEBEB },
+ { "grey93", 0xEDEDED },
+ { "grey94", 0xF0F0F0 },
+ { "grey95", 0xF2F2F2 },
+ { "grey96", 0xF5F5F5 },
+ { "grey97", 0xF7F7F7 },
+ { "grey98", 0xFAFAFA },
+ { "grey99", 0xFCFCFC },
+ { "honeydew", 0xF0FFF0 },
+ { "honeydew1", 0xF0FFF0 },
+ { "honeydew2", 0xE0EEE0 },
+ { "honeydew3", 0xC1CDC1 },
+ { "honeydew4", 0x838B83 },
+ { "hotpink", 0xFF69B4 },
+ { "hotpink1", 0xFF6EB4 },
+ { "hotpink2", 0xEE6AA7 },
+ { "hotpink3", 0xCD6090 },
+ { "hotpink4", 0x8B3A62 },
+ { "indianred", 0xCD5C5C },
+ { "indianred1", 0xFF6A6A },
+ { "indianred2", 0xEE6363 },
+ { "indianred3", 0xCD5555 },
+ { "indianred4", 0x8B3A3A },
+ { "indigo", 0x4B0082 },
+ { "ivory", 0xFFFFF0 },
+ { "ivory1", 0xFFFFF0 },
+ { "ivory2", 0xEEEEE0 },
+ { "ivory3", 0xCDCDC1 },
+ { "ivory4", 0x8B8B83 },
+ { "khaki", 0xF0E68C },
+ { "khaki1", 0xFFF68F },
+ { "khaki2", 0xEEE685 },
+ { "khaki3", 0xCDC673 },
+ { "khaki4", 0x8B864E },
+ { "lavender", 0xE6E6FA },
+ { "lavenderblush", 0xFFF0F5 },
+ { "lavenderblush1", 0xFFF0F5 },
+ { "lavenderblush2", 0xEEE0E5 },
+ { "lavenderblush3", 0xCDC1C5 },
+ { "lavenderblush4", 0x8B8386 },
+ { "lawngreen", 0x7CFC00 },
+ { "lemonchiffon", 0xFFFACD },
+ { "lemonchiffon1", 0xFFFACD },
+ { "lemonchiffon2", 0xEEE9BF },
+ { "lemonchiffon3", 0xCDC9A5 },
+ { "lemonchiffon4", 0x8B8970 },
+ { "lightblue", 0xADD8E6 },
+ { "lightblue1", 0xBFEFFF },
+ { "lightblue2", 0xB2DFEE },
+ { "lightblue3", 0x9AC0CD },
+ { "lightblue4", 0x68838B },
+ { "lightcoral", 0xF08080 },
+ { "lightcyan", 0xE0FFFF },
+ { "lightcyan1", 0xE0FFFF },
+ { "lightcyan2", 0xD1EEEE },
+ { "lightcyan3", 0xB4CDCD },
+ { "lightcyan4", 0x7A8B8B },
+ { "lightgoldenrod", 0xEEDD82 },
+ { "lightgoldenrod1", 0xFFEC8B },
+ { "lightgoldenrod2", 0xEEDC82 },
+ { "lightgoldenrod3", 0xCDBE70 },
+ { "lightgoldenrod4", 0x8B814C },
+ { "lightgoldenrodyellow", 0xFAFAD2 },
+ { "lightgray", 0xD3D3D3 },
+ { "lightgreen", 0x90EE90 },
+ { "lightgrey", 0xD3D3D3 },
+ { "lightpink", 0xFFB6C1 },
+ { "lightpink1", 0xFFAEB9 },
+ { "lightpink2", 0xEEA2AD },
+ { "lightpink3", 0xCD8C95 },
+ { "lightpink4", 0x8B5F65 },
+ { "lightsalmon", 0xFFA07A },
+ { "lightsalmon1", 0xFFA07A },
+ { "lightsalmon2", 0xEE9572 },
+ { "lightsalmon3", 0xCD8162 },
+ { "lightsalmon4", 0x8B5742 },
+ { "lightseagreen", 0x20B2AA },
+ { "lightskyblue", 0x87CEFA },
+ { "lightskyblue1", 0xB0E2FF },
+ { "lightskyblue2", 0xA4D3EE },
+ { "lightskyblue3", 0x8DB6CD },
+ { "lightskyblue4", 0x607B8B },
+ { "lightslateblue", 0x8470FF },
+ { "lightslategray", 0x778899 },
+ { "lightslategrey", 0x778899 },
+ { "lightsteelblue", 0xB0C4DE },
+ { "lightsteelblue1", 0xCAE1FF },
+ { "lightsteelblue2", 0xBCD2EE },
+ { "lightsteelblue3", 0xA2B5CD },
+ { "lightsteelblue4", 0x6E7B8B },
+ { "lightyellow", 0xFFFFE0 },
+ { "lightyellow1", 0xFFFFE0 },
+ { "lightyellow2", 0xEEEED1 },
+ { "lightyellow3", 0xCDCDB4 },
+ { "lightyellow4", 0x8B8B7A },
+ { "lime", 0x00FF00 },
+ { "limegreen", 0x32CD32 },
+ { "linen", 0xFAF0E6 },
+ { "magenta", 0xFF00FF },
+ { "magenta1", 0xFF00FF },
+ { "magenta2", 0xEE00EE },
+ { "magenta3", 0xCD00CD },
+ { "magenta4", 0x8B008B },
+ { "maroon", 0x800000 },
+ { "maroon", 0xB03060 },
+ { "maroon1", 0xFF34B3 },
+ { "maroon2", 0xEE30A7 },
+ { "maroon3", 0xCD2990 },
+ { "maroon4", 0x8B1C62 },
+ { "mediumaquamarine", 0x66CDAA },
+ { "mediumblue", 0x0000CD },
+ { "mediumforestgreen", 0x32814B },
+ { "mediumgoldenrod", 0xD1C166 },
+ { "mediumorchid", 0xBA55D3 },
+ { "mediumorchid1", 0xE066FF },
+ { "mediumorchid2", 0xD15FEE },
+ { "mediumorchid3", 0xB452CD },
+ { "mediumorchid4", 0x7A378B },
+ { "mediumpurple", 0x9370DB },
+ { "mediumpurple1", 0xAB82FF },
+ { "mediumpurple2", 0x9F79EE },
+ { "mediumpurple3", 0x8968CD },
+ { "mediumpurple4", 0x5D478B },
+ { "mediumseagreen", 0x3CB371 },
+ { "mediumslateblue", 0x7B68EE },
+ { "mediumspringgreen", 0x00FA9A },
+ { "mediumturquoise", 0x48D1CC },
+ { "mediumvioletred", 0xC71585 },
+ { "midnightblue", 0x191970 },
+ { "mintcream", 0xF5FFFA },
+ { "mistyrose", 0xFFE4E1 },
+ { "mistyrose1", 0xFFE4E1 },
+ { "mistyrose2", 0xEED5D2 },
+ { "mistyrose3", 0xCDB7B5 },
+ { "mistyrose4", 0x8B7D7B },
+ { "moccasin", 0xFFE4B5 },
+ { "navajowhite", 0xFFDEAD },
+ { "navajowhite1", 0xFFDEAD },
+ { "navajowhite2", 0xEECFA1 },
+ { "navajowhite3", 0xCDB38B },
+ { "navajowhite4", 0x8B795E },
+ { "navy", 0x000080 },
+ { "navyblue", 0x000080 },
+ { "none", 0x0000FF },
+ { "oldlace", 0xFDF5E6 },
+ { "olive", 0x808000 },
+ { "olivedrab", 0x6B8E23 },
+ { "olivedrab1", 0xC0FF3E },
+ { "olivedrab2", 0xB3EE3A },
+ { "olivedrab3", 0x9ACD32 },
+ { "olivedrab4", 0x698B22 },
+ { "opaque", 0x000000 },
+ { "orange", 0xFFA500 },
+ { "orange1", 0xFFA500 },
+ { "orange2", 0xEE9A00 },
+ { "orange3", 0xCD8500 },
+ { "orange4", 0x8B5A00 },
+ { "orangered", 0xFF4500 },
+ { "orangered1", 0xFF4500 },
+ { "orangered2", 0xEE4000 },
+ { "orangered3", 0xCD3700 },
+ { "orangered4", 0x8B2500 },
+ { "orchid", 0xDA70D6 },
+ { "orchid1", 0xFF83FA },
+ { "orchid2", 0xEE7AE9 },
+ { "orchid3", 0xCD69C9 },
+ { "orchid4", 0x8B4789 },
+ { "palegoldenrod", 0xEEE8AA },
+ { "palegreen", 0x98FB98 },
+ { "palegreen1", 0x9AFF9A },
+ { "palegreen2", 0x90EE90 },
+ { "palegreen3", 0x7CCD7C },
+ { "palegreen4", 0x548B54 },
+ { "paleturquoise", 0xAFEEEE },
+ { "paleturquoise1", 0xBBFFFF },
+ { "paleturquoise2", 0xAEEEEE },
+ { "paleturquoise3", 0x96CDCD },
+ { "paleturquoise4", 0x668B8B },
+ { "palevioletred", 0xDB7093 },
+ { "palevioletred1", 0xFF82AB },
+ { "palevioletred2", 0xEE799F },
+ { "palevioletred3", 0xCD6889 },
+ { "palevioletred4", 0x8B475D },
+ { "papayawhip", 0xFFEFD5 },
+ { "peachpuff", 0xFFDAB9 },
+ { "peachpuff1", 0xFFDAB9 },
+ { "peachpuff2", 0xEECBAD },
+ { "peachpuff3", 0xCDAF95 },
+ { "peachpuff4", 0x8B7765 },
+ { "peru", 0xCD853F },
+ { "pink", 0xFFC0CB },
+ { "pink1", 0xFFB5C5 },
+ { "pink2", 0xEEA9B8 },
+ { "pink3", 0xCD919E },
+ { "pink4", 0x8B636C },
+ { "plum", 0xDDA0DD },
+ { "plum1", 0xFFBBFF },
+ { "plum2", 0xEEAEEE },
+ { "plum3", 0xCD96CD },
+ { "plum4", 0x8B668B },
+ { "powderblue", 0xB0E0E6 },
+ { "purple", 0x800080 },
+ { "purple", 0xA020F0 },
+ { "purple1", 0x9B30FF },
+ { "purple2", 0x912CEE },
+ { "purple3", 0x7D26CD },
+ { "purple4", 0x551A8B },
+ { "red", 0xFF0000 },
+ { "red1", 0xFF0000 },
+ { "red2", 0xEE0000 },
+ { "red3", 0xCD0000 },
+ { "red4", 0x8B0000 },
+ { "rosybrown", 0xBC8F8F },
+ { "rosybrown1", 0xFFC1C1 },
+ { "rosybrown2", 0xEEB4B4 },
+ { "rosybrown3", 0xCD9B9B },
+ { "rosybrown4", 0x8B6969 },
+ { "royalblue", 0x4169E1 },
+ { "royalblue1", 0x4876FF },
+ { "royalblue2", 0x436EEE },
+ { "royalblue3", 0x3A5FCD },
+ { "royalblue4", 0x27408B },
+ { "saddlebrown", 0x8B4513 },
+ { "salmon", 0xFA8072 },
+ { "salmon1", 0xFF8C69 },
+ { "salmon2", 0xEE8262 },
+ { "salmon3", 0xCD7054 },
+ { "salmon4", 0x8B4C39 },
+ { "sandybrown", 0xF4A460 },
+ { "seagreen", 0x2E8B57 },
+ { "seagreen1", 0x54FF9F },
+ { "seagreen2", 0x4EEE94 },
+ { "seagreen3", 0x43CD80 },
+ { "seagreen4", 0x2E8B57 },
+ { "seashell", 0xFFF5EE },
+ { "seashell1", 0xFFF5EE },
+ { "seashell2", 0xEEE5DE },
+ { "seashell3", 0xCDC5BF },
+ { "seashell4", 0x8B8682 },
+ { "sienna", 0xA0522D },
+ { "sienna1", 0xFF8247 },
+ { "sienna2", 0xEE7942 },
+ { "sienna3", 0xCD6839 },
+ { "sienna4", 0x8B4726 },
+ { "silver", 0xC0C0C0 },
+ { "skyblue", 0x87CEEB },
+ { "skyblue1", 0x87CEFF },
+ { "skyblue2", 0x7EC0EE },
+ { "skyblue3", 0x6CA6CD },
+ { "skyblue4", 0x4A708B },
+ { "slateblue", 0x6A5ACD },
+ { "slateblue1", 0x836FFF },
+ { "slateblue2", 0x7A67EE },
+ { "slateblue3", 0x6959CD },
+ { "slateblue4", 0x473C8B },
+ { "slategray", 0x708090 },
+ { "slategray1", 0xC6E2FF },
+ { "slategray2", 0xB9D3EE },
+ { "slategray3", 0x9FB6CD },
+ { "slategray4", 0x6C7B8B },
+ { "slategrey", 0x708090 },
+ { "snow", 0xFFFAFA },
+ { "snow1", 0xFFFAFA },
+ { "snow2", 0xEEE9E9 },
+ { "snow3", 0xCDC9C9 },
+ { "snow4", 0x8B8989 },
+ { "springgreen", 0x00FF7F },
+ { "springgreen1", 0x00FF7F },
+ { "springgreen2", 0x00EE76 },
+ { "springgreen3", 0x00CD66 },
+ { "springgreen4", 0x008B45 },
+ { "steelblue", 0x4682B4 },
+ { "steelblue1", 0x63B8FF },
+ { "steelblue2", 0x5CACEE },
+ { "steelblue3", 0x4F94CD },
+ { "steelblue4", 0x36648B },
+ { "tan", 0xD2B48C },
+ { "tan1", 0xFFA54F },
+ { "tan2", 0xEE9A49 },
+ { "tan3", 0xCD853F },
+ { "tan4", 0x8B5A2B },
+ { "teal", 0x008080 },
+ { "thistle", 0xD8BFD8 },
+ { "thistle1", 0xFFE1FF },
+ { "thistle2", 0xEED2EE },
+ { "thistle3", 0xCDB5CD },
+ { "thistle4", 0x8B7B8B },
+ { "tomato", 0xFF6347 },
+ { "tomato1", 0xFF6347 },
+ { "tomato2", 0xEE5C42 },
+ { "tomato3", 0xCD4F39 },
+ { "tomato4", 0x8B3626 },
+ { "transparent", 0x0000FF },
+ { "turquoise", 0x40E0D0 },
+ { "turquoise1", 0x00F5FF },
+ { "turquoise2", 0x00E5EE },
+ { "turquoise3", 0x00C5CD },
+ { "turquoise4", 0x00868B },
+ { "violet", 0xEE82EE },
+ { "violetred", 0xD02090 },
+ { "violetred1", 0xFF3E96 },
+ { "violetred2", 0xEE3A8C },
+ { "violetred3", 0xCD3278 },
+ { "violetred4", 0x8B2252 },
+ { "wheat", 0xF5DEB3 },
+ { "wheat1", 0xFFE7BA },
+ { "wheat2", 0xEED8AE },
+ { "wheat3", 0xCDBA96 },
+ { "wheat4", 0x8B7E66 },
+ { "white", 0xFFFFFF },
+ { "whitesmoke", 0xF5F5F5 },
+ { "yellow", 0xFFFF00 },
+ { "yellow1", 0xFFFF00 },
+ { "yellow2", 0xEEEE00 },
+ { "yellow3", 0xCDCD00 },
+ { "yellow4", 0x8B8B00 },
+ { "yellowgreen", 0x9ACD32 },
+ { NULL, 0x000000 }
+};
+
+uint32_t hb_rgb_lookup_by_name(const char *color)
+{
+ int ii = 0;
+
+ while (colormap[ii].name != NULL)
+ {
+ if (!strcasecmp(color, colormap[ii].name))
+ return colormap[ii].rgb;
+ ii++;
+ }
+ return 0;
+}
+

HandBrake-0.10.0.tar.bz2/libhb/colormap.h Added

HandBrake-0.9.9.tar.bz2/libhb/common.c -> HandBrake-0.10.0.tar.bz2/libhb/common.c Changed

@@ -1,6 +1,6 @@
 /* common.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -12,677 +12,949 @@
 #include <ctype.h>
 #include <sys/time.h>
 
-#include "common.h"
-#include "lang.h"
 #include "hb.h"
+#include "x264.h"
+#include "lang.h"
+#include "common.h"
+#include "h264_common.h"
+#ifdef USE_QSV
+#include "qsv_common.h"
+#endif
+
+#ifdef USE_X265
+#include "x265.h"
+#endif
+
+#ifdef SYS_MINGW
+#include <windows.h>
+#endif
 
 /**********************************************************************
 * Global variables
 *********************************************************************/
-hb_rate_t hb_video_rates[] =
+static hb_error_handler_t *error_handler = NULL;
+
+/* Generic IDs for encoders, containers, etc. */
+enum
 {
- { "5", 5400000 },
- { "10", 2700000 },
- { "12", 2250000 },
- { "15", 1800000 },
- { "23.976", 1126125 },
- { "24", 1125000 },
- { "25", 1080000 },
- { "29.97", 900900 },
- { "30", 900000 },
- { "50", 540000 },
- { "59.94", 450450 },
- { "60", 450000 },
+ HB_GID_NONE = -1, // encoders must NEVER use it
+ HB_GID_VCODEC_H264,
+ HB_GID_VCODEC_H265,
+ HB_GID_VCODEC_MPEG2,
+ HB_GID_VCODEC_MPEG4,
+ HB_GID_VCODEC_THEORA,
+ HB_GID_VCODEC_VP8,
+ HB_GID_ACODEC_AAC,
+ HB_GID_ACODEC_AAC_HE,
+ HB_GID_ACODEC_AAC_PASS,
+ HB_GID_ACODEC_AC3,
+ HB_GID_ACODEC_AC3_PASS,
+ HB_GID_ACODEC_AUTO_PASS,
+ HB_GID_ACODEC_DTS_PASS,
+ HB_GID_ACODEC_DTSHD_PASS,
+ HB_GID_ACODEC_FLAC,
+ HB_GID_ACODEC_MP3,
+ HB_GID_ACODEC_MP3_PASS,
+ HB_GID_ACODEC_VORBIS,
+ HB_GID_MUX_MKV,
+ HB_GID_MUX_MP4,
 };
-int hb_video_rates_count = sizeof(hb_video_rates) / sizeof(hb_rate_t);
 
-hb_rate_t hb_audio_rates[] =
+typedef struct
 {
- { "8", 8000 },
- { "11.025", 11025 },
- { "12", 12000 },
- { "16", 16000 },
- { "22.05", 22050 },
- { "24", 24000 },
- { "32", 32000 },
- { "44.1", 44100 },
- { "48", 48000 },
+ hb_rate_t item;
+ hb_rate_t *next;
+ int enabled;
+} hb_rate_internal_t;
+hb_rate_t *hb_video_rates_first_item = NULL;
+hb_rate_t *hb_video_rates_last_item = NULL;
+hb_rate_internal_t hb_video_rates[] =
+{
+ // legacy framerates (disabled)
+ { { "23.976 (NTSC Film)", 1126125, }, NULL, 0, },
+ { { "25 (PAL Film/Video)", 1080000, }, NULL, 0, },
+ { { "29.97 (NTSC Video)", 900900, }, NULL, 0, },
+ // actual framerates
+ { { "5", 5400000, }, NULL, 1, },
+ { { "10", 2700000, }, NULL, 1, },
+ { { "12", 2250000, }, NULL, 1, },
+ { { "15", 1800000, }, NULL, 1, },
+ { { "23.976", 1126125, }, NULL, 1, },
+ { { "24", 1125000, }, NULL, 1, },
+ { { "25", 1080000, }, NULL, 1, },
+ { { "29.97", 900900, }, NULL, 1, },
+ { { "30", 900000, }, NULL, 1, },
+ { { "50", 540000, }, NULL, 1, },
+ { { "59.94", 450450, }, NULL, 1, },
+ { { "60", 450000, }, NULL, 1, },
+};
+int hb_video_rates_count = sizeof(hb_video_rates) / sizeof(hb_video_rates[0]);
+
+hb_rate_t *hb_audio_rates_first_item = NULL;
+hb_rate_t *hb_audio_rates_last_item = NULL;
+hb_rate_internal_t hb_audio_rates[] =
+{
+ { { "8", 8000, }, NULL, 1, },
+ { { "11.025", 11025, }, NULL, 1, },
+ { { "12", 12000, }, NULL, 1, },
+ { { "16", 16000, }, NULL, 1, },
+ { { "22.05", 22050, }, NULL, 1, },
+ { { "24", 24000, }, NULL, 1, },
+ { { "32", 32000, }, NULL, 1, },
+ { { "44.1", 44100, }, NULL, 1, },
+ { { "48", 48000, }, NULL, 1, },
 };
-int hb_audio_rates_count = sizeof(hb_audio_rates) / sizeof(hb_rate_t);
+int hb_audio_rates_count = sizeof(hb_audio_rates) / sizeof(hb_audio_rates[0]);
 
-hb_rate_t hb_audio_bitrates[] =
+hb_rate_t *hb_audio_bitrates_first_item = NULL;
+hb_rate_t *hb_audio_bitrates_last_item = NULL;
+hb_rate_internal_t hb_audio_bitrates[] =
 {
 // AC3-compatible bitrates
- { "32", 32 },
- { "40", 40 },
- { "48", 48 },
- { "56", 56 },
- { "64", 64 },
- { "80", 80 },
- { "96", 96 },
- { "112", 112 },
- { "128", 128 },
- { "160", 160 },
- { "192", 192 },
- { "224", 224 },
- { "256", 256 },
- { "320", 320 },
- { "384", 384 },
- { "448", 448 },
- { "512", 512 },
- { "576", 576 },
- { "640", 640 },
+ { { "32", 32, }, NULL, 1, },
+ { { "40", 40, }, NULL, 1, },
+ { { "48", 48, }, NULL, 1, },
+ { { "56", 56, }, NULL, 1, },
+ { { "64", 64, }, NULL, 1, },
+ { { "80", 80, }, NULL, 1, },
+ { { "96", 96, }, NULL, 1, },
+ { { "112", 112, }, NULL, 1, },
+ { { "128", 128, }, NULL, 1, },
+ { { "160", 160, }, NULL, 1, },
+ { { "192", 192, }, NULL, 1, },
+ { { "224", 224, }, NULL, 1, },
+ { { "256", 256, }, NULL, 1, },
+ { { "320", 320, }, NULL, 1, },
+ { { "384", 384, }, NULL, 1, },
+ { { "448", 448, }, NULL, 1, },
+ { { "512", 512, }, NULL, 1, },
+ { { "576", 576, }, NULL, 1, },
+ { { "640", 640, }, NULL, 1, },
 // additional bitrates
- { "768", 768 },
- { "960", 960 },
- { "1152", 1152 },
- { "1344", 1344 },
- { "1536", 1536 },
+ { { "768", 768, }, NULL, 1, },
+ { { "960", 960, }, NULL, 1, },
+ { { "1152", 1152, }, NULL, 1, },
+ { { "1344", 1344, }, NULL, 1, },
+ { { "1536", 1536, }, NULL, 1, },
 };
-int hb_audio_bitrates_count = sizeof(hb_audio_bitrates) / sizeof(hb_rate_t);
-
-static hb_error_handler_t *error_handler = NULL;
+int hb_audio_bitrates_count = sizeof(hb_audio_bitrates) / sizeof(hb_audio_bitrates[0]);
 
-hb_dither_t hb_audio_dithers[] =
+typedef struct
 {
- { "default", "auto", AV_RESAMPLE_DITHER_NONE - 1, },
- { "none", "none", AV_RESAMPLE_DITHER_NONE, },
- { "rectangular", "rectangular", AV_RESAMPLE_DITHER_RECTANGULAR, },
- { "triangular", "triangular", AV_RESAMPLE_DITHER_TRIANGULAR, },
- { "triangular with high pass", "triangular_hp", AV_RESAMPLE_DITHER_TRIANGULAR_HP, },
- { "triangular with noise shaping", "triangular_ns", AV_RESAMPLE_DITHER_TRIANGULAR_NS, },
+ hb_dither_t item;
+ hb_dither_t *next;
+ int enabled;
+} hb_dither_internal_t;
+hb_dither_t *hb_audio_dithers_first_item = NULL;
+hb_dither_t *hb_audio_dithers_last_item = NULL;
+hb_dither_internal_t hb_audio_dithers[] =
+{
+ { { "default", "auto", AV_RESAMPLE_DITHER_NONE - 1, }, NULL, 1, },
+ { { "none", "none", AV_RESAMPLE_DITHER_NONE, }, NULL, 1, },
+ { { "rectangular", "rectangular", AV_RESAMPLE_DITHER_RECTANGULAR, }, NULL, 1, },
+ { { "triangular", "triangular", AV_RESAMPLE_DITHER_TRIANGULAR, }, NULL, 1, },
+ { { "triangular with high pass", "triangular_hp", AV_RESAMPLE_DITHER_TRIANGULAR_HP, }, NULL, 1, },
+ { { "triangular with noise shaping", "triangular_ns", AV_RESAMPLE_DITHER_TRIANGULAR_NS, }, NULL, 1, },
 };
-int hb_audio_dithers_count = sizeof(hb_audio_dithers) / sizeof(hb_dither_t);
+int hb_audio_dithers_count = sizeof(hb_audio_dithers) / sizeof(hb_audio_dithers[0]);
 
-hb_mixdown_t hb_audio_mixdowns[] =
+typedef struct
 {
- { "None", "HB_AMIXDOWN_NONE", "none", HB_AMIXDOWN_NONE },
- { "Mono", "HB_AMIXDOWN_MONO", "mono", HB_AMIXDOWN_MONO },
- { "Mono (Left Only)", "HB_AMIXDOWN_LEFT", "left_only", HB_AMIXDOWN_LEFT },
- { "Mono (Right Only)", "HB_AMIXDOWN_RIGHT", "right_only", HB_AMIXDOWN_RIGHT },
- { "Stereo", "HB_AMIXDOWN_STEREO", "stereo", HB_AMIXDOWN_STEREO },
- { "Dolby Surround", "HB_AMIXDOWN_DOLBY", "dpl1", HB_AMIXDOWN_DOLBY },
- { "Dolby Pro Logic II", "HB_AMIXDOWN_DOLBYPLII", "dpl2", HB_AMIXDOWN_DOLBYPLII },
- { "5.1 Channels", "HB_AMIXDOWN_5POINT1", "5point1", HB_AMIXDOWN_5POINT1 },
- { "6.1 Channels", "HB_AMIXDOWN_6POINT1", "6point1", HB_AMIXDOWN_6POINT1 },
- { "7.1 Channels", "HB_AMIXDOWN_7POINT1", "7point1", HB_AMIXDOWN_7POINT1 },
- { "7.1 (5F/2R/LFE)", "HB_AMIXDOWN_5_2_LFE", "5_2_lfe", HB_AMIXDOWN_5_2_LFE },
+ hb_mixdown_t item;
+ hb_mixdown_t *next;
+ int enabled;
+} hb_mixdown_internal_t;
+hb_mixdown_t *hb_audio_mixdowns_first_item = NULL;
+hb_mixdown_t *hb_audio_mixdowns_last_item = NULL;
+hb_mixdown_internal_t hb_audio_mixdowns[] =
+{
+ // legacy mixdowns, back to HB 0.9.4 whenever possible (disabled)
+ { { "AC3 Passthru", "", HB_AMIXDOWN_NONE, }, NULL, 0, },
+ { { "DTS Passthru", "", HB_AMIXDOWN_NONE, }, NULL, 0, },
+ { { "DTS-HD Passthru", "", HB_AMIXDOWN_NONE, }, NULL, 0, },
+ { { "6-channel discrete", "6ch", HB_AMIXDOWN_5POINT1, }, NULL, 0, },
+ // actual mixdowns
+ { { "None", "none", HB_AMIXDOWN_NONE, }, NULL, 1, },
+ { { "Mono", "mono", HB_AMIXDOWN_MONO, }, NULL, 1, },
+ { { "Mono (Left Only)", "left_only", HB_AMIXDOWN_LEFT, }, NULL, 1, },
+ { { "Mono (Right Only)", "right_only", HB_AMIXDOWN_RIGHT, }, NULL, 1, },
+ { { "Stereo", "stereo", HB_AMIXDOWN_STEREO, }, NULL, 1, },
+ { { "Dolby Surround", "dpl1", HB_AMIXDOWN_DOLBY, }, NULL, 1, },
+ { { "Dolby Pro Logic II", "dpl2", HB_AMIXDOWN_DOLBYPLII, }, NULL, 1, },
+ { { "5.1 Channels", "5point1", HB_AMIXDOWN_5POINT1, }, NULL, 1, },
+ { { "6.1 Channels", "6point1", HB_AMIXDOWN_6POINT1, }, NULL, 1, },
+ { { "7.1 Channels", "7point1", HB_AMIXDOWN_7POINT1, }, NULL, 1, },
+ { { "7.1 (5F/2R/LFE)", "5_2_lfe", HB_AMIXDOWN_5_2_LFE, }, NULL, 1, },
 };
-int hb_audio_mixdowns_count = sizeof(hb_audio_mixdowns) / sizeof(hb_mixdown_t);
+int hb_audio_mixdowns_count = sizeof(hb_audio_mixdowns) / sizeof(hb_audio_mixdowns[0]);
 
-hb_encoder_t hb_video_encoders[] =
+typedef struct
 {
- { "H.264 (x264)", "x264", HB_VCODEC_X264, HB_MUX_MP4|HB_MUX_MKV },
- { "MPEG-4 (FFmpeg)", "ffmpeg4", HB_VCODEC_FFMPEG_MPEG4, HB_MUX_MP4|HB_MUX_MKV },
- { "MPEG-2 (FFmpeg)", "ffmpeg2", HB_VCODEC_FFMPEG_MPEG2, HB_MUX_MP4|HB_MUX_MKV },
- { "VP3 (Theora)", "theora", HB_VCODEC_THEORA, HB_MUX_MKV },
+ hb_encoder_t item;
+ hb_encoder_t *next;
+ int enabled;
+ int gid;
+} hb_encoder_internal_t;
+hb_encoder_t *hb_video_encoders_first_item = NULL;
+hb_encoder_t *hb_video_encoders_last_item = NULL;
+hb_encoder_internal_t hb_video_encoders[] =
+{
+ // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
+ { { "FFmpeg", "ffmpeg", NULL, HB_VCODEC_FFMPEG_MPEG4, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_VCODEC_MPEG4, },
+ { { "MPEG-4 (FFmpeg)", "ffmpeg4", NULL, HB_VCODEC_FFMPEG_MPEG4, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_VCODEC_MPEG4, },
+ { { "MPEG-2 (FFmpeg)", "ffmpeg2", NULL, HB_VCODEC_FFMPEG_MPEG2, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_VCODEC_MPEG2, },
+ { { "VP3 (Theora)", "libtheora", NULL, HB_VCODEC_THEORA, HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_VCODEC_THEORA, },
+ // actual encoders
+ { { "H.264 (x264)", "x264", "H.264 (libx264)", HB_VCODEC_X264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H264, },
+ { { "H.264 (Intel QSV)", "qsv_h264", "H.264 (Intel Media SDK)", HB_VCODEC_QSV_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H264, },
+ { { "H.265 (x265)", "x265", "H.265 (libx265)", HB_VCODEC_X265, HB_MUX_AV_MP4|HB_MUX_AV_MKV, }, NULL, 1, HB_GID_VCODEC_H265, },
+ { { "MPEG-4", "mpeg4", "MPEG-4 (libavcodec)", HB_VCODEC_FFMPEG_MPEG4, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_MPEG4, },
+ { { "MPEG-2", "mpeg2", "MPEG-2 (libavcodec)", HB_VCODEC_FFMPEG_MPEG2, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_MPEG2, },
+ { { "VP8", "VP8", "VP8 (libvpx)", HB_VCODEC_FFMPEG_VP8, HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_VP8, },
+ { { "Theora", "theora", "Theora (libtheora)", HB_VCODEC_THEORA, HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_THEORA, },
 };
-int hb_video_encoders_count = sizeof(hb_video_encoders) / sizeof(hb_encoder_t);
-
-// note: the first encoder in the list must be AAC
-hb_encoder_t hb_audio_encoders[] =
+int hb_video_encoders_count = sizeof(hb_video_encoders) / sizeof(hb_video_encoders[0]);
+static int hb_video_encoder_is_enabled(int encoder)
 {
-#ifdef __APPLE__
- { "AAC (CoreAudio)", "ca_aac", HB_ACODEC_CA_AAC, HB_MUX_MP4|HB_MUX_MKV },
- { "HE-AAC (CoreAudio)", "ca_haac", HB_ACODEC_CA_HAAC, HB_MUX_MP4|HB_MUX_MKV },
+#ifdef USE_QSV
+ if (encoder & HB_VCODEC_QSV_MASK)
+ {
+ return hb_qsv_video_encoder_is_enabled(encoder);
+ }
 #endif
- { "AAC (faac)", "faac", HB_ACODEC_FAAC, HB_MUX_MP4|HB_MUX_MKV },
-#ifdef USE_FDK_AAC
- { "AAC (FDK)", "fdk_aac", HB_ACODEC_FDK_AAC, HB_MUX_MP4|HB_MUX_MKV },
- { "HE-AAC (FDK)", "fdk_haac", HB_ACODEC_FDK_HAAC, HB_MUX_MP4|HB_MUX_MKV },
-#endif
- { "AAC (ffmpeg)", "ffaac", HB_ACODEC_FFAAC, HB_MUX_MP4|HB_MUX_MKV },
- { "AAC Passthru", "copy:aac", HB_ACODEC_AAC_PASS, HB_MUX_MP4|HB_MUX_MKV },
- { "AC3 (ffmpeg)", "ffac3", HB_ACODEC_AC3, HB_MUX_MP4|HB_MUX_MKV },
- { "AC3 Passthru", "copy:ac3", HB_ACODEC_AC3_PASS, HB_MUX_MP4|HB_MUX_MKV },
- { "DTS Passthru", "copy:dts", HB_ACODEC_DCA_PASS, HB_MUX_MP4|HB_MUX_MKV },
- { "DTS-HD Passthru", "copy:dtshd", HB_ACODEC_DCA_HD_PASS, HB_MUX_MP4|HB_MUX_MKV },
- { "MP3 (lame)", "lame", HB_ACODEC_LAME, HB_MUX_MP4|HB_MUX_MKV },
- { "MP3 Passthru", "copy:mp3", HB_ACODEC_MP3_PASS, HB_MUX_MP4|HB_MUX_MKV },
- { "Vorbis (vorbis)", "vorbis", HB_ACODEC_VORBIS, HB_MUX_MKV },
- { "FLAC (ffmpeg)", "ffflac", HB_ACODEC_FFFLAC, HB_MUX_MKV },
- { "FLAC (24-bit)", "ffflac24", HB_ACODEC_FFFLAC24, HB_MUX_MKV },
- { "Auto Passthru", "copy", HB_ACODEC_AUTO_PASS, HB_MUX_MP4|HB_MUX_MKV },
-};
-int hb_audio_encoders_count = sizeof(hb_audio_encoders) / sizeof(hb_encoder_t);
-
-/* Expose values for PInvoke */
-hb_rate_t* hb_get_video_rates() { return hb_video_rates; }
-int hb_get_video_rates_count() { return hb_video_rates_count; }
-hb_rate_t* hb_get_audio_rates() { return hb_audio_rates; }
-int hb_get_audio_rates_count() { return hb_audio_rates_count; }
-hb_rate_t* hb_get_audio_bitrates() { return hb_audio_bitrates; }
-int hb_get_audio_bitrates_count() { return hb_audio_bitrates_count; }
-hb_dither_t* hb_get_audio_dithers() { return hb_audio_dithers; }
-int hb_get_audio_dithers_count() { return hb_audio_dithers_count; }
-hb_mixdown_t* hb_get_audio_mixdowns() { return hb_audio_mixdowns; }
-int hb_get_audio_mixdowns_count() { return hb_audio_mixdowns_count; }
-hb_encoder_t* hb_get_video_encoders() { return hb_video_encoders; }
-int hb_get_video_encoders_count() { return hb_video_encoders_count; }
-hb_encoder_t* hb_get_audio_encoders() { return hb_audio_encoders; }
-int hb_get_audio_encoders_count() { return hb_audio_encoders_count; }
-
-int hb_audio_dither_get_default()
-{
- // "auto"
- return hb_audio_dithers[0].method;
-}
-
-int hb_audio_dither_get_default_method()
-{
- /*
- * input could be s16 (possibly already dithered) converted to flt, so
- * let's use a "low-risk" dither algorithm (standard triangular).
- */
- return AV_RESAMPLE_DITHER_TRIANGULAR;
-}
-
-int hb_audio_dither_is_supported(uint32_t codec)
-{
- // encoder's input sample format must be s16(p)
- switch (codec)
+ switch (encoder)
 {
- case HB_ACODEC_FFFLAC:
- case HB_ACODEC_FDK_AAC:
- case HB_ACODEC_FDK_HAAC:
+ // the following encoders are always enabled
+ case HB_VCODEC_X264:
+ case HB_VCODEC_THEORA:
+ case HB_VCODEC_FFMPEG_MPEG4:
+ case HB_VCODEC_FFMPEG_MPEG2:
+ case HB_VCODEC_FFMPEG_VP8:
+#ifdef USE_X265
+ case HB_VCODEC_X265:
+#endif
 return 1;
+
 default:
 return 0;
 }
 }
 
-const char* hb_audio_dither_get_description(int method)
+hb_encoder_t *hb_audio_encoders_first_item = NULL;
+hb_encoder_t *hb_audio_encoders_last_item = NULL;
+hb_encoder_internal_t hb_audio_encoders[] =
+{
+ // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
+ { { "", "dts", NULL, HB_ACODEC_DCA_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_DTS_PASS, },
+ { { "AAC (faac)", "faac", NULL, 0, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, },
+ { { "AAC (ffmpeg)", "ffaac", NULL, HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, },
+ { { "AC3 (ffmpeg)", "ffac3", NULL, HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3, },
+ { { "MP3 (lame)", "lame", NULL, HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3, },
+ { { "Vorbis (vorbis)", "libvorbis", NULL, HB_ACODEC_VORBIS, HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_VORBIS, },
+ { { "FLAC (ffmpeg)", "ffflac", NULL, HB_ACODEC_FFFLAC, HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_FLAC, },
+ { { "FLAC (24-bit)", "ffflac24", NULL, HB_ACODEC_FFFLAC24, HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_FLAC, },
+ // actual encoders
+ { { "AAC (CoreAudio)", "ca_aac", "AAC (Apple AudioToolbox)", HB_ACODEC_CA_AAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC, },
+ { { "HE-AAC (CoreAudio)", "ca_haac", "HE-AAC (Apple AudioToolbox)", HB_ACODEC_CA_HAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC_HE, },
+ { { "AAC (avcodec)", "av_aac", "AAC (libavcodec)", HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC, },
+ { { "AAC (FDK)", "fdk_aac", "AAC (libfdk_aac)", HB_ACODEC_FDK_AAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC, },
+ { { "HE-AAC (FDK)", "fdk_haac", "HE-AAC (libfdk_aac)", HB_ACODEC_FDK_HAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC_HE, },
+ { { "AAC Passthru", "copy:aac", "AAC Passthru", HB_ACODEC_AAC_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC_PASS, },
+ { { "AC3", "ac3", "AC3 (libavcodec)", HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AC3, },
+ { { "AC3 Passthru", "copy:ac3", "AC3 Passthru", HB_ACODEC_AC3_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AC3_PASS, },
+ { { "DTS Passthru", "copy:dts", "DTS Passthru", HB_ACODEC_DCA_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_DTS_PASS, },
+ { { "DTS-HD Passthru", "copy:dtshd", "DTS-HD Passthru", HB_ACODEC_DCA_HD_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_DTSHD_PASS, },
+ { { "MP3", "mp3", "MP3 (libmp3lame)", HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_MP3, },
+ { { "MP3 Passthru", "copy:mp3", "MP3 Passthru", HB_ACODEC_MP3_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_MP3_PASS, },
+ { { "Vorbis", "vorbis", "Vorbis (libvorbis)", HB_ACODEC_VORBIS, HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_VORBIS, },
+ { { "FLAC 16-bit", "flac16", "FLAC 16-bit (libavcodec)", HB_ACODEC_FFFLAC, HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_FLAC, },
+ { { "FLAC 24-bit", "flac24", "FLAC 24-bit (libavcodec)", HB_ACODEC_FFFLAC24, HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_FLAC, },
+ { { "Auto Passthru", "copy", "Auto Passthru", HB_ACODEC_AUTO_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AUTO_PASS, },
+};
+int hb_audio_encoders_count = sizeof(hb_audio_encoders) / sizeof(hb_audio_encoders[0]);
+static int hb_audio_encoder_is_enabled(int encoder)
 {
- int i;
- for (i = 0; i < hb_audio_dithers_count; i++)
+ if (encoder & HB_ACODEC_PASS_FLAG)
 {
- if (hb_audio_dithers[i].method == method)
- {
- return hb_audio_dithers[i].description;
- }
+ // Passthru encoders are always enabled
+ return 1;
 }
- return "";
-}
-
+ switch (encoder)
+ {
+#ifdef __APPLE__
+ case HB_ACODEC_CA_AAC:
+ case HB_ACODEC_CA_HAAC:
+ return 1;
+#endif
 
-int hb_mixdown_is_supported(int mixdown, uint32_t codec, uint64_t layout)
-{
- return (hb_mixdown_has_codec_support(mixdown, codec) &&
- hb_mixdown_has_remix_support(mixdown, layout));
-}
+#ifdef USE_LIBAV_AAC
+ case HB_ACODEC_FFAAC:
+ return avcodec_find_encoder_by_name("aac") != NULL;
+#endif
 
-int hb_mixdown_has_codec_support(int mixdown, uint32_t codec)
-{
- // Passthru, only "None" mixdown is supported
- if (codec & HB_ACODEC_PASS_FLAG)
- return (mixdown == HB_AMIXDOWN_NONE);
+ case HB_ACODEC_FDK_AAC:
+ case HB_ACODEC_FDK_HAAC:
+ return avcodec_find_encoder_by_name("libfdk_aac") != NULL;
 
- // Not passthru, "None" mixdown never supported
- if (mixdown == HB_AMIXDOWN_NONE)
- return 0;
+ case HB_ACODEC_AC3:
+ return avcodec_find_encoder(AV_CODEC_ID_AC3) != NULL;
 
- switch (codec)
- {
- case HB_ACODEC_VORBIS:
 case HB_ACODEC_FFFLAC:
 case HB_ACODEC_FFFLAC24:
- return (mixdown <= HB_AMIXDOWN_7POINT1);
+ return avcodec_find_encoder(AV_CODEC_ID_FLAC) != NULL;
 
+ // the following encoders are always enabled
 case HB_ACODEC_LAME:
- case HB_ACODEC_FFAAC:
- return (mixdown <= HB_AMIXDOWN_DOLBYPLII);
-
- case HB_ACODEC_FAAC:
- case HB_ACODEC_CA_AAC:
- case HB_ACODEC_CA_HAAC:
- return ((mixdown <= HB_AMIXDOWN_5POINT1) ||
- (mixdown == HB_AMIXDOWN_5_2_LFE));
+ case HB_ACODEC_VORBIS:
+ return 1;
 
 default:
- return (mixdown <= HB_AMIXDOWN_5POINT1);
+ return 0;
 }
 }
 
-int hb_mixdown_has_remix_support(int mixdown, uint64_t layout)
+typedef struct
 {
- switch (mixdown)
+ hb_container_t item;
+ hb_container_t *next;
+ int enabled;
+ int gid;
+} hb_container_internal_t;
+hb_container_t *hb_containers_first_item = NULL;
+hb_container_t *hb_containers_last_item = NULL;
+hb_container_internal_t hb_containers[] =
+{
+ // legacy muxers, back to HB 0.9.4 whenever possible (disabled)
+ { { "M4V file", "m4v", NULL, "m4v", 0, }, NULL, 0, HB_GID_MUX_MP4, },
+ { { "MP4 file", "mp4", NULL, "mp4", 0, }, NULL, 0, HB_GID_MUX_MP4, },
+ { { "MKV file", "mkv", NULL, "mkv", 0, }, NULL, 0, HB_GID_MUX_MKV, },
+ // actual muxers
+ { { "MPEG-4 (avformat)", "av_mp4", "MPEG-4 (libavformat)", "mp4", HB_MUX_AV_MP4, }, NULL, 1, HB_GID_MUX_MP4, },
+ { { "MPEG-4 (mp4v2)", "mp4v2", "MPEG-4 (libmp4v2)", "mp4", HB_MUX_MP4V2, }, NULL, 1, HB_GID_MUX_MP4, },
+ { { "Matroska (avformat)", "av_mkv", "Matroska (libavformat)", "mkv", HB_MUX_AV_MKV, }, NULL, 1, HB_GID_MUX_MKV, },
+ { { "Matroska (libmkv)", "libmkv", "Matroska (libmkv)", "mkv", HB_MUX_LIBMKV, }, NULL, 1, HB_GID_MUX_MKV, },
+};
+int hb_containers_count = sizeof(hb_containers) / sizeof(hb_containers[0]);
+static int hb_container_is_enabled(int format)
+{
+ switch (format)
 {
- // stereo + front left/right of center
- case HB_AMIXDOWN_5_2_LFE:
- return ((layout & AV_CH_FRONT_LEFT_OF_CENTER) &&
- (layout & AV_CH_FRONT_RIGHT_OF_CENTER) &&
- (layout & AV_CH_LAYOUT_STEREO) == AV_CH_LAYOUT_STEREO);
-
- // 7.0 or better
- case HB_AMIXDOWN_7POINT1:
- return ((layout & AV_CH_LAYOUT_7POINT0) == AV_CH_LAYOUT_7POINT0);
-
- // 6.0 or better
- case HB_AMIXDOWN_6POINT1:
- return ((layout & AV_CH_LAYOUT_7POINT0) == AV_CH_LAYOUT_7POINT0 ||
- (layout & AV_CH_LAYOUT_6POINT0) == AV_CH_LAYOUT_6POINT0 ||
- (layout & AV_CH_LAYOUT_HEXAGONAL) == AV_CH_LAYOUT_HEXAGONAL);
-
- // stereo + either of front center, side or back left/right, back center
- case HB_AMIXDOWN_5POINT1:
- return ((layout & AV_CH_LAYOUT_2_1) == AV_CH_LAYOUT_2_1 ||
- (layout & AV_CH_LAYOUT_2_2) == AV_CH_LAYOUT_2_2 ||
- (layout & AV_CH_LAYOUT_QUAD) == AV_CH_LAYOUT_QUAD ||
- (layout & AV_CH_LAYOUT_SURROUND) == AV_CH_LAYOUT_SURROUND);
-
- // stereo + either of side or back left/right, back center
- // also, allow Dolby Surrounbd output if the input is already Dolby
- case HB_AMIXDOWN_DOLBY:
- case HB_AMIXDOWN_DOLBYPLII:
- return ((layout & AV_CH_LAYOUT_2_1) == AV_CH_LAYOUT_2_1 ||
- (layout & AV_CH_LAYOUT_2_2) == AV_CH_LAYOUT_2_2 ||
- (layout & AV_CH_LAYOUT_QUAD) == AV_CH_LAYOUT_QUAD ||
- (layout == AV_CH_LAYOUT_STEREO_DOWNMIX &&
- mixdown == HB_AMIXDOWN_DOLBY));
-
- // more than 1 channel
- case HB_AMIXDOWN_STEREO:
- return (av_get_channel_layout_nb_channels(layout) > 1);
-
- // regular stereo (not Dolby)
- case HB_AMIXDOWN_LEFT:
- case HB_AMIXDOWN_RIGHT:
- return (layout == AV_CH_LAYOUT_STEREO);
-
- // mono remix always supported
- // HB_AMIXDOWN_NONE always supported (for Passthru)
- case HB_AMIXDOWN_MONO:
- case HB_AMIXDOWN_NONE:
+ case HB_MUX_AV_MP4:
+ case HB_MUX_AV_MKV:
 return 1;
 
- // unknown mixdown, should never happen
 default:
 return 0;
 }
 }
 
-int hb_mixdown_get_discrete_channel_count(int amixdown)
+void hb_common_global_init()
 {
- switch (amixdown)
- {
- case HB_AMIXDOWN_5_2_LFE:
- case HB_AMIXDOWN_7POINT1:
- return 8;
-
- case HB_AMIXDOWN_6POINT1:
- return 7;
-
- case HB_AMIXDOWN_5POINT1:
- return 6;
+ static int common_init_done = 0;
+ if (common_init_done)
+ return;
 
- case HB_AMIXDOWN_MONO:
- case HB_AMIXDOWN_LEFT:
- case HB_AMIXDOWN_RIGHT:
- return 1;
+ int i, j;
 
- case HB_AMIXDOWN_NONE:
- return 0;
-
- default:
- return 2;
+ // video framerates
+ for (i = 0; i < hb_video_rates_count; i++)
+ {
+ if (hb_video_rates[i].enabled)
+ {
+ if (hb_video_rates_first_item == NULL)
+ {
+ hb_video_rates_first_item = &hb_video_rates[i].item;
+ }
+ else
+ {
+ ((hb_rate_internal_t*)hb_video_rates_last_item)->next =
+ &hb_video_rates[i].item;
+ }
+ hb_video_rates_last_item = &hb_video_rates[i].item;
+ }
 }
-}
+ // fallbacks are static for now (no setup required)
 
-int hb_mixdown_get_low_freq_channel_count(int amixdown)
-{
- switch (amixdown)
+ // audio samplerates
+ for (i = 0; i < hb_audio_rates_count; i++)
 {
- case HB_AMIXDOWN_5POINT1:
- case HB_AMIXDOWN_6POINT1:
- case HB_AMIXDOWN_7POINT1:
- case HB_AMIXDOWN_5_2_LFE:
- return 1;
+ if (hb_audio_rates[i].enabled)
+ {
+ if (hb_audio_rates_first_item == NULL)
+ {
+ hb_audio_rates_first_item = &hb_audio_rates[i].item;
+ }
+ else
+ {
+ ((hb_rate_internal_t*)hb_audio_rates_last_item)->next =
+ &hb_audio_rates[i].item;
+ }
+ hb_audio_rates_last_item = &hb_audio_rates[i].item;
+ }
+ }
+ // fallbacks are static for now (no setup required)
 
- default:
- return 0;
+ // audio bitrates
+ for (i = 0; i < hb_audio_bitrates_count; i++)
+ {
+ if (hb_audio_bitrates[i].enabled)
+ {
+ if (hb_audio_bitrates_first_item == NULL)
+ {
+ hb_audio_bitrates_first_item = &hb_audio_bitrates[i].item;
+ }
+ else
+ {
+ ((hb_rate_internal_t*)hb_audio_bitrates_last_item)->next =
+ &hb_audio_bitrates[i].item;
+ }
+ hb_audio_bitrates_last_item = &hb_audio_bitrates[i].item;
+ }
 }
-}
+ // fallbacks are static for now (no setup required)
 
-int hb_mixdown_get_mixdown_from_short_name(const char *short_name)
-{
- int i;
- for (i = 0; i < hb_audio_mixdowns_count; i++)
+ // audio dithers
+ for (i = 0; i < hb_audio_dithers_count; i++)
 {
- if (!strcmp(hb_audio_mixdowns[i].short_name, short_name))
+ if (hb_audio_dithers[i].enabled)
 {
- return hb_audio_mixdowns[i].amixdown;
+ if (hb_audio_dithers_first_item == NULL)
+ {
+ hb_audio_dithers_first_item = &hb_audio_dithers[i].item;
+ }
+ else
+ {
+ ((hb_dither_internal_t*)hb_audio_dithers_last_item)->next =
+ &hb_audio_dithers[i].item;
+ }
+ hb_audio_dithers_last_item = &hb_audio_dithers[i].item;
 }
 }
- return 0;
-}
+ // fallbacks are static for now (no setup required)
 
-const char* hb_mixdown_get_short_name_from_mixdown(int amixdown)
-{
- int i;
+ // audio mixdowns
 for (i = 0; i < hb_audio_mixdowns_count; i++)
 {
- if (hb_audio_mixdowns[i].amixdown == amixdown)
+ if (hb_audio_mixdowns[i].enabled)
 {
- return hb_audio_mixdowns[i].short_name;
+ if (hb_audio_mixdowns_first_item == NULL)
+ {
+ hb_audio_mixdowns_first_item = &hb_audio_mixdowns[i].item;
+ }
+ else
+ {
+ ((hb_mixdown_internal_t*)hb_audio_mixdowns_last_item)->next =
+ &hb_audio_mixdowns[i].item;
+ }
+ hb_audio_mixdowns_last_item = &hb_audio_mixdowns[i].item;
 }
 }
- return "";
-}
+ // fallbacks are static for now (no setup required)
 
-void hb_autopassthru_apply_settings( hb_job_t * job )
-{
- int i, j, already_printed;
- hb_audio_t * audio;
- for( i = 0, already_printed = 0; i < hb_list_count( job->list_audio ); )
+ // video encoders
+ for (i = 0; i < hb_video_encoders_count; i++)
 {
- audio = hb_list_item( job->list_audio, i );
- if( audio->config.out.codec == HB_ACODEC_AUTO_PASS )
+ if (hb_video_encoders[i].enabled)
 {
- if( !already_printed )
- hb_autopassthru_print_settings( job );
- already_printed = 1;
- audio->config.out.codec = hb_autopassthru_get_encoder( audio->config.in.codec,
- job->acodec_copy_mask,
- job->acodec_fallback,
- job->mux );
- if( !( audio->config.out.codec & HB_ACODEC_PASS_FLAG ) &&
- !( audio->config.out.codec & HB_ACODEC_MASK ) )
- {
- hb_log( "Auto Passthru: passthru not possible and no valid fallback specified, dropping track %d",
- audio->config.out.track );
- hb_list_rem( job->list_audio, audio );
- hb_audio_close( &audio );
+ // we still need to check
+ hb_video_encoders[i].enabled =
+ hb_video_encoder_is_enabled(hb_video_encoders[i].item.codec);
+ }
+ if (hb_video_encoders[i].enabled)
+ {
+ if (hb_video_encoders_first_item == NULL)
+ {
+ hb_video_encoders_first_item = &hb_video_encoders[i].item;
+ }
+ else
+ {
+ ((hb_encoder_internal_t*)hb_video_encoders_last_item)->next =
+ &hb_video_encoders[i].item;
+ }
+ hb_video_encoders_last_item = &hb_video_encoders[i].item;
+ }
+ }
+ // setup fallbacks
+ for (i = 0; i < hb_video_encoders_count; i++)
+ {
+ if (!hb_video_encoders[i].enabled)
+ {
+ if ((hb_video_encoders[i].item.codec & HB_VCODEC_MASK) &&
+ (hb_video_encoder_is_enabled(hb_video_encoders[i].item.codec)))
+ {
+ // we have a specific fallback and it's enabled
 continue;
 }
- audio->config.out.samplerate = audio->config.in.samplerate;
- if( !( audio->config.out.codec & HB_ACODEC_PASS_FLAG ) )
+ for (j = 0; j < hb_video_encoders_count; j++)
 {
- if( audio->config.out.codec == job->acodec_fallback )
+ if (hb_video_encoders[j].enabled &&
+ hb_video_encoders[j].gid == hb_video_encoders[i].gid)
 {
- hb_log( "Auto Passthru: passthru not possible for track %d, using fallback",
- audio->config.out.track );
+ hb_video_encoders[i].item.codec = hb_video_encoders[j].item.codec;
+ break;
 }
- else
+ }
+ }
+ }
+
+ // audio encoders
+ for (i = 0; i < hb_audio_encoders_count; i++)
+ {
+ if (hb_audio_encoders[i].enabled)
+ {
+ // we still need to check
+ hb_audio_encoders[i].enabled =
+ hb_audio_encoder_is_enabled(hb_audio_encoders[i].item.codec);
+ }
+ if (hb_audio_encoders[i].enabled)
+ {
+ if (hb_audio_encoders_first_item == NULL)
+ {
+ hb_audio_encoders_first_item = &hb_audio_encoders[i].item;
+ }
+ else
+ {
+ ((hb_encoder_internal_t*)hb_audio_encoders_last_item)->next =
+ &hb_audio_encoders[i].item;
+ }
+ hb_audio_encoders_last_item = &hb_audio_encoders[i].item;
+ }
+ }
+ // setup fallbacks
+ for (i = 0; i < hb_audio_encoders_count; i++)
+ {
+ if (!hb_audio_encoders[i].enabled)
+ {
+ if ((hb_audio_encoders[i].item.codec & HB_ACODEC_MASK) &&
+ (hb_audio_encoder_is_enabled(hb_audio_encoders[i].item.codec)))
+ {
+ // we have a specific fallback and it's enabled
+ continue;
+ }
+ for (j = 0; j < hb_audio_encoders_count; j++)
+ {
+ if (hb_audio_encoders[j].enabled &&
+ hb_audio_encoders[j].gid == hb_audio_encoders[i].gid)
 {
- hb_log( "Auto Passthru: passthru and fallback not possible for track %d, using default encoder",
- audio->config.out.track );
+ hb_audio_encoders[i].item.codec = hb_audio_encoders[j].item.codec;
+ break;
 }
- audio->config.out.mixdown = hb_get_default_mixdown( audio->config.out.codec,
- audio->config.in.channel_layout );
- audio->config.out.bitrate = hb_get_default_audio_bitrate( audio->config.out.codec,
- audio->config.out.samplerate,
- audio->config.out.mixdown );
- audio->config.out.compression_level = hb_get_default_audio_compression( audio->config.out.codec );
 }
- else
+ if ((hb_audio_encoders[i].item.codec & HB_ACODEC_MASK) == 0 &&
+ (hb_audio_encoders[i].gid == HB_GID_ACODEC_AAC_HE))
 {
- for( j = 0; j < hb_audio_encoders_count; j++ )
+ // try to find an AAC fallback if no HE-AAC encoder is available
+ for (j = 0; j < hb_audio_encoders_count; j++)
 {
- if( hb_audio_encoders[j].encoder == audio->config.out.codec )
+ if (hb_audio_encoders[j].enabled &&
+ hb_audio_encoders[j].gid == HB_GID_ACODEC_AAC)
 {
- hb_log( "Auto Passthru: using %s for track %d",
- hb_audio_encoders[j].human_readable_name,
- audio->config.out.track );
+ hb_audio_encoders[i].item.codec = hb_audio_encoders[j].item.codec;
 break;
 }
 }
 }
 }
- /* Adjust output track number, in case we removed one.
- * Output tracks sadly still need to be in sequential order.
- * Note: out.track starts at 1, i starts at 0 */
- audio->config.out.track = ++i;
 }
-}
 
-void hb_autopassthru_print_settings( hb_job_t * job )
-{
- int i, codec_len;
- char *mask = NULL, *tmp;
- const char *fallback = NULL;
- for( i = 0; i < hb_audio_encoders_count; i++ )
+ // video containers
+ for (i = 0; i < hb_containers_count; i++)
 {
- if( ( hb_audio_encoders[i].encoder & HB_ACODEC_PASS_FLAG ) &&
- ( hb_audio_encoders[i].encoder != HB_ACODEC_AUTO_PASS ) &&
- ( hb_audio_encoders[i].encoder & job->acodec_copy_mask ) )
+ if (hb_containers[i].enabled)
+ {
+ // we still need to check
+ hb_containers[i].enabled =
+ hb_container_is_enabled(hb_containers[i].item.format);
+ }
+ if (hb_containers[i].enabled)
 {
- if( mask )
+ if (hb_containers_first_item == NULL)
 {
- tmp = hb_strncat_dup( mask, ", ", 2 );
- if( tmp )
- {
- free( mask );
- mask = tmp;
- }
+ hb_containers_first_item = &hb_containers[i].item;
 }
- // passthru name without " Passthru"
- codec_len = strlen( hb_audio_encoders[i].human_readable_name ) - 9;
- tmp = hb_strncat_dup( mask, hb_audio_encoders[i].human_readable_name, codec_len );
- if( tmp )
+ else
 {
- free( mask );
- mask = tmp;
+ ((hb_container_internal_t*)hb_containers_last_item)->next =
+ &hb_containers[i].item;
 }
+ hb_containers_last_item = &hb_containers[i].item;
 }
- else if( !( hb_audio_encoders[i].encoder & HB_ACODEC_PASS_FLAG ) &&
- ( hb_audio_encoders[i].encoder == job->acodec_fallback ) )
+ }
+ // setup fallbacks
+ for (i = 0; i < hb_containers_count; i++)
+ {
+ if (!hb_containers[i].enabled)
 {
- fallback = hb_audio_encoders[i].human_readable_name;
+ if ((hb_containers[i].item.format & HB_MUX_MASK) &&
+ (hb_container_is_enabled(hb_containers[i].item.format)))
+ {
+ // we have a specific fallback and it's enabled
+ continue;
+ }
+ for (j = 0; j < hb_containers_count; j++)
+ {
+ if (hb_containers[j].enabled &&
+ hb_containers[j].gid == hb_containers[i].gid)
+ {
+ hb_containers[i].item.format = hb_containers[j].item.format;
+ break;
+ }
+ }
 }
 }
- if( !mask )
- hb_log( "Auto Passthru: no codecs allowed" );
- else
- hb_log( "Auto Passthru: allowed codecs are %s", mask );
- if( !fallback )
- hb_log( "Auto Passthru: no valid fallback specified" );
+
+ // we're done, yay!
+ common_init_done = 1;
+}
+
+int hb_video_framerate_get_from_name(const char *name)
+{
+ if (name == NULL || *name == '\0')
+ goto fail;
+
+ int i;
+ for (i = 0; i < hb_video_rates_count; i++)
+ {
+ if (!strcasecmp(hb_video_rates[i].item.name, name))
+ {
+ return hb_video_rates[i].item.rate;
+ }
+ }
+
+fail:
+ return -1;
+}
+
+const char* hb_video_framerate_get_name(int framerate)
+{
+ if (framerate > hb_video_rates_first_item->rate ||
+ framerate < hb_video_rates_last_item ->rate)
+ goto fail;
+
+ const hb_rate_t *video_framerate = NULL;
+ while ((video_framerate = hb_video_framerate_get_next(video_framerate)) != NULL)
+ {
+ if (video_framerate->rate == framerate)
+ {
+ return video_framerate->name;
+ }
+ }
+
+fail:
+ return NULL;
+}
+
+const char* hb_video_framerate_sanitize_name(const char *name)
+{
+ return hb_video_framerate_get_name(hb_video_framerate_get_from_name(name));
+}
+
+const hb_rate_t* hb_video_framerate_get_next(const hb_rate_t *last)
+{
+ if (last == NULL)
+ {
+ return hb_video_rates_first_item;
+ }
+ return ((hb_rate_internal_t*)last)->next;
+}
+
+int hb_audio_samplerate_get_best(uint32_t codec, int samplerate, int *sr_shift)
+{
+ int best_samplerate;
+ if (samplerate < 32000 && (codec == HB_ACODEC_AC3 ||
+ codec == HB_ACODEC_CA_HAAC))
+ {
+ // ca_haac can't do samplerates < 32 kHz
+ // AC-3 < 32 kHz suffers from poor hardware compatibility
+ best_samplerate = 32000;
+ }
+ else if (samplerate < 16000 && codec == HB_ACODEC_FDK_HAAC)
+ {
+ // fdk_haac can't do samplerates < 16 kHz
+ best_samplerate = 16000;
+ }
 else
- hb_log( "Auto Passthru: fallback is %s", fallback );
+ {
+ best_samplerate = hb_audio_rates_first_item->rate;
+ const hb_rate_t *audio_samplerate = NULL;
+ while ((audio_samplerate = hb_audio_samplerate_get_next(audio_samplerate)) != NULL)
+ {
+ if (samplerate == audio_samplerate->rate)
+ {
+ // valid samplerate
+ best_samplerate = audio_samplerate->rate;
+ break;
+ }
+ if (samplerate > audio_samplerate->rate)
+ {
+ // samplerates are sanitized downwards
+ best_samplerate = audio_samplerate->rate;
+ }
+ }
+ }
+ if (sr_shift != NULL)
+ {
+ /* sr_shift: 0 -> 48000, 44100, 32000 Hz
+ * 1 -> 24000, 22050, 16000 Hz
+ * 2 -> 12000, 11025, 8000 Hz
+ *
+ * also, since samplerates are sanitized downwards:
+ *
+ * (samplerate < 32000) implies (samplerate <= 24000)
+ */
+ *sr_shift = ((best_samplerate < 16000) ? 2 :
+ (best_samplerate < 32000) ? 1 : 0);
+ }
+ return best_samplerate;
 }
 
-int hb_autopassthru_get_encoder( int in_codec, int copy_mask, int fallback, int muxer )
+int hb_audio_samplerate_get_from_name(const char *name)
 {
+ if (name == NULL || *name == '\0')
+ goto fail;
+
 int i;
- int out_codec = ( copy_mask & in_codec ) | HB_ACODEC_PASS_FLAG;
- // sanitize fallback encoder and selected passthru
- // note: invalid fallbacks are caught in hb_autopassthru_apply_settings
- for( i = 0; i < hb_audio_encoders_count; i++ )
+ for (i = 0; i < hb_audio_rates_count; i++)
 {
- if( ( hb_audio_encoders[i].encoder == fallback ) &&
- !( hb_audio_encoders[i].muxers & muxer ) )
+ if (!strcasecmp(hb_audio_rates[i].item.name, name))
 {
- // fallback not possible with current muxer
- // use the default audio encoder instead
- fallback = hb_get_default_audio_encoder(muxer);
- break;
+ return hb_audio_rates[i].item.rate;
 }
 }
- for( i = 0; i < hb_audio_encoders_count; i++ )
+
+ // maybe the samplerate was specified in Hz
+ i = atoi(name);
+ if (i >= hb_audio_rates_first_item->rate &&
+ i <= hb_audio_rates_last_item ->rate)
+ {
+ return hb_audio_samplerate_get_best(0, i, NULL);
+ }
+
+fail:
+ return -1;
+}
+
+const char* hb_audio_samplerate_get_name(int samplerate)
+{
+ if (samplerate < hb_audio_rates_first_item->rate ||
+ samplerate > hb_audio_rates_last_item ->rate)
+ goto fail;
+
+ const hb_rate_t *audio_samplerate = NULL;
+ while ((audio_samplerate = hb_audio_samplerate_get_next(audio_samplerate)) != NULL)
 {
- if( ( hb_audio_encoders[i].encoder == out_codec ) &&
- !( hb_audio_encoders[i].muxers & muxer ) )
+ if (audio_samplerate->rate == samplerate)
 {
- // selected passthru not possible with current muxer
- out_codec = fallback;
- break;
+ return audio_samplerate->name;
 }
 }
- if( !( out_codec & HB_ACODEC_PASS_MASK ) )
- return fallback;
- return out_codec;
+
+fail:
+ return NULL;
 }
 
-int hb_get_default_audio_encoder(int muxer)
+const hb_rate_t* hb_audio_samplerate_get_next(const hb_rate_t *last)
 {
-#ifndef __APPLE__
- if (muxer == HB_MUX_MKV)
+ if (last == NULL)
 {
- return HB_ACODEC_LAME;
+ return hb_audio_rates_first_item;
 }
-#endif
- return hb_audio_encoders[0].encoder;
+ return ((hb_rate_internal_t*)last)->next;
 }
 
 // Given an input bitrate, find closest match in the set of allowed bitrates
-int hb_find_closest_audio_bitrate(int bitrate)
+static int hb_audio_bitrate_find_closest(int bitrate)
 {
 // Check if bitrate mode was disabled
 if (bitrate <= 0)
 return bitrate;
 
- int ii, result;
- // result is highest rate if none found during search.
- // rate returned will always be <= rate asked for.
- result = hb_audio_bitrates[0].rate;
- for (ii = hb_audio_bitrates_count - 1; ii > 0; ii--)
+ int closest_bitrate = hb_audio_bitrates_first_item->rate;
+ const hb_rate_t *audio_bitrate = NULL;
+ while ((audio_bitrate = hb_audio_bitrate_get_next(audio_bitrate)) != NULL)
 {
- if (bitrate >= hb_audio_bitrates[ii].rate)
+ if (bitrate == audio_bitrate->rate)
 {
- result = hb_audio_bitrates[ii].rate;
+ // valid bitrate
+ closest_bitrate = audio_bitrate->rate;
 break;
 }
+ if (bitrate > audio_bitrate->rate)
+ {
+ // bitrates are sanitized downwards
+ closest_bitrate = audio_bitrate->rate;
+ }
 }
- return result;
+ return closest_bitrate;
 }
 
-/* Get the bitrate low and high limits for a codec/samplerate/mixdown triplet.
+// Given an input bitrate, sanitize it.
+// Check low and high limits and make sure it is in the set of allowed bitrates.
+int hb_audio_bitrate_get_best(uint32_t codec, int bitrate, int samplerate,
+ int mixdown)
+{
+ int low, high;
+ hb_audio_bitrate_get_limits(codec, samplerate, mixdown, &low, &high);
+ if (bitrate > high)
+ bitrate = high;
+ if (bitrate < low)
+ bitrate = low;
+ return hb_audio_bitrate_find_closest(bitrate);
+}
 
-Encoder 1.0 channel 2.0 channels 5.1 channels 6.1 channels 7.1 channels
---------------------------------------------------------------------------------------
+// Get the default bitrate for a given codec/samplerate/mixdown triplet.
+int hb_audio_bitrate_get_default(uint32_t codec, int samplerate, int mixdown)
+{
+ if ((codec & HB_ACODEC_PASS_FLAG) || !(codec & HB_ACODEC_MASK))
+ goto fail;
 
-faac
-----
-supported samplerates: 8 - 48 kHz
-libfaac/util.c defines the bitrate limits:
-MinBitrate() -> 8000 bps (per channel, incl. LFE).
-MaxBitrate() -> (6144 * samplerate / 1024) bps (per channel, incl. LFE).
-But output bitrates don't go as high as the theoretical maximums:
-12 kHz 43 (72) 87 (144) 260 (432) 303 (504) 342 (576)
-24 kHz 87 (144) 174 (288) 514 (864) 595 (1008) 669 (1152)
-48 kHz 174 (288) 347 (576) 970 (1728) 1138 (2016) 1287 (2304)
-Also, faac isn't a great encoder, so you don't want to allow too low a bitrate.
-Limits: minimum of 32 Kbps per channel
- maximum of 192 Kbps per channel at 32-48 kHz, adjusted for sr_shift
-
-
-ffaac
------
-supported samplerates: 8 - 48 kHz
-libavcodec/aacenc.c defines a maximum bitrate:
--> 6144 * samplerate / 1024 bps (per channel, incl. LFE).
-But output bitrates don't go as high as the theoretical maximums:
-12 kHz 61 (72) 123 (144)
-24 kHz 121 (144) 242 (288)
-48 kHz 236 (288) 472 (576)
-Also, ffaac isn't a great encoder, so you don't want to allow too low a bitrate.
-Limits: minimum of 32 Kbps per channel
- maximum of 192 Kbps per channel at 32 kHz, adjusted for sr_shift
- maximum of 256 Kbps per channel at 44.1-48 kHz, adjusted for sr_shift
-
-vorbis
-------
-supported samplerates: 8 - 48 kHz
-lib/modes/setup_*.h provides a range of allowed bitrates for various configurations.
-for each samplerate, the highest minimums and lowest maximums are:
- 8 kHz Minimum 8 Kbps, maximum 32 Kbps (per channel, incl. LFE).
-12 kHz Minimum 14 Kbps, maximum 44 Kbps (per channel, incl. LFE).
-16 kHz Minimum 16 Kbps, maximum 86 Kbps (per channel, incl. LFE).
-24 kHz Minimum 22 Kbps, maximum 86 Kbps (per channel, incl. LFE).
-32 kHz Minimum 26 Kbps, maximum 190 Kbps (per channel, incl. LFE).
-48 kHz Minimum 28 Kbps, maximum 240 Kbps (per channel, incl. LFE).
-Limits: minimum of 14/22/28 Kbps per channel (8-12, 16-24, 32-48 kHz)
- maximum of 32/86/190/240 Kbps per channel (8-12, 16-24, 32, 44.1-48 kHz)
-
-lame
-----
-supported samplerates: 8 - 48 kHz
-lame_init_params() allows the following bitrates:
-12 kHz Minimum 8 Kbps, maximum 64 Kbps
-24 kHz Minimum 8 Kbps, maximum 160 Kbps
-48 kHz Minimum 32 Kbps, maximum 320 Kbps
-Limits: minimum of 8/8/32 Kbps (8-12, 16-24, 32-48 kHz)
- maximum of 64/160/320 Kbps (8-12, 16-24, 32-48 kHz)
-
-ffac3
------
-supported samplerates: 32 - 48 kHz (< 32 kHz disabled for compatibility reasons)
-Dolby's encoder has a min. of 224 Kbps for 5 full-bandwidth channels (5.0, 5.1)
-The maximum AC3 bitrate is 640 Kbps
-Limits: minimum of 224/5 Kbps per full-bandwidth channel, maximum of 640 Kbps
-
-ca_aac
-------
-supported samplerates: 8 - 48 kHz
-Core Audio API provides a range of allowed bitrates:
- 8 kHz 8 - 24 16 - 48 40 - 112 48 - 144 56 - 160
-12 kHz 12 - 32 24 - 64 64 - 160 72 - 192 96 - 224
-16 kHz 12 - 48 24 - 96 64 - 224 72 - 288 96 - 320
-24 kHz 16 - 64 32 - 128 80 - 320 96 - 384 112 - 448
-32 kHz 24 - 96 48 - 192 128 - 448 144 - 576 192 - 640
-48 kHz 32 - 256 64 - 320 160 - 768 192 - 960 224 - 960
-Limits:
- 8 kHz -> minimum of 8 Kbps and maximum of 24 Kbps per full-bandwidth channel
-12 kHz -> minimum of 12 Kbps and maximum of 32 Kbps per full-bandwidth channel
-16 kHz -> minimum of 12 Kbps and maximum of 48 Kbps per full-bandwidth channel
-24 kHz -> minimum of 16 Kbps and maximum of 64 Kbps per full-bandwidth channel
-32 kHz -> minimum of 24 Kbps and maximum of 96 Kbps per full-bandwidth channel
-48 kHz -> minimum of 32 Kbps and maximum of 160 Kbps per full-bandwidth channel
-48 kHz -> maximum of +96 Kbps for Mono
-Note: encCoreAudioInit() will sanitize any mistake made here.
-
-ca_haac
--------
-supported samplerates: 32 - 48 kHz
-Core Audio API provides a range of allowed bitrates:
-32 kHz 12 - 40 24 - 80 64 - 192 N/A 96 - 256
-48 kHz 16 - 40 32 - 80 80 - 192 N/A 112 - 256
-Limits: minimum of 12 Kbps per full-bandwidth channel (<= 32 kHz)
- minimum of 16 Kbps per full-bandwidth channel ( > 32 kHz)
- maximum of 40 Kbps per full-bandwidth channel
-Note: encCoreAudioInit() will sanitize any mistake made here.
-
-fdk_aac
--------
-supported samplerates: 8 - 48 kHz
-libfdk limits the bitrate to the following values:
- 8 kHz 48 96 240
-12 kHz 72 144 360
-16 kHz 96 192 480
-24 kHz 144 288 720
-32 kHz 192 384 960
-48 kHz 288 576 1440
-Limits: minimum of samplerate * 2/3 Kbps per full-bandwidth channel (see ca_aac)
- maximum of samplerate * 6.0 Kbps per full-bandwidth channel
- 
-fdk_haac
---------
-supported samplerates: 16 - 48 kHz
-libfdk limits the bitrate to the following values:
-16 kHz 8 - 48 16 - 96 45 - 199
-24 kHz 8 - 63 16 - 127 45 - 266
-32 kHz 8 - 63 16 - 127 45 - 266
-48 kHz 12 - 63 16 - 127 50 - 266
-Limits: minimum of 12 Kbps per full-bandwidth channel (<= 32 kHz) (see ca_haac)
- minimum of 16 Kbps per full-bandwidth channel ( > 32 kHz) (see ca_haac)
- maximum of 48, 96 or 192 Kbps (1.0, 2.0, 5.1) (<= 16 kHz)
- maximum of 64, 128 or 256 Kbps (1.0, 2.0, 5.1) ( > 16 kHz)
-*/
+ int bitrate, nchannels, sr_shift;
+ /* full-bandwidth channels, sr_shift */
+ nchannels = (hb_mixdown_get_discrete_channel_count(mixdown) -
+ hb_mixdown_get_low_freq_channel_count(mixdown));
+ hb_audio_samplerate_get_best(codec, samplerate, &sr_shift);
 
-void hb_get_audio_bitrate_limits(uint32_t codec, int samplerate, int mixdown,
- int *low, int *high)
-{
- if (codec & HB_ACODEC_PASS_FLAG)
+ switch (codec)
 {
- // Bitrates don't apply to passthrough audio, but may apply if we
- // fallback to an encoder when the source can't be passed through.
- *low = hb_audio_bitrates[0].rate;
- *high = hb_audio_bitrates[hb_audio_bitrates_count-1].rate;
- return;
+ case HB_ACODEC_FFFLAC:
+ case HB_ACODEC_FFFLAC24:
+ goto fail;
+
+ // 96, 224, 640 Kbps
+ case HB_ACODEC_AC3:
+ bitrate = (nchannels * 128) - (32 * (nchannels < 5));
+ break;
+
+ case HB_ACODEC_CA_HAAC:
+ case HB_ACODEC_FDK_HAAC:
+ bitrate = nchannels * 32;
+ break;
+
+ default:
+ bitrate = nchannels * 80;
+ break;
 }
+ // sample_rate adjustment
+ bitrate >>= sr_shift;
+ return hb_audio_bitrate_get_best(codec, bitrate, samplerate, mixdown);
+
+fail:
+ return -1;
+}
 
+/* Get the bitrate low and high limits for a codec/samplerate/mixdown triplet.
+ *
+ * Encoder 1.0 channel 2.0 channels 5.1 channels 6.1 channels 7.1 channels
+ * --------------------------------------------------------------------------------------
+ *
+ * ffaac
+ * -----
+ * supported samplerates: 8 - 48 kHz
+ * libavcodec/aacenc.c defines a maximum bitrate:
+ * -> 6144 * samplerate / 1024 bps (per channel, incl. LFE).
+ * But output bitrates don't go as high as the theoretical maximums:
+ * 12 kHz 61 (72) 123 (144)
+ * 24 kHz 121 (144) 242 (288)
+ * 48 kHz 236 (288) 472 (576)
+ * Also, ffaac isn't a great encoder, so you don't want to allow too low a bitrate.
+ * Limits: minimum of 32 Kbps per channel
+ * maximum of 192 Kbps per channel at 32 kHz, adjusted for sr_shift
+ * maximum of 256 Kbps per channel at 44.1-48 kHz, adjusted for sr_shift
+ *
+ * vorbis
+ * ------
+ * supported samplerates: 8 - 48 kHz
+ * lib/modes/setup_*.h provides a range of allowed bitrates for various configurations.
+ * for each samplerate, the highest minimums and lowest maximums are:
+ * 8 kHz Minimum 8 Kbps, maximum 32 Kbps (per channel, incl. LFE).
+ * 12 kHz Minimum 14 Kbps, maximum 44 Kbps (per channel, incl. LFE).
+ * 16 kHz Minimum 16 Kbps, maximum 86 Kbps (per channel, incl. LFE).
+ * 24 kHz Minimum 22 Kbps, maximum 86 Kbps (per channel, incl. LFE).
+ * 32 kHz Minimum 26 Kbps, maximum 190 Kbps (per channel, incl. LFE).
+ * 48 kHz Minimum 28 Kbps, maximum 240 Kbps (per channel, incl. LFE).
+ * Limits: minimum of 14/22/28 Kbps per channel (8-12, 16-24, 32-48 kHz)
+ * maximum of 32/86/190/240 Kbps per channel (8-12, 16-24, 32, 44.1-48 kHz)
+ *
+ * lame
+ * ----
+ * supported samplerates: 8 - 48 kHz
+ * lame_init_params() allows the following bitrates:
+ * 12 kHz Minimum 8 Kbps, maximum 64 Kbps
+ * 24 kHz Minimum 8 Kbps, maximum 160 Kbps
+ * 48 kHz Minimum 32 Kbps, maximum 320 Kbps
+ * Limits: minimum of 8/8/32 Kbps (8-12, 16-24, 32-48 kHz)
+ * maximum of 64/160/320 Kbps (8-12, 16-24, 32-48 kHz)
+ *
+ * ffac3
+ * -----
+ * supported samplerates: 32 - 48 kHz (< 32 kHz disabled for compatibility reasons)
+ * Dolby's encoder has a min. of 224 Kbps for 5 full-bandwidth channels (5.0, 5.1)
+ * The maximum AC3 bitrate is 640 Kbps
+ * Limits: minimum of 224/5 Kbps per full-bandwidth channel, maximum of 640 Kbps
+ *
+ * ca_aac
+ * ------
+ * supported samplerates: 8 - 48 kHz
+ * Core Audio API provides a range of allowed bitrates:
+ * 8 kHz 8 - 24 16 - 48 40 - 112 48 - 144 56 - 160
+ * 12 kHz 12 - 32 24 - 64 64 - 160 72 - 192 96 - 224
+ * 16 kHz 12 - 48 24 - 96 64 - 224 72 - 288 96 - 320
+ * 24 kHz 16 - 64 32 - 128 80 - 320 96 - 384 112 - 448
+ * 32 kHz 24 - 96 48 - 192 128 - 448 144 - 576 192 - 640
+ * 48 kHz 32 - 256 64 - 320 160 - 768 192 - 960 224 - 960
+ * Limits:
+ * 8 kHz -> minimum of 8 Kbps and maximum of 24 Kbps per full-bandwidth channel
+ * 12 kHz -> minimum of 12 Kbps and maximum of 32 Kbps per full-bandwidth channel
+ * 16 kHz -> minimum of 12 Kbps and maximum of 48 Kbps per full-bandwidth channel
+ * 24 kHz -> minimum of 16 Kbps and maximum of 64 Kbps per full-bandwidth channel
+ * 32 kHz -> minimum of 24 Kbps and maximum of 96 Kbps per full-bandwidth channel
+ * 48 kHz -> minimum of 32 Kbps and maximum of 160 Kbps per full-bandwidth channel
+ * 48 kHz -> maximum of +96 Kbps for Mono
+ * Note: encCoreAudioInit() will sanitize any mistake made here.
+ *
+ * ca_haac
+ * -------
+ * supported samplerates: 32 - 48 kHz
+ * Core Audio API provides a range of allowed bitrates:
+ * 32 kHz 12 - 40 24 - 80 64 - 192 N/A 96 - 256
+ * 48 kHz 16 - 40 32 - 80 80 - 192 N/A 112 - 256
+ * Limits: minimum of 12 Kbps per full-bandwidth channel (<= 32 kHz)
+ * minimum of 16 Kbps per full-bandwidth channel ( > 32 kHz)
+ * maximum of 40 Kbps per full-bandwidth channel
+ * Note: encCoreAudioInit() will sanitize any mistake made here.
+ *
+ * fdk_aac
+ * -------
+ * supported samplerates: 8 - 48 kHz
+ * libfdk limits the bitrate to the following values:
+ * 8 kHz 48 96 240
+ * 12 kHz 72 144 360
+ * 16 kHz 96 192 480
+ * 24 kHz 144 288 720
+ * 32 kHz 192 384 960
+ * 48 kHz 288 576 1440
+ * Limits: minimum of samplerate * 2/3 Kbps per full-bandwidth channel (see ca_aac)
+ * maximum of samplerate * 6.0 Kbps per full-bandwidth channel
+ *
+ * fdk_haac
+ * --------
+ * supported samplerates: 16 - 48 kHz
+ * libfdk limits the bitrate to the following values:
+ * 16 kHz 8 - 48 16 - 96 45 - 199
+ * 24 kHz 8 - 63 16 - 127 45 - 266
+ * 32 kHz 8 - 63 16 - 127 45 - 266
+ * 48 kHz 12 - 63 16 - 127 50 - 266
+ * Limits: minimum of 12 Kbps per full-bandwidth channel (<= 32 kHz) (see ca_haac)
+ * minimum of 16 Kbps per full-bandwidth channel ( > 32 kHz) (see ca_haac)
+ * maximum of 48, 96 or 192 Kbps (1.0, 2.0, 5.1) (<= 16 kHz)
+ * maximum of 64, 128 or 256 Kbps (1.0, 2.0, 5.1) ( > 16 kHz)
+ */
+void hb_audio_bitrate_get_limits(uint32_t codec, int samplerate, int mixdown,
+ int *low, int *high)
+{
 /* samplerate, sr_shift */
 int sr_shift;
- samplerate = hb_get_best_samplerate(codec, samplerate, &sr_shift);
+ samplerate = hb_audio_samplerate_get_best(codec, samplerate, &sr_shift);
 
 /* LFE, full-bandwidth channels */
 int lfe_count, nchannels;
@@ -710,32 +982,37 @@
 *low = nchannels * 8;
 *high = nchannels * 24;
 break;
+
 case 11025:
 case 12000:
 *low = nchannels * 12;
 *high = nchannels * 32;
 break;
+
 case 16000:
 *low = nchannels * 12;
 *high = nchannels * 48;
 break;
+
 case 22050:
 case 24000:
 *low = nchannels * 16;
 *high = nchannels * 64;
 break;
+
 case 32000:
 *low = nchannels * 24;
 *high = nchannels * 96;
 break;
+
 case 44100:
 case 48000:
 default:
 *low = nchannels * 32;
 *high = nchannels * (160 + (96 * (nchannels == 1)));
 break;
- }
- } break;
+ } break;
+ }
 
 case HB_ACODEC_CA_HAAC:
 *low = nchannels * (12 + (4 * (samplerate >= 44100)));
@@ -754,11 +1031,6 @@
 (samplerate >= 22050)));
 break;
 
- case HB_ACODEC_FAAC:
- *low = (nchannels + lfe_count) * 32;
- *high = (nchannels + lfe_count) * (192 >> sr_shift);
- break;
-
 case HB_ACODEC_FFAAC:
 *low = ((nchannels + lfe_count) * 32);
 *high = ((nchannels + lfe_count) *
@@ -781,69 +1053,189 @@
 ( 50 * (samplerate >= 44100)));
 break;
 
+ // Bitrates don't apply to passthrough audio, but may apply if we
+ // fall back to an encoder when the source can't be passed through.
 default:
- *low = hb_audio_bitrates[0].rate;
- *high = hb_audio_bitrates[hb_audio_bitrates_count-1].rate;
+ *low = hb_audio_bitrates_first_item->rate;
+ *high = hb_audio_bitrates_last_item ->rate;
 break;
 }
+
 // sanitize max. bitrate
- if (*high < hb_audio_bitrates[0].rate)
- *high = hb_audio_bitrates[0].rate;
- if (*high > hb_audio_bitrates[hb_audio_bitrates_count-1].rate)
- *high = hb_audio_bitrates[hb_audio_bitrates_count-1].rate;
+ if (*high < hb_audio_bitrates_first_item->rate)
+ *high = hb_audio_bitrates_first_item->rate;
+ if (*high > hb_audio_bitrates_last_item ->rate)
+ *high = hb_audio_bitrates_last_item ->rate;
 }
 
-// Given an input bitrate, sanitize it.
-// Check low and high limits and make sure it is in the set of allowed bitrates.
-int hb_get_best_audio_bitrate(uint32_t codec, int bitrate, int samplerate,
- int mixdown)
+const hb_rate_t* hb_audio_bitrate_get_next(const hb_rate_t *last)
 {
- int low, high;
- hb_get_audio_bitrate_limits(codec, samplerate, mixdown, &low, &high);
- if (bitrate > high)
- bitrate = high;
- if (bitrate < low)
- bitrate = low;
- return hb_find_closest_audio_bitrate(bitrate);
+ if (last == NULL)
+ {
+ return hb_audio_bitrates_first_item;
+ }
+ return ((hb_rate_internal_t*)last)->next;
 }
 
-// Get the default bitrate for a given codec/samplerate/mixdown triplet.
-int hb_get_default_audio_bitrate(uint32_t codec, int samplerate, int mixdown)
+// Get limits and hints for the UIs.
+//
+// granularity sets the minimum step increments that should be used
+// (it's ok to round up to some nice multiple if you like)
+//
+// direction says whether 'low' limit is highest or lowest
+// quality (direction 0 == lowest value is worst quality)
+void hb_video_quality_get_limits(uint32_t codec, float *low, float *high,
+ float *granularity, int *direction)
 {
- if (codec & HB_ACODEC_PASS_FLAG)
+#ifdef USE_QSV
+ if (codec & HB_VCODEC_QSV_MASK)
 {
- return -1;
+ return hb_qsv_video_quality_get_limits(codec, low, high, granularity,
+ direction);
 }
-
- int bitrate, nchannels, sr_shift;
- /* full-bandwidth channels, sr_shift */
- nchannels = (hb_mixdown_get_discrete_channel_count(mixdown) -
- hb_mixdown_get_low_freq_channel_count(mixdown));
- hb_get_best_samplerate(codec, samplerate, &sr_shift);
+#endif
 
 switch (codec)
 {
- case HB_ACODEC_FFFLAC:
- case HB_ACODEC_FFFLAC24:
- return -1;
+ case HB_VCODEC_X264:
+#ifdef USE_X265
+ case HB_VCODEC_X265:
+#endif
+ *direction = 1;
+ *granularity = 0.1;
+ *low = 0.;
+ *high = 51.;
+ break;
 
- // 96, 224, 640 Kbps
- case HB_ACODEC_AC3:
- bitrate = (nchannels * 128) - (32 * (nchannels < 5));
+ case HB_VCODEC_THEORA:
+ *direction = 0;
+ *granularity = 1.;
+ *low = 0.;
+ *high = 63.;
 break;
 
- case HB_ACODEC_CA_HAAC:
- case HB_ACODEC_FDK_HAAC:
- bitrate = nchannels * 32;
+ case HB_VCODEC_FFMPEG_VP8:
+ *direction = 1;
+ *granularity = 1.;
+ *low = 0.;
+ *high = 63.;
 break;
 
+ case HB_VCODEC_FFMPEG_MPEG2:
+ case HB_VCODEC_FFMPEG_MPEG4:
 default:
- bitrate = nchannels * 80;
+ *direction = 1;
+ *granularity = 1.;
+ *low = 1.;
+ *high = 31.;
 break;
 }
- // sample_rate adjustment
- bitrate >>= sr_shift;
- return hb_get_best_audio_bitrate(codec, bitrate, samplerate, mixdown);
+}
+
+const char* hb_video_quality_get_name(uint32_t codec)
+{
+#ifdef USE_QSV
+ if (codec & HB_VCODEC_QSV_MASK)
+ {
+ return hb_qsv_video_quality_get_name(codec);
+ }
+#endif
+
+ switch (codec)
+ {
+ case HB_VCODEC_X264:
+#ifdef USE_X265
+ case HB_VCODEC_X265:
+#endif
+ return "RF";
+
+ case HB_VCODEC_FFMPEG_VP8:
+ return "CQ";
+
+ default:
+ return "QP";
+ }
+}
+
+const char* const* hb_video_encoder_get_presets(int encoder)
+{
+#ifdef USE_QSV
+ if (encoder & HB_VCODEC_QSV_MASK)
+ {
+ return hb_qsv_preset_get_names();
+ }
+#endif
+
+ switch (encoder)
+ {
+ case HB_VCODEC_X264:
+ return x264_preset_names;
+
+#ifdef USE_X265
+ case HB_VCODEC_X265:
+ return x265_preset_names;
+#endif
+ default:
+ return NULL;
+ }
+}
+
+const char* const* hb_video_encoder_get_tunes(int encoder)
+{
+ switch (encoder)
+ {
+ case HB_VCODEC_X264:
+ return x264_tune_names;
+
+#ifdef USE_X265
+ case HB_VCODEC_X265:
+ return x265_tune_names;
+#endif
+ default:
+ return NULL;
+ }
+}
+
+const char* const* hb_video_encoder_get_profiles(int encoder)
+{
+#ifdef USE_QSV
+ if (encoder & HB_VCODEC_QSV_MASK)
+ {
+ return hb_qsv_profile_get_names(encoder);
+ }
+#endif
+
+ switch (encoder)
+ {
+ case HB_VCODEC_X264:
+ return hb_h264_profile_names;
+
+#ifdef USE_X265
+ case HB_VCODEC_X265:
+ return x265_profile_names;
+#endif
+ default:
+ return NULL;
+ }
+}
+
+const char* const* hb_video_encoder_get_levels(int encoder)
+{
+#ifdef USE_QSV
+ if (encoder & HB_VCODEC_QSV_MASK)
+ {
+ return hb_qsv_level_get_names(encoder);
+ }
+#endif
+
+ switch (encoder)
+ {
+ case HB_VCODEC_X264:
+ return hb_h264_level_names;
+
+ default:
+ return NULL;
+ }
 }
 
 // Get limits and hints for the UIs.
@@ -851,47 +1243,47 @@
 // granularity sets the minimum step increments that should be used
 // (it's ok to round up to some nice multiple if you like)
 //
-// direction says whether 'low' limit is highest or lowest 
+// direction says whether 'low' limit is highest or lowest
 // quality (direction 0 == lowest value is worst quality)
-void hb_get_audio_quality_limits(uint32_t codec, float *low, float *high,
+void hb_audio_quality_get_limits(uint32_t codec, float *low, float *high,
 float *granularity, int *direction)
 {
 switch (codec)
 {
 case HB_ACODEC_LAME:
- *direction = 1;
+ *direction = 1;
 *granularity = 0.5;
- *low = 0.;
- *high = 10.0;
+ *low = 0.;
+ *high = 10.;
 break;
 
 case HB_ACODEC_VORBIS:
- *direction = 0;
+ *direction = 0;
 *granularity = 0.5;
- *low = -2.0;
- *high = 10.0;
+ *low = -2.;
+ *high = 10.;
 break;
 
 case HB_ACODEC_CA_AAC:
- *direction = 0;
- *granularity = 9;
- *low = 1.;
- *high = 127.0;
+ *direction = 0;
+ *granularity = 9.;
+ *low = 1.;
+ *high = 127.;
 break;
 
 default:
- *direction = 0;
- *granularity = 1;
+ *direction = 0;
+ *granularity = 1.;
 *low = *high = HB_INVALID_AUDIO_QUALITY;
 break;
 }
 }
 
-float hb_get_best_audio_quality(uint32_t codec, float quality)
+float hb_audio_quality_get_best(uint32_t codec, float quality)
 {
- float low, high, granularity;
 int direction;
- hb_get_audio_quality_limits(codec, &low, &high, &granularity, &direction);
+ float low, high, granularity;
+ hb_audio_quality_get_limits(codec, &low, &high, &granularity, &direction);
 if (quality > high)
 quality = high;
 if (quality < low)
@@ -899,28 +1291,22 @@
 return quality;
 }
 
-float hb_get_default_audio_quality( uint32_t codec )
+float hb_audio_quality_get_default(uint32_t codec)
 {
- float quality;
- switch( codec )
+ switch (codec)
 {
 case HB_ACODEC_LAME:
- quality = 2.;
- break;
+ return 2.;
 
 case HB_ACODEC_VORBIS:
- quality = 5.;
- break;
+ return 5.;
 
 case HB_ACODEC_CA_AAC:
- quality = 91.;
- break;
+ return 91.;
 
 default:
- quality = HB_INVALID_AUDIO_QUALITY;
- break;
+ return HB_INVALID_AUDIO_QUALITY;
 }
- return quality;
 }
 
 // Get limits and hints for the UIs.
@@ -928,41 +1314,41 @@
 // granularity sets the minimum step increments that should be used
 // (it's ok to round up to some nice multiple if you like)
 //
-// direction says whether 'low' limit is highest or lowest 
+// direction says whether 'low' limit is highest or lowest
 // compression level (direction 0 == lowest value is worst compression level)
-void hb_get_audio_compression_limits(uint32_t codec, float *low, float *high,
+void hb_audio_compression_get_limits(uint32_t codec, float *low, float *high,
 float *granularity, int *direction)
 {
 switch (codec)
 {
 case HB_ACODEC_FFFLAC:
 case HB_ACODEC_FFFLAC24:
- *direction = 0;
- *granularity = 1;
- *high = 12;
- *low = 0;
+ *direction = 0;
+ *granularity = 1.;
+ *high = 12.;
+ *low = 0.;
 break;
 
 case HB_ACODEC_LAME:
- *direction = 1;
- *granularity = 1;
- *high = 9;
- *low = 0;
+ *direction = 1;
+ *granularity = 1.;
+ *high = 9.;
+ *low = 0.;
 break;
 
 default:
- *direction = 0;
- *granularity = 1;
- *low = *high = -1;
+ *direction = 0;
+ *granularity = 1.;
+ *low = *high = -1.;
 break;
 }
 }
 
-float hb_get_best_audio_compression(uint32_t codec, float compression)
+float hb_audio_compression_get_best(uint32_t codec, float compression)
 {
- float low, high, granularity;
 int direction;
- hb_get_audio_compression_limits(codec, &low, &high, &granularity, &direction);
+ float low, high, granularity;
+ hb_audio_compression_get_limits(codec, &low, &high, &granularity, &direction);
 if( compression > high )
 compression = high;
 if( compression < low )
@@ -970,7 +1356,7 @@
 return compression;
 }
 
-float hb_get_default_audio_compression(uint32_t codec)
+float hb_audio_compression_get_default(uint32_t codec)
 {
 switch (codec)
 {
@@ -986,27 +1372,241 @@
 }
 }
 
-int hb_get_best_mixdown(uint32_t codec, uint64_t layout, int mixdown)
+int hb_audio_dither_get_default()
+{
+ // "auto"
+ return hb_audio_dithers_first_item->method;
+}
+
+int hb_audio_dither_get_default_method()
+{
+ /*
+ * input could be s16 (possibly already dithered) converted to flt, so
+ * let's use a "low-risk" dither algorithm (standard triangular).
+ */
+ return AV_RESAMPLE_DITHER_TRIANGULAR;
+}
+
+int hb_audio_dither_is_supported(uint32_t codec)
+{
+ // encoder's input sample format must be s16(p)
+ switch (codec)
+ {
+ case HB_ACODEC_FFFLAC:
+ case HB_ACODEC_FDK_AAC:
+ case HB_ACODEC_FDK_HAAC:
+ return 1;
+
+ default:
+ return 0;
+ }
+}
+
+int hb_audio_dither_get_from_name(const char *name)
+{
+ if (name == NULL || *name == '\0')
+ goto fail;
+
+ int i;
+ for ( i = 0; i < hb_audio_dithers_count; i++)
+ {
+ if (!strcasecmp(hb_audio_dithers[i].item.short_name, name) ||
+ !strcasecmp(hb_audio_dithers[i].item.description, name))
+ {
+ return hb_audio_dithers[i].item.method;
+ }
+ }
+
+fail:
+ return hb_audio_dither_get_default();
+}
+
+const char* hb_audio_dither_get_description(int method)
+{
+ if (method < hb_audio_dithers_first_item->method ||
+ method > hb_audio_dithers_last_item ->method)
+ goto fail;
+
+ const hb_dither_t *audio_dither = NULL;
+ while ((audio_dither = hb_audio_dither_get_next(audio_dither)) != NULL)
+ {
+ if (audio_dither->method == method)
+ {
+ return audio_dither->description;
+ }
+ }
+
+fail:
+ return NULL;
+}
+
+const hb_dither_t* hb_audio_dither_get_next(const hb_dither_t *last)
+{
+ if (last == NULL)
+ {
+ return hb_audio_dithers_first_item;
+ }
+ return ((hb_dither_internal_t*)last)->next;
+}
+
+int hb_mixdown_is_supported(int mixdown, uint32_t codec, uint64_t layout)
+{
+ return (hb_mixdown_has_codec_support(mixdown, codec) &&
+ hb_mixdown_has_remix_support(mixdown, layout));
+}
+
+int hb_mixdown_has_codec_support(int mixdown, uint32_t codec)
+{
+ // Passthru, only "None" mixdown is supported
+ if (codec & HB_ACODEC_PASS_FLAG)
+ return (mixdown == HB_AMIXDOWN_NONE);
+
+ // Not passthru, "None" mixdown never supported
+ if (mixdown == HB_AMIXDOWN_NONE)
+ return 0;
+
+ switch (codec)
+ {
+ case HB_ACODEC_VORBIS:
+ case HB_ACODEC_FFFLAC:
+ case HB_ACODEC_FFFLAC24:
+ return (mixdown <= HB_AMIXDOWN_7POINT1);
+
+ case HB_ACODEC_LAME:
+ return (mixdown <= HB_AMIXDOWN_DOLBYPLII);
+
+ case HB_ACODEC_CA_AAC:
+ case HB_ACODEC_CA_HAAC:
+ return ((mixdown <= HB_AMIXDOWN_5POINT1) ||
+ (mixdown == HB_AMIXDOWN_5_2_LFE));
+
+ default:
+ return (mixdown <= HB_AMIXDOWN_5POINT1);
+ }
+}
+
+int hb_mixdown_has_remix_support(int mixdown, uint64_t layout)
+{
+ switch (mixdown)
+ {
+ // stereo + front left/right of center
+ case HB_AMIXDOWN_5_2_LFE:
+ return ((layout & AV_CH_FRONT_LEFT_OF_CENTER) &&
+ (layout & AV_CH_FRONT_RIGHT_OF_CENTER) &&
+ (layout & AV_CH_LAYOUT_STEREO) == AV_CH_LAYOUT_STEREO);
+
+ // 7.0 or better
+ case HB_AMIXDOWN_7POINT1:
+ return ((layout & AV_CH_LAYOUT_7POINT0) == AV_CH_LAYOUT_7POINT0);
+
+ // 6.0 or better
+ case HB_AMIXDOWN_6POINT1:
+ return ((layout & AV_CH_LAYOUT_7POINT0) == AV_CH_LAYOUT_7POINT0 ||
+ (layout & AV_CH_LAYOUT_6POINT0) == AV_CH_LAYOUT_6POINT0 ||
+ (layout & AV_CH_LAYOUT_HEXAGONAL) == AV_CH_LAYOUT_HEXAGONAL);
+
+ // stereo + either of front center, side or back left/right, back center
+ case HB_AMIXDOWN_5POINT1:
+ return ((layout & AV_CH_LAYOUT_2_1) == AV_CH_LAYOUT_2_1 ||
+ (layout & AV_CH_LAYOUT_2_2) == AV_CH_LAYOUT_2_2 ||
+ (layout & AV_CH_LAYOUT_QUAD) == AV_CH_LAYOUT_QUAD ||
+ (layout & AV_CH_LAYOUT_SURROUND) == AV_CH_LAYOUT_SURROUND);
+
+ // stereo + either of side or back left/right, back center
+ // also, allow Dolby Surrounbd output if the input is already Dolby
+ case HB_AMIXDOWN_DOLBY:
+ case HB_AMIXDOWN_DOLBYPLII:
+ return ((layout & AV_CH_LAYOUT_2_1) == AV_CH_LAYOUT_2_1 ||
+ (layout & AV_CH_LAYOUT_2_2) == AV_CH_LAYOUT_2_2 ||
+ (layout & AV_CH_LAYOUT_QUAD) == AV_CH_LAYOUT_QUAD ||
+ (layout == AV_CH_LAYOUT_STEREO_DOWNMIX &&
+ mixdown == HB_AMIXDOWN_DOLBY));
+
+ // more than 1 channel
+ case HB_AMIXDOWN_STEREO:
+ return (av_get_channel_layout_nb_channels(layout) > 1);
+
+ // regular stereo (not Dolby)
+ case HB_AMIXDOWN_LEFT:
+ case HB_AMIXDOWN_RIGHT:
+ return (layout == AV_CH_LAYOUT_STEREO);
+
+ // mono remix always supported
+ // HB_AMIXDOWN_NONE always supported (for Passthru)
+ case HB_AMIXDOWN_MONO:
+ case HB_AMIXDOWN_NONE:
+ return 1;
+
+ // unknown mixdown, should never happen
+ default:
+ return 0;
+ }
+}
+
+int hb_mixdown_get_discrete_channel_count(int amixdown)
+{
+ switch (amixdown)
+ {
+ case HB_AMIXDOWN_5_2_LFE:
+ case HB_AMIXDOWN_7POINT1:
+ return 8;
+
+ case HB_AMIXDOWN_6POINT1:
+ return 7;
+
+ case HB_AMIXDOWN_5POINT1:
+ return 6;
+
+ case HB_AMIXDOWN_MONO:
+ case HB_AMIXDOWN_LEFT:
+ case HB_AMIXDOWN_RIGHT:
+ return 1;
+
+ case HB_AMIXDOWN_NONE:
+ return 0;
+
+ default:
+ return 2;
+ }
+}
+
+int hb_mixdown_get_low_freq_channel_count(int amixdown)
+{
+ switch (amixdown)
+ {
+ case HB_AMIXDOWN_5POINT1:
+ case HB_AMIXDOWN_6POINT1:
+ case HB_AMIXDOWN_7POINT1:
+ case HB_AMIXDOWN_5_2_LFE:
+ return 1;
+
+ default:
+ return 0;
+ }
+}
+
+int hb_mixdown_get_best(uint32_t codec, uint64_t layout, int mixdown)
 {
 // Passthru, only "None" mixdown is supported
 if (codec & HB_ACODEC_PASS_FLAG)
 return HB_AMIXDOWN_NONE;
 
- // caller requested the best available mixdown
- if (mixdown == HB_INVALID_AMIXDOWN)
- mixdown = hb_audio_mixdowns[hb_audio_mixdowns_count - 1].amixdown;
-
- int ii;
- // test all mixdowns until an authorized, supported mixdown is found
- // stop before we reach the "worst" non-None mixdown (index == 1)
- for (ii = hb_audio_mixdowns_count - 1; ii > 1; ii--)
- if (hb_audio_mixdowns[ii].amixdown <= mixdown &&
- hb_mixdown_is_supported(hb_audio_mixdowns[ii].amixdown, codec, layout))
- break;
- return hb_audio_mixdowns[ii].amixdown;
+ int best_mixdown = HB_INVALID_AMIXDOWN;
+ const hb_mixdown_t *audio_mixdown = hb_mixdown_get_next(NULL);
+ // test all non-None mixdowns while the value is <= the requested mixdown
+ // HB_INVALID_AMIXDOWN means the highest supported mixdown was requested
+ while ((audio_mixdown = hb_mixdown_get_next(audio_mixdown)) != NULL)
+ {
+ if ((mixdown == HB_INVALID_AMIXDOWN || audio_mixdown->amixdown <= mixdown) &&
+ (hb_mixdown_is_supported(audio_mixdown->amixdown, codec, layout)))
+ {
+ best_mixdown = audio_mixdown->amixdown;
+ }
+ }
+ return best_mixdown;
 }
 
-int hb_get_default_mixdown(uint32_t codec, uint64_t layout)
+int hb_mixdown_get_default(uint32_t codec, uint64_t layout)
 {
 int mixdown;
 switch (codec)
@@ -1016,69 +1616,673 @@
 case HB_ACODEC_FFFLAC24:
 mixdown = HB_AMIXDOWN_7POINT1;
 break;
+
 // the AC3 encoder defaults to the best mixdown up to 5.1
 case HB_ACODEC_AC3:
 mixdown = HB_AMIXDOWN_5POINT1;
 break;
+
 // other encoders default to the best mixdown up to DPLII
 default:
 mixdown = HB_AMIXDOWN_DOLBYPLII;
 break;
 }
+
 // return the best available mixdown up to the selected default
- return hb_get_best_mixdown(codec, layout, mixdown);
+ return hb_mixdown_get_best(codec, layout, mixdown);
 }
 
-int hb_get_best_samplerate(uint32_t codec, int samplerate, int *sr_shift)
+int hb_mixdown_get_from_name(const char *name)
 {
- int ii, best_samplerate, samplerate_shift;
- if ((samplerate < 32000) &&
- (codec == HB_ACODEC_CA_HAAC || codec == HB_ACODEC_AC3))
+ if (name == NULL || *name == '\0')
+ goto fail;
+
+ int i;
+ for (i = 0; i < hb_audio_mixdowns_count; i++)
 {
- // ca_haac can't do samplerates < 32 kHz
- // AC-3 < 32 kHz suffers from poor hardware compatibility
- best_samplerate = 32000;
- samplerate_shift = 0;
+ if (!strcasecmp(hb_audio_mixdowns[i].item.name, name) ||
+ !strcasecmp(hb_audio_mixdowns[i].item.short_name, name))
+ {
+ return hb_audio_mixdowns[i].item.amixdown;
+ }
 }
- else if (samplerate < 16000 && codec == HB_ACODEC_FDK_HAAC)
+
+fail:
+ return HB_INVALID_AMIXDOWN;
+}
+
+const char* hb_mixdown_get_name(int mixdown)
+{
+ if (mixdown < hb_audio_mixdowns_first_item->amixdown ||
+ mixdown > hb_audio_mixdowns_last_item ->amixdown)
+ goto fail;
+
+ const hb_mixdown_t *audio_mixdown = NULL;
+ while ((audio_mixdown = hb_mixdown_get_next(audio_mixdown)) != NULL)
 {
- // fdk_haac can't do samplerates < 16 kHz
- best_samplerate = 16000;
- samplerate_shift = 1;
+ if (audio_mixdown->amixdown == mixdown)
+ {
+ return audio_mixdown->name;
+ }
+ }
+
+fail:
+ return NULL;
+}
+
+const char* hb_mixdown_get_short_name(int mixdown)
+{
+ if (mixdown < hb_audio_mixdowns_first_item->amixdown ||
+ mixdown > hb_audio_mixdowns_last_item ->amixdown)
+ goto fail;
+
+ const hb_mixdown_t *audio_mixdown = NULL;
+ while ((audio_mixdown = hb_mixdown_get_next(audio_mixdown)) != NULL)
+ {
+ if (audio_mixdown->amixdown == mixdown)
+ {
+ return audio_mixdown->short_name;
+ }
+ }
+
+fail:
+ return NULL;
+}
+
+const char* hb_mixdown_sanitize_name(const char *name)
+{
+ return hb_mixdown_get_name(hb_mixdown_get_from_name(name));
+}
+
+const hb_mixdown_t* hb_mixdown_get_next(const hb_mixdown_t *last)
+{
+ if (last == NULL)
+ {
+ return hb_audio_mixdowns_first_item;
+ }
+ return ((hb_mixdown_internal_t*)last)->next;
+}
+
+int hb_video_encoder_get_default(int muxer)
+{
+ if (!(muxer & HB_MUX_MASK))
+ goto fail;
+
+ const hb_encoder_t *video_encoder = NULL;
+ while ((video_encoder = hb_video_encoder_get_next(video_encoder)) != NULL)
+ {
+ if (video_encoder->muxers & muxer)
+ {
+ return video_encoder->codec;
+ }
+ }
+
+fail:
+ return 0;
+}
+
+int hb_video_encoder_get_from_name(const char *name)
+{
+ if (name == NULL || *name == '\0')
+ goto fail;
+
+ int i;
+ for (i = 0; i < hb_video_encoders_count; i++)
+ {
+ if (!strcasecmp(hb_video_encoders[i].item.name, name) ||
+ !strcasecmp(hb_video_encoders[i].item.short_name, name))
+ {
+ return hb_video_encoders[i].item.codec;
+ }
+ }
+
+fail:
+ return 0;
+}
+
+const char* hb_video_encoder_get_name(int encoder)
+{
+ if (!(encoder & HB_VCODEC_MASK))
+ goto fail;
+
+ const hb_encoder_t *video_encoder = NULL;
+ while ((video_encoder = hb_video_encoder_get_next(video_encoder)) != NULL)
+ {
+ if (video_encoder->codec == encoder)
+ {
+ return video_encoder->name;
+ }
+ }
+
+fail:
+ return NULL;
+}
+
+const char* hb_video_encoder_get_short_name(int encoder)
+{
+ if (!(encoder & HB_VCODEC_MASK))
+ goto fail;
+
+ const hb_encoder_t *video_encoder = NULL;
+ while ((video_encoder = hb_video_encoder_get_next(video_encoder)) != NULL)
+ {
+ if (video_encoder->codec == encoder)
+ {
+ return video_encoder->short_name;
+ }
+ }
+
+fail:
+ return NULL;
+}
+
+const char* hb_video_encoder_get_long_name(int encoder)
+{
+ if (!(encoder & HB_VCODEC_MASK))
+ goto fail;
+
+ const hb_encoder_t *video_encoder = NULL;
+ while ((video_encoder = hb_video_encoder_get_next(video_encoder)) != NULL)
+ {
+ if (video_encoder->codec == encoder)
+ {
+ return video_encoder->long_name;
+ }
+ }
+
+fail:
+ return NULL;
+}
+
+const char* hb_video_encoder_sanitize_name(const char *name)
+{
+ return hb_video_encoder_get_name(hb_video_encoder_get_from_name(name));
+}
+
+const hb_encoder_t* hb_video_encoder_get_next(const hb_encoder_t *last)
+{
+ if (last == NULL)
+ {
+ return hb_video_encoders_first_item;
+ }
+ return ((hb_encoder_internal_t*)last)->next;
+}
+
+// for a valid passthru, return the matching encoder for that codec (if any),
+// else return -1 (i.e. drop the track)
+int hb_audio_encoder_get_fallback_for_passthru(int passthru)
+{
+ int gid;
+ const hb_encoder_t *audio_encoder = NULL;
+ switch (passthru)
+ {
+ case HB_ACODEC_AAC_PASS:
+ gid = HB_GID_ACODEC_AAC;
+ break;
+
+ case HB_ACODEC_AC3_PASS:
+ gid = HB_GID_ACODEC_AC3;
+ break;
+
+ case HB_ACODEC_MP3_PASS:
+ gid = HB_GID_ACODEC_MP3;
+ break;
+
+ default:
+ gid = HB_GID_NONE; // will never match an enabled encoder
+ break;
+ }
+ while ((audio_encoder = hb_audio_encoder_get_next(audio_encoder)) != NULL)
+ {
+ if (((hb_encoder_internal_t*)audio_encoder)->gid == gid)
+ {
+ return audio_encoder->codec;
+ }
+ }
+
+ // passthru tracks are often the second audio from the same source track
+ // if we don't have an encoder matching the passthru codec, return 0
+ // dropping the track, as well as ensuring that there is at least one
+ // audio track in the output is then up to the UIs
+ return 0;
+}
+
+int hb_audio_encoder_get_default(int muxer)
+{
+ if (!(muxer & HB_MUX_MASK))
+ goto fail;
+
+ int codec = 0;
+ const hb_encoder_t *audio_encoder = NULL;
+ while ((audio_encoder = hb_audio_encoder_get_next(audio_encoder)) != NULL)
+ {
+ // default encoder should not be passthru
+ if ((audio_encoder->muxers & muxer) &&
+ (audio_encoder->codec & HB_ACODEC_PASS_FLAG) == 0)
+ {
+ codec = audio_encoder->codec;
+ break;
+ }
+ }
+
+ // Lame is better than our low-end AAC encoders
+ // if the container is MKV, use the former
+ // AAC is still used when the container is MP4 (for better compatibility)
+ if (codec == HB_ACODEC_FFAAC && (muxer & HB_MUX_MASK_MKV) == muxer)
+ {
+ return HB_ACODEC_LAME;
 }
 else
 {
- best_samplerate = samplerate;
- for (ii = hb_audio_rates_count - 1; ii >= 0; ii--)
+ return codec;
+ }
+
+fail:
+ return 0;
+}
+
+int hb_audio_encoder_get_from_name(const char *name)
+{
+ if (name == NULL || *name == '\0')
+ goto fail;
+
+ int i;
+ for (i = 0; i < hb_audio_encoders_count; i++)
+ {
+ if (!strcasecmp(hb_audio_encoders[i].item.name, name) ||
+ !strcasecmp(hb_audio_encoders[i].item.short_name, name))
 {
- // valid samplerate
- if (best_samplerate == hb_audio_rates[ii].rate)
- break;
+ return hb_audio_encoders[i].item.codec;
+ }
+ }
 
- // samplerate is higher than the next valid samplerate,
- // or lower than the lowest valid samplerate
- if (best_samplerate > hb_audio_rates[ii].rate || ii == 0)
+fail:
+ return 0;
+}
+
+const char* hb_audio_encoder_get_name(int encoder)
+{
+ if (!(encoder & HB_ACODEC_ANY))
+ goto fail;
+
+ const hb_encoder_t *audio_encoder = NULL;
+ while ((audio_encoder = hb_audio_encoder_get_next(audio_encoder)) != NULL)
+ {
+ if (audio_encoder->codec == encoder)
+ {
+ return audio_encoder->name;
+ }
+ }
+
+fail:
+ return NULL;
+}
+
+const char* hb_audio_encoder_get_short_name(int encoder)
+{
+ if (!(encoder & HB_ACODEC_ANY))
+ goto fail;
+
+ const hb_encoder_t *audio_encoder = NULL;
+ while ((audio_encoder = hb_audio_encoder_get_next(audio_encoder)) != NULL)
+ {
+ if (audio_encoder->codec == encoder)
+ {
+ return audio_encoder->short_name;
+ }
+ }
+
+fail:
+ return NULL;
+}
+
+const char* hb_audio_encoder_get_long_name(int encoder)
+{
+ if (!(encoder & HB_ACODEC_ANY))
+ goto fail;
+
+ const hb_encoder_t *audio_encoder = NULL;
+ while ((audio_encoder = hb_audio_encoder_get_next(audio_encoder)) != NULL)
+ {
+ if (audio_encoder->codec == encoder)
+ {
+ return audio_encoder->long_name;
+ }
+ }
+
+fail:
+ return NULL;
+}
+
+const char* hb_audio_encoder_sanitize_name(const char *name)
+{
+ return hb_audio_encoder_get_name(hb_audio_encoder_get_from_name(name));
+}
+
+const hb_encoder_t* hb_audio_encoder_get_next(const hb_encoder_t *last)
+{
+ if (last == NULL)
+ {
+ return hb_audio_encoders_first_item;
+ }
+ return ((hb_encoder_internal_t*)last)->next;
+}
+
+void hb_autopassthru_apply_settings(hb_job_t *job)
+{
+ hb_audio_t *audio;
+ int i, already_printed;
+ for (i = already_printed = 0; i < hb_list_count(job->list_audio);)
+ {
+ audio = hb_list_item(job->list_audio, i);
+ if (audio->config.out.codec == HB_ACODEC_AUTO_PASS)
+ {
+ if (!already_printed)
+ hb_autopassthru_print_settings(job);
+ already_printed = 1;
+ audio->config.out.codec = hb_autopassthru_get_encoder(audio->config.in.codec,
+ job->acodec_copy_mask,
+ job->acodec_fallback,
+ job->mux);
+ if (!(audio->config.out.codec & HB_ACODEC_PASS_FLAG) &&
+ !(audio->config.out.codec & HB_ACODEC_MASK))
 {
- best_samplerate = hb_audio_rates[ii].rate;
- break;
+ hb_log("Auto Passthru: passthru not possible and no valid fallback specified, dropping track %d",
+ audio->config.out.track );
+ hb_list_rem(job->list_audio, audio);
+ hb_audio_close(&audio);
+ continue;
+ }
+ if (!(audio->config.out.codec & HB_ACODEC_PASS_FLAG))
+ {
+ if (audio->config.out.codec == job->acodec_fallback)
+ {
+ hb_log("Auto Passthru: passthru not possible for track %d, using fallback",
+ audio->config.out.track);
+ }
+ else
+ {
+ hb_log("Auto Passthru: passthru and fallback not possible for track %d, using default encoder",
+ audio->config.out.track);
+ }
+ if (audio->config.out.mixdown <= 0)
+ {
+ audio->config.out.mixdown =
+ hb_mixdown_get_default(audio->config.out.codec,
+ audio->config.in.channel_layout);
+ }
+ else
+ {
+ audio->config.out.mixdown =
+ hb_mixdown_get_best(audio->config.out.codec,
+ audio->config.in.channel_layout,
+ audio->config.out.mixdown);
+ }
+ if (audio->config.out.samplerate <= 0)
+ audio->config.out.samplerate = audio->config.in.samplerate;
+ audio->config.out.samplerate =
+ hb_audio_samplerate_get_best(audio->config.out.codec,
+ audio->config.out.samplerate,
+ NULL);
+ int quality_not_allowed =
+ hb_audio_quality_get_default(audio->config.out.codec)
+ == HB_INVALID_AUDIO_QUALITY;
+ if (audio->config.out.bitrate > 0)
+ {
+ // Use best bitrate
+ audio->config.out.bitrate =
+ hb_audio_bitrate_get_best(audio->config.out.codec,
+ audio->config.out.bitrate,
+ audio->config.out.samplerate,
+ audio->config.out.mixdown);
+ }
+ else if (quality_not_allowed ||
+ audio->config.out.quality != HB_INVALID_AUDIO_QUALITY)
+ {
+ // Use default bitrate
+ audio->config.out.bitrate =
+ hb_audio_bitrate_get_default(audio->config.out.codec,
+ audio->config.out.samplerate,
+ audio->config.out.mixdown);
+ }
+ else
+ {
+ // Use best quality
+ audio->config.out.quality =
+ hb_audio_quality_get_best(audio->config.out.codec,
+ audio->config.out.quality);
+ }
+ if (audio->config.out.compression_level < 0)
+ {
+ audio->config.out.compression_level =
+ hb_audio_compression_get_default(
+ audio->config.out.codec);
+ }
+ else
+ {
+ audio->config.out.compression_level =
+ hb_audio_compression_get_best(audio->config.out.codec,
+ audio->config.out.compression_level);
+ }
+ }
+ else
+ {
+ const hb_encoder_t *audio_encoder = NULL;
+ while ((audio_encoder = hb_audio_encoder_get_next(audio_encoder)) != NULL)
+ {
+ if (audio_encoder->codec == audio->config.out.codec)
+ {
+ hb_log("Auto Passthru: using %s for track %d",
+ audio_encoder->name,
+ audio->config.out.track);
+ break;
+ }
+ }
 }
 }
- /* sr_shift: 0 -> 48000, 44100, 32000 Hz
- * 1 -> 24000, 22050, 16000 Hz
- * 2 -> 12000, 11025, 8000 Hz
- *
- * also, since samplerates are sanitized downwards:
- *
- * (samplerate < 32000) implies (samplerate <= 24000)
- */
- samplerate_shift = ((best_samplerate < 16000) ? 2 :
- (best_samplerate < 32000) ? 1 : 0);
+ /* Adjust output track number, in case we removed one.
+ * Output tracks sadly still need to be in sequential order.
+ * Note: out.track starts at 1, i starts at 0 */
+ audio->config.out.track = ++i;
 }
- if (sr_shift != NULL)
+}
+
+void hb_autopassthru_print_settings(hb_job_t *job)
+{
+ char *mask = NULL, *tmp;
+ const char *fallback = NULL;
+ const hb_encoder_t *audio_encoder = NULL;
+ while ((audio_encoder = hb_audio_encoder_get_next(audio_encoder)) != NULL)
 {
- *sr_shift = samplerate_shift;
+ if ((audio_encoder->codec & HB_ACODEC_PASS_FLAG) &&
+ (audio_encoder->codec != HB_ACODEC_AUTO_PASS) &&
+ (audio_encoder->codec & job->acodec_copy_mask))
+ {
+ if (mask != NULL)
+ {
+ tmp = hb_strncat_dup(mask, ", ", 2);
+ if (tmp != NULL)
+ {
+ free(mask);
+ mask = tmp;
+ }
+ }
+ // passthru name without " Passthru"
+ tmp = hb_strncat_dup(mask, audio_encoder->name,
+ strlen(audio_encoder->name) - 9);
+ if (tmp != NULL)
+ {
+ free(mask);
+ mask = tmp;
+ }
+ }
+ else if ((audio_encoder->codec & HB_ACODEC_PASS_FLAG) == 0 &&
+ (audio_encoder->codec == job->acodec_fallback))
+ {
+ fallback = audio_encoder->name;
+ }
 }
- return best_samplerate;
+ if (mask == NULL)
+ hb_log("Auto Passthru: no codecs allowed");
+ else
+ hb_log("Auto Passthru: allowed codecs are %s", mask);
+ if (fallback == NULL)
+ hb_log("Auto Passthru: no valid fallback specified");
+ else
+ hb_log("Auto Passthru: fallback is %s", fallback);
+}
+
+int hb_autopassthru_get_encoder(int in_codec, int copy_mask, int fallback,
+ int muxer)
+{
+ int i = 0;
+ const hb_encoder_t *audio_encoder = NULL;
+ int out_codec = (copy_mask & in_codec) | HB_ACODEC_PASS_FLAG;
+ // sanitize fallback encoder and selected passthru
+ // note: invalid fallbacks are caught in hb_autopassthru_apply_settings
+ while ((audio_encoder = hb_audio_encoder_get_next(audio_encoder)) != NULL)
+ {
+ if (audio_encoder->codec == out_codec)
+ {
+ i++;
+ if (!(audio_encoder->muxers & muxer))
+ out_codec = 0;
+ }
+ else if (audio_encoder->codec == fallback)
+ {
+ i++;
+ if (!(audio_encoder->muxers & muxer))
+ fallback = hb_audio_encoder_get_default(muxer);
+ }
+ if (i > 1)
+ {
+ break;
+ }
+ }
+ return (out_codec & HB_ACODEC_PASS_MASK) ? out_codec : fallback;
+}
+
+int hb_container_get_from_name(const char *name)
+{
+ if (name == NULL || *name == '\0')
+ goto fail;
+
+ int i;
+ for (i = 0; i < hb_containers_count; i++)
+ {
+ if (!strcasecmp(hb_containers[i].item.name, name) ||
+ !strcasecmp(hb_containers[i].item.short_name, name))
+ {
+ return hb_containers[i].item.format;
+ }
+ }
+
+fail:
+ return 0;
+}
+
+int hb_container_get_from_extension(const char *extension)
+{
+ if (extension == NULL || *extension == '\0')
+ goto fail;
+
+ int i;
+ for (i = 0; i < hb_containers_count; i++)
+ {
+ if (!strcasecmp(hb_containers[i].item.default_extension, extension))
+ {
+ return hb_containers[i].item.format;
+ }
+ }
+
+fail:
+ return 0;
+}
+
+const char* hb_container_get_name(int format)
+{
+ if (!(format & HB_MUX_MASK))
+ goto fail;
+
+ const hb_container_t *container = NULL;
+ while ((container = hb_container_get_next(container)) != NULL)
+ {
+ if (container->format == format)
+ {
+ return container->name;
+ }
+ }
+
+fail:
+ return NULL;
+}
+
+const char* hb_container_get_short_name(int format)
+{
+ if (!(format & HB_MUX_MASK))
+ goto fail;
+
+ const hb_container_t *container = NULL;
+ while ((container = hb_container_get_next(container)) != NULL)
+ {
+ if (container->format == format)
+ {
+ return container->short_name;
+ }
+ }
+
+fail:
+ return NULL;
+}
+
+const char* hb_container_get_long_name(int format)
+{
+ if (!(format & HB_MUX_MASK))
+ goto fail;
+
+ const hb_container_t *container = NULL;
+ while ((container = hb_container_get_next(container)) != NULL)
+ {
+ if (container->format == format)
+ {
+ return container->long_name;
+ }
+ }
+
+fail:
+ return NULL;
+}
+
+const char* hb_container_get_default_extension(int format)
+{
+ if (!(format & HB_MUX_MASK))
+ goto fail;
+
+ const hb_container_t *container = NULL;
+ while ((container = hb_container_get_next(container)) != NULL)
+ {
+ if (container->format == format)
+ {
+ return container->default_extension;
+ }
+ }
+
+fail:
+ return NULL;
+}
+
+const char* hb_container_sanitize_name(const char *name)
+{
+ return hb_container_get_name(hb_container_get_from_name(name));
+}
+
+const hb_container_t* hb_container_get_next(const hb_container_t *last)
+{
+ if (last == NULL)
+ {
+ return hb_containers_first_item;
+ }
+ return ((hb_container_internal_t*)last)->next;
 }
 
 /**********************************************************************
@@ -1169,74 +2373,6 @@
 }
 
 /**********************************************************************
- * hb_fix_aspect
- **********************************************************************
- * Given the output width (if HB_KEEP_WIDTH) or height
- * (HB_KEEP_HEIGHT) and the current crop values, calculates the
- * correct height or width in order to respect the DVD aspect ratio
- *********************************************************************/
-void hb_fix_aspect( hb_job_t * job, int keep )
-{
- hb_title_t * title = job->title;
- int i;
- int min_width;
- int min_height;
- int modulus;
-
- /* don't do anything unless the title has complete size info */
- if ( title->height == 0 || title->width == 0 || title->aspect == 0 )
- {
- hb_log( "hb_fix_aspect: incomplete info for title %d: "
- "height = %d, width = %d, aspect = %.3f",
- title->index, title->height, title->width, title->aspect );
- return;
- }
-
- // min_width and min_height should be multiples of modulus
- min_width = 32;
- min_height = 32;
- modulus = job->modulus ? job->modulus : 16;
-
- for( i = 0; i < 4; i++ )
- {
- // Sanity check crop values are zero or positive multiples of 2
- if( i < 2 )
- {
- // Top, bottom
- job->crop[i] = MIN( EVEN( job->crop[i] ), EVEN( ( title->height / 2 ) - ( min_height / 2 ) ) );
- job->crop[i] = MAX( 0, job->crop[i] );
- }
- else
- {
- // Left, right
- job->crop[i] = MIN( EVEN( job->crop[i] ), EVEN( ( title->width / 2 ) - ( min_width / 2 ) ) );
- job->crop[i] = MAX( 0, job->crop[i] );
- }
- }
-
- double par = (double)title->width / ( (double)title->height * title->aspect );
- double cropped_sar = (double)( title->height - job->crop[0] - job->crop[1] ) /
- (double)( title->width - job->crop[2] - job->crop[3] );
- double ar = par * cropped_sar;
-
- // Dimensions must be greater than minimum and multiple of modulus
- if( keep == HB_KEEP_WIDTH )
- {
- job->width = MULTIPLE_MOD( job->width, modulus );
- job->width = MAX( min_width, job->width );
- job->height = MULTIPLE_MOD( (uint64_t)( (double)job->width * ar ), modulus );
- job->height = MAX( min_height, job->height );
- }
- else
- {
- job->height = MULTIPLE_MOD( job->height, modulus );
- job->height = MAX( min_height, job->height );
- job->width = MULTIPLE_MOD( (uint64_t)( (double)job->height / ar ), modulus );
- job->width = MAX( min_width, job->width );
- }
-}
-
-/**********************************************************************
 * hb_list implementation
 **********************************************************************
 * Basic and slow, but enough for what we need
@@ -1557,6 +2693,21 @@
 /* Add the end of line */
 strcat( string, "\n" );
 
+#ifdef SYS_MINGW
+ wchar_t wstring[2*362]; /* 360 chars + \n + \0 */
+
+ // Convert internal utf8 to "console output code page".
+ //
+ // This is just bizarre windows behavior. You would expect that
+ // printf would automatically convert a wide character string to
+ // the current "console output code page" when using the "%ls" format
+ // specifier. But it doesn't... so we must do it.
+ if (!MultiByteToWideChar(CP_UTF8, 0, string, -1, wstring, sizeof(wstring)))
+ return;
+ if (!WideCharToMultiByte(GetConsoleOutputCP(), 0, wstring, -1, string, sizeof(string), NULL, NULL))
+ return;
+#endif
+
 /* Print it */
 fprintf( stderr, "%s", string );
 }
@@ -1633,9 +2784,9 @@
 {
 hb_unlock( mutex );
 return;
- } 
+ }
 }
- 
+
 /*
 * A new error, or the same one more than 10sec since the last one
 * did we have any of the same counted up?
@@ -1643,7 +2794,7 @@
 if( last_error_count > 0 )
 {
 /*
- * Print out the last error to ensure context for the last 
+ * Print out the last error to ensure context for the last
 * repeated message.
 */
 if( error_handler )
@@ -1652,16 +2803,16 @@
 } else {
 hb_log( "%s", last_string );
 }
- 
+
 if( last_error_count > 1 )
 {
 /*
 * Only print out the repeat message for more than 2 of the
 * same, since we just printed out two of them already.
 */
- snprintf( rep_string, 180, "Last error repeated %d times", 
+ snprintf( rep_string, 180, "Last error repeated %d times",
 last_error_count - 1 );
- 
+
 if( error_handler )
 {
 error_handler( rep_string );
@@ -1669,7 +2820,7 @@
 hb_log( "%s", rep_string );
 }
 }
- 
+
 last_error_count = 0;
 }
 
@@ -1729,7 +2880,8 @@
 strcat( t->path, path );
 // default to decoding mpeg2
 t->video_id = 0xE0;
- t->video_codec = WORK_DECMPEG2;
+ t->video_codec = WORK_DECAVCODECV;
+ t->video_codec_param = AV_CODEC_ID_MPEG2VIDEO;
 t->angle_count = 1;
 t->pixel_aspect_width = 1;
 t->pixel_aspect_height = 1;
@@ -1770,7 +2922,7 @@
 hb_subtitle_close( &subtitle );
 }
 hb_list_close( &t->list_subtitle );
- 
+
 while( ( attachment = hb_list_item( t->list_attachment, 0 ) ) )
 {
 hb_list_rem( t->list_attachment, attachment );
@@ -1826,6 +2978,7 @@
 job->metadata = hb_metadata_copy( title->metadata );
 }
 
+
 static void job_setup( hb_job_t * job, hb_title_t * title )
 {
 if ( job == NULL || title == NULL )
@@ -1856,14 +3009,15 @@
 }
 
 job->width = title->width - job->crop[2] - job->crop[3];
- hb_fix_aspect( job, HB_KEEP_WIDTH );
- if( job->height > title->height - job->crop[0] - job->crop[1] )
- {
- job->height = title->height - job->crop[0] - job->crop[1];
- hb_fix_aspect( job, HB_KEEP_HEIGHT );
- }
+ job->height = title->height - job->crop[0] - job->crop[1];
+ job->anamorphic.keep_display_aspect = 1;
 
- job->keep_ratio = 1;
+ int width, height, par_width, par_height;
+ hb_set_anamorphic_size(job, &width, &height, &par_width, &par_height);
+ job->width = width;
+ job->height = height;
+ job->anamorphic.par_width = par_width;
+ job->anamorphic.par_height = par_height;
 
 job->vcodec = HB_VCODEC_FFMPEG_MPEG4;
 job->vquality = -1.0;
@@ -1880,6 +3034,13 @@
 
 job->list_attachment = hb_attachment_list_copy( title->list_attachment );
 job->metadata = hb_metadata_copy( title->metadata );
+
+#ifdef USE_QSV
+ job->qsv.enc_info.is_init_done = 0;
+ job->qsv.async_depth = AV_QSV_ASYNC_DEPTH_DEFAULT;
+ job->qsv.decode = !!(title->video_decode_support &
+ HB_DECODE_SUPPORT_QSV);
+#endif
 }
 
 static void job_clean( hb_job_t * job )
@@ -1892,18 +3053,18 @@
 hb_filter_object_t *filter;
 hb_attachment_t *attachment;
 
+ free(job->encoder_preset);
+ job->encoder_preset = NULL;
+ free(job->encoder_tune);
+ job->encoder_tune = NULL;
+ free(job->encoder_options);
+ job->encoder_options = NULL;
+ free(job->encoder_profile);
+ job->encoder_profile = NULL;
+ free(job->encoder_level);
+ job->encoder_level = NULL;
 free(job->file);
 job->file = NULL;
- free(job->advanced_opts);
- job->advanced_opts = NULL;
- free(job->x264_preset);
- job->x264_preset = NULL;
- free(job->x264_tune);
- job->x264_tune = NULL;
- free(job->h264_profile);
- job->h264_profile = NULL;
- free(job->h264_level);
- job->h264_level = NULL;
 
 // clean up chapter list
 while( ( chapter = hb_list_item( job->list_chapter, 0 ) ) )
@@ -1950,6 +3111,22 @@
 }
 }
 
+hb_title_t * hb_find_title_by_index( hb_handle_t *h, int title_index )
+{
+ hb_title_set_t *title_set = hb_get_title_set( h );
+ int ii;
+
+ for (ii = 0; ii < hb_list_count(title_set->list_title); ii++)
+ {
+ hb_title_t *title = hb_list_item(title_set->list_title, ii);
+ if (title_index == title->index)
+ {
+ return title;
+ }
+ }
+ return NULL;
+}
+
 /*
 * Create a pristine job structure from a title
 * title_index is 1 based
@@ -2009,51 +3186,51 @@
 }
 }
 
-void hb_job_set_file( hb_job_t *job, const char *file )
+void hb_job_set_encoder_preset(hb_job_t *job, const char *preset)
 {
- if ( job )
+ if (job != NULL)
 {
- hb_update_str( &job->file, file );
+ hb_update_str(&job->encoder_preset, preset);
 }
 }
 
-void hb_job_set_advanced_opts( hb_job_t *job, const char *advanced_opts )
+void hb_job_set_encoder_tune(hb_job_t *job, const char *tune)
 {
- if ( job )
+ if (job != NULL)
 {
- hb_update_str( &job->advanced_opts, advanced_opts );
+ hb_update_str(&job->encoder_tune, tune);
 }
 }
 
-void hb_job_set_x264_preset( hb_job_t *job, const char *preset )
+void hb_job_set_encoder_options(hb_job_t *job, const char *options)
 {
- if ( job )
+ if (job != NULL)
 {
- hb_update_str( &job->x264_preset, preset );
+ hb_update_str(&job->encoder_options, options);
 }
 }
 
-void hb_job_set_x264_tune( hb_job_t *job, const char *tune )
+void hb_job_set_encoder_profile(hb_job_t *job, const char *profile)
 {
- if ( job )
+ if (job != NULL)
 {
- hb_update_str( &job->x264_tune, tune );
+ hb_update_str(&job->encoder_profile, profile);
 }
 }
 
-void hb_job_set_h264_profile( hb_job_t *job, const char *profile )
+void hb_job_set_encoder_level(hb_job_t *job, const char *level)
 {
- if ( job )
+ if (job != NULL)
 {
- hb_update_str( &job->h264_profile, profile );
+ hb_update_str(&job->encoder_level, level);
 }
 }
 
-void hb_job_set_h264_level( hb_job_t *job, const char *level )
+void hb_job_set_file(hb_job_t *job, const char *file)
 {
- if ( job )
+ if (job != NULL)
 {
- hb_update_str( &job->h264_level, level );
+ hb_update_str(&job->file, file);
 }
 }
 
@@ -2127,6 +3304,10 @@
 filter = &hb_filter_denoise;
 break;
 
+ case HB_FILTER_NLMEANS:
+ filter = &hb_filter_nlmeans;
+ break;
+
 case HB_FILTER_RENDER_SUB:
 filter = &hb_filter_render_sub;
 break;
@@ -2139,6 +3320,20 @@
 filter = &hb_filter_rotate;
 break;
 
+#ifdef USE_QSV
+ case HB_FILTER_QSV:
+ filter = &hb_filter_qsv;
+ break;
+
+ case HB_FILTER_QSV_PRE:
+ filter = &hb_filter_qsv_pre;
+ break;
+
+ case HB_FILTER_QSV_POST:
+ filter = &hb_filter_qsv_post;
+ break;
+#endif
+
 default:
 filter = NULL;
 break;
@@ -2328,7 +3523,8 @@
 audiocfg->in.samplerate = -1;
 audiocfg->in.samples_per_frame = -1;
 audiocfg->in.bitrate = -1;
- audiocfg->in.channel_layout = -1;
+ audiocfg->in.matrix_encoding = AV_MATRIX_ENCODING_NONE;
+ audiocfg->in.channel_layout = 0;
 audiocfg->in.channel_map = NULL;
 audiocfg->lang.description[0] = 0;
 audiocfg->lang.simple[0] = 0;
@@ -2336,7 +3532,7 @@
 
 /* Initalize some sensible defaults */
 audiocfg->in.track = audiocfg->out.track = 0;
- audiocfg->out.codec = hb_audio_encoders[0].encoder;
+ audiocfg->out.codec = hb_audio_encoder_get_default(HB_MUX_MP4); // default container
 audiocfg->out.samplerate = -1;
 audiocfg->out.samples_per_frame = -1;
 audiocfg->out.bitrate = -1;
@@ -2376,7 +3572,7 @@
 
 /* Set the job's "in track" to the value passed in audiocfg.
 * HandBrakeCLI assumes this value is preserved in the jobs
- * audio list, but in.track in the title's audio list is not 
+ * audio list, but in.track in the title's audio list is not
 * required to be the same. */
 audio->config.in.track = audiocfg->in.track;
 
@@ -2498,6 +3694,39 @@
 **********************************************************************
 *
 *********************************************************************/
+int hb_subtitle_add_ssa_header(hb_subtitle_t *subtitle, int w, int h)
+{
+ // Free any pre-existing extradata
+ free(subtitle->extradata);
+
+ int fs = h * .066;
+
+ // SRT subtitles are represented internally as SSA
+ // Create an SSA header
+ const char * ssa_header =
+ "[Script Info]\r\n"
+ "ScriptType: v4.00+\r\n"
+ "Collisions: Normal\r\n"
+ "PlayResX: %d\r\n"
+ "PlayResY: %d\r\n"
+ "Timer: 100.0\r\n"
+ "WrapStyle: 0\r\n"
+ "\r\n"
+ "[V4+ Styles]\r\n"
+ "Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\r\n"
+ "Style: Default,Arial,%d,&H00FFFFFF,&H00FFFFFF,&H000F0F0F,&H000F0F0F,0,0,0,0,100,100,0,0.00,1,2,3,2,20,20,20,0\r\n";
+
+ subtitle->extradata = (uint8_t*)hb_strdup_printf(ssa_header, w, h, fs);
+ if (subtitle->extradata == NULL)
+ {
+ hb_error("hb_subtitle_add_ssa_header: malloc failed");
+ return 0;
+ }
+ subtitle->extradata_size = strlen((char*)subtitle->extradata) + 1;
+
+ return 1;
+}
+
 int hb_subtitle_add(const hb_job_t * job, const hb_subtitle_config_t * subtitlecfg, int track)
 {
 hb_title_t *title = job->title;
@@ -2509,42 +3738,45 @@
 /* We fail! */
 return 0;
 }
+
 subtitle->config = *subtitlecfg;
 subtitle->out_track = hb_list_count(job->list_subtitle) + 1;
 hb_list_add(job->list_subtitle, subtitle);
 return 1;
 }
 
-int hb_srt_add( const hb_job_t * job, 
- const hb_subtitle_config_t * subtitlecfg, 
+int hb_srt_add( const hb_job_t * job,
+ const hb_subtitle_config_t * subtitlecfg,
 const char *lang )
 {
 hb_subtitle_t *subtitle;
 iso639_lang_t *language = NULL;
- int retval = 0;
 
 subtitle = calloc( 1, sizeof( *subtitle ) );
- 
+ if (subtitle == NULL)
+ {
+ hb_error("hb_srt_add: malloc failed");
+ return 0;
+ }
+
 subtitle->id = (hb_list_count(job->list_subtitle) << 8) | 0xFF;
 subtitle->format = TEXTSUB;
 subtitle->source = SRTSUB;
 subtitle->codec = WORK_DECSRTSUB;
 
- language = lang_for_code2( lang );
-
- if( language )
+ language = lang_for_code2(lang);
+ if (language == NULL)
 {
+ hb_log("hb_srt_add: unknown language code (%s)", lang);
+ language = lang_for_code2("und");
+ }
+ strcpy(subtitle->lang, language->eng_name);
+ strcpy(subtitle->iso639_2, language->iso639_2);
 
- strcpy( subtitle->lang, language->eng_name );
- strncpy( subtitle->iso639_2, lang, 4 );
- 
- subtitle->config = *subtitlecfg;
- subtitle->config.dest = PASSTHRUSUB;
+ subtitle->config = *subtitlecfg;
+ hb_list_add(job->list_subtitle, subtitle);
 
- hb_list_add(job->list_subtitle, subtitle);
- retval = 1;
- }
- return retval;
+ return 1;
 }
 
 int hb_subtitle_can_force( int source )
@@ -2554,50 +3786,79 @@
 
 int hb_subtitle_can_burn( int source )
 {
- return source == VOBSUB || source == PGSSUB || source == SSASUB;
+ return source == VOBSUB || source == PGSSUB || source == SSASUB ||
+ source == SRTSUB || source == CC608SUB || source == UTF8SUB ||
+ source == TX3GSUB;
 }
 
 int hb_subtitle_can_pass( int source, int mux )
 {
- if ( mux == HB_MUX_MKV )
+ switch (mux)
 {
- switch( source )
- {
- case PGSSUB:
- case VOBSUB:
- case SSASUB:
- case SRTSUB:
- case UTF8SUB:
- case TX3GSUB:
- case CC608SUB:
- case CC708SUB:
+ case HB_MUX_AV_MKV:
+ case HB_MUX_LIBMKV:
+ switch( source )
+ {
+ case PGSSUB:
+ case VOBSUB:
+ case SSASUB:
+ case SRTSUB:
+ case UTF8SUB:
+ case TX3GSUB:
+ case CC608SUB:
+ case CC708SUB:
+ return 1;
+
+ default:
+ return 0;
+ } break;
+
+ case HB_MUX_MP4V2:
+ if (source == VOBSUB)
+ {
 return 1;
+ } // fall through to next case...
+ case HB_MUX_AV_MP4:
+ switch( source )
+ {
+ case VOBSUB:
+ case SSASUB:
+ case SRTSUB:
+ case UTF8SUB:
+ case TX3GSUB:
+ case CC608SUB:
+ case CC708SUB:
+ return 1;
 
- default:
- return 0;
- }
+ default:
+ return 0;
+ } break;
+
+ default:
+ // Internal error. Should never get here.
+ hb_error("internel error. Bad mux %d\n", mux);
+ return 0;
 }
- else if ( mux == HB_MUX_MP4 )
- {
- switch( source )
- {
- case VOBSUB:
- case SSASUB:
- case SRTSUB:
- case UTF8SUB:
- case TX3GSUB:
- case CC608SUB:
- case CC708SUB:
- return 1;
+}
 
- default:
- return 0;
- }
+int hb_audio_can_apply_drc(uint32_t codec, uint32_t codec_param, int encoder)
+{
+ if (encoder & HB_ACODEC_PASS_FLAG)
+ {
+ // can't apply DRC to passthrough audio
+ return 0;
+ }
+ else if (codec & HB_ACODEC_FF_MASK)
+ {
+ return (codec_param == AV_CODEC_ID_AC3 ||
+ codec_param == AV_CODEC_ID_EAC3);
+ }
+ else if (codec == HB_ACODEC_AC3)
+ {
+ return 1;
 }
 else
 {
- // Internal error. Should never get here.
- hb_error("internel error. Bad mux %d\n", mux);
 return 0;
 }
 }
@@ -2846,7 +4107,7 @@
 if ( str == NULL )
 return NULL;
 
- while (1) 
+ while (1)
 {
 /* Try to print in the allocated space. */
 va_start( ap, fmt );
@@ -2970,9 +4231,9 @@
 * hb_yuv2rgb
 **********************************************************************
 * Converts a YCrCb pixel to an RGB pixel.
- * 
+ *
 * This conversion is lossy (due to rounding and clamping).
- * 
+ *
 * Algorithm:
 * http://en.wikipedia.org/w/index.php?title=YCbCr&oldid=361987695#Technical_details
 *********************************************************************/
@@ -2988,15 +4249,15 @@
 r = 1.164 * (y - 16) + 1.596 * (Cr - 128);
 g = 1.164 * (y - 16) - 0.392 * (Cb - 128) - 0.813 * (Cr - 128);
 b = 1.164 * (y - 16) + 2.017 * (Cb - 128);
- 
+
 r = (r < 0) ? 0 : r;
 g = (g < 0) ? 0 : g;
 b = (b < 0) ? 0 : b;
- 
+
 r = (r > 255) ? 255 : r;
 g = (g > 255) ? 255 : g;
 b = (b > 255) ? 255 : b;
- 
+
 return (r << 16) | (g << 8) | b;
 }
 
@@ -3004,9 +4265,9 @@
 * hb_rgb2yuv
 **********************************************************************
 * Converts an RGB pixel to a YCrCb pixel.
- * 
+ *
 * This conversion is lossy (due to rounding and clamping).
- * 
+ *
 * Algorithm:
 * http://en.wikipedia.org/w/index.php?title=YCbCr&oldid=361987695#Technical_details
 *********************************************************************/
@@ -3014,7 +4275,7 @@
 {
 double r, g, b;
 int y, Cr, Cb;
- 
+
 r = (rgb >> 16) & 0xff;
 g = (rgb >> 8) & 0xff;
 b = (rgb ) & 0xff;
@@ -3022,15 +4283,15 @@
 y = 16. + ( 0.257 * r) + (0.504 * g) + (0.098 * b);
 Cb = 128. + (-0.148 * r) - (0.291 * g) + (0.439 * b);
 Cr = 128. + ( 0.439 * r) - (0.368 * g) - (0.071 * b);
- 
+
 y = (y < 0) ? 0 : y;
 Cb = (Cb < 0) ? 0 : Cb;
 Cr = (Cr < 0) ? 0 : Cr;
- 
+
 y = (y > 255) ? 255 : y;
 Cb = (Cb > 255) ? 255 : Cb;
 Cr = (Cr > 255) ? 255 : Cr;
- 
+
 return (y << 16) | (Cr << 8) | Cb;
 }
 
@@ -3095,9 +4356,20 @@
 else
 ascii[(ii & 0x0f) + 1] = '.';
 }
- ascii[ii] = 0;
 if( p != line )
 {
 hb_deep_log( level, " %-50s%20s", line, ascii );
 }
 }
+
+int hb_gui_use_hwd_flag = 0;
+int hb_use_dxva( hb_title_t * title )
+{
+ return ( (title->video_codec_param == AV_CODEC_ID_MPEG2VIDEO
+ || title->video_codec_param == AV_CODEC_ID_H264
+ || title->video_codec_param == AV_CODEC_ID_VC1
+ || title->video_codec_param == AV_CODEC_ID_WMV3
+ || title->video_codec_param == AV_CODEC_ID_MPEG4 )
+ && title->opaque_priv );
+}
+

HandBrake-0.9.9.tar.bz2/libhb/common.h -> HandBrake-0.10.0.tar.bz2/libhb/common.h Changed

@@ -1,6 +1,6 @@
 /* common.h
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -59,11 +59,14 @@
 #define MAX( a, b ) ( (a) > (b) ? (a) : (b) )
 #endif
 
-#define EVEN( a ) ( (a) + ( (a) & 1 ) )
-#define MULTIPLE_16( a ) ( 16 * ( ( (a) + 8 ) / 16 ) )
-#define MULTIPLE_MOD( a, b ) ((b==1)?a:( b * ( ( (a) + (b / 2) - 1) / b ) ))
-#define MULTIPLE_MOD_UP( a, b ) ((b==1)?a:( b * ( ( (a) + (b) - 1) / b ) ))
-#define MULTIPLE_MOD_DOWN( a, b ) ((b==1)?a:( b * ( (a) / b ) ))
+#ifndef HB_DEBUG_ASSERT
+#define HB_DEBUG_ASSERT(x, y) { if ((x)) { hb_error("ASSERT: %s", y); exit(1); } }
+#endif
+
+#define EVEN( a ) ((a) + ((a) & 1))
+#define MULTIPLE_MOD(a, b) (((b) * (int)(((a) + ((b) / 2)) / (b))))
+#define MULTIPLE_MOD_UP(a, b) (((b) * (int)(((a) + ((b) - 1)) / (b))))
+#define MULTIPLE_MOD_DOWN(a, b) (((b) * (int)((a) / (b))))
 
 #define HB_DVD_READ_BUFFER_SIZE 2048
 
@@ -73,6 +76,11 @@
 typedef struct hb_dither_s hb_dither_t;
 typedef struct hb_mixdown_s hb_mixdown_t;
 typedef struct hb_encoder_s hb_encoder_t;
+typedef struct hb_container_s hb_container_t;
+typedef struct hb_rational_s hb_rational_t;
+typedef struct hb_geometry_s hb_geometry_t;
+typedef struct hb_ui_geometry_s hb_ui_geometry_t;
+typedef struct hb_image_s hb_image_t;
 typedef struct hb_job_s hb_job_t;
 typedef struct hb_title_set_s hb_title_set_t;
 typedef struct hb_title_s hb_title_t;
@@ -91,8 +99,18 @@
 typedef struct hb_filter_private_s hb_filter_private_t;
 typedef struct hb_filter_object_s hb_filter_object_t;
 typedef struct hb_buffer_s hb_buffer_t;
+typedef struct hb_buffer_settings_s hb_buffer_settings_t;
+typedef struct hb_image_format_s hb_image_format_t;
 typedef struct hb_fifo_s hb_fifo_t;
 typedef struct hb_lock_s hb_lock_t;
+typedef enum
+{
+ HB_ERROR_NONE = 0,
+ HB_ERROR_CANCELED ,
+ HB_ERROR_WRONG_INPUT,
+ HB_ERROR_INIT ,
+ HB_ERROR_UNKNOWN
+} hb_error_code;
 
 #include "ports.h"
 #ifdef __LIBHB__
@@ -104,6 +122,10 @@
 #include "audio_remap.h"
 #include "libavutil/channel_layout.h"
 
+#ifdef USE_QSV
+#include "libavcodec/qsv.h"
+#endif
+
 hb_list_t * hb_list_init();
 int hb_list_count( const hb_list_t * );
 void hb_list_add( hb_list_t *, void * );
@@ -116,16 +138,16 @@
 void hb_reduce64( int64_t *x, int64_t *y, int64_t num, int64_t den );
 void hb_limit_rational64( int64_t *x, int64_t *y, int64_t num, int64_t den, int64_t limit );
 
-#define HB_KEEP_WIDTH 0
-#define HB_KEEP_HEIGHT 1
-void hb_fix_aspect( hb_job_t * job, int keep );
+#define HB_KEEP_WIDTH 0x01
+#define HB_KEEP_HEIGHT 0x02
+#define HB_KEEP_DISPLAY_ASPECT 0x04
 
-void hb_job_set_advanced_opts( hb_job_t *job, const char *advanced_opts );
-void hb_job_set_x264_preset( hb_job_t *job, const char *preset );
-void hb_job_set_x264_tune( hb_job_t *job, const char *tune );
-void hb_job_set_h264_profile( hb_job_t *job, const char *profile );
-void hb_job_set_h264_level( hb_job_t *job, const char *level );
-void hb_job_set_file( hb_job_t *job, const char *file );
+void hb_job_set_encoder_preset (hb_job_t *job, const char *preset);
+void hb_job_set_encoder_tune (hb_job_t *job, const char *tune);
+void hb_job_set_encoder_options(hb_job_t *job, const char *options);
+void hb_job_set_encoder_profile(hb_job_t *job, const char *profile);
+void hb_job_set_encoder_level (hb_job_t *job, const char *level);
+void hb_job_set_file (hb_job_t *job, const char *file);
 
 hb_audio_t *hb_audio_copy(const hb_audio_t *src);
 hb_list_t *hb_audio_list_copy(const hb_list_t *src);
@@ -134,6 +156,7 @@
 int hb_audio_add(const hb_job_t * job, const hb_audio_config_t * audiocfg);
 hb_audio_config_t * hb_list_audio_config_item(hb_list_t * list, int i);
 
+int hb_subtitle_add_ssa_header(hb_subtitle_t *subtitle, int width, int height);
 hb_subtitle_t *hb_subtitle_copy(const hb_subtitle_t *src);
 hb_list_t *hb_subtitle_list_copy(const hb_list_t *src);
 void hb_subtitle_close( hb_subtitle_t **sub );
@@ -144,7 +167,10 @@
 int hb_subtitle_can_burn( int source );
 int hb_subtitle_can_pass( int source, int mux );
 
+int hb_audio_can_apply_drc(uint32_t codec, uint32_t codec_param, int encoder);
+
 hb_attachment_t *hb_attachment_copy(const hb_attachment_t *src);
+
 hb_list_t *hb_attachment_list_copy(const hb_list_t *src);
 void hb_attachment_close(hb_attachment_t **attachment);
 
@@ -169,9 +195,10 @@
 void hb_chapter_close(hb_chapter_t **chapter);
 void hb_chapter_set_title(hb_chapter_t *chapter, const char *title);
 
+// Update win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_rate_s.cs when changing this struct
 struct hb_rate_s
 {
- const char *string;
+ const char *name;
 int rate;
 };
 
@@ -182,22 +209,83 @@
 int method;
 };
 
+// Update win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_mixdown_s.cs when changing this struct
 struct hb_mixdown_s
 {
- const char *human_readable_name;
- const char *internal_name;
+ const char *name;
 const char *short_name;
 int amixdown;
 };
 
+// Update win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_encoder_s.cs when changing this struct
 struct hb_encoder_s
 {
- const char *human_readable_name; // note: used in presets
- const char *short_name; // note: used in CLI
- int encoder; // HB_*CODEC_* define
- int muxers; // supported muxers
+ const char *name; // note: used in presets
+ const char *short_name; // note: used in CLI
+ const char *long_name; // used in log
+ int codec; // HB_*CODEC_* define
+ int muxers; // supported muxers
+};
+
+// Update win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_container_s.cs when changing this struct
+struct hb_container_s
+{
+ const char *name;
+ const char *short_name;
+ const char *long_name;
+ const char *default_extension;
+ int format;
+};
+
+struct hb_rational_s
+{
+ int num;
+ int den;
+};
+
+struct hb_geometry_s
+{
+ int width;
+ int height;
+ hb_rational_t par;
+};
+
+struct hb_ui_geometry_s
+{
+ int mode; // Anamorphic mode, see job struct anamorphic
+ int keep; // Specifies settings that shouldn't be changed
+ int itu_par; // use dvd dimensions to determine PAR
+ int modulus; // pixel alignment for loose anamorphic
+ int crop[4]; // Pixels cropped from source before scaling
+ int width; // destination storage width
+ int height; // destination storage height
+ int maxWidth; // max destination storage width
+ int maxHeight; // max destination storage height
+ hb_rational_t par; // Pixel aspect used in custom anamorphic
+ hb_rational_t dar; // Display aspect used in custom anamorphic
 };
 
+struct hb_image_s
+{
+ int format;
+ int width;
+ int height;
+ uint8_t *data;
+
+ struct image_plane
+ {
+ uint8_t *data;
+ int width;
+ int height;
+ int stride;
+ int height_stride;
+ int size;
+ } plane[4];
+};
+
+void hb_image_close(hb_image_t **_image);
+
+// Update win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle_config_s.cs when changing this struct
 struct hb_subtitle_config_s
 {
 enum subdest { RENDERSUB, PASSTHRUSUB } dest;
@@ -210,86 +298,151 @@
 int64_t offset;
 };
 
-#define HB_VIDEO_RATE_BASE 27000000
-
-extern hb_rate_t hb_video_rates[];
-extern int hb_video_rates_count;
-extern hb_rate_t hb_audio_rates[];
-extern int hb_audio_rates_count;
-extern int hb_audio_rates_default;
-extern hb_rate_t hb_audio_bitrates[];
-extern int hb_audio_bitrates_count;
-extern hb_dither_t hb_audio_dithers[];
-extern int hb_audio_dithers_count;
-extern hb_mixdown_t hb_audio_mixdowns[];
-extern int hb_audio_mixdowns_count;
-extern hb_encoder_t hb_video_encoders[];
-extern int hb_video_encoders_count;
-extern hb_encoder_t hb_audio_encoders[];
-extern int hb_audio_encoders_count;
-
-/* Expose values for PInvoke */
-hb_rate_t* hb_get_video_rates();
-int hb_get_video_rates_count();
-hb_rate_t* hb_get_audio_rates();
-int hb_get_audio_rates_count();
-int hb_get_audio_rates_default();
-hb_rate_t* hb_get_audio_bitrates();
-int hb_get_audio_bitrates_count();
-hb_dither_t* hb_get_audio_dithers();
-int hb_get_audio_dithers_count();
-hb_mixdown_t* hb_get_audio_mixdowns();
-int hb_get_audio_mixdowns_count();
-hb_encoder_t* hb_get_video_encoders();
-int hb_get_video_encoders_count();
-hb_encoder_t* hb_get_audio_encoders();
-int hb_get_audio_encoders_count();
-
-int hb_audio_dither_get_default();
-int hb_audio_dither_get_default_method();
-int hb_audio_dither_is_supported(uint32_t codec);
-const char* hb_audio_dither_get_description(int method);
-
-int hb_mixdown_is_supported(int mixdown, uint32_t codec, uint64_t layout);
-int hb_mixdown_has_codec_support(int mixdown, uint32_t codec);
-int hb_mixdown_has_remix_support(int mixdown, uint64_t layout);
-int hb_mixdown_get_discrete_channel_count(int amixdown);
-int hb_mixdown_get_low_freq_channel_count(int amixdown);
-int hb_mixdown_get_mixdown_from_short_name(const char *short_name);
-const char* hb_mixdown_get_short_name_from_mixdown(int amixdown);
+/*******************************************************************************
+ * Lists of rates, mixdowns, encoders etc.
+ *******************************************************************************
+ *
+ * Use hb_*_get_next() to get the next list item (use NULL to get the first).
+ *
+ * Use hb_*_get_from_name() to get the value corresponding to a name.
+ * The name can be either the short or full name.
+ * Legacy names are sanitized to currently-supported values whenever possible.
+ * Returns 0 or -1 if no value could be found.
+ *
+ * Use hb_*_get_name() and hb_*_get_short_name() to get the corresponding value.
+ * Returns NULL if the value is invalid.
+ *
+ * Use hb_*_get_long_name() when the name is not descriptive enough for you.
+ *
+ * hb_*_sanitize_name() are convenience functions for use when dealing
+ * with full names (e.g. to translate legacy values while loading a preset).
+ *
+ * Names are case-insensitive; libhb will ensure that the lists do not contain
+ * more than one entry with the same name.
+ *
+ * Use hb_*_get_limits() to get the minimum/maximum for lists with numerically
+ * ordered values.
+ *
+ * Use hb_*_get_best() to sanitize a value based on other relevant parameters.
+ *
+ * Use hb_*_get_default() to get the default based on other relevant parameters.
+ *
+ */
+
+void hb_common_global_init();
+
+int hb_video_framerate_get_from_name(const char *name);
+const char* hb_video_framerate_get_name(int framerate);
+const char* hb_video_framerate_sanitize_name(const char *name);
+const hb_rate_t* hb_video_framerate_get_next(const hb_rate_t *last);
+
+int hb_audio_samplerate_get_best(uint32_t codec, int samplerate, int *sr_shift);
+int hb_audio_samplerate_get_from_name(const char *name);
+const char* hb_audio_samplerate_get_name(int samplerate);
+const hb_rate_t* hb_audio_samplerate_get_next(const hb_rate_t *last);
+
+int hb_audio_bitrate_get_best(uint32_t codec, int bitrate, int samplerate, int mixdown);
+int hb_audio_bitrate_get_default(uint32_t codec, int samplerate, int mixdown);
+void hb_audio_bitrate_get_limits(uint32_t codec, int samplerate, int mixdown, int *low, int *high);
+const hb_rate_t* hb_audio_bitrate_get_next(const hb_rate_t *last);
+
+void hb_video_quality_get_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction);
+const char* hb_video_quality_get_name(uint32_t codec);
+
+const char* const* hb_video_encoder_get_presets (int encoder);
+const char* const* hb_video_encoder_get_tunes (int encoder);
+const char* const* hb_video_encoder_get_profiles(int encoder);
+const char* const* hb_video_encoder_get_levels (int encoder);
+
+void hb_audio_quality_get_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction);
+float hb_audio_quality_get_best(uint32_t codec, float quality);
+float hb_audio_quality_get_default(uint32_t codec);
+
+void hb_audio_compression_get_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction);
+float hb_audio_compression_get_best(uint32_t codec, float compression);
+float hb_audio_compression_get_default(uint32_t codec);
+
+int hb_audio_dither_get_default();
+int hb_audio_dither_get_default_method(); // default method, if enabled && supported
+int hb_audio_dither_is_supported(uint32_t codec);
+int hb_audio_dither_get_from_name(const char *name);
+const char* hb_audio_dither_get_description(int method);
+const hb_dither_t* hb_audio_dither_get_next(const hb_dither_t *last);
+
+int hb_mixdown_is_supported(int mixdown, uint32_t codec, uint64_t layout);
+int hb_mixdown_has_codec_support(int mixdown, uint32_t codec);
+int hb_mixdown_has_remix_support(int mixdown, uint64_t layout);
+int hb_mixdown_get_discrete_channel_count(int mixdown);
+int hb_mixdown_get_low_freq_channel_count(int mixdown);
+int hb_mixdown_get_best(uint32_t codec, uint64_t layout, int mixdown);
+int hb_mixdown_get_default(uint32_t codec, uint64_t layout);
+int hb_mixdown_get_from_name(const char *name);
+const char* hb_mixdown_get_name(int mixdown);
+const char* hb_mixdown_get_short_name(int mixdown);
+const char* hb_mixdown_sanitize_name(const char *name);
+const hb_mixdown_t* hb_mixdown_get_next(const hb_mixdown_t *last);
+
+int hb_video_encoder_get_default(int muxer);
+int hb_video_encoder_get_from_name(const char *name);
+const char* hb_video_encoder_get_name(int encoder);
+const char* hb_video_encoder_get_short_name(int encoder);
+const char* hb_video_encoder_get_long_name(int encoder);
+const char* hb_video_encoder_sanitize_name(const char *name);
+const hb_encoder_t* hb_video_encoder_get_next(const hb_encoder_t *last);
 
+/*
+ * hb_audio_encoder_get_fallback_for_passthru() will sanitize a passthru codec
+ * to the matching audio encoder (if any is available).
+ *
+ * hb_audio_encoder_get_from_name(), hb_audio_encoder_sanitize_name() will
+ * sanitize legacy encoder names, but won't convert passthru to an encoder.
+ */
+int hb_audio_encoder_get_fallback_for_passthru(int passthru);
+int hb_audio_encoder_get_default(int muxer);
+int hb_audio_encoder_get_from_name(const char *name);
+const char* hb_audio_encoder_get_name(int encoder);
+const char* hb_audio_encoder_get_short_name(int encoder);
+const char* hb_audio_encoder_get_long_name(int encoder);
+const char* hb_audio_encoder_sanitize_name(const char *name);
+const hb_encoder_t* hb_audio_encoder_get_next(const hb_encoder_t *last);
+
+/*
+ * Not typically used by the UIs
+ * (set hb_job_t.acodec_copy_mask, hb_job_t.acodec_fallback instead).
+ */
 void hb_autopassthru_apply_settings(hb_job_t *job);
 void hb_autopassthru_print_settings(hb_job_t *job);
 int hb_autopassthru_get_encoder(int in_codec, int copy_mask, int fallback, int muxer);
 
-int hb_get_default_audio_encoder(int muxer);
-
-int hb_get_best_mixdown(uint32_t codec, uint64_t layout, int mixdown);
-int hb_get_default_mixdown(uint32_t codec, uint64_t layout);
-
-int hb_get_best_samplerate(uint32_t codec, int samplerate, int *sr_shift);
-
-int hb_find_closest_audio_bitrate(int bitrate);
-void hb_get_audio_bitrate_limits(uint32_t codec, int samplerate, int mixdown, int *low, int *high);
-int hb_get_best_audio_bitrate(uint32_t codec, int bitrate, int samplerate, int mixdown);
-int hb_get_default_audio_bitrate(uint32_t codec, int samplerate, int mixdown);
-
-void hb_get_audio_quality_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction);
-float hb_get_best_audio_quality(uint32_t codec, float quality);
-float hb_get_default_audio_quality(uint32_t codec);
-
-void hb_get_audio_compression_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction);
-float hb_get_best_audio_compression(uint32_t codec, float compression);
-float hb_get_default_audio_compression(uint32_t codec);
+int hb_container_get_from_name(const char *name);
+int hb_container_get_from_extension(const char *extension); // not really a container name
+const char* hb_container_get_name(int format);
+const char* hb_container_get_short_name(int format);
+const char* hb_container_get_long_name(int format);
+const char* hb_container_get_default_extension(int format);
+const char* hb_container_sanitize_name(const char *name);
+const hb_container_t* hb_container_get_next(const hb_container_t *last);
 
+// Update win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_set_s.cs when changing this struct
 struct hb_title_set_s
 {
 hb_list_t * list_title;
 int feature; // Detected DVD feature title
 };
 
+extern int hb_gui_use_hwd_flag;
+
+typedef enum
+{
+ HB_ANAMORPHIC_NONE,
+ HB_ANAMORPHIC_STRICT,
+ HB_ANAMORPHIC_LOOSE,
+ HB_ANAMORPHIC_CUSTOM
+} hb_anamorphic_mode_t;
+
 /******************************************************************************
 * hb_job_t: settings to be filled by the UI
+ * Update win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs when changing this struct
 *****************************************************************************/
 struct hb_job_s
 {
@@ -304,7 +457,7 @@
 int chapter_start;
 int chapter_end;
 
-	/* Include chapter marker track in mp4? */
+ /* Include chapter marker track in mp4? */
 int chapter_markers;
 
 /* Picture settings:
@@ -312,7 +465,6 @@
 deinterlace: 0 or 1
 width: must be a multiple of 2
 height: must be a multiple of 2
- keep_ratio: used by UIs
 grayscale: black and white encoding
 pixel_ratio: store pixel aspect ratio in the video
 pixel_aspect_width: numerator for pixel aspect ratio
@@ -325,18 +477,17 @@
 hb_list_t * list_filter;
 int width;
 int height;
- int keep_ratio;
 int grayscale;
 
 struct
 {
- int mode;
- int itu_par;
- int par_width;
- int par_height;
- int dar_width; // 0 if normal
- int dar_height; // 0 if normal
- int keep_display_aspect;
+ hb_anamorphic_mode_t mode;
+ int itu_par;
+ int par_width;
+ int par_height;
+ int dar_width; // 0 if normal
+ int dar_height; // 0 if normal
+ int keep_display_aspect;
 } anamorphic;
 
 int modulus;
@@ -350,30 +501,32 @@
 vrate, vrate_base: output framerate is vrate / vrate_base
 cfr: 0 (vfr), 1 (cfr), 2 (pfr) [see render.c]
 pass: 0, 1 or 2 (or -1 for scan)
- advanced_opts: string of extra advanced encoder options
- areBframes: boolean to note if b-frames are included in advanced_opts */
-#define HB_VCODEC_MASK 0x00000FF
+ areBframes: boolean to note if b-frames are used */
+#define HB_VCODEC_MASK 0x0000FFF
 #define HB_VCODEC_X264 0x0000001
 #define HB_VCODEC_THEORA 0x0000002
+#define HB_VCODEC_X265 0x0000004
 #define HB_VCODEC_FFMPEG_MPEG4 0x0000010
 #define HB_VCODEC_FFMPEG_MPEG2 0x0000020
+#define HB_VCODEC_FFMPEG_VP8 0x0000040
 #define HB_VCODEC_FFMPEG_MASK 0x00000F0
+#define HB_VCODEC_QSV_H264 0x0000100
+#define HB_VCODEC_QSV_MASK 0x0000F00
+#define HB_VCODEC_H264_MASK (HB_VCODEC_X264|HB_VCODEC_QSV_H264)
 
 int vcodec;
 float vquality;
 int vbitrate;
- int pfr_vrate;
- int pfr_vrate_base;
 int vrate;
 int vrate_base;
 int cfr;
 int pass;
 int fastfirstpass;
- char *x264_preset;
- char *x264_tune;
- char *advanced_opts;
- char *h264_profile;
- char *h264_level;
+ char *encoder_preset;
+ char *encoder_tune;
+ char *encoder_options;
+ char *encoder_profile;
+ char *encoder_level;
 int areBframes;
 
 int color_matrix_code;
@@ -410,12 +563,22 @@
 
 hb_metadata_t * metadata;
 
- /* Muxer settings
- mux: output file format
- file: file path */
-#define HB_MUX_MASK 0xFF0000
-#define HB_MUX_MP4 0x010000
-#define HB_MUX_MKV 0x200000
+ /*
+ * Muxer settings
+ * mux: output file format
+ * file: file path
+ */
+#define HB_MUX_MASK 0xFF0001
+#define HB_MUX_MP4V2 0x010000
+#define HB_MUX_AV_MP4 0x020000
+#define HB_MUX_MASK_MP4 0x030000
+#define HB_MUX_LIBMKV 0x100000
+#define HB_MUX_AV_MKV 0x200000
+#define HB_MUX_MASK_MKV 0x300000
+#define HB_MUX_MASK_AV 0x220000
+/* default muxer for each container */
+#define HB_MUX_MP4 HB_MUX_AV_MP4
+#define HB_MUX_MKV HB_MUX_AV_MKV
 
 int mux;
 char * file;
@@ -441,11 +604,36 @@
 uint32_t frames_to_skip; // decode but discard this many frames
 // initially (for frame accurate positioning
 // to non-I frames).
+ int use_opencl;
+ int use_hwd;
+ int use_decomb;
+ int use_detelecine;
+
+#ifdef USE_QSV
+ // QSV-specific settings
+ struct
+ {
+ int decode;
+ int async_depth;
+ av_qsv_context *ctx;
+ // shared encoding parameters
+ // initialized by the QSV encoder, then used upstream (e.g. by filters)
+ // to configure their output so that it matches what the encoder expects
+ struct
+ {
+ int pic_struct;
+ int align_width;
+ int align_height;
+ int is_init_done;
+ } enc_info;
+ } qsv;
+#endif
 
 #ifdef __LIBHB__
 /* Internal data */
 hb_handle_t * h;
 hb_lock_t * pause;
+ volatile hb_error_code * done_error;
 volatile int * die;
 volatile int done;
 
@@ -467,9 +655,8 @@
 };
 
 /* Audio starts here */
-/* Audio Codecs */
+/* Audio Codecs: Update win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs when changing these consts */
 #define HB_ACODEC_MASK 0x00FFFF00
-#define HB_ACODEC_FAAC 0x00000100
 #define HB_ACODEC_LAME 0x00000200
 #define HB_ACODEC_VORBIS 0x00000400
 #define HB_ACODEC_AC3 0x00000800
@@ -485,7 +672,7 @@
 #define HB_ACODEC_FFFLAC24 0x00200000
 #define HB_ACODEC_FDK_AAC 0x00400000
 #define HB_ACODEC_FDK_HAAC 0x00800000
-#define HB_ACODEC_FF_MASK 0x00FF2000
+#define HB_ACODEC_FF_MASK 0x00FF2800
 #define HB_ACODEC_PASS_FLAG 0x40000000
 #define HB_ACODEC_PASS_MASK (HB_ACODEC_MP3 | HB_ACODEC_FFAAC | HB_ACODEC_DCA_HD | HB_ACODEC_AC3 | HB_ACODEC_DCA)
 #define HB_ACODEC_AUTO_PASS (HB_ACODEC_PASS_MASK | HB_ACODEC_PASS_FLAG)
@@ -504,6 +691,7 @@
 /* define an invalid VBR quality compatible with all VBR-capable codecs */
 #define HB_INVALID_AUDIO_QUALITY (-3.)
 
+// Update win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio_config_s.cs when changing this struct
 struct hb_audio_config_s
 {
 /* Output */
@@ -537,6 +725,7 @@
 int normalize_mix_level; /* mix level normalization (boolean) */
 int dither_method; /* dither algorithm */
 char * name; /* Output track name */
+ int delay;
 } out;
 
 /* Input */
@@ -554,6 +743,7 @@
 PRIVATE int samplerate; /* Input sample rate (Hz) */
 PRIVATE int samples_per_frame; /* Number of samples per frame */
 PRIVATE int bitrate; /* Input bitrate (bps) */
+ PRIVATE int matrix_encoding; /* Source matrix encoding mode, set by the audio decoder */
 PRIVATE uint64_t channel_layout; /* Source channel layout, set by the audio decoder */
 PRIVATE hb_chan_map_t * channel_map; /* Source channel map, set by the audio decoder */
 } in;
@@ -568,6 +758,7 @@
 };
 
 #ifdef __LIBHB__
+// Update win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio_s.cs when changing this struct
 struct hb_audio_s
 {
 int id;
@@ -587,6 +778,7 @@
 };
 #endif
 
+// Update win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_chapter_s.cs when changing this struct
 struct hb_chapter_s
 {
 int index;
@@ -637,6 +829,8 @@
 * - may correspond to the type of track (see the 'type' field; ex: "Closed Captions")
 * > iso639_2
 * - language code for the subtitle, or "und" if unknown
+ *
+ * Update win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle_s.cs when changing this struct
 */
 struct hb_subtitle_s
 {
@@ -722,6 +916,7 @@
 hb_list_t * list_coverart;
 };
 
+// Update win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs when changing this struct
 struct hb_title_s
 {
 enum { HB_DVD_TYPE, HB_BD_TYPE, HB_STREAM_TYPE, HB_FF_STREAM_TYPE } type;
@@ -761,7 +956,7 @@
 int rate;
 int rate_base;
 int crop[4];
- enum { HB_DVD_DEMUXER, HB_MPEG_DEMUXER, HB_NULL_DEMUXER } demuxer;
+ enum {HB_DVD_DEMUXER, HB_TS_DEMUXER, HB_PS_DEMUXER, HB_NULL_DEMUXER} demuxer;
 int detected_interlacing;
 int pcr_pid; /* PCR PID for TS streams */
 int video_id; /* demuxer stream id for video */
@@ -773,6 +968,11 @@
 char *container_name;
 int data_rate;
 
+ // additional supported video decoders (e.g. HW-accelerated implementations)
+ int video_decode_support;
+#define HB_DECODE_SUPPORT_SW 0x01 // software (libavcodec or mpeg2dec)
+#define HB_DECODE_SUPPORT_QSV 0x02 // Intel Quick Sync Video
+
 hb_metadata_t *metadata;
 
 hb_list_t * list_chapter;
@@ -788,10 +988,14 @@
 uint32_t flags;
 // set if video stream doesn't have IDR frames
 #define HBTF_NO_IDR (1 << 0)
-#define HBTF_SCAN_COMPLETE (1 << 0)
-};
+#define HBTF_SCAN_COMPLETE (1 << 1)
 
+ // whether OpenCL scaling is supported for this source
+ int opencl_support;
+ int hwd_support; // TODO: merge to video_decode_support
+};
 
+// Update win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_state_s.cs when changing this struct
 struct hb_state_s
 {
 #define HB_STATE_IDLE 1
@@ -833,10 +1037,7 @@
 struct
 {
 /* HB_STATE_WORKDONE */
-#define HB_ERROR_NONE 0
-#define HB_ERROR_CANCELED 1
-#define HB_ERROR_UNKNOWN 2
- int error;
+ hb_error_code error;
 } workdone;
 
 struct
@@ -869,12 +1070,14 @@
 int color_prim;
 int color_transfer;
 int color_matrix;
+ int video_decode_support;
 };
 struct
 { // info only valid for audio decoders
 uint64_t channel_layout;
 hb_chan_map_t * channel_map;
 int samples_per_frame;
+ int matrix_encoding;
 };
 };
 } hb_work_info_t;
@@ -928,7 +1131,6 @@
 
 extern hb_work_object_t hb_sync_video;
 extern hb_work_object_t hb_sync_audio;
-extern hb_work_object_t hb_decmpeg2;
 extern hb_work_object_t hb_decvobsub;
 extern hb_work_object_t hb_encvobsub;
 extern hb_work_object_t hb_deccc608;
@@ -938,14 +1140,13 @@
 extern hb_work_object_t hb_decssasub;
 extern hb_work_object_t hb_decpgssub;
 extern hb_work_object_t hb_encavcodec;
+extern hb_work_object_t hb_encqsv;
 extern hb_work_object_t hb_encx264;
 extern hb_work_object_t hb_enctheora;
-extern hb_work_object_t hb_deca52;
-extern hb_work_object_t hb_decdca;
+extern hb_work_object_t hb_encx265;
 extern hb_work_object_t hb_decavcodeca;
 extern hb_work_object_t hb_decavcodecv;
 extern hb_work_object_t hb_declpcm;
-extern hb_work_object_t hb_encfaac;
 extern hb_work_object_t hb_enclame;
 extern hb_work_object_t hb_encvorbis;
 extern hb_work_object_t hb_muxer;
@@ -960,6 +1161,8 @@
 #define HB_FILTER_DROP 3
 #define HB_FILTER_DONE 4
 
+int hb_use_dxva(hb_title_t *title);
+
 typedef struct hb_filter_init_s
 {
 hb_job_t * job;
@@ -971,9 +1174,8 @@
 int crop[4];
 int vrate_base;
 int vrate;
- int pfr_vrate_base;
- int pfr_vrate;
 int cfr;
+ int use_dxva;
 } hb_filter_init_t;
 
 typedef struct hb_filter_info_s
@@ -1016,27 +1218,43 @@
 #endif
 };
 
+// Update win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_filter_ids.cs when changing this enum
 enum
 {
+ // for QSV - important to have before other filters
+ HB_FILTER_QSV_PRE = 1,
+
 // First, filters that may change the framerate (drop or dup frames)
- HB_FILTER_DETELECINE = 1,
+ HB_FILTER_DETELECINE,
 HB_FILTER_DECOMB,
 HB_FILTER_DEINTERLACE,
 HB_FILTER_VFR,
 // Filters that must operate on the original source image are next
 HB_FILTER_DEBLOCK,
 HB_FILTER_DENOISE,
+ HB_FILTER_HQDN3D = HB_FILTER_DENOISE,
+ HB_FILTER_NLMEANS,
 HB_FILTER_RENDER_SUB,
 HB_FILTER_CROP_SCALE,
+
 // Finally filters that don't care what order they are in,
 // except that they must be after the above filters
 HB_FILTER_ROTATE,
+
+ // for QSV - important to have as a last one
+ HB_FILTER_QSV_POST,
+ // default MSDK VPP filter
+ HB_FILTER_QSV,
 };
 
 hb_filter_object_t * hb_filter_init( int filter_id );
 hb_filter_object_t * hb_filter_copy( hb_filter_object_t * filter );
 hb_list_t *hb_filter_list_copy(const hb_list_t *src);
 void hb_filter_close( hb_filter_object_t ** );
+char * hb_generate_filter_settings(int filter_id, const char *preset,
+ const char *tune);
+int hb_validate_filter_settings(int filter_id, const char *filter_param);
+int hb_validate_param_string(const char *regex_pattern, const char *param_string);
 
 typedef void hb_error_handler_t( const char *errmsg );
 
@@ -1055,13 +1273,24 @@
 const char *x264_encopts, const char *h264_profile,
 const char *h264_level, int width, int height);
 
-// x264 preset/tune & h264 profile/level helpers
+#define HB_API_OLD_PRESET_GETTERS
+#ifdef HB_API_OLD_PRESET_GETTERS
+// x264 preset/tune, qsv preset & h264 profile/level helpers
 const char * const * hb_x264_presets();
 const char * const * hb_x264_tunes();
+#ifdef USE_QSV
+const char * const * hb_qsv_presets();
+#endif
 const char * const * hb_h264_profiles();
 const char * const * hb_h264_levels();
+#endif
 
 // x264 option name/synonym helper
 const char * hb_x264_encopt_name( const char * name );
 
+#ifdef USE_X265
+// x265 option name/synonym helper
+const char * hb_x265_encopt_name( const char * name );
+#endif
+
 #endif

HandBrake-0.9.9.tar.bz2/libhb/cropscale.c -> HandBrake-0.10.0.tar.bz2/libhb/cropscale.c Changed

@@ -1,6 +1,6 @@
 /* cropscale.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -9,9 +9,12 @@
 
 #include "hb.h"
 #include "hbffmpeg.h"
+#include "common.h"
+#include "opencl.h"
 
 struct hb_filter_private_s
 {
+ hb_job_t *job;
 int width_in;
 int height_in;
 int pix_fmt;
@@ -19,6 +22,13 @@
 int width_out;
 int height_out;
 int crop[4];
+ 
+ /* OpenCL/DXVA2 */
+ int use_dxva;
+ int use_decomb;
+ int use_detelecine;
+ hb_oclscale_t *os; //ocl scaler handler
+
 struct SwsContext * context;
 };
 
@@ -53,11 +63,24 @@
 hb_filter_private_t * pv = filter->private_data;
 
 // TODO: add pix format option to settings
+ pv->job = init->job;
 pv->pix_fmt_out = init->pix_fmt;
 pv->width_in = init->width;
 pv->height_in = init->height;
- pv->width_out = init->width;
- pv->height_out = init->height;
+ pv->width_out = init->width - (init->crop[2] + init->crop[3]);
+ pv->height_out = init->height - (init->crop[0] + init->crop[1]);
+
+ /* OpenCL/DXVA2 */
+ pv->use_dxva = init->use_dxva;
+ pv->use_decomb = init->job->use_decomb;
+ pv->use_detelecine = init->job->use_detelecine;
+
+ if (pv->job->use_opencl && pv->job->title->opencl_support)
+ {
+ pv->os = ( hb_oclscale_t * )malloc( sizeof( hb_oclscale_t ) );
+ memset( pv->os, 0, sizeof( hb_oclscale_t ) );
+ }
+
 memcpy( pv->crop, init->crop, sizeof( int[4] ) );
 if( filter->settings )
 {
@@ -112,7 +135,18 @@
 return;
 }
 
- if ( pv->context )
+ /* OpenCL */
+ if (pv->job->use_opencl && pv->job->title->opencl_support && pv->os)
+ {
+ if (hb_ocl != NULL)
+ {
+ HB_OCL_BUF_FREE(hb_ocl, pv->os->bicubic_x_weights);
+ HB_OCL_BUF_FREE(hb_ocl, pv->os->bicubic_y_weights);
+ }
+ free(pv->os);
+ }
+
+ if( pv->context )
 {
 sws_freeContext( pv->context );
 }
@@ -121,6 +155,7 @@
 filter->private_data = NULL;
 }
 
+/* OpenCL */
 static hb_buffer_t* crop_scale( hb_filter_private_t * pv, hb_buffer_t * in )
 {
 AVPicture pic_in;
@@ -137,33 +172,43 @@
 av_picture_crop( &pic_crop, &pic_in, in->f.fmt,
 pv->crop[0], pv->crop[2] );
 
- if ( !pv->context ||
- pv->width_in != in->f.width ||
- pv->height_in != in->f.height ||
- pv->pix_fmt != in->f.fmt )
+ // Use bicubic OpenCL scaling when selected and when downsampling < 4:1;
+ if ((pv->job->use_opencl && pv->job->title->opencl_support) &&
+ (pv->width_out * 4 > pv->width_in) &&
+ (in->cl.buffer != NULL) && (out->cl.buffer != NULL))
 {
- // Something changed, need a new scaling context.
- if( pv->context )
- sws_freeContext( pv->context );
-
- pv->context = hb_sws_get_context(
- in->f.width - (pv->crop[2] + pv->crop[3]),
- in->f.height - (pv->crop[0] + pv->crop[1]),
- in->f.fmt,
- out->f.width, out->f.height, out->f.fmt,
- SWS_LANCZOS | SWS_ACCURATE_RND );
- pv->width_in = in->f.width;
- pv->height_in = in->f.height;
- pv->pix_fmt = in->f.fmt;
+ /* OpenCL */
+ hb_ocl_scale(in, out, pv->crop, pv->os);
+ }
+ else
+ {
+ if (pv->context == NULL ||
+ pv->width_in != in->f.width ||
+ pv->height_in != in->f.height ||
+ pv->pix_fmt != in->f.fmt)
+ {
+ // Something changed, need a new scaling context.
+ if (pv->context != NULL)
+ {
+ sws_freeContext(pv->context);
+ }
+ 
+ pv->context = hb_sws_get_context(in->f.width - (pv->crop[2] + pv->crop[3]),
+ in->f.height - (pv->crop[0] + pv->crop[1]),
+ in->f.fmt, out->f.width, out->f.height,
+ out->f.fmt, SWS_LANCZOS|SWS_ACCURATE_RND);
+ pv->width_in = in->f.width;
+ pv->height_in = in->f.height;
+ pv->pix_fmt = in->f.fmt;
+ }
+ 
+ // Scale pic_crop into pic_render according to the
+ // context set up above
+ sws_scale(pv->context,
+ (const uint8_t* const*)pic_crop.data, pic_crop.linesize,
+ 0, in->f.height - (pv->crop[0] + pv->crop[1]),
+ pic_out.data, pic_out.linesize);
 }
-
- // Scale pic_crop into pic_render according to the
- // context set up above
- sws_scale(pv->context,
- (const uint8_t* const*)pic_crop.data,
- pic_crop.linesize,
- 0, in->f.height - (pv->crop[0] + pv->crop[1]),
- pic_out.data, pic_out.linesize);
 
 out->s = in->s;
 hb_buffer_move_subs( out, in );
@@ -198,14 +243,20 @@
 pv->width_out = in->f.width - (pv->crop[2] + pv->crop[3]);
 pv->height_out = in->f.height - (pv->crop[0] + pv->crop[1]);
 }
- if ( in->f.fmt == pv->pix_fmt_out &&
+
+ /* OpenCL/DXVA2 */
+ if ((!pv->use_decomb && !pv->use_detelecine &&
 !pv->crop[0] && !pv->crop[1] && !pv->crop[2] && !pv->crop[3] &&
- in->f.width == pv->width_out && in->f.height == pv->height_out )
+ in->f.fmt == pv->pix_fmt_out && in->f.width == pv->width_out &&
+ in->f.height == pv->height_out) || (pv->use_dxva &&
+ in->f.width == pv->width_out &&
+ in->f.height == pv->height_out))
 {
 *buf_out = in;
- *buf_in = NULL;
+ *buf_in = NULL;
 return HB_FILTER_OK;
 }
+
 *buf_out = crop_scale( pv, in );
 
 return HB_FILTER_OK;

HandBrake-0.9.9.tar.bz2/libhb/deblock.c -> HandBrake-0.10.0.tar.bz2/libhb/deblock.c Changed

HandBrake-0.9.9.tar.bz2/libhb/decavcodec.c -> HandBrake-0.10.0.tar.bz2/libhb/decavcodec.c Changed

@@ -1,6 +1,6 @@
 /* decavcodec.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -18,7 +18,7 @@
 has different decoder calling conventions for audio & video.
 These work objects are self-contained & follow all
 of HB's conventions for a decoder module. They can be used like
- any other HB decoder (deca52, decmpeg2, etc.).
+ any other HB decoder
 
 These decoders handle 2 kinds of input. Streams that are demuxed
 by HandBrake and streams that are demuxed by libavformat. In the
@@ -42,6 +42,15 @@
 #include "hbffmpeg.h"
 #include "audio_resample.h"
 
+#ifdef USE_HWD
+#include "opencl.h"
+#include "vadxva2.h"
+#endif
+
+#ifdef USE_QSV
+#include "qsv_common.h"
+#endif
+
 static void compute_frame_duration( hb_work_private_t *pv );
 static void flushDelayQueue( hb_work_private_t *pv );
 static int decavcodecaInit( hb_work_object_t *, hb_job_t * );
@@ -76,6 +85,8 @@
 hb_title_t *title;
 AVCodecContext *context;
 AVCodecParserContext *parser;
+ AVFrame *frame;
+ hb_buffer_t *palette;
 int threads;
 int video_codec_opened;
 hb_list_t *list;
@@ -88,7 +99,8 @@
 uint32_t nframes;
 uint32_t ndrops;
 uint32_t decode_errors;
- int brokenByMicrosoft; // video stream may contain packed b-frames
+ int64_t prev_pts;
+ int brokenTS; // video stream may contain packed b-frames
 hb_buffer_t* delayq[HEAP_SIZE];
 int queue_primed;
 pts_heap_t pts_heap;
@@ -99,10 +111,82 @@
 int sws_pix_fmt;
 int cadence[12];
 int wait_for_keyframe;
-
+#ifdef USE_HWD
+ hb_va_dxva2_t *dxva2;
+ uint8_t *dst_frame;
+ hb_oclscale_t *opencl_scale;
+#endif
 hb_audio_resample_t *resample;
+
+#ifdef USE_QSV
+ // QSV-specific settings
+ struct
+ {
+ int decode;
+ av_qsv_config config;
+ const char *codec_name;
+#define USE_QSV_PTS_WORKAROUND // work around out-of-order output timestamps
+#ifdef USE_QSV_PTS_WORKAROUND
+ hb_list_t *pts_list;
+#endif
+ } qsv;
+#endif
+
+ hb_list_t * list_subtitle;
 };
 
+#ifdef USE_QSV_PTS_WORKAROUND
+// save/restore PTS if the decoder may not attach the right PTS to the frame
+static void hb_av_add_new_pts(hb_list_t *list, int64_t new_pts)
+{
+ int index = 0;
+ int64_t *cur_item, *new_item;
+ if (list != NULL && new_pts != AV_NOPTS_VALUE)
+ {
+ new_item = malloc(sizeof(int64_t));
+ if (new_item != NULL)
+ {
+ *new_item = new_pts;
+ // sort chronologically
+ for (index = 0; index < hb_list_count(list); index++)
+ {
+ cur_item = hb_list_item(list, index);
+ if (cur_item != NULL)
+ {
+ if (*cur_item == *new_item)
+ {
+ // no duplicates
+ free(new_item);
+ return;
+ }
+ if (*cur_item > *new_item)
+ {
+ // insert here
+ break;
+ }
+ }
+ }
+ hb_list_insert(list, index, new_item);
+ }
+ }
+}
+static int64_t hb_av_pop_next_pts(hb_list_t *list)
+{
+ int64_t *item, next_pts = AV_NOPTS_VALUE;
+ if (list != NULL && hb_list_count(list) > 0)
+ {
+ item = hb_list_item(list, 0);
+ if (item != NULL)
+ {
+ next_pts = *item;
+ hb_list_rem(list, item);
+ free(item);
+ }
+ }
+ return next_pts;
+}
+#endif
+
 static void decodeAudio( hb_audio_t * audio, hb_work_private_t *pv, uint8_t *data, int size, int64_t pts );
 static hb_buffer_t *link_buf_list( hb_work_private_t *pv );
 
@@ -113,7 +197,7 @@
 
 if ( heap->nheap <= 0 )
 {
- return -1;
+ return AV_NOPTS_VALUE;
 }
 
 // return the top of the heap then put the bottom element on top,
@@ -219,39 +303,120 @@
 hb_error("decavcodecaInit: hb_audio_resample_init() failed");
 return 1;
 }
- // some decoders can downmix using embedded coefficients,
- // or dedicated audio substreams for a specific channel layout
- switch (w->audio->config.out.mixdown)
+ /*
+ * Some audio decoders can downmix using embedded coefficients,
+ * or dedicated audio substreams for a specific channel layout.
+ *
+ * But some will e.g. use normalized mix coefficients unconditionally,
+ * so we need to make sure this matches what the user actually requested.
+ */
+ int avcodec_downmix = 0;
+ switch (w->codec_param)
 {
- case HB_AMIXDOWN_MONO:
- if (w->codec_param == AV_CODEC_ID_TRUEHD)
- {
- // libavcodec can't decode TrueHD Mono (bug #356)
- // work around it by requesting Stereo and downmixing
- pv->context->request_channels = 2;
- pv->context->request_channel_layout = AV_CH_LAYOUT_STEREO;
- break;
- }
- pv->context->request_channel_layout = AV_CH_LAYOUT_MONO;
+ case AV_CODEC_ID_AC3:
+ case AV_CODEC_ID_EAC3:
+ avcodec_downmix = w->audio->config.out.normalize_mix_level != 0;
+ break;
+ case AV_CODEC_ID_DTS:
+ avcodec_downmix = w->audio->config.out.normalize_mix_level == 0;
 break;
- // request 5.1 before downmixing to dpl1/dpl2
- case HB_AMIXDOWN_DOLBY:
- case HB_AMIXDOWN_DOLBYPLII:
- pv->context->request_channel_layout = AV_CH_LAYOUT_5POINT1;
+ case AV_CODEC_ID_TRUEHD:
+ avcodec_downmix = (w->audio->config.out.normalize_mix_level == 0 ||
+ w->audio->config.out.mixdown == HB_AMIXDOWN_MONO ||
+ w->audio->config.out.mixdown == HB_AMIXDOWN_DOLBY ||
+ w->audio->config.out.mixdown == HB_AMIXDOWN_DOLBYPLII);
 break;
- // request the layout corresponding to the selected mixdown
 default:
- pv->context->request_channel_layout =
- hb_ff_mixdown_xlat(w->audio->config.out.mixdown, NULL);
 break;
 }
+ if (avcodec_downmix)
+ {
+ switch (w->audio->config.out.mixdown)
+ {
+ case HB_AMIXDOWN_MONO:
+ if (w->codec_param == AV_CODEC_ID_TRUEHD)
+ {
+ // libavcodec can't decode TrueHD Mono (bug #356)
+ // work around it by requesting Stereo and downmixing
+ pv->context->request_channel_layout = AV_CH_LAYOUT_STEREO;
+ break;
+ }
+ pv->context->request_channel_layout = AV_CH_LAYOUT_MONO;
+ break;
+ // request 5.1 before downmixing to dpl1/dpl2
+ case HB_AMIXDOWN_DOLBY:
+ case HB_AMIXDOWN_DOLBYPLII:
+ pv->context->request_channel_layout = AV_CH_LAYOUT_5POINT1;
+ break;
+ // request the layout corresponding to the selected mixdown
+ default:
+ pv->context->request_channel_layout =
+ hb_ff_mixdown_xlat(w->audio->config.out.mixdown, NULL);
+ break;
+ }
+ }
+ }
+
+ // Set decoder opts...
+ AVDictionary * av_opts = NULL;
+ av_dict_set( &av_opts, "refcounted_frames", "1", 0 );
+
+ // Dynamic Range Compression
+ if (w->audio->config.out.dynamic_range_compression >= 0.0f &&
+ hb_audio_can_apply_drc(w->audio->config.in.codec,
+ w->audio->config.in.codec_param, 0))
+ {
+ float drc_scale_max = 1.0f;
+ /*
+ * avcodec_open will fail if the value for any of the options is out of
+ * range, so assume a conservative maximum of 1 and try to determine the
+ * option's actual upper limit.
+ */
+ if (codec != NULL && codec->priv_class != NULL)
+ {
+ const AVOption *opt;
+ opt = av_opt_find2((void*)&codec->priv_class, "drc_scale", NULL,
+ AV_OPT_FLAG_DECODING_PARAM|AV_OPT_FLAG_AUDIO_PARAM,
+ AV_OPT_SEARCH_FAKE_OBJ, NULL);
+ if (opt != NULL)
+ {
+ drc_scale_max = opt->max;
+ }
+ }
+ if (w->audio->config.out.dynamic_range_compression > drc_scale_max)
+ {
+ hb_log("decavcodecaInit: track %d, sanitizing out-of-range DRC %.2f to %.2f",
+ w->audio->config.out.track,
+ w->audio->config.out.dynamic_range_compression, drc_scale_max);
+ w->audio->config.out.dynamic_range_compression = drc_scale_max;
+ }
+
+ char drc_scale[5]; // "?.??\n"
+ snprintf(drc_scale, sizeof(drc_scale), "%.2f",
+ w->audio->config.out.dynamic_range_compression);
+ av_dict_set(&av_opts, "drc_scale", drc_scale, 0);
 }
 
- if (hb_avcodec_open(pv->context, codec, NULL, 0))
+ if (hb_avcodec_open(pv->context, codec, &av_opts, 0))
 {
+ av_dict_free( &av_opts );
 hb_log("decavcodecaInit: avcodec_open failed");
 return 1;
 }
+ // avcodec_open populates av_opts with the things it didn't recognize.
+ AVDictionaryEntry *t = NULL;
+ while ((t = av_dict_get(av_opts, "", t, AV_DICT_IGNORE_SUFFIX)) != NULL)
+ {
+ hb_log("decavcodecaInit: unknown option '%s'", t->key);
+ }
+ av_dict_free( &av_opts );
+
+ pv->frame = av_frame_alloc();
+ if (pv->frame == NULL)
+ {
+ hb_log("decavcodecaInit: av_frame_alloc failed");
+ return 1;
+ }
 
 return 0;
 }
@@ -268,6 +433,8 @@
 if ( pv )
 {
 flushDelayQueue( pv );
+ hb_buffer_t *buf = link_buf_list( pv );
+ hb_buffer_close( &buf );
 
 if ( pv->job && pv->context && pv->context->codec )
 {
@@ -275,6 +442,7 @@
 pv->context->codec->name, pv->nframes, pv->decode_errors,
 pv->ndrops );
 }
+ av_frame_free(&pv->frame);
 if ( pv->sws_context )
 {
 sws_freeContext( pv->sws_context );
@@ -285,19 +453,62 @@
 }
 if ( pv->context && pv->context->codec )
 {
- hb_avcodec_close( pv->context );
+#ifdef USE_QSV
+ /*
+ * FIXME: knowingly leaked.
+ *
+ * If we're using our Libav QSV wrapper, qsv_decode_end() will call
+ * MFXClose() on the QSV session. Even if decoding is complete, we
+ * still need that session for QSV filtering and/or encoding, so we
+ * we can't close the context here until we implement a proper fix.
+ */
+ if (!pv->qsv.decode)
+#endif
+ {
+ hb_avcodec_close(pv->context);
+ }
 }
 if ( pv->context )
 {
 av_freep( &pv->context->extradata );
- av_free( pv->context );
+ av_freep( &pv->context );
 }
 if ( pv->list )
 {
 hb_list_empty( &pv->list );
 }
 hb_audio_resample_free(pv->resample);
- free( pv );
+
+#ifdef USE_HWD
+ if (pv->opencl_scale != NULL)
+ {
+ free(pv->opencl_scale);
+ }
+ if (pv->dxva2 != NULL)
+ {
+ if (hb_ocl != NULL)
+ {
+ HB_OCL_BUF_FREE(hb_ocl, pv->dxva2->cl_mem_nv12);
+ }
+ hb_va_close(pv->dxva2);
+ }
+#endif
+
+#ifdef USE_QSV_PTS_WORKAROUND
+ if (pv->qsv.decode && pv->qsv.pts_list != NULL)
+
+ {
+ while (hb_list_count(pv->qsv.pts_list) > 0)
+ {
+ int64_t *item = hb_list_item(pv->qsv.pts_list, 0);
+ hb_list_rem(pv->qsv.pts_list, item);
+ free(item);
+ }
+ hb_list_close(&pv->qsv.pts_list);
+ }
+#endif
+
+ free(pv);
 }
 *ppv = NULL;
 }
@@ -305,7 +516,9 @@
 static void decavcodecClose( hb_work_object_t * w )
 {
 hb_work_private_t * pv = w->private_data;
-
+#ifdef USE_HWD
+ if( pv->dst_frame ) free( pv->dst_frame );
+#endif
 if ( pv )
 {
 closePrivData( &pv );
@@ -334,7 +547,7 @@
 
 *buf_out = NULL;
 
- if ( in->s.start < -1 && pv->pts_next <= 0 )
+ if ( in->s.start < 0 && pv->pts_next <= 0 )
 {
 // discard buffers that start before video time 0
 return HB_WORK_OK;
@@ -354,27 +567,14 @@
 len = av_parser_parse2( pv->parser, pv->context, &pout, &pout_len,
 in->data + pos, in->size - pos, cur, cur, 0 );
 cur = pv->parser->pts;
- if ( cur == AV_NOPTS_VALUE )
- cur = -1;
 }
 else
 {
 pout = in->data;
 len = pout_len = in->size;
 }
- if (pout)
+ if (pout != NULL && pout_len > 0)
 {
- // set the duration on every frame since the stream format can
- // change (it shouldn't but there's no way to guarantee it).
- // duration is a scaling factor to go from #bytes in the decoded
- // frame to frame time (in 90KHz mpeg ticks). 'channels' converts
- // total samples to per-channel samples. 'sample_rate' converts
- // per-channel samples to seconds per sample and the 90000
- // is mpeg ticks per second.
- if ( pv->context->sample_rate )
- {
- pv->duration = 90000. / (double)( pv->context->sample_rate );
- }
 decodeAudio( w->audio, pv, pout, pout_len, cur );
 }
 }
@@ -427,7 +627,7 @@
 AVCodecContext *context = avcodec_alloc_context3(codec);
 AVCodecParserContext *parser = NULL;
 
- if (w->title->opaque_priv != NULL)
+ if (w->title && w->title->opaque_priv != NULL)
 {
 AVFormatContext *ic = (AVFormatContext*)w->title->opaque_priv;
 avcodec_copy_context(context, ic->streams[w->audio->id]->codec);
@@ -446,32 +646,37 @@
 }
 
 hb_ff_set_sample_fmt( context, codec, AV_SAMPLE_FMT_FLT );
- if ( hb_avcodec_open( context, codec, NULL, 0 ) )
+
+ AVDictionary * av_opts = NULL;
+ av_dict_set( &av_opts, "err_detect", "crccheck+explode", 0 );
+ if ( hb_avcodec_open( context, codec, &av_opts, 0 ) )
 {
+ av_dict_free( &av_opts );
 return -1;
 }
- unsigned char *pbuffer;
- int pos, pbuffer_size;
+ av_dict_free( &av_opts );
+ unsigned char *parse_buffer;
+ int parse_pos, dec_pos, parse_buffer_size;
 
 while (buf != NULL && !ret)
 {
- pos = 0;
- while (pos < buf->size)
+ parse_pos = 0;
+ while (parse_pos < buf->size)
 {
- int len, truehd_mono = 0;
+ int parse_len, truehd_mono = 0;
 
 if (parser != NULL)
 {
- len = av_parser_parse2(parser, context, &pbuffer, &pbuffer_size,
- buf->data + pos, buf->size - pos,
- buf->s.start, buf->s.start, 0);
+ parse_len = av_parser_parse2(parser, context,
+ &parse_buffer, &parse_buffer_size,
+ buf->data + parse_pos, buf->size - parse_pos,
+ buf->s.start, buf->s.start, 0);
 }
 else
 {
- pbuffer = buf->data;
- len = pbuffer_size = buf->size;
+ parse_buffer = buf->data + parse_pos;
+ parse_len = parse_buffer_size = buf->size - parse_pos;
 }
- pos += len;
 
 // libavcodec can't decode TrueHD Mono (bug #356)
 // work around it by requesting Stereo before decoding
@@ -479,37 +684,50 @@
 context->channel_layout == AV_CH_LAYOUT_MONO)
 {
 truehd_mono = 1;
- context->request_channels = 2;
 context->request_channel_layout = AV_CH_LAYOUT_STEREO;
 }
 else
 {
- context->request_channels = 0;
 context->request_channel_layout = 0;
 }
 
- if (pbuffer_size > 0)
+ dec_pos = 0;
+ while (dec_pos < parse_buffer_size)
 {
+ int dec_len;
 int got_frame;
- AVFrame frame = { { 0 } };
+ AVFrame *frame = av_frame_alloc();
 AVPacket avp;
 av_init_packet(&avp);
- avp.data = pbuffer;
- avp.size = pbuffer_size;
+ avp.data = parse_buffer + dec_pos;
+ avp.size = parse_buffer_size - dec_pos;
 
- len = avcodec_decode_audio4(context, &frame, &got_frame, &avp);
- if (len > 0 && context->sample_rate > 0)
+ dec_len = avcodec_decode_audio4(context, frame, &got_frame, &avp);
+ if (dec_len < 0)
+ {
+ av_frame_free(&frame);
+ break;
+ }
+ if (dec_len > 0 && got_frame)
 {
 info->rate_base = 1;
- info->rate = context->sample_rate;
- info->samples_per_frame = frame.nb_samples;
+ // libavcoded doesn't consistently set frame->sample_rate
+ if (frame->sample_rate != 0)
+ {
+ info->rate = frame->sample_rate;
+ }
+ else
+ {
+ info->rate = context->sample_rate;
+ hb_log("decavcodecaBSInfo: warning: invalid frame sample_rate! Using context sample_rate.");
+ }
+ info->samples_per_frame = frame->nb_samples;
 
 int bps = av_get_bits_per_sample(context->codec_id);
- if (bps > 0 && context->channels > 0)
+ int channels = av_get_channel_layout_nb_channels(frame->channel_layout);
+ if (bps > 0)
 {
- info->bitrate = (bps *
- context->channels *
- context->sample_rate);
+ info->bitrate = (bps * channels * info->rate);
 }
 else if (context->bit_rate > 0)
 {
@@ -523,18 +741,52 @@
 if (truehd_mono)
 {
 info->channel_layout = AV_CH_LAYOUT_MONO;
+ info->matrix_encoding = AV_MATRIX_ENCODING_NONE;
 }
 else
 {
- info->channel_layout =
- hb_ff_layout_xlat(context->channel_layout,
- context->channels);
+ AVFrameSideData *side_data;
+ if ((side_data =
+ av_frame_get_side_data(frame,
+ AV_FRAME_DATA_MATRIXENCODING)) != NULL)
+ {
+ info->matrix_encoding = *side_data->data;
+ }
+ else
+ {
+ info->matrix_encoding = AV_MATRIX_ENCODING_NONE;
+ }
+ if (info->matrix_encoding == AV_MATRIX_ENCODING_DOLBY ||
+ info->matrix_encoding == AV_MATRIX_ENCODING_DPLII)
+ {
+ info->channel_layout = AV_CH_LAYOUT_STEREO_DOWNMIX;
+ }
+ else
+ {
+ info->channel_layout = frame->channel_layout;
+ }
+ }
+ if (context->codec_id == AV_CODEC_ID_AC3 ||
+ context->codec_id == AV_CODEC_ID_EAC3)
+ {
+ if (context->audio_service_type == AV_AUDIO_SERVICE_TYPE_KARAOKE)
+ {
+ info->mode = 7;
+ }
+ else
+ {
+ info->mode = context->audio_service_type;
+ }
 }
 
 ret = 1;
+ av_frame_free(&frame);
 break;
 }
+ dec_pos += dec_len;
+ av_frame_free(&frame);
 }
+ parse_pos += parse_len;
 }
 buf = buf->next;
 }
@@ -546,7 +798,8 @@
 if ( parser != NULL )
 av_parser_close( parser );
 hb_avcodec_close( context );
- av_free( context );
+ av_freep( &context->extradata );
+ av_freep( &context );
 return ret;
 }
 
@@ -575,7 +828,7 @@
 // copy one video frame into an HB buf. If the frame isn't in our color space
 // or at least one of its dimensions is odd, use sws_scale to convert/rescale it.
 // Otherwise just copy the bits.
-static hb_buffer_t *copy_frame( hb_work_private_t *pv, AVFrame *frame )
+static hb_buffer_t *copy_frame( hb_work_private_t *pv )
 {
 AVCodecContext *context = pv->context;
 int w, h;
@@ -589,57 +842,143 @@
 }
 else
 {
- w = pv->job->title->width;
- h = pv->job->title->height;
+ w = pv->job->title->width;
+ h = pv->job->title->height;
 }
- hb_buffer_t *buf = hb_video_buffer_init( w, h );
- uint8_t *dst = buf->data;
 
- if (context->pix_fmt != AV_PIX_FMT_YUV420P || w != context->width ||
- h != context->height)
+#ifdef USE_HWD
+ if (pv->dxva2 && pv->job)
 {
- // have to convert to our internal color space and/or rescale
- AVPicture dstpic;
- hb_avpicture_fill(&dstpic, buf);
+ hb_buffer_t *buf;
+ int ww, hh;
+
+ buf = hb_video_buffer_init( w, h );
+ ww = w;
+ hh = h;
 
- if (pv->sws_context == NULL ||
- pv->sws_width != context->width ||
- pv->sws_height != context->height ||
- pv->sws_pix_fmt != context->pix_fmt)
+ if( !pv->dst_frame )
 {
- if (pv->sws_context != NULL)
- sws_freeContext(pv->sws_context);
- pv->sws_context = hb_sws_get_context(context->width,
- context->height,
- context->pix_fmt,
- w, h, AV_PIX_FMT_YUV420P,
- SWS_LANCZOS|SWS_ACCURATE_RND);
- pv->sws_width = context->width;
- pv->sws_height = context->height;
- pv->sws_pix_fmt = context->pix_fmt;
+ pv->dst_frame = malloc( ww * hh * 3 / 2 );
+ }
+ if( hb_va_extract( pv->dxva2, pv->dst_frame, pv->frame, pv->job->width, pv->job->height, pv->job->title->crop, pv->opencl_scale, pv->job->use_opencl, pv->job->use_decomb, pv->job->use_detelecine ) == HB_WORK_ERROR )
+ {
+ hb_log( "hb_va_Extract failed!!!!!!" );
 }
- sws_scale(pv->sws_context,
- (const uint8_t* const *)frame->data, frame->linesize,
- 0, context->height, dstpic.data, dstpic.linesize);
- }
- else
- {
 w = buf->plane[0].stride;
 h = buf->plane[0].height;
- dst = buf->plane[0].data;
- copy_plane( dst, frame->data[0], w, frame->linesize[0], h );
+ uint8_t *dst = buf->plane[0].data;
+ copy_plane( dst, pv->dst_frame, w, ww, h );
 w = buf->plane[1].stride;
 h = buf->plane[1].height;
 dst = buf->plane[1].data;
- copy_plane( dst, frame->data[1], w, frame->linesize[1], h );
+ copy_plane( dst, pv->dst_frame + ww * hh, w, ww >> 1, h );
 w = buf->plane[2].stride;
 h = buf->plane[2].height;
 dst = buf->plane[2].data;
- copy_plane( dst, frame->data[2], w, frame->linesize[2], h );
+ copy_plane( dst, pv->dst_frame + ww * hh +( ( ww * hh ) >> 2 ), w, ww >> 1, h );
+ return buf;
+ }
+ else
+#endif
+ {
+ hb_buffer_t *buf = hb_video_buffer_init( w, h );
+			
+#ifdef USE_QSV
+ // no need to copy the frame data when decoding with QSV to opaque memory
+ if (pv->qsv.decode &&
+ pv->qsv.config.io_pattern == MFX_IOPATTERN_OUT_OPAQUE_MEMORY)
+ {
+ buf->qsv_details.qsv_atom = pv->frame->data[2];
+ return buf;
+ }
+#endif
+
+ uint8_t *dst = buf->data;
+
+ if (context->pix_fmt != AV_PIX_FMT_YUV420P || w != context->width ||
+ h != context->height)
+ {
+ // have to convert to our internal color space and/or rescale
+ AVPicture dstpic;
+ hb_avpicture_fill(&dstpic, buf);
+
+ if (pv->sws_context == NULL ||
+ pv->sws_width != context->width ||
+ pv->sws_height != context->height ||
+ pv->sws_pix_fmt != context->pix_fmt)
+ {
+ if (pv->sws_context != NULL)
+ sws_freeContext(pv->sws_context);
+ pv->sws_context = hb_sws_get_context(context->width,
+ context->height,
+ context->pix_fmt,
+ w, h, AV_PIX_FMT_YUV420P,
+ SWS_LANCZOS|SWS_ACCURATE_RND);
+ pv->sws_width = context->width;
+ pv->sws_height = context->height;
+ pv->sws_pix_fmt = context->pix_fmt;
+ }
+ sws_scale(pv->sws_context,
+ (const uint8_t* const *)pv->frame->data,
+ pv->frame->linesize,
+ 0, context->height, dstpic.data, dstpic.linesize);
+ }
+ else
+ {
+ w = buf->plane[0].stride;
+ h = buf->plane[0].height;
+ dst = buf->plane[0].data;
+ copy_plane( dst, pv->frame->data[0], w, pv->frame->linesize[0], h );
+ w = buf->plane[1].stride;
+ h = buf->plane[1].height;
+ dst = buf->plane[1].data;
+ copy_plane( dst, pv->frame->data[1], w, pv->frame->linesize[1], h );
+ w = buf->plane[2].stride;
+ h = buf->plane[2].height;
+ dst = buf->plane[2].data;
+ copy_plane( dst, pv->frame->data[2], w, pv->frame->linesize[2], h );
+ }
+ return buf;
 }
- return buf;
 }
 
+#ifdef USE_HWD
+
+static int get_frame_buf_hwd( AVCodecContext *context, AVFrame *frame )
+{
+
+ hb_work_private_t *pv = (hb_work_private_t*)context->opaque;
+ if ( (pv != NULL) && pv->dxva2 )
+ {
+ int result = HB_WORK_ERROR;
+ hb_work_private_t *pv = (hb_work_private_t*)context->opaque;
+ result = hb_va_get_frame_buf( pv->dxva2, context, frame );
+ if( result == HB_WORK_ERROR )
+ return avcodec_default_get_buffer( context, frame );
+ return 0;
+ }
+ else
+ return avcodec_default_get_buffer( context, frame );
+}
+
+static void hb_ffmpeg_release_frame_buf( struct AVCodecContext *p_context, AVFrame *frame )
+{
+ hb_work_private_t *p_dec = (hb_work_private_t*)p_context->opaque;
+ int i;
+ if( p_dec->dxva2 )
+ {
+ hb_va_release( p_dec->dxva2, frame );
+ }
+ else if( !frame->opaque )
+ {
+ if( frame->type == FF_BUFFER_TYPE_INTERNAL )
+ avcodec_default_release_buffer( p_context, frame );
+ }
+ for( i = 0; i < 4; i++ )
+ frame->data[i] = NULL;
+}
+#endif
+
 static void log_chapter( hb_work_private_t *pv, int chap_num, int64_t pts )
 {
 hb_chapter_t *c;
@@ -754,6 +1093,81 @@
 hb_log("%fs: Film -> Video", (float)start / 90000);
 }
 
+// send cc_buf to the CC decoder(s)
+static void cc_send_to_decoder(hb_work_private_t *pv, hb_buffer_t *buf)
+{
+ if (buf == NULL)
+ return;
+
+ // if there's more than one decoder for the captions send a copy
+ // of the buffer to all.
+ hb_subtitle_t *subtitle;
+ int ii = 0, n = hb_list_count(pv->list_subtitle);
+ while (--n > 0)
+ {
+ // make a copy of the buf then forward it to the decoder
+ hb_buffer_t *cpy = hb_buffer_dup(buf);
+
+ subtitle = hb_list_item(pv->list_subtitle, ii++);
+ hb_fifo_push(subtitle->fifo_in, cpy);
+ }
+ subtitle = hb_list_item(pv->list_subtitle, ii);
+ hb_fifo_push( subtitle->fifo_in, buf );
+}
+
+static hb_buffer_t * cc_fill_buffer(hb_work_private_t *pv, uint8_t *cc, int size, int64_t pts)
+{
+ int cc_count[4] = {0,};
+ int ii;
+ hb_buffer_t *buf = NULL;
+
+ for (ii = 0; ii < size; ii += 3)
+ {
+ if ((cc[ii] & 0x04) == 0) // not valid
+ continue;
+ if ((cc[ii+1] & 0x7f) == 0 && (cc[ii+2] & 0x7f) == 0) // stuffing
+ continue;
+ int type = cc[ii] & 0x03;
+ cc_count[type]++;
+ }
+
+ // Only handles CC1 for now.
+ if (cc_count[0] > 0)
+ {
+ buf = hb_buffer_init(cc_count[0] * 2);
+ buf->s.start = pts;
+ int jj = 0;
+ for (ii = 0; ii < size; ii += 3)
+ {
+ if ((cc[ii] & 0x04) == 0) // not valid
+ continue;
+ if ((cc[ii+1] & 0x7f) == 0 && (cc[ii+2] & 0x7f) == 0) // stuffing
+ continue;
+ int type = cc[ii] & 0x03;
+ if (type == 0)
+ {
+ buf->data[jj++] = cc[ii+1];
+ buf->data[jj++] = cc[ii+2];
+ }
+ }
+ }
+ return buf;
+}
+
+static int get_frame_type(int type)
+{
+ switch(type)
+ {
+ case AV_PICTURE_TYPE_I:
+ return HB_FRAME_I;
+ case AV_PICTURE_TYPE_B:
+ return HB_FRAME_B;
+ case AV_PICTURE_TYPE_P:
+ return HB_FRAME_P;
+ }
+ return 0;
+}
+
 /*
 * Decodes a video frame from the specified raw packet data
 * ('data', 'size', 'sequence').
@@ -772,7 +1186,6 @@
 {
 hb_work_private_t *pv = w->private_data;
 int got_picture, oldlevel = 0;
- AVFrame frame = { { 0 } };
 AVPacket avp;
 
 if ( global_verbosity_level <= 1 )
@@ -786,38 +1199,66 @@
 avp.size = size;
 avp.pts = pts;
 avp.dts = dts;
+
+ if (pv->palette != NULL)
+ {
+ uint8_t * palette;
+ int size;
+ palette = av_packet_new_side_data(&avp, AV_PKT_DATA_PALETTE,
+ AVPALETTE_SIZE);
+ size = MIN(pv->palette->size, AVPALETTE_SIZE);
+ memcpy(palette, pv->palette->data, size);
+ hb_buffer_close(&pv->palette);
+ }
+
 /*
 * libav avcodec_decode_video2() needs AVPacket flagged with AV_PKT_FLAG_KEY
 * for some codecs. For example, sequence of PNG in a mov container.
- */ 
+ */
 if ( frametype & HB_FRAME_KEY )
 {
 avp.flags |= AV_PKT_FLAG_KEY;
 }
 
- if ( avcodec_decode_video2( pv->context, &frame, &got_picture, &avp ) < 0 )
+#ifdef USE_QSV_PTS_WORKAROUND
+ /*
+ * The MediaSDK decoder will return decoded frames in the correct order,
+ * but *sometimes* with the incorrect timestamp assigned to them.
+ *
+ * We work around it by saving the input timestamps (in chronological order)
+ * and restoring them after decoding.
+ */
+ if (pv->qsv.decode && avp.data != NULL)
+ {
+ hb_av_add_new_pts(pv->qsv.pts_list, avp.pts);
+ }
+#endif
+
+ if ( avcodec_decode_video2( pv->context, pv->frame, &got_picture, &avp ) < 0 )
 {
 ++pv->decode_errors;
 }
- if ( global_verbosity_level <= 1 )
+
+#ifdef USE_QSV
+ if (pv->qsv.decode && pv->job->qsv.ctx == NULL && pv->video_codec_opened > 0)
 {
- av_log_set_level( oldlevel );
+ // this is quite late, but we can't be certain that the QSV context is
+ // available until after we call avcodec_decode_video2() at least once
+ pv->job->qsv.ctx = pv->context->priv_data;
 }
- if( got_picture && pv->wait_for_keyframe > 0 )
+#endif
+
+#ifdef USE_QSV_PTS_WORKAROUND
+ if (pv->qsv.decode && got_picture)
 {
- // Libav is inconsistant about how it flags keyframes. For many
- // codecs it simply sets frame.key_frame. But for others, it only
- // sets frame.pict_type. And for yet others neither gets set at all
- // (qtrle).
- int key = frame.key_frame || (w->codec_param != AV_CODEC_ID_H264 &&
- (frame.pict_type == 0 ||
- frame.pict_type == AV_PICTURE_TYPE_I));
- if( !key )
- {
- pv->wait_for_keyframe--;
- return 0;
- }
- pv->wait_for_keyframe = 0;
+ // we got a decoded frame, restore the lowest available PTS
+ pv->frame->pkt_pts = hb_av_pop_next_pts(pv->qsv.pts_list);
+ }
+#endif
+
+ if ( global_verbosity_level <= 1 )
+ {
+ av_log_set_level( oldlevel );
 }
 if( got_picture )
 {
@@ -839,53 +1280,132 @@
 if ( !pv->frame_duration_set )
 compute_frame_duration( pv );
 
+ double pts;
 double frame_dur = pv->duration;
- if ( frame.repeat_pict )
+ if ( pv->frame->repeat_pict )
 {
- frame_dur += frame.repeat_pict * pv->field_duration;
+ frame_dur += pv->frame->repeat_pict * pv->field_duration;
 }
-
+#ifdef USE_HWD
+ if( pv->dxva2 && pv->dxva2->do_job == HB_WORK_OK )
+ {
+ if( avp.pts>0 )
+ {
+ if( pv->dxva2->input_pts[0] != 0 && pv->dxva2->input_pts[1] == 0 )
+ pv->frame->pkt_pts = pv->dxva2->input_pts[0];
+ else
+ pv->frame->pkt_pts = pv->dxva2->input_pts[0]<pv->dxva2->input_pts[1] ? pv->dxva2->input_pts[0] : pv->dxva2->input_pts[1];
+ }
+ }
+#endif
 // If there was no pts for this frame, assume constant frame rate
 // video & estimate the next frame time from the last & duration.
- double pts;
- if (frame.pkt_pts == AV_NOPTS_VALUE)
+ if (pv->frame->pkt_pts == AV_NOPTS_VALUE || hb_gui_use_hwd_flag == 1)
 {
 pts = pv->pts_next;
 }
 else
 {
- pts = frame.pkt_pts;
+ pts = pv->frame->pkt_pts;
+ // Detect streams with broken out of order timestamps
+ if (!pv->brokenTS && pv->frame->pkt_pts < pv->prev_pts)
+ {
+ hb_log("Broken timestamps detected. Reordering.");
+ pv->brokenTS = 1;
+ }
+ pv->prev_pts = pv->frame->pkt_pts;
 }
+
 pv->pts_next = pts + frame_dur;
 
- if ( frame.top_field_first )
+ if ( pv->frame->top_field_first )
 {
 flags |= PIC_FLAG_TOP_FIELD_FIRST;
 }
- if ( !frame.interlaced_frame )
+ if ( !pv->frame->interlaced_frame )
 {
 flags |= PIC_FLAG_PROGRESSIVE_FRAME;
 }
- if ( frame.repeat_pict == 1 )
+ if ( pv->frame->repeat_pict == 1 )
 {
 flags |= PIC_FLAG_REPEAT_FIRST_FIELD;
 }
- if ( frame.repeat_pict == 2 )
+ if ( pv->frame->repeat_pict == 2 )
 {
 flags |= PIC_FLAG_REPEAT_FRAME;
 }
+ int frametype = get_frame_type(pv->frame->pict_type);
+
+ // Check for CC data
+ AVFrameSideData *sd;
+ sd = av_frame_get_side_data(pv->frame, AV_FRAME_DATA_A53_CC);
+ if (sd != NULL)
+ {
+ if (!pv->job && pv->title && sd->size > 0)
+ {
+ hb_subtitle_t *subtitle;
+ int i = 0;
+
+ while ((subtitle = hb_list_item(pv->title->list_subtitle, i++)))
+ {
+ /*
+ * Let's call them 608 subs for now even if they aren't,
+ * since they are the only types we grok.
+ */
+ if (subtitle->source == CC608SUB)
+ {
+ break;
+ }
+ }
+ if (subtitle == NULL)
+ {
+ subtitle = calloc(sizeof( hb_subtitle_t ), 1);
+ subtitle->track = 0;
+ subtitle->id = 0;
+ subtitle->format = TEXTSUB;
+ subtitle->source = CC608SUB;
+ subtitle->config.dest = PASSTHRUSUB;
+ subtitle->codec = WORK_DECCC608;
+ subtitle->type = 5;
+ snprintf(subtitle->lang, sizeof( subtitle->lang ),
+ "Closed Captions");
+ /*
+ * The language of the subtitles will be the same as the
+ * first audio track, i.e. the same as the video.
+ */
+ hb_audio_t *audio = hb_list_item(pv->title->list_audio, 0);
+ if (audio != NULL)
+ {
+ snprintf(subtitle->iso639_2, sizeof(subtitle->iso639_2),
+ "%s", audio->config.lang.iso639_2);
+ } else {
+ snprintf(subtitle->iso639_2, sizeof(subtitle->iso639_2),
+ "und");
+ }
+ hb_list_add(pv->title->list_subtitle, subtitle);
+ }
+ }
+ if (pv->list_subtitle != NULL && sd->size > 0)
+ {
+ hb_buffer_t *cc_buf;
+ cc_buf = cc_fill_buffer(pv, sd->data, sd->size, pts);
+ cc_send_to_decoder(pv, cc_buf);
+ }
+ }
 
 hb_buffer_t *buf;
 
 // if we're doing a scan or this content couldn't have been broken
 // by Microsoft we don't worry about timestamp reordering
- if ( ! pv->job || ! pv->brokenByMicrosoft )
+ if ( ! pv->job || ! pv->brokenTS )
 {
- buf = copy_frame( pv, &frame );
+ buf = copy_frame( pv );
+ av_frame_unref(pv->frame);
 buf->s.start = pts;
 buf->sequence = sequence;
 
 buf->s.flags = flags;
+ buf->s.frametype = frametype;
 
 if ( pv->new_chap && buf->s.start >= pv->chap_time )
 {
@@ -931,7 +1451,6 @@
 {
 pv->queue_primed = 1;
 buf->s.start = heap_pop( &pv->pts_heap );
-
 if ( pv->new_chap && buf->s.start >= pv->chap_time )
 {
 buf->s.new_chap = pv->new_chap;
@@ -948,10 +1467,12 @@
 }
 
 // add the new frame to the delayq & push its timestamp on the heap
- buf = copy_frame( pv, &frame );
+ buf = copy_frame( pv );
+ av_frame_unref(pv->frame);
 buf->sequence = sequence;
 /* Store picture flags for later use by filters */
 buf->s.flags = flags;
+ buf->s.frametype = frametype;
 pv->delayq[slot] = buf;
 heap_push( &pv->pts_heap, pts );
 
@@ -998,12 +1519,25 @@
 } while ( pos < size );
 
 /* the stuff above flushed the parser, now flush the decoder */
- if ( size <= 0 )
+ if (size <= 0)
 {
- while ( decodeFrame( w, NULL, 0, sequence, AV_NOPTS_VALUE, AV_NOPTS_VALUE, 0 ) )
+ while (decodeFrame(w, NULL, 0, sequence, AV_NOPTS_VALUE, AV_NOPTS_VALUE, 0))
 {
+ continue;
 }
- flushDelayQueue( pv );
+#ifdef USE_QSV
+ if (pv->qsv.decode)
+ {
+ // flush a second time
+ while (decodeFrame(w, NULL, 0, sequence, AV_NOPTS_VALUE, AV_NOPTS_VALUE, 0))
+ {
+ continue;
+ }
+ }
+#endif
+ flushDelayQueue(pv);
+ if (pv->list_subtitle != NULL)
+ cc_send_to_decoder(pv, hb_buffer_init(0));
 }
 }
 
@@ -1045,30 +1579,116 @@
 pv->title = w->title;
 pv->list = hb_list_init();
 
+#ifdef USE_QSV
+ if (hb_qsv_decode_is_enabled(job))
+ {
+ // determine which encoder we're using
+ hb_qsv_info_t *info = hb_qsv_info_get(job->vcodec);
+ pv->qsv.decode = info != NULL;
+ if (pv->qsv.decode)
+ {
+ // setup the QSV configuration
+ pv->qsv.config.io_pattern = MFX_IOPATTERN_OUT_OPAQUE_MEMORY;
+ pv->qsv.config.impl_requested = info->implementation;
+ pv->qsv.config.async_depth = job->qsv.async_depth;
+ pv->qsv.config.sync_need = 0;
+ pv->qsv.config.usage_threaded = 1;
+ pv->qsv.config.additional_buffers = 64; // FIFO_LARGE
+ if (info->capabilities & HB_QSV_CAP_RATECONTROL_LA)
+ {
+ // more surfaces may be needed for the lookahead
+ pv->qsv.config.additional_buffers = 160;
+ }
+ pv->qsv.codec_name = hb_qsv_decode_get_codec_name(w->codec_param);
+ }
+ }
+ else
+ {
+ pv->qsv.decode = 0;
+ }
+#endif
+
 if( pv->job && pv->job->title && !pv->job->title->has_resolution_change )
 {
 pv->threads = HB_FFMPEG_THREADS_AUTO;
 }
+
+ AVCodec *codec = NULL;
+
+#ifdef USE_QSV
+ if (pv->qsv.decode)
+ {
+ codec = avcodec_find_decoder_by_name(pv->qsv.codec_name);
+ }
+ else
+#endif
+ {
+ codec = avcodec_find_decoder(w->codec_param);
+ }
+ if ( codec == NULL )
+ {
+ hb_log( "decavcodecvInit: failed to find codec for id (%d)", w->codec_param );
+ return 1;
+ }
+
 if ( pv->title->opaque_priv )
 {
 AVFormatContext *ic = (AVFormatContext*)pv->title->opaque_priv;
- AVCodec *codec = avcodec_find_decoder( w->codec_param );
- if ( codec == NULL )
- {
- hb_log( "decavcodecvInit: failed to find codec for id (%d)", w->codec_param );
- return 1;
- }
+
 pv->context = avcodec_alloc_context3(codec);
 avcodec_copy_context( pv->context, ic->streams[pv->title->video_id]->codec);
 pv->context->workaround_bugs = FF_BUG_AUTODETECT;
 pv->context->err_recognition = AV_EF_CRCCHECK;
 pv->context->error_concealment = FF_EC_GUESS_MVS|FF_EC_DEBLOCK;
+#ifdef USE_HWD
+ // QSV decoding is faster, so prefer it to DXVA2
+ if (pv->job != NULL && !pv->qsv.decode && pv->job->use_hwd &&
+ hb_use_dxva(pv->title))
+ {
+ pv->dxva2 = hb_va_create_dxva2( pv->dxva2, w->codec_param );
+ if( pv->dxva2 && pv->dxva2->do_job == HB_WORK_OK )
+ {
+ hb_va_new_dxva2( pv->dxva2, pv->context );
+ pv->context->slice_flags |= SLICE_FLAG_ALLOW_FIELD;
+ pv->context->opaque = pv;
+ pv->context->get_buffer = get_frame_buf_hwd;
+ pv->context->release_buffer = hb_ffmpeg_release_frame_buf;
+ pv->context->get_format = hb_ffmpeg_get_format;
+ pv->opencl_scale = ( hb_oclscale_t * )malloc( sizeof( hb_oclscale_t ) );
+ memset( pv->opencl_scale, 0, sizeof( hb_oclscale_t ) );
+ pv->threads = 1;
+ }
+ }
+#endif
+
+
+#ifdef USE_QSV
+ if (pv->qsv.decode)
+ {
+#ifdef USE_QSV_PTS_WORKAROUND
+ pv->qsv.pts_list = hb_list_init();
+#endif
+ // set the QSV configuration before opening the decoder
+ pv->context->hwaccel_context = &pv->qsv.config;
+ }
+#endif
 
- if ( hb_avcodec_open( pv->context, codec, NULL, pv->threads ) )
+ // Set encoder opts...
+ AVDictionary * av_opts = NULL;
+ av_dict_set( &av_opts, "refcounted_frames", "1", 0 );
+ if (pv->title->flags & HBTF_NO_IDR)
 {
+ av_dict_set( &av_opts, "flags", "output_corrupt", 0 );
+ }
+
+ if ( hb_avcodec_open( pv->context, codec, &av_opts, pv->threads ) )
+ {
+ av_dict_free( &av_opts );
 hb_log( "decavcodecvInit: avcodec_open failed" );
 return 1;
 }
+ av_dict_free( &av_opts );
+
 pv->video_codec_opened = 1;
 // avi, mkv and possibly mp4 containers can contain the M$ VFW packed
 // b-frames abortion that messes up frame ordering and timestamps.
@@ -1076,49 +1696,42 @@
 // info externally. We should patch ffmpeg to add a flag to the
 // codec context for this but until then we mark all ffmpeg streams
 // as suspicious.
- pv->brokenByMicrosoft = 1;
+ pv->brokenTS = 1;
 }
 else
 {
- AVCodec *codec = avcodec_find_decoder( w->codec_param );
 pv->parser = av_parser_init( w->codec_param );
- pv->context = avcodec_alloc_context3( codec );
- pv->context->workaround_bugs = FF_BUG_AUTODETECT;
- pv->context->err_recognition = AV_EF_CRCCHECK;
- pv->context->error_concealment = FF_EC_GUESS_MVS|FF_EC_DEBLOCK;
 }
- return 0;
-}
 
-static int next_hdr( hb_buffer_t *in, int offset )
-{
- uint8_t *dat = in->data;
- uint16_t last2 = 0xffff;
- for ( ; in->size - offset > 1; ++offset )
+ pv->frame = av_frame_alloc();
+ if (pv->frame == NULL)
 {
- if ( last2 == 0 && dat[offset] == 0x01 )
- // found an mpeg start code
- return offset - 2;
-
- last2 = ( last2 << 8 ) | dat[offset];
+ hb_log("decavcodecvInit: av_frame_alloc failed");
+ return 1;
 }
 
- return -1;
-}
-
-static int find_hdr( hb_buffer_t *in, int offset, uint8_t hdr_type )
-{
- if ( in->size - offset < 4 )
- // not enough room for an mpeg start code
- return -1;
-
- for ( ; ( offset = next_hdr( in, offset ) ) >= 0; ++offset )
+ /*
+ * If not scanning, then are we supposed to extract Closed Captions
+ * and send them to the decoder?
+ */
+ if (job != NULL && hb_list_count(job->list_subtitle) > 0)
 {
- if ( in->data[offset+3] == hdr_type )
- // found it
- break;
+ hb_subtitle_t *subtitle;
+ int i = 0;
+
+ while ((subtitle = hb_list_item(job->list_subtitle, i++)) != NULL)
+ {
+ if (subtitle->source == CC608SUB)
+ {
+ if (pv->list_subtitle == NULL)
+ {
+ pv->list_subtitle = hb_list_init();
+ }
+ hb_list_add(pv->list_subtitle, subtitle);
+ }
+ }
 }
- return offset;
+ return 0;
 }
 
 static int setup_extradata( hb_work_object_t *w, hb_buffer_t *in )
@@ -1130,53 +1743,31 @@
 // vc1t_read_header allocates 'extradata' to deal with header issues
 // related to Microsoft's bizarre engineering notions. We alloc a chunk
 // of space to make vc1 work then associate the codec with the context.
- if ( w->codec_param != AV_CODEC_ID_VC1 )
- {
- // we haven't been inflicted with M$ - allocate a little space as
- // a marker and return success.
- pv->context->extradata_size = 0;
- // av_malloc uses posix_memalign which is allowed to
- // return NULL when allocating 0 bytes. We use extradata == NULL
- // to trigger initialization of extradata and the decoder, so
- // we can not set it to NULL here. So allocate a small
- // buffer instead.
- pv->context->extradata = av_malloc(1);
- return 0;
- }
-
- // find the start and and of the sequence header
- int shdr, shdr_end;
- if ( ( shdr = find_hdr( in, 0, 0x0f ) ) < 0 )
+ if (pv->context->extradata == NULL)
 {
- // didn't find start of seq hdr
- return 1;
- }
- if ( ( shdr_end = next_hdr( in, shdr + 4 ) ) < 0 )
- {
- shdr_end = in->size;
- }
- shdr_end -= shdr;
-
- // find the start and and of the entry point header
- int ehdr, ehdr_end;
- if ( ( ehdr = find_hdr( in, 0, 0x0e ) ) < 0 )
- {
- // didn't find start of entry point hdr
+ if (pv->parser == NULL || pv->parser == NULL ||
+ pv->parser->parser->split == NULL)
+ {
+ return 0;
+ }
+ else
+ {
+ int size;
+ size = pv->parser->parser->split(pv->context, in->data, in->size);
+ if (size > 0)
+ {
+ pv->context->extradata_size = size;
+ pv->context->extradata =
+ av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (pv->context->extradata == NULL)
+ return 1;
+ memcpy(pv->context->extradata, in->data, size);
+ return 0;
+ }
+ }
 return 1;
 }
- if ( ( ehdr_end = next_hdr( in, ehdr + 4 ) ) < 0 )
- {
- ehdr_end = in->size;
- }
- ehdr_end -= ehdr;
 
- // found both headers - allocate an extradata big enough to hold both
- // then copy them into it.
- pv->context->extradata_size = shdr_end + ehdr_end;
- pv->context->extradata = av_malloc(pv->context->extradata_size + 8);
- memcpy( pv->context->extradata, in->data + shdr, shdr_end );
- memcpy( pv->context->extradata + shdr_end, in->data + ehdr, ehdr_end );
- memset( pv->context->extradata + shdr_end + ehdr_end, 0, 8);
 return 0;
 }
 
@@ -1194,7 +1785,7 @@
 /* if we got an empty buffer signaling end-of-stream send it downstream */
 if ( in->size == 0 )
 {
- if ( pv->context->codec != NULL )
+ if (pv->context != NULL && pv->context->codec != NULL)
 {
 decodeVideo( w, in->data, in->size, in->sequence, pts, dts, in->s.frametype );
 }
@@ -1207,22 +1798,31 @@
 // first frame because of M$ VC1 braindamage).
 if ( !pv->video_codec_opened )
 {
- AVCodec *codec = avcodec_find_decoder( w->codec_param );
+
+ AVCodec *codec = NULL;
+#ifdef USE_QSV
+ if (pv->qsv.decode)
+ {
+ codec = avcodec_find_decoder_by_name(pv->qsv.codec_name);
+ }
+ else
+#endif
+ {
+ codec = avcodec_find_decoder(w->codec_param);
+ }
+
 if ( codec == NULL )
 {
 hb_log( "decavcodecvWork: failed to find codec for id (%d)", w->codec_param );
 *buf_out = hb_buffer_init( 0 );;
 return HB_WORK_DONE;
 }
- // Note that there is currently a small memory leak in libav at this
- // point. pv->context->priv_data gets allocated by
- // avcodec_alloc_context3(), then avcodec_get_context_defaults3()
- // memsets the context and looses the pointer.
- //
- // avcodec_get_context_defaults3() looks as if they intended for
- // it to preserve any existing priv_data because they test the pointer
- // before allocating new memory, but the memset has already cleared it.
- avcodec_get_context_defaults3( pv->context, codec );
+
+ pv->context = avcodec_alloc_context3( codec );
+ pv->context->workaround_bugs = FF_BUG_AUTODETECT;
+ pv->context->err_recognition = AV_EF_CRCCHECK;
+ pv->context->error_concealment = FF_EC_GUESS_MVS|FF_EC_DEBLOCK;
+
 if ( setup_extradata( w, in ) )
 {
 // we didn't find the headers needed to set up extradata.
@@ -1231,13 +1831,34 @@
 hb_buffer_close( &in );
 return HB_WORK_OK;
 }
+
+#ifdef USE_QSV
+ if (pv->qsv.decode)
+ {
+#ifdef USE_QSV_PTS_WORKAROUND
+ pv->qsv.pts_list = hb_list_init();
+#endif
+ // set the QSV configuration before opening the decoder
+ pv->context->hwaccel_context = &pv->qsv.config;
+ }
+#endif
+
+ AVDictionary * av_opts = NULL;
+ av_dict_set( &av_opts, "refcounted_frames", "1", 0 );
+ if (pv->title->flags & HBTF_NO_IDR)
+ {
+ av_dict_set( &av_opts, "flags", "output_corrupt", 0 );
+ }
+
 // disable threaded decoding for scan, can cause crashes
- if ( hb_avcodec_open( pv->context, codec, NULL, pv->threads ) )
+ if ( hb_avcodec_open( pv->context, codec, &av_opts, pv->threads ) )
 {
+ av_dict_free( &av_opts );
 hb_log( "decavcodecvWork: avcodec_open failed" );
 *buf_out = hb_buffer_init( 0 );;
 return HB_WORK_DONE;
 }
+ av_dict_free( &av_opts );
 pv->video_codec_opened = 1;
 }
 
@@ -1251,6 +1872,21 @@
 pv->new_chap = in->s.new_chap;
 pv->chap_time = pts >= 0? pts : pv->pts_next;
 }
+#ifdef USE_HWD
+ if( pv->dxva2 && pv->dxva2->do_job == HB_WORK_OK )
+ {
+ if( pv->dxva2->input_pts[0] <= pv->dxva2->input_pts[1] )
+ pv->dxva2->input_pts[0] = pts;
+ else if( pv->dxva2->input_pts[0] > pv->dxva2->input_pts[1] )
+ pv->dxva2->input_pts[1] = pts;
+ pv->dxva2->input_dts = dts;
+ }
+#endif
+ if (in->palette != NULL)
+ {
+ pv->palette = in->palette;
+ in->palette = NULL;
+ }
 decodeVideo( w, in->data, in->size, in->sequence, pts, dts, in->s.frametype );
 hb_buffer_close( &in );
 *buf_out = link_buf_list( pv );
@@ -1280,7 +1916,10 @@
 duration = ( (double)st->duration * (double)st->time_base.num ) /
 ( (double)st->nb_frames * (double)st->time_base.den );
 }
- else
+ // Raw demuxers set a default fps of 25 and do not parse
+ // a value from the container. So use the codec time_base
+ // for raw demuxers.
+ else if (ic->iformat->raw_codec_id == AV_CODEC_ID_NONE)
 {
 // XXX We don't have a frame count or duration so try to use the
 // far less reliable time base info in the stream.
@@ -1299,12 +1938,6 @@
 tb = &(st->time_base);
 duration = (double)tb->num / (double)tb->den;
 }
- else if ( st->r_frame_rate.den * 64L > st->r_frame_rate.num &&
- st->r_frame_rate.num > st->r_frame_rate.den * 8L )
- {
- tb = &(st->r_frame_rate);
- duration = (double)tb->den / (double)tb->num;
- }
 }
 if ( !duration &&
 pv->context->time_base.num * max_fps > pv->context->time_base.den &&
@@ -1358,6 +1991,9 @@
 
 memset( info, 0, sizeof(*info) );
 
+ if (pv->context == NULL)
+ return 0;
+
 info->bitrate = pv->context->bit_rate;
 // HandBrake's video pipeline uses yuv420 color. This means all
 // dimensions must be even. So we must adjust the dimensions
@@ -1444,6 +2080,23 @@
 }
 }
 
+ info->video_decode_support = HB_DECODE_SUPPORT_SW;
+ switch (pv->context->codec_id)
+ {
+ case AV_CODEC_ID_H264:
+ if (pv->context->pix_fmt == AV_PIX_FMT_YUV420P ||
+ pv->context->pix_fmt == AV_PIX_FMT_YUVJ420P)
+ {
+#ifdef USE_QSV
+ info->video_decode_support |= HB_DECODE_SUPPORT_QSV;
+#endif
+ }
+ break;
+
+ default:
+ break;
+ }
+
 return 1;
 }
 
@@ -1457,7 +2110,7 @@
 {
 hb_work_private_t *pv = w->private_data;
 
- if ( pv->context->codec )
+ if (pv->context != NULL && pv->context->codec != NULL)
 {
 flushDelayQueue( pv );
 hb_buffer_t *buf = link_buf_list( pv );
@@ -1467,6 +2120,7 @@
 pv->video_codec_opened = 0;
 hb_avcodec_close( pv->context );
 av_freep( &pv->context->extradata );
+ av_freep( &pv->context );
 if ( pv->parser )
 {
 av_parser_close(pv->parser);
@@ -1492,7 +2146,6 @@
 .info = decavcodecvInfo,
 .bsinfo = decavcodecvBSInfo
 };
-
 static void decodeAudio(hb_audio_t *audio, hb_work_private_t *pv, uint8_t *data,
 int size, int64_t pts)
 {
@@ -1501,12 +2154,11 @@
 int pos = 0;
 
 // If we are given a pts, use it; but don't lose partial ticks.
- if (pts != -1 && (int64_t)pv->pts_next != pts)
+ if (pts != AV_NOPTS_VALUE && (int64_t)pv->pts_next != pts)
 pv->pts_next = pts;
 while (pos < size)
 {
 int got_frame;
- AVFrame frame = { { 0 } };
 AVPacket avp;
 
 av_init_packet(&avp);
@@ -1515,7 +2167,7 @@
 avp.pts = pv->pts_next;
 avp.dts = AV_NOPTS_VALUE;
 
- int len = avcodec_decode_audio4(context, &frame, &got_frame, &avp);
+ int len = avcodec_decode_audio4(context, pv->frame, &got_frame, &avp);
 if ((len < 0) || (!got_frame && !(loop_limit--)))
 {
 return;
@@ -1530,8 +2182,18 @@
 if (got_frame)
 {
 hb_buffer_t *out;
- double duration = frame.nb_samples * pv->duration;
- double pts_next = pv->pts_next + duration;
+ int samplerate;
+ // libavcoded doesn't yet consistently set frame->sample_rate
+ if (pv->frame->sample_rate != 0)
+ {
+ samplerate = pv->frame->sample_rate;
+ }
+ else
+ {
+ samplerate = context->sample_rate;
+ }
+ double duration = (90000. * pv->frame->nb_samples /
+ (double)samplerate);
 
 if (audio->config.out.codec & HB_ACODEC_PASS_FLAG)
 {
@@ -1543,26 +2205,50 @@
 }
 else
 {
+ AVFrameSideData *side_data;
+ if ((side_data =
+ av_frame_get_side_data(pv->frame,
+ AV_FRAME_DATA_DOWNMIX_INFO)) != NULL)
+ {
+ double surround_mix_level, center_mix_level;
+ AVDownmixInfo *downmix_info = (AVDownmixInfo*)side_data->data;
+ if (audio->config.out.mixdown == HB_AMIXDOWN_DOLBY ||
+ audio->config.out.mixdown == HB_AMIXDOWN_DOLBYPLII)
+ {
+ surround_mix_level = downmix_info->surround_mix_level_ltrt;
+ center_mix_level = downmix_info->center_mix_level_ltrt;
+ }
+ else
+ {
+ surround_mix_level = downmix_info->surround_mix_level;
+ center_mix_level = downmix_info->center_mix_level;
+ }
+ hb_audio_resample_set_mix_levels(pv->resample,
+ surround_mix_level,
+ center_mix_level,
+ downmix_info->lfe_mix_level);
+ }
 hb_audio_resample_set_channel_layout(pv->resample,
- context->channel_layout,
- context->channels);
+ pv->frame->channel_layout);
 hb_audio_resample_set_sample_fmt(pv->resample,
- context->sample_fmt);
+ pv->frame->format);
 if (hb_audio_resample_update(pv->resample))
 {
 hb_log("decavcodec: hb_audio_resample_update() failed");
+ av_frame_unref(pv->frame);
 return;
 }
- out = hb_audio_resample(pv->resample, frame.extended_data,
- frame.nb_samples);
+ out = hb_audio_resample(pv->resample, pv->frame->extended_data,
+ pv->frame->nb_samples);
 }
+ av_frame_unref(pv->frame);
 
 if (out != NULL)
 {
 out->s.start = pv->pts_next;
 out->s.duration = duration;
- out->s.stop = pts_next;
- pv->pts_next = pts_next;
+ out->s.stop = duration + pv->pts_next;
+ pv->pts_next = duration + pv->pts_next;
 hb_list_add(pv->list, out);
 }
 }

HandBrake-0.9.9.tar.bz2/libhb/deccc608sub.c -> HandBrake-0.10.0.tar.bz2/libhb/deccc608sub.c Changed

@@ -1,5 +1,14 @@
+/* deccc608sub.c
+
+ Copyright (c) 2003-2014 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
 /*
- * From ccextractor, leave this file as intact and close to the original as possible so that 
+ * From ccextractor, leave this file as intact and close to the original as possible so that
 * it is easy to patch in fixes - even though this file contains code that we don't need.
 *
 * Note that the SRT sub generation from CC could be useful for mkv subs.
@@ -7,51 +16,34 @@
 #include "hb.h"
 #include "deccc608sub.h"
 
+#define SSA_PREAMBLE_LEN 24
 /*
 * ccextractor static configuration variables.
 */
 static int debug_608 = 0;
-static int trim_subs = 1;
-static int nofontcolor = 0;
-static enum encoding_type encoding = ENC_UTF_8;
 static int cc_channel = 1;
-static enum output_format write_format = OF_SRT;
-static int sentence_cap = 0;
 static int subs_delay = 0;
-static int64_t screens_to_process = -1;
-static int processed_enough = 0;
-static int gui_mode_reports = 0;
-static int norollup = 1;
-static int direct_rollup = 0;
 
 /*
 * Get the time of the last buffer that we have received.
 */
-static int64_t get_fts(struct s_write *wb)
+static int64_t get_last_pts(struct s_write *wb)
 {
 return wb->last_pts;
 }
 
 #define fatal(N, ...) // N
-#define XMLRPC_APPEND(N, ...) // N
 
-int rowdata[] = {11,-1,1,2,3,4,12,13,14,15,5,6,7,8,9,10};
+int rowdata[] = {11,-1,1,2,3,4,12,13,14,15,5,6,7,8,9,10};
 // Relationship between the first PAC byte and the row number
 
 // The following enc_buffer is not used at the moment, if it does get used
 // we need to bring it into the swrite struct. Same for "str".
-#define INITIAL_ENC_BUFFER_CAPACITY		2048
-
-unsigned char str[2048]; // Another generic general purpose buffer
-
-#define GUARANTEE(wb, length) if (length>wb->enc_buffer_capacity) \
-{wb->enc_buffer_capacity*=2; wb->enc_buffer=(unsigned char*) realloc (wb->enc_buffer, wb->enc_buffer_capacity); \
- if (wb->enc_buffer==NULL) { fatal (EXIT_NOT_ENOUGH_MEMORY, "Not enough memory, bailing out\n"); } \
-}
+#define INITIAL_ENC_BUFFER_CAPACITY 2048
 
-const unsigned char pac2_attribs[][3]= // Color, font, ident
+static const unsigned char pac2_attribs[][3]= // Color, font, ident
 {
- {COL_WHITE, FONT_REGULAR, 0}, // 0x40 || 0x60 
+ {COL_WHITE, FONT_REGULAR, 0}, // 0x40 || 0x60
 {COL_WHITE, FONT_UNDERLINED, 0}, // 0x41 || 0x61
 {COL_GREEN, FONT_REGULAR, 0}, // 0x42 || 0x62
 {COL_GREEN, FONT_UNDERLINED, 0}, // 0x43 || 0x63
@@ -85,30 +77,10 @@
 {COL_WHITE, FONT_UNDERLINED, 28} // 0x5f || 0x7f
 };
 
-// Preencoded strings
-unsigned char encoded_crlf[16]; 
-unsigned int encoded_crlf_length;
-unsigned char encoded_br[16];
-unsigned int encoded_br_length;
-
 // Default color
-unsigned char usercolor_rgb[8]="";
-enum color_code default_color=COL_WHITE;
-
-const char *sami_header= // TODO: Revise the \n\
-</STYLE>\n\
-</HEAD>\n\n\
-<BODY>\n";
-
-const char *command_type[] =
+static enum color_code default_color=COL_WHITE;
+
+static const char *command_type[] =
 {
 "Unknown",
 "EDM - EraseDisplayedMemory",
@@ -126,7 +98,7 @@
 "RTD - Resume Text Display"
 };
 
-const char *font_text[]=
+static const char *font_text[]=
 {
 "regular",
 "italics",
@@ -134,28 +106,23 @@
 "underlined italics"
 };
 
-const char *cc_modes_text[]=
-{
- "Pop-Up captions"
-};
-
-const char *color_text[][2]=
+static const char *color_text[][2]=
 {
- {"white",""},
- {"green",""},
- {"blue",""},
- {"cyan",""},
- {"red",""},
- {"yellow",""},
- {"magenta",""},
- {"userdefined","<font color=\""}
+ {"white", "&HFFFFFF&"},
+ {"green", "&H00FF00&"},
+ {"blue", "&HFF0000&"},
+ {"cyan", "&HFFFF00&"},
+ {"red", "&H0000FF&"},
+ {"yellow", "&H00FFFF&"},
+ {"magenta", "&HFF00FF&"},
+ {"userdefined", "&HFFFFFF&"}
 };
 
-int general_608_init (struct s_write *wb)
+static int general_608_init (struct s_write *wb)
 {
 if( !wb->enc_buffer )
 {
- wb->enc_buffer=(unsigned char *) malloc (INITIAL_ENC_BUFFER_CAPACITY); 
+ wb->enc_buffer=(unsigned char *) malloc (INITIAL_ENC_BUFFER_CAPACITY);
 if (wb->enc_buffer==NULL)
 return -1;
 wb->enc_buffer_capacity=INITIAL_ENC_BUFFER_CAPACITY;
@@ -163,7 +130,7 @@
 
 if( !wb->subline) {
 wb->subline = malloc(2048);
- 
+
 if (!wb->subline)
 {
 return -1;
@@ -185,7 +152,7 @@
 * parallel encodes to fail - to be honest they will be stuffed anyway since
 * the CC's may be overwriting the buffers.
 */
-void general_608_close (struct s_write *wb)
+static void general_608_close (struct s_write *wb)
 {
 if( wb->enc_buffer ) {
 free(wb->enc_buffer);
@@ -204,1190 +171,600 @@
 
 #include <ctype.h>
 
-void get_char_in_latin_1 (unsigned char *buffer, unsigned char c)
+// Returns number of bytes used
+static int get_char_in_utf8(unsigned char *buffer, unsigned char c)
 {
- unsigned char c1='?';
- if (c<0x80) 
- {	
- // Regular line-21 character set, mostly ASCII except these exceptions
- switch (c)
- {
- case 0x2a: // lowercase a, acute accent
- c1=0xe1;
- break;
- case 0x5c: // lowercase e, acute accent
- c1=0xe9;
- break;
- case 0x5e: // lowercase i, acute accent
- c1=0xed;
- break;			
- case 0x5f: // lowercase o, acute accent
- c1=0xf3;
- break;
- case 0x60: // lowercase u, acute accent
- c1=0xfa;
- break;
- case 0x7b: // lowercase c with cedilla
- c1=0xe7;
- break;
- case 0x7c: // division symbol
- c1=0xf7;
- break;
- case 0x7d: // uppercase N tilde
- c1=0xd1;
- break;
- case 0x7e: // lowercase n tilde
- c1=0xf1;
- break;
- default:
- c1=c;
- break;
- }
- *buffer=c1;
- return;
- }
- switch (c)
- {
- // THIS BLOCK INCLUDES THE 16 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
- // THAT COME FROM HI BYTE=0x11 AND LOW BETWEEN 0x30 AND 0x3F		
- case 0x80: // Registered symbol (R)
- c1=0xae;
- break;			
- case 0x81: // degree sign
- c1=0xb0;
- break;
- case 0x82: // 1/2 symbol			
- c1=0xbd;
- break;
- case 0x83: // Inverted (open) question mark			
- c1=0xbf;
- break;
- case 0x84: // Trademark symbol (TM) - Does not exist in Latin 1
- break;			
- case 0x85: // Cents symbol			
- c1=0xa2;
- break;
- case 0x86: // Pounds sterling			
- c1=0xa3;
- break;
- case 0x87: // Music note - Not in latin 1, so we use 'pilcrow'
- c1=0xb6;
- break;
- case 0x88: // lowercase a, grave accent
- c1=0xe0;
- break;
- case 0x89: // transparent space, we make it regular
- c1=0x20;			
- break;
- case 0x8a: // lowercase e, grave accent
- c1=0xe8;
- break;
- case 0x8b: // lowercase a, circumflex accent
- c1=0xe2;
- break;
- case 0x8c: // lowercase e, circumflex accent
- c1=0xea;			
- break;
- case 0x8d: // lowercase i, circumflex accent
- c1=0xee;
- break;
- case 0x8e: // lowercase o, circumflex accent
- c1=0xf4;
- break;
- case 0x8f: // lowercase u, circumflex accent
- c1=0xfb;
- break;
- // THIS BLOCK INCLUDES THE 32 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
- // THAT COME FROM HI BYTE=0x12 AND LOW BETWEEN 0x20 AND 0x3F
- case 0x90: // capital letter A with acute
- c1=0xc1;
- break;
- case 0x91: // capital letter E with acute
- c1=0xc9;
- break;
- case 0x92: // capital letter O with acute
- c1=0xd3;
- break;
- case 0x93: // capital letter U with acute
- c1=0xda;
- break;
- case 0x94: // capital letter U with diaresis
- c1=0xdc;
- break;
- case 0x95: // lowercase letter U with diaeresis
- c1=0xfc;
- break;
- case 0x96: // apostrophe
- c1=0x27;			
- break;
- case 0x97: // inverted exclamation mark			
- c1=0xa1;
- break;
- case 0x98: // asterisk
- c1=0x2a;			
- break;
- case 0x99: // apostrophe (yes, duped). See CCADI source code.
- c1=0x27;			
- break;
- case 0x9a: // hyphen-minus
- c1=0x2d;			
- break;
- case 0x9b: // copyright sign
- c1=0xa9;
- break;
- case 0x9c: // Service Mark - not available in latin 1
- break;
- case 0x9d: // Full stop (.)
- c1=0x2e;
- break;
- case 0x9e: // Quoatation mark
- c1=0x22;			
- break;
- case 0x9f: // Quoatation mark
- c1=0x22;			
- break;
- case 0xa0: // uppercase A, grave accent
- c1=0xc0;
- break;
- case 0xa1: // uppercase A, circumflex
- c1=0xc2;
- break;			
- case 0xa2: // uppercase C with cedilla
- c1=0xc7;
- break;
- case 0xa3: // uppercase E, grave accent
- c1=0xc8;
- break;
- case 0xa4: // uppercase E, circumflex
- c1=0xca;
- break;
- case 0xa5: // capital letter E with diaresis
- c1=0xcb;
- break;
- case 0xa6: // lowercase letter e with diaresis
- c1=0xeb;
- break;
- case 0xa7: // uppercase I, circumflex
- c1=0xce;
- break;
- case 0xa8: // uppercase I, with diaresis
- c1=0xcf;
- break;
- case 0xa9: // lowercase i, with diaresis
- c1=0xef;
- break;
- case 0xaa: // uppercase O, circumflex
- c1=0xd4;
- break;
- case 0xab: // uppercase U, grave accent
- c1=0xd9;
- break;
- case 0xac: // lowercase u, grave accent
- c1=0xf9;
- break;
- case 0xad: // uppercase U, circumflex
- c1=0xdb;
- break;
- case 0xae: // LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
- c1=0xab;
- break;
- case 0xaf: // RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
- c1=0xbb;
- break;
- // THIS BLOCK INCLUDES THE 32 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
- // THAT COME FROM HI BYTE=0x13 AND LOW BETWEEN 0x20 AND 0x3F
- case 0xb0: // Uppercase A, tilde
- c1=0xc3;
- break;
- case 0xb1: // Lowercase a, tilde
- c1=0xe3;
- break;
- case 0xb2: // Uppercase I, acute accent
- c1=0xcd;
- break;
- case 0xb3: // Uppercase I, grave accent
- c1=0xcc;
- break;
- case 0xb4: // Lowercase i, grave accent
- c1=0xec;
- break;
- case 0xb5: // Uppercase O, grave accent
- c1=0xd2;
- break;
- case 0xb6: // Lowercase o, grave accent
- c1=0xf2;
- break;
- case 0xb7: // Uppercase O, tilde
- c1=0xd5;
- break;
- case 0xb8: // Lowercase o, tilde
- c1=0xf5;
- break;
- case 0xb9: // Open curly brace
- c1=0x7b;
- break;
- case 0xba: // Closing curly brace
- c1=0x7d; 
- break;
- case 0xbb: // Backslash
- c1=0x5c;
- break;
- case 0xbc: // Caret
- c1=0x5e;
- break;
- case 0xbd: // Underscore
- c1=0x5f;
- break;
- case 0xbe: // Pipe (broken bar) 
- c1=0xa6;
- break;
- case 0xbf: // Tilde
- c1=0x7e; 
- break;
- case 0xc0: // Uppercase A, umlaut 
- c1=0xc4;
- break;
- case 0xc1: // Lowercase A, umlaut
- c1=0xe3; 
- break;
- case 0xc2: // Uppercase O, umlaut
- c1=0xd6;
- break;
- case 0xc3: // Lowercase o, umlaut
- c1=0xf6;
- break;
- case 0xc4: // Esszett (sharp S)
- c1=0xdf;
- break;
- case 0xc5: // Yen symbol
- c1=0xa5;
- break;
- case 0xc6: // Currency symbol
- c1=0xa4;
- break; 
- case 0xc7: // Vertical bar
- c1=0x7c;
- break; 
- case 0xc8: // Uppercase A, ring
- c1=0xc5;
- break;
- case 0xc9: // Lowercase A, ring
- c1=0xe5;
- break;
- case 0xca: // Uppercase O, slash
- c1=0xd8;
- break;
- case 0xcb: // Lowercase o, slash
- c1=0xf8;
- break;
- case 0xcc: // Upper left corner
- case 0xcd: // Upper right corner
- case 0xce: // Lower left corner
- case 0xcf: // Lower right corner
- default: // For those that don't have representation
- *buffer='?'; // I'll do it eventually, I promise
- break; // This are weird chars anyway
- }
- *buffer=c1;	
-}
-
-void get_char_in_unicode (unsigned char *buffer, unsigned char c)
-{
- unsigned char c1,c2;
- switch (c)
- {
- case 0x84: // Trademark symbol (TM) 
- c2=0x21;
- c1=0x22;
- break;
- case 0x87: // Music note
- c2=0x26;
- c1=0x6a;
- break;
- case 0x9c: // Service Mark
- c2=0x21;
- c1=0x20;
- break;
- case 0xcc: // Upper left corner
- c2=0x23;
- c1=0x1c;
- break;			
- case 0xcd: // Upper right corner
- c2=0x23;
- c1=0x1d;
- break;
- case 0xce: // Lower left corner
- c2=0x23;
- c1=0x1e;
- break;
- case 0xcf: // Lower right corner
- c2=0x23;
- c1=0x1f;
- break;
- default: // Everything else, same as latin-1 followed by 00			
- get_char_in_latin_1 (&c1,c);
- c2=0;
- break;
- }
- *buffer=c1;
- *(buffer+1)=c2;
-}
-
-int get_char_in_utf_8 (unsigned char *buffer, unsigned char c) // Returns number of bytes used
-{
- if (c==0x00)
+ if (c == 0x00)
 return 0;
- if (c<0x80) // Regular line-21 character set, mostly ASCII except these exceptions
+
+ // Regular line-21 character set, mostly ASCII except these exceptions
+ if (c < 0x80)
 {
 switch (c)
 {
 case 0x2a: // lowercase a, acute accent
- *buffer=0xc3;
- *(buffer+1)=0xa1;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xa1;
 return 2;
 case 0x5c: // lowercase e, acute accent
- *buffer=0xc3;
- *(buffer+1)=0xa9;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xa9;
 return 2;
 case 0x5e: // lowercase i, acute accent
- *buffer=0xc3;
- *(buffer+1)=0xad;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xad;
 return 2;
 case 0x5f: // lowercase o, acute accent
- *buffer=0xc3;
- *(buffer+1)=0xb3;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xb3;
 return 2;
 case 0x60: // lowercase u, acute accent
- *buffer=0xc3;
- *(buffer+1)=0xba;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xba;
 return 2;
 case 0x7b: // lowercase c with cedilla
- *buffer=0xc3;
- *(buffer+1)=0xa7;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xa7;
 return 2;
 case 0x7c: // division symbol
- *buffer=0xc3;
- *(buffer+1)=0xb7;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xb7;
 return 2;
 case 0x7d: // uppercase N tilde
- *buffer=0xc3;
- *(buffer+1)=0x91;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x91;
 return 2;
 case 0x7e: // lowercase n tilde
- *buffer=0xc3;
- *(buffer+1)=0xb1;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xb1;
 return 2;
 default:
- *buffer=c;
+ *buffer = c;
 return 1;
 }
 }
 switch (c)
 {
 // THIS BLOCK INCLUDES THE 16 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
- // THAT COME FROM HI BYTE=0x11 AND LOW BETWEEN 0x30 AND 0x3F		
+ // THAT COME FROM HI BYTE = 0x11 AND LOW BETWEEN 0x30 AND 0x3F
 case 0x80: // Registered symbol (R)
- *buffer=0xc2;
- *(buffer+1)=0xae;			
+ *buffer = 0xc2;
+ *(buffer+1) = 0xae;
 return 2;
 case 0x81: // degree sign
- *buffer=0xc2;
- *(buffer+1)=0xb0;
+ *buffer = 0xc2;
+ *(buffer+1) = 0xb0;
 return 2;
 case 0x82: // 1/2 symbol
- *buffer=0xc2;
- *(buffer+1)=0xbd;
+ *buffer = 0xc2;
+ *(buffer+1) = 0xbd;
 return 2;
 case 0x83: // Inverted (open) question mark
- *buffer=0xc2;
- *(buffer+1)=0xbf;
+ *buffer = 0xc2;
+ *(buffer+1) = 0xbf;
 return 2;
 case 0x84: // Trademark symbol (TM)
- *buffer=0xe2;
- *(buffer+1)=0x84;
- *(buffer+2)=0xa2;
+ *buffer = 0xe2;
+ *(buffer+1) = 0x84;
+ *(buffer+2) = 0xa2;
 return 3;
 case 0x85: // Cents symbol
- *buffer=0xc2;
- *(buffer+1)=0xa2;
+ *buffer = 0xc2;
+ *(buffer+1) = 0xa2;
 return 2;
 case 0x86: // Pounds sterling
- *buffer=0xc2;
- *(buffer+1)=0xa3;
+ *buffer = 0xc2;
+ *(buffer+1) = 0xa3;
 return 2;
- case 0x87: // Music note			
- *buffer=0xe2;
- *(buffer+1)=0x99;
- *(buffer+2)=0xaa;
+ case 0x87: // Music note
+ *buffer = 0xe2;
+ *(buffer+1) = 0x99;
+ *(buffer+2) = 0xaa;
 return 3;
 case 0x88: // lowercase a, grave accent
- *buffer=0xc3;
- *(buffer+1)=0xa0;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xa0;
 return 2;
 case 0x89: // transparent space, we make it regular
- *buffer=0x20;			
+ *buffer = 0x20;
 return 1;
 case 0x8a: // lowercase e, grave accent
- *buffer=0xc3;
- *(buffer+1)=0xa8;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xa8;
 return 2;
 case 0x8b: // lowercase a, circumflex accent
- *buffer=0xc3;
- *(buffer+1)=0xa2;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xa2;
 return 2;
 case 0x8c: // lowercase e, circumflex accent
- *buffer=0xc3;
- *(buffer+1)=0xaa;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xaa;
 return 2;
 case 0x8d: // lowercase i, circumflex accent
- *buffer=0xc3;
- *(buffer+1)=0xae;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xae;
 return 2;
 case 0x8e: // lowercase o, circumflex accent
- *buffer=0xc3;
- *(buffer+1)=0xb4;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xb4;
 return 2;
 case 0x8f: // lowercase u, circumflex accent
- *buffer=0xc3;
- *(buffer+1)=0xbb;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xbb;
 return 2;
 // THIS BLOCK INCLUDES THE 32 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
- // THAT COME FROM HI BYTE=0x12 AND LOW BETWEEN 0x20 AND 0x3F
+ // THAT COME FROM HI BYTE = 0x12 AND LOW BETWEEN 0x20 AND 0x3F
 case 0x90: // capital letter A with acute
- *buffer=0xc3;
- *(buffer+1)=0x81;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x81;
 return 2;
 case 0x91: // capital letter E with acute
- *buffer=0xc3;
- *(buffer+1)=0x89;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x89;
 return 2;
 case 0x92: // capital letter O with acute
- *buffer=0xc3;
- *(buffer+1)=0x93;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x93;
 return 2;
 case 0x93: // capital letter U with acute
- *buffer=0xc3;
- *(buffer+1)=0x9a;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x9a;
 return 2;
 case 0x94: // capital letter U with diaresis
- *buffer=0xc3;
- *(buffer+1)=0x9c;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x9c;
 return 2;
 case 0x95: // lowercase letter U with diaeresis
- *buffer=0xc3;
- *(buffer+1)=0xbc;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xbc;
 return 2;
 case 0x96: // apostrophe
- *buffer=0x27;			
+ *buffer = 0x27;
 return 1;
 case 0x97: // inverted exclamation mark
- *buffer=0xc2;
- *(buffer+1)=0xa1;
+ *buffer = 0xc2;
+ *(buffer+1) = 0xa1;
 return 2;
 case 0x98: // asterisk
- *buffer=0x2a;			
+ *buffer = 0x2a;
 return 1;
 case 0x99: // apostrophe (yes, duped). See CCADI source code.
- *buffer=0x27;			
+ *buffer = 0x27;
 return 1;
 case 0x9a: // hyphen-minus
- *buffer=0x2d;			
+ *buffer = 0x2d;
 return 1;
 case 0x9b: // copyright sign
- *buffer=0xc2;
- *(buffer+1)=0xa9;
+ *buffer = 0xc2;
+ *(buffer+1) = 0xa9;
 return 2;
- case 0x9c: // Service mark 
- *buffer=0xe2;			
- *(buffer+1)=0x84;
- *(buffer+2)=0xa0;
+ case 0x9c: // Service mark
+ *buffer = 0xe2;
+ *(buffer+1) = 0x84;
+ *(buffer+2) = 0xa0;
 return 3;
 case 0x9d: // Full stop (.)
- *buffer=0x2e;			
+ *buffer = 0x2e;
 return 1;
 case 0x9e: // Quoatation mark
- *buffer=0x22;			
+ *buffer = 0x22;
 return 1;
 case 0x9f: // Quoatation mark
- *buffer=0x22;			
+ *buffer = 0x22;
 return 1;
 case 0xa0: // uppercase A, grave accent
- *buffer=0xc3;
- *(buffer+1)=0x80;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x80;
 return 2;
 case 0xa1: // uppercase A, circumflex
- *buffer=0xc3;
- *(buffer+1)=0x82;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x82;
 return 2;
 case 0xa2: // uppercase C with cedilla
- *buffer=0xc3;
- *(buffer+1)=0x87;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x87;
 return 2;
 case 0xa3: // uppercase E, grave accent
- *buffer=0xc3;
- *(buffer+1)=0x88;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x88;
 return 2;
 case 0xa4: // uppercase E, circumflex
- *buffer=0xc3;
- *(buffer+1)=0x8a;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x8a;
 return 2;
 case 0xa5: // capital letter E with diaresis
- *buffer=0xc3;
- *(buffer+1)=0x8b;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x8b;
 return 2;
 case 0xa6: // lowercase letter e with diaresis
- *buffer=0xc3;
- *(buffer+1)=0xab;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xab;
 return 2;
 case 0xa7: // uppercase I, circumflex
- *buffer=0xc3;
- *(buffer+1)=0x8e;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x8e;
 return 2;
 case 0xa8: // uppercase I, with diaresis
- *buffer=0xc3;
- *(buffer+1)=0x8f;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x8f;
 return 2;
 case 0xa9: // lowercase i, with diaresis
- *buffer=0xc3;
- *(buffer+1)=0xaf;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xaf;
 return 2;
 case 0xaa: // uppercase O, circumflex
- *buffer=0xc3;
- *(buffer+1)=0x94;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x94;
 return 2;
 case 0xab: // uppercase U, grave accent
- *buffer=0xc3;
- *(buffer+1)=0x99;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x99;
 return 2;
 case 0xac: // lowercase u, grave accent
- *buffer=0xc3;
- *(buffer+1)=0xb9;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xb9;
 return 2;
 case 0xad: // uppercase U, circumflex
- *buffer=0xc3;
- *(buffer+1)=0x9b;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x9b;
 return 2;
 case 0xae: // LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
- *buffer=0xc2;
- *(buffer+1)=0xab;
+ *buffer = 0xc2;
+ *(buffer+1) = 0xab;
 return 2;
 case 0xaf: // RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
- *buffer=0xc2;
- *(buffer+1)=0xbb;
+ *buffer = 0xc2;
+ *(buffer+1) = 0xbb;
 return 2;
 // THIS BLOCK INCLUDES THE 32 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
- // THAT COME FROM HI BYTE=0x13 AND LOW BETWEEN 0x20 AND 0x3F
+ // THAT COME FROM HI BYTE = 0x13 AND LOW BETWEEN 0x20 AND 0x3F
 case 0xb0: // Uppercase A, tilde
- *buffer=0xc3;
- *(buffer+1)=0x83;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x83;
 return 2;
 case 0xb1: // Lowercase a, tilde
- *buffer=0xc3;
- *(buffer+1)=0xa3;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xa3;
 return 2;
 case 0xb2: // Uppercase I, acute accent
- *buffer=0xc3;
- *(buffer+1)=0x8d;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x8d;
 return 2;
 case 0xb3: // Uppercase I, grave accent
- *buffer=0xc3;
- *(buffer+1)=0x8c;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x8c;
 return 2;
 case 0xb4: // Lowercase i, grave accent
- *buffer=0xc3;
- *(buffer+1)=0xac;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xac;
 return 2;
 case 0xb5: // Uppercase O, grave accent
- *buffer=0xc3;
- *(buffer+1)=0x92;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x92;
 return 2;
 case 0xb6: // Lowercase o, grave accent
- *buffer=0xc3;
- *(buffer+1)=0xb2;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xb2;
 return 2;
 case 0xb7: // Uppercase O, tilde
- *buffer=0xc3;
- *(buffer+1)=0x95;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x95;
 return 2;
 case 0xb8: // Lowercase o, tilde
- *buffer=0xc3;
- *(buffer+1)=0xb5;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xb5;
 return 2;
 case 0xb9: // Open curly brace
- *buffer=0x7b;
+ *buffer = 0x7b;
 return 1;
 case 0xba: // Closing curly brace
- *buffer=0x7d; 
+ *buffer = 0x7d;
 return 1;
 case 0xbb: // Backslash
- *buffer=0x5c;
+ *buffer = 0x5c;
 return 1;
 case 0xbc: // Caret
- *buffer=0x5e;
+ *buffer = 0x5e;
 return 1;
 case 0xbd: // Underscore
- *buffer=0x5f;
+ *buffer = 0x5f;
 return 1;
 case 0xbe: // Pipe (broken bar)
- *buffer=0xc2; 
- *(buffer+1)=0xa6;
+ *buffer = 0xc2;
+ *(buffer+1) = 0xa6;
 return 1;
 case 0xbf: // Tilde
- *buffer=0x7e; // Not sure
+ *buffer = 0x7e; // Not sure
 return 1;
 case 0xc0: // Uppercase A, umlaut
- *buffer=0xc3; 
- *(buffer+1)=0x84;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x84;
 return 2;
 case 0xc1: // Lowercase A, umlaut
- *buffer=0xc3; 
- *(buffer+1)=0xa4;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xa4;
 return 2;
 case 0xc2: // Uppercase O, umlaut
- *buffer=0xc3; 
- *(buffer+1)=0x96;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x96;
 return 2;
 case 0xc3: // Lowercase o, umlaut
- *buffer=0xc3; 
- *(buffer+1)=0xb6;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xb6;
 return 2;
 case 0xc4: // Esszett (sharp S)
- *buffer=0xc3;
- *(buffer+1)=0x9f;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x9f;
 return 2;
 case 0xc5: // Yen symbol
- *buffer=0xc2;
- *(buffer+1)=0xa5;
+ *buffer = 0xc2;
+ *(buffer+1) = 0xa5;
 return 2;
 case 0xc6: // Currency symbol
- *buffer=0xc2;
- *(buffer+1)=0xa4;
+ *buffer = 0xc2;
+ *(buffer+1) = 0xa4;
 return 2;
 case 0xc7: // Vertical bar
- *buffer=0x7c; 
+ *buffer = 0x7c;
 return 1;
 case 0xc8: // Uppercase A, ring
- *buffer=0xc3;
- *(buffer+1)=0x85;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x85;
 return 2;
 case 0xc9: // Lowercase A, ring
- *buffer=0xc3;
- *(buffer+1)=0xa5;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xa5;
 return 2;
 case 0xca: // Uppercase O, slash
- *buffer=0xc3;
- *(buffer+1)=0x98;
+ *buffer = 0xc3;
+ *(buffer+1) = 0x98;
 return 2;
 case 0xcb: // Lowercase o, slash
- *buffer=0xc3;
- *(buffer+1)=0xb8;
+ *buffer = 0xc3;
+ *(buffer+1) = 0xb8;
 return 2;
 case 0xcc: // Upper left corner
- *buffer=0xe2;
- *(buffer+1)=0x8c;
- *(buffer+2)=0x9c;
+ *buffer = 0xe2;
+ *(buffer+1) = 0x8c;
+ *(buffer+2) = 0x9c;
 return 3;
 case 0xcd: // Upper right corner
- *buffer=0xe2;
- *(buffer+1)=0x8c;
- *(buffer+2)=0x9d;
+ *buffer = 0xe2;
+ *(buffer+1) = 0x8c;
+ *(buffer+2) = 0x9d;
 return 3;
 case 0xce: // Lower left corner
- *buffer=0xe2;
- *(buffer+1)=0x8c;
- *(buffer+2)=0x9e;
+ *buffer = 0xe2;
+ *(buffer+1) = 0x8c;
+ *(buffer+2) = 0x9e;
 return 3;
 case 0xcf: // Lower right corner
- *buffer=0xe2;
- *(buffer+1)=0x8c;
- *(buffer+2)=0x9f;
+ *buffer = 0xe2;
+ *(buffer+1) = 0x8c;
+ *(buffer+2) = 0x9f;
 return 3;
- default: // 
- *buffer='?'; // I'll do it eventually, I promise
+ default: //
+ *buffer = '?'; // I'll do it eventually, I promise
 return 1; // This are weird chars anyway
 }
 }
 
-unsigned char cctolower (unsigned char c)
+// Encodes a generic string. Note that since we use the encoders for closed
+// caption data, text would have to be encoded as CCs... so using special
+// characters here it's a bad idea.
+static unsigned encode_line(unsigned char *buffer, unsigned char *text)
 {
- if (c>='A' && c<='Z')
- return tolower(c);
- switch (c)
- {
- case 0x7d: // uppercase N tilde
- return 0x7e;
- case 0x90: // capital letter A with acute
- return 0x2a;
- case 0x91: // capital letter E with acute
- return 0x5c; 
- case 0x92: // capital letter O with acute
- return 0x5f; 
- case 0x93: // capital letter U with acute
- return 0x60; 
- case 0xa2: // uppercase C with cedilla
- return 0x7b; 
- case 0xa0: // uppercase A, grave accent
- return 0x88; 
- case 0xa3: // uppercase E, grave accent
- return 0x8a; 
- case 0xa1: // uppercase A, circumflex
- return 0x8b; 
- case 0xa4: // uppercase E, circumflex
- return 0x8c; 
- case 0xa7: // uppercase I, circumflex
- return 0x8d; 
- case 0xaa: // uppercase O, circumflex
- return 0x8e; 
- case 0xad: // uppercase U, circumflex
- return 0x8f; 
- case 0x94: // capital letter U with diaresis
- return 0x95; 
- case 0xa5: // capital letter E with diaresis
- return 0xa6; 
- case 0xa8: // uppercase I, with diaresis
- return 0xa9; 
- case 0xab: // uppercase U, grave accent
- return 0xac; 
- case 0xb0: // Uppercase A, tilde
- return 0xb1;
- case 0xb2: // Uppercase I, acute accent
- return 0x5e;
- case 0xb3: // Uppercase I, grave accent
- return 0xb4;
- case 0xb5: // Uppercase O, grave accent
- return 0xb6;
- case 0xb7: // Uppercase O, tilde
- return 0xb8;
- case 0xc0: // Uppercase A, umlaut
- return 0xc1;
- case 0xc2: // Uppercase O, umlaut
- return 0xc3;
- case 0xc8: // Uppercase A, ring
- return 0xc9;
- case 0xca: // Uppercase O, slash
- return 0xcb;
- }
- return c;
-}
-
-unsigned char cctoupper (unsigned char c)
-{
- if (c>='a' && c<='z')
- return toupper(c);
- switch (c)
- {
- case 0x7e: // lowercase n tilde
- return 0x7d;
- case 0x2a: // lowercase a, acute accent
- return 0x90;
- case 0x5c: // lowercase e, acute accent
- return 0x91;
- case 0x5e: // lowercase i, acute accent
- return 0xb2;
- case 0x5f: // lowercase o, acute accent
- return 0x92;
- case 0x60: // lowercase u, acute accent
- return 0x93;
- case 0x7b: // lowercase c with cedilla
- return 0xa2;
- case 0x88: // lowercase a, grave accent
- return 0xa0;
- case 0x8a: // lowercase e, grave accent
- return 0xa3;
- case 0x8b: // lowercase a, circumflex accent
- return 0xa1;
- case 0x8c: // lowercase e, circumflex accent
- return 0xa4;
- case 0x8d: // lowercase i, circumflex accent
- return 0xa7;
- case 0x8e: // lowercase o, circumflex accent
- return 0xaa;
- case 0x8f: // lowercase u, circumflex accent
- return 0xad;
- case 0x95: // lowercase letter U with diaeresis
- return 0x94;
- case 0xa6: // lowercase letter e with diaresis
- return 0xa5;
- case 0xa9: // lowercase i, with diaresis
- return 0xa8;
- case 0xac: // lowercase u, grave accent
- return 0xab;
- case 0xb1: // Lowercase a, tilde
- return 0xb0; 
- case 0xb4: // Lowercase i, grave accent
- return 0xb3;
- case 0xb6: // Lowercase o, grave accent
- return 0xb5; 
- case 0xb8: // Lowercase o, tilde	
- return 0xb7;
- case 0xc1: // Lowercase A, umlaut	
- return 0xc0; 
- case 0xc3: // Lowercase o, umlaut
- return 0xc2;
- case 0xc9: // Lowercase A, ring
- return 0xc8; 
- case 0xcb: // Lowercase o, slash
- return 0xca; 
- }
- return c;
-}
-
-
-// Encodes a generic string. Note that since we use the encoders for closed caption
-// data, text would have to be encoded as CCs... so using special characters here
-// it's a bad idea. 
-unsigned encode_line (unsigned char *buffer, unsigned char *text)
-{ 
- unsigned bytes=0;
+ unsigned bytes = 0;
 while (*text)
- {		
- switch (encoding)
- {
- case ENC_UTF_8:
- case ENC_LATIN_1:
- *buffer=*text;
- bytes++;
- buffer++;
- break;
- case ENC_UNICODE:				
- *buffer=*text;				
- *(buffer+1)=0;
- bytes+=2;				
- buffer+=2;
- break;
- }		
- text++;
+ {
+ *buffer++ = *text++;
+ bytes++;
 }
 return bytes;
 }
 
-#define ISSEPARATOR(c) (c==' ' || c==0x89 || ispunct(c) \
- || c==0x99) // This is the apostrofe. We get it here in CC encoding, not ASCII
-
-
-void correct_case (int line_num, struct eia608_screen *data)
-{
-/* int i=0; */
-/* while (i<spell_words) */
-/* { */
-/* char *c=(char *) data->characters[line_num]; */
-/* size_t len=strlen (spell_correct[i]); */
-/* while ((c=strstr (c,spell_lower[i]))!=NULL) */
-/* { */
-/* // Make sure it's a whole word (start of line or */
-/* // preceded by space, and end of line or followed by */
-/* // space) */
-/* unsigned char prev; */
-/* if (c==(char *) data->characters[line_num]) // Beginning of line... */
-/* prev=' '; // ...Pretend we had a blank before */
-/* else */
-/* prev=*(c-1); */
-/* unsigned char next; */
-/* if (c-(char *) data->characters[line_num]+len==CC608_SCREEN_WIDTH) // End of line... */
-/* next=' '; // ... pretend we have a blank later */
-/* else */
-/* next=*(c+len);			 */
-/* if ( ISSEPARATOR(prev) && ISSEPARATOR(next)) */
-/* { */
-/* memcpy (c,spell_correct[i],len); */
-/* } */
-/* c++; */
-/* } */
-/* i++; */
-/* } */
-}
-
-void capitalize (int line_num, struct eia608_screen *data, int *new_sentence)
+static void find_limit_characters(unsigned char *line, int *first_non_blank,
+ int *last_non_blank)
 {
 int i;
 
- for (i=0;i<CC608_SCREEN_WIDTH;i++)
+ *last_non_blank = -1;
+ *first_non_blank = -1;
+ for (i = 0; i < CC608_SCREEN_WIDTH; i++)
 {
- switch (data->characters[line_num][i])
+ unsigned char c = line[i];
+ if (c != ' ' && c != 0x89)
 {
- case ' ': 
- case 0x89: // This is a transparent space
- case '-':
- break; 
- case '.': // Fallthrough
- case '?': // Fallthrough
- case '!':
- case ':':
- *new_sentence=1;
- break;
- default:
- if (*new_sentence)			
- data->characters[line_num][i]=cctoupper (data->characters[line_num][i]);
- else
- data->characters[line_num][i]=cctolower (data->characters[line_num][i]);
- *new_sentence=0;
- break;
+ if (*first_non_blank == -1)
+ *first_non_blank = i;
+ *last_non_blank = i;
 }
 }
 }
 
-void find_limit_characters (unsigned char *line, int *first_non_blank, int *last_non_blank)
+static unsigned get_decoder_line_encoded(struct s_write *wb,
+ unsigned char *buffer, int line_num,
+ struct eia608_screen *data)
 {
+ uint8_t font_style;
+ uint8_t font_color;
 int i;
 
- *last_non_blank=-1;
- *first_non_blank=-1;
- for (i=0;i<CC608_SCREEN_WIDTH;i++)
- {
- unsigned char c=line[i];
- if (c!=' ' && c!=0x89)
- {
- if (*first_non_blank==-1)
- *first_non_blank=i;
- *last_non_blank=i;
- }
- }
-}
-
-unsigned get_decoder_line_basic (unsigned char *buffer, int line_num, struct eia608_screen *data)
-{
 unsigned char *line = data->characters[line_num];
- int last_non_blank=-1;
- int first_non_blank=-1;
- unsigned char *orig=buffer; // Keep for debugging
- int i;
- find_limit_characters (line, &first_non_blank, &last_non_blank);
+ unsigned char *orig = buffer; // Keep for debugging
+ int first = 0, last = 31;
 
- if (first_non_blank==-1)
+ find_limit_characters(line, &first, &last);
+ for (i = first; i <= last; i++)
 {
- *buffer=0;
- return 0;
- }
+ // Handle color
+ font_color = data->colors[line_num][i];
+ font_style = data->fonts[line_num][i];
 
- int bytes=0;
- for (i=first_non_blank;i<=last_non_blank;i++)
- {
- char c=line[i];
- switch (encoding)
+ // Handle reset to defaults
+ if ((font_style & FONT_STYLE_MASK) == 0 && font_color == COL_WHITE)
 {
- case ENC_UTF_8:
- bytes=get_char_in_utf_8 (buffer,c);
- break;
- case ENC_LATIN_1:
- get_char_in_latin_1 (buffer,c);
- bytes=1;
- break;
- case ENC_UNICODE:
- get_char_in_unicode (buffer,c);
- bytes=2;				
- break;
+ if (((font_style ^ wb->prev_font_style) & FONT_STYLE_MASK) ||
+ (font_color != wb->prev_font_color))
+ {
+ buffer += encode_line(buffer, (uint8_t*)"{\\r}");
+ }
 }
- buffer+=bytes;
- }
- *buffer=0;
- return (unsigned) (buffer-orig); // Return length
-}
-
-unsigned get_decoder_line_encoded_for_gui (unsigned char *buffer, int line_num, struct eia608_screen *data)
-{
- unsigned char *line = data->characters[line_num];	
- unsigned char *orig=buffer; // Keep for debugging
- int first=0, last=31;
- int i;
-
- find_limit_characters(line,&first,&last);
- for (i=first;i<=last;i++)
- {	
- get_char_in_latin_1 (buffer,line[i]);
- buffer++;
- }
- *buffer=0;
- return (unsigned) (buffer-orig); // Return length
-
-}
+ else
+ {
+ // Open markup
+ if (((font_style ^ wb->prev_font_style) & FONT_STYLE_MASK) ||
+ (font_color != wb->prev_font_color))
+ {
+ // style changed
+ buffer += encode_line(buffer, (uint8_t*)"{");
+ }
 
-unsigned get_decoder_line_encoded (unsigned char *buffer, int line_num, struct eia608_screen *data)
-{
- int col = COL_WHITE;
- int underlined = 0;
- int italics = 0;	
- int i;
+ // Handle underlined
+ if ((font_style ^ wb->prev_font_style) & FONT_UNDERLINED)
+ {
+ int enable = !!(font_style & FONT_UNDERLINED);
+ buffer += encode_line(buffer, (uint8_t*)"\\u");
+ *buffer++ = enable + 0x30;
+ }
 
- unsigned char *line = data->characters[line_num];	
- unsigned char *orig=buffer; // Keep for debugging
- int first=0, last=31;
- if (trim_subs)
- find_limit_characters(line,&first,&last);
- for (i=first;i<=last;i++)
- {	
- // Handle color
- int its_col = data->colors[line_num][i];
- if (its_col != col && !nofontcolor)
- {
- if (col!=COL_WHITE) // We need to close the previous font tag
+ // Handle italics
+ if ((font_style ^ wb->prev_font_style) & FONT_ITALICS)
 {
- buffer+= encode_line (buffer,(unsigned char *) "");
+ int enable = !!(font_style & FONT_ITALICS);
+ buffer += encode_line(buffer, (uint8_t*)"\\i");
+ *buffer++ = enable + 0x30;
 }
- // Add new font tag
- buffer+=encode_line (buffer, (unsigned char*) color_text[its_col][1]);
- if (its_col==COL_USERDEFINED)
+
+ // Handle color
+ if (font_color != wb->prev_font_color)
 {
- // The previous sentence doesn't copy the whole 
- // tag, just up to the quote before the color
- buffer+=encode_line (buffer, (unsigned char*) usercolor_rgb);
- buffer+=encode_line (buffer, (unsigned char*) "\">");
- }			
+ buffer += encode_line(buffer, (uint8_t*)"\\1c");
+ buffer += encode_line(buffer,
+ (uint8_t*)color_text[font_color][1]);
+ }
 
- col = its_col;
- }
- // Handle underlined
- int is_underlined = data->fonts[line_num][i] & FONT_UNDERLINED;
- if (is_underlined && underlined==0) // Open underline
- {
- buffer+=encode_line (buffer, (unsigned char *) "");
- }
- if (is_underlined==0 && underlined) // Close underline
- {
- buffer+=encode_line (buffer, (unsigned char *) "");
- } 
- underlined=is_underlined;
- // Handle italics
- int has_ita = data->fonts[line_num][i] & FONT_ITALICS;		
- if (has_ita && italics==0) // Open italics
- {
- buffer+=encode_line (buffer, (unsigned char *) "");
- }
- if (has_ita==0 && italics) // Close italics
- {
- buffer+=encode_line (buffer, (unsigned char *) "");
- } 
- italics=has_ita;
- int bytes=0;
- switch (encoding)
- {
- case ENC_UTF_8:
- bytes=get_char_in_utf_8 (buffer,line[i]);
- break;
- case ENC_LATIN_1:
- get_char_in_latin_1 (buffer,line[i]);
- bytes=1;
- break;
- case ENC_UNICODE:
- get_char_in_unicode (buffer,line[i]);
- bytes=2;				
- break;
+ // Close markup
+ if (((font_style ^ wb->prev_font_style) & FONT_STYLE_MASK) ||
+ (font_color != wb->prev_font_color))
+ {
+ // style changed
+ buffer += encode_line(buffer, (uint8_t*)"}");
+ }
 }
- buffer+=bytes; 
- }
- if (italics)
- {
- buffer+=encode_line (buffer, (unsigned char *) "");
- }
- if (underlined)
- {
- buffer+=encode_line (buffer, (unsigned char *) "");
- }
- if (col != COL_WHITE && !nofontcolor)
- {
- buffer+=encode_line (buffer, (unsigned char *) "");
+ wb->prev_font_style = font_style;
+ wb->prev_font_color = font_color;
+
+ int bytes = 0;
+ bytes = get_char_in_utf8(buffer, line[i]);
+ buffer += bytes;
 }
- *buffer=0;
- return (unsigned) (buffer-orig); // Return length
+ *buffer = 0;
+ return (unsigned) (buffer - orig); // Return length
 }
 
 
-void delete_all_lines_but_current (struct eia608_screen *data, int row)
+static void clear_eia608_cc_buffer (struct eia608_screen *data)
 {
 int i;
+
 for (i=0;i<15;i++)
 {
- if (i!=row)
- {
- memset(data->characters[i],' ',CC608_SCREEN_WIDTH);
- data->characters[i][CC608_SCREEN_WIDTH]=0;		
- memset (data->colors[i],default_color,CC608_SCREEN_WIDTH+1); 
- memset (data->fonts[i],FONT_REGULAR,CC608_SCREEN_WIDTH+1); 
- data->row_used[i]=0; 
- }
+ memset(data->characters[i],' ',CC608_SCREEN_WIDTH);
+ data->characters[i][CC608_SCREEN_WIDTH]=0;
+ memset (data->colors[i],default_color,CC608_SCREEN_WIDTH+1);
+ memset (data->fonts[i],FONT_REGULAR,CC608_SCREEN_WIDTH+1);
+ data->row_used[i]=0;
 }
+ data->empty=1;
 }
 
-void clear_eia608_cc_buffer (struct eia608_screen *data)
+static void init_eia608 (struct eia608 *data)
 {
- int i;
+ data->cursor_column = 0;
+ data->cursor_row = 0;
+ clear_eia608_cc_buffer (&data->buffer1);
+ clear_eia608_cc_buffer (&data->buffer2);
+ data->visible_buffer = 1;
+ data->last_c1 = 0;
+ data->last_c2 = 0;
+ data->mode = MODE_POPUP;
+ data->current_visible_start_ms = 0;
+ data->ssa_counter = 0;
+ data->screenfuls_counter = 0;
+ data->channel = 1;
+ data->color = default_color;
+ data->font = FONT_REGULAR;
+ data->rollup_base_row = 14;
+}
 
- for (i=0;i<15;i++)
- {
- memset(data->characters[i],' ',CC608_SCREEN_WIDTH);
- data->characters[i][CC608_SCREEN_WIDTH]=0;		
- memset (data->colors[i],default_color,CC608_SCREEN_WIDTH+1); 
- memset (data->fonts[i],FONT_REGULAR,CC608_SCREEN_WIDTH+1); 
- data->row_used[i]=0; 
- }
- data->empty=1;
+static struct eia608_screen *get_current_hidden_buffer(struct s_write *wb)
+{
+ struct eia608_screen *data;
+ if (wb->data608->visible_buffer == 1)
+ data = &wb->data608->buffer2;
+ else
+ data = &wb->data608->buffer1;
+ return data;
 }
 
-void init_eia608 (struct eia608 *data)
+static struct eia608_screen *get_current_visible_buffer(struct s_write *wb)
 {
- data->cursor_column=0;
- data->cursor_row=0;
- clear_eia608_cc_buffer (&data->buffer1);
- clear_eia608_cc_buffer (&data->buffer2);
- data->visible_buffer=1;
- data->last_c1=0;
- data->last_c2=0;
- data->mode=MODE_POPUP;
- // data->current_visible_start_cc=0;
- data->current_visible_start_ms=0;
- data->srt_counter=0;
- data->screenfuls_counter=0;
- data->channel=1;	
- data->color=default_color;
- data->font=FONT_REGULAR;
- data->rollup_base_row=14;
+ struct eia608_screen *data;
+ if (wb->data608->visible_buffer == 1)
+ data = &wb->data608->buffer1;
+ else
+ data = &wb->data608->buffer2;
+ return data;
+}
+
+static void swap_visible_buffer(struct s_write *wb)
+{
+ wb->data608->visible_buffer = (wb->data608->visible_buffer == 1) ? 2 : 1;
 }
 
-struct eia608_screen *get_writing_buffer (struct s_write *wb)
+static struct eia608_screen *get_writing_buffer(struct s_write *wb)
 {
 struct eia608_screen *use_buffer=NULL;
 switch (wb->data608->mode)
 {
 case MODE_POPUP: // Write on the non-visible buffer
- if (wb->data608->visible_buffer==1)
- use_buffer = &wb->data608->buffer2;
- else
- use_buffer = &wb->data608->buffer1;
+ use_buffer = get_current_hidden_buffer(wb);
 break;
 case MODE_ROLLUP_2: // Write directly to screen
 case MODE_ROLLUP_3:
 case MODE_ROLLUP_4:
- if (wb->data608->visible_buffer==1)
- use_buffer = &wb->data608->buffer1;
- else
- use_buffer = &wb->data608->buffer2;
+ use_buffer = get_current_visible_buffer(wb);
 break;
 default:
- fatal (EXIT_BUG_BUG, "Caption mode has an illegal value at get_writing_buffer(), this is a bug.\n"); 
+ fatal (EXIT_BUG_BUG, "Caption mode has an illegal value at get_writing_buffer(), this is a bug.\n");
 }
 return use_buffer;
 }
 
-void write_char (const unsigned char c, struct s_write *wb)
+static void write_char(const unsigned char c, struct s_write *wb)
 {
- if (wb->data608->mode!=MODE_TEXT)
+ if (wb->data608->mode != MODE_TEXT)
 {
- struct eia608_screen * use_buffer=get_writing_buffer(wb);
+ struct eia608_screen * use_buffer = get_writing_buffer(wb);
 /* hb_log ("\rWriting char [%c] at %s:%d:%d\n",c,
 use_buffer == &wb->data608->buffer1?"B1":"B2",
 wb->data608->cursor_row,wb->data608->cursor_column); */
- use_buffer->characters[wb->data608->cursor_row][wb->data608->cursor_column]=c;
- use_buffer->colors[wb->data608->cursor_row][wb->data608->cursor_column]=wb->data608->color;
- use_buffer->fonts[wb->data608->cursor_row][wb->data608->cursor_column]=wb->data608->font;	
- use_buffer->row_used[wb->data608->cursor_row]=1;
- use_buffer->empty=0;
- if (wb->data608->cursor_column<31)
+ use_buffer->characters[wb->data608->cursor_row][wb->data608->cursor_column] = c;
+ use_buffer->colors[wb->data608->cursor_row][wb->data608->cursor_column] = wb->data608->color;
+ use_buffer->fonts[wb->data608->cursor_row][wb->data608->cursor_column] = wb->data608->font;
+ use_buffer->row_used[wb->data608->cursor_row] = 1;
+ use_buffer->empty = 0;
+ if (wb->data608->cursor_column < 31)
 wb->data608->cursor_column++;
+ use_buffer->dirty = 1;
 }
 
 }
 
 /* Handle MID-ROW CODES. */
-void handle_text_attr (const unsigned char c1, const unsigned char c2, struct s_write *wb)
+static void handle_text_attr(const unsigned char c1, const unsigned char c2,
+ struct s_write *wb)
 {
 // Handle channel change
 wb->data608->channel=wb->new_channel;
@@ -1406,460 +783,337 @@
 wb->data608->color=pac2_attribs[i][0];
 wb->data608->font=pac2_attribs[i][1];
 if (debug_608)
- hb_log (" -- Color: %s, font: %s\n",
- color_text[wb->data608->color][0],
- font_text[wb->data608->font]);
+ hb_log(" -- Color: %s, font: %s\n",
+ color_text[wb->data608->color][0],
+ font_text[wb->data608->font]);
 if (wb->data608->cursor_column<31)
 wb->data608->cursor_column++;
 }
 }
 
-void mstotime (int64_t milli, unsigned *hours, unsigned *minutes,
- unsigned *seconds, unsigned *ms)
-{
- // int64_t milli = (int64_t) ((ccblock*1000)/29.97);
- *ms=(unsigned) (milli%1000); // milliseconds
- milli=(milli-*ms)/1000; // Remainder, in seconds
- *seconds = (int) (milli%60);
- milli=(milli-*seconds)/60; // Remainder, in minutes
- *minutes = (int) (milli%60);
- milli=(milli-*minutes)/60; // Remainder, in hours
- *hours=(int) milli;
-}
-
-void write_subtitle_file_footer (struct s_write *wb)
-{
- switch (write_format)
- {
- case OF_SAMI:
- sprintf ((char *) str,"</BODY></SAMI>\n");
- if (debug_608 && encoding!=ENC_UNICODE)
- {
- hb_log ("\r%s\n", str);
- }
- wb->enc_buffer_used=encode_line (wb->enc_buffer,(unsigned char *) str);
- //fwrite (enc_buffer,enc_buffer_used,1,wb->fh);
- XMLRPC_APPEND(wb->enc_buffer,wb->enc_buffer_used);
- break;
- default: // Nothing to do. Only SAMI has a footer
- break;
- }
-}
-
-void fhb_log_encoded (FILE *fh, const char *string)
-{
- //GUARANTEE(wb, strlen (string)*3);
- //wb->enc_buffer_used=encode_line (wb->enc_buffer,(unsigned char *) string);
- //fwrite (wb->enc_buffer,wb->enc_buffer_used,1,fh);
-}
-
-void write_subtitle_file_header (struct s_write *wb)
-{
- switch (write_format)
- {
- case OF_SRT: // Subrip subtitles have no header
- break; 
- case OF_SAMI: // This header brought to you by McPoodle's CCASDI 
- //fhb_log_encoded (wb->fh, sami_header);
- GUARANTEE(wb, strlen (sami_header)*3);
- wb->enc_buffer_used=encode_line (wb->enc_buffer,(unsigned char *) sami_header);
- //fwrite (enc_buffer,enc_buffer_used,1,wb->fh);
- XMLRPC_APPEND(wb->enc_buffer,wb->enc_buffer_used);
- break;
- case OF_RCWT: // Write header
- //fwrite (rcwt_header, sizeof(rcwt_header),1,wb->fh);
- break;
- case OF_TRANSCRIPT: // No header. Fall thru
- default:
- break;
- }
-}
-
-void write_cc_line_as_transcript (struct eia608_screen *data, struct s_write *wb, int line_number)
-{
- hb_buffer_t *buffer;
-
- if (sentence_cap)
- {
- capitalize(line_number,data, &wb->new_sentence);
- correct_case(line_number,data);
- }
- int length = get_decoder_line_basic (wb->subline, line_number, data);
- if (debug_608 && encoding!=ENC_UNICODE)
- {
- hb_log ("\r");
- hb_log ("%s\n",wb->subline);
- }
- if (length>0)
- {
- //fwrite (wb->subline, 1, length, wb->fh);
- /*
- * Put this subtitle in a hb_buffer_t and shove it into the subtitle fifo
- */
- buffer = hb_buffer_init( length + 1 );
- buffer->s.start = wb->data608->current_visible_start_ms;
- buffer->s.stop = get_fts(wb);
- memcpy( buffer->data, wb->subline, length + 1 );
- //hb_log("CC %"PRId64": %s", buffer->s.stop, wb->subline);
-
- if (wb->hb_last_buffer) {
- wb->hb_last_buffer->next = buffer;
- } else {
- wb->hb_buffer = buffer;
- }
- wb->hb_last_buffer = buffer;
-
- XMLRPC_APPEND(wb->subline,length);
- //fwrite (encoded_crlf, 1, encoded_crlf_length,wb->fh);
- XMLRPC_APPEND(encoded_crlf,encoded_crlf_length); 
- }
- // fhb_log (wb->fh,encoded_crlf);
-}
-
-int write_cc_buffer_as_transcript (struct eia608_screen *data, struct s_write *wb)
-{
- int i;
-
- int wrote_something = 0;
- if (debug_608)
- {
- hb_log ("\n- - - TRANSCRIPT caption - - -\n"); 
- }
- for (i=0;i<15;i++)
- {
- if (data->row_used[i])
- {		
- write_cc_line_as_transcript (data,wb, i);
- }
- wrote_something=1;
- }
- if (debug_608)
- {
- hb_log ("- - - - - - - - - - - -\r\n");
- }
- return wrote_something;
-}
-
-void write_cc_buffer_to_gui (struct eia608_screen *data, struct s_write *wb)
-{
- unsigned h1,m1,s1,ms1;
- unsigned h2,m2,s2,ms2; 
- int i;
-
- int64_t ms_start= wb->data608->current_visible_start_ms;
-
- ms_start+=subs_delay;
- if (ms_start<0) // Drop screens that because of subs_delay start too early
- return;
- int time_reported=0; 
- for (i=0;i<15;i++)
- {
- if (data->row_used[i])
- {
- hb_log ("###SUBTITLE#"); 
- if (!time_reported)
- {
- int64_t ms_end = get_fts(wb)+subs_delay;		
- mstotime (ms_start,&h1,&m1,&s1,&ms1);
- mstotime (ms_end-1,&h2,&m2,&s2,&ms2); // -1 To prevent overlapping with next line.
- // Note, only MM:SS here as we need to save space in the preview window
- hb_log ("%02u:%02u#%02u:%02u#",
- h1*60+m1,s1, h2*60+m2,s2);
- time_reported=1;
- }
- else
- hb_log ("##");
- 
- // We don't capitalize here because whatever function that was used
- // before to write to file already took care of it.
- int length = get_decoder_line_encoded_for_gui (wb->subline, i, data);
- fwrite (wb->subline, 1, length, stderr);
- fwrite ("\n",1,1,stderr);
- }
- }
- fflush (stderr);
-}
-
-int write_cc_buffer_as_srt (struct eia608_screen *data, struct s_write *wb)
+static int write_cc_buffer_as_ssa(struct eia608_screen *data,
+ struct s_write *wb)
 {
- unsigned h1,m1,s1,ms1;
- unsigned h2,m2,s2,ms2;
 int wrote_something = 0;
- int64_t ms_start= wb->data608->current_visible_start_ms;
 int i;
+ int64_t ms_start = wb->data608->current_visible_start_ms;
+ //int64_t ms_end = get_last_pts(wb) + subs_delay;
+ int row = -1, col = -1;
 
- ms_start+=subs_delay;
+ ms_start += subs_delay;
 if (ms_start<0) // Drop screens that because of subs_delay start too early
 return 0;
 
- int64_t ms_end = get_fts(wb)+subs_delay;		
- mstotime (ms_start,&h1,&m1,&s1,&ms1);
- mstotime (ms_end-1,&h2,&m2,&s2,&ms2); // -1 To prevent overlapping with next line.
- char timeline[128]; 
- wb->data608->srt_counter++;
- sprintf (timeline,"%u\r\n",wb->data608->srt_counter);
- //wb->enc_buffer_used=encode_line (wb->enc_buffer,(unsigned char *) timeline);
- //fwrite (wb->enc_buffer,wb->enc_buffer_used,1,wb->fh);
- XMLRPC_APPEND(wb->enc_buffer,wb->enc_buffer_used);
- //sprintf (timeline, "%02u:%02u:%02u,%03u --> %02u:%02u:%02u,%03u\r\n",
- // h1,m1,s1,ms1, h2,m2,s2,ms2);
- //wb->enc_buffer_used=encode_line (wb->enc_buffer,(unsigned char *) timeline);
 if (debug_608)
 {
- hb_log ("\n- - - SRT caption - - -\n");
+ char timeline[128];
+ wb->data608->ssa_counter++;
+ sprintf (timeline,"%u\r\n",wb->data608->ssa_counter);
+
+ hb_log ("\n- - - SSA caption - - -\n");
 hb_log ("%s", timeline);
 }
- //fwrite (enc_buffer,enc_buffer_used,1,wb->fh);		
- XMLRPC_APPEND(wb->enc_buffer,wb->enc_buffer_used);
- 
+
 /*
 * Write all the lines into enc_buffer, and then write that out at the end
 * ensure that we only have two lines, insert a newline after the first one,
 * and have a big bottom line (strip spaces from any joined lines).
 */
+ int rows = 0, columns = 0;
+ for (i = 0; i < 15; i++)
+ {
+ if (data->row_used[i])
+ {
+ int first, last;
+
+ rows++;
+ find_limit_characters(data->characters[i], &first, &last);
+ if (last - first + 1 > columns)
+ columns = last - first + 1;
+ }
+ }
+
+ wb->prev_font_style = FONT_REGULAR;
+ wb->prev_font_color = COL_WHITE;
+ wb->enc_buffer_used = 0;
 int line = 1;
- for (i=0;i<15;i++)
+ for (i = 0; i < 15; i++)
 {
 if (data->row_used[i])
- {		
- if (sentence_cap)
+ {
+ // Get position for this CC
+ if (row == -1)
 {
- capitalize(i,data, &wb->new_sentence);
- correct_case(i,data);
+ int last, x, y, top, safe_zone, cell_width, cell_height;
+ int cropped_width, cropped_height, font_size;
+ char *pos;
+
+ row = i;
+ find_limit_characters(data->characters[i], &col, &last);
+
+ // CC grid is 16 rows by 62 colums
+ // Our SSA resolution is the title resolution
+ // Tranlate CC grid to SSA coordinates
+ // The numbers are tweaked to keep things off the very
+ // edges of the screen and in the "safe" zone
+ cropped_height = wb->height - wb->crop[0] - wb->crop[1];
+ cropped_width = wb->width - wb->crop[2] - wb->crop[3];
+ font_size = cropped_height * .066;
+
+ safe_zone = cropped_height * 0.025; 
+ cell_height = (wb->height - 2 * safe_zone) / 16; 
+ cell_width = (wb->width - 2 * safe_zone) / 32; 
+
+ // Calculate position assuming the position defines
+ // the baseline of the text which is lower left corner
+ // of bottom row of characters
+ y = cell_height * (row + 1 + rows) + safe_zone - wb->crop[0];
+ top = y - rows * font_size;
+ x = cell_width * col + safe_zone - wb->crop[2];
+ if (top < safe_zone)
+ y = (rows * font_size) + safe_zone;
+ if (y > cropped_height - safe_zone)
+ y = cropped_height - safe_zone;
+ if (x + columns * cell_width > cropped_width - safe_zone)
+ x = cropped_width - columns * cell_width - safe_zone;
+ if (x < safe_zone)
+ x = safe_zone;
+ pos = hb_strdup_printf("{\\a1\\pos(%d,%d)}", x, y);
+ wb->enc_buffer_used += encode_line(
+ wb->enc_buffer + wb->enc_buffer_used, (uint8_t*)pos);
+ free(pos);
 }
+
 /*
- * The intention was to use a newline but QT doesn't like it, old code still
- * here just in case..
+ * The intention was to use a newline but QT doesn't like it,
+ * old code still here just in case..
 */
 if (line == 1) {
- wb->enc_buffer_used = get_decoder_line_encoded (wb->enc_buffer, i, data);
+ wb->enc_buffer_used += get_decoder_line_encoded(wb,
+ wb->enc_buffer + wb->enc_buffer_used, i, data);
 line = 2;
 } else {
- if (line == 2) {
- wb->enc_buffer_used += encode_line (wb->enc_buffer+wb->enc_buffer_used,
- (unsigned char *) "\n");
- line = 3;
- } else {
- wb->enc_buffer_used += encode_line (wb->enc_buffer+wb->enc_buffer_used,
- (unsigned char *) " "); 
- }
- wb->enc_buffer_used += get_decoder_line_encoded (wb->enc_buffer+wb->enc_buffer_used, i, data);
+ wb->enc_buffer_used += encode_line(
+ wb->enc_buffer + wb->enc_buffer_used, (uint8_t*)"\\N");
+ wb->enc_buffer_used += get_decoder_line_encoded(wb,
+ wb->enc_buffer + wb->enc_buffer_used, i, data);
 }
 }
 }
- if (wb->enc_buffer_used)
+ if (wb->enc_buffer_used && wb->enc_buffer[0] != 0 && data->dirty)
 {
- hb_buffer_t *buffer = hb_buffer_init( wb->enc_buffer_used + 1 );
+ hb_buffer_t *buffer;
+ int len;
+
+ // bump past null terminator
+ wb->enc_buffer_used++;
+ buffer = hb_buffer_init(wb->enc_buffer_used + SSA_PREAMBLE_LEN);
+ buffer->s.frametype = HB_FRAME_SUBTITLE;
 buffer->s.start = ms_start;
- buffer->s.stop = ms_end;
- memcpy( buffer->data, wb->enc_buffer, wb->enc_buffer_used + 1 );
- if (wb->hb_last_buffer) {
+ buffer->s.stop = AV_NOPTS_VALUE;
+ sprintf((char*)buffer->data, "%d,,Default,,0,0,0,,", ++wb->line);
+ len = strlen((char*)buffer->data);
+ memcpy(buffer->data + len, wb->enc_buffer, wb->enc_buffer_used);
+ if (wb->hb_last_buffer)
+ {
 wb->hb_last_buffer->next = buffer;
- } else {
+ }
+ else
+ {
 wb->hb_buffer = buffer;
 }
 wb->hb_last_buffer = buffer;
- 
 wrote_something=1;
+ wb->clear_sub_needed = 1;
+ }
+ else if (wb->clear_sub_needed)
+ {
+ hb_buffer_t *buffer = hb_buffer_init(1);
+ buffer->s.frametype = HB_FRAME_SUBTITLE;
+ buffer->s.start = ms_start;
+ buffer->s.stop = ms_start;
+ buffer->data[0] = 0;
+ if (wb->hb_last_buffer != NULL)
+ {
+ wb->hb_last_buffer->next = buffer;
+ }
+ else
+ {
+ wb->hb_buffer = buffer;
+ }
+ wb->hb_last_buffer = buffer;
+ wb->clear_sub_needed = 0;
 }
 if (debug_608)
 {
 hb_log ("- - - - - - - - - - - -\r\n");
 }
- // fhb_log (wb->fh, encoded_crlf);
- //fwrite (encoded_crlf, 1, encoded_crlf_length,wb->fh);
- XMLRPC_APPEND(encoded_crlf,encoded_crlf_length);
 return wrote_something;
 }
 
-int write_cc_buffer_as_sami (struct eia608_screen *data, struct s_write *wb)
+static int write_cc_buffer(struct s_write *wb)
 {
+ struct eia608_screen *data;
 int wrote_something=0;
- int64_t startms = wb->data608->current_visible_start_ms;
- int i;
 
- startms+=subs_delay;
- if (startms<0) // Drop screens that because of subs_delay start too early
- return 0; 
-
- int64_t endms = get_fts(wb)+subs_delay;
- endms--; // To prevent overlapping with next line.
- sprintf ((char *) str,"<SYNC start=\"%"PRId64"\">\r\n",startms);
- if (debug_608 && encoding!=ENC_UNICODE)
- {
- hb_log ("\r%s\n", str);
- }
- wb->enc_buffer_used=encode_line (wb->enc_buffer,(unsigned char *) str);
- fwrite (wb->enc_buffer,wb->enc_buffer_used,1,wb->fh);		
- XMLRPC_APPEND(wb->enc_buffer,wb->enc_buffer_used);
- for (i=0;i<15;i++)
- {
- if (data->row_used[i])
- {				
- int length = get_decoder_line_encoded (wb->subline, i, data);
- if (debug_608 && encoding!=ENC_UNICODE)
- {
- hb_log ("\r");
- hb_log ("%s\n",wb->subline);
- }
- fwrite (wb->subline, 1, length, wb->fh);
- XMLRPC_APPEND(wb->subline,length);
- wrote_something=1;
- if (i!=14)
- {
- fwrite (encoded_br, 1, encoded_br_length,wb->fh);			
- XMLRPC_APPEND(encoded_br, encoded_br_length);
- }
- fwrite (encoded_crlf, 1, encoded_crlf_length,wb->fh);
- XMLRPC_APPEND(encoded_crlf, encoded_crlf_length);
- }
- }
- sprintf ((char *) str,"</SYNC>\r\n");
- if (debug_608 && encoding!=ENC_UNICODE)
- {
- hb_log ("\r%s\n", str);
- }
- wb->enc_buffer_used=encode_line (wb->enc_buffer,(unsigned char *) str);
- fwrite (wb->enc_buffer,wb->enc_buffer_used,1,wb->fh);
- XMLRPC_APPEND(wb->enc_buffer,wb->enc_buffer_used);
- sprintf ((char *) str,"<SYNC start=\"%"PRId64"\">&nbsp;</SYNC>\r\n\r\n",endms);
- if (debug_608 && encoding!=ENC_UNICODE)
- {
- hb_log ("\r%s\n", str);
- }
- wb->enc_buffer_used=encode_line (wb->enc_buffer,(unsigned char *) str);
- fwrite (wb->enc_buffer,wb->enc_buffer_used,1,wb->fh);
- XMLRPC_APPEND(wb->enc_buffer,wb->enc_buffer_used);
+ data = get_current_visible_buffer(wb);
+ if (!data->dirty)
+ return 0;
+ wb->new_sentence=1;
+ wrote_something = write_cc_buffer_as_ssa(data, wb);
+ data->dirty = 0;
 return wrote_something;
 }
 
-struct eia608_screen *get_current_visible_buffer (struct s_write *wb)
+static void move_roll_up(struct s_write *wb, int row)
 {
- struct eia608_screen *data;
- if (wb->data608->visible_buffer==1)
- data = &wb->data608->buffer1;
- else
- data = &wb->data608->buffer2;
- return data;
-}
+ struct eia608_screen *use_buffer;
+ int ii, src, dst, keep_lines;
 
+ switch (wb->data608->mode)
+ {
+ case MODE_ROLLUP_2:
+ keep_lines = 2;
+ break;
+ case MODE_ROLLUP_3:
+ keep_lines = 3;
+ break;
+ case MODE_ROLLUP_4:
+ keep_lines = 4;
+ break;
+ default:
+ // Not rollup mode, nothing to do
+ return;
+ }
 
-int write_cc_buffer (struct s_write *wb)
-{
- struct eia608_screen *data;
- int wrote_something=0;
- if (screens_to_process!=-1 && wb->data608->screenfuls_counter>=screens_to_process)
+ if (row == wb->data608->rollup_base_row)
 {
- // We are done. 
- processed_enough=1;
- return 0;
+ // base row didn't change, nothing to do
+ return;
 }
- if (wb->data608->visible_buffer==1)
- data = &wb->data608->buffer1;
- else
- data = &wb->data608->buffer2;
 
- if (!data->empty)
+ use_buffer = get_current_visible_buffer(wb);
+ if (row < wb->data608->rollup_base_row)
 {
- wb->new_sentence=1;
- switch (write_format)
+ src = wb->data608->rollup_base_row - keep_lines + 1;
+ dst = row - keep_lines + 1;
+ for (ii = 0; ii < keep_lines; ii++)
 {
- case OF_SRT:
- wrote_something = write_cc_buffer_as_srt (data, wb);
- break;
- case OF_SAMI:
- wrote_something = write_cc_buffer_as_sami (data,wb);
- break;
- case OF_TRANSCRIPT:
- wrote_something = write_cc_buffer_as_transcript (data,wb);
- break;
- default: 
- break;
+ memcpy(use_buffer->characters[dst], use_buffer->characters[src], CC608_SCREEN_WIDTH+1);
+ memcpy(use_buffer->colors[dst], use_buffer->colors[src], CC608_SCREEN_WIDTH+1);
+ memcpy(use_buffer->fonts[dst], use_buffer->fonts[src], CC608_SCREEN_WIDTH+1);
+ use_buffer->row_used[dst] = use_buffer->row_used[src];
+
+ memset(use_buffer->characters[src], ' ', CC608_SCREEN_WIDTH);
+ memset(use_buffer->colors[src], COL_WHITE, CC608_SCREEN_WIDTH);
+ memset(use_buffer->fonts[src], FONT_REGULAR, CC608_SCREEN_WIDTH);
+ use_buffer->characters[src][CC608_SCREEN_WIDTH] = 0;
+ use_buffer->row_used[src] = 0;
+
+ src++;
+ dst++;
 }
- if (wrote_something && gui_mode_reports)
- write_cc_buffer_to_gui (data,wb);
 }
- return wrote_something;
+ else
+ {
+ src = wb->data608->rollup_base_row;
+ dst = row;
+ for (ii = 0; ii < keep_lines; ii++)
+ {
+ memcpy(use_buffer->characters[dst], use_buffer->characters[src], CC608_SCREEN_WIDTH+1);
+ memcpy(use_buffer->colors[dst], use_buffer->colors[src], CC608_SCREEN_WIDTH+1);
+ memcpy(use_buffer->fonts[dst], use_buffer->fonts[src], CC608_SCREEN_WIDTH+1);
+ use_buffer->row_used[dst] = use_buffer->row_used[src];
+
+ memset(use_buffer->characters[src], ' ', CC608_SCREEN_WIDTH);
+ memset(use_buffer->colors[src], COL_WHITE, CC608_SCREEN_WIDTH);
+ memset(use_buffer->fonts[src], FONT_REGULAR, CC608_SCREEN_WIDTH);
+ use_buffer->characters[src][CC608_SCREEN_WIDTH] = 0;
+ use_buffer->row_used[src] = 0;
+
+ src--;
+ dst--;
+ }
+ }
+ use_buffer->dirty = 1;
 }
 
-void roll_up(struct s_write *wb)
+static void roll_up(struct s_write *wb)
 {
 struct eia608_screen *use_buffer;
 int i, j;
 
- if (wb->data608->visible_buffer==1)
- use_buffer = &wb->data608->buffer1;
- else
- use_buffer = &wb->data608->buffer2;
+ use_buffer = get_current_visible_buffer(wb);
 int keep_lines;
 switch (wb->data608->mode)
 {
 case MODE_ROLLUP_2:
- keep_lines=2;
+ keep_lines = 2;
 break;
 case MODE_ROLLUP_3:
- keep_lines=3;
+ keep_lines = 3;
 break;
 case MODE_ROLLUP_4:
- keep_lines=4;
+ keep_lines = 4;
 break;
 default: // Shouldn't happen
- keep_lines=0;
+ keep_lines = 0;
 break;
 }
- int firstrow=-1, lastrow=-1;
+ int firstrow = -1, lastrow = -1;
 // Look for the last line used
- int rows_now=0; // Number of rows in use right now
- for (i=0;i<15;i++)
+ int rows_now = 0; // Number of rows in use right now
+ for (i = 0; i < 15; i++)
 {
 if (use_buffer->row_used[i])
 {
 rows_now++;
- if (firstrow==-1)
- firstrow=i;
- lastrow=i;
+ if (firstrow == -1)
+ firstrow = i;
+ lastrow = i;
 }
 }
- 
+
 if (debug_608)
 hb_log ("\rIn roll-up: %d lines used, first: %d, last: %d\n", rows_now, firstrow, lastrow);
 
 if (lastrow==-1) // Empty screen, nothing to rollup
 return;
 
- for (j=lastrow-keep_lines+1;j<lastrow; j++)
+ for (j = lastrow - keep_lines + 1; j < lastrow; j++)
 {
- if (j>=0)
+ if (j >= 0)
 {
- memcpy (use_buffer->characters[j],use_buffer->characters[j+1],CC608_SCREEN_WIDTH+1);
- memcpy (use_buffer->colors[j],use_buffer->colors[j+1],CC608_SCREEN_WIDTH+1);
- memcpy (use_buffer->fonts[j],use_buffer->fonts[j+1],CC608_SCREEN_WIDTH+1);
- use_buffer->row_used[j]=use_buffer->row_used[j+1];
+ memcpy(use_buffer->characters[j], use_buffer->characters[j+1], CC608_SCREEN_WIDTH+1);
+ memcpy(use_buffer->colors[j], use_buffer->colors[j+1], CC608_SCREEN_WIDTH+1);
+ memcpy(use_buffer->fonts[j], use_buffer->fonts[j+1], CC608_SCREEN_WIDTH+1);
+ use_buffer->row_used[j] = use_buffer->row_used[j+1];
 }
 }
- for (j=0;j<(1+wb->data608->cursor_row-keep_lines);j++)
+ for (j = 0; j < (1 + wb->data608->cursor_row - keep_lines); j++)
 {
- memset(use_buffer->characters[j],' ',CC608_SCREEN_WIDTH);			
- memset(use_buffer->colors[j],COL_WHITE,CC608_SCREEN_WIDTH);
- memset(use_buffer->fonts[j],FONT_REGULAR,CC608_SCREEN_WIDTH);
- use_buffer->characters[j][CC608_SCREEN_WIDTH]=0;
- use_buffer->row_used[j]=0;
+ memset(use_buffer->characters[j], ' ', CC608_SCREEN_WIDTH);
+ memset(use_buffer->colors[j], COL_WHITE, CC608_SCREEN_WIDTH);
+ memset(use_buffer->fonts[j], FONT_REGULAR, CC608_SCREEN_WIDTH);
+ use_buffer->characters[j][CC608_SCREEN_WIDTH] = 0;
+ use_buffer->row_used[j] = 0;
 }
- memset(use_buffer->characters[lastrow],' ',CC608_SCREEN_WIDTH);
- memset(use_buffer->colors[lastrow],COL_WHITE,CC608_SCREEN_WIDTH);
- memset(use_buffer->fonts[lastrow],FONT_REGULAR,CC608_SCREEN_WIDTH);
+ memset(use_buffer->characters[lastrow], ' ', CC608_SCREEN_WIDTH);
+ memset(use_buffer->colors[lastrow], COL_WHITE, CC608_SCREEN_WIDTH);
+ memset(use_buffer->fonts[lastrow], FONT_REGULAR, CC608_SCREEN_WIDTH);
+
+ use_buffer->characters[lastrow][CC608_SCREEN_WIDTH] = 0;
+ use_buffer->row_used[lastrow] = 0;
 
- use_buffer->characters[lastrow][CC608_SCREEN_WIDTH]=0;
- use_buffer->row_used[lastrow]=0;
- 
 // Sanity check
- rows_now=0;
- for (i=0;i<15;i++)
+ rows_now = 0;
+ for (i = 0; i < 15; i++)
 if (use_buffer->row_used[i])
 rows_now++;
- if (rows_now>keep_lines)
+ if (rows_now > keep_lines)
 hb_log ("Bug in roll_up, should have %d lines but I have %d.\n",
 keep_lines, rows_now);
+ use_buffer->dirty = 1;
 }
 
 void erase_memory (struct s_write *wb, int displayed)
@@ -1867,30 +1121,21 @@
 struct eia608_screen *buf;
 if (displayed)
 {
- if (wb->data608->visible_buffer==1)
- buf=&wb->data608->buffer1;
- else
- buf=&wb->data608->buffer2;
+ buf = get_current_visible_buffer(wb);
 }
 else
 {
- if (wb->data608->visible_buffer==1)
- buf=&wb->data608->buffer2;
- else
- buf=&wb->data608->buffer1;
+ buf = get_current_hidden_buffer(wb);
 }
 clear_eia608_cc_buffer (buf);
 }
 
-int is_current_row_empty (struct s_write *wb)
+static int is_current_row_empty (struct s_write *wb)
 {
 struct eia608_screen *use_buffer;
 int i;
 
- if (wb->data608->visible_buffer==1)
- use_buffer = &wb->data608->buffer1;
- else
- use_buffer = &wb->data608->buffer2;
+ use_buffer = get_current_visible_buffer(wb);
 for (i=0;i<CC608_SCREEN_WIDTH;i++)
 {
 if (use_buffer->characters[wb->data608->rollup_base_row][i]!=' ')
@@ -1900,7 +1145,8 @@
 }
 
 /* Process GLOBAL CODES */
-void handle_command (/*const */ unsigned char c1, const unsigned char c2, struct s_write *wb)
+static void handle_command(unsigned char c1, const unsigned char c2,
+ struct s_write *wb)
 {
 // Handle channel change
 wb->data608->channel=wb->new_channel;
@@ -1945,8 +1191,11 @@
 case COM_BACKSPACE:
 if (wb->data608->cursor_column>0)
 {
+ struct eia608_screen *data;
+ data = get_writing_buffer(wb);
 wb->data608->cursor_column--;
- get_writing_buffer(wb)->characters[wb->data608->cursor_row][wb->data608->cursor_column]=' ';
+ data->characters[wb->data608->cursor_row][wb->data608->cursor_column] = ' ';
+ data->dirty = 1;
 }
 break;
 case COM_TABOFFSET1:
@@ -1965,115 +1214,150 @@
 break;
 case COM_RESUMECAPTIONLOADING:
 wb->data608->mode=MODE_POPUP;
+ wb->data608->current_visible_start_ms = get_last_pts(wb);
 break;
 case COM_RESUMETEXTDISPLAY:
 wb->data608->mode=MODE_TEXT;
+ wb->data608->current_visible_start_ms = get_last_pts(wb);
 break;
- case COM_ROLLUP2: 
+ case COM_ROLLUP2:
+ if (wb->data608->rollup_base_row + 1 < 2)
+ {
+ move_roll_up(wb, 1);
+ wb->data608->rollup_base_row = 1;
+ }
 if (wb->data608->mode==MODE_POPUP)
 {
- if (write_cc_buffer (wb))
+ swap_visible_buffer(wb);
+ if (write_cc_buffer(wb))
 wb->data608->screenfuls_counter++;
- erase_memory (wb, 1);			
+ erase_memory (wb, 1);
 }
+ wb->data608->color=default_color;
+ wb->data608->font=FONT_REGULAR;
 if (wb->data608->mode==MODE_ROLLUP_2 && !is_current_row_empty(wb))
 {
 if (debug_608)
 hb_log ("Two RU2, current line not empty. Simulating a CR\n");
 handle_command(0x14, 0x2D, wb);
- } 
+ wb->rollup_cr = 1;
+ }
+ wb->data608->current_visible_start_ms = get_last_pts(wb);
 wb->data608->mode=MODE_ROLLUP_2;
 erase_memory (wb, 0);
- wb->data608->cursor_column=0;
- wb->data608->cursor_row=wb->data608->rollup_base_row;
+ wb->data608->cursor_column = 0;
+ wb->data608->cursor_row = wb->data608->rollup_base_row;
 break;
 case COM_ROLLUP3:
+ if (wb->data608->rollup_base_row + 1 < 3)
+ {
+ move_roll_up(wb, 2);
+ wb->data608->rollup_base_row = 2;
+ }
 if (wb->data608->mode==MODE_POPUP)
 {
- if (write_cc_buffer (wb))
+ if (write_cc_buffer(wb))
 wb->data608->screenfuls_counter++;
 erase_memory (wb, 1);
 }
+ wb->data608->color=default_color;
+ wb->data608->font=FONT_REGULAR;
 if (wb->data608->mode==MODE_ROLLUP_3 && !is_current_row_empty(wb))
 {
 if (debug_608)
 hb_log ("Two RU3, current line not empty. Simulating a CR\n");
 handle_command(0x14, 0x2D, wb);
+ wb->rollup_cr = 1;
 }
+ wb->data608->current_visible_start_ms = get_last_pts(wb);
 wb->data608->mode=MODE_ROLLUP_3;
 erase_memory (wb, 0);
- wb->data608->cursor_column=0;
- wb->data608->cursor_row=wb->data608->rollup_base_row;
+ wb->data608->cursor_column = 0;
+ wb->data608->cursor_row = wb->data608->rollup_base_row;
 break;
 case COM_ROLLUP4:
+ if (wb->data608->rollup_base_row + 1 < 4)
+ {
+ move_roll_up(wb, 3);
+ wb->data608->rollup_base_row = 3;
+ }
 if (wb->data608->mode==MODE_POPUP)
 {
- if (write_cc_buffer (wb))
+ if (write_cc_buffer(wb))
 wb->data608->screenfuls_counter++;
- erase_memory (wb, 1);			
+ erase_memory (wb, 1);
 }
+ wb->data608->color=default_color;
+ wb->data608->font=FONT_REGULAR;
 if (wb->data608->mode==MODE_ROLLUP_4 && !is_current_row_empty(wb))
 {
 if (debug_608)
 hb_log ("Two RU4, current line not empty. Simulating a CR\n");
 handle_command(0x14, 0x2D, wb);
+ wb->rollup_cr = 1;
 }
- 
- wb->data608->mode=MODE_ROLLUP_4;
- wb->data608->cursor_column=0;
- wb->data608->cursor_row=wb->data608->rollup_base_row;
+ wb->data608->current_visible_start_ms = get_last_pts(wb);
+ wb->data608->mode = MODE_ROLLUP_4;
+ wb->data608->cursor_column = 0;
+ wb->data608->cursor_row = wb->data608->rollup_base_row;
 erase_memory (wb, 0);
 break;
 case COM_CARRIAGERETURN:
 // In transcript mode, CR doesn't write the whole screen, to avoid
 // repeated lines.
- if (write_format==OF_TRANSCRIPT)
- {
- write_cc_line_as_transcript(get_current_visible_buffer (wb), wb, wb->data608->cursor_row);
- }
- else
+
+ // Skip initial CR if rollup has already done it
+ if (wb->rollup_cr && is_current_row_empty(wb))
 {
- if (norollup)
- delete_all_lines_but_current (get_current_visible_buffer (wb), wb->data608->cursor_row);
- if (write_cc_buffer(wb))
- wb->data608->screenfuls_counter++;
+ wb->rollup_cr = 0;
+ wb->data608->current_visible_start_ms = get_last_pts(wb);
+ break;
 }
- roll_up(wb);		
- wb->data608->current_visible_start_ms=get_fts(wb);
- wb->data608->cursor_column=0;
+ if (write_cc_buffer(wb))
+ wb->data608->screenfuls_counter++;
+ roll_up(wb);
+ wb->data608->cursor_column = 0;
+ wb->data608->current_visible_start_ms = get_last_pts(wb);
 break;
 case COM_ERASENONDISPLAYEDMEMORY:
 erase_memory (wb,0);
 break;
 case COM_ERASEDISPLAYEDMEMORY:
- // Write it to disk before doing this, and make a note of the new
- // time it became clear.
- if (write_format==OF_TRANSCRIPT && 
- (wb->data608->mode==MODE_ROLLUP_2 || wb->data608->mode==MODE_ROLLUP_3 ||
- wb->data608->mode==MODE_ROLLUP_4))
+ // There may be "displayed" rollup data that has not been
+ // written to a buffer yet.
+ if (wb->data608->mode == MODE_ROLLUP_2 ||
+ wb->data608->mode == MODE_ROLLUP_3 ||
+ wb->data608->mode == MODE_ROLLUP_4)
 {
- // In transcript mode we just write the cursor line. The previous lines
- // should have been written already, so writing everything produces
- // duplicate lines. 
- write_cc_line_as_transcript(get_current_visible_buffer (wb), wb, wb->data608->cursor_row);
- }
- else
- {
- if (write_cc_buffer (wb))
- wb->data608->screenfuls_counter++;
+ write_cc_buffer(wb);
 }
 erase_memory (wb,1);
- wb->data608->current_visible_start_ms=get_fts(wb);
+
+ // the last pts is the time to remove the previously 
+ // displayed CC from the display
+ wb->data608->current_visible_start_ms = get_last_pts(wb);
+
+ // Write "clear" subtitle if necessary
+ struct eia608_screen *data;
+ data = get_current_visible_buffer(wb);
+ data->dirty = 1;
+ write_cc_buffer(wb);
 break;
 case COM_ENDOFCAPTION: // Switch buffers
 // The currently *visible* buffer is leaving, so now we know it's ending
 // time. Time to actually write it to file.
- if (write_cc_buffer (wb))
+ if (wb->data608->mode == MODE_POPUP)
+ {
+ swap_visible_buffer(wb);
+ wb->data608->current_visible_start_ms = get_last_pts(wb);
+ }
+ if (write_cc_buffer(wb))
 wb->data608->screenfuls_counter++;
- wb->data608->visible_buffer = (wb->data608->visible_buffer==1) ? 2 : 1;
- wb->data608->current_visible_start_ms=get_fts(wb);
- wb->data608->cursor_column=0;
- wb->data608->cursor_row=0;
+
+ if (wb->data608->mode != MODE_POPUP)
+ swap_visible_buffer(wb);
+ wb->data608->cursor_column = 0;
+ wb->data608->cursor_row = 0;
 wb->data608->color=default_color;
 wb->data608->font=FONT_REGULAR;
 break;
@@ -2086,14 +1370,15 @@
 }
 }
 
-void handle_end_of_data (struct s_write *wb)
-{ 
+static void handle_end_of_data(struct s_write *wb)
+{
 // We issue a EraseDisplayedMemory here so if there's any captions pending
- // they get written to file. 
+ // they get written to file.
 handle_command (0x14, 0x2c, wb); // EDM
 }
 
-void handle_double (const unsigned char c1, const unsigned char c2, struct s_write *wb)
+static void handle_double(const unsigned char c1, const unsigned char c2,
+ struct s_write *wb)
 {
 unsigned char c;
 if (wb->data608->channel!=cc_channel)
@@ -2108,10 +1393,11 @@
 }
 
 /* Process EXTENDED CHARACTERS */
-unsigned char handle_extended (unsigned char hi, unsigned char lo, struct s_write *wb)
+static unsigned char handle_extended(unsigned char hi, unsigned char lo,
+ struct s_write *wb)
 {
 // Handle channel change
- if (wb->new_channel > 2) 
+ if (wb->new_channel > 2)
 {
 wb->new_channel -= 2;
 if (debug_608)
@@ -2137,11 +1423,11 @@
 c=lo+0x90; // So if c>=0xb0 && c<=0xcf it comes from here
 break;
 }
- // This column change is because extended characters replace 
+ // This column change is because extended characters replace
 // the previous character (which is sent for basic decoders
 // to show something similar to the real char)
- if (wb->data608->cursor_column>0) 
- wb->data608->cursor_column--; 
+ if (wb->data608->cursor_column>0)
+ wb->data608->cursor_column--;
 
 write_char (c,wb);
 }
@@ -2149,10 +1435,10 @@
 }
 
 /* Process PREAMBLE ACCESS CODES (PAC) */
-void handle_pac (unsigned char c1, unsigned char c2, struct s_write *wb)
+static void handle_pac(unsigned char c1, unsigned char c2, struct s_write *wb)
 {
 // Handle channel change
- if (wb->new_channel > 2) 
+ if (wb->new_channel > 2)
 {
 wb->new_channel -= 2;
 if (debug_608)
@@ -2189,20 +1475,49 @@
 int indent=pac2_attribs[c2][2];
 if (debug_608)
 hb_log (" -- Position: %d:%d, color: %s, font: %s\n",row,
- indent,color_text[color][0],font_text[font]);
- if (wb->data608->mode!=MODE_TEXT)
+ indent,color_text[color][0],font_text[font]);
+
+ // CC spec says to the preferred method to handle a roll-up base row
+ // that causes the display to scroll off the top of the screen is to 
+ // adjust the base row down.
+ int keep_lines;
+ switch (wb->data608->mode)
+ {
+ case MODE_ROLLUP_2:
+ keep_lines = 2;
+ break;
+ case MODE_ROLLUP_3:
+ keep_lines = 3;
+ break;
+ case MODE_ROLLUP_4:
+ keep_lines = 4;
+ break;
+ default:
+ // Not rollup mode, all rows ok
+ keep_lines = 0;
+ break;
+ }
+ if (row < keep_lines)
+ {
+ row = keep_lines;
+ }
+ if (wb->data608->mode != MODE_TEXT)
 {
 // According to Robson, row info is discarded in text mode
 // but column is accepted
- wb->data608->cursor_row=row-1 ; // Since the array is 0 based
- }
- wb->data608->rollup_base_row=row-1;
- wb->data608->cursor_column=indent;	
+ //
+ // CC-608 spec says current rollup display must move to the
+ // new position when the cursor row changes
+ move_roll_up(wb, row - 1);
+ wb->data608->cursor_row = row - 1 ; // Since the array is 0 based
+ }
+ wb->data608->rollup_base_row = row - 1;
+ wb->data608->cursor_column = indent;
 }
 
 
-void handle_single (const unsigned char c1, struct s_write *wb)
-{	
+static void handle_single(const unsigned char c1, struct s_write *wb)
+{
 if (c1<0x20 || wb->data608->channel!=cc_channel)
 return; // We don't allow special stuff here
 if (debug_608)
@@ -2213,27 +1528,27 @@
 write_char (c1,wb);
 }
 
-int check_channel (unsigned char c1, struct s_write *wb)
+static int check_channel(unsigned char c1, struct s_write *wb)
 {
- if (c1==0x14) 
+ if (c1==0x14)
 {
 if (debug_608 && wb->data608->channel!=1)
 hb_log ("\nChannel change, now 1\n");
 return 1;
 }
- if (c1==0x1c) 
+ if (c1==0x1c)
 {
 if (debug_608 && wb->data608->channel!=2)
 hb_log ("\nChannel change, now 2\n");
 return 2;
 }
- if (c1==0x15) 
+ if (c1==0x15)
 {
 if (debug_608 && wb->data608->channel!=3)
 hb_log ("\nChannel change, now 3\n");
 return 3;
 }
- if (c1==0x1d) 
+ if (c1==0x1d)
 {
 if (debug_608 && wb->data608->channel!=4)
 hb_log ("\nChannel change, now 4\n");
@@ -2247,7 +1562,7 @@
 /* Handle Command, special char or attribute and also check for
 * channel changes.
 * Returns 1 if something was written to screen, 0 otherwise */
-int disCommand (unsigned char hi, unsigned char lo, struct s_write *wb)
+static int disCommand(unsigned char hi, unsigned char lo, struct s_write *wb)
 {
 int wrote_to_screen=0;
 
@@ -2313,7 +1628,8 @@
 return wrote_to_screen;
 }
 
-void process608 (const unsigned char *data, int length, struct s_write *wb)
+static void process608(const unsigned char *data, int length,
+ struct s_write *wb)
 {
 static int textprinted = 0;
 int i;
@@ -2323,14 +1639,11 @@
 for (i=0;i<length;i=i+2)
 {
 unsigned char hi, lo;
- int wrote_to_screen=0; 
 hi = data[i] & 0x7F; // Get rid of parity bit
 lo = data[i+1] & 0x7F; // Get rid of parity bit
 
 if (hi==0 && lo==0) // Just padding
 continue;
- // hb_log ("\r[%02X:%02X]\n",hi,lo);
-
 if (hi>=0x01 && hi<=0x0E)
 {
 // XDS crap - mode. Would be nice to support it eventually
@@ -2364,7 +1677,7 @@
 }
 wb->data608->last_c1=hi;
 wb->data608->last_c2=lo;
- wrote_to_screen=disCommand (hi,lo,wb);
+ disCommand (hi,lo,wb);
 }
 if (hi>=0x20) // Standard characters (always in pairs)
 {
@@ -2383,72 +1696,36 @@
 
 handle_single(hi,wb);
 handle_single(lo,wb);
- wrote_to_screen=1;
 wb->data608->last_c1=0;
 wb->data608->last_c2=0;
 }
 
 if ( debug_608 && !textprinted && wb->data608->channel==cc_channel )
 { // Current FTS information after the characters are shown
- //hb_log("Current FTS: %s\n", print_mstime(get_fts()));
+ //hb_log("Current FTS: %s\n", print_mstime(get_last_pts()));
 }
 
- if (wrote_to_screen && direct_rollup && // If direct_rollup is enabled and
- (wb->data608->mode==MODE_ROLLUP_2 || // we are in rollup mode, write now.
- wb->data608->mode==MODE_ROLLUP_3 ||
- wb->data608->mode==MODE_ROLLUP_4))
+ if ((wb->data608->mode == MODE_ROLLUP_2 ||
+ wb->data608->mode == MODE_ROLLUP_3 ||
+ wb->data608->mode == MODE_ROLLUP_4) &&
+ wb->direct_rollup)
 {
- // We don't increase screenfuls_counter here.
- write_cc_buffer (wb);
- wb->data608->current_visible_start_ms=get_fts(wb);
+ // If we are showing rollup on the fly (direct_rollup)
+ // write a buffer now
+ write_cc_buffer(wb);
+ wb->data608->current_visible_start_ms = get_last_pts(wb);
 }
 }
 }
 }
 
-
-/* Return a pointer to a string that holds the printable characters
- * of the caption data block. FOR DEBUG PURPOSES ONLY! */
-unsigned char *debug_608toASC (unsigned char *cc_data, int channel)
-{
- static unsigned char output[3];
-
- unsigned char cc_valid = (cc_data[0] & 4) >>2;
- unsigned char cc_type = cc_data[0] & 3;
- unsigned char hi, lo;
-
- output[0]=' ';
- output[1]=' ';
- output[2]='\x00';
-
- if (cc_valid && cc_type==channel)
- {
- hi = cc_data[1] & 0x7F; // Get rid of parity bit
- lo = cc_data[2] & 0x7F; // Get rid of parity bit
- if (hi>=0x20)
- {
- output[0]=hi;
- output[1]=(lo>=20 ? lo : '.');
- output[2]='\x00';
- }
- else
- {
- output[0]='<';
- output[1]='>';
- output[2]='\x00';
- }
- }
- return output;
-}
-
-
 struct hb_work_private_s
 {
 hb_job_t * job;
 struct s_write * cc608;
 };
 
-int decccInit( hb_work_object_t * w, hb_job_t * job )
+static int decccInit( hb_work_object_t * w, hb_job_t * job )
 {
 int retval = 1;
 hb_work_private_t * pv;
@@ -2464,6 +1741,9 @@
 
 if( pv->cc608 )
 {
+ pv->cc608->width = job->title->width;
+ pv->cc608->height = job->title->height;
+ memcpy(pv->cc608->crop, job->crop, sizeof(int[4]));
 retval = general_608_init(pv->cc608);
 if( !retval )
 {
@@ -2472,13 +1752,25 @@
 {
 retval = 1;
 }
+ init_eia608(pv->cc608->data608);
 }
 }
 }
+ if (!retval)
+ {
+ // Generate generic SSA Script Info.
+ int height = job->title->height - job->crop[0] - job->crop[1];
+ int width = job->title->width - job->crop[2] - job->crop[3];
+ hb_subtitle_add_ssa_header(w->subtitle, width, height);
+ }
+ // When rendering subs, we need to push rollup subtitles out
+ // asap (instead of waiting for a completed line) so that we
+ // do not miss the frame that they should be rendered over.
+ pv->cc608->direct_rollup = w->subtitle->config.dest == RENDERSUB;
 return retval;
 }
 
-int decccWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
+static int decccWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
 hb_buffer_t ** buf_out )
 {
 hb_work_private_t * pv = w->private_data;
@@ -2505,20 +1797,20 @@
 }
 
 pv->cc608->last_pts = in->s.start;
-
 process608(in->data, in->size, pv->cc608);
 
 /*
 * If there is one waiting then pass it on
 */
 *buf_out = pv->cc608->hb_buffer;
+
 pv->cc608->hb_buffer = NULL;
 pv->cc608->hb_last_buffer = NULL;
 
- return HB_WORK_OK; 
+ return HB_WORK_OK;
 }
 
-void decccClose( hb_work_object_t * w )
+static void decccClose( hb_work_object_t * w )
 {
 hb_work_private_t * pv = w->private_data;
 general_608_close( pv->cc608 );

HandBrake-0.9.9.tar.bz2/libhb/deccc608sub.h -> HandBrake-0.10.0.tar.bz2/libhb/deccc608sub.h Changed

@@ -1,26 +1,22 @@
+/* deccc608sub.h
+
+ Copyright (c) 2003-2014 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
 /*
- * From ccextractor, leave this file as intact and close to the original as possible so that 
- * it is easy to patch in fixes - even though this file contains code that we don't need.
- *
- * Note that the SRT sub generation from CC could be useful for mkv subs.
+ * From ccextractor...
 */
-#ifndef __deccc608sub_H__
-#define __deccc608sub_H__
+#ifndef __DECCC608SUB_H__
+#define __DECCC608SUB_H__
 
 #include "common.h"
 
 struct s_write;
 
-void handle_end_of_data (struct s_write *wb);
-void process608 (const unsigned char *data, int length, struct s_write *wb);
-void get_char_in_latin_1 (unsigned char *buffer, unsigned char c);
-void get_char_in_unicode (unsigned char *buffer, unsigned char c);
-int get_char_in_utf_8 (unsigned char *buffer, unsigned char c);
-unsigned char cctolower (unsigned char c);
-unsigned char cctoupper (unsigned char c);
-int general_608_init (struct s_write *wb);
-void general_608_close (struct s_write *wb);
-
 #define CC608_SCREEN_WIDTH 32
 
 enum cc_modes
@@ -29,7 +25,7 @@
 MODE_ROLLUP_2 = 1,
 MODE_ROLLUP_3 = 2,
 MODE_ROLLUP_4 = 3,
-	MODE_TEXT = 4
+ MODE_TEXT = 4
 };
 
 enum color_code
@@ -41,7 +37,7 @@
 COL_RED = 4,
 COL_YELLOW = 5,
 COL_MAGENTA = 6,
-	COL_USERDEFINED = 7
+ COL_USERDEFINED = 7
 };
 
 
@@ -53,26 +49,27 @@
 FONT_UNDERLINED_ITALICS = 3
 };
 
+#define FONT_STYLE_MASK FONT_UNDERLINED_ITALICS
 
 struct eia608_screen // A CC buffer
 {
- unsigned char characters[15][33]; 
+ unsigned char characters[15][33];
 unsigned char colors[15][33];
 unsigned char fonts[15][33]; // Extra char at the end for a 0
 int row_used[15]; // Any data in row?
- int empty; // Buffer completely empty? 	
+ int empty; // Buffer completely empty?
+ int dirty; // Flag indicates buffer has changed since written
 };
 
 struct eia608
 {
 struct eia608_screen buffer1;
- struct eia608_screen buffer2; 
+ struct eia608_screen buffer2;
 int cursor_row, cursor_column;
 int visible_buffer;
- int srt_counter; // Number of subs currently written
+ int ssa_counter; // Number of subs currently written
 int screenfuls_counter; // Number of meaningful screenfuls written
 int64_t current_visible_start_ms; // At what time did the current visible buffer became so?
- // unsigned current_visible_start_cc; // At what time did the current visible buffer became so?
 enum cc_modes mode;
 unsigned char last_c1, last_c2;
 int channel; // Currently selected channel
@@ -84,7 +81,7 @@
 struct s_write {
 struct eia608 *data608;
 FILE *fh;
- unsigned char *subline; 
+ unsigned char *subline;
 int new_sentence;
 int new_channel;
 int in_xds_mode;
@@ -94,6 +91,18 @@
 unsigned char *enc_buffer; // Generic general purpose buffer
 unsigned enc_buffer_used;
 unsigned enc_buffer_capacity;
+
+ int clear_sub_needed; // Indicates that we need to send a null
+ // subtitle to clear the current subtitle
+
+ int rollup_cr; // Flag indicates if CR command performed by rollup
+ int direct_rollup;
+ int line; // SSA line number
+ int width;
+ int height;
+ int crop[4];
+ uint8_t prev_font_style;
+ uint8_t prev_font_color;
 };
 
 enum command_code
@@ -111,7 +120,7 @@
 COM_CARRIAGERETURN = 10,
 COM_ERASENONDISPLAYEDMEMORY = 11,
 COM_BACKSPACE = 12,
-	COM_RESUMETEXTDISPLAY = 13
+ COM_RESUMETEXTDISPLAY = 13
 };
 
 enum encoding_type
@@ -123,11 +132,11 @@
 
 enum output_format
 {
- OF_RAW	= 0,
- OF_SRT	= 1,
+ OF_RAW = 0,
+ OF_SRT = 1,
 OF_SAMI = 2,
 OF_TRANSCRIPT = 3,
 OF_RCWT = 4
 };
 
-#endif
+#endif // __DECCC608SUB_H__

HandBrake-0.9.9.tar.bz2/libhb/declpcm.c -> HandBrake-0.10.0.tar.bz2/libhb/declpcm.c Changed

@@ -1,6 +1,6 @@
 /* declpcm.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -330,8 +330,7 @@
 }
 
 hb_audio_resample_set_channel_layout(pv->resample,
- hdr2layout[pv->nchannels - 1],
- pv->nchannels);
+ hdr2layout[pv->nchannels - 1]);
 if (hb_audio_resample_update(pv->resample))
 {
 hb_log("declpcm: hb_audio_resample_update() failed");
@@ -379,6 +378,7 @@
 info->rate_base = 1;
 info->bitrate = bitrate;
 info->flags = ( b->data[3] << 16 ) | ( b->data[4] << 8 ) | b->data[5];
+ info->matrix_encoding = AV_MATRIX_ENCODING_NONE;
 info->channel_layout = hdr2layout[nchannels - 1];
 info->channel_map = &hb_libav_chan_map;
 info->samples_per_frame = ( duration * rate ) / 90000;

HandBrake-0.9.9.tar.bz2/libhb/decomb.c -> HandBrake-0.10.0.tar.bz2/libhb/decomb.c Changed

@@ -1,6 +1,6 @@
 /* decomb.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -33,7 +33,6 @@
 #define MODE_BLEND 2 // Use blending interpolation
 #define MODE_CUBIC 4 // Use cubic interpolation
 #define MODE_EEDI2 8 // Use EEDI2 interpolation
-#define MODE_MCDEINT 16 // Post-process with mcdeint
 #define MODE_MASK 32 // Output combing masks instead of pictures
 #define MODE_BOB 64 // Deinterlace each field to a separate frame
 
@@ -60,36 +59,20 @@
 9: EEDI2->yadif
 10: Switch between EEDI2 and blend
 11: Switch between EEDI2->yadif and blend
-17: Yadif->mcdeint
-18: Blend->mcdeint
-19: Switch between blending and yadif -> mcdeint
-20: Cubic->mdeint
-21: Cubic->yadif->mcdeint
-22: Cubic or blend -> mcdeint
-23: Cubic->yadif or blend -> mcdeint
-24: EEDI2->mcdeint
-25: EEDI2->yadif->mcdeint
 ...okay I'm getting bored now listing all these different modes
 32: Passes through the combing mask for every combed frame (white for combed pixels, otherwise black)
 33+: Overlay the combing mask for every combed frame on top of the filtered output (white for combed pixels)
 
 12-15: EEDI2 will override cubic interpolation
-16: DOES NOT WORK BY ITSELF-- mcdeint needs to be fed by another deinterlacer
 *****/
 
 #include "hb.h"
 #include "hbffmpeg.h"
-#include "mpeg2dec/mpeg2.h"
 #include "eedi2.h"
-#include "mcdeint.h"
 #include "taskset.h"
 
 #define PARITY_DEFAULT -1
 
-#define MCDEINT_MODE_DEFAULT -1
-#define MCDEINT_MODE_ENABLED 2
-#define MCDEINT_QP_DEFAULT 1
-
 #define ABS(a) ((a) > 0 ? (a) : (-(a)))
 #define MIN3(a,b,c) MIN(MIN(a,b),c)
 #define MAX3(a,b,c) MAX(MAX(a,b),c)
@@ -168,9 +151,6 @@
 
 int yadif_ready;
 
- int mcdeint_mode;
- mcdeint_private_t mcdeint;
-
 int deinterlaced_frames;
 int blended_frames;
 int unfiltered_frames;
@@ -208,6 +188,12 @@
 taskset_t eedi2_taskset; // Threads for eedi2 - one per plane
 };
 
+typedef struct
+{
+ int tap[5];
+ int normalize;
+} filter_param_t;
+
 static int hb_decomb_init( hb_filter_object_t * filter,
 hb_filter_init_t * init );
 
@@ -228,20 +214,36 @@
 .close = hb_decomb_close,
 };
 
-int cubic_interpolate_pixel( int y0, int y1, int y2, int y3 )
+// Borrowed from libav
+#define times4(x) x, x, x, x
+#define times1024(x) times4(times4(times4(times4(times4(x)))))
+
+static const uint8_t hb_crop_table[256 + 2 * 1024] = {
+times1024(0x00),
+0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
+0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
+0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
+0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
+0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
+0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
+0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
+0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
+0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
+0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
+times1024(0xFF)
+};
+
+static inline int cubic_interpolate_pixel( int y0, int y1, int y2, int y3 )
 {
 /* From http://www.neuron2.net/library/cubicinterp.html */
 int result = ( y0 * -3 ) + ( y1 * 23 ) + ( y2 * 23 ) + ( y3 * -3 );
- result /= 40;
-
- if( result > 255 )
- {
- result = 255;
- }
- else if( result < 0 )
- {
- result = 0;
- }
+ result = hb_crop_table[(result / 40) + 1024];
 
 return result;
 }
@@ -307,7 +309,7 @@
 }
 }
 
-void draw_mask_box( hb_filter_private_t * pv )
+static void draw_mask_box( hb_filter_private_t * pv )
 {
 int x = pv->mask_box_x;
 int y = pv->mask_box_y;
@@ -342,9 +344,9 @@
 }
 }
 
-void apply_mask_line( uint8_t * srcp,
- uint8_t * mskp,
- int width )
+static void apply_mask_line( uint8_t * srcp,
+ uint8_t * mskp,
+ int width )
 {
 int x;
 
@@ -361,7 +363,7 @@
 }
 }
 
-void apply_mask(hb_filter_private_t * pv, hb_buffer_t * b)
+static void apply_mask(hb_filter_private_t * pv, hb_buffer_t * b)
 {
 /* draw_boxes */
 draw_mask_box( pv );
@@ -392,7 +394,7 @@
 {
 memset(dstp, 128, m->plane[pp].width);
 }
- else if (pp == 0)
+ if (pp == 0)
 {
 apply_mask_line(dstp, mskp, m->plane[pp].width);
 }
@@ -410,30 +412,24 @@
 pv->ref[2] = b;
 }
 
-int blend_filter_pixel( int up2, int up1, int current, int down1, int down2 )
+static inline int blend_filter_pixel(filter_param_t *filter, int up2, int up1, int current, int down1, int down2)
 {
 /* Low-pass 5-tap filter */
 int result = 0;
- result += -up2;
- result += up1 * 2;
- result += current * 6;
- result += down1 *2;
- result += -down2;
- result /= 8;
 
- if( result > 255 )
- {
- result = 255;
- }
- if( result < 0 )
- {
- result = 0;
- }
+ result += up2 * filter->tap[0];
+ result += up1 * filter->tap[1];
+ result += current * filter->tap[2];
+ result += down1 * filter->tap[3];
+ result += down2 * filter->tap[4];
+ result >>= filter->normalize;
 
+ result = hb_crop_table[result + 1024];
 return result;
 }
 
-static void blend_filter_line( uint8_t *dst,
+static void blend_filter_line(filter_param_t *filter,
+ uint8_t *dst,
 uint8_t *cur,
 int width,
 int height,
@@ -487,15 +483,15 @@
 
 for( x = 0; x < w; x++)
 {
- dst[0] = blend_filter_pixel( cur[up2], cur[up1], cur[0],
- cur[down1], cur[down2] );
-
+ /* Low-pass 5-tap filter */
+ dst[0] = blend_filter_pixel(filter, cur[up2], cur[up1], cur[0],
+ cur[down1], cur[down2] );
 dst++;
 cur++;
 }
 }
 
-void reset_combing_results( hb_filter_private_t * pv )
+static void reset_combing_results( hb_filter_private_t * pv )
 {
 pv->comb_check_complete = 0;
 int ii;
@@ -505,7 +501,7 @@
 }
 }
 
-int check_combing_results( hb_filter_private_t * pv )
+static int check_combing_results( hb_filter_private_t * pv )
 {
 int threshold = pv->block_threshold;
 int send_to_blend = 0;
@@ -515,8 +511,7 @@
 {
 if( pv->block_score[ii] >= ( threshold / 2 ) )
 {
- if (pv->block_score[ii] <= threshold &&
- !( pv->ref[1]->s.flags & 16) )
+ if (pv->block_score[ii] <= threshold)
 {
 /* Blend video content that scores between
 ( threshold / 2 ) and threshold. */
@@ -525,18 +520,9 @@
 }
 else if( pv->block_score[ii] > threshold )
 {
- if( pv->ref[1]->s.flags & 16 )
- {
- /* Blend progressive content above the threshold.*/
- pv->mask_box_color = 2;
- return 2;
- }
- else
- {
- /* Yadif deinterlace video content above the threshold. */
- pv->mask_box_color = 1;
- return 1;
- }
+ /* Yadif deinterlace video content above the threshold. */
+ pv->mask_box_color = 1;
+ return 1;
 }
 }
 }
@@ -552,7 +538,7 @@
 }
 }
 
-void check_filtered_combing_mask( hb_filter_private_t * pv, int segment, int start, int stop )
+static void check_filtered_combing_mask( hb_filter_private_t * pv, int segment, int start, int stop )
 {
 /* Go through the mask in X*Y blocks. If any of these windows
 have threshold or more combed pixels, consider the whole
@@ -620,7 +606,7 @@
 }
 }
 
-void check_combing_mask( hb_filter_private_t * pv, int segment, int start, int stop )
+static void check_combing_mask( hb_filter_private_t * pv, int segment, int start, int stop )
 {
 /* Go through the mask in X*Y blocks. If any of these windows
 have threshold or more combed pixels, consider the whole
@@ -699,7 +685,7 @@
 }
 }
 
-void build_gamma_lut( hb_filter_private_t * pv )
+static void build_gamma_lut( hb_filter_private_t * pv )
 {
 int i;
 for( i = 0; i < 256; i++ )
@@ -708,12 +694,7 @@
 }
 }
 
-float scale_gamma( int pixel, hb_filter_private_t * pv )
-{
- return pv->gamma_lut[pixel];
-}
-
-void detect_gamma_combed_segment( hb_filter_private_t * pv, int segment_start, int segment_stop )
+static void detect_gamma_combed_segment( hb_filter_private_t * pv, int segment_start, int segment_stop )
 {
 /* A mish-mash of various comb detection tricks
 picked up from neuron2's Decomb plugin for
@@ -785,7 +766,6 @@
 fabs( pv->gamma_lut[prev[down_1]] - pv->gamma_lut[cur[down_1]] ) > mthresh )
 motion++;
 
-// hb_log("prev->cur motion: %f, mthresh: %f", fabs( scale_gamma( prev[0] ) - scale_gamma( cur[0] ) ), mthresh);
 }
 else
 {
@@ -823,7 +803,7 @@
 }
 
 
-void detect_combed_segment( hb_filter_private_t * pv, int segment_start, int segment_stop )
+static void detect_combed_segment( hb_filter_private_t * pv, int segment_start, int segment_stop )
 {
 /* A mish-mash of various comb detection tricks
 picked up from neuron2's Decomb plugin for
@@ -960,7 +940,7 @@
 
 // This function calls all the eedi2 filters in sequence for a given plane.
 // It outputs the final interpolated image to pv->eedi_full[DST2PF].
-void eedi2_interpolate_plane( hb_filter_private_t * pv, int plane )
+static void eedi2_interpolate_plane( hb_filter_private_t * pv, int plane )
 {
 /* We need all these pointers. No, seriously.
 I swear. It's not a joke. They're used.
@@ -1040,7 +1020,7 @@
 /*
 * eedi2 interpolate this plane in a single thread.
 */
-void eedi2_filter_thread( void *thread_args_v )
+static void eedi2_filter_thread( void *thread_args_v )
 {
 hb_filter_private_t * pv;
 int plane;
@@ -1070,7 +1050,7 @@
 * Process plane
 */
 eedi2_interpolate_plane( pv, plane );
- 
+
 /*
 * Finished this segment, let everyone know.
 */
@@ -1082,7 +1062,7 @@
 
 // Sets up the input field planes for EEDI2 in pv->eedi_half[SRCPF]
 // and then runs eedi2_filter_thread for each plane.
-void eedi2_planer( hb_filter_private_t * pv )
+static void eedi2_planer( hb_filter_private_t * pv )
 {
 /* Copy the first field from the source to a half-height frame. */
 int pp;
@@ -1105,7 +1085,7 @@
 }
 
 
-void mask_dilate_thread( void *thread_args_v )
+static void mask_dilate_thread( void *thread_args_v )
 {
 hb_filter_private_t * pv;
 int segment, segment_start, segment_stop;
@@ -1129,7 +1109,7 @@
 * No more work to do, exit this thread.
 */
 break;
- } 
+ }
 
 int xx, yy, pp;
 
@@ -1207,7 +1187,7 @@
 taskset_thread_complete( &pv->mask_dilate_taskset, segment );
 }
 
-void mask_erode_thread( void *thread_args_v )
+static void mask_erode_thread( void *thread_args_v )
 {
 hb_filter_private_t * pv;
 int segment, segment_start, segment_stop;
@@ -1231,7 +1211,7 @@
 * No more work to do, exit this thread.
 */
 break;
- } 
+ }
 
 int xx, yy, pp;
 
@@ -1309,7 +1289,7 @@
 taskset_thread_complete( &pv->mask_erode_taskset, segment );
 }
 
-void mask_filter_thread( void *thread_args_v )
+static void mask_filter_thread( void *thread_args_v )
 {
 hb_filter_private_t * pv;
 int segment, segment_start, segment_stop;
@@ -1333,7 +1313,7 @@
 * No more work to do, exit this thread.
 */
 break;
- } 
+ }
 
 int xx, yy, pp;
 
@@ -1412,7 +1392,7 @@
 taskset_thread_complete( &pv->mask_filter_taskset, segment );
 }
 
-void decomb_check_thread( void *thread_args_v )
+static void decomb_check_thread( void *thread_args_v )
 {
 hb_filter_private_t * pv;
 int segment, segment_start, segment_stop;
@@ -1436,7 +1416,7 @@
 * No more work to do, exit this thread.
 */
 break;
- } 
+ }
 
 segment_start = thread_args->segment_start[0];
 segment_stop = segment_start + thread_args->segment_height[0];
@@ -1462,7 +1442,7 @@
 /*
 * comb detect this segment of all three planes in a single thread.
 */
-void decomb_filter_thread( void *thread_args_v )
+static void decomb_filter_thread( void *thread_args_v )
 {
 hb_filter_private_t * pv;
 int segment, segment_start, segment_stop;
@@ -1486,7 +1466,7 @@
 * No more work to do, exit this thread.
 */
 break;
- } 
+ }
 
 /*
 * Process segment (for now just from luma)
@@ -1516,14 +1496,14 @@
 taskset_thread_complete( &pv->decomb_filter_taskset, segment );
 }
 
-int comb_segmenter( hb_filter_private_t * pv )
+static int comb_segmenter( hb_filter_private_t * pv )
 {
 /*
 * Now that all data for decomb detection is ready for
 * our threads, fire them off and wait for their completion.
 */
 taskset_cycle( &pv->decomb_filter_taskset );
- 
+
 if( pv->mode & MODE_FILTER )
 {
 taskset_cycle( &pv->mask_filter_taskset );
@@ -1711,12 +1691,20 @@
 /*
 * deinterlace this segment of all three planes in a single thread.
 */
-void yadif_decomb_filter_thread( void *thread_args_v )
+static void yadif_decomb_filter_thread( void *thread_args_v )
 {
 yadif_arguments_t *yadif_work = NULL;
 hb_filter_private_t * pv;
 int segment, segment_start, segment_stop;
 yadif_thread_arg_t *thread_args = thread_args_v;
+ filter_param_t filter;
+
+ filter.tap[0] = -1;
+ filter.tap[1] = 2;
+ filter.tap[2] = 6;
+ filter.tap[3] = 2;
+ filter.tap[4] = -1;
+ filter.normalize = 3;
 
 pv = thread_args->pv;
 segment = thread_args->segment;
@@ -1729,14 +1717,14 @@
 * Wait here until there is work to do.
 */
 taskset_thread_wait4start( &pv->yadif_taskset, segment );
- 
+
 if( taskset_thread_stop( &pv->yadif_taskset, segment ) )
 {
 /*
 * No more work to do, exit this thread.
 */
 break;
- } 
+ }
 
 yadif_work = &pv->yadif_arguments[segment];
 
@@ -1776,7 +1764,7 @@
 for( yy = start; yy < segment_stop; yy += 2 )
 {
 /* This line gets blend filtered, not yadif filtered. */
- blend_filter_line(dst2, cur, width, height, stride, yy);
+ blend_filter_line(&filter, dst2, cur, width, height, stride, yy);
 dst2 += stride * 2;
 cur += stride * 2;
 }
@@ -1971,8 +1959,6 @@
 else
 {
 /* Just passing through... */
-
- /* For mcdeint's benefit... */
 pv->yadif_arguments[0].is_combed = is_combed; // 0
 hb_buffer_copy(dst, pv->ref[1]);
 }
@@ -1992,7 +1978,7 @@
 
 pv->yadif_ready = 0;
 
- pv->mode = MODE_YADIF | MODE_BLEND | MODE_CUBIC | 
+ pv->mode = MODE_YADIF | MODE_BLEND | MODE_CUBIC |
 MODE_GAMMA | MODE_FILTER;
 pv->filter_mode = FILTER_ERODE_DILATE;
 pv->spatial_metric = 2;
@@ -2013,9 +1999,6 @@
 
 pv->parity = PARITY_DEFAULT;
 
- pv->mcdeint_mode = MCDEINT_MODE_DEFAULT;
- int mcdeint_qp = MCDEINT_QP_DEFAULT;
-
 if( filter->settings )
 {
 sscanf( filter->settings, "%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d",
@@ -2046,11 +2029,6 @@
 pv->segment_height[1] = hb_image_height(init->pix_fmt, pv->segment_height[0], 1);
 pv->segment_height[2] = hb_image_height(init->pix_fmt, pv->segment_height[0], 2);
 
- if( pv->mode & MODE_MCDEINT )
- {
- pv->mcdeint_mode = MCDEINT_MODE_ENABLED;
- }
-
 /* Allocate buffers to store comb masks. */
 pv->mask = hb_frame_buffer_init(init->pix_fmt, init->width, init->height);
 pv->mask_filtered = hb_frame_buffer_init(init->pix_fmt, init->width, init->height);
@@ -2076,7 +2054,7 @@
 init->pix_fmt, init->width, init->height);
 }
 }
- 
+
 /*
 * Setup yadif taskset.
 */
@@ -2142,7 +2120,7 @@
 for( ii = 0; ii < pv->cpu_count; ii++ )
 {
 decomb_thread_arg_t *thread_args;
- 
+
 thread_args = taskset_thread_args( &pv->decomb_filter_taskset, ii );
 thread_args->pv = pv;
 thread_args->segment = ii;
@@ -2200,7 +2178,7 @@
 for( ii = 0; ii < pv->comb_check_nthreads; ii++ )
 {
 decomb_thread_arg_t *thread_args, *decomb_prev_thread_args = NULL;
- 
+
 thread_args = taskset_thread_args( &pv->decomb_check_taskset, ii );
 thread_args->pv = pv;
 thread_args->segment = ii;
@@ -2257,7 +2235,7 @@
 for( ii = 0; ii < pv->cpu_count; ii++ )
 {
 decomb_thread_arg_t *thread_args;
- 
+
 thread_args = taskset_thread_args( &pv->mask_filter_taskset, ii );
 thread_args->pv = pv;
 thread_args->segment = ii;
@@ -2308,7 +2286,7 @@
 for( ii = 0; ii < pv->cpu_count; ii++ )
 {
 decomb_thread_arg_t *thread_args;
- 
+
 thread_args = taskset_thread_args( &pv->mask_erode_taskset, ii );
 thread_args->pv = pv;
 thread_args->segment = ii;
@@ -2357,7 +2335,7 @@
 for( ii = 0; ii < pv->cpu_count; ii++ )
 {
 decomb_thread_arg_t *thread_args;
- 
+
 thread_args = taskset_thread_args( &pv->mask_dilate_taskset, ii );
 thread_args->pv = pv;
 thread_args->segment = ii;
@@ -2449,9 +2427,6 @@
 }
 }
 }
- 
- mcdeint_init( &pv->mcdeint, pv->mcdeint_mode, mcdeint_qp, 
- init->pix_fmt, init->width, init->height );
 
 return 0;
 }
@@ -2486,7 +2461,7 @@
 taskset_fini( &pv->eedi2_taskset );
 }
 
- 
+
 /* Cleanup reference buffers. */
 int ii;
 for (ii = 0; ii < 3; ii++)
@@ -2522,16 +2497,13 @@
 if (pv->cxy) eedi2_aligned_free(pv->cxy);
 if (pv->tmpc) eedi2_aligned_free(pv->tmpc);
 }
- 
+
 free(pv->block_score);
 
 /*
 * free memory for yadif structs
 */
 free( pv->yadif_arguments );
- 
- /* Cleanup mcdeint specific buffers */
- mcdeint_close( &pv->mcdeint );
 
 free( pv );
 filter->private_data = NULL;
@@ -2578,18 +2550,18 @@
 tff = (pv->parity & 1) ^ 1;
 }
 
- /* deinterlace both fields if mcdeint is enabled without bob */
+ /* deinterlace both fields if bob */
 int frame, num_frames = 1;
- if (pv->mode & (MODE_MCDEINT | MODE_BOB))
+ if (pv->mode & MODE_BOB)
 {
 num_frames = 2;
 }
- 
+
 // Will need up to 2 buffers simultaneously
 int idx = 0;
 hb_buffer_t * o_buf[2] = {NULL,};
 
- /* Perform yadif filtering */ 
+ /* Perform yadif filtering */
 for( frame = 0; frame < num_frames; frame++ )
 {
 int parity = frame ^ tff ^ 1;
@@ -2615,24 +2587,9 @@
 
 yadif_filter(pv, o_buf[idx], parity, tff);
 
- // Unfortunately, all frames must be fed to mcdeint combed or
- // not since it maintains state that is updated by each frame.
- if (pv->mcdeint_mode >= 0)
- {
- if (o_buf[idx^1] == NULL)
- {
- o_buf[idx^1] = hb_video_buffer_init(in->f.width, in->f.height);
- }
- /* Perform mcdeint filtering */
- mcdeint_filter(o_buf[idx^1], o_buf[idx], parity, &pv->mcdeint);
-
- // If frame was combed, we will use results from mcdeint
- // else we will use yadif result
- if (pv->is_combed)
- idx ^= 1;
- }
-
- // Add to list of output buffers (should be at most 2)
+ // If bob, add all frames to output
+ // else, if not combed, add frame to output
+ // else if final iteration, add frame to output
 if ((pv->mode & MODE_BOB) ||
 pv->is_combed == 0 ||
 frame == num_frames - 1)
@@ -2686,3 +2643,41 @@
 
 return HB_FILTER_OK;
 }
+
+void hb_deinterlace(hb_buffer_t *dst, hb_buffer_t *src)
+{
+ int pp;
+ filter_param_t filter;
+
+ filter.tap[0] = -1;
+ filter.tap[1] = 4;
+ filter.tap[2] = 2;
+ filter.tap[3] = 4;
+ filter.tap[4] = -1;
+ filter.normalize = 3;
+
+ for (pp = 0; pp < 3; pp++)
+ {
+ int yy;
+ int width = src->plane[pp].width;
+ int stride = src->plane[pp].stride;
+ int height = src->plane[pp].height;
+
+ // Filter parity lines
+ uint8_t *pdst = &dst->plane[pp].data[0];
+ uint8_t *psrc = &src->plane[pp].data[0];
+
+ /* These will be useful if we ever do temporal blending. */
+ for( yy = 0; yy < height - 1; yy += 2 )
+ {
+ /* This line gets blend filtered, not yadif filtered. */
+ memcpy(pdst, psrc, width);
+ pdst += stride;
+ psrc += stride;
+ blend_filter_line(&filter, pdst, psrc, width, height, stride, yy + 1);
+ pdst += stride;
+ psrc += stride;
+ }
+ }
+}
+

HandBrake-0.9.9.tar.bz2/libhb/decpgssub.c -> HandBrake-0.10.0.tar.bz2/libhb/decpgssub.c Changed

@@ -1,6 +1,6 @@
 /* decpgssub.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -56,6 +56,19 @@
 pv->context = context;
 pv->job = job;
 
+ // Set decoder opts...
+ AVDictionary * av_opts = NULL;
+ // e.g. av_dict_set( &av_opts, "refcounted_frames", "1", 0 );
+
+ if (hb_avcodec_open(pv->context, codec, &av_opts, 0))
+ {
+ av_dict_free( &av_opts );
+ hb_log("decsubInit: avcodec_open failed");
+ return 1;
+ }
+ av_dict_free( &av_opts );
+
+
 return 0;
 }
 
@@ -198,7 +211,14 @@
 avp.data = in->data;
 avp.size = in->size;
 // libav wants pkt pts in AV_TIME_BASE units
- avp.pts = av_rescale(in->s.start, AV_TIME_BASE, 90000);
+ if (in->s.start != AV_NOPTS_VALUE)
+ {
+ avp.pts = av_rescale(in->s.start, AV_TIME_BASE, 90000);
+ }
+ else
+ {
+ avp.pts = AV_NOPTS_VALUE;
+ }
 
 int has_subtitle = 0;
 
@@ -276,20 +296,43 @@
 
 if (useable_sub)
 {
- int64_t pts = av_rescale(subtitle.pts, 90000, AV_TIME_BASE);
+ int64_t pts = AV_NOPTS_VALUE;
 hb_buffer_t * out = NULL;
 
- // work around broken timestamps
- if (pts < 0 && in->s.start >= 0)
+ if (subtitle.pts != AV_NOPTS_VALUE)
 {
- pts = in->s.start;
+ pts = av_rescale(subtitle.pts, 90000, AV_TIME_BASE);
+ }
+ else
+ {
+ if (in->s.start >= 0)
+ {
+ pts = in->s.start;
+ }
+ else
+ {
+ // XXX: a broken pts will cause us to drop this subtitle,
+ // which is bad; use a default duration of 3 seconds
+ //
+ // A broken pts is only generated when a pgs packet
+ // occurs after a discontinuity and before the
+ // next audio or video packet which re-establishes
+ // timing (afaik).
+ pts = pv->last_pts + 3 * 90000LL;
+ hb_log("[warning] decpgssub: track %d, invalid PTS",
+ w->subtitle->out_track);
+ }
 }
- else if (pts < 0)
+ // work around broken timestamps
+ if (pts < pv->last_pts)
 {
- // XXX: a broken pts will cause us to drop this subtitle,
- // which is bad; use a default duration of 3 seconds
- pts = pv->last_pts + 3 * 90000LL;
- hb_log("[warning] decpgssub: track %d, invalid PTS",
+ // XXX: this should only happen if the prevous pts
+ // was unknown and our 3 second default duration
+ // overshot the next pgs pts.
+ //
+ // assign a 1 second duration
+ pts = pv->last_pts + 1 * 90000LL;
+ hb_log("[warning] decpgssub: track %d, non-monotically increasing PTS",
 w->subtitle->out_track);
 }
 pv->last_pts = pts;
@@ -334,32 +377,64 @@
 out->s = in->s;
 out->sequence = in->sequence;
 }
- out->s.start = out->s.stop = pts;
+ out->s.frametype = HB_FRAME_SUBTITLE;
+ out->s.renderOffset = AV_NOPTS_VALUE;
+ out->s.stop = AV_NOPTS_VALUE;
+ out->s.start = pts;
 }
 else
 {
 if (!clear_subtitle)
 {
- unsigned ii;
+ unsigned ii, x0, y0, x1, y1, w, h;
+
+ x0 = subtitle.rects[0]->x;
+ y0 = subtitle.rects[0]->y;
+ x1 = subtitle.rects[0]->x + subtitle.rects[0]->w;
+ y1 = subtitle.rects[0]->y + subtitle.rects[0]->h;
+
+ // First, find total bounding rectangle
+ for (ii = 1; ii < subtitle.num_rects; ii++)
+ {
+ if (subtitle.rects[ii]->x < x0)
+ x0 = subtitle.rects[ii]->x;
+ if (subtitle.rects[ii]->y < y0)
+ y0 = subtitle.rects[ii]->y;
+ if (subtitle.rects[ii]->x + subtitle.rects[ii]->w > x1)
+ x1 = subtitle.rects[ii]->x + subtitle.rects[ii]->w;
+ if (subtitle.rects[ii]->y + subtitle.rects[ii]->h > y1)
+ y1 = subtitle.rects[ii]->y + subtitle.rects[ii]->h;
+ }
+ w = x1 - x0;
+ h = y1 - y0;
+
+ out = hb_frame_buffer_init(AV_PIX_FMT_YUVA420P, w, h);
+ memset(out->data, 0, out->size);
+
+ out->s.frametype = HB_FRAME_SUBTITLE;
+ out->s.id = in->s.id;
+ out->sequence = in->sequence;
+ out->s.start = pts;
+ out->s.stop = AV_NOPTS_VALUE;
+ out->s.renderOffset = AV_NOPTS_VALUE;
+ out->f.x = x0;
+ out->f.y = y0;
 for (ii = 0; ii < subtitle.num_rects; ii++)
 {
 AVSubtitleRect *rect = subtitle.rects[ii];
 
- out = hb_frame_buffer_init(AV_PIX_FMT_YUVA420P,
- rect->w, rect->h);
-
- out->s.id = in->s.id;
- out->sequence = in->sequence;
- out->s.start = pts;
- out->s.stop = pts;
- out->f.x = rect->x;
- out->f.y = rect->y;
-
+ int off_x = rect->x - x0;
+ int off_y = rect->y - y0;
 uint8_t *lum = out->plane[0].data;
 uint8_t *chromaU = out->plane[1].data;
 uint8_t *chromaV = out->plane[2].data;
 uint8_t *alpha = out->plane[3].data;
 
+ lum += off_y * out->plane[0].stride + off_x;
+ alpha += off_y * out->plane[3].stride + off_x;
+ chromaU += (off_y >> 1) * out->plane[1].stride + (off_x >> 1);
+ chromaV += (off_y >> 1) * out->plane[2].stride + (off_x >> 1);
+
 int xx, yy;
 for (yy = 0; yy < rect->h; yy++)
 {
@@ -390,23 +465,23 @@
 }
 alpha += out->plane[3].stride;
 }
-
- if ( pv->list_buffer == NULL )
- {
- pv->list_buffer = pv->last_buffer = out;
- }
- else
- {
- pv->last_buffer->next = out;
- pv->last_buffer = out;
- }
- out = NULL;
 }
+ if ( pv->list_buffer == NULL )
+ {
+ pv->list_buffer = pv->last_buffer = out;
+ }
+ else
+ {
+ pv->last_buffer->next = out;
+ pv->last_buffer = out;
+ }
+ out = NULL;
 }
 else
 {
 out = hb_buffer_init( 1 );
 
+ out->s.frametype = HB_FRAME_SUBTITLE;
 out->s.id = in->s.id;
 out->s.start = pts;
 out->s.stop = pts;

HandBrake-0.9.9.tar.bz2/libhb/decsrtsub.c -> HandBrake-0.10.0.tar.bz2/libhb/decsrtsub.c Changed

@@ -1,6 +1,6 @@
 /* decsrtsub.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -13,6 +13,8 @@
 #include <iconv.h>
 #include <errno.h>
 #include "hb.h"
+#include "colormap.h"
+#include "decsrtsub.h"
 
 struct start_and_end {
 unsigned long start, end;
@@ -56,17 +58,162 @@
 hb_subtitle_t *subtitle;
 uint64_t start_time; // In HB time
 uint64_t stop_time; // In HB time
+
+ int line; // SSA line number
 };
 
-static int 
+static char* srt_markup_to_ssa(char *srt, int *len)
+{
+ char terminator;
+ char color[40];
+ uint32_t rgb;
+
+ *len = 0;
+ if (srt[0] != '<' && srt[0] != '{')
+ return NULL;
+
+ if (srt[0] == '<')
+ terminator = '>';
+ else
+ terminator = '}';
+
+ if (srt[1] == 'i' && srt[2] == terminator)
+ {
+ *len = 3;
+ return hb_strdup_printf("{\\i1}");
+ }
+ else if (srt[1] == 'b' && srt[2] == terminator)
+ {
+ *len = 3;
+ return hb_strdup_printf("{\\b1}");
+ }
+ else if (srt[1] == 'u' && srt[2] == terminator)
+ {
+ *len = 3;
+ return hb_strdup_printf("{\\u1}");
+ }
+ else if (srt[1] == '/' && srt[2] == 'i' && srt[3] == terminator)
+ {
+ *len = 4;
+ return hb_strdup_printf("{\\i0}");
+ }
+ else if (srt[1] == '/' && srt[2] == 'b' && srt[3] == terminator)
+ {
+ *len = 4;
+ return hb_strdup_printf("{\\b0}");
+ }
+ else if (srt[1] == '/' && srt[2] == 'u' && srt[3] == terminator)
+ {
+ *len = 4;
+ return hb_strdup_printf("{\\u0}");
+ }
+ else if (srt[0] == '<' && !strncmp(srt + 1, "font", 4))
+ {
+ int match;
+ match = sscanf(srt + 1, "font color=\"%39[^\"]\">", color);
+ if (match != 1)
+ {
+ return NULL;
+ }
+ while (srt[*len] != '>') (*len)++;
+ (*len)++;
+ if (color[0] == '#')
+ rgb = strtol(color + 1, NULL, 16);
+ else
+ rgb = hb_rgb_lookup_by_name(color);
+ return hb_strdup_printf("{\\1c&H%X&}", HB_RGB_TO_BGR(rgb));
+ }
+ else if (srt[0] == '<' && srt[1] == '/' && !strncmp(srt + 2, "font", 4) &&
+ srt[6] == '>')
+ {
+ *len = 7;
+ return hb_strdup_printf("{\\1c&HFFFFFF&}");
+ }
+
+ return NULL;
+}
+
+void hb_srt_to_ssa(hb_buffer_t *sub_in, int line)
+{
+ if (sub_in->size == 0)
+ return;
+
+ // null terminate input if not already terminated
+ if (sub_in->data[sub_in->size-1] != 0)
+ {
+ hb_buffer_realloc(sub_in, ++sub_in->size);
+ sub_in->data[sub_in->size - 1] = 0;
+ }
+ char * srt = (char*)sub_in->data;
+ // SSA markup expands a little over SRT, so allocate a bit of extra
+ // space. More will be realloc'd if needed.
+ hb_buffer_t * sub = hb_buffer_init(sub_in->size + 80);
+ char * ssa, *ssa_markup;
+ int skip, len, pos, ii;
+
+ // Exchange data between input sub and new ssa_sub
+ // After this, sub_in contains ssa data
+ hb_buffer_swap_copy(sub_in, sub);
+ ssa = (char*)sub_in->data;
+
+ sprintf((char*)sub_in->data, "%d,,Default,,0,0,0,,", line);
+ pos = strlen((char*)sub_in->data);
+
+ ii = 0;
+ while (srt[ii] != '\0')
+ {
+ if ((ssa_markup = srt_markup_to_ssa(srt + ii, &skip)) != NULL)
+ {
+ len = strlen(ssa_markup);
+ hb_buffer_realloc(sub_in, pos + len + 1);
+ // After realloc, sub_in->data may change
+ ssa = (char*)sub_in->data;
+ sprintf(ssa + pos, "%s", ssa_markup);
+ free(ssa_markup);
+ pos += len;
+ ii += skip;
+ }
+ else
+ {
+ hb_buffer_realloc(sub_in, pos + 4);
+ // After realloc, sub_in->data may change
+ ssa = (char*)sub_in->data;
+ if (srt[ii] == '\r')
+ {
+ ssa[pos++] = '\\';
+ ssa[pos++] = 'N';
+ ii++;
+ if (srt[ii] == '\n')
+ {
+ ii++;
+ }
+ }
+ else if (srt[ii] == '\n')
+ {
+ ssa[pos++] = '\\';
+ ssa[pos++] = 'N';
+ ii++;
+ }
+ else
+ {
+ ssa[pos++] = srt[ii++];
+ }
+ }
+ }
+ ssa[pos] = '\0';
+ sub_in->size = pos + 1;
+ hb_buffer_close(&sub);
+}
+
+static int
 read_time_from_string( const char* timeString, struct start_and_end *result )
 {
 // for ex. 00:00:15,248 --> 00:00:16,545
- 
+
 long houres1, minutes1, seconds1, milliseconds1,
 houres2, minutes2, seconds2, milliseconds2;
 int scanned;
- 
+
 scanned = sscanf(timeString, "%ld:%ld:%ld,%ld --> %ld:%ld:%ld,%ld\n",
 &houres1, &minutes1, &seconds1, &milliseconds1,
 &houres2, &minutes2, &seconds2, &milliseconds2);
@@ -207,8 +354,8 @@
 {
 return NULL;
 }
- 
- while( reprocess || get_line( pv, line_buffer, sizeof( line_buffer ) ) ) 
+
+ while( reprocess || get_line( pv, line_buffer, sizeof( line_buffer ) ) )
 {
 reprocess = 0;
 switch (pv->current_state)
@@ -227,7 +374,7 @@
 }
 pv->current_entry.duration = timing.end - timing.start;
 pv->current_entry.offset = timing.start - pv->current_time;
- 
+
 pv->current_time = timing.end;
 
 pv->current_entry.start = timing.start;
@@ -276,7 +423,7 @@
 pv->current_state = k_state_potential_new_entry;
 continue;
 }
- 
+
 q = pv->current_entry.text + pv->current_entry.pos;
 len = strlen( line_buffer );
 size = MIN(1024 - pv->current_entry.pos - 1, len );
@@ -329,9 +476,9 @@
 long length;
 char *p, *q;
 int line = 1;
- uint64_t start_time = ( pv->current_entry.start + 
+ uint64_t start_time = ( pv->current_entry.start +
 pv->subtitle->config.offset ) * 90;
- uint64_t stop_time = ( pv->current_entry.stop + 
+ uint64_t stop_time = ( pv->current_entry.stop +
 pv->subtitle->config.offset ) * 90;
 
 if( !( start_time > pv->start_time && stop_time < pv->stop_time ) )
@@ -396,7 +543,7 @@
 return buffer;
 }
 continue;
- } 
+ }
 }
 }
 
@@ -406,9 +553,9 @@
 long length;
 char *p, *q;
 int line = 1;
- uint64_t start_time = ( pv->current_entry.start + 
+ uint64_t start_time = ( pv->current_entry.start +
 pv->subtitle->config.offset ) * 90;
- uint64_t stop_time = ( pv->current_entry.stop + 
+ uint64_t stop_time = ( pv->current_entry.stop +
 pv->subtitle->config.offset ) * 90;
 
 if( !( start_time > pv->start_time && stop_time < pv->stop_time ) )
@@ -467,7 +614,7 @@
 {
 return buffer;
 }
- 
+
 return NULL;
 }
 
@@ -488,7 +635,7 @@
 
 buffer = hb_buffer_init( 0 );
 hb_fifo_push( w->fifo_in, buffer);
- 
+
 pv->current_state = k_state_potential_new_entry;
 pv->number_of_entries = 0;
 pv->last_entry_number = 0;
@@ -535,19 +682,25 @@
 
 } else {
 memset( &pv->current_entry, 0, sizeof( srt_entry_t ) );
- 
- pv->file = fopen( w->subtitle->config.src_filename, "r" );
- 
+
+ pv->file = hb_fopen(w->subtitle->config.src_filename, "r");
+
 if( !pv->file )
 {
- hb_error("Could not open the SRT subtitle file '%s'\n", 
+ hb_error("Could not open the SRT subtitle file '%s'\n",
 w->subtitle->config.src_filename);
 } else {
 retval = 0;
 }
 }
- } 
-
+ }
+ if (!retval)
+ {
+ // Generate generic SSA Script Info.
+ int height = job->title->height - job->crop[0] - job->crop[1];
+ int width = job->title->width - job->crop[2] - job->crop[3];
+ hb_subtitle_add_ssa_header(w->subtitle, width, height);
+ }
 return retval;
 }
 
@@ -559,9 +712,10 @@
 hb_buffer_t * out = NULL;
 
 out = srt_read( pv );
-
 if( out )
 {
+ hb_srt_to_ssa(out, ++pv->line);
+
 /*
 * Keep a buffer in our input fifo so that we get run.
 */
@@ -573,7 +727,7 @@
 return HB_WORK_OK;
 }
 
- return HB_WORK_OK; 
+ return HB_WORK_OK;
 }
 
 static void decsrtClose( hb_work_object_t * w )

HandBrake-0.10.0.tar.bz2/libhb/decsrtsub.h Added

HandBrake-0.9.9.tar.bz2/libhb/decssasub.c -> HandBrake-0.10.0.tar.bz2/libhb/decssasub.c Changed

@@ -1,6 +1,6 @@
 /* decssasub.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -11,23 +11,26 @@
 * Converts SSA subtitles to either:
 * (1) TEXTSUB format: UTF-8 subtitles with limited HTML-style markup (, , ), or
 * (2) PICTURESUB format, using libass.
- * 
+ *
 * SSA format references:
 * http://www.matroska.org/technical/specs/subtitles/ssa.html
 * http://moodub.free.fr/video/ass-specs.doc
 * vlc-1.0.4/modules/codec/subtitles/subsass.c:ParseSSAString
- * 
+ *
 * libass references:
 * libass-0.9.9/ass.h
 * vlc-1.0.4/modules/codec/libass.c
- * 
+ *
 * @author David Foster (davidfstr)
 */
 #include <stdlib.h>
 #include <stdio.h>
+#include <ctype.h>
 #include "hb.h"
 
 #include <ass/ass.h>
+#include "decssasub.h"
+#include "colormap.h"
 
 struct hb_work_private_s
 {
@@ -37,15 +40,6 @@
 hb_job_t *job;
 };
 
-typedef enum {
- BOLD = 0x01,
- ITALIC = 0x02,
- UNDERLINE = 0x04
-} StyleSet;
-
-// "".len + "".len + "".len
-#define MAX_OVERHEAD_PER_OVERRIDE (7 * 3)
-
 #define SSA_2_HB_TIME(hr,min,sec,centi) \
 ( 90L * ( hr * 1000L * 60 * 60 +\
 min * 1000L * 60 +\
@@ -54,71 +48,189 @@
 
 #define SSA_VERBOSE_PACKETS 0
 
-static StyleSet ssa_parse_style_override( uint8_t *pos, StyleSet prevStyles )
+static int ssa_update_style(char *ssa, hb_subtitle_style_t *style)
 {
- StyleSet nextStyles = prevStyles;
- for (;;)
+ int pos, end, index;
+
+ if (ssa[0] != '{')
+ return 0;
+
+ pos = 1;
+ while (ssa[pos] != '}' && ssa[pos] != '\0')
 {
- // Skip over leading '{' or last '\\'
+ index = -1;
+
+ // Skip any malformed markup junk
+ while (strchr("\\}", ssa[pos]) == NULL) pos++;
 pos++;
- 
- // Scan for next \code
- while ( *pos != '\\' && *pos != '}' && *pos != '\0' ) pos++;
- if ( *pos != '\\' )
+ // Check for an index that is in some markup (e.g. font color)
+ if (isdigit(ssa[pos]))
+ {
+ index = ssa[pos++] - 0x30;
+ }
+ // Find the end of this markup clause
+ end = pos;
+ while (strchr("\\}", ssa[end]) == NULL) end++;
+ // Handle simple integer valued attributes
+ if (strchr("ibu", ssa[pos]) != NULL && isdigit(ssa[pos+1]))
 {
- // End of style override block
- break;
+ int val = strtol(ssa + pos + 1, NULL, 0);
+ switch (ssa[pos])
+ {
+ case 'i':
+ style->flags = (style->flags & ~HB_STYLE_FLAG_ITALIC) |
+ !!val * HB_STYLE_FLAG_ITALIC;
+ break;
+ case 'b':
+ style->flags = (style->flags & ~HB_STYLE_FLAG_BOLD) |
+ !!val * HB_STYLE_FLAG_BOLD;
+ break;
+ case 'u':
+ style->flags = (style->flags & ~HB_STYLE_FLAG_UNDERLINE) |
+ !!val * HB_STYLE_FLAG_UNDERLINE;
+ break;
+ }
 }
- 
- // If next chars are \[biu][01], interpret it
- if ( strchr("biu", pos[1]) && strchr("01", pos[2]) )
+ if (ssa[pos] == 'c' && ssa[pos+1] == '&' && ssa[pos+2] == 'H')
 {
- StyleSet styleID =
- pos[1] == 'b' ? BOLD :
- pos[1] == 'i' ? ITALIC :
- pos[1] == 'u' ? UNDERLINE : 0;
- int enabled = (pos[2] == '1');
- 
- if (enabled)
+ // Font color markup
+ char *endptr;
+ uint32_t bgr;
+
+ bgr = strtol(ssa + pos + 3, &endptr, 16);
+ if (*endptr == '&')
 {
- nextStyles |= styleID;
+ switch (index)
+ {
+ case -1:
+ case 1:
+ style->fg_rgb = HB_BGR_TO_RGB(bgr);
+ break;
+ case 2:
+ style->alt_rgb = HB_BGR_TO_RGB(bgr);
+ break;
+ case 3:
+ style->ol_rgb = HB_BGR_TO_RGB(bgr);
+ break;
+ case 4:
+ style->bg_rgb = HB_BGR_TO_RGB(bgr);
+ break;
+ default:
+ // Unknown color index, ignore
+ break;
+ }
 }
- else
+ }
+ if ((ssa[pos] == 'a' && ssa[pos+1] == '&' && ssa[pos+2] == 'H') ||
+ (!strcmp(ssa+pos, "alpha") && ssa[pos+5] == '&' && ssa[pos+6] == 'H'))
+ {
+ // Font alpha markup
+ char *endptr;
+ uint8_t alpha;
+ int alpha_pos = 3;
+
+ if (ssa[1] == 'l')
+ alpha_pos = 7;
+
+ alpha = strtol(ssa + pos + alpha_pos, &endptr, 16);
+ if (*endptr == '&')
 {
- nextStyles &= ~styleID;
+ // SSA alpha is inverted 0 is opaque
+ alpha = 255 - alpha;
+ switch (index)
+ {
+ case -1:
+ case 1:
+ style->fg_alpha = alpha;
+ break;
+ case 2:
+ style->alt_alpha = alpha;
+ break;
+ case 3:
+ style->ol_alpha = alpha;
+ break;
+ case 4:
+ style->bg_alpha = alpha;
+ break;
+ default:
+ // Unknown alpha index, ignore
+ break;
+ }
 }
 }
+ pos = end;
 }
- return nextStyles;
+ if (ssa[pos] == '}')
+ pos++;
+ return pos;
 }
 
-static void ssa_append_html_tags_for_style_change(
- uint8_t **dst, StyleSet prevStyles, StyleSet nextStyles )
+char * hb_ssa_to_text(char *in, int *consumed, hb_subtitle_style_t *style)
 {
- #define APPEND(str) { \
- char *src = str; \
- while (*src) { *(*dst)++ = *src++; } \
+ int markup_len = 0;
+ int in_pos = 0;
+ int out_pos = 0;
+ char *out = malloc(strlen(in) + 1); // out will never be longer than in
+
+ for (in_pos = 0; in[in_pos] != '\0'; in_pos++)
+ {
+ if ((markup_len = ssa_update_style(in + in_pos, style)))
+ {
+ *consumed = in_pos + markup_len;
+ out[out_pos++] = '\0';
+ return out;
+ }
+ // Check escape codes
+ if (in[in_pos] == '\\')
+ {
+ in_pos++;
+ switch (in[in_pos])
+ {
+ case '\0':
+ in_pos--;
+ break;
+ case 'N':
+ case 'n':
+ out[out_pos++] = '\n';
+ break;
+ case 'h':
+ out[out_pos++] = ' ';
+ break;
+ default:
+ out[out_pos++] = in[in_pos];
+ break;
+ }
+ }
+ else
+ {
+ out[out_pos++] = in[in_pos];
+ }
 }
+ *consumed = in_pos;
+ out[out_pos++] = '\0';
+ return out;
+}
+
+void hb_ssa_style_init(hb_subtitle_style_t *style)
+{
+ style->flags = 0;
+
+ style->fg_rgb = 0x00FFFFFF;
+ style->alt_rgb = 0x00FFFFFF;
+ style->ol_rgb = 0x000F0F0F;
+ style->bg_rgb = 0x000F0F0F;
 
- // Reverse-order close all previous styles
- if (prevStyles & UNDERLINE) APPEND("");
- if (prevStyles & ITALIC) APPEND("");
- if (prevStyles & BOLD) APPEND("");
- 
- // Forward-order open all next styles
- if (nextStyles & BOLD) APPEND("");
- if (nextStyles & ITALIC) APPEND("");
- if (nextStyles & UNDERLINE) APPEND("");
- 
- #undef APPEND
+ style->fg_alpha = 0xFF;
+ style->alt_alpha = 0xFF;
+ style->ol_alpha = 0xFF;
+ style->bg_alpha = 0xFF;
 }
 
-static hb_buffer_t *ssa_decode_line_to_utf8( uint8_t *in_data, int in_size, int in_sequence );
 static hb_buffer_t *ssa_decode_line_to_mkv_ssa( hb_work_object_t * w, uint8_t *in_data, int in_size, int in_sequence );
 
 /*
 * Decodes a single SSA packet to one or more TEXTSUB or PICTURESUB subtitle packets.
- * 
+ *
 * SSA packet format:
 * ( Dialogue: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text CR LF ) +
 * 1 2 3 4 5 6 7 8 9 10
@@ -128,10 +240,10 @@
 // Store NULL after the end of the buffer to make using string processing safe
 hb_buffer_realloc(in, ++in->size);
 in->data[in->size - 1] = '\0';
- 
+
 hb_buffer_t *out_list = NULL;
 hb_buffer_t **nextPtr = &out_list;
- 
+
 const char *EOL = "\r\n";
 char *curLine, *curLine_parserData;
 for ( curLine = strtok_r( (char *) in->data, EOL, &curLine_parserData );
@@ -141,53 +253,31 @@
 // Skip empty lines and spaces between adjacent CR and LF
 if (curLine[0] == '\0')
 continue;
- 
+
 // Decode an individual SSA line
 hb_buffer_t *out;
- if ( w->subtitle->config.dest == PASSTHRUSUB ) {
- out = ssa_decode_line_to_utf8( (uint8_t *) curLine, strlen( curLine ), in->sequence );
- if ( out == NULL )
- continue;
- 
- // We shouldn't be storing the extra NULL character,
- // but the MP4 muxer expects this, unfortunately.
- if (out->size > 0 && out->data[out->size - 1] != '\0')
- {
- hb_buffer_realloc(out, ++out->size);
- out->data[out->size - 1] = '\0';
- }
- 
- // If the input packet was non-empty, do not pass through
- // an empty output packet (even if the subtitle was empty),
- // as this would be interpreted as an end-of-stream
- if ( in->size > 0 && out->size == 0 ) {
- hb_buffer_close(&out);
- continue;
- }
- } else if ( w->subtitle->config.dest == RENDERSUB ) {
- out = ssa_decode_line_to_mkv_ssa( w, (uint8_t *) curLine, strlen( curLine ), in->sequence );
- if ( out == NULL )
- continue;
- }
- 
+ out = ssa_decode_line_to_mkv_ssa(w, (uint8_t *)curLine, strlen(curLine), in->sequence);
+ if ( out == NULL )
+ continue;
+
 // Append 'out' to 'out_list'
 *nextPtr = out;
 nextPtr = &out->next;
 }
 
- // For point-to-point encoding, when the start time of the stream 
+ // For point-to-point encoding, when the start time of the stream
 // may be offset, the timestamps of the subtitles must be offset as well.
 //
 // HACK: Here we are making the assumption that, under normal circumstances,
 // the output display time of the first output packet is equal to the
 // display time of the input packet.
- // 
- // During point-to-point encoding, the display time of the input 
+ //
+ // During point-to-point encoding, the display time of the input
 // packet will be offset to compensate.
- // 
- // Therefore we offset all of the output packets by a slip amount 
- // such that first output packet's display time aligns with the 
- // input packet's display time. This should give the correct time 
+ //
+ // Therefore we offset all of the output packets by a slip amount
+ // such that first output packet's display time aligns with the
+ // input packet's display time. This should give the correct time
 // when point-to-point encoding is in effect.
 if (out_list && out_list->s.start > in->s.start)
 {
@@ -202,13 +292,13 @@
 out = out->next;
 }
 }
- 
+
 return out_list;
 }
 
 /*
 * Parses the start and stop time from the specified SSA packet.
- * 
+ *
 * Returns true if parsing failed; false otherwise.
 */
 static int parse_timing_from_ssa_packet( char *in_data, int64_t *in_start, int64_t *in_stop )
@@ -222,7 +312,7 @@
 // format specifier "%*128[^,]" will not match on a bare ','. There
 // must be at least one non ',' character in the match. So the format
 // specifier is placed directly next to the ':' so that the next
- // expected ' ' after the ':' will be the character it matches on 
+ // expected ' ' after the ':' will be the character it matches on
 // when there is no layer field.
 int numPartsRead = sscanf( (char *) in_data, "Dialogue:%*128[^,],"
 "%d:%d:%d.%d," // Start
@@ -231,10 +321,10 @@
 &end_hr, &end_min, &end_sec, &end_centi );
 if ( numPartsRead != 8 )
 return 1;
- 
+
 *in_start = SSA_2_HB_TIME(start_hr, start_min, start_sec, start_centi);
 *in_stop = SSA_2_HB_TIME( end_hr, end_min, end_sec, end_centi);
- 
+
 return 0;
 }
 
@@ -257,136 +347,7 @@
 * SSA line format:
 * Dialogue: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text '\0'
 * 1 2 3 4 5 6 7 8 9 10
- */
-static hb_buffer_t *ssa_decode_line_to_utf8( uint8_t *in_data, int in_size, int in_sequence )
-{
- uint8_t *pos = in_data;
- uint8_t *end = in_data + in_size;
- 
- // Parse values for in->s.start and in->s.stop
- int64_t in_start, in_stop;
- if ( parse_timing_from_ssa_packet( (char *) in_data, &in_start, &in_stop ) )
- goto fail;
- 
- uint8_t *textFieldPos = find_field( pos, end, 10 );
- if ( textFieldPos == NULL )
- goto fail;
- 
- // Count the number of style overrides in the Text field
- int numStyleOverrides = 0;
- pos = textFieldPos;
- while ( pos < end )
- {
- if (*pos++ == '{')
- {
- numStyleOverrides++;
- }
- }
- 
- int maxOutputSize = (end - textFieldPos) + ((numStyleOverrides + 1) * MAX_OVERHEAD_PER_OVERRIDE);
- hb_buffer_t *out = hb_buffer_init( maxOutputSize );
- if ( out == NULL )
- return NULL;
- 
- /*
- * The Text field contains plain text marked up with:
- * (1) '\n' -> space
- * (2) '\N' -> newline
- * (3) curly-brace control codes like '{\k44}' -> HTML tags / strip
- * 
- * Perform the above conversions and copy it to the output packet
- */
- StyleSet prevStyles = 0;
- uint8_t *dst = out->data;
- pos = textFieldPos;
- while ( pos < end )
- {
- if ( pos[0] == '\\' && pos[1] == 'n' )
- {
- *dst++ = ' ';
- pos += 2;
- }
- else if ( pos[0] == '\\' && pos[1] == 'N' )
- {
- *dst++ = '\n';
- pos += 2;
- }
- else if ( pos[0] == '{' )
- {
- // Parse SSA style overrides and append appropriate HTML style tags
- StyleSet nextStyles = ssa_parse_style_override( pos, prevStyles );
- ssa_append_html_tags_for_style_change( &dst, prevStyles, nextStyles );
- prevStyles = nextStyles;
- 
- // Skip past SSA control code
- while ( pos < end && *pos != '}' ) pos++;
- if ( pos < end && *pos == '}' ) pos++;
- }
- else
- {
- // Copy raw character
- *dst++ = *pos++;
- }
- }
- 
- // Append closing HTML style tags
- ssa_append_html_tags_for_style_change( &dst, prevStyles, 0 );
- 
- // Trim output buffer to the actual amount of data written
- out->size = dst - out->data;
- 
- // Copy metadata from the input packet to the output packet
- out->s.start = in_start;
- out->s.stop = in_stop;
- out->sequence = in_sequence;
- 
- return out;
- 
-fail:
- hb_log( "decssasub: malformed SSA subtitle packet: %.*s\n", in_size, in_data );
- return NULL;
-}
-
-static hb_buffer_t * ssa_to_mkv_ssa( hb_work_object_t * w, hb_buffer_t * in )
-{
- hb_buffer_t * out_last = NULL;
- hb_buffer_t * out_first = NULL;
-
- // Store NULL after the end of the buffer to make using string processing safe
- hb_buffer_realloc(in, ++in->size);
- in->data[in->size - 1] = '\0';
-
- const char *EOL = "\r\n";
- char *curLine, *curLine_parserData;
- for ( curLine = strtok_r( (char *) in->data, EOL, &curLine_parserData );
- curLine;
- curLine = strtok_r( NULL, EOL, &curLine_parserData ) )
- {
- hb_buffer_t * out;
-
- out = ssa_decode_line_to_mkv_ssa( w, (uint8_t *) curLine, strlen( curLine ), in->sequence );
- if( out )
- {
- if ( out_last == NULL )
- {
- out_last = out_first = out;
- }
- else
- {
- out_last->next = out;
- out_last = out;
- }
- }
- }
-
- return out_first;
-}
-
-/*
- * SSA line format:
- * Dialogue: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text '\0'
- * 1 2 3 4 5 6 7 8 9 10
- * 
+ *
 * MKV-SSA packet format:
 * ReadOrder,Marked, Style,Name,MarginL,MarginR,MarginV,Effect,Text '\0'
 * 1 2 3 4 5 6 7 8 9
@@ -395,12 +356,12 @@
 {
 hb_work_private_t * pv = w->private_data;
 hb_buffer_t * out;
- 
+
 // Parse values for in->s.start and in->s.stop
 int64_t in_start, in_stop;
 if ( parse_timing_from_ssa_packet( (char *) in_data, &in_start, &in_stop ) )
 goto fail;
- 
+
 // Convert the SSA packet to MKV-SSA format, which is what libass expects
 char *mkvIn;
 int numPartsRead;
@@ -411,18 +372,18 @@
 // format specifier "%*128[^,]" will not match on a bare ','. There
 // must be at least one non ',' character in the match. So the format
 // specifier is placed directly next to the ':' so that the next
- // expected ' ' after the ':' will be the character it matches on 
+ // expected ' ' after the ':' will be the character it matches on
 // when there is no layer field.
 numPartsRead = sscanf( (char *)in_data, "Dialogue:%128[^,],", layerField );
 if ( numPartsRead != 1 )
 goto fail;
- 
+
 styleToTextFields = (char *)find_field( in_data, in_data + in_size, 4 );
 if ( styleToTextFields == NULL ) {
 free( layerField );
 goto fail;
 }
- 
+
 // The sscanf conversion above will result in an extra space
 // before the layerField. Strip the space.
 char *stripLayerField = layerField;
@@ -436,9 +397,10 @@
 strcat( mkvIn, "," );
 strcat( mkvIn, stripLayerField );
 strcat( mkvIn, "," );
- strcat( mkvIn, (char *) styleToTextFields );
- 
- out->size = strlen(mkvIn);
+ strcat( mkvIn, (char *)styleToTextFields );
+
+ out->size = strlen(mkvIn) + 1;
+ out->s.frametype = HB_FRAME_SUBTITLE;
 out->s.start = in_start;
 out->s.stop = in_stop;
 out->sequence = in_sequence;
@@ -447,11 +409,11 @@
 {
 hb_buffer_close(&out);
 }
- 
+
 free( layerField );
- 
+
 return out;
- 
+
 fail:
 hb_log( "decssasub: malformed SSA subtitle packet: %.*s\n", in_size, in_data );
 return NULL;
@@ -464,20 +426,19 @@
 pv = calloc( 1, sizeof( hb_work_private_t ) );
 w->private_data = pv;
 pv->job = job;
- 
+
 return 0;
 }
 
 static int decssaWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
 hb_buffer_t ** buf_out )
 {
- hb_work_private_t * pv = w->private_data;
 hb_buffer_t * in = *buf_in;
- 
+
 #if SSA_VERBOSE_PACKETS
 printf("\nPACKET(%"PRId64",%"PRId64"): %.*s\n", in->s.start/90, in->s.stop/90, in->size, in->data);
 #endif
- 
+
 if ( in->size <= 0 )
 {
 *buf_out = in;
@@ -485,14 +446,7 @@
 return HB_WORK_DONE;
 }
 
- if ( w->subtitle->config.dest == PASSTHRUSUB && pv->job->mux == HB_MUX_MKV )
- {
- *buf_out = ssa_to_mkv_ssa(w, in);
- }
- else
- {
- *buf_out = ssa_decode_packet(w, in);
- }
+ *buf_out = ssa_decode_packet(w, in);
 
 return HB_WORK_OK;
 }

HandBrake-0.10.0.tar.bz2/libhb/decssasub.h Added

@@ -0,0 +1,35 @@
+/* decssasub.h
+ *
+ * Copyright (c) 2003-2014 HandBrake Team
+ * This file is part of the HandBrake source code
+ * Homepage: <http://handbrake.fr/>.
+ * It may be used under the terms of the GNU General Public License v2.
+ * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#ifndef __DECSSASUB_H__
+#define __DECSSASUB_H__
+
+typedef struct
+{
+ uint32_t flags;
+
+ uint32_t fg_rgb; // forground color
+ uint32_t alt_rgb; // secondary color
+ uint32_t ol_rgb; // outline color
+ uint32_t bg_rgb; // background color
+
+ uint32_t fg_alpha; // forground alpha
+ uint32_t alt_alpha; // secondary alpha
+ uint32_t ol_alpha; // outline alpha
+ uint32_t bg_alpha; // background alpha
+} hb_subtitle_style_t;
+
+#define HB_STYLE_FLAG_ITALIC 0x0001
+#define HB_STYLE_FLAG_BOLD 0x0002
+#define HB_STYLE_FLAG_UNDERLINE 0x0004
+
+char * hb_ssa_to_text(char *in, int *consumed, hb_subtitle_style_t *style);
+void hb_ssa_style_init(hb_subtitle_style_t *style);
+
+#endif // __DECSSASUB_H__

HandBrake-0.9.9.tar.bz2/libhb/dectx3gsub.c -> HandBrake-0.10.0.tar.bz2/libhb/dectx3gsub.c Changed

@@ -1,6 +1,6 @@
 /* dectx3gsub.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -9,17 +9,23 @@
 
 /*
 * Converts TX3G subtitles to UTF-8 subtitles with limited HTML-style markup (, , ).
- * 
+ *
 * TX3G == MPEG 4, Part 17 (ISO/IEC 14496-17) == 3GPP Timed Text (26.245)
 * A full reference to the format can be found here:
 * http://www.3gpp.org/ftp/Specs/html-info/26245.htm
- * 
+ *
 * @author David Foster (davidfstr)
 */
 
 #include <stdlib.h>
 #include <stdio.h>
 #include "hb.h"
+#include "colormap.h"
+
+struct hb_work_private_s
+{
+ int line; // SSA line number
+};
 
 typedef enum {
 BOLD = 0x1,
@@ -27,9 +33,8 @@
 UNDERLINE = 0x4
 } FaceStyleFlag;
 
-#define NUM_FACE_STYLE_FLAGS 3
-#define MAX_OPEN_TAG_SIZE 3 // ""
-#define MAX_CLOSE_TAG_SIZE 4 // ""
+#define MAX_MARKUP_LEN 40
+#define SSA_PREAMBLE_LEN 24
 
 typedef struct {
 uint16_t startChar; // NOTE: indices in terms of *character* (not: byte) positions
@@ -48,8 +53,6 @@
 #define SKIP_ARRAY(n) pos += n;
 
 #define WRITE_CHAR(c) {dst[0]=c; dst += 1;}
-#define WRITE_START_TAG(c) {dst[0]='<'; dst[1]=c; dst[2]='>'; dst += 3;}
-#define WRITE_END_TAG(c) {dst[0]='<'; dst[1]='/'; dst[2]=c; dst[3]='>'; dst += 4;}
 
 #define FOURCC(str) ((((uint32_t) str[0]) << 24) | \
 (((uint32_t) str[1]) << 16) | \
@@ -57,124 +60,169 @@
 (((uint32_t) str[3]) << 0))
 #define IS_10xxxxxx(c) ((c & 0xC0) == 0x80)
 
-static hb_buffer_t *tx3g_decode_to_utf8( hb_buffer_t *in )
+static int write_ssa_markup(char *dst, StyleRecord *style)
+{
+ if (style == NULL)
+ {
+ sprintf(dst, "{\\r}");
+ return strlen(dst);
+ }
+ sprintf(dst, "{\\i%d\\b%d\\u%d\\1c&H%X&\\1a&H%02X&}",
+ !!(style->faceStyleFlags & ITALIC),
+ !!(style->faceStyleFlags & BOLD),
+ !!(style->faceStyleFlags & UNDERLINE),
+ HB_RGB_TO_BGR(style->textColorRGBA >> 8),
+ 255 - (style->textColorRGBA & 0xFF)); // SSA alpha is inverted 0==opaque
+
+ return strlen(dst);
+}
+
+static hb_buffer_t *tx3g_decode_to_ssa(hb_work_private_t *pv, hb_buffer_t *in)
 {
 uint8_t *pos = in->data;
 uint8_t *end = in->data + in->size;
- 
+
 uint16_t numStyleRecords = 0;
- 
- uint8_t *startStyle;
- uint8_t *endStyle;
- 
+ StyleRecord *styleRecords = NULL;
+
 /*
 * Parse the packet as a TX3G TextSample.
- * 
+ *
 * Look for a single StyleBox ('styl') and read all contained StyleRecords.
 * Ignore all other box types.
- * 
+ *
 * NOTE: Buffer overflows on read are not checked.
 */
 uint16_t textLength = READ_U16();
 uint8_t *text = READ_ARRAY(textLength);
- startStyle = calloc( textLength, 1 );
- endStyle = calloc( textLength, 1 );
- while ( pos < end ) {
+ while ( pos < end )
+ {
 /*
 * Read TextSampleModifierBox
 */
 uint32_t size = READ_U32();
- if ( size == 0 ) {
+ if ( size == 0 )
+ {
 size = pos - end; // extends to end of packet
 }
- if ( size == 1 ) {
+ if ( size == 1 )
+ {
 hb_log( "dectx3gsub: TextSampleModifierBox has unsupported large size" );
 break;
 }
 uint32_t type = READ_U32();
- if ( type == FOURCC("uuid") ) {
+ if (type == FOURCC("uuid"))
+ {
 hb_log( "dectx3gsub: TextSampleModifierBox has unsupported extended type" );
 break;
 }
- 
- if ( type == FOURCC("styl") ) {
+
+ if (type == FOURCC("styl"))
+ {
 // Found a StyleBox. Parse the contained StyleRecords
- 
- if ( numStyleRecords != 0 ) {
+
+ if ( numStyleRecords != 0 )
+ {
 hb_log( "dectx3gsub: found additional StyleBoxes on subtitle; skipping" );
 SKIP_ARRAY(size);
 continue;
 }
- 
+
 numStyleRecords = READ_U16();
- 
+ if (numStyleRecords > 0)
+ styleRecords = calloc(numStyleRecords, sizeof(StyleRecord));
+
 int i;
- for (i=0; i<numStyleRecords; i++) {
- StyleRecord curRecord;
- curRecord.startChar = READ_U16();
- curRecord.endChar = READ_U16();
- curRecord.fontID = READ_U16();
- curRecord.faceStyleFlags = READ_U8();
- curRecord.fontSize = READ_U8();
- curRecord.textColorRGBA = READ_U32();
- 
- startStyle[curRecord.startChar] |= curRecord.faceStyleFlags;
- endStyle[curRecord.endChar] |= curRecord.faceStyleFlags;
+ for (i = 0; i < numStyleRecords; i++)
+ {
+ styleRecords[i].startChar = READ_U16();
+ styleRecords[i].endChar = READ_U16();
+ styleRecords[i].fontID = READ_U16();
+ styleRecords[i].faceStyleFlags = READ_U8();
+ styleRecords[i].fontSize = READ_U8();
+ styleRecords[i].textColorRGBA = READ_U32();
 }
- } else {
+ }
+ else
+ {
 // Found some other kind of TextSampleModifierBox. Skip it.
 SKIP_ARRAY(size);
 }
 }
- 
+
 /*
 * Copy text to output buffer, and add HTML markup for the style records
 */
- int maxOutputSize = textLength + (numStyleRecords * NUM_FACE_STYLE_FLAGS * (MAX_OPEN_TAG_SIZE + MAX_CLOSE_TAG_SIZE));
+ int maxOutputSize = textLength + SSA_PREAMBLE_LEN + (numStyleRecords * MAX_MARKUP_LEN);
 hb_buffer_t *out = hb_buffer_init( maxOutputSize );
 if ( out == NULL )
 goto fail;
 uint8_t *dst = out->data;
+ uint8_t *start;
 int charIndex = 0;
- for ( pos = text, end = text + textLength; pos < end; pos++ ) {
- if (IS_10xxxxxx(*pos)) {
+ int styleIndex = 0;
+
+ sprintf((char*)dst, "%d,,Default,,0,0,0,,", pv->line);
+ dst += strlen((char*)dst);
+ start = dst;
+ for (pos = text, end = text + textLength; pos < end; pos++)
+ {
+ if (IS_10xxxxxx(*pos))
+ {
 // Is a non-first byte of a multi-byte UTF-8 character
 WRITE_CHAR(*pos);
 continue; // ...without incrementing 'charIndex'
 }
- 
- uint8_t plusStyles = startStyle[charIndex];
- uint8_t minusStyles = endStyle[charIndex];
- 
- if (minusStyles & UNDERLINE)
- WRITE_END_TAG('u');
- if (minusStyles & ITALIC)
- WRITE_END_TAG('i');
- if (minusStyles & BOLD)
- WRITE_END_TAG('b');
- 
- if (plusStyles & BOLD)
- WRITE_START_TAG('b');
- if (plusStyles & ITALIC)
- WRITE_START_TAG('i');
- if (plusStyles & UNDERLINE)
- WRITE_START_TAG('u');
- 
- WRITE_CHAR(*pos);
+
+ if (styleIndex < numStyleRecords)
+ {
+ if (styleRecords[styleIndex].endChar == charIndex)
+ {
+ if (styleIndex + 1 >= numStyleRecords ||
+ styleRecords[styleIndex+1].startChar > charIndex)
+ {
+ dst += write_ssa_markup((char*)dst, NULL);
+ }
+ styleIndex++;
+ }
+ if (styleRecords[styleIndex].startChar == charIndex)
+ {
+ dst += write_ssa_markup((char*)dst, &styleRecords[styleIndex]);
+ }
+ }
+
+ if (*pos == '\n')
+ {
+ WRITE_CHAR('\\');
+ WRITE_CHAR('N');
+ }
+ else
+ {
+ WRITE_CHAR(*pos);
+ }
 charIndex++;
 }
- 
+ if (start == dst)
+ {
+ // No text in the subtitle. This sub is just filler, drop it.
+ free(styleRecords);
+ hb_buffer_close(&out);
+ return NULL;
+ }
+ *dst = '\0';
+ dst++;
+
 // Trim output buffer to the actual amount of data written
 out->size = dst - out->data;
- 
+
 // Copy metadata from the input packet to the output packet
+ out->s.frametype = HB_FRAME_SUBTITLE;
 out->s.start = in->s.start;
 out->s.stop = in->s.stop;
- 
+
 fail:
- free( startStyle );
- free( endStyle );
- 
+ free(styleRecords);
+
 return out;
 }
 
@@ -190,55 +238,48 @@
 
 static int dectx3gInit( hb_work_object_t * w, hb_job_t * job )
 {
+ hb_work_private_t * pv;
+ pv = calloc( 1, sizeof( hb_work_private_t ) );
+ if (pv == NULL)
+ return 1;
+ w->private_data = pv;
+
+ // TODO:
+ // parse w->subtitle->extradata txg3 sample description into
+ // SSA format and replace extradata.
+ // For now we just create a generic SSA Script Info.
+ int height = job->title->height - job->crop[0] - job->crop[1];
+ int width = job->title->width - job->crop[2] - job->crop[3];
+ hb_subtitle_add_ssa_header(w->subtitle, width, height);
+
 return 0;
 }
 
 static int dectx3gWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
 hb_buffer_t ** buf_out )
 {
+ hb_work_private_t * pv = w->private_data;
 hb_buffer_t * in = *buf_in;
- hb_buffer_t * out = NULL;
- 
- // Warn if the subtitle's duration has not been passed through by the demuxer,
- // which will prevent the subtitle from displaying at all
+
 if ( in->s.stop == 0 ) {
 hb_log( "dectx3gsub: subtitle packet lacks duration" );
 }
- 
- if ( in->size > 0 ) {
- out = tx3g_decode_to_utf8(in);
- } else {
- out = hb_buffer_init( 0 );
- }
- 
- if ( out != NULL ) {
- // We shouldn't be storing the extra NULL character,
- // but the MP4 muxer expects this, unfortunately.
- if (out->size > 0 && out->data[out->size - 1] != '\0')
- {
- hb_buffer_realloc(out, ++out->size);
- out->data[out->size - 1] = '\0';
- }
- 
- // If the input packet was non-empty, do not pass through
- // an empty output packet (even if the subtitle was empty),
- // as this would be interpreted as an end-of-stream
- if ( in->size > 0 && out->size == 0 ) {
- hb_buffer_close(&out);
- }
+
+ if (in->size == 0)
+ {
+ *buf_out = in;
+ *buf_in = NULL;
+ return HB_WORK_DONE;
 }
- 
- // Dispose the input packet, as it is no longer needed
- hb_buffer_close(&in);
- 
- *buf_in = NULL;
- *buf_out = out;
+
+ *buf_out = tx3g_decode_to_ssa(pv, in);
+
 return HB_WORK_OK;
 }
 
 static void dectx3gClose( hb_work_object_t * w )
 {
- // nothing
+ free(w->private_data);
 }
 
 hb_work_object_t hb_dectx3gsub =

HandBrake-0.9.9.tar.bz2/libhb/decutf8sub.c -> HandBrake-0.10.0.tar.bz2/libhb/decutf8sub.c Changed

@@ -1,6 +1,6 @@
 /* decutf8sub.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -19,18 +19,38 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "hb.h"
+#include "decsrtsub.h"
+
+struct hb_work_private_s
+{
+ int line; // SSA line number
+};
 
 static int decutf8Init(hb_work_object_t *w, hb_job_t *job)
 {
+ hb_work_private_t * pv;
+ pv = calloc( 1, sizeof( hb_work_private_t ) );
+ if (pv == NULL)
+ return 1;
+ w->private_data = pv;
+
+ // Generate generic SSA Script Info.
+ int height = job->title->height - job->crop[0] - job->crop[1];
+ int width = job->title->width - job->crop[2] - job->crop[3];
+ hb_subtitle_add_ssa_header(w->subtitle, width, height);
+
 return 0;
 }
 
 static int decutf8Work(hb_work_object_t * w,
 hb_buffer_t **buf_in, hb_buffer_t **buf_out)
 {
+ hb_work_private_t * pv = w->private_data;
 // Pass the packets through without modification
 hb_buffer_t *out = *buf_in;
 
+ out->s.frametype = HB_FRAME_SUBTITLE;
+
 // Warn if the subtitle's duration has not been passed through by the
 // demuxer, which will prevent the subtitle from displaying at all
 if (out->s.stop == 0)
@@ -38,22 +58,19 @@
 hb_log("decutf8sub: subtitle packet lacks duration");
 }
 
- // We shouldn't be storing the extra NULL character,
- // but the MP4 muxer expects this, unfortunately.
- if (out->size > 0 && out->data[out->size - 1] != '\0')
- {
- hb_buffer_realloc(out, ++out->size);
- out->data[out->size - 1] = '\0';
- }
+ hb_srt_to_ssa(out, ++pv->line);
 
 *buf_in = NULL;
 *buf_out = out;
+
+ if (out->size == 0)
+ return HB_WORK_DONE;
 return HB_WORK_OK;
 }
 
 static void decutf8Close(hb_work_object_t *w)
 {
- // nothing
+ free(w->private_data);
 }
 
 hb_work_object_t hb_decutf8sub =

HandBrake-0.9.9.tar.bz2/libhb/decvobsub.c -> HandBrake-0.10.0.tar.bz2/libhb/decvobsub.c Changed

@@ -1,6 +1,6 @@
 /* decvobsub.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -123,6 +123,7 @@
 pv->buf = hb_buffer_init( 0xFFFF );
 memcpy( pv->buf->data, in->data, in->size );
 pv->buf->s.id = in->s.id;
+ pv->buf->s.frametype = HB_FRAME_SUBTITLE;
 pv->buf->sequence = in->sequence;
 pv->size_got = in->size;
 if( in->s.start >= 0 )
@@ -176,7 +177,7 @@
 pv->size_got = 0;
 pv->size_rle = 0;
 
- if ( pv->pts_stop != -1 )
+ if ( pv->pts_stop != AV_NOPTS_VALUE )
 {
 // If we don't get a valid next timestamp, use the stop time
 // of the current sub as the start of the next.
@@ -224,8 +225,8 @@
 int command;
 int date, next;
 
- pv->pts_start = -1;
- pv->pts_stop = -1;
+ pv->pts_start = AV_NOPTS_VALUE;
+ pv->pts_stop = AV_NOPTS_VALUE;
 pv->pts_forced = 0;
 
 pv->alpha[3] = 0;
@@ -270,7 +271,7 @@
 break;
 
 case 0x02: // 0x02 - STP_DSP - Stop Display, no arguments
- if(pv->pts_stop == -1)
+ if(pv->pts_stop == AV_NOPTS_VALUE)
 pv->pts_stop = pv->pts + date * 1024;
 break;
 
@@ -346,7 +347,7 @@
 }
 
 // fading-out
- if( currAlpha < lastAlpha && pv->pts_stop == -1 )
+ if (currAlpha < lastAlpha && pv->pts_stop == AV_NOPTS_VALUE)
 {
 pv->pts_stop = pv->pts + date * 1024;
 }
@@ -381,7 +382,7 @@
 i = next;
 }
 // Generate timestamps if they are not set
- if( pv->pts_start == -1 )
+ if( pv->pts_start == AV_NOPTS_VALUE )
 {
 // Set pts to end of last sub if the start time is unknown.
 pv->pts_start = pv->pts;
@@ -537,6 +538,7 @@
 realheight = crop[1] - crop[0] + 1;
 
 buf = hb_frame_buffer_init( AV_PIX_FMT_YUVA420P, realwidth, realheight );
+ buf->s.frametype = HB_FRAME_SUBTITLE;
 buf->s.start = pv->pts_start;
 buf->s.stop = pv->pts_stop;
 buf->s.type = SUBTITLE_BUF;

HandBrake-0.9.9.tar.bz2/libhb/deinterlace.c -> HandBrake-0.10.0.tar.bz2/libhb/deinterlace.c Changed

@@ -18,12 +18,9 @@
 
 #include "hb.h"
 #include "hbffmpeg.h"
-#include "mpeg2dec/mpeg2.h"
-#include "mcdeint.h"
 #include "taskset.h"
 
 // yadif_mode is a bit vector with the following flags
-// Note that 2PASS should be enabled when using MCDEINT
 #define MODE_YADIF_ENABLE 1
 #define MODE_YADIF_SPATIAL 2
 #define MODE_YADIF_2PASS 4
@@ -32,9 +29,6 @@
 #define YADIF_MODE_DEFAULT 0
 #define YADIF_PARITY_DEFAULT -1
 
-#define MCDEINT_MODE_DEFAULT -1
-#define MCDEINT_QP_DEFAULT 1
-
 #define ABS(a) ((a) > 0 ? (a) : (-(a)))
 #define MIN3(a,b,c) MIN(MIN(a,b),c)
 #define MAX3(a,b,c) MAX(MAX(a,b),c)
@@ -45,6 +39,16 @@
 int tff;
 } yadif_arguments_t;
 
+typedef struct deint_arguments_s {
+ hb_buffer_t * src;
+ hb_buffer_t * dst;
+} deint_arguments_t;
+
+typedef struct deint_thread_arg_s {
+ hb_filter_private_t *pv;
+ int segment;
+} deint_thread_arg_t;
+
 struct hb_filter_private_s
 {
 int width;
@@ -57,15 +61,15 @@
 hb_buffer_t * yadif_ref[3];
 
 int cpu_count;
+ int segments;
 
- taskset_t yadif_taskset; // Threads for Yadif - one per CPU
-
- yadif_arguments_t *yadif_arguments; // Arguments to thread for work
+ int deint_nsegs;
 
- int mcdeint_mode;
- mcdeint_private_t mcdeint;
+ taskset_t deint_taskset; // Threads for fast deint
+ taskset_t yadif_taskset; // Threads for Yadif
 
- //hb_buffer_t * buf_out[2];
+ deint_arguments_t *deint_arguments; // Arguments to thread for work
+ yadif_arguments_t *yadif_arguments; // Arguments to thread for work
 };
 
 static int hb_deinterlace_init( hb_filter_object_t * filter,
@@ -81,7 +85,7 @@
 {
 .id = HB_FILTER_DEINTERLACE,
 .enforce_order = 1,
- .name = "Deinterlace (ffmpeg or yadif/mcdeint)",
+ .name = "Deinterlace",
 .settings = NULL,
 .init = hb_deinterlace_init,
 .work = hb_deinterlace_work,
@@ -202,17 +206,16 @@
 */
 run = 0;
 goto report_completion;
- } 
+ }
 
 yadif_work = &pv->yadif_arguments[segment];
 
 if( yadif_work->dst == NULL )
 {
 hb_error( "Thread started when no work available" );
- hb_snooze(500);
 goto report_completion;
 }
- 
+
 /*
 * Process all three planes, but only this segment of it.
 */
@@ -228,9 +231,9 @@
 int tff = yadif_work->tff;
 int penultimate = h - 2;
 
- int segment_height = (h / pv->cpu_count) & ~1;
+ int segment_height = (h / pv->segments) & ~1;
 segment_start = segment_height * segment;
- if( segment == pv->cpu_count - 1 )
+ if( segment == pv->segments - 1 )
 {
 /*
 * Final segment
@@ -258,7 +261,7 @@
 {
 /* This isn't the top or bottom,
 * proceed as normal to yadif. */
- yadif_filter_line(pv, dst2, prev, cur, next, w, s, 
+ yadif_filter_line(pv, dst2, prev, cur, next, w, s,
 parity ^ tff);
 }
 else
@@ -305,8 +308,8 @@
 
 int segment;
 
- for( segment = 0; segment < pv->cpu_count; segment++ )
- { 
+ for( segment = 0; segment < pv->segments; segment++ )
+ {
 /*
 * Setup the work for this plane.
 */
@@ -323,6 +326,128 @@
 */
 }
 
+/*
+ * deinterlace a frame in a single thread.
+ */
+void deint_filter_thread( void *thread_args_v )
+{
+ deint_arguments_t *args = NULL;
+ hb_filter_private_t * pv;
+ int run = 1;
+ int segment;
+ deint_thread_arg_t *thread_args = thread_args_v;
+
+ pv = thread_args->pv;
+ segment = thread_args->segment;
+
+ hb_log("Fast Deinterlace thread started for segment %d", segment);
+
+ while( run )
+ {
+ /*
+ * Wait here until there is work to do.
+ */
+ taskset_thread_wait4start( &pv->deint_taskset, segment );
+
+
+ if( taskset_thread_stop( &pv->deint_taskset, segment ) )
+ {
+ /*
+ * No more work to do, exit this thread.
+ */
+ run = 0;
+ goto report_completion;
+ }
+
+ args = &pv->deint_arguments[segment];
+
+ if( args->dst == NULL )
+ {
+ // This can happen when flushing final buffers.
+ goto report_completion;
+ }
+
+ /*
+ * Process all three planes, but only this segment of it.
+ */
+ hb_deinterlace(args->dst, args->src);
+
+report_completion:
+ /*
+ * Finished this segment, let everyone know.
+ */
+ taskset_thread_complete( &pv->deint_taskset, segment );
+ }
+}
+
+/*
+ * threaded fast deint - each thread deinterlaces a single frame.
+ *
+ * This function blocks until all frames are deinterlaced.
+ */
+static hb_buffer_t * deint_fast(hb_filter_private_t * pv, hb_buffer_t * in)
+{
+
+ int ii;
+ hb_buffer_t *dst, *src;
+
+ if (in != NULL)
+ {
+ dst = hb_frame_buffer_init(in->f.fmt, in->f.width, in->f.height);
+ pv->deint_arguments[pv->deint_nsegs].src = in;
+ pv->deint_arguments[pv->deint_nsegs].dst = dst;
+ pv->deint_nsegs++;
+ }
+ if (in != NULL && pv->deint_nsegs < pv->segments)
+ {
+ return NULL;
+ }
+
+ if (pv->deint_nsegs > 0)
+ {
+ /* Allow the taskset threads to make one pass over the data. */
+ taskset_cycle( &pv->deint_taskset );
+ }
+
+ hb_buffer_t *first = NULL, *last = NULL;
+ for (ii = 0; ii < pv->deint_nsegs; ii++)
+ {
+ src = pv->deint_arguments[ii].src;
+ dst = pv->deint_arguments[ii].dst;
+ pv->deint_arguments[ii].src = NULL;
+ pv->deint_arguments[ii].dst = NULL;
+ if (first == NULL)
+ {
+ first = dst;
+ }
+ if (last != NULL)
+ {
+ last->next = dst;
+ }
+ last = dst;
+
+ dst->s = src->s;
+ hb_buffer_move_subs(dst, src);
+ hb_buffer_close(&src);
+ }
+ if (in == NULL)
+ {
+ // Flushing final buffers. Append EOS marker buffer.
+ dst = hb_buffer_init(0);
+ if (first == NULL)
+ {
+ first = dst;
+ }
+ else
+ {
+ last->next = dst;
+ }
+ }
+ pv->deint_nsegs = 0;
+
+ return first;
+}
+
 static int hb_deinterlace_init( hb_filter_object_t * filter,
 hb_filter_init_t * init )
 {
@@ -336,16 +461,11 @@
 pv->yadif_mode = YADIF_MODE_DEFAULT;
 pv->yadif_parity = YADIF_PARITY_DEFAULT;
 
- pv->mcdeint_mode = MCDEINT_MODE_DEFAULT;
- int mcdeint_qp = MCDEINT_QP_DEFAULT;
-
 if( filter->settings )
 {
- sscanf( filter->settings, "%d:%d:%d:%d",
+ sscanf( filter->settings, "%d:%d",
 &pv->yadif_mode,
- &pv->yadif_parity,
- &pv->mcdeint_mode,
- &mcdeint_qp );
+ &pv->yadif_parity);
 }
 
 pv->cpu_count = hb_get_cpu_count();
@@ -356,16 +476,17 @@
 /*
 * Setup yadif taskset.
 */
- pv->yadif_arguments = malloc( sizeof( yadif_arguments_t ) * pv->cpu_count );
+ pv->segments = pv->cpu_count;
+ pv->yadif_arguments = malloc( sizeof( yadif_arguments_t ) * pv->segments );
 if( pv->yadif_arguments == NULL ||
- taskset_init( &pv->yadif_taskset, /*thread_count*/pv->cpu_count,
- sizeof( yadif_arguments_t ) ) == 0 )
+ taskset_init( &pv->yadif_taskset, /*thread_count*/pv->segments,
+ sizeof( yadif_thread_arg_t ) ) == 0 )
 {
 hb_error( "yadif could not initialize taskset" );
 }
 
 int ii;
- for( ii = 0; ii < pv->cpu_count; ii++ )
+ for( ii = 0; ii < pv->segments; ii++ )
 {
 yadif_thread_arg_t *thread_args;
 
@@ -384,10 +505,41 @@
 }
 }
 }
+ else
+ {
+ /*
+ * Setup fast deint taskset.
+ */
+ pv->segments = pv->cpu_count;
+ pv->deint_arguments = malloc( sizeof( deint_arguments_t ) * pv->segments );
+ if( pv->deint_arguments == NULL ||
+ taskset_init( &pv->deint_taskset, pv->segments,
+ sizeof( deint_thread_arg_t ) ) == 0 )
+ {
+ hb_error( "deint could not initialize taskset" );
+ }
+
+ int ii;
+ for( ii = 0; ii < pv->segments; ii++ )
+ {
+ deint_thread_arg_t *thread_args;
+
+ thread_args = taskset_thread_args( &pv->deint_taskset, ii );
+
+ thread_args->pv = pv;
+ thread_args->segment = ii;
+ pv->deint_arguments[ii].dst = NULL;
+
+ if( taskset_thread_spawn( &pv->deint_taskset, ii,
+ "deint_filter_segment",
+ deint_filter_thread,
+ HB_NORMAL_PRIORITY ) == 0 )
+ {
+ hb_error( "deint could not spawn thread" );
+ }
+ }
+ }
 
- mcdeint_init( &pv->mcdeint, pv->mcdeint_mode, mcdeint_qp, 
- init->pix_fmt, init->width, init->height );
- 
 return 0;
 }
 
@@ -413,39 +565,16 @@
 
 free( pv->yadif_arguments );
 }
+ else
+ {
+ taskset_fini( &pv->deint_taskset );
+ free( pv->deint_arguments );
+ }
 
- mcdeint_close( &pv->mcdeint );
- 
 free( pv );
 filter->private_data = NULL;
 }
 
-static hb_buffer_t * deint_fast(hb_buffer_t * in)
-{
- AVPicture pic_in;
- AVPicture pic_out;
- hb_buffer_t * out;
-
- int w = (in->plane[0].width + 3) & ~0x3;
- int h = (in->plane[0].height + 3) & ~0x3;
-
- out = hb_frame_buffer_init(in->f.fmt, in->f.width, in->f.height);
-
- hb_avpicture_fill( &pic_in, in );
- hb_avpicture_fill( &pic_out, out );
-
- // avpicture_deinterlace requires 4 pixel aligned width and height
- // we have aligned all buffers to 16 byte width and height strides
- // so there is room in the buffers to accomodate a litte
- // overscan.
- avpicture_deinterlace(&pic_out, &pic_in, out->f.fmt, w, h);
-
- out->s = in->s;
- hb_buffer_move_subs(out, in);
-
- return out;
-}
-
 static int hb_deinterlace_work( hb_filter_object_t * filter,
 hb_buffer_t ** buf_in,
 hb_buffer_t ** buf_out )
@@ -458,13 +587,19 @@
 {
 *buf_out = in;
 *buf_in = NULL;
+ if( !( pv->yadif_mode & MODE_YADIF_ENABLE ) )
+ {
+ // Flush final frames
+ *buf_out = deint_fast(pv, NULL);
+ }
 return HB_FILTER_DONE;
 }
 
 /* Use libavcodec deinterlace if yadif_mode < 0 */
 if( !( pv->yadif_mode & MODE_YADIF_ENABLE ) )
 {
- *buf_out = deint_fast(in);
+ *buf_in = NULL;
+ *buf_out = deint_fast(pv, in);
 return HB_FILTER_OK;
 }
 
@@ -494,7 +629,7 @@
 tff = (pv->yadif_parity & 1) ^ 1;
 }
 
- /* deinterlace both fields if mcdeint is enabled without bob */
+ /* deinterlace both fields if yadif 2 pass or bob */
 int frame, num_frames = 1;
 if ((pv->yadif_mode & MODE_YADIF_2PASS) ||
 (pv->yadif_mode & MODE_YADIF_BOB))
@@ -506,7 +641,7 @@
 int idx = 0;
 hb_buffer_t * o_buf[2] = {NULL,};
 
- /* Perform yadif and mcdeint filtering */
+ /* Perform yadif filtering */
 for( frame = 0; frame < num_frames; frame++ )
 {
 int parity = frame ^ tff ^ 1;
@@ -517,18 +652,8 @@
 }
 yadif_filter(pv, o_buf[idx], parity, tff);
 
- if (pv->mcdeint_mode >= 0)
- {
- if (o_buf[idx^1] == NULL)
- {
- o_buf[idx^1] = hb_frame_buffer_init(in->f.fmt, in->f.width, in->f.height);
- }
- mcdeint_filter( o_buf[idx^1], o_buf[idx], parity, &pv->mcdeint );
- idx ^= 1;
- }
-
 // If bob, add both frames
- // else, add only second frame
+ // else, add only final frame
 if (( pv->yadif_mode & MODE_YADIF_BOB ) || frame == num_frames - 1)
 {
 if ( out == NULL )
@@ -550,6 +675,7 @@
 idx ^= 1;
 }
 }
+
 // Copy subs only to first output buffer
 hb_buffer_move_subs( out, pv->yadif_ref[1] );

HandBrake-0.9.9.tar.bz2/libhb/demuxmpeg.c -> HandBrake-0.10.0.tar.bz2/libhb/demuxmpeg.c Changed

@@ -1,6 +1,6 @@
 /* demuxmpeg.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -39,10 +39,11 @@
 // 'tol'ms between the last scr & this or if this scr goes back
 // by more than half a frame time.
 int64_t scr_delta = scr - state->last_scr;
- if ( state->last_scr == -1 || scr_delta > 90*tol || scr_delta < -90*10 )
+ if (state->last_scr == AV_NOPTS_VALUE ||
+ scr_delta > 90*tol || scr_delta < -90*10)
 {
 ++state->scr_changes;
- state->last_pts = -1;
+ state->last_pts = AV_NOPTS_VALUE;
 }
 state->last_scr = scr;
 }
@@ -101,7 +102,7 @@
 ((uint64_t)(d[pos+2] & 3) << 13) |
 ((uint64_t)(d[pos+3]) << 5) |
 (d[pos+4] >> 3);
- check_mpeg_scr( state, scr, 300 );
+ check_mpeg_scr( state, scr, 700 );
 }
 
 pos += 9; /* pack_header */
@@ -128,7 +129,7 @@
 int pes_header_d_length;
 int pes_header_end;
 int has_pts;
- int64_t pts = -1, dts = -1;
+ int64_t pts = AV_NOPTS_VALUE, dts = AV_NOPTS_VALUE;
 
 pos += 3; /* packet_start_code_prefix */
 id = d[pos];
@@ -220,7 +221,7 @@
 buf_es->s.id = id;
 buf_es->s.start = pts;
 buf_es->s.renderOffset = dts;
- buf_es->s.stop = -1;
+ buf_es->s.stop = AV_NOPTS_VALUE;
 if ( state && id == 0xE0)
 {
 // Consume a chapter break, and apply it to the ES.
@@ -244,7 +245,8 @@
 // stripped off and buf has all the info gleaned from them: id is set,
 // start contains the pts (if any), renderOffset contains the dts (if any)
 // and stop contains the pcr (if it changed).
-void hb_demux_mpeg( hb_buffer_t *buf, hb_list_t *list_es, hb_psdemux_t *state )
+void hb_demux_mpeg(hb_buffer_t *buf, hb_list_t *list_es,
+ hb_psdemux_t *state, int pcr_tolerance)
 {
 while ( buf )
 {
@@ -265,8 +267,8 @@
 if ( buf->s.pcr >= 0 )
 {
 // we have a new pcr
- check_mpeg_scr( state, buf->s.pcr, 300 );
- buf->s.pcr = -1;
+ check_mpeg_scr( state, buf->s.pcr, pcr_tolerance );
+ buf->s.pcr = AV_NOPTS_VALUE;
 // Some streams have consistantly bad PCRs or SCRs
 // So filter out the offset
 if ( buf->s.start >= 0 )
@@ -336,6 +338,19 @@
 }
 }
 
+void hb_demux_ts(hb_buffer_t *buf, hb_list_t *list_es, hb_psdemux_t *state)
+{
+ // Distance between PCRs in TS is up to 100ms, but we have seen
+ // streams that exceed this, so allow up to 300ms.
+ hb_demux_mpeg(buf, list_es, state, 300);
+}
+
+void hb_demux_ps(hb_buffer_t *buf, hb_list_t *list_es, hb_psdemux_t *state)
+{
+ // Distance between SCRs in PS is up to 700ms
+ hb_demux_mpeg(buf, list_es, state, 700);
+}
+
 // "null" demuxer (makes a copy of input buf & returns it in list)
 // used when the reader for some format includes its own demuxer.
 // for example, ffmpeg.
@@ -348,8 +363,9 @@
 {
 // if we don't have a time offset yet, 
 // use this timestamp as the offset.
- if ( state->scr_changes == 0 &&
- ( buf->s.start != -1 || buf->s.renderOffset != -1 ) )
+ if (state->scr_changes == 0 &&
+ (buf->s.start != AV_NOPTS_VALUE ||
+ buf->s.renderOffset != AV_NOPTS_VALUE))
 {
 ++state->scr_changes;
 state->last_scr = buf->s.start >= 0 ? buf->s.start : buf->s.renderOffset;
@@ -368,4 +384,4 @@
 }
 }
 
-const hb_muxer_t hb_demux[] = { hb_demux_dvd_ps, hb_demux_mpeg, hb_demux_null };
+const hb_muxer_t hb_demux[] = { hb_demux_dvd_ps, hb_demux_ts, hb_demux_ps, hb_demux_null };

HandBrake-0.9.9.tar.bz2/libhb/denoise.c -> HandBrake-0.10.0.tar.bz2/libhb/denoise.c Changed

@@ -1,5 +1,6 @@
 /*
- Copyright (C) 2003 Daniel Moreno <comac@comac.darktech.org>
+ Copyright (c) 2003 Daniel Moreno <comac AT comac DOT darktech DOT org>
+ Copyright (c) 2012 Loren Merritt
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -18,18 +19,18 @@
 
 #include "hb.h"
 #include "hbffmpeg.h"
-#include "mpeg2dec/mpeg2.h"
 
 #define HQDN3D_SPATIAL_LUMA_DEFAULT 4.0f
 #define HQDN3D_SPATIAL_CHROMA_DEFAULT 3.0f
 #define HQDN3D_TEMPORAL_LUMA_DEFAULT 6.0f
 
 #define ABS(A) ( (A) > 0 ? (A) : -(A) )
+#define MIN( a, b ) ( (a) > (b) ? (b) : (a) )
 
 struct hb_filter_private_s
 {
- int hqdn3d_coef[4][512*16];
- unsigned int * hqdn3d_line;
+ short hqdn3d_coef[6][512*16];
+ unsigned short * hqdn3d_line;
 unsigned short * hqdn3d_frame[3];
 };
 
@@ -53,30 +54,31 @@
 .close = hb_denoise_close,
 };
 
-static void hqdn3d_precalc_coef( int * ct,
+static void hqdn3d_precalc_coef( short * ct,
 double dist25 )
 {
 int i;
 double gamma, simil, c;
 
- gamma = log( 0.25 ) / log( 1.0 - dist25/255.0 - 0.00001 );
+ gamma = log( 0.25 ) / log( 1.0 - MIN(dist25,252.0)/255.0 - 0.00001 );
 
 for( i = -255*16; i <= 255*16; i++ )
 {
- simil = 1.0 - ABS(i) / (16*255.0);
- c = pow( simil, gamma ) * 65536.0 * (double)i / 16.0;
+ /* hqdn3d_lowpass_mul() truncates (not rounds) the diff, use +15/32 as midpoint */
+ double f = (i + 15.0/32.0) / 16.0;
+ simil = 1.0 - ABS(f) / 255.0;
+ c = pow(simil, gamma) * 256.0 * f;
 ct[16*256+i] = (c<0) ? (c-0.5) : (c+0.5);
 }
 
 ct[0] = (dist25 != 0);
 }
 
-static inline unsigned int hqdn3d_lowpass_mul( unsigned int prev_mul,
- unsigned int curr_mul,
- int * coef )
+static inline unsigned int hqdn3d_lowpass_mul( int prev_mul,
+ int curr_mul,
+ short * coef )
 {
- int diff_mul = prev_mul - curr_mul;
- int d = ((diff_mul+0x10007FF)>>12);
+ int d = (prev_mul - curr_mul)>>4;
 return curr_mul + coef[d];
 }
 
@@ -84,21 +86,21 @@
 unsigned char * frame_dst,
 unsigned short * frame_ant,
 int w, int h,
- int * temporal)
+ short * temporal)
 {
 int x, y;
- unsigned int pixel_dst;
+ unsigned int tmp;
+
+ temporal += 0x1000;
 
 for( y = 0; y < h; y++ )
 {
 for( x = 0; x < w; x++ )
 {
- pixel_dst = hqdn3d_lowpass_mul( frame_ant[x]<<8,
- frame_src[x]<<16,
- temporal );
-
- frame_ant[x] = ((pixel_dst+0x1000007F)>>8);
- frame_dst[x] = ((pixel_dst+0x10007FFF)>>16);
+ frame_ant[x] = tmp = hqdn3d_lowpass_mul( frame_ant[x],
+ frame_src[x]<<8,
+ temporal );
+ frame_dst[x] = (tmp+0x7F)>>8;
 }
 
 frame_src += w;
@@ -109,175 +111,106 @@
 
 static void hqdn3d_denoise_spatial( unsigned char * frame_src,
 unsigned char * frame_dst,
- unsigned int * line_ant,
+ unsigned short * line_ant,
+ unsigned short * frame_ant,
 int w, int h,
- int * horizontal,
- int * vertical )
+ short * spatial,
+ short * temporal )
 {
 int x, y;
- int line_offset_src = 0, line_offset_dst = 0;
 unsigned int pixel_ant;
- unsigned int pixel_dst;
+ unsigned int tmp;
 
- /* First pixel has no left nor top neighbor. */
- pixel_dst = line_ant[0] = pixel_ant = frame_src[0]<<16;
- frame_dst[0] = ((pixel_dst+0x10007FFF)>>16);
+ spatial += 0x1000;
+ temporal += 0x1000;
 
- /* First line has no top neighbor, only left. */
- for( x = 1; x < w; x++ )
+ /* First line has no top neighbor. Only left one for each tmp and last frame */
+ pixel_ant = frame_src[0]<<8;
+ for ( x = 0; x < w; x++)
 {
- pixel_dst = line_ant[x] = hqdn3d_lowpass_mul(pixel_ant,
- frame_src[x]<<16,
- horizontal);
-
- frame_dst[x] = ((pixel_dst+0x10007FFF)>>16);
+ line_ant[x] = tmp = pixel_ant = hqdn3d_lowpass_mul( pixel_ant,
+ frame_src[x]<<8,
+ spatial );
+ frame_ant[x] = tmp = hqdn3d_lowpass_mul( frame_ant[x],
+ tmp,
+ temporal );
+ frame_dst[x] = (tmp+0x7F)>>8;
 }
 
 for( y = 1; y < h; y++ )
 {
- unsigned int pixel_ant;
- line_offset_src += w, line_offset_dst += w;
-
- /* First pixel on each line doesn't have previous pixel */
- pixel_ant = frame_src[line_offset_src]<<16;
-
- pixel_dst = line_ant[0] = hqdn3d_lowpass_mul( line_ant[0],
- pixel_ant,
- vertical);
-
- frame_dst[line_offset_dst] = ((pixel_dst+0x10007FFF)>>16);
-
- /* The rest of the pixels in the line are normal */
- for( x = 1; x < w; x++ )
+ frame_src += w;
+ frame_dst += w;
+ frame_ant += w;
+ pixel_ant = frame_src[0]<<8;
+ for ( x = 0; x < w-1; x++ )
 {
- unsigned int pixel_dst;
-
- pixel_ant = hqdn3d_lowpass_mul( pixel_ant,
- frame_src[line_offset_src+x]<<16,
- horizontal );
- pixel_dst = line_ant[x] = hqdn3d_lowpass_mul( line_ant[x],
- pixel_ant,
- vertical );
-
- frame_dst[line_offset_dst+x]= ((pixel_dst+0x10007FFF)>>16);
+ line_ant[x] = tmp = hqdn3d_lowpass_mul( line_ant[x],
+ pixel_ant,
+ spatial );
+ pixel_ant = hqdn3d_lowpass_mul( pixel_ant,
+ frame_src[x+1]<<8,
+ spatial );
+ frame_ant[x] = tmp = hqdn3d_lowpass_mul( frame_ant[x],
+ tmp,
+ temporal );
+ frame_dst[x] = (tmp+0x7F)>>8;
 }
+ line_ant[x] = tmp = hqdn3d_lowpass_mul( line_ant[x],
+ pixel_ant,
+ spatial );
+ frame_ant[x] = tmp = hqdn3d_lowpass_mul( frame_ant[x],
+ tmp,
+ temporal );
+ frame_dst[x] = (tmp+0x7F)>>8;
 }
 }
 
 static void hqdn3d_denoise( unsigned char * frame_src,
 unsigned char * frame_dst,
- unsigned int * line_ant,
+ unsigned short * line_ant,
 unsigned short ** frame_ant_ptr,
 int w,
 int h,
- int * horizontal,
- int * vertical,
- int * temporal)
+ short * spatial,
+ short * temporal )
 {
 int x, y;
- int line_offset_src = 0, line_offset_dst = 0;
- unsigned int pixel_ant;
- unsigned int pixel_dst;
 unsigned short* frame_ant = (*frame_ant_ptr);
 
 if( !frame_ant)
 {
+ unsigned char * src = frame_src;
 (*frame_ant_ptr) = frame_ant = malloc( w*h*sizeof(unsigned short) );
- for( y = 0; y < h; y++ )
+ for ( y = 0; y < h; y++, frame_src += w, frame_ant += w )
 {
- unsigned short* dst = &frame_ant[y*w];
- unsigned char* src = frame_src + y*w;
-
 for( x = 0; x < w; x++ )
 {
- dst[x] = src[x] << 8;
+ frame_ant[x] = frame_src[x]<<8;
 }
 }
+ frame_src = src;
+ frame_ant = *frame_ant_ptr;
 }
 
 /* If no spatial coefficients, do temporal denoise only */
- if( !horizontal[0] && !vertical[0] )
- {
- hqdn3d_denoise_temporal( frame_src,
- frame_dst,
- frame_ant,
- w, h,
- temporal);
- return;
- }
-
- /* If no temporal coefficients, do spatial denoise only */
- if( !temporal[0] )
+ if( spatial[0] )
 {
 hqdn3d_denoise_spatial( frame_src,
 frame_dst,
 line_ant,
+ frame_ant,
 w, h,
- horizontal,
- vertical);
- return;
- }
-
- /* First pixel has no left nor top neighbor. Only previous frame */
- line_ant[0] = pixel_ant = frame_src[0] << 16;
-
- pixel_dst = hqdn3d_lowpass_mul( frame_ant[0]<<8,
- pixel_ant,
- temporal );
-
- frame_ant[0] = ((pixel_dst+0x1000007F)>>8);
- frame_dst[0] = ((pixel_dst+0x10007FFF)>>16);
-
- /* First line has no top neighbor. Only left one for each pixel and last frame */
- for( x = 1; x < w; x++ )
- {
- line_ant[x] = pixel_ant = hqdn3d_lowpass_mul( pixel_ant,
- frame_src[x]<<16,
- horizontal);
-
- pixel_dst = hqdn3d_lowpass_mul( frame_ant[x]<<8,
- pixel_ant,
- temporal);
-
- frame_ant[x] = ((pixel_dst+0x1000007F)>>8);
- frame_dst[x] = ((pixel_dst+0x10007FFF)>>16);
+ spatial,
+ temporal );
 }
-
- /* The rest of the lines in the frame are normal */
- for( y = 1; y < h; y++ )
+ else
 {
- unsigned int pixel_ant;
- unsigned short * line_prev = &frame_ant[y*w];
- line_offset_src += w, line_offset_dst += w;
-
- /* First pixel on each line doesn't have previous pixel */
- pixel_ant = frame_src[line_offset_src]<<16;
- line_ant[0] = hqdn3d_lowpass_mul( line_ant[0],
- pixel_ant,
- vertical);
- pixel_dst = hqdn3d_lowpass_mul( line_prev[0]<<8,
- line_ant[0],
- temporal);
- line_prev[0] = ((pixel_dst+0x1000007F)>>8);
-
- frame_dst[line_offset_dst] = ((pixel_dst+0x10007FFF)>>16);
-
- /* The rest of the pixels in the line are normal */
- for( x = 1; x < w; x++ )
- {
- unsigned int pixel_dst;
- pixel_ant = hqdn3d_lowpass_mul( pixel_ant,
- frame_src[line_offset_src+x]<<16,
- horizontal );
- line_ant[x] = hqdn3d_lowpass_mul( line_ant[x],
- pixel_ant, vertical);
- pixel_dst = hqdn3d_lowpass_mul( line_prev[x]<<8,
- line_ant[x],
- temporal );
- line_prev[x] = ((pixel_dst+0x1000007F)>>8);
-
- frame_dst[line_offset_dst+x] = ((pixel_dst+0x10007FFF)>>16);
- }
+ hqdn3d_denoise_temporal( frame_src,
+ frame_dst,
+ frame_ant,
+ w, h,
+ temporal);
 }
 }
 
@@ -287,55 +220,71 @@
 filter->private_data = calloc( sizeof(struct hb_filter_private_s), 1 );
 hb_filter_private_t * pv = filter->private_data;
 
- double spatial_luma, temporal_luma, spatial_chroma, temporal_chroma;
+ double spatial_luma, spatial_chroma_b, spatial_chroma_r;
+ double temporal_luma, temporal_chroma_b, temporal_chroma_r;
 
 if( filter->settings )
 {
- switch( sscanf( filter->settings, "%lf:%lf:%lf:%lf",
- &spatial_luma, &spatial_chroma,
- &temporal_luma, &temporal_chroma ) )
+ switch( sscanf( filter->settings, "%lf:%lf:%lf:%lf:%lf:%lf",
+ &spatial_luma, &spatial_chroma_b, &spatial_chroma_r,
+ &temporal_luma, &temporal_chroma_b, &temporal_chroma_r ) )
 {
 case 0:
- spatial_luma = HQDN3D_SPATIAL_LUMA_DEFAULT;
-
- spatial_chroma = HQDN3D_SPATIAL_CHROMA_DEFAULT;
-
- temporal_luma = HQDN3D_TEMPORAL_LUMA_DEFAULT;
-
- temporal_chroma = temporal_luma *
- spatial_chroma / spatial_luma;
+ spatial_luma = HQDN3D_SPATIAL_LUMA_DEFAULT;
+ spatial_chroma_b = HQDN3D_SPATIAL_CHROMA_DEFAULT;
+ spatial_chroma_r = spatial_chroma_b;
+ temporal_luma = HQDN3D_TEMPORAL_LUMA_DEFAULT;
+ temporal_chroma_b = temporal_luma *
+ spatial_chroma_b / spatial_luma;
+ temporal_chroma_r = temporal_chroma_b;
 break;
 
 case 1:
- spatial_chroma = HQDN3D_SPATIAL_CHROMA_DEFAULT *
- spatial_luma / HQDN3D_SPATIAL_LUMA_DEFAULT;
-
- temporal_luma = HQDN3D_TEMPORAL_LUMA_DEFAULT *
- spatial_luma / HQDN3D_SPATIAL_LUMA_DEFAULT;
-
- temporal_chroma = temporal_luma *
- spatial_chroma / spatial_luma;
+ spatial_chroma_b = HQDN3D_SPATIAL_CHROMA_DEFAULT *
+ spatial_luma / HQDN3D_SPATIAL_LUMA_DEFAULT;
+ spatial_chroma_r = spatial_chroma_b;
+ temporal_luma = HQDN3D_TEMPORAL_LUMA_DEFAULT *
+ spatial_luma / HQDN3D_SPATIAL_LUMA_DEFAULT;
+ temporal_chroma_b = temporal_luma *
+ spatial_chroma_b / spatial_luma;
+ temporal_chroma_r = temporal_chroma_b;
 break;
 
 case 2:
- temporal_luma = HQDN3D_TEMPORAL_LUMA_DEFAULT *
- spatial_luma / HQDN3D_SPATIAL_LUMA_DEFAULT;
-
- temporal_chroma = temporal_luma *
- spatial_chroma / spatial_luma;
+ spatial_chroma_r = spatial_chroma_b;
+ temporal_luma = HQDN3D_TEMPORAL_LUMA_DEFAULT *
+ spatial_luma / HQDN3D_SPATIAL_LUMA_DEFAULT;
+ temporal_chroma_b = temporal_luma *
+ spatial_chroma_b / spatial_luma;
+ temporal_chroma_r = temporal_chroma_b;
 break;
 
 case 3:
- temporal_chroma = temporal_luma *
- spatial_chroma / spatial_luma;
+ temporal_luma = HQDN3D_TEMPORAL_LUMA_DEFAULT *
+ spatial_luma / HQDN3D_SPATIAL_LUMA_DEFAULT;
+ temporal_chroma_b = temporal_luma *
+ spatial_chroma_b / spatial_luma;
+ temporal_chroma_r = temporal_chroma_b;
+ break;
+
+ case 4:
+ temporal_chroma_b = temporal_luma *
+ spatial_chroma_b / spatial_luma;
+ temporal_chroma_r = temporal_chroma_b;
+ break;
+
+ case 5:
+ temporal_chroma_r = temporal_chroma_b;
 break;
 }
 }
 
 hqdn3d_precalc_coef( pv->hqdn3d_coef[0], spatial_luma );
 hqdn3d_precalc_coef( pv->hqdn3d_coef[1], temporal_luma );
- hqdn3d_precalc_coef( pv->hqdn3d_coef[2], spatial_chroma );
- hqdn3d_precalc_coef( pv->hqdn3d_coef[3], temporal_chroma );
+ hqdn3d_precalc_coef( pv->hqdn3d_coef[2], spatial_chroma_b );
+ hqdn3d_precalc_coef( pv->hqdn3d_coef[3], temporal_chroma_b );
+ hqdn3d_precalc_coef( pv->hqdn3d_coef[4], spatial_chroma_r );
+ hqdn3d_precalc_coef( pv->hqdn3d_coef[5], temporal_chroma_r );
 
 return 0;
 }
@@ -392,38 +341,23 @@
 
 if( !pv->hqdn3d_line )
 {
- pv->hqdn3d_line = malloc( in->plane[0].stride * sizeof(int) );
+ pv->hqdn3d_line = malloc( in->plane[0].stride * sizeof(unsigned short) );
 }
 
- hqdn3d_denoise( in->plane[0].data,
- out->plane[0].data,
- pv->hqdn3d_line,
- &pv->hqdn3d_frame[0],
- in->plane[0].stride,
- in->plane[0].height,
- pv->hqdn3d_coef[0],
- pv->hqdn3d_coef[0],
- pv->hqdn3d_coef[1] );
-
- hqdn3d_denoise( in->plane[1].data,
- out->plane[1].data,
- pv->hqdn3d_line,
- &pv->hqdn3d_frame[1],
- in->plane[1].stride,
- in->plane[1].height,
- pv->hqdn3d_coef[2],
- pv->hqdn3d_coef[2],
- pv->hqdn3d_coef[3] );
-
- hqdn3d_denoise( in->plane[2].data,
- out->plane[2].data,
- pv->hqdn3d_line,
- &pv->hqdn3d_frame[2],
- in->plane[2].stride,
- in->plane[2].height,
- pv->hqdn3d_coef[2],
- pv->hqdn3d_coef[2],
- pv->hqdn3d_coef[3] );
+ int c, coef_index;
+
+ for ( c = 0; c < 3; c++ )
+ {
+ coef_index = c * 2;
+ hqdn3d_denoise( in->plane[c].data,
+ out->plane[c].data,
+ pv->hqdn3d_line,
+ &pv->hqdn3d_frame[c],
+ in->plane[c].stride,
+ in->plane[c].height,
+ pv->hqdn3d_coef[coef_index],
+ pv->hqdn3d_coef[coef_index+1] );
+ }
 
 out->s = in->s;
 hb_buffer_move_subs( out, in );

HandBrake-0.9.9.tar.bz2/libhb/detelecine.c -> HandBrake-0.10.0.tar.bz2/libhb/detelecine.c Changed

HandBrake-0.9.9.tar.bz2/libhb/dvd.c -> HandBrake-0.10.0.tar.bz2/libhb/dvd.c Changed

HandBrake-0.9.9.tar.bz2/libhb/dvd.h -> HandBrake-0.10.0.tar.bz2/libhb/dvd.h Changed

HandBrake-0.9.9.tar.bz2/libhb/dvdnav.c -> HandBrake-0.10.0.tar.bz2/libhb/dvdnav.c Changed

@@ -1,6 +1,6 @@
 /* dvdnav.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -99,11 +99,12 @@
 **********************************************************************/
 static int hb_dvdnav_reset( hb_dvdnav_t * d )
 {
+ char * path_ccp = hb_utf8_to_cp( d->path );
 if ( d->dvdnav ) 
 dvdnav_close( d->dvdnav );
 
 /* Open device */
- if( dvdnav_open(&d->dvdnav, d->path) != DVDNAV_STATUS_OK )
+ if( dvdnav_open(&d->dvdnav, path_ccp) != DVDNAV_STATUS_OK )
 {
 /*
 * Not an error, may be a stream - which we'll try in a moment.
@@ -131,10 +132,14 @@
 dvdnav_err_to_string(d->dvdnav));
 goto fail;
 }
+
+ free( path_ccp );
+
 return 1;
 
 fail:
 if( d->dvdnav ) dvdnav_close( d->dvdnav );
+ free( path_ccp );
 return 0;
 }
 
@@ -148,12 +153,20 @@
 hb_dvd_t * e;
 hb_dvdnav_t * d;
 int region_mask;
+ char * path_ccp;
 
 e = calloc( sizeof( hb_dvd_t ), 1 );
 d = &(e->dvdnav);
 
+ /*
+ * Convert UTF-8 path to current code page on Windows
+ * hb_utf8_to_cp() is the same as strdup on non-Windows,
+ * so no #ifdef required here
+ */
+ path_ccp = hb_utf8_to_cp( path );
+
 	/* Log DVD drive region code */
- if ( hb_dvd_region( path, &region_mask ) == 0 )
+ if ( hb_dvd_region( path_ccp, &region_mask ) == 0 )
 {
 hb_log( "dvd: Region mask 0x%02x", region_mask );
 if ( region_mask == 0xFF )
@@ -163,7 +176,7 @@
 }
 
 /* Open device */
- if( dvdnav_open(&d->dvdnav, path) != DVDNAV_STATUS_OK )
+ if( dvdnav_open(&d->dvdnav, path_ccp) != DVDNAV_STATUS_OK )
 {
 /*
 * Not an error, may be a stream - which we'll try in a moment.
@@ -193,7 +206,7 @@
 }
 
 /* Open device */
- if( !( d->reader = DVDOpen( path ) ) )
+ if( !( d->reader = DVDOpen( path_ccp ) ) )
 {
 /*
 * Not an error, may be a stream - which we'll try in a moment.
@@ -209,7 +222,8 @@
 goto fail;
 }
 
- d->path = strdup( path );
+ d->path = strdup( path ); /* hb_dvdnav_title_scan assumes UTF-8 path, so not path_ccp here */
+ free( path_ccp );
 
 return e;
 
@@ -218,6 +232,7 @@
 if( d->vmg ) ifoClose( d->vmg );
 if( d->reader ) DVDClose( d->reader );
 free( e );
+ free( path_ccp );
 return NULL;
 }
 
@@ -318,7 +333,6 @@
 int count;
 uint64_t duration, longest;
 int longest_pgcn, longest_pgn, longest_pgcn_end;
- float duration_correction;
 const char * name;
 const char * codec_name;
 
@@ -335,12 +349,15 @@
 char * p_cur, * p_last = d->path;
 for( p_cur = d->path; *p_cur; p_cur++ )
 {
- if( p_cur[0] == '/' && p_cur[1] )
+ if( IS_DIR_SEP(p_cur[0]) && p_cur[1] )
 {
 p_last = &p_cur[1];
 }
 }
 snprintf( title->name, sizeof( title->name ), "%s", p_last );
+ char *dot_term = strrchr(title->name, '.');
+ if (dot_term)
+ *dot_term = '\0';
 }
 
 /* VTS which our title is in */
@@ -380,15 +397,6 @@
 ifo->vts_c_adt->cell_adr_table[i].last_sector );
 goto fail;
 }
- if( ifo->vts_c_adt->cell_adr_table[i].start_sector >=
- ifo->vts_c_adt->cell_adr_table[i].last_sector )
- {
- hb_log( "scan: cell_adr_table[%d].start_sector (0x%x) "
- "is not before last_sector (0x%x) - skipping title", i,
- ifo->vts_c_adt->cell_adr_table[i].start_sector,
- ifo->vts_c_adt->cell_adr_table[i].last_sector );
- goto fail;
- }
 }
 
 if( global_verbosity_level == 3 )
@@ -538,6 +546,7 @@
 case 0x00:
 audio->id = ( ( 0x80 + position ) << 8 ) | 0xbd;
 audio->config.in.codec = HB_ACODEC_AC3;
+ audio->config.in.codec_param = AV_CODEC_ID_AC3;
 codec_name = "AC3";
 break;
 
@@ -602,28 +611,10 @@
 strlen( lang->native_name ) ? lang->native_name : lang->eng_name );
 snprintf( audio->config.lang.iso639_2,
 sizeof( audio->config.lang.iso639_2 ), "%s", lang->iso639_2 );
- snprintf( audio->config.lang.description,
- sizeof( audio->config.lang.description ), "%s (%s)",
- audio->config.lang.simple, codec_name );
-
- switch( lang_extension )
- {
- case 2:
- strcat( audio->config.lang.description, " (Visually Impaired)" );
- break;
- case 3:
- strcat( audio->config.lang.description, " (Director's Commentary 1)" );
- break;
- case 4:
- strcat( audio->config.lang.description, " (Director's Commentary 2)" );
- break;
- default:
- break;
- }
 
- hb_log( "scan: id=0x%x, lang=%s, 3cc=%s ext=%i", audio->id,
- audio->config.lang.description, audio->config.lang.iso639_2,
- lang_extension );
+ hb_log("scan: id=0x%x, lang=%s (%s), 3cc=%s ext=%i", audio->id,
+ audio->config.lang.simple, codec_name,
+ audio->config.lang.iso639_2, lang_extension);
 
 audio->config.in.track = i;
 hb_list_add( title->list_audio, audio );
@@ -758,7 +749,6 @@
 
 hb_log( "scan: title %d has %d chapters", t, c );
 
- duration = 0;
 count = hb_list_count( title->list_chapter );
 for (i = 0; i < count; i++)
 {
@@ -797,16 +787,11 @@
 #undef cp
 cell_cur = FindNextCell( pgc, cell_cur );
 }
- duration += chapter->duration;
 }
 
- /* The durations we get for chapters aren't precise. Scale them so
- the total matches the title duration */
- duration_correction = (float) title->duration / (float) duration;
 for( i = 0; i < hb_list_count( title->list_chapter ); i++ )
 {
 chapter = hb_list_item( title->list_chapter, i );
- chapter->duration = duration_correction * chapter->duration;
 
 int seconds = ( chapter->duration + 45000 ) / 90000;
 chapter->hours = ( seconds / 3600 );
@@ -1979,7 +1964,7 @@
 **********************************************************************/
 static void PgcWalkInit( uint32_t pgcn_map[MAX_PGCN/32] )
 {
- memset(pgcn_map, 0, sizeof(pgcn_map) );
+ memset(pgcn_map, 0, sizeof(uint32_t) * MAX_PGCN/32);
 }
 
 /***********************************************************************
@@ -1998,8 +1983,8 @@
 
 if( fps > 0 )
 {
- ms += ((dt->frame_u & 0x30) >> 3) * 5 +
- (dt->frame_u & 0x0f) * 1000.0 / fps;
+ ms += (((dt->frame_u & 0x30) >> 3) * 5 +
+ (dt->frame_u & 0x0f)) * 1000.0 / fps;
 }
 
 return ms;

HandBrake-0.10.0.tar.bz2/libhb/dxva2api.c Added

@@ -0,0 +1,38 @@
+/* dxva2api.c
+
+ Copyright (c) 2003-2014 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+
+ Authors: Peng Gao <peng@multicorewareinc.com> <http://www.multicorewareinc.com/>
+ Li Cao <li@multicorewareinc.com> <http://www.multicorewareinc.com/>
+
+ */
+#ifdef USE_HWD
+#include "dxva2api.h"
+
+__inline float hb_dx_fixedtofloat( const DXVA2_Fixed32 _fixed_ )
+{
+ return (FLOAT)_fixed_.Value + (FLOAT)_fixed_.Fraction / 0x10000;
+}
+
+__inline const DXVA2_Fixed32 hb_dx_fixed32_opaque_alpha()
+{
+ DXVA2_Fixed32 _fixed_;
+ _fixed_.Fraction = 0;
+ _fixed_.Value = 0;
+ _fixed_.ll = 1;
+ return _fixed_;
+}
+
+
+__inline DXVA2_Fixed32 hb_dx_floattofixed( const float _float_ )
+{
+ DXVA2_Fixed32 _fixed_;
+ _fixed_.Fraction = LOWORD( _float_ * 0x10000 );
+ _fixed_.Value = HIWORD( _float_ * 0x10000 );
+ return _fixed_;
+}
+#endif

HandBrake-0.10.0.tar.bz2/libhb/dxva2api.h Added

@@ -0,0 +1,822 @@
+/* dxva2api.h
+
+ Copyright (c) 2003-2014 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+
+ Authors: Peng Gao <peng@multicorewareinc.com> <http://www.multicorewareinc.com/>
+ Li Cao <li@multicorewareinc.com> <http://www.multicorewareinc.com/>
+
+ */
+
+
+#ifndef _DXVA2API_H
+#define _DXVA2API_H
+#ifdef USE_HWD
+#define MINGW_DXVA2API_H_VERSION (2)
+
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+#include <objbase.h>
+#include <d3d9.h>
+
+/* Define it to allow using nameless struct/union (non C99 compliant) to match
+ * the official documentation. */
+//#define DXVA2API_USE_BITFIELDS
+
+/****************STRUCTURES******************/
+#pragma pack(push, 1)
+
+#define DXVA2API_USE_BITFIELDS
+
+typedef struct _DXVA2_ExtendedFormat {
+#ifdef DXVA2API_USE_BITFIELDS
+ union {
+ struct {
+ UINT SampleFormat : 8;
+ UINT VideoChromaSubsampling : 4;
+ UINT NominalRange : 3;
+ UINT VideoTransferMatrix : 3;
+ UINT VideoLighting : 4;
+ UINT VideoPrimaries : 5;
+ UINT VideoTransferFunction : 5;
+ };
+ UINT value;
+ };
+#else
+ UINT value;
+#endif
+} DXVA2_ExtendedFormat;
+
+typedef struct _DXVA2_Frequency {
+ UINT Numerator;
+ UINT Denominator;
+} DXVA2_Frequency;
+
+typedef struct _DXVA2_VideoDesc {
+ UINT SampleWidth;
+ UINT SampleHeight;
+ DXVA2_ExtendedFormat SampleFormat;
+ D3DFORMAT Format;
+ DXVA2_Frequency InputSampleFreq;
+ DXVA2_Frequency OutputFrameFreq;
+ UINT UABProtectionLevel;
+ UINT Reserved;
+} DXVA2_VideoDesc;
+
+typedef struct _DXVA2_ConfigPictureDecode {
+ GUID guidConfigBitstreamEncryption;
+ GUID guidConfigMBcontrolEncryption;
+ GUID guidConfigResidDiffEncryption;
+ UINT ConfigBitstreamRaw;
+ UINT ConfigMBcontrolRasterOrder;
+ UINT ConfigResidDiffHost;
+ UINT ConfigSpatialResid8;
+ UINT ConfigResid8Subtraction;
+ UINT ConfigSpatialHost8or9Clipping;
+ UINT ConfigSpatialResidInterleaved;
+ UINT ConfigIntraResidUnsigned;
+ UINT ConfigResidDiffAccelerator;
+ UINT ConfigHostInverseScan;
+ UINT ConfigSpecificIDCT;
+ UINT Config4GroupedCoefs;
+ USHORT ConfigMinRenderTargetBuffCount;
+ USHORT ConfigDecoderSpecific;
+} DXVA2_ConfigPictureDecode;
+
+typedef struct _DXVA2_DecodeBufferDesc {
+ DWORD CompressedBufferType;
+ UINT BufferIndex;
+ UINT DataOffset;
+ UINT DataSize;
+ UINT FirstMBaddress;
+ UINT NumMBsInBuffer;
+ UINT Width;
+ UINT Height;
+ UINT Stride;
+ UINT ReservedBits;
+ PVOID pvPVPState;
+} DXVA2_DecodeBufferDesc;
+
+typedef struct _DXVA2_DecodeExtensionData {
+ UINT Function;
+ PVOID pPrivateInputData;
+ UINT PrivateInputDataSize;
+ PVOID pPrivateOutputData;
+ UINT PrivateOutputDataSize;
+} DXVA2_DecodeExtensionData;
+
+typedef struct _DXVA2_DecodeExecuteParams {
+ UINT NumCompBuffers;
+ DXVA2_DecodeBufferDesc *pCompressedBuffers;
+ DXVA2_DecodeExtensionData *pExtensionData;
+} DXVA2_DecodeExecuteParams;
+
+enum {
+ DXVA2_VideoDecoderRenderTarget = 0,
+ DXVA2_VideoProcessorRenderTarget= 1,
+ DXVA2_VideoSoftwareRenderTarget = 2
+};
+
+enum {
+ DXVA2_PictureParametersBufferType = 0,
+ DXVA2_MacroBlockControlBufferType = 1,
+ DXVA2_ResidualDifferenceBufferType = 2,
+ DXVA2_DeblockingControlBufferType = 3,
+ DXVA2_InverseQuantizationMatrixBufferType = 4,
+ DXVA2_SliceControlBufferType = 5,
+ DXVA2_BitStreamDateBufferType = 6,
+ DXVA2_MotionVectorBuffer = 7,
+ DXVA2_FilmGrainBuffer = 8
+};
+
+/* DXVA MPEG-I/II and VC-1 */
+typedef struct _DXVA_PictureParameters {
+ USHORT wDecodedPictureIndex;
+ USHORT wDeblockedPictureIndex;
+ USHORT wForwardRefPictureIndex;
+ USHORT wBackwardRefPictureIndex;
+ USHORT wPicWidthInMBminus1;
+ USHORT wPicHeightInMBminus1;
+ UCHAR bMacroblockWidthMinus1;
+ UCHAR bMacroblockHeightMinus1;
+ UCHAR bBlockWidthMinus1;
+ UCHAR bBlockHeightMinus1;
+ UCHAR bBPPminus1;
+ UCHAR bPicStructure;
+ UCHAR bSecondField;
+ UCHAR bPicIntra;
+ UCHAR bPicBackwardPrediction;
+ UCHAR bBidirectionalAveragingMode;
+ UCHAR bMVprecisionAndChromaRelation;
+ UCHAR bChromaFormat;
+ UCHAR bPicScanFixed;
+ UCHAR bPicScanMethod;
+ UCHAR bPicReadbackRequests;
+ UCHAR bRcontrol;
+ UCHAR bPicSpatialResid8;
+ UCHAR bPicOverflowBlocks;
+ UCHAR bPicExtrapolation;
+ UCHAR bPicDeblocked;
+ UCHAR bPicDeblockConfined;
+ UCHAR bPic4MVallowed;
+ UCHAR bPicOBMC;
+ UCHAR bPicBinPB;
+ UCHAR bMV_RPS;
+ UCHAR bReservedBits;
+ USHORT wBitstreamFcodes;
+ USHORT wBitstreamPCEelements;
+ UCHAR bBitstreamConcealmentNeed;
+ UCHAR bBitstreamConcealmentMethod;
+} DXVA_PictureParameters, *LPDXVA_PictureParameters;
+
+typedef struct _DXVA_QmatrixData {
+ BYTE bNewQmatrix[4];
+ WORD Qmatrix[4][8 * 8];
+} DXVA_QmatrixData, *LPDXVA_QmatrixData;
+
+typedef struct _DXVA_SliceInfo {
+ USHORT wHorizontalPosition;
+ USHORT wVerticalPosition;
+ UINT dwSliceBitsInBuffer;
+ UINT dwSliceDataLocation;
+ UCHAR bStartCodeBitOffset;
+ UCHAR bReservedBits;
+ USHORT wMBbitOffset;
+ USHORT wNumberMBsInSlice;
+ USHORT wQuantizerScaleCode;
+ USHORT wBadSliceChopping;
+} DXVA_SliceInfo, *LPDXVA_SliceInfo;
+
+/* DXVA H264 */
+typedef struct {
+#ifdef DXVA2API_USE_BITFIELDS
+ union {
+ struct {
+ UCHAR Index7Bits : 7;
+ UCHAR AssociatedFlag : 1;
+ };
+ UCHAR bPicEntry;
+ };
+#else
+ UCHAR bPicEntry;
+#endif
+} DXVA_PicEntry_H264;
+
+
+typedef struct {
+ USHORT wFrameWidthInMbsMinus1;
+ USHORT wFrameHeightInMbsMinus1;
+ DXVA_PicEntry_H264 CurrPic;
+ UCHAR num_ref_frames;
+#ifdef DXVA2API_USE_BITFIELDS
+ union {
+ struct {
+ USHORT field_pic_flag : 1;
+ USHORT MbaffFrameFlag : 1;
+ USHORT residual_colour_transform_flag : 1;
+ USHORT sp_for_switch_flag : 1;
+ USHORT chroma_format_idc : 2;
+ USHORT RefPicFlag : 1;
+ USHORT constrained_intra_pred_flag : 1;
+ USHORT weighted_pred_flag : 1;
+ USHORT weighted_bipred_idc : 2;
+ USHORT MbsConsecutiveFlag : 1;
+ USHORT frame_mbs_only_flag : 1;
+ USHORT transform_8x8_mode_flag : 1;
+ USHORT MinLumaBipredSize8x8Flag : 1;
+ USHORT IntraPicFlag : 1;
+ };
+ USHORT wBitFields;
+ };
+#else
+ USHORT wBitFields;
+#endif
+ UCHAR bit_depth_luma_minus8;
+ UCHAR bit_depth_chroma_minus8;
+ USHORT Reserved16Bits;
+ UINT StatusReportFeedbackNumber;
+ DXVA_PicEntry_H264 RefFrameList[16];
+ INT CurrFieldOrderCnt[2];
+ INT FieldOrderCntList[16][2];
+ CHAR pic_init_qs_minus26;
+ CHAR chroma_qp_index_offset;
+ CHAR second_chroma_qp_index_offset;
+ UCHAR ContinuationFlag;
+ CHAR pic_init_qp_minus26;
+ UCHAR num_ref_idx_l0_active_minus1;
+ UCHAR num_ref_idx_l1_active_minus1;
+ UCHAR Reserved8BitsA;
+ USHORT FrameNumList[16];
+
+ UINT UsedForReferenceFlags;
+ USHORT NonExistingFrameFlags;
+ USHORT frame_num;
+ UCHAR log2_max_frame_num_minus4;
+ UCHAR pic_order_cnt_type;
+ UCHAR log2_max_pic_order_cnt_lsb_minus4;
+ UCHAR delta_pic_order_always_zero_flag;
+ UCHAR direct_8x8_inference_flag;
+ UCHAR entropy_coding_mode_flag;
+ UCHAR pic_order_present_flag;
+ UCHAR num_slice_groups_minus1;
+ UCHAR slice_group_map_type;
+ UCHAR deblocking_filter_control_present_flag;
+ UCHAR redundant_pic_cnt_present_flag;
+ UCHAR Reserved8BitsB;
+ USHORT slice_group_change_rate_minus1;
+ UCHAR SliceGroupMap[810];
+} DXVA_PicParams_H264;
+
+typedef struct {
+ UCHAR bScalingLists4x4[6][16];
+ UCHAR bScalingLists8x8[2][64];
+} DXVA_Qmatrix_H264;
+
+
+typedef struct {
+ UINT BSNALunitDataLocation;
+ UINT SliceBytesInBuffer;
+ USHORT wBadSliceChopping;
+ USHORT first_mb_in_slice;
+ USHORT NumMbsForSlice;
+ USHORT BitOffsetToSliceData;
+ UCHAR slice_type;
+ UCHAR luma_log2_weight_denom;
+ UCHAR chroma_log2_weight_denom;
+
+ UCHAR num_ref_idx_l0_active_minus1;
+ UCHAR num_ref_idx_l1_active_minus1;
+ CHAR slice_alpha_c0_offset_div2;
+ CHAR slice_beta_offset_div2;
+ UCHAR Reserved8Bits;
+ DXVA_PicEntry_H264 RefPicList[2][32];
+ SHORT Weights[2][32][3][2];
+ CHAR slice_qs_delta;
+ CHAR slice_qp_delta;
+ UCHAR redundant_pic_cnt;
+ UCHAR direct_spatial_mv_pred_flag;
+ UCHAR cabac_init_idc;
+ UCHAR disable_deblocking_filter_idc;
+ USHORT slice_id;
+} DXVA_Slice_H264_Long;
+
+typedef struct {
+ UINT BSNALunitDataLocation;
+ UINT SliceBytesInBuffer;
+ USHORT wBadSliceChopping;
+} DXVA_Slice_H264_Short;
+
+typedef struct {
+ USHORT wFrameWidthInMbsMinus1;
+ USHORT wFrameHeightInMbsMinus1;
+ DXVA_PicEntry_H264 InPic;
+ DXVA_PicEntry_H264 OutPic;
+ USHORT PicOrderCnt_offset;
+ INT CurrPicOrderCnt;
+ UINT StatusReportFeedbackNumber;
+ UCHAR model_id;
+ UCHAR separate_colour_description_present_flag;
+ UCHAR film_grain_bit_depth_luma_minus8;
+ UCHAR film_grain_bit_depth_chroma_minus8;
+ UCHAR film_grain_full_range_flag;
+ UCHAR film_grain_colour_primaries;
+ UCHAR film_grain_transfer_characteristics;
+ UCHAR film_grain_matrix_coefficients;
+ UCHAR blending_mode_id;
+ UCHAR log2_scale_factor;
+ UCHAR comp_model_present_flag[4];
+ UCHAR num_intensity_intervals_minus1[4];
+ UCHAR num_model_values_minus1[4];
+ UCHAR intensity_interval_lower_bound[3][16];
+ UCHAR intensity_interval_upper_bound[3][16];
+ SHORT comp_model_value[3][16][8];
+} DXVA_FilmGrainChar_H264;
+
+typedef struct {
+ union {
+ struct {
+ USHORT Fraction;
+ SHORT Value;
+ };
+ LONG ll;
+ };
+}DXVA2_Fixed32;
+
+typedef struct {
+ UCHAR Cr;
+ UCHAR Cb;
+ UCHAR Y;
+ UCHAR Alpha;
+}DXVA2_AYUVSample8;
+
+typedef struct {
+ USHORT Cr;
+ USHORT Cb;
+ USHORT Y;
+ USHORT Alpha;
+}DXVA2_AYUVSample16;
+
+typedef struct {
+ DXVA2_Fixed32 MinValue;
+ DXVA2_Fixed32 MaxValue;
+ DXVA2_Fixed32 DefaultValue;
+ DXVA2_Fixed32 StepSize;
+}DXVA2_ValueRange;
+
+typedef struct {
+ DXVA2_Fixed32 Brightness;
+ DXVA2_Fixed32 Contrast;
+ DXVA2_Fixed32 Hue;
+ DXVA2_Fixed32 Saturation;
+}DXVA2_ProcAmpValues;
+
+typedef struct {
+ DXVA2_Fixed32 Level;
+ DXVA2_Fixed32 Threshold;
+ DXVA2_Fixed32 Radius;
+}DXVA2_FilterValues;
+
+typedef struct {
+ UINT DeviceCaps;
+ D3DPOOL InputPool;
+ UINT NumForwardRefSamples;
+ UINT NumBackwardRefSamples;
+ UINT Reserved;
+ UINT DeinterlaceTechnology;
+ UINT ProcAmpControlCaps;
+ UINT VideoProcessorOperations;
+ UINT NoiseFilterTechnology;
+ UINT DetailFilterTechnology;
+}DXVA2_VideoProcessorCaps;
+
+#ifndef _REFERENCE_TIME_
+#define _REFERENCE_TIME_
+typedef long long int64_t;
+typedef int64_t REFERENCE_TIME;
+#endif
+
+typedef struct {
+ REFERENCE_TIME Start;
+ REFERENCE_TIME End;
+ DXVA2_ExtendedFormat SampleFormat;
+ IDirect3DSurface9 *SrcSurface;
+ RECT SrcRect;
+ RECT DstRect;
+ DXVA2_AYUVSample8 Pal[16];
+ DXVA2_Fixed32 PlanarAlpha;
+ DWORD SampleData;
+}DXVA2_VideoSample;
+
+
+typedef struct {
+ REFERENCE_TIME TargetFrame;
+ RECT TargetRect;
+ SIZE ConstrictionSize;
+ UINT StreamingFlags;
+ DXVA2_AYUVSample16 BackgroundColor;
+ DXVA2_ExtendedFormat DestFormat;
+ DXVA2_ProcAmpValues ProcAmpValues;
+ DXVA2_Fixed32 Alpha;
+ DXVA2_FilterValues NoiseFilterLuma;
+ DXVA2_FilterValues NoiseFilterChroma;
+ DXVA2_FilterValues DetailFilterLuma;
+ DXVA2_FilterValues DetailFilterChroma;
+ DWORD DestData;
+} DXVA2_VideoProcessBltParams;
+
+#pragma pack(pop)
+
+/*************INTERFACES************/
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define _COM_interface struct
+typedef _COM_interface IDirectXVideoDecoderService IDirectXVideoDecoderService;
+typedef _COM_interface IDirectXVideoDecoder IDirectXVideoDecoder;
+
+#undef INTERFACE
+#define INTERFACE IDirectXVideoDecoder
+DECLARE_INTERFACE_( IDirectXVideoDecoder, IUnknown )
+{
+ STDMETHOD( QueryInterface ) ( THIS_ REFIID, PVOID* ) PURE;
+ STDMETHOD_( ULONG, AddRef ) ( THIS ) PURE;
+ STDMETHOD_( ULONG, Release ) ( THIS ) PURE;
+ STDMETHOD( GetVideoDecoderService ) ( THIS_ IDirectXVideoDecoderService** ) PURE;
+ STDMETHOD( GetCreationParameters ) ( THIS_ GUID*, DXVA2_VideoDesc*, DXVA2_ConfigPictureDecode*, IDirect3DSurface9***, UINT* ) PURE;
+ STDMETHOD( GetBuffer ) ( THIS_ UINT, void**, UINT* ) PURE;
+ STDMETHOD( ReleaseBuffer ) ( THIS_ UINT ) PURE;
+ STDMETHOD( BeginFrame ) ( THIS_ IDirect3DSurface9 *, void* ) PURE;
+ STDMETHOD( EndFrame ) ( THIS_ HANDLE * ) PURE;
+ STDMETHOD( Execute ) ( THIS_ const DXVA2_DecodeExecuteParams* ) PURE;
+
+
+};
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectXVideoDecoder_QueryInterface( p, a, b ) (p)->lpVtbl->QueryInterface( p, a, b )
+#define IDirectXVideoDecoder_AddRef( p ) (p)->lpVtbl->AddRef( p )
+#define IDirectXVideoDecoder_Release( p ) (p)->lpVtbl->Release( p )
+#define IDirectXVideoDecoder_BeginFrame( p, a, b ) (p)->lpVtbl->BeginFrame( p, a, b )
+#define IDirectXVideoDecoder_EndFrame( p, a ) (p)->lpVtbl->EndFrame( p, a )
+#define IDirectXVideoDecoder_Execute( p, a ) (p)->lpVtbl->Execute( p, a )
+#define IDirectXVideoDecoder_GetBuffer( p, a, b, c ) (p)->lpVtbl->GetBuffer( p, a, b, c )
+#define IDirectXVideoDecoder_GetCreationParameters( p, a, b, c, d, e ) (p)->lpVtbl->GetCreationParameters( p, a, b, c, d, e )
+#define IDirectXVideoDecoder_GetVideoDecoderService( p, a ) (p)->lpVtbl->GetVideoDecoderService( p, a )
+#define IDirectXVideoDecoder_ReleaseBuffer( p, a ) (p)->lpVtbl->ReleaseBuffer( p, a )
+#else
+#define IDirectXVideoDecoder_QueryInterface( p, a, b ) (p)->QueryInterface( a, b )
+#define IDirectXVideoDecoder_AddRef( p ) (p)->AddRef()
+#define IDirectXVideoDecoder_Release( p ) (p)->Release()
+#define IDirectXVideoDecoder_BeginFrame( p, a, b ) (p)->BeginFrame( a, b )
+#define IDirectXVideoDecoder_EndFrame( p, a ) (p)->EndFrame( a )
+#define IDirectXVideoDecoder_Execute( p, a ) (p)->Execute( a )
+#define IDirectXVideoDecoder_GetBuffer( p, a, b, c ) (p)->GetBuffer( a, b, c )
+#define IDirectXVideoDecoder_GetCreationParameters( p, a, b, c, d, e ) (p)->GetCreationParameters( a, b, c, d, e )
+#define IDirectXVideoDecoder_GetVideoDecoderService( p, a ) (p)->GetVideoDecoderService( a )
+#define IDirectXVideoDecoder_ReleaseBuffer( p, a ) (p)->ReleaseBuffer( a )
+#endif
+
+#undef INTERFACE
+#define INTERFACE IDirectXVideoAccelerationService
+DECLARE_INTERFACE_( IDirectXVideoAccelerationService, IUnknown )
+{
+ STDMETHOD( QueryInterface ) ( THIS_ REFIID, PVOID* ) PURE;
+ STDMETHOD_( ULONG, AddRef ) ( THIS ) PURE;
+ STDMETHOD_( ULONG, Release ) ( THIS ) PURE;
+ STDMETHOD( CreateSurface ) ( THIS_ UINT, UINT, UINT, D3DFORMAT, D3DPOOL, DWORD, DWORD, IDirect3DSurface9**, HANDLE* ) PURE;
+
+};
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectXVideoAccelerationService_QueryInterface( p, a, b ) (p)->lpVtbl->QueryInterface( p, a, b )
+#define IDirectXVideoAccelerationService_AddRef( p ) (p)->lpVtbl->AddRef( p )
+#define IDirectXVideoAccelerationService_Release( p ) (p)->lpVtbl->Release( p )
+#define IDirectXVideoAccelerationService_CreateSurface( p, a, b, c, d, e, f, g, h, i ) (p)->lpVtbl->CreateSurface( p, a, b, c, d, e, f, g, h, i )
+#else
+#define IDirectXVideoAccelerationService_QueryInterface( p, a, b ) (p)->QueryInterface( a, b )
+#define IDirectXVideoAccelerationService_AddRef( p ) (p)->AddRef()
+#define IDirectXVideoAccelerationService_Release( p ) (p)->Release()
+#define IDirectXVideoAccelerationService_CreateSurface( p, a, b, c, d, e, f, g, h, i ) (p)->CreateSurface( a, b, c, d, e, f, g, h, i )
+#endif
+
+#undef INTERFACE
+#define INTERFACE IDirectXVideoDecoderService
+DECLARE_INTERFACE_( IDirectXVideoDecoderService, IDirectXVideoAccelerationService )
+{
+ STDMETHOD( QueryInterface ) ( THIS_ REFIID, PVOID* ) PURE;
+ STDMETHOD_( ULONG, AddRef ) ( THIS ) PURE;
+ STDMETHOD_( ULONG, Release ) ( THIS ) PURE;
+ STDMETHOD( CreateSurface ) ( THIS_ UINT, UINT, UINT, D3DFORMAT, D3DPOOL, DWORD, DWORD, IDirect3DSurface9**, HANDLE* ) PURE;
+ STDMETHOD( GetDecoderDeviceGuids ) ( THIS_ UINT*, GUID ** ) PURE;
+ STDMETHOD( GetDecoderRenderTargets ) ( THIS_ REFGUID, UINT*, D3DFORMAT** ) PURE;
+ STDMETHOD( GetDecoderConfigurations ) ( THIS_ REFGUID, const DXVA2_VideoDesc*, IUnknown*, UINT*, DXVA2_ConfigPictureDecode** ) PURE;
+ STDMETHOD( CreateVideoDecoder ) ( THIS_ REFGUID, const DXVA2_VideoDesc*, DXVA2_ConfigPictureDecode*, IDirect3DSurface9**, UINT, IDirectXVideoDecoder** ) PURE;
+};
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectXVideoDecoderService_QueryInterface( p, a, b ) (p)->lpVtbl->QueryInterface( p, a, b )
+#define IDirectXVideoDecoderService_AddRef( p ) (p)->lpVtbl->AddRef( p )
+#define IDirectXVideoDecoderService_Release( p ) (p)->lpVtbl->Release( p )
+#define IDirectXVideoDecoderService_CreateSurface( p, a, b, c, d, e, f, g, h, i ) (p)->lpVtbl->CreateSurface( p, a, b, c, d, e, f, g, h, i )
+#define IDirectXVideoDecoderService_CreateVideoDecoder( p, a, b, c, d, e, f ) (p)->lpVtbl->CreateVideoDecoder( p, a, b, c, d, e, f )
+#define IDirectXVideoDecoderService_GetDecoderConfigurations( p, a, b, c, d, e ) (p)->lpVtbl->GetDecoderConfigurations( p, a, b, c, d, e )
+#define IDirectXVideoDecoderService_GetDecoderDeviceGuids( p, a, b ) (p)->lpVtbl->GetDecoderDeviceGuids( p, a, b )
+#define IDirectXVideoDecoderService_GetDecoderRenderTargets( p, a, b, c ) (p)->lpVtbl->GetDecoderRenderTargets( p, a, b, c )
+#else
+#define IDirectXVideoDecoderService_QueryInterface( p, a, b ) (p)->QueryInterface( a, b )
+#define IDirectXVideoDecoderService_AddRef( p ) (p)->AddRef()
+#define IDirectXVideoDecoderService_Release( p ) (p)->Release()
+#define IDirectXVideoDecoderService_CreateSurface( p, a, b, c, d, e, f, g, h, i ) (p)->CreateSurface( a, b, c, d, e, f, g, h, i )
+#define IDirectXVideoDecoderService_CreateVideoDecoder( p, a, b, c, d, e, f ) (p)->CreateVideoDecoder( a, b, c, d, e, f )
+#define IDirectXVideoDecoderService_GetDecoderConfigurations( p, a, b, c, d, e ) (p)->GetDecoderConfigurations( a, b, c, d, e )
+#define IDirectXVideoDecoderService_GetDecoderDeviceGuids( p, a, b ) (p)->GetDecoderDeviceGuids( a, b )
+#define IDirectXVideoDecoderService_GetDecoderRenderTargets( p, a, b, c ) (p)->GetDecoderRenderTargets( a, b, c )
+#endif
+
+#undef INTERFACE
+#define INTERFACE IDirect3DDeviceManager9
+DECLARE_INTERFACE_( IDirect3DDeviceManager9, IUnknown )
+{
+ STDMETHOD( QueryInterface ) ( THIS_ REFIID, PVOID* ) PURE;
+ STDMETHOD_( ULONG, AddRef ) ( THIS ) PURE;
+ STDMETHOD_( ULONG, Release ) ( THIS ) PURE;
+ STDMETHOD( ResetDevice ) ( THIS_ IDirect3DDevice9*, UINT ) PURE;
+ STDMETHOD( OpenDeviceHandle ) ( THIS_ HANDLE* ) PURE;
+ STDMETHOD( CloseDeviceHandle ) ( THIS_ HANDLE ) PURE;
+ STDMETHOD( TestDevice ) ( THIS_ HANDLE ) PURE;
+ STDMETHOD( LockDevice ) ( THIS_ HANDLE, IDirect3DDevice9**, BOOL ) PURE;
+ STDMETHOD( UnlockDevice ) ( THIS_ HANDLE, BOOL ) PURE;
+ STDMETHOD( GetVideoService ) ( THIS_ HANDLE, REFIID, void** ) PURE;
+};
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirect3DDeviceManager9_QueryInterface( p, a, b ) (p)->lpVtbl->QueryInterface( p, a, b )
+#define IDirect3DDeviceManager9_AddRef( p ) (p)->lpVtbl->AddRef( p )
+#define IDirect3DDeviceManager9_Release( p ) (p)->lpVtbl->Release( p )
+#define IDirect3DDeviceManager9_ResetDevice( p, a, b ) (p)->lpVtbl->ResetDevice( p, a, b )
+#define IDirect3DDeviceManager9_OpenDeviceHandle( p, a ) (p)->lpVtbl->OpenDeviceHandle( p, a )
+#define IDirect3DDeviceManager9_CloseDeviceHandle( p, a ) (p)->lpVtbl->CloseDeviceHandle( p, a )
+#define IDirect3DDeviceManager9_TestDevice( p, a ) (p)->lpVtbl->TestDevice( p, a )
+#define IDirect3DDeviceManager9_LockDevice( p, a, b, c ) (p)->lpVtbl->LockDevice( p, a, b, c )
+#define IDirect3DDeviceManager9_UnlockDevice( p, a, b ) (p)->lpVtbl->UnlockDevice( p, a, b )
+#define IDirect3DDeviceManager9_GetVideoService( p, a, b, c ) (p)->lpVtbl->GetVideoService( p, a, b, c )
+#else
+#define IDirect3DDeviceManager9_QueryInterface( p, a, b ) (p)->QueryInterface( a, b )
+#define IDirect3DDeviceManager9_AddRef( p ) (p)->AddRef()
+#define IDirect3DDeviceManager9_Release( p ) (p)->Release()
+#define IDirect3DDeviceManager9_ResetDevice( p, a, b ) (p)->ResetDevice( a, b )
+#define IDirect3DDeviceManager9_OpenDeviceHandle( p, a ) (p)->OpenDeviceHandle( a )
+#define IDirect3DDeviceManager9_CloseDeviceHandle( p, a ) (p)->CloseDeviceHandle( a )
+#define IDirect3DDeviceManager9_TestDevice( p, a ) (p)->TestDevice( a )
+#define IDirect3DDeviceManager9_LockDevice( p, a, b, c ) (p)->LockDevice( a, b, c )
+#define IDirect3DDeviceManager9_UnlockDevice( p, a, b ) (p)->UnlockDevice( a, b )
+#define IDirect3DDeviceManager9_GetVideoService( p, a, b, c ) (p)->GetVideoService( a, b, c )
+#endif
+
+typedef _COM_interface IDirectXVideoProcessorService IDirectXVideoProcessorService;
+typedef _COM_interface IDirectXVideoProcessor IDirectXVideoProcessor;
+
+#undef INTERFACE
+#define INTERFACE IDirectXVideoProcessor
+DECLARE_INTERFACE_( IDirectXVideoProcessor, IUnknown )
+{
+ STDMETHOD( QueryInterface ) ( THIS_ REFIID, PVOID* ) PURE;
+ STDMETHOD_( ULONG, AddRef ) ( THIS ) PURE;
+ STDMETHOD_( ULONG, Release ) ( THIS ) PURE;
+ STDMETHOD( GetVideoProcessorService ) ( THIS_ IDirectXVideoProcessorService** ) PURE;
+ STDMETHOD( GetCreationParameters ) ( THIS_ GUID*, DXVA2_VideoDesc*, D3DFORMAT*, UINT* ) PURE;
+ STDMETHOD( GetVideoProcessorCaps ) ( THIS_ DXVA2_VideoProcessorCaps* ) PURE;
+ STDMETHOD( GetProcAmpRange ) ( THIS_ UINT, DXVA2_ValueRange* ) PURE;
+ STDMETHOD( GetFilterPropertyRange ) ( THIS_ UINT, DXVA2_ValueRange* ) PURE;
+ STDMETHOD( VideoProcessBlt ) ( THIS_ IDirect3DSurface9*, DXVA2_VideoProcessBltParams*, DXVA2_VideoSample*, UINT, HANDLE* ) PURE;
+};
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectXVideoProcessor_QueryInterface( p, a, b ) (p)->lpVtbl->QueryInterface( p, a, b )
+#define IDirectXVideoProcessor_AddRef( p ) (p)->lpVtbl->AddRef( p )
+#define IDirectXVideoProcessor_Release( p ) (p)->lpVtbl->Release( p )
+#define IDirectXVideoProcessor_GetVideoProcessorService( p, a ) (p)->lpVtbl->GetVideoProcessorService( p, a )
+#define IDirectXVideoProcessor_GetCreationParameters( p, a, b, c, d ) (p)->lpVtbl->GetCreationParameters( p, a, b, c, d )
+#define IDirectXVideoProcessor_GetVideoProcessorCaps( p, a ) (p)->lpVtbl->GetVideoProcessorCaps( p, a )
+#define IDirectXVideoProcessor_GetProcAmpRange( p, a, b ) (p)->lpVtbl->GetProcAmpRange( p, a, b )
+#define IDirectXVideoProcessor_GetFilterPropertyRange( p, a, b ) (p)->lpVtbl->GetFilterPropertyRange( p, a, b )
+#define IDirectXVideoProcessor_VideoProcessBlt( p, a, b, c, d, e ) (p)->lpVtbl->VideoProcessBlt( p, a, b, c, d, e )
+#else
+#define IDirectXVideoProcessor_QueryInterface( p, a, b ) (p)->QueryInterface( a, b )
+#define IDirectXVideoProcessor_AddRef( p ) (p)->AddRef()
+#define IDirectXVideoProcessor_Release( p ) (p)->Release()
+#define IDirectXVideoProcessor_GetVideoProcessorService( p, a ) (p)->GetVideoProcessorService( a )
+#define IDirectXVideoProcessor_GetCreationParameters( p, a, b, c, d ) (p)->GetCreationParameters( a, b, c, d )
+#define IDirectXVideoProcessor_GetVideoProcessorCaps( p, a ) (p)->GetVideoProcessorCaps( a )
+#define IDirectXVideoProcessor_GetProcAmpRange( p, a, b ) (p)->GetProcAmpRange( a, b )
+#define IDirectXVideoProcessor_GetFilterPropertyRange( p, a, b ) (p)->GetFilterPropertyRange( a, b )
+#define IDirectXVideoProcessor_VideoProcessBlt( p, a, b, c, d, e ) (p)->VideoProcessBlt( a, b, c, d, e )
+#endif
+
+
+#undef INTERFACE
+#define INTERFACE IDirectXVideoProcessorService
+DECLARE_INTERFACE_( IDirectXVideoProcessorService, IDirectXVideoAccelerationService )
+{
+ STDMETHOD( QueryInterface ) ( THIS_ REFIID, PVOID* ) PURE;
+ STDMETHOD_( ULONG, AddRef ) ( THIS ) PURE;
+ STDMETHOD_( ULONG, Release ) ( THIS ) PURE;
+ STDMETHOD( CreateSurface ) ( THIS_ UINT, UINT, UINT, D3DFORMAT, D3DPOOL, DWORD, DWORD, IDirect3DSurface9**, HANDLE* ) PURE;
+ STDMETHOD( RegisterVideoProcessorSoftwareDevice ) ( THIS_ void* ) PURE;
+ STDMETHOD( GetVideoProcessorDeviceGuids ) ( THIS_ DXVA2_VideoDesc*, UINT, GUID** ) PURE;
+ STDMETHOD( GetVideoProcessorRenderTargets ) ( THIS_ REFGUID, DXVA2_VideoDesc*, UINT*, D3DFORMAT** ) PURE;
+ STDMETHOD( GetVideoProcessorSubStreamFormats ) ( THIS_ REFGUID, DXVA2_VideoDesc*, D3DFORMAT, UINT*, D3DFORMAT** ) PURE;
+ STDMETHOD( GetVideoProcessorCaps ) ( THIS_ REFGUID, DXVA2_VideoDesc*, D3DFORMAT, DXVA2_VideoProcessorCaps* ) PURE;
+ STDMETHOD( GetProcAmpRange ) ( THIS_ REFGUID, DXVA2_VideoDesc*, D3DFORMAT, UINT, DXVA2_ValueRange* ) PURE;
+ STDMETHOD( GetFilterPropertyRange ) ( THIS_ REFGUID, DXVA2_VideoDesc*, D3DFORMAT, UINT, DXVA2_ValueRange* ) PURE;
+ STDMETHOD( CreateVideoProcessor ) ( THIS_ REFGUID, DXVA2_VideoDesc*, D3DFORMAT, UINT, IDirectXVideoProcessor** ) PURE;
+};
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectXVideoProcessorService_QueryInterface( p, a, b ) (p)->lpVtbl->QueryInterface( p, a, b )
+#define IDirectXVideoProcessorService_AddRef( p ) (p)->lpVtbl->AddRef( p )
+#define IDirectXVideoProcessorService_Release( p ) (p)->lpVtbl->Release( p )
+#define IDirectXVideoProcessorService_CreateSurface( p, a, b, c, d, e, f, g, h, i ) (p)->lpVtbl->CreateSurface( p, a, b, c, d, e, f, g, h, i )
+#define IDirectXVideoProcessorService_RegisterVideoProcessorSoftwareDevice( p, a ) (p)->lpVtbl->RegisterVideoProcessorSoftwareDevice( p, a )
+#define IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids( p, a, b, c ) (p)->lpVtbl->GetVideoProcessorDeviceGuids( p, a, b, c )
+#define IDirectXVideoProcessorService_GetVideoProcessorRenderTargets( p, a, b, c, d ) (p)->lpVtbl->GetVideoProcessorRenderTargets( p, a, b, c, d )
+#define IDirectXVideoProcessorService_GetVideoProcessorSubStreamFormats( p, a, b, c, d, e ) (p)->lpVtbl->GetVideoProcessorSubStreamFormats( p, a, b, c, d, e )
+#define IDirectXVideoProcessorService_GetVideoProcessorCaps( p, a, b, c, d ) (p)->lpVtbl->GetVideoProcessorCaps( p, a, b, c, d )
+#define IDirectXVideoProcessorService_GetProcAmpRange( p, a, b, c, d, e ) (p)->lpVtbl->GetProcAmpRange( p, a, b, c, d, e )
+#define IDirectXVideoProcessorService_GetFilterPropertyRange( p, a, b, c, d, e ) (p)->lpVtbl->GetFilterPropertyRange( p, a, b, c, d, e )
+#define IDirectXVideoProcessorService_CreateVideoProcessor( p, a, b, c, d, e ) (p)->lpVtbl->CreateVideoProcessor( p, a, b, c, d, e )
+#else
+#define IDirectXVideoProcessorService_QueryInterface( p, a, b ) (p)->QueryInterface( a, b )
+#define IDirectXVideoProcessorService_AddRef( p ) (p)->AddRef()
+#define IDirectXVideoProcessorService_Release( p ) (p)->Release()
+#define IDirectXVideoProcessorService_CreateSurface( p, a, b, c, d, e, f, g, h, i ) (p)->CreateSurface( a, b, c, d, e, f, g, h, i )
+#define IDirectXVideoProcessorService_RegisterVideoProcessorSoftwareDevice( p, a ) (p)->RegisterVideoProcessorSoftwareDevice( a )
+#define IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids( p, a, b, c ) (p)->GetVideoProcessorDeviceGuids( a, b, c )
+#define IDirectXVideoProcessorService_GetVideoProcessorRenderTargets( p, a, b, c, d ) (p)->GetVideoProcessorRenderTargets( a, b, c, d )
+#define IDirectXVideoProcessorService_GetVideoProcessorSubStreamFormats( p, a, b, c, d, e ) (p)->GetVideoProcessorSubStreamFormats( a, b, c, d, e )
+#define IDirectXVideoProcessorService_GetVideoProcessorCaps( p, a, b, c, d ) (p)->GetVideoProcessorCaps( a, b, c, d )
+#define IDirectXVideoProcessorService_GetProcAmpRange( p, a, b, c, d, e ) (p)->GetProcAmpRange( a, b, c, d, e )
+#define IDirectXVideoProcessorService_GetFilterPropertyRange( p, a, b, c, d, e ) (p)->GetFilterPropertyRange( a, b, c, d, e )
+#define IDirectXVideoProcessorService_CreateVideoProcessor( p, a, b, c, d, e ) (p)->CreateVideoProcessor( a, b, c, d, e )
+#endif
+
+
+/*****************************************************************************************************
+************************DXVA Video Processor********************************************************
+*******************************************************************************************************/
+
+
+
+/*#undef INTERFACE
+#define INTERFACE IDirectXVideoService
+DECLARE_INTERFACE_(IDirectXVideoService,IUnknown)
+{
+ STDMETHOD(DXVA2CreateVideoService)(IDirect3DDevice9*, REFIID, void**) PURE;
+};
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectXVideoService_DXVA2CreateVideoService(a,b,c) DXVA2CreateVideoService(a,b,c)
+#else
+#define IDirectXVideoService_DXVA2CreateVideoService(a,b,c) DXVA2CreateVideoService(a,b,c)
+#endif*/
+
+
+#ifdef __cplusplus
+};
+#endif
+
+#ifdef __cplusplus
+extern "C" HRESULT WINAPI DXVA2CreateVideoService( IDirect3DDevice9 *,
+ REFIID riid,
+ void **ppService );
+#else
+extern HRESULT WINAPI DXVA2CreateVideoService( IDirect3DDevice9 *,
+ REFIID riid,
+ void **ppService );
+#endif
+
+typedef
+enum _DXVA2_VideoChromaSubSampling
+{ DXVA2_VideoChromaSubsamplingMask = 0xf,
+ DXVA2_VideoChromaSubsampling_Unknown = 0,
+ DXVA2_VideoChromaSubsampling_ProgressiveChroma = 0x8,
+ DXVA2_VideoChromaSubsampling_Horizontally_Cosited = 0x4,
+ DXVA2_VideoChromaSubsampling_Vertically_Cosited = 0x2,
+ DXVA2_VideoChromaSubsampling_Vertically_AlignedChromaPlanes = 0x1,
+ DXVA2_VideoChromaSubsampling_MPEG2 = ( DXVA2_VideoChromaSubsampling_Horizontally_Cosited | DXVA2_VideoChromaSubsampling_Vertically_AlignedChromaPlanes ),
+ DXVA2_VideoChromaSubsampling_MPEG1 = DXVA2_VideoChromaSubsampling_Vertically_AlignedChromaPlanes,
+ DXVA2_VideoChromaSubsampling_DV_PAL = ( DXVA2_VideoChromaSubsampling_Horizontally_Cosited | DXVA2_VideoChromaSubsampling_Vertically_Cosited ),
+ DXVA2_VideoChromaSubsampling_Cosited = ( ( DXVA2_VideoChromaSubsampling_Horizontally_Cosited | DXVA2_VideoChromaSubsampling_Vertically_Cosited ) | DXVA2_VideoChromaSubsampling_Vertically_AlignedChromaPlanes )} DXVA2_VideoChromaSubSampling;
+
+typedef
+enum _DXVA2_NominalRange
+{ DXVA2_NominalRangeMask = 0x7,
+ DXVA2_NominalRange_Unknown = 0,
+ DXVA2_NominalRange_Normal = 1,
+ DXVA2_NominalRange_Wide = 2,
+ DXVA2_NominalRange_0_255 = 1,
+ DXVA2_NominalRange_16_235 = 2,
+ DXVA2_NominalRange_48_208 = 3} DXVA2_NominalRange;
+
+typedef
+enum _DXVA2_VideoLighting
+{ DXVA2_VideoLightingMask = 0xf,
+ DXVA2_VideoLighting_Unknown = 0,
+ DXVA2_VideoLighting_bright = 1,
+ DXVA2_VideoLighting_office = 2,
+ DXVA2_VideoLighting_dim = 3,
+ DXVA2_VideoLighting_dark = 4} DXVA2_VideoLighting;
+
+typedef
+enum _DXVA2_VideoPrimaries
+{ DXVA2_VideoPrimariesMask = 0x1f,
+ DXVA2_VideoPrimaries_Unknown = 0,
+ DXVA2_VideoPrimaries_reserved = 1,
+ DXVA2_VideoPrimaries_BT709 = 2,
+ DXVA2_VideoPrimaries_BT470_2_SysM = 3,
+ DXVA2_VideoPrimaries_BT470_2_SysBG = 4,
+ DXVA2_VideoPrimaries_SMPTE170M = 5,
+ DXVA2_VideoPrimaries_SMPTE240M = 6,
+ DXVA2_VideoPrimaries_EBU3213 = 7,
+ DXVA2_VideoPrimaries_SMPTE_C = 8} DXVA2_VideoPrimaries;
+
+typedef
+enum _DXVA2_VideoTransferFunction
+{ DXVA2_VideoTransFuncMask = 0x1f,
+ DXVA2_VideoTransFunc_Unknown = 0,
+ DXVA2_VideoTransFunc_10 = 1,
+ DXVA2_VideoTransFunc_18 = 2,
+ DXVA2_VideoTransFunc_20 = 3,
+ DXVA2_VideoTransFunc_22 = 4,
+ DXVA2_VideoTransFunc_709 = 5,
+ DXVA2_VideoTransFunc_240M = 6,
+ DXVA2_VideoTransFunc_sRGB = 7,
+ DXVA2_VideoTransFunc_28 = 8} DXVA2_VideoTransferFunction;
+
+typedef
+enum _DXVA2_SampleFormat
+{ DXVA2_SampleFormatMask = 0xff,
+ DXVA2_SampleUnknown = 0,
+ DXVA2_SampleProgressiveFrame = 2,
+ DXVA2_SampleFieldInterleavedEvenFirst = 3,
+ DXVA2_SampleFieldInterleavedOddFirst = 4,
+ DXVA2_SampleFieldSingleEven = 5,
+ DXVA2_SampleFieldSingleOdd = 6,
+ DXVA2_SampleSubStream = 7} DXVA2_SampleFormat;
+
+typedef
+enum _DXVA2_VideoTransferMatrix
+{ DXVA2_VideoTransferMatrixMask = 0x7,
+ DXVA2_VideoTransferMatrix_Unknown = 0,
+ DXVA2_VideoTransferMatrix_BT709 = 1,
+ DXVA2_VideoTransferMatrix_BT601 = 2,
+ DXVA2_VideoTransferMatrix_SMPTE240M = 3} DXVA2_VideoTransferMatrix;
+
+enum __MIDL___MIDL_itf_dxva2api_0000_0000_0004
+{ DXVA2_NoiseFilterLumaLevel = 1,
+ DXVA2_NoiseFilterLumaThreshold = 2,
+ DXVA2_NoiseFilterLumaRadius = 3,
+ DXVA2_NoiseFilterChromaLevel = 4,
+ DXVA2_NoiseFilterChromaThreshold = 5,
+ DXVA2_NoiseFilterChromaRadius = 6,
+ DXVA2_DetailFilterLumaLevel = 7,
+ DXVA2_DetailFilterLumaThreshold = 8,
+ DXVA2_DetailFilterLumaRadius = 9,
+ DXVA2_DetailFilterChromaLevel = 10,
+ DXVA2_DetailFilterChromaThreshold = 11,
+ DXVA2_DetailFilterChromaRadius = 12};
+
+enum __MIDL___MIDL_itf_dxva2api_0000_0000_0008
+{ DXVA2_VideoProcess_None = 0,
+ DXVA2_VideoProcess_YUV2RGB = 0x1,
+ DXVA2_VideoProcess_StretchX = 0x2,
+ DXVA2_VideoProcess_StretchY = 0x4,
+ DXVA2_VideoProcess_AlphaBlend = 0x8,
+ DXVA2_VideoProcess_SubRects = 0x10,
+ DXVA2_VideoProcess_SubStreams = 0x20,
+ DXVA2_VideoProcess_SubStreamsExtended = 0x40,
+ DXVA2_VideoProcess_YUV2RGBExtended = 0x80,
+ DXVA2_VideoProcess_AlphaBlendExtended = 0x100,
+ DXVA2_VideoProcess_Constriction = 0x200,
+ DXVA2_VideoProcess_NoiseFilter = 0x400,
+ DXVA2_VideoProcess_DetailFilter = 0x800,
+ DXVA2_VideoProcess_PlanarAlpha = 0x1000,
+ DXVA2_VideoProcess_LinearScaling = 0x2000,
+ DXVA2_VideoProcess_GammaCompensated = 0x4000,
+ DXVA2_VideoProcess_MaintainsOriginalFieldData = 0x8000,
+ DXVA2_VideoProcess_Mask = 0xffff};
+
+
+
+__inline float hb_dx_fixedtofloat( const DXVA2_Fixed32 _fixed_ );
+
+__inline const DXVA2_Fixed32 hb_dx_fixed32_opaque_alpha();
+
+__inline DXVA2_Fixed32 hb_dx_floattofixed( const float _float_ );
+#endif
+#endif //_DXVA2API_H

HandBrake-0.9.9.tar.bz2/libhb/eedi2.c -> HandBrake-0.10.0.tar.bz2/libhb/eedi2.c Changed

HandBrake-0.9.9.tar.bz2/libhb/eedi2.h -> HandBrake-0.10.0.tar.bz2/libhb/eedi2.h Changed

HandBrake-0.10.0.tar.bz2/libhb/enc_qsv.c Added

@@ -0,0 +1,1850 @@
+/* ********************************************************************* *\
+
+Copyright (C) 2013 Intel Corporation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+- Neither the name of Intel Corporation nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+\* ********************************************************************* */
+
+#ifdef USE_QSV
+
+#include "hb.h"
+#include "nal_units.h"
+#include "qsv_common.h"
+#include "qsv_memory.h"
+#include "h264_common.h"
+
+/*
+ * The frame info struct remembers information about each frame across calls to
+ * the encoder. Since frames are uniquely identified by their timestamp, we use
+ * some bits of the timestamp as an index. The LSB is chosen so that two
+ * successive frames will have different values in the bits over any plausible
+ * range of frame rates (starting with bit 8 allows any frame rate slower than
+ * 352fps). The MSB determines the size of the array. It is chosen so that two
+ * frames can't use the same slot during the encoder's max frame delay so that,
+ * up to some minimum frame rate, frames are guaranteed to map to different
+ * slots (an MSB of 17 which is 2^(17-8+1) = 1024 slots guarantees no collisions
+ * down to a rate of 0.7 fps).
+ */
+#define FRAME_INFO_MAX2 (8) // 2^8 = 256; 90000/256 = 352 frames/sec
+#define FRAME_INFO_MIN2 (17) // 2^17 = 128K; 90000/131072 = 0.7 frames/sec
+#define FRAME_INFO_SIZE (1 << (FRAME_INFO_MIN2 - FRAME_INFO_MAX2 + 1))
+#define FRAME_INFO_MASK (FRAME_INFO_SIZE - 1)
+
+int encqsvInit (hb_work_object_t*, hb_job_t*);
+int encqsvWork (hb_work_object_t*, hb_buffer_t**, hb_buffer_t**);
+void encqsvClose(hb_work_object_t*);
+
+hb_work_object_t hb_encqsv =
+{
+ WORK_ENCQSV,
+ "H.264/AVC encoder (Intel QSV)",
+ encqsvInit,
+ encqsvWork,
+ encqsvClose
+};
+
+struct hb_work_private_s
+{
+ hb_job_t *job;
+ uint32_t frames_in;
+ uint32_t frames_out;
+ int64_t last_start;
+
+ hb_qsv_param_t param;
+ av_qsv_space enc_space;
+ hb_qsv_info_t *qsv_info;
+
+ hb_list_t *delayed_chapters;
+ int64_t next_chapter_pts;
+
+#define BFRM_DELAY_MAX 16
+ uint32_t *init_delay;
+ int bfrm_delay;
+ int64_t init_pts[BFRM_DELAY_MAX + 1];
+ hb_list_t *list_dts;
+
+ int64_t frame_duration[FRAME_INFO_SIZE];
+
+ int async_depth;
+ int max_async_depth;
+
+ // if encode-only, system memory used
+ int is_sys_mem;
+ mfxSession mfx_session;
+ struct SwsContext *sws_context_to_nv12;
+
+ // whether to expect input from VPP or from QSV decode
+ int is_vpp_present;
+
+ // whether the encoder is initialized
+ int init_done;
+
+ hb_list_t *delayed_processing;
+ hb_list_t *encoded_frames;
+};
+
+// used in delayed_chapters list
+struct chapter_s
+{
+ int index;
+ int64_t start;
+};
+
+static void hb_qsv_add_new_dts(hb_list_t *list, int64_t new_dts)
+{
+ if (list != NULL)
+ {
+ int64_t *item = malloc(sizeof(int64_t));
+ if (item != NULL)
+ {
+ *item = new_dts;
+ hb_list_add(list, item);
+ }
+ }
+}
+
+static int64_t hb_qsv_pop_next_dts(hb_list_t *list)
+{
+ int64_t next_dts = INT64_MIN;
+ if (list != NULL && hb_list_count(list) > 0)
+ {
+ int64_t *item = hb_list_item(list, 0);
+ if (item != NULL)
+ {
+ next_dts = *item;
+ hb_list_rem(list, item);
+ free(item);
+ }
+ }
+ return next_dts;
+}
+
+static void save_frame_duration(hb_work_private_t *pv, hb_buffer_t *buf)
+{
+ int i = (buf->s.start >> FRAME_INFO_MAX2) & FRAME_INFO_MASK;
+ pv->frame_duration[i] = buf->s.stop - buf->s.start;
+}
+
+static int64_t get_frame_duration(hb_work_private_t *pv, hb_buffer_t *buf)
+{
+ int i = (buf->s.start >> FRAME_INFO_MAX2) & FRAME_INFO_MASK;
+ return pv->frame_duration[i];
+}
+
+static const char* qsv_h264_profile_xlat(int profile)
+{
+ switch (profile)
+ {
+ case MFX_PROFILE_AVC_CONSTRAINED_BASELINE:
+ return "Constrained Baseline";
+ case MFX_PROFILE_AVC_BASELINE:
+ return "Baseline";
+ case MFX_PROFILE_AVC_EXTENDED:
+ return "Extended";
+ case MFX_PROFILE_AVC_MAIN:
+ return "Main";
+ case MFX_PROFILE_AVC_CONSTRAINED_HIGH:
+ return "Constrained High";
+ case MFX_PROFILE_AVC_PROGRESSIVE_HIGH:
+ return "Progressive High";
+ case MFX_PROFILE_AVC_HIGH:
+ return "High";
+ case MFX_PROFILE_UNKNOWN:
+ default:
+ return NULL;
+ }
+}
+
+static const char* qsv_h264_level_xlat(int level)
+{
+ int i;
+ for (i = 0; hb_h264_level_names[i] != NULL; i++)
+ {
+ if (hb_h264_level_values[i] == level)
+ {
+ return hb_h264_level_names[i];
+ }
+ }
+ return NULL;
+}
+
+int qsv_enc_init(hb_work_private_t *pv)
+{
+ av_qsv_context *qsv = pv->job->qsv.ctx;
+ hb_job_t *job = pv->job;
+ mfxStatus sts;
+ int i;
+
+ if (pv->init_done)
+ {
+ return 0;
+ }
+
+ if (qsv == NULL)
+ {
+ if (!pv->is_sys_mem)
+ {
+ hb_error("qsv_enc_init: decode enabled but no context!");
+ return 3;
+ }
+ job->qsv.ctx = qsv = av_mallocz(sizeof(av_qsv_context));
+ }
+
+ av_qsv_space *qsv_encode = qsv->enc_space;
+ if (qsv_encode == NULL)
+ {
+ // if only for encode
+ if (pv->is_sys_mem)
+ {
+ // no need to use additional sync as encode only -> single thread
+ av_qsv_add_context_usage(qsv, 0);
+
+ // re-use the session from encqsvInit
+ qsv->mfx_session = pv->mfx_session;
+ }
+ qsv->enc_space = qsv_encode = &pv->enc_space;
+ }
+
+ if (!pv->is_sys_mem)
+ {
+ if (!pv->is_vpp_present && job->list_filter != NULL)
+ {
+ for (i = 0; i < hb_list_count(job->list_filter); i++)
+ {
+ hb_filter_object_t *filter = hb_list_item(job->list_filter, i);
+ if (filter->id == HB_FILTER_QSV_PRE ||
+ filter->id == HB_FILTER_QSV_POST ||
+ filter->id == HB_FILTER_QSV)
+ {
+ pv->is_vpp_present = 1;
+ break;
+ }
+ }
+ }
+
+ if (pv->is_vpp_present)
+ {
+ if (qsv->vpp_space == NULL)
+ {
+ return 2;
+ }
+ for (i = 0; i < av_qsv_list_count(qsv->vpp_space); i++)
+ {
+ av_qsv_space *vpp = av_qsv_list_item(qsv->vpp_space, i);
+ if (!vpp->is_init_done)
+ {
+ return 2;
+ }
+ }
+ }
+
+ av_qsv_space *dec_space = qsv->dec_space;
+ if (dec_space == NULL || !dec_space->is_init_done)
+ {
+ return 2;
+ }
+ }
+ else
+ {
+ pv->sws_context_to_nv12 = hb_sws_get_context(job->width, job->height,
+ AV_PIX_FMT_YUV420P,
+ job->width, job->height,
+ AV_PIX_FMT_NV12,
+ SWS_LANCZOS|SWS_ACCURATE_RND);
+ }
+
+ // allocate tasks
+ qsv_encode->p_buf_max_size = AV_QSV_BUF_SIZE_DEFAULT;
+ qsv_encode->tasks = av_qsv_list_init(HAVE_THREADS);
+ for (i = 0; i < pv->max_async_depth; i++)
+ {
+ av_qsv_task *task = av_mallocz(sizeof(av_qsv_task));
+ task->bs = av_mallocz(sizeof(mfxBitstream));
+ task->bs->Data = av_mallocz(sizeof(uint8_t) * qsv_encode->p_buf_max_size);
+ task->bs->MaxLength = qsv_encode->p_buf_max_size;
+ task->bs->DataLength = 0;
+ task->bs->DataOffset = 0;
+ av_qsv_list_add(qsv_encode->tasks, task);
+ }
+
+ // setup surface allocation
+ pv->param.videoParam->IOPattern = (pv->is_sys_mem ?
+ MFX_IOPATTERN_IN_SYSTEM_MEMORY :
+ MFX_IOPATTERN_IN_OPAQUE_MEMORY);
+ memset(&qsv_encode->request, 0, sizeof(mfxFrameAllocRequest) * 2);
+ sts = MFXVideoENCODE_QueryIOSurf(qsv->mfx_session,
+ pv->param.videoParam,
+ &qsv_encode->request[0]);
+ if (sts < MFX_ERR_NONE) // ignore warnings
+ {
+ hb_error("qsv_enc_init: MFXVideoENCODE_QueryIOSurf failed (%d)", sts);
+ *job->done_error = HB_ERROR_INIT;
+ *job->die = 1;
+ return -1;
+ }
+
+ // allocate surfaces
+ if (pv->is_sys_mem)
+ {
+ qsv_encode->surface_num = FFMIN(qsv_encode->request[0].NumFrameSuggested +
+ pv->max_async_depth, AV_QSV_SURFACE_NUM);
+ if (qsv_encode->surface_num <= 0)
+ {
+ qsv_encode->surface_num = AV_QSV_SURFACE_NUM;
+ }
+ for (i = 0; i < qsv_encode->surface_num; i++)
+ {
+ mfxFrameSurface1 *surface = av_mallocz(sizeof(mfxFrameSurface1));
+ mfxFrameInfo info = pv->param.videoParam->mfx.FrameInfo;
+ surface->Info = info;
+ surface->Data.Pitch = info.Width;
+ surface->Data.Y = av_mallocz(info.Width * info.Height);
+ surface->Data.VU = av_mallocz(info.Width * info.Height / 2);
+ qsv_encode->p_surfaces[i] = surface;
+ }
+ }
+ else
+ {
+ av_qsv_space *in_space = qsv->dec_space;
+ if (pv->is_vpp_present)
+ {
+ // we get our input from VPP instead
+ in_space = av_qsv_list_item(qsv->vpp_space,
+ av_qsv_list_count(qsv->vpp_space) - 1);
+ }
+ // introduced in API 1.3
+ memset(&qsv_encode->ext_opaque_alloc, 0, sizeof(mfxExtOpaqueSurfaceAlloc));
+ qsv_encode->ext_opaque_alloc.Header.BufferId = MFX_EXTBUFF_OPAQUE_SURFACE_ALLOCATION;
+ qsv_encode->ext_opaque_alloc.Header.BufferSz = sizeof(mfxExtOpaqueSurfaceAlloc);
+ qsv_encode->ext_opaque_alloc.In.Surfaces = in_space->p_surfaces;
+ qsv_encode->ext_opaque_alloc.In.NumSurface = in_space->surface_num;
+ qsv_encode->ext_opaque_alloc.In.Type = qsv_encode->request[0].Type;
+ pv->param.videoParam->ExtParam[pv->param.videoParam->NumExtParam++] = (mfxExtBuffer*)&qsv_encode->ext_opaque_alloc;
+ }
+
+ // allocate sync points
+ qsv_encode->sync_num = (qsv_encode->surface_num ?
+ FFMIN(qsv_encode->surface_num, AV_QSV_SYNC_NUM) :
+ AV_QSV_SYNC_NUM);
+ for (i = 0; i < qsv_encode->sync_num; i++)
+ {
+ qsv_encode->p_syncp[i] = av_mallocz(sizeof(av_qsv_sync));
+ AV_QSV_CHECK_POINTER(qsv_encode->p_syncp[i], MFX_ERR_MEMORY_ALLOC);
+ qsv_encode->p_syncp[i]->p_sync = av_mallocz(sizeof(mfxSyncPoint));
+ AV_QSV_CHECK_POINTER(qsv_encode->p_syncp[i]->p_sync, MFX_ERR_MEMORY_ALLOC);
+ }
+
+ // initialize the encoder
+ sts = MFXVideoENCODE_Init(qsv->mfx_session, pv->param.videoParam);
+ if (sts < MFX_ERR_NONE) // ignore warnings
+ {
+ hb_error("qsv_enc_init: MFXVideoENCODE_Init failed (%d)", sts);
+ *job->done_error = HB_ERROR_INIT;
+ *job->die = 1;
+ return -1;
+ }
+ qsv_encode->is_init_done = 1;
+
+ mfxIMPL impl;
+ mfxVersion version;
+ // log actual implementation details now that we know them
+ if ((MFXQueryIMPL (qsv->mfx_session, &impl) == MFX_ERR_NONE) &&
+ (MFXQueryVersion(qsv->mfx_session, &version) == MFX_ERR_NONE))
+ {
+ hb_log("qsv_enc_init: using '%s' implementation, API: %"PRIu16".%"PRIu16"",
+ hb_qsv_impl_get_name(impl), version.Major, version.Minor);
+ }
+ else
+ {
+ hb_log("qsv_enc_init: MFXQueryIMPL/MFXQueryVersion failure");
+ }
+
+ pv->init_done = 1;
+ return 0;
+}
+
+/***********************************************************************
+ * encqsvInit
+ ***********************************************************************
+ *
+ **********************************************************************/
+int encqsvInit(hb_work_object_t *w, hb_job_t *job)
+{
+ hb_work_private_t *pv = calloc(1, sizeof(hb_work_private_t));
+ w->private_data = pv;
+
+ pv->job = job;
+ pv->is_sys_mem = hb_qsv_decode_is_enabled(job) == 0;
+ pv->qsv_info = hb_qsv_info_get(job->vcodec);
+ pv->delayed_processing = hb_list_init();
+ pv->encoded_frames = hb_list_init();
+ pv->last_start = INT64_MIN;
+
+ pv->next_chapter_pts = AV_NOPTS_VALUE;
+ pv->delayed_chapters = hb_list_init();
+
+ // default encoding parameters
+ if (hb_qsv_param_default_preset(&pv->param, &pv->enc_space.m_mfxVideoParam,
+ pv->qsv_info, job->encoder_preset))
+ {
+ hb_error("encqsvInit: hb_qsv_param_default_preset failed");
+ return -1;
+ }
+
+ // set AsyncDepth to match that of decode and VPP
+ pv->param.videoParam->AsyncDepth = job->qsv.async_depth;
+
+ // enable and set colorimetry (video signal information)
+ pv->param.videoSignalInfo.ColourDescriptionPresent = 1;
+ switch (job->color_matrix_code)
+ {
+ case 4:
+ // custom
+ pv->param.videoSignalInfo.ColourPrimaries = job->color_prim;
+ pv->param.videoSignalInfo.TransferCharacteristics = job->color_transfer;
+ pv->param.videoSignalInfo.MatrixCoefficients = job->color_matrix;
+ break;
+ case 3:
+ // ITU BT.709 HD content
+ pv->param.videoSignalInfo.ColourPrimaries = HB_COLR_PRI_BT709;
+ pv->param.videoSignalInfo.TransferCharacteristics = HB_COLR_TRA_BT709;
+ pv->param.videoSignalInfo.MatrixCoefficients = HB_COLR_MAT_BT709;
+ break;
+ case 2:
+ // ITU BT.601 DVD or SD TV content (PAL)
+ pv->param.videoSignalInfo.ColourPrimaries = HB_COLR_PRI_EBUTECH;
+ pv->param.videoSignalInfo.TransferCharacteristics = HB_COLR_TRA_BT709;
+ pv->param.videoSignalInfo.MatrixCoefficients = HB_COLR_MAT_SMPTE170M;
+ break;
+ case 1:
+ // ITU BT.601 DVD or SD TV content (NTSC)
+ pv->param.videoSignalInfo.ColourPrimaries = HB_COLR_PRI_SMPTEC;
+ pv->param.videoSignalInfo.TransferCharacteristics = HB_COLR_TRA_BT709;
+ pv->param.videoSignalInfo.MatrixCoefficients = HB_COLR_MAT_SMPTE170M;
+ break;
+ default:
+ // detected during scan
+ pv->param.videoSignalInfo.ColourPrimaries = job->title->color_prim;
+ pv->param.videoSignalInfo.TransferCharacteristics = job->title->color_transfer;
+ pv->param.videoSignalInfo.MatrixCoefficients = job->title->color_matrix;
+ break;
+ }
+
+ // parse user-specified encoder options, if present
+ if (job->encoder_options != NULL && *job->encoder_options)
+ {
+ hb_dict_t *options_list;
+ hb_dict_entry_t *option = NULL;
+ options_list = hb_encopts_to_dict(job->encoder_options, job->vcodec);
+ while ((option = hb_dict_next(options_list, option)) != NULL)
+ {
+ switch (hb_qsv_param_parse(&pv->param, pv->qsv_info,
+ option->key, option->value))
+ {
+ case HB_QSV_PARAM_OK:
+ break;
+
+ case HB_QSV_PARAM_BAD_NAME:
+ hb_log("encqsvInit: hb_qsv_param_parse: bad key %s",
+ option->key);
+ break;
+ case HB_QSV_PARAM_BAD_VALUE:
+ hb_log("encqsvInit: hb_qsv_param_parse: bad value %s for key %s",
+ option->value, option->key);
+ break;
+ case HB_QSV_PARAM_UNSUPPORTED:
+ hb_log("encqsvInit: hb_qsv_param_parse: unsupported option %s",
+ option->key);
+ break;
+
+ case HB_QSV_PARAM_ERROR:
+ default:
+ hb_log("encqsvInit: hb_qsv_param_parse: unknown error");
+ break;
+ }
+ }
+ hb_dict_free(&options_list);
+ }
+
+ // reload colorimetry in case values were set in encoder_options
+ if (pv->param.videoSignalInfo.ColourDescriptionPresent)
+ {
+ job->color_matrix_code = 4;
+ job->color_prim = pv->param.videoSignalInfo.ColourPrimaries;
+ job->color_transfer = pv->param.videoSignalInfo.TransferCharacteristics;
+ job->color_matrix = pv->param.videoSignalInfo.MatrixCoefficients;
+ }
+ else
+ {
+ job->color_matrix_code = 0;
+ job->color_prim = HB_COLR_PRI_UNDEF;
+ job->color_transfer = HB_COLR_TRA_UNDEF;
+ job->color_matrix = HB_COLR_MAT_UNDEF;
+ }
+
+ // sanitize values that may exceed the Media SDK variable size
+ int64_t vrate, vrate_base;
+ int64_t par_width, par_height;
+ hb_limit_rational64(&vrate, &vrate_base,
+ job->vrate, job->vrate_base, UINT32_MAX);
+ hb_limit_rational64(&par_width, &par_height,
+ job->anamorphic.par_width,
+ job->anamorphic.par_height, UINT16_MAX);
+
+ // some encoding parameters are used by filters to configure their output
+ if (pv->param.videoParam->mfx.FrameInfo.PicStruct != MFX_PICSTRUCT_PROGRESSIVE)
+ {
+ job->qsv.enc_info.align_height = AV_QSV_ALIGN32(job->height);
+ }
+ else
+ {
+ job->qsv.enc_info.align_height = AV_QSV_ALIGN16(job->height);
+ }
+ job->qsv.enc_info.align_width = AV_QSV_ALIGN16(job->width);
+ job->qsv.enc_info.pic_struct = pv->param.videoParam->mfx.FrameInfo.PicStruct;
+ job->qsv.enc_info.is_init_done = 1;
+
+ // encode to H.264 and set FrameInfo
+ pv->param.videoParam->mfx.CodecId = MFX_CODEC_AVC;
+ pv->param.videoParam->mfx.CodecLevel = MFX_LEVEL_UNKNOWN;
+ pv->param.videoParam->mfx.CodecProfile = MFX_PROFILE_UNKNOWN;
+ pv->param.videoParam->mfx.FrameInfo.FourCC = MFX_FOURCC_NV12;
+ pv->param.videoParam->mfx.FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
+ pv->param.videoParam->mfx.FrameInfo.FrameRateExtN = vrate;
+ pv->param.videoParam->mfx.FrameInfo.FrameRateExtD = vrate_base;
+ pv->param.videoParam->mfx.FrameInfo.AspectRatioW = par_width;
+ pv->param.videoParam->mfx.FrameInfo.AspectRatioH = par_height;
+ pv->param.videoParam->mfx.FrameInfo.CropX = 0;
+ pv->param.videoParam->mfx.FrameInfo.CropY = 0;
+ pv->param.videoParam->mfx.FrameInfo.CropW = job->width;
+ pv->param.videoParam->mfx.FrameInfo.CropH = job->height;
+ pv->param.videoParam->mfx.FrameInfo.PicStruct = job->qsv.enc_info.pic_struct;
+ pv->param.videoParam->mfx.FrameInfo.Width = job->qsv.enc_info.align_width;
+ pv->param.videoParam->mfx.FrameInfo.Height = job->qsv.enc_info.align_height;
+
+ // set H.264 profile and level
+ if (job->encoder_profile != NULL && *job->encoder_profile &&
+ strcasecmp(job->encoder_profile, "auto"))
+ {
+ if (!strcasecmp(job->encoder_profile, "baseline"))
+ {
+ pv->param.videoParam->mfx.CodecProfile = MFX_PROFILE_AVC_BASELINE;
+ }
+ else if (!strcasecmp(job->encoder_profile, "main"))
+ {
+ pv->param.videoParam->mfx.CodecProfile = MFX_PROFILE_AVC_MAIN;
+ }
+ else if (!strcasecmp(job->encoder_profile, "high"))
+ {
+ pv->param.videoParam->mfx.CodecProfile = MFX_PROFILE_AVC_HIGH;
+ }
+ else
+ {
+ hb_error("encqsvInit: bad profile %s", job->encoder_profile);
+ return -1;
+ }
+ }
+ if (job->encoder_level != NULL && *job->encoder_level &&
+ strcasecmp(job->encoder_level, "auto"))
+ {
+ int err;
+ int i = hb_qsv_atoindex(hb_h264_level_names, job->encoder_level, &err);
+ if (err || i >= (sizeof(hb_h264_level_values) /
+ sizeof(hb_h264_level_values[0])))
+ {
+ hb_error("encqsvInit: bad level %s", job->encoder_level);
+ return -1;
+ }
+ else if (pv->qsv_info->capabilities & HB_QSV_CAP_MSDK_API_1_6)
+ {
+ pv->param.videoParam->mfx.CodecLevel = HB_QSV_CLIP3(MFX_LEVEL_AVC_1,
+ MFX_LEVEL_AVC_52,
+ hb_h264_level_values[i]);
+ }
+ else
+ {
+ // Media SDK API < 1.6, MFX_LEVEL_AVC_52 unsupported
+ pv->param.videoParam->mfx.CodecLevel = HB_QSV_CLIP3(MFX_LEVEL_AVC_1,
+ MFX_LEVEL_AVC_51,
+ hb_h264_level_values[i]);
+ }
+ }
+
+ // interlaced encoding is not always possible
+ if (pv->param.videoParam->mfx.FrameInfo.PicStruct != MFX_PICSTRUCT_PROGRESSIVE)
+ {
+ if (pv->param.videoParam->mfx.CodecProfile == MFX_PROFILE_AVC_CONSTRAINED_BASELINE ||
+ pv->param.videoParam->mfx.CodecProfile == MFX_PROFILE_AVC_BASELINE ||
+ pv->param.videoParam->mfx.CodecProfile == MFX_PROFILE_AVC_PROGRESSIVE_HIGH)
+ {
+ hb_error("encqsvInit: profile %s doesn't support interlaced encoding",
+ qsv_h264_profile_xlat(pv->param.videoParam->mfx.CodecProfile));
+ return -1;
+ }
+ if ((pv->param.videoParam->mfx.CodecLevel >= MFX_LEVEL_AVC_1b &&
+ pv->param.videoParam->mfx.CodecLevel <= MFX_LEVEL_AVC_2) ||
+ (pv->param.videoParam->mfx.CodecLevel >= MFX_LEVEL_AVC_42))
+ {
+ hb_error("encqsvInit: level %s doesn't support interlaced encoding",
+ qsv_h264_level_xlat(pv->param.videoParam->mfx.CodecLevel));
+ return -1;
+ }
+ }
+
+ // sanitize ICQ
+ if (!(pv->qsv_info->capabilities & HB_QSV_CAP_RATECONTROL_ICQ))
+ {
+ // ICQ not supported
+ pv->param.rc.icq = 0;
+ }
+ else
+ {
+ pv->param.rc.icq = !!pv->param.rc.icq;
+ }
+
+ // sanitize lookahead
+ if (!(pv->qsv_info->capabilities & HB_QSV_CAP_RATECONTROL_LA))
+ {
+ // lookahead not supported
+ pv->param.rc.lookahead = 0;
+ }
+ else if ((pv->param.rc.lookahead) &&
+ (pv->qsv_info->capabilities & HB_QSV_CAP_RATECONTROL_LAi) == 0 &&
+ (pv->param.videoParam->mfx.FrameInfo.PicStruct != MFX_PICSTRUCT_PROGRESSIVE))
+ {
+ // lookahead enabled but we can't use it
+ hb_log("encqsvInit: LookAhead not used (LookAhead is progressive-only)");
+ pv->param.rc.lookahead = 0;
+ }
+ else
+ {
+ pv->param.rc.lookahead = !!pv->param.rc.lookahead;
+ }
+
+ // set VBV here (this will be overridden for CQP and ignored for LA)
+ // only set BufferSizeInKB, InitialDelayInKB and MaxKbps if we have
+ // them - otheriwse Media SDK will pick values for us automatically
+ if (pv->param.rc.vbv_buffer_size > 0)
+ {
+ if (pv->param.rc.vbv_buffer_init > 1.0)
+ {
+ pv->param.videoParam->mfx.InitialDelayInKB = (pv->param.rc.vbv_buffer_init / 8);
+ }
+ else if (pv->param.rc.vbv_buffer_init > 0.0)
+ {
+ pv->param.videoParam->mfx.InitialDelayInKB = (pv->param.rc.vbv_buffer_size *
+ pv->param.rc.vbv_buffer_init / 8);
+ }
+ pv->param.videoParam->mfx.BufferSizeInKB = (pv->param.rc.vbv_buffer_size / 8);
+ }
+ if (pv->param.rc.vbv_max_bitrate > 0)
+ {
+ pv->param.videoParam->mfx.MaxKbps = pv->param.rc.vbv_max_bitrate;
+ }
+
+ // set rate control paremeters
+ if (job->vquality >= 0)
+ {
+ if (pv->param.rc.icq)
+ {
+ // introduced in API 1.8
+ if (pv->param.rc.lookahead)
+ {
+ pv->param.videoParam->mfx.RateControlMethod = MFX_RATECONTROL_LA_ICQ;
+ }
+ else
+ {
+ pv->param.videoParam->mfx.RateControlMethod = MFX_RATECONTROL_ICQ;
+ }
+ pv->param.videoParam->mfx.ICQQuality = HB_QSV_CLIP3(1, 51, job->vquality);
+ }
+ else
+ {
+ // introduced in API 1.1
+ pv->param.videoParam->mfx.RateControlMethod = MFX_RATECONTROL_CQP;
+ pv->param.videoParam->mfx.QPI = HB_QSV_CLIP3(0, 51, job->vquality + pv->param.rc.cqp_offsets[0]);
+ pv->param.videoParam->mfx.QPP = HB_QSV_CLIP3(0, 51, job->vquality + pv->param.rc.cqp_offsets[1]);
+ pv->param.videoParam->mfx.QPB = HB_QSV_CLIP3(0, 51, job->vquality + pv->param.rc.cqp_offsets[2]);
+ // CQP + ExtBRC can cause bad output
+ pv->param.codingOption2.ExtBRC = MFX_CODINGOPTION_OFF;
+ }
+ }
+ else if (job->vbitrate > 0)
+ {
+ if (pv->param.rc.lookahead)
+ {
+ // introduced in API 1.7
+ pv->param.videoParam->mfx.RateControlMethod = MFX_RATECONTROL_LA;
+ pv->param.videoParam->mfx.TargetKbps = job->vbitrate;
+ // ignored, but some drivers will change AsyncDepth because of it
+ pv->param.codingOption2.ExtBRC = MFX_CODINGOPTION_OFF;
+ }
+ else
+ {
+ // introduced in API 1.0
+ if (job->vbitrate == pv->param.rc.vbv_max_bitrate)
+ {
+ pv->param.videoParam->mfx.RateControlMethod = MFX_RATECONTROL_CBR;
+ }
+ else
+ {
+ pv->param.videoParam->mfx.RateControlMethod = MFX_RATECONTROL_VBR;
+ }
+ pv->param.videoParam->mfx.TargetKbps = job->vbitrate;
+ }
+ }
+ else
+ {
+ hb_error("encqsvInit: invalid rate control (%d, %d)",
+ job->vquality, job->vbitrate);
+ return -1;
+ }
+
+ // if VBV is enabled but ignored, log it
+ if (pv->param.rc.vbv_max_bitrate > 0 || pv->param.rc.vbv_buffer_size > 0)
+ {
+ switch (pv->param.videoParam->mfx.RateControlMethod)
+ {
+ case MFX_RATECONTROL_LA:
+ case MFX_RATECONTROL_LA_ICQ:
+ hb_log("encqsvInit: LookAhead enabled, ignoring VBV");
+ break;
+ case MFX_RATECONTROL_ICQ:
+ hb_log("encqsvInit: ICQ rate control, ignoring VBV");
+ break;
+ default:
+ break;
+ }
+ }
+
+ // set B-pyramid
+ if (pv->param.gop.b_pyramid < 0)
+ {
+ if (pv->param.videoParam->mfx.RateControlMethod == MFX_RATECONTROL_CQP)
+ {
+ pv->param.gop.b_pyramid = 1;
+ }
+ else
+ {
+ pv->param.gop.b_pyramid = 0;
+ }
+ }
+ pv->param.gop.b_pyramid = !!pv->param.gop.b_pyramid;
+
+ // set the GOP structure
+ if (pv->param.gop.gop_ref_dist < 0)
+ {
+ if (pv->param.videoParam->mfx.RateControlMethod == MFX_RATECONTROL_CQP)
+ {
+ pv->param.gop.gop_ref_dist = 4;
+ }
+ else
+ {
+ pv->param.gop.gop_ref_dist = 3;
+ }
+ }
+ pv->param.videoParam->mfx.GopRefDist = pv->param.gop.gop_ref_dist;
+
+ // set the keyframe interval
+ if (pv->param.gop.gop_pic_size < 0)
+ {
+ int rate = (int)((double)job->vrate / (double)job->vrate_base + 0.5);
+ if (pv->param.videoParam->mfx.RateControlMethod == MFX_RATECONTROL_CQP)
+ {
+ // ensure B-pyramid is enabled for CQP on Haswell
+ pv->param.gop.gop_pic_size = 32;
+ }
+ else
+ {
+ // set the keyframe interval based on the framerate
+ pv->param.gop.gop_pic_size = rate;
+ }
+ }
+ pv->param.videoParam->mfx.GopPicSize = pv->param.gop.gop_pic_size;
+
+ // sanitize some settings that affect memory consumption
+ if (!pv->is_sys_mem)
+ {
+ // limit these to avoid running out of resources (causes hang)
+ pv->param.videoParam->mfx.GopRefDist = FFMIN(pv->param.videoParam->mfx.GopRefDist,
+ pv->param.rc.lookahead ? 8 : 16);
+ pv->param.codingOption2.LookAheadDepth = FFMIN(pv->param.codingOption2.LookAheadDepth,
+ pv->param.rc.lookahead ? (48 - pv->param.videoParam->mfx.GopRefDist -
+ 3 * !pv->param.videoParam->mfx.GopRefDist) : 0);
+ }
+ else
+ {
+ // encode-only is a bit less sensitive to memory issues
+ pv->param.videoParam->mfx.GopRefDist = FFMIN(pv->param.videoParam->mfx.GopRefDist, 16);
+ pv->param.codingOption2.LookAheadDepth = FFMIN(pv->param.codingOption2.LookAheadDepth,
+ pv->param.rc.lookahead ? 60 : 0);
+ }
+
+ if ((pv->qsv_info->capabilities & HB_QSV_CAP_B_REF_PYRAMID) &&
+ (pv->param.videoParam->mfx.CodecProfile != MFX_PROFILE_AVC_BASELINE &&
+ pv->param.videoParam->mfx.CodecProfile != MFX_PROFILE_AVC_CONSTRAINED_HIGH &&
+ pv->param.videoParam->mfx.CodecProfile != MFX_PROFILE_AVC_CONSTRAINED_BASELINE))
+ {
+ int gop_ref_dist = 4;
+ /*
+ * B-pyramid is supported.
+ *
+ * Set gop_ref_dist to a power of two, >= 4 and <= GopRefDist to ensure
+ * Media SDK will not disable B-pyramid if we end up using it below.
+ */
+ while (pv->param.videoParam->mfx.GopRefDist >= gop_ref_dist * 2)
+ {
+ gop_ref_dist *= 2;
+ }
+ if ((pv->param.gop.b_pyramid) &&
+ (pv->param.videoParam->mfx.GopPicSize == 0 ||
+ pv->param.videoParam->mfx.GopPicSize > gop_ref_dist))
+ {
+ /*
+ * B-pyramid enabled and GopPicSize is long enough for gop_ref_dist.
+ *
+ * Use gop_ref_dist. GopPicSize must be a multiple of GopRefDist.
+ * NumRefFrame should be >= (GopRefDist / 2) and >= 3, otherwise
+ * Media SDK may sometimes decide to disable B-pyramid too (whereas
+ * sometimes it will just sanitize NumrefFrame instead).
+ *
+ * Notes: Media SDK handles the NumRefFrame == 0 case for us.
+ * Also, GopPicSize == 0 should always result in a value that
+ * does NOT cause Media SDK to disable B-pyramid, so it's OK.
+ */
+ pv->param.videoParam->mfx.GopRefDist = gop_ref_dist;
+ pv->param.videoParam->mfx.GopPicSize = (pv->param.videoParam->mfx.GopPicSize /
+ pv->param.videoParam->mfx.GopRefDist *
+ pv->param.videoParam->mfx.GopRefDist);
+ if (pv->param.videoParam->mfx.NumRefFrame)
+ {
+ pv->param.videoParam->mfx.NumRefFrame = FFMAX(pv->param.videoParam->mfx.NumRefFrame,
+ pv->param.videoParam->mfx.GopRefDist / 2);
+ pv->param.videoParam->mfx.NumRefFrame = FFMAX(pv->param.videoParam->mfx.NumRefFrame, 3);
+ }
+ }
+ else
+ {
+ /*
+ * B-pyramid disabled or not possible (GopPicSize too short).
+ * Sanitize gop.b_pyramid to 0 (off/disabled).
+ */
+ pv->param.gop.b_pyramid = 0;
+ /* Then, adjust settings to actually disable it. */
+ if (pv->param.videoParam->mfx.GopRefDist == 0)
+ {
+ /*
+ * GopRefDist == 0 means the value will be set by Media SDK.
+ * Since we can't be sure what the actual value would be, we
+ * have to make sure that GopRefDist is set explicitly.
+ */
+ pv->param.videoParam->mfx.GopRefDist = gop_ref_dist - 1;
+ }
+ else if (pv->param.videoParam->mfx.GopRefDist == gop_ref_dist)
+ {
+ /* GopRefDist is compatible with Media SDK's B-pyramid. */
+ if (pv->param.videoParam->mfx.GopPicSize == 0)
+ {
+ /*
+ * GopPicSize is unknown and could be a multiple of
+ * GopRefDist. Decrement the latter to disable B-pyramid.
+ */
+ pv->param.videoParam->mfx.GopRefDist--;
+ }
+ else if (pv->param.videoParam->mfx.GopPicSize %
+ pv->param.videoParam->mfx.GopRefDist == 0)
+ {
+ /*
+ * GopPicSize is a multiple of GopRefDist.
+ * Increment the former to disable B-pyramid.
+ */
+ pv->param.videoParam->mfx.GopPicSize++;
+ }
+ }
+ }
+ }
+ else
+ {
+ /* B-pyramid not supported. */
+ pv->param.gop.b_pyramid = 0;
+ }
+
+ /*
+ * init a dummy encode-only session to get the SPS/PPS
+ * and the final output settings sanitized by Media SDK
+ * this is fine since the actual encode will use the same
+ * values for all parameters relevant to the H.264 bitstream
+ */
+ mfxStatus err;
+ mfxVersion version;
+ mfxVideoParam videoParam;
+ mfxExtBuffer *extParamArray[3];
+ mfxSession session = (mfxSession)0;
+ mfxExtCodingOption option1_buf, *option1 = &option1_buf;
+ mfxExtCodingOption2 option2_buf, *option2 = &option2_buf;
+ mfxExtCodingOptionSPSPPS sps_pps_buf, *sps_pps = &sps_pps_buf;
+ version.Major = HB_QSV_MINVERSION_MAJOR;
+ version.Minor = HB_QSV_MINVERSION_MINOR;
+ err = MFXInit(pv->qsv_info->implementation, &version, &session);
+ if (err != MFX_ERR_NONE)
+ {
+ hb_error("encqsvInit: MFXInit failed (%d)", err);
+ return -1;
+ }
+ err = MFXVideoENCODE_Init(session, pv->param.videoParam);
+// workaround for the early 15.33.x driver, should be removed later
+#define HB_DRIVER_FIX_33
+#ifdef HB_DRIVER_FIX_33
+ int la_workaround = 0;
+ if (err < MFX_ERR_NONE &&
+ pv->param.videoParam->mfx.RateControlMethod == MFX_RATECONTROL_LA)
+ {
+ pv->param.videoParam->mfx.RateControlMethod = MFX_RATECONTROL_CBR;
+ err = MFXVideoENCODE_Init(session, pv->param.videoParam);
+ la_workaround = 1;
+ }
+#endif
+ if (err < MFX_ERR_NONE) // ignore warnings
+ {
+ hb_error("encqsvInit: MFXVideoENCODE_Init failed (%d)", err);
+ MFXClose(session);
+ return -1;
+ }
+ memset(&videoParam, 0, sizeof(mfxVideoParam));
+ videoParam.ExtParam = extParamArray;
+ videoParam.NumExtParam = 0;
+ // introduced in API 1.3
+ memset(sps_pps, 0, sizeof(mfxExtCodingOptionSPSPPS));
+ sps_pps->Header.BufferId = MFX_EXTBUFF_CODING_OPTION_SPSPPS;
+ sps_pps->Header.BufferSz = sizeof(mfxExtCodingOptionSPSPPS);
+ sps_pps->SPSId = 0;
+ sps_pps->SPSBuffer = w->config->h264.sps;
+ sps_pps->SPSBufSize = sizeof(w->config->h264.sps);
+ sps_pps->PPSId = 0;
+ sps_pps->PPSBuffer = w->config->h264.pps;
+ sps_pps->PPSBufSize = sizeof(w->config->h264.pps);
+ videoParam.ExtParam[videoParam.NumExtParam++] = (mfxExtBuffer*)sps_pps;
+ // introduced in API 1.0
+ memset(option1, 0, sizeof(mfxExtCodingOption));
+ option1->Header.BufferId = MFX_EXTBUFF_CODING_OPTION;
+ option1->Header.BufferSz = sizeof(mfxExtCodingOption);
+ videoParam.ExtParam[videoParam.NumExtParam++] = (mfxExtBuffer*)option1;
+ // introduced in API 1.6
+ memset(option2, 0, sizeof(mfxExtCodingOption2));
+ option2->Header.BufferId = MFX_EXTBUFF_CODING_OPTION2;
+ option2->Header.BufferSz = sizeof(mfxExtCodingOption2);
+ if (pv->qsv_info->capabilities & HB_QSV_CAP_MSDK_API_1_6)
+ {
+ // attach to get the final output mfxExtCodingOption2 settings
+ videoParam.ExtParam[videoParam.NumExtParam++] = (mfxExtBuffer*)option2;
+ }
+ err = MFXVideoENCODE_GetVideoParam(session, &videoParam);
+ MFXVideoENCODE_Close(session);
+ if (err == MFX_ERR_NONE)
+ {
+ // remove 32-bit NAL prefix (0x00 0x00 0x00 0x01)
+ w->config->h264.sps_length = sps_pps->SPSBufSize - 4;
+ memmove(w->config->h264.sps, w->config->h264.sps + 4,
+ w->config->h264.sps_length);
+ w->config->h264.pps_length = sps_pps->PPSBufSize - 4;
+ memmove(w->config->h264.pps, w->config->h264.pps + 4,
+ w->config->h264.pps_length);
+ }
+ else
+ {
+ hb_error("encqsvInit: MFXVideoENCODE_GetVideoParam failed (%d)", err);
+ MFXClose(session);
+ return -1;
+ }
+
+#ifdef HB_DRIVER_FIX_33
+ if (la_workaround)
+ {
+ videoParam.mfx.RateControlMethod =
+ pv->param.videoParam->mfx.RateControlMethod = MFX_RATECONTROL_LA;
+ option2->LookAheadDepth = pv->param.codingOption2.LookAheadDepth;
+ hb_log("encqsvInit: using LookAhead workaround (\"early 33 fix\")");
+ }
+#endif
+
+ // when using system memory, we re-use this same session
+ if (pv->is_sys_mem)
+ {
+ pv->mfx_session = session;
+ }
+ else
+ {
+ MFXClose(session);
+ }
+
+ /* check whether B-frames are used */
+ int bframes = videoParam.mfx.GopRefDist > 1 && videoParam.mfx.GopPicSize > 2;
+ if (bframes)
+ {
+ /* the muxer needs to know to the init_delay */
+ switch (pv->qsv_info->codec_id)
+ {
+ case MFX_CODEC_AVC:
+ pv->init_delay = &w->config->h264.init_delay;
+ break;
+ default: // unreachable
+ break;
+ }
+
+ /* let the muxer know that it should expect B-frames */
+ job->areBframes = 1;
+
+ /* holds the PTS sequence in display order, used to generate DTS */
+ pv->list_dts = hb_list_init();
+ }
+
+ // log code path and main output settings
+ hb_log("encqsvInit: using %s path",
+ pv->is_sys_mem ? "encode-only" : "full QSV");
+ hb_log("encqsvInit: TargetUsage %"PRIu16" AsyncDepth %"PRIu16"",
+ videoParam.mfx.TargetUsage, videoParam.AsyncDepth);
+ hb_log("encqsvInit: GopRefDist %"PRIu16" GopPicSize %"PRIu16" NumRefFrame %"PRIu16"",
+ videoParam.mfx.GopRefDist, videoParam.mfx.GopPicSize, videoParam.mfx.NumRefFrame);
+ if (pv->qsv_info->capabilities & HB_QSV_CAP_B_REF_PYRAMID)
+ {
+ hb_log("encqsvInit: BFrames %s BPyramid %s",
+ bframes ? "on" : "off",
+ bframes && pv->param.gop.b_pyramid ? "on" : "off");
+ }
+ else
+ {
+ hb_log("encqsvInit: BFrames %s", bframes ? "on" : "off");
+ }
+ if (pv->qsv_info->capabilities & HB_QSV_CAP_OPTION2_IB_ADAPT)
+ {
+ if (bframes)
+ {
+ hb_log("encqsvInit: AdaptiveI %s AdaptiveB %s",
+ hb_qsv_codingoption_get_name(option2->AdaptiveI),
+ hb_qsv_codingoption_get_name(option2->AdaptiveB));
+ }
+ else
+ {
+ hb_log("encqsvInit: AdaptiveI %s",
+ hb_qsv_codingoption_get_name(option2->AdaptiveI));
+ }
+ }
+ if (videoParam.mfx.RateControlMethod == MFX_RATECONTROL_CQP)
+ {
+ char qpi[7], qpp[9], qpb[9];
+ snprintf(qpi, sizeof(qpi), "QPI %"PRIu16"", videoParam.mfx.QPI);
+ snprintf(qpp, sizeof(qpp), " QPP %"PRIu16"", videoParam.mfx.QPP);
+ snprintf(qpb, sizeof(qpb), " QPB %"PRIu16"", videoParam.mfx.QPB);
+ hb_log("encqsvInit: RateControlMethod CQP with %s%s%s", qpi,
+ videoParam.mfx.GopPicSize > 1 ? qpp : "",
+ videoParam.mfx.GopRefDist > 1 ? qpb : "");
+ }
+ else
+ {
+ switch (videoParam.mfx.RateControlMethod)
+ {
+ case MFX_RATECONTROL_LA:
+ hb_log("encqsvInit: RateControlMethod LA TargetKbps %"PRIu16" LookAheadDepth %"PRIu16"",
+ videoParam.mfx.TargetKbps, option2->LookAheadDepth);
+ break;
+ case MFX_RATECONTROL_LA_ICQ:
+ hb_log("encqsvInit: RateControlMethod LA_ICQ ICQQuality %"PRIu16" LookAheadDepth %"PRIu16"",
+ videoParam.mfx.ICQQuality, option2->LookAheadDepth);
+ break;
+ case MFX_RATECONTROL_ICQ:
+ hb_log("encqsvInit: RateControlMethod ICQ ICQQuality %"PRIu16"",
+ videoParam.mfx.ICQQuality);
+ break;
+ case MFX_RATECONTROL_CBR:
+ case MFX_RATECONTROL_VBR:
+ hb_log("encqsvInit: RateControlMethod %s TargetKbps %"PRIu16" MaxKbps %"PRIu16" BufferSizeInKB %"PRIu16" InitialDelayInKB %"PRIu16"",
+ videoParam.mfx.RateControlMethod == MFX_RATECONTROL_CBR ? "CBR" : "VBR",
+ videoParam.mfx.TargetKbps, videoParam.mfx.MaxKbps,
+ videoParam.mfx.BufferSizeInKB, videoParam.mfx.InitialDelayInKB);
+ break;
+ default:
+ hb_log("encqsvInit: invalid rate control method %"PRIu16"",
+ videoParam.mfx.RateControlMethod);
+ return -1;
+ }
+ }
+ if ((pv->qsv_info->capabilities & HB_QSV_CAP_OPTION2_LA_DOWNS) &&
+ (videoParam.mfx.RateControlMethod == MFX_RATECONTROL_LA ||
+ videoParam.mfx.RateControlMethod == MFX_RATECONTROL_LA_ICQ))
+ {
+ switch (option2->LookAheadDS)
+ {
+ case MFX_LOOKAHEAD_DS_UNKNOWN:
+ hb_log("encqsvInit: LookAheadDS unknown (auto)");
+ break;
+ case MFX_LOOKAHEAD_DS_OFF:
+ hb_log("encqsvInit: LookAheadDS off");
+ break;
+ case MFX_LOOKAHEAD_DS_2x:
+ hb_log("encqsvInit: LookAheadDS 2x");
+ break;
+ case MFX_LOOKAHEAD_DS_4x:
+ hb_log("encqsvInit: LookAheadDS 4x");
+ break;
+ default:
+ hb_log("encqsvInit: invalid LookAheadDS value 0x%"PRIx16"",
+ option2->LookAheadDS);
+ break;
+ }
+ }
+ switch (videoParam.mfx.FrameInfo.PicStruct)
+ {
+ // quiet, most people don't care
+ case MFX_PICSTRUCT_PROGRESSIVE:
+ break;
+ // interlaced encoding is intended for advanced users only, who do care
+ case MFX_PICSTRUCT_FIELD_TFF:
+ hb_log("encqsvInit: PicStruct top field first");
+ break;
+ case MFX_PICSTRUCT_FIELD_BFF:
+ hb_log("encqsvInit: PicStruct bottom field first");
+ break;
+ default:
+ hb_error("encqsvInit: invalid PicStruct value 0x%"PRIx16"",
+ videoParam.mfx.FrameInfo.PicStruct);
+ return -1;
+ }
+ hb_log("encqsvInit: CAVLC %s",
+ hb_qsv_codingoption_get_name(option1->CAVLC));
+ if (pv->param.rc.lookahead == 0 &&
+ videoParam.mfx.RateControlMethod != MFX_RATECONTROL_CQP)
+ {
+ // LA/CQP and ExtBRC/MBBRC are mutually exclusive
+ if (pv->qsv_info->capabilities & HB_QSV_CAP_OPTION2_EXTBRC)
+ {
+ hb_log("encqsvInit: ExtBRC %s",
+ hb_qsv_codingoption_get_name(option2->ExtBRC));
+ }
+ if (pv->qsv_info->capabilities & HB_QSV_CAP_OPTION2_MBBRC)
+ {
+ hb_log("encqsvInit: MBBRC %s",
+ hb_qsv_codingoption_get_name(option2->MBBRC));
+ }
+ }
+ if (pv->qsv_info->capabilities & HB_QSV_CAP_OPTION2_TRELLIS)
+ {
+ switch (option2->Trellis)
+ {
+ case MFX_TRELLIS_OFF:
+ hb_log("encqsvInit: Trellis off");
+ break;
+ case MFX_TRELLIS_UNKNOWN:
+ hb_log("encqsvInit: Trellis unknown (auto)");
+ break;
+ default:
+ hb_log("encqsvInit: Trellis on (%s%s%s)",
+ (option2->Trellis & MFX_TRELLIS_I) ? "I" : "",
+ (option2->Trellis & MFX_TRELLIS_P) &&
+ (videoParam.mfx.GopPicSize > 1) ? "P" : "",
+ (option2->Trellis & MFX_TRELLIS_B) &&
+ (videoParam.mfx.GopRefDist > 1) ? "B" : "");
+ break;
+ }
+ }
+ hb_log("encqsvInit: H.264 profile %s @ level %s",
+ qsv_h264_profile_xlat(videoParam.mfx.CodecProfile),
+ qsv_h264_level_xlat (videoParam.mfx.CodecLevel));
+
+ // AsyncDepth has now been set and/or modified by Media SDK
+ pv->max_async_depth = videoParam.AsyncDepth;
+ pv->async_depth = 0;
+
+ return 0;
+}
+
+void encqsvClose(hb_work_object_t *w)
+{
+ hb_work_private_t *pv = w->private_data;
+ int i;
+
+ if (pv != NULL && pv->job != NULL && pv->job->qsv.ctx != NULL &&
+ pv->job->qsv.ctx->is_context_active)
+ {
+
+ av_qsv_context *qsv_ctx = pv->job->qsv.ctx;
+ av_qsv_space *qsv_enc_space = pv->job->qsv.ctx->enc_space;
+
+ if (qsv_enc_space != NULL)
+ {
+ if (qsv_enc_space->is_init_done)
+ {
+ for (i = av_qsv_list_count(qsv_enc_space->tasks); i > 1; i--)
+ {
+ av_qsv_task *task = av_qsv_list_item(qsv_enc_space->tasks,
+ i - 1);
+ if (task != NULL)
+ {
+ if (task->bs != NULL)
+ {
+ av_freep(&task->bs->Data);
+ }
+ av_qsv_list_rem(qsv_enc_space->tasks, task);
+ av_freep(&task->bs);
+ av_freep(&task);
+ }
+ }
+ av_qsv_list_close(&qsv_enc_space->tasks);
+
+ for (i = 0; i < qsv_enc_space->surface_num; i++)
+ {
+ if (pv->is_sys_mem)
+ {
+ av_freep(&qsv_enc_space->p_surfaces[i]->Data.VU);
+ av_freep(&qsv_enc_space->p_surfaces[i]->Data.Y);
+ }
+ av_freep(&qsv_enc_space->p_surfaces[i]);
+ }
+ qsv_enc_space->surface_num = 0;
+
+ for (i = 0; i < qsv_enc_space->sync_num; i++)
+ {
+ av_freep(&qsv_enc_space->p_syncp[i]->p_sync);
+ av_freep(&qsv_enc_space->p_syncp[i]);
+ }
+ qsv_enc_space->sync_num = 0;
+ }
+ qsv_enc_space->is_init_done = 0;
+ }
+
+ if (qsv_ctx != NULL)
+ {
+ /* QSV context cleanup and MFXClose */
+ av_qsv_context_clean(qsv_ctx);
+
+ if (pv->is_sys_mem)
+ {
+ av_freep(&qsv_ctx);
+ }
+ }
+ }
+
+ if (pv != NULL)
+ {
+ if (pv->delayed_processing != NULL)
+ {
+ /* the list is already empty */
+ hb_list_close(&pv->delayed_processing);
+ }
+ if (pv->sws_context_to_nv12 != NULL)
+ {
+ sws_freeContext(pv->sws_context_to_nv12);
+ }
+ if (pv->list_dts != NULL)
+ {
+ int64_t *item;
+ while ((item = hb_list_item(pv->list_dts, 0)) != NULL)
+ {
+ hb_list_rem(pv->list_dts, item);
+ free(item);
+ }
+ hb_list_close(&pv->list_dts);
+ }
+ if (pv->delayed_chapters != NULL)
+ {
+ struct chapter_s *item;
+ while ((item = hb_list_item(pv->delayed_chapters, 0)) != NULL)
+ {
+ hb_list_rem(pv->delayed_chapters, item);
+ free(item);
+ }
+ hb_list_close(&pv->delayed_chapters);
+ }
+ if (pv->encoded_frames != NULL)
+ {
+ hb_buffer_t *item;
+ while ((item = hb_list_item(pv->encoded_frames, 0)) != NULL)
+ {
+ hb_list_rem(pv->encoded_frames, item);
+ hb_buffer_close(&item);
+ }
+ hb_list_close(&pv->encoded_frames);
+ }
+ }
+
+ free(pv);
+ w->private_data = NULL;
+}
+
+static void save_chapter(hb_work_private_t *pv, hb_buffer_t *buf)
+{
+ /*
+ * Since there may be several frames buffered in the encoder, remember the
+ * timestamp so when this frame finally pops out of the encoder we'll mark
+ * its buffer as the start of a chapter.
+ */
+ if (pv->next_chapter_pts == AV_NOPTS_VALUE)
+ {
+ pv->next_chapter_pts = buf->s.start;
+ }
+
+ /*
+ * Chapter markers are sometimes so close we can get a new
+ * one before the previous goes through the encoding queue.
+ *
+ * Dropping markers can cause weird side-effects downstream,
+ * including but not limited to missing chapters in the
+ * output, so we need to save it somehow.
+ */
+ struct chapter_s *item = malloc(sizeof(struct chapter_s));
+
+ if (item != NULL)
+ {
+ item->start = buf->s.start;
+ item->index = buf->s.new_chap;
+ hb_list_add(pv->delayed_chapters, item);
+ }
+
+ /* don't let 'work_loop' put a chapter mark on the wrong buffer */
+ buf->s.new_chap = 0;
+}
+
+static void restore_chapter(hb_work_private_t *pv, hb_buffer_t *buf)
+{
+ /* we're no longer looking for this chapter */
+ pv->next_chapter_pts = AV_NOPTS_VALUE;
+
+ /* get the chapter index from the list */
+ struct chapter_s *item = hb_list_item(pv->delayed_chapters, 0);
+
+ if (item != NULL)
+ {
+ /* we're done with this chapter */
+ hb_list_rem(pv->delayed_chapters, item);
+ buf->s.new_chap = item->index;
+ free(item);
+
+ /* we may still have another pending chapter */
+ item = hb_list_item(pv->delayed_chapters, 0);
+
+ if (item != NULL)
+ {
+ /*
+ * we're looking for this chapter now
+ * we still need it, don't remove it
+ */
+ pv->next_chapter_pts = item->start;
+ }
+ }
+}
+
+static void compute_init_delay(hb_work_private_t *pv, mfxBitstream *bs)
+{
+ if (pv->init_delay == NULL)
+ {
+ return; // not needed or already set
+ }
+
+ /*
+ * In the MP4 container, DT(0) = STTS(0) = 0.
+ *
+ * Which gives us:
+ * CT(0) = CTTS(0) + STTS(0) = CTTS(0) = PTS(0) - DTS(0)
+ * When DTS(0) < PTS(0), we then have:
+ * CT(0) > 0 for video, but not audio (breaks A/V sync).
+ *
+ * This is typically solved by writing an edit list shifting
+ * video samples by the initial delay, PTS(0) - DTS(0).
+ *
+ * See:
+ * ISO/IEC 14496-12:2008(E), ISO base media file format
+ * - 8.6.1.2 Decoding Time to Sample Box
+ */
+ if (pv->qsv_info->capabilities & HB_QSV_CAP_MSDK_API_1_6)
+ {
+ /* compute init_delay (in ticks) based on the DTS provided by MSDK. */
+ int64_t init_delay = bs->TimeStamp - bs->DecodeTimeStamp;
+
+ /*
+ * we also need to know the delay in frames to generate DTS.
+ *
+ * compute it based on the init_delay and average frame duration,
+ * and account for potential rounding errors due to the timebase.
+ */
+ double avg_frame_dur = ((double)pv->job->vrate_base /
+ (double)pv->job->vrate * 90000.);
+
+ pv->bfrm_delay = (init_delay + (avg_frame_dur / 2)) / avg_frame_dur;
+
+ if (pv->bfrm_delay < 1 || pv->bfrm_delay > BFRM_DELAY_MAX)
+ {
+ hb_log("compute_init_delay: "
+ "invalid delay %d (PTS: %"PRIu64", DTS: %"PRId64")",
+ pv->bfrm_delay, bs->TimeStamp, bs->DecodeTimeStamp);
+
+ /* we have B-frames, the frame delay should be at least 1 */
+ if (pv->bfrm_delay < 1)
+ {
+ mfxStatus sts;
+ mfxVideoParam videoParam;
+ mfxSession session = pv->job->qsv.ctx->mfx_session;
+
+ memset(&videoParam, 0, sizeof(mfxVideoParam));
+
+ sts = MFXVideoENCODE_GetVideoParam(session, &videoParam);
+ if (sts != MFX_ERR_NONE)
+ {
+ hb_log("compute_init_delay: "
+ "MFXVideoENCODE_GetVideoParam failed (%d)", sts);
+ pv->bfrm_delay = 1;
+ }
+ else
+ {
+ /* usually too large, but should cover all cases */
+ pv->bfrm_delay = FFMIN(pv->frames_in - 1,
+ videoParam.mfx.GopRefDist - 1);
+ }
+ }
+
+ pv->bfrm_delay = FFMIN(BFRM_DELAY_MAX, pv->bfrm_delay);
+ }
+
+ pv->init_delay[0] = pv->init_pts[pv->bfrm_delay] - pv->init_pts[0];
+ }
+ else
+ {
+ /*
+ * we can't get the DTS from MSDK, so we need to generate our own.
+ *
+ * B-pyramid not possible here, so the delay in frames is always 1.
+ */
+ pv->bfrm_delay = 1;
+ pv->init_delay[0] = pv->init_pts[1] - pv->init_pts[0];
+ }
+
+ /* The delay only needs to be set once. */
+ pv->init_delay = NULL;
+}
+
+static int qsv_frame_is_key(mfxU16 FrameType)
+{
+ return ((FrameType & MFX_FRAMETYPE_IDR) ||
+ (FrameType == MFX_FRAMETYPE_UNKNOWN));
+}
+
+static void qsv_bitstream_slurp(hb_work_private_t *pv, mfxBitstream *bs)
+{
+ /*
+ * we need to convert the encoder's Annex B output
+ * to an MP4-compatible format (ISO/IEC 14496-15).
+ */
+ hb_buffer_t *buf = hb_nal_bitstream_annexb_to_mp4(bs->Data + bs->DataOffset,
+ bs->DataLength);
+ if (buf == NULL)
+ {
+ hb_error("encqsv: hb_nal_bitstream_annexb_to_mp4 failed");
+ goto fail;
+ }
+ bs->DataLength = bs->DataOffset = 0;
+ bs->MaxLength = pv->job->qsv.ctx->enc_space->p_buf_max_size;
+
+ buf->s.frametype = hb_qsv_frametype_xlat(bs->FrameType, &buf->s.flags);
+ buf->s.start = buf->s.renderOffset = bs->TimeStamp;
+ buf->s.stop = buf->s.start + get_frame_duration(pv, buf);
+ buf->s.duration = buf->s.stop - buf->s.start;
+
+ /* compute the init_delay before setting the DTS */
+ compute_init_delay(pv, bs);
+
+ /*
+ * Generate VFR-compatible output DTS based on input PTS.
+ *
+ * Depends on the B-frame delay:
+ *
+ * 0: ipts0, ipts1, ipts2...
+ * 1: ipts0 - ipts1, ipts1 - ipts1, ipts1, ipts2...
+ * 2: ipts0 - ipts2, ipts1 - ipts2, ipts2 - ipts2, ipts1...
+ * ...and so on.
+ */
+ if (pv->bfrm_delay)
+ {
+ if (pv->frames_out <= pv->bfrm_delay)
+ {
+ buf->s.renderOffset = (pv->init_pts[pv->frames_out] -
+ pv->init_pts[pv->bfrm_delay]);
+ }
+ else
+ {
+ buf->s.renderOffset = hb_qsv_pop_next_dts(pv->list_dts);
+ }
+ }
+
+ /* check if B-pyramid is used even though it's disabled */
+ if ((pv->param.gop.b_pyramid == 0) &&
+ (bs->FrameType & MFX_FRAMETYPE_B) &&
+ (bs->FrameType & MFX_FRAMETYPE_REF))
+ {
+ hb_log("encqsv: BPyramid off not respected (delay: %d)", pv->bfrm_delay);
+
+ /* don't pollute the log unnecessarily */
+ pv->param.gop.b_pyramid = 1;
+ }
+
+ /* check for PTS < DTS */
+ if (buf->s.start < buf->s.renderOffset)
+ {
+ hb_log("encqsv: PTS %"PRId64" < DTS %"PRId64" for frame %d with type '%s'",
+ buf->s.start, buf->s.renderOffset, pv->frames_out + 1,
+ hb_qsv_frametype_name(bs->FrameType));
+ }
+
+ /*
+ * If we have a chapter marker pending and this frame's PTS
+ * is at or after the marker's PTS, use it as the chapter start.
+ */
+ if (pv->next_chapter_pts != AV_NOPTS_VALUE &&
+ pv->next_chapter_pts <= buf->s.start &&
+ qsv_frame_is_key(bs->FrameType))
+ {
+ restore_chapter(pv, buf);
+ }
+
+ hb_list_add(pv->encoded_frames, buf);
+ pv->frames_out++;
+ return;
+
+fail:
+ *pv->job->done_error = HB_ERROR_UNKNOWN;
+ *pv->job->die = 1;
+}
+
+static int qsv_enc_work(hb_work_private_t *pv,
+ av_qsv_list *qsv_atom,
+ mfxFrameSurface1 *surface)
+{
+ mfxStatus sts;
+ av_qsv_context *qsv_ctx = pv->job->qsv.ctx;
+ av_qsv_space *qsv_enc_space = pv->job->qsv.ctx->enc_space;
+
+ do
+ {
+ int sync_idx = av_qsv_get_free_sync(qsv_enc_space, qsv_ctx);
+ if (sync_idx == -1)
+ {
+ hb_error("encqsv: av_qsv_get_free_sync failed");
+ return -1;
+ }
+ av_qsv_task *task = av_qsv_list_item(qsv_enc_space->tasks,
+ pv->async_depth);
+
+ do
+ {
+ sts = MFXVideoENCODE_EncodeFrameAsync(qsv_ctx->mfx_session,
+ NULL, surface, task->bs,
+ qsv_enc_space->p_syncp[sync_idx]->p_sync);
+
+ if (sts == MFX_ERR_MORE_DATA || (sts >= MFX_ERR_NONE &&
+ sts != MFX_WRN_DEVICE_BUSY))
+ {
+ if (surface != NULL && !pv->is_sys_mem)
+ {
+ ff_qsv_atomic_dec(&surface->Data.Locked);
+ }
+ }
+
+ if (sts == MFX_ERR_MORE_DATA)
+ {
+ if (qsv_atom != NULL)
+ {
+ hb_list_add(pv->delayed_processing, qsv_atom);
+ }
+ ff_qsv_atomic_dec(&qsv_enc_space->p_syncp[sync_idx]->in_use);
+ break;
+ }
+ else if (sts < MFX_ERR_NONE)
+ {
+ hb_error("encqsv: MFXVideoENCODE_EncodeFrameAsync failed (%d)", sts);
+ return -1;
+ }
+ else if (sts == MFX_WRN_DEVICE_BUSY)
+ {
+ av_qsv_sleep(10); // device is busy, wait then repeat the call
+ continue;
+ }
+ else
+ {
+ av_qsv_stage *new_stage = av_qsv_stage_init();
+ new_stage->type = AV_QSV_ENCODE;
+ new_stage->in.p_surface = surface;
+ new_stage->out.sync = qsv_enc_space->p_syncp[sync_idx];
+ new_stage->out.p_bs = task->bs;
+ task->stage = new_stage;
+ pv->async_depth++;
+
+ if (qsv_atom != NULL)
+ {
+ av_qsv_add_stagee(&qsv_atom, new_stage, HAVE_THREADS);
+ }
+ else
+ {
+ /* encode-only or flushing */
+ av_qsv_list *new_qsv_atom = av_qsv_list_init(HAVE_THREADS);
+ av_qsv_add_stagee(&new_qsv_atom, new_stage, HAVE_THREADS);
+ av_qsv_list_add (qsv_ctx->pipes, new_qsv_atom);
+ }
+
+ int i = hb_list_count(pv->delayed_processing);
+ while (--i >= 0)
+ {
+ av_qsv_list *item = hb_list_item(pv->delayed_processing, i);
+
+ if (item != NULL)
+ {
+ hb_list_rem(pv->delayed_processing, item);
+ av_qsv_flush_stages(qsv_ctx->pipes, &item);
+ }
+ }
+ break;
+ }
+
+ ff_qsv_atomic_dec(&qsv_enc_space->p_syncp[sync_idx]->in_use);
+ break;
+ }
+ while (sts >= MFX_ERR_NONE);
+
+ do
+ {
+ if (pv->async_depth == 0) break;
+
+ /* we've done enough asynchronous operations or we're flushing */
+ if (pv->async_depth >= pv->max_async_depth || surface == NULL)
+ {
+ av_qsv_task *task = av_qsv_list_item(qsv_enc_space->tasks, 0);
+ pv->async_depth--;
+
+ /* perform a sync operation to get the output bitstream */
+ av_qsv_wait_on_sync(qsv_ctx, task->stage);
+
+ if (task->bs->DataLength > 0)
+ {
+ av_qsv_list *pipe = av_qsv_pipe_by_stage(qsv_ctx->pipes,
+ task->stage);
+ av_qsv_flush_stages(qsv_ctx->pipes, &pipe);
+
+ /* get the encoded frame from the bitstream */
+ qsv_bitstream_slurp(pv, task->bs);
+
+ /* shift for fifo */
+ if (pv->async_depth)
+ {
+ av_qsv_list_rem(qsv_enc_space->tasks, task);
+ av_qsv_list_add(qsv_enc_space->tasks, task);
+ }
+ task->stage = NULL;
+ }
+ }
+ }
+ while (surface == NULL);
+ }
+ while (surface == NULL && sts != MFX_ERR_MORE_DATA);
+
+ return 0;
+}
+
+static hb_buffer_t* link_buffer_list(hb_list_t *list)
+{
+ hb_buffer_t *buf, *prev = NULL, *out = NULL;
+
+ while ((buf = hb_list_item(list, 0)) != NULL)
+ {
+ hb_list_rem(list, buf);
+
+ if (prev == NULL)
+ {
+ prev = out = buf;
+ }
+ else
+ {
+ prev->next = buf;
+ prev = buf;
+ }
+ }
+
+ return out;
+}
+
+int encqsvWork(hb_work_object_t *w, hb_buffer_t **buf_in, hb_buffer_t **buf_out)
+{
+ hb_work_private_t *pv = w->private_data;
+ hb_buffer_t *in = *buf_in;
+ hb_job_t *job = pv->job;
+
+ while (qsv_enc_init(pv) >= 2)
+ {
+ av_qsv_sleep(1); // encoding not initialized, wait and repeat the call
+ }
+
+ if (*job->die)
+ {
+ goto fail; // unrecoverable error, don't attempt to encode
+ }
+
+ /*
+ * EOF on input. Flush the decoder, then send the
+ * EOF downstream to let the muxer know we're done.
+ */
+ if (in->size <= 0)
+ {
+ qsv_enc_work(pv, NULL, NULL);
+ hb_list_add(pv->encoded_frames, in);
+ *buf_out = link_buffer_list(pv->encoded_frames);
+ *buf_in = NULL; // don't let 'work_loop' close this buffer
+ return HB_WORK_DONE;
+ }
+
+ mfxFrameSurface1 *surface = NULL;
+ av_qsv_list *qsv_atom = NULL;
+ av_qsv_context *qsv_ctx = job->qsv.ctx;
+ av_qsv_space *qsv_enc_space = job->qsv.ctx->enc_space;
+
+ if (pv->is_sys_mem)
+ {
+ mfxFrameInfo *info = &pv->param.videoParam->mfx.FrameInfo;
+ int surface_index = av_qsv_get_free_surface(qsv_enc_space, qsv_ctx, info,
+ QSV_PART_ANY);
+ if (surface_index == -1)
+ {
+ hb_error("encqsv: av_qsv_get_free_surface failed");
+ goto fail;
+ }
+
+ surface = qsv_enc_space->p_surfaces[surface_index];
+ qsv_yuv420_to_nv12(pv->sws_context_to_nv12, surface, in);
+ }
+ else
+ {
+ qsv_atom = in->qsv_details.qsv_atom;
+ surface = av_qsv_get_last_stage(qsv_atom)->out.p_surface;
+
+ /*
+ * QSV decoding fills the QSV context's dts_seq list, we need to
+ * pop this surface's DTS so dts_seq doesn't grow unnecessarily.
+ */
+ av_qsv_dts_pop(qsv_ctx);
+ }
+
+ /*
+ * Debugging code to check that the upstream modules have generated
+ * a continuous, self-consistent frame stream.
+ */
+ if (pv->last_start > in->s.start)
+ {
+ hb_log("encqsv: input continuity error, "
+ "last start %"PRId64" start %"PRId64"",
+ pv->last_start, in->s.start);
+ }
+ pv->last_start = in->s.start;
+
+ /* for DTS generation */
+ if (pv->frames_in <= BFRM_DELAY_MAX)
+ {
+ pv->init_pts[pv->frames_in] = in->s.start;
+ }
+ if (pv->frames_in)
+ {
+ hb_qsv_add_new_dts(pv->list_dts, in->s.start);
+ }
+ pv->frames_in++;
+
+ /*
+ * Chapters have to start with a keyframe, so request one here.
+ *
+ * Using an mfxEncodeCtrl structure to force key frame generation is not
+ * possible when using a lookahead and frame reordering, so instead do
+ * the following before encoding the frame attached to the chapter:
+ *
+ * - flush the encoder to encode and retrieve any buffered frames
+ *
+ * - do a hard reset (MFXVideoENCODE_Close, then Init) of
+ * the encoder to make sure the next frame is a keyframe
+ *
+ * The hard reset ensures encoding resumes with a clean state, avoiding
+ * miscellaneous hard-to-disagnose issues that may occur when resuming
+ * an encode after flushing the encoder or using MFXVideoENCODE_Reset.
+ */
+ if (in->s.new_chap > 0 && job->chapter_markers)
+ {
+ mfxStatus sts;
+
+ if (qsv_enc_work(pv, NULL, NULL) < 0)
+ {
+ goto fail;
+ }
+
+ sts = MFXVideoENCODE_Close(qsv_ctx->mfx_session);
+ if (sts != MFX_ERR_NONE)
+ {
+ hb_error("encqsv: MFXVideoENCODE_Close failed (%d)", sts);
+ goto fail;
+ }
+
+ sts = MFXVideoENCODE_Init(qsv_ctx->mfx_session, pv->param.videoParam);
+ if (sts < MFX_ERR_NONE)
+ {
+ hb_error("encqsv: MFXVideoENCODE_Init failed (%d)", sts);
+ goto fail;
+ }
+
+ save_chapter(pv, in);
+ }
+
+ /*
+ * If interlaced encoding is requested during encoder initialization,
+ * but the input mfxFrameSurface1 is flagged as progressive here,
+ * the output bitstream will be progressive (according to MediaInfo).
+ *
+ * Assume the user knows what he's doing (say he is e.g. encoding a
+ * progressive-flagged source using interlaced compression - he may
+ * well have a good reason to do so; mis-flagged sources do exist).
+ */
+ surface->Info.PicStruct = pv->param.videoParam->mfx.FrameInfo.PicStruct;
+ surface->Data.TimeStamp = in->s.start;
+ save_frame_duration(pv, in);
+
+ /*
+ * Now that the input surface is setup, we can encode it.
+ */
+ if (qsv_enc_work(pv, qsv_atom, surface) < 0)
+ {
+ goto fail;
+ }
+
+ *buf_out = link_buffer_list(pv->encoded_frames);
+ return HB_WORK_OK;
+
+fail:
+ if (*job->done_error == HB_ERROR_NONE)
+ {
+ *job->done_error = HB_ERROR_UNKNOWN;
+ }
+ *job->die = 1;
+ *buf_out = NULL;
+ return HB_WORK_ERROR;
+}
+
+#endif // USE_QSV

HandBrake-0.9.9.tar.bz2/libhb/encavcodec.c -> HandBrake-0.10.0.tar.bz2/libhb/encavcodec.c Changed

@@ -1,6 +1,6 @@
 /* encavcodec.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -39,8 +39,7 @@
 
 struct {
 int64_t start;
- int64_t stop;
- int64_t renderOffset;
+ int64_t duration;
 } frame_info[FRAME_INFO_SIZE];
 };
 
@@ -78,6 +77,10 @@
 {
 hb_log("encavcodecInit: MPEG-2 encoder");
 } break;
+ case AV_CODEC_ID_VP8:
+ {
+ hb_log("encavcodecInit: VP8 encoder");
+ } break;
 default:
 {
 hb_error("encavcodecInit: unsupported encoder!");
@@ -90,13 +93,12 @@
 {
 hb_log( "encavcodecInit: avcodec_find_encoder "
 "failed" );
+ return 1;
 }
 context = avcodec_alloc_context3( codec );
 
 // Set things in context that we will allow the user to 
 // override with advanced settings.
- context->thread_count = ( hb_get_cpu_count() * 3 / 2 );
-
 if( job->pass == 2 )
 {
 hb_interjob_t * interjob = hb_interjob_get( job->h );
@@ -117,12 +119,12 @@
 // to fps.den.
 if (fps.num == 27000000)
 {
- int ii;
- for (ii = 0; ii < hb_video_rates_count; ii++)
+ const hb_rate_t *video_framerate = NULL;
+ while ((video_framerate = hb_video_framerate_get_next(video_framerate)) != NULL)
 {
- if (abs(fps.den - hb_video_rates[ii].rate) < 10)
+ if (abs(fps.den - video_framerate->rate) < 10)
 {
- fps.den = hb_video_rates[ii].rate;
+ fps.den = video_framerate->rate;
 break;
 }
 }
@@ -160,11 +162,11 @@
 context->time_base.num = fps.den;
 context->gop_size = 10 * (int)( (double)job->vrate / (double)job->vrate_base + 0.5 );
 
- /* place job->advanced_opts in an hb_dict_t for convenience */
+ /* place job->encoder_options in an hb_dict_t for convenience */
 hb_dict_t * lavc_opts = NULL;
- if( job->advanced_opts != NULL && *job->advanced_opts != '\0' )
+ if (job->encoder_options != NULL && *job->encoder_options)
 {
- lavc_opts = hb_encopts_to_dict( job->advanced_opts, job->vcodec );
+ lavc_opts = hb_encopts_to_dict(job->encoder_options, job->vcodec);
 }
 /* iterate through lavc_opts and have avutil parse the options for us */
 AVDictionary * av_opts = NULL;
@@ -193,8 +195,28 @@
 // what was previously used
 context->flags |= CODEC_FLAG_QSCALE;
 context->global_quality = FF_QP2LAMBDA * job->vquality + 0.5;
- hb_log( "encavcodec: encoding at constant quantizer %d",
- context->global_quality );
+ //Set constant quality for libvpx
+ if ( w->codec_param == AV_CODEC_ID_VP8 )
+ {
+ char quality[7];
+ snprintf(quality, 7, "%.2f", job->vquality);
+ av_dict_set( &av_opts, "crf", quality, 0 );
+ //Setting the deadline to good and cpu-used to 0
+ //causes the encoder to balance video quality and
+ //encode time, with a bias to video quality.
+ av_dict_set( &av_opts, "deadline", "good", 0);
+ av_dict_set( &av_opts, "cpu-used", "0", 0);
+ //This value was chosen to make the bitrate high enough
+ //for libvpx to "turn off" the maximum bitrate feature
+ //that is normally applied to constant quality.
+ context->bit_rate = job->width*job->height*( (double)fps.num / (double)fps.den );
+ hb_log( "encavcodec: encoding at CQ %.2f", job->vquality );
+ }
+ else
+ {
+ hb_log( "encavcodec: encoding at constant quantizer %d",
+ context->global_quality );
+ }
 }
 context->width = job->width;
 context->height = job->height;
@@ -209,7 +231,7 @@
 job->anamorphic.par_width, job->anamorphic.par_height );
 }
 
- if( job->mux & HB_MUX_MP4 )
+ if( job->mux & HB_MUX_MASK_MP4 )
 {
 context->flags |= CODEC_FLAG_GLOBAL_HEADER;
 }
@@ -225,7 +247,7 @@
 
 if( job->pass == 1 )
 {
- pv->file = fopen( filename, "wb" );
+ pv->file = hb_fopen(filename, "wb");
 context->flags |= CODEC_FLAG_PASS1;
 }
 else
@@ -233,7 +255,7 @@
 int size;
 char * log;
 
- pv->file = fopen( filename, "rb" );
+ pv->file = hb_fopen(filename, "rb");
 fseek( pv->file, 0, SEEK_END );
 size = ftell( pv->file );
 fseek( pv->file, 0, SEEK_SET );
@@ -248,7 +270,7 @@
 }
 }
 
- if( hb_avcodec_open( context, codec, &av_opts, 0 ) )
+ if (hb_avcodec_open(context, codec, &av_opts, HB_FFMPEG_THREADS_AUTO))
 {
 hb_log( "encavcodecInit: avcodec_open failed" );
 }
@@ -268,7 +290,7 @@
 {
 job->areBframes = 1;
 }
- if( ( job->mux & HB_MUX_MP4 ) && job->pass != 1 )
+ if( ( job->mux & HB_MUX_MASK_MP4 ) && job->pass != 1 )
 {
 w->config->mpeg4.length = context->extradata_size;
 memcpy( w->config->mpeg4.bytes, context->extradata,
@@ -292,6 +314,7 @@
 hb_deep_log( 2, "encavcodec: closing libavcodec" );
 avcodec_flush_buffers( pv->context );
 hb_avcodec_close( pv->context );
+ av_free( pv->context );
 }
 if( pv->file )
 {
@@ -309,7 +332,7 @@
 {
 int i = pv->frameno_in & FRAME_INFO_MASK;
 pv->frame_info[i].start = in->s.start;
- pv->frame_info[i].stop = in->s.stop;
+ pv->frame_info[i].duration = in->s.stop - in->s.start;
 }
 
 static int64_t get_frame_start( hb_work_private_t * pv, int64_t frameno )
@@ -318,17 +341,17 @@
 return pv->frame_info[i].start;
 }
 
-static int64_t get_frame_stop( hb_work_private_t * pv, int64_t frameno )
+static int64_t get_frame_duration( hb_work_private_t * pv, int64_t frameno )
 {
 int i = frameno & FRAME_INFO_MASK;
- return pv->frame_info[i].stop;
+ return pv->frame_info[i].duration;
 }
 
 static void compute_dts_offset( hb_work_private_t * pv, hb_buffer_t * buf )
 {
 if ( pv->job->areBframes )
 {
- if ( ( pv->frameno_in - 1 ) == pv->job->areBframes )
+ if ( ( pv->frameno_in ) == pv->job->areBframes )
 {
 pv->dts_delay = buf->s.start;
 pv->job->config.h264.init_delay = pv->dts_delay;
@@ -336,6 +359,63 @@
 }
 }
 
+static uint8_t convert_pict_type( int pict_type, char pkt_flag_key, uint16_t* sflags )
+{
+ uint8_t retval = 0;
+ switch ( pict_type )
+ {
+ case AV_PICTURE_TYPE_P:
+ {
+ retval = HB_FRAME_P;
+ } break;
+
+ case AV_PICTURE_TYPE_B:
+ {
+ retval = HB_FRAME_B;
+ } break;
+
+ case AV_PICTURE_TYPE_S:
+ {
+ retval = HB_FRAME_P;
+ } break;
+
+ case AV_PICTURE_TYPE_SP:
+ {
+ retval = HB_FRAME_P;
+ } break;
+
+ case AV_PICTURE_TYPE_BI:
+ case AV_PICTURE_TYPE_SI:
+ case AV_PICTURE_TYPE_I:
+ {
+ *sflags |= HB_FRAME_REF;
+ if ( pkt_flag_key )
+ {
+ retval = HB_FRAME_IDR;
+ }
+ else
+ {
+ retval = HB_FRAME_I;
+ }
+ } break;
+
+ default:
+ {
+ if ( pkt_flag_key )
+ {
+ //buf->s.flags |= HB_FRAME_REF;
+ *sflags |= HB_FRAME_REF;
+ retval = HB_FRAME_KEY;
+ }
+ else
+ {
+ retval = HB_FRAME_REF;
+ }
+ } break;
+ }
+ return retval;
+}
+
 // Generate DTS by rearranging PTS in this sequence:
 // pts0 - delay, pts1 - delay, pts2 - delay, pts1, pts2, pts3...
 //
@@ -370,12 +450,20 @@
 // and return all queued buffers.
 if ( pv->delay_tail == NULL && buf != NULL )
 {
- pv->frameno_out++;
 // Use the cached frame info to get the start time of Nth frame
 // Note that start Nth frame != start time this buffer since the
 // output buffers have rearranged start times.
- int64_t start = get_frame_start( pv, pv->frameno_out );
- buf->s.renderOffset = start - pv->dts_delay;
+ if (pv->frameno_out < pv->job->areBframes)
+ {
+ int64_t start = get_frame_start( pv, pv->frameno_out );
+ buf->s.renderOffset = start - pv->dts_delay;
+ }
+ else
+ {
+ buf->s.renderOffset =
+ get_frame_start(pv, pv->frameno_out - pv->job->areBframes);
+ }
+ pv->frameno_out++;
 return buf;
 }
 else
@@ -384,13 +472,21 @@
 buf = pv->delay_head;
 while ( buf )
 {
- pv->frameno_out++;
 // Use the cached frame info to get the start time of Nth frame
 // Note that start Nth frame != start time this buffer since the
 // output buffers have rearranged start times.
- int64_t start = get_frame_start( pv, pv->frameno_out );
- buf->s.renderOffset = start - pv->dts_delay;
+ if (pv->frameno_out < pv->job->areBframes)
+ {
+ int64_t start = get_frame_start( pv, pv->frameno_out );
+ buf->s.renderOffset = start - pv->dts_delay;
+ }
+ else
+ {
+ buf->s.renderOffset = get_frame_start(pv,
+ pv->frameno_out - pv->job->areBframes);
+ }
 buf = buf->next;
+ pv->frameno_out++;
 }
 buf = pv->delay_head;
 pv->delay_head = pv->delay_tail = NULL;
@@ -399,7 +495,7 @@
 }
 else if ( buf )
 {
- buf->s.renderOffset = buf->s.start - pv->dts_delay;
+ buf->s.renderOffset = buf->s.start;
 return buf;
 }
 return NULL;
@@ -417,119 +513,98 @@
 hb_job_t * job = pv->job;
 AVFrame * frame;
 hb_buffer_t * in = *buf_in, * buf;
-
- if ( in->size <= 0 )
+ char final_flushing_call = (in->size <= 0);
+ if ( final_flushing_call )
 {
+ //make a flushing call to encode for codecs that can encode out of order
 /* EOF on input - send it downstream & say we're done */
- *buf_out = in;
 *buf_in = NULL;
- return HB_WORK_DONE;
+ frame = NULL;
+ }
+ else
+ {
+ frame = av_frame_alloc();
+ frame->data[0] = in->plane[0].data;
+ frame->data[1] = in->plane[1].data;
+ frame->data[2] = in->plane[2].data;
+ frame->linesize[0] = in->plane[0].stride;
+ frame->linesize[1] = in->plane[1].stride;
+ frame->linesize[2] = in->plane[2].stride;
+
+ // For constant quality, setting the quality in AVCodecContext 
+ // doesn't do the trick. It must be set in the AVFrame.
+ frame->quality = pv->context->global_quality;
+
+ // Remember info about this frame that we need to pass across
+ // the avcodec_encode_video call (since it reorders frames).
+ save_frame_info( pv, in );
+ compute_dts_offset( pv, in );
+
+ // Bizarro ffmpeg appears to require the input AVFrame.pts to be
+ // set to a frame number. Setting it to an actual pts causes
+ // jerky video.
+ // frame->pts = in->s.start;
+ frame->pts = pv->frameno_in++;
 }
-
- frame = avcodec_alloc_frame();
- frame->data[0] = in->plane[0].data;
- frame->data[1] = in->plane[1].data;
- frame->data[2] = in->plane[2].data;
- frame->linesize[0] = in->plane[0].stride;
- frame->linesize[1] = in->plane[1].stride;
- frame->linesize[2] = in->plane[2].stride;
-
- // For constant quality, setting the quality in AVCodecContext 
- // doesn't do the trick. It must be set in the AVFrame.
- frame->quality = pv->context->global_quality;
-
- // Bizarro ffmpeg appears to require the input AVFrame.pts to be
- // set to a frame number. Setting it to an actual pts causes
- // jerky video.
- // frame->pts = in->s.start;
- frame->pts = ++pv->frameno_in;
-
- // Remember info about this frame that we need to pass across
- // the avcodec_encode_video call (since it reorders frames).
- save_frame_info( pv, in );
- compute_dts_offset( pv, in );
 
 if ( pv->context->codec )
 {
 int ret;
 AVPacket pkt;
 int got_packet;
+ char still_flushing = final_flushing_call;
+ hb_buffer_t* buf_head = NULL;
+ hb_buffer_t* buf_last = NULL;
 
- av_init_packet(&pkt);
- /* Should be way too large */
- buf = hb_video_buffer_init( job->width, job->height );
- pkt.data = buf->data;
- pkt.size = buf->alloc;
-
- ret = avcodec_encode_video2( pv->context, &pkt, frame, &got_packet );
- if ( ret < 0 || pkt.size <= 0 || !got_packet )
+ do
 {
- hb_buffer_close( &buf );
- }
- else
- {
- int64_t frameno = pkt.pts;
- buf->size = pkt.size;
- buf->s.start = get_frame_start( pv, frameno );
- buf->s.stop = get_frame_stop( pv, frameno );
- buf->s.flags &= ~HB_FRAME_REF;
- switch ( pv->context->coded_frame->pict_type )
+ av_init_packet(&pkt);
+ /* Should be way too large */
+ buf = hb_video_buffer_init( job->width, job->height );
+ pkt.data = buf->data;
+ pkt.size = buf->alloc;
+
+ ret = avcodec_encode_video2( pv->context, &pkt, frame, &got_packet );
+ if ( ret < 0 || pkt.size <= 0 || !got_packet )
 {
- case AV_PICTURE_TYPE_P:
- {
- buf->s.frametype = HB_FRAME_P;
- } break;
-
- case AV_PICTURE_TYPE_B:
- {
- buf->s.frametype = HB_FRAME_B;
- } break;
-
- case AV_PICTURE_TYPE_S:
- {
- buf->s.frametype = HB_FRAME_P;
- } break;
-
- case AV_PICTURE_TYPE_SP:
- {
- buf->s.frametype = HB_FRAME_P;
- } break;
-
- case AV_PICTURE_TYPE_BI:
- case AV_PICTURE_TYPE_SI:
- case AV_PICTURE_TYPE_I:
+ hb_buffer_close( &buf );
+ still_flushing = 0;
+ }
+ else
+ {
+ int64_t frameno = pkt.pts;
+ buf->size = pkt.size;
+ buf->s.start = get_frame_start( pv, frameno );
+ buf->s.duration = get_frame_duration( pv, frameno );
+ buf->s.stop = buf->s.stop + buf->s.duration;
+ buf->s.flags &= ~HB_FRAME_REF;
+ buf->s.frametype = convert_pict_type( pv->context->coded_frame->pict_type, pkt.flags & AV_PKT_FLAG_KEY, &buf->s.flags );
+ buf = process_delay_list( pv, buf );
+
+ if (buf_head == NULL)
 {
- buf->s.flags |= HB_FRAME_REF;
- if ( pkt.flags & AV_PKT_FLAG_KEY )
- {
- buf->s.frametype = HB_FRAME_IDR;
- }
- else
- {
- buf->s.frametype = HB_FRAME_I;
- }
- } break;
-
- default:
+ buf_head = buf;
+ }
+ else
 {
- if ( pkt.flags & AV_PKT_FLAG_KEY )
- {
- buf->s.flags |= HB_FRAME_REF;
- buf->s.frametype = HB_FRAME_KEY;
- }
- else
- {
- buf->s.frametype = HB_FRAME_REF;
- }
- } break;
+ buf_last->next = buf;
+ }
+ buf_last = buf;
+ }
+ /* Write stats */
+ if (job->pass == 1 && pv->context->stats_out != NULL)
+ {
+ fprintf( pv->file, "%s", pv->context->stats_out );
 }
- buf = process_delay_list( pv, buf );
+ } while (still_flushing);
+ if (buf_last != NULL && final_flushing_call)
+ {
+ buf_last->next = in;
+ buf = buf_head;
 }
-
- if( job->pass == 1 )
+ else if (final_flushing_call)
 {
- /* Write stats */
- fprintf( pv->file, "%s", pv->context->stats_out );
+ buf = in;
 }
 }
 else
@@ -539,11 +614,11 @@
 hb_error( "encavcodec: codec context has uninitialized codec; skipping frame" );
 }
 
- avcodec_free_frame(&frame);
+ av_frame_free( &frame );
 
 *buf_out = buf;
 
- return HB_WORK_OK;
+ return final_flushing_call? HB_WORK_DONE : HB_WORK_OK;
 }

HandBrake-0.9.9.tar.bz2/libhb/encavcodecaudio.c -> HandBrake-0.10.0.tar.bz2/libhb/encavcodecaudio.c Changed

@@ -1,6 +1,6 @@
 /* encavcodecaudio.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -243,6 +243,9 @@
 w->config->extradata.length = context->extradata_size;
 }
 
+ audio->config.out.delay = av_rescale_q(context->delay, context->time_base,
+ (AVRational){1, 90000});
+
 return 0;
 }
 
@@ -293,6 +296,7 @@
 if (pv->context->codec != NULL)
 avcodec_flush_buffers(pv->context);
 hb_avcodec_close(pv->context);
+ av_free( pv->context );
 }
 
 if (pv->output_buf != NULL)
@@ -388,21 +392,14 @@
 if (got_packet && pkt.size)
 {
 out->size = pkt.size;
-
 // The output pts from libav is in context->time_base. Convert it back
 // to our timebase.
- //
- // Also account for the "delay" factor that libav seems to arbitrarily
- // subtract from the packet. Not sure WTH they think they are doing by
- // offsetting the value in a negative direction.
- out->s.start = av_rescale_q(pv->context->delay + pkt.pts,
- pv->context->time_base,
- (AVRational){1, 90000});
-
- out->s.stop = out->s.start + (90000 * pv->samples_per_frame /
- audio->config.out.samplerate);
-
- out->s.type = AUDIO_BUF;
+ out->s.start = av_rescale_q(pkt.pts, pv->context->time_base,
+ (AVRational){1, 90000});
+ out->s.duration = (double)90000 * pv->samples_per_frame /
+ audio->config.out.samplerate;
+ out->s.stop = out->s.start + out->s.duration;
+ out->s.type = AUDIO_BUF;
 out->s.frametype = HB_FRAME_AUDIO;
 }
 else

HandBrake-0.9.9.tar.bz2/libhb/enclame.c -> HandBrake-0.10.0.tar.bz2/libhb/enclame.c Changed

@@ -1,6 +1,6 @@
 /* enclame.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -94,7 +94,7 @@
 audio->config.out.samples_per_frame = 1152;
 
 pv->list = hb_list_init();
- pv->pts = -1;
+ pv->pts = AV_NOPTS_VALUE;
 
 return 0;
 }
@@ -145,9 +145,10 @@
 }
 }
 
- buf = hb_buffer_init( pv->output_bytes );
- buf->s.start = pts + 90000 * pos / pv->out_discrete_channels / sizeof( float ) / audio->config.out.samplerate;
- buf->s.stop = buf->s.start + 90000 * 1152 / audio->config.out.samplerate;
+ buf = hb_buffer_init( pv->output_bytes );
+ buf->s.start = pts + 90000 * pos / pv->out_discrete_channels / sizeof( float ) / audio->config.out.samplerate;
+ buf->s.duration = (double)90000 * 1152 / audio->config.out.samplerate;
+ buf->s.stop = buf->s.start + buf->s.duration;
 pv->pts = buf->s.stop;
 buf->size = lame_encode_buffer_float( 
 pv->lame, samples[0], samples[1],

HandBrake-0.9.9.tar.bz2/libhb/enctheora.c -> HandBrake-0.10.0.tar.bz2/libhb/enctheora.c Changed

@@ -1,6 +1,6 @@
 /* enctheora.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -51,11 +51,11 @@
 hb_get_tempory_filename( job->h, filename, "theroa.log" );
 if ( job->pass == 1 )
 {
- pv->file = fopen( filename, "wb" );
+ pv->file = hb_fopen(filename, "wb");
 }
 else
 {
- pv->file = fopen( filename, "rb" );
+ pv->file = hb_fopen(filename, "rb");
 }
 }
 
@@ -178,17 +178,17 @@
 
 th_comment_init( &tc );
 
- th_encode_flushheader( pv->ctx, &tc, &op );
- memcpy(w->config->theora.headers[0], &op, sizeof(op));
- memcpy(w->config->theora.headers[0] + sizeof(op), op.packet, op.bytes );
+ ogg_packet *header;
 
- th_encode_flushheader( pv->ctx, &tc, &op );
- memcpy(w->config->theora.headers[1], &op, sizeof(op));
- memcpy(w->config->theora.headers[1] + sizeof(op), op.packet, op.bytes );
-
- th_encode_flushheader( pv->ctx, &tc, &op );
- memcpy(w->config->theora.headers[2], &op, sizeof(op));
- memcpy(w->config->theora.headers[2] + sizeof(op), op.packet, op.bytes );
+ int ii;
+ for (ii = 0; ii < 3; ii++)
+ {
+ th_encode_flushheader( pv->ctx, &tc, &op );
+ header = (ogg_packet*)w->config->theora.headers[ii];
+ memcpy(header, &op, sizeof(op));
+ header->packet = w->config->theora.headers[ii] + sizeof(ogg_packet);
+ memcpy(header->packet, op.packet, op.bytes );
+ }
 
 th_comment_clear( &tc );
 
@@ -273,6 +273,7 @@
 if( bytes < 0 )
 {
 hb_error("Error requesting stats size in second pass.");
+ *job->done_error = HB_ERROR_UNKNOWN;
 *job->die = 1;
 return HB_WORK_DONE;
 }
@@ -291,6 +292,7 @@
 fread( pv->stat_buf+pv->stat_fill, 1, size, pv->file ) < size )
 {
 hb_error("Could not read frame data from two-pass data file!");
+ *job->done_error = HB_ERROR_UNKNOWN;
 *job->die = 1;
 return HB_WORK_DONE;
 }
@@ -304,6 +306,7 @@
 if( ret < 0 )
 {
 hb_error("Error submitting pass data in second pass.");
+ *job->done_error = HB_ERROR_UNKNOWN;
 *job->die = 1;
 return HB_WORK_DONE;
 }
@@ -349,12 +352,14 @@
 if( bytes < 0 )
 {
 fprintf(stderr,"Could not read two-pass data from encoder.\n");
+ *job->done_error = HB_ERROR_UNKNOWN;
 *job->die = 1;
 return HB_WORK_DONE;
 }
 if( fwrite( buffer, 1, bytes, pv->file ) < bytes)
 {
 fprintf(stderr,"Unable to write to two-pass data file.\n");
+ *job->done_error = HB_ERROR_UNKNOWN;
 *job->die = 1;
 return HB_WORK_DONE;
 }
@@ -362,15 +367,15 @@
 }
 th_encode_packetout( pv->ctx, 0, &op );
 
- buf = hb_buffer_init( op.bytes + sizeof(op) );
- memcpy(buf->data, &op, sizeof(op));
- memcpy(buf->data + sizeof(op), op.packet, op.bytes);
+ buf = hb_buffer_init(op.bytes);
+ memcpy(buf->data, op.packet, op.bytes);
 buf->f.fmt = AV_PIX_FMT_YUV420P;
 buf->f.width = frame_width;
 buf->f.height = frame_height;
 buf->s.frametype = ( th_packet_iskeyframe(&op) ) ? HB_FRAME_KEY : HB_FRAME_REF;
- buf->s.start = in->s.start;
- buf->s.stop = in->s.stop;
+ buf->s.start = in->s.start;
+ buf->s.stop = in->s.stop;
+ buf->s.duration = in->s.stop - in->s.start;
 
 *buf_out = buf;

HandBrake-0.9.9.tar.bz2/libhb/encvobsub.c -> HandBrake-0.10.0.tar.bz2/libhb/encvobsub.c Changed

HandBrake-0.9.9.tar.bz2/libhb/encvorbis.c -> HandBrake-0.10.0.tar.bz2/libhb/encvorbis.c Changed

@@ -1,6 +1,6 @@
 /* encvorbis.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -77,6 +77,7 @@
 audio->config.out.bitrate * 1000, -1))
 {
 hb_error("encvorbis: vorbis_encode_setup_managed() failed");
+ *job->done_error = HB_ERROR_INIT;
 *job->die = 1;
 return -1;
 }
@@ -89,6 +90,7 @@
 audio->config.out.quality / 10))
 {
 hb_error("encvorbis: vorbis_encode_setup_vbr() failed");
+ *job->done_error = HB_ERROR_INIT;
 *job->die = 1;
 return -1;
 }
@@ -98,6 +100,7 @@
 vorbis_encode_setup_init(&pv->vi))
 {
 hb_error("encvorbis: vorbis_encode_ctl(ratemanage2_set) OR vorbis_encode_setup_init() failed");
+ *job->done_error = HB_ERROR_INIT;
 *job->die = 1;
 return -1;
 }
@@ -114,11 +117,13 @@
 /* get the 3 headers */
 vorbis_analysis_headerout(&pv->vd, &pv->vc,
 &header[0], &header[1], &header[2]);
+ ogg_packet *pheader;
 for (i = 0; i < 3; i++)
 {
- memcpy(w->config->vorbis.headers[i], &header[i], sizeof(ogg_packet));
- memcpy(w->config->vorbis.headers[i] + sizeof(ogg_packet),
- header[i].packet, header[i].bytes);
+ pheader = (ogg_packet*)w->config->theora.headers[i];
+ memcpy(pheader, &header[i], sizeof(ogg_packet));
+ pheader->packet = w->config->theora.headers[i] + sizeof(ogg_packet);
+ memcpy(pheader->packet, header[i].packet, header[i].bytes );
 }
 
 pv->input_samples = pv->out_discrete_channels * OGGVORBIS_FRAME_SIZE;
@@ -180,10 +185,8 @@
 
 if( vorbis_bitrate_flushpacket( &pv->vd, &op ) )
 {
- buf = hb_buffer_init( sizeof( ogg_packet ) + op.bytes );
- memcpy( buf->data, &op, sizeof( ogg_packet ) );
- memcpy( buf->data + sizeof( ogg_packet ), op.packet,
- op.bytes );
+ buf = hb_buffer_init( op.bytes );
+ memcpy( buf->data, op.packet, op.bytes );
 blocksize = vorbis_packet_blocksize(&pv->vi, &op);
 
 buf->s.type = AUDIO_BUF;
@@ -191,6 +194,7 @@
 
 buf->s.start = (int64_t)(vorbis_granule_time(&pv->vd, op.granulepos) * 90000);
 buf->s.stop = (int64_t)(vorbis_granule_time(&pv->vd, (pv->prev_blocksize + blocksize)/4 + op.granulepos) * 90000);
+ buf->s.duration = buf->s.stop - buf->s.start;
 /* The stop time isn't accurate for the first ~3 packets, as the actual blocksize depends on the previous _and_ current packets. */
 pv->prev_blocksize = blocksize;
 return buf;

HandBrake-0.9.9.tar.bz2/libhb/encx264.c -> HandBrake-0.10.0.tar.bz2/libhb/encx264.c Changed

@@ -1,6 +1,6 @@
 /* encx264.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -55,11 +55,10 @@
 
 uint32_t frames_in;
 uint32_t frames_out;
- uint32_t frames_split; // number of frames we had to split
- int chap_mark; // saved chap mark when we're propagating it
 int64_t last_stop; // Debugging - stop time of previous input frame
- int64_t next_chap;
 
+ hb_list_t *delayed_chapters;
+ int64_t next_chapter_pts;
 struct {
 int64_t duration;
 } frame_info[FRAME_INFO_SIZE];
@@ -67,6 +66,13 @@
 char filename[1024];
 };
 
+// used in delayed_chapters list
+struct chapter_s
+{
+ int index;
+ int64_t start;
+};
+
 /***********************************************************************
 * hb_work_encx264_init
 ***********************************************************************
@@ -82,21 +88,41 @@
 w->private_data = pv;
 
 pv->job = job;
+ pv->next_chapter_pts = AV_NOPTS_VALUE;
+ pv->delayed_chapters = hb_list_init();
 
- if( x264_param_default_preset( &param, job->x264_preset, job->x264_tune ) < 0 )
+ if (x264_param_default_preset(&param,
+ job->encoder_preset, job->encoder_tune) < 0)
 {
 free( pv );
 pv = NULL;
 return 1;
 }
 
+ /* If the PSNR or SSIM tunes are in use, enable the relevant metric */
+ if (job->encoder_tune != NULL && *job->encoder_tune)
+ {
+ char *tmp = strdup(job->encoder_tune);
+ char *tok = strtok(tmp, ",./-+");
+ do
+ {
+ if (!strncasecmp(tok, "psnr", 4))
+ {
+ param.analyse.b_psnr = 1;
+ break;
+ }
+ if (!strncasecmp(tok, "ssim", 4))
+ {
+ param.analyse.b_ssim = 1;
+ break;
+ }
+ }
+ while ((tok = strtok(NULL, ",./-+")) != NULL);
+ free(tmp);
+ }
+
 /* Some HandBrake-specific defaults; users can override them
- * using the advanced_opts string. */
- 
- /* Enable metrics */
- param.analyse.b_psnr = 1;
- param.analyse.b_ssim = 1;
- 
+ * using the encoder_options string. */
 if( job->pass == 2 && job->cfr != 1 )
 {
 hb_interjob_t * interjob = hb_interjob_get( job->h );
@@ -166,11 +192,11 @@
 param.vui.i_colmatrix = job->title->color_matrix;
 }
 
- /* place job->advanced_opts in an hb_dict_t for convenience */
+ /* place job->encoder_options in an hb_dict_t for convenience */
 hb_dict_t * x264_opts = NULL;
- if( job->advanced_opts != NULL && *job->advanced_opts != '\0' )
+ if (job->encoder_options != NULL && *job->encoder_options)
 {
- x264_opts = hb_encopts_to_dict( job->advanced_opts, job->vcodec );
+ x264_opts = hb_encopts_to_dict(job->encoder_options, job->vcodec);
 }
 /* iterate through x264_opts and have libx264 parse the options for us */
 int ret;
@@ -188,7 +214,7 @@
 hb_dict_free( &x264_opts );
 
 /* Reload colorimetry settings in case custom values were set
- * in the advanced_opts string */
+ * in the encoder_options string */
 job->color_matrix_code = 4;
 job->color_prim = param.vui.i_colorprim;
 job->color_transfer = param.vui.i_transfer;
@@ -217,7 +243,7 @@
 hb_log( "encx264: min-keyint: %s, keyint: %s", min, max );
 }
 
- /* Settings which can't be overriden in the advanced_opts string
+ /* Settings which can't be overriden in the encoder_options string
 * (muxer-specific settings, resolution, ratecontrol, etc.). */
 
 /* Disable annexb. Inserts size into nal header instead of start code. */
@@ -230,9 +256,6 @@
 {
 param.vui.i_sar_width = job->anamorphic.par_width;
 param.vui.i_sar_height = job->anamorphic.par_height;
-
- hb_log( "encx264: encoding with stored aspect %d/%d",
- param.vui.i_sar_width, param.vui.i_sar_height );
 }
 
 if( job->vquality >= 0 )
@@ -240,13 +263,14 @@
 /* Constant RF */
 param.rc.i_rc_method = X264_RC_CRF;
 param.rc.f_rf_constant = job->vquality;
- hb_log( "encx264: Encoding at constant RF %f", param.rc.f_rf_constant );
+ hb_log( "encx264: encoding at constant RF %f", param.rc.f_rf_constant );
 }
 else
 {
 /* Average bitrate */
 param.rc.i_rc_method = X264_RC_ABR;
 param.rc.i_bitrate = job->vbitrate;
+ hb_log( "encx264: encoding at average bitrate %d", param.rc.i_bitrate );
 if( job->pass > 0 && job->pass < 3 )
 {
 memset( pv->filename, 0, 1024 );
@@ -268,19 +292,19 @@
 }
 
 /* Apply profile and level settings last, if present. */
- if (job->h264_profile != NULL && *job->h264_profile)
+ if (job->encoder_profile != NULL && *job->encoder_profile)
 {
- if (hb_apply_h264_profile(&param, job->h264_profile, 1))
+ if (hb_apply_h264_profile(&param, job->encoder_profile, 1))
 {
 free(pv);
 pv = NULL;
 return 1;
 }
 }
- if (job->h264_level != NULL && *job->h264_level)
+ if (job->encoder_level != NULL && *job->encoder_level)
 {
- if (hb_apply_h264_level(&param, job->h264_level,
- job->h264_profile, 1) < 0)
+ if (hb_apply_h264_level(&param, job->encoder_level,
+ job->encoder_profile, 1) < 0)
 {
 free(pv);
 pv = NULL;
@@ -306,6 +330,19 @@
 job->areBframes = 1;
 }
 
+ /* Log the unparsed x264 options string. */
+ char *x264_opts_unparsed = hb_x264_param_unparse(job->encoder_preset,
+ job->encoder_tune,
+ job->encoder_options,
+ job->encoder_profile,
+ job->encoder_level,
+ job->width, job->height);
+ if( x264_opts_unparsed != NULL )
+ {
+ hb_log( "encx264: unparsed options: %s", x264_opts_unparsed );
+ }
+ free( x264_opts_unparsed );
+
 hb_deep_log( 2, "encx264: opening libx264 (pass %d)", job->pass );
 pv->x264 = x264_encoder_open( &param );
 if ( pv->x264 == NULL )
@@ -347,11 +384,17 @@
 {
 hb_work_private_t * pv = w->private_data;
 
- if ( pv->frames_split )
+ if (pv->delayed_chapters != NULL)
 {
- hb_log( "encx264: %u frames had to be split (%u in, %u out)",
- pv->frames_split, pv->frames_in, pv->frames_out );
+ struct chapter_s *item;
+ while ((item = hb_list_item(pv->delayed_chapters, 0)) != NULL)
+ {
+ hb_list_rem(pv->delayed_chapters, item);
+ free(item);
+ }
+ hb_list_close(&pv->delayed_chapters);
 }
+
 free( pv->grey_data );
 x264_encoder_close( pv->x264 );
 free( pv );
@@ -389,9 +432,9 @@
 buf->s.frametype = 0;
 
 // use the pts to get the original frame's duration.
- int64_t duration = get_frame_duration( pv, pic_out->i_pts );
- buf->s.start = pic_out->i_pts;
- buf->s.stop = pic_out->i_pts + duration;
+ buf->s.duration = get_frame_duration( pv, pic_out->i_pts );
+ buf->s.start = pic_out->i_pts;
+ buf->s.stop = buf->s.start + buf->s.duration;
 buf->s.renderOffset = pic_out->i_dts;
 if ( !w->config->h264.init_delay && pic_out->i_dts < 0 )
 {
@@ -483,10 +526,30 @@
 frame's presentation time stamp is at or after
 the marker's time stamp, use this as the
 chapter start. */
- if( pv->next_chap != 0 && pv->next_chap <= pic_out->i_pts )
+ if (pv->next_chapter_pts != AV_NOPTS_VALUE &&
+ pv->next_chapter_pts <= pic_out->i_pts)
 {
- pv->next_chap = 0;
- buf->s.new_chap = pv->chap_mark;
+ // we're no longer looking for this chapter
+ pv->next_chapter_pts = AV_NOPTS_VALUE;
+
+ // get the chapter index from the list
+ struct chapter_s *item = hb_list_item(pv->delayed_chapters, 0);
+ if (item != NULL)
+ {
+ // we're done with this chapter
+ buf->s.new_chap = item->index;
+ hb_list_rem(pv->delayed_chapters, item);
+ free(item);
+
+ // we may still have another pending chapter
+ item = hb_list_item(pv->delayed_chapters, 0);
+ if (item != NULL)
+ {
+ // we're looking for this one now
+ // we still need it, don't remove it
+ pv->next_chapter_pts = item->start;
+ }
+ }
 }
 }
 
@@ -525,10 +588,24 @@
 when this frame finally pops out of the encoder we'll mark
 its buffer as the start of a chapter. */
 pv->pic_in.i_type = X264_TYPE_IDR;
- if( pv->next_chap == 0 )
+ if (pv->next_chapter_pts == AV_NOPTS_VALUE)
+ {
+ pv->next_chapter_pts = in->s.start;
+ }
+ /*
+ * Chapter markers are sometimes so close we can get a new one before the
+ * previous marker has been through the encoding queue.
+ *
+ * Dropping markers can cause weird side-effects downstream, including but
+ * not limited to missing chapters in the output, so we need to save it
+ * somehow.
+ */
+ struct chapter_s *item = malloc(sizeof(struct chapter_s));
+ if (item != NULL)
 {
- pv->next_chap = in->s.start;
- pv->chap_mark = in->s.new_chap;
+ item->start = in->s.start;
+ item->index = in->s.new_chap;
+ hb_list_add(pv->delayed_chapters, item);
 }
 /* don't let 'work_loop' put a chapter mark on the wrong buffer */
 in->s.new_chap = 0;

HandBrake-0.9.9.tar.bz2/libhb/encx264.h -> HandBrake-0.10.0.tar.bz2/libhb/encx264.h Changed

HandBrake-0.10.0.tar.bz2/libhb/encx265.c Added

@@ -0,0 +1,576 @@
+/* encx265.c
+
+ Copyright (c) 2003-2014 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+#ifdef USE_X265
+
+#include "hb.h"
+#include "hb_dict.h"
+#include "x265.h"
+
+int encx265Init (hb_work_object_t*, hb_job_t*);
+int encx265Work (hb_work_object_t*, hb_buffer_t**, hb_buffer_t**);
+void encx265Close(hb_work_object_t*);
+
+hb_work_object_t hb_encx265 =
+{
+ WORK_ENCX265,
+ "H.265/HEVC encoder (libx265)",
+ encx265Init,
+ encx265Work,
+ encx265Close,
+};
+
+#define FRAME_INFO_MAX2 (8) // 2^8 = 256; 90000/256 = 352 frames/sec
+#define FRAME_INFO_MIN2 (17) // 2^17 = 128K; 90000/131072 = 1.4 frames/sec
+#define FRAME_INFO_SIZE (1 << (FRAME_INFO_MIN2 - FRAME_INFO_MAX2 + 1))
+#define FRAME_INFO_MASK (FRAME_INFO_SIZE - 1)
+
+static const char * const hb_x265_encopt_synonyms[][2] =
+{
+ { "me", "motion", },
+ { NULL, NULL, },
+};
+
+struct hb_work_private_s
+{
+ hb_job_t *job;
+ x265_encoder *x265;
+ x265_param *param;
+
+ int64_t last_stop;
+ uint32_t frames_in;
+
+ hb_list_t *delayed_chapters;
+ int64_t next_chapter_pts;
+
+ struct
+ {
+ int64_t duration;
+ }
+ frame_info[FRAME_INFO_SIZE];
+
+ char csvfn[1024];
+};
+
+// used in delayed_chapters list
+struct chapter_s
+{
+ int index;
+ int64_t start;
+};
+
+static int param_parse(x265_param *param, const char *key, const char *value)
+{
+ int ret = x265_param_parse(param, key, value);
+ // let x265 sanity check the options for us
+ switch (ret)
+ {
+ case X265_PARAM_BAD_NAME:
+ hb_log("encx265: unknown option '%s'", key);
+ break;
+ case X265_PARAM_BAD_VALUE:
+ hb_log("encx265: bad argument '%s=%s'", key, value ? value : "(null)");
+ break;
+ default:
+ break;
+ }
+ return ret;
+}
+
+/***********************************************************************
+ * hb_work_encx265_init
+ ***********************************************************************
+ *
+ **********************************************************************/
+int encx265Init(hb_work_object_t *w, hb_job_t *job)
+{
+ hb_work_private_t *pv = calloc(1, sizeof(hb_work_private_t));
+ pv->next_chapter_pts = AV_NOPTS_VALUE;
+ pv->delayed_chapters = hb_list_init();
+ pv->job = job;
+ w->private_data = pv;
+ int ret, vrate, vrate_base;
+ x265_nal *nal;
+ uint32_t nnal;
+
+ x265_param *param = pv->param = x265_param_alloc();
+
+ if (x265_param_default_preset(param,
+ job->encoder_preset, job->encoder_tune) < 0)
+ {
+ goto fail;
+ }
+
+ /* If the PSNR or SSIM tunes are in use, enable the relevant metric */
+ param->bEnablePsnr = param->bEnableSsim = 0;
+ if (job->encoder_tune != NULL && *job->encoder_tune)
+ {
+ char *tmp = strdup(job->encoder_tune);
+ char *tok = strtok(tmp, ",./-+");
+ do
+ {
+ if (!strncasecmp(tok, "psnr", 4))
+ {
+ param->bEnablePsnr = 1;
+ break;
+ }
+ if (!strncasecmp(tok, "ssim", 4))
+ {
+ param->bEnableSsim = 1;
+ break;
+ }
+ }
+ while ((tok = strtok(NULL, ",./-+")) != NULL);
+ free(tmp);
+ }
+
+ /*
+ * Some HandBrake-specific defaults; users can override them
+ * using the encoder_options string.
+ */
+ hb_reduce(&vrate, &vrate_base, job->vrate, job->vrate_base);
+ param->fpsNum = vrate;
+ param->fpsDenom = vrate_base;
+ param->keyframeMin = (int)((double)vrate / (double)vrate_base + 0.5);
+ param->keyframeMax = param->keyframeMin * 10;
+
+ /*
+ * Video Signal Type (color description only).
+ *
+ * Use x265_param_parse (let x265 determine which bEnable
+ * flags, if any, should be set in the x265_param struct).
+ */
+ char colorprim[11], transfer[11], colormatrix[11];
+ switch (job->color_matrix_code)
+ {
+ case 1: // ITU BT.601 DVD or SD TV content (NTSC)
+ strcpy(colorprim, "smpte170m");
+ strcpy(transfer, "bt709");
+ strcpy(colormatrix, "smpte170m");
+ break;
+ case 2: // ITU BT.601 DVD or SD TV content (PAL)
+ strcpy(colorprim, "bt470bg");
+ strcpy(transfer, "bt709");
+ strcpy(colormatrix, "smpte170m");
+ break;
+ case 3: // ITU BT.709 HD content
+ strcpy(colorprim, "bt709");
+ strcpy(transfer, "bt709");
+ strcpy(colormatrix, "bt709");
+ break;
+ case 4: // custom
+ snprintf(colorprim, sizeof(colorprim), "%d", job->color_prim);
+ snprintf(transfer, sizeof(transfer), "%d", job->color_transfer);
+ snprintf(colormatrix, sizeof(colormatrix), "%d", job->color_matrix);
+ break;
+ default: // detected during scan
+ snprintf(colorprim, sizeof(colorprim), "%d", job->title->color_prim);
+ snprintf(transfer, sizeof(transfer), "%d", job->title->color_transfer);
+ snprintf(colormatrix, sizeof(colormatrix), "%d", job->title->color_matrix);
+ break;
+ }
+ if (param_parse(param, "colorprim", colorprim) ||
+ param_parse(param, "transfer", transfer) ||
+ param_parse(param, "colormatrix", colormatrix))
+ {
+ goto fail;
+ }
+
+ /* iterate through x265_opts and parse the options */
+ hb_dict_entry_t *entry = NULL;
+ hb_dict_t *x265_opts = hb_encopts_to_dict(job->encoder_options, job->vcodec);
+ while ((entry = hb_dict_next(x265_opts, entry)) != NULL)
+ {
+ // here's where the strings are passed to libx265 for parsing
+ if (param_parse(param, entry->key, entry->value))
+ {
+ hb_dict_free(&x265_opts);
+ goto fail;
+ }
+ }
+ hb_dict_free(&x265_opts);
+
+ /*
+ * Reload colorimetry settings in case custom
+ * values were set in the encoder_options string.
+ */
+ job->color_matrix_code = 4;
+ job->color_prim = param->vui.colorPrimaries;
+ job->color_transfer = param->vui.transferCharacteristics;
+ job->color_matrix = param->vui.matrixCoeffs;
+
+ /*
+ * Settings which can't be overriden in the encodeer_options string
+ * (muxer-specific settings, resolution, ratecontrol, etc.).
+ */
+ param->bRepeatHeaders = 0;
+ param->sourceWidth = job->width;
+ param->sourceHeight = job->height;
+ if (job->anamorphic.mode)
+ {
+ /*
+ * Let x265 determnine whether to use an aspect ratio
+ * index vs. the extended SAR index + SAR width/height.
+ */
+ char sar[22];
+ snprintf(sar, sizeof(sar), "%d:%d",
+ job->anamorphic.par_width, job->anamorphic.par_height);
+ if (param_parse(param, "sar", sar))
+ {
+ goto fail;
+ }
+ }
+
+ if (job->vquality > 0)
+ {
+ param->rc.rateControlMode = X265_RC_CRF;
+ param->rc.rfConstant = job->vquality;
+ }
+ else
+ {
+ param->rc.rateControlMode = X265_RC_ABR;
+ param->rc.bitrate = job->vbitrate;
+ if (job->pass > 0 && job->pass < 3)
+ {
+ char stats_file[1024] = "";
+ char pass[2];
+ snprintf(pass, sizeof(pass), "%d", job->pass);
+ hb_get_tempory_filename(job->h, stats_file, "x265.log");
+ if (param_parse(param, "stats", stats_file) ||
+ param_parse(param, "pass", pass))
+ {
+ goto fail;
+ }
+ if (job->pass == 1 && job->fastfirstpass == 0 &&
+ param_parse(param, "slow-firstpass", "1"))
+ {
+ goto fail;
+ }
+ }
+ }
+
+ /* statsfile (but not 2-pass) */
+ memset(pv->csvfn, 0, sizeof(pv->csvfn));
+ if (param->logLevel >= X265_LOG_DEBUG)
+ {
+ if (param->csvfn == NULL)
+ {
+ hb_get_tempory_filename(job->h, pv->csvfn, "x265.csv");
+ param->csvfn = pv->csvfn;
+ }
+ else
+ {
+ strncpy(pv->csvfn, param->csvfn, sizeof(pv->csvfn));
+ }
+ }
+
+ /* Apply profile and level settings last. */
+ if (x265_param_apply_profile(param, job->encoder_profile) < 0)
+ {
+ goto fail;
+ }
+
+ /* we should now know whether B-frames are enabled */
+ job->areBframes = (param->bframes > 0) + (param->bframes > 0 &&
+ param->bBPyramid > 0);
+
+ pv->x265 = x265_encoder_open(param);
+ if (pv->x265 == NULL)
+ {
+ hb_error("encx265: x265_encoder_open failed.");
+ goto fail;
+ }
+
+ /*
+ * x265's output (headers and bitstream) are in Annex B format.
+ *
+ * Write the header as is, and let the muxer reformat
+ * the extradata and output bitstream properly for us.
+ */
+ ret = x265_encoder_headers(pv->x265, &nal, &nnal);
+ if (ret < 0)
+ {
+ hb_error("encx265: x265_encoder_headers failed (%d)", ret);
+ goto fail;
+ }
+ if (ret > sizeof(w->config->h265.headers))
+ {
+ hb_error("encx265: bitstream headers too large (%d)", ret);
+ goto fail;
+ }
+ memcpy(w->config->h265.headers, nal->payload, ret);
+ w->config->h265.headers_length = ret;
+
+ return 0;
+
+fail:
+ w->private_data = NULL;
+ free(pv);
+ return 1;
+}
+
+void encx265Close(hb_work_object_t *w)
+{
+ hb_work_private_t *pv = w->private_data;
+
+ if (pv->delayed_chapters != NULL)
+ {
+ struct chapter_s *item;
+ while ((item = hb_list_item(pv->delayed_chapters, 0)) != NULL)
+ {
+ hb_list_rem(pv->delayed_chapters, item);
+ free(item);
+ }
+ hb_list_close(&pv->delayed_chapters);
+ }
+
+ x265_param_free(pv->param);
+ x265_encoder_close(pv->x265);
+ free(pv);
+ w->private_data = NULL;
+}
+
+/*
+ * see comments in definition of 'frame_info' in pv struct for description
+ * of what these routines are doing.
+ */
+static void save_frame_info(hb_work_private_t *pv, hb_buffer_t *in)
+{
+ int i = (in->s.start >> FRAME_INFO_MAX2) & FRAME_INFO_MASK;
+ pv->frame_info[i].duration = in->s.stop - in->s.start;
+}
+static int64_t get_frame_duration(hb_work_private_t * pv, int64_t pts)
+{
+ int i = (pts >> FRAME_INFO_MAX2) & FRAME_INFO_MASK;
+ return pv->frame_info[i].duration;
+}
+
+static hb_buffer_t* nal_encode(hb_work_object_t *w,
+ x265_picture *pic_out,
+ x265_nal *nal, uint32_t nnal)
+{
+ hb_work_private_t *pv = w->private_data;
+ hb_job_t *job = pv->job;
+ hb_buffer_t *buf = NULL;
+ int i;
+
+ if (nnal <= 0)
+ {
+ return NULL;
+ }
+
+ buf = hb_video_buffer_init(job->width, job->height);
+ if (buf == NULL)
+ {
+ return NULL;
+ }
+
+ buf->size = 0;
+ // copy the bitstream data
+ for (i = 0; i < nnal; i++)
+ {
+ memcpy(buf->data + buf->size, nal[i].payload, nal[i].sizeBytes);
+ buf->size += nal[i].sizeBytes;
+ }
+
+ // use the pts to get the original frame's duration.
+ buf->s.duration = get_frame_duration(pv, pic_out->pts);
+ buf->s.stop = pic_out->pts + buf->s.duration;
+ buf->s.start = pic_out->pts;
+ buf->s.renderOffset = pic_out->dts;
+ if (w->config->h264.init_delay == 0 && pic_out->dts < 0)
+ {
+ w->config->h264.init_delay -= pic_out->dts;
+ }
+
+ switch (pic_out->sliceType)
+ {
+ case X265_TYPE_IDR:
+ buf->s.frametype = HB_FRAME_IDR;
+ break;
+ case X265_TYPE_I:
+ buf->s.frametype = HB_FRAME_I;
+ break;
+ case X265_TYPE_P:
+ buf->s.frametype = HB_FRAME_P;
+ break;
+ case X265_TYPE_B:
+ buf->s.frametype = HB_FRAME_B;
+ break;
+ case X265_TYPE_BREF:
+ buf->s.frametype = HB_FRAME_BREF;
+ break;
+ default:
+ buf->s.frametype = 0;
+ break;
+ }
+
+ if (pv->next_chapter_pts != AV_NOPTS_VALUE &&
+ pv->next_chapter_pts <= pic_out->pts &&
+ pic_out->sliceType == X265_TYPE_IDR)
+ {
+ // we're no longer looking for this chapter
+ pv->next_chapter_pts = AV_NOPTS_VALUE;
+
+ // get the chapter index from the list
+ struct chapter_s *item = hb_list_item(pv->delayed_chapters, 0);
+ if (item != NULL)
+ {
+ // we're done with this chapter
+ hb_list_rem(pv->delayed_chapters, item);
+ buf->s.new_chap = item->index;
+ free(item);
+
+ // we may still have another pending chapter
+ item = hb_list_item(pv->delayed_chapters, 0);
+ if (item != NULL)
+ {
+ // we're looking for this one now
+ // we still need it, don't remove it
+ pv->next_chapter_pts = item->start;
+ }
+ }
+ }
+
+ // discard empty buffers (no video)
+ if (buf->size <= 0)
+ {
+ hb_buffer_close(&buf);
+ }
+ return buf;
+}
+
+static hb_buffer_t* x265_encode(hb_work_object_t *w, hb_buffer_t *in)
+{
+ hb_work_private_t *pv = w->private_data;
+ hb_job_t *job = pv->job;
+ x265_picture pic_in, pic_out;
+ x265_nal *nal;
+ uint32_t nnal;
+
+ x265_picture_init(pv->param, &pic_in);
+
+ pic_in.stride[0] = in->plane[0].stride;
+ pic_in.stride[1] = in->plane[1].stride;
+ pic_in.stride[2] = in->plane[2].stride;
+ pic_in.planes[0] = in->plane[0].data;
+ pic_in.planes[1] = in->plane[1].data;
+ pic_in.planes[2] = in->plane[2].data;
+ pic_in.poc = pv->frames_in++;
+ pic_in.pts = in->s.start;
+ pic_in.bitDepth = 8;
+
+ if (in->s.new_chap && job->chapter_markers)
+ {
+ if (pv->next_chapter_pts == AV_NOPTS_VALUE)
+ {
+ pv->next_chapter_pts = in->s.start;
+ }
+ /*
+ * Chapter markers are sometimes so close we can get a new one before
+ * the previous marker has been through the encoding queue.
+ *
+ * Dropping markers can cause weird side-effects downstream, including
+ * but not limited to missing chapters in the output, so we need to save
+ * it somehow.
+ */
+ struct chapter_s *item = malloc(sizeof(struct chapter_s));
+ if (item != NULL)
+ {
+ item->start = in->s.start;
+ item->index = in->s.new_chap;
+ hb_list_add(pv->delayed_chapters, item);
+ }
+ /* don't let 'work_loop' put a chapter mark on the wrong buffer */
+ in->s.new_chap = 0;
+ /*
+ * Chapters have to start with an IDR frame so request that this frame be
+ * coded as IDR. Since there may be up to 16 frames currently buffered in
+ * the encoder, remember the timestamp so when this frame finally pops out
+ * of the encoder we'll mark its buffer as the start of a chapter.
+ */
+ pic_in.sliceType = X265_TYPE_IDR;
+ }
+ else
+ {
+ pic_in.sliceType = X265_TYPE_AUTO;
+ }
+
+ if (pv->last_stop != in->s.start)
+ {
+ hb_log("encx265 input continuity err: last stop %"PRId64" start %"PRId64,
+ pv->last_stop, in->s.start);
+ }
+ pv->last_stop = in->s.stop;
+ save_frame_info(pv, in);
+
+ if (x265_encoder_encode(pv->x265, &nal, &nnal, &pic_in, &pic_out) > 0)
+ {
+ return nal_encode(w, &pic_out, nal, nnal);
+ }
+ return NULL;
+}
+
+int encx265Work(hb_work_object_t *w, hb_buffer_t **buf_in, hb_buffer_t **buf_out)
+{
+ hb_work_private_t *pv = w->private_data;
+ hb_buffer_t *in = *buf_in;
+
+ if (in->size <= 0)
+ {
+ uint32_t nnal;
+ x265_nal *nal;
+ x265_picture pic_out;
+ hb_buffer_t *last_buf = NULL;
+
+ // flush delayed frames
+ while (x265_encoder_encode(pv->x265, &nal, &nnal, NULL, &pic_out) > 0)
+ {
+ hb_buffer_t *buf = nal_encode(w, &pic_out, nal, nnal);
+ if (buf != NULL)
+ {
+ if (last_buf == NULL)
+ {
+ *buf_out = buf;
+ }
+ else
+ {
+ last_buf->next = buf;
+ }
+ last_buf = buf;
+ }
+ }
+
+ // add the EOF to the end of the chain
+ if (last_buf == NULL)
+ {
+ *buf_out = in;
+ }
+ else
+ {
+ last_buf->next = in;
+ }
+
+ *buf_in = NULL;
+ return HB_WORK_DONE;
+ }
+
+ *buf_out = x265_encode(w, in);
+ return HB_WORK_OK;
+}
+
+const char* hb_x265_encopt_name(const char *name)
+{
+ int i;
+ for (i = 0; hb_x265_encopt_synonyms[i][0] != NULL; i++)
+ if (!strcmp(name, hb_x265_encopt_synonyms[i][1]))
+ return hb_x265_encopt_synonyms[i][0];
+ return name;
+}
+
+#endif

HandBrake-0.10.0.tar.bz2/libhb/extras Added

HandBrake-0.10.0.tar.bz2/libhb/extras/cl.h Added

@@ -0,0 +1,1209 @@
+/*******************************************************************************
+ * Copyright (c) 2008 - 2012 The Khronos Group Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and/or associated documentation files (the
+ * "Materials"), to deal in the Materials without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Materials, and to
+ * permit persons to whom the Materials are 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 Materials.
+ *
+ * THE MATERIALS ARE 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
+ * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+ ******************************************************************************/
+
+#ifndef __OPENCL_CL_H
+#define __OPENCL_CL_H
+
+#include "cl_platform.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/******************************************************************************/
+
+typedef struct _cl_platform_id * cl_platform_id;
+typedef struct _cl_device_id * cl_device_id;
+typedef struct _cl_context * cl_context;
+typedef struct _cl_command_queue * cl_command_queue;
+typedef struct _cl_mem * cl_mem;
+typedef struct _cl_program * cl_program;
+typedef struct _cl_kernel * cl_kernel;
+typedef struct _cl_event * cl_event;
+typedef struct _cl_sampler * cl_sampler;
+
+typedef cl_uint cl_bool; /* WARNING! Unlike cl_ types in cl_platform.h, cl_bool is not guaranteed to be the same size as the bool in kernels. */
+typedef cl_ulong cl_bitfield;
+typedef cl_bitfield cl_device_type;
+typedef cl_uint cl_platform_info;
+typedef cl_uint cl_device_info;
+typedef cl_bitfield cl_device_fp_config;
+typedef cl_uint cl_device_mem_cache_type;
+typedef cl_uint cl_device_local_mem_type;
+typedef cl_bitfield cl_device_exec_capabilities;
+typedef cl_bitfield cl_command_queue_properties;
+typedef intptr_t cl_device_partition_property;
+typedef cl_bitfield cl_device_affinity_domain;
+
+typedef intptr_t cl_context_properties;
+typedef cl_uint cl_context_info;
+typedef cl_uint cl_command_queue_info;
+typedef cl_uint cl_channel_order;
+typedef cl_uint cl_channel_type;
+typedef cl_bitfield cl_mem_flags;
+typedef cl_uint cl_mem_object_type;
+typedef cl_uint cl_mem_info;
+typedef cl_bitfield cl_mem_migration_flags;
+typedef cl_uint cl_image_info;
+typedef cl_uint cl_buffer_create_type;
+typedef cl_uint cl_addressing_mode;
+typedef cl_uint cl_filter_mode;
+typedef cl_uint cl_sampler_info;
+typedef cl_bitfield cl_map_flags;
+typedef cl_uint cl_program_info;
+typedef cl_uint cl_program_build_info;
+typedef cl_uint cl_program_binary_type;
+typedef cl_int cl_build_status;
+typedef cl_uint cl_kernel_info;
+typedef cl_uint cl_kernel_arg_info;
+typedef cl_uint cl_kernel_arg_address_qualifier;
+typedef cl_uint cl_kernel_arg_access_qualifier;
+typedef cl_bitfield cl_kernel_arg_type_qualifier;
+typedef cl_uint cl_kernel_work_group_info;
+typedef cl_uint cl_event_info;
+typedef cl_uint cl_command_type;
+typedef cl_uint cl_profiling_info;
+
+
+typedef struct _cl_image_format {
+ cl_channel_order image_channel_order;
+ cl_channel_type image_channel_data_type;
+} cl_image_format;
+
+typedef struct _cl_image_desc {
+ cl_mem_object_type image_type;
+ size_t image_width;
+ size_t image_height;
+ size_t image_depth;
+ size_t image_array_size;
+ size_t image_row_pitch;
+ size_t image_slice_pitch;
+ cl_uint num_mip_levels;
+ cl_uint num_samples;
+ cl_mem buffer;
+} cl_image_desc;
+
+typedef struct _cl_buffer_region {
+ size_t origin;
+ size_t size;
+} cl_buffer_region;
+
+
+/******************************************************************************/
+
+/* Error Codes */
+#define CL_SUCCESS 0
+#define CL_DEVICE_NOT_FOUND -1
+#define CL_DEVICE_NOT_AVAILABLE -2
+#define CL_COMPILER_NOT_AVAILABLE -3
+#define CL_MEM_OBJECT_ALLOCATION_FAILURE -4
+#define CL_OUT_OF_RESOURCES -5
+#define CL_OUT_OF_HOST_MEMORY -6
+#define CL_PROFILING_INFO_NOT_AVAILABLE -7
+#define CL_MEM_COPY_OVERLAP -8
+#define CL_IMAGE_FORMAT_MISMATCH -9
+#define CL_IMAGE_FORMAT_NOT_SUPPORTED -10
+#define CL_BUILD_PROGRAM_FAILURE -11
+#define CL_MAP_FAILURE -12
+#define CL_MISALIGNED_SUB_BUFFER_OFFSET -13
+#define CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST -14
+#define CL_COMPILE_PROGRAM_FAILURE -15
+#define CL_LINKER_NOT_AVAILABLE -16
+#define CL_LINK_PROGRAM_FAILURE -17
+#define CL_DEVICE_PARTITION_FAILED -18
+#define CL_KERNEL_ARG_INFO_NOT_AVAILABLE -19
+
+#define CL_INVALID_VALUE -30
+#define CL_INVALID_DEVICE_TYPE -31
+#define CL_INVALID_PLATFORM -32
+#define CL_INVALID_DEVICE -33
+#define CL_INVALID_CONTEXT -34
+#define CL_INVALID_QUEUE_PROPERTIES -35
+#define CL_INVALID_COMMAND_QUEUE -36
+#define CL_INVALID_HOST_PTR -37
+#define CL_INVALID_MEM_OBJECT -38
+#define CL_INVALID_IMAGE_FORMAT_DESCRIPTOR -39
+#define CL_INVALID_IMAGE_SIZE -40
+#define CL_INVALID_SAMPLER -41
+#define CL_INVALID_BINARY -42
+#define CL_INVALID_BUILD_OPTIONS -43
+#define CL_INVALID_PROGRAM -44
+#define CL_INVALID_PROGRAM_EXECUTABLE -45
+#define CL_INVALID_KERNEL_NAME -46
+#define CL_INVALID_KERNEL_DEFINITION -47
+#define CL_INVALID_KERNEL -48
+#define CL_INVALID_ARG_INDEX -49
+#define CL_INVALID_ARG_VALUE -50
+#define CL_INVALID_ARG_SIZE -51
+#define CL_INVALID_KERNEL_ARGS -52
+#define CL_INVALID_WORK_DIMENSION -53
+#define CL_INVALID_WORK_GROUP_SIZE -54
+#define CL_INVALID_WORK_ITEM_SIZE -55
+#define CL_INVALID_GLOBAL_OFFSET -56
+#define CL_INVALID_EVENT_WAIT_LIST -57
+#define CL_INVALID_EVENT -58
+#define CL_INVALID_OPERATION -59
+#define CL_INVALID_GL_OBJECT -60
+#define CL_INVALID_BUFFER_SIZE -61
+#define CL_INVALID_MIP_LEVEL -62
+#define CL_INVALID_GLOBAL_WORK_SIZE -63
+#define CL_INVALID_PROPERTY -64
+#define CL_INVALID_IMAGE_DESCRIPTOR -65
+#define CL_INVALID_COMPILER_OPTIONS -66
+#define CL_INVALID_LINKER_OPTIONS -67
+#define CL_INVALID_DEVICE_PARTITION_COUNT -68
+
+/* OpenCL Version */
+#define CL_VERSION_1_0 1
+#define CL_VERSION_1_1 1
+#define CL_VERSION_1_2 1
+
+/* cl_bool */
+#define CL_FALSE 0
+#define CL_TRUE 1
+#define CL_BLOCKING CL_TRUE
+#define CL_NON_BLOCKING CL_FALSE
+
+/* cl_platform_info */
+#define CL_PLATFORM_PROFILE 0x0900
+#define CL_PLATFORM_VERSION 0x0901
+#define CL_PLATFORM_NAME 0x0902
+#define CL_PLATFORM_VENDOR 0x0903
+#define CL_PLATFORM_EXTENSIONS 0x0904
+
+/* cl_device_type - bitfield */
+#define CL_DEVICE_TYPE_DEFAULT (1 << 0)
+#define CL_DEVICE_TYPE_CPU (1 << 1)
+#define CL_DEVICE_TYPE_GPU (1 << 2)
+#define CL_DEVICE_TYPE_ACCELERATOR (1 << 3)
+#define CL_DEVICE_TYPE_CUSTOM (1 << 4)
+#define CL_DEVICE_TYPE_ALL 0xFFFFFFFF
+
+/* cl_device_info */
+#define CL_DEVICE_TYPE 0x1000
+#define CL_DEVICE_VENDOR_ID 0x1001
+#define CL_DEVICE_MAX_COMPUTE_UNITS 0x1002
+#define CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS 0x1003
+#define CL_DEVICE_MAX_WORK_GROUP_SIZE 0x1004
+#define CL_DEVICE_MAX_WORK_ITEM_SIZES 0x1005
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR 0x1006
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_SHORT 0x1007
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_INT 0x1008
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_LONG 0x1009
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT 0x100A
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_DOUBLE 0x100B
+#define CL_DEVICE_MAX_CLOCK_FREQUENCY 0x100C
+#define CL_DEVICE_ADDRESS_BITS 0x100D
+#define CL_DEVICE_MAX_READ_IMAGE_ARGS 0x100E
+#define CL_DEVICE_MAX_WRITE_IMAGE_ARGS 0x100F
+#define CL_DEVICE_MAX_MEM_ALLOC_SIZE 0x1010
+#define CL_DEVICE_IMAGE2D_MAX_WIDTH 0x1011
+#define CL_DEVICE_IMAGE2D_MAX_HEIGHT 0x1012
+#define CL_DEVICE_IMAGE3D_MAX_WIDTH 0x1013
+#define CL_DEVICE_IMAGE3D_MAX_HEIGHT 0x1014
+#define CL_DEVICE_IMAGE3D_MAX_DEPTH 0x1015
+#define CL_DEVICE_IMAGE_SUPPORT 0x1016
+#define CL_DEVICE_MAX_PARAMETER_SIZE 0x1017
+#define CL_DEVICE_MAX_SAMPLERS 0x1018
+#define CL_DEVICE_MEM_BASE_ADDR_ALIGN 0x1019
+#define CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE 0x101A
+#define CL_DEVICE_SINGLE_FP_CONFIG 0x101B
+#define CL_DEVICE_GLOBAL_MEM_CACHE_TYPE 0x101C
+#define CL_DEVICE_GLOBAL_MEM_CACHELINE_SIZE 0x101D
+#define CL_DEVICE_GLOBAL_MEM_CACHE_SIZE 0x101E
+#define CL_DEVICE_GLOBAL_MEM_SIZE 0x101F
+#define CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE 0x1020
+#define CL_DEVICE_MAX_CONSTANT_ARGS 0x1021
+#define CL_DEVICE_LOCAL_MEM_TYPE 0x1022
+#define CL_DEVICE_LOCAL_MEM_SIZE 0x1023
+#define CL_DEVICE_ERROR_CORRECTION_SUPPORT 0x1024
+#define CL_DEVICE_PROFILING_TIMER_RESOLUTION 0x1025
+#define CL_DEVICE_ENDIAN_LITTLE 0x1026
+#define CL_DEVICE_AVAILABLE 0x1027
+#define CL_DEVICE_COMPILER_AVAILABLE 0x1028
+#define CL_DEVICE_EXECUTION_CAPABILITIES 0x1029
+#define CL_DEVICE_QUEUE_PROPERTIES 0x102A
+#define CL_DEVICE_NAME 0x102B
+#define CL_DEVICE_VENDOR 0x102C
+#define CL_DRIVER_VERSION 0x102D
+#define CL_DEVICE_PROFILE 0x102E
+#define CL_DEVICE_VERSION 0x102F
+#define CL_DEVICE_EXTENSIONS 0x1030
+#define CL_DEVICE_PLATFORM 0x1031
+#define CL_DEVICE_DOUBLE_FP_CONFIG 0x1032
+/* 0x1033 reserved for CL_DEVICE_HALF_FP_CONFIG */
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_HALF 0x1034
+#define CL_DEVICE_HOST_UNIFIED_MEMORY 0x1035
+#define CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR 0x1036
+#define CL_DEVICE_NATIVE_VECTOR_WIDTH_SHORT 0x1037
+#define CL_DEVICE_NATIVE_VECTOR_WIDTH_INT 0x1038
+#define CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG 0x1039
+#define CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT 0x103A
+#define CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE 0x103B
+#define CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF 0x103C
+#define CL_DEVICE_OPENCL_C_VERSION 0x103D
+#define CL_DEVICE_LINKER_AVAILABLE 0x103E
+#define CL_DEVICE_BUILT_IN_KERNELS 0x103F
+#define CL_DEVICE_IMAGE_MAX_BUFFER_SIZE 0x1040
+#define CL_DEVICE_IMAGE_MAX_ARRAY_SIZE 0x1041
+#define CL_DEVICE_PARENT_DEVICE 0x1042
+#define CL_DEVICE_PARTITION_MAX_SUB_DEVICES 0x1043
+#define CL_DEVICE_PARTITION_PROPERTIES 0x1044
+#define CL_DEVICE_PARTITION_AFFINITY_DOMAIN 0x1045
+#define CL_DEVICE_PARTITION_TYPE 0x1046
+#define CL_DEVICE_REFERENCE_COUNT 0x1047
+#define CL_DEVICE_PREFERRED_INTEROP_USER_SYNC 0x1048
+#define CL_DEVICE_PRINTF_BUFFER_SIZE 0x1049
+#define CL_DEVICE_IMAGE_PITCH_ALIGNMENT 0x104A
+#define CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT 0x104B
+
+/* cl_device_fp_config - bitfield */
+#define CL_FP_DENORM (1 << 0)
+#define CL_FP_INF_NAN (1 << 1)
+#define CL_FP_ROUND_TO_NEAREST (1 << 2)
+#define CL_FP_ROUND_TO_ZERO (1 << 3)
+#define CL_FP_ROUND_TO_INF (1 << 4)
+#define CL_FP_FMA (1 << 5)
+#define CL_FP_SOFT_FLOAT (1 << 6)
+#define CL_FP_CORRECTLY_ROUNDED_DIVIDE_SQRT (1 << 7)
+
+/* cl_device_mem_cache_type */
+#define CL_NONE 0x0
+#define CL_READ_ONLY_CACHE 0x1
+#define CL_READ_WRITE_CACHE 0x2
+
+/* cl_device_local_mem_type */
+#define CL_LOCAL 0x1
+#define CL_GLOBAL 0x2
+
+/* cl_device_exec_capabilities - bitfield */
+#define CL_EXEC_KERNEL (1 << 0)
+#define CL_EXEC_NATIVE_KERNEL (1 << 1)
+
+/* cl_command_queue_properties - bitfield */
+#define CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE (1 << 0)
+#define CL_QUEUE_PROFILING_ENABLE (1 << 1)
+
+/* cl_context_info */
+#define CL_CONTEXT_REFERENCE_COUNT 0x1080
+#define CL_CONTEXT_DEVICES 0x1081
+#define CL_CONTEXT_PROPERTIES 0x1082
+#define CL_CONTEXT_NUM_DEVICES 0x1083
+
+/* cl_context_properties */
+#define CL_CONTEXT_PLATFORM 0x1084
+#define CL_CONTEXT_INTEROP_USER_SYNC 0x1085
+
+/* cl_device_partition_property */
+#define CL_DEVICE_PARTITION_EQUALLY 0x1086
+#define CL_DEVICE_PARTITION_BY_COUNTS 0x1087
+#define CL_DEVICE_PARTITION_BY_COUNTS_LIST_END 0x0
+#define CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN 0x1088
+
+/* cl_device_affinity_domain */
+#define CL_DEVICE_AFFINITY_DOMAIN_NUMA (1 << 0)
+#define CL_DEVICE_AFFINITY_DOMAIN_L4_CACHE (1 << 1)
+#define CL_DEVICE_AFFINITY_DOMAIN_L3_CACHE (1 << 2)
+#define CL_DEVICE_AFFINITY_DOMAIN_L2_CACHE (1 << 3)
+#define CL_DEVICE_AFFINITY_DOMAIN_L1_CACHE (1 << 4)
+#define CL_DEVICE_AFFINITY_DOMAIN_NEXT_PARTITIONABLE (1 << 5)
+
+/* cl_command_queue_info */
+#define CL_QUEUE_CONTEXT 0x1090
+#define CL_QUEUE_DEVICE 0x1091
+#define CL_QUEUE_REFERENCE_COUNT 0x1092
+#define CL_QUEUE_PROPERTIES 0x1093
+
+/* cl_mem_flags - bitfield */
+#define CL_MEM_READ_WRITE (1 << 0)
+#define CL_MEM_WRITE_ONLY (1 << 1)
+#define CL_MEM_READ_ONLY (1 << 2)
+#define CL_MEM_USE_HOST_PTR (1 << 3)
+#define CL_MEM_ALLOC_HOST_PTR (1 << 4)
+#define CL_MEM_COPY_HOST_PTR (1 << 5)
+// reserved (1 << 6)
+#define CL_MEM_HOST_WRITE_ONLY (1 << 7)
+#define CL_MEM_HOST_READ_ONLY (1 << 8)
+#define CL_MEM_HOST_NO_ACCESS (1 << 9)
+
+/* cl_mem_migration_flags - bitfield */
+#define CL_MIGRATE_MEM_OBJECT_HOST (1 << 0)
+#define CL_MIGRATE_MEM_OBJECT_CONTENT_UNDEFINED (1 << 1)
+
+/* cl_channel_order */
+#define CL_R 0x10B0
+#define CL_A 0x10B1
+#define CL_RG 0x10B2
+#define CL_RA 0x10B3
+#define CL_RGB 0x10B4
+#define CL_RGBA 0x10B5
+#define CL_BGRA 0x10B6
+#define CL_ARGB 0x10B7
+#define CL_INTENSITY 0x10B8
+#define CL_LUMINANCE 0x10B9
+#define CL_Rx 0x10BA
+#define CL_RGx 0x10BB
+#define CL_RGBx 0x10BC
+#define CL_DEPTH 0x10BD
+#define CL_DEPTH_STENCIL 0x10BE
+
+/* cl_channel_type */
+#define CL_SNORM_INT8 0x10D0
+#define CL_SNORM_INT16 0x10D1
+#define CL_UNORM_INT8 0x10D2
+#define CL_UNORM_INT16 0x10D3
+#define CL_UNORM_SHORT_565 0x10D4
+#define CL_UNORM_SHORT_555 0x10D5
+#define CL_UNORM_INT_101010 0x10D6
+#define CL_SIGNED_INT8 0x10D7
+#define CL_SIGNED_INT16 0x10D8
+#define CL_SIGNED_INT32 0x10D9
+#define CL_UNSIGNED_INT8 0x10DA
+#define CL_UNSIGNED_INT16 0x10DB
+#define CL_UNSIGNED_INT32 0x10DC
+#define CL_HALF_FLOAT 0x10DD
+#define CL_FLOAT 0x10DE
+#define CL_UNORM_INT24 0x10DF
+
+/* cl_mem_object_type */
+#define CL_MEM_OBJECT_BUFFER 0x10F0
+#define CL_MEM_OBJECT_IMAGE2D 0x10F1
+#define CL_MEM_OBJECT_IMAGE3D 0x10F2
+#define CL_MEM_OBJECT_IMAGE2D_ARRAY 0x10F3
+#define CL_MEM_OBJECT_IMAGE1D 0x10F4
+#define CL_MEM_OBJECT_IMAGE1D_ARRAY 0x10F5
+#define CL_MEM_OBJECT_IMAGE1D_BUFFER 0x10F6
+
+/* cl_mem_info */
+#define CL_MEM_TYPE 0x1100
+#define CL_MEM_FLAGS 0x1101
+#define CL_MEM_SIZE 0x1102
+#define CL_MEM_HOST_PTR 0x1103
+#define CL_MEM_MAP_COUNT 0x1104
+#define CL_MEM_REFERENCE_COUNT 0x1105
+#define CL_MEM_CONTEXT 0x1106
+#define CL_MEM_ASSOCIATED_MEMOBJECT 0x1107
+#define CL_MEM_OFFSET 0x1108
+
+/* cl_image_info */
+#define CL_IMAGE_FORMAT 0x1110
+#define CL_IMAGE_ELEMENT_SIZE 0x1111
+#define CL_IMAGE_ROW_PITCH 0x1112
+#define CL_IMAGE_SLICE_PITCH 0x1113
+#define CL_IMAGE_WIDTH 0x1114
+#define CL_IMAGE_HEIGHT 0x1115
+#define CL_IMAGE_DEPTH 0x1116
+#define CL_IMAGE_ARRAY_SIZE 0x1117
+#define CL_IMAGE_BUFFER 0x1118
+#define CL_IMAGE_NUM_MIP_LEVELS 0x1119
+#define CL_IMAGE_NUM_SAMPLES 0x111A
+
+/* cl_addressing_mode */
+#define CL_ADDRESS_NONE 0x1130
+#define CL_ADDRESS_CLAMP_TO_EDGE 0x1131
+#define CL_ADDRESS_CLAMP 0x1132
+#define CL_ADDRESS_REPEAT 0x1133
+#define CL_ADDRESS_MIRRORED_REPEAT 0x1134
+
+/* cl_filter_mode */
+#define CL_FILTER_NEAREST 0x1140
+#define CL_FILTER_LINEAR 0x1141
+
+/* cl_sampler_info */
+#define CL_SAMPLER_REFERENCE_COUNT 0x1150
+#define CL_SAMPLER_CONTEXT 0x1151
+#define CL_SAMPLER_NORMALIZED_COORDS 0x1152
+#define CL_SAMPLER_ADDRESSING_MODE 0x1153
+#define CL_SAMPLER_FILTER_MODE 0x1154
+
+/* cl_map_flags - bitfield */
+#define CL_MAP_READ (1 << 0)
+#define CL_MAP_WRITE (1 << 1)
+#define CL_MAP_WRITE_INVALIDATE_REGION (1 << 2)
+
+/* cl_program_info */
+#define CL_PROGRAM_REFERENCE_COUNT 0x1160
+#define CL_PROGRAM_CONTEXT 0x1161
+#define CL_PROGRAM_NUM_DEVICES 0x1162
+#define CL_PROGRAM_DEVICES 0x1163
+#define CL_PROGRAM_SOURCE 0x1164
+#define CL_PROGRAM_BINARY_SIZES 0x1165
+#define CL_PROGRAM_BINARIES 0x1166
+#define CL_PROGRAM_NUM_KERNELS 0x1167
+#define CL_PROGRAM_KERNEL_NAMES 0x1168
+
+/* cl_program_build_info */
+#define CL_PROGRAM_BUILD_STATUS 0x1181
+#define CL_PROGRAM_BUILD_OPTIONS 0x1182
+#define CL_PROGRAM_BUILD_LOG 0x1183
+#define CL_PROGRAM_BINARY_TYPE 0x1184
+
+/* cl_program_binary_type */
+#define CL_PROGRAM_BINARY_TYPE_NONE 0x0
+#define CL_PROGRAM_BINARY_TYPE_COMPILED_OBJECT 0x1
+#define CL_PROGRAM_BINARY_TYPE_LIBRARY 0x2
+#define CL_PROGRAM_BINARY_TYPE_EXECUTABLE 0x4
+
+/* cl_build_status */
+#define CL_BUILD_SUCCESS 0
+#define CL_BUILD_NONE -1
+#define CL_BUILD_ERROR -2
+#define CL_BUILD_IN_PROGRESS -3
+
+/* cl_kernel_info */
+#define CL_KERNEL_FUNCTION_NAME 0x1190
+#define CL_KERNEL_NUM_ARGS 0x1191
+#define CL_KERNEL_REFERENCE_COUNT 0x1192
+#define CL_KERNEL_CONTEXT 0x1193
+#define CL_KERNEL_PROGRAM 0x1194
+#define CL_KERNEL_ATTRIBUTES 0x1195
+
+/* cl_kernel_arg_info */
+#define CL_KERNEL_ARG_ADDRESS_QUALIFIER 0x1196
+#define CL_KERNEL_ARG_ACCESS_QUALIFIER 0x1197
+#define CL_KERNEL_ARG_TYPE_NAME 0x1198
+#define CL_KERNEL_ARG_TYPE_QUALIFIER 0x1199
+#define CL_KERNEL_ARG_NAME 0x119A
+
+/* cl_kernel_arg_address_qualifier */
+#define CL_KERNEL_ARG_ADDRESS_GLOBAL 0x119B
+#define CL_KERNEL_ARG_ADDRESS_LOCAL 0x119C
+#define CL_KERNEL_ARG_ADDRESS_CONSTANT 0x119D
+#define CL_KERNEL_ARG_ADDRESS_PRIVATE 0x119E
+
+/* cl_kernel_arg_access_qualifier */
+#define CL_KERNEL_ARG_ACCESS_READ_ONLY 0x11A0
+#define CL_KERNEL_ARG_ACCESS_WRITE_ONLY 0x11A1
+#define CL_KERNEL_ARG_ACCESS_READ_WRITE 0x11A2
+#define CL_KERNEL_ARG_ACCESS_NONE 0x11A3
+
+/* cl_kernel_arg_type_qualifer */
+#define CL_KERNEL_ARG_TYPE_NONE 0
+#define CL_KERNEL_ARG_TYPE_CONST (1 << 0)
+#define CL_KERNEL_ARG_TYPE_RESTRICT (1 << 1)
+#define CL_KERNEL_ARG_TYPE_VOLATILE (1 << 2)
+
+/* cl_kernel_work_group_info */
+#define CL_KERNEL_WORK_GROUP_SIZE 0x11B0
+#define CL_KERNEL_COMPILE_WORK_GROUP_SIZE 0x11B1
+#define CL_KERNEL_LOCAL_MEM_SIZE 0x11B2
+#define CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE 0x11B3
+#define CL_KERNEL_PRIVATE_MEM_SIZE 0x11B4
+#define CL_KERNEL_GLOBAL_WORK_SIZE 0x11B5
+
+/* cl_event_info */
+#define CL_EVENT_COMMAND_QUEUE 0x11D0
+#define CL_EVENT_COMMAND_TYPE 0x11D1
+#define CL_EVENT_REFERENCE_COUNT 0x11D2
+#define CL_EVENT_COMMAND_EXECUTION_STATUS 0x11D3
+#define CL_EVENT_CONTEXT 0x11D4
+
+/* cl_command_type */
+#define CL_COMMAND_NDRANGE_KERNEL 0x11F0
+#define CL_COMMAND_TASK 0x11F1
+#define CL_COMMAND_NATIVE_KERNEL 0x11F2
+#define CL_COMMAND_READ_BUFFER 0x11F3
+#define CL_COMMAND_WRITE_BUFFER 0x11F4
+#define CL_COMMAND_COPY_BUFFER 0x11F5
+#define CL_COMMAND_READ_IMAGE 0x11F6
+#define CL_COMMAND_WRITE_IMAGE 0x11F7
+#define CL_COMMAND_COPY_IMAGE 0x11F8
+#define CL_COMMAND_COPY_IMAGE_TO_BUFFER 0x11F9
+#define CL_COMMAND_COPY_BUFFER_TO_IMAGE 0x11FA
+#define CL_COMMAND_MAP_BUFFER 0x11FB
+#define CL_COMMAND_MAP_IMAGE 0x11FC
+#define CL_COMMAND_UNMAP_MEM_OBJECT 0x11FD
+#define CL_COMMAND_MARKER 0x11FE
+#define CL_COMMAND_ACQUIRE_GL_OBJECTS 0x11FF
+#define CL_COMMAND_RELEASE_GL_OBJECTS 0x1200
+#define CL_COMMAND_READ_BUFFER_RECT 0x1201
+#define CL_COMMAND_WRITE_BUFFER_RECT 0x1202
+#define CL_COMMAND_COPY_BUFFER_RECT 0x1203
+#define CL_COMMAND_USER 0x1204
+#define CL_COMMAND_BARRIER 0x1205
+#define CL_COMMAND_MIGRATE_MEM_OBJECTS 0x1206
+#define CL_COMMAND_FILL_BUFFER 0x1207
+#define CL_COMMAND_FILL_IMAGE 0x1208
+
+/* command execution status */
+#define CL_COMPLETE 0x0
+#define CL_RUNNING 0x1
+#define CL_SUBMITTED 0x2
+#define CL_QUEUED 0x3
+
+/* cl_buffer_create_type */
+#define CL_BUFFER_CREATE_TYPE_REGION 0x1220
+
+/* cl_profiling_info */
+#define CL_PROFILING_COMMAND_QUEUED 0x1280
+#define CL_PROFILING_COMMAND_SUBMIT 0x1281
+#define CL_PROFILING_COMMAND_START 0x1282
+#define CL_PROFILING_COMMAND_END 0x1283
+
+/********************************************************************************************************/
+
+/* Platform API */
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetPlatformIDs(cl_uint /* num_entries */,
+ cl_platform_id * /* platforms */,
+ cl_uint * /* num_platforms */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetPlatformInfo(cl_platform_id /* platform */,
+ cl_platform_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+/* Device APIs */
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetDeviceIDs(cl_platform_id /* platform */,
+ cl_device_type /* device_type */,
+ cl_uint /* num_entries */,
+ cl_device_id * /* devices */,
+ cl_uint * /* num_devices */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetDeviceInfo(cl_device_id /* device */,
+ cl_device_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clCreateSubDevices(cl_device_id /* in_device */,
+ const cl_device_partition_property * /* properties */,
+ cl_uint /* num_devices */,
+ cl_device_id * /* out_devices */,
+ cl_uint * /* num_devices_ret */) CL_API_SUFFIX__VERSION_1_2;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clRetainDevice(cl_device_id /* device */) CL_API_SUFFIX__VERSION_1_2;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clReleaseDevice(cl_device_id /* device */) CL_API_SUFFIX__VERSION_1_2;
+
+/* Context APIs */
+extern CL_API_ENTRY cl_context CL_API_CALL
+clCreateContext(const cl_context_properties * /* properties */,
+ cl_uint /* num_devices */,
+ const cl_device_id * /* devices */,
+ void (CL_CALLBACK * /* pfn_notify */)(const char *, const void *, size_t, void *),
+ void * /* user_data */,
+ cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_context CL_API_CALL
+clCreateContextFromType(const cl_context_properties * /* properties */,
+ cl_device_type /* device_type */,
+ void (CL_CALLBACK * /* pfn_notify*/ )(const char *, const void *, size_t, void *),
+ void * /* user_data */,
+ cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clRetainContext(cl_context /* context */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clReleaseContext(cl_context /* context */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetContextInfo(cl_context /* context */,
+ cl_context_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+/* Command Queue APIs */
+extern CL_API_ENTRY cl_command_queue CL_API_CALL
+clCreateCommandQueue(cl_context /* context */,
+ cl_device_id /* device */,
+ cl_command_queue_properties /* properties */,
+ cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clRetainCommandQueue(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clReleaseCommandQueue(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetCommandQueueInfo(cl_command_queue /* command_queue */,
+ cl_command_queue_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+/* Memory Object APIs */
+extern CL_API_ENTRY cl_mem CL_API_CALL
+clCreateBuffer(cl_context /* context */,
+ cl_mem_flags /* flags */,
+ size_t /* size */,
+ void * /* host_ptr */,
+ cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_mem CL_API_CALL
+clCreateSubBuffer(cl_mem /* buffer */,
+ cl_mem_flags /* flags */,
+ cl_buffer_create_type /* buffer_create_type */,
+ const void * /* buffer_create_info */,
+ cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1;
+
+extern CL_API_ENTRY cl_mem CL_API_CALL
+clCreateImage(cl_context /* context */,
+ cl_mem_flags /* flags */,
+ const cl_image_format * /* image_format */,
+ const cl_image_desc * /* image_desc */,
+ void * /* host_ptr */,
+ cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_2;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clRetainMemObject(cl_mem /* memobj */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clReleaseMemObject(cl_mem /* memobj */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetSupportedImageFormats(cl_context /* context */,
+ cl_mem_flags /* flags */,
+ cl_mem_object_type /* image_type */,
+ cl_uint /* num_entries */,
+ cl_image_format * /* image_formats */,
+ cl_uint * /* num_image_formats */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetMemObjectInfo(cl_mem /* memobj */,
+ cl_mem_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetImageInfo(cl_mem /* image */,
+ cl_image_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clSetMemObjectDestructorCallback( cl_mem /* memobj */,
+ void (CL_CALLBACK * /*pfn_notify*/)( cl_mem /* memobj */, void* /*user_data*/),
+ void * /*user_data */ ) CL_API_SUFFIX__VERSION_1_1;
+
+/* Sampler APIs */
+extern CL_API_ENTRY cl_sampler CL_API_CALL
+clCreateSampler(cl_context /* context */,
+ cl_bool /* normalized_coords */,
+ cl_addressing_mode /* addressing_mode */,
+ cl_filter_mode /* filter_mode */,
+ cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clRetainSampler(cl_sampler /* sampler */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clReleaseSampler(cl_sampler /* sampler */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetSamplerInfo(cl_sampler /* sampler */,
+ cl_sampler_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+/* Program Object APIs */
+extern CL_API_ENTRY cl_program CL_API_CALL
+clCreateProgramWithSource(cl_context /* context */,
+ cl_uint /* count */,
+ const char ** /* strings */,
+ const size_t * /* lengths */,
+ cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_program CL_API_CALL
+clCreateProgramWithBinary(cl_context /* context */,
+ cl_uint /* num_devices */,
+ const cl_device_id * /* device_list */,
+ const size_t * /* lengths */,
+ const unsigned char ** /* binaries */,
+ cl_int * /* binary_status */,
+ cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_program CL_API_CALL
+clCreateProgramWithBuiltInKernels(cl_context /* context */,
+ cl_uint /* num_devices */,
+ const cl_device_id * /* device_list */,
+ const char * /* kernel_names */,
+ cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_2;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clRetainProgram(cl_program /* program */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clReleaseProgram(cl_program /* program */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clBuildProgram(cl_program /* program */,
+ cl_uint /* num_devices */,
+ const cl_device_id * /* device_list */,
+ const char * /* options */,
+ void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */),
+ void * /* user_data */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clCompileProgram(cl_program /* program */,
+ cl_uint /* num_devices */,
+ const cl_device_id * /* device_list */,
+ const char * /* options */,
+ cl_uint /* num_input_headers */,
+ const cl_program * /* input_headers */,
+ const char ** /* header_include_names */,
+ void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */),
+ void * /* user_data */) CL_API_SUFFIX__VERSION_1_2;
+
+extern CL_API_ENTRY cl_program CL_API_CALL
+clLinkProgram(cl_context /* context */,
+ cl_uint /* num_devices */,
+ const cl_device_id * /* device_list */,
+ const char * /* options */,
+ cl_uint /* num_input_programs */,
+ const cl_program * /* input_programs */,
+ void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */),
+ void * /* user_data */,
+ cl_int * /* errcode_ret */ ) CL_API_SUFFIX__VERSION_1_2;
+
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clUnloadPlatformCompiler(cl_platform_id /* platform */) CL_API_SUFFIX__VERSION_1_2;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetProgramInfo(cl_program /* program */,
+ cl_program_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetProgramBuildInfo(cl_program /* program */,
+ cl_device_id /* device */,
+ cl_program_build_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+/* Kernel Object APIs */
+extern CL_API_ENTRY cl_kernel CL_API_CALL
+clCreateKernel(cl_program /* program */,
+ const char * /* kernel_name */,
+ cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clCreateKernelsInProgram(cl_program /* program */,
+ cl_uint /* num_kernels */,
+ cl_kernel * /* kernels */,
+ cl_uint * /* num_kernels_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clRetainKernel(cl_kernel /* kernel */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clReleaseKernel(cl_kernel /* kernel */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clSetKernelArg(cl_kernel /* kernel */,
+ cl_uint /* arg_index */,
+ size_t /* arg_size */,
+ const void * /* arg_value */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetKernelInfo(cl_kernel /* kernel */,
+ cl_kernel_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetKernelArgInfo(cl_kernel /* kernel */,
+ cl_uint /* arg_indx */,
+ cl_kernel_arg_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_2;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetKernelWorkGroupInfo(cl_kernel /* kernel */,
+ cl_device_id /* device */,
+ cl_kernel_work_group_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+/* Event Object APIs */
+extern CL_API_ENTRY cl_int CL_API_CALL
+clWaitForEvents(cl_uint /* num_events */,
+ const cl_event * /* event_list */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetEventInfo(cl_event /* event */,
+ cl_event_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_event CL_API_CALL
+clCreateUserEvent(cl_context /* context */,
+ cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clRetainEvent(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clReleaseEvent(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clSetUserEventStatus(cl_event /* event */,
+ cl_int /* execution_status */) CL_API_SUFFIX__VERSION_1_1;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clSetEventCallback( cl_event /* event */,
+ cl_int /* command_exec_callback_type */,
+ void (CL_CALLBACK * /* pfn_notify */)(cl_event, cl_int, void *),
+ void * /* user_data */) CL_API_SUFFIX__VERSION_1_1;
+
+/* Profiling APIs */
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetEventProfilingInfo(cl_event /* event */,
+ cl_profiling_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+/* Flush and Finish APIs */
+extern CL_API_ENTRY cl_int CL_API_CALL
+clFlush(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clFinish(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
+
+/* Enqueued Commands APIs */
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueReadBuffer(cl_command_queue /* command_queue */,
+ cl_mem /* buffer */,
+ cl_bool /* blocking_read */,
+ size_t /* offset */,
+ size_t /* size */,
+ void * /* ptr */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueReadBufferRect(cl_command_queue /* command_queue */,
+ cl_mem /* buffer */,
+ cl_bool /* blocking_read */,
+ const size_t * /* buffer_offset */,
+ const size_t * /* host_offset */,
+ const size_t * /* region */,
+ size_t /* buffer_row_pitch */,
+ size_t /* buffer_slice_pitch */,
+ size_t /* host_row_pitch */,
+ size_t /* host_slice_pitch */,
+ void * /* ptr */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_1;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueWriteBuffer(cl_command_queue /* command_queue */,
+ cl_mem /* buffer */,
+ cl_bool /* blocking_write */,
+ size_t /* offset */,
+ size_t /* size */,
+ const void * /* ptr */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueWriteBufferRect(cl_command_queue /* command_queue */,
+ cl_mem /* buffer */,
+ cl_bool /* blocking_write */,
+ const size_t * /* buffer_offset */,
+ const size_t * /* host_offset */,
+ const size_t * /* region */,
+ size_t /* buffer_row_pitch */,
+ size_t /* buffer_slice_pitch */,
+ size_t /* host_row_pitch */,
+ size_t /* host_slice_pitch */,
+ const void * /* ptr */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_1;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueFillBuffer(cl_command_queue /* command_queue */,
+ cl_mem /* buffer */,
+ const void * /* pattern */,
+ size_t /* pattern_size */,
+ size_t /* offset */,
+ size_t /* size */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_2;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueCopyBuffer(cl_command_queue /* command_queue */,
+ cl_mem /* src_buffer */,
+ cl_mem /* dst_buffer */,
+ size_t /* src_offset */,
+ size_t /* dst_offset */,
+ size_t /* size */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueCopyBufferRect(cl_command_queue /* command_queue */,
+ cl_mem /* src_buffer */,
+ cl_mem /* dst_buffer */,
+ const size_t * /* src_origin */,
+ const size_t * /* dst_origin */,
+ const size_t * /* region */,
+ size_t /* src_row_pitch */,
+ size_t /* src_slice_pitch */,
+ size_t /* dst_row_pitch */,
+ size_t /* dst_slice_pitch */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_1;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueReadImage(cl_command_queue /* command_queue */,
+ cl_mem /* image */,
+ cl_bool /* blocking_read */,
+ const size_t * /* origin[3] */,
+ const size_t * /* region[3] */,
+ size_t /* row_pitch */,
+ size_t /* slice_pitch */,
+ void * /* ptr */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueWriteImage(cl_command_queue /* command_queue */,
+ cl_mem /* image */,
+ cl_bool /* blocking_write */,
+ const size_t * /* origin[3] */,
+ const size_t * /* region[3] */,
+ size_t /* input_row_pitch */,
+ size_t /* input_slice_pitch */,
+ const void * /* ptr */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueFillImage(cl_command_queue /* command_queue */,
+ cl_mem /* image */,
+ const void * /* fill_color */,
+ const size_t * /* origin[3] */,
+ const size_t * /* region[3] */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_2;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueCopyImage(cl_command_queue /* command_queue */,
+ cl_mem /* src_image */,
+ cl_mem /* dst_image */,
+ const size_t * /* src_origin[3] */,
+ const size_t * /* dst_origin[3] */,
+ const size_t * /* region[3] */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueCopyImageToBuffer(cl_command_queue /* command_queue */,
+ cl_mem /* src_image */,
+ cl_mem /* dst_buffer */,
+ const size_t * /* src_origin[3] */,
+ const size_t * /* region[3] */,
+ size_t /* dst_offset */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueCopyBufferToImage(cl_command_queue /* command_queue */,
+ cl_mem /* src_buffer */,
+ cl_mem /* dst_image */,
+ size_t /* src_offset */,
+ const size_t * /* dst_origin[3] */,
+ const size_t * /* region[3] */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY void * CL_API_CALL
+clEnqueueMapBuffer(cl_command_queue /* command_queue */,
+ cl_mem /* buffer */,
+ cl_bool /* blocking_map */,
+ cl_map_flags /* map_flags */,
+ size_t /* offset */,
+ size_t /* size */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */,
+ cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY void * CL_API_CALL
+clEnqueueMapImage(cl_command_queue /* command_queue */,
+ cl_mem /* image */,
+ cl_bool /* blocking_map */,
+ cl_map_flags /* map_flags */,
+ const size_t * /* origin[3] */,
+ const size_t * /* region[3] */,
+ size_t * /* image_row_pitch */,
+ size_t * /* image_slice_pitch */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */,
+ cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueUnmapMemObject(cl_command_queue /* command_queue */,
+ cl_mem /* memobj */,
+ void * /* mapped_ptr */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueMigrateMemObjects(cl_command_queue /* command_queue */,
+ cl_uint /* num_mem_objects */,
+ const cl_mem * /* mem_objects */,
+ cl_mem_migration_flags /* flags */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_2;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueNDRangeKernel(cl_command_queue /* command_queue */,
+ cl_kernel /* kernel */,
+ cl_uint /* work_dim */,
+ const size_t * /* global_work_offset */,
+ const size_t * /* global_work_size */,
+ const size_t * /* local_work_size */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueTask(cl_command_queue /* command_queue */,
+ cl_kernel /* kernel */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueNativeKernel(cl_command_queue /* command_queue */,
+ void (CL_CALLBACK * /*user_func*/)(void *),
+ void * /* args */,
+ size_t /* cb_args */,
+ cl_uint /* num_mem_objects */,
+ const cl_mem * /* mem_list */,
+ const void ** /* args_mem_loc */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueMarkerWithWaitList(cl_command_queue /* command_queue */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_2;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clEnqueueBarrierWithWaitList(cl_command_queue /* command_queue */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */) CL_API_SUFFIX__VERSION_1_2;
+
+
+/* Extension function access
+ *
+ * Returns the extension function address for the given function name,
+ * or NULL if a valid function can not be found. The client must
+ * check to make sure the address is not NULL, before using or
+ * calling the returned function address.
+ */
+extern CL_API_ENTRY void * CL_API_CALL
+clGetExtensionFunctionAddressForPlatform(cl_platform_id /* platform */,
+ const char * /* func_name */) CL_API_SUFFIX__VERSION_1_2;
+
+
+// Deprecated OpenCL 1.1 APIs
+extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
+clCreateImage2D(cl_context /* context */,
+ cl_mem_flags /* flags */,
+ const cl_image_format * /* image_format */,
+ size_t /* image_width */,
+ size_t /* image_height */,
+ size_t /* image_row_pitch */,
+ void * /* host_ptr */,
+ cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
+
+extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
+clCreateImage3D(cl_context /* context */,
+ cl_mem_flags /* flags */,
+ const cl_image_format * /* image_format */,
+ size_t /* image_width */,
+ size_t /* image_height */,
+ size_t /* image_depth */,
+ size_t /* image_row_pitch */,
+ size_t /* image_slice_pitch */,
+ void * /* host_ptr */,
+ cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
+
+extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
+clEnqueueMarker(cl_command_queue /* command_queue */,
+ cl_event * /* event */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
+
+extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
+clEnqueueWaitForEvents(cl_command_queue /* command_queue */,
+ cl_uint /* num_events */,
+ const cl_event * /* event_list */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
+
+extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
+clEnqueueBarrier(cl_command_queue /* command_queue */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
+
+extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
+clUnloadCompiler(void) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
+
+extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED void * CL_API_CALL
+clGetExtensionFunctionAddress(const char * /* func_name */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __OPENCL_CL_H */

HandBrake-0.10.0.tar.bz2/libhb/extras/cl_platform.h Added

@@ -0,0 +1,1268 @@
+/**********************************************************************************
+ * Copyright (c) 2008-2012 The Khronos Group Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and/or associated documentation files (the
+ * "Materials"), to deal in the Materials without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Materials, and to
+ * permit persons to whom the Materials are 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 Materials.
+ *
+ * THE MATERIALS ARE 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
+ * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+ **********************************************************************************/
+
+/* $Revision: 11803 $ on $Date: 2010-06-25 10:02:12 -0700 (Fri, 25 Jun 2010) $ */
+
+#ifndef __CL_PLATFORM_H
+#define __CL_PLATFORM_H
+
+#ifdef __APPLE__
+ /* Contains #defines for AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER below */
+ #include <AvailabilityMacros.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(_WIN32)
+ #define CL_API_ENTRY
+ #define CL_API_CALL __stdcall
+ #define CL_CALLBACK __stdcall
+#else
+ #define CL_API_ENTRY
+ #define CL_API_CALL
+ #define CL_CALLBACK
+#endif
+
+#ifdef __APPLE__
+ #define CL_EXTENSION_WEAK_LINK __attribute__((weak_import))
+ #ifndef UNAVAILABLE_ATTRIBUTE
+ #define UNAVAILABLE_ATTRIBUTE
+ #endif
+ #ifdef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+ #define CL_API_SUFFIX__VERSION_1_0 AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+ #define CL_EXT_SUFFIX__VERSION_1_0 CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+ #else
+ #define CL_API_SUFFIX__VERSION_1_0 UNAVAILABLE_ATTRIBUTE
+ #define CL_EXT_SUFFIX__VERSION_1_0 CL_EXTENSION_WEAK_LINK UNAVAILABLE_ATTRIBUTE
+ #endif
+ #ifdef AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+ #define CL_API_SUFFIX__VERSION_1_1 AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+ #define GCL_API_SUFFIX__VERSION_1_1 AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+ #define CL_EXT_SUFFIX__VERSION_1_1 CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+ #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_7
+ #else
+ #define CL_API_SUFFIX__VERSION_1_1 UNAVAILABLE_ATTRIBUTE
+ #define GCL_API_SUFFIX__VERSION_1_1 UNAVAILABLE_ATTRIBUTE
+ #define CL_EXT_SUFFIX__VERSION_1_1 CL_EXTENSION_WEAK_LINK UNAVAILABLE_ATTRIBUTE
+ #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATE CL_EXT_SUFFIX__VERSION_1_0
+ #endif
+ #ifdef AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER
+ #define CL_API_SUFFIX__VERSION_1_2 AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER
+ #define GCL_API_SUFFIX__VERSION_1_2 AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER
+ #define CL_EXT_SUFFIX__VERSION_1_2 CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER
+ #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
+ #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_8
+ #else
+ #define CL_API_SUFFIX__VERSION_1_2 UNAVAILABLE_ATTRIBUTE
+ #define GCL_API_SUFFIX__VERSION_1_2 UNAVAILABLE_ATTRIBUTE
+ #define CL_EXT_SUFFIX__VERSION_1_2 CL_EXTENSION_WEAK_LINK UNAVAILABLE_ATTRIBUTE
+ #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
+ #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED CL_EXT_SUFFIX__VERSION_1_1
+ #endif
+#else
+ #define CL_EXTENSION_WEAK_LINK
+ #define CL_API_SUFFIX__VERSION_1_0
+ #define CL_EXT_SUFFIX__VERSION_1_0
+ #define CL_API_SUFFIX__VERSION_1_1
+ #define CL_EXT_SUFFIX__VERSION_1_1
+ #define CL_API_SUFFIX__VERSION_1_2
+ #define CL_EXT_SUFFIX__VERSION_1_2
+
+ #ifdef __GNUC__
+ #ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
+ #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED
+ #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED
+ #else
+ #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED __attribute__((deprecated))
+ #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED
+ #endif
+
+ #ifdef CL_USE_DEPRECATED_OPENCL_1_1_APIS
+ #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED
+ #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
+ #else
+ #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED __attribute__((deprecated))
+ #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
+ #endif
+ #elif _WIN32
+ #ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
+ #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED
+ #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED
+ #else
+ #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED
+ #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED __declspec(deprecated)
+ #endif
+
+ #ifdef CL_USE_DEPRECATED_OPENCL_1_1_APIS
+ #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED
+ #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
+ #else
+ #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED
+ #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED __declspec(deprecated)
+ #endif
+ #else
+ #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED
+ #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED
+
+ #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED
+ #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
+ #endif
+#endif
+
+#if (defined (_WIN32) && defined(_MSC_VER))
+
+/* scalar types */
+typedef signed __int8 cl_char;
+typedef unsigned __int8 cl_uchar;
+typedef signed __int16 cl_short;
+typedef unsigned __int16 cl_ushort;
+typedef signed __int32 cl_int;
+typedef unsigned __int32 cl_uint;
+typedef signed __int64 cl_long;
+typedef unsigned __int64 cl_ulong;
+
+typedef unsigned __int16 cl_half;
+typedef float cl_float;
+typedef double cl_double;
+
+/* Macro names and corresponding values defined by OpenCL */
+#define CL_CHAR_BIT 8
+#define CL_SCHAR_MAX 127
+#define CL_SCHAR_MIN (-127-1)
+#define CL_CHAR_MAX CL_SCHAR_MAX
+#define CL_CHAR_MIN CL_SCHAR_MIN
+#define CL_UCHAR_MAX 255
+#define CL_SHRT_MAX 32767
+#define CL_SHRT_MIN (-32767-1)
+#define CL_USHRT_MAX 65535
+#define CL_INT_MAX 2147483647
+#define CL_INT_MIN (-2147483647-1)
+#define CL_UINT_MAX 0xffffffffU
+#define CL_LONG_MAX ((cl_long) 0x7FFFFFFFFFFFFFFFLL)
+#define CL_LONG_MIN ((cl_long) -0x7FFFFFFFFFFFFFFFLL - 1LL)
+#define CL_ULONG_MAX ((cl_ulong) 0xFFFFFFFFFFFFFFFFULL)
+
+#define CL_FLT_DIG 6
+#define CL_FLT_MANT_DIG 24
+#define CL_FLT_MAX_10_EXP +38
+#define CL_FLT_MAX_EXP +128
+#define CL_FLT_MIN_10_EXP -37
+#define CL_FLT_MIN_EXP -125
+#define CL_FLT_RADIX 2
+#define CL_FLT_MAX 340282346638528859811704183484516925440.0f
+#define CL_FLT_MIN 1.175494350822287507969e-38f
+#define CL_FLT_EPSILON 0x1.0p-23f
+
+#define CL_DBL_DIG 15
+#define CL_DBL_MANT_DIG 53
+#define CL_DBL_MAX_10_EXP +308
+#define CL_DBL_MAX_EXP +1024
+#define CL_DBL_MIN_10_EXP -307
+#define CL_DBL_MIN_EXP -1021
+#define CL_DBL_RADIX 2
+#define CL_DBL_MAX 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0
+#define CL_DBL_MIN 2.225073858507201383090e-308
+#define CL_DBL_EPSILON 2.220446049250313080847e-16
+
+#define CL_M_E 2.718281828459045090796
+#define CL_M_LOG2E 1.442695040888963387005
+#define CL_M_LOG10E 0.434294481903251816668
+#define CL_M_LN2 0.693147180559945286227
+#define CL_M_LN10 2.302585092994045901094
+#define CL_M_PI 3.141592653589793115998
+#define CL_M_PI_2 1.570796326794896557999
+#define CL_M_PI_4 0.785398163397448278999
+#define CL_M_1_PI 0.318309886183790691216
+#define CL_M_2_PI 0.636619772367581382433
+#define CL_M_2_SQRTPI 1.128379167095512558561
+#define CL_M_SQRT2 1.414213562373095145475
+#define CL_M_SQRT1_2 0.707106781186547572737
+
+#define CL_M_E_F 2.71828174591064f
+#define CL_M_LOG2E_F 1.44269502162933f
+#define CL_M_LOG10E_F 0.43429449200630f
+#define CL_M_LN2_F 0.69314718246460f
+#define CL_M_LN10_F 2.30258512496948f
+#define CL_M_PI_F 3.14159274101257f
+#define CL_M_PI_2_F 1.57079637050629f
+#define CL_M_PI_4_F 0.78539818525314f
+#define CL_M_1_PI_F 0.31830987334251f
+#define CL_M_2_PI_F 0.63661974668503f
+#define CL_M_2_SQRTPI_F 1.12837922573090f
+#define CL_M_SQRT2_F 1.41421353816986f
+#define CL_M_SQRT1_2_F 0.70710676908493f
+
+#define CL_NAN (CL_INFINITY - CL_INFINITY)
+#define CL_HUGE_VALF ((cl_float) 1e50)
+#define CL_HUGE_VAL ((cl_double) 1e500)
+#define CL_MAXFLOAT CL_FLT_MAX
+#define CL_INFINITY CL_HUGE_VALF
+
+#else
+
+#include <stdint.h>
+
+/* scalar types */
+typedef int8_t cl_char;
+typedef uint8_t cl_uchar;
+typedef int16_t cl_short __attribute__((aligned(2)));
+typedef uint16_t cl_ushort __attribute__((aligned(2)));
+typedef int32_t cl_int __attribute__((aligned(4)));
+typedef uint32_t cl_uint __attribute__((aligned(4)));
+typedef int64_t cl_long __attribute__((aligned(8)));
+typedef uint64_t cl_ulong __attribute__((aligned(8)));
+
+typedef uint16_t cl_half __attribute__((aligned(2)));
+typedef float cl_float __attribute__((aligned(4)));
+typedef double cl_double __attribute__((aligned(8)));
+
+/* Macro names and corresponding values defined by OpenCL */
+#define CL_CHAR_BIT 8
+#define CL_SCHAR_MAX 127
+#define CL_SCHAR_MIN (-127-1)
+#define CL_CHAR_MAX CL_SCHAR_MAX
+#define CL_CHAR_MIN CL_SCHAR_MIN
+#define CL_UCHAR_MAX 255
+#define CL_SHRT_MAX 32767
+#define CL_SHRT_MIN (-32767-1)
+#define CL_USHRT_MAX 65535
+#define CL_INT_MAX 2147483647
+#define CL_INT_MIN (-2147483647-1)
+#define CL_UINT_MAX 0xffffffffU
+#define CL_LONG_MAX ((cl_long) 0x7FFFFFFFFFFFFFFFLL)
+#define CL_LONG_MIN ((cl_long) -0x7FFFFFFFFFFFFFFFLL - 1LL)
+#define CL_ULONG_MAX ((cl_ulong) 0xFFFFFFFFFFFFFFFFULL)
+
+#define CL_FLT_DIG 6
+#define CL_FLT_MANT_DIG 24
+#define CL_FLT_MAX_10_EXP +38
+#define CL_FLT_MAX_EXP +128
+#define CL_FLT_MIN_10_EXP -37
+#define CL_FLT_MIN_EXP -125
+#define CL_FLT_RADIX 2
+#define CL_FLT_MAX 0x1.fffffep127f
+#define CL_FLT_MIN 0x1.0p-126f
+#define CL_FLT_EPSILON 0x1.0p-23f
+
+#define CL_DBL_DIG 15
+#define CL_DBL_MANT_DIG 53
+#define CL_DBL_MAX_10_EXP +308
+#define CL_DBL_MAX_EXP +1024
+#define CL_DBL_MIN_10_EXP -307
+#define CL_DBL_MIN_EXP -1021
+#define CL_DBL_RADIX 2
+#define CL_DBL_MAX 0x1.fffffffffffffp1023
+#define CL_DBL_MIN 0x1.0p-1022
+#define CL_DBL_EPSILON 0x1.0p-52
+
+#define CL_M_E 2.718281828459045090796
+#define CL_M_LOG2E 1.442695040888963387005
+#define CL_M_LOG10E 0.434294481903251816668
+#define CL_M_LN2 0.693147180559945286227
+#define CL_M_LN10 2.302585092994045901094
+#define CL_M_PI 3.141592653589793115998
+#define CL_M_PI_2 1.570796326794896557999
+#define CL_M_PI_4 0.785398163397448278999
+#define CL_M_1_PI 0.318309886183790691216
+#define CL_M_2_PI 0.636619772367581382433
+#define CL_M_2_SQRTPI 1.128379167095512558561
+#define CL_M_SQRT2 1.414213562373095145475
+#define CL_M_SQRT1_2 0.707106781186547572737
+
+#define CL_M_E_F 2.71828174591064f
+#define CL_M_LOG2E_F 1.44269502162933f
+#define CL_M_LOG10E_F 0.43429449200630f
+#define CL_M_LN2_F 0.69314718246460f
+#define CL_M_LN10_F 2.30258512496948f
+#define CL_M_PI_F 3.14159274101257f
+#define CL_M_PI_2_F 1.57079637050629f
+#define CL_M_PI_4_F 0.78539818525314f
+#define CL_M_1_PI_F 0.31830987334251f
+#define CL_M_2_PI_F 0.63661974668503f
+#define CL_M_2_SQRTPI_F 1.12837922573090f
+#define CL_M_SQRT2_F 1.41421353816986f
+#define CL_M_SQRT1_2_F 0.70710676908493f
+
+#if defined( __GNUC__ )
+ #define CL_HUGE_VALF __builtin_huge_valf()
+ #define CL_HUGE_VAL __builtin_huge_val()
+ #define CL_NAN __builtin_nanf( "" )
+#else
+ #define CL_HUGE_VALF ((cl_float) 1e50)
+ #define CL_HUGE_VAL ((cl_double) 1e500)
+ float nanf( const char * );
+ #define CL_NAN nanf( "" )
+#endif
+#define CL_MAXFLOAT CL_FLT_MAX
+#define CL_INFINITY CL_HUGE_VALF
+
+#endif
+
+#include <stddef.h>
+
+/* Mirror types to GL types. Mirror types allow us to avoid deciding which 87s to load based on whether we are using GL or GLES here. */
+typedef unsigned int cl_GLuint;
+typedef int cl_GLint;
+typedef unsigned int cl_GLenum;
+
+/*
+ * Vector types
+ *
+ * Note: OpenCL requires that all types be naturally aligned.
+ * This means that vector types must be naturally aligned.
+ * For example, a vector of four floats must be aligned to
+ * a 16 byte boundary (calculated as 4 * the natural 4-byte
+ * alignment of the float). The alignment qualifiers here
+ * will only function properly if your compiler supports them
+ * and if you don't actively work to defeat them. For example,
+ * in order for a cl_float4 to be 16 byte aligned in a struct,
+ * the start of the struct must itself be 16-byte aligned.
+ *
+ * Maintaining proper alignment is the user's responsibility.
+ */
+
+/* Define basic vector types */
+#if defined( __VEC__ )
+ #include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
+ typedef vector unsigned char __cl_uchar16;
+ typedef vector signed char __cl_char16;
+ typedef vector unsigned short __cl_ushort8;
+ typedef vector signed short __cl_short8;
+ typedef vector unsigned int __cl_uint4;
+ typedef vector signed int __cl_int4;
+ typedef vector float __cl_float4;
+ #define __CL_UCHAR16__ 1
+ #define __CL_CHAR16__ 1
+ #define __CL_USHORT8__ 1
+ #define __CL_SHORT8__ 1
+ #define __CL_UINT4__ 1
+ #define __CL_INT4__ 1
+ #define __CL_FLOAT4__ 1
+#endif
+
+#if defined( __SSE__ )
+ #if defined( __MINGW64__ )
+ #include <intrin.h>
+ #else
+ #include <xmmintrin.h>
+ #endif
+ #if defined( __GNUC__ )
+ typedef float __cl_float4 __attribute__((vector_size(16)));
+ #else
+ typedef __m128 __cl_float4;
+ #endif
+ #define __CL_FLOAT4__ 1
+#endif
+
+#if defined( __SSE2__ )
+ #if defined( __MINGW64__ )
+ #include <intrin.h>
+ #else
+ #include <emmintrin.h>
+ #endif
+ #if defined( __GNUC__ )
+ typedef cl_uchar __cl_uchar16 __attribute__((vector_size(16)));
+ typedef cl_char __cl_char16 __attribute__((vector_size(16)));
+ typedef cl_ushort __cl_ushort8 __attribute__((vector_size(16)));
+ typedef cl_short __cl_short8 __attribute__((vector_size(16)));
+ typedef cl_uint __cl_uint4 __attribute__((vector_size(16)));
+ typedef cl_int __cl_int4 __attribute__((vector_size(16)));
+ typedef cl_ulong __cl_ulong2 __attribute__((vector_size(16)));
+ typedef cl_long __cl_long2 __attribute__((vector_size(16)));
+ typedef cl_double __cl_double2 __attribute__((vector_size(16)));
+ #else
+ typedef __m128i __cl_uchar16;
+ typedef __m128i __cl_char16;
+ typedef __m128i __cl_ushort8;
+ typedef __m128i __cl_short8;
+ typedef __m128i __cl_uint4;
+ typedef __m128i __cl_int4;
+ typedef __m128i __cl_ulong2;
+ typedef __m128i __cl_long2;
+ typedef __m128d __cl_double2;
+ #endif
+ #define __CL_UCHAR16__ 1
+ #define __CL_CHAR16__ 1
+ #define __CL_USHORT8__ 1
+ #define __CL_SHORT8__ 1
+ #define __CL_INT4__ 1
+ #define __CL_UINT4__ 1
+ #define __CL_ULONG2__ 1
+ #define __CL_LONG2__ 1
+ #define __CL_DOUBLE2__ 1
+#endif
+
+#if defined( __MMX__ )
+ #include <mmintrin.h>
+ #if defined( __GNUC__ )
+ typedef cl_uchar __cl_uchar8 __attribute__((vector_size(8)));
+ typedef cl_char __cl_char8 __attribute__((vector_size(8)));
+ typedef cl_ushort __cl_ushort4 __attribute__((vector_size(8)));
+ typedef cl_short __cl_short4 __attribute__((vector_size(8)));
+ typedef cl_uint __cl_uint2 __attribute__((vector_size(8)));
+ typedef cl_int __cl_int2 __attribute__((vector_size(8)));
+ typedef cl_ulong __cl_ulong1 __attribute__((vector_size(8)));
+ typedef cl_long __cl_long1 __attribute__((vector_size(8)));
+ typedef cl_float __cl_float2 __attribute__((vector_size(8)));
+ #else
+ typedef __m64 __cl_uchar8;
+ typedef __m64 __cl_char8;
+ typedef __m64 __cl_ushort4;
+ typedef __m64 __cl_short4;
+ typedef __m64 __cl_uint2;
+ typedef __m64 __cl_int2;
+ typedef __m64 __cl_ulong1;
+ typedef __m64 __cl_long1;
+ typedef __m64 __cl_float2;
+ #endif
+ #define __CL_UCHAR8__ 1
+ #define __CL_CHAR8__ 1
+ #define __CL_USHORT4__ 1
+ #define __CL_SHORT4__ 1
+ #define __CL_INT2__ 1
+ #define __CL_UINT2__ 1
+ #define __CL_ULONG1__ 1
+ #define __CL_LONG1__ 1
+ #define __CL_FLOAT2__ 1
+#endif
+
+#if defined( __AVX__ )
+ #if defined( __MINGW64__ )
+ #include <intrin.h>
+ #else
+ #include <immintrin.h>
+ #endif
+ #if defined( __GNUC__ )
+ typedef cl_float __cl_float8 __attribute__((vector_size(32)));
+ typedef cl_double __cl_double4 __attribute__((vector_size(32)));
+ #else
+ typedef __m256 __cl_float8;
+ typedef __m256d __cl_double4;
+ #endif
+ #define __CL_FLOAT8__ 1
+ #define __CL_DOUBLE4__ 1
+#endif
+
+/* Define alignment keys */
+#if defined( __GNUC__ )
+ #define CL_ALIGNED(_x) __attribute__ ((aligned(_x)))
+#elif defined( _WIN32) && (_MSC_VER)
+ /* Alignment keys neutered on windows because MSVC can't swallow function arguments with alignment requirements */
+ /* http://msdn.microsoft.com/en-us/library/373ak2y1%28VS.71%29.aspx */
+ /* #include <crtdefs.h> */
+ /* #define CL_ALIGNED(_x) _CRT_ALIGN(_x) */
+ #define CL_ALIGNED(_x)
+#else
+ #warning Need to implement some method to align data here
+ #define CL_ALIGNED(_x)
+#endif
+
+/* Indicate whether .xyzw, .s0123 and .hi.lo are supported */
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ /* .xyzw and .s0123...{f|F} are supported */
+ #define CL_HAS_NAMED_VECTOR_FIELDS 1
+ /* .hi and .lo are supported */
+ #define CL_HAS_HI_LO_VECTOR_FIELDS 1
+#endif
+
+/* Define cl_vector types */
+
+/* ---- cl_charn ---- */
+typedef union
+{
+ cl_char CL_ALIGNED(2) s[2];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_char x, y; };
+ __extension__ struct{ cl_char s0, s1; };
+ __extension__ struct{ cl_char lo, hi; };
+#endif
+#if defined( __CL_CHAR2__)
+ __cl_char2 v2;
+#endif
+}cl_char2;
+
+typedef union
+{
+ cl_char CL_ALIGNED(4) s[4];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_char x, y, z, w; };
+ __extension__ struct{ cl_char s0, s1, s2, s3; };
+ __extension__ struct{ cl_char2 lo, hi; };
+#endif
+#if defined( __CL_CHAR2__)
+ __cl_char2 v2[2];
+#endif
+#if defined( __CL_CHAR4__)
+ __cl_char4 v4;
+#endif
+}cl_char4;
+
+/* cl_char3 is identical in size, alignment and behavior to cl_char4. See section 6.1.5. */
+typedef cl_char4 cl_char3;
+
+typedef union
+{
+ cl_char CL_ALIGNED(8) s[8];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_char x, y, z, w; };
+ __extension__ struct{ cl_char s0, s1, s2, s3, s4, s5, s6, s7; };
+ __extension__ struct{ cl_char4 lo, hi; };
+#endif
+#if defined( __CL_CHAR2__)
+ __cl_char2 v2[4];
+#endif
+#if defined( __CL_CHAR4__)
+ __cl_char4 v4[2];
+#endif
+#if defined( __CL_CHAR8__ )
+ __cl_char8 v8;
+#endif
+}cl_char8;
+
+typedef union
+{
+ cl_char CL_ALIGNED(16) s[16];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_char x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+ __extension__ struct{ cl_char s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+ __extension__ struct{ cl_char8 lo, hi; };
+#endif
+#if defined( __CL_CHAR2__)
+ __cl_char2 v2[8];
+#endif
+#if defined( __CL_CHAR4__)
+ __cl_char4 v4[4];
+#endif
+#if defined( __CL_CHAR8__ )
+ __cl_char8 v8[2];
+#endif
+#if defined( __CL_CHAR16__ )
+ __cl_char16 v16;
+#endif
+}cl_char16;
+
+
+/* ---- cl_ucharn ---- */
+typedef union
+{
+ cl_uchar CL_ALIGNED(2) s[2];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_uchar x, y; };
+ __extension__ struct{ cl_uchar s0, s1; };
+ __extension__ struct{ cl_uchar lo, hi; };
+#endif
+#if defined( __cl_uchar2__)
+ __cl_uchar2 v2;
+#endif
+}cl_uchar2;
+
+typedef union
+{
+ cl_uchar CL_ALIGNED(4) s[4];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_uchar x, y, z, w; };
+ __extension__ struct{ cl_uchar s0, s1, s2, s3; };
+ __extension__ struct{ cl_uchar2 lo, hi; };
+#endif
+#if defined( __CL_UCHAR2__)
+ __cl_uchar2 v2[2];
+#endif
+#if defined( __CL_UCHAR4__)
+ __cl_uchar4 v4;
+#endif
+}cl_uchar4;
+
+/* cl_uchar3 is identical in size, alignment and behavior to cl_uchar4. See section 6.1.5. */
+typedef cl_uchar4 cl_uchar3;
+
+typedef union
+{
+ cl_uchar CL_ALIGNED(8) s[8];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_uchar x, y, z, w; };
+ __extension__ struct{ cl_uchar s0, s1, s2, s3, s4, s5, s6, s7; };
+ __extension__ struct{ cl_uchar4 lo, hi; };
+#endif
+#if defined( __CL_UCHAR2__)
+ __cl_uchar2 v2[4];
+#endif
+#if defined( __CL_UCHAR4__)
+ __cl_uchar4 v4[2];
+#endif
+#if defined( __CL_UCHAR8__ )
+ __cl_uchar8 v8;
+#endif
+}cl_uchar8;
+
+typedef union
+{
+ cl_uchar CL_ALIGNED(16) s[16];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_uchar x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+ __extension__ struct{ cl_uchar s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+ __extension__ struct{ cl_uchar8 lo, hi; };
+#endif
+#if defined( __CL_UCHAR2__)
+ __cl_uchar2 v2[8];
+#endif
+#if defined( __CL_UCHAR4__)
+ __cl_uchar4 v4[4];
+#endif
+#if defined( __CL_UCHAR8__ )
+ __cl_uchar8 v8[2];
+#endif
+#if defined( __CL_UCHAR16__ )
+ __cl_uchar16 v16;
+#endif
+}cl_uchar16;
+
+
+/* ---- cl_shortn ---- */
+typedef union
+{
+ cl_short CL_ALIGNED(4) s[2];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_short x, y; };
+ __extension__ struct{ cl_short s0, s1; };
+ __extension__ struct{ cl_short lo, hi; };
+#endif
+#if defined( __CL_SHORT2__)
+ __cl_short2 v2;
+#endif
+}cl_short2;
+
+typedef union
+{
+ cl_short CL_ALIGNED(8) s[4];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_short x, y, z, w; };
+ __extension__ struct{ cl_short s0, s1, s2, s3; };
+ __extension__ struct{ cl_short2 lo, hi; };
+#endif
+#if defined( __CL_SHORT2__)
+ __cl_short2 v2[2];
+#endif
+#if defined( __CL_SHORT4__)
+ __cl_short4 v4;
+#endif
+}cl_short4;
+
+/* cl_short3 is identical in size, alignment and behavior to cl_short4. See section 6.1.5. */
+typedef cl_short4 cl_short3;
+
+typedef union
+{
+ cl_short CL_ALIGNED(16) s[8];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_short x, y, z, w; };
+ __extension__ struct{ cl_short s0, s1, s2, s3, s4, s5, s6, s7; };
+ __extension__ struct{ cl_short4 lo, hi; };
+#endif
+#if defined( __CL_SHORT2__)
+ __cl_short2 v2[4];
+#endif
+#if defined( __CL_SHORT4__)
+ __cl_short4 v4[2];
+#endif
+#if defined( __CL_SHORT8__ )
+ __cl_short8 v8;
+#endif
+}cl_short8;
+
+typedef union
+{
+ cl_short CL_ALIGNED(32) s[16];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_short x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+ __extension__ struct{ cl_short s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+ __extension__ struct{ cl_short8 lo, hi; };
+#endif
+#if defined( __CL_SHORT2__)
+ __cl_short2 v2[8];
+#endif
+#if defined( __CL_SHORT4__)
+ __cl_short4 v4[4];
+#endif
+#if defined( __CL_SHORT8__ )
+ __cl_short8 v8[2];
+#endif
+#if defined( __CL_SHORT16__ )
+ __cl_short16 v16;
+#endif
+}cl_short16;
+
+
+/* ---- cl_ushortn ---- */
+typedef union
+{
+ cl_ushort CL_ALIGNED(4) s[2];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_ushort x, y; };
+ __extension__ struct{ cl_ushort s0, s1; };
+ __extension__ struct{ cl_ushort lo, hi; };
+#endif
+#if defined( __CL_USHORT2__)
+ __cl_ushort2 v2;
+#endif
+}cl_ushort2;
+
+typedef union
+{
+ cl_ushort CL_ALIGNED(8) s[4];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_ushort x, y, z, w; };
+ __extension__ struct{ cl_ushort s0, s1, s2, s3; };
+ __extension__ struct{ cl_ushort2 lo, hi; };
+#endif
+#if defined( __CL_USHORT2__)
+ __cl_ushort2 v2[2];
+#endif
+#if defined( __CL_USHORT4__)
+ __cl_ushort4 v4;
+#endif
+}cl_ushort4;
+
+/* cl_ushort3 is identical in size, alignment and behavior to cl_ushort4. See section 6.1.5. */
+typedef cl_ushort4 cl_ushort3;
+
+typedef union
+{
+ cl_ushort CL_ALIGNED(16) s[8];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_ushort x, y, z, w; };
+ __extension__ struct{ cl_ushort s0, s1, s2, s3, s4, s5, s6, s7; };
+ __extension__ struct{ cl_ushort4 lo, hi; };
+#endif
+#if defined( __CL_USHORT2__)
+ __cl_ushort2 v2[4];
+#endif
+#if defined( __CL_USHORT4__)
+ __cl_ushort4 v4[2];
+#endif
+#if defined( __CL_USHORT8__ )
+ __cl_ushort8 v8;
+#endif
+}cl_ushort8;
+
+typedef union
+{
+ cl_ushort CL_ALIGNED(32) s[16];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_ushort x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+ __extension__ struct{ cl_ushort s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+ __extension__ struct{ cl_ushort8 lo, hi; };
+#endif
+#if defined( __CL_USHORT2__)
+ __cl_ushort2 v2[8];
+#endif
+#if defined( __CL_USHORT4__)
+ __cl_ushort4 v4[4];
+#endif
+#if defined( __CL_USHORT8__ )
+ __cl_ushort8 v8[2];
+#endif
+#if defined( __CL_USHORT16__ )
+ __cl_ushort16 v16;
+#endif
+}cl_ushort16;
+
+/* ---- cl_intn ---- */
+typedef union
+{
+ cl_int CL_ALIGNED(8) s[2];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_int x, y; };
+ __extension__ struct{ cl_int s0, s1; };
+ __extension__ struct{ cl_int lo, hi; };
+#endif
+#if defined( __CL_INT2__)
+ __cl_int2 v2;
+#endif
+}cl_int2;
+
+typedef union
+{
+ cl_int CL_ALIGNED(16) s[4];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_int x, y, z, w; };
+ __extension__ struct{ cl_int s0, s1, s2, s3; };
+ __extension__ struct{ cl_int2 lo, hi; };
+#endif
+#if defined( __CL_INT2__)
+ __cl_int2 v2[2];
+#endif
+#if defined( __CL_INT4__)
+ __cl_int4 v4;
+#endif
+}cl_int4;
+
+/* cl_int3 is identical in size, alignment and behavior to cl_int4. See section 6.1.5. */
+typedef cl_int4 cl_int3;
+
+typedef union
+{
+ cl_int CL_ALIGNED(32) s[8];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_int x, y, z, w; };
+ __extension__ struct{ cl_int s0, s1, s2, s3, s4, s5, s6, s7; };
+ __extension__ struct{ cl_int4 lo, hi; };
+#endif
+#if defined( __CL_INT2__)
+ __cl_int2 v2[4];
+#endif
+#if defined( __CL_INT4__)
+ __cl_int4 v4[2];
+#endif
+#if defined( __CL_INT8__ )
+ __cl_int8 v8;
+#endif
+}cl_int8;
+
+typedef union
+{
+ cl_int CL_ALIGNED(64) s[16];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_int x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+ __extension__ struct{ cl_int s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+ __extension__ struct{ cl_int8 lo, hi; };
+#endif
+#if defined( __CL_INT2__)
+ __cl_int2 v2[8];
+#endif
+#if defined( __CL_INT4__)
+ __cl_int4 v4[4];
+#endif
+#if defined( __CL_INT8__ )
+ __cl_int8 v8[2];
+#endif
+#if defined( __CL_INT16__ )
+ __cl_int16 v16;
+#endif
+}cl_int16;
+
+
+/* ---- cl_uintn ---- */
+typedef union
+{
+ cl_uint CL_ALIGNED(8) s[2];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_uint x, y; };
+ __extension__ struct{ cl_uint s0, s1; };
+ __extension__ struct{ cl_uint lo, hi; };
+#endif
+#if defined( __CL_UINT2__)
+ __cl_uint2 v2;
+#endif
+}cl_uint2;
+
+typedef union
+{
+ cl_uint CL_ALIGNED(16) s[4];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_uint x, y, z, w; };
+ __extension__ struct{ cl_uint s0, s1, s2, s3; };
+ __extension__ struct{ cl_uint2 lo, hi; };
+#endif
+#if defined( __CL_UINT2__)
+ __cl_uint2 v2[2];
+#endif
+#if defined( __CL_UINT4__)
+ __cl_uint4 v4;
+#endif
+}cl_uint4;
+
+/* cl_uint3 is identical in size, alignment and behavior to cl_uint4. See section 6.1.5. */
+typedef cl_uint4 cl_uint3;
+
+typedef union
+{
+ cl_uint CL_ALIGNED(32) s[8];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_uint x, y, z, w; };
+ __extension__ struct{ cl_uint s0, s1, s2, s3, s4, s5, s6, s7; };
+ __extension__ struct{ cl_uint4 lo, hi; };
+#endif
+#if defined( __CL_UINT2__)
+ __cl_uint2 v2[4];
+#endif
+#if defined( __CL_UINT4__)
+ __cl_uint4 v4[2];
+#endif
+#if defined( __CL_UINT8__ )
+ __cl_uint8 v8;
+#endif
+}cl_uint8;
+
+typedef union
+{
+ cl_uint CL_ALIGNED(64) s[16];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_uint x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+ __extension__ struct{ cl_uint s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+ __extension__ struct{ cl_uint8 lo, hi; };
+#endif
+#if defined( __CL_UINT2__)
+ __cl_uint2 v2[8];
+#endif
+#if defined( __CL_UINT4__)
+ __cl_uint4 v4[4];
+#endif
+#if defined( __CL_UINT8__ )
+ __cl_uint8 v8[2];
+#endif
+#if defined( __CL_UINT16__ )
+ __cl_uint16 v16;
+#endif
+}cl_uint16;
+
+/* ---- cl_longn ---- */
+typedef union
+{
+ cl_long CL_ALIGNED(16) s[2];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_long x, y; };
+ __extension__ struct{ cl_long s0, s1; };
+ __extension__ struct{ cl_long lo, hi; };
+#endif
+#if defined( __CL_LONG2__)
+ __cl_long2 v2;
+#endif
+}cl_long2;
+
+typedef union
+{
+ cl_long CL_ALIGNED(32) s[4];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_long x, y, z, w; };
+ __extension__ struct{ cl_long s0, s1, s2, s3; };
+ __extension__ struct{ cl_long2 lo, hi; };
+#endif
+#if defined( __CL_LONG2__)
+ __cl_long2 v2[2];
+#endif
+#if defined( __CL_LONG4__)
+ __cl_long4 v4;
+#endif
+}cl_long4;
+
+/* cl_long3 is identical in size, alignment and behavior to cl_long4. See section 6.1.5. */
+typedef cl_long4 cl_long3;
+
+typedef union
+{
+ cl_long CL_ALIGNED(64) s[8];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_long x, y, z, w; };
+ __extension__ struct{ cl_long s0, s1, s2, s3, s4, s5, s6, s7; };
+ __extension__ struct{ cl_long4 lo, hi; };
+#endif
+#if defined( __CL_LONG2__)
+ __cl_long2 v2[4];
+#endif
+#if defined( __CL_LONG4__)
+ __cl_long4 v4[2];
+#endif
+#if defined( __CL_LONG8__ )
+ __cl_long8 v8;
+#endif
+}cl_long8;
+
+typedef union
+{
+ cl_long CL_ALIGNED(128) s[16];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_long x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+ __extension__ struct{ cl_long s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+ __extension__ struct{ cl_long8 lo, hi; };
+#endif
+#if defined( __CL_LONG2__)
+ __cl_long2 v2[8];
+#endif
+#if defined( __CL_LONG4__)
+ __cl_long4 v4[4];
+#endif
+#if defined( __CL_LONG8__ )
+ __cl_long8 v8[2];
+#endif
+#if defined( __CL_LONG16__ )
+ __cl_long16 v16;
+#endif
+}cl_long16;
+
+
+/* ---- cl_ulongn ---- */
+typedef union
+{
+ cl_ulong CL_ALIGNED(16) s[2];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_ulong x, y; };
+ __extension__ struct{ cl_ulong s0, s1; };
+ __extension__ struct{ cl_ulong lo, hi; };
+#endif
+#if defined( __CL_ULONG2__)
+ __cl_ulong2 v2;
+#endif
+}cl_ulong2;
+
+typedef union
+{
+ cl_ulong CL_ALIGNED(32) s[4];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_ulong x, y, z, w; };
+ __extension__ struct{ cl_ulong s0, s1, s2, s3; };
+ __extension__ struct{ cl_ulong2 lo, hi; };
+#endif
+#if defined( __CL_ULONG2__)
+ __cl_ulong2 v2[2];
+#endif
+#if defined( __CL_ULONG4__)
+ __cl_ulong4 v4;
+#endif
+}cl_ulong4;
+
+/* cl_ulong3 is identical in size, alignment and behavior to cl_ulong4. See section 6.1.5. */
+typedef cl_ulong4 cl_ulong3;
+
+typedef union
+{
+ cl_ulong CL_ALIGNED(64) s[8];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_ulong x, y, z, w; };
+ __extension__ struct{ cl_ulong s0, s1, s2, s3, s4, s5, s6, s7; };
+ __extension__ struct{ cl_ulong4 lo, hi; };
+#endif
+#if defined( __CL_ULONG2__)
+ __cl_ulong2 v2[4];
+#endif
+#if defined( __CL_ULONG4__)
+ __cl_ulong4 v4[2];
+#endif
+#if defined( __CL_ULONG8__ )
+ __cl_ulong8 v8;
+#endif
+}cl_ulong8;
+
+typedef union
+{
+ cl_ulong CL_ALIGNED(128) s[16];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_ulong x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+ __extension__ struct{ cl_ulong s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+ __extension__ struct{ cl_ulong8 lo, hi; };
+#endif
+#if defined( __CL_ULONG2__)
+ __cl_ulong2 v2[8];
+#endif
+#if defined( __CL_ULONG4__)
+ __cl_ulong4 v4[4];
+#endif
+#if defined( __CL_ULONG8__ )
+ __cl_ulong8 v8[2];
+#endif
+#if defined( __CL_ULONG16__ )
+ __cl_ulong16 v16;
+#endif
+}cl_ulong16;
+
+
+/* --- cl_floatn ---- */
+
+typedef union
+{
+ cl_float CL_ALIGNED(8) s[2];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_float x, y; };
+ __extension__ struct{ cl_float s0, s1; };
+ __extension__ struct{ cl_float lo, hi; };
+#endif
+#if defined( __CL_FLOAT2__)
+ __cl_float2 v2;
+#endif
+}cl_float2;
+
+typedef union
+{
+ cl_float CL_ALIGNED(16) s[4];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_float x, y, z, w; };
+ __extension__ struct{ cl_float s0, s1, s2, s3; };
+ __extension__ struct{ cl_float2 lo, hi; };
+#endif
+#if defined( __CL_FLOAT2__)
+ __cl_float2 v2[2];
+#endif
+#if defined( __CL_FLOAT4__)
+ __cl_float4 v4;
+#endif
+}cl_float4;
+
+/* cl_float3 is identical in size, alignment and behavior to cl_float4. See section 6.1.5. */
+typedef cl_float4 cl_float3;
+
+typedef union
+{
+ cl_float CL_ALIGNED(32) s[8];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_float x, y, z, w; };
+ __extension__ struct{ cl_float s0, s1, s2, s3, s4, s5, s6, s7; };
+ __extension__ struct{ cl_float4 lo, hi; };
+#endif
+#if defined( __CL_FLOAT2__)
+ __cl_float2 v2[4];
+#endif
+#if defined( __CL_FLOAT4__)
+ __cl_float4 v4[2];
+#endif
+#if defined( __CL_FLOAT8__ )
+ __cl_float8 v8;
+#endif
+}cl_float8;
+
+typedef union
+{
+ cl_float CL_ALIGNED(64) s[16];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_float x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+ __extension__ struct{ cl_float s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+ __extension__ struct{ cl_float8 lo, hi; };
+#endif
+#if defined( __CL_FLOAT2__)
+ __cl_float2 v2[8];
+#endif
+#if defined( __CL_FLOAT4__)
+ __cl_float4 v4[4];
+#endif
+#if defined( __CL_FLOAT8__ )
+ __cl_float8 v8[2];
+#endif
+#if defined( __CL_FLOAT16__ )
+ __cl_float16 v16;
+#endif
+}cl_float16;
+
+/* --- cl_doublen ---- */
+
+typedef union
+{
+ cl_double CL_ALIGNED(16) s[2];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_double x, y; };
+ __extension__ struct{ cl_double s0, s1; };
+ __extension__ struct{ cl_double lo, hi; };
+#endif
+#if defined( __CL_DOUBLE2__)
+ __cl_double2 v2;
+#endif
+}cl_double2;
+
+typedef union
+{
+ cl_double CL_ALIGNED(32) s[4];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_double x, y, z, w; };
+ __extension__ struct{ cl_double s0, s1, s2, s3; };
+ __extension__ struct{ cl_double2 lo, hi; };
+#endif
+#if defined( __CL_DOUBLE2__)
+ __cl_double2 v2[2];
+#endif
+#if defined( __CL_DOUBLE4__)
+ __cl_double4 v4;
+#endif
+}cl_double4;
+
+/* cl_double3 is identical in size, alignment and behavior to cl_double4. See section 6.1.5. */
+typedef cl_double4 cl_double3;
+
+typedef union
+{
+ cl_double CL_ALIGNED(64) s[8];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_double x, y, z, w; };
+ __extension__ struct{ cl_double s0, s1, s2, s3, s4, s5, s6, s7; };
+ __extension__ struct{ cl_double4 lo, hi; };
+#endif
+#if defined( __CL_DOUBLE2__)
+ __cl_double2 v2[4];
+#endif
+#if defined( __CL_DOUBLE4__)
+ __cl_double4 v4[2];
+#endif
+#if defined( __CL_DOUBLE8__ )
+ __cl_double8 v8;
+#endif
+}cl_double8;
+
+typedef union
+{
+ cl_double CL_ALIGNED(128) s[16];
+#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+ __extension__ struct{ cl_double x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+ __extension__ struct{ cl_double s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+ __extension__ struct{ cl_double8 lo, hi; };
+#endif
+#if defined( __CL_DOUBLE2__)
+ __cl_double2 v2[8];
+#endif
+#if defined( __CL_DOUBLE4__)
+ __cl_double4 v4[4];
+#endif
+#if defined( __CL_DOUBLE8__ )
+ __cl_double8 v8[2];
+#endif
+#if defined( __CL_DOUBLE16__ )
+ __cl_double16 v16;
+#endif
+}cl_double16;
+
+/* Macro to facilitate debugging
+ * Usage:
+ * Place CL_PROGRAM_STRING_DEBUG_INFO on the line before the first line of your source.
+ * The first line ends with: CL_PROGRAM_STRING_DEBUG_INFO \"
+ * Each line thereafter of OpenCL C source must end with: \n\
+ * The last line ends in ";
+ *
+ * Example:
+ *
+ * const char *my_program = CL_PROGRAM_STRING_DEBUG_INFO "\
+ * kernel void foo( int a, float * b ) \n\
+ * { \n\
+ * // my comment \n\
+ * *b[ get_global_id(0)] = a; \n\
+ * } \n\
+ * ";
+ *
+ * This should correctly set up the line, (column) and file information for your source
+ * string so you can do source level debugging.
+ */
+#define __CL_STRINGIFY( _x ) # _x
+#define _CL_STRINGIFY( _x ) __CL_STRINGIFY( _x )
+#define CL_PROGRAM_STRING_DEBUG_INFO "#line " _CL_STRINGIFY(__LINE__) " \"" __FILE__ "\" \n\n"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __CL_PLATFORM_H */

HandBrake-0.9.9.tar.bz2/libhb/fifo.c -> HandBrake-0.10.0.tar.bz2/libhb/fifo.c Changed

@@ -1,6 +1,6 @@
 /* fifo.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -8,6 +8,7 @@
 */
 
 #include "hb.h"
+#include "openclwrapper.h"
 
 #ifndef SYS_DARWIN
 #include <malloc.h>
@@ -15,6 +16,7 @@
 
 #define FIFO_TIMEOUT 200
 //#define HB_FIFO_DEBUG 1
+//#define HB_BUFFER_DEBUG 1
 
 /* Fifo */
 struct hb_fifo_s
@@ -48,6 +50,8 @@
 * be at most 32 possible pools when the size is a 32 bit int. To avoid a lot
 * of slow & error-prone run-time checking we allow for all 32. */
 #define MAX_BUFFER_POOLS 32
+#define BUFFER_POOL_FIRST 10
+#define BUFFER_POOL_LAST 25
 /* the buffer pool only exists to avoid the two malloc and two free calls that
 * it would otherwise take to allocate & free a buffer. but we don't want to
 * tie up a lot of memory in the pool because this allocator isn't as general
@@ -61,6 +65,9 @@
 int64_t allocated;
 hb_lock_t *lock;
 hb_fifo_t *pool[MAX_BUFFER_POOLS];
+#if defined(HB_BUFFER_DEBUG)
+ hb_list_t *alloc_list;
+#endif
 } buffers;
 
 
@@ -69,18 +76,28 @@
 buffers.lock = hb_lock_init();
 buffers.allocated = 0;
 
+#if defined(HB_BUFFER_DEBUG)
+ buffers.alloc_list = hb_list_init();
+#endif
+
 /* we allocate pools for sizes 2^10 through 2^25. requests larger than
 * 2^25 will get passed through to malloc. */
 int i;
- for ( i = 10; i < 26; ++i )
+
+ // Create larger queue for 2^10 bucket since all allocations smaller than
+ // 2^10 come from here.
+ buffers.pool[BUFFER_POOL_FIRST] = hb_fifo_init(BUFFER_POOL_MAX_ELEMENTS*10, 1);
+ buffers.pool[BUFFER_POOL_FIRST]->buffer_size = 1 << 10;
+
+ /* requests smaller than 2^10 are satisfied from the 2^10 pool. */
+ for ( i = 1; i < BUFFER_POOL_FIRST; ++i )
 {
- buffers.pool[i] = hb_fifo_init(BUFFER_POOL_MAX_ELEMENTS, 1);
- buffers.pool[i]->buffer_size = 1 << i;
+ buffers.pool[i] = buffers.pool[BUFFER_POOL_FIRST];
 }
- /* requests smaller than 2^10 are satisfied from the 2^10 pool. */
- for ( i = 1; i < 10; ++i )
+ for ( i = BUFFER_POOL_FIRST + 1; i <= BUFFER_POOL_LAST; ++i )
 {
- buffers.pool[i] = buffers.pool[10];
+ buffers.pool[i] = hb_fifo_init(BUFFER_POOL_MAX_ELEMENTS, 1);
+ buffers.pool[i]->buffer_size = 1 << i;
 }
 }
 
@@ -152,7 +169,7 @@
 static void buffer_pools_validate( void )
 {
 int ii;
- for ( ii = 10; ii < 26; ++ii )
+ for ( ii = BUFFER_POOL_FIRST; ii <= BUFFER_POOL_LAST; ++ii )
 {
 buffer_pool_validate( buffers.pool[ii] );
 }
@@ -234,7 +251,17 @@
 
 hb_lock(buffers.lock);
 
- for( i = 10; i < 26; ++i)
+#if defined(HB_BUFFER_DEBUG)
+ hb_deep_log(2, "leaked %d buffers", hb_list_count(buffers.alloc_list));
+ for (i = 0; i < hb_list_count(buffers.alloc_list); i++)
+ {
+ hb_buffer_t *b = hb_list_item(buffers.alloc_list, i);
+ hb_deep_log(2, "leaked buffer %p type %d size %d alloc %d",
+ b, b->s.type, b->size, b->alloc);
+ }
+#endif
+
+ for( i = BUFFER_POOL_FIRST; i <= BUFFER_POOL_LAST; ++i)
 {
 count = 0;
 while( ( b = hb_fifo_get(buffers.pool[i]) ) )
@@ -242,7 +269,20 @@
 if( b->data )
 {
 freed += b->alloc;
- free( b->data );
+
+ if (b->cl.buffer != NULL)
+ {
+ /* OpenCL */
+ if (hb_cl_free_mapped_buffer(b->cl.buffer, b->data) == 0)
+ {
+ hb_log("hb_buffer_pool_free: bad free: %p -> buffer %p map %p",
+ b, b->cl.buffer, b->data);
+ }
+ }
+ else
+ {
+ free(b->data);
+ }
 }
 free( b );
 count++;
@@ -263,7 +303,7 @@
 static hb_fifo_t *size_to_pool( int size )
 {
 int i;
- for ( i = 0; i < 30; ++i )
+ for ( i = BUFFER_POOL_FIRST; i <= BUFFER_POOL_LAST; ++i )
 {
 if ( size <= (1 << i) )
 {
@@ -273,7 +313,7 @@
 return NULL;
 }
 
-hb_buffer_t * hb_buffer_init( int size )
+hb_buffer_t * hb_buffer_init_internal( int size , int needsMapped )
 {
 hb_buffer_t * b;
 // Certain libraries (hrm ffmpeg) expect buffers passed to them to
@@ -288,6 +328,20 @@
 {
 b = hb_fifo_get( buffer_pool );
 
+ /* OpenCL */
+ if (b != NULL && needsMapped && b->cl.buffer == NULL)
+ {
+ // We need a mapped OpenCL buffer and that is not
+ // what we got out of the pool.
+ // Ditch it; it will get replaced with what we need.
+ if (b->data != NULL)
+ {
+ free(b->data);
+ }
+ free(b);
+ b = NULL;
+ }
+
 if( b )
 {
 /*
@@ -295,10 +349,30 @@
 * didn't have to do this.
 */
 uint8_t *data = b->data;
+
+ /* OpenCL */
+ cl_mem buffer = b->cl.buffer;
+ cl_event last_event = b->cl.last_event;
+ int loc = b->cl.buffer_location;
+
 memset( b, 0, sizeof(hb_buffer_t) );
 b->alloc = buffer_pool->buffer_size;
 b->size = size;
 b->data = data;
+ b->s.start = AV_NOPTS_VALUE;
+ b->s.stop = AV_NOPTS_VALUE;
+ b->s.renderOffset = AV_NOPTS_VALUE;
+
+ /* OpenCL */
+ b->cl.buffer = buffer;
+ b->cl.last_event = last_event;
+ b->cl.buffer_location = loc;
+
+#if defined(HB_BUFFER_DEBUG)
+ hb_lock(buffers.lock);
+ hb_list_add(buffers.alloc_list, b);
+ hb_unlock(buffers.lock);
+#endif
 return( b );
 }
 }
@@ -317,14 +391,35 @@
 
 if (size)
 {
+ /* OpenCL */
+ b->cl.last_event = NULL;
+ b->cl.buffer_location = HOST;
+
+ /* OpenCL */
+ if (needsMapped)
+ {
+ int status = hb_cl_create_mapped_buffer(&b->cl.buffer, &b->data, b->alloc);
+ if (!status)
+ {
+ hb_error("Failed to map CL buffer");
+ free(b);
+ return NULL;
+ }
+ }
+ else
+ {
+ b->cl.buffer = NULL;
+
 #if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined( SYS_MINGW )
- b->data = malloc( b->alloc );
+ b->data = malloc( b->alloc );
 #elif defined( SYS_CYGWIN )
- /* FIXME */
- b->data = malloc( b->alloc + 17 );
+ /* FIXME */
+ b->data = malloc( b->alloc + 17 );
 #else
- b->data = memalign( 16, b->alloc );
+ b->data = memalign( 16, b->alloc );
 #endif
+ }
+
 if( !b->data )
 {
 hb_log( "out of memory" );
@@ -335,9 +430,22 @@
 buffers.allocated += b->alloc;
 hb_unlock(buffers.lock);
 }
+ b->s.start = AV_NOPTS_VALUE;
+ b->s.stop = AV_NOPTS_VALUE;
+ b->s.renderOffset = AV_NOPTS_VALUE;
+#if defined(HB_BUFFER_DEBUG)
+ hb_lock(buffers.lock);
+ hb_list_add(buffers.alloc_list, b);
+ hb_unlock(buffers.lock);
+#endif
 return b;
 }
 
+hb_buffer_t * hb_buffer_init( int size )
+{
+ return hb_buffer_init_internal(size, 0);
+}
+
 void hb_buffer_realloc( hb_buffer_t * b, int size )
 {
 if ( size > b->alloc || b->data == NULL )
@@ -355,6 +463,7 @@
 
 void hb_buffer_reduce( hb_buffer_t * b, int size )
 {
+
 if ( size < b->alloc / 8 || b->data == NULL )
 {
 hb_buffer_t * tmp = hb_buffer_init( size );
@@ -368,6 +477,7 @@
 
 hb_buffer_t * hb_buffer_dup( const hb_buffer_t * src )
 {
+
 hb_buffer_t * buf;
 
 if ( src == NULL )
@@ -383,6 +493,10 @@
 hb_buffer_init_planes( buf );
 }
 
+#ifdef USE_QSV
+ memcpy(&buf->qsv_details, &src->qsv_details, sizeof(src->qsv_details));
+#endif
+
 return buf;
 }
 
@@ -406,7 +520,7 @@
 static void hb_buffer_init_planes_internal( hb_buffer_t * b, uint8_t * has_plane )
 {
 uint8_t * plane = b->data;
- int p, tot = 0;
+ int p;
 
 for( p = 0; p < 4; p++ )
 {
@@ -419,14 +533,13 @@
 b->plane[p].height = hb_image_height( b->f.fmt, b->f.height, p );
 b->plane[p].size = b->plane[p].stride * b->plane[p].height_stride;
 plane += b->plane[p].size;
- tot += b->plane[p].size;
 }
 }
 }
 
 void hb_buffer_init_planes( hb_buffer_t * b )
 {
- const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[b->f.fmt];
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(b->f.fmt);
 int p;
 
 uint8_t has_plane[4] = {0,};
@@ -442,7 +555,7 @@
 // with pixel format pix_fmt and dimensions width x height.
 hb_buffer_t * hb_frame_buffer_init( int pix_fmt, int width, int height )
 {
- const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
 hb_buffer_t * buf;
 int p;
 uint8_t has_plane[4] = {0,};
@@ -462,7 +575,9 @@
 }
 }
 
- buf = hb_buffer_init( size );
+ /* OpenCL */
+ buf = hb_buffer_init_internal(size , hb_use_buffers());
+
 if( buf == NULL )
 return NULL;
 
@@ -479,7 +594,7 @@
 // with dimensions width x height.
 void hb_video_buffer_realloc( hb_buffer_t * buf, int width, int height )
 {
- const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[buf->f.fmt];
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(buf->f.fmt);
 int p;
 uint8_t has_plane[4] = {0,};
 
@@ -502,6 +617,7 @@
 
 buf->f.width = width;
 buf->f.height = height;
+ buf->size = size;
 
 hb_buffer_init_planes_internal( buf, has_plane );
 }
@@ -515,11 +631,21 @@
 int size = dst->size;
 int alloc = dst->alloc;
 
+ /* OpenCL */
+ cl_mem buffer = dst->cl.buffer;
+ cl_event last_event = dst->cl.last_event;
+ int loc = dst->cl.buffer_location;
+
 *dst = *src;
 
 src->data = data;
 src->size = size;
 src->alloc = alloc;
+
+ /* OpenCL */
+ src->cl.buffer = buffer;
+ src->cl.last_event = last_event;
+ src->cl.buffer_location = loc;
 }
 
 // Frees the specified buffer list.
@@ -534,6 +660,11 @@
 
 b->next = NULL;
 
+#if defined(HB_BUFFER_DEBUG)
+ hb_lock(buffers.lock);
+ hb_list_rem(buffers.alloc_list, b);
+ hb_unlock(buffers.lock);
+#endif
 // Close any attached subtitle buffers
 hb_buffer_close( &b->sub );
 
@@ -547,7 +678,19 @@
 // free the buf 
 if( b->data )
 {
- free( b->data );
+ if (b->cl.buffer != NULL)
+ {
+ /* OpenCL */
+ if (hb_cl_free_mapped_buffer(b->cl.buffer, b->data) == 0)
+ {
+ hb_log("hb_buffer_pool_free: bad free %p -> buffer %p map %p",
+ b, b->cl.buffer, b->data);
+ }
+ }
+ else
+ {
+ free(b->data);
+ }
 hb_lock(buffers.lock);
 buffers.allocated -= b->alloc;
 hb_unlock(buffers.lock);
@@ -564,6 +707,63 @@
 // Note that dst takes ownership of the subtitles
 dst->sub = src->sub;
 src->sub = NULL;
+
+#ifdef USE_QSV
+	memcpy(&dst->qsv_details, &src->qsv_details, sizeof(src->qsv_details));
+#endif
+
+}
+
+hb_image_t * hb_buffer_to_image(hb_buffer_t *buf)
+{
+ hb_image_t *image = calloc(1, sizeof(hb_image_t));
+
+#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined( SYS_MINGW )
+ image->data = malloc( buf->size );
+#elif defined( SYS_CYGWIN )
+ /* FIXME */
+ image->data = malloc( buf->size + 17 );
+#else
+ image->data = memalign( 16, buf->size );
+#endif
+ if (image->data == NULL)
+ {
+ free(image);
+ return NULL;
+ }
+
+ image->format = buf->f.fmt;
+ image->width = buf->f.width;
+ image->height = buf->f.height;
+ memcpy(image->data, buf->data, buf->size);
+
+ int p;
+ uint8_t *data = image->data;
+ for (p = 0; p < 4; p++)
+ {
+ image->plane[p].data = data;
+ image->plane[p].width = buf->plane[p].width;
+ image->plane[p].height = buf->plane[p].height;
+ image->plane[p].stride = buf->plane[p].stride;
+ image->plane[p].height_stride = buf->plane[p].height_stride;
+ image->plane[p].size = buf->plane[p].size;
+ data += image->plane[p].size;
+ }
+ return image;
+}
+
+void hb_image_close(hb_image_t **_image)
+{
+ if (_image == NULL)
+ return;
+
+ hb_image_t * image = *_image;
+ if (image != NULL)
+ {
+ free(image->data);
+ free(image);
+ *_image = NULL;
+ }
 }
 
 hb_fifo_t * hb_fifo_init( int capacity, int thresh )

HandBrake-0.10.0.tar.bz2/libhb/h264_common.h Added

@@ -0,0 +1,24 @@
+/* h264_common.h
+
+ Copyright (c) 2003-2014 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#ifndef HB_H264_COMMON_H
+#define HB_H264_COMMON_H
+
+static const char * const hb_h264_profile_names[] = { "auto", "high", "main", "baseline", NULL, };
+static const char * const hb_h264_level_names[] = { "auto", "1.0", "1b", "1.1", "1.2", "1.3", "2.0", "2.1", "2.2", "3.0", "3.1", "3.2", "4.0", "4.1", "4.2", "5.0", "5.1", "5.2", NULL, };
+static const int const hb_h264_level_values[] = { -1, 10, 9, 11, 12, 13, 20, 21, 22, 30, 31, 32, 40, 41, 42, 50, 51, 52, 0, };
+
+// stolen from libx264's x264.h
+static const char * const hb_h264_fullrange_names[] = { "off", "on", NULL, };
+static const char * const hb_h264_vidformat_names[] = { "component", "pal", "ntsc", "secam", "mac", "undef", NULL, };
+static const char * const hb_h264_colorprim_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "film", "bt2020", NULL, };
+static const char * const hb_h264_transfer_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "linear", "log100", "log316", "iec61966-2-4", "bt1361e", "iec61966-2-1", "bt2020-10", "bt2020-12", NULL, };
+static const char * const hb_h264_colmatrix_names[] = { "GBR", "bt709", "undef", "", "fcc", "bt470bg", "smpte170m", "smpte240m", "YCgCo", "bt2020nc", "bt2020c", NULL, };
+
+#endif //HB_H264_COMMON_H

HandBrake-0.9.9.tar.bz2/libhb/hb.c -> HandBrake-0.10.0.tar.bz2/libhb/hb.c Changed

@@ -1,6 +1,6 @@
 /* hb.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -8,11 +8,16 @@
 */
 
 #include "hb.h"
+#include "opencl.h"
 #include "hbffmpeg.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 
+#ifdef USE_QSV
+#include "qsv_common.h"
+#endif
+
 #if defined( SYS_MINGW )
 #include <io.h>
 #if defined( PTW32_STATIC_LIB )
@@ -46,7 +51,7 @@
 int job_count;
 int job_count_permanent;
 volatile int work_die;
- int work_error;
+ hb_error_code work_error;
 hb_thread_t * work_thread;
 
 hb_lock_t * state_lock;
@@ -70,7 +75,6 @@
 
 hb_work_object_t * hb_objects = NULL;
 int hb_instance_counter = 0;
-int hb_process_initialized = 0;
 
 static void thread_func( void * );
 
@@ -284,23 +288,6 @@
 return ff_layout;
 }
 
-uint64_t hb_ff_layout_xlat(uint64_t ff_channel_layout, int nchannels)
-{
- uint64_t hb_layout = ff_channel_layout;
- if (!hb_layout || av_get_channel_layout_nb_channels(hb_layout) != nchannels)
- {
- hb_layout = av_get_default_channel_layout(nchannels);
- if (!hb_layout)
- {
- // This will likely not sound very good ;)
- hb_layout = AV_CH_LAYOUT_STEREO;
- hb_error("hb_ff_layout_xlat: unsupported layout 0x%"PRIx64" with %d channels",
- ff_channel_layout, nchannels);
- }
- }
- return hb_layout;
-}
-
 /*
 * Set sample format to the request format if supported by the codec.
 * The planar/packed variant of the requested format is the next best thing.
@@ -355,26 +342,6 @@
 hb_objects = w;
 }
 
-/**
- * Ensures that the process has been initialized.
- */
-static void process_init()
-{
- if (!hb_process_initialized)
- {
-#if defined( SYS_MINGW ) && defined( PTW32_STATIC_LIB )
- pthread_win32_process_attach_np();
-#endif
-
-#if defined( _WIN32 ) || defined( __MINGW32__ )
- setvbuf( stdout, NULL, _IONBF, 0 );
- setvbuf( stderr, NULL, _IONBF, 0 );
-#endif
- hb_process_initialized = 1;
- }
- 
-}
-
 void (*hb_log_callback)(const char* message);
 static void redirect_thread_func(void *);
 
@@ -388,8 +355,6 @@
 */
 void hb_register_logger( void (*log_cb)(const char* message) )
 {
- process_init();
-
 hb_log_callback = log_cb;
 hb_thread_init("ioredirect", redirect_thread_func, NULL, HB_NORMAL_PRIORITY);
 }
@@ -402,8 +367,6 @@
 */
 hb_handle_t * hb_init( int verbose, int update_check )
 {
- process_init();
-
 hb_handle_t * h = calloc( sizeof( hb_handle_t ), 1 );
 uint64_t date;
 
@@ -461,42 +424,11 @@
 
 h->interjob = calloc( sizeof( hb_interjob_t ), 1 );
 
- /* libavcodec */
- hb_avcodec_init();
-
 /* Start library thread */
 hb_log( "hb_init: starting libhb thread" );
 h->die = 0;
 h->main_thread = hb_thread_init( "libhb", thread_func, h,
 HB_NORMAL_PRIORITY );
- hb_register( &hb_sync_video );
- hb_register( &hb_sync_audio );
-	hb_register( &hb_decmpeg2 );
-	hb_register( &hb_decvobsub );
- hb_register( &hb_encvobsub );
- hb_register( &hb_deccc608 );
- hb_register( &hb_decsrtsub );
- hb_register( &hb_decutf8sub );
- hb_register( &hb_dectx3gsub );
- hb_register( &hb_decssasub );
- hb_register( &hb_decpgssub );
-	hb_register( &hb_encavcodec );
-	hb_register( &hb_encx264 );
- hb_register( &hb_enctheora );
-	hb_register( &hb_deca52 );
-	hb_register( &hb_decavcodeca );
-	hb_register( &hb_decavcodecv );
-	hb_register( &hb_declpcm );
-	hb_register( &hb_encfaac );
-	hb_register( &hb_enclame );
-	hb_register( &hb_encvorbis );
-	hb_register( &hb_muxer );
-#ifdef __APPLE__
-	hb_register( &hb_encca_aac );
-	hb_register( &hb_encca_haac );
-#endif
-	hb_register( &hb_encavcodeca );
-	hb_register( &hb_reader );
 
 return h;
 }
@@ -562,44 +494,13 @@
 
 h->pause_lock = hb_lock_init();
 
- /* libavcodec */
- hb_avcodec_init();
-
 /* Start library thread */
 hb_log( "hb_init: starting libhb thread" );
 h->die = 0;
 h->main_thread = hb_thread_init( "libhb", thread_func, h,
 HB_NORMAL_PRIORITY );
 
- hb_register( &hb_sync_video );
- hb_register( &hb_sync_audio );
-	hb_register( &hb_decmpeg2 );
-	hb_register( &hb_decvobsub );
- hb_register( &hb_encvobsub );
- hb_register( &hb_deccc608 );
- hb_register( &hb_decsrtsub );
- hb_register( &hb_decutf8sub );
- hb_register( &hb_dectx3gsub );
- hb_register( &hb_decssasub );
-	hb_register( &hb_encavcodec );
-	hb_register( &hb_encx264 );
- hb_register( &hb_enctheora );
-	hb_register( &hb_deca52 );
-	hb_register( &hb_decavcodeca );
-	hb_register( &hb_decavcodecv );
-	hb_register( &hb_declpcm );
-	hb_register( &hb_encfaac );
-	hb_register( &hb_enclame );
-	hb_register( &hb_encvorbis );
-	hb_register( &hb_muxer );
-#ifdef __APPLE__
-	hb_register( &hb_encca_aac );
-	hb_register( &hb_encca_haac );
-#endif
-	hb_register( &hb_encavcodeca );
-	hb_register( &hb_reader );
-
-	return h;
+ return h;
 }
 
 
@@ -698,6 +599,24 @@
 hb_title_close( &title );
 }
 
+ /* Print CPU info here so that it's in all scan and encode logs */
+ const char *cpu_name = hb_get_cpu_name();
+ const char *cpu_type = hb_get_cpu_platform_name();
+ hb_log("CPU: %s", cpu_name != NULL ? cpu_name : "");
+ if (cpu_type != NULL)
+ {
+ hb_log(" - %s", cpu_type);
+ }
+ hb_log(" - logical processor count: %d", hb_get_cpu_count());
+
+ /* Print OpenCL info here so that it's in all scan and encode logs */
+ hb_opencl_info_print();
+
+#ifdef USE_QSV
+ /* Print QSV info here so that it's in all scan and encode logs */
+ hb_qsv_info_print();
+#endif
+
 hb_log( "hb_scan: path=%s, title_index=%d", path, title_index );
 h->scan_thread = hb_scan_init( h, &h->scan_die, path, title_index, 
 &h->title_set, preview_count, 
@@ -727,7 +646,7 @@
 hb_get_tempory_filename( h, filename, "%d_%d_%d",
 hb_get_instance_id(h), title, preview );
 
- file = fopen( filename, "wb" );
+ file = hb_fopen(filename, "wb");
 if( !file )
 {
 hb_error( "hb_save_preview: fopen failed (%s)", filename );
@@ -752,64 +671,124 @@
 return 0;
 }
 
-hb_buffer_t * hb_read_preview( hb_handle_t * h, int title_idx, int preview )
+hb_buffer_t * hb_read_preview(hb_handle_t * h, hb_title_t *title, int preview)
 {
 FILE * file;
 char filename[1024];
- hb_title_set_t *title_set;
 
- hb_title_t * title = NULL;
+ hb_get_tempory_filename(h, filename, "%d_%d_%d",
+ hb_get_instance_id(h), title->index, preview);
 
- title_set = hb_get_title_set(h);
-
- int ii;
- for (ii = 0; ii < hb_list_count(title_set->list_title); ii++)
- {
- title = hb_list_item( title_set->list_title, ii);
- if (title != NULL && title->index == title_idx)
- {
- break;
- }
- title = NULL;
- }
- if (title == NULL)
- {
- hb_error( "hb_read_preview: invalid title (%d)", title_idx );
- return NULL;
- }
-
- hb_get_tempory_filename( h, filename, "%d_%d_%d",
- hb_get_instance_id(h), title_idx, preview );
-
- file = fopen( filename, "rb" );
- if( !file )
+ file = hb_fopen(filename, "rb");
+ if (!file)
 {
 hb_error( "hb_read_preview: fopen failed (%s)", filename );
 return NULL;
 }
 
 hb_buffer_t * buf;
- buf = hb_frame_buffer_init( AV_PIX_FMT_YUV420P, title->width, title->height );
+ buf = hb_frame_buffer_init(AV_PIX_FMT_YUV420P, title->width, title->height);
 
 int pp, hh;
- for( pp = 0; pp < 3; pp++ )
+ for (pp = 0; pp < 3; pp++)
 {
 uint8_t *data = buf->plane[pp].data;
 int stride = buf->plane[pp].stride;
 int w = buf->plane[pp].width;
 int h = buf->plane[pp].height;
 
- for( hh = 0; hh < h; hh++ )
+ for (hh = 0; hh < h; hh++)
 {
- fread( data, w, 1, file );
+ fread(data, w, 1, file);
 data += stride;
 }
 }
- fclose( file );
+ fclose(file);
 
 return buf;
 }
 
+hb_image_t* hb_get_preview2(hb_handle_t * h, int title_idx, int picture,
+ hb_ui_geometry_t *ui_geo, int deinterlace)
+{
+ char filename[1024];
+ hb_buffer_t * in_buf, * deint_buf = NULL, * preview_buf;
+ uint32_t swsflags;
+ AVPicture pic_in, pic_preview, pic_deint, pic_crop;
+ struct SwsContext * context;
+
+ int width = ui_geo->width * ui_geo->par.num / ui_geo->par.den;
+ int height = ui_geo->height;
+
+ swsflags = SWS_LANCZOS | SWS_ACCURATE_RND;
+
+ preview_buf = hb_frame_buffer_init(AV_PIX_FMT_RGB32, width, height);
+ hb_avpicture_fill( &pic_preview, preview_buf );
+
+ // Allocate the AVPicture frames and fill in
+
+ memset( filename, 0, 1024 );
+
+ hb_title_t * title;
+ title = hb_find_title_by_index(h, title_idx);
+ if (title == NULL)
+ {
+ hb_error( "hb_get_preview2: invalid title (%d)", title_idx );
+ return NULL;
+ }
+
+ in_buf = hb_read_preview( h, title, picture );
+ if ( in_buf == NULL )
+ {
+ return NULL;
+ }
+
+ hb_avpicture_fill( &pic_in, in_buf );
+
+ if (deinterlace)
+ {
+ // Deinterlace and crop
+ deint_buf = hb_frame_buffer_init( AV_PIX_FMT_YUV420P,
+ title->width, title->height );
+ hb_deinterlace(deint_buf, in_buf);
+ hb_avpicture_fill( &pic_deint, deint_buf );
+
+ av_picture_crop(&pic_crop, &pic_deint, AV_PIX_FMT_YUV420P,
+ ui_geo->crop[0], ui_geo->crop[2] );
+ }
+ else
+ {
+ // Crop
+ av_picture_crop(&pic_crop, &pic_in, AV_PIX_FMT_YUV420P,
+ ui_geo->crop[0], ui_geo->crop[2] );
+ }
+
+ // Get scaling context
+ context = hb_sws_get_context(
+ title->width - (ui_geo->crop[2] + ui_geo->crop[3]),
+ title->height - (ui_geo->crop[0] + ui_geo->crop[1]),
+ AV_PIX_FMT_YUV420P, width, height, AV_PIX_FMT_RGB32,
+ swsflags);
+
+ // Scale
+ sws_scale(context,
+ (const uint8_t* const *)pic_crop.data, pic_crop.linesize,
+ 0, title->height - (ui_geo->crop[0] + ui_geo->crop[1]),
+ pic_preview.data, pic_preview.linesize);
+
+ // Free context
+ sws_freeContext( context );
+
+ hb_image_t *image = hb_buffer_to_image(preview_buf);
+
+ // Clean up
+ hb_buffer_close( &in_buf );
+ hb_buffer_close( &deint_buf );
+ hb_buffer_close( &preview_buf );
+
+ return image;
+}
+
 /**
 * Create preview image of desired title a index of picture.
 * @param h Handle to hb_handle_t.
@@ -840,7 +819,7 @@
 
 memset( filename, 0, 1024 );
 
- in_buf = hb_read_preview( h, title->index, picture );
+ in_buf = hb_read_preview( h, title, picture );
 if ( in_buf == NULL )
 {
 return;
@@ -850,19 +829,11 @@
 
 if( job->deinterlace )
 {
- int width = (in_buf->plane[0].width + 3) & ~0x3;
- int height = (in_buf->plane[0].height + 3) & ~0x3;
-
 // Deinterlace and crop
- // avpicture_deinterlace requires 4 pixel aligned width and height
- // we have aligned all buffers to 16 byte width and height strides
- // so there is room in the buffers to accomodate a litte
- // overscan.
 deint_buf = hb_frame_buffer_init( AV_PIX_FMT_YUV420P,
 title->width, title->height );
+ hb_deinterlace(deint_buf, in_buf);
 hb_avpicture_fill( &pic_deint, deint_buf );
- avpicture_deinterlace( &pic_deint, &pic_in, AV_PIX_FMT_YUV420P,
- width, height );
 
 av_picture_crop( &pic_crop, &pic_deint, AV_PIX_FMT_YUV420P,
 job->crop[0], job->crop[2] );
@@ -1002,77 +973,78 @@
 }
 
 /**
- * Calculates job width and height for anamorphic content,
+ * Calculates destination width and height for anamorphic content
 *
- * @param job Handle to hb_job_t
- * @param output_width Pointer to returned storage width
- * @param output_height Pointer to returned storage height
- * @param output_par_width Pointer to returned pixel width
- * @param output_par_height Pointer to returned pixel height
+ * Returns calculated geometry
+ * @param source_geometry - Pointer to source geometry info
+ * @param ui_geometry - Pointer to requested destination parameters
 */
-void hb_set_anamorphic_size( hb_job_t * job,
- int *output_width, int *output_height,
- int *output_par_width, int *output_par_height )
+void hb_set_anamorphic_size2(hb_geometry_t *src_geo,
+ hb_ui_geometry_t *ui_geo,
+ hb_geometry_t *result)
 {
+ hb_rational_t in_par, out_par;
+ int keep_display_aspect = !!(ui_geo->keep & HB_KEEP_DISPLAY_ASPECT);
+ int keep_height = !!(ui_geo->keep & HB_KEEP_HEIGHT);
+
 /* Set up some variables to make the math easier to follow. */
- hb_title_t * title = job->title;
- int cropped_width = title->width - job->crop[2] - job->crop[3] ;
- int cropped_height = title->height - job->crop[0] - job->crop[1] ;
- double storage_aspect = (double)cropped_width / (double)cropped_height;
- int mod = job->modulus ? job->modulus : 16;
- double aspect = title->aspect;
- 
- int64_t pixel_aspect_width = job->anamorphic.par_width;
- int64_t pixel_aspect_height = job->anamorphic.par_height;
+ int cropped_width = src_geo->width - ui_geo->crop[2] - ui_geo->crop[3];
+ int cropped_height = src_geo->height - ui_geo->crop[0] - ui_geo->crop[1];
+ double storage_aspect = (double)cropped_width / cropped_height;
+ int mod = ui_geo->modulus ? EVEN(ui_geo->modulus) : 2;
+
+ // Use 64 bits to avoid overflow till the final hb_reduce() call
+ hb_reduce(&in_par.num, &in_par.den, ui_geo->par.num, ui_geo->par.den);
+ int64_t dst_par_num = in_par.num;
+ int64_t dst_par_den = in_par.den;
+
+ hb_rational_t src_par = src_geo->par;
 
 /* If a source was really NTSC or PAL and the user specified ITU PAR
 values, replace the standard PAR values with the ITU broadcast ones. */
- if( title->width == 720 && job->anamorphic.itu_par )
+ if (src_geo->width == 720 && ui_geo->itu_par)
 {
 // convert aspect to a scaled integer so we can test for 16:9 & 4:3
 // aspect ratios ignoring insignificant differences in the LSBs of
 // the floating point representation.
- int iaspect = aspect * 9.;
+ int iaspect = src_geo->width * src_par.num * 9. /
+ (src_geo->height * src_par.den);
 
 /* Handle ITU PARs */
- if (title->height == 480)
+ if (src_geo->height == 480)
 {
 /* It's NTSC */
 if (iaspect == 16)
 {
 /* It's widescreen */
- pixel_aspect_width = 40;
- pixel_aspect_height = 33;
+ dst_par_num = 40;
+ dst_par_den = 33;
 }
 else if (iaspect == 12)
 {
 /* It's 4:3 */
- pixel_aspect_width = 10;
- pixel_aspect_height = 11;
+ dst_par_num = 10;
+ dst_par_den = 11;
 }
 }
- else if (title->height == 576)
+ else if (src_geo->height == 576)
 {
 /* It's PAL */
- if(iaspect == 16)
+ if (iaspect == 16)
 {
 /* It's widescreen */
- pixel_aspect_width = 16;
- pixel_aspect_height = 11;
+ dst_par_num = 16;
+ dst_par_den = 11;
 }
 else if (iaspect == 12)
 {
 /* It's 4:3 */
- pixel_aspect_width = 12;
- pixel_aspect_height = 11;
+ dst_par_num = 12;
+ dst_par_den = 11;
 }
 }
 }
 
- /* Figure out what width the source would display at. */
- int source_display_width = cropped_width * (double)pixel_aspect_width /
- (double)pixel_aspect_height ;
-
 /*
 3 different ways of deciding output dimensions:
 - 1: Strict anamorphic, preserve source dimensions
@@ -1082,82 +1054,133 @@
 int width, height;
 int maxWidth, maxHeight;
 
- maxWidth = MULTIPLE_MOD_DOWN( job->maxWidth, mod );
- maxHeight = MULTIPLE_MOD_DOWN( job->maxHeight, mod );
+ maxWidth = MULTIPLE_MOD_DOWN(ui_geo->maxWidth, mod);
+ maxHeight = MULTIPLE_MOD_DOWN(ui_geo->maxHeight, mod);
+ if (maxWidth && maxWidth < 32)
+ maxWidth = 32;
+ if (maxHeight && maxHeight < 32)
+ maxHeight = 32;
 
- switch( job->anamorphic.mode )
+ switch (ui_geo->mode)
 {
- case 1:
- /* Strict anamorphic */
- *output_width = MULTIPLE_MOD( cropped_width, 2 );
- *output_height = MULTIPLE_MOD( cropped_height, 2 );
- // adjust the source PAR for new width/height
- // new PAR = source PAR * ( old width / new_width ) * ( new_height / old_height )
- pixel_aspect_width = (int64_t)title->pixel_aspect_width * cropped_width * (*output_height); 
- pixel_aspect_height = (int64_t)title->pixel_aspect_height * (*output_width) * cropped_height;
- break;
-
- case 2:
+ case HB_ANAMORPHIC_NONE:
+ {
+ double par, cropped_sar, dar;
+ par = (double)src_geo->par.num / src_geo->par.den;
+ cropped_sar = (double)cropped_width / cropped_height;
+ dar = par * cropped_sar;
+
+ /* "None" anamorphic. a.k.a. non-anamorphic
+ * - Uses mod-compliant dimensions, set by user
+ * - Allows users to set the either width *or* height
+ */
+ if (keep_display_aspect)
+ {
+ if (!keep_height)
+ {
+ width = MULTIPLE_MOD_UP(ui_geo->width, mod);
+ height = MULTIPLE_MOD(width / dar, mod);
+ }
+ else
+ {
+ height = MULTIPLE_MOD_UP(ui_geo->height, mod);
+ width = MULTIPLE_MOD(height * dar, mod);
+ }
+ }
+ else
+ {
+ width = MULTIPLE_MOD_UP(ui_geo->width, mod);
+ height = MULTIPLE_MOD_UP(ui_geo->height, mod);
+ }
+ if (maxWidth && (width > maxWidth))
+ {
+ width = maxWidth;
+ height = MULTIPLE_MOD(width / dar, mod);
+ }
+ if (maxHeight && (height > maxHeight))
+ {
+ height = maxHeight;
+ width = MULTIPLE_MOD(height * dar, mod);
+ }
+ dst_par_num = dst_par_den = 1;
+ } break;
+
+ default:
+ case HB_ANAMORPHIC_STRICT:
+ {
+ /* "Strict" anamorphic.
+ * - Uses mod2-compliant dimensions,
+ * - Forces title - crop dimensions
+ */
+ width = MULTIPLE_MOD_UP(cropped_width, 2);
+ height = MULTIPLE_MOD_UP(cropped_height, 2);
+
+ /* Adjust the output PAR for new width/height
+ * Film AR is the source display width / cropped source height.
+ * Output display width is the output height * film AR.
+ * Output PAR is the output display width / output storage width.
+ *
+ * i.e.
+ * source_display_width = cropped_width * source PAR
+ * AR = source_display_width / cropped_height;
+ * output_display_width = height * AR;
+ * par = output_display_width / width;
+ *
+ * When these terms are reduced, you get the following...
+ */
+ dst_par_num = (int64_t)height * cropped_width * src_par.num;
+ dst_par_den = (int64_t)width * cropped_height * src_par.den;
+ } break;
+
+ case HB_ANAMORPHIC_LOOSE:
+ {
 /* "Loose" anamorphic.
- - Uses mod16-compliant dimensions,
- - Allows users to set the width
- */
- width = job->width;
- // height: Gets set later, ignore user job->height value
-
- /* Gotta handle bounding dimensions.
- If the width is too big, just reset it with no rescaling.
- Instead of using the aspect-scaled job height,
- we need to see if the job width divided by the storage aspect
- is bigger than the max. If so, set it to the max (this is sloppy).
- If not, set job height to job width divided by storage aspect.
- */
-
- /* Time to get picture width that divide cleanly.*/
- width = MULTIPLE_MOD( width, mod);
-
- if ( maxWidth && (maxWidth < job->width) )
- width = maxWidth;
+ * - Uses mod-compliant dimensions, set by user
+ * - Allows users to set the either width *or* height
+ */
+ if (!keep_height)
+ {
+ width = MULTIPLE_MOD_UP(ui_geo->width, mod);
+ height = MULTIPLE_MOD_UP(width / storage_aspect + 0.5, mod);
+ }
+ else
+ {
+ height = MULTIPLE_MOD_UP(ui_geo->height, mod);
+ width = MULTIPLE_MOD_UP(height * storage_aspect + 0.5, mod);
+ }
 
- /* Verify these new dimensions don't violate max height and width settings */
- height = ((double)width / storage_aspect) + 0.5;
+ if (maxWidth && (maxWidth < width))
+ {
+ width = maxWidth;
+ height = MULTIPLE_MOD(width / storage_aspect + 0.5, mod);
+ }
 
- /* Time to get picture height that divide cleanly.*/
- height = MULTIPLE_MOD( height, mod);
- 
- if ( maxHeight && (maxHeight < height) )
+ if (maxHeight && (maxHeight < height))
 {
 height = maxHeight;
- width = ((double)height * storage_aspect) + 0.5;
- width = MULTIPLE_MOD( width, mod);
+ width = MULTIPLE_MOD(height * storage_aspect + 0.5, mod);
 }
 
- /* The film AR is the source's display width / cropped source height.
- The output display width is the output height * film AR.
- The output PAR is the output display width / output storage width. */
- pixel_aspect_width = (int64_t)height * cropped_width * pixel_aspect_width;
- pixel_aspect_height = (int64_t)width * cropped_height * pixel_aspect_height;
-
- /* Pass the results back to the caller */
- *output_width = width;
- *output_height = height;
- break;
- 
- case 3:
+ /* Adjust the output PAR for new width/height
+ See comment in HB_ANAMORPHIC_STRICT */
+ dst_par_num = (int64_t)height * cropped_width * src_par.num;
+ dst_par_den = (int64_t)width * cropped_height * src_par.den;
+ } break;
+
+ case HB_ANAMORPHIC_CUSTOM:
+ {
 /* Anamorphic 3: Power User Jamboree
 - Set everything based on specified values */
- 
+
 /* Use specified storage dimensions */
- storage_aspect = (double)job->width / (double)job->height;
- width = job->width;
- height = job->height;
- 
+ storage_aspect = (double)ui_geo->width / ui_geo->height;
+
 /* Time to get picture dimensions that divide cleanly.*/
- width = MULTIPLE_MOD( width, mod);
- height = MULTIPLE_MOD( height, mod);
- 
+ width = MULTIPLE_MOD_UP(ui_geo->width, mod);
+ height = MULTIPLE_MOD_UP(ui_geo->height, mod);
+
 /* Bind to max dimensions */
- if( maxWidth && width > maxWidth )
+ if (maxWidth && width > maxWidth)
 {
 width = maxWidth;
 // If we are keeping the display aspect, then we are going
@@ -1168,64 +1191,128 @@
 // But otherwise, PAR and DAR will change the least
 // if we stay as close as possible to the requested
 // storage aspect.
- if ( !job->anamorphic.keep_display_aspect )
+ if (!keep_display_aspect)
 {
- height = ((double)width / storage_aspect) + 0.5;
- height = MULTIPLE_MOD( height, mod);
+ height = width / storage_aspect + 0.5;
+ height = MULTIPLE_MOD(height, mod);
 }
 }
- if( maxHeight && height > maxHeight )
+ if (maxHeight && height > maxHeight)
 {
 height = maxHeight;
 // Ditto, see comment above
- if ( !job->anamorphic.keep_display_aspect )
+ if (!keep_display_aspect)
 {
- width = ((double)height * storage_aspect) + 0.5;
- width = MULTIPLE_MOD( width, mod);
+ width = height * storage_aspect + 0.5;
+ width = MULTIPLE_MOD(width, mod);
 }
 }
- 
- /* That finishes the storage dimensions. On to display. */ 
- if( job->anamorphic.dar_width && job->anamorphic.dar_height )
+
+ /* That finishes the storage dimensions. On to display. */
+ if (ui_geo->dar.num && ui_geo->dar.den)
 {
 /* We need to adjust the PAR to produce this aspect. */
- pixel_aspect_width = (int64_t)height * job->anamorphic.dar_width / job->anamorphic.dar_height;
- pixel_aspect_height = width;
+ dst_par_num = (int64_t)height * ui_geo->dar.num /
+ ui_geo->dar.den;
+ dst_par_den = width;
 }
 else
 {
- /* If we're doing ana 3 and not specifying a DAR, care needs to be taken.
- This indicates a PAR is potentially being set by the interface. But
- this is an output PAR, to correct a source, and it should not be assumed
- that it properly creates a display aspect ratio when applied to the source,
- which could easily be stored in a different resolution. */
- if( job->anamorphic.keep_display_aspect )
+ if (keep_display_aspect)
 {
- /* We can ignore the possibility of a PAR change */
- pixel_aspect_width = (int64_t)height * ( (double)source_display_width / (double)cropped_height );
- pixel_aspect_height = width;
+ /* We can ignore the possibility of a PAR change
+ * Adjust the output PAR for new width/height
+ * See comment in HB_ANAMORPHIC_STRICT
+ */
+ dst_par_num = (int64_t)height * cropped_width *
+ src_par.num;
+ dst_par_den = (int64_t)width * cropped_height *
+ src_par.den;
 }
 else
 {
- int output_display_width = width * (double)pixel_aspect_width /
- (double)pixel_aspect_height;
- pixel_aspect_width = output_display_width;
- pixel_aspect_height = width;
+ /* If the dimensions were changed by the modulus
+ * or by maxWidth/maxHeight, we also change the
+ * output PAR so that the DAR is unchanged.
+ *
+ * PAR is the requested output display width / storage width
+ * requested output display width is the original
+ * requested width * original requested PAR
+ */
+ dst_par_num = ui_geo->width * dst_par_num;
+ dst_par_den = width * dst_par_den;
 }
 }
- 
- /* Back to caller */
- *output_width = width;
- *output_height = height;
- break;
+ } break;
 }
- 
+
+ /* Pass the results back to the caller */
+ result->width = width;
+ result->height = height;
+
 /* While x264 is smart enough to reduce fractions on its own, libavcodec
 * needs some help with the math, so lose superfluous factors. */
- hb_limit_rational64( &pixel_aspect_width, &pixel_aspect_height,
- pixel_aspect_width, pixel_aspect_height, 65535 );
- hb_reduce( output_par_width, output_par_height,
- pixel_aspect_width, pixel_aspect_height );
+ hb_limit_rational64(&dst_par_num, &dst_par_den,
+ dst_par_num, dst_par_den, 65535);
+
+ /* If the user is directling updating PAR, don't override his values */
+ hb_reduce(&out_par.num, &out_par.den, dst_par_num, dst_par_den);
+ if (ui_geo->mode == HB_ANAMORPHIC_CUSTOM && !keep_display_aspect &&
+ out_par.num == in_par.num && out_par.den == in_par.den)
+ {
+ result->par.num = ui_geo->par.num;
+ result->par.den = ui_geo->par.den;
+ }
+ else
+ {
+ hb_reduce(&result->par.num, &result->par.den, dst_par_num, dst_par_den);
+ }
+}
+
+/**
+ * Calculates job width and height for anamorphic content,
+ *
+ * @param job Handle to hb_job_t
+ * @param output_width Pointer to returned storage width
+ * @param output_height Pointer to returned storage height
+ * @param output_par_width Pointer to returned pixel width
+ * @param output_par_height Pointer to returned pixel height
+ */
+void hb_set_anamorphic_size( hb_job_t * job,
+ int *output_width, int *output_height,
+ int *output_par_width, int *output_par_height )
+{
+ hb_geometry_t result;
+ hb_geometry_t src;
+ hb_ui_geometry_t ui_geo;
+
+ src.width = job->title->width;
+ src.height = job->title->height;
+ src.par.num = job->title->pixel_aspect_width;
+ src.par.den = job->title->pixel_aspect_height;
+
+ ui_geo.width = job->width;
+ ui_geo.height = job->height;
+ ui_geo.par.num = job->anamorphic.par_width;
+ ui_geo.par.den = job->anamorphic.par_height;
+
+ ui_geo.modulus = job->modulus;
+ memcpy(ui_geo.crop, job->crop, sizeof(int[4]));
+ ui_geo.maxWidth = job->maxWidth;
+ ui_geo.maxHeight = job->maxHeight;
+ ui_geo.mode = job->anamorphic.mode;
+ ui_geo.keep = 0;
+ if (job->anamorphic.keep_display_aspect)
+ ui_geo.keep = HB_KEEP_DISPLAY_ASPECT;
+ ui_geo.itu_par = job->anamorphic.itu_par;
+ ui_geo.dar.num = job->anamorphic.dar_width;
+ ui_geo.dar.den = job->anamorphic.dar_height;
+
+ hb_set_anamorphic_size2(&src, &ui_geo, &result);
+ *output_width = result.width;
+ *output_height = result.height;
+ *output_par_width = result.par.num;
+ *output_par_height = result.par.den;
 }
 
 /**
@@ -1274,119 +1361,12 @@
 */
 void hb_validate_size( hb_job_t * job )
 {
- if ( job->anamorphic.mode )
- {
- hb_set_anamorphic_size( job, &job->width, &job->height,
- &job->anamorphic.par_width, &job->anamorphic.par_height );
- }
- else
- {
- if ( job->maxHeight && ( job->height > job->maxHeight ) )
- {
- job->height = job->maxHeight;
- hb_fix_aspect( job, HB_KEEP_HEIGHT );
- hb_log( "Height out of bounds, scaling down to %i",
- job->maxHeight );
- hb_log( "New dimensions %i * %i", job->width, job->height );
- }
- if ( job->maxWidth && ( job->width > job->maxWidth ) )
- {
- job->width = job->maxWidth;
- hb_fix_aspect( job, HB_KEEP_WIDTH );
- hb_log( "Width out of bounds, scaling down to %i",
- job->maxWidth );
- hb_log( "New dimensions %i * %i", job->width, job->height );
- }
- }
-}
-
-/**
- * Calculates job width, height, and cropping parameters.
- * @param job Handle to hb_job_t.
- * @param aspect Desired aspect ratio. Value of -1 uses title aspect.
- * @param pixels Maximum desired pixel count.
- */
-void hb_set_size( hb_job_t * job, double aspect, int pixels )
-{
- hb_title_t * title = job->title;
-
- int croppedWidth = title->width - title->crop[2] - title->crop[3];
- int croppedHeight = title->height - title->crop[0] - title->crop[1];
- double croppedAspect = title->aspect * title->height * croppedWidth /
- croppedHeight / title->width;
- int addCrop;
- int i, w, h;
-
- if( aspect <= 0 )
- {
- /* Keep the best possible aspect ratio */
- aspect = croppedAspect;
- }
-
- /* Crop if necessary to obtain the desired ratio */
- memcpy( job->crop, title->crop, 4 * sizeof( int ) );
- if( aspect < croppedAspect )
- {
- /* Need to crop on the left and right */
- addCrop = croppedWidth - aspect * croppedHeight * title->width /
- title->aspect / title->height;
- if( addCrop & 3 )
- {
- addCrop = ( addCrop + 1 ) / 2;
- job->crop[2] += addCrop;
- job->crop[3] += addCrop;
- }
- else if( addCrop & 2 )
- {
- addCrop /= 2;
- job->crop[2] += addCrop - 1;
- job->crop[3] += addCrop + 1;
- }
- else
- {
- addCrop /= 2;
- job->crop[2] += addCrop;
- job->crop[3] += addCrop;
- }
- }
- else if( aspect > croppedAspect )
- {
- /* Need to crop on the top and bottom */
- addCrop = croppedHeight - croppedWidth * title->aspect *
- title->height / aspect / title->width;
- if( addCrop & 3 )
- {
- addCrop = ( addCrop + 1 ) / 2;
- job->crop[0] += addCrop;
- job->crop[1] += addCrop;
- }
- else if( addCrop & 2 )
- {
- addCrop /= 2;
- job->crop[0] += addCrop - 1;
- job->crop[1] += addCrop + 1;
- }
- else
- {
- addCrop /= 2;
- job->crop[0] += addCrop;
- job->crop[1] += addCrop;
- }
- }
-
- /* Compute a resolution from the number of pixels and aspect */
- for( i = 0;; i++ )
- {
- w = 16 * i;
- h = MULTIPLE_16( (int)( (double)w / aspect ) );
- if( w * h > pixels )
- {
- break;
- }
- }
- i--;
- job->width = 16 * i;
- job->height = MULTIPLE_16( (int)( (double)job->width / aspect ) );
+ int width, height, par_width, par_height;
+ hb_set_anamorphic_size(job, &width, &height, &par_width, &par_height);
+ job->width = width;
+ job->height = height;
+ job->anamorphic.par_width = par_width;
+ job->anamorphic.par_height = par_height;
 }
 
 /**
@@ -1487,18 +1467,18 @@
 job_copy->list_attachment = hb_attachment_list_copy( job->list_attachment );
 job_copy->metadata = hb_metadata_copy( job->metadata );
 
- if ( job->file )
- job_copy->file = strdup( job->file );
- if ( job->advanced_opts )
- job_copy->advanced_opts = strdup( job->advanced_opts );
- if ( job->x264_preset )
- job_copy->x264_preset = strdup( job->x264_preset );
- if ( job->x264_tune )
- job_copy->x264_tune = strdup( job->x264_tune );
- if ( job->h264_profile )
- job_copy->h264_profile = strdup( job->h264_profile );
- if ( job->h264_level )
- job_copy->h264_level = strdup( job->h264_level );
+ if (job->encoder_preset != NULL)
+ job_copy->encoder_preset = strdup(job->encoder_preset);
+ if (job->encoder_tune != NULL)
+ job_copy->encoder_tune = strdup(job->encoder_tune);
+ if (job->encoder_options != NULL)
+ job_copy->encoder_options = strdup(job->encoder_options);
+ if (job->encoder_profile != NULL)
+ job_copy->encoder_profile = strdup(job->encoder_profile);
+ if (job->encoder_level != NULL)
+ job_copy->encoder_level = strdup(job->encoder_level);
+ if (job->file != NULL)
+ job_copy->file = strdup(job->file);
 
 job_copy->h = h;
 job_copy->pause = h->pause_lock;
@@ -1558,6 +1538,7 @@
 h->paused = 0;
 
 h->work_die = 0;
+ h->work_error = HB_ERROR_NONE;
 h->work_thread = hb_work_init( h->jobs, &h->work_die, &h->work_error, &h->current_job );
 }
 
@@ -1694,6 +1675,67 @@
 *_h = NULL;
 }
 
+int hb_global_init()
+{
+ int result = 0;
+
+ result = hb_platform_init();
+ if (result < 0)
+ {
+ hb_error("Platform specific initialization failed!");
+ return -1;
+ }
+
+#ifdef USE_QSV
+ result = hb_qsv_info_init();
+ if (result < 0)
+ {
+ hb_error("hb_qsv_info_init failed!");
+ return -1;
+ }
+#endif
+
+ /* libavcodec */
+ hb_avcodec_init();
+
+ /* HB work objects */
+ hb_register(&hb_muxer);
+ hb_register(&hb_reader);
+ hb_register(&hb_sync_video);
+ hb_register(&hb_sync_audio);
+ hb_register(&hb_decavcodecv);
+ hb_register(&hb_decavcodeca);
+ hb_register(&hb_declpcm);
+ hb_register(&hb_deccc608);
+ hb_register(&hb_decpgssub);
+ hb_register(&hb_decsrtsub);
+ hb_register(&hb_decssasub);
+ hb_register(&hb_dectx3gsub);
+ hb_register(&hb_decutf8sub);
+ hb_register(&hb_decvobsub);
+ hb_register(&hb_encvobsub);
+ hb_register(&hb_encavcodec);
+ hb_register(&hb_encavcodeca);
+#ifdef __APPLE__
+ hb_register(&hb_encca_aac);
+ hb_register(&hb_encca_haac);
+#endif
+ hb_register(&hb_enclame);
+ hb_register(&hb_enctheora);
+ hb_register(&hb_encvorbis);
+ hb_register(&hb_encx264);
+#ifdef USE_X265
+ hb_register(&hb_encx265);
+#endif
+#ifdef USE_QSV
+ hb_register(&hb_encqsv);
+#endif
+ 
+ hb_common_global_init();
+
+ return result;
+}
+
 /**
 * Cleans up libhb at a process level. Call before the app closes. Removes preview directory.
 */

HandBrake-0.9.9.tar.bz2/libhb/hb.h -> HandBrake-0.10.0.tar.bz2/libhb/hb.h Changed

@@ -1,6 +1,6 @@
 /* hb.h
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -68,10 +68,15 @@
 // JJJ: title->job?
 int hb_save_preview( hb_handle_t * h, int title, int preview, 
 hb_buffer_t *buf );
-hb_buffer_t * hb_read_preview( hb_handle_t * h, int title_idx, int preview );
+hb_buffer_t * hb_read_preview( hb_handle_t * h, hb_title_t *title,
+ int preview );
 void hb_get_preview( hb_handle_t *, hb_job_t *, int,
 uint8_t * );
-void hb_set_size( hb_job_t *, double ratio, int pixels );
+hb_image_t * hb_get_preview2(hb_handle_t * h, int title_idx, int picture,
+ hb_ui_geometry_t *ui_geo, int deinterlace);
+void hb_set_anamorphic_size2(hb_geometry_t *src_geo,
+ hb_ui_geometry_t *ui_geo,
+ hb_geometry_t *result);
 void hb_set_anamorphic_size( hb_job_t *,
 int *output_width, int *output_height,
 int *output_par_width, int *output_par_height );
@@ -81,12 +86,13 @@
 
 /* Handling jobs */
 int hb_count( hb_handle_t * );
-hb_job_t * hb_job( hb_handle_t *, int );
+hb_job_t * hb_job( hb_handle_t *, int );
 void hb_add( hb_handle_t *, hb_job_t * );
 void hb_rem( hb_handle_t *, hb_job_t * );
 
-hb_job_t * hb_job_init_by_index( hb_handle_t *h, int title_index );
-hb_job_t * hb_job_init( hb_title_t * title );
+hb_title_t * hb_find_title_by_index( hb_handle_t *h, int title_index );
+hb_job_t * hb_job_init_by_index( hb_handle_t *h, int title_index );
+hb_job_t * hb_job_init( hb_title_t * title );
 void hb_job_reset( hb_job_t * job );
 void hb_job_close( hb_job_t ** job );
 
@@ -126,6 +132,9 @@
 Aborts all current jobs if any, frees memory. */
 void hb_close( hb_handle_t ** );
 
+/* hb_global_init()
+ Performs process initialization. */
+int hb_global_init();
 /* hb_global_close()
 Performs final cleanup for the process. */
 void hb_global_close();

HandBrake-0.9.9.tar.bz2/libhb/hb_dict.c -> HandBrake-0.10.0.tar.bz2/libhb/hb_dict.c Changed

HandBrake-0.9.9.tar.bz2/libhb/hb_dict.h -> HandBrake-0.10.0.tar.bz2/libhb/hb_dict.h Changed

HandBrake-0.9.9.tar.bz2/libhb/hbffmpeg.h -> HandBrake-0.10.0.tar.bz2/libhb/hbffmpeg.h Changed

HandBrake-0.9.9.tar.bz2/libhb/internal.h -> HandBrake-0.10.0.tar.bz2/libhb/internal.h Changed

@@ -1,6 +1,6 @@
 /* internal.h
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -8,6 +8,7 @@
 */
 
 #include "hbffmpeg.h"
+#include "extras/cl.h"
 
 /***********************************************************************
 * common.c
@@ -50,6 +51,41 @@
 * May have metadata associated with it via extra fields
 * that are conditionally used depending on the type of packet.
 */
+struct hb_buffer_settings_s
+{
+ enum { AUDIO_BUF, VIDEO_BUF, SUBTITLE_BUF, FRAME_BUF, OTHER_BUF } type;
+
+ int id; // ID of the track that the packet comes from
+ int64_t start; // start time of frame
+ double duration; // Actual duration, may be fractional ticks
+ int64_t stop; // stop time of frame
+ int64_t renderOffset; // DTS used by b-frame offsets in muxmp4
+ int64_t pcr;
+ uint8_t discontinuity;
+ int new_chap; // Video packets: if non-zero, is the index of the chapter whose boundary was crossed
+
+#define HB_FRAME_IDR 0x01
+#define HB_FRAME_I 0x02
+#define HB_FRAME_AUDIO 0x04
+#define HB_FRAME_SUBTITLE 0x08
+#define HB_FRAME_P 0x10
+#define HB_FRAME_B 0x20
+#define HB_FRAME_BREF 0x40
+#define HB_FRAME_KEY 0x0F
+#define HB_FRAME_REF 0xF0
+ uint8_t frametype;
+ uint16_t flags;
+};
+
+struct hb_image_format_s
+{
+ int x;
+ int y;
+ int width;
+ int height;
+ int fmt;
+};
+
 struct hb_buffer_s
 {
 int size; // size of this packet
@@ -70,41 +106,10 @@
 */
 int64_t sequence;
 
- struct settings
- {
- enum { AUDIO_BUF, VIDEO_BUF, SUBTITLE_BUF, FRAME_BUF, OTHER_BUF } type;
-
- int id; // ID of the track that the packet comes from
- int64_t start; // start time of frame
- double duration; // Actual duration, may be fractional ticks
- int64_t stop; // stop time of frame
- int64_t renderOffset; // DTS used by b-frame offsets in muxmp4
- int64_t pcr;
- uint8_t discontinuity;
- int new_chap; // Video packets: if non-zero, is the index of the chapter whose boundary was crossed
-
- #define HB_FRAME_IDR 0x01
- #define HB_FRAME_I 0x02
- #define HB_FRAME_AUDIO 0x04
- #define HB_FRAME_P 0x10
- #define HB_FRAME_B 0x20
- #define HB_FRAME_BREF 0x40
- #define HB_FRAME_KEY 0x0F
- #define HB_FRAME_REF 0xF0
- uint8_t frametype;
- uint16_t flags;
- } s;
-
- struct format
- {
- int x;
- int y;
- int width;
- int height;
- int fmt;
- } f;
+ hb_buffer_settings_t s;
+ hb_image_format_t f;
 
- struct plane
+ struct buffer_plane
 {
 uint8_t * data;
 int stride;
@@ -114,6 +119,24 @@
 int size;
 } plane[4]; // 3 Color components + alpha
 
+ struct qsv
+ {
+ void *qsv_atom;
+ void *filter_details;
+ } qsv_details;
+
+ /* OpenCL */
+ struct cl_data
+ {
+ cl_mem buffer;
+ cl_event last_event;
+ enum { HOST, DEVICE } buffer_location;
+ } cl;
+
+ // libav may attach AV_PKT_DATA_PALETTE side data to some AVPackets
+ // Store this data here when read and pass to decoder.
+ hb_buffer_t * palette;
+
 // PICTURESUB subtitle packets:
 
 // Video packets (after processing by the hb_sync_video work-object):
@@ -143,6 +166,7 @@
 int hb_buffer_copy( hb_buffer_t * dst, const hb_buffer_t * src );
 void hb_buffer_swap_copy( hb_buffer_t *src, hb_buffer_t *dst );
 void hb_buffer_move_subs( hb_buffer_t * dst, hb_buffer_t * src );
+hb_image_t * hb_buffer_to_image(hb_buffer_t *buf);
 
 hb_fifo_t * hb_fifo_init( int capacity, int thresh );
 int hb_fifo_size( hb_fifo_t * );
@@ -230,7 +254,7 @@
 hb_title_set_t * title_set, int preview_count, 
 int store_previews, uint64_t min_duration );
 hb_thread_t * hb_work_init( hb_list_t * jobs,
- volatile int * die, int * error, hb_job_t ** job );
+ volatile int * die, hb_error_code * error, hb_job_t ** job );
 void ReadLoop( void * _w );
 hb_work_object_t * hb_muxer_init( hb_job_t * );
 hb_work_object_t * hb_get_work( int );
@@ -263,11 +287,6 @@
 extern const hb_muxer_t hb_demux[];
 
 /***********************************************************************
- * decmetadata.c
- **********************************************************************/
-extern int decmetadata( hb_title_t *title );
-
-/***********************************************************************
 * batch.c
 **********************************************************************/
 typedef struct hb_batch_s hb_batch_t;
@@ -324,6 +343,7 @@
 int hb_stream_chapter( hb_stream_t * );
 
 hb_buffer_t * hb_ts_decode_pkt( hb_stream_t *stream, const uint8_t * pkt );
+void hb_stream_set_need_keyframe( hb_stream_t *stream, int need_keyframe );
 
 
 #define STR4_TO_UINT32(p) \
@@ -356,6 +376,12 @@
 
 struct
 {
+ uint8_t headers[HB_CONFIG_MAX_SIZE];
+ int headers_length;
+ } h265;
+
+ struct
+ {
 uint8_t headers[3][HB_CONFIG_MAX_SIZE];
 } theora;
 
@@ -370,30 +396,13 @@
 uint8_t headers[3][HB_CONFIG_MAX_SIZE];
 char *language;
 } vorbis;
-
- struct
- {
- 	/* ac3flags stores the flags from the AC3 source, as found in scan.c */
- 	int ac3flags;
- // next two items are used by the bsinfo routine to accumulate small
- // frames until we have enough to validate the crc.
- int len; // space currently used in 'buf'
- uint8_t buf[HB_CONFIG_MAX_SIZE-sizeof(int)];
- } a52;
-
- struct
- {
- 	/* dcaflags stores the flags from the DCA source, as found in scan.c */
- 	int dcaflags;
- } dca;
-
 };
 
 enum
 {
- WORK_SYNC_VIDEO = 1,
+ WORK_NONE = 0,
+ WORK_SYNC_VIDEO,
 WORK_SYNC_AUDIO,
- WORK_DECMPEG2,
 WORK_DECCC608,
 WORK_DECVOBSUB,
 WORK_DECSRTSUB,
@@ -403,13 +412,13 @@
 WORK_ENCVOBSUB,
 WORK_RENDER,
 WORK_ENCAVCODEC,
+ WORK_ENCQSV,
 WORK_ENCX264,
+ WORK_ENCX265,
 WORK_ENCTHEORA,
- WORK_DECA52,
 WORK_DECAVCODEC,
 WORK_DECAVCODECV,
 WORK_DECLPCM,
- WORK_ENCFAAC,
 WORK_ENCLAME,
 WORK_ENCVORBIS,
 WORK_ENC_CA_AAC,
@@ -424,12 +433,19 @@
 extern hb_filter_object_t hb_filter_deinterlace;
 extern hb_filter_object_t hb_filter_deblock;
 extern hb_filter_object_t hb_filter_denoise;
+extern hb_filter_object_t hb_filter_nlmeans;
 extern hb_filter_object_t hb_filter_decomb;
 extern hb_filter_object_t hb_filter_rotate;
 extern hb_filter_object_t hb_filter_crop_scale;
 extern hb_filter_object_t hb_filter_render_sub;
 extern hb_filter_object_t hb_filter_vfr;
 
+#ifdef USE_QSV
+extern hb_filter_object_t hb_filter_qsv;
+extern hb_filter_object_t hb_filter_qsv_pre;
+extern hb_filter_object_t hb_filter_qsv_post;
+#endif
+
 // Picture flags used by filters
 #ifndef PIC_FLAG_REPEAT_FIRST_FIELD
 #define PIC_FLAG_REPEAT_FIRST_FIELD 256
@@ -466,7 +482,11 @@
 hb_mux_object_t * hb_mux_##a##_init( hb_job_t * );
 
 DECLARE_MUX( mp4 );
-DECLARE_MUX( avi );
-DECLARE_MUX( ogm );
 DECLARE_MUX( mkv );
+DECLARE_MUX( avformat );
+
+void hb_muxmp4_process_subtitle_style( uint8_t *input,
+ uint8_t *output,
+ uint8_t *style, uint16_t *stylesize );
 
+void hb_deinterlace(hb_buffer_t *dst, hb_buffer_t *src);

HandBrake-0.9.9.tar.bz2/libhb/lang.c -> HandBrake-0.10.0.tar.bz2/libhb/lang.c Changed

HandBrake-0.9.9.tar.bz2/libhb/lang.h -> HandBrake-0.10.0.tar.bz2/libhb/lang.h Changed

HandBrake-0.9.9.tar.bz2/libhb/module.defs -> HandBrake-0.10.0.tar.bz2/libhb/module.defs Changed

@@ -1,6 +1,6 @@
-__deps__ := A52DEC BZIP2 FAAC FFMPEG FONTCONFIG FREETYPE LAME LIBASS LIBDCA \
- LIBDVDREAD LIBDVDNAV LIBICONV LIBMKV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBXML2 \
- MP4V2 MPEG2DEC PTHREADW32 X264 ZLIB LIBBLURAY FDKAAC
+__deps__ := A52DEC BZIP2 LIBVPX FFMPEG FONTCONFIG FREETYPE LAME LIBASS LIBDCA \
+ LIBDVDREAD LIBDVDNAV LIBICONV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBXML2 \
+ PTHREADW32 X264 X265 ZLIB LIBBLURAY FDKAAC LIBMFX LIBGNURX
 
 $(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__)))
 $(eval $(call import.GCC,LIBHB))
@@ -19,11 +19,12 @@
 $(foreach n,$(LIBHB.prerequisites),$($n.INSTALL.target) )
 
 LIBHB.h.in = $(wildcard $(LIBHB.src/)*.h)
+LIBHB.h.in += $(wildcard $(LIBHB.src/)extras/*.h)
 LIBHB.h.out = $(patsubst $(SRC/)%,$(BUILD/)%,$(LIBHB.h.in))
 
 ###############################################################################
 
-LIBHB.a = $(LIBHB.build/)$(call TARGET.archive,hb)
+LIBHB.a = $(LIBHB.build/)$(call TARGET.archive,handbrake)
 
 ###############################################################################
 
@@ -34,11 +35,12 @@
 
 ###############################################################################
 
-ifeq (1,$(FEATURE.ff.mpeg2))
-LIBHB.GCC.D += USE_FF_MPEG2
+ifeq (1,$(FEATURE.hwd))
+LIBHB.GCC.D += USE_HWD
 endif
-ifeq (1,$(FEATURE.fdk_aac))
-LIBHB.GCC.D += USE_FDK_AAC
+
+ifeq (1,$(FEATURE.libav_aac))
+LIBHB.GCC.D += USE_LIBAV_AAC
 endif
 LIBHB.GCC.D += __LIBHB__ USE_PTHREAD
 LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include
@@ -54,11 +56,19 @@
 LIBHB.GCC.D += SYS_MINGW PTW32_STATIC_LIB
 	LIBHB.GCC.args.extra.dylib++ += -Wl,--enable-auto-import -static
 else ifeq ($(BUILD.system),solaris)
- LIBHB.GCC.D += SYS_SunOS _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
+ LIBHB.GCC.D += SYS_SunOS _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64 _POSIX_C_SOURCE=200112L __EXTENSIONS__
 else
 LIBHB.platform.D = SYS_UNKNOWN
 endif
 
+ifeq (1,$(FEATURE.qsv)) 
+ LIBHB.GCC.D += USE_QSV HAVE_THREADS=1
+endif 
+
+ifeq (1,$(FEATURE.x265))
+ LIBHB.GCC.D += USE_X265
+endif 
+
 ## required for <libdvdread/*.h>
 ifneq (,$(filter $(BUILD.arch),ppc ppc64))
 	LIBHB.GCC.D += WORDS_BIGENDIAN
@@ -95,21 +105,35 @@
 LIBHB.lib = $(LIBHB.build/)hb.lib
 
 LIBHB.dll.libs = $(foreach n, \
- a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \
- fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
- ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
+ ass avcodec avformat avutil avresample dvdnav dvdread \
+ fontconfig freetype mp3lame \
+ ogg samplerate swscale vpx theora vorbis vorbisenc x264 xml2 bluray, \
 $(CONTRIB.build/)lib/lib$(n).a )
 
 ifeq (1,$(FEATURE.fdk_aac))
 LIBHB.dll.libs += $(CONTRIB.build/)lib/libfdk-aac.a
 endif
 
+ifeq (1,$(FEATURE.qsv))
+LIBHB.dll.libs += $(CONTRIB.build/)lib/libmfx.a
+endif
+
+ifeq (1,$(FEATURE.x265))
+LIBHB.dll.libs += $(CONTRIB.build/)lib/libx265.a
+endif
+
 ifneq ($(HAS.iconv),1)
 LIBHB.dll.libs += $(CONTRIB.build/)lib/libiconv.a
 else
 LIBHB.GCC.l += iconv
 endif
 
+ifneq ($(HAS.regex),1)
+LIBHB.dll.libs += $(CONTRIB.build/)lib/libregex.a
+else
+ LIBHB.GCC.l += regex
+endif
+
 ifeq (1,$(FRIBIDI.enabled))
 LIBHB.dll.libs += $(CONTRIB.build/)lib/libfribidi.a
 else

HandBrake-0.10.0.tar.bz2/libhb/muxavformat.c Added

@@ -0,0 +1,1331 @@
+/* muxavformat.c
+
+ Copyright (c) 2003-2014 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#include <ogg/ogg.h>
+#include "libavformat/avformat.h"
+#include "libavutil/avstring.h"
+#include "libavutil/intreadwrite.h"
+
+#include "hb.h"
+#include "lang.h"
+
+struct hb_mux_data_s
+{
+ enum
+ {
+ MUX_TYPE_VIDEO,
+ MUX_TYPE_AUDIO,
+ MUX_TYPE_SUBTITLE
+ } type;
+
+ AVStream *st;
+
+ int64_t duration;
+
+ hb_buffer_t * delay_buf;
+
+ int64_t prev_chapter_tc;
+ int16_t current_chapter;
+};
+
+struct hb_mux_object_s
+{
+ HB_MUX_COMMON;
+
+ hb_job_t * job;
+
+ AVFormatContext * oc;
+ AVRational time_base;
+
+ int ntracks;
+ hb_mux_data_t ** tracks;
+
+ int64_t delay;
+};
+
+enum
+{
+ META_TITLE,
+ META_ARTIST,
+ META_DIRECTOR,
+ META_COMPOSER,
+ META_RELEASE_DATE,
+ META_COMMENT,
+ META_ALBUM,
+ META_GENRE,
+ META_DESCRIPTION,
+ META_SYNOPSIS,
+ META_LAST
+};
+
+enum
+{
+ META_MUX_MP4,
+ META_MUX_MKV,
+ META_MUX_LAST
+};
+
+const char *metadata_keys[META_LAST][META_MUX_LAST] =
+{
+ {"title", "TITLE"},
+ {"artist", "ARTIST"},
+ {"album_artist", "DIRECTOR"},
+ {"composer", "COMPOSER"},
+ {"date", "DATE_RELEASED"},
+ {"comment", "SUMMARY"},
+ {"album", NULL},
+ {"genre", "GENRE"},
+ {"description", "DESCRIPTION"},
+ {"synopsis", "SYNOPSIS"}
+};
+
+static char* lookup_lang_code(int mux, char *iso639_2)
+{
+ iso639_lang_t *lang;
+ char *out = NULL;
+
+ switch (mux)
+ {
+ case HB_MUX_AV_MP4:
+ out = iso639_2;
+ break;
+ case HB_MUX_AV_MKV:
+ // MKV lang codes should be ISO-639-2B if it exists,
+ // else ISO-639-2
+ lang = lang_for_code2( iso639_2 );
+ out = lang->iso639_2b ? lang->iso639_2b : lang->iso639_2;
+ break;
+ default:
+ break;
+ }
+ return out;
+}
+
+/**********************************************************************
+ * avformatInit
+ **********************************************************************
+ * Allocates hb_mux_data_t structures, create file and write headers
+ *********************************************************************/
+static int avformatInit( hb_mux_object_t * m )
+{
+ hb_job_t * job = m->job;
+ hb_audio_t * audio;
+ hb_mux_data_t * track;
+ int meta_mux;
+ int max_tracks;
+ int ii, ret;
+
+ const char *muxer_name = NULL;
+
+ uint8_t default_track_flag = 1;
+ uint8_t need_fonts = 0;
+ char *lang;
+
+
+ m->delay = AV_NOPTS_VALUE;
+ max_tracks = 1 + hb_list_count( job->list_audio ) +
+ hb_list_count( job->list_subtitle );
+
+ m->tracks = calloc(max_tracks, sizeof(hb_mux_data_t*));
+
+ m->oc = avformat_alloc_context();
+ if (m->oc == NULL)
+ {
+ hb_error( "Could not initialize avformat context." );
+ goto error;
+ }
+
+ AVDictionary * av_opts = NULL;
+ switch (job->mux)
+ {
+ case HB_MUX_AV_MP4:
+ m->time_base.num = 1;
+ m->time_base.den = 90000;
+ if( job->ipod_atom )
+ muxer_name = "ipod";
+ else
+ muxer_name = "mp4";
+ meta_mux = META_MUX_MP4;
+
+ av_dict_set(&av_opts, "brand", "mp42", 0);
+ if (job->mp4_optimize)
+ av_dict_set(&av_opts, "movflags", "faststart+disable_chpl", 0);
+ else
+ av_dict_set(&av_opts, "movflags", "+disable_chpl", 0);
+ break;
+
+ case HB_MUX_AV_MKV:
+ // libavformat is essentially hard coded such that it only
+ // works with a timebase of 1/1000
+ m->time_base.num = 1;
+ m->time_base.den = 1000;
+ muxer_name = "matroska";
+ meta_mux = META_MUX_MKV;
+ break;
+
+ default:
+ {
+ hb_error("Invalid Mux %x", job->mux);
+ goto error;
+ }
+ }
+ m->oc->oformat = av_guess_format(muxer_name, NULL, NULL);
+ if(m->oc->oformat == NULL)
+ {
+ hb_error("Could not guess output format %s", muxer_name);
+ goto error;
+ }
+ av_strlcpy(m->oc->filename, job->file, sizeof(m->oc->filename));
+ ret = avio_open2(&m->oc->pb, job->file, AVIO_FLAG_WRITE,
+ &m->oc->interrupt_callback, NULL);
+ if( ret < 0 )
+ {
+ hb_error( "avio_open2 failed, errno %d", ret);
+ goto error;
+ }
+
+ /* Video track */
+ track = m->tracks[m->ntracks++] = calloc(1, sizeof( hb_mux_data_t ) );
+ job->mux_data = track;
+
+ track->type = MUX_TYPE_VIDEO;
+ track->st = avformat_new_stream(m->oc, NULL);
+ if (track->st == NULL)
+ {
+ hb_error("Could not initialize video stream");
+ goto error;
+ }
+ track->st->time_base = m->time_base;
+ avcodec_get_context_defaults3(track->st->codec, NULL);
+
+ track->st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ track->st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
+
+ uint8_t *priv_data = NULL;
+ int priv_size = 0;
+ switch (job->vcodec)
+ {
+ case HB_VCODEC_X264:
+ case HB_VCODEC_QSV_H264:
+ track->st->codec->codec_id = AV_CODEC_ID_H264;
+
+ /* Taken from x264 muxers.c */
+ priv_size = 5 + 1 + 2 + job->config.h264.sps_length + 1 + 2 +
+ job->config.h264.pps_length;
+ priv_data = av_malloc(priv_size);
+ if (priv_data == NULL)
+ {
+ hb_error("H.264 extradata: malloc failure");
+ goto error;
+ }
+
+ priv_data[0] = 1;
+ priv_data[1] = job->config.h264.sps[1]; /* AVCProfileIndication */
+ priv_data[2] = job->config.h264.sps[2]; /* profile_compat */
+ priv_data[3] = job->config.h264.sps[3]; /* AVCLevelIndication */
+ priv_data[4] = 0xff; // nalu size length is four bytes
+ priv_data[5] = 0xe1; // one sps
+
+ priv_data[6] = job->config.h264.sps_length >> 8;
+ priv_data[7] = job->config.h264.sps_length;
+
+ memcpy(priv_data+8, job->config.h264.sps,
+ job->config.h264.sps_length);
+
+ priv_data[8+job->config.h264.sps_length] = 1; // one pps
+ priv_data[9+job->config.h264.sps_length] =
+ job->config.h264.pps_length >> 8;
+ priv_data[10+job->config.h264.sps_length] =
+ job->config.h264.pps_length;
+
+ memcpy(priv_data+11+job->config.h264.sps_length,
+ job->config.h264.pps, job->config.h264.pps_length );
+ break;
+
+ case HB_VCODEC_FFMPEG_MPEG4:
+ track->st->codec->codec_id = AV_CODEC_ID_MPEG4;
+
+ if (job->config.mpeg4.length != 0)
+ {
+ priv_size = job->config.mpeg4.length;
+ priv_data = av_malloc(priv_size);
+ if (priv_data == NULL)
+ {
+ hb_error("MPEG4 extradata: malloc failure");
+ goto error;
+ }
+ memcpy(priv_data, job->config.mpeg4.bytes, priv_size);
+ }
+ break;
+
+ case HB_VCODEC_FFMPEG_MPEG2:
+ track->st->codec->codec_id = AV_CODEC_ID_MPEG2VIDEO;
+
+ if (job->config.mpeg4.length != 0)
+ {
+ priv_size = job->config.mpeg4.length;
+ priv_data = av_malloc(priv_size);
+ if (priv_data == NULL)
+ {
+ hb_error("MPEG2 extradata: malloc failure");
+ goto error;
+ }
+ memcpy(priv_data, job->config.mpeg4.bytes, priv_size);
+ }
+ break;
+
+ case HB_VCODEC_FFMPEG_VP8:
+ track->st->codec->codec_id = AV_CODEC_ID_VP8;
+ priv_data = NULL;
+ priv_size = 0;
+ break;
+
+ case HB_VCODEC_THEORA:
+ {
+ track->st->codec->codec_id = AV_CODEC_ID_THEORA;
+
+ int size = 0;
+ ogg_packet *ogg_headers[3];
+
+ for (ii = 0; ii < 3; ii++)
+ {
+ ogg_headers[ii] = (ogg_packet *)job->config.theora.headers[ii];
+ size += ogg_headers[ii]->bytes + 2;
+ }
+
+ priv_size = size;
+ priv_data = av_malloc(priv_size);
+ if (priv_data == NULL)
+ {
+ hb_error("Theora extradata: malloc failure");
+ goto error;
+ }
+
+ size = 0;
+ for(ii = 0; ii < 3; ii++)
+ {
+ AV_WB16(priv_data + size, ogg_headers[ii]->bytes);
+ size += 2;
+ memcpy(priv_data+size, ogg_headers[ii]->packet,
+ ogg_headers[ii]->bytes);
+ size += ogg_headers[ii]->bytes;
+ }
+ } break;
+
+ case HB_VCODEC_X265:
+ track->st->codec->codec_id = AV_CODEC_ID_HEVC;
+
+ if (job->config.h265.headers_length > 0)
+ {
+ priv_size = job->config.h265.headers_length;
+ priv_data = av_malloc(priv_size);
+ if (priv_data == NULL)
+ {
+ hb_error("H.265 extradata: malloc failure");
+ goto error;
+ }
+ memcpy(priv_data, job->config.h265.headers, priv_size);
+ }
+ break;
+
+ default:
+ hb_error("muxavformat: Unknown video codec: %x", job->vcodec);
+ goto error;
+ }
+ track->st->codec->extradata = priv_data;
+ track->st->codec->extradata_size = priv_size;
+
+ if (job->anamorphic.mode > 0)
+ {
+ track->st->sample_aspect_ratio.num = job->anamorphic.par_width;
+ track->st->sample_aspect_ratio.den = job->anamorphic.par_height;
+ track->st->codec->sample_aspect_ratio.num = job->anamorphic.par_width;
+ track->st->codec->sample_aspect_ratio.den = job->anamorphic.par_height;
+ }
+ else
+ {
+ track->st->sample_aspect_ratio.num = 1;
+ track->st->sample_aspect_ratio.den = 1;
+ track->st->codec->sample_aspect_ratio.num = 1;
+ track->st->codec->sample_aspect_ratio.den = 1;
+ }
+ track->st->codec->width = job->width;
+ track->st->codec->height = job->height;
+ track->st->disposition |= AV_DISPOSITION_DEFAULT;
+
+ int vrate_base, vrate;
+ if( job->pass == 2 )
+ {
+ hb_interjob_t * interjob = hb_interjob_get( job->h );
+ vrate_base = interjob->vrate_base;
+ vrate = interjob->vrate;
+ }
+ else
+ {
+ vrate_base = job->vrate_base;
+ vrate = job->vrate;
+ }
+
+ // If the vrate is 27000000, there's a good chance this is
+ // a standard rate that we have in our hb_video_rates table.
+ // Because of rounding errors and approximations made while
+ // measuring framerate, the actual value may not be exact. So
+ // we look for rates that are "close" and make an adjustment
+ // to fps.den.
+ if (vrate == 27000000)
+ {
+ const hb_rate_t *video_framerate = NULL;
+ while ((video_framerate = hb_video_framerate_get_next(video_framerate)) != NULL)
+ {
+ if (abs(vrate_base - video_framerate->rate) < 10)
+ {
+ vrate_base = video_framerate->rate;
+ break;
+ }
+ }
+ }
+ hb_reduce(&vrate_base, &vrate, vrate_base, vrate);
+ if (job->mux == HB_MUX_AV_MP4)
+ {
+ // libavformat mp4 muxer requires that the codec time_base have the
+ // same denominator as the stream time_base, it uses it for the
+ // mdhd timescale.
+ double scale = (double)track->st->time_base.den / vrate;
+ track->st->codec->time_base.den = track->st->time_base.den;
+ track->st->codec->time_base.num = vrate_base * scale;
+ }
+ else
+ {
+ track->st->codec->time_base.num = vrate_base;
+ track->st->codec->time_base.den = vrate;
+ }
+
+ /* add the audio tracks */
+ for(ii = 0; ii < hb_list_count( job->list_audio ); ii++ )
+ {
+ audio = hb_list_item( job->list_audio, ii );
+ track = m->tracks[m->ntracks++] = calloc(1, sizeof( hb_mux_data_t ) );
+ audio->priv.mux_data = track;
+
+ track->type = MUX_TYPE_AUDIO;
+
+ track->st = avformat_new_stream(m->oc, NULL);
+ if (track->st == NULL)
+ {
+ hb_error("Could not initialize audio stream");
+ goto error;
+ }
+ avcodec_get_context_defaults3(track->st->codec, NULL);
+
+ track->st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ track->st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ if (job->mux == HB_MUX_AV_MP4)
+ {
+ track->st->codec->time_base.num = audio->config.out.samples_per_frame;
+ track->st->codec->time_base.den = audio->config.out.samplerate;
+ track->st->time_base.num = 1;
+ track->st->time_base.den = audio->config.out.samplerate;
+ }
+ else
+ {
+ track->st->codec->time_base = m->time_base;
+ }
+
+ priv_data = NULL;
+ priv_size = 0;
+ switch (audio->config.out.codec & HB_ACODEC_MASK)
+ {
+ case HB_ACODEC_DCA:
+ case HB_ACODEC_DCA_HD:
+ track->st->codec->codec_id = AV_CODEC_ID_DTS;
+ break;
+ case HB_ACODEC_AC3:
+ track->st->codec->codec_id = AV_CODEC_ID_AC3;
+ break;
+ case HB_ACODEC_LAME:
+ case HB_ACODEC_MP3:
+ track->st->codec->codec_id = AV_CODEC_ID_MP3;
+ break;
+ case HB_ACODEC_VORBIS:
+ {
+ track->st->codec->codec_id = AV_CODEC_ID_VORBIS;
+
+ int jj, size = 0;
+ ogg_packet *ogg_headers[3];
+
+ for (jj = 0; jj < 3; jj++)
+ {
+ ogg_headers[jj] = (ogg_packet *)audio->priv.config.vorbis.headers[jj];
+ size += ogg_headers[jj]->bytes + 2;
+ }
+
+ priv_size = size;
+ priv_data = av_malloc(priv_size);
+ if (priv_data == NULL)
+ {
+ hb_error("Vorbis extradata: malloc failure");
+ goto error;
+ }
+
+ size = 0;
+ for(jj = 0; jj < 3; jj++)
+ {
+ AV_WB16(priv_data + size, ogg_headers[jj]->bytes);
+ size += 2;
+ memcpy(priv_data+size, ogg_headers[jj]->packet,
+ ogg_headers[jj]->bytes);
+ size += ogg_headers[jj]->bytes;
+ }
+ } break;
+ case HB_ACODEC_FFFLAC:
+ case HB_ACODEC_FFFLAC24:
+ track->st->codec->codec_id = AV_CODEC_ID_FLAC;
+
+ if (audio->priv.config.extradata.length)
+ {
+ priv_size = audio->priv.config.extradata.length;
+ priv_data = av_malloc(priv_size);
+ if (priv_data == NULL)
+ {
+ hb_error("FLAC extradata: malloc failure");
+ goto error;
+ }
+ memcpy(priv_data,
+ audio->priv.config.extradata.bytes,
+ audio->priv.config.extradata.length);
+ }
+ break;
+ case HB_ACODEC_FFAAC:
+ case HB_ACODEC_CA_AAC:
+ case HB_ACODEC_CA_HAAC:
+ case HB_ACODEC_FDK_AAC:
+ case HB_ACODEC_FDK_HAAC:
+ track->st->codec->codec_id = AV_CODEC_ID_AAC;
+
+ // TODO: fix AAC in TS parsing. We need to fill
+ // extradata with AAC config. Some players will play
+ // an AAC stream that is missing extradata and some
+ // will not.
+ //
+ // libav mkv muxer expects there to be extradata for
+ // AAC and will crash if it is NULL. So allocate extra
+ // byte so that av_malloc does not return NULL when length
+ // is 0.
+ priv_size = audio->priv.config.extradata.length;
+ priv_data = av_malloc(priv_size + 1);
+ if (priv_data == NULL)
+ {
+ hb_error("AAC extradata: malloc failure");
+ goto error;
+ }
+ memcpy(priv_data,
+ audio->priv.config.extradata.bytes,
+ audio->priv.config.extradata.length);
+ break;
+ default:
+ hb_error("muxavformat: Unknown audio codec: %x",
+ audio->config.out.codec);
+ goto error;
+ }
+ track->st->codec->extradata = priv_data;
+ track->st->codec->extradata_size = priv_size;
+
+ if( default_track_flag )
+ {
+ track->st->disposition |= AV_DISPOSITION_DEFAULT;
+ default_track_flag = 0;
+ }
+
+ lang = lookup_lang_code(job->mux, audio->config.lang.iso639_2 );
+ if (lang != NULL)
+ {
+ av_dict_set(&track->st->metadata, "language", lang, 0);
+ }
+ track->st->codec->sample_rate = audio->config.out.samplerate;
+ if (audio->config.out.codec & HB_ACODEC_PASS_FLAG)
+ {
+ track->st->codec->channels = av_get_channel_layout_nb_channels(audio->config.in.channel_layout);
+ track->st->codec->channel_layout = audio->config.in.channel_layout;
+ }
+ else
+ {
+ track->st->codec->channels = hb_mixdown_get_discrete_channel_count(audio->config.out.mixdown);
+ track->st->codec->channel_layout = hb_ff_mixdown_xlat(audio->config.out.mixdown, NULL);
+ }
+
+ char *name;
+ if (audio->config.out.name == NULL)
+ {
+ switch (track->st->codec->channels)
+ {
+ case 1:
+ name = "Mono";
+ break;
+
+ case 2:
+ name = "Stereo";
+ break;
+
+ default:
+ name = "Surround";
+ break;
+ }
+ }
+ else
+ {
+ name = audio->config.out.name;
+ }
+ // Set audio track title
+ av_dict_set(&track->st->metadata, "title", name, 0);
+ if (job->mux == HB_MUX_AV_MP4)
+ {
+ // Some software (MPC, mediainfo) use hdlr description
+ // for track title
+ av_dict_set(&track->st->metadata, "handler", name, 0);
+ }
+ }
+
+ char * subidx_fmt =
+ "size: %dx%d\n"
+ "org: %d, %d\n"
+ "scale: 100%%, 100%%\n"
+ "alpha: 100%%\n"
+ "smooth: OFF\n"
+ "fadein/out: 50, 50\n"
+ "align: OFF at LEFT TOP\n"
+ "time offset: 0\n"
+ "forced subs: %s\n"
+ "palette: %06x, %06x, %06x, %06x, %06x, %06x, "
+ "%06x, %06x, %06x, %06x, %06x, %06x, %06x, %06x, %06x, %06x\n"
+ "custom colors: OFF, tridx: 0000, "
+ "colors: 000000, 000000, 000000, 000000\n";
+
+ int subtitle_default = -1;
+ for( ii = 0; ii < hb_list_count( job->list_subtitle ); ii++ )
+ {
+ hb_subtitle_t *subtitle = hb_list_item( job->list_subtitle, ii );
+
+ if( subtitle->config.dest == PASSTHRUSUB )
+ {
+ if ( subtitle->config.default_track )
+ subtitle_default = ii;
+ }
+ }
+ // Quicktime requires that at least one subtitle is enabled,
+ // else it doesn't show any of the subtitles.
+ // So check to see if any of the subtitles are flagged to be
+ // the defualt. The default will the the enabled track, else
+ // enable the first track.
+ if (job->mux == HB_MUX_AV_MP4 && subtitle_default == -1)
+ {
+ subtitle_default = 0;
+ }
+
+ for( ii = 0; ii < hb_list_count( job->list_subtitle ); ii++ )
+ {
+ hb_subtitle_t * subtitle;
+ uint32_t rgb[16];
+ char subidx[2048];
+ int len;
+
+ subtitle = hb_list_item( job->list_subtitle, ii );
+ if (subtitle->config.dest != PASSTHRUSUB)
+ continue;
+
+ track = m->tracks[m->ntracks++] = calloc(1, sizeof( hb_mux_data_t ) );
+ subtitle->mux_data = track;
+
+ track->type = MUX_TYPE_SUBTITLE;
+ track->st = avformat_new_stream(m->oc, NULL);
+ if (track->st == NULL)
+ {
+ hb_error("Could not initialize subtitle stream");
+ goto error;
+ }
+ avcodec_get_context_defaults3(track->st->codec, NULL);
+
+ track->st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
+ track->st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ track->st->time_base = m->time_base;
+ track->st->codec->time_base = m->time_base;
+ track->st->codec->width = subtitle->width;
+ track->st->codec->height = subtitle->height;
+
+ priv_data = NULL;
+ priv_size = 0;
+ switch (subtitle->source)
+ {
+ case VOBSUB:
+ {
+ int jj;
+ track->st->codec->codec_id = AV_CODEC_ID_DVD_SUBTITLE;
+
+ for (jj = 0; jj < 16; jj++)
+ rgb[jj] = hb_yuv2rgb(subtitle->palette[jj]);
+ len = snprintf(subidx, 2048, subidx_fmt,
+ subtitle->width, subtitle->height,
+ 0, 0, "OFF",
+ rgb[0], rgb[1], rgb[2], rgb[3],
+ rgb[4], rgb[5], rgb[6], rgb[7],
+ rgb[8], rgb[9], rgb[10], rgb[11],
+ rgb[12], rgb[13], rgb[14], rgb[15]);
+
+ priv_size = len + 1;
+ priv_data = av_malloc(priv_size);
+ if (priv_data == NULL)
+ {
+ hb_error("VOBSUB extradata: malloc failure");
+ goto error;
+ }
+ memcpy(priv_data, subidx, priv_size);
+ } break;
+
+ case PGSSUB:
+ {
+ track->st->codec->codec_id = AV_CODEC_ID_HDMV_PGS_SUBTITLE;
+ } break;
+
+ case CC608SUB:
+ case CC708SUB:
+ case TX3GSUB:
+ case SRTSUB:
+ case UTF8SUB:
+ case SSASUB:
+ {
+ if (job->mux == HB_MUX_AV_MP4)
+ {
+ track->st->codec->codec_id = AV_CODEC_ID_MOV_TEXT;
+ }
+ else
+ {
+ track->st->codec->codec_id = AV_CODEC_ID_SSA;
+ need_fonts = 1;
+
+ if (subtitle->extradata_size)
+ {
+ priv_size = subtitle->extradata_size;
+ priv_data = av_malloc(priv_size);
+ if (priv_data == NULL)
+ {
+ hb_error("SSA extradata: malloc failure");
+ goto error;
+ }
+ memcpy(priv_data, subtitle->extradata, priv_size);
+ }
+ }
+ } break;
+
+ default:
+ continue;
+ }
+ if (track->st->codec->codec_id == AV_CODEC_ID_MOV_TEXT)
+ {
+ // Build codec extradata for tx3g.
+ // If we were using a libav codec to generate this data
+ // this would (or should) be done for us.
+ uint8_t properties[] = {
+ 0x00, 0x00, 0x00, 0x00, // Display Flags
+ 0x01, // Horiz. Justification
+ 0xff, // Vert. Justification
+ 0x00, 0x00, 0x00, 0xff, // Bg color
+ 0x00, 0x00, 0x00, 0x00, // Default text box
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, // Reserved
+ 0x00, 0x01, // Font ID
+ 0x00, // Font face
+ 0x18, // Font size
+ 0xff, 0xff, 0xff, 0xff, // Fg color
+ // Font table:
+ 0x00, 0x00, 0x00, 0x12, // Font table size
+ 'f','t','a','b', // Tag
+ 0x00, 0x01, // Count
+ 0x00, 0x01, // Font ID
+ 0x05, // Font name length
+ 'A','r','i','a','l' // Font name
+ };
+
+ int width, height = 60;
+ if (job->anamorphic.mode)
+ width = job->width * ((float)job->anamorphic.par_width / job->anamorphic.par_height);
+ else
+ width = job->width;
+ track->st->codec->width = width;
+ track->st->codec->height = height;
+ properties[14] = height >> 8;
+ properties[15] = height & 0xff;
+ properties[16] = width >> 8;
+ properties[17] = width & 0xff;
+
+ priv_size = sizeof(properties);
+ priv_data = av_malloc(priv_size);
+ if (priv_data == NULL)
+ {
+ hb_error("TX3G extradata: malloc failure");
+ goto error;
+ }
+ memcpy(priv_data, properties, priv_size);
+ }
+ track->st->codec->extradata = priv_data;
+ track->st->codec->extradata_size = priv_size;
+
+ if ( ii == subtitle_default )
+ {
+ track->st->disposition |= AV_DISPOSITION_DEFAULT;
+ }
+
+ lang = lookup_lang_code(job->mux, subtitle->iso639_2 );
+ if (lang != NULL)
+ {
+ av_dict_set(&track->st->metadata, "language", lang, 0);
+ }
+ }
+
+ if (need_fonts)
+ {
+ hb_list_t * list_attachment = job->list_attachment;
+ int i;
+ for ( i = 0; i < hb_list_count(list_attachment); i++ )
+ {
+ hb_attachment_t * attachment = hb_list_item( list_attachment, i );
+
+ if (attachment->type == FONT_TTF_ATTACH &&
+ attachment->size > 0)
+ {
+ AVStream *st = avformat_new_stream(m->oc, NULL);
+ if (st == NULL)
+ {
+ hb_error("Could not initialize attachment stream");
+ goto error;
+ }
+ avcodec_get_context_defaults3(st->codec, NULL);
+
+ st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT;
+ st->codec->codec_id = AV_CODEC_ID_TTF;
+
+ priv_size = attachment->size;
+ priv_data = av_malloc(priv_size);
+ if (priv_data == NULL)
+ {
+ hb_error("Font extradata: malloc failure");
+ goto error;
+ }
+ memcpy(priv_data, attachment->data, priv_size);
+
+ st->codec->extradata = priv_data;
+ st->codec->extradata_size = priv_size;
+
+ av_dict_set(&st->metadata, "filename", attachment->name, 0);
+ }
+ }
+ }
+
+ if( job->metadata )
+ {
+ hb_metadata_t *md = job->metadata;
+
+ hb_deep_log(2, "Writing Metadata to output file...");
+ if (md->name &&
+ metadata_keys[META_TITLE][meta_mux] != NULL)
+ {
+ av_dict_set(&m->oc->metadata,
+ metadata_keys[META_TITLE][meta_mux], md->name, 0);
+ }
+ if (md->artist &&
+ metadata_keys[META_ARTIST][meta_mux] != NULL)
+ {
+ av_dict_set(&m->oc->metadata,
+ metadata_keys[META_ARTIST][meta_mux], md->artist, 0);
+ }
+ if (md->album_artist &&
+ metadata_keys[META_DIRECTOR][meta_mux] != NULL)
+ {
+ av_dict_set(&m->oc->metadata,
+ metadata_keys[META_DIRECTOR][meta_mux],
+ md->album_artist, 0);
+ }
+ if (md->composer &&
+ metadata_keys[META_COMPOSER][meta_mux] != NULL)
+ {
+ av_dict_set(&m->oc->metadata,
+ metadata_keys[META_COMPOSER][meta_mux],
+ md->composer, 0);
+ }
+ if (md->release_date &&
+ metadata_keys[META_RELEASE_DATE][meta_mux] != NULL)
+ {
+ av_dict_set(&m->oc->metadata,
+ metadata_keys[META_RELEASE_DATE][meta_mux],
+ md->release_date, 0);
+ }
+ if (md->comment &&
+ metadata_keys[META_COMMENT][meta_mux] != NULL)
+ {
+ av_dict_set(&m->oc->metadata,
+ metadata_keys[META_COMMENT][meta_mux], md->comment, 0);
+ }
+ if (!md->name && md->album &&
+ metadata_keys[META_ALBUM][meta_mux] != NULL)
+ {
+ av_dict_set(&m->oc->metadata,
+ metadata_keys[META_ALBUM][meta_mux], md->album, 0);
+ }
+ if (md->genre &&
+ metadata_keys[META_GENRE][meta_mux] != NULL)
+ {
+ av_dict_set(&m->oc->metadata,
+ metadata_keys[META_GENRE][meta_mux], md->genre, 0);
+ }
+ if (md->description &&
+ metadata_keys[META_DESCRIPTION][meta_mux] != NULL)
+ {
+ av_dict_set(&m->oc->metadata,
+ metadata_keys[META_DESCRIPTION][meta_mux],
+ md->description, 0);
+ }
+ if (md->long_description &&
+ metadata_keys[META_SYNOPSIS][meta_mux] != NULL)
+ {
+ av_dict_set(&m->oc->metadata,
+ metadata_keys[META_SYNOPSIS][meta_mux],
+ md->long_description, 0);
+ }
+ }
+
+ char tool_string[80];
+ snprintf(tool_string, sizeof(tool_string), "HandBrake %s %i",
+ HB_PROJECT_VERSION, HB_PROJECT_BUILD);
+ av_dict_set(&m->oc->metadata, "encoding_tool", tool_string, 0);
+
+ ret = avformat_write_header(m->oc, &av_opts);
+ if( ret < 0 )
+ {
+ av_dict_free( &av_opts );
+ hb_error( "muxavformat: avformat_write_header failed!");
+ goto error;
+ }
+
+ AVDictionaryEntry *t = NULL;
+ while( ( t = av_dict_get( av_opts, "", t, AV_DICT_IGNORE_SUFFIX ) ) )
+ {
+ hb_log( "muxavformat: Unknown option %s", t->key );
+ }
+ av_dict_free( &av_opts );
+
+ return 0;
+
+error:
+ free(job->mux_data);
+ job->mux_data = NULL;
+ avformat_free_context(m->oc);
+ *job->done_error = HB_ERROR_INIT;
+ *job->die = 1;
+ return -1;
+}
+
+static int add_chapter(hb_mux_object_t *m, int64_t start, int64_t end, char * title)
+{
+ AVChapter *chap;
+ AVChapter **chapters;
+ int nchap = m->oc->nb_chapters;
+
+ nchap++;
+ chapters = av_realloc(m->oc->chapters, nchap * sizeof(AVChapter*));
+ if (chapters == NULL)
+ {
+ hb_error("chapter array: malloc failure");
+ return -1;
+ }
+
+ chap = av_mallocz(sizeof(AVChapter));
+ if (chap == NULL)
+ {
+ hb_error("chapter: malloc failure");
+ return -1;
+ }
+
+ m->oc->chapters = chapters;
+ m->oc->chapters[nchap-1] = chap;
+ m->oc->nb_chapters = nchap;
+
+ chap->id = nchap;
+ chap->time_base = m->time_base;
+ chap->start = start;
+ chap->end = end;
+ av_dict_set(&chap->metadata, "title", title, 0);
+
+ return 0;
+}
+
+// Video with b-frames and certain audio types require a lead-in delay.
+// Compute the max delay and offset all timestamps by this amount.
+//
+// For mp4, avformat will automatically put entries in the edts atom
+// to account for the offset of the first dts in each track.
+static void computeDelay(hb_mux_object_t *m)
+{
+ int ii;
+ hb_audio_t * audio;
+
+ m->delay = m->job->config.h264.init_delay;
+ for(ii = 0; ii < hb_list_count( m->job->list_audio ); ii++ )
+ {
+ audio = hb_list_item( m->job->list_audio, ii );
+ if (audio->config.out.delay > m->delay)
+ m->delay = audio->config.out.delay;
+ }
+}
+
+static int avformatMux(hb_mux_object_t *m, hb_mux_data_t *track, hb_buffer_t *buf)
+{
+ AVPacket pkt;
+ int64_t dts, pts, duration = AV_NOPTS_VALUE;
+ hb_job_t *job = m->job;
+ uint8_t sub_out[2048];
+
+ if (m->delay == AV_NOPTS_VALUE)
+ {
+ computeDelay(m);
+ }
+
+ if (buf != NULL)
+ {
+ if (buf->s.start != AV_NOPTS_VALUE)
+ buf->s.start += m->delay;
+ if (buf->s.renderOffset != AV_NOPTS_VALUE)
+ buf->s.renderOffset += m->delay;
+ }
+
+ // We only compute dts duration for MP4 files
+ if (track->type == MUX_TYPE_VIDEO && (job->mux & HB_MUX_MASK_MP4))
+ {
+ hb_buffer_t * tmp;
+
+ // delay by one frame so that we can compute duration properly.
+ tmp = track->delay_buf;
+ track->delay_buf = buf;
+ buf = tmp;
+ }
+ if (buf == NULL)
+ return 0;
+
+ if (buf->s.renderOffset == AV_NOPTS_VALUE)
+ {
+ dts = av_rescale_q(buf->s.start, (AVRational){1,90000},
+ track->st->time_base);
+ }
+ else
+ {
+ dts = av_rescale_q(buf->s.renderOffset, (AVRational){1,90000},
+ track->st->time_base);
+ }
+
+ pts = av_rescale_q(buf->s.start, (AVRational){1,90000},
+ track->st->time_base);
+
+ if (track->type == MUX_TYPE_VIDEO && track->delay_buf != NULL)
+ {
+ int64_t delayed_dts;
+ delayed_dts = av_rescale_q(track->delay_buf->s.renderOffset,
+ (AVRational){1,90000},
+ track->st->time_base);
+ duration = delayed_dts - dts;
+ }
+ if (duration < 0 && buf->s.duration > 0)
+ {
+ duration = av_rescale_q(buf->s.duration, (AVRational){1,90000},
+ track->st->time_base);
+ }
+ if (duration < 0)
+ {
+ // There is a possiblility that some subtitles get through the pipeline
+ // without ever discovering their true duration. Make the duration
+ // 10 seconds in this case. Unless they are PGS subs which should
+ // have zero duration.
+ if (track->type == MUX_TYPE_SUBTITLE &&
+ track->st->codec->codec_id != AV_CODEC_ID_HDMV_PGS_SUBTITLE)
+ duration = av_rescale_q(10, (AVRational){1,1},
+ track->st->time_base);
+ else
+ duration = 0;
+ }
+
+ av_init_packet(&pkt);
+ pkt.data = buf->data;
+ pkt.size = buf->size;
+ pkt.dts = dts;
+ pkt.pts = pts;
+ pkt.duration = duration;
+
+ if (track->type == MUX_TYPE_VIDEO && ((job->vcodec & HB_VCODEC_H264_MASK) ||
+ (job->vcodec & HB_VCODEC_FFMPEG_MASK)))
+ {
+ if (buf->s.frametype == HB_FRAME_IDR)
+ pkt.flags |= AV_PKT_FLAG_KEY;
+ }
+ else if (buf->s.frametype & HB_FRAME_KEY)
+ {
+ pkt.flags |= AV_PKT_FLAG_KEY;
+ }
+
+ switch (track->type)
+ {
+ case MUX_TYPE_VIDEO:
+ {
+ if (job->chapter_markers && buf->s.new_chap)
+ {
+ hb_chapter_t *chapter;
+
+ // reached chapter N, write marker for chapter N-1
+ // we don't know the end time of chapter N-1 till we receive
+ // chapter N. So we are always writing the previous chapter
+ // mark.
+ track->current_chapter = buf->s.new_chap - 1;
+
+ // chapter numbers start at 1, but the list starts at 0
+ chapter = hb_list_item(job->list_chapter,
+ track->current_chapter - 1);
+
+ // make sure we're not writing a chapter that has 0 length
+ if (chapter != NULL && track->prev_chapter_tc < pkt.pts)
+ {
+ char title[1024];
+ if (chapter->title != NULL)
+ {
+ snprintf(title, 1023, "%s", chapter->title);
+ }
+ else
+ {
+ snprintf(title, 1023, "Chapter %d",
+ track->current_chapter);
+ }
+ add_chapter(m, track->prev_chapter_tc, pkt.pts, title);
+ }
+ track->prev_chapter_tc = pkt.pts;
+ }
+ } break;
+
+ case MUX_TYPE_SUBTITLE:
+ {
+ if (job->mux == HB_MUX_AV_MP4)
+ {
+ /* Write an empty sample */
+ if ( track->duration < pts )
+ {
+ AVPacket empty_pkt;
+ uint8_t empty[2] = {0,0};
+
+ av_init_packet(&empty_pkt);
+ empty_pkt.data = empty;
+ empty_pkt.size = 2;
+ empty_pkt.dts = track->duration;
+ empty_pkt.pts = track->duration;
+ empty_pkt.duration = pts - duration;
+ empty_pkt.convergence_duration = empty_pkt.duration;
+ empty_pkt.stream_index = track->st->index;
+ int ret = av_interleaved_write_frame(m->oc, &empty_pkt);
+ if (ret < 0)
+ {
+ char errstr[64];
+ av_strerror(ret, errstr, sizeof(errstr));
+ hb_error("avformatMux: track %d, av_interleaved_write_frame failed with error '%s' (empty_pkt)",
+ track->st->index, errstr);
+ *job->done_error = HB_ERROR_UNKNOWN;
+ *job->die = 1;
+ return -1;
+ }
+ }
+ if (track->st->codec->codec_id == AV_CODEC_ID_MOV_TEXT)
+ {
+ uint8_t styleatom[2048];;
+ uint16_t stylesize = 0;
+ uint8_t buffer[2048];
+ uint16_t buffersize = 0;
+
+ *buffer = '\0';
+
+ /*
+ * Copy the subtitle into buffer stripping markup and creating
+ * style atoms for them.
+ */
+ hb_muxmp4_process_subtitle_style( buf->data,
+ buffer,
+ styleatom, &stylesize );
+
+ buffersize = strlen((char*)buffer);
+
+ /* Write the subtitle sample */
+ memcpy( sub_out + 2, buffer, buffersize );
+ memcpy( sub_out + 2 + buffersize, styleatom, stylesize);
+ sub_out[0] = ( buffersize >> 8 ) & 0xff;
+ sub_out[1] = buffersize & 0xff;
+ pkt.data = sub_out;
+ pkt.size = buffersize + stylesize + 2;
+ }
+ }
+ if (track->st->codec->codec_id == AV_CODEC_ID_SSA &&
+ job->mux == HB_MUX_AV_MKV)
+ {
+ // avformat requires the this additional information
+ // which it parses and then strips away
+ int start_hh, start_mm, stop_hh, stop_mm, layer;
+ float start_ss, stop_ss;
+ char *ssa;
+
+ start_hh = buf->s.start / (90000 * 60 * 60);
+ start_mm = (buf->s.start / (90000 * 60));
+ start_ss = ((float)buf->s.start / 90000) - start_mm * 60;
+ start_mm %= 60;
+ stop_hh = buf->s.stop / (90000 * 60 * 60);
+ stop_mm = (buf->s.stop / (90000 * 60));
+ stop_ss = ((float)buf->s.stop / 90000) - stop_mm * 60;
+ stop_mm %= 60;
+
+ // Skip the read-order field
+ ssa = strchr((char*)buf->data, ',');
+ if (ssa != NULL)
+ ssa++;
+ // Skip the layer field
+ layer = strtol(ssa, NULL, 10);
+ ssa = strchr(ssa, ',');
+ if (ssa != NULL)
+ ssa++;
+ sprintf((char*)sub_out,
+ "Dialogue: %d,%d:%02d:%05.2f,%d:%02d:%05.2f,%s", layer,
+ start_hh, start_mm, start_ss,
+ stop_hh, stop_mm, stop_ss, ssa);
+ pkt.data = sub_out;
+ pkt.size = strlen((char*)sub_out) + 1;
+ }
+ pkt.convergence_duration = pkt.duration;
+
+ } break;
+ case MUX_TYPE_AUDIO:
+ default:
+ break;
+ }
+ track->duration = pts + pkt.duration;
+
+ pkt.stream_index = track->st->index;
+ int ret = av_interleaved_write_frame(m->oc, &pkt);
+ // Many avformat muxer functions do not check the error status
+ // of the AVIOContext. So we need to check it ourselves to detect
+ // write errors (like disk full condition).
+ if (ret < 0 || m->oc->pb->error != 0)
+ {
+ char errstr[64];
+ av_strerror(ret < 0 ? ret : m->oc->pb->error, errstr, sizeof(errstr));
+ hb_error("avformatMux: track %d, av_interleaved_write_frame failed with error '%s'",
+ track->st->index, errstr);
+ *job->done_error = HB_ERROR_UNKNOWN;
+ *job->die = 1;
+ return -1;
+ }
+
+ hb_buffer_close( &buf );
+ return 0;
+}
+
+static int avformatEnd(hb_mux_object_t *m)
+{
+ hb_job_t *job = m->job;
+ hb_mux_data_t *track = job->mux_data;
+
+ if( !job->mux_data )
+ {
+ /*
+ * We must have failed to create the file in the first place.
+ */
+ return 0;
+ }
+
+ // Flush any delayed frames
+ int ii;
+ for (ii = 0; ii < m->ntracks; ii++)
+ {
+ avformatMux(m, m->tracks[ii], NULL);
+ }
+
+ if (job->chapter_markers)
+ {
+ hb_chapter_t *chapter;
+
+ // get the last chapter
+ chapter = hb_list_item(job->list_chapter, track->current_chapter++);
+
+ // only write the last chapter marker if it lasts at least 1.5 second
+ if (chapter != NULL && chapter->duration > 135000LL)
+ {
+ char title[1024];
+ if (chapter->title != NULL)
+ {
+ snprintf(title, 1023, "%s", chapter->title);
+ }
+ else
+ {
+ snprintf(title, 1023, "Chapter %d", track->current_chapter);
+ }
+ add_chapter(m, track->prev_chapter_tc, track->duration, title);
+ }
+ }
+
+ // Update and track private data that can change during
+ // encode.
+ for(ii = 0; ii < hb_list_count( job->list_audio ); ii++)
+ {
+ AVStream *st;
+ hb_audio_t * audio;
+
+ audio = hb_list_item(job->list_audio, ii);
+ st = audio->priv.mux_data->st;
+
+ switch (audio->config.out.codec & HB_ACODEC_MASK)
+ {
+ case HB_ACODEC_FFFLAC:
+ case HB_ACODEC_FFFLAC24:
+ if( audio->priv.config.extradata.length )
+ {
+ uint8_t *priv_data;
+ int priv_size;
+
+ priv_size = audio->priv.config.extradata.length;
+ priv_data = av_realloc(st->codec->extradata, priv_size);
+ if (priv_data == NULL)
+ {
+ break;
+ }
+ memcpy(priv_data,
+ audio->priv.config.extradata.bytes,
+ audio->priv.config.extradata.length);
+ st->codec->extradata = priv_data;
+ st->codec->extradata_size = priv_size;
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ av_write_trailer(m->oc);
+ avio_close(m->oc->pb);
+ avformat_free_context(m->oc);
+ free(m->tracks);
+ m->oc = NULL;
+
+ return 0;
+}
+
+hb_mux_object_t * hb_mux_avformat_init( hb_job_t * job )
+{
+ hb_mux_object_t * m = calloc( sizeof( hb_mux_object_t ), 1 );
+ m->init = avformatInit;
+ m->mux = avformatMux;
+ m->end = avformatEnd;
+ m->job = job;
+ return m;
+}

HandBrake-0.9.9.tar.bz2/libhb/muxcommon.c -> HandBrake-0.10.0.tar.bz2/libhb/muxcommon.c Changed

@@ -1,12 +1,13 @@
 /* muxcommon.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
 For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
 */
 #include "hb.h"
+#include "decssasub.h"
 
 #define MIN_BUFFERING (1024*1024*10)
 #define MAX_BUFFERING (1024*1024*50)
@@ -18,6 +19,12 @@
 
 typedef struct
 {
+ int size; // Size in bits
+ uint32_t * vec;
+} hb_bitvec_t;
+
+typedef struct
+{
 hb_buffer_t **fifo;
 uint32_t in; // number of bufs put into fifo
 uint32_t out; // number of bufs taken out of fifo
@@ -41,16 +48,13 @@
 hb_mux_object_t * m;
 double pts; // end time of next muxing chunk
 double interleave; // size in 90KHz ticks of media chunks we mux
+ uint32_t max_tracks; // total number of tracks allocated
 uint32_t ntracks; // total number of tracks we're muxing
- uint32_t eof; // bitmask of track with eof
- uint32_t rdy; // bitmask of tracks ready to output
- uint32_t allEof; // valid bits in eof (all tracks)
- uint32_t allRdy; // valid bits in rdy (audio & video tracks)
- hb_track_t * track[32]; // array of tracks to mux ('ntrack' elements)
- // NOTE- this array could be dynamically 
- // allocated but the eof & rdy logic has to 
- // be changed to handle more than 32 tracks 
- // anyway so we keep it simple and fast.
+ hb_bitvec_t * eof; // bitmask of track with eof
+ hb_bitvec_t * rdy; // bitmask of tracks ready to output
+ hb_bitvec_t * allEof; // valid bits in eof (all tracks)
+ hb_bitvec_t * allRdy; // valid bits in rdy (audio & video tracks)
+ hb_track_t ** track; // tracks to mux 'max_tracks' elements
 int buffered_size;
 } hb_mux_t;
 
@@ -61,6 +65,130 @@
 hb_mux_t * mux;
 };
 
+
+static int hb_bitvec_add_bits(hb_bitvec_t *bv, int bits)
+{
+ int ii;
+ int words_cur = (bv->size + 31) >> 5;
+ int words = (bv->size + bits + 31) >> 5;
+ if (words > words_cur)
+ {
+ uint32_t *tmp = realloc(bv->vec, words * sizeof(uint32_t));
+ if (tmp == NULL)
+ {
+ return -1;
+ }
+ for (ii = words_cur; ii < words; ii++)
+ tmp[ii] = 0;
+ bv->vec = tmp;
+ }
+ bv->size += bits;
+ return 0;
+}
+
+static hb_bitvec_t* hb_bitvec_new(int size)
+{
+ hb_bitvec_t *bv = calloc(sizeof(hb_bitvec_t), 1);
+ hb_bitvec_add_bits(bv, size);
+ return bv;
+}
+
+static void hb_bitvec_free(hb_bitvec_t **_bv)
+{
+ hb_bitvec_t *bv = *_bv;
+ free(bv->vec);
+ free(bv);
+ *_bv = NULL;
+}
+
+static void hb_bitvec_set(hb_bitvec_t *bv, int n)
+{
+ if (n >= bv->size)
+ return; // Error. Should never happen.
+
+ int word = n >> 5;
+ uint32_t bit = 1 << (n & 0x1F);
+ bv->vec[word] |= bit;
+}
+
+static void hb_bitvec_clr(hb_bitvec_t *bv, int n)
+{
+ if (n >= bv->size)
+ return; // Error. Should never happen.
+
+ int word = n >> 5;
+ uint32_t bit = 1 << (n & 0x1F);
+ bv->vec[word] &= ~bit;
+}
+
+static void hb_bitvec_zero(hb_bitvec_t *bv)
+{
+ int words = (bv->size + 31) >> 5;
+ memset(bv->vec, 0, words * sizeof(uint32_t));
+}
+
+static int hb_bitvec_bit(hb_bitvec_t *bv, int n)
+{
+ if (n >= bv->size)
+ return 0; // Error. Should never happen.
+
+ int word = n >> 5;
+ uint32_t bit = 1 << (n & 0x1F);
+ return !!(bv->vec[word] & bit);
+}
+
+static int hb_bitvec_any(hb_bitvec_t *bv)
+{
+ uint32_t result = 0;;
+ int ii;
+ int words = (bv->size + 31) >> 5;
+ for (ii = 0; ii < words; ii++)
+ result |= bv->vec[ii];
+
+ return !!result;
+}
+
+static int hb_bitvec_cmp(hb_bitvec_t *bv1, hb_bitvec_t *bv2)
+{
+ if (bv1->size != bv2->size)
+ return 0;
+
+ int ii;
+ int words = (bv1->size + 31) >> 5;
+ for (ii = 0; ii < words; ii++)
+ if (bv1->vec[ii] != bv2->vec[ii])
+ return 0;
+ return 1;
+}
+
+static int hb_bitvec_and_cmp(hb_bitvec_t *bv1, hb_bitvec_t *bv2, hb_bitvec_t *bv3)
+{
+ if (bv1->size != bv2->size)
+ return 0;
+
+ int ii;
+ int words = (bv1->size + 31) >> 5;
+ for (ii = 0; ii < words; ii++)
+ if ((bv1->vec[ii] & bv2->vec[ii]) != bv3->vec[ii])
+ return 0;
+ return 1;
+}
+
+static int hb_bitvec_cpy(hb_bitvec_t *bv1, hb_bitvec_t *bv2)
+{
+ if (bv1->size < bv2->size)
+ {
+ int result = hb_bitvec_add_bits(bv1, bv2->size - bv1->size);
+ if (result < 0)
+ return result;
+ }
+
+ int words = (bv1->size + 31) >> 5;
+ memcpy(bv1->vec, bv2->vec, words * sizeof(uint32_t));
+
+ return 0;
+}
+
 // The muxer handles two different kinds of media: Video and audio tracks
 // are continuous: once they start they generate continuous, consecutive
 // sequence of bufs until they end. The muxer will time align all continuous
@@ -92,11 +220,19 @@
 static void add_mux_track( hb_mux_t *mux, hb_mux_data_t *mux_data,
 int is_continuous )
 {
- int max_tracks = sizeof(mux->track) / sizeof(*(mux->track));
- if ( mux->ntracks >= max_tracks )
+ if ( mux->ntracks + 1 > mux->max_tracks )
 {
- hb_error( "add_mux_track: too many tracks (>%d)", max_tracks );
- return;
+ int max_tracks = mux->max_tracks ? mux->max_tracks * 2 : 32;
+ hb_track_t **tmp;
+ tmp = realloc(mux->track, max_tracks * sizeof(hb_track_t*));
+ if (tmp == NULL)
+ {
+ hb_error("add_mux_track: realloc failed, too many tracks (>%d)",
+ max_tracks);
+ return;
+ }
+ mux->track = tmp;
+ mux->max_tracks = max_tracks;
 }
 
 hb_track_t *track = calloc( sizeof( hb_track_t ), 1 );
@@ -106,8 +242,9 @@
 
 int t = mux->ntracks++;
 mux->track[t] = track;
- mux->allEof |= 1 << t;
- mux->allRdy |= is_continuous << t;
+ hb_bitvec_set(mux->allEof, t);
+ if (is_continuous)
+ hb_bitvec_set(mux->allRdy, t);
 }
 
 static int mf_full( hb_track_t * track )
@@ -127,7 +264,7 @@
 hb_buffer_reduce( buf, buf->size );
 if ( track->buffered_size > MAX_BUFFERING )
 {
- mux->rdy = mux->allRdy;
+ hb_bitvec_cpy(mux->rdy, mux->allRdy);
 }
 if ( ( ( in + 1 ) & mask ) == ( track->mf.out & mask ) )
 {
@@ -190,11 +327,11 @@
 // (b) we can control how data from multiple tracks is
 // interleaved in the output file.
 mf_push( mux, tk, buf );
- if ( buf->s.stop >= mux->pts )
+ if ( buf->s.start >= mux->pts )
 {
 // buffer is past our next interleave point so
 // note that this track is ready to be output.
- mux->rdy |= ( 1 << tk );
+ hb_bitvec_set(mux->rdy, tk);
 }
 }
 
@@ -233,11 +370,11 @@
 {
 // EOF - mark this track as done
 hb_buffer_close( &buf );
- mux->eof |= ( 1 << pv->track );
- mux->rdy |= ( 1 << pv->track );
+ hb_bitvec_set(mux->eof, pv->track);
+ hb_bitvec_set(mux->rdy, pv->track);
 }
- else if ( ( job->pass != 0 && job->pass != 2 ) ||
- ( mux->eof & (1 << pv->track) ) )
+ else if ((job->pass != 0 && job->pass != 2) ||
+ hb_bitvec_bit(mux->eof, pv->track))
 {
 hb_buffer_close( &buf );
 }
@@ -247,20 +384,23 @@
 }
 *buf_in = NULL;
 
- if ( ( mux->rdy & mux->allRdy ) != mux->allRdy )
+ if (!hb_bitvec_and_cmp(mux->rdy, mux->allRdy, mux->allRdy) &&
+ !hb_bitvec_and_cmp(mux->eof, mux->allEof, mux->allEof))
 {
 hb_unlock( mux->mutex );
 return HB_WORK_OK;
 }
 
- int more = mux->rdy;
+ hb_bitvec_t *more;
+ more = hb_bitvec_new(0);
+ hb_bitvec_cpy(more, mux->rdy);
 // all tracks have at least 'interleave' ticks of data. Output
 // all that we can in 'interleave' size chunks.
- while ( (( mux->rdy & mux->allRdy ) == mux->allRdy && 
- more && mux->buffered_size > MIN_BUFFERING ) ||
- ( mux->eof == mux->allEof ) ) 
+ while ((hb_bitvec_and_cmp(mux->rdy, mux->allRdy, mux->allRdy) &&
+ hb_bitvec_any(more) && mux->buffered_size > MIN_BUFFERING ) ||
+ (hb_bitvec_cmp(mux->eof, mux->allEof)))
 {
- more = 0;
+ hb_bitvec_zero(more);
 for ( i = 0; i < mux->ntracks; ++i )
 {
 track = mux->track[i];
@@ -269,29 +409,29 @@
 {
 // If the track's fifo is still full, advance
 // the currint interleave point and try again.
- mux->rdy = mux->allRdy;
+ hb_bitvec_cpy(mux->rdy, mux->allRdy);
 break;
 }
 
 // if the track is at eof or still has data that's past
 // our next interleave point then leave it marked as rdy.
 // Otherwise clear rdy.
- if ( ( mux->eof & (1 << i) ) == 0 &&
- ( track->mf.out == track->mf.in ||
- track->mf.fifo[(track->mf.in-1) & (track->mf.flen-1)]->s.stop
- < mux->pts + mux->interleave ) )
+ if (hb_bitvec_bit(mux->eof, i) &&
+ (track->mf.out == track->mf.in ||
+ track->mf.fifo[(track->mf.in-1) & (track->mf.flen-1)]->s.start
+ < mux->pts + mux->interleave))
 {
- mux->rdy &=~ ( 1 <rdy, i);
 }
 if ( track->mf.out != track->mf.in )
 {
- more |= ( 1 << i );
+ hb_bitvec_set(more, i);
 }
 }
 
 // if all the tracks are at eof we're just purging their
 // remaining data -- keep going until all internal fifos are empty.
- if ( mux->eof == mux->allEof )
+ if (hb_bitvec_cmp(mux->eof, mux->allEof))
 {
 for ( i = 0; i < mux->ntracks; ++i )
 {
@@ -304,11 +444,14 @@
 {
 mux->done = 1;
 hb_unlock( mux->mutex );
+ hb_bitvec_free(&more);
 return HB_WORK_DONE;
 }
 }
 mux->pts += mux->interleave;
 }
+ hb_bitvec_free(&more);
+
 hb_unlock( mux->mutex );
 return HB_WORK_OK;
 }
@@ -346,10 +489,10 @@
 // we're all done muxing -- print final stats and cleanup.
 if( job->pass == 0 || job->pass == 2 )
 {
- struct stat sb;
+ hb_stat_t sb;
 uint64_t bytes_total, frames_total;
 
- if( !stat( job->file, &sb ) )
+ if (!hb_stat(job->file, &sb))
 {
 hb_deep_log( 2, "mux: file size, %"PRId64" bytes", (uint64_t) sb.st_size );
 
@@ -380,7 +523,7 @@
 }
 }
 }
- 
+
 for( i = 0; i < mux->ntracks; ++i )
 {
 hb_buffer_t * b;
@@ -396,8 +539,13 @@
 }
 free( track );
 }
+ free(mux->track);
 hb_unlock( mux->mutex );
 hb_lock_close( &mux->mutex );
+ hb_bitvec_free(&mux->eof);
+ hb_bitvec_free(&mux->rdy);
+ hb_bitvec_free(&mux->allEof);
+ hb_bitvec_free(&mux->allRdy);
 free( mux );
 }
 else
@@ -446,6 +594,15 @@
 hb_work_object_t * w;
 hb_work_object_t * muxer;
 
+ // The bit vectors must be allocated before hb_thread_init for the
+ // audio and subtitle muxer jobs below.
+ int bit_vec_size = 1 + hb_list_count(job->list_audio) +
+ hb_list_count(job->list_subtitle);
+ mux->rdy = hb_bitvec_new(bit_vec_size);
+ mux->eof = hb_bitvec_new(bit_vec_size);
+ mux->allRdy = hb_bitvec_new(bit_vec_size);
+ mux->allEof = hb_bitvec_new(bit_vec_size);
+
 mux->mutex = hb_lock_init();
 
 // set up to interleave track data in blocks of 1 video frame time.
@@ -459,14 +616,13 @@
 {
 switch( job->mux )
 {
- case HB_MUX_MP4:
- mux->m = hb_mux_mp4_init( job );
- break;
- case HB_MUX_MKV:
- mux->m = hb_mux_mkv_init( job );
+ case HB_MUX_AV_MP4:
+ case HB_MUX_AV_MKV:
+ mux->m = hb_mux_avformat_init( job );
 break;
 default:
 hb_error( "No muxer selected, exiting" );
+ *job->done_error = HB_ERROR_INIT;
 *job->die = 1;
 return NULL;
 }
@@ -544,3 +700,164 @@
 muxClose
 };
 
+#define TX3G_STYLES (HB_STYLE_FLAG_BOLD | \
+ HB_STYLE_FLAG_ITALIC | \
+ HB_STYLE_FLAG_UNDERLINE)
+
+typedef struct style_context_s
+{
+ uint8_t * style_atoms;
+ int style_atom_count;
+ hb_subtitle_style_t current_style;
+ int style_start;
+} style_context_t;
+
+static void update_style_atoms(style_context_t *ctx, int stop)
+{
+ uint8_t *style_entry;
+ uint8_t face = 0;
+
+ style_entry = ctx->style_atoms + 10 + (12 * ctx->style_atom_count);
+
+ if (ctx->current_style.flags & HB_STYLE_FLAG_BOLD)
+ face |= 1;
+ if (ctx->current_style.flags & HB_STYLE_FLAG_ITALIC)
+ face |= 2;
+ if (ctx->current_style.flags & HB_STYLE_FLAG_UNDERLINE)
+ face |= 4;
+
+ style_entry[0] = (ctx->style_start >> 8) & 0xff; // startChar
+ style_entry[1] = ctx->style_start & 0xff;
+ style_entry[2] = (stop >> 8) & 0xff; // endChar
+ style_entry[3] = stop & 0xff;
+ style_entry[4] = 0; // font-ID msb
+ style_entry[5] = 1; // font-ID lsb
+ style_entry[6] = face; // face-style-flags
+ style_entry[7] = 24; // font-size
+ style_entry[8] = (ctx->current_style.fg_rgb >> 16) & 0xff; // r
+ style_entry[9] = (ctx->current_style.fg_rgb >> 8) & 0xff; // g
+ style_entry[10] = (ctx->current_style.fg_rgb) & 0xff; // b
+ style_entry[11] = ctx->current_style.fg_alpha; // a
+
+ ctx->style_atom_count++;
+}
+
+static void update_style(style_context_t *ctx,
+ hb_subtitle_style_t *style, int pos)
+{
+ if (ctx->style_start < pos)
+ {
+ // do we need to add a style atom?
+ if (((ctx->current_style.flags ^ style->flags) & TX3G_STYLES) ||
+ ctx->current_style.fg_rgb != style->fg_rgb ||
+ ctx->current_style.fg_alpha != style->fg_alpha)
+ {
+ update_style_atoms(ctx, pos - 1);
+ ctx->current_style = *style;
+ ctx->style_start = pos;
+ }
+ }
+ else
+ {
+ ctx->current_style = *style;
+ ctx->style_start = pos;
+ }
+}
+
+static void style_context_init(style_context_t *ctx, uint8_t *style_atoms)
+{
+ memset(ctx, 0, sizeof(*ctx));
+ ctx->style_atoms = style_atoms;
+ ctx->style_start = INT_MAX;
+}
+
+/*
+ * Copy the input to output removing markup and adding markup to the style
+ * atom where appropriate.
+ */
+void hb_muxmp4_process_subtitle_style(uint8_t *input,
+ uint8_t *output,
+ uint8_t *style_atoms, uint16_t *stylesize)
+{
+ uint16_t utf8_count = 0; // utf8 count from start of subtitle
+ int consumed, in_pos = 0, out_pos = 0, len, ii, lines;
+ style_context_t ctx;
+ hb_subtitle_style_t style;
+ char *text, *tmp;
+
+ *stylesize = 0;
+ style_context_init(&ctx, style_atoms);
+
+ hb_ssa_style_init(&style);
+
+ // Skip past the SSA preamble
+ text = (char*)input;
+ for (ii = 0; ii < 8; ii++)
+ {
+ tmp = strchr(text, ',');
+ if (tmp == NULL)
+ break;
+ text = tmp + 1;
+ }
+ in_pos = text - (char*)input;
+
+ while (input[in_pos] != '\0')
+ {
+ lines = 1;
+ text = hb_ssa_to_text((char*)input + in_pos, &consumed, &style);
+ if (text == NULL)
+ break;
+
+ // count UTF8 characters, and get length of text
+ len = 0;
+ for (ii = 0; text[ii] != '\0'; ii++)
+ {
+ if ((text[ii] & 0xc0) == 0x80)
+ {
+ utf8_count++;
+ hb_deep_log( 3, "mux: Counted %d UTF-8 chrs within subtitle",
+ utf8_count);
+ }
+ // By default tx3g only supports 2 lines of text
+ // To support more lines, we must enable the virtical placement
+ // flag in the tx3g atom and add tbox atoms to the sample
+ // data to set the vertical placement for each subtitle.
+ // Although tbox defines a rectangle, the QT spec says
+ // that only the vertical placement is honored (bummer).
+ if (text[ii] == '\n')
+ {
+ lines++;
+ if (lines > 2)
+ text[ii] = ' ';
+ }
+ len++;
+ }
+ strcpy((char*)output+out_pos, text);
+ free(text);
+ out_pos += len;
+ in_pos += consumed;
+ update_style(&ctx, &style, out_pos - utf8_count);
+ }
+ // Return to default style at end of line, flushes any pending
+ // style changes
+ hb_ssa_style_init(&style);
+ update_style(&ctx, &style, out_pos - utf8_count);
+
+ // null terminate output string
+ output[out_pos] = 0;
+
+ if (ctx.style_atom_count > 0)
+ {
+ *stylesize = 10 + (ctx.style_atom_count * 12);
+
+ memcpy(style_atoms + 4, "styl", 4);
+
+ style_atoms[0] = 0;
+ style_atoms[1] = 0;
+ style_atoms[2] = (*stylesize >> 8) & 0xff;
+ style_atoms[3] = *stylesize & 0xff;
+ style_atoms[8] = (ctx.style_atom_count >> 8) & 0xff;
+ style_atoms[9] = ctx.style_atom_count & 0xff;
+ }
+}
+

HandBrake-0.10.0.tar.bz2/libhb/nal_units.c Added

@@ -0,0 +1,195 @@
+/* nal_units.c
+ *
+ * Copyright (c) 2003-2014 HandBrake Team
+ * This file is part of the HandBrake source code.
+ * Homepage: <http://handbrake.fr/>.
+ * It may be used under the terms of the GNU General Public License v2.
+ * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#include <stdint.h>
+#include <string.h>
+
+#include "common.h"
+#include "nal_units.h"
+
+static const uint8_t hb_annexb_startcode[] = { 0x00, 0x00, 0x00, 0x01, };
+
+size_t hb_nal_unit_write_annexb(uint8_t *buf,
+ const uint8_t *nal_unit,
+ const size_t nal_unit_size)
+{
+ if (buf != NULL)
+ {
+ memcpy(buf, hb_annexb_startcode, sizeof(hb_annexb_startcode));
+ memcpy(buf + sizeof(hb_annexb_startcode), nal_unit, nal_unit_size);
+ }
+
+ return sizeof(hb_annexb_startcode) + nal_unit_size;
+}
+
+size_t hb_nal_unit_write_isomp4(uint8_t *buf,
+ const uint8_t *nal_unit,
+ const size_t nal_unit_size)
+{
+ int i;
+ uint8_t length[4]; // 4-byte length replaces Annex B start code prefix
+
+ if (buf != NULL)
+ {
+ for (i = 0; i < sizeof(length); i++)
+ {
+ length[i] = (nal_unit_size >> (8 * (sizeof(length) - 1 - i))) & 0xff;
+ }
+
+ memcpy(buf, &length[0], sizeof(length));
+ memcpy(buf + sizeof(length), nal_unit, nal_unit_size);
+ }
+
+ return sizeof(length) + nal_unit_size;
+}
+
+uint8_t* hb_annexb_find_next_nalu(const uint8_t *start, size_t *size)
+{
+ uint8_t *nal = NULL;
+ uint8_t *buf = (uint8_t*)start;
+ uint8_t *end = (uint8_t*)start + *size;
+
+ /* Look for an Annex B start code prefix (3-byte sequence == 1) */
+ while (end - buf > 3)
+ {
+ if (!buf[0] && !buf[1] && buf[2] == 1)
+ {
+ nal = (buf += 3); // NAL unit begins after start code
+ break;
+ }
+ buf++;
+ }
+
+ if (nal == NULL)
+ {
+ *size = 0;
+ return NULL;
+ }
+
+ /*
+ * Start code prefix found, look for the next one to determine the size
+ *
+ * A 4-byte sequence == 1 is also a start code, so check for a 3-byte
+ * sequence == 0 too (start code emulation prevention will prevent such a
+ * sequence from occurring outside of a start code prefix)
+ */
+ while (end - buf > 3)
+ {
+ if (!buf[0] && !buf[1] && (!buf[2] || buf[2] == 1))
+ {
+ end = buf;
+ break;
+ }
+ buf++;
+ }
+
+ *size = end - nal;
+ return nal;
+}
+
+hb_buffer_t* hb_nal_bitstream_annexb_to_mp4(const uint8_t *data,
+ const size_t size)
+{
+ hb_buffer_t *out;
+ uint8_t *buf, *end;
+ size_t out_size, buf_size;
+
+ out_size = 0;
+ buf_size = size;
+ buf = (uint8_t*)data;
+ end = (uint8_t*)data + size;
+
+ while ((buf = hb_annexb_find_next_nalu(buf, &buf_size)) != NULL)
+ {
+ out_size += hb_nal_unit_write_isomp4(NULL, buf, buf_size);
+ buf_size = end - buf;
+ }
+
+ out = hb_buffer_init(out_size);
+ if (out == NULL)
+ {
+ hb_error("hb_nal_bitstream_annexb_to_mp4: hb_buffer_init failed");
+ return NULL;
+ }
+
+ out_size = 0;
+ buf_size = size;
+ buf = (uint8_t*)data;
+ end = (uint8_t*)data + size;
+
+ while ((buf = hb_annexb_find_next_nalu(buf, &buf_size)) != NULL)
+ {
+ out_size += hb_nal_unit_write_isomp4(out->data + out_size, buf, buf_size);
+ buf_size = end - buf;
+ }
+
+ return out;
+}
+
+static size_t mp4_nal_unit_length(const uint8_t *data,
+ const size_t nal_length_size,
+ size_t *nal_unit_length)
+{
+ uint8_t i;
+
+ /* In MP4, NAL units are preceded by a 2-4 byte length field */
+ for (i = 0, *nal_unit_length = 0; i < nal_length_size; i++)
+ {
+ *nal_unit_length |= data[i] << (8 * (nal_length_size - 1 - i));
+ }
+
+ return nal_length_size;
+}
+
+hb_buffer_t* hb_nal_bitstream_mp4_to_annexb(const uint8_t *data,
+ const size_t size,
+ const uint8_t nal_length_size)
+{
+ hb_buffer_t *out;
+ uint8_t *buf, *end;
+ size_t out_size, nal_size;
+
+ out_size = 0;
+ buf = (uint8_t*)data;
+ end = (uint8_t*)data + size;
+
+ while (end - buf > nal_length_size)
+ {
+ buf += mp4_nal_unit_length(buf, nal_length_size, &nal_size);
+ if (end - buf < nal_size)
+ {
+ hb_log("hb_nal_bitstream_mp4_to_annexb: truncated bitstream"
+ " (remaining: %lu, expected: %lu)", end - buf, nal_size);
+ return NULL;
+ }
+
+ out_size += hb_nal_unit_write_annexb(NULL, buf, nal_size);
+ buf += nal_size;
+ }
+
+ out = hb_buffer_init(out_size);
+ if (out == NULL)
+ {
+ hb_error("hb_nal_bitstream_mp4_to_annexb: hb_buffer_init failed");
+ return NULL;
+ }
+
+ out_size = 0;
+ buf = (uint8_t*)data;
+ end = (uint8_t*)data + size;
+
+ while (end - buf > nal_length_size)
+ {
+ buf += mp4_nal_unit_length(buf, nal_length_size, &nal_size);
+ out_size += hb_nal_unit_write_annexb(out->data + out_size, buf, nal_size);
+ buf += nal_size;
+ }
+
+ return out;
+}

HandBrake-0.10.0.tar.bz2/libhb/nal_units.h Added

@@ -0,0 +1,51 @@
+/* nal_units.h
+ *
+ * Copyright (c) 2003-2014 HandBrake Team
+ * This file is part of the HandBrake source code.
+ * Homepage: <http://handbrake.fr/>.
+ * It may be used under the terms of the GNU General Public License v2.
+ * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#ifndef HB_NAL_UNITS_H
+#define HB_NAL_UNITS_H
+
+#include <stdint.h>
+
+#include "common.h"
+
+/*
+ * Write a NAL unit of the specified size to the provided
+ * output buffer, using the requested output format.
+ * Returns the amount (in bytes) of data written to the buffer.
+ *
+ * The provided NAL unit must start with the NAL unit header.
+ *
+ * Note: the buffer is assumed to be large enough to hold the NAL unit
+ * as well as any additonal data the function may prepend/append to it.
+ *
+ * The caller may check the minimum required buffer size by passing a
+ * NULL buffer to the fucntion and checking the returned size value.
+ */
+size_t hb_nal_unit_write_annexb(uint8_t *buf, const uint8_t *nal_unit, const size_t nal_unit_size);
+size_t hb_nal_unit_write_isomp4(uint8_t *buf, const uint8_t *nal_unit, const size_t nal_unit_size);
+
+/*
+ * Search the provided data buffer for NAL units in Annex B format.
+ *
+ * Returns a pointer to the start (start code prefix excluded) of the
+ * first NAL unit found, or NULL if no NAL units were found in the buffer.
+ *
+ * On input, size holds the length of the provided data buffer.
+ * On output, size holds the length of the returned NAL unit.
+ */
+uint8_t* hb_annexb_find_next_nalu(const uint8_t *start, size_t *size);
+
+/*
+ * Returns a newly-allocated buffer holding a copy of the provided
+ * NAL unit bitstream data, converted to the requested format.
+ */
+hb_buffer_t* hb_nal_bitstream_annexb_to_mp4(const uint8_t *data, const size_t size);
+hb_buffer_t* hb_nal_bitstream_mp4_to_annexb(const uint8_t *data, const size_t size, const uint8_t nal_length_size);
+
+#endif // HB_NAL_UNITS_H

HandBrake-0.10.0.tar.bz2/libhb/nlmeans.c Added

@@ -0,0 +1,1123 @@
+/* nlmeans.c
+
+ Copyright (c) 2013 Dirk Farin
+ Copyright (c) 2003-2014 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+/* Usage
+ *
+ * Parameters:
+ * lumaY_strength : lumaY_origin_tune : lumaY_patch_size : lumaY_range : lumaY_frames : lumaY_prefilter :
+ * chromaB_strength : chromaB_origin_tune : chromaB_patch_size : chromaB_range : chromaB_frames : chromaB_prefilter :
+ * chromaR_strength : chromaR_origin_tune : chromaR_patch_size : chromaR_range : chromaR_frames : chromaR_prefilter
+ *
+ * Defaults:
+ * 8:1:7:3:2:0 for each channel (equivalent to 8:1:7:3:2:0:8:1:7:3:2:0:8:1:7:3:2:0)
+ *
+ * Parameters cascade, e.g. 6:0.8:7:3:3:0:4:1 sets:
+ * strength 6, origin tune 0.8 for luma
+ * patch size 7, range 3, frames 3, prefilter 0 for all channels
+ * strength 4, origin tune 1 for both chroma channels
+ *
+ * Strength is relative and must be adjusted; ALL parameters affect overall strength.
+ * Lower origin tune improves results for noisier input or animation (film 0.5-1, animation 0.15-0.5).
+ * Large patch size (>9) may greatly reduce quality by clobbering detail.
+ * Larger search range increases quality; however, computation time increases exponentially.
+ * Large number of frames (film >3, animation >6) may cause temporal smearing.
+ * Prefiltering can potentially improve weight decisions, yielding better results for difficult sources.
+ *
+ * Prefilter enum combos:
+ * 1: Mean 3x3
+ * 2: Mean 5x5
+ * 3: Mean 5x5 (overrides Mean 3x3)
+ * 257: Mean 3x3 reduced by 25%
+ * 258: Mean 5x5 reduced by 25%
+ * 513: Mean 3x3 reduced by 50%
+ * 514: Mean 5x5 reduced by 50%
+ * 769: Mean 3x3 reduced by 75%
+ * 770: Mean 5x5 reduced by 75%
+ * 1025: Mean 3x3 plus edge boost (restores lost edge detail)
+ * 1026: Mean 5x5 plus edge boost
+ * 1281: Mean 3x3 reduced by 25% plus edge boost
+ * etc...
+ * 2049: Mean 3x3 passthru (NL-means off, prefilter is the output)
+ * etc...
+ * 3329: Mean 3x3 reduced by 25% plus edge boost, passthru
+ * etc...
+ */
+
+#include "hb.h"
+#include "hbffmpeg.h"
+#include "taskset.h"
+
+#define NLMEANS_STRENGTH_LUMA_DEFAULT 8
+#define NLMEANS_STRENGTH_CHROMA_DEFAULT 8
+#define NLMEANS_ORIGIN_TUNE_LUMA_DEFAULT 1
+#define NLMEANS_ORIGIN_TUNE_CHROMA_DEFAULT 1
+#define NLMEANS_PATCH_SIZE_LUMA_DEFAULT 7
+#define NLMEANS_PATCH_SIZE_CHROMA_DEFAULT 7
+#define NLMEANS_RANGE_LUMA_DEFAULT 3
+#define NLMEANS_RANGE_CHROMA_DEFAULT 3
+#define NLMEANS_FRAMES_LUMA_DEFAULT 2
+#define NLMEANS_FRAMES_CHROMA_DEFAULT 2
+#define NLMEANS_PREFILTER_LUMA_DEFAULT 0
+#define NLMEANS_PREFILTER_CHROMA_DEFAULT 0
+
+#define NLMEANS_PREFILTER_MODE_MEAN3X3 1
+#define NLMEANS_PREFILTER_MODE_MEAN5X5 2
+#define NLMEANS_PREFILTER_MODE_MEDIAN3X3 4
+#define NLMEANS_PREFILTER_MODE_MEDIAN5X5 8
+#define NLMEANS_PREFILTER_MODE_RESERVED16 16 // Reserved
+#define NLMEANS_PREFILTER_MODE_RESERVED32 32 // Reserved
+#define NLMEANS_PREFILTER_MODE_RESERVED64 64 // Reserved
+#define NLMEANS_PREFILTER_MODE_RESERVED128 128 // Reserved
+#define NLMEANS_PREFILTER_MODE_REDUCE25 256
+#define NLMEANS_PREFILTER_MODE_REDUCE50 512
+#define NLMEANS_PREFILTER_MODE_EDGEBOOST 1024
+#define NLMEANS_PREFILTER_MODE_PASSTHRU 2048
+
+#define NLMEANS_SORT(a,b) { if (a > b) NLMEANS_SWAP(a, b); }
+#define NLMEANS_SWAP(a,b) { a = (a ^ b); b = (a ^ b); a = (b ^ a); }
+
+#define NLMEANS_FRAMES_MAX 32
+#define NLMEANS_EXPSIZE 128
+
+typedef struct
+{
+ uint8_t *mem;
+ uint8_t *mem_pre;
+ uint8_t *image;
+ uint8_t *image_pre;
+ int w;
+ int h;
+ int border;
+ hb_lock_t *mutex;
+ int prefiltered;
+} BorderedPlane;
+
+typedef struct
+{
+ int width;
+ int height;
+ int fmt;
+ BorderedPlane plane[3];
+ hb_buffer_settings_t s;
+} Frame;
+
+struct PixelSum
+{
+ float weight_sum;
+ float pixel_sum;
+};
+
+typedef struct
+{
+ hb_filter_private_t *pv;
+ int segment;
+ hb_buffer_t *out;
+} nlmeans_thread_arg_t;
+
+struct hb_filter_private_s
+{
+ double strength[3]; // averaging weight decay, larger produces smoother output
+ double origin_tune[3]; // weight tuning for origin patch, 0.00..1.00
+ int patch_size[3]; // pixel context region width (must be odd)
+ int range[3]; // spatial search window width (must be odd)
+ int nframes[3]; // temporal search depth in frames
+ int prefilter[3]; // prefilter mode, can improve weight analysis
+
+ Frame *frame;
+ int next_frame;
+ int max_frames;
+
+ taskset_t taskset;
+ int thread_count;
+ nlmeans_thread_arg_t **thread_data;
+};
+
+static int nlmeans_init(hb_filter_object_t *filter, hb_filter_init_t *init);
+static int nlmeans_work(hb_filter_object_t *filter,
+ hb_buffer_t **buf_in,
+ hb_buffer_t **buf_out);
+static void nlmeans_close(hb_filter_object_t *filter);
+
+static void nlmeans_filter_thread(void *thread_args_v);
+
+hb_filter_object_t hb_filter_nlmeans =
+{
+ .id = HB_FILTER_NLMEANS,
+ .enforce_order = 1,
+ .name = "Denoise (nlmeans)",
+ .settings = NULL,
+ .init = nlmeans_init,
+ .work = nlmeans_work,
+ .close = nlmeans_close,
+};
+
+static void nlmeans_border(uint8_t *src,
+ int w,
+ int h,
+ int border)
+{
+ int bw = w + 2 * border;
+ uint8_t *image = src + border + bw * border;
+
+ // Create faux borders using edge pixels
+ for (int y = 0; y < h; y++)
+ {
+ for (int x = 0; x < border; x++)
+ {
+ *(image + y*bw - x - 1) = *(image + y*bw + x);
+ *(image + y*bw + x + w) = *(image + y*bw - x + (w-1));
+ }
+ }
+ for (int y = 0; y < border; y++)
+ {
+ memcpy(image - border - (y+1)*bw, image - border + y*bw, bw);
+ memcpy(image - border + (y+h)*bw, image - border + (h-y-1)*bw, bw);
+ }
+
+}
+
+static void nlmeans_deborder(BorderedPlane *src,
+ uint8_t *dst,
+ int w,
+ int s,
+ int h)
+{
+ int bw = src->w + 2 * src->border;
+ uint8_t *image = src->mem + src->border + bw * src->border;
+ int width = w;
+ if (src->w < width)
+ width = src->w;
+
+ // Copy main image
+ for (int y = 0; y < h; y++)
+ {
+ memcpy(dst + y * s, image + y * bw, width);
+ }
+
+}
+
+static void nlmeans_alloc(uint8_t *src,
+ int src_w,
+ int src_s,
+ int src_h,
+ BorderedPlane *dst,
+ int border)
+{
+ int bw = src_w + 2 * border;
+ int bh = src_h + 2 * border;
+
+ uint8_t *mem = malloc(bw * bh * sizeof(uint8_t));
+ uint8_t *image = mem + border + bw * border;
+
+ // Copy main image
+ for (int y = 0; y < src_h; y++)
+ {
+ memcpy(image + y * bw, src + y * src_s, src_w);
+ }
+
+ dst->mem = mem;
+ dst->image = image;
+ dst->w = src_w;
+ dst->h = src_h;
+ dst->border = border;
+
+ nlmeans_border(dst->mem, dst->w, dst->h, dst->border);
+ dst->mem_pre = dst->mem;
+ dst->image_pre = dst->image;
+
+}
+
+static void nlmeans_filter_mean(uint8_t *src,
+ uint8_t *dst,
+ int w,
+ int h,
+ int border,
+ int size)
+{
+
+ // Mean filter
+ int bw = w + 2 * border;
+ int offset_min = -((size - 1) /2);
+ int offset_max = (size + 1) /2;
+ uint16_t pixel_sum;
+ double pixel_weight = 1.0 / (size * size);
+ for (int y = 0; y < h; y++)
+ {
+ for (int x = 0; x < w; x++)
+ {
+ pixel_sum = 0;
+ for (int k = offset_min; k < offset_max; k++)
+ {
+ for (int j = offset_min; j < offset_max; j++)
+ {
+ pixel_sum = pixel_sum + *(src + bw*(y+j) + (x+k));
+ }
+ }
+ *(dst + bw*y + x) = (uint8_t)(pixel_sum * pixel_weight);
+ }
+ }
+
+}
+
+static uint8_t nlmeans_filter_median_opt(uint8_t *pixels, int size)
+{
+
+ // Optimized sorting networks
+ if (size == 3)
+ {
+ /* opt_med9() via Nicolas Devillard
+ * http://ndevilla.free.fr/median/median.pdf
+ */
+ NLMEANS_SORT(pixels[1], pixels[2]); NLMEANS_SORT(pixels[4], pixels[5]); NLMEANS_SORT(pixels[7], pixels[8]);
+ NLMEANS_SORT(pixels[0], pixels[1]); NLMEANS_SORT(pixels[3], pixels[4]); NLMEANS_SORT(pixels[6], pixels[7]);
+ NLMEANS_SORT(pixels[1], pixels[2]); NLMEANS_SORT(pixels[4], pixels[5]); NLMEANS_SORT(pixels[7], pixels[8]);
+ NLMEANS_SORT(pixels[0], pixels[3]); NLMEANS_SORT(pixels[5], pixels[8]); NLMEANS_SORT(pixels[4], pixels[7]);
+ NLMEANS_SORT(pixels[3], pixels[6]); NLMEANS_SORT(pixels[1], pixels[4]); NLMEANS_SORT(pixels[2], pixels[5]);
+ NLMEANS_SORT(pixels[4], pixels[7]); NLMEANS_SORT(pixels[4], pixels[2]); NLMEANS_SORT(pixels[6], pixels[4]);
+ NLMEANS_SORT(pixels[4], pixels[2]);
+ return pixels[4];
+ }
+ else if (size == 5)
+ {
+ /* opt_med25() via Nicolas Devillard
+ * http://ndevilla.free.fr/median/median.pdf
+ */
+ NLMEANS_SORT(pixels[0], pixels[1]); NLMEANS_SORT(pixels[3], pixels[4]); NLMEANS_SORT(pixels[2], pixels[4]);
+ NLMEANS_SORT(pixels[2], pixels[3]); NLMEANS_SORT(pixels[6], pixels[7]); NLMEANS_SORT(pixels[5], pixels[7]);
+ NLMEANS_SORT(pixels[5], pixels[6]); NLMEANS_SORT(pixels[9], pixels[10]); NLMEANS_SORT(pixels[8], pixels[10]);
+ NLMEANS_SORT(pixels[8], pixels[9]); NLMEANS_SORT(pixels[12], pixels[13]); NLMEANS_SORT(pixels[11], pixels[13]);
+ NLMEANS_SORT(pixels[11], pixels[12]); NLMEANS_SORT(pixels[15], pixels[16]); NLMEANS_SORT(pixels[14], pixels[16]);
+ NLMEANS_SORT(pixels[14], pixels[15]); NLMEANS_SORT(pixels[18], pixels[19]); NLMEANS_SORT(pixels[17], pixels[19]);
+ NLMEANS_SORT(pixels[17], pixels[18]); NLMEANS_SORT(pixels[21], pixels[22]); NLMEANS_SORT(pixels[20], pixels[22]);
+ NLMEANS_SORT(pixels[20], pixels[21]); NLMEANS_SORT(pixels[23], pixels[24]); NLMEANS_SORT(pixels[2], pixels[5]);
+ NLMEANS_SORT(pixels[3], pixels[6]); NLMEANS_SORT(pixels[0], pixels[6]); NLMEANS_SORT(pixels[0], pixels[3]);
+ NLMEANS_SORT(pixels[4], pixels[7]); NLMEANS_SORT(pixels[1], pixels[7]); NLMEANS_SORT(pixels[1], pixels[4]);
+ NLMEANS_SORT(pixels[11], pixels[14]); NLMEANS_SORT(pixels[8], pixels[14]); NLMEANS_SORT(pixels[8], pixels[11]);
+ NLMEANS_SORT(pixels[12], pixels[15]); NLMEANS_SORT(pixels[9], pixels[15]); NLMEANS_SORT(pixels[9], pixels[12]);
+ NLMEANS_SORT(pixels[13], pixels[16]); NLMEANS_SORT(pixels[10], pixels[16]); NLMEANS_SORT(pixels[10], pixels[13]);
+ NLMEANS_SORT(pixels[20], pixels[23]); NLMEANS_SORT(pixels[17], pixels[23]); NLMEANS_SORT(pixels[17], pixels[20]);
+ NLMEANS_SORT(pixels[21], pixels[24]); NLMEANS_SORT(pixels[18], pixels[24]); NLMEANS_SORT(pixels[18], pixels[21]);
+ NLMEANS_SORT(pixels[19], pixels[22]); NLMEANS_SORT(pixels[8], pixels[17]); NLMEANS_SORT(pixels[9], pixels[18]);
+ NLMEANS_SORT(pixels[0], pixels[18]); NLMEANS_SORT(pixels[0], pixels[9]); NLMEANS_SORT(pixels[10], pixels[19]);
+ NLMEANS_SORT(pixels[1], pixels[19]); NLMEANS_SORT(pixels[1], pixels[10]); NLMEANS_SORT(pixels[11], pixels[20]);
+ NLMEANS_SORT(pixels[2], pixels[20]); NLMEANS_SORT(pixels[2], pixels[11]); NLMEANS_SORT(pixels[12], pixels[21]);
+ NLMEANS_SORT(pixels[3], pixels[21]); NLMEANS_SORT(pixels[3], pixels[12]); NLMEANS_SORT(pixels[13], pixels[22]);
+ NLMEANS_SORT(pixels[4], pixels[22]); NLMEANS_SORT(pixels[4], pixels[13]); NLMEANS_SORT(pixels[14], pixels[23]);
+ NLMEANS_SORT(pixels[5], pixels[23]); NLMEANS_SORT(pixels[5], pixels[14]); NLMEANS_SORT(pixels[15], pixels[24]);
+ NLMEANS_SORT(pixels[6], pixels[24]); NLMEANS_SORT(pixels[6], pixels[15]); NLMEANS_SORT(pixels[7], pixels[16]);
+ NLMEANS_SORT(pixels[7], pixels[19]); NLMEANS_SORT(pixels[13], pixels[21]); NLMEANS_SORT(pixels[15], pixels[23]);
+ NLMEANS_SORT(pixels[7], pixels[13]); NLMEANS_SORT(pixels[7], pixels[15]); NLMEANS_SORT(pixels[1], pixels[9]);
+ NLMEANS_SORT(pixels[3], pixels[11]); NLMEANS_SORT(pixels[5], pixels[17]); NLMEANS_SORT(pixels[11], pixels[17]);
+ NLMEANS_SORT(pixels[9], pixels[17]); NLMEANS_SORT(pixels[4], pixels[10]); NLMEANS_SORT(pixels[6], pixels[12]);
+ NLMEANS_SORT(pixels[7], pixels[14]); NLMEANS_SORT(pixels[4], pixels[6]); NLMEANS_SORT(pixels[4], pixels[7]);
+ NLMEANS_SORT(pixels[12], pixels[14]); NLMEANS_SORT(pixels[10], pixels[14]); NLMEANS_SORT(pixels[6], pixels[7]);
+ NLMEANS_SORT(pixels[10], pixels[12]); NLMEANS_SORT(pixels[6], pixels[10]); NLMEANS_SORT(pixels[6], pixels[17]);
+ NLMEANS_SORT(pixels[12], pixels[17]); NLMEANS_SORT(pixels[7], pixels[17]); NLMEANS_SORT(pixels[7], pixels[10]);
+ NLMEANS_SORT(pixels[12], pixels[18]); NLMEANS_SORT(pixels[7], pixels[12]); NLMEANS_SORT(pixels[10], pixels[18]);
+ NLMEANS_SORT(pixels[12], pixels[20]); NLMEANS_SORT(pixels[10], pixels[20]); NLMEANS_SORT(pixels[10], pixels[12]);
+ return pixels[12];
+ }
+
+ // Network for size not implemented
+ return pixels[(int)((size * size)/2)];
+
+}
+
+static void nlmeans_filter_median(uint8_t *src,
+ uint8_t *dst,
+ int w,
+ int h,
+ int border,
+ int size)
+{
+ // Median filter
+ int bw = w + 2 * border;
+ int offset_min = -((size - 1) /2);
+ int offset_max = (size + 1) /2;
+ int index;
+ uint8_t pixels[size * size];
+ for (int y = 0; y < h; y++)
+ {
+ for (int x = 0; x < w; x++)
+ {
+ index = 0;
+ for (int k = offset_min; k < offset_max; k++)
+ {
+ for (int j = offset_min; j < offset_max; j++)
+ {
+ pixels[index] = *(src + bw*(y+j) + (x+k));
+ index++;
+ }
+ }
+ *(dst + bw*y + x) = nlmeans_filter_median_opt(pixels, size);
+ }
+ }
+
+}
+
+static void nlmeans_filter_edgeboost(uint8_t *src,
+ uint8_t *dst,
+ int w,
+ int h,
+ int border)
+{
+ int bw = w + 2 * border;
+ int bh = h + 2 * border;
+
+ // Custom kernel
+ int kernel_size = 3;
+ int kernel[3][3] = {{-31, 0, 31},
+ {-44, 0, 44},
+ {-31, 0, 31}};
+ double kernel_coef = 1.0 / 126.42;
+
+ // Detect edges
+ int offset_min = -((kernel_size - 1) /2);
+ int offset_max = (kernel_size + 1) /2;
+ uint16_t pixel1;
+ uint16_t pixel2;
+ uint8_t *mask_mem = calloc(bw * bh, sizeof(uint8_t));
+ uint8_t *mask = mask_mem + border + bw * border;
+ for (int y = 0; y < h; y++)
+ {
+ for (int x = 0; x < w; x++)
+ {
+ pixel1 = 0;
+ pixel2 = 0;
+ for (int k = offset_min; k < offset_max; k++)
+ {
+ for (int j = offset_min; j < offset_max; j++)
+ {
+ pixel1 += kernel[j+1][k+1] * *(src + bw*(y+j) + (x+k));
+ pixel2 += kernel[k+1][j+1] * *(src + bw*(y+j) + (x+k));
+ }
+ }
+ pixel1 = pixel1 > 0 ? pixel1 : -pixel1;
+ pixel2 = pixel2 > 0 ? pixel2 : -pixel2;
+ pixel1 = (uint16_t)(((double)pixel1 * kernel_coef) + 128);
+ pixel2 = (uint16_t)(((double)pixel2 * kernel_coef) + 128);
+ *(mask + bw*y + x) = (uint8_t)(pixel1 + pixel2);
+ if (*(mask + bw*y + x) > 160)
+ {
+ *(mask + bw*y + x) = 235;
+ }
+ else if (*(mask + bw*y + x) > 16)
+ {
+ *(mask + bw*y + x) = 128;
+ }
+ else
+ {
+ *(mask + bw*y + x) = 16;
+ }
+ }
+ }
+
+ // Post-process and output
+ int pixels;
+ for (int y = 0; y < h; y++)
+ {
+ for (int x = 0; x < w; x++)
+ {
+ if (*(mask + bw*y + x) > 16)
+ {
+ // Count nearby edge pixels
+ pixels = 0;
+ for (int k = offset_min; k < offset_max; k++)
+ {
+ for (int j = offset_min; j < offset_max; j++)
+ {
+ if (*(mask + bw*(y+j) + (x+k)) > 16)
+ {
+ pixels++;
+ }
+ }
+ }
+ // Remove false positive
+ if (pixels < 3)
+ {
+ *(mask + bw*y + x) = 16;
+ }
+ // Filter output
+ if (*(mask + bw*y + x) > 16)
+ {
+ if (*(mask + bw*y + x) == 235)
+ {
+ *(dst + bw*y + x) = (3 * *(src + bw*y + x) + 1 * *(dst + bw*y + x)) /4;
+ }
+ else
+ {
+ *(dst + bw*y + x) = (2 * *(src + bw*y + x) + 3 * *(dst + bw*y + x)) /5;
+ }
+ //*(dst + bw*y + x) = *(mask + bw*y + x); // Overlay mask
+ }
+ }
+ //*(dst + bw*y + x) = *(mask + bw*y + x); // Full mask
+ }
+ }
+
+ free(mask_mem);
+}
+
+static void nlmeans_prefilter(BorderedPlane *src,
+ int filter_type)
+{
+ hb_lock(src->mutex);
+ if (src->prefiltered)
+ {
+ hb_unlock(src->mutex);
+ return;
+ }
+
+ if (filter_type & NLMEANS_PREFILTER_MODE_MEAN3X3 ||
+ filter_type & NLMEANS_PREFILTER_MODE_MEAN5X5 ||
+ filter_type & NLMEANS_PREFILTER_MODE_MEDIAN3X3 ||
+ filter_type & NLMEANS_PREFILTER_MODE_MEDIAN5X5)
+ {
+
+ // Source image
+ uint8_t *mem = src->mem;
+ uint8_t *image = src->image;
+ int border = src->border;
+ int w = src->w;
+ int h = src->h;
+ int bw = w + 2 * border;
+ int bh = h + 2 * border;
+
+ // Duplicate plane
+ uint8_t *mem_pre = malloc(bw * bh * sizeof(uint8_t));
+ uint8_t *image_pre = mem_pre + border + bw * border;
+ for (int y = 0; y < h; y++)
+ {
+ memcpy(mem_pre + y * bw, mem + y * bw, bw);
+ }
+
+ // Filter plane; should already have at least 2px extra border on each side
+ if (filter_type & NLMEANS_PREFILTER_MODE_MEDIAN5X5)
+ {
+ // Median 5x5
+ nlmeans_filter_median(image, image_pre, w, h, border, 5);
+ }
+ else if (filter_type & NLMEANS_PREFILTER_MODE_MEDIAN3X3)
+ {
+ // Median 3x3
+ nlmeans_filter_median(image, image_pre, w, h, border, 3);
+ }
+ else if (filter_type & NLMEANS_PREFILTER_MODE_MEAN5X5)
+ {
+ // Mean 5x5
+ nlmeans_filter_mean(image, image_pre, w, h, border, 5);
+ }
+ else if (filter_type & NLMEANS_PREFILTER_MODE_MEAN3X3)
+ {
+ // Mean 3x3
+ nlmeans_filter_mean(image, image_pre, w, h, border, 3);
+ }
+
+ // Restore edges
+ if (filter_type & NLMEANS_PREFILTER_MODE_EDGEBOOST)
+ {
+ nlmeans_filter_edgeboost(image, image_pre, w, h, border);
+ }
+
+ // Blend source and destination for lesser effect
+ int wet = 1;
+ int dry = 0;
+ if (filter_type & NLMEANS_PREFILTER_MODE_REDUCE50 &&
+ filter_type & NLMEANS_PREFILTER_MODE_REDUCE25)
+ {
+ wet = 1;
+ dry = 3;
+ }
+ else if (filter_type & NLMEANS_PREFILTER_MODE_REDUCE50)
+ {
+ wet = 1;
+ dry = 1;
+ }
+ else if (filter_type & NLMEANS_PREFILTER_MODE_REDUCE25)
+ {
+ wet = 3;
+ dry = 1;
+ }
+ if (dry > 0)
+ {
+ for (int y = 0; y < bh; y++)
+ {
+ for (int x = 0; x < bw; x++)
+ {
+ *(mem_pre + bw*y + x) = (uint8_t)((wet * *(mem_pre + bw*y + x) + dry * *(mem + bw*y + x)) / (wet + dry));
+ }
+ }
+ }
+
+ // Assign result
+ src->mem_pre = mem_pre;
+ src->image_pre = image_pre;
+
+ // Recreate borders
+ nlmeans_border(mem_pre, w, h, border);
+
+ }
+ src->prefiltered = 1;
+ hb_unlock(src->mutex);
+}
+
+static void nlmeans_plane(Frame *frame,
+ int prefilter,
+ int plane,
+ int nframes,
+ uint8_t *dst,
+ int w,
+ int s,
+ int h,
+ double h_param,
+ double origin_tune,
+ int n,
+ int r)
+{
+ int n_half = (n-1) /2;
+ int r_half = (r-1) /2;
+
+ // Source image
+ uint8_t *src = frame[0].plane[plane].image;
+ uint8_t *src_pre = frame[0].plane[plane].image_pre;
+ int border = frame[0].plane[plane].border;
+ int src_w = frame[0].plane[plane].w + 2 * border;
+
+ // Allocate temporary pixel sums
+ struct PixelSum *tmp_data = calloc(w * h, sizeof(struct PixelSum));
+
+ // Allocate integral image
+ int integral_stride = w + 2 * 16;
+ uint32_t *integral_mem = malloc(integral_stride * (h+1) * sizeof(uint32_t));
+ uint32_t *integral = integral_mem + integral_stride + 16;
+
+ // Precompute exponential table
+ float exptable[NLMEANS_EXPSIZE];
+ const float weight_factor = 1.0/n/n / (h_param * h_param);
+ const float min_weight_in_table = 0.0005;
+ const float stretch = NLMEANS_EXPSIZE / (-log(min_weight_in_table));
+ const float weight_fact_table = weight_factor * stretch;
+ const int diff_max = NLMEANS_EXPSIZE / weight_fact_table;
+ for (int i = 0; i < NLMEANS_EXPSIZE; i++)
+ {
+ exptable[i] = exp(-i/stretch);
+ }
+ exptable[NLMEANS_EXPSIZE-1] = 0;
+
+ // Iterate through available frames
+ for (int f = 0; f < nframes; f++)
+ {
+ nlmeans_prefilter(&frame[f].plane[plane], prefilter);
+
+ // Compare image
+ uint8_t *compare = frame[f].plane[plane].image;
+ uint8_t *compare_pre = frame[f].plane[plane].image_pre;
+ int border = frame[f].plane[plane].border;
+ int compare_w = frame[f].plane[plane].w + 2 * border;
+
+ // Iterate through all displacements
+ for (int dy = -r_half; dy <= r_half; dy++)
+ {
+ for (int dx = -r_half; dx <= r_half; dx++)
+ {
+
+ // Apply special weight tuning to origin patch
+ if (dx == 0 && dy == 0 && f == 0)
+ {
+ // TODO: Parallelize this
+ for (int y = n_half; y < h-n + n_half; y++)
+ {
+ for (int x = n_half; x < w-n + n_half; x++)
+ {
+ tmp_data[y*w + x].weight_sum += origin_tune;
+ tmp_data[y*w + x].pixel_sum += origin_tune * src[y*src_w + x];
+ }
+ }
+ continue;
+ }
+
+ // Build integral
+ memset(integral-1 - integral_stride, 0, (w+1) * sizeof(uint32_t));
+ for (int y = 0; y < h; y++)
+ {
+ const uint8_t *p1 = src_pre + y*src_w;
+ const uint8_t *p2 = compare_pre + (y+dy)*compare_w + dx;
+ uint32_t *out = integral + (y*integral_stride) - 1;
+
+ *out++ = 0;
+
+ for (int x = 0; x < w; x++)
+ {
+ int diff = *p1++ - *p2++;
+ *out = *(out-1) + diff * diff;
+ out++;
+ }
+
+ if (y > 0)
+ {
+ out = integral + y*integral_stride;
+
+ for (int x = 0; x < w; x++)
+ {
+ *out += *(out - integral_stride);
+ out++;
+ }
+ }
+ }
+
+ // Average displacement
+ // TODO: Parallelize this
+ for (int y = 0; y <= h-n; y++)
+ {
+ const uint32_t *integral_ptr1 = integral + (y -1)*integral_stride - 1;
+ const uint32_t *integral_ptr2 = integral + (y+n-1)*integral_stride - 1;
+
+ for (int x = 0; x <= w-n; x++)
+ {
+ int xc = x + n_half;
+ int yc = y + n_half;
+
+ // Difference between patches
+ int diff = (uint32_t)(integral_ptr2[n] - integral_ptr2[0] - integral_ptr1[n] + integral_ptr1[0]);
+
+ // Sum pixel with weight
+ if (diff < diff_max)
+ {
+ int diffidx = diff * weight_fact_table;
+
+ //float weight = exp(-diff*weightFact);
+ float weight = exptable[diffidx];
+
+ tmp_data[yc*w + xc].weight_sum += weight;
+ tmp_data[yc*w + xc].pixel_sum += weight * compare[(yc+dy)*compare_w + xc + dx];
+ }
+
+ integral_ptr1++;
+ integral_ptr2++;
+ }
+ }
+ }
+ }
+ }
+
+ // Copy edges
+ for (int y = 0; y < h; y++)
+ {
+ for (int x = 0; x < n_half; x++)
+ {
+ *(dst + y * s + x) = *(src + y * src_w - x - 1);
+ *(dst + y * s - x + (w - 1)) = *(src + y * src_w + x + w);
+ }
+ }
+ for (int y = 0; y < n_half; y++)
+ {
+ memcpy(dst + y*s, src - (y+1)*src_w, w);
+ memcpy(dst + (h-y-1)*s, src + (y+h)*src_w, w);
+ }
+
+ // Copy main image
+ uint8_t result;
+ for (int y = n_half; y < h-n_half; y++)
+ {
+ for (int x = n_half; x < w-n_half; x++)
+ {
+ result = (uint8_t)(tmp_data[y*w + x].pixel_sum / tmp_data[y*w + x].weight_sum);
+ *(dst + y*s + x) = result ? result : *(src + y*src_w + x);
+ }
+ }
+
+ free(tmp_data);
+ free(integral_mem);
+
+}
+
+static int nlmeans_init(hb_filter_object_t *filter,
+ hb_filter_init_t *init)
+{
+ filter->private_data = calloc(sizeof(struct hb_filter_private_s), 1);
+ hb_filter_private_t *pv = filter->private_data;
+
+ // Mark parameters unset
+ for (int c = 0; c < 3; c++)
+ {
+ pv->strength[c] = -1;
+ pv->origin_tune[c] = -1;
+ pv->patch_size[c] = -1;
+ pv->range[c] = -1;
+ pv->nframes[c] = -1;
+ pv->prefilter[c] = -1;
+ }
+
+ // Read user parameters
+ if (filter->settings != NULL)
+ {
+ sscanf(filter->settings, "%lf:%lf:%d:%d:%d:%d:%lf:%lf:%d:%d:%d:%d:%lf:%lf:%d:%d:%d:%d",
+ &pv->strength[0], &pv->origin_tune[0], &pv->patch_size[0], &pv->range[0], &pv->nframes[0], &pv->prefilter[0],
+ &pv->strength[1], &pv->origin_tune[1], &pv->patch_size[1], &pv->range[1], &pv->nframes[1], &pv->prefilter[1],
+ &pv->strength[2], &pv->origin_tune[2], &pv->patch_size[2], &pv->range[2], &pv->nframes[2], &pv->prefilter[2]);
+ }
+
+ // Cascade values
+ // Cr not set; inherit Cb. Cb not set; inherit Y. Y not set; defaults.
+ for (int c = 1; c < 3; c++)
+ {
+ if (pv->strength[c] == -1) { pv->strength[c] = pv->strength[c-1]; }
+ if (pv->origin_tune[c] == -1) { pv->origin_tune[c] = pv->origin_tune[c-1]; }
+ if (pv->patch_size[c] == -1) { pv->patch_size[c] = pv->patch_size[c-1]; }
+ if (pv->range[c] == -1) { pv->range[c] = pv->range[c-1]; }
+ if (pv->nframes[c] == -1) { pv->nframes[c] = pv->nframes[c-1]; }
+ if (pv->prefilter[c] == -1) { pv->prefilter[c] = pv->prefilter[c-1]; }
+ }
+
+ for (int c = 0; c < 3; c++)
+ {
+ // Replace unset values with defaults
+ if (pv->strength[c] == -1) { pv->strength[c] = c ? NLMEANS_STRENGTH_LUMA_DEFAULT : NLMEANS_STRENGTH_CHROMA_DEFAULT; }
+ if (pv->origin_tune[c] == -1) { pv->origin_tune[c] = c ? NLMEANS_ORIGIN_TUNE_LUMA_DEFAULT : NLMEANS_ORIGIN_TUNE_CHROMA_DEFAULT; }
+ if (pv->patch_size[c] == -1) { pv->patch_size[c] = c ? NLMEANS_PATCH_SIZE_LUMA_DEFAULT : NLMEANS_PATCH_SIZE_CHROMA_DEFAULT; }
+ if (pv->range[c] == -1) { pv->range[c] = c ? NLMEANS_RANGE_LUMA_DEFAULT : NLMEANS_RANGE_CHROMA_DEFAULT; }
+ if (pv->nframes[c] == -1) { pv->nframes[c] = c ? NLMEANS_FRAMES_LUMA_DEFAULT : NLMEANS_FRAMES_CHROMA_DEFAULT; }
+ if (pv->prefilter[c] == -1) { pv->prefilter[c] = c ? NLMEANS_PREFILTER_LUMA_DEFAULT : NLMEANS_PREFILTER_CHROMA_DEFAULT; }
+
+ // Sanitize
+ if (pv->strength[c] < 0) { pv->strength[c] = 0; }
+ if (pv->origin_tune[c] < 0.01) { pv->origin_tune[c] = 0.01; } // avoid black artifacts
+ if (pv->origin_tune[c] > 1) { pv->origin_tune[c] = 1; }
+ if (pv->patch_size[c] % 2 == 0) { pv->patch_size[c]--; }
+ if (pv->patch_size[c] < 1) { pv->patch_size[c] = 1; }
+ if (pv->range[c] % 2 == 0) { pv->range[c]--; }
+ if (pv->range[c] < 1) { pv->range[c] = 1; }
+ if (pv->nframes[c] < 1) { pv->nframes[c] = 1; }
+ if (pv->nframes[c] > NLMEANS_FRAMES_MAX) { pv->nframes[c] = NLMEANS_FRAMES_MAX; }
+ if (pv->prefilter[c] < 0) { pv->prefilter[c] = 0; }
+
+ if (pv->max_frames < pv->nframes[c]) pv->max_frames = pv->nframes[c];
+ }
+
+ pv->thread_count = hb_get_cpu_count();
+ pv->frame = calloc(pv->thread_count + pv->max_frames, sizeof(Frame));
+ for (int ii = 0; ii < pv->thread_count + pv->max_frames; ii++)
+ {
+ for (int c = 0; c < 3; c++)
+ {
+ pv->frame[ii].plane[c].mutex = hb_lock_init();
+ }
+ }
+
+ pv->thread_data = malloc(pv->thread_count * sizeof(nlmeans_thread_arg_t*));
+ if (taskset_init(&pv->taskset, pv->thread_count,
+ sizeof(nlmeans_thread_arg_t)) == 0)
+ {
+ hb_error("nlmeans could not initialize taskset");
+ goto fail;
+ }
+
+ for (int ii = 0; ii < pv->thread_count; ii++)
+ {
+ pv->thread_data[ii] = taskset_thread_args(&pv->taskset, ii);
+ if (pv->thread_data[ii] == NULL)
+ {
+ hb_error("nlmeans could not create thread args");
+ goto fail;
+ }
+ pv->thread_data[ii]->pv = pv;
+ pv->thread_data[ii]->segment = ii;
+ if (taskset_thread_spawn(&pv->taskset, ii, "nlmeans_filter",
+ nlmeans_filter_thread, HB_NORMAL_PRIORITY) == 0)
+ {
+ hb_error("nlmeans could not spawn thread");
+ goto fail;
+ }
+ }
+
+ return 0;
+
+fail:
+ taskset_fini(&pv->taskset);
+ free(pv->thread_data);
+ free(pv);
+ return -1;
+}
+
+static void nlmeans_close(hb_filter_object_t *filter)
+{
+ hb_filter_private_t *pv = filter->private_data;
+
+ if (pv == NULL)
+ {
+ return;
+ }
+
+ taskset_fini(&pv->taskset);
+ for (int c = 0; c < 3; c++)
+ {
+ for (int f = 0; f < pv->nframes[c]; f++)
+ {
+ if (pv->frame[f].plane[c].mem_pre != NULL &&
+ pv->frame[f].plane[c].mem_pre != pv->frame[f].plane[c].mem)
+ {
+ free(pv->frame[f].plane[c].mem_pre);
+ pv->frame[f].plane[c].mem_pre = NULL;
+ }
+ if (pv->frame[f].plane[c].mem != NULL)
+ {
+ free(pv->frame[f].plane[c].mem);
+ pv->frame[f].plane[c].mem = NULL;
+ }
+ }
+ }
+
+ for (int ii = 0; ii < pv->thread_count + pv->max_frames; ii++)
+ {
+ for (int c = 0; c < 3; c++)
+ {
+ hb_lock_close(&pv->frame[ii].plane[c].mutex);
+ }
+ }
+
+ free(pv->frame);
+ free(pv->thread_data);
+ free(pv);
+ filter->private_data = NULL;
+}
+
+static void nlmeans_filter_thread(void *thread_args_v)
+{
+ nlmeans_thread_arg_t *thread_data = thread_args_v;
+ hb_filter_private_t *pv = thread_data->pv;
+ int segment = thread_data->segment;
+
+ hb_log("NLMeans Denoise thread started for segment %d", segment);
+
+ while (1)
+ {
+ // Wait until there is work to do.
+ taskset_thread_wait4start(&pv->taskset, segment);
+
+ if (taskset_thread_stop(&pv->taskset, segment))
+ {
+ break;
+ }
+
+ Frame *frame = &pv->frame[segment];
+ hb_buffer_t *buf;
+ buf = hb_frame_buffer_init(frame->fmt, frame->width, frame->height);
+
+ for (int c = 0; c < 3; c++)
+ {
+ if (pv->strength[c] == 0)
+ {
+ nlmeans_deborder(&frame->plane[c], buf->plane[c].data,
+ buf->plane[c].width, buf->plane[c].stride,
+ buf->plane[c].height);
+ continue;
+ }
+ if (pv->prefilter[c] & NLMEANS_PREFILTER_MODE_PASSTHRU)
+ {
+ nlmeans_prefilter(&pv->frame->plane[c], pv->prefilter[c]);
+ nlmeans_deborder(&frame->plane[c], buf->plane[c].data,
+ buf->plane[c].width, buf->plane[c].stride,
+ buf->plane[c].height);
+ continue;
+ }
+
+ // Process current plane
+ nlmeans_plane(frame,
+ pv->prefilter[c],
+ c,
+ pv->nframes[c],
+ buf->plane[c].data,
+ buf->plane[c].width,
+ buf->plane[c].stride,
+ buf->plane[c].height,
+ pv->strength[c],
+ pv->origin_tune[c],
+ pv->patch_size[c],
+ pv->range[c]);
+ }
+ buf->s = pv->frame[segment].s;
+ thread_data->out = buf;
+
+ // Finished this segment, notify.
+ taskset_thread_complete(&pv->taskset, segment);
+ }
+ taskset_thread_complete(&pv->taskset, segment);
+}
+
+static void nlmeans_add_frame(hb_filter_private_t *pv, hb_buffer_t *buf)
+{
+ for (int c = 0; c < 3; c++)
+ {
+ // Extend copy of plane with extra border and place in buffer
+ int border = ((pv->range[c] + 2) / 2 + 15) / 16 * 16;
+ nlmeans_alloc(buf->plane[c].data,
+ buf->plane[c].width,
+ buf->plane[c].stride,
+ buf->plane[c].height,
+ &pv->frame[pv->next_frame].plane[c],
+ border);
+ pv->frame[pv->next_frame].s = buf->s;
+ pv->frame[pv->next_frame].width = buf->f.width;
+ pv->frame[pv->next_frame].height = buf->f.height;
+ pv->frame[pv->next_frame].fmt = buf->f.fmt;
+ }
+ pv->next_frame++;
+}
+
+static hb_buffer_t * nlmeans_filter(hb_filter_private_t *pv)
+{
+ if (pv->next_frame < pv->max_frames + pv->thread_count)
+ return NULL;
+
+ taskset_cycle(&pv->taskset);
+
+ // Free buffers that are not needed for next taskset cycle
+ for (int c = 0; c < 3; c++)
+ {
+ for (int t = 0; t < pv->thread_count; t++)
+ {
+ // Release last frame in buffer
+ if (pv->frame[t].plane[c].mem_pre != NULL &&
+ pv->frame[t].plane[c].mem_pre != pv->frame[t].plane[c].mem)
+ {
+ free(pv->frame[t].plane[c].mem_pre);
+ pv->frame[t].plane[c].mem_pre = NULL;
+ }
+ if (pv->frame[t].plane[c].mem != NULL)
+ {
+ free(pv->frame[t].plane[c].mem);
+ pv->frame[t].plane[c].mem = NULL;
+ }
+ }
+ }
+ // Shift frames in buffer down
+ for (int f = 0; f < pv->max_frames; f++)
+ {
+ // Don't move the mutex!
+ Frame frame = pv->frame[f];
+ pv->frame[f] = pv->frame[f+pv->thread_count];
+ for (int c = 0; c < 3; c++)
+ {
+ pv->frame[f].plane[c].mutex = frame.plane[c].mutex;
+ pv->frame[f+pv->thread_count].plane[c].mem_pre = NULL;
+ pv->frame[f+pv->thread_count].plane[c].mem = NULL;
+ }
+ }
+ pv->next_frame -= pv->thread_count;
+
+ // Collect results from taskset
+ hb_buffer_t *last = NULL, *out = NULL;
+ for (int t = 0; t < pv->thread_count; t++)
+ {
+ if (out == NULL)
+ {
+ out = last = pv->thread_data[t]->out;
+ }
+ else
+ {
+ last->next = pv->thread_data[t]->out;
+ last = pv->thread_data[t]->out;
+ }
+ }
+ return out;
+}
+
+static hb_buffer_t * nlmeans_filter_flush(hb_filter_private_t *pv)
+{
+ hb_buffer_t *out = NULL, *last = NULL;
+
+ for (int f = 0; f < pv->next_frame; f++)
+ {
+ Frame *frame = &pv->frame[f];
+ hb_buffer_t *buf;
+ buf = hb_frame_buffer_init(frame->fmt, frame->width, frame->height);
+
+ for (int c = 0; c < 3; c++)
+ {
+ if (pv->strength[c] == 0)
+ {
+ nlmeans_deborder(&frame->plane[c], buf->plane[c].data,
+ buf->plane[c].width, buf->plane[c].stride,
+ buf->plane[c].height);
+ continue;
+ }
+ if (pv->prefilter[c] & NLMEANS_PREFILTER_MODE_PASSTHRU)
+ {
+ nlmeans_prefilter(&pv->frame[f].plane[c], pv->prefilter[c]);
+ nlmeans_deborder(&frame->plane[c], buf->plane[c].data,
+ buf->plane[c].width, buf->plane[c].stride,
+ buf->plane[c].height);
+ continue;
+ }
+
+ int nframes = pv->next_frame - f;
+ if (pv->nframes[c] < nframes)
+ nframes = pv->nframes[c];
+ // Process current plane
+ nlmeans_plane(frame,
+ pv->prefilter[c],
+ c,
+ nframes,
+ buf->plane[c].data,
+ buf->plane[c].width,
+ buf->plane[c].stride,
+ buf->plane[c].height,
+ pv->strength[c],
+ pv->origin_tune[c],
+ pv->patch_size[c],
+ pv->range[c]);
+ }
+ buf->s = frame->s;
+ if (out == NULL)
+ {
+ out = last = buf;
+ }
+ else
+ {
+ last->next = buf;
+ last = buf;
+ }
+ }
+ return out;
+}
+
+static int nlmeans_work(hb_filter_object_t *filter,
+ hb_buffer_t **buf_in,
+ hb_buffer_t **buf_out )
+{
+ hb_filter_private_t *pv = filter->private_data;
+ hb_buffer_t *in = *buf_in;
+
+ if (in->size <= 0)
+ {
+ hb_buffer_t *last;
+ // Flush buffered frames
+ last = *buf_out = nlmeans_filter_flush(pv);
+
+ // And terminate the buffer list with a null buffer
+ if (last != NULL)
+ {
+ while (last->next != NULL)
+ last = last->next;
+ last->next = in;
+ }
+ else
+ {
+ *buf_out = in;
+ }
+ *buf_in = NULL;
+ return HB_FILTER_DONE;
+ }
+
+ nlmeans_add_frame(pv, in);
+ *buf_out = nlmeans_filter(pv);
+
+ return HB_FILTER_OK;
+}

HandBrake-0.10.0.tar.bz2/libhb/oclnv12toyuv.c Added

@@ -0,0 +1,326 @@
+/* oclnv12toyuv.c
+
+ Copyright (c) 2003-2014 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+
+ Authors: Peng Gao <peng@multicorewareinc.com> <http://www.multicorewareinc.com/>
+ Li Cao <li@multicorewareinc.com> <http://www.multicorewareinc.com/>
+ */
+
+#ifdef USE_HWD
+
+#include "opencl.h"
+#include "vadxva2.h"
+#include "oclnv12toyuv.h"
+
+/**
+ * It creates are opencl bufs w is input frame width, h is input frame height
+*/
+static int hb_nv12toyuv_create_cl_buf( KernelEnv *kenv, int w, int h, hb_va_dxva2_t *dxva2 );
+ 
+/**
+ * It creates are opencl kernel. kernel name is nv12toyuv
+*/
+static int hb_nv12toyuv_create_cl_kernel( KernelEnv *kenv, hb_va_dxva2_t *dxva2 );
+ 
+/**
+ * It set opencl arg, input data,output data, input width, output height
+*/
+static int hb_nv12toyuv_setkernelarg( KernelEnv *kenv, int w, int h, hb_va_dxva2_t *dxva2 );
+ 
+/**
+ * It initialize nv12 to yuv kernel.
+*/
+static int hb_init_nv12toyuv_ocl( KernelEnv *kenv, int w, int h, hb_va_dxva2_t *dxva2 );
+
+/**
+ * Run nv12 to yuv kernel.
+ */
+static int hb_nv12toyuv( void **userdata, KernelEnv *kenv );
+
+/**
+ * register nv12 to yuv kernel.
+ */
+static int hb_nv12toyuv_reg_kernel( void );
+
+/**
+ * It creates are opencl bufs w is input frame width, h is input frame height
+ */
+static int hb_nv12toyuv_create_cl_buf( KernelEnv *kenv, int w, int h, hb_va_dxva2_t *dxva2 )
+{
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_nv12toyuv_create_cl_kernel: OpenCL support not available");
+ return 1;
+ }
+
+ cl_int status = CL_SUCCESS;
+ int in_bytes = w*h*3/2;
+ HB_OCL_BUF_CREATE(hb_ocl, dxva2->cl_mem_nv12, CL_MEM_READ_ONLY|CL_MEM_ALLOC_HOST_PTR, in_bytes);
+ HB_OCL_BUF_CREATE(hb_ocl, dxva2->cl_mem_yuv, CL_MEM_READ_WRITE|CL_MEM_ALLOC_HOST_PTR, in_bytes);
+ return 0;
+}
+
+/**
+ * It creates are opencl kernel. kernel name is nv12toyuv
+ */
+static int hb_nv12toyuv_create_cl_kernel( KernelEnv *kenv, hb_va_dxva2_t *dxva2 )
+{
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_nv12toyuv_create_cl_kernel: OpenCL support not available");
+ return 1;
+ }
+
+ int ret;
+ dxva2->nv12toyuv = hb_ocl->clCreateKernel(kenv->program, "nv12toyuv", &ret);
+ return ret;
+}
+
+/**
+ * It set opencl arg, input data,output data, input width, output height
+ */
+static int hb_nv12toyuv_setkernelarg( KernelEnv *kenv, int w, int h, hb_va_dxva2_t *dxva2 )
+{
+ int arg = 0, status;
+ kenv->kernel = dxva2->nv12toyuv;
+
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_nv12toyuv_setkernelarg: OpenCL support not available");
+ return 1;
+ }
+
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, kenv->kernel, arg++, sizeof(cl_mem), &dxva2->cl_mem_nv12);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, kenv->kernel, arg++, sizeof(cl_mem), &dxva2->cl_mem_yuv);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, kenv->kernel, arg++, sizeof(int), &w);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, kenv->kernel, arg++, sizeof(int), &h);
+ return 0;
+}
+
+/**
+ * It initialize nv12 to yuv kernel.
+ */
+static int hb_init_nv12toyuv_ocl( KernelEnv *kenv, int w, int h, hb_va_dxva2_t *dxva2 )
+{
+ if( !dxva2->nv12toyuv )
+ {
+ if( hb_nv12toyuv_create_cl_buf( kenv, w, h, dxva2 ) )
+ {
+ hb_log( "OpenCL: nv12toyuv_create_cl_buf fail" );
+ return -1;
+ }
+ if (!dxva2->nv12toyuv_tmp_in) 
+		{
+ dxva2->nv12toyuv_tmp_in = malloc (w*h*3/2);
+		}
+
+ if (!dxva2->nv12toyuv_tmp_out) 
+		{
+ dxva2->nv12toyuv_tmp_out = malloc (w*h*3/2);
+		}
+
+ hb_nv12toyuv_create_cl_kernel( kenv, dxva2 );
+ }
+ return 0;
+}
+
+/**
+ * copy_plane
+ * @param dst -
+ * @param src -
+ * @param dstride -
+ * @param sstride -
+ * @param h -
+ */
+static uint8_t *copy_plane( uint8_t *dst, uint8_t* src, int dstride, int sstride,
+ int h )
+{
+ if ( dstride == sstride )
+ {
+ memcpy( dst, src, dstride * h );
+ return dst + dstride * h;
+ }
+
+ int lbytes = dstride <= sstride? dstride : sstride;
+ while ( --h >= 0 )
+ {
+ memcpy( dst, src, lbytes );
+ src += sstride;
+ dst += dstride;
+ }
+
+ return dst;
+}
+
+/**
+ * Run nv12 to yuv kernel.
+ */
+static int hb_nv12toyuv( void **userdata, KernelEnv *kenv )
+{
+ int status;
+ int w = (int)userdata[0];
+ int h = (int)userdata[1];
+ uint8_t *bufi1 = userdata[2];
+ int *crop = userdata[3];
+ hb_va_dxva2_t *dxva2 = userdata[4];
+
+ uint8_t *bufi2 = userdata[5];
+ int p = (int)userdata[6];
+ int decomb = (int)userdata[7];
+ int detelecine = (int)userdata[8];
+ int i;
+ if( hb_init_nv12toyuv_ocl( kenv, w, h, dxva2 ) )
+	{
+ return -1;
+	}
+
+ if( hb_nv12toyuv_setkernelarg( kenv, w, h, dxva2 ) )
+	{
+ return -1;
+	}
+
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_nv12toyuv: OpenCL support not available");
+ return -1;
+ }
+
+ int in_bytes = w*h*3/2;
+ if( kenv->isAMD )
+ {
+ void *data = hb_ocl->clEnqueueMapBuffer(kenv->command_queue,
+ dxva2->cl_mem_nv12,
+ CL_MAP_WRITE_INVALIDATE_REGION,
+ CL_TRUE, 0, in_bytes, 0, NULL, NULL, NULL);
+
+ for ( i = 0; i < dxva2->height; i++ )
+ {
+ memcpy( data + i * dxva2->width, bufi1 + i * p, dxva2->width );
+ if ( i < dxva2->height >> 1 )
+			{
+ memcpy( data + ( dxva2->width * dxva2->height ) + i * dxva2->width, bufi2 + i * p, dxva2->width );
+			}		
+		}
+ hb_ocl->clEnqueueUnmapMemObject(kenv->command_queue, dxva2->cl_mem_nv12,
+ data, 0, NULL, NULL);
+ }
+ else
+ {
+ uint8_t *tmp = (uint8_t*)malloc( dxva2->width * dxva2->height * 3 / 2 );
+ for( i = 0; i < dxva2->height; i++ )
+ {
+ memcpy( tmp + i * dxva2->width, bufi1 + i * p, dxva2->width );
+ if( i < dxva2->height >> 1 )
+			{
+ memcpy( tmp + (dxva2->width * dxva2->height) + i * dxva2->width, bufi2 + i * p, dxva2->width );
+			}
+ }
+ HB_OCL_CHECK(hb_ocl->clEnqueueWriteBuffer, kenv->command_queue,
+ dxva2->cl_mem_nv12, CL_TRUE, 0, in_bytes, tmp, 0, NULL, NULL);
+ free( tmp );
+ }
+
+ size_t gdim[2] = {w>>1, h>>1};
+ HB_OCL_CHECK(hb_ocl->clEnqueueNDRangeKernel, kenv->command_queue,
+ kenv->kernel, 2, NULL, gdim, NULL, 0, NULL, NULL );
+
+ if( (crop[0] || crop[1] || crop[2] || crop[3]) && (decomb == 0) && (detelecine == 0) )
+ {
+ AVPicture pic_in;
+ AVPicture pic_crop;
+ hb_ocl->clEnqueueReadBuffer(kenv->command_queue, dxva2->cl_mem_yuv,
+ CL_TRUE, 0, in_bytes, dxva2->nv12toyuv_tmp_out,
+ 0, NULL, NULL);
+ hb_buffer_t *in = hb_video_buffer_init( w, h );
+
+ int wmp = in->plane[0].stride;
+ int hmp = in->plane[0].height;
+ copy_plane( in->plane[0].data, dxva2->nv12toyuv_tmp_out, wmp, w, hmp );
+ wmp = in->plane[1].stride;
+ hmp = in->plane[1].height;
+ copy_plane( in->plane[1].data, dxva2->nv12toyuv_tmp_out + w * h, wmp, w>>1, hmp );
+ wmp = in->plane[2].stride;
+ hmp = in->plane[2].height;
+ copy_plane( in->plane[2].data, dxva2->nv12toyuv_tmp_out + w * h +( ( w * h )>>2 ), wmp, w>>1, hmp );
+
+ hb_avpicture_fill( &pic_in, in );
+ av_picture_crop( &pic_crop, &pic_in, in->f.fmt, crop[0], crop[2] );
+ int i, ww = w - ( crop[2] + crop[3] ), hh = h - ( crop[0] + crop[1] );
+ for( i = 0; i< hh >> 1; i++ )
+ {
+ memcpy( dxva2->nv12toyuv_tmp_in + ( ( i << 1 ) + 0 ) * ww, pic_crop.data[0]+ ( ( i << 1 ) + 0 ) * pic_crop.linesize[0], ww );
+ memcpy( dxva2->nv12toyuv_tmp_in + ( ( i << 1 ) + 1 ) * ww, pic_crop.data[0]+ ( ( i << 1 ) + 1 ) * pic_crop.linesize[0], ww );
+ memcpy( dxva2->nv12toyuv_tmp_in + ( ww * hh ) + i * ( ww >> 1 ), pic_crop.data[1] + i * pic_crop.linesize[1], ww >> 1 );
+ memcpy( dxva2->nv12toyuv_tmp_in + ( ww * hh ) + ( ( ww * hh )>>2 ) + i * ( ww >> 1 ), pic_crop.data[2] + i * pic_crop.linesize[2], ww >> 1 );
+ }
+
+ if( kenv->isAMD )
+ {
+ void *data = hb_ocl->clEnqueueMapBuffer(kenv->command_queue,
+ dxva2->cl_mem_yuv,
+ CL_MAP_WRITE_INVALIDATE_REGION,
+ CL_TRUE, 0, ww * hh * 3 / 2, 0,
+ NULL, NULL, NULL);
+ memcpy( data, dxva2->nv12toyuv_tmp_in, ww * hh * 3 / 2 );
+ hb_ocl->clEnqueueUnmapMemObject(kenv->command_queue,
+ dxva2->cl_mem_yuv, data, 0, NULL, NULL);
+ }
+ else
+ {
+ HB_OCL_CHECK(hb_ocl->clEnqueueWriteBuffer, kenv->command_queue,
+ dxva2->cl_mem_yuv, CL_TRUE, 0, in_bytes,
+ dxva2->nv12toyuv_tmp_in, 0, NULL, NULL);
+ }
+
+ hb_buffer_close( &in );
+ }
+ return 0;
+}
+/**
+ * register nv12 to yuv kernel.
+ */
+static int hb_nv12toyuv_reg_kernel( void )
+{
+ int st = hb_register_kernel_wrapper( "nv12toyuv", hb_nv12toyuv );
+ if( !st )
+ {
+ hb_log( "OpenCL: register kernel[%s] failed", "nv12toyuv" );
+ return -1;
+ }
+ return 0;
+}
+/**
+ * nv12 to yuv interface
+ * bufi is input frame of nv12, w is input frame width, h is input frame height
+ */
+int hb_ocl_nv12toyuv( uint8_t *bufi[], int p, int w, int h, int *crop, hb_va_dxva2_t *dxva2, int decomb, int detelecine )
+{
+ void *userdata[9];
+ userdata[0] = (void*)w;
+ userdata[1] = (void*)h;
+ userdata[2] = bufi[0];
+ userdata[3] = crop;
+ userdata[4] = dxva2;
+ userdata[5] = bufi[1];
+ userdata[6] = (void*)p;
+ userdata[7] = decomb;
+ userdata[8] = detelecine;
+
+ if( hb_nv12toyuv_reg_kernel() )
+	{
+ return -1;
+	}
+
+ if( hb_run_kernel( "nv12toyuv", userdata ) )
+ {
+ hb_log( "OpenCL: run kernel[nv12toyuv] failed" );
+ return -1;
+ }
+ return 0;
+}
+
+#endif // USE_HWD

HandBrake-0.10.0.tar.bz2/libhb/oclnv12toyuv.h Added

HandBrake-0.10.0.tar.bz2/libhb/oclscale.c Added

@@ -0,0 +1,302 @@
+/* oclscale.c
+
+ Copyright (c) 2003-2014 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+
+ Authors: Peng Gao <peng@multicorewareinc.com> <http://www.multicorewareinc.com/>
+ Li Cao <li@multicorewareinc.com> <http://www.multicorewareinc.com/>
+
+ */
+
+#include <math.h>
+#include "common.h"
+#include "opencl.h"
+#include "openclwrapper.h"
+#define FILTER_LEN 4
+
+#define _A -0.5f
+
+cl_float cubic(cl_float x)
+{
+ if (x < 0)
+ x = -x;
+
+ if (x < 1)
+ return (_A + 2.0f) * (x * x * x) - (_A + 3.0f) * (x * x) + 0 + 1;
+ else if (x < 2)
+ return (_A) * (x * x * x) - (5.0f * _A) * (x * x) + (8.0f * _A) * x - (4.0f * _A);
+ else
+ return 0;
+}
+
+
+cl_float *hb_bicubic_weights(cl_float scale, int length)
+{
+ cl_float *weights = (cl_float*) malloc(length * sizeof(cl_float) * 4);
+
+ int i; // C rocks
+ cl_float *out = weights;
+ for (i = 0; i < length; ++i)
+ {
+ cl_float x = i / scale;
+ cl_float dx = x - (int)x;
+ *out++ = cubic(-dx - 1.0f);
+ *out++ = cubic(-dx);
+ *out++ = cubic(-dx + 1.0f);
+ *out++ = cubic(-dx + 2.0f);
+ }
+ return weights;
+}
+
+int setupScaleWeights(cl_float xscale, cl_float yscale, int width, int height, hb_oclscale_t *os, KernelEnv *kenv);
+
+/**
+* executive scale using opencl
+* get filter args
+* create output buffer
+* create horizontal filter buffer
+* create vertical filter buffer
+* create kernels
+*/
+int hb_ocl_scale_func( void **data, KernelEnv *kenv )
+{
+ cl_int status;
+
+ cl_mem in_buf = data[0];
+ cl_mem out_buf = data[1];
+ int crop_top = (intptr_t)data[2];
+ int crop_bottom = (intptr_t)data[3];
+ int crop_left = (intptr_t)data[4];
+ int crop_right = (intptr_t)data[5];
+ cl_int in_frame_w = (intptr_t)data[6];
+ cl_int in_frame_h = (intptr_t)data[7];
+ cl_int out_frame_w = (intptr_t)data[8];
+ cl_int out_frame_h = (intptr_t)data[9];
+ hb_oclscale_t *os = data[10];
+ hb_buffer_t *in = data[11];
+ hb_buffer_t *out = data[12];
+
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_ocl_scale_func: OpenCL support not available");
+ return 0;
+ }
+
+ if (os->initialized == 0)
+ {
+ hb_log( "Scaling With OpenCL" );
+ if (kenv->isAMD != 0)
+ hb_log( "Using Zero Copy");
+ // create the block kernel
+ cl_int status;
+ os->m_kernel = hb_ocl->clCreateKernel(kenv->program, "frame_scale", &status);
+
+ os->initialized = 1;
+ }
+
+ {
+ // Use the new kernel
+ cl_event events[5];
+ int eventCount = 0;
+
+ if (kenv->isAMD == 0) {
+ status = hb_ocl->clEnqueueUnmapMemObject(kenv->command_queue,
+ in->cl.buffer, in->data, 0,
+ NULL, &events[eventCount++]);
+ status = hb_ocl->clEnqueueUnmapMemObject(kenv->command_queue,
+ out->cl.buffer, out->data, 0,
+ NULL, &events[eventCount++]);
+ }
+
+ cl_int srcPlaneOffset0 = in->plane[0].data - in->data;
+ cl_int srcPlaneOffset1 = in->plane[1].data - in->data;
+ cl_int srcPlaneOffset2 = in->plane[2].data - in->data;
+ cl_int srcRowWords0 = in->plane[0].stride;
+ cl_int srcRowWords1 = in->plane[1].stride;
+ cl_int srcRowWords2 = in->plane[2].stride;
+ cl_int dstPlaneOffset0 = out->plane[0].data - out->data;
+ cl_int dstPlaneOffset1 = out->plane[1].data - out->data;
+ cl_int dstPlaneOffset2 = out->plane[2].data - out->data;
+ cl_int dstRowWords0 = out->plane[0].stride;
+ cl_int dstRowWords1 = out->plane[1].stride;
+ cl_int dstRowWords2 = out->plane[2].stride;
+
+ if (crop_top != 0 || crop_bottom != 0 || crop_left != 0 || crop_right != 0) {
+ srcPlaneOffset0 += crop_left + crop_top * srcRowWords0;
+ srcPlaneOffset1 += crop_left / 2 + (crop_top / 2) * srcRowWords1;
+ srcPlaneOffset2 += crop_left / 2 + (crop_top / 2) * srcRowWords2;
+ in_frame_w = in_frame_w - crop_right - crop_left;
+ in_frame_h = in_frame_h - crop_bottom - crop_top;
+ }
+
+ cl_float xscale = (out_frame_w * 1.0f) / in_frame_w;
+ cl_float yscale = (out_frame_h * 1.0f) / in_frame_h;
+ setupScaleWeights(xscale, yscale, out_frame_w, out_frame_h, os, kenv);
+
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 0, sizeof(cl_mem), &out_buf);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 1, sizeof(cl_mem), &in_buf);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 2, sizeof(cl_float), &xscale);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 3, sizeof(cl_float), &yscale);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 4, sizeof(cl_int), &srcPlaneOffset0);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 5, sizeof(cl_int), &srcPlaneOffset1);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 6, sizeof(cl_int), &srcPlaneOffset2);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 7, sizeof(cl_int), &dstPlaneOffset0);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 8, sizeof(cl_int), &dstPlaneOffset1);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 9, sizeof(cl_int), &dstPlaneOffset2);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 10, sizeof(cl_int), &srcRowWords0);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 11, sizeof(cl_int), &srcRowWords1);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 12, sizeof(cl_int), &srcRowWords2);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 13, sizeof(cl_int), &dstRowWords0);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 14, sizeof(cl_int), &dstRowWords1);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 15, sizeof(cl_int), &dstRowWords2);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 16, sizeof(cl_int), &in_frame_w);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 17, sizeof(cl_int), &in_frame_h);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 18, sizeof(cl_int), &out_frame_w);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 19, sizeof(cl_int), &out_frame_h);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 20, sizeof(cl_mem), &os->bicubic_x_weights);
+ HB_OCL_CHECK(hb_ocl->clSetKernelArg, os->m_kernel, 21, sizeof(cl_mem), &os->bicubic_y_weights);
+
+ size_t workOffset[] = { 0, 0, 0 };
+ size_t globalWorkSize[] = { 1, 1, 1 };
+ size_t localWorkSize[] = { 1, 1, 1 };
+
+ int xgroups = (out_frame_w + 63) / 64;
+ int ygroups = (out_frame_h + 15) / 16;
+
+ localWorkSize[0] = 64;
+ localWorkSize[1] = 1;
+ localWorkSize[2] = 1;
+ globalWorkSize[0] = xgroups * 64;
+ globalWorkSize[1] = ygroups;
+ globalWorkSize[2] = 3;
+
+ HB_OCL_CHECK(hb_ocl->clEnqueueNDRangeKernel, kenv->command_queue,
+ os->m_kernel, 3, workOffset, globalWorkSize, localWorkSize,
+ eventCount, eventCount == 0 ? NULL : &events[0], &events[eventCount]);
+ ++eventCount;
+
+ if (kenv->isAMD == 0) {
+ in->data = hb_ocl->clEnqueueMapBuffer(kenv->command_queue, in->cl.buffer,
+ CL_FALSE, CL_MAP_READ|CL_MAP_WRITE,
+ 0, in->alloc,
+ eventCount ? 1 : 0,
+ eventCount ? &events[eventCount - 1] : NULL,
+ &events[eventCount], &status);
+ out->data = hb_ocl->clEnqueueMapBuffer(kenv->command_queue, out->cl.buffer,
+ CL_FALSE, CL_MAP_READ|CL_MAP_WRITE,
+ 0, out->alloc,
+ eventCount ? 1 : 0,
+ eventCount ? &events[eventCount - 1] : NULL,
+ &events[eventCount + 1], &status);
+ eventCount += 2;
+ }
+
+ hb_ocl->clFlush(kenv->command_queue);
+ hb_ocl->clWaitForEvents(eventCount, &events[0]);
+ int i;
+ for (i = 0; i < eventCount; ++i)
+ {
+ hb_ocl->clReleaseEvent(events[i]);
+ }
+ }
+
+ return 1;
+}
+
+int setupScaleWeights(cl_float xscale, cl_float yscale, int width, int height, hb_oclscale_t *os, KernelEnv *kenv)
+{
+ cl_int status;
+
+ if (hb_ocl == NULL)
+ {
+ hb_error("setupScaleWeights: OpenCL support not available");
+ return 1;
+ }
+
+ if (os->xscale != xscale || os->width < width)
+ {
+ cl_float *xweights = hb_bicubic_weights(xscale, width);
+ HB_OCL_BUF_FREE (hb_ocl, os->bicubic_x_weights);
+ HB_OCL_BUF_CREATE(hb_ocl, os->bicubic_x_weights, CL_MEM_READ_ONLY,
+ sizeof(cl_float) * width * 4);
+ HB_OCL_CHECK(hb_ocl->clEnqueueWriteBuffer, kenv->command_queue, os->bicubic_x_weights,
+ CL_TRUE, 0, sizeof(cl_float) * width * 4, xweights, 0, NULL, NULL);
+ os->width = width;
+ os->xscale = xscale;
+ free(xweights);
+ }
+
+ if ((os->yscale != yscale) || (os->height < height))
+ {
+ cl_float *yweights = hb_bicubic_weights(yscale, height);
+ HB_OCL_BUF_FREE (hb_ocl, os->bicubic_y_weights);
+ HB_OCL_BUF_CREATE(hb_ocl, os->bicubic_y_weights, CL_MEM_READ_ONLY,
+ sizeof(cl_float) * height * 4);
+ HB_OCL_CHECK(hb_ocl->clEnqueueWriteBuffer, kenv->command_queue, os->bicubic_y_weights,
+ CL_TRUE, 0, sizeof(cl_float) * height * 4, yweights, 0, NULL, NULL);
+ os->height = height;
+ os->yscale = yscale;
+ free(yweights);
+ }
+ return 0;
+}
+
+
+/**
+* function describe: this function is used to scaling video frame. it uses the gausi scaling algorithm
+* parameter:
+* inputFrameBuffer: the source video frame opencl buffer
+* outputdata: the destination video frame buffer
+* inputWidth: the width of the source video frame
+* inputHeight: the height of the source video frame
+* outputWidth: the width of destination video frame
+* outputHeight: the height of destination video frame
+*/
+
+
+static int s_scale_init_flag = 0;
+
+int do_scale_init()
+{
+ if ( s_scale_init_flag==0 )
+ {
+ int st = hb_register_kernel_wrapper( "frame_scale", hb_ocl_scale_func );
+ if( !st )
+ {
+ hb_log( "register kernel[%s] failed", "frame_scale" );
+ return 0;
+ }
+ s_scale_init_flag++;
+ }
+ return 1;
+}
+
+
+int hb_ocl_scale(hb_buffer_t *in, hb_buffer_t *out, int *crop, hb_oclscale_t *os)
+{
+ void *data[13];
+
+ if (do_scale_init() == 0)
+ return 0;
+
+ data[0] = in->cl.buffer;
+ data[1] = out->cl.buffer;
+ data[2] = (void*)(intptr_t)(crop[0]);
+ data[3] = (void*)(intptr_t)(crop[1]);
+ data[4] = (void*)(intptr_t)(crop[2]);
+ data[5] = (void*)(intptr_t)(crop[3]);
+ data[6] = (void*)(intptr_t)(in->f.width);
+ data[7] = (void*)(intptr_t)(in->f.height);
+ data[8] = (void*)(intptr_t)(out->f.width);
+ data[9] = (void*)(intptr_t)(out->f.height);
+ data[10] = os;
+ data[11] = in;
+ data[12] = out;
+
+ if( !hb_run_kernel( "frame_scale", data ) )
+ hb_log( "run kernel[%s] failed", "frame_scale" );
+ return 0;
+}

HandBrake-0.10.0.tar.bz2/libhb/opencl.c Added

@@ -0,0 +1,422 @@
+/* opencl.c
+
+ Copyright (c) 2003-2014 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#ifdef _WIN32
+#include <windows.h>
+#define HB_OCL_DLOPEN LoadLibraryW(L"OpenCL")
+#define HB_OCL_DLSYM GetProcAddress
+#define HB_OCL_DLCLOSE FreeLibrary
+#else
+#include <dlfcn.h>
+#ifdef __APPLE__
+#define HB_OCL_DLOPEN dlopen("/System/Library/Frameworks/OpenCL.framework/OpenCL", RTLD_NOW)
+#else
+#define HB_OCL_DLOPEN dlopen("libOpenCL.so", RTLD_NOW)
+#endif
+#define HB_OCL_DLSYM dlsym
+#define HB_OCL_DLCLOSE dlclose
+#endif
+
+#include "common.h"
+#include "opencl.h"
+
+hb_opencl_library_t *hb_ocl = NULL;
+
+int hb_ocl_init()
+{
+ if (hb_ocl == NULL)
+ {
+ if ((hb_ocl = hb_opencl_library_init()) == NULL)
+ {
+ return -1;
+ }
+ }
+ return 0;
+}
+
+void hb_ocl_close()
+{
+ hb_opencl_library_close(&hb_ocl);
+}
+
+hb_opencl_library_t* hb_opencl_library_init()
+{
+ hb_opencl_library_t *opencl;
+ if ((opencl = calloc(1, sizeof(hb_opencl_library_t))) == NULL)
+ {
+ hb_error("hb_opencl_library_init: memory allocation failure");
+ goto fail;
+ }
+
+ opencl->library = HB_OCL_DLOPEN;
+ if (opencl->library == NULL)
+ {
+ goto fail;
+ }
+
+#define HB_OCL_LOAD(func) \
+{ \
+ if ((opencl->func = (void*)HB_OCL_DLSYM(opencl->library, #func)) == NULL) \
+ { \
+ hb_log("hb_opencl_library_init: failed to load function '%s'", #func); \
+ goto fail; \
+ } \
+}
+ HB_OCL_LOAD(clBuildProgram);
+ HB_OCL_LOAD(clCreateBuffer);
+ HB_OCL_LOAD(clCreateCommandQueue);
+ HB_OCL_LOAD(clCreateContextFromType);
+ HB_OCL_LOAD(clCreateKernel);
+ HB_OCL_LOAD(clCreateProgramWithBinary);
+ HB_OCL_LOAD(clCreateProgramWithSource);
+ HB_OCL_LOAD(clEnqueueCopyBuffer);
+ HB_OCL_LOAD(clEnqueueMapBuffer);
+ HB_OCL_LOAD(clEnqueueNDRangeKernel);
+ HB_OCL_LOAD(clEnqueueReadBuffer);
+ HB_OCL_LOAD(clEnqueueUnmapMemObject);
+ HB_OCL_LOAD(clEnqueueWriteBuffer);
+ HB_OCL_LOAD(clFlush);
+ HB_OCL_LOAD(clGetCommandQueueInfo);
+ HB_OCL_LOAD(clGetContextInfo);
+ HB_OCL_LOAD(clGetDeviceIDs);
+ HB_OCL_LOAD(clGetDeviceInfo);
+ HB_OCL_LOAD(clGetPlatformIDs);
+ HB_OCL_LOAD(clGetPlatformInfo);
+ HB_OCL_LOAD(clGetProgramBuildInfo);
+ HB_OCL_LOAD(clGetProgramInfo);
+ HB_OCL_LOAD(clReleaseCommandQueue);
+ HB_OCL_LOAD(clReleaseContext);
+ HB_OCL_LOAD(clReleaseEvent);
+ HB_OCL_LOAD(clReleaseKernel);
+ HB_OCL_LOAD(clReleaseMemObject);
+ HB_OCL_LOAD(clReleaseProgram);
+ HB_OCL_LOAD(clSetKernelArg);
+ HB_OCL_LOAD(clWaitForEvents);
+
+ //success
+ return opencl;
+
+fail:
+ hb_opencl_library_close(&opencl);
+ return NULL;
+}
+
+void hb_opencl_library_close(hb_opencl_library_t **_opencl)
+{
+ if (_opencl == NULL)
+ {
+ return;
+ }
+ hb_opencl_library_t *opencl = *_opencl;
+
+ if (opencl != NULL)
+ {
+ if (opencl->library != NULL)
+ {
+ HB_OCL_DLCLOSE(opencl->library);
+ }
+ opencl->library = NULL;
+
+#define HB_OCL_UNLOAD(func) { opencl->func = NULL; }
+ HB_OCL_UNLOAD(clBuildProgram);
+ HB_OCL_UNLOAD(clCreateBuffer);
+ HB_OCL_UNLOAD(clCreateCommandQueue);
+ HB_OCL_UNLOAD(clCreateContextFromType);
+ HB_OCL_UNLOAD(clCreateKernel);
+ HB_OCL_UNLOAD(clCreateProgramWithBinary);
+ HB_OCL_UNLOAD(clCreateProgramWithSource);
+ HB_OCL_UNLOAD(clEnqueueCopyBuffer);
+ HB_OCL_UNLOAD(clEnqueueMapBuffer);
+ HB_OCL_UNLOAD(clEnqueueNDRangeKernel);
+ HB_OCL_UNLOAD(clEnqueueReadBuffer);
+ HB_OCL_UNLOAD(clEnqueueUnmapMemObject);
+ HB_OCL_UNLOAD(clEnqueueWriteBuffer);
+ HB_OCL_UNLOAD(clFlush);
+ HB_OCL_UNLOAD(clGetCommandQueueInfo);
+ HB_OCL_UNLOAD(clGetContextInfo);
+ HB_OCL_UNLOAD(clGetDeviceIDs);
+ HB_OCL_UNLOAD(clGetDeviceInfo);
+ HB_OCL_UNLOAD(clGetPlatformIDs);
+ HB_OCL_UNLOAD(clGetPlatformInfo);
+ HB_OCL_UNLOAD(clGetProgramBuildInfo);
+ HB_OCL_UNLOAD(clGetProgramInfo);
+ HB_OCL_UNLOAD(clReleaseCommandQueue);
+ HB_OCL_UNLOAD(clReleaseContext);
+ HB_OCL_UNLOAD(clReleaseEvent);
+ HB_OCL_UNLOAD(clReleaseKernel);
+ HB_OCL_UNLOAD(clReleaseMemObject);
+ HB_OCL_UNLOAD(clReleaseProgram);
+ HB_OCL_UNLOAD(clSetKernelArg);
+ HB_OCL_UNLOAD(clWaitForEvents);
+ }
+ *_opencl = NULL;
+}
+
+static int hb_opencl_device_is_supported(hb_opencl_device_t* device)
+{
+ // we only support OpenCL on GPUs for now
+ // Ivy Bridge supports OpenCL on GPU, but it's too slow to be usable
+ // FIXME: disable on NVIDIA to to a bug
+ if ((device != NULL) &&
+ (device->type & CL_DEVICE_TYPE_GPU) &&
+ (device->ocl_vendor != HB_OCL_VENDOR_NVIDIA) &&
+ (device->ocl_vendor != HB_OCL_VENDOR_INTEL ||
+ hb_get_cpu_platform() != HB_CPU_PLATFORM_INTEL_IVB))
+ {
+ int major, minor;
+ // check OpenCL version:
+ // OpenCL<space><major_version.minor_version><space><vendor-specific information>
+ if (sscanf(device->version, "OpenCL %d.%d", &major, &minor) != 2)
+ {
+ return 0;
+ }
+ return (major > HB_OCL_MINVERSION_MAJOR) || (major == HB_OCL_MINVERSION_MAJOR &&
+ minor >= HB_OCL_MINVERSION_MINOR);
+ }
+ return 0;
+}
+
+static hb_opencl_device_t* hb_opencl_device_get(hb_opencl_library_t *opencl,
+ cl_device_id device_id)
+{
+ if (opencl == NULL || opencl->clGetDeviceInfo == NULL)
+ {
+ hb_error("hb_opencl_device_get: OpenCL support not available");
+ return NULL;
+ }
+ else if (device_id == NULL)
+ {
+ hb_error("hb_opencl_device_get: invalid device ID");
+ return NULL;
+ }
+
+ hb_opencl_device_t *device = calloc(1, sizeof(hb_opencl_device_t));
+ if (device == NULL)
+ {
+ hb_error("hb_opencl_device_get: memory allocation failure");
+ return NULL;
+ }
+
+ cl_int status = CL_SUCCESS;
+ device->id = device_id;
+
+ status |= opencl->clGetDeviceInfo(device->id, CL_DEVICE_VENDOR, sizeof(device->vendor),
+ device->vendor, NULL);
+ status |= opencl->clGetDeviceInfo(device->id, CL_DEVICE_NAME, sizeof(device->name),
+ device->name, NULL);
+ status |= opencl->clGetDeviceInfo(device->id, CL_DEVICE_VERSION, sizeof(device->version),
+ device->version, NULL);
+ status |= opencl->clGetDeviceInfo(device->id, CL_DEVICE_TYPE, sizeof(device->type),
+ &device->type, NULL);
+ status |= opencl->clGetDeviceInfo(device->id, CL_DEVICE_PLATFORM, sizeof(device->platform),
+ &device->platform, NULL);
+ status |= opencl->clGetDeviceInfo(device->id, CL_DRIVER_VERSION, sizeof(device->driver),
+ device->driver, NULL);
+ if (status != CL_SUCCESS)
+ {
+ free(device);
+ return NULL;
+ }
+
+ if (!strcmp(device->vendor, "Advanced Micro Devices, Inc.") ||
+ !strcmp(device->vendor, "AMD"))
+ {
+ device->ocl_vendor = HB_OCL_VENDOR_AMD;
+ }
+ else if (!strncmp(device->vendor, "NVIDIA", 6 /* strlen("NVIDIA") */))
+ {
+ device->ocl_vendor = HB_OCL_VENDOR_NVIDIA;
+ }
+ else if (!strncmp(device->vendor, "Intel", 5 /* strlen("Intel") */))
+ {
+ device->ocl_vendor = HB_OCL_VENDOR_INTEL;
+ }
+ else
+ {
+ device->ocl_vendor = HB_OCL_VENDOR_OTHER;
+ }
+
+ return device;
+}
+
+static void hb_opencl_devices_list_close(hb_list_t **_list)
+{
+ if (_list != NULL)
+ {
+ hb_list_t *list = *_list;
+ hb_opencl_device_t *device;
+ while (list != NULL && hb_list_count(list) > 0)
+ {
+ if ((device = hb_list_item(list, 0)) != NULL)
+ {
+ hb_list_rem(list, device);
+ free(device);
+ }
+ }
+ }
+ hb_list_close(_list);
+}
+
+static hb_list_t* hb_opencl_devices_list_get(hb_opencl_library_t *opencl,
+ cl_device_type device_type)
+{
+ if (opencl == NULL ||
+ opencl->library == NULL ||
+ opencl->clGetDeviceIDs == NULL ||
+ opencl->clGetDeviceInfo == NULL ||
+ opencl->clGetPlatformIDs == NULL)
+ {
+ hb_error("hb_opencl_devices_list_get: OpenCL support not available");
+ return NULL;
+ }
+
+ hb_list_t *list = hb_list_init();
+ if (list == NULL)
+ {
+ hb_error("hb_opencl_devices_list_get: memory allocation failure");
+ return NULL;
+ }
+
+ cl_device_id *device_ids;
+ hb_opencl_device_t *device;
+ cl_platform_id *platform_ids;
+ cl_uint i, j, num_platforms, num_devices;
+
+ if (opencl->clGetPlatformIDs(0, NULL, &num_platforms) != CL_SUCCESS || !num_platforms)
+ {
+ goto fail;
+ }
+ if ((platform_ids = malloc(sizeof(cl_platform_id) * num_platforms)) == NULL)
+ {
+ hb_error("hb_opencl_devices_list_get: memory allocation failure");
+ goto fail;
+ }
+ if (opencl->clGetPlatformIDs(num_platforms, platform_ids, NULL) != CL_SUCCESS)
+ {
+ goto fail;
+ }
+ for (i = 0; i < num_platforms; i++)
+ {
+ if (opencl->clGetDeviceIDs(platform_ids[i], device_type, 0, NULL, &num_devices) != CL_SUCCESS || !num_devices)
+ {
+ // non-fatal
+ continue;
+ }
+ if ((device_ids = malloc(sizeof(cl_device_id) * num_devices)) == NULL)
+ {
+ hb_error("hb_opencl_devices_list_get: memory allocation failure");
+ goto fail;
+ }
+ if (opencl->clGetDeviceIDs(platform_ids[i], device_type, num_devices, device_ids, NULL) != CL_SUCCESS)
+ {
+ // non-fatal
+ continue;
+ }
+ for (j = 0; j < num_devices; j++)
+ {
+ if ((device = hb_opencl_device_get(opencl, device_ids[j])) != NULL)
+ {
+ hb_list_add(list, device);
+ }
+ }
+ }
+ return list;
+
+fail:
+ hb_opencl_devices_list_close(&list);
+ return NULL;
+}
+
+int hb_opencl_available()
+{
+ static int opencl_available = -1;
+ if (opencl_available >= 0)
+ {
+ return opencl_available;
+ }
+ opencl_available = 0;
+
+ /*
+ * Check whether we can load the OpenCL library, then check devices and make
+ * sure we support running OpenCL code on at least one of them.
+ */
+ hb_opencl_library_t *opencl;
+ if ((opencl = hb_opencl_library_init()) != NULL)
+ {
+ int i;
+ hb_list_t *device_list;
+ hb_opencl_device_t *device;
+ if ((device_list = hb_opencl_devices_list_get(opencl, CL_DEVICE_TYPE_ALL)) != NULL)
+ {
+ for (i = 0; i < hb_list_count(device_list); i++)
+ {
+ if ((device = hb_list_item(device_list, i)) != NULL &&
+ (hb_opencl_device_is_supported(device)))
+ {
+ opencl_available = 1;
+ break;
+ }
+ }
+ hb_opencl_devices_list_close(&device_list);
+ }
+ hb_opencl_library_close(&opencl);
+ }
+ return opencl_available;
+}
+
+void hb_opencl_info_print()
+{
+ /*
+ * Note: this function should not log any warnings or errors.
+ * Its only purpose is to list OpenCL-capable devices, so let's initialize
+ * only what we absolutely need here, rather than calling library_open().
+ */
+ hb_opencl_library_t ocl, *opencl = &ocl;
+ if ((opencl->library = (void*)HB_OCL_DLOPEN) == NULL ||
+ (opencl->clGetDeviceIDs = (void*)HB_OCL_DLSYM(opencl->library, "clGetDeviceIDs" )) == NULL ||
+ (opencl->clGetDeviceInfo = (void*)HB_OCL_DLSYM(opencl->library, "clGetDeviceInfo" )) == NULL ||
+ (opencl->clGetPlatformIDs = (void*)HB_OCL_DLSYM(opencl->library, "clGetPlatformIDs")) == NULL)
+ {
+ // zero or insufficient OpenCL support
+ hb_log("OpenCL: library not available");
+ goto end;
+ }
+
+ int i, idx;
+ hb_list_t *device_list;
+ hb_opencl_device_t *device;
+ if ((device_list = hb_opencl_devices_list_get(opencl, CL_DEVICE_TYPE_ALL)) != NULL)
+ {
+ for (i = 0, idx = 1; i < hb_list_count(device_list); i++)
+ {
+ if ((device = hb_list_item(device_list, i)) != NULL)
+ {
+ // don't list CPU devices (always unsupported)
+ if (!(device->type & CL_DEVICE_TYPE_CPU))
+ {
+ hb_log("OpenCL device #%d: %s %s", idx++, device->vendor, device->name);
+ hb_log(" - OpenCL version: %s", device->version + 7 /* strlen("OpenCL ") */);
+ hb_log(" - driver version: %s", device->driver);
+ hb_log(" - device type: %s%s",
+ device->type & CL_DEVICE_TYPE_CPU ? "CPU" :
+ device->type & CL_DEVICE_TYPE_GPU ? "GPU" :
+ device->type & CL_DEVICE_TYPE_CUSTOM ? "Custom" :
+ device->type & CL_DEVICE_TYPE_ACCELERATOR ? "Accelerator" : "Unknown",
+ device->type & CL_DEVICE_TYPE_DEFAULT ? " (default)" : "");
+ hb_log(" - supported: %s",
+ hb_opencl_device_is_supported(device) ? "YES" : "no");
+ }
+ }
+ }
+ hb_opencl_devices_list_close(&device_list);
+ }
+
+end:
+ hb_opencl_library_close(&opencl);
+}

HandBrake-0.10.0.tar.bz2/libhb/opencl.h Added

@@ -0,0 +1,749 @@
+/* opencl.h
+
+ Copyright (c) 2003-2014 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#ifndef HB_OPENCL_H
+#define HB_OPENCL_H
+
+#include "extras/cl.h"
+#include "openclwrapper.h"
+
+// we only support OpenCL 1.1 or later
+#define HB_OCL_MINVERSION_MAJOR 1
+#define HB_OCL_MINVERSION_MINOR 1
+
+#define HB_OCL_FUNC_TYPE(name) hb_opencl_##name##_func
+#define HB_OCL_FUNC_DECL(name) HB_OCL_FUNC_TYPE(name) name
+#define HB_OCL_API(ret, attr, name) typedef ret (attr* HB_OCL_FUNC_TYPE(name))
+
+#ifdef __APPLE__
+#pragma mark -
+#pragma mark OpenCL API
+#endif // __APPLE__
+
+/* Platform API */
+HB_OCL_API(cl_int, CL_API_CALL, clGetPlatformIDs)
+(cl_uint /* num_entries */,
+ cl_platform_id * /* platforms */,
+ cl_uint * /* num_platforms */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clGetPlatformInfo)
+(cl_platform_id /* platform */,
+ cl_platform_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */);
+
+/* Device APIs */
+HB_OCL_API(cl_int, CL_API_CALL, clGetDeviceIDs)
+(cl_platform_id /* platform */,
+ cl_device_type /* device_type */,
+ cl_uint /* num_entries */,
+ cl_device_id * /* devices */,
+ cl_uint * /* num_devices */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clGetDeviceInfo)
+(cl_device_id /* device */,
+ cl_device_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clCreateSubDevices)
+(cl_device_id /* in_device */,
+ const cl_device_partition_property * /* properties */,
+ cl_uint /* num_devices */,
+ cl_device_id * /* out_devices */,
+ cl_uint * /* num_devices_ret */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clRetainDevice)
+(cl_device_id /* device */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clReleaseDevice)
+(cl_device_id /* device */);
+
+/* Context APIs */
+HB_OCL_API(cl_context, CL_API_CALL, clCreateContext)
+(const cl_context_properties * /* properties */,
+ cl_uint /* num_devices */,
+ const cl_device_id * /* devices */,
+ void (CL_CALLBACK * /* pfn_notify */)(const char *, const void *, size_t, void *),
+ void * /* user_data */,
+ cl_int * /* errcode_ret */);
+
+HB_OCL_API(cl_context, CL_API_CALL, clCreateContextFromType)
+(const cl_context_properties * /* properties */,
+ cl_device_type /* device_type */,
+ void (CL_CALLBACK * /* pfn_notify*/ )(const char *, const void *, size_t, void *),
+ void * /* user_data */,
+ cl_int * /* errcode_ret */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clRetainContext)
+(cl_context /* context */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clReleaseContext)
+(cl_context /* context */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clGetContextInfo)
+(cl_context /* context */,
+ cl_context_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */);
+
+/* Command Queue APIs */
+HB_OCL_API(cl_command_queue, CL_API_CALL, clCreateCommandQueue)
+(cl_context /* context */,
+ cl_device_id /* device */,
+ cl_command_queue_properties /* properties */,
+ cl_int * /* errcode_ret */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clRetainCommandQueue)
+(cl_command_queue /* command_queue */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clReleaseCommandQueue)
+(cl_command_queue /* command_queue */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clGetCommandQueueInfo)
+(cl_command_queue /* command_queue */,
+ cl_command_queue_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */);
+
+/* Memory Object APIs */
+HB_OCL_API(cl_mem, CL_API_CALL, clCreateBuffer)
+(cl_context /* context */,
+ cl_mem_flags /* flags */,
+ size_t /* size */,
+ void * /* host_ptr */,
+ cl_int * /* errcode_ret */);
+
+HB_OCL_API(cl_mem, CL_API_CALL, clCreateSubBuffer)
+(cl_mem /* buffer */,
+ cl_mem_flags /* flags */,
+ cl_buffer_create_type /* buffer_create_type */,
+ const void * /* buffer_create_info */,
+ cl_int * /* errcode_ret */);
+
+HB_OCL_API(cl_mem, CL_API_CALL, clCreateImage)
+(cl_context /* context */,
+ cl_mem_flags /* flags */,
+ const cl_image_format * /* image_format */,
+ const cl_image_desc * /* image_desc */,
+ void * /* host_ptr */,
+ cl_int * /* errcode_ret */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clRetainMemObject)
+(cl_mem /* memobj */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clReleaseMemObject)
+(cl_mem /* memobj */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clGetSupportedImageFormats)
+(cl_context /* context */,
+ cl_mem_flags /* flags */,
+ cl_mem_object_type /* image_type */,
+ cl_uint /* num_entries */,
+ cl_image_format * /* image_formats */,
+ cl_uint * /* num_image_formats */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clGetMemObjectInfo)
+(cl_mem /* memobj */,
+ cl_mem_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clGetImageInfo)
+(cl_mem /* image */,
+ cl_image_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clSetMemObjectDestructorCallback)
+(cl_mem /* memobj */,
+ void (CL_CALLBACK * /*pfn_notify*/)( cl_mem /* memobj */, void* /*user_data*/),
+ void * /*user_data */ );
+
+/* Sampler APIs */
+HB_OCL_API(cl_sampler, CL_API_CALL, clCreateSampler)
+(cl_context /* context */,
+ cl_bool /* normalized_coords */,
+ cl_addressing_mode /* addressing_mode */,
+ cl_filter_mode /* filter_mode */,
+ cl_int * /* errcode_ret */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clRetainSampler)
+(cl_sampler /* sampler */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clReleaseSampler)
+(cl_sampler /* sampler */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clGetSamplerInfo)
+(cl_sampler /* sampler */,
+ cl_sampler_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */);
+
+/* Program Object APIs */
+HB_OCL_API(cl_program, CL_API_CALL, clCreateProgramWithSource)
+(cl_context /* context */,
+ cl_uint /* count */,
+ const char ** /* strings */,
+ const size_t * /* lengths */,
+ cl_int * /* errcode_ret */);
+
+HB_OCL_API(cl_program, CL_API_CALL, clCreateProgramWithBinary)
+(cl_context /* context */,
+ cl_uint /* num_devices */,
+ const cl_device_id * /* device_list */,
+ const size_t * /* lengths */,
+ const unsigned char ** /* binaries */,
+ cl_int * /* binary_status */,
+ cl_int * /* errcode_ret */);
+
+HB_OCL_API(cl_program, CL_API_CALL, clCreateProgramWithBuiltInKernels)
+(cl_context /* context */,
+ cl_uint /* num_devices */,
+ const cl_device_id * /* device_list */,
+ const char * /* kernel_names */,
+ cl_int * /* errcode_ret */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clRetainProgram)
+(cl_program /* program */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clReleaseProgram)
+(cl_program /* program */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clBuildProgram)
+(cl_program /* program */,
+ cl_uint /* num_devices */,
+ const cl_device_id * /* device_list */,
+ const char * /* options */,
+ void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */),
+ void * /* user_data */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clCompileProgram)
+(cl_program /* program */,
+ cl_uint /* num_devices */,
+ const cl_device_id * /* device_list */,
+ const char * /* options */,
+ cl_uint /* num_input_headers */,
+ const cl_program * /* input_headers */,
+ const char ** /* header_include_names */,
+ void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */),
+ void * /* user_data */);
+
+HB_OCL_API(cl_program, CL_API_CALL, clLinkProgram)
+(cl_context /* context */,
+ cl_uint /* num_devices */,
+ const cl_device_id * /* device_list */,
+ const char * /* options */,
+ cl_uint /* num_input_programs */,
+ const cl_program * /* input_programs */,
+ void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */),
+ void * /* user_data */,
+ cl_int * /* errcode_ret */ );
+
+
+HB_OCL_API(cl_int, CL_API_CALL, clUnloadPlatformCompiler)
+(cl_platform_id /* platform */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clGetProgramInfo)
+(cl_program /* program */,
+ cl_program_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clGetProgramBuildInfo)
+(cl_program /* program */,
+ cl_device_id /* device */,
+ cl_program_build_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */);
+
+/* Kernel Object APIs */
+HB_OCL_API(cl_kernel, CL_API_CALL, clCreateKernel)
+(cl_program /* program */,
+ const char * /* kernel_name */,
+ cl_int * /* errcode_ret */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clCreateKernelsInProgram)
+(cl_program /* program */,
+ cl_uint /* num_kernels */,
+ cl_kernel * /* kernels */,
+ cl_uint * /* num_kernels_ret */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clRetainKernel)
+(cl_kernel /* kernel */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clReleaseKernel)
+(cl_kernel /* kernel */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clSetKernelArg)
+(cl_kernel /* kernel */,
+ cl_uint /* arg_index */,
+ size_t /* arg_size */,
+ const void * /* arg_value */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clGetKernelInfo)
+(cl_kernel /* kernel */,
+ cl_kernel_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clGetKernelArgInfo)
+(cl_kernel /* kernel */,
+ cl_uint /* arg_indx */,
+ cl_kernel_arg_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clGetKernelWorkGroupInfo)
+(cl_kernel /* kernel */,
+ cl_device_id /* device */,
+ cl_kernel_work_group_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */);
+
+/* Event Object APIs */
+HB_OCL_API(cl_int, CL_API_CALL, clWaitForEvents)
+(cl_uint /* num_events */,
+ const cl_event * /* event_list */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clGetEventInfo)
+(cl_event /* event */,
+ cl_event_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */);
+
+HB_OCL_API(cl_event, CL_API_CALL, clCreateUserEvent)
+(cl_context /* context */,
+ cl_int * /* errcode_ret */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clRetainEvent)
+(cl_event /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clReleaseEvent)
+(cl_event /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clSetUserEventStatus)
+(cl_event /* event */,
+ cl_int /* execution_status */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clSetEventCallback)
+(cl_event /* event */,
+ cl_int /* command_exec_callback_type */,
+ void (CL_CALLBACK * /* pfn_notify */)(cl_event, cl_int, void *),
+ void * /* user_data */);
+
+/* Profiling APIs */
+HB_OCL_API(cl_int, CL_API_CALL, clGetEventProfilingInfo)
+(cl_event /* event */,
+ cl_profiling_info /* param_name */,
+ size_t /* param_value_size */,
+ void * /* param_value */,
+ size_t * /* param_value_size_ret */);
+
+/* Flush and Finish APIs */
+HB_OCL_API(cl_int, CL_API_CALL, clFlush)
+(cl_command_queue /* command_queue */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clFinish)
+(cl_command_queue /* command_queue */);
+
+/* Enqueued Commands APIs */
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueReadBuffer)
+(cl_command_queue /* command_queue */,
+ cl_mem /* buffer */,
+ cl_bool /* blocking_read */,
+ size_t /* offset */,
+ size_t /* size */,
+ void * /* ptr */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueReadBufferRect)
+(cl_command_queue /* command_queue */,
+ cl_mem /* buffer */,
+ cl_bool /* blocking_read */,
+ const size_t * /* buffer_offset */,
+ const size_t * /* host_offset */,
+ const size_t * /* region */,
+ size_t /* buffer_row_pitch */,
+ size_t /* buffer_slice_pitch */,
+ size_t /* host_row_pitch */,
+ size_t /* host_slice_pitch */,
+ void * /* ptr */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueWriteBuffer)
+(cl_command_queue /* command_queue */,
+ cl_mem /* buffer */,
+ cl_bool /* blocking_write */,
+ size_t /* offset */,
+ size_t /* size */,
+ const void * /* ptr */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueWriteBufferRect)
+(cl_command_queue /* command_queue */,
+ cl_mem /* buffer */,
+ cl_bool /* blocking_write */,
+ const size_t * /* buffer_offset */,
+ const size_t * /* host_offset */,
+ const size_t * /* region */,
+ size_t /* buffer_row_pitch */,
+ size_t /* buffer_slice_pitch */,
+ size_t /* host_row_pitch */,
+ size_t /* host_slice_pitch */,
+ const void * /* ptr */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueFillBuffer)
+(cl_command_queue /* command_queue */,
+ cl_mem /* buffer */,
+ const void * /* pattern */,
+ size_t /* pattern_size */,
+ size_t /* offset */,
+ size_t /* size */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueCopyBuffer)
+(cl_command_queue /* command_queue */,
+ cl_mem /* src_buffer */,
+ cl_mem /* dst_buffer */,
+ size_t /* src_offset */,
+ size_t /* dst_offset */,
+ size_t /* size */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueCopyBufferRect)
+(cl_command_queue /* command_queue */,
+ cl_mem /* src_buffer */,
+ cl_mem /* dst_buffer */,
+ const size_t * /* src_origin */,
+ const size_t * /* dst_origin */,
+ const size_t * /* region */,
+ size_t /* src_row_pitch */,
+ size_t /* src_slice_pitch */,
+ size_t /* dst_row_pitch */,
+ size_t /* dst_slice_pitch */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueReadImage)
+(cl_command_queue /* command_queue */,
+ cl_mem /* image */,
+ cl_bool /* blocking_read */,
+ const size_t * /* origin[3] */,
+ const size_t * /* region[3] */,
+ size_t /* row_pitch */,
+ size_t /* slice_pitch */,
+ void * /* ptr */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueWriteImage)
+(cl_command_queue /* command_queue */,
+ cl_mem /* image */,
+ cl_bool /* blocking_write */,
+ const size_t * /* origin[3] */,
+ const size_t * /* region[3] */,
+ size_t /* input_row_pitch */,
+ size_t /* input_slice_pitch */,
+ const void * /* ptr */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueFillImage)
+(cl_command_queue /* command_queue */,
+ cl_mem /* image */,
+ const void * /* fill_color */,
+ const size_t * /* origin[3] */,
+ const size_t * /* region[3] */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueCopyImage)
+(cl_command_queue /* command_queue */,
+ cl_mem /* src_image */,
+ cl_mem /* dst_image */,
+ const size_t * /* src_origin[3] */,
+ const size_t * /* dst_origin[3] */,
+ const size_t * /* region[3] */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueCopyImageToBuffer)
+(cl_command_queue /* command_queue */,
+ cl_mem /* src_image */,
+ cl_mem /* dst_buffer */,
+ const size_t * /* src_origin[3] */,
+ const size_t * /* region[3] */,
+ size_t /* dst_offset */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueCopyBufferToImage)
+(cl_command_queue /* command_queue */,
+ cl_mem /* src_buffer */,
+ cl_mem /* dst_image */,
+ size_t /* src_offset */,
+ const size_t * /* dst_origin[3] */,
+ const size_t * /* region[3] */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(void *, CL_API_CALL, clEnqueueMapBuffer)
+(cl_command_queue /* command_queue */,
+ cl_mem /* buffer */,
+ cl_bool /* blocking_map */,
+ cl_map_flags /* map_flags */,
+ size_t /* offset */,
+ size_t /* size */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */,
+ cl_int * /* errcode_ret */);
+
+HB_OCL_API(void *, CL_API_CALL, clEnqueueMapImage)
+(cl_command_queue /* command_queue */,
+ cl_mem /* image */,
+ cl_bool /* blocking_map */,
+ cl_map_flags /* map_flags */,
+ const size_t * /* origin[3] */,
+ const size_t * /* region[3] */,
+ size_t * /* image_row_pitch */,
+ size_t * /* image_slice_pitch */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */,
+ cl_int * /* errcode_ret */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueUnmapMemObject)
+(cl_command_queue /* command_queue */,
+ cl_mem /* memobj */,
+ void * /* mapped_ptr */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueMigrateMemObjects)
+(cl_command_queue /* command_queue */,
+ cl_uint /* num_mem_objects */,
+ const cl_mem * /* mem_objects */,
+ cl_mem_migration_flags /* flags */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueNDRangeKernel)
+(cl_command_queue /* command_queue */,
+ cl_kernel /* kernel */,
+ cl_uint /* work_dim */,
+ const size_t * /* global_work_offset */,
+ const size_t * /* global_work_size */,
+ const size_t * /* local_work_size */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueTask)
+(cl_command_queue /* command_queue */,
+ cl_kernel /* kernel */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueNativeKernel)
+(cl_command_queue /* command_queue */,
+ void (CL_CALLBACK * /*user_func*/)(void *),
+ void * /* args */,
+ size_t /* cb_args */,
+ cl_uint /* num_mem_objects */,
+ const cl_mem * /* mem_list */,
+ const void ** /* args_mem_loc */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueMarkerWithWaitList)
+(cl_command_queue /* command_queue */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+HB_OCL_API(cl_int, CL_API_CALL, clEnqueueBarrierWithWaitList)
+(cl_command_queue /* command_queue */,
+ cl_uint /* num_events_in_wait_list */,
+ const cl_event * /* event_wait_list */,
+ cl_event * /* event */);
+
+
+/* Extension function access
+ *
+ * Returns the extension function address for the given function name,
+ * or NULL if a valid function can not be found. The client must
+ * check to make sure the address is not NULL, before using or
+ * calling the returned function address.
+ */
+HB_OCL_API(void *, CL_API_CALL, clGetExtensionFunctionAddressForPlatform)
+(cl_platform_id /* platform */,
+ const char * /* func_name */);
+
+#ifdef __APPLE__
+#pragma mark -
+#endif // __APPLE__
+
+typedef struct hb_opencl_library_s
+{
+ void *library;
+
+ /* Pointers to select OpenCL API functions */
+ HB_OCL_FUNC_DECL(clBuildProgram);
+ HB_OCL_FUNC_DECL(clCreateBuffer);
+ HB_OCL_FUNC_DECL(clCreateCommandQueue);
+ HB_OCL_FUNC_DECL(clCreateContextFromType);
+ HB_OCL_FUNC_DECL(clCreateKernel);
+ HB_OCL_FUNC_DECL(clCreateProgramWithBinary);
+ HB_OCL_FUNC_DECL(clCreateProgramWithSource);
+ HB_OCL_FUNC_DECL(clEnqueueCopyBuffer);
+ HB_OCL_FUNC_DECL(clEnqueueMapBuffer);
+ HB_OCL_FUNC_DECL(clEnqueueNDRangeKernel);
+ HB_OCL_FUNC_DECL(clEnqueueReadBuffer);
+ HB_OCL_FUNC_DECL(clEnqueueUnmapMemObject);
+ HB_OCL_FUNC_DECL(clEnqueueWriteBuffer);
+ HB_OCL_FUNC_DECL(clFlush);
+ HB_OCL_FUNC_DECL(clGetCommandQueueInfo);
+ HB_OCL_FUNC_DECL(clGetContextInfo);
+ HB_OCL_FUNC_DECL(clGetDeviceIDs);
+ HB_OCL_FUNC_DECL(clGetDeviceInfo);
+ HB_OCL_FUNC_DECL(clGetPlatformIDs);
+ HB_OCL_FUNC_DECL(clGetPlatformInfo);
+ HB_OCL_FUNC_DECL(clGetProgramBuildInfo);
+ HB_OCL_FUNC_DECL(clGetProgramInfo);
+ HB_OCL_FUNC_DECL(clReleaseCommandQueue);
+ HB_OCL_FUNC_DECL(clReleaseContext);
+ HB_OCL_FUNC_DECL(clReleaseEvent);
+ HB_OCL_FUNC_DECL(clReleaseKernel);
+ HB_OCL_FUNC_DECL(clReleaseMemObject);
+ HB_OCL_FUNC_DECL(clReleaseProgram);
+ HB_OCL_FUNC_DECL(clSetKernelArg);
+ HB_OCL_FUNC_DECL(clWaitForEvents);
+} hb_opencl_library_t;
+
+hb_opencl_library_t* hb_opencl_library_init();
+void hb_opencl_library_close(hb_opencl_library_t **_opencl);
+
+/*
+ * Convenience pointer to a single shared OpenCL library wrapper.
+ *
+ * It can be initialized and closed via hb_ocl_init/close().
+ */
+extern hb_opencl_library_t *hb_ocl;
+int hb_ocl_init();
+void hb_ocl_close();
+
+typedef struct hb_opencl_device_s
+{
+ cl_platform_id platform;
+ cl_device_type type;
+ cl_device_id id;
+ char version[128];
+ char driver[128];
+ char vendor[128];
+ char name[128];
+ enum
+ {
+ HB_OCL_VENDOR_AMD,
+ HB_OCL_VENDOR_NVIDIA,
+ HB_OCL_VENDOR_INTEL,
+ HB_OCL_VENDOR_OTHER,
+ } ocl_vendor;
+} hb_opencl_device_t;
+
+int hb_opencl_available();
+void hb_opencl_info_print();
+
+/* OpenCL scaling */
+typedef struct hb_oclscale_s
+{
+ int initialized;
+ // bicubic scale weights
+ cl_mem bicubic_x_weights;
+ cl_mem bicubic_y_weights;
+ cl_float xscale;
+ cl_float yscale;
+ int width;
+ int height;
+ // horizontal scaling and vertical scaling kernel handle
+ cl_kernel m_kernel;
+ int use_ocl_mem; // 0 use host memory. 1 use gpu oclmem
+} hb_oclscale_t;
+
+int hb_ocl_scale(hb_buffer_t *in, hb_buffer_t *out, int *crop,
+ hb_oclscale_t *os);
+
+/* Utilities */
+#define HB_OCL_BUF_CREATE(ocl_lib, out, flags, size) \
+{ \
+ out = ocl_lib->clCreateBuffer(kenv->context, flags, size, NULL, &status); \
+ if (CL_SUCCESS != status) \
+ { \
+ return -1; \
+ } \
+}
+
+#define HB_OCL_BUF_FREE(ocl_lib, buf) \
+{ \
+ if (buf != NULL) \
+ { \
+ ocl_lib->clReleaseMemObject(buf); \
+ buf = NULL; \
+ } \
+}
+
+#define HB_OCL_CHECK(method, ...) \
+{ \
+ status = method(__VA_ARGS__); \
+ if (status != CL_SUCCESS) \
+ { \
+ hb_error("%s:%d (%s) error: %d\n",__FUNCTION__,__LINE__,#method,status);\
+ return status; \
+ } \
+}
+
+#endif//HB_OPENCL_H

HandBrake-0.10.0.tar.bz2/libhb/openclkernels.h Added

@@ -0,0 +1,771 @@
+/* openclkernels.h
+
+ Copyright (c) 2003-2014 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ 
+ Authors: Peng Gao <peng@multicorewareinc.com> <http://www.multicorewareinc.com/>
+ Li Cao <li@multicorewareinc.com> <http://www.multicorewareinc.com/>
+
+ */
+ 
+#ifndef USE_EXTERNAL_KERNEL
+
+#define KERNEL( ... )# __VA_ARGS__
+
+
+char *kernel_src_hscale = KERNEL (
+
+ typedef unsigned char fixed8;
+
+/*******************************************************************************************************
+dst: Horizontal scale destination;
+src: YUV content in opencl buf;
+hf_Y: Horizontal filter coefficients for Y planes;
+hf_UV: Horizontal filter coefficients for UV planes;
+hi_Y: Horizontal filter index for Y planes;
+hi_UV: Horizontal filter index for UV planes;
+stride: Src width;
+filter_len: Length of filter;
+********************************************************************************************************/
+ kernel void frame_h_scale (
+ global fixed8 *src,
+ global float *hf_Y,
+ global float *hf_UV,
+ global int *hi_Y,
+ global int *hi_UV,
+ global fixed8 *dst,
+ int stride, //src_width
+ int filter_len
+ )
+ {
+ int x = get_global_id( 0 );
+ int y = get_global_id( 1 );
+ int width = get_global_size( 0 );
+ int height = get_global_size( 1 );
+ float result_Y = 0, result_U = 0, result_V = 0;
+ int i = 0;
+
+ global fixed8 *src_Y = src;
+ global fixed8 *src_U = src_Y + stride * height;
+ global fixed8 *src_V = src_U + (stride >> 1) * (height >> 1);
+
+ global fixed8 *dst_Y = dst;
+ global fixed8 *dst_U = dst_Y + width * height;
+ global fixed8 *dst_V = dst_U + (width >> 1) * (height >> 1);
+
+ int xy = y * width + x;
+ global fixed8 *rowdata_Y = src_Y + (y * stride);
+ for( int i = 0; i < filter_len; i++ )
+ {
+ result_Y += ( hf_Y[x + i * width] * rowdata_Y[hi_Y[x] + i]);
+ }
+ dst_Y[xy] = result_Y;
+
+ if( y < (height >> 1) && x < (width >> 1) )
+ {
+ int xy = y * (width >> 1) + x;
+ global fixed8 *rowdata_U = src_U + (y * (stride >> 1));
+ global fixed8 *rowdata_V = src_V + (y * (stride >> 1));
+ for( i = 0; i < filter_len; i++ )
+ {
+ result_U += ( hf_UV[x + i * (width >> 1)] * rowdata_U[hi_UV[x] + i]);
+ result_V += ( hf_UV[x + i * (width >> 1)] * rowdata_V[hi_UV[x] + i]);
+ }
+ dst_U[xy] = result_U;
+ dst_V[xy] = result_V;
+ }
+ }
+ );
+
+/*******************************************************************************************************
+dst: Vertical scale destination;
+src: YUV content in opencl buf;
+hf_Y: Vertical filter coefficients for Y planes;
+hf_UV: Vertical filter coefficients for UV planes;
+hi_Y: Vertical filter index for Y planes;
+hi_UV: Vertical filter index for UV planes;
+stride: Src height;
+filter_len: Length of filter;
+********************************************************************************************************/
+char *kernel_src_vscale = KERNEL (
+
+ kernel void frame_v_scale (
+ global fixed8 *src,
+ global float *vf_Y,
+ global float *vf_UV,
+ global int *vi_Y,
+ global int *vi_UV,
+ global fixed8 *dst,
+ int src_height,
+ int filter_len
+ )
+ {
+ int x = get_global_id( 0 );
+ int y = get_global_id( 1 );
+ int width = get_global_size( 0 );
+ int height = get_global_size( 1 );
+ float result_Y = 0, result_U = 0, result_V = 0;
+ int i = 0;
+
+ global fixed8 *src_Y = src;
+ global fixed8 *src_U = src_Y + src_height * width;
+ global fixed8 *src_V = src_U + (src_height >> 1) * (width >> 1);
+
+ global fixed8 *dst_Y = dst;
+ global fixed8 *dst_U = dst_Y + height * width;
+ global fixed8 *dst_V = dst_U + (height >> 1) * (width >> 1);
+
+ int xy = y * width + x;
+ for( i = 0; i < filter_len; i++ )
+ {
+ result_Y += vf_Y[y + i * height] * src_Y[(vi_Y[y] + i) * width + x];
+ }
+ dst_Y[xy] = result_Y;
+
+ if( y < (height >> 1) && x < (width >> 1) )
+ {
+ int xy = y * (width >> 1) + x;
+ for( i = 0; i < filter_len; i++ )
+ {
+ result_U += vf_UV[y + i * (height >> 1)] * src_U[(vi_UV[y] + i) * (width >> 1) + x];
+ result_V += vf_UV[y + i * (height >> 1)] * src_V[(vi_UV[y] + i) * (width >> 1) + x];
+ }
+ dst_U[xy] = result_U;
+ dst_V[xy] = result_V;
+ }
+ }
+ );
+
+/*******************************************************************************************************
+input: Input buffer;
+output: Output buffer;
+w: Width of frame;
+h: Height of frame;
+********************************************************************************************************/
+char *kernel_src_nvtoyuv = KERNEL (
+
+ kernel void nv12toyuv ( global char *input, global char* output, int w, int h )
+ {
+ int x = get_global_id( 0 );
+ int y = get_global_id( 1 );
+ int idx = y * (w >> 1) + x;
+ vstore4((vload4( 0, input + (idx << 2))), 0, output + (idx << 2)); //Y
+ char2 uv = vload2( 0, input + (idx << 1) + w * h );
+ output[idx + w * h] = uv.s0;
+ output[idx + w * h + ((w * h) >> 2)] = uv.s1;
+ }
+ );
+
+/*******************************************************************************************************
+dst: Horizontal scale destination;
+src: YUV content in opencl buf;
+yfilter: Opencl memory of horizontal filter coefficients for luma/alpha planes;
+yfilterPos: Opencl memory of horizontal filter starting positions for each dst[i] for luma/alpha planes;
+yfilterSize: Horizontal filter size for luma/alpha pixels;
+cfilter: Opencl memory of horizontal filter coefficients for chroma planes;
+cfilterPos: Opencl memory of horizontal filter starting positions for each dst[i] for chroma planes;
+cfilterSize: Horizontal filter size for chroma pixels;
+dstStride: Width of destination luma/alpha planes;
+dstChrStride: Width of destination chroma planes;
+********************************************************************************************************/
+
+char *kernel_src_hscaleall = KERNEL (
+
+ kernel void hscale_all_opencl (
+ global short *dst,
+ const global unsigned char *src,
+ const global short *yfilter,
+ const global int *yfilterPos,
+ int yfilterSize,
+ const global short *cfilter,
+ const global int *cfilterPos,
+ int cfilterSize,
+ int dstWidth,
+ int dstHeight,
+ int srcWidth,
+ int srcHeight,
+ int dstStride,
+ int dstChrStride,
+ int srcStride,
+ int srcChrStride)
+ {
+ int w = get_global_id(0);
+ int h = get_global_id(1);
+
+ int chrWidth = get_global_size(0);
+ int chrHeight = get_global_size(1);
+
+ int srcPos1 = h * srcStride + yfilterPos[w];
+ int srcPos2 = h * srcStride + yfilterPos[w + chrWidth];
+ int srcPos3 = (h + (srcHeight >> 1)) * srcStride + yfilterPos[w];
+ int srcPos4 = (h + (srcHeight >> 1)) * srcStride + yfilterPos[w + chrWidth];
+ int srcc1Pos = srcStride * srcHeight + (h) * (srcChrStride) + cfilterPos[w];
+ int srcc2Pos = srcc1Pos + ((srcChrStride)*(chrHeight));
+
+ int val1 = 0;
+ int val2 = 0;
+ int val3 = 0;
+ int val4 = 0;
+ int val5 = 0;
+ int val6 = 0;
+
+ int filterPos1 = yfilterSize * w;
+ int filterPos2 = yfilterSize * (w + chrWidth);
+ int cfilterPos1 = cfilterSize * w;
+
+ int j;
+ for (j = 0; j < yfilterSize; j++)
+ {
+ val1 += src[srcPos1 + j] * yfilter[filterPos1+ j];
+ val2 += src[srcPos2 + j] * yfilter[filterPos2 + j];
+ val3 += src[srcPos3 + j] * yfilter[filterPos1 + j];
+ val4 += src[srcPos4 + j] * yfilter[filterPos2 + j];
+ val5 += src[srcc1Pos+j] * cfilter[cfilterPos1 + j];
+ val6 += src[srcc2Pos+j] * cfilter[cfilterPos1 + j];
+ }
+ int dstPos1 = h *dstStride;
+ int dstPos2 = (h + chrHeight) * dstStride;
+
+ dst[dstPos1 + w] = ((val1 >> 7) > ((1 << 15) - 1) ? ((1 << 15) - 1) : (val1 >> 7));
+ dst[dstPos1 + w + chrWidth] = ((val2 >> 7) > ((1 << 15) - 1) ? ((1 << 15) - 1) : (val2 >> 7));
+ dst[dstPos2 + w] = ((val3 >> 7) > ((1 << 15) - 1) ? ((1 << 15) - 1) : (val3 >> 7));
+ dst[dstPos2 + w + chrWidth] = ((val4 >> 7) > ((1 << 15) - 1) ? ((1 << 15) - 1) : (val4 >> 7));
+
+ int dstPos3 = h * (dstChrStride) + w + dstStride * dstHeight;
+ int dstPos4 = h * (dstChrStride) + w + dstStride * dstHeight + ((dstChrStride) * chrHeight);
+ dst[dstPos3] = ((val5 >> 7) > ((1 << 15) - 1) ? ((1 << 15) - 1) : (val5 >> 7));
+ dst[dstPos4] = ((val6 >> 7) > ((1 << 15) - 1) ? ((1 << 15) - 1) : (val6 >> 7));
+ }
+ );
+
+char *kernel_src_hscalefast = KERNEL (
+
+ kernel void hscale_fast_opencl (
+ global short *dst,
+ const global unsigned char *src,
+ int xInc,
+ int chrXInc,
+ int dstWidth,
+ int dstHeight,
+ int srcWidth,
+ int srcHeight,
+ int dstStride,
+ int dstChrStride,
+ int srcStride,
+ int srcChrStride)
+ {
+
+ int w = get_global_id(0);
+ int h = get_global_id(1);
+
+ int chrWidth = get_global_size(0);
+ int chrHeight = get_global_size(1);
+ int xpos1 = 0;
+ int xpos2 = 0;
+ int xx = xpos1 >> 16;
+ int xalpha = (xpos1 & 0xFFFF) >> 9;
+ dst[h * dstStride + w] = (src[h * srcStride + xx] << 7) + (src[h * srcStride + xx + 1] -src[h * srcStride + xx]) * xalpha;
+ int lowpart = h + (chrHeight);
+ dst[lowpart * dstStride + w] = (src[lowpart * srcStride + xx] << 7) + (src[lowpart * srcStride + xx + 1] - src[lowpart * srcStride + xx]) * xalpha;
+
+ int inv_i = w * xInc >> 16;
+ if( inv_i >= srcWidth - 1)
+ {
+ dst[h*dstStride + w] = src[h*srcStride + srcWidth-1]*128;
+ dst[lowpart*dstStride + w] = src[lowpart*srcStride + srcWidth - 1] * 128;
+ }
+
+ int rightpart = w + (chrWidth);
+ xx = xpos2 >> 16;
+ xalpha = (xpos2 & 0xFFFF) >> 9;
+ dst[h * dstStride + rightpart] = (src[h *srcStride + xx] << 7) + (src[h * srcStride + xx + 1] - src[h * srcStride + xx]) * xalpha;
+ dst[lowpart * dstStride + rightpart] = (src[lowpart * srcStride + xx] << 7) + (src[lowpart * srcStride + xx + 1] - src[lowpart * srcStride + xx]) * xalpha;
+ inv_i = rightpart * xInc >> 16;
+ if( inv_i >= srcWidth - 1)
+ {
+ dst[h * dstStride + rightpart] = src[h * srcStride + srcWidth - 1] * 128;
+ dst[lowpart * dstStride + rightpart] = src[lowpart * srcStride + srcWidth - 1] * 128;
+ }
+
+ int xpos = 0;
+ xpos = chrXInc * w;
+ xx = xpos >> 16;
+ xalpha = (xpos & 0xFFFF) >> 9;
+ src += srcStride * srcHeight;
+ dst += dstStride * dstHeight;
+ dst[h * (dstChrStride) + w] = (src[h * (srcChrStride) + xx] * (xalpha^127) + src[h * (srcChrStride) + xx + 1] * xalpha);
+ inv_i = w * xInc >> 16;
+ if( inv_i >= (srcWidth >> 1) - 1)
+ {
+ dst[h * (dstChrStride) + w] = src[h * (srcChrStride) + (srcWidth >> 1) -1]*128;
+ }
+
+ xpos = chrXInc * (w);
+ xx = xpos >> 16;
+ src += srcChrStride * srcHeight >> 1;
+ dst += (dstChrStride * chrHeight);
+ dst[h * (dstChrStride) + w] = (src[h * (srcChrStride) + xx] * (xalpha^127) + src[h * (srcChrStride) + xx + 1 ] * xalpha);
+
+ if( inv_i >= (srcWidth >> 1) - 1)
+ {
+ //v channel:
+ dst[h * (dstChrStride) + w] = src[h * (srcChrStride) + (srcWidth >> 1) -1] * 128;
+ }
+ }
+ );
+
+char *kernel_src_vscalealldither = KERNEL (
+
+ kernel void vscale_all_dither_opencl (
+ global unsigned char *dst,
+ const global short *src,
+ const global short *yfilter,
+ int yfilterSize,
+ const global short *cfilter,
+ int cfilterSize,
+ const global int *yfilterPos,
+ const global int *cfilterPos,
+ int dstWidth,
+ int dstHeight,
+ int srcWidth,
+ int srcHeight,
+ int dstStride,
+ int dstChrStride,
+ int srcStride,
+ int srcChrStride)
+ {
+ const unsigned char hb_dither_8x8_128[8][8] = {
+ { 36, 68, 60, 92, 34, 66, 58, 90, },
+ { 100, 4, 124, 28, 98, 2, 122, 26, },
+ { 52, 84, 44, 76, 50, 82, 42, 74, },
+ { 116, 20, 108, 12, 114, 18, 106, 10, },
+ { 32, 64, 56, 88, 38, 70, 62, 94, },
+ { 96, 0, 120, 24, 102, 6, 126, 30, },
+ { 48, 80, 40, 72, 54, 86, 46, 78, },
+ { 112, 16, 104, 8, 118, 22, 110, 14, },
+ };
+
+
+ int w = get_global_id(0);
+ int h = get_global_id(1);
+
+ int chrWidth = get_global_size(0);
+ int chrHeight = get_global_size(1);
+ const unsigned char *local_up_dither;
+ const unsigned char *local_down_dither;
+
+ local_up_dither = hb_dither_8x8_128[h & 7];
+ local_down_dither = hb_dither_8x8_128[(h + chrHeight) & 7];
+
+ //yscale;
+ int srcPos1 = (yfilterPos[h]) * srcStride + w;
+ int srcPos2 = (yfilterPos[h]) * srcStride + w + (chrWidth);
+ int srcPos3 = (yfilterPos[h + chrHeight]) * srcStride + w;
+ int srcPos4 = (yfilterPos[h + chrHeight]) * srcStride + w + chrWidth;
+ int src1Pos = dstStride * srcHeight + (cfilterPos[h]) * dstChrStride + (w);
+ int src2Pos = dstStride * srcHeight + (dstChrStride*(srcHeight>>1)) + (cfilterPos[h]) * dstChrStride + w;
+
+ int val1 = (local_up_dither[w & 7] << 12); //y offset is 0;
+ int val2 = (local_up_dither[(w + chrWidth) & 7] << 12);
+ int val3 = (local_down_dither[w &7] << 12);
+ int val4 = (local_down_dither[(w + chrWidth) & 7] << 12);
+ int val5 = (local_up_dither[w & 7] << 12);
+ int val6 = (local_up_dither[(w + 3) & 7] << 12); // 3 is offset of the chrome channel.
+
+ int j;
+ int filterPos1 = h * yfilterSize;
+ int filterPos2 = ( h + chrHeight ) * yfilterSize;
+ for(j = 0; j < yfilterSize; j++)
+ {
+ val1 += src[srcPos1] * yfilter[filterPos1 + j];
+ srcPos1 += srcStride;
+ val2 += src[srcPos2] * yfilter[filterPos1 + j];
+ srcPos2 += srcStride;
+ val3 += src[srcPos3] * yfilter[filterPos2 + j];
+ srcPos3 += srcStride;
+ val4 += src[srcPos4] * yfilter[filterPos2 + j];
+ srcPos4 += srcStride;
+ val5 += src[src1Pos] * cfilter[filterPos1 + j];
+ val6 += src[src2Pos] * cfilter[filterPos1 + j];
+ src1Pos += dstChrStride;
+ src2Pos += dstChrStride;
+ }
+ dst[h * dstStride + w] = (((val1 >> 19)&(~0xFF)) ? ((-(val1 >> 19)) >> 31) : (val1 >> 19));
+ dst[h * dstStride + w + chrWidth] = (((val2 >> 19)&(~0xFF)) ? ((-(val2 >> 19)) >> 31) : (val2 >> 19));
+ dst[(h + chrHeight) * dstStride + w] = (((val3 >> 19)&(~0xFF)) ? ((-(val3 >> 19)) >> 31) : (val3 >> 19));
+ dst[(h + chrHeight) * dstStride + w + chrWidth] = (((val4 >> 19)&(~0xFF)) ? ((-(val4 >> 19)) >> 31) : (val4 >> 19));
+
+ int dst1Pos = dstStride * dstHeight + h*(dstChrStride)+(w);
+ int dst2Pos = (dstChrStride * chrHeight) + dst1Pos;
+ dst[dst1Pos] = (((val5 >> 19)&(~0xFF)) ? ((-(val5 >> 19)) >> 31) : (val5 >> 19));
+ dst[dst2Pos] = (((val6 >> 19)&(~0xFF)) ? ((-(val6 >> 19)) >> 31) : (val6 >> 19));
+ }
+ );
+
+char *kernel_src_vscaleallnodither = KERNEL (
+
+ kernel void vscale_all_nodither_opencl (
+ global unsigned char *dst,
+ const global short *src,
+ const global short *yfilter,
+ int yfilterSize,
+ const global short *cfilter,
+ int cfilterSize,
+ const global int *yfilterPos,
+ const global int *cfilterPos,
+ int dstWidth,
+ int dstHeight,
+ int srcWidth,
+ int srcHeight,
+ int dstStride,
+ int dstChrStride,
+ int srcStride,
+ int srcChrStride)
+ {
+ const unsigned char hb_sws_pb_64[8] = {
+ 64, 64, 64, 64, 64, 64, 64, 64
+ };
+
+ int w = get_global_id(0);
+ int h = get_global_id(1);
+
+ int chrWidth = get_global_size(0);
+ int chrHeight = get_global_size(1);
+ const unsigned char *local_up_dither;
+ const unsigned char *local_down_dither;
+
+ local_up_dither = hb_sws_pb_64;
+ local_down_dither = hb_sws_pb_64;
+
+
+ //yscale;
+ int srcPos1 = (yfilterPos[h]) * srcStride + w;
+ int srcPos2 = (yfilterPos[h]) * srcStride + w + (chrWidth);
+ int srcPos3 = (yfilterPos[h + chrHeight]) * srcStride + w;
+ int srcPos4 = (yfilterPos[h + chrHeight]) * srcStride + w + chrWidth;
+ int src1Pos = dstStride * srcHeight + (cfilterPos[h]) * dstChrStride + (w);
+ int src2Pos = dstStride * srcHeight + (dstChrStride*(srcHeight>>1)) + (cfilterPos[h]) * dstChrStride + w;
+
+ int val1 = (local_up_dither[w & 7] << 12); //y offset is 0;
+ int val2 = (local_up_dither[(w + chrWidth) & 7] << 12);
+ int val3 = (local_down_dither[w &7] << 12);
+ int val4 = (local_down_dither[(w + chrWidth) & 7] << 12);
+ int val5 = (local_up_dither[w & 7] << 12);
+ int val6 = (local_up_dither[(w + 3) & 7] << 12); // 3 is offset of the chrome channel.
+
+
+ int j;
+ int filterPos1 = h * yfilterSize;
+ int filterPos2 = ( h + chrHeight ) * yfilterSize;
+ for(j = 0; j < yfilterSize; j++)
+ {
+ val1 += src[srcPos1] * yfilter[filterPos1 + j];
+ srcPos1 += srcStride;
+ val2 += src[srcPos2] * yfilter[filterPos1 + j];
+ srcPos2 += srcStride;
+ val3 += src[srcPos3] * yfilter[filterPos2 + j];
+ srcPos3 += srcStride;
+ val4 += src[srcPos4] * yfilter[filterPos2 + j];
+ srcPos4 += srcStride;
+ val5 += src[src1Pos] * cfilter[filterPos1 + j];
+ val6 += src[src2Pos] * cfilter[filterPos1 + j];
+ src1Pos += dstChrStride;
+ src2Pos += dstChrStride;
+ }
+ dst[h * dstStride + w] = (((val1 >> 19)&(~0xFF)) ? ((-(val1 >> 19)) >> 31) : (val1 >> 19));
+ dst[h * dstStride + w + chrWidth] = (((val2 >> 19)&(~0xFF)) ? ((-(val2 >> 19)) >> 31) : (val2 >> 19));
+ dst[(h + chrHeight) * dstStride + w] = (((val3 >> 19)&(~0xFF)) ? ((-(val3 >> 19)) >> 31) : (val3 >> 19));
+ dst[(h + chrHeight) * dstStride + w + chrWidth] = (((val4 >> 19)&(~0xFF)) ? ((-(val4 >> 19)) >> 31) : (val4 >> 19));;
+
+ int dst1Pos = dstStride * dstHeight + h * (dstChrStride) + (w);
+ int dst2Pos = (dstChrStride * chrHeight) + dst1Pos;
+ dst[dst1Pos] = (((val5 >> 19)&(~0xFF)) ? ((-(val5 >> 19)) >> 31) : (val5 >> 19));
+ dst[dst2Pos] = (((val6 >> 19)&(~0xFF)) ? ((-(val6 >> 19)) >> 31) : (val6 >> 19));
+ }
+ );
+
+char *kernel_src_vscalefast = KERNEL (
+
+ kernel void vscale_fast_opencl (
+ global unsigned char *dst,
+ const global short *src,
+ const global int *yfilterPos,
+ const global int *cfilterPos,
+ int dstWidth,
+ int dstHeight,
+ int srcWidth,
+ int srcHeight,
+ int dstStride,
+ int dstChrStride,
+ int srcStride,
+ int srcChrStride)
+ {
+ const unsigned char hb_sws_pb_64[8] = {
+ 64, 64, 64, 64, 64, 64, 64, 64
+ };
+
+ int w = get_global_id(0);
+ int h = get_global_id(1);
+
+ int chrWidth = get_global_size(0);
+ int chrHeight = get_global_size(1);
+
+ const unsigned char *local_up_dither;
+ const unsigned char *local_down_dither;
+
+ local_up_dither = hb_sws_pb_64;
+ local_down_dither = hb_sws_pb_64;
+
+
+ int rightpart = w + chrWidth;
+ int bh = h + chrHeight; // bottom part
+ short val1 = (src[(yfilterPos[h]) * dstStride + w] + local_up_dither[(w + 0) & 7]) >> 7; //lum offset is 0;
+ short val2 = (src[(yfilterPos[h]) * dstStride + rightpart] + local_up_dither[rightpart & 7]) >> 7;
+ short val3 = (src[(yfilterPos[bh]) * dstStride + w] + local_down_dither[w & 7]) >> 7;
+ short val4 = (src[(yfilterPos[bh]) * dstStride + rightpart] + local_down_dither[rightpart & 7]) >> 7;
+ dst[h * dstStride + w] = ((val1&(~0xFF)) ? ((-val1) >> 31) : (val1));
+ dst[h * dstStride + rightpart] = ((val2&(~0xFF)) ? ((-val2) >> 31) : (val2));
+ dst[bh * dstStride + w] = ((val3&(~0xFF)) ? ((-val3) >> 31) : (val3));
+ dst[bh * dstStride + rightpart] = ((val4&(~0xFF)) ? ((-val4) >> 31) : (val4));
+
+ src += dstStride * srcHeight;
+ dst += dstStride * dstHeight;
+ val1 = (src[cfilterPos[h] * (dstChrStride) + w] + local_up_dither[ w & 7]) >> 7;
+ dst[h * (dstChrStride) + w] = ((val1&(~0xFF)) ? ((-val1) >> 31) : (val1));
+
+ src += dstChrStride * (srcHeight >> 1);
+ dst += dstChrStride * chrHeight;
+ val1 = (src[cfilterPos[h] * dstChrStride + w] + local_up_dither[ (w + 3) & 7] ) >> 7;
+ dst[h * dstChrStride + w] = ((val1&(~0xFF)) ? ((-val1) >> 31) : (val1));
+
+ }
+ );
+
+char *kernel_src_scale = KERNEL (
+
+__kernel __attribute__((reqd_work_group_size(64, 1, 1))) void frame_scale(__global uchar *dst,
+ __global const uchar *src,
+ const float xscale,
+ const float yscale,
+ const int srcPlaneOffset0,
+ const int srcPlaneOffset1,
+ const int srcPlaneOffset2,
+ const int dstPlaneOffset0,
+ const int dstPlaneOffset1,
+ const int dstPlaneOffset2,
+ const int srcRowWords0,
+ const int srcRowWords1,
+ const int srcRowWords2,
+ const int dstRowWords0,
+ const int dstRowWords1,
+ const int dstRowWords2,
+ const int srcWidth,
+ const int srcHeight,
+ const int dstWidth,
+ const int dstHeight,
+ __global const float4* restrict xweights,
+ __global const float4* restrict yweights
+ )
+{
+ const int x = get_global_id(0);
+ const int y = get_global_id(1);
+ const int z = get_global_id(2);
+
+ // Abort work items outside the dst image bounds.
+
+ if ((get_group_id(0) * 64 >= (dstWidth >> ((z == 0) ? 0 : 1))) || (get_group_id(1) * 16 >= (dstHeight >> ((z == 0) ? 0 : 1))))
+ return;
+
+ const int srcPlaneOffset = (z == 0) ? srcPlaneOffset0 : ((z == 1) ? srcPlaneOffset1 : srcPlaneOffset2);
+ const int dstPlaneOffset = (z == 0) ? dstPlaneOffset0 : ((z == 1) ? dstPlaneOffset1 : dstPlaneOffset2);
+ const int srcRowWords = (z == 0) ? srcRowWords0: ((z == 1) ? srcRowWords1 : srcRowWords2);
+ const int dstRowWords = (z == 0) ? dstRowWords0: ((z == 1) ? dstRowWords1 : dstRowWords2);
+
+ __local uchar pixels[64 * 36];
+ const int localRowPixels = 64;
+ const int groupHeight = 16; // src pixel height output by the workgroup
+ const int ypad = 2;
+ const int localx = get_local_id(0);
+
+ const int globalStartRow = floor((get_group_id(1) * groupHeight) / yscale);
+ const int globalRowCount = ceil(groupHeight / yscale) + 2 * ypad;
+
+ float4 weights = xweights[x];
+ int4 woffs = floor(x / xscale);
+ woffs += (int4)(-1, 0, 1, 2);
+ woffs = clamp(woffs, 0, (srcWidth >> ((z == 0) ? 0 : 1)) - 1);
+ const int maxy = (srcHeight >> ((z == 0) ? 0 : 1)) - 1;
+
+ // Scale x from global into LDS
+
+ for (int i = 0; i <= globalRowCount; ++i) {
+ int4 offs = srcPlaneOffset + clamp(globalStartRow - ypad + i, 0, maxy) * srcRowWords;
+ offs += woffs;
+ pixels[localx + i * localRowPixels] = convert_uchar(clamp(round(dot(weights,
+ (float4)(src[offs.x], src[offs.y], src[offs.z], src[offs.w]))), 0.0f, 255.0f));
+ }
+ 
+ barrier(CLK_LOCAL_MEM_FENCE);
+
+ // Scale y from LDS into global
+
+ if (x >= dstWidth >> ((z == 0) ? 0 : 1))
+ return;
+
+ int off = dstPlaneOffset + x + (get_group_id(1) * groupHeight) * dstRowWords;
+
+ for (int i = 0; i < groupHeight; ++i) {
+ if (y >= dstHeight >> ((z == 0) ? 0 : 1))
+ break;
+ int localy = floor((get_group_id(1) * groupHeight + i) / yscale);
+ localy = localy - globalStartRow + ypad;
+ int loff = localx + localy * localRowPixels;
+ dst[off] = convert_uchar(clamp(round(dot(yweights[get_group_id(1) * groupHeight + i],
+ (float4)(pixels[loff - localRowPixels], pixels[loff], pixels[loff + localRowPixels]
+ , pixels[loff + localRowPixels * 2]))), 0.0f, 255.0f));
+ off += dstRowWords;
+ }
+}
+);
+
+
+char *kernel_src_yadif_filter = KERNEL(
+ void filter_v6(
+ global unsigned char *dst,
+ global unsigned char *prev, 
+ global unsigned char *cur, 
+ global unsigned char *next,
+ int x,
+ int y,
+ int width,
+ int height,
+ int parity,
+ int inlinesize,
+ int outlinesize,
+ int inmode,
+ int uvflag
+ )
+ {
+
+ int flag = uvflag * (y >=height) * height; 
+ int prefs = select(-(inlinesize), inlinesize,((y+1) - flag) <height);
+ int mrefs = select(inlinesize, -(inlinesize),y - flag);
+ int mode = select(inmode,2,(y - flag==1) || (y - flag + 2==height));
+ int score;
+ 
+ global unsigned char *prev2 = parity ? prev : cur ;
+ global unsigned char *next2 = parity ? cur : next;
+ int index = x + y * inlinesize;
+ int outindex = x + y * outlinesize;
+ int c = cur[index + mrefs]; 
+ int d = (prev2[index] + next2[index])>>1; 
+ int e = cur[index + prefs]; 
+ int temporal_diff0 = abs((prev2[index]) - (next2[index])); 
+ int temporal_diff1 =(abs(prev[index + mrefs] - c) + abs(prev[index + prefs] - e) )>>1; 
+ int temporal_diff2 =(abs(next[index + mrefs] - c) + abs(next[index + prefs] - e) )>>1; 
+ int diff = max(max(temporal_diff0>>1, temporal_diff1), temporal_diff2); 
+ int spatial_pred = (c+e)>>1; 
+ int spatial_score = abs(cur[index + mrefs-1] - cur[index + prefs-1]) + abs(c-e) + abs(cur[index + mrefs+1] - cur[index + prefs+1]) - 1; 
+ //check -1
+ score = abs(cur[index + mrefs-2] - cur[index + prefs])
+ + abs(cur[index + mrefs-1] - cur[index + prefs+1])
+ + abs(cur[index + mrefs] - cur[index + prefs+2]);
+ if (score < spatial_score)
+ {
+ spatial_score= score;
+ spatial_pred= (cur[index + mrefs-1] + cur[index + prefs+1])>>1;
+ }
+ //check -2
+ score = abs(cur[index + mrefs-3] - cur[index + prefs+1])
+ + abs(cur[index + mrefs-2] - cur[index + prefs+2])
+ + abs(cur[index + mrefs-1] - cur[index + prefs+3]);
+ if (score < spatial_score)
+ {
+ spatial_score= score;
+ spatial_pred= (cur[index + mrefs-2] + cur[index + prefs+2])>>1;
+ }
+ //check 1
+ score = abs(cur[index + mrefs] - cur[index + prefs-2])
+ + abs(cur[index + mrefs+1] - cur[index + prefs-1])
+ + abs(cur[index + mrefs+2] - cur[index + prefs]);
+ if (score < spatial_score)
+ {
+ spatial_score= score;
+ spatial_pred= (cur[index + mrefs+1] + cur[index + prefs-1])>>1;
+ }
+ //check 2
+ score = abs(cur[index + mrefs+1] - cur[index + prefs-3])
+ + abs(cur[index + mrefs+2] - cur[index + prefs-2])
+ + abs(cur[index + mrefs+3] - cur[index + prefs-1]);
+ if (score < spatial_score)
+ {
+ spatial_score= score;
+ spatial_pred= (cur[index + mrefs+2] + cur[index + prefs-2])>>1;
+ }
+ if (mode < 2)
+ { 
+ int b = (prev2[index + (mrefs<<1)] + next2[index + (mrefs<<1)])>>1; 
+ int f = (prev2[index + (prefs<<1)] + next2[index + (prefs<<1)])>>1; 
+ int diffmax = max(max(d-e, d-c), min(b-c, f-e)); 
+ int diffmin = min(min(d-e, d-c), max(b-c, f-e)); 
+
+ diff = max(max(diff, diffmin), -diffmax); 
+ } 
+ if (spatial_pred > d + diff) 
+ {
+ spatial_pred = d + diff; 
+ }
+ else if (spatial_pred < d - diff) 
+ {
+ spatial_pred = d - diff; 
+ }
+
+ dst[outindex] = spatial_pred; 
+ }
+
+ kernel void yadif_filter(
+ global unsigned char *dst,
+ global unsigned char *prev,
+ global unsigned char *cur,
+ global unsigned char *next,
+ int parity,
+ int inlinesizeY,
+ int inlinesizeUV,
+ int outlinesizeY,
+ int outlinesizeUV,
+ int mode)
+ {
+ int x=get_global_id(0);
+ int y=(get_global_id(1)<<1) + (!parity);
+ int width=(get_global_size(0)<<1)/3;
+ int height=get_global_size(1)<<1;
+ 
+
+ global unsigned char *dst_Y=dst;
+ global unsigned char *dst_U=dst_Y+height*outlinesizeY;
+
+ global unsigned char *prev_Y=prev;
+ global unsigned char *prev_U=prev_Y+height*inlinesizeY;
+
+ global unsigned char *cur_Y=cur;
+ global unsigned char *cur_U=cur_Y+height*inlinesizeY;
+
+ global unsigned char *next_Y=next;
+ global unsigned char *next_U=next_Y+height*inlinesizeY;
+
+ if(x < width)
+ {
+ filter_v6(dst_Y,prev_Y,cur_Y,next_Y,x,y,width,height,parity,inlinesizeY,outlinesizeY,mode,0);
+ }
+ else
+ {
+ x = x - width;
+ filter_v6(dst_U,prev_U,cur_U,next_U,x,y,width>>1,height>>1,parity,inlinesizeUV,outlinesizeUV,mode,1);
+ }
+ }
+ );
+
+#endif

HandBrake-0.10.0.tar.bz2/libhb/openclwrapper.c Added

@@ -0,0 +1,1207 @@
+/* openclwrapper.c
+
+ Copyright (c) 2003-2014 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+
+ Authors: Peng Gao <peng@multicorewareinc.com> <http://www.multicorewareinc.com/>
+ Li Cao <li@multicorewareinc.com> <http://www.multicorewareinc.com/>
+ */
+ 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "extras/cl.h"
+#include "opencl.h"
+#include "openclwrapper.h"
+#include "openclkernels.h"
+
+//#define USE_EXTERNAL_KERNEL
+#ifdef SYS_MINGW
+#include <windows.h>
+#endif
+
+#if defined(_MSC_VER)
+#define strcasecmp strcmpi
+#endif
+
+#define MAX_KERNEL_STRING_LEN 64
+#define MAX_CLFILE_NUM 50
+#define MAX_CLKERNEL_NUM 200
+#define MAX_CLFILE_PATH 255
+#define MAX_KERNEL_NUM 50
+#define MAX_KERNEL_NAME_LEN 64
+
+#ifndef INVALID_HANDLE_VALUE
+#define INVALID_HANDLE_VALUE NULL
+#endif
+
+//#define THREAD_PRIORITY_TIME_CRITICAL 15
+
+enum VENDOR
+{
+ AMD = 0,
+ Intel,
+ NVIDIA,
+ others
+};
+typedef struct _GPUEnv
+{
+ //share vb in all modules in hb library
+ cl_platform_id platform;
+ cl_device_type dType;
+ cl_context context;
+ cl_device_id * devices;
+ cl_device_id dev;
+ cl_command_queue command_queue;
+ cl_kernel kernels[MAX_CLFILE_NUM];
+ cl_program programs[MAX_CLFILE_NUM]; //one program object maps one kernel source file
+ char kernelSrcFile[MAX_CLFILE_NUM][256]; //the max len of kernel file name is 256
+ int file_count; // only one kernel file
+
+ char kernel_names[MAX_CLKERNEL_NUM][MAX_KERNEL_STRING_LEN+1];
+ cl_kernel_function kernel_functions[MAX_CLKERNEL_NUM];
+ int kernel_count;
+ int isUserCreated; // 1: created , 0:no create and needed to create by opencl wrapper
+ enum VENDOR vendor;
+}GPUEnv;
+
+typedef struct
+{
+ char kernelName[MAX_KERNEL_NAME_LEN+1];
+ char * kernelStr;
+}hb_kernel_node;
+
+static GPUEnv gpu_env;
+static int isInited = 0;
+static int useBuffers = 0;
+static hb_kernel_node gKernels[MAX_KERNEL_NUM];
+
+#define HB_OCL_ADD_KERNEL_CFG(idx, s, p) \
+{ \
+ strcpy(gKernels[idx].kernelName, s); \
+ gKernels[idx].kernelStr = p; \
+ strcpy(gpu_env.kernel_names[idx], s); \
+ gpu_env.kernel_count++; \
+}
+
+/**
+ * hb_regist_opencl_kernel
+ */
+int hb_regist_opencl_kernel()
+{
+ //if( !gpu_env.isUserCreated )
+ // memset( &gpu_env, 0, sizeof(gpu_env) );
+ //Comment for posterity: When in doubt just zero out a structure full of pointers to allocated resources.
+
+ gpu_env.file_count = 0; //argc;
+ gpu_env.kernel_count = 0UL;
+
+ HB_OCL_ADD_KERNEL_CFG(0, "frame_scale", NULL);
+ HB_OCL_ADD_KERNEL_CFG(1, "yadif_filter", NULL);
+
+ return 0;
+}
+
+/**
+ * hb_regist_opencl_kernel
+ * @param filename -
+ * @param source -
+ * @param gpu_info -
+ * @param int idx -
+ */
+int hb_convert_to_string( const char *filename, char **source, GPUEnv *gpu_info, int idx )
+{
+ int file_size;
+ size_t result;
+ FILE * file = NULL;
+ file_size = 0;
+ result = 0;
+ file = fopen( filename, "rb+" );
+
+ if( file!=NULL )
+ {
+ fseek( file, 0, SEEK_END );
+
+ file_size = ftell( file );
+ rewind( file );
+ *source = (char*)malloc( sizeof(char) * file_size + 1 );
+ if( *source == (char*)NULL )
+ {
+ return(0);
+ }
+ result = fread( *source, 1, file_size, file );
+ if( result != file_size )
+ {
+ free( *source );
+ return(0);
+ }
+ (*source)[file_size] = '\0';
+ fclose( file );
+
+ return(1);
+ }
+ return(0);
+}
+
+/**
+ * hb_binary_generated
+ * @param context -
+ * @param cl_file_name -
+ * @param fhandle -
+ */
+int hb_binary_generated( cl_context context, const char * cl_file_name, FILE ** fhandle )
+{
+ int i = 0;
+ cl_int status;
+ cl_uint numDevices;
+ cl_device_id *devices;
+ char * str = NULL;
+ FILE * fd = NULL;
+
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_binary_generated: OpenCL support not available");
+ return 0;
+ }
+
+ status = hb_ocl->clGetContextInfo(context, CL_CONTEXT_NUM_DEVICES,
+ sizeof(numDevices), &numDevices, NULL);
+ if( status != CL_SUCCESS )
+ {
+ hb_log( "OpenCL: Get context info failed" );
+ return 0;
+ }
+
+ devices = (cl_device_id*)malloc( sizeof(cl_device_id) * numDevices );
+ if( devices == NULL )
+ {
+ hb_log( "OpenCL: No device found" );
+ return 0;
+ }
+
+ /* grab the handles to all of the devices in the context. */
+ status = hb_ocl->clGetContextInfo(context, CL_CONTEXT_DEVICES,
+ sizeof(cl_device_id) * numDevices,
+ devices, NULL);
+
+ status = 0;
+ /* dump out each binary into its own separate file. */
+ for (i = 0; i < numDevices; i++)
+ {
+ char fileName[256] = { 0 };
+ char cl_name[128] = { 0 };
+ if (devices[i])
+ {
+ char deviceName[1024];
+ status = hb_ocl->clGetDeviceInfo(devices[i], CL_DEVICE_NAME,
+ sizeof(deviceName), deviceName, NULL);
+
+ str = (char*)strstr(cl_file_name, ".cl");
+ memcpy(cl_name, cl_file_name, str - cl_file_name);
+ cl_name[str - cl_file_name] = '\0';
+ sprintf(fileName, "./%s - %s.bin", cl_name, deviceName);
+ fd = fopen(fileName, "rb");
+ status = fd != NULL;
+ }
+ }
+
+ if( devices != NULL )
+ {
+ free( devices );
+ devices = NULL;
+ }
+
+ if( fd != NULL )
+ *fhandle = fd;
+
+ return status;
+}
+
+/**
+ * hb_write_binary_to_file
+ * @param fileName -
+ * @param birary -
+ * @param numBytes -
+ */
+int hb_write_binary_to_file( const char* fileName, const char* birary, size_t numBytes )
+{
+ FILE *output = NULL;
+ output = fopen( fileName, "wb" );
+ if( output == NULL )
+ return 0;
+
+ fwrite( birary, sizeof(char), numBytes, output );
+ fclose( output );
+
+ return 1;
+}
+
+/**
+ * hb_generat_bin_from_kernel_source
+ * @param program -
+ * @param cl_file_name -
+ */
+int hb_generat_bin_from_kernel_source( cl_program program, const char * cl_file_name )
+{
+ int i = 0;
+ cl_int status;
+ cl_uint numDevices;
+ size_t *binarySizes;
+ cl_device_id *devices;
+ char **binaries;
+ char *str = NULL;
+
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_generat_bin_from_kernel_source: OpenCL support not available");
+ return 0;
+ }
+
+ status = hb_ocl->clGetProgramInfo(program, CL_PROGRAM_NUM_DEVICES,
+ sizeof(numDevices), &numDevices, NULL);
+ if( status != CL_SUCCESS )
+ {
+ hb_log("OpenCL: hb_generat_bin_from_kernel_source: clGetProgramInfo for CL_PROGRAM_NUM_DEVICES failed");
+ return 0;
+ }
+
+ devices = (cl_device_id*)malloc( sizeof(cl_device_id) * numDevices );
+ if( devices == NULL )
+ {
+ hb_log("OpenCL: hb_generat_bin_from_kernel_source: no device found");
+ return 0;
+ }
+
+ /* grab the handles to all of the devices in the program. */
+ status = hb_ocl->clGetProgramInfo(program, CL_PROGRAM_DEVICES,
+ sizeof(cl_device_id) * numDevices,
+ devices, NULL);
+ if( status != CL_SUCCESS )
+ {
+ hb_log("OpenCL: hb_generat_bin_from_kernel_source: clGetProgramInfo for CL_PROGRAM_DEVICES failed");
+ return 0;
+ }
+
+ /* figure out the sizes of each of the binaries. */
+ binarySizes = (size_t*)malloc( sizeof(size_t) * numDevices );
+
+ status = hb_ocl->clGetProgramInfo(program, CL_PROGRAM_BINARY_SIZES,
+ sizeof(size_t) * numDevices,
+ binarySizes, NULL);
+ if( status != CL_SUCCESS )
+ {
+ hb_log("OpenCL: hb_generat_bin_from_kernel_source: clGetProgramInfo for CL_PROGRAM_BINARY_SIZES failed");
+ return 0;
+ }
+
+ /* copy over all of the generated binaries. */
+ binaries = (char**)malloc( sizeof(char *) * numDevices );
+ if( binaries == NULL )
+ {
+ hb_log("OpenCL: hb_generat_bin_from_kernel_source: malloc for binaries failed");
+ return 0;
+ }
+
+ for( i = 0; i < numDevices; i++ )
+ {
+ if( binarySizes[i] != 0 )
+ {
+ binaries[i] = (char*)malloc( sizeof(char) * binarySizes[i] );
+ if( binaries[i] == NULL )
+ {
+ hb_log("OpenCL: hb_generat_bin_from_kernel_source: malloc for binaries[%d] failed", i);
+ return 0;
+ }
+ }
+ else
+ {
+ binaries[i] = NULL;
+ }
+ }
+
+ status = hb_ocl->clGetProgramInfo(program, CL_PROGRAM_BINARIES,
+ sizeof(char *) * numDevices,
+ binaries, NULL);
+ if( status != CL_SUCCESS )
+ {
+ hb_log("OpenCL: hb_generat_bin_from_kernel_source: clGetProgramInfo for CL_PROGRAM_BINARIES failed");
+ return 0;
+ }
+
+ /* dump out each binary into its own separate file. */
+ for (i = 0; i < numDevices; i++)
+ {
+ char fileName[256] = {0};
+ char cl_name[128] = {0};
+ if (binarySizes[i])
+ {
+ char deviceName[1024];
+ status = hb_ocl->clGetDeviceInfo(devices[i], CL_DEVICE_NAME,
+ sizeof(deviceName), deviceName,
+ NULL);
+
+ str = (char*)strstr( cl_file_name, (char*)".cl" );
+ memcpy(cl_name, cl_file_name, str - cl_file_name);
+ cl_name[str - cl_file_name] = '\0';
+ sprintf(fileName, "./%s - %s.bin", cl_name, deviceName);
+
+ if (!hb_write_binary_to_file(fileName, binaries[i], binarySizes[i]))
+ {
+ hb_log("OpenCL: hb_generat_bin_from_kernel_source: unable to write kernel, writing to temporary directory instead.");
+ return 0;
+ }
+ }
+ }
+
+ // Release all resouces and memory
+ for( i = 0; i < numDevices; i++ )
+ {
+ if( binaries[i] != NULL )
+ {
+ free( binaries[i] );
+ binaries[i] = NULL;
+ }
+ }
+
+ if( binaries != NULL )
+ {
+ free( binaries );
+ binaries = NULL;
+ }
+
+ if( binarySizes != NULL )
+ {
+ free( binarySizes );
+ binarySizes = NULL;
+ }
+
+ if( devices != NULL )
+ {
+ free( devices );
+ devices = NULL;
+ }
+ return 1;
+}
+
+
+/**
+ * hb_init_opencl_attr
+ * @param env -
+ */
+int hb_init_opencl_attr( OpenCLEnv * env )
+{
+ if( gpu_env.isUserCreated )
+ return 1;
+
+ gpu_env.context = env->context;
+ gpu_env.platform = env->platform;
+ gpu_env.dev = env->devices;
+ gpu_env.command_queue = env->command_queue;
+
+ gpu_env.isUserCreated = 1;
+
+ return 0;
+}
+
+/**
+ * hb_create_kernel
+ * @param kernelname -
+ * @param env -
+ */
+int hb_create_kernel( char * kernelname, KernelEnv * env )
+{
+ int status;
+
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_create_kernel: OpenCL support not available");
+ return 0;
+ }
+
+ env->kernel = hb_ocl->clCreateKernel(gpu_env.programs[0], kernelname, &status);
+ env->context = gpu_env.context;
+ env->command_queue = gpu_env.command_queue;
+ return status != CL_SUCCESS ? 1 : 0;
+}
+
+/**
+ * hb_release_kernel
+ * @param env -
+ */
+int hb_release_kernel( KernelEnv * env )
+{
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_release_kernel: OpenCL support not available");
+ return 0;
+ }
+
+ int status = hb_ocl->clReleaseKernel(env->kernel);
+ return status != CL_SUCCESS ? 1 : 0;
+}
+
+/**
+ * hb_init_opencl_env
+ * @param gpu_info -
+ */
+
+static int init_once = 0;
+int hb_init_opencl_env( GPUEnv *gpu_info )
+{
+ size_t length;
+ cl_int status;
+ cl_uint numPlatforms, numDevices;
+ cl_platform_id *platforms;
+ cl_context_properties cps[3];
+ char platformName[100];
+ unsigned int i;
+ void *handle = INVALID_HANDLE_VALUE;
+
+ if (init_once != 0)
+ return 0;
+ else
+ init_once = 1;
+
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_init_opencl_env: OpenCL support not available");
+ return 1;
+ }
+
+ /*
+ * Have a look at the available platforms.
+ */
+ if( !gpu_info->isUserCreated )
+ {
+ status = hb_ocl->clGetPlatformIDs(0, NULL, &numPlatforms);
+ if( status != CL_SUCCESS )
+ {
+ hb_log( "OpenCL: OpenCL device platform not found." );
+ return(1);
+ }
+
+ gpu_info->platform = NULL;
+ if( 0 < numPlatforms )
+ {
+ platforms = (cl_platform_id*)malloc(
+ numPlatforms * sizeof(cl_platform_id));
+ if( platforms == (cl_platform_id*)NULL )
+ {
+ return(1);
+ }
+ status = hb_ocl->clGetPlatformIDs(numPlatforms, platforms, NULL);
+
+ if( status != CL_SUCCESS )
+ {
+ hb_log( "OpenCL: Specific opencl platform not found." );
+ return(1);
+ }
+
+ for( i = 0; i < numPlatforms; i++ )
+ {
+ status = hb_ocl->clGetPlatformInfo(platforms[i], CL_PLATFORM_VENDOR,
+ sizeof(platformName), platformName, NULL);
+
+ if( status != CL_SUCCESS )
+ {
+ continue;
+ }
+ gpu_info->platform = platforms[i];
+
+ if (!strcmp(platformName, "Advanced Micro Devices, Inc.") ||
+ !strcmp(platformName, "AMD"))
+ gpu_info->vendor = AMD;
+ else 
+ gpu_info->vendor = others;
+ 
+ gpu_info->platform = platforms[i];
+
+ status = hb_ocl->clGetDeviceIDs(gpu_info->platform /* platform */,
+ CL_DEVICE_TYPE_GPU /* device_type */,
+ 0 /* num_entries */,
+ NULL /* devices */, &numDevices);
+
+ if( status != CL_SUCCESS )
+ {
+ continue;
+ }
+
+ if( numDevices )
+ break;
+ 
+ }
+ free( platforms );
+ }
+
+ if( NULL == gpu_info->platform )
+ {
+ hb_log( "OpenCL: No OpenCL-compatible GPU found." );
+ return(1);
+ }
+
+ if( status != CL_SUCCESS )
+ {
+ hb_log( "OpenCL: No OpenCL-compatible GPU found." );
+ return(1);
+ }
+
+ /*
+ * Use available platform.
+ */
+ cps[0] = CL_CONTEXT_PLATFORM;
+ cps[1] = (cl_context_properties)gpu_info->platform;
+ cps[2] = 0;
+ /* Check for GPU. */
+ gpu_info->dType = CL_DEVICE_TYPE_GPU;
+ gpu_info->context = hb_ocl->clCreateContextFromType(cps, gpu_info->dType,
+ NULL, NULL, &status);
+
+ if( (gpu_info->context == (cl_context)NULL) || (status != CL_SUCCESS) )
+ {
+ gpu_info->dType = CL_DEVICE_TYPE_CPU;
+ gpu_info->context = hb_ocl->clCreateContextFromType(cps, gpu_info->dType,
+ NULL, NULL, &status);
+ }
+
+ if( (gpu_info->context == (cl_context)NULL) || (status != CL_SUCCESS) )
+ {
+ gpu_info->dType = CL_DEVICE_TYPE_DEFAULT;
+ gpu_info->context = hb_ocl->clCreateContextFromType(cps, gpu_info->dType,
+ NULL, NULL, &status);
+ }
+
+ if( (gpu_info->context == (cl_context)NULL) || (status != CL_SUCCESS) )
+ {
+ hb_log( "OpenCL: Unable to create opencl context." );
+ return(1);
+ }
+
+ /* Detect OpenCL devices. */
+ /* First, get the size of device list data */
+ status = hb_ocl->clGetContextInfo(gpu_info->context, CL_CONTEXT_DEVICES,
+ 0, NULL, &length);
+ if((status != CL_SUCCESS) || (length == 0))
+ {
+ hb_log( "OpenCL: Unable to get the list of devices in context." );
+ return(1);
+ }
+
+ /* Now allocate memory for device list based on the size we got earlier */
+ gpu_info->devices = (cl_device_id*)malloc( length );
+ if( gpu_info->devices == (cl_device_id*)NULL )
+ {
+ return(1);
+ }
+
+ /* Now, get the device list data */
+ status = hb_ocl->clGetContextInfo(gpu_info->context, CL_CONTEXT_DEVICES,
+ length, gpu_info->devices, NULL);
+ if( status != CL_SUCCESS )
+ {
+ hb_log( "OpenCL: Unable to get the device list data in context." );
+ return(1);
+ }
+
+ /* Create OpenCL command queue. */
+ gpu_info->command_queue = hb_ocl->clCreateCommandQueue(gpu_info->context,
+ gpu_info->devices[0],
+ 0, &status);
+ if( status != CL_SUCCESS )
+ {
+ hb_log( "OpenCL: Unable to create opencl command queue." );
+ return(1);
+ }
+ }
+
+ if ((CL_SUCCESS == hb_ocl->clGetCommandQueueInfo(gpu_info->command_queue,
+ CL_QUEUE_THREAD_HANDLE_AMD,
+ sizeof(handle), &handle, NULL)) &&
+ (INVALID_HANDLE_VALUE != handle))
+ {
+#ifdef SYS_MINGW 
+ SetThreadPriority( handle, THREAD_PRIORITY_TIME_CRITICAL );
+#endif
+ }
+
+ return 0;
+}
+
+
+/**
+ * hb_release_opencl_env
+ * @param gpu_info -
+ */
+int hb_release_opencl_env( GPUEnv *gpu_info )
+{
+ if( !isInited )
+ return 1;
+ int i;
+
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_release_opencl_env: OpenCL support not available");
+ return 0;
+ }
+
+ for( i = 0; i<gpu_env.file_count; i++ )
+ {
+ if( gpu_env.programs[i] )
+ {
+ hb_ocl->clReleaseProgram(gpu_env.programs[i]);
+ gpu_env.programs[i] = NULL;
+ }
+ }
+
+ if( gpu_env.command_queue )
+ {
+ hb_ocl->clReleaseCommandQueue(gpu_env.command_queue);
+ gpu_env.command_queue = NULL;
+ }
+
+ if( gpu_env.context )
+ {
+ hb_ocl->clReleaseContext(gpu_env.context);
+ gpu_env.context = NULL;
+ }
+
+ isInited = 0;
+ gpu_info->isUserCreated = 0;
+
+ return 1;
+}
+
+
+/**
+ * hb_register_kernel_wrapper
+ * @param kernel_name -
+ * @param function -
+ */
+int hb_register_kernel_wrapper( const char *kernel_name, cl_kernel_function function )
+{
+ int i;
+ for( i = 0; i < gpu_env.kernel_count; i++ )
+ {
+ if( strcasecmp( kernel_name, gpu_env.kernel_names[i] ) == 0 )
+ {
+ gpu_env.kernel_functions[i] = function;
+ return(1);
+ }
+ }
+ return(0);
+}
+
+/**
+ * hb_cached_of_kerner_prg
+ * @param gpu_env -
+ * @param cl_file_name -
+ */
+int hb_cached_of_kerner_prg( const GPUEnv *gpu_env, const char * cl_file_name )
+{
+ int i;
+ for( i = 0; i < gpu_env->file_count; i++ )
+ {
+ if( strcasecmp( gpu_env->kernelSrcFile[i], cl_file_name ) == 0 )
+ {
+ if( gpu_env->programs[i] != NULL )
+ return(1);
+ }
+ }
+
+ return(0);
+}
+
+/**
+ * hb_compile_kernel_file
+ * @param filename -
+ * @param gpu_info -
+ * @param indx -
+ * @param build_option -
+ */
+int hb_compile_kernel_file( const char *filename, GPUEnv *gpu_info,
+ int indx, const char *build_option )
+{
+ cl_int status;
+ size_t length;
+ char *source_str;
+ const char *source;
+ size_t source_size[1];
+ char *buildLog = NULL;
+ int b_error, binary_status, binaryExisted;
+ char * binary;
+ cl_uint numDevices;
+ cl_device_id *devices;
+ FILE * fd;
+ FILE * fd1;
+ int idx;
+
+ if( hb_cached_of_kerner_prg( gpu_info, filename ) == 1 )
+ return (1);
+
+ idx = gpu_info->file_count;
+
+#ifdef USE_EXTERNAL_KERNEL
+ status = hb_convert_to_string( filename, &source_str, gpu_info, idx );
+ if( status == 0 )
+ return(0);
+#else
+ int kernel_src_size = strlen(kernel_src_scale) + strlen(kernel_src_yadif_filter);
+
+// char *scale_src;
+// status = hb_convert_to_string("./scale_kernels.cl", &scale_src, gpu_info, idx);
+// if (status != 0)
+// kernel_src_size += strlen(scale_src);
+
+ source_str = (char*)malloc( kernel_src_size + 2 );
+ strcpy( source_str, kernel_src_scale );
+// strcat( source_str, scale_src ); //
+ strcat( source_str, kernel_src_yadif_filter );
+#endif
+
+ source = source_str;
+ source_size[0] = strlen( source );
+
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_compile_kernel_file: OpenCL support not available");
+ return 0;
+ }
+
+ if ((binaryExisted = hb_binary_generated(gpu_info->context, filename, &fd)) == 1)
+ {
+ status = hb_ocl->clGetContextInfo(gpu_info->context, CL_CONTEXT_NUM_DEVICES,
+ sizeof(numDevices), &numDevices, NULL);
+ if (status != CL_SUCCESS)
+ {
+ hb_log("OpenCL: Unable to get the number of devices in context.");
+ return 0;
+ }
+
+ devices = (cl_device_id*)malloc(sizeof(cl_device_id) * numDevices);
+ if (devices == NULL)
+ return 0;
+
+ length = 0;
+ b_error = 0;
+ b_error |= fseek(fd, 0, SEEK_END) < 0;
+ b_error |= (length = ftell(fd)) <= 0;
+ b_error |= fseek(fd, 0, SEEK_SET) < 0;
+ if (b_error)
+ return 0;
+
+ binary = (char*)calloc(length + 2, sizeof(char));
+ if (binary == NULL)
+ return 0;
+
+ b_error |= fread(binary, 1, length, fd) != length;
+#if 0 // this doesn't work under OS X and/or with some non-AMD GPUs
+ if (binary[length-1] != '\n')
+ binary[length++] = '\n';
+#endif
+
+ if (b_error)
+ return 0;
+
+ /* grab the handles to all of the devices in the context. */
+ status = hb_ocl->clGetContextInfo(gpu_info->context, CL_CONTEXT_DEVICES,
+ sizeof(cl_device_id) * numDevices,
+ devices, NULL);
+
+ gpu_info->programs[idx] = hb_ocl->clCreateProgramWithBinary(gpu_info->context,
+ numDevices,
+ devices,
+ &length,
+ (const unsigned char**)&binary,
+ &binary_status,
+ &status);
+
+ fclose(fd);
+ free(devices);
+ fd = NULL;
+ devices = NULL;
+ }
+ else
+ {
+ /* create a CL program using the kernel source */
+ gpu_info->programs[idx] = hb_ocl->clCreateProgramWithSource(gpu_info->context, 1,
+ &source, source_size,
+ &status);
+ }
+
+ if((gpu_info->programs[idx] == (cl_program)NULL) || (status != CL_SUCCESS)){
+ hb_log( "OpenCL: Unable to get list of devices in context." );
+ return(0);
+ }
+
+ /* create a cl program executable for all the devices specified */
+ if( !gpu_info->isUserCreated ) 
+ {
+ status = hb_ocl->clBuildProgram(gpu_info->programs[idx], 1, gpu_info->devices,
+ build_option, NULL, NULL);
+ }
+ else
+ {
+ status = hb_ocl->clBuildProgram(gpu_info->programs[idx], 1, &(gpu_info->dev),
+ build_option, NULL, NULL);
+ }
+
+ if( status != CL_SUCCESS )
+ {
+ if( !gpu_info->isUserCreated ) 
+ {
+ status = hb_ocl->clGetProgramBuildInfo(gpu_info->programs[idx],
+ gpu_info->devices[0],
+ CL_PROGRAM_BUILD_LOG,
+ 0, NULL, &length);
+ }
+ else
+ {
+ status = hb_ocl->clGetProgramBuildInfo(gpu_info->programs[idx],
+ gpu_info->dev,
+ CL_PROGRAM_BUILD_LOG,
+ 0, NULL, &length);
+ }
+
+ if( status != CL_SUCCESS )
+ {
+ hb_log( "OpenCL: Unable to get GPU build information." );
+ return(0);
+ }
+
+ buildLog = (char*)malloc( length );
+ if( buildLog == (char*)NULL )
+ {
+ return(0);
+ }
+
+ if( !gpu_info->isUserCreated )
+ {
+ status = hb_ocl->clGetProgramBuildInfo(gpu_info->programs[idx],
+ gpu_info->devices[0],
+ CL_PROGRAM_BUILD_LOG,
+ length, buildLog, &length);
+ }
+ else
+ {
+ status = hb_ocl->clGetProgramBuildInfo(gpu_info->programs[idx],
+ gpu_info->dev,
+ CL_PROGRAM_BUILD_LOG,
+ length, buildLog, &length);
+ }
+
+ fd1 = fopen( "kernel-build.log", "w+" );
+ if( fd1 != NULL ) {
+ fwrite( buildLog, sizeof(char), length, fd1 );
+ fclose( fd1 );
+ }
+
+ free( buildLog );
+ return(0);
+ }
+
+ strcpy( gpu_env.kernelSrcFile[idx], filename );
+
+ if (binaryExisted != 1)
+ {
+ //hb_generat_bin_from_kernel_source(gpu_env.programs[idx], filename);
+ }
+
+ gpu_info->file_count += 1;
+
+ return(1);
+}
+
+
+/**
+ * hb_get_kernel_env_and_func
+ * @param kernel_name -
+ * @param env -
+ * @param function -
+ */
+int hb_get_kernel_env_and_func( const char *kernel_name,
+ KernelEnv *env,
+ cl_kernel_function *function )
+{
+ int i;
+ for( i = 0; i < gpu_env.kernel_count; i++ )
+ {
+ if( strcasecmp( kernel_name, gpu_env.kernel_names[i] ) == 0 )
+ {
+ env->context = gpu_env.context;
+ env->command_queue = gpu_env.command_queue;
+ env->program = gpu_env.programs[0];
+ env->kernel = gpu_env.kernels[i];
+ env->isAMD = ( gpu_env.vendor == AMD ) ? 1 : 0;
+ *function = gpu_env.kernel_functions[i];
+ return(1);
+ }
+ }
+ return(0);
+}
+
+/**
+ * hb_get_kernel_env_and_func
+ * @param kernel_name -
+ * @param userdata -
+ */
+int hb_run_kernel( const char *kernel_name, void **userdata )
+{
+ KernelEnv env;
+ cl_kernel_function function;
+ int status;
+ memset( &env, 0, sizeof(KernelEnv));
+ status = hb_get_kernel_env_and_func( kernel_name, &env, &function );
+ strcpy( env.kernel_name, kernel_name );
+ if( status == 1 ) 
+ {
+ return(function( userdata, &env ));
+ }
+
+ return(0);
+}
+
+/**
+ * hb_init_opencl_run_env
+ * @param argc -
+ * @param argv -
+ * @param build_option -
+ */
+int hb_init_opencl_run_env( int argc, char **argv, const char *build_option )
+{
+ int status = 0;
+ if( MAX_CLKERNEL_NUM <= 0 )
+ {
+ return 1;
+ }
+
+ if((argc > MAX_CLFILE_NUM) || (argc<0))
+ {
+ return 1;
+ }
+
+ if( !isInited )
+ {
+ hb_regist_opencl_kernel();
+
+ /*initialize devices, context, comand_queue*/
+ status = hb_init_opencl_env( &gpu_env );
+ if( status )
+ return(1);
+
+ /*initialize program, kernel_name, kernel_count*/
+ status = hb_compile_kernel_file("hb-opencl-kernels.cl",
+ &gpu_env, 0, build_option);
+
+ if( status == 0 || gpu_env.kernel_count == 0 )
+ {
+ return(1);
+
+ }
+
+ useBuffers = 1;
+ isInited = 1;
+ }
+
+ return(0);
+}
+
+/**
+ * hb_release_opencl_run_env
+ */
+int hb_release_opencl_run_env()
+{
+ return hb_release_opencl_env( &gpu_env );
+}
+
+/**
+ * hb_opencl_stats
+ */
+int hb_opencl_stats()
+{
+ return isInited;
+}
+
+/**
+ * hb_get_opencl_env
+ */
+int hb_get_opencl_env()
+{
+ /* initialize devices, context, command_queue */
+ return hb_init_opencl_env(&gpu_env);
+}
+
+/**
+ * hb_create_buffer
+ * @param cl_inBuf -
+ * @param flags -
+ * @param size -
+ */
+int hb_create_buffer( cl_mem *cl_Buf, int flags, int size )
+{
+ int status;
+
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_create_buffer: OpenCL support not available");
+ return 0;
+ }
+
+ *cl_Buf = hb_ocl->clCreateBuffer(gpu_env.context, flags, size, NULL, &status);
+ 
+ if( status != CL_SUCCESS )
+ { 
+ hb_log( "OpenCL: clCreateBuffer error '%d'", status );
+ return 0; 
+ }
+
+ return 1;
+}
+
+
+/**
+ * hb_read_opencl_buffer
+ * @param cl_inBuf -
+ * @param outbuf -
+ * @param size -
+ */
+int hb_read_opencl_buffer( cl_mem cl_inBuf, unsigned char *outbuf, int size )
+{
+ int status;
+
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_read_opencl_suffer: OpenCL support not available");
+ return 0;
+ }
+
+ status = hb_ocl->clEnqueueReadBuffer(gpu_env.command_queue, cl_inBuf,
+ CL_TRUE, 0, size, outbuf, 0, 0, 0);
+ if( status != CL_SUCCESS )
+ { 
+ hb_log( "OpenCL: av_read_opencl_buffer error '%d'", status );
+ return 0; 
+ }
+
+ return 1;
+}
+
+int hb_cl_create_mapped_buffer(cl_mem *mem, unsigned char **addr, int size)
+{
+ int status;
+ int flags = CL_MEM_ALLOC_HOST_PTR;
+
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_cl_create_mapped_buffer: OpenCL support not available");
+ return 0;
+ }
+
+ //cl_event event;
+ *mem = hb_ocl->clCreateBuffer(gpu_env.context, flags, size, NULL, &status);
+ *addr = hb_ocl->clEnqueueMapBuffer(gpu_env.command_queue, *mem, CL_TRUE,
+ CL_MAP_READ|CL_MAP_WRITE, 0, size, 0,
+ NULL, NULL/*&event*/, &status);
+
+ //hb_log("\t **** context: %.8x cmdqueue: %.8x cl_mem: %.8x mapaddr: %.8x size: %d status: %d", gpu_env.context, gpu_env.command_queue, mem, addr, size, status);
+
+ return (status == CL_SUCCESS) ? 1 : 0;
+}
+
+int hb_cl_free_mapped_buffer(cl_mem mem, unsigned char *addr)
+{
+ cl_event event;
+
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_cl_free_mapped_buffer: OpenCL support not available");
+ return 0;
+ }
+
+ int status = hb_ocl->clEnqueueUnmapMemObject(gpu_env.command_queue, mem,
+ addr, 0, NULL, &event);
+ if (status == CL_SUCCESS)
+ hb_ocl->clWaitForEvents(1, &event);
+ else
+ hb_log("hb_free_mapped_buffer: error %d", status);
+ return (status == CL_SUCCESS) ? 1 : 0;
+}
+
+void hb_opencl_init()
+{
+ hb_get_opencl_env();
+}
+
+int hb_use_buffers()
+{
+ return useBuffers;
+}
+
+int hb_copy_buffer(cl_mem src_buffer,cl_mem dst_buffer,size_t src_offset,size_t dst_offset,size_t cb)
+{
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_copy_buffer: OpenCL support not available");
+ return 0;
+ }
+
+ int status = hb_ocl->clEnqueueCopyBuffer(gpu_env.command_queue,
+ src_buffer, dst_buffer,
+ src_offset, dst_offset,
+ cb, 0, 0, 0);
+ if( status != CL_SUCCESS )
+ { 
+ av_log(NULL,AV_LOG_ERROR, "hb_read_opencl_buffer error '%d'\n", status ); 
+ return 0; 
+ }
+ return 1;
+}
+
+int hb_read_opencl_frame_buffer(cl_mem cl_inBuf,unsigned char *Ybuf,unsigned char *Ubuf,unsigned char *Vbuf,int linesize0,int linesize1,int linesize2,int height)
+{
+
+ int chrH = -(-height >> 1);
+ unsigned char *temp = (unsigned char *)av_malloc(sizeof(uint8_t) * (linesize0 * height + linesize1 * chrH * 2));
+ if(hb_read_opencl_buffer(cl_inBuf,temp,sizeof(uint8_t)*(linesize0 + linesize1)*height))
+ {
+ memcpy(Ybuf,temp,linesize0 * height);
+ memcpy(Ubuf,temp + linesize0 * height,linesize1 *chrH);
+ memcpy(Vbuf,temp + linesize0 * height + linesize1 * chrH,linesize2 * chrH);
+ 
+ }
+ av_free(temp);
+
+ return 1;
+}
+
+int hb_write_opencl_frame_buffer(cl_mem cl_inBuf,unsigned char *Ybuf,unsigned char *Ubuf,unsigned char *Vbuf,int linesize0,int linesize1,int linesize2,int height,int offset)
+{
+ if (hb_ocl == NULL)
+ {
+ hb_error("hb_write_opencl_frame_buffer: OpenCL support not available");
+ return 0;
+ }
+
+ void *mapped = hb_ocl->clEnqueueMapBuffer(gpu_env.command_queue, cl_inBuf,
+ CL_TRUE,CL_MAP_WRITE, 0,
+ sizeof(uint8_t) * (linesize0 + linesize1) * height + offset,
+ 0, NULL, NULL, NULL);
+ uint8_t *temp = (uint8_t *)mapped;
+ temp += offset;
+ memcpy(temp,Ybuf,sizeof(uint8_t) * linesize0 * height);
+ memcpy(temp + sizeof(uint8_t) * linesize0 * height,Ubuf,sizeof(uint8_t) * linesize1 * height/2);
+ memcpy(temp + sizeof(uint8_t) * (linesize0 * height + linesize1 * height/2),Vbuf,sizeof(uint8_t) * linesize2 * height/2);
+ hb_ocl->clEnqueueUnmapMemObject(gpu_env.command_queue, cl_inBuf, mapped, 0, NULL, NULL);
+ return 1;
+}
+
+cl_command_queue hb_get_command_queue()
+{
+ return gpu_env.command_queue;
+}
+
+cl_context hb_get_context()
+{
+ return gpu_env.context;
+}

HandBrake-0.10.0.tar.bz2/libhb/openclwrapper.h Added

@@ -0,0 +1,90 @@
+/* openclwrapper.h
+
+ Copyright (c) 2003-2014 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+
+ Authors: Peng Gao <peng@multicorewareinc.com> <http://www.multicorewareinc.com/>
+ Li Cao <li@multicorewareinc.com> <http://www.multicorewareinc.com/>
+
+
+ */
+#ifndef HB_OPENCL_WRAPPER_H
+#define HB_OPENCL_WRAPPER_H
+
+#include "common.h"
+#include "extras/cl.h"
+
+//support AMD opencl
+#define CL_QUEUE_THREAD_HANDLE_AMD 0x403E
+#define CL_MAP_WRITE_INVALIDATE_REGION (1 << 2)
+
+typedef struct _KernelEnv
+{
+ cl_context context;
+ cl_command_queue command_queue;
+ cl_program program;
+ cl_kernel kernel;
+ char kernel_name[150];
+ int isAMD;
+}KernelEnv;
+
+typedef struct _OpenCLEnv
+{
+ cl_platform_id platform;
+ cl_context context;
+ cl_device_id devices;
+ cl_command_queue command_queue;
+}OpenCLEnv;
+
+
+//user defined, this is function wrapper which is used to set the input parameters ,
+//luanch kernel and copy data from GPU to CPU or CPU to GPU.
+typedef int (*cl_kernel_function)( void **userdata, KernelEnv *kenv );
+
+// registe a wapper for running the kernel specified by the kernel name
+int hb_register_kernel_wrapper( const char *kernel_name, cl_kernel_function function );
+
+// run kernel , user call this function to luanch kernel.
+// kernel_name: this kernel name is used to find the kernel in opencl runtime environment
+// userdata: this userdata is the all parameters for running the kernel specified by kernel name
+int hb_run_kernel( const char *kernel_name, void **userdata );
+
+// init the run time environment , this function must be called befor calling any function related to opencl
+// the argc must be set zero , argv must be set NULL, build_option is the options for build the kernel.
+int hb_init_opencl_run_env( int argc, char **argv, const char *build_option );
+
+//relase all resource about the opencl , this function must be called after calling any functions related to opencl
+int hb_release_opencl_run_env();
+
+// get the opencl status , 0: not init ; 1, inited; this function is used the check whether or not the opencl run time has been created
+int hb_opencl_stats();
+
+// update opencl run time environments , such as commandqueue , platforme, context. program
+int hb_init_opencl_attr( OpenCLEnv * env );
+
+// create kernel object by a kernel name on the specified opencl run time indicated by env parameter
+int hb_create_kernel( char * kernelname, KernelEnv * env );
+
+// release kernel object which is generated by calling the hb_create_kernel api
+int hb_release_kernel( KernelEnv * env );
+
+void hb_opencl_init();
+
+int hb_get_opencl_env();
+
+int hb_create_buffer(cl_mem *cl_Buf,int flags,int size);
+
+int hb_read_opencl_buffer(cl_mem cl_inBuf,unsigned char *outbuf,int size);
+
+int hb_cl_create_mapped_buffer(cl_mem *mem, unsigned char **addr, int size);
+
+int hb_cl_free_mapped_buffer(cl_mem mem, unsigned char *addr);
+
+int hb_use_buffers();
+
+int hb_confirm_gpu_type();
+
+#endif // HB_OPENCL_WRAPPER_H

HandBrake-0.10.0.tar.bz2/libhb/param.c Added

@@ -0,0 +1,291 @@
+/* param.c
+ *
+ * Copyright (c) 2003-2014 HandBrake Team
+ * This file is part of the HandBrake source code
+ * Homepage: <http://handbrake.fr/>.
+ * It may be used under the terms of the GNU General Public License v2.
+ * For full terms see the file COPYING file or visit
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#include "hb.h"
+#include <regex.h>
+
+/* NL-means presets and tunes
+ *
+ * Presets adjust strength:
+ * ultralight - visually transparent
+ * light
+ * medium
+ * strong
+ *
+ * Tunes adjust settings to the specified content type:
+ * none
+ * film - most content, live action
+ * grain - like film but preserves luma grain
+ * highmotion - like film but avoids color smearing with stronger settings
+ * animation - cel animation such as cartoons, anime
+ */
+static char * generate_nlmeans_settings(const char *preset, const char *tune)
+{
+ char *opt = NULL;
+
+ if (preset == NULL)
+ return NULL;
+
+ if (!strcasecmp(preset, "ultralight") ||
+ !strcasecmp(preset, "light") ||
+ !strcasecmp(preset, "medium") ||
+ !strcasecmp(preset, "strong"))
+ {
+ double strength[2],
+ origin_tune[2];
+ int patch_size[2],
+ range[2],
+ frames[2],
+ prefilter[2];
+
+ if (tune == NULL || !strcasecmp(tune, "none"))
+ {
+ strength[0] = strength[1] = 6;
+ origin_tune[0] = origin_tune[1] = 1;
+ patch_size[0] = patch_size[1] = 7;
+ range[0] = range[1] = 3;
+ frames[0] = frames[1] = 2;
+ prefilter[0] = prefilter[1] = 0;
+ if (!strcasecmp(preset, "ultralight"))
+ {
+ strength[0] = strength[1] = 1.5;
+ }
+ else if (!strcasecmp(preset, "light"))
+ {
+ strength[0] = strength[1] = 3;
+ }
+ else if (!strcasecmp(preset, "strong"))
+ {
+ strength[0] = strength[1] = 10;
+ }
+ }
+ else if (!strcasecmp(tune, "film"))
+ {
+ strength[0] = 6; strength[1] = 8;
+ origin_tune[0] = origin_tune[1] = 0.8;
+ patch_size[0] = patch_size[1] = 7;
+ range[0] = range[1] = 3;
+ frames[0] = frames[1] = 2;
+ prefilter[0] = prefilter[1] = 0;
+ if (!strcasecmp(preset, "ultralight"))
+ {
+ strength[0] = 1.5; strength[1] = 2.4;
+ origin_tune[0] = 0.9; origin_tune[1] = 0.9;
+ }
+ else if (!strcasecmp(preset, "light"))
+ {
+ strength[0] = 3; strength[1] = 4;
+ origin_tune[0] = 0.9; origin_tune[1] = 0.9;
+ }
+ else if (!strcasecmp(preset, "strong"))
+ {
+ strength[0] = 8; strength[1] = 10;
+ origin_tune[0] = 0.6; origin_tune[1] = 0.6;
+ }
+ }
+ else if (!strcasecmp(tune, "grain"))
+ {
+ strength[0] = 0; strength[1] = 6;
+ origin_tune[0] = origin_tune[1] = 0.8;
+ patch_size[0] = patch_size[1] = 7;
+ range[0] = range[1] = 3;
+ frames[0] = frames[1] = 2;
+ prefilter[0] = prefilter[1] = 0;
+ if (!strcasecmp(preset, "ultralight"))
+ {
+ strength[0] = 0; strength[1] = 2.4;
+ origin_tune[0] = 0.9; origin_tune[1] = 0.9;
+ }
+ else if (!strcasecmp(preset, "light"))
+ {
+ strength[0] = 0; strength[1] = 3.5;
+ origin_tune[0] = 0.9; origin_tune[1] = 0.9;
+ }
+ else if (!strcasecmp(preset, "strong"))
+ {
+ strength[0] = 0; strength[1] = 8;
+ origin_tune[0] = 0.6; origin_tune[1] = 0.6;
+ }
+ }
+ else if (!strcasecmp(tune, "highmotion"))
+ {
+ strength[0] = 6; strength[1] = 6;
+ origin_tune[0] = 0.8; origin_tune[1] = 0.7;
+ patch_size[0] = 7; patch_size[1] = 7;
+ range[0] = 3; range[1] = 5;
+ frames[0] = 2; frames[1] = 1;
+ prefilter[0] = 0; prefilter[1] = 0;
+ if (!strcasecmp(preset, "ultralight"))
+ {
+ strength[0] = 1.5; strength[1] = 2.4;
+ origin_tune[0] = 0.9; origin_tune[1] = 0.9;
+ }
+ else if (!strcasecmp(preset, "light"))
+ {
+ strength[0] = 3; strength[1] = 3.25;
+ origin_tune[0] = 0.9; origin_tune[1] = 0.8;
+ }
+ else if (!strcasecmp(preset, "strong"))
+ {
+ strength[0] = 8; strength[1] = 6.75;
+ origin_tune[0] = 0.6; origin_tune[1] = 0.5;
+ }
+ }
+ else if (!strcasecmp(tune, "animation"))
+ {
+ strength[0] = 5; strength[1] = 4;
+ origin_tune[0] = origin_tune[1] = 0.15;
+ patch_size[0] = patch_size[1] = 5;
+ range[0] = range[1] = 7;
+ frames[0] = frames[1] = 4;
+ prefilter[0] = prefilter[1] = 0;
+ if (!strcasecmp(preset, "ultralight"))
+ {
+ strength[0] = 2.5; strength[1] = 2;
+ frames[0] = 2; frames[1] = 2;
+ }
+ else if (!strcasecmp(preset, "light"))
+ {
+ strength[0] = 3; strength[1] = 2.25;
+ frames[0] = 3; frames[1] = 3;
+ }
+ else if (!strcasecmp(preset, "strong"))
+ {
+ strength[0] = 10; strength[1] = 8;
+ }
+ }
+ else
+ {
+ fprintf(stderr, "Unrecognized nlmeans tune (%s).\n", tune);
+ return NULL;
+ }
+
+ opt = hb_strdup_printf("%lf:%lf:%d:%d:%d:%d:%lf:%lf:%d:%d:%d:%d",
+ strength[0], origin_tune[0], patch_size[0],
+ range[0], frames[0], prefilter[0],
+ strength[1], origin_tune[1], patch_size[1],
+ range[1], frames[1], prefilter[1]);
+
+
+ }
+ else
+ {
+ opt = strdup(preset);
+ if (tune != NULL)
+ {
+ fprintf(stderr, "Custom nlmeans parameters specified; ignoring nlmeans tune (%s).\n", tune);
+ }
+ }
+
+ return opt;
+}
+
+/* HQDN3D presets
+ *
+ * Presets adjust strength:
+ * ultralight - visually transparent
+ * light
+ * medium
+ * strong
+ */
+static char * generate_hqdn3d_settings(const char *preset, const char *tune)
+{
+ if (preset == NULL)
+ return NULL;
+
+ if (!strcasecmp(preset, "strong"))
+ return strdup("7:7:7:5:5:5");
+ else if (!strcasecmp(preset, "medium"))
+ return strdup("3:2:2:2:3:3");
+ else if (!strcasecmp(preset, "light") || !strcasecmp(preset, "weak"))
+ return strdup("2:1:1:2:3:3");
+ else if (!strcasecmp(preset, "ultralight"))
+ return strdup("1:0.7:0.7:1:2:2");
+ else
+ return strdup(preset);
+}
+
+int hb_validate_param_string(const char *regex_pattern, const char *param_string)
+{
+ regex_t regex_temp;
+
+ if (regcomp(&regex_temp, regex_pattern, REG_EXTENDED) == 0)
+ {
+ if (regexec(&regex_temp, param_string, 0, NULL, 0) == 0)
+ {
+ regfree(&regex_temp);
+ return 0;
+ }
+ }
+ else
+ {
+ fprintf(stderr, "hb_validate_param_string: Error compiling regex for pattern (%s).\n", param_string);
+ }
+
+ regfree(&regex_temp);
+ return 1;
+}
+
+int hb_validate_filter_settings(int filter_id, const char *filter_param)
+{
+ // Regex matches "number" followed by one or more ":number", where number is uint or ufloat
+ const char *hb_colon_separated_params_regex = "^((([0-9]+([.][0-9]+)?)|([.][0-9]+))((:(([0-9]+([.][0-9]+)?)|([.][0-9]+)))+)?)$";
+
+ const char *regex_pattern = NULL;
+
+ switch (filter_id)
+ {
+ case HB_FILTER_NLMEANS:
+ case HB_FILTER_HQDN3D:
+ if (filter_param == NULL)
+ {
+ return 0;
+ }
+ regex_pattern = hb_colon_separated_params_regex;
+ break;
+ default:
+ fprintf(stderr, "hb_validate_filter_settings: Unrecognized filter (%d).\n",
+ filter_id);
+ return 1;
+ break;
+ }
+
+ if (hb_validate_param_string(regex_pattern, filter_param) == 0)
+ {
+ return 0;
+ }
+ return 1;
+}
+
+char * hb_generate_filter_settings(int filter_id, const char *preset, const char *tune)
+{
+ char *filter_param = NULL;
+
+ switch (filter_id)
+ {
+ case HB_FILTER_NLMEANS:
+ filter_param = generate_nlmeans_settings(preset, tune);
+ break;
+ case HB_FILTER_HQDN3D:
+ filter_param = generate_hqdn3d_settings(preset, tune);
+ break;
+ default:
+ fprintf(stderr, "hb_generate_filter_settings: Unrecognized filter (%d).\n",
+ filter_id);
+ break;
+ }
+
+ if (hb_validate_filter_settings(filter_id, filter_param) == 0)
+ {
+ return filter_param;
+ }
+ return NULL;
+}
+

HandBrake-0.9.9.tar.bz2/libhb/platform/macosx/encca_aac.c -> HandBrake-0.10.0.tar.bz2/libhb/platform/macosx/encca_aac.c Changed

@@ -1,6 +1,6 @@
 /* encca_aac.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -46,7 +46,7 @@
 
 AudioConverterRef converter;
 unsigned long isamples, isamplesiz, omaxpacket, nchannels;
- uint64_t pts, ibytes;
+ uint64_t samples, ibytes;
 Float64 osamplerate;
 
 hb_audio_remap_t *remap;
@@ -200,6 +200,7 @@
 {
 hb_log("Error creating an AudioConverter err=%"PRId64" output.mBytesPerFrame=%"PRIu64"",
 (int64_t)err, (uint64_t)output.mBytesPerFrame);
+ *job->done_error = HB_ERROR_UNKNOWN;
 *job->die = 1;
 return -1;
 }
@@ -296,7 +297,7 @@
 hb_error("encCoreAudioInit: hb_audio_remap_init() failed");
 }
 uint64_t layout = hb_ff_mixdown_xlat(audio->config.out.mixdown, NULL);
- hb_audio_remap_set_channel_layout(pv->remap, layout, pv->nchannels);
+ hb_audio_remap_set_channel_layout(pv->remap, layout);
 
 // get maximum output size
 AudioConverterGetProperty(pv->converter,
@@ -315,6 +316,7 @@
 ReadESDSDescExt(w->config->extradata.bytes, &buffer, &tmpsiz, 0);
 w->config->extradata.length = tmpsiz;
 memmove(w->config->extradata.bytes, buffer, w->config->extradata.length);
+ free(buffer);
 
 pv->list = hb_list_init();
 pv->buf = NULL;
@@ -439,9 +441,10 @@
 }
 
 obuf->size = odesc.mDataByteSize;
- obuf->s.start = pv->pts;
- pv->pts += 90000LL * pv->isamples / pv->osamplerate;
- obuf->s.stop = pv->pts;
+ obuf->s.start = 90000LL * pv->samples / pv->osamplerate;
+ pv->samples += pv->isamples;
+ obuf->s.stop = 90000LL * pv->samples / pv->osamplerate;
+ obuf->s.duration = (double)90000 * pv->isamples / pv->osamplerate;
 obuf->s.type = AUDIO_BUF;
 obuf->s.frametype = HB_FRAME_AUDIO;

HandBrake-0.9.9.tar.bz2/libhb/ports.c -> HandBrake-0.10.0.tar.bz2/libhb/ports.c Changed

@@ -1,6 +1,6 @@
 /* ports.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -47,6 +47,9 @@
 #ifdef SYS_MINGW
 #include <pthread.h>
 #include <windows.h>
+#include <wchar.h>
+#include <mbctype.h>
+#include <locale.h>
 #endif
 
 #ifdef SYS_SunOS
@@ -55,6 +58,7 @@
 
 #include <time.h>
 #include <sys/time.h>
+#include <ctype.h>
 
 #if defined( SYS_LINUX )
 #include <linux/cdrom.h>
@@ -74,6 +78,7 @@
 #include <unistd.h>
 
 #include "hb.h"
+#include "libavutil/cpu.h"
 
 /************************************************************************
 * hb_get_date()
@@ -99,6 +104,34 @@
 #endif
 */
 
+// Convert utf8 string to current code page.
+// The internal string representation in hb is utf8. But some
+// libraries (libmkv, and mp4v2) expect filenames in the current
+// code page. So we must convert.
+char * hb_utf8_to_cp(const char *src)
+{
+ char *dst = NULL;
+
+#if defined( SYS_MINGW )
+ int num_chars = MultiByteToWideChar(CP_UTF8, 0, src, -1, NULL, 0);
+ if (num_chars <= 0)
+ return NULL;
+ wchar_t * tmp = calloc(num_chars, sizeof(wchar_t));
+ MultiByteToWideChar(CP_UTF8, 0, src, -1, tmp, num_chars);
+ int len = WideCharToMultiByte(GetACP(), 0, tmp, num_chars, NULL, 0, NULL, NULL);
+ if (len <= 0)
+ return NULL;
+ dst = calloc(len, sizeof(char));
+ WideCharToMultiByte(GetACP(), 0, tmp, num_chars, dst, len, NULL, NULL);
+ free(tmp);
+#else
+ // Other platforms don't have code pages
+ dst = strdup(src);
+#endif
+
+ return dst;
+}
+
 int hb_dvd_region(char *device, int *region_mask)
 {
 #if defined( DVD_LU_SEND_RPC_STATE ) && defined( DVD_AUTH )
@@ -140,6 +173,27 @@
 return( (uint64_t) tv.tv_sec * 1000 + (uint64_t) tv.tv_usec / 1000 );
 }
 
+uint64_t hb_get_time_us()
+{
+#ifdef SYS_MINGW
+ static LARGE_INTEGER frequency;
+ LARGE_INTEGER cur_time;
+
+ if (frequency.QuadPart == 0)
+ {
+ QueryPerformanceFrequency(&frequency);
+ }
+
+ QueryPerformanceCounter(&cur_time);
+
+ return (uint64_t)(1000000 * cur_time.QuadPart / frequency.QuadPart);
+#else
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ return ((uint64_t)tv.tv_sec * 1000000 + (uint64_t)tv.tv_usec);
+#endif
+}
+
 /************************************************************************
 * hb_snooze()
 ************************************************************************
@@ -161,21 +215,176 @@
 }
 
 /************************************************************************
- * hb_get_cpu_count()
- ************************************************************************
- * Whenever possible, returns the number of CPUs on the current
- * computer. Returns 1 otherwise.
- * The detection is actually only performed on the first call.
+ * Get information about the CPU (number of cores, name, platform name)
 ************************************************************************/
+static void init_cpu_info();
+static int init_cpu_count();
+struct
+{
+ enum hb_cpu_platform platform;
+ const char *name;
+ union
+ {
+ char buf[48];
+ uint32_t buf4[12];
+ };
+ int count;
+} hb_cpu_info;
+
 int hb_get_cpu_count()
 {
- static int cpu_count = 0;
+ return hb_cpu_info.count;
+}
+
+int hb_get_cpu_platform()
+{
+ return hb_cpu_info.platform;
+}
+
+const char* hb_get_cpu_name()
+{
+ return hb_cpu_info.name;
+}
+
+const char* hb_get_cpu_platform_name()
+{
+ switch (hb_cpu_info.platform)
+ {
+ // Intel 64 and IA-32 Architectures Software Developer's Manual, Vol. 3C
+ // Table 35-1: CPUID Signature Values of DisplayFamily_DisplayModel
+ case HB_CPU_PLATFORM_INTEL_BNL:
+ return "Intel microarchitecture Bonnell";
+ case HB_CPU_PLATFORM_INTEL_SNB:
+ return "Intel microarchitecture Sandy Bridge";
+ case HB_CPU_PLATFORM_INTEL_IVB:
+ return "Intel microarchitecture Ivy Bridge";
+ case HB_CPU_PLATFORM_INTEL_SLM:
+ return "Intel microarchitecture Silvermont";
+ case HB_CPU_PLATFORM_INTEL_HSW:
+ return "Intel microarchitecture Haswell";
+
+ default:
+ return NULL;
+ }
+}
 
- if( cpu_count )
+#if ARCH_X86_64
+# define REG_b "rbx"
+# define REG_S "rsi"
+#elif ARCH_X86_32
+# define REG_b "ebx"
+# define REG_S "esi"
+#endif // ARCH_X86_32
+
+#if ARCH_X86_64 || ARCH_X86_32
+#define cpuid(index, eax, ebx, ecx, edx) \
+ __asm__ volatile ( \
+ "mov %%"REG_b", %%"REG_S" \n\t" \
+ "cpuid \n\t" \
+ "xchg %%"REG_b", %%"REG_S \
+ : "=a" (*eax), "=S" (*ebx), "=c" (*ecx), "=d" (*edx) \
+ : "0" (index))
+#endif // ARCH_X86_64 || ARCH_X86_32
+
+static void init_cpu_info()
+{
+ hb_cpu_info.name = NULL;
+ hb_cpu_info.count = init_cpu_count();
+ hb_cpu_info.platform = HB_CPU_PLATFORM_UNSPECIFIED;
+
+ if (av_get_cpu_flags() & AV_CPU_FLAG_SSE)
 {
- return cpu_count;
+#if ARCH_X86_64 || ARCH_X86_32
+ int eax, ebx, ecx, edx, family, model;
+
+ cpuid(1, &eax, &ebx, &ecx, &edx);
+ family = ((eax >> 8) & 0xf) + ((eax >> 20) & 0xff);
+ model = ((eax >> 4) & 0xf) + ((eax >> 12) & 0xf0);
+
+ // Intel 64 and IA-32 Architectures Software Developer's Manual, Vol. 3C
+ // Table 35-1: CPUID Signature Values of DisplayFamily_DisplayModel
+ switch (family)
+ {
+ case 0x06:
+ {
+ switch (model)
+ {
+ case 0x1C:
+ case 0x26:
+ case 0x27:
+ case 0x35:
+ case 0x36:
+ hb_cpu_info.platform = HB_CPU_PLATFORM_INTEL_BNL;
+ break;
+ case 0x2A:
+ case 0x2D:
+ hb_cpu_info.platform = HB_CPU_PLATFORM_INTEL_SNB;
+ break;
+ case 0x3A:
+ case 0x3E:
+ hb_cpu_info.platform = HB_CPU_PLATFORM_INTEL_IVB;
+ break;
+ case 0x37:
+ case 0x4A:
+ case 0x4D:
+ hb_cpu_info.platform = HB_CPU_PLATFORM_INTEL_SLM;
+ break;
+ case 0x3C:
+ case 0x45:
+ case 0x46:
+ hb_cpu_info.platform = HB_CPU_PLATFORM_INTEL_HSW;
+ break;
+ default:
+ break;
+ }
+ } break;
+
+ default:
+ break;
+ }
+
+ // Intel 64 and IA-32 Architectures Software Developer's Manual, Vol. 2A
+ // Figure 3-8: Determination of Support for the Processor Brand String
+ // Table 3-17: Information Returned by CPUID Instruction
+ cpuid(0x80000000, &eax, &ebx, &ecx, &edx);
+ if ((eax & 0x80000004) < 0x80000004)
+ {
+ cpuid(0x80000002,
+ &hb_cpu_info.buf4[ 0],
+ &hb_cpu_info.buf4[ 1],
+ &hb_cpu_info.buf4[ 2],
+ &hb_cpu_info.buf4[ 3]);
+ cpuid(0x80000003,
+ &hb_cpu_info.buf4[ 4],
+ &hb_cpu_info.buf4[ 5],
+ &hb_cpu_info.buf4[ 6],
+ &hb_cpu_info.buf4[ 7]);
+ cpuid(0x80000004,
+ &hb_cpu_info.buf4[ 8],
+ &hb_cpu_info.buf4[ 9],
+ &hb_cpu_info.buf4[10],
+ &hb_cpu_info.buf4[11]);
+
+ hb_cpu_info.name = hb_cpu_info.buf;
+ hb_cpu_info.buf[47] = '\0'; // just in case
+
+ while (isspace(*hb_cpu_info.name))
+ {
+ // skip leading whitespace to prettify
+ hb_cpu_info.name++;
+ }
+ }
+#endif // ARCH_X86_64 || ARCH_X86_32
 }
- cpu_count = 1;
+}
+
+/*
+ * Whenever possible, returns the number of CPUs on the current computer.
+ * Returns 1 otherwise.
+ */
+static int init_cpu_count()
+{
+ int cpu_count = 1;
 
 #if defined(SYS_CYGWIN) || defined(SYS_MINGW)
 SYSTEM_INFO cpuinfo;
@@ -231,6 +440,43 @@
 return cpu_count;
 }
 
+int hb_platform_init()
+{
+ int result = 0;
+
+#if defined(SYS_MINGW) && defined(PTW32_STATIC_LIB)
+ result = !pthread_win32_process_attach_np();
+ if (result)
+ {
+ hb_error("pthread_win32_process_attach_np() failed!");
+ return -1;
+ }
+#endif
+
+#if defined(_WIN32) || defined(__MINGW32__)
+ /*
+ * win32 _IOLBF (line-buffering) is the same as _IOFBF (full-buffering).
+ * force it to unbuffered otherwise informative output is not easily parsed.
+ */
+ result = setvbuf(stdout, NULL, _IONBF, 0);
+ if (result)
+ {
+ hb_error("setvbuf(stdout, NULL, _IONBF, 0) failed!");
+ return -1;
+ }
+ result = setvbuf(stderr, NULL, _IONBF, 0);
+ if (result)
+ {
+ hb_error("setvbuf(stderr, NULL, _IONBF, 0) failed!");
+ return -1;
+ }
+#endif
+
+ init_cpu_info();
+
+ return result;
+}
+
 /************************************************************************
 * Get a temporary directory for HB
 ***********************************************************************/
@@ -262,7 +508,7 @@
 if( base[strlen(base)-1] == '/' )
 base[strlen(base)-1] = '\0';
 
- snprintf( path, 512, "%s/hb.%d", base, getpid() );
+ snprintf(path, 512, "%s/hb.%d", base, (int)getpid());
 }
 
 /************************************************************************
@@ -282,17 +528,140 @@
 }
 
 /************************************************************************
+ * hb_stat
+ ************************************************************************
+ * Wrapper to the real stat, needed to handle utf8 filenames on
+ * windows.
+ ***********************************************************************/
+int hb_stat(const char *path, hb_stat_t *sb)
+{
+#ifdef SYS_MINGW
+ wchar_t path_utf16[MAX_PATH];
+ if (!MultiByteToWideChar(CP_UTF8, 0, path, -1, path_utf16, MAX_PATH))
+ return -1;
+ return _wstat64( path_utf16, sb );
+#else
+ return stat(path, sb);
+#endif
+}
+
+/************************************************************************
+ * hb_fopen
+ ************************************************************************
+ * Wrapper to the real fopen, needed to handle utf8 filenames on
+ * windows.
+ ***********************************************************************/
+FILE * hb_fopen(const char *path, const char *mode)
+{
+#ifdef SYS_MINGW
+ FILE *f;
+ wchar_t path_utf16[MAX_PATH];
+ wchar_t mode_utf16[16];
+ if (!MultiByteToWideChar(CP_UTF8, 0, path, -1, path_utf16, MAX_PATH))
+ return NULL;
+ if (!MultiByteToWideChar(CP_UTF8, 0, mode, -1, mode_utf16, 16))
+ return NULL;
+ errno_t ret = _wfopen_s(&f, path_utf16, mode_utf16);
+ if (ret)
+ return NULL;
+ return f;
+#else
+ return fopen(path, mode);
+#endif
+}
+
+HB_DIR* hb_opendir(char *path)
+{
+#ifdef SYS_MINGW
+ HB_DIR *dir;
+ wchar_t path_utf16[MAX_PATH];
+
+ if (!MultiByteToWideChar(CP_UTF8, 0, path, -1, path_utf16, MAX_PATH))
+ return NULL;
+ dir = malloc(sizeof(HB_DIR));
+ if (dir == NULL)
+ return NULL;
+ dir->wdir = _wopendir(path_utf16);
+ if (dir->wdir == NULL)
+ {
+ free(dir);
+ return NULL;
+ }
+ return dir;
+#else
+ return opendir(path);
+#endif
+}
+
+int hb_closedir(HB_DIR *dir)
+{
+#ifdef SYS_MINGW
+ int ret;
+
+ ret = _wclosedir(dir->wdir);
+ free(dir);
+ return ret;
+#else
+ return closedir(dir);
+#endif
+}
+
+struct dirent * hb_readdir(HB_DIR *dir)
+{
+#ifdef SYS_MINGW
+ struct _wdirent *entry;
+ entry = _wreaddir(dir->wdir);
+ if (entry == NULL)
+ return NULL;
+
+ int len = WideCharToMultiByte(CP_UTF8, 0, entry->d_name, -1,
+ dir->entry.d_name, sizeof(dir->entry.d_name),
+ NULL, NULL );
+ dir->entry.d_ino = entry->d_ino;
+ dir->entry.d_reclen = entry->d_reclen;
+ dir->entry.d_namlen = len - 1;
+ return &dir->entry;
+#else
+ return readdir(dir);
+#endif
+}
+
+void hb_rewinddir(HB_DIR *dir)
+{
+#ifdef SYS_MINGW
+ _wrewinddir(dir->wdir);
+#else
+ return rewinddir(dir);
+#endif
+}
+
+char * hb_strr_dir_sep(const char *path)
+{
+#ifdef SYS_MINGW
+ char *sep = strrchr(path, '/');
+ if (sep == NULL)
+ sep = strrchr(path, '\\');
+ return sep;
+#else
+ return strrchr(path, '/');
+#endif
+}
+
+/************************************************************************
 * hb_mkdir
 ************************************************************************
 * Wrapper to the real mkdir, needed only because it doesn't take a
 * second argument on Win32. Grrr.
 ***********************************************************************/
-void hb_mkdir( char * name )
+int hb_mkdir(char * path)
 {
 #ifdef SYS_MINGW
- mkdir( name );
+ wchar_t path_utf16[MAX_PATH];
+ if (!MultiByteToWideChar(CP_UTF8, 0, path, -1, path_utf16, MAX_PATH))
+ return -1;
+ return _wmkdir(path_utf16);
 #else
- mkdir( name, 0755 );
+ return mkdir(path, 0755);
 #endif
 }

HandBrake-0.9.9.tar.bz2/libhb/ports.h -> HandBrake-0.10.0.tar.bz2/libhb/ports.h Changed

@@ -1,6 +1,6 @@
 /* ports.h
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -12,22 +12,77 @@
 
 #if defined(_WIN32)
 #define DIR_SEP_STR "\\"
+#define DIR_SEP_CHAR '\\'
+#define IS_DIR_SEP(c) (c == '\\' || c == '/')
 #else
 #define DIR_SEP_STR "/"
+#define DIR_SEP_CHAR '/'
+#define IS_DIR_SEP(c) (c == '/')
 #endif
 
+
+/************************************************************************
+ * CPU info utilities
+ ***********************************************************************/
+enum hb_cpu_platform
+{
+ // list of microarchitecture codenames
+ HB_CPU_PLATFORM_UNSPECIFIED = 0,
+ HB_CPU_PLATFORM_INTEL_BNL,
+ HB_CPU_PLATFORM_INTEL_SNB,
+ HB_CPU_PLATFORM_INTEL_IVB,
+ HB_CPU_PLATFORM_INTEL_SLM,
+ HB_CPU_PLATFORM_INTEL_HSW,
+};
+int hb_get_cpu_count();
+int hb_get_cpu_platform();
+const char* hb_get_cpu_name();
+const char* hb_get_cpu_platform_name();
+
 /************************************************************************
 * Utils
 ***********************************************************************/
+// provide time in ms
 uint64_t hb_get_date();
+// provide time in us
+uint64_t hb_get_time_us();
+
 void hb_snooze( int delay );
-int hb_get_cpu_count();
+int hb_platform_init();
 #ifdef SYS_MINGW
 char *strtok_r(char *s, const char *delim, char **save_ptr);
 #endif
 
+#ifdef SYS_MINGW
+typedef struct
+{
+ _WDIR *wdir;
+ struct dirent entry;
+} HB_DIR;
+#else
+typedef DIR HB_DIR;
+#endif
+
+#ifdef SYS_MINGW
+typedef struct _stat64 hb_stat_t;
+#else
+typedef struct stat hb_stat_t;
+#endif
+
+HB_DIR* hb_opendir(char *path);
+int hb_closedir(HB_DIR *dir);
+void hb_rewinddir(HB_DIR *dir);
+struct dirent * hb_readdir(HB_DIR *dir);
+int hb_mkdir(char * name);
+int hb_stat(const char *path, hb_stat_t *sb);
+FILE * hb_fopen(const char *path, const char *mode);
+char * hb_strr_dir_sep(const char *path);
+
 #ifdef __LIBHB__
 
+// Convert utf8 string to current code page.
+char * hb_utf8_to_cp(const char *src);
+
 /* Everything from now is only used internally and hidden to the UI */
 
 /************************************************************************
@@ -41,7 +96,6 @@
 void hb_get_temporary_directory( char path[512] );
 void hb_get_tempory_filename( hb_handle_t *, char name[1024],
 char * fmt, ... );
-void hb_mkdir( char * name );
 
 /************************************************************************
 * Threads

HandBrake-0.10.0.tar.bz2/libhb/qsv_common.c Added

@@ -0,0 +1,1615 @@
+/* qsv_common.c
+ *
+ * Copyright (c) 2003-2014 HandBrake Team
+ * This file is part of the HandBrake source code.
+ * Homepage: <http://handbrake.fr/>.
+ * It may be used under the terms of the GNU General Public License v2.
+ * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#ifdef USE_QSV
+
+#include <stdio.h>
+
+#include "hb.h"
+#include "ports.h"
+#include "common.h"
+#include "hb_dict.h"
+#include "qsv_common.h"
+#include "h264_common.h"
+
+// QSV info for each codec
+static hb_qsv_info_t *hb_qsv_info_avc = NULL;
+static hb_qsv_info_t *hb_qsv_info_hevc = NULL;
+// API versions
+static mfxVersion qsv_software_version = { .Version = 0, };
+static mfxVersion qsv_hardware_version = { .Version = 0, };
+// AVC implementations
+static hb_qsv_info_t qsv_software_info_avc = { .available = 0, .codec_id = MFX_CODEC_AVC, .implementation = MFX_IMPL_SOFTWARE, };
+static hb_qsv_info_t qsv_hardware_info_avc = { .available = 0, .codec_id = MFX_CODEC_AVC, .implementation = MFX_IMPL_HARDWARE_ANY|MFX_IMPL_VIA_ANY, };
+// HEVC implementations
+static mfxPluginUID qsv_encode_plugin_hevc = { .Data = { 0x2F, 0xCA, 0x99, 0x74, 0x9F, 0xDB, 0x49, 0xAE, 0xB1, 0x21, 0xA5, 0xB6, 0x3E, 0xF5, 0x68, 0xF7 } };
+static hb_qsv_info_t qsv_software_info_hevc = { .available = 0, .codec_id = MFX_CODEC_HEVC, .implementation = MFX_IMPL_SOFTWARE, };
+static hb_qsv_info_t qsv_hardware_info_hevc = { .available = 0, .codec_id = MFX_CODEC_HEVC, .implementation = MFX_IMPL_HARDWARE_ANY|MFX_IMPL_VIA_ANY, };
+
+// check available Intel Media SDK version against a minimum
+#define HB_CHECK_MFX_VERSION(MFX_VERSION, MAJOR, MINOR) \
+ (MFX_VERSION.Major == MAJOR && MFX_VERSION.Minor >= MINOR)
+
+/*
+ * Determine the "generation" of QSV hardware based on the CPU microarchitecture.
+ * Anything unknown is assumed to be more recent than the latest known generation.
+ * This avoids having to order the hb_cpu_platform enum depending on QSV hardware.
+ */
+enum
+{
+ QSV_G0, // third party hardware
+ QSV_G1, // Sandy Bridge or equivalent
+ QSV_G2, // Ivy Bridge or equivalent
+ QSV_G3, // Haswell or equivalent
+};
+static int qsv_hardware_generation(int cpu_platform)
+{
+ switch (cpu_platform)
+ {
+ case HB_CPU_PLATFORM_INTEL_BNL:
+ return QSV_G0;
+ case HB_CPU_PLATFORM_INTEL_SNB:
+ return QSV_G1;
+ case HB_CPU_PLATFORM_INTEL_IVB:
+ case HB_CPU_PLATFORM_INTEL_SLM:
+ return QSV_G2;
+ case HB_CPU_PLATFORM_INTEL_HSW:
+ default:
+ return QSV_G3;
+ }
+}
+
+/*
+ * Determine whether a given mfxIMPL is hardware-accelerated.
+ */
+static int qsv_implementation_is_hardware(mfxIMPL implementation)
+{
+ return MFX_IMPL_BASETYPE(implementation) != MFX_IMPL_SOFTWARE;
+}
+
+int hb_qsv_available()
+{
+ return hb_qsv_video_encoder_is_enabled(HB_VCODEC_QSV_H264);
+}
+
+int hb_qsv_video_encoder_is_enabled(int encoder)
+{
+ switch (encoder)
+ {
+ case HB_VCODEC_QSV_H264:
+ return hb_qsv_info_avc != NULL && hb_qsv_info_avc->available;
+ default:
+ return 0;
+ }
+}
+
+int hb_qsv_audio_encoder_is_enabled(int encoder)
+{
+ switch (encoder)
+ {
+ default:
+ return 0;
+ }
+}
+
+static void init_video_param(mfxVideoParam *videoParam)
+{
+ if (videoParam == NULL)
+ {
+ return;
+ }
+
+ memset(videoParam, 0, sizeof(mfxVideoParam));
+ videoParam->mfx.CodecId = MFX_CODEC_AVC;
+ videoParam->mfx.CodecLevel = MFX_LEVEL_UNKNOWN;
+ videoParam->mfx.CodecProfile = MFX_PROFILE_UNKNOWN;
+ videoParam->mfx.RateControlMethod = MFX_RATECONTROL_VBR;
+ videoParam->mfx.TargetUsage = MFX_TARGETUSAGE_BALANCED;
+ videoParam->mfx.TargetKbps = 5000;
+ videoParam->mfx.GopOptFlag = MFX_GOP_CLOSED;
+ videoParam->mfx.FrameInfo.FourCC = MFX_FOURCC_NV12;
+ videoParam->mfx.FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
+ videoParam->mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
+ videoParam->mfx.FrameInfo.FrameRateExtN = 25;
+ videoParam->mfx.FrameInfo.FrameRateExtD = 1;
+ videoParam->mfx.FrameInfo.Width = 1920;
+ videoParam->mfx.FrameInfo.CropW = 1920;
+ videoParam->mfx.FrameInfo.AspectRatioW = 1;
+ videoParam->mfx.FrameInfo.Height = 1088;
+ videoParam->mfx.FrameInfo.CropH = 1080;
+ videoParam->mfx.FrameInfo.AspectRatioH = 1;
+ videoParam->AsyncDepth = AV_QSV_ASYNC_DEPTH_DEFAULT;
+ videoParam->IOPattern = MFX_IOPATTERN_IN_SYSTEM_MEMORY;
+}
+
+static void init_ext_coding_option2(mfxExtCodingOption2 *extCodingOption2)
+{
+ if (extCodingOption2 == NULL)
+ {
+ return;
+ }
+
+ memset(extCodingOption2, 0, sizeof(mfxExtCodingOption2));
+ extCodingOption2->Header.BufferId = MFX_EXTBUFF_CODING_OPTION2;
+ extCodingOption2->Header.BufferSz = sizeof(mfxExtCodingOption2);
+ extCodingOption2->MBBRC = MFX_CODINGOPTION_ON;
+ extCodingOption2->ExtBRC = MFX_CODINGOPTION_ON;
+ extCodingOption2->Trellis = MFX_TRELLIS_I|MFX_TRELLIS_P|MFX_TRELLIS_B;
+ extCodingOption2->RepeatPPS = MFX_CODINGOPTION_ON;
+ extCodingOption2->BRefType = MFX_B_REF_PYRAMID;
+ extCodingOption2->AdaptiveI = MFX_CODINGOPTION_ON;
+ extCodingOption2->AdaptiveB = MFX_CODINGOPTION_ON;
+ extCodingOption2->LookAheadDS = MFX_LOOKAHEAD_DS_4x;
+ extCodingOption2->NumMbPerSlice = 2040; // 1920x1088/4
+}
+
+static int query_capabilities(mfxSession session, mfxVersion version, hb_qsv_info_t *info)
+{
+ /*
+ * MFXVideoENCODE_Query(mfxSession, mfxVideoParam *in, mfxVideoParam *out);
+ *
+ * Mode 1:
+ * - in is NULL
+ * - out has the parameters we want to query set to 1
+ * - out->mfx.CodecId field has to be set (mandatory)
+ * - MFXVideoENCODE_Query should zero out all unsupported parameters
+ *
+ * Mode 2:
+ * - the paramaters we want to query are set for in
+ * - in ->mfx.CodecId field has to be set (mandatory)
+ * - out->mfx.CodecId field has to be set (mandatory)
+ * - MFXVideoENCODE_Query should sanitize all unsupported parameters
+ */
+ mfxStatus status;
+ mfxPluginUID *pluginUID;
+ mfxExtBuffer *videoExtParam[1];
+ mfxVideoParam videoParam, inputParam;
+ mfxExtCodingOption2 extCodingOption2;
+
+ /* Reset capabilities before querying */
+ info->capabilities = 0;
+
+ /* Load optional codec plug-ins */
+ switch (info->codec_id)
+ {
+ case MFX_CODEC_HEVC:
+ pluginUID = &qsv_encode_plugin_hevc;
+ break;
+ default:
+ pluginUID = NULL;
+ break;
+ }
+ if (pluginUID != NULL && HB_CHECK_MFX_VERSION(version, 1, 8) &&
+ MFXVideoUSER_Load(session, pluginUID, 0) < MFX_ERR_NONE)
+ {
+ // couldn't load plugin successfully
+ return 0;
+ }
+
+ /*
+ * First of all, check availability of an encoder for
+ * this combination of a codec ID and implementation.
+ *
+ * Note: can error out rather than sanitizing
+ * unsupported codec IDs, so don't log errors.
+ */
+ if (HB_CHECK_MFX_VERSION(version, HB_QSV_MINVERSION_MAJOR, HB_QSV_MINVERSION_MINOR))
+ {
+ if (info->implementation & MFX_IMPL_AUDIO)
+ {
+ /* Not yet supported */
+ return 0;
+ }
+ else
+ {
+ init_video_param(&inputParam);
+ inputParam.mfx.CodecId = info->codec_id;
+
+ memset(&videoParam, 0, sizeof(mfxVideoParam));
+ videoParam.mfx.CodecId = inputParam.mfx.CodecId;
+
+ if (MFXVideoENCODE_Query(session, &inputParam, &videoParam) >= MFX_ERR_NONE &&
+ videoParam.mfx.CodecId == info->codec_id)
+ {
+ info->available = 1;
+ }
+ }
+ }
+ if (!info->available)
+ {
+ /* Don't check capabilities for unavailable encoders */
+ return 0;
+ }
+
+ if (info->implementation & MFX_IMPL_AUDIO)
+ {
+ /* We don't have any audio capability checks yet */
+ return 0;
+ }
+ else
+ {
+ /* Implementation-specific features that can't be queried */
+ if (qsv_implementation_is_hardware(info->implementation))
+ {
+ if (qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G3)
+ {
+ info->capabilities |= HB_QSV_CAP_B_REF_PYRAMID;
+ }
+ }
+ else
+ {
+ if (HB_CHECK_MFX_VERSION(version, 1, 6))
+ {
+ info->capabilities |= HB_QSV_CAP_B_REF_PYRAMID;
+ }
+ }
+
+ /* API-specific features that can't be queried */
+ if (HB_CHECK_MFX_VERSION(version, 1, 6))
+ {
+ // API >= 1.6 (mfxBitstream::DecodeTimeStamp, mfxExtCodingOption2)
+ info->capabilities |= HB_QSV_CAP_MSDK_API_1_6;
+ }
+
+ /*
+ * Check availability of optional rate control methods.
+ *
+ * Mode 2 tends to error out, but mode 1 gives false negatives, which
+ * is worse. So use mode 2 and assume an error means it's unsupported.
+ *
+ * Also assume that LA and ICQ combined imply LA_ICQ is
+ * supported, so we don't need to check the latter too.
+ */
+ if (HB_CHECK_MFX_VERSION(version, 1, 7))
+ {
+ init_video_param(&inputParam);
+ inputParam.mfx.CodecId = info->codec_id;
+ inputParam.mfx.RateControlMethod = MFX_RATECONTROL_LA;
+
+ memset(&videoParam, 0, sizeof(mfxVideoParam));
+ videoParam.mfx.CodecId = inputParam.mfx.CodecId;
+
+ if (MFXVideoENCODE_Query(session, &inputParam, &videoParam) >= MFX_ERR_NONE &&
+ videoParam.mfx.RateControlMethod == MFX_RATECONTROL_LA)
+ {
+ info->capabilities |= HB_QSV_CAP_RATECONTROL_LA;
+
+ // also check for LA + interlaced support
+ init_video_param(&inputParam);
+ inputParam.mfx.CodecId = info->codec_id;
+ inputParam.mfx.RateControlMethod = MFX_RATECONTROL_LA;
+ inputParam.mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_FIELD_TFF;
+
+ memset(&videoParam, 0, sizeof(mfxVideoParam));
+ videoParam.mfx.CodecId = inputParam.mfx.CodecId;
+
+ if (MFXVideoENCODE_Query(session, &inputParam, &videoParam) >= MFX_ERR_NONE &&
+ videoParam.mfx.FrameInfo.PicStruct == MFX_PICSTRUCT_FIELD_TFF &&
+ videoParam.mfx.RateControlMethod == MFX_RATECONTROL_LA)
+ {
+ info->capabilities |= HB_QSV_CAP_RATECONTROL_LAi;
+ }
+ }
+ }
+ if (HB_CHECK_MFX_VERSION(version, 1, 8))
+ {
+ init_video_param(&inputParam);
+ inputParam.mfx.CodecId = info->codec_id;
+ inputParam.mfx.RateControlMethod = MFX_RATECONTROL_ICQ;
+
+ memset(&videoParam, 0, sizeof(mfxVideoParam));
+ videoParam.mfx.CodecId = inputParam.mfx.CodecId;
+
+ if (MFXVideoENCODE_Query(session, &inputParam, &videoParam) >= MFX_ERR_NONE &&
+ videoParam.mfx.RateControlMethod == MFX_RATECONTROL_ICQ)
+ {
+ info->capabilities |= HB_QSV_CAP_RATECONTROL_ICQ;
+ }
+ }
+
+ /*
+ * Check mfxExtCodingOption2 fields.
+ *
+ * Mode 2 suffers from false negatives with some drivers, whereas mode 1
+ * suffers from false positives instead. The latter is probably easier
+ * and/or safer to sanitize for us, so use mode 1.
+ */
+ if (HB_CHECK_MFX_VERSION(version, 1, 6) && info->codec_id == MFX_CODEC_AVC)
+ {
+ init_video_param(&videoParam);
+ videoParam.mfx.CodecId = info->codec_id;
+
+ init_ext_coding_option2(&extCodingOption2);
+ videoParam.ExtParam = videoExtParam;
+ videoParam.ExtParam[0] = (mfxExtBuffer*)&extCodingOption2;
+ videoParam.NumExtParam = 1;
+
+ status = MFXVideoENCODE_Query(session, NULL, &videoParam);
+ if (status >= MFX_ERR_NONE)
+ {
+#if 0
+ // testing code that could come in handy
+ fprintf(stderr, "-------------------\n");
+ fprintf(stderr, "MBBRC: 0x%02X\n", extCodingOption2.MBBRC);
+ fprintf(stderr, "ExtBRC: 0x%02X\n", extCodingOption2.ExtBRC);
+ fprintf(stderr, "Trellis: 0x%02X\n", extCodingOption2.Trellis);
+ fprintf(stderr, "RepeatPPS: 0x%02X\n", extCodingOption2.RepeatPPS);
+ fprintf(stderr, "BRefType: %4"PRIu16"\n", extCodingOption2.BRefType);
+ fprintf(stderr, "AdaptiveI: 0x%02X\n", extCodingOption2.AdaptiveI);
+ fprintf(stderr, "AdaptiveB: 0x%02X\n", extCodingOption2.AdaptiveB);
+ fprintf(stderr, "LookAheadDS: %4"PRIu16"\n", extCodingOption2.LookAheadDS);
+ fprintf(stderr, "-------------------\n");
+#endif
+
+ /*
+ * Sanitize API 1.6 fields:
+ *
+ * - MBBRC requires G3 hardware (Haswell or equivalent)
+ * - ExtBRC requires G2 hardware (Ivy Bridge or equivalent)
+ */
+ if (qsv_implementation_is_hardware(info->implementation) &&
+ qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G3)
+ {
+ if (extCodingOption2.MBBRC)
+ {
+ info->capabilities |= HB_QSV_CAP_OPTION2_MBBRC;
+ }
+ }
+ if (qsv_implementation_is_hardware(info->implementation) &&
+ qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G2)
+ {
+ if (extCodingOption2.ExtBRC)
+ {
+ info->capabilities |= HB_QSV_CAP_OPTION2_EXTBRC;
+ }
+ }
+
+ /*
+ * Sanitize API 1.7 fields:
+ *
+ * - Trellis requires G3 hardware (Haswell or equivalent)
+ */
+ if (HB_CHECK_MFX_VERSION(version, 1, 7))
+ {
+ if (qsv_implementation_is_hardware(info->implementation) &&
+ qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G3)
+ {
+ if (extCodingOption2.Trellis)
+ {
+ info->capabilities |= HB_QSV_CAP_OPTION2_TRELLIS;
+ }
+ }
+ }
+
+ /*
+ * Sanitize API 1.8 fields:
+ *
+ * - BRefType requires B-pyramid support
+ * - LookAheadDS requires lookahead support
+ * - AdaptiveI, AdaptiveB, NumMbPerSlice unknown (trust Query)
+ */
+ if (HB_CHECK_MFX_VERSION(version, 1, 8))
+ {
+ if (info->capabilities & HB_QSV_CAP_B_REF_PYRAMID)
+ {
+ if (extCodingOption2.BRefType)
+ {
+ info->capabilities |= HB_QSV_CAP_OPTION2_BREFTYPE;
+ }
+ }
+ if (info->capabilities & HB_QSV_CAP_RATECONTROL_LA)
+ {
+ if (extCodingOption2.LookAheadDS)
+ {
+ info->capabilities |= HB_QSV_CAP_OPTION2_LA_DOWNS;
+ }
+ }
+ if (extCodingOption2.AdaptiveI && extCodingOption2.AdaptiveB)
+ {
+ info->capabilities |= HB_QSV_CAP_OPTION2_IB_ADAPT;
+ }
+ if (extCodingOption2.NumMbPerSlice)
+ {
+ info->capabilities |= HB_QSV_CAP_OPTION2_NMBSLICE;
+ }
+ }
+ }
+ else
+ {
+ fprintf(stderr,
+ "hb_qsv_info_init: mfxExtCodingOption2 check failed (0x%"PRIX32", 0x%"PRIX32", %d)\n",
+ info->codec_id, info->implementation, status);
+ }
+ }
+ }
+
+ /* Unload optional codec plug-ins */
+ if (pluginUID != NULL && HB_CHECK_MFX_VERSION(version, 1, 8))
+ {
+ MFXVideoUSER_UnLoad(session, pluginUID);
+ }
+
+ return 0;
+}
+
+int hb_qsv_info_init()
+{
+ static int init_done = 0;
+ if (init_done)
+ return 0;
+ init_done = 1;
+
+ /*
+ * First, check for any MSDK version to determine whether one or
+ * more implementations are present; then check if we can use them.
+ *
+ * I've had issues using a NULL version with some combinations of
+ * hardware and driver, so use a low version number (1.0) instead.
+ */
+ mfxSession session;
+ mfxVersion version = { .Major = 1, .Minor = 0, };
+
+ // check for software fallback
+ if (MFXInit(MFX_IMPL_SOFTWARE, &version, &session) == MFX_ERR_NONE)
+ {
+ // Media SDK software found, but check that our minimum is supported
+ MFXQueryVersion(session, &qsv_software_version);
+ if (HB_CHECK_MFX_VERSION(qsv_software_version,
+ HB_QSV_MINVERSION_MAJOR,
+ HB_QSV_MINVERSION_MINOR))
+ {
+ query_capabilities(session, qsv_software_version, &qsv_software_info_avc);
+ query_capabilities(session, qsv_software_version, &qsv_software_info_hevc);
+ // now that we know which hardware encoders are
+ // available, we can set the preferred implementation
+ hb_qsv_impl_set_preferred("software");
+ }
+ MFXClose(session);
+ }
+
+ // check for actual hardware support
+ if (MFXInit(MFX_IMPL_HARDWARE_ANY, &version, &session) == MFX_ERR_NONE)
+ {
+ // Media SDK hardware found, but check that our minimum is supported
+ //
+ // Note: this-party hardware (QSV_G0) is unsupported for the time being
+ MFXQueryVersion(session, &qsv_hardware_version);
+ if (qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G1 &&
+ HB_CHECK_MFX_VERSION(qsv_hardware_version,
+ HB_QSV_MINVERSION_MAJOR,
+ HB_QSV_MINVERSION_MINOR))
+ {
+ query_capabilities(session, qsv_hardware_version, &qsv_hardware_info_avc);
+ query_capabilities(session, qsv_hardware_version, &qsv_hardware_info_hevc);
+ // now that we know which hardware encoders are
+ // available, we can set the preferred implementation
+ hb_qsv_impl_set_preferred("hardware");
+ }
+ MFXClose(session);
+ }
+
+ // success
+ return 0;
+}
+
+static void log_capabilities(int log_level, uint64_t caps, const char *prefix)
+{
+ if (!caps)
+ {
+ hb_deep_log(log_level, "%s none (standard feature set)", prefix);
+ }
+ else
+ {
+ hb_deep_log(log_level, "%s%s%s%s%s%s%s%s%s%s%s%s%s", prefix,
+ !(caps & HB_QSV_CAP_MSDK_API_1_6) ? "" : " api1.6",
+ !(caps & HB_QSV_CAP_B_REF_PYRAMID) ? "" : " bpyramid",
+ !(caps & HB_QSV_CAP_OPTION2_BREFTYPE) ? "" : " breftype",
+ !(caps & HB_QSV_CAP_RATECONTROL_LA) ? "" : " lookahead",
+ !(caps & HB_QSV_CAP_RATECONTROL_LAi) ? "" : " lookaheadi",
+ !(caps & HB_QSV_CAP_OPTION2_LA_DOWNS) ? "" : " lookaheadds",
+ !(caps & HB_QSV_CAP_RATECONTROL_ICQ) ? "" : " icq",
+ !(caps & HB_QSV_CAP_OPTION2_MBBRC) ? "" : " mbbrc",
+ !(caps & HB_QSV_CAP_OPTION2_EXTBRC) ? "" : " extbrc",
+ !(caps & HB_QSV_CAP_OPTION2_TRELLIS) ? "" : " trellis",
+ !(caps & HB_QSV_CAP_OPTION2_IB_ADAPT) ? "" : " adaptivei adaptiveb",
+ !(caps & HB_QSV_CAP_OPTION2_NMBSLICE) ? "" : " nummbperslice");
+ }
+}
+
+void hb_qsv_info_print()
+{
+ // is QSV available and usable?
+ hb_log("Intel Quick Sync Video support: %s",
+ hb_qsv_available() ? "yes": "no");
+
+ // also print the details
+ if (qsv_hardware_version.Version)
+ {
+ hb_log(" - Intel Media SDK hardware: API %"PRIu16".%"PRIu16" (minimum: %"PRIu16".%"PRIu16")",
+ qsv_hardware_version.Major, qsv_hardware_version.Minor,
+ HB_QSV_MINVERSION_MAJOR, HB_QSV_MINVERSION_MINOR);
+ }
+ if (qsv_software_version.Version)
+ {
+ hb_log(" - Intel Media SDK software: API %"PRIu16".%"PRIu16" (minimum: %"PRIu16".%"PRIu16")",
+ qsv_software_version.Major, qsv_software_version.Minor,
+ HB_QSV_MINVERSION_MAJOR, HB_QSV_MINVERSION_MINOR);
+ }
+ if (hb_qsv_available())
+ {
+ if (hb_qsv_info_avc != NULL && hb_qsv_info_avc->available)
+ {
+ hb_log(" - H.264 encoder: yes");
+ hb_log(" - preferred implementation: %s",
+ hb_qsv_impl_get_name(hb_qsv_info_avc->implementation));
+ if (qsv_hardware_info_avc.available)
+ {
+ log_capabilities(2, qsv_hardware_info_avc.capabilities,
+ " - capabilities (hardware): ");
+ }
+ if (qsv_software_info_avc.available)
+ {
+ log_capabilities(2, qsv_software_info_avc.capabilities,
+ " - capabilities (software): ");
+ }
+ }
+ else
+ {
+ hb_log(" - H.264 encoder: no");
+ }
+ if (hb_qsv_info_hevc != NULL && hb_qsv_info_hevc->available)
+ {
+ hb_log(" - H.265 encoder: yes (unsupported)");
+ hb_log(" - preferred implementation: %s",
+ hb_qsv_impl_get_name(hb_qsv_info_hevc->implementation));
+ if (qsv_hardware_info_hevc.available)
+ {
+ log_capabilities(2, qsv_hardware_info_hevc.capabilities,
+ " - capabilities (hardware): ");
+ }
+ if (qsv_software_info_hevc.available)
+ {
+ log_capabilities(2, qsv_software_info_hevc.capabilities,
+ " - capabilities (software): ");
+ }
+ }
+ else
+ {
+ hb_log(" - H.265 encoder: no");
+ }
+ }
+}
+
+hb_qsv_info_t* hb_qsv_info_get(int encoder)
+{
+ switch (encoder)
+ {
+ case HB_VCODEC_QSV_H264:
+ return hb_qsv_info_avc;
+ default:
+ return NULL;
+ }
+}
+
+const char* hb_qsv_decode_get_codec_name(enum AVCodecID codec_id)
+{
+ switch (codec_id)
+ {
+ case AV_CODEC_ID_H264:
+ return "h264_qsv";
+
+ default:
+ return NULL;
+ }
+}
+
+int hb_qsv_decode_is_enabled(hb_job_t *job)
+{
+ return ((job != NULL && job->qsv.decode) &&
+ (job->vcodec & HB_VCODEC_QSV_MASK) &&
+ (job->title->video_decode_support & HB_DECODE_SUPPORT_QSV));
+}
+
+int hb_qsv_copyframe_is_slow(int encoder)
+{
+ hb_qsv_info_t *info = hb_qsv_info_get(encoder);
+ if (info != NULL && qsv_implementation_is_hardware(info->implementation))
+ {
+ // we should really check the driver version, but since it's not
+ // available, checking the API version is the best we can do :-(
+ return !HB_CHECK_MFX_VERSION(qsv_hardware_version, 1, 7);
+ }
+ return 0;
+}
+
+int hb_qsv_codingoption_xlat(int val)
+{
+ switch (HB_QSV_CLIP3(-1, 2, val))
+ {
+ case 0:
+ return MFX_CODINGOPTION_OFF;
+ case 1:
+ case 2: // MFX_CODINGOPTION_ADAPTIVE, reserved
+ return MFX_CODINGOPTION_ON;
+ case -1:
+ default:
+ return MFX_CODINGOPTION_UNKNOWN;
+ }
+}
+
+int hb_qsv_trellisvalue_xlat(int val)
+{
+ switch (HB_QSV_CLIP3(0, 3, val))
+ {
+ case 0:
+ return MFX_TRELLIS_OFF;
+ case 1: // I-frames only
+ return MFX_TRELLIS_I;
+ case 2: // I- and P-frames
+ return MFX_TRELLIS_I|MFX_TRELLIS_P;
+ case 3: // all frames
+ return MFX_TRELLIS_I|MFX_TRELLIS_P|MFX_TRELLIS_B;
+ default:
+ return MFX_TRELLIS_UNKNOWN;
+ }
+}
+
+const char* hb_qsv_codingoption_get_name(int val)
+{
+ switch (val)
+ {
+ case MFX_CODINGOPTION_ON:
+ return "on";
+ case MFX_CODINGOPTION_OFF:
+ return "off";
+ case MFX_CODINGOPTION_ADAPTIVE:
+ return "adaptive";
+ case MFX_CODINGOPTION_UNKNOWN:
+ return "unknown (auto)";
+ default:
+ return NULL;
+ }
+}
+
+int hb_qsv_atoindex(const char* const *arr, const char *str, int *err)
+{
+ int i;
+ for (i = 0; arr[i] != NULL; i++)
+ {
+ if (!strcasecmp(arr[i], str))
+ {
+ break;
+ }
+ }
+ *err = (arr[i] == NULL);
+ return i;
+}
+
+// adapted from libx264
+int hb_qsv_atobool(const char *str, int *err)
+{
+ if (!strcasecmp(str, "1") ||
+ !strcasecmp(str, "yes") ||
+ !strcasecmp(str, "true"))
+ {
+ return 1;
+ }
+ if (!strcasecmp(str, "0") ||
+ !strcasecmp(str, "no") ||
+ !strcasecmp(str, "false"))
+ {
+ return 0;
+ }
+ *err = 1;
+ return 0;
+}
+
+// adapted from libx264
+int hb_qsv_atoi(const char *str, int *err)
+{
+ char *end;
+ int v = strtol(str, &end, 0);
+ if (end == str || end[0] != '\0')
+ {
+ *err = 1;
+ }
+ return v;
+}
+
+// adapted from libx264
+float hb_qsv_atof(const char *str, int *err)
+{
+ char *end;
+ float v = strtod(str, &end);
+ if (end == str || end[0] != '\0')
+ {
+ *err = 1;
+ }
+ return v;
+}
+
+int hb_qsv_param_parse(hb_qsv_param_t *param, hb_qsv_info_t *info,
+ const char *key, const char *value)
+{
+ float fvalue;
+ int ivalue, error = 0;
+ if (param == NULL || info == NULL)
+ {
+ return HB_QSV_PARAM_ERROR;
+ }
+ if (value == NULL || value[0] == '\0')
+ {
+ value = "true";
+ }
+ else if (value[0] == '=')
+ {
+ value++;
+ }
+ if (key == NULL || key[0] == '\0')
+ {
+ return HB_QSV_PARAM_BAD_NAME;
+ }
+ else if (!strncasecmp(key, "no-", 3))
+ {
+ key += 3;
+ value = hb_qsv_atobool(value, &error) ? "false" : "true";
+ if (error)
+ {
+ return HB_QSV_PARAM_BAD_VALUE;
+ }
+ }
+ if (!strcasecmp(key, "target-usage") ||
+ !strcasecmp(key, "tu"))
+ {
+ ivalue = hb_qsv_atoi(value, &error);
+ if (!error)
+ {
+ param->videoParam->mfx.TargetUsage = HB_QSV_CLIP3(MFX_TARGETUSAGE_1,
+ MFX_TARGETUSAGE_7,
+ ivalue);
+ }
+ }
+ else if (!strcasecmp(key, "num-ref-frame") ||
+ !strcasecmp(key, "ref"))
+ {
+ ivalue = hb_qsv_atoi(value, &error);
+ if (!error)
+ {
+ param->videoParam->mfx.NumRefFrame = HB_QSV_CLIP3(0, 16, ivalue);
+ }
+ }
+ else if (!strcasecmp(key, "gop-ref-dist"))
+ {
+ ivalue = hb_qsv_atoi(value, &error);
+ if (!error)
+ {
+ param->gop.gop_ref_dist = HB_QSV_CLIP3(-1, 32, ivalue);
+ }
+ }
+ else if (!strcasecmp(key, "gop-pic-size") ||
+ !strcasecmp(key, "keyint"))
+ {
+ ivalue = hb_qsv_atoi(value, &error);
+ if (!error)
+ {
+ param->gop.gop_pic_size = HB_QSV_CLIP3(-1, UINT16_MAX, ivalue);
+ }
+ }
+ else if (!strcasecmp(key, "b-pyramid"))
+ {
+ if (info->capabilities & HB_QSV_CAP_B_REF_PYRAMID)
+ {
+ ivalue = hb_qsv_atoi(value, &error);
+ if (!error)
+ {
+ param->gop.b_pyramid = HB_QSV_CLIP3(-1, 1, ivalue);
+ }
+ }
+ else
+ {
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ }
+ else if (!strcasecmp(key, "scenecut"))
+ {
+ ivalue = hb_qsv_atobool(value, &error);
+ if (!error)
+ {
+ if (!ivalue)
+ {
+ param->videoParam->mfx.GopOptFlag |= MFX_GOP_STRICT;
+ }
+ else
+ {
+ param->videoParam->mfx.GopOptFlag &= ~MFX_GOP_STRICT;
+ }
+ }
+ }
+ else if (!strcasecmp(key, "adaptive-i") ||
+ !strcasecmp(key, "i-adapt"))
+ {
+ if (info->capabilities & HB_QSV_CAP_OPTION2_IB_ADAPT)
+ {
+ ivalue = hb_qsv_atobool(value, &error);
+ if (!error)
+ {
+ param->codingOption2.AdaptiveI = hb_qsv_codingoption_xlat(ivalue);
+ }
+ }
+ else
+ {
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ }
+ else if (!strcasecmp(key, "adaptive-b") ||
+ !strcasecmp(key, "b-adapt"))
+ {
+ if (info->capabilities & HB_QSV_CAP_OPTION2_IB_ADAPT)
+ {
+ ivalue = hb_qsv_atobool(value, &error);
+ if (!error)
+ {
+ param->codingOption2.AdaptiveB = hb_qsv_codingoption_xlat(ivalue);
+ }
+ }
+ else
+ {
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ }
+ else if (!strcasecmp(key, "force-cqp"))
+ {
+ ivalue = hb_qsv_atobool(value, &error);
+ if (!error)
+ {
+ param->rc.icq = !ivalue;
+ }
+ }
+ else if (!strcasecmp(key, "cqp-offset-i"))
+ {
+ ivalue = hb_qsv_atoi(value, &error);
+ if (!error)
+ {
+ param->rc.cqp_offsets[0] = HB_QSV_CLIP3(INT16_MIN, INT16_MAX, ivalue);
+ }
+ }
+ else if (!strcasecmp(key, "cqp-offset-p"))
+ {
+ ivalue = hb_qsv_atoi(value, &error);
+ if (!error)
+ {
+ param->rc.cqp_offsets[1] = HB_QSV_CLIP3(INT16_MIN, INT16_MAX, ivalue);
+ }
+ }
+ else if (!strcasecmp(key, "cqp-offset-b"))
+ {
+ ivalue = hb_qsv_atoi(value, &error);
+ if (!error)
+ {
+ param->rc.cqp_offsets[2] = HB_QSV_CLIP3(INT16_MIN, INT16_MAX, ivalue);
+ }
+ }
+ else if (!strcasecmp(key, "vbv-init"))
+ {
+ fvalue = hb_qsv_atof(value, &error);
+ if (!error)
+ {
+ param->rc.vbv_buffer_init = HB_QSV_CLIP3(0, UINT16_MAX, fvalue);
+ }
+ }
+ else if (!strcasecmp(key, "vbv-bufsize"))
+ {
+ ivalue = hb_qsv_atoi(value, &error);
+ if (!error)
+ {
+ param->rc.vbv_buffer_size = HB_QSV_CLIP3(0, UINT16_MAX, ivalue);
+ }
+ }
+ else if (!strcasecmp(key, "vbv-maxrate"))
+ {
+ ivalue = hb_qsv_atoi(value, &error);
+ if (!error)
+ {
+ param->rc.vbv_max_bitrate = HB_QSV_CLIP3(0, UINT16_MAX, ivalue);
+ }
+ }
+ else if (!strcasecmp(key, "cavlc") || !strcasecmp(key, "cabac"))
+ {
+ switch (info->codec_id)
+ {
+ case MFX_CODEC_AVC:
+ ivalue = hb_qsv_atobool(value, &error);
+ break;
+ default:
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ if (!error)
+ {
+ if (!strcasecmp(key, "cabac"))
+ {
+ ivalue = !ivalue;
+ }
+ param->codingOption.CAVLC = hb_qsv_codingoption_xlat(ivalue);
+ }
+ }
+ else if (!strcasecmp(key, "videoformat"))
+ {
+ switch (info->codec_id)
+ {
+ case MFX_CODEC_AVC:
+ ivalue = hb_qsv_atoindex(hb_h264_vidformat_names, value, &error);
+ break;
+ default:
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ if (!error)
+ {
+ param->videoSignalInfo.VideoFormat = ivalue;
+ }
+ }
+ else if (!strcasecmp(key, "fullrange"))
+ {
+ switch (info->codec_id)
+ {
+ case MFX_CODEC_AVC:
+ ivalue = hb_qsv_atoindex(hb_h264_fullrange_names, value, &error);
+ break;
+ default:
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ if (!error)
+ {
+ param->videoSignalInfo.VideoFullRange = ivalue;
+ }
+ }
+ else if (!strcasecmp(key, "colorprim"))
+ {
+ switch (info->codec_id)
+ {
+ case MFX_CODEC_AVC:
+ ivalue = hb_qsv_atoindex(hb_h264_colorprim_names, value, &error);
+ break;
+ default:
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ if (!error)
+ {
+ param->videoSignalInfo.ColourDescriptionPresent = 1;
+ param->videoSignalInfo.ColourPrimaries = ivalue;
+ }
+ }
+ else if (!strcasecmp(key, "transfer"))
+ {
+ switch (info->codec_id)
+ {
+ case MFX_CODEC_AVC:
+ ivalue = hb_qsv_atoindex(hb_h264_transfer_names, value, &error);
+ break;
+ default:
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ if (!error)
+ {
+ param->videoSignalInfo.ColourDescriptionPresent = 1;
+ param->videoSignalInfo.TransferCharacteristics = ivalue;
+ }
+ }
+ else if (!strcasecmp(key, "colormatrix"))
+ {
+ switch (info->codec_id)
+ {
+ case MFX_CODEC_AVC:
+ ivalue = hb_qsv_atoindex(hb_h264_colmatrix_names, value, &error);
+ break;
+ default:
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ if (!error)
+ {
+ param->videoSignalInfo.ColourDescriptionPresent = 1;
+ param->videoSignalInfo.MatrixCoefficients = ivalue;
+ }
+ }
+ else if (!strcasecmp(key, "tff") ||
+ !strcasecmp(key, "interlaced"))
+ {
+ switch (info->codec_id)
+ {
+ case MFX_CODEC_AVC:
+ ivalue = hb_qsv_atobool(value, &error);
+ break;
+ default:
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ if (!error)
+ {
+ param->videoParam->mfx.FrameInfo.PicStruct = (ivalue ?
+ MFX_PICSTRUCT_FIELD_TFF :
+ MFX_PICSTRUCT_PROGRESSIVE);
+ }
+ }
+ else if (!strcasecmp(key, "bff"))
+ {
+ switch (info->codec_id)
+ {
+ case MFX_CODEC_AVC:
+ ivalue = hb_qsv_atobool(value, &error);
+ break;
+ default:
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ if (!error)
+ {
+ param->videoParam->mfx.FrameInfo.PicStruct = (ivalue ?
+ MFX_PICSTRUCT_FIELD_BFF :
+ MFX_PICSTRUCT_PROGRESSIVE);
+ }
+ }
+ else if (!strcasecmp(key, "mbbrc"))
+ {
+ if (info->capabilities & HB_QSV_CAP_OPTION2_MBBRC)
+ {
+ ivalue = hb_qsv_atobool(value, &error);
+ if (!error)
+ {
+ param->codingOption2.MBBRC = hb_qsv_codingoption_xlat(ivalue);
+ }
+ }
+ else
+ {
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ }
+ else if (!strcasecmp(key, "extbrc"))
+ {
+ if (info->capabilities & HB_QSV_CAP_OPTION2_EXTBRC)
+ {
+ ivalue = hb_qsv_atobool(value, &error);
+ if (!error)
+ {
+ param->codingOption2.ExtBRC = hb_qsv_codingoption_xlat(ivalue);
+ }
+ }
+ else
+ {
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ }
+ else if (!strcasecmp(key, "lookahead") ||
+ !strcasecmp(key, "la"))
+ {
+ if (info->capabilities & HB_QSV_CAP_RATECONTROL_LA)
+ {
+ ivalue = hb_qsv_atobool(value, &error);
+ if (!error)
+ {
+ param->rc.lookahead = ivalue;
+ }
+ }
+ else
+ {
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ }
+ else if (!strcasecmp(key, "lookahead-depth") ||
+ !strcasecmp(key, "la-depth"))
+ {
+ if (info->capabilities & HB_QSV_CAP_RATECONTROL_LA)
+ {
+ ivalue = hb_qsv_atoi(value, &error);
+ if (!error)
+ {
+ // LookAheadDepth 10 will cause a hang with some driver versions
+ param->codingOption2.LookAheadDepth = HB_QSV_CLIP3(11, 100,
+ ivalue);
+ }
+ }
+ else
+ {
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ }
+ else if (!strcasecmp(key, "lookahead-ds") ||
+ !strcasecmp(key, "la-ds"))
+ {
+ if (info->capabilities & HB_QSV_CAP_OPTION2_LA_DOWNS)
+ {
+ ivalue = hb_qsv_atoi(value, &error);
+ if (!error)
+ {
+ param->codingOption2.LookAheadDS = HB_QSV_CLIP3(MFX_LOOKAHEAD_DS_UNKNOWN,
+ MFX_LOOKAHEAD_DS_4x,
+ ivalue);
+ }
+ }
+ else
+ {
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ }
+ else if (!strcasecmp(key, "trellis"))
+ {
+ if (info->capabilities & HB_QSV_CAP_OPTION2_TRELLIS)
+ {
+ ivalue = hb_qsv_atoi(value, &error);
+ if (!error)
+ {
+ param->codingOption2.Trellis = hb_qsv_trellisvalue_xlat(ivalue);
+ }
+ }
+ else
+ {
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ }
+ else
+ {
+ /*
+ * TODO:
+ * - slice count (num-slice/slices, num-mb-per-slice/slice-max-mbs)
+ * - open-gop
+ * - fake-interlaced (mfxExtCodingOption.FramePicture???)
+ * - intra-refresh
+ */
+ return HB_QSV_PARAM_BAD_NAME;
+ }
+ return error ? HB_QSV_PARAM_BAD_VALUE : HB_QSV_PARAM_OK;
+}
+
+#ifdef HB_API_OLD_PRESET_GETTERS
+const char* const* hb_qsv_presets()
+{
+ return hb_qsv_preset_get_names();
+}
+#endif
+
+const char* const* hb_qsv_preset_get_names()
+{
+ if (qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G3)
+ {
+ return hb_qsv_preset_names2;
+ }
+ else
+ {
+ return hb_qsv_preset_names1;
+ }
+}
+
+const char* const* hb_qsv_profile_get_names(int encoder)
+{
+ switch (encoder)
+ {
+ case HB_VCODEC_QSV_H264:
+ return hb_h264_profile_names;
+ default:
+ return NULL;
+ }
+}
+
+const char* const* hb_qsv_level_get_names(int encoder)
+{
+ switch (encoder)
+ {
+ case HB_VCODEC_QSV_H264:
+ return hb_h264_level_names;
+ default:
+ return NULL;
+ }
+}
+
+const char* hb_qsv_video_quality_get_name(uint32_t codec)
+{
+ uint64_t caps;
+ switch (codec)
+ {
+ case HB_VCODEC_QSV_H264:
+ caps = hb_qsv_info_avc != NULL ? hb_qsv_info_avc->capabilities : 0;
+ return (caps & HB_QSV_CAP_RATECONTROL_ICQ) ? "ICQ" : "QP";
+
+ default:
+ return "QP";
+ }
+}
+
+void hb_qsv_video_quality_get_limits(uint32_t codec, float *low, float *high,
+ float *granularity, int *direction)
+{
+ uint64_t caps;
+ switch (codec)
+ {
+ case HB_VCODEC_QSV_H264:
+ caps = hb_qsv_info_avc != NULL ? hb_qsv_info_avc->capabilities : 0;
+ *direction = 1;
+ *granularity = 1.;
+ *low = (caps & HB_QSV_CAP_RATECONTROL_ICQ) ? 1. : 0.;
+ *high = 51.;
+ break;
+
+ default:
+ *direction = 1;
+ *granularity = 1.;
+ *low = 0.;
+ *high = 51.;
+ break;
+ }
+}
+
+int hb_qsv_param_default_preset(hb_qsv_param_t *param,
+ mfxVideoParam *videoParam,
+ hb_qsv_info_t *info, const char *preset)
+{
+ if (param != NULL && videoParam != NULL && info != NULL)
+ {
+ int ret = hb_qsv_param_default(param, videoParam, info);
+ if (ret)
+ {
+ return ret;
+ }
+ }
+ else
+ {
+ hb_error("hb_qsv_param_default_preset: invalid pointer(s)");
+ return -1;
+ }
+ if (preset != NULL && preset[0] != '\0')
+ {
+ if (!strcasecmp(preset, "quality"))
+ {
+ /*
+ * HSW TargetUsage: 2
+ * NumRefFrame: 0
+ * GopRefDist: 4 (CQP), 3 (VBR) -> -1 (set by encoder)
+ * GopPicSize: 32 (CQP), 1 second (VBR) -> -1 (set by encoder)
+ * BPyramid: 1 (CQP), 0 (VBR) -> -1 (set by encoder)
+ * LookAhead: 1 (on)
+ * LookAheadDepth: 40
+ *
+ *
+ * SNB
+ * IVB Preset Not Available
+ *
+ * Note: this preset is the libhb default (like x264's "medium").
+ */
+ }
+ else if (!strcasecmp(preset, "balanced"))
+ {
+ /*
+ * HSW TargetUsage: 4
+ * NumRefFrame: 1
+ * GopRefDist: 4 (CQP), 3 (VBR) -> -1 (set by encoder)
+ * GopPicSize: 32 (CQP), 1 second (VBR) -> -1 (set by encoder)
+ * BPyramid: 1 (CQP), 0 (VBR) -> -1 (set by encoder)
+ * LookAhead: 0 (off)
+ * LookAheadDepth: Not Applicable
+ */
+ if (qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G3)
+ {
+ param->rc.lookahead = 0;
+ param->videoParam->mfx.NumRefFrame = 1;
+ param->videoParam->mfx.TargetUsage = MFX_TARGETUSAGE_4;
+ }
+ else
+ {
+ /*
+ * SNB
+ * IVB TargetUsage: 2
+ * NumRefFrame: 0
+ * GopRefDist: 4 (CQP), 3 (VBR) -> -1 (set by encoder)
+ * GopPicSize: 32 (CQP), 1 second (VBR) -> -1 (set by encoder)
+ * BPyramid: Not Applicable
+ * LookAhead: Not Applicable
+ * LookAheadDepth: Not Applicable
+ *
+ * Note: this preset is not the libhb default,
+ * but the settings are the same so do nothing.
+ */
+ }
+ }
+ else if (!strcasecmp(preset, "speed"))
+ {
+ if (qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G3)
+ {
+ /*
+ * HSW TargetUsage: 6
+ * NumRefFrame: 0 (CQP), 1 (VBR) -> see note
+ * GopRefDist: 4 (CQP), 3 (VBR) -> -1 (set by encoder)
+ * GopPicSize: 32 (CQP), 1 second (VBR) -> -1 (set by encoder)
+ * BPyramid: 1 (CQP), 0 (VBR) -> -1 (set by encoder)
+ * LookAhead: 0 (off)
+ * LookAheadDepth: Not Applicable
+ *
+ * Note: NumRefFrame depends on the RC method, which we don't
+ * know here. Rather than have an additional variable and
+ * having the encoder set it, we set it to 1 and let the
+ * B-pyramid code sanitize it. Since BPyramid is 1 w/CQP,
+ * the result (3) is the same as what MSDK would pick for
+ * NumRefFrame 0 GopRefDist 4 GopPicSize 32.
+ */
+ param->rc.lookahead = 0;
+ param->videoParam->mfx.NumRefFrame = 1;
+ param->videoParam->mfx.TargetUsage = MFX_TARGETUSAGE_6;
+ }
+ else
+ {
+ /*
+ * SNB
+ * IVB TargetUsage: 4
+ * NumRefFrame: 0
+ * GopRefDist: 4 (CQP), 3 (VBR) -> -1 (set by encoder)
+ * GopPicSize: 32 (CQP), 1 second (VBR) -> -1 (set by encoder)
+ * BPyramid: Not Applicable
+ * LookAhead: Not Applicable
+ * LookAheadDepth: Not Applicable
+ */
+ param->videoParam->mfx.TargetUsage = MFX_TARGETUSAGE_4;
+ }
+ }
+ else
+ {
+ hb_error("hb_qsv_param_default_preset: invalid preset '%s'", preset);
+ return -1;
+ }
+ }
+ return 0;
+}
+
+int hb_qsv_param_default(hb_qsv_param_t *param, mfxVideoParam *videoParam,
+ hb_qsv_info_t *info)
+{
+ if (param != NULL && videoParam != NULL && info != NULL)
+ {
+ // introduced in API 1.0
+ memset(&param->codingOption, 0, sizeof(mfxExtCodingOption));
+ param->codingOption.Header.BufferId = MFX_EXTBUFF_CODING_OPTION;
+ param->codingOption.Header.BufferSz = sizeof(mfxExtCodingOption);
+ param->codingOption.MECostType = 0; // reserved, must be 0
+ param->codingOption.MESearchType = 0; // reserved, must be 0
+ param->codingOption.MVSearchWindow.x = 0; // reserved, must be 0
+ param->codingOption.MVSearchWindow.y = 0; // reserved, must be 0
+ param->codingOption.RefPicListReordering = 0; // reserved, must be 0
+ param->codingOption.IntraPredBlockSize = 0; // reserved, must be 0
+ param->codingOption.InterPredBlockSize = 0; // reserved, must be 0
+ param->codingOption.MVPrecision = 0; // reserved, must be 0
+ param->codingOption.EndOfSequence = MFX_CODINGOPTION_UNKNOWN;
+ param->codingOption.RateDistortionOpt = MFX_CODINGOPTION_UNKNOWN;
+ param->codingOption.ResetRefList = MFX_CODINGOPTION_UNKNOWN;
+ param->codingOption.MaxDecFrameBuffering = 0; // unspecified
+ param->codingOption.AUDelimiter = MFX_CODINGOPTION_OFF;
+ param->codingOption.SingleSeiNalUnit = MFX_CODINGOPTION_UNKNOWN;
+ param->codingOption.PicTimingSEI = MFX_CODINGOPTION_OFF;
+ param->codingOption.VuiNalHrdParameters = MFX_CODINGOPTION_UNKNOWN;
+ param->codingOption.FramePicture = MFX_CODINGOPTION_UNKNOWN;
+ param->codingOption.CAVLC = MFX_CODINGOPTION_OFF;
+ // introduced in API 1.3
+ param->codingOption.RefPicMarkRep = MFX_CODINGOPTION_UNKNOWN;
+ param->codingOption.FieldOutput = MFX_CODINGOPTION_UNKNOWN;
+ param->codingOption.NalHrdConformance = MFX_CODINGOPTION_UNKNOWN;
+ param->codingOption.SingleSeiNalUnit = MFX_CODINGOPTION_UNKNOWN;
+ param->codingOption.VuiVclHrdParameters = MFX_CODINGOPTION_UNKNOWN;
+ // introduced in API 1.4
+ param->codingOption.ViewOutput = MFX_CODINGOPTION_UNKNOWN;
+ // introduced in API 1.6
+ param->codingOption.RecoveryPointSEI = MFX_CODINGOPTION_UNKNOWN;
+
+ // introduced in API 1.3
+ memset(&param->videoSignalInfo, 0, sizeof(mfxExtVideoSignalInfo));
+ param->videoSignalInfo.Header.BufferId = MFX_EXTBUFF_VIDEO_SIGNAL_INFO;
+ param->videoSignalInfo.Header.BufferSz = sizeof(mfxExtVideoSignalInfo);
+ param->videoSignalInfo.VideoFormat = 5; // undefined
+ param->videoSignalInfo.VideoFullRange = 0; // TV range
+ param->videoSignalInfo.ColourDescriptionPresent = 0; // don't write to bitstream
+ param->videoSignalInfo.ColourPrimaries = 2; // undefined
+ param->videoSignalInfo.TransferCharacteristics = 2; // undefined
+ param->videoSignalInfo.MatrixCoefficients = 2; // undefined
+
+ // introduced in API 1.6
+ memset(&param->codingOption2, 0, sizeof(mfxExtCodingOption2));
+ param->codingOption2.Header.BufferId = MFX_EXTBUFF_CODING_OPTION2;
+ param->codingOption2.Header.BufferSz = sizeof(mfxExtCodingOption2);
+ param->codingOption2.IntRefType = 0;
+ param->codingOption2.IntRefCycleSize = 2;
+ param->codingOption2.IntRefQPDelta = 0;
+ param->codingOption2.MaxFrameSize = 0;
+ param->codingOption2.BitrateLimit = MFX_CODINGOPTION_ON;
+ param->codingOption2.MBBRC = MFX_CODINGOPTION_ON;
+ param->codingOption2.ExtBRC = MFX_CODINGOPTION_OFF;
+ // introduced in API 1.7
+ param->codingOption2.LookAheadDepth = 40;
+ param->codingOption2.Trellis = MFX_TRELLIS_OFF;
+ // introduced in API 1.8
+ param->codingOption2.RepeatPPS = MFX_CODINGOPTION_ON;
+ param->codingOption2.BRefType = MFX_B_REF_UNKNOWN; // controlled via gop.b_pyramid
+ param->codingOption2.AdaptiveI = MFX_CODINGOPTION_ON;
+ param->codingOption2.AdaptiveB = MFX_CODINGOPTION_ON;
+ param->codingOption2.LookAheadDS = MFX_LOOKAHEAD_DS_OFF;
+ param->codingOption2.NumMbPerSlice = 0;
+
+ // GOP & rate control
+ param->gop.b_pyramid = -1; // set automatically
+ param->gop.gop_pic_size = -1; // set automatically
+ param->gop.gop_ref_dist = -1; // set automatically
+ param->gop.int_ref_cycle_size = -1; // set automatically
+ param->rc.icq = 1; // enabled by default (if supported)
+ param->rc.lookahead = 1; // enabled by default (if supported)
+ param->rc.cqp_offsets[0] = 0;
+ param->rc.cqp_offsets[1] = 2;
+ param->rc.cqp_offsets[2] = 4;
+ param->rc.vbv_max_bitrate = 0; // set automatically
+ param->rc.vbv_buffer_size = 0; // set automatically
+ param->rc.vbv_buffer_init = .0; // set automatically
+
+ // introduced in API 1.0
+ memset(videoParam, 0, sizeof(mfxVideoParam));
+ param->videoParam = videoParam;
+ param->videoParam->Protected = 0; // reserved, must be 0
+ param->videoParam->NumExtParam = 0;
+ param->videoParam->IOPattern = MFX_IOPATTERN_IN_SYSTEM_MEMORY;
+ param->videoParam->mfx.TargetUsage = MFX_TARGETUSAGE_2;
+ param->videoParam->mfx.GopOptFlag = MFX_GOP_CLOSED;
+ param->videoParam->mfx.NumThread = 0; // deprecated, must be 0
+ param->videoParam->mfx.EncodedOrder = 0; // input is in display order
+ param->videoParam->mfx.IdrInterval = 0; // all I-frames are IDR
+ param->videoParam->mfx.NumSlice = 0; // use Media SDK default
+ param->videoParam->mfx.NumRefFrame = 0; // use Media SDK default
+ param->videoParam->mfx.GopPicSize = 0; // use Media SDK default
+ param->videoParam->mfx.GopRefDist = 0; // use Media SDK default
+ // introduced in API 1.1
+ param->videoParam->AsyncDepth = AV_QSV_ASYNC_DEPTH_DEFAULT;
+ // introduced in API 1.3
+ param->videoParam->mfx.BRCParamMultiplier = 0; // no multiplier
+
+ // FrameInfo: set by video encoder, except PicStruct
+ param->videoParam->mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
+
+ // attach supported mfxExtBuffer structures to the mfxVideoParam
+ param->videoParam->NumExtParam = 0;
+ param->videoParam->ExtParam = param->ExtParamArray;
+ param->videoParam->ExtParam[param->videoParam->NumExtParam++] = (mfxExtBuffer*)&param->codingOption;
+ param->videoParam->ExtParam[param->videoParam->NumExtParam++] = (mfxExtBuffer*)&param->videoSignalInfo;
+ if (info->capabilities & HB_QSV_CAP_MSDK_API_1_6)
+ {
+ param->videoParam->ExtParam[param->videoParam->NumExtParam++] = (mfxExtBuffer*)&param->codingOption2;
+ }
+ }
+ else
+ {
+ hb_error("hb_qsv_param_default: invalid pointer(s)");
+ return -1;
+ }
+ return 0;
+}
+
+const char* hb_qsv_frametype_name(uint16_t qsv_frametype)
+{
+ if (qsv_frametype & MFX_FRAMETYPE_IDR)
+ {
+ return qsv_frametype & MFX_FRAMETYPE_REF ? "IDR (ref)" : "IDR";
+ }
+ else if (qsv_frametype & MFX_FRAMETYPE_I)
+ {
+ return qsv_frametype & MFX_FRAMETYPE_REF ? "I (ref)" : "I";
+ }
+ else if (qsv_frametype & MFX_FRAMETYPE_P)
+ {
+ return qsv_frametype & MFX_FRAMETYPE_REF ? "P (ref)" : "P";
+ }
+ else if (qsv_frametype & MFX_FRAMETYPE_B)
+ {
+ return qsv_frametype & MFX_FRAMETYPE_REF ? "B (ref)" : "B";
+ }
+ else
+ {
+ return "unknown";
+ }
+}
+
+uint8_t hb_qsv_frametype_xlat(uint16_t qsv_frametype, uint16_t *out_flags)
+{
+ uint16_t flags = 0;
+ uint8_t frametype = 0;
+
+ if (qsv_frametype & MFX_FRAMETYPE_IDR)
+ {
+ frametype = HB_FRAME_IDR;
+ }
+ else if (qsv_frametype & MFX_FRAMETYPE_I)
+ {
+ frametype = HB_FRAME_I;
+ }
+ else if (qsv_frametype & MFX_FRAMETYPE_P)
+ {
+ frametype = HB_FRAME_P;
+ }
+ else if (qsv_frametype & MFX_FRAMETYPE_B)
+ {
+ frametype = HB_FRAME_B;
+ }
+
+ if (qsv_frametype & MFX_FRAMETYPE_REF)
+ {
+ flags |= HB_FRAME_REF;
+ }
+
+ if (out_flags != NULL)
+ {
+ *out_flags = flags;
+ }
+ return frametype;
+}
+
+int hb_qsv_impl_set_preferred(const char *name)
+{
+ if (name == NULL)
+ {
+ return -1;
+ }
+ if (!strcasecmp(name, "software"))
+ {
+ if (qsv_software_info_avc.available)
+ {
+ hb_qsv_info_avc = &qsv_software_info_avc;
+ }
+ if (qsv_software_info_hevc.available)
+ {
+ hb_qsv_info_hevc = &qsv_software_info_hevc;
+ }
+ return 0;
+ }
+ if (!strcasecmp(name, "hardware"))
+ {
+ if (qsv_hardware_info_avc.available)
+ {
+ hb_qsv_info_avc = &qsv_hardware_info_avc;
+ }
+ if (qsv_hardware_info_hevc.available)
+ {
+ hb_qsv_info_hevc = &qsv_hardware_info_hevc;
+ }
+ return 0;
+ }
+ return -1;
+}
+
+const char* hb_qsv_impl_get_name(int impl)
+{
+ switch (MFX_IMPL_BASETYPE(impl))
+ {
+ case MFX_IMPL_SOFTWARE:
+ return "software";
+
+ case MFX_IMPL_HARDWARE:
+ return "hardware (1)";
+ case MFX_IMPL_HARDWARE2:
+ return "hardware (2)";
+ case MFX_IMPL_HARDWARE3:
+ return "hardware (3)";
+ case MFX_IMPL_HARDWARE4:
+ return "hardware (4)";
+ case MFX_IMPL_HARDWARE_ANY:
+ return "hardware (any)";
+
+ case MFX_IMPL_AUTO:
+ return "automatic";
+ case MFX_IMPL_AUTO_ANY:
+ return "automatic (any)";
+
+ default:
+ return NULL;
+ }
+}
+
+void hb_qsv_force_workarounds()
+{
+ qsv_software_info_avc.capabilities &= ~HB_QSV_CAP_MSDK_API_1_6;
+ qsv_hardware_info_avc.capabilities &= ~HB_QSV_CAP_MSDK_API_1_6;
+ qsv_software_info_hevc.capabilities &= ~HB_QSV_CAP_MSDK_API_1_6;
+ qsv_hardware_info_hevc.capabilities &= ~HB_QSV_CAP_MSDK_API_1_6;
+}
+
+#endif // USE_QSV

HandBrake-0.10.0.tar.bz2/libhb/qsv_common.h Added

@@ -0,0 +1,165 @@
+/* qsv_common.h
+ *
+ * Copyright (c) 2003-2014 HandBrake Team
+ * This file is part of the HandBrake source code.
+ * Homepage: <http://handbrake.fr/>.
+ * It may be used under the terms of the GNU General Public License v2.
+ * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#ifndef HB_QSV_COMMON_H
+#define HB_QSV_COMMON_H
+
+#include "msdk/mfxvideo.h"
+#include "msdk/mfxplugin.h"
+#include "libavcodec/avcodec.h"
+
+/* Minimum Intel Media SDK version (currently 1.3, for Sandy Bridge support) */
+#define HB_QSV_MINVERSION_MAJOR AV_QSV_MSDK_VERSION_MAJOR
+#define HB_QSV_MINVERSION_MINOR AV_QSV_MSDK_VERSION_MINOR
+
+/*
+ * Get & store all available Intel Quick Sync information:
+ *
+ * - general availability
+ * - available implementations (hardware-accelerated, software fallback, etc.)
+ * - available codecs, filters, etc. for direct access (convenience)
+ * - supported API version
+ * - supported resolutions
+ */
+typedef struct hb_qsv_info_s
+{
+ // each info struct only corresponds to one CodecId and implementation combo
+ const mfxU32 codec_id;
+ const mfxIMPL implementation;
+
+ // whether the encoder is available for this implementation
+ int available;
+
+ // version-specific or hardware-specific capabilities
+ uint64_t capabilities;
+ // support for API 1.6 or later
+#define HB_QSV_CAP_MSDK_API_1_6 (1LL << 0)
+ // H.264, H.265: B-frames can be used as references
+#define HB_QSV_CAP_B_REF_PYRAMID (1LL << 1)
+ // optional rate control methods
+#define HB_QSV_CAP_RATECONTROL_LA (1LL << 10)
+#define HB_QSV_CAP_RATECONTROL_LAi (1LL << 11)
+#define HB_QSV_CAP_RATECONTROL_ICQ (1LL << 12)
+ // mfxExtCodingOption2 fields
+#define HB_QSV_CAP_OPTION2_MBBRC (1LL << 20)
+#define HB_QSV_CAP_OPTION2_EXTBRC (1LL << 21)
+#define HB_QSV_CAP_OPTION2_TRELLIS (1LL << 22)
+#define HB_QSV_CAP_OPTION2_BREFTYPE (1LL << 23)
+#define HB_QSV_CAP_OPTION2_IB_ADAPT (1LL << 24)
+#define HB_QSV_CAP_OPTION2_LA_DOWNS (1LL << 25)
+#define HB_QSV_CAP_OPTION2_NMBSLICE (1LL << 26)
+
+ // TODO: add maximum encode resolution, etc.
+} hb_qsv_info_t;
+
+/* Intel Quick Sync Video utilities */
+int hb_qsv_available();
+int hb_qsv_video_encoder_is_enabled(int encoder);
+int hb_qsv_audio_encoder_is_enabled(int encoder);
+int hb_qsv_info_init();
+void hb_qsv_info_print();
+hb_qsv_info_t* hb_qsv_info_get(int encoder);
+
+/* Intel Quick Sync Video DECODE utilities */
+const char* hb_qsv_decode_get_codec_name(enum AVCodecID codec_id);
+int hb_qsv_decode_is_enabled(hb_job_t *job);
+
+/*
+ * mfxCoreInterface::CopyFrame had a bug preventing us from using it, but
+ * it was fixed in newer drivers - we can use this to determine usability
+ */
+int hb_qsv_copyframe_is_slow(int encoder);
+
+/* Media SDK parameters handling */
+enum
+{
+ HB_QSV_PARAM_OK,
+ HB_QSV_PARAM_ERROR,
+ HB_QSV_PARAM_BAD_NAME,
+ HB_QSV_PARAM_BAD_VALUE,
+ HB_QSV_PARAM_UNSUPPORTED,
+};
+
+typedef struct
+{
+ /*
+ * Supported mfxExtBuffer.BufferId values:
+ *
+ * MFX_EXTBUFF_AVC_REFLIST_CTRL
+ * MFX_EXTBUFF_AVC_TEMPORAL_LAYERS
+ * MFX_EXTBUFF_CODING_OPTION
+ * MFX_EXTBUFF_CODING_OPTION_SPSPPS
+ * MFX_EXTBUFF_CODING_OPTION2
+ * MFX_EXTBUFF_ENCODER_CAPABILITY
+ * MFX_EXTBUFF_ENCODER_RESET_OPTION
+ * MFX_EXTBUFF_OPAQUE_SURFACE_ALLOCATION
+ * MFX_EXTBUFF_PICTURE_TIMING_SEI
+ * MFX_EXTBUFF_VIDEO_SIGNAL_INFO
+ *
+ * This should cover all encode-compatible extended
+ * buffers that can be attached to an mfxVideoParam.
+ */
+#define HB_QSV_ENC_NUM_EXT_PARAM_MAX 10
+ mfxExtBuffer* ExtParamArray[HB_QSV_ENC_NUM_EXT_PARAM_MAX];
+ mfxExtCodingOption codingOption;
+ mfxExtCodingOption2 codingOption2;
+ mfxExtVideoSignalInfo videoSignalInfo;
+ struct
+ {
+ int b_pyramid;
+ int gop_pic_size;
+ int gop_ref_dist;
+ int int_ref_cycle_size;
+ } gop;
+ struct
+ {
+ int icq;
+ int lookahead;
+ int cqp_offsets[3];
+ int vbv_max_bitrate;
+ int vbv_buffer_size;
+ float vbv_buffer_init;
+ } rc;
+
+ // assigned via hb_qsv_param_default, may be shared with another structure
+ mfxVideoParam *videoParam;
+} hb_qsv_param_t;
+
+static const char* const hb_qsv_preset_names1[] = { "speed", "balanced", NULL, };
+static const char* const hb_qsv_preset_names2[] = { "speed", "balanced", "quality", NULL, };
+const char* const* hb_qsv_preset_get_names();
+const char* const* hb_qsv_profile_get_names(int encoder);
+const char* const* hb_qsv_level_get_names(int encoder);
+
+const char* hb_qsv_video_quality_get_name(uint32_t codec);
+void hb_qsv_video_quality_get_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction);
+
+#define HB_QSV_CLIP3(min, max, val) ((val < min) ? min : (val > max) ? max : val)
+int hb_qsv_codingoption_xlat (int val);
+const char* hb_qsv_codingoption_get_name(int val);
+
+int hb_qsv_trellisvalue_xlat(int val);
+int hb_qsv_atoindex(const char* const *arr, const char *str, int *err);
+int hb_qsv_atobool (const char *str, int *err);
+int hb_qsv_atoi (const char *str, int *err);
+float hb_qsv_atof (const char *str, int *err);
+
+int hb_qsv_param_default_preset(hb_qsv_param_t *param, mfxVideoParam *videoParam, hb_qsv_info_t *info, const char *preset);
+int hb_qsv_param_default (hb_qsv_param_t *param, mfxVideoParam *videoParam, hb_qsv_info_t *info);
+int hb_qsv_param_parse (hb_qsv_param_t *param, hb_qsv_info_t *info, const char *key, const char *value);
+
+const char* hb_qsv_frametype_name(uint16_t qsv_frametype);
+uint8_t hb_qsv_frametype_xlat(uint16_t qsv_frametype, uint16_t *out_flags);
+
+int hb_qsv_impl_set_preferred(const char *name);
+const char* hb_qsv_impl_get_name(int impl);
+
+void hb_qsv_force_workarounds(); // for developers only
+
+#endif

HandBrake-0.10.0.tar.bz2/libhb/qsv_filter.c Added

@@ -0,0 +1,683 @@
+/* ********************************************************************* *\
+
+Copyright (C) 2013 Intel Corporation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+- Neither the name of Intel Corporation nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+\* ********************************************************************* */
+
+#ifdef USE_QSV
+
+#include "hb.h"
+#include "hbffmpeg.h"
+#include "libavcodec/qsv.h"
+#include "qsv_filter.h"
+
+struct hb_filter_private_s
+{
+ hb_job_t *job;
+ hb_list_t *list;
+
+ int width_in;
+ int height_in;
+ int pix_fmt;
+ int pix_fmt_out;
+ int width_out;
+ int height_out;
+ int crop[4];
+ int deinterlace;
+ int is_frc_used;
+
+ // set during init, used to configure input surfaces' "area of interest"
+ mfxU16 CropX;
+ mfxU16 CropY;
+ mfxU16 CropH;
+ mfxU16 CropW;
+
+ av_qsv_space *vpp_space;
+
+ // FRC param(s)
+ mfxExtVPPFrameRateConversion frc_config;
+};
+
+static int hb_qsv_filter_init( hb_filter_object_t * filter,
+ hb_filter_init_t * init );
+
+static int hb_qsv_filter_work( hb_filter_object_t * filter,
+ hb_buffer_t ** buf_in,
+ hb_buffer_t ** buf_out );
+
+static int hb_qsv_filter_info( hb_filter_object_t * filter,
+ hb_filter_info_t * info );
+
+static void hb_qsv_filter_close( hb_filter_object_t * filter );
+
+hb_filter_object_t hb_filter_qsv =
+{
+ .id = HB_FILTER_QSV,
+ .enforce_order = 1,
+ .name = "Quick Sync Video VPP",
+ .settings = NULL,
+ .init = hb_qsv_filter_init,
+ .work = hb_qsv_filter_work,
+ .close = hb_qsv_filter_close,
+ .info = hb_qsv_filter_info,
+};
+
+static int filter_init( av_qsv_context* qsv, hb_filter_private_t * pv ){
+ mfxStatus sts;
+ int i=0;
+
+ if(!qsv) return 3;
+
+
+ if(!qsv->vpp_space){
+ qsv->vpp_space = av_qsv_list_init(HAVE_THREADS);
+ }
+ if(!pv->vpp_space){
+ for(i=0; i<av_qsv_list_count(qsv->vpp_space);i++){
+ av_qsv_space *qsv_vpp = av_qsv_list_item( qsv->vpp_space, i );
+ if(qsv_vpp->type == AV_QSV_VPP_DEFAULT){
+ pv->vpp_space = qsv_vpp;
+ break;
+ }
+ }
+ }
+
+ if(!pv->vpp_space){
+ pv->vpp_space = calloc( 1, sizeof( av_qsv_space ));
+ pv->vpp_space->type = AV_QSV_VPP_DEFAULT;
+ av_qsv_list_add( qsv->vpp_space, pv->vpp_space );
+ }
+ else
+ if(pv->vpp_space->is_init_done ) return 1;
+
+ if(!qsv->dec_space || !qsv->dec_space->is_init_done) return 2;
+
+ // we need to know final output settings before we can properly configure
+ if (!pv->job->qsv.enc_info.is_init_done)
+ {
+ return 2;
+ }
+
+ av_qsv_add_context_usage(qsv,HAVE_THREADS);
+
+ // see params needed like at mediasdk-man.pdf:"Appendix A: Configuration Parameter Constraints"
+ // for now - most will take from the decode
+ {
+ av_qsv_space *qsv_vpp = pv->vpp_space;
+ AV_QSV_ZERO_MEMORY(qsv_vpp->m_mfxVideoParam);
+
+ if (pv->deinterlace)
+ {
+ /*
+ * Input may be progressive, interlaced or even mixed, so init with
+ * MFX_PICSTRUCT_UNKNOWN and use per-frame field order information
+ * (mfxFrameSurface1.Info.PicStruct)
+ */
+ qsv_vpp->m_mfxVideoParam.vpp.In.PicStruct = MFX_PICSTRUCT_UNKNOWN;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
+ }
+ else
+ {
+ /* Same PicStruct in/out: no filtering */
+ qsv_vpp->m_mfxVideoParam.vpp.In.PicStruct = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.PicStruct;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.PicStruct = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.PicStruct;
+ }
+
+ // FrameRate is important for VPP to start with
+ if( qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.FrameRateExtN == 0 &&
+ qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.FrameRateExtD == 0 ){
+ qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.FrameRateExtN = pv->job->title->rate;
+ qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.FrameRateExtD = pv->job->title->rate_base;
+ }
+
+ /*
+ * In theory, input width/height and decode CropW/CropH should be the
+ * same; however, due to some versions of Libav not applying the H.264
+ * "crop rect" properly, there can be a mismatch.
+ *
+ * Since we want the same bahevior regardless of whether we're using
+ * software or hardware-accelerated decoding, prefer the Libav values.
+ *
+ * Note that since CropW/CropH may be higher than the decode values, we
+ * need to adjust CropX/CropY to make sure we don't exceed the input's
+ * Width/Height boundaries.
+ */
+ pv->CropW = pv-> width_in;
+ pv->CropH = pv->height_in;
+ pv->CropX = FFMIN(qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.CropX,
+ qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.Width - pv->CropW);
+ pv->CropY = FFMIN(qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.CropY,
+ qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.Height - pv->CropH);
+ /* Then, apply additional cropping requested by the user, if any */
+ pv->CropX += pv->crop[2];
+ pv->CropY += pv->crop[0];
+ pv->CropW -= pv->crop[2] + pv->crop[3];
+ pv->CropH -= pv->crop[0] + pv->crop[1];
+ 
+
+ qsv_vpp->m_mfxVideoParam.vpp.In.FourCC = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.FourCC;
+ qsv_vpp->m_mfxVideoParam.vpp.In.ChromaFormat = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.ChromaFormat;
+ qsv_vpp->m_mfxVideoParam.vpp.In.FrameRateExtN = pv->job->vrate;
+ qsv_vpp->m_mfxVideoParam.vpp.In.FrameRateExtD = pv->job->vrate_base;
+ qsv_vpp->m_mfxVideoParam.vpp.In.AspectRatioW = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.AspectRatioW;
+ qsv_vpp->m_mfxVideoParam.vpp.In.AspectRatioH = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.AspectRatioH;
+ qsv_vpp->m_mfxVideoParam.vpp.In.Width = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.Width;
+ qsv_vpp->m_mfxVideoParam.vpp.In.Height = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.Height;
+ qsv_vpp->m_mfxVideoParam.vpp.In.CropX = pv->CropX;
+ qsv_vpp->m_mfxVideoParam.vpp.In.CropY = pv->CropY;
+ qsv_vpp->m_mfxVideoParam.vpp.In.CropW = pv->CropW;
+ qsv_vpp->m_mfxVideoParam.vpp.In.CropH = pv->CropH;
+
+ qsv_vpp->m_mfxVideoParam.vpp.Out.FourCC = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.FourCC;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.ChromaFormat = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.ChromaFormat;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.FrameRateExtN = pv->job->vrate;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.FrameRateExtD = pv->job->vrate_base;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.AspectRatioW = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.AspectRatioW;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.AspectRatioH = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.AspectRatioH;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.Width = pv->job->qsv.enc_info.align_width;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.Height = pv->job->qsv.enc_info.align_height;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.CropX = 0; // no letterboxing
+ qsv_vpp->m_mfxVideoParam.vpp.Out.CropY = 0; // no pillarboxing
+ qsv_vpp->m_mfxVideoParam.vpp.Out.CropW = pv-> width_out;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.CropH = pv->height_out;
+
+ qsv_vpp->m_mfxVideoParam.IOPattern = MFX_IOPATTERN_IN_OPAQUE_MEMORY | MFX_IOPATTERN_OUT_OPAQUE_MEMORY;
+
+ qsv_vpp->m_mfxVideoParam.AsyncDepth = pv->job->qsv.async_depth;
+
+ memset(&qsv_vpp->request, 0, sizeof(mfxFrameAllocRequest)*2);
+
+ sts = MFXVideoVPP_QueryIOSurf(qsv->mfx_session, &qsv_vpp->m_mfxVideoParam, qsv_vpp->request );
+ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+
+ int num_surfaces_in = qsv_vpp->request[0].NumFrameSuggested;
+ int num_surfaces_out = qsv_vpp->request[1].NumFrameSuggested;
+
+ av_qsv_config *config = qsv->qsv_config;
+
+
+ qsv_vpp->surface_num = FFMIN( num_surfaces_in + num_surfaces_out + qsv_vpp->m_mfxVideoParam.AsyncDepth + config ? config->additional_buffers/2 :0 , AV_QSV_SURFACE_NUM );
+ if(qsv_vpp->surface_num <= 0 )
+ qsv_vpp->surface_num = AV_QSV_SURFACE_NUM;
+
+ int i = 0;
+ for (i = 0; i < qsv_vpp->surface_num; i++){
+ qsv_vpp->p_surfaces[i] = av_mallocz( sizeof(mfxFrameSurface1) );
+ AV_QSV_CHECK_POINTER(qsv_vpp->p_surfaces[i], MFX_ERR_MEMORY_ALLOC);
+ memcpy(&(qsv_vpp->p_surfaces[i]->Info), &(qsv_vpp->m_mfxVideoParam.vpp.Out), sizeof(mfxFrameInfo));
+ }
+
+ qsv_vpp->sync_num = FFMIN( qsv_vpp->surface_num, AV_QSV_SYNC_NUM );
+
+ for (i = 0; i < qsv_vpp->sync_num; i++){
+ qsv_vpp->p_syncp[i] = av_mallocz(sizeof(av_qsv_sync));
+ AV_QSV_CHECK_POINTER(qsv_vpp->p_syncp[i], MFX_ERR_MEMORY_ALLOC);
+ qsv_vpp->p_syncp[i]->p_sync = av_mallocz(sizeof(mfxSyncPoint));
+ AV_QSV_CHECK_POINTER(qsv_vpp->p_syncp[i]->p_sync, MFX_ERR_MEMORY_ALLOC);
+ }
+/*
+ about available VPP filters, see "Table 4 Configurable VPP filters", mediasdk-man.pdf
+ Hints (optional feature) IDs:
+ MFX_EXTBUFF_VPP_DENOISE // Remove noise
+ // Value of 0-100 (inclusive) indicates
+ // the level of noise to remove.
+ MFX_EXTBUFF_VPP_DETAIL // Enhance picture details/edges:
+ // 0-100 value (inclusive) to indicate
+ // the level of details to be enhanced.
+ MFX_EXTBUFF_VPP_FRAME_RATE_CONVERSION // Convert input frame rate to match the output, based on frame interpolation:
+ // MFX_FRCALGM_PRESERVE_TIMESTAMP,
+ // MFX_FRCALGM_DISTRIBUTED_TIMESTAMP,
+ // MFX_FRCALGM_FRAME_INTERPOLATION
+ MFX_EXTBUFF_VPP_IMAGE_STABILIZATION // Perform image stabilization
+ // Stabilization modes:
+ // MFX_IMAGESTAB_MODE_UPSCALE
+ // MFX_IMAGESTAB_MODE_BOXING
+ MFX_EXTBUFF_VPP_PICSTRUCT_DETECTION // Perform detection of picture structure:
+ // Detected picture structure - top field first, bottom field first, progressive or unknown
+ // if video processor cannot detect picture structure.
+ MFX_EXTBUFF_VPP_PROCAMP // Adjust the brightness, contrast, saturation, and hue settings
+
+ // Initialize extended buffer for frame processing
+ // - Process amplifier (ProcAmp) used to control brightness
+ // - mfxExtVPPDoUse: Define the processing algorithm to be used
+ // - mfxExtVPPProcAmp: ProcAmp configuration
+ // - mfxExtBuffer: Add extended buffers to VPP parameter configuration
+ mfxExtVPPDoUse extDoUse;
+ mfxU32 tabDoUseAlg[1];
+ extDoUse.Header.BufferId = MFX_EXTBUFF_VPP_DOUSE;
+ extDoUse.Header.BufferSz = sizeof(mfxExtVPPDoUse);
+ extDoUse.NumAlg = 1;
+ extDoUse.AlgList = tabDoUseAlg;
+ tabDoUseAlg[0] = MFX_EXTBUFF_VPP_PROCAMP;
+
+ mfxExtVPPProcAmp procampConfig;
+ procampConfig.Header.BufferId = MFX_EXTBUFF_VPP_PROCAMP;
+ procampConfig.Header.BufferSz = sizeof(mfxExtVPPProcAmp);
+ procampConfig.Hue = 0.0f; // Default
+ procampConfig.Saturation = 1.0f; // Default
+ procampConfig.Contrast = 1.0; // Default
+ procampConfig.Brightness = 40.0; // Adjust brightness
+
+ mfxExtBuffer* ExtBuffer[2];
+ ExtBuffer[0] = (mfxExtBuffer*)&extDoUse;
+ ExtBuffer[1] = (mfxExtBuffer*)&procampConfig;
+ VPPParams.NumExtParam = 2;
+ VPPParams.ExtParam = (mfxExtBuffer**)&ExtBuffer[0];
+*/
+ memset(&qsv_vpp->ext_opaque_alloc, 0, sizeof(qsv_vpp->ext_opaque_alloc));
+
+ if( (qsv_vpp->m_mfxVideoParam.vpp.In.FrameRateExtN / qsv_vpp->m_mfxVideoParam.vpp.In.FrameRateExtD ) !=
+ (qsv_vpp->m_mfxVideoParam.vpp.Out.FrameRateExtN / qsv_vpp->m_mfxVideoParam.vpp.Out.FrameRateExtD) )
+ {
+ pv->is_frc_used = 1;
+ }
+
+ qsv_vpp->m_mfxVideoParam.NumExtParam = qsv_vpp->p_ext_param_num = 1 + pv->is_frc_used;
+
+ qsv_vpp->p_ext_params = av_mallocz(sizeof(mfxExtBuffer *)*qsv_vpp->p_ext_param_num);
+ AV_QSV_CHECK_POINTER(qsv_vpp->p_ext_params, MFX_ERR_MEMORY_ALLOC);
+
+ qsv_vpp->m_mfxVideoParam.ExtParam = qsv_vpp->p_ext_params;
+
+ qsv_vpp->ext_opaque_alloc.In.Surfaces = qsv->dec_space->p_surfaces;
+ qsv_vpp->ext_opaque_alloc.In.NumSurface = qsv->dec_space->surface_num;
+ qsv_vpp->ext_opaque_alloc.In.Type = qsv->dec_space->request[0].Type;
+
+ qsv_vpp->ext_opaque_alloc.Out.Surfaces = qsv_vpp->p_surfaces;
+ qsv_vpp->ext_opaque_alloc.Out.NumSurface = qsv_vpp->surface_num;
+ qsv_vpp->ext_opaque_alloc.Out.Type = qsv->dec_space->request[0].Type;
+
+ qsv_vpp->ext_opaque_alloc.Header.BufferId = MFX_EXTBUFF_OPAQUE_SURFACE_ALLOCATION;
+ qsv_vpp->ext_opaque_alloc.Header.BufferSz = sizeof(mfxExtOpaqueSurfaceAlloc);
+ qsv_vpp->p_ext_params[0] = (mfxExtBuffer*)&qsv_vpp->ext_opaque_alloc;
+
+ if(pv->is_frc_used)
+ {
+ pv->frc_config.Header.BufferId = MFX_EXTBUFF_VPP_FRAME_RATE_CONVERSION;
+ pv->frc_config.Header.BufferSz = sizeof(mfxExtVPPFrameRateConversion);
+ pv->frc_config.Algorithm = MFX_FRCALGM_PRESERVE_TIMESTAMP;
+
+ qsv_vpp->p_ext_params[1] = (mfxExtBuffer*)&pv->frc_config;
+ }
+
+ sts = MFXVideoVPP_Init(qsv->mfx_session, &qsv_vpp->m_mfxVideoParam);
+
+ AV_QSV_IGNORE_MFX_STS(sts, MFX_WRN_PARTIAL_ACCELERATION);
+ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+
+ qsv_vpp->is_init_done = 1;
+ }
+ return 0;
+}
+
+static int hb_qsv_filter_init( hb_filter_object_t * filter,
+ hb_filter_init_t * init )
+{
+
+ filter->private_data = calloc( 1, sizeof(struct hb_filter_private_s) );
+ hb_filter_private_t * pv = filter->private_data;
+
+ pv->list = hb_list_init();
+ // list of init params provided at work.c:~700
+ pv->width_in = init->width;
+ pv->height_in = init->height;
+ pv->width_out = init->width;
+ pv->height_out = init->height;
+ memcpy( pv->crop, init->crop, sizeof( int[4] ) );
+
+ if (filter->settings != NULL)
+ {
+ sscanf(filter->settings, "%d:%d:%d:%d:%d:%d_dei:%d",
+ &pv->width_out, &pv->height_out,
+ &pv->crop[0], &pv->crop[1], &pv->crop[2], &pv->crop[3],
+ &pv->deinterlace);
+ }
+
+ pv->job = init->job;
+
+ // will be later as more params will be known
+ // filter_init(pv->job->qsv, pv);
+
+ // just passing
+ init->vrate = init->vrate;
+ init->vrate_base = init->vrate_base;
+
+ // framerate shaping not yet supported
+ init->cfr = 0;
+
+ init->pix_fmt = pv->pix_fmt;
+ init->width = pv->width_out;
+ init->height = pv->height_out;
+ memcpy( init->crop, pv->crop, sizeof( int[4] ) );
+
+ return 0;
+}
+
+static int hb_qsv_filter_info( hb_filter_object_t * filter,
+ hb_filter_info_t * info )
+{
+
+ hb_filter_private_t *pv = filter->private_data;
+ if (pv == NULL)
+ return -1;
+
+ sprintf(info->human_readable_desc,
+ "source: %d * %d, crop (%d/%d/%d/%d): %d * %d, scale: %d * %d",
+ pv->width_in, pv->height_in,
+ pv->crop[0], pv->crop[1], pv->crop[2], pv->crop[3],
+ pv->width_in - pv->crop[2] - pv->crop[3],
+ pv->height_in - pv->crop[0] - pv->crop[1],
+ pv->width_out, pv->height_out);
+
+ if (pv->deinterlace)
+ {
+ sprintf(info->human_readable_desc + strlen(info->human_readable_desc),
+ ", deinterlace");
+ }
+
+ return 0;
+}
+
+void qsv_filter_close( av_qsv_context* qsv, AV_QSV_STAGE_TYPE vpp_type ){
+ int i = 0;
+ av_qsv_space* vpp_space = 0;
+
+ if(qsv && qsv->is_context_active && qsv->vpp_space)
+ for(i=av_qsv_list_count( qsv->vpp_space);i>0;i--){
+
+ vpp_space = av_qsv_list_item( qsv->vpp_space, i-1 );
+ if( vpp_space->type == vpp_type && vpp_space->is_init_done){
+
+ hb_log( "qsv_filter[%s] done: max_surfaces: %u/%u , max_syncs: %u/%u", ((vpp_type == AV_QSV_VPP_DEFAULT)?"Default": "User") ,vpp_space->surface_num_max_used, vpp_space->surface_num, vpp_space->sync_num_max_used, vpp_space->sync_num );
+
+ for (i = 0; i < vpp_space->surface_num; i++){
+ av_freep(&vpp_space->p_surfaces[i]);
+ }
+ vpp_space->surface_num = 0;
+
+ if( vpp_space->p_ext_param_num || vpp_space->p_ext_params )
+ av_freep(&vpp_space->p_ext_params);
+ vpp_space->p_ext_param_num = 0;
+
+ for (i = 0; i < vpp_space->sync_num; i++){
+ av_freep(&vpp_space->p_syncp[i]->p_sync);
+ av_freep(&vpp_space->p_syncp[i]);
+ }
+ vpp_space->sync_num = 0;
+
+ av_qsv_list_rem(qsv->vpp_space,vpp_space);
+ if( av_qsv_list_count(qsv->vpp_space) == 0 )
+ av_qsv_list_close(&qsv->vpp_space);
+
+ vpp_space->is_init_done = 0;
+ break;
+ }
+ }
+}
+
+static void hb_qsv_filter_close( hb_filter_object_t * filter )
+{
+ int i = 0;
+ hb_filter_private_t * pv = filter->private_data;
+
+ if ( !pv )
+ {
+ return;
+ }
+
+ av_qsv_context* qsv = pv->job->qsv.ctx;
+ if(qsv && qsv->vpp_space && av_qsv_list_count(qsv->vpp_space) > 0){
+
+ // closing local stuff
+ qsv_filter_close(qsv,AV_QSV_VPP_DEFAULT);
+
+ // closing the commong stuff
+ av_qsv_context_clean(qsv);
+ }
+ hb_list_close(&pv->list);
+ free( pv );
+ filter->private_data = NULL;
+}
+
+int process_frame(av_qsv_list* received_item, av_qsv_context* qsv, hb_filter_private_t * pv ){
+
+ // 1 if have results , 0 - otherwise
+ int ret = 1;
+
+ mfxStatus sts = MFX_ERR_NONE;
+ mfxFrameSurface1 *work_surface = NULL;
+ av_qsv_stage* stage = 0;
+
+ av_qsv_space *qsv_vpp = pv->vpp_space;
+
+ if(received_item){
+ stage = av_qsv_get_last_stage( received_item );
+ work_surface = stage->out.p_surface;
+ }
+
+ int sync_idx = av_qsv_get_free_sync(qsv_vpp, qsv);
+ int surface_idx = -1;
+
+ for(;;)
+ {
+ if (sync_idx == -1)
+ {
+ hb_error("qsv: Not enough resources allocated for QSV filter");
+ ret = 0;
+ break;
+ }
+ if( sts == MFX_ERR_MORE_SURFACE || sts == MFX_ERR_NONE )
+ surface_idx = av_qsv_get_free_surface(qsv_vpp, qsv, &(qsv_vpp->m_mfxVideoParam.vpp.Out), QSV_PART_ANY);
+ if (surface_idx == -1) {
+ hb_error("qsv: Not enough resources allocated for QSV filter");
+ ret = 0;
+ break;
+ }
+ if (work_surface != NULL)
+ {
+ work_surface->Info.CropX = pv->CropX;
+ work_surface->Info.CropY = pv->CropY;
+ work_surface->Info.CropW = pv->CropW;
+ work_surface->Info.CropH = pv->CropH;
+ }
+
+ sts = MFXVideoVPP_RunFrameVPPAsync(qsv->mfx_session, work_surface, qsv_vpp->p_surfaces[surface_idx] , NULL, qsv_vpp->p_syncp[sync_idx]->p_sync);
+
+ if( MFX_ERR_MORE_DATA == sts ){
+ if(!qsv_vpp->pending){
+ qsv_vpp->pending = av_qsv_list_init(0);
+ }
+
+ // if we have no results, we should not miss resource(s)
+ av_qsv_list_add( qsv_vpp->pending, received_item);
+
+ ff_qsv_atomic_dec(&qsv_vpp->p_syncp[sync_idx]->in_use);
+
+ ret = 0;
+ break;
+ }
+
+ if( MFX_ERR_MORE_DATA == sts || (MFX_ERR_NONE <= sts && MFX_WRN_DEVICE_BUSY != sts)){
+ if (work_surface){
+ ff_qsv_atomic_dec(&work_surface->Data.Locked);
+ }
+ }
+
+ if( MFX_ERR_MORE_SURFACE == sts || MFX_ERR_NONE <= sts){
+ if( MFX_ERR_MORE_SURFACE == sts )
+ continue;
+
+ if (qsv_vpp->p_surfaces[surface_idx] && MFX_WRN_DEVICE_BUSY != sts )
+ ff_qsv_atomic_inc(&qsv_vpp->p_surfaces[surface_idx]->Data.Locked);
+ }
+
+ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+
+ if (MFX_ERR_NONE <= sts ) // repeat the call if warning and no output
+ {
+ if (MFX_WRN_DEVICE_BUSY == sts){
+ av_qsv_sleep(10); // wait if device is busy
+ continue;
+ }
+
+ // shouldnt be a case but drain
+ if(stage){
+ av_qsv_stage* new_stage = av_qsv_stage_init();
+
+ new_stage->type = AV_QSV_VPP_DEFAULT;
+ new_stage->in.p_surface = work_surface;
+ new_stage->out.p_surface = qsv_vpp->p_surfaces[surface_idx];
+ new_stage->out.sync = qsv_vpp->p_syncp[sync_idx];
+ av_qsv_add_stagee( &received_item, new_stage,HAVE_THREADS );
+
+ // add pending resources for the proper reclaim later
+ if( qsv_vpp->pending ){
+ if( av_qsv_list_count(qsv_vpp->pending)>0 ){
+ new_stage->pending = qsv_vpp->pending;
+ }
+ qsv_vpp->pending = 0;
+
+ // making free via decrement for all pending
+ int i = 0;
+ for (i = av_qsv_list_count(new_stage->pending); i > 0; i--){
+ av_qsv_list *atom_list = av_qsv_list_item(new_stage->pending, i-1);
+ av_qsv_stage *stage = av_qsv_get_last_stage( atom_list );
+ mfxFrameSurface1 *work_surface = stage->out.p_surface;
+ if (work_surface)
+ ff_qsv_atomic_dec(&work_surface->Data.Locked);
+ }
+ }
+ }
+ break;
+ }
+
+ ff_qsv_atomic_dec(&qsv_vpp->p_syncp[sync_idx]->in_use);
+
+ if (MFX_ERR_NOT_ENOUGH_BUFFER == sts)
+ HB_DEBUG_ASSERT(1, "The bitstream buffer size is insufficient.");
+
+ break;
+ }
+
+ return ret;
+}
+
+static int hb_qsv_filter_work( hb_filter_object_t * filter,
+ hb_buffer_t ** buf_in,
+ hb_buffer_t ** buf_out )
+{
+
+ hb_filter_private_t * pv = filter->private_data;
+ hb_buffer_t * in = *buf_in;
+ hb_buffer_t * out = *buf_out;
+ int sts = 0;
+
+ av_qsv_context* qsv = pv->job->qsv.ctx;
+
+ if ( !pv )
+ {
+ *buf_out = in;
+ *buf_in = NULL;
+ return HB_FILTER_OK;
+ }
+
+ while(1){
+ int ret = filter_init(qsv,pv);
+ if(ret >= 2)
+ av_qsv_sleep(1);
+ else
+ break;
+ }
+
+ *buf_in = NULL;
+
+ if ( in->size <= 0 )
+ {
+ while(1){
+ sts = process_frame(in->qsv_details.qsv_atom, qsv, pv);
+ if(sts)
+ hb_list_add(pv->list,in);
+ else
+ break;
+ }
+
+ hb_list_add( pv->list, in );
+ *buf_out = link_buf_list( pv );
+ return HB_FILTER_DONE;
+ }
+
+ sts = process_frame(in->qsv_details.qsv_atom, qsv, pv);
+
+ if(sts){
+ hb_list_add(pv->list,in);
+ }
+
+ if( hb_list_count(pv->list) ){
+ *buf_out = hb_list_item(pv->list,0);
+ out = *buf_out;
+ if(pv->is_frc_used && out)
+ {
+ mfxStatus sts = MFX_ERR_NONE;
+ if(out->qsv_details.qsv_atom){
+ av_qsv_stage* stage = av_qsv_get_last_stage( out->qsv_details.qsv_atom );
+ mfxFrameSurface1 *work_surface = stage->out.p_surface;
+
+ av_qsv_wait_on_sync( qsv,stage );
+
+ av_qsv_space *qsv_vpp = pv->vpp_space;
+ int64_t duration = ((double)qsv_vpp->m_mfxVideoParam.vpp.Out.FrameRateExtD/(double)qsv_vpp->m_mfxVideoParam.vpp.Out.FrameRateExtN ) * 90000.;
+ out->s.start = work_surface->Data.TimeStamp;
+ out->s.stop = work_surface->Data.TimeStamp + duration;
+ }
+ }
+ hb_list_rem(pv->list,*buf_out);
+ }
+ else
+ *buf_out = NULL;
+
+ return HB_FILTER_OK;
+}
+
+// see devavcode.c
+hb_buffer_t *link_buf_list( hb_filter_private_t *pv )
+{
+ hb_buffer_t *head = hb_list_item( pv->list, 0 );
+
+ if ( head )
+ {
+ hb_list_rem( pv->list, head );
+ hb_buffer_t *last = head, *buf;
+ while ( ( buf = hb_list_item( pv->list, 0 ) ) != NULL )
+ {
+ hb_list_rem( pv->list, buf );
+ last->next = buf;
+ last = buf;
+ }
+ }
+ return head;
+}
+
+#endif // USE_QSV
+

HandBrake-0.10.0.tar.bz2/libhb/qsv_filter.h Added

@@ -0,0 +1,35 @@
+/* ********************************************************************* *\
+
+Copyright (C) 2013 Intel Corporation.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+- Neither the name of Intel Corporation nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+\* ********************************************************************* */
+
+#ifndef QSV_FILTER_H
+#define QSV_FILTER_H
+
+hb_buffer_t *link_buf_list( hb_filter_private_t *pv );
+void qsv_filter_close( av_qsv_context* qsv, AV_QSV_STAGE_TYPE vpp_type );
+
+#endif // QSV_FILTER_H

HandBrake-0.10.0.tar.bz2/libhb/qsv_filter_pp.c Added

@@ -0,0 +1,920 @@
+/* ********************************************************************* *\
+
+Copyright (C) 2013 Intel Corporation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+- Neither the name of Intel Corporation nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+\* ********************************************************************* */
+
+#ifdef USE_QSV
+
+#include "hb.h"
+#include "hbffmpeg.h"
+#include "libavcodec/qsv.h"
+#include "qsv_filter_pp.h"
+#include "qsv_filter.h"
+#include "qsv_memory.h"
+
+
+static int hb_qsv_filter_pre_init( hb_filter_object_t * filter,
+ hb_filter_init_t * init );
+static int hb_qsv_filter_pre_work( hb_filter_object_t * filter,
+ hb_buffer_t ** buf_in,
+ hb_buffer_t ** buf_out );
+static int hb_qsv_filter_pre_info( hb_filter_object_t * filter,
+ hb_filter_info_t * info );
+static void hb_qsv_filter_pre_close( hb_filter_object_t * filter );
+
+static int hb_qsv_filter_post_init( hb_filter_object_t * filter,
+ hb_filter_init_t * init );
+static int hb_qsv_filter_post_work( hb_filter_object_t * filter,
+ hb_buffer_t ** buf_in,
+ hb_buffer_t ** buf_out );
+static int hb_qsv_filter_post_info( hb_filter_object_t * filter,
+ hb_filter_info_t * info );
+static void hb_qsv_filter_post_close( hb_filter_object_t * filter );
+
+
+hb_filter_object_t hb_filter_qsv_pre =
+{
+ .id = HB_FILTER_QSV_PRE,
+ .enforce_order = 1,
+ .name = "Quick Sync Video user filter (pre)",
+ .settings = NULL,
+ .init = hb_qsv_filter_pre_init,
+ .work = hb_qsv_filter_pre_work,
+ .close = hb_qsv_filter_pre_close,
+ .info = hb_qsv_filter_pre_info,
+};
+
+hb_filter_object_t hb_filter_qsv_post =
+{
+ .id = HB_FILTER_QSV_POST,
+ .enforce_order = 1,
+ .name = "Quick Sync Video user filter (post)",
+ .settings = NULL,
+ .init = hb_qsv_filter_post_init,
+ .work = hb_qsv_filter_post_work,
+ .close = hb_qsv_filter_post_close,
+ .info = hb_qsv_filter_post_info,
+};
+
+
+static int filter_pre_init( av_qsv_context* qsv, hb_filter_private_t * pv ){
+ mfxStatus sts = MFX_ERR_NONE;
+ int i=0;
+
+ if(!qsv) return 3;
+
+ av_qsv_space *prev_vpp = 0;
+
+ if(!qsv->vpp_space){
+ qsv->vpp_space = av_qsv_list_init(HAVE_THREADS);
+ // note some change as : when no size changes -> no VPP used
+ // impact on : prev_vpp
+ }
+
+ if(!pv->vpp_space){
+ for(i=0; i<av_qsv_list_count(qsv->vpp_space);i++){
+ av_qsv_space *qsv_vpp = av_qsv_list_item( qsv->vpp_space, i );
+ if(qsv_vpp->type == AV_QSV_VPP_USER){
+ pv->vpp_space = qsv_vpp;
+ break;
+ }
+ else
+ if(qsv_vpp->type == AV_QSV_VPP_DEFAULT){
+ prev_vpp = qsv_vpp;
+ }
+
+ }
+ }
+
+ if(!pv->vpp_space){
+ pv->vpp_space = calloc( 1, sizeof( av_qsv_space ));
+ pv->vpp_space->type = AV_QSV_VPP_USER;
+ av_qsv_list_add( qsv->vpp_space, pv->vpp_space );
+ av_qsv_add_context_usage(qsv,HAVE_THREADS);
+ }
+ else
+ if(pv->vpp_space->is_init_done ) return 1;
+
+ if(!qsv->dec_space || !qsv->dec_space->is_init_done) return 2;
+
+ av_qsv_space *qsv_vpp = pv->vpp_space;
+
+ AV_QSV_ZERO_MEMORY(qsv_vpp->m_mfxVideoParam);
+
+
+ if (prev_vpp)
+ {
+ memcpy( &qsv_vpp->m_mfxVideoParam.vpp, &prev_vpp->m_mfxVideoParam.vpp, sizeof(prev_vpp->m_mfxVideoParam.vpp));
+ }
+ else
+ {
+ AV_QSV_ZERO_MEMORY(qsv_vpp->m_mfxVideoParam);
+
+ // FrameRate is important for VPP to start with
+ if( qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.FrameRateExtN == 0 &&
+ qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.FrameRateExtD == 0 ){
+ qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.FrameRateExtN = pv->job->title->rate;
+ qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.FrameRateExtD = pv->job->title->rate_base;
+ }
+
+ qsv_vpp->m_mfxVideoParam.vpp.In.FourCC = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.FourCC;
+ qsv_vpp->m_mfxVideoParam.vpp.In.ChromaFormat = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.ChromaFormat;
+ qsv_vpp->m_mfxVideoParam.vpp.In.CropX = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.CropX;
+ qsv_vpp->m_mfxVideoParam.vpp.In.CropY = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.CropY;
+ qsv_vpp->m_mfxVideoParam.vpp.In.CropW = pv->job->title->width;
+ qsv_vpp->m_mfxVideoParam.vpp.In.CropH = pv->job->title->height;
+ qsv_vpp->m_mfxVideoParam.vpp.In.PicStruct = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.PicStruct;
+ qsv_vpp->m_mfxVideoParam.vpp.In.FrameRateExtN = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.FrameRateExtN;
+ qsv_vpp->m_mfxVideoParam.vpp.In.FrameRateExtD = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.FrameRateExtD;
+ qsv_vpp->m_mfxVideoParam.vpp.In.AspectRatioW = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.AspectRatioW;
+ qsv_vpp->m_mfxVideoParam.vpp.In.AspectRatioH = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.AspectRatioH;
+ qsv_vpp->m_mfxVideoParam.vpp.In.Width = AV_QSV_ALIGN16(pv->job->title->width);
+ qsv_vpp->m_mfxVideoParam.vpp.In.Height = (MFX_PICSTRUCT_PROGRESSIVE == qsv_vpp->m_mfxVideoParam.vpp.In.PicStruct)?
+ AV_QSV_ALIGN16(pv->job->title->height) : AV_QSV_ALIGN32(pv->job->title->height);
+
+ qsv_vpp->m_mfxVideoParam.vpp.Out.FourCC = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.FourCC;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.ChromaFormat = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.ChromaFormat;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.CropX = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.CropX;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.CropY = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.CropY;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.CropW = pv->job->title->width;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.CropH = pv->job->title->height;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.PicStruct = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.PicStruct;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.FrameRateExtN = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.FrameRateExtN;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.FrameRateExtD = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.FrameRateExtD;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.AspectRatioW = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.AspectRatioW;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.AspectRatioH = qsv->dec_space->m_mfxVideoParam.mfx.FrameInfo.AspectRatioH;
+ qsv_vpp->m_mfxVideoParam.vpp.Out.Width = AV_QSV_ALIGN16(pv->job->title->width);
+ qsv_vpp->m_mfxVideoParam.vpp.Out.Height = (MFX_PICSTRUCT_PROGRESSIVE == qsv_vpp->m_mfxVideoParam.vpp.In.PicStruct)?
+ AV_QSV_ALIGN16(pv->job->title->height) : AV_QSV_ALIGN32(pv->job->title->height);
+
+ memset(&qsv_vpp->request, 0, sizeof(mfxFrameAllocRequest)*2);
+ }
+
+ qsv_vpp->m_mfxVideoParam.IOPattern = MFX_IOPATTERN_IN_OPAQUE_MEMORY | MFX_IOPATTERN_OUT_OPAQUE_MEMORY;
+
+ qsv_vpp->surface_num = FFMIN(prev_vpp ? prev_vpp->surface_num : qsv->dec_space->surface_num/2, AV_QSV_SURFACE_NUM);
+
+ for(i = 0; i < qsv_vpp->surface_num; i++){
+ qsv_vpp->p_surfaces[i] = av_mallocz( sizeof(mfxFrameSurface1) );
+ AV_QSV_CHECK_POINTER(qsv_vpp->p_surfaces[i], MFX_ERR_MEMORY_ALLOC);
+ memcpy(&(qsv_vpp->p_surfaces[i]->Info), &(qsv_vpp->m_mfxVideoParam.vpp.Out), sizeof(mfxFrameInfo));
+ }
+
+ qsv_vpp->sync_num = FFMIN(prev_vpp ? prev_vpp->sync_num : qsv->dec_space->sync_num, AV_QSV_SYNC_NUM);
+ for (i = 0; i < qsv_vpp->sync_num; i++){
+ qsv_vpp->p_syncp[i] = av_mallocz(sizeof(av_qsv_sync));
+ AV_QSV_CHECK_POINTER(qsv_vpp->p_syncp[i], MFX_ERR_MEMORY_ALLOC);
+ qsv_vpp->p_syncp[i]->p_sync = av_mallocz(sizeof(mfxSyncPoint));
+ AV_QSV_CHECK_POINTER(qsv_vpp->p_syncp[i]->p_sync, MFX_ERR_MEMORY_ALLOC);
+ }
+
+ memset(&qsv_vpp->ext_opaque_alloc, 0, sizeof(mfxExtOpaqueSurfaceAlloc));
+ qsv_vpp->m_mfxVideoParam.NumExtParam = qsv_vpp->p_ext_param_num = 1;
+
+ qsv_vpp->p_ext_params = av_mallocz(sizeof(mfxExtBuffer *)*qsv_vpp->p_ext_param_num);
+ AV_QSV_CHECK_POINTER(qsv_vpp->p_ext_params, MFX_ERR_MEMORY_ALLOC);
+
+ qsv_vpp->m_mfxVideoParam.ExtParam = qsv_vpp->p_ext_params;
+
+ qsv_vpp->ext_opaque_alloc.Header.BufferId = MFX_EXTBUFF_OPAQUE_SURFACE_ALLOCATION;
+ qsv_vpp->ext_opaque_alloc.Header.BufferSz = sizeof(mfxExtOpaqueSurfaceAlloc);
+ qsv_vpp->p_ext_params[0] = (mfxExtBuffer*)&qsv_vpp->ext_opaque_alloc;
+
+ if(prev_vpp){
+ qsv_vpp->ext_opaque_alloc.In.Surfaces = prev_vpp->p_surfaces;
+ qsv_vpp->ext_opaque_alloc.In.NumSurface = prev_vpp->surface_num;
+ }
+ else{
+ qsv_vpp->ext_opaque_alloc.In.Surfaces = qsv->dec_space->p_surfaces;
+ qsv_vpp->ext_opaque_alloc.In.NumSurface = qsv->dec_space->surface_num;
+ }
+ qsv_vpp->ext_opaque_alloc.In.Type = qsv->dec_space->request[0].Type;
+
+ qsv_vpp->ext_opaque_alloc.Out.Surfaces = qsv_vpp->p_surfaces;
+ qsv_vpp->ext_opaque_alloc.Out.NumSurface = qsv_vpp->surface_num;
+ qsv_vpp->ext_opaque_alloc.Out.Type = qsv->dec_space->request[0].Type;
+
+ pv->qsv_user = hb_list_init();
+
+ qsv_filter_t *plugin = av_mallocz( sizeof(qsv_filter_t) );
+
+ plugin->pv = pv;
+ plugin->plug.pthis = plugin;
+ plugin->plug.PluginInit = qsv_PluginInit;
+ plugin->plug.PluginClose = qsv_PluginClose;
+ plugin->plug.GetPluginParam = qsv_GetPluginParam;
+ plugin->plug.Submit = qsv_Submit;
+ plugin->plug.Execute = qsv_Execute;
+ plugin->plug.FreeResources = qsv_FreeResources;
+
+ hb_list_add(pv->qsv_user,plugin);
+
+ sts=MFXVideoUSER_Register(qsv->mfx_session,0,&plugin->plug);
+ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+
+ plugin_init(plugin,&qsv_vpp->m_mfxVideoParam);
+
+ qsv_vpp->is_init_done = 1;
+
+ return 0;
+}
+
+static int hb_qsv_filter_pre_info( hb_filter_object_t * filter,
+ hb_filter_info_t * info ){
+ hb_filter_private_t * pv = filter->private_data;
+ if( !pv )
+ return 0;
+
+ sprintf(info->human_readable_desc, "copy data to system memory");
+
+ return 0;
+}
+static int hb_qsv_filter_pre_init( hb_filter_object_t * filter,
+ hb_filter_init_t * init ){
+ filter->private_data = calloc( 1, sizeof(struct hb_filter_private_s) );
+ hb_filter_private_t * pv = filter->private_data;
+ pv->job = init->job;
+
+ pv->pre.frame_go = 0;
+ pv->pre.frame_completed = hb_cond_init();
+ pv->pre.frame_completed_lock = hb_lock_init();
+
+ pv->post.frame_go = 0;
+ pv->post.frame_completed = hb_cond_init();
+ pv->post.frame_completed_lock = hb_lock_init();
+
+ pv->pre_busy.frame_go = 0;
+ pv->pre_busy.frame_completed = hb_cond_init();
+ pv->pre_busy.frame_completed_lock = hb_lock_init();
+
+ pv->post_busy.frame_go = 0;
+ pv->post_busy.frame_completed = hb_cond_init();
+ pv->post_busy.frame_completed_lock = hb_lock_init();
+
+ pv->list = hb_list_init();
+
+ // just to remind:
+ // PIX_FMT_YUV420P, ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples) , 3 planes: Y, U, V
+ // PIX_FMT_NV12, ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
+ pv->sws_context_from_nv12 = hb_sws_get_context(
+ pv->job->title->width, pv->job->title->height, AV_PIX_FMT_NV12,
+ pv->job->title->width, pv->job->title->height, AV_PIX_FMT_YUV420P,
+ SWS_LANCZOS|SWS_ACCURATE_RND);
+ pv->sws_context_to_nv12 = hb_sws_get_context(
+ pv->job->title->width, pv->job->title->height, AV_PIX_FMT_YUV420P,
+ pv->job->title->width, pv->job->title->height, AV_PIX_FMT_NV12,
+ SWS_LANCZOS|SWS_ACCURATE_RND);
+ return 0;
+}
+int pre_process_frame(hb_buffer_t *in, av_qsv_context* qsv, hb_filter_private_t * pv ){
+
+ // 1 if have results , 0 otherwise
+ int ret = 1;
+
+ av_qsv_list* received_item = in->qsv_details.qsv_atom;
+
+ mfxStatus sts = MFX_ERR_NONE;
+ mfxFrameSurface1 *work_surface = NULL;
+ av_qsv_stage* stage = 0;
+
+ av_qsv_space *qsv_vpp = pv->vpp_space;
+
+ if (received_item)
+ {
+ stage = av_qsv_get_last_stage( received_item );
+ work_surface = stage->out.p_surface;
+ }
+
+ int sync_idx = av_qsv_get_free_sync(qsv_vpp, qsv);
+ int surface_idx = -1;
+
+ for (;;)
+ {
+ if (sync_idx == -1)
+ {
+ hb_error("qsv: Not enough resources allocated for the preprocessing filter");
+ ret = 0;
+ break;
+ }
+
+ if (sts == MFX_ERR_MORE_SURFACE || sts == MFX_ERR_NONE)
+ surface_idx = av_qsv_get_free_surface(qsv_vpp, qsv, &(qsv_vpp->m_mfxVideoParam.vpp.Out), QSV_PART_ANY);
+ if (surface_idx == -1) {
+ hb_error("qsv: Not enough resources allocated for the preprocessing filter");
+ ret = 0;
+ break;
+ }
+
+ sts = MFXVideoUSER_ProcessFrameAsync(qsv->mfx_session, &work_surface, 1, &qsv_vpp->p_surfaces[surface_idx] , 1, qsv_vpp->p_syncp[sync_idx]->p_sync);
+
+ if (MFX_ERR_MORE_DATA == sts)
+ {
+ if (!qsv_vpp->pending)
+ {
+ qsv_vpp->pending = av_qsv_list_init(0);
+ }
+
+ // if we have no results, we should not miss resource(s)
+ av_qsv_list_add( qsv_vpp->pending, received_item);
+
+ ff_qsv_atomic_dec(&qsv_vpp->p_syncp[sync_idx]->in_use);
+
+ ret = 0;
+ break;
+ }
+
+ if( MFX_ERR_MORE_SURFACE == sts || MFX_ERR_NONE <= sts){
+ if( MFX_ERR_MORE_SURFACE == sts )
+ continue;
+
+ if (qsv_vpp->p_surfaces[surface_idx] && MFX_WRN_DEVICE_BUSY != sts )
+ ff_qsv_atomic_inc(&qsv_vpp->p_surfaces[surface_idx]->Data.Locked);
+ }
+
+ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+
+ if (MFX_ERR_NONE <= sts ) // repeat the call if warning and no output
+ {
+ if (MFX_WRN_DEVICE_BUSY == sts){
+ hb_lock(pv->pre_busy.frame_completed_lock);
+ while(!pv->pre_busy.frame_go){
+ hb_cond_timedwait(pv->pre_busy.frame_completed,pv->pre_busy.frame_completed_lock,1000);
+ if(*pv->job->die)
+ break;
+ }
+ pv->pre_busy.frame_go = 0;
+ hb_unlock(pv->pre_busy.frame_completed_lock);
+
+ continue;
+ }
+ hb_lock(pv->pre.frame_completed_lock);
+ while(!pv->pre.frame_go){
+ hb_cond_timedwait(pv->pre.frame_completed,pv->pre.frame_completed_lock,1000);
+ if(*pv->job->die)
+ break;
+ }
+ pv->pre.frame_go = 0;
+ hb_unlock(pv->pre.frame_completed_lock);
+
+ in = pv->pre.out;
+
+ if (work_surface){
+ ff_qsv_atomic_dec(&work_surface->Data.Locked);
+ }
+
+ // inserting for the future, will be locked until very ready
+ if(stage){
+ av_qsv_stage* new_stage = av_qsv_stage_init();
+
+ new_stage->type = AV_QSV_VPP_USER;
+ new_stage->in.p_surface = work_surface;
+ new_stage->out.p_surface = qsv_vpp->p_surfaces[surface_idx];
+ new_stage->out.sync = qsv_vpp->p_syncp[sync_idx];
+ av_qsv_add_stagee( &received_item, new_stage,HAVE_THREADS );
+
+ // add pending resources for the proper reclaim later
+ if( qsv_vpp->pending ){
+ if( av_qsv_list_count(qsv_vpp->pending)>0 ){
+ new_stage->pending = qsv_vpp->pending;
+ }
+ qsv_vpp->pending = 0;
+
+ // making free via decrement for all pending
+ int i = 0;
+ for (i = av_qsv_list_count(new_stage->pending); i > 0; i--){
+ av_qsv_list *atom_list = av_qsv_list_item(new_stage->pending, i-1);
+ av_qsv_stage *stage = av_qsv_get_last_stage( atom_list );
+ mfxFrameSurface1 *work_surface = stage->out.p_surface;
+ if (work_surface)
+ ff_qsv_atomic_dec(&work_surface->Data.Locked);
+ }
+ }
+ }
+
+ break;
+ }
+
+ ff_qsv_atomic_dec(&qsv_vpp->p_syncp[sync_idx]->in_use);
+
+ if (MFX_ERR_NOT_ENOUGH_BUFFER == sts)
+ HB_DEBUG_ASSERT(1, "The bitstream buffer size is insufficient.");
+
+ break;
+ }
+
+ return ret;
+}
+
+static int hb_qsv_filter_pre_work( hb_filter_object_t * filter,
+ hb_buffer_t ** buf_in,
+ hb_buffer_t ** buf_out ){
+ hb_filter_private_t * pv = filter->private_data;
+ hb_buffer_t * in = *buf_in;
+ hb_buffer_t * out = *buf_out;
+ int sts = 0;
+
+ av_qsv_context* qsv = pv->job->qsv.ctx;
+
+ if(!in->qsv_details.filter_details)
+ in->qsv_details.filter_details = pv;
+
+ if ( in->size <= 0 )
+ {
+ *buf_out = in;
+ *buf_in = NULL;
+ return HB_FILTER_DONE;
+ }
+
+ while(1){
+ int ret = filter_pre_init(qsv,pv);
+ if(ret >= 2)
+ av_qsv_sleep(1);
+ else
+ break;
+ }
+
+ pv->pre.in = in;
+ pv->pre.out = in;
+
+ sts = pre_process_frame(in, qsv, pv);
+
+ if(sts){
+ hb_list_add(pv->list,out);
+ }
+
+ if( hb_list_count(pv->list) ){
+ *buf_out = hb_list_item(pv->list,0);
+ hb_list_rem(pv->list,*buf_out);
+ *buf_in = NULL;
+ }
+ else{
+ *buf_in = NULL;
+ *buf_out = in;
+ }
+
+ return HB_FILTER_OK;
+}
+static void hb_qsv_filter_pre_close( hb_filter_object_t * filter ){
+ int i = 0;
+ mfxStatus sts = MFX_ERR_NONE;
+
+ hb_filter_private_t * pv = filter->private_data;
+
+ if ( !pv )
+ {
+ return;
+ }
+
+ sws_freeContext(pv->sws_context_to_nv12);
+ sws_freeContext(pv->sws_context_from_nv12);
+
+ av_qsv_context* qsv = pv->job->qsv.ctx;
+ if(qsv && qsv->vpp_space && av_qsv_list_count(qsv->vpp_space) > 0 ){
+ if(pv->qsv_user && qsv->mfx_session){
+
+ sts=MFXVideoUSER_Unregister(qsv->mfx_session,0);
+ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+
+ for(i=hb_list_count(pv->qsv_user);i>0;i--){
+ qsv_filter_t *plugin = hb_list_item(pv->qsv_user,i-1);
+ hb_list_rem(pv->qsv_user,plugin);
+ plugin_close(plugin);
+ }
+ hb_list_close(&pv->qsv_user);
+ }
+
+ // closing local stuff
+ qsv_filter_close(qsv,AV_QSV_VPP_USER);
+
+ // closing the commong stuff
+ av_qsv_context_clean(qsv);
+ }
+ hb_cond_close(&pv->pre.frame_completed);
+ hb_lock_close(&pv->pre.frame_completed_lock);
+
+ hb_cond_close(&pv->post.frame_completed);
+ hb_lock_close(&pv->post.frame_completed_lock);
+
+ hb_cond_close(&pv->pre_busy.frame_completed);
+ hb_lock_close(&pv->pre_busy.frame_completed_lock);
+
+ hb_cond_close(&pv->post_busy.frame_completed);
+ hb_lock_close(&pv->post_busy.frame_completed_lock);
+
+ hb_list_close( &pv->list );
+
+ free( pv );
+ filter->private_data = NULL;
+}
+
+
+static int hb_qsv_filter_post_info( hb_filter_object_t * filter,
+ hb_filter_info_t * info ){
+ hb_filter_private_t * pv = filter->private_data;
+ if( !pv )
+ return 0;
+
+ sprintf(info->human_readable_desc, "copy data to opaque memory");
+
+ return 0;
+}
+static int hb_qsv_filter_post_init( hb_filter_object_t * filter,
+ hb_filter_init_t * init ){
+ filter->private_data = calloc( 1, sizeof(struct hb_filter_private_s) );
+ hb_filter_private_t * pv = filter->private_data;
+ pv->job = init->job;
+ return 0;
+}
+static int hb_qsv_filter_post_work( hb_filter_object_t * filter,
+ hb_buffer_t ** buf_in,
+ hb_buffer_t ** buf_out ){
+ hb_filter_private_t * pv = filter->private_data;
+ hb_buffer_t * in = *buf_in;
+ hb_buffer_t * out = *buf_out;
+
+ if ( in->size <= 0 )
+ {
+ *buf_out = in;
+ *buf_in = NULL;
+ return HB_FILTER_DONE;
+ }
+
+ av_qsv_context* qsv = pv->job->qsv.ctx;
+ pv = in->qsv_details.filter_details;
+
+ if (!pv)
+ {
+ *buf_out = NULL;
+ *buf_in = NULL;
+ return HB_FILTER_OK;
+ }
+
+ while(1){
+ int ret = filter_pre_init(qsv,pv);
+ if(ret >= 2)
+ av_qsv_sleep(1);
+ else
+ break;
+ }
+
+ pv->post.in = in;
+ pv->post.out = out;
+
+ // signal: input is prepared, can start inserting data back into pipeline
+ hb_lock(pv->post.frame_completed_lock);
+ pv->post.frame_go = 1;
+ hb_cond_broadcast(pv->post.frame_completed);
+ hb_unlock(pv->post.frame_completed_lock);
+
+ // wait: on signal that data is ready
+ hb_lock(pv->post_busy.frame_completed_lock);
+ while(!pv->post_busy.frame_go){
+ hb_cond_timedwait(pv->post_busy.frame_completed,pv->post_busy.frame_completed_lock,1000);
+ if(*pv->job->die)
+ break;
+ }
+ pv->post_busy.frame_go = 0;
+ hb_unlock(pv->post_busy.frame_completed_lock);
+
+ if (pv->post.status == HB_FILTER_OK || pv->post.status == HB_FILTER_DONE)
+ {
+ *buf_out = in;
+ }
+ else
+ {
+ *buf_out = NULL;
+ pv->post.status = HB_FILTER_OK;
+ }
+ *buf_in = NULL;
+
+ return HB_FILTER_OK;
+}
+static void hb_qsv_filter_post_close( hb_filter_object_t * filter ){
+ hb_filter_private_t * pv = filter->private_data;
+
+ if ( !pv )
+ {
+ return;
+ }
+
+ free( pv );
+ filter->private_data = NULL;
+}
+
+
+mfxStatus MFX_CDECL qsv_PluginInit(mfxHDL pthis, mfxCoreInterface *core){
+ mfxStatus sts = MFX_ERR_NONE;
+
+ if(core && pthis){
+ qsv_filter_t *plugin = pthis;
+ plugin->core = core;
+
+ plugin->pluginparam.MaxThreadNum = 1;
+ plugin->pluginparam.ThreadPolicy = MFX_THREADPOLICY_SERIAL;
+ }
+ else
+ sts = MFX_ERR_NULL_PTR;
+
+ return sts;
+}
+mfxStatus MFX_CDECL qsv_PluginClose (mfxHDL pthis){
+ mfxStatus sts = MFX_ERR_NONE;
+ return sts;
+}
+mfxStatus MFX_CDECL qsv_GetPluginParam(mfxHDL pthis, mfxPluginParam *par){
+ mfxStatus sts = MFX_ERR_NONE;
+
+ if(pthis){
+ qsv_filter_t *plugin = pthis;
+ *par = plugin->pluginparam;
+ }
+ else
+ sts = MFX_ERR_NULL_PTR;
+ return sts;
+}
+mfxStatus MFX_CDECL qsv_Submit(mfxHDL pthis, const mfxHDL *in, mfxU32 in_num, const mfxHDL *out, mfxU32 out_num, mfxThreadTask *task){
+ mfxStatus sts = MFX_ERR_NONE;
+
+ qsv_filter_t *plugin = pthis;
+
+ mfxFrameSurface1 *surface_in = (mfxFrameSurface1 *)in[0];
+ mfxFrameSurface1 *surface_out = (mfxFrameSurface1 *)out[0];
+ mfxFrameSurface1 *real_surface_in = surface_in;
+ mfxFrameSurface1 *real_surface_out = surface_out;
+
+ sts = plugin->core->GetRealSurface(plugin->core->pthis, surface_in, &real_surface_in);
+ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, MFX_ERR_MEMORY_ALLOC);
+
+ sts = plugin->core->GetRealSurface(plugin->core->pthis, surface_out, &real_surface_out);
+ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, MFX_ERR_MEMORY_ALLOC);
+
+ int task_idx = get_free_task(plugin->tasks);
+
+ if (task_idx == -1)
+ {
+ return MFX_WRN_DEVICE_BUSY;
+ }
+
+ plugin->core->IncreaseReference(plugin->core->pthis, &(real_surface_in->Data));
+ plugin->core->IncreaseReference(plugin->core->pthis, &(real_surface_out->Data));
+
+ // to preserve timing if other filters are used in-between
+ surface_out->Data.TimeStamp = surface_in->Data.TimeStamp;
+ surface_out->Data.FrameOrder = surface_in->Data.FrameOrder;
+
+ qsv_filter_task_t *current_task = hb_list_item(plugin->tasks,task_idx);
+ current_task->in = real_surface_in;
+ current_task->out = real_surface_out;
+ current_task->busy = 1;
+ current_task->pv = plugin->pv;
+
+ *task = (mfxThreadTask)current_task;
+
+ return sts;
+}
+mfxStatus MFX_CDECL qsv_Execute(mfxHDL pthis, mfxThreadTask task, mfxU32 uid_p, mfxU32 uid_a){
+ mfxStatus sts = MFX_ERR_NONE;
+
+ qsv_filter_task_t *current_task = (qsv_filter_task_t *)task;
+ qsv_filter_t *plugin = pthis;
+
+ sts = (current_task->processor.process)(current_task,0);
+ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+
+ sts = MFX_TASK_DONE;
+ return sts;
+}
+mfxStatus MFX_CDECL qsv_FreeResources(mfxHDL pthis, mfxThreadTask task, mfxStatus sts){
+
+ qsv_filter_t *plugin = pthis;
+ qsv_filter_task_t *current_task = (qsv_filter_task_t *)task;
+
+ plugin->core->DecreaseReference(plugin->core->pthis, &(current_task->in->Data));
+ plugin->core->DecreaseReference(plugin->core->pthis, &(current_task->out->Data));
+
+ current_task->busy = 0;
+
+ hb_lock(plugin->pv->pre_busy.frame_completed_lock);
+ plugin->pv->pre_busy.frame_go = 1;
+ hb_cond_broadcast(plugin->pv->pre_busy.frame_completed);
+ hb_unlock(plugin->pv->pre_busy.frame_completed_lock);
+
+ return MFX_ERR_NONE;
+}
+
+mfxStatus plugin_init(qsv_filter_t* plugin, mfxVideoParam *param){
+ mfxStatus sts = MFX_ERR_NONE;
+
+ if(plugin->is_init_done) return sts;
+
+ plugin->videoparam = param;
+
+ mfxExtOpaqueSurfaceAlloc* plugin_opaque_alloc = NULL;
+
+ plugin_opaque_alloc = (mfxExtOpaqueSurfaceAlloc*) get_ext_buffer(plugin->videoparam->ExtParam,
+ plugin->videoparam->NumExtParam, MFX_EXTBUFF_OPAQUE_SURFACE_ALLOCATION);
+
+ if(!plugin_opaque_alloc || !plugin_opaque_alloc->In.Surfaces || !plugin_opaque_alloc->Out.Surfaces)
+ return MFX_ERR_INVALID_VIDEO_PARAM;
+
+ sts = plugin->core->MapOpaqueSurface(plugin->core->pthis, plugin_opaque_alloc->In.NumSurface,
+ plugin_opaque_alloc->In.Type, plugin_opaque_alloc->In.Surfaces);
+ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+
+
+ sts = plugin->core->MapOpaqueSurface(plugin->core->pthis, plugin_opaque_alloc->Out.NumSurface,
+ plugin_opaque_alloc->Out.Type, plugin_opaque_alloc->Out.Surfaces);
+ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+
+
+ plugin->tasks = hb_list_init();
+ qsv_filter_task_t *task = calloc( 1, sizeof( qsv_filter_task_t ));
+
+ task->processor.process = process_filter;
+ task->processor.alloc = &plugin->core->FrameAllocator;
+ task->processor.core = plugin->core;
+
+ hb_list_add(plugin->tasks,task);
+
+ plugin->is_init_done = 1;
+
+ return sts;
+}
+
+mfxStatus plugin_close(qsv_filter_t* plugin){
+ int i = 0;
+ mfxStatus sts = MFX_ERR_NONE;
+
+ if(!plugin->is_init_done) return sts;
+
+ mfxExtOpaqueSurfaceAlloc* plugin_opaque_alloc = NULL;
+
+ plugin_opaque_alloc = (mfxExtOpaqueSurfaceAlloc*) get_ext_buffer(plugin->videoparam->ExtParam,
+ plugin->videoparam->NumExtParam, MFX_EXTBUFF_OPAQUE_SURFACE_ALLOCATION);
+
+ if(!plugin_opaque_alloc || !plugin_opaque_alloc->In.Surfaces || !plugin_opaque_alloc->Out.Surfaces)
+ return MFX_ERR_INVALID_VIDEO_PARAM;
+
+ sts = plugin->core->UnmapOpaqueSurface(plugin->core->pthis, plugin_opaque_alloc->In.NumSurface,
+ plugin_opaque_alloc->In.Type, plugin_opaque_alloc->In.Surfaces);
+ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+
+
+ sts = plugin->core->UnmapOpaqueSurface(plugin->core->pthis, plugin_opaque_alloc->Out.NumSurface,
+ plugin_opaque_alloc->Out.Type, plugin_opaque_alloc->Out.Surfaces);
+ AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+
+ if(plugin->tasks){
+ for(i=hb_list_count(plugin->tasks);i>0;i--){
+ qsv_filter_task_t *task = hb_list_item(plugin->tasks,i-1);
+ hb_list_rem(plugin->tasks,task);
+ free(task);
+ }
+ hb_list_close(&plugin->tasks);
+ }
+
+ plugin->is_init_done = 0;
+
+ return sts;
+}
+
+mfxExtBuffer* get_ext_buffer(mfxExtBuffer** buffers, mfxU32 buffers_num, mfxU32 buffer_id){
+ int i = 0;
+ if(!buffers) return 0;
+ for(i=0;i<buffers_num;i++){
+ if(!buffers[i]) continue;
+ if(buffers[i]->BufferId == buffer_id)
+ return buffers[i];
+ }
+ return 0;
+}
+
+int get_free_task(hb_list_t* tasks){
+ int ret = -1;
+ int i = 0;
+ for(i=0;i<hb_list_count(tasks);i++){
+ qsv_filter_task_t* task = hb_list_item(tasks,i);
+ if(!task->busy){
+ ret = i;
+ break;
+ }
+ }
+ return ret;
+}
+
+mfxStatus lock_frame(mfxFrameAllocator *alloc,mfxFrameSurface1 *surface){
+ mfxStatus sts = MFX_ERR_NONE;
+ // prevent double lock
+ if (surface->Data.Y != 0 && surface->Data.MemId !=0){
+ return MFX_ERR_UNSUPPORTED;
+ }
+ // not allocated, therefore no lock
+ if (surface->Data.Y != 0){
+ return MFX_ERR_NONE;
+ }
+ sts = alloc->Lock(alloc->pthis,surface->Data.MemId,&surface->Data);
+ return sts;
+}
+
+mfxStatus unlock_frame(mfxFrameAllocator *alloc,mfxFrameSurface1 *surface){
+ mfxStatus sts = MFX_ERR_NONE;
+ // not allocated
+ if (surface->Data.Y != 0 && surface->Data.MemId == 0){
+ return MFX_ERR_NONE;
+ }
+ // not locked
+ if (surface->Data.Y == 0){
+ return MFX_ERR_NONE;
+ }
+ sts = alloc->Unlock(alloc->pthis,surface->Data.MemId,&surface->Data);
+ return sts;
+}
+
+
+int process_filter(qsv_filter_task_t* task, void* params){
+ mfxStatus sts = MFX_ERR_NONE;
+
+ if (MFX_ERR_NONE != (sts = lock_frame(task->processor.alloc,task->in)))return sts;
+ if (MFX_ERR_NONE != (sts = lock_frame(task->processor.alloc,task->out)))
+ {
+ unlock_frame(task->processor.alloc,task->in);
+ return sts;
+ }
+
+ qsv_nv12_to_yuv420(task->pv->sws_context_from_nv12,task->pv->pre.out, task->in, task->processor.core);
+
+ // signal: input is prepared, converted from pipeline into internal buffer
+ hb_lock(task->pv->pre.frame_completed_lock);
+ task->pv->pre.frame_go = 1;
+ hb_cond_broadcast(task->pv->pre.frame_completed);
+ hb_unlock(task->pv->pre.frame_completed_lock);
+
+ // wait: input is prepared, converted from pipeline into internal buffer
+ hb_lock(task->pv->post.frame_completed_lock);
+ while(!task->pv->post.frame_go){
+ hb_cond_timedwait(task->pv->post.frame_completed,task->pv->post.frame_completed_lock,1000);
+ if(*task->pv->job->die)
+ break;
+ }
+ task->pv->post.frame_go = 0;
+ hb_unlock(task->pv->post.frame_completed_lock);
+
+// this is just a simple fun/test case
+#if 0
+ {
+ int i = 0;
+ char *cur_line;
+ char* luma = task->pv->post.in->plane[0].data;
+ int pitch = task->pv->post.in->plane[0].stride;
+ int h = task->pv->post.in->plane[0].height;
+ int w = task->pv->post.in->plane[0].width;
+ for (i = 0; i < h; i++){
+
+ cur_line = luma + i * pitch;
+ if(i>h/4 && i < 3*h/4 && i % 5 == 0 )
+ memset(cur_line, 0 , w );
+ }
+ }
+#endif
+
+ if(task->pv->post.in)
+ {
+ qsv_yuv420_to_nv12(task->pv->sws_context_to_nv12, task->out, task->pv->post.in);
+ }
+
+ // signal: output is prepared, converted from internal buffer into pipeline
+ hb_lock(task->pv->post_busy.frame_completed_lock);
+ task->pv->post_busy.frame_go = 1;
+ hb_cond_broadcast(task->pv->post_busy.frame_completed);
+ hb_unlock(task->pv->post_busy.frame_completed_lock);
+
+ unlock_frame(task->processor.alloc,task->in);
+ unlock_frame(task->processor.alloc,task->out);
+
+ return sts;
+}
+
+#endif // USE_QSV

HandBrake-0.10.0.tar.bz2/libhb/qsv_filter_pp.h Added

@@ -0,0 +1,114 @@
+/* ********************************************************************* *\
+
+Copyright (C) 2013 Intel Corporation.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+- Neither the name of Intel Corporation nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+\* ********************************************************************* */
+
+#ifndef QSV_FILTER_PP_H
+#define QSV_FILTER_PP_H
+
+#include "msdk/mfxplugin.h"
+
+extern hb_buffer_t *link_buf_list( hb_filter_private_t *pv );
+
+struct qsv_filter_task_s;
+
+typedef struct{
+        mfxFrameAllocator *alloc;
+        mfxStatus             (*process)(struct qsv_filter_task_s*,void*);
+        mfxCoreInterface    *core;
+}qsv_filter_processor_t;
+
+typedef  struct qsv_filter_task_s{
+        mfxFrameSurface1 *in;
+        mfxFrameSurface1 *out;
+        int              busy;
+        hb_filter_private_t *pv;
+        qsv_filter_processor_t processor;
+} qsv_filter_task_t;
+
+typedef struct qsv_filter_private_s{
+
+        int                 is_init_done;
+
+        mfxCoreInterface    *core;
+        mfxVideoParam       *videoparam;
+        mfxPluginParam      pluginparam;
+
+        hb_filter_private_t *pv;
+
+        mfxPlugin           plug;
+        hb_list_t           *tasks;
+} qsv_filter_t;
+
+typedef struct hb_qsv_sync_s{
+    int                 frame_go;
+    int                 status;
+    hb_cond_t           *frame_completed;
+    hb_lock_t           *frame_completed_lock;
+
+    hb_buffer_t         *in;
+    hb_buffer_t         *out;
+} hb_qsv_sync_t;
+
+typedef struct hb_filter_private_s
+{
+    hb_job_t            *job;
+    hb_list_t           *list;
+
+    hb_qsv_sync_t       pre;
+    hb_qsv_sync_t       pre_busy;
+
+    hb_qsv_sync_t       post;
+    hb_qsv_sync_t       post_busy;
+
+    av_qsv_space        *vpp_space;
+    hb_list_t           *qsv_user;
+
+    struct SwsContext* sws_context_to_nv12;
+    struct SwsContext* sws_context_from_nv12;
+} hb_filter_private_t_qsv;
+
+// methods to be called by Media SDK
+mfxStatus MFX_CDECL qsv_PluginInit(mfxHDL pthis, mfxCoreInterface *core);
+mfxStatus MFX_CDECL qsv_PluginClose (mfxHDL pthis);
+mfxStatus MFX_CDECL qsv_GetPluginParam(mfxHDL pthis, mfxPluginParam *par);
+mfxStatus MFX_CDECL qsv_Submit(mfxHDL pthis, const mfxHDL *in, mfxU32 in_num, const mfxHDL *out, mfxU32 out_num, mfxThreadTask *task);
+mfxStatus MFX_CDECL qsv_Execute(mfxHDL pthis, mfxThreadTask task, mfxU32 uid_p, mfxU32 uid_a);
+mfxStatus MFX_CDECL qsv_FreeResources(mfxHDL pthis, mfxThreadTask task, mfxStatus sts);
+
+// methods to be called by us
+mfxStatus plugin_init(qsv_filter_t*,mfxVideoParam*);
+mfxStatus plugin_close(qsv_filter_t*);
+
+//internal functions
+mfxExtBuffer* get_ext_buffer(mfxExtBuffer**, mfxU32, mfxU32);
+int get_free_task(hb_list_t*);
+mfxStatus           process_filter(qsv_filter_task_t*,void*);
+mfxStatus lock_frame(mfxFrameAllocator *,mfxFrameSurface1*);
+mfxStatus unlock_frame(mfxFrameAllocator *,mfxFrameSurface1*);
+
+
+#endif //QSV_FILTER_PP_H

HandBrake-0.10.0.tar.bz2/libhb/qsv_memory.c Added

@@ -0,0 +1,124 @@
+/* ********************************************************************* *\
+
+Copyright (C) 2013 Intel Corporation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+- Neither the name of Intel Corporation nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+\* ********************************************************************* */
+
+#ifdef USE_QSV
+
+#include "hb.h"
+#include "hbffmpeg.h"
+#include "qsv_memory.h"
+
+int qsv_nv12_to_yuv420(struct SwsContext* sws_context,hb_buffer_t* dst, mfxFrameSurface1* src, mfxCoreInterface *core){
+ int ret = 0;
+ int i,j;
+
+ int in_pitch = src->Data.Pitch;
+ int w = AV_QSV_ALIGN16(src->Info.Width);
+ int h = (MFX_PICSTRUCT_PROGRESSIVE == src->Info.PicStruct) ? AV_QSV_ALIGN16(src->Info.Height) : AV_QSV_ALIGN32(src->Info.Height);
+ uint8_t *in_luma = 0;
+ uint8_t *in_chroma = 0;
+ static int copyframe_in_use = 1;
+
+
+ mfxStatus sts = MFX_ERR_NONE;
+ mfxFrameSurface1 accel_dst;
+
+ if (copyframe_in_use)
+ {
+ accel_dst.Info.FourCC = src->Info.FourCC;
+ accel_dst.Info.CropH = src->Info.CropH;
+ accel_dst.Info.CropW = src->Info.CropW;
+ accel_dst.Info.CropY = src->Info.CropY;
+ accel_dst.Info.CropX = src->Info.CropX;
+ accel_dst.Info.Width = w;
+ accel_dst.Info.Height = h;
+ accel_dst.Data.Pitch = src->Data.Pitch;
+ accel_dst.Data.Y = calloc( 1, in_pitch*h );
+ accel_dst.Data.VU = calloc( 1, in_pitch*h/2 );
+
+ sts = core->CopyFrame(core->pthis, &accel_dst, src);
+
+ if (sts < MFX_ERR_NONE)
+ {
+ free(accel_dst.Data.Y);
+ free(accel_dst.Data.VU);
+ copyframe_in_use = 0;
+ }
+ else
+ {
+ in_luma = accel_dst.Data.Y + accel_dst.Info.CropY * in_pitch + accel_dst.Info.CropX;
+ in_chroma = accel_dst.Data.VU + accel_dst.Info.CropY / 2 * in_pitch + accel_dst.Info.CropX;
+ }
+ }
+
+ if (!copyframe_in_use)
+ {
+ in_luma = src->Data.Y + src->Info.CropY * in_pitch + src->Info.CropX;
+ in_chroma = src->Data.VU + src->Info.CropY / 2 * in_pitch + src->Info.CropX;
+ }
+
+ hb_video_buffer_realloc( dst, w, h );
+
+ uint8_t *srcs[] = { in_luma, in_chroma };
+ int srcs_stride[] = { in_pitch, in_pitch };
+
+ uint8_t *dsts[] = { dst->plane[0].data, dst->plane[1].data, dst->plane[2].data };
+ int dsts_stride[] = { dst->plane[0].stride, dst->plane[1].stride, dst->plane[2].stride };
+
+ ret = sws_scale(sws_context, srcs, srcs_stride, 0, h, dsts, dsts_stride );
+
+ if (copyframe_in_use)
+ {
+ free(accel_dst.Data.Y);
+ free(accel_dst.Data.VU);
+ }
+
+ return ret;
+}
+
+int qsv_yuv420_to_nv12(struct SwsContext* sws_context,mfxFrameSurface1* dst, hb_buffer_t* src){
+ int ret = 0;
+
+ int w = src->plane[0].width;
+ int h = src->plane[0].height;
+
+ int out_pitch = dst->Data.Pitch;
+ uint8_t *out_luma = dst->Data.Y;
+ uint8_t *out_chroma = dst->Data.VU;
+
+ uint8_t *srcs[] = { src->plane[0].data, src->plane[1].data, src->plane[2].data };
+ int srcs_stride[] = { src->plane[0].stride, src->plane[1].stride, src->plane[2].stride };
+
+ uint8_t *dsts[] = { out_luma, out_chroma };
+ int dsts_stride[] = { out_pitch, out_pitch };
+
+ ret = sws_scale(sws_context, srcs, srcs_stride, 0, h, dsts, dsts_stride );
+
+ return ret;
+}
+
+#endif // USE_QSV

HandBrake-0.10.0.tar.bz2/libhb/qsv_memory.h Added

@@ -0,0 +1,55 @@
+/* ********************************************************************* *\
+
+Copyright (C) 2013 Intel Corporation.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+- Neither the name of Intel Corporation nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+\* ********************************************************************* */
+
+#ifndef QSV_MEMORY_H
+#define QSV_MEMORY_H
+
+#include "libavcodec/qsv.h"
+#include "msdk/mfxplugin.h"
+
+typedef struct{
+
+    struct{
+        // for "planes" , Y and VU
+        uint8_t     *data[2];
+        int         strides[2];
+    }               qsv_data;
+
+    struct{
+        // for each plane, Y U V
+        uint8_t     *data[3];
+        int         strides[3];
+    }               data;
+    int             width;
+    int             height;
+} qsv_memory_copy_t;
+
+int qsv_nv12_to_yuv420(struct SwsContext* sws_context,hb_buffer_t* dst, mfxFrameSurface1* src,mfxCoreInterface *core);
+int qsv_yuv420_to_nv12(struct SwsContext* sws_context,mfxFrameSurface1* dst, hb_buffer_t* src);
+
+#endif // QSV_MEMORY_H

HandBrake-0.9.9.tar.bz2/libhb/reader.c -> HandBrake-0.10.0.tar.bz2/libhb/reader.c Changed

@@ -1,6 +1,6 @@
 /* reader.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -119,7 +119,7 @@
 r->stream_timing[0].startup = 10;
 r->stream_timing[1].id = -1;
 
- r->demux.last_scr = -1;
+ r->demux.last_scr = AV_NOPTS_VALUE;
 
 if ( !job->pts_to_start )
 r->start_found = 1;
@@ -128,7 +128,8 @@
 // The frame at the actual start time may not be an i-frame
 // so can't be decoded without starting a little early.
 // sync.c will drop early frames.
- r->pts_to_start = MAX(0, job->pts_to_start - 180000);
+ // Starting a little over 10 seconds early
+ r->pts_to_start = MAX(0, job->pts_to_start - 1000000);
 }
 
 if (job->pts_to_stop)
@@ -278,7 +279,7 @@
 {
 stream_timing_t *st = id_to_st( r, buf, 1 );
 
- if( buf->s.renderOffset < 0 )
+ if (buf->s.renderOffset == AV_NOPTS_VALUE)
 {
 st->last += st->filtered_average;
 return;
@@ -349,7 +350,7 @@
 hb_work_object_t * w = _w;
 hb_work_private_t * r = w->private_data;
 hb_fifo_t ** fifos;
- hb_buffer_t * buf;
+ hb_buffer_t * buf = NULL;
 hb_list_t * list;
 int n;
 int chapter = -1;
@@ -441,7 +442,7 @@
 // and then seek to the appropriate offset from it
 if ( ( buf = hb_stream_read( r->stream ) ) )
 {
- if ( buf->s.start > 0 )
+ if (buf->s.start != AV_NOPTS_VALUE)
 {
 pts_to_start += buf->s.start;
 }
@@ -456,7 +457,11 @@
 r->start_found = 2;
 r->duration -= r->job->pts_to_start;
 r->job->pts_to_start = pts_to_start;
+ hb_buffer_close(&buf);
 }
+ // hb_stream_seek_ts does nothing for TS streams and will return
+ // an error. In this case, the current buf remains valid and
+ // gets processed below.
 } 
 else if( r->stream )
 {
@@ -503,41 +508,29 @@
 break;
 }
 
- if (r->bd)
- {
- if( (buf = hb_bd_read( r->bd )) == NULL )
- {
- break;
- }
- }
- else if (r->dvd)
+ if (buf == NULL)
 {
- if( (buf = hb_dvd_read( r->dvd )) == NULL )
- {
- break;
- }
- }
- else if (r->stream)
- {
- if ( (buf = hb_stream_read( r->stream )) == NULL )
- {
- break;
- }
- if ( r->start_found == 2 )
- {
- // We will inspect the timestamps of each frame in sync
- // to skip from this seek point to the timestamp we
- // want to start at.
- if ( buf->s.start > 0 && buf->s.start < r->job->pts_to_start )
+ if (r->bd)
 {
- r->job->pts_to_start -= buf->s.start;
+ if( (buf = hb_bd_read( r->bd )) == NULL )
+ {
+ break;
+ }
 }
- else if ( buf->s.start >= r->job->pts_to_start )
+ else if (r->dvd)
 {
- r->job->pts_to_start = 0;
- r->start_found = 1;
+ if( (buf = hb_dvd_read( r->dvd )) == NULL )
+ {
+ break;
+ }
+ }
+ else if (r->stream)
+ {
+ if ( (buf = hb_stream_read( r->stream )) == NULL )
+ {
+ break;
+ }
 }
- }
 }
 
 (hb_demux[r->title->demuxer])( buf, list, &r->demux );
@@ -547,13 +540,32 @@
 hb_list_rem( list, buf );
 fifos = GetFifoForId( r, buf->s.id );
 
+ if (fifos && r->stream && r->start_found == 2 )
+ {
+ // We will inspect the timestamps of each frame in sync
+ // to skip from this seek point to the timestamp we
+ // want to start at.
+ if (buf->s.start != AV_NOPTS_VALUE &&
+ buf->s.start < r->job->pts_to_start)
+ {
+ r->job->pts_to_start -= buf->s.start;
+ }
+ else if ( buf->s.start >= r->job->pts_to_start )
+ {
+ r->job->pts_to_start = 0;
+ }
+ r->start_found = 1;
+ }
+
 if ( fifos && ! r->saw_video && !r->job->indepth_scan )
 {
 // The first data packet with a PTS from an audio or video stream
 // that we're decoding defines 'time zero'. Discard packets until
 // we get one.
- if ( buf->s.start != -1 && buf->s.renderOffset != -1 &&
- ( buf->s.id == r->title->video_id || is_audio( r, buf->s.id ) ) )
+ if (buf->s.start != AV_NOPTS_VALUE &&
+ buf->s.renderOffset != AV_NOPTS_VALUE &&
+ (buf->s.id == r->title->video_id ||
+ is_audio( r, buf->s.id)))
 {
 // force a new scr offset computation
 r->scr_changes = r->demux.scr_changes - 1;
@@ -572,7 +584,7 @@
 
 if ( r->job->indepth_scan || fifos )
 {
- if ( buf->s.renderOffset != -1 )
+ if ( buf->s.renderOffset != AV_NOPTS_VALUE )
 {
 if ( r->scr_changes != r->demux.scr_changes )
 {
@@ -597,12 +609,12 @@
 // frame but video & subtitles don't. Clear
 // the timestamps so the decoder will generate
 // them from the frame durations.
- buf->s.start = -1;
- buf->s.renderOffset = -1;
+ buf->s.start = AV_NOPTS_VALUE;
+ buf->s.renderOffset = AV_NOPTS_VALUE;
 }
 }
 }
- if ( buf->s.start != -1 )
+ if ( buf->s.start != AV_NOPTS_VALUE )
 {
 int64_t start = buf->s.start - r->scr_offset;
 
@@ -621,11 +633,20 @@
 break;
 }
 
- if ( !r->start_found &&
- start >= r->pts_to_start )
+ if (!r->start_found && start >= r->pts_to_start)
 {
 // pts_to_start point found
 r->start_found = 1;
+ if (r->stream)
+ {
+ // libav multi-threaded decoders can get into
+ // a bad state if the initial data is not
+ // decodable. So try to improve the chances of
+ // a good start by waiting for an initial iframe
+ hb_stream_set_need_keyframe(r->stream, 1);
+ hb_buffer_close( &buf );
+ continue;
+ }
 }
 // This log is handy when you need to debug timing problems
 //hb_log("id %x scr_offset %"PRId64
@@ -633,8 +654,12 @@
 // buf->s.id, r->scr_offset, buf->s.start, 
 // buf->s.start - r->scr_offset);
 buf->s.start -= r->scr_offset;
+ if ( buf->s.stop != AV_NOPTS_VALUE )
+ {
+ buf->s.stop -= r->scr_offset;
+ }
 }
- if ( buf->s.renderOffset != -1 )
+ if ( buf->s.renderOffset != AV_NOPTS_VALUE )
 {
 // This packet is referenced to the same SCR as the last.
 // Adjust timestamp to remove the System Clock Reference
@@ -675,6 +700,7 @@
 push_buf( r, fifos[n], buf_copy );
 }
 push_buf( r, fifos[0], buf );
+ buf = NULL;
 }
 else
 {

HandBrake-0.9.9.tar.bz2/libhb/rendersub.c -> HandBrake-0.10.0.tar.bz2/libhb/rendersub.c Changed

@@ -1,12 +1,12 @@
 /* rendersub.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
 For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
 */
- 
+
 #include "hb.h"
 #include "hbffmpeg.h"
 #include <ass/ass.h>
@@ -24,6 +24,11 @@
 ASS_Library * ssa;
 ASS_Renderer * renderer;
 ASS_Track * ssaTrack;
+ uint8_t script_initialized;
+
+ // SRT
+ int line;
+ hb_buffer_t * current_sub;
 };
 
 // VOBSUB
@@ -46,6 +51,16 @@
 static void ssa_close( hb_filter_object_t * filter );
 
 
+// SRT
+static int textsub_init( hb_filter_object_t * filter, hb_filter_init_t * init );
+
+static int textsub_work( hb_filter_object_t * filter,
+ hb_buffer_t ** buf_in,
+ hb_buffer_t ** buf_out );
+
+static void textsub_close( hb_filter_object_t * filter );
+
+
 // PGS
 static int pgssub_init ( hb_filter_object_t * filter, hb_filter_init_t * init );
 
@@ -119,7 +134,7 @@
 /*
 * Merge the luminance and alpha with the picture
 */
- y_out[left + xx] = 
+ y_out[left + xx] =
 ( (uint16_t)y_out[left + xx] * ( 255 - alpha ) +
 (uint16_t)y_in[xx] * alpha ) >> 8;
 }
@@ -258,8 +273,8 @@
 else
 next = NULL;
 
- if ((sub->s.stop != -1 && sub->s.stop <= buf->s.start) ||
- (next != NULL && sub->s.stop == -1 && next->s.start <= buf->s.start))
+ if ((sub->s.stop != AV_NOPTS_VALUE && sub->s.stop <= buf->s.start) ||
+ (next != NULL && sub->s.stop == AV_NOPTS_VALUE && next->s.start <= buf->s.start))
 {
 // Subtitle stop is in the past, delete it
 hb_list_rem( pv->sub_list, sub );
@@ -335,7 +350,7 @@
 ApplyVOBSubs( pv, in );
 *buf_in = NULL;
 *buf_out = in;
- 
+
 return HB_FILTER_OK;
 }
 
@@ -361,7 +376,7 @@
 unsigned b = ( frame->color >> 8 ) & 0xff;
 
 int yuv = hb_rgb2yuv((r << 16) | (g << 8) | b );
- 
+
 unsigned frameY = (yuv >> 16) & 0xff;
 unsigned frameV = (yuv >> 8 ) & 0xff;
 unsigned frameU = (yuv >> 0 ) & 0xff;
@@ -408,6 +423,7 @@
 {
 ASS_Image *frameList;
 hb_buffer_t *sub;
+
 frameList = ass_render_frame( pv->renderer, pv->ssaTrack,
 buf->s.start / 90, NULL );
 if ( !frameList )
@@ -442,17 +458,17 @@
 hb_error( "decssasub: libass initialization failed\n" );
 return 1;
 }
- 
+
 // Redirect libass output to hb_log
 ass_set_message_cb( pv->ssa, ssa_log, NULL );
- 
+
 // Load embedded fonts
 hb_list_t * list_attachment = init->job->list_attachment;
 int i;
 for ( i = 0; i < hb_list_count(list_attachment); i++ )
 {
 hb_attachment_t * attachment = hb_list_item( list_attachment, i );
- 
+
 if ( attachment->type == FONT_TTF_ATTACH )
 {
 ass_add_font(
@@ -462,41 +478,37 @@
 attachment->size );
 }
 }
- 
+
 ass_set_extract_fonts( pv->ssa, 1 );
 ass_set_style_overrides( pv->ssa, NULL );
- 
+
 pv->renderer = ass_renderer_init( pv->ssa );
 if ( !pv->renderer ) {
 hb_log( "decssasub: renderer initialization failed\n" );
 return 1;
 }
- 
+
 ass_set_use_margins( pv->renderer, 0 );
 ass_set_hinting( pv->renderer, ASS_HINTING_LIGHT ); // VLC 1.0.4 uses this
 ass_set_font_scale( pv->renderer, 1.0 );
 ass_set_line_spacing( pv->renderer, 1.0 );
- 
+
 // Setup default font family
- // 
+ //
 // SSA v4.00 requires that "Arial" be the default font
 const char *font = NULL;
 const char *family = "Arial";
 // NOTE: This can sometimes block for several *seconds*.
 // It seems that process_fontdata() for some embedded fonts is slow.
 ass_set_fonts( pv->renderer, font, family, /*haveFontConfig=*/1, NULL, 1 );
- 
+
 // Setup track state
 pv->ssaTrack = ass_new_track( pv->ssa );
 if ( !pv->ssaTrack ) {
 hb_log( "decssasub: ssa track initialization failed\n" );
 return 1;
 }
- 
- // NOTE: The codec extradata is expected to be in MKV format
- ass_process_codec_private( pv->ssaTrack,
- (char *)filter->subtitle->extradata, filter->subtitle->extradata_size );
- 
+
 int width = init->width - ( pv->crop[2] + pv->crop[3] );
 int height = init->height - ( pv->crop[0] + pv->crop[1] );
 ass_set_frame_size( pv->renderer, width, height);
@@ -535,6 +547,19 @@
 hb_buffer_t * in = *buf_in;
 hb_buffer_t * sub;
 
+ if (!pv->script_initialized)
+ {
+ // NOTE: The codec extradata is expected to be in MKV format
+ // I would like to initialize this in ssa_init, but when we are
+ // transcoding text subtitles to SSA, the extradata does not
+ // get initialized until the decoder is initialized. Since
+ // decoder initialization happens after filter initialization,
+ // we need to postpone this.
+ ass_process_codec_private(pv->ssaTrack,
+ (char*)filter->subtitle->extradata,
+ filter->subtitle->extradata_size);
+ pv->script_initialized = 1;
+ }
 if ( in->size <= 0 )
 {
 *buf_in = NULL;
@@ -548,16 +573,148 @@
 {
 // Parse MKV-SSA packet
 // SSA subtitles always have an explicit stop time, so we
- // do not need to do special processing for stop == -1
+ // do not need to do special processing for stop == AV_NOPTS_VALUE
 ass_process_chunk( pv->ssaTrack, (char*)sub->data, sub->size,
 sub->s.start / 90,
 (sub->s.stop - sub->s.start) / 90 );
+ hb_buffer_close(&sub);
 }
 
 ApplySSASubs( pv, in );
 *buf_in = NULL;
 *buf_out = in;
- 
+
+ return HB_FILTER_OK;
+}
+
+static int textsub_init( hb_filter_object_t * filter,
+ hb_filter_init_t * init )
+{
+ hb_filter_private_t * pv = filter->private_data;
+
+ int width = init->width - pv->crop[2] - pv->crop[3];
+ int height = init->height - pv->crop[0] - pv->crop[1];
+
+ // Text subtitles for which we create a dummy ASS header need
+ // to have the header rewritten with the correct dimensions.
+ hb_subtitle_add_ssa_header(filter->subtitle, width, height);
+ return ssa_init(filter, init);
+}
+
+static void textsub_close( hb_filter_object_t * filter )
+{
+ return ssa_close(filter);
+}
+
+static void process_sub(hb_filter_private_t *pv, hb_buffer_t *sub)
+{
+ int64_t start, dur;
+ char *ssa, *tmp;
+
+ // libass expects every chunk to have a unique sequence number
+ // since we are repeating subs in some cases, we need to replace
+ // the sequence number.
+ tmp = strchr((char*)sub->data, ',');
+ if (tmp == NULL)
+ return;
+
+ ssa = hb_strdup_printf("%d%s", ++pv->line, tmp);
+
+ // Parse MKV-SSA packet
+ // SSA subtitles always have an explicit stop time, so we
+ // do not need to do special processing for stop == AV_NOPTS_VALUE
+ start = sub->s.start;
+ dur = sub->s.stop - sub->s.start;
+ ass_process_chunk(pv->ssaTrack, ssa, sub->size, start, dur);
+ free(ssa);
+}
+
+static int textsub_work(hb_filter_object_t * filter,
+ hb_buffer_t ** buf_in,
+ hb_buffer_t ** buf_out)
+{
+ hb_filter_private_t * pv = filter->private_data;
+ hb_buffer_t * in = *buf_in;
+ hb_buffer_t * sub;
+
+ if (!pv->script_initialized)
+ {
+ ass_process_codec_private(pv->ssaTrack,
+ (char*)filter->subtitle->extradata,
+ filter->subtitle->extradata_size);
+ pv->script_initialized = 1;
+ }
+
+ if (in->size <= 0)
+ {
+ *buf_in = NULL;
+ *buf_out = in;
+ return HB_FILTER_DONE;
+ }
+
+ int in_start_ms = in->s.start / 90;
+
+ // Get any pending subtitles and add them to the active
+ // subtitle list
+ while ((sub = hb_fifo_get(filter->subtitle->fifo_out)))
+ {
+ // libass expects times in ms. So to make the math easy,
+ // convert to ms immediately.
+ sub->s.start /= 90;
+ if (sub->s.stop != AV_NOPTS_VALUE)
+ {
+ sub->s.stop /= 90;
+ }
+
+ // Subtitle formats such as CC can have stop times
+ // that are not known until an "erase display" command
+ // is encountered in the stream. For these formats
+ // current_sub is the currently active subtitle for which
+ // we do not yet know the stop time. We do not currently
+ // support overlapping subtitles of this type.
+ if (pv->current_sub != NULL)
+ {
+ // Next sub start time tells us the stop time of the
+ // current sub when it is not known in advance.
+ pv->current_sub->s.stop = sub->s.start;
+ process_sub(pv, pv->current_sub);
+ hb_buffer_close(&pv->current_sub);
+ }
+ if (sub->s.start == sub->s.stop)
+ {
+ // Zero duration sub used to "clear" previous sub that had
+ // an unknown duration
+ hb_buffer_close(&sub);
+ }
+ else if (sub->s.stop == AV_NOPTS_VALUE)
+ {
+ // We don't know the duration of this sub. So we will
+ // apply it to every video frame until we see a "clear" sub.
+ pv->current_sub = sub;
+ pv->current_sub->s.stop = pv->current_sub->s.start;
+ }
+ else
+ {
+ // Duration of this subtitle is known, so we can just
+ // process it normally.
+ process_sub(pv, sub);
+ hb_buffer_close(&sub);
+ }
+ }
+ if (pv->current_sub != NULL && pv->current_sub->s.start <= in_start_ms)
+ {
+ // We don't know the duration of this subtitle, but we know
+ // that it started before the current video frame and that
+ // it is still active. So render it on this video frame.
+ pv->current_sub->s.start = pv->current_sub->s.stop;
+ pv->current_sub->s.stop = in_start_ms + 1;
+ process_sub(pv, pv->current_sub);
+ }
+
+ ApplySSASubs(pv, in);
+ *buf_in = NULL;
+ *buf_out = in;
+
 return HB_FILTER_OK;
 }
 
@@ -715,6 +872,14 @@
 return ssa_init( filter, init );
 } break;
 
+ case SRTSUB:
+ case CC608SUB:
+ case UTF8SUB:
+ case TX3GSUB:
+ {
+ return textsub_init( filter, init );
+ } break;
+
 case PGSSUB:
 {
 return pgssub_init( filter, init );
@@ -745,6 +910,14 @@
 return ssa_work( filter, buf_in, buf_out );
 } break;
 
+ case SRTSUB:
+ case CC608SUB:
+ case UTF8SUB:
+ case TX3GSUB:
+ {
+ return textsub_work( filter, buf_in, buf_out );
+ } break;
+
 case PGSSUB:
 {
 return pgssub_work( filter, buf_in, buf_out );
@@ -773,6 +946,14 @@
 ssa_close( filter );
 } break;
 
+ case SRTSUB:
+ case CC608SUB:
+ case UTF8SUB:
+ case TX3GSUB:
+ {
+ textsub_close( filter );
+ } break;
+
 case PGSSUB:
 {
 pgssub_close( filter );

HandBrake-0.9.9.tar.bz2/libhb/rotate.c -> HandBrake-0.10.0.tar.bz2/libhb/rotate.c Changed

HandBrake-0.9.9.tar.bz2/libhb/scan.c -> HandBrake-0.10.0.tar.bz2/libhb/scan.c Changed

@@ -1,6 +1,6 @@
 /* scan.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -8,8 +8,8 @@
 */
 
 #include "hb.h"
+#include "opencl.h"
 #include "hbffmpeg.h"
-#include "a52dec/a52.h"
 
 typedef struct
 {
@@ -32,8 +32,10 @@
 
 } hb_scan_t;
 
+#define PREVIEW_READ_THRESH (1024 * 1024 * 10)
+
 static void ScanFunc( void * );
-static int DecodePreviews( hb_scan_t *, hb_title_t * title );
+static int DecodePreviews( hb_scan_t *, hb_title_t * title, int flush );
 static void LookForAudio( hb_title_t * title, hb_buffer_t * b );
 static int AllAudioOK( hb_title_t * title );
 static void UpdateState1(hb_scan_t *scan, int title);
@@ -181,7 +183,7 @@
 
 for( i = 0; i < hb_list_count( data->title_set->list_title ); )
 {
- int j;
+ int j, npreviews;
 hb_audio_t * audio;
 
 if ( *data->die )
@@ -194,7 +196,12 @@
 
 /* Decode previews */
 /* this will also detect more AC3 / DTS information */
- if( !DecodePreviews( data, title ) )
+ npreviews = DecodePreviews( data, title, 1 );
+ if (npreviews < 2)
+ {
+ npreviews = DecodePreviews( data, title, 0 );
+ }
+ if (npreviews == 0)
 {
 /* TODO: free things */
 hb_list_rem( data->title_set->list_title, title );
@@ -283,6 +290,7 @@
 free( data->path );
 free( data );
 _data = NULL;
+ hb_buffer_pool_free();
 }
 
 // -----------------------------------------------
@@ -476,15 +484,18 @@
 * It assumes that data->reader and data->vts have successfully been
 * DVDOpen()ed and ifoOpen()ed.
 **********************************************************************/
-static int DecodePreviews( hb_scan_t * data, hb_title_t * title )
+static int DecodePreviews( hb_scan_t * data, hb_title_t * title, int flush )
 {
- int i, npreviews = 0;
+ int i, npreviews = 0, abort = 0;
 hb_buffer_t * buf, * buf_es;
 hb_list_t * list_es;
 int progressive_count = 0;
 int pulldown_count = 0;
 int doubled_frame_count = 0;
 int interlaced_preview_count = 0;
+ int frame_wait = 0;
+ int cc_wait = 10;
+ hb_stream_t * stream = NULL;
 info_list_t * info_list = calloc( data->preview_count+1, sizeof(*info_list) );
 crop_record_t *crops = crop_record_init( data->preview_count );
 
@@ -512,18 +523,19 @@
 }
 else if (data->batch)
 {
- data->stream = hb_stream_open( title->path, title, 1 );
+ stream = hb_stream_open( title->path, title, 0 );
+ }
+ else if (data->stream)
+ {
+ stream = hb_stream_open( data->path, title, 0 );
 }
 
- int vcodec = title->video_codec? title->video_codec : WORK_DECMPEG2;
-#if defined(USE_FF_MPEG2)
- if (vcodec == WORK_DECMPEG2)
+ if (title->video_codec == WORK_NONE)
 {
- vcodec = WORK_DECAVCODECV;
- title->video_codec_param = AV_CODEC_ID_MPEG2VIDEO;
+ hb_error("No video decoder set!");
+ return 0;
 }
-#endif
- hb_work_object_t *vid_decoder = hb_get_work( vcodec );
+ hb_work_object_t *vid_decoder = hb_get_work(title->video_codec);
 vid_decoder->codec_param = title->video_codec_param;
 vid_decoder->title = title;
 vid_decoder->init( vid_decoder, NULL );
@@ -554,25 +566,41 @@
 continue;
 }
 }
- else if (data->stream)
+ else if (stream)
 {
- /* we start reading streams at zero rather than 1/11 because
- * short streams may have only one sequence header in the entire
- * file and we need it to decode any previews. */
- if (!hb_stream_seek(data->stream, (float) i / ( data->preview_count + 1.0 ) ) )
- {
- continue;
- }
+ /* we start reading streams at zero rather than 1/11 because
+ * short streams may have only one sequence header in the entire
+ * file and we need it to decode any previews.
+ *
+ * Also, seeking to position 0 loses the palette of avi files
+ * so skip initial seek */
+ if (i != 0)
+ {
+ if (!hb_stream_seek(stream,
+ (float)i / (data->preview_count + 1.0)))
+ {
+ continue;
+ }
+ }
+ else
+ {
+ hb_stream_set_need_keyframe(stream, 1);
+ }
 }
 
 hb_deep_log( 2, "scan: preview %d", i + 1 );
 
- if ( vid_decoder->flush )
+ if (flush && vid_decoder->flush)
 vid_decoder->flush( vid_decoder );
+ if (title->flags & HBTF_NO_IDR)
+ {
+ frame_wait = 100;
+ }
 
 hb_buffer_t * vid_buf = NULL;
 
- for( j = 0; j < 10240 ; j++ )
+ int total_read = 0;
+ while (total_read < PREVIEW_READ_THRESH)
 {
 if (data->bd)
 {
@@ -583,6 +611,7 @@
 break;
 }
 hb_log( "Warning: Could not read data for preview %d, skipped", i + 1 );
+ abort = 1;
 goto skip_preview;
 }
 }
@@ -595,18 +624,20 @@
 break;
 }
 hb_log( "Warning: Could not read data for preview %d, skipped", i + 1 );
+ abort = 1;
 goto skip_preview;
 }
 }
- else if (data->stream)
+ else if (stream)
 {
- if ( (buf = hb_stream_read( data->stream )) == NULL )
+ if ( (buf = hb_stream_read(stream)) == NULL )
 {
 if ( vid_buf )
 {
 break;
 }
 hb_log( "Warning: Could not read data for preview %d, skipped", i + 1 );
+ abort = 1;
 goto skip_preview;
 }
 }
@@ -615,8 +646,17 @@
 // Silence compiler warning
 buf = NULL;
 hb_error( "Error: This can't happen!" );
+ abort = 1;
+ goto skip_preview;
+ }
+
+ if (buf->size <= 0)
+ {
+ hb_log( "Warning: Could not read data for preview %d, skipped", i + 1 );
+ abort = 1;
 goto skip_preview;
 }
+ total_read += buf->size;
 
 (hb_demux[title->demuxer])(buf, list_es, 0 );
 
@@ -626,6 +666,25 @@
 if( buf_es->s.id == title->video_id && vid_buf == NULL )
 {
 vid_decoder->work( vid_decoder, &buf_es, &vid_buf );
+ // There are 2 conditions we decode additional
+ // video frames for during scan.
+ // 1. We did not detect IDR frames, so the initial video
+ // frames may be corrupt. We docode extra frames to
+ // increase the probability of a complete preview frame
+ // 2. Some frames do not contain CC data, even though
+ // CCs are present in the stream. So we need to decode
+ // additional frames to find the CCs.
+ if (vid_buf != NULL && (frame_wait || cc_wait))
+ {
+ if (vid_buf->s.frametype == HB_FRAME_I)
+ frame_wait = 0;
+ if (frame_wait || cc_wait)
+ {
+ hb_buffer_close(&vid_buf);
+ if (frame_wait) frame_wait--;
+ if (cc_wait) cc_wait--;
+ }
+ }
 }
 else if( ! AllAudioOK( title ) ) 
 {
@@ -791,15 +850,19 @@
 {
 hb_buffer_close( &vid_buf );
 }
+ if (abort)
+ {
+ break;
+ }
 }
 UpdateState3(data, i);
 
 vid_decoder->close( vid_decoder );
 free( vid_decoder );
 
- if ( data->batch && data->stream )
+ if (stream != NULL)
 {
- hb_stream_close( &data->stream );
+ hb_stream_close(&stream);
 }
 
 if ( npreviews )
@@ -820,11 +883,12 @@
 // if the frame rate is very close to one of our "common" framerates,
 // assume it actually is said frame rate; e.g. some 24000/1001 sources
 // may have a rate_base of 1126124 (instead of 1126125)
- for( i = 0; i < hb_video_rates_count; i++ )
+ const hb_rate_t *video_framerate = NULL;
+ while ((video_framerate = hb_video_framerate_get_next(video_framerate)) != NULL)
 {
- if( is_close_to( vid_info.rate_base, hb_video_rates[i].rate, 100 ) )
+ if (is_close_to(vid_info.rate_base, video_framerate->rate, 100))
 {
- vid_info.rate_base = hb_video_rates[i].rate;
+ vid_info.rate_base = video_framerate->rate;
 break;
 }
 }
@@ -832,12 +896,12 @@
 title->rate_base = vid_info.rate_base;
 if( vid_info.rate_base == 900900 )
 {
- if( pulldown_count >= npreviews / 4 )
+ if( npreviews >= 4 && pulldown_count >= npreviews / 4 )
 {
 title->rate_base = 1126125;
 hb_deep_log( 2, "Pulldown detected, setting fps to 23.976" );
 }
- if( progressive_count >= npreviews / 2 )
+ if( npreviews >= 2 && progressive_count >= npreviews / 2 )
 {
 // We've already deduced that the frame rate is 23.976,
 // so set it back again.
@@ -845,7 +909,7 @@
 hb_deep_log( 2, "Title's mostly NTSC Film, setting fps to 23.976" );
 }
 }
- if( doubled_frame_count >= 3 * npreviews / 4 )
+ if( npreviews >= 2 && doubled_frame_count >= 3 * npreviews / 4 )
 {
 // We've detected that a significant number of the frames
 // have been doubled in duration by repeat flags.
@@ -864,6 +928,11 @@
 title->color_transfer = vid_info.color_transfer;
 title->color_matrix = vid_info.color_matrix;
 
+ title->video_decode_support = vid_info.video_decode_support;
+
+ // TODO: check video dimensions
+ title->opencl_support = !!hb_opencl_available();
+
 // compute the aspect ratio based on the storage dimensions and the
 // pixel aspect ratio (if supplied) or just storage dimensions if no PAR.
 title->aspect = (double)title->width / (double)title->height;
@@ -1024,18 +1093,124 @@
 audio->config.in.samplerate = info.rate;
 audio->config.in.samples_per_frame = info.samples_per_frame;
 audio->config.in.bitrate = info.bitrate;
+ audio->config.in.matrix_encoding = info.matrix_encoding;
 audio->config.in.channel_layout = info.channel_layout;
 audio->config.in.channel_map = info.channel_map;
 audio->config.in.version = info.version;
 audio->config.in.flags = info.flags;
 audio->config.in.mode = info.mode;
 
- // update the audio description string based on the info we found
- if (audio->config.in.channel_layout == AV_CH_LAYOUT_STEREO_DOWNMIX)
+ // now that we have all the info, set the audio description
+ const char *codec_name = NULL;
+ if (audio->config.in.codec & HB_ACODEC_FF_MASK)
+ {
+ AVCodec *codec = avcodec_find_decoder(audio->config.in.codec_param);
+ if (codec != NULL)
+ {
+ if (info.profile != FF_PROFILE_UNKNOWN)
+ {
+ codec_name = av_get_profile_name(codec, info.profile);
+ }
+ if (codec_name == NULL)
+ {
+ // use our own capitalization for the most common codecs
+ switch (audio->config.in.codec_param)
+ {
+ case AV_CODEC_ID_AAC:
+ codec_name = "AAC";
+ break;
+ case AV_CODEC_ID_AC3:
+ codec_name = "AC3";
+ break;
+ case AV_CODEC_ID_EAC3:
+ codec_name = "E-AC3";
+ break;
+ case AV_CODEC_ID_TRUEHD:
+ codec_name = "TrueHD";
+ break;
+ case AV_CODEC_ID_DTS:
+ codec_name = audio->config.in.codec == HB_ACODEC_DCA_HD ? "DTS-HD" : "DTS";
+ break;
+ case AV_CODEC_ID_FLAC:
+ codec_name = "FLAC";
+ break;
+ case AV_CODEC_ID_MP2:
+ codec_name = "MPEG";
+ break;
+ case AV_CODEC_ID_MP3:
+ codec_name = "MP3";
+ break;
+ case AV_CODEC_ID_PCM_BLURAY:
+ codec_name = "BD LPCM";
+ break;
+ case AV_CODEC_ID_OPUS:
+ codec_name = "Opus";
+ break;
+ case AV_CODEC_ID_VORBIS:
+ codec_name = "Vorbis";
+ break;
+ default:
+ codec_name = codec->name;
+ break;
+ }
+ }
+ }
+ else
+ {
+ switch (audio->config.in.codec)
+ {
+ case HB_ACODEC_DCA:
+ codec_name = "DTS";
+ break;
+ case HB_ACODEC_DCA_HD:
+ codec_name = "DTS-HD";
+ break;
+ case HB_ACODEC_FFAAC:
+ codec_name = "AAC";
+ break;
+ case HB_ACODEC_MP3:
+ codec_name = "MP3";
+ break;
+ default:
+ codec_name = "Unknown (libav)";
+ break;
+ }
+ }
+ }
+ else
+ {
+ switch (audio->config.in.codec)
+ {
+ case HB_ACODEC_AC3:
+ codec_name = "AC3";
+ break;
+ case HB_ACODEC_LPCM:
+ codec_name = "LPCM";
+ break;
+ default:
+ codec_name = "Unknown";
+ break;
+ }
+ }
+ sprintf(audio->config.lang.description, "%s (%s)",
+ audio->config.lang.simple, codec_name);
+
+ switch (audio->config.lang.type)
 {
- strcat(audio->config.lang.description, " (Dolby Surround)");
+ case 2:
+ strcat(audio->config.lang.description, " (Visually Impaired)");
+ break;
+ case 3:
+ strcat(audio->config.lang.description, " (Director's Commentary 1)");
+ break;
+ case 4:
+ strcat(audio->config.lang.description, " (Director's Commentary 2)");
+ break;
+ default:
+ break;
 }
- else if (audio->config.in.channel_layout)
+
+ if (audio->config.in.channel_layout)
 {
 int lfes = (!!(audio->config.in.channel_layout & AV_CH_LOW_FREQUENCY) +
 !!(audio->config.in.channel_layout & AV_CH_LOW_FREQUENCY_2));
@@ -1043,6 +1218,39 @@
 char *desc = audio->config.lang.description +
 strlen(audio->config.lang.description);
 sprintf(desc, " (%d.%d ch)", channels - lfes, lfes);
+
+ // describe the matrix encoding mode, if any
+ switch (audio->config.in.matrix_encoding)
+ {
+ case AV_MATRIX_ENCODING_DOLBY:
+ if (audio->config.in.codec == HB_ACODEC_AC3 ||
+ audio->config.in.codec_param == AV_CODEC_ID_AC3 ||
+ audio->config.in.codec_param == AV_CODEC_ID_EAC3 ||
+ audio->config.in.codec_param == AV_CODEC_ID_TRUEHD)
+ {
+ strcat(audio->config.lang.description, " (Dolby Surround)");
+ break;
+ }
+ strcat(audio->config.lang.description, " (Lt/Rt)");
+ break;
+ case AV_MATRIX_ENCODING_DPLII:
+ strcat(audio->config.lang.description, " (Dolby Pro Logic II)");
+ break;
+ case AV_MATRIX_ENCODING_DPLIIX:
+ strcat(audio->config.lang.description, " (Dolby Pro Logic IIx)");
+ break;
+ case AV_MATRIX_ENCODING_DPLIIZ:
+ strcat(audio->config.lang.description, " (Dolby Pro Logic IIz)");
+ break;
+ case AV_MATRIX_ENCODING_DOLBYEX:
+ strcat(audio->config.lang.description, " (Dolby Digital EX)");
+ break;
+ case AV_MATRIX_ENCODING_DOLBYHEADPHONE:
+ strcat(audio->config.lang.description, " (Dolby Headphone)");
+ break;
+ default:
+ break;
+ }
 }
 
 hb_log( "scan: audio 0x%x: %s, rate=%dHz, bitrate=%d %s", audio->id,

HandBrake-0.9.9.tar.bz2/libhb/stream.c -> HandBrake-0.10.0.tar.bz2/libhb/stream.c Changed

@@ -1,6 +1,6 @@
 /* stream.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -14,8 +14,8 @@
 #include "hb.h"
 #include "hbffmpeg.h"
 #include "lang.h"
-#include "a52dec/a52.h"
 #include "libbluray/bluray.h"
+#include "vadxva2.h"
 
 #define min(a, b) a < b ? a : b
 #define HB_MAX_PROBE_SIZE (1*1024*1024)
@@ -48,8 +48,8 @@
 
 static const stream2codec_t st2codec[256] = {
 st(0x00, U, 0, 0, NULL),
- st(0x01, V, WORK_DECMPEG2, 0, "MPEG1"),
- st(0x02, V, WORK_DECMPEG2, 0, "MPEG2"),
+ st(0x01, V, WORK_DECAVCODECV, AV_CODEC_ID_MPEG2VIDEO, "MPEG1"),
+ st(0x02, V, WORK_DECAVCODECV, AV_CODEC_ID_MPEG2VIDEO, "MPEG2"),
 st(0x03, A, HB_ACODEC_FFMPEG, AV_CODEC_ID_MP2, "MPEG1"),
 st(0x04, A, HB_ACODEC_FFMPEG, AV_CODEC_ID_MP2, "MPEG2"),
 st(0x05, N, 0, 0, "ISO 13818-1 private section"),
@@ -72,7 +72,7 @@
 st(0x1b, V, WORK_DECAVCODECV, AV_CODEC_ID_H264, "H.264"),
 
 st(0x80, U, HB_ACODEC_FFMPEG, AV_CODEC_ID_PCM_BLURAY, "Digicipher II Video"),
- st(0x81, A, HB_ACODEC_AC3, 0, "AC3"),
+ st(0x81, A, HB_ACODEC_AC3, AV_CODEC_ID_AC3, "AC3"),
 st(0x82, A, HB_ACODEC_DCA, AV_CODEC_ID_DTS, "DTS"),
 // 0x83 can be LPCM or BD TrueHD. Set to 'unknown' till we know more.
 st(0x83, U, HB_ACODEC_LPCM, 0, "LPCM"),
@@ -609,6 +609,10 @@
 
 if ( fread(buf, 1, sizeof(buf), stream->file_handle) == sizeof(buf) )
 {
+#ifdef USE_HWD
+ if ( hb_gui_use_hwd_flag == 1 )
+ return 0;
+#endif
 int psize;
 if ( ( psize = hb_stream_check_for_ts(buf) ) != 0 )
 {
@@ -811,7 +815,7 @@
 **********************************************************************/
 hb_stream_t * hb_stream_open( char *path, hb_title_t *title, int scan )
 {
- FILE *f = fopen( path, "rb" );
+ FILE *f = hb_fopen(path, "rb");
 if ( f == NULL )
 {
 hb_log( "hb_stream_open: open %s failed", path );
@@ -954,10 +958,16 @@
 hb_subtitle_t * subtitle;
 for ( ii = 0; ( subtitle = hb_list_item( title->list_subtitle, ii ) ); ++ii )
 {
- pid = subtitle->id & 0xFFFF;
- stream_type = subtitle->stream_type;
+ // If the subtitle track is CC embedded in the video stream, then
+ // it does not have an independent pid. In this case, we assigned
+ // the subtitle->id to 0.
+ if (subtitle->id != 0)
+ {
+ pid = subtitle->id & 0xFFFF;
+ stream_type = subtitle->stream_type;
 
- update_ts_streams( d, pid, 0, stream_type, S, NULL );
+ update_ts_streams( d, pid, 0, stream_type, S, NULL );
+ }
 }
 
 // We don't need to wait for a PCR when scanning. In fact, it
@@ -1032,7 +1042,7 @@
 title->index = 1;
 
 // Copy part of the stream path to the title name
- char *sep = strrchr(stream->path, '/');
+ char *sep = hb_strr_dir_sep(stream->path);
 if (sep)
 strcpy(title->name, sep+1);
 char *dot_term = strrchr(title->name, '.');
@@ -1060,14 +1070,18 @@
 title->video_id = get_id( &stream->pes.list[idx] );
 title->video_codec = stream->pes.list[idx].codec;
 title->video_codec_param = stream->pes.list[idx].codec_param;
- title->demuxer = HB_MPEG_DEMUXER;
 
 if (stream->hb_stream_type == transport)
 {
+ title->demuxer = HB_TS_DEMUXER;
 
 // make sure we're grabbing the PCR PID
 update_ts_streams( stream, stream->pmt_info.PCR_PID, 0, -1, P, NULL );
 }
+ else
+ {
+ title->demuxer = HB_PS_DEMUXER;
+ }
 
 // IDRs will be search for in hb_stream_duration
 stream->has_IDRs = 0;
@@ -1084,7 +1098,6 @@
 chapter->seconds = title->seconds;
 hb_list_add( title->list_chapter, chapter );
 
-
 if ( stream->has_IDRs < 1 )
 {
 hb_log( "stream doesn't seem to have video IDR frames" );
@@ -1096,6 +1109,20 @@
 {
 hb_log( "transport stream missing PCRs - using video DTS instead" );
 }
+#ifdef USE_HWD
+ hb_va_dxva2_t * dxva2 = NULL;
+ dxva2 = hb_va_create_dxva2( dxva2, title->video_codec_param );
+ if ( dxva2 )
+ {
+ title->hwd_support = 1;
+ hb_va_close(dxva2);
+ dxva2 = NULL;
+ }
+ else
+ title->hwd_support = 0;
+#else
+ title->hwd_support = 0;
+#endif
 
 // Height, width, rate and aspect ratio information is filled in
 // when the previews are built
@@ -1329,6 +1356,21 @@
 // didn't find an I-frame
 return 0;
 }
+ if ( pes->stream_type == 0x10 || pes->codec_param == AV_CODEC_ID_MPEG4 )
+ {
+ // we have an mpeg4 stream
+ for (ii = 0; ii < len-1; ii++)
+ {
+ strid = (strid << 8) | buf[ii];
+ if ( strid == 0x1b6 )
+ {
+ if ((buf[ii+1] & 0xC0) == 0)
+ return 1;
+ }
+ }
+ // didn't find an I-frame
+ return 0;
+ }
 
 // we don't understand the stream type so just say "yes" otherwise
 // we'll discard all the video.
@@ -1447,7 +1489,7 @@
 }
 if ( stream->pes.list[idx].stream_kind == V )
 {
- if ( pes_info.pts != -1 )
+ if ( pes_info.pts != AV_NOPTS_VALUE )
 {
 *pi = pes_info;
 return buf;
@@ -1877,183 +1919,14 @@
 return "Unknown";
 }
 
-static const char *stream_type_name (uint32_t reg_desc, uint8_t stream_type)
-{
- if ( reg_desc == STR4_TO_UINT32("HDMV") )
- {
- // Names for streams we know about.
- switch ( stream_type )
- {
- case 0x80:
- return "BD LPCM";
-
- case 0x83:
- return "TrueHD";
-
- case 0x84:
- return "E-AC3";
-
- case 0x85:
- return "DTS-HD HRA";
-
- case 0x86:
- return "DTS-HD MA";
-
- default:
- break;
- }
- }
- return st2codec[stream_type].name ? st2codec[stream_type].name : "Unknown";
-}
-
-static void set_audio_description(
- hb_stream_t * stream,
- hb_audio_t *audio,
- iso639_lang_t *lang)
+static void set_audio_description(hb_audio_t *audio, iso639_lang_t *lang)
 {
- int idx;
- const char *codec_name;
- char codec_name_caps[80];
- AVCodecContext *cc = NULL;
-
- if ( stream && stream->ffmpeg_ic )
- {
- cc = stream->ffmpeg_ic->streams[audio->id]->codec;
- }
-
- // Names for streams we know about.
- if ( audio->config.in.stream_type == 0x80 &&
- audio->config.in.reg_desc == STR4_TO_UINT32("HDMV") )
- {
- // LPCM audio in bluray have an stype of 0x80
- codec_name = "BD LPCM";
- }
- else if ( audio->config.in.stream_type == 0x83 &&
- audio->config.in.reg_desc == STR4_TO_UINT32("HDMV") )
- {
- // This is an interleaved TrueHD/AC-3 stream and the esid of
- // the AC-3 is 0x76
- if (audio->config.in.substream_type == HB_SUBSTREAM_BD_AC3)
- codec_name = "AC3";
- else
- codec_name = "TrueHD";
- }
- else if ( audio->config.in.stream_type == 0x86 &&
- audio->config.in.reg_desc == STR4_TO_UINT32("HDMV") )
- {
- // This is an interleaved DTS-HD MA/DTS stream and the
- // esid of the DTS is 0x71
- if (audio->config.in.substream_type == HB_SUBSTREAM_BD_DTS)
- codec_name = "DTS";
- else
- codec_name = "DTS-HD MA";
- }
- else if ( audio->config.in.stream_type == 0x85 &&
- audio->config.in.reg_desc == STR4_TO_UINT32("HDMV") )
- {
- // DTS-HD HRA audio in bluray has an stype of 0x85
- // which conflicts with ATSC Program ID
- // To distinguish, Bluray streams have a reg_desc of HDMV
- // This is an interleaved DTS-HD HRA/DTS stream and the
- // esid of the DTS is 0x71
- if (audio->config.in.substream_type == HB_SUBSTREAM_BD_DTS)
- codec_name = "DTS";
- else
- codec_name = "DTS-HD HRA";
- }
- else if ( audio->config.in.stream_type == 0x84 &&
- audio->config.in.reg_desc == STR4_TO_UINT32("HDMV") )
- {
- // EAC3 audio in bluray has an stype of 0x84
- // which conflicts with SDDS
- // To distinguish, Bluray streams have a reg_desc of HDMV
- codec_name = "E-AC3";
- }
- // For streams demuxed and decoded by ffmpeg, we have a cached context.
- // Use it to get the name and profile information. Obtaining
- // the profile requires that ffmpeg has already probed the stream.
- else if ( ( audio->config.in.codec & HB_ACODEC_FF_MASK ) && cc &&
- avcodec_find_decoder( cc->codec_id ) )
- {
- AVCodec *codec = avcodec_find_decoder( cc->codec_id );
- codec_name = codec->name;
-
- const char *profile_name;
- profile_name = av_get_profile_name( codec, cc->profile );
- if ( profile_name )
- {
- codec_name = profile_name;
- }
- }
- else if ( stream->hb_stream_type != ffmpeg && 
- (idx = index_of_id( stream, audio->id ) ) >= 0 )
- {
- codec_name = stream_type_name2( stream, &stream->pes.list[idx] );
- }
- else if ( st2codec[audio->config.in.stream_type].kind == A )
- {
- codec_name = stream_type_name(audio->config.in.reg_desc,
- audio->config.in.stream_type);
- }
- // For streams demuxed by us and decoded by ffmpeg, we can lookup the
- // decoder name.
- else if ( ( audio->config.in.codec & HB_ACODEC_FF_MASK ) &&
- avcodec_find_decoder( audio->config.in.codec_param ) )
- {
- codec_name = avcodec_find_decoder( audio->config.in.codec_param )->name;
- strncpyupper( codec_name_caps, codec_name, 80 );
- codec_name = codec_name_caps;
- }
- else
- {
- switch( audio->config.in.codec )
- {
- case HB_ACODEC_AC3:
- codec_name = "AC3";
- break;
- case HB_ACODEC_DCA:
- codec_name = "DTS";
- break;
- case HB_ACODEC_LPCM:
- codec_name = "LPCM";
- break;
- case HB_ACODEC_MP3:
- codec_name = "MP3";
- break;
- case HB_ACODEC_FFAAC:
- codec_name = "AAC";
- break;
- case HB_ACODEC_DCA_HD:
- codec_name = "DTS-HD";
- break;
- default:
- codec_name = ( audio->config.in.codec & HB_ACODEC_FF_MASK ) ? "Unknown FFmpeg" : "Unknown";
- break;
- }
- }
-
 snprintf( audio->config.lang.simple,
 sizeof( audio->config.lang.simple ), "%s",
 strlen( lang->native_name ) ? lang->native_name : lang->eng_name );
 snprintf( audio->config.lang.iso639_2,
 sizeof( audio->config.lang.iso639_2 ), "%s", lang->iso639_2 );
- snprintf( audio->config.lang.description,
- sizeof( audio->config.lang.description ), "%s (%s)",
- audio->config.lang.simple, codec_name );
-
- if (audio->config.in.channel_layout == AV_CH_LAYOUT_STEREO_DOWNMIX)
- {
- strcat(audio->config.lang.description, " (Dolby Surround)");
- }
- else if (audio->config.in.channel_layout)
- {
- int lfes = (!!(audio->config.in.channel_layout & AV_CH_LOW_FREQUENCY) +
- !!(audio->config.in.channel_layout & AV_CH_LOW_FREQUENCY_2));
- int channels = av_get_channel_layout_nb_channels(audio->config.in.channel_layout);
- char *desc = audio->config.lang.description +
- strlen(audio->config.lang.description);
- sprintf(desc, " (%d.%d ch)", channels - lfes, lfes);
- }
+ audio->config.lang.type = 0;
 }
 
 // Sort specifies the index in the audio list where you would
@@ -2205,7 +2078,7 @@
 audio->config.in.codec = pes->codec;
 audio->config.in.codec_param = pes->codec_param;
 
- set_audio_description( stream, audio, lang_for_code( pes->lang_code ) );
+ set_audio_description(audio, lang_for_code(pes->lang_code));
 
 hb_log("stream id 0x%x (type 0x%x substream 0x%x) audio 0x%x",
 pes->stream_id, pes->stream_type, pes->stream_id_ext, audio->id);
@@ -3314,8 +3187,8 @@
 hb_pes_info_t *pes_info )
 {
 memset( pes_info, 0, sizeof( hb_pes_info_t ) );
- pes_info->pts = -1;
- pes_info->dts = -1;
+ pes_info->pts = AV_NOPTS_VALUE;
+ pes_info->dts = AV_NOPTS_VALUE;
 
 bitbuf_t bb, cc;
 bits_init(&bb, buf, len, 0);
@@ -3586,8 +3459,8 @@
 !isIframe( stream, buf->data, buf->size ) )
 {
 // not the video stream or didn't find an I frame
- // but we'll only wait 255 video frames for an I frame.
- if ( buf->s.type != VIDEO_BUF || ++stream->need_keyframe < 512 )
+ // but we'll only wait 600 video frames for an I frame.
+ if ( buf->s.type != VIDEO_BUF || ++stream->need_keyframe < 600 )
 {
 continue;
 }
@@ -3606,7 +3479,7 @@
 buf->size -= pes_info.header_len;
 if ( buf->size == 0 )
 continue;
- stream->pes.scr = -1;
+ stream->pes.scr = AV_NOPTS_VALUE;
 return buf;
 }
 }
@@ -4186,12 +4059,12 @@
 switch ( codec->id )
 {
 case AV_CODEC_ID_MPEG1VIDEO:
- pes->codec = WORK_DECMPEG2;
+ pes->codec = WORK_DECAVCODECV;
 pes->stream_type = 0x01;
 break;
 
 case AV_CODEC_ID_MPEG2VIDEO:
- pes->codec = WORK_DECMPEG2;
+ pes->codec = WORK_DECAVCODECV;
 pes->stream_type = 0x02;
 break;
 
@@ -4274,6 +4147,7 @@
 update_ts_streams( stream, pid, HB_SUBSTREAM_BD_AC3,
 stype, A, &pes_idx );
 stream->pes.list[pes_idx].codec = HB_ACODEC_AC3;
+ stream->pes.list[pes_idx].codec_param = AV_CODEC_ID_AC3;
 
 update_ts_streams( stream, pid, HB_SUBSTREAM_BD_TRUEHD,
 stype, A, &pes_idx );
@@ -4665,7 +4539,7 @@
 }
 else
 {
- buf->s.pcr = -1;
+ buf->s.pcr = AV_NOPTS_VALUE;
 }
 
 // check if this packet was referenced to an older pcr and if that
@@ -4675,10 +4549,10 @@
 // we've sent up a new pcr but have a packet referenced to an
 // old pcr and the difference was enough to trigger a discontinuity
 // correction. smash the timestamps or we'll mess up the correction.
- buf->s.start = -1;
- buf->s.renderOffset = -1;
- buf->s.stop = -1;
- buf->s.pcr = -1;
+ buf->s.start = AV_NOPTS_VALUE;
+ buf->s.renderOffset = AV_NOPTS_VALUE;
+ buf->s.stop = AV_NOPTS_VALUE;
+ buf->s.pcr = AV_NOPTS_VALUE;
 }
 else
 {
@@ -4876,6 +4750,17 @@
 }
 }
 
+ if ( ts_stream_kind( stream, curstream ) == P )
+ {
+ // This is a stream that only contains PCRs. No need to process
+ // the remainder of the packet.
+ //
+ // I ran across a poorly mastered BD that does not properly pad
+ // the adaptation field and causes parsing errors below if we
+ // do not exit early here.
+ return NULL;
+ }
+
 /* If we get here the packet is valid - process its data */
 
 
@@ -5001,6 +4886,20 @@
 return NULL;
 }
 
+void hb_stream_set_need_keyframe(hb_stream_t *stream, int need_keyframe)
+{
+ if ( stream->hb_stream_type == transport ||
+ stream->hb_stream_type == program )
+ {
+ // Only wait for a keyframe if the stream is known to have IDRs
+ stream->need_keyframe = !!need_keyframe & !!stream->has_IDRs;
+ }
+ else
+ {
+ stream->need_keyframe = need_keyframe;
+ }
+}
+
 void hb_ts_stream_reset(hb_stream_t *stream)
 {
 int i;
@@ -5020,9 +4919,9 @@
 stream->ts.found_pcr = 0;
 stream->ts.pcr_out = 0;
 stream->ts.pcr_in = 0;
- stream->ts.pcr = -1;
+ stream->ts.pcr = AV_NOPTS_VALUE;
 stream->ts.pcr_current = -1;
- stream->ts.last_timestamp = -1;
+ stream->ts.last_timestamp = AV_NOPTS_VALUE;
 
 stream->frames = 0;
 stream->errors = 0;
@@ -5035,7 +4934,7 @@
 stream->need_keyframe = 1;
 
 stream->pes.found_scr = 0;
- stream->pes.scr = -1;
+ stream->pes.scr = AV_NOPTS_VALUE;
 
 stream->frames = 0;
 stream->errors = 0;
@@ -5143,7 +5042,6 @@
 
 case AV_CODEC_ID_AC3:
 audio->config.in.codec = HB_ACODEC_AC3;
- audio->config.in.codec_param = 0;
 break;
 
 case AV_CODEC_ID_DTS:
@@ -5174,7 +5072,7 @@
 break;
 }
 
- set_audio_description(stream, audio,
+ set_audio_description(audio,
 lang_for_code2(tag != NULL ? tag->value : "und"));
 hb_list_add(title->list_audio, audio);
 }
@@ -5362,9 +5260,12 @@
 strncpy( subtitle->iso639_2, language->iso639_2, 4 );
 
 // Copy the extradata for the subtitle track
- subtitle->extradata = malloc( codec->extradata_size );
- memcpy( subtitle->extradata, codec->extradata, codec->extradata_size );
- subtitle->extradata_size = codec->extradata_size;
+ if (codec->extradata != NULL)
+ {
+ subtitle->extradata = malloc( codec->extradata_size );
+ memcpy( subtitle->extradata, codec->extradata, codec->extradata_size );
+ subtitle->extradata_size = codec->extradata_size;
+ }
 
 subtitle->track = id;
 hb_list_add(title->list_subtitle, subtitle);
@@ -5495,7 +5396,7 @@
 title->index = 1;
 
 // Copy part of the stream path to the title name
- char *sep = strrchr(stream->path, '/');
+ char *sep = hb_strr_dir_sep(stream->path);
 if (sep)
 strcpy(title->name, sep+1);
 char *dot_term = strrchr(title->name, '.');
@@ -5513,13 +5414,16 @@
 title->demuxer = HB_NULL_DEMUXER;
 title->video_codec = 0;
 int i;
+ int pix_fmt = -1;
 for (i = 0; i < ic->nb_streams; ++i )
 {
 if ( ic->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
+ !(ic->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC) &&
 avcodec_find_decoder( ic->streams[i]->codec->codec_id ) &&
 title->video_codec == 0 )
 {
 AVCodecContext *context = ic->streams[i]->codec;
+ pix_fmt = context->pix_fmt;
 if ( context->pix_fmt != AV_PIX_FMT_YUV420P &&
 !sws_isSupportedInput( context->pix_fmt ) )
 {
@@ -5535,9 +5439,6 @@
 title->pixel_aspect_height = ic->streams[i]->sample_aspect_ratio.den;
 }
 
- if ( context->codec_id == AV_CODEC_ID_H264 )
- title->flags |= HBTF_NO_IDR;
-
 title->video_codec = WORK_DECAVCODECV;
 title->video_codec_param = context->codec_id;
 }
@@ -5608,11 +5509,7 @@
 /*
 * Fill the metadata.
 */
- // JJJ: is this necessary? can we just get this metadata from libav api's?
- if (!decmetadata( title ))
- {
- ffmpeg_decmetadata( ic->metadata, title );
- }
+ ffmpeg_decmetadata( ic->metadata, title );
 
 if( hb_list_count( title->list_chapter ) == 0 )
 {
@@ -5626,6 +5523,24 @@
 chapter->seconds = title->seconds;
 hb_list_add( title->list_chapter, chapter );
 }
+#ifdef USE_HWD
+ hb_va_dxva2_t * dxva2 = NULL;
+ dxva2 = hb_va_create_dxva2( dxva2, title->video_codec_param );
+ if (dxva2)
+ {
+ title->hwd_support = 1;
+ hb_va_close(dxva2);
+ dxva2 = NULL;
+ }
+ else
+ title->hwd_support = 0;
+ if ( hb_check_hwd_fmt(pix_fmt) == 0)
+ title->hwd_support = 0;
+#else
+ // Eliminate compiler warning "pix_fmt set but not used"
+ (void)pix_fmt;
+ title->hwd_support = 0;
+#endif
 
 return title;
 }
@@ -5633,7 +5548,7 @@
 static int64_t av_to_hb_pts( int64_t pts, double conv_factor )
 {
 if ( pts == AV_NOPTS_VALUE )
- return -1;
+ return AV_NOPTS_VALUE;
 return (int64_t)( (double)pts * conv_factor );
 }
 
@@ -5745,6 +5660,16 @@
 }
 buf = hb_buffer_init( stream->ffmpeg_pkt->size );
 memcpy( buf->data, stream->ffmpeg_pkt->data, stream->ffmpeg_pkt->size );
+
+ const uint8_t *palette;
+ int size;
+ palette = av_packet_get_side_data(stream->ffmpeg_pkt,
+ AV_PKT_DATA_PALETTE, &size);
+ if (palette != NULL)
+ {
+ buf->palette = hb_buffer_init( size );
+ memcpy( buf->palette->data, palette, size );
+ }
 }
 buf->s.id = stream->ffmpeg_pkt->stream_index;
 
@@ -5755,11 +5680,11 @@
 
 buf->s.start = av_to_hb_pts( stream->ffmpeg_pkt->pts, tsconv );
 buf->s.renderOffset = av_to_hb_pts( stream->ffmpeg_pkt->dts, tsconv );
- if ( buf->s.renderOffset >= 0 && buf->s.start == -1 )
+ if ( buf->s.renderOffset >= 0 && buf->s.start == AV_NOPTS_VALUE )
 {
 buf->s.start = buf->s.renderOffset;
 }
- else if ( buf->s.renderOffset == -1 && buf->s.start >= 0 )
+ else if ( buf->s.renderOffset == AV_NOPTS_VALUE && buf->s.start >= 0 )
 {
 buf->s.renderOffset = buf->s.start;
 }

HandBrake-0.9.9.tar.bz2/libhb/sync.c -> HandBrake-0.10.0.tar.bz2/libhb/sync.c Changed

@@ -1,6 +1,6 @@
 /* sync.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -55,6 +55,14 @@
 
 typedef struct
 {
+ int link;
+ int merge;
+ hb_buffer_t * list_current;
+ hb_buffer_t * last;
+} subtitle_sanitizer_t;
+
+typedef struct
+{
 /* Video */
 int first_frame;
 int64_t pts_skip;
@@ -68,6 +76,8 @@
 int chap_mark; /* to propagate chapter mark across a drop */
 hb_buffer_t * cur; /* The next picture to process */
 
+ subtitle_sanitizer_t *subtitle_sanitizer;
+
 /* Statistics */
 uint64_t st_counts[4];
 uint64_t st_dates[4];
@@ -91,6 +101,7 @@
 static void getPtsOffset( hb_work_object_t * w );
 static int checkPtsOffset( hb_work_object_t * w );
 static void InitAudio( hb_job_t * job, hb_sync_common_t * common, int i );
+static void InitSubtitle( hb_job_t * job, hb_sync_video_t * sync, int i );
 static void InsertSilence( hb_work_object_t * w, int64_t d );
 static void UpdateState( hb_work_object_t * w );
 static void UpdateSearchState( hb_work_object_t * w, int64_t start );
@@ -118,7 +129,7 @@
 pv->common = calloc( 1, sizeof( hb_sync_common_t ) );
 pv->common->ref++;
 pv->common->mutex = hb_lock_init();
- pv->common->audio_pts_thresh = -1;
+ pv->common->audio_pts_thresh = AV_NOPTS_VALUE;
 pv->common->next_frame = hb_cond_init();
 pv->common->pts_count = 1;
 if ( job->frame_to_start || job->pts_to_start )
@@ -188,9 +199,43 @@
 for ( i = 0; i < pv->common->pts_count; i++ )
 pv->common->first_pts[i] = INT64_MAX;
 
+ int count = hb_list_count(job->list_subtitle);
+ sync->subtitle_sanitizer = calloc(count, sizeof(subtitle_sanitizer_t));
+ for( i = 0; i < count; i++ )
+ {
+ InitSubtitle(job, sync, i);
+ }
 return ret;
 }
 
+static void InitSubtitle( hb_job_t * job, hb_sync_video_t * sync, int i )
+{
+ hb_subtitle_t * subtitle;
+
+ subtitle = hb_list_item( job->list_subtitle, i );
+ if (subtitle->format == TEXTSUB &&
+ subtitle->config.dest == PASSTHRUSUB &&
+ (job->mux & HB_MUX_MASK_MP4))
+ {
+ // Merge overlapping subtitles since mpv tx3g does not support them
+ sync->subtitle_sanitizer[i].merge = 1;
+ }
+ // PGS subtitles don't need to be linked because there are explicit
+ // "clear" subtitle packets that indicate the end time of the
+ // previous subtitle
+ if (subtitle->config.dest == PASSTHRUSUB &&
+ subtitle->source != PGSSUB)
+ {
+ // Fill in stop time when it is missing
+ sync->subtitle_sanitizer[i].link = 1;
+ }
+}
+
+static void CloseSubtitle(hb_sync_video_t * sync, int ii)
+{
+ hb_buffer_close(&sync->subtitle_sanitizer[ii].list_current);
+}
+
 /***********************************************************************
 * Close Video
 ***********************************************************************
@@ -201,6 +246,7 @@
 hb_work_private_t * pv = w->private_data;
 hb_job_t * job = pv->job;
 hb_sync_video_t * sync = &pv->type.video;
+ int ii;
 
 // Wake up audio sync if it's still waiting on condition.
 pv->common->pts_offset = 0;
@@ -230,6 +276,13 @@
 sync->drops, sync->dups );
 }
 
+ int count = hb_list_count(job->list_subtitle);
+ for( ii = 0; ii < count; ii++ )
+ {
+ CloseSubtitle(sync, ii);
+ }
+ free(sync->subtitle_sanitizer);
+
 hb_lock( pv->common->mutex );
 if ( --pv->common->ref == 0 )
 {
@@ -248,6 +301,197 @@
 w->private_data = NULL;
 }
 
+#define ABS(a) ((a) < 0 ? -(a) : (a))
+
+static hb_buffer_t * merge_ssa(hb_buffer_t *a, hb_buffer_t *b)
+{
+ int len, ii;
+ char *text;
+ hb_buffer_t *buf = hb_buffer_init(a->size + b->size);
+ buf->s = a->s;
+
+ // Find the text in the second SSA sub
+ text = (char*)b->data;
+ for (ii = 0; ii < 8; ii++)
+ {
+ text = strchr(text, ',');
+ if (text == NULL)
+ break;
+ text++;
+ }
+ if (text != NULL)
+ {
+ len = sprintf((char*)buf->data, "%s\n%s", a->data, text);
+ if (len >= 0)
+ buf->size = len + 1;
+ }
+ else
+ {
+ memcpy(buf->data, a->data, a->size);
+ buf->size = a->size;
+ }
+
+ return buf;
+}
+
+static hb_buffer_t * mergeSubtitles(subtitle_sanitizer_t *sanitizer, int end)
+{
+ hb_buffer_t *a, *b, *buf, *out = NULL, *last = NULL;
+
+ do
+ {
+ a = sanitizer->list_current;
+ b = a != NULL ? a->next : NULL;
+
+ buf = NULL;
+ if (a != NULL && b == NULL && end)
+ {
+ sanitizer->list_current = a->next;
+ if (sanitizer->list_current == NULL)
+ sanitizer->last = NULL;
+ a->next = NULL;
+ buf = a;
+ }
+ else if (a != NULL && a->s.stop != AV_NOPTS_VALUE)
+ {
+ if (!sanitizer->merge)
+ {
+ sanitizer->list_current = a->next;
+ if (sanitizer->list_current == NULL)
+ sanitizer->last = NULL;
+ a->next = NULL;
+ buf = a;
+ }
+ else if (b != NULL && a->s.stop > b->s.start)
+ {
+ // Overlap
+ if (ABS(a->s.start - b->s.start) <= 18000)
+ {
+ // subtitles start within 1/5 second of eachother, merge
+ sanitizer->list_current = a->next;
+ if (sanitizer->list_current == NULL)
+ sanitizer->last = NULL;
+ a->next = NULL;
+ b->s.start = a->s.stop;
+
+ buf = merge_ssa(a, b);
+ hb_buffer_close(&a);
+
+ if (b->s.stop != AV_NOPTS_VALUE && ABS(b->s.stop - b->s.start) <= 18000)
+ {
+ // b and a completely overlap, remove b
+ sanitizer->list_current = b->next;
+ if (sanitizer->list_current == NULL)
+ sanitizer->last = NULL;
+ hb_buffer_close(&b);
+ }
+ }
+ else
+ {
+ // a starts before b, output copy of a and
+ buf = hb_buffer_dup(a);
+ buf->s.stop = b->s.start;
+ a->s.start = b->s.start;
+ }
+ }
+ else if (b != NULL && a->s.stop <= b->s.start)
+ {
+ sanitizer->list_current = a->next;
+ if (sanitizer->list_current == NULL)
+ sanitizer->last = NULL;
+ a->next = NULL;
+ buf = a;
+ }
+ }
+
+ if (buf != NULL)
+ {
+ if (buf->s.stop != AV_NOPTS_VALUE)
+ buf->s.duration = buf->s.stop - buf->s.start;
+ else
+ buf->s.duration = AV_NOPTS_VALUE;
+ if (last == NULL)
+ {
+ out = last = buf;
+ }
+ else
+ {
+ last->next = buf;
+ last = buf;
+ }
+ }
+ } while (buf != NULL);
+
+ return out;
+}
+
+static hb_buffer_t * sanitizeSubtitle(
+ hb_work_private_t * pv,
+ int i,
+ hb_buffer_t * sub)
+{
+ hb_sync_video_t * sync;
+ subtitle_sanitizer_t * sanitizer;
+
+ sync = &pv->type.video;
+ sanitizer = &sync->subtitle_sanitizer[i];
+
+ if (!sanitizer->link && !sanitizer->merge)
+ {
+ if (sub != NULL)
+ {
+ if (sub->s.stop != AV_NOPTS_VALUE)
+ sub->s.duration = sub->s.stop - sub->s.start;
+ else
+ sub->s.duration = 0;
+ sub->s.start -= pv->common->video_pts_slip;
+ if (sub->s.stop != AV_NOPTS_VALUE)
+ sub->s.stop -= pv->common->video_pts_slip;
+ if (sub->s.renderOffset != AV_NOPTS_VALUE)
+ sub->s.renderOffset -= pv->common->video_pts_slip;
+ }
+ return sub;
+ }
+
+ if (sub == NULL)
+ {
+ return mergeSubtitles(sanitizer, 1);
+ }
+
+ hb_lock( pv->common->mutex );
+ sub->s.start -= pv->common->video_pts_slip;
+ if (sub->s.stop != AV_NOPTS_VALUE)
+ sub->s.stop -= pv->common->video_pts_slip;
+ if (sub->s.renderOffset != AV_NOPTS_VALUE)
+ sub->s.renderOffset -= pv->common->video_pts_slip;
+ hb_unlock( pv->common->mutex );
+
+ if (sanitizer->last != NULL && sanitizer->last->s.stop == AV_NOPTS_VALUE)
+ {
+ sanitizer->last->s.stop = sub->s.start;
+ }
+
+ if (sub->s.start == sub->s.stop)
+ {
+ // Used to indicate "clear" subtitles when the duration
+ // of subtitles is not encoded in the stream
+ hb_buffer_close(&sub);
+ }
+ if (sub != NULL)
+ {
+ if (sanitizer->last == NULL)
+ {
+ sanitizer->list_current = sanitizer->last = sub;
+ }
+ else
+ {
+ sanitizer->last->next = sub;
+ sanitizer->last = sub;
+ }
+ }
+ return mergeSubtitles(sanitizer, 0);
+}
+
 /***********************************************************************
 * syncVideoWork
 ***********************************************************************
@@ -273,7 +517,7 @@
 {
 pv->common->first_pts[0] = next->s.start;
 hb_lock( pv->common->mutex );
- while( pv->common->pts_offset == INT64_MIN )
+ while( pv->common->pts_offset == INT64_MIN && !*w->done )
 {
 // Full fifos will make us wait forever, so get the
 // pts offset from the available streams if full
@@ -337,12 +581,41 @@
 }
 }
 hb_lock( pv->common->mutex );
- // Tell the audio threads what must be dropped
- pv->common->audio_pts_thresh = next_start + pv->common->video_pts_slip;
+ if (job->frame_to_start > 0)
+ {
+ // When doing frame based p-to-p we must update the audio
+ // start point with each frame skipped.
+ //
+ // Tell the audio threads what must be dropped
+ pv->common->audio_pts_thresh = next->s.start;
+ }
 hb_cond_broadcast( pv->common->next_frame );
 hb_unlock( pv->common->mutex );
 
 UpdateSearchState( w, next_start );
+#ifdef USE_QSV
+ // reclaim QSV resources before dropping the buffer
+ // when decoding without QSV, the QSV atom will be NULL
+ if (job != NULL && job->qsv.ctx != NULL &&
+ next->qsv_details.qsv_atom != NULL)
+ {
+ av_qsv_stage *stage = av_qsv_get_last_stage(next->qsv_details.qsv_atom);
+ if (stage != NULL)
+ {
+ av_qsv_wait_on_sync(job->qsv.ctx, stage);
+ if (stage->out.sync->in_use > 0)
+ {
+ ff_qsv_atomic_dec(&stage->out.sync->in_use);
+ }
+ if (stage->out.p_surface->Data.Locked > 0)
+ {
+ ff_qsv_atomic_dec(&stage->out.p_surface->Data.Locked);
+ }
+ }
+ av_qsv_flush_stages(job->qsv.ctx->pipes,
+ &next->qsv_details.qsv_atom);
+ }
+#endif
 hb_buffer_close( &next );
 
 return HB_WORK_OK;
@@ -423,6 +696,10 @@
 for( i = 0; i < hb_list_count( job->list_subtitle ); i++)
 {
 subtitle = hb_list_item( job->list_subtitle, i );
+ // flush out any pending subtitle buffers in the sanitizer
+ hb_buffer_t *out = sanitizeSubtitle(pv, i, NULL);
+ if (out != NULL)
+ hb_fifo_push( subtitle->fifo_out, out );
 if( subtitle->config.dest == PASSTHRUSUB )
 {
 hb_fifo_push( subtitle->fifo_out, hb_buffer_init( 0 ) );
@@ -450,6 +727,10 @@
 for( i = 0; i < hb_list_count( job->list_subtitle ); i++)
 {
 subtitle = hb_list_item( job->list_subtitle, i );
+ // flush out any pending subtitle buffers in the sanitizer
+ hb_buffer_t *out = sanitizeSubtitle(pv, i, NULL);
+ if (out != NULL)
+ hb_fifo_push( subtitle->fifo_out, out );
 if( subtitle->config.dest == PASSTHRUSUB )
 {
 hb_fifo_push( subtitle->fifo_out, hb_buffer_init( 0 ) );
@@ -474,6 +755,10 @@
 for( i = 0; i < hb_list_count( job->list_subtitle ); i++)
 {
 subtitle = hb_list_item( job->list_subtitle, i );
+ // flush out any pending subtitle buffers in the sanitizer
+ hb_buffer_t *out = sanitizeSubtitle(pv, i, NULL);
+ if (out != NULL)
+ hb_fifo_push( subtitle->fifo_out, out );
 if( subtitle->config.dest == PASSTHRUSUB )
 {
 hb_fifo_push( subtitle->fifo_out, hb_buffer_init( 0 ) );
@@ -524,6 +809,31 @@
 // don't drop a chapter mark when we drop the buffer
 sync->chap_mark = next->s.new_chap;
 }
+
+#ifdef USE_QSV
+ // reclaim QSV resources before dropping the buffer
+ // when decoding without QSV, the QSV atom will be NULL
+ if (job != NULL && job->qsv.ctx != NULL &&
+ next->qsv_details.qsv_atom != NULL)
+ {
+ av_qsv_stage *stage = av_qsv_get_last_stage(next->qsv_details.qsv_atom);
+ if (stage != NULL)
+ {
+ av_qsv_wait_on_sync(job->qsv.ctx, stage);
+ if (stage->out.sync->in_use > 0)
+ {
+ ff_qsv_atomic_dec(&stage->out.sync->in_use);
+ }
+ if (stage->out.p_surface->Data.Locked > 0)
+ {
+ ff_qsv_atomic_dec(&stage->out.p_surface->Data.Locked);
+ }
+ }
+ av_qsv_flush_stages(job->qsv.ctx->pipes,
+ &next->qsv_details.qsv_atom);
+ }
+#endif
+
 hb_buffer_close( &next );
 return HB_WORK_OK;
 }
@@ -553,58 +863,25 @@
 
 for( i = 0; i < hb_list_count( job->list_subtitle ); i++)
 {
- int64_t sub_start, sub_stop, duration;
+ hb_buffer_t *out;
 
 subtitle = hb_list_item( job->list_subtitle, i );
 
 // Sanitize subtitle start and stop times, then pass to 
 // muxer or renderer filter.
- while ( ( sub = hb_fifo_see( subtitle->fifo_raw ) ) != NULL )
+ while ( ( sub = hb_fifo_get( subtitle->fifo_raw ) ) != NULL )
 {
- hb_lock( pv->common->mutex );
- sub_start = sub->s.start - pv->common->video_pts_slip;
- hb_unlock( pv->common->mutex );
-
- if (sub->s.stop == -1)
+ if (sub->size > 0)
 {
- if (subtitle->config.dest != RENDERSUB &&
- hb_fifo_size( subtitle->fifo_raw ) < 2)
- {
- // For passthru subs, we want to wait for the
- // next subtitle so that we can fill in the stop time.
- // This way the muxer can compute the duration of
- // the subtitle.
- //
- // For render subs, we need to ensure that they
- // get to the renderer before the associated video
- // that they are to be applied to. It is the 
- // responsibility of the renderer to handle
- // stop == -1.
- break;
- }
+ out = sanitizeSubtitle(pv, i, sub);
+ if (out != NULL)
+ hb_fifo_push( subtitle->fifo_out, out );
 }
-
- sub = hb_fifo_get( subtitle->fifo_raw );
- if ( sub->s.stop == -1 )
- {
- hb_buffer_t *next;
- next = hb_fifo_see( subtitle->fifo_raw );
- if (next != NULL)
- sub->s.stop = next->s.start;
- }
- // Need to re-write subtitle timestamps to account
- // for any slippage.
- sub_stop = -1;
- if ( sub->s.stop != -1 )
+ else
 {
- duration = sub->s.stop - sub->s.start;
- sub_stop = sub_start + duration;
+ // Push the end of stream marker
+ hb_fifo_push( subtitle->fifo_out, sub );
 }
-
- sub->s.start = sub_start;
- sub->s.stop = sub_stop;
-
- hb_fifo_push( subtitle->fifo_out, sub );
 }
 }
 
@@ -626,6 +903,8 @@
 sync->cur = cur = next;
 cur->sub = NULL;
 cur->s.start -= pv->common->video_pts_slip;
+ if (cur->s.renderOffset != AV_NOPTS_VALUE)
+ cur->s.renderOffset -= pv->common->video_pts_slip;
 cur->s.stop -= pv->common->video_pts_slip;
 sync->pts_skip = 0;
 if ( duration <= 0 )
@@ -741,7 +1020,7 @@
 {
 pv->common->first_pts[sync->index+1] = buf->s.start;
 hb_lock( pv->common->mutex );
- while( pv->common->pts_offset == INT64_MIN )
+ while( pv->common->pts_offset == INT64_MIN && !*w->done)
 {
 // Full fifos will make us wait forever, so get the
 // pts offset from the available streams if full
@@ -758,10 +1037,16 @@
 hb_unlock( pv->common->mutex );
 }
 
- /* Wait for start frame if doing point-to-point */
+ // Wait for start frame if doing point-to-point
+ //
+ // When doing p-to-p, video leads the way. The video thead will set
+ // start_found when we have reached the start point.
+ //
+ // When doing frame based p-to-p, as each video frame is processed
+ // it advances audio_pts_thresh which informs us how much audio must
+ // be dropped.
 hb_lock( pv->common->mutex );
- start = buf->s.start - pv->common->audio_pts_slip;
- while ( !pv->common->start_found )
+ while ( !pv->common->start_found && !*w->done )
 {
 if ( pv->common->audio_pts_thresh < 0 )
 {
@@ -776,8 +1061,14 @@
 hb_unlock( pv->common->mutex );
 return HB_WORK_OK;
 }
+
+ // We should only get here when doing frame based p-to-p.
+ // In frame based p-to-p, the video sync thread updates
+ // audio_pts_thresh as it discards frames. So wait here
+ // until the current audio frame needs to be discarded
+ // or start point is found.
 while ( !pv->common->start_found && 
- buf->s.start >= pv->common->audio_pts_thresh )
+ buf->s.start >= pv->common->audio_pts_thresh && !*w->done )
 {
 hb_cond_timedwait( pv->common->next_frame, pv->common->mutex, 10 );
 // There is an unfortunate unavoidable deadlock that can occur.
@@ -804,15 +1095,20 @@
 }
 }
 }
- start = buf->s.start - pv->common->audio_pts_slip;
 }
- if ( start < 0 )
+ start = buf->s.start - pv->common->audio_pts_slip;
+ hb_unlock( pv->common->mutex );
+
+ // When doing p-to-p, video determines when the start point has been
+ // found. Since audio and video are processed asynchronously, there
+ // may yet be audio packets in the pipe that are before the start point.
+ // These packets will have negative start times after applying
+ // audio_pts_slip.
+ if (start < 0)
 {
- hb_buffer_close( &buf );
- hb_unlock( pv->common->mutex );
+ hb_buffer_close(&buf);
 return HB_WORK_OK;
 }
- hb_unlock( pv->common->mutex );
 
 if( job->frame_to_stop && pv->common->count_frames >= job->frame_to_stop )
 {
@@ -955,7 +1251,7 @@
 } break;
 case HB_ACODEC_AAC_PASS:
 {
- codec = avcodec_find_encoder( AV_CODEC_ID_AAC );
+ codec = avcodec_find_encoder_by_name("aac");
 } break;
 default:
 {
@@ -1016,7 +1312,9 @@
 int ret = avcodec_encode_audio2( c, &pkt, &frame, &got_packet);
 if ( ret < 0 )
 {
- hb_log( "sync: avcodec_encode_audio failed" );
+ hb_log("sync: track %d, avcodec_encode_audio() failed, dropping video to sync",
+ w->audio->config.out.track);
+ sync->drop_video_to_sync = 1;
 break;
 }
 
@@ -1025,6 +1323,12 @@
 sync->silence_size = pkt.size;
 break;
 }
+ else if (ii + 1 == 10)
+ {
+ hb_log("sync: track %d, failed to get output packet, dropping video to sync",
+ w->audio->config.out.track);
+ sync->drop_video_to_sync = 1;
+ }
 }
 free( zeros );
 hb_avcodec_close( c );

HandBrake-0.9.9.tar.bz2/libhb/taskset.c -> HandBrake-0.10.0.tar.bz2/libhb/taskset.c Changed

HandBrake-0.9.9.tar.bz2/libhb/taskset.h -> HandBrake-0.10.0.tar.bz2/libhb/taskset.h Changed

HandBrake-0.9.9.tar.bz2/libhb/update.c -> HandBrake-0.10.0.tar.bz2/libhb/update.c Changed

HandBrake-0.10.0.tar.bz2/libhb/vadxva2.c Added

@@ -0,0 +1,776 @@
+/* vadxva2.c
+
+ Copyright (c) 2003-2014 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+
+ Authors: Peng Gao <peng@multicorewareinc.com> <http://www.multicorewareinc.com/>
+ Li Cao <li@multicorewareinc.com> <http://www.multicorewareinc.com/>
+
+ */
+
+#ifdef USE_HWD
+
+#include "vadxva2.h"
+#include "extras/cl.h"
+#include "oclnv12toyuv.h"
+
+static int hb_va_setup( hb_va_dxva2_t *dxva2, void **hw, int width, int height );
+static int hb_va_get( hb_va_dxva2_t *dxva2, AVFrame *frame );
+static int hb_d3d_create_device( hb_va_dxva2_t *dxva2 );
+static void hb_d3d_destroy_device( hb_va_dxva2_t *dxvva2 );
+static int hb_d3d_create_device_manager( hb_va_dxva2_t *dxva2 );
+static void hb_d3d_destroy_device_manager( hb_va_dxva2_t *dxva2 );
+static int hb_dx_create_video_service( hb_va_dxva2_t *dxva2 );
+static void hb_dx_destroy_video_service( hb_va_dxva2_t *dxva2 );
+static int hb_dx_find_video_service_conversion( hb_va_dxva2_t *dxva2, GUID *input, D3DFORMAT *output );
+static int hb_dx_create_video_decoder( hb_va_dxva2_t *dxva2, int codec_id, const hb_title_t* fmt );
+static void hb_dx_create_video_conversion( hb_va_dxva2_t *dxva2 );
+static const hb_d3d_format_t *hb_d3d_find_format( D3DFORMAT format );
+static const hb_dx_mode_t *hb_dx_find_mode( const GUID *guid );
+static void hb_dx_destroy_video_decoder( hb_va_dxva2_t *dxva2 );
+/**
+ * It destroys a Direct3D device manager
+ */
+static void hb_d3d_destroy_device_manager( hb_va_dxva2_t *dxva2 )
+{
+ if( dxva2->devmng )
+ IDirect3DDeviceManager9_Release( dxva2->devmng );
+}
+/**
+ * It releases a Direct3D device and its resources.
+ */
+static void hb_d3d_destroy_device( hb_va_dxva2_t *dxva2 )
+{
+ if( dxva2->d3ddev )
+ IDirect3DDevice9_Release( dxva2->d3ddev );
+ if( dxva2->d3dobj )
+ IDirect3D9_Release( dxva2->d3dobj );
+}
+/**
+ * It destroys a DirectX video service
+ */
+static void hb_dx_destroy_video_service( hb_va_dxva2_t *dxva2 )
+{
+ if( dxva2->device )
+ IDirect3DDeviceManager9_CloseDeviceHandle( dxva2->devmng, dxva2->device );
+
+ if( dxva2->vs )
+ IDirectXVideoDecoderService_Release( dxva2->vs );
+}
+
+static const hb_d3d_format_t *hb_d3d_find_format( D3DFORMAT format )
+{
+ unsigned i;
+ for( i = 0; d3d_formats[i].name; i++ )
+ {
+ if( d3d_formats[i].format == format )
+ return &d3d_formats[i];
+ }
+ return NULL;
+}
+
+static void hb_dx_create_video_conversion( hb_va_dxva2_t *dxva2 )
+{
+ switch( dxva2->render )
+ {
+ case MAKEFOURCC( 'N', 'V', '1', '2' ):
+ dxva2->output = MAKEFOURCC( 'Y', 'V', '1', '2' );
+ break;
+ default:
+ dxva2->output = dxva2->render;
+ break;
+ }
+}
+
+void hb_va_release( hb_va_dxva2_t *dxva2, AVFrame *frame )
+{
+ LPDIRECT3DSURFACE9 d3d = (LPDIRECT3DSURFACE9)(uintptr_t)frame->data[3];
+ unsigned i;
+ for( i = 0; i < dxva2->surface_count; i++ )
+ {
+ hb_va_surface_t *surface = &dxva2->surface[i];
+ if( surface->d3d == d3d )
+ surface->refcount--;
+ }
+}
+
+
+void hb_va_close( hb_va_dxva2_t *dxva2 )
+{
+ hb_dx_destroy_video_decoder( dxva2 );
+ hb_dx_destroy_video_service( dxva2 );
+ hb_d3d_destroy_device_manager( dxva2 );
+ hb_d3d_destroy_device( dxva2 );
+
+ if( dxva2->hdxva2_dll )
+ FreeLibrary( dxva2->hdxva2_dll );
+ if( dxva2->hd3d9_dll )
+ FreeLibrary( dxva2->hd3d9_dll );
+
+ if ( dxva2->nv12toyuv_tmp_in )
+ free( dxva2->nv12toyuv_tmp_in );
+ if ( dxva2->nv12toyuv_tmp_out )
+ free( dxva2->nv12toyuv_tmp_out );
+
+ dxva2->description = NULL;
+ free( dxva2 );
+}
+
+/**
+ * It creates a DXVA2 decoder using the given video format
+ */
+static int hb_dx_create_video_decoder( hb_va_dxva2_t *dxva2, int codec_id, const hb_title_t* fmt )
+{
+ dxva2->width = fmt->width;
+ dxva2->height = fmt->height;
+ dxva2->surface_width = (fmt->width + 15) & ~15;
+ dxva2->surface_height = (fmt->height + 15) & ~15;
+ switch( codec_id )
+ {
+ case AV_CODEC_ID_H264:
+ dxva2->surface_count = 16 + 1;
+ break;
+ default:
+ dxva2->surface_count = 2 + 1;
+ break;
+ }
+ LPDIRECT3DSURFACE9 surface_list[VA_DXVA2_MAX_SURFACE_COUNT];
+ if( FAILED( IDirectXVideoDecoderService_CreateSurface( dxva2->vs,
+ dxva2->surface_width,
+ dxva2->surface_height,
+ dxva2->surface_count - 1,
+ dxva2->render,
+ D3DPOOL_DEFAULT,
+ 0,
+ DXVA2_VideoDecoderRenderTarget,
+ surface_list, NULL )))
+ {
+ hb_log( "dxva2:IDirectXVideoAccelerationService_CreateSurface failed" );
+ dxva2->surface_count = 0;
+ return HB_WORK_ERROR;
+ }
+
+ unsigned i;
+ for( i = 0; i<dxva2->surface_count; i++ )
+ {
+ hb_va_surface_t *surface = &dxva2->surface[i];
+ surface->d3d = surface_list[i];
+ surface->refcount = 0;
+ surface->order = 0;
+ }
+ hb_log( "dxva2:CreateSurface succeed with %d, fmt (%dx%d) surfaces (%dx%d)", dxva2->surface_count,
+ fmt->width, fmt->height, dxva2->surface_width, dxva2->surface_height );
+ DXVA2_VideoDesc dsc;
+ memset( &dsc, 0, sizeof(dsc));
+ dsc.SampleWidth = fmt->width;
+ dsc.SampleHeight = fmt->height;
+ dsc.Format = dxva2->render;
+
+ if( fmt->rate> 0 && fmt->rate_base> 0 )
+ {
+ dsc.InputSampleFreq.Numerator = fmt->rate;
+ dsc.InputSampleFreq.Denominator = fmt->rate_base;
+ }
+ else
+ {
+ dsc.InputSampleFreq.Numerator = 0;
+ dsc.InputSampleFreq.Denominator = 0;
+ }
+
+ dsc.OutputFrameFreq = dsc.InputSampleFreq;
+ dsc.UABProtectionLevel = FALSE;
+ dsc.Reserved = 0;
+
+ /* FIXME I am unsure we can let unknown everywhere */
+ DXVA2_ExtendedFormat *ext = &dsc.SampleFormat;
+ ext->SampleFormat = 0; //DXVA2_SampleUnknown;
+ ext->VideoChromaSubsampling = 0; //DXVA2_VideoChromaSubsampling_Unknown;
+ ext->NominalRange = 0; //DXVA2_NominalRange_Unknown;
+ ext->VideoTransferMatrix = 0; //DXVA2_VideoTransferMatrix_Unknown;
+ ext->VideoLighting = 0; //DXVA2_VideoLighting_Unknown;
+ ext->VideoPrimaries = 0; //DXVA2_VideoPrimaries_Unknown;
+ ext->VideoTransferFunction = 0; //DXVA2_VideoTransFunc_Unknown;
+
+ /* List all configurations available for the decoder */
+ UINT cfg_count = 0;
+ DXVA2_ConfigPictureDecode *cfg_list = NULL;
+ if( FAILED( IDirectXVideoDecoderService_GetDecoderConfigurations( dxva2->vs, &dxva2->input, &dsc, NULL, &cfg_count, &cfg_list )))
+ {
+ hb_log( "dxva2:IDirectXVideoDecoderService_GetDecoderConfigurations failed" );
+ return HB_WORK_ERROR;
+ }
+ hb_log( "dxva2:we got %d decoder configurations", cfg_count );
+
+ /* Select the best decoder configuration */
+ int cfg_score = 0;
+ for( i = 0; i < cfg_count; i++ )
+ {
+ const DXVA2_ConfigPictureDecode *cfg = &cfg_list[i];
+ hb_log( "dxva2:configuration[%d] ConfigBitstreamRaw %d", i, cfg->ConfigBitstreamRaw );
+ int score;
+ if( cfg->ConfigBitstreamRaw == 1 )
+ score = 1;
+ else if( codec_id == AV_CODEC_ID_H264 && cfg->ConfigBitstreamRaw == 2 )
+ score = 2;
+ else
+ continue;
+ if( IsEqualGUID( &cfg->guidConfigBitstreamEncryption, &DXVA_NoEncrypt ))
+ score += 16;
+ if( cfg_score < score )
+ {
+ dxva2->cfg = *cfg;
+ cfg_score = score;
+ }
+ }
+ //my_release(cfg_list);
+ if( cfg_score <= 0 )
+ {
+ hb_log( "dxva2:Failed to find a supported decoder configuration" );
+ return HB_WORK_ERROR;
+ }
+
+ /* Create the decoder */
+ IDirectXVideoDecoder *decoder;
+ if( FAILED( IDirectXVideoDecoderService_CreateVideoDecoder( dxva2->vs, &dxva2->input, &dsc, &dxva2->cfg, surface_list, dxva2->surface_count, &decoder )))
+ {
+ hb_log( "dxva2:IDirectXVideoDecoderService_CreateVideoDecoder failed" );
+ return HB_WORK_ERROR;
+ }
+ dxva2->decoder = decoder;
+ hb_log( "dxva2:IDirectXVideoDecoderService_CreateVideoDecoder succeed" );
+ return HB_WORK_OK;
+}
+
+typedef HWND (WINAPI *PROCGETSHELLWND)();
+/**
+ * It creates a DirectX video service
+ */
+static int hb_d3d_create_device( hb_va_dxva2_t *dxva2 )
+{
+ LPDIRECT3D9 (WINAPI *Create9)( UINT SDKVersion );
+ Create9 = (void*)GetProcAddress( dxva2->hd3d9_dll, TEXT( "Direct3DCreate9" ));
+ if( !Create9 )
+ {
+ hb_log( "dxva2:Cannot locate reference to Direct3DCreate9 ABI in DLL" );
+ return HB_WORK_ERROR;
+ }
+ LPDIRECT3D9 d3dobj;
+ d3dobj = Create9( D3D_SDK_VERSION );
+ if( !d3dobj )
+ {
+ hb_log( "dxva2:Direct3DCreate9 failed" );
+ return HB_WORK_ERROR;
+ }
+ dxva2->d3dobj = d3dobj;
+ D3DADAPTER_IDENTIFIER9 *d3dai = &dxva2->d3dai;
+ if( FAILED( IDirect3D9_GetAdapterIdentifier( dxva2->d3dobj, D3DADAPTER_DEFAULT, 0, d3dai )))
+ {
+ hb_log( "dxva2:IDirect3D9_GetAdapterIdentifier failed" );
+ memset( d3dai, 0, sizeof(*d3dai));
+ }
+
+ PROCGETSHELLWND GetShellWindow;
+ HMODULE hUser32 = GetModuleHandle( "user32" );
+ GetShellWindow = (PROCGETSHELLWND)
+ GetProcAddress( hUser32, "GetShellWindow" );
+
+ D3DPRESENT_PARAMETERS *d3dpp = &dxva2->d3dpp;
+ memset( d3dpp, 0, sizeof(*d3dpp));
+ d3dpp->Flags = D3DPRESENTFLAG_VIDEO;
+ d3dpp->Windowed = TRUE;
+ d3dpp->hDeviceWindow = NULL;
+ d3dpp->SwapEffect = D3DSWAPEFFECT_DISCARD;
+ d3dpp->MultiSampleType = D3DMULTISAMPLE_NONE;
+ d3dpp->PresentationInterval = D3DPRESENT_INTERVAL_DEFAULT;
+ d3dpp->BackBufferCount = 0; /* FIXME what to put here */
+ d3dpp->BackBufferFormat = D3DFMT_X8R8G8B8; /* FIXME what to put here */
+ d3dpp->BackBufferWidth = 0;
+ d3dpp->BackBufferHeight = 0;
+ d3dpp->EnableAutoDepthStencil = FALSE;
+
+ LPDIRECT3DDEVICE9 d3ddev;
+ //if (FAILED(IDirect3D9_CreateDevice(d3dobj, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, GetShellWindow(), D3DCREATE_SOFTWARE_VERTEXPROCESSING|D3DCREATE_MULTITHREADED, d3dpp, &d3ddev)))
+ if( FAILED( IDirect3D9_CreateDevice( d3dobj,
+ D3DADAPTER_DEFAULT,
+ D3DDEVTYPE_HAL,
+ GetShellWindow(),
+ D3DCREATE_HARDWARE_VERTEXPROCESSING|D3DCREATE_MULTITHREADED,
+ d3dpp,
+ &d3ddev )))
+ {
+ hb_log( "dxva2:IDirect3D9_CreateDevice failed" );
+ return HB_WORK_ERROR;
+ }
+ dxva2->d3ddev = d3ddev;
+
+ return HB_WORK_OK;
+}
+/**
+ * It creates a Direct3D device manager
+ */
+static int hb_d3d_create_device_manager( hb_va_dxva2_t *dxva2 )
+{
+ HRESULT(WINAPI *CreateDeviceManager9)( UINT *pResetToken, IDirect3DDeviceManager9 ** );
+ CreateDeviceManager9 = (void*)GetProcAddress( dxva2->hdxva2_dll, TEXT( "DXVA2CreateDirect3DDeviceManager9" ));
+
+ if( !CreateDeviceManager9 )
+ {
+ hb_log( "dxva2:cannot load function" );
+ return HB_WORK_ERROR;
+ }
+
+ UINT token;
+ IDirect3DDeviceManager9 *devmng;
+ if( FAILED( CreateDeviceManager9( &token, &devmng )))
+ {
+ hb_log( "dxva2:OurDirect3DCreateDeviceManager9 failed" );
+ return HB_WORK_ERROR;
+ }
+ dxva2->token = token;
+ dxva2->devmng = devmng;
+
+ long hr = IDirect3DDeviceManager9_ResetDevice( devmng, dxva2->d3ddev, token );
+ if( FAILED( hr ))
+ {
+ hb_log( "dxva2:IDirect3DDeviceManager9_ResetDevice failed: %08x", (unsigned)hr );
+ return HB_WORK_ERROR;
+ }
+ return HB_WORK_OK;
+}
+/**
+ * It creates a DirectX video service
+ */
+static int hb_dx_create_video_service( hb_va_dxva2_t *dxva2 )
+{
+ HRESULT (WINAPI *CreateVideoService)( IDirect3DDevice9 *, REFIID riid, void **ppService );
+ CreateVideoService = (void*)GetProcAddress( dxva2->hdxva2_dll, TEXT( "DXVA2CreateVideoService" ));
+
+ if( !CreateVideoService )
+ {
+ hb_log( "dxva2:cannot load function" );
+ return HB_WORK_ERROR;
+ }
+
+ HRESULT hr;
+
+ HANDLE device;
+ hr = IDirect3DDeviceManager9_OpenDeviceHandle( dxva2->devmng, &device );
+ if( FAILED( hr ))
+ {
+ hb_log( "dxva2:OpenDeviceHandle failed" );
+ return HB_WORK_ERROR;
+ }
+ dxva2->device = device;
+
+ IDirectXVideoDecoderService *vs;
+ hr = IDirect3DDeviceManager9_GetVideoService( dxva2->devmng, device, &IID_IDirectXVideoDecoderService, (void*)&vs );
+ if( FAILED( hr ))
+ {
+ hb_log( "dxva2:GetVideoService failed" );
+ return HB_WORK_ERROR;
+ }
+ dxva2->vs = vs;
+
+ return HB_WORK_OK;
+}
+/**
+ * Find the best suited decoder mode GUID and render format.
+ */
+static int hb_dx_find_video_service_conversion( hb_va_dxva2_t *dxva2, GUID *input, D3DFORMAT *output )
+{
+ unsigned int input_count = 0;
+ GUID *input_list = NULL;
+ if( FAILED( IDirectXVideoDecoderService_GetDecoderDeviceGuids( dxva2->vs, &input_count, &input_list )))
+ {
+ hb_log( "dxva2:IDirectXVideoDecoderService_GetDecoderDeviceGuids failed" );
+ return HB_WORK_ERROR;
+ }
+ unsigned i, j;
+ for( i = 0; i < input_count; i++ )
+ {
+ const GUID *g = &input_list[i];
+ const hb_dx_mode_t *mode = hb_dx_find_mode( g );
+ }
+
+ for( i = 0; dxva2_modes[i].name; i++ )
+ {
+ const hb_dx_mode_t *mode = &dxva2_modes[i];
+ if( !mode->codec || mode->codec != dxva2->codec_id )
+ continue;
+
+ int is_suported = 0;
+ const GUID *g;
+ for( g = &input_list[0]; !is_suported && g < &input_list[input_count]; g++ )
+ {
+ is_suported = IsEqualGUID( mode->guid, g );
+ }
+ if( !is_suported )
+ continue;
+
+ unsigned int output_count = 0;
+ D3DFORMAT *output_list = NULL;
+ if( FAILED( IDirectXVideoDecoderService_GetDecoderRenderTargets( dxva2->vs, mode->guid, &output_count, &output_list )))
+ {
+ hb_log( "dxva2:IDirectXVideoDecoderService_GetDecoderRenderTargets failed" );
+ continue;
+ }
+ for( j = 0; j < output_count; j++ )
+ {
+ const D3DFORMAT f = output_list[j];
+ const hb_d3d_format_t *format = hb_d3d_find_format( f );
+ if( format )
+ {
+ //hb_log( "dxva2:%s is supported for output", format->name );
+ }
+ else
+ {
+ hb_log( "dxvar2:%d is supported for output (%4.4s)", f, (const char*)&f );
+ }
+ }
+
+ for( j = 0; d3d_formats[j].name; j++ )
+ {
+ const hb_d3d_format_t *format = &d3d_formats[j];
+ int is_suported = 0;
+ unsigned k;
+ for( k = 0; !is_suported && k < output_count; k++ )
+ {
+ is_suported = format->format == output_list[k];
+ }
+ if( !is_suported )
+ continue;
+ *input = *mode->guid;
+ *output = format->format;
+ return HB_WORK_OK;
+ }
+ }
+ return HB_WORK_ERROR;
+}
+static const hb_dx_mode_t *hb_dx_find_mode( const GUID *guid )
+{
+ unsigned i;
+ for( i = 0; dxva2_modes[i].name; i++ )
+ {
+ if( IsEqualGUID( dxva2_modes[i].guid, guid ))
+ return &dxva2_modes[i];
+ }
+ return NULL;
+}
+
+
+static void hb_dx_destroy_video_decoder( hb_va_dxva2_t *dxva2 )
+{
+ if( dxva2->decoder )
+ IDirectXVideoDecoder_Release( dxva2->decoder );
+ dxva2->decoder = NULL;
+
+ unsigned i;
+ for( i = 0; i<dxva2->surface_count; i++ )
+ IDirect3DSurface9_Release( dxva2->surface[i].d3d );
+ dxva2->surface_count = 0;
+}
+/**
+ * setup dxva2
+*/
+static int hb_va_setup( hb_va_dxva2_t *dxva2, void **hw, int width, int height )
+{
+ if( dxva2->width == width && dxva2->height == height && dxva2->decoder )
+ goto ok;
+
+ hb_dx_destroy_video_decoder( dxva2 );
+ *hw = NULL;
+ dxva2->i_chroma = 0;
+
+ if( width <= 0 || height <= 0 ) 
+ return HB_WORK_ERROR;
+
+ hb_title_t fmt;
+ memset( &fmt, 0, sizeof(fmt));
+ fmt.width = width;
+ fmt.height = height;
+
+ if( hb_dx_create_video_decoder( dxva2, dxva2->codec_id, &fmt ) == HB_WORK_ERROR )
+ return HB_WORK_ERROR;
+ dxva2->hw.decoder = dxva2->decoder;
+ dxva2->hw.cfg = &dxva2->cfg;
+ dxva2->hw.surface_count = dxva2->surface_count;
+ dxva2->hw.surface = dxva2->hw_surface;
+
+ unsigned i;
+ for( i = 0; i < dxva2->surface_count; i++ )
+ dxva2->hw.surface[i] = dxva2->surface[i].d3d;
+
+ hb_dx_create_video_conversion( dxva2 );
+
+ok:
+ *hw = &dxva2->hw;
+ const hb_d3d_format_t *output = hb_d3d_find_format( dxva2->output );
+ dxva2->i_chroma = output->codec;
+ return HB_WORK_OK;
+
+}
+
+static int hb_va_get( hb_va_dxva2_t *dxva2, AVFrame *frame )
+{
+ unsigned i, old;
+ for( i = 0, old = 0; i < dxva2->surface_count; i++ )
+ {
+ hb_va_surface_t *surface = &dxva2->surface[i];
+ if( !surface->refcount )
+ break;
+ if( surface->order < dxva2->surface[old].order )
+ old = i;
+ }
+ if( i >= dxva2->surface_count )
+ i = old;
+
+ hb_va_surface_t *surface = &dxva2->surface[i];
+
+ surface->refcount = 1;
+ surface->order = dxva2->surface_order++;
+
+ for( i = 0; i < 4; i++ )
+ {
+ frame->data[i] = NULL;
+ frame->linesize[i] = 0;
+ if( i == 0 || i == 3 )
+ frame->data[i] = (void*)surface->d3d;
+ }
+ return HB_WORK_OK;
+}
+/**
+ * nv12 to yuv of c reference
+ */
+static void hb_copy_from_nv12( uint8_t *dst, uint8_t *src[2], size_t src_pitch[2], unsigned width, unsigned height )
+{
+ unsigned int i, j;
+ uint8_t *dstU, *dstV;
+ dstU = dst + width*height;
+ dstV = dstU + width*height/4;
+ unsigned int heithtUV, widthUV;
+ heithtUV = height/2;
+ widthUV = width/2;
+
+ for( i = 0; i < height; i++ ) //Y
+ {
+ memcpy( dst + i * width, src[0] + i * src_pitch[0], width );
+ }
+ for( i = 0; i < heithtUV; i++ )
+ {
+ for( j = 0; j < widthUV; j++ )
+ {
+ dstU[i * widthUV + j] = *(src[1] + i * src_pitch[1] + 2 * j);
+ dstV[i *widthUV + j] = *(src[1] + i * src_pitch[1] + 2 * j + 1);
+ }
+ }
+}
+
+/**
+ * lock frame data form surface.
+ * nv12 to yuv with opencl and with C reference
+ * scale with opencl
+ */
+int hb_va_extract( hb_va_dxva2_t *dxva2, uint8_t *dst, AVFrame *frame, int job_w, int job_h, int *crop, hb_oclscale_t *os, int use_opencl, int use_decomb, int use_detelecine )
+
+{
+ LPDIRECT3DSURFACE9 d3d = (LPDIRECT3DSURFACE9)(uintptr_t)frame->data[3];
+ D3DLOCKED_RECT lock;
+ if( FAILED( IDirect3DSurface9_LockRect( d3d, &lock, NULL, D3DLOCK_READONLY )))
+ {
+ hb_log( "dxva2:Failed to lock surface" );
+ return HB_WORK_ERROR;
+ }
+
+ if( dxva2->render == MAKEFOURCC( 'N', 'V', '1', '2' ))
+ {
+ uint8_t *plane[2] =
+ {
+ lock.pBits,
+ (uint8_t*)lock.pBits + lock.Pitch * dxva2->surface_height
+ };
+ size_t pitch[2] =
+ {
+ lock.Pitch,
+ lock.Pitch,
+ };
+
+ hb_copy_from_nv12( dst, plane, pitch, dxva2->width, dxva2->height );
+ }
+ IDirect3DSurface9_UnlockRect( d3d );
+ return HB_WORK_OK;
+}
+
+/**
+ * create dxva2 service
+ * load library D3D9.dll
+ */
+hb_va_dxva2_t * hb_va_create_dxva2( hb_va_dxva2_t *dxva2, int codec_id )
+{
+ if( dxva2 )
+ {
+ hb_va_close( dxva2 );
+ dxva2 = NULL;
+ }
+
+ hb_va_dxva2_t *dxva = calloc( 1, sizeof(*dxva) );
+ if( !dxva ) return NULL;
+ dxva->codec_id = codec_id;
+
+ dxva->hd3d9_dll = LoadLibrary( TEXT( "D3D9.DLL" ) );
+ if( !dxva->hd3d9_dll )
+ {
+ hb_log( "dxva2:cannot load d3d9.dll" );
+ goto error;
+ }
+ dxva->hdxva2_dll = LoadLibrary( TEXT( "DXVA2.DLL" ) );
+ if( !dxva->hdxva2_dll )
+ {
+ hb_log( "dxva2:cannot load DXVA2.dll" );
+ goto error;
+ }
+
+ if( hb_d3d_create_device( dxva ) == HB_WORK_ERROR )
+ {
+ hb_log( "dxva2:Failed to create Direct3D device" );
+ goto error;
+ }
+
+ if( hb_d3d_create_device_manager( dxva ) == HB_WORK_ERROR )
+ {
+ hb_log( "dxva2:D3dCreateDeviceManager failed" );
+ goto error;
+ }
+
+
+ if( hb_dx_create_video_service( dxva ) == HB_WORK_ERROR )
+ {
+ hb_log( "dxva2:DxCreateVideoService failed" );
+ goto error;
+ }
+
+ if( hb_dx_find_video_service_conversion( dxva, &dxva->input, &dxva->render ) == HB_WORK_ERROR )
+ {
+ hb_log( "dxva2:DxFindVideoServiceConversion failed" );
+ goto error;
+ }
+
+ dxva->do_job = HB_WORK_OK;
+ dxva->description = "DXVA2";
+
+ return dxva;
+
+error:
+ hb_va_close( dxva );
+ return NULL;
+}
+
+void hb_va_new_dxva2( hb_va_dxva2_t *dxva2, AVCodecContext *p_context )
+{
+ if( p_context->width > 0 && p_context->height > 0 )
+ {
+ if( hb_va_setup( dxva2, &p_context->hwaccel_context, p_context->width, p_context->height ) == HB_WORK_ERROR )
+ {
+ hb_log( "dxva2:hb_va_Setup failed" );
+ hb_va_close( dxva2 );
+ dxva2 = NULL;
+ }
+ }
+ if( dxva2 )
+ {
+ dxva2->input_pts[0] = 0;
+ dxva2->input_pts[1] = 0;
+ if( dxva2->description )
+ hb_log( "dxva2:Using %s for hardware decoding", dxva2->description );
+ p_context->draw_horiz_band = NULL;
+ }
+
+}
+
+char* hb_get_pix_fmt_name( int pix_fmt )
+{
+ static const char *ppsz_name[AV_PIX_FMT_NB] =
+ {
+ [AV_PIX_FMT_VDPAU_H264] = "AV_PIX_FMT_VDPAU_H264",
+ [AV_PIX_FMT_VAAPI_IDCT] = "AV_PIX_FMT_VAAPI_IDCT",
+ [AV_PIX_FMT_VAAPI_VLD] = "AV_PIX_FMT_VAAPI_VLD",
+ [AV_PIX_FMT_VAAPI_MOCO] = "AV_PIX_FMT_VAAPI_MOCO",
+ [AV_PIX_FMT_DXVA2_VLD] = "AV_PIX_FMT_DXVA2_VLD",
+ [AV_PIX_FMT_YUYV422] = "AV_PIX_FMT_YUYV422",
+ [AV_PIX_FMT_YUV420P] = "AV_PIX_FMT_YUV420P",
+ };
+
+ return ppsz_name[pix_fmt];
+}
+
+enum PixelFormat hb_ffmpeg_get_format( AVCodecContext *p_context, const enum PixelFormat *pi_fmt )
+{
+ int i;
+ for( i = 0; pi_fmt[i] != AV_PIX_FMT_NONE; i++ )
+ {
+ hb_log( "dxva2:Available decoder output format %d (%s)", pi_fmt[i], hb_get_pix_fmt_name(pi_fmt[i]) ? : "Unknown" );
+ if( pi_fmt[i] == AV_PIX_FMT_DXVA2_VLD )
+ {
+ return pi_fmt[i];
+ }
+ }
+ return avcodec_default_get_format( p_context, pi_fmt );
+}
+
+int hb_va_get_frame_buf( hb_va_dxva2_t *dxva2, AVCodecContext *p_context, AVFrame *frame )
+{
+ frame->type = FF_BUFFER_TYPE_USER;
+ if( hb_va_get( dxva2, frame ) == HB_WORK_ERROR )
+ {
+ hb_log( "VaGrabSurface failed" );
+ return HB_WORK_ERROR;
+ }
+ return HB_WORK_OK;
+
+}
+
+int hb_check_hwd_fmt( int fmt )
+{
+ int result = 1;
+ switch ( fmt )
+ {
+ case AV_PIX_FMT_YUV420P16LE:
+ case AV_PIX_FMT_YUV420P16BE:
+ case AV_PIX_FMT_YUV422P16LE:
+ case AV_PIX_FMT_YUV422P16BE:
+ case AV_PIX_FMT_YUV444P16LE:
+ case AV_PIX_FMT_YUV444P16BE:
+ case AV_PIX_FMT_YUV420P9BE:
+ case AV_PIX_FMT_YUV420P9LE:
+ case AV_PIX_FMT_YUV420P10BE:
+ case AV_PIX_FMT_YUV420P10LE:
+ case AV_PIX_FMT_YUV422P10BE:
+ case AV_PIX_FMT_YUV422P10LE:
+ case AV_PIX_FMT_YUV444P9BE:
+ case AV_PIX_FMT_YUV444P9LE:
+ case AV_PIX_FMT_YUV444P10BE:
+ case AV_PIX_FMT_YUV444P10LE:
+ case AV_PIX_FMT_YUV422P9BE:
+ case AV_PIX_FMT_YUV422P9LE:
+ case AV_PIX_FMT_GBRP9BE:
+ case AV_PIX_FMT_GBRP9LE:
+ case AV_PIX_FMT_GBRP10BE:
+ case AV_PIX_FMT_GBRP10LE:
+ case AV_PIX_FMT_GBRP16BE:
+ case AV_PIX_FMT_GBRP16LE:
+ case AV_PIX_FMT_YUVA420P9BE:
+ case AV_PIX_FMT_YUVA420P9LE:
+ case AV_PIX_FMT_YUVA422P9BE:
+ case AV_PIX_FMT_YUVA422P9LE:
+ case AV_PIX_FMT_YUVA444P9BE:
+ case AV_PIX_FMT_YUVA444P9LE:
+ case AV_PIX_FMT_YUVA420P10BE:
+ case AV_PIX_FMT_YUVA420P10LE:
+ result = 0; 
+ }
+ return result;
+}
+
+#endif // USE_HWD

HandBrake-0.10.0.tar.bz2/libhb/vadxva2.h Added

@@ -0,0 +1,214 @@
+/* vadxva2.h
+
+ Copyright (c) 2003-2014 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+
+ Authors: Peng Gao <peng@multicorewareinc.com> <http://www.multicorewareinc.com/>
+ Li Cao <li@multicorewareinc.com> <http://www.multicorewareinc.com/>
+
+ */
+
+#ifdef USE_HWD
+
+#ifndef HB_VA_DXVA2_H
+#define HB_VA_DXVA2_H
+
+#include "hbffmpeg.h"
+#include "d3d9.h"
+#include "libavcodec/dxva2.h"
+#include "dxva2api.h"
+#include "common.h"
+#include "opencl.h"
+#include "openclwrapper.h"
+
+#define HB_FOURCC( a, b, c, d ) ( ((uint32_t)a) | ( ((uint32_t)b) << 8 ) | ( ((uint32_t)c) << 16 ) | ( ((uint32_t)d) << 24 ) )
+#define MAKEFOURCC( a, b, c, d ) ((DWORD)(BYTE)(a) | ((DWORD)(BYTE)(b) << 8) | ((DWORD)(BYTE)(c) << 16) | ((DWORD)(BYTE)(d) << 24 ))
+#define HB_CODEC_YV12 HB_FOURCC( 'Y', 'V', '1', '2' )
+#define HB_CODEC_NV12 HB_FOURCC( 'N', 'V', '1', '2' )
+#define DXVA2_E_NOT_INITIALIZED MAKE_HRESULT( 1, 4, 4096 )
+#define DXVA2_E_NEW_VIDEO_DEVICE MAKE_HRESULT( 1, 4, 4097 )
+#define DXVA2_E_VIDEO_DEVICE_LOCKED MAKE_HRESULT( 1, 4, 4098 )
+#define DXVA2_E_NOT_AVAILABLE MAKE_HRESULT( 1, 4, 4099 )
+#define VA_DXVA2_MAX_SURFACE_COUNT (64)
+
+static const GUID DXVA_NoEncrypt = { 0x1b81bed0, 0xa0c7, 0x11d3, {0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5} };
+static const GUID IID_IDirectXVideoDecoderService = {0xfc51a551, 0xd5e7, 0x11d9, {0xaf, 0x55, 0x00, 0x05, 0x4e, 0x43, 0xff, 0x02}};
+static const GUID DXVA2_ModeMPEG2_MoComp = { 0xe6a9f44b, 0x61b0, 0x4563, {0x9e, 0xa4, 0x63, 0xd2, 0xa3, 0xc6, 0xfe, 0x66} };
+static const GUID DXVA2_ModeMPEG2_IDCT = { 0xbf22ad00, 0x03ea, 0x4690, {0x80, 0x77, 0x47, 0x33, 0x46, 0x20, 0x9b, 0x7e} };
+static const GUID DXVA2_ModeMPEG2_VLD = { 0xee27417f, 0x5e28, 0x4e65, {0xbe, 0xea, 0x1d, 0x26, 0xb5, 0x08, 0xad, 0xc9} };
+static const GUID DXVA2_ModeH264_A = { 0x1b81be64, 0xa0c7, 0x11d3, {0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5} };
+static const GUID DXVA2_ModeH264_B = { 0x1b81be65, 0xa0c7, 0x11d3, {0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5} };
+static const GUID DXVA2_ModeH264_C = { 0x1b81be66, 0xa0c7, 0x11d3, {0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5} };
+static const GUID DXVA2_ModeH264_D = { 0x1b81be67, 0xa0c7, 0x11d3, {0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5} };
+static const GUID DXVA2_ModeH264_E = { 0x1b81be68, 0xa0c7, 0x11d3, {0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5} };
+static const GUID DXVA2_ModeH264_F = { 0x1b81be69, 0xa0c7, 0x11d3, {0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5} };
+static const GUID DXVADDI_Intel_ModeH264_A = { 0x604F8E64, 0x4951, 0x4c54, {0x88, 0xFE, 0xAB, 0xD2, 0x5C, 0x15, 0xB3, 0xD6} };
+static const GUID DXVADDI_Intel_ModeH264_C = { 0x604F8E66, 0x4951, 0x4c54, {0x88, 0xFE, 0xAB, 0xD2, 0x5C, 0x15, 0xB3, 0xD6} };
+static const GUID DXVADDI_Intel_ModeH264_E = { 0x604F8E68, 0x4951, 0x4c54, {0x88, 0xFE, 0xAB, 0xD2, 0x5C, 0x15, 0xB3, 0xD6} };
+static const GUID DXVA2_ModeWMV8_A = { 0x1b81be80, 0xa0c7, 0x11d3, {0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5} };
+static const GUID DXVA2_ModeWMV8_B = { 0x1b81be81, 0xa0c7, 0x11d3, {0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5} };
+static const GUID DXVA2_ModeWMV9_A = { 0x1b81be90, 0xa0c7, 0x11d3, {0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5} };
+static const GUID DXVA2_ModeWMV9_B = { 0x1b81be91, 0xa0c7, 0x11d3, {0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5} };
+static const GUID DXVA2_ModeWMV9_C = { 0x1b81be94, 0xa0c7, 0x11d3, {0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5} };
+static const GUID DXVA2_ModeVC1_A = { 0x1b81beA0, 0xa0c7, 0x11d3, {0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5} };
+static const GUID DXVA2_ModeVC1_B = { 0x1b81beA1, 0xa0c7, 0x11d3, {0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5} };
+static const GUID DXVA2_ModeVC1_C = { 0x1b81beA2, 0xa0c7, 0x11d3, {0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5} };
+static const GUID DXVA2_ModeVC1_D = { 0x1b81beA3, 0xa0c7, 0x11d3, {0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5} };
+
+typedef struct
+{
+ int width;
+ int height;
+ int rate;
+ int rate_base;
+
+}hb_dx_format;
+
+typedef struct
+{
+ LPDIRECT3DSURFACE9 d3d;
+ int refcount;
+ unsigned int order;
+
+} hb_va_surface_t;
+
+typedef struct
+{
+ uint8_t *base;
+ uint8_t *buffer;
+ size_t size;
+
+} hb_copy_cache_t;
+
+typedef struct
+{
+ const char *name;
+ D3DFORMAT format;
+ uint32_t codec;
+
+} hb_d3d_format_t;
+
+typedef struct
+{
+ const char *name;
+ const GUID *guid;
+ int codec;
+} hb_dx_mode_t;
+
+typedef struct
+{
+ char *description;
+ int codec_id;
+ uint32_t i_chroma;
+ int width;
+ int height;
+ HINSTANCE hd3d9_dll;
+ HINSTANCE hdxva2_dll;
+ D3DPRESENT_PARAMETERS d3dpp;
+ LPDIRECT3D9 d3dobj;
+ D3DADAPTER_IDENTIFIER9 d3dai;
+ LPDIRECT3DDEVICE9 d3ddev;
+ UINT token;
+ IDirect3DDeviceManager9 *devmng;
+ HANDLE device;
+ IDirectXVideoDecoderService *vs;
+ GUID input;
+ D3DFORMAT render;
+ DXVA2_ConfigPictureDecode cfg;
+ IDirectXVideoDecoder *decoder;
+ D3DFORMAT output;
+ struct dxva_context hw;
+ unsigned surface_count;
+ unsigned surface_order;
+ int surface_width;
+ int surface_height;
+ uint32_t surface_chroma;
+ hb_va_surface_t surface[VA_DXVA2_MAX_SURFACE_COUNT];
+ LPDIRECT3DSURFACE9 hw_surface[VA_DXVA2_MAX_SURFACE_COUNT];
+ IDirectXVideoProcessorService *ps;
+ IDirectXVideoProcessor *vp;
+ int64_t input_pts[2];
+ int64_t input_dts;
+ int do_job;
+
+ // running nv12toyuv kernel.
+ cl_kernel nv12toyuv;
+ cl_mem cl_mem_nv12;
+ cl_mem cl_mem_yuv;
+ uint8_t * nv12toyuv_tmp_in;
+ uint8_t * nv12toyuv_tmp_out;
+} hb_va_dxva2_t;
+
+typedef struct FilterLink_T
+{
+ cl_mem cl_inbuf;
+ cl_mem cl_outbuf;
+
+ uint8_t *mem_inbuf;
+ uint8_t *mem_outbuf;
+ int width;
+ int height;
+ int linesizeY;
+ int linesizeUV;
+ int inmemdataflag;
+ int outmemdataflag;
+ int incldataflag;
+ int outcldataflag;
+ int framenum;
+ int outputSize; 
+} T_FilterLink;
+
+static const hb_d3d_format_t d3d_formats[] =
+{
+ { "YV12", MAKEFOURCC( 'Y', 'V', '1', '2' ), HB_CODEC_YV12 },
+ { "NV12", MAKEFOURCC( 'N', 'V', '1', '2' ), HB_CODEC_NV12 },
+ { NULL, 0, 0 }
+};
+
+static const hb_dx_mode_t dxva2_modes[] =
+{
+ { "DXVA2_ModeMPEG2_VLD", &DXVA2_ModeMPEG2_VLD, AV_CODEC_ID_MPEG2VIDEO },
+ { "DXVA2_ModeMPEG2_MoComp", &DXVA2_ModeMPEG2_MoComp, 0 },
+ { "DXVA2_ModeMPEG2_IDCT", &DXVA2_ModeMPEG2_IDCT, 0 },
+
+ { "H.264 variable-length decoder (VLD), FGT", &DXVA2_ModeH264_F, AV_CODEC_ID_H264 },
+ { "H.264 VLD, no FGT", &DXVA2_ModeH264_E, AV_CODEC_ID_H264 },
+ { "H.264 VLD, no FGT (Intel)", &DXVADDI_Intel_ModeH264_E, AV_CODEC_ID_H264 },
+ { "H.264 IDCT, FGT", &DXVA2_ModeH264_D, 0 },
+ { "H.264 inverse discrete cosine transform (IDCT), no FGT", &DXVA2_ModeH264_C, 0 },
+ { "H.264 inverse discrete cosine transform (IDCT), no FGT (Intel)", &DXVADDI_Intel_ModeH264_C, 0 },
+ { "H.264 MoComp, FGT", &DXVA2_ModeH264_B, 0 },
+ { "H.264 motion compensation (MoComp), no FGT", &DXVA2_ModeH264_A, 0 },
+ { "H.264 motion compensation (MoComp), no FGT (Intel)", &DXVADDI_Intel_ModeH264_A, 0 },
+
+ { "Windows Media Video 8 MoComp", &DXVA2_ModeWMV8_B, 0 },
+ { "Windows Media Video 8 post processing", &DXVA2_ModeWMV8_A, 0 },
+
+ { "Windows Media Video 9 IDCT", &DXVA2_ModeWMV9_C, 0 },
+ { "Windows Media Video 9 MoComp", &DXVA2_ModeWMV9_B, 0 },
+ { "Windows Media Video 9 post processing", &DXVA2_ModeWMV9_A, 0 },
+
+ { "VC-1 VLD", &DXVA2_ModeVC1_D, AV_CODEC_ID_VC1 },
+ { "VC-1 VLD", &DXVA2_ModeVC1_D, AV_CODEC_ID_WMV3 },
+ { "VC-1 IDCT", &DXVA2_ModeVC1_C, 0 },
+ { "VC-1 MoComp", &DXVA2_ModeVC1_B, 0 },
+ { "VC-1 post processing", &DXVA2_ModeVC1_A, 0 },
+
+ { NULL, NULL, 0 }
+};
+
+int hb_va_get_frame_buf( hb_va_dxva2_t *dxva2, AVCodecContext *p_context, AVFrame *frame );
+int hb_va_extract( hb_va_dxva2_t *dxva2, uint8_t *dst, AVFrame *frame, int job_w, int job_h, int *crop, hb_oclscale_t *os, int use_opencl, int use_decomb, int use_detelecine );
+enum PixelFormat hb_ffmpeg_get_format( AVCodecContext *, const enum PixelFormat * );
+hb_va_dxva2_t *hb_va_create_dxva2( hb_va_dxva2_t *dxva2, int codec_id );
+void hb_va_new_dxva2( hb_va_dxva2_t *dxva2, AVCodecContext *p_context );
+void hb_va_release( hb_va_dxva2_t *dxva2, AVFrame *frame );
+void hb_va_close( hb_va_dxva2_t *dxva2 );
+int hb_check_hwd_fmt( int fmt );
+
+#endif // HB_VA_DXVA2_H
+
+#endif // USE_HWD

HandBrake-0.9.9.tar.bz2/libhb/vfr.c -> HandBrake-0.10.0.tar.bz2/libhb/vfr.c Changed

@@ -1,6 +1,6 @@
 /* vfr.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -301,20 +301,19 @@
 }
 }
 
-static int hb_vfr_init( hb_filter_object_t * filter,
- hb_filter_init_t * init )
+static int hb_vfr_init(hb_filter_object_t *filter, hb_filter_init_t *init)
 {
- filter->private_data = calloc( 1, sizeof(struct hb_filter_private_s) );
- hb_filter_private_t * pv = filter->private_data;
+ filter->private_data = calloc(1, sizeof(struct hb_filter_private_s));
+ hb_filter_private_t *pv = filter->private_data;
+ build_gamma_lut(pv);
 
- build_gamma_lut( pv );
- pv->cfr = init->cfr;
+ pv->cfr = init->cfr;
 pv->input_vrate = pv->vrate = init->vrate;
 pv->input_vrate_base = pv->vrate_base = init->vrate_base;
- if( filter->settings )
+ if (filter->settings != NULL)
 {
- sscanf( filter->settings, "%d:%d:%d",
- &pv->cfr, &pv->vrate, &pv->vrate_base );
+ sscanf(filter->settings, "%d:%d:%d",
+ &pv->cfr, &pv->vrate, &pv->vrate_base);
 }
 
 pv->job = init->job;
@@ -336,36 +335,27 @@
 pv->lost_time[0] = 0; pv->lost_time[1] = 0; pv->lost_time[2] = 0; pv->lost_time[3] = 0;
 pv->frame_metric = 1000; // Force first frame
 
- if ( pv->cfr == 0 )
- {
- /* Ensure we're using "Same as source" FPS */
- pv->vrate_base = init->vrate_base;
- pv->vrate = init->vrate;
- }
- else if ( pv->cfr == 2 )
+ if (pv->cfr == 2)
 {
- // For PFR, we want the framerate based on the source's actual 
- // framerate, unless it's higher than the specified peak framerate. 
+ // For PFR, we want the framerate based on the source's actual
+ // framerate, unless it's higher than the specified peak framerate.
 double source_fps = (double)init->vrate / init->vrate_base;
 double peak_fps = (double)pv->vrate / pv->vrate_base;
- if ( source_fps > peak_fps )
+ if (source_fps > peak_fps)
 {
- // peak framerate is lower than source framerate. so signal
- // that the nominal framerate will be changed.
+ // peak framerate is lower than the source framerate.
+ // so signal that the framerate will be the peak fps.
 init->vrate = pv->vrate;
 init->vrate_base = pv->vrate_base;
 }
- init->pfr_vrate = pv->vrate;
- init->pfr_vrate_base = pv->vrate_base;
 }
 else
 {
- // Constant framerate. Signal the framerate we are using.
 init->vrate = pv->vrate;
 init->vrate_base = pv->vrate_base;
 }
- init->cfr = pv->cfr;
- pv->frame_rate = (double)pv->vrate_base * 90000. / pv->vrate;
+ pv->frame_rate = (double)pv->vrate_base * 90000. / pv->vrate;
+ init->cfr = pv->cfr;
 
 return 0;
 }
@@ -379,8 +369,27 @@
 return 1;
 
 memset( info, 0, sizeof( hb_filter_info_t ) );
- info->out.vrate_base = pv->vrate_base;
- info->out.vrate = pv->vrate;
+ info->out.vrate_base = pv->input_vrate_base;
+ info->out.vrate = pv->input_vrate;
+ if (pv->cfr == 2)
+ {
+ // For PFR, we want the framerate based on the source's actual
+ // framerate, unless it's higher than the specified peak framerate.
+ double source_fps = (double)pv->input_vrate / pv->input_vrate_base;
+ double peak_fps = (double)pv->vrate / pv->vrate_base;
+ if (source_fps > peak_fps)
+ {
+ // peak framerate is lower than the source framerate.
+ // so signal that the framerate will be the peak fps.
+ info->out.vrate = pv->vrate;
+ info->out.vrate_base = pv->vrate_base;
+ }
+ }
+ else
+ {
+ info->out.vrate = pv->vrate;
+ info->out.vrate_base = pv->vrate_base;
+ }
 info->out.cfr = pv->cfr;
 if ( pv->cfr == 0 )
 {

HandBrake-0.9.9.tar.bz2/libhb/work.c -> HandBrake-0.10.0.tar.bz2/libhb/work.c Changed

@@ -1,6 +1,6 @@
 /* work.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -8,14 +8,20 @@
 */
 
 #include "hb.h"
-#include "a52dec/a52.h"
 #include "libavformat/avformat.h"
+#include "openclwrapper.h"
+#include "opencl.h"
+
+#ifdef USE_QSV
+#include "qsv_common.h"
+#include "qsv_filter_pp.h"
+#endif
 
 typedef struct
 {
 hb_list_t * jobs;
 hb_job_t ** current_job;
- int * error;
+ hb_error_code * error;
 volatile int * die;
 
 } hb_work_t;
@@ -40,7 +46,7 @@
 * @param die Handle to user inititated exit indicator.
 * @param error Handle to error indicator.
 */
-hb_thread_t * hb_work_init( hb_list_t * jobs, volatile int * die, int * error, hb_job_t ** job )
+hb_thread_t * hb_work_init( hb_list_t * jobs, volatile int * die, hb_error_code * error, hb_job_t ** job )
 {
 hb_work_t * work = calloc( sizeof( hb_work_t ), 1 );
 
@@ -85,14 +91,13 @@
 {
 hb_list_rem( work->jobs, job );
 job->die = work->die;
+ job->done_error = work->error;
 *(work->current_job) = job;
 InitWorkState( job->h );
 do_job( job );
 *(work->current_job) = NULL;
 }
 
- *(work->error) = HB_ERROR_NONE;
-
 free( work );
 }
 
@@ -119,7 +124,6 @@
 }
 switch (codec)
 {
- case HB_ACODEC_AC3: return hb_get_work(WORK_DECA52);
 case HB_ACODEC_LPCM: return hb_get_work(WORK_DECLPCM);
 default: break;
 }
@@ -135,7 +139,6 @@
 switch (codec)
 {
 case HB_ACODEC_AC3: return hb_get_work(WORK_ENCAVCODEC_AUDIO);
- case HB_ACODEC_FAAC: return hb_get_work(WORK_ENCFAAC);
 case HB_ACODEC_LAME: return hb_get_work(WORK_ENCLAME);
 case HB_ACODEC_VORBIS: return hb_get_work(WORK_ENCVORBIS);
 case HB_ACODEC_CA_AAC: return hb_get_work(WORK_ENC_CA_AAC);
@@ -149,12 +152,12 @@
 * Displays job parameters in the debug log.
 * @param job Handle work hb_job_t.
 */
-void hb_display_job_info( hb_job_t * job )
+void hb_display_job_info(hb_job_t *job)
 {
- hb_title_t * title = job->title;
- hb_audio_t * audio;
- hb_subtitle_t * subtitle;
- int i, j;
+ int i;
+ hb_title_t *title = job->title;
+ hb_audio_t *audio;
+ hb_subtitle_t *subtitle;
 
 hb_log("job configuration:");
 hb_log( " * source");
@@ -179,9 +182,10 @@
 sec_stop = (float)stop / 90000.0 - min_stop * 60;
 min_stop %= 60;
 
- hb_log( " + title %d, start %d:%d:%.2f stop %d:%d:%.2f", title->index,
- hr_start, min_start, sec_start,
- hr_stop, min_stop, sec_stop);
+ hb_log(" + title %d, start %02d:%02d:%02.2f stop %02d:%02d:%02.2f",
+ title->index,
+ hr_start, min_start, sec_start,
+ hr_stop, min_stop, sec_stop);
 }
 else if( job->frame_to_start || job->frame_to_stop )
 {
@@ -206,26 +210,20 @@
 
 hb_log( " + %s", job->file );
 
- switch( job->mux )
+ hb_log(" + container: %s", hb_container_get_long_name(job->mux));
+ switch (job->mux)
 {
- case HB_MUX_MP4:
- hb_log(" + container: MPEG-4 (.mp4 and .m4v)");
- 
- if( job->ipod_atom )
- hb_log( " + compatibility atom for iPod 5G");
-
- if( job->largeFileSize )
- hb_log( " + 64-bit formatting");
-
- if( job->mp4_optimize )
- hb_log( " + optimized for progressive web downloads");
- 
- if( job->color_matrix_code )
- hb_log( " + custom color matrix: %s", job->color_matrix_code == 1 ? "ITU Bt.601 (SD)" : job->color_matrix_code == 2 ? "ITU Bt.709 (HD)" : "Custom" );
+ case HB_MUX_MP4V2:
+ if (job->largeFileSize)
+ hb_log(" + 64-bit chunk offsets");
+ case HB_MUX_AV_MP4:
+ if (job->mp4_optimize)
+ hb_log(" + optimized for HTTP streaming (fast start)");
+ if (job->ipod_atom)
+ hb_log(" + compatibility atom for iPod 5G");
 break;
 
- case HB_MUX_MKV:
- hb_log(" + container: Matroska (.mkv)");
+ default:
 break;
 }
 
@@ -236,31 +234,23 @@
 
 hb_log(" * video track");
 
- hb_log(" + decoder: %s", title->video_codec_name );
- 
- if( title->video_bitrate )
- {
- hb_log( " + bitrate %d kbps", title->video_bitrate / 1000 );
- }
- 
- if( job->cfr == 0 )
+#ifdef USE_QSV
+ if (hb_qsv_decode_is_enabled(job))
 {
- hb_log( " + frame rate: same as source (around %.3f fps)",
- (float) title->rate / (float) title->rate_base );
+ hb_log(" + decoder: %s",
+ hb_qsv_decode_get_codec_name(title->video_codec_param));
 }
- else if( job->cfr == 1 )
+ else
+#endif
 {
- hb_log( " + frame rate: %.3f fps -> constant %.3f fps",
- (float) title->rate / (float) title->rate_base,
- (float) job->vrate / (float) job->vrate_base );
+ hb_log(" + decoder: %s", title->video_codec_name);
 }
- else if( job->cfr == 2 )
+
+ if( title->video_bitrate )
 {
- hb_log( " + frame rate: %.3f fps -> peak rate limited to %.3f fps",
- (float) title->rate / (float) title->rate_base,
- (float) job->pfr_vrate / (float) job->pfr_vrate_base );
+ hb_log( " + bitrate %d kbps", title->video_bitrate / 1000 );
 }
-
+ 
 // Filters can modify dimensions. So show them first.
 if( hb_list_count( job->list_filter ) )
 {
@@ -313,57 +303,93 @@
 if( !job->indepth_scan )
 {
 /* Video encoder */
- for( i = 0; i < hb_video_encoders_count; i++ )
+ hb_log(" + encoder: %s",
+ hb_video_encoder_get_long_name(job->vcodec));
+
+ if (job->encoder_preset && *job->encoder_preset)
 {
- if( hb_video_encoders[i].encoder == job->vcodec )
+ switch (job->vcodec)
 {
- hb_log( " + encoder: %s", hb_video_encoders[i].human_readable_name );
- break;
+ case HB_VCODEC_X264:
+ case HB_VCODEC_X265:
+ case HB_VCODEC_QSV_H264:
+ hb_log(" + preset: %s", job->encoder_preset);
+ default:
+ break;
 }
 }
-
- if( job->x264_preset && *job->x264_preset &&
- job->vcodec == HB_VCODEC_X264 )
- {
- hb_log( " + x264 preset: %s", job->x264_preset );
- }
- if( job->x264_tune && *job->x264_tune &&
- job->vcodec == HB_VCODEC_X264 )
+ if (job->encoder_tune && *job->encoder_tune)
 {
- hb_log( " + x264 tune: %s", job->x264_tune );
+ switch (job->vcodec)
+ {
+ case HB_VCODEC_X264:
+ case HB_VCODEC_X265:
+ hb_log(" + tune: %s", job->encoder_tune);
+ default:
+ break;
+ }
 }
- if (job->advanced_opts != NULL && *job->advanced_opts &&
- (job->vcodec != HB_VCODEC_THEORA))
+ if (job->encoder_options != NULL && *job->encoder_options &&
+ job->vcodec != HB_VCODEC_THEORA)
 {
- hb_log(" + options: %s", job->advanced_opts);
+ hb_log(" + options: %s", job->encoder_options);
 }
- if( job->h264_profile && *job->h264_profile &&
- job->vcodec == HB_VCODEC_X264 )
+ if (job->encoder_profile && *job->encoder_profile)
 {
- hb_log( " + h264 profile: %s", job->h264_profile );
+ switch (job->vcodec)
+ {
+ case HB_VCODEC_X264:
+ case HB_VCODEC_X265:
+ case HB_VCODEC_QSV_H264:
+ hb_log(" + profile: %s", job->encoder_profile);
+ default:
+ break;
+ }
 }
- if( job->h264_level && *job->h264_level &&
- job->vcodec == HB_VCODEC_X264 )
+ if (job->encoder_level && *job->encoder_level)
 {
- hb_log( " + h264 level: %s", job->h264_level );
+ switch (job->vcodec)
+ {
+ case HB_VCODEC_X264:
+ case HB_VCODEC_QSV_H264:
+ hb_log(" + level: %s", job->encoder_level);
+ default:
+ break;
+ }
 }
 
- if( job->vquality >= 0 )
+ if (job->vquality >= 0)
 {
- hb_log( " + quality: %.2f %s", job->vquality, job->vcodec == HB_VCODEC_X264 ? "(RF)" : "(QP)" ); 
+ hb_log(" + quality: %.2f (%s)", job->vquality,
+ hb_video_quality_get_name(job->vcodec));
 }
 else
 {
 hb_log( " + bitrate: %d kbps, pass: %d", job->vbitrate, job->pass );
- if( job->pass == 1 && job->fastfirstpass == 1 &&
- job->vcodec == HB_VCODEC_X264 )
+ if(job->pass == 1 && job->fastfirstpass == 1 &&
+ (job->vcodec == HB_VCODEC_X264 || job->vcodec == HB_VCODEC_X265))
 {
 hb_log( " + fast first pass" );
- hb_log( " + options: ref=1:8x8dct=0:me=dia:trellis=0" );
- hb_log( " analyse=i4x4 (if originally enabled, else analyse=none)" );
- hb_log( " subq=2 (if originally greater than 2, else subq unchanged)" );
+ if (job->vcodec == HB_VCODEC_X264)
+ {
+ hb_log( " + options: ref=1:8x8dct=0:me=dia:trellis=0" );
+ hb_log( " analyse=i4x4 (if originally enabled, else analyse=none)" );
+ hb_log( " subq=2 (if originally greater than 2, else subq unchanged)" );
+ }
 }
 }
+
+ if (job->color_matrix_code && (job->vcodec == HB_VCODEC_X264 ||
+ job->mux == HB_MUX_MP4V2))
+ {
+ // color matrix is set:
+ // 1) at the stream level (x264 only),
+ // 2) at the container level (mp4v2 only)
+ hb_log(" + custom color matrix: %s",
+ job->color_matrix_code == 1 ? "ITU Bt.601 (NTSC)" :
+ job->color_matrix_code == 2 ? "ITU Bt.601 (PAL)" :
+ job->color_matrix_code == 3 ? "ITU Bt.709 (HD)" : "Custom");
+ }
 }
 
 if( job->indepth_scan )
@@ -390,8 +416,9 @@
 else if( subtitle->source == SRTSUB )
 {
 /* For SRT, print offset and charset too */
- hb_log( " * subtitle track %d, %s (track %d, id 0x%x) Text [SRT] -> Passthrough%s, offset: %"PRId64", charset: %s",
+ hb_log( " * subtitle track %d, %s (track %d, id 0x%x) Text [SRT] -> %s%s, offset: %"PRId64", charset: %s",
 subtitle->out_track, subtitle->lang, subtitle->track, subtitle->id,
+ subtitle->config.dest == RENDERSUB ? "Render/Burn-in" : "Passthrough",
 subtitle->config.default_track ? ", Default" : "",
 subtitle->config.offset, subtitle->config.src_codeset );
 }
@@ -431,25 +458,13 @@
 
 if( audio->config.out.codec & HB_ACODEC_PASS_FLAG )
 {
- for( j = 0; j < hb_audio_encoders_count; j++ )
- {
- if( hb_audio_encoders[j].encoder == audio->config.out.codec )
- {
- hb_log( " + %s", hb_audio_encoders[j].human_readable_name );
- break;
- }
- }
+ hb_log(" + %s",
+ hb_audio_encoder_get_name(audio->config.out.codec));
 }
 else
 {
- for( j = 0; j < hb_audio_mixdowns_count; j++ )
- {
- if( hb_audio_mixdowns[j].amixdown == audio->config.out.mixdown )
- {
- hb_log( " + mixdown: %s", hb_audio_mixdowns[j].human_readable_name );
- break;
- }
- }
+ hb_log(" + mixdown: %s",
+ hb_mixdown_get_name(audio->config.out.mixdown));
 if( audio->config.out.normalize_mix_level != 0 )
 {
 hb_log( " + normalized mixing levels" );
@@ -458,7 +473,10 @@
 {
 hb_log( " + gain: %.fdB", audio->config.out.gain );
 }
- if( ( audio->config.out.dynamic_range_compression != 0.0 ) && ( audio->config.in.codec == HB_ACODEC_AC3 ) )
+ if (audio->config.out.dynamic_range_compression > 0.0f &&
+ hb_audio_can_apply_drc(audio->config.in.codec,
+ audio->config.in.codec_param,
+ audio->config.out.codec))
 {
 hb_log( " + dynamic range compression: %f", audio->config.out.dynamic_range_compression );
 }
@@ -467,22 +485,27 @@
 hb_log(" + dither: %s",
 hb_audio_dither_get_description(audio->config.out.dither_method));
 }
- for( j = 0; j < hb_audio_encoders_count; j++ )
+ hb_log(" + encoder: %s",
+ hb_audio_encoder_get_long_name(audio->config.out.codec));
+ if (audio->config.out.bitrate > 0)
 {
- if( hb_audio_encoders[j].encoder == audio->config.out.codec )
- {
- hb_log( " + encoder: %s", hb_audio_encoders[j].human_readable_name );
- if( audio->config.out.bitrate > 0 )
- hb_log( " + bitrate: %d kbps, samplerate: %d Hz", audio->config.out.bitrate, audio->config.out.samplerate );
- else if( audio->config.out.quality != HB_INVALID_AUDIO_QUALITY )
- hb_log( " + quality: %.2f, samplerate: %d Hz", audio->config.out.quality, audio->config.out.samplerate );
- else if( audio->config.out.samplerate > 0 )
- hb_log( " + samplerate: %d Hz", audio->config.out.samplerate );
- if( audio->config.out.compression_level >= 0 )
- hb_log( " + compression level: %.2f", 
- audio->config.out.compression_level );
- break;
- }
+ hb_log(" + bitrate: %d kbps, samplerate: %d Hz",
+ audio->config.out.bitrate, audio->config.out.samplerate);
+ }
+ else if (audio->config.out.quality != HB_INVALID_AUDIO_QUALITY)
+ {
+ hb_log(" + quality: %.2f, samplerate: %d Hz",
+ audio->config.out.quality, audio->config.out.samplerate);
+ }
+ else if (audio->config.out.samplerate > 0)
+ {
+ hb_log(" + samplerate: %d Hz",
+ audio->config.out.samplerate);
+ }
+ if (audio->config.out.compression_level >= 0)
+ {
+ hb_log(" + compression level: %.2f",
+ audio->config.out.compression_level);
 }
 }
 }
@@ -512,24 +535,24 @@
 * Closes threads and frees fifos.
 * @param job Handle work hb_job_t.
 */
-static void do_job( hb_job_t * job )
+static void do_job(hb_job_t *job)
 {
- hb_title_t * title;
- int i, j;
- hb_work_object_t * w;
- hb_work_object_t * sync;
- hb_work_object_t * muxer;
+ int i;
+ hb_title_t *title;
+ hb_interjob_t *interjob;
+ hb_work_object_t *w;
+ hb_work_object_t *sync;
+ hb_work_object_t *muxer;
 hb_work_object_t *reader = hb_get_work(WORK_READER);
- hb_interjob_t * interjob;
-
- hb_audio_t * audio;
- hb_subtitle_t * subtitle;
- unsigned int subtitle_highest = 0;
- unsigned int subtitle_lowest = 0;
- unsigned int subtitle_lowest_id = 0;
- unsigned int subtitle_forced_id = 0;
+
+ hb_audio_t *audio;
+ hb_subtitle_t *subtitle;
+ unsigned int subtitle_highest = 0;
+ unsigned int subtitle_lowest = 0;
+ unsigned int subtitle_lowest_id = 0;
+ unsigned int subtitle_forced_id = 0;
 unsigned int subtitle_forced_hits = 0;
- unsigned int subtitle_hit = 0;
+ unsigned int subtitle_hit = 0;
 
 title = job->title;
 interjob = hb_interjob_get( job->h );
@@ -541,6 +564,14 @@
 
 job->list_work = hb_list_init();
 
+ /* OpenCL */
+ if (job->use_opencl && (hb_ocl_init() || hb_init_opencl_run_env(0, NULL, "-I.")))
+ {
+ hb_log("work: failed to initialize OpenCL environment, using fallback");
+ job->use_opencl = 0;
+ hb_ocl_close();
+ }
+
 hb_log( "starting job" );
 
 /* Look for the scanned subtitle in the existing subtitle list
@@ -683,6 +714,163 @@
 }
 }
 
+#ifdef USE_QSV
+ /*
+ * XXX: mfxCoreInterface's CopyFrame doesn't work in old drivers, and our
+ * workaround is really slow. If we have validated CPU-based filters in
+ * the list and we can't use CopyFrame, disable QSV decoding until a
+ * better solution is implemented.
+ */
+ if (hb_qsv_copyframe_is_slow(job->vcodec))
+ {
+ if (job->list_filter != NULL)
+ {
+ int encode_only = 0;
+ for (i = 0; i < hb_list_count(job->list_filter) && !encode_only; i++)
+ {
+ hb_filter_object_t *filter = hb_list_item(job->list_filter, i);
+ switch (filter->id)
+ {
+ // validated, CPU-based filters
+ case HB_FILTER_ROTATE:
+ case HB_FILTER_RENDER_SUB:
+ encode_only = 1;
+ break;
+
+ // CPU-based deinterlace (validated)
+ case HB_FILTER_DEINTERLACE:
+ if (filter->settings != NULL &&
+ strcasecmp(filter->settings, "qsv") != 0)
+ {
+ encode_only = 1;
+ }
+ break;
+
+ // other filters will be removed
+ default:
+ break;
+ }
+ }
+ if (encode_only)
+ {
+ hb_log("do_job: QSV: possible CopyFrame bug, using encode-only path");
+ if (hb_get_cpu_platform() >= HB_CPU_PLATFORM_INTEL_IVB)
+ {
+ hb_log("do_job: QSV: please update your Intel graphics driver to version 9.18.10.3257 or later");
+ }
+ job->qsv.decode = 0;
+ }
+ }
+ }
+
+ /*
+ * When QSV is used for decoding, not all CPU-based filters are supported,
+ * so we need to do a little extra setup here.
+ */
+ if (hb_qsv_decode_is_enabled(job))
+ {
+ int vpp_settings[7];
+ int num_cpu_filters = 0;
+ hb_filter_object_t *filter;
+ // default values for VPP filter
+ vpp_settings[0] = job->title->width;
+ vpp_settings[1] = job->title->height;
+ vpp_settings[2] = job->title->crop[0];
+ vpp_settings[3] = job->title->crop[1];
+ vpp_settings[4] = job->title->crop[2];
+ vpp_settings[5] = job->title->crop[3];
+ vpp_settings[6] = 0; // deinterlace: off
+ if (job->list_filter != NULL && hb_list_count(job->list_filter) > 0)
+ {
+ while (hb_list_count(job->list_filter) > num_cpu_filters)
+ {
+ filter = hb_list_item(job->list_filter, num_cpu_filters);
+ switch (filter->id)
+ {
+ // cropping and scaling always done via VPP filter
+ case HB_FILTER_CROP_SCALE:
+ if (filter->settings == NULL || *filter->settings == '\0')
+ {
+ // VPP defaults were set above, so not a problem
+ // however, this should never happen, print an error
+ hb_error("do_job: '%s': no settings!", filter->name);
+ }
+ else
+ {
+ sscanf(filter->settings, "%d:%d:%d:%d:%d:%d",
+ &vpp_settings[0], &vpp_settings[1],
+ &vpp_settings[2], &vpp_settings[3],
+ &vpp_settings[4], &vpp_settings[5]);
+ }
+ hb_list_rem(job->list_filter, filter);
+ hb_filter_close(&filter);
+ break;
+
+ // pick VPP or CPU deinterlace depending on settings
+ case HB_FILTER_DEINTERLACE:
+ if (filter->settings == NULL ||
+ strcasecmp(filter->settings, "qsv") == 0)
+ {
+ // deinterlacing via VPP filter
+ vpp_settings[6] = 1;
+ hb_list_rem(job->list_filter, filter);
+ hb_filter_close(&filter);
+ }
+ else
+ {
+ // validated
+ num_cpu_filters++;
+ }
+ break;
+
+ // then, validated filters
+ case HB_FILTER_ROTATE: // TODO: use Media SDK for this
+ case HB_FILTER_RENDER_SUB:
+ num_cpu_filters++;
+ break;
+
+ // finally, drop all unsupported filters
+ default:
+ hb_log("do_job: QSV: full path, removing unsupported filter '%s'",
+ filter->name);
+ hb_list_rem(job->list_filter, filter);
+ hb_filter_close(&filter);
+ break;
+ }
+ }
+ if (num_cpu_filters > 0)
+ {
+ // we need filters to copy to system memory and back
+ filter = hb_filter_init(HB_FILTER_QSV_PRE);
+ hb_add_filter(job, filter, NULL);
+ filter = hb_filter_init(HB_FILTER_QSV_POST);
+ hb_add_filter(job, filter, NULL);
+ }
+ if (vpp_settings[0] != job->title->width ||
+ vpp_settings[1] != job->title->height ||
+ vpp_settings[2] >= 1 /* crop */ ||
+ vpp_settings[3] >= 1 /* crop */ ||
+ vpp_settings[4] >= 1 /* crop */ ||
+ vpp_settings[5] >= 1 /* crop */ ||
+ vpp_settings[6] >= 1 /* deinterlace */)
+ {
+ // we need the VPP filter
+ char *settings = hb_strdup_printf("%d:%d:%d:%d:%d:%d_dei:%d",
+ vpp_settings[0],
+ vpp_settings[1],
+ vpp_settings[2],
+ vpp_settings[3],
+ vpp_settings[4],
+ vpp_settings[5],
+ vpp_settings[6]);
+ filter = hb_filter_init(HB_FILTER_QSV);
+ hb_add_filter(job, filter, settings);
+ free(settings);
+ }
+ }
+ }
+#endif
+
 // Filters have an effect on settings.
 // So initialize the filters and update the job.
 if( job->list_filter && hb_list_count( job->list_filter ) )
@@ -693,13 +881,15 @@
 init.pix_fmt = AV_PIX_FMT_YUV420P;
 init.width = title->width;
 init.height = title->height;
+
+ /* DXVA2 */
+ init.use_dxva = hb_use_dxva(title);
+
 init.par_width = job->anamorphic.par_width;
 init.par_height = job->anamorphic.par_height;
- memcpy(init.crop, job->crop, sizeof(int[4]));
- init.vrate_base = job->vrate_base;
- init.vrate = job->vrate;
- init.pfr_vrate_base = job->pfr_vrate_base;
- init.pfr_vrate = job->pfr_vrate;
+ memcpy(init.crop, title->crop, sizeof(int[4]));
+ init.vrate_base = title->rate_base;
+ init.vrate = title->rate;
 init.cfr = 0;
 for( i = 0; i < hb_list_count( job->list_filter ); )
 {
@@ -721,8 +911,6 @@
 memcpy(job->crop, init.crop, sizeof(int[4]));
 job->vrate_base = init.vrate_base;
 job->vrate = init.vrate;
- job->pfr_vrate_base = init.pfr_vrate_base;
- job->pfr_vrate = init.pfr_vrate;
 job->cfr = init.cfr;
 }
 
@@ -748,12 +936,25 @@
 }
 }
 }
- 
- job->fifo_mpeg2 = hb_fifo_init( FIFO_LARGE, FIFO_LARGE_WAKE );
- job->fifo_raw = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
- job->fifo_sync = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
- job->fifo_mpeg4 = hb_fifo_init( FIFO_LARGE, FIFO_LARGE_WAKE );
- job->fifo_render = NULL; // Attached to filter chain
+
+#ifdef USE_QSV
+ if (hb_qsv_decode_is_enabled(job))
+ {
+ job->fifo_mpeg2 = hb_fifo_init( FIFO_MINI, FIFO_MINI_WAKE );
+ job->fifo_raw = hb_fifo_init( FIFO_MINI, FIFO_MINI_WAKE );
+ job->fifo_sync = hb_fifo_init( FIFO_MINI, FIFO_MINI_WAKE );
+ job->fifo_render = hb_fifo_init( FIFO_MINI, FIFO_MINI_WAKE );
+ job->fifo_mpeg4 = hb_fifo_init( FIFO_MINI, FIFO_MINI_WAKE );
+ }
+ else
+#endif
+ {
+ job->fifo_mpeg2 = hb_fifo_init( FIFO_LARGE, FIFO_LARGE_WAKE );
+ job->fifo_raw = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
+ job->fifo_sync = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
+ job->fifo_mpeg4 = hb_fifo_init( FIFO_LARGE, FIFO_LARGE_WAKE );
+ job->fifo_render = NULL; // Attached to filter chain
+ }
 
 /* Audio fifos must be initialized before sync */
 if (!job->indepth_scan)
@@ -804,36 +1005,36 @@
 audio->priv.fifo_out = hb_fifo_init(FIFO_LARGE, FIFO_LARGE_WAKE);
 audio->priv.fifo_in = hb_fifo_init(FIFO_LARGE, FIFO_LARGE_WAKE);
 
- /* Passthru audio, nothing to sanitize here */
+ /* Passthru audio */
 if (audio->config.out.codec & HB_ACODEC_PASS_FLAG)
+ {
+ // Muxer needs these to be set correctly in order to
+ // set audio track MP4 time base.
+ audio->config.out.samples_per_frame =
+ audio->config.in.samples_per_frame;
+ audio->config.out.samplerate = audio->config.in.samplerate;
 continue;
+ }
 
 /* Vorbis language information */
 if (audio->config.out.codec == HB_ACODEC_VORBIS)
 audio->priv.config.vorbis.language = audio->config.lang.simple;
 
 /* sense-check the requested samplerate */
- if (audio->config.out.samplerate < 0)
+ if (audio->config.out.samplerate <= 0)
 {
 // if not specified, set to same as input
 audio->config.out.samplerate = audio->config.in.samplerate;
 }
 best_samplerate =
- hb_get_best_samplerate(audio->config.out.codec,
- audio->config.out.samplerate, NULL);
+ hb_audio_samplerate_get_best(audio->config.out.codec,
+ audio->config.out.samplerate,
+ NULL);
 if (best_samplerate != audio->config.out.samplerate)
 {
- int ii;
- for (ii = 0; ii < hb_audio_rates_count; ii++)
- {
- if (best_samplerate == hb_audio_rates[ii].rate)
- {
- hb_log("work: sanitizing track %d unsupported samplerate %d Hz to %s kHz",
- audio->config.out.track, audio->config.out.samplerate,
- hb_audio_rates[ii].string);
- break;
- }
- }
+ hb_log("work: sanitizing track %d unsupported samplerate %d Hz to %s kHz",
+ audio->config.out.track, audio->config.out.samplerate,
+ hb_audio_samplerate_get_name(best_samplerate));
 audio->config.out.samplerate = best_samplerate;
 }
 
@@ -842,44 +1043,25 @@
 {
 /* Mixdown not specified, set the default mixdown */
 audio->config.out.mixdown =
- hb_get_default_mixdown(audio->config.out.codec,
+ hb_mixdown_get_default(audio->config.out.codec,
 audio->config.in.channel_layout);
- for (j = 0; j < hb_audio_mixdowns_count; j++)
- {
- if (hb_audio_mixdowns[j].amixdown == audio->config.out.mixdown)
- {
- hb_log("work: mixdown not specified, track %d setting mixdown %s",
- audio->config.out.track,
- hb_audio_mixdowns[j].human_readable_name);
- break;
- }
- }
+ hb_log("work: mixdown not specified, track %d setting mixdown %s",
+ audio->config.out.track,
+ hb_mixdown_get_name(audio->config.out.mixdown));
 }
 else
 {
 best_mixdown =
- hb_get_best_mixdown(audio->config.out.codec,
+ hb_mixdown_get_best(audio->config.out.codec,
 audio->config.in.channel_layout,
 audio->config.out.mixdown);
 if (audio->config.out.mixdown != best_mixdown)
 {
- int prev_mix_idx = 0, best_mix_idx = 0;
- for (j = 0; j < hb_audio_mixdowns_count; j++)
- {
- if (hb_audio_mixdowns[j].amixdown == audio->config.out.mixdown)
- {
- prev_mix_idx = j;
- }
- else if (hb_audio_mixdowns[j].amixdown == best_mixdown)
- {
- best_mix_idx = j;
- }
- }
 /* log the output mixdown */
 hb_log("work: sanitizing track %d mixdown %s to %s",
 audio->config.out.track,
- hb_audio_mixdowns[prev_mix_idx].human_readable_name,
- hb_audio_mixdowns[best_mix_idx].human_readable_name);
+ hb_mixdown_get_name(audio->config.out.mixdown),
+ hb_mixdown_get_name(best_mixdown));
 audio->config.out.mixdown = best_mixdown;
 }
 }
@@ -888,7 +1070,7 @@
 if (audio->config.out.compression_level < 0)
 {
 audio->config.out.compression_level =
- hb_get_default_audio_compression(audio->config.out.codec);
+ hb_audio_compression_get_default(audio->config.out.codec);
 if (audio->config.out.compression_level >= 0)
 {
 hb_log("work: compression level not specified, track %d setting compression level %.2f",
@@ -899,7 +1081,7 @@
 else
 {
 float best_compression =
- hb_get_best_audio_compression(audio->config.out.codec,
+ hb_audio_compression_get_best(audio->config.out.codec,
 audio->config.out.compression_level);
 if (best_compression != audio->config.out.compression_level)
 {
@@ -923,7 +1105,7 @@
 if (audio->config.out.quality != HB_INVALID_AUDIO_QUALITY)
 {
 float best_quality =
- hb_get_best_audio_quality(audio->config.out.codec,
+ hb_audio_quality_get_best(audio->config.out.codec,
 audio->config.out.quality);
 if (best_quality != audio->config.out.quality)
 {
@@ -949,7 +1131,7 @@
 {
 /* Bitrate not specified, set the default bitrate */
 audio->config.out.bitrate =
- hb_get_default_audio_bitrate(audio->config.out.codec,
+ hb_audio_bitrate_get_default(audio->config.out.codec,
 audio->config.out.samplerate,
 audio->config.out.mixdown);
 if (audio->config.out.bitrate > 0)
@@ -962,7 +1144,7 @@
 else
 {
 best_bitrate =
- hb_get_best_audio_bitrate(audio->config.out.codec,
+ hb_audio_bitrate_get_best(audio->config.out.codec,
 audio->config.out.bitrate,
 audio->config.out.samplerate,
 audio->config.out.mixdown);
@@ -1003,15 +1185,12 @@
 sync = hb_sync_init( job );
 
 /* Video decoder */
- int vcodec = title->video_codec? title->video_codec : WORK_DECMPEG2;
-#if defined(USE_FF_MPEG2)
- if (vcodec == WORK_DECMPEG2)
+ if (title->video_codec == WORK_NONE)
 {
- vcodec = WORK_DECAVCODECV;
- title->video_codec_param = AV_CODEC_ID_MPEG2VIDEO;
+ hb_error("No video decoder set!");
+ goto cleanup;
 }
-#endif
- hb_list_add( job->list_work, ( w = hb_get_work( vcodec ) ) );
+ hb_list_add(job->list_work, (w = hb_get_work(title->video_codec)));
 w->codec_param = title->video_codec_param;
 w->fifo_in = job->fifo_mpeg2;
 w->fifo_out = job->fifo_raw;
@@ -1079,12 +1258,24 @@
 w = hb_get_work( WORK_ENCAVCODEC );
 w->codec_param = AV_CODEC_ID_MPEG2VIDEO;
 break;
+ case HB_VCODEC_FFMPEG_VP8:
+ w = hb_get_work( WORK_ENCAVCODEC );
+ w->codec_param = AV_CODEC_ID_VP8;
+ break;
 case HB_VCODEC_X264:
 w = hb_get_work( WORK_ENCX264 );
 break;
+ case HB_VCODEC_QSV_H264:
+ w = hb_get_work( WORK_ENCQSV );
+ break;
 case HB_VCODEC_THEORA:
 w = hb_get_work( WORK_ENCTHEORA );
 break;
+#ifdef USE_X265
+ case HB_VCODEC_X265:
+ w = hb_get_work( WORK_ENCX265 );
+ break;
+#endif
 }
 // Handle case where there are no filters. 
 // This really should never happen.
@@ -1110,6 +1301,7 @@
 if ( ( w = hb_codec_decoder( audio->config.in.codec ) ) == NULL )
 {
 hb_error("Invalid input codec: %d", audio->config.in.codec);
+ *job->done_error = HB_ERROR_WRONG_INPUT;
 *job->die = 1;
 goto cleanup;
 }
@@ -1134,6 +1326,7 @@
 {
 hb_error("Invalid audio codec: %#x", audio->config.out.codec);
 w = NULL;
+ *job->done_error = HB_ERROR_WRONG_INPUT;
 *job->die = 1;
 goto cleanup;
 }
@@ -1160,6 +1353,7 @@
 if ( reader->init( reader, job ) )
 {
 hb_error( "Failure to initialise thread '%s'", reader->name );
+ *job->done_error = HB_ERROR_INIT;
 *job->die = 1;
 goto cleanup;
 }
@@ -1196,6 +1390,7 @@
 if( w->init( w, job ) )
 {
 hb_error( "Failure to initialise thread '%s'", w->name );
+ *job->done_error = HB_ERROR_INIT;
 *job->die = 1;
 goto cleanup;
 }
@@ -1216,6 +1411,7 @@
 if( sync->init( w, job ) )
 {
 hb_error( "Failure to initialise thread '%s'", w->name );
+ *job->done_error = HB_ERROR_INIT;
 *job->die = 1;
 goto cleanup;
 }
@@ -1456,6 +1652,13 @@
 }
 
 hb_buffer_pool_free();
+ 
+ /* OpenCL: must be closed *after* freeing the buffer pool */
+ if (job->use_opencl)
+ {
+ hb_ocl_close();
+ }
+ 
 hb_job_close( &job );
 }
 
@@ -1469,7 +1672,6 @@
 if( src && dst && src->s.start == dst->s.start)
 {
 // restore log below to debug chapter mark propagation problems
- //hb_log("work %s: Copying Chapter Break @ %"PRId64, w->name, src->s.start);
 dst->s.new_chap = src->s.new_chap;
 }
 }
@@ -1553,7 +1755,7 @@
 static void filter_loop( void * _f )
 {
 hb_filter_object_t * f = _f;
- hb_buffer_t * buf_in, * buf_out;
+ hb_buffer_t * buf_in, * buf_out = NULL;
 
 while( !*f->done && f->status != HB_FILTER_DONE )
 {
@@ -1567,6 +1769,8 @@
 {
 f->chapter_time = buf_in->s.start;
 f->chapter_val = buf_in->s.new_chap;
+ // don't let 'filter_loop' put a chapter mark on the wrong buffer
+ buf_in->s.new_chap = 0;
 }
 if ( *f->done )
 {
@@ -1578,8 +1782,27 @@
 }
 
 buf_out = NULL;
+
+#ifdef USE_QSV
+ hb_buffer_t *last_buf_in = buf_in;
+#endif
+
 f->status = f->work( f, &buf_in, &buf_out );
 
+#ifdef USE_QSV
+ if (f->status == HB_FILTER_DELAY &&
+ last_buf_in->qsv_details.filter_details != NULL && buf_out == NULL)
+ {
+ hb_filter_private_t_qsv *qsv_user = buf_in ? buf_in->qsv_details.filter_details : last_buf_in->qsv_details.filter_details ;
+ qsv_user->post.status = f->status;
+
+ hb_lock(qsv_user->post.frame_completed_lock);
+ qsv_user->post.frame_go = 1;
+ hb_cond_broadcast(qsv_user->post.frame_completed);
+ hb_unlock(qsv_user->post.frame_completed_lock);
+
+ }
+#endif
 if ( buf_out && f->chapter_val && f->chapter_time <= buf_out->s.start )
 {
 buf_out->s.new_chap = f->chapter_val;
@@ -1601,11 +1824,17 @@
 if ( hb_fifo_full_wait( f->fifo_out ) )
 {
 hb_fifo_push( f->fifo_out, buf_out );
+ buf_out = NULL;
 break;
 }
 }
 }
 }
+ if ( buf_out )
+ {
+ hb_buffer_close( &buf_out );
+ }
+
 // Consume data in incoming fifo till job complete so that
 // residual data does not stall the pipeline
 while( !*f->done )

HandBrake-0.9.9.tar.bz2/macosx/Controller.h -> HandBrake-0.10.0.tar.bz2/macosx/Controller.h Changed

@@ -9,15 +9,18 @@
 
 #include "hb.h"
 
-#import "ChapterTitles.h"
-#import "HBSubtitles.h"
 #import "PictureController.h"
 #import "HBPreviewController.h"
+
 #import "HBQueueController.h"
+
+#import "HBVideoController.h"
+#import "HBAudioController.h"
+#import "HBSubtitlesController.h"
 #import "HBAdvancedController.h"
+#import "HBChapterTitlesController.h"
+
 #import "HBPreferencesController.h"
-#import "HBPresets.h"
-#import "HBAudioController.h"
 
 extern NSString *HBContainerChangedNotification;
 extern NSString *keyContainerTag;
@@ -25,21 +28,35 @@
 extern NSString *keyTitleTag;
 
 @class HBOutputPanelController;
-@class DockTextField;
+@class HBPresetsViewController;
+@class HBPresetsManager;
+@class HBDockTile;
 
-/* We subclass NSView so that our drags show both the icon as well as PresetName columns */
-@interface HBPresetsOutlineView : NSOutlineView
+@interface HBController : NSObject <GrowlApplicationBridgeDelegate, HBPictureControllerDelegate, NSToolbarDelegate, NSDrawerDelegate>
 {
+ IBOutlet NSWindow * fWindow;
 
-BOOL fIsDragging;
+ IBOutlet NSTabView *fMainTabView;
 
-}
-@end
+ /* Video view controller */
+ HBVideoController * fVideoController;
+ IBOutlet NSTabViewItem * fVideoTab;
 
-@interface HBController : NSObject <GrowlApplicationBridgeDelegate>
-{
- NSImage * fApplicationIcon;
- IBOutlet NSWindow * fWindow;
+ /* Subtitles view controller */
+	HBSubtitlesController * fSubtitlesViewController;
+ IBOutlet NSTabViewItem * fSubtitlesTab;
+
+	/* Audio view controller */
+	HBAudioController * fAudioController;
+ IBOutlet NSTabViewItem * fAudioTab;
+
+	/* Chapters view controller */
+	HBChapterTitlesController * fChapterTitlesController;
+ IBOutlet NSTabViewItem * fChaptersTitlesTab;
+
+ /* Advanced options tab */
+ HBAdvancedController * fAdvancedOptions;
+	IBOutlet NSTabViewItem * fAdvancedTab;
 
 /* Main Menu Outlets */
 NSMenuItem * fOpenSourceTitleMMenu;
@@ -52,40 +69,12 @@
 IBOutlet NSButton * fScanSrcTitleCancelButton;
 IBOutlet NSButton * fScanSrcTitleOpenButton;
 
- 
 /* Picture Settings */
- PictureController * fPictureController;
+ HBPictureController * fPictureController;
 
 /* Picture Preview */
- PreviewController * fPreviewController;
- 
- /* x264 Presets Box */
- NSArray * fX264PresetNames;
- NSUInteger fX264MediumPresetIndex;
- IBOutlet NSButton * fX264UseAdvancedOptionsCheck;
- IBOutlet NSBox * fX264PresetsBox;
- IBOutlet NSSlider * fX264PresetsSlider;
- IBOutlet NSTextField * fX264PresetSliderLabel;
- IBOutlet NSTextField * fX264PresetSelectedTextField;
- IBOutlet NSPopUpButton * fX264TunePopUp;
- IBOutlet NSTextField * fX264TunePopUpLabel;
- IBOutlet NSPopUpButton * fX264ProfilePopUp;
- IBOutlet NSTextField * fX264ProfilePopUpLabel;
- IBOutlet NSPopUpButton * fX264LevelPopUp;
- IBOutlet NSTextField * fX264LevelPopUpLabel;
- IBOutlet NSButton * fX264FastDecodeCheck;
- IBOutlet NSTextField * fDisplayX264PresetsAdditonalOptionsTextField;
- IBOutlet NSTextField * fDisplayX264PresetsAdditonalOptionsLabel;
- // Text Field to show the expanded opts from unparse()
- IBOutlet NSTextField * fDisplayX264PresetsUnparseTextField;
- char * fX264PresetsUnparsedUTF8String;
- NSUInteger fX264PresetsHeightForUnparse;
- NSUInteger fX264PresetsWidthForUnparse;
- 
- /* Advanced options tab */
- HBAdvancedController * fAdvancedOptions;
-	IBOutlet NSBox * fAdvancedView;
- 
+ HBPreviewController * fPreviewController;
+
 HBPreferencesController * fPreferencesController;
 
 /* Queue panel */
@@ -118,7 +107,6 @@
 IBOutlet NSTextField * fSrcFrameStartEncodingField;
 IBOutlet NSTextField * fSrcFrameEndEncodingField;
 
- IBOutlet NSTextField * fSrcChapterField;
 IBOutlet NSPopUpButton * fSrcChapterStartPopUp;
 IBOutlet NSTextField * fSrcChapterToField;
 IBOutlet NSPopUpButton * fSrcChapterEndPopUp;
@@ -135,91 +123,33 @@
 IBOutlet NSTextField * fDstFile2Field;
 IBOutlet NSButton * fDstBrowseButton;
 /* MP4 Options */
- // Creates 64 bit mp4's that allow file sizes over 4gb
- IBOutlet NSButton * fDstMp4LargeFileCheck;
 // Optimizes mp4's for http
 IBOutlet NSButton * fDstMp4HttpOptFileCheck;
 // Creates iPod compatible mp4's (add ipod uuid atom)
 IBOutlet NSButton * fDstMp4iPodFileCheck;
-	
- /* Video box */
- 
- /* Framerate */
- /* Radio Button Framerate Controls */
- IBOutlet NSMatrix * fFramerateMatrix;
- IBOutlet NSButtonCell * fFramerateVfrPfrCell;
- IBOutlet NSButtonCell * fFramerateCfrCell;
- 
- /* Video Encoder */
- IBOutlet NSTextField * fVidRateField;
- IBOutlet NSPopUpButton * fVidRatePopUp;
- IBOutlet NSTextField * fVidEncoderField;
- IBOutlet NSPopUpButton * fVidEncoderPopUp;
- IBOutlet NSTextField * fVidQualityField;
- IBOutlet NSTextField * fVidQualityRFLabel;
- IBOutlet NSTextField * fVidQualityRFField;
- IBOutlet NSMatrix * fVidQualityMatrix;
- IBOutlet NSButtonCell * fVidBitrateCell;
- IBOutlet NSTextField * fVidBitrateField;
- IBOutlet NSButtonCell * fVidConstantCell;
- IBOutlet NSSlider * fVidQualitySlider;
- IBOutlet NSButton * fVidTwoPassCheck;
- IBOutlet NSButton * fVidTurboPassCheck;
-	
- /* Status read out fields for picture settings and video filters */
- IBOutlet NSTextField * fPictureSettingsField;
- IBOutlet NSTextField * fPictureFiltersField;
-	
+
 	/* Picture variables */
-	int PicOrigOutputWidth;
-	int PicOrigOutputHeight;
 	int AutoCropTop;
 	int AutoCropBottom;
 	int AutoCropLeft;
 	int AutoCropRight;
- /* Subtitles box */
- IBOutlet NSTextField * fSubField;
- IBOutlet NSPopUpButton * fSubPopUp;
-	IBOutlet NSButton * fSubForcedCheck;
- 
- 
- IBOutlet NSTableView * fSubtitlesTable;
-	HBSubtitles * fSubtitlesDelegate;
- IBOutlet NSButton * fBrowseSrtFileButton;
- 
-	/* New Audio box */
-	IBOutlet HBAudioController * fAudioDelegate;
- 
- /* New Audio Auto Passthru box */
- IBOutlet NSBox * fAudioAutoPassthruBox;
- IBOutlet NSButton * fAudioAllowAACPassCheck;
- IBOutlet NSButton * fAudioAllowAC3PassCheck;
- IBOutlet NSButton * fAudioAllowDTSHDPassCheck;
- IBOutlet NSButton * fAudioAllowDTSPassCheck;
- IBOutlet NSButton * fAudioAllowMP3PassCheck;
- IBOutlet NSPopUpButton * fAudioFallbackPopUp;
- 
- 	 
- /* Chapters box */
- IBOutlet NSButton * fCreateChapterMarkers;
- IBOutlet NSTableView * fChapterTable;
-	IBOutlet NSButton * fLoadChaptersButton;
-	IBOutlet NSButton * fSaveChaptersButton;
-	IBOutlet NSTableColumn * fChapterTableNameColumn;
-	ChapterTitles * fChapterTitlesDelegate;
-	
+
 /* Bottom */
 IBOutlet NSTextField * fStatusField;
 IBOutlet NSProgressIndicator * fRipIndicator;
 	BOOL fRipIndicatorShown;
 
 /* Queue File variables */
+ FSEventStreamRef QueueStream;
 NSString * QueueFile;
 	NSMutableArray * QueueFileArray;
- int currentQueueEncodeIndex; // Used to track the currently encoding queueu item
+ NSInteger currentQueueEncodeIndex; // Used to track the currently encoding queueu item
 
 	/* User Preset variables here */
-	HBPresets * fPresetsBuiltin;
+	HBPresetsManager * presetManager;
+ HBPresetsViewController * fPresetsView;
+ IBOutlet NSMenu * presetsMenu;
+
 	IBOutlet NSDrawer * fPresetDrawer;
 	IBOutlet NSTextField * fPresetNewName;
 	IBOutlet NSTextField * fPresetNewDesc;
@@ -227,30 +157,11 @@
 IBOutlet NSTextField * fPresetNewPicWidth;
 IBOutlet NSTextField * fPresetNewPicHeight;
 IBOutlet NSBox * fPresetNewPicWidthHeightBox;
- 
+
 IBOutlet NSButton * fPresetNewPicFiltersCheck;
- IBOutlet NSButton * fPresetNewFolderCheck;
 	IBOutlet NSTextField * fPresetSelectedDisplay;
-	
-	NSString * AppSupportDirectory;
-	NSString * UserPresetsFile;
-	NSMutableArray * UserPresets;
-	NSMutableArray * UserPresetssortedArray;
-	NSMutableDictionary * chosenPreset;
-	 
-	NSMutableDictionary *presetHbDefault; // this is 1 in "Default" preset key
-	NSMutableDictionary *presetUserDefault;// this is 2 in "Default" preset key
- NSMutableDictionary *presetUserDefaultParent;
- NSMutableDictionary *presetUserDefaultParentParent;
- int presetCurrentBuiltInCount; // keeps track of the current number of built in presets
+
 IBOutlet NSPanel * fAddPresetPanel;
-	
- /* NSOutline View for the presets */
- NSArray *fDraggedNodes;
- IBOutlet HBPresetsOutlineView * fPresetsOutlineView;
- IBOutlet NSButton * fPresetsAdd;
-	IBOutlet NSButton * fPresetsDelete;
- IBOutlet NSPopUpButton * fPresetsActionButton;
 
 hb_handle_t * fHandle;
 
@@ -265,15 +176,13 @@
 int fCanceledCount;
 int fWorkingCount;
 
- int fqueueEditRescanItemNum; // queue array item to be reloaded into the main window
- int pidNum; // The pid number for this instance
+ NSInteger fqueueEditRescanItemNum; // queue array item to be reloaded into the main window
+ pid_t pidNum; // The pid number for this instance
 NSString * currentQueueEncodeNameString;
 
 /* integer to set to determine the previous state
 		of encode 0==idle, 1==encoding, 2==cancelled*/
 int fEncodeState;
-	int currentScanCount;
-	int currentSuccessfulScanCount;
 BOOL SuccessfulScan;
 BOOL applyQueueToScan;
 	NSString * currentSource;
@@ -283,31 +192,24 @@
 double dockIconProgress;
 
 BOOL fWillScan;
- NSDockTile * dockTile;
- DockTextField * percentField;
- DockTextField * timeField;
+
+ HBDockTile *dockTile;
 }
 - (int) getPidnum;
-- (IBAction) showAboutPanel:(id)sender;
 
-- (void) writeToActivityLog:(const char *) format, ...;
 - (IBAction) browseSources: (id) sender;
 - (void) browseSourcesDone: (NSOpenPanel *) sheet
 returnCode: (int) returnCode contextInfo: (void *) contextInfo;
 - (IBAction) showSourceTitleScanPanel: (id) sender;
 - (IBAction) closeSourceTitleScanPanel: (id) sender; 
-- (void) performScan:(NSString *) scanPath scanTitleNum: (int) scanTitleNum;
+- (void) performScan:(NSString *) scanPath scanTitleNum: (NSInteger) scanTitleNum;
 - (IBAction) showNewScan: (id) sender;
 
 
 - (IBAction) cancelScanning:(id)sender;
 
 - (void) updateUI: (NSTimer*) timer;
-- (void) enableUI: (bool) enable;
-- (void) setupX264PresetsWidgets: (id) sender;
-- (void) enableX264Widgets: (bool) enable;
-- (IBAction) updateX264Widgets: (id) sender;
-- (IBAction) x264PresetsChangedDisplayExpandedOptions: (id) sender;
+- (void) enableUI: (BOOL) enable;
 
 - (IBAction) encodeStartStopPopUpChanged: (id) sender;
 
@@ -319,34 +221,20 @@
 
 
 - (IBAction) formatPopUpChanged: (id) sender;
-- (IBAction) videoEncoderPopUpChanged: (id) sender;
 - (IBAction) autoSetM4vExtension: (id) sender;
-- (IBAction) twoPassCheckboxChanged: (id) sender;
-- (IBAction) videoFrameRateChanged: (id) sender;
+
 - (void) prepareJob;
 - (IBAction) browseFile: (id) sender;
 - (void) browseFileDone: (NSSavePanel *) sheet
 returnCode: (int) returnCode contextInfo: (void *) contextInfo;
 
-- (IBAction) videoMatrixChanged: (id) sender;
-
-- (IBAction) qualitySliderChanged: (id) sender;
-- (void) setupQualitySlider;
-
-- (IBAction) browseImportSrtFile: (id) sender;
-- (void) browseImportSrtFileDone: (NSSavePanel *) sheet
- returnCode: (int) returnCode contextInfo: (void *) contextInfo;
-
 - (IBAction) showPicturePanel: (id) sender;
-- (void) picturePanelWindowed;
 - (IBAction) showPreviewWindow: (id) sender;
 - (void)pictureSettingsDidChange;
-- (IBAction) calculatePictureSizing: (id) sender;
 - (IBAction) openMainWindow: (id) sender;
 
 /* Text summaries of various settings */
 - (NSString*) pictureSettingsSummary;
-- (NSString*) pictureFiltersSummary;
 - (NSString*) muxerOptionsSummary;
 
 /* Add All titles to the queue */
@@ -356,19 +244,22 @@
 - (void) doAddAllTitlesToQueue;
 
 /* Queue File Stuff */
+- (void) initQueueFSEvent;
+- (void) closeQueueFSEvent;
 - (void) loadQueueFile;
+- (void) reloadQueue;
 - (NSDictionary *)createQueueFileItem;
 - (void)saveQueueFileItem;
-- (void) incrementQueueItemDone:(int) queueItemDoneIndexNum;
-- (void) performNewQueueScan:(NSString *) scanPath scanTitleNum: (int) scanTitleNum;
+- (void) incrementQueueItemDone:(NSInteger) queueItemDoneIndexNum;
+- (void) performNewQueueScan:(NSString *) scanPath scanTitleNum: (NSInteger) scanTitleNum;
 - (void) processNewQueueEncode;
 - (void) clearQueueEncodedItems;
 /* Queue Editing */
 - (IBAction)applyQueueSettingsToMainWindow:(id)sender;
-- (IBAction)rescanQueueItemToMainWindow:(NSString *) scanPath scanTitleNum: (int) scanTitleNum selectedQueueItem: (int) selectedQueueItem;
+- (IBAction)rescanQueueItemToMainWindow:(NSString *) scanPath scanTitleNum: (NSUInteger) scanTitleNum selectedQueueItem: (NSUInteger) selectedQueueItem;
 
 
-- (void) removeQueueFileItem:(int) queueItemToRemove;
+- (void) removeQueueFileItem:(NSUInteger) queueItemToRemove;
 - (void) clearQueueAllItems;
 - (void)moveObjectsInQueueArray:(NSMutableArray *)array fromIndexes:(NSIndexSet *)indexSet toIndex:(NSUInteger)insertIndex;
 - (void)getQueueStats;
@@ -392,67 +283,25 @@
 - (void) doCancelCurrentJobAndStop;
 - (IBAction) Pause: (id) sender;
 
-- (IBAction) calculateBitrate: (id) sender;
-- (void) controlTextDidChange: (NSNotification *) notification;
-
 - (IBAction) openHomepage: (id) sender;
 - (IBAction) openForums: (id) sender;
 - (IBAction) openUserGuide: (id) sender;
 
 // Preset Methods Here
- 
-/* These are required by the NSOutlineView Datasource Delegate */
-/* We use this to deterimine children of an item */
-- (id)outlineView:(NSOutlineView *)fPresetsOutlineView child:(NSInteger)index ofItem:(id)item;
-/* We use this to determine if an item should be expandable */
-- (BOOL)outlineView:(NSOutlineView *)fPresetsOutlineView isItemExpandable:(id)item;
-/* used to specify the number of levels to show for each item */
-- (int)outlineView:(NSOutlineView *)fPresetsOutlineView numberOfChildrenOfItem:(id)item;
-/* Used to tell the outline view which information is to be displayed per item */
-- (id)outlineView:(NSOutlineView *)fPresetsOutlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item;
-/* Use to customize the font and display characteristics of the title cell */
-- (void)outlineView:(NSOutlineView *)fPresetsOutlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item;
-/* We use this to edit the name field in the outline view */
-- (void)outlineView:(NSOutlineView *)fPresetsOutlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item;
-/* We use this to provide tooltips for the items in the presets outline view */
-- (NSString *)outlineView:(NSOutlineView *)fPresetsOutlineView toolTipForCell:(NSCell *)cell rect:(NSRectPointer)rect tableColumn:(NSTableColumn *)tc item:(id)item mouseLocation:(NSPoint)mouseLocation;
-- (void) checkBuiltInsForUpdates;
-/* We use this to actually select the preset and act accordingly */
-- (IBAction)selectPreset:(id)sender;
-
-@property (nonatomic, readonly) BOOL hasValidPresetSelected;
-- (id)selectedPreset;
-
 /* Export / Import Presets */
 - (IBAction) browseExportPresetFile: (id) sender;
-- (void) browseExportPresetFileDone: (NSSavePanel *) sheet
- returnCode: (int) returnCode contextInfo: (void *) contextInfo;
- 
 - (IBAction) browseImportPresetFile: (id) sender;
-- (void) browseImportPresetDone: (NSSavePanel *) sheet
- returnCode: (int) returnCode contextInfo: (void *) contextInfo;
 
 /* Manage User presets */ 
-- (void) loadPresets;
 - (IBAction) customSettingUsed: (id) sender;
 - (IBAction) showAddPresetPanel: (id) sender;
 - (IBAction) addPresetPicDropdownChanged: (id) sender;
 - (IBAction) closeAddPresetPanel: (id) sender;
 - (NSDictionary *)createPreset;
 
-- (IBAction) revertPictureSizeToMax:(id)sender;
-
-- (IBAction)setDefaultPreset:(id)sender;
 - (IBAction)selectDefaultPreset:(id)sender;
-- (void) savePreset;
-- (void)sortPresets;
 - (IBAction)addFactoryPresets:(id)sender;
-- (IBAction)deleteFactoryPresets:(id)sender;
 - (IBAction)addUserPreset:(id)sender;
-- (void)addPreset;
-- (IBAction)insertPreset:(id)sender;
-- (IBAction)deletePreset:(id)sender;
-- (IBAction)getDefaultPresets:(id)sender;
 
 -(void)sendToMetaX:(NSString *) filePath;
 // Growl methods
@@ -464,43 +313,12 @@
 - (void) prepareJobForPreview;
 - (void) remindUserOfSleepOrShutdown;
 
-- (void)moveObjectsInPresetsArray:(NSMutableArray *)array fromIndexes:(NSIndexSet *)indexSet toIndex:(NSUInteger)insertIndex;
-
 - (int) hbInstances;
 
-// Chapter files methods
-- (IBAction) browseForChapterFile: (id) sender;
-- (void) browseForChapterFileDone: (NSOpenPanel *) sheet
- returnCode: (int) returnCode contextInfo: (void *) contextInfo;
-
-- (IBAction) browseForChapterFileSave: (id) sender;
-- (void) browseForChapterFileSaveDone: (NSSavePanel *) sheet
- returnCode: (int) returnCode contextInfo: (void *) contextInfo;
-
-+ (unsigned int) maximumNumberOfAllowedAudioTracks;
-- (IBAction) addAllAudioTracks: (id) sender;
-
 // Drag & Drop methods
 - (void)openFiles:(NSArray*)filenames;
 - (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames;
 - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender;
 - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender;
 
-- (void) updateDockIcon:(double)progress withETA:(NSString*)etaStr;
-
-// x264 system methods
-- (NSString*) x264Preset;
-- (NSString*) x264Tune;
-- (NSString*) x264OptionExtra;
-- (NSString*) h264Profile;
-- (NSString*) h264Level;
-- (void) setX264Preset: (NSString*) x264Preset;
-- (void) setX264Tune: (NSString*) x264Tune;
-- (void) setX264OptionExtra: (NSString*) x264OptionExtra;
-- (void) setH264Profile: (NSString*) h264Profile;
-- (void) setH264Level: (NSString*) h264Level;
-- (IBAction) x264PresetsSliderChanged: (id) sender;
-
-
 @end
-

HandBrake-0.9.9.tar.bz2/macosx/Controller.m -> HandBrake-0.10.0.tar.bz2/macosx/Controller.m Changed

@@ -9,11 +9,17 @@
 #import "HBOutputPanelController.h"
 #import "HBPreferencesController.h"
 #import "HBDVDDetector.h"
-#import "HBPresets.h"
+#import "HBPresetsManager.h"
+#import "HBPreset.h"
 #import "HBPreviewController.h"
-#import "DockTextField.h"
+#import "HBDockTile.h"
+#import "HBUtilities.h"
+
+#import "HBPresetsViewController.h"
+
+#import "HBAudioDefaults.h"
+#import "HBSubtitlesDefaults.h"
 
-unsigned int maximumNumberOfAllowedAudioTracks = 24;
 NSString *HBContainerChangedNotification = @"HBContainerChangedNotification";
 NSString *keyContainerTag = @"keyContainerTag";
 NSString *HBTitleChangedNotification = @"HBTitleChangedNotification";
@@ -21,9 +27,6 @@
 
 NSString *dragDropFiles = @"dragDropFiles";
 
-#define DragDropSimplePboardType @"MyCustomOutlineViewPboardType"
-
-NSString *dockTilePercentFormat = @"%2.1f%%";
 // DockTile update freqency in total percent increment
 #define dockTileUpdateFrequency 0.1f
 
@@ -38,88 +41,76 @@
 static NSString * ShowActivityIdentifier = @"Debug Output Item Identifier";
 static NSString * ChooseSourceIdentifier = @"Choose Source Item Identifier";
 
+@interface HBController () <HBPresetsViewControllerDelegate>
+
+// The current selected preset.
+@property (nonatomic, retain) HBPreset *selectedPreset;
+@property (nonatomic) BOOL customPreset;
+
+@end
 
 /*******************************
 * HBController implementation *
 *******************************/
 @implementation HBController
 
-+ (unsigned int) maximumNumberOfAllowedAudioTracks	{	return maximumNumberOfAllowedAudioTracks;	}
-
-- (id)init
+- (instancetype)init
 {
 self = [super init];
- if( !self )
+ if (self)
 {
- return nil;
- }
+ // Register the defaults preferences
+ [HBPreferencesController registerUserDefaults];
 
- fApplicationIcon = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForImageResource:@"HandBrake.icns"]];
+ /* Check for and create the App Support Preview directory if necessary */
+ NSString *previewDirectory = [[HBUtilities appSupportPath] stringByAppendingPathComponent:@"Previews"];
+ if (![[NSFileManager defaultManager] fileExistsAtPath:previewDirectory])
+ {
+ [[NSFileManager defaultManager] createDirectoryAtPath:previewDirectory
+ withIntermediateDirectories:YES
+ attributes:nil
+ error:NULL];
+ }
+
+ // Inits the controllers
+ outputPanel = [[HBOutputPanelController alloc] init];
+ fPictureController = [[HBPictureController alloc] init];
+ fQueueController = [[HBQueueController alloc] init];
+
+ // we init the HBPresetsManager class
+ NSURL *presetsURL = [NSURL fileURLWithPath:[[HBUtilities appSupportPath] stringByAppendingPathComponent:@"UserPresets.plist"]];
+ presetManager = [[HBPresetsManager alloc] initWithURL:presetsURL];
+ _selectedPreset = presetManager.defaultPreset;
+
+ // Workaround to avoid a bug in Snow Leopard
+ // we can switch back to [[NSApplication sharedApplication] applicationIconImage]
+ // when we won't support it anymore.
+ NSImage *appIcon = [NSImage imageNamed:@"HandBrake"];
+ [appIcon setSize:NSMakeSize(1024, 1024)];
+
+ // Load the dockTile and instiante initial text fields
+ dockTile = [[HBDockTile alloc] initWithDockTile:[[NSApplication sharedApplication] dockTile]
+ image:appIcon];
+
+ [dockTile updateDockIcon:-1.0 withETA:@""];
+
+ // Lets report the HandBrake version number here to the activity log and text log file
+ NSString *versionStringFull = [[NSString stringWithFormat:@"Handbrake Version: %@",
+ [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]]
+ stringByAppendingString:[NSString stringWithFormat: @" (%@)", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]]];
+ [HBUtilities writeToActivityLog: "%s", [versionStringFull UTF8String]];
+
+ // Init libhb with check for updates libhb style set to "0" so its ignored and lets sparkle take care of it
+ int loggingLevel = [[[NSUserDefaults standardUserDefaults] objectForKey:@"LoggingLevel"] intValue];
+ fHandle = hb_init(loggingLevel, 0);
+
+ // Optional dvd nav UseDvdNav
+ hb_dvd_set_dvdnav([[[NSUserDefaults standardUserDefaults] objectForKey:@"UseDvdNav"] boolValue]);
+
+ // Init a separate instance of libhb for user scanning and setting up jobs
+ fQueueEncodeLibhb = hb_init(loggingLevel, 0);
+ }
 
- if( fApplicationIcon != nil )
- [NSApp setApplicationIconImage:fApplicationIcon];
- 
- [HBPreferencesController registerUserDefaults];
- fHandle = NULL;
- fQueueEncodeLibhb = NULL;
- /* Check for check for the app support directory here as
- * outputPanel needs it right away, as may other future methods
- */
- NSString *libraryDir = [NSSearchPathForDirectoriesInDomains( NSLibraryDirectory,
- NSUserDomainMask,
- YES ) objectAtIndex:0];
- AppSupportDirectory = [[libraryDir stringByAppendingPathComponent:@"Application Support"]
- stringByAppendingPathComponent:@"HandBrake"];
- if( ![[NSFileManager defaultManager] fileExistsAtPath:AppSupportDirectory] )
- {
- [[NSFileManager defaultManager] createDirectoryAtPath:AppSupportDirectory
- attributes:nil];
- }
- /* Check for and create the App Support Preview directory if necessary */
- NSString *PreviewDirectory = [AppSupportDirectory stringByAppendingPathComponent:@"Previews"];
- if( ![[NSFileManager defaultManager] fileExistsAtPath:PreviewDirectory] )
- {
- [[NSFileManager defaultManager] createDirectoryAtPath:PreviewDirectory
- attributes:nil];
- } 
- outputPanel = [[HBOutputPanelController alloc] init];
- fPictureController = [[PictureController alloc] init];
- fQueueController = [[HBQueueController alloc] init];
- fAdvancedOptions = [[HBAdvancedController alloc] init];
- /* we init the HBPresets class which currently is only used
- * for updating built in presets, may move more functionality
- * there in the future
- */
- fPresetsBuiltin = [[HBPresets alloc] init];
- fPreferencesController = [[HBPreferencesController alloc] init];
- /* Lets report the HandBrake version number here to the activity log and text log file */
- NSString *versionStringFull = [[NSString stringWithFormat: @"Handbrake Version: %@", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]] stringByAppendingString: [NSString stringWithFormat: @" (%@)", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]]];
- [self writeToActivityLog: "%s", [versionStringFull UTF8String]];
- 
- /* Load the dockTile and instiante initial text fields */
- dockTile = [[NSApplication sharedApplication] dockTile];
- NSImageView *iv = [[NSImageView alloc] init];
- [iv setImage:[[NSApplication sharedApplication] applicationIconImage]];
- [dockTile setContentView:iv];
- 
- /* We can move the specific values out from here by subclassing NSDockTile and package everything in here */
- /* If colors are to be chosen once and for all, we can also remove the instantiation with numerical values */
- percentField = [[DockTextField alloc] initWithFrame:NSMakeRect(0.0f, 32.0f, [dockTile size].width, 30.0f)];
- [percentField changeGradientColors:[NSColor colorWithDeviceRed:0.4f green:0.6f blue:0.4f alpha:1.0f] endColor:[NSColor colorWithDeviceRed:0.2f green:0.4f blue:0.2f alpha:1.0f]];
- [iv addSubview:percentField];
- 
- timeField = [[DockTextField alloc] initWithFrame:NSMakeRect(0.0f, 0.0f, [dockTile size].width, 30.0f)];
- [timeField changeGradientColors:[NSColor colorWithDeviceRed:0.6f green:0.4f blue:0.4f alpha:1.0f] endColor:[NSColor colorWithDeviceRed:0.4f green:0.2f blue:0.2f alpha:1.0f]];
- [iv addSubview:timeField];
- 
- [self updateDockIcon:-1.0 withETA:@""];
- 
- /*
- * initialize fX264PresetsUnparsedUTF8String as early as possible
- * avoids an invalid free
- */
- fX264PresetsUnparsedUTF8String = NULL;
- 
 return self;
 }
 
@@ -138,7 +129,7 @@
 if (filenames.count == 1 && [[filenames objectAtIndex:0] isEqual:@"YES"])
 return;
 
- NSMutableArray* filesList = [[NSMutableArray alloc] initWithArray:filenames];
+ NSMutableArray *filesList = [[[NSMutableArray alloc] initWithArray:filenames] autorelease];
 [filesList removeObject:@"YES"];
 
 // For now, we just want to accept one file at a time
@@ -150,7 +141,7 @@
 
 // The goal of this check is to know if the application was running before the drag & drop
 // if fSubtitlesDelegate is set, then applicationDidFinishLaunching was called
- if (fSubtitlesDelegate)
+ if (fSubtitlesViewController)
 {
 // Handbrake was already running when the user dropped the file(s)
 // So we get unstack the first one and launch the scan
@@ -187,44 +178,23 @@
 
 - (void) applicationDidFinishLaunching: (NSNotification *) notification
 {
- /* Init libhb with check for updates libhb style set to "0" so its ignored and lets sparkle take care of it */
- int loggingLevel = [[[NSUserDefaults standardUserDefaults] objectForKey:@"LoggingLevel"] intValue];
- fHandle = hb_init(loggingLevel, 0);
- /* Optional dvd nav UseDvdNav*/
- hb_dvd_set_dvdnav([[[NSUserDefaults standardUserDefaults] objectForKey:@"UseDvdNav"] boolValue]);
- /* Init a separate instance of libhb for user scanning and setting up jobs */
- fQueueEncodeLibhb = hb_init(loggingLevel, 0);
- 
 	// Set the Growl Delegate
 [GrowlApplicationBridge setGrowlDelegate: self];
 /* Init others controllers */
- [fPictureController SetHandle: fHandle];
- [fPictureController setHBController: self];
- 
+ [fPictureController setDelegate: self];
+ [fPictureController setHandle: fHandle];
+
 [fQueueController setHandle: fQueueEncodeLibhb];
 [fQueueController setHBController: self];
 
- fChapterTitlesDelegate = [[ChapterTitles alloc] init];
- [fChapterTable setDataSource:fChapterTitlesDelegate];
- [fChapterTable setDelegate:fChapterTitlesDelegate];
- 
- /* setup the subtitles delegate and connections to table */
- fSubtitlesDelegate = [[HBSubtitles alloc] init];
- [fSubtitlesTable setDataSource:fSubtitlesDelegate];
- [fSubtitlesTable setDelegate:fSubtitlesDelegate];
- [fSubtitlesTable setRowHeight:25.0];
- 
-	/* setup the audio controller */
-	[fAudioDelegate setHBController: self];
 	[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(autoSetM4vExtension:) name: HBMixdownChangedNotification object: nil];
-
- [fPresetsOutlineView setAutosaveName:@"Presets View"];
- [fPresetsOutlineView setAutosaveExpandedItems:YES];
+	[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updateMp4Checkboxes:) name: HBVideoEncoderChangedNotification object: nil];
 
 dockIconProgress = 0;
 
 /* Init QueueFile .plist */
 [self loadQueueFile];
+ [self initQueueFSEvent];
 /* Run hbInstances to get any info on other instances as well as set the
 * pid number for this instance in the case of multi-instance encoding. */ 
 hbInstanceNum = [self hbInstances];
@@ -236,27 +206,25 @@
 * preview encode is initiated. */
 if (hbInstanceNum == 1)
 {
- NSString *PreviewDirectory = [NSString stringWithFormat:@"~/Library/Application Support/HandBrake/Previews"];
- PreviewDirectory = [PreviewDirectory stringByExpandingTildeInPath];
+ NSString *PreviewDirectory = [[HBUtilities appSupportPath] stringByAppendingPathComponent:@"Previews"];
 NSError *error;
 NSArray *files = [ [NSFileManager defaultManager] contentsOfDirectoryAtPath: PreviewDirectory error: &error ];
 for( NSString *file in files ) 
 {
- if( file != @"." && file != @".." ) 
+ if( ![file isEqual: @"."] && ![file isEqual: @".."] )
 {
 [ [NSFileManager defaultManager] removeItemAtPath: [ PreviewDirectory stringByAppendingPathComponent: file ] error: &error ];
 if( error ) 
 { 
 //an error occurred
- [self writeToActivityLog: "Could not remove existing preview at : %s",[file UTF8String] ];
+ [HBUtilities writeToActivityLog: "Could not remove existing preview at : %s",[file UTF8String] ];
 }
 } 
 }
 
 }
- 
- 
- 
+
+ [self enableUI: NO];
 /* Call UpdateUI every 1/2 sec */
 
 [[NSRunLoop currentRunLoop] addTimer:[NSTimer
@@ -300,29 +268,28 @@
 * fWorkingCount = 0;
 */
 
- /*On Screen Notification*/
- NSString * alertTitle;
- 
- /* We check to see if there is already another instance of hb running.
+ /* On Screen Notification
+ * We check to see if there is already another instance of hb running.
 * Note: hbInstances == 1 means we are the only instance of HandBrake.app
 */
 if (hbInstanceNum > 1)
 {
- alertTitle = [NSString stringWithFormat:
- NSLocalizedString(@"There is already an instance of HandBrake running.", @"")];
- NSBeginCriticalAlertSheet(
- alertTitle,
- NSLocalizedString(@"Reload Queue", nil),
- nil,
- nil,
- fWindow, self,
- nil, @selector(didDimissReloadQueue:returnCode:contextInfo:), nil,
- NSLocalizedString(@" HandBrake will now load up the existing queue.", nil)); 
+ NSAlert *alert = [[NSAlert alloc] init];
+ [alert setMessageText:NSLocalizedString(@"There is already an instance of HandBrake running.", @"")];
+ [alert setInformativeText:NSLocalizedString(@"HandBrake will now load up the existing queue.", nil)];
+ [alert addButtonWithTitle:NSLocalizedString(@"Reload Queue", nil)];
+ [alert beginSheetModalForWindow:fWindow
+ modalDelegate:self
+ didEndSelector:@selector(didDimissReloadQueue:returnCode:contextInfo:)
+ contextInfo:nil];
+ [alert release];
 }
 else
 {
 if (fWorkingCount > 0 || fPendingCount > 0)
 {
+ NSString *alertTitle;
+
 if (fWorkingCount > 0)
 {
 alertTitle = [NSString stringWithFormat:
@@ -335,16 +302,19 @@
 NSLocalizedString(@"HandBrake Has Detected %d Pending Item(s) In Your Queue.", @""),
 fPendingCount];
 }
- 
- NSBeginCriticalAlertSheet(
- alertTitle,
- NSLocalizedString(@"Reload Queue", nil),
- nil,
- NSLocalizedString(@"Empty Queue", nil),
- fWindow, self,
- nil, @selector(didDimissReloadQueue:returnCode:contextInfo:), nil,
- NSLocalizedString(@" Do you want to reload them ?", nil));
- 
+
+ NSAlert *alert = [[NSAlert alloc] init];
+ [alert setMessageText:alertTitle];
+ [alert setInformativeText:NSLocalizedString(@"Do you want to reload them ?", nil)];
+ [alert addButtonWithTitle:NSLocalizedString(@"Reload Queue", nil)];
+ [alert addButtonWithTitle:NSLocalizedString(@"Empty Queue", nil)];
+ [alert setAlertStyle:NSCriticalAlertStyle];
+ [alert beginSheetModalForWindow:fWindow
+ modalDelegate:self
+ didEndSelector:@selector(didDimissReloadQueue:returnCode:contextInfo:)
+ contextInfo:nil];
+ [alert release];
+
 // After handling the previous queue (reload or empty), if there is files waiting for scanning
 // we will process them
 if (dragDropFilesId)
@@ -412,35 +382,36 @@
 - (int) hbInstances
 {
 /* check to see if another instance of HandBrake.app is running */
- NSArray *runningAppDictionaries = [[NSWorkspace sharedWorkspace] launchedApplications];
- NSDictionary *runningAppsDictionary;
+ NSArray *runningInstances = [NSRunningApplication runningApplicationsWithBundleIdentifier:[[NSBundle mainBundle] bundleIdentifier]];
+ NSRunningApplication *runningInstance;
+ 
+ NSRunningApplication *thisInstance = [NSRunningApplication currentApplication];
+ NSString *thisInstanceAppPath = [[NSBundle mainBundle] bundlePath];
+ [HBUtilities writeToActivityLog: "hbInstances path to this instance: %s", [thisInstanceAppPath UTF8String]];
+ 
 int hbInstances = 0;
- NSString * thisInstanceAppPath = [[NSBundle mainBundle] bundlePath];
- NSString * runningInstanceAppPath;
- int runningInstancePidNum;
- [self writeToActivityLog: "hbInstances path to this instance: %s", [thisInstanceAppPath UTF8String]];
- for (runningAppsDictionary in runningAppDictionaries)
+ NSString *runningInstanceAppPath;
+ pid_t runningInstancePidNum;
+ 
+ for (runningInstance in runningInstances)
 	{
- if ([[runningAppsDictionary valueForKey:@"NSApplicationName"] isEqualToString:@"HandBrake"])
-		{
- /*Report the path to each active instances app path */
- runningInstancePidNum = [[runningAppsDictionary valueForKey:@"NSApplicationProcessIdentifier"] intValue];
- runningInstanceAppPath = [runningAppsDictionary valueForKey:@"NSApplicationPath"];
- [self writeToActivityLog: "hbInstance found instance pidnum:%d at path: %s", runningInstancePidNum, [runningInstanceAppPath UTF8String]];
- /* see if this is us by comparing the app path */
- if ([runningInstanceAppPath isEqualToString: thisInstanceAppPath])
- {
- /* If so this is our pidnum */
- [self writeToActivityLog: "hbInstance MATCH FOUND, our pidnum is:%d", runningInstancePidNum];
- /* Get the PID number for this hb instance, used in multi instance encoding */
- pidNum = runningInstancePidNum;
- /* Report this pid to the activity log */
- [self writeToActivityLog: "Pid for this instance:%d", pidNum];
- /* Tell fQueueController what our pidNum is */
- [fQueueController setPidNum:pidNum];
- }
- hbInstances++;
+ /*Report the path to each active instances app path */
+ runningInstancePidNum = [runningInstance processIdentifier];
+ runningInstanceAppPath = [[runningInstance bundleURL] path];
+ [HBUtilities writeToActivityLog: "hbInstance found instance pidnum: %d at path: %s", runningInstancePidNum, [runningInstanceAppPath UTF8String]];
+ /* see if this is us*/
+ if ([runningInstance isEqual: thisInstance])
+ {
+ /* If so this is our pidnum */
+ [HBUtilities writeToActivityLog: "hbInstance MATCH FOUND, our pidnum is: %d", runningInstancePidNum];
+ /* Get the PID number for this hb instance, used in multi instance encoding */
+ pidNum = runningInstancePidNum;
+ /* Report this pid to the activity log */
+ [HBUtilities writeToActivityLog: "Pid for this instance: %d", pidNum];
+ /* Tell fQueueController what our pidNum is */
+ [fQueueController setPidNum:pidNum];
 }
+ hbInstances++;
 }
 return hbInstances;
 }
@@ -498,10 +469,10 @@
 - (void) didDimissReloadQueue: (NSWindow *)sheet returnCode: (int)returnCode contextInfo: (void *)contextInfo
 {
 
- [self writeToActivityLog: "didDimissReloadQueue number of hb instances:%d", hbInstanceNum];
- if (returnCode == NSAlertOtherReturn)
+ [HBUtilities writeToActivityLog: "didDimissReloadQueue number of hb instances:%d", hbInstanceNum];
+ if (returnCode == NSAlertSecondButtonReturn)
 {
- [self writeToActivityLog: "didDimissReloadQueue NSAlertOtherReturn Chosen"];
+ [HBUtilities writeToActivityLog: "didDimissReloadQueue NSAlertSecondButtonReturn Chosen"];
 [self clearQueueAllItems];
 
 /* We show whichever open source window specified in LaunchSourceBehavior preference key */
@@ -517,52 +488,65 @@
 }
 else
 {
- [self writeToActivityLog: "didDimissReloadQueue First Button Chosen"];
+ [HBUtilities writeToActivityLog: "didDimissReloadQueue NSAlertFirstButtonReturn Chosen"];
 if (hbInstanceNum == 1)
 {
 
 [self setQueueEncodingItemsAsPending];
 }
+ [self reloadQueue];
 [self showQueueWindow:NULL];
 }
 }
 
 - (NSApplicationTerminateReply) applicationShouldTerminate: (NSApplication *) app
 {
-
- 
 hb_state_t s;
- hb_get_state( fQueueEncodeLibhb, &s );
- 
- if ( s.state != HB_STATE_IDLE )
+ hb_get_state2(fQueueEncodeLibhb, &s);
+
+ if (s.state != HB_STATE_IDLE)
 {
- int result = NSRunCriticalAlertPanel(
- NSLocalizedString(@"Are you sure you want to quit HandBrake?", nil),
- NSLocalizedString(@"If you quit HandBrake your current encode will be reloaded into your queue at next launch. Do you want to quit anyway?", nil),
- NSLocalizedString(@"Quit", nil), NSLocalizedString(@"Don't Quit", nil), nil, @"A movie" );
- 
- if (result == NSAlertDefaultReturn)
+ NSAlert *alert = [[NSAlert alloc] init];
+ [alert setMessageText:NSLocalizedString(@"Are you sure you want to quit HandBrake?", nil)];
+ [alert setInformativeText:NSLocalizedString(@"If you quit HandBrake your current encode will be reloaded into your queue at next launch. Do you want to quit anyway?", nil)];
+ [alert addButtonWithTitle:NSLocalizedString(@"Quit", nil)];
+ [alert addButtonWithTitle:NSLocalizedString(@"Don't Quit", nil)];
+ [alert setAlertStyle:NSCriticalAlertStyle];
+
+ NSInteger result = [alert runModal];
+ [alert release];
+
+ if (result == NSAlertFirstButtonReturn)
 {
 return NSTerminateNow;
 }
 else
+ {
 return NSTerminateCancel;
+ }
 }
- 
+
 // Warn if items still in the queue
- else if ( fPendingCount > 0 )
+ else if (fPendingCount > 0)
 {
- int result = NSRunCriticalAlertPanel(
- NSLocalizedString(@"Are you sure you want to quit HandBrake?", nil),
- NSLocalizedString(@"There are pending encodes in your queue. Do you want to quit anyway?",nil),
- NSLocalizedString(@"Quit", nil), NSLocalizedString(@"Don't Quit", nil), nil);
- 
- if ( result == NSAlertDefaultReturn )
+ NSAlert *alert = [[NSAlert alloc] init];
+ [alert setMessageText:NSLocalizedString(@"Are you sure you want to quit HandBrake?", nil)];
+ [alert setInformativeText:NSLocalizedString(@"There are pending encodes in your queue. Do you want to quit anyway?",nil)];
+ [alert addButtonWithTitle:NSLocalizedString(@"Quit", nil)];
+ [alert addButtonWithTitle:NSLocalizedString(@"Don't Quit", nil)];
+ [alert setAlertStyle:NSCriticalAlertStyle];
+ NSInteger result = [alert runModal];
+ [alert release];
+ if (result == NSAlertFirstButtonReturn)
+ {
 return NSTerminateNow;
+ }
 else
+ {
 return NSTerminateCancel;
+ }
 }
- 
+
 return NSTerminateNow;
 }
 
@@ -571,19 +555,22 @@
 // When the application is closed and we still have some files in the dragDropFiles array
 // it's highly probable that the user throw a lot of files and just want to reset this
 [[NSUserDefaults standardUserDefaults] removeObjectForKey:dragDropFiles];
- 
+
+ [presetManager savePresets];
+ [presetManager release];
+
+ [self closeQueueFSEvent];
 [currentQueueEncodeNameString release];
 [browsedSourceDisplayName release];
 [outputPanel release];
 	[fQueueController release];
 [fPreviewController release];
 [fPictureController release];
- [fApplicationIcon release];
+ [dockTile release];
 
 hb_close(&fHandle);
 hb_close(&fQueueEncodeLibhb);
 hb_global_close();
-
 }
 
 
@@ -591,22 +578,7 @@
 {
 [fWindow center];
 [fWindow setExcludedFromWindowsMenu:NO];
- 
- [fAdvancedOptions setView:fAdvancedView];
- 
- /* lets setup our presets drawer for drag and drop here */
- [fPresetsOutlineView registerForDraggedTypes: [NSArray arrayWithObject:DragDropSimplePboardType] ];
- [fPresetsOutlineView setDraggingSourceOperationMask:NSDragOperationEvery forLocal:YES];
- [fPresetsOutlineView setVerticalMotionCanBeginDrag: YES];
- 
- /* Initialize currentScanCount so HB can use it to
- evaluate successive scans */
-	currentScanCount = 0;
- 
- 
- /* Init UserPresets .plist */
-	[self loadPresets];
-	
+
 fRipIndicatorShown = NO; // initially out of view in the nib
 
 /* For 64 bit builds, the threaded animation in the progress
@@ -622,149 +594,167 @@
 
 [fScanIndicator setUsesThreadedAnimation:NO];
 [fRipIndicator setUsesThreadedAnimation:NO];
- 
- 
- 
+
+ // Presets initialization
+ [self checkBuiltInsForUpdates];
+ [self buildPresetsMenu];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(buildPresetsMenu) name:HBPresetsChangedNotification object:nil];
+
+ [fPresetDrawer setDelegate:self];
+ NSSize drawerSize = NSSizeFromString([[NSUserDefaults standardUserDefaults]
+ stringForKey:@"HBDrawerSize"]);
+ if (drawerSize.width)
+ {
+ [fPresetDrawer setContentSize: drawerSize];
+ }
+
 	/* Show/Dont Show Presets drawer upon launch based
- on user preference DefaultPresetsDrawerShow*/
-	if( [[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultPresetsDrawerShow"] > 0 )
+ on user preference DefaultPresetsDrawerShow */
+	if ([[NSUserDefaults standardUserDefaults] boolForKey:@"HBDefaultPresetsDrawerShow"])
 	{
- [fPresetDrawer setDelegate:self];
- NSSize drawerSize = NSSizeFromString( [[NSUserDefaults standardUserDefaults] 
- stringForKey:@"Drawer Size"] );
- if( drawerSize.width )
- [fPresetDrawer setContentSize: drawerSize];
-		[fPresetDrawer open];
+		[fPresetDrawer open:self];
 	}
- 
- /* Initially set the dvd angle widgets to hidden (dvdnav only) */
- [fSrcAngleLabel setHidden:YES];
- [fSrcAnglePopUp setHidden:YES];
- 
+
 /* Setup the start / stop popup */
 [fEncodeStartStopPopUp removeAllItems];
 [fEncodeStartStopPopUp addItemWithTitle: @"Chapters"];
 [fEncodeStartStopPopUp addItemWithTitle: @"Seconds"];
 [fEncodeStartStopPopUp addItemWithTitle: @"Frames"];
- /* Align the start / stop widgets with the chapter popups */
- [fSrcTimeStartEncodingField setFrameOrigin:[fSrcChapterStartPopUp frame].origin];
- [fSrcTimeEndEncodingField setFrameOrigin:[fSrcChapterEndPopUp frame].origin];
+
+ // Align the start / stop widgets with the chapter popups
+ NSPoint startPoint = [fSrcChapterStartPopUp frame].origin;
+ startPoint.y += 2;
+
+ NSPoint endPoint = [fSrcChapterEndPopUp frame].origin;
+ endPoint.y += 2;
+
+ [fSrcTimeStartEncodingField setFrameOrigin:startPoint];
+ [fSrcTimeEndEncodingField setFrameOrigin:endPoint];
 
- [fSrcFrameStartEncodingField setFrameOrigin:[fSrcChapterStartPopUp frame].origin];
- [fSrcFrameEndEncodingField setFrameOrigin:[fSrcChapterEndPopUp frame].origin];
+ [fSrcFrameStartEncodingField setFrameOrigin:startPoint];
+ [fSrcFrameEndEncodingField setFrameOrigin:endPoint];
 
 /* Destination box*/
 NSMenuItem *menuItem;
 [fDstFormatPopUp removeAllItems];
- // MP4 file
- menuItem = [[fDstFormatPopUp menu] addItemWithTitle:@"MP4 file" action: NULL keyEquivalent: @""];
- [menuItem setTag: HB_MUX_MP4];
-	// MKV file
- menuItem = [[fDstFormatPopUp menu] addItemWithTitle:@"MKV file" action: NULL keyEquivalent: @""];
- [menuItem setTag: HB_MUX_MKV];
- 
- [fDstFormatPopUp selectItemAtIndex: 0];
- 
- [self formatPopUpChanged:nil];
- 
-	/* We enable the create chapters checkbox here since we are .mp4 */
-	[fCreateChapterMarkers setEnabled: YES];
-	if ([fDstFormatPopUp indexOfSelectedItem] == 0 && [[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultChapterMarkers"] > 0)
-	{
-		[fCreateChapterMarkers setState: NSOnState];
-	}
- 
- 
- 
- 
- [fDstFile2Field setStringValue: [NSString stringWithFormat:
- @"%@/Desktop/Movie.mp4", NSHomeDirectory()]];
- 
- /* Video encoder */
- [fVidEncoderPopUp removeAllItems];
- [fVidEncoderPopUp addItemWithTitle: @"FFmpeg"];
- 
- /* setup our x264 presets widgets - this only needs to be done once */
- [self setupX264PresetsWidgets: nil];
- 
- /* Video quality */
-	[fVidBitrateField setIntValue: 1000];
- [fVidQualityMatrix selectCell: fVidBitrateCell];
- [self videoMatrixChanged:nil];
- 
- /* Video framerate */
- [fVidRatePopUp removeAllItems];
-	[fVidRatePopUp addItemWithTitle: NSLocalizedString( @"Same as source", @"" )];
- for( int i = 0; i < hb_video_rates_count; i++ )
+ for (const hb_container_t *container = hb_container_get_next(NULL);
+ container != NULL;
+ container = hb_container_get_next(container))
 {
- if ([[NSString stringWithUTF8String: hb_video_rates[i].string] isEqualToString: [NSString stringWithFormat: @"%.3f",23.976]])
-		{
-			[fVidRatePopUp addItemWithTitle:[NSString stringWithFormat: @"%@%@",
- [NSString stringWithUTF8String: hb_video_rates[i].string], @" (NTSC Film)"]];
-		}
-		else if ([[NSString stringWithUTF8String: hb_video_rates[i].string] isEqualToString: [NSString stringWithFormat: @"%d",25]])
-		{
-			[fVidRatePopUp addItemWithTitle:[NSString stringWithFormat: @"%@%@",
- [NSString stringWithUTF8String: hb_video_rates[i].string], @" (PAL Film/Video)"]];
-		}
-		else if ([[NSString stringWithUTF8String: hb_video_rates[i].string] isEqualToString: [NSString stringWithFormat: @"%.2f",29.97]])
-		{
-			[fVidRatePopUp addItemWithTitle:[NSString stringWithFormat: @"%@%@",
- [NSString stringWithUTF8String: hb_video_rates[i].string], @" (NTSC Video)"]];
-		}
-		else
-		{
-			[fVidRatePopUp addItemWithTitle:
- [NSString stringWithUTF8String: hb_video_rates[i].string]];
-		}
+ NSString *title = nil;
+ if (container->format & HB_MUX_MASK_MP4)
+ {
+ title = @"MP4 File";
+ }
+ else if (container->format & HB_MUX_MASK_MKV)
+ {
+ title = @"MKV File";
+ }
+ else
+ {
+ title = [NSString stringWithUTF8String:container->name];
+ }
+ menuItem = [[fDstFormatPopUp menu] addItemWithTitle:title
+ action:nil
+ keyEquivalent:@""];
+ [menuItem setTag:container->format];
 }
- [fVidRatePopUp selectItemAtIndex: 0];
-	
+ // select the first container
+ [fDstFormatPopUp selectItemAtIndex:0];
+ [self formatPopUpChanged:nil];
+
+ [fDstFile2Field setStringValue:[NSString
+ stringWithFormat:@"%@/Desktop/Movie.mp4",
+ NSHomeDirectory()]];
+
 	/* Set Auto Crop to On at launch */
 [fPictureController setAutoCrop:YES];
 		
 /* Bottom */
 [fStatusField setStringValue: @""];
 
- [self enableUI: NO];
 	[self setupToolbar];
- 
-	/* We disable the Turbo 1st pass checkbox since we are not x264 */
-	[fVidTurboPassCheck setEnabled: NO];
-	[fVidTurboPassCheck setState: NSOffState];
- 
- /* Auto Passthru advanced options box */
- [fAudioAutoPassthruBox setHidden:NO];
- 
- 
-	/* lets get our default prefs here */
-	[self getDefaultPresets:nil];
-	/* lets initialize the current successful scancount here to 0 */
-	currentSuccessfulScanCount = 0;
- 
+
 /* Register HBController's Window as a receiver for files/folders drag & drop operations */
 [fWindow registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
+
+ // Set up the preset drawer
+ fPresetsView = [[HBPresetsViewController alloc] initWithPresetManager:presetManager];
+ [fPresetDrawer setContentView:[fPresetsView view]];
+ fPresetsView.delegate = self;
+ [[fPresetDrawer contentView] setAutoresizingMask:( NSViewWidthSizable | NSViewHeightSizable )];
+
+ // Set up the chapters title view
+ fChapterTitlesController = [[HBChapterTitlesController alloc] init];
+ [fChaptersTitlesTab setView:[fChapterTitlesController view]];
+
+ // setup the subtitles view
+ fSubtitlesViewController = [[HBSubtitlesController alloc] init];
+	[fSubtitlesTab setView:[fSubtitlesViewController view]];
+
+	// setup the audio controller
+ fAudioController = [[HBAudioController alloc] init];
+	[fAudioTab setView:[fAudioController view]];
+
+ // setup the advanced view controller
+ fAdvancedOptions = [[HBAdvancedController alloc] init];
+	[fAdvancedTab setView:[fAdvancedOptions view]];
+
+ // setup the video view controller
+ fVideoController = [[HBVideoController alloc] init];
+ fVideoController.fAdvancedOptions = fAdvancedOptions;
+ fVideoController.fHBController = self;
+	[fVideoTab setView:[fVideoController view]];
+
+ [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
+ forKeyPath:@"values.HBShowAdvancedTab"
+ options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial
+ context:NULL];
+
+ [fWindow recalculateKeyViewLoop];
 }
 
-- (void) enableUI: (bool) b
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+ if (context == NULL)
+ {
+ if ([keyPath isEqualToString:@"values.HBShowAdvancedTab"])
+ {
+ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"HBShowAdvancedTab"])
+ {
+ if (![[fMainTabView tabViewItems] containsObject:fAdvancedTab])
+ {
+ [fMainTabView insertTabViewItem:fAdvancedTab atIndex:3];
+ [fAdvancedTab release];
+ }
+ }
+ else
+ {
+ [fAdvancedTab retain];
+ [fMainTabView removeTabViewItem:fAdvancedTab];
+ }
+ }
+ }
+ else
+ {
+ [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+ }
+}
+
+- (void) enableUI: (BOOL) b
 {
 NSControl * controls[] =
 {
 fSrcTitleField, fSrcTitlePopUp,
- fSrcChapterField, fSrcChapterStartPopUp, fSrcChapterToField,
+ fSrcChapterStartPopUp, fSrcChapterToField,
 fSrcChapterEndPopUp, fSrcDuration1Field, fSrcDuration2Field,
 fDstFormatField, fDstFormatPopUp, fDstFile1Field, fDstFile2Field,
- fDstBrowseButton, fVidRateField, fVidRatePopUp, fVidEncoderField,
- fVidEncoderPopUp, fVidQualityField, fVidQualityMatrix,
- fPictureSettingsField, fPictureFiltersField,
- fSubField, fSubPopUp, fPresetsAdd, fPresetsDelete, fSrcAngleLabel,
- fSrcAnglePopUp, fCreateChapterMarkers, fVidTurboPassCheck,
- fDstMp4LargeFileCheck, fSubForcedCheck, fPresetsOutlineView,
- fDstMp4HttpOptFileCheck, fDstMp4iPodFileCheck, fVidQualityRFField,
- fVidQualityRFLabel, fEncodeStartStopPopUp, fSrcTimeStartEncodingField,
+ fDstBrowseButton, fSrcAngleLabel, fSrcAnglePopUp,
+ fDstMp4HttpOptFileCheck, fDstMp4iPodFileCheck,
+ fEncodeStartStopPopUp, fSrcTimeStartEncodingField,
 fSrcTimeEndEncodingField, fSrcFrameStartEncodingField,
- fSrcFrameEndEncodingField, fLoadChaptersButton, fSaveChaptersButton,
- fFramerateMatrix,
+ fSrcFrameEndEncodingField,
 
 };
 for (unsigned i = 0; i < (sizeof(controls) / sizeof(NSControl*)); i++)
@@ -782,78 +772,20 @@
 }
 [controls[i] setEnabled: b];
 }
- 
- 
-	if (b) 
- {
- 
- /* we also call calculatePictureSizing here to sense check if we already have vfr selected */
- [self calculatePictureSizing:nil];
- /* Also enable the preview window hud controls */
- [fPictureController enablePreviewHudControls];
- }
- else 
- {
- 
-		[fPresetsOutlineView setEnabled: NO];
- [fPictureController disablePreviewHudControls];
- }
- 
- [self videoMatrixChanged:nil];
- [self enableX264Widgets:b];
-}
 
-
-/***********************************************************************
- * updateDockIcon
- ***********************************************************************
- * Updates two DockTextFields on the dockTile,
- * one with total percentage, the other one with the ETA.
- * The ETA string is formated by the callers
- **********************************************************************/
-- (void) updateDockIcon: (double) progress withETA:(NSString*)etaStr
-{
- if (progress < 0.0 || progress > 1.0)
- {
- [percentField setHidden:YES];
- [timeField setHidden:YES];
- }
- else
- {
- [percentField setTextToDisplay:[NSString stringWithFormat:dockTilePercentFormat,progress * 100]];
- [percentField setHidden:NO];
- [timeField setTextToDisplay:etaStr];
- [timeField setHidden:NO];
- }
- 
- [dockTile display];
+ [fPresetsView setUIEnabled:b];
+ [fVideoController setUIEnabled:b];
+ [fAudioController setUIEnabled:b];
+ [fSubtitlesViewController setUIEnabled:b];
+ [fChapterTitlesController setUIEnabled:b];
 }
 
 - (void) updateUI: (NSTimer *) timer
 {
- 
 /* Update UI for fHandle (user scanning instance of libhb ) */
- 
- hb_list_t * list;
- list = hb_get_titles( fHandle );
- /* check to see if there has been a new scan done
- this bypasses the constraints of HB_STATE_WORKING
- not allowing setting a newly scanned source */
-	int checkScanCount = hb_get_scancount( fHandle );
-	if( checkScanCount > currentScanCount )
-	{
-		currentScanCount = checkScanCount;
- [fScanIndicator setIndeterminate: NO];
- [fScanIndicator setDoubleValue: 0.0];
- [fScanIndicator setHidden: YES];
- [fScanHorizontalLine setHidden: NO];
- 
-		[self showNewScan:nil];
-	}
- 
 hb_state_t s;
 hb_get_state( fHandle, &s );
- 
+
 switch( s.state )
 {
 case HB_STATE_IDLE:
@@ -888,7 +820,7 @@
 [fScanIndicator setDoubleValue: 0.0];
 [fScanIndicator setHidden: YES];
 [fScanHorizontalLine setHidden: NO];
-			[self writeToActivityLog:"ScanDone state received from fHandle"];
+			[HBUtilities writeToActivityLog:"ScanDone state received from fHandle"];
 [self showNewScan:nil];
 [[fWindow toolbar] validateVisibleItems];
 
@@ -920,24 +852,10 @@
 break;
 }
 }
- 
- 
+
 /* Update UI for fQueueEncodeLibhb */
- // hb_list_t * list;
- // list = hb_get_titles( fQueueEncodeLibhb ); //fQueueEncodeLibhb
- /* check to see if there has been a new scan done
- this bypasses the constraints of HB_STATE_WORKING
- not allowing setting a newly scanned source */
-	
- checkScanCount = hb_get_scancount( fQueueEncodeLibhb );
-	if( checkScanCount > currentScanCount )
-	{
-		currentScanCount = checkScanCount;
-	}
- 
- //hb_state_t s;
 hb_get_state( fQueueEncodeLibhb, &s );
- 
+
 switch( s.state )
 {
 case HB_STATE_IDLE:
@@ -969,7 +887,7 @@
 #define p s.param.scandone
 case HB_STATE_SCANDONE:
 {
-			[self writeToActivityLog:"ScanDone state received from fQueueEncodeLibhb"];
+			[HBUtilities writeToActivityLog:"ScanDone state received from fQueueEncodeLibhb"];
 [self processNewQueueEncode];
 [[fWindow toolbar] validateVisibleItems];
 
@@ -982,11 +900,9 @@
 
 case HB_STATE_SEARCHING:
 		{
- NSMutableString * string;
- NSString * pass_desc;
- 
+ NSMutableString *string;
+
 /* Update text field */
- pass_desc = @"";
 //string = [NSMutableString stringWithFormat:
 // NSLocalizedString( @"Searching for start point: pass %d %@ of %d, %.2f %%", @"" ),
 // p.job_cur, pass_desc, p.job_count, 100.0 * p.progress];
@@ -1039,7 +955,8 @@
 			/* Update text field */
 if (p.job_cur == 1 && p.job_count > 1)
 {
- if ([[QueueFileArray objectAtIndex:currentQueueEncodeIndex] objectForKey:@"SubtitleList"] && [[[[[QueueFileArray objectAtIndex:currentQueueEncodeIndex]objectForKey:@"SubtitleList"] objectAtIndex:0] objectForKey:@"subtitleSourceTrackNum"] intValue] == 1)
+ if (QueueFileArray[currentQueueEncodeIndex][@"SubtitleList"] &&
+ [[QueueFileArray[currentQueueEncodeIndex][@"SubtitleList"] firstObject][keySubTrackIndex] intValue] == -1)
 {
 pass_desc = @"(subtitle scan)"; 
 }
@@ -1124,7 +1041,7 @@
 else
 etaStr = @"~";
 
- [self updateDockIcon:progress_total withETA:etaStr];
+ [dockTile updateDockIcon:progress_total withETA:etaStr];
 
 dockIconProgress += dockTileUpdateFrequency;
 }
@@ -1145,7 +1062,7 @@
 [fRipIndicator startAnimation: nil];
 
 /* Update dock icon */
- [self updateDockIcon:1.0 withETA:@""];
+ [dockTile updateDockIcon:1.0 withETA:@""];
 
 			break;
 }
@@ -1173,7 +1090,7 @@
 [[fWindow toolbar] validateVisibleItems];
 
 /* Restore dock icon */
- [self updateDockIcon:-1.0 withETA:@""];
+ [dockTile updateDockIcon:-1.0 withETA:@""];
 dockIconProgress = 0;
 
 if( fRipIndicatorShown )
@@ -1221,32 +1138,13 @@
 break;
 }
 }
- 
- /* Since we can use multiple instance off of the same queue file it is imperative that we keep the QueueFileArray updated off of the QueueFile.plist
- * so we go ahead and do it in this existing timer as opposed to using a new one */
- 
- NSMutableArray * tempQueueArray = [[NSMutableArray alloc] initWithContentsOfFile:QueueFile];
- [QueueFileArray setArray:tempQueueArray];
- [tempQueueArray release]; 
- /* Send Fresh QueueFileArray to fQueueController to update queue window */
- [fQueueController setQueueArray: QueueFileArray];
+
 [self getQueueStats];
- 
- /* Update the visibility of the Auto Passthru advanced options box */
- if ([[NSUserDefaults standardUserDefaults] boolForKey:@"ShowAdvancedOptsForAutoPassthru"] == YES)
- {
- [fAudioAutoPassthruBox setHidden:NO];
- }
- else
- {
- [fAudioAutoPassthruBox setHidden:YES];
- }
- 
- 
+
 // Finally after all UI updates, we look for a next dragDropItem to scan
 // fWillScan will signal that a scan will be launched, so we need to wait
 // the next idle cycle after the scan
- hb_get_state( fHandle, &s );
+ hb_get_state2( fHandle, &s );
 if (s.state == HB_STATE_IDLE && !fWillScan)
 {
 // Continue to loop on the other drag & drop files if any
@@ -1282,25 +1180,10 @@
 {
 [[NSUserDefaults standardUserDefaults] removeObjectForKey:dragDropFiles];
 }
- }
- }
-}
-
-/* We use this to write messages to stderr from the macgui which show up in the activity window and log*/
-- (void) writeToActivityLog:(const char *) format, ...
-{
- va_list args;
- va_start(args, format);
- if (format != nil)
- {
- char str[1024];
- vsnprintf( str, 1024, format, args );
 
- time_t _now = time( NULL );
- struct tm * now = localtime( &_now );
- fprintf(stderr, "[%02d:%02d:%02d] macgui: %s\n", now->tm_hour, now->tm_min, now->tm_sec, str );
+ [filesList release];
+ }
 }
- va_end(args);
 }
 
 #pragma mark -
@@ -1441,7 +1324,7 @@
 {
 hb_state_t s;
 
- hb_get_state( fHandle, &s );
+ hb_get_state2( fHandle, &s );
 if (s.state == HB_STATE_SCANNING)
 {
 
@@ -1560,24 +1443,17 @@
 - (BOOL) validateMenuItem: (NSMenuItem *) menuItem
 {
 SEL action = [menuItem action];
- 
+
 hb_state_t s;
- hb_get_state2( fHandle, &s );
- 
- if (fHandle)
+ hb_get_state2( fQueueEncodeLibhb, &s );
+
+ if (fQueueEncodeLibhb)
 {
 if (action == @selector(addToQueue:) || action == @selector(addAllTitlesToQueue:) || action == @selector(showPicturePanel:) || action == @selector(showAddPresetPanel:))
 return SuccessfulScan && [fWindow attachedSheet] == nil;
 
- if (action == @selector(browseSources:))
- {
- if (s.state == HB_STATE_SCANNING)
- return NO;
- else
- return [fWindow attachedSheet] == nil;
- }
 if (action == @selector(selectDefaultPreset:))
- return [fPresetsOutlineView selectedRow] >= 0 && [fWindow attachedSheet] == nil;
+ return [fWindow attachedSheet] == nil;
 if (action == @selector(Pause:))
 {
 if (s.state == HB_STATE_WORKING)
@@ -1612,10 +1488,26 @@
 else
 return NO;
 }
- }
- if( action == @selector(setDefaultPreset:) )
- {
- return [fPresetsOutlineView selectedRow] != -1;
+ if (action == @selector(browseSources:))
+ {
+ hb_get_state2( fHandle, &s );
+
+ if (s.state == HB_STATE_SCANNING)
+ return NO;
+ else
+ return [fWindow attachedSheet] == nil;
+ }
+ if (action == @selector(selectPresetFromMenu:))
+ {
+ if (!self.customPreset && [menuItem.representedObject isEqualTo:self.selectedPreset])
+ {
+ [menuItem setState:NSOnState];
+ }
+ else
+ {
+ [menuItem setState:NSOffState];
+ }
+ }
 }
 
 return YES;
@@ -1661,7 +1553,7 @@
 NSString *sendToApp = [[NSUserDefaults standardUserDefaults] objectForKey: @"SendCompletedEncodeToApp"];
 if (![sendToApp isEqualToString:@"None"])
 {
- [self writeToActivityLog: "trying to send encode to: %s", [sendToApp UTF8String]];
+ [HBUtilities writeToActivityLog: "trying to send encode to: %s", [sendToApp UTF8String]];
 NSAppleScript *myScript = [[NSAppleScript alloc] initWithSource: [NSString stringWithFormat: @"%@%@%@%@%@", @"tell application \"",sendToApp,@"\" to open (POSIX file \"", filePath, @"\")"]];
 [myScript executeAndReturnError: nil];
 [myScript release];
@@ -1683,20 +1575,22 @@
 [[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Alert Window And Growl"] )
 {
 /*On Screen Notification*/
- int status;
- status = NSRunAlertPanel(@"Put down that cocktail…",@"Your HandBrake queue is done!", @"OK", nil, nil);
+ NSAlert *alert = [[NSAlert alloc] init];
+ [alert setMessageText:@"Put down that cocktail…"];
+ [alert setInformativeText:@"Your HandBrake queue is done!"];
 [NSApp requestUserAttention:NSCriticalRequest];
+ [alert runModal];
+ [alert release];
 }
- 
+
 /* If sleep has been selected */
 if( [[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Put Computer To Sleep"] )
 {
 /* Sleep */
- NSDictionary* errorDict;
- NSAppleEventDescriptor* returnDescriptor = nil;
- NSAppleScript* scriptObject = [[NSAppleScript alloc] initWithSource:
+ NSDictionary *errorDict;
+ NSAppleScript *scriptObject = [[NSAppleScript alloc] initWithSource:
 @"tell application \"Finder\" to sleep"];
- returnDescriptor = [scriptObject executeAndReturnError: &errorDict];
+ [scriptObject executeAndReturnError: &errorDict];
 [scriptObject release];
 }
 /* If Shutdown has been selected */
@@ -1704,10 +1598,9 @@
 {
 /* Shut Down */
 NSDictionary* errorDict;
- NSAppleEventDescriptor* returnDescriptor = nil;
 NSAppleScript* scriptObject = [[NSAppleScript alloc] initWithSource:
 @"tell application \"Finder\" to shut down"];
- returnDescriptor = [scriptObject executeAndReturnError: &errorDict];
+ [scriptObject executeAndReturnError: &errorDict];
 [scriptObject release];
 }
 }
@@ -1720,7 +1613,7 @@
 {
 
 hb_state_t s;
- hb_get_state( fHandle, &s );
+ hb_get_state2( fHandle, &s );
 if (s.state == HB_STATE_SCANNING)
 {
 [self cancelScanning:nil];
@@ -1734,23 +1627,23 @@
 [panel setAllowsMultipleSelection: NO];
 [panel setCanChooseFiles: YES];
 [panel setCanChooseDirectories: YES ];
- NSString * sourceDirectory;
-	if ([[NSUserDefaults standardUserDefaults] stringForKey:@"LastSourceDirectory"])
+ NSURL *sourceDirectory;
+	if ([[NSUserDefaults standardUserDefaults] URLForKey:@"LastSourceDirectoryURL"])
 	{
-		sourceDirectory = [[NSUserDefaults standardUserDefaults] stringForKey:@"LastSourceDirectory"];
+		sourceDirectory = [[NSUserDefaults standardUserDefaults] URLForKey:@"LastSourceDirectoryURL"];
 	}
 	else
 	{
-		sourceDirectory = @"~/Desktop";
-		sourceDirectory = [sourceDirectory stringByExpandingTildeInPath];
+		sourceDirectory = [[NSURL fileURLWithPath:NSHomeDirectory()] URLByAppendingPathComponent:@"Desktop"];
 	}
 /* we open up the browse sources sheet here and call for browseSourcesDone after the sheet is closed
 * to evaluate whether we want to specify a title, we pass the sender in the contextInfo variable
 */
- [panel beginSheetForDirectory: sourceDirectory file: nil types: nil
- modalForWindow: fWindow modalDelegate: self
- didEndSelector: @selector( browseSourcesDone:returnCode:contextInfo: )
- contextInfo: sender]; 
+ [panel setDirectoryURL:sourceDirectory];
+ [panel beginSheetModalForWindow:fWindow completionHandler:
+ ^(NSInteger result) {
+ [self browseSourcesDone:panel returnCode:(int)result contextInfo:sender];
+ }];
 }
 
 - (void) browseSourcesDone: (NSOpenPanel *) sheet
@@ -1763,13 +1656,16 @@
 /* User selected a file to open */
 	if( returnCode == NSOKButton )
 {
+ // We started a new scan, so set SuccessfulScan to no for now.
+ SuccessfulScan = NO;
+
 /* Free display name allocated previously by this code */
 [browsedSourceDisplayName release];
 
- NSString *scanPath = [[sheet filenames] objectAtIndex: 0];
+ NSURL *scanURL = [[sheet URLs] objectAtIndex: 0];
 /* we set the last searched source directory in the prefs here */
- NSString *sourceDirectory = [scanPath stringByDeletingLastPathComponent];
- [[NSUserDefaults standardUserDefaults] setObject:sourceDirectory forKey:@"LastSourceDirectory"];
+ NSURL *sourceDirectory = [scanURL URLByDeletingLastPathComponent];
+ [[NSUserDefaults standardUserDefaults] setURL:sourceDirectory forKey:@"LastSourceDirectoryURL"];
 /* we order out sheet, which is the browse window as we need to open
 * the title selection sheet right away
 */
@@ -1783,19 +1679,19 @@
 * purposes in the title panel
 */
 /* Full Path */
- [fScanSrcTitlePathField setStringValue:scanPath];
+ [fScanSrcTitlePathField setStringValue:[scanURL path]];
 NSString *displayTitlescanSourceName;
 
- if ([[scanPath lastPathComponent] isEqualToString: @"VIDEO_TS"])
+ if ([[scanURL lastPathComponent] isEqualToString: @"VIDEO_TS"])
 {
 /* If VIDEO_TS Folder is chosen, choose its parent folder for the source display name
 we have to use the title->path value so we get the proper name of the volume if a physical dvd is the source*/
- displayTitlescanSourceName = [[scanPath stringByDeletingLastPathComponent] lastPathComponent];
+ displayTitlescanSourceName = [[scanURL URLByDeletingLastPathComponent] lastPathComponent];
 }
 else
 {
 /* if not the VIDEO_TS Folder, we can assume the chosen folder is the source name */
- displayTitlescanSourceName = [scanPath lastPathComponent];
+ displayTitlescanSourceName = [scanURL lastPathComponent];
 }
 /* we set the source display name in the title selection dialogue */
 [fSrcDsplyNameTitleScan setStringValue:displayTitlescanSourceName];
@@ -1809,21 +1705,21 @@
 else
 {
 /* We are just doing a standard full source scan, so we specify "0" to libhb */
- NSString *path = [[sheet filenames] objectAtIndex: 0];
+ NSURL *url = [[sheet URLs] objectAtIndex: 0];
 
 /* We check to see if the chosen file at path is a package */
- if ([[NSWorkspace sharedWorkspace] isFilePackageAtPath:path])
+ if ([[NSWorkspace sharedWorkspace] isFilePackageAtPath:[url path]])
 {
- [self writeToActivityLog: "trying to open a package at: %s", [path UTF8String]];
+ [HBUtilities writeToActivityLog: "trying to open a package at: %s", [[url path] UTF8String]];
 /* We check to see if this is an .eyetv package */
- if ([[path pathExtension] isEqualToString: @"eyetv"])
+ if ([[url pathExtension] isEqualToString: @"eyetv"])
 {
- [self writeToActivityLog:"trying to open eyetv package"];
+ [HBUtilities writeToActivityLog:"trying to open eyetv package"];
 /* We're looking at an EyeTV package - try to open its enclosed
 .mpg media file */
- browsedSourceDisplayName = [[[path stringByDeletingPathExtension] lastPathComponent] retain];
+ browsedSourceDisplayName = [[[url URLByDeletingPathExtension] lastPathComponent] retain];
 NSString *mpgname;
- int n = [[path stringByAppendingString: @"/"]
+ NSUInteger n = [[[url path] stringByAppendingString: @"/"]
 completePathIntoString: &mpgname caseSensitive: YES
 matchesIntoArray: nil
 filterTypes: [NSArray arrayWithObject: @"mpg"]];
@@ -1831,48 +1727,49 @@
 {
 /* Found an mpeg inside the eyetv package, make it our scan path 
 and call performScan on the enclosed mpeg */
- path = mpgname;
- [self writeToActivityLog:"found mpeg in eyetv package"];
- [self performScan:path scanTitleNum:0];
+ [HBUtilities writeToActivityLog:"found mpeg in eyetv package"];
+ [self performScan:mpgname scanTitleNum:0];
 }
 else
 {
 /* We did not find an mpeg file in our package, so we do not call performScan */
- [self writeToActivityLog:"no valid mpeg in eyetv package"];
+ [HBUtilities writeToActivityLog:"no valid mpeg in eyetv package"];
 }
 }
 /* We check to see if this is a .dvdmedia package */
- else if ([[path pathExtension] isEqualToString: @"dvdmedia"])
+ else if ([[url pathExtension] isEqualToString: @"dvdmedia"])
 {
 /* path IS a package - but dvdmedia packages can be treaded like normal directories */
- browsedSourceDisplayName = [[[path stringByDeletingPathExtension] lastPathComponent] retain];
- [self writeToActivityLog:"trying to open dvdmedia package"];
- [self performScan:path scanTitleNum:0];
+ browsedSourceDisplayName = [[[url URLByDeletingPathExtension] lastPathComponent] retain];
+ [HBUtilities writeToActivityLog:"trying to open dvdmedia package"];
+ [self performScan:[url path] scanTitleNum:0];
 }
 else
 {
- /* The package is not an eyetv package, so we do not call performScan */
- [self writeToActivityLog:"unable to open package"];
+ /* The package is not an eyetv package, try to open it anyway */
+ browsedSourceDisplayName = [[url lastPathComponent] retain];
+ [HBUtilities writeToActivityLog:"not a known to package"];
+ [self performScan:[url path] scanTitleNum:0];
 }
 }
 else // path is not a package, so we treat it as a dvd parent folder or VIDEO_TS folder
 {
 /* path is not a package, so we call perform scan directly on our file */
- if ([[path lastPathComponent] isEqualToString: @"VIDEO_TS"])
+ if ([[url lastPathComponent] isEqualToString: @"VIDEO_TS"])
 {
- [self writeToActivityLog:"trying to open video_ts folder (video_ts folder chosen)"];
+ [HBUtilities writeToActivityLog:"trying to open video_ts folder (video_ts folder chosen)"];
 /* If VIDEO_TS Folder is chosen, choose its parent folder for the source display name*/
- browsedSourceDisplayName = [[[path stringByDeletingLastPathComponent] lastPathComponent] retain];
+ browsedSourceDisplayName = [[[url URLByDeletingLastPathComponent] lastPathComponent] retain];
 }
 else
 {
- [self writeToActivityLog:"trying to open video_ts folder (parent directory chosen)"];
+ [HBUtilities writeToActivityLog:"trying to open video_ts folder (parent directory chosen)"];
 /* if not the VIDEO_TS Folder, we can assume the chosen folder is the source name */
 /* make sure we remove any path extension as this can also be an '.mpg' file */
- browsedSourceDisplayName = [[path lastPathComponent] retain];
+ browsedSourceDisplayName = [[url lastPathComponent] retain];
 }
 applyQueueToScan = NO;
- [self performScan:path scanTitleNum:0];
+ [self performScan:[url path] scanTitleNum:0];
 }
 
 }
@@ -1880,15 +1777,6 @@
 }
 }
 
-- (IBAction)showAboutPanel:(id)sender
-{
- NSMutableDictionary* d = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
- fApplicationIcon, @"ApplicationIcon",
- nil ];
- [NSApp orderFrontStandardAboutPanelWithOptions:d];
- [d release];
-}
-
 /* Here we open the title selection sheet where we can specify an exact title to be scanned */
 - (IBAction) showSourceTitleScanPanel: (id) sender
 {
@@ -1923,22 +1811,16 @@
 }
 
 /* Here we actually tell hb_scan to perform the source scan, using the path to source and title number*/
-- (void) performScan:(NSString *) scanPath scanTitleNum: (int) scanTitleNum
+- (void) performScan:(NSString *) scanPath scanTitleNum: (NSInteger) scanTitleNum
 {
 /* use a bool to determine whether or not we can decrypt using vlc */
 BOOL cancelScanDecrypt = 0;
 NSString *path = scanPath;
 HBDVDDetector *detector = [HBDVDDetector detectorForPath:path];
- 
- // Notify ChapterTitles that there's no title
- [fChapterTitlesDelegate resetWithTitle:nil];
- [fChapterTable reloadData];
- 
- // Notify Subtitles that there's no title
- [fSubtitlesDelegate resetWithTitle:nil];
- [fSubtitlesTable reloadData];
- 
-	//	Notify anyone interested (audio controller) that there's no title
+
+ [fPictureController setTitle:NULL];
+
+	//	Notify anyone interested (audio/subtitles/chapters controller) that there's no title
 	[[NSNotificationCenter defaultCenter] postNotification:
 	 [NSNotification notificationWithName: HBTitleChangedNotification
 								 object: self
@@ -1953,7 +1835,7 @@
 // The chosen path was actually on a DVD, so use the raw block
 // device path instead.
 path = [detector devicePath];
- [self writeToActivityLog: "trying to open a physical dvd at: %s", [scanPath UTF8String]];
+ [HBUtilities writeToActivityLog: "trying to open a physical dvd at: %s", [scanPath UTF8String]];
 
 
 NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
@@ -1968,36 +1850,48 @@
 
 /*compatible vlc not found, so we set the bool to cancel scanning to 1 */
 cancelScanDecrypt = 1;
- [self writeToActivityLog: "libdvdcss.2.dylib not found for decrypting physical dvd"];
- int status;
- status = NSRunAlertPanel(@"Please note that HandBrake does not support the removal of copy-protection from DVD Discs. You can if you wish install libdvdcss or any other 3rd party software for this function.",
- @"Videolan.org provides libdvdcss if you are not currently using another solution.", @"Get libdvdcss.pkg", @"Cancel Scan", @"Attempt Scan Anyway");
+ [HBUtilities writeToActivityLog: "libdvdcss.2.dylib not found for decrypting physical dvd"];
+ NSInteger status;
+ NSAlert *alert = [[NSAlert alloc] init];
+ [alert setMessageText:@"Please note that HandBrake does not support the removal of copy-protection from DVD Discs. You can if you wish install libdvdcss or any other 3rd party software for this function."];
+ [alert setInformativeText:@"Videolan.org provides libdvdcss if you are not currently using another solution."];
+ [alert addButtonWithTitle:@"Get libdvdcss.pkg"];
+ [alert addButtonWithTitle:@"Cancel Scan"];
+ [alert addButtonWithTitle:@"Attempt Scan Anyway"];
 [NSApp requestUserAttention:NSCriticalRequest];
- 
- if (status == NSAlertDefaultReturn)
+ status = [alert runModal];
+ [alert release];
+
+ if (status == NSAlertFirstButtonReturn)
 {
 /* User chose to go download vlc (as they rightfully should) so we send them to the vlc site */
 [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://download.videolan.org/libdvdcss/1.2.12/macosx/"]];
 }
- else if (status == NSAlertAlternateReturn)
+ else if (status == NSAlertSecondButtonReturn)
 {
 /* User chose to cancel the scan */
- [self writeToActivityLog: "Cannot open physical dvd, scan cancelled"];
+ [HBUtilities writeToActivityLog: "Cannot open physical dvd, scan cancelled"];
 }
 else
 {
 /* User chose to override our warning and scan the physical dvd anyway, at their own peril. on an encrypted dvd this produces massive log files and fails */
 cancelScanDecrypt = 0;
- [self writeToActivityLog: "User overrode copy-proteciton warning - trying to open physical dvd without decryption"];
+ [HBUtilities writeToActivityLog:"User overrode copy-protection warning - trying to open physical dvd without decryption"];
 }
 
 }
- else
+ else if (dvdcss != NULL)
 {
 /* VLC was found in /Applications so all is well, we can carry on using vlc's libdvdcss.dylib for decrypting if needed */
- [self writeToActivityLog: "libdvdcss.2.dylib found for decrypting physical dvd"];
+ [HBUtilities writeToActivityLog: "libdvdcss.2.dylib found for decrypting physical dvd"];
 dlclose(dvdcss);
 }
+ else
+ {
+ /* User chose to override our warning and scan the physical dvd anyway, at their own peril. on an encrypted dvd this produces massive log files and fails */
+ cancelScanDecrypt = 0;
+ [HBUtilities writeToActivityLog:"Copy-protection warning disabled in preferences - trying to open physical dvd without decryption"];
+ }
 }
 
 if (cancelScanDecrypt == 0)
@@ -2018,17 +1912,17 @@
 }
 if (scanTitleNum > 0)
 {
- [self writeToActivityLog: "scanning specifically for title: %d", scanTitleNum];
+ [HBUtilities writeToActivityLog: "scanning specifically for title: %d", scanTitleNum];
 }
 else
 {
 // minimum title duration doesn't apply to title-specific scan
 // it doesn't apply to batch scan either, but we can't tell it apart from DVD & BD folders here
- [self writeToActivityLog: "scanning titles with a duration of %d seconds or more", min_title_duration_seconds];
+ [HBUtilities writeToActivityLog: "scanning titles with a duration of %d seconds or more", min_title_duration_seconds];
 }
 
 hb_system_sleep_prevent(fHandle);
- hb_scan(fHandle, [path UTF8String], scanTitleNum, hb_num_previews, 1 ,
+ hb_scan(fHandle, [path UTF8String], (int)scanTitleNum, hb_num_previews, 1 ,
 min_title_duration_ticks);
 
 [fSrcDVD2Field setStringValue:@"Scanning new source…"];
@@ -2058,16 +1952,11 @@
 /* We display a message if a valid dvd source was not chosen */
 [fSrcDVD2Field setStringValue: @"No Valid Source Found"];
 SuccessfulScan = NO;
- 
- // Notify ChapterTitles that there's no title
- [fSubtitlesDelegate resetWithTitle:nil];
- [fSubtitlesTable reloadData];
- 
- // Notify Subtitles that there's no title
- [fChapterTitlesDelegate resetWithTitle:nil];
- [fChapterTable reloadData];
 
-			//	Notify anyone interested (audio controller) that there's no title
+ // Notify PictureController that there's no title
+ [fPictureController setTitle:NULL];
+
+			//	Notify anyone interested (video/audio/subtitles/chapters controller) that there's no title
 			[[NSNotificationCenter defaultCenter] postNotification:
 			 [NSNotification notificationWithName: HBTitleChangedNotification
 										 object: self
@@ -2080,24 +1969,18 @@
 if (applyQueueToScan == YES)
 {
 /* we are a rescan of an existing queue item and need to apply the queued settings to the scan */
- [self writeToActivityLog: "showNewScan: This is a queued item rescan"];
+ [HBUtilities writeToActivityLog: "showNewScan: This is a queued item rescan"];
 
 }
 else if (applyQueueToScan == NO)
 {
- [self writeToActivityLog: "showNewScan: This is a new source item scan"];
+ [HBUtilities writeToActivityLog: "showNewScan: This is a new source item scan"];
 }
 else
 {
- [self writeToActivityLog: "showNewScan: cannot grok scan status"];
+ [HBUtilities writeToActivityLog: "showNewScan: cannot grok scan status"];
 }
- 
- /* We increment the successful scancount here by one,
- which we use at the end of this function to tell the gui
- if this is the first successful scan since launch and whether
- or not we should set all settings to the defaults */
- currentSuccessfulScanCount++;
- 
+
 [[fWindow toolbar] validateVisibleItems];
 
 [fSrcTitlePopUp removeAllItems];
@@ -2114,12 +1997,8 @@
 [fSrcDVD2Field setStringValue:browsedSourceDisplayName];
 
 // use the correct extension based on the container
- int format = [fDstFormatPopUp indexOfSelectedItem];
- char *ext = "mp4";
- if (format == 1)
- {
- ext = "mkv";
- }
+ int videoContainer = (int)[[fDstFormatPopUp selectedItem] tag];
+ const char *ext = hb_container_get_default_extension(videoContainer);
 
 /* If its a queue rescan for edit, get the queue item output path */
 /* if not, its a new source scan. */
@@ -2140,9 +2019,9 @@
 }
 
 // set m4v extension if necessary - do not override user-specified .mp4 extension
- if (format == 0 && applyQueueToScan != YES)
+ if ((videoContainer & HB_MUX_MASK_MP4) && (applyQueueToScan != YES))
 {
- [self autoSetM4vExtension: sender];
+ [self autoSetM4vExtension:sender];
 }
 
 /* See if this is the main feature according to libhb */
@@ -2168,7 +2047,7 @@
 }
 
 /* if we are a stream, select the first title */
- if (title->type == HB_STREAM_TYPE || title->type == HB_FF_STREAM_TYPE)
+ if (title && (title->type == HB_STREAM_TYPE || title->type == HB_FF_STREAM_TYPE))
 {
 [fSrcTitlePopUp selectItemAtIndex: 0];
 }
@@ -2177,31 +2056,27 @@
 /* if not then select the main feature title */
 [fSrcTitlePopUp selectItemAtIndex: feature_title];
 }
- [self titlePopUpChanged:nil];
- 
+
 SuccessfulScan = YES;
+
+ [self titlePopUpChanged:nil];
+ [self encodeStartStopPopUpChanged:nil];
+
 [self enableUI: YES];
 
- /* if its the initial successful scan after awakeFromNib */
- if (currentSuccessfulScanCount == 1)
- {
- [self encodeStartStopPopUpChanged:nil];
- 
- [self selectDefaultPreset:nil];
- 
- // Open preview window now if it was visible when HB was closed
- if ([[NSUserDefaults standardUserDefaults] boolForKey:@"PreviewWindowIsOpen"])
- [self showPreviewWindow:nil];
+ // Open preview window now if it was visible when HB was closed
+ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"PreviewWindowIsOpen"])
+ [self showPreviewWindow:nil];
+
+ // Open picture sizing window now if it was visible when HB was closed
+ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"PictureSizeWindowIsOpen"])
+ [self showPicturePanel:nil];
 
- // Open picture sizing window now if it was visible when HB was closed
- if ([[NSUserDefaults standardUserDefaults] boolForKey:@"PictureSizeWindowIsOpen"])
- [self showPicturePanel:nil];
- 
- }
+
 if (applyQueueToScan == YES)
 {
 /* we are a rescan of an existing queue item and need to apply the queued settings to the scan */
- [self writeToActivityLog: "showNewScan: calling applyQueueSettingsToMainWindow"];
+ [HBUtilities writeToActivityLog: "showNewScan: calling applyQueueSettingsToMainWindow"];
 [self applyQueueSettingsToMainWindow:nil];
 
 }
@@ -2220,10 +2095,12 @@
 /* Open a panel to let the user choose and update the text field */
 NSSavePanel * panel = [NSSavePanel savePanel];
 	/* We get the current file name and path from the destination field here */
-	[panel beginSheetForDirectory: [[fDstFile2Field stringValue] stringByDeletingLastPathComponent] file: [[fDstFile2Field stringValue] lastPathComponent]
-				 modalForWindow: fWindow modalDelegate: self
-				 didEndSelector: @selector( browseFileDone:returnCode:contextInfo: )
-					 contextInfo: NULL];
+ NSString* destinationDirectory = [[fDstFile2Field stringValue] stringByDeletingLastPathComponent];
+ [panel setDirectoryURL:[NSURL fileURLWithPath:destinationDirectory]];
+ [panel setNameFieldStringValue:[[fDstFile2Field stringValue] lastPathComponent]];
+ [panel beginSheetModalForWindow:fWindow completionHandler:^(NSInteger result) {
+ [self browseFileDone:panel returnCode:(int)result contextInfo:sender];
+ }];
 }
 
 - (void) browseFileDone: (NSSavePanel *) sheet
@@ -2231,7 +2108,7 @@
 {
 if( returnCode == NSOKButton )
 {
- [fDstFile2Field setStringValue: [sheet filename]];
+ [fDstFile2Field setStringValue: [[sheet URL] path]];
 /* Save this path to the prefs so that on next browse destination window it opens there */
 NSString *destinationDirectory = [[fDstFile2Field stringValue] stringByDeletingLastPathComponent];
 [[NSUserDefaults standardUserDefaults] setObject:destinationDirectory forKey:@"LastDestinationDirectory"]; 
@@ -2247,11 +2124,6 @@
 [fWindow makeKeyAndOrderFront:nil];
 }
 
-- (BOOL) windowShouldClose: (id) sender
-{
- return YES;
-}
-
 - (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)flag
 {
 if( !flag ) {
@@ -2261,28 +2133,89 @@
 }
 
 - (NSSize) drawerWillResizeContents:(NSDrawer *) drawer toSize:(NSSize) contentSize {
-	[[NSUserDefaults standardUserDefaults] setObject:NSStringFromSize( contentSize ) forKey:@"Drawer Size"];
+	[[NSUserDefaults standardUserDefaults] setObject:NSStringFromSize( contentSize ) forKey:@"HBDrawerSize"];
 	return contentSize;
 }
 
 #pragma mark -
 #pragma mark Queue File
 
-- (void) loadQueueFile {
+static void queueFSEventStreamCallback(
+ ConstFSEventStreamRef streamRef,
+ void *clientCallBackInfo,
+ size_t numEvents,
+ void *eventPaths,
+ const FSEventStreamEventFlags eventFlags[],
+ const FSEventStreamEventId eventIds[])
+{
+ HBController *hb = (HBController *)clientCallBackInfo;
+ [hb reloadQueue];
+}
+
+- (void)initQueueFSEvent
+{
+ /* Define variables and create a CFArray object containing
+ CFString objects containing paths to watch.
+ */
+ CFStringRef mypath = (CFStringRef) [[HBUtilities appSupportPath] stringByAppendingPathComponent:@"Queue"];
+ CFArrayRef pathsToWatch = CFArrayCreate(NULL, (const void **)&mypath, 1, NULL);
+
+ FSEventStreamContext callbackCtx;
+ callbackCtx.version			= 0;
+ callbackCtx.info			= self;
+ callbackCtx.retain			= NULL;
+ callbackCtx.release			= NULL;
+ callbackCtx.copyDescription	= NULL;
+
+ CFAbsoluteTime latency = 0.5; /* Latency in seconds */
+
+ /* Create the stream, passing in a callback */
+ QueueStream = FSEventStreamCreate(NULL,
+ &queueFSEventStreamCallback,
+ &callbackCtx,
+ pathsToWatch,
+ kFSEventStreamEventIdSinceNow,
+ latency,
+ kFSEventStreamCreateFlagIgnoreSelf
+ );
+
+ CFRelease(pathsToWatch);
+
+ /* Create the stream before calling this. */
+ FSEventStreamScheduleWithRunLoop(QueueStream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+ FSEventStreamStart(QueueStream);
+}
+
+- (void)closeQueueFSEvent
+{
+ FSEventStreamStop(QueueStream);
+ FSEventStreamInvalidate(QueueStream);
+ FSEventStreamRelease(QueueStream);
+}
+
+- (void)loadQueueFile
+{
 	/* We declare the default NSFileManager into fileManager */
-	NSFileManager * fileManager = [NSFileManager defaultManager];
+	NSFileManager *fileManager = [NSFileManager defaultManager];
+ NSString *appSupportPath = [HBUtilities appSupportPath];
+
 	/* We define the location of the user presets file */
- QueueFile = @"~/Library/Application Support/HandBrake/Queue.plist";
-	QueueFile = [[QueueFile stringByExpandingTildeInPath]retain];
+ QueueFile = [[appSupportPath stringByAppendingPathComponent:@"Queue/Queue.plist"] retain];
+
 /* We check for the Queue.plist */
-	if ([fileManager fileExistsAtPath:QueueFile] == 0)
+	if( ![fileManager fileExistsAtPath:QueueFile] )
 	{
+ if( ![fileManager fileExistsAtPath:[appSupportPath stringByAppendingPathComponent:@"Queue"]] )
+ {
+ [fileManager createDirectoryAtPath:[appSupportPath stringByAppendingPathComponent:@"Queue"] withIntermediateDirectories:YES attributes:nil error:NULL];
+ }
+
 		[fileManager createFileAtPath:QueueFile contents:nil attributes:nil];
 	}
- 
+
 	QueueFileArray = [[NSMutableArray alloc] initWithContentsOfFile:QueueFile];
 	/* lets check to see if there is anything in the queue file .plist */
- if (nil == QueueFileArray)
+ if( QueueFileArray == nil )
 	{
 /* if not, then lets initialize an empty array */
 		QueueFileArray = [[NSMutableArray alloc] init];
@@ -2290,13 +2223,24 @@
 else
 {
 /* ONLY clear out encoded items if we are single instance */
- if (hbInstanceNum == 1)
+ if( hbInstanceNum == 1 )
 {
 [self clearQueueEncodedItems];
 }
 }
 }
 
+- (void)reloadQueue
+{
+ [HBUtilities writeToActivityLog:"Queue reloaded"];
+
+ NSMutableArray * tempQueueArray = [[NSMutableArray alloc] initWithContentsOfFile:QueueFile];
+ [QueueFileArray setArray:tempQueueArray];
+ [tempQueueArray release];
+ /* Send Fresh QueueFileArray to fQueueController to update queue window */
+ [fQueueController setQueueArray: QueueFileArray];
+}
+
 - (void)addQueueFileItem
 {
 [QueueFileArray addObject:[self createQueueFileItem]];
@@ -2304,7 +2248,7 @@
 
 }
 
-- (void) removeQueueFileItem:(int) queueItemToRemove
+- (void) removeQueueFileItem:(NSUInteger) queueItemToRemove
 {
 [QueueFileArray removeObjectAtIndex:queueItemToRemove];
 [self saveQueueFileItem];
@@ -2337,9 +2281,7 @@
 */
 
 	int i = 0;
- NSEnumerator *enumerator = [QueueFileArray objectEnumerator];
-	id tempObject;
-	while (tempObject = [enumerator nextObject])
+	for (id tempObject in QueueFileArray)
 	{
 		NSDictionary *thisQueueDict = tempObject;
 		if ([[thisQueueDict objectForKey:@"Status"] intValue] == 0) // Completed
@@ -2386,40 +2328,33 @@
 }
 
 /* Used to get the next pending queue item index and return it if found */
-- (int)getNextPendingQueueIndex
+- (NSInteger)getNextPendingQueueIndex
 {
 /* initialize nextPendingIndex to -1, this value tells incrementQueueItemDone that there are no pending items in the queue */
- int nextPendingIndex = -1;
+ NSInteger nextPendingIndex = -1;
 	BOOL nextPendingFound = NO;
- NSEnumerator *enumerator = [QueueFileArray objectEnumerator];
-	id tempObject;
- int i = 0;
-	while (tempObject = [enumerator nextObject])
+	for (id tempObject in QueueFileArray)
 	{
 		NSDictionary *thisQueueDict = tempObject;
 if ([[thisQueueDict objectForKey:@"Status"] intValue] == 2 && nextPendingFound == NO) // pending		
 {
 			nextPendingFound = YES;
 nextPendingIndex = [QueueFileArray indexOfObject: tempObject];
- [self writeToActivityLog: "getNextPendingQueueIndex next pending encode index is:%d", nextPendingIndex];
+ [HBUtilities writeToActivityLog: "getNextPendingQueueIndex next pending encode index is:%d", nextPendingIndex];
 		}
- i++;
 	}
 return nextPendingIndex;
 }
 
-
 /* This method will set any item marked as encoding back to pending
 * currently used right after a queue reload
 */
 - (void) setQueueEncodingItemsAsPending
 {
- NSEnumerator *enumerator = [QueueFileArray objectEnumerator];
-	id tempObject;
 NSMutableArray *tempArray;
 tempArray = [NSMutableArray array];
 /* we look here to see if the preset is we move on to the next one */
- while ( tempObject = [enumerator nextObject] ) 
+ for (id tempObject in QueueFileArray)
 {
 /* We want to keep any queue item that is pending or was previously being encoded */
 if ([[tempObject objectForKey:@"Status"] intValue] == 1 || [[tempObject objectForKey:@"Status"] intValue] == 2)
@@ -2445,12 +2380,10 @@
 * this includes both successfully completed encodes as well as cancelled encodes */
 - (void) clearQueueEncodedItems
 {
- NSEnumerator *enumerator = [QueueFileArray objectEnumerator];
-	id tempObject;
 NSMutableArray *tempArray;
 tempArray = [NSMutableArray array];
 /* we look here to see if the preset is we move on to the next one */
- while ( tempObject = [enumerator nextObject] ) 
+ for (id tempObject in QueueFileArray)
 {
 /* If the queue item is either completed (0) or cancelled (3) from the
 * last session, then we put it in tempArray to be deleted from QueueFileArray.
@@ -2472,12 +2405,10 @@
 /* This method will clear the queue of all encodes. effectively creating an empty queue */
 - (void) clearQueueAllItems
 {
- NSEnumerator *enumerator = [QueueFileArray objectEnumerator];
-	id tempObject;
 NSMutableArray *tempArray;
 tempArray = [NSMutableArray array];
 /* we look here to see if the preset is we move on to the next one */
- while ( tempObject = [enumerator nextObject] ) 
+ for (id tempObject in QueueFileArray)
 {
 [tempArray addObject:tempObject];
 }
@@ -2495,7 +2426,7 @@
 
 hb_list_t * list = hb_get_titles( fHandle );
 hb_title_t * title = (hb_title_t *) hb_list_item( list,
- [fSrcTitlePopUp indexOfSelectedItem] );
+ (int)[fSrcTitlePopUp indexOfSelectedItem] );
 hb_job_t * job = title->job;
 
 
@@ -2510,9 +2441,9 @@
 /* Source and Destination Information */
 
 [queueFileJob setObject:[NSString stringWithUTF8String: title->path] forKey:@"SourcePath"];
- [queueFileJob setObject:[fSrcDVD2Field stringValue] forKey:@"SourceName"];
+ [queueFileJob setObject:[[fSrcDVD2Field stringValue] lastPathComponent] forKey:@"SourceName"];
 [queueFileJob setObject:[NSNumber numberWithInt:title->index] forKey:@"TitleNumber"];
- [queueFileJob setObject:[NSNumber numberWithInt:[fSrcAnglePopUp indexOfSelectedItem] + 1] forKey:@"TitleAngle"];
+ [queueFileJob setObject:[NSNumber numberWithInteger:[fSrcAnglePopUp indexOfSelectedItem] + 1] forKey:@"TitleAngle"];
 
 /* Determine and set a variable to tell hb what start and stop times to use (chapters, seconds or frames) */
 if( [fEncodeStartStopPopUp indexOfSelectedItem] == 0 )
@@ -2528,8 +2459,8 @@
 [queueFileJob setObject:[NSNumber numberWithInt:2] forKey:@"fEncodeStartStop"];
 }
 /* Chapter encode info */
- [queueFileJob setObject:[NSNumber numberWithInt:[fSrcChapterStartPopUp indexOfSelectedItem] + 1] forKey:@"ChapterStart"];
- [queueFileJob setObject:[NSNumber numberWithInt:[fSrcChapterEndPopUp indexOfSelectedItem] + 1] forKey:@"ChapterEnd"];
+ [queueFileJob setObject:[NSNumber numberWithInteger:[fSrcChapterStartPopUp indexOfSelectedItem] + 1] forKey:@"ChapterStart"];
+ [queueFileJob setObject:[NSNumber numberWithInteger:[fSrcChapterEndPopUp indexOfSelectedItem] + 1] forKey:@"ChapterEnd"];
 /* Time (pts) encode info */
 [queueFileJob setObject:[NSNumber numberWithInt:[fSrcTimeStartEncodingField intValue]] forKey:@"StartSeconds"];
 [queueFileJob setObject:[NSNumber numberWithInt:[fSrcTimeEndEncodingField intValue] - [fSrcTimeStartEncodingField intValue]] forKey:@"StopSeconds"];
@@ -2546,8 +2477,7 @@
 
 /* Lets get the preset info if there is any */
 [queueFileJob setObject:[fPresetSelectedDisplay stringValue] forKey:@"PresetName"];
- [queueFileJob setObject:[NSNumber numberWithInt:[fPresetsOutlineView selectedRow]] forKey:@"PresetIndexNum"];
- 
+
 [queueFileJob setObject:[fDstFormatPopUp titleOfSelectedItem] forKey:@"FileFormat"];
 /* Chapter Markers*/
 /* If we are encoding by chapters and we have only one chapter or a title without chapters, set chapter markers to off.
@@ -2559,104 +2489,39 @@
 }
 else
 {
- [queueFileJob setObject:[NSNumber numberWithInt:[fCreateChapterMarkers state]] forKey:@"ChapterMarkers"];
+ [queueFileJob setObject:@(fChapterTitlesController.createChapterMarkers) forKey:@"ChapterMarkers"];
 }
 	
 /* We need to get the list of chapter names to put into an array and store 
 * in our queue, so they can be reapplied in prepareJob when this queue
 * item comes up if Chapter Markers is set to on.
 */
- [queueFileJob setObject:[fChapterTitlesDelegate chapterTitlesArray] forKey:@"ChapterNames"];
+ [queueFileJob setObject:fChapterTitlesController.chapterTitlesArray forKey:@"ChapterNames"];
 
- /* Allow Mpeg4 64 bit formatting +4GB file sizes */
-	[queueFileJob setObject:[NSNumber numberWithInt:[fDstMp4LargeFileCheck state]] forKey:@"Mp4LargeFile"];
 /* Mux mp4 with http optimization */
- [queueFileJob setObject:[NSNumber numberWithInt:[fDstMp4HttpOptFileCheck state]] forKey:@"Mp4HttpOptimize"];
+ [queueFileJob setObject:[NSNumber numberWithInteger:[fDstMp4HttpOptFileCheck state]] forKey:@"Mp4HttpOptimize"];
 /* Add iPod uuid atom */
- [queueFileJob setObject:[NSNumber numberWithInt:[fDstMp4iPodFileCheck state]] forKey:@"Mp4iPodCompatible"];
+ [queueFileJob setObject:[NSNumber numberWithInteger:[fDstMp4iPodFileCheck state]] forKey:@"Mp4iPodCompatible"];
 
 /* Codecs */
 	/* Video encoder */
-	[queueFileJob setObject:[fVidEncoderPopUp titleOfSelectedItem] forKey:@"VideoEncoder"];
-	
- /* x264 advanced options */
- if ([fX264UseAdvancedOptionsCheck state])
- {
- // we are using the advanced panel
- [queueFileJob setObject:[NSNumber numberWithInt:1] forKey: @"x264UseAdvancedOptions"];
- [queueFileJob setObject:[fAdvancedOptions optionsString] forKey:@"x264Option"];
- }
- else
- {
- // we are using the x264 preset system
- [queueFileJob setObject:[NSNumber numberWithInt:0] forKey: @"x264UseAdvancedOptions"];
- [queueFileJob setObject:[self x264Preset] forKey: @"x264Preset"];
- [queueFileJob setObject:[self x264Tune] forKey: @"x264Tune"];
- [queueFileJob setObject:[self x264OptionExtra] forKey: @"x264OptionExtra"];
- [queueFileJob setObject:[self h264Profile] forKey: @"h264Profile"];
- [queueFileJob setObject:[self h264Level] forKey: @"h264Level"];
- }
- 
- /* FFmpeg (lavc) Option String */
- [queueFileJob setObject:[fAdvancedOptions optionsStringLavc] forKey:@"lavcOption"];
-
-	[queueFileJob setObject:[NSNumber numberWithInt:[[fVidQualityMatrix selectedCell] tag] + 1] forKey:@"VideoQualityType"];
-	[queueFileJob setObject:[fVidBitrateField stringValue] forKey:@"VideoAvgBitrate"];
-	[queueFileJob setObject:[NSNumber numberWithFloat:[fVidQualityRFField floatValue]] forKey:@"VideoQualitySlider"];
- /* Framerate */
- [queueFileJob setObject:[fVidRatePopUp titleOfSelectedItem] forKey:@"VideoFramerate"];
- /* Frame Rate Mode */
- if ([fFramerateMatrix selectedRow] == 1) // if selected we are cfr regardless of the frame rate popup
- {
- [queueFileJob setObject:@"cfr" forKey:@"VideoFramerateMode"];
- }
- else
- {
- if ([fVidRatePopUp indexOfSelectedItem] == 0) // Same as source frame rate
- {
- [queueFileJob setObject:@"vfr" forKey:@"VideoFramerateMode"];
- }
- else
- {
- [queueFileJob setObject:@"pfr" forKey:@"VideoFramerateMode"];
- }
- 
- }
- 
- 
-	/* 2 Pass Encoding */
-	[queueFileJob setObject:[NSNumber numberWithInt:[fVidTwoPassCheck state]] forKey:@"VideoTwoPass"];
-	/* Turbo 2 pass Encoding fVidTurboPassCheck*/
-	[queueFileJob setObject:[NSNumber numberWithInt:[fVidTurboPassCheck state]] forKey:@"VideoTurboTwoPass"];
- 
+ [fVideoController prepareVideoForQueueFileJob:queueFileJob];
+
 	/* Picture Sizing */
 	/* Use Max Picture settings for whatever the dvd is.*/
 	[queueFileJob setObject:[NSNumber numberWithInt:0] forKey:@"UsesMaxPictureSettings"];
 	[queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->width] forKey:@"PictureWidth"];
 	[queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->height] forKey:@"PictureHeight"];
-	[queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->keep_ratio] forKey:@"PictureKeepRatio"];
+	[queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->anamorphic.keep_display_aspect] forKey:@"PictureKeepRatio"];
 	[queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->anamorphic.mode] forKey:@"PicturePAR"];
 [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->modulus] forKey:@"PictureModulus"];
- /* if we are custom anamorphic, store the exact storage, par and display dims */
- if (fTitle->job->anamorphic.mode == 3)
- {
- [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->modulus] forKey:@"PicturePARModulus"];
- 
- [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->width] forKey:@"PicturePARStorageWidth"];
- [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->height] forKey:@"PicturePARStorageHeight"];
- 
- [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->anamorphic.par_width] forKey:@"PicturePARPixelWidth"];
- [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->anamorphic.par_height] forKey:@"PicturePARPixelHeight"];
- 
- [queueFileJob setObject:[NSNumber numberWithFloat:fTitle->job->anamorphic.dar_width] forKey:@"PicturePARDisplayWidth"];
- [queueFileJob setObject:[NSNumber numberWithFloat:fTitle->job->anamorphic.dar_height] forKey:@"PicturePARDisplayHeight"];
-
- }
+ [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->anamorphic.par_width] forKey:@"PicturePARPixelWidth"];
+ [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->anamorphic.par_height] forKey:@"PicturePARPixelHeight"];
 
 /* Text summaries of various settings */
 [queueFileJob setObject:[NSString stringWithString:[self pictureSettingsSummary]]
 forKey:@"PictureSettingsSummary"];
- [queueFileJob setObject:[NSString stringWithString:[self pictureFiltersSummary]]
+ [queueFileJob setObject:fPictureController.filters.summary
 forKey:@"PictureFiltersSummary"];
 [queueFileJob setObject:[NSString stringWithString:[self muxerOptionsSummary]]
 forKey:@"MuxerOptionsSummary"];
@@ -2667,78 +2532,54 @@
 [queueFileJob setObject:[NSNumber numberWithInt:job->crop[1]] forKey:@"PictureBottomCrop"];
 	[queueFileJob setObject:[NSNumber numberWithInt:job->crop[2]] forKey:@"PictureLeftCrop"];
 	[queueFileJob setObject:[NSNumber numberWithInt:job->crop[3]] forKey:@"PictureRightCrop"];
- 
+
 /* Picture Filters */
- [queueFileJob setObject:[NSNumber numberWithInt:[fPictureController detelecine]] forKey:@"PictureDetelecine"];
- [queueFileJob setObject:[fPictureController detelecineCustomString] forKey:@"PictureDetelecineCustom"];
- 
- [queueFileJob setObject:[NSNumber numberWithInt:[fPictureController useDecomb]] forKey:@"PictureDecombDeinterlace"];
- [queueFileJob setObject:[NSNumber numberWithInt:[fPictureController decomb]] forKey:@"PictureDecomb"];
- [queueFileJob setObject:[fPictureController decombCustomString] forKey:@"PictureDecombCustom"];
- 
- [queueFileJob setObject:[NSNumber numberWithInt:[fPictureController deinterlace]] forKey:@"PictureDeinterlace"];
- [queueFileJob setObject:[fPictureController deinterlaceCustomString] forKey:@"PictureDeinterlaceCustom"];
- 
- [queueFileJob setObject:[NSNumber numberWithInt:[fPictureController denoise]] forKey:@"PictureDenoise"];
- [queueFileJob setObject:[fPictureController denoiseCustomString] forKey:@"PictureDenoiseCustom"];
- 
- [queueFileJob setObject:[NSString stringWithFormat:@"%d",[fPictureController deblock]] forKey:@"PictureDeblock"];
- 
- [queueFileJob setObject:[NSNumber numberWithInt:[fPictureController grayscale]] forKey:@"VideoGrayScale"];
- 
- /* Auto Passthru */
- [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowAACPassCheck state]] forKey: @"AudioAllowAACPass"];
- [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowAC3PassCheck state]] forKey: @"AudioAllowAC3Pass"];
- [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowDTSHDPassCheck state]] forKey: @"AudioAllowDTSHDPass"];
- [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowDTSPassCheck state]] forKey: @"AudioAllowDTSPass"];
- [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowMP3PassCheck state]] forKey: @"AudioAllowMP3Pass"];
- // just in case we need it for display purposes
- [queueFileJob setObject:[fAudioFallbackPopUp titleOfSelectedItem] forKey: @"AudioEncoderFallback"];
- // actual fallback encoder
- [queueFileJob setObject:[NSNumber numberWithInt:[[fAudioFallbackPopUp selectedItem] tag]] forKey: @"JobAudioEncoderFallback"];
- 
+ HBFilters *filters = fPictureController.filters;
+ queueFileJob[@"PictureDetelecine"] = @(filters.detelecine);
+ queueFileJob[@"PictureDetelecineCustom"] = filters.detelecineCustomString;
+
+ queueFileJob[@"PictureDecombDeinterlace"] = @(filters.useDecomb);
+ queueFileJob[@"PictureDecomb"] = @(filters.decomb);
+ queueFileJob[@"PictureDecombCustom"] = filters.decombCustomString;
+
+ queueFileJob[@"PictureDeinterlace"] = @(filters.deinterlace);
+ queueFileJob[@"PictureDeinterlaceCustom"] = filters.deinterlaceCustomString;
+
+ queueFileJob[@"PictureDenoise"] = filters.denoise;
+ queueFileJob[@"PictureDenoisePreset"] = filters.denoisePreset;
+ queueFileJob[@"PictureDenoiseTune"] = filters.denoiseTune;
+ queueFileJob[@"PictureDenoiseCustom"] = filters.denoiseCustomString;
+
+ queueFileJob[@"PictureDeblock"] = [NSString stringWithFormat:@"%ld",(long)filters.deblock];
+ queueFileJob[@"VideoGrayScale"] = [NSString stringWithFormat:@"%ld",(long)filters.grayscale];
+
+ /* Audio Defaults */
+ NSMutableDictionary *audioDefaults = [NSMutableDictionary dictionary];
+ [fAudioController.settings prepareAudioDefaultsForPreset:audioDefaults];
+ queueFileJob[@"AudioDefaults"] = audioDefaults;
+
 /* Audio */
- [fAudioDelegate prepareAudioForQueueFileJob: queueFileJob];
- 
+ NSMutableArray *audioArray = [[NSMutableArray alloc] initWithArray:[fAudioController audioTracks] copyItems:YES];
+ [queueFileJob setObject:audioArray forKey:@"AudioList"];
+ [audioArray release];
+
+	/* Subtitles Defaults */
+ NSMutableDictionary *subtitlesDefaults = [NSMutableDictionary dictionary];
+ [fSubtitlesViewController.settings prepareSubtitlesDefaultsForPreset:subtitlesDefaults];
+ queueFileJob[@"SubtitlesDefaults"] = subtitlesDefaults;
+
 	/* Subtitles */
- NSMutableArray *subtitlesArray = [[NSMutableArray alloc] initWithArray:[fSubtitlesDelegate getSubtitleArray] copyItems:YES];
- [queueFileJob setObject:[NSArray arrayWithArray: subtitlesArray] forKey:@"SubtitleList"];
- [subtitlesArray autorelease];
+ NSMutableArray *subtitlesArray = [[NSMutableArray alloc] initWithArray:[fSubtitlesViewController subtitles] copyItems:YES];
+ [queueFileJob setObject:subtitlesArray forKey:@"SubtitleList"];
+ [subtitlesArray release];
 
 /* Now we go ahead and set the "job->values in the plist for passing right to fQueueEncodeLibhb */
- 
- [queueFileJob setObject:[NSNumber numberWithInt:[fSrcChapterStartPopUp indexOfSelectedItem] + 1] forKey:@"JobChapterStart"];
- 
- [queueFileJob setObject:[NSNumber numberWithInt:[fSrcChapterEndPopUp indexOfSelectedItem] + 1] forKey:@"JobChapterEnd"];
- 
- 
- [queueFileJob setObject:[NSNumber numberWithInt:[[fDstFormatPopUp selectedItem] tag]] forKey:@"JobFileFormatMux"];
+ [queueFileJob setObject:[NSNumber numberWithInteger:[[fDstFormatPopUp selectedItem] tag]] forKey:@"JobFileFormatMux"];
 
 /* Codecs */
-	/* Video encoder */
-	[queueFileJob setObject:[NSNumber numberWithInt:[[fVidEncoderPopUp selectedItem] tag]] forKey:@"JobVideoEncoderVcodec"];
-	
 /* Framerate */
- [queueFileJob setObject:[NSNumber numberWithInt:[fVidRatePopUp indexOfSelectedItem]] forKey:@"JobIndexVideoFramerate"];
- [queueFileJob setObject:[NSNumber numberWithInt:title->rate] forKey:@"JobVrate"];
- [queueFileJob setObject:[NSNumber numberWithInt:title->rate_base] forKey:@"JobVrateBase"];
-	
- /* Picture Sizing */
-	/* Use Max Picture settings for whatever the dvd is.*/
-	[queueFileJob setObject:[NSNumber numberWithInt:0] forKey:@"UsesMaxPictureSettings"];
-	[queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->width] forKey:@"PictureWidth"];
-	[queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->height] forKey:@"PictureHeight"];
-	[queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->keep_ratio] forKey:@"PictureKeepRatio"];
-	[queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->anamorphic.mode] forKey:@"PicturePAR"];
- 
- /* Set crop settings here */
-	[queueFileJob setObject:[NSNumber numberWithInt:[fPictureController autoCrop]] forKey:@"PictureAutoCrop"];
- [queueFileJob setObject:[NSNumber numberWithInt:job->crop[0]] forKey:@"PictureTopCrop"];
- [queueFileJob setObject:[NSNumber numberWithInt:job->crop[1]] forKey:@"PictureBottomCrop"];
-	[queueFileJob setObject:[NSNumber numberWithInt:job->crop[2]] forKey:@"PictureLeftCrop"];
-	[queueFileJob setObject:[NSNumber numberWithInt:job->crop[3]] forKey:@"PictureRightCrop"];
- 
- 
+ [queueFileJob setObject:[NSNumber numberWithInt:title->rate] forKey:@"JobVrate"];
+ [queueFileJob setObject:[NSNumber numberWithInt:title->rate_base] forKey:@"JobVrateBase"];
 
 /* we need to auto relase the queueFileJob and return it */
 [queueFileJob autorelease];
@@ -2770,8 +2611,6 @@
 [QueueFileArray removeObjectAtIndex:removeIndex];
 [QueueFileArray insertObject:object atIndex:insertIndex];
 [object release];
- 
- index = [indexSet indexLessThanIndex:index];
 
 /* We save all of the Queue data here 
 * and it also gets sent back to the queue controller*/
@@ -2783,7 +2622,7 @@
 #pragma mark -
 #pragma mark Queue Job Processing
 
-- (void) incrementQueueItemDone:(int) queueItemDoneIndexNum
+- (void) incrementQueueItemDone:(NSInteger) queueItemDoneIndexNum
 {
 /* Mark the encode just finished as done (status 0)*/
 [[QueueFileArray objectAtIndex:currentQueueEncodeIndex] setObject:[NSNumber numberWithInt:0] forKey:@"Status"];
@@ -2795,9 +2634,9 @@
 * we can go ahead and increment currentQueueEncodeIndex 
 * so that if there is anything left in the queue we can
 * go ahead and move to the next item if we want to */
- int queueItems = [QueueFileArray count];
+ NSInteger queueItems = [QueueFileArray count];
 /* Check to see if there are any more pending items in the queue */
- int newQueueItemIndex = [self getNextPendingQueueIndex];
+ NSInteger newQueueItemIndex = [self getNextPendingQueueIndex];
 /* If we still have more pending items in our queue, lets go to the next one */
 if (newQueueItemIndex >= 0 && newQueueItemIndex < queueItems)
 {
@@ -2805,7 +2644,7 @@
 currentQueueEncodeIndex = newQueueItemIndex;
 /* now we mark the queue item as Status = 1 ( being encoded ) so another instance can not come along and try to scan it while we are scanning */
 [[QueueFileArray objectAtIndex:currentQueueEncodeIndex] setObject:[NSNumber numberWithInt:1] forKey:@"Status"];
- [self writeToActivityLog: "incrementQueueItemDone new pending items found: %d", currentQueueEncodeIndex];
+ [HBUtilities writeToActivityLog: "incrementQueueItemDone new pending items found: %d", currentQueueEncodeIndex];
 [self saveQueueFileItem];
 /* now we can go ahead and scan the new pending queue item */
 [self performNewQueueScan:[[QueueFileArray objectAtIndex:currentQueueEncodeIndex] objectForKey:@"SourcePath"] scanTitleNum:[[[QueueFileArray objectAtIndex:currentQueueEncodeIndex] objectForKey:@"TitleNumber"]intValue]];
@@ -2813,7 +2652,7 @@
 }
 else
 {
- [self writeToActivityLog: "incrementQueueItemDone there are no more pending encodes"];
+ [HBUtilities writeToActivityLog: "incrementQueueItemDone there are no more pending encodes"];
 /* Done encoding, allow system sleep for the encode handle */
 hb_system_sleep_allow(fQueueEncodeLibhb);
 /*
@@ -2825,7 +2664,7 @@
 }
 
 /* Here we actually tell hb_scan to perform the source scan, using the path to source and title number*/
-- (void) performNewQueueScan:(NSString *) scanPath scanTitleNum: (int) scanTitleNum
+- (void) performNewQueueScan:(NSString *) scanPath scanTitleNum: (NSInteger) scanTitleNum
 {
 /* Tell HB to output a new activity log file for this encode */
 [outputPanel startEncodeLog:[[QueueFileArray objectAtIndex:currentQueueEncodeIndex] objectForKey:@"DestinationPath"]];
@@ -2843,7 +2682,6 @@
 * settings as this is a queue rescan
 */
 NSString *path = scanPath;
- HBDVDDetector *detector = [HBDVDDetector detectorForPath:path];
 
 if (cancelScanDecrypt == 0)
 {
@@ -2856,7 +2694,7 @@
 }
 if (scanTitleNum > 0)
 {
- [self writeToActivityLog: "scanning specifically for title: %d", scanTitleNum];
+ [HBUtilities writeToActivityLog: "scanning specifically for title: %d", scanTitleNum];
 }
 /*
 * Only scan 10 previews before an encode - additional previews are
@@ -2864,7 +2702,7 @@
 * care of at this point
 */
 hb_system_sleep_prevent(fQueueEncodeLibhb);
- hb_scan(fQueueEncodeLibhb, [path UTF8String], scanTitleNum, 10, 0, 0);
+ hb_scan(fQueueEncodeLibhb, [path UTF8String], (int)scanTitleNum, 10, 0, 0);
 }
 }
 
@@ -2877,12 +2715,12 @@
 
 if( !hb_list_count( list ) )
 {
- [self writeToActivityLog: "processNewQueueEncode WARNING nothing found in the title list"];
+ [HBUtilities writeToActivityLog: "processNewQueueEncode WARNING nothing found in the title list"];
 }
 
 NSMutableDictionary * queueToApply = [QueueFileArray objectAtIndex:currentQueueEncodeIndex];
- [self writeToActivityLog: "Preset: %s", [[queueToApply objectForKey:@"PresetName"] UTF8String]];
- [self writeToActivityLog: "processNewQueueEncode number of passes expected is: %d", ([[queueToApply objectForKey:@"VideoTwoPass"] intValue] + 1)];
+ [HBUtilities writeToActivityLog: "Preset: %s", [[queueToApply objectForKey:@"PresetName"] UTF8String]];
+ [HBUtilities writeToActivityLog: "processNewQueueEncode number of passes expected is: %d", ([[queueToApply objectForKey:@"VideoTwoPass"] intValue] + 1)];
 hb_job_set_file(job, [[queueToApply objectForKey:@"DestinationPath"] UTF8String]);
 [self prepareJob];
 
@@ -2891,35 +2729,35 @@
 */
 if (job->indepth_scan == 1)
 {
- char *x264_preset_tmp = job->x264_preset != NULL ? strdup(job->x264_preset) : NULL;
- char *x264_tune_tmp = job->x264_tune != NULL ? strdup(job->x264_tune) : NULL;
- char *advanced_opts_tmp = job->advanced_opts != NULL ? strdup(job->advanced_opts) : NULL;
- char *h264_profile_tmp = job->h264_profile != NULL ? strdup(job->h264_profile) : NULL;
- char *h264_level_tmp = job->h264_level != NULL ? strdup(job->h264_level) : NULL;
+ char *encoder_preset_tmp = job->encoder_preset != NULL ? strdup(job->encoder_preset) : NULL;
+ char *encoder_tune_tmp = job->encoder_tune != NULL ? strdup(job->encoder_tune) : NULL;
+ char *encoder_options_tmp = job->encoder_options != NULL ? strdup(job->encoder_options) : NULL;
+ char *encoder_profile_tmp = job->encoder_profile != NULL ? strdup(job->encoder_profile) : NULL;
+ char *encoder_level_tmp = job->encoder_level != NULL ? strdup(job->encoder_level) : NULL;
 /*
 * When subtitle scan is enabled do a fast pre-scan job
 * which will determine which subtitles to enable, if any.
 */
- hb_job_set_x264_preset (job, NULL);
- hb_job_set_x264_tune (job, NULL);
- hb_job_set_advanced_opts(job, NULL);
- hb_job_set_h264_profile (job, NULL);
- hb_job_set_h264_level (job, NULL);
+ hb_job_set_encoder_preset (job, NULL);
+ hb_job_set_encoder_tune (job, NULL);
+ hb_job_set_encoder_options(job, NULL);
+ hb_job_set_encoder_profile(job, NULL);
+ hb_job_set_encoder_level (job, NULL);
 job->pass = -1;
 hb_add(fQueueEncodeLibhb, job);
 /*
 * reset the advanced settings
 */
- hb_job_set_x264_preset (job, x264_preset_tmp);
- hb_job_set_x264_tune (job, x264_tune_tmp);
- hb_job_set_advanced_opts(job, advanced_opts_tmp);
- hb_job_set_h264_profile (job, h264_profile_tmp);
- hb_job_set_h264_level (job, h264_level_tmp);
- free(x264_preset_tmp);
- free(x264_tune_tmp);
- free(advanced_opts_tmp);
- free(h264_profile_tmp);
- free(h264_level_tmp);
+ hb_job_set_encoder_preset (job, encoder_preset_tmp);
+ hb_job_set_encoder_tune (job, encoder_tune_tmp);
+ hb_job_set_encoder_options(job, encoder_options_tmp);
+ hb_job_set_encoder_profile(job, encoder_profile_tmp);
+ hb_job_set_encoder_level (job, encoder_level_tmp);
+ free(encoder_preset_tmp);
+ free(encoder_tune_tmp);
+ free(encoder_options_tmp);
+ free(encoder_profile_tmp);
+ free(encoder_level_tmp);
 }
 
 
@@ -2958,10 +2796,10 @@
 #pragma mark Queue Item Editing
 
 /* Rescans the chosen queue item back into the main window */
-- (void)rescanQueueItemToMainWindow:(NSString *) scanPath scanTitleNum: (int) scanTitleNum selectedQueueItem: (int) selectedQueueItem
+- (void)rescanQueueItemToMainWindow:(NSString *) scanPath scanTitleNum: (NSUInteger) scanTitleNum selectedQueueItem: (NSUInteger) selectedQueueItem
 {
 fqueueEditRescanItemNum = selectedQueueItem;
- [self writeToActivityLog: "rescanQueueItemToMainWindow: Re-scanning queue item at index:%d",fqueueEditRescanItemNum];
+ [HBUtilities writeToActivityLog: "rescanQueueItemToMainWindow: Re-scanning queue item at index:%d",fqueueEditRescanItemNum];
 applyQueueToScan = YES;
 /* Make sure we release the display name before reassigning it */
 [browsedSourceDisplayName release];
@@ -2981,7 +2819,7 @@
 hb_job_t * job = fTitle->job;
 if (queueToApply)
 {
- [self writeToActivityLog: "applyQueueSettingsToMainWindow: queue item found"];
+ [HBUtilities writeToActivityLog: "applyQueueSettingsToMainWindow: queue item found"];
 }
 /* Set title number and chapters */
 /* since the queue only scans a single title, its already been selected in showNewScan
@@ -2991,125 +2829,37 @@
 
 [fSrcChapterStartPopUp selectItemAtIndex: [[queueToApply objectForKey:@"ChapterStart"] intValue] - 1];
 [fSrcChapterEndPopUp selectItemAtIndex: [[queueToApply objectForKey:@"ChapterEnd"] intValue] - 1];
- 
+
 /* File Format */
- [fDstFormatPopUp selectItemWithTitle:[queueToApply objectForKey:@"FileFormat"]];
+ [fDstFormatPopUp selectItemWithTag:[queueToApply[@"JobFileFormatMux"] integerValue]];
 [self formatPopUpChanged:nil];
- 
+
 /* Chapter Markers*/
- [fCreateChapterMarkers setState:[[queueToApply objectForKey:@"ChapterMarkers"] intValue]];
- /* Allow Mpeg4 64 bit formatting +4GB file sizes */
- [fDstMp4LargeFileCheck setState:[[queueToApply objectForKey:@"Mp4LargeFile"] intValue]];
+ fChapterTitlesController.createChapterMarkers = [[queueToApply objectForKey:@"ChapterMarkers"] boolValue];
+ [fChapterTitlesController addChaptersFromQueue:[queueToApply objectForKey:@"ChapterNames"]];
+
 /* Mux mp4 with http optimization */
 [fDstMp4HttpOptFileCheck setState:[[queueToApply objectForKey:@"Mp4HttpOptimize"] intValue]];
- 
- /* video encoder */
- [fVidEncoderPopUp selectItemWithTitle:[queueToApply objectForKey:@"VideoEncoder"]];
- [fAdvancedOptions setLavcOptions: [queueToApply objectForKey:@"lavcOption"]];
- /* advanced x264 options */
- if ([[queueToApply objectForKey:@"x264UseAdvancedOptions"] intValue])
- {
- // we are using the advanced panel
- [fAdvancedOptions setOptions:[queueToApply objectForKey:@"x264Option"]];
- // preset does not use the x264 preset system, reset the widgets
- [self setX264Preset: nil];
- [self setX264Tune: nil];
- [self setX264OptionExtra:[queueToApply objectForKey:@"x264Option"]];
- [self setH264Profile: nil];
- [self setH264Level: nil];
- // enable the advanced panel and update the widgets
- [fX264UseAdvancedOptionsCheck setState:NSOnState];
- [self updateX264Widgets:nil];
- }
- else
- {
- // we are using the x264 preset system
- [self setX264Preset: [queueToApply objectForKey:@"x264Preset"]];
- [self setX264Tune: [queueToApply objectForKey:@"x264Tune"]];
- [self setX264OptionExtra:[queueToApply objectForKey:@"x264OptionExtra"]];
- [self setH264Profile: [queueToApply objectForKey:@"h264Profile"]];
- [self setH264Level: [queueToApply objectForKey:@"h264Level"]];
- // preset does not use the advanced panel, reset it
- [fAdvancedOptions setOptions:@""];
- // disable the advanced panel and update the widgets
- [fX264UseAdvancedOptionsCheck setState:NSOffState];
- [self updateX264Widgets:nil];
- }
- 
- /* Lets run through the following functions to get variables set there */
- [self videoEncoderPopUpChanged:nil];
+
 /* Set the state of ipod compatible with Mp4iPodCompatible. Only for x264*/
 [fDstMp4iPodFileCheck setState:[[queueToApply objectForKey:@"Mp4iPodCompatible"] intValue]];
- [self calculateBitrate:nil];
- 
- /* Video quality */
- [fVidQualityMatrix selectCellAtRow:[[queueToApply objectForKey:@"VideoQualityType"] intValue] column:0];
- 
- [fVidBitrateField setStringValue:[queueToApply objectForKey:@"VideoAvgBitrate"]];
- 
- if ([[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_THEORA)
- {
- /* Since theora's qp value goes up from left to right, we can just set the slider float value */
- [fVidQualitySlider setFloatValue:[[queueToApply objectForKey:@"VideoQualitySlider"] floatValue]];
- }
- else
- {
- /* Since ffmpeg and x264 use an "inverted" slider (lower qp/rf values indicate a higher quality) we invert the value on the slider */
- [fVidQualitySlider setFloatValue:([fVidQualitySlider maxValue] + [fVidQualitySlider minValue]) - [[queueToApply objectForKey:@"VideoQualitySlider"] floatValue]];
- }
- 
- [self videoMatrixChanged:nil];
- 
- /* Video framerate */
- if ([[queueToApply objectForKey:@"VideoFramerate"] isEqualToString:@"Same as source"])
- {
- /* Now set the Video Frame Rate Mode to either vfr or cfr according to the preset */
- if ([[queueToApply objectForKey:@"VideoFramerateMode"] isEqualToString:@"vfr"])
- {
- [fFramerateMatrix selectCellAtRow:0 column:0]; // we want vfr
- }
- else
- {
- [fFramerateMatrix selectCellAtRow:1 column:0]; // we want cfr
- }
- }
- else
- {
- /* Now set the Video Frame Rate Mode to either pfr or cfr according to the preset */
- if ([[queueToApply objectForKey:@"VideoFramerateMode"] isEqualToString:@"pfr"])
- {
- [fFramerateMatrix selectCellAtRow:0 column:0]; // we want pfr
- }
- else
- {
- [fFramerateMatrix selectCellAtRow:1 column:0]; // we want cfr
- }
- }
- [fVidRatePopUp selectItemWithTitle:[queueToApply objectForKey:@"VideoFramerate"]];
- [self videoFrameRateChanged:nil];
- 
- /* 2 Pass Encoding */
- [fVidTwoPassCheck setState:[[queueToApply objectForKey:@"VideoTwoPass"] intValue]];
- [self twoPassCheckboxChanged:nil];
- /* Turbo 1st pass for 2 Pass Encoding */
- [fVidTurboPassCheck setState:[[queueToApply objectForKey:@"VideoTurboTwoPass"] intValue]];
- 
- /* Auto Passthru */
- [fAudioAllowAACPassCheck setState:[[queueToApply objectForKey:@"AudioAllowAACPass"] intValue]];
- [fAudioAllowAC3PassCheck setState:[[queueToApply objectForKey:@"AudioAllowAC3Pass"] intValue]];
- [fAudioAllowDTSHDPassCheck setState:[[queueToApply objectForKey:@"AudioAllowDTSHDPass"] intValue]];
- [fAudioAllowDTSPassCheck setState:[[queueToApply objectForKey:@"AudioAllowDTSPass"] intValue]];
- [fAudioAllowMP3PassCheck setState:[[queueToApply objectForKey:@"AudioAllowMP3Pass"] intValue]];
- [fAudioFallbackPopUp selectItemWithTitle:[queueToApply objectForKey:@"AudioEncoderFallback"]];
- 
+
+ /* video encoder */
+ [fVideoController applyVideoSettingsFromQueue:queueToApply];
+
+ /* Audio Defaults */
+ [fAudioController.settings applySettingsFromPreset:queueToApply[@"AudioDefaults"]];
+
 /* Audio */
 /* Now lets add our new tracks to the audio list here */
- [fAudioDelegate addTracksFromQueue: queueToApply];
- 
- /*Subtitles*/
- /* Crashy crashy right now, working on it */
- [fSubtitlesDelegate setNewSubtitles:[queueToApply objectForKey:@"SubtitleList"]];
- [fSubtitlesTable reloadData]; 
+ [fAudioController addTracksFromQueue:[queueToApply objectForKey:@"AudioList"]];
+
+ /* Subtitles Defaults */
+ [fSubtitlesViewController.settings applySettingsFromPreset:queueToApply[@"SubtitlesDefaults"]];
+
+ /* Subtitles */
+ [fSubtitlesViewController addTracksFromQueue:[queueToApply objectForKey:@"SubtitleList"]];
+
 /* Picture Settings */
 
 /* If Cropping is set to custom, then recall all four crop values from
@@ -3135,65 +2885,34 @@
 job->crop[3] = AutoCropRight;
 
 }
- 
- job->modulus = [[queueToApply objectForKey:@"PictureModulus"] intValue];
- 
- /*
- * if the preset specifies neither max. width nor height
- * (both are 0), use the max. picture size
- *
- * if the specified non-zero dimensions exceed those of the
- * source, also use the max. picture size (no upscaling)
- */
- if (([[queueToApply objectForKey:@"PictureWidth"] intValue] <= 0 &&
- [[queueToApply objectForKey:@"PictureHeight"] intValue] <= 0) ||
- ([[queueToApply objectForKey:@"PictureWidth"] intValue] > fTitle->width &&
- [[queueToApply objectForKey:@"PictureHeight"] intValue] > fTitle->height) ||
- ([[queueToApply objectForKey:@"PictureHeight"] intValue] <= 0 &&
- [[queueToApply objectForKey:@"PictureWidth"] intValue] > fTitle->width) ||
- ([[queueToApply objectForKey:@"PictureWidth"] intValue] <= 0 &&
- [[queueToApply objectForKey:@"PictureHeight"] intValue] > fTitle->height))
- {
- /* use the source's width/height to avoid upscaling */
- [self revertPictureSizeToMax:nil];
- }
- else // source width/height is >= preset width/height
- {
- /* use the preset values for width/height */
- job->width = [[queueToApply objectForKey:@"PictureWidth"] intValue];
- job->height = [[queueToApply objectForKey:@"PictureHeight"] intValue];
- }
- job->keep_ratio = [[queueToApply objectForKey:@"PictureKeepRatio"] intValue];
- if (job->keep_ratio == 1)
- {
- hb_fix_aspect( job, HB_KEEP_WIDTH );
- if( job->height > fTitle->height )
- {
- job->height = fTitle->height;
- hb_fix_aspect( job, HB_KEEP_HEIGHT );
- }
- }
+
 job->anamorphic.mode = [[queueToApply objectForKey:@"PicturePAR"] intValue];
 job->modulus = [[queueToApply objectForKey:@"PictureModulus"] intValue];
- 
+ job->maxWidth = job->maxHeight = 0;
+ job->anamorphic.keep_display_aspect = [[queueToApply objectForKey:@"PictureKeepRatio"] intValue];
+ job->width = [[queueToApply objectForKey:@"PictureWidth"] intValue];
+ job->height = [[queueToApply objectForKey:@"PictureHeight"] intValue];
+
 /* Filters */
- 
+
+ HBFilters *filters = [fPictureController filters];
+
 /* We only allow *either* Decomb or Deinterlace. So check for the PictureDecombDeinterlace key. */
- [fPictureController setUseDecomb:1];
- [fPictureController setDecomb:0];
- [fPictureController setDeinterlace:0];
- if ([[queueToApply objectForKey:@"PictureDecombDeinterlace"] intValue] == 1)
+ filters.useDecomb = YES;
+ filters.decomb = 0;
+ filters.deinterlace = 0;
+ if ([queueToApply[@"PictureDecombDeinterlace"] intValue] == 1)
 {
 /* we are using decomb */
 /* Decomb */
- if ([[queueToApply objectForKey:@"PictureDecomb"] intValue] > 0)
+ if ([queueToApply[@"PictureDecomb"] intValue] > 0)
 {
- [fPictureController setDecomb:[[queueToApply objectForKey:@"PictureDecomb"] intValue]];
- 
+ filters.decomb = [queueToApply[@"PictureDecomb"] intValue];
+
 /* if we are using "Custom" in the decomb setting, also set the custom string*/
- if ([[queueToApply objectForKey:@"PictureDecomb"] intValue] == 1)
+ if ([queueToApply[@"PictureDecomb"] intValue] == 1)
 {
- [fPictureController setDecombCustomString:[queueToApply objectForKey:@"PictureDecombCustom"]]; 
+ filters.decombCustomString = queueToApply[@"PictureDecombCustom"];
 }
 }
 }
@@ -3201,100 +2920,62 @@
 {
 /* We are using Deinterlace */
 /* Deinterlace */
- if ([[queueToApply objectForKey:@"PictureDeinterlace"] intValue] > 0)
+ if ([queueToApply[@"PictureDeinterlace"] intValue] > 0)
 {
- [fPictureController setUseDecomb:0];
- [fPictureController setDeinterlace:[[queueToApply objectForKey:@"PictureDeinterlace"] intValue]];
+ filters.useDecomb = NO;
+ filters.deinterlace = [queueToApply[@"PictureDeinterlace"] intValue];
 /* if we are using "Custom" in the deinterlace setting, also set the custom string*/
- if ([[queueToApply objectForKey:@"PictureDeinterlace"] intValue] == 1)
+ if ([queueToApply[@"PictureDeinterlace"] intValue] == 1)
 {
- [fPictureController setDeinterlaceCustomString:[queueToApply objectForKey:@"PictureDeinterlaceCustom"]]; 
+ filters.deinterlaceCustomString = queueToApply[@"PictureDeinterlaceCustom"];
 }
 }
 }
- 
- 
+
 /* Detelecine */
- if ([[queueToApply objectForKey:@"PictureDetelecine"] intValue] > 0)
+ if ([queueToApply[@"PictureDetelecine"] intValue] > 0)
 {
- [fPictureController setDetelecine:[[queueToApply objectForKey:@"PictureDetelecine"] intValue]];
+ filters.detelecine = [queueToApply[@"PictureDetelecine"] intValue];
 /* if we are using "Custom" in the detelecine setting, also set the custom string*/
- if ([[queueToApply objectForKey:@"PictureDetelecine"] intValue] == 1)
+ if ([queueToApply[@"PictureDetelecine"] intValue] == 1)
 {
- [fPictureController setDetelecineCustomString:[queueToApply objectForKey:@"PictureDetelecineCustom"]]; 
+ filters.detelecineCustomString = queueToApply[@"PictureDetelecineCustom"];
 }
 }
 else
 {
- [fPictureController setDetelecine:0];
+ filters.detelecine = 0;
 }
- 
+
 /* Denoise */
- if ([[queueToApply objectForKey:@"PictureDenoise"] intValue] > 0)
- {
- [fPictureController setDenoise:[[queueToApply objectForKey:@"PictureDenoise"] intValue]];
- /* if we are using "Custom" in the denoise setting, also set the custom string*/
- if ([[queueToApply objectForKey:@"PictureDenoise"] intValue] == 1)
- {
- [fPictureController setDenoiseCustomString:[queueToApply objectForKey:@"PictureDenoiseCustom"]]; 
- }
- }
- else
- {
- [fPictureController setDenoise:0];
- } 
- 
+ filters.denoise = queueToApply[@"PictureDenoise"];
+ filters.denoisePreset = queueToApply[@"PictureDenoisePreset"];
+ filters.denoiseTune = queueToApply[@"PictureDenoiseTune"];
+ filters.denoiseCustomString = queueToApply[@"PictureDenoiseCustom"];
+
 /* Deblock */
- if ([[queueToApply objectForKey:@"PictureDeblock"] intValue] == 1)
+ if ([queueToApply[@"PictureDeblock"] intValue] == 1)
 {
 /* if its a one, then its the old on/off deblock, set on to 5*/
- [fPictureController setDeblock:5];
+ filters.deblock = 5;
 }
 else
 {
 /* use the settings intValue */
- [fPictureController setDeblock:[[queueToApply objectForKey:@"PictureDeblock"] intValue]];
- }
- 
- if ([[queueToApply objectForKey:@"VideoGrayScale"] intValue] == 1)
- {
- [fPictureController setGrayscale:1];
+ filters.deblock = [queueToApply[@"PictureDeblock"] intValue];
 }
- else
- {
- [fPictureController setGrayscale:0];
- }
- 
+
+ filters.grayscale = [queueToApply[@"VideoGrayScale"] boolValue];
+
 /* we call SetTitle: in fPictureController so we get an instant update in the Picture Settings window */
- [fPictureController SetTitle:fTitle];
- [self calculatePictureSizing:nil];
- 
- /* somehow we need to figure out a way to tie the queue item to a preset if it used one */
- //[queueFileJob setObject:[fPresetSelectedDisplay stringValue] forKey:@"PresetName"];
- //[queueFileJob setObject:[NSNumber numberWithInt:[fPresetsOutlineView selectedRow]] forKey:@"PresetIndexNum"];
- if ([queueToApply objectForKey:@"PresetIndexNum"]) // This item used a preset so insert that info
-	{
-		/* Deselect the currently selected Preset if there is one*/
- //[fPresetsOutlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:[[queueToApply objectForKey:@"PresetIndexNum"] intValue]] byExtendingSelection:NO];
- //[self selectPreset:nil];
-		
- //[fPresetsOutlineView selectRow:[[queueToApply objectForKey:@"PresetIndexNum"] intValue]];
-		/* Change UI to show "Custom" settings are being used */
-		//[fPresetSelectedDisplay setStringValue: [[queueToApply objectForKey:@"PresetName"] stringValue]];
-	}
- else
- {
- /* Deselect the currently selected Preset if there is one*/
-		[fPresetsOutlineView deselectRow:[fPresetsOutlineView selectedRow]];
-		/* Change UI to show "Custom" settings are being used */
-		[fPresetSelectedDisplay setStringValue: @"Custom"];
- }
- 
- /* We need to set this bool back to NO, in case the user wants to do a scan */
- //applyQueueToScan = NO;
- 
- /* Not that source is loaded and settings applied, delete the queue item from the queue */
- [self writeToActivityLog: "applyQueueSettingsToMainWindow: deleting queue item:%d",fqueueEditRescanItemNum];
+ [fPictureController setTitle:fTitle];
+ [self pictureSettingsDidChange];
+
+ [fPresetSelectedDisplay setStringValue:queueToApply[@"PresetName"]];
+ [fPresetsView deselect];
+
+ /* Now that source is loaded and settings applied, delete the queue item from the queue */
+ [HBUtilities writeToActivityLog: "applyQueueSettingsToMainWindow: deleting queue item:%d",fqueueEditRescanItemNum];
 [self removeQueueFileItem:fqueueEditRescanItemNum];
 }
 
@@ -3310,292 +2991,183 @@
 {
 hb_list_t * list = hb_get_titles( fHandle );
 hb_title_t * title = (hb_title_t *) hb_list_item( list,
- [fSrcTitlePopUp indexOfSelectedItem] );
+ (int)[fSrcTitlePopUp indexOfSelectedItem] );
 hb_job_t * job = title->job;
- hb_filter_object_t * filter;
 /* set job->angle for libdvdnav */
- job->angle = [fSrcAnglePopUp indexOfSelectedItem] + 1;
+ job->angle = (int)[fSrcAnglePopUp indexOfSelectedItem] + 1;
 /* Chapter selection */
- job->chapter_start = [fSrcChapterStartPopUp indexOfSelectedItem] + 1;
- job->chapter_end = [fSrcChapterEndPopUp indexOfSelectedItem] + 1;
+ job->chapter_start = (int)[fSrcChapterStartPopUp indexOfSelectedItem] + 1;
+ job->chapter_end = (int)[fSrcChapterEndPopUp indexOfSelectedItem] + 1;
 	
 /* Format (Muxer) and Video Encoder */
- job->mux = [[fDstFormatPopUp selectedItem] tag];
- job->vcodec = [[fVidEncoderPopUp selectedItem] tag];
- job->fastfirstpass = 0;
+ job->mux = (int)[[fDstFormatPopUp selectedItem] tag];
 
- job->chapter_markers = 0;
- 
-	if (job->vcodec == HB_VCODEC_X264)
+ /* Video Encoder */
+ [fVideoController prepareVideoForJobPreview:job andTitle:title];
+
+ /* Subtitle settings */
+ BOOL one_burned = NO;
+ int i = 0;
+
+ for (id subtitleDict in fSubtitlesViewController.subtitles)
 {
- /* advanced x264 options */
- NSString *tmpString;
- // translate zero-length strings to NULL for libhb
- const char *x264_preset = NULL;
- const char *x264_tune = NULL;
- const char *advanced_opts = NULL;
- const char *h264_profile = NULL;
- const char *h264_level = NULL;
- if ([fX264UseAdvancedOptionsCheck state])
- {
- // we are using the advanced panel
- if ([(tmpString = [fAdvancedOptions optionsString]) length])
- {
- advanced_opts = [tmpString UTF8String];
- }
- }
- else
+ int subtitle = [subtitleDict[keySubTrackIndex] intValue];
+ int force = [subtitleDict[keySubTrackForced] intValue];
+ int burned = [subtitleDict[keySubTrackBurned] intValue];
+ int def = [subtitleDict[keySubTrackDefault] intValue];
+
+ // if i is 0, then we are in the first item of the subtitles which we need to
+ // check for the "Foreign Audio Search" which would be keySubTrackIndex of -1
+
+ /* if we are on the first track and using "Foreign Audio Search" */
+ if (i == 0 && subtitle == -1)
 {
- // we are using the x264 preset system
- if ([(tmpString = [self x264Tune]) length])
- {
- x264_tune = [tmpString UTF8String];
- }
- if ([(tmpString = [self x264OptionExtra]) length])
- {
- advanced_opts = [tmpString UTF8String];
- }
- if ([(tmpString = [self h264Profile]) length])
+ [HBUtilities writeToActivityLog: "Foreign Language Search: %d", 1];
+
+ job->indepth_scan = 1;
+
+ if (burned != 1)
 {
- h264_profile = [tmpString UTF8String];
+ job->select_subtitle_config.dest = PASSTHRUSUB;
 }
- if ([(tmpString = [self h264Level]) length])
+ else
 {
- h264_level = [tmpString UTF8String];
+ job->select_subtitle_config.dest = RENDERSUB;
 }
- x264_preset = [[self x264Preset] UTF8String];
- }
- hb_job_set_x264_preset (job, x264_preset);
- hb_job_set_x264_tune (job, x264_tune);
- hb_job_set_advanced_opts(job, advanced_opts);
- hb_job_set_h264_profile (job, h264_profile);
- hb_job_set_h264_level (job, h264_level);
- }
- else if (job->vcodec & HB_VCODEC_FFMPEG_MASK)
- {
- hb_job_set_advanced_opts(job,
- [[fAdvancedOptions optionsStringLavc]
- UTF8String]);
- }
 
- /* Video settings */
- 
- if( [fVidRatePopUp indexOfSelectedItem] > 0 )
- {
- /* a specific framerate has been chosen */
- job->vrate = 27000000;
- job->vrate_base = hb_video_rates[[fVidRatePopUp indexOfSelectedItem]-1].rate;
- if ([fFramerateMatrix selectedRow] == 1)
- {
- // CFR
- job->cfr = 1;
- }
- else
- {
- // PFR
- job->cfr = 2;
- }
- }
- else
- {
- /* same as source */
- job->vrate = title->rate;
- job->vrate_base = title->rate_base;
- if ([fFramerateMatrix selectedRow] == 1)
- {
- // CFR
- job->cfr = 1;
+ job->select_subtitle_config.force = force;
+ job->select_subtitle_config.default_track = def;
 }
 else
 {
- // VFR
- job->cfr = 0;
- }
- }
+ /* if we are getting the subtitles from an external srt file */
+ if ([subtitleDict[keySubTrackType] intValue] == SRTSUB)
+ {
+ hb_subtitle_config_t sub_config;
 
- switch( [[fVidQualityMatrix selectedCell] tag] )
- {
- case 0:
- /* ABR */
- job->vquality = -1.0;
- job->vbitrate = [fVidBitrateField intValue];
- break;
- case 1:
- /* Constant Quality */
- job->vquality = [fVidQualityRFField floatValue];
- job->vbitrate = 0;
- break;
- }
+ sub_config.offset = [subtitleDict[keySubTrackSrtOffset] intValue];
 
- /* Subtitle settings */
- NSMutableArray *subtitlesArray = [[NSMutableArray alloc] initWithArray:[fSubtitlesDelegate getSubtitleArray] copyItems:YES];
- 
- 
-int subtitle;
-int force;
-int burned;
-int def;
-bool one_burned = FALSE;
+ /* we need to srncpy file name and codeset */
+ strncpy(sub_config.src_filename, [subtitleDict[keySubTrackSrtFilePath] UTF8String], 255);
+ sub_config.src_filename[255] = 0;
+ strncpy(sub_config.src_codeset, [subtitleDict[keySubTrackSrtCharCode] UTF8String], 39);
+ sub_config.src_codeset[39] = 0;
 
- int i = 0;
- NSEnumerator *enumerator = [subtitlesArray objectEnumerator];
- id tempObject;
- while (tempObject = [enumerator nextObject])
- {
- 
- subtitle = [[tempObject objectForKey:@"subtitleSourceTrackNum"] intValue];
- force = [[tempObject objectForKey:@"subtitleTrackForced"] intValue];
- burned = [[tempObject objectForKey:@"subtitleTrackBurned"] intValue];
- def = [[tempObject objectForKey:@"subtitleTrackDefault"] intValue];
- 
- /* since the subtitleSourceTrackNum 0 is "None" in our array of the subtitle popups,
- * we want to ignore it for display as well as encoding.
- */
- if (subtitle > 0)
- {
- /* if i is 0, then we are in the first item of the subtitles which we need to 
- * check for the "Foreign Audio Search" which would be subtitleSourceTrackNum of 1
- * bearing in mind that for all tracks subtitleSourceTrackNum of 0 is None.
- */
- 
- /* if we are on the first track and using "Foreign Audio Search" */ 
- if (i == 0 && subtitle == 1)
- {
- /* NOTE: Currently foreign language search is borked for preview.
- * Commented out but left in for initial commit. */
- 
- 
- [self writeToActivityLog: "Foreign Language Search: %d", 1];
- 
- job->indepth_scan = 1;
- 
- if (burned != 1)
+ if( !burned && hb_subtitle_can_pass( SRTSUB, job->mux ) )
 {
- job->select_subtitle_config.dest = PASSTHRUSUB;
+ sub_config.dest = PASSTHRUSUB;
 }
- else
+ else if( hb_subtitle_can_burn( SRTSUB ) )
 {
- job->select_subtitle_config.dest = RENDERSUB;
+ // Only allow one subtitle to be burned into the video
+ if( one_burned )
+ continue;
+ one_burned = TRUE;
+ sub_config.dest = RENDERSUB;
 }
- 
- job->select_subtitle_config.force = force;
- job->select_subtitle_config.default_track = def;
+
+ sub_config.force = 0;
+ sub_config.default_track = def;
+ hb_srt_add( job, &sub_config, [subtitleDict[keySubTrackLanguageIsoCode] UTF8String]);
+ continue;
 }
- else
+
+ /* We are setting a source subtitle so access the source subtitle info */
+ hb_subtitle_t * subt = (hb_subtitle_t *) hb_list_item( title->list_subtitle, subtitle );
+
+ if( subt != NULL )
 {
- /* if we are getting the subtitles from an external srt file */
- if ([[tempObject objectForKey:@"subtitleSourceTrackType"] intValue] == SRTSUB)
+ hb_subtitle_config_t sub_config = subt->config;
+
+ if( !burned && hb_subtitle_can_pass( subt->source, job->mux ) )
 {
- hb_subtitle_config_t sub_config;
- 
- sub_config.offset = [[tempObject objectForKey:@"subtitleTrackSrtOffset"] intValue];
- 
- /* we need to srncpy file path and char code */
- strncpy(sub_config.src_filename, [[tempObject objectForKey:@"subtitleSourceSrtFilePath"] UTF8String], 255);
- sub_config.src_filename[255] = 0;
- strncpy(sub_config.src_codeset, [[tempObject objectForKey:@"subtitleTrackSrtCharCode"] UTF8String], 39);
- sub_config.src_codeset[39] = 0;
- 
- sub_config.force = 0;
 sub_config.dest = PASSTHRUSUB;
- sub_config.default_track = def;
- 
- hb_srt_add( job, &sub_config, [[tempObject objectForKey:@"subtitleTrackSrtLanguageIso3"] UTF8String]);
- continue;
 }
- 
- /* for the actual source tracks, we must subtract the non source entries so 
- * that the menu index matches the source subtitle_list index for convenience */
- if( i == 0 )
- {
- /* for the first track, the source tracks start at menu index 2 ( None is 0,
- * Foreign Language Search is 1) so subtract 2 */
- subtitle = subtitle - 2;
- }
- else
+ else if( hb_subtitle_can_burn( subt->source ) )
 {
- /* for all other tracks, the source tracks start at menu index 1 (None is 0)
- * so subtract 1. */
- subtitle = subtitle - 1;
- }
- 
- /* We are setting a source subtitle so access the source subtitle info */ 
- hb_subtitle_t * subt = (hb_subtitle_t *) hb_list_item( title->list_subtitle, subtitle );
- 
- if( subt != NULL )
- {
- hb_subtitle_config_t sub_config = subt->config;
- 
- if( !burned && hb_subtitle_can_pass( subt->source, job->mux ) )
- {
- sub_config.dest = PASSTHRUSUB;
- }
- else if( hb_subtitle_can_burn( subt->source ) )
- {
- // Only allow one subtitle to be burned into the video
- if( one_burned )
- continue;
- one_burned = TRUE;
- sub_config.dest = RENDERSUB;
- }
- 
- sub_config.force = force;
- sub_config.default_track = def;
- hb_subtitle_add( job, &sub_config, subtitle );
+ // Only allow one subtitle to be burned into the video
+ if( one_burned )
+ continue;
+ one_burned = TRUE;
+ sub_config.dest = RENDERSUB;
 }
+
+ sub_config.force = force;
+ sub_config.default_track = def;
+ hb_subtitle_add( job, &sub_config, subtitle );
 }
 }
 i++;
 }
 if( one_burned )
 {
- filter = hb_filter_init( HB_FILTER_RENDER_SUB );
+ hb_filter_object_t *filter = hb_filter_init( HB_FILTER_RENDER_SUB );
 hb_add_filter( job, filter, [[NSString stringWithFormat:@"%d:%d:%d:%d",
- job->crop[0], job->crop[1],
- job->crop[2], job->crop[3]] UTF8String] );
+ job->crop[0], job->crop[1],
+ job->crop[2], job->crop[3]] UTF8String] );
 }
- 
- 
- 
-[subtitlesArray autorelease];
- 
- 
+
 /* Auto Passthru */
 job->acodec_copy_mask = 0;
- if ([fAudioAllowAACPassCheck state] == NSOnState)
+ if (fAudioController.settings.allowAACPassthru)
 {
 job->acodec_copy_mask |= HB_ACODEC_FFAAC;
 }
- if ([fAudioAllowAC3PassCheck state] == NSOnState)
+ if (fAudioController.settings.allowAC3Passthru)
 {
 job->acodec_copy_mask |= HB_ACODEC_AC3;
 }
- if ([fAudioAllowDTSHDPassCheck state] == NSOnState)
+ if (fAudioController.settings.allowDTSHDPassthru)
 {
 job->acodec_copy_mask |= HB_ACODEC_DCA_HD;
 }
- if ([fAudioAllowDTSPassCheck state] == NSOnState)
+ if (fAudioController.settings.allowDTSPassthru)
 {
 job->acodec_copy_mask |= HB_ACODEC_DCA;
 }
- if ([fAudioAllowMP3PassCheck state] == NSOnState)
+ if (fAudioController.settings.allowMP3Passthru)
 {
 job->acodec_copy_mask |= HB_ACODEC_MP3;
 }
- job->acodec_fallback = [[fAudioFallbackPopUp selectedItem] tag];
- 
+ job->acodec_fallback = fAudioController.settings.encoderFallback;
+
+ // First clear out any audio tracks in the job currently
+ int audiotrack_count = hb_list_count(job->list_audio);
+ for (i = 0; i < audiotrack_count; i++)
+ {
+ hb_audio_t *temp_audio = (hb_audio_t *) hb_list_item(job->list_audio, 0);
+ hb_list_rem(job->list_audio, temp_audio);
+ }
+
 /* Audio tracks and mixdowns */
-	[fAudioDelegate prepareAudioForJob: job];
+ for (NSDictionary *audioDict in fAudioController.audioTracks)
+ {
+ hb_audio_config_t *audio = (hb_audio_config_t *)calloc(1, sizeof(*audio));
+ hb_audio_config_init(audio);
+ audio->in.track = [audioDict[@"Track"] intValue];
+ /* We go ahead and assign values to our audio->out.<properties> */
+ audio->out.track = audio->in.track;
+ audio->out.codec = [audioDict[@"JobEncoder"] intValue];
+ audio->out.compression_level = hb_audio_compression_get_default(audio->out.codec);
+ audio->out.mixdown = [audioDict[@"JobMixdown"] intValue];
+ audio->out.normalize_mix_level = 0;
+ audio->out.bitrate = [audioDict[@"JobBitrate"] intValue];
+ audio->out.samplerate = [audioDict[@"JobSamplerate"] intValue];
+ audio->out.dynamic_range_compression = [audioDict[@"TrackDRCSlider"] doubleValue];
+ audio->out.gain = [audioDict[@"TrackGainSlider"] doubleValue];
+ audio->out.dither_method = hb_audio_dither_get_default();
+
+ hb_audio_add(job, audio);
+ free(audio);
+ }
 
- 
- 
 /* Filters */
 
 /* Though Grayscale is not really a filter, per se
 * we put it here since its in the filters panel
 */
 
- if ([fPictureController grayscale])
+ if ([fPictureController.filters grayscale])
 {
 job->grayscale = 1;
 }
@@ -3610,131 +3182,127 @@
 
 
 	/* Detelecine */
- filter = hb_filter_init( HB_FILTER_DETELECINE );
- if ([fPictureController detelecine] == 1)
+ HBFilters *filters = [fPictureController filters];
+ if (filters.detelecine == 1)
 {
+ hb_filter_object_t *filter = hb_filter_init(HB_FILTER_DETELECINE);
 /* use a custom detelecine string */
- hb_add_filter( job, filter, [[fPictureController detelecineCustomString] UTF8String] );
+ hb_add_filter(job, filter, [filters.detelecineCustomString UTF8String]);
 }
- else if ([fPictureController detelecine] == 2)
+ else if (filters.detelecine == 2)
 {
 /* Default */
- hb_add_filter( job, filter, NULL );
+ hb_filter_object_t *filter = hb_filter_init(HB_FILTER_DETELECINE);
+ hb_add_filter(job, filter, NULL);
 }
- 
- 
- 
- if ([fPictureController useDecomb] == 1)
+ if (filters.useDecomb == YES)
 {
 /* Decomb */
- filter = hb_filter_init( HB_FILTER_DECOMB );
- if ([fPictureController decomb] == 1)
+ hb_filter_object_t *filter = hb_filter_init(HB_FILTER_DECOMB);
+ if (filters.decomb == 1)
 {
 /* use a custom decomb string */
- hb_add_filter( job, filter, [[fPictureController decombCustomString] UTF8String] );
+ hb_add_filter(job, filter, [filters.decombCustomString UTF8String]);
 }
- else if ([fPictureController decomb] == 2)
+ else if (filters.decomb == 2)
 {
 /* use libhb defaults */
- hb_add_filter( job, filter, NULL );
+ hb_add_filter(job, filter, NULL);
 }
- else if ([fPictureController decomb] == 3)
+ else if (filters.decomb == 3)
 {
 /* use old defaults (decomb fast) */
- hb_add_filter( job, filter, "7:2:6:9:1:80" );
+ hb_add_filter(job, filter, "7:2:6:9:1:80");
 }
- else if ([fPictureController decomb] == 4)
+ else if (filters.decomb == 4)
 {
 /* decomb 3 with bobbing enabled */
- hb_add_filter( job, filter, "455" );
+ hb_add_filter(job, filter, "455");
 }
 }
 else
 {
 /* Deinterlace */
- filter = hb_filter_init( HB_FILTER_DEINTERLACE );
- if ([fPictureController deinterlace] == 1)
+ hb_filter_object_t *filter = hb_filter_init(HB_FILTER_DEINTERLACE);
+ if (filters.deinterlace == 1)
 {
 /* we add the custom string if present */
- hb_add_filter( job, filter, [[fPictureController deinterlaceCustomString] UTF8String] ); 
+ hb_add_filter(job, filter, [filters.deinterlaceCustomString UTF8String]);
 }
- else if ([fPictureController deinterlace] == 2)
+ else if (filters.deinterlace == 2)
 {
 /* Run old deinterlacer fd by default */
- hb_add_filter( job, filter, "0" );
+ hb_add_filter(job, filter, "0");
 }
- else if ([fPictureController deinterlace] == 3)
+ else if (filters.deinterlace == 3)
 {
 /* Yadif mode 0 (without spatial deinterlacing) */
- hb_add_filter( job, filter, "1" ); 
+ hb_add_filter(job, filter, "1");
 }
- else if ([fPictureController deinterlace] == 4)
+ else if (filters.deinterlace == 4)
 {
 /* Yadif (with spatial deinterlacing) */
- hb_add_filter( job, filter, "3" );
+ hb_add_filter(job, filter, "3");
 }
- else if ([fPictureController deinterlace] == 5)
+ else if (filters.deinterlace == 5)
 {
 /* Yadif (with spatial deinterlacing and bobbing) */
- hb_add_filter( job, filter, "15" );
+ hb_add_filter(job, filter, "15");
 }
 	}
- 
+
 /* Denoise */
- filter = hb_filter_init( HB_FILTER_DENOISE );
-	if ([fPictureController denoise] == 1) // custom in popup
-	{
-		/* we add the custom string if present */
- hb_add_filter( job, filter, [[fPictureController denoiseCustomString] UTF8String] );
-	}
- else if ([fPictureController denoise] == 2) // Weak in popup
-	{
- hb_add_filter( job, filter, "2:1:2:3" );
-	}
-	else if ([fPictureController denoise] == 3) // Medium in popup
-	{
- hb_add_filter( job, filter, "3:2:2:3" );
-	}
-	else if ([fPictureController denoise] == 4) // Strong in popup
-	{
- hb_add_filter( job, filter, "7:7:5:5" );
-	}
- 
- 
+ if (![filters.denoise isEqualToString:@"off"])
+ {
+ int filter_id = HB_FILTER_HQDN3D;
+ if ([filters.denoise isEqualToString:@"nlmeans"])
+ filter_id = HB_FILTER_NLMEANS;
+
+ if ([filters.denoisePreset isEqualToString:@"none"])
+ {
+ const char *filter_str;
+ filter_str = [filters.denoiseCustomString UTF8String];
+ hb_filter_object_t *filter = hb_filter_init(filter_id);
+ hb_add_filter(job, filter, filter_str);
+ }
+ else
+ {
+ const char *filter_str, *preset, *tune;
+ preset = [filters.denoisePreset UTF8String];
+ tune = [filters.denoiseTune UTF8String];
+ filter_str = hb_generate_filter_settings(filter_id, preset, tune);
+ hb_filter_object_t *filter = hb_filter_init(filter_id);
+ hb_add_filter(job, filter, filter_str);
+ }
+ }
+
 /* Deblock (uses pp7 default) */
 /* NOTE: even though there is a valid deblock setting of 0 for the filter, for 
 * the macgui's purposes a value of 0 actually means to not even use the filter
 * current hb_filter_deblock.settings valid ranges are from 5 - 15 
 */
- filter = hb_filter_init( HB_FILTER_DEBLOCK );
- if ([fPictureController deblock] != 0)
+ if (filters.deblock != 0)
 {
- NSString *deblockStringValue = [NSString stringWithFormat: @"%d",[fPictureController deblock]];
+ hb_filter_object_t *filter = hb_filter_init( HB_FILTER_DEBLOCK );
+ NSString *deblockStringValue = [NSString stringWithFormat: @"%ld",(long)filters.deblock];
 hb_add_filter( job, filter, [deblockStringValue UTF8String] );
 }
 
 /* Add Crop/Scale filter */
- filter = hb_filter_init( HB_FILTER_CROP_SCALE );
+ hb_filter_object_t *filter = hb_filter_init( HB_FILTER_CROP_SCALE );
 hb_add_filter( job, filter, [[NSString stringWithFormat:@"%d:%d:%d:%d:%d:%d",
 job->width,job->height,
 job->crop[0], job->crop[1],
 job->crop[2], job->crop[3]] UTF8String] );
-
- /* Add framerate shaping filter */
- filter = hb_filter_init( HB_FILTER_VFR );
- hb_add_filter( job, filter, [[NSString stringWithFormat:@"%d:%d:%d",
- job->cfr, job->vrate, job->vrate_base] UTF8String] );
 }
 
-
 #pragma mark -
 #pragma mark Job Handling
 
-
 - (void) prepareJob
 {
 
- NSMutableDictionary * queueToApply = [QueueFileArray objectAtIndex:currentQueueEncodeIndex];
+ NSDictionary * queueToApply = [QueueFileArray objectAtIndex:currentQueueEncodeIndex];
 hb_list_t * list = hb_get_titles( fQueueEncodeLibhb );
 hb_title_t * title = (hb_title_t *) hb_list_item( list,0 ); // is always zero since now its a single title scan
 hb_job_t * job = title->job;
@@ -3746,14 +3314,14 @@
 if([[queueToApply objectForKey:@"fEncodeStartStop"] intValue] == 0)
 {
 /* Chapter selection */
- [self writeToActivityLog: "Start / Stop set to chapters"];
- job->chapter_start = [[queueToApply objectForKey:@"JobChapterStart"] intValue];
- job->chapter_end = [[queueToApply objectForKey:@"JobChapterEnd"] intValue];
+ [HBUtilities writeToActivityLog: "Start / Stop set to chapters"];
+ job->chapter_start = [[queueToApply objectForKey:@"ChapterStart"] intValue];
+ job->chapter_end = [[queueToApply objectForKey:@"ChapterEnd"] intValue];
 }
 else if ([[queueToApply objectForKey:@"fEncodeStartStop"] intValue] == 1)
 {
 /* we are pts based start / stop */
- [self writeToActivityLog: "Start / Stop set to seconds…"];
+ [HBUtilities writeToActivityLog: "Start / Stop set to seconds…"];
 
 /* Point A to Point B. Time to time in seconds.*/
 /* get the start seconds from the start seconds field */
@@ -3767,7 +3335,7 @@
 else if ([[queueToApply objectForKey:@"fEncodeStartStop"] intValue] == 2)
 {
 /* we are frame based start / stop */
- [self writeToActivityLog: "Start / Stop set to frames…"];
+ [HBUtilities writeToActivityLog: "Start / Stop set to frames…"];
 
 /* Point A to Point B. Frame to frame */
 /* get the start frame from the start frame field */
@@ -3785,17 +3353,7 @@
 /* Format (Muxer) and Video Encoder */
 job->mux = [[queueToApply objectForKey:@"JobFileFormatMux"] intValue];
 job->vcodec = [[queueToApply objectForKey:@"JobVideoEncoderVcodec"] intValue];
- 
- 
- /* If mpeg-4, then set mpeg-4 specific options like chapters and > 4gb file sizes */
- if( [[queueToApply objectForKey:@"Mp4LargeFile"] intValue] == 1)
- {
- job->largeFileSize = 1;
- }
- else
- {
- job->largeFileSize = 0;
- }
+
 /* We set http optimized mp4 here */
 if( [[queueToApply objectForKey:@"Mp4HttpOptimize"] intValue] == 1 )
 {
@@ -3821,11 +3379,9 @@
 * chapters just come out 001, 002, etc. etc.
 */
 
- NSMutableArray *ChapterNamesArray = [queueToApply objectForKey:@"ChapterNames"];
+ NSArray *chapterNamesArray = [queueToApply objectForKey:@"ChapterNames"];
 int i = 0;
- NSEnumerator *enumerator = [ChapterNamesArray objectEnumerator];
- id tempObject;
- while (tempObject = [enumerator nextObject])
+ for (id tempObject in chapterNamesArray)
 {
 hb_chapter_t *chapter = (hb_chapter_t *) hb_list_item( job->list_chapter, i );
 if( chapter != NULL )
@@ -3840,7 +3396,7 @@
 job->chapter_markers = 0;
 }
 
- if (job->vcodec == HB_VCODEC_X264)
+ if (job->vcodec == HB_VCODEC_X264 || job->vcodec == HB_VCODEC_X265)
 {
 /* iPod 5G atom */
 job->ipod_atom = ([[queueToApply objectForKey:@"Mp4iPodCompatible"]
@@ -3856,76 +3412,64 @@
 /* advanced x264 options */
 NSString *tmpString;
 // translate zero-length strings to NULL for libhb
- const char *x264_preset = NULL;
- const char *x264_tune = NULL;
- const char *advanced_opts = NULL;
- const char *h264_profile = NULL;
- const char *h264_level = NULL;
+ const char *encoder_preset = NULL;
+ const char *encoder_tune = NULL;
+ const char *encoder_options = NULL;
+ const char *encoder_profile = NULL;
+ const char *encoder_level = NULL;
 if ([[queueToApply objectForKey:@"x264UseAdvancedOptions"] intValue])
 {
 // we are using the advanced panel
 if ([(tmpString = [queueToApply objectForKey:@"x264Option"]) length])
 {
- advanced_opts = [tmpString UTF8String];
+ encoder_options = [tmpString UTF8String];
 }
 }
 else
 {
 // we are using the x264 preset system
- if ([(tmpString = [queueToApply objectForKey:@"x264Tune"]) length])
+ if ([(tmpString = [queueToApply objectForKey:@"VideoTune"]) length])
 {
- x264_tune = [tmpString UTF8String];
+ encoder_tune = [tmpString UTF8String];
 }
- if ([(tmpString = [queueToApply objectForKey:@"x264OptionExtra"]) length])
+ if ([(tmpString = [queueToApply objectForKey:@"VideoOptionExtra"]) length])
 {
- advanced_opts = [tmpString UTF8String];
+ encoder_options = [tmpString UTF8String];
 }
- if ([(tmpString = [queueToApply objectForKey:@"h264Profile"]) length])
+ if ([(tmpString = [queueToApply objectForKey:@"VideoProfile"]) length])
 {
- h264_profile = [tmpString UTF8String];
+ encoder_profile = [tmpString UTF8String];
 }
- if ([(tmpString = [queueToApply objectForKey:@"h264Level"]) length])
+ if ([(tmpString = [queueToApply objectForKey:@"VideoLevel"]) length])
 {
- h264_level = [tmpString UTF8String];
+ encoder_level = [tmpString UTF8String];
 }
- x264_preset = [[queueToApply objectForKey:@"x264Preset"] UTF8String];
+ encoder_preset = [[queueToApply objectForKey:@"VideoPreset"] UTF8String];
 }
- hb_job_set_x264_preset (job, x264_preset);
- hb_job_set_x264_tune (job, x264_tune);
- hb_job_set_advanced_opts(job, advanced_opts);
- hb_job_set_h264_profile (job, h264_profile);
- hb_job_set_h264_level (job, h264_level);
+ hb_job_set_encoder_preset (job, encoder_preset);
+ hb_job_set_encoder_tune (job, encoder_tune);
+ hb_job_set_encoder_options(job, encoder_options);
+ hb_job_set_encoder_profile(job, encoder_profile);
+ hb_job_set_encoder_level (job, encoder_level);
 }
 else if (job->vcodec & HB_VCODEC_FFMPEG_MASK)
 {
- hb_job_set_advanced_opts(job,
- [[queueToApply objectForKey:@"lavcOption"]
- UTF8String]);
+ hb_job_set_encoder_options(job,
+ [[queueToApply objectForKey:@"VideoOptionExtra"]
+ UTF8String]);
 }
- 
- 
+
 /* Picture Size Settings */
 job->width = [[queueToApply objectForKey:@"PictureWidth"] intValue];
 job->height = [[queueToApply objectForKey:@"PictureHeight"] intValue];
- 
- job->keep_ratio = [[queueToApply objectForKey:@"PictureKeepRatio"] intValue];
+
+ job->anamorphic.keep_display_aspect = [[queueToApply objectForKey:@"PictureKeepRatio"] intValue];
 job->anamorphic.mode = [[queueToApply objectForKey:@"PicturePAR"] intValue];
 job->modulus = [[queueToApply objectForKey:@"PictureModulus"] intValue];
- if ([[queueToApply objectForKey:@"PicturePAR"] intValue] == 3)
- {
- /* insert our custom values here for capuj */
- job->width = [[queueToApply objectForKey:@"PicturePARStorageWidth"] intValue];
- job->height = [[queueToApply objectForKey:@"PicturePARStorageHeight"] intValue];
- 
- job->modulus = [[queueToApply objectForKey:@"PicturePARModulus"] intValue];
- 
- job->anamorphic.par_width = [[queueToApply objectForKey:@"PicturePARPixelWidth"] intValue];
- job->anamorphic.par_height = [[queueToApply objectForKey:@"PicturePARPixelHeight"] intValue];
- 
- job->anamorphic.dar_width = [[queueToApply objectForKey:@"PicturePARDisplayWidth"] floatValue];
- job->anamorphic.dar_height = [[queueToApply objectForKey:@"PicturePARDisplayHeight"] floatValue];
- }
- 
+ job->anamorphic.par_width = [[queueToApply objectForKey:@"PicturePARPixelWidth"] intValue];
+ job->anamorphic.par_height = [[queueToApply objectForKey:@"PicturePARPixelHeight"] intValue];
+ job->anamorphic.dar_width = job->anamorphic.dar_height = 0;
+
 /* Here we use the crop values saved at the time the preset was saved */
 job->crop[0] = [[queueToApply objectForKey:@"PictureTopCrop"] intValue];
 job->crop[1] = [[queueToApply objectForKey:@"PictureBottomCrop"] intValue];
@@ -3934,37 +3478,37 @@
 
 /* Video settings */
 /* Framerate */
- 
- if( [[queueToApply objectForKey:@"JobIndexVideoFramerate"] intValue] > 0 )
+ int fps_mode, fps_num, fps_den;
+ if ([[queueToApply objectForKey:@"JobIndexVideoFramerate"] intValue] > 0)
 {
 /* a specific framerate has been chosen */
- job->vrate = 27000000;
- job->vrate_base = hb_video_rates[[[queueToApply objectForKey:@"JobIndexVideoFramerate"] intValue]-1].rate;
+ fps_num = 27000000;
+ fps_den = (int)[[queueToApply objectForKey:@"JobIndexVideoFramerate"] intValue];
 if ([[queueToApply objectForKey:@"VideoFramerateMode"] isEqualToString:@"cfr"])
 {
 // CFR
- job->cfr = 1;
+ fps_mode = 1;
 }
 else
 {
 // PFR
- job->cfr = 2;
+ fps_mode = 2;
 }
 }
 else
 {
 /* same as source */
- job->vrate = [[queueToApply objectForKey:@"JobVrate"] intValue];
- job->vrate_base = [[queueToApply objectForKey:@"JobVrateBase"] intValue];
+ fps_num = [[queueToApply objectForKey:@"JobVrate"] intValue];
+ fps_den = [[queueToApply objectForKey:@"JobVrateBase"] intValue];
 if ([[queueToApply objectForKey:@"VideoFramerateMode"] isEqualToString:@"cfr"])
 {
 // CFR
- job->cfr = 1;
+ fps_mode = 1;
 }
 else
 {
 // VFR
- job->cfr = 0;
+ fps_mode = 0;
 }
 }
 
@@ -3979,130 +3523,100 @@
 job->vbitrate = 0;
 
 }
- 
- job->grayscale = [[queueToApply objectForKey:@"VideoGrayScale"] intValue];
- 
 
+ job->grayscale = [[queueToApply objectForKey:@"VideoGrayScale"] intValue];
 
-#pragma mark -
-#pragma mark Process Subtitles to libhb
+ // Map the settings in the dictionaries for the SubtitleList array to match title->list_subtitle
+ BOOL one_burned = NO;
+ int i = 0;
 
-/* Map the settings in the dictionaries for the SubtitleList array to match title->list_subtitle
- * which means that we need to account for the offset of non source language settings in from
- * the NSPopUpCell menu. For all of the objects in the SubtitleList array this means 0 is "None"
- * from the popup menu, additionally the first track has "Foreign Audio Search" at 1. So we use
- * an int to offset the index number for the objectForKey:@"subtitleSourceTrackNum" to map that
- * to the source tracks position in title->list_subtitle.
- */
+ NSArray *subtitles = [queueToApply objectForKey:@"SubtitleList"];
+ for (id subtitleDict in subtitles)
+ {
+ int subtitle = [subtitleDict[keySubTrackIndex] intValue];
+ int force = [subtitleDict[keySubTrackForced] intValue];
+ int burned = [subtitleDict[keySubTrackBurned] intValue];
+ int def = [subtitleDict[keySubTrackDefault] intValue];
 
-int subtitle;
-int force;
-int burned;
-int def;
-bool one_burned = FALSE;
+ // if i is 0, then we are in the first item of the subtitles which we need to
+ // check for the "Foreign Audio Search" which would be keySubTrackIndex of -1
 
- int i = 0;
- NSEnumerator *enumerator = [[queueToApply objectForKey:@"SubtitleList"] objectEnumerator];
- id tempObject;
- while (tempObject = [enumerator nextObject])
- {
- 
- subtitle = [[tempObject objectForKey:@"subtitleSourceTrackNum"] intValue];
- force = [[tempObject objectForKey:@"subtitleTrackForced"] intValue];
- burned = [[tempObject objectForKey:@"subtitleTrackBurned"] intValue];
- def = [[tempObject objectForKey:@"subtitleTrackDefault"] intValue];
- 
- /* since the subtitleSourceTrackNum 0 is "None" in our array of the subtitle popups,
- * we want to ignore it for display as well as encoding.
- */
- if (subtitle > 0)
+ // if we are on the first track and using "Foreign Audio Search"
+ if (i == 0 && subtitle == -1)
 {
- /* if i is 0, then we are in the first item of the subtitles which we need to 
- * check for the "Foreign Audio Search" which would be subtitleSourceTrackNum of 1
- * bearing in mind that for all tracks subtitleSourceTrackNum of 0 is None.
- */
- 
- /* if we are on the first track and using "Foreign Audio Search" */ 
- if (i == 0 && subtitle == 1)
+ [HBUtilities writeToActivityLog: "Foreign Language Search: %d", 1];
+
+ job->indepth_scan = 1;
+
+ if (burned != 1)
 {
- [self writeToActivityLog: "Foreign Language Search: %d", 1];
- 
- job->indepth_scan = 1;
- 
- if (burned != 1)
- {
- job->select_subtitle_config.dest = PASSTHRUSUB;
- }
- else
- {
- job->select_subtitle_config.dest = RENDERSUB;
- }
- 
- job->select_subtitle_config.force = force;
- job->select_subtitle_config.default_track = def;
+ job->select_subtitle_config.dest = PASSTHRUSUB;
 }
 else
 {
- /* if we are getting the subtitles from an external srt file */
- if ([[tempObject objectForKey:@"subtitleSourceTrackType"] intValue] == SRTSUB)
+ job->select_subtitle_config.dest = RENDERSUB;
+ }
+
+ job->select_subtitle_config.force = force;
+ job->select_subtitle_config.default_track = def;
+ }
+ else
+ {
+ // if we are getting the subtitles from an external srt file
+ if ([subtitleDict[keySubTrackType] intValue] == SRTSUB)
+ {
+ hb_subtitle_config_t sub_config;
+
+ sub_config.offset = [subtitleDict[keySubTrackSrtOffset] intValue];
+
+ // we need to srncpy file name and codeset
+ strncpy(sub_config.src_filename, [subtitleDict[keySubTrackSrtFilePath] UTF8String], 255);
+ sub_config.src_filename[255] = 0;
+ strncpy(sub_config.src_codeset, [subtitleDict[keySubTrackSrtCharCode] UTF8String], 39);
+ sub_config.src_codeset[39] = 0;
+
+ if( !burned && hb_subtitle_can_pass( SRTSUB, job->mux ) )
 {
- hb_subtitle_config_t sub_config;
- 
- sub_config.offset = [[tempObject objectForKey:@"subtitleTrackSrtOffset"] intValue];
- 
- /* we need to srncpy file name and codeset */
- strncpy(sub_config.src_filename, [[tempObject objectForKey:@"subtitleSourceSrtFilePath"] UTF8String], 255);
- sub_config.src_filename[255] = 0;
- strncpy(sub_config.src_codeset, [[tempObject objectForKey:@"subtitleTrackSrtCharCode"] UTF8String], 39);
- sub_config.src_codeset[39] = 0;
- 
- sub_config.force = 0;
 sub_config.dest = PASSTHRUSUB;
- sub_config.default_track = def;
- 
- hb_srt_add( job, &sub_config, [[tempObject objectForKey:@"subtitleTrackSrtLanguageIso3"] UTF8String]);
- continue;
 }
- 
- /* for the actual source tracks, we must subtract the non source entries so 
- * that the menu index matches the source subtitle_list index for convenience */
- if( i == 0 )
+ else if( hb_subtitle_can_burn( SRTSUB ) )
 {
- /* for the first track, the source tracks start at menu index 2 ( None is 0,
- * Foreign Language Search is 1) so subtract 2 */
- subtitle = subtitle - 2;
+ // Only allow one subtitle to be burned into the video
+ if( one_burned )
+ continue;
+ one_burned = TRUE;
+ sub_config.dest = RENDERSUB;
 }
- else
+
+ sub_config.force = 0;
+ sub_config.default_track = def;
+ hb_srt_add( job, &sub_config, [subtitleDict[keySubTrackLanguageIsoCode] UTF8String]);
+ continue;
+ }
+
+ /* We are setting a source subtitle so access the source subtitle info */
+ hb_subtitle_t * subt = (hb_subtitle_t *) hb_list_item( title->list_subtitle, subtitle );
+
+ if( subt != NULL )
+ {
+ hb_subtitle_config_t sub_config = subt->config;
+
+ if( !burned && hb_subtitle_can_pass( subt->source, job->mux ) )
 {
- /* for all other tracks, the source tracks start at menu index 1 (None is 0)
- * so subtract 1. */
- subtitle = subtitle - 1;
+ sub_config.dest = PASSTHRUSUB;
 }
- 
- /* We are setting a source subtitle so access the source subtitle info */ 
- hb_subtitle_t * subt = (hb_subtitle_t *) hb_list_item( title->list_subtitle, subtitle );
- 
- if( subt != NULL )
+ else if( hb_subtitle_can_burn( subt->source ) )
 {
- hb_subtitle_config_t sub_config = subt->config;
- 
- if( !burned && hb_subtitle_can_pass( subt->source, job->mux ) )
- {
- sub_config.dest = PASSTHRUSUB;
- }
- else if( hb_subtitle_can_burn( subt->source ) )
- {
- // Only allow one subtitle to be burned into the video
- if( one_burned )
- continue;
- one_burned = TRUE;
- sub_config.dest = RENDERSUB;
- }
- 
- sub_config.force = force;
- sub_config.default_track = def;
- hb_subtitle_add( job, &sub_config, subtitle );
+ // Only allow one subtitle to be burned into the video
+ if( one_burned )
+ continue;
+ one_burned = TRUE;
+ sub_config.dest = RENDERSUB;
 }
+
+ sub_config.force = force;
+ sub_config.default_track = def;
+ hb_subtitle_add( job, &sub_config, subtitle );
 }
 }
 i++;
@@ -4115,60 +3629,56 @@
 job->crop[2], job->crop[3]] UTF8String] );
 }
 
-#pragma mark -
+ /* Auto Defaults */
+ NSDictionary *audioDefaults = queueToApply[@"AudioDefaults"];
 
- /* Auto Passthru */
 job->acodec_copy_mask = 0;
- if( [[queueToApply objectForKey: @"AudioAllowAACPass"] intValue] == 1 )
+
+ if ([audioDefaults[@"AudioAllowAACPass"] boolValue])
 {
 job->acodec_copy_mask |= HB_ACODEC_FFAAC;
 }
- if( [[queueToApply objectForKey: @"AudioAllowAC3Pass"] intValue] == 1 )
+ if ([audioDefaults[@"AudioAllowAC3Pass"] boolValue])
 {
 job->acodec_copy_mask |= HB_ACODEC_AC3;
 }
- if( [[queueToApply objectForKey: @"AudioAllowDTSHDPass"] intValue] == 1 )
+ if ([audioDefaults[@"AudioAllowDTSHDPass"] boolValue])
 {
 job->acodec_copy_mask |= HB_ACODEC_DCA_HD;
 }
- if( [[queueToApply objectForKey: @"AudioAllowDTSPass"] intValue] == 1 )
+ if ([audioDefaults[@"AudioAllowDTSPass"] boolValue])
 {
 job->acodec_copy_mask |= HB_ACODEC_DCA;
 }
- if( [[queueToApply objectForKey: @"AudioAllowMP3Pass"] intValue] == 1 )
+ if ([audioDefaults[@"AudioAllowMP3Pass"] boolValue])
 {
 job->acodec_copy_mask |= HB_ACODEC_MP3;
 }
- job->acodec_fallback = [[queueToApply objectForKey: @"JobAudioEncoderFallback"] intValue];
- 
+ job->acodec_fallback = hb_audio_encoder_get_from_name([audioDefaults[@"AudioEncoderFallback"] UTF8String]);
+
 /* Audio tracks and mixdowns */
 /* Now lets add our new tracks to the audio list here */
- for (unsigned int counter = 0; counter < maximumNumberOfAllowedAudioTracks; counter++)
+ for (NSDictionary *audioDict in [queueToApply objectForKey:@"AudioList"])
 {
- NSString *prefix = [NSString stringWithFormat:@"Audio%d", counter + 1];
- NSString *jobPrefix = [NSString stringWithFormat:@"JobAudio%d", counter + 1];
- if ([[queueToApply objectForKey:[prefix stringByAppendingString:@"Track"]] intValue] > 0)
- {
- audio = (hb_audio_config_t*)calloc(1, sizeof(*audio));
- hb_audio_config_init(audio);
- audio->in.track = [[queueToApply objectForKey:[prefix stringByAppendingString:@"Track"]] intValue] - 1;
- /* We go ahead and assign values to our audio->out.<properties> */
- audio->out.track = audio->in.track;
- audio->out.codec = [[queueToApply objectForKey:[jobPrefix stringByAppendingString:@"Encoder"]] intValue];
- audio->out.compression_level = hb_get_default_audio_compression(audio->out.codec);
- audio->out.mixdown = [[queueToApply objectForKey:[jobPrefix stringByAppendingString:@"Mixdown"]] intValue];
- audio->out.normalize_mix_level = 0;
- audio->out.bitrate = [[queueToApply objectForKey:[jobPrefix stringByAppendingString:@"Bitrate"]] intValue];
- audio->out.samplerate = [[queueToApply objectForKey:[jobPrefix stringByAppendingString:@"Samplerate"]] intValue];
- audio->out.dynamic_range_compression = [[queueToApply objectForKey:[prefix stringByAppendingString:@"TrackDRCSlider"]] floatValue];
- audio->out.gain = [[queueToApply objectForKey:[prefix stringByAppendingString:@"TrackGainSlider"]] floatValue];
- audio->out.dither_method = hb_audio_dither_get_default();
- 
- hb_audio_add(job, audio);
- free(audio);
- }
+ audio = (hb_audio_config_t *)calloc(1, sizeof(*audio));
+ hb_audio_config_init(audio);
+ audio->in.track = [audioDict[@"Track"] intValue];
+ /* We go ahead and assign values to our audio->out.<properties> */
+ audio->out.track = audio->in.track;
+ audio->out.codec = [audioDict[@"JobEncoder"] intValue];
+ audio->out.compression_level = hb_audio_compression_get_default(audio->out.codec);
+ audio->out.mixdown = [audioDict[@"JobMixdown"] intValue];
+ audio->out.normalize_mix_level = 0;
+ audio->out.bitrate = [audioDict[@"JobBitrate"] intValue];
+ audio->out.samplerate = [audioDict[@"JobSamplerate"] intValue];
+ audio->out.dynamic_range_compression = [audioDict[@"TrackDRCSlider"] doubleValue];
+ audio->out.gain = [audioDict[@"TrackGainSlider"] doubleValue];
+ audio->out.dither_method = hb_audio_dither_get_default();
+
+ hb_audio_add(job, audio);
+ free(audio);
 }
- 
+
 /* Now lets call the filters if applicable.
 * The order of the filters is critical
 */
@@ -4241,26 +3751,30 @@
 }
 }
 /* Denoise */
- filter = hb_filter_init( HB_FILTER_DENOISE );
-	if ([[queueToApply objectForKey:@"PictureDenoise"] intValue] == 1) // Custom in popup
-	{
-		/* we add the custom string if present */
- hb_add_filter( job, filter, [[queueToApply objectForKey:@"PictureDenoiseCustom"] UTF8String] );	
-	}
- else if ([[queueToApply objectForKey:@"PictureDenoise"] intValue] == 2) // Weak in popup
-	{
- hb_add_filter( job, filter, "2:1:2:3" );	
-	}
-	else if ([[queueToApply objectForKey:@"PictureDenoise"] intValue] == 3) // Medium in popup
-	{
- hb_add_filter( job, filter, "3:2:2:3" );	
-	}
-	else if ([[queueToApply objectForKey:@"PictureDenoise"] intValue] == 4) // Strong in popup
-	{
- hb_add_filter( job, filter, "7:7:5:5" );	
-	}
- 
- 
+ if (![queueToApply[@"PictureDenoise"] isEqualToString:@"off"])
+ {
+ int filter_id = HB_FILTER_HQDN3D;
+ if ([queueToApply[@"PictureDenoise"] isEqualToString:@"nlmeans"])
+ filter_id = HB_FILTER_NLMEANS;
+
+ if ([queueToApply[@"PictureDenoisePreset"] isEqualToString:@"none"])
+ {
+ const char *filter_str;
+ filter_str = [queueToApply[@"PictureDenoiseCustom"] UTF8String];
+ filter = hb_filter_init(filter_id);
+ hb_add_filter(job, filter, filter_str);
+ }
+ else
+ {
+ const char *filter_str, *preset, *tune;
+ preset = [queueToApply[@"PictureDenoisePreset"] UTF8String];
+ tune = [queueToApply[@"PictureDenoiseTune"] UTF8String];
+ filter_str = hb_generate_filter_settings(filter_id, preset, tune);
+ filter = hb_filter_init(filter_id);
+ hb_add_filter(job, filter, filter_str);
+ }
+ }
+
 /* Deblock (uses pp7 default) */
 /* NOTE: even though there is a valid deblock setting of 0 for the filter, for 
 * the macgui's purposes a value of 0 actually means to not even use the filter
@@ -4280,11 +3794,11 @@
 job->crop[2], job->crop[3]] UTF8String] );
 
 /* Add framerate shaping filter */
- filter = hb_filter_init( HB_FILTER_VFR );
- hb_add_filter( job, filter, [[NSString stringWithFormat:@"%d:%d:%d",
- job->cfr, job->vrate, job->vrate_base] UTF8String] );
+ filter = hb_filter_init(HB_FILTER_VFR);
+ hb_add_filter(job, filter, [[NSString stringWithFormat:@"%d:%d:%d",
+ fps_mode, fps_num, fps_den] UTF8String]);
 
-[self writeToActivityLog: "prepareJob exiting"]; 
+ [HBUtilities writeToActivityLog: "prepareJob exiting"];
 }
 
 
@@ -4298,7 +3812,11 @@
 	/* We check for a valid destination here */
 	if ([[NSFileManager defaultManager] fileExistsAtPath:destinationDirectory] == 0) 
 	{
-		NSRunAlertPanel(@"Warning!", @"This is not a valid destination directory!", @"OK", nil, nil);
+ NSAlert *alert = [[NSAlert alloc] init];
+ [alert setMessageText:@"Warning!"];
+ [alert setInformativeText:@"This is not a valid destination directory!"];
+ [alert runModal];
+ [alert release];
 return;
 	}
 
@@ -4315,37 +3833,37 @@
 }
 
 /* We now run through the queue and make sure we are not overwriting an exisiting queue item */
- int i = 0;
- NSEnumerator *enumerator = [QueueFileArray objectEnumerator];
-	id tempObject;
-	while (tempObject = [enumerator nextObject])
+	for (id tempObject in QueueFileArray)
 	{
 		NSDictionary *thisQueueDict = tempObject;
 		if ([[thisQueueDict objectForKey:@"DestinationPath"] isEqualToString: [fDstFile2Field stringValue]])
 		{
 			fileExistsInQueue = YES;	
 		}
- i++;
 	}
- 
- 
+
 	if(fileExists == YES)
 {
- NSBeginCriticalAlertSheet( NSLocalizedString( @"File already exists.", @"" ),
- NSLocalizedString( @"Cancel", @"" ), NSLocalizedString( @"Overwrite", @"" ), nil, fWindow, self,
- @selector( overwriteAddToQueueAlertDone:returnCode:contextInfo: ),
- NULL, NULL, [NSString stringWithFormat:
- NSLocalizedString( @"Do you want to overwrite %@?", @"" ),
- [fDstFile2Field stringValue]] );
+ NSAlert *alert = [NSAlert alertWithMessageText:@"File already exists."
+ defaultButton:@"Cancel"
+ alternateButton:@"Overwrite"
+ otherButton:nil
+ informativeTextWithFormat:@"Do you want to overwrite %@?", [fDstFile2Field stringValue]];
+ [alert setAlertStyle:NSCriticalAlertStyle];
+
+ [alert beginSheetModalForWindow:fWindow modalDelegate:self didEndSelector:@selector( overwriteAddToQueueAlertDone:returnCode:contextInfo: ) contextInfo:NULL];
+
 }
 else if (fileExistsInQueue == YES)
 {
- NSBeginCriticalAlertSheet( NSLocalizedString( @"There is already a queue item for this destination.", @"" ),
- NSLocalizedString( @"Cancel", @"" ), NSLocalizedString( @"Overwrite", @"" ), nil, fWindow, self,
- @selector( overwriteAddToQueueAlertDone:returnCode:contextInfo: ),
- NULL, NULL, [NSString stringWithFormat:
- NSLocalizedString( @"Do you want to overwrite %@?", @"" ),
- [fDstFile2Field stringValue]] );
+ NSAlert *alert = [NSAlert alertWithMessageText:@"There is already a queue item for this destination."
+ defaultButton:@"Cancel"
+ alternateButton:@"Overwrite"
+ otherButton:nil
+ informativeTextWithFormat:@"Do you want to overwrite %@?", [fDstFile2Field stringValue]];
+ [alert setAlertStyle:NSCriticalAlertStyle];
+
+ [alert beginSheetModalForWindow:fWindow modalDelegate:self didEndSelector:@selector( overwriteAddToQueueAlertDone:returnCode:contextInfo: ) contextInfo:NULL];
 }
 else
 {
@@ -4374,7 +3892,7 @@
 */
 - (IBAction) Rip: (id) sender
 {
- [self writeToActivityLog: "Rip: Pending queue count is %d", fPendingCount];
+ [HBUtilities writeToActivityLog: "Rip: Pending queue count is %d", fPendingCount];
 /* Rip or Cancel ? */
 hb_state_t s;
 hb_get_state2( fQueueEncodeLibhb, &s );
@@ -4404,20 +3922,25 @@
 NSString *destinationDirectory = [[fDstFile2Field stringValue] stringByDeletingLastPathComponent];
 if ([[NSFileManager defaultManager] fileExistsAtPath:destinationDirectory] == 0) 
 {
- NSRunAlertPanel(@"Warning!", @"This is not a valid destination directory!", @"OK", nil, nil);
+ NSAlert *alert = [[NSAlert alloc] init];
+ [alert setMessageText:@"Warning!"];
+ [alert setInformativeText:@"This is not a valid destination directory!"];
+ [alert runModal];
+ [alert release];
 return;
 }
 
 /* We check for duplicate name here */
 if( [[NSFileManager defaultManager] fileExistsAtPath:[fDstFile2Field stringValue]] )
 {
- NSBeginCriticalAlertSheet( NSLocalizedString( @"File already exists", @"" ),
- NSLocalizedString( @"Cancel", "" ), NSLocalizedString( @"Overwrite", @"" ), nil, fWindow, self,
- @selector( overWriteAlertDone:returnCode:contextInfo: ),
- NULL, NULL, [NSString stringWithFormat:
- NSLocalizedString( @"Do you want to overwrite %@?", @"" ),
- [fDstFile2Field stringValue]] );
- 
+ NSAlert *alert = [NSAlert alertWithMessageText:@"File already exists."
+ defaultButton:@"Cancel"
+ alternateButton:@"Overwrite"
+ otherButton:nil
+ informativeTextWithFormat:@"Do you want to overwrite %@?", [fDstFile2Field stringValue]];
+ [alert setAlertStyle:NSCriticalAlertStyle];
+
+ [alert beginSheetModalForWindow:fWindow modalDelegate:self didEndSelector:@selector( overWriteAlertDone:returnCode:contextInfo: ) contextInfo:NULL];
 // overWriteAlertDone: will be called when the alert is dismissed. It will call doRip.
 }
 else
@@ -4461,33 +3984,46 @@
 
 - (void) remindUserOfSleepOrShutdown
 {
- if ([[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Put Computer To Sleep"])
- {
- /*Warn that computer will sleep after encoding*/
- int reminduser;
- NSBeep();
- reminduser = NSRunAlertPanel(@"The computer will sleep after encoding is done.",@"You have selected to sleep the computer after encoding. To turn off sleeping, go to the HandBrake preferences.", @"OK", @"Preferences…", nil);
- [NSApp requestUserAttention:NSCriticalRequest];
- if ( reminduser == NSAlertAlternateReturn )
- {
- [self showPreferencesWindow:nil];
- }
- }
- else if ([[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Shut Down Computer"])
- {
- /*Warn that computer will shut down after encoding*/
- int reminduser;
- NSBeep();
- reminduser = NSRunAlertPanel(@"The computer will shut down after encoding is done.",@"You have selected to shut down the computer after encoding. To turn off shut down, go to the HandBrake preferences.", @"OK", @"Preferences…", nil);
- [NSApp requestUserAttention:NSCriticalRequest];
- if ( reminduser == NSAlertAlternateReturn )
- {
- [self showPreferencesWindow:nil];
- }
- }
+ if ([[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Put Computer To Sleep"])
+ {
+ /*Warn that computer will sleep after encoding*/
+ NSBeep();
+ [NSApp requestUserAttention:NSCriticalRequest];
 
-}
+ NSAlert *alert = [[NSAlert alloc] init];
+ [alert setMessageText:@"The computer will sleep after encoding is done."];
+ [alert setInformativeText:@"You have selected to sleep the computer after encoding. To turn off sleeping, go to the HandBrake preferences."];
+ [alert addButtonWithTitle:@"OK"];
+ [alert addButtonWithTitle:@"Preferences…"];
+
+ NSInteger reminduser = [alert runModal];
+ [alert release];
+ if (reminduser == NSAlertSecondButtonReturn)
+ {
+ [self showPreferencesWindow:nil];
+ }
+ }
+ else if ([[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Shut Down Computer"])
+ {
+ /*Warn that computer will shut down after encoding*/
+ NSBeep();
+ [NSApp requestUserAttention:NSCriticalRequest];
+
+ NSAlert *alert = [[NSAlert alloc] init];
+ [alert setMessageText:@"The computer will shut down after encoding is done."];
+ [alert setInformativeText:@"You have selected to shut down the computer after encoding. To turn off shut down, go to the HandBrake preferences."];
+ [alert addButtonWithTitle:@"OK"];
+ [alert addButtonWithTitle:@"Preferences…"];
+
+ NSInteger reminduser = [alert runModal];
+ if (reminduser == NSAlertSecondButtonReturn)
+ {
+ [self showPreferencesWindow:nil];
+ }
+ [alert release];
+ }
 
+}
 
 - (void) doRip
 {
@@ -4512,40 +4048,44 @@
 * (which will take care of it) or resume right away
 */
 hb_pause(fQueueEncodeLibhb);
- 
- NSString * alertTitle = [NSString stringWithFormat:NSLocalizedString(@"You are currently encoding. What would you like to do ?", nil)];
- 
+
 // Which window to attach the sheet to?
 NSWindow * docWindow;
 if ([sender respondsToSelector: @selector(window)])
+ {
 docWindow = [sender window];
+ }
 else
+ {
 docWindow = fWindow;
- 
- NSBeginCriticalAlertSheet(
- alertTitle,
- NSLocalizedString(@"Continue Encoding", nil),
- NSLocalizedString(@"Cancel Current and Stop", nil),
- NSLocalizedString(@"Cancel Current and Continue", nil),
- docWindow, self,
- nil, @selector(didDimissCancel:returnCode:contextInfo:), nil,
- NSLocalizedString(@"Your encode will be cancelled if you don't continue encoding.", nil));
- 
- // didDimissCancelCurrentJob:returnCode:contextInfo: will be called when the dialog is dismissed
+ }
+
+ NSAlert *alert = [[NSAlert alloc] init];
+ [alert setMessageText:NSLocalizedString(@"You are currently encoding. What would you like to do ?", nil)];
+ [alert setInformativeText:NSLocalizedString(@"Your encode will be cancelled if you don't continue encoding.", nil)];
+ [alert addButtonWithTitle:NSLocalizedString(@"Continue Encoding", nil)];
+ [alert addButtonWithTitle:NSLocalizedString(@"Cancel Current and Stop", nil)];
+ [alert addButtonWithTitle:NSLocalizedString(@"Cancel Current and Continue", nil)];
+ [alert setAlertStyle:NSCriticalAlertStyle];
+ [alert beginSheetModalForWindow:docWindow
+ modalDelegate:self
+ didEndSelector:@selector(didDimissCancel:returnCode:contextInfo:)
+ contextInfo:nil];
+ [alert release];
 }
 
 - (void) didDimissCancel: (NSWindow *)sheet returnCode: (int)returnCode contextInfo: (void *)contextInfo
 {
 /* No need to prevent system sleep here as we didn't allow it in Cancel: */
 hb_resume(fQueueEncodeLibhb);
- 
- if (returnCode == NSAlertOtherReturn)
+
+ if (returnCode == NSAlertSecondButtonReturn)
 {
- [self doCancelCurrentJob]; // <- this also stops libhb
+ [self doCancelCurrentJobAndStop];
 }
- else if (returnCode == NSAlertAlternateReturn)
+ else if (returnCode == NSAlertThirdButtonReturn)
 {
- [self doCancelCurrentJobAndStop];
+ [self doCancelCurrentJob]; // <- this also stops libhb
 }
 }
 
@@ -4579,10 +4119,10 @@
 [self saveQueueFileItem];
 
 // and see if there are more items left in our queue
- int queueItems = [QueueFileArray count];
+ NSInteger queueItems = [QueueFileArray count];
 /* If we still have more items in our queue, lets go to the next one */
 /* Check to see if there are any more pending items in the queue */
- int newQueueItemIndex = [self getNextPendingQueueIndex];
+ NSInteger newQueueItemIndex = [self getNextPendingQueueIndex];
 /* If we still have more pending items in our queue, lets go to the next one */
 if (newQueueItemIndex >= 0 && newQueueItemIndex < queueItems)
 {
@@ -4590,7 +4130,7 @@
 currentQueueEncodeIndex = newQueueItemIndex;
 /* now we mark the queue item as Status = 1 ( being encoded ) so another instance can not come along and try to scan it while we are scanning */
 [[QueueFileArray objectAtIndex:currentQueueEncodeIndex] setObject:[NSNumber numberWithInt:1] forKey:@"Status"];
- [self writeToActivityLog: "incrementQueueItemDone new pending items found: %d", currentQueueEncodeIndex];
+ [HBUtilities writeToActivityLog: "incrementQueueItemDone new pending items found: %d", currentQueueEncodeIndex];
 [self saveQueueFileItem];
 /* now we can go ahead and scan the new pending queue item */
 [self performNewQueueScan:[[QueueFileArray objectAtIndex:currentQueueEncodeIndex] objectForKey:@"SourcePath"] scanTitleNum:[[[QueueFileArray objectAtIndex:currentQueueEncodeIndex] objectForKey:@"TitleNumber"]intValue]];
@@ -4598,7 +4138,7 @@
 }
 else
 {
- [self writeToActivityLog: "incrementQueueItemDone there are no more pending encodes"];
+ [HBUtilities writeToActivityLog: "incrementQueueItemDone there are no more pending encodes"];
 }
 }
 
@@ -4622,7 +4162,7 @@
 [self saveQueueFileItem];
 // so now lets move to 
 currentQueueEncodeIndex++ ;
- [self writeToActivityLog: "cancelling current job and stopping the queue"];
+ [HBUtilities writeToActivityLog: "cancelling current job and stopping the queue"];
 }
 - (IBAction) Pause: (id) sender
 {
@@ -4645,11 +4185,14 @@
 #pragma mark Batch Queue Titles Methods
 - (IBAction) addAllTitlesToQueue: (id) sender
 {
- NSBeginCriticalAlertSheet( NSLocalizedString( @"You are about to add ALL titles to the queue!", @"" ), 
- NSLocalizedString( @"Cancel", @"" ), NSLocalizedString( @"Yes, I want to add all titles to the queue.", @"" ), nil, fWindow, self,
- @selector( addAllTitlesToQueueAlertDone:returnCode:contextInfo: ),
- NULL, NULL, [NSString stringWithFormat:
- NSLocalizedString( @"Current settings will be applied to all %d titles. Are you sure you want to do this?", @"" ),[fSrcTitlePopUp numberOfItems]] );
+ NSAlert *alert = [NSAlert alertWithMessageText:@"You are about to add ALL titles to the queue!"
+ defaultButton:@"Cancel"
+ alternateButton:@"Yes, I want to add all titles to the queue"
+ otherButton:nil
+ informativeTextWithFormat:@"Current preset will be applied to all %ld titles. Are you sure you want to do this?", (long)[fSrcTitlePopUp numberOfItems]];
+ [alert setAlertStyle:NSCriticalAlertStyle];
+
+ [alert beginSheetModalForWindow:fWindow modalDelegate:self didEndSelector:@selector( addAllTitlesToQueueAlertDone:returnCode:contextInfo: ) contextInfo:NULL];
 }
 
 - (void) addAllTitlesToQueueAlertDone: (NSWindow *) sheet
@@ -4663,7 +4206,7 @@
 {
 
 /* first get the currently selected index so we can choose it again after cycling through the available titles. */
- int currentlySelectedTitle = [fSrcTitlePopUp indexOfSelectedItem];
+ NSInteger currentlySelectedTitle = [fSrcTitlePopUp indexOfSelectedItem];
 
 /* For each title in the fSrcTitlePopUp, select it */
 for( int i = 0; i < [fSrcTitlePopUp numberOfItems]; i++ )
@@ -4683,11 +4226,49 @@
 #pragma mark -
 #pragma mark GUI Controls Changed Methods
 
+- (void)updateFileName
+{
+ if (!SuccessfulScan)
+ {
+ return;
+ }
+
+ hb_list_t *list = hb_get_titles(fHandle);
+ hb_title_t *title = (hb_title_t *)
+ hb_list_item(list, (int)[fSrcTitlePopUp indexOfSelectedItem]);
+
+ NSString *sourceName = nil;
+ // Get the file name
+ if ((title->type == HB_STREAM_TYPE || title->type == HB_FF_STREAM_TYPE) &&
+ hb_list_count( list ) > 1 )
+ {
+ sourceName = @(title->name);
+ }
+ else
+ {
+ sourceName = [browsedSourceDisplayName stringByDeletingPathExtension];
+ }
+
+ // Generate a new file name
+ NSString *fileName = [HBUtilities automaticNameForSource:sourceName
+ title:title->index
+ chapters:NSMakeRange([fSrcChapterStartPopUp indexOfSelectedItem] + 1, [fSrcChapterEndPopUp indexOfSelectedItem] + 1)
+ quality:fVideoController.qualityType ? fVideoController.selectedQuality : 0
+ bitrate:!fVideoController.qualityType ? fVideoController.selectedBitrate : 0
+ videoCodec:fVideoController.codec];
+
+ // Swap the old one with the new one
+ [fDstFile2Field setStringValue: [NSString stringWithFormat:@"%@/%@.%@",
+ [[fDstFile2Field stringValue] stringByDeletingLastPathComponent],
+ fileName,
+ [[fDstFile2Field stringValue] pathExtension]]];
+}
+
 - (IBAction) titlePopUpChanged: (id) sender
 {
 hb_list_t * list = hb_get_titles( fHandle );
 hb_title_t * title = (hb_title_t*)
- hb_list_item( list, [fSrcTitlePopUp indexOfSelectedItem] );
+ hb_list_item( list, (int)[fSrcTitlePopUp indexOfSelectedItem] );
 
 /* If we are a stream type and a batch scan, grok the output file name from title->name upon title change */
 if ((title->type == HB_STREAM_TYPE || title->type == HB_FF_STREAM_TYPE) &&
@@ -4711,20 +4292,9 @@
 [fSrcFrameStartEncodingField setStringValue: [NSString stringWithFormat: @"%d", 1]];
 //[fSrcFrameEndEncodingField setStringValue: [NSString stringWithFormat: @"%d", ((title->hours * 3600) + (title->minutes * 60) + (title->seconds)) * 24]];
 [fSrcFrameEndEncodingField setStringValue: [NSString stringWithFormat: @"%d", duration * (title->rate / title->rate_base)]]; 
- 
- /* If Auto Naming is on. We create an output filename of dvd name - title number */
- if( [[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultAutoNaming"] > 0 && ( hb_list_count( list ) > 1 ) )
-	{
-		[fDstFile2Field setStringValue: [NSString stringWithFormat:
-			@"%@/%@-%d.%@", [[fDstFile2Field stringValue] stringByDeletingLastPathComponent],
-			[browsedSourceDisplayName stringByDeletingPathExtension],
- title->index,
-			[[fDstFile2Field stringValue] pathExtension]]];	
-	}
+
 /* Update encode start / stop variables */
- 
- 
- 
+
 /* Update chapter popups */
 [fSrcChapterStartPopUp removeAllItems];
 [fSrcChapterEndPopUp removeAllItems];
@@ -4740,26 +4310,14 @@
 [fSrcChapterEndPopUp selectItemAtIndex:
 hb_list_count( title->list_chapter ) - 1];
 [self chapterPopUpChanged:nil];
- 
- /* if using dvd nav, show the angle widget */
- if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"UseDvdNav"] boolValue])
- {
- [fSrcAngleLabel setHidden:NO];
- [fSrcAnglePopUp setHidden:NO];
- 
- [fSrcAnglePopUp removeAllItems];
- for( int i = 0; i < title->angle_count; i++ )
- {
- [fSrcAnglePopUp addItemWithTitle: [NSString stringWithFormat: @"%d", i + 1]];
- }
- [fSrcAnglePopUp selectItemAtIndex: 0];
- }
- else
+
+ [fSrcAnglePopUp removeAllItems];
+ for( int i = 0; i < title->angle_count; i++ )
 {
- [fSrcAngleLabel setHidden:YES];
- [fSrcAnglePopUp setHidden:YES];
+ [fSrcAnglePopUp addItemWithTitle: [NSString stringWithFormat: @"%d", i + 1]];
 }
- 
+ [fSrcAnglePopUp selectItemAtIndex: 0];
+
 /* Start Get and set the initial pic size for display */
 	fTitle = title;
 
@@ -4768,40 +4326,27 @@
 
 	/* We get the originial output picture width and height and put them
 	in variables for use with some presets later on */
-	PicOrigOutputWidth = title->width;
-	PicOrigOutputHeight = title->height;
 	AutoCropTop = title->crop[0];
 	AutoCropBottom = title->crop[1];
 	AutoCropLeft = title->crop[2];
 	AutoCropRight = title->crop[3];
 
-	/* Reset the new title in fPictureController && fPreviewController*/
- [fPictureController SetTitle:title];
-
- 
- /* Update Subtitle Table */
- [fSubtitlesDelegate resetWithTitle:title];
- [fSubtitlesTable reloadData];
- 
-
- /* Update chapter table */
- [fChapterTitlesDelegate resetWithTitle:title];
- [fChapterTable reloadData];
-
-	/* Update audio table */
+	/* Update the others views */
 	[[NSNotificationCenter defaultCenter] postNotification:
 	 [NSNotification notificationWithName: HBTitleChangedNotification
 								 object: self
 								 userInfo: [NSDictionary dictionaryWithObjectsAndKeys:
 											[NSData dataWithBytesNoCopy: &fTitle length: sizeof(fTitle) freeWhenDone: NO], keyTitleTag,
 											nil]]];
- [fVidRatePopUp selectItemAtIndex: 0];
 
- /* we run the picture size values through calculatePictureSizing to get all picture setting	information*/
-	[self calculatePictureSizing:nil];
+ /* If Auto Naming is on. We create an output filename of dvd name - title number */
+ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultAutoNaming"])
+	{
+ [self updateFileName];
+	}
 
 /* lets call tableViewSelected to make sure that any preset we have selected is enforced after a title change */
- [self selectPreset:nil];
+ [self applyPreset:self.selectedPreset];
 }
 
 - (IBAction) encodeStartStopPopUpChanged: (id) sender;
@@ -4866,14 +4411,14 @@
 		
 	hb_list_t * list = hb_get_titles( fHandle );
 hb_title_t * title = (hb_title_t *)
- hb_list_item( list, [fSrcTitlePopUp indexOfSelectedItem] );
+ hb_list_item( list, (int)[fSrcTitlePopUp indexOfSelectedItem] );
 
 hb_chapter_t * chapter;
 int64_t duration = 0;
- for( int i = [fSrcChapterStartPopUp indexOfSelectedItem];
+ for( NSInteger i = [fSrcChapterStartPopUp indexOfSelectedItem];
 i <= [fSrcChapterEndPopUp indexOfSelectedItem]; i++ )
 {
- chapter = (hb_chapter_t *) hb_list_item( title->list_chapter, i );
+ chapter = (hb_chapter_t *) hb_list_item( title->list_chapter, (int)i );
 duration += chapter->duration;
 }
 
@@ -4881,12 +4426,18 @@
 [fSrcDuration2Field setStringValue: [NSString stringWithFormat:
 @"%02lld:%02lld:%02lld", duration / 3600, ( duration / 60 ) % 60,
 duration % 60]];
- 
- //[self calculateBitrate: sender];
- 
+
 /* We're changing the chapter range - we may need to flip the m4v/mp4 extension */
- if ([fDstFormatPopUp indexOfSelectedItem] == 0)
- [self autoSetM4vExtension: sender];
+ if ([[fDstFormatPopUp selectedItem] tag] & HB_MUX_MASK_MP4)
+ {
+ [self autoSetM4vExtension:sender];
+ }
+
+ /* If Auto Naming is on it might need to be update if it includes the chapters range */
+ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultAutoNaming"])
+	{
+ [self updateFileName];
+	}
 }
 
 - (IBAction) startEndSecValueChanged: (id) sender
@@ -4896,158 +4447,71 @@
 [fSrcDuration2Field setStringValue: [NSString stringWithFormat:
 @"%02d:%02d:%02d", duration / 3600, ( duration / 60 ) % 60,
 duration % 60]];
- 
- //[self calculateBitrate: sender];
- 
 }
 
 - (IBAction) startEndFrameValueChanged: (id) sender
 {
 hb_list_t * list = hb_get_titles( fHandle );
 hb_title_t * title = (hb_title_t*)
- hb_list_item( list, [fSrcTitlePopUp indexOfSelectedItem] );
+ hb_list_item( list, (int)[fSrcTitlePopUp indexOfSelectedItem] );
 
 int duration = ([fSrcFrameEndEncodingField intValue] - [fSrcFrameStartEncodingField intValue]) / (title->rate / title->rate_base);
 [fSrcDuration2Field setStringValue: [NSString stringWithFormat:
 @"%02d:%02d:%02d", duration / 3600, ( duration / 60 ) % 60,
 duration % 60]];
- 
- //[self calculateBitrate: sender];
 }
 
-
 - (IBAction) formatPopUpChanged: (id) sender
 {
- NSString * string = [fDstFile2Field stringValue];
- int format = [fDstFormatPopUp indexOfSelectedItem];
- char * ext = NULL;
- NSMenuItem *menuItem;
- int i;
-	/* Initially set the large file (64 bit formatting) output checkbox to hidden */
- [fDstMp4LargeFileCheck setHidden: YES];
- [fDstMp4HttpOptFileCheck setHidden: YES];
- [fDstMp4iPodFileCheck setHidden: YES];
- 
- /* Update the Video Codec Popup */
- /* lets get the tag of the currently selected item first so we might reset it later */
- int selectedVidEncoderTag;
- selectedVidEncoderTag = [[fVidEncoderPopUp selectedItem] tag];
- 
- /* Note: we now store the video encoder int values from common.c in the tags of each popup for easy retrieval later */
- [fVidEncoderPopUp removeAllItems];
- for( i = 0; i < hb_video_encoders_count; i++ )
- {
- if( ( ( format == 0 ) && ( hb_video_encoders[i].muxers & HB_MUX_MP4 ) ) ||
- ( ( format == 1 ) && ( hb_video_encoders[i].muxers & HB_MUX_MKV ) ) )
- {
- menuItem = [[fVidEncoderPopUp menu] addItemWithTitle: [NSString stringWithUTF8String: hb_video_encoders[i].human_readable_name]
- action: NULL keyEquivalent: @""];
- [menuItem setTag: hb_video_encoders[i].encoder];
- }
- }
- 
- /*
- * item 0 will be selected by default
- * deselect it so that we can detect whether the video encoder has changed
- */
- [fVidEncoderPopUp selectItem:nil];
- if (selectedVidEncoderTag)
- {
- // if we have a tag for previously selected encoder, try to select it
- // if this fails, [fVidEncoderPopUp selectedItem] will be nil
- // we'll handle that scenario further down
- [fVidEncoderPopUp selectItemWithTag:selectedVidEncoderTag];
- }
- 
- /* Update the Auto Passtgru Fallback Codec Popup */
- /* lets get the tag of the currently selected item first so we might reset it later */
- int selectedAutoPassthruFallbackEncoderTag;
- selectedAutoPassthruFallbackEncoderTag = [[fAudioFallbackPopUp selectedItem] tag];
- 
- [fAudioFallbackPopUp removeAllItems];
- for( i = 0; i < hb_audio_encoders_count; i++ )
- {
- if( !( hb_audio_encoders[i].encoder & HB_ACODEC_PASS_FLAG ) &&
- ( ( ( format == 0 ) && ( hb_audio_encoders[i].muxers & HB_MUX_MP4 ) ) ||
- ( ( format == 1 ) && ( hb_audio_encoders[i].muxers & HB_MUX_MKV ) ) ) )
- {
- menuItem = [[fAudioFallbackPopUp menu] addItemWithTitle: [NSString stringWithUTF8String: hb_audio_encoders[i].human_readable_name]
- action: NULL keyEquivalent: @""];
- [menuItem setTag: hb_audio_encoders[i].encoder];
- }
- }
- 
- /* if we have a previously selected auto passthru fallback encoder tag, then try to select it */
- if (selectedAutoPassthruFallbackEncoderTag)
- {
- selectedAutoPassthruFallbackEncoderTag = [fAudioFallbackPopUp selectItemWithTag: selectedAutoPassthruFallbackEncoderTag];
- }
- /* if we had no previous fallback selected OR if selection failed
- * select the default fallback encoder (AC3) */
- if (!selectedAutoPassthruFallbackEncoderTag)
- {
- [fAudioFallbackPopUp selectItemWithTag: HB_ACODEC_AC3];
- }
- 
- switch( format )
- {
- case 0:
-			[self autoSetM4vExtension: nil];
- /* We show the mp4 option checkboxes here since we are mp4 */
- [fCreateChapterMarkers setEnabled: YES];
-			[fDstMp4LargeFileCheck setHidden: NO];
-			[fDstMp4HttpOptFileCheck setHidden: NO];
- [fDstMp4iPodFileCheck setHidden: NO];
+ NSString *string = [fDstFile2Field stringValue];
+ int videoContainer = (int)[[fDstFormatPopUp selectedItem] tag];
+ const char *ext = NULL;
+
+ // enable chapter markers and hide muxer-specific options
+ [fDstMp4HttpOptFileCheck setHidden:YES];
+ [fDstMp4iPodFileCheck setHidden:YES];
+
+ switch (videoContainer)
+ {
+ case HB_MUX_AV_MP4:
+ [fDstMp4HttpOptFileCheck setHidden:NO];
+ [fDstMp4iPodFileCheck setHidden:NO];
 break;
- 
- case 1:
- ext = "mkv";
- /* We enable the create chapters checkbox here */
-			[fCreateChapterMarkers setEnabled: YES];
-			break;
- 
 
+ default:
+ break;
 }
- /* tell fSubtitlesDelegate we have a new video container */
- 
- [fSubtitlesDelegate containerChanged:[[fDstFormatPopUp selectedItem] tag]];
- [fSubtitlesTable reloadData];
-	
-	/* post a notification for any interested observers to indicate that our video container has changed */
-	[[NSNotificationCenter defaultCenter] postNotification:
-	 [NSNotification notificationWithName: HBContainerChangedNotification
-								 object: self
-								 userInfo: [NSDictionary dictionaryWithObjectsAndKeys:
-											[NSNumber numberWithInt: [[fDstFormatPopUp selectedItem] tag]], keyContainerTag,
-											nil]]];
+ // set the file extension
+ ext = hb_container_get_default_extension(videoContainer);
+ [fDstFile2Field setStringValue:[NSString stringWithFormat:@"%@.%s",
+ [string stringByDeletingPathExtension],
+ ext]];
+ if (videoContainer & HB_MUX_MASK_MP4)
+ {
+ [self autoSetM4vExtension:sender];
+ }
+
+ /* post a notification for any interested observers to indicate that our video container has changed */
+ [[NSNotificationCenter defaultCenter] postNotification:
+ [NSNotification notificationWithName:HBContainerChangedNotification
+ object:self
+ userInfo:[NSDictionary dictionaryWithObjectsAndKeys:
+ [NSNumber numberWithInt:videoContainer], keyContainerTag,
+ nil]]];
 
- if( format == 0 )
- [self autoSetM4vExtension: sender];
- else
- [fDstFile2Field setStringValue: [NSString stringWithFormat:@"%@.%s", [string stringByDeletingPathExtension], ext]];
-
- if (SuccessfulScan)
- {
- if ([fVidEncoderPopUp selectedItem] == nil)
- {
- /* this means the above call to selectItemWithTag failed */
- [fVidEncoderPopUp selectItemAtIndex:0];
- [self videoEncoderPopUpChanged:nil];
- }
- }
 	[self customSettingUsed:sender];
 }
 
-- (IBAction) autoSetM4vExtension: (id) sender
+- (void) autoSetM4vExtension:(NSNotification *)notification
 {
- if ( [fDstFormatPopUp indexOfSelectedItem] )
+ if (!([[fDstFormatPopUp selectedItem] tag] & HB_MUX_MASK_MP4))
 return;
 
 NSString * extension = @"mp4";
 
- BOOL anyCodecAC3 = [fAudioDelegate anyCodecMatches: HB_ACODEC_AC3] || [fAudioDelegate anyCodecMatches: HB_ACODEC_AC3_PASS];
+ BOOL anyCodecAC3 = [fAudioController anyCodecMatches: HB_ACODEC_AC3] || [fAudioController anyCodecMatches: HB_ACODEC_AC3_PASS];
 /* Chapter markers are enabled if the checkbox is ticked and we are doing p2p or we have > 1 chapter */
- BOOL chapterMarkers = ([fCreateChapterMarkers state] == NSOnState) &&
+ BOOL chapterMarkers = (fChapterTitlesController.createChapterMarkers) &&
 ([fEncodeStartStopPopUp indexOfSelectedItem] != 0 ||
 [fSrcChapterStartPopUp indexOfSelectedItem] < [fSrcChapterEndPopUp indexOfSelectedItem]);
 	
@@ -5065,62 +4529,13 @@
 [[fDstFile2Field stringValue] stringByDeletingPathExtension], extension]];
 }
 
-/* Method to determine if we should change the UI
-To reflect whether or not a Preset is being used or if
-the user is using "Custom" settings by determining the sender*/
-- (IBAction) customSettingUsed: (id) sender
-{
-	if ([sender stringValue])
-	{
-		/* Deselect the currently selected Preset if there is one*/
-		[fPresetsOutlineView deselectRow:[fPresetsOutlineView selectedRow]];
-		/* Change UI to show "Custom" settings are being used */
-		[fPresetSelectedDisplay setStringValue: @"Custom"];
-	}
-[self calculateBitrate:nil];
-}
-
-
-#pragma mark -
-#pragma mark - Video
-
-- (IBAction) videoEncoderPopUpChanged: (id) sender
+- (void)updateMp4Checkboxes:(NSNotification *)notification
 {
- int videoEncoder = [[fVidEncoderPopUp selectedItem] tag];
- 
- [fAdvancedOptions setHidden:YES];
- /* If we are using x264 then show the x264 advanced panel and the x264 presets box */
- if (videoEncoder == HB_VCODEC_X264)
- {
- [fAdvancedOptions setHidden:NO];
- 
- // show the x264 presets box
- [fX264PresetsBox setHidden:NO];
- 
- [self autoSetM4vExtension: sender];
- }
- else // we are FFmpeg (lavc) or Theora
- {
- [fAdvancedOptions setHidden:YES];
- [fX264PresetsBox setHidden:YES];
- 
- // We Are Lavc
- if ([[fVidEncoderPopUp selectedItem] tag] & HB_VCODEC_FFMPEG_MASK)
- {
- [fAdvancedOptions setLavcOptsEnabled:YES];
- }
- else /// We are Theora
- {
- [fAdvancedOptions setLavcOptsEnabled:NO]; 
- }
- }
-
-
- if (videoEncoder != HB_VCODEC_X264)
+ if (fVideoController.codec != HB_VCODEC_X264)
 {
 /* We set the iPod atom checkbox to disabled and uncheck it as its only for x264 in the mp4
 * container. Format is taken care of in formatPopUpChanged method by hiding and unchecking
- * anything other than MP4. */ 
+ * anything other than MP4. */
 [fDstMp4iPodFileCheck setEnabled: NO];
 [fDstMp4iPodFileCheck setState: NSOffState];
 }
@@ -5128,623 +4543,50 @@
 {
 [fDstMp4iPodFileCheck setEnabled: YES];
 }
- [self setupQualitySlider];
-	[self calculatePictureSizing: sender];
-	[self twoPassCheckboxChanged: sender];
 }
 
-
-- (IBAction) twoPassCheckboxChanged: (id) sender
+/* Method to determine if we should change the UI
+To reflect whether or not a Preset is being used or if
+the user is using "Custom" settings by determining the sender*/
+- (IBAction) customSettingUsed: (id) sender
 {
-	/* check to see if x264 is chosen */
-	if([[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_X264)
- {
-		if( [fVidTwoPassCheck state] == NSOnState)
-		{
-			[fVidTurboPassCheck setHidden: NO];
-		}
-		else
-		{
-			[fVidTurboPassCheck setHidden: YES];
-			[fVidTurboPassCheck setState: NSOffState];
-		}
-		/* Make sure Two Pass is checked if Turbo is checked */
-		if( [fVidTurboPassCheck state] == NSOnState)
-		{
-			[fVidTwoPassCheck setState: NSOnState];
-		}
-	}
-	else
+	if ([sender stringValue])
 	{
-		[fVidTurboPassCheck setHidden: YES];
-		[fVidTurboPassCheck setState: NSOffState];
+		/* Deselect the currently selected Preset if there is one*/
+ [fPresetsView deselect];
+		/* Change UI to show "Custom" settings are being used */
+		[fPresetSelectedDisplay setStringValue: @"Custom"];
+ self.customPreset = YES;
 	}
-	
-	/* We call method method to change UI to reflect whether a preset is used or not*/
-	[self customSettingUsed: sender];
-}
-
-- (IBAction ) videoFrameRateChanged: (id) sender
-{
- /* Hide and set the PFR Checkbox to OFF if we are set to Same as Source */
- /* Depending on whether or not Same as source is selected modify the title for
- * fFramerateVfrPfrCell*/
- if ([fVidRatePopUp indexOfSelectedItem] == 0) // We are Same as Source
- {
- [fFramerateVfrPfrCell setTitle:@"Variable Framerate"];
- }
- else
- {
- [fFramerateVfrPfrCell setTitle:@"Peak Framerate (VFR)"];
 
-
- }
- 
- /* We call method method to calculatePictureSizing to error check detelecine*/
- [self calculatePictureSizing: sender];
-
- /* We call method method to change UI to reflect whether a preset is used or not*/
-	[self customSettingUsed: sender];
-}
-
-- (IBAction) videoMatrixChanged: (id) sender;
-{
- /* We use the selectedCell: tag of the fVidQualityMatrix instead of selectedRow
- * so that the order of the video controls can be switched around.
- * Constant quality is 1 and Average bitrate is 0 for reference. */
- bool bitrate, quality;
- bitrate = quality = false;
- if( [fVidQualityMatrix isEnabled] )
- {
- switch( [[fVidQualityMatrix selectedCell] tag] )
- {
- case 0:
- bitrate = true;
- break;
- case 1:
- quality = true;
- break;
- }
- }
-
- [fVidBitrateField setEnabled: bitrate];
- [fVidQualitySlider setEnabled: quality];
- [fVidQualityRFField setEnabled: quality];
- [fVidQualityRFLabel setEnabled: quality];
- [fVidTwoPassCheck setEnabled: !quality &&
- [fVidQualityMatrix isEnabled]];
- if( quality )
- {
- [fVidTwoPassCheck setState: NSOffState];
-		[fVidTurboPassCheck setHidden: YES];
-		[fVidTurboPassCheck setState: NSOffState];
- }
-
- [self qualitySliderChanged: sender];
- //[self calculateBitrate: sender];
-	[self customSettingUsed: sender];
-}
-
-/* Use this method to setup the quality slider for cq/rf values depending on
- * the video encoder selected.
- */
-- (void) setupQualitySlider
-{
- /* Get the current slider maxValue to check for a change in slider scale later
- * so that we can choose a new similar value on the new slider scale */
- float previousMaxValue = [fVidQualitySlider maxValue];
- float previousPercentOfSliderScale = [fVidQualitySlider floatValue] / ([fVidQualitySlider maxValue] - [fVidQualitySlider minValue] + 1);
- NSString * qpRFLabelString = @"QP:";
- /* x264 0-51 */
- if ([[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_X264)
- {
- [fVidQualitySlider setMinValue:0.0];
- [fVidQualitySlider setMaxValue:51.0];
- /* As x264 allows for qp/rf values that are fractional, we get the value from the preferences */
- int fractionalGranularity = 1 / [[NSUserDefaults standardUserDefaults] floatForKey:@"x264CqSliderFractional"];
- [fVidQualitySlider setNumberOfTickMarks:(([fVidQualitySlider maxValue] - [fVidQualitySlider minValue]) * fractionalGranularity) + 1];
- qpRFLabelString = @"RF:";
- }
- /* FFmpeg MPEG-2/4 1-31 */
- if ([[fVidEncoderPopUp selectedItem] tag] & HB_VCODEC_FFMPEG_MASK )
- {
- [fVidQualitySlider setMinValue:1.0];
- [fVidQualitySlider setMaxValue:31.0];
- [fVidQualitySlider setNumberOfTickMarks:31];
- }
- /* Theora 0-63 */
- if ([[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_THEORA)
- {
- [fVidQualitySlider setMinValue:0.0];
- [fVidQualitySlider setMaxValue:63.0];
- [fVidQualitySlider setNumberOfTickMarks:64];
- }
- [fVidQualityRFLabel setStringValue:qpRFLabelString];
- 
- /* check to see if we have changed slider scales */
- if (previousMaxValue != [fVidQualitySlider maxValue])
- {
- /* if so, convert the old setting to the new scale as close as possible based on percentages */
- float rf = ([fVidQualitySlider maxValue] - [fVidQualitySlider minValue] + 1) * previousPercentOfSliderScale;
- [fVidQualitySlider setFloatValue:rf];
- }
- 
- [self qualitySliderChanged:nil];
-}
-
-- (IBAction) qualitySliderChanged: (id) sender
-{
- 
- /* Our constant quality slider is in a range based
- * on each encoders qp/rf values. The range depends
- * on the encoder. Also, the range is inverse of quality
- * for all of the encoders *except* for theora
- * (ie. as the "quality" goes up, the cq or rf value
- * actually goes down). Since the IB sliders always set
- * their max value at the right end of the slider, we
- * will calculate the inverse, so as the slider floatValue
- * goes up, we will show the inverse in the rf field
- * so, the floatValue at the right for x264 would be 51
- * and our rf field needs to show 0 and vice versa.
- */
- 
- float sliderRfInverse = ([fVidQualitySlider maxValue] - [fVidQualitySlider floatValue]) + [fVidQualitySlider minValue];
- /* If the encoder is theora, use the float, otherwise use the inverse float*/
- //float sliderRfToPercent;
- if ([[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_THEORA)
- {
- [fVidQualityRFField setStringValue: [NSString stringWithFormat: @"%.2f", [fVidQualitySlider floatValue]]]; 
- }
- else
- {
- [fVidQualityRFField setStringValue: [NSString stringWithFormat: @"%.2f", sliderRfInverse]];
- }
- /* Show a warning if x264 and rf 0 which is lossless */
- if ([[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_X264 && sliderRfInverse == 0.0)
- {
- [fVidQualityRFField setStringValue: [NSString stringWithFormat: @"%.2f (Warning: Lossless)", sliderRfInverse]];
- }
- 
- [self customSettingUsed: sender];
-}
-
-
-- (void) controlTextDidChange: (NSNotification *) notification
-{
- [self calculateBitrate:nil];
-}
-
-- (IBAction) calculateBitrate: (id) sender
-{
- if( !fHandle || ![fVidQualityMatrix selectedRow] || !SuccessfulScan )
- {
- return;
- }
-
- hb_list_t * list = hb_get_titles( fHandle );
- hb_title_t * title = (hb_title_t *) hb_list_item( list,
- [fSrcTitlePopUp indexOfSelectedItem] );
- hb_job_t * job = title->job;
- /* For hb_calc_bitrate in addition to the Target Size in MB out of the
- * Target Size Field, we also need the job info for the Muxer, the Chapters
- * as well as all of the audio track info.
- * This used to be accomplished by simply calling prepareJob here, however
- * since the resilient queue sets the queue array values instead of the job
- * values directly, we duplicate the old prepareJob code here for the variables
- * needed
- */
- job->chapter_start = [fSrcChapterStartPopUp indexOfSelectedItem] + 1;
- job->chapter_end = [fSrcChapterEndPopUp indexOfSelectedItem] + 1; 
- job->mux = [[fDstFormatPopUp selectedItem] tag];
- 
- /* Audio goes here */
-	[fAudioDelegate prepareAudioForJob: job];
- 
-}
-
-#pragma mark -
-#pragma mark - Video x264 Presets
-
-- (IBAction) setupX264PresetsWidgets: (id) sender
-{
- NSUInteger i;
- /*
- * now we populate the x264 preset system widgets via hb_x264_presets(),
- * hb_x264_tunes(), hb_h264_profiles(), hb_h264_levels()
- */
- // store x264 preset names
- const char * const * x264_presets = hb_x264_presets();
- NSMutableArray *tmp_array = [[NSMutableArray alloc] init];
- for (i = 0; x264_presets[i] != NULL; i++)
- {
- [tmp_array addObject:[NSString stringWithUTF8String:x264_presets[i]]];
- if (!strcasecmp(x264_presets[i], "medium"))
- {
- fX264MediumPresetIndex = i;
- }
- }
- fX264PresetNames = [[NSArray alloc] initWithArray:tmp_array];
- [tmp_array release];
- // setup the x264 preset slider
- [fX264PresetsSlider setMinValue:0];
- [fX264PresetsSlider setMaxValue:[fX264PresetNames count]-1];
- [fX264PresetsSlider setNumberOfTickMarks:[fX264PresetNames count]];
- [fX264PresetsSlider setIntegerValue:fX264MediumPresetIndex];
- [fX264PresetsSlider setTickMarkPosition:NSTickMarkAbove];
- [fX264PresetsSlider setAllowsTickMarkValuesOnly:YES];
- [self x264PresetsSliderChanged: sender];
- // setup the x264 tune popup
- [fX264TunePopUp removeAllItems];
- [fX264TunePopUp addItemWithTitle: @"none"];
- const char * const * x264_tunes = hb_x264_tunes();
- for (int i = 0; x264_tunes[i] != NULL; i++)
- {
- // we filter out "fastdecode" as we have a dedicated checkbox for it
- if (strcasecmp(x264_tunes[i], "fastdecode") != 0)
- {
- [fX264TunePopUp addItemWithTitle: [NSString stringWithUTF8String:x264_tunes[i]]];
- }
- }
- // the fastdecode checkbox is off by default
- [fX264FastDecodeCheck setState: NSOffState];
- // setup the h264 profile popup
- [fX264ProfilePopUp removeAllItems];
- const char * const * h264_profiles = hb_h264_profiles();
- for (int i = 0; h264_profiles[i] != NULL; i++)
- {
- [fX264ProfilePopUp addItemWithTitle: [NSString stringWithUTF8String:h264_profiles[i]]];
- }
- // setup the h264 level popup
- [fX264LevelPopUp removeAllItems];
- const char * const * h264_levels = hb_h264_levels();
- for (int i = 0; h264_levels[i] != NULL; i++)
- {
- [fX264LevelPopUp addItemWithTitle: [NSString stringWithUTF8String:h264_levels[i]]];
- }
- // clear the additional x264 options
- [fDisplayX264PresetsAdditonalOptionsTextField setStringValue:@""];
-}
-
-- (void) enableX264Widgets: (bool) enable
-{
- NSControl *controls[] =
- {
- fX264PresetsSlider, fX264PresetSliderLabel, fX264PresetSelectedTextField,
- fX264TunePopUp, fX264TunePopUpLabel, fX264FastDecodeCheck,
- fDisplayX264PresetsAdditonalOptionsTextField, fDisplayX264PresetsAdditonalOptionsLabel,
- fX264ProfilePopUp, fX264ProfilePopUpLabel,
- fX264LevelPopUp, fX264LevelPopUpLabel,
- fDisplayX264PresetsUnparseTextField,
- };
- 
- // check whether the x264 preset system and the advanced panel should be enabled
- BOOL enable_x264_controls = (enable && [fX264UseAdvancedOptionsCheck state] == NSOffState);
- BOOL enable_advanced_panel = (enable && [fX264UseAdvancedOptionsCheck state] == NSOnState);
- 
- // enable/disable the checkbox and advanced panel
- [fX264UseAdvancedOptionsCheck setEnabled:enable];
- [fAdvancedOptions enableUI:enable_advanced_panel];
- 
- // enable/disable the x264 preset system controls
- for (unsigned i = 0; i < (sizeof(controls) / sizeof(NSControl*)); i++)
- {
- if ([[controls[i] className] isEqualToString: @"NSTextField"])
- {
- NSTextField *tf = (NSTextField*)controls[i];
- if (![tf isBezeled])
- {
- [tf setTextColor:(enable_x264_controls ?
- [NSColor controlTextColor] :
- [NSColor disabledControlTextColor])];
- continue;
- }
- }
- [controls[i] setEnabled:enable_x264_controls];
- }
-}
-
-- (IBAction) updateX264Widgets: (id) sender
-{
- if ([fX264UseAdvancedOptionsCheck state] == NSOnState)
- {
- /*
- * we are using or switching to the advanced panel
- *
- * if triggered by selectPreset or applyQueueSettingToMainWindow,
- * the options string will have been specified explicitly - leave it.
- *
- * if triggered by the advanced panel on/off checkbox, set the options
- * string to the value of the unparsed x264 preset system string.
- */
- if (sender == fX264UseAdvancedOptionsCheck)
- {
- if (fX264PresetsUnparsedUTF8String != NULL)
- {
- [fAdvancedOptions setOptions:
- [NSString stringWithUTF8String:fX264PresetsUnparsedUTF8String]];
- }
- else
- {
- [fAdvancedOptions setOptions:@""];
- }
- }
- }
- // enable/disable, populate and update the various widgets
- [self enableX264Widgets: YES];
- [self x264PresetsSliderChanged:nil];
- [fAdvancedOptions X264AdvancedOptionsSet: nil];
-}
-
-#pragma mark -
-#pragma mark x264 preset system
-
-- (NSString*) x264Preset
-{
- return (NSString*)[fX264PresetNames objectAtIndex:[fX264PresetsSlider intValue]];
-}
-
-- (NSString*) x264Tune
-{
- NSString *x264Tune = @"";
- if ([fX264TunePopUp indexOfSelectedItem])
- {
- x264Tune = [x264Tune stringByAppendingString:
- [fX264TunePopUp titleOfSelectedItem]];
- }
- if ([fX264FastDecodeCheck state])
- {
- if ([x264Tune length])
- {
- x264Tune = [x264Tune stringByAppendingString: @","];
- }
- x264Tune = [x264Tune stringByAppendingString: @"fastdecode"];
- }
- return x264Tune;
-}
-
-- (NSString*) x264OptionExtra
-{
- return [fDisplayX264PresetsAdditonalOptionsTextField stringValue];
-}
-
-- (NSString*) h264Profile
-{
- if ([fX264ProfilePopUp indexOfSelectedItem])
- {
- return [fX264ProfilePopUp titleOfSelectedItem];
- }
- return @"";
-}
-
-- (NSString*) h264Level
-{
- if ([fX264LevelPopUp indexOfSelectedItem])
- {
- return [fX264LevelPopUp titleOfSelectedItem];
- }
- return @"";
-}
-
-- (void) setX264Preset: (NSString*)x264Preset
-{
- if (x264Preset)
- {
- NSString *name;
- NSEnumerator *enumerator = [fX264PresetNames objectEnumerator];
- while ((name = (NSString *)[enumerator nextObject]))
- {
- if ([name isEqualToString:x264Preset])
- {
- [fX264PresetsSlider setIntegerValue:
- [fX264PresetNames indexOfObject:name]];
- return;
- }
- }
- }
- [fX264PresetsSlider setIntegerValue:fX264MediumPresetIndex];
-}
-
-- (void) setX264Tune: (NSString*)x264Tune
-{
- if (!x264Tune)
- {
- [fX264TunePopUp selectItemAtIndex:0];
- [fX264FastDecodeCheck setState:NSOffState];
- return;
- }
- // handle fastdecode
- if ([x264Tune rangeOfString:@"fastdecode"].location != NSNotFound)
- {
- [fX264FastDecodeCheck setState:NSOnState];
- }
- else
- {
- [fX264FastDecodeCheck setState:NSOffState];
- }
- // filter out fastdecode
- x264Tune = [x264Tune stringByReplacingOccurrencesOfString:@","
- withString:@""];
- x264Tune = [x264Tune stringByReplacingOccurrencesOfString:@"fastdecode"
- withString:@""];
- // set the tune
- [fX264TunePopUp selectItemWithTitle:x264Tune];
- // fallback
- if ([fX264TunePopUp indexOfSelectedItem] == -1)
- {
- [fX264TunePopUp selectItemAtIndex:0];
- }
-}
-
-- (void) setX264OptionExtra: (NSString*)x264OptionExtra
-{
- if (!x264OptionExtra)
- {
- [fDisplayX264PresetsAdditonalOptionsTextField setStringValue:@""];
- return;
- }
- [fDisplayX264PresetsAdditonalOptionsTextField setStringValue:x264OptionExtra];
-}
-
-- (void) setH264Profile: (NSString*)h264Profile
-{
- if (!h264Profile)
- {
- [fX264ProfilePopUp selectItemAtIndex:0];
- return;
- }
- // set the profile
- [fX264ProfilePopUp selectItemWithTitle:h264Profile];
- // fallback
- if ([fX264ProfilePopUp indexOfSelectedItem] == -1)
- {
- [fX264ProfilePopUp selectItemAtIndex:0];
- }
-}
-
-- (void) setH264Level: (NSString*)h264Level
-{
- if (!h264Level)
- {
- [fX264LevelPopUp selectItemAtIndex:0];
- return;
- }
- // set the level
- [fX264LevelPopUp selectItemWithTitle:h264Level];
- // fallback
- if ([fX264LevelPopUp indexOfSelectedItem] == -1)
- {
- [fX264LevelPopUp selectItemAtIndex:0];
- }
-}
-
-
-- (IBAction) x264PresetsSliderChanged: (id) sender
-{ 
- // we assume the preset names and slider were setup properly
- [fX264PresetSelectedTextField setStringValue: [self x264Preset]];
- [self x264PresetsChangedDisplayExpandedOptions:nil];
- 
-}
-
-/* This is called everytime a x264 widget in the video tab is changed to 
- display the expanded options in a text field via outlet fDisplayX264PresetsUnparseTextField
- */
-- (IBAction) x264PresetsChangedDisplayExpandedOptions: (id) sender
-
-{
- /* API reference:
- *
- * char * hb_x264_param_unparse(const char *x264_preset,
- * const char *x264_tune,
- * const char *x264_encopts,
- * const char *h264_profile,
- * const char *h264_level,
- * int width, int height);
- */
- NSString *tmpString;
- const char *x264_preset = [[self x264Preset] UTF8String];
- const char *x264_tune = NULL;
- const char *advanced_opts = NULL;
- const char *h264_profile = NULL;
- const char *h264_level = NULL;
- int width = 1;
- int height = 1;
- // prepare the tune, advanced options, profile and level
- if ([(tmpString = [self x264Tune]) length])
- {
- x264_tune = [tmpString UTF8String];
- }
- if ([(tmpString = [self x264OptionExtra]) length])
- {
- advanced_opts = [tmpString UTF8String];
- }
- if ([(tmpString = [self h264Profile]) length])
- {
- h264_profile = [tmpString UTF8String];
- }
- if ([(tmpString = [self h264Level]) length])
- {
- h264_level = [tmpString UTF8String];
- }
- // width and height must be non-zero
- if (fX264PresetsWidthForUnparse && fX264PresetsHeightForUnparse)
- {
- width = fX264PresetsWidthForUnparse;
- height = fX264PresetsHeightForUnparse;
- }
- // free the previous unparsed string
- free(fX264PresetsUnparsedUTF8String);
- // now, unparse
- fX264PresetsUnparsedUTF8String = hb_x264_param_unparse(x264_preset,
- x264_tune,
- advanced_opts,
- h264_profile,
- h264_level,
- width, height);
- // update the text field
- if (fX264PresetsUnparsedUTF8String != NULL)
- {
- [fDisplayX264PresetsUnparseTextField setStringValue:
- [NSString stringWithFormat:@"x264 Unparse: %s",
- fX264PresetsUnparsedUTF8String]];
- }
- else
- {
- [fDisplayX264PresetsUnparseTextField setStringValue:@"x264 Unparse:"];
- }
+ /* If Auto Naming is on it might need to be update if it includes the quality token */
+ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultAutoNaming"])
+	{
+ [self updateFileName];
+	}
 }
 
 #pragma mark -
 #pragma mark - Picture
 
-/* lets set the picture size back to the max from right after title scan
- Lets use an IBAction here as down the road we could always use a checkbox
- in the gui to easily take the user back to max. Remember, the compiler
- resolves IBActions down to -(void) during compile anyway */
-- (IBAction) revertPictureSizeToMax: (id) sender
-{
-	hb_job_t * job = fTitle->job;
-	/* Here we apply the title source and height */
- job->width = fTitle->width;
- job->height = fTitle->height;
- 
- [self calculatePictureSizing: sender];
- /* We call method to change UI to reflect whether a preset is used or not*/ 
- [self customSettingUsed: sender];
-}
-
 /**
 * Registers changes made in the Picture Settings Window.
 */
 
 - (void)pictureSettingsDidChange 
 {
-	[self calculatePictureSizing:nil];
-}
+ // align picture settings and video filters in the UI using tabs
+ fVideoController.pictureSettingsField = [self pictureSettingsSummary];
+ fVideoController.pictureFiltersField = fPictureController.filters.summary;
 
-/* Get and Display Current Pic Settings in main window */
-- (IBAction) calculatePictureSizing: (id) sender
-{
- if (fTitle->job->anamorphic.mode > 0)
+ /* Store storage resolution for unparse */
+ if (fTitle)
 {
- fTitle->job->keep_ratio = 0;
+ fVideoController.fPresetsWidthForUnparse = fTitle->job->width;
+ fVideoController.fPresetsHeightForUnparse = fTitle->job->height;
+ // width or height may have changed, unparse
+ [fVideoController x264PresetsChangedDisplayExpandedOptions:nil];
 }
- 
- // align picture settings and video filters in the UI using tabs
- [fPictureSettingsField setStringValue:[NSString stringWithFormat:@"Picture Settings: \t %@",
- [self pictureSettingsSummary]]];
- [fPictureFiltersField setStringValue:[NSString stringWithFormat:@"Picture Filters: \t\t %@",
- [self pictureFiltersSummary]]];
- 
- /* Store storage resolution for unparse */
- fX264PresetsWidthForUnparse = fTitle->job->width;
- fX264PresetsHeightForUnparse = fTitle->job->height;
- // width or height may have changed, unparse
- [self x264PresetsChangedDisplayExpandedOptions:nil];
- 
- // reload still previews
- // note: fTitle->job->deinterlace is set by fPictureController now
- [fPictureController decombDeinterlacePreviewImage];
 }
 
 #pragma mark -
@@ -5755,8 +4597,8 @@
 NSMutableString *summary = [NSMutableString stringWithString:@""];
 if (fPictureController && fTitle && fTitle->job)
 {
- [summary appendString:[fPictureController getPictureSizeInfoString]];
- if (fTitle->job->anamorphic.mode != 1)
+ [summary appendString:[fPictureController pictureSizeInfoString]];
+ if (fTitle->job->anamorphic.mode != HB_ANAMORPHIC_STRICT)
 {
 // anamorphic is not Strict, show the modulus
 [summary appendFormat:@", Modulus: %d", fTitle->job->modulus];
@@ -5769,146 +4611,20 @@
 return [NSString stringWithString:summary];
 }
 
-- (NSString*) pictureFiltersSummary
+- (NSString*) muxerOptionsSummary
 {
 NSMutableString *summary = [NSMutableString stringWithString:@""];
- if (fPictureController)
+ if ([fDstMp4HttpOptFileCheck isHidden] == NO &&
+ [fDstMp4HttpOptFileCheck isEnabled] == YES &&
+ [fDstMp4HttpOptFileCheck state] == NSOnState)
 {
- /* Detelecine */
- switch ([fPictureController detelecine])
- {
- case 1:
- [summary appendFormat:@" - Detelecine (%@)",
- [fPictureController detelecineCustomString]];
- break;
- 
- case 2:
- [summary appendString:@" - Detelecine (Default)"];
- break;
- 
- default:
- break;
- }
- 
- if ([fPictureController useDecomb] == 1)
- {
- /* Decomb */
- switch ([fPictureController decomb])
- {
- case 1:
- [summary appendFormat:@" - Decomb (%@)",
- [fPictureController decombCustomString]];
- break;
- 
- case 2:
- [summary appendString:@" - Decomb (Default)"];
- break;
- 
- case 3:
- [summary appendString:@" - Decomb (Fast)"];
- break;
- 
- case 4:
- [summary appendString:@" - Decomb (Bob)"];
- break;
- 
- default:
- break;
- }
- }
- else
- {
- /* Deinterlace */
- switch ([fPictureController deinterlace])
- {
- case 1:
- [summary appendFormat:@" - Deinterlace (%@)",
- [fPictureController deinterlaceCustomString]];
- break;
- 
- case 2:
- [summary appendString:@" - Deinterlace (Fast)"];
- break;
- 
- case 3:
- [summary appendString:@" - Deinterlace (Slow)"];
- break;
- 
- case 4:
- [summary appendString:@" - Deinterlace (Slower)"];
- break;
- 
- case 5:
- [summary appendString:@" - Deinterlace (Bob)"];
- break;
- 
- default:
- break;
- }
- }
- 
- /* Deblock */
- if ([fPictureController deblock] > 0)
- {
- [summary appendFormat:@" - Deblock (%d)",
- [fPictureController deblock]];
- }
- 
- /* Denoise */
- switch ([fPictureController denoise])
- {
- case 1:
- [summary appendFormat:@" - Denoise (%@)",
- [fPictureController denoiseCustomString]];
- break;
- 
- case 2:
- [summary appendString:@" - Denoise (Weak)"];
- break;
- 
- case 3:
- [summary appendString:@" - Denoise (Medium)"];
- break;
- 
- case 4:
- [summary appendString:@" - Denoise (Strong)"];
- break;
- 
- default:
- break;
- }
- 
- /* Grayscale */
- if ([fPictureController grayscale]) 
- {
- [summary appendString:@" - Grayscale"];
- }
+ [summary appendString:@" - Web optimized"];
 }
- if ([summary hasPrefix:@" - "])
- {
- [summary deleteCharactersInRange:NSMakeRange(0, 3)];
- }
- return [NSString stringWithString:summary];
-}
-
-- (NSString*) muxerOptionsSummary
-{
- NSMutableString *summary = [NSMutableString stringWithString:@""];
- if (([fDstFormatPopUp selectedItem]) &&
- [[fDstFormatPopUp selectedItem] tag] == HB_MUX_MP4)
+ if ([fDstMp4iPodFileCheck isHidden] == NO &&
+ [fDstMp4iPodFileCheck isEnabled] == YES &&
+ [fDstMp4iPodFileCheck state] == NSOnState)
 {
- if ([fDstMp4LargeFileCheck state])
- {
- [summary appendString:@" - Large file size"];
- }
- if ([fDstMp4HttpOptFileCheck state])
- {
- [summary appendString:@" - Web optimized"];
- }
- if ([fDstMp4iPodFileCheck state])
- {
- [summary appendString:@" - iPod 5G support"];
- }
+ [summary appendString:@" - iPod 5G support"];
 }
 if ([summary hasPrefix:@" - "])
 {
@@ -5918,62 +4634,6 @@
 }
 
 #pragma mark -
-#pragma mark - Audio and Subtitles
-
-
-//	This causes all audio tracks from the title to be used based on the current preset
-- (IBAction) addAllAudioTracks: (id) sender
-
-{
- [fAudioDelegate	addAllTracksFromPreset:[self selectedPreset]];
- return;
-}
-
-- (IBAction) browseImportSrtFile: (id) sender
-{
-
- NSOpenPanel * panel;
-	
- panel = [NSOpenPanel openPanel];
- [panel setAllowsMultipleSelection: NO];
- [panel setCanChooseFiles: YES];
- [panel setCanChooseDirectories: NO ];
- NSString * sourceDirectory;
-	if ([[NSUserDefaults standardUserDefaults] stringForKey:@"LastSrtImportDirectory"])
-	{
-		sourceDirectory = [[NSUserDefaults standardUserDefaults] stringForKey:@"LastSrtImportDirectory"];
-	}
-	else
-	{
-		sourceDirectory = @"~/Desktop";
-		sourceDirectory = [sourceDirectory stringByExpandingTildeInPath];
-	}
- /* we open up the browse srt sheet here and call for browseImportSrtFileDone after the sheet is closed */
- NSArray *fileTypes = [NSArray arrayWithObjects:@"plist", @"srt", nil];
- [panel beginSheetForDirectory: sourceDirectory file: nil types: fileTypes
- modalForWindow: fWindow modalDelegate: self
- didEndSelector: @selector( browseImportSrtFileDone:returnCode:contextInfo: )
- contextInfo: sender];
-}
-
-- (void) browseImportSrtFileDone: (NSSavePanel *) sheet
- returnCode: (int) returnCode contextInfo: (void *) contextInfo
-{
- if( returnCode == NSOKButton )
- {
- NSString *importSrtDirectory = [[sheet filename] stringByDeletingLastPathComponent];
- NSString *importSrtFilePath = [sheet filename];
- [[NSUserDefaults standardUserDefaults] setObject:importSrtDirectory forKey:@"LastSrtImportDirectory"];
- 
- /* now pass the string off to fSubtitlesDelegate to add the srt file to the dropdown */
- [fSubtitlesDelegate createSubtitleSrtTrack:importSrtFilePath];
- 
- [fSubtitlesTable reloadData];
- 
- }
-} 
-
-#pragma mark -
 #pragma mark Open New Windows
 
 - (IBAction) openHomepage: (id) sender
@@ -6006,7 +4666,12 @@
 */
 - (IBAction) showPreferencesWindow: (id) sender
 {
- NSWindow * window = [fPreferencesController window];
+ if (fPreferencesController == nil)
+ {
+ fPreferencesController = [[HBPreferencesController alloc] init];
+ }
+
+ NSWindow *window = [fPreferencesController window];
 if (![window isVisible])
 [window center];
 
@@ -6024,6 +4689,15 @@
 
 - (IBAction) toggleDrawer:(id)sender
 {
+ if ([fPresetDrawer state] == NSDrawerClosedState)
+ {
+ [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"HBDefaultPresetsDrawerShow"];
+ }
+ else
+ {
+ [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"HBDefaultPresetsDrawerShow"];
+ }
+
 [fPresetDrawer toggle:self];
 }
 
@@ -6036,367 +4710,23 @@
 	[fPictureController showPictureWindow:sender];
 }
 
-- (void) picturePanelWindowed
-{
-	[fPictureController setToWindowedMode];
-}
-
 - (IBAction) showPreviewWindow: (id) sender
 {
 	[fPictureController showPreviewWindow:sender];
 }
 
-#pragma mark -
-#pragma mark Preset Outline View Methods
-#pragma mark - Required
-/* These are required by the NSOutlineView Datasource Delegate */
-
-
-/* used to specify the number of levels to show for each item */
-- (int)outlineView:(NSOutlineView *)fPresetsOutlineView numberOfChildrenOfItem:(id)item
-{
- /* currently use no levels to test outline view viability */
- if (item == nil) // for an outline view the root level of the hierarchy is always nil
- {
- return [UserPresets count];
- }
- else
- {
- /* we need to return the count of the array in ChildrenArray for this folder */
- NSArray *children = nil;
- children = [item objectForKey:@"ChildrenArray"];
- if ([children count] > 0)
- {
- return [children count];
- }
- else
- {
- return 0;
- }
- }
-}
-
-/* We use this to deterimine children of an item */
-- (id)outlineView:(NSOutlineView *)fPresetsOutlineView child:(NSInteger)index ofItem:(id)item
-{
- 
- /* we need to return the count of the array in ChildrenArray for this folder */
- NSArray *children = nil;
- if (item == nil)
- {
- children = UserPresets;
- }
- else
- {
- if ([item objectForKey:@"ChildrenArray"])
- {
- children = [item objectForKey:@"ChildrenArray"];
- }
- } 
- if ((children == nil) || ( [children count] <= (NSUInteger) index))
- {
- return nil;
- }
- else
- {
- return [children objectAtIndex:index];
- }
- 
- 
- // We are only one level deep, so we can't be asked about children
- //NSAssert (NO, @"Presets View outlineView:child:ofItem: currently can't handle nested items.");
- //return nil;
-}
+#pragma mark - Preset Methods
 
-/* We use this to determine if an item should be expandable */
-- (BOOL)outlineView:(NSOutlineView *)fPresetsOutlineView isItemExpandable:(id)item
+- (void)applyPreset:(HBPreset *)preset
 {
- 
- /* we need to return the count of the array in ChildrenArray for this folder */
- NSArray *children= nil;
- if (item == nil)
- {
- children = UserPresets;
- }
- else
- {
- if ([item objectForKey:@"ChildrenArray"])
- {
- children = [item objectForKey:@"ChildrenArray"];
- }
- } 
- 
- /* To deterimine if an item should show a disclosure triangle
- * we could do it by the children count as so:
- * if ([children count] < 1)
- * However, lets leave the triangle show even if there are no
- * children to help indicate a folder, just like folder in the
- * finder can show a disclosure triangle even when empty
- */
- 
- /* We need to determine if the item is a folder */
- if ([[item objectForKey:@"Folder"] intValue] == 1)
- {
- return YES;
- }
- else
- {
- return NO;
- }
- 
-}
-
-- (BOOL)outlineView:(NSOutlineView *)outlineView shouldExpandItem:(id)item
-{
- // Our outline view has no levels, but we can still expand every item. Doing so
- // just makes the row taller. See heightOfRowByItem below.
-//return ![(HBQueueOutlineView*)outlineView isDragging];
+ self.selectedPreset = preset;
+ self.customPreset = NO;
 
-return YES;
-}
-
-
-/* Used to tell the outline view which information is to be displayed per item */
-- (id)outlineView:(NSOutlineView *)fPresetsOutlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
-{
-	/* We have two columns right now, icon and PresetName */
-	
- if ([[tableColumn identifier] isEqualToString:@"PresetName"])
- {
- return [item objectForKey:@"PresetName"];
- }
- else
+ if (preset != nil && SuccessfulScan)
 {
- //return @"";
- return nil;
- }
-}
-
-- (id)outlineView:(NSOutlineView *)outlineView itemForPersistentObject:(id)object
-{
- return [NSKeyedUnarchiver unarchiveObjectWithData:object];
-}
-- (id)outlineView:(NSOutlineView *)outlineView persistentObjectForItem:(id)item
-{
- return [NSKeyedArchiver archivedDataWithRootObject:item];
-}
-
-#pragma mark - Added Functionality (optional)
-/* Use to customize the font and display characteristics of the title cell */
-- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
-{
- if ([[tableColumn identifier] isEqualToString:@"PresetName"])
- {
- NSFont *txtFont;
- NSColor *fontColor;
- NSColor *shadowColor;
- txtFont = [NSFont systemFontOfSize: [NSFont smallSystemFontSize]];
- /*check to see if its a selected row */
- if ([fPresetsOutlineView selectedRow] == [fPresetsOutlineView rowForItem:item])
- {
- 
- fontColor = [NSColor blackColor];
- shadowColor = [NSColor colorWithDeviceRed:(127.0/255.0) green:(140.0/255.0) blue:(160.0/255.0) alpha:1.0];
- }
- else
- {
- if ([[item objectForKey:@"Type"] intValue] == 0)
- {
- fontColor = [NSColor blueColor];
- }
- else // User created preset, use a black font
- {
- fontColor = [NSColor blackColor];
- }
- /* check to see if its a folder */
- //if ([[item objectForKey:@"Folder"] intValue] == 1)
- //{
- //fontColor = [NSColor greenColor];
- //}
- 
- 
- }
- /* We use bold text for the default preset */
- if (presetUserDefault == nil && // no User default found
- [[item objectForKey:@"Default"] intValue] == 1)// 1 is HB default
- {
- txtFont = [NSFont boldSystemFontOfSize: [NSFont smallSystemFontSize]];
- }
- if ([[item objectForKey:@"Default"] intValue] == 2)// 2 is User default
- {
- txtFont = [NSFont boldSystemFontOfSize: [NSFont smallSystemFontSize]];
- }
- 
- 
- [cell setTextColor:fontColor];
- [cell setFont:txtFont];
- 
- }
-}
-
-/* We use this to edit the name field in the outline view */
-- (void)outlineView:(NSOutlineView *)outlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
-{
- if ([[tableColumn identifier] isEqualToString:@"PresetName"])
- {
- id theRecord;
- 
- theRecord = item;
- [theRecord setObject:object forKey:@"PresetName"];
- 
- [self sortPresets];
- 
- [fPresetsOutlineView reloadData];
- /* We save all of the preset data here */
- [self savePreset];
- }
-}
-/* We use this to provide tooltips for the items in the presets outline view */
-- (NSString *)outlineView:(NSOutlineView *)fPresetsOutlineView toolTipForCell:(NSCell *)cell rect:(NSRectPointer)rect tableColumn:(NSTableColumn *)tc item:(id)item mouseLocation:(NSPoint)mouseLocation
-{
- //if ([[tc identifier] isEqualToString:@"PresetName"])
- //{
- /* initialize the tooltip contents variable */
- NSString *loc_tip;
- /* if there is a description for the preset, we show it in the tooltip */
- if ([item objectForKey:@"PresetDescription"])
- {
- loc_tip = [item objectForKey:@"PresetDescription"];
- return (loc_tip);
- }
- else
- {
- loc_tip = @"No description available";
- }
- return (loc_tip);
- //}
-}
-
-- (void) outlineViewSelectionDidChange: (NSNotification *) ignored
-
-{
-	[self willChangeValueForKey: @"hasValidPresetSelected"];
-	[self didChangeValueForKey: @"hasValidPresetSelected"];
-	return;
-}
-
-#pragma mark -
-#pragma mark Preset Outline View Methods (dragging related)
-
-
-- (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard
-{
-	// Dragging is only allowed for custom presets.
- //[[[self selectedPreset] objectForKey:@"Default"] intValue] != 1
- if ([[[self selectedPreset] objectForKey:@"Type"] intValue] == 0) // 0 is built in preset
- {
- return NO;
- }
- // Don't retain since this is just holding temporaral drag information, and it is
- //only used during a drag! We could put this in the pboard actually.
- fDraggedNodes = items;
- // Provide data for our custom type, and simple NSStrings.
- [pboard declareTypes:[NSArray arrayWithObjects: DragDropSimplePboardType, nil] owner:self];
- 
- // the actual data doesn't matter since DragDropSimplePboardType drags aren't recognized by anyone but us!.
- [pboard setData:[NSData data] forType:DragDropSimplePboardType]; 
- 
- return YES;
-}
-
-- (NSDragOperation)outlineView:(NSOutlineView *)outlineView validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(NSInteger)index
-{
-	
-	// Don't allow dropping ONTO an item since they can't really contain any children.
- 
- BOOL isOnDropTypeProposal = index == NSOutlineViewDropOnItemIndex;
- if (isOnDropTypeProposal)
- return NSDragOperationNone;
- 
- // Don't allow dropping INTO an item since they can't really contain any children as of yet.
-	if (item != nil)
-	{
-		index = [fPresetsOutlineView rowForItem: item] + 1;
-		item = nil;
-	}
- 
- // Don't allow dropping into the Built In Presets.
- if (index < presetCurrentBuiltInCount)
- {
- return NSDragOperationNone;
- index = MAX (index, presetCurrentBuiltInCount);
-	} 
-	
- [outlineView setDropItem:item dropChildIndex:index];
- return NSDragOperationGeneric;
-}
-
-
-
-- (BOOL)outlineView:(NSOutlineView *)outlineView acceptDrop:(id <NSDraggingInfo>)info item:(id)item childIndex:(NSInteger)index
-{
- /* first, lets see if we are dropping into a folder */
- if ([[fPresetsOutlineView itemAtRow:index] objectForKey:@"Folder"] && [[[fPresetsOutlineView itemAtRow:index] objectForKey:@"Folder"] intValue] == 1) // if its a folder
-	{
- NSMutableArray *childrenArray = [[NSMutableArray alloc] init];
- childrenArray = [[fPresetsOutlineView itemAtRow:index] objectForKey:@"ChildrenArray"];
- [childrenArray addObject:item];
- [[fPresetsOutlineView itemAtRow:index] setObject:[NSMutableArray arrayWithArray: childrenArray] forKey:@"ChildrenArray"];
- [childrenArray autorelease];
- }
- else // We are not, so we just move the preset into the existing array 
- {
- NSMutableIndexSet *moveItems = [NSMutableIndexSet indexSet];
- id obj;
- NSEnumerator *enumerator = [fDraggedNodes objectEnumerator];
- while (obj = [enumerator nextObject])
- {
- [moveItems addIndex:[UserPresets indexOfObject:obj]];
- }
- // Successful drop, lets rearrange the view and save it all
- [self moveObjectsInPresetsArray:UserPresets fromIndexes:moveItems toIndex: index];
- }
- [fPresetsOutlineView reloadData];
- [self savePreset];
- return YES;
-}
-
-- (void)moveObjectsInPresetsArray:(NSMutableArray *)array fromIndexes:(NSIndexSet *)indexSet toIndex:(NSUInteger)insertIndex
-{
- NSUInteger index = [indexSet lastIndex];
- NSUInteger aboveInsertIndexCount = 0;
- 
- NSUInteger removeIndex;
-
- if (index >= insertIndex)
- {
- removeIndex = index + aboveInsertIndexCount;
- aboveInsertIndexCount++;
- }
- else
- {
- removeIndex = index;
- insertIndex--;
- }
-
- id object = [[array objectAtIndex:removeIndex] retain];
- [array removeObjectAtIndex:removeIndex];
- [array insertObject:object atIndex:insertIndex];
- [object release];
-
- index = [indexSet indexLessThanIndex:index];
-}
-
-
-
-#pragma mark - Functional Preset NSOutlineView Methods
-
-- (IBAction)selectPreset:(id)sender
-{
+ hb_job_t * job = fTitle->job;
+ NSDictionary *chosenPreset = preset.content;
 
- if (YES == [self hasValidPresetSelected])
- {
- chosenPreset = [self selectedPreset];
 [fPresetSelectedDisplay setStringValue:[chosenPreset objectForKey:@"PresetName"]];
 
 if ([[chosenPreset objectForKey:@"Default"] intValue] == 1)
@@ -6407,227 +4737,48 @@
 {
 [fPresetSelectedDisplay setStringValue:[chosenPreset objectForKey:@"PresetName"]];
 }
- 
+
 /* File Format */
- [fDstFormatPopUp selectItemWithTitle:[chosenPreset objectForKey:@"FileFormat"]];
+ /* map legacy container names via libhb */
+ int format = hb_container_get_from_name(hb_container_sanitize_name([chosenPreset[@"FileFormat"] UTF8String]));
+ [fDstFormatPopUp selectItemWithTag:format];
 [self formatPopUpChanged:nil];
- 
+
 /* Chapter Markers*/
- [fCreateChapterMarkers setState:[[chosenPreset objectForKey:@"ChapterMarkers"] intValue]];
+ fChapterTitlesController.createChapterMarkers = [[chosenPreset objectForKey:@"ChapterMarkers"] boolValue];
 /* check to see if we have only one chapter */
 [self chapterPopUpChanged:nil];
 
- /* Allow Mpeg4 64 bit formatting +4GB file sizes */
- [fDstMp4LargeFileCheck setState:[[chosenPreset objectForKey:@"Mp4LargeFile"] intValue]];
 /* Mux mp4 with http optimization */
 [fDstMp4HttpOptFileCheck setState:[[chosenPreset objectForKey:@"Mp4HttpOptimize"] intValue]];
 
 /* Video encoder */
- [fVidEncoderPopUp selectItemWithTitle:[chosenPreset objectForKey:@"VideoEncoder"]];
- [self videoEncoderPopUpChanged:nil];
- 
- if ([[chosenPreset objectForKey:@"VideoEncoder"] isEqualToString:@"H.264 (x264)"])
- {
- if (![chosenPreset objectForKey:@"x264UseAdvancedOptions"] ||
- [[chosenPreset objectForKey:@"x264UseAdvancedOptions"] intValue])
- {
- /*
- * x264UseAdvancedOptions is not set (legacy preset)
- * or set to 1 (enabled), so we use the old advanced panel
- */
- if ([chosenPreset objectForKey:@"x264Option"])
- {
- /* we set the advanced options string here if applicable */
- [fAdvancedOptions setOptions: [chosenPreset objectForKey:@"x264Option"]];
- [self setX264OptionExtra:[chosenPreset objectForKey:@"x264Option"]];
- }
- else
- {
- [fAdvancedOptions setOptions: @""];
- [self setX264OptionExtra:nil];
- }
- /* preset does not use the x264 preset system, reset the widgets */
- [self setX264Preset: nil];
- [self setX264Tune: nil];
- [self setH264Profile:nil];
- [self setH264Level: nil];
- /* we enable the advanced panel and update the widgets */
- [fX264UseAdvancedOptionsCheck setState:NSOnState];
- [self updateX264Widgets:nil];
- }
- else
- {
- /*
- * x264UseAdvancedOptions is set to 0 (disabled),
- * so we use the x264 preset system
- */
- [self setX264Preset: [chosenPreset objectForKey:@"x264Preset"]];
- [self setX264Tune: [chosenPreset objectForKey:@"x264Tune"]];
- [self setX264OptionExtra:[chosenPreset objectForKey:@"x264OptionExtra"]];
- [self setH264Profile: [chosenPreset objectForKey:@"h264Profile"]];
- [self setH264Level: [chosenPreset objectForKey:@"h264Level"]];
- /* preset does not use the advanced panel, reset it */
- [fAdvancedOptions setOptions:@""];
- /* we disable the advanced panel and update the widgets */
- [fX264UseAdvancedOptionsCheck setState:NSOffState];
- [self updateX264Widgets:nil];
- }
- }
- 
- if ([chosenPreset objectForKey:@"lavcOption"])
- {
- [fAdvancedOptions setLavcOptions:[chosenPreset objectForKey:@"lavcOption"]];
- }
- else
- {
- [fAdvancedOptions setLavcOptions:@""]; 
- }
- 
+ [fVideoController applySettingsFromPreset:chosenPreset];
+
 /* Lets run through the following functions to get variables set there */
- //[self videoEncoderPopUpChanged:nil];
 /* Set the state of ipod compatible with Mp4iPodCompatible. Only for x264*/
 [fDstMp4iPodFileCheck setState:[[chosenPreset objectForKey:@"Mp4iPodCompatible"] intValue]];
- [self calculateBitrate:nil];
- 
- /* Video quality */
- 
- int qualityType = [[chosenPreset objectForKey:@"VideoQualityType"] intValue] - 1;
- /* Note since the removal of Target Size encoding, the possible values for VideoQuality type are 0 - 1.
- * Therefore any preset that uses the old 2 for Constant Quality would now use 1 since there is one less index
- * for the fVidQualityMatrix. It should also be noted that any preset that used the deprecated Target Size
- * setting of 0 would set us to 0 or ABR since ABR is now tagged 0. Fortunately this does not affect any built-in
- * presets since they all use Constant Quality or Average Bitrate.*/
- if (qualityType == -1)
- {
- qualityType = 0;
- }
- [fVidQualityMatrix selectCellWithTag:qualityType];
 
- [fVidBitrateField setStringValue:[chosenPreset objectForKey:@"VideoAvgBitrate"]];
- 
- if ([[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_THEORA)
- {
- /* Since theora's qp value goes up from left to right, we can just set the slider float value */
- [fVidQualitySlider setFloatValue:[[chosenPreset objectForKey:@"VideoQualitySlider"] floatValue]];
- }
- else
- {
- /* Since ffmpeg and x264 use an "inverted" slider (lower qp/rf values indicate a higher quality) we invert the value on the slider */
- [fVidQualitySlider setFloatValue:([fVidQualitySlider maxValue] + [fVidQualitySlider minValue]) - [[chosenPreset objectForKey:@"VideoQualitySlider"] floatValue]];
- }
- 
- [self videoMatrixChanged:nil];
- 
- /* Video framerate */
- if ([[chosenPreset objectForKey:@"VideoFramerate"] isEqualToString:@"Same as source"])
- {
- /* Now set the Video Frame Rate Mode to either vfr or cfr according to the preset */
- if (![chosenPreset objectForKey:@"VideoFramerateMode"] ||
- [[chosenPreset objectForKey:@"VideoFramerateMode"] isEqualToString:@"vfr"])
- {
- [fFramerateMatrix selectCellAtRow:0 column:0]; // we want vfr
- }
- else
- {
- [fFramerateMatrix selectCellAtRow:1 column:0]; // we want cfr
- }
- }
- else
- {
- /* Now set the Video Frame Rate Mode to either pfr or cfr according to the preset */
- if ([[chosenPreset objectForKey:@"VideoFramerateMode"] isEqualToString:@"pfr"] ||
- [[chosenPreset objectForKey:@"VideoFrameratePFR"] intValue] == 1)
- {
- [fFramerateMatrix selectCellAtRow:0 column:0]; // we want pfr
- }
- else
- {
- [fFramerateMatrix selectCellAtRow:1 column:0]; // we want cfr
- }
- }
- [fVidRatePopUp selectItemWithTitle:[chosenPreset objectForKey:@"VideoFramerate"]];
- [self videoFrameRateChanged:nil];
- 
- /* 2 Pass Encoding */
- [fVidTwoPassCheck setState:[[chosenPreset objectForKey:@"VideoTwoPass"] intValue]];
- [self twoPassCheckboxChanged:nil];
- 
- /* Turbo 1st pass for 2 Pass Encoding */
- [fVidTurboPassCheck setState:[[chosenPreset objectForKey:@"VideoTurboTwoPass"] intValue]];
- 
- /* Auto Passthru: if the preset has Auto Passthru fields, use them.
- * Otherwise assume every passthru is allowed and the fallback is AC3 */
- id tempObject;
- if ((tempObject = [chosenPreset objectForKey:@"AudioAllowAACPass"]) != nil)
- {
- [fAudioAllowAACPassCheck setState:[tempObject intValue]];
- }
- else
- {
- [fAudioAllowAACPassCheck setState:NSOnState];
- }
- if ((tempObject = [chosenPreset objectForKey:@"AudioAllowAC3Pass"]) != nil)
- {
- [fAudioAllowAC3PassCheck setState:[tempObject intValue]];
- }
- else
- {
- [fAudioAllowAC3PassCheck setState:NSOnState];
- }
- if ((tempObject = [chosenPreset objectForKey:@"AudioAllowDTSHDPass"]) != nil)
- {
- [fAudioAllowDTSHDPassCheck setState:[tempObject intValue]];
- }
- else
- {
- [fAudioAllowDTSHDPassCheck setState:NSOnState];
- }
- if ((tempObject = [chosenPreset objectForKey:@"AudioAllowDTSPass"]) != nil)
- {
- [fAudioAllowDTSPassCheck setState:[tempObject intValue]];
- }
- else
- {
- [fAudioAllowDTSPassCheck setState:NSOnState];
- }
- if ((tempObject = [chosenPreset objectForKey:@"AudioAllowMP3Pass"]) != nil)
- {
- [fAudioAllowMP3PassCheck setState:[tempObject intValue]];
- }
- else
- {
- [fAudioAllowMP3PassCheck setState:NSOnState];
- }
- if ((tempObject = [chosenPreset objectForKey:@"AudioEncoderFallback"]) != nil)
- {
- [fAudioFallbackPopUp selectItemWithTitle:tempObject];
- }
- else
- {
- [fAudioFallbackPopUp selectItemWithTitle:@"AC3 (ffmpeg)"];
- }
- 
 /* Audio */
- [fAudioDelegate addTracksFromPreset: chosenPreset];
+ [fAudioController applySettingsFromPreset: chosenPreset];
 
 /*Subtitles*/
- [fSubPopUp selectItemWithTitle:[chosenPreset objectForKey:@"Subtitles"]];
- /* Forced Subtitles */
- [fSubForcedCheck setState:[[chosenPreset objectForKey:@"SubtitlesForced"] intValue]];
- 
+ [fSubtitlesViewController applySettingsFromPreset:chosenPreset];
+
 /* Picture Settings */
 /* Note: objectForKey:@"UsesPictureSettings" refers to picture size, which encompasses:
 * height, width, keep ar, anamorphic and crop settings.
 * picture filters are handled separately below.
 */
+ int maxWidth = fTitle->width - job->crop[2] - job->crop[3];
+ int maxHeight = fTitle->height - job->crop[0] - job->crop[1];
+ job->maxWidth = job->maxHeight = 0;
 /* Check to see if the objectForKey:@"UsesPictureSettings is greater than 0, as 0 means use picture sizing "None" 
 * ( 2 is use max for source and 1 is use exact size when the preset was created ) and the 
 * preset completely ignores any picture sizing values in the preset.
 */
 if ([[chosenPreset objectForKey:@"UsesPictureSettings"] intValue] > 0)
 {
- hb_job_t * job = fTitle->job;
- 
 /* If Cropping is set to custom, then recall all four crop values from
 when the preset was created and apply them */
 if ([[chosenPreset objectForKey:@"PictureAutoCrop"] intValue] == 0)
@@ -6652,6 +4803,10 @@
 
 }
 
+ /* crop may have changed, reset maxWidth/maxHeight */
+ maxWidth = fTitle->width - job->crop[2] - job->crop[3];
+ maxHeight = fTitle->height - job->crop[0] - job->crop[1];
+
 /* Set modulus */
 if ([chosenPreset objectForKey:@"PictureModulus"])
 {
@@ -6661,29 +4816,22 @@
 {
 job->modulus = 16;
 }
- 
+
+ /*
+ * Assume max picture settings initially
+ */
+ job->anamorphic.mode = [[chosenPreset objectForKey:@"PicturePAR"] intValue];
+ job->width = fTitle->width - job->crop[2] - job->crop[3];
+ job->height = fTitle->height - job->crop[0] - job->crop[1];
+ job->anamorphic.keep_display_aspect = [[chosenPreset objectForKey:@"PictureKeepRatio"] intValue];
+
 /* Check to see if the objectForKey:@"UsesPictureSettings" is 2,
- * which means "Use max. picture size for the source" */
- if ([[chosenPreset objectForKey:@"UsesPictureSettings"] intValue] == 2 ||
- [[chosenPreset objectForKey:@"UsesMaxPictureSettings"] intValue] == 1)
- {
- /* Use Max Picture settings for whatever the dvd is.*/
- [self revertPictureSizeToMax:nil];
- job->keep_ratio = [[chosenPreset objectForKey:@"PictureKeepRatio"] intValue];
- if (job->keep_ratio == 1)
- {
- hb_fix_aspect( job, HB_KEEP_WIDTH );
- if( job->height > fTitle->height )
- {
- job->height = fTitle->height;
- hb_fix_aspect( job, HB_KEEP_HEIGHT );
- }
- }
- job->anamorphic.mode = [[chosenPreset objectForKey:@"PicturePAR"] intValue];
- }
- /* If not 0 or 2 we assume objectForKey:@"UsesPictureSettings" is 1,
- * which means "Use the picture size specified in the preset" */
- else
+ * which means "Use max. picture size for source"
+ * If not 2 it must be 1 here which means "Use the picture
+ * size specified in the preset"
+ */
+ if ([[chosenPreset objectForKey:@"UsesPictureSettings"] intValue] != 2 &&
+ [[chosenPreset objectForKey:@"UsesMaxPictureSettings"] intValue] != 1)
 {
 /*
 * if the preset specifies neither max. width nor height
@@ -6692,239 +4840,73 @@
 * if the specified non-zero dimensions exceed those of the
 * source, also use the max. picture size (no upscaling)
 */
- if (([[chosenPreset objectForKey:@"PictureWidth"] intValue] <= 0 &&
- [[chosenPreset objectForKey:@"PictureHeight"] intValue] <= 0) ||
- ([[chosenPreset objectForKey:@"PictureWidth"] intValue] > fTitle->width &&
- [[chosenPreset objectForKey:@"PictureHeight"] intValue] > fTitle->height) ||
- ([[chosenPreset objectForKey:@"PictureHeight"] intValue] <= 0 &&
- [[chosenPreset objectForKey:@"PictureWidth"] intValue] > fTitle->width) ||
- ([[chosenPreset objectForKey:@"PictureWidth"] intValue] <= 0 &&
- [[chosenPreset objectForKey:@"PictureHeight"] intValue] > fTitle->height))
+ if ([[chosenPreset objectForKey:@"PictureWidth"] intValue] > 0)
 {
- /* use the source's width/height to avoid upscaling */
- [self revertPictureSizeToMax:nil];
+ job->maxWidth = [[chosenPreset objectForKey:@"PictureWidth"] intValue];
 }
- else // source width/height is >= preset width/height
+ if ([[chosenPreset objectForKey:@"PictureHeight"] intValue] > 0)
 {
- /* use the preset values for width/height */
- job->width = [[chosenPreset objectForKey:@"PictureWidth"] intValue];
- job->height = [[chosenPreset objectForKey:@"PictureHeight"] intValue];
+ job->maxHeight = [[chosenPreset objectForKey:@"PictureHeight"] intValue];
 }
- job->keep_ratio = [[chosenPreset objectForKey:@"PictureKeepRatio"] intValue];
- if (job->keep_ratio == 1)
- {
- int height = fTitle->height;
-
- if ( job->height && job->height < fTitle->height )
- height = job->height;
-
- hb_fix_aspect( job, HB_KEEP_WIDTH );
- // Make sure the resulting height is less than
- // the title height and less than the height
- // requested in the preset.
- if( job->height > height )
- {
- job->height = height;
- hb_fix_aspect( job, HB_KEEP_HEIGHT );
- }
- }
- job->anamorphic.mode = [[chosenPreset objectForKey:@"PicturePAR"] intValue];
- if ( job->anamorphic.mode > 0 )
- {
- int w, h, par_w, par_h;
-
- job->anamorphic.par_width = fTitle->pixel_aspect_width;
- job->anamorphic.par_height = fTitle->pixel_aspect_height;
- job->maxWidth = job->width;
- job->maxHeight = job->height;
- hb_set_anamorphic_size( job, &w, &h, &par_w, &par_h );
- job->maxWidth = 0;
- job->maxHeight = 0;
- job->width = w;
- job->height = h;
- }
- 
- }
- 
- 
- }
- /* If the preset has an objectForKey:@"UsesPictureFilters", and handle the filters here */
- if ([chosenPreset objectForKey:@"UsesPictureFilters"] && [[chosenPreset objectForKey:@"UsesPictureFilters"] intValue] > 0)
- {
- /* Filters */
- 
- /* We only allow *either* Decomb or Deinterlace. So check for the PictureDecombDeinterlace key. */
- [fPictureController setUseDecomb:1];
- [fPictureController setDecomb:0];
- [fPictureController setDeinterlace:0];
- if ([[chosenPreset objectForKey:@"PictureDecombDeinterlace"] intValue] == 1)
- {
- /* we are using decomb */
- /* Decomb */
- if ([[chosenPreset objectForKey:@"PictureDecomb"] intValue] > 0)
- {
- [fPictureController setDecomb:[[chosenPreset objectForKey:@"PictureDecomb"] intValue]];
- 
- /* if we are using "Custom" in the decomb setting, also set the custom string*/
- if ([[chosenPreset objectForKey:@"PictureDecomb"] intValue] == 1)
- {
- [fPictureController setDecombCustomString:[chosenPreset objectForKey:@"PictureDecombCustom"]]; 
- }
- }
- }
- else
- {
- /* We are using Deinterlace */
- /* Deinterlace */
- if ([[chosenPreset objectForKey:@"PictureDeinterlace"] intValue] > 0)
- {
- [fPictureController setUseDecomb:0];
- [fPictureController setDeinterlace:[[chosenPreset objectForKey:@"PictureDeinterlace"] intValue]];
- /* if we are using "Custom" in the deinterlace setting, also set the custom string*/
- if ([[chosenPreset objectForKey:@"PictureDeinterlace"] intValue] == 1)
- {
- [fPictureController setDeinterlaceCustomString:[chosenPreset objectForKey:@"PictureDeinterlaceCustom"]]; 
- }
- }
- }
- 
- 
- /* Detelecine */
- if ([[chosenPreset objectForKey:@"PictureDetelecine"] intValue] > 0)
- {
- [fPictureController setDetelecine:[[chosenPreset objectForKey:@"PictureDetelecine"] intValue]];
- /* if we are using "Custom" in the detelecine setting, also set the custom string*/
- if ([[chosenPreset objectForKey:@"PictureDetelecine"] intValue] == 1)
- {
- [fPictureController setDetelecineCustomString:[chosenPreset objectForKey:@"PictureDetelecineCustom"]]; 
- }
- }
- else
- {
- [fPictureController setDetelecine:0];
- }
- 
- /* Denoise */
- if ([[chosenPreset objectForKey:@"PictureDenoise"] intValue] > 0)
- {
- [fPictureController setDenoise:[[chosenPreset objectForKey:@"PictureDenoise"] intValue]];
- /* if we are using "Custom" in the denoise setting, also set the custom string*/
- if ([[chosenPreset objectForKey:@"PictureDenoise"] intValue] == 1)
- {
- [fPictureController setDenoiseCustomString:[chosenPreset objectForKey:@"PictureDenoiseCustom"]]; 
- }
- }
- else
- {
- [fPictureController setDenoise:0];
- } 
- 
- /* Deblock */
- if ([[chosenPreset objectForKey:@"PictureDeblock"] intValue] == 1)
- {
- /* if its a one, then its the old on/off deblock, set on to 5*/
- [fPictureController setDeblock:5];
- }
- else
- {
- /* use the settings intValue */
- [fPictureController setDeblock:[[chosenPreset objectForKey:@"PictureDeblock"] intValue]];
- }
- 
- if ([[chosenPreset objectForKey:@"VideoGrayScale"] intValue] == 1)
- {
- [fPictureController setGrayscale:1];
- }
- else
- {
- [fPictureController setGrayscale:0];
 }
 }
+ /* Modulus added to maxWidth/maxHeight to allow a small amount of
+ * upscaling to the next mod boundary. This does not apply to 
+ * explicit limits set for device compatibility. It only applies
+ * when limiting to cropped title dimensions.
+ */
+ maxWidth += job->modulus - 1;
+ maxHeight += job->modulus - 1;
+ if (job->maxWidth == 0 || job->maxWidth > maxWidth)
+ job->maxWidth = maxWidth;
+ if (job->maxHeight == 0 || job->maxHeight > maxHeight)
+ job->maxHeight = maxHeight;
+
+ int width, height, par_width, par_height;
+ hb_set_anamorphic_size(job, &width, &height, &par_width, &par_height);
+ job->width = width;
+ job->height = height;
+ job->anamorphic.par_width = par_width;
+ job->anamorphic.par_height = par_height;
+
 /* we call SetTitle: in fPictureController so we get an instant update in the Picture Settings window */
- [fPictureController SetTitle:fTitle];
- [fPictureController SetTitle:fTitle];
- [self calculatePictureSizing:nil];
+ [fPictureController setTitle:fTitle];
+ [fPictureController.filters applySettingsFromPreset:chosenPreset];
+ [self pictureSettingsDidChange];
 }
 }
 
+#pragma mark - Presets View Controller Delegate
 
-- (BOOL)hasValidPresetSelected
-{
- return ([fPresetsOutlineView selectedRow] >= 0 && [[[self selectedPreset] objectForKey:@"Folder"] intValue] != 1);
-}
-
-
-- (id)selectedPreset
+- (void)selectionDidChange
 {
- return [fPresetsOutlineView itemAtRow:[fPresetsOutlineView selectedRow]];
+ [self applyPreset:fPresetsView.selectedPreset];
 }
 
-
 #pragma mark -
 #pragma mark Manage Presets
 
-- (void) loadPresets {
- /* We declare the default NSFileManager into fileManager */
- NSFileManager * fileManager = [NSFileManager defaultManager];
- /* We define the location of the user presets file */
- UserPresetsFile = @"~/Library/Application Support/HandBrake/UserPresets.plist";
- UserPresetsFile = [[UserPresetsFile stringByExpandingTildeInPath]retain];
- /* We check for the presets.plist */
- if ([fileManager fileExistsAtPath:UserPresetsFile] == 0)
- {
- [fileManager createFileAtPath:UserPresetsFile contents:nil attributes:nil];
- }
-
- UserPresets = [[NSMutableArray alloc] initWithContentsOfFile:UserPresetsFile];
- if (nil == UserPresets)
- {
- UserPresets = [[NSMutableArray alloc] init];
- [self addFactoryPresets:nil];
- }
- [fPresetsOutlineView reloadData];
- 
- [self checkBuiltInsForUpdates];
-}
-
-- (void) checkBuiltInsForUpdates {
- 
- BOOL updateBuiltInPresets = NO;
- int i = 0;
- NSEnumerator *enumerator = [UserPresets objectEnumerator];
- id tempObject;
- while (tempObject = [enumerator nextObject])
- {
- /* iterate through the built in presets to see if any have an old build number */
- NSMutableDictionary *thisPresetDict = tempObject;
- /*Key Type == 0 is built in, and key PresetBuildNumber is the build number it was created with */
- if ([[thisPresetDict objectForKey:@"Type"] intValue] == 0)		
- {
-			if (![thisPresetDict objectForKey:@"PresetBuildNumber"] || [[thisPresetDict objectForKey:@"PresetBuildNumber"] intValue] < [[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] intValue])
- {
- updateBuiltInPresets = YES;
- }	
-		}
- i++;
- }
+- (void) checkBuiltInsForUpdates
+{
 /* if we have built in presets to update, then do so AlertBuiltInPresetUpdate*/
- if ( updateBuiltInPresets == YES)
+ if ([presetManager checkBuiltInsForUpdates])
 {
 if( [[NSUserDefaults standardUserDefaults] boolForKey:@"AlertBuiltInPresetUpdate"] == YES)
 {
 /* Show an alert window that built in presets will be updated */
 /*On Screen Notification*/
- int status;
- NSBeep();
- status = NSRunAlertPanel(@"HandBrake has determined your built in presets are out of date…",@"HandBrake will now update your built-in presets.", @"OK", nil, nil);
 [NSApp requestUserAttention:NSCriticalRequest];
+ NSAlert *alert = [[NSAlert alloc] init];
+ [alert setMessageText:@"HandBrake has determined your built in presets are out of date…"];
+ [alert setInformativeText:@"HandBrake will now update your built-in presets."];
+ [alert runModal];
+ [alert release];
 }
 /* when alert is dismissed, go ahead and update the built in presets */
- [self addFactoryPresets:nil];
+ [presetManager generateBuiltInPresets];
 }
- 
 }
 
-
 - (IBAction) addPresetPicDropdownChanged: (id) sender
 {
 if ([[fPresetNewPicSettingsPopUp selectedItem] tag] == 1)
@@ -6939,9 +4921,6 @@
 
 - (IBAction) showAddPresetPanel: (id) sender
 {
- /* Deselect the currently selected Preset if there is one*/
- [fPresetsOutlineView deselectRow:[fPresetsOutlineView selectedRow]];
-
 /*
 * Populate the preset picture settings popup.
 *
@@ -6952,7 +4931,7 @@
 [fPresetNewPicSettingsPopUp removeAllItems];
 [fPresetNewPicSettingsPopUp addItemWithTitle:@"None"];
 [[fPresetNewPicSettingsPopUp lastItem] setTag: 0];
- if (fTitle->job->anamorphic.mode != 1)
+ if (fTitle->job->anamorphic.mode != HB_ANAMORPHIC_STRICT)
 {
 // not Strict, Custom is applicable
 [fPresetNewPicSettingsPopUp addItemWithTitle:@"Custom"];
@@ -6964,11 +4943,9 @@
 * Default to Source Maximum for anamorphic Strict
 * Default to Custom for all other anamorphic modes
 */
- [fPresetNewPicSettingsPopUp selectItemWithTag: (1 + (fTitle->job->anamorphic.mode == 1))];
+ [fPresetNewPicSettingsPopUp selectItemWithTag: (1 + (fTitle->job->anamorphic.mode == HB_ANAMORPHIC_STRICT))];
 /* Save the current filters in the preset by default */
 [fPresetNewPicFiltersCheck setState:NSOnState];
- // fPresetNewFolderCheck
- [fPresetNewFolderCheck setState:NSOffState];
 /* Erase info from the input fields*/
 	[fPresetNewName setStringValue: @""];
 	[fPresetNewDesc setStringValue: @""];
@@ -6991,55 +4968,21 @@
 - (IBAction)addUserPreset:(id)sender
 {
 if (![[fPresetNewName stringValue] length])
- NSRunAlertPanel(@"Warning!", @"You need to insert a name for the preset.", @"OK", nil , nil);
+ {
+ NSAlert *alert = [[NSAlert alloc] init];
+ [alert setMessageText:@"Warning!"];
+ [alert setInformativeText:@"You need to insert a name for the preset."];
+ [alert runModal];
+ [alert release];
+ }
 else
 {
 /* Here we create a custom user preset */
- [UserPresets addObject:[self createPreset]];
- [self addPreset];
+ [presetManager addPreset:[self createPreset]];
 
 [self closeAddPresetPanel:nil];
 }
 }
-- (void)addPreset
-{
-
-	
-	/* We Reload the New Table data for presets */
- [fPresetsOutlineView reloadData];
- /* We save all of the preset data here */
- [self savePreset];
-}
-
-- (void)sortPresets
-{
-
-	
-	/* We Sort the Presets By Factory or Custom */
-	NSSortDescriptor * presetTypeDescriptor=[[[NSSortDescriptor alloc] initWithKey:@"Type" 
- ascending:YES] autorelease];
-	/* We Sort the Presets Alphabetically by name We do not use this now as we have drag and drop*/
-	/*
- NSSortDescriptor * presetNameDescriptor=[[[NSSortDescriptor alloc] initWithKey:@"PresetName" 
- ascending:YES selector:@selector(caseInsensitiveCompare:)] autorelease];
-	//NSArray *sortDescriptors=[NSArray arrayWithObjects:presetTypeDescriptor,presetNameDescriptor,nil];
- 
- */
- /* Since we can drag and drop our custom presets, lets just sort by type and not name */
- NSArray *sortDescriptors=[NSArray arrayWithObjects:presetTypeDescriptor,nil];
-	NSArray *sortedArray=[UserPresets sortedArrayUsingDescriptors:sortDescriptors];
-	[UserPresets setArray:sortedArray];
-	
-
-}
-
-- (IBAction)insertPreset:(id)sender
-{
- int index = [fPresetsOutlineView selectedRow];
- [UserPresets insertObject:[self createPreset] atIndex:index];
- [fPresetsOutlineView reloadData];
- [self savePreset];
-}
 
 - (NSDictionary *)createPreset
 {
@@ -7050,816 +4993,238 @@
 	/* Get the New Preset Name from the field in the AddPresetPanel */
 [preset setObject:[fPresetNewName stringValue] forKey:@"PresetName"];
 /* Set whether or not this is to be a folder fPresetNewFolderCheck*/
- [preset setObject:[NSNumber numberWithBool:[fPresetNewFolderCheck state]] forKey:@"Folder"];
+ [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
 	/*Set whether or not this is a user preset or factory 0 is factory, 1 is user*/
 	[preset setObject:[NSNumber numberWithInt:1] forKey:@"Type"];
 	/*Set whether or not this is default, at creation set to 0*/
 	[preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
- if ([fPresetNewFolderCheck state] == YES)
- {
- /* initialize and set an empty array for children here since we are a new folder */
- NSMutableArray *childrenArray = [[NSMutableArray alloc] init];
- [preset setObject:[NSMutableArray arrayWithArray: childrenArray] forKey:@"ChildrenArray"];
- [childrenArray autorelease];
- }
- else // we are not creating a preset folder, so we go ahead with the rest of the preset info
- {
- /*Get the whether or not to apply pic Size and Cropping (includes Anamorphic)*/
- [preset setObject:[NSNumber numberWithInteger:[[fPresetNewPicSettingsPopUp selectedItem] tag]] forKey:@"UsesPictureSettings"];
- /* Get whether or not to use the current Picture Filter settings for the preset */
- [preset setObject:[NSNumber numberWithInt:[fPresetNewPicFiltersCheck state]] forKey:@"UsesPictureFilters"];
 
- /* Get New Preset Description from the field in the AddPresetPanel*/
- [preset setObject:[fPresetNewDesc stringValue] forKey:@"PresetDescription"];
- /* File Format */
- [preset setObject:[fDstFormatPopUp titleOfSelectedItem] forKey:@"FileFormat"];
- /* Chapter Markers fCreateChapterMarkers*/
- [preset setObject:[NSNumber numberWithInt:[fCreateChapterMarkers state]] forKey:@"ChapterMarkers"];
- /* Allow Mpeg4 64 bit formatting +4GB file sizes */
- [preset setObject:[NSNumber numberWithInt:[fDstMp4LargeFileCheck state]] forKey:@"Mp4LargeFile"];
- /* Mux mp4 with http optimization */
- [preset setObject:[NSNumber numberWithInt:[fDstMp4HttpOptFileCheck state]] forKey:@"Mp4HttpOptimize"];
- /* Add iPod uuid atom */
- [preset setObject:[NSNumber numberWithInt:[fDstMp4iPodFileCheck state]] forKey:@"Mp4iPodCompatible"];
- 
- /* Codecs */
- /* Video encoder */
- [preset setObject:[fVidEncoderPopUp titleOfSelectedItem] forKey:@"VideoEncoder"];
- /* x264 Options, this will either be advanced panel or the video tabs x264 presets panel with modded option string */
- 
- if ([fX264UseAdvancedOptionsCheck state] == NSOnState)
- {
- /* use the old advanced panel */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"x264UseAdvancedOptions"];
- [preset setObject:[fAdvancedOptions optionsString] forKey:@"x264Option"];
- }
- else
- {
- /* use the x264 preset system */
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
- [preset setObject:[self x264Preset] forKey:@"x264Preset"];
- [preset setObject:[self x264Tune] forKey:@"x264Tune"];
- [preset setObject:[self x264OptionExtra] forKey:@"x264OptionExtra"];
- [preset setObject:[self h264Profile] forKey:@"h264Profile"];
- [preset setObject:[self h264Level] forKey:@"h264Level"];
- /*
- * bonus: set the unparsed options to make the preset compatible
- * with old HB versions
- */
- if (fX264PresetsUnparsedUTF8String != NULL)
- {
- [preset setObject:[NSString stringWithUTF8String:fX264PresetsUnparsedUTF8String]
- forKey:@"x264Option"];
- }
- else
- {
- [preset setObject:@"" forKey:@"x264Option"];
- }
- }
+ /*Get the whether or not to apply pic Size and Cropping (includes Anamorphic)*/
+ [preset setObject:[NSNumber numberWithInteger:[[fPresetNewPicSettingsPopUp selectedItem] tag]] forKey:@"UsesPictureSettings"];
+ /* Get whether or not to use the current Picture Filter settings for the preset */
+ [preset setObject:[NSNumber numberWithInteger:[fPresetNewPicFiltersCheck state]] forKey:@"UsesPictureFilters"];
 
- /* FFmpeg (lavc) Option String */
- [preset setObject:[fAdvancedOptions optionsStringLavc] forKey:@"lavcOption"];
- 
- /* though there are actually only 0 - 1 types available in the ui we need to map to the old 0 - 2
- * set of indexes from when we had 0 == Target , 1 == Abr and 2 == Constant Quality for presets
- * to take care of any legacy presets. */
- [preset setObject:[NSNumber numberWithInt:[[fVidQualityMatrix selectedCell] tag] +1 ] forKey:@"VideoQualityType"];
- [preset setObject:[fVidBitrateField stringValue] forKey:@"VideoAvgBitrate"];
- [preset setObject:[NSNumber numberWithFloat:[fVidQualityRFField floatValue]] forKey:@"VideoQualitySlider"];
- 
- /* Video framerate */
- /* Set the Video Frame Rate Mode */
- if ([fFramerateMatrix selectedRow] == 1)
- {
- [preset setObject:@"cfr" forKey:@"VideoFramerateMode"];
- }
- /* Set the actual framerate from popup overriding the cfr setting as needed */
- if ([fVidRatePopUp indexOfSelectedItem] == 0) // Same as source is selected
- {
- [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
- 
- if ([fFramerateMatrix selectedRow] == 0)
- {
- [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
- }
- }
- else // we can record the actual titleOfSelectedItem
- {
- [preset setObject:[fVidRatePopUp titleOfSelectedItem] forKey:@"VideoFramerate"];
- 
- if ([fFramerateMatrix selectedRow] == 0)
- {
- [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
- }
- }
- 
+ /* Get New Preset Description from the field in the AddPresetPanel*/
+ [preset setObject:[fPresetNewDesc stringValue] forKey:@"PresetDescription"];
+ /* File Format */
+ [preset setObject:[fDstFormatPopUp titleOfSelectedItem] forKey:@"FileFormat"];
+ /* Chapter Markers fCreateChapterMarkers*/
+ [preset setObject:@(fChapterTitlesController.createChapterMarkers) forKey:@"ChapterMarkers"];
+ /* Mux mp4 with http optimization */
+ [preset setObject:[NSNumber numberWithInteger:[fDstMp4HttpOptFileCheck state]] forKey:@"Mp4HttpOptimize"];
+ /* Add iPod uuid atom */
+ [preset setObject:[NSNumber numberWithInteger:[fDstMp4iPodFileCheck state]] forKey:@"Mp4iPodCompatible"];
+ 
+ /* Codecs */
+ /* Video encoder */
+ [fVideoController prepareVideoForPreset:preset];
 
- 
- /* 2 Pass Encoding */
- [preset setObject:[NSNumber numberWithInt:[fVidTwoPassCheck state]] forKey:@"VideoTwoPass"];
- /* Turbo 2 pass Encoding fVidTurboPassCheck*/
- [preset setObject:[NSNumber numberWithInt:[fVidTurboPassCheck state]] forKey:@"VideoTurboTwoPass"];
- /*Picture Settings*/
- hb_job_t * job = fTitle->job;
- 
- /* Picture Sizing */
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"UsesMaxPictureSettings"];
- [preset setObject:[NSNumber numberWithInt:[fPresetNewPicWidth intValue]] forKey:@"PictureWidth"];
- [preset setObject:[NSNumber numberWithInt:[fPresetNewPicHeight intValue]] forKey:@"PictureHeight"];
- [preset setObject:[NSNumber numberWithInt:fTitle->job->keep_ratio] forKey:@"PictureKeepRatio"];
- [preset setObject:[NSNumber numberWithInt:fTitle->job->anamorphic.mode] forKey:@"PicturePAR"];
- [preset setObject:[NSNumber numberWithInt:fTitle->job->modulus] forKey:@"PictureModulus"];
- 
- /* Set crop settings here */
- [preset setObject:[NSNumber numberWithInt:[fPictureController autoCrop]] forKey:@"PictureAutoCrop"];
- [preset setObject:[NSNumber numberWithInt:job->crop[0]] forKey:@"PictureTopCrop"];
- [preset setObject:[NSNumber numberWithInt:job->crop[1]] forKey:@"PictureBottomCrop"];
- [preset setObject:[NSNumber numberWithInt:job->crop[2]] forKey:@"PictureLeftCrop"];
- [preset setObject:[NSNumber numberWithInt:job->crop[3]] forKey:@"PictureRightCrop"];
- 
- /* Picture Filters */
- [preset setObject:[NSNumber numberWithInt:[fPictureController useDecomb]] forKey:@"PictureDecombDeinterlace"];
- [preset setObject:[NSNumber numberWithInt:[fPictureController deinterlace]] forKey:@"PictureDeinterlace"];
- [preset setObject:[fPictureController deinterlaceCustomString] forKey:@"PictureDeinterlaceCustom"];
- [preset setObject:[NSNumber numberWithInt:[fPictureController detelecine]] forKey:@"PictureDetelecine"];
- [preset setObject:[fPictureController detelecineCustomString] forKey:@"PictureDetelecineCustom"];
- [preset setObject:[NSNumber numberWithInt:[fPictureController denoise]] forKey:@"PictureDenoise"];
- [preset setObject:[fPictureController denoiseCustomString] forKey:@"PictureDenoiseCustom"];
- [preset setObject:[NSNumber numberWithInt:[fPictureController deblock]] forKey:@"PictureDeblock"]; 
- [preset setObject:[NSNumber numberWithInt:[fPictureController decomb]] forKey:@"PictureDecomb"];
- [preset setObject:[fPictureController decombCustomString] forKey:@"PictureDecombCustom"];
- [preset setObject:[NSNumber numberWithInt:[fPictureController grayscale]] forKey:@"VideoGrayScale"];
- 
- /* Auto Pasthru */
- [preset setObject:[NSNumber numberWithInt:[fAudioAllowAACPassCheck state]] forKey: @"AudioAllowAACPass"];
- [preset setObject:[NSNumber numberWithInt:[fAudioAllowAC3PassCheck state]] forKey: @"AudioAllowAC3Pass"];
- [preset setObject:[NSNumber numberWithInt:[fAudioAllowDTSHDPassCheck state]] forKey: @"AudioAllowDTSHDPass"];
- [preset setObject:[NSNumber numberWithInt:[fAudioAllowDTSPassCheck state]] forKey: @"AudioAllowDTSPass"];
- [preset setObject:[NSNumber numberWithInt:[fAudioAllowMP3PassCheck state]] forKey: @"AudioAllowMP3Pass"];
- [preset setObject:[fAudioFallbackPopUp titleOfSelectedItem] forKey: @"AudioEncoderFallback"];
- 
- /* Audio */
- NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
-		[fAudioDelegate prepareAudioForPreset: audioListArray];
- 
- 
- [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
+ /*Picture Settings*/
+ hb_job_t * job = fTitle->job;
+ 
+ /* Picture Sizing */
+ [preset setObject:[NSNumber numberWithInt:0] forKey:@"UsesMaxPictureSettings"];
+ [preset setObject:[NSNumber numberWithInt:[fPresetNewPicWidth intValue]] forKey:@"PictureWidth"];
+ [preset setObject:[NSNumber numberWithInt:[fPresetNewPicHeight intValue]] forKey:@"PictureHeight"];
+ [preset setObject:[NSNumber numberWithInt:fTitle->job->anamorphic.keep_display_aspect] forKey:@"PictureKeepRatio"];
+ [preset setObject:[NSNumber numberWithInt:fTitle->job->anamorphic.mode] forKey:@"PicturePAR"];
+ [preset setObject:[NSNumber numberWithInt:fTitle->job->modulus] forKey:@"PictureModulus"];
 
- 
- /* Temporarily remove subtitles from creating a new preset as it has to be converted over to use the new
- * subititle array code. */
- /* Subtitles*/
- //[preset setObject:[fSubPopUp titleOfSelectedItem] forKey:@"Subtitles"];
- /* Forced Subtitles */
- //[preset setObject:[NSNumber numberWithInt:[fSubForcedCheck state]] forKey:@"SubtitlesForced"];
- }
- [preset autorelease];
- return preset;
+ /* Set crop settings here */
+ [preset setObject:[NSNumber numberWithInt:[fPictureController autoCrop]] forKey:@"PictureAutoCrop"];
+ [preset setObject:[NSNumber numberWithInt:job->crop[0]] forKey:@"PictureTopCrop"];
+ [preset setObject:[NSNumber numberWithInt:job->crop[1]] forKey:@"PictureBottomCrop"];
+ [preset setObject:[NSNumber numberWithInt:job->crop[2]] forKey:@"PictureLeftCrop"];
+ [preset setObject:[NSNumber numberWithInt:job->crop[3]] forKey:@"PictureRightCrop"];
 
-}
+ /* Picture Filters */
+ [fPictureController.filters prepareFiltersForPreset:preset];
 
-- (void)savePreset
-{
- [UserPresets writeToFile:UserPresetsFile atomically:YES];
-	/* We get the default preset in case it changed */
-	[self getDefaultPresets:nil];
+ /* Audio */
+ [fAudioController.settings prepareAudioDefaultsForPreset:preset];
 
-}
+ /* Subtitles */
+ [fSubtitlesViewController.settings prepareSubtitlesDefaultsForPreset:preset];
 
-- (IBAction)deletePreset:(id)sender
-{
- 
+ [preset autorelease];
+ return preset;
 
- if ( [fPresetsOutlineView numberOfSelectedRows] == 0 )
- {
- return;
- }
- /* Alert user before deleting preset */
- int status;
- status = NSRunAlertPanel(@"Warning!", @"Are you sure that you want to delete the selected preset?", @"OK", @"Cancel", nil);
-
- if ( status == NSAlertDefaultReturn )
- {
- int presetToModLevel = [fPresetsOutlineView levelForItem: [self selectedPreset]];
- NSDictionary *presetToMod = [self selectedPreset];
- NSDictionary *presetToModParent = [fPresetsOutlineView parentForItem: presetToMod];
-
- NSEnumerator *enumerator;
- NSMutableArray *presetsArrayToMod;
- NSMutableArray *tempArray;
- id tempObject;
- /* If we are a root level preset, we are modding the UserPresets array */
- if (presetToModLevel == 0)
- {
- presetsArrayToMod = UserPresets;
- }
- else // We have a parent preset, so we modify the chidren array object for key
- {
- presetsArrayToMod = [presetToModParent objectForKey:@"ChildrenArray"]; 
- }
- 
- enumerator = [presetsArrayToMod objectEnumerator];
- tempArray = [NSMutableArray array];
- 
- while (tempObject = [enumerator nextObject]) 
- {
- NSDictionary *thisPresetDict = tempObject;
- if (thisPresetDict == presetToMod)
- {
- [tempArray addObject:tempObject];
- }
- }
- 
- [presetsArrayToMod removeObjectsInArray:tempArray];
- [fPresetsOutlineView reloadData];
- [self savePreset]; 
- }
 }
 
-
 #pragma mark -
 #pragma mark Import Export Preset(s)
 
 - (IBAction) browseExportPresetFile: (id) sender
 {
 /* Open a panel to let the user choose where and how to save the export file */
- NSSavePanel * panel = [NSSavePanel savePanel];
+ NSSavePanel *panel = [NSSavePanel savePanel];
 	/* We get the current file name and path from the destination field here */
 NSString *defaultExportDirectory = [NSString stringWithFormat: @"%@/Desktop/", NSHomeDirectory()];
-
-	[panel beginSheetForDirectory: defaultExportDirectory file: @"HB_Export.plist"
-				 modalForWindow: fWindow modalDelegate: self
-				 didEndSelector: @selector( browseExportPresetFileDone:returnCode:contextInfo: )
-					 contextInfo: NULL];
-}
-
-- (void) browseExportPresetFileDone: (NSSavePanel *) sheet
- returnCode: (int) returnCode contextInfo: (void *) contextInfo
-{
- if( returnCode == NSOKButton )
- {
- NSString *presetExportDirectory = [[sheet filename] stringByDeletingLastPathComponent];
- NSString *exportPresetsFile = [sheet filename];
- [[NSUserDefaults standardUserDefaults] setObject:presetExportDirectory forKey:@"LastPresetExportDirectory"];
- /* We check for the presets.plist */
- if ([[NSFileManager defaultManager] fileExistsAtPath:exportPresetsFile] == 0)
- {
- [[NSFileManager defaultManager] createFileAtPath:exportPresetsFile contents:nil attributes:nil];
- }
- NSMutableArray * presetsToExport = [[NSMutableArray alloc] initWithContentsOfFile:exportPresetsFile];
- if (nil == presetsToExport)
+ [panel setDirectoryURL:[NSURL fileURLWithPath:defaultExportDirectory]];
+ [panel setNameFieldStringValue:@"HB_Export.plist"];
+ [panel beginSheetModalForWindow:fWindow completionHandler:^(NSInteger result) {
+ if( result == NSOKButton )
 {
- presetsToExport = [[NSMutableArray alloc] init];
+ NSURL *exportPresetsFile = [panel URL];
+ NSURL *presetExportDirectory = [exportPresetsFile URLByDeletingLastPathComponent];
+ [[NSUserDefaults standardUserDefaults] setURL:presetExportDirectory forKey:@"LastPresetExportDirectoryURL"];
 
- /* now get and add selected presets to export */
-
- }
- if (YES == [self hasValidPresetSelected])
- {
- [presetsToExport addObject:[self selectedPreset]];
- [presetsToExport writeToFile:exportPresetsFile atomically:YES];
+ /* We check for the presets.plist */
+ if ([[NSFileManager defaultManager] fileExistsAtPath:[exportPresetsFile path]] == 0)
+ {
+ [[NSFileManager defaultManager] createFileAtPath:[exportPresetsFile path] contents:nil attributes:nil];
+ }
 
+ NSMutableArray *presetsToExport = [[[NSMutableArray alloc] initWithContentsOfURL:exportPresetsFile] autorelease];
+ if (presetsToExport == nil)
+ {
+ presetsToExport = [[NSMutableArray alloc] init];
+ /* now get and add selected presets to export */
+ }
+ if (fPresetsView.selectedPreset != nil)
+ {
+ [presetsToExport addObject:[fPresetsView.selectedPreset content]];
+ [presetsToExport writeToURL:exportPresetsFile atomically:YES];
+ }
 }
-
- }
+ }];
 }
 
-
-- (IBAction) browseImportPresetFile: (id) sender
+- (IBAction)browseImportPresetFile:(id)sender
 {
+ NSOpenPanel *panel;
 
- NSOpenPanel * panel;
-	
 panel = [NSOpenPanel openPanel];
- [panel setAllowsMultipleSelection: NO];
- [panel setCanChooseFiles: YES];
- [panel setCanChooseDirectories: NO ];
- NSString * sourceDirectory;
-	if ([[NSUserDefaults standardUserDefaults] stringForKey:@"LastPresetImportDirectory"])
+ [panel setAllowsMultipleSelection:NO];
+ [panel setCanChooseFiles:YES];
+ [panel setCanChooseDirectories:NO];
+ [panel setAllowedFileTypes:@[@"plist", @"xml"]];
+
+ NSURL *sourceDirectory;
+	if ([[NSUserDefaults standardUserDefaults] URLForKey:@"LastPresetImportDirectoryURL"])
 	{
-		sourceDirectory = [[NSUserDefaults standardUserDefaults] stringForKey:@"LastPresetImportDirectory"];
+		sourceDirectory = [[NSUserDefaults standardUserDefaults] URLForKey:@"LastPresetImportDirectoryURL"];
 	}
 	else
 	{
-		sourceDirectory = @"~/Desktop";
-		sourceDirectory = [sourceDirectory stringByExpandingTildeInPath];
+		sourceDirectory = [[NSURL fileURLWithPath:NSHomeDirectory()] URLByAppendingPathComponent:@"Desktop"];
 	}
 /* we open up the browse sources sheet here and call for browseSourcesDone after the sheet is closed
 * to evaluate whether we want to specify a title, we pass the sender in the contextInfo variable
 */
 /* set this for allowed file types, not sure if we should allow xml or not */
- NSArray *fileTypes = [NSArray arrayWithObjects:@"plist", @"xml", nil];
- [panel beginSheetForDirectory: sourceDirectory file: nil types: fileTypes
- modalForWindow: fWindow modalDelegate: self
- didEndSelector: @selector( browseImportPresetDone:returnCode:contextInfo: )
- contextInfo: sender];
-}
-
-- (void) browseImportPresetDone: (NSSavePanel *) sheet
- returnCode: (int) returnCode contextInfo: (void *) contextInfo
-{
- if( returnCode == NSOKButton )
+ [panel setDirectoryURL:sourceDirectory];
+ [panel beginSheetModalForWindow:fWindow completionHandler:^(NSInteger result)
 {
- NSString *importPresetsDirectory = [[sheet filename] stringByDeletingLastPathComponent];
- NSString *importPresetsFile = [sheet filename];
- [[NSUserDefaults standardUserDefaults] setObject:importPresetsDirectory forKey:@"LastPresetImportDirectory"];
+ NSURL *importPresetsFile = [panel URL];
+ NSURL *importPresetsDirectory = nil;//[importPresetsFile URLByDeletingLastPathComponent];
+ [[NSUserDefaults standardUserDefaults] setURL:importPresetsDirectory forKey:@"LastPresetImportDirectoryURL"];
+
 /* NOTE: here we need to do some sanity checking to verify we do not hose up our presets file */
- NSMutableArray * presetsToImport = [[NSMutableArray alloc] initWithContentsOfFile:importPresetsFile];
+ NSMutableArray * presetsToImport = [[NSMutableArray alloc] initWithContentsOfURL:importPresetsFile];
 /* iterate though the new array of presets to import and add them to our presets array */
- int i = 0;
- NSEnumerator *enumerator = [presetsToImport objectEnumerator];
- id tempObject;
- while (tempObject = [enumerator nextObject])
+ for (id tempObject in presetsToImport)
 {
 /* make any changes to the incoming preset we see fit */
 /* make sure the incoming preset is not tagged as default */
 [tempObject setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
 /* prepend "(imported) to the name of the incoming preset for clarification since it can be changed */
- NSString * prependedName = [@"(import) " stringByAppendingString:[tempObject objectForKey:@"PresetName"]] ;
+ NSString *prependedName = [@"(import) " stringByAppendingString:[tempObject objectForKey:@"PresetName"]] ;
 [tempObject setObject:prependedName forKey:@"PresetName"];
 
 /* actually add the new preset to our presets array */
- [UserPresets addObject:tempObject];
- i++;
+ [presetManager addPreset:tempObject];
 }
 [presetsToImport autorelease];
- [self sortPresets];
- [self addPreset];
- 
- }
+ }];
 }
 
 #pragma mark -
-#pragma mark Manage Default Preset
+#pragma mark Preset Menu
 
-- (IBAction)getDefaultPresets:(id)sender
+- (IBAction)selectDefaultPreset:(id)sender
 {
-	presetHbDefault = nil;
- presetUserDefault = nil;
- presetUserDefaultParent = nil;
- presetUserDefaultParentParent = nil;
- NSMutableDictionary *presetHbDefaultParent = nil;
- NSMutableDictionary *presetHbDefaultParentParent = nil;
- 
- int i = 0;
- BOOL userDefaultFound = NO;
- presetCurrentBuiltInCount = 0;
- /* First we iterate through the root UserPresets array to check for defaults */
- NSEnumerator *enumerator = [UserPresets objectEnumerator];
-	id tempObject;
-	while (tempObject = [enumerator nextObject])
-	{
-		NSMutableDictionary *thisPresetDict = tempObject;
-		if ([[thisPresetDict objectForKey:@"Default"] intValue] == 1) // 1 is HB default
-		{
-			presetHbDefault = thisPresetDict;	
-		}
-		if ([[thisPresetDict objectForKey:@"Default"] intValue] == 2) // 2 is User specified default
-		{
-			presetUserDefault = thisPresetDict;
- userDefaultFound = YES;
- }
- if ([[thisPresetDict objectForKey:@"Type"] intValue] == 0) // Type 0 is a built in preset		
- {
-			presetCurrentBuiltInCount++; // <--increment the current number of built in presets	
-		}
-		i++;
- 
- /* if we run into a folder, go to level 1 and iterate through the children arrays for the default */
- if ([thisPresetDict objectForKey:@"ChildrenArray"])
- {
- NSMutableDictionary *thisPresetDictParent = thisPresetDict;
- NSEnumerator *enumerator = [[thisPresetDict objectForKey:@"ChildrenArray"] objectEnumerator];
- id tempObject;
- while (tempObject = [enumerator nextObject])
- {
- NSMutableDictionary *thisPresetDict = tempObject;
- if ([[thisPresetDict objectForKey:@"Default"] intValue] == 1) // 1 is HB default
- {
- presetHbDefault = thisPresetDict;
- presetHbDefaultParent = thisPresetDictParent;
- }
- if ([[thisPresetDict objectForKey:@"Default"] intValue] == 2) // 2 is User specified default
- {
- presetUserDefault = thisPresetDict;
- presetUserDefaultParent = thisPresetDictParent;
- userDefaultFound = YES;
- }
- 
- /* if we run into a folder, go to level 2 and iterate through the children arrays for the default */
- if ([thisPresetDict objectForKey:@"ChildrenArray"])
- {
- NSMutableDictionary *thisPresetDictParentParent = thisPresetDict;
- NSEnumerator *enumerator = [[thisPresetDict objectForKey:@"ChildrenArray"] objectEnumerator];
- id tempObject;
- while (tempObject = [enumerator nextObject])
- {
- NSMutableDictionary *thisPresetDict = tempObject;
- if ([[thisPresetDict objectForKey:@"Default"] intValue] == 1) // 1 is HB default
- {
- presetHbDefault = thisPresetDict;
- presetHbDefaultParent = thisPresetDictParent;
- presetHbDefaultParentParent = thisPresetDictParentParent;	
- }
- if ([[thisPresetDict objectForKey:@"Default"] intValue] == 2) // 2 is User specified default
- {
- presetUserDefault = thisPresetDict;
- presetUserDefaultParent = thisPresetDictParent;
- presetUserDefaultParentParent = thisPresetDictParentParent;
- userDefaultFound = YES;	
- }
- 
- }
- }
- }
- }
- 
-	}
- /* check to see if a user specified preset was found, if not then assign the parents for
- * the presetHbDefault so that we can open the parents for the nested presets
- */
- if (userDefaultFound == NO)
- {
- presetUserDefaultParent = presetHbDefaultParent;
- presetUserDefaultParentParent = presetHbDefaultParentParent;
- }
+ [self applyPreset:presetManager.defaultPreset];
+ [fPresetsView setSelection:_selectedPreset];
 }
 
-- (IBAction)setDefaultPreset:(id)sender
+- (IBAction)insertFolder:(id)sender
 {
-/* We need to determine if the item is a folder */
- if ([[[self selectedPreset] objectForKey:@"Folder"] intValue] == 1)
- {
- return;
- }
-
- int i = 0;
- NSEnumerator *enumerator = [UserPresets objectEnumerator];
- id tempObject;
- /* First make sure the old user specified default preset is removed */
- while (tempObject = [enumerator nextObject])
- {
- NSMutableDictionary *thisPresetDict = tempObject;
- if ([[tempObject objectForKey:@"Default"] intValue] != 1) // if not the default HB Preset, set to 0
- {
- [[UserPresets objectAtIndex:i] setObject:[NSNumber numberWithInt:0] forKey:@"Default"];	
- }
-		
- /* if we run into a folder, go to level 1 and iterate through the children arrays for the default */
- if ([thisPresetDict objectForKey:@"ChildrenArray"])
- {
- NSEnumerator *enumerator = [[thisPresetDict objectForKey:@"ChildrenArray"] objectEnumerator];
- id tempObject;
- int ii = 0;
- while (tempObject = [enumerator nextObject])
- {
- NSMutableDictionary *thisPresetDict1 = tempObject;
- if ([[tempObject objectForKey:@"Default"] intValue] != 1) // if not the default HB Preset, set to 0
- {
- [[[thisPresetDict objectForKey:@"ChildrenArray"] objectAtIndex:ii] setObject:[NSNumber numberWithInt:0] forKey:@"Default"];	
- }
- /* if we run into a folder, go to level 2 and iterate through the children arrays for the default */
- if ([thisPresetDict1 objectForKey:@"ChildrenArray"])
- {
- NSEnumerator *enumerator = [[thisPresetDict1 objectForKey:@"ChildrenArray"] objectEnumerator];
- id tempObject;
- int iii = 0;
- while (tempObject = [enumerator nextObject])
- {
- if ([[tempObject objectForKey:@"Default"] intValue] != 1) // if not the default HB Preset, set to 0
- {
- [[[thisPresetDict1 objectForKey:@"ChildrenArray"] objectAtIndex:iii] setObject:[NSNumber numberWithInt:0] forKey:@"Default"];	
- }
- iii++;
- }
- }
- ii++;
- }
-
- }
- i++;
-	}
-
-
- int presetToModLevel = [fPresetsOutlineView levelForItem: [self selectedPreset]];
- NSDictionary *presetToMod = [self selectedPreset];
- NSDictionary *presetToModParent = [fPresetsOutlineView parentForItem: presetToMod];
-
-
- NSMutableArray *presetsArrayToMod;
- NSMutableArray *tempArray;
-
- /* If we are a root level preset, we are modding the UserPresets array */
- if (presetToModLevel == 0)
- {
- presetsArrayToMod = UserPresets;
- }
- else // We have a parent preset, so we modify the chidren array object for key
- {
- presetsArrayToMod = [presetToModParent objectForKey:@"ChildrenArray"]; 
- }
- 
- enumerator = [presetsArrayToMod objectEnumerator];
- tempArray = [NSMutableArray array];
- int iiii = 0;
- while (tempObject = [enumerator nextObject]) 
- {
- NSDictionary *thisPresetDict = tempObject;
- if (thisPresetDict == presetToMod)
- {
- if ([[tempObject objectForKey:@"Default"] intValue] != 1) // if not the default HB Preset, set to 2
- {
- [[presetsArrayToMod objectAtIndex:iiii] setObject:[NSNumber numberWithInt:2] forKey:@"Default"];	
- }
- }
- iiii++;
- }
- 
- 
- /* We save all of the preset data here */
- [self savePreset];
- /* We Reload the New Table data for presets */
- [fPresetsOutlineView reloadData];
+ [fPresetsView insertFolder:sender];
 }
 
-- (IBAction)selectDefaultPreset:(id)sender
+- (IBAction)selectPresetFromMenu:(id)sender
 {
-	NSMutableDictionary *presetToMod;
- /* if there is a user specified default, we use it */
-	if (presetUserDefault)
-	{
- presetToMod = presetUserDefault;
- }
-	else if (presetHbDefault) //else we use the built in default presetHbDefault
-	{
- presetToMod = presetHbDefault;
-	}
- else
- {
- return;
- }
- 
- if (presetUserDefaultParent != nil)
- {
- [fPresetsOutlineView expandItem:presetUserDefaultParent];
- 
- }
- if (presetUserDefaultParentParent != nil)
- {
- [fPresetsOutlineView expandItem:presetUserDefaultParentParent];
- 
- }
- 
- [fPresetsOutlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:[fPresetsOutlineView rowForItem: presetToMod]] byExtendingSelection:NO];
-	[self selectPreset:nil];
-}
-
-
-#pragma mark -
-#pragma mark Manage Built In Presets
-
-
-- (IBAction)deleteFactoryPresets:(id)sender
-{
- //int status;
- NSEnumerator *enumerator = [UserPresets objectEnumerator];
-	id tempObject;
- 
-	//NSNumber *index;
- NSMutableArray *tempArray;
-
-
- tempArray = [NSMutableArray array];
- /* we look here to see if the preset is we move on to the next one */
- while ( tempObject = [enumerator nextObject] ) 
-		{
-			/* if the preset is "Factory" then we put it in the array of
-			presets to delete */
-			if ([[tempObject objectForKey:@"Type"] intValue] == 0)
-			{
-				[tempArray addObject:tempObject];
-			}
- }
- 
- [UserPresets removeObjectsInArray:tempArray];
- [fPresetsOutlineView reloadData];
- [self savePreset]; 
+ // Retrieve the preset stored in the NSMenuItem
+ HBPreset *preset = [sender representedObject];
 
+ [self applyPreset:preset];
+ [fPresetsView setSelection:preset];
 }
 
- /* We use this method to recreate new, updated factory presets */
-- (IBAction)addFactoryPresets:(id)sender
+/**
+ * Adds the presets list to the menu.
+ */
+- (void)buildPresetsMenu
 {
- 
- /* First, we delete any existing built in presets */
- [self deleteFactoryPresets: sender];
- /* Then we generate new built in presets programmatically with fPresetsBuiltin
- * which is all setup in HBPresets.h and HBPresets.m*/
- [fPresetsBuiltin generateBuiltinPresets:UserPresets];
- /* update build number for built in presets */
- /* iterate though the new array of presets to import and add them to our presets array */
- int i = 0;
- NSEnumerator *enumerator = [UserPresets objectEnumerator];
- id tempObject;
- while (tempObject = [enumerator nextObject])
+ // First we remove all the preset menu items
+ // inserted previosly
+ NSArray *menuItems = [presetsMenu.itemArray copy];
+ for (NSMenuItem *item in menuItems)
 {
- /* Record the apps current build number in the PresetBuildNumber key */
- if ([[tempObject objectForKey:@"Type"] intValue] == 0) // Type 0 is a built in preset		
+ if (item.tag != -1)
 {
- /* Preset build number */
- [[UserPresets objectAtIndex:i] setObject:[NSNumber numberWithInt:[[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] intValue]] forKey:@"PresetBuildNumber"];
+ [presetsMenu removeItem:item];
 }
- i++;
 }
- /* report the built in preset updating to the activity log */
- [self writeToActivityLog: "built in presets updated to build number: %d", [[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] intValue]];
- 
- [self sortPresets];
- [self addPreset];
- 
-}
-
-#pragma mark -
-#pragma mark Chapter Files Import / Export
+ [menuItems release];
 
-- (IBAction) browseForChapterFile: (id) sender
-{
-	/* Open a panel to let the user choose the file */
-	NSOpenPanel * panel = [NSOpenPanel openPanel];
-	/* We get the current file name and path from the destination field here */
-	[panel beginSheetForDirectory: [NSString stringWithFormat:@"%@/",
- [[NSUserDefaults standardUserDefaults] stringForKey:@"LastDestinationDirectory"]]
- file: NULL
- types: [NSArray arrayWithObjects:@"csv",nil]
- modalForWindow: fWindow modalDelegate: self
- didEndSelector: @selector( browseForChapterFileDone:returnCode:contextInfo: )
- contextInfo: NULL];
-}
-
-- (void) browseForChapterFileDone: (NSOpenPanel *) sheet
- returnCode: (int) returnCode contextInfo: (void *) contextInfo
-{
- NSArray *chaptersArray; /* temp array for chapters */
-	NSMutableArray *chaptersMutableArray; /* temp array for chapters */
- NSString *chapterName; 	/* temp string from file */
- int chapters, i;
- 
- if( returnCode == NSOKButton ) /* if they click OK */
- {	
- chapterName = [[NSString alloc] initWithContentsOfFile:[sheet filename] encoding:NSUTF8StringEncoding error:NULL];
- chaptersArray = [chapterName componentsSeparatedByString:@"\n"];
- chaptersMutableArray= [chaptersArray mutableCopy];
-		chapters = [fChapterTitlesDelegate numberOfRowsInTableView:fChapterTable];
- if ([chaptersMutableArray count] > 0)
- { 
- /* if last item is empty remove it */
- if ([[chaptersMutableArray objectAtIndex:[chaptersArray count]-1] length] == 0)
- {
- [chaptersMutableArray removeLastObject];
- }
- }
- /* if chapters in table is not equal to array count */
- if ((unsigned int) chapters != [chaptersMutableArray count])
- {
- [sheet close];
- [[NSAlert alertWithMessageText:NSLocalizedString(@"Unable to load chapter file", @"Unable to load chapter file")
- defaultButton:NSLocalizedString(@"OK", @"OK")
- alternateButton:NULL 
- otherButton:NULL
- informativeTextWithFormat:NSLocalizedString(@"%d chapters expected, %d chapters found in %@", @"%d chapters expected, %d chapters found in %@"), 
- chapters, [chaptersMutableArray count], [[sheet filename] lastPathComponent]] runModal];
- return;
- }
-		/* otherwise, go ahead and populate table with array */
-		for (i=0; i<chapters; i++)
+ __block NSUInteger i = 0;
+ __block BOOL builtInEnded = NO;
+ [presetManager.root enumerateObjectsUsingBlock:^(id obj, NSIndexPath *idx, BOOL *stop)
+ {
+ if (idx.length)
 {
- 
- if([[chaptersMutableArray objectAtIndex:i] length] > 5)
- { 
- /* avoid a segfault */
- /* Get the Range.location of the first comma in the line and then put everything after that into chapterTitle */
- NSRange firstCommaRange = [[chaptersMutableArray objectAtIndex:i] rangeOfString:@","];
- NSString *chapterTitle = [[chaptersMutableArray objectAtIndex:i] substringFromIndex:firstCommaRange.location + 1];
- /* Since we store our chapterTitle commas as "\," for the cli, we now need to remove the escaping "\" from the title */
- chapterTitle = [chapterTitle stringByReplacingOccurrencesOfString:@"\\," withString:@","];
- [fChapterTitlesDelegate tableView:fChapterTable 
- setObjectValue:chapterTitle
- forTableColumn:fChapterTableNameColumn
- row:i];
- }
- else 
- {
- [sheet close];
- [[NSAlert alertWithMessageText:NSLocalizedString(@"Unable to load chapter file", @"Unable to load chapter file")
- defaultButton:NSLocalizedString(@"OK", @"OK")
- alternateButton:NULL 
- otherButton:NULL
- informativeTextWithFormat:NSLocalizedString(@"%@ was not formatted as expected.", @"%@ was not formatted as expected."), [[sheet filename] lastPathComponent]] runModal]; 
- [fChapterTable reloadData];
- return;
- }
- }
- [fChapterTable reloadData];
- }
-}
-
-- (IBAction) browseForChapterFileSave: (id) sender
-{
- NSSavePanel *panel = [NSSavePanel savePanel];
- /* Open a panel to let the user save to a file */
- [panel setAllowedFileTypes:[NSArray arrayWithObjects:@"csv",nil]];
- [panel beginSheetForDirectory: [[fDstFile2Field stringValue] stringByDeletingLastPathComponent] 
- file: [[[[fDstFile2Field stringValue] lastPathComponent] stringByDeletingPathExtension] 
- stringByAppendingString:@"-chapters.csv"]
- modalForWindow: fWindow 
- modalDelegate: self
- didEndSelector: @selector( browseForChapterFileSaveDone:returnCode:contextInfo: )
- contextInfo: NULL];
-}
+ NSMenuItem *item = [[NSMenuItem alloc] init];
+ item.title = [obj name];
+ item.tag = i++;
 
-- (void) browseForChapterFileSaveDone: (NSSavePanel *) sheet
- returnCode: (int) returnCode contextInfo: (void *) contextInfo
-{
- NSString *chapterName; /* pointer for string for later file-writing */
- NSString *chapterTitle;
- NSError *saveError = [[NSError alloc] init];
- int chapters, i; /* ints for the number of chapters in the table and the loop */
- 
- if( returnCode == NSOKButton ) /* if they clicked OK */
- {	
- chapters = [fChapterTitlesDelegate numberOfRowsInTableView:fChapterTable];
- chapterName = [NSString string];
- for (i=0; i<chapters; i++)
- {
- /* put each chapter title from the table into the array */
- if (i<9)
- { /* if i is from 0 to 8 (chapters 1 to 9) add two leading zeros */
- chapterName = [chapterName stringByAppendingFormat:@"00%d,",i+1];
- }
- else if (i<99)
- { /* if i is from 9 to 98 (chapters 10 to 99) add one leading zero */
- chapterName = [chapterName stringByAppendingFormat:@"0%d,",i+1];
- }
- else if (i<999)
- { /* in case i is from 99 to 998 (chapters 100 to 999) no leading zeros */
- chapterName = [chapterName stringByAppendingFormat:@"%d,",i+1];
- }
- 
- chapterTitle = [fChapterTitlesDelegate tableView:fChapterTable objectValueForTableColumn:fChapterTableNameColumn row:i];
- /* escape any commas in the chapter name with "\," */
- chapterTitle = [chapterTitle stringByReplacingOccurrencesOfString:@"," withString:@"\\,"];
- chapterName = [chapterName stringByAppendingString:chapterTitle];
- if (i+1 != chapters)
- { /* if not the last chapter */
- chapterName = [chapterName stringByAppendingString:@ "\n"];
+ // Set an action only to the actual presets,
+ // not on the folders.
+ if ([obj isLeaf])
+ {
+ item.action = @selector(selectPresetFromMenu:);
+ item.representedObject = obj;
+ }
+ // Make the default preset font bold.
+ if ([obj isDefault])
+ {
+ NSAttributedString *newTitle = [[NSAttributedString alloc] initWithString:[obj name]
+ attributes:@{NSFontAttributeName: [NSFont boldSystemFontOfSize:14]}];
+ [item setAttributedTitle:newTitle];
+ [newTitle release];
+ }
+ // Add a separator line after the last builtIn preset
+ if ([obj isBuiltIn] == NO && builtInEnded == NO)
+ {
+ [presetsMenu addItem:[NSMenuItem separatorItem]];
+ builtInEnded = YES;
 }
 
- 
- }
- /* try to write it to where the user wanted */
- if (![chapterName writeToFile:[sheet filename] 
- atomically:NO 
- encoding:NSUTF8StringEncoding 
- error:&saveError])
- {
- [sheet close];
- [[NSAlert alertWithError:saveError] runModal];
- }
- }
-}
-
-@end
-
-/*******************************
- * Subclass of the HBPresetsOutlineView *
- *******************************/
+ item.indentationLevel = idx.length - 1;
 
-@implementation HBPresetsOutlineView
-- (NSImage *)dragImageForRowsWithIndexes:(NSIndexSet *)dragRows tableColumns:(NSArray *)tableColumns event:(NSEvent*)dragEvent offset:(NSPointPointer)dragImageOffset
-{
- fIsDragging = YES;
-
- // By default, NSTableView only drags an image of the first column. Change this to
- // drag an image of the queue's icon and PresetName columns.
- NSArray * cols = [NSArray arrayWithObjects: [self tableColumnWithIdentifier:@"PresetName"], nil];
- return [super dragImageForRowsWithIndexes:dragRows tableColumns:cols event:dragEvent offset:dragImageOffset];
+ [presetsMenu addItem:item];
+ [item release];
+ }
+ }];
 }
 
-
-
-- (void) mouseDown:(NSEvent *)theEvent
+/**
+ * We use this method to recreate new, updated factory presets
+ */
+- (IBAction)addFactoryPresets:(id)sender
 {
- [super mouseDown:theEvent];
-	fIsDragging = NO;
+ [presetManager generateBuiltInPresets];
 }
 
-
-
-- (BOOL) isDragging;
-{
- return fIsDragging;
-}
 @end
-
-
-

HandBrake-0.9.9.tar.bz2/macosx/DockTextField.m -> HandBrake-0.10.0.tar.bz2/macosx/DockTextField.m Changed

HandBrake-0.9.9.tar.bz2/macosx/English.lproj/AdvancedView.xib -> HandBrake-0.10.0.tar.bz2/macosx/English.lproj/AdvancedView.xib Changed

@@ -1,4174 +1,596 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">11C74</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1138.23</string>
-		<string key="IBDocument.HIToolboxVersion">567.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1938</string>
-		</object>
-		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSPopUpButton</string>
-			<string>NSMenuItem</string>
-			<string>NSMenu</string>
-			<string>NSTextFieldCell</string>
-			<string>NSButtonCell</string>
-			<string>NSButton</string>
-			<string>NSSlider</string>
-			<string>NSSliderCell</string>
-			<string>NSCustomView</string>
-			<string>NSCustomObject</string>
-			<string>NSPopUpButtonCell</string>
-			<string>NSTextField</string>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="658768339">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="674763238">
-				<string key="NSClassName">HBAdvancedController</string>
-			</object>
-			<object class="NSCustomObject" id="670200792">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="620160606">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomView" id="738514360">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">256</int>
-				<object class="NSMutableArray" key="NSSubviews">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSTextField" id="297485972">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{298, 275}, {61, 14}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="496835891"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="225631881">
-							<int key="NSCellFlags">68288064</int>
-							<int key="NSCellFlags2">272630784</int>
-							<string key="NSContents">Analysis</string>
-							<object class="NSFont" key="NSSupport" id="755377161">
-								<string key="NSName">LucidaGrande-Bold</string>
-								<double key="NSSize">11</double>
-								<int key="NSfFlags">16</int>
-							</object>
-							<reference key="NSControlView" ref="297485972"/>
-							<object class="NSColor" key="NSBackgroundColor" id="1006136775">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">controlColor</string>
-								<object class="NSColor" key="NSColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-								</object>
-							</object>
-							<object class="NSColor" key="NSTextColor" id="555417541">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">controlTextColor</string>
-								<object class="NSColor" key="NSColor" id="534207422">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MAA</bytes>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSTextField" id="120436311">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{1, 275}, {66, 14}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="297485972"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="571635509">
-							<int key="NSCellFlags">68288064</int>
-							<int key="NSCellFlags2">272630784</int>
-							<string key="NSContents">Encoding</string>
-							<reference key="NSSupport" ref="755377161"/>
-							<reference key="NSControlView" ref="120436311"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="933060176">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{1, 128}, {91, 14}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="677509567"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="236903504">
-							<int key="NSCellFlags">68288064</int>
-							<int key="NSCellFlags2">272630784</int>
-							<string key="NSContents">Psychovisual</string>
-							<reference key="NSSupport" ref="755377161"/>
-							<reference key="NSControlView" ref="933060176"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="742215576">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{124, 151}, {97, 15}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="933060176"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="821448906">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">264704</int>
-							<object class="NSFont" key="NSSupport" id="22">
-								<string key="NSName">LucidaGrande</string>
-								<double key="NSSize">9</double>
-								<int key="NSfFlags">3614</int>
-							</object>
-							<reference key="NSControlView" ref="742215576"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">1</int>
-							<reference key="NSAlternateImage" ref="22"/>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="1001978608">
-								<reference key="NSMenu" ref="278489647"/>
-								<string key="NSTitle">Item1</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<object class="NSCustomResource" key="NSOnImage" id="934680330">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSMenuCheckmark</string>
-								</object>
-								<object class="NSCustomResource" key="NSMixedImage" id="962234898">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSMenuMixedState</string>
-								</object>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="821448906"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="278489647">
-								<object class="NSMutableString" key="NSTitle">
-									<characters key="NS.bytes">OtherViews</characters>
-								</object>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<reference ref="1001978608"/>
-									<object class="NSMenuItem" id="101526218">
-										<reference key="NSMenu" ref="278489647"/>
-										<string key="NSTitle">Item2</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="821448906"/>
-									</object>
-									<object class="NSMenuItem" id="447058849">
-										<reference key="NSMenu" ref="278489647"/>
-										<string key="NSTitle">Item3</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="821448906"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSPreferredEdge">3</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">1</int>
-						</object>
-					</object>
-					<object class="NSTextField" id="500710129">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{333, 107}, {116, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="938870755"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="316938196">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71434240</int>
-							<string key="NSContents">Adaptive Quantization:</string>
-							<object class="NSFont" key="NSSupport" id="826935898">
-								<string key="NSName">LucidaGrande</string>
-								<double key="NSSize">10</double>
-								<int key="NSfFlags">2843</int>
-							</object>
-							<reference key="NSControlView" ref="500710129"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSSlider" id="938870755">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{454, 105}, {146, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="529644976"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSSliderCell" key="NSCell" id="152220780">
-							<int key="NSCellFlags">-2079981824</int>
-							<int key="NSCellFlags2">262144</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="22"/>
-							<reference key="NSControlView" ref="938870755"/>
-							<double key="NSMaxValue">1</double>
-							<double key="NSMinValue">0.0</double>
-							<double key="NSValue">0.0</double>
-							<double key="NSAltIncValue">0.0</double>
-							<int key="NSNumberOfTickMarks">11</int>
-							<int key="NSTickMarkPosition">0</int>
-							<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
-							<bool key="NSVertical">NO</bool>
-						</object>
-					</object>
-					<object class="NSTextField" id="594030759">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{18, 170}, {102, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="390676982"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="790451247">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71434240</int>
-							<string key="NSContents">Weighted P-Frames:</string>
-							<reference key="NSSupport" ref="826935898"/>
-							<reference key="NSControlView" ref="594030759"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSButton" id="390676982">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{122, 172}, {22, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="9309938"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="528921925">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">131072</int>
-							<string key="NSContents"/>
-							<object class="NSFont" key="NSSupport" id="26">
-								<string key="NSName">LucidaGrande</string>
-								<double key="NSSize">11</double>
-								<int key="NSfFlags">3100</int>
-							</object>
-							<reference key="NSControlView" ref="390676982"/>
-							<int key="NSButtonFlags">1211912703</int>
-							<int key="NSButtonFlags2">2</int>
-							<object class="NSButtonImageSource" key="NSAlternateImage" id="534293989">
-								<string key="NSImageName">NSSwitch</string>
-							</object>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="502806021">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{124, 256}, {97, 15}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="965170034"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="928228060">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">264192</int>
-							<reference key="NSSupport" ref="22"/>
-							<reference key="NSControlView" ref="502806021"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">1</int>
-							<reference key="NSAlternateImage" ref="22"/>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="675281532">
-								<reference key="NSMenu" ref="302593572"/>
-								<string key="NSTitle">Item1</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="934680330"/>
-								<reference key="NSMixedImage" ref="962234898"/>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="928228060"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="302593572">
-								<object class="NSMutableString" key="NSTitle">
-									<characters key="NS.bytes">OtherViews</characters>
-								</object>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<reference ref="675281532"/>
-									<object class="NSMenuItem" id="381221882">
-										<reference key="NSMenu" ref="302593572"/>
-										<string key="NSTitle">Item2</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="928228060"/>
-									</object>
-									<object class="NSMenuItem" id="473757651">
-										<reference key="NSMenu" ref="302593572"/>
-										<string key="NSTitle">Item3</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="928228060"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSPreferredEdge">3</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">1</int>
-						</object>
-					</object>
-					<object class="NSTextField" id="496835891">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{26, 254}, {94, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="502806021"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="621289166">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71434240</int>
-							<string key="NSContents">Reference Frames:</string>
-							<reference key="NSSupport" ref="826935898"/>
-							<reference key="NSControlView" ref="496835891"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="444018704">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{15, 233}, {105, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="463613064"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="660394934">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Maximum B-Frames:</string>
-							<reference key="NSSupport" ref="826935898"/>
-							<reference key="NSControlView" ref="444018704"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="965170034">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{349, 254}, {100, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="646401135"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="517356884">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Adaptive B-Frames:</string>
-							<reference key="NSSupport" ref="826935898"/>
-							<reference key="NSControlView" ref="965170034"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="463613064">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{124, 235}, {97, 15}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="751714853"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="67902101">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">264704</int>
-							<reference key="NSSupport" ref="22"/>
-							<reference key="NSControlView" ref="463613064"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">1</int>
-							<reference key="NSAlternateImage" ref="22"/>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="817763274">
-								<reference key="NSMenu" ref="735303444"/>
-								<string key="NSTitle">Item1</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="934680330"/>
-								<reference key="NSMixedImage" ref="962234898"/>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="67902101"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="735303444">
-								<object class="NSMutableString" key="NSTitle">
-									<characters key="NS.bytes">OtherViews</characters>
-								</object>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<reference ref="817763274"/>
-									<object class="NSMenuItem" id="604338719">
-										<reference key="NSMenu" ref="735303444"/>
-										<string key="NSTitle">Item2</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="67902101"/>
-									</object>
-									<object class="NSMenuItem" id="704690128">
-										<reference key="NSMenu" ref="735303444"/>
-										<string key="NSTitle">Item3</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="67902101"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSPreferredEdge">3</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">1</int>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="646401135">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{453, 256}, {149, 15}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="516451639"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="468935027">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">264704</int>
-							<reference key="NSSupport" ref="22"/>
-							<reference key="NSControlView" ref="646401135"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">1</int>
-							<object class="NSFont" key="NSAlternateImage" id="892021687">
-								<string key="NSName">LucidaGrande</string>
-								<double key="NSSize">9</double>
-								<int key="NSfFlags">16</int>
-							</object>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="84181884">
-								<reference key="NSMenu" ref="884041487"/>
-								<string key="NSTitle">Item1</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="934680330"/>
-								<reference key="NSMixedImage" ref="962234898"/>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="468935027"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="884041487">
-								<object class="NSMutableString" key="NSTitle">
-									<characters key="NS.bytes">OtherViews</characters>
-								</object>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<reference ref="84181884"/>
-									<object class="NSMenuItem" id="148376841">
-										<reference key="NSMenu" ref="884041487"/>
-										<string key="NSTitle">Item2</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="468935027"/>
-									</object>
-									<object class="NSMenuItem" id="425106023">
-										<reference key="NSMenu" ref="884041487"/>
-										<string key="NSTitle">Item3</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="468935027"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSPreferredEdge">3</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">1</int>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="1012635724">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{453, 193}, {149, 15}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="594030759"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="597433555">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">264192</int>
-							<reference key="NSSupport" ref="22"/>
-							<reference key="NSControlView" ref="1012635724"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">1</int>
-							<reference key="NSAlternateImage" ref="892021687"/>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="138849732">
-								<reference key="NSMenu" ref="418397244"/>
-								<string key="NSTitle">Item1</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="934680330"/>
-								<reference key="NSMixedImage" ref="962234898"/>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="597433555"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="418397244">
-								<object class="NSMutableString" key="NSTitle">
-									<characters key="NS.bytes">OtherViews</characters>
-								</object>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<reference ref="138849732"/>
-									<object class="NSMenuItem" id="87174157">
-										<reference key="NSMenu" ref="418397244"/>
-										<string key="NSTitle">Item2</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="597433555"/>
-									</object>
-									<object class="NSMenuItem" id="193116813">
-										<reference key="NSMenu" ref="418397244"/>
-										<string key="NSTitle">Item3</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="597433555"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSPreferredEdge">3</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">1</int>
-						</object>
-					</object>
-					<object class="NSTextField" id="34095372">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{720, 233}, {37, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="907540673"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="368733355">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Trellis:</string>
-							<reference key="NSSupport" ref="826935898"/>
-							<reference key="NSControlView" ref="34095372"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="677509567">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{17, 107}, {103, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="140207359"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="652898624">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">No DCT Decimation:</string>
-							<reference key="NSSupport" ref="826935898"/>
-							<reference key="NSControlView" ref="677509567"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="862092551">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{4, 0}, {882, 34}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="456227852">
-							<int key="NSCellFlags">-1805517311</int>
-							<int key="NSCellFlags2">272760832</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="862092551"/>
-							<bool key="NSDrawsBackground">YES</bool>
-							<object class="NSColor" key="NSBackgroundColor" id="649660579">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">textBackgroundColor</string>
-								<object class="NSColor" key="NSColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MQA</bytes>
-								</object>
-							</object>
-							<object class="NSColor" key="NSTextColor" id="726854009">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">textColor</string>
-								<reference key="NSColor" ref="534207422"/>
-							</object>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="463632258">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{453, 214}, {149, 15}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="180296347"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="1015322159">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">264704</int>
-							<reference key="NSSupport" ref="22"/>
-							<reference key="NSControlView" ref="463632258"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">1</int>
-							<reference key="NSAlternateImage" ref="892021687"/>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="355405826">
-								<reference key="NSMenu" ref="4652010"/>
-								<string key="NSTitle">Item1</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="934680330"/>
-								<reference key="NSMixedImage" ref="962234898"/>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="1015322159"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="4652010">
-								<object class="NSMutableString" key="NSTitle">
-									<characters key="NS.bytes">OtherViews</characters>
-								</object>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<reference ref="355405826"/>
-									<object class="NSMenuItem" id="623541927">
-										<reference key="NSMenu" ref="4652010"/>
-										<string key="NSTitle">Item2</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="1015322159"/>
-									</object>
-									<object class="NSMenuItem" id="716695777">
-										<reference key="NSMenu" ref="4652010"/>
-										<string key="NSTitle">Item3</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="1015322159"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSPreferredEdge">3</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">1</int>
-						</object>
-					</object>
-					<object class="NSTextField" id="501486901">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{314, 212}, {135, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="463632258"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="523579964">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Motion Estimation Method:</string>
-							<reference key="NSSupport" ref="826935898"/>
-							<reference key="NSControlView" ref="501486901"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="9309938">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{320, 170}, {129, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="108597901"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="625397549">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71434240</int>
-							<string key="NSContents">Motion Estimation Range:</string>
-							<reference key="NSSupport" ref="826935898"/>
-							<reference key="NSControlView" ref="9309938"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="108597901">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{453, 172}, {149, 15}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="34260806"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="1015445713">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">264704</int>
-							<reference key="NSSupport" ref="22"/>
-							<reference key="NSControlView" ref="108597901"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">1</int>
-							<reference key="NSAlternateImage" ref="892021687"/>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="664014443">
-								<reference key="NSMenu" ref="945504605"/>
-								<string key="NSTitle">Item1</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="934680330"/>
-								<reference key="NSMixedImage" ref="962234898"/>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="1015445713"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="945504605">
-								<object class="NSMutableString" key="NSTitle">
-									<characters key="NS.bytes">OtherViews</characters>
-								</object>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<reference ref="664014443"/>
-									<object class="NSMenuItem" id="42097014">
-										<reference key="NSMenu" ref="945504605"/>
-										<string key="NSTitle">Item2</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="1015445713"/>
-									</object>
-									<object class="NSMenuItem" id="712570706">
-										<reference key="NSMenu" ref="945504605"/>
-										<string key="NSTitle">Item3</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="1015445713"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSPreferredEdge">3</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">1</int>
-						</object>
-					</object>
-					<object class="NSTextField" id="335373847">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{298, 191}, {151, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="1012635724"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="492298910">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71434240</int>
-							<string key="NSContents">Subpixel ME &amp; Mode Decision:</string>
-							<reference key="NSSupport" ref="826935898"/>
-							<reference key="NSControlView" ref="335373847"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="34260806">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{15, 149}, {105, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="742215576"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="124098371">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71434240</int>
-							<string key="NSContents">Pyramidal B-Frames:</string>
-							<reference key="NSSupport" ref="826935898"/>
-							<reference key="NSControlView" ref="34260806"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="777985871">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{304, 86}, {145, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="734910001"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="996811218">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71434240</int>
-							<string key="NSContents">Psychovisual Rate Distortion:</string>
-							<reference key="NSSupport" ref="826935898"/>
-							<reference key="NSControlView" ref="777985871"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="751714853">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{337, 233}, {112, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="1028233887"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="651032081">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Adaptive Direct Mode:</string>
-							<reference key="NSSupport" ref="826935898"/>
-							<reference key="NSControlView" ref="751714853"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="1028233887">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{453, 235}, {149, 15}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="34095372"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="96368274">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">264704</int>
-							<reference key="NSSupport" ref="22"/>
-							<reference key="NSControlView" ref="1028233887"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">1</int>
-							<reference key="NSAlternateImage" ref="892021687"/>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="551923619">
-								<reference key="NSMenu" ref="359920682"/>
-								<string key="NSTitle">Item1</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="934680330"/>
-								<reference key="NSMixedImage" ref="962234898"/>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="96368274"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="359920682">
-								<object class="NSMutableString" key="NSTitle">
-									<characters key="NS.bytes">OtherViews</characters>
-								</object>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<reference ref="551923619"/>
-									<object class="NSMenuItem" id="1005011526">
-										<reference key="NSMenu" ref="359920682"/>
-										<string key="NSTitle">Item2</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="96368274"/>
-									</object>
-									<object class="NSMenuItem" id="836668078">
-										<reference key="NSMenu" ref="359920682"/>
-										<string key="NSTitle">Item3</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="96368274"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSPreferredEdge">3</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">1</int>
-						</object>
-					</object>
-					<object class="NSTextField" id="498769415">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{1, 42}, {221, 17}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="862092551"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="492969921">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">272629760</int>
-							<string key="NSContents">Current x264 Advanced Option String:</string>
-							<reference key="NSSupport" ref="755377161"/>
-							<reference key="NSControlView" ref="498769415"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="130462646">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{758, 109}, {130, 15}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="777985871"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="1069442299">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">263680</int>
-							<reference key="NSSupport" ref="22"/>
-							<reference key="NSControlView" ref="130462646"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">1</int>
-							<reference key="NSAlternateImage" ref="22"/>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="259498980">
-								<reference key="NSMenu" ref="155689363"/>
-								<string key="NSTitle">Item1</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="934680330"/>
-								<reference key="NSMixedImage" ref="962234898"/>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="1069442299"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="155689363">
-								<object class="NSMutableString" key="NSTitle">
-									<characters key="NS.bytes">OtherViews</characters>
-								</object>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<reference ref="259498980"/>
-									<object class="NSMenuItem" id="736037090">
-										<reference key="NSMenu" ref="155689363"/>
-										<string key="NSTitle">Item2</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="1069442299"/>
-									</object>
-									<object class="NSMenuItem" id="354770588">
-										<reference key="NSMenu" ref="155689363"/>
-										<string key="NSTitle">Item3</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="1069442299"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSPreferredEdge">3</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">1</int>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="497968468">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{758, 88}, {130, 15}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="149148764"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="691127886">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">263680</int>
-							<reference key="NSSupport" ref="22"/>
-							<reference key="NSControlView" ref="497968468"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">1</int>
-							<reference key="NSAlternateImage" ref="22"/>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="286317196">
-								<reference key="NSMenu" ref="1069179379"/>
-								<string key="NSTitle">Item1</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="934680330"/>
-								<reference key="NSMixedImage" ref="962234898"/>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="691127886"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="1069179379">
-								<object class="NSMutableString" key="NSTitle">
-									<characters key="NS.bytes">OtherViews</characters>
-								</object>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<reference ref="286317196"/>
-									<object class="NSMenuItem" id="847739510">
-										<reference key="NSMenu" ref="1069179379"/>
-										<string key="NSTitle">Item2</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="691127886"/>
-									</object>
-									<object class="NSMenuItem" id="413956336">
-										<reference key="NSMenu" ref="1069179379"/>
-										<string key="NSTitle">Item3</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="691127886"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSPreferredEdge">3</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">1</int>
-						</object>
-					</object>
-					<object class="NSTextField" id="529644976">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{695, 107}, {62, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="130462646"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="343844477">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Deblocking:</string>
-							<reference key="NSSupport" ref="826935898"/>
-							<reference key="NSControlView" ref="529644976"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSButton" id="140207359">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{122, 109}, {22, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="500710129"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="401971973">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">131072</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="140207359"/>
-							<int key="NSButtonFlags">1211912703</int>
-							<int key="NSButtonFlags2">2</int>
-							<reference key="NSAlternateImage" ref="534293989"/>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="907540673">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{758, 235}, {130, 15}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="5114506"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="804220802">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">264192</int>
-							<reference key="NSSupport" ref="22"/>
-							<reference key="NSControlView" ref="907540673"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">1</int>
-							<reference key="NSAlternateImage" ref="22"/>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="169170697">
-								<reference key="NSMenu" ref="869830194"/>
-								<string key="NSTitle">Item1</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="934680330"/>
-								<reference key="NSMixedImage" ref="962234898"/>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="804220802"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="869830194">
-								<object class="NSMutableString" key="NSTitle">
-									<characters key="NS.bytes">OtherViews</characters>
-								</object>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<reference ref="169170697"/>
-									<object class="NSMenuItem" id="1070100923">
-										<reference key="NSMenu" ref="869830194"/>
-										<string key="NSTitle">Item2</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="804220802"/>
-									</object>
-									<object class="NSMenuItem" id="6137744">
-										<reference key="NSMenu" ref="869830194"/>
-										<string key="NSTitle">Item3</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="804220802"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSPreferredEdge">3</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">1</int>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="473093704">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{758, 256}, {130, 15}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="444018704"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="572444645">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">264704</int>
-							<reference key="NSSupport" ref="22"/>
-							<reference key="NSControlView" ref="473093704"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">1</int>
-							<reference key="NSAlternateImage" ref="22"/>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="894119487">
-								<reference key="NSMenu" ref="838480608"/>
-								<string key="NSTitle">Item1</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="934680330"/>
-								<reference key="NSMixedImage" ref="962234898"/>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="572444645"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="838480608">
-								<object class="NSMutableString" key="NSTitle">
-									<characters key="NS.bytes">OtherViews</characters>
-								</object>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<reference ref="894119487"/>
-									<object class="NSMenuItem" id="946029370">
-										<reference key="NSMenu" ref="838480608"/>
-										<string key="NSTitle">Item2</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="572444645"/>
-									</object>
-									<object class="NSMenuItem" id="19515960">
-										<reference key="NSMenu" ref="838480608"/>
-										<string key="NSTitle">Item3</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="934680330"/>
-										<reference key="NSMixedImage" ref="962234898"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="572444645"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSPreferredEdge">3</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">1</int>
-						</object>
-					</object>
-					<object class="NSTextField" id="516451639">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{674, 254}, {83, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="473093704"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="562573539">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71434240</int>
-							<string key="NSContents">Partition Types:</string>
-							<reference key="NSSupport" ref="826935898"/>
-							<reference key="NSControlView" ref="516451639"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSButton" id="526934709">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{122, 193}, {22, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="335373847"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="273314683">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">131072</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="526934709"/>
-							<int key="NSButtonFlags">1211912703</int>
-							<int key="NSButtonFlags2">2</int>
-							<reference key="NSAlternateImage" ref="534293989"/>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-					</object>
-					<object class="NSTextField" id="180296347">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{40, 191}, {80, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="526934709"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="495611013">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71434240</int>
-							<string key="NSContents">8x8 Transform:</string>
-							<reference key="NSSupport" ref="826935898"/>
-							<reference key="NSControlView" ref="180296347"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSButton" id="612818913">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{122, 214}, {22, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="501486901"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="12489527">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">131072</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="612818913"/>
-							<int key="NSButtonFlags">1211912703</int>
-							<int key="NSButtonFlags2">2</int>
-							<reference key="NSAlternateImage" ref="534293989"/>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-					</object>
-					<object class="NSTextField" id="5114506">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{1, 212}, {119, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="612818913"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="894602850">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71565312</int>
-							<string key="NSContents">CABAC Entropy Coding:</string>
-							<reference key="NSSupport" ref="826935898"/>
-							<reference key="NSControlView" ref="5114506"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSSlider" id="734910001">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{454, 84}, {146, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="497968468"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSSliderCell" key="NSCell" id="737375773">
-							<int key="NSCellFlags">-2079981824</int>
-							<int key="NSCellFlags2">262144</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="22"/>
-							<reference key="NSControlView" ref="734910001"/>
-							<double key="NSMaxValue">1</double>
-							<double key="NSMinValue">0.0</double>
-							<double key="NSValue">1</double>
-							<double key="NSAltIncValue">0.0</double>
-							<int key="NSNumberOfTickMarks">11</int>
-							<int key="NSTickMarkPosition">0</int>
-							<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
-							<bool key="NSVertical">NO</bool>
-						</object>
-					</object>
-					<object class="NSTextField" id="149148764">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{347, 65}, {102, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="747005200"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="950560055">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71434240</int>
-							<string key="NSContents">Psychovisual Trellis:</string>
-							<reference key="NSSupport" ref="826935898"/>
-							<reference key="NSControlView" ref="149148764"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSSlider" id="747005200">
-						<reference key="NSNextResponder" ref="738514360"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{454, 63}, {146, 16}}</string>
-						<reference key="NSSuperview" ref="738514360"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="498769415"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSSliderCell" key="NSCell" id="148673163">
-							<int key="NSCellFlags">-2079981824</int>
-							<int key="NSCellFlags2">262144</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="22"/>
-							<reference key="NSControlView" ref="747005200"/>
-							<double key="NSMaxValue">1</double>
-							<double key="NSMinValue">0.0</double>
-							<double key="NSValue">0.0</double>
-							<double key="NSAltIncValue">0.0</double>
-							<int key="NSNumberOfTickMarks">11</int>
-							<int key="NSTickMarkPosition">0</int>
-							<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
-							<bool key="NSVertical">NO</bool>
-						</object>
-					</object>
-				</object>
-				<string key="NSFrameSize">{906, 290}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="120436311"/>
-				<string key="NSClassName">NSView</string>
-				<string key="NSExtension">NSResponder</string>
-			</object>
-			<object class="NSCustomView" id="679064762">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">256</int>
-				<object class="NSMutableArray" key="NSSubviews">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSTextField" id="1067360024">
-						<reference key="NSNextResponder" ref="679064762"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{199, 137}, {509, 17}}</string>
-						<reference key="NSSuperview" ref="679064762"/>
-						<reference key="NSWindow"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="168605488">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">138412032</int>
-							<string key="NSContents">HandBrake Does Not Support Advanced Theora Options</string>
-							<reference key="NSSupport" ref="755377161"/>
-							<reference key="NSControlView" ref="1067360024"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="522658278">
-						<reference key="NSNextResponder" ref="679064762"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{1, 42}, {888, 17}}</string>
-						<reference key="NSSuperview" ref="679064762"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="489160988"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="246337895">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">272629760</int>
-							<string key="NSContents">Current FFmpeg Advanced Option String:</string>
-							<reference key="NSSupport" ref="755377161"/>
-							<reference key="NSControlView" ref="522658278"/>
-							<reference key="NSBackgroundColor" ref="1006136775"/>
-							<reference key="NSTextColor" ref="555417541"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="489160988">
-						<reference key="NSNextResponder" ref="679064762"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{4, 0}, {882, 34}}</string>
-						<reference key="NSSuperview" ref="679064762"/>
-						<reference key="NSWindow"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="1037223262">
-							<int key="NSCellFlags">-1805517311</int>
-							<int key="NSCellFlags2">272760832</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="489160988"/>
-							<bool key="NSDrawsBackground">YES</bool>
-							<reference key="NSBackgroundColor" ref="649660579"/>
-							<reference key="NSTextColor" ref="726854009"/>
-						</object>
-					</object>
-				</object>
-				<string key="NSFrameSize">{906, 290}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="522658278"/>
-				<object class="NSMutableString" key="NSClassName">
-					<characters key="NS.bytes">NSView</characters>
-				</object>
-				<string key="NSExtension">NSResponder</string>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDisplayX264Options</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="862092551"/>
-					</object>
-					<int key="connectionID">191</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDisplayX264OptionsLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="498769415"/>
-					</object>
-					<int key="connectionID">192</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsSet:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="862092551"/>
-					</object>
-					<int key="connectionID">193</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optView</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="738514360"/>
-					</object>
-					<int key="connectionID">194</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264opt8x8dctSwitch</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="526934709"/>
-					</object>
-					<int key="connectionID">195</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264opt8x8dctLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="180296347"/>
-					</object>
-					<int key="connectionID">196</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optAlphaDeblockPopUp</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="130462646"/>
-					</object>
-					<int key="connectionID">197</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optBetaDeblockPopUp</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="497968468"/>
-					</object>
-					<int key="connectionID">198</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optAnalyseLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="516451639"/>
-					</object>
-					<int key="connectionID">199</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optAnalysePopUp</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="473093704"/>
-					</object>
-					<int key="connectionID">200</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optBframesPopUp</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="463613064"/>
-					</object>
-					<int key="connectionID">201</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optBframesLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="444018704"/>
-					</object>
-					<int key="connectionID">202</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optBPyramidLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="34260806"/>
-					</object>
-					<int key="connectionID">206</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optCabacSwitch</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="612818913"/>
-					</object>
-					<int key="connectionID">209</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optCabacLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="5114506"/>
-					</object>
-					<int key="connectionID">210</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optDeblockLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="529644976"/>
-					</object>
-					<int key="connectionID">211</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optDirectPredPopUp</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="1028233887"/>
-					</object>
-					<int key="connectionID">212</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optDirectPredLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="751714853"/>
-					</object>
-					<int key="connectionID">213</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optMERangePopUp</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="108597901"/>
-					</object>
-					<int key="connectionID">218</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optMERangeLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="9309938"/>
-					</object>
-					<int key="connectionID">219</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optMotionEstPopUp</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="463632258"/>
-					</object>
-					<int key="connectionID">220</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optMotionEstLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="501486901"/>
-					</object>
-					<int key="connectionID">221</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optNodctdcmtLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="677509567"/>
-					</object>
-					<int key="connectionID">224</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optNodctdcmtSwitch</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="140207359"/>
-					</object>
-					<int key="connectionID">225</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optRefPopUp</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="502806021"/>
-					</object>
-					<int key="connectionID">226</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optRefLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="496835891"/>
-					</object>
-					<int key="connectionID">227</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optSubmePopUp</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="1012635724"/>
-					</object>
-					<int key="connectionID">228</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optSubmeLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="335373847"/>
-					</object>
-					<int key="connectionID">229</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optTrellisPopUp</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="907540673"/>
-					</object>
-					<int key="connectionID">230</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optTrellisLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="34095372"/>
-					</object>
-					<int key="connectionID">231</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="502806021"/>
-					</object>
-					<int key="connectionID">235</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="463613064"/>
-					</object>
-					<int key="connectionID">237</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="1028233887"/>
-					</object>
-					<int key="connectionID">238</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="463632258"/>
-					</object>
-					<int key="connectionID">243</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="108597901"/>
-					</object>
-					<int key="connectionID">244</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="1012635724"/>
-					</object>
-					<int key="connectionID">245</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="473093704"/>
-					</object>
-					<int key="connectionID">246</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="526934709"/>
-					</object>
-					<int key="connectionID">247</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="130462646"/>
-					</object>
-					<int key="connectionID">248</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="497968468"/>
-					</object>
-					<int key="connectionID">249</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="907540673"/>
-					</object>
-					<int key="connectionID">250</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="140207359"/>
-					</object>
-					<int key="connectionID">252</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="612818913"/>
-					</object>
-					<int key="connectionID">253</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fEmptyView</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="679064762"/>
-					</object>
-					<int key="connectionID">256</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optPsyRDLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="777985871"/>
-					</object>
-					<int key="connectionID">386</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optPsyRDSlider</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="734910001"/>
-					</object>
-					<int key="connectionID">387</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optPsyTrellisLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="149148764"/>
-					</object>
-					<int key="connectionID">392</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optPsyTrellisSlider</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="747005200"/>
-					</object>
-					<int key="connectionID">393</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="734910001"/>
-					</object>
-					<int key="connectionID">394</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="747005200"/>
-					</object>
-					<int key="connectionID">395</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optBAdaptLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="965170034"/>
-					</object>
-					<int key="connectionID">404</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optBAdaptPopUp</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="646401135"/>
-					</object>
-					<int key="connectionID">405</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="646401135"/>
-					</object>
-					<int key="connectionID">406</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="390676982"/>
-					</object>
-					<int key="connectionID">411</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optWeightPLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="594030759"/>
-					</object>
-					<int key="connectionID">413</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optWeightPSwitch</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="390676982"/>
-					</object>
-					<int key="connectionID">414</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="938870755"/>
-					</object>
-					<int key="connectionID">424</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optAqSlider</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="938870755"/>
-					</object>
-					<int key="connectionID">425</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optAqLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="500710129"/>
-					</object>
-					<int key="connectionID">426</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsChanged:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="742215576"/>
-					</object>
-					<int key="connectionID">433</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264optBPyramidPopUp</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="742215576"/>
-					</object>
-					<int key="connectionID">434</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">X264AdvancedOptionsSet:</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="489160988"/>
-					</object>
-					<int key="connectionID">452</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDisplayLavcOptions</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="489160988"/>
-					</object>
-					<int key="connectionID">455</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDisplayLavcOptionsLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="522658278"/>
-					</object>
-					<int key="connectionID">456</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDisplayTheoraOptionsLabel</string>
-						<reference key="source" ref="674763238"/>
-						<reference key="destination" ref="1067360024"/>
-					</object>
-					<int key="connectionID">459</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="0">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="658768339"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="674763238"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="670200792"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="620160606"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="738514360"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="502806021"/>
-							<reference ref="496835891"/>
-							<reference ref="444018704"/>
-							<reference ref="463613064"/>
-							<reference ref="463632258"/>
-							<reference ref="501486901"/>
-							<reference ref="9309938"/>
-							<reference ref="108597901"/>
-							<reference ref="335373847"/>
-							<reference ref="390676982"/>
-							<reference ref="594030759"/>
-							<reference ref="5114506"/>
-							<reference ref="612818913"/>
-							<reference ref="180296347"/>
-							<reference ref="526934709"/>
-							<reference ref="34260806"/>
-							<reference ref="473093704"/>
-							<reference ref="907540673"/>
-							<reference ref="34095372"/>
-							<reference ref="516451639"/>
-							<reference ref="747005200"/>
-							<reference ref="149148764"/>
-							<reference ref="734910001"/>
-							<reference ref="777985871"/>
-							<reference ref="938870755"/>
-							<reference ref="500710129"/>
-							<reference ref="742215576"/>
-							<reference ref="646401135"/>
-							<reference ref="965170034"/>
-							<reference ref="1028233887"/>
-							<reference ref="751714853"/>
-							<reference ref="933060176"/>
-							<reference ref="297485972"/>
-							<reference ref="120436311"/>
-							<reference ref="862092551"/>
-							<reference ref="529644976"/>
-							<reference ref="497968468"/>
-							<reference ref="130462646"/>
-							<reference ref="140207359"/>
-							<reference ref="677509567"/>
-							<reference ref="498769415"/>
-							<reference ref="1012635724"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">x264</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="502806021"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="928228060"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="496835891"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="621289166"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="444018704"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="660394934"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="463613064"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="67902101"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">18</int>
-						<reference key="object" ref="1012635724"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="597433555"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">23</int>
-						<reference key="object" ref="34095372"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="368733355"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">24</int>
-						<reference key="object" ref="677509567"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="652898624"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">30</int>
-						<reference key="object" ref="862092551"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="456227852"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">32</int>
-						<reference key="object" ref="463632258"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1015322159"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">37</int>
-						<reference key="object" ref="501486901"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="523579964"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">38</int>
-						<reference key="object" ref="9309938"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="625397549"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">39</int>
-						<reference key="object" ref="108597901"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1015445713"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">44</int>
-						<reference key="object" ref="335373847"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="492298910"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">46</int>
-						<reference key="object" ref="34260806"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="124098371"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">49</int>
-						<reference key="object" ref="751714853"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="651032081"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">50</int>
-						<reference key="object" ref="1028233887"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="96368274"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">56</int>
-						<reference key="object" ref="130462646"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1069442299"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">61</int>
-						<reference key="object" ref="497968468"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="691127886"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">66</int>
-						<reference key="object" ref="529644976"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="343844477"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">73</int>
-						<reference key="object" ref="140207359"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="401971973"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">74</int>
-						<reference key="object" ref="907540673"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="804220802"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">81</int>
-						<reference key="object" ref="473093704"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="572444645"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">86</int>
-						<reference key="object" ref="516451639"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="562573539"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">87</int>
-						<reference key="object" ref="526934709"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="273314683"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">88</int>
-						<reference key="object" ref="180296347"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="495611013"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">89</int>
-						<reference key="object" ref="612818913"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="12489527"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">90</int>
-						<reference key="object" ref="5114506"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="894602850"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">254</int>
-						<reference key="object" ref="679064762"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="489160988"/>
-							<reference ref="522658278"/>
-							<reference ref="1067360024"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">empty</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">342</int>
-						<reference key="object" ref="928228060"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="302593572"/>
-						</object>
-						<reference key="parent" ref="502806021"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">343</int>
-						<reference key="object" ref="621289166"/>
-						<reference key="parent" ref="496835891"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">344</int>
-						<reference key="object" ref="660394934"/>
-						<reference key="parent" ref="444018704"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">345</int>
-						<reference key="object" ref="67902101"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="735303444"/>
-						</object>
-						<reference key="parent" ref="463613064"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">346</int>
-						<reference key="object" ref="597433555"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="418397244"/>
-						</object>
-						<reference key="parent" ref="1012635724"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">347</int>
-						<reference key="object" ref="368733355"/>
-						<reference key="parent" ref="34095372"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">348</int>
-						<reference key="object" ref="652898624"/>
-						<reference key="parent" ref="677509567"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">350</int>
-						<reference key="object" ref="456227852"/>
-						<reference key="parent" ref="862092551"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">352</int>
-						<reference key="object" ref="1015322159"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="4652010"/>
-						</object>
-						<reference key="parent" ref="463632258"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">353</int>
-						<reference key="object" ref="523579964"/>
-						<reference key="parent" ref="501486901"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">354</int>
-						<reference key="object" ref="625397549"/>
-						<reference key="parent" ref="9309938"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">355</int>
-						<reference key="object" ref="1015445713"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="945504605"/>
-						</object>
-						<reference key="parent" ref="108597901"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">356</int>
-						<reference key="object" ref="492298910"/>
-						<reference key="parent" ref="335373847"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">358</int>
-						<reference key="object" ref="124098371"/>
-						<reference key="parent" ref="34260806"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">361</int>
-						<reference key="object" ref="651032081"/>
-						<reference key="parent" ref="751714853"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">362</int>
-						<reference key="object" ref="96368274"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="359920682"/>
-						</object>
-						<reference key="parent" ref="1028233887"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">364</int>
-						<reference key="object" ref="1069442299"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="155689363"/>
-						</object>
-						<reference key="parent" ref="130462646"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">365</int>
-						<reference key="object" ref="691127886"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1069179379"/>
-						</object>
-						<reference key="parent" ref="497968468"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">366</int>
-						<reference key="object" ref="343844477"/>
-						<reference key="parent" ref="529644976"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">373</int>
-						<reference key="object" ref="401971973"/>
-						<reference key="parent" ref="140207359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">374</int>
-						<reference key="object" ref="804220802"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="869830194"/>
-						</object>
-						<reference key="parent" ref="907540673"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">375</int>
-						<reference key="object" ref="572444645"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="838480608"/>
-						</object>
-						<reference key="parent" ref="473093704"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">376</int>
-						<reference key="object" ref="562573539"/>
-						<reference key="parent" ref="516451639"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">377</int>
-						<reference key="object" ref="273314683"/>
-						<reference key="parent" ref="526934709"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">378</int>
-						<reference key="object" ref="495611013"/>
-						<reference key="parent" ref="180296347"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">379</int>
-						<reference key="object" ref="12489527"/>
-						<reference key="parent" ref="612818913"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">380</int>
-						<reference key="object" ref="894602850"/>
-						<reference key="parent" ref="5114506"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">7</int>
-						<reference key="object" ref="302593572"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="381221882"/>
-							<reference ref="473757651"/>
-							<reference ref="675281532"/>
-						</object>
-						<reference key="parent" ref="928228060"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">10</int>
-						<reference key="object" ref="381221882"/>
-						<reference key="parent" ref="302593572"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">9</int>
-						<reference key="object" ref="473757651"/>
-						<reference key="parent" ref="302593572"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">8</int>
-						<reference key="object" ref="675281532"/>
-						<reference key="parent" ref="302593572"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="735303444"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="817763274"/>
-							<reference ref="704690128"/>
-							<reference ref="604338719"/>
-						</object>
-						<reference key="parent" ref="67902101"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">17</int>
-						<reference key="object" ref="817763274"/>
-						<reference key="parent" ref="735303444"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">16</int>
-						<reference key="object" ref="704690128"/>
-						<reference key="parent" ref="735303444"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">15</int>
-						<reference key="object" ref="604338719"/>
-						<reference key="parent" ref="735303444"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="418397244"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="193116813"/>
-							<reference ref="87174157"/>
-							<reference ref="138849732"/>
-						</object>
-						<reference key="parent" ref="597433555"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">22</int>
-						<reference key="object" ref="193116813"/>
-						<reference key="parent" ref="418397244"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">21</int>
-						<reference key="object" ref="87174157"/>
-						<reference key="parent" ref="418397244"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">20</int>
-						<reference key="object" ref="138849732"/>
-						<reference key="parent" ref="418397244"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">33</int>
-						<reference key="object" ref="4652010"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="355405826"/>
-							<reference ref="623541927"/>
-							<reference ref="716695777"/>
-						</object>
-						<reference key="parent" ref="1015322159"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">36</int>
-						<reference key="object" ref="355405826"/>
-						<reference key="parent" ref="4652010"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">35</int>
-						<reference key="object" ref="623541927"/>
-						<reference key="parent" ref="4652010"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">34</int>
-						<reference key="object" ref="716695777"/>
-						<reference key="parent" ref="4652010"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">40</int>
-						<reference key="object" ref="945504605"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="712570706"/>
-							<reference ref="42097014"/>
-							<reference ref="664014443"/>
-						</object>
-						<reference key="parent" ref="1015445713"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">43</int>
-						<reference key="object" ref="712570706"/>
-						<reference key="parent" ref="945504605"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">42</int>
-						<reference key="object" ref="42097014"/>
-						<reference key="parent" ref="945504605"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">41</int>
-						<reference key="object" ref="664014443"/>
-						<reference key="parent" ref="945504605"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">51</int>
-						<reference key="object" ref="359920682"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="551923619"/>
-							<reference ref="1005011526"/>
-							<reference ref="836668078"/>
-						</object>
-						<reference key="parent" ref="96368274"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">54</int>
-						<reference key="object" ref="551923619"/>
-						<reference key="parent" ref="359920682"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">53</int>
-						<reference key="object" ref="1005011526"/>
-						<reference key="parent" ref="359920682"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">52</int>
-						<reference key="object" ref="836668078"/>
-						<reference key="parent" ref="359920682"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">57</int>
-						<reference key="object" ref="155689363"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="354770588"/>
-							<reference ref="736037090"/>
-							<reference ref="259498980"/>
-						</object>
-						<reference key="parent" ref="1069442299"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">60</int>
-						<reference key="object" ref="354770588"/>
-						<reference key="parent" ref="155689363"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">59</int>
-						<reference key="object" ref="736037090"/>
-						<reference key="parent" ref="155689363"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">58</int>
-						<reference key="object" ref="259498980"/>
-						<reference key="parent" ref="155689363"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">62</int>
-						<reference key="object" ref="1069179379"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="413956336"/>
-							<reference ref="847739510"/>
-							<reference ref="286317196"/>
-						</object>
-						<reference key="parent" ref="691127886"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">65</int>
-						<reference key="object" ref="413956336"/>
-						<reference key="parent" ref="1069179379"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">64</int>
-						<reference key="object" ref="847739510"/>
-						<reference key="parent" ref="1069179379"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">63</int>
-						<reference key="object" ref="286317196"/>
-						<reference key="parent" ref="1069179379"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">75</int>
-						<reference key="object" ref="869830194"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="6137744"/>
-							<reference ref="169170697"/>
-							<reference ref="1070100923"/>
-						</object>
-						<reference key="parent" ref="804220802"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">78</int>
-						<reference key="object" ref="6137744"/>
-						<reference key="parent" ref="869830194"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">77</int>
-						<reference key="object" ref="169170697"/>
-						<reference key="parent" ref="869830194"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">76</int>
-						<reference key="object" ref="1070100923"/>
-						<reference key="parent" ref="869830194"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">82</int>
-						<reference key="object" ref="838480608"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="946029370"/>
-							<reference ref="894119487"/>
-							<reference ref="19515960"/>
-						</object>
-						<reference key="parent" ref="572444645"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">85</int>
-						<reference key="object" ref="946029370"/>
-						<reference key="parent" ref="838480608"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">84</int>
-						<reference key="object" ref="894119487"/>
-						<reference key="parent" ref="838480608"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">83</int>
-						<reference key="object" ref="19515960"/>
-						<reference key="parent" ref="838480608"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">382</int>
-						<reference key="object" ref="777985871"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="996811218"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">383</int>
-						<reference key="object" ref="996811218"/>
-						<reference key="parent" ref="777985871"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">384</int>
-						<reference key="object" ref="734910001"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="737375773"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">385</int>
-						<reference key="object" ref="737375773"/>
-						<reference key="parent" ref="734910001"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">388</int>
-						<reference key="object" ref="149148764"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="950560055"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">389</int>
-						<reference key="object" ref="747005200"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="148673163"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">390</int>
-						<reference key="object" ref="148673163"/>
-						<reference key="parent" ref="747005200"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">391</int>
-						<reference key="object" ref="950560055"/>
-						<reference key="parent" ref="149148764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">396</int>
-						<reference key="object" ref="965170034"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="517356884"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">397</int>
-						<reference key="object" ref="517356884"/>
-						<reference key="parent" ref="965170034"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">398</int>
-						<reference key="object" ref="646401135"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="468935027"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">399</int>
-						<reference key="object" ref="468935027"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="884041487"/>
-						</object>
-						<reference key="parent" ref="646401135"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">400</int>
-						<reference key="object" ref="884041487"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="148376841"/>
-							<reference ref="425106023"/>
-							<reference ref="84181884"/>
-						</object>
-						<reference key="parent" ref="468935027"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">401</int>
-						<reference key="object" ref="148376841"/>
-						<reference key="parent" ref="884041487"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">402</int>
-						<reference key="object" ref="425106023"/>
-						<reference key="parent" ref="884041487"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">403</int>
-						<reference key="object" ref="84181884"/>
-						<reference key="parent" ref="884041487"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">407</int>
-						<reference key="object" ref="390676982"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="528921925"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">408</int>
-						<reference key="object" ref="594030759"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="790451247"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">409</int>
-						<reference key="object" ref="790451247"/>
-						<reference key="parent" ref="594030759"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">410</int>
-						<reference key="object" ref="528921925"/>
-						<reference key="parent" ref="390676982"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">420</int>
-						<reference key="object" ref="938870755"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="152220780"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">421</int>
-						<reference key="object" ref="500710129"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="316938196"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">422</int>
-						<reference key="object" ref="316938196"/>
-						<reference key="parent" ref="500710129"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">423</int>
-						<reference key="object" ref="152220780"/>
-						<reference key="parent" ref="938870755"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">55</int>
-						<reference key="object" ref="498769415"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="492969921"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">363</int>
-						<reference key="object" ref="492969921"/>
-						<reference key="parent" ref="498769415"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">427</int>
-						<reference key="object" ref="742215576"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="821448906"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">428</int>
-						<reference key="object" ref="821448906"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="278489647"/>
-						</object>
-						<reference key="parent" ref="742215576"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">429</int>
-						<reference key="object" ref="278489647"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1001978608"/>
-							<reference ref="447058849"/>
-							<reference ref="101526218"/>
-						</object>
-						<reference key="parent" ref="821448906"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">430</int>
-						<reference key="object" ref="1001978608"/>
-						<reference key="parent" ref="278489647"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">431</int>
-						<reference key="object" ref="447058849"/>
-						<reference key="parent" ref="278489647"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">432</int>
-						<reference key="object" ref="101526218"/>
-						<reference key="parent" ref="278489647"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">438</int>
-						<reference key="object" ref="933060176"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="236903504"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">439</int>
-						<reference key="object" ref="236903504"/>
-						<reference key="parent" ref="933060176"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">440</int>
-						<reference key="object" ref="120436311"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="571635509"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">441</int>
-						<reference key="object" ref="571635509"/>
-						<reference key="parent" ref="120436311"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">442</int>
-						<reference key="object" ref="297485972"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="225631881"/>
-						</object>
-						<reference key="parent" ref="738514360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">443</int>
-						<reference key="object" ref="225631881"/>
-						<reference key="parent" ref="297485972"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">450</int>
-						<reference key="object" ref="489160988"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1037223262"/>
-						</object>
-						<reference key="parent" ref="679064762"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">451</int>
-						<reference key="object" ref="1037223262"/>
-						<reference key="parent" ref="489160988"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">453</int>
-						<reference key="object" ref="522658278"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="246337895"/>
-						</object>
-						<reference key="parent" ref="679064762"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">454</int>
-						<reference key="object" ref="246337895"/>
-						<reference key="parent" ref="522658278"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">457</int>
-						<reference key="object" ref="1067360024"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="168605488"/>
-						</object>
-						<reference key="parent" ref="679064762"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">458</int>
-						<reference key="object" ref="168605488"/>
-						<reference key="parent" ref="1067360024"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>10.IBPluginDependency</string>
-					<string>11.IBAttributePlaceholdersKey</string>
-					<string>11.IBPluginDependency</string>
-					<string>12.IBAttributePlaceholdersKey</string>
-					<string>12.IBPluginDependency</string>
-					<string>13.IBAttributePlaceholdersKey</string>
-					<string>13.IBPluginDependency</string>
-					<string>14.IBPluginDependency</string>
-					<string>15.IBPluginDependency</string>
-					<string>16.IBPluginDependency</string>
-					<string>17.IBPluginDependency</string>
-					<string>18.IBAttributePlaceholdersKey</string>
-					<string>18.IBPluginDependency</string>
-					<string>19.IBPluginDependency</string>
-					<string>20.IBPluginDependency</string>
-					<string>21.IBPluginDependency</string>
-					<string>22.IBPluginDependency</string>
-					<string>23.IBAttributePlaceholdersKey</string>
-					<string>23.IBPluginDependency</string>
-					<string>24.IBAttributePlaceholdersKey</string>
-					<string>24.IBPluginDependency</string>
-					<string>254.IBPluginDependency</string>
-					<string>30.IBPluginDependency</string>
-					<string>32.IBAttributePlaceholdersKey</string>
-					<string>32.IBPluginDependency</string>
-					<string>33.IBPluginDependency</string>
-					<string>34.IBPluginDependency</string>
-					<string>342.IBPluginDependency</string>
-					<string>343.IBPluginDependency</string>
-					<string>344.IBPluginDependency</string>
-					<string>345.IBPluginDependency</string>
-					<string>346.IBPluginDependency</string>
-					<string>347.IBPluginDependency</string>
-					<string>348.IBPluginDependency</string>
-					<string>35.IBPluginDependency</string>
-					<string>350.IBPluginDependency</string>
-					<string>352.IBPluginDependency</string>
-					<string>353.IBPluginDependency</string>
-					<string>354.IBPluginDependency</string>
-					<string>355.IBPluginDependency</string>
-					<string>356.IBPluginDependency</string>
-					<string>358.IBPluginDependency</string>
-					<string>36.IBPluginDependency</string>
-					<string>361.IBPluginDependency</string>
-					<string>362.IBPluginDependency</string>
-					<string>363.IBPluginDependency</string>
-					<string>364.IBPluginDependency</string>
-					<string>365.IBPluginDependency</string>
-					<string>366.IBPluginDependency</string>
-					<string>37.IBAttributePlaceholdersKey</string>
-					<string>37.IBPluginDependency</string>
-					<string>373.IBPluginDependency</string>
-					<string>374.IBPluginDependency</string>
-					<string>375.IBPluginDependency</string>
-					<string>376.IBPluginDependency</string>
-					<string>377.IBPluginDependency</string>
-					<string>378.IBPluginDependency</string>
-					<string>379.IBPluginDependency</string>
-					<string>38.IBAttributePlaceholdersKey</string>
-					<string>38.IBPluginDependency</string>
-					<string>380.IBPluginDependency</string>
-					<string>382.IBAttributePlaceholdersKey</string>
-					<string>382.IBPluginDependency</string>
-					<string>383.IBPluginDependency</string>
-					<string>384.IBPluginDependency</string>
-					<string>385.IBPluginDependency</string>
-					<string>388.IBAttributePlaceholdersKey</string>
-					<string>388.IBPluginDependency</string>
-					<string>389.IBPluginDependency</string>
-					<string>39.IBAttributePlaceholdersKey</string>
-					<string>39.IBPluginDependency</string>
-					<string>390.IBPluginDependency</string>
-					<string>391.IBPluginDependency</string>
-					<string>396.IBAttributePlaceholdersKey</string>
-					<string>396.IBPluginDependency</string>
-					<string>397.IBPluginDependency</string>
-					<string>398.IBAttributePlaceholdersKey</string>
-					<string>398.IBPluginDependency</string>
-					<string>399.IBPluginDependency</string>
-					<string>40.IBPluginDependency</string>
-					<string>400.IBPluginDependency</string>
-					<string>401.IBPluginDependency</string>
-					<string>402.IBPluginDependency</string>
-					<string>403.IBPluginDependency</string>
-					<string>407.IBAttributePlaceholdersKey</string>
-					<string>407.IBPluginDependency</string>
-					<string>408.IBAttributePlaceholdersKey</string>
-					<string>408.IBPluginDependency</string>
-					<string>409.IBPluginDependency</string>
-					<string>41.IBPluginDependency</string>
-					<string>410.IBPluginDependency</string>
-					<string>42.IBPluginDependency</string>
-					<string>420.IBPluginDependency</string>
-					<string>421.IBAttributePlaceholdersKey</string>
-					<string>421.IBPluginDependency</string>
-					<string>422.IBPluginDependency</string>
-					<string>423.IBPluginDependency</string>
-					<string>427.IBAttributePlaceholdersKey</string>
-					<string>427.IBPluginDependency</string>
-					<string>428.IBPluginDependency</string>
-					<string>429.IBPluginDependency</string>
-					<string>43.IBPluginDependency</string>
-					<string>430.IBPluginDependency</string>
-					<string>431.IBPluginDependency</string>
-					<string>432.IBPluginDependency</string>
-					<string>438.IBPluginDependency</string>
-					<string>439.IBPluginDependency</string>
-					<string>44.IBAttributePlaceholdersKey</string>
-					<string>44.IBPluginDependency</string>
-					<string>440.IBPluginDependency</string>
-					<string>441.IBPluginDependency</string>
-					<string>442.IBPluginDependency</string>
-					<string>443.IBPluginDependency</string>
-					<string>450.IBPluginDependency</string>
-					<string>451.IBPluginDependency</string>
-					<string>453.IBPluginDependency</string>
-					<string>454.IBPluginDependency</string>
-					<string>457.IBPluginDependency</string>
-					<string>458.IBPluginDependency</string>
-					<string>46.IBAttributePlaceholdersKey</string>
-					<string>46.IBPluginDependency</string>
-					<string>49.IBAttributePlaceholdersKey</string>
-					<string>49.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>50.IBAttributePlaceholdersKey</string>
-					<string>50.IBPluginDependency</string>
-					<string>51.IBPluginDependency</string>
-					<string>52.IBPluginDependency</string>
-					<string>53.IBPluginDependency</string>
-					<string>54.IBPluginDependency</string>
-					<string>55.IBPluginDependency</string>
-					<string>56.IBAttributePlaceholdersKey</string>
-					<string>56.IBPluginDependency</string>
-					<string>57.IBPluginDependency</string>
-					<string>58.IBPluginDependency</string>
-					<string>59.IBPluginDependency</string>
-					<string>6.IBAttributePlaceholdersKey</string>
-					<string>6.IBPluginDependency</string>
-					<string>60.IBPluginDependency</string>
-					<string>61.IBAttributePlaceholdersKey</string>
-					<string>61.IBPluginDependency</string>
-					<string>62.IBPluginDependency</string>
-					<string>63.IBPluginDependency</string>
-					<string>64.IBPluginDependency</string>
-					<string>65.IBPluginDependency</string>
-					<string>66.IBAttributePlaceholdersKey</string>
-					<string>66.IBPluginDependency</string>
-					<string>7.IBPluginDependency</string>
-					<string>73.IBAttributePlaceholdersKey</string>
-					<string>73.IBPluginDependency</string>
-					<string>74.IBAttributePlaceholdersKey</string>
-					<string>74.IBPluginDependency</string>
-					<string>75.IBPluginDependency</string>
-					<string>76.IBPluginDependency</string>
-					<string>77.IBPluginDependency</string>
-					<string>78.IBPluginDependency</string>
-					<string>8.IBPluginDependency</string>
-					<string>81.IBAttributePlaceholdersKey</string>
-					<string>81.IBPluginDependency</string>
-					<string>82.IBPluginDependency</string>
-					<string>83.IBPluginDependency</string>
-					<string>84.IBPluginDependency</string>
-					<string>85.IBPluginDependency</string>
-					<string>86.IBAttributePlaceholdersKey</string>
-					<string>86.IBPluginDependency</string>
-					<string>87.IBAttributePlaceholdersKey</string>
-					<string>87.IBPluginDependency</string>
-					<string>88.IBAttributePlaceholdersKey</string>
-					<string>88.IBPluginDependency</string>
-					<string>89.IBAttributePlaceholdersKey</string>
-					<string>89.IBPluginDependency</string>
-					<string>9.IBPluginDependency</string>
-					<string>90.IBAttributePlaceholdersKey</string>
-					<string>90.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">459</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">HBAdvancedController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>X264AdvancedOptionsAnimate:</string>
-							<string>X264AdvancedOptionsChanged:</string>
-							<string>X264AdvancedOptionsSet:</string>
-							<string>X264AdvancedOptionsSetCurrentSettings:</string>
-							<string>X264AdvancedOptionsStandardizeOptString:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>X264AdvancedOptionsAnimate:</string>
-							<string>X264AdvancedOptionsChanged:</string>
-							<string>X264AdvancedOptionsSet:</string>
-							<string>X264AdvancedOptionsSetCurrentSettings:</string>
-							<string>X264AdvancedOptionsStandardizeOptString:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">X264AdvancedOptionsAnimate:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">X264AdvancedOptionsChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">X264AdvancedOptionsSet:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">X264AdvancedOptionsSetCurrentSettings:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">X264AdvancedOptionsStandardizeOptString:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>fDisplayLavcOptions</string>
-							<string>fDisplayLavcOptionsLabel</string>
-							<string>fDisplayTheoraOptionsLabel</string>
-							<string>fDisplayX264Options</string>
-							<string>fDisplayX264OptionsLabel</string>
-							<string>fEmptyView</string>
-							<string>fX264opt8x8dctLabel</string>
-							<string>fX264opt8x8dctSwitch</string>
-							<string>fX264optAlphaDeblockPopUp</string>
-							<string>fX264optAnalyseLabel</string>
-							<string>fX264optAnalysePopUp</string>
-							<string>fX264optAqLabel</string>
-							<string>fX264optAqSlider</string>
-							<string>fX264optBAdaptLabel</string>
-							<string>fX264optBAdaptPopUp</string>
-							<string>fX264optBPyramidLabel</string>
-							<string>fX264optBPyramidPopUp</string>
-							<string>fX264optBetaDeblockPopUp</string>
-							<string>fX264optBframesLabel</string>
-							<string>fX264optBframesPopUp</string>
-							<string>fX264optCabacLabel</string>
-							<string>fX264optCabacSwitch</string>
-							<string>fX264optDeblockLabel</string>
-							<string>fX264optDirectPredLabel</string>
-							<string>fX264optDirectPredPopUp</string>
-							<string>fX264optMERangeLabel</string>
-							<string>fX264optMERangePopUp</string>
-							<string>fX264optMotionEstLabel</string>
-							<string>fX264optMotionEstPopUp</string>
-							<string>fX264optNodctdcmtLabel</string>
-							<string>fX264optNodctdcmtSwitch</string>
-							<string>fX264optPsyRDLabel</string>
-							<string>fX264optPsyRDSlider</string>
-							<string>fX264optPsyTrellisLabel</string>
-							<string>fX264optPsyTrellisSlider</string>
-							<string>fX264optRefLabel</string>
-							<string>fX264optRefPopUp</string>
-							<string>fX264optSubmeLabel</string>
-							<string>fX264optSubmePopUp</string>
-							<string>fX264optTrellisLabel</string>
-							<string>fX264optTrellisPopUp</string>
-							<string>fX264optView</string>
-							<string>fX264optViewTitleLabel</string>
-							<string>fX264optWeightPLabel</string>
-							<string>fX264optWeightPSwitch</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSView</string>
-							<string>NSTextField</string>
-							<string>NSButton</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSSlider</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSSlider</string>
-							<string>NSTextField</string>
-							<string>NSSlider</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSView</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSButton</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>fDisplayLavcOptions</string>
-							<string>fDisplayLavcOptionsLabel</string>
-							<string>fDisplayTheoraOptionsLabel</string>
-							<string>fDisplayX264Options</string>
-							<string>fDisplayX264OptionsLabel</string>
-							<string>fEmptyView</string>
-							<string>fX264opt8x8dctLabel</string>
-							<string>fX264opt8x8dctSwitch</string>
-							<string>fX264optAlphaDeblockPopUp</string>
-							<string>fX264optAnalyseLabel</string>
-							<string>fX264optAnalysePopUp</string>
-							<string>fX264optAqLabel</string>
-							<string>fX264optAqSlider</string>
-							<string>fX264optBAdaptLabel</string>
-							<string>fX264optBAdaptPopUp</string>
-							<string>fX264optBPyramidLabel</string>
-							<string>fX264optBPyramidPopUp</string>
-							<string>fX264optBetaDeblockPopUp</string>
-							<string>fX264optBframesLabel</string>
-							<string>fX264optBframesPopUp</string>
-							<string>fX264optCabacLabel</string>
-							<string>fX264optCabacSwitch</string>
-							<string>fX264optDeblockLabel</string>
-							<string>fX264optDirectPredLabel</string>
-							<string>fX264optDirectPredPopUp</string>
-							<string>fX264optMERangeLabel</string>
-							<string>fX264optMERangePopUp</string>
-							<string>fX264optMotionEstLabel</string>
-							<string>fX264optMotionEstPopUp</string>
-							<string>fX264optNodctdcmtLabel</string>
-							<string>fX264optNodctdcmtSwitch</string>
-							<string>fX264optPsyRDLabel</string>
-							<string>fX264optPsyRDSlider</string>
-							<string>fX264optPsyTrellisLabel</string>
-							<string>fX264optPsyTrellisSlider</string>
-							<string>fX264optRefLabel</string>
-							<string>fX264optRefPopUp</string>
-							<string>fX264optSubmeLabel</string>
-							<string>fX264optSubmePopUp</string>
-							<string>fX264optTrellisLabel</string>
-							<string>fX264optTrellisPopUp</string>
-							<string>fX264optView</string>
-							<string>fX264optViewTitleLabel</string>
-							<string>fX264optWeightPLabel</string>
-							<string>fX264optWeightPSwitch</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fDisplayLavcOptions</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fDisplayLavcOptionsLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fDisplayTheoraOptionsLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fDisplayX264Options</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fDisplayX264OptionsLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fEmptyView</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264opt8x8dctLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264opt8x8dctSwitch</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optAlphaDeblockPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optAnalyseLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optAnalysePopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optAqLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optAqSlider</string>
-								<string key="candidateClassName">NSSlider</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optBAdaptLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optBAdaptPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optBPyramidLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optBPyramidPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optBetaDeblockPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optBframesLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optBframesPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optCabacLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optCabacSwitch</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optDeblockLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optDirectPredLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optDirectPredPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optMERangeLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optMERangePopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optMotionEstLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optMotionEstPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optNodctdcmtLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optNodctdcmtSwitch</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optPsyRDLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optPsyRDSlider</string>
-								<string key="candidateClassName">NSSlider</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optPsyTrellisLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optPsyTrellisSlider</string>
-								<string key="candidateClassName">NSSlider</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optRefLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optRefPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optSubmeLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optSubmePopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optTrellisLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optTrellisPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optView</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optViewTitleLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optWeightPLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264optWeightPSwitch</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/HBAdvancedController.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>NSMenuCheckmark</string>
-				<string>NSMenuMixedState</string>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{9, 8}</string>
-				<string>{7, 2}</string>
-			</object>
-		</object>
-	</data>
-</archive>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <deployment version="1060" identifier="macosx"/>
+ <development version="5100" identifier="xcode"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6250"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="HBAdvancedController">
+ <connections>
+ <outlet property="fDisplayX264Options" destination="30" id="191"/>
+ <outlet property="fDisplayX264OptionsLabel" destination="55" id="192"/>
+ <outlet property="fEmptyView" destination="nxI-yk-oWT" id="vLJ-P2-ROb"/>
+ <outlet property="fOptionsBox" destination="sPV-JX-8CO" id="OhE-r2-gaB"/>
+ <outlet property="fX264opt8x8dctLabel" destination="88" id="196"/>
+ <outlet property="fX264opt8x8dctSwitch" destination="87" id="195"/>
+ <outlet property="fX264optAlphaDeblockPopUp" destination="56" id="197"/>
+ <outlet property="fX264optAnalyseLabel" destination="86" id="199"/>
+ <outlet property="fX264optAnalysePopUp" destination="81" id="200"/>
+ <outlet property="fX264optAqLabel" destination="421" id="426"/>
+ <outlet property="fX264optAqSlider" destination="420" id="425"/>
+ <outlet property="fX264optBAdaptLabel" destination="396" id="404"/>
+ <outlet property="fX264optBAdaptPopUp" destination="398" id="405"/>
+ <outlet property="fX264optBPyramidLabel" destination="46" id="206"/>
+ <outlet property="fX264optBPyramidPopUp" destination="427" id="434"/>
+ <outlet property="fX264optBetaDeblockPopUp" destination="61" id="198"/>
+ <outlet property="fX264optBframesLabel" destination="12" id="202"/>
+ <outlet property="fX264optBframesPopUp" destination="13" id="201"/>
+ <outlet property="fX264optCabacLabel" destination="90" id="210"/>
+ <outlet property="fX264optCabacSwitch" destination="89" id="209"/>
+ <outlet property="fX264optDeblockLabel" destination="66" id="211"/>
+ <outlet property="fX264optDirectPredLabel" destination="49" id="213"/>
+ <outlet property="fX264optDirectPredPopUp" destination="50" id="212"/>
+ <outlet property="fX264optMERangeLabel" destination="38" id="219"/>
+ <outlet property="fX264optMERangePopUp" destination="39" id="218"/>
+ <outlet property="fX264optMotionEstLabel" destination="37" id="221"/>
+ <outlet property="fX264optMotionEstPopUp" destination="32" id="220"/>
+ <outlet property="fX264optNodctdcmtLabel" destination="24" id="224"/>
+ <outlet property="fX264optNodctdcmtSwitch" destination="73" id="225"/>
+ <outlet property="fX264optPsyRDLabel" destination="382" id="386"/>
+ <outlet property="fX264optPsyRDSlider" destination="384" id="387"/>
+ <outlet property="fX264optPsyTrellisLabel" destination="388" id="392"/>
+ <outlet property="fX264optPsyTrellisSlider" destination="389" id="393"/>
+ <outlet property="fX264optRefLabel" destination="11" id="227"/>
+ <outlet property="fX264optRefPopUp" destination="6" id="226"/>
+ <outlet property="fX264optSubmeLabel" destination="44" id="229"/>
+ <outlet property="fX264optSubmePopUp" destination="18" id="228"/>
+ <outlet property="fX264optTrellisLabel" destination="23" id="231"/>
+ <outlet property="fX264optTrellisPopUp" destination="74" id="230"/>
+ <outlet property="fX264optView" destination="5" id="194"/>
+ <outlet property="fX264optWeightPLabel" destination="408" id="413"/>
+ <outlet property="fX264optWeightPSwitch" destination="407" id="414"/>
+ <outlet property="view" destination="kZH-f0-3MZ" id="vhL-OP-goq"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+ <customView id="5" userLabel="x264">
+ <rect key="frame" x="0.0" y="0.0" width="891" height="290"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <slider verticalHuggingPriority="750" id="389">
+ <rect key="frame" x="454" y="63" width="146" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <sliderCell key="cell" controlSize="mini" continuous="YES" state="on" alignment="left" maxValue="1" tickMarkPosition="below" numberOfTickMarks="11" allowsTickMarkValuesOnly="YES" sliderType="linear" id="390">
+ 
+ </sliderCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="395"/>
+ </connections>
+ </slider>
+ <textField verticalHuggingPriority="750" id="388">
+ <rect key="frame" x="298" y="65" width="151" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Psychovisual Trellis:" id="391">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <slider verticalHuggingPriority="750" id="384">
+ <rect key="frame" x="454" y="84" width="146" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <sliderCell key="cell" controlSize="mini" continuous="YES" state="on" alignment="left" maxValue="1" doubleValue="1" tickMarkPosition="below" numberOfTickMarks="11" allowsTickMarkValuesOnly="YES" sliderType="linear" id="385">
+ 
+ </sliderCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="394"/>
+ </connections>
+ </slider>
+ <textField verticalHuggingPriority="750" id="90">
+ <rect key="frame" x="4" y="212" width="123" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="right" title="CABAC Entropy Coding:" id="380">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <button id="89">
+ <rect key="frame" x="129" y="212" width="22" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="379">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="253"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" id="88">
+ <rect key="frame" x="2" y="191" width="125" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="8x8 Transform:" id="378">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <button id="87">
+ <rect key="frame" x="129" y="191" width="22" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="377">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="247"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" id="86">
+ <rect key="frame" x="662" y="254" width="95" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Partition Types:" id="376">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="81">
+ <rect key="frame" x="758" y="256" width="130" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="84" id="375">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="82">
+ <items>
+ <menuItem title="Item1" state="on" id="84"/>
+ <menuItem title="Item2" id="85"/>
+ <menuItem title="Item3" id="83"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="246"/>
+ </connections>
+ </popUpButton>
+ <popUpButton verticalHuggingPriority="750" id="74">
+ <rect key="frame" x="758" y="235" width="130" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="77" id="374">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="75">
+ <items>
+ <menuItem title="Item1" state="on" id="77"/>
+ <menuItem title="Item2" id="76"/>
+ <menuItem title="Item3" id="78"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="250"/>
+ </connections>
+ </popUpButton>
+ <button id="73">
+ <rect key="frame" x="129" y="107" width="22" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="373">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="252"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" id="66">
+ <rect key="frame" x="689" y="107" width="68" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Deblocking:" id="366">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="61">
+ <rect key="frame" x="758" y="88" width="130" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingHead" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="63" id="365">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="62">
+ <items>
+ <menuItem title="Item1" state="on" id="63"/>
+ <menuItem title="Item2" id="64"/>
+ <menuItem title="Item3" id="65"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="249"/>
+ </connections>
+ </popUpButton>
+ <popUpButton verticalHuggingPriority="750" id="56">
+ <rect key="frame" x="758" y="109" width="130" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingHead" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="58" id="364">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="57">
+ <items>
+ <menuItem title="Item1" state="on" id="58"/>
+ <menuItem title="Item2" id="59"/>
+ <menuItem title="Item3" id="60"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="248"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="55">
+ <rect key="frame" x="1" y="45" width="222" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Current x264 Advanced Option String:" id="363">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="50">
+ <rect key="frame" x="453" y="235" width="149" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="54" id="362">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="51">
+ <items>
+ <menuItem title="Item1" state="on" id="54"/>
+ <menuItem title="Item2" id="53"/>
+ <menuItem title="Item3" id="52"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="238"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="49">
+ <rect key="frame" x="298" y="233" width="151" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Adaptive Direct Mode:" id="361">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="382">
+ <rect key="frame" x="298" y="86" width="151" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Psychovisual Rate Distortion:" id="383">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="46">
+ <rect key="frame" x="2" y="149" width="125" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Pyramidal B-Frames:" id="358">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="44">
+ <rect key="frame" x="285" y="191" width="164" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Subpixel ME &amp; Mode Decision:" id="356">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="39">
+ <rect key="frame" x="453" y="172" width="149" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="41" id="355">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="40">
+ <items>
+ <menuItem title="Item1" state="on" id="41"/>
+ <menuItem title="Item2" id="42"/>
+ <menuItem title="Item3" id="43"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="244"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="38">
+ <rect key="frame" x="298" y="170" width="151" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Motion Estimation Range:" id="354">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="37">
+ <rect key="frame" x="298" y="212" width="151" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Motion Estimation Method:" id="353">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="32">
+ <rect key="frame" x="453" y="214" width="149" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="36" id="352">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="33">
+ <items>
+ <menuItem title="Item1" state="on" id="36"/>
+ <menuItem title="Item2" id="35"/>
+ <menuItem title="Item3" id="34"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="243"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="30">
+ <rect key="frame" x="4" y="7" width="882" height="34"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="small" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="350">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <action selector="X264AdvancedOptionsSet:" target="-2" id="193"/>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="750" id="24">
+ <rect key="frame" x="24" y="107" width="103" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="No DCT Decimation:" id="348">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="23">
+ <rect key="frame" x="662" y="233" width="95" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Trellis:" id="347">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="18">
+ <rect key="frame" x="453" y="193" width="149" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="20" id="346">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="19">
+ <items>
+ <menuItem title="Item1" state="on" id="20"/>
+ <menuItem title="Item2" id="21"/>
+ <menuItem title="Item3" id="22"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="245"/>
+ </connections>
+ </popUpButton>
+ <popUpButton verticalHuggingPriority="750" id="398">
+ <rect key="frame" x="453" y="256" width="149" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="403" id="399">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="400">
+ <items>
+ <menuItem title="Item1" state="on" id="403"/>
+ <menuItem title="Item2" id="401"/>
+ <menuItem title="Item3" id="402"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="406"/>
+ </connections>
+ </popUpButton>
+ <popUpButton verticalHuggingPriority="750" id="13">
+ <rect key="frame" x="131" y="235" width="97" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="17" id="345">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="14">
+ <items>
+ <menuItem title="Item1" state="on" id="17"/>
+ <menuItem title="Item2" id="15"/>
+ <menuItem title="Item3" id="16"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="237"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="396">
+ <rect key="frame" x="298" y="254" width="151" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Adaptive B-Frames:" id="397">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="12">
+ <rect key="frame" x="2" y="233" width="125" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Maximum B-Frames:" id="344">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="11">
+ <rect key="frame" x="2" y="254" width="125" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Reference Frames:" id="343">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="6">
+ <rect key="frame" x="131" y="256" width="97" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="8" id="342">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="7">
+ <items>
+ <menuItem title="Item1" state="on" id="8"/>
+ <menuItem title="Item2" id="10"/>
+ <menuItem title="Item3" id="9"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="235"/>
+ </connections>
+ </popUpButton>
+ <button id="407">
+ <rect key="frame" x="129" y="170" width="22" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="410">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="411"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" id="408">
+ <rect key="frame" x="2" y="170" width="125" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Weighted P-Frames:" id="409">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <slider verticalHuggingPriority="750" id="420">
+ <rect key="frame" x="454" y="105" width="146" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <sliderCell key="cell" controlSize="mini" continuous="YES" state="on" alignment="left" maxValue="1" tickMarkPosition="below" numberOfTickMarks="11" allowsTickMarkValuesOnly="YES" sliderType="linear" id="423">
+ 
+ </sliderCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="424"/>
+ </connections>
+ </slider>
+ <textField verticalHuggingPriority="750" id="421">
+ <rect key="frame" x="298" y="107" width="151" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Adaptive Quantization:" id="422">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="427">
+ <rect key="frame" x="131" y="151" width="97" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="430" id="428">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="429">
+ <items>
+ <menuItem title="Item1" state="on" id="430"/>
+ <menuItem title="Item2" id="432"/>
+ <menuItem title="Item3" id="431"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="X264AdvancedOptionsChanged:" target="-2" id="433"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="438">
+ <rect key="frame" x="1" y="128" width="91" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Psychovisual" id="439">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="440">
+ <rect key="frame" x="1" y="275" width="66" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Encoding" id="441">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="442">
+ <rect key="frame" x="298" y="275" width="61" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Analysis" id="443">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ </customView>
+ <customView id="kZH-f0-3MZ" userLabel="view">
+ <rect key="frame" x="0.0" y="0.0" width="905" height="294"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <subviews>
+ <box autoresizesSubviews="NO" title="Box" borderType="none" titlePosition="noTitle" id="sPV-JX-8CO">
+ <rect key="frame" x="7" y="-4" width="890" height="290"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <view key="contentView">
+ <rect key="frame" x="0.0" y="0.0" width="890" height="290"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ </view>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </box>
+ </subviews>
+ </customView>
+ <customView id="nxI-yk-oWT" userLabel="empty">
+ <rect key="frame" x="0.0" y="0.0" width="905" height="294"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="60D-Fv-Yl5">
+ <rect key="frame" x="18" y="139" width="869" height="17"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Advanced options not available for the selected codec." id="lPc-aK-FOh">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ </customView>
+ </objects>
+</document>

HandBrake-0.10.0.tar.bz2/macosx/English.lproj/Audio.xib Added

@@ -0,0 +1,372 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="14A329r" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <deployment version="1060" defaultVersion="1060" identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="HBAudioController">
+ <connections>
+ <outlet property="configureDefaults" destination="vFP-nq-IQg" id="EFe-IR-Cyn"/>
+ <outlet property="fTableView" destination="LlC-ua-mth" id="NvM-yh-c0L"/>
+ <outlet property="reloadDefaults" destination="wcL-rL-aYS" id="R78-R5-U0p"/>
+ <outlet property="trackPopup" destination="jrP-M5-2Rq" id="Avl-Cd-Th2"/>
+ <outlet property="view" destination="LOv-5G-86T" id="qyT-Z6-lCU"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application"/>
+ <arrayController id="iWY-gv-3ab" userLabel="Audio Inputs">
+ <declaredKeys>
+ <string>keyAudioTrackName</string>
+ </declaredKeys>
+ <connections>
+ <binding destination="-2" name="contentArray" keyPath="masterTrackArray" id="vVy-cS-D4a"/>
+ </connections>
+ </arrayController>
+ <arrayController preservesSelection="NO" avoidsEmptySelection="NO" id="rzb-Si-Kpf" userLabel="Audios">
+ <declaredKeys>
+ <string>tracks</string>
+ <string>tracks.keyAudioTrackName</string>
+ <string>track</string>
+ <string>enabled</string>
+ <string>mixdownEnabled</string>
+ <string>drc</string>
+ <string>codecs</string>
+ <string>codecs.keyAudioCodecName</string>
+ <string>codec</string>
+ <string>mixdowns</string>
+ <string>mixdowns.keyAudioMixdownName</string>
+ <string>mixdown</string>
+ <string>sampleRates</string>
+ <string>sampleRates.keyAudioSampleRateName</string>
+ <string>sampleRate</string>
+ <string>bitRates</string>
+ <string>bitRates.keyAudioBitrateName</string>
+ <string>bitRate</string>
+ <string>DRCEnabled</string>
+ <string>gain</string>
+ <string>PassThruEnabled</string>
+ <string>PassThruDisabled</string>
+ <string>bitrateEnabled</string>
+ </declaredKeys>
+ <connections>
+ <binding destination="-2" name="contentArray" keyPath="audioArray" id="Rfp-6S-XXq"/>
+ </connections>
+ </arrayController>
+ <view id="LOv-5G-86T">
+ <rect key="frame" x="0.0" y="0.0" width="926" height="322"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <scrollView autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="uE3-SE-Oss">
+ <rect key="frame" x="20" y="20" width="886" height="266"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <clipView key="contentView" id="RfG-9v-Rts">
+ <rect key="frame" x="1" y="17" width="884" height="248"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="25" headerView="GLD-lI-qeh" id="LlC-ua-mth">
+ <rect key="frame" x="0.0" y="0.0" width="884" height="248"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <size key="intercellSpacing" width="3" height="2"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+ <tableColumns>
+ <tableColumn identifier="track" editable="NO" width="322" minWidth="40" maxWidth="1000" id="gRu-la-4i7">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Track">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
+ </tableHeaderCell>
+ <popUpButtonCell key="dataCell" type="push" title="Pop Up" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="Oa8-0K-PPX" id="xWU-Pf-IHv">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="Uir-S5-yLw">
+ <items>
+ <menuItem title="Pop Up" state="on" id="Oa8-0K-PPX"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="iWY-gv-3ab" name="content" keyPath="arrangedObjects" id="Ie2-Do-VdN"/>
+ <binding destination="iWY-gv-3ab" name="contentValues" keyPath="arrangedObjects.keyAudioTrackName" previousBinding="Ie2-Do-VdN" id="oTn-J8-yoY"/>
+ <binding destination="rzb-Si-Kpf" name="selectedObject" keyPath="arrangedObjects.track" previousBinding="oTn-J8-yoY" id="fh6-LS-cAe"/>
+ </connections>
+ </tableColumn>
+ <tableColumn identifier="codec" width="140" minWidth="140" maxWidth="3.4028229999999999e+38" id="dI5-Bu-m9C">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Codec">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <popUpButtonCell key="dataCell" type="push" title="Pop Up" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="YpG-KX-KsI" id="S5G-sn-g3u">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="7Cr-sT-Iwx">
+ <items>
+ <menuItem title="Pop Up" state="on" id="YpG-KX-KsI"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="rzb-Si-Kpf" name="selectedObject" keyPath="arrangedObjects.codec" previousBinding="XJw-aT-etB" id="S7r-tN-wM2"/>
+ <binding destination="rzb-Si-Kpf" name="content" keyPath="arrangedObjects.codecs" id="Rhu-Z1-dOp"/>
+ <binding destination="rzb-Si-Kpf" name="contentValues" keyPath="arrangedObjects.codecs.keyAudioCodecName" previousBinding="Rhu-Z1-dOp" id="XJw-aT-etB"/>
+ <binding destination="rzb-Si-Kpf" name="enabled" keyPath="arrangedObjects.enabled" id="3q0-x0-5zx"/>
+ </connections>
+ </tableColumn>
+ <tableColumn identifier="mixdown" width="128" minWidth="128" maxWidth="3.4028229999999999e+38" id="3wx-Uv-5Uc">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Mixdown">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <popUpButtonCell key="dataCell" type="push" title="Pop Up" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="6KP-up-v0L" id="iPl-mc-59p">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="ThG-6I-ogh">
+ <items>
+ <menuItem title="Pop Up" state="on" id="6KP-up-v0L"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="rzb-Si-Kpf" name="selectedObject" keyPath="arrangedObjects.mixdown" previousBinding="eLm-QG-NGR" id="LOT-t7-LWV">
+ <dictionary key="options">
+ <bool key="NSCreatesSortDescriptor" value="NO"/>
+ </dictionary>
+ </binding>
+ <binding destination="rzb-Si-Kpf" name="enabled" keyPath="arrangedObjects.mixdownEnabled" id="IBK-Ut-O6Y"/>
+ <binding destination="rzb-Si-Kpf" name="content" keyPath="arrangedObjects.mixdowns" id="Cfe-Wx-NFu"/>
+ <binding destination="rzb-Si-Kpf" name="contentValues" keyPath="arrangedObjects.mixdowns.keyAudioMixdownName" previousBinding="Cfe-Wx-NFu" id="eLm-QG-NGR"/>
+ </connections>
+ </tableColumn>
+ <tableColumn identifier="samplerate" width="72" minWidth="72" maxWidth="3.4028229999999999e+38" id="4ge-RO-Qjs">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Samplerate">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <popUpButtonCell key="dataCell" type="push" title="Pop Up" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="HX0-fQ-k4C" id="LWh-ZT-m8J">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="bfn-7j-zra">
+ <items>
+ <menuItem title="Pop Up" state="on" id="HX0-fQ-k4C"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="rzb-Si-Kpf" name="enabled" keyPath="arrangedObjects.mixdownEnabled" id="1Ce-Kl-47e"/>
+ <binding destination="rzb-Si-Kpf" name="selectedObject" keyPath="arrangedObjects.sampleRate" previousBinding="ErN-GC-Ge9" id="4uH-KH-1V7">
+ <dictionary key="options">
+ <bool key="NSCreatesSortDescriptor" value="NO"/>
+ </dictionary>
+ </binding>
+ <binding destination="rzb-Si-Kpf" name="content" keyPath="arrangedObjects.sampleRates" id="92M-oG-NTY"/>
+ <binding destination="rzb-Si-Kpf" name="contentValues" keyPath="arrangedObjects.sampleRates.keyAudioSampleRateName" previousBinding="92M-oG-NTY" id="ErN-GC-Ge9"/>
+ </connections>
+ </tableColumn>
+ <tableColumn identifier="bitrate" width="72" minWidth="72" maxWidth="3.4028229999999999e+38" id="icy-WJ-qjH">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Bitrate">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <popUpButtonCell key="dataCell" type="push" title="Pop Up" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="ScK-9X-Gvn" id="YmG-Il-WGI">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="cPd-Hx-eHs">
+ <items>
+ <menuItem title="Pop Up" state="on" id="ScK-9X-Gvn"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="rzb-Si-Kpf" name="selectedObject" keyPath="arrangedObjects.bitRate" previousBinding="aJi-it-rd3" id="JLj-Mg-gQL">
+ <dictionary key="options">
+ <bool key="NSCreatesSortDescriptor" value="NO"/>
+ </dictionary>
+ </binding>
+ <binding destination="rzb-Si-Kpf" name="content" keyPath="arrangedObjects.bitRates" id="wpG-YB-fxH"/>
+ <binding destination="rzb-Si-Kpf" name="contentValues" keyPath="arrangedObjects.bitRates.keyAudioBitrateName" previousBinding="wpG-YB-fxH" id="aJi-it-rd3"/>
+ <binding destination="rzb-Si-Kpf" name="enabled" keyPath="arrangedObjects.bitrateEnabled" id="eNf-Cc-xL3"/>
+ </connections>
+ </tableColumn>
+ <tableColumn identifier="gain" width="36" minWidth="36" maxWidth="3.4028234663852886e+38" id="psI-ue-Jsr">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="Gain">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <sliderCell key="dataCell" controlSize="small" continuous="YES" state="on" alignment="left" minValue="-5" maxValue="16" doubleValue="0.25" tickMarkPosition="above" numberOfTickMarks="21" allowsTickMarkValuesOnly="YES" sliderType="circular" id="3XQ-vq-IRV"/>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="rzb-Si-Kpf" name="enabled" keyPath="arrangedObjects.PassThruDisabled" id="AY4-98-DiI"/>
+ <binding destination="rzb-Si-Kpf" name="value" keyPath="arrangedObjects.gain" id="T1e-LK-znD">
+ <dictionary key="options">
+ <bool key="NSCreatesSortDescriptor" value="NO"/>
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </tableColumn>
+ <tableColumn identifier="gainText" width="25" minWidth="25" maxWidth="3.4028234663852886e+38" id="fy5-z6-TRg">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <textFieldCell key="dataCell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="Vbk-Fc-rCj">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="rzb-Si-Kpf" name="enabled" keyPath="arrangedObjects.PassThruDisabled" id="L5Z-ZJ-Zjq"/>
+ <binding destination="rzb-Si-Kpf" name="value" keyPath="arrangedObjects.gain" id="AwB-52-7Cm">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </tableColumn>
+ <tableColumn identifier="drc" width="35" minWidth="35" maxWidth="3.4028229999999999e+38" id="whw-Me-VIU">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="DRC">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <sliderCell key="dataCell" controlSize="small" continuous="YES" state="on" alignment="left" maxValue="4" tickMarkPosition="below" numberOfTickMarks="16" allowsTickMarkValuesOnly="YES" sliderType="circular" id="jVw-iZ-yhL"/>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="rzb-Si-Kpf" name="enabled" keyPath="arrangedObjects.DRCEnabled" id="uRE-B4-yzg"/>
+ <binding destination="rzb-Si-Kpf" name="value" keyPath="arrangedObjects.drc" id="nOq-9s-eHF"/>
+ </connections>
+ </tableColumn>
+ <tableColumn identifier="drctext" editable="NO" width="27" minWidth="27" maxWidth="3.4028229999999999e+38" id="ASp-Mc-vG6">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <textFieldCell key="dataCell" controlSize="small" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="Text" id="Qw5-9v-GFf">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="rzb-Si-Kpf" name="enabled" keyPath="arrangedObjects.DRCEnabled" id="7a1-p0-bgX"/>
+ <binding destination="rzb-Si-Kpf" name="value" keyPath="arrangedObjects.drc" id="YWG-sr-noG">
+ <dictionary key="options">
+ <bool key="NSConditionallySetsEditable" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </tableColumn>
+ </tableColumns>
+ <connections>
+ <outlet property="menu" destination="hyy-qd-qpe" id="e5W-aS-mPB"/>
+ </connections>
+ </tableView>
+ </subviews>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </clipView>
+ <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="1Fp-Pd-fdH">
+ <rect key="frame" x="-100" y="-100" width="685" height="15"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="5LV-7H-phB">
+ <rect key="frame" x="-100" y="-100" width="15" height="206"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <tableHeaderView key="headerView" id="GLD-lI-qeh">
+ <rect key="frame" x="0.0" y="0.0" width="884" height="17"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </tableHeaderView>
+ </scrollView>
+ <button verticalHuggingPriority="750" id="vFP-nq-IQg">
+ <rect key="frame" x="110" y="288" width="140" height="28"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="push" title="Configure Defaults…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="aYF-d5-Ya6">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="showSettingsSheet:" target="-2" id="D9K-M3-zHd"/>
+ </connections>
+ </button>
+ <button verticalHuggingPriority="750" id="wcL-rL-aYS">
+ <rect key="frame" x="248" y="288" width="116" height="28"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="push" title="Reload Defaults" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="q2P-Tg-cBJ">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="reloadDefaults:" target="-2" id="k9I-I9-T2U"/>
+ </connections>
+ </button>
+ <popUpButton verticalHuggingPriority="750" id="jrP-M5-2Rq">
+ <rect key="frame" x="17" y="291" width="88" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Track" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="AoT-G9-aA4">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="Vxo-66-Mrx">
+ <items>
+ <menuItem title="Track" state="on" hidden="YES" id="Pfh-Bc-83k"/>
+ <menuItem title="Add All" id="AMA-Ul-v2f">
+ <connections>
+ <action selector="addAllAudioTracks:" target="-2" id="8LO-bD-Fjy"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="CCk-3A-ULa"/>
+ <menuItem title="Remove All" id="YlA-ue-5oE">
+ <connections>
+ <action selector="removeAll:" target="-2" id="Hbr-n5-nOt"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ </popUpButton>
+ </subviews>
+ </view>
+ <userDefaultsController representsSharedInstance="YES" id="ee3-5O-TtC"/>
+ <menu id="hyy-qd-qpe">
+ <items>
+ <menuItem title="Add All" id="HM0-a4-pm5">
+ <attributedString key="attributedTitle"/>
+ <connections>
+ <action selector="addAllAudioTracks:" target="-2" id="V4d-pG-lsJ"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="fKl-2Z-8aX"/>
+ <menuItem title="Remove All" id="fqs-Q8-hNY">
+ <connections>
+ <action selector="removeAll:" target="-2" id="E7c-dN-4dY"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="CjR-R1-IBg"/>
+ <menuItem title="Reload Defaults" id="sq7-Ux-T6D">
+ <connections>
+ <action selector="reloadDefaults:" target="-2" id="7JX-ub-E5y"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Configure Defaults…" id="TK6-fY-4Sk">
+ <connections>
+ <action selector="showSettingsSheet:" target="-2" id="Q8y-a8-pV6"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </objects>
+</document>

HandBrake-0.10.0.tar.bz2/macosx/English.lproj/AudioDefaults.xib Added

@@ -0,0 +1,574 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F14" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <deployment defaultVersion="1060" identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="HBAudioDefaultsController">
+ <connections>
+ <outlet property="TracksController" destination="I6S-EX-Dvu" id="kKd-rp-1eh"/>
+ <outlet property="showAllButton" destination="QAt-5X-NBT" id="3IW-6r-piX"/>
+ <outlet property="tableController" destination="ZBe-aP-wvq" id="HBN-Z2-bbo"/>
+ <outlet property="tracksController" destination="I6S-EX-Dvu" id="oEz-8a-ef7"/>
+ <outlet property="window" destination="kwM-lz-5lG" id="rob-Fo-JhL"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application"/>
+ <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="kwM-lz-5lG">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="175" y="825" width="813" height="442"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
+ <value key="minSize" type="size" width="813" height="397"/>
+ <value key="maxSize" type="size" width="813" height="600"/>
+ <view key="contentView" id="ZP2-Cp-K5w">
+ <rect key="frame" x="0.0" y="0.0" width="813" height="442"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="fPg-3n-1TN">
+ <rect key="frame" x="10" y="406" width="145" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Track Selection Behavior:" id="GbM-vm-RC2">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Jsz-Er-bsF">
+ <rect key="frame" x="10" y="382" width="145" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Languages:" id="mAT-Jp-SG1">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Hqz-Lw-gAu">
+ <rect key="frame" x="430" y="261" width="115" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Options:" id="NJl-q3-zXL">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="oiD-QI-wly">
+ <rect key="frame" x="158" y="401" width="252" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="None" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="mvw-Hg-JFM" id="21e-KY-8TR">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="Kwy-lU-VuU">
+ <items>
+ <menuItem title="None" state="on" id="mvw-Hg-JFM"/>
+ <menuItem title="First Matching Selected Languages" id="jDd-Ji-7Sm"/>
+ <menuItem title="All Matching Selected Languages" id="GZP-q7-SYy"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <binding destination="-2" name="selectedIndex" keyPath="self.settings.trackSelectionBehavior" id="sKn-Mr-Hce"/>
+ <outlet property="nextKeyView" destination="Of7-71-Ci6" id="jgQ-nK-YLu"/>
+ </connections>
+ </popUpButton>
+ <button id="uF5-6E-EIe">
+ <rect key="frame" x="548" y="259" width="255" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <string key="toolTip">Only the primary audio track will be encoded with the full encoder list. All other secondary audio output tracks will be encoded with first encoder only.</string>
+ <buttonCell key="cell" type="check" title="Use only first encoder for secondary audio" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="66v-2g-DHn">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.settings.secondaryEncoderMode" id="Umc-CV-pJy"/>
+ <outlet property="nextKeyView" destination="r4m-GO-aN3" id="nUp-Ow-ZFS"/>
+ </connections>
+ </button>
+ <scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="10" verticalLineScroll="16" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="aTC-39-h6S">
+ <rect key="frame" x="161" y="261" width="246" height="135"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <clipView key="contentView" id="TdE-Sh-NcS">
+ <rect key="frame" x="1" y="1" width="244" height="133"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" autosaveColumns="NO" rowHeight="14" id="Of7-71-Ci6">
+ <rect key="frame" x="0.0" y="0.0" width="244" height="133"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <size key="intercellSpacing" width="3" height="2"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+ <tableColumns>
+ <tableColumn identifier="checkBox" width="20" minWidth="20" maxWidth="20" id="G44-XP-6xE">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
+ </tableHeaderCell>
+ <buttonCell key="dataCell" type="check" bezelStyle="regularSquare" imagePosition="left" controlSize="small" lineBreakMode="truncatingMiddle" inset="2" id="6by-yL-8VC">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="ZBe-aP-wvq" name="value" keyPath="arrangedObjects.isSelected" id="fRp-oC-H6C"/>
+ </connections>
+ </tableColumn>
+ <tableColumn identifier="name" width="210" minWidth="10" maxWidth="2000" id="IJ6-jx-Nba">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <textFieldCell key="dataCell" controlSize="small" lineBreakMode="truncatingMiddle" alignment="left" title="Text Cell" id="lY3-CN-AmZ">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="ZBe-aP-wvq" name="value" keyPath="arrangedObjects.language" id="y6d-Rn-DIv"/>
+ </connections>
+ </tableColumn>
+ </tableColumns>
+ <connections>
+ <binding destination="ZBe-aP-wvq" name="content" keyPath="arrangedObjects" id="ak7-UG-Fqe"/>
+ <outlet property="dataSource" destination="ZBe-aP-wvq" id="Xy6-f7-IyO"/>
+ <outlet property="delegate" destination="ZBe-aP-wvq" id="Q25-uc-GVY"/>
+ </connections>
+ </tableView>
+ </subviews>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </clipView>
+ <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="bXf-U5-ogz">
+ <rect key="frame" x="1" y="118" width="244" height="16"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="BWM-rq-VTg">
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <connections>
+ <outlet property="nextKeyView" destination="QAt-5X-NBT" id="u00-fZ-W1s"/>
+ </connections>
+ </scrollView>
+ <button verticalHuggingPriority="750" id="QAt-5X-NBT">
+ <rect key="frame" x="161" y="231" width="71" height="23"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="smallSquare" title="Show All" bezelStyle="smallSquare" imagePosition="overlaps" alignment="center" controlSize="small" borderStyle="border" inset="3" id="PiQ-bA-7P1">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="edit:" target="-2" id="13y-nD-hEj"/>
+ <outlet property="nextKeyView" destination="vUx-OV-W5T" id="fma-A5-pRA"/>
+ </connections>
+ </button>
+ <button verticalHuggingPriority="750" id="sC2-52-liU">
+ <rect key="frame" x="744" y="14" width="54" height="28"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <buttonCell key="cell" type="push" title="Done" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="kDe-1L-VkD">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="done:" target="-2" id="Rdg-PN-7l6"/>
+ <outlet property="nextKeyView" destination="oiD-QI-wly" id="1gO-sY-HNE"/>
+ </connections>
+ </button>
+ <button id="vUx-OV-W5T">
+ <rect key="frame" x="548" y="404" width="151" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <string key="toolTip">Enable this if your playback device supports MP3. This permits MP3 passthru to be selected when automatic passthru selecion is enabled.</string>
+ <buttonCell key="cell" type="check" title="MP3" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="sdZ-Rx-JoG">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.settings.allowMP3Passthru" id="rVF-G7-BYA"/>
+ <outlet property="nextKeyView" destination="fzd-MO-xaB" id="1fb-a1-B25"/>
+ </connections>
+ </button>
+ <button id="fzd-MO-xaB">
+ <rect key="frame" x="548" y="386" width="151" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <string key="toolTip">Enable this if your playback device supports AAC. This permits AAC passthru to be selected when automatic passthru selecion is enabled.</string>
+ <buttonCell key="cell" type="check" title="AAC" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="cUX-iP-UAs">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.settings.allowAACPassthru" id="nsQ-cP-JyI"/>
+ <outlet property="nextKeyView" destination="fgl-Ev-ELt" id="Exn-Wt-M4D"/>
+ </connections>
+ </button>
+ <button id="fgl-Ev-ELt">
+ <rect key="frame" x="548" y="368" width="151" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <string key="toolTip">Enable this if your playback device supports AC3. This permits AC3 passthru to be selected when automatic passthru selecion is enabled.</string>
+ <buttonCell key="cell" type="check" title="AC3" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="VnE-3R-bUf">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.settings.allowAC3Passthru" id="Aig-Ok-RyG"/>
+ <outlet property="nextKeyView" destination="E93-Md-aWa" id="Yv5-Xs-mbs"/>
+ </connections>
+ </button>
+ <button id="E93-Md-aWa">
+ <rect key="frame" x="548" y="350" width="151" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <string key="toolTip">Enable this if your playback device supports DTS. This permits DTS passthru to be selected when automatic passthru selecion is enabled.</string>
+ <buttonCell key="cell" type="check" title="DTS" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="8mC-Wx-myL">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.settings.allowDTSPassthru" id="IWX-ek-0Bd"/>
+ <outlet property="nextKeyView" destination="IxI-o9-jMs" id="sBB-lF-vtE"/>
+ </connections>
+ </button>
+ <button id="IxI-o9-jMs">
+ <rect key="frame" x="548" y="332" width="151" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <string key="toolTip">Enable this if your playback device supports DTS-HD. This permits DTS-HD passthru to be selected when automatic passthru selecion is enabled.</string>
+ <buttonCell key="cell" type="check" title="DTS-HD" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="LX6-kc-5vq">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.settings.allowDTSHDPassthru" id="w77-9v-vIh"/>
+ <outlet property="nextKeyView" destination="LdN-Cx-ZJY" id="rAA-cB-Ma5"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" id="l4i-pd-Cbk">
+ <rect key="frame" x="430" y="406" width="115" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Auto Passthru:" id="s6s-EH-5CB">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton toolTip="Set the audio codec to encode with when a suitable track can not be found for audio passthru." verticalHuggingPriority="750" id="LdN-Cx-ZJY">
+ <rect key="frame" x="548" y="285" width="152" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Item" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="UJy-A2-Bb1" id="OqD-Tf-29c">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="PtB-Wp-B9X">
+ <items>
+ <menuItem title="Item" state="on" id="UJy-A2-Bb1"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <binding destination="-2" name="content" keyPath="self.settings.audioEncoderFallbacks" id="cP2-Bo-45S"/>
+ <binding destination="-2" name="selectedValue" keyPath="self.settings.encoderFallback" previousBinding="cP2-Bo-45S" id="njJ-qO-UAy">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">HBEncoderTrasformer</string>
+ </dictionary>
+ </binding>
+ <outlet property="nextKeyView" destination="uF5-6E-EIe" id="gaK-Cr-XA9"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="Tth-IR-7cU">
+ <rect key="frame" x="430" y="290" width="115" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Passthru Fallback:" id="AQe-Sg-Qgh">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <scrollView autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="dWE-zD-izv">
+ <rect key="frame" x="20" y="46" width="773" height="144"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <clipView key="contentView" id="ocp-4z-kPU">
+ <rect key="frame" x="1" y="17" width="771" height="126"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="25" headerView="X9E-z1-8Hv" id="r4m-GO-aN3">
+ <rect key="frame" x="0.0" y="0.0" width="771" height="126"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <size key="intercellSpacing" width="3" height="2"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+ <tableColumns>
+ <tableColumn identifier="codec" width="275" minWidth="10" maxWidth="3.4028229999999999e+38" id="LuF-er-YPm">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Codec">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <popUpButtonCell key="dataCell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="eC3-fz-8ff">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="vJx-U4-Kqn">
+ <items>
+ <menuItem title="Pop Up" id="L04-Mv-X9t"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="I6S-EX-Dvu" name="selectedValue" keyPath="arrangedObjects.encoder" previousBinding="3FH-yz-dQp" id="fdo-7w-Lke">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">HBEncoderTrasformer</string>
+ </dictionary>
+ </binding>
+ <binding destination="I6S-EX-Dvu" name="content" keyPath="arrangedObjects.encoders" id="3FH-yz-dQp"/>
+ </connections>
+ </tableColumn>
+ <tableColumn identifier="mixdown" width="146" minWidth="10" maxWidth="3.4028229999999999e+38" id="569-7O-ycq">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Mixdown">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <popUpButtonCell key="dataCell" type="push" title="Pop Up" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="JZe-ew-UW6" id="U3S-VF-Osh">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="iFd-Xx-1fd">
+ <items>
+ <menuItem title="Pop Up" state="on" id="JZe-ew-UW6"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="I6S-EX-Dvu" name="selectedValue" keyPath="arrangedObjects.mixdown" previousBinding="M17-dt-S1h" id="jRj-iF-7Dx">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">HBMixdownTrasformer</string>
+ </dictionary>
+ </binding>
+ <binding destination="I6S-EX-Dvu" name="enabled" keyPath="arrangedObjects.mixdownEnabled" id="QcL-GI-fNW"/>
+ <binding destination="I6S-EX-Dvu" name="content" keyPath="arrangedObjects.mixdowns" id="M17-dt-S1h"/>
+ </connections>
+ </tableColumn>
+ <tableColumn identifier="samplerate" width="110" minWidth="10" maxWidth="3.4028229999999999e+38" id="NfI-qX-NGY">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Samplerate">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <popUpButtonCell key="dataCell" type="push" title="Pop Up" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="kkp-zN-T9L" id="XOK-j0-7l5">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="IMI-0m-Flq">
+ <items>
+ <menuItem title="Pop Up" state="on" id="kkp-zN-T9L"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="I6S-EX-Dvu" name="enabled" keyPath="arrangedObjects.mixdownEnabled" id="yMS-bS-lfu"/>
+ <binding destination="I6S-EX-Dvu" name="selectedValue" keyPath="arrangedObjects.sampleRate" previousBinding="ynD-oN-CKW" id="4g4-Uc-Hrq">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">HBSampleRateTrasformer</string>
+ </dictionary>
+ </binding>
+ <binding destination="I6S-EX-Dvu" name="content" keyPath="arrangedObjects.samplerates" id="ynD-oN-CKW">
+ <dictionary key="options">
+ <bool key="NSInsertsNullPlaceholder" value="YES"/>
+ <string key="NSNoSelectionPlaceholder">Auto</string>
+ <string key="NSNullPlaceholder">Auto</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </tableColumn>
+ <tableColumn identifier="bitrate" width="97" minWidth="10" maxWidth="3.4028229999999999e+38" id="hKf-1o-HNE">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Bitrate">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <popUpButtonCell key="dataCell" type="push" title="Pop Up" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="EO9-ri-g0o" id="Fzr-Fz-SdB">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="6Qt-Y4-vCG">
+ <items>
+ <menuItem title="Pop Up" state="on" id="EO9-ri-g0o"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="I6S-EX-Dvu" name="selectedValue" keyPath="arrangedObjects.bitRate" previousBinding="Soq-ZJ-4KR" id="tw7-Kl-He8">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">HBIntegerTrasformer</string>
+ </dictionary>
+ </binding>
+ <binding destination="I6S-EX-Dvu" name="enabled" keyPath="arrangedObjects.bitrateEnabled" id="31K-Op-hHw"/>
+ <binding destination="I6S-EX-Dvu" name="content" keyPath="arrangedObjects.bitrates" id="Soq-ZJ-4KR">
+ <dictionary key="options">
+ <string key="NSNoSelectionPlaceholder">None</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </tableColumn>
+ <tableColumn identifier="gain" width="34" minWidth="10" maxWidth="3.4028234663852886e+38" id="sef-2z-RiQ">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="Gain">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <sliderCell key="dataCell" controlSize="small" continuous="YES" state="on" alignment="left" minValue="-5" maxValue="16" doubleValue="0.25" tickMarkPosition="above" numberOfTickMarks="21" allowsTickMarkValuesOnly="YES" sliderType="circular" id="nEH-R2-7WW"/>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="I6S-EX-Dvu" name="value" keyPath="arrangedObjects.gain" id="8lj-8n-vWu">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <binding destination="I6S-EX-Dvu" name="enabled" keyPath="arrangedObjects.passThruDisabled" id="RnT-tA-tlH"/>
+ </connections>
+ </tableColumn>
+ <tableColumn identifier="gainText" width="25" minWidth="10" maxWidth="3.4028234663852886e+38" id="8iJ-ka-Oti">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <textFieldCell key="dataCell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="OHv-wE-adq">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="I6S-EX-Dvu" name="value" keyPath="arrangedObjects.gain" id="vWH-Cd-dKZ">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ <string key="NSValueTransformerName">HBIntegerTrasformer</string>
+ </dictionary>
+ </binding>
+ <binding destination="I6S-EX-Dvu" name="enabled" keyPath="arrangedObjects.passThruDisabled" id="JZi-cA-lcC"/>
+ </connections>
+ </tableColumn>
+ <tableColumn identifier="drc" width="35" minWidth="10" maxWidth="3.4028229999999999e+38" id="wPN-ex-1CZ">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="DRC">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <sliderCell key="dataCell" controlSize="small" continuous="YES" state="on" alignment="left" maxValue="4" tickMarkPosition="below" numberOfTickMarks="16" allowsTickMarkValuesOnly="YES" sliderType="circular" id="say-2a-x5G"/>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="I6S-EX-Dvu" name="value" keyPath="arrangedObjects.drc" id="3lI-ks-4a5"/>
+ <binding destination="I6S-EX-Dvu" name="enabled" keyPath="arrangedObjects.passThruDisabled" id="q8u-5E-Adj"/>
+ </connections>
+ </tableColumn>
+ <tableColumn identifier="drctext" editable="NO" width="25" minWidth="10" maxWidth="3.4028229999999999e+38" id="eLM-kL-FjB">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <textFieldCell key="dataCell" controlSize="small" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="Text" id="a4J-LK-c3P">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="I6S-EX-Dvu" name="value" keyPath="arrangedObjects.drc" id="TKR-FO-JR4">
+ <dictionary key="options">
+ <bool key="NSConditionallySetsEditable" value="YES"/>
+ </dictionary>
+ </binding>
+ <binding destination="I6S-EX-Dvu" name="enabled" keyPath="arrangedObjects.passThruDisabled" id="IIO-pS-nND"/>
+ </connections>
+ </tableColumn>
+ </tableColumns>
+ <connections>
+ <binding destination="I6S-EX-Dvu" name="content" keyPath="arrangedObjects" id="let-yi-XDX"/>
+ <binding destination="I6S-EX-Dvu" name="selectionIndexes" keyPath="selectionIndexes" previousBinding="let-yi-XDX" id="zy7-Dz-cEh"/>
+ </connections>
+ </tableView>
+ </subviews>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </clipView>
+ <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="MQZ-cv-4yN">
+ <rect key="frame" x="-100" y="-100" width="685" height="15"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="F0o-6a-EMC">
+ <rect key="frame" x="-100" y="-100" width="15" height="206"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <tableHeaderView key="headerView" id="X9E-z1-8Hv">
+ <rect key="frame" x="0.0" y="0.0" width="771" height="17"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </tableHeaderView>
+ <connections>
+ <outlet property="nextKeyView" destination="N4q-sT-WgW" id="6gC-Nj-s8x"/>
+ </connections>
+ </scrollView>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="RtZ-Cz-5mG">
+ <rect key="frame" x="18" y="198" width="205" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Audio Encoder Settings:" id="007-WM-RmC">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <segmentedControl verticalHuggingPriority="750" id="N4q-sT-WgW">
+ <rect key="frame" x="18" y="19" width="54" height="20"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <segmentedCell key="cell" controlSize="small" borderStyle="border" alignment="left" style="rounded" trackingMode="momentary" id="otA-K4-TxM">
+ 
+ <segments>
+ <segment image="NSAddTemplate" width="24">
+ <nil key="label"/>
+ </segment>
+ <segment image="NSRemoveTemplate" width="23" tag="1">
+ <nil key="label"/>
+ </segment>
+ </segments>
+ </segmentedCell>
+ <connections>
+ <action selector="addTrack:" target="-2" id="vsd-5z-3e3"/>
+ <outlet property="nextKeyView" destination="sC2-52-liU" id="mmR-bd-cFG"/>
+ </connections>
+ </segmentedControl>
+ </subviews>
+ </view>
+ <connections>
+ <outlet property="initialFirstResponder" destination="oiD-QI-wly" id="Vxi-xi-P0d"/>
+ </connections>
+ </window>
+ <arrayController objectClassName="HBLang" id="ZBe-aP-wvq" userLabel="Languages Table Controller" customClass="HBLanguageArrayController">
+ <declaredKeys>
+ <string>language</string>
+ <string>isSelected</string>
+ </declaredKeys>
+ <connections>
+ <binding destination="-2" name="contentArray" keyPath="languagesList.languagesArray" id="vKV-y3-Zbg"/>
+ <outlet property="tableView" destination="Of7-71-Ci6" id="IBV-kN-tPc"/>
+ </connections>
+ </arrayController>
+ <arrayController objectClassName="HBAudioTrackPreset" id="I6S-EX-Dvu" userLabel="Tracks Controller">
+ <declaredKeys>
+ <string>encoder</string>
+ <string>mixdown</string>
+ <string>sampleRate</string>
+ <string>bitRate</string>
+ <string>gain</string>
+ <string>drc</string>
+ </declaredKeys>
+ <connections>
+ <binding destination="-2" name="contentArray" keyPath="self.settings.tracksArray" id="oDO-aQ-oZJ"/>
+ </connections>
+ </arrayController>
+ </objects>
+ <resources>
+ <image name="NSAddTemplate" width="8" height="8"/>
+ <image name="NSRemoveTemplate" width="8" height="8"/>
+ </resources>
+</document>

HandBrake-0.10.0.tar.bz2/macosx/English.lproj/ChaptersTitles.xib Added

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F7" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <deployment version="1060" identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="HBChapterTitlesController">
+ <connections>
+ <outlet property="fChapterTable" destination="InF-gR-Lia" id="DSk-hZ-TGI"/>
+ <outlet property="fChapterTableNameColumn" destination="Z6H-lJ-ipr" id="TkJ-3q-ejW"/>
+ <outlet property="fCreateChaptersMarkers" destination="7Xf-c0-jsr" id="RqA-eo-yhD"/>
+ <outlet property="fLoadChaptersButton" destination="Ron-3B-rYg" id="6Tt-yt-c0U"/>
+ <outlet property="fSaveChaptersButton" destination="3SP-6e-RPS" id="LxX-yO-VCg"/>
+ <outlet property="view" destination="qs9-Xl-pXA" id="km6-16-y27"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application"/>
+ <view id="qs9-Xl-pXA">
+ <rect key="frame" x="0.0" y="0.0" width="926" height="322"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <scrollView horizontalLineScroll="19" horizontalPageScroll="0.0" verticalLineScroll="19" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="lqY-aE-MZi">
+ <rect key="frame" x="20" y="20" width="886" height="266"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <clipView key="contentView" id="3Pi-zz-fFg">
+ <rect key="frame" x="1" y="17" width="884" height="248"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" headerView="0rK-Rs-NTb" id="InF-gR-Lia">
+ <rect key="frame" x="0.0" y="0.0" width="884" height="248"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <size key="intercellSpacing" width="3" height="2"/>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+ <tableColumns>
+ <tableColumn identifier="1" editable="NO" width="91" minWidth="40" maxWidth="1000" id="0iF-eL-NOC">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Chapter">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
+ </tableHeaderCell>
+ <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="FyM-2X-9xs">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ </tableColumn>
+ <tableColumn identifier="2" width="787" minWidth="77.217290000000006" maxWidth="1000" id="Z6H-lJ-ipr">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Chapter Title">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
+ </tableHeaderCell>
+ <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="ozt-ED-g1M">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ </tableColumn>
+ </tableColumns>
+ <connections>
+ <outlet property="dataSource" destination="-2" id="7rd-Et-5BT"/>
+ <outlet property="delegate" destination="-2" id="DOu-XY-6Tq"/>
+ </connections>
+ </tableView>
+ </subviews>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </clipView>
+ <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="O2b-uL-5ea">
+ <rect key="frame" x="-100" y="-100" width="488" height="15"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="yp0-pp-Yw7">
+ <rect key="frame" x="869" y="17" width="16" height="248"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <tableHeaderView key="headerView" id="0rK-Rs-NTb">
+ <rect key="frame" x="0.0" y="0.0" width="884" height="17"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </tableHeaderView>
+ </scrollView>
+ <button id="7Xf-c0-jsr">
+ <rect key="frame" x="17" y="294" width="165" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="check" title="Create chapter markers" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="lJL-wX-DVP">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="createChapterMarkersChanged:" target="-2" id="J6X-VM-8Me"/>
+ <binding destination="-2" name="value" keyPath="createChapterMarkers" id="7It-q2-Xl3"/>
+ </connections>
+ </button>
+ <button verticalHuggingPriority="750" id="Ron-3B-rYg">
+ <rect key="frame" x="656" y="288" width="129" height="28"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="push" title="Import Chapters…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="PM3-Ue-0kW">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="browseForChapterFile:" target="-2" id="yMS-zB-Pa6"/>
+ </connections>
+ </button>
+ <button verticalHuggingPriority="750" id="3SP-6e-RPS">
+ <rect key="frame" x="783" y="288" width="128" height="28"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="push" title="Export Chapters…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="h0O-zg-OF9">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="browseForChapterFileSave:" target="-2" id="kKu-5B-QsT"/>
+ </connections>
+ </button>
+ </subviews>
+ </view>
+ <userDefaultsController representsSharedInstance="YES" id="coy-s6-QLx"/>
+ </objects>
+</document>

HandBrake-0.9.9.tar.bz2/macosx/English.lproj/InfoPlist.strings -> HandBrake-0.10.0.tar.bz2/macosx/English.lproj/InfoPlist.strings Changed

HandBrake-0.9.9.tar.bz2/macosx/English.lproj/MainMenu.xib -> HandBrake-0.10.0.tar.bz2/macosx/English.lproj/MainMenu.xib Changed

@@ -1,13405 +1,1130 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">12D78</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.37</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">3084</string>
-		</object>
-		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSArrayController</string>
-			<string>NSBox</string>
-			<string>NSButton</string>
-			<string>NSButtonCell</string>
-			<string>NSCustomObject</string>
-			<string>NSCustomView</string>
-			<string>NSDrawer</string>
-			<string>NSImageCell</string>
-			<string>NSImageView</string>
-			<string>NSMatrix</string>
-			<string>NSMenu</string>
-			<string>NSMenuItem</string>
-			<string>NSNumberFormatter</string>
-			<string>NSOutlineView</string>
-			<string>NSPopUpButton</string>
-			<string>NSPopUpButtonCell</string>
-			<string>NSProgressIndicator</string>
-			<string>NSScrollView</string>
-			<string>NSScroller</string>
-			<string>NSSlider</string>
-			<string>NSSliderCell</string>
-			<string>NSTabView</string>
-			<string>NSTabViewItem</string>
-			<string>NSTableColumn</string>
-			<string>NSTableHeaderView</string>
-			<string>NSTableView</string>
-			<string>NSTextField</string>
-			<string>NSTextFieldCell</string>
-			<string>NSUserDefaultsController</string>
-			<string>NSView</string>
-			<string>NSWindowTemplate</string>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="411085004">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="1046316778">
-				<object class="NSMutableString" key="NSClassName">
-					<characters key="NS.bytes">NSApplication</characters>
-				</object>
-			</object>
-			<object class="NSCustomObject" id="952684036">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="300550588">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="192660081">
-				<int key="NSWindowStyleMask">4103</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{41, 572}, {959, 558}}</string>
-				<int key="NSWTFlags">1886912512</int>
-				<string key="NSWindowTitle">HandBrake</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<object class="NSMutableString" key="NSViewClass">
-					<characters key="NS.bytes">View</characters>
-				</object>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<string key="NSWindowContentMinSize">{213, 107}</string>
-				<object class="NSView" key="NSWindowView" id="168918359">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSTextField" id="794651271">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{18, 2}, {711, 28}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="1007421233"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="10523918">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">4325376</int>
-								<string type="base64-UTF8" key="NSContents">RE8gTk9UIFRSQU5TTEFURSBUSElTIE5JQiBGSUxFLAo</string>
-								<object class="NSFont" key="NSSupport" id="26">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">11</double>
-									<int key="NSfFlags">3100</int>
-								</object>
-								<reference key="NSControlView" ref="794651271"/>
-								<object class="NSColor" key="NSBackgroundColor" id="242973447">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">controlColor</string>
-									<object class="NSColor" key="NSColor" id="458742033">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-									</object>
-								</object>
-								<object class="NSColor" key="NSTextColor" id="701609070">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">controlTextColor</string>
-									<object class="NSColor" key="NSColor" id="544409939">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MAA</bytes>
-									</object>
-								</object>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSProgressIndicator" id="222334056">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">1288</int>
-							<string key="NSFrame">{{18, -26}, {930, 20}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView"/>
-							<int key="NSpiFlags">16396</int>
-							<double key="NSMaxValue">100</double>
-						</object>
-						<object class="NSTabView" id="712502892">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{13, 28}, {940, 343}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="1053078401"/>
-							<object class="NSMutableArray" key="NSTabViewItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSTabViewItem" id="107038816">
-									<string key="NSIdentifier">1</string>
-									<object class="NSView" key="NSView" id="1053078401">
-										<reference key="NSNextResponder" ref="712502892"/>
-										<int key="NSvFlags">256</int>
-										<object class="NSMutableArray" key="NSSubviews">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSTextField" id="521019277">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{14, 247}, {94, 19}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="888819828"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="200565868">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">4194304</int>
-													<string key="NSContents">Video Quality:</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="521019277"/>
-													<reference key="NSBackgroundColor" ref="242973447"/>
-													<reference key="NSTextColor" ref="701609070"/>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
-											<object class="NSTextField" id="783405221">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{170, 209}, {84, 19}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="1000247853"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="351953267">
-													<int key="NSCellFlags">-1804599231</int>
-													<int key="NSCellFlags2">4326400</int>
-													<string key="NSContents"/>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="783405221"/>
-													<bool key="NSDrawsBackground">YES</bool>
-													<object class="NSColor" key="NSBackgroundColor" id="138233214">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">textBackgroundColor</string>
-														<object class="NSColor" key="NSColor" id="809784795">
-															<int key="NSColorSpace">3</int>
-															<bytes key="NSWhite">MQA</bytes>
-														</object>
-													</object>
-													<object class="NSColor" key="NSTextColor" id="378140636">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">textColor</string>
-														<reference key="NSColor" ref="544409939"/>
-													</object>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
-											<object class="NSSlider" id="239657287">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{281, 229}, {622, 16}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="783405221"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSSliderCell" key="NSCell" id="160453387">
-													<int key="NSCellFlags">67371264</int>
-													<int key="NSCellFlags2">262144</int>
-													<object class="NSMutableString" key="NSContents">
-														<characters key="NS.bytes"/>
-													</object>
-													<object class="NSFont" key="NSSupport" id="22">
-														<string key="NSName">LucidaGrande</string>
-														<double key="NSSize">9</double>
-														<int key="NSfFlags">3614</int>
-													</object>
-													<reference key="NSControlView" ref="239657287"/>
-													<double key="NSMaxValue">51</double>
-													<double key="NSMinValue">0.0</double>
-													<double key="NSValue">19</double>
-													<double key="NSAltIncValue">0.0</double>
-													<int key="NSNumberOfTickMarks">205</int>
-													<int key="NSTickMarkPosition">1</int>
-													<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
-													<bool key="NSVertical">NO</bool>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
-											<object class="NSTextField" id="987137669">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{16, 20}, {892, 14}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="503933842"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="537000521">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">4194304</int>
-													<string key="NSContents">Picture Settings:</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="987137669"/>
-													<reference key="NSBackgroundColor" ref="242973447"/>
-													<reference key="NSTextColor" ref="701609070"/>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
-											<object class="NSTextField" id="690304958">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{192, 231}, {65, 14}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="239657287"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="923732752">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">-2143158272</int>
-													<string key="NSContents"/>
-													<reference key="NSSupport" ref="26"/>
-													<object class="NSNumberFormatter" key="NSFormatter" id="580574518">
-														<object class="NSMutableDictionary" key="NS.attributes">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<object class="NSArray" key="dict.sortedKeys">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<string>allowsFloats</string>
-																<string>formatterBehavior</string>
-																<string>lenient</string>
-																<string>locale</string>
-																<string>negativeInfinitySymbol</string>
-																<string>nilSymbol</string>
-																<string>numberStyle</string>
-																<string>positiveInfinitySymbol</string>
-															</object>
-															<object class="NSArray" key="dict.values">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<boolean value="YES"/>
-																<integer value="1040"/>
-																<boolean value="NO"/>
-																<object class="NSLocale">
-																	<string key="NS.identifier"/>
-																</object>
-																<string>-∞</string>
-																<string/>
-																<integer value="1"/>
-																<string>+∞</string>
-															</object>
-														</object>
-														<string key="NS.positiveformat">#,##0.###</string>
-														<string key="NS.negativeformat">#,##0.###</string>
-														<nil key="NS.positiveattrs"/>
-														<nil key="NS.negativeattrs"/>
-														<nil key="NS.zero"/>
-														<object class="NSAttributedString" key="NS.nil">
-															<string key="NSString"/>
-														</object>
-														<object class="NSAttributedString" key="NS.nan">
-															<string key="NSString">NaN</string>
-															<object class="NSDictionary" key="NSAttributes">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<object class="NSArray" key="dict.sortedKeys" id="0">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																</object>
-																<reference key="dict.values" ref="0"/>
-															</object>
-														</object>
-														<object class="NSDecimalNumberPlaceholder" key="NS.min" id="464006568">
-															<int key="NS.exponent">0</int>
-															<int key="NS.length">0</int>
-															<bool key="NS.negative">YES</bool>
-															<bool key="NS.compact">NO</bool>
-															<int key="NS.mantissa.bo">1</int>
-															<bytes key="NS.mantissa">AAAAAAAAAAAAAAAAAAAAAA</bytes>
-														</object>
-														<reference key="NS.max" ref="464006568"/>
-														<object class="NSDecimalNumberHandler" key="NS.rounding">
-															<int key="NS.roundingmode">3</int>
-															<bool key="NS.raise.overflow">YES</bool>
-															<bool key="NS.raise.underflow">YES</bool>
-															<bool key="NS.raise.dividebyzero">YES</bool>
-														</object>
-														<string key="NS.decimal">.</string>
-														<string key="NS.thousand">,</string>
-														<bool key="NS.hasthousands">YES</bool>
-														<bool key="NS.localized">NO</bool>
-														<bool key="NS.allowsfloats">YES</bool>
-													</object>
-													<reference key="NSControlView" ref="690304958"/>
-													<reference key="NSBackgroundColor" ref="242973447"/>
-													<reference key="NSTextColor" ref="701609070"/>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
-											<object class="NSTextField" id="323705695">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{167, 231}, {28, 14}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="690304958"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="936221726">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">4325376</int>
-													<string key="NSContents">RF:</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="323705695"/>
-													<reference key="NSBackgroundColor" ref="242973447"/>
-													<reference key="NSTextColor" ref="701609070"/>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
-											<object class="NSTextField" id="503933842">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{16, 4}, {892, 14}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="109092334">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">4194304</int>
-													<string key="NSContents">Picture Filters:</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="503933842"/>
-													<reference key="NSBackgroundColor" ref="242973447"/>
-													<reference key="NSTextColor" ref="701609070"/>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
-											<object class="NSPopUpButton" id="222980245">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{372, 272}, {158, 22}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="521019277"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSPopUpButtonCell" key="NSCell" id="343952154">
-													<int key="NSCellFlags">-2076180416</int>
-													<int key="NSCellFlags2">132096</int>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="222980245"/>
-													<int key="NSButtonFlags">109199360</int>
-													<int key="NSButtonFlags2">1</int>
-													<reference key="NSAlternateImage" ref="26"/>
-													<string key="NSAlternateContents"/>
-													<object class="NSMutableString" key="NSKeyEquivalent">
-														<characters key="NS.bytes"/>
-													</object>
-													<int key="NSPeriodicDelay">400</int>
-													<int key="NSPeriodicInterval">75</int>
-													<object class="NSMenuItem" key="NSMenuItem" id="996965095">
-														<reference key="NSMenu" ref="794681411"/>
-														<string key="NSTitle"/>
-														<string key="NSKeyEquiv"/>
-														<int key="NSKeyEquivModMask">1048576</int>
-														<int key="NSMnemonicLoc">2147483647</int>
-														<int key="NSState">1</int>
-														<object class="NSCustomResource" key="NSOnImage" id="447995298">
-															<string key="NSClassName">NSImage</string>
-															<string key="NSResourceName">NSMenuCheckmark</string>
-														</object>
-														<object class="NSCustomResource" key="NSMixedImage" id="760317610">
-															<string key="NSClassName">NSImage</string>
-															<string key="NSResourceName">NSMenuMixedState</string>
-														</object>
-														<string key="NSAction">_popUpItemAction:</string>
-														<reference key="NSTarget" ref="343952154"/>
-													</object>
-													<bool key="NSMenuItemRespectAlignment">YES</bool>
-													<object class="NSMenu" key="NSMenu" id="794681411">
-														<object class="NSMutableString" key="NSTitle">
-															<characters key="NS.bytes">OtherViews</characters>
-														</object>
-														<object class="NSMutableArray" key="NSMenuItems">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<reference ref="996965095"/>
-														</object>
-													</object>
-													<int key="NSPreferredEdge">3</int>
-													<bool key="NSUsesItemFromMenu">YES</bool>
-													<bool key="NSAltersState">YES</bool>
-													<int key="NSArrowPosition">1</int>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
-											<object class="NSButton" id="1000247853">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{279, 209}, {124, 18}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="447003158"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSButtonCell" key="NSCell" id="860863090">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">131072</int>
-													<string key="NSContents">2-pass encoding</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="1000247853"/>
-													<int key="NSButtonFlags">1211912448</int>
-													<int key="NSButtonFlags2">2</int>
-													<object class="NSButtonImageSource" key="NSAlternateImage" id="624832340">
-														<string key="NSImageName">NSSwitch</string>
-													</object>
-													<string key="NSAlternateContents"/>
-													<string key="NSKeyEquivalent"/>
-													<int key="NSPeriodicDelay">200</int>
-													<int key="NSPeriodicInterval">25</int>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
-											<object class="NSButton" id="447003158">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{416, 210}, {107, 16}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="954159030"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSButtonCell" key="NSCell" id="1070893195">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">131072</int>
-													<string key="NSContents">Turbo first pass</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="447003158"/>
-													<int key="NSButtonFlags">1211912448</int>
-													<int key="NSButtonFlags2">2</int>
-													<object class="NSCustomResource" key="NSNormalImage" id="887198214">
-														<string key="NSClassName">NSImage</string>
-														<string key="NSResourceName">NSSwitch</string>
-													</object>
-													<reference key="NSAlternateImage" ref="624832340"/>
-													<string key="NSAlternateContents"/>
-													<string key="NSKeyEquivalent"/>
-													<int key="NSPeriodicDelay">200</int>
-													<int key="NSPeriodicInterval">25</int>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
-											<object class="NSPopUpButton" id="12330413">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{98, 272}, {149, 22}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="463960465"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSPopUpButtonCell" key="NSCell" id="1018849574">
-													<int key="NSCellFlags">-2076180416</int>
-													<int key="NSCellFlags2">132096</int>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="12330413"/>
-													<int key="NSButtonFlags">109199360</int>
-													<int key="NSButtonFlags2">1</int>
-													<reference key="NSAlternateImage" ref="26"/>
-													<string key="NSAlternateContents"/>
-													<object class="NSMutableString" key="NSKeyEquivalent">
-														<characters key="NS.bytes"/>
-													</object>
-													<int key="NSPeriodicDelay">400</int>
-													<int key="NSPeriodicInterval">75</int>
-													<object class="NSMenuItem" key="NSMenuItem" id="536275725">
-														<reference key="NSMenu" ref="605902924"/>
-														<string key="NSTitle"/>
-														<string key="NSKeyEquiv"/>
-														<int key="NSKeyEquivModMask">1048576</int>
-														<int key="NSMnemonicLoc">2147483647</int>
-														<int key="NSState">1</int>
-														<reference key="NSOnImage" ref="447995298"/>
-														<reference key="NSMixedImage" ref="760317610"/>
-														<string key="NSAction">_popUpItemAction:</string>
-														<reference key="NSTarget" ref="1018849574"/>
-													</object>
-													<bool key="NSMenuItemRespectAlignment">YES</bool>
-													<object class="NSMenu" key="NSMenu" id="605902924">
-														<object class="NSMutableString" key="NSTitle">
-															<characters key="NS.bytes">OtherViews</characters>
-														</object>
-														<object class="NSMutableArray" key="NSMenuItems">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<reference ref="536275725"/>
-														</object>
-													</object>
-													<int key="NSPreferredEdge">3</int>
-													<bool key="NSUsesItemFromMenu">YES</bool>
-													<bool key="NSAltersState">YES</bool>
-													<int key="NSArrowPosition">1</int>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
-											<object class="NSTextField" id="463960465">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{278, 274}, {92, 17}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="222980245"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="509250281">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">71303168</int>
-													<string key="NSContents">Framerate (FPS):</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="463960465"/>
-													<reference key="NSBackgroundColor" ref="242973447"/>
-													<reference key="NSTextColor" ref="701609070"/>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
-											<object class="NSTextField" id="1064150725">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{14, 274}, {79, 17}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="12330413"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="451922400">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">4194304</int>
-													<string key="NSContents">Video Codec:</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="1064150725"/>
-													<reference key="NSBackgroundColor" ref="242973447"/>
-													<reference key="NSTextColor" ref="701609070"/>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
-											<object class="NSMatrix" id="1036976683">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{17, 209}, {145, 38}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="323705695"/>
-												<bool key="NSEnabled">YES</bool>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-												<int key="NSNumRows">2</int>
-												<int key="NSNumCols">1</int>
-												<object class="NSMutableArray" key="NSCells">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSButtonCell" id="613962178">
-														<int key="NSCellFlags">-2080374784</int>
-														<int key="NSCellFlags2">131072</int>
-														<string key="NSContents">Constant Quality</string>
-														<reference key="NSSupport" ref="26"/>
-														<reference key="NSControlView" ref="1036976683"/>
-														<int key="NSTag">1</int>
-														<int key="NSButtonFlags">1211912448</int>
-														<int key="NSButtonFlags2">0</int>
-														<object class="NSButtonImageSource" key="NSAlternateImage" id="860784734">
-															<string key="NSImageName">NSRadioButton</string>
-														</object>
-														<string key="NSAlternateContents"/>
-														<string key="NSKeyEquivalent"/>
-														<int key="NSPeriodicDelay">200</int>
-														<int key="NSPeriodicInterval">25</int>
-													</object>
-													<object class="NSButtonCell" id="878990764">
-														<int key="NSCellFlags">67108864</int>
-														<int key="NSCellFlags2">131072</int>
-														<string key="NSContents">Average Bitrate (kbps):</string>
-														<reference key="NSSupport" ref="26"/>
-														<reference key="NSControlView" ref="1036976683"/>
-														<int key="NSButtonFlags">1211912448</int>
-														<int key="NSButtonFlags2">0</int>
-														<object class="NSImage" key="NSNormalImage">
-															<int key="NSImageFlags">549453824</int>
-															<string key="NSSize">{18, 18}</string>
-															<object class="NSMutableArray" key="NSReps">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<object class="NSArray">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<integer value="0"/>
-																	<object class="NSBitmapImageRep">
-																		<object class="NSData" key="NSTIFFRepresentation">
-																			<bytes key="NS.bytes">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
-AAAAAF1KAAA0kQAACCVYWVogAAAAAAAAdCAAALRgAAAjPVhZWiAAAAAAAAAlbAAAFyoAAKfDWFlaIAAA
-AAAAAPNSAAEAAAABFs9zZjMyAAAAAAABDEIAAAXe///zJgAAB5IAAP2R///7ov///aMAAAPcAADAbGN1
-cnYAAAAAAAAAAQHNAABjdXJ2AAAAAAAAAAEBzQAAY3VydgAAAAAAAAABAc0AAHZjZ3QAAAAAAAAAAAAD
-AQAAAQACBAUGBwkKCw0ODxASExQWFxgaGxweHyAiIyQmJygpKywtLzAxMjM1Njc4OTs8PT5AQUJDREZH
-SElKS0xOT1BRUlNUVVZXWFlaW1xdXl9hYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ent8fX5/gIGCg4SF
-hoeIiYqLjI2Oj5CRkpOUlZaXmJmam5ydnZ6foKGio6SlpqanqKmqq6ytra6vsLGysrO0tba3uLi5uru8
-vL2+v8DBwcLDxMXGxsfIycrKy8zNzs7P0NHS0tPU1dbW19jZ2drb3Nzd3t/g4eLi4+Tl5ufo6enq6+zt
-7u/w8fHy8/T19vf4+fr7/P3+/v8AAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR8gISIjJCUnKCkq
-Ky0uLzAxMzQ1Njc4OTo7PD0/QEFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaWltcXV5fYGFiY2RlZmdo
-aWprbG1ub3BxcnN0dXZ3d3h5ent8fH1+f4CBgoKDhIWGh4iIiYqLjI2Oj5CRkpOUlJWWl5iZmpucnZ2e
-n6ChoqOkpaamp6ipqqusra6vsLCxsrO0tba3uLm5uru8vb6/wMHCw8TFx8jJysvMzc7P0NDR0tPU1dbX
-2Nna29ze3+Dh4uPk5ebn6err7O3u7/Hy8/T19vf5+vv8/f7/AAIDAwQFBgcICQoKCwwNDg8QERITFBUW
-FxgZGhscHR4fICEiIyQlJicoKSorLC0uLzAxMjM0NTY3ODg5Ojs8PT4+P0BBQkNDREVGR0hJSUpLTE1O
-Tk9QUVJSU1RVVVZXWFhZWltbXF1eXl9gYWFiY2RkZWZnZ2hpaWprbGxtbm5vcHFxcnNzdHV1dnd4eHl6
-ent8fH1+fn+AgYGCg4SEhYaHiImJiouMjY6Oj5CRkpOTlJWWl5iZmZqbnJ2en6ChoqOkpaanqKmqq6yt
-rq+xsrO0tba3uLq7vL2+wMHDxMbHycrMzs/R0tTW19nb3d7g4uTm6Ors7vDy9Pb4+vz+/wAAbmRpbgAA
-AAAAAAY2AACXGgAAVjoAAFPKAACJ3gAAJ8IAABaoAABQDQAAVDkAAiuFAAIZmQABeFEAAwEAAAIAAAAA
-AAEABgANABcAIwAxAEAAUgBlAHsAkwCrAMUA4gD/AR8BPwFhAYUBqgHQAfgCIAJLAncCpQLSAwIDMwNl
-A5gDzgQFBD0EdQSvBOsFKQVnBacF6AYqBm4GtQb8B0UHkgfkCDkIkAjnCT4JmAn0ClAKrQsLC2sLygwq
-DIwM8Q1XDcAOKA6SDv4PbA/bEE0QxBE7EbQSMRKwEzITuRREFNAVYBXxFocXHhfAGGIZBBmsGlQa+RuU
-HC4czh1yHhQeux9jIA0gvCFoIhkizyOJJEEk+SW6JnknOygFKMspkypiKzIsASzXLawuhy9gMD4xGzH8
-MtszvzSgNYY2cjdcOEw5OTorOxs8CD0EPfU+6z/nQOFB2ELUQ9VE00XcRttH5EjxSgBLCUwdTTFOUE9v
-UI9Rt1LdVAVVNlZsV6VY4FohW21ct135X09goGH0Y0tkqGYFZ19oxGova5ptCG54b/BxbnLsdG119Xd/
-eQh6knwqfcV/W4D4gpSEO4Xih4CJKorYjIqOOY/jkZuTWJUOlsyYiZpSnB6d4Z+soX+jWqUvpxOo+6rj
-rMuuwLC4sra0rra0uL+60LzfvwDBHcLdxLXGhchYyi7MCs3lz7rRmtOA1WPXR9kq2xPc/97s4M/iveSn
-5o3obupT7ELuLPAM8fLz0PW396H5f/tZ/T3//wAAAAEAAwALABYAJQA3AE0AZQCBAJ8AwQDlAQsBNQFh
-AZABwQH1AisCZAKfAtwDHANfA6MD6gQ0BH8EzQT1BR0FcAXEBhsGdAbPBy0HXAeMB+4IUgi4CSAJVAmK
-CfYKZArVC0cLgQu8DDIMqw0mDaIOIQ6hDyQPqRAvELgQ/RFDEc8SXRLuE4AUFRSrFUMV3RZ5FxcXthhY
-GPwZoRpIGvEbnBxJHPgdqB5bHw8fxSB9ITch8iKwJDAk8yW3Jn4nRigQKNwpqSp5K0osHCzxLccuoC95
-MFUxMzISMvMz1TS5NaA2hzdxOFw5STo4Oyg8Gj4DPvs/9EDuQepD6ETpRexG8Uf3SP9LFEwhTTBOQE9S
-UGZSklOrVMVV4Vb/WB5ZP1phW4Vcq13SXvthUmJ/Y69k4GYSZ0dofGm0au1tZG6ib+FxInJlc6l073Y2
-d396FXtjfLJ+A39VgKmB/4NWhK+GCYjCiiGLgYzjjkePrJESknuT5Ja8mCuZm5sMnH+d9J9qoOGiWqPV
-pVGmz6eOqE6pzqtRrNSuWq/gsWmy8rR+tgu5Kbq6vE294b93wQ7Cp8RBxd3He8kZyrrLisxbzf/Po9FK
-0vHUm9ZF1/HZn9tO3Cbc/96x4GTiGePQ5YjnQegf6Pzquex27jbv9/G583z0X/VC9wj40Pqa/GX+Mf//
-AAAAAQADAAsAJQA3AE0AZQCBAJ8AwQELATUBYQGQAcEB9QIrAmQCnwLcAxwDXwOjA+oENAR/BM0FHQVw
-BcQGGwZ0Bs8HLQeMB+4IUgi4CSAJign2CmQK1QtHC7wMMgyrDSYNog4hDqEPJA+pEC8QuBFDEl0S7hOA
-FBUUqxVDFnkXFxe2GFgY/BpIGvEbnBxJHPgdqB8PH8UgfSE3IfIjbyQwJPMltydGKBAo3Cp5K0osHC3H
-LqAveTEzMhIy8zS5NaA2hzhcOUk6ODwaPQ4+Az/0QO5C6EPoROlG8Uf3SglLFEwhTkBPUlF7UpJUxVXh
-Vv9ZP1phXKtd0mAlYVJjr2TgZhJofGm0au1tZG6ib+FxInJldO92Nnd/eMl6FXyyfgN/VYCpgf+Er4YJ
-h2WIwoohi4GOR4+skRKSe5PklVCWvJgrmZubDJx/nfSfaqDholqj1aVRps+oTqnOq1Gs1K2Xrlqv4LFp
-svK0frYLt5m5Kbnxurq8Tb3hv3fBDsHawqfEQcUPxd3He8hKyRnKusuKzFvN/87Rz6PQdtFK0vHTxtSb
-1kXXG9fx2MjZn9tO3Cbc/93Y3rHfiuBk4hni9ePQ5KzliOZk50HoH+j86drqueuX7HbtVu427xbv9/DX
-8bnymvN89F/1QvYl9wj37PjQ+bX6mvt//GX9S/4x//8AAGRlc2MAAAAAAAAACkNvbG9yIExDRAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAABtbHVjAAAAAAAAAAEAAAAMZW5VUwAAABIAAAAcAEMAbwBsAG8AcgAgAEwAQwBE
-AABtbW9kAAAAAAAABhAAAJxOAAAAAL5zkQAAAAAAAAAAAAAAAAAAAAAAdGV4dAAAAABDb3B5cmlnaHQg
-QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes>
-																		</object>
-																	</object>
-																</object>
-															</object>
-															<object class="NSColor" key="NSColor" id="936477564">
-																<int key="NSColorSpace">3</int>
-																<bytes key="NSWhite">MCAwAA</bytes>
-															</object>
-														</object>
-														<reference key="NSAlternateImage" ref="860784734"/>
-														<int key="NSPeriodicDelay">400</int>
-														<int key="NSPeriodicInterval">75</int>
-													</object>
-												</object>
-												<string key="NSCellSize">{145, 18}</string>
-												<string key="NSIntercellSpacing">{4, 2}</string>
-												<int key="NSMatrixFlags">1151868928</int>
-												<string key="NSCellClass">NSActionCell</string>
-												<object class="NSButtonCell" key="NSProtoCell" id="121093497">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Radio</string>
-													<object class="NSFont" key="NSSupport" id="273283760">
-														<string key="NSName">LucidaGrande</string>
-														<double key="NSSize">13</double>
-														<int key="NSfFlags">1044</int>
-													</object>
-													<int key="NSButtonFlags">1211912448</int>
-													<int key="NSButtonFlags2">0</int>
-													<object class="NSImage" key="NSNormalImage">
-														<int key="NSImageFlags">549453824</int>
-														<string key="NSSize">{18, 18}</string>
-														<object class="NSMutableArray" key="NSReps">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<object class="NSArray">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<integer value="0"/>
-																<object class="NSBitmapImageRep">
-																	<object class="NSData" key="NSTIFFRepresentation">
-																		<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw
-IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/
-29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5
-dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA
-AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG
-AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/
-0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/
-7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/
-5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/
-3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD
-AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns
-AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/
-6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/
-/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/
-///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl
-YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA
-AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD
-AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
-AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
-AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
-AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
-AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
-																	</object>
-																</object>
-															</object>
-														</object>
-														<reference key="NSColor" ref="936477564"/>
-													</object>
-													<reference key="NSAlternateImage" ref="860784734"/>
-													<int key="NSPeriodicDelay">400</int>
-													<int key="NSPeriodicInterval">75</int>
-												</object>
-												<reference key="NSSelectedCell" ref="613962178"/>
-												<reference key="NSBackgroundColor" ref="242973447"/>
-												<reference key="NSCellBackgroundColor" ref="809784795"/>
-												<reference key="NSFont" ref="273283760"/>
-											</object>
-											<object class="NSMatrix" id="888819828">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{540, 255}, {157, 38}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="1036976683"/>
-												<bool key="NSEnabled">YES</bool>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-												<int key="NSNumRows">2</int>
-												<int key="NSNumCols">1</int>
-												<object class="NSMutableArray" key="NSCells">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSButtonCell" id="329026312">
-														<int key="NSCellFlags">-2080374784</int>
-														<int key="NSCellFlags2">131072</int>
-														<string key="NSContents">Variable Framerate</string>
-														<reference key="NSSupport" ref="26"/>
-														<reference key="NSControlView" ref="888819828"/>
-														<int key="NSTag">1</int>
-														<int key="NSButtonFlags">1211912448</int>
-														<int key="NSButtonFlags2">0</int>
-														<reference key="NSAlternateImage" ref="860784734"/>
-														<string key="NSAlternateContents"/>
-														<string key="NSKeyEquivalent"/>
-														<int key="NSPeriodicDelay">200</int>
-														<int key="NSPeriodicInterval">25</int>
-													</object>
-													<object class="NSButtonCell" id="995154792">
-														<int key="NSCellFlags">67108864</int>
-														<int key="NSCellFlags2">131072</int>
-														<string key="NSContents">Constant Framerate</string>
-														<reference key="NSSupport" ref="26"/>
-														<reference key="NSControlView" ref="888819828"/>
-														<int key="NSButtonFlags">1211912448</int>
-														<int key="NSButtonFlags2">0</int>
-														<object class="NSImage" key="NSNormalImage">
-															<int key="NSImageFlags">549453824</int>
-															<string key="NSSize">{18, 18}</string>
-															<object class="NSMutableArray" key="NSReps">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<object class="NSArray">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<integer value="0"/>
-																	<object class="NSBitmapImageRep">
-																		<object class="NSData" key="NSTIFFRepresentation">
-																			<bytes key="NS.bytes">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
-AAAAAF1KAAA0kQAACCVYWVogAAAAAAAAdCAAALRgAAAjPVhZWiAAAAAAAAAlbAAAFyoAAKfDWFlaIAAA
-AAAAAPNSAAEAAAABFs9zZjMyAAAAAAABDEIAAAXe///zJgAAB5IAAP2R///7ov///aMAAAPcAADAbGN1
-cnYAAAAAAAAAAQHNAABjdXJ2AAAAAAAAAAEBzQAAY3VydgAAAAAAAAABAc0AAHZjZ3QAAAAAAAAAAAAD
-AQAAAQACBAUGBwkKCw0ODxASExQWFxgaGxweHyAiIyQmJygpKywtLzAxMjM1Njc4OTs8PT5AQUJDREZH
-SElKS0xOT1BRUlNUVVZXWFlaW1xdXl9hYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ent8fX5/gIGCg4SF
-hoeIiYqLjI2Oj5CRkpOUlZaXmJmam5ydnZ6foKGio6SlpqanqKmqq6ytra6vsLGysrO0tba3uLi5uru8
-vL2+v8DBwcLDxMXGxsfIycrKy8zNzs7P0NHS0tPU1dbW19jZ2drb3Nzd3t/g4eLi4+Tl5ufo6enq6+zt
-7u/w8fHy8/T19vf4+fr7/P3+/v8AAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR8gISIjJCUnKCkq
-Ky0uLzAxMzQ1Njc4OTo7PD0/QEFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaWltcXV5fYGFiY2RlZmdo
-aWprbG1ub3BxcnN0dXZ3d3h5ent8fH1+f4CBgoKDhIWGh4iIiYqLjI2Oj5CRkpOUlJWWl5iZmpucnZ2e
-n6ChoqOkpaamp6ipqqusra6vsLCxsrO0tba3uLm5uru8vb6/wMHCw8TFx8jJysvMzc7P0NDR0tPU1dbX
-2Nna29ze3+Dh4uPk5ebn6err7O3u7/Hy8/T19vf5+vv8/f7/AAIDAwQFBgcICQoKCwwNDg8QERITFBUW
-FxgZGhscHR4fICEiIyQlJicoKSorLC0uLzAxMjM0NTY3ODg5Ojs8PT4+P0BBQkNDREVGR0hJSUpLTE1O
-Tk9QUVJSU1RVVVZXWFhZWltbXF1eXl9gYWFiY2RkZWZnZ2hpaWprbGxtbm5vcHFxcnNzdHV1dnd4eHl6
-ent8fH1+fn+AgYGCg4SEhYaHiImJiouMjY6Oj5CRkpOTlJWWl5iZmZqbnJ2en6ChoqOkpaanqKmqq6yt
-rq+xsrO0tba3uLq7vL2+wMHDxMbHycrMzs/R0tTW19nb3d7g4uTm6Ors7vDy9Pb4+vz+/wAAbmRpbgAA
-AAAAAAY2AACXGgAAVjoAAFPKAACJ3gAAJ8IAABaoAABQDQAAVDkAAiuFAAIZmQABeFEAAwEAAAIAAAAA
-AAEABgANABcAIwAxAEAAUgBlAHsAkwCrAMUA4gD/AR8BPwFhAYUBqgHQAfgCIAJLAncCpQLSAwIDMwNl
-A5gDzgQFBD0EdQSvBOsFKQVnBacF6AYqBm4GtQb8B0UHkgfkCDkIkAjnCT4JmAn0ClAKrQsLC2sLygwq
-DIwM8Q1XDcAOKA6SDv4PbA/bEE0QxBE7EbQSMRKwEzITuRREFNAVYBXxFocXHhfAGGIZBBmsGlQa+RuU
-HC4czh1yHhQeux9jIA0gvCFoIhkizyOJJEEk+SW6JnknOygFKMspkypiKzIsASzXLawuhy9gMD4xGzH8
-MtszvzSgNYY2cjdcOEw5OTorOxs8CD0EPfU+6z/nQOFB2ELUQ9VE00XcRttH5EjxSgBLCUwdTTFOUE9v
-UI9Rt1LdVAVVNlZsV6VY4FohW21ct135X09goGH0Y0tkqGYFZ19oxGova5ptCG54b/BxbnLsdG119Xd/
-eQh6knwqfcV/W4D4gpSEO4Xih4CJKorYjIqOOY/jkZuTWJUOlsyYiZpSnB6d4Z+soX+jWqUvpxOo+6rj
-rMuuwLC4sra0rra0uL+60LzfvwDBHcLdxLXGhchYyi7MCs3lz7rRmtOA1WPXR9kq2xPc/97s4M/iveSn
-5o3obupT7ELuLPAM8fLz0PW396H5f/tZ/T3//wAAAAEAAwALABYAJQA3AE0AZQCBAJ8AwQDlAQsBNQFh
-AZABwQH1AisCZAKfAtwDHANfA6MD6gQ0BH8EzQT1BR0FcAXEBhsGdAbPBy0HXAeMB+4IUgi4CSAJVAmK
-CfYKZArVC0cLgQu8DDIMqw0mDaIOIQ6hDyQPqRAvELgQ/RFDEc8SXRLuE4AUFRSrFUMV3RZ5FxcXthhY
-GPwZoRpIGvEbnBxJHPgdqB5bHw8fxSB9ITch8iKwJDAk8yW3Jn4nRigQKNwpqSp5K0osHCzxLccuoC95
-MFUxMzISMvMz1TS5NaA2hzdxOFw5STo4Oyg8Gj4DPvs/9EDuQepD6ETpRexG8Uf3SP9LFEwhTTBOQE9S
-UGZSklOrVMVV4Vb/WB5ZP1phW4Vcq13SXvthUmJ/Y69k4GYSZ0dofGm0au1tZG6ib+FxInJlc6l073Y2
-d396FXtjfLJ+A39VgKmB/4NWhK+GCYjCiiGLgYzjjkePrJESknuT5Ja8mCuZm5sMnH+d9J9qoOGiWqPV
-pVGmz6eOqE6pzqtRrNSuWq/gsWmy8rR+tgu5Kbq6vE294b93wQ7Cp8RBxd3He8kZyrrLisxbzf/Po9FK
-0vHUm9ZF1/HZn9tO3Cbc/96x4GTiGePQ5YjnQegf6Pzquex27jbv9/G583z0X/VC9wj40Pqa/GX+Mf//
-AAAAAQADAAsAJQA3AE0AZQCBAJ8AwQELATUBYQGQAcEB9QIrAmQCnwLcAxwDXwOjA+oENAR/BM0FHQVw
-BcQGGwZ0Bs8HLQeMB+4IUgi4CSAJign2CmQK1QtHC7wMMgyrDSYNog4hDqEPJA+pEC8QuBFDEl0S7hOA
-FBUUqxVDFnkXFxe2GFgY/BpIGvEbnBxJHPgdqB8PH8UgfSE3IfIjbyQwJPMltydGKBAo3Cp5K0osHC3H
-LqAveTEzMhIy8zS5NaA2hzhcOUk6ODwaPQ4+Az/0QO5C6EPoROlG8Uf3SglLFEwhTkBPUlF7UpJUxVXh
-Vv9ZP1phXKtd0mAlYVJjr2TgZhJofGm0au1tZG6ib+FxInJldO92Nnd/eMl6FXyyfgN/VYCpgf+Er4YJ
-h2WIwoohi4GOR4+skRKSe5PklVCWvJgrmZubDJx/nfSfaqDholqj1aVRps+oTqnOq1Gs1K2Xrlqv4LFp
-svK0frYLt5m5Kbnxurq8Tb3hv3fBDsHawqfEQcUPxd3He8hKyRnKusuKzFvN/87Rz6PQdtFK0vHTxtSb
-1kXXG9fx2MjZn9tO3Cbc/93Y3rHfiuBk4hni9ePQ5KzliOZk50HoH+j86drqueuX7HbtVu427xbv9/DX
-8bnymvN89F/1QvYl9wj37PjQ+bX6mvt//GX9S/4x//8AAGRlc2MAAAAAAAAACkNvbG9yIExDRAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAABtbHVjAAAAAAAAAAEAAAAMZW5VUwAAABIAAAAcAEMAbwBsAG8AcgAgAEwAQwBE
-AABtbW9kAAAAAAAABhAAAJxOAAAAAL5zkQAAAAAAAAAAAAAAAAAAAAAAdGV4dAAAAABDb3B5cmlnaHQg
-QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes>
-																		</object>
-																	</object>
-																</object>
-															</object>
-															<reference key="NSColor" ref="936477564"/>
-														</object>
-														<reference key="NSAlternateImage" ref="860784734"/>
-														<int key="NSPeriodicDelay">400</int>
-														<int key="NSPeriodicInterval">75</int>
-													</object>
-												</object>
-												<string key="NSCellSize">{157, 18}</string>
-												<string key="NSIntercellSpacing">{4, 2}</string>
-												<int key="NSMatrixFlags">1151868928</int>
-												<string key="NSCellClass">NSActionCell</string>
-												<object class="NSButtonCell" key="NSProtoCell" id="217044635">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Radio</string>
-													<reference key="NSSupport" ref="273283760"/>
-													<int key="NSButtonFlags">1211912448</int>
-													<int key="NSButtonFlags2">0</int>
-													<object class="NSImage" key="NSNormalImage">
-														<int key="NSImageFlags">549453824</int>
-														<string key="NSSize">{18, 18}</string>
-														<object class="NSMutableArray" key="NSReps">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<object class="NSArray">
-																<bool key="EncodedWithXMLCoder">YES</bool>
-																<integer value="0"/>
-																<object class="NSBitmapImageRep">
-																	<object class="NSData" key="NSTIFFRepresentation">
-																		<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw
-IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/
-29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5
-dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA
-AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG
-AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/
-0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/
-7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/
-5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/
-3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD
-AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns
-AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/
-6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/
-/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/
-///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl
-YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA
-AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD
-AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
-AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
-AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
-AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
-AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
-																	</object>
-																</object>
-															</object>
-														</object>
-														<reference key="NSColor" ref="936477564"/>
-													</object>
-													<reference key="NSAlternateImage" ref="860784734"/>
-													<int key="NSPeriodicDelay">400</int>
-													<int key="NSPeriodicInterval">75</int>
-												</object>
-												<reference key="NSSelectedCell" ref="329026312"/>
-												<reference key="NSBackgroundColor" ref="242973447"/>
-												<reference key="NSCellBackgroundColor" ref="809784795"/>
-												<reference key="NSFont" ref="273283760"/>
-											</object>
-											<object class="NSBox" id="954159030">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">12</int>
-												<object class="NSMutableArray" key="NSSubviews">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSView" id="443817184">
-														<reference key="NSNextResponder" ref="954159030"/>
-														<int key="NSvFlags">274</int>
-														<object class="NSMutableArray" key="NSSubviews">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<object class="NSSlider" id="480823072">
-																<reference key="NSNextResponder" ref="443817184"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{243, 105}, {629, 16}}</string>
-																<reference key="NSSuperview" ref="443817184"/>
-																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView" ref="1031662534"/>
-																<string key="NSReuseIdentifierKey">_NS:779</string>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSSliderCell" key="NSCell" id="690637620">
-																	<int key="NSCellFlags">-2080112384</int>
-																	<int key="NSCellFlags2">262144</int>
-																	<string key="NSContents"/>
-																	<string key="NSCellIdentifier">_NS:779</string>
-																	<reference key="NSControlView" ref="480823072"/>
-																	<double key="NSMaxValue">5</double>
-																	<double key="NSMinValue">0.0</double>
-																	<double key="NSValue">0.0</double>
-																	<double key="NSAltIncValue">0.0</double>
-																	<int key="NSNumberOfTickMarks">2</int>
-																	<int key="NSTickMarkPosition">1</int>
-																	<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
-																	<bool key="NSVertical">NO</bool>
-																</object>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-															</object>
-															<object class="NSTextField" id="139432403">
-																<reference key="NSNextResponder" ref="443817184"/>
-																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{15, 107}, {79, 13}}</string>
-																<reference key="NSSuperview" ref="443817184"/>
-																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView" ref="527737261"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="367754591">
-																	<int key="NSCellFlags">67108864</int>
-																	<int key="NSCellFlags2">71303168</int>
-																	<string key="NSContents">x264 Preset:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="139432403"/>
-																	<reference key="NSBackgroundColor" ref="242973447"/>
-																	<reference key="NSTextColor" ref="701609070"/>
-																</object>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-															</object>
-															<object class="NSTextField" id="1031662534">
-																<reference key="NSNextResponder" ref="443817184"/>
-																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{15, 86}, {79, 13}}</string>
-																<reference key="NSSuperview" ref="443817184"/>
-																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView" ref="610425389"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="444043003">
-																	<int key="NSCellFlags">67108864</int>
-																	<int key="NSCellFlags2">71303168</int>
-																	<string key="NSContents">x264 Tune:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="1031662534"/>
-																	<reference key="NSBackgroundColor" ref="242973447"/>
-																	<reference key="NSTextColor" ref="701609070"/>
-																</object>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-															</object>
-															<object class="NSTextField" id="102651997">
-																<reference key="NSNextResponder" ref="443817184"/>
-																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{15, 65}, {79, 13}}</string>
-																<reference key="NSSuperview" ref="443817184"/>
-																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView" ref="112458239"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="858212432">
-																	<int key="NSCellFlags">67108864</int>
-																	<int key="NSCellFlags2">71303168</int>
-																	<string key="NSContents">H.264 Profile:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="102651997"/>
-																	<reference key="NSBackgroundColor" ref="242973447"/>
-																	<reference key="NSTextColor" ref="701609070"/>
-																</object>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-															</object>
-															<object class="NSTextField" id="8023338">
-																<reference key="NSNextResponder" ref="443817184"/>
-																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{15, 43}, {79, 13}}</string>
-																<reference key="NSSuperview" ref="443817184"/>
-																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView" ref="144142005"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="248169798">
-																	<int key="NSCellFlags">67108864</int>
-																	<int key="NSCellFlags2">71303168</int>
-																	<string key="NSContents">H.264 Level:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="8023338"/>
-																	<reference key="NSBackgroundColor" ref="242973447"/>
-																	<reference key="NSTextColor" ref="701609070"/>
-																</object>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-															</object>
-															<object class="NSPopUpButton" id="610425389">
-																<reference key="NSNextResponder" ref="443817184"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{98, 84}, {126, 15}}</string>
-																<reference key="NSSuperview" ref="443817184"/>
-																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView" ref="884471415"/>
-																<string key="NSReuseIdentifierKey">_NS:868</string>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSPopUpButtonCell" key="NSCell" id="1050851477">
-																	<int key="NSCellFlags">-2076180416</int>
-																	<int key="NSCellFlags2">264192</int>
-																	<reference key="NSSupport" ref="22"/>
-																	<string key="NSCellIdentifier">_NS:868</string>
-																	<reference key="NSControlView" ref="610425389"/>
-																	<int key="NSButtonFlags">109199360</int>
-																	<int key="NSButtonFlags2">129</int>
-																	<string key="NSAlternateContents"/>
-																	<string key="NSKeyEquivalent"/>
-																	<int key="NSPeriodicDelay">400</int>
-																	<int key="NSPeriodicInterval">75</int>
-																	<object class="NSMenuItem" key="NSMenuItem" id="791223578">
-																		<reference key="NSMenu" ref="353982019"/>
-																		<string key="NSTitle">Item 1</string>
-																		<string key="NSKeyEquiv"/>
-																		<int key="NSKeyEquivModMask">1048576</int>
-																		<int key="NSMnemonicLoc">2147483647</int>
-																		<int key="NSState">1</int>
-																		<reference key="NSOnImage" ref="447995298"/>
-																		<reference key="NSMixedImage" ref="760317610"/>
-																		<string key="NSAction">_popUpItemAction:</string>
-																		<reference key="NSTarget" ref="1050851477"/>
-																	</object>
-																	<bool key="NSMenuItemRespectAlignment">YES</bool>
-																	<object class="NSMenu" key="NSMenu" id="353982019">
-																		<string key="NSTitle">OtherViews</string>
-																		<object class="NSMutableArray" key="NSMenuItems">
-																			<bool key="EncodedWithXMLCoder">YES</bool>
-																			<reference ref="791223578"/>
-																			<object class="NSMenuItem" id="645526467">
-																				<reference key="NSMenu" ref="353982019"/>
-																				<string key="NSTitle">Item 2</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<reference key="NSOnImage" ref="447995298"/>
-																				<reference key="NSMixedImage" ref="760317610"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="1050851477"/>
-																			</object>
-																			<object class="NSMenuItem" id="1035566125">
-																				<reference key="NSMenu" ref="353982019"/>
-																				<string key="NSTitle">Item 3</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<reference key="NSOnImage" ref="447995298"/>
-																				<reference key="NSMixedImage" ref="760317610"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="1050851477"/>
-																			</object>
-																		</object>
-																		<reference key="NSMenuFont" ref="273283760"/>
-																	</object>
-																	<int key="NSPreferredEdge">3</int>
-																	<bool key="NSUsesItemFromMenu">YES</bool>
-																	<bool key="NSAltersState">YES</bool>
-																	<int key="NSArrowPosition">1</int>
-																</object>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-															</object>
-															<object class="NSPopUpButton" id="112458239">
-																<reference key="NSNextResponder" ref="443817184"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{98, 63}, {126, 15}}</string>
-																<reference key="NSSuperview" ref="443817184"/>
-																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView" ref="796460997"/>
-																<string key="NSReuseIdentifierKey">_NS:868</string>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSPopUpButtonCell" key="NSCell" id="1012707648">
-																	<int key="NSCellFlags">-2076180416</int>
-																	<int key="NSCellFlags2">264192</int>
-																	<reference key="NSSupport" ref="22"/>
-																	<string key="NSCellIdentifier">_NS:868</string>
-																	<reference key="NSControlView" ref="112458239"/>
-																	<int key="NSButtonFlags">109199360</int>
-																	<int key="NSButtonFlags2">129</int>
-																	<string key="NSAlternateContents"/>
-																	<string key="NSKeyEquivalent"/>
-																	<int key="NSPeriodicDelay">400</int>
-																	<int key="NSPeriodicInterval">75</int>
-																	<object class="NSMenuItem" key="NSMenuItem" id="56675133">
-																		<reference key="NSMenu" ref="349551230"/>
-																		<string key="NSTitle">Item 1</string>
-																		<string key="NSKeyEquiv"/>
-																		<int key="NSKeyEquivModMask">1048576</int>
-																		<int key="NSMnemonicLoc">2147483647</int>
-																		<int key="NSState">1</int>
-																		<reference key="NSOnImage" ref="447995298"/>
-																		<reference key="NSMixedImage" ref="760317610"/>
-																		<string key="NSAction">_popUpItemAction:</string>
-																		<reference key="NSTarget" ref="1012707648"/>
-																	</object>
-																	<bool key="NSMenuItemRespectAlignment">YES</bool>
-																	<object class="NSMenu" key="NSMenu" id="349551230">
-																		<string key="NSTitle">OtherViews</string>
-																		<object class="NSMutableArray" key="NSMenuItems">
-																			<bool key="EncodedWithXMLCoder">YES</bool>
-																			<reference ref="56675133"/>
-																			<object class="NSMenuItem" id="603447176">
-																				<reference key="NSMenu" ref="349551230"/>
-																				<string key="NSTitle">Item 2</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<reference key="NSOnImage" ref="447995298"/>
-																				<reference key="NSMixedImage" ref="760317610"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="1012707648"/>
-																			</object>
-																			<object class="NSMenuItem" id="691985983">
-																				<reference key="NSMenu" ref="349551230"/>
-																				<string key="NSTitle">Item 3</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<reference key="NSOnImage" ref="447995298"/>
-																				<reference key="NSMixedImage" ref="760317610"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="1012707648"/>
-																			</object>
-																		</object>
-																		<reference key="NSMenuFont" ref="273283760"/>
-																	</object>
-																	<int key="NSPreferredEdge">3</int>
-																	<bool key="NSUsesItemFromMenu">YES</bool>
-																	<bool key="NSAltersState">YES</bool>
-																	<int key="NSArrowPosition">1</int>
-																</object>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-															</object>
-															<object class="NSPopUpButton" id="144142005">
-																<reference key="NSNextResponder" ref="443817184"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{98, 41}, {126, 15}}</string>
-																<reference key="NSSuperview" ref="443817184"/>
-																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView" ref="487526549"/>
-																<string key="NSReuseIdentifierKey">_NS:868</string>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSPopUpButtonCell" key="NSCell" id="379682863">
-																	<int key="NSCellFlags">-2076180416</int>
-																	<int key="NSCellFlags2">264192</int>
-																	<reference key="NSSupport" ref="22"/>
-																	<string key="NSCellIdentifier">_NS:868</string>
-																	<reference key="NSControlView" ref="144142005"/>
-																	<int key="NSButtonFlags">109199360</int>
-																	<int key="NSButtonFlags2">129</int>
-																	<string key="NSAlternateContents"/>
-																	<string key="NSKeyEquivalent"/>
-																	<int key="NSPeriodicDelay">400</int>
-																	<int key="NSPeriodicInterval">75</int>
-																	<object class="NSMenuItem" key="NSMenuItem" id="658841842">
-																		<reference key="NSMenu" ref="957749846"/>
-																		<string key="NSTitle">Item 1</string>
-																		<string key="NSKeyEquiv"/>
-																		<int key="NSKeyEquivModMask">1048576</int>
-																		<int key="NSMnemonicLoc">2147483647</int>
-																		<int key="NSState">1</int>
-																		<reference key="NSOnImage" ref="447995298"/>
-																		<reference key="NSMixedImage" ref="760317610"/>
-																		<string key="NSAction">_popUpItemAction:</string>
-																		<reference key="NSTarget" ref="379682863"/>
-																	</object>
-																	<bool key="NSMenuItemRespectAlignment">YES</bool>
-																	<object class="NSMenu" key="NSMenu" id="957749846">
-																		<string key="NSTitle">OtherViews</string>
-																		<object class="NSMutableArray" key="NSMenuItems">
-																			<bool key="EncodedWithXMLCoder">YES</bool>
-																			<reference ref="658841842"/>
-																			<object class="NSMenuItem" id="442645374">
-																				<reference key="NSMenu" ref="957749846"/>
-																				<string key="NSTitle">Item 2</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<reference key="NSOnImage" ref="447995298"/>
-																				<reference key="NSMixedImage" ref="760317610"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="379682863"/>
-																			</object>
-																			<object class="NSMenuItem" id="831415388">
-																				<reference key="NSMenu" ref="957749846"/>
-																				<string key="NSTitle">Item 3</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<reference key="NSOnImage" ref="447995298"/>
-																				<reference key="NSMixedImage" ref="760317610"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="379682863"/>
-																			</object>
-																		</object>
-																		<reference key="NSMenuFont" ref="273283760"/>
-																	</object>
-																	<int key="NSPreferredEdge">3</int>
-																	<bool key="NSUsesItemFromMenu">YES</bool>
-																	<bool key="NSAltersState">YES</bool>
-																	<int key="NSArrowPosition">1</int>
-																</object>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-															</object>
-															<object class="NSButton" id="884471415">
-																<reference key="NSNextResponder" ref="443817184"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{240, 84}, {108, 18}}</string>
-																<reference key="NSSuperview" ref="443817184"/>
-																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView" ref="102651997"/>
-																<string key="NSReuseIdentifierKey">_NS:771</string>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSButtonCell" key="NSCell" id="140128742">
-																	<int key="NSCellFlags">67108864</int>
-																	<int key="NSCellFlags2">131072</int>
-																	<string key="NSContents">Fast Decode</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<string key="NSCellIdentifier">_NS:771</string>
-																	<reference key="NSControlView" ref="884471415"/>
-																	<int key="NSButtonFlags">1211912448</int>
-																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="887198214"/>
-																	<reference key="NSAlternateImage" ref="624832340"/>
-																	<string key="NSAlternateContents"/>
-																	<string key="NSKeyEquivalent"/>
-																	<int key="NSPeriodicDelay">200</int>
-																	<int key="NSPeriodicInterval">25</int>
-																</object>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-															</object>
-															<object class="NSTextField" id="796460997">
-																<reference key="NSNextResponder" ref="443817184"/>
-																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{240, 65}, {110, 13}}</string>
-																<reference key="NSSuperview" ref="443817184"/>
-																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView" ref="8023338"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="934066385">
-																	<int key="NSCellFlags">67108864</int>
-																	<int key="NSCellFlags2">71303168</int>
-																	<string key="NSContents">Additional Options:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="796460997"/>
-																	<reference key="NSBackgroundColor" ref="242973447"/>
-																	<reference key="NSTextColor" ref="701609070"/>
-																</object>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-															</object>
-															<object class="NSTextField" id="487526549">
-																<reference key="NSNextResponder" ref="443817184"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{355, 43}, {517, 36}}</string>
-																<reference key="NSSuperview" ref="443817184"/>
-																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView" ref="349581420"/>
-																<string key="NSReuseIdentifierKey">_NS:354</string>
-																<string key="NSAntiCompressionPriority">{250, 750}</string>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="284269747">
-																	<int key="NSCellFlags">-1805647871</int>
-																	<int key="NSCellFlags2">272760832</int>
-																	<string key="NSContents"/>
-																	<reference key="NSSupport" ref="26"/>
-																	<string key="NSCellIdentifier">_NS:354</string>
-																	<reference key="NSControlView" ref="487526549"/>
-																	<bool key="NSDrawsBackground">YES</bool>
-																	<reference key="NSBackgroundColor" ref="138233214"/>
-																	<reference key="NSTextColor" ref="378140636"/>
-																</object>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-															</object>
-															<object class="NSTextField" id="527737261">
-																<reference key="NSNextResponder" ref="443817184"/>
-																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{96, 107}, {129, 13}}</string>
-																<reference key="NSSuperview" ref="443817184"/>
-																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView" ref="480823072"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="513519725">
-																	<int key="NSCellFlags">67108864</int>
-																	<int key="NSCellFlags2">4194304</int>
-																	<string key="NSContents"/>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="527737261"/>
-																	<reference key="NSBackgroundColor" ref="242973447"/>
-																	<reference key="NSTextColor" ref="701609070"/>
-																</object>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-															</object>
-															<object class="NSButton" id="902460295">
-																<reference key="NSNextResponder" ref="443817184"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{20, 127}, {209, 18}}</string>
-																<reference key="NSSuperview" ref="443817184"/>
-																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView" ref="139432403"/>
-																<string key="NSReuseIdentifierKey">_NS:771</string>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSButtonCell" key="NSCell" id="191360965">
-																	<int key="NSCellFlags">67108864</int>
-																	<int key="NSCellFlags2">131072</int>
-																	<string key="NSContents">Use x264 Advanced Options Panel</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<string key="NSCellIdentifier">_NS:771</string>
-																	<reference key="NSControlView" ref="902460295"/>
-																	<int key="NSButtonFlags">1211912448</int>
-																	<int key="NSButtonFlags2">2</int>
-																	<reference key="NSNormalImage" ref="887198214"/>
-																	<reference key="NSAlternateImage" ref="624832340"/>
-																	<string key="NSAlternateContents"/>
-																	<string key="NSKeyEquivalent"/>
-																	<int key="NSPeriodicDelay">200</int>
-																	<int key="NSPeriodicInterval">25</int>
-																</object>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-															</object>
-															<object class="NSTextField" id="349581420">
-																<reference key="NSNextResponder" ref="443817184"/>
-																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{12, 6}, {863, 29}}</string>
-																<reference key="NSSuperview" ref="443817184"/>
-																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="812860538">
-																	<int key="NSCellFlags">67108864</int>
-																	<int key="NSCellFlags2">4194304</int>
-																	<string key="NSContents">x264 Unparse:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="349581420"/>
-																	<reference key="NSBackgroundColor" ref="242973447"/>
-																	<reference key="NSTextColor" ref="701609070"/>
-																</object>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-															</object>
-														</object>
-														<string key="NSFrame">{{1, 1}, {890, 155}}</string>
-														<reference key="NSSuperview" ref="954159030"/>
-														<reference key="NSWindow"/>
-														<reference key="NSNextKeyView" ref="902460295"/>
-														<string key="NSReuseIdentifierKey">_NS:21</string>
-													</object>
-												</object>
-												<string key="NSFrame">{{14, 46}, {892, 157}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="443817184"/>
-												<string key="NSReuseIdentifierKey">_NS:18</string>
-												<string key="NSOffsets">{0, 0}</string>
-												<object class="NSTextFieldCell" key="NSTitleCell">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">x264 Presets</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSBackgroundColor" ref="138233214"/>
-													<object class="NSColor" key="NSTextColor">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
-													</object>
-												</object>
-												<reference key="NSContentView" ref="443817184"/>
-												<int key="NSBorderType">1</int>
-												<int key="NSBoxType">0</int>
-												<int key="NSTitlePosition">0</int>
-												<bool key="NSTransparent">NO</bool>
-											</object>
-										</object>
-										<string key="NSFrame">{{10, 25}, {920, 305}}</string>
-										<reference key="NSSuperview" ref="712502892"/>
-										<reference key="NSWindow"/>
-										<reference key="NSNextKeyView" ref="1064150725"/>
-									</object>
-									<string key="NSLabel">Video</string>
-									<reference key="NSColor" ref="242973447"/>
-									<reference key="NSTabView" ref="712502892"/>
-								</object>
-								<object class="NSTabViewItem" id="157300012">
-									<string key="NSIdentifier">2</string>
-									<object class="NSView" key="NSView" id="738554558">
-										<nil key="NSNextResponder"/>
-										<int key="NSvFlags">256</int>
-										<object class="NSMutableArray" key="NSSubviews">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSView" id="577274772">
-												<reference key="NSNextResponder" ref="738554558"/>
-												<int key="NSvFlags">256</int>
-												<object class="NSMutableArray" key="NSSubviews">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSScrollView" id="933946879">
-														<reference key="NSNextResponder" ref="577274772"/>
-														<int key="NSvFlags">268</int>
-														<object class="NSMutableArray" key="NSSubviews">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<object class="NSClipView" id="528259747">
-																<reference key="NSNextResponder" ref="933946879"/>
-																<int key="NSvFlags">2304</int>
-																<object class="NSMutableArray" key="NSSubviews">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="NSTableView" id="792464451">
-																		<reference key="NSNextResponder" ref="528259747"/>
-																		<int key="NSvFlags">256</int>
-																		<string key="NSFrameSize">{884, 236}</string>
-																		<reference key="NSSuperview" ref="528259747"/>
-																		<reference key="NSNextKeyView" ref="496546489"/>
-																		<bool key="NSEnabled">YES</bool>
-																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-																		<bool key="NSControlAllowsExpansionToolTips">YES</bool>
-																		<object class="NSTableHeaderView" key="NSHeaderView" id="146611085">
-																			<reference key="NSNextResponder" ref="230332532"/>
-																			<int key="NSvFlags">256</int>
-																			<string key="NSFrameSize">{884, 17}</string>
-																			<reference key="NSSuperview" ref="230332532"/>
-																			<reference key="NSNextKeyView" ref="528259747"/>
-																			<reference key="NSTableView" ref="792464451"/>
-																		</object>
-																		<object class="_NSCornerView" key="NSCornerView" id="727606062">
-																			<reference key="NSNextResponder" ref="933946879"/>
-																			<int key="NSvFlags">-2147483392</int>
-																			<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
-																			<reference key="NSSuperview" ref="933946879"/>
-																			<reference key="NSNextKeyView" ref="230332532"/>
-																		</object>
-																		<object class="NSMutableArray" key="NSTableColumns">
-																			<bool key="EncodedWithXMLCoder">YES</bool>
-																			<object class="NSTableColumn" id="33212493">
-																				<string key="NSIdentifier">track</string>
-																				<double key="NSWidth">323</double>
-																				<double key="NSMinWidth">40</double>
-																				<double key="NSMaxWidth">1000</double>
-																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75497536</int>
-																					<int key="NSCellFlags2">2048</int>
-																					<string key="NSContents">Track</string>
-																					<reference key="NSSupport" ref="26"/>
-																					<object class="NSColor" key="NSBackgroundColor">
-																						<int key="NSColorSpace">3</int>
-																						<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
-																					</object>
-																					<object class="NSColor" key="NSTextColor" id="188451177">
-																						<int key="NSColorSpace">6</int>
-																						<string key="NSCatalogName">System</string>
-																						<string key="NSColorName">headerTextColor</string>
-																						<reference key="NSColor" ref="544409939"/>
-																					</object>
-																				</object>
-																				<object class="NSPopUpButtonCell" key="NSDataCell" id="871837653">
-																					<int key="NSCellFlags">-2076180416</int>
-																					<int key="NSCellFlags2">133120</int>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSControlView" ref="792464451"/>
-																					<int key="NSButtonFlags">-2038284288</int>
-																					<int key="NSButtonFlags2">129</int>
-																					<object class="NSFont" key="NSAlternateImage" id="995413175">
-																						<string key="NSName">LucidaGrande</string>
-																						<double key="NSSize">11</double>
-																						<int key="NSfFlags">16</int>
-																					</object>
-																					<string key="NSAlternateContents"/>
-																					<string key="NSKeyEquivalent"/>
-																					<int key="NSPeriodicDelay">400</int>
-																					<int key="NSPeriodicInterval">75</int>
-																					<object class="NSMenuItem" key="NSMenuItem" id="677045788">
-																						<reference key="NSMenu" ref="513335837"/>
-																						<string key="NSTitle">Pop Up</string>
-																						<string key="NSKeyEquiv"/>
-																						<int key="NSKeyEquivModMask">1048576</int>
-																						<int key="NSMnemonicLoc">2147483647</int>
-																						<int key="NSState">1</int>
-																						<reference key="NSOnImage" ref="447995298"/>
-																						<reference key="NSMixedImage" ref="760317610"/>
-																						<string key="NSAction">_popUpItemAction:</string>
-																						<reference key="NSTarget" ref="871837653"/>
-																					</object>
-																					<bool key="NSMenuItemRespectAlignment">YES</bool>
-																					<object class="NSMenu" key="NSMenu" id="513335837">
-																						<string key="NSTitle">OtherViews</string>
-																						<object class="NSMutableArray" key="NSMenuItems">
-																							<bool key="EncodedWithXMLCoder">YES</bool>
-																							<reference ref="677045788"/>
-																						</object>
-																					</object>
-																					<int key="NSPreferredEdge">3</int>
-																					<bool key="NSUsesItemFromMenu">YES</bool>
-																					<bool key="NSAltersState">YES</bool>
-																					<int key="NSArrowPosition">1</int>
-																				</object>
-																				<int key="NSResizingMask">3</int>
-																				<bool key="NSIsResizeable">YES</bool>
-																				<reference key="NSTableView" ref="792464451"/>
-																			</object>
-																			<object class="NSTableColumn" id="200958136">
-																				<string key="NSIdentifier">codec</string>
-																				<double key="NSWidth">141</double>
-																				<double key="NSMinWidth">10</double>
-																				<double key="NSMaxWidth">3.4028229999999999e+38</double>
-																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75497536</int>
-																					<int key="NSCellFlags2">2048</int>
-																					<string key="NSContents">Codec</string>
-																					<reference key="NSSupport" ref="26"/>
-																					<object class="NSColor" key="NSBackgroundColor" id="1045207104">
-																						<int key="NSColorSpace">6</int>
-																						<string key="NSCatalogName">System</string>
-																						<string key="NSColorName">headerColor</string>
-																						<reference key="NSColor" ref="809784795"/>
-																					</object>
-																					<reference key="NSTextColor" ref="188451177"/>
-																				</object>
-																				<object class="NSPopUpButtonCell" key="NSDataCell" id="4014313">
-																					<int key="NSCellFlags">-2076180416</int>
-																					<int key="NSCellFlags2">133120</int>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSControlView" ref="792464451"/>
-																					<int key="NSButtonFlags">-2038284288</int>
-																					<int key="NSButtonFlags2">129</int>
-																					<reference key="NSAlternateImage" ref="995413175"/>
-																					<string key="NSAlternateContents"/>
-																					<string key="NSKeyEquivalent"/>
-																					<int key="NSPeriodicDelay">400</int>
-																					<int key="NSPeriodicInterval">75</int>
-																					<object class="NSMenuItem" key="NSMenuItem" id="1058317103">
-																						<reference key="NSMenu" ref="525066294"/>
-																						<string key="NSTitle">Pop Up</string>
-																						<string key="NSKeyEquiv"/>
-																						<int key="NSKeyEquivModMask">1048576</int>
-																						<int key="NSMnemonicLoc">2147483647</int>
-																						<int key="NSState">1</int>
-																						<reference key="NSOnImage" ref="447995298"/>
-																						<reference key="NSMixedImage" ref="760317610"/>
-																						<string key="NSAction">_popUpItemAction:</string>
-																						<reference key="NSTarget" ref="4014313"/>
-																					</object>
-																					<bool key="NSMenuItemRespectAlignment">YES</bool>
-																					<object class="NSMenu" key="NSMenu" id="525066294">
-																						<string key="NSTitle">OtherViews</string>
-																						<object class="NSMutableArray" key="NSMenuItems">
-																							<bool key="EncodedWithXMLCoder">YES</bool>
-																							<reference ref="1058317103"/>
-																						</object>
-																					</object>
-																					<int key="NSPreferredEdge">3</int>
-																					<bool key="NSUsesItemFromMenu">YES</bool>
-																					<bool key="NSAltersState">YES</bool>
-																					<int key="NSArrowPosition">1</int>
-																				</object>
-																				<int key="NSResizingMask">3</int>
-																				<bool key="NSIsResizeable">YES</bool>
-																				<bool key="NSIsEditable">YES</bool>
-																				<reference key="NSTableView" ref="792464451"/>
-																			</object>
-																			<object class="NSTableColumn" id="590927656">
-																				<string key="NSIdentifier">mixdown</string>
-																				<double key="NSWidth">129</double>
-																				<double key="NSMinWidth">10</double>
-																				<double key="NSMaxWidth">3.4028229999999999e+38</double>
-																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75497536</int>
-																					<int key="NSCellFlags2">2048</int>
-																					<string key="NSContents">Mixdown</string>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSBackgroundColor" ref="1045207104"/>
-																					<reference key="NSTextColor" ref="188451177"/>
-																				</object>
-																				<object class="NSPopUpButtonCell" key="NSDataCell" id="1037917692">
-																					<int key="NSCellFlags">-2076180416</int>
-																					<int key="NSCellFlags2">133120</int>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSControlView" ref="792464451"/>
-																					<int key="NSButtonFlags">-2038284288</int>
-																					<int key="NSButtonFlags2">129</int>
-																					<reference key="NSAlternateImage" ref="995413175"/>
-																					<string key="NSAlternateContents"/>
-																					<string key="NSKeyEquivalent"/>
-																					<int key="NSPeriodicDelay">400</int>
-																					<int key="NSPeriodicInterval">75</int>
-																					<object class="NSMenuItem" key="NSMenuItem" id="106742036">
-																						<reference key="NSMenu" ref="966554680"/>
-																						<string key="NSTitle">Pop Up</string>
-																						<string key="NSKeyEquiv"/>
-																						<int key="NSKeyEquivModMask">1048576</int>
-																						<int key="NSMnemonicLoc">2147483647</int>
-																						<int key="NSState">1</int>
-																						<reference key="NSOnImage" ref="447995298"/>
-																						<reference key="NSMixedImage" ref="760317610"/>
-																						<string key="NSAction">_popUpItemAction:</string>
-																						<reference key="NSTarget" ref="1037917692"/>
-																					</object>
-																					<bool key="NSMenuItemRespectAlignment">YES</bool>
-																					<object class="NSMenu" key="NSMenu" id="966554680">
-																						<string key="NSTitle">OtherViews</string>
-																						<object class="NSMutableArray" key="NSMenuItems">
-																							<bool key="EncodedWithXMLCoder">YES</bool>
-																							<reference ref="106742036"/>
-																						</object>
-																					</object>
-																					<int key="NSPreferredEdge">3</int>
-																					<bool key="NSUsesItemFromMenu">YES</bool>
-																					<bool key="NSAltersState">YES</bool>
-																					<int key="NSArrowPosition">1</int>
-																				</object>
-																				<int key="NSResizingMask">3</int>
-																				<bool key="NSIsResizeable">YES</bool>
-																				<bool key="NSIsEditable">YES</bool>
-																				<reference key="NSTableView" ref="792464451"/>
-																			</object>
-																			<object class="NSTableColumn" id="1063255">
-																				<string key="NSIdentifier">samplerate</string>
-																				<double key="NSWidth">73</double>
-																				<double key="NSMinWidth">10</double>
-																				<double key="NSMaxWidth">3.4028229999999999e+38</double>
-																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75497536</int>
-																					<int key="NSCellFlags2">2048</int>
-																					<string key="NSContents">Samplerate</string>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSBackgroundColor" ref="1045207104"/>
-																					<reference key="NSTextColor" ref="188451177"/>
-																				</object>
-																				<object class="NSPopUpButtonCell" key="NSDataCell" id="257530638">
-																					<int key="NSCellFlags">-2076180416</int>
-																					<int key="NSCellFlags2">133120</int>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSControlView" ref="792464451"/>
-																					<int key="NSButtonFlags">-2038284288</int>
-																					<int key="NSButtonFlags2">129</int>
-																					<reference key="NSAlternateImage" ref="995413175"/>
-																					<string key="NSAlternateContents"/>
-																					<string key="NSKeyEquivalent"/>
-																					<int key="NSPeriodicDelay">400</int>
-																					<int key="NSPeriodicInterval">75</int>
-																					<object class="NSMenuItem" key="NSMenuItem" id="713274619">
-																						<reference key="NSMenu" ref="640929469"/>
-																						<string key="NSTitle">Pop Up</string>
-																						<string key="NSKeyEquiv"/>
-																						<int key="NSKeyEquivModMask">1048576</int>
-																						<int key="NSMnemonicLoc">2147483647</int>
-																						<int key="NSState">1</int>
-																						<reference key="NSOnImage" ref="447995298"/>
-																						<reference key="NSMixedImage" ref="760317610"/>
-																						<string key="NSAction">_popUpItemAction:</string>
-																						<reference key="NSTarget" ref="257530638"/>
-																					</object>
-																					<bool key="NSMenuItemRespectAlignment">YES</bool>
-																					<object class="NSMenu" key="NSMenu" id="640929469">
-																						<string key="NSTitle">OtherViews</string>
-																						<object class="NSMutableArray" key="NSMenuItems">
-																							<bool key="EncodedWithXMLCoder">YES</bool>
-																							<reference ref="713274619"/>
-																						</object>
-																					</object>
-																					<int key="NSPreferredEdge">3</int>
-																					<bool key="NSUsesItemFromMenu">YES</bool>
-																					<bool key="NSAltersState">YES</bool>
-																					<int key="NSArrowPosition">1</int>
-																				</object>
-																				<int key="NSResizingMask">3</int>
-																				<bool key="NSIsResizeable">YES</bool>
-																				<bool key="NSIsEditable">YES</bool>
-																				<reference key="NSTableView" ref="792464451"/>
-																			</object>
-																			<object class="NSTableColumn" id="596723553">
-																				<string key="NSIdentifier">bitrate</string>
-																				<double key="NSWidth">72</double>
-																				<double key="NSMinWidth">10</double>
-																				<double key="NSMaxWidth">3.4028229999999999e+38</double>
-																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75497536</int>
-																					<int key="NSCellFlags2">2048</int>
-																					<string key="NSContents">Bitrate</string>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSBackgroundColor" ref="1045207104"/>
-																					<reference key="NSTextColor" ref="188451177"/>
-																				</object>
-																				<object class="NSPopUpButtonCell" key="NSDataCell" id="238248766">
-																					<int key="NSCellFlags">-2076180416</int>
-																					<int key="NSCellFlags2">133120</int>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSControlView" ref="792464451"/>
-																					<int key="NSButtonFlags">-2038284288</int>
-																					<int key="NSButtonFlags2">129</int>
-																					<reference key="NSAlternateImage" ref="995413175"/>
-																					<string key="NSAlternateContents"/>
-																					<string key="NSKeyEquivalent"/>
-																					<int key="NSPeriodicDelay">400</int>
-																					<int key="NSPeriodicInterval">75</int>
-																					<object class="NSMenuItem" key="NSMenuItem" id="452766579">
-																						<reference key="NSMenu" ref="764294190"/>
-																						<string key="NSTitle">Pop Up</string>
-																						<string key="NSKeyEquiv"/>
-																						<int key="NSKeyEquivModMask">1048576</int>
-																						<int key="NSMnemonicLoc">2147483647</int>
-																						<int key="NSState">1</int>
-																						<reference key="NSOnImage" ref="447995298"/>
-																						<reference key="NSMixedImage" ref="760317610"/>
-																						<string key="NSAction">_popUpItemAction:</string>
-																						<reference key="NSTarget" ref="238248766"/>
-																					</object>
-																					<bool key="NSMenuItemRespectAlignment">YES</bool>
-																					<object class="NSMenu" key="NSMenu" id="764294190">
-																						<string key="NSTitle">OtherViews</string>
-																						<object class="NSMutableArray" key="NSMenuItems">
-																							<bool key="EncodedWithXMLCoder">YES</bool>
-																							<reference ref="452766579"/>
-																						</object>
-																					</object>
-																					<int key="NSPreferredEdge">3</int>
-																					<bool key="NSUsesItemFromMenu">YES</bool>
-																					<bool key="NSAltersState">YES</bool>
-																					<int key="NSArrowPosition">1</int>
-																				</object>
-																				<int key="NSResizingMask">3</int>
-																				<bool key="NSIsResizeable">YES</bool>
-																				<bool key="NSIsEditable">YES</bool>
-																				<reference key="NSTableView" ref="792464451"/>
-																			</object>
-																			<object class="NSTableColumn" id="7762140">
-																				<string key="NSIdentifier">gain</string>
-																				<double key="NSWidth">32</double>
-																				<double key="NSMinWidth">10</double>
-																				<double key="NSMaxWidth">3.4028234663852886e+38</double>
-																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75497536</int>
-																					<int key="NSCellFlags2">134219776</int>
-																					<string key="NSContents">Gain</string>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSBackgroundColor" ref="1045207104"/>
-																					<reference key="NSTextColor" ref="188451177"/>
-																				</object>
-																				<object class="NSSliderCell" key="NSDataCell" id="723141526">
-																					<int key="NSCellFlags">-2080112384</int>
-																					<int key="NSCellFlags2">131072</int>
-																					<string key="NSContents"/>
-																					<reference key="NSControlView" ref="792464451"/>
-																					<double key="NSMaxValue">16</double>
-																					<double key="NSMinValue">-5</double>
-																					<double key="NSValue">0.0</double>
-																					<double key="NSAltIncValue">0.0</double>
-																					<int key="NSNumberOfTickMarks">21</int>
-																					<int key="NSTickMarkPosition">1</int>
-																					<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
-																					<bool key="NSVertical">NO</bool>
-																					<int key="NSSliderType">1</int>
-																				</object>
-																				<int key="NSResizingMask">3</int>
-																				<bool key="NSIsResizeable">YES</bool>
-																				<bool key="NSIsEditable">YES</bool>
-																				<reference key="NSTableView" ref="792464451"/>
-																			</object>
-																			<object class="NSTableColumn" id="432964705">
-																				<string key="NSIdentifier">gainText</string>
-																				<double key="NSWidth">25</double>
-																				<double key="NSMinWidth">10</double>
-																				<double key="NSMaxWidth">3.4028234663852886e+38</double>
-																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75497536</int>
-																					<int key="NSCellFlags2">2048</int>
-																					<string key="NSContents"/>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSBackgroundColor" ref="1045207104"/>
-																					<reference key="NSTextColor" ref="188451177"/>
-																				</object>
-																				<object class="NSTextFieldCell" key="NSDataCell" id="718953459">
-																					<int key="NSCellFlags">337641536</int>
-																					<int key="NSCellFlags2">133120</int>
-																					<string key="NSContents">Text Cell</string>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSControlView" ref="792464451"/>
-																					<object class="NSColor" key="NSBackgroundColor" id="355843302">
-																						<int key="NSColorSpace">6</int>
-																						<string key="NSCatalogName">System</string>
-																						<string key="NSColorName">controlBackgroundColor</string>
-																						<reference key="NSColor" ref="458742033"/>
-																					</object>
-																					<reference key="NSTextColor" ref="701609070"/>
-																				</object>
-																				<int key="NSResizingMask">3</int>
-																				<bool key="NSIsResizeable">YES</bool>
-																				<bool key="NSIsEditable">YES</bool>
-																				<reference key="NSTableView" ref="792464451"/>
-																			</object>
-																			<object class="NSTableColumn" id="393032802">
-																				<string key="NSIdentifier">drc</string>
-																				<double key="NSWidth">35</double>
-																				<double key="NSMinWidth">10</double>
-																				<double key="NSMaxWidth">3.4028229999999999e+38</double>
-																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75497536</int>
-																					<int key="NSCellFlags2">134219776</int>
-																					<string key="NSContents">DRC</string>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSBackgroundColor" ref="1045207104"/>
-																					<reference key="NSTextColor" ref="188451177"/>
-																				</object>
-																				<object class="NSSliderCell" key="NSDataCell" id="852982078">
-																					<int key="NSCellFlags">-2080112384</int>
-																					<int key="NSCellFlags2">131072</int>
-																					<string key="NSContents"/>
-																					<reference key="NSControlView" ref="792464451"/>
-																					<double key="NSMaxValue">4</double>
-																					<double key="NSMinValue">0.0</double>
-																					<double key="NSValue">0.0</double>
-																					<double key="NSAltIncValue">0.0</double>
-																					<int key="NSNumberOfTickMarks">16</int>
-																					<int key="NSTickMarkPosition">0</int>
-																					<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
-																					<bool key="NSVertical">NO</bool>
-																					<int key="NSSliderType">1</int>
-																				</object>
-																				<int key="NSResizingMask">3</int>
-																				<bool key="NSIsResizeable">YES</bool>
-																				<bool key="NSIsEditable">YES</bool>
-																				<reference key="NSTableView" ref="792464451"/>
-																			</object>
-																			<object class="NSTableColumn" id="581296833">
-																				<string key="NSIdentifier">drctext</string>
-																				<double key="NSWidth">27</double>
-																				<double key="NSMinWidth">10</double>
-																				<double key="NSMaxWidth">3.4028229999999999e+38</double>
-																				<object class="NSTableHeaderCell" key="NSHeaderCell">
-																					<int key="NSCellFlags">75497536</int>
-																					<int key="NSCellFlags2">2048</int>
-																					<string key="NSContents"/>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSBackgroundColor" ref="1045207104"/>
-																					<reference key="NSTextColor" ref="188451177"/>
-																				</object>
-																				<object class="NSTextFieldCell" key="NSDataCell" id="750418243">
-																					<int key="NSCellFlags">337641536</int>
-																					<int key="NSCellFlags2">272761856</int>
-																					<string key="NSContents">Text</string>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSControlView" ref="792464451"/>
-																					<reference key="NSBackgroundColor" ref="242973447"/>
-																					<reference key="NSTextColor" ref="701609070"/>
-																				</object>
-																				<int key="NSResizingMask">3</int>
-																				<bool key="NSIsResizeable">YES</bool>
-																				<reference key="NSTableView" ref="792464451"/>
-																			</object>
-																		</object>
-																		<double key="NSIntercellSpacingWidth">3</double>
-																		<double key="NSIntercellSpacingHeight">2</double>
-																		<reference key="NSBackgroundColor" ref="809784795"/>
-																		<object class="NSColor" key="NSGridColor" id="156710040">
-																			<int key="NSColorSpace">6</int>
-																			<string key="NSCatalogName">System</string>
-																			<string key="NSColorName">gridColor</string>
-																			<object class="NSColor" key="NSColor">
-																				<int key="NSColorSpace">3</int>
-																				<bytes key="NSWhite">MC41AA</bytes>
-																			</object>
-																		</object>
-																		<double key="NSRowHeight">25</double>
-																		<int key="NSTvFlags">1379926016</int>
-																		<reference key="NSDelegate"/>
-																		<reference key="NSDataSource"/>
-																		<int key="NSColumnAutoresizingStyle">4</int>
-																		<int key="NSDraggingSourceMaskForLocal">15</int>
-																		<int key="NSDraggingSourceMaskForNonLocal">0</int>
-																		<bool key="NSAllowsTypeSelect">NO</bool>
-																		<int key="NSTableViewDraggingDestinationStyle">0</int>
-																		<int key="NSTableViewGroupRowStyle">1</int>
-																	</object>
-																</object>
-																<string key="NSFrame">{{1, 17}, {884, 236}}</string>
-																<reference key="NSSuperview" ref="933946879"/>
-																<reference key="NSNextKeyView" ref="792464451"/>
-																<reference key="NSDocView" ref="792464451"/>
-																<reference key="NSBGColor" ref="355843302"/>
-																<int key="NScvFlags">4</int>
-															</object>
-															<object class="NSScroller" id="496546489">
-																<reference key="NSNextResponder" ref="933946879"/>
-																<int key="NSvFlags">-2147483392</int>
-																<string key="NSFrame">{{-100, -100}, {15, 206}}</string>
-																<reference key="NSSuperview" ref="933946879"/>
-																<reference key="NSNextKeyView" ref="821562152"/>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-																<reference key="NSTarget" ref="933946879"/>
-																<string key="NSAction">_doScroller:</string>
-																<double key="NSCurValue">37</double>
-																<double key="NSPercent">0.19473679999999999</double>
-															</object>
-															<object class="NSScroller" id="821562152">
-																<reference key="NSNextResponder" ref="933946879"/>
-																<int key="NSvFlags">-2147483392</int>
-																<string key="NSFrame">{{-100, -100}, {685, 15}}</string>
-																<reference key="NSSuperview" ref="933946879"/>
-																<reference key="NSNextKeyView" ref="727606062"/>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-																<int key="NSsFlags">1</int>
-																<reference key="NSTarget" ref="933946879"/>
-																<string key="NSAction">_doScroller:</string>
-																<double key="NSPercent">0.57142859999999995</double>
-															</object>
-															<object class="NSClipView" id="230332532">
-																<reference key="NSNextResponder" ref="933946879"/>
-																<int key="NSvFlags">2304</int>
-																<object class="NSMutableArray" key="NSSubviews">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<reference ref="146611085"/>
-																</object>
-																<string key="NSFrame">{{1, 0}, {884, 17}}</string>
-																<reference key="NSSuperview" ref="933946879"/>
-																<reference key="NSNextKeyView" ref="146611085"/>
-																<reference key="NSDocView" ref="146611085"/>
-																<reference key="NSBGColor" ref="355843302"/>
-																<int key="NScvFlags">4</int>
-															</object>
-															<reference ref="727606062"/>
-														</object>
-														<string key="NSFrame">{{17, 17}, {886, 254}}</string>
-														<reference key="NSSuperview" ref="577274772"/>
-														<reference key="NSNextKeyView" ref="528259747"/>
-														<int key="NSsFlags">133650</int>
-														<reference key="NSVScroller" ref="496546489"/>
-														<reference key="NSHScroller" ref="821562152"/>
-														<reference key="NSContentView" ref="528259747"/>
-														<reference key="NSHeaderClipView" ref="230332532"/>
-														<bytes key="NSScrollAmts">QSAAAEEgAABB2AAAQdgAAA</bytes>
-														<double key="NSMinMagnification">0.25</double>
-														<double key="NSMaxMagnification">4</double>
-														<double key="NSMagnification">1</double>
-													</object>
-													<object class="NSButton" id="883603583">
-														<reference key="NSNextResponder" ref="577274772"/>
-														<int key="NSvFlags">268</int>
-														<string key="NSFrame">{{16, 282}, {116, 16}}</string>
-														<reference key="NSSuperview" ref="577274772"/>
-														<reference key="NSNextKeyView" ref="334448622"/>
-														<bool key="NSEnabled">YES</bool>
-														<object class="NSButtonCell" key="NSCell" id="327570663">
-															<int key="NSCellFlags">67108864</int>
-															<int key="NSCellFlags2">134479872</int>
-															<string key="NSContents">Add All Tracks</string>
-															<reference key="NSSupport" ref="22"/>
-															<reference key="NSControlView" ref="883603583"/>
-															<int key="NSButtonFlags">-2038284288</int>
-															<int key="NSButtonFlags2">129</int>
-															<string key="NSAlternateContents"/>
-															<string key="NSKeyEquivalent"/>
-															<int key="NSPeriodicDelay">200</int>
-															<int key="NSPeriodicInterval">25</int>
-														</object>
-														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-													</object>
-													<object class="NSBox" id="334448622">
-														<reference key="NSNextResponder" ref="577274772"/>
-														<int key="NSvFlags">12</int>
-														<object class="NSMutableArray" key="NSSubviews">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<object class="NSView" id="754802956">
-																<reference key="NSNextResponder" ref="334448622"/>
-																<int key="NSvFlags">274</int>
-																<object class="NSMutableArray" key="NSSubviews">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="NSButton" id="162512199">
-																		<reference key="NSNextResponder" ref="754802956"/>
-																		<int key="NSvFlags">268</int>
-																		<string key="NSFrame">{{85, 8}, {41, 18}}</string>
-																		<reference key="NSSuperview" ref="754802956"/>
-																		<reference key="NSNextKeyView" ref="354328979"/>
-																		<string key="NSReuseIdentifierKey">_NS:771</string>
-																		<bool key="NSEnabled">YES</bool>
-																		<object class="NSButtonCell" key="NSCell" id="707344957">
-																			<int key="NSCellFlags">-2080374784</int>
-																			<int key="NSCellFlags2">262144</int>
-																			<string key="NSContents">MP3</string>
-																			<reference key="NSSupport" ref="22"/>
-																			<string key="NSCellIdentifier">_NS:771</string>
-																			<reference key="NSControlView" ref="162512199"/>
-																			<int key="NSButtonFlags">1211912448</int>
-																			<int key="NSButtonFlags2">2</int>
-																			<reference key="NSNormalImage" ref="887198214"/>
-																			<reference key="NSAlternateImage" ref="624832340"/>
-																			<string key="NSAlternateContents"/>
-																			<string key="NSKeyEquivalent"/>
-																			<int key="NSPeriodicDelay">200</int>
-																			<int key="NSPeriodicInterval">25</int>
-																		</object>
-																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-																	</object>
-																	<object class="NSButton" id="354328979">
-																		<reference key="NSNextResponder" ref="754802956"/>
-																		<int key="NSvFlags">268</int>
-																		<string key="NSFrame">{{130, 8}, {47, 18}}</string>
-																		<reference key="NSSuperview" ref="754802956"/>
-																		<reference key="NSNextKeyView" ref="453548414"/>
-																		<string key="NSReuseIdentifierKey">_NS:771</string>
-																		<bool key="NSEnabled">YES</bool>
-																		<object class="NSButtonCell" key="NSCell" id="243873688">
-																			<int key="NSCellFlags">-2080374784</int>
-																			<int key="NSCellFlags2">262144</int>
-																			<string key="NSContents">AAC</string>
-																			<reference key="NSSupport" ref="22"/>
-																			<string key="NSCellIdentifier">_NS:771</string>
-																			<reference key="NSControlView" ref="354328979"/>
-																			<int key="NSButtonFlags">1211912448</int>
-																			<int key="NSButtonFlags2">2</int>
-																			<reference key="NSNormalImage" ref="887198214"/>
-																			<reference key="NSAlternateImage" ref="624832340"/>
-																			<string key="NSAlternateContents"/>
-																			<string key="NSKeyEquivalent"/>
-																			<int key="NSPeriodicDelay">200</int>
-																			<int key="NSPeriodicInterval">25</int>
-																		</object>
-																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-																	</object>
-																	<object class="NSButton" id="453548414">
-																		<reference key="NSNextResponder" ref="754802956"/>
-																		<int key="NSvFlags">268</int>
-																		<string key="NSFrame">{{179, 8}, {47, 18}}</string>
-																		<reference key="NSSuperview" ref="754802956"/>
-																		<reference key="NSNextKeyView" ref="485809563"/>
-																		<string key="NSReuseIdentifierKey">_NS:771</string>
-																		<bool key="NSEnabled">YES</bool>
-																		<object class="NSButtonCell" key="NSCell" id="368344404">
-																			<int key="NSCellFlags">-2080374784</int>
-																			<int key="NSCellFlags2">262144</int>
-																			<string key="NSContents">AC3</string>
-																			<reference key="NSSupport" ref="22"/>
-																			<string key="NSCellIdentifier">_NS:771</string>
-																			<reference key="NSControlView" ref="453548414"/>
-																			<int key="NSButtonFlags">1211912448</int>
-																			<int key="NSButtonFlags2">2</int>
-																			<reference key="NSNormalImage" ref="887198214"/>
-																			<reference key="NSAlternateImage" ref="624832340"/>
-																			<string key="NSAlternateContents"/>
-																			<string key="NSKeyEquivalent"/>
-																			<int key="NSPeriodicDelay">200</int>
-																			<int key="NSPeriodicInterval">25</int>
-																		</object>
-																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-																	</object>
-																	<object class="NSButton" id="485809563">
-																		<reference key="NSNextResponder" ref="754802956"/>
-																		<int key="NSvFlags">268</int>
-																		<string key="NSFrame">{{226, 8}, {48, 18}}</string>
-																		<reference key="NSSuperview" ref="754802956"/>
-																		<reference key="NSNextKeyView" ref="1024961404"/>
-																		<string key="NSReuseIdentifierKey">_NS:771</string>
-																		<bool key="NSEnabled">YES</bool>
-																		<object class="NSButtonCell" key="NSCell" id="118300837">
-																			<int key="NSCellFlags">-2080374784</int>
-																			<int key="NSCellFlags2">262144</int>
-																			<string key="NSContents">DTS</string>
-																			<reference key="NSSupport" ref="22"/>
-																			<string key="NSCellIdentifier">_NS:771</string>
-																			<reference key="NSControlView" ref="485809563"/>
-																			<int key="NSButtonFlags">1211912448</int>
-																			<int key="NSButtonFlags2">2</int>
-																			<reference key="NSNormalImage" ref="887198214"/>
-																			<reference key="NSAlternateImage" ref="624832340"/>
-																			<string key="NSAlternateContents"/>
-																			<string key="NSKeyEquivalent"/>
-																			<int key="NSPeriodicDelay">200</int>
-																			<int key="NSPeriodicInterval">25</int>
-																		</object>
-																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-																	</object>
-																	<object class="NSButton" id="1024961404">
-																		<reference key="NSNextResponder" ref="754802956"/>
-																		<int key="NSvFlags">268</int>
-																		<string key="NSFrame">{{271, 8}, {58, 18}}</string>
-																		<reference key="NSSuperview" ref="754802956"/>
-																		<reference key="NSNextKeyView" ref="431725280"/>
-																		<string key="NSReuseIdentifierKey">_NS:771</string>
-																		<bool key="NSEnabled">YES</bool>
-																		<object class="NSButtonCell" key="NSCell" id="735750065">
-																			<int key="NSCellFlags">-2080374784</int>
-																			<int key="NSCellFlags2">262144</int>
-																			<string key="NSContents">DTS-HD</string>
-																			<reference key="NSSupport" ref="22"/>
-																			<string key="NSCellIdentifier">_NS:771</string>
-																			<reference key="NSControlView" ref="1024961404"/>
-																			<int key="NSButtonFlags">1211912448</int>
-																			<int key="NSButtonFlags2">2</int>
-																			<reference key="NSNormalImage" ref="887198214"/>
-																			<reference key="NSAlternateImage" ref="624832340"/>
-																			<string key="NSAlternateContents"/>
-																			<string key="NSKeyEquivalent"/>
-																			<int key="NSPeriodicDelay">200</int>
-																			<int key="NSPeriodicInterval">25</int>
-																		</object>
-																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-																	</object>
-																	<object class="NSPopUpButton" id="586044455">
-																		<reference key="NSNextResponder" ref="754802956"/>
-																		<int key="NSvFlags">268</int>
-																		<string key="NSFrame">{{442, 8}, {100, 15}}</string>
-																		<reference key="NSSuperview" ref="754802956"/>
-																		<reference key="NSNextKeyView" ref="933946879"/>
-																		<string key="NSReuseIdentifierKey">_NS:868</string>
-																		<bool key="NSEnabled">YES</bool>
-																		<object class="NSPopUpButtonCell" key="NSCell" id="141259846">
-																			<int key="NSCellFlags">-2076180416</int>
-																			<int key="NSCellFlags2">264192</int>
-																			<reference key="NSSupport" ref="22"/>
-																			<string key="NSCellIdentifier">_NS:868</string>
-																			<reference key="NSControlView" ref="586044455"/>
-																			<int key="NSButtonFlags">109199360</int>
-																			<int key="NSButtonFlags2">129</int>
-																			<string key="NSAlternateContents"/>
-																			<string key="NSKeyEquivalent"/>
-																			<int key="NSPeriodicDelay">400</int>
-																			<int key="NSPeriodicInterval">75</int>
-																			<object class="NSMenuItem" key="NSMenuItem" id="394026679">
-																				<reference key="NSMenu" ref="458538409"/>
-																				<string key="NSTitle">AC3 (ffmpeg)</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<int key="NSState">1</int>
-																				<reference key="NSOnImage" ref="447995298"/>
-																				<reference key="NSMixedImage" ref="760317610"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="141259846"/>
-																			</object>
-																			<bool key="NSMenuItemRespectAlignment">YES</bool>
-																			<object class="NSMenu" key="NSMenu" id="458538409">
-																				<string key="NSTitle">OtherViews</string>
-																				<object class="NSMutableArray" key="NSMenuItems">
-																					<bool key="EncodedWithXMLCoder">YES</bool>
-																					<reference ref="394026679"/>
-																					<object class="NSMenuItem" id="797157934">
-																						<reference key="NSMenu" ref="458538409"/>
-																						<string key="NSTitle">Item 2</string>
-																						<string key="NSKeyEquiv"/>
-																						<int key="NSKeyEquivModMask">1048576</int>
-																						<int key="NSMnemonicLoc">2147483647</int>
-																						<reference key="NSOnImage" ref="447995298"/>
-																						<reference key="NSMixedImage" ref="760317610"/>
-																						<string key="NSAction">_popUpItemAction:</string>
-																						<reference key="NSTarget" ref="141259846"/>
-																					</object>
-																					<object class="NSMenuItem" id="4616658">
-																						<reference key="NSMenu" ref="458538409"/>
-																						<string key="NSTitle">Item 3</string>
-																						<string key="NSKeyEquiv"/>
-																						<int key="NSKeyEquivModMask">1048576</int>
-																						<int key="NSMnemonicLoc">2147483647</int>
-																						<reference key="NSOnImage" ref="447995298"/>
-																						<reference key="NSMixedImage" ref="760317610"/>
-																						<string key="NSAction">_popUpItemAction:</string>
-																						<reference key="NSTarget" ref="141259846"/>
-																					</object>
-																				</object>
-																				<reference key="NSMenuFont" ref="273283760"/>
-																			</object>
-																			<int key="NSPreferredEdge">1</int>
-																			<bool key="NSUsesItemFromMenu">YES</bool>
-																			<bool key="NSAltersState">YES</bool>
-																			<int key="NSArrowPosition">2</int>
-																		</object>
-																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-																	</object>
-																	<object class="NSTextField" id="1010907474">
-																		<reference key="NSNextResponder" ref="754802956"/>
-																		<int key="NSvFlags">264</int>
-																		<string key="NSFrame">{{2, -7}, {78, 28}}</string>
-																		<reference key="NSSuperview" ref="754802956"/>
-																		<reference key="NSNextKeyView" ref="162512199"/>
-																		<bool key="NSEnabled">YES</bool>
-																		<object class="NSTextFieldCell" key="NSCell" id="935575109">
-																			<int key="NSCellFlags">67108864</int>
-																			<int key="NSCellFlags2">71565312</int>
-																			<string key="NSContents">Auto Passthru:</string>
-																			<reference key="NSSupport" ref="22"/>
-																			<reference key="NSControlView" ref="1010907474"/>
-																			<reference key="NSBackgroundColor" ref="242973447"/>
-																			<reference key="NSTextColor" ref="701609070"/>
-																		</object>
-																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-																	</object>
-																	<object class="NSTextField" id="431725280">
-																		<reference key="NSNextResponder" ref="754802956"/>
-																		<int key="NSvFlags">264</int>
-																		<string key="NSFrame">{{354, 7}, {86, 14}}</string>
-																		<reference key="NSSuperview" ref="754802956"/>
-																		<reference key="NSNextKeyView" ref="586044455"/>
-																		<bool key="NSEnabled">YES</bool>
-																		<object class="NSTextFieldCell" key="NSCell" id="121164790">
-																			<int key="NSCellFlags">67108864</int>
-																			<int key="NSCellFlags2">71565312</int>
-																			<string key="NSContents">Passthru Fallback:</string>
-																			<reference key="NSSupport" ref="22"/>
-																			<reference key="NSControlView" ref="431725280"/>
-																			<reference key="NSBackgroundColor" ref="242973447"/>
-																			<reference key="NSTextColor" ref="701609070"/>
-																		</object>
-																		<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-																	</object>
-																</object>
-																<string key="NSFrame">{{1, 1}, {552, 29}}</string>
-																<reference key="NSSuperview" ref="334448622"/>
-																<reference key="NSNextKeyView" ref="1010907474"/>
-																<string key="NSReuseIdentifierKey">_NS:21</string>
-															</object>
-														</object>
-														<string key="NSFrame">{{349, 275}, {554, 31}}</string>
-														<reference key="NSSuperview" ref="577274772"/>
-														<reference key="NSNextKeyView" ref="754802956"/>
-														<string key="NSReuseIdentifierKey">_NS:18</string>
-														<string key="NSOffsets">{0, 0}</string>
-														<object class="NSTextFieldCell" key="NSTitleCell">
-															<int key="NSCellFlags">67108864</int>
-															<int key="NSCellFlags2">0</int>
-															<string key="NSContents">Auto Passthru</string>
-															<reference key="NSSupport" ref="26"/>
-															<reference key="NSBackgroundColor" ref="138233214"/>
-															<object class="NSColor" key="NSTextColor">
-																<int key="NSColorSpace">3</int>
-																<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
-															</object>
-														</object>
-														<reference key="NSContentView" ref="754802956"/>
-														<int key="NSBorderType">1</int>
-														<int key="NSBoxType">0</int>
-														<int key="NSTitlePosition">0</int>
-														<bool key="NSTransparent">NO</bool>
-													</object>
-												</object>
-												<string key="NSFrame">{{0, -3}, {920, 305}}</string>
-												<reference key="NSSuperview" ref="738554558"/>
-												<reference key="NSNextKeyView" ref="883603583"/>
-											</object>
-										</object>
-										<string key="NSFrame">{{10, 25}, {920, 305}}</string>
-										<reference key="NSNextKeyView" ref="577274772"/>
-									</object>
-									<string key="NSLabel">Audio</string>
-									<reference key="NSColor" ref="242973447"/>
-									<reference key="NSTabView" ref="712502892"/>
-								</object>
-								<object class="NSTabViewItem" id="799016137">
-									<string key="NSIdentifier">3</string>
-									<object class="NSView" key="NSView" id="756255803">
-										<nil key="NSNextResponder"/>
-										<int key="NSvFlags">256</int>
-										<object class="NSMutableArray" key="NSSubviews">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSScrollView" id="596256174">
-												<reference key="NSNextResponder" ref="756255803"/>
-												<int key="NSvFlags">268</int>
-												<object class="NSMutableArray" key="NSSubviews">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSClipView" id="705918581">
-														<reference key="NSNextResponder" ref="596256174"/>
-														<int key="NSvFlags">2304</int>
-														<object class="NSMutableArray" key="NSSubviews">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<object class="NSTableView" id="587237088">
-																<reference key="NSNextResponder" ref="705918581"/>
-																<int key="NSvFlags">256</int>
-																<string key="NSFrameSize">{884, 241}</string>
-																<reference key="NSSuperview" ref="705918581"/>
-																<bool key="NSEnabled">YES</bool>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-																<bool key="NSControlAllowsExpansionToolTips">YES</bool>
-																<object class="NSTableHeaderView" key="NSHeaderView" id="569585004">
-																	<reference key="NSNextResponder" ref="139191276"/>
-																	<int key="NSvFlags">256</int>
-																	<string key="NSFrameSize">{884, 17}</string>
-																	<reference key="NSSuperview" ref="139191276"/>
-																	<reference key="NSTableView" ref="587237088"/>
-																</object>
-																<object class="_NSCornerView" key="NSCornerView" id="10217663">
-																	<reference key="NSNextResponder" ref="596256174"/>
-																	<int key="NSvFlags">-2147483392</int>
-																	<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
-																	<reference key="NSSuperview" ref="596256174"/>
-																</object>
-																<object class="NSMutableArray" key="NSTableColumns">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="NSTableColumn" id="274341565">
-																		<string key="NSIdentifier">track</string>
-																		<double key="NSWidth">323</double>
-																		<double key="NSMinWidth">40</double>
-																		<double key="NSMaxWidth">1000</double>
-																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75497536</int>
-																			<int key="NSCellFlags2">2048</int>
-																			<string key="NSContents">Track</string>
-																			<reference key="NSSupport" ref="26"/>
-																			<object class="NSColor" key="NSBackgroundColor">
-																				<int key="NSColorSpace">3</int>
-																				<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
-																			</object>
-																			<reference key="NSTextColor" ref="188451177"/>
-																		</object>
-																		<object class="NSPopUpButtonCell" key="NSDataCell" id="426946554">
-																			<int key="NSCellFlags">-2076180416</int>
-																			<int key="NSCellFlags2">264192</int>
-																			<reference key="NSSupport" ref="22"/>
-																			<reference key="NSControlView" ref="587237088"/>
-																			<int key="NSButtonFlags">100679680</int>
-																			<int key="NSButtonFlags2">129</int>
-																			<string key="NSAlternateContents"/>
-																			<string key="NSKeyEquivalent"/>
-																			<int key="NSPeriodicDelay">400</int>
-																			<int key="NSPeriodicInterval">75</int>
-																			<object class="NSMenuItem" key="NSMenuItem" id="1026748451">
-																				<reference key="NSMenu" ref="472498711"/>
-																				<string key="NSTitle">Pop Up</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<int key="NSState">1</int>
-																				<reference key="NSOnImage" ref="447995298"/>
-																				<reference key="NSMixedImage" ref="760317610"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="426946554"/>
-																			</object>
-																			<bool key="NSMenuItemRespectAlignment">YES</bool>
-																			<object class="NSMenu" key="NSMenu" id="472498711">
-																				<string key="NSTitle">OtherViews</string>
-																				<object class="NSMutableArray" key="NSMenuItems">
-																					<bool key="EncodedWithXMLCoder">YES</bool>
-																					<reference ref="1026748451"/>
-																				</object>
-																			</object>
-																			<bool key="NSUsesItemFromMenu">YES</bool>
-																			<bool key="NSAltersState">YES</bool>
-																			<int key="NSArrowPosition">2</int>
-																		</object>
-																		<int key="NSResizingMask">3</int>
-																		<bool key="NSIsResizeable">YES</bool>
-																		<reference key="NSTableView" ref="587237088"/>
-																	</object>
-																	<object class="NSTableColumn" id="1033748386">
-																		<string key="NSIdentifier">forced</string>
-																		<double key="NSWidth">75</double>
-																		<double key="NSMinWidth">10</double>
-																		<double key="NSMaxWidth">3.4028229999999999e+38</double>
-																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75497536</int>
-																			<int key="NSCellFlags2">134219776</int>
-																			<string key="NSContents">Forced Only</string>
-																			<reference key="NSSupport" ref="26"/>
-																			<reference key="NSBackgroundColor" ref="1045207104"/>
-																			<reference key="NSTextColor" ref="188451177"/>
-																		</object>
-																		<object class="NSButtonCell" key="NSDataCell" id="13236417">
-																			<int key="NSCellFlags">67108864</int>
-																			<int key="NSCellFlags2">131072</int>
-																			<string key="NSContents">Check</string>
-																			<reference key="NSSupport" ref="26"/>
-																			<reference key="NSControlView" ref="587237088"/>
-																			<int key="NSButtonFlags">1215582464</int>
-																			<int key="NSButtonFlags2">130</int>
-																			<reference key="NSNormalImage" ref="887198214"/>
-																			<reference key="NSAlternateImage" ref="624832340"/>
-																			<string key="NSAlternateContents"/>
-																			<string key="NSKeyEquivalent"/>
-																			<int key="NSPeriodicDelay">200</int>
-																			<int key="NSPeriodicInterval">25</int>
-																		</object>
-																		<int key="NSResizingMask">3</int>
-																		<bool key="NSIsResizeable">YES</bool>
-																		<bool key="NSIsEditable">YES</bool>
-																		<reference key="NSTableView" ref="587237088"/>
-																	</object>
-																	<object class="NSTableColumn" id="362209136">
-																		<string key="NSIdentifier">burned</string>
-																		<double key="NSWidth">65</double>
-																		<double key="NSMinWidth">10</double>
-																		<double key="NSMaxWidth">3.4028229999999999e+38</double>
-																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75497536</int>
-																			<int key="NSCellFlags2">134219776</int>
-																			<string key="NSContents">Burned In</string>
-																			<reference key="NSSupport" ref="26"/>
-																			<reference key="NSBackgroundColor" ref="1045207104"/>
-																			<reference key="NSTextColor" ref="188451177"/>
-																		</object>
-																		<object class="NSButtonCell" key="NSDataCell" id="704907857">
-																			<int key="NSCellFlags">67108864</int>
-																			<int key="NSCellFlags2">131072</int>
-																			<string key="NSContents">Check</string>
-																			<reference key="NSSupport" ref="26"/>
-																			<reference key="NSControlView" ref="587237088"/>
-																			<int key="NSButtonFlags">1215582464</int>
-																			<int key="NSButtonFlags2">130</int>
-																			<reference key="NSNormalImage" ref="887198214"/>
-																			<reference key="NSAlternateImage" ref="624832340"/>
-																			<string key="NSAlternateContents"/>
-																			<string key="NSKeyEquivalent"/>
-																			<int key="NSPeriodicDelay">200</int>
-																			<int key="NSPeriodicInterval">25</int>
-																		</object>
-																		<int key="NSResizingMask">3</int>
-																		<bool key="NSIsResizeable">YES</bool>
-																		<bool key="NSIsEditable">YES</bool>
-																		<reference key="NSTableView" ref="587237088"/>
-																	</object>
-																	<object class="NSTableColumn" id="270619684">
-																		<string key="NSIdentifier">default</string>
-																		<double key="NSWidth">77</double>
-																		<double key="NSMinWidth">10</double>
-																		<double key="NSMaxWidth">3.4028229999999999e+38</double>
-																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75497536</int>
-																			<int key="NSCellFlags2">134219776</int>
-																			<string key="NSContents">Default</string>
-																			<reference key="NSSupport" ref="26"/>
-																			<reference key="NSBackgroundColor" ref="1045207104"/>
-																			<reference key="NSTextColor" ref="188451177"/>
-																		</object>
-																		<object class="NSButtonCell" key="NSDataCell" id="299034685">
-																			<int key="NSCellFlags">67108864</int>
-																			<int key="NSCellFlags2">131072</int>
-																			<string key="NSContents">Check</string>
-																			<reference key="NSSupport" ref="26"/>
-																			<reference key="NSControlView" ref="587237088"/>
-																			<int key="NSButtonFlags">1215582464</int>
-																			<int key="NSButtonFlags2">130</int>
-																			<reference key="NSNormalImage" ref="887198214"/>
-																			<reference key="NSAlternateImage" ref="624832340"/>
-																			<string key="NSAlternateContents"/>
-																			<string key="NSKeyEquivalent"/>
-																			<int key="NSPeriodicDelay">200</int>
-																			<int key="NSPeriodicInterval">25</int>
-																		</object>
-																		<int key="NSResizingMask">3</int>
-																		<bool key="NSIsResizeable">YES</bool>
-																		<bool key="NSIsEditable">YES</bool>
-																		<reference key="NSTableView" ref="587237088"/>
-																	</object>
-																	<object class="NSTableColumn" id="116912874">
-																		<string key="NSIdentifier">srt_lang</string>
-																		<double key="NSWidth">148</double>
-																		<double key="NSMinWidth">10</double>
-																		<double key="NSMaxWidth">3.4028229999999999e+38</double>
-																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75497536</int>
-																			<int key="NSCellFlags2">2048</int>
-																			<string key="NSContents">Srt Language</string>
-																			<reference key="NSSupport" ref="26"/>
-																			<reference key="NSBackgroundColor" ref="1045207104"/>
-																			<reference key="NSTextColor" ref="188451177"/>
-																		</object>
-																		<object class="NSPopUpButtonCell" key="NSDataCell" id="688461412">
-																			<int key="NSCellFlags">-2076180416</int>
-																			<int key="NSCellFlags2">133120</int>
-																			<reference key="NSSupport" ref="26"/>
-																			<reference key="NSControlView" ref="587237088"/>
-																			<int key="NSButtonFlags">100679680</int>
-																			<int key="NSButtonFlags2">129</int>
-																			<string key="NSAlternateContents"/>
-																			<string key="NSKeyEquivalent"/>
-																			<int key="NSPeriodicDelay">400</int>
-																			<int key="NSPeriodicInterval">75</int>
-																			<object class="NSMenuItem" key="NSMenuItem" id="341659302">
-																				<reference key="NSMenu" ref="808277525"/>
-																				<string key="NSTitle">Pop Up</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<int key="NSState">1</int>
-																				<reference key="NSOnImage" ref="447995298"/>
-																				<reference key="NSMixedImage" ref="760317610"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="688461412"/>
-																			</object>
-																			<bool key="NSMenuItemRespectAlignment">YES</bool>
-																			<object class="NSMenu" key="NSMenu" id="808277525">
-																				<string key="NSTitle">OtherViews</string>
-																				<object class="NSMutableArray" key="NSMenuItems">
-																					<bool key="EncodedWithXMLCoder">YES</bool>
-																					<reference ref="341659302"/>
-																				</object>
-																			</object>
-																			<int key="NSPreferredEdge">3</int>
-																			<bool key="NSUsesItemFromMenu">YES</bool>
-																			<bool key="NSAltersState">YES</bool>
-																			<int key="NSArrowPosition">1</int>
-																		</object>
-																		<int key="NSResizingMask">3</int>
-																		<bool key="NSIsResizeable">YES</bool>
-																		<bool key="NSIsEditable">YES</bool>
-																		<reference key="NSTableView" ref="587237088"/>
-																	</object>
-																	<object class="NSTableColumn" id="180322215">
-																		<string key="NSIdentifier">srt_charcode</string>
-																		<double key="NSWidth">104</double>
-																		<double key="NSMinWidth">10</double>
-																		<double key="NSMaxWidth">3.4028229999999999e+38</double>
-																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75497536</int>
-																			<int key="NSCellFlags2">2048</int>
-																			<string key="NSContents">Srt Char Code</string>
-																			<reference key="NSSupport" ref="26"/>
-																			<reference key="NSBackgroundColor" ref="1045207104"/>
-																			<reference key="NSTextColor" ref="188451177"/>
-																		</object>
-																		<object class="NSPopUpButtonCell" key="NSDataCell" id="483232645">
-																			<int key="NSCellFlags">-2076180416</int>
-																			<int key="NSCellFlags2">133120</int>
-																			<reference key="NSSupport" ref="26"/>
-																			<reference key="NSControlView" ref="587237088"/>
-																			<int key="NSButtonFlags">100679680</int>
-																			<int key="NSButtonFlags2">129</int>
-																			<string key="NSAlternateContents"/>
-																			<string key="NSKeyEquivalent"/>
-																			<int key="NSPeriodicDelay">400</int>
-																			<int key="NSPeriodicInterval">75</int>
-																			<object class="NSMenuItem" key="NSMenuItem" id="66454705">
-																				<reference key="NSMenu" ref="427130300"/>
-																				<string key="NSTitle">Pop Up</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<int key="NSState">1</int>
-																				<reference key="NSOnImage" ref="447995298"/>
-																				<reference key="NSMixedImage" ref="760317610"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="483232645"/>
-																			</object>
-																			<bool key="NSMenuItemRespectAlignment">YES</bool>
-																			<object class="NSMenu" key="NSMenu" id="427130300">
-																				<string key="NSTitle">OtherViews</string>
-																				<object class="NSMutableArray" key="NSMenuItems">
-																					<bool key="EncodedWithXMLCoder">YES</bool>
-																					<reference ref="66454705"/>
-																				</object>
-																			</object>
-																			<int key="NSPreferredEdge">3</int>
-																			<bool key="NSUsesItemFromMenu">YES</bool>
-																			<bool key="NSAltersState">YES</bool>
-																			<int key="NSArrowPosition">1</int>
-																		</object>
-																		<int key="NSResizingMask">3</int>
-																		<bool key="NSIsResizeable">YES</bool>
-																		<bool key="NSIsEditable">YES</bool>
-																		<reference key="NSTableView" ref="587237088"/>
-																	</object>
-																	<object class="NSTableColumn" id="526590234">
-																		<string key="NSIdentifier">srt_offset</string>
-																		<double key="NSWidth">71</double>
-																		<double key="NSMinWidth">10</double>
-																		<double key="NSMaxWidth">3.4028229999999999e+38</double>
-																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75497536</int>
-																			<int key="NSCellFlags2">2048</int>
-																			<string key="NSContents">Srt Offset</string>
-																			<reference key="NSSupport" ref="26"/>
-																			<reference key="NSBackgroundColor" ref="1045207104"/>
-																			<reference key="NSTextColor" ref="188451177"/>
-																		</object>
-																		<object class="NSTextFieldCell" key="NSDataCell" id="43785715">
-																			<int key="NSCellFlags">337641536</int>
-																			<int key="NSCellFlags2">272630784</int>
-																			<string key="NSContents">Text</string>
-																			<reference key="NSSupport" ref="273283760"/>
-																			<reference key="NSControlView" ref="587237088"/>
-																			<reference key="NSBackgroundColor" ref="242973447"/>
-																			<reference key="NSTextColor" ref="701609070"/>
-																		</object>
-																		<int key="NSResizingMask">3</int>
-																		<bool key="NSIsResizeable">YES</bool>
-																		<bool key="NSIsEditable">YES</bool>
-																		<reference key="NSTableView" ref="587237088"/>
-																	</object>
-																</object>
-																<double key="NSIntercellSpacingWidth">3</double>
-																<double key="NSIntercellSpacingHeight">2</double>
-																<reference key="NSBackgroundColor" ref="809784795"/>
-																<reference key="NSGridColor" ref="156710040"/>
-																<double key="NSRowHeight">17</double>
-																<int key="NSTvFlags">1379926016</int>
-																<reference key="NSDelegate"/>
-																<reference key="NSDataSource"/>
-																<int key="NSColumnAutoresizingStyle">4</int>
-																<int key="NSDraggingSourceMaskForLocal">15</int>
-																<int key="NSDraggingSourceMaskForNonLocal">0</int>
-																<bool key="NSAllowsTypeSelect">NO</bool>
-																<int key="NSTableViewDraggingDestinationStyle">0</int>
-																<int key="NSTableViewGroupRowStyle">1</int>
-															</object>
-														</object>
-														<string key="NSFrame">{{1, 17}, {884, 241}}</string>
-														<reference key="NSSuperview" ref="596256174"/>
-														<reference key="NSNextKeyView" ref="587237088"/>
-														<reference key="NSDocView" ref="587237088"/>
-														<reference key="NSBGColor" ref="355843302"/>
-														<int key="NScvFlags">4</int>
-													</object>
-													<object class="NSScroller" id="40751315">
-														<reference key="NSNextResponder" ref="596256174"/>
-														<int key="NSvFlags">-2147483392</int>
-														<string key="NSFrame">{{-100, -100}, {15, 206}}</string>
-														<reference key="NSSuperview" ref="596256174"/>
-														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-														<reference key="NSTarget" ref="596256174"/>
-														<string key="NSAction">_doScroller:</string>
-														<double key="NSCurValue">37</double>
-														<double key="NSPercent">0.19473679999999999</double>
-													</object>
-													<object class="NSScroller" id="892147391">
-														<reference key="NSNextResponder" ref="596256174"/>
-														<int key="NSvFlags">-2147483392</int>
-														<string key="NSFrame">{{-100, -100}, {685, 15}}</string>
-														<reference key="NSSuperview" ref="596256174"/>
-														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-														<int key="NSsFlags">1</int>
-														<reference key="NSTarget" ref="596256174"/>
-														<string key="NSAction">_doScroller:</string>
-														<double key="NSPercent">0.57142859999999995</double>
-													</object>
-													<object class="NSClipView" id="139191276">
-														<reference key="NSNextResponder" ref="596256174"/>
-														<int key="NSvFlags">2304</int>
-														<object class="NSMutableArray" key="NSSubviews">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<reference ref="569585004"/>
-														</object>
-														<string key="NSFrame">{{1, 0}, {884, 17}}</string>
-														<reference key="NSSuperview" ref="596256174"/>
-														<reference key="NSNextKeyView" ref="569585004"/>
-														<reference key="NSDocView" ref="569585004"/>
-														<reference key="NSBGColor" ref="355843302"/>
-														<int key="NScvFlags">4</int>
-													</object>
-													<reference ref="10217663"/>
-												</object>
-												<string key="NSFrame">{{17, 17}, {886, 259}}</string>
-												<reference key="NSSuperview" ref="756255803"/>
-												<reference key="NSNextKeyView" ref="705918581"/>
-												<int key="NSsFlags">133650</int>
-												<reference key="NSVScroller" ref="40751315"/>
-												<reference key="NSHScroller" ref="892147391"/>
-												<reference key="NSContentView" ref="705918581"/>
-												<reference key="NSHeaderClipView" ref="139191276"/>
-												<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
-												<double key="NSMinMagnification">0.25</double>
-												<double key="NSMaxMagnification">4</double>
-												<double key="NSMagnification">1</double>
-											</object>
-											<object class="NSButton" id="377401502">
-												<reference key="NSNextResponder" ref="756255803"/>
-												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{16, 283}, {116, 16}}</string>
-												<reference key="NSSuperview" ref="756255803"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSButtonCell" key="NSCell" id="206924163">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">134479872</int>
-													<string key="NSContents">Add External SRT ...</string>
-													<reference key="NSSupport" ref="22"/>
-													<reference key="NSControlView" ref="377401502"/>
-													<int key="NSButtonFlags">-2038284288</int>
-													<int key="NSButtonFlags2">129</int>
-													<string key="NSAlternateContents"/>
-													<string key="NSKeyEquivalent"/>
-													<int key="NSPeriodicDelay">200</int>
-													<int key="NSPeriodicInterval">25</int>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
-										</object>
-										<string key="NSFrame">{{10, 25}, {920, 305}}</string>
-									</object>
-									<string key="NSLabel">Subtitles</string>
-									<reference key="NSColor" ref="242973447"/>
-									<reference key="NSTabView" ref="712502892"/>
-								</object>
-								<object class="NSTabViewItem" id="744678564">
-									<string key="NSIdentifier">5</string>
-									<object class="NSView" key="NSView" id="833271282">
-										<nil key="NSNextResponder"/>
-										<int key="NSvFlags">256</int>
-										<object class="NSMutableArray" key="NSSubviews">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSBox" id="231506045">
-												<reference key="NSNextResponder" ref="833271282"/>
-												<int key="NSvFlags">256</int>
-												<object class="NSMutableArray" key="NSSubviews">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSView" id="815869140">
-														<reference key="NSNextResponder" ref="231506045"/>
-														<int key="NSvFlags">274</int>
-														<string key="NSFrameSize">{907, 290}</string>
-														<reference key="NSSuperview" ref="231506045"/>
-													</object>
-												</object>
-												<string key="NSFrame">{{7, 8}, {907, 290}}</string>
-												<reference key="NSSuperview" ref="833271282"/>
-												<reference key="NSNextKeyView" ref="815869140"/>
-												<string key="NSOffsets">{0, 0}</string>
-												<object class="NSTextFieldCell" key="NSTitleCell">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Box</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSBackgroundColor" ref="138233214"/>
-													<object class="NSColor" key="NSTextColor">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-													</object>
-												</object>
-												<reference key="NSContentView" ref="815869140"/>
-												<int key="NSBorderType">0</int>
-												<int key="NSBoxType">3</int>
-												<int key="NSTitlePosition">0</int>
-												<bool key="NSTransparent">NO</bool>
-											</object>
-										</object>
-										<string key="NSFrame">{{10, 25}, {920, 305}}</string>
-										<reference key="NSNextKeyView" ref="231506045"/>
-									</object>
-									<string key="NSLabel">Advanced</string>
-									<reference key="NSColor" ref="242973447"/>
-									<reference key="NSTabView" ref="712502892"/>
-								</object>
-								<object class="NSTabViewItem" id="291470012">
-									<string key="NSIdentifier">4</string>
-									<object class="NSView" key="NSView" id="440990725">
-										<nil key="NSNextResponder"/>
-										<int key="NSvFlags">256</int>
-										<object class="NSMutableArray" key="NSSubviews">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSScrollView" id="307620967">
-												<reference key="NSNextResponder" ref="440990725"/>
-												<int key="NSvFlags">256</int>
-												<object class="NSMutableArray" key="NSSubviews">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSClipView" id="272816362">
-														<reference key="NSNextResponder" ref="307620967"/>
-														<int key="NSvFlags">2304</int>
-														<object class="NSMutableArray" key="NSSubviews">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<object class="NSTableView" id="595654978">
-																<reference key="NSNextResponder" ref="272816362"/>
-																<int key="NSvFlags">256</int>
-																<string key="NSFrameSize">{869, 242}</string>
-																<reference key="NSSuperview" ref="272816362"/>
-																<reference key="NSNextKeyView" ref="1033243513"/>
-																<bool key="NSEnabled">YES</bool>
-																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-																<bool key="NSControlAllowsExpansionToolTips">YES</bool>
-																<object class="NSTableHeaderView" key="NSHeaderView" id="928480858">
-																	<reference key="NSNextResponder" ref="814110287"/>
-																	<int key="NSvFlags">256</int>
-																	<string key="NSFrameSize">{869, 17}</string>
-																	<reference key="NSSuperview" ref="814110287"/>
-																	<reference key="NSNextKeyView" ref="393843623"/>
-																	<reference key="NSTableView" ref="595654978"/>
-																</object>
-																<object class="_NSCornerView" key="NSCornerView" id="393843623">
-																	<reference key="NSNextResponder" ref="307620967"/>
-																	<int key="NSvFlags">256</int>
-																	<string key="NSFrame">{{870, 0}, {16, 17}}</string>
-																	<reference key="NSSuperview" ref="307620967"/>
-																	<reference key="NSNextKeyView" ref="272816362"/>
-																</object>
-																<object class="NSMutableArray" key="NSTableColumns">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="NSTableColumn" id="77208310">
-																		<string key="NSIdentifier">1</string>
-																		<double key="NSWidth">91</double>
-																		<double key="NSMinWidth">40</double>
-																		<double key="NSMaxWidth">1000</double>
-																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75497536</int>
-																			<int key="NSCellFlags2">2048</int>
-																			<string key="NSContents">Chapter</string>
-																			<reference key="NSSupport" ref="26"/>
-																			<object class="NSColor" key="NSBackgroundColor" id="754789485">
-																				<int key="NSColorSpace">3</int>
-																				<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
-																			</object>
-																			<reference key="NSTextColor" ref="188451177"/>
-																		</object>
-																		<object class="NSTextFieldCell" key="NSDataCell" id="686068440">
-																			<int key="NSCellFlags">337641536</int>
-																			<int key="NSCellFlags2">2048</int>
-																			<string key="NSContents">Text Cell</string>
-																			<reference key="NSSupport" ref="995413175"/>
-																			<reference key="NSControlView" ref="595654978"/>
-																			<reference key="NSBackgroundColor" ref="355843302"/>
-																			<reference key="NSTextColor" ref="701609070"/>
-																		</object>
-																		<int key="NSResizingMask">3</int>
-																		<bool key="NSIsResizeable">YES</bool>
-																		<reference key="NSTableView" ref="595654978"/>
-																	</object>
-																	<object class="NSTableColumn" id="932392163">
-																		<string key="NSIdentifier">2</string>
-																		<double key="NSWidth">772</double>
-																		<double key="NSMinWidth">77.217290000000006</double>
-																		<double key="NSMaxWidth">1000</double>
-																		<object class="NSTableHeaderCell" key="NSHeaderCell">
-																			<int key="NSCellFlags">75497536</int>
-																			<int key="NSCellFlags2">2048</int>
-																			<string key="NSContents">Chapter Title</string>
-																			<reference key="NSSupport" ref="26"/>
-																			<reference key="NSBackgroundColor" ref="754789485"/>
-																			<reference key="NSTextColor" ref="188451177"/>
-																		</object>
-																		<object class="NSTextFieldCell" key="NSDataCell" id="237660698">
-																			<int key="NSCellFlags">337641536</int>
-																			<int key="NSCellFlags2">2048</int>
-																			<string key="NSContents">Text Cell</string>
-																			<reference key="NSSupport" ref="995413175"/>
-																			<reference key="NSControlView" ref="595654978"/>
-																			<reference key="NSBackgroundColor" ref="355843302"/>
-																			<reference key="NSTextColor" ref="701609070"/>
-																		</object>
-																		<int key="NSResizingMask">3</int>
-																		<bool key="NSIsResizeable">YES</bool>
-																		<bool key="NSIsEditable">YES</bool>
-																		<reference key="NSTableView" ref="595654978"/>
-																	</object>
-																</object>
-																<double key="NSIntercellSpacingWidth">3</double>
-																<double key="NSIntercellSpacingHeight">2</double>
-																<reference key="NSBackgroundColor" ref="355843302"/>
-																<reference key="NSGridColor" ref="156710040"/>
-																<double key="NSRowHeight">17</double>
-																<int key="NSTvFlags">-700448768</int>
-																<reference key="NSDelegate"/>
-																<reference key="NSDataSource"/>
-																<int key="NSColumnAutoresizingStyle">4</int>
-																<int key="NSDraggingSourceMaskForLocal">15</int>
-																<int key="NSDraggingSourceMaskForNonLocal">0</int>
-																<bool key="NSAllowsTypeSelect">YES</bool>
-																<int key="NSTableViewDraggingDestinationStyle">0</int>
-																<int key="NSTableViewGroupRowStyle">1</int>
-															</object>
-														</object>
-														<string key="NSFrame">{{1, 17}, {869, 242}}</string>
-														<reference key="NSSuperview" ref="307620967"/>
-														<reference key="NSNextKeyView" ref="595654978"/>
-														<reference key="NSDocView" ref="595654978"/>
-														<reference key="NSBGColor" ref="355843302"/>
-														<int key="NScvFlags">4</int>
-													</object>
-													<object class="NSScroller" id="1046880533">
-														<reference key="NSNextResponder" ref="307620967"/>
-														<int key="NSvFlags">256</int>
-														<string key="NSFrame">{{870, 17}, {15, 242}}</string>
-														<reference key="NSSuperview" ref="307620967"/>
-														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-														<reference key="NSTarget" ref="307620967"/>
-														<string key="NSAction">_doScroller:</string>
-														<double key="NSPercent">0.9736842</double>
-													</object>
-													<object class="NSScroller" id="1033243513">
-														<reference key="NSNextResponder" ref="307620967"/>
-														<int key="NSvFlags">-2147483392</int>
-														<string key="NSFrame">{{-100, -100}, {488, 15}}</string>
-														<reference key="NSSuperview" ref="307620967"/>
-														<reference key="NSNextKeyView" ref="814110287"/>
-														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-														<int key="NSsFlags">1</int>
-														<reference key="NSTarget" ref="307620967"/>
-														<string key="NSAction">_doScroller:</string>
-														<double key="NSPercent">0.99047620000000003</double>
-													</object>
-													<object class="NSClipView" id="814110287">
-														<reference key="NSNextResponder" ref="307620967"/>
-														<int key="NSvFlags">2304</int>
-														<object class="NSMutableArray" key="NSSubviews">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<reference ref="928480858"/>
-														</object>
-														<string key="NSFrame">{{1, 0}, {869, 17}}</string>
-														<reference key="NSSuperview" ref="307620967"/>
-														<reference key="NSNextKeyView" ref="928480858"/>
-														<reference key="NSDocView" ref="928480858"/>
-														<reference key="NSBGColor" ref="355843302"/>
-														<int key="NScvFlags">4</int>
-													</object>
-													<reference ref="393843623"/>
-												</object>
-												<string key="NSFrame">{{17, 17}, {886, 260}}</string>
-												<reference key="NSSuperview" ref="440990725"/>
-												<reference key="NSNextKeyView" ref="272816362"/>
-												<int key="NSsFlags">133138</int>
-												<reference key="NSVScroller" ref="1046880533"/>
-												<reference key="NSHScroller" ref="1033243513"/>
-												<reference key="NSContentView" ref="272816362"/>
-												<reference key="NSHeaderClipView" ref="814110287"/>
-												<bytes key="NSScrollAmts">AAAAAAAAAABBmAAAQZgAAA</bytes>
-												<double key="NSMinMagnification">0.25</double>
-												<double key="NSMaxMagnification">4</double>
-												<double key="NSMagnification">1</double>
-											</object>
-											<object class="NSButton" id="262106913">
-												<reference key="NSNextResponder" ref="440990725"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{14, 283}, {151, 16}}</string>
-												<reference key="NSSuperview" ref="440990725"/>
-												<reference key="NSNextKeyView" ref="307620967"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSButtonCell" key="NSCell" id="719511430">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">131072</int>
-													<string key="NSContents">Create chapter markers</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="262106913"/>
-													<int key="NSButtonFlags">1211912448</int>
-													<int key="NSButtonFlags2">2</int>
-													<reference key="NSAlternateImage" ref="624832340"/>
-													<string key="NSAlternateContents"/>
-													<string key="NSKeyEquivalent"/>
-													<int key="NSPeriodicDelay">200</int>
-													<int key="NSPeriodicInterval">25</int>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
-											<object class="NSButton" id="959722284">
-												<reference key="NSNextResponder" ref="440990725"/>
-												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{187, 283}, {107, 16}}</string>
-												<reference key="NSSuperview" ref="440990725"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSButtonCell" key="NSCell" id="100898939">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">134479872</int>
-													<string key="NSContents">Import Chapters ...</string>
-													<reference key="NSSupport" ref="22"/>
-													<reference key="NSControlView" ref="959722284"/>
-													<int key="NSButtonFlags">-2038284288</int>
-													<int key="NSButtonFlags2">129</int>
-													<string key="NSAlternateContents"/>
-													<string key="NSKeyEquivalent"/>
-													<int key="NSPeriodicDelay">200</int>
-													<int key="NSPeriodicInterval">25</int>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
-											<object class="NSButton" id="931485910">
-												<reference key="NSNextResponder" ref="440990725"/>
-												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{307, 283}, {106, 16}}</string>
-												<reference key="NSSuperview" ref="440990725"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSButtonCell" key="NSCell" id="843416672">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">134479872</int>
-													<string key="NSContents">Export Chapters ...</string>
-													<reference key="NSSupport" ref="22"/>
-													<reference key="NSControlView" ref="931485910"/>
-													<int key="NSButtonFlags">-2038284288</int>
-													<int key="NSButtonFlags2">129</int>
-													<string key="NSAlternateContents"/>
-													<string key="NSKeyEquivalent"/>
-													<int key="NSPeriodicDelay">200</int>
-													<int key="NSPeriodicInterval">25</int>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
-										</object>
-										<string key="NSFrame">{{10, 25}, {920, 305}}</string>
-										<reference key="NSNextKeyView" ref="262106913"/>
-									</object>
-									<string key="NSLabel">Chapters</string>
-									<reference key="NSColor" ref="242973447"/>
-									<reference key="NSTabView" ref="712502892"/>
-								</object>
-							</object>
-							<reference key="NSSelectedTabViewItem" ref="107038816"/>
-							<reference key="NSFont" ref="26"/>
-							<int key="NSTvFlags">134217728</int>
-							<bool key="NSAllowTruncatedLabels">YES</bool>
-							<bool key="NSDrawsBackground">YES</bool>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<reference ref="1053078401"/>
-							</object>
-						</object>
-						<object class="NSTextField" id="586321835">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{20, 530}, {45, 14}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="854767306"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="121574898">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">4325376</int>
-								<string key="NSContents">Source:</string>
-								<object class="NSFont" key="NSSupport" id="27">
-									<string key="NSName">LucidaGrande-Bold</string>
-									<double key="NSSize">11</double>
-									<int key="NSfFlags">3357</int>
-								</object>
-								<reference key="NSControlView" ref="586321835"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="806469067">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{17, 501}, {35, 14}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="766125203"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="177567437">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">71303168</int>
-								<string key="NSContents">Title:</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="806469067"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSPopUpButton" id="766125203">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{55, 501}, {323, 15}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="303369850"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSPopUpButtonCell" key="NSCell" id="821198683">
-								<int key="NSCellFlags">-2076180416</int>
-								<int key="NSCellFlags2">263168</int>
-								<reference key="NSSupport" ref="22"/>
-								<reference key="NSControlView" ref="766125203"/>
-								<int key="NSButtonFlags">109199360</int>
-								<int key="NSButtonFlags2">1</int>
-								<object class="NSFont" key="NSAlternateImage" id="1010451086">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">9</double>
-									<int key="NSfFlags">16</int>
-								</object>
-								<string key="NSAlternateContents"/>
-								<object class="NSMutableString" key="NSKeyEquivalent">
-									<characters key="NS.bytes"/>
-								</object>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-								<object class="NSMenuItem" key="NSMenuItem" id="52855721">
-									<reference key="NSMenu" ref="793162058"/>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<int key="NSState">1</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-									<string key="NSAction">_popUpItemAction:</string>
-									<reference key="NSTarget" ref="821198683"/>
-								</object>
-								<bool key="NSMenuItemRespectAlignment">YES</bool>
-								<object class="NSMenu" key="NSMenu" id="793162058">
-									<object class="NSMutableString" key="NSTitle">
-										<characters key="NS.bytes">OtherViews</characters>
-									</object>
-									<object class="NSMutableArray" key="NSMenuItems">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<reference ref="52855721"/>
-									</object>
-								</object>
-								<int key="NSPreferredEdge">3</int>
-								<bool key="NSUsesItemFromMenu">YES</bool>
-								<bool key="NSAltersState">YES</bool>
-								<int key="NSArrowPosition">1</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSPopUpButton" id="482831442">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{483, 500}, {77, 15}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="971754180"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSPopUpButtonCell" key="NSCell" id="266952854">
-								<int key="NSCellFlags">-2076180416</int>
-								<int key="NSCellFlags2">263168</int>
-								<reference key="NSSupport" ref="22"/>
-								<reference key="NSControlView" ref="482831442"/>
-								<int key="NSButtonFlags">109199360</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="1010451086"/>
-								<string key="NSAlternateContents"/>
-								<object class="NSMutableString" key="NSKeyEquivalent">
-									<characters key="NS.bytes"/>
-								</object>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-								<nil key="NSMenuItem"/>
-								<bool key="NSMenuItemRespectAlignment">YES</bool>
-								<object class="NSMenu" key="NSMenu" id="289100177">
-									<object class="NSMutableString" key="NSTitle">
-										<characters key="NS.bytes">OtherViews</characters>
-									</object>
-									<object class="NSMutableArray" key="NSMenuItems">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-									</object>
-								</object>
-								<int key="NSSelectedIndex">-1</int>
-								<int key="NSPreferredEdge">3</int>
-								<bool key="NSUsesItemFromMenu">YES</bool>
-								<bool key="NSAltersState">YES</bool>
-								<int key="NSArrowPosition">1</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="303369850">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{385, 498}, {46, 17}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="460320725"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="677126774">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">71303168</int>
-								<string key="NSContents">Angle:</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="303369850"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSPopUpButton" id="460320725">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{433, 500}, {41, 15}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="482831442"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSPopUpButtonCell" key="NSCell" id="567459641">
-								<int key="NSCellFlags">-2076180416</int>
-								<int key="NSCellFlags2">263168</int>
-								<reference key="NSSupport" ref="22"/>
-								<reference key="NSControlView" ref="460320725"/>
-								<int key="NSButtonFlags">109199360</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="1010451086"/>
-								<string key="NSAlternateContents"/>
-								<object class="NSMutableString" key="NSKeyEquivalent">
-									<characters key="NS.bytes"/>
-								</object>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-								<object class="NSMenuItem" key="NSMenuItem" id="62890346">
-									<reference key="NSMenu" ref="651682595"/>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<int key="NSState">1</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-									<string key="NSAction">_popUpItemAction:</string>
-									<reference key="NSTarget" ref="567459641"/>
-								</object>
-								<bool key="NSMenuItemRespectAlignment">YES</bool>
-								<object class="NSMenu" key="NSMenu" id="651682595">
-									<object class="NSMutableString" key="NSTitle">
-										<characters key="NS.bytes">OtherViews</characters>
-									</object>
-									<object class="NSMutableArray" key="NSMenuItems">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<reference ref="62890346"/>
-									</object>
-								</object>
-								<int key="NSPreferredEdge">3</int>
-								<bool key="NSUsesItemFromMenu">YES</bool>
-								<bool key="NSAltersState">YES</bool>
-								<int key="NSArrowPosition">1</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="1023408378">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{5, 444}, {47, 17}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="186223550"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="834340599">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">71303168</int>
-								<string key="NSContents">File:</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="1023408378"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="713493964">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{751, 501}, {57, 14}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="955053416"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="1038625481">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">71303168</int>
-								<string key="NSContents">Duration:</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="713493964"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="955053416">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{808, 501}, {79, 14}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="138115732"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="362196160">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">4194304</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="955053416"/>
-								<object class="NSColor" key="NSBackgroundColor">
-									<int key="NSColorSpace">1</int>
-									<bytes key="NSRGB">MC43NjYzMDQzNyAtMCAwIDAAA</bytes>
-								</object>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="138115732">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{20, 476}, {70, 14}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="104002862"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="510160694">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">4325376</int>
-								<string key="NSContents">Destination</string>
-								<reference key="NSSupport" ref="27"/>
-								<reference key="NSControlView" ref="138115732"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSPopUpButton" id="732193996">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{76, 388}, {177, 22}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="553453876"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSPopUpButtonCell" key="NSCell" id="264217237">
-								<int key="NSCellFlags">-2076180416</int>
-								<int key="NSCellFlags2">132096</int>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="732193996"/>
-								<int key="NSButtonFlags">109199360</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="26"/>
-								<string key="NSAlternateContents"/>
-								<object class="NSMutableString" key="NSKeyEquivalent">
-									<characters key="NS.bytes"/>
-								</object>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-								<object class="NSMenuItem" key="NSMenuItem" id="586933029">
-									<reference key="NSMenu" ref="237152896"/>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<int key="NSState">1</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-									<string key="NSAction">_popUpItemAction:</string>
-									<reference key="NSTarget" ref="264217237"/>
-								</object>
-								<bool key="NSMenuItemRespectAlignment">YES</bool>
-								<object class="NSMenu" key="NSMenu" id="237152896">
-									<string key="NSTitle">OtherViews</string>
-									<object class="NSMutableArray" key="NSMenuItems">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<reference ref="586933029"/>
-									</object>
-								</object>
-								<int key="NSPreferredEdge">3</int>
-								<bool key="NSUsesItemFromMenu">YES</bool>
-								<bool key="NSAltersState">YES</bool>
-								<int key="NSArrowPosition">1</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSButton" id="210289606">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{755, 440}, {90, 28}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="35106907"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="295879492">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">134348800</int>
-								<string key="NSContents">Browse…</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="210289606"/>
-								<int key="NSButtonFlags">-2038284288</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="995413175"/>
-								<string key="NSAlternateContents"/>
-								<object class="NSMutableString" key="NSKeyEquivalent">
-									<characters key="NS.bytes"/>
-								</object>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSBox" id="10346684">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{98, 480}, {842, 5}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="1023408378"/>
-							<string key="NSOffsets">{0, 0}</string>
-							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Box</string>
-								<reference key="NSSupport" ref="273283760"/>
-								<reference key="NSBackgroundColor" ref="138233214"/>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-								</object>
-							</object>
-							<int key="NSBorderType">3</int>
-							<int key="NSBoxType">2</int>
-							<int key="NSTitlePosition">0</int>
-							<bool key="NSTransparent">NO</bool>
-						</object>
-						<object class="NSTextField" id="854767306">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{70, 530}, {309, 14}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="519699512"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="689580100">
-								<int key="NSCellFlags">69206081</int>
-								<int key="NSCellFlags2">4327936</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="854767306"/>
-								<object class="NSColor" key="NSBackgroundColor">
-									<int key="NSColorSpace">1</int>
-									<bytes key="NSRGB">MSAxIDEAA</bytes>
-								</object>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="186223550">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{56, 445}, {684, 19}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="210289606"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="988599137">
-								<int key="NSCellFlags">-1804599231</int>
-								<int key="NSCellFlags2">4326400</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="186223550"/>
-								<bool key="NSDrawsBackground">YES</bool>
-								<reference key="NSBackgroundColor" ref="138233214"/>
-								<reference key="NSTextColor" ref="378140636"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="104002862">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{571, 485}, {54, 16}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="978025076"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="371961838">
-								<int key="NSCellFlags">-1804599231</int>
-								<int key="NSCellFlags2">71566336</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="22"/>
-								<reference key="NSControlView" ref="104002862"/>
-								<bool key="NSDrawsBackground">YES</bool>
-								<reference key="NSBackgroundColor" ref="138233214"/>
-								<reference key="NSTextColor" ref="378140636"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="398989741">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{628, 485}, {54, 16}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="453345136"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="506346481">
-								<int key="NSCellFlags">-1804599231</int>
-								<int key="NSCellFlags2">71566336</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="22"/>
-								<reference key="NSControlView" ref="398989741"/>
-								<bool key="NSDrawsBackground">YES</bool>
-								<reference key="NSBackgroundColor" ref="138233214"/>
-								<reference key="NSTextColor" ref="378140636"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="19055068">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{686, 485}, {54, 16}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="164276139"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="778187711">
-								<int key="NSCellFlags">-1804599231</int>
-								<int key="NSCellFlags2">4457472</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="22"/>
-								<reference key="NSControlView" ref="19055068"/>
-								<bool key="NSDrawsBackground">YES</bool>
-								<reference key="NSBackgroundColor" ref="138233214"/>
-								<reference key="NSTextColor" ref="378140636"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="164276139">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{748, 485}, {54, 16}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="10346684"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="1039518079">
-								<int key="NSCellFlags">-1804599231</int>
-								<int key="NSCellFlags2">4457472</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="22"/>
-								<reference key="NSControlView" ref="164276139"/>
-								<bool key="NSDrawsBackground">YES</bool>
-								<reference key="NSBackgroundColor" ref="138233214"/>
-								<reference key="NSTextColor" ref="378140636"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="35106907">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{20, 420}, {96, 14}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="574185541"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="293028864">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">4325376</int>
-								<string key="NSContents">Output Settings:</string>
-								<reference key="NSSupport" ref="27"/>
-								<reference key="NSControlView" ref="35106907"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSBox" id="151388399">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{294, 424}, {646, 5}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="87961628"/>
-							<string key="NSOffsets">{0, 0}</string>
-							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Box</string>
-								<reference key="NSSupport" ref="273283760"/>
-								<reference key="NSBackgroundColor" ref="138233214"/>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-								</object>
-							</object>
-							<int key="NSBorderType">3</int>
-							<int key="NSBoxType">2</int>
-							<int key="NSTitlePosition">0</int>
-							<bool key="NSTransparent">NO</bool>
-						</object>
-						<object class="NSTextField" id="574185541">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{124, 420}, {162, 14}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="151388399"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="488791842">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">272629760</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="27"/>
-								<reference key="NSControlView" ref="574185541"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="1007421233">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{731, 15}, {218, 14}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="222334056"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="224806210">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">71434240</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="1007421233"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="87961628">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{21, 393}, {53, 14}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="732193996"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="51600927">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">71303168</int>
-								<string key="NSContents">Format:</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="87961628"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSBox" id="454206717">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{386, 533}, {554, 5}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="806469067"/>
-							<string key="NSOffsets">{0, 0}</string>
-							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Box</string>
-								<reference key="NSSupport" ref="273283760"/>
-								<reference key="NSBackgroundColor" ref="138233214"/>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-								</object>
-							</object>
-							<int key="NSBorderType">3</int>
-							<int key="NSBoxType">2</int>
-							<int key="NSTitlePosition">0</int>
-							<bool key="NSTransparent">NO</bool>
-						</object>
-						<object class="NSProgressIndicator" id="519699512">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">-2147483380</int>
-							<string key="NSFrame">{{385, 532}, {562, 12}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="454206717"/>
-							<int key="NSpiFlags">16648</int>
-							<double key="NSMaxValue">100</double>
-						</object>
-						<object class="NSButton" id="581806074">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{399, 391}, {141, 18}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="921877174"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="832863281">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">131072</int>
-								<string key="NSContents">Web optimized</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="581806074"/>
-								<int key="NSButtonFlags">1211912448</int>
-								<int key="NSButtonFlags2">2</int>
-								<reference key="NSNormalImage" ref="887198214"/>
-								<reference key="NSAlternateImage" ref="624832340"/>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSButton" id="553453876">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{283, 391}, {102, 18}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="581806074"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="294332300">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">131072</int>
-								<string key="NSContents">Large file size</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="553453876"/>
-								<int key="NSButtonFlags">1211912448</int>
-								<int key="NSButtonFlags2">2</int>
-								<reference key="NSNormalImage" ref="887198214"/>
-								<reference key="NSAlternateImage" ref="624832340"/>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSButton" id="921877174">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{541, 391}, {141, 18}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="712502892"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="547085070">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">131072</int>
-								<string key="NSContents">iPod 5G support</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="921877174"/>
-								<int key="NSButtonFlags">1211912448</int>
-								<int key="NSButtonFlags2">2</int>
-								<reference key="NSNormalImage" ref="887198214"/>
-								<reference key="NSAlternateImage" ref="624832340"/>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="978025076">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{627, 500}, {56, 15}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="398989741"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="138681808">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">138412032</int>
-								<string key="NSContents">through</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="978025076"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSPopUpButton" id="971754180">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{570, 500}, {57, 15}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="713493964"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSPopUpButtonCell" key="NSCell" id="286887304">
-								<int key="NSCellFlags">-2076180416</int>
-								<int key="NSCellFlags2">263168</int>
-								<reference key="NSSupport" ref="22"/>
-								<reference key="NSControlView" ref="971754180"/>
-								<int key="NSButtonFlags">109199360</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="1010451086"/>
-								<string key="NSAlternateContents"/>
-								<object class="NSMutableString" key="NSKeyEquivalent">
-									<characters key="NS.bytes"/>
-								</object>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-								<object class="NSMenuItem" key="NSMenuItem" id="170826719">
-									<reference key="NSMenu" ref="493845446"/>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<int key="NSState">1</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-									<string key="NSAction">_popUpItemAction:</string>
-									<reference key="NSTarget" ref="286887304"/>
-								</object>
-								<bool key="NSMenuItemRespectAlignment">YES</bool>
-								<object class="NSMenu" key="NSMenu" id="493845446">
-									<object class="NSMutableString" key="NSTitle">
-										<characters key="NS.bytes">OtherViews</characters>
-									</object>
-									<object class="NSMutableArray" key="NSMenuItems">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<reference ref="170826719"/>
-									</object>
-								</object>
-								<int key="NSPreferredEdge">3</int>
-								<bool key="NSUsesItemFromMenu">YES</bool>
-								<bool key="NSAltersState">YES</bool>
-								<int key="NSArrowPosition">1</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSPopUpButton" id="453345136">
-							<reference key="NSNextResponder" ref="168918359"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{685, 500}, {57, 15}}</string>
-							<reference key="NSSuperview" ref="168918359"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="19055068"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSPopUpButtonCell" key="NSCell" id="564669343">
-								<int key="NSCellFlags">-2076180416</int>
-								<int key="NSCellFlags2">263168</int>
-								<reference key="NSSupport" ref="22"/>
-								<reference key="NSControlView" ref="453345136"/>
-								<int key="NSButtonFlags">109199360</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="1010451086"/>
-								<string key="NSAlternateContents"/>
-								<object class="NSMutableString" key="NSKeyEquivalent">
-									<characters key="NS.bytes"/>
-								</object>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-								<object class="NSMenuItem" key="NSMenuItem" id="1048999115">
-									<reference key="NSMenu" ref="27255767"/>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<int key="NSState">1</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-									<string key="NSAction">_popUpItemAction:</string>
-									<reference key="NSTarget" ref="564669343"/>
-								</object>
-								<bool key="NSMenuItemRespectAlignment">YES</bool>
-								<object class="NSMenu" key="NSMenu" id="27255767">
-									<object class="NSMutableString" key="NSTitle">
-										<characters key="NS.bytes">OtherViews</characters>
-									</object>
-									<object class="NSMutableArray" key="NSMenuItems">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<reference ref="1048999115"/>
-									</object>
-								</object>
-								<int key="NSPreferredEdge">3</int>
-								<bool key="NSUsesItemFromMenu">YES</bool>
-								<bool key="NSAltersState">YES</bool>
-								<int key="NSArrowPosition">1</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-					</object>
-					<string key="NSFrameSize">{959, 558}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
-					<reference key="NSNextKeyView" ref="586321835"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
-				<string key="NSMinSize">{213, 129}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-			<object class="NSMenu" id="840340181">
-				<string key="NSTitle">MainMenu</string>
-				<object class="NSMutableArray" key="NSMenuItems">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSMenuItem" id="116324948">
-						<reference key="NSMenu" ref="840340181"/>
-						<string key="NSTitle">HandBrake</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="447995298"/>
-						<reference key="NSMixedImage" ref="760317610"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="1035150210">
-							<string key="NSTitle">HandBrake</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="218095211">
-									<reference key="NSMenu" ref="1035150210"/>
-									<string key="NSTitle">About HandBrake</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="985983659">
-									<reference key="NSMenu" ref="1035150210"/>
-									<string key="NSTitle">Check for Updates…</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="912853376">
-									<reference key="NSMenu" ref="1035150210"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="782330144">
-									<reference key="NSMenu" ref="1035150210"/>
-									<string key="NSTitle">Preferences...</string>
-									<string key="NSKeyEquiv">,</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="802148601">
-									<reference key="NSMenu" ref="1035150210"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="981110965">
-									<reference key="NSMenu" ref="1035150210"/>
-									<string key="NSTitle">Hide HandBrake</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="360013803">
-									<reference key="NSMenu" ref="1035150210"/>
-									<string key="NSTitle">Hide Others</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1572864</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="750596130">
-									<reference key="NSMenu" ref="1035150210"/>
-									<string key="NSTitle">Show All</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="550835954">
-									<reference key="NSMenu" ref="1035150210"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="680265479">
-									<reference key="NSMenu" ref="1035150210"/>
-									<string key="NSTitle">Quit HandBrake</string>
-									<string key="NSKeyEquiv">q</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-							</object>
-							<string key="NSName">_NSAppleMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="966413586">
-						<reference key="NSMenu" ref="840340181"/>
-						<string key="NSTitle">File</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="447995298"/>
-						<reference key="NSMixedImage" ref="760317610"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="567182830">
-							<object class="NSMutableString" key="NSTitle">
-								<characters key="NS.bytes">File</characters>
-							</object>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="595836714">
-									<reference key="NSMenu" ref="567182830"/>
-									<string key="NSTitle">Open Source…</string>
-									<string key="NSKeyEquiv">o</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="865776798">
-									<reference key="NSMenu" ref="567182830"/>
-									<string key="NSTitle">Open Source (Title Specific) ...</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="417984878">
-									<reference key="NSMenu" ref="567182830"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="542310438">
-									<reference key="NSMenu" ref="567182830"/>
-									<string key="NSTitle">Close</string>
-									<string key="NSKeyEquiv">w</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="374169999">
-									<reference key="NSMenu" ref="567182830"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="853234446">
-									<reference key="NSMenu" ref="567182830"/>
-									<string key="NSTitle">Add To Queue</string>
-									<string key="NSKeyEquiv">b</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="232757118">
-									<reference key="NSMenu" ref="567182830"/>
-									<string key="NSTitle">Add All Titles To Queue ...</string>
-									<string key="NSKeyEquiv">b</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="17111946">
-									<reference key="NSMenu" ref="567182830"/>
-									<string key="NSTitle">Start Encoding</string>
-									<string key="NSKeyEquiv">s</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="101536867">
-									<reference key="NSMenu" ref="567182830"/>
-									<string key="NSTitle">Pause Encoding</string>
-									<string key="NSKeyEquiv">p</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="692187614">
-						<reference key="NSMenu" ref="840340181"/>
-						<string key="NSTitle">Edit</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="447995298"/>
-						<reference key="NSMixedImage" ref="760317610"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="1010405502">
-							<object class="NSMutableString" key="NSTitle">
-								<characters key="NS.bytes">Edit</characters>
-							</object>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="587511664">
-									<reference key="NSMenu" ref="1010405502"/>
-									<string key="NSTitle">Undo</string>
-									<string key="NSKeyEquiv">z</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="786616983">
-									<reference key="NSMenu" ref="1010405502"/>
-									<string key="NSTitle">Redo</string>
-									<string key="NSKeyEquiv">Z</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="134768774">
-									<reference key="NSMenu" ref="1010405502"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="84425921">
-									<reference key="NSMenu" ref="1010405502"/>
-									<string key="NSTitle">Cut</string>
-									<string key="NSKeyEquiv">x</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="979367247">
-									<reference key="NSMenu" ref="1010405502"/>
-									<string key="NSTitle">Copy</string>
-									<string key="NSKeyEquiv">c</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="741953332">
-									<reference key="NSMenu" ref="1010405502"/>
-									<string key="NSTitle">Paste</string>
-									<string key="NSKeyEquiv">v</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="1006794292">
-									<reference key="NSMenu" ref="1010405502"/>
-									<string key="NSTitle">Paste and Match Style</string>
-									<string key="NSKeyEquiv">V</string>
-									<int key="NSKeyEquivModMask">1572864</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="494582096">
-									<reference key="NSMenu" ref="1010405502"/>
-									<string key="NSTitle">Delete</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="695401358">
-									<reference key="NSMenu" ref="1010405502"/>
-									<string key="NSTitle">Select All</string>
-									<string key="NSKeyEquiv">a</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="1051795572">
-									<reference key="NSMenu" ref="1010405502"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="249090291">
-									<reference key="NSMenu" ref="1010405502"/>
-									<string key="NSTitle">Find</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="1067858879">
-										<object class="NSMutableString" key="NSTitle">
-											<characters key="NS.bytes">Find</characters>
-										</object>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="49300518">
-												<reference key="NSMenu" ref="1067858879"/>
-												<string key="NSTitle">Find…</string>
-												<string key="NSKeyEquiv">f</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="447995298"/>
-												<reference key="NSMixedImage" ref="760317610"/>
-												<int key="NSTag">1</int>
-											</object>
-											<object class="NSMenuItem" id="323467360">
-												<reference key="NSMenu" ref="1067858879"/>
-												<string key="NSTitle">Find Next</string>
-												<string key="NSKeyEquiv">g</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="447995298"/>
-												<reference key="NSMixedImage" ref="760317610"/>
-												<int key="NSTag">2</int>
-											</object>
-											<object class="NSMenuItem" id="1069789051">
-												<reference key="NSMenu" ref="1067858879"/>
-												<string key="NSTitle">Find Previous</string>
-												<string key="NSKeyEquiv">G</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="447995298"/>
-												<reference key="NSMixedImage" ref="760317610"/>
-												<int key="NSTag">3</int>
-											</object>
-											<object class="NSMenuItem" id="793630765">
-												<reference key="NSMenu" ref="1067858879"/>
-												<string key="NSTitle">Use Selection for Find</string>
-												<string key="NSKeyEquiv">e</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="447995298"/>
-												<reference key="NSMixedImage" ref="760317610"/>
-												<int key="NSTag">7</int>
-											</object>
-											<object class="NSMenuItem" id="541561571">
-												<reference key="NSMenu" ref="1067858879"/>
-												<string key="NSTitle">Jump to Selection</string>
-												<string key="NSKeyEquiv">j</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="447995298"/>
-												<reference key="NSMixedImage" ref="760317610"/>
-											</object>
-										</object>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="1016677230">
-									<reference key="NSMenu" ref="1010405502"/>
-									<string key="NSTitle">Spelling</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="650155643">
-										<string key="NSTitle">Spelling</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="981624971">
-												<reference key="NSMenu" ref="650155643"/>
-												<string key="NSTitle">Spelling…</string>
-												<string key="NSKeyEquiv">:</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="447995298"/>
-												<reference key="NSMixedImage" ref="760317610"/>
-											</object>
-											<object class="NSMenuItem" id="301925013">
-												<reference key="NSMenu" ref="650155643"/>
-												<string key="NSTitle">Check Spelling</string>
-												<string key="NSKeyEquiv">;</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="447995298"/>
-												<reference key="NSMixedImage" ref="760317610"/>
-											</object>
-											<object class="NSMenuItem" id="6854324">
-												<reference key="NSMenu" ref="650155643"/>
-												<string key="NSTitle">Check Spelling as You Type</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="447995298"/>
-												<reference key="NSMixedImage" ref="760317610"/>
-											</object>
-										</object>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="611285451">
-									<reference key="NSMenu" ref="1010405502"/>
-									<string key="NSTitle">Speech</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="654962117">
-										<string key="NSTitle">Speech</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="362189914">
-												<reference key="NSMenu" ref="654962117"/>
-												<string key="NSTitle">Start Speaking</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="447995298"/>
-												<reference key="NSMixedImage" ref="760317610"/>
-											</object>
-											<object class="NSMenuItem" id="496049927">
-												<reference key="NSMenu" ref="654962117"/>
-												<string key="NSTitle">Stop Speaking</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="447995298"/>
-												<reference key="NSMixedImage" ref="760317610"/>
-											</object>
-										</object>
-									</object>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="226787934">
-						<reference key="NSMenu" ref="840340181"/>
-						<string key="NSTitle">Presets</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="447995298"/>
-						<reference key="NSMixedImage" ref="760317610"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="112579544">
-							<string key="NSTitle">Presets</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="814047217">
-									<reference key="NSMenu" ref="112579544"/>
-									<string key="NSTitle">Update Built-in Presets</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="153657129">
-									<reference key="NSMenu" ref="112579544"/>
-									<string key="NSTitle">Delete Built-in Presets</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="644928468">
-									<reference key="NSMenu" ref="112579544"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="180231">
-									<reference key="NSMenu" ref="112579544"/>
-									<string key="NSTitle">New Preset ...</string>
-									<string key="NSKeyEquiv">n</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="734454745">
-									<reference key="NSMenu" ref="112579544"/>
-									<string key="NSTitle">Export ...</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="685593004">
-									<reference key="NSMenu" ref="112579544"/>
-									<string key="NSTitle">Import ...</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="454042588">
-									<reference key="NSMenu" ref="112579544"/>
-									<string key="NSTitle">Select Default Preset</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="610133626">
-						<reference key="NSMenu" ref="840340181"/>
-						<string key="NSTitle">Window</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="447995298"/>
-						<reference key="NSMixedImage" ref="760317610"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="919178355">
-							<object class="NSMutableString" key="NSTitle">
-								<characters key="NS.bytes">Window</characters>
-							</object>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="372804054">
-									<reference key="NSMenu" ref="919178355"/>
-									<string key="NSTitle">Minimize</string>
-									<string key="NSKeyEquiv">m</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="998796929">
-									<reference key="NSMenu" ref="919178355"/>
-									<string key="NSTitle">Bring All to Front</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="196605560">
-									<reference key="NSMenu" ref="919178355"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="545622547">
-									<reference key="NSMenu" ref="919178355"/>
-									<string key="NSTitle">HandBrake</string>
-									<string key="NSKeyEquiv">1</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="87484946">
-									<reference key="NSMenu" ref="919178355"/>
-									<string key="NSTitle">Queue</string>
-									<string key="NSKeyEquiv">2</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="1034427275">
-									<reference key="NSMenu" ref="919178355"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="854594899">
-									<reference key="NSMenu" ref="919178355"/>
-									<string key="NSTitle">Presets Drawer</string>
-									<string key="NSKeyEquiv">t</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="849279674">
-									<reference key="NSMenu" ref="919178355"/>
-									<string key="NSTitle">Picture Settings</string>
-									<string key="NSKeyEquiv">P</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="157409278">
-									<reference key="NSMenu" ref="919178355"/>
-									<string key="NSTitle">Preview Window</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="302989927">
-									<reference key="NSMenu" ref="919178355"/>
-									<string key="NSTitle">Activity Window</string>
-									<string key="NSKeyEquiv">D</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-							</object>
-							<string key="NSName">_NSWindowsMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="487283590">
-						<reference key="NSMenu" ref="840340181"/>
-						<string key="NSTitle">Help</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="447995298"/>
-						<reference key="NSMixedImage" ref="760317610"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="371757683">
-							<string key="NSTitle">Help</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="911007118">
-									<reference key="NSMenu" ref="371757683"/>
-									<string key="NSTitle">HandBrake User Guide</string>
-									<string key="NSKeyEquiv">?</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="265609219">
-									<reference key="NSMenu" ref="371757683"/>
-									<string key="NSTitle">HandBrake Homepage</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-								<object class="NSMenuItem" id="757350989">
-									<reference key="NSMenu" ref="371757683"/>
-									<string key="NSTitle">HandBrake Forums</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-								</object>
-							</object>
-						</object>
-					</object>
-				</object>
-				<string key="NSName">_NSMainMenu</string>
-			</object>
-			<object class="NSWindowTemplate" id="526140766">
-				<int key="NSWindowStyleMask">3</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{57, 765}, {300, 233}}</string>
-				<int key="NSWTFlags">1886912512</int>
-				<object class="NSMutableString" key="NSWindowTitle">
-					<characters key="NS.bytes">Panel</characters>
-				</object>
-				<string key="NSWindowClass">NSPanel</string>
-				<object class="NSMutableString" key="NSViewClass">
-					<characters key="NS.bytes">View</characters>
-				</object>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<string key="NSWindowContentMinSize">{213, 107}</string>
-				<object class="NSView" key="NSWindowView" id="168254512">
-					<nil key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSImageView" id="940804962">
-							<reference key="NSNextResponder" ref="168254512"/>
-							<int key="NSvFlags">256</int>
-							<object class="NSMutableSet" key="NSDragTypes">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="set.sortedObjects">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>Apple PDF pasteboard type</string>
-									<string>Apple PICT pasteboard type</string>
-									<string>Apple PNG pasteboard type</string>
-									<string>NSFilenamesPboardType</string>
-									<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
-									<string>NeXT TIFF v4.0 pasteboard type</string>
-								</object>
-							</object>
-							<string key="NSFrame">{{83, 82}, {134, 134}}</string>
-							<reference key="NSSuperview" ref="168254512"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSImageCell" key="NSCell" id="72412547">
-								<int key="NSCellFlags">134217728</int>
-								<int key="NSCellFlags2">33554432</int>
-								<object class="NSCustomResource" key="NSContents">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">HandBrake.icns</string>
-								</object>
-								<int key="NSAlign">0</int>
-								<int key="NSScale">0</int>
-								<int key="NSStyle">0</int>
-								<bool key="NSAnimates">NO</bool>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-							<bool key="NSEditable">YES</bool>
-						</object>
-						<object class="NSButton" id="764659803">
-							<reference key="NSNextResponder" ref="168254512"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{202, 12}, {84, 32}}</string>
-							<reference key="NSSuperview" ref="168254512"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="938246142">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">137887744</int>
-								<string key="NSContents">Ahuh !</string>
-								<reference key="NSSupport" ref="273283760"/>
-								<reference key="NSControlView" ref="764659803"/>
-								<int key="NSButtonFlags">-2038284288</int>
-								<int key="NSButtonFlags2">1</int>
-								<object class="NSFont" key="NSAlternateImage">
-									<string key="NSName">Helvetica</string>
-									<double key="NSSize">13</double>
-									<int key="NSfFlags">16</int>
-								</object>
-								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="640205151">
-							<reference key="NSNextResponder" ref="168254512"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{82, 60}, {134, 17}}</string>
-							<reference key="NSSuperview" ref="168254512"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="160092001">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">138412032</int>
-								<string key="NSContents">Rip done !</string>
-								<reference key="NSSupport" ref="273283760"/>
-								<reference key="NSControlView" ref="640205151"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-					</object>
-					<string key="NSFrameSize">{300, 233}</string>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
-				<string key="NSMinSize">{213, 129}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-			<object class="NSDrawer" id="972647787">
-				<nil key="NSNextResponder"/>
-				<string key="NSContentSize">{240, 550}</string>
-				<string key="NSMinContentSize">{100, 50}</string>
-				<string key="NSMaxContentSize">{280, 550}</string>
-				<int key="NSPreferredEdge">2</int>
-				<double key="NSLeadingOffset">0.0</double>
-				<double key="NSTrailingOffset">15</double>
-				<nil key="NSParentWindow"/>
-				<nil key="NSDelegate"/>
-			</object>
-			<object class="NSCustomView" id="621751818">
-				<nil key="NSNextResponder"/>
-				<int key="NSvFlags">256</int>
-				<object class="NSMutableArray" key="NSSubviews">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSScrollView" id="33643505">
-						<reference key="NSNextResponder" ref="621751818"/>
-						<int key="NSvFlags">274</int>
-						<object class="NSMutableArray" key="NSSubviews">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="NSClipView" id="421228634">
-								<reference key="NSNextResponder" ref="33643505"/>
-								<int key="NSvFlags">2304</int>
-								<object class="NSMutableArray" key="NSSubviews">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<object class="NSOutlineView" id="807972370">
-										<reference key="NSNextResponder" ref="421228634"/>
-										<int key="NSvFlags">256</int>
-										<string key="NSFrameSize">{247, 506}</string>
-										<reference key="NSSuperview" ref="421228634"/>
-										<bool key="NSEnabled">YES</bool>
-										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										<bool key="NSControlAllowsExpansionToolTips">YES</bool>
-										<object class="_NSCornerView" key="NSCornerView">
-											<nil key="NSNextResponder"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{184, 0}, {16, 17}}</string>
-										</object>
-										<object class="NSMutableArray" key="NSTableColumns">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSTableColumn" id="658438499">
-												<string key="NSIdentifier">PresetName</string>
-												<double key="NSWidth">244</double>
-												<double key="NSMinWidth">40</double>
-												<double key="NSMaxWidth">1000</double>
-												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75497536</int>
-													<int key="NSCellFlags2">2048</int>
-													<string key="NSContents">Presets</string>
-													<reference key="NSSupport" ref="26"/>
-													<object class="NSColor" key="NSBackgroundColor">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
-													</object>
-													<reference key="NSTextColor" ref="188451177"/>
-												</object>
-												<object class="NSTextFieldCell" key="NSDataCell" id="384895213">
-													<int key="NSCellFlags">337641536</int>
-													<int key="NSCellFlags2">2048</int>
-													<string key="NSContents">Text Cell</string>
-													<reference key="NSSupport" ref="995413175"/>
-													<reference key="NSControlView" ref="807972370"/>
-													<reference key="NSBackgroundColor" ref="355843302"/>
-													<reference key="NSTextColor" ref="701609070"/>
-												</object>
-												<int key="NSResizingMask">1</int>
-												<bool key="NSIsResizeable">YES</bool>
-												<bool key="NSIsEditable">YES</bool>
-												<reference key="NSTableView" ref="807972370"/>
-												<object class="NSSortDescriptor" key="NSSortDescriptorPrototype">
-													<string key="NSKey">PresetName</string>
-													<bool key="NSAscending">YES</bool>
-													<string key="NSSelector">compare:</string>
-												</object>
-											</object>
-										</object>
-										<double key="NSIntercellSpacingWidth">3</double>
-										<double key="NSIntercellSpacingHeight">2</double>
-										<reference key="NSBackgroundColor" ref="809784795"/>
-										<reference key="NSGridColor" ref="156710040"/>
-										<double key="NSRowHeight">14</double>
-										<int key="NSTvFlags">314572800</int>
-										<reference key="NSDelegate"/>
-										<reference key="NSDataSource"/>
-										<int key="NSColumnAutoresizingStyle">4</int>
-										<int key="NSDraggingSourceMaskForLocal">15</int>
-										<int key="NSDraggingSourceMaskForNonLocal">0</int>
-										<bool key="NSAllowsTypeSelect">YES</bool>
-										<int key="NSTableViewDraggingDestinationStyle">0</int>
-										<int key="NSTableViewGroupRowStyle">1</int>
-										<float key="NSOutlineViewIndentationPerLevelKey">12</float>
-									</object>
-								</object>
-								<string key="NSFrame">{{1, 1}, {247, 506}}</string>
-								<reference key="NSSuperview" ref="33643505"/>
-								<reference key="NSNextKeyView" ref="807972370"/>
-								<reference key="NSDocView" ref="807972370"/>
-								<reference key="NSBGColor" ref="355843302"/>
-								<int key="NScvFlags">4</int>
-							</object>
-							<object class="NSScroller" id="475123229">
-								<reference key="NSNextResponder" ref="33643505"/>
-								<int key="NSvFlags">256</int>
-								<string key="NSFrame">{{248, 1}, {11, 506}}</string>
-								<reference key="NSSuperview" ref="33643505"/>
-								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								<int key="NSsFlags">256</int>
-								<reference key="NSTarget" ref="33643505"/>
-								<string key="NSAction">_doScroller:</string>
-								<double key="NSPercent">0.99770119999999995</double>
-							</object>
-							<object class="NSScroller" id="573337548">
-								<reference key="NSNextResponder" ref="33643505"/>
-								<int key="NSvFlags">-2147483392</int>
-								<string key="NSFrame">{{-100, -100}, {183, 15}}</string>
-								<reference key="NSSuperview" ref="33643505"/>
-								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								<int key="NSsFlags">1</int>
-								<reference key="NSTarget" ref="33643505"/>
-								<string key="NSAction">_doScroller:</string>
-								<double key="NSPercent">0.99456520000000004</double>
-							</object>
-						</object>
-						<string key="NSFrame">{{4, 31}, {260, 508}}</string>
-						<reference key="NSSuperview" ref="621751818"/>
-						<reference key="NSNextKeyView" ref="421228634"/>
-						<int key="NSsFlags">133138</int>
-						<reference key="NSVScroller" ref="475123229"/>
-						<reference key="NSHScroller" ref="573337548"/>
-						<reference key="NSContentView" ref="421228634"/>
-						<bytes key="NSScrollAmts">QSAAAEEgAABBgAAAQYAAAA</bytes>
-						<double key="NSMinMagnification">0.25</double>
-						<double key="NSMaxMagnification">4</double>
-						<double key="NSMagnification">1</double>
-					</object>
-					<object class="NSButton" id="241719587">
-						<reference key="NSNextResponder" ref="621751818"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{27, 1}, {24, 23}}</string>
-						<reference key="NSSuperview" ref="621751818"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="501219161">
-							<int key="NSCellFlags">67108864</int>
-							<int key="NSCellFlags2">0</int>
-							<string key="NSContents"/>
-							<object class="NSFont" key="NSSupport" id="575851035">
-								<string key="NSName">LucidaGrande-Bold</string>
-								<double key="NSSize">13</double>
-								<int key="NSfFlags">2072</int>
-							</object>
-							<reference key="NSControlView" ref="241719587"/>
-							<int key="NSButtonFlags">-2030804992</int>
-							<int key="NSButtonFlags2">34</int>
-							<object class="NSCustomResource" key="NSNormalImage">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">NSRemoveTemplate</string>
-							</object>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-					</object>
-					<object class="NSButton" id="699919504">
-						<reference key="NSNextResponder" ref="621751818"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{4, 1}, {24, 23}}</string>
-						<reference key="NSSuperview" ref="621751818"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="489159603">
-							<int key="NSCellFlags">-2080374784</int>
-							<int key="NSCellFlags2">134217728</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="575851035"/>
-							<reference key="NSControlView" ref="699919504"/>
-							<int key="NSButtonFlags">-2032902144</int>
-							<int key="NSButtonFlags2">34</int>
-							<object class="NSCustomResource" key="NSNormalImage">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">NSAddTemplate</string>
-							</object>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-					</object>
-					<object class="NSPopUpButton" id="886184281">
-						<reference key="NSNextResponder" ref="621751818"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{59, 1}, {33, 23}}</string>
-						<reference key="NSSuperview" ref="621751818"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="492120702">
-							<int key="NSCellFlags">71303232</int>
-							<int key="NSCellFlags2">2048</int>
-							<reference key="NSSupport" ref="273283760"/>
-							<reference key="NSControlView" ref="886184281"/>
-							<int key="NSButtonFlags">-2031075328</int>
-							<int key="NSButtonFlags2">162</int>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="228547440">
-								<reference key="NSMenu" ref="717227898"/>
-								<bool key="NSIsHidden">YES</bool>
-								<string key="NSTitle"/>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<object class="NSCustomResource" key="NSImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSActionTemplate</string>
-								</object>
-								<reference key="NSOnImage" ref="447995298"/>
-								<reference key="NSMixedImage" ref="760317610"/>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="492120702"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="717227898">
-								<string key="NSTitle">Presets Action Menu</string>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<reference ref="228547440"/>
-									<object class="NSMenuItem" id="950937431">
-										<reference key="NSMenu" ref="717227898"/>
-										<string key="NSTitle">Make Default</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="447995298"/>
-										<reference key="NSMixedImage" ref="760317610"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="492120702"/>
-									</object>
-									<object class="NSMenuItem" id="583192244">
-										<reference key="NSMenu" ref="717227898"/>
-										<string key="NSTitle">Update Built-in Presets</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="447995298"/>
-										<reference key="NSMixedImage" ref="760317610"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="492120702"/>
-									</object>
-								</object>
-							</object>
-							<bool key="NSPullDown">YES</bool>
-							<int key="NSPreferredEdge">1</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">2</int>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-					</object>
-				</object>
-				<string key="NSFrameSize">{270, 550}</string>
-				<string key="NSClassName">NSView</string>
-				<string key="NSExtension">NSResponder</string>
-			</object>
-			<object class="NSWindowTemplate" id="888992113">
-				<int key="NSWindowStyleMask">1</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{421, 536}, {338, 318}}</string>
-				<int key="NSWTFlags">1886912512</int>
-				<string key="NSWindowTitle">Create A New Preset</string>
-				<string key="NSWindowClass">NSPanel</string>
-				<object class="NSMutableString" key="NSViewClass">
-					<characters key="NS.bytes">View</characters>
-				</object>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<string key="NSWindowContentMinSize">{338, 232}</string>
-				<object class="NSView" key="NSWindowView" id="69290042">
-					<nil key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSButton" id="636581183">
-							<reference key="NSNextResponder" ref="69290042"/>
-							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{239, 12}, {85, 32}}</string>
-							<reference key="NSSuperview" ref="69290042"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="107603394">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Add</string>
-								<reference key="NSSupport" ref="273283760"/>
-								<reference key="NSControlView" ref="636581183"/>
-								<int key="NSButtonFlags">-2038284288</int>
-								<int key="NSButtonFlags2">1</int>
-								<object class="NSFont" key="NSAlternateImage" id="212993004">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">13</double>
-									<int key="NSfFlags">16</int>
-								</object>
-								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSButton" id="586136427">
-							<reference key="NSNextResponder" ref="69290042"/>
-							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{155, 12}, {84, 32}}</string>
-							<reference key="NSSuperview" ref="69290042"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="231870318">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Cancel</string>
-								<reference key="NSSupport" ref="273283760"/>
-								<reference key="NSControlView" ref="586136427"/>
-								<int key="NSButtonFlags">-2038284288</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="212993004"/>
-								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="978853241">
-							<reference key="NSNextResponder" ref="69290042"/>
-							<int key="NSvFlags">266</int>
-							<string key="NSFrame">{{20, 264}, {298, 19}}</string>
-							<reference key="NSSuperview" ref="69290042"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="479246832">
-								<int key="NSCellFlags">-1804599231</int>
-								<int key="NSCellFlags2">272761856</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="978853241"/>
-								<bool key="NSDrawsBackground">YES</bool>
-								<reference key="NSBackgroundColor" ref="138233214"/>
-								<reference key="NSTextColor" ref="378140636"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSPopUpButton" id="167356719">
-							<reference key="NSNextResponder" ref="69290042"/>
-							<int key="NSvFlags">266</int>
-							<string key="NSFrame">{{128, 193}, {193, 22}}</string>
-							<reference key="NSSuperview" ref="69290042"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSPopUpButtonCell" key="NSCell" id="17688962">
-								<int key="NSCellFlags">-2076180416</int>
-								<int key="NSCellFlags2">133120</int>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="167356719"/>
-								<int key="NSButtonFlags">109199360</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="995413175"/>
-								<string key="NSAlternateContents"/>
-								<object class="NSMutableString" key="NSKeyEquivalent">
-									<characters key="NS.bytes"/>
-								</object>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-								<object class="NSMenuItem" key="NSMenuItem" id="12791251">
-									<reference key="NSMenu" ref="521597821"/>
-									<string key="NSTitle">Item1</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<int key="NSState">1</int>
-									<reference key="NSOnImage" ref="447995298"/>
-									<reference key="NSMixedImage" ref="760317610"/>
-									<string key="NSAction">_popUpItemAction:</string>
-									<reference key="NSTarget" ref="17688962"/>
-								</object>
-								<bool key="NSMenuItemRespectAlignment">YES</bool>
-								<object class="NSMenu" key="NSMenu" id="521597821">
-									<object class="NSMutableString" key="NSTitle">
-										<characters key="NS.bytes">OtherViews</characters>
-									</object>
-									<object class="NSMutableArray" key="NSMenuItems">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<reference ref="12791251"/>
-										<object class="NSMenuItem" id="802910491">
-											<reference key="NSMenu" ref="521597821"/>
-											<string key="NSTitle">Item2</string>
-											<string key="NSKeyEquiv"/>
-											<int key="NSKeyEquivModMask">1048576</int>
-											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="447995298"/>
-											<reference key="NSMixedImage" ref="760317610"/>
-											<string key="NSAction">_popUpItemAction:</string>
-											<reference key="NSTarget" ref="17688962"/>
-										</object>
-										<object class="NSMenuItem" id="962314470">
-											<reference key="NSMenu" ref="521597821"/>
-											<string key="NSTitle">Item3</string>
-											<string key="NSKeyEquiv"/>
-											<int key="NSKeyEquivModMask">1048576</int>
-											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="447995298"/>
-											<reference key="NSMixedImage" ref="760317610"/>
-											<string key="NSAction">_popUpItemAction:</string>
-											<reference key="NSTarget" ref="17688962"/>
-										</object>
-									</object>
-								</object>
-								<int key="NSPreferredEdge">3</int>
-								<bool key="NSUsesItemFromMenu">YES</bool>
-								<bool key="NSAltersState">YES</bool>
-								<int key="NSArrowPosition">1</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="343391844">
-							<reference key="NSNextResponder" ref="69290042"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{17, 286}, {114, 17}}</string>
-							<reference key="NSSuperview" ref="69290042"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="658438349">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">272760832</int>
-								<string type="base64-UTF8" key="NSContents">UHJlc2V0IE5hbWU6Cg</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="343391844"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="340554114">
-							<reference key="NSNextResponder" ref="69290042"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{17, 217}, {91, 14}}</string>
-							<reference key="NSSuperview" ref="69290042"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="70981869">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">272760832</int>
-								<string key="NSContents">Picture Settings:</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="340554114"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="384547934">
-							<reference key="NSNextResponder" ref="69290042"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{17, 100}, {114, 14}}</string>
-							<reference key="NSSuperview" ref="69290042"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="207651610">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">272760832</int>
-								<string key="NSContents">Description:</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="384547934"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="511645357">
-							<reference key="NSNextResponder" ref="69290042"/>
-							<int key="NSvFlags">274</int>
-							<string key="NSFrame">{{20, 51}, {298, 41}}</string>
-							<reference key="NSSuperview" ref="69290042"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="855042909">
-								<int key="NSCellFlags">-1805647871</int>
-								<int key="NSCellFlags2">272760832</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="511645357"/>
-								<bool key="NSDrawsBackground">YES</bool>
-								<reference key="NSBackgroundColor" ref="138233214"/>
-								<reference key="NSTextColor" ref="378140636"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="31472093">
-							<reference key="NSNextResponder" ref="69290042"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{27, 195}, {99, 14}}</string>
-							<reference key="NSSuperview" ref="69290042"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="31665321">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">71434240</int>
-								<string key="NSContents">Use Picture Size:</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="31472093"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSButton" id="1024752086">
-							<reference key="NSNextResponder" ref="69290042"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{128, 142}, {24, 18}}</string>
-							<reference key="NSSuperview" ref="69290042"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="625635488">
-								<int key="NSCellFlags">-2080374784</int>
-								<int key="NSCellFlags2">131072</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="1024752086"/>
-								<int key="NSButtonFlags">1211912448</int>
-								<int key="NSButtonFlags2">2</int>
-								<reference key="NSNormalImage" ref="887198214"/>
-								<reference key="NSAlternateImage" ref="624832340"/>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSButton" id="786415813">
-							<reference key="NSNextResponder" ref="69290042"/>
-							<int key="NSvFlags">-2147483380</int>
-							<string key="NSFrame">{{17, 240}, {303, 18}}</string>
-							<reference key="NSSuperview" ref="69290042"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="977106207">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">131072</int>
-								<string key="NSContents">Preset Folder ( if checked disregard below )</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="786415813"/>
-								<int key="NSButtonFlags">1211912448</int>
-								<int key="NSButtonFlags2">2</int>
-								<reference key="NSNormalImage" ref="887198214"/>
-								<reference key="NSAlternateImage" ref="624832340"/>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSBox" id="5085381">
-							<reference key="NSNextResponder" ref="69290042"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{113, 220}, {205, 5}}</string>
-							<reference key="NSSuperview" ref="69290042"/>
-							<string key="NSOffsets">{0, 0}</string>
-							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Box</string>
-								<reference key="NSSupport" ref="273283760"/>
-								<reference key="NSBackgroundColor" ref="138233214"/>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-								</object>
-							</object>
-							<int key="NSBorderType">3</int>
-							<int key="NSBoxType">2</int>
-							<int key="NSTitlePosition">0</int>
-							<bool key="NSTransparent">NO</bool>
-						</object>
-						<object class="NSBox" id="988499754">
-							<reference key="NSNextResponder" ref="69290042"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{12, 120}, {298, 5}}</string>
-							<reference key="NSSuperview" ref="69290042"/>
-							<string key="NSOffsets">{0, 0}</string>
-							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Box</string>
-								<reference key="NSSupport" ref="273283760"/>
-								<reference key="NSBackgroundColor" ref="138233214"/>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-								</object>
-							</object>
-							<int key="NSBorderType">3</int>
-							<int key="NSBoxType">2</int>
-							<int key="NSTitlePosition">0</int>
-							<bool key="NSTransparent">NO</bool>
-						</object>
-						<object class="NSTextField" id="59653352">
-							<reference key="NSNextResponder" ref="69290042"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{17, 144}, {109, 15}}</string>
-							<reference key="NSSuperview" ref="69290042"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="155469085">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">71434240</int>
-								<string key="NSContents">Use Picture Filters:</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="59653352"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSBox" id="277759901">
-							<reference key="NSNextResponder" ref="69290042"/>
-							<int key="NSvFlags">12</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSView" id="956968044">
-									<reference key="NSNextResponder" ref="277759901"/>
-									<int key="NSvFlags">274</int>
-									<object class="NSMutableArray" key="NSSubviews">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSTextField" id="522324466">
-											<reference key="NSNextResponder" ref="956968044"/>
-											<int key="NSvFlags">266</int>
-											<string key="NSFrame">{{11, 10}, {52, 16}}</string>
-											<reference key="NSSuperview" ref="956968044"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="862361869">
-												<int key="NSCellFlags">-1804599231</int>
-												<int key="NSCellFlags2">71566336</int>
-												<string key="NSContents"/>
-												<reference key="NSSupport" ref="22"/>
-												<reference key="NSControlView" ref="522324466"/>
-												<bool key="NSDrawsBackground">YES</bool>
-												<reference key="NSBackgroundColor" ref="138233214"/>
-												<reference key="NSTextColor" ref="378140636"/>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-										<object class="NSTextField" id="358179065">
-											<reference key="NSNextResponder" ref="956968044"/>
-											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{61, 10}, {29, 15}}</string>
-											<reference key="NSSuperview" ref="956968044"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="14541127">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">138543104</int>
-												<string key="NSContents">X</string>
-												<reference key="NSSupport" ref="26"/>
-												<reference key="NSControlView" ref="358179065"/>
-												<reference key="NSBackgroundColor" ref="242973447"/>
-												<reference key="NSTextColor" ref="701609070"/>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-										<object class="NSTextField" id="525081109">
-											<reference key="NSNextResponder" ref="956968044"/>
-											<int key="NSvFlags">266</int>
-											<string key="NSFrame">{{90, 10}, {52, 16}}</string>
-											<reference key="NSSuperview" ref="956968044"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="945554305">
-												<int key="NSCellFlags">-1804599231</int>
-												<int key="NSCellFlags2">4457472</int>
-												<string key="NSContents"/>
-												<reference key="NSSupport" ref="22"/>
-												<reference key="NSControlView" ref="525081109"/>
-												<bool key="NSDrawsBackground">YES</bool>
-												<reference key="NSBackgroundColor" ref="138233214"/>
-												<reference key="NSTextColor" ref="378140636"/>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-									</object>
-									<string key="NSFrameSize">{155, 32}</string>
-									<reference key="NSSuperview" ref="277759901"/>
-								</object>
-							</object>
-							<string key="NSFrame">{{128, 163}, {155, 32}}</string>
-							<reference key="NSSuperview" ref="69290042"/>
-							<string key="NSOffsets">{0, 0}</string>
-							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Box</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSBackgroundColor" ref="138233214"/>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
-								</object>
-							</object>
-							<reference key="NSContentView" ref="956968044"/>
-							<int key="NSBorderType">0</int>
-							<int key="NSBoxType">0</int>
-							<int key="NSTitlePosition">0</int>
-							<bool key="NSTransparent">NO</bool>
-						</object>
-					</object>
-					<string key="NSFrameSize">{338, 318}</string>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
-				<string key="NSMinSize">{338, 254}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-			<object class="NSWindowTemplate" id="687953568">
-				<int key="NSWindowStyleMask">1</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{302, 989}, {392, 144}}</string>
-				<int key="NSWTFlags">1886912512</int>
-				<string key="NSWindowTitle">SourceTitlePanel</string>
-				<object class="NSMutableString" key="NSWindowClass">
-					<characters key="NS.bytes">NSPanel</characters>
-				</object>
-				<object class="NSMutableString" key="NSViewClass">
-					<characters key="NS.bytes">View</characters>
-				</object>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<string key="NSWindowContentMinSize">{213, 107}</string>
-				<object class="NSView" key="NSWindowView" id="867624722">
-					<nil key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSTextField" id="133861013">
-							<reference key="NSNextResponder" ref="867624722"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{96, 45}, {279, 38}}</string>
-							<reference key="NSSuperview" ref="867624722"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="874724779">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">272629760</int>
-								<string key="NSContents">Source Path Here</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="133861013"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="293908248">
-							<reference key="NSNextResponder" ref="867624722"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{155, 106}, {26, 14}}</string>
-							<reference key="NSSuperview" ref="867624722"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="290236859">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">272629760</int>
-								<string key="NSContents">for</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="293908248"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="535532677">
-							<reference key="NSNextResponder" ref="867624722"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{17, 106}, {104, 15}}</string>
-							<reference key="NSSuperview" ref="867624722"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="1026393301">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">71303168</int>
-								<string key="NSContents">Scan title number</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="535532677"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="290568055">
-							<reference key="NSNextResponder" ref="867624722"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{126, 105}, {24, 19}}</string>
-							<reference key="NSSuperview" ref="867624722"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="412266408">
-								<int key="NSCellFlags">-1804599231</int>
-								<int key="NSCellFlags2">138544128</int>
-								<string key="NSContents">0</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="290568055"/>
-								<bool key="NSDrawsBackground">YES</bool>
-								<reference key="NSBackgroundColor" ref="138233214"/>
-								<reference key="NSTextColor" ref="378140636"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSButton" id="35126402">
-							<reference key="NSNextResponder" ref="867624722"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{15, 13}, {80, 28}}</string>
-							<reference key="NSSuperview" ref="867624722"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="935162329">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">134348800</int>
-								<string key="NSContents">Cancel</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="35126402"/>
-								<int key="NSButtonFlags">-2038284288</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="995413175"/>
-								<string key="NSAlternateContents"/>
-								<object class="NSMutableString" key="NSKeyEquivalent">
-									<characters key="NS.bytes"/>
-								</object>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSButton" id="1029080172">
-							<reference key="NSNextResponder" ref="867624722"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{290, 13}, {87, 28}}</string>
-							<reference key="NSSuperview" ref="867624722"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="1020926636">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">134348800</int>
-								<string key="NSContents">Open Title</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="1029080172"/>
-								<int key="NSButtonFlags">-2038284288</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="995413175"/>
-								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="1010749064">
-							<reference key="NSNextResponder" ref="867624722"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{17, 83}, {455, 19}}</string>
-							<reference key="NSSuperview" ref="867624722"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="938406174">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">4194304</int>
-								<string key="NSContents">Note: (entering 0 or leaving blank will result in a full source scan)</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="1010749064"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="610976437">
-							<reference key="NSNextResponder" ref="867624722"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{17, 69}, {77, 14}}</string>
-							<reference key="NSSuperview" ref="867624722"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="802225466">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">272629760</int>
-								<string key="NSContents">Source Path:</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="610976437"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSTextField" id="655257851">
-							<reference key="NSNextResponder" ref="867624722"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{177, 106}, {198, 14}}</string>
-							<reference key="NSSuperview" ref="867624722"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="19595360">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">272629760</int>
-								<string key="NSContents">Small System Font Text</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="655257851"/>
-								<reference key="NSBackgroundColor" ref="242973447"/>
-								<reference key="NSTextColor" ref="701609070"/>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-					</object>
-					<string key="NSFrameSize">{392, 144}</string>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
-				<string key="NSMinSize">{213, 129}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-			<object class="NSCustomObject" id="2258723">
-				<string key="NSClassName">HBController</string>
-			</object>
-			<object class="NSCustomObject" id="159095366">
-				<string key="NSClassName">SUUpdater</string>
-			</object>
-			<object class="NSCustomObject" id="681233637">
-				<string key="NSClassName">HBAudioController</string>
-			</object>
-			<object class="NSArrayController" id="551130964">
-				<object class="NSMutableArray" key="NSDeclaredKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>keyAudioTrackName</string>
-				</object>
-				<bool key="NSEditable">YES</bool>
-				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
-				<bool key="NSAvoidsEmptySelection">YES</bool>
-				<bool key="NSPreservesSelection">YES</bool>
-				<bool key="NSSelectsInsertedObjects">YES</bool>
-				<bool key="NSFilterRestrictsInsertion">YES</bool>
-				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
-			</object>
-			<object class="NSArrayController" id="141316080">
-				<object class="NSMutableArray" key="NSDeclaredKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>tracks</string>
-					<string>tracks.keyAudioTrackName</string>
-					<string>track</string>
-					<string>enabled</string>
-					<string>mixdownEnabled</string>
-					<string>drc</string>
-					<string>codecs</string>
-					<string>codecs.keyAudioCodecName</string>
-					<string>codec</string>
-					<string>mixdowns</string>
-					<string>mixdowns.keyAudioMixdownName</string>
-					<string>mixdown</string>
-					<string>sampleRates</string>
-					<string>sampleRates.keyAudioSampleRateName</string>
-					<string>sampleRate</string>
-					<string>bitRates</string>
-					<string>bitRates.keyAudioBitrateName</string>
-					<string>bitRate</string>
-					<string>AC3Enabled</string>
-					<string>gain</string>
-					<string>PassThruEnabled</string>
-					<string>PassThruDisabled</string>
-					<string>bitrateEnabled</string>
-				</object>
-				<bool key="NSEditable">YES</bool>
-				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
-				<bool key="NSSelectsInsertedObjects">YES</bool>
-				<bool key="NSFilterRestrictsInsertion">YES</bool>
-				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
-			</object>
-			<object class="NSUserDefaultsController" id="869523098">
-				<bool key="NSSharedInstance">YES</bool>
-			</object>
-			<object class="NSView" id="412106376">
-				<nil key="NSNextResponder"/>
-				<int key="NSvFlags">256</int>
-				<string key="NSFrameSize">{125, 1}</string>
-			</object>
-			<object class="NSView" id="586026952">
-				<nil key="NSNextResponder"/>
-				<int key="NSvFlags">256</int>
-				<string key="NSFrameSize">{125, 1}</string>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">terminate:</string>
-						<reference key="source" ref="1046316778"/>
-						<reference key="destination" ref="680265479"/>
-					</object>
-					<int key="connectionID">139</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1046316778"/>
-						<reference key="destination" ref="2258723"/>
-					</object>
-					<int key="connectionID">247</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hide:</string>
-						<reference key="source" ref="1046316778"/>
-						<reference key="destination" ref="981110965"/>
-					</object>
-					<int key="connectionID">972</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hideOtherApplications:</string>
-						<reference key="source" ref="1046316778"/>
-						<reference key="destination" ref="360013803"/>
-					</object>
-					<int key="connectionID">975</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">arrangeInFront:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="998796929"/>
-					</object>
-					<int key="connectionID">1194</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performMiniaturize:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="372804054"/>
-					</object>
-					<int key="connectionID">1195</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performFindPanelAction:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="793630765"/>
-					</object>
-					<int key="connectionID">1823</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">startSpeaking:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="362189914"/>
-					</object>
-					<int key="connectionID">1824</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleContinuousSpellChecking:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="6854324"/>
-					</object>
-					<int key="connectionID">1825</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">undo:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="587511664"/>
-					</object>
-					<int key="connectionID">1826</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">stopSpeaking:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="496049927"/>
-					</object>
-					<int key="connectionID">1827</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performFindPanelAction:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="49300518"/>
-					</object>
-					<int key="connectionID">1828</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">redo:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="786616983"/>
-					</object>
-					<int key="connectionID">1829</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performFindPanelAction:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="1069789051"/>
-					</object>
-					<int key="connectionID">1830</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">cut:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="84425921"/>
-					</object>
-					<int key="connectionID">1831</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">paste:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="741953332"/>
-					</object>
-					<int key="connectionID">1832</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">pasteAsPlainText:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="1006794292"/>
-					</object>
-					<int key="connectionID">1833</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">selectAll:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="695401358"/>
-					</object>
-					<int key="connectionID">1834</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performFindPanelAction:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="323467360"/>
-					</object>
-					<int key="connectionID">1835</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">copy:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="979367247"/>
-					</object>
-					<int key="connectionID">1836</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">checkSpelling:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="301925013"/>
-					</object>
-					<int key="connectionID">1837</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">centerSelectionInVisibleArea:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="541561571"/>
-					</object>
-					<int key="connectionID">1838</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showGuessPanel:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="981624971"/>
-					</object>
-					<int key="connectionID">1839</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">delete:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="494582096"/>
-					</object>
-					<int key="connectionID">1840</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performClose:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="542310438"/>
-					</object>
-					<int key="connectionID">2509</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">unhideAllApplications:</string>
-						<reference key="source" ref="952684036"/>
-						<reference key="destination" ref="750596130"/>
-					</object>
-					<int key="connectionID">5281</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="192660081"/>
-						<reference key="destination" ref="2258723"/>
-					</object>
-					<int key="connectionID">433</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fWindow</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="192660081"/>
-					</object>
-					<int key="connectionID">350</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fStatusField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="794651271"/>
-					</object>
-					<int key="connectionID">1238</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fRipIndicator</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="222334056"/>
-					</object>
-					<int key="connectionID">1374</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">openHomepage:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="265609219"/>
-					</object>
-					<int key="connectionID">1434</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">openForums:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="757350989"/>
-					</object>
-					<int key="connectionID">1435</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">titlePopUpChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="766125203"/>
-					</object>
-					<int key="connectionID">1567</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSrcChapterStartPopUp</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="971754180"/>
-					</object>
-					<int key="connectionID">1568</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSrcChapterEndPopUp</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="453345136"/>
-					</object>
-					<int key="connectionID">1569</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDstBrowseButton</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="210289606"/>
-					</object>
-					<int key="connectionID">1578</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">browseFile:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="210289606"/>
-					</object>
-					<int key="connectionID">1579</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDstFormatField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="87961628"/>
-					</object>
-					<int key="connectionID">1583</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDstFormatPopUp</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="732193996"/>
-					</object>
-					<int key="connectionID">1584</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDstFile2Field</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="186223550"/>
-					</object>
-					<int key="connectionID">1585</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSrcDuration1Field</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="713493964"/>
-					</object>
-					<int key="connectionID">1589</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSrcDuration2Field</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="955053416"/>
-					</object>
-					<int key="connectionID">1590</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSrcDVD2Field</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="854767306"/>
-					</object>
-					<int key="connectionID">1591</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSrcTitleField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="806469067"/>
-					</object>
-					<int key="connectionID">1592</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSrcTitlePopUp</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="766125203"/>
-					</object>
-					<int key="connectionID">1593</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDstFile1Field</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="1023408378"/>
-					</object>
-					<int key="connectionID">1596</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fVidBitrateField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="783405221"/>
-					</object>
-					<int key="connectionID">1599</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fVidEncoderPopUp</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="12330413"/>
-					</object>
-					<int key="connectionID">1602</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fVidQualityField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="521019277"/>
-					</object>
-					<int key="connectionID">1604</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fVidQualitySlider</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="239657287"/>
-					</object>
-					<int key="connectionID">1606</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fVidRateField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="463960465"/>
-					</object>
-					<int key="connectionID">1607</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fVidRatePopUp</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="222980245"/>
-					</object>
-					<int key="connectionID">1608</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fVidTwoPassCheck</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="1000247853"/>
-					</object>
-					<int key="connectionID">1611</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">formatPopUpChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="732193996"/>
-					</object>
-					<int key="connectionID">1614</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">chapterPopUpChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="971754180"/>
-					</object>
-					<int key="connectionID">1615</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">chapterPopUpChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="453345136"/>
-					</object>
-					<int key="connectionID">1616</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">qualitySliderChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="239657287"/>
-					</object>
-					<int key="connectionID">1617</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fAddPresetPanel</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="888992113"/>
-					</object>
-					<int key="connectionID">1869</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPresetNewName</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="978853241"/>
-					</object>
-					<int key="connectionID">1875</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">closeAddPresetPanel:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="586136427"/>
-					</object>
-					<int key="connectionID">1878</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPresetSelectedDisplay</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="574185541"/>
-					</object>
-					<int key="connectionID">1883</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPresetDrawer</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="972647787"/>
-					</object>
-					<int key="connectionID">1889</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addUserPreset:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="636581183"/>
-					</object>
-					<int key="connectionID">1907</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addFactoryPresets:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="814047217"/>
-					</object>
-					<int key="connectionID">1952</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">deleteFactoryPresets:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="153657129"/>
-					</object>
-					<int key="connectionID">1953</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showAddPresetPanel:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="180231"/>
-					</object>
-					<int key="connectionID">1956</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">openUserGuide:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="911007118"/>
-					</object>
-					<int key="connectionID">1986</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fCreateChapterMarkers</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="262106913"/>
-					</object>
-					<int key="connectionID">2004</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fChapterTable</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="595654978"/>
-					</object>
-					<int key="connectionID">2005</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fQueueStatus</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="1007421233"/>
-					</object>
-					<int key="connectionID">2007</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPresetNewPicSettingsPopUp</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="167356719"/>
-					</object>
-					<int key="connectionID">2013</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showDebugOutputPanel:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="302989927"/>
-					</object>
-					<int key="connectionID">2296</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fVidTurboPassCheck</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="447003158"/>
-					</object>
-					<int key="connectionID">2362</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">twoPassCheckboxChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="1000247853"/>
-					</object>
-					<int key="connectionID">2363</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">customSettingUsed:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="553453876"/>
-					</object>
-					<int key="connectionID">2366</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">customSettingUsed:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="447003158"/>
-					</object>
-					<int key="connectionID">2367</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">openMainWindow:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="545622547"/>
-					</object>
-					<int key="connectionID">2369</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">selectDefaultPreset:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="454042588"/>
-					</object>
-					<int key="connectionID">2422</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showQueueWindow:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="87484946"/>
-					</object>
-					<int key="connectionID">2446</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addToQueue:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="853234446"/>
-					</object>
-					<int key="connectionID">2447</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">Rip:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="17111946"/>
-					</object>
-					<int key="connectionID">2448</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">videoFrameRateChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="222980245"/>
-					</object>
-					<int key="connectionID">2462</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showPicturePanel:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="849279674"/>
-					</object>
-					<int key="connectionID">2493</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">Pause:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="101536867"/>
-					</object>
-					<int key="connectionID">2496</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fAdvancedView</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="231506045"/>
-					</object>
-					<int key="connectionID">2516</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showPreferencesWindow:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="782330144"/>
-					</object>
-					<int key="connectionID">2517</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPresetNewDesc</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="511645357"/>
-					</object>
-					<int key="connectionID">2674</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">customSettingUsed:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="783405221"/>
-					</object>
-					<int key="connectionID">2691</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fOpenSourceTitleMMenu</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="865776798"/>
-					</object>
-					<int key="connectionID">2700</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fScanSrcTitlePathField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="133861013"/>
-					</object>
-					<int key="connectionID">2709</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fScanSrcTitleNumField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="290568055"/>
-					</object>
-					<int key="connectionID">2710</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fScanSrcTitleCancelButton</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="35126402"/>
-					</object>
-					<int key="connectionID">2711</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fScanSrcTitleOpenButton</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="1029080172"/>
-					</object>
-					<int key="connectionID">2712</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fScanSrcTitlePanel</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="687953568"/>
-					</object>
-					<int key="connectionID">2713</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">closeSourceTitleScanPanel:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="35126402"/>
-					</object>
-					<int key="connectionID">2714</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">closeSourceTitleScanPanel:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="1029080172"/>
-					</object>
-					<int key="connectionID">2715</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">browseSources:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="865776798"/>
-					</object>
-					<int key="connectionID">2717</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">browseSources:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="595836714"/>
-					</object>
-					<int key="connectionID">2718</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSrcDsplyNameTitleScan</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="655257851"/>
-					</object>
-					<int key="connectionID">2721</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPresetNewPicFiltersCheck</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="1024752086"/>
-					</object>
-					<int key="connectionID">2841</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fScanIndicator</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="519699512"/>
-					</object>
-					<int key="connectionID">3204</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPresetsOutlineView</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="807972370"/>
-					</object>
-					<int key="connectionID">4187</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">selectPreset:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="807972370"/>
-					</object>
-					<int key="connectionID">4312</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPresetsDelete</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="241719587"/>
-					</object>
-					<int key="connectionID">4319</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">deletePreset:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="241719587"/>
-					</object>
-					<int key="connectionID">4321</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPresetsAdd</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="699919504"/>
-					</object>
-					<int key="connectionID">4324</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showAddPresetPanel:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="699919504"/>
-					</object>
-					<int key="connectionID">4325</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDstMp4LargeFileCheck</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="553453876"/>
-					</object>
-					<int key="connectionID">4578</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDstMp4HttpOptFileCheck</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="581806074"/>
-					</object>
-					<int key="connectionID">4581</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDstMp4iPodFileCheck</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="921877174"/>
-					</object>
-					<int key="connectionID">4969</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">customSettingUsed:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="921877174"/>
-					</object>
-					<int key="connectionID">4970</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">customSettingUsed:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="581806074"/>
-					</object>
-					<int key="connectionID">4971</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">videoEncoderPopUpChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="12330413"/>
-					</object>
-					<int key="connectionID">5075</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">setDefaultPreset:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="950937431"/>
-					</object>
-					<int key="connectionID">5138</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addFactoryPresets:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="583192244"/>
-					</object>
-					<int key="connectionID">5139</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">autoSetM4vExtension:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="719511430"/>
-					</object>
-					<int key="connectionID">5152</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPresetNewFolderCheck</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="786415813"/>
-					</object>
-					<int key="connectionID">5155</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fVidEncoderField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="1064150725"/>
-					</object>
-					<int key="connectionID">5156</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showPreviewWindow:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="157409278"/>
-					</object>
-					<int key="connectionID">5158</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureSettingsField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="987137669"/>
-					</object>
-					<int key="connectionID">5169</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureFiltersField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="503933842"/>
-					</object>
-					<int key="connectionID">5173</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fVidQualityRFField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="690304958"/>
-					</object>
-					<int key="connectionID">5176</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fVidQualityRFLabel</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="323705695"/>
-					</object>
-					<int key="connectionID">5179</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSrcAngleLabel</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="303369850"/>
-					</object>
-					<int key="connectionID">5186</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">browseExportPresetFile:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="734454745"/>
-					</object>
-					<int key="connectionID">5191</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">browseImportPresetFile:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="685593004"/>
-					</object>
-					<int key="connectionID">5193</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSubtitlesTable</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="587237088"/>
-					</object>
-					<int key="connectionID">5214</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showAboutPanel:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="218095211"/>
-					</object>
-					<int key="connectionID">5245</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fBrowseSrtFileButton</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="377401502"/>
-					</object>
-					<int key="connectionID">5248</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">browseImportSrtFile:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="377401502"/>
-					</object>
-					<int key="connectionID">5249</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSrcTimeStartEncodingField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="104002862"/>
-					</object>
-					<int key="connectionID">5507</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSrcTimeEndEncodingField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="19055068"/>
-					</object>
-					<int key="connectionID">5508</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">encodeStartStopPopUpChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="482831442"/>
-					</object>
-					<int key="connectionID">5520</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSrcFrameStartEncodingField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="398989741"/>
-					</object>
-					<int key="connectionID">5525</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSrcFrameEndEncodingField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="164276139"/>
-					</object>
-					<int key="connectionID">5526</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fEncodeStartStopPopUp</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="482831442"/>
-					</object>
-					<int key="connectionID">5527</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">startEndSecValueChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="104002862"/>
-					</object>
-					<int key="connectionID">5528</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">startEndSecValueChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="19055068"/>
-					</object>
-					<int key="connectionID">5529</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">startEndFrameValueChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="398989741"/>
-					</object>
-					<int key="connectionID">5530</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">startEndFrameValueChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="164276139"/>
-					</object>
-					<int key="connectionID">5531</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSrcChapterToField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="978025076"/>
-					</object>
-					<int key="connectionID">5532</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSrcAnglePopUp</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="460320725"/>
-					</object>
-					<int key="connectionID">5533</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">browseForChapterFile:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="959722284"/>
-					</object>
-					<int key="connectionID">5538</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">browseForChapterFileSave:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="931485910"/>
-					</object>
-					<int key="connectionID">5539</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fLoadChaptersButton</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="959722284"/>
-					</object>
-					<int key="connectionID">5540</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSaveChaptersButton</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="931485910"/>
-					</object>
-					<int key="connectionID">5541</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fChapterTableNameColumn</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="932392163"/>
-					</object>
-					<int key="connectionID">5544</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPresetNewPicWidth</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="522324466"/>
-					</object>
-					<int key="connectionID">5668</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPresetNewPicHeight</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="525081109"/>
-					</object>
-					<int key="connectionID">5669</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPresetNewPicWidthHeightBox</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="277759901"/>
-					</object>
-					<int key="connectionID">5671</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addPresetPicDropdownChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="167356719"/>
-					</object>
-					<int key="connectionID">5672</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fAudioDelegate</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="681233637"/>
-					</object>
-					<int key="connectionID">5675</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addAllAudioTracks:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="883603583"/>
-					</object>
-					<int key="connectionID">5709</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fVidQualityMatrix</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="1036976683"/>
-					</object>
-					<int key="connectionID">5812</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fVidBitrateCell</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="878990764"/>
-					</object>
-					<int key="connectionID">5813</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fVidConstantCell</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="613962178"/>
-					</object>
-					<int key="connectionID">5814</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">videoMatrixChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="613962178"/>
-					</object>
-					<int key="connectionID">5815</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">videoMatrixChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="878990764"/>
-					</object>
-					<int key="connectionID">5816</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">videoMatrixChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="329026312"/>
-					</object>
-					<int key="connectionID">5824</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">videoMatrixChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="995154792"/>
-					</object>
-					<int key="connectionID">5825</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fFramerateMatrix</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="888819828"/>
-					</object>
-					<int key="connectionID">5826</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fFramerateVfrPfrCell</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="329026312"/>
-					</object>
-					<int key="connectionID">5827</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fFramerateCfrCell</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="995154792"/>
-					</object>
-					<int key="connectionID">5828</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addAllTitlesToQueue:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="232757118"/>
-					</object>
-					<int key="connectionID">5899</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fAudioAllowMP3PassCheck</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="162512199"/>
-					</object>
-					<int key="connectionID">5925</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fAudioAllowAACPassCheck</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="354328979"/>
-					</object>
-					<int key="connectionID">5926</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fAudioAllowAC3PassCheck</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="453548414"/>
-					</object>
-					<int key="connectionID">5927</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fAudioAllowDTSPassCheck</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="485809563"/>
-					</object>
-					<int key="connectionID">5928</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fAudioAllowDTSHDPassCheck</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="1024961404"/>
-					</object>
-					<int key="connectionID">5929</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fAudioFallbackPopUp</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="586044455"/>
-					</object>
-					<int key="connectionID">5930</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fAudioAutoPassthruBox</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="334448622"/>
-					</object>
-					<int key="connectionID">5931</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264PresetsBox</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="954159030"/>
-					</object>
-					<int key="connectionID">5973</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264TunePopUp</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="610425389"/>
-					</object>
-					<int key="connectionID">5974</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264ProfilePopUp</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="112458239"/>
-					</object>
-					<int key="connectionID">5975</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264LevelPopUp</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="144142005"/>
-					</object>
-					<int key="connectionID">5976</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264FastDecodeCheck</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="884471415"/>
-					</object>
-					<int key="connectionID">5977</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDisplayX264PresetsAdditonalOptionsTextField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="487526549"/>
-					</object>
-					<int key="connectionID">5979</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264PresetsSlider</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="480823072"/>
-					</object>
-					<int key="connectionID">5980</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264PresetSelectedTextField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="527737261"/>
-					</object>
-					<int key="connectionID">5983</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">x264PresetsSliderChanged:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="480823072"/>
-					</object>
-					<int key="connectionID">5984</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264PresetSliderLabel</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="139432403"/>
-					</object>
-					<int key="connectionID">5985</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264TunePopUpLabel</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="1031662534"/>
-					</object>
-					<int key="connectionID">5986</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264ProfilePopUpLabel</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="102651997"/>
-					</object>
-					<int key="connectionID">5987</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264LevelPopUpLabel</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="8023338"/>
-					</object>
-					<int key="connectionID">5988</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDisplayX264PresetsAdditonalOptionsLabel</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="796460997"/>
-					</object>
-					<int key="connectionID">5989</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fX264UseAdvancedOptionsCheck</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="902460295"/>
-					</object>
-					<int key="connectionID">5994</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">updateX264Widgets:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="902460295"/>
-					</object>
-					<int key="connectionID">5995</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDisplayX264PresetsUnparseTextField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="349581420"/>
-					</object>
-					<int key="connectionID">5998</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">x264PresetsChangedDisplayExpandedOptions:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="610425389"/>
-					</object>
-					<int key="connectionID">5999</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">x264PresetsChangedDisplayExpandedOptions:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="112458239"/>
-					</object>
-					<int key="connectionID">6000</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">x264PresetsChangedDisplayExpandedOptions:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="144142005"/>
-					</object>
-					<int key="connectionID">6001</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">x264PresetsChangedDisplayExpandedOptions:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="487526549"/>
-					</object>
-					<int key="connectionID">6002</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">x264PresetsChangedDisplayExpandedOptions:</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="884471415"/>
-					</object>
-					<int key="connectionID">6003</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fScanHorizontalLine</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="454206717"/>
-					</object>
-					<int key="connectionID">6004</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">parentWindow</string>
-						<reference key="source" ref="972647787"/>
-						<reference key="destination" ref="192660081"/>
-					</object>
-					<int key="connectionID">1842</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">contentView</string>
-						<reference key="source" ref="972647787"/>
-						<reference key="destination" ref="621751818"/>
-					</object>
-					<int key="connectionID">1844</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggle:</string>
-						<reference key="source" ref="972647787"/>
-						<reference key="destination" ref="854594899"/>
-					</object>
-					<int key="connectionID">1885</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">dataSource</string>
-						<reference key="source" ref="807972370"/>
-						<reference key="destination" ref="2258723"/>
-					</object>
-					<int key="connectionID">4188</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="807972370"/>
-						<reference key="destination" ref="2258723"/>
-					</object>
-					<int key="connectionID">4189</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">checkForUpdates:</string>
-						<reference key="source" ref="159095366"/>
-						<reference key="destination" ref="985983659"/>
-					</object>
-					<int key="connectionID">4966</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentArray: audioArray</string>
-						<reference key="source" ref="141316080"/>
-						<reference key="destination" ref="681233637"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="141316080"/>
-							<reference key="NSDestination" ref="681233637"/>
-							<string key="NSLabel">contentArray: audioArray</string>
-							<string key="NSBinding">contentArray</string>
-							<string key="NSKeyPath">audioArray</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5679</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: hasValidPresetSelected</string>
-						<reference key="source" ref="883603583"/>
-						<reference key="destination" ref="2258723"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="883603583"/>
-							<reference key="NSDestination" ref="2258723"/>
-							<string key="NSLabel">enabled: hasValidPresetSelected</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">hasValidPresetSelected</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5711</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.drc</string>
-						<reference key="source" ref="581296833"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="581296833"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">value: arrangedObjects.drc</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.drc</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSCreatesSortDescriptor</string>
-								<boolean value="NO" key="NS.object.0"/>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5791</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: arrangedObjects.AC3Enabled</string>
-						<reference key="source" ref="581296833"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="581296833"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">enabled: arrangedObjects.AC3Enabled</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">arrangedObjects.AC3Enabled</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5793</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.drc</string>
-						<reference key="source" ref="393032802"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="393032802"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">value: arrangedObjects.drc</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.drc</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSCreatesSortDescriptor</string>
-									<string>NSValidatesImmediately</string>
-								</object>
-								<object class="NSArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<boolean value="NO"/>
-									<boolean value="YES"/>
-								</object>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5790</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: arrangedObjects.AC3Enabled</string>
-						<reference key="source" ref="393032802"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="393032802"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">enabled: arrangedObjects.AC3Enabled</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">arrangedObjects.AC3Enabled</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5792</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">content: arrangedObjects.bitRates</string>
-						<reference key="source" ref="596723553"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector" id="526128549">
-							<reference key="NSSource" ref="596723553"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">content: arrangedObjects.bitRates</string>
-							<string key="NSBinding">content</string>
-							<string key="NSKeyPath">arrangedObjects.bitRates</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5766</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentValues: arrangedObjects.bitRates.keyAudioBitrateName</string>
-						<reference key="source" ref="596723553"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector" id="614736310">
-							<reference key="NSSource" ref="596723553"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">contentValues: arrangedObjects.bitRates.keyAudioBitrateName</string>
-							<string key="NSBinding">contentValues</string>
-							<string key="NSKeyPath">arrangedObjects.bitRates.keyAudioBitrateName</string>
-							<reference key="NSPreviousConnector" ref="526128549"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5768</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedObject: arrangedObjects.bitRate</string>
-						<reference key="source" ref="596723553"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="596723553"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">selectedObject: arrangedObjects.bitRate</string>
-							<string key="NSBinding">selectedObject</string>
-							<string key="NSKeyPath">arrangedObjects.bitRate</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSCreatesSortDescriptor</string>
-								<boolean value="NO" key="NS.object.0"/>
-							</object>
-							<reference key="NSPreviousConnector" ref="614736310"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5789</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: arrangedObjects.bitrateEnabled</string>
-						<reference key="source" ref="596723553"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="596723553"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">enabled: arrangedObjects.bitrateEnabled</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">arrangedObjects.bitrateEnabled</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5903</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">content: arrangedObjects.sampleRates</string>
-						<reference key="source" ref="1063255"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector" id="389021487">
-							<reference key="NSSource" ref="1063255"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">content: arrangedObjects.sampleRates</string>
-							<string key="NSBinding">content</string>
-							<string key="NSKeyPath">arrangedObjects.sampleRates</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5760</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentValues: arrangedObjects.sampleRates.keyAudioSampleRateName</string>
-						<reference key="source" ref="1063255"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector" id="1059867876">
-							<reference key="NSSource" ref="1063255"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">contentValues: arrangedObjects.sampleRates.keyAudioSampleRateName</string>
-							<string key="NSBinding">contentValues</string>
-							<string key="NSKeyPath">arrangedObjects.sampleRates.keyAudioSampleRateName</string>
-							<reference key="NSPreviousConnector" ref="389021487"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5762</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: arrangedObjects.mixdownEnabled</string>
-						<reference key="source" ref="1063255"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="1063255"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">enabled: arrangedObjects.mixdownEnabled</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">arrangedObjects.mixdownEnabled</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5778</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedObject: arrangedObjects.sampleRate</string>
-						<reference key="source" ref="1063255"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="1063255"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">selectedObject: arrangedObjects.sampleRate</string>
-							<string key="NSBinding">selectedObject</string>
-							<string key="NSKeyPath">arrangedObjects.sampleRate</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSCreatesSortDescriptor</string>
-								<boolean value="NO" key="NS.object.0"/>
-							</object>
-							<reference key="NSPreviousConnector" ref="1059867876"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5788</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">content: arrangedObjects.mixdowns</string>
-						<reference key="source" ref="590927656"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector" id="993421587">
-							<reference key="NSSource" ref="590927656"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">content: arrangedObjects.mixdowns</string>
-							<string key="NSBinding">content</string>
-							<string key="NSKeyPath">arrangedObjects.mixdowns</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5754</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentValues: arrangedObjects.mixdowns.keyAudioMixdownName</string>
-						<reference key="source" ref="590927656"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector" id="688037869">
-							<reference key="NSSource" ref="590927656"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">contentValues: arrangedObjects.mixdowns.keyAudioMixdownName</string>
-							<string key="NSBinding">contentValues</string>
-							<string key="NSKeyPath">arrangedObjects.mixdowns.keyAudioMixdownName</string>
-							<reference key="NSPreviousConnector" ref="993421587"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5756</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedObject: arrangedObjects.mixdown</string>
-						<reference key="source" ref="590927656"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="590927656"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">selectedObject: arrangedObjects.mixdown</string>
-							<string key="NSBinding">selectedObject</string>
-							<string key="NSKeyPath">arrangedObjects.mixdown</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSCreatesSortDescriptor</string>
-								<boolean value="NO" key="NS.object.0"/>
-							</object>
-							<reference key="NSPreviousConnector" ref="688037869"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5787</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: arrangedObjects.mixdownEnabled</string>
-						<reference key="source" ref="590927656"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="590927656"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">enabled: arrangedObjects.mixdownEnabled</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">arrangedObjects.mixdownEnabled</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5901</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">content: arrangedObjects.codecs</string>
-						<reference key="source" ref="200958136"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector" id="561471240">
-							<reference key="NSSource" ref="200958136"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">content: arrangedObjects.codecs</string>
-							<string key="NSBinding">content</string>
-							<string key="NSKeyPath">arrangedObjects.codecs</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5747</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentValues: arrangedObjects.codecs.keyAudioCodecName</string>
-						<reference key="source" ref="200958136"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector" id="357206672">
-							<reference key="NSSource" ref="200958136"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">contentValues: arrangedObjects.codecs.keyAudioCodecName</string>
-							<string key="NSBinding">contentValues</string>
-							<string key="NSKeyPath">arrangedObjects.codecs.keyAudioCodecName</string>
-							<reference key="NSPreviousConnector" ref="561471240"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5749</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: arrangedObjects.enabled</string>
-						<reference key="source" ref="200958136"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="200958136"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">enabled: arrangedObjects.enabled</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">arrangedObjects.enabled</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5774</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedObject: arrangedObjects.codec</string>
-						<reference key="source" ref="200958136"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="200958136"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">selectedObject: arrangedObjects.codec</string>
-							<string key="NSBinding">selectedObject</string>
-							<string key="NSKeyPath">arrangedObjects.codec</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSCreatesSortDescriptor</string>
-								<boolean value="NO" key="NS.object.0"/>
-							</object>
-							<reference key="NSPreviousConnector" ref="357206672"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5786</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">content: arrangedObjects</string>
-						<reference key="source" ref="33212493"/>
-						<reference key="destination" ref="551130964"/>
-						<object class="NSNibBindingConnector" key="connector" id="788392549">
-							<reference key="NSSource" ref="33212493"/>
-							<reference key="NSDestination" ref="551130964"/>
-							<string key="NSLabel">content: arrangedObjects</string>
-							<string key="NSBinding">content</string>
-							<string key="NSKeyPath">arrangedObjects</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5886</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentValues: arrangedObjects.keyAudioTrackName</string>
-						<reference key="source" ref="33212493"/>
-						<reference key="destination" ref="551130964"/>
-						<object class="NSNibBindingConnector" key="connector" id="694612681">
-							<reference key="NSSource" ref="33212493"/>
-							<reference key="NSDestination" ref="551130964"/>
-							<string key="NSLabel">contentValues: arrangedObjects.keyAudioTrackName</string>
-							<string key="NSBinding">contentValues</string>
-							<string key="NSKeyPath">arrangedObjects.keyAudioTrackName</string>
-							<reference key="NSPreviousConnector" ref="788392549"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5891</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedObject: arrangedObjects.track</string>
-						<reference key="source" ref="33212493"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="33212493"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">selectedObject: arrangedObjects.track</string>
-							<string key="NSBinding">selectedObject</string>
-							<string key="NSKeyPath">arrangedObjects.track</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSCreatesSortDescriptor</string>
-								<boolean value="NO" key="NS.object.0"/>
-							</object>
-							<reference key="NSPreviousConnector" ref="694612681"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5892</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.gain</string>
-						<reference key="source" ref="7762140"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="7762140"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">value: arrangedObjects.gain</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.gain</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSCreatesSortDescriptor</string>
-									<string>NSValidatesImmediately</string>
-								</object>
-								<object class="NSArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<boolean value="NO"/>
-									<boolean value="YES"/>
-								</object>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5877</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: arrangedObjects.PassThruDisabled</string>
-						<reference key="source" ref="7762140"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="7762140"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">enabled: arrangedObjects.PassThruDisabled</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">arrangedObjects.PassThruDisabled</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5878</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.gain</string>
-						<reference key="source" ref="432964705"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="432964705"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">value: arrangedObjects.gain</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.gain</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5875</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: arrangedObjects.PassThruDisabled</string>
-						<reference key="source" ref="432964705"/>
-						<reference key="destination" ref="141316080"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="432964705"/>
-							<reference key="NSDestination" ref="141316080"/>
-							<string key="NSLabel">enabled: arrangedObjects.PassThruDisabled</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">arrangedObjects.PassThruDisabled</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSRaisesForNotApplicableKeys</string>
-								<boolean value="NO" key="NS.object.0"/>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5876</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentArray: masterTrackArray</string>
-						<reference key="source" ref="551130964"/>
-						<reference key="destination" ref="681233637"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="551130964"/>
-							<reference key="NSDestination" ref="681233637"/>
-							<string key="NSLabel">contentArray: masterTrackArray</string>
-							<string key="NSBinding">contentArray</string>
-							<string key="NSKeyPath">masterTrackArray</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5882</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
-						<reference key="children" ref="411085004"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1046316778"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="952684036"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="300550588"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">21</int>
-						<reference key="object" ref="192660081"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="168918359"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">MainWindow</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="168918359"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="794651271"/>
-							<reference ref="222334056"/>
-							<reference ref="586321835"/>
-							<reference ref="854767306"/>
-							<reference ref="87961628"/>
-							<reference ref="732193996"/>
-							<reference ref="35106907"/>
-							<reference ref="151388399"/>
-							<reference ref="574185541"/>
-							<reference ref="519699512"/>
-							<reference ref="454206717"/>
-							<reference ref="581806074"/>
-							<reference ref="553453876"/>
-							<reference ref="921877174"/>
-							<reference ref="806469067"/>
-							<reference ref="766125203"/>
-							<reference ref="303369850"/>
-							<reference ref="460320725"/>
-							<reference ref="453345136"/>
-							<reference ref="978025076"/>
-							<reference ref="971754180"/>
-							<reference ref="482831442"/>
-							<reference ref="104002862"/>
-							<reference ref="19055068"/>
-							<reference ref="713493964"/>
-							<reference ref="955053416"/>
-							<reference ref="398989741"/>
-							<reference ref="164276139"/>
-							<reference ref="1023408378"/>
-							<reference ref="186223550"/>
-							<reference ref="138115732"/>
-							<reference ref="10346684"/>
-							<reference ref="210289606"/>
-							<reference ref="1007421233"/>
-							<reference ref="712502892"/>
-						</object>
-						<reference key="parent" ref="192660081"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1123</int>
-						<reference key="object" ref="794651271"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="10523918"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1373</int>
-						<reference key="object" ref="222334056"/>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1474</int>
-						<reference key="object" ref="712502892"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="157300012"/>
-							<reference ref="107038816"/>
-							<reference ref="744678564"/>
-							<reference ref="799016137"/>
-							<reference ref="291470012"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1475</int>
-						<reference key="object" ref="157300012"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="738554558"/>
-						</object>
-						<reference key="parent" ref="712502892"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1476</int>
-						<reference key="object" ref="738554558"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="577274772"/>
-						</object>
-						<reference key="parent" ref="157300012"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1477</int>
-						<reference key="object" ref="107038816"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1053078401"/>
-						</object>
-						<reference key="parent" ref="712502892"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1478</int>
-						<reference key="object" ref="1053078401"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="987137669"/>
-							<reference ref="503933842"/>
-							<reference ref="783405221"/>
-							<reference ref="690304958"/>
-							<reference ref="323705695"/>
-							<reference ref="1000247853"/>
-							<reference ref="447003158"/>
-							<reference ref="239657287"/>
-							<reference ref="12330413"/>
-							<reference ref="463960465"/>
-							<reference ref="1036976683"/>
-							<reference ref="521019277"/>
-							<reference ref="1064150725"/>
-							<reference ref="222980245"/>
-							<reference ref="954159030"/>
-							<reference ref="888819828"/>
-						</object>
-						<reference key="parent" ref="107038816"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1499</int>
-						<reference key="object" ref="521019277"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="200565868"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1505</int>
-						<reference key="object" ref="783405221"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="351953267"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1506</int>
-						<reference key="object" ref="239657287"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="160453387"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1507</int>
-						<reference key="object" ref="1000247853"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="860863090"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1508</int>
-						<reference key="object" ref="463960465"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="509250281"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1509</int>
-						<reference key="object" ref="12330413"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1018849574"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1512</int>
-						<reference key="object" ref="222980245"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="343952154"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1515</int>
-						<reference key="object" ref="1064150725"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="451922400"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2361</int>
-						<reference key="object" ref="447003158"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1070893195"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1989</int>
-						<reference key="object" ref="291470012"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="440990725"/>
-						</object>
-						<reference key="parent" ref="712502892"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1990</int>
-						<reference key="object" ref="440990725"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="307620967"/>
-							<reference ref="931485910"/>
-							<reference ref="262106913"/>
-							<reference ref="959722284"/>
-						</object>
-						<reference key="parent" ref="291470012"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1999</int>
-						<reference key="object" ref="307620967"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="595654978"/>
-							<reference ref="1046880533"/>
-							<reference ref="1033243513"/>
-							<reference ref="928480858"/>
-						</object>
-						<reference key="parent" ref="440990725"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2000</int>
-						<reference key="object" ref="595654978"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="77208310"/>
-							<reference ref="932392163"/>
-						</object>
-						<reference key="parent" ref="307620967"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2001</int>
-						<reference key="object" ref="77208310"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="686068440"/>
-						</object>
-						<reference key="parent" ref="595654978"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2002</int>
-						<reference key="object" ref="932392163"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="237660698"/>
-						</object>
-						<reference key="parent" ref="595654978"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2003</int>
-						<reference key="object" ref="262106913"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="719511430"/>
-						</object>
-						<reference key="parent" ref="440990725"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2015</int>
-						<reference key="object" ref="744678564"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="833271282"/>
-						</object>
-						<reference key="parent" ref="712502892"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2016</int>
-						<reference key="object" ref="833271282"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="231506045"/>
-						</object>
-						<reference key="parent" ref="744678564"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2513</int>
-						<reference key="object" ref="231506045"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="parent" ref="833271282"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1538</int>
-						<reference key="object" ref="586321835"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="121574898"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1539</int>
-						<reference key="object" ref="854767306"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="689580100"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1540</int>
-						<reference key="object" ref="806469067"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="177567437"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1541</int>
-						<reference key="object" ref="766125203"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="821198683"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1545</int>
-						<reference key="object" ref="971754180"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="286887304"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1548</int>
-						<reference key="object" ref="453345136"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="564669343"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1552</int>
-						<reference key="object" ref="1023408378"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="834340599"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1553</int>
-						<reference key="object" ref="713493964"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1038625481"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1554</int>
-						<reference key="object" ref="955053416"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="362196160"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1555</int>
-						<reference key="object" ref="138115732"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="510160694"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1556</int>
-						<reference key="object" ref="87961628"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="51600927"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1557</int>
-						<reference key="object" ref="732193996"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="264217237"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1561</int>
-						<reference key="object" ref="186223550"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="988599137"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1562</int>
-						<reference key="object" ref="210289606"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="295879492"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1623</int>
-						<reference key="object" ref="10346684"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1627</int>
-						<reference key="object" ref="35106907"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="293028864"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1628</int>
-						<reference key="object" ref="151388399"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1882</int>
-						<reference key="object" ref="574185541"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="488791842"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2006</int>
-						<reference key="object" ref="1007421233"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="224806210"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2364</int>
-						<reference key="object" ref="553453876"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="294332300"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3203</int>
-						<reference key="object" ref="519699512"/>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3205</int>
-						<reference key="object" ref="454206717"/>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4579</int>
-						<reference key="object" ref="581806074"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="832863281"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">29</int>
-						<reference key="object" ref="840340181"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="116324948"/>
-							<reference ref="610133626"/>
-							<reference ref="966413586"/>
-							<reference ref="487283590"/>
-							<reference ref="692187614"/>
-							<reference ref="226787934"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">MainMenu</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">56</int>
-						<reference key="object" ref="116324948"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1035150210"/>
-						</object>
-						<reference key="parent" ref="840340181"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">57</int>
-						<reference key="object" ref="1035150210"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="218095211"/>
-							<reference ref="680265479"/>
-							<reference ref="550835954"/>
-							<reference ref="912853376"/>
-							<reference ref="981110965"/>
-							<reference ref="360013803"/>
-							<reference ref="782330144"/>
-							<reference ref="802148601"/>
-							<reference ref="985983659"/>
-							<reference ref="750596130"/>
-						</object>
-						<reference key="parent" ref="116324948"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">58</int>
-						<reference key="object" ref="218095211"/>
-						<reference key="parent" ref="1035150210"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">136</int>
-						<reference key="object" ref="680265479"/>
-						<reference key="parent" ref="1035150210"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">196</int>
-						<reference key="object" ref="550835954"/>
-						<reference key="parent" ref="1035150210"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">970</int>
-						<reference key="object" ref="912853376"/>
-						<reference key="parent" ref="1035150210"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">971</int>
-						<reference key="object" ref="981110965"/>
-						<reference key="parent" ref="1035150210"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">973</int>
-						<reference key="object" ref="360013803"/>
-						<reference key="parent" ref="1035150210"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1445</int>
-						<reference key="object" ref="782330144"/>
-						<reference key="parent" ref="1035150210"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1900</int>
-						<reference key="object" ref="802148601"/>
-						<reference key="parent" ref="1035150210"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1189</int>
-						<reference key="object" ref="610133626"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="919178355"/>
-						</object>
-						<reference key="parent" ref="840340181"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1192</int>
-						<reference key="object" ref="919178355"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="998796929"/>
-							<reference ref="372804054"/>
-							<reference ref="196605560"/>
-							<reference ref="854594899"/>
-							<reference ref="302989927"/>
-							<reference ref="545622547"/>
-							<reference ref="87484946"/>
-							<reference ref="849279674"/>
-							<reference ref="1034427275"/>
-							<reference ref="157409278"/>
-						</object>
-						<reference key="parent" ref="610133626"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1190</int>
-						<reference key="object" ref="998796929"/>
-						<reference key="parent" ref="919178355"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1191</int>
-						<reference key="object" ref="372804054"/>
-						<reference key="parent" ref="919178355"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1193</int>
-						<reference key="object" ref="196605560"/>
-						<reference key="parent" ref="919178355"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1884</int>
-						<reference key="object" ref="854594899"/>
-						<reference key="parent" ref="919178355"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2295</int>
-						<reference key="object" ref="302989927"/>
-						<reference key="parent" ref="919178355"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2368</int>
-						<reference key="object" ref="545622547"/>
-						<reference key="parent" ref="919178355"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2445</int>
-						<reference key="object" ref="87484946"/>
-						<reference key="parent" ref="919178355"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2488</int>
-						<reference key="object" ref="849279674"/>
-						<reference key="parent" ref="919178355"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2519</int>
-						<reference key="object" ref="1034427275"/>
-						<reference key="parent" ref="919178355"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1200</int>
-						<reference key="object" ref="966413586"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="567182830"/>
-						</object>
-						<reference key="parent" ref="840340181"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1209</int>
-						<reference key="object" ref="567182830"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="595836714"/>
-							<reference ref="853234446"/>
-							<reference ref="17111946"/>
-							<reference ref="101536867"/>
-							<reference ref="417984878"/>
-							<reference ref="542310438"/>
-							<reference ref="374169999"/>
-							<reference ref="865776798"/>
-							<reference ref="232757118"/>
-						</object>
-						<reference key="parent" ref="966413586"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1198</int>
-						<reference key="object" ref="595836714"/>
-						<reference key="parent" ref="567182830"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2443</int>
-						<reference key="object" ref="853234446"/>
-						<reference key="parent" ref="567182830"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2444</int>
-						<reference key="object" ref="17111946"/>
-						<reference key="parent" ref="567182830"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2494</int>
-						<reference key="object" ref="101536867"/>
-						<reference key="parent" ref="567182830"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2507</int>
-						<reference key="object" ref="417984878"/>
-						<reference key="parent" ref="567182830"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2508</int>
-						<reference key="object" ref="542310438"/>
-						<reference key="parent" ref="567182830"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2518</int>
-						<reference key="object" ref="374169999"/>
-						<reference key="parent" ref="567182830"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2698</int>
-						<reference key="object" ref="865776798"/>
-						<reference key="parent" ref="567182830"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1431</int>
-						<reference key="object" ref="487283590"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="371757683"/>
-						</object>
-						<reference key="parent" ref="840340181"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1429</int>
-						<reference key="object" ref="371757683"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="265609219"/>
-							<reference ref="757350989"/>
-							<reference ref="911007118"/>
-						</object>
-						<reference key="parent" ref="487283590"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1432</int>
-						<reference key="object" ref="265609219"/>
-						<reference key="parent" ref="371757683"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1433</int>
-						<reference key="object" ref="757350989"/>
-						<reference key="parent" ref="371757683"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1985</int>
-						<reference key="object" ref="911007118"/>
-						<reference key="parent" ref="371757683"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1795</int>
-						<reference key="object" ref="692187614"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1010405502"/>
-						</object>
-						<reference key="parent" ref="840340181"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1796</int>
-						<reference key="object" ref="1010405502"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="494582096"/>
-							<reference ref="695401358"/>
-							<reference ref="587511664"/>
-							<reference ref="1051795572"/>
-							<reference ref="786616983"/>
-							<reference ref="249090291"/>
-							<reference ref="134768774"/>
-							<reference ref="1016677230"/>
-							<reference ref="84425921"/>
-							<reference ref="979367247"/>
-							<reference ref="611285451"/>
-							<reference ref="741953332"/>
-							<reference ref="1006794292"/>
-						</object>
-						<reference key="parent" ref="692187614"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1797</int>
-						<reference key="object" ref="494582096"/>
-						<reference key="parent" ref="1010405502"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1798</int>
-						<reference key="object" ref="695401358"/>
-						<reference key="parent" ref="1010405502"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1799</int>
-						<reference key="object" ref="587511664"/>
-						<reference key="parent" ref="1010405502"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1800</int>
-						<reference key="object" ref="1051795572"/>
-						<reference key="parent" ref="1010405502"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1801</int>
-						<reference key="object" ref="786616983"/>
-						<reference key="parent" ref="1010405502"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1802</int>
-						<reference key="object" ref="249090291"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1067858879"/>
-						</object>
-						<reference key="parent" ref="1010405502"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1803</int>
-						<reference key="object" ref="1067858879"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="541561571"/>
-							<reference ref="49300518"/>
-							<reference ref="323467360"/>
-							<reference ref="1069789051"/>
-							<reference ref="793630765"/>
-						</object>
-						<reference key="parent" ref="249090291"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1804</int>
-						<reference key="object" ref="541561571"/>
-						<reference key="parent" ref="1067858879"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1805</int>
-						<reference key="object" ref="49300518"/>
-						<reference key="parent" ref="1067858879"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1806</int>
-						<reference key="object" ref="323467360"/>
-						<reference key="parent" ref="1067858879"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1807</int>
-						<reference key="object" ref="1069789051"/>
-						<reference key="parent" ref="1067858879"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1808</int>
-						<reference key="object" ref="793630765"/>
-						<reference key="parent" ref="1067858879"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1809</int>
-						<reference key="object" ref="134768774"/>
-						<reference key="parent" ref="1010405502"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1810</int>
-						<reference key="object" ref="1016677230"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="650155643"/>
-						</object>
-						<reference key="parent" ref="1010405502"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1811</int>
-						<reference key="object" ref="650155643"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="981624971"/>
-							<reference ref="301925013"/>
-							<reference ref="6854324"/>
-						</object>
-						<reference key="parent" ref="1016677230"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1812</int>
-						<reference key="object" ref="981624971"/>
-						<reference key="parent" ref="650155643"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1813</int>
-						<reference key="object" ref="301925013"/>
-						<reference key="parent" ref="650155643"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1814</int>
-						<reference key="object" ref="6854324"/>
-						<reference key="parent" ref="650155643"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1815</int>
-						<reference key="object" ref="84425921"/>
-						<reference key="parent" ref="1010405502"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1816</int>
-						<reference key="object" ref="979367247"/>
-						<reference key="parent" ref="1010405502"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1817</int>
-						<reference key="object" ref="611285451"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="654962117"/>
-						</object>
-						<reference key="parent" ref="1010405502"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1818</int>
-						<reference key="object" ref="654962117"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="496049927"/>
-							<reference ref="362189914"/>
-						</object>
-						<reference key="parent" ref="611285451"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1819</int>
-						<reference key="object" ref="496049927"/>
-						<reference key="parent" ref="654962117"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1820</int>
-						<reference key="object" ref="362189914"/>
-						<reference key="parent" ref="654962117"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1821</int>
-						<reference key="object" ref="741953332"/>
-						<reference key="parent" ref="1010405502"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1822</int>
-						<reference key="object" ref="1006794292"/>
-						<reference key="parent" ref="1010405502"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1948</int>
-						<reference key="object" ref="226787934"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="112579544"/>
-						</object>
-						<reference key="parent" ref="840340181"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1949</int>
-						<reference key="object" ref="112579544"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="814047217"/>
-							<reference ref="153657129"/>
-							<reference ref="644928468"/>
-							<reference ref="180231"/>
-							<reference ref="454042588"/>
-							<reference ref="734454745"/>
-							<reference ref="685593004"/>
-						</object>
-						<reference key="parent" ref="226787934"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1950</int>
-						<reference key="object" ref="814047217"/>
-						<reference key="parent" ref="112579544"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1951</int>
-						<reference key="object" ref="153657129"/>
-						<reference key="parent" ref="112579544"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1954</int>
-						<reference key="object" ref="644928468"/>
-						<reference key="parent" ref="112579544"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1955</int>
-						<reference key="object" ref="180231"/>
-						<reference key="parent" ref="112579544"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2421</int>
-						<reference key="object" ref="454042588"/>
-						<reference key="parent" ref="112579544"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">240</int>
-						<reference key="object" ref="2258723"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">HBController</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">434</int>
-						<reference key="object" ref="526140766"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="168254512"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">DonePanel</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">435</int>
-						<reference key="object" ref="168254512"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="940804962"/>
-							<reference ref="764659803"/>
-							<reference ref="640205151"/>
-						</object>
-						<reference key="parent" ref="526140766"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">436</int>
-						<reference key="object" ref="940804962"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="72412547"/>
-						</object>
-						<reference key="parent" ref="168254512"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">437</int>
-						<reference key="object" ref="764659803"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="938246142"/>
-						</object>
-						<reference key="parent" ref="168254512"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">438</int>
-						<reference key="object" ref="640205151"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="160092001"/>
-						</object>
-						<reference key="parent" ref="168254512"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1841</int>
-						<reference key="object" ref="972647787"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">PresetsDrawer</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1843</int>
-						<reference key="object" ref="621751818"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="33643505"/>
-							<reference ref="241719587"/>
-							<reference ref="699919504"/>
-							<reference ref="886184281"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">PresetsView</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4179</int>
-						<reference key="object" ref="33643505"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="807972370"/>
-							<reference ref="475123229"/>
-							<reference ref="573337548"/>
-						</object>
-						<reference key="parent" ref="621751818"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4182</int>
-						<reference key="object" ref="807972370"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="658438499"/>
-						</object>
-						<reference key="parent" ref="33643505"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4183</int>
-						<reference key="object" ref="658438499"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="384895213"/>
-						</object>
-						<reference key="parent" ref="807972370"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4186</int>
-						<reference key="object" ref="384895213"/>
-						<reference key="parent" ref="658438499"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4317</int>
-						<reference key="object" ref="241719587"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="501219161"/>
-						</object>
-						<reference key="parent" ref="621751818"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4322</int>
-						<reference key="object" ref="699919504"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="489159603"/>
-						</object>
-						<reference key="parent" ref="621751818"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1867</int>
-						<reference key="object" ref="888992113"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="69290042"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">AddPresetPanel</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1868</int>
-						<reference key="object" ref="69290042"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="636581183"/>
-							<reference ref="586136427"/>
-							<reference ref="978853241"/>
-							<reference ref="343391844"/>
-							<reference ref="340554114"/>
-							<reference ref="511645357"/>
-							<reference ref="5085381"/>
-							<reference ref="384547934"/>
-							<reference ref="786415813"/>
-							<reference ref="167356719"/>
-							<reference ref="277759901"/>
-							<reference ref="988499754"/>
-							<reference ref="59653352"/>
-							<reference ref="31472093"/>
-							<reference ref="1024752086"/>
-						</object>
-						<reference key="parent" ref="888992113"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1870</int>
-						<reference key="object" ref="636581183"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="107603394"/>
-						</object>
-						<reference key="parent" ref="69290042"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1871</int>
-						<reference key="object" ref="586136427"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="231870318"/>
-						</object>
-						<reference key="parent" ref="69290042"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1872</int>
-						<reference key="object" ref="978853241"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="479246832"/>
-						</object>
-						<reference key="parent" ref="69290042"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2008</int>
-						<reference key="object" ref="167356719"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="17688962"/>
-						</object>
-						<reference key="parent" ref="69290042"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2670</int>
-						<reference key="object" ref="343391844"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="658438349"/>
-						</object>
-						<reference key="parent" ref="69290042"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2671</int>
-						<reference key="object" ref="340554114"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="70981869"/>
-						</object>
-						<reference key="parent" ref="69290042"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2672</int>
-						<reference key="object" ref="384547934"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="207651610"/>
-						</object>
-						<reference key="parent" ref="69290042"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2673</int>
-						<reference key="object" ref="511645357"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="855042909"/>
-						</object>
-						<reference key="parent" ref="69290042"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2833</int>
-						<reference key="object" ref="31472093"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="31665321"/>
-						</object>
-						<reference key="parent" ref="69290042"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2837</int>
-						<reference key="object" ref="1024752086"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="625635488"/>
-						</object>
-						<reference key="parent" ref="69290042"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2839</int>
-						<reference key="object" ref="5085381"/>
-						<reference key="parent" ref="69290042"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2840</int>
-						<reference key="object" ref="988499754"/>
-						<reference key="parent" ref="69290042"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2957</int>
-						<reference key="object" ref="59653352"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="155469085"/>
-						</object>
-						<reference key="parent" ref="69290042"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2701</int>
-						<reference key="object" ref="687953568"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="867624722"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">SourceTitlePanel</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2702</int>
-						<reference key="object" ref="867624722"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="133861013"/>
-							<reference ref="293908248"/>
-							<reference ref="535532677"/>
-							<reference ref="290568055"/>
-							<reference ref="35126402"/>
-							<reference ref="1029080172"/>
-							<reference ref="1010749064"/>
-							<reference ref="610976437"/>
-							<reference ref="655257851"/>
-						</object>
-						<reference key="parent" ref="687953568"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2703</int>
-						<reference key="object" ref="133861013"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="874724779"/>
-						</object>
-						<reference key="parent" ref="867624722"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2704</int>
-						<reference key="object" ref="293908248"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="290236859"/>
-						</object>
-						<reference key="parent" ref="867624722"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2705</int>
-						<reference key="object" ref="535532677"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1026393301"/>
-						</object>
-						<reference key="parent" ref="867624722"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2706</int>
-						<reference key="object" ref="290568055"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="412266408"/>
-						</object>
-						<reference key="parent" ref="867624722"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2707</int>
-						<reference key="object" ref="35126402"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="935162329"/>
-						</object>
-						<reference key="parent" ref="867624722"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2708</int>
-						<reference key="object" ref="1029080172"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1020926636"/>
-						</object>
-						<reference key="parent" ref="867624722"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2716</int>
-						<reference key="object" ref="1010749064"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="938406174"/>
-						</object>
-						<reference key="parent" ref="867624722"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2719</int>
-						<reference key="object" ref="610976437"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="802225466"/>
-						</object>
-						<reference key="parent" ref="867624722"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2720</int>
-						<reference key="object" ref="655257851"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="19595360"/>
-						</object>
-						<reference key="parent" ref="867624722"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4846</int>
-						<reference key="object" ref="10523918"/>
-						<reference key="parent" ref="794651271"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4872</int>
-						<reference key="object" ref="200565868"/>
-						<reference key="parent" ref="521019277"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4874</int>
-						<reference key="object" ref="351953267"/>
-						<reference key="parent" ref="783405221"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4875</int>
-						<reference key="object" ref="160453387"/>
-						<reference key="parent" ref="239657287"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4876</int>
-						<reference key="object" ref="860863090"/>
-						<reference key="parent" ref="1000247853"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4877</int>
-						<reference key="object" ref="509250281"/>
-						<reference key="parent" ref="463960465"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4878</int>
-						<reference key="object" ref="1018849574"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="605902924"/>
-						</object>
-						<reference key="parent" ref="12330413"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4879</int>
-						<reference key="object" ref="343952154"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="794681411"/>
-						</object>
-						<reference key="parent" ref="222980245"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4880</int>
-						<reference key="object" ref="451922400"/>
-						<reference key="parent" ref="1064150725"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4892</int>
-						<reference key="object" ref="1070893195"/>
-						<reference key="parent" ref="447003158"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4904</int>
-						<reference key="object" ref="719511430"/>
-						<reference key="parent" ref="262106913"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4905</int>
-						<reference key="object" ref="121574898"/>
-						<reference key="parent" ref="586321835"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4906</int>
-						<reference key="object" ref="689580100"/>
-						<reference key="parent" ref="854767306"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4907</int>
-						<reference key="object" ref="177567437"/>
-						<reference key="parent" ref="806469067"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4908</int>
-						<reference key="object" ref="821198683"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="793162058"/>
-						</object>
-						<reference key="parent" ref="766125203"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4910</int>
-						<reference key="object" ref="286887304"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="493845446"/>
-						</object>
-						<reference key="parent" ref="971754180"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4911</int>
-						<reference key="object" ref="564669343"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="27255767"/>
-						</object>
-						<reference key="parent" ref="453345136"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4913</int>
-						<reference key="object" ref="834340599"/>
-						<reference key="parent" ref="1023408378"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4914</int>
-						<reference key="object" ref="1038625481"/>
-						<reference key="parent" ref="713493964"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4915</int>
-						<reference key="object" ref="362196160"/>
-						<reference key="parent" ref="955053416"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4916</int>
-						<reference key="object" ref="510160694"/>
-						<reference key="parent" ref="138115732"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4917</int>
-						<reference key="object" ref="51600927"/>
-						<reference key="parent" ref="87961628"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4918</int>
-						<reference key="object" ref="264217237"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="237152896"/>
-						</object>
-						<reference key="parent" ref="732193996"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4919</int>
-						<reference key="object" ref="988599137"/>
-						<reference key="parent" ref="186223550"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4920</int>
-						<reference key="object" ref="295879492"/>
-						<reference key="parent" ref="210289606"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4923</int>
-						<reference key="object" ref="293028864"/>
-						<reference key="parent" ref="35106907"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4924</int>
-						<reference key="object" ref="488791842"/>
-						<reference key="parent" ref="574185541"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4925</int>
-						<reference key="object" ref="224806210"/>
-						<reference key="parent" ref="1007421233"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4926</int>
-						<reference key="object" ref="294332300"/>
-						<reference key="parent" ref="553453876"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4927</int>
-						<reference key="object" ref="832863281"/>
-						<reference key="parent" ref="581806074"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4928</int>
-						<reference key="object" ref="72412547"/>
-						<reference key="parent" ref="940804962"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4929</int>
-						<reference key="object" ref="938246142"/>
-						<reference key="parent" ref="764659803"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4930</int>
-						<reference key="object" ref="160092001"/>
-						<reference key="parent" ref="640205151"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4932</int>
-						<reference key="object" ref="501219161"/>
-						<reference key="parent" ref="241719587"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4933</int>
-						<reference key="object" ref="489159603"/>
-						<reference key="parent" ref="699919504"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4934</int>
-						<reference key="object" ref="107603394"/>
-						<reference key="parent" ref="636581183"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4935</int>
-						<reference key="object" ref="231870318"/>
-						<reference key="parent" ref="586136427"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4936</int>
-						<reference key="object" ref="479246832"/>
-						<reference key="parent" ref="978853241"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4937</int>
-						<reference key="object" ref="17688962"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="521597821"/>
-						</object>
-						<reference key="parent" ref="167356719"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4938</int>
-						<reference key="object" ref="658438349"/>
-						<reference key="parent" ref="343391844"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4939</int>
-						<reference key="object" ref="70981869"/>
-						<reference key="parent" ref="340554114"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4940</int>
-						<reference key="object" ref="207651610"/>
-						<reference key="parent" ref="384547934"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4941</int>
-						<reference key="object" ref="855042909"/>
-						<reference key="parent" ref="511645357"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4942</int>
-						<reference key="object" ref="31665321"/>
-						<reference key="parent" ref="31472093"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4943</int>
-						<reference key="object" ref="625635488"/>
-						<reference key="parent" ref="1024752086"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4944</int>
-						<reference key="object" ref="155469085"/>
-						<reference key="parent" ref="59653352"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4945</int>
-						<reference key="object" ref="874724779"/>
-						<reference key="parent" ref="133861013"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4946</int>
-						<reference key="object" ref="290236859"/>
-						<reference key="parent" ref="293908248"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4947</int>
-						<reference key="object" ref="1026393301"/>
-						<reference key="parent" ref="535532677"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4948</int>
-						<reference key="object" ref="412266408"/>
-						<reference key="parent" ref="290568055"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4949</int>
-						<reference key="object" ref="935162329"/>
-						<reference key="parent" ref="35126402"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4950</int>
-						<reference key="object" ref="1020926636"/>
-						<reference key="parent" ref="1029080172"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4951</int>
-						<reference key="object" ref="938406174"/>
-						<reference key="parent" ref="1010749064"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4952</int>
-						<reference key="object" ref="802225466"/>
-						<reference key="parent" ref="610976437"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4953</int>
-						<reference key="object" ref="19595360"/>
-						<reference key="parent" ref="655257851"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4955</int>
-						<reference key="object" ref="686068440"/>
-						<reference key="parent" ref="77208310"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4956</int>
-						<reference key="object" ref="237660698"/>
-						<reference key="parent" ref="932392163"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1510</int>
-						<reference key="object" ref="605902924"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="536275725"/>
-						</object>
-						<reference key="parent" ref="1018849574"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1511</int>
-						<reference key="object" ref="536275725"/>
-						<reference key="parent" ref="605902924"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1513</int>
-						<reference key="object" ref="794681411"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="996965095"/>
-						</object>
-						<reference key="parent" ref="343952154"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1514</int>
-						<reference key="object" ref="996965095"/>
-						<reference key="parent" ref="794681411"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1542</int>
-						<reference key="object" ref="793162058"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="52855721"/>
-						</object>
-						<reference key="parent" ref="821198683"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1543</int>
-						<reference key="object" ref="52855721"/>
-						<reference key="parent" ref="793162058"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1546</int>
-						<reference key="object" ref="493845446"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="170826719"/>
-						</object>
-						<reference key="parent" ref="286887304"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1547</int>
-						<reference key="object" ref="170826719"/>
-						<reference key="parent" ref="493845446"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1549</int>
-						<reference key="object" ref="27255767"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1048999115"/>
-						</object>
-						<reference key="parent" ref="564669343"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1550</int>
-						<reference key="object" ref="1048999115"/>
-						<reference key="parent" ref="27255767"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1558</int>
-						<reference key="object" ref="237152896"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="586933029"/>
-						</object>
-						<reference key="parent" ref="264217237"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1559</int>
-						<reference key="object" ref="586933029"/>
-						<reference key="parent" ref="237152896"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2009</int>
-						<reference key="object" ref="521597821"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="12791251"/>
-							<reference ref="802910491"/>
-							<reference ref="962314470"/>
-						</object>
-						<reference key="parent" ref="17688962"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2012</int>
-						<reference key="object" ref="12791251"/>
-						<reference key="parent" ref="521597821"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2011</int>
-						<reference key="object" ref="802910491"/>
-						<reference key="parent" ref="521597821"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2010</int>
-						<reference key="object" ref="962314470"/>
-						<reference key="parent" ref="521597821"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4957</int>
-						<reference key="object" ref="1046880533"/>
-						<reference key="parent" ref="307620967"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4958</int>
-						<reference key="object" ref="1033243513"/>
-						<reference key="parent" ref="307620967"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4959</int>
-						<reference key="object" ref="928480858"/>
-						<reference key="parent" ref="307620967"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4960</int>
-						<reference key="object" ref="475123229"/>
-						<reference key="parent" ref="33643505"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4961</int>
-						<reference key="object" ref="573337548"/>
-						<reference key="parent" ref="33643505"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4963</int>
-						<reference key="object" ref="159095366"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4964</int>
-						<reference key="object" ref="985983659"/>
-						<reference key="parent" ref="1035150210"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4967</int>
-						<reference key="object" ref="921877174"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="547085070"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4968</int>
-						<reference key="object" ref="547085070"/>
-						<reference key="parent" ref="921877174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5130</int>
-						<reference key="object" ref="886184281"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="492120702"/>
-						</object>
-						<reference key="parent" ref="621751818"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5131</int>
-						<reference key="object" ref="492120702"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="717227898"/>
-						</object>
-						<reference key="parent" ref="886184281"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5132</int>
-						<reference key="object" ref="717227898"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="228547440"/>
-							<reference ref="950937431"/>
-							<reference ref="583192244"/>
-						</object>
-						<reference key="parent" ref="492120702"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5133</int>
-						<reference key="object" ref="228547440"/>
-						<reference key="parent" ref="717227898"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5134</int>
-						<reference key="object" ref="950937431"/>
-						<reference key="parent" ref="717227898"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5135</int>
-						<reference key="object" ref="583192244"/>
-						<reference key="parent" ref="717227898"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5153</int>
-						<reference key="object" ref="786415813"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="977106207"/>
-						</object>
-						<reference key="parent" ref="69290042"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5154</int>
-						<reference key="object" ref="977106207"/>
-						<reference key="parent" ref="786415813"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5157</int>
-						<reference key="object" ref="157409278"/>
-						<reference key="parent" ref="919178355"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5167</int>
-						<reference key="object" ref="987137669"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="537000521"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5168</int>
-						<reference key="object" ref="537000521"/>
-						<reference key="parent" ref="987137669"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5171</int>
-						<reference key="object" ref="503933842"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="109092334"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5172</int>
-						<reference key="object" ref="109092334"/>
-						<reference key="parent" ref="503933842"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5174</int>
-						<reference key="object" ref="690304958"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="923732752"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5175</int>
-						<reference key="object" ref="923732752"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="580574518"/>
-						</object>
-						<reference key="parent" ref="690304958"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5177</int>
-						<reference key="object" ref="323705695"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="936221726"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5178</int>
-						<reference key="object" ref="936221726"/>
-						<reference key="parent" ref="323705695"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5180</int>
-						<reference key="object" ref="303369850"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="677126774"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5181</int>
-						<reference key="object" ref="460320725"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="567459641"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5182</int>
-						<reference key="object" ref="567459641"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="651682595"/>
-						</object>
-						<reference key="parent" ref="460320725"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5183</int>
-						<reference key="object" ref="651682595"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="62890346"/>
-						</object>
-						<reference key="parent" ref="567459641"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5184</int>
-						<reference key="object" ref="62890346"/>
-						<reference key="parent" ref="651682595"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5185</int>
-						<reference key="object" ref="677126774"/>
-						<reference key="parent" ref="303369850"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5188</int>
-						<reference key="object" ref="734454745"/>
-						<reference key="parent" ref="112579544"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5192</int>
-						<reference key="object" ref="685593004"/>
-						<reference key="parent" ref="112579544"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5194</int>
-						<reference key="object" ref="799016137"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="756255803"/>
-						</object>
-						<reference key="parent" ref="712502892"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5195</int>
-						<reference key="object" ref="756255803"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="596256174"/>
-							<reference ref="377401502"/>
-						</object>
-						<reference key="parent" ref="799016137"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5196</int>
-						<reference key="object" ref="596256174"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="40751315"/>
-							<reference ref="892147391"/>
-							<reference ref="587237088"/>
-							<reference ref="569585004"/>
-						</object>
-						<reference key="parent" ref="756255803"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5197</int>
-						<reference key="object" ref="40751315"/>
-						<reference key="parent" ref="596256174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5198</int>
-						<reference key="object" ref="892147391"/>
-						<reference key="parent" ref="596256174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5199</int>
-						<reference key="object" ref="587237088"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="274341565"/>
-							<reference ref="1033748386"/>
-							<reference ref="362209136"/>
-							<reference ref="270619684"/>
-							<reference ref="116912874"/>
-							<reference ref="180322215"/>
-							<reference ref="526590234"/>
-						</object>
-						<reference key="parent" ref="596256174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5201</int>
-						<reference key="object" ref="274341565"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="426946554"/>
-						</object>
-						<reference key="parent" ref="587237088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5215</int>
-						<reference key="object" ref="1033748386"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="13236417"/>
-						</object>
-						<reference key="parent" ref="587237088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5217</int>
-						<reference key="object" ref="362209136"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="704907857"/>
-						</object>
-						<reference key="parent" ref="587237088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5219</int>
-						<reference key="object" ref="270619684"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="299034685"/>
-						</object>
-						<reference key="parent" ref="587237088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5225</int>
-						<reference key="object" ref="426946554"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="472498711"/>
-						</object>
-						<reference key="parent" ref="274341565"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5226</int>
-						<reference key="object" ref="472498711"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1026748451"/>
-						</object>
-						<reference key="parent" ref="426946554"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5227</int>
-						<reference key="object" ref="1026748451"/>
-						<reference key="parent" ref="472498711"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5232</int>
-						<reference key="object" ref="13236417"/>
-						<reference key="parent" ref="1033748386"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5233</int>
-						<reference key="object" ref="704907857"/>
-						<reference key="parent" ref="362209136"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5234</int>
-						<reference key="object" ref="299034685"/>
-						<reference key="parent" ref="270619684"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5244</int>
-						<reference key="object" ref="569585004"/>
-						<reference key="parent" ref="596256174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5246</int>
-						<reference key="object" ref="377401502"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="206924163"/>
-						</object>
-						<reference key="parent" ref="756255803"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5247</int>
-						<reference key="object" ref="206924163"/>
-						<reference key="parent" ref="377401502"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5250</int>
-						<reference key="object" ref="116912874"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="688461412"/>
-						</object>
-						<reference key="parent" ref="587237088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5252</int>
-						<reference key="object" ref="180322215"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="483232645"/>
-						</object>
-						<reference key="parent" ref="587237088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5254</int>
-						<reference key="object" ref="526590234"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="43785715"/>
-						</object>
-						<reference key="parent" ref="587237088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5268</int>
-						<reference key="object" ref="688461412"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="808277525"/>
-						</object>
-						<reference key="parent" ref="116912874"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5269</int>
-						<reference key="object" ref="808277525"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="341659302"/>
-						</object>
-						<reference key="parent" ref="688461412"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5270</int>
-						<reference key="object" ref="341659302"/>
-						<reference key="parent" ref="808277525"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5271</int>
-						<reference key="object" ref="483232645"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="427130300"/>
-						</object>
-						<reference key="parent" ref="180322215"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5272</int>
-						<reference key="object" ref="427130300"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="66454705"/>
-						</object>
-						<reference key="parent" ref="483232645"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5273</int>
-						<reference key="object" ref="66454705"/>
-						<reference key="parent" ref="427130300"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5278</int>
-						<reference key="object" ref="43785715"/>
-						<reference key="parent" ref="526590234"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5279</int>
-						<reference key="object" ref="580574518"/>
-						<reference key="parent" ref="923732752"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5280</int>
-						<reference key="object" ref="750596130"/>
-						<reference key="parent" ref="1035150210"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5491</int>
-						<reference key="object" ref="104002862"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="371961838"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5492</int>
-						<reference key="object" ref="371961838"/>
-						<reference key="parent" ref="104002862"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5493</int>
-						<reference key="object" ref="19055068"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="778187711"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5494</int>
-						<reference key="object" ref="778187711"/>
-						<reference key="parent" ref="19055068"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5505</int>
-						<reference key="object" ref="978025076"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="138681808"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5506</int>
-						<reference key="object" ref="138681808"/>
-						<reference key="parent" ref="978025076"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5513</int>
-						<reference key="object" ref="482831442"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="266952854"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5514</int>
-						<reference key="object" ref="266952854"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="289100177"/>
-						</object>
-						<reference key="parent" ref="482831442"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5515</int>
-						<reference key="object" ref="289100177"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="parent" ref="266952854"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5521</int>
-						<reference key="object" ref="398989741"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="506346481"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5522</int>
-						<reference key="object" ref="506346481"/>
-						<reference key="parent" ref="398989741"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5523</int>
-						<reference key="object" ref="164276139"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1039518079"/>
-						</object>
-						<reference key="parent" ref="168918359"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5524</int>
-						<reference key="object" ref="1039518079"/>
-						<reference key="parent" ref="164276139"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5534</int>
-						<reference key="object" ref="959722284"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="100898939"/>
-						</object>
-						<reference key="parent" ref="440990725"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5535</int>
-						<reference key="object" ref="100898939"/>
-						<reference key="parent" ref="959722284"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5536</int>
-						<reference key="object" ref="931485910"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="843416672"/>
-						</object>
-						<reference key="parent" ref="440990725"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5537</int>
-						<reference key="object" ref="843416672"/>
-						<reference key="parent" ref="931485910"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5670</int>
-						<reference key="object" ref="277759901"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="522324466"/>
-							<reference ref="358179065"/>
-							<reference ref="525081109"/>
-						</object>
-						<reference key="parent" ref="69290042"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5549</int>
-						<reference key="object" ref="522324466"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="862361869"/>
-						</object>
-						<reference key="parent" ref="277759901"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5550</int>
-						<reference key="object" ref="862361869"/>
-						<reference key="parent" ref="522324466"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5553</int>
-						<reference key="object" ref="358179065"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="14541127"/>
-						</object>
-						<reference key="parent" ref="277759901"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5554</int>
-						<reference key="object" ref="14541127"/>
-						<reference key="parent" ref="358179065"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5551</int>
-						<reference key="object" ref="525081109"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="945554305"/>
-						</object>
-						<reference key="parent" ref="277759901"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5552</int>
-						<reference key="object" ref="945554305"/>
-						<reference key="parent" ref="525081109"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5673</int>
-						<reference key="object" ref="681233637"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Audio Controller</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5674</int>
-						<reference key="object" ref="141316080"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Audios</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5676</int>
-						<reference key="object" ref="869523098"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5680</int>
-						<reference key="object" ref="577274772"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="883603583"/>
-							<reference ref="933946879"/>
-							<reference ref="334448622"/>
-						</object>
-						<reference key="parent" ref="738554558"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5681</int>
-						<reference key="object" ref="883603583"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="327570663"/>
-						</object>
-						<reference key="parent" ref="577274772"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5682</int>
-						<reference key="object" ref="933946879"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="146611085"/>
-							<reference ref="792464451"/>
-							<reference ref="821562152"/>
-							<reference ref="496546489"/>
-						</object>
-						<reference key="parent" ref="577274772"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5683</int>
-						<reference key="object" ref="146611085"/>
-						<reference key="parent" ref="933946879"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5684</int>
-						<reference key="object" ref="792464451"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="581296833"/>
-							<reference ref="393032802"/>
-							<reference ref="596723553"/>
-							<reference ref="1063255"/>
-							<reference ref="590927656"/>
-							<reference ref="200958136"/>
-							<reference ref="33212493"/>
-							<reference ref="7762140"/>
-							<reference ref="432964705"/>
-						</object>
-						<reference key="parent" ref="933946879"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5685</int>
-						<reference key="object" ref="821562152"/>
-						<reference key="parent" ref="933946879"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5686</int>
-						<reference key="object" ref="496546489"/>
-						<reference key="parent" ref="933946879"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5687</int>
-						<reference key="object" ref="581296833"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="750418243"/>
-						</object>
-						<reference key="parent" ref="792464451"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5688</int>
-						<reference key="object" ref="393032802"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="852982078"/>
-						</object>
-						<reference key="parent" ref="792464451"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5689</int>
-						<reference key="object" ref="596723553"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="238248766"/>
-						</object>
-						<reference key="parent" ref="792464451"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5690</int>
-						<reference key="object" ref="1063255"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="257530638"/>
-						</object>
-						<reference key="parent" ref="792464451"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5691</int>
-						<reference key="object" ref="590927656"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1037917692"/>
-						</object>
-						<reference key="parent" ref="792464451"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5692</int>
-						<reference key="object" ref="200958136"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="4014313"/>
-						</object>
-						<reference key="parent" ref="792464451"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5693</int>
-						<reference key="object" ref="33212493"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="871837653"/>
-						</object>
-						<reference key="parent" ref="792464451"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5694</int>
-						<reference key="object" ref="871837653"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="513335837"/>
-						</object>
-						<reference key="parent" ref="33212493"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5695</int>
-						<reference key="object" ref="513335837"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="677045788"/>
-						</object>
-						<reference key="parent" ref="871837653"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5696</int>
-						<reference key="object" ref="677045788"/>
-						<reference key="parent" ref="513335837"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5706</int>
-						<reference key="object" ref="750418243"/>
-						<reference key="parent" ref="581296833"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5707</int>
-						<reference key="object" ref="327570663"/>
-						<reference key="parent" ref="883603583"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5712</int>
-						<reference key="object" ref="4014313"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="525066294"/>
-						</object>
-						<reference key="parent" ref="200958136"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5713</int>
-						<reference key="object" ref="525066294"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1058317103"/>
-						</object>
-						<reference key="parent" ref="4014313"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5714</int>
-						<reference key="object" ref="1058317103"/>
-						<reference key="parent" ref="525066294"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5715</int>
-						<reference key="object" ref="1037917692"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="966554680"/>
-						</object>
-						<reference key="parent" ref="590927656"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5716</int>
-						<reference key="object" ref="966554680"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="106742036"/>
-						</object>
-						<reference key="parent" ref="1037917692"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5717</int>
-						<reference key="object" ref="106742036"/>
-						<reference key="parent" ref="966554680"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5718</int>
-						<reference key="object" ref="257530638"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="640929469"/>
-						</object>
-						<reference key="parent" ref="1063255"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5719</int>
-						<reference key="object" ref="640929469"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="713274619"/>
-						</object>
-						<reference key="parent" ref="257530638"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5720</int>
-						<reference key="object" ref="713274619"/>
-						<reference key="parent" ref="640929469"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5721</int>
-						<reference key="object" ref="238248766"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="764294190"/>
-						</object>
-						<reference key="parent" ref="596723553"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5722</int>
-						<reference key="object" ref="764294190"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="452766579"/>
-						</object>
-						<reference key="parent" ref="238248766"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5723</int>
-						<reference key="object" ref="452766579"/>
-						<reference key="parent" ref="764294190"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5724</int>
-						<reference key="object" ref="852982078"/>
-						<reference key="parent" ref="393032802"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5808</int>
-						<reference key="object" ref="1036976683"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="613962178"/>
-							<reference ref="878990764"/>
-							<reference ref="121093497"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5809</int>
-						<reference key="object" ref="613962178"/>
-						<reference key="parent" ref="1036976683"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5810</int>
-						<reference key="object" ref="878990764"/>
-						<reference key="parent" ref="1036976683"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5811</int>
-						<reference key="object" ref="121093497"/>
-						<reference key="parent" ref="1036976683"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5820</int>
-						<reference key="object" ref="888819828"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="217044635"/>
-							<reference ref="995154792"/>
-							<reference ref="329026312"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5821</int>
-						<reference key="object" ref="217044635"/>
-						<reference key="parent" ref="888819828"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5822</int>
-						<reference key="object" ref="995154792"/>
-						<reference key="parent" ref="888819828"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5823</int>
-						<reference key="object" ref="329026312"/>
-						<reference key="parent" ref="888819828"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5871</int>
-						<reference key="object" ref="7762140"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="723141526"/>
-						</object>
-						<reference key="parent" ref="792464451"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5872</int>
-						<reference key="object" ref="432964705"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="718953459"/>
-						</object>
-						<reference key="parent" ref="792464451"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5873</int>
-						<reference key="object" ref="718953459"/>
-						<reference key="parent" ref="432964705"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5874</int>
-						<reference key="object" ref="723141526"/>
-						<reference key="parent" ref="7762140"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5879</int>
-						<reference key="object" ref="551130964"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Audio Inputs</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5897</int>
-						<reference key="object" ref="232757118"/>
-						<reference key="parent" ref="567182830"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1624</int>
-						<reference key="object" ref="412106376"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1629</int>
-						<reference key="object" ref="586026952"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5920</int>
-						<reference key="object" ref="334448622"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1024961404"/>
-							<reference ref="485809563"/>
-							<reference ref="453548414"/>
-							<reference ref="354328979"/>
-							<reference ref="162512199"/>
-							<reference ref="586044455"/>
-							<reference ref="1010907474"/>
-							<reference ref="431725280"/>
-						</object>
-						<reference key="parent" ref="577274772"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5904</int>
-						<reference key="object" ref="162512199"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="707344957"/>
-						</object>
-						<reference key="parent" ref="334448622"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5905</int>
-						<reference key="object" ref="707344957"/>
-						<reference key="parent" ref="162512199"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5906</int>
-						<reference key="object" ref="354328979"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="243873688"/>
-						</object>
-						<reference key="parent" ref="334448622"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5907</int>
-						<reference key="object" ref="243873688"/>
-						<reference key="parent" ref="354328979"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5908</int>
-						<reference key="object" ref="453548414"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="368344404"/>
-						</object>
-						<reference key="parent" ref="334448622"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5909</int>
-						<reference key="object" ref="368344404"/>
-						<reference key="parent" ref="453548414"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5910</int>
-						<reference key="object" ref="485809563"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="118300837"/>
-						</object>
-						<reference key="parent" ref="334448622"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5911</int>
-						<reference key="object" ref="118300837"/>
-						<reference key="parent" ref="485809563"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5912</int>
-						<reference key="object" ref="1024961404"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="735750065"/>
-						</object>
-						<reference key="parent" ref="334448622"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5913</int>
-						<reference key="object" ref="735750065"/>
-						<reference key="parent" ref="1024961404"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5914</int>
-						<reference key="object" ref="586044455"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="141259846"/>
-						</object>
-						<reference key="parent" ref="334448622"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5915</int>
-						<reference key="object" ref="141259846"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="458538409"/>
-						</object>
-						<reference key="parent" ref="586044455"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5916</int>
-						<reference key="object" ref="458538409"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="4616658"/>
-							<reference ref="797157934"/>
-							<reference ref="394026679"/>
-						</object>
-						<reference key="parent" ref="141259846"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5919</int>
-						<reference key="object" ref="4616658"/>
-						<reference key="parent" ref="458538409"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5918</int>
-						<reference key="object" ref="797157934"/>
-						<reference key="parent" ref="458538409"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5917</int>
-						<reference key="object" ref="394026679"/>
-						<reference key="parent" ref="458538409"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5921</int>
-						<reference key="object" ref="1010907474"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="935575109"/>
-						</object>
-						<reference key="parent" ref="334448622"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5922</int>
-						<reference key="object" ref="935575109"/>
-						<reference key="parent" ref="1010907474"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5923</int>
-						<reference key="object" ref="431725280"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="121164790"/>
-						</object>
-						<reference key="parent" ref="334448622"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5924</int>
-						<reference key="object" ref="121164790"/>
-						<reference key="parent" ref="431725280"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5934</int>
-						<reference key="object" ref="954159030"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="480823072"/>
-							<reference ref="139432403"/>
-							<reference ref="1031662534"/>
-							<reference ref="102651997"/>
-							<reference ref="610425389"/>
-							<reference ref="8023338"/>
-							<reference ref="144142005"/>
-							<reference ref="112458239"/>
-							<reference ref="796460997"/>
-							<reference ref="487526549"/>
-							<reference ref="527737261"/>
-							<reference ref="902460295"/>
-							<reference ref="349581420"/>
-							<reference ref="884471415"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5932</int>
-						<reference key="object" ref="480823072"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="690637620"/>
-						</object>
-						<reference key="parent" ref="954159030"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5933</int>
-						<reference key="object" ref="690637620"/>
-						<reference key="parent" ref="480823072"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5937</int>
-						<reference key="object" ref="139432403"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="367754591"/>
-						</object>
-						<reference key="parent" ref="954159030"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5938</int>
-						<reference key="object" ref="367754591"/>
-						<reference key="parent" ref="139432403"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5939</int>
-						<reference key="object" ref="1031662534"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="444043003"/>
-						</object>
-						<reference key="parent" ref="954159030"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5940</int>
-						<reference key="object" ref="444043003"/>
-						<reference key="parent" ref="1031662534"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5941</int>
-						<reference key="object" ref="102651997"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="858212432"/>
-						</object>
-						<reference key="parent" ref="954159030"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5942</int>
-						<reference key="object" ref="858212432"/>
-						<reference key="parent" ref="102651997"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5943</int>
-						<reference key="object" ref="8023338"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="248169798"/>
-						</object>
-						<reference key="parent" ref="954159030"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5944</int>
-						<reference key="object" ref="248169798"/>
-						<reference key="parent" ref="8023338"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5945</int>
-						<reference key="object" ref="610425389"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1050851477"/>
-						</object>
-						<reference key="parent" ref="954159030"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5946</int>
-						<reference key="object" ref="1050851477"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="353982019"/>
-						</object>
-						<reference key="parent" ref="610425389"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5947</int>
-						<reference key="object" ref="353982019"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="791223578"/>
-							<reference ref="645526467"/>
-							<reference ref="1035566125"/>
-						</object>
-						<reference key="parent" ref="1050851477"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5948</int>
-						<reference key="object" ref="791223578"/>
-						<reference key="parent" ref="353982019"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5949</int>
-						<reference key="object" ref="645526467"/>
-						<reference key="parent" ref="353982019"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5950</int>
-						<reference key="object" ref="1035566125"/>
-						<reference key="parent" ref="353982019"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5951</int>
-						<reference key="object" ref="112458239"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1012707648"/>
-						</object>
-						<reference key="parent" ref="954159030"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5952</int>
-						<reference key="object" ref="1012707648"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="349551230"/>
-						</object>
-						<reference key="parent" ref="112458239"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5953</int>
-						<reference key="object" ref="349551230"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="691985983"/>
-							<reference ref="603447176"/>
-							<reference ref="56675133"/>
-						</object>
-						<reference key="parent" ref="1012707648"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5954</int>
-						<reference key="object" ref="691985983"/>
-						<reference key="parent" ref="349551230"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5955</int>
-						<reference key="object" ref="603447176"/>
-						<reference key="parent" ref="349551230"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5956</int>
-						<reference key="object" ref="56675133"/>
-						<reference key="parent" ref="349551230"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5957</int>
-						<reference key="object" ref="144142005"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="379682863"/>
-						</object>
-						<reference key="parent" ref="954159030"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5958</int>
-						<reference key="object" ref="379682863"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="957749846"/>
-						</object>
-						<reference key="parent" ref="144142005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5959</int>
-						<reference key="object" ref="957749846"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="658841842"/>
-							<reference ref="442645374"/>
-							<reference ref="831415388"/>
-						</object>
-						<reference key="parent" ref="379682863"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5960</int>
-						<reference key="object" ref="658841842"/>
-						<reference key="parent" ref="957749846"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5961</int>
-						<reference key="object" ref="442645374"/>
-						<reference key="parent" ref="957749846"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5962</int>
-						<reference key="object" ref="831415388"/>
-						<reference key="parent" ref="957749846"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5963</int>
-						<reference key="object" ref="884471415"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="140128742"/>
-						</object>
-						<reference key="parent" ref="954159030"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5964</int>
-						<reference key="object" ref="140128742"/>
-						<reference key="parent" ref="884471415"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5967</int>
-						<reference key="object" ref="796460997"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="934066385"/>
-						</object>
-						<reference key="parent" ref="954159030"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5968</int>
-						<reference key="object" ref="934066385"/>
-						<reference key="parent" ref="796460997"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5971</int>
-						<reference key="object" ref="487526549"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="284269747"/>
-						</object>
-						<reference key="parent" ref="954159030"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5972</int>
-						<reference key="object" ref="284269747"/>
-						<reference key="parent" ref="487526549"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5981</int>
-						<reference key="object" ref="527737261"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="513519725"/>
-						</object>
-						<reference key="parent" ref="954159030"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5982</int>
-						<reference key="object" ref="513519725"/>
-						<reference key="parent" ref="527737261"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5992</int>
-						<reference key="object" ref="902460295"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="191360965"/>
-						</object>
-						<reference key="parent" ref="954159030"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5993</int>
-						<reference key="object" ref="191360965"/>
-						<reference key="parent" ref="902460295"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5996</int>
-						<reference key="object" ref="349581420"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="812860538"/>
-						</object>
-						<reference key="parent" ref="954159030"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5997</int>
-						<reference key="object" ref="812860538"/>
-						<reference key="parent" ref="349581420"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>1123.IBPluginDependency</string>
-					<string>1189.IBPluginDependency</string>
-					<string>1190.IBPluginDependency</string>
-					<string>1191.IBPluginDependency</string>
-					<string>1192.IBPluginDependency</string>
-					<string>1193.IBPluginDependency</string>
-					<string>1198.IBPluginDependency</string>
-					<string>1200.IBPluginDependency</string>
-					<string>1209.IBPluginDependency</string>
-					<string>136.IBPluginDependency</string>
-					<string>1373.IBPluginDependency</string>
-					<string>1429.IBPluginDependency</string>
-					<string>1431.IBPluginDependency</string>
-					<string>1432.IBPluginDependency</string>
-					<string>1433.IBPluginDependency</string>
-					<string>1445.IBPluginDependency</string>
-					<string>1474.IBAttributePlaceholdersKey</string>
-					<string>1474.IBPluginDependency</string>
-					<string>1475.IBPluginDependency</string>
-					<string>1476.IBPluginDependency</string>
-					<string>1477.IBPluginDependency</string>
-					<string>1478.IBPluginDependency</string>
-					<string>1499.IBPluginDependency</string>
-					<string>1505.IBPluginDependency</string>
-					<string>1506.IBPluginDependency</string>
-					<string>1507.IBPluginDependency</string>
-					<string>1508.IBPluginDependency</string>
-					<string>1509.IBPluginDependency</string>
-					<string>1510.IBPluginDependency</string>
-					<string>1511.IBPluginDependency</string>
-					<string>1512.IBPluginDependency</string>
-					<string>1513.IBPluginDependency</string>
-					<string>1514.IBPluginDependency</string>
-					<string>1515.IBPluginDependency</string>
-					<string>1538.IBPluginDependency</string>
-					<string>1539.IBPluginDependency</string>
-					<string>1540.IBPluginDependency</string>
-					<string>1541.IBPluginDependency</string>
-					<string>1542.IBPluginDependency</string>
-					<string>1543.IBPluginDependency</string>
-					<string>1545.IBPluginDependency</string>
-					<string>1546.IBPluginDependency</string>
-					<string>1547.IBPluginDependency</string>
-					<string>1548.IBPluginDependency</string>
-					<string>1549.IBPluginDependency</string>
-					<string>1550.IBPluginDependency</string>
-					<string>1552.IBPluginDependency</string>
-					<string>1553.IBPluginDependency</string>
-					<string>1554.IBPluginDependency</string>
-					<string>1555.IBPluginDependency</string>
-					<string>1556.IBPluginDependency</string>
-					<string>1557.IBPluginDependency</string>
-					<string>1558.IBPluginDependency</string>
-					<string>1559.IBPluginDependency</string>
-					<string>1561.IBPluginDependency</string>
-					<string>1562.IBPluginDependency</string>
-					<string>1623.IBPluginDependency</string>
-					<string>1624.IBPluginDependency</string>
-					<string>1627.IBPluginDependency</string>
-					<string>1628.IBPluginDependency</string>
-					<string>1629.IBPluginDependency</string>
-					<string>1795.IBPluginDependency</string>
-					<string>1796.IBPluginDependency</string>
-					<string>1797.IBPluginDependency</string>
-					<string>1798.IBPluginDependency</string>
-					<string>1799.IBPluginDependency</string>
-					<string>1800.IBPluginDependency</string>
-					<string>1801.IBPluginDependency</string>
-					<string>1802.IBPluginDependency</string>
-					<string>1803.IBPluginDependency</string>
-					<string>1804.IBPluginDependency</string>
-					<string>1805.IBPluginDependency</string>
-					<string>1806.IBPluginDependency</string>
-					<string>1807.IBPluginDependency</string>
-					<string>1808.IBPluginDependency</string>
-					<string>1809.IBPluginDependency</string>
-					<string>1810.IBPluginDependency</string>
-					<string>1811.IBPluginDependency</string>
-					<string>1812.IBPluginDependency</string>
-					<string>1813.IBPluginDependency</string>
-					<string>1814.IBPluginDependency</string>
-					<string>1815.IBPluginDependency</string>
-					<string>1816.IBPluginDependency</string>
-					<string>1817.IBPluginDependency</string>
-					<string>1818.IBPluginDependency</string>
-					<string>1819.IBPluginDependency</string>
-					<string>1820.IBPluginDependency</string>
-					<string>1821.IBPluginDependency</string>
-					<string>1822.IBPluginDependency</string>
-					<string>1841.IBPluginDependency</string>
-					<string>1843.IBPluginDependency</string>
-					<string>1867.IBPluginDependency</string>
-					<string>1867.IBWindowTemplateEditedContentRect</string>
-					<string>1868.IBPluginDependency</string>
-					<string>1870.IBPluginDependency</string>
-					<string>1871.IBPluginDependency</string>
-					<string>1872.IBPluginDependency</string>
-					<string>1882.IBPluginDependency</string>
-					<string>1884.IBPluginDependency</string>
-					<string>1900.IBPluginDependency</string>
-					<string>1948.IBPluginDependency</string>
-					<string>1949.IBPluginDependency</string>
-					<string>1950.IBPluginDependency</string>
-					<string>1951.IBPluginDependency</string>
-					<string>1954.IBPluginDependency</string>
-					<string>1955.IBPluginDependency</string>
-					<string>196.IBPluginDependency</string>
-					<string>1985.IBPluginDependency</string>
-					<string>1989.IBPluginDependency</string>
-					<string>1990.IBPluginDependency</string>
-					<string>1999.IBPluginDependency</string>
-					<string>2.IBPluginDependency</string>
-					<string>2000.IBPluginDependency</string>
-					<string>2001.IBPluginDependency</string>
-					<string>2002.IBPluginDependency</string>
-					<string>2003.IBPluginDependency</string>
-					<string>2006.IBPluginDependency</string>
-					<string>2008.IBPluginDependency</string>
-					<string>2009.IBPluginDependency</string>
-					<string>2010.IBPluginDependency</string>
-					<string>2011.IBPluginDependency</string>
-					<string>2012.IBPluginDependency</string>
-					<string>2015.IBPluginDependency</string>
-					<string>2016.IBPluginDependency</string>
-					<string>21.IBPluginDependency</string>
-					<string>21.IBWindowTemplateEditedContentRect</string>
-					<string>2295.IBPluginDependency</string>
-					<string>2361.IBPluginDependency</string>
-					<string>2364.IBAttributePlaceholdersKey</string>
-					<string>2364.IBPluginDependency</string>
-					<string>2368.IBPluginDependency</string>
-					<string>240.IBPluginDependency</string>
-					<string>2421.IBPluginDependency</string>
-					<string>2443.IBPluginDependency</string>
-					<string>2444.IBPluginDependency</string>
-					<string>2445.IBPluginDependency</string>
-					<string>2488.IBPluginDependency</string>
-					<string>2494.IBPluginDependency</string>
-					<string>2507.IBPluginDependency</string>
-					<string>2508.IBPluginDependency</string>
-					<string>2513.IBPluginDependency</string>
-					<string>2518.IBPluginDependency</string>
-					<string>2519.IBPluginDependency</string>
-					<string>2670.IBPluginDependency</string>
-					<string>2671.IBPluginDependency</string>
-					<string>2672.IBPluginDependency</string>
-					<string>2673.IBPluginDependency</string>
-					<string>2698.IBPluginDependency</string>
-					<string>2701.IBPluginDependency</string>
-					<string>2701.IBWindowTemplateEditedContentRect</string>
-					<string>2702.IBPluginDependency</string>
-					<string>2703.IBPluginDependency</string>
-					<string>2704.IBPluginDependency</string>
-					<string>2705.IBPluginDependency</string>
-					<string>2706.IBPluginDependency</string>
-					<string>2707.IBPluginDependency</string>
-					<string>2708.IBPluginDependency</string>
-					<string>2716.IBPluginDependency</string>
-					<string>2719.IBPluginDependency</string>
-					<string>2720.IBPluginDependency</string>
-					<string>2833.IBPluginDependency</string>
-					<string>2837.IBPluginDependency</string>
-					<string>2839.IBPluginDependency</string>
-					<string>2840.IBPluginDependency</string>
-					<string>29.IBPluginDependency</string>
-					<string>2957.IBPluginDependency</string>
-					<string>3203.IBPluginDependency</string>
-					<string>3205.IBPluginDependency</string>
-					<string>4179.IBPluginDependency</string>
-					<string>4182.CustomClassName</string>
-					<string>4182.IBPluginDependency</string>
-					<string>4183.IBPluginDependency</string>
-					<string>4186.IBPluginDependency</string>
-					<string>4317.IBPluginDependency</string>
-					<string>4322.IBPluginDependency</string>
-					<string>434.IBPluginDependency</string>
-					<string>434.IBWindowTemplateEditedContentRect</string>
-					<string>435.IBPluginDependency</string>
-					<string>436.IBPluginDependency</string>
-					<string>437.IBPluginDependency</string>
-					<string>438.IBPluginDependency</string>
-					<string>4579.IBAttributePlaceholdersKey</string>
-					<string>4579.IBPluginDependency</string>
-					<string>4846.IBPluginDependency</string>
-					<string>4872.IBPluginDependency</string>
-					<string>4874.IBPluginDependency</string>
-					<string>4875.IBPluginDependency</string>
-					<string>4876.IBPluginDependency</string>
-					<string>4877.IBPluginDependency</string>
-					<string>4878.IBPluginDependency</string>
-					<string>4879.IBPluginDependency</string>
-					<string>4880.IBPluginDependency</string>
-					<string>4892.IBPluginDependency</string>
-					<string>4904.IBPluginDependency</string>
-					<string>4905.IBPluginDependency</string>
-					<string>4906.IBPluginDependency</string>
-					<string>4907.IBPluginDependency</string>
-					<string>4908.IBPluginDependency</string>
-					<string>4910.IBPluginDependency</string>
-					<string>4911.IBPluginDependency</string>
-					<string>4913.IBPluginDependency</string>
-					<string>4914.IBPluginDependency</string>
-					<string>4915.IBPluginDependency</string>
-					<string>4916.IBPluginDependency</string>
-					<string>4917.IBPluginDependency</string>
-					<string>4918.IBPluginDependency</string>
-					<string>4919.IBPluginDependency</string>
-					<string>4920.IBPluginDependency</string>
-					<string>4923.IBPluginDependency</string>
-					<string>4924.IBPluginDependency</string>
-					<string>4925.IBPluginDependency</string>
-					<string>4926.IBPluginDependency</string>
-					<string>4927.IBPluginDependency</string>
-					<string>4928.IBPluginDependency</string>
-					<string>4929.IBPluginDependency</string>
-					<string>4930.IBPluginDependency</string>
-					<string>4932.IBPluginDependency</string>
-					<string>4933.IBPluginDependency</string>
-					<string>4934.IBPluginDependency</string>
-					<string>4935.IBPluginDependency</string>
-					<string>4936.IBPluginDependency</string>
-					<string>4937.IBPluginDependency</string>
-					<string>4938.IBPluginDependency</string>
-					<string>4939.IBPluginDependency</string>
-					<string>4940.IBPluginDependency</string>
-					<string>4941.IBPluginDependency</string>
-					<string>4942.IBPluginDependency</string>
-					<string>4943.IBPluginDependency</string>
-					<string>4944.IBPluginDependency</string>
-					<string>4945.IBPluginDependency</string>
-					<string>4946.IBPluginDependency</string>
-					<string>4947.IBPluginDependency</string>
-					<string>4948.IBPluginDependency</string>
-					<string>4949.IBPluginDependency</string>
-					<string>4950.IBPluginDependency</string>
-					<string>4951.IBPluginDependency</string>
-					<string>4952.IBPluginDependency</string>
-					<string>4953.IBPluginDependency</string>
-					<string>4955.IBPluginDependency</string>
-					<string>4955.IBShouldRemoveOnLegacySave</string>
-					<string>4956.IBPluginDependency</string>
-					<string>4956.IBShouldRemoveOnLegacySave</string>
-					<string>4957.IBPluginDependency</string>
-					<string>4957.IBShouldRemoveOnLegacySave</string>
-					<string>4958.IBPluginDependency</string>
-					<string>4958.IBShouldRemoveOnLegacySave</string>
-					<string>4959.IBPluginDependency</string>
-					<string>4959.IBShouldRemoveOnLegacySave</string>
-					<string>4960.IBPluginDependency</string>
-					<string>4960.IBShouldRemoveOnLegacySave</string>
-					<string>4961.IBPluginDependency</string>
-					<string>4961.IBShouldRemoveOnLegacySave</string>
-					<string>4963.IBPluginDependency</string>
-					<string>4964.IBPluginDependency</string>
-					<string>4967.IBAttributePlaceholdersKey</string>
-					<string>4967.IBPluginDependency</string>
-					<string>4968.IBPluginDependency</string>
-					<string>5130.IBPluginDependency</string>
-					<string>5131.IBPluginDependency</string>
-					<string>5132.IBPluginDependency</string>
-					<string>5133.IBPluginDependency</string>
-					<string>5134.IBPluginDependency</string>
-					<string>5135.IBPluginDependency</string>
-					<string>5153.IBPluginDependency</string>
-					<string>5154.IBPluginDependency</string>
-					<string>5157.IBPluginDependency</string>
-					<string>5167.IBPluginDependency</string>
-					<string>5168.IBPluginDependency</string>
-					<string>5171.IBPluginDependency</string>
-					<string>5172.IBPluginDependency</string>
-					<string>5174.IBPluginDependency</string>
-					<string>5175.IBPluginDependency</string>
-					<string>5177.IBPluginDependency</string>
-					<string>5178.IBPluginDependency</string>
-					<string>5180.IBPluginDependency</string>
-					<string>5181.IBPluginDependency</string>
-					<string>5182.IBPluginDependency</string>
-					<string>5183.IBPluginDependency</string>
-					<string>5184.IBPluginDependency</string>
-					<string>5185.IBPluginDependency</string>
-					<string>5188.IBPluginDependency</string>
-					<string>5192.IBPluginDependency</string>
-					<string>5194.IBPluginDependency</string>
-					<string>5195.IBPluginDependency</string>
-					<string>5196.IBPluginDependency</string>
-					<string>5197.IBPluginDependency</string>
-					<string>5198.IBPluginDependency</string>
-					<string>5199.IBPluginDependency</string>
-					<string>5201.IBPluginDependency</string>
-					<string>5215.IBPluginDependency</string>
-					<string>5217.IBPluginDependency</string>
-					<string>5219.IBPluginDependency</string>
-					<string>5225.IBPluginDependency</string>
-					<string>5226.IBPluginDependency</string>
-					<string>5227.IBPluginDependency</string>
-					<string>5232.IBPluginDependency</string>
-					<string>5233.IBPluginDependency</string>
-					<string>5234.IBPluginDependency</string>
-					<string>5244.IBPluginDependency</string>
-					<string>5246.IBPluginDependency</string>
-					<string>5247.IBPluginDependency</string>
-					<string>5250.IBPluginDependency</string>
-					<string>5252.IBPluginDependency</string>
-					<string>5254.IBPluginDependency</string>
-					<string>5268.IBPluginDependency</string>
-					<string>5269.IBPluginDependency</string>
-					<string>5270.IBPluginDependency</string>
-					<string>5271.IBPluginDependency</string>
-					<string>5272.IBPluginDependency</string>
-					<string>5273.IBPluginDependency</string>
-					<string>5278.IBPluginDependency</string>
-					<string>5279.IBNumberFormatterBehaviorMetadataKey</string>
-					<string>5279.IBNumberFormatterLocalizesFormatMetadataKey</string>
-					<string>5279.IBPluginDependency</string>
-					<string>5280.IBPluginDependency</string>
-					<string>5491.IBPluginDependency</string>
-					<string>5492.IBPluginDependency</string>
-					<string>5493.IBPluginDependency</string>
-					<string>5494.IBPluginDependency</string>
-					<string>5505.IBPluginDependency</string>
-					<string>5506.IBPluginDependency</string>
-					<string>5513.IBPluginDependency</string>
-					<string>5514.IBPluginDependency</string>
-					<string>5515.IBPluginDependency</string>
-					<string>5521.IBPluginDependency</string>
-					<string>5522.IBPluginDependency</string>
-					<string>5523.IBPluginDependency</string>
-					<string>5524.IBPluginDependency</string>
-					<string>5534.IBPluginDependency</string>
-					<string>5535.IBPluginDependency</string>
-					<string>5536.IBPluginDependency</string>
-					<string>5537.IBPluginDependency</string>
-					<string>5549.IBPluginDependency</string>
-					<string>5550.IBPluginDependency</string>
-					<string>5551.IBPluginDependency</string>
-					<string>5552.IBPluginDependency</string>
-					<string>5553.IBPluginDependency</string>
-					<string>5554.IBPluginDependency</string>
-					<string>56.IBPluginDependency</string>
-					<string>5670.IBPluginDependency</string>
-					<string>5673.IBPluginDependency</string>
-					<string>5674.IBPluginDependency</string>
-					<string>5676.IBPluginDependency</string>
-					<string>5680.IBPluginDependency</string>
-					<string>5681.IBPluginDependency</string>
-					<string>5682.IBPluginDependency</string>
-					<string>5683.IBPluginDependency</string>
-					<string>5684.IBPluginDependency</string>
-					<string>5685.IBPluginDependency</string>
-					<string>5686.IBPluginDependency</string>
-					<string>5687.IBPluginDependency</string>
-					<string>5688.IBPluginDependency</string>
-					<string>5689.IBPluginDependency</string>
-					<string>5690.IBPluginDependency</string>
-					<string>5691.IBPluginDependency</string>
-					<string>5692.IBPluginDependency</string>
-					<string>5693.IBPluginDependency</string>
-					<string>5694.IBPluginDependency</string>
-					<string>5695.IBPluginDependency</string>
-					<string>5696.IBPluginDependency</string>
-					<string>57.IBPluginDependency</string>
-					<string>5706.IBPluginDependency</string>
-					<string>5707.IBPluginDependency</string>
-					<string>5712.IBPluginDependency</string>
-					<string>5713.IBPluginDependency</string>
-					<string>5714.IBPluginDependency</string>
-					<string>5715.IBPluginDependency</string>
-					<string>5716.IBPluginDependency</string>
-					<string>5717.IBPluginDependency</string>
-					<string>5718.IBPluginDependency</string>
-					<string>5719.IBPluginDependency</string>
-					<string>5720.IBPluginDependency</string>
-					<string>5721.IBPluginDependency</string>
-					<string>5722.IBPluginDependency</string>
-					<string>5723.IBPluginDependency</string>
-					<string>5724.IBPluginDependency</string>
-					<string>58.IBPluginDependency</string>
-					<string>5808.IBPluginDependency</string>
-					<string>5809.IBPluginDependency</string>
-					<string>5810.IBPluginDependency</string>
-					<string>5811.IBPluginDependency</string>
-					<string>5820.IBPluginDependency</string>
-					<string>5821.IBPluginDependency</string>
-					<string>5822.IBPluginDependency</string>
-					<string>5823.IBPluginDependency</string>
-					<string>5871.IBPluginDependency</string>
-					<string>5872.IBPluginDependency</string>
-					<string>5873.IBPluginDependency</string>
-					<string>5874.IBPluginDependency</string>
-					<string>5879.IBPluginDependency</string>
-					<string>5897.IBPluginDependency</string>
-					<string>5904.IBPluginDependency</string>
-					<string>5905.IBPluginDependency</string>
-					<string>5906.IBPluginDependency</string>
-					<string>5907.IBPluginDependency</string>
-					<string>5908.IBPluginDependency</string>
-					<string>5909.IBPluginDependency</string>
-					<string>5910.IBPluginDependency</string>
-					<string>5911.IBPluginDependency</string>
-					<string>5912.IBPluginDependency</string>
-					<string>5913.IBPluginDependency</string>
-					<string>5914.IBPluginDependency</string>
-					<string>5915.IBPluginDependency</string>
-					<string>5916.IBPluginDependency</string>
-					<string>5917.IBPluginDependency</string>
-					<string>5918.IBPluginDependency</string>
-					<string>5919.IBPluginDependency</string>
-					<string>5920.IBPluginDependency</string>
-					<string>5921.IBPluginDependency</string>
-					<string>5922.IBPluginDependency</string>
-					<string>5923.IBPluginDependency</string>
-					<string>5924.IBPluginDependency</string>
-					<string>5932.IBPluginDependency</string>
-					<string>5933.IBPluginDependency</string>
-					<string>5934.IBPluginDependency</string>
-					<string>5937.IBPluginDependency</string>
-					<string>5938.IBPluginDependency</string>
-					<string>5939.IBPluginDependency</string>
-					<string>5940.IBPluginDependency</string>
-					<string>5941.IBPluginDependency</string>
-					<string>5942.IBPluginDependency</string>
-					<string>5943.IBPluginDependency</string>
-					<string>5944.IBPluginDependency</string>
-					<string>5945.IBPluginDependency</string>
-					<string>5946.IBPluginDependency</string>
-					<string>5947.IBPluginDependency</string>
-					<string>5948.IBPluginDependency</string>
-					<string>5949.IBPluginDependency</string>
-					<string>5950.IBPluginDependency</string>
-					<string>5951.IBPluginDependency</string>
-					<string>5952.IBPluginDependency</string>
-					<string>5953.IBPluginDependency</string>
-					<string>5954.IBPluginDependency</string>
-					<string>5955.IBPluginDependency</string>
-					<string>5956.IBPluginDependency</string>
-					<string>5957.IBPluginDependency</string>
-					<string>5958.IBPluginDependency</string>
-					<string>5959.IBPluginDependency</string>
-					<string>5960.IBPluginDependency</string>
-					<string>5961.IBPluginDependency</string>
-					<string>5962.IBPluginDependency</string>
-					<string>5963.IBPluginDependency</string>
-					<string>5964.IBPluginDependency</string>
-					<string>5967.IBPluginDependency</string>
-					<string>5968.IBPluginDependency</string>
-					<string>5971.IBPluginDependency</string>
-					<string>5972.IBPluginDependency</string>
-					<string>5981.IBPluginDependency</string>
-					<string>5982.IBPluginDependency</string>
-					<string>5992.IBPluginDependency</string>
-					<string>5993.IBPluginDependency</string>
-					<string>5996.IBPluginDependency</string>
-					<string>5997.IBPluginDependency</string>
-					<string>970.IBPluginDependency</string>
-					<string>971.IBPluginDependency</string>
-					<string>973.IBPluginDependency</string>
-				</object>
-				<object class="NSArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<string key="NS.key.0">InitialTabViewItem</string>
-						<object class="IBInitialTabViewItemAttribute" key="NS.object.0">
-							<string key="name">InitialTabViewItem</string>
-							<reference key="object" ref="712502892"/>
-							<reference key="initialTabViewItem" ref="107038816"/>
-						</object>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{329, 373}, {338, 318}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{132, 289}, {959, 558}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<string key="NS.key.0">ToolTip</string>
-						<object class="IBToolTipAttribute" key="NS.object.0">
-							<string key="name">ToolTip</string>
-							<reference key="object" ref="553453876"/>
-							<string key="toolTip">Caution: This option will likely break device compatiblity with all but the AppleTV Take 2. Checking this box enables a 64 bit mp4 file which can be over 4 GB.</string>
-						</object>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{72, 712}, {392, 144}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>HBPresetsOutlineView</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{57, 766}, {300, 233}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<string key="NS.key.0">ToolTip</string>
-						<object class="IBToolTipAttribute" key="NS.object.0">
-							<string key="name">ToolTip</string>
-							<reference key="object" ref="581806074"/>
-							<string key="toolTip">This rearranges the header of the MP4 file to optimize it for streaming across the web.</string>
-						</object>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<string key="NS.key.0">ToolTip</string>
-						<object class="IBToolTipAttribute" key="NS.object.0">
-							<string key="name">ToolTip</string>
-							<reference key="object" ref="921877174"/>
-							<string key="toolTip">This option adds an atom to the MP4 file which allows older iPods (5th Generation classic style) to play the file.</string>
-						</object>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1041"/>
-					<boolean value="NO"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">6004</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">HBAudioController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/HBAudioController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">HBController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>Cancel:</string>
-							<string>Pause:</string>
-							<string>Rip:</string>
-							<string>addAllAudioTracks:</string>
-							<string>addAllTitlesToQueue:</string>
-							<string>addFactoryPresets:</string>
-							<string>addPresetPicDropdownChanged:</string>
-							<string>addToQueue:</string>
-							<string>addUserPreset:</string>
-							<string>applyQueueSettingsToMainWindow:</string>
-							<string>autoSetM4vExtension:</string>
-							<string>browseExportPresetFile:</string>
-							<string>browseFile:</string>
-							<string>browseForChapterFile:</string>
-							<string>browseForChapterFileSave:</string>
-							<string>browseImportPresetFile:</string>
-							<string>browseImportSrtFile:</string>
-							<string>browseSources:</string>
-							<string>calculateBitrate:</string>
-							<string>calculatePictureSizing:</string>
-							<string>cancelScanning:</string>
-							<string>chapterPopUpChanged:</string>
-							<string>closeAddPresetPanel:</string>
-							<string>closeSourceTitleScanPanel:</string>
-							<string>customSettingUsed:</string>
-							<string>deleteFactoryPresets:</string>
-							<string>deletePreset:</string>
-							<string>encodeStartStopPopUpChanged:</string>
-							<string>formatPopUpChanged:</string>
-							<string>getDefaultPresets:</string>
-							<string>insertPreset:</string>
-							<string>openForums:</string>
-							<string>openHomepage:</string>
-							<string>openMainWindow:</string>
-							<string>openUserGuide:</string>
-							<string>qualitySliderChanged:</string>
-							<string>revertPictureSizeToMax:</string>
-							<string>selectDefaultPreset:</string>
-							<string>selectPreset:</string>
-							<string>setDefaultPreset:</string>
-							<string>showAboutPanel:</string>
-							<string>showAddPresetPanel:</string>
-							<string>showDebugOutputPanel:</string>
-							<string>showNewScan:</string>
-							<string>showPicturePanel:</string>
-							<string>showPreferencesWindow:</string>
-							<string>showPreviewWindow:</string>
-							<string>showQueueWindow:</string>
-							<string>showSourceTitleScanPanel:</string>
-							<string>startEndFrameValueChanged:</string>
-							<string>startEndSecValueChanged:</string>
-							<string>titlePopUpChanged:</string>
-							<string>twoPassCheckboxChanged:</string>
-							<string>updateX264Widgets:</string>
-							<string>videoEncoderPopUpChanged:</string>
-							<string>videoFrameRateChanged:</string>
-							<string>videoMatrixChanged:</string>
-							<string>x264PresetsChangedDisplayExpandedOptions:</string>
-							<string>x264PresetsSliderChanged:</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>Cancel:</string>
-							<string>Pause:</string>
-							<string>Rip:</string>
-							<string>addAllAudioTracks:</string>
-							<string>addAllTitlesToQueue:</string>
-							<string>addFactoryPresets:</string>
-							<string>addPresetPicDropdownChanged:</string>
-							<string>addToQueue:</string>
-							<string>addUserPreset:</string>
-							<string>applyQueueSettingsToMainWindow:</string>
-							<string>autoSetM4vExtension:</string>
-							<string>browseExportPresetFile:</string>
-							<string>browseFile:</string>
-							<string>browseForChapterFile:</string>
-							<string>browseForChapterFileSave:</string>
-							<string>browseImportPresetFile:</string>
-							<string>browseImportSrtFile:</string>
-							<string>browseSources:</string>
-							<string>calculateBitrate:</string>
-							<string>calculatePictureSizing:</string>
-							<string>cancelScanning:</string>
-							<string>chapterPopUpChanged:</string>
-							<string>closeAddPresetPanel:</string>
-							<string>closeSourceTitleScanPanel:</string>
-							<string>customSettingUsed:</string>
-							<string>deleteFactoryPresets:</string>
-							<string>deletePreset:</string>
-							<string>encodeStartStopPopUpChanged:</string>
-							<string>formatPopUpChanged:</string>
-							<string>getDefaultPresets:</string>
-							<string>insertPreset:</string>
-							<string>openForums:</string>
-							<string>openHomepage:</string>
-							<string>openMainWindow:</string>
-							<string>openUserGuide:</string>
-							<string>qualitySliderChanged:</string>
-							<string>revertPictureSizeToMax:</string>
-							<string>selectDefaultPreset:</string>
-							<string>selectPreset:</string>
-							<string>setDefaultPreset:</string>
-							<string>showAboutPanel:</string>
-							<string>showAddPresetPanel:</string>
-							<string>showDebugOutputPanel:</string>
-							<string>showNewScan:</string>
-							<string>showPicturePanel:</string>
-							<string>showPreferencesWindow:</string>
-							<string>showPreviewWindow:</string>
-							<string>showQueueWindow:</string>
-							<string>showSourceTitleScanPanel:</string>
-							<string>startEndFrameValueChanged:</string>
-							<string>startEndSecValueChanged:</string>
-							<string>titlePopUpChanged:</string>
-							<string>twoPassCheckboxChanged:</string>
-							<string>updateX264Widgets:</string>
-							<string>videoEncoderPopUpChanged:</string>
-							<string>videoFrameRateChanged:</string>
-							<string>videoMatrixChanged:</string>
-							<string>x264PresetsChangedDisplayExpandedOptions:</string>
-							<string>x264PresetsSliderChanged:</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">Cancel:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">Pause:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">Rip:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">addAllAudioTracks:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">addAllTitlesToQueue:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">addFactoryPresets:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">addPresetPicDropdownChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">addToQueue:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">addUserPreset:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">applyQueueSettingsToMainWindow:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">autoSetM4vExtension:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">browseExportPresetFile:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">browseFile:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">browseForChapterFile:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">browseForChapterFileSave:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">browseImportPresetFile:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">browseImportSrtFile:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">browseSources:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">calculateBitrate:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">calculatePictureSizing:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">cancelScanning:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">chapterPopUpChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">closeAddPresetPanel:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">closeSourceTitleScanPanel:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">customSettingUsed:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">deleteFactoryPresets:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">deletePreset:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">encodeStartStopPopUpChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">formatPopUpChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">getDefaultPresets:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">insertPreset:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">openForums:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">openHomepage:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">openMainWindow:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">openUserGuide:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">qualitySliderChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">revertPictureSizeToMax:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">selectDefaultPreset:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">selectPreset:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">setDefaultPreset:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showAboutPanel:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showAddPresetPanel:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showDebugOutputPanel:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showNewScan:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showPicturePanel:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showPreferencesWindow:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showPreviewWindow:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showQueueWindow:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showSourceTitleScanPanel:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">startEndFrameValueChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">startEndSecValueChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">titlePopUpChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">twoPassCheckboxChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">updateX264Widgets:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">videoEncoderPopUpChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">videoFrameRateChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">videoMatrixChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">x264PresetsChangedDisplayExpandedOptions:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">x264PresetsSliderChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>fAddPresetPanel</string>
-							<string>fAdvancedView</string>
-							<string>fAudioAllowAACPassCheck</string>
-							<string>fAudioAllowAC3PassCheck</string>
-							<string>fAudioAllowDTSHDPassCheck</string>
-							<string>fAudioAllowDTSPassCheck</string>
-							<string>fAudioAllowMP3PassCheck</string>
-							<string>fAudioAutoPassthruBox</string>
-							<string>fAudioDelegate</string>
-							<string>fAudioFallbackPopUp</string>
-							<string>fBrowseSrtFileButton</string>
-							<string>fChapterTable</string>
-							<string>fChapterTableNameColumn</string>
-							<string>fCreateChapterMarkers</string>
-							<string>fDisplayX264PresetsAdditonalOptionsLabel</string>
-							<string>fDisplayX264PresetsAdditonalOptionsTextField</string>
-							<string>fDisplayX264PresetsUnparseTextField</string>
-							<string>fDstBrowseButton</string>
-							<string>fDstFile1Field</string>
-							<string>fDstFile2Field</string>
-							<string>fDstFormatField</string>
-							<string>fDstFormatPopUp</string>
-							<string>fDstMp4HttpOptFileCheck</string>
-							<string>fDstMp4LargeFileCheck</string>
-							<string>fDstMp4iPodFileCheck</string>
-							<string>fEncodeStartStopPopUp</string>
-							<string>fFramerateCfrCell</string>
-							<string>fFramerateMatrix</string>
-							<string>fFramerateVfrPfrCell</string>
-							<string>fLoadChaptersButton</string>
-							<string>fPictureSettingsField</string>
-							<string>fPresetDrawer</string>
-							<string>fPresetNewDesc</string>
-							<string>fPresetNewFolderCheck</string>
-							<string>fPresetNewName</string>
-							<string>fPresetNewPicFiltersCheck</string>
-							<string>fPresetNewPicHeight</string>
-							<string>fPresetNewPicSettingsPopUp</string>
-							<string>fPresetNewPicWidth</string>
-							<string>fPresetNewPicWidthHeightBox</string>
-							<string>fPresetSelectedDisplay</string>
-							<string>fPresetsActionButton</string>
-							<string>fPresetsAdd</string>
-							<string>fPresetsDelete</string>
-							<string>fPresetsOutlineView</string>
-							<string>fQueueStatus</string>
-							<string>fRipIndicator</string>
-							<string>fSaveChaptersButton</string>
-							<string>fScanHorizontalLine</string>
-							<string>fScanIndicator</string>
-							<string>fScanSrcTitleCancelButton</string>
-							<string>fScanSrcTitleNumField</string>
-							<string>fScanSrcTitleOpenButton</string>
-							<string>fScanSrcTitlePanel</string>
-							<string>fScanSrcTitlePathField</string>
-							<string>fSrcAngleLabel</string>
-							<string>fSrcAnglePopUp</string>
-							<string>fSrcChapterEndPopUp</string>
-							<string>fSrcChapterField</string>
-							<string>fSrcChapterStartPopUp</string>
-							<string>fSrcChapterToField</string>
-							<string>fSrcDVD2Field</string>
-							<string>fSrcDsplyNameTitleScan</string>
-							<string>fSrcDuration1Field</string>
-							<string>fSrcDuration2Field</string>
-							<string>fSrcFrameEndEncodingField</string>
-							<string>fSrcFrameStartEncodingField</string>
-							<string>fSrcTimeEndEncodingField</string>
-							<string>fSrcTimeStartEncodingField</string>
-							<string>fSrcTitleField</string>
-							<string>fSrcTitlePopUp</string>
-							<string>fStatusField</string>
-							<string>fSubField</string>
-							<string>fSubForcedCheck</string>
-							<string>fSubPopUp</string>
-							<string>fSubtitlesTable</string>
-							<string>fVidBitrateCell</string>
-							<string>fVidBitrateField</string>
-							<string>fVidConstantCell</string>
-							<string>fVidEncoderField</string>
-							<string>fVidEncoderPopUp</string>
-							<string>fVidQualityField</string>
-							<string>fVidQualityMatrix</string>
-							<string>fVidQualityRFField</string>
-							<string>fVidQualityRFLabel</string>
-							<string>fVidQualitySlider</string>
-							<string>fVidRateField</string>
-							<string>fVidRatePopUp</string>
-							<string>fVidTurboPassCheck</string>
-							<string>fVidTwoPassCheck</string>
-							<string>fPictureFiltersField</string>
-							<string>fWindow</string>
-							<string>fX264FastDecodeCheck</string>
-							<string>fX264LevelPopUp</string>
-							<string>fX264LevelPopUpLabel</string>
-							<string>fX264PresetSelectedTextField</string>
-							<string>fX264PresetSliderLabel</string>
-							<string>fX264PresetsBox</string>
-							<string>fX264PresetsSlider</string>
-							<string>fX264ProfilePopUp</string>
-							<string>fX264ProfilePopUpLabel</string>
-							<string>fX264TunePopUp</string>
-							<string>fX264TunePopUpLabel</string>
-							<string>fX264UseAdvancedOptionsCheck</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSPanel</string>
-							<string>NSBox</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSBox</string>
-							<string>HBAudioController</string>
-							<string>NSPopUpButton</string>
-							<string>NSButton</string>
-							<string>NSTableView</string>
-							<string>NSTableColumn</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSPopUpButton</string>
-							<string>NSButtonCell</string>
-							<string>NSMatrix</string>
-							<string>NSButtonCell</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSDrawer</string>
-							<string>NSTextField</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSBox</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>HBPresetsOutlineView</string>
-							<string>NSTextField</string>
-							<string>NSProgressIndicator</string>
-							<string>NSButton</string>
-							<string>NSBox</string>
-							<string>NSProgressIndicator</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSButton</string>
-							<string>NSPanel</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSButton</string>
-							<string>NSPopUpButton</string>
-							<string>NSTableView</string>
-							<string>NSButtonCell</string>
-							<string>NSTextField</string>
-							<string>NSButtonCell</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSMatrix</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSSlider</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSWindow</string>
-							<string>NSButton</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSBox</string>
-							<string>NSSlider</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSButton</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>fAddPresetPanel</string>
-							<string>fAdvancedView</string>
-							<string>fAudioAllowAACPassCheck</string>
-							<string>fAudioAllowAC3PassCheck</string>
-							<string>fAudioAllowDTSHDPassCheck</string>
-							<string>fAudioAllowDTSPassCheck</string>
-							<string>fAudioAllowMP3PassCheck</string>
-							<string>fAudioAutoPassthruBox</string>
-							<string>fAudioDelegate</string>
-							<string>fAudioFallbackPopUp</string>
-							<string>fBrowseSrtFileButton</string>
-							<string>fChapterTable</string>
-							<string>fChapterTableNameColumn</string>
-							<string>fCreateChapterMarkers</string>
-							<string>fDisplayX264PresetsAdditonalOptionsLabel</string>
-							<string>fDisplayX264PresetsAdditonalOptionsTextField</string>
-							<string>fDisplayX264PresetsUnparseTextField</string>
-							<string>fDstBrowseButton</string>
-							<string>fDstFile1Field</string>
-							<string>fDstFile2Field</string>
-							<string>fDstFormatField</string>
-							<string>fDstFormatPopUp</string>
-							<string>fDstMp4HttpOptFileCheck</string>
-							<string>fDstMp4LargeFileCheck</string>
-							<string>fDstMp4iPodFileCheck</string>
-							<string>fEncodeStartStopPopUp</string>
-							<string>fFramerateCfrCell</string>
-							<string>fFramerateMatrix</string>
-							<string>fFramerateVfrPfrCell</string>
-							<string>fLoadChaptersButton</string>
-							<string>fPictureSettingsField</string>
-							<string>fPresetDrawer</string>
-							<string>fPresetNewDesc</string>
-							<string>fPresetNewFolderCheck</string>
-							<string>fPresetNewName</string>
-							<string>fPresetNewPicFiltersCheck</string>
-							<string>fPresetNewPicHeight</string>
-							<string>fPresetNewPicSettingsPopUp</string>
-							<string>fPresetNewPicWidth</string>
-							<string>fPresetNewPicWidthHeightBox</string>
-							<string>fPresetSelectedDisplay</string>
-							<string>fPresetsActionButton</string>
-							<string>fPresetsAdd</string>
-							<string>fPresetsDelete</string>
-							<string>fPresetsOutlineView</string>
-							<string>fQueueStatus</string>
-							<string>fRipIndicator</string>
-							<string>fSaveChaptersButton</string>
-							<string>fScanHorizontalLine</string>
-							<string>fScanIndicator</string>
-							<string>fScanSrcTitleCancelButton</string>
-							<string>fScanSrcTitleNumField</string>
-							<string>fScanSrcTitleOpenButton</string>
-							<string>fScanSrcTitlePanel</string>
-							<string>fScanSrcTitlePathField</string>
-							<string>fSrcAngleLabel</string>
-							<string>fSrcAnglePopUp</string>
-							<string>fSrcChapterEndPopUp</string>
-							<string>fSrcChapterField</string>
-							<string>fSrcChapterStartPopUp</string>
-							<string>fSrcChapterToField</string>
-							<string>fSrcDVD2Field</string>
-							<string>fSrcDsplyNameTitleScan</string>
-							<string>fSrcDuration1Field</string>
-							<string>fSrcDuration2Field</string>
-							<string>fSrcFrameEndEncodingField</string>
-							<string>fSrcFrameStartEncodingField</string>
-							<string>fSrcTimeEndEncodingField</string>
-							<string>fSrcTimeStartEncodingField</string>
-							<string>fSrcTitleField</string>
-							<string>fSrcTitlePopUp</string>
-							<string>fStatusField</string>
-							<string>fSubField</string>
-							<string>fSubForcedCheck</string>
-							<string>fSubPopUp</string>
-							<string>fSubtitlesTable</string>
-							<string>fVidBitrateCell</string>
-							<string>fVidBitrateField</string>
-							<string>fVidConstantCell</string>
-							<string>fVidEncoderField</string>
-							<string>fVidEncoderPopUp</string>
-							<string>fVidQualityField</string>
-							<string>fVidQualityMatrix</string>
-							<string>fVidQualityRFField</string>
-							<string>fVidQualityRFLabel</string>
-							<string>fVidQualitySlider</string>
-							<string>fVidRateField</string>
-							<string>fVidRatePopUp</string>
-							<string>fVidTurboPassCheck</string>
-							<string>fVidTwoPassCheck</string>
-							<string>fPictureFiltersField</string>
-							<string>fWindow</string>
-							<string>fX264FastDecodeCheck</string>
-							<string>fX264LevelPopUp</string>
-							<string>fX264LevelPopUpLabel</string>
-							<string>fX264PresetSelectedTextField</string>
-							<string>fX264PresetSliderLabel</string>
-							<string>fX264PresetsBox</string>
-							<string>fX264PresetsSlider</string>
-							<string>fX264ProfilePopUp</string>
-							<string>fX264ProfilePopUpLabel</string>
-							<string>fX264TunePopUp</string>
-							<string>fX264TunePopUpLabel</string>
-							<string>fX264UseAdvancedOptionsCheck</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fAddPresetPanel</string>
-								<string key="candidateClassName">NSPanel</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fAdvancedView</string>
-								<string key="candidateClassName">NSBox</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fAudioAllowAACPassCheck</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fAudioAllowAC3PassCheck</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fAudioAllowDTSHDPassCheck</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fAudioAllowDTSPassCheck</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fAudioAllowMP3PassCheck</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fAudioAutoPassthruBox</string>
-								<string key="candidateClassName">NSBox</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fAudioDelegate</string>
-								<string key="candidateClassName">HBAudioController</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fAudioFallbackPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fBrowseSrtFileButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fChapterTable</string>
-								<string key="candidateClassName">NSTableView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fChapterTableNameColumn</string>
-								<string key="candidateClassName">NSTableColumn</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fCreateChapterMarkers</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fDisplayX264PresetsAdditonalOptionsLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fDisplayX264PresetsAdditonalOptionsTextField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fDisplayX264PresetsUnparseTextField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fDstBrowseButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fDstFile1Field</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fDstFile2Field</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fDstFormatField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fDstFormatPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fDstMp4HttpOptFileCheck</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fDstMp4LargeFileCheck</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fDstMp4iPodFileCheck</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fEncodeStartStopPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fFramerateCfrCell</string>
-								<string key="candidateClassName">NSButtonCell</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fFramerateMatrix</string>
-								<string key="candidateClassName">NSMatrix</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fFramerateVfrPfrCell</string>
-								<string key="candidateClassName">NSButtonCell</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fLoadChaptersButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPictureSettingsField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPresetDrawer</string>
-								<string key="candidateClassName">NSDrawer</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPresetNewDesc</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPresetNewFolderCheck</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPresetNewName</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPresetNewPicFiltersCheck</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPresetNewPicHeight</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPresetNewPicSettingsPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPresetNewPicWidth</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPresetNewPicWidthHeightBox</string>
-								<string key="candidateClassName">NSBox</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPresetSelectedDisplay</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPresetsActionButton</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPresetsAdd</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPresetsDelete</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPresetsOutlineView</string>
-								<string key="candidateClassName">HBPresetsOutlineView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fQueueStatus</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fRipIndicator</string>
-								<string key="candidateClassName">NSProgressIndicator</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSaveChaptersButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fScanHorizontalLine</string>
-								<string key="candidateClassName">NSBox</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fScanIndicator</string>
-								<string key="candidateClassName">NSProgressIndicator</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fScanSrcTitleCancelButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fScanSrcTitleNumField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fScanSrcTitleOpenButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fScanSrcTitlePanel</string>
-								<string key="candidateClassName">NSPanel</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fScanSrcTitlePathField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSrcAngleLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSrcAnglePopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSrcChapterEndPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSrcChapterField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSrcChapterStartPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSrcChapterToField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSrcDVD2Field</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSrcDsplyNameTitleScan</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSrcDuration1Field</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSrcDuration2Field</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSrcFrameEndEncodingField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSrcFrameStartEncodingField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSrcTimeEndEncodingField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSrcTimeStartEncodingField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSrcTitleField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSrcTitlePopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fStatusField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSubField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSubForcedCheck</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSubPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSubtitlesTable</string>
-								<string key="candidateClassName">NSTableView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fVidBitrateCell</string>
-								<string key="candidateClassName">NSButtonCell</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fVidBitrateField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fVidConstantCell</string>
-								<string key="candidateClassName">NSButtonCell</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fVidEncoderField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fVidEncoderPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fVidQualityField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fVidQualityMatrix</string>
-								<string key="candidateClassName">NSMatrix</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fVidQualityRFField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fVidQualityRFLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fVidQualitySlider</string>
-								<string key="candidateClassName">NSSlider</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fVidRateField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fVidRatePopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fVidTurboPassCheck</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fVidTwoPassCheck</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPictureFiltersField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fWindow</string>
-								<string key="candidateClassName">NSWindow</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264FastDecodeCheck</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264LevelPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264LevelPopUpLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264PresetSelectedTextField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264PresetSliderLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264PresetsBox</string>
-								<string key="candidateClassName">NSBox</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264PresetsSlider</string>
-								<string key="candidateClassName">NSSlider</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264ProfilePopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264ProfilePopUpLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264TunePopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264TunePopUpLabel</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fX264UseAdvancedOptionsCheck</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/HBController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">HBPresetsOutlineView</string>
-					<string key="superclassName">NSOutlineView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/HBPresetsOutlineView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">SUUpdater</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">checkForUpdates:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">checkForUpdates:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">checkForUpdates:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">delegate</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">delegate</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">delegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/SUUpdater.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>HandBrake.icns</string>
-				<string>NSActionTemplate</string>
-				<string>NSAddTemplate</string>
-				<string>NSMenuCheckmark</string>
-				<string>NSMenuMixedState</string>
-				<string>NSRemoveTemplate</string>
-				<string>NSSwitch</string>
-			</object>
-			<object class="NSArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{128, 128}</string>
-				<string>{15, 15}</string>
-				<string>{8, 8}</string>
-				<string>{11, 11}</string>
-				<string>{10, 3}</string>
-				<string>{8, 8}</string>
-				<string>{15, 15}</string>
-			</object>
-		</object>
-	</data>
-</archive>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="14B23" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <deployment version="1060" identifier="macosx"/>
+ <development version="5100" identifier="xcode"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6250"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
+ <connections>
+ <outlet property="delegate" destination="240" id="247"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+ <window title="HandBrake" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="HBMainWindow" animationBehavior="default" id="21" userLabel="MainWindow">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" unifiedTitleAndToolbar="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="41" y="572" width="946" height="568"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1178"/>
+ <value key="minSize" type="size" width="946" height="568"/>
+ <value key="maxSize" type="size" width="1600" height="568"/>
+ <view key="contentView" id="2">
+ <rect key="frame" x="0.0" y="0.0" width="946" height="568"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" id="1123">
+ <rect key="frame" x="18" y="2" width="711" height="28"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" id="4846">
+ 
+ <string key="title">DO NOT TRANSLATE THIS NIB FILE,
+</string>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <progressIndicator verticalHuggingPriority="750" maxValue="100" bezeled="NO" style="bar" id="1373">
+ <rect key="frame" x="18" y="-26" width="910" height="20"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ </progressIndicator>
+ <tabView controlSize="small" initialItem="1477" id="1474">
+ <rect key="frame" x="13" y="27" width="920" height="357"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <tabViewItems>
+ <tabViewItem label="Video" identifier="1" id="1477">
+ <view key="view" id="1478">
+ <rect key="frame" x="10" y="29" width="900" height="315"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ </view>
+ </tabViewItem>
+ <tabViewItem label="Audio" identifier="2" id="1475">
+ <view key="view" id="1476">
+ <rect key="frame" x="10" y="25" width="900" height="319"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ </view>
+ </tabViewItem>
+ <tabViewItem label="Subtitles" identifier="3" id="5194">
+ <view key="view" id="5195">
+ <rect key="frame" x="10" y="25" width="900" height="319"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ </view>
+ </tabViewItem>
+ <tabViewItem label="Advanced" identifier="5" id="2015">
+ <view key="view" id="2016">
+ <rect key="frame" x="10" y="25" width="900" height="319"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ </view>
+ </tabViewItem>
+ <tabViewItem label="Chapters" identifier="4" id="1989">
+ <view key="view" id="1990">
+ <rect key="frame" x="10" y="25" width="900" height="319"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ </view>
+ </tabViewItem>
+ </tabViewItems>
+ </tabView>
+ <textField verticalHuggingPriority="750" id="1538">
+ <rect key="frame" x="20" y="540" width="45" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Source:" id="4905">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="1540">
+ <rect key="frame" x="17" y="511" width="35" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Title:" id="4907">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="1541">
+ <rect key="frame" x="53" y="506" width="312" height="22"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="1543" id="4908">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="1542">
+ <items>
+ <menuItem state="on" id="1543"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <accessibility description="Title"/>
+ <connections>
+ <action selector="titlePopUpChanged:" target="240" id="1567"/>
+ </connections>
+ </popUpButton>
+ <popUpButton verticalHuggingPriority="750" id="5513">
+ <rect key="frame" x="492" y="506" width="84" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="5514">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="5515"/>
+ </popUpButtonCell>
+ <connections>
+ <action selector="encodeStartStopPopUpChanged:" target="240" id="5520"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="5180">
+ <rect key="frame" x="390" y="511" width="46" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Angle:" id="5185">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="5676" name="hidden" keyPath="values.UseDvdNav" id="GhV-lP-BWw">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="5181">
+ <rect key="frame" x="436" y="506" width="44" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="5184" id="5182">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="5183">
+ <items>
+ <menuItem state="on" id="5184"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <accessibility description="Angle"/>
+ <connections>
+ <binding destination="5676" name="hidden" keyPath="values.UseDvdNav" id="8xq-AL-yDc">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="1552">
+ <rect key="frame" x="5" y="454" width="47" height="17"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="File:" id="4913">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="1553">
+ <rect key="frame" x="764" y="511" width="65" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Duration:" id="4914">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="1554">
+ <rect key="frame" x="829" y="511" width="99" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="00:00:00" id="4915">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" red="0.76630436999999996" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="1555">
+ <rect key="frame" x="20" y="486" width="70" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="Destination" id="4916">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="1557">
+ <rect key="frame" x="76" y="398" width="177" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="1559" id="4918">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="1558">
+ <items>
+ <menuItem state="on" id="1559"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <accessibility description="Format"/>
+ <connections>
+ <action selector="formatPopUpChanged:" target="240" id="1614"/>
+ </connections>
+ </popUpButton>
+ <button verticalHuggingPriority="750" id="1562">
+ <rect key="frame" x="841" y="450" width="90" height="28"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="push" title="Browse…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="4920">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="browseFile:" target="240" id="1579"/>
+ </connections>
+ </button>
+ <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="1623">
+ <rect key="frame" x="98" y="490" width="828" height="5"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ 
+ </box>
+ <textField verticalHuggingPriority="750" id="1539">
+ <rect key="frame" x="70" y="540" width="310" height="14.000000042040593"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinY="YES" heightSizable="YES"/>
+ <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingMiddle" selectable="YES" sendsActionOnEndEditing="YES" alignment="left" id="4906">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="1561">
+ <rect key="frame" x="56" y="455" width="782" height="19"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="4919">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField hidden="YES" verticalHuggingPriority="750" id="5491">
+ <rect key="frame" x="581" y="492" width="54" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" drawsBackground="YES" id="5492">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <action selector="startEndSecValueChanged:" target="240" id="5528"/>
+ </connections>
+ </textField>
+ <textField hidden="YES" verticalHuggingPriority="750" id="5521">
+ <rect key="frame" x="638" y="492" width="54" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" drawsBackground="YES" id="5522">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <action selector="startEndFrameValueChanged:" target="240" id="5530"/>
+ </connections>
+ </textField>
+ <textField hidden="YES" verticalHuggingPriority="750" id="5493">
+ <rect key="frame" x="696" y="492" width="54" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="5494">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <action selector="startEndSecValueChanged:" target="240" id="5529"/>
+ </connections>
+ </textField>
+ <textField hidden="YES" verticalHuggingPriority="750" id="5523">
+ <rect key="frame" x="758" y="492" width="54" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="5524">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <action selector="startEndFrameValueChanged:" target="240" id="5531"/>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="750" id="1627">
+ <rect key="frame" x="20" y="430" width="97" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="Output Settings:" id="4923">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="1628">
+ <rect key="frame" x="292" y="434" width="634" height="5"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ 
+ </box>
+ <textField verticalHuggingPriority="750" id="1882">
+ <rect key="frame" x="121" y="430" width="165" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="4924">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="2006">
+ <rect key="frame" x="711" y="15" width="218" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" id="4925">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="1556">
+ <rect key="frame" x="21" y="403" width="53" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Format:" id="4917">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="3205">
+ <rect key="frame" x="386" y="543" width="540" height="5"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ 
+ </box>
+ <progressIndicator hidden="YES" verticalHuggingPriority="750" maxValue="100" bezeled="NO" controlSize="small" style="bar" id="3203">
+ <rect key="frame" x="386" y="542.0000000420406" width="541" height="12"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ </progressIndicator>
+ <button toolTip="This rearranges the header of the MP4 file to optimize it for streaming across the web." id="4579">
+ <rect key="frame" x="269" y="401" width="102" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="check" title="Web optimized" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="4927">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="customSettingUsed:" target="240" id="4971"/>
+ </connections>
+ </button>
+ <button toolTip="This option adds an atom to the MP4 file which allows older iPods (5th Generation classic style) to play the file." id="4967">
+ <rect key="frame" x="388" y="401" width="108" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="check" title="iPod 5G support" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="4968">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="customSettingUsed:" target="240" id="4970"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" id="5505">
+ <rect key="frame" x="637" y="510" width="56" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="through" id="5506">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="1545">
+ <rect key="frame" x="578" y="506" width="60" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="1547" id="4910">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="1546">
+ <items>
+ <menuItem state="on" id="1547"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <accessibility description="Start Chapter"/>
+ <connections>
+ <action selector="chapterPopUpChanged:" target="240" id="1615"/>
+ </connections>
+ </popUpButton>
+ <popUpButton verticalHuggingPriority="750" id="1548">
+ <rect key="frame" x="693" y="506" width="60" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="1550" id="4911">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="1549">
+ <items>
+ <menuItem state="on" id="1550"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <accessibility description="End Chapter"/>
+ <connections>
+ <action selector="chapterPopUpChanged:" target="240" id="1616"/>
+ </connections>
+ </popUpButton>
+ </subviews>
+ </view>
+ <connections>
+ <outlet property="delegate" destination="240" id="433"/>
+ </connections>
+ </window>
+ <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
+ <items>
+ <menuItem title="HandBrake" id="56">
+ <menu key="submenu" title="HandBrake" systemMenu="apple" id="57">
+ <items>
+ <menuItem title="About HandBrake" id="58">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="orderFrontStandardAboutPanel:" target="-2" id="W6s-9y-dwJ"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Check for Updates…" id="4964">
+ <connections>
+ <action selector="checkForUpdates:" target="4963" id="4966"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="970">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Preferences…" keyEquivalent="," id="1445">
+ <connections>
+ <action selector="showPreferencesWindow:" target="240" id="2517"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="bDt-OE-wyf">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Services" id="XcG-Aw-Gdb">
+ <menu key="submenu" title="Services" systemMenu="services" id="0te-ai-fgD"/>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="1900">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Hide HandBrake" keyEquivalent="h" id="971">
+ <connections>
+ <action selector="hide:" target="-2" id="972"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Hide Others" keyEquivalent="h" id="973">
+ <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+ <connections>
+ <action selector="hideOtherApplications:" target="-2" id="975"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Show All" id="5280">
+ <connections>
+ <action selector="unhideAllApplications:" target="-1" id="5281"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="196">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Quit HandBrake" keyEquivalent="q" id="136">
+ <connections>
+ <action selector="terminate:" target="-2" id="139"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ <menuItem title="File" id="1200">
+ <menu key="submenu" title="File" id="1209">
+ <items>
+ <menuItem title="Open Source…" keyEquivalent="o" id="1198">
+ <connections>
+ <action selector="browseSources:" target="240" id="2718"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Open Source (Title Specific)…" id="2698">
+ <connections>
+ <action selector="browseSources:" target="240" id="2717"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="2507">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Close" keyEquivalent="w" id="2508">
+ <connections>
+ <action selector="performClose:" target="-1" id="2509"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="2518">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Add To Queue" keyEquivalent="b" id="2443">
+ <connections>
+ <action selector="addToQueue:" target="240" id="2447"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Add All Titles To Queue…" keyEquivalent="B" id="5897">
+ <connections>
+ <action selector="addAllTitlesToQueue:" target="240" id="5899"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="Kee-pg-bfk">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Start Encoding" keyEquivalent="s" id="2444">
+ <connections>
+ <action selector="Rip:" target="240" id="2448"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Pause Encoding" keyEquivalent="p" id="2494">
+ <connections>
+ <action selector="Pause:" target="240" id="2496"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ <menuItem title="Edit" id="1795">
+ <menu key="submenu" title="Edit" id="1796">
+ <items>
+ <menuItem title="Undo" keyEquivalent="z" id="1799">
+ <connections>
+ <action selector="undo:" target="-1" id="1826"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Redo" keyEquivalent="Z" id="1801">
+ <connections>
+ <action selector="redo:" target="-1" id="1829"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="1809">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Cut" keyEquivalent="x" id="1815">
+ <connections>
+ <action selector="cut:" target="-1" id="1831"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Copy" keyEquivalent="c" id="1816">
+ <connections>
+ <action selector="copy:" target="-1" id="1836"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Paste" keyEquivalent="v" id="1821">
+ <connections>
+ <action selector="paste:" target="-1" id="1832"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Paste and Match Style" keyEquivalent="V" id="1822">
+ <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+ <connections>
+ <action selector="pasteAsPlainText:" target="-1" id="1833"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Delete" id="1797">
+ <connections>
+ <action selector="delete:" target="-1" id="1840"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Select All" keyEquivalent="a" id="1798">
+ <connections>
+ <action selector="selectAll:" target="-1" id="1834"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="1800">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Find" id="1802">
+ <menu key="submenu" title="Find" id="1803">
+ <items>
+ <menuItem title="Find…" tag="1" keyEquivalent="f" id="1805">
+ <connections>
+ <action selector="performFindPanelAction:" target="-1" id="1828"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Find Next" tag="2" keyEquivalent="g" id="1806">
+ <connections>
+ <action selector="performFindPanelAction:" target="-1" id="1835"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="1807">
+ <connections>
+ <action selector="performFindPanelAction:" target="-1" id="1830"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="1808">
+ <connections>
+ <action selector="performFindPanelAction:" target="-1" id="1823"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Jump to Selection" keyEquivalent="j" id="1804">
+ <connections>
+ <action selector="centerSelectionInVisibleArea:" target="-1" id="1838"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ <menuItem title="Spelling" id="1810">
+ <menu key="submenu" title="Spelling" id="1811">
+ <items>
+ <menuItem title="Spelling…" keyEquivalent=":" id="1812">
+ <connections>
+ <action selector="showGuessPanel:" target="-1" id="1839"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Check Spelling" keyEquivalent=";" id="1813">
+ <connections>
+ <action selector="checkSpelling:" target="-1" id="1837"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Check Spelling as You Type" id="1814">
+ <connections>
+ <action selector="toggleContinuousSpellChecking:" target="-1" id="1825"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ <menuItem title="Speech" id="1817">
+ <menu key="submenu" title="Speech" id="1818">
+ <items>
+ <menuItem title="Start Speaking" id="1820">
+ <connections>
+ <action selector="startSpeaking:" target="-1" id="1824"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Stop Speaking" id="1819">
+ <connections>
+ <action selector="stopSpeaking:" target="-1" id="1827"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ <menuItem title="Presets" id="1948">
+ <menu key="submenu" title="Presets" id="1949">
+ <items>
+ <menuItem title="New Preset…" tag="-1" keyEquivalent="n" id="1955">
+ <connections>
+ <action selector="showAddPresetPanel:" target="-1" id="iWH-6U-rv2"/>
+ </connections>
+ </menuItem>
+ <menuItem title="New Folder" tag="-1" keyEquivalent="N" id="wvb-60-cWL">
+ <connections>
+ <action selector="insertFolder:" target="-1" id="HpS-UY-h3l"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" tag="-1" id="1954">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Select Default Preset" tag="-1" id="2421">
+ <connections>
+ <action selector="selectDefaultPreset:" target="240" id="2422"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" tag="-1" id="CQW-qW-5C5">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Import…" tag="-1" id="5192">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="browseImportPresetFile:" target="240" id="5193"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Export…" tag="-1" id="5188">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="browseExportPresetFile:" target="240" id="5191"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Update Built-in Presets" tag="-1" id="1950">
+ <connections>
+ <action selector="addFactoryPresets:" target="240" id="1952"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" tag="-1" id="wgI-bc-Ors">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ <menuItem title="Window" id="1189">
+ <menu key="submenu" title="Window" systemMenu="window" id="1192">
+ <items>
+ <menuItem title="Minimize" keyEquivalent="m" id="1191">
+ <connections>
+ <action selector="performMiniaturize:" target="-1" id="1195"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Bring All to Front" id="1190">
+ <connections>
+ <action selector="arrangeInFront:" target="-1" id="1194"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="1193">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="HandBrake" keyEquivalent="1" id="2368">
+ <connections>
+ <action selector="openMainWindow:" target="240" id="2369"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Queue" keyEquivalent="2" id="2445">
+ <connections>
+ <action selector="showQueueWindow:" target="240" id="2446"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="2519">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Presets Drawer" keyEquivalent="t" id="1884">
+ <connections>
+ <action selector="toggle:" target="1841" id="1885"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Picture Settings" keyEquivalent="P" id="2488">
+ <connections>
+ <action selector="showPicturePanel:" target="240" id="2493"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Preview Window" id="5157">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="showPreviewWindow:" target="240" id="5158"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Activity Window" keyEquivalent="D" id="2295">
+ <connections>
+ <action selector="showDebugOutputPanel:" target="240" id="2296"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ <menuItem title="Help" id="1431">
+ <menu key="submenu" title="Help" id="1429">
+ <items>
+ <menuItem title="HandBrake User Guide" keyEquivalent="?" id="1985">
+ <connections>
+ <action selector="openUserGuide:" target="240" id="1986"/>
+ </connections>
+ </menuItem>
+ <menuItem title="HandBrake Homepage" id="1432">
+ <connections>
+ <action selector="openHomepage:" target="240" id="1434"/>
+ </connections>
+ </menuItem>
+ <menuItem title="HandBrake Forums" id="1433">
+ <connections>
+ <action selector="openForums:" target="240" id="1435"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ </items>
+ </menu>
+ <drawer trailingOffset="15" id="1841" userLabel="PresetsDrawer">
+ <size key="contentSize" width="240" height="550"/>
+ <size key="minContentSize" width="100" height="50"/>
+ <size key="maxContentSize" width="280" height="550"/>
+ <connections>
+ <outlet property="parentWindow" destination="21" id="1842"/>
+ </connections>
+ </drawer>
+ <window title="Create A New Preset" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="1867" userLabel="AddPresetPanel" customClass="NSPanel">
+ <windowStyleMask key="styleMask" titled="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="421" y="536" width="338" height="281"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1178"/>
+ <value key="minSize" type="size" width="338" height="232"/>
+ <view key="contentView" id="1868">
+ <rect key="frame" x="0.0" y="0.0" width="338" height="281"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <button verticalHuggingPriority="750" id="1870">
+ <rect key="frame" x="239" y="13" width="85" height="32"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <buttonCell key="cell" type="push" title="Add" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="4934">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="addUserPreset:" target="240" id="1907"/>
+ </connections>
+ </button>
+ <button verticalHuggingPriority="750" id="1871">
+ <rect key="frame" x="155" y="13" width="84" height="32"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="4935">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="closeAddPresetPanel:" target="240" id="1878"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" id="1872">
+ <rect key="frame" x="20" y="229" width="298" height="19"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="4936">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="2008">
+ <rect key="frame" x="128" y="180" width="193" height="22"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="2012" id="4937">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="2009">
+ <items>
+ <menuItem title="Item1" state="on" id="2012"/>
+ <menuItem title="Item2" id="2011"/>
+ <menuItem title="Item3" id="2010"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="addPresetPicDropdownChanged:" target="240" id="5672"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="2670">
+ <rect key="frame" x="17" y="252" width="303" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="Preset Name:" id="4938">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="2671">
+ <rect key="frame" x="17" y="207" width="91" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="Picture Settings:" id="4939">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="2672">
+ <rect key="frame" x="17" y="106" width="84" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="Description:" id="4940">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="2673">
+ <rect key="frame" x="20" y="61" width="298" height="41"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <textFieldCell key="cell" controlSize="small" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="4941">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="2833">
+ <rect key="frame" x="18" y="185" width="108" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Use Picture Size:" id="4942">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <button id="2837">
+ <rect key="frame" x="128" y="132" width="24" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="4943">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ </button>
+ <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="2839">
+ <rect key="frame" x="113" y="210" width="205" height="5"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ 
+ </box>
+ <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="2840">
+ <rect key="frame" x="91" y="108" width="227" height="5"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ 
+ </box>
+ <textField verticalHuggingPriority="750" id="2957">
+ <rect key="frame" x="17" y="134" width="109" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Use Picture Filters:" id="4944">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <box autoresizesSubviews="NO" title="Box" borderType="none" titlePosition="noTitle" id="5670">
+ <rect key="frame" x="128" y="153" width="155" height="32"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <view key="contentView">
+ <rect key="frame" x="0.0" y="0.0" width="155" height="32"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" id="5549">
+ <rect key="frame" x="3" y="6" width="52" height="16"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" drawsBackground="YES" id="5550">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="5553">
+ <rect key="frame" x="53" y="6" width="29" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="center" title="X" id="5554">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="5551">
+ <rect key="frame" x="82" y="6" width="52" height="16"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="5552">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ </view>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </box>
+ </subviews>
+ </view>
+ </window>
+ <window title="SourceTitlePanel" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="2701" userLabel="SourceTitlePanel" customClass="NSPanel">
+ <windowStyleMask key="styleMask" titled="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="302" y="989" width="392" height="144"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1178"/>
+ <value key="minSize" type="size" width="213" height="107"/>
+ <view key="contentView" id="2702">
+ <rect key="frame" x="0.0" y="0.0" width="392" height="144"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" id="2703">
+ <rect key="frame" x="96" y="45" width="279" height="38"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Source Path Here" id="4945">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="2704">
+ <rect key="frame" x="155" y="106" width="26" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="for" id="4946">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="2705">
+ <rect key="frame" x="17" y="106" width="104" height="15"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Scan title number" id="4947">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="2706">
+ <rect key="frame" x="126" y="105" width="24" height="19"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="center" title="0" drawsBackground="YES" id="4948">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <button verticalHuggingPriority="750" id="2708">
+ <rect key="frame" x="290" y="13" width="87" height="28"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <buttonCell key="cell" type="push" title="Open Title" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="4950">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="closeSourceTitleScanPanel:" target="240" id="2715"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" id="2716">
+ <rect key="frame" x="17" y="83" width="455" height="19"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Note: (entering 0 or leaving blank will result in a full source scan)" id="4951">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="2719">
+ <rect key="frame" x="17" y="69" width="77" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Source Path:" id="4952">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="2720">
+ <rect key="frame" x="177" y="106" width="198" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Small System Font Text" id="4953">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <button verticalHuggingPriority="750" id="2707">
+ <rect key="frame" x="212" y="13" width="80" height="28"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="4949">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="closeSourceTitleScanPanel:" target="240" id="2714"/>
+ </connections>
+ </button>
+ </subviews>
+ </view>
+ <point key="canvasLocation" x="515" y="271"/>
+ </window>
+ <customObject id="240" userLabel="HBController" customClass="HBController">
+ <connections>
+ <outlet property="fAddPresetPanel" destination="1867" id="1869"/>
+ <outlet property="fAdvancedTab" destination="2015" id="4eO-Lg-7cH"/>
+ <outlet property="fAudioTab" destination="1475" id="AuZ-Uf-bla"/>
+ <outlet property="fChaptersTitlesTab" destination="1989" id="oUt-8L-Ag2"/>
+ <outlet property="fDstBrowseButton" destination="1562" id="1578"/>
+ <outlet property="fDstFile1Field" destination="1552" id="1596"/>
+ <outlet property="fDstFile2Field" destination="1561" id="1585"/>
+ <outlet property="fDstFormatField" destination="1556" id="1583"/>
+ <outlet property="fDstFormatPopUp" destination="1557" id="1584"/>
+ <outlet property="fDstMp4HttpOptFileCheck" destination="4579" id="4581"/>
+ <outlet property="fDstMp4iPodFileCheck" destination="4967" id="4969"/>
+ <outlet property="fEncodeStartStopPopUp" destination="5513" id="5527"/>
+ <outlet property="fMainTabView" destination="1474" id="XMU-Vi-8QM"/>
+ <outlet property="fOpenSourceTitleMMenu" destination="2698" id="2700"/>
+ <outlet property="fPresetDrawer" destination="1841" id="1889"/>
+ <outlet property="fPresetNewDesc" destination="2673" id="2674"/>
+ <outlet property="fPresetNewName" destination="1872" id="1875"/>
+ <outlet property="fPresetNewPicFiltersCheck" destination="2837" id="2841"/>
+ <outlet property="fPresetNewPicHeight" destination="5551" id="5669"/>
+ <outlet property="fPresetNewPicSettingsPopUp" destination="2008" id="2013"/>
+ <outlet property="fPresetNewPicWidth" destination="5549" id="5668"/>
+ <outlet property="fPresetNewPicWidthHeightBox" destination="5670" id="5671"/>
+ <outlet property="fPresetSelectedDisplay" destination="1882" id="1883"/>
+ <outlet property="fQueueStatus" destination="2006" id="2007"/>
+ <outlet property="fRipIndicator" destination="1373" id="1374"/>
+ <outlet property="fScanHorizontalLine" destination="3205" id="6004"/>
+ <outlet property="fScanIndicator" destination="3203" id="3204"/>
+ <outlet property="fScanSrcTitleCancelButton" destination="2707" id="2711"/>
+ <outlet property="fScanSrcTitleNumField" destination="2706" id="2710"/>
+ <outlet property="fScanSrcTitleOpenButton" destination="2708" id="2712"/>
+ <outlet property="fScanSrcTitlePanel" destination="2701" id="2713"/>
+ <outlet property="fScanSrcTitlePathField" destination="2703" id="2709"/>
+ <outlet property="fSrcAngleLabel" destination="5180" id="5186"/>
+ <outlet property="fSrcAnglePopUp" destination="5181" id="5533"/>
+ <outlet property="fSrcChapterEndPopUp" destination="1548" id="1569"/>
+ <outlet property="fSrcChapterStartPopUp" destination="1545" id="1568"/>
+ <outlet property="fSrcChapterToField" destination="5505" id="5532"/>
+ <outlet property="fSrcDVD2Field" destination="1539" id="1591"/>
+ <outlet property="fSrcDsplyNameTitleScan" destination="2720" id="2721"/>
+ <outlet property="fSrcDuration1Field" destination="1553" id="1589"/>
+ <outlet property="fSrcDuration2Field" destination="1554" id="1590"/>
+ <outlet property="fSrcFrameEndEncodingField" destination="5523" id="5526"/>
+ <outlet property="fSrcFrameStartEncodingField" destination="5521" id="5525"/>
+ <outlet property="fSrcTimeEndEncodingField" destination="5493" id="5508"/>
+ <outlet property="fSrcTimeStartEncodingField" destination="5491" id="5507"/>
+ <outlet property="fSrcTitleField" destination="1540" id="1592"/>
+ <outlet property="fSrcTitlePopUp" destination="1541" id="1593"/>
+ <outlet property="fStatusField" destination="1123" id="1238"/>
+ <outlet property="fSubtitlesTab" destination="5194" id="d9b-rJ-XrS"/>
+ <outlet property="fVideoTab" destination="1477" id="6o2-cM-yy4"/>
+ <outlet property="fWindow" destination="21" id="350"/>
+ <outlet property="presetsMenu" destination="1949" id="bkm-2h-uFI"/>
+ </connections>
+ </customObject>
+ <customObject id="4963" customClass="SUUpdater"/>
+ <userDefaultsController representsSharedInstance="YES" id="5676"/>
+ </objects>
+</document>

HandBrake-0.9.9.tar.bz2/macosx/English.lproj/OutputPanel.xib -> HandBrake-0.10.0.tar.bz2/macosx/English.lproj/OutputPanel.xib Changed

@@ -1,612 +1,101 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">11G63</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1138.51</string>
-		<string key="IBDocument.HIToolboxVersion">569.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1938</string>
-		</object>
-		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSView</string>
-			<string>NSMenu</string>
-			<string>NSScrollView</string>
-			<string>NSWindowTemplate</string>
-			<string>NSMenuItem</string>
-			<string>NSTextView</string>
-			<string>NSScroller</string>
-			<string>NSCustomObject</string>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="640353287">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="282956917">
-				<string key="NSClassName">HBOutputPanelController</string>
-			</object>
-			<object class="NSCustomObject" id="531893577">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="602845690">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="1026712888">
-				<int key="NSWindowStyleMask">15</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{155, 772}, {378, 371}}</string>
-				<int key="NSWTFlags">-260571136</int>
-				<string key="NSWindowTitle">Activity Window - HandBrake</string>
-				<string key="NSWindowClass">NSPanel</string>
-				<object class="NSMutableString" key="NSViewClass">
-					<characters key="NS.bytes">View</characters>
-				</object>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<string key="NSWindowContentMinSize">{214.50200000000001, 107}</string>
-				<object class="NSView" key="NSWindowView" id="1055997608">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSScrollView" id="777989256">
-							<reference key="NSNextResponder" ref="1055997608"/>
-							<int key="NSvFlags">274</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSClipView" id="630219039">
-									<reference key="NSNextResponder" ref="777989256"/>
-									<int key="NSvFlags">2304</int>
-									<object class="NSMutableArray" key="NSSubviews">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSTextView" id="123567529">
-											<reference key="NSNextResponder" ref="630219039"/>
-											<int key="NSvFlags">2322</int>
-											<string key="NSFrameSize">{363, 14}</string>
-											<reference key="NSSuperview" ref="630219039"/>
-											<object class="NSTextContainer" key="NSTextContainer" id="431112540">
-												<object class="NSLayoutManager" key="NSLayoutManager">
-													<object class="NSTextStorage" key="NSTextStorage">
-														<object class="NSMutableString" key="NSString">
-															<characters key="NS.bytes"/>
-														</object>
-														<nil key="NSDelegate"/>
-													</object>
-													<object class="NSMutableArray" key="NSTextContainers">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<reference ref="431112540"/>
-													</object>
-													<int key="NSLMFlags">6</int>
-													<nil key="NSDelegate"/>
-												</object>
-												<reference key="NSTextView" ref="123567529"/>
-												<double key="NSWidth">363</double>
-												<int key="NSTCFlags">1</int>
-											</object>
-											<object class="NSTextViewSharedData" key="NSSharedData">
-												<int key="NSFlags">11109</int>
-												<int key="NSTextCheckingTypes">0</int>
-												<nil key="NSMarkedAttributes"/>
-												<object class="NSColor" key="NSBackgroundColor" id="913007966">
-													<int key="NSColorSpace">3</int>
-													<bytes key="NSWhite">MQA</bytes>
-												</object>
-												<object class="NSDictionary" key="NSSelectedAttributes">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSArray" key="dict.sortedKeys">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<string>NSBackgroundColor</string>
-														<string>NSColor</string>
-													</object>
-													<object class="NSMutableArray" key="dict.values">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSColor">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">selectedTextBackgroundColor</string>
-															<object class="NSColor" key="NSColor">
-																<int key="NSColorSpace">3</int>
-																<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-															</object>
-														</object>
-														<object class="NSColor">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">selectedTextColor</string>
-															<object class="NSColor" key="NSColor" id="76040784">
-																<int key="NSColorSpace">3</int>
-																<bytes key="NSWhite">MAA</bytes>
-															</object>
-														</object>
-													</object>
-												</object>
-												<reference key="NSInsertionColor" ref="76040784"/>
-												<object class="NSDictionary" key="NSLinkAttributes">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSArray" key="dict.sortedKeys">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<string>NSColor</string>
-														<string>NSUnderline</string>
-													</object>
-													<object class="NSMutableArray" key="dict.values">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSColor">
-															<int key="NSColorSpace">1</int>
-															<bytes key="NSRGB">MCAwIDEAA</bytes>
-														</object>
-														<integer value="1"/>
-													</object>
-												</object>
-												<nil key="NSDefaultParagraphStyle"/>
-												<nil key="NSTextFinder"/>
-												<int key="NSPreferredTextFinderStyle">1</int>
-											</object>
-											<int key="NSTVFlags">6</int>
-											<string key="NSMaxSize">{743, 10000000}</string>
-											<string key="NSMinize">{83, 0}</string>
-											<nil key="NSDelegate"/>
-										</object>
-									</object>
-									<string key="NSFrame">{{1, 1}, {363, 371}}</string>
-									<reference key="NSSuperview" ref="777989256"/>
-									<reference key="NSNextKeyView" ref="123567529"/>
-									<reference key="NSDocView" ref="123567529"/>
-									<reference key="NSBGColor" ref="913007966"/>
-									<object class="NSCursor" key="NSCursor">
-										<string key="NSHotSpot">{4, 5}</string>
-										<object class="NSImage" key="NSImage">
-											<int key="NSImageFlags">12582912</int>
-											<object class="NSMutableArray" key="NSReps">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="NSArray">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<integer value="0"/>
-													<object class="NSBitmapImageRep">
-														<object class="NSData" key="NSTIFFRepresentation">
-															<bytes key="NS.bytes">TU0AKgAAAHCAFUqgBVKsAAAAwdVQUqwaEQeIRGJRGFlYqwWLQ+JxuOQpVRmEx2RROKwOQyOUQSPyaUym
-SxqWyKXyeYxyZzWbSuJTScRCbz2Nz+gRKhUOfTqeUai0OSxiWTiBQSHSGFquGwekxyAgAAAOAQAAAwAA
-AAEAEAAAAQEAAwAAAAEAEAAAAQIAAwAAAAIACAAIAQMAAwAAAAEABQAAAQYAAwAAAAEAAQAAAREABAAA
-AAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAEAAAARcABAAAAAEAAABnARwAAwAA
-AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-														</object>
-													</object>
-												</object>
-											</object>
-											<object class="NSColor" key="NSColor">
-												<int key="NSColorSpace">3</int>
-												<bytes key="NSWhite">MCAwAA</bytes>
-											</object>
-										</object>
-									</object>
-									<int key="NScvFlags">4</int>
-								</object>
-								<object class="NSScroller" id="821320990">
-									<reference key="NSNextResponder" ref="777989256"/>
-									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{364, 1}, {15, 371}}</string>
-									<reference key="NSSuperview" ref="777989256"/>
-									<reference key="NSTarget" ref="777989256"/>
-									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">0.60032359999999996</double>
-								</object>
-								<object class="NSScroller" id="446620405">
-									<reference key="NSNextResponder" ref="777989256"/>
-									<int key="NSvFlags">-2147483392</int>
-									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
-									<reference key="NSSuperview" ref="777989256"/>
-									<int key="NSsFlags">1</int>
-									<reference key="NSTarget" ref="777989256"/>
-									<string key="NSAction">_doScroller:</string>
-									<double key="NSCurValue">1</double>
-									<double key="NSPercent">0.94565220000000005</double>
-								</object>
-							</object>
-							<string key="NSFrame">{{-1, -1}, {380, 373}}</string>
-							<reference key="NSSuperview" ref="1055997608"/>
-							<reference key="NSNextKeyView" ref="630219039"/>
-							<int key="NSsFlags">133138</int>
-							<reference key="NSVScroller" ref="821320990"/>
-							<reference key="NSHScroller" ref="446620405"/>
-							<reference key="NSContentView" ref="630219039"/>
-							<bytes key="NSScrollAmts">AAAAAAAAAAAAAAAAAAAAAA</bytes>
-						</object>
-					</object>
-					<string key="NSFrameSize">{378, 371}</string>
-					<reference key="NSSuperview"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
-				<string key="NSMinSize">{214.50200000000001, 129}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-			<object class="NSMenu" id="391216144">
-				<string key="NSTitle">Menu</string>
-				<object class="NSMutableArray" key="NSMenuItems">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSMenuItem" id="190531161">
-						<reference key="NSMenu" ref="391216144"/>
-						<string key="NSTitle">Copy Window Contents</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSOnImage" id="914385192">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuCheckmark</string>
-						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="397103719">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuMixedState</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="780868037">
-						<reference key="NSMenu" ref="391216144"/>
-						<string key="NSTitle">Clear Window Contents</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="914385192"/>
-						<reference key="NSMixedImage" ref="397103719"/>
-					</object>
-					<object class="NSMenuItem" id="292074454">
-						<reference key="NSMenu" ref="391216144"/>
-						<bool key="NSIsDisabled">YES</bool>
-						<bool key="NSIsSeparator">YES</bool>
-						<string key="NSTitle"/>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="914385192"/>
-						<reference key="NSMixedImage" ref="397103719"/>
-					</object>
-					<object class="NSMenuItem" id="1041053003">
-						<reference key="NSMenu" ref="391216144"/>
-						<string key="NSTitle">Open Log File For This Session</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="914385192"/>
-						<reference key="NSMixedImage" ref="397103719"/>
-					</object>
-					<object class="NSMenuItem" id="405725939">
-						<reference key="NSMenu" ref="391216144"/>
-						<string key="NSTitle">Clear Log File For This Session</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="914385192"/>
-						<reference key="NSMixedImage" ref="397103719"/>
-					</object>
-					<object class="NSMenuItem" id="851442803">
-						<reference key="NSMenu" ref="391216144"/>
-						<bool key="NSIsDisabled">YES</bool>
-						<bool key="NSIsSeparator">YES</bool>
-						<string key="NSTitle"/>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="914385192"/>
-						<reference key="NSMixedImage" ref="397103719"/>
-					</object>
-					<object class="NSMenuItem" id="541567733">
-						<reference key="NSMenu" ref="391216144"/>
-						<string key="NSTitle">Open Individual Log File Directory</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="914385192"/>
-						<reference key="NSMixedImage" ref="397103719"/>
-					</object>
-				</object>
-				<string key="NSName"/>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">textView</string>
-						<reference key="source" ref="282956917"/>
-						<reference key="destination" ref="123567529"/>
-					</object>
-					<int key="connectionID">23</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">clearOutput:</string>
-						<reference key="source" ref="282956917"/>
-						<reference key="destination" ref="780868037"/>
-					</object>
-					<int key="connectionID">27</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">copyAllOutputToPasteboard:</string>
-						<reference key="source" ref="282956917"/>
-						<reference key="destination" ref="190531161"/>
-					</object>
-					<int key="connectionID">32</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">openActivityLogFile:</string>
-						<reference key="source" ref="282956917"/>
-						<reference key="destination" ref="1041053003"/>
-					</object>
-					<int key="connectionID">34</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">clearActivityLogFile:</string>
-						<reference key="source" ref="282956917"/>
-						<reference key="destination" ref="405725939"/>
-					</object>
-					<int key="connectionID">36</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="282956917"/>
-						<reference key="destination" ref="1026712888"/>
-					</object>
-					<int key="connectionID">41</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">openEncodeLogDirectory:</string>
-						<reference key="source" ref="282956917"/>
-						<reference key="destination" ref="541567733"/>
-					</object>
-					<int key="connectionID">44</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1026712888"/>
-						<reference key="destination" ref="282956917"/>
-					</object>
-					<int key="connectionID">17</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="123567529"/>
-						<reference key="destination" ref="282956917"/>
-					</object>
-					<int key="connectionID">21</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">menu</string>
-						<reference key="source" ref="123567529"/>
-						<reference key="destination" ref="391216144"/>
-					</object>
-					<int key="connectionID">22</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="650019074">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="640353287"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="282956917"/>
-						<reference key="parent" ref="650019074"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="531893577"/>
-						<reference key="parent" ref="650019074"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="602845690"/>
-						<reference key="parent" ref="650019074"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="1026712888"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1055997608"/>
-						</object>
-						<reference key="parent" ref="650019074"/>
-						<string key="objectName">OutputPanel</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="1055997608"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="777989256"/>
-						</object>
-						<reference key="parent" ref="1026712888"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="777989256"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="123567529"/>
-							<reference ref="821320990"/>
-							<reference ref="446620405"/>
-						</object>
-						<reference key="parent" ref="1055997608"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">20</int>
-						<reference key="object" ref="123567529"/>
-						<reference key="parent" ref="777989256"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="391216144"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="780868037"/>
-							<reference ref="190531161"/>
-							<reference ref="1041053003"/>
-							<reference ref="405725939"/>
-							<reference ref="292074454"/>
-							<reference ref="541567733"/>
-							<reference ref="851442803"/>
-						</object>
-						<reference key="parent" ref="650019074"/>
-						<string key="objectName">ContextMenu</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="780868037"/>
-						<reference key="parent" ref="391216144"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">24</int>
-						<reference key="object" ref="190531161"/>
-						<reference key="parent" ref="391216144"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">33</int>
-						<reference key="object" ref="1041053003"/>
-						<reference key="parent" ref="391216144"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">35</int>
-						<reference key="object" ref="405725939"/>
-						<reference key="parent" ref="391216144"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">37</int>
-						<reference key="object" ref="292074454"/>
-						<reference key="parent" ref="391216144"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">39</int>
-						<reference key="object" ref="821320990"/>
-						<reference key="parent" ref="777989256"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">40</int>
-						<reference key="object" ref="446620405"/>
-						<reference key="parent" ref="777989256"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">42</int>
-						<reference key="object" ref="851442803"/>
-						<reference key="parent" ref="391216144"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">43</int>
-						<reference key="object" ref="541567733"/>
-						<reference key="parent" ref="391216144"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>11.IBPluginDependency</string>
-					<string>12.IBPluginDependency</string>
-					<string>19.IBPluginDependency</string>
-					<string>20.IBPluginDependency</string>
-					<string>24.IBPluginDependency</string>
-					<string>33.IBPluginDependency</string>
-					<string>35.IBPluginDependency</string>
-					<string>37.IBPluginDependency</string>
-					<string>39.IBPluginDependency</string>
-					<string>39.IBShouldRemoveOnLegacySave</string>
-					<string>40.IBPluginDependency</string>
-					<string>40.IBShouldRemoveOnLegacySave</string>
-					<string>42.IBPluginDependency</string>
-					<string>43.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>5.IBWindowTemplateEditedContentRect</string>
-					<string>6.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{597, 246}, {378, 371}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="650019074"/>
-				<reference key="dict.values" ref="650019074"/>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="650019074"/>
-				<reference key="dict.values" ref="650019074"/>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">44</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>NSMenuCheckmark</string>
-				<string>NSMenuMixedState</string>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{11, 11}</string>
-				<string>{10, 3}</string>
-			</object>
-		</object>
-	</data>
-</archive>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F7" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <deployment version="1060" defaultVersion="1090" identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="HBOutputPanelController">
+ <connections>
+ <outlet property="textView" destination="20" id="23"/>
+ <outlet property="window" destination="5" id="41"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application"/>
+ <window title="Activity Window - HandBrake" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="OutputPanel" customClass="NSPanel">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="74" y="449" width="378" height="439"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
+ <value key="minSize" type="size" width="214.50200000000001" height="107"/>
+ <view key="contentView" id="6">
+ <rect key="frame" x="0.0" y="0.0" width="378" height="439"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <scrollView horizontalLineScroll="0.0" horizontalPageScroll="0.0" verticalLineScroll="0.0" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="19">
+ <rect key="frame" x="-1" y="-1" width="380" height="441"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <clipView key="contentView" id="mnc-sf-Cwe">
+ <rect key="frame" x="1" y="1" width="378" height="439"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <textView editable="NO" importsGraphics="NO" richText="NO" findStyle="panel" verticallyResizable="YES" spellingCorrection="YES" id="20">
+ <rect key="frame" x="0.0" y="0.0" width="378" height="439"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <size key="minSize" width="378" height="439"/>
+ <size key="maxSize" width="743" height="10000000"/>
+ <color key="insertionPointColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+ <size key="minSize" width="378" height="439"/>
+ <size key="maxSize" width="743" height="10000000"/>
+ <connections>
+ <outlet property="delegate" destination="-2" id="21"/>
+ <outlet property="menu" destination="11" id="22"/>
+ </connections>
+ </textView>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ </clipView>
+ <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="40">
+ <rect key="frame" x="-100" y="-100" width="87" height="18"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="39">
+ <rect key="frame" x="363" y="1" width="16" height="439"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ </scrollView>
+ </subviews>
+ </view>
+ <connections>
+ <outlet property="delegate" destination="-2" id="17"/>
+ </connections>
+ </window>
+ <menu title="Menu" id="11" userLabel="ContextMenu">
+ <items>
+ <menuItem title="Copy Window Contents" id="24">
+ <connections>
+ <action selector="copyAllOutputToPasteboard:" target="-2" id="32"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Clear Window Contents" id="12">
+ <connections>
+ <action selector="clearOutput:" target="-2" id="27"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="37">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Open Log File For This Session" id="33">
+ <connections>
+ <action selector="openActivityLogFile:" target="-2" id="34"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Clear Log File For This Session" id="35">
+ <connections>
+ <action selector="clearActivityLogFile:" target="-2" id="36"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="42">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Open Individual Log File Directory" id="43">
+ <connections>
+ <action selector="openEncodeLogDirectory:" target="-2" id="44"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </objects>
+</document>

HandBrake-0.9.9.tar.bz2/macosx/English.lproj/PicturePreview.xib -> HandBrake-0.10.0.tar.bz2/macosx/English.lproj/PicturePreview.xib Changed

@@ -1,2116 +1,252 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">12D61</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.37</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string>com.apple.QTKitIBPlugin</string>
-			</object>
-			<object class="NSArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>3084</string>
-				<string>2053</string>
-			</object>
-		</object>
-		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSBox</string>
-			<string>NSButton</string>
-			<string>NSButtonCell</string>
-			<string>NSCustomObject</string>
-			<string>NSMenu</string>
-			<string>NSMenuItem</string>
-			<string>NSPopUpButton</string>
-			<string>NSPopUpButtonCell</string>
-			<string>NSProgressIndicator</string>
-			<string>NSSlider</string>
-			<string>NSSliderCell</string>
-			<string>NSTextField</string>
-			<string>NSTextFieldCell</string>
-			<string>NSView</string>
-			<string>NSWindowTemplate</string>
-			<string>QTMovieView</string>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string>com.apple.QTKitIBPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="273418435">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="355312334">
-				<string key="NSClassName">PreviewController</string>
-			</object>
-			<object class="NSCustomObject" id="844574444">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="837220151">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="616825745">
-				<int key="NSWindowStyleMask">7</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{142, 519}, {490, 360}}</string>
-				<int key="NSWTFlags">1886913536</int>
-				<string key="NSWindowTitle">HandBrake Preview</string>
-				<string key="NSWindowClass">NSPanel</string>
-				<object class="NSMutableString" key="NSViewClass">
-					<characters key="NS.bytes">View</characters>
-				</object>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<object class="NSView" key="NSWindowView" id="49161063">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">274</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="QTMovieView" id="48693112">
-							<reference key="NSNextResponder" ref="49161063"/>
-							<int key="NSvFlags">274</int>
-							<object class="NSMutableSet" key="NSDragTypes">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="set.sortedObjects">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>Apple URL pasteboard type</string>
-									<string>CorePasteboardFlavorType 0x6D6F6F76</string>
-									<string>NSFilenamesPboardType</string>
-									<string>QTMoviePasteboardType</string>
-								</object>
-							</object>
-							<string key="NSFrameSize">{490, 360}</string>
-							<reference key="NSSuperview" ref="49161063"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="768906858"/>
-							<object class="NSColor" key="kCoderFillColor">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MC44MDAwMDAwMSAwLjgwMDAwMDAxIDAuODAwMDAwMDEAA</bytes>
-							</object>
-							<boolean value="YES" key="kCoderControllerVisible"/>
-							<boolean value="YES" key="kCoderPreservesAspectRatio"/>
-							<nil key="kCoderMovie"/>
-							<boolean value="NO" key="kCoderEditable"/>
-						</object>
-						<object class="NSBox" id="92351498">
-							<reference key="NSNextResponder" ref="49161063"/>
-							<int key="NSvFlags">-2147483611</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSView" id="385854969">
-									<reference key="NSNextResponder" ref="92351498"/>
-									<int key="NSvFlags">274</int>
-									<object class="NSMutableArray" key="NSSubviews">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSButton" id="798240356">
-											<reference key="NSNextResponder" ref="385854969"/>
-											<int key="NSvFlags">292</int>
-											<object class="NSMutableArray" key="NSSubviews">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-											</object>
-											<string key="NSFrame">{{17, 11}, {77, 16}}</string>
-											<reference key="NSSuperview" ref="385854969"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="66510867"/>
-											<object class="NSArray" key="NSViewContentFilters">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="CIColorMonochrome">
-													<object class="CIColor" key="CI_inputColor">
-														<float key="red">0.70196080207824707</float>
-														<float key="green">0.70196080207824707</float>
-														<float key="blue">0.70196080207824707</float>
-														<float key="alpha">1</float>
-													</object>
-													<integer value="1" key="CI_inputIntensity"/>
-													<bool key="CIEnabled">YES</bool>
-												</object>
-											</object>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="975305481">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">134479872</int>
-												<string key="NSContents">Live Preview</string>
-												<object class="NSFont" key="NSSupport" id="22">
-													<string key="NSName">LucidaGrande</string>
-													<double key="NSSize">9</double>
-													<int key="NSfFlags">3614</int>
-												</object>
-												<reference key="NSControlView" ref="798240356"/>
-												<int key="NSButtonFlags">-2038284288</int>
-												<int key="NSButtonFlags2">129</int>
-												<reference key="NSAlternateImage" ref="22"/>
-												<string key="NSAlternateContents"/>
-												<string key="NSKeyEquivalent"/>
-												<int key="NSPeriodicDelay">200</int>
-												<int key="NSPeriodicInterval">25</int>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-										<object class="NSButton" id="141370142">
-											<reference key="NSNextResponder" ref="385854969"/>
-											<int key="NSvFlags">289</int>
-											<object class="NSMutableArray" key="NSSubviews">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-											</object>
-											<string key="NSFrame">{{370, 11}, {59, 16}}</string>
-											<reference key="NSSuperview" ref="385854969"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="700607930"/>
-											<object class="NSArray" key="NSViewContentFilters">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="CIColorMonochrome">
-													<object class="CIColor" key="CI_inputColor">
-														<float key="red">0.70196080207824707</float>
-														<float key="green">0.70196080207824707</float>
-														<float key="blue">0.70196080207824707</float>
-														<float key="alpha">1</float>
-													</object>
-													<integer value="1" key="CI_inputIntensity"/>
-													<bool key="CIEnabled">YES</bool>
-												</object>
-											</object>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="606007744">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">134479872</int>
-												<string key="NSContents">Settings</string>
-												<reference key="NSSupport" ref="22"/>
-												<reference key="NSControlView" ref="141370142"/>
-												<int key="NSButtonFlags">-2038284288</int>
-												<int key="NSButtonFlags2">129</int>
-												<reference key="NSAlternateImage" ref="22"/>
-												<string key="NSAlternateContents"/>
-												<string key="NSKeyEquivalent"/>
-												<int key="NSPeriodicDelay">200</int>
-												<int key="NSPeriodicInterval">25</int>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-										<object class="NSButton" id="81685190">
-											<reference key="NSNextResponder" ref="385854969"/>
-											<int key="NSvFlags">289</int>
-											<object class="NSMutableArray" key="NSSubviews">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-											</object>
-											<string key="NSFrame">{{272, 11}, {92, 16}}</string>
-											<reference key="NSSuperview" ref="385854969"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="141370142"/>
-											<object class="NSArray" key="NSViewContentFilters">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="CIColorMonochrome">
-													<object class="CIColor" key="CI_inputColor">
-														<float key="red">0.70196080207824707</float>
-														<float key="green">0.70196080207824707</float>
-														<float key="blue">0.70196080207824707</float>
-														<float key="alpha">1</float>
-													</object>
-													<integer value="1" key="CI_inputIntensity"/>
-													<bool key="CIEnabled">YES</bool>
-												</object>
-											</object>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="847033897">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">134479872</int>
-												<string key="NSContents">Scale To Screen</string>
-												<reference key="NSSupport" ref="22"/>
-												<reference key="NSControlView" ref="81685190"/>
-												<int key="NSButtonFlags">-2038284288</int>
-												<int key="NSButtonFlags2">129</int>
-												<object class="NSFont" key="NSAlternateImage" id="354866114">
-													<string key="NSName">LucidaGrande</string>
-													<double key="NSSize">9</double>
-													<int key="NSfFlags">16</int>
-												</object>
-												<string key="NSAlternateContents"/>
-												<string key="NSKeyEquivalent"/>
-												<int key="NSPeriodicDelay">200</int>
-												<int key="NSPeriodicInterval">25</int>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-										<object class="NSTextField" id="66510867">
-											<reference key="NSNextResponder" ref="385854969"/>
-											<int key="NSvFlags">289</int>
-											<string key="NSFrame">{{108, 14}, {75, 11}}</string>
-											<reference key="NSSuperview" ref="385854969"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="598619000"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="567286013">
-												<int key="NSCellFlags">68157504</int>
-												<int key="NSCellFlags2">71566336</int>
-												<string key="NSContents">Duration (sec):</string>
-												<object class="NSFont" key="NSSupport" id="811969608">
-													<string key="NSName">LucidaGrande-Bold</string>
-													<double key="NSSize">9</double>
-													<int key="NSfFlags">16</int>
-												</object>
-												<reference key="NSControlView" ref="66510867"/>
-												<object class="NSColor" key="NSBackgroundColor" id="407686733">
-													<int key="NSColorSpace">6</int>
-													<string key="NSCatalogName">System</string>
-													<string key="NSColorName">controlColor</string>
-													<object class="NSColor" key="NSColor">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-													</object>
-												</object>
-												<object class="NSColor" key="NSTextColor" id="978544139">
-													<int key="NSColorSpace">1</int>
-													<bytes key="NSRGB">MSAxIDEAA</bytes>
-												</object>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-										<object class="NSPopUpButton" id="598619000">
-											<reference key="NSNextResponder" ref="385854969"/>
-											<int key="NSvFlags">289</int>
-											<string key="NSFrame">{{187, 12}, {58, 15}}</string>
-											<reference key="NSSuperview" ref="385854969"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="81685190"/>
-											<object class="NSArray" key="NSViewContentFilters">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="CIColorMonochrome">
-													<object class="CIColor" key="CI_inputColor">
-														<float key="red">0.70196080207824707</float>
-														<float key="green">0.70196080207824707</float>
-														<float key="blue">0.70196080207824707</float>
-														<float key="alpha">1</float>
-													</object>
-													<integer value="1" key="CI_inputIntensity"/>
-													<bool key="CIEnabled">YES</bool>
-												</object>
-											</object>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSPopUpButtonCell" key="NSCell" id="953108737">
-												<int key="NSCellFlags">-2076180416</int>
-												<int key="NSCellFlags2">264192</int>
-												<reference key="NSSupport" ref="22"/>
-												<reference key="NSControlView" ref="598619000"/>
-												<int key="NSButtonFlags">109199360</int>
-												<int key="NSButtonFlags2">1</int>
-												<string key="NSAlternateContents"/>
-												<string key="NSKeyEquivalent"/>
-												<int key="NSPeriodicDelay">400</int>
-												<int key="NSPeriodicInterval">75</int>
-												<object class="NSMenuItem" key="NSMenuItem" id="372655630">
-													<reference key="NSMenu" ref="501672847"/>
-													<string key="NSTitle">Item 1</string>
-													<string key="NSKeyEquiv"/>
-													<int key="NSKeyEquivModMask">1048576</int>
-													<int key="NSMnemonicLoc">2147483647</int>
-													<int key="NSState">1</int>
-													<object class="NSCustomResource" key="NSOnImage" id="858043985">
-														<string key="NSClassName">NSImage</string>
-														<string key="NSResourceName">NSMenuCheckmark</string>
-													</object>
-													<object class="NSCustomResource" key="NSMixedImage" id="700487240">
-														<string key="NSClassName">NSImage</string>
-														<string key="NSResourceName">NSMenuMixedState</string>
-													</object>
-													<string key="NSAction">_popUpItemAction:</string>
-													<reference key="NSTarget" ref="953108737"/>
-												</object>
-												<bool key="NSMenuItemRespectAlignment">YES</bool>
-												<object class="NSMenu" key="NSMenu" id="501672847">
-													<string key="NSTitle">OtherViews</string>
-													<object class="NSMutableArray" key="NSMenuItems">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<reference ref="372655630"/>
-														<object class="NSMenuItem" id="607756368">
-															<reference key="NSMenu" ref="501672847"/>
-															<string key="NSTitle">Item 2</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSKeyEquivModMask">1048576</int>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="858043985"/>
-															<reference key="NSMixedImage" ref="700487240"/>
-															<string key="NSAction">_popUpItemAction:</string>
-															<reference key="NSTarget" ref="953108737"/>
-														</object>
-														<object class="NSMenuItem" id="272743761">
-															<reference key="NSMenu" ref="501672847"/>
-															<string key="NSTitle">Item 3</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSKeyEquivModMask">1048576</int>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="858043985"/>
-															<reference key="NSMixedImage" ref="700487240"/>
-															<string key="NSAction">_popUpItemAction:</string>
-															<reference key="NSTarget" ref="953108737"/>
-														</object>
-													</object>
-												</object>
-												<int key="NSPreferredEdge">1</int>
-												<bool key="NSUsesItemFromMenu">YES</bool>
-												<bool key="NSAltersState">YES</bool>
-												<int key="NSArrowPosition">2</int>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-										<object class="NSSlider" id="396925210">
-											<reference key="NSNextResponder" ref="385854969"/>
-											<int key="NSvFlags">290</int>
-											<string key="NSFrame">{{18, 39}, {410, 16}}</string>
-											<reference key="NSSuperview" ref="385854969"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="798240356"/>
-											<object class="NSArray" key="NSViewContentFilters">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="CIColorMonochrome">
-													<object class="CIColor" key="CI_inputColor">
-														<float key="red">0.70196080207824707</float>
-														<float key="green">0.70196080207824707</float>
-														<float key="blue">0.70196080207824707</float>
-														<float key="alpha">1</float>
-													</object>
-													<integer value="1" key="CI_inputIntensity"/>
-													<bool key="CIEnabled">YES</bool>
-												</object>
-											</object>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSSliderCell" key="NSCell" id="639767004">
-												<int key="NSCellFlags">67371264</int>
-												<int key="NSCellFlags2">262144</int>
-												<string key="NSContents"/>
-												<reference key="NSSupport" ref="22"/>
-												<reference key="NSControlView" ref="396925210"/>
-												<double key="NSMaxValue">9</double>
-												<double key="NSMinValue">0.0</double>
-												<double key="NSValue">0.0</double>
-												<double key="NSAltIncValue">0.0</double>
-												<int key="NSNumberOfTickMarks">10</int>
-												<int key="NSTickMarkPosition">1</int>
-												<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
-												<bool key="NSVertical">NO</bool>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-										<object class="NSTextField" id="628196212">
-											<reference key="NSNextResponder" ref="385854969"/>
-											<int key="NSvFlags">290</int>
-											<string key="NSFrame">{{15, 55}, {420, 20}}</string>
-											<reference key="NSSuperview" ref="385854969"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="396925210"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="921881842">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">4325376</int>
-												<string key="NSContents"/>
-												<object class="NSFont" key="NSSupport" id="476446081">
-													<string key="NSName">LucidaGrande-Bold</string>
-													<double key="NSSize">11</double>
-													<int key="NSfFlags">16</int>
-												</object>
-												<reference key="NSControlView" ref="628196212"/>
-												<bool key="NSDrawsBackground">YES</bool>
-												<reference key="NSBackgroundColor" ref="407686733"/>
-												<reference key="NSTextColor" ref="978544139"/>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-										<object class="NSTextField" id="245200984">
-											<reference key="NSNextResponder" ref="385854969"/>
-											<int key="NSvFlags">290</int>
-											<string key="NSFrame">{{15, 77}, {416, 12}}</string>
-											<reference key="NSSuperview" ref="385854969"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="628196212"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="1032360651">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">4456448</int>
-												<string key="NSContents"/>
-												<reference key="NSSupport" ref="811969608"/>
-												<reference key="NSControlView" ref="245200984"/>
-												<bool key="NSDrawsBackground">YES</bool>
-												<reference key="NSBackgroundColor" ref="407686733"/>
-												<reference key="NSTextColor" ref="978544139"/>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-									</object>
-									<string key="NSFrame">{{2, 2}, {446, 96}}</string>
-									<reference key="NSSuperview" ref="92351498"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="245200984"/>
-								</object>
-							</object>
-							<string key="NSFrame">{{15, 132}, {460, 100}}</string>
-							<reference key="NSSuperview" ref="49161063"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="385854969"/>
-							<string key="NSOffsets">{0, 0}</string>
-							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Picture Controls</string>
-								<object class="NSFont" key="NSSupport" id="26">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">11</double>
-									<int key="NSfFlags">3100</int>
-								</object>
-								<object class="NSColor" key="NSBackgroundColor" id="384686844">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">textBackgroundColor</string>
-									<object class="NSColor" key="NSColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MQA</bytes>
-									</object>
-								</object>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-								</object>
-							</object>
-							<reference key="NSContentView" ref="385854969"/>
-							<int key="NSBorderType">1</int>
-							<int key="NSBoxType">4</int>
-							<int key="NSTitlePosition">0</int>
-							<bool key="NSTransparent">NO</bool>
-							<real value="2" key="NSBorderWidth2"/>
-							<double key="NSCornerRadius2">12</double>
-							<object class="NSColor" key="NSBorderColor2">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MSAxIDEgMC44AA</bytes>
-							</object>
-							<object class="NSColor" key="NSFillColor2">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MCAwIDAgMC42AA</bytes>
-							</object>
-						</object>
-						<object class="NSBox" id="700607930">
-							<reference key="NSNextResponder" ref="49161063"/>
-							<int key="NSvFlags">-2147483611</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSView" id="1068222891">
-									<reference key="NSNextResponder" ref="700607930"/>
-									<int key="NSvFlags">274</int>
-									<object class="NSMutableArray" key="NSSubviews">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSSlider" id="886140787">
-											<reference key="NSNextResponder" ref="1068222891"/>
-											<int key="NSvFlags">290</int>
-											<string key="NSFrame">{{16, 16}, {355, 21}}</string>
-											<reference key="NSSuperview" ref="1068222891"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="964331174"/>
-											<object class="NSArray" key="NSViewContentFilters">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="CIColorMonochrome">
-													<object class="CIColor" key="CI_inputColor">
-														<float key="red">0.70196080207824707</float>
-														<float key="green">0.70196080207824707</float>
-														<float key="blue">0.70196080207824707</float>
-														<float key="alpha">1</float>
-													</object>
-													<integer value="1" key="CI_inputIntensity"/>
-													<bool key="CIEnabled">YES</bool>
-												</object>
-											</object>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSSliderCell" key="NSCell" id="493667684">
-												<int key="NSCellFlags">67371264</int>
-												<int key="NSCellFlags2">0</int>
-												<string key="NSContents"/>
-												<reference key="NSControlView" ref="886140787"/>
-												<double key="NSMaxValue">100</double>
-												<double key="NSMinValue">0.0</double>
-												<double key="NSValue">0.0</double>
-												<double key="NSAltIncValue">0.0</double>
-												<int key="NSNumberOfTickMarks">0</int>
-												<int key="NSTickMarkPosition">1</int>
-												<bool key="NSAllowsTickMarkValuesOnly">NO</bool>
-												<bool key="NSVertical">NO</bool>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-										<object class="NSButton" id="102183813">
-											<reference key="NSNextResponder" ref="1068222891"/>
-											<int key="NSvFlags">268</int>
-											<object class="NSMutableArray" key="NSSubviews">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-											</object>
-											<string key="NSFrame">{{205, 43}, {36, 36}}</string>
-											<reference key="NSSuperview" ref="1068222891"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="894608246"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="19809002">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">134217728</int>
-												<string key="NSContents"/>
-												<object class="NSFont" key="NSSupport" id="353643025">
-													<string key="NSName">LucidaGrande</string>
-													<double key="NSSize">13</double>
-													<int key="NSfFlags">1044</int>
-												</object>
-												<reference key="NSControlView" ref="102183813"/>
-												<int key="NSButtonFlags">-931921920</int>
-												<int key="NSButtonFlags2">134</int>
-												<object class="NSCustomResource" key="NSNormalImage">
-													<string key="NSClassName">NSImage</string>
-													<string key="NSResourceName">play-p</string>
-												</object>
-												<object class="NSCustomResource" key="NSAlternateImage">
-													<string key="NSClassName">NSImage</string>
-													<string key="NSResourceName">pause-p</string>
-												</object>
-												<string key="NSAlternateContents"/>
-												<string key="NSKeyEquivalent"/>
-												<int key="NSPeriodicDelay">200</int>
-												<int key="NSPeriodicInterval">25</int>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-										<object class="NSButton" id="897614796">
-											<reference key="NSNextResponder" ref="1068222891"/>
-											<int key="NSvFlags">268</int>
-											<object class="NSMutableArray" key="NSSubviews">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-											</object>
-											<string key="NSFrame">{{163, 48}, {32, 26}}</string>
-											<reference key="NSSuperview" ref="1068222891"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="102183813"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="913339095">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">134217728</int>
-												<string key="NSContents"/>
-												<reference key="NSSupport" ref="353643025"/>
-												<reference key="NSControlView" ref="897614796"/>
-												<int key="NSButtonFlags">-2041839616</int>
-												<int key="NSButtonFlags2">134</int>
-												<object class="NSCustomResource" key="NSNormalImage">
-													<string key="NSClassName">NSImage</string>
-													<string key="NSResourceName">prev-p</string>
-												</object>
-												<string key="NSAlternateContents"/>
-												<string key="NSKeyEquivalent"/>
-												<int key="NSPeriodicDelay">200</int>
-												<int key="NSPeriodicInterval">25</int>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-										<object class="NSButton" id="894608246">
-											<reference key="NSNextResponder" ref="1068222891"/>
-											<int key="NSvFlags">268</int>
-											<object class="NSMutableArray" key="NSSubviews">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-											</object>
-											<string key="NSFrame">{{251, 48}, {32, 26}}</string>
-											<reference key="NSSuperview" ref="1068222891"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="630042886"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="117507013">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">134479872</int>
-												<string key="NSContents"/>
-												<reference key="NSSupport" ref="22"/>
-												<reference key="NSControlView" ref="894608246"/>
-												<int key="NSButtonFlags">-2042363904</int>
-												<int key="NSButtonFlags2">134</int>
-												<object class="NSCustomResource" key="NSNormalImage">
-													<string key="NSClassName">NSImage</string>
-													<string key="NSResourceName">next-p</string>
-												</object>
-												<string key="NSAlternateContents"/>
-												<string key="NSKeyEquivalent"/>
-												<int key="NSPeriodicDelay">200</int>
-												<int key="NSPeriodicInterval">25</int>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-										<object class="NSButton" id="630042886">
-											<reference key="NSNextResponder" ref="1068222891"/>
-											<int key="NSvFlags">292</int>
-											<object class="NSMutableArray" key="NSSubviews">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-											</object>
-											<string key="NSFrame">{{348, 53}, {81, 16}}</string>
-											<reference key="NSSuperview" ref="1068222891"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="886140787"/>
-											<object class="NSArray" key="NSViewContentFilters">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="CIColorMonochrome">
-													<object class="CIColor" key="CI_inputColor">
-														<float key="red">0.70196080207824707</float>
-														<float key="green">0.70196080207824707</float>
-														<float key="blue">0.70196080207824707</float>
-														<float key="alpha">1</float>
-													</object>
-													<integer value="1" key="CI_inputIntensity"/>
-													<bool key="CIEnabled">YES</bool>
-												</object>
-											</object>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="999505395">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">134479872</int>
-												<string key="NSContents">Still Previews</string>
-												<reference key="NSSupport" ref="22"/>
-												<reference key="NSControlView" ref="630042886"/>
-												<int key="NSButtonFlags">-2038284288</int>
-												<int key="NSButtonFlags2">129</int>
-												<reference key="NSAlternateImage" ref="22"/>
-												<string key="NSAlternateContents"/>
-												<string key="NSKeyEquivalent"/>
-												<int key="NSPeriodicDelay">200</int>
-												<int key="NSPeriodicInterval">25</int>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-										<object class="NSTextField" id="964331174">
-											<reference key="NSNextResponder" ref="1068222891"/>
-											<int key="NSvFlags">290</int>
-											<string key="NSFrame">{{364, 19}, {67, 14}}</string>
-											<reference key="NSSuperview" ref="1068222891"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="113790059">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">71565312</int>
-												<string key="NSContents">00:00:00</string>
-												<reference key="NSSupport" ref="476446081"/>
-												<reference key="NSControlView" ref="964331174"/>
-												<bool key="NSDrawsBackground">YES</bool>
-												<reference key="NSBackgroundColor" ref="407686733"/>
-												<reference key="NSTextColor" ref="978544139"/>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-									</object>
-									<string key="NSFrame">{{2, 2}, {446, 96}}</string>
-									<reference key="NSSuperview" ref="700607930"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="897614796"/>
-								</object>
-							</object>
-							<string key="NSFrame">{{15, 30}, {460, 100}}</string>
-							<reference key="NSSuperview" ref="49161063"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="1068222891"/>
-							<string key="NSOffsets">{0, 0}</string>
-							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Playback Controls</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSBackgroundColor" ref="384686844"/>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-								</object>
-							</object>
-							<reference key="NSContentView" ref="1068222891"/>
-							<int key="NSBorderType">1</int>
-							<int key="NSBoxType">4</int>
-							<int key="NSTitlePosition">0</int>
-							<bool key="NSTransparent">NO</bool>
-							<real value="2" key="NSBorderWidth2"/>
-							<double key="NSCornerRadius2">12</double>
-							<object class="NSColor" key="NSBorderColor2">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MSAxIDEgMC44AA</bytes>
-							</object>
-							<object class="NSColor" key="NSFillColor2">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MCAwIDAgMC42AA</bytes>
-							</object>
-						</object>
-						<object class="NSBox" id="768906858">
-							<reference key="NSNextResponder" ref="49161063"/>
-							<int key="NSvFlags">-2147483611</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSView" id="1067699710">
-									<reference key="NSNextResponder" ref="768906858"/>
-									<int key="NSvFlags">274</int>
-									<object class="NSMutableArray" key="NSSubviews">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSProgressIndicator" id="196868285">
-											<reference key="NSNextResponder" ref="1067699710"/>
-											<int key="NSvFlags">1280</int>
-											<string key="NSFrame">{{18, 26}, {346, 12}}</string>
-											<reference key="NSSuperview" ref="1067699710"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="569473100"/>
-											<object class="NSArray" key="NSViewContentFilters">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="CIColorMonochrome">
-													<object class="CIColor" key="CI_inputColor">
-														<float key="red">0.70196080207824707</float>
-														<float key="green">0.70196080207824707</float>
-														<float key="blue">0.70196080207824707</float>
-														<float key="alpha">1</float>
-													</object>
-													<integer value="1" key="CI_inputIntensity"/>
-													<bool key="CIEnabled">YES</bool>
-												</object>
-											</object>
-											<int key="NSpiFlags">16650</int>
-											<double key="NSMaxValue">100</double>
-										</object>
-										<object class="NSButton" id="569473100">
-											<reference key="NSNextResponder" ref="1067699710"/>
-											<int key="NSvFlags">265</int>
-											<object class="NSMutableArray" key="NSSubviews">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-											</object>
-											<string key="NSFrame">{{371, 24}, {58, 16}}</string>
-											<reference key="NSSuperview" ref="1067699710"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="92351498"/>
-											<object class="NSArray" key="NSViewContentFilters">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="CIColorMonochrome">
-													<object class="CIColor" key="CI_inputColor">
-														<float key="red">0.70196080207824707</float>
-														<float key="green">0.70196080207824707</float>
-														<float key="blue">0.70196080207824707</float>
-														<float key="alpha">1</float>
-													</object>
-													<integer value="1" key="CI_inputIntensity"/>
-													<bool key="CIEnabled">YES</bool>
-												</object>
-											</object>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="908165435">
-												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">134479872</int>
-												<string key="NSContents">Cancel</string>
-												<reference key="NSSupport" ref="22"/>
-												<reference key="NSControlView" ref="569473100"/>
-												<int key="NSButtonFlags">-2038284288</int>
-												<int key="NSButtonFlags2">129</int>
-												<reference key="NSAlternateImage" ref="354866114"/>
-												<string key="NSAlternateContents"/>
-												<string key="NSKeyEquivalent"/>
-												<int key="NSPeriodicDelay">200</int>
-												<int key="NSPeriodicInterval">25</int>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-										<object class="NSTextField" id="986015194">
-											<reference key="NSNextResponder" ref="1067699710"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{15, 59}, {406, 14}}</string>
-											<reference key="NSSuperview" ref="1067699710"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="196868285"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="304208899">
-												<int key="NSCellFlags">68157504</int>
-												<int key="NSCellFlags2">4326400</int>
-												<string key="NSContents">Preparing Preview</string>
-												<reference key="NSSupport" ref="476446081"/>
-												<reference key="NSControlView" ref="986015194"/>
-												<object class="NSColor" key="NSBackgroundColor">
-													<int key="NSColorSpace">2</int>
-													<bytes key="NSRGB">MC45MDE5NjA4NSAwLjkwMTk2MDg1IDAuOTAxOTYwODUgMAA</bytes>
-												</object>
-												<reference key="NSTextColor" ref="978544139"/>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
-									</object>
-									<string key="NSFrame">{{2, 2}, {446, 96}}</string>
-									<reference key="NSSuperview" ref="768906858"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="986015194"/>
-								</object>
-							</object>
-							<string key="NSFrame">{{15, 235}, {460, 100}}</string>
-							<reference key="NSSuperview" ref="49161063"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="1067699710"/>
-							<string key="NSOffsets">{0, 0}</string>
-							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Encoding Controls</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSBackgroundColor" ref="384686844"/>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-								</object>
-							</object>
-							<reference key="NSContentView" ref="1067699710"/>
-							<int key="NSBorderType">1</int>
-							<int key="NSBoxType">4</int>
-							<int key="NSTitlePosition">0</int>
-							<bool key="NSTransparent">NO</bool>
-							<real value="2" key="NSBorderWidth2"/>
-							<double key="NSCornerRadius2">12</double>
-							<object class="NSColor" key="NSBorderColor2">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MSAxIDEgMC44AA</bytes>
-							</object>
-							<object class="NSColor" key="NSFillColor2">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MCAwIDAgMC42AA</bytes>
-							</object>
-						</object>
-					</object>
-					<string key="NSFrameSize">{490, 360}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
-					<reference key="NSNextKeyView" ref="48693112"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="616825745"/>
-					</object>
-					<int key="connectionID">184</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fCreatePreviewMovieButton</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="798240356"/>
-					</object>
-					<int key="connectionID">217</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fscaleInfoField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="245200984"/>
-					</object>
-					<int key="connectionID">282</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPreviewMovieLengthPopUp</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="598619000"/>
-					</object>
-					<int key="connectionID">232</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">previewDurationPopUpChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="598619000"/>
-					</object>
-					<int key="connectionID">233</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureControlBox</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="92351498"/>
-					</object>
-					<int key="connectionID">254</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">pictureSliderChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="396925210"/>
-					</object>
-					<int key="connectionID">212</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">createMoviePreview:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="798240356"/>
-					</object>
-					<int key="connectionID">218</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureSettingsToggleButton</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="141370142"/>
-					</object>
-					<int key="connectionID">273</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleScaleToScreen:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="81685190"/>
-					</object>
-					<int key="connectionID">279</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fScaleToScreenToggleButton</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="81685190"/>
-					</object>
-					<int key="connectionID">277</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureSlider</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="396925210"/>
-					</object>
-					<int key="connectionID">211</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showPictureSettings:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="141370142"/>
-					</object>
-					<int key="connectionID">274</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fInfoField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="628196212"/>
-					</object>
-					<int key="connectionID">73</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fGoToBeginningButton</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="897614796"/>
-					</object>
-					<int key="connectionID">380</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fMovieScrubberSlider</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="886140787"/>
-					</object>
-					<int key="connectionID">371</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fMovieInfoField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="964331174"/>
-					</object>
-					<int key="connectionID">374</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fGoToEndButton</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="894608246"/>
-					</object>
-					<int key="connectionID">381</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">moviePlaybackGoToEnd:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="894608246"/>
-					</object>
-					<int key="connectionID">383</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleMoviePreviewPlayPause:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="102183813"/>
-					</object>
-					<int key="connectionID">370</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPlayPauseButton</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="102183813"/>
-					</object>
-					<int key="connectionID">364</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">moviePlaybackGoToBeginning:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="897614796"/>
-					</object>
-					<int key="connectionID">382</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fGoToStillPreviewButton</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="630042886"/>
-					</object>
-					<int key="connectionID">368</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">previewScrubberChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="886140787"/>
-					</object>
-					<int key="connectionID">384</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fMoviePlaybackControlBox</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="700607930"/>
-					</object>
-					<int key="connectionID">363</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showPicturesPreview:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="630042886"/>
-					</object>
-					<int key="connectionID">396</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fMovieCreationProgressIndicator</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="196868285"/>
-					</object>
-					<int key="connectionID">214</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">cancelCreateMoviePreview:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="569473100"/>
-					</object>
-					<int key="connectionID">395</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPreviewMovieStatusField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="986015194"/>
-					</object>
-					<int key="connectionID">225</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fCancelPreviewMovieButton</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="569473100"/>
-					</object>
-					<int key="connectionID">263</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fEncodingControlBox</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="768906858"/>
-					</object>
-					<int key="connectionID">253</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fMovieView</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="48693112"/>
-					</object>
-					<int key="connectionID">208</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="0">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="273418435"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="355312334"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="844574444"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="837220151"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="616825745"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="49161063"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">PreviewPanel</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="49161063"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="700607930"/>
-							<reference ref="768906858"/>
-							<reference ref="92351498"/>
-							<reference ref="48693112"/>
-						</object>
-						<reference key="parent" ref="616825745"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">335</int>
-						<reference key="object" ref="700607930"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="102183813"/>
-							<reference ref="894608246"/>
-							<reference ref="897614796"/>
-							<reference ref="964331174"/>
-							<reference ref="886140787"/>
-							<reference ref="630042886"/>
-						</object>
-						<reference key="parent" ref="49161063"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">365</int>
-						<reference key="object" ref="630042886"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="999505395"/>
-						</object>
-						<reference key="parent" ref="700607930"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">375</int>
-						<reference key="object" ref="897614796"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="913339095"/>
-						</object>
-						<reference key="parent" ref="700607930"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">378</int>
-						<reference key="object" ref="894608246"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="117507013"/>
-						</object>
-						<reference key="parent" ref="700607930"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">361</int>
-						<reference key="object" ref="102183813"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="19809002"/>
-						</object>
-						<reference key="parent" ref="700607930"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">372</int>
-						<reference key="object" ref="964331174"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="113790059"/>
-						</object>
-						<reference key="parent" ref="700607930"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">341</int>
-						<reference key="object" ref="886140787"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="493667684"/>
-						</object>
-						<reference key="parent" ref="700607930"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">346</int>
-						<reference key="object" ref="493667684"/>
-						<reference key="parent" ref="886140787"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">373</int>
-						<reference key="object" ref="113790059"/>
-						<reference key="parent" ref="964331174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">362</int>
-						<reference key="object" ref="19809002"/>
-						<reference key="parent" ref="102183813"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">379</int>
-						<reference key="object" ref="117507013"/>
-						<reference key="parent" ref="894608246"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">376</int>
-						<reference key="object" ref="913339095"/>
-						<reference key="parent" ref="897614796"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">366</int>
-						<reference key="object" ref="999505395"/>
-						<reference key="parent" ref="630042886"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">252</int>
-						<reference key="object" ref="768906858"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="569473100"/>
-							<reference ref="986015194"/>
-							<reference ref="196868285"/>
-						</object>
-						<reference key="parent" ref="49161063"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">261</int>
-						<reference key="object" ref="569473100"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="908165435"/>
-						</object>
-						<reference key="parent" ref="768906858"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">223</int>
-						<reference key="object" ref="986015194"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="304208899"/>
-						</object>
-						<reference key="parent" ref="768906858"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">213</int>
-						<reference key="object" ref="196868285"/>
-						<reference key="parent" ref="768906858"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">224</int>
-						<reference key="object" ref="304208899"/>
-						<reference key="parent" ref="986015194"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">262</int>
-						<reference key="object" ref="908165435"/>
-						<reference key="parent" ref="569473100"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">251</int>
-						<reference key="object" ref="92351498"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="66510867"/>
-							<reference ref="598619000"/>
-							<reference ref="141370142"/>
-							<reference ref="798240356"/>
-							<reference ref="81685190"/>
-							<reference ref="245200984"/>
-							<reference ref="396925210"/>
-							<reference ref="628196212"/>
-						</object>
-						<reference key="parent" ref="49161063"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">38</int>
-						<reference key="object" ref="628196212"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="921881842"/>
-						</object>
-						<reference key="parent" ref="92351498"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">165</int>
-						<reference key="object" ref="921881842"/>
-						<reference key="parent" ref="628196212"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">209</int>
-						<reference key="object" ref="396925210"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="639767004"/>
-						</object>
-						<reference key="parent" ref="92351498"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">210</int>
-						<reference key="object" ref="639767004"/>
-						<reference key="parent" ref="396925210"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">280</int>
-						<reference key="object" ref="245200984"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1032360651"/>
-						</object>
-						<reference key="parent" ref="92351498"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">281</int>
-						<reference key="object" ref="1032360651"/>
-						<reference key="parent" ref="245200984"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">275</int>
-						<reference key="object" ref="81685190"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="847033897"/>
-						</object>
-						<reference key="parent" ref="92351498"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">276</int>
-						<reference key="object" ref="847033897"/>
-						<reference key="parent" ref="81685190"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">215</int>
-						<reference key="object" ref="798240356"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="975305481"/>
-						</object>
-						<reference key="parent" ref="92351498"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">216</int>
-						<reference key="object" ref="975305481"/>
-						<reference key="parent" ref="798240356"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">271</int>
-						<reference key="object" ref="141370142"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="606007744"/>
-						</object>
-						<reference key="parent" ref="92351498"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">272</int>
-						<reference key="object" ref="606007744"/>
-						<reference key="parent" ref="141370142"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">226</int>
-						<reference key="object" ref="598619000"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="953108737"/>
-						</object>
-						<reference key="parent" ref="92351498"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">227</int>
-						<reference key="object" ref="953108737"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="501672847"/>
-						</object>
-						<reference key="parent" ref="598619000"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">228</int>
-						<reference key="object" ref="501672847"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="272743761"/>
-							<reference ref="607756368"/>
-							<reference ref="372655630"/>
-						</object>
-						<reference key="parent" ref="953108737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">231</int>
-						<reference key="object" ref="372655630"/>
-						<reference key="parent" ref="501672847"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">230</int>
-						<reference key="object" ref="607756368"/>
-						<reference key="parent" ref="501672847"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">229</int>
-						<reference key="object" ref="272743761"/>
-						<reference key="parent" ref="501672847"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">234</int>
-						<reference key="object" ref="66510867"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="567286013"/>
-						</object>
-						<reference key="parent" ref="92351498"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">235</int>
-						<reference key="object" ref="567286013"/>
-						<reference key="parent" ref="66510867"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">207</int>
-						<reference key="object" ref="48693112"/>
-						<reference key="parent" ref="49161063"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>165.IBPluginDependency</string>
-					<string>207.IBPluginDependency</string>
-					<string>209.IBPluginDependency</string>
-					<string>210.IBPluginDependency</string>
-					<string>213.IBPluginDependency</string>
-					<string>215.IBAttributePlaceholdersKey</string>
-					<string>215.IBPluginDependency</string>
-					<string>215.IBViewIntegration.shadowBlurRadius</string>
-					<string>215.IBViewIntegration.shadowColor</string>
-					<string>215.IBViewIntegration.shadowOffsetHeight</string>
-					<string>215.IBViewIntegration.shadowOffsetWidth</string>
-					<string>216.IBPluginDependency</string>
-					<string>223.IBPluginDependency</string>
-					<string>224.IBPluginDependency</string>
-					<string>226.IBAttributePlaceholdersKey</string>
-					<string>226.IBPluginDependency</string>
-					<string>227.IBPluginDependency</string>
-					<string>228.IBPluginDependency</string>
-					<string>229.IBPluginDependency</string>
-					<string>230.IBPluginDependency</string>
-					<string>231.IBPluginDependency</string>
-					<string>234.IBPluginDependency</string>
-					<string>235.IBPluginDependency</string>
-					<string>251.IBPluginDependency</string>
-					<string>251.IBViewIntegration.shadowBlurRadius</string>
-					<string>251.IBViewIntegration.shadowColor</string>
-					<string>251.IBViewIntegration.shadowOffsetHeight</string>
-					<string>251.IBViewIntegration.shadowOffsetWidth</string>
-					<string>252.IBPluginDependency</string>
-					<string>252.IBViewIntegration.shadowBlurRadius</string>
-					<string>252.IBViewIntegration.shadowColor</string>
-					<string>252.IBViewIntegration.shadowOffsetHeight</string>
-					<string>252.IBViewIntegration.shadowOffsetWidth</string>
-					<string>261.IBAttributePlaceholdersKey</string>
-					<string>261.IBPluginDependency</string>
-					<string>262.IBPluginDependency</string>
-					<string>271.IBAttributePlaceholdersKey</string>
-					<string>271.IBPluginDependency</string>
-					<string>271.IBViewIntegration.shadowBlurRadius</string>
-					<string>271.IBViewIntegration.shadowColor</string>
-					<string>271.IBViewIntegration.shadowOffsetHeight</string>
-					<string>271.IBViewIntegration.shadowOffsetWidth</string>
-					<string>272.IBPluginDependency</string>
-					<string>275.IBAttributePlaceholdersKey</string>
-					<string>275.IBPluginDependency</string>
-					<string>275.IBViewIntegration.shadowBlurRadius</string>
-					<string>275.IBViewIntegration.shadowColor</string>
-					<string>275.IBViewIntegration.shadowOffsetHeight</string>
-					<string>275.IBViewIntegration.shadowOffsetWidth</string>
-					<string>276.IBPluginDependency</string>
-					<string>280.IBPluginDependency</string>
-					<string>281.IBPluginDependency</string>
-					<string>335.IBPluginDependency</string>
-					<string>335.IBViewIntegration.shadowBlurRadius</string>
-					<string>335.IBViewIntegration.shadowColor</string>
-					<string>335.IBViewIntegration.shadowOffsetHeight</string>
-					<string>335.IBViewIntegration.shadowOffsetWidth</string>
-					<string>341.IBPluginDependency</string>
-					<string>346.IBPluginDependency</string>
-					<string>361.IBAttributePlaceholdersKey</string>
-					<string>361.IBPluginDependency</string>
-					<string>362.IBPluginDependency</string>
-					<string>365.IBAttributePlaceholdersKey</string>
-					<string>365.IBPluginDependency</string>
-					<string>365.IBViewIntegration.shadowBlurRadius</string>
-					<string>365.IBViewIntegration.shadowColor</string>
-					<string>365.IBViewIntegration.shadowOffsetHeight</string>
-					<string>365.IBViewIntegration.shadowOffsetWidth</string>
-					<string>366.IBPluginDependency</string>
-					<string>372.IBPluginDependency</string>
-					<string>373.IBPluginDependency</string>
-					<string>375.IBAttributePlaceholdersKey</string>
-					<string>375.IBPluginDependency</string>
-					<string>376.IBPluginDependency</string>
-					<string>378.IBAttributePlaceholdersKey</string>
-					<string>378.IBPluginDependency</string>
-					<string>379.IBPluginDependency</string>
-					<string>38.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>5.IBWindowTemplateEditedContentRect</string>
-					<string>6.IBPluginDependency</string>
-					<string>6.IBViewIntegration.shadowBlurRadius</string>
-					<string>6.IBViewIntegration.shadowColor</string>
-					<string>6.IBViewIntegration.shadowOffsetHeight</string>
-					<string>6.IBViewIntegration.shadowOffsetWidth</string>
-				</object>
-				<object class="NSArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.QTKitIBPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<string key="NS.key.0">ToolTip</string>
-						<object class="IBToolTipAttribute" key="NS.object.0">
-							<string key="name">ToolTip</string>
-							<reference key="object" ref="798240356"/>
-							<string key="toolTip">Encode And Play Back A Live Preview At Your Current Settings</string>
-						</object>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="0"/>
-					<object class="NSColor" id="864448722">
-						<int key="NSColorSpace">3</int>
-						<bytes key="NSWhite">MAA</bytes>
-					</object>
-					<integer value="0"/>
-					<integer value="0"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<string key="NS.key.0">ToolTip</string>
-						<object class="IBToolTipAttribute" key="NS.object.0">
-							<string key="name">ToolTip</string>
-							<reference key="object" ref="598619000"/>
-							<string key="toolTip">Select The Length Of Live Preview to Encode</string>
-						</object>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="0"/>
-					<reference ref="864448722"/>
-					<integer value="0"/>
-					<integer value="0"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="0"/>
-					<reference ref="864448722"/>
-					<integer value="0"/>
-					<integer value="0"/>
-					<object class="NSMutableDictionary">
-						<string key="NS.key.0">ToolTip</string>
-						<object class="IBToolTipAttribute" key="NS.object.0">
-							<string key="name">ToolTip</string>
-							<reference key="object" ref="569473100"/>
-							<string key="toolTip">Cancel Live Preview Encode</string>
-						</object>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<string key="NS.key.0">ToolTip</string>
-						<object class="IBToolTipAttribute" key="NS.object.0">
-							<string key="name">ToolTip</string>
-							<reference key="object" ref="141370142"/>
-							<string key="toolTip">Show Picture Settings Inspector</string>
-						</object>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="0"/>
-					<reference ref="864448722"/>
-					<integer value="0"/>
-					<integer value="0"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<string key="NS.key.0">ToolTip</string>
-						<object class="IBToolTipAttribute" key="NS.object.0">
-							<string key="name">ToolTip</string>
-							<reference key="object" ref="81685190"/>
-							<string key="toolTip">Scale Preview To Screen</string>
-						</object>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="0"/>
-					<reference ref="864448722"/>
-					<integer value="0"/>
-					<integer value="0"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="0"/>
-					<reference ref="864448722"/>
-					<integer value="0"/>
-					<integer value="0"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<string key="NS.key.0">ToolTip</string>
-						<object class="IBToolTipAttribute" key="NS.object.0">
-							<string key="name">ToolTip</string>
-							<reference key="object" ref="102183813"/>
-							<string key="toolTip">Toggle Play/Pause</string>
-						</object>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<string key="NS.key.0">ToolTip</string>
-						<object class="IBToolTipAttribute" key="NS.object.0">
-							<string key="name">ToolTip</string>
-							<reference key="object" ref="630042886"/>
-							<string key="toolTip">Show Still Previews</string>
-						</object>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="0"/>
-					<reference ref="864448722"/>
-					<integer value="0"/>
-					<integer value="0"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<string key="NS.key.0">ToolTip</string>
-						<object class="IBToolTipAttribute" key="NS.object.0">
-							<string key="name">ToolTip</string>
-							<reference key="object" ref="897614796"/>
-							<string key="toolTip">Go To Beginning</string>
-						</object>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<string key="NS.key.0">ToolTip</string>
-						<object class="IBToolTipAttribute" key="NS.object.0">
-							<string key="name">ToolTip</string>
-							<reference key="object" ref="894608246"/>
-							<string key="toolTip">Go To End</string>
-						</object>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{262, 474}, {490, 360}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<real value="0.0"/>
-					<reference ref="864448722"/>
-					<real value="0.0"/>
-					<real value="0.0"/>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">396</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">PreviewController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>cancelCreateMoviePreview:</string>
-							<string>createMoviePreview:</string>
-							<string>moviePlaybackGoBackwardOneFrame:</string>
-							<string>moviePlaybackGoForwardOneFrame:</string>
-							<string>moviePlaybackGoToBeginning:</string>
-							<string>moviePlaybackGoToEnd:</string>
-							<string>pictureSliderChanged:</string>
-							<string>previewDurationPopUpChanged:</string>
-							<string>previewScrubberChanged:</string>
-							<string>settingsChanged:</string>
-							<string>showMoviePreview:</string>
-							<string>showPictureSettings:</string>
-							<string>showPicturesPreview:</string>
-							<string>toggleMoviePreviewPlayPause:</string>
-							<string>toggleScaleToScreen:</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>NSString</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>cancelCreateMoviePreview:</string>
-							<string>createMoviePreview:</string>
-							<string>moviePlaybackGoBackwardOneFrame:</string>
-							<string>moviePlaybackGoForwardOneFrame:</string>
-							<string>moviePlaybackGoToBeginning:</string>
-							<string>moviePlaybackGoToEnd:</string>
-							<string>pictureSliderChanged:</string>
-							<string>previewDurationPopUpChanged:</string>
-							<string>previewScrubberChanged:</string>
-							<string>settingsChanged:</string>
-							<string>showMoviePreview:</string>
-							<string>showPictureSettings:</string>
-							<string>showPicturesPreview:</string>
-							<string>toggleMoviePreviewPlayPause:</string>
-							<string>toggleScaleToScreen:</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">cancelCreateMoviePreview:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">createMoviePreview:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">moviePlaybackGoBackwardOneFrame:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">moviePlaybackGoForwardOneFrame:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">moviePlaybackGoToBeginning:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">moviePlaybackGoToEnd:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">pictureSliderChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">previewDurationPopUpChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">previewScrubberChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">settingsChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showMoviePreview:</string>
-								<string key="candidateClassName">NSString</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showPictureSettings:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showPicturesPreview:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">toggleMoviePreviewPlayPause:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">toggleScaleToScreen:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>fCancelPreviewMovieButton</string>
-							<string>fCreatePreviewMovieButton</string>
-							<string>fEncodingControlBox</string>
-							<string>fGoBackwardOneFrameButton</string>
-							<string>fGoForwardOneFrameButton</string>
-							<string>fGoToBeginningButton</string>
-							<string>fGoToEndButton</string>
-							<string>fGoToStillPreviewButton</string>
-							<string>fInfoField</string>
-							<string>fMovieCreationProgressIndicator</string>
-							<string>fMovieInfoField</string>
-							<string>fMoviePlaybackControlBox</string>
-							<string>fMovieScrubberSlider</string>
-							<string>fMovieView</string>
-							<string>fPictureControlBox</string>
-							<string>fPictureSettingsToggleButton</string>
-							<string>fPictureSlider</string>
-							<string>fPlayPauseButton</string>
-							<string>fPreviewMovieLengthPopUp</string>
-							<string>fPreviewMovieStatusField</string>
-							<string>fScaleToScreenToggleButton</string>
-							<string>fShowPreviewMovieButton</string>
-							<string>fscaleInfoField</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSBox</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSProgressIndicator</string>
-							<string>NSTextField</string>
-							<string>NSBox</string>
-							<string>NSSlider</string>
-							<string>QTMovieView</string>
-							<string>NSBox</string>
-							<string>NSButton</string>
-							<string>NSSlider</string>
-							<string>NSButton</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>fCancelPreviewMovieButton</string>
-							<string>fCreatePreviewMovieButton</string>
-							<string>fEncodingControlBox</string>
-							<string>fGoBackwardOneFrameButton</string>
-							<string>fGoForwardOneFrameButton</string>
-							<string>fGoToBeginningButton</string>
-							<string>fGoToEndButton</string>
-							<string>fGoToStillPreviewButton</string>
-							<string>fInfoField</string>
-							<string>fMovieCreationProgressIndicator</string>
-							<string>fMovieInfoField</string>
-							<string>fMoviePlaybackControlBox</string>
-							<string>fMovieScrubberSlider</string>
-							<string>fMovieView</string>
-							<string>fPictureControlBox</string>
-							<string>fPictureSettingsToggleButton</string>
-							<string>fPictureSlider</string>
-							<string>fPlayPauseButton</string>
-							<string>fPreviewMovieLengthPopUp</string>
-							<string>fPreviewMovieStatusField</string>
-							<string>fScaleToScreenToggleButton</string>
-							<string>fShowPreviewMovieButton</string>
-							<string>fscaleInfoField</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fCancelPreviewMovieButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fCreatePreviewMovieButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fEncodingControlBox</string>
-								<string key="candidateClassName">NSBox</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fGoBackwardOneFrameButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fGoForwardOneFrameButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fGoToBeginningButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fGoToEndButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fGoToStillPreviewButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fInfoField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fMovieCreationProgressIndicator</string>
-								<string key="candidateClassName">NSProgressIndicator</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fMovieInfoField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fMoviePlaybackControlBox</string>
-								<string key="candidateClassName">NSBox</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fMovieScrubberSlider</string>
-								<string key="candidateClassName">NSSlider</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fMovieView</string>
-								<string key="candidateClassName">QTMovieView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPictureControlBox</string>
-								<string key="candidateClassName">NSBox</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPictureSettingsToggleButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPictureSlider</string>
-								<string key="candidateClassName">NSSlider</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPlayPauseButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPreviewMovieLengthPopUp</string>
-								<string key="candidateClassName">NSPopUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPreviewMovieStatusField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fScaleToScreenToggleButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fShowPreviewMovieButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fscaleInfoField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/PreviewController.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>NSMenuCheckmark</string>
-				<string>NSMenuMixedState</string>
-				<string>next-p</string>
-				<string>pause-p</string>
-				<string>play-p</string>
-				<string>prev-p</string>
-			</object>
-			<object class="NSArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{11, 11}</string>
-				<string>{10, 3}</string>
-				<string>{48, 48}</string>
-				<string>{48, 48}</string>
-				<string>{48, 48}</string>
-				<string>{48, 48}</string>
-			</object>
-		</object>
-	</data>
-</archive>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="14A329r" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <deployment version="1060" defaultVersion="1060" identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
+ <plugIn identifier="com.apple.QTKitIBPlugin" version="5056"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="HBPreviewController">
+ <connections>
+ <outlet property="fEncodingControlBox" destination="F8A-dU-Y1l" id="s29-SQ-WXg"/>
+ <outlet property="fInfoField" destination="38" id="73"/>
+ <outlet property="fMovieCreationProgressIndicator" destination="213" id="214"/>
+ <outlet property="fMovieInfoField" destination="372" id="374"/>
+ <outlet property="fMoviePlaybackControlBox" destination="COi-Ia-2yt" id="dcQ-Bp-1jG"/>
+ <outlet property="fMovieScrubberSlider" destination="341" id="371"/>
+ <outlet property="fMovieView" destination="207" id="208"/>
+ <outlet property="fPictureControlBox" destination="2me-4k-EDi" id="ABj-KD-Z3U"/>
+ <outlet property="fPictureSlider" destination="209" id="211"/>
+ <outlet property="fPlayPauseButton" destination="361" id="364"/>
+ <outlet property="fPreviewMovieLengthPopUp" destination="226" id="232"/>
+ <outlet property="fPreviewMovieStatusField" destination="223" id="225"/>
+ <outlet property="fScaleToScreenToggleButton" destination="275" id="yX0-fL-6J9"/>
+ <outlet property="fscaleInfoField" destination="280" id="282"/>
+ <outlet property="window" destination="5" id="184"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application"/>
+ <window title="HandBrake Preview" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="PreviewPanel" customClass="NSPanel">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="221" y="837" width="490" height="360"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
+ <view key="contentView" id="6">
+ <rect key="frame" x="0.0" y="0.0" width="490" height="360"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <qtMovieView preservesAspectRatio="YES" id="207">
+ <rect key="frame" x="0.0" y="0.0" width="490" height="360"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="fillColor" red="0.80000000999999998" green="0.80000000999999998" blue="0.80000000999999998" alpha="1" colorSpace="calibratedRGB"/>
+ </qtMovieView>
+ <customView id="2me-4k-EDi" userLabel="Picture Controls" customClass="HBHUDView">
+ <rect key="frame" x="15" y="136" width="460" height="100"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <subviews>
+ <button toolTip="Encode And Play Back A Live Preview At Your Current Settings" verticalHuggingPriority="750" id="215">
+ <rect key="frame" x="17" y="11" width="80" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <buttonCell key="cell" type="push" title="Live Preview" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="216">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="createMoviePreview:" target="-2" id="218"/>
+ </connections>
+ </button>
+ <button toolTip="Show Picture Settings Inspector" verticalHuggingPriority="750" id="271">
+ <rect key="frame" x="378" y="11" width="61" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <buttonCell key="cell" type="push" title="Settings" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="272">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="showPictureSettings:" target="-2" id="274"/>
+ </connections>
+ </button>
+ <button toolTip="Scale Preview To Screen" verticalHuggingPriority="750" id="275">
+ <rect key="frame" x="276" y="11" width="96" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <buttonCell key="cell" type="push" title="Scale To Screen" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="276">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="toggleScaleToScreen:" target="-2" id="279"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" id="234">
+ <rect key="frame" x="105" y="14" width="48" height="11"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Duration:" id="235">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="q81-Om-Azd">
+ <rect key="frame" x="211" y="14" width="21" height="11"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="sec" id="APs-l9-qFj">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton toolTip="Select The Length Of Live Preview to Encode" verticalHuggingPriority="750" id="226">
+ <rect key="frame" x="158" y="12" width="49" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="240" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="231" id="227">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="228">
+ <items>
+ <menuItem title="240" state="on" id="231"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="previewDurationPopUpChanged:" target="-2" id="233"/>
+ </connections>
+ </popUpButton>
+ <slider verticalHuggingPriority="750" id="209">
+ <rect key="frame" x="18" y="39" width="420" height="16"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+ <sliderCell key="cell" controlSize="mini" continuous="YES" alignment="left" maxValue="9" tickMarkPosition="above" numberOfTickMarks="10" allowsTickMarkValuesOnly="YES" sliderType="linear" id="210">
+ 
+ </sliderCell>
+ <connections>
+ <action selector="pictureSliderChanged:" target="-2" id="212"/>
+ </connections>
+ </slider>
+ <textField verticalHuggingPriority="750" id="38">
+ <rect key="frame" x="15" y="55" width="430" height="20"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" id="165">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="280">
+ <rect key="frame" x="15" y="77" width="426" height="12"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="left" id="281">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ </customView>
+ <customView hidden="YES" id="COi-Ia-2yt" userLabel="Playback Controls" customClass="HBHUDView">
+ <rect key="frame" x="15" y="32" width="460" height="100"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <subviews>
+ <slider verticalHuggingPriority="750" id="341">
+ <rect key="frame" x="18" y="17" width="337" height="21"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+ <sliderCell key="cell" continuous="YES" alignment="left" maxValue="100" tickMarkPosition="above" sliderType="linear" id="346"/>
+ <connections>
+ <action selector="previewScrubberChanged:" target="-2" id="384"/>
+ </connections>
+ </slider>
+ <button toolTip="Toggle Play/Pause" id="361">
+ <rect key="frame" x="207" y="44" width="36" height="36"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="play-p" imagePosition="only" alignment="center" alternateImage="pause-p" imageScaling="proportionallyDown" id="362">
+ <behavior key="behavior" pushIn="YES" changeContents="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="toggleMoviePreviewPlayPause:" target="-2" id="370"/>
+ </connections>
+ </button>
+ <button toolTip="Go To Beginning" id="375">
+ <rect key="frame" x="165" y="49" width="32" height="26"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="prev-p" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" id="376">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="moviePlaybackGoToBeginning:" target="-2" id="382"/>
+ </connections>
+ </button>
+ <button toolTip="Go To End" id="378">
+ <rect key="frame" x="253" y="49" width="32" height="26"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="next-p" imagePosition="only" alignment="center" controlSize="mini" imageScaling="proportionallyDown" id="379">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="moviePlaybackGoToEnd:" target="-2" id="383"/>
+ </connections>
+ </button>
+ <button toolTip="Show Still Previews" verticalHuggingPriority="750" id="365">
+ <rect key="frame" x="350" y="54" width="81" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <buttonCell key="cell" type="push" title="Still Previews" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="366">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="showPicturesPreview:" target="-2" id="396"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" id="372">
+ <rect key="frame" x="349" y="20" width="94" height="14"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="right" title="00:00:00" id="373">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ </customView>
+ <customView hidden="YES" id="F8A-dU-Y1l" userLabel="Encoding Controls" customClass="HBHUDView">
+ <rect key="frame" x="15" y="240" width="460" height="100"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" id="223">
+ <rect key="frame" x="17" y="60" width="425" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Preparing Preview" id="224">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.90196085000000004" green="0.90196085000000004" blue="0.90196085000000004" alpha="0.0" colorSpace="deviceRGB"/>
+ </textFieldCell>
+ </textField>
+ <progressIndicator verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" controlSize="small" style="bar" id="213">
+ <rect key="frame" x="20" y="27" width="346" height="12"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </progressIndicator>
+ <button toolTip="Cancel Live Preview Encode" verticalHuggingPriority="750" id="261">
+ <rect key="frame" x="383" y="25" width="58" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="262">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="cancelCreateMoviePreview:" target="-2" id="395"/>
+ </connections>
+ </button>
+ </subviews>
+ </customView>
+ </subviews>
+ </view>
+ </window>
+ </objects>
+ <resources>
+ <image name="next-p" width="48" height="48"/>
+ <image name="pause-p" width="48" height="48"/>
+ <image name="play-p" width="48" height="48"/>
+ <image name="prev-p" width="48" height="48"/>
+ </resources>
+</document>

HandBrake-0.9.9.tar.bz2/macosx/English.lproj/PictureSettings.xib -> HandBrake-0.10.0.tar.bz2/macosx/English.lproj/PictureSettings.xib Changed

@@ -1,4772 +1,902 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
-	<data>
-		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">9G55</string>
-		<string key="IBDocument.InterfaceBuilderVersion">677</string>
-		<string key="IBDocument.AppKitVersion">949.43</string>
-		<string key="IBDocument.HIToolboxVersion">353.00</string>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="436"/>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="273418435">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="355312334">
-				<string key="NSClassName">PictureController</string>
-			</object>
-			<object class="NSCustomObject" id="844574444">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="837220151">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="616825745">
-				<int key="NSWindowStyleMask">8215</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{63, 414}, {849, 399}}</string>
-				<int key="NSWTFlags">-260570112</int>
-				<string key="NSWindowTitle">Picture Settings</string>
-				<string key="NSWindowClass">NSPanel</string>
-				<object class="NSMutableString" key="NSViewClass">
-					<characters key="NS.bytes">View</characters>
-				</object>
-				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
-				<object class="NSView" key="NSWindowView" id="49161063">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSTextField" id="922381307">
-							<reference key="NSNextResponder" ref="49161063"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{19, 474}, {55, 17}}</string>
-							<reference key="NSSuperview" ref="49161063"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="1037100053">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">4194304</int>
-								<string key="NSContents">Size</string>
-								<object class="NSFont" key="NSSupport" id="26">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">1.100000e+01</double>
-									<int key="NSfFlags">3100</int>
-								</object>
-								<reference key="NSControlView" ref="922381307"/>
-								<object class="NSColor" key="NSBackgroundColor" id="407686733">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">controlColor</string>
-									<object class="NSColor" key="NSColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
-									</object>
-								</object>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">1</int>
-									<bytes key="NSRGB">MC44MDAwMDAwMSAwLjgwMDAwMDAxIDAuODAwMDAwMDEAA</bytes>
-								</object>
-							</object>
-						</object>
-						<object class="NSButton" id="892118626">
-							<reference key="NSNextResponder" ref="49161063"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{19, 373}, {57, 25}}</string>
-							<reference key="NSSuperview" ref="49161063"/>
-							<bool key="NSViewIsLayerTreeHost">YES</bool>
-							<object class="NSArray" key="NSViewContentFilters">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="CIColorMonochrome">
-									<object class="CIColor" key="CI_inputColor">
-										<float key="red">7.019608e-01</float>
-										<float key="green">7.019608e-01</float>
-										<float key="blue">7.019608e-01</float>
-										<float key="alpha">1.000000e+00</float>
-									</object>
-									<real value="1.000000e+00" key="CI_inputIntensity" id="559925184"/>
-									<bool key="CIEnabled">YES</bool>
-								</object>
-							</object>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="533593716">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">134479872</int>
-								<string key="NSContents">Preview</string>
-								<object class="NSFont" key="NSSupport" id="22">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">9.000000e+00</double>
-									<int key="NSfFlags">3614</int>
-								</object>
-								<reference key="NSControlView" ref="892118626"/>
-								<int key="NSButtonFlags">-2038284033</int>
-								<int key="NSButtonFlags2">163</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-						</object>
-						<object class="NSTextField" id="154029488">
-							<reference key="NSNextResponder" ref="49161063"/>
-							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{18, 6}, {425, 19}}</string>
-							<reference key="NSSuperview" ref="49161063"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="63504302">
-								<int key="NSCellFlags">-2079195584</int>
-								<int key="NSCellFlags2">4457472</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="22"/>
-								<reference key="NSControlView" ref="154029488"/>
-								<object class="NSColor" key="NSBackgroundColor">
-									<int key="NSColorSpace">1</int>
-									<bytes key="NSRGB">MC4yIDAuMiAwLjIAA</bytes>
-								</object>
-								<object class="NSColor" key="NSTextColor" id="852384715">
-									<int key="NSColorSpace">1</int>
-									<bytes key="NSRGB">MSAxIDEAA</bytes>
-								</object>
-							</object>
-						</object>
-						<object class="NSTabView" id="570027662">
-							<reference key="NSNextResponder" ref="49161063"/>
-							<int key="NSvFlags">18</int>
-							<string key="NSFrame">{{15, 19}, {821, 362}}</string>
-							<reference key="NSSuperview" ref="49161063"/>
-							<object class="NSArray" key="NSViewContentFilters">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="CIColorMonochrome">
-									<object class="CIColor" key="CI_inputColor">
-										<float key="red">7.019608e-01</float>
-										<float key="green">7.019608e-01</float>
-										<float key="blue">7.019608e-01</float>
-										<float key="alpha">1.000000e+00</float>
-									</object>
-									<real value="1.000000e+00" key="CI_inputIntensity"/>
-									<bool key="CIEnabled">YES</bool>
-								</object>
-							</object>
-							<object class="NSMutableArray" key="NSTabViewItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSTabViewItem" id="184512336">
-									<string key="NSIdentifier">1</string>
-									<object class="NSView" key="NSView" id="490590002">
-										<reference key="NSNextResponder" ref="570027662"/>
-										<int key="NSvFlags">256</int>
-										<object class="NSMutableArray" key="NSSubviews">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSBox" id="291242569">
-												<reference key="NSNextResponder" ref="490590002"/>
-												<int key="NSvFlags">268</int>
-												<object class="NSMutableArray" key="NSSubviews">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSView" id="93103015">
-														<reference key="NSNextResponder" ref="291242569"/>
-														<int key="NSvFlags">256</int>
-														<object class="NSMutableArray" key="NSSubviews">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<object class="NSTextField" id="84657333">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{203, 93}, {82, 16}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="752977354">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">71434240</int>
-																	<string key="NSContents">Display Width:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="84657333"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="924352608">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">292</int>
-																<string key="NSFrame">{{289, 93}, {61, 16}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="617679053">
-																	<int key="NSCellFlags">-1804468671</int>
-																	<int key="NSCellFlags2">4457472</int>
-																	<string key="NSContents"/>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="924352608"/>
-																	<bool key="NSDrawsBackground">YES</bool>
-																	<object class="NSColor" key="NSBackgroundColor">
-																		<int key="NSColorSpace">1</int>
-																		<bytes key="NSRGB">MC4yIDAuMiAwLjIAA</bytes>
-																	</object>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="998049160">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">292</int>
-																<string key="NSFrame">{{446, 94}, {37, 16}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="564975975">
-																	<int key="NSCellFlags">-1804468671</int>
-																	<int key="NSCellFlags2">4457472</int>
-																	<string key="NSContents"/>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="998049160"/>
-																	<bool key="NSDrawsBackground">YES</bool>
-																	<object class="NSColor" key="NSBackgroundColor">
-																		<int key="NSColorSpace">1</int>
-																		<bytes key="NSRGB">MC4yIDAuMiAwLjIAA</bytes>
-																	</object>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="601215307">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">292</int>
-																<string key="NSFrame">{{446, 52}, {37, 16}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="119145016">
-																	<int key="NSCellFlags">-1804468671</int>
-																	<int key="NSCellFlags2">4457472</int>
-																	<string key="NSContents"/>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="601215307"/>
-																	<bool key="NSDrawsBackground">YES</bool>
-																	<object class="NSColor" key="NSBackgroundColor">
-																		<int key="NSColorSpace">1</int>
-																		<bytes key="NSRGB">MC4yIDAuMiAwLjIAA</bytes>
-																	</object>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="122509689">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{375, 94}, {67, 16}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="486553162">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">71434240</int>
-																	<string key="NSContents">PAR Width:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="122509689"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="810439401">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{370, 52}, {71, 16}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="134407475">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">71434240</int>
-																	<string key="NSContents">PAR Height:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="810439401"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSStepper" id="221469578">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">292</int>
-																<string key="NSFrame">{{155, 90}, {15, 22}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSViewIsLayerTreeHost">YES</bool>
-																<object class="NSArray" key="NSViewContentFilters">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="CIColorMonochrome">
-																		<object class="CIColor" key="CI_inputColor">
-																			<float key="red">7.019608e-01</float>
-																			<float key="green">7.019608e-01</float>
-																			<float key="blue">7.019608e-01</float>
-																			<float key="alpha">1.000000e+00</float>
-																		</object>
-																		<reference key="CI_inputIntensity" ref="559925184"/>
-																		<bool key="CIEnabled">YES</bool>
-																	</object>
-																</object>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSStepperCell" key="NSCell" id="714433793">
-																	<int key="NSCellFlags">68025888</int>
-																	<int key="NSCellFlags2">131072</int>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="221469578"/>
-																	<double key="NSValue">6.400000e+01</double>
-																	<double key="NSMinValue">6.400000e+01</double>
-																	<double key="NSMaxValue">5.900000e+01</double>
-																	<double key="NSIncrement">1.600000e+01</double>
-																	<bool key="NSAutorepeat">YES</bool>
-																</object>
-															</object>
-															<object class="NSPopUpButton" id="387637584">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">292</int>
-																<string key="NSFrame">{{91, 9}, {46, 15}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSViewIsLayerTreeHost">YES</bool>
-																<object class="NSArray" key="NSViewContentFilters">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="CIColorMonochrome">
-																		<object class="CIColor" key="CI_inputColor">
-																			<float key="red">7.019608e-01</float>
-																			<float key="green">7.019608e-01</float>
-																			<float key="blue">7.019608e-01</float>
-																			<float key="alpha">1.000000e+00</float>
-																		</object>
-																		<real value="1.000000e+00" key="CI_inputIntensity" id="484376035"/>
-																		<bool key="CIEnabled">YES</bool>
-																	</object>
-																</object>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSPopUpButtonCell" key="NSCell" id="800808932">
-																	<int key="NSCellFlags">-2076049856</int>
-																	<int key="NSCellFlags2">264192</int>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="387637584"/>
-																	<int key="NSButtonFlags">109199615</int>
-																	<int key="NSButtonFlags2">1</int>
-																	<string key="NSAlternateContents"/>
-																	<string key="NSKeyEquivalent"/>
-																	<int key="NSPeriodicDelay">400</int>
-																	<int key="NSPeriodicInterval">75</int>
-																	<object class="NSMenuItem" key="NSMenuItem" id="588147075">
-																		<reference key="NSMenu" ref="246883325"/>
-																		<string key="NSTitle">16</string>
-																		<string key="NSKeyEquiv"/>
-																		<int key="NSKeyEquivModMask">1048576</int>
-																		<int key="NSMnemonicLoc">2147483647</int>
-																		<int key="NSState">1</int>
-																		<object class="NSCustomResource" key="NSOnImage" id="279874594">
-																			<string key="NSClassName">NSImage</string>
-																			<string key="NSResourceName">NSMenuCheckmark</string>
-																		</object>
-																		<object class="NSCustomResource" key="NSMixedImage" id="300720659">
-																			<string key="NSClassName">NSImage</string>
-																			<string key="NSResourceName">NSMenuMixedState</string>
-																		</object>
-																		<string key="NSAction">_popUpItemAction:</string>
-																		<reference key="NSTarget" ref="800808932"/>
-																	</object>
-																	<bool key="NSMenuItemRespectAlignment">YES</bool>
-																	<object class="NSMenu" key="NSMenu" id="246883325">
-																		<string key="NSTitle">OtherViews</string>
-																		<object class="NSMutableArray" key="NSMenuItems">
-																			<bool key="EncodedWithXMLCoder">YES</bool>
-																			<reference ref="588147075"/>
-																			<object class="NSMenuItem" id="940982828">
-																				<reference key="NSMenu" ref="246883325"/>
-																				<string key="NSTitle">8</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<reference key="NSOnImage" ref="279874594"/>
-																				<reference key="NSMixedImage" ref="300720659"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="800808932"/>
-																			</object>
-																			<object class="NSMenuItem" id="765075061">
-																				<reference key="NSMenu" ref="246883325"/>
-																				<string key="NSTitle">4</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<reference key="NSOnImage" ref="279874594"/>
-																				<reference key="NSMixedImage" ref="300720659"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="800808932"/>
-																			</object>
-																		</object>
-																	</object>
-																	<int key="NSPreferredEdge">1</int>
-																	<bool key="NSUsesItemFromMenu">YES</bool>
-																	<bool key="NSAltersState">YES</bool>
-																	<int key="NSArrowPosition">2</int>
-																</object>
-															</object>
-															<object class="NSTextField" id="232869468">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">292</int>
-																<string key="NSFrame">{{91, 95}, {62, 16}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="96315080">
-																	<int key="NSCellFlags">-2075001280</int>
-																	<int key="NSCellFlags2">4457472</int>
-																	<string key="NSContents"/>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="232869468"/>
-																	<bool key="NSDrawsBackground">YES</bool>
-																	<object class="NSColor" key="NSBackgroundColor" id="501609908">
-																		<int key="NSColorSpace">1</int>
-																		<bytes key="NSRGB">MC4yIDAuMiAwLjIAA</bytes>
-																	</object>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSStepper" id="667015191">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">292</int>
-																<string key="NSFrame">{{155, 49}, {15, 22}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSStepperCell" key="NSCell" id="634499157">
-																	<int key="NSCellFlags">68025888</int>
-																	<int key="NSCellFlags2">131072</int>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="667015191"/>
-																	<double key="NSValue">5.900000e+01</double>
-																	<double key="NSMinValue">6.400000e+01</double>
-																	<double key="NSMaxValue">5.900000e+01</double>
-																	<double key="NSIncrement">1.600000e+01</double>
-																	<bool key="NSAutorepeat">YES</bool>
-																</object>
-															</object>
-															<object class="NSTextField" id="301555397">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">292</int>
-																<string key="NSFrame">{{10, 31}, {73, 14}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="926890760">
-																	<int key="NSCellFlags">67239488</int>
-																	<int key="NSCellFlags2">71435264</int>
-																	<string key="NSContents">Anamorphic:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="301555397"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="513894170">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">292</int>
-																<string key="NSFrame">{{28, 55}, {55, 14}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="863668536">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">71434240</int>
-																	<string key="NSContents">Height:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="513894170"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSPopUpButton" id="147098438">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">292</int>
-																<string key="NSFrame">{{90, 30}, {80, 15}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<object class="NSArray" key="NSViewContentFilters">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="CIColorMonochrome">
-																		<object class="CIColor" key="CI_inputColor">
-																			<float key="red">7.019608e-01</float>
-																			<float key="green">7.019608e-01</float>
-																			<float key="blue">7.019608e-01</float>
-																			<float key="alpha">1.000000e+00</float>
-																		</object>
-																		<reference key="CI_inputIntensity" ref="559925184"/>
-																		<bool key="CIEnabled">YES</bool>
-																	</object>
-																</object>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSPopUpButtonCell" key="NSCell" id="261514411">
-																	<int key="NSCellFlags">-2076049856</int>
-																	<int key="NSCellFlags2">264192</int>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="147098438"/>
-																	<int key="NSButtonFlags">109199615</int>
-																	<int key="NSButtonFlags2">1</int>
-																	<string key="NSAlternateContents"/>
-																	<string key="NSKeyEquivalent"/>
-																	<int key="NSPeriodicDelay">400</int>
-																	<int key="NSPeriodicInterval">75</int>
-																	<object class="NSMenuItem" key="NSMenuItem" id="85032843">
-																		<reference key="NSMenu" ref="577969360"/>
-																		<string key="NSTitle">Item 1</string>
-																		<string key="NSKeyEquiv"/>
-																		<int key="NSKeyEquivModMask">1048576</int>
-																		<int key="NSMnemonicLoc">2147483647</int>
-																		<int key="NSState">1</int>
-																		<reference key="NSOnImage" ref="279874594"/>
-																		<reference key="NSMixedImage" ref="300720659"/>
-																		<string key="NSAction">_popUpItemAction:</string>
-																		<reference key="NSTarget" ref="261514411"/>
-																	</object>
-																	<bool key="NSMenuItemRespectAlignment">YES</bool>
-																	<object class="NSMenu" key="NSMenu" id="577969360">
-																		<string key="NSTitle">OtherViews</string>
-																		<object class="NSMutableArray" key="NSMenuItems">
-																			<bool key="EncodedWithXMLCoder">YES</bool>
-																			<reference ref="85032843"/>
-																			<object class="NSMenuItem" id="804424712">
-																				<reference key="NSMenu" ref="577969360"/>
-																				<string key="NSTitle">Item 2</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<reference key="NSOnImage" ref="279874594"/>
-																				<reference key="NSMixedImage" ref="300720659"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="261514411"/>
-																			</object>
-																			<object class="NSMenuItem" id="1018195923">
-																				<reference key="NSMenu" ref="577969360"/>
-																				<string key="NSTitle">Item 3</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<reference key="NSOnImage" ref="279874594"/>
-																				<reference key="NSMixedImage" ref="300720659"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="261514411"/>
-																			</object>
-																		</object>
-																	</object>
-																	<int key="NSPreferredEdge">1</int>
-																	<bool key="NSUsesItemFromMenu">YES</bool>
-																	<bool key="NSAltersState">YES</bool>
-																	<int key="NSArrowPosition">2</int>
-																</object>
-															</object>
-															<object class="NSTextField" id="902766107">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">292</int>
-																<string key="NSFrame">{{10, 10}, {73, 14}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="377264474">
-																	<int key="NSCellFlags">67239488</int>
-																	<int key="NSCellFlags2">71435264</int>
-																	<string key="NSContents">Modulus:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="902766107"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="569671425">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">292</int>
-																<string key="NSFrame">{{0, 95}, {82, 14}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="412868245">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">71434240</int>
-																	<string key="NSContents">Width:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="569671425"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="443002022">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">292</int>
-																<string key="NSFrame">{{91, 52}, {62, 16}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="649389918">
-																	<int key="NSCellFlags">-2075001280</int>
-																	<int key="NSCellFlags2">4457472</int>
-																	<string key="NSContents"/>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="443002022"/>
-																	<bool key="NSDrawsBackground">YES</bool>
-																	<reference key="NSBackgroundColor" ref="501609908"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSButton" id="302614967">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">292</int>
-																<string key="NSFrame">{{153, 71}, {18, 18}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSViewIsLayerTreeHost">YES</bool>
-																<object class="NSArray" key="NSViewContentFilters">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="CIColorMonochrome">
-																		<object class="CIColor" key="CI_inputColor">
-																			<float key="red">7.019608e-01</float>
-																			<float key="green">7.019608e-01</float>
-																			<float key="blue">7.019608e-01</float>
-																			<float key="alpha">1.000000e+00</float>
-																		</object>
-																		<reference key="CI_inputIntensity" ref="559925184"/>
-																		<bool key="CIEnabled">YES</bool>
-																	</object>
-																</object>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSButtonCell" key="NSCell" id="595088069">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">67239936</int>
-																	<string key="NSContents">Keep aspect ratio:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="302614967"/>
-																	<int key="NSButtonFlags">1210864127</int>
-																	<int key="NSButtonFlags2">2</int>
-																	<object class="NSButtonImageSource" key="NSAlternateImage" id="998385597">
-																		<string key="NSImageName">NSSwitch</string>
-																	</object>
-																	<string key="NSAlternateContents"/>
-																	<string key="NSKeyEquivalent"/>
-																	<int key="NSPeriodicDelay">200</int>
-																	<int key="NSPeriodicInterval">25</int>
-																</object>
-															</object>
-															<object class="NSTextField" id="973216726">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">292</int>
-																<string key="NSFrame">{{32, 73}, {123, 14}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="910777593">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">71434240</int>
-																	<string key="NSContents">Keep Aspect Ratio:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="973216726"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="231562326">
-																<reference key="NSNextResponder" ref="93103015"/>
-																<int key="NSvFlags">292</int>
-																<string key="NSFrame">{{173, 53}, {112, 14}}</string>
-																<reference key="NSSuperview" ref="93103015"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="87951024">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">71434240</int>
-																	<string key="NSContents">Keep Aspect Ratio:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="231562326"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-														</object>
-														<string key="NSFrame">{{1, 1}, {511, 124}}</string>
-														<reference key="NSSuperview" ref="291242569"/>
-													</object>
-												</object>
-												<string key="NSFrame">{{0, 202}, {513, 126}}</string>
-												<reference key="NSSuperview" ref="490590002"/>
-												<string key="NSOffsets">{0, 0}</string>
-												<object class="NSTextFieldCell" key="NSTitleCell">
-													<int key="NSCellFlags">67239424</int>
-													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Box</string>
-													<reference key="NSSupport" ref="26"/>
-													<object class="NSColor" key="NSBackgroundColor" id="406287577">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">textBackgroundColor</string>
-														<object class="NSColor" key="NSColor" id="45357611">
-															<int key="NSColorSpace">3</int>
-															<bytes key="NSWhite">MQA</bytes>
-														</object>
-													</object>
-													<object class="NSColor" key="NSTextColor">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-													</object>
-												</object>
-												<reference key="NSContentView" ref="93103015"/>
-												<int key="NSBorderType">1</int>
-												<int key="NSBoxType">0</int>
-												<int key="NSTitlePosition">0</int>
-												<bool key="NSTransparent">NO</bool>
-											</object>
-											<object class="NSBox" id="1064912113">
-												<reference key="NSNextResponder" ref="490590002"/>
-												<int key="NSvFlags">268</int>
-												<object class="NSMutableArray" key="NSSubviews">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSView" id="114416973">
-														<reference key="NSNextResponder" ref="1064912113"/>
-														<int key="NSvFlags">256</int>
-														<object class="NSMutableArray" key="NSSubviews">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<object class="NSStepper" id="580805308">
-																<reference key="NSNextResponder" ref="114416973"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{165, 53}, {15, 22}}</string>
-																<reference key="NSSuperview" ref="114416973"/>
-																<bool key="NSViewIsLayerTreeHost">YES</bool>
-																<object class="NSArray" key="NSViewContentFilters">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="CIColorMonochrome">
-																		<object class="CIColor" key="CI_inputColor">
-																			<float key="red">7.019608e-01</float>
-																			<float key="green">7.019608e-01</float>
-																			<float key="blue">7.019608e-01</float>
-																			<float key="alpha">1.000000e+00</float>
-																		</object>
-																		<reference key="CI_inputIntensity" ref="559925184"/>
-																		<bool key="CIEnabled">YES</bool>
-																	</object>
-																</object>
-																<object class="NSArray" key="NSViewBackgroundFilters">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="CIColorMonochrome">
-																		<object class="CIColor" key="CI_inputColor">
-																			<float key="red">6.000000e-01</float>
-																			<float key="green">4.500000e-01</float>
-																			<float key="blue">3.000000e-01</float>
-																			<float key="alpha">1.000000e+00</float>
-																		</object>
-																		<reference key="CI_inputIntensity" ref="559925184"/>
-																		<bool key="CIEnabled">YES</bool>
-																	</object>
-																</object>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSStepperCell" key="NSCell" id="44321990">
-																	<int key="NSCellFlags">68025888</int>
-																	<int key="NSCellFlags2">131072</int>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="580805308"/>
-																	<double key="NSMaxValue">5.900000e+01</double>
-																	<double key="NSIncrement">2.000000e+00</double>
-																	<bool key="NSAutorepeat">YES</bool>
-																</object>
-															</object>
-															<object class="NSStepper" id="510144318">
-																<reference key="NSNextResponder" ref="114416973"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{251, 41}, {15, 22}}</string>
-																<reference key="NSSuperview" ref="114416973"/>
-																<bool key="NSViewIsLayerTreeHost">YES</bool>
-																<object class="NSArray" key="NSViewContentFilters">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="CIColorMonochrome">
-																		<object class="CIColor" key="CI_inputColor">
-																			<float key="red">7.019608e-01</float>
-																			<float key="green">7.019608e-01</float>
-																			<float key="blue">7.019608e-01</float>
-																			<float key="alpha">1.000000e+00</float>
-																		</object>
-																		<reference key="CI_inputIntensity" ref="559925184"/>
-																		<bool key="CIEnabled">YES</bool>
-																	</object>
-																</object>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSStepperCell" key="NSCell" id="759792686">
-																	<int key="NSCellFlags">68025888</int>
-																	<int key="NSCellFlags2">131072</int>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="510144318"/>
-																	<double key="NSMaxValue">5.900000e+01</double>
-																	<double key="NSIncrement">2.000000e+00</double>
-																	<bool key="NSAutorepeat">YES</bool>
-																</object>
-															</object>
-															<object class="NSMatrix" id="1032624817">
-																<reference key="NSNextResponder" ref="114416973"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{76, 88}, {20, 24}}</string>
-																<reference key="NSSuperview" ref="114416973"/>
-																<object class="NSArray" key="NSViewContentFilters">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="CIColorMonochrome">
-																		<object class="CIColor" key="CI_inputColor">
-																			<float key="red">7.019608e-01</float>
-																			<float key="green">7.019608e-01</float>
-																			<float key="blue">7.019608e-01</float>
-																			<float key="alpha">1.000000e+00</float>
-																		</object>
-																		<reference key="CI_inputIntensity" ref="559925184"/>
-																		<bool key="CIEnabled">YES</bool>
-																	</object>
-																</object>
-																<bool key="NSEnabled">YES</bool>
-																<int key="NSNumRows">2</int>
-																<int key="NSNumCols">1</int>
-																<object class="NSMutableArray" key="NSCells">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="NSButtonCell" id="660067650">
-																		<int key="NSCellFlags">-2080244224</int>
-																		<int key="NSCellFlags2">262144</int>
-																		<string key="NSContents">Automatic</string>
-																		<reference key="NSSupport" ref="22"/>
-																		<reference key="NSControlView" ref="1032624817"/>
-																		<int key="NSButtonFlags">1211912703</int>
-																		<int key="NSButtonFlags2">0</int>
-																		<object class="NSButtonImageSource" key="NSAlternateImage" id="216523553">
-																			<string key="NSImageName">NSRadioButton</string>
-																		</object>
-																		<string key="NSAlternateContents"/>
-																		<object class="NSMutableString" key="NSKeyEquivalent">
-																			<characters key="NS.bytes"/>
-																		</object>
-																		<int key="NSPeriodicDelay">200</int>
-																		<int key="NSPeriodicInterval">25</int>
-																	</object>
-																	<object class="NSButtonCell" id="288116155">
-																		<int key="NSCellFlags">67239424</int>
-																		<int key="NSCellFlags2">262144</int>
-																		<string key="NSContents">Custom:</string>
-																		<reference key="NSSupport" ref="22"/>
-																		<reference key="NSControlView" ref="1032624817"/>
-																		<int key="NSButtonFlags">1211912703</int>
-																		<int key="NSButtonFlags2">0</int>
-																		<reference key="NSAlternateImage" ref="216523553"/>
-																		<string key="NSAlternateContents"/>
-																		<string key="NSKeyEquivalent"/>
-																		<int key="NSPeriodicDelay">400</int>
-																		<int key="NSPeriodicInterval">75</int>
-																	</object>
-																</object>
-																<string key="NSCellSize">{20, 11}</string>
-																<string key="NSIntercellSpacing">{4, 2}</string>
-																<int key="NSMatrixFlags">1143480320</int>
-																<string key="NSCellClass">NSActionCell</string>
-																<object class="NSButtonCell" key="NSProtoCell" id="643930266">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">262144</int>
-																	<string key="NSContents">Radio</string>
-																	<reference key="NSSupport" ref="22"/>
-																	<int key="NSButtonFlags">1211912703</int>
-																	<int key="NSButtonFlags2">0</int>
-																	<object class="NSImage" key="NSNormalImage">
-																		<int key="NSImageFlags">549453824</int>
-																		<string key="NSSize">{18, 18}</string>
-																		<object class="NSMutableArray" key="NSReps">
-																			<bool key="EncodedWithXMLCoder">YES</bool>
-																			<object class="NSArray">
-																				<bool key="EncodedWithXMLCoder">YES</bool>
-																				<integer value="0" id="8"/>
-																				<object class="NSBitmapImageRep">
-																					<object class="NSData" key="NSTIFFRepresentation">
-																						<bytes key="NS.bytes">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
-AAAAAGB8AAA5DAAABbxYWVogAAAAAAAAb3IAALBfAAAciVhZWiAAAAAAAAAm6AAAFq8AALDfWFlaIAAA
-AAAAAPNSAAEAAAABFs9zZjMyAAAAAAABDEIAAAXe///zJgAAB5IAAP2R///7ov///aMAAAPcAADAbGN1
-cnYAAAAAAAAAAQHNAABjdXJ2AAAAAAAAAAEBzQAAY3VydgAAAAAAAAABAc0AAHZjZ3QAAAAAAAAAAAAD
-AQAAAgAAAB4AaQDaAV8B/ALQA9sFIAbTCNMLPA4EEJ8THxVuF6EZnxt9HT8e4CBzIf8jfCT7JnUn5ilV
-KsIsKS2QLvkwYjHTM0g0wTY3N544/TpWO6Y88D41P3ZAt0H6Qz1Eg0XERvhIIklLSmpLhUycTbBOxE/Z
-UPBSC1MpVFJVfFasV9tZClo1W1lcc12AXoVfgGBzYZJivGPrZR1mVGeIaMJp+msvbGJtj26qb5NwZ3FE
-citzGnQRdRF2F3cfeCh5L3o0ezx8Q31HfkZ/QoA4gSqCG4MMg/yE7oXihtaHyYi5iaaKkIt5jGGNS444
-jyiQG5EQkgWS9JPflMiVrJaPl22YS5krmgya8JvXnL6dnp52n0ugHqDuobuihqNSpB+k7qXAppKndKhb
-qUWqMasdrAes7q3RrquvfLBFsROx77Lcs860wbW6tq+3pbiauYu6e7tkvD+9Bb25vnO/NL/8wMvBo8KA
-w2DEQcUixgPG48fGyKPJfMpRyyPL8sy8zYbOTs8Wz97QpdFn0ifS59Oj1F7VGtXV1pTXVNgX2N3Zo9pj
-2yHb3tyV3U3eBN6733TgMODv4bLic+My4+/kpuVa5gzmuudo6BboxOl16ifq3euc7FTtA+2a7iXuoe8Y
-74bv+fCc8WLyRfMM84/0EfSM9Qr1lfYq9tb3qfiu+f78YP//AAAAFwBQAKcBGQGsAmkDWQR+BdsHiQl9
-C7gOGxCeExsVbReKGX8bQxzZHjsfkSDjIjwjmST8JlknvCkmKo0r8y1aLsEwJTGEMuA0PjWRNuM4NDl4
-Ors79D0sPls/i0C3Qd5DBEQgRUBGVkdqSHpJhkqPS5hMn02kTqhPqVCrUbJSxVPdVPJWBlcYWChZM1o+
-W0dcT11WXl5fY2BuYXZigWOQZJ9lr2bDZ85ox2m0ap9riWx0bWJuUG8+cC1xHnIQcwNz93TudeZ233fa
-eNh513rUe818u32dfnp/WoA9gSOCC4L0g9+EzIW5hqWHj4h6iWeKT4s3jByM/43gjsCPnpCKkW6SVpM7
-lB+VAJXflr2XmJhxmUiaHprzm8WclZ1mnjWfAp/PoJ+hcaJVoz2kJaUOpfam3afDqKipjKpwq1SsOK0b
-rfyu3q+/sKKxgrJks0W0I7T6tcu2mbdsuD+5E7npusG7nbx6vVm+Or8ewAPA6cHNwrjDnsSIxXPGWsc5
-yA/I48m3ypPLb8xNzSzODc7uz9DQr9GN0mfTPtQS1OTVr9Z31zvX/NjC2a3amtuH3HHdV9473xrf9ODP
-4aPic+M/5Ank0uWW5lnnHOfd6J3pXOoh6vTryeyS7VfuGu7X75TwT/EH8cTygfNB9AT00vWq9o/3hviV
-+cn7Tv1t//8AAAAOADAAYwCnAPkBYwHcAoUDXgR4BdEHjQlsCzoM7g6KEA0RbBK7E/0VKRZMF2sYexmC
-GoYbjRyWHaIerR+5IMMhyyLPI9EkyiW8JqonlSh8KWEqRSsqLBEs+y3nLtQvvjCfMXkyUTMiM+40tzV/
-NkY3CzfUOJ85bjpFOyE8AjzlPcg+qj+HQGBBMEH3QrhDe0RSRTdGHkcIR/NI30nMSrhLoEyGTWdORE7p
-T41QM1DhUZZSUFMUU9tUpFVuVjdXAFfMWJpZZlowWvZbulx7XT1d/l7BX4VgTGETYdlinWNeZBxk2WWW
-ZlJnEmfUaJdpXWogat9rnGxXbQ9txm5+bzdv8nCwcXFyNnL4c7Z0cHUkddd2hncyd914iHk0eeJ6kntF
-fAZ8z32bfmp/O4ALgNmBo4JmgyGD14SJhVmGMIcNh+yIzomxipSLeIxXjTWOD47Yj42QJJC9kV6SB5K0
-k2qUJJThlaCWX5cfl+SYrJlzmjea+Zu5nHedNZ30nrSfdaA5oP6hxaKLo1GkFqTbpaGmaac2qAao2qmy
-qo6raqxErR6t967Tr7CwkLF4smSzV7RPtUi2PrcxuCC5CrnwutS7trycvYC+Z79SwEHBOMI0wzTENsU5
-xjrHOMgyySbKFMr6y+DNLc6p0EjSDtQN1mPZFtxo4Ijlxuzn933//wAAbmRpbgAAAAAAAAY2AACX6QAA
-W1AAAFSbAACOVgAAJ6QAABVgAABQDQAAVDkAAlwoAAIhRwABRR4AAwEAAAIAAAAaADgAUgBpAH8AkQCj
-ALQAxADTAOIA8AD+AQwBGwEsATwBTgFgAXQBiAGeAbQBzAHmAgICHwI+Al8CggKoAs8C+AMiA08DfAOr
-A9sEDQRBBHYErATkBR4FWQWUBdEGDwZNBosGygcJB0oHjAfRCBkIYwivCP4JTwmjCfkKUQqrCwULYQu+
-DBsMegzdDUYNsg4gDpMPCQ+CD/8QfRD9EX4SABKBEwMTgRQBFIAVABWCFgUWjBcYF6kYQhjiGYoaPRrV
-G2kb/ByOHSEdsx5IHtsfcCAHIKEhPSHdIoAjTiQ4JRol9CbHJ5UoXikmKe4qtyuFLFUtJC32Ls0vqTCL
-MXQyYjNTNEY1OzYuNyQ4GzkYOho7IjwtPTs+ST9UQF5BZ0JuQ31ElUWxRtZIAEkxSmVLmEzKTfpPKVBl
-Ua9TAFRaVbxXJliQWfpbYFzGXhVfXmClYexjNmSHZd9nS2jIalxr1G0sbn5v0HEccm5zwHUWdnR31nlF
-ett8uX6LgEWB7oOGhRaGoogwicCLVIzljoOQK5Hfk5+VbJc+mRWa8JzPnsGgt6K7pMOmz6jSqtOsyq7E
-sNSy7bUXt0O5drugvcG/2cH4xCfGaMi8yyPNjM/60l/Uutb22V/cOt/A47bmauhQ6mLtyfFy9LX3XPlz
-+xH8Yf0t/fj+iv8G/4P//wAAACIAQgBdAHYAjQCjALcAygDdAO4BAAERASIBNAFFAVcBaQF8AY8BpAG5
-AdAB6QIDAh8CPQJeAoICqQLXAwYDOANrA54D0gQHBDwEdASsBOUFHgVZBZQF0gYQBk8GkAbSBxYHXAej
-B+sINgiDCNEJIQl1CcoKIgp+CtsLPAueDAIMagzUDUANsg4jDpoPEw+QEBAQlBEaEaISLhK7E00T4BR1
-FQQVkBYfFrEXRRfbGHUZExmyGlUa+huhHEkc9R2fHk0e+h+nIFUhBSGzImMjIiPyJMYlniZ3J08oKSkG
-KeMqwCufLH4tXi49Lx4v/zDfMb8yojOINHk1fjaMN5c4ojmpOrM7vDzDPc0+2j/rQP1CDkMqREVFaEaQ
-R7xI70oQSz1MZ02YTs1QClFJUpFT3VUwVoZX5FlIWq5cGl2NXv1gaWG1YwVkVGWnZvxoVmm0axVsd23d
-b0RwsXIfc5F1A3Z6d/B5a3rzfI9+Mn/OgWyDCYSjhjmHzIleiu2Meo4Hj5mRIZK0lEKVzpdomR2a3Zyf
-nlGgBaG3o2qlGqbNqIaqRawQreSvwrGys621v7fGuXK7Jrzbvp3AY8I3xBnF/sf0yfnMC84k0E7Se9Sw
-1u3ZLNs63UXfduGy5AXmXOjF6yTtfu/S8gT0F/YK99H5b/rf/Bb9Bv3d/p3/Tv//AAAAOQBtAJQAtADQ
-AOoBAAEWASwBQwFcAXcBkwGxAdIB9QIcAkYCcwKjAtgDEANKA4kDzQQVBF4EqQT1BUMFkwXlBjoGkgbt
-B0sHsAgZCIcI+QlvCekKZQriC2AL3wxgDOcNeA4ODqwPUQ/9EK0RYRIVEsoTeRQmFNEVfhYtFuIXnhhl
-GTkaHBrnG6ccZx0nHegeqx9vIDkhByHcIrgj5yUVJjQnSChRKVgqXitqLHgtgi6RL6cwxjHtMxg0RTVz
-Np43zTkAOj47gzzOPh0/aECyQfpDSESmRgpHd0joSlpLx00wTpRQAVGCUw9UqlZTWAJZslteXQNegl/6
-YW5i4WRbZdxnc2kfauVsa23gb1FwvnIsc5p1CnaDeAF5jHtmfaV/wIG+g6SFfYdRiSeK+oy/jouQYZJB
-lCqWFpgAmeqbz52wn5WhfaNspVmnQqkgqvesxK6MsFSyJLP3tci3l7lhux280L55wBzBwsNwxSbG6Mi0
-yorMZM460BTR59O21XnXL9jg2o/cO93p35/hW+Mk5Pnm4ujf6kPrfOyh7bnuwu+/8Kjxi/JV8xjzzvR2
-9R/1r/Y59sT3QPev+B/4jvjz+Ur5ovn5+lD6pPrk+yT7Zful++b8Jvxm/JH8vfzo/RP9P/1q/ZX9wf3s
-/hj+SP5//rb+7P8j/1r/kf/I//8AAGRlc2MAAAAAAAAACkNvbG9yIExDRAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AABtbHVjAAAAAAAAAAIAAAAMZW5VUwAAABIAAAAoaXRJVAAAABQAAAA6AEMAbwBsAG8AcgAgAEwAQwBE
-AEwAQwBEACAAYwBvAGwAbwByAGkAAG1tb2QAAAAAAAAGEAAAnGgAAAAAwhEOAAAAAAAAAAAAAAAAAAAA
-AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
-																					</object>
-																				</object>
-																			</object>
-																		</object>
-																		<object class="NSColor" key="NSColor">
-																			<int key="NSColorSpace">3</int>
-																			<bytes key="NSWhite">MCAwAA</bytes>
-																		</object>
-																	</object>
-																	<reference key="NSAlternateImage" ref="216523553"/>
-																	<int key="NSPeriodicDelay">400</int>
-																	<int key="NSPeriodicInterval">75</int>
-																</object>
-																<reference key="NSSelectedCell" ref="660067650"/>
-																<reference key="NSBackgroundColor" ref="407686733"/>
-																<reference key="NSCellBackgroundColor" ref="45357611"/>
-																<object class="NSFont" key="NSFont">
-																	<string key="NSName">LucidaGrande</string>
-																	<double key="NSSize">1.300000e+01</double>
-																	<int key="NSfFlags">1044</int>
-																</object>
-															</object>
-															<object class="NSTextField" id="897162141">
-																<reference key="NSNextResponder" ref="114416973"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{107, 54}, {56, 16}}</string>
-																<reference key="NSSuperview" ref="114416973"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="936113070">
-																	<int key="NSCellFlags">-2075001280</int>
-																	<int key="NSCellFlags2">4457472</int>
-																	<string key="NSContents"/>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="897162141"/>
-																	<bool key="NSDrawsBackground">YES</bool>
-																	<reference key="NSBackgroundColor" ref="501609908"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="773085513">
-																<reference key="NSNextResponder" ref="114416973"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{107, 27}, {56, 16}}</string>
-																<reference key="NSSuperview" ref="114416973"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="634956024">
-																	<int key="NSCellFlags">-2075001280</int>
-																	<int key="NSCellFlags2">4457472</int>
-																	<string key="NSContents"/>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="773085513"/>
-																	<bool key="NSDrawsBackground">YES</bool>
-																	<reference key="NSBackgroundColor" ref="501609908"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSStepper" id="1067684983">
-																<reference key="NSNextResponder" ref="114416973"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{79, 38}, {15, 22}}</string>
-																<reference key="NSSuperview" ref="114416973"/>
-																<bool key="NSViewIsLayerTreeHost">YES</bool>
-																<object class="NSArray" key="NSViewContentFilters">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="CIColorMonochrome">
-																		<object class="CIColor" key="CI_inputColor">
-																			<float key="red">7.019608e-01</float>
-																			<float key="green">7.019608e-01</float>
-																			<float key="blue">7.019608e-01</float>
-																			<float key="alpha">1.000000e+00</float>
-																		</object>
-																		<reference key="CI_inputIntensity" ref="559925184"/>
-																		<bool key="CIEnabled">YES</bool>
-																	</object>
-																</object>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSStepperCell" key="NSCell" id="996643427">
-																	<int key="NSCellFlags">68025888</int>
-																	<int key="NSCellFlags2">131072</int>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="1067684983"/>
-																	<double key="NSMaxValue">5.900000e+01</double>
-																	<double key="NSIncrement">2.000000e+00</double>
-																	<bool key="NSAutorepeat">YES</bool>
-																</object>
-															</object>
-															<object class="NSTextField" id="411931143">
-																<reference key="NSNextResponder" ref="114416973"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{189, 44}, {56, 16}}</string>
-																<reference key="NSSuperview" ref="114416973"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="1050606643">
-																	<int key="NSCellFlags">-2075001280</int>
-																	<int key="NSCellFlags2">4457472</int>
-																	<string key="NSContents"/>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="411931143"/>
-																	<bool key="NSDrawsBackground">YES</bool>
-																	<reference key="NSBackgroundColor" ref="501609908"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="842452881">
-																<reference key="NSNextResponder" ref="114416973"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{18, 41}, {56, 16}}</string>
-																<reference key="NSSuperview" ref="114416973"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="904241294">
-																	<int key="NSCellFlags">-2075001280</int>
-																	<int key="NSCellFlags2">4457472</int>
-																	<string key="NSContents"/>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="842452881"/>
-																	<bool key="NSDrawsBackground">YES</bool>
-																	<reference key="NSBackgroundColor" ref="501609908"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSStepper" id="133033963">
-																<reference key="NSNextResponder" ref="114416973"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{166, 25}, {15, 22}}</string>
-																<reference key="NSSuperview" ref="114416973"/>
-																<bool key="NSViewIsLayerTreeHost">YES</bool>
-																<object class="NSArray" key="NSViewContentFilters">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="CIColorMonochrome">
-																		<object class="CIColor" key="CI_inputColor">
-																			<float key="red">7.019608e-01</float>
-																			<float key="green">7.019608e-01</float>
-																			<float key="blue">7.019608e-01</float>
-																			<float key="alpha">1.000000e+00</float>
-																		</object>
-																		<reference key="CI_inputIntensity" ref="559925184"/>
-																		<bool key="CIEnabled">YES</bool>
-																	</object>
-																</object>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSStepperCell" key="NSCell" id="71578223">
-																	<int key="NSCellFlags">68025888</int>
-																	<int key="NSCellFlags2">131072</int>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="133033963"/>
-																	<double key="NSMaxValue">5.900000e+01</double>
-																	<double key="NSIncrement">2.000000e+00</double>
-																	<bool key="NSAutorepeat">YES</bool>
-																</object>
-															</object>
-															<object class="NSTextField" id="1021399174">
-																<reference key="NSNextResponder" ref="114416973"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{97, 102}, {68, 11}}</string>
-																<reference key="NSSuperview" ref="114416973"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="215687429">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">4456448</int>
-																	<string key="NSContents">Automatic</string>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="1021399174"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="194145642">
-																<reference key="NSNextResponder" ref="114416973"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{97, 88}, {68, 11}}</string>
-																<reference key="NSSuperview" ref="114416973"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="664940567">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">4456448</int>
-																	<string key="NSContents">Custom</string>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="194145642"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="294892452">
-																<reference key="NSNextResponder" ref="114416973"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{12, 98}, {59, 17}}</string>
-																<reference key="NSSuperview" ref="114416973"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="511041238">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">71303168</int>
-																	<string key="NSContents">Cropping:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="294892452"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-														</object>
-														<string key="NSFrame">{{1, 1}, {282, 124}}</string>
-														<reference key="NSSuperview" ref="1064912113"/>
-													</object>
-												</object>
-												<string key="NSFrame">{{515, 202}, {284, 126}}</string>
-												<reference key="NSSuperview" ref="490590002"/>
-												<string key="NSOffsets">{0, 0}</string>
-												<object class="NSTextFieldCell" key="NSTitleCell">
-													<int key="NSCellFlags">67239424</int>
-													<int key="NSCellFlags2">0</int>
-													<string key="NSContents"/>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSBackgroundColor" ref="406287577"/>
-													<object class="NSColor" key="NSTextColor">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-													</object>
-												</object>
-												<reference key="NSContentView" ref="114416973"/>
-												<int key="NSBorderType">1</int>
-												<int key="NSBoxType">0</int>
-												<int key="NSTitlePosition">0</int>
-												<bool key="NSTransparent">NO</bool>
-											</object>
-										</object>
-										<string key="NSFrame">{{10, 19}, {801, 330}}</string>
-										<reference key="NSSuperview" ref="570027662"/>
-									</object>
-									<string key="NSLabel">Size</string>
-									<reference key="NSColor" ref="407686733"/>
-									<reference key="NSTabView" ref="570027662"/>
-								</object>
-								<object class="NSTabViewItem" id="1059808840">
-									<string key="NSIdentifier">2</string>
-									<object class="NSView" key="NSView" id="49700183">
-										<nil key="NSNextResponder"/>
-										<int key="NSvFlags">256</int>
-										<object class="NSMutableArray" key="NSSubviews">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSBox" id="123709997">
-												<reference key="NSNextResponder" ref="49700183"/>
-												<int key="NSvFlags">12</int>
-												<object class="NSMutableArray" key="NSSubviews">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSView" id="614431874">
-														<reference key="NSNextResponder" ref="123709997"/>
-														<int key="NSvFlags">256</int>
-														<object class="NSMutableArray" key="NSSubviews">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<object class="NSTextField" id="907249437">
-																<reference key="NSNextResponder" ref="614431874"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{15, 45}, {68, 17}}</string>
-																<reference key="NSSuperview" ref="614431874"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="20607951">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">71303168</int>
-																	<string key="NSContents">Detelecine:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="907249437"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="675657376">
-																<reference key="NSNextResponder" ref="614431874"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{15, 22}, {68, 17}}</string>
-																<reference key="NSSuperview" ref="614431874"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="42393523">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">71303168</int>
-																	<string key="NSContents">Custom:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="675657376"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSPopUpButton" id="444006373">
-																<reference key="NSNextResponder" ref="614431874"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{103, 46}, {110, 15}}</string>
-																<reference key="NSSuperview" ref="614431874"/>
-																<bool key="NSViewIsLayerTreeHost">YES</bool>
-																<object class="NSArray" key="NSViewContentFilters">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="CIColorMonochrome">
-																		<object class="CIColor" key="CI_inputColor">
-																			<float key="red">7.019608e-01</float>
-																			<float key="green">7.019608e-01</float>
-																			<float key="blue">7.019608e-01</float>
-																			<float key="alpha">1.000000e+00</float>
-																		</object>
-																		<real value="1.000000e+00" key="CI_inputIntensity" id="172944286"/>
-																		<bool key="CIEnabled">YES</bool>
-																	</object>
-																</object>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSPopUpButtonCell" key="NSCell" id="225659946">
-																	<int key="NSCellFlags">-2076049856</int>
-																	<int key="NSCellFlags2">264192</int>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="444006373"/>
-																	<int key="NSButtonFlags">109199615</int>
-																	<int key="NSButtonFlags2">1</int>
-																	<object class="NSFont" key="NSAlternateImage" id="254124275">
-																		<string key="NSName">LucidaGrande</string>
-																		<double key="NSSize">9.000000e+00</double>
-																		<int key="NSfFlags">16</int>
-																	</object>
-																	<string key="NSAlternateContents"/>
-																	<object class="NSMutableString" key="NSKeyEquivalent">
-																		<characters key="NS.bytes"/>
-																	</object>
-																	<int key="NSPeriodicDelay">400</int>
-																	<int key="NSPeriodicInterval">75</int>
-																	<object class="NSMenuItem" key="NSMenuItem" id="237877455">
-																		<reference key="NSMenu" ref="822312097"/>
-																		<string key="NSTitle">Item1</string>
-																		<string key="NSKeyEquiv"/>
-																		<int key="NSKeyEquivModMask">1048576</int>
-																		<int key="NSMnemonicLoc">2147483647</int>
-																		<int key="NSState">1</int>
-																		<reference key="NSOnImage" ref="279874594"/>
-																		<reference key="NSMixedImage" ref="300720659"/>
-																		<string key="NSAction">_popUpItemAction:</string>
-																		<reference key="NSTarget" ref="225659946"/>
-																	</object>
-																	<bool key="NSMenuItemRespectAlignment">YES</bool>
-																	<object class="NSMenu" key="NSMenu" id="822312097">
-																		<object class="NSMutableString" key="NSTitle">
-																			<characters key="NS.bytes">OtherViews</characters>
-																		</object>
-																		<object class="NSMutableArray" key="NSMenuItems">
-																			<bool key="EncodedWithXMLCoder">YES</bool>
-																			<reference ref="237877455"/>
-																			<object class="NSMenuItem" id="621985928">
-																				<reference key="NSMenu" ref="822312097"/>
-																				<string key="NSTitle">Item2</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<reference key="NSOnImage" ref="279874594"/>
-																				<reference key="NSMixedImage" ref="300720659"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="225659946"/>
-																			</object>
-																			<object class="NSMenuItem" id="1040778121">
-																				<reference key="NSMenu" ref="822312097"/>
-																				<string key="NSTitle">Item3</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<reference key="NSOnImage" ref="279874594"/>
-																				<reference key="NSMixedImage" ref="300720659"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="225659946"/>
-																			</object>
-																		</object>
-																	</object>
-																	<int key="NSPreferredEdge">3</int>
-																	<bool key="NSUsesItemFromMenu">YES</bool>
-																	<bool key="NSAltersState">YES</bool>
-																	<int key="NSArrowPosition">1</int>
-																</object>
-															</object>
-															<object class="NSTextField" id="1003980650">
-																<reference key="NSNextResponder" ref="614431874"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{104, 24}, {108, 16}}</string>
-																<reference key="NSSuperview" ref="614431874"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="673987852">
-																	<int key="NSCellFlags">-1804468671</int>
-																	<int key="NSCellFlags2">272892928</int>
-																	<string key="NSContents"/>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="1003980650"/>
-																	<bool key="NSDrawsBackground">YES</bool>
-																	<reference key="NSBackgroundColor" ref="406287577"/>
-																	<object class="NSColor" key="NSTextColor" id="779569028">
-																		<int key="NSColorSpace">6</int>
-																		<string key="NSCatalogName">System</string>
-																		<string key="NSColorName">textColor</string>
-																		<object class="NSColor" key="NSColor" id="6672969">
-																			<int key="NSColorSpace">3</int>
-																			<bytes key="NSWhite">MAA</bytes>
-																		</object>
-																	</object>
-																</object>
-															</object>
-														</object>
-														<string key="NSFrame">{{1, 1}, {230, 71}}</string>
-														<reference key="NSSuperview" ref="123709997"/>
-													</object>
-												</object>
-												<string key="NSFrame">{{15, 255}, {232, 73}}</string>
-												<reference key="NSSuperview" ref="49700183"/>
-												<string key="NSOffsets">{0, 0}</string>
-												<object class="NSTextFieldCell" key="NSTitleCell">
-													<int key="NSCellFlags">67239424</int>
-													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Box</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSBackgroundColor" ref="406287577"/>
-													<object class="NSColor" key="NSTextColor">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-													</object>
-												</object>
-												<reference key="NSContentView" ref="614431874"/>
-												<int key="NSBorderType">1</int>
-												<int key="NSBoxType">0</int>
-												<int key="NSTitlePosition">0</int>
-												<bool key="NSTransparent">NO</bool>
-											</object>
-											<object class="NSBox" id="211309117">
-												<reference key="NSNextResponder" ref="49700183"/>
-												<int key="NSvFlags">268</int>
-												<object class="NSMutableArray" key="NSSubviews">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSView" id="769476491">
-														<reference key="NSNextResponder" ref="211309117"/>
-														<int key="NSvFlags">256</int>
-														<object class="NSMutableArray" key="NSSubviews">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<object class="NSSlider" id="985124611">
-																<reference key="NSNextResponder" ref="769476491"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{59, 65}, {37, 15}}</string>
-																<reference key="NSSuperview" ref="769476491"/>
-																<bool key="NSViewIsLayerTreeHost">YES</bool>
-																<object class="NSArray" key="NSViewContentFilters">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="CIColorMonochrome">
-																		<object class="CIColor" key="CI_inputColor">
-																			<float key="red">1.000000e+00</float>
-																			<float key="green">1.000000e+00</float>
-																			<float key="blue">1.000000e+00</float>
-																			<float key="alpha">1.000000e+00</float>
-																		</object>
-																		<reference key="CI_inputIntensity" ref="172944286"/>
-																		<bool key="CIEnabled">YES</bool>
-																	</object>
-																</object>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSSliderCell" key="NSCell" id="288804516">
-																	<int key="NSCellFlags">-2080244224</int>
-																	<int key="NSCellFlags2">131072</int>
-																	<string key="NSContents"/>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="985124611"/>
-																	<double key="NSMaxValue">1.000000e+00</double>
-																	<double key="NSMinValue">0.000000e+00</double>
-																	<double key="NSValue">0.000000e+00</double>
-																	<double key="NSAltIncValue">0.000000e+00</double>
-																	<int key="NSNumberOfTickMarks">0</int>
-																	<int key="NSTickMarkPosition">1</int>
-																	<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
-																	<bool key="NSVertical">NO</bool>
-																</object>
-															</object>
-															<object class="NSTextField" id="873921736">
-																<reference key="NSNextResponder" ref="769476491"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{1, 64}, {56, 17}}</string>
-																<reference key="NSSuperview" ref="769476491"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="475982274">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">71303168</int>
-																	<string key="NSContents">Decomb</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="873921736"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="478887050">
-																<reference key="NSNextResponder" ref="769476491"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{97, 63}, {89, 17}}</string>
-																<reference key="NSSuperview" ref="769476491"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="940230908">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">4194304</int>
-																	<string key="NSContents">Deinterlace</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="478887050"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSBox" id="889994612">
-																<reference key="NSNextResponder" ref="769476491"/>
-																<int key="NSvFlags">12</int>
-																<object class="NSMutableArray" key="NSSubviews">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="NSView" id="277740026">
-																		<reference key="NSNextResponder" ref="889994612"/>
-																		<int key="NSvFlags">256</int>
-																		<object class="NSMutableArray" key="NSSubviews">
-																			<bool key="EncodedWithXMLCoder">YES</bool>
-																			<object class="NSTextField" id="7173206">
-																				<reference key="NSNextResponder" ref="277740026"/>
-																				<int key="NSvFlags">268</int>
-																				<string key="NSFrame">{{5, 33}, {68, 17}}</string>
-																				<reference key="NSSuperview" ref="277740026"/>
-																				<bool key="NSEnabled">YES</bool>
-																				<object class="NSTextFieldCell" key="NSCell" id="695838500">
-																					<int key="NSCellFlags">67239424</int>
-																					<int key="NSCellFlags2">71303168</int>
-																					<string key="NSContents">Decomb:</string>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSControlView" ref="7173206"/>
-																					<reference key="NSBackgroundColor" ref="407686733"/>
-																					<reference key="NSTextColor" ref="852384715"/>
-																				</object>
-																			</object>
-																			<object class="NSTextField" id="652411918">
-																				<reference key="NSNextResponder" ref="277740026"/>
-																				<int key="NSvFlags">268</int>
-																				<string key="NSFrame">{{5, 10}, {68, 17}}</string>
-																				<reference key="NSSuperview" ref="277740026"/>
-																				<bool key="NSEnabled">YES</bool>
-																				<object class="NSTextFieldCell" key="NSCell" id="908484803">
-																					<int key="NSCellFlags">67239424</int>
-																					<int key="NSCellFlags2">71303168</int>
-																					<string key="NSContents">Custom:</string>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSControlView" ref="652411918"/>
-																					<reference key="NSBackgroundColor" ref="407686733"/>
-																					<reference key="NSTextColor" ref="852384715"/>
-																				</object>
-																			</object>
-																			<object class="NSPopUpButton" id="356573645">
-																				<reference key="NSNextResponder" ref="277740026"/>
-																				<int key="NSvFlags">268</int>
-																				<string key="NSFrame">{{93, 34}, {110, 15}}</string>
-																				<reference key="NSSuperview" ref="277740026"/>
-																				<bool key="NSViewIsLayerTreeHost">YES</bool>
-																				<object class="NSArray" key="NSViewContentFilters">
-																					<bool key="EncodedWithXMLCoder">YES</bool>
-																					<object class="CIColorMonochrome">
-																						<object class="CIColor" key="CI_inputColor">
-																							<float key="red">7.019608e-01</float>
-																							<float key="green">7.019608e-01</float>
-																							<float key="blue">7.019608e-01</float>
-																							<float key="alpha">1.000000e+00</float>
-																						</object>
-																						<reference key="CI_inputIntensity" ref="172944286"/>
-																						<bool key="CIEnabled">YES</bool>
-																					</object>
-																				</object>
-																				<bool key="NSEnabled">YES</bool>
-																				<object class="NSPopUpButtonCell" key="NSCell" id="454070103">
-																					<int key="NSCellFlags">-2076049856</int>
-																					<int key="NSCellFlags2">264192</int>
-																					<reference key="NSSupport" ref="22"/>
-																					<reference key="NSControlView" ref="356573645"/>
-																					<int key="NSButtonFlags">109199615</int>
-																					<int key="NSButtonFlags2">1</int>
-																					<reference key="NSAlternateImage" ref="254124275"/>
-																					<string key="NSAlternateContents"/>
-																					<object class="NSMutableString" key="NSKeyEquivalent">
-																						<characters key="NS.bytes"/>
-																					</object>
-																					<int key="NSPeriodicDelay">400</int>
-																					<int key="NSPeriodicInterval">75</int>
-																					<object class="NSMenuItem" key="NSMenuItem" id="720143866">
-																						<reference key="NSMenu" ref="259868564"/>
-																						<string key="NSTitle">Item1</string>
-																						<string key="NSKeyEquiv"/>
-																						<int key="NSKeyEquivModMask">1048576</int>
-																						<int key="NSMnemonicLoc">2147483647</int>
-																						<int key="NSState">1</int>
-																						<reference key="NSOnImage" ref="279874594"/>
-																						<reference key="NSMixedImage" ref="300720659"/>
-																						<string key="NSAction">_popUpItemAction:</string>
-																						<reference key="NSTarget" ref="454070103"/>
-																					</object>
-																					<bool key="NSMenuItemRespectAlignment">YES</bool>
-																					<object class="NSMenu" key="NSMenu" id="259868564">
-																						<object class="NSMutableString" key="NSTitle">
-																							<characters key="NS.bytes">OtherViews</characters>
-																						</object>
-																						<object class="NSMutableArray" key="NSMenuItems">
-																							<bool key="EncodedWithXMLCoder">YES</bool>
-																							<reference ref="720143866"/>
-																							<object class="NSMenuItem" id="414039981">
-																								<reference key="NSMenu" ref="259868564"/>
-																								<string key="NSTitle">Item2</string>
-																								<string key="NSKeyEquiv"/>
-																								<int key="NSKeyEquivModMask">1048576</int>
-																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="279874594"/>
-																								<reference key="NSMixedImage" ref="300720659"/>
-																								<string key="NSAction">_popUpItemAction:</string>
-																								<reference key="NSTarget" ref="454070103"/>
-																							</object>
-																							<object class="NSMenuItem" id="197481337">
-																								<reference key="NSMenu" ref="259868564"/>
-																								<string key="NSTitle">Item3</string>
-																								<string key="NSKeyEquiv"/>
-																								<int key="NSKeyEquivModMask">1048576</int>
-																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="279874594"/>
-																								<reference key="NSMixedImage" ref="300720659"/>
-																								<string key="NSAction">_popUpItemAction:</string>
-																								<reference key="NSTarget" ref="454070103"/>
-																							</object>
-																						</object>
-																					</object>
-																					<int key="NSPreferredEdge">3</int>
-																					<bool key="NSUsesItemFromMenu">YES</bool>
-																					<bool key="NSAltersState">YES</bool>
-																					<int key="NSArrowPosition">1</int>
-																				</object>
-																			</object>
-																			<object class="NSTextField" id="103870225">
-																				<reference key="NSNextResponder" ref="277740026"/>
-																				<int key="NSvFlags">268</int>
-																				<string key="NSFrame">{{94, 12}, {108, 16}}</string>
-																				<reference key="NSSuperview" ref="277740026"/>
-																				<bool key="NSEnabled">YES</bool>
-																				<object class="NSTextFieldCell" key="NSCell" id="558197217">
-																					<int key="NSCellFlags">-1804468671</int>
-																					<int key="NSCellFlags2">272892928</int>
-																					<string key="NSContents"/>
-																					<reference key="NSSupport" ref="22"/>
-																					<reference key="NSControlView" ref="103870225"/>
-																					<bool key="NSDrawsBackground">YES</bool>
-																					<reference key="NSBackgroundColor" ref="406287577"/>
-																					<reference key="NSTextColor" ref="779569028"/>
-																				</object>
-																			</object>
-																		</object>
-																		<string key="NSFrameSize">{215, 60}</string>
-																		<reference key="NSSuperview" ref="889994612"/>
-																	</object>
-																</object>
-																<string key="NSFrame">{{5, -3}, {215, 60}}</string>
-																<reference key="NSSuperview" ref="769476491"/>
-																<string key="NSOffsets">{0, 0}</string>
-																<object class="NSTextFieldCell" key="NSTitleCell">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">0</int>
-																	<string key="NSContents">Box</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSBackgroundColor" ref="406287577"/>
-																	<object class="NSColor" key="NSTextColor">
-																		<int key="NSColorSpace">3</int>
-																		<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-																	</object>
-																</object>
-																<reference key="NSContentView" ref="277740026"/>
-																<int key="NSBorderType">0</int>
-																<int key="NSBoxType">4</int>
-																<int key="NSTitlePosition">0</int>
-																<bool key="NSTransparent">NO</bool>
-															</object>
-															<object class="NSBox" id="136990045">
-																<reference key="NSNextResponder" ref="769476491"/>
-																<int key="NSvFlags">12</int>
-																<object class="NSMutableArray" key="NSSubviews">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="NSView" id="800728459">
-																		<reference key="NSNextResponder" ref="136990045"/>
-																		<int key="NSvFlags">256</int>
-																		<object class="NSMutableArray" key="NSSubviews">
-																			<bool key="EncodedWithXMLCoder">YES</bool>
-																			<object class="NSTextField" id="455753488">
-																				<reference key="NSNextResponder" ref="800728459"/>
-																				<int key="NSvFlags">268</int>
-																				<string key="NSFrame">{{8, 33}, {68, 17}}</string>
-																				<reference key="NSSuperview" ref="800728459"/>
-																				<bool key="NSEnabled">YES</bool>
-																				<object class="NSTextFieldCell" key="NSCell" id="733163980">
-																					<int key="NSCellFlags">67239424</int>
-																					<int key="NSCellFlags2">71303168</int>
-																					<string key="NSContents">Deinterlace:</string>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSControlView" ref="455753488"/>
-																					<reference key="NSBackgroundColor" ref="407686733"/>
-																					<reference key="NSTextColor" ref="852384715"/>
-																				</object>
-																			</object>
-																			<object class="NSTextField" id="707016708">
-																				<reference key="NSNextResponder" ref="800728459"/>
-																				<int key="NSvFlags">268</int>
-																				<string key="NSFrame">{{8, 10}, {68, 17}}</string>
-																				<reference key="NSSuperview" ref="800728459"/>
-																				<bool key="NSEnabled">YES</bool>
-																				<object class="NSTextFieldCell" key="NSCell" id="1039358237">
-																					<int key="NSCellFlags">67239424</int>
-																					<int key="NSCellFlags2">71303168</int>
-																					<string key="NSContents">Custom:</string>
-																					<reference key="NSSupport" ref="26"/>
-																					<reference key="NSControlView" ref="707016708"/>
-																					<reference key="NSBackgroundColor" ref="407686733"/>
-																					<reference key="NSTextColor" ref="852384715"/>
-																				</object>
-																			</object>
-																			<object class="NSPopUpButton" id="850427642">
-																				<reference key="NSNextResponder" ref="800728459"/>
-																				<int key="NSvFlags">268</int>
-																				<string key="NSFrame">{{96, 34}, {110, 15}}</string>
-																				<reference key="NSSuperview" ref="800728459"/>
-																				<bool key="NSViewIsLayerTreeHost">YES</bool>
-																				<object class="NSArray" key="NSViewContentFilters">
-																					<bool key="EncodedWithXMLCoder">YES</bool>
-																					<object class="CIColorMonochrome">
-																						<object class="CIColor" key="CI_inputColor">
-																							<float key="red">7.019608e-01</float>
-																							<float key="green">7.019608e-01</float>
-																							<float key="blue">7.019608e-01</float>
-																							<float key="alpha">1.000000e+00</float>
-																						</object>
-																						<reference key="CI_inputIntensity" ref="172944286"/>
-																						<bool key="CIEnabled">YES</bool>
-																					</object>
-																				</object>
-																				<bool key="NSEnabled">YES</bool>
-																				<object class="NSPopUpButtonCell" key="NSCell" id="247704759">
-																					<int key="NSCellFlags">-2076049856</int>
-																					<int key="NSCellFlags2">264192</int>
-																					<reference key="NSSupport" ref="22"/>
-																					<reference key="NSControlView" ref="850427642"/>
-																					<int key="NSButtonFlags">109199615</int>
-																					<int key="NSButtonFlags2">1</int>
-																					<reference key="NSAlternateImage" ref="254124275"/>
-																					<string key="NSAlternateContents"/>
-																					<object class="NSMutableString" key="NSKeyEquivalent">
-																						<characters key="NS.bytes"/>
-																					</object>
-																					<int key="NSPeriodicDelay">400</int>
-																					<int key="NSPeriodicInterval">75</int>
-																					<object class="NSMenuItem" key="NSMenuItem" id="683933257">
-																						<reference key="NSMenu" ref="579462485"/>
-																						<string key="NSTitle">Item1</string>
-																						<string key="NSKeyEquiv"/>
-																						<int key="NSKeyEquivModMask">1048576</int>
-																						<int key="NSMnemonicLoc">2147483647</int>
-																						<int key="NSState">1</int>
-																						<reference key="NSOnImage" ref="279874594"/>
-																						<reference key="NSMixedImage" ref="300720659"/>
-																						<string key="NSAction">_popUpItemAction:</string>
-																						<reference key="NSTarget" ref="247704759"/>
-																					</object>
-																					<bool key="NSMenuItemRespectAlignment">YES</bool>
-																					<object class="NSMenu" key="NSMenu" id="579462485">
-																						<object class="NSMutableString" key="NSTitle">
-																							<characters key="NS.bytes">OtherViews</characters>
-																						</object>
-																						<object class="NSMutableArray" key="NSMenuItems">
-																							<bool key="EncodedWithXMLCoder">YES</bool>
-																							<reference ref="683933257"/>
-																							<object class="NSMenuItem" id="770160669">
-																								<reference key="NSMenu" ref="579462485"/>
-																								<string key="NSTitle">Item2</string>
-																								<string key="NSKeyEquiv"/>
-																								<int key="NSKeyEquivModMask">1048576</int>
-																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="279874594"/>
-																								<reference key="NSMixedImage" ref="300720659"/>
-																								<string key="NSAction">_popUpItemAction:</string>
-																								<reference key="NSTarget" ref="247704759"/>
-																							</object>
-																							<object class="NSMenuItem" id="391113581">
-																								<reference key="NSMenu" ref="579462485"/>
-																								<string key="NSTitle">Item3</string>
-																								<string key="NSKeyEquiv"/>
-																								<int key="NSKeyEquivModMask">1048576</int>
-																								<int key="NSMnemonicLoc">2147483647</int>
-																								<reference key="NSOnImage" ref="279874594"/>
-																								<reference key="NSMixedImage" ref="300720659"/>
-																								<string key="NSAction">_popUpItemAction:</string>
-																								<reference key="NSTarget" ref="247704759"/>
-																							</object>
-																						</object>
-																					</object>
-																					<int key="NSPreferredEdge">3</int>
-																					<bool key="NSUsesItemFromMenu">YES</bool>
-																					<bool key="NSAltersState">YES</bool>
-																					<int key="NSArrowPosition">1</int>
-																				</object>
-																			</object>
-																			<object class="NSTextField" id="181376038">
-																				<reference key="NSNextResponder" ref="800728459"/>
-																				<int key="NSvFlags">268</int>
-																				<string key="NSFrame">{{97, 11}, {108, 16}}</string>
-																				<reference key="NSSuperview" ref="800728459"/>
-																				<bool key="NSEnabled">YES</bool>
-																				<object class="NSTextFieldCell" key="NSCell" id="240437779">
-																					<int key="NSCellFlags">-1804468671</int>
-																					<int key="NSCellFlags2">272892928</int>
-																					<string key="NSContents"/>
-																					<reference key="NSSupport" ref="22"/>
-																					<reference key="NSControlView" ref="181376038"/>
-																					<bool key="NSDrawsBackground">YES</bool>
-																					<reference key="NSBackgroundColor" ref="406287577"/>
-																					<reference key="NSTextColor" ref="779569028"/>
-																				</object>
-																			</object>
-																		</object>
-																		<string key="NSFrameSize">{221, 60}</string>
-																		<reference key="NSSuperview" ref="136990045"/>
-																	</object>
-																</object>
-																<string key="NSFrame">{{2, -3}, {221, 60}}</string>
-																<reference key="NSSuperview" ref="769476491"/>
-																<string key="NSOffsets">{0, 0}</string>
-																<object class="NSTextFieldCell" key="NSTitleCell">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">0</int>
-																	<string key="NSContents">Box</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSBackgroundColor" ref="406287577"/>
-																	<object class="NSColor" key="NSTextColor">
-																		<int key="NSColorSpace">3</int>
-																		<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-																	</object>
-																</object>
-																<reference key="NSContentView" ref="800728459"/>
-																<int key="NSBorderType">0</int>
-																<int key="NSBoxType">0</int>
-																<int key="NSTitlePosition">0</int>
-																<bool key="NSTransparent">NO</bool>
-															</object>
-														</object>
-														<string key="NSFrame">{{2, 18}, {228, 92}}</string>
-														<reference key="NSSuperview" ref="211309117"/>
-													</object>
-												</object>
-												<string key="NSFrame">{{15, 140}, {232, 112}}</string>
-												<reference key="NSSuperview" ref="49700183"/>
-												<string key="NSOffsets">{0, 0}</string>
-												<object class="NSTextFieldCell" key="NSTitleCell">
-													<int key="NSCellFlags">67239424</int>
-													<int key="NSCellFlags2">0</int>
-													<string key="NSContents"/>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSBackgroundColor" ref="406287577"/>
-													<object class="NSColor" key="NSTextColor">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-													</object>
-												</object>
-												<reference key="NSContentView" ref="769476491"/>
-												<int key="NSBorderType">3</int>
-												<int key="NSBoxType">0</int>
-												<int key="NSTitlePosition">4</int>
-												<bool key="NSTransparent">NO</bool>
-											</object>
-											<object class="NSBox" id="691710132">
-												<reference key="NSNextResponder" ref="49700183"/>
-												<int key="NSvFlags">12</int>
-												<object class="NSMutableArray" key="NSSubviews">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSView" id="432503529">
-														<reference key="NSNextResponder" ref="691710132"/>
-														<int key="NSvFlags">256</int>
-														<object class="NSMutableArray" key="NSSubviews">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<object class="NSTextField" id="407034984">
-																<reference key="NSNextResponder" ref="432503529"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{15, 37}, {68, 17}}</string>
-																<reference key="NSSuperview" ref="432503529"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="15366198">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">71303168</int>
-																	<string key="NSContents">Denoise:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="407034984"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="929586587">
-																<reference key="NSNextResponder" ref="432503529"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{15, 14}, {68, 17}}</string>
-																<reference key="NSSuperview" ref="432503529"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="601710816">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">71303168</int>
-																	<string key="NSContents">Custom:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="929586587"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSPopUpButton" id="362740356">
-																<reference key="NSNextResponder" ref="432503529"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{103, 38}, {110, 15}}</string>
-																<reference key="NSSuperview" ref="432503529"/>
-																<bool key="NSViewIsLayerTreeHost">YES</bool>
-																<object class="NSArray" key="NSViewContentFilters">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="CIColorMonochrome">
-																		<object class="CIColor" key="CI_inputColor">
-																			<float key="red">7.019608e-01</float>
-																			<float key="green">7.019608e-01</float>
-																			<float key="blue">7.019608e-01</float>
-																			<float key="alpha">1.000000e+00</float>
-																		</object>
-																		<reference key="CI_inputIntensity" ref="172944286"/>
-																		<bool key="CIEnabled">YES</bool>
-																	</object>
-																</object>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSPopUpButtonCell" key="NSCell" id="625319255">
-																	<int key="NSCellFlags">-2076049856</int>
-																	<int key="NSCellFlags2">264192</int>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="362740356"/>
-																	<int key="NSButtonFlags">109199615</int>
-																	<int key="NSButtonFlags2">1</int>
-																	<reference key="NSAlternateImage" ref="254124275"/>
-																	<string key="NSAlternateContents"/>
-																	<object class="NSMutableString" key="NSKeyEquivalent">
-																		<characters key="NS.bytes"/>
-																	</object>
-																	<int key="NSPeriodicDelay">400</int>
-																	<int key="NSPeriodicInterval">75</int>
-																	<object class="NSMenuItem" key="NSMenuItem" id="535683643">
-																		<reference key="NSMenu" ref="618343102"/>
-																		<string key="NSTitle">Item1</string>
-																		<string key="NSKeyEquiv"/>
-																		<int key="NSKeyEquivModMask">1048576</int>
-																		<int key="NSMnemonicLoc">2147483647</int>
-																		<int key="NSState">1</int>
-																		<reference key="NSOnImage" ref="279874594"/>
-																		<reference key="NSMixedImage" ref="300720659"/>
-																		<string key="NSAction">_popUpItemAction:</string>
-																		<reference key="NSTarget" ref="625319255"/>
-																	</object>
-																	<bool key="NSMenuItemRespectAlignment">YES</bool>
-																	<object class="NSMenu" key="NSMenu" id="618343102">
-																		<object class="NSMutableString" key="NSTitle">
-																			<characters key="NS.bytes">OtherViews</characters>
-																		</object>
-																		<object class="NSMutableArray" key="NSMenuItems">
-																			<bool key="EncodedWithXMLCoder">YES</bool>
-																			<reference ref="535683643"/>
-																			<object class="NSMenuItem" id="107429478">
-																				<reference key="NSMenu" ref="618343102"/>
-																				<string key="NSTitle">Item2</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<reference key="NSOnImage" ref="279874594"/>
-																				<reference key="NSMixedImage" ref="300720659"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="625319255"/>
-																			</object>
-																			<object class="NSMenuItem" id="865792840">
-																				<reference key="NSMenu" ref="618343102"/>
-																				<string key="NSTitle">Item3</string>
-																				<string key="NSKeyEquiv"/>
-																				<int key="NSKeyEquivModMask">1048576</int>
-																				<int key="NSMnemonicLoc">2147483647</int>
-																				<reference key="NSOnImage" ref="279874594"/>
-																				<reference key="NSMixedImage" ref="300720659"/>
-																				<string key="NSAction">_popUpItemAction:</string>
-																				<reference key="NSTarget" ref="625319255"/>
-																			</object>
-																		</object>
-																	</object>
-																	<int key="NSPreferredEdge">3</int>
-																	<bool key="NSUsesItemFromMenu">YES</bool>
-																	<bool key="NSAltersState">YES</bool>
-																	<int key="NSArrowPosition">1</int>
-																</object>
-															</object>
-															<object class="NSTextField" id="529723890">
-																<reference key="NSNextResponder" ref="432503529"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{104, 16}, {108, 16}}</string>
-																<reference key="NSSuperview" ref="432503529"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="692527149">
-																	<int key="NSCellFlags">-1804468671</int>
-																	<int key="NSCellFlags2">272892928</int>
-																	<string key="NSContents"/>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="529723890"/>
-																	<bool key="NSDrawsBackground">YES</bool>
-																	<reference key="NSBackgroundColor" ref="406287577"/>
-																	<reference key="NSTextColor" ref="779569028"/>
-																</object>
-															</object>
-														</object>
-														<string key="NSFrame">{{1, 1}, {230, 63}}</string>
-														<reference key="NSSuperview" ref="691710132"/>
-													</object>
-												</object>
-												<string key="NSFrame">{{14, 73}, {232, 65}}</string>
-												<reference key="NSSuperview" ref="49700183"/>
-												<string key="NSOffsets">{0, 0}</string>
-												<object class="NSTextFieldCell" key="NSTitleCell">
-													<int key="NSCellFlags">67239424</int>
-													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Box</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSBackgroundColor" ref="406287577"/>
-													<object class="NSColor" key="NSTextColor">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-													</object>
-												</object>
-												<reference key="NSContentView" ref="432503529"/>
-												<int key="NSBorderType">1</int>
-												<int key="NSBoxType">0</int>
-												<int key="NSTitlePosition">0</int>
-												<bool key="NSTransparent">NO</bool>
-											</object>
-											<object class="NSBox" id="825796162">
-												<reference key="NSNextResponder" ref="49700183"/>
-												<int key="NSvFlags">12</int>
-												<object class="NSMutableArray" key="NSSubviews">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSView" id="487196162">
-														<reference key="NSNextResponder" ref="825796162"/>
-														<int key="NSvFlags">256</int>
-														<object class="NSMutableArray" key="NSSubviews">
-															<bool key="EncodedWithXMLCoder">YES</bool>
-															<object class="NSTextField" id="425499167">
-																<reference key="NSNextResponder" ref="487196162"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{29, 39}, {51, 17}}</string>
-																<reference key="NSSuperview" ref="487196162"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="440135121">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">71303168</int>
-																	<string key="NSContents">Deblock:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="425499167"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="1014567695">
-																<reference key="NSNextResponder" ref="487196162"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{17, 8}, {63, 14}}</string>
-																<reference key="NSSuperview" ref="487196162"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="922265218">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">71303168</int>
-																	<string key="NSContents">Grayscale:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="1014567695"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSTextField" id="345974679">
-																<reference key="NSNextResponder" ref="487196162"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{79, 41}, {31, 14}}</string>
-																<reference key="NSSuperview" ref="487196162"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="288379564">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">138543104</int>
-																	<string key="NSContents">Off</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="345974679"/>
-																	<reference key="NSBackgroundColor" ref="407686733"/>
-																	<reference key="NSTextColor" ref="852384715"/>
-																</object>
-															</object>
-															<object class="NSSlider" id="703236195">
-																<reference key="NSNextResponder" ref="487196162"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{108, 40}, {104, 16}}</string>
-																<reference key="NSSuperview" ref="487196162"/>
-																<bool key="NSViewIsLayerTreeHost">YES</bool>
-																<object class="NSArray" key="NSViewContentFilters">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="CIColorMonochrome">
-																		<object class="CIColor" key="CI_inputColor">
-																			<float key="red">7.019608e-01</float>
-																			<float key="green">7.019608e-01</float>
-																			<float key="blue">7.019608e-01</float>
-																			<float key="alpha">1.000000e+00</float>
-																		</object>
-																		<reference key="CI_inputIntensity" ref="172944286"/>
-																		<bool key="CIEnabled">YES</bool>
-																	</object>
-																</object>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSSliderCell" key="NSCell" id="145960326">
-																	<int key="NSCellFlags">-2079981824</int>
-																	<int key="NSCellFlags2">262144</int>
-																	<string key="NSContents"/>
-																	<reference key="NSSupport" ref="22"/>
-																	<reference key="NSControlView" ref="703236195"/>
-																	<double key="NSMaxValue">1.500000e+01</double>
-																	<double key="NSMinValue">4.000000e+00</double>
-																	<double key="NSValue">4.000000e+00</double>
-																	<double key="NSAltIncValue">0.000000e+00</double>
-																	<int key="NSNumberOfTickMarks">12</int>
-																	<int key="NSTickMarkPosition">0</int>
-																	<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
-																	<bool key="NSVertical">NO</bool>
-																</object>
-															</object>
-															<object class="NSButton" id="1021739901">
-																<reference key="NSNextResponder" ref="487196162"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{84, 6}, {19, 18}}</string>
-																<reference key="NSSuperview" ref="487196162"/>
-																<bool key="NSViewIsLayerTreeHost">YES</bool>
-																<object class="NSArray" key="NSViewContentFilters">
-																	<bool key="EncodedWithXMLCoder">YES</bool>
-																	<object class="CIColorMonochrome">
-																		<object class="CIColor" key="CI_inputColor">
-																			<float key="red">7.019608e-01</float>
-																			<float key="green">7.019608e-01</float>
-																			<float key="blue">7.019608e-01</float>
-																			<float key="alpha">1.000000e+00</float>
-																		</object>
-																		<reference key="CI_inputIntensity" ref="172944286"/>
-																		<bool key="CIEnabled">YES</bool>
-																	</object>
-																</object>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSButtonCell" key="NSCell" id="1059254264">
-																	<int key="NSCellFlags">67239424</int>
-																	<int key="NSCellFlags2">131072</int>
-																	<string key="NSContents">Check</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="1021739901"/>
-																	<int key="NSButtonFlags">1211912703</int>
-																	<int key="NSButtonFlags2">130</int>
-																	<object class="NSCustomResource" key="NSNormalImage">
-																		<string key="NSClassName">NSImage</string>
-																		<string key="NSResourceName">NSSwitch</string>
-																	</object>
-																	<reference key="NSAlternateImage" ref="998385597"/>
-																	<string key="NSAlternateContents"/>
-																	<string key="NSKeyEquivalent"/>
-																	<int key="NSPeriodicDelay">200</int>
-																	<int key="NSPeriodicInterval">25</int>
-																</object>
-															</object>
-														</object>
-														<string key="NSFrame">{{1, 1}, {230, 63}}</string>
-														<reference key="NSSuperview" ref="825796162"/>
-													</object>
-												</object>
-												<string key="NSFrame">{{15, 5}, {232, 65}}</string>
-												<reference key="NSSuperview" ref="49700183"/>
-												<string key="NSOffsets">{0, 0}</string>
-												<object class="NSTextFieldCell" key="NSTitleCell">
-													<int key="NSCellFlags">67239424</int>
-													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Box</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSBackgroundColor" ref="406287577"/>
-													<object class="NSColor" key="NSTextColor">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-													</object>
-												</object>
-												<reference key="NSContentView" ref="487196162"/>
-												<int key="NSBorderType">1</int>
-												<int key="NSBoxType">0</int>
-												<int key="NSTitlePosition">0</int>
-												<bool key="NSTransparent">NO</bool>
-											</object>
-										</object>
-										<string key="NSFrame">{{10, 19}, {801, 330}}</string>
-									</object>
-									<string key="NSLabel">Filters</string>
-									<reference key="NSColor" ref="407686733"/>
-									<reference key="NSTabView" ref="570027662"/>
-								</object>
-							</object>
-							<reference key="NSSelectedTabViewItem" ref="184512336"/>
-							<reference key="NSFont" ref="22"/>
-							<int key="NSTvFlags">268435456</int>
-							<bool key="NSAllowTruncatedLabels">YES</bool>
-							<bool key="NSDrawsBackground">YES</bool>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<reference ref="490590002"/>
-							</object>
-						</object>
-					</object>
-					<string key="NSFrameSize">{849, 399}</string>
-					<reference key="NSSuperview"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
-				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fCropBottomField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="773085513"/>
-					</object>
-					<int key="connectionID">53</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fCropBottomStepper</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="133033963"/>
-					</object>
-					<int key="connectionID">54</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fCropLeftField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="842452881"/>
-					</object>
-					<int key="connectionID">55</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fCropLeftStepper</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="1067684983"/>
-					</object>
-					<int key="connectionID">56</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fCropMatrix</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="1032624817"/>
-					</object>
-					<int key="connectionID">57</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fCropRightField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="411931143"/>
-					</object>
-					<int key="connectionID">58</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fCropRightStepper</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="510144318"/>
-					</object>
-					<int key="connectionID">59</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fCropTopField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="897162141"/>
-					</object>
-					<int key="connectionID">60</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fCropTopStepper</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="580805308"/>
-					</object>
-					<int key="connectionID">61</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fHeightField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="443002022"/>
-					</object>
-					<int key="connectionID">66</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fHeightStepper</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="667015191"/>
-					</object>
-					<int key="connectionID">67</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fWidthField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="232869468"/>
-					</object>
-					<int key="connectionID">68</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fWidthStepper</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="221469578"/>
-					</object>
-					<int key="connectionID">69</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fRatioCheck</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="302614967"/>
-					</object>
-					<int key="connectionID">74</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">SettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="221469578"/>
-					</object>
-					<int key="connectionID">76</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">SettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="133033963"/>
-					</object>
-					<int key="connectionID">83</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">SettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="510144318"/>
-					</object>
-					<int key="connectionID">84</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">SettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="1067684983"/>
-					</object>
-					<int key="connectionID">85</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">SettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="580805308"/>
-					</object>
-					<int key="connectionID">86</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">SettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="1032624817"/>
-					</object>
-					<int key="connectionID">87</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">SettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="302614967"/>
-					</object>
-					<int key="connectionID">89</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">SettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="667015191"/>
-					</object>
-					<int key="connectionID">90</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fAnamorphicPopUp</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="147098438"/>
-					</object>
-					<int key="connectionID">140</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">SettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="147098438"/>
-					</object>
-					<int key="connectionID">142</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="616825745"/>
-					</object>
-					<int key="connectionID">184</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureWindow</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="616825745"/>
-					</object>
-					<int key="connectionID">240</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureCropBox</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="1064912113"/>
-					</object>
-					<int key="connectionID">242</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPreviewOpenButton</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="892118626"/>
-					</object>
-					<int key="connectionID">272</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showPreviewWindow:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="892118626"/>
-					</object>
-					<int key="connectionID">273</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSizeInfoField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="154029488"/>
-					</object>
-					<int key="connectionID">280</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDetelecineBox</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="123709997"/>
-					</object>
-					<int key="connectionID">356</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDetelecinePopUp</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="444006373"/>
-					</object>
-					<int key="connectionID">358</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDetelecineField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="1003980650"/>
-					</object>
-					<int key="connectionID">359</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDecombDeinterlaceBox</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="211309117"/>
-					</object>
-					<int key="connectionID">360</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDecombDeinterlaceSlider</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="985124611"/>
-					</object>
-					<int key="connectionID">361</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDecombPopUp</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="356573645"/>
-					</object>
-					<int key="connectionID">362</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDecombField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="103870225"/>
-					</object>
-					<int key="connectionID">363</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDecombBox</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="889994612"/>
-					</object>
-					<int key="connectionID">364</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDeinterlaceBox</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="136990045"/>
-					</object>
-					<int key="connectionID">365</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDeinterlacePopUp</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="850427642"/>
-					</object>
-					<int key="connectionID">366</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDeinterlaceField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="181376038"/>
-					</object>
-					<int key="connectionID">367</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDenoiseBox</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="691710132"/>
-					</object>
-					<int key="connectionID">368</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDenoisePopUp</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="362740356"/>
-					</object>
-					<int key="connectionID">369</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDenoiseField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="529723890"/>
-					</object>
-					<int key="connectionID">370</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDeblockSlider</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="703236195"/>
-					</object>
-					<int key="connectionID">371</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDeblockField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="345974679"/>
-					</object>
-					<int key="connectionID">372</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fGrayscaleCheck</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="1021739901"/>
-					</object>
-					<int key="connectionID">373</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">FilterSettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="444006373"/>
-					</object>
-					<int key="connectionID">374</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">FilterSettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="356573645"/>
-					</object>
-					<int key="connectionID">375</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">FilterSettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="850427642"/>
-					</object>
-					<int key="connectionID">377</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">FilterSettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="362740356"/>
-					</object>
-					<int key="connectionID">378</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">deblockSliderChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="703236195"/>
-					</object>
-					<int key="connectionID">379</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">FilterSettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="1021739901"/>
-					</object>
-					<int key="connectionID">380</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">modeDecombDeinterlaceSliderChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="985124611"/>
-					</object>
-					<int key="connectionID">381</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fModulusPopUp</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="387637584"/>
-					</object>
-					<int key="connectionID">392</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">SettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="387637584"/>
-					</object>
-					<int key="connectionID">393</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDisplayWidthField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="924352608"/>
-					</object>
-					<int key="connectionID">407</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSizeFilterView</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="570027662"/>
-					</object>
-					<int key="connectionID">419</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="570027662"/>
-						<reference key="destination" ref="355312334"/>
-					</object>
-					<int key="connectionID">420</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDeblockBox</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="825796162"/>
-					</object>
-					<int key="connectionID">434</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureSizeBox</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="291242569"/>
-					</object>
-					<int key="connectionID">437</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fParWidthField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="998049160"/>
-					</object>
-					<int key="connectionID">448</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fParHeightField</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="601215307"/>
-					</object>
-					<int key="connectionID">449</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">SettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="998049160"/>
-					</object>
-					<int key="connectionID">453</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">SettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="924352608"/>
-					</object>
-					<int key="connectionID">454</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">SettingsChanged:</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="601215307"/>
-					</object>
-					<int key="connectionID">456</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fRatioLabel</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="973216726"/>
-					</object>
-					<int key="connectionID">522</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fParWidthLabel</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="122509689"/>
-					</object>
-					<int key="connectionID">524</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fParHeightLabel</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="810439401"/>
-					</object>
-					<int key="connectionID">525</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fDisplayWidthLabel</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="84657333"/>
-					</object>
-					<int key="connectionID">526</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fRatioLabel2</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="231562326"/>
-					</object>
-					<int key="connectionID">531</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fModulusLabel</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="902766107"/>
-					</object>
-					<int key="connectionID">532</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fWidthLabel</string>
-						<reference key="source" ref="355312334"/>
-						<reference key="destination" ref="569671425"/>
-					</object>
-					<int key="connectionID">533</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="48079043">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="273418435"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="355312334"/>
-						<reference key="parent" ref="48079043"/>
-						<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="844574444"/>
-						<reference key="parent" ref="48079043"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="837220151"/>
-						<reference key="parent" ref="48079043"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="616825745"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="49161063"/>
-						</object>
-						<reference key="parent" ref="48079043"/>
-						<string key="objectName">PicturePanel</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="49161063"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="922381307"/>
-							<reference ref="892118626"/>
-							<reference ref="154029488"/>
-							<reference ref="570027662"/>
-						</object>
-						<reference key="parent" ref="616825745"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">262</int>
-						<reference key="object" ref="922381307"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1037100053"/>
-						</object>
-						<reference key="parent" ref="49161063"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">263</int>
-						<reference key="object" ref="1037100053"/>
-						<reference key="parent" ref="922381307"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">270</int>
-						<reference key="object" ref="892118626"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="533593716"/>
-						</object>
-						<reference key="parent" ref="49161063"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">271</int>
-						<reference key="object" ref="533593716"/>
-						<reference key="parent" ref="892118626"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">278</int>
-						<reference key="object" ref="154029488"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="63504302"/>
-						</object>
-						<reference key="parent" ref="49161063"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">279</int>
-						<reference key="object" ref="63504302"/>
-						<reference key="parent" ref="154029488"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">281</int>
-						<reference key="object" ref="570027662"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="184512336"/>
-							<reference ref="1059808840"/>
-						</object>
-						<reference key="parent" ref="49161063"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">282</int>
-						<reference key="object" ref="184512336"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="490590002"/>
-						</object>
-						<reference key="parent" ref="570027662"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">283</int>
-						<reference key="object" ref="1059808840"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="49700183"/>
-						</object>
-						<reference key="parent" ref="570027662"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">284</int>
-						<reference key="object" ref="49700183"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="123709997"/>
-							<reference ref="691710132"/>
-							<reference ref="211309117"/>
-							<reference ref="825796162"/>
-						</object>
-						<reference key="parent" ref="1059808840"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">285</int>
-						<reference key="object" ref="490590002"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="291242569"/>
-							<reference ref="1064912113"/>
-						</object>
-						<reference key="parent" ref="184512336"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">7</int>
-						<reference key="object" ref="1064912113"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="194145642"/>
-							<reference ref="133033963"/>
-							<reference ref="842452881"/>
-							<reference ref="1067684983"/>
-							<reference ref="773085513"/>
-							<reference ref="897162141"/>
-							<reference ref="1032624817"/>
-							<reference ref="510144318"/>
-							<reference ref="580805308"/>
-							<reference ref="411931143"/>
-							<reference ref="294892452"/>
-							<reference ref="1021399174"/>
-						</object>
-						<reference key="parent" ref="490590002"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">252</int>
-						<reference key="object" ref="194145642"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="664940567"/>
-						</object>
-						<reference key="parent" ref="1064912113"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">250</int>
-						<reference key="object" ref="1021399174"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="215687429"/>
-						</object>
-						<reference key="parent" ref="1064912113"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="133033963"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="71578223"/>
-						</object>
-						<reference key="parent" ref="1064912113"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="842452881"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="904241294"/>
-						</object>
-						<reference key="parent" ref="1064912113"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">9</int>
-						<reference key="object" ref="411931143"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1050606643"/>
-						</object>
-						<reference key="parent" ref="1064912113"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="1067684983"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="996643427"/>
-						</object>
-						<reference key="parent" ref="1064912113"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">10</int>
-						<reference key="object" ref="773085513"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="634956024"/>
-						</object>
-						<reference key="parent" ref="1064912113"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="897162141"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="936113070"/>
-						</object>
-						<reference key="parent" ref="1064912113"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">16</int>
-						<reference key="object" ref="1032624817"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="660067650"/>
-							<reference ref="288116155"/>
-							<reference ref="643930266"/>
-						</object>
-						<reference key="parent" ref="1064912113"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">15</int>
-						<reference key="object" ref="510144318"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="759792686"/>
-						</object>
-						<reference key="parent" ref="1064912113"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="580805308"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="44321990"/>
-						</object>
-						<reference key="parent" ref="1064912113"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">152</int>
-						<reference key="object" ref="44321990"/>
-						<reference key="parent" ref="580805308"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">155</int>
-						<reference key="object" ref="759792686"/>
-						<reference key="parent" ref="510144318"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">17</int>
-						<reference key="object" ref="660067650"/>
-						<reference key="parent" ref="1032624817"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">18</int>
-						<reference key="object" ref="288116155"/>
-						<reference key="parent" ref="1032624817"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">178</int>
-						<reference key="object" ref="643930266"/>
-						<reference key="parent" ref="1032624817"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">153</int>
-						<reference key="object" ref="936113070"/>
-						<reference key="parent" ref="897162141"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">150</int>
-						<reference key="object" ref="634956024"/>
-						<reference key="parent" ref="773085513"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">156</int>
-						<reference key="object" ref="996643427"/>
-						<reference key="parent" ref="1067684983"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">149</int>
-						<reference key="object" ref="1050606643"/>
-						<reference key="parent" ref="411931143"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">151</int>
-						<reference key="object" ref="904241294"/>
-						<reference key="parent" ref="842452881"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">154</int>
-						<reference key="object" ref="71578223"/>
-						<reference key="parent" ref="133033963"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">251</int>
-						<reference key="object" ref="215687429"/>
-						<reference key="parent" ref="1021399174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">253</int>
-						<reference key="object" ref="664940567"/>
-						<reference key="parent" ref="194145642"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">286</int>
-						<reference key="object" ref="123709997"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1003980650"/>
-							<reference ref="675657376"/>
-							<reference ref="444006373"/>
-							<reference ref="907249437"/>
-						</object>
-						<reference key="parent" ref="49700183"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">287</int>
-						<reference key="object" ref="211309117"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="478887050"/>
-							<reference ref="873921736"/>
-							<reference ref="985124611"/>
-							<reference ref="889994612"/>
-							<reference ref="136990045"/>
-						</object>
-						<reference key="parent" ref="49700183"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">288</int>
-						<reference key="object" ref="691710132"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="407034984"/>
-							<reference ref="929586587"/>
-							<reference ref="529723890"/>
-							<reference ref="362740356"/>
-						</object>
-						<reference key="parent" ref="49700183"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">299</int>
-						<reference key="object" ref="407034984"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="15366198"/>
-						</object>
-						<reference key="parent" ref="691710132"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">300</int>
-						<reference key="object" ref="362740356"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="625319255"/>
-						</object>
-						<reference key="parent" ref="691710132"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">301</int>
-						<reference key="object" ref="929586587"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="601710816"/>
-						</object>
-						<reference key="parent" ref="691710132"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">302</int>
-						<reference key="object" ref="529723890"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="692527149"/>
-						</object>
-						<reference key="parent" ref="691710132"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">303</int>
-						<reference key="object" ref="692527149"/>
-						<reference key="parent" ref="529723890"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">304</int>
-						<reference key="object" ref="601710816"/>
-						<reference key="parent" ref="929586587"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">305</int>
-						<reference key="object" ref="625319255"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="618343102"/>
-						</object>
-						<reference key="parent" ref="362740356"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">306</int>
-						<reference key="object" ref="618343102"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="865792840"/>
-							<reference ref="107429478"/>
-							<reference ref="535683643"/>
-						</object>
-						<reference key="parent" ref="625319255"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">307</int>
-						<reference key="object" ref="865792840"/>
-						<reference key="parent" ref="618343102"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">308</int>
-						<reference key="object" ref="107429478"/>
-						<reference key="parent" ref="618343102"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">309</int>
-						<reference key="object" ref="535683643"/>
-						<reference key="parent" ref="618343102"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">310</int>
-						<reference key="object" ref="15366198"/>
-						<reference key="parent" ref="407034984"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">311</int>
-						<reference key="object" ref="478887050"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="940230908"/>
-						</object>
-						<reference key="parent" ref="211309117"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">312</int>
-						<reference key="object" ref="873921736"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="475982274"/>
-						</object>
-						<reference key="parent" ref="211309117"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">313</int>
-						<reference key="object" ref="985124611"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="288804516"/>
-						</object>
-						<reference key="parent" ref="211309117"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">315</int>
-						<reference key="object" ref="889994612"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="103870225"/>
-							<reference ref="652411918"/>
-							<reference ref="356573645"/>
-							<reference ref="7173206"/>
-						</object>
-						<reference key="parent" ref="211309117"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">316</int>
-						<reference key="object" ref="103870225"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="558197217"/>
-						</object>
-						<reference key="parent" ref="889994612"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">317</int>
-						<reference key="object" ref="652411918"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="908484803"/>
-						</object>
-						<reference key="parent" ref="889994612"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">318</int>
-						<reference key="object" ref="356573645"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="454070103"/>
-						</object>
-						<reference key="parent" ref="889994612"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">319</int>
-						<reference key="object" ref="7173206"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="695838500"/>
-						</object>
-						<reference key="parent" ref="889994612"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">320</int>
-						<reference key="object" ref="695838500"/>
-						<reference key="parent" ref="7173206"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">321</int>
-						<reference key="object" ref="454070103"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="259868564"/>
-						</object>
-						<reference key="parent" ref="356573645"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">322</int>
-						<reference key="object" ref="259868564"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="720143866"/>
-							<reference ref="414039981"/>
-							<reference ref="197481337"/>
-						</object>
-						<reference key="parent" ref="454070103"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">323</int>
-						<reference key="object" ref="720143866"/>
-						<reference key="parent" ref="259868564"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">324</int>
-						<reference key="object" ref="414039981"/>
-						<reference key="parent" ref="259868564"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">325</int>
-						<reference key="object" ref="197481337"/>
-						<reference key="parent" ref="259868564"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">326</int>
-						<reference key="object" ref="908484803"/>
-						<reference key="parent" ref="652411918"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">327</int>
-						<reference key="object" ref="558197217"/>
-						<reference key="parent" ref="103870225"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">340</int>
-						<reference key="object" ref="288804516"/>
-						<reference key="parent" ref="985124611"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">341</int>
-						<reference key="object" ref="475982274"/>
-						<reference key="parent" ref="873921736"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">342</int>
-						<reference key="object" ref="940230908"/>
-						<reference key="parent" ref="478887050"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">343</int>
-						<reference key="object" ref="1003980650"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="673987852"/>
-						</object>
-						<reference key="parent" ref="123709997"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">344</int>
-						<reference key="object" ref="675657376"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="42393523"/>
-						</object>
-						<reference key="parent" ref="123709997"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">345</int>
-						<reference key="object" ref="444006373"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="225659946"/>
-						</object>
-						<reference key="parent" ref="123709997"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">346</int>
-						<reference key="object" ref="907249437"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="20607951"/>
-						</object>
-						<reference key="parent" ref="123709997"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">347</int>
-						<reference key="object" ref="20607951"/>
-						<reference key="parent" ref="907249437"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">348</int>
-						<reference key="object" ref="225659946"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="822312097"/>
-						</object>
-						<reference key="parent" ref="444006373"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">349</int>
-						<reference key="object" ref="822312097"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="237877455"/>
-							<reference ref="621985928"/>
-							<reference ref="1040778121"/>
-						</object>
-						<reference key="parent" ref="225659946"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">350</int>
-						<reference key="object" ref="237877455"/>
-						<reference key="parent" ref="822312097"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">351</int>
-						<reference key="object" ref="621985928"/>
-						<reference key="parent" ref="822312097"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">352</int>
-						<reference key="object" ref="1040778121"/>
-						<reference key="parent" ref="822312097"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">353</int>
-						<reference key="object" ref="42393523"/>
-						<reference key="parent" ref="675657376"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">354</int>
-						<reference key="object" ref="673987852"/>
-						<reference key="parent" ref="1003980650"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">382</int>
-						<reference key="object" ref="294892452"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="511041238"/>
-						</object>
-						<reference key="parent" ref="1064912113"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">383</int>
-						<reference key="object" ref="511041238"/>
-						<reference key="parent" ref="294892452"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">314</int>
-						<reference key="object" ref="136990045"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="181376038"/>
-							<reference ref="455753488"/>
-							<reference ref="707016708"/>
-							<reference ref="850427642"/>
-						</object>
-						<reference key="parent" ref="211309117"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">329</int>
-						<reference key="object" ref="181376038"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="240437779"/>
-						</object>
-						<reference key="parent" ref="136990045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">331</int>
-						<reference key="object" ref="455753488"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="733163980"/>
-						</object>
-						<reference key="parent" ref="136990045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">330</int>
-						<reference key="object" ref="707016708"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1039358237"/>
-						</object>
-						<reference key="parent" ref="136990045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">328</int>
-						<reference key="object" ref="850427642"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="247704759"/>
-						</object>
-						<reference key="parent" ref="136990045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">335</int>
-						<reference key="object" ref="247704759"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="579462485"/>
-						</object>
-						<reference key="parent" ref="850427642"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">336</int>
-						<reference key="object" ref="579462485"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="391113581"/>
-							<reference ref="770160669"/>
-							<reference ref="683933257"/>
-						</object>
-						<reference key="parent" ref="247704759"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">339</int>
-						<reference key="object" ref="391113581"/>
-						<reference key="parent" ref="579462485"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">338</int>
-						<reference key="object" ref="770160669"/>
-						<reference key="parent" ref="579462485"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">337</int>
-						<reference key="object" ref="683933257"/>
-						<reference key="parent" ref="579462485"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">333</int>
-						<reference key="object" ref="1039358237"/>
-						<reference key="parent" ref="707016708"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">332</int>
-						<reference key="object" ref="733163980"/>
-						<reference key="parent" ref="455753488"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">334</int>
-						<reference key="object" ref="240437779"/>
-						<reference key="parent" ref="181376038"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">421</int>
-						<reference key="object" ref="825796162"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1021739901"/>
-							<reference ref="703236195"/>
-							<reference ref="345974679"/>
-							<reference ref="1014567695"/>
-							<reference ref="425499167"/>
-						</object>
-						<reference key="parent" ref="49700183"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">289</int>
-						<reference key="object" ref="425499167"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="440135121"/>
-						</object>
-						<reference key="parent" ref="825796162"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">298</int>
-						<reference key="object" ref="440135121"/>
-						<reference key="parent" ref="425499167"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">290</int>
-						<reference key="object" ref="1014567695"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="922265218"/>
-						</object>
-						<reference key="parent" ref="825796162"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">297</int>
-						<reference key="object" ref="922265218"/>
-						<reference key="parent" ref="1014567695"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">291</int>
-						<reference key="object" ref="345974679"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="288379564"/>
-						</object>
-						<reference key="parent" ref="825796162"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">296</int>
-						<reference key="object" ref="288379564"/>
-						<reference key="parent" ref="345974679"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">292</int>
-						<reference key="object" ref="703236195"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="145960326"/>
-						</object>
-						<reference key="parent" ref="825796162"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">295</int>
-						<reference key="object" ref="145960326"/>
-						<reference key="parent" ref="703236195"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">293</int>
-						<reference key="object" ref="1021739901"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1059254264"/>
-						</object>
-						<reference key="parent" ref="825796162"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">294</int>
-						<reference key="object" ref="1059254264"/>
-						<reference key="parent" ref="1021739901"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">436</int>
-						<reference key="object" ref="291242569"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="667015191"/>
-							<reference ref="513894170"/>
-							<reference ref="301555397"/>
-							<reference ref="443002022"/>
-							<reference ref="221469578"/>
-							<reference ref="232869468"/>
-							<reference ref="569671425"/>
-							<reference ref="387637584"/>
-							<reference ref="902766107"/>
-							<reference ref="147098438"/>
-							<reference ref="302614967"/>
-							<reference ref="973216726"/>
-							<reference ref="998049160"/>
-							<reference ref="122509689"/>
-							<reference ref="601215307"/>
-							<reference ref="810439401"/>
-							<reference ref="231562326"/>
-							<reference ref="84657333"/>
-							<reference ref="924352608"/>
-						</object>
-						<reference key="parent" ref="490590002"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">44</int>
-						<reference key="object" ref="221469578"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="714433793"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">169</int>
-						<reference key="object" ref="714433793"/>
-						<reference key="parent" ref="221469578"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">384</int>
-						<reference key="object" ref="387637584"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="800808932"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">385</int>
-						<reference key="object" ref="800808932"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="246883325"/>
-						</object>
-						<reference key="parent" ref="387637584"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">386</int>
-						<reference key="object" ref="246883325"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="765075061"/>
-							<reference ref="940982828"/>
-							<reference ref="588147075"/>
-						</object>
-						<reference key="parent" ref="800808932"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">389</int>
-						<reference key="object" ref="765075061"/>
-						<reference key="parent" ref="246883325"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">388</int>
-						<reference key="object" ref="940982828"/>
-						<reference key="parent" ref="246883325"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">387</int>
-						<reference key="object" ref="588147075"/>
-						<reference key="parent" ref="246883325"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">42</int>
-						<reference key="object" ref="232869468"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="96315080"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">167</int>
-						<reference key="object" ref="96315080"/>
-						<reference key="parent" ref="232869468"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">46</int>
-						<reference key="object" ref="667015191"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="634499157"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">171</int>
-						<reference key="object" ref="634499157"/>
-						<reference key="parent" ref="667015191"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">138</int>
-						<reference key="object" ref="301555397"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="926890760"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">174</int>
-						<reference key="object" ref="926890760"/>
-						<reference key="parent" ref="301555397"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">41</int>
-						<reference key="object" ref="513894170"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="863668536"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">166</int>
-						<reference key="object" ref="863668536"/>
-						<reference key="parent" ref="513894170"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">132</int>
-						<reference key="object" ref="147098438"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="261514411"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">173</int>
-						<reference key="object" ref="261514411"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="577969360"/>
-						</object>
-						<reference key="parent" ref="147098438"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">134</int>
-						<reference key="object" ref="577969360"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="85032843"/>
-							<reference ref="804424712"/>
-							<reference ref="1018195923"/>
-						</object>
-						<reference key="parent" ref="261514411"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">135</int>
-						<reference key="object" ref="85032843"/>
-						<reference key="parent" ref="577969360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">136</int>
-						<reference key="object" ref="804424712"/>
-						<reference key="parent" ref="577969360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">137</int>
-						<reference key="object" ref="1018195923"/>
-						<reference key="parent" ref="577969360"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">390</int>
-						<reference key="object" ref="902766107"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="377264474"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">391</int>
-						<reference key="object" ref="377264474"/>
-						<reference key="parent" ref="902766107"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">47</int>
-						<reference key="object" ref="569671425"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="412868245"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">172</int>
-						<reference key="object" ref="412868245"/>
-						<reference key="parent" ref="569671425"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">43</int>
-						<reference key="object" ref="443002022"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="649389918"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">168</int>
-						<reference key="object" ref="649389918"/>
-						<reference key="parent" ref="443002022"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">45</int>
-						<reference key="object" ref="302614967"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="595088069"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">170</int>
-						<reference key="object" ref="595088069"/>
-						<reference key="parent" ref="302614967"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">244</int>
-						<reference key="object" ref="973216726"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="910777593"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">245</int>
-						<reference key="object" ref="910777593"/>
-						<reference key="parent" ref="973216726"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">402</int>
-						<reference key="object" ref="84657333"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="752977354"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">403</int>
-						<reference key="object" ref="752977354"/>
-						<reference key="parent" ref="84657333"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">440</int>
-						<reference key="object" ref="998049160"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="564975975"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">441</int>
-						<reference key="object" ref="564975975"/>
-						<reference key="parent" ref="998049160"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">442</int>
-						<reference key="object" ref="601215307"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="119145016"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">443</int>
-						<reference key="object" ref="119145016"/>
-						<reference key="parent" ref="601215307"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">444</int>
-						<reference key="object" ref="122509689"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="486553162"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">445</int>
-						<reference key="object" ref="486553162"/>
-						<reference key="parent" ref="122509689"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">446</int>
-						<reference key="object" ref="810439401"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="134407475"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">447</int>
-						<reference key="object" ref="134407475"/>
-						<reference key="parent" ref="810439401"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">529</int>
-						<reference key="object" ref="231562326"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="87951024"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">530</int>
-						<reference key="object" ref="87951024"/>
-						<reference key="parent" ref="231562326"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">396</int>
-						<reference key="object" ref="924352608"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="617679053"/>
-						</object>
-						<reference key="parent" ref="291242569"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">397</int>
-						<reference key="object" ref="617679053"/>
-						<reference key="parent" ref="924352608"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSMutableArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>-3.ImportedFromIB2</string>
-					<string>10.IBPluginDependency</string>
-					<string>10.ImportedFromIB2</string>
-					<string>11.IBPluginDependency</string>
-					<string>11.ImportedFromIB2</string>
-					<string>12.IBPluginDependency</string>
-					<string>12.ImportedFromIB2</string>
-					<string>13.IBPluginDependency</string>
-					<string>13.ImportedFromIB2</string>
-					<string>132.IBPluginDependency</string>
-					<string>132.ImportedFromIB2</string>
-					<string>134.IBPluginDependency</string>
-					<string>134.ImportedFromIB2</string>
-					<string>135.IBPluginDependency</string>
-					<string>135.ImportedFromIB2</string>
-					<string>136.IBPluginDependency</string>
-					<string>136.ImportedFromIB2</string>
-					<string>137.IBPluginDependency</string>
-					<string>137.ImportedFromIB2</string>
-					<string>138.IBPluginDependency</string>
-					<string>138.ImportedFromIB2</string>
-					<string>14.IBPluginDependency</string>
-					<string>14.ImportedFromIB2</string>
-					<string>149.IBPluginDependency</string>
-					<string>15.IBPluginDependency</string>
-					<string>15.ImportedFromIB2</string>
-					<string>150.IBPluginDependency</string>
-					<string>151.IBPluginDependency</string>
-					<string>152.IBPluginDependency</string>
-					<string>153.IBPluginDependency</string>
-					<string>154.IBPluginDependency</string>
-					<string>155.IBPluginDependency</string>
-					<string>156.IBPluginDependency</string>
-					<string>16.IBPluginDependency</string>
-					<string>16.ImportedFromIB2</string>
-					<string>166.IBPluginDependency</string>
-					<string>167.IBPluginDependency</string>
-					<string>168.IBPluginDependency</string>
-					<string>169.IBPluginDependency</string>
-					<string>17.IBPluginDependency</string>
-					<string>17.ImportedFromIB2</string>
-					<string>170.IBPluginDependency</string>
-					<string>171.IBPluginDependency</string>
-					<string>172.IBPluginDependency</string>
-					<string>173.IBPluginDependency</string>
-					<string>174.IBPluginDependency</string>
-					<string>178.IBPluginDependency</string>
-					<string>18.IBPluginDependency</string>
-					<string>18.ImportedFromIB2</string>
-					<string>19.IBPluginDependency</string>
-					<string>19.ImportedFromIB2</string>
-					<string>244.IBPluginDependency</string>
-					<string>244.ImportedFromIB2</string>
-					<string>245.IBPluginDependency</string>
-					<string>250.IBPluginDependency</string>
-					<string>250.ImportedFromIB2</string>
-					<string>251.IBPluginDependency</string>
-					<string>252.IBPluginDependency</string>
-					<string>252.ImportedFromIB2</string>
-					<string>253.IBPluginDependency</string>
-					<string>262.IBPluginDependency</string>
-					<string>262.ImportedFromIB2</string>
-					<string>263.IBPluginDependency</string>
-					<string>270.IBPluginDependency</string>
-					<string>271.IBPluginDependency</string>
-					<string>278.IBPluginDependency</string>
-					<string>278.ImportedFromIB2</string>
-					<string>279.IBPluginDependency</string>
-					<string>281.IBAttributePlaceholdersKey</string>
-					<string>281.IBPluginDependency</string>
-					<string>282.IBPluginDependency</string>
-					<string>283.IBPluginDependency</string>
-					<string>284.IBPluginDependency</string>
-					<string>285.IBPluginDependency</string>
-					<string>286.IBPluginDependency</string>
-					<string>287.IBPluginDependency</string>
-					<string>287.ImportedFromIB2</string>
-					<string>288.IBPluginDependency</string>
-					<string>289.IBPluginDependency</string>
-					<string>289.ImportedFromIB2</string>
-					<string>290.IBPluginDependency</string>
-					<string>290.ImportedFromIB2</string>
-					<string>291.IBPluginDependency</string>
-					<string>291.ImportedFromIB2</string>
-					<string>292.IBPluginDependency</string>
-					<string>292.IBViewIntegration.shadowBlurRadius</string>
-					<string>292.IBViewIntegration.shadowColor</string>
-					<string>292.IBViewIntegration.shadowOffsetHeight</string>
-					<string>292.IBViewIntegration.shadowOffsetWidth</string>
-					<string>293.IBPluginDependency</string>
-					<string>294.IBPluginDependency</string>
-					<string>295.IBPluginDependency</string>
-					<string>296.IBPluginDependency</string>
-					<string>297.IBPluginDependency</string>
-					<string>298.IBPluginDependency</string>
-					<string>299.IBPluginDependency</string>
-					<string>299.ImportedFromIB2</string>
-					<string>300.IBPluginDependency</string>
-					<string>300.ImportedFromIB2</string>
-					<string>301.IBPluginDependency</string>
-					<string>301.ImportedFromIB2</string>
-					<string>302.IBPluginDependency</string>
-					<string>303.IBPluginDependency</string>
-					<string>304.IBPluginDependency</string>
-					<string>305.IBPluginDependency</string>
-					<string>306.IBPluginDependency</string>
-					<string>306.ImportedFromIB2</string>
-					<string>307.IBPluginDependency</string>
-					<string>307.ImportedFromIB2</string>
-					<string>308.IBPluginDependency</string>
-					<string>308.ImportedFromIB2</string>
-					<string>309.IBPluginDependency</string>
-					<string>309.ImportedFromIB2</string>
-					<string>310.IBPluginDependency</string>
-					<string>311.IBPluginDependency</string>
-					<string>311.ImportedFromIB2</string>
-					<string>312.IBPluginDependency</string>
-					<string>312.ImportedFromIB2</string>
-					<string>313.IBPluginDependency</string>
-					<string>313.IBViewIntegration.shadowBlurRadius</string>
-					<string>313.IBViewIntegration.shadowColor</string>
-					<string>313.IBViewIntegration.shadowOffsetHeight</string>
-					<string>313.IBViewIntegration.shadowOffsetWidth</string>
-					<string>314.IBPluginDependency</string>
-					<string>315.IBPluginDependency</string>
-					<string>316.IBPluginDependency</string>
-					<string>317.IBPluginDependency</string>
-					<string>317.ImportedFromIB2</string>
-					<string>318.IBPluginDependency</string>
-					<string>318.ImportedFromIB2</string>
-					<string>319.IBPluginDependency</string>
-					<string>319.ImportedFromIB2</string>
-					<string>320.IBPluginDependency</string>
-					<string>321.IBPluginDependency</string>
-					<string>322.IBEditorWindowLastContentRect</string>
-					<string>322.IBPluginDependency</string>
-					<string>322.ImportedFromIB2</string>
-					<string>323.IBPluginDependency</string>
-					<string>323.ImportedFromIB2</string>
-					<string>324.IBPluginDependency</string>
-					<string>324.ImportedFromIB2</string>
-					<string>325.IBPluginDependency</string>
-					<string>325.ImportedFromIB2</string>
-					<string>326.IBPluginDependency</string>
-					<string>327.IBPluginDependency</string>
-					<string>328.IBPluginDependency</string>
-					<string>328.ImportedFromIB2</string>
-					<string>329.IBPluginDependency</string>
-					<string>330.IBPluginDependency</string>
-					<string>330.ImportedFromIB2</string>
-					<string>331.IBPluginDependency</string>
-					<string>331.ImportedFromIB2</string>
-					<string>332.IBPluginDependency</string>
-					<string>333.IBPluginDependency</string>
-					<string>334.IBPluginDependency</string>
-					<string>335.IBPluginDependency</string>
-					<string>336.IBEditorWindowLastContentRect</string>
-					<string>336.IBPluginDependency</string>
-					<string>336.ImportedFromIB2</string>
-					<string>337.IBPluginDependency</string>
-					<string>337.ImportedFromIB2</string>
-					<string>338.IBPluginDependency</string>
-					<string>338.ImportedFromIB2</string>
-					<string>339.IBPluginDependency</string>
-					<string>339.ImportedFromIB2</string>
-					<string>340.IBPluginDependency</string>
-					<string>341.IBPluginDependency</string>
-					<string>342.IBPluginDependency</string>
-					<string>343.IBPluginDependency</string>
-					<string>344.IBPluginDependency</string>
-					<string>344.ImportedFromIB2</string>
-					<string>345.IBPluginDependency</string>
-					<string>345.ImportedFromIB2</string>
-					<string>346.IBPluginDependency</string>
-					<string>346.ImportedFromIB2</string>
-					<string>347.IBPluginDependency</string>
-					<string>348.IBPluginDependency</string>
-					<string>349.IBPluginDependency</string>
-					<string>349.ImportedFromIB2</string>
-					<string>350.IBPluginDependency</string>
-					<string>350.ImportedFromIB2</string>
-					<string>351.IBPluginDependency</string>
-					<string>351.ImportedFromIB2</string>
-					<string>352.IBPluginDependency</string>
-					<string>352.ImportedFromIB2</string>
-					<string>353.IBPluginDependency</string>
-					<string>354.IBPluginDependency</string>
-					<string>382.IBPluginDependency</string>
-					<string>382.ImportedFromIB2</string>
-					<string>383.IBPluginDependency</string>
-					<string>384.IBPluginDependency</string>
-					<string>384.ImportedFromIB2</string>
-					<string>385.IBPluginDependency</string>
-					<string>386.IBEditorWindowLastContentRect</string>
-					<string>386.IBPluginDependency</string>
-					<string>386.ImportedFromIB2</string>
-					<string>387.IBPluginDependency</string>
-					<string>387.ImportedFromIB2</string>
-					<string>388.IBPluginDependency</string>
-					<string>388.ImportedFromIB2</string>
-					<string>389.IBPluginDependency</string>
-					<string>389.ImportedFromIB2</string>
-					<string>390.IBPluginDependency</string>
-					<string>390.ImportedFromIB2</string>
-					<string>391.IBPluginDependency</string>
-					<string>396.IBPluginDependency</string>
-					<string>396.ImportedFromIB2</string>
-					<string>397.IBPluginDependency</string>
-					<string>402.IBPluginDependency</string>
-					<string>402.ImportedFromIB2</string>
-					<string>403.IBPluginDependency</string>
-					<string>41.IBPluginDependency</string>
-					<string>41.ImportedFromIB2</string>
-					<string>42.IBPluginDependency</string>
-					<string>42.ImportedFromIB2</string>
-					<string>421.IBPluginDependency</string>
-					<string>43.IBPluginDependency</string>
-					<string>43.ImportedFromIB2</string>
-					<string>436.IBPluginDependency</string>
-					<string>44.IBPluginDependency</string>
-					<string>44.ImportedFromIB2</string>
-					<string>440.IBPluginDependency</string>
-					<string>440.ImportedFromIB2</string>
-					<string>441.IBPluginDependency</string>
-					<string>442.IBPluginDependency</string>
-					<string>442.ImportedFromIB2</string>
-					<string>443.IBPluginDependency</string>
-					<string>444.IBPluginDependency</string>
-					<string>444.ImportedFromIB2</string>
-					<string>445.IBPluginDependency</string>
-					<string>446.IBPluginDependency</string>
-					<string>446.ImportedFromIB2</string>
-					<string>447.IBPluginDependency</string>
-					<string>45.IBPluginDependency</string>
-					<string>45.ImportedFromIB2</string>
-					<string>46.IBPluginDependency</string>
-					<string>46.ImportedFromIB2</string>
-					<string>47.IBPluginDependency</string>
-					<string>47.ImportedFromIB2</string>
-					<string>5.IBEditorWindowLastContentRect</string>
-					<string>5.IBViewEditorWindowController.showingBoundsRectangles</string>
-					<string>5.IBViewEditorWindowController.showingLayoutRectangles</string>
-					<string>5.IBWindowTemplateEditedContentRect</string>
-					<string>5.ImportedFromIB2</string>
-					<string>5.editorWindowContentRectSynchronizationRect</string>
-					<string>5.windowTemplate.hasMaxSize</string>
-					<string>5.windowTemplate.hasMinSize</string>
-					<string>5.windowTemplate.maxSize</string>
-					<string>5.windowTemplate.minSize</string>
-					<string>529.IBPluginDependency</string>
-					<string>529.ImportedFromIB2</string>
-					<string>530.IBPluginDependency</string>
-					<string>6.IBPluginDependency</string>
-					<string>6.IBUserGuides</string>
-					<string>6.ImportedFromIB2</string>
-					<string>7.IBPluginDependency</string>
-					<string>7.ImportedFromIB2</string>
-					<string>9.IBPluginDependency</string>
-					<string>9.ImportedFromIB2</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<real value="1.000000e+00"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableDictionary">
-						<string key="NS.key.0">InitialTabViewItem</string>
-						<object class="IBInitialTabViewItemAttribute" key="NS.object.0">
-							<string key="name">InitialTabViewItem</string>
-							<reference key="object" ref="570027662"/>
-							<reference key="initialTabViewItem" ref="184512336"/>
-						</object>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="8"/>
-					<reference ref="6672969"/>
-					<reference ref="8"/>
-					<reference ref="8"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="8"/>
-					<reference ref="6672969"/>
-					<reference ref="8"/>
-					<reference ref="8"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{873, 640}, {110, 48}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{873, 640}, {110, 48}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="172944286"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<real value="1.000000e+00"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="484376035"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{772, 644}, {100, 48}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="484376035"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="484376035"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="484376035"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="484376035"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<real value="1.000000e+00"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<real value="1.000000e+00"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<real value="1.000000e+00"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<real value="1.000000e+00"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<real value="1.000000e+00"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<real value="1.000000e+00"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<real value="1.000000e+00"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>{{-1077, 352}, {849, 399}}</string>
-					<boolean value="NO" id="6"/>
-					<reference ref="559925184"/>
-					<string>{{-1077, 352}, {849, 399}}</string>
-					<reference ref="559925184"/>
-					<string>{{221, 276}, {533, 580}}</string>
-					<reference ref="8"/>
-					<reference ref="6"/>
-					<string>{3.40282e+38, 3.40282e+38}</string>
-					<string>{230, 500}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<real value="1.000000e+00"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSMutableArray">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="IBUserGuide">
-							<reference key="view" ref="49161063"/>
-							<float key="location">0.000000e+00</float>
-							<int key="affinity">1</int>
-						</object>
-						<object class="IBUserGuide">
-							<reference key="view" ref="49161063"/>
-							<float key="location">2.420000e+02</float>
-							<int key="affinity">0</int>
-						</object>
-					</object>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="559925184"/>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">533</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">FirstResponder</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">PictureController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSMutableArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>FilterSettingsChanged:</string>
-							<string>SettingsChanged:</string>
-							<string>adjustFilterDisplay:</string>
-							<string>adjustSizingDisplay:</string>
-							<string>deblockSliderChanged:</string>
-							<string>displayLinkChanged:</string>
-							<string>modeDecombDeinterlaceSliderChanged:</string>
-							<string>parLinkChanged:</string>
-							<string>previewGoWindowed:</string>
-							<string>resizeInspectorForTab:</string>
-							<string>showPictureWindow:</string>
-							<string>showPreviewWindow:</string>
-							<string>storageLinkChanged:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSMutableArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>fAnamorphicPopUp</string>
-							<string>fCropBottomField</string>
-							<string>fCropBottomStepper</string>
-							<string>fCropLeftField</string>
-							<string>fCropLeftStepper</string>
-							<string>fCropMatrix</string>
-							<string>fCropRightField</string>
-							<string>fCropRightStepper</string>
-							<string>fCropTopField</string>
-							<string>fCropTopStepper</string>
-							<string>fDeblockBox</string>
-							<string>fDeblockCheck</string>
-							<string>fDeblockField</string>
-							<string>fDeblockSlider</string>
-							<string>fDecombBox</string>
-							<string>fDecombDeinterlaceBox</string>
-							<string>fDecombDeinterlaceSlider</string>
-							<string>fDecombField</string>
-							<string>fDecombPopUp</string>
-							<string>fDeinterlaceBox</string>
-							<string>fDeinterlaceField</string>
-							<string>fDeinterlacePopUp</string>
-							<string>fDenoiseBox</string>
-							<string>fDenoiseField</string>
-							<string>fDenoisePopUp</string>
-							<string>fDetelecineBox</string>
-							<string>fDetelecineField</string>
-							<string>fDetelecinePopUp</string>
-							<string>fDisplayLinkParLabel</string>
-							<string>fDisplayLinkSlider</string>
-							<string>fDisplayLinkStorageLabel</string>
-							<string>fDisplayWidthField</string>
-							<string>fDisplayWidthLabel</string>
-							<string>fFilterTabView</string>
-							<string>fGrayscaleCheck</string>
-							<string>fHeightField</string>
-							<string>fHeightStepper</string>
-							<string>fInfoField</string>
-							<string>fModulusLabel</string>
-							<string>fModulusPopUp</string>
-							<string>fParHeightField</string>
-							<string>fParHeightLabel</string>
-							<string>fParLinkDisplayLabel</string>
-							<string>fParLinkSlider</string>
-							<string>fParLinkStorageLabel</string>
-							<string>fParWidthField</string>
-							<string>fParWidthLabel</string>
-							<string>fPictureCropBox</string>
-							<string>fPictureFilterBox</string>
-							<string>fPictureFiltersOpenButton</string>
-							<string>fPictureSizeBox</string>
-							<string>fPictureWindow</string>
-							<string>fPreviewOpenButton</string>
-							<string>fRatioCheck</string>
-							<string>fRatioLabel</string>
-							<string>fRatioLabel2</string>
-							<string>fResetParDarButton</string>
-							<string>fSizeFilterView</string>
-							<string>fSizeInfoField</string>
-							<string>fSizeTabView</string>
-							<string>fStorageLinkBox</string>
-							<string>fStorageLinkDisplayLabel</string>
-							<string>fStorageLinkParLabel</string>
-							<string>fStorageLinkSlider</string>
-							<string>fWidthField</string>
-							<string>fWidthLabel</string>
-							<string>fWidthStepper</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSStepper</string>
-							<string>NSTextField</string>
-							<string>NSStepper</string>
-							<string>NSMatrix</string>
-							<string>NSTextField</string>
-							<string>NSStepper</string>
-							<string>NSTextField</string>
-							<string>NSStepper</string>
-							<string>NSBox</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSSlider</string>
-							<string>NSBox</string>
-							<string>NSBox</string>
-							<string>NSSlider</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSBox</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSBox</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSBox</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSSlider</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTabViewItem</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSStepper</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSSlider</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSBox</string>
-							<string>NSBox</string>
-							<string>NSButton</string>
-							<string>NSBox</string>
-							<string>NSWindow</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSButton</string>
-							<string>NSTabView</string>
-							<string>NSTextField</string>
-							<string>NSTabViewItem</string>
-							<string>NSBox</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSSlider</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSStepper</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">PictureController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">PictureController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../HandBrake.xcodeproj</string>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-	</data>
-</archive>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="14B23" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <deployment version="1060" identifier="macosx"/>
+ <development version="5100" identifier="xcode"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6250"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="HBPictureController">
+ <connections>
+ <outlet property="fAnamorphicPopUp" destination="132" id="140"/>
+ <outlet property="fCropBottomField" destination="10" id="53"/>
+ <outlet property="fCropBottomStepper" destination="14" id="54"/>
+ <outlet property="fCropLeftField" destination="11" id="55"/>
+ <outlet property="fCropLeftStepper" destination="19" id="56"/>
+ <outlet property="fCropMatrix" destination="16" id="57"/>
+ <outlet property="fCropRightField" destination="9" id="58"/>
+ <outlet property="fCropRightStepper" destination="15" id="59"/>
+ <outlet property="fCropTopField" destination="13" id="60"/>
+ <outlet property="fCropTopStepper" destination="12" id="61"/>
+ <outlet property="fDeblockField" destination="291" id="372"/>
+ <outlet property="fDecombBox" destination="315" id="364"/>
+ <outlet property="fDecombDeinterlaceBox" destination="287" id="360"/>
+ <outlet property="fDeinterlaceBox" destination="314" id="365"/>
+ <outlet property="fDenoiseCustomField" destination="302" id="OGp-PW-gBH"/>
+ <outlet property="fDenoiseCustomLabel" destination="301" id="gyb-ha-nT2"/>
+ <outlet property="fDenoisePreset" destination="ZSz-Vu-qC0" id="ksD-JU-hU9"/>
+ <outlet property="fDenoisePresetPopUp" destination="2F0-KY-tOC" id="qWR-VK-SxC"/>
+ <outlet property="fDenoiseTuneLabel" destination="gpP-sp-Lev" id="Q7g-G7-JZZ"/>
+ <outlet property="fDenoiseTunePopUp" destination="Upd-5E-OpR" id="5UN-Gt-l11"/>
+ <outlet property="fDetelecineBox" destination="286" id="356"/>
+ <outlet property="fDisplayWidthField" destination="396" id="407"/>
+ <outlet property="fDisplayWidthLabel" destination="402" id="526"/>
+ <outlet property="fHeightField" destination="43" id="66"/>
+ <outlet property="fHeightStepper" destination="46" id="67"/>
+ <outlet property="fModulusLabel" destination="390" id="532"/>
+ <outlet property="fModulusPopUp" destination="384" id="392"/>
+ <outlet property="fParHeightField" destination="442" id="449"/>
+ <outlet property="fParHeightLabel" destination="446" id="525"/>
+ <outlet property="fParWidthField" destination="440" id="448"/>
+ <outlet property="fParWidthLabel" destination="444" id="524"/>
+ <outlet property="fPictureCropBox" destination="7" id="242"/>
+ <outlet property="fPictureSizeBox" destination="436" id="437"/>
+ <outlet property="fRatioCheck" destination="45" id="74"/>
+ <outlet property="fSizeFilterView" destination="281" id="419"/>
+ <outlet property="fSizeInfoField" destination="278" id="280"/>
+ <outlet property="fWidthField" destination="42" id="68"/>
+ <outlet property="fWidthStepper" destination="44" id="69"/>
+ <outlet property="window" destination="5" id="184"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+ <window title="Picture Settings" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="PictureSizing" animationBehavior="default" id="5" userLabel="PicturePanel" customClass="NSPanel">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" utility="YES" HUD="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="152" y="1024" width="635" height="252"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
+ <view key="contentView" id="6">
+ <rect key="frame" x="0.0" y="0.0" width="635" height="252"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <userGuides>
+ <userLayoutGuide affinity="minY"/>
+ <userLayoutGuide location="115" affinity="minX"/>
+ </userGuides>
+ <subviews>
+ <textField verticalHuggingPriority="750" id="262">
+ <rect key="frame" x="19" y="469" width="55" height="17"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Size" id="263">
+ 
+ <color key="textColor" red="0.80000000999999998" green="0.80000000999999998" blue="0.80000000999999998" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="278">
+ <rect key="frame" x="14" y="8" width="418" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" alignment="left" id="279">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+ </textFieldCell>
+ </textField>
+ <tabView controlSize="mini" initialItem="282" id="281">
+ <rect key="frame" x="-12" y="18" width="658" height="216"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ 
+ <tabViewItems>
+ <tabViewItem label="Size" identifier="1" id="282">
+ <view key="view" id="285">
+ <rect key="frame" x="10" y="28" width="638" height="175"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <box title="Box" borderType="none" titlePosition="noTitle" id="436">
+ <rect key="frame" x="14" y="40" width="358" height="126"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <view key="contentView">
+ <rect key="frame" x="0.0" y="0.0" width="358" height="126"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" id="402">
+ <rect key="frame" x="192" y="106" width="82" height="16"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Display Width:" id="403">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="396">
+ <rect key="frame" x="278" y="106" width="61" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="397">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="EIO-m9-bQ5"/>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="750" id="440">
+ <rect key="frame" x="278" y="81" width="37" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="441">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="Ip6-Hp-U6K"/>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="750" id="442">
+ <rect key="frame" x="278" y="56" width="37" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="443">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="YvM-ki-flP"/>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="750" id="444">
+ <rect key="frame" x="207" y="81" width="67" height="16"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="PAR Width:" id="445">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="446">
+ <rect key="frame" x="202" y="56" width="71" height="16"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="PAR Height:" id="447">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="44">
+ <rect key="frame" x="143" y="103" width="15" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="59" id="169">
+ 
+ </stepperCell>
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="je3-pw-SC3"/>
+ </connections>
+ </stepper>
+ <popUpButton verticalHuggingPriority="750" id="384">
+ <rect key="frame" x="75" y="15" width="46" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="16" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="387" id="385">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="386">
+ <items>
+ <menuItem title="16" state="on" id="387"/>
+ <menuItem title="8" id="388"/>
+ <menuItem title="4" id="389"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="fS2-p2-Ldc"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="42">
+ <rect key="frame" x="76" y="107" width="62" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="167">
+ <numberFormatter key="formatter" formatterBehavior="custom10_4" localizesFormat="NO" numberStyle="decimal" usesGroupingSeparator="NO" minimumIntegerDigits="1" maximumIntegerDigits="309" maximumFractionDigits="3" id="le0-iC-NhW">
+ <real key="minimum" value="64"/>
+ </numberFormatter>
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="EJC-vL-fSK"/>
+ </connections>
+ </textField>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="46">
+ <rect key="frame" x="143" y="78" width="15" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="64" id="171">
+ 
+ </stepperCell>
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="77Y-D7-WA9"/>
+ </connections>
+ </stepper>
+ <textField verticalHuggingPriority="750" id="138">
+ <rect key="frame" x="-1" y="38" width="73" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Anamorphic:" id="174">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="41">
+ <rect key="frame" x="29" y="82" width="43" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Height:" id="166">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="132">
+ <rect key="frame" x="75" y="38" width="80" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="135" id="173">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="134">
+ <items>
+ <menuItem title="Item 1" state="on" id="135"/>
+ <menuItem title="Item 2" id="136"/>
+ <menuItem title="Item 3" id="137"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="OGE-xz-yb7"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="390">
+ <rect key="frame" x="19" y="15" width="53" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Modulus:" id="391">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="47">
+ <rect key="frame" x="32" y="108" width="38" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Width:" id="172">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="43">
+ <rect key="frame" x="76" y="81" width="62" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="168">
+ <numberFormatter key="formatter" formatterBehavior="custom10_4" localizesFormat="NO" numberStyle="decimal" usesGroupingSeparator="NO" minimumIntegerDigits="1" maximumIntegerDigits="309" maximumFractionDigits="3" id="9iU-HJ-b4u">
+ <real key="minimum" value="64"/>
+ <metadata>
+ <real key="inspectorSampleValue" value="1.234"/>
+ </metadata>
+ </numberFormatter>
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="hfw-v1-XQB"/>
+ </connections>
+ </textField>
+ <button id="45">
+ <rect key="frame" x="73" y="57" width="125" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <buttonCell key="cell" type="check" title="Keep Aspect Ratio" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="170" customClass="HBHUDButtonCell">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="urF-IM-OfA"/>
+ </connections>
+ </button>
+ </subviews>
+ </view>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </box>
+ <box borderType="none" titlePosition="noTitle" id="7">
+ <rect key="frame" x="374" y="40" width="254" height="126"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <view key="contentView">
+ <rect key="frame" x="0.0" y="0.0" width="254" height="126"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="12">
+ <rect key="frame" x="169" y="63" width="15" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="59" id="152">
+ 
+ </stepperCell>
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="gih-EE-fLI"/>
+ </connections>
+ </stepper>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="15">
+ <rect key="frame" x="232" y="53" width="15" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="59" id="155">
+ 
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="pwP-2b-uZ1"/>
+ </connections>
+ </stepperCell>
+ </stepper>
+ <matrix verticalHuggingPriority="750" allowsEmptySelection="NO" autosizesCells="NO" id="16">
+ <rect key="frame" x="64" y="92" width="90" height="31"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <size key="cellSize" width="90" height="14"/>
+ <size key="intercellSpacing" width="2" height="3"/>
+ <buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" controlSize="mini" inset="2" id="178" customClass="HBHUDButtonCell">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <cells>
+ <column>
+ <buttonCell type="radio" title="Automatic" imagePosition="left" alignment="left" controlSize="mini" state="on" inset="2" id="17" customClass="HBHUDButtonCell">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <buttonCell type="radio" title="Custom:" imagePosition="left" alignment="left" controlSize="mini" inset="2" id="18" customClass="HBHUDButtonCell">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ </column>
+ </cells>
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="dUb-Ct-S9f"/>
+ </connections>
+ </matrix>
+ <textField verticalHuggingPriority="750" id="13">
+ <rect key="frame" x="131" y="66" width="36" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="153">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="LEd-0c-EqV"/>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="750" id="10">
+ <rect key="frame" x="131" y="39" width="36" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="150">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="txb-hc-ans"/>
+ </connections>
+ </textField>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="19">
+ <rect key="frame" x="110" y="50" width="15" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="59" id="156">
+ 
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="Ds0-vg-mpO"/>
+ </connections>
+ </stepperCell>
+ </stepper>
+ <textField verticalHuggingPriority="750" id="9">
+ <rect key="frame" x="194" y="56" width="36" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="149">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="FQT-HE-w3X"/>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="750" id="11">
+ <rect key="frame" x="72" y="53" width="36" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="151">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="JTs-h7-4xm"/>
+ </connections>
+ </textField>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="14">
+ <rect key="frame" x="169" y="36" width="15" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="59" id="154">
+ 
+ <connections>
+ <action selector="settingsChanged:" target="-2" id="e3a-Lo-Umb"/>
+ </connections>
+ </stepperCell>
+ </stepper>
+ <textField verticalHuggingPriority="750" id="382">
+ <rect key="frame" x="3" y="107" width="59" height="17"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Cropping:" id="383">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ </view>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </box>
+ </subviews>
+ </view>
+ </tabViewItem>
+ <tabViewItem label="Filters" identifier="2" id="283">
+ <view key="view" id="284">
+ <rect key="frame" x="10" y="19" width="638" height="184"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <box autoresizesSubviews="NO" title="Box" borderType="bezel" titlePosition="noTitle" id="286">
+ <rect key="frame" x="11" y="113" width="232" height="66"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <view key="contentView">
+ <rect key="frame" x="3" y="3" width="226" height="60"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" id="346">
+ <rect key="frame" x="19" y="36" width="64" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Detelecine:" id="347">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="344">
+ <rect key="frame" x="34" y="13" width="49" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Custom:" id="353">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="hidden" keyPath="self.filters.detelecine" id="GeL-Hh-N04">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">HBCustomFilterTransformer</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="345">
+ <rect key="frame" x="87" y="35" width="110" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="348">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="349"/>
+ </popUpButtonCell>
+ <connections>
+ <binding destination="-2" name="selectedIndex" keyPath="self.filters.detelecine" previousBinding="pGd-yk-F9V" id="nJ6-iy-GiP"/>
+ <binding destination="-2" name="content" keyPath="self.filters.detelecineSettings" id="pGd-yk-F9V"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="343">
+ <rect key="frame" x="88" y="12" width="108" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="354">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="hidden" keyPath="self.filters.detelecine" id="BLn-QV-lw8">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">HBCustomFilterTransformer</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.filters.detelecineCustomString" id="gSO-TA-w8P">
+ <dictionary key="options">
+ <bool key="NSContinuouslyUpdatesValue" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ </subviews>
+ </view>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </box>
+ <box borderType="bezel" titlePosition="aboveBottom" id="287">
+ <rect key="frame" x="11" y="4" width="232" height="107"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <view key="contentView">
+ <rect key="frame" x="3" y="19" width="226" height="85"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <matrix verticalHuggingPriority="750" allowsEmptySelection="NO" id="kSA-Hn-6ya">
+ <rect key="frame" x="88" y="43" width="83" height="32"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <size key="cellSize" width="83" height="15"/>
+ <size key="intercellSpacing" width="4" height="2"/>
+ <buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" inset="2" id="m9e-GO-6R2" customClass="HBHUDButtonCell">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <cells>
+ <column>
+ <buttonCell type="radio" title="Deinterlace" imagePosition="left" alignment="left" controlSize="small" state="on" tag="1" inset="2" id="UmU-23-PdR" customClass="HBHUDButtonCell">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <buttonCell type="radio" title="Decomb" imagePosition="left" alignment="left" controlSize="small" inset="2" id="N0e-d0-RLj" customClass="HBHUDButtonCell">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ </column>
+ </cells>
+ <connections>
+ <binding destination="-2" name="selectedIndex" keyPath="self.filters.useDecomb" id="FHi-fu-YUi"/>
+ </connections>
+ </matrix>
+ <box autoresizesSubviews="NO" title="Box" borderType="none" titlePosition="noTitle" id="315" userLabel="Decomb Box">
+ <rect key="frame" x="11" y="-11" width="207" height="62"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <view key="contentView">
+ <rect key="frame" x="0.0" y="0.0" width="207" height="62"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" id="319">
+ <rect key="frame" x="20" y="35" width="52" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Decomb:" id="320">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="317">
+ <rect key="frame" x="23" y="11" width="49" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Custom:" id="326">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="hidden" keyPath="self.filters.decomb" id="SgL-u6-Y9a">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">HBCustomFilterTransformer</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="318">
+ <rect key="frame" x="76" y="34" width="111" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="321">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="322"/>
+ </popUpButtonCell>
+ <connections>
+ <binding destination="-2" name="selectedIndex" keyPath="self.filters.decomb" previousBinding="Rky-63-XUy" id="0LF-hS-iFS"/>
+ <binding destination="-2" name="contentValues" keyPath="self.filters.decombSettings" id="Rky-63-XUy"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="316">
+ <rect key="frame" x="77" y="10" width="108" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="327">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="hidden" keyPath="self.filters.decomb" id="akE-8W-aND">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">HBCustomFilterTransformer</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.filters.decombCustomString" id="y3W-Df-Jgn">
+ <dictionary key="options">
+ <bool key="NSContinuouslyUpdatesValue" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ </subviews>
+ </view>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </box>
+ <box autoresizesSubviews="NO" title="Box" borderType="none" titlePosition="noTitle" id="314" userLabel="Deinterlace Box">
+ <rect key="frame" x="11" y="-11" width="207" height="62"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <view key="contentView">
+ <rect key="frame" x="0.0" y="0.0" width="207" height="62"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" id="331">
+ <rect key="frame" x="4" y="35" width="68" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Deinterlace:" id="332">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="330">
+ <rect key="frame" x="23" y="11" width="49" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Custom:" id="333">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="hidden" keyPath="self.filters.deinterlace" id="rIM-KR-bUf">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">HBCustomFilterTransformer</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="328">
+ <rect key="frame" x="76" y="34" width="111" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="335">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="336"/>
+ </popUpButtonCell>
+ <connections>
+ <binding destination="-2" name="selectedIndex" keyPath="self.filters.deinterlace" previousBinding="hol-Lh-FVF" id="5jK-2w-2Fq"/>
+ <binding destination="-2" name="contentValues" keyPath="self.filters.deinterlaceSettings" id="hol-Lh-FVF"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="329">
+ <rect key="frame" x="77" y="10" width="108" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="334">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="hidden" keyPath="self.filters.deinterlace" id="7f6-Fd-pfo">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">HBCustomFilterTransformer</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.filters.deinterlaceCustomString" id="aSX-hF-LBO">
+ <dictionary key="options">
+ <bool key="NSContinuouslyUpdatesValue" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ </subviews>
+ </view>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </box>
+ </subviews>
+ </view>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </box>
+ <box autoresizesSubviews="NO" title="Box" borderType="bezel" titlePosition="noTitle" id="288">
+ <rect key="frame" x="245" y="4" width="232" height="107"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <view key="contentView">
+ <rect key="frame" x="3" y="3" width="226" height="101"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" id="299">
+ <rect key="frame" x="32" y="73" width="50" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Denoise:" id="310">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton toolTip="Denoise filtering reduces or removes the appearance of noise and grain." verticalHuggingPriority="750" id="300">
+ <rect key="frame" x="86" y="73" width="110" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="305">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="306"/>
+ </popUpButtonCell>
+ <connections>
+ <binding destination="-2" name="selectedValue" keyPath="self.filters.denoise" previousBinding="mkS-wD-luU" id="1LQ-5U-xih">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">HBDenoiseTransformer</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="contentValues" keyPath="self.filters.denoiseTypes" id="mkS-wD-luU"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="ZSz-Vu-qC0">
+ <rect key="frame" x="42" y="50" width="40" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Preset:" id="CBk-r9-aJb">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="2F0-KY-tOC">
+ <rect key="frame" x="86" y="50" width="110" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="nMP-H2-vMe">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="Mxi-ZP-xzf"/>
+ </popUpButtonCell>
+ <connections>
+ <binding destination="-2" name="selectedValue" keyPath="self.filters.denoisePreset" previousBinding="Lju-Js-fav" id="8HL-Js-eww">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">HBDenoisePresetTransformer</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="contentValues" keyPath="self.filters.denoisePresets" id="Lju-Js-fav"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="gpP-sp-Lev">
+ <rect key="frame" x="48" y="28" width="34" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Tune:" id="BqI-14-fzH">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="Upd-5E-OpR">
+ <rect key="frame" x="86" y="28" width="110" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="lPq-MO-3Oz">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="NiL-SO-Fbj"/>
+ </popUpButtonCell>
+ <connections>
+ <binding destination="-2" name="selectedValue" keyPath="self.filters.denoiseTune" previousBinding="nST-CD-SjR" id="wvC-Ag-WKc">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">HBDenoiseTuneTransformer</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="contentValues" keyPath="self.filters.denoiseTunes" id="nST-CD-SjR"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="301">
+ <rect key="frame" x="33" y="27" width="49" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Custom:" id="304">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="302">
+ <rect key="frame" x="87" y="26" width="108" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="303">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.filters.denoiseCustomString" id="cUD-QA-8K3">
+ <dictionary key="options">
+ <bool key="NSContinuouslyUpdatesValue" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ </subviews>
+ </view>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </box>
+ <box autoresizesSubviews="NO" title="Box" borderType="bezel" titlePosition="noTitle" id="421">
+ <rect key="frame" x="245" y="113" width="232" height="66"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <view key="contentView">
+ <rect key="frame" x="3" y="3" width="226" height="60"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" id="289">
+ <rect key="frame" x="30" y="36" width="51" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Deblock:" id="298">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="290">
+ <rect key="frame" x="24" y="13" width="58" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Grayscale:" id="297">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="291">
+ <rect key="frame" x="79" y="35" width="31" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="center" title="Off" id="296">
+ 
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <slider verticalHuggingPriority="750" id="292">
+ <rect key="frame" x="108" y="34" width="104" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <sliderCell key="cell" controlSize="mini" continuous="YES" state="on" alignment="left" minValue="4" maxValue="15" doubleValue="4" tickMarkPosition="below" numberOfTickMarks="12" allowsTickMarkValuesOnly="YES" sliderType="linear" id="295">
+ 
+ </sliderCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.filters.deblock" id="QYG-e5-NYq"/>
+ </connections>
+ </slider>
+ <button id="293">
+ <rect key="frame" x="84" y="11" width="19" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="294">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.filters.grayscale" id="CyF-w9-sk3"/>
+ </connections>
+ </button>
+ </subviews>
+ </view>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </box>
+ </subviews>
+ </view>
+ </tabViewItem>
+ </tabViewItems>
+ <connections>
+ <outlet property="delegate" destination="-2" id="420"/>
+ </connections>
+ </tabView>
+ <button verticalHuggingPriority="750" id="270">
+ <rect key="frame" x="15" y="228" width="64" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="push" title="Preview" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="271">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="showPreviewWindow:" target="-2" id="273"/>
+ </connections>
+ </button>
+ </subviews>
+ </view>
+ <connections>
+ <outlet property="delegate" destination="-2" id="hby-dR-NFK"/>
+ </connections>
+ <point key="canvasLocation" x="182.5" y="419"/>
+ </window>
+ </objects>
+</document>

HandBrake-0.9.9.tar.bz2/macosx/English.lproj/Preferences.xib -> HandBrake-0.10.0.tar.bz2/macosx/English.lproj/Preferences.xib Changed

@@ -1,3681 +1,627 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">11G63</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1138.51</string>
-		<string key="IBDocument.HIToolboxVersion">569.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1938</string>
-		</object>
-		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSPopUpButtonCell</string>
-			<string>NSComboBoxCell</string>
-			<string>NSPopUpButton</string>
-			<string>NSButton</string>
-			<string>NSMenu</string>
-			<string>NSTextFieldCell</string>
-			<string>NSButtonCell</string>
-			<string>NSMenuItem</string>
-			<string>NSComboBox</string>
-			<string>NSCustomView</string>
-			<string>NSCustomObject</string>
-			<string>NSView</string>
-			<string>NSWindowTemplate</string>
-			<string>NSTextField</string>
-			<string>NSUserDefaultsController</string>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="185275739">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="169862212">
-				<string key="NSClassName">HBPreferencesController</string>
-			</object>
-			<object class="NSCustomObject" id="941647215">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="559784606">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="123373831">
-				<int key="NSWindowStyleMask">3</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{136, 318}, {500, 200}}</string>
-				<int key="NSWTFlags">813171712</int>
-				<string key="NSWindowTitle">Preferences</string>
-				<string key="NSWindowClass">NSPanel</string>
-				<object class="NSMutableString" key="NSViewClass">
-					<characters key="NS.bytes">View</characters>
-				</object>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<string key="NSWindowContentMinSize">{213, 107}</string>
-				<object class="NSView" key="NSWindowView" id="496214002">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<string key="NSFrameSize">{500, 200}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
-					<reference key="NSNextKeyView"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
-				<string key="NSMinSize">{213, 129}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-			<object class="NSUserDefaultsController" id="580534391">
-				<bool key="NSSharedInstance">YES</bool>
-			</object>
-			<object class="NSCustomView" id="1048779201">
-				<nil key="NSNextResponder"/>
-				<int key="NSvFlags">256</int>
-				<object class="NSMutableArray" key="NSSubviews">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSPopUpButton" id="23412822">
-						<reference key="NSNextResponder" ref="1048779201"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{123, 113}, {195, 22}}</string>
-						<reference key="NSSuperview" ref="1048779201"/>
-						<reference key="NSNextKeyView" ref="1009109497"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="630285587">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">133120</int>
-							<object class="NSFont" key="NSSupport" id="26">
-								<string key="NSName">LucidaGrande</string>
-								<double key="NSSize">11</double>
-								<int key="NSfFlags">3100</int>
-							</object>
-							<reference key="NSControlView" ref="23412822"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">129</int>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="302654188">
-								<reference key="NSMenu" ref="479459549"/>
-								<string key="NSTitle">Alert Window</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<object class="NSCustomResource" key="NSOnImage" id="13790404">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSMenuCheckmark</string>
-								</object>
-								<object class="NSCustomResource" key="NSMixedImage" id="218367874">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSMenuMixedState</string>
-								</object>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="630285587"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="479459549">
-								<string key="NSTitle">OtherViews</string>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<object class="NSMenuItem" id="434429668">
-										<reference key="NSMenu" ref="479459549"/>
-										<string key="NSTitle">Do Nothing</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="630285587"/>
-									</object>
-									<reference ref="302654188"/>
-									<object class="NSMenuItem" id="583376135">
-										<reference key="NSMenu" ref="479459549"/>
-										<string key="NSTitle">Growl Notification</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="630285587"/>
-									</object>
-									<object class="NSMenuItem" id="432828860">
-										<reference key="NSMenu" ref="479459549"/>
-										<string key="NSTitle">Alert Window And Growl</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="630285587"/>
-									</object>
-									<object class="NSMenuItem" id="770487737">
-										<reference key="NSMenu" ref="479459549"/>
-										<string key="NSTitle">Put Computer To Sleep</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="630285587"/>
-									</object>
-									<object class="NSMenuItem" id="327548156">
-										<reference key="NSMenu" ref="479459549"/>
-										<string key="NSTitle">Shut Down Computer</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="630285587"/>
-									</object>
-								</object>
-								<object class="NSFont" key="NSMenuFont" id="964910696">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">13</double>
-									<int key="NSfFlags">1044</int>
-								</object>
-							</object>
-							<int key="NSSelectedIndex">1</int>
-							<int key="NSPreferredEdge">1</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">2</int>
-						</object>
-					</object>
-					<object class="NSButton" id="1009109497">
-						<reference key="NSNextResponder" ref="1048779201"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{123, 90}, {313, 18}}</string>
-						<reference key="NSSuperview" ref="1048779201"/>
-						<reference key="NSNextKeyView" ref="597305137"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="878201725">
-							<int key="NSCellFlags">-2080244224</int>
-							<int key="NSCellFlags2">131072</int>
-							<string key="NSContents">Play System Alert Sound</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="1009109497"/>
-							<int key="NSButtonFlags">1211912703</int>
-							<int key="NSButtonFlags2">2</int>
-							<object class="NSCustomResource" key="NSNormalImage" id="491838135">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">NSSwitch</string>
-							</object>
-							<object class="NSButtonImageSource" key="NSAlternateImage" id="1056213191">
-								<string key="NSImageName">NSSwitch</string>
-							</object>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-					</object>
-					<object class="NSButton" id="806259169">
-						<reference key="NSNextResponder" ref="1048779201"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{345, 71}, {96, 16}}</string>
-						<reference key="NSSuperview" ref="1048779201"/>
-						<reference key="NSNextKeyView" ref="713240777"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="725806271">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">134479872</int>
-							<string key="NSContents">Browse ...</string>
-							<object class="NSFont" key="NSSupport" id="22">
-								<string key="NSName">LucidaGrande</string>
-								<double key="NSSize">9</double>
-								<int key="NSfFlags">3614</int>
-							</object>
-							<reference key="NSControlView" ref="806259169"/>
-							<int key="NSButtonFlags">-2038284033</int>
-							<int key="NSButtonFlags2">129</int>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-					</object>
-					<object class="NSTextField" id="842132572">
-						<reference key="NSNextResponder" ref="1048779201"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{209, 73}, {125, 14}}</string>
-						<reference key="NSSuperview" ref="1048779201"/>
-						<reference key="NSNextKeyView" ref="806259169"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="456853603">
-							<int key="NSCellFlags">68288064</int>
-							<int key="NSCellFlags2">272761856</int>
-							<string key="NSContents">None</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="842132572"/>
-							<object class="NSColor" key="NSBackgroundColor" id="525377782">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">controlColor</string>
-								<object class="NSColor" key="NSColor" id="666005350">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-								</object>
-							</object>
-							<object class="NSColor" key="NSTextColor" id="887152126">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">controlTextColor</string>
-								<object class="NSColor" key="NSColor" id="897199777">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MAA</bytes>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSButton" id="636306431">
-						<reference key="NSNextResponder" ref="1048779201"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{123, 220}, {133, 18}}</string>
-						<reference key="NSSuperview" ref="1048779201"/>
-						<reference key="NSNextKeyView" ref="280291731"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="448858755">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">131072</int>
-							<string key="NSContents">Show Presets Drawer</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="636306431"/>
-							<int key="NSButtonFlags">1211912703</int>
-							<int key="NSButtonFlags2">2</int>
-							<reference key="NSAlternateImage" ref="1056213191"/>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-					</object>
-					<object class="NSButton" id="965044526">
-						<reference key="NSNextResponder" ref="1048779201"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{125, 38}, {303, 18}}</string>
-						<reference key="NSSuperview" ref="1048779201"/>
-						<reference key="NSNextKeyView" ref="854927877"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="419322096">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">131072</int>
-							<string key="NSContents">Use Auto Naming (uses DVD name and title number)</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="965044526"/>
-							<int key="NSButtonFlags">1211912703</int>
-							<int key="NSButtonFlags2">2</int>
-							<reference key="NSAlternateImage" ref="1056213191"/>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-					</object>
-					<object class="NSTextField" id="315188467">
-						<reference key="NSNextResponder" ref="1048779201"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{52, 117}, {69, 14}}</string>
-						<reference key="NSSuperview" ref="1048779201"/>
-						<reference key="NSNextKeyView" ref="23412822"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="718672066">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">272760832</int>
-							<string key="NSContents">When Done:</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="315188467"/>
-							<reference key="NSBackgroundColor" ref="525377782"/>
-							<reference key="NSTextColor" ref="887152126"/>
-						</object>
-					</object>
-					<object class="NSButton" id="581738572">
-						<reference key="NSNextResponder" ref="1048779201"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{123, 175}, {194, 18}}</string>
-						<reference key="NSSuperview" ref="1048779201"/>
-						<reference key="NSNextKeyView" ref="954667708"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="824062726">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">131072</int>
-							<string key="NSContents">Automatically check for updates</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="581738572"/>
-							<int key="NSButtonFlags">1211912703</int>
-							<int key="NSButtonFlags2">2</int>
-							<reference key="NSAlternateImage" ref="1056213191"/>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-					</object>
-					<object class="NSButton" id="597305137">
-						<reference key="NSNextResponder" ref="1048779201"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{123, 71}, {86, 18}}</string>
-						<reference key="NSSuperview" ref="1048779201"/>
-						<reference key="NSNextKeyView" ref="842132572"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="437495050">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">131072</int>
-							<string key="NSContents">Send file to:</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="597305137"/>
-							<int key="NSButtonFlags">1211912703</int>
-							<int key="NSButtonFlags2">2</int>
-							<reference key="NSNormalImage" ref="491838135"/>
-							<reference key="NSAlternateImage" ref="1056213191"/>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-					</object>
-					<object class="NSTextField" id="576686737">
-						<reference key="NSNextResponder" ref="1048779201"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{62, 222}, {59, 14}}</string>
-						<reference key="NSSuperview" ref="1048779201"/>
-						<reference key="NSNextKeyView" ref="636306431"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="404194395">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">272760832</int>
-							<string key="NSContents">At launch:</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="576686737"/>
-							<reference key="NSBackgroundColor" ref="525377782"/>
-							<reference key="NSTextColor" ref="887152126"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="854927877">
-						<reference key="NSNextResponder" ref="1048779201"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{125, 20}, {134, 14}}</string>
-						<reference key="NSSuperview" ref="1048779201"/>
-						<reference key="NSNextKeyView" ref="317169558"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="177949206">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71434240</int>
-							<string key="NSContents">Default MP4 Extension:</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="854927877"/>
-							<reference key="NSBackgroundColor" ref="525377782"/>
-							<reference key="NSTextColor" ref="887152126"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="280291731">
-						<reference key="NSNextResponder" ref="1048779201"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{141, 199}, {95, 14}}</string>
-						<reference key="NSSuperview" ref="1048779201"/>
-						<reference key="NSNextKeyView" ref="54712339"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="1049782015">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71434240</int>
-							<string key="NSContents">Source selection:</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="280291731"/>
-							<reference key="NSBackgroundColor" ref="525377782"/>
-							<reference key="NSTextColor" ref="887152126"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="713240777">
-						<reference key="NSNextResponder" ref="1048779201"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{52, 40}, {71, 14}}</string>
-						<reference key="NSSuperview" ref="1048779201"/>
-						<reference key="NSNextKeyView" ref="965044526"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="947435557">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">272760832</int>
-							<string key="NSContents">Output files:</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="713240777"/>
-							<reference key="NSBackgroundColor" ref="525377782"/>
-							<reference key="NSTextColor" ref="887152126"/>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="317169558">
-						<reference key="NSNextResponder" ref="1048779201"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{263, 19}, {66, 15}}</string>
-						<reference key="NSSuperview" ref="1048779201"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="792374025">
-							<int key="NSCellFlags">71433792</int>
-							<int key="NSCellFlags2">264192</int>
-							<reference key="NSSupport" ref="22"/>
-							<reference key="NSControlView" ref="317169558"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">1</int>
-							<object class="NSFont" key="NSAlternateImage">
-								<string key="NSName">LucidaGrande</string>
-								<double key="NSSize">9</double>
-								<int key="NSfFlags">16</int>
-							</object>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="197120751">
-								<reference key="NSMenu" ref="783755954"/>
-								<string key="NSTitle">Auto</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="13790404"/>
-								<reference key="NSMixedImage" ref="218367874"/>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="792374025"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="783755954">
-								<object class="NSMutableString" key="NSTitle">
-									<characters key="NS.bytes">OtherViews</characters>
-								</object>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<reference ref="197120751"/>
-									<object class="NSMenuItem" id="701819170">
-										<reference key="NSMenu" ref="783755954"/>
-										<string key="NSTitle">.m4v</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="792374025"/>
-									</object>
-									<object class="NSMenuItem" id="796707391">
-										<reference key="NSMenu" ref="783755954"/>
-										<string key="NSTitle">.mp4</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="792374025"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSPreferredEdge">3</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">1</int>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="954667708">
-						<reference key="NSNextResponder" ref="1048779201"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{141, 148}, {102, 22}}</string>
-						<reference key="NSSuperview" ref="1048779201"/>
-						<reference key="NSNextKeyView" ref="315188467"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="841218599">
-							<int key="NSCellFlags">71433792</int>
-							<int key="NSCellFlags2">133120</int>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="954667708"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">1</int>
-							<object class="NSFont" key="NSAlternateImage" id="44722471">
-								<string key="NSName">LucidaGrande</string>
-								<double key="NSSize">11</double>
-								<int key="NSfFlags">16</int>
-							</object>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="409508073">
-								<reference key="NSMenu" ref="601170194"/>
-								<string key="NSTitle">Weekly</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="13790404"/>
-								<reference key="NSMixedImage" ref="218367874"/>
-								<string key="NSAction">_popUpItemAction:</string>
-								<int key="NSTag">604800</int>
-								<reference key="NSTarget" ref="841218599"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="601170194">
-								<object class="NSMutableString" key="NSTitle">
-									<characters key="NS.bytes">OtherViews</characters>
-								</object>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<object class="NSMenuItem" id="356864129">
-										<reference key="NSMenu" ref="601170194"/>
-										<string key="NSTitle">Daily</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<int key="NSTag">86400</int>
-										<reference key="NSTarget" ref="841218599"/>
-									</object>
-									<reference ref="409508073"/>
-									<object class="NSMenuItem" id="1028006448">
-										<reference key="NSMenu" ref="601170194"/>
-										<string key="NSTitle">Monthly</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<int key="NSTag">2629800</int>
-										<reference key="NSTarget" ref="841218599"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSSelectedIndex">1</int>
-							<int key="NSPreferredEdge">3</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">1</int>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="54712339">
-						<reference key="NSNextResponder" ref="1048779201"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{238, 194}, {205, 22}}</string>
-						<reference key="NSSuperview" ref="1048779201"/>
-						<reference key="NSNextKeyView" ref="581738572"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="310956178">
-							<int key="NSCellFlags">71433792</int>
-							<int key="NSCellFlags2">133120</int>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="54712339"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">1</int>
-							<reference key="NSAlternateImage" ref="44722471"/>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="420036141">
-								<reference key="NSMenu" ref="374003297"/>
-								<string key="NSTitle">Open Source</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="13790404"/>
-								<reference key="NSMixedImage" ref="218367874"/>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="310956178"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="374003297">
-								<object class="NSMutableString" key="NSTitle">
-									<characters key="NS.bytes">OtherViews</characters>
-								</object>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<object class="NSMenuItem" id="951535454">
-										<reference key="NSMenu" ref="374003297"/>
-										<string key="NSTitle">Do Nothing</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="310956178"/>
-									</object>
-									<reference ref="420036141"/>
-									<object class="NSMenuItem" id="195310116">
-										<reference key="NSMenu" ref="374003297"/>
-										<string key="NSTitle">Open Source (Title Specific)</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="310956178"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSSelectedIndex">1</int>
-							<int key="NSPreferredEdge">3</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">1</int>
-						</object>
-					</object>
-				</object>
-				<string key="NSFrameSize">{460, 256}</string>
-				<reference key="NSNextKeyView" ref="576686737"/>
-				<string key="NSClassName">NSView</string>
-				<string key="NSExtension">NSControl</string>
-			</object>
-			<object class="NSCustomView" id="520288288">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">256</int>
-				<object class="NSMutableArray" key="NSSubviews">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSTextField" id="539748933">
-						<reference key="NSNextResponder" ref="520288288"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{34, 42}, {432, 17}}</string>
-						<reference key="NSSuperview" ref="520288288"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="374363387">
-							<int key="NSCellFlags">67239488</int>
-							<int key="NSCellFlags2">138413056</int>
-							<string key="NSContents">Nothing here right now, but I am sure we will think of something</string>
-							<reference key="NSSupport" ref="964910696"/>
-							<reference key="NSControlView" ref="539748933"/>
-							<reference key="NSBackgroundColor" ref="525377782"/>
-							<reference key="NSTextColor" ref="887152126"/>
-						</object>
-					</object>
-				</object>
-				<string key="NSFrameSize">{496, 82}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="539748933"/>
-				<string key="NSClassName">NSView</string>
-				<string key="NSExtension">NSResponder</string>
-			</object>
-			<object class="NSCustomView" id="332598366">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">256</int>
-				<object class="NSMutableArray" key="NSSubviews">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSTextField" id="725503362">
-						<reference key="NSNextResponder" ref="332598366"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{30, 77}, {134, 28}}</string>
-						<reference key="NSSuperview" ref="332598366"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="113289239"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="603140150">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">272760832</int>
-							<string key="NSContents">Alternate Language:</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="725503362"/>
-							<reference key="NSBackgroundColor" ref="525377782"/>
-							<reference key="NSTextColor" ref="887152126"/>
-						</object>
-					</object>
-					<object class="NSComboBox" id="113289239">
-						<reference key="NSNextResponder" ref="332598366"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{169, 87}, {247, 22}}</string>
-						<reference key="NSSuperview" ref="332598366"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="247298122"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSComboBoxCell" key="NSCell" id="37767182">
-							<int key="NSCellFlags">343014976</int>
-							<int key="NSCellFlags2">272761856</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="113289239"/>
-							<bool key="NSDrawsBackground">YES</bool>
-							<object class="NSColor" key="NSBackgroundColor" id="84276979">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">textBackgroundColor</string>
-								<object class="NSColor" key="NSColor" id="993015046">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MQA</bytes>
-								</object>
-							</object>
-							<reference key="NSTextColor" ref="887152126"/>
-							<int key="NSVisibleItemCount">10</int>
-							<bool key="NSHasVerticalScroller">YES</bool>
-							<bool key="NSCompletes">YES</bool>
-							<object class="NSMutableArray" key="NSPopUpListData">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<string>Afar</string>
-								<string>Abkhazian</string>
-								<string>Afrikaans</string>
-								<string>Albanian</string>
-								<string>Amharic</string>
-								<string>Arabic</string>
-								<string>Armenian</string>
-								<string>Assamese</string>
-								<string>Avestan</string>
-								<string>Aymara</string>
-								<string>Azerbaijani</string>
-								<string>Bashkir</string>
-								<string>Basque</string>
-								<string>Belarusian</string>
-								<string>Bengali</string>
-								<string>Bihari</string>
-								<string>Bislama</string>
-								<string>Bosnian</string>
-								<string>Breton</string>
-								<string>Bulgarian</string>
-								<string>Burmese</string>
-								<string>Catalan</string>
-								<string>Chamorro</string>
-								<string>Chechen</string>
-								<string>Chichewa; Nyanja</string>
-								<string>Chinese</string>
-								<string>Church Slavic</string>
-								<string>Chuvash</string>
-								<string>Cornish</string>
-								<string>Corsican</string>
-								<string>Croatian</string>
-								<string>Czech</string>
-								<string>Dansk</string>
-								<string>Deutsch</string>
-								<string>Dzongkha</string>
-								<string>English</string>
-								<string>Espanol</string>
-								<string>Esperanto</string>
-								<string>Estonian</string>
-								<string>Faroese</string>
-								<string>Fijian</string>
-								<string>Francais</string>
-								<string>Frisian</string>
-								<string>Georgian</string>
-								<string>Gaelic (Scots)</string>
-								<string>Gallegan</string>
-								<string>Greek, Modern ()</string>
-								<string>Guarani</string>
-								<string>Gujarati</string>
-								<string>Hebrew</string>
-								<string>Herero</string>
-								<string>Hindi</string>
-								<string>Hiri Motu</string>
-								<string>Inuktitut</string>
-								<string>Interlingue</string>
-								<string>Interlingua</string>
-								<string>Indonesian</string>
-								<string>Inupiaq</string>
-								<string>Irish</string>
-								<string>Islenska</string>
-								<string>Italian</string>
-								<string>Javanese</string>
-								<string>Japanese</string>
-								<string>Kalaallisut (Greenlandic)</string>
-								<string>Kannada</string>
-								<string>Kashmiri</string>
-								<string>Kazakh</string>
-								<string>Khmer</string>
-								<string>Kikuyu</string>
-								<string>Kinyarwanda</string>
-								<string>Kirghiz</string>
-								<string>Komi</string>
-								<string>Korean</string>
-								<string>Kuanyama</string>
-								<string>Kurdish</string>
-								<string>Lao</string>
-								<string>Latin</string>
-								<string>Latvian</string>
-								<string>Lingala</string>
-								<string>Lithuanian</string>
-								<string>Letzeburgesch</string>
-								<string>Macedonian</string>
-								<string>Magyar</string>
-								<string>Malay</string>
-								<string>Malayalam</string>
-								<string>Malagasy</string>
-								<string>Maltese</string>
-								<string>Manx</string>
-								<string>Maori</string>
-								<string>Marathi</string>
-								<string>Marshall</string>
-								<string>Moldavian</string>
-								<string>Mongolian</string>
-								<string>Nauru</string>
-								<string>Navajo</string>
-								<string>Ndebele, South</string>
-								<string>Ndebele, North</string>
-								<string>Ndonga</string>
-								<string>Nederlands</string>
-								<string>Nepali</string>
-								<string>Northern Sami</string>
-								<string>Norwegian</string>
-								<string>Norwegian Bokmal</string>
-								<string>Norwegian Nynorsk</string>
-								<string>Occitan (post 1500); Provencal</string>
-								<string>Oriya</string>
-								<string>Oromo</string>
-								<string>Ossetian; Ossetic</string>
-								<string>Panjabi</string>
-								<string>Persian</string>
-								<string>Pali</string>
-								<string>Polish</string>
-								<string>Portuges</string>
-								<string>Pushto</string>
-								<string>Quechua</string>
-								<string>Raeto-Romance</string>
-								<string>Romanian</string>
-								<string>Rundi</string>
-								<string>Russian</string>
-								<string>Sango</string>
-								<string>Sanskrit</string>
-								<string>Sardinian</string>
-								<string>Serbian</string>
-								<string>Sinhalese</string>
-								<string>Slovak</string>
-								<string>Slovenian</string>
-								<string>Samoan</string>
-								<string>Shona</string>
-								<string>Sindhi</string>
-								<string>Somali</string>
-								<string>Sotho, Southern</string>
-								<string>Sundanese</string>
-								<string>Suomi</string>
-								<string>Svenska</string>
-								<string>Swahili</string>
-								<string>Swati</string>
-								<string>Tahitian</string>
-								<string>Tamil</string>
-								<string>Tatar</string>
-								<string>Telugu</string>
-								<string>Tajik</string>
-								<string>Tagalog</string>
-								<string>Thai</string>
-								<string>Tibetian</string>
-								<string>Tigrinya</string>
-								<string>Tonga (Tonga Islands)</string>
-								<string>Tswana</string>
-								<string>Tsonga</string>
-								<string>Turkish</string>
-								<string>Turkmen</string>
-								<string>Twi</string>
-								<string>Uighur</string>
-								<string>Ukrainian</string>
-								<string>Urdu</string>
-								<string>Uzbek</string>
-								<string>Vietnamese</string>
-								<string>Volapk</string>
-								<string>Welsh</string>
-								<string>Wolof</string>
-								<string>Xhosa</string>
-								<string>Yiddish</string>
-								<string>Yoruba</string>
-								<string>Zhuang</string>
-								<string>Zulu</string>
-							</object>
-							<reference key="NSDelegate" ref="113289239"/>
-							<object class="NSComboTableView" key="NSTableView" id="734498420">
-								<reference key="NSNextResponder"/>
-								<int key="NSvFlags">274</int>
-								<string key="NSFrameSize">{13, 2952}</string>
-								<reference key="NSSuperview"/>
-								<reference key="NSWindow"/>
-								<bool key="NSEnabled">YES</bool>
-								<object class="NSMutableArray" key="NSTableColumns">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<object class="NSTableColumn">
-										<double key="NSWidth">10</double>
-										<double key="NSMinWidth">10</double>
-										<double key="NSMaxWidth">1000</double>
-										<object class="NSTableHeaderCell" key="NSHeaderCell">
-											<int key="NSCellFlags">75628032</int>
-											<int key="NSCellFlags2">0</int>
-											<object class="NSMutableString" key="NSContents">
-												<characters key="NS.bytes"/>
-											</object>
-											<object class="NSFont" key="NSSupport" id="464053631">
-												<string key="NSName">LucidaGrande</string>
-												<double key="NSSize">12</double>
-												<int key="NSfFlags">16</int>
-											</object>
-											<object class="NSColor" key="NSBackgroundColor">
-												<int key="NSColorSpace">3</int>
-												<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
-											</object>
-											<reference key="NSTextColor" ref="993015046"/>
-										</object>
-										<object class="NSTextFieldCell" key="NSDataCell">
-											<int key="NSCellFlags">338820672</int>
-											<int key="NSCellFlags2">1024</int>
-											<reference key="NSSupport" ref="26"/>
-											<reference key="NSControlView" ref="734498420"/>
-											<bool key="NSDrawsBackground">YES</bool>
-											<object class="NSColor" key="NSBackgroundColor" id="501011794">
-												<int key="NSColorSpace">6</int>
-												<string key="NSCatalogName">System</string>
-												<string key="NSColorName">controlBackgroundColor</string>
-												<reference key="NSColor" ref="666005350"/>
-											</object>
-											<reference key="NSTextColor" ref="887152126"/>
-										</object>
-										<int key="NSResizingMask">3</int>
-										<bool key="NSIsResizeable">YES</bool>
-										<reference key="NSTableView" ref="734498420"/>
-									</object>
-								</object>
-								<double key="NSIntercellSpacingWidth">3</double>
-								<double key="NSIntercellSpacingHeight">2</double>
-								<reference key="NSBackgroundColor" ref="501011794"/>
-								<object class="NSColor" key="NSGridColor" id="855204397">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">gridColor</string>
-									<object class="NSColor" key="NSColor">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MC41AA</bytes>
-									</object>
-								</object>
-								<double key="NSRowHeight">16</double>
-								<string key="NSAction">tableViewAction:</string>
-								<int key="NSTvFlags">-765427712</int>
-								<reference key="NSDelegate" ref="37767182"/>
-								<reference key="NSDataSource" ref="37767182"/>
-								<reference key="NSTarget" ref="37767182"/>
-								<int key="NSColumnAutoresizingStyle">1</int>
-								<int key="NSDraggingSourceMaskForLocal">15</int>
-								<int key="NSDraggingSourceMaskForNonLocal">0</int>
-								<bool key="NSAllowsTypeSelect">YES</bool>
-								<int key="NSTableViewDraggingDestinationStyle">0</int>
-								<int key="NSTableViewGroupRowStyle">1</int>
-							</object>
-						</object>
-					</object>
-					<object class="NSTextField" id="389101877">
-						<reference key="NSNextResponder" ref="332598366"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{30, 122}, {134, 14}}</string>
-						<reference key="NSSuperview" ref="332598366"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="172081130"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="459708758">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">272760832</int>
-							<string key="NSContents">Native Language:</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="389101877"/>
-							<reference key="NSBackgroundColor" ref="525377782"/>
-							<reference key="NSTextColor" ref="887152126"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="247298122">
-						<reference key="NSNextResponder" ref="332598366"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{90, 55}, {31, 14}}</string>
-						<reference key="NSSuperview" ref="332598366"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="1054432492"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="954547948">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">272760832</int>
-							<string key="NSContents">AAC:</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="247298122"/>
-							<reference key="NSBackgroundColor" ref="525377782"/>
-							<reference key="NSTextColor" ref="887152126"/>
-						</object>
-					</object>
-					<object class="NSComboBox" id="172081130">
-						<reference key="NSNextResponder" ref="332598366"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{169, 118}, {247, 22}}</string>
-						<reference key="NSSuperview" ref="332598366"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="725503362"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSComboBoxCell" key="NSCell" id="210320026">
-							<int key="NSCellFlags">343014976</int>
-							<int key="NSCellFlags2">272761856</int>
-							<string key="NSContents">English</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="172081130"/>
-							<bool key="NSDrawsBackground">YES</bool>
-							<reference key="NSBackgroundColor" ref="84276979"/>
-							<reference key="NSTextColor" ref="887152126"/>
-							<int key="NSVisibleItemCount">10</int>
-							<bool key="NSHasVerticalScroller">YES</bool>
-							<bool key="NSCompletes">YES</bool>
-							<object class="NSMutableArray" key="NSPopUpListData">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<string>Afar</string>
-								<string>Abkhazian</string>
-								<string>Afrikaans</string>
-								<string>Albanian</string>
-								<string>Amharic</string>
-								<string>Arabic</string>
-								<string>Armenian</string>
-								<string>Assamese</string>
-								<string>Avestan</string>
-								<string>Aymara</string>
-								<string>Azerbaijani</string>
-								<string>Bashkir</string>
-								<string>Basque</string>
-								<string>Belarusian</string>
-								<string>Bengali</string>
-								<string>Bihari</string>
-								<string>Bislama</string>
-								<string>Bosnian</string>
-								<string>Breton</string>
-								<string>Bulgarian</string>
-								<string>Burmese</string>
-								<string>Catalan</string>
-								<string>Chamorro</string>
-								<string>Chechen</string>
-								<string>Chichewa; Nyanja</string>
-								<string>Chinese</string>
-								<string>Church Slavic</string>
-								<string>Chuvash</string>
-								<string>Cornish</string>
-								<string>Corsican</string>
-								<string>Croatian</string>
-								<string>Czech</string>
-								<string>Dansk</string>
-								<string>Deutsch</string>
-								<string>Dzongkha</string>
-								<string>English</string>
-								<string>Espanol</string>
-								<string>Esperanto</string>
-								<string>Estonian</string>
-								<string>Faroese</string>
-								<string>Fijian</string>
-								<string>Francais</string>
-								<string>Frisian</string>
-								<string>Georgian</string>
-								<string>Gaelic (Scots)</string>
-								<string>Gallegan</string>
-								<string>Greek, Modern ()</string>
-								<string>Guarani</string>
-								<string>Gujarati</string>
-								<string>Hebrew</string>
-								<string>Herero</string>
-								<string>Hindi</string>
-								<string>Hiri Motu</string>
-								<string>Inuktitut</string>
-								<string>Interlingue</string>
-								<string>Interlingua</string>
-								<string>Indonesian</string>
-								<string>Inupiaq</string>
-								<string>Irish</string>
-								<string>Islenska</string>
-								<string>Italian</string>
-								<string>Javanese</string>
-								<string>Japanese</string>
-								<string>Kalaallisut (Greenlandic)</string>
-								<string>Kannada</string>
-								<string>Kashmiri</string>
-								<string>Kazakh</string>
-								<string>Khmer</string>
-								<string>Kikuyu</string>
-								<string>Kinyarwanda</string>
-								<string>Kirghiz</string>
-								<string>Komi</string>
-								<string>Korean</string>
-								<string>Kuanyama</string>
-								<string>Kurdish</string>
-								<string>Lao</string>
-								<string>Latin</string>
-								<string>Latvian</string>
-								<string>Lingala</string>
-								<string>Lithuanian</string>
-								<string>Letzeburgesch</string>
-								<string>Macedonian</string>
-								<string>Magyar</string>
-								<string>Malay</string>
-								<string>Malayalam</string>
-								<string>Malagasy</string>
-								<string>Maltese</string>
-								<string>Manx</string>
-								<string>Maori</string>
-								<string>Marathi</string>
-								<string>Marshall</string>
-								<string>Moldavian</string>
-								<string>Mongolian</string>
-								<string>Nauru</string>
-								<string>Navajo</string>
-								<string>Ndebele, South</string>
-								<string>Ndebele, North</string>
-								<string>Ndonga</string>
-								<string>Nederlands</string>
-								<string>Nepali</string>
-								<string>Northern Sami</string>
-								<string>Norwegian</string>
-								<string>Norwegian Bokmal</string>
-								<string>Norwegian Nynorsk</string>
-								<string>Occitan (post 1500); Provencal</string>
-								<string>Oriya</string>
-								<string>Oromo</string>
-								<string>Ossetian; Ossetic</string>
-								<string>Panjabi</string>
-								<string>Persian</string>
-								<string>Pali</string>
-								<string>Polish</string>
-								<string>Portuges</string>
-								<string>Pushto</string>
-								<string>Quechua</string>
-								<string>Raeto-Romance</string>
-								<string>Romanian</string>
-								<string>Rundi</string>
-								<string>Russian</string>
-								<string>Sango</string>
-								<string>Sanskrit</string>
-								<string>Sardinian</string>
-								<string>Serbian</string>
-								<string>Sinhalese</string>
-								<string>Slovak</string>
-								<string>Slovenian</string>
-								<string>Samoan</string>
-								<string>Shona</string>
-								<string>Sindhi</string>
-								<string>Somali</string>
-								<string>Sotho, Southern</string>
-								<string>Sundanese</string>
-								<string>Suomi</string>
-								<string>Svenska</string>
-								<string>Swahili</string>
-								<string>Swati</string>
-								<string>Tahitian</string>
-								<string>Tamil</string>
-								<string>Tatar</string>
-								<string>Telugu</string>
-								<string>Tajik</string>
-								<string>Tagalog</string>
-								<string>Thai</string>
-								<string>Tibetian</string>
-								<string>Tigrinya</string>
-								<string>Tonga (Tonga Islands)</string>
-								<string>Tswana</string>
-								<string>Tsonga</string>
-								<string>Turkish</string>
-								<string>Turkmen</string>
-								<string>Twi</string>
-								<string>Uighur</string>
-								<string>Ukrainian</string>
-								<string>Urdu</string>
-								<string>Uzbek</string>
-								<string>Vietnamese</string>
-								<string>Volapk</string>
-								<string>Welsh</string>
-								<string>Wolof</string>
-								<string>Xhosa</string>
-								<string>Yiddish</string>
-								<string>Yoruba</string>
-								<string>Zhuang</string>
-								<string>Zulu</string>
-							</object>
-							<reference key="NSDelegate" ref="172081130"/>
-							<object class="NSComboTableView" key="NSTableView" id="686758712">
-								<reference key="NSNextResponder"/>
-								<int key="NSvFlags">274</int>
-								<string key="NSFrameSize">{13, 2952}</string>
-								<reference key="NSSuperview"/>
-								<reference key="NSWindow"/>
-								<bool key="NSEnabled">YES</bool>
-								<object class="NSMutableArray" key="NSTableColumns">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<object class="NSTableColumn">
-										<double key="NSWidth">10</double>
-										<double key="NSMinWidth">10</double>
-										<double key="NSMaxWidth">1000</double>
-										<object class="NSTableHeaderCell" key="NSHeaderCell">
-											<int key="NSCellFlags">75628032</int>
-											<int key="NSCellFlags2">0</int>
-											<object class="NSMutableString" key="NSContents">
-												<characters key="NS.bytes"/>
-											</object>
-											<reference key="NSSupport" ref="464053631"/>
-											<object class="NSColor" key="NSBackgroundColor">
-												<int key="NSColorSpace">3</int>
-												<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
-											</object>
-											<reference key="NSTextColor" ref="993015046"/>
-										</object>
-										<object class="NSTextFieldCell" key="NSDataCell">
-											<int key="NSCellFlags">338820672</int>
-											<int key="NSCellFlags2">1024</int>
-											<reference key="NSSupport" ref="26"/>
-											<reference key="NSControlView" ref="686758712"/>
-											<bool key="NSDrawsBackground">YES</bool>
-											<reference key="NSBackgroundColor" ref="501011794"/>
-											<reference key="NSTextColor" ref="887152126"/>
-										</object>
-										<int key="NSResizingMask">3</int>
-										<bool key="NSIsResizeable">YES</bool>
-										<reference key="NSTableView" ref="686758712"/>
-									</object>
-								</object>
-								<double key="NSIntercellSpacingWidth">3</double>
-								<double key="NSIntercellSpacingHeight">2</double>
-								<reference key="NSBackgroundColor" ref="501011794"/>
-								<reference key="NSGridColor" ref="855204397"/>
-								<double key="NSRowHeight">16</double>
-								<string key="NSAction">tableViewAction:</string>
-								<int key="NSTvFlags">-765427712</int>
-								<reference key="NSDelegate" ref="210320026"/>
-								<reference key="NSDataSource" ref="210320026"/>
-								<reference key="NSTarget" ref="210320026"/>
-								<int key="NSColumnAutoresizingStyle">1</int>
-								<int key="NSDraggingSourceMaskForLocal">15</int>
-								<int key="NSDraggingSourceMaskForNonLocal">0</int>
-								<bool key="NSAllowsTypeSelect">YES</bool>
-								<int key="NSTableViewDraggingDestinationStyle">0</int>
-								<int key="NSTableViewGroupRowStyle">1</int>
-							</object>
-						</object>
-					</object>
-					<object class="NSButton" id="168948265">
-						<reference key="NSNextResponder" ref="332598366"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{91, 18}, {292, 26}}</string>
-						<reference key="NSSuperview" ref="332598366"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="686321393">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">0</int>
-							<string key="NSContents">Show advanced options for Auto Passthru</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="168948265"/>
-							<int key="NSButtonFlags">1211912703</int>
-							<int key="NSButtonFlags2">2</int>
-							<reference key="NSAlternateImage" ref="1056213191"/>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-					</object>
-					<object class="NSButton" id="1054432492">
-						<reference key="NSNextResponder" ref="332598366"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{123, 53}, {333, 18}}</string>
-						<reference key="NSSuperview" ref="332598366"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="168948265"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="787274685">
-							<int key="NSCellFlags">-2080244224</int>
-							<int key="NSCellFlags2">131072</int>
-							<string key="NSContents">Use CoreAudio instead of FAAC for Built-In Presets</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="1054432492"/>
-							<int key="NSButtonFlags">1211912703</int>
-							<int key="NSButtonFlags2">130</int>
-							<reference key="NSNormalImage" ref="491838135"/>
-							<reference key="NSAlternateImage" ref="1056213191"/>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-					</object>
-				</object>
-				<string key="NSFrameSize">{492, 157}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="389101877"/>
-				<object class="NSMutableString" key="NSClassName">
-					<characters key="NS.bytes">NSView</characters>
-				</object>
-				<string key="NSExtension">NSResponder</string>
-			</object>
-			<object class="NSCustomView" id="23728330">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">256</int>
-				<object class="NSMutableArray" key="NSSubviews">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSTextField" id="62457548">
-						<reference key="NSNextResponder" ref="23728330"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{302, 172}, {48, 19}}</string>
-						<reference key="NSSuperview" ref="23728330"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="701867067"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="607341761">
-							<int key="NSCellFlags">-1804468671</int>
-							<int key="NSCellFlags2">272761856</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="62457548"/>
-							<bool key="NSDrawsBackground">YES</bool>
-							<reference key="NSBackgroundColor" ref="84276979"/>
-							<object class="NSColor" key="NSTextColor">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">textColor</string>
-								<reference key="NSColor" ref="897199777"/>
-							</object>
-						</object>
-					</object>
-					<object class="NSTextField" id="226601760">
-						<reference key="NSNextResponder" ref="23728330"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{17, 207}, {280, 14}}</string>
-						<reference key="NSSuperview" ref="23728330"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="822080053"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="1064438472">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71434240</int>
-							<string key="NSContents">x264 Constant Quality fractional granularity:</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="226601760"/>
-							<reference key="NSBackgroundColor" ref="525377782"/>
-							<reference key="NSTextColor" ref="887152126"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="469378299">
-						<reference key="NSNextResponder" ref="23728330"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{48, 175}, {249, 14}}</string>
-						<reference key="NSSuperview" ref="23728330"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="62457548"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="552368920">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71434240</int>
-							<string key="NSContents">Minimum length of title to scan (seconds):</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="469378299"/>
-							<reference key="NSBackgroundColor" ref="525377782"/>
-							<reference key="NSTextColor" ref="887152126"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="701867067">
-						<reference key="NSNextResponder" ref="23728330"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{99, 145}, {198, 14}}</string>
-						<reference key="NSSuperview" ref="23728330"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="772611942"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="978611587">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">71434240</int>
-							<string key="NSContents">Number of picture previews to scan:</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="701867067"/>
-							<reference key="NSBackgroundColor" ref="525377782"/>
-							<reference key="NSTextColor" ref="887152126"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="173328305">
-						<reference key="NSNextResponder" ref="23728330"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{137, 53}, {160, 15}}</string>
-						<reference key="NSSuperview" ref="23728330"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="895206300"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="271531935">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">4325376</int>
-							<string key="NSContents">Activity Log Verbosity Level:</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="173328305"/>
-							<reference key="NSBackgroundColor" ref="525377782"/>
-							<reference key="NSTextColor" ref="887152126"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="899831697">
-						<reference key="NSNextResponder" ref="23728330"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{108, 76}, {27, 14}}</string>
-						<reference key="NSSuperview" ref="23728330"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="907177043"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="483848741">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">272760832</int>
-							<string key="NSContents">Log:</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="899831697"/>
-							<reference key="NSBackgroundColor" ref="525377782"/>
-							<reference key="NSTextColor" ref="887152126"/>
-						</object>
-					</object>
-					<object class="NSTextField" id="898312631">
-						<reference key="NSNextResponder" ref="23728330"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{70, 110}, {65, 14}}</string>
-						<reference key="NSSuperview" ref="23728330"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="745324926"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="1062716368">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">272760832</int>
-							<string key="NSContents">Dvd-Video:</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="898312631"/>
-							<reference key="NSBackgroundColor" ref="525377782"/>
-							<reference key="NSTextColor" ref="887152126"/>
-						</object>
-					</object>
-					<object class="NSButton" id="907177043">
-						<reference key="NSNextResponder" ref="23728330"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{137, 74}, {304, 18}}</string>
-						<reference key="NSSuperview" ref="23728330"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="173328305"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="869757541">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">131072</int>
-							<string key="NSContents">Put individual encode logs in same location as movie</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="907177043"/>
-							<int key="NSButtonFlags">1211912703</int>
-							<int key="NSButtonFlags2">2</int>
-							<reference key="NSAlternateImage" ref="1056213191"/>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-					</object>
-					<object class="NSButton" id="745324926">
-						<reference key="NSNextResponder" ref="23728330"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{137, 108}, {220, 18}}</string>
-						<reference key="NSSuperview" ref="23728330"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="899831697"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="884409108">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">131072</int>
-							<string key="NSContents">Use libdvdnav (instead of libdvdread)</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="745324926"/>
-							<int key="NSButtonFlags">1211912703</int>
-							<int key="NSButtonFlags2">2</int>
-							<reference key="NSAlternateImage" ref="1056213191"/>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-					</object>
-					<object class="NSButton" id="712613872">
-						<reference key="NSNextResponder" ref="23728330"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{137, 18}, {217, 18}}</string>
-						<reference key="NSSuperview" ref="23728330"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="562265695">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">131072</int>
-							<string key="NSContents">Alert when updating built-in presets</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="712613872"/>
-							<int key="NSButtonFlags">1211912703</int>
-							<int key="NSButtonFlags2">2</int>
-							<reference key="NSAlternateImage" ref="1056213191"/>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="772611942">
-						<reference key="NSNextResponder" ref="23728330"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{299, 140}, {73, 22}}</string>
-						<reference key="NSSuperview" ref="23728330"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="898312631"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="413609467">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">133120</int>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="772611942"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">129</int>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<nil key="NSMenuItem"/>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="743346318">
-								<string key="NSTitle">OtherViews</string>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<object class="NSMenuItem" id="165310533">
-										<reference key="NSMenu" ref="743346318"/>
-										<string key="NSTitle">10</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="413609467"/>
-									</object>
-									<object class="NSMenuItem" id="477590220">
-										<reference key="NSMenu" ref="743346318"/>
-										<string key="NSTitle">15</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="413609467"/>
-									</object>
-									<object class="NSMenuItem" id="444551526">
-										<reference key="NSMenu" ref="743346318"/>
-										<string key="NSTitle">20</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="413609467"/>
-									</object>
-									<object class="NSMenuItem" id="498458317">
-										<reference key="NSMenu" ref="743346318"/>
-										<string key="NSTitle">25</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="413609467"/>
-									</object>
-									<object class="NSMenuItem" id="327639789">
-										<reference key="NSMenu" ref="743346318"/>
-										<string key="NSTitle">30</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="413609467"/>
-									</object>
-									<object class="NSMenuItem" id="889335378">
-										<reference key="NSMenu" ref="743346318"/>
-										<string key="NSTitle">35</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="413609467"/>
-									</object>
-									<object class="NSMenuItem" id="98863414">
-										<reference key="NSMenu" ref="743346318"/>
-										<string key="NSTitle">40</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="413609467"/>
-									</object>
-									<object class="NSMenuItem" id="310764806">
-										<reference key="NSMenu" ref="743346318"/>
-										<string key="NSTitle">45</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="413609467"/>
-									</object>
-									<object class="NSMenuItem" id="1052421538">
-										<reference key="NSMenu" ref="743346318"/>
-										<string key="NSTitle">50</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="413609467"/>
-									</object>
-									<object class="NSMenuItem" id="814398830">
-										<reference key="NSMenu" ref="743346318"/>
-										<string key="NSTitle">55</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="413609467"/>
-									</object>
-									<object class="NSMenuItem" id="526914817">
-										<reference key="NSMenu" ref="743346318"/>
-										<string key="NSTitle">60</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="413609467"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSSelectedIndex">-1</int>
-							<int key="NSPreferredEdge">1</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">2</int>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="822080053">
-						<reference key="NSNextResponder" ref="23728330"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{299, 202}, {76, 22}}</string>
-						<reference key="NSSuperview" ref="23728330"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="469378299"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="434430620">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">133120</int>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="822080053"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">129</int>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="731921194">
-								<reference key="NSMenu" ref="841477386"/>
-								<string key="NSTitle">0.25</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="13790404"/>
-								<reference key="NSMixedImage" ref="218367874"/>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="434430620"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="841477386">
-								<string key="NSTitle">OtherViews</string>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<object class="NSMenuItem" id="835010135">
-										<reference key="NSMenu" ref="841477386"/>
-										<string key="NSTitle">1.0</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="434430620"/>
-									</object>
-									<object class="NSMenuItem" id="642215596">
-										<reference key="NSMenu" ref="841477386"/>
-										<string key="NSTitle">0.50</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="434430620"/>
-									</object>
-									<reference ref="731921194"/>
-									<object class="NSMenuItem" id="226776327">
-										<reference key="NSMenu" ref="841477386"/>
-										<string key="NSTitle">0.20</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="434430620"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSSelectedIndex">2</int>
-							<int key="NSPreferredEdge">1</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">2</int>
-						</object>
-					</object>
-					<object class="NSPopUpButton" id="895206300">
-						<reference key="NSNextResponder" ref="23728330"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{303, 49}, {66, 22}}</string>
-						<reference key="NSSuperview" ref="23728330"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="200780219"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="290473288">
-							<int key="NSCellFlags">-2076049856</int>
-							<int key="NSCellFlags2">133120</int>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="895206300"/>
-							<int key="NSButtonFlags">109199615</int>
-							<int key="NSButtonFlags2">129</int>
-							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="769184887">
-								<reference key="NSMenu" ref="898961390"/>
-								<string key="NSTitle">1</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<reference key="NSOnImage" ref="13790404"/>
-								<reference key="NSMixedImage" ref="218367874"/>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="290473288"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="898961390">
-								<string key="NSTitle">OtherViews</string>
-								<object class="NSMutableArray" key="NSMenuItems">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<object class="NSMenuItem" id="546193261">
-										<reference key="NSMenu" ref="898961390"/>
-										<string key="NSTitle">0</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="290473288"/>
-									</object>
-									<reference ref="769184887"/>
-									<object class="NSMenuItem" id="544981908">
-										<reference key="NSMenu" ref="898961390"/>
-										<string key="NSTitle">2</string>
-										<string key="NSKeyEquiv"/>
-										<int key="NSKeyEquivModMask">1048576</int>
-										<int key="NSMnemonicLoc">2147483647</int>
-										<reference key="NSOnImage" ref="13790404"/>
-										<reference key="NSMixedImage" ref="218367874"/>
-										<string key="NSAction">_popUpItemAction:</string>
-										<reference key="NSTarget" ref="290473288"/>
-									</object>
-								</object>
-							</object>
-							<int key="NSSelectedIndex">1</int>
-							<int key="NSPreferredEdge">1</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">2</int>
-						</object>
-					</object>
-					<object class="NSTextField" id="200780219">
-						<reference key="NSNextResponder" ref="23728330"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{89, 20}, {46, 14}}</string>
-						<reference key="NSSuperview" ref="23728330"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="712613872"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="221545613">
-							<int key="NSCellFlags">67239424</int>
-							<int key="NSCellFlags2">272760832</int>
-							<string key="NSContents">Presets:</string>
-							<reference key="NSSupport" ref="26"/>
-							<reference key="NSControlView" ref="200780219"/>
-							<reference key="NSBackgroundColor" ref="525377782"/>
-							<reference key="NSTextColor" ref="887152126"/>
-						</object>
-					</object>
-				</object>
-				<string key="NSFrameSize">{495, 241}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="226601760"/>
-				<object class="NSMutableString" key="NSClassName">
-					<characters key="NS.bytes">NSView</characters>
-				</object>
-				<string key="NSExtension">NSResponder</string>
-			</object>
-			<object class="NSCustomObject" id="413269307">
-				<string key="NSClassName">SUUpdater</string>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="169862212"/>
-						<reference key="destination" ref="123373831"/>
-					</object>
-					<int key="connectionID">187</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fGeneralView</string>
-						<reference key="source" ref="169862212"/>
-						<reference key="destination" ref="1048779201"/>
-					</object>
-					<int key="connectionID">245</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fAdvancedView</string>
-						<reference key="source" ref="169862212"/>
-						<reference key="destination" ref="23728330"/>
-					</object>
-					<int key="connectionID">246</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fAudioView</string>
-						<reference key="source" ref="169862212"/>
-						<reference key="destination" ref="332598366"/>
-					</object>
-					<int key="connectionID">247</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureView</string>
-						<reference key="source" ref="169862212"/>
-						<reference key="destination" ref="520288288"/>
-					</object>
-					<int key="connectionID">248</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">browseSendToApp:</string>
-						<reference key="source" ref="169862212"/>
-						<reference key="destination" ref="806259169"/>
-					</object>
-					<int key="connectionID">455</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fSendEncodeToAppField</string>
-						<reference key="source" ref="169862212"/>
-						<reference key="destination" ref="842132572"/>
-					</object>
-					<int key="connectionID">456</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="123373831"/>
-						<reference key="destination" ref="169862212"/>
-					</object>
-					<int key="connectionID">185</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.DefaultPresetsDrawerShow</string>
-						<reference key="source" ref="636306431"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="636306431"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">value: values.DefaultPresetsDrawerShow</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.DefaultPresetsDrawerShow</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">260</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.DefaultAutoNaming</string>
-						<reference key="source" ref="965044526"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="965044526"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">value: values.DefaultAutoNaming</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.DefaultAutoNaming</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">262</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: automaticallyChecksForUpdates</string>
-						<reference key="source" ref="581738572"/>
-						<reference key="destination" ref="413269307"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="581738572"/>
-							<reference key="NSDestination" ref="413269307"/>
-							<string key="NSLabel">value: automaticallyChecksForUpdates</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">automaticallyChecksForUpdates</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">429</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.sendToMetaX</string>
-						<reference key="source" ref="597305137"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="597305137"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">value: values.sendToMetaX</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.sendToMetaX</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">266</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.DefaultLanguage</string>
-						<reference key="source" ref="172081130"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="172081130"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">value: values.DefaultLanguage</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.DefaultLanguage</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">270</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.ShowAdvancedOptsForAutoPassthru</string>
-						<reference key="source" ref="168948265"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="168948265"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">value: values.ShowAdvancedOptsForAutoPassthru</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.ShowAdvancedOptsForAutoPassthru</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">502</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedValue: values.DefaultMpegExtension</string>
-						<reference key="source" ref="317169558"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="317169558"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">selectedValue: values.DefaultMpegExtension</string>
-							<string key="NSBinding">selectedValue</string>
-							<string key="NSKeyPath">values.DefaultMpegExtension</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">490</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.EncodeLogLocation</string>
-						<reference key="source" ref="907177043"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="907177043"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">value: values.EncodeLogLocation</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.EncodeLogLocation</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">349</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedValue: values.PreviewsNumber</string>
-						<reference key="source" ref="772611942"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="772611942"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">selectedValue: values.PreviewsNumber</string>
-							<string key="NSBinding">selectedValue</string>
-							<string key="NSKeyPath">values.PreviewsNumber</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">358</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedValue: values.LoggingLevel</string>
-						<reference key="source" ref="895206300"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="895206300"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">selectedValue: values.LoggingLevel</string>
-							<string key="NSBinding">selectedValue</string>
-							<string key="NSKeyPath">values.LoggingLevel</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">373</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedValue: values.LaunchSourceBehavior</string>
-						<reference key="source" ref="54712339"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="54712339"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">selectedValue: values.LaunchSourceBehavior</string>
-							<string key="NSBinding">selectedValue</string>
-							<string key="NSKeyPath">values.LaunchSourceBehavior</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">386</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedValue: values.x264CqSliderFractional</string>
-						<reference key="source" ref="822080053"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="822080053"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">selectedValue: values.x264CqSliderFractional</string>
-							<string key="NSBinding">selectedValue</string>
-							<string key="NSKeyPath">values.x264CqSliderFractional</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">397</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.UseDvdNav</string>
-						<reference key="source" ref="745324926"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="745324926"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">value: values.UseDvdNav</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.UseDvdNav</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">400</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.AlertBuiltInPresetUpdate</string>
-						<reference key="source" ref="712613872"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="712613872"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">value: values.AlertBuiltInPresetUpdate</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.AlertBuiltInPresetUpdate</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">403</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.UseCoreAudio</string>
-						<reference key="source" ref="1054432492"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="1054432492"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">value: values.UseCoreAudio</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.UseCoreAudio</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">409</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: automaticallyChecksForUpdates</string>
-						<reference key="source" ref="954667708"/>
-						<reference key="destination" ref="413269307"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="954667708"/>
-							<reference key="NSDestination" ref="413269307"/>
-							<string key="NSLabel">enabled: automaticallyChecksForUpdates</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">automaticallyChecksForUpdates</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">433</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedTag: updateCheckInterval</string>
-						<reference key="source" ref="954667708"/>
-						<reference key="destination" ref="413269307"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="954667708"/>
-							<reference key="NSDestination" ref="413269307"/>
-							<string key="NSLabel">selectedTag: updateCheckInterval</string>
-							<string key="NSBinding">selectedTag</string>
-							<string key="NSKeyPath">updateCheckInterval</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">434</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.SendCompletedEncodeToApp</string>
-						<reference key="source" ref="842132572"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="842132572"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">value: values.SendCompletedEncodeToApp</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.SendCompletedEncodeToApp</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">454</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.SendCompletedEncodeToApp</string>
-						<reference key="source" ref="456853603"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="456853603"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">value: values.SendCompletedEncodeToApp</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.SendCompletedEncodeToApp</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">453</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.AlertWhenDoneSound</string>
-						<reference key="source" ref="1009109497"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="1009109497"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">value: values.AlertWhenDoneSound</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.AlertWhenDoneSound</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">460</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.MinTitleScanSeconds</string>
-						<reference key="source" ref="62457548"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="62457548"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">value: values.MinTitleScanSeconds</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.MinTitleScanSeconds</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">483</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedValue: values.AlertWhenDone</string>
-						<reference key="source" ref="23412822"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="23412822"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">selectedValue: values.AlertWhenDone</string>
-							<string key="NSBinding">selectedValue</string>
-							<string key="NSKeyPath">values.AlertWhenDone</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">501</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.AlternateLanguage</string>
-						<reference key="source" ref="113289239"/>
-						<reference key="destination" ref="580534391"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="113289239"/>
-							<reference key="NSDestination" ref="580534391"/>
-							<string key="NSLabel">value: values.AlternateLanguage</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.AlternateLanguage</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">513</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="0">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="185275739"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="169862212"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="941647215"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="123373831"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="496214002"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Preferences</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="496214002"/>
-						<reference key="parent" ref="123373831"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">61</int>
-						<reference key="object" ref="580534391"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Shared Defaults</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">233</int>
-						<reference key="object" ref="1048779201"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="636306431"/>
-							<reference ref="315188467"/>
-							<reference ref="581738572"/>
-							<reference ref="597305137"/>
-							<reference ref="576686737"/>
-							<reference ref="280291731"/>
-							<reference ref="954667708"/>
-							<reference ref="54712339"/>
-							<reference ref="842132572"/>
-							<reference ref="806259169"/>
-							<reference ref="1009109497"/>
-							<reference ref="713240777"/>
-							<reference ref="965044526"/>
-							<reference ref="854927877"/>
-							<reference ref="317169558"/>
-							<reference ref="23412822"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">General</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">238</int>
-						<reference key="object" ref="636306431"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="448858755"/>
-						</object>
-						<reference key="parent" ref="1048779201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">239</int>
-						<reference key="object" ref="965044526"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="419322096"/>
-						</object>
-						<reference key="parent" ref="1048779201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">242</int>
-						<reference key="object" ref="315188467"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="718672066"/>
-						</object>
-						<reference key="parent" ref="1048779201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">243</int>
-						<reference key="object" ref="581738572"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="824062726"/>
-						</object>
-						<reference key="parent" ref="1048779201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">244</int>
-						<reference key="object" ref="597305137"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="437495050"/>
-						</object>
-						<reference key="parent" ref="1048779201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">275</int>
-						<reference key="object" ref="576686737"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="404194395"/>
-						</object>
-						<reference key="parent" ref="1048779201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">276</int>
-						<reference key="object" ref="713240777"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="947435557"/>
-						</object>
-						<reference key="parent" ref="1048779201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">289</int>
-						<reference key="object" ref="317169558"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="792374025"/>
-						</object>
-						<reference key="parent" ref="1048779201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">234</int>
-						<reference key="object" ref="520288288"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="539748933"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Picture</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">235</int>
-						<reference key="object" ref="332598366"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="389101877"/>
-							<reference ref="725503362"/>
-							<reference ref="113289239"/>
-							<reference ref="172081130"/>
-							<reference ref="1054432492"/>
-							<reference ref="168948265"/>
-							<reference ref="247298122"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Audio</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">252</int>
-						<reference key="object" ref="389101877"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="459708758"/>
-						</object>
-						<reference key="parent" ref="332598366"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">253</int>
-						<reference key="object" ref="172081130"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="210320026"/>
-						</object>
-						<reference key="parent" ref="332598366"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">254</int>
-						<reference key="object" ref="168948265"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="686321393"/>
-						</object>
-						<reference key="parent" ref="332598366"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">236</int>
-						<reference key="object" ref="23728330"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="701867067"/>
-							<reference ref="772611942"/>
-							<reference ref="173328305"/>
-							<reference ref="895206300"/>
-							<reference ref="745324926"/>
-							<reference ref="899831697"/>
-							<reference ref="898312631"/>
-							<reference ref="907177043"/>
-							<reference ref="200780219"/>
-							<reference ref="712613872"/>
-							<reference ref="226601760"/>
-							<reference ref="822080053"/>
-							<reference ref="469378299"/>
-							<reference ref="62457548"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Advanced</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">301</int>
-						<reference key="object" ref="448858755"/>
-						<reference key="parent" ref="636306431"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">302</int>
-						<reference key="object" ref="419322096"/>
-						<reference key="parent" ref="965044526"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">304</int>
-						<reference key="object" ref="718672066"/>
-						<reference key="parent" ref="315188467"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">305</int>
-						<reference key="object" ref="824062726"/>
-						<reference key="parent" ref="581738572"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">306</int>
-						<reference key="object" ref="437495050"/>
-						<reference key="parent" ref="597305137"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">307</int>
-						<reference key="object" ref="404194395"/>
-						<reference key="parent" ref="576686737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">308</int>
-						<reference key="object" ref="947435557"/>
-						<reference key="parent" ref="713240777"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">309</int>
-						<reference key="object" ref="792374025"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="783755954"/>
-						</object>
-						<reference key="parent" ref="317169558"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">315</int>
-						<reference key="object" ref="459708758"/>
-						<reference key="parent" ref="389101877"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">316</int>
-						<reference key="object" ref="210320026"/>
-						<reference key="parent" ref="172081130"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">317</int>
-						<reference key="object" ref="686321393"/>
-						<reference key="parent" ref="168948265"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">290</int>
-						<reference key="object" ref="783755954"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="197120751"/>
-							<reference ref="701819170"/>
-							<reference ref="796707391"/>
-						</object>
-						<reference key="parent" ref="792374025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">292</int>
-						<reference key="object" ref="197120751"/>
-						<reference key="parent" ref="783755954"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="559784606"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">326</int>
-						<reference key="object" ref="539748933"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="374363387"/>
-						</object>
-						<reference key="parent" ref="520288288"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">327</int>
-						<reference key="object" ref="374363387"/>
-						<reference key="parent" ref="539748933"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">347</int>
-						<reference key="object" ref="907177043"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="869757541"/>
-						</object>
-						<reference key="parent" ref="23728330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">348</int>
-						<reference key="object" ref="869757541"/>
-						<reference key="parent" ref="907177043"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">350</int>
-						<reference key="object" ref="899831697"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="483848741"/>
-						</object>
-						<reference key="parent" ref="23728330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">351</int>
-						<reference key="object" ref="483848741"/>
-						<reference key="parent" ref="899831697"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">352</int>
-						<reference key="object" ref="772611942"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="413609467"/>
-						</object>
-						<reference key="parent" ref="23728330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">353</int>
-						<reference key="object" ref="413609467"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="743346318"/>
-						</object>
-						<reference key="parent" ref="772611942"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">354</int>
-						<reference key="object" ref="743346318"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="165310533"/>
-							<reference ref="477590220"/>
-							<reference ref="444551526"/>
-							<reference ref="498458317"/>
-							<reference ref="327639789"/>
-							<reference ref="889335378"/>
-							<reference ref="98863414"/>
-							<reference ref="310764806"/>
-							<reference ref="1052421538"/>
-							<reference ref="814398830"/>
-							<reference ref="526914817"/>
-						</object>
-						<reference key="parent" ref="413609467"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">355</int>
-						<reference key="object" ref="165310533"/>
-						<reference key="parent" ref="743346318"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">356</int>
-						<reference key="object" ref="477590220"/>
-						<reference key="parent" ref="743346318"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">357</int>
-						<reference key="object" ref="444551526"/>
-						<reference key="parent" ref="743346318"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">359</int>
-						<reference key="object" ref="701867067"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="978611587"/>
-						</object>
-						<reference key="parent" ref="23728330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">360</int>
-						<reference key="object" ref="978611587"/>
-						<reference key="parent" ref="701867067"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">361</int>
-						<reference key="object" ref="498458317"/>
-						<reference key="parent" ref="743346318"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">362</int>
-						<reference key="object" ref="327639789"/>
-						<reference key="parent" ref="743346318"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">363</int>
-						<reference key="object" ref="895206300"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="290473288"/>
-						</object>
-						<reference key="parent" ref="23728330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">364</int>
-						<reference key="object" ref="290473288"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="898961390"/>
-						</object>
-						<reference key="parent" ref="895206300"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">365</int>
-						<reference key="object" ref="898961390"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="544981908"/>
-							<reference ref="769184887"/>
-							<reference ref="546193261"/>
-						</object>
-						<reference key="parent" ref="290473288"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">368</int>
-						<reference key="object" ref="544981908"/>
-						<reference key="parent" ref="898961390"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">369</int>
-						<reference key="object" ref="769184887"/>
-						<reference key="parent" ref="898961390"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">370</int>
-						<reference key="object" ref="546193261"/>
-						<reference key="parent" ref="898961390"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">371</int>
-						<reference key="object" ref="173328305"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="271531935"/>
-						</object>
-						<reference key="parent" ref="23728330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">372</int>
-						<reference key="object" ref="271531935"/>
-						<reference key="parent" ref="173328305"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">374</int>
-						<reference key="object" ref="54712339"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="310956178"/>
-						</object>
-						<reference key="parent" ref="1048779201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">375</int>
-						<reference key="object" ref="310956178"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="374003297"/>
-						</object>
-						<reference key="parent" ref="54712339"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">376</int>
-						<reference key="object" ref="374003297"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="195310116"/>
-							<reference ref="951535454"/>
-							<reference ref="420036141"/>
-						</object>
-						<reference key="parent" ref="310956178"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">377</int>
-						<reference key="object" ref="195310116"/>
-						<reference key="parent" ref="374003297"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">378</int>
-						<reference key="object" ref="951535454"/>
-						<reference key="parent" ref="374003297"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">379</int>
-						<reference key="object" ref="420036141"/>
-						<reference key="parent" ref="374003297"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">383</int>
-						<reference key="object" ref="280291731"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1049782015"/>
-						</object>
-						<reference key="parent" ref="1048779201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">384</int>
-						<reference key="object" ref="1049782015"/>
-						<reference key="parent" ref="280291731"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">387</int>
-						<reference key="object" ref="822080053"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="434430620"/>
-						</object>
-						<reference key="parent" ref="23728330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">388</int>
-						<reference key="object" ref="434430620"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="841477386"/>
-						</object>
-						<reference key="parent" ref="822080053"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">389</int>
-						<reference key="object" ref="841477386"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="226776327"/>
-							<reference ref="731921194"/>
-							<reference ref="642215596"/>
-							<reference ref="835010135"/>
-						</object>
-						<reference key="parent" ref="434430620"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">390</int>
-						<reference key="object" ref="226776327"/>
-						<reference key="parent" ref="841477386"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">391</int>
-						<reference key="object" ref="731921194"/>
-						<reference key="parent" ref="841477386"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">393</int>
-						<reference key="object" ref="642215596"/>
-						<reference key="parent" ref="841477386"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">394</int>
-						<reference key="object" ref="835010135"/>
-						<reference key="parent" ref="841477386"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">395</int>
-						<reference key="object" ref="226601760"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1064438472"/>
-						</object>
-						<reference key="parent" ref="23728330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">396</int>
-						<reference key="object" ref="1064438472"/>
-						<reference key="parent" ref="226601760"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">398</int>
-						<reference key="object" ref="745324926"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="884409108"/>
-						</object>
-						<reference key="parent" ref="23728330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">399</int>
-						<reference key="object" ref="884409108"/>
-						<reference key="parent" ref="745324926"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">401</int>
-						<reference key="object" ref="712613872"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="562265695"/>
-						</object>
-						<reference key="parent" ref="23728330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">402</int>
-						<reference key="object" ref="562265695"/>
-						<reference key="parent" ref="712613872"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">406</int>
-						<reference key="object" ref="1054432492"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="787274685"/>
-						</object>
-						<reference key="parent" ref="332598366"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">407</int>
-						<reference key="object" ref="787274685"/>
-						<reference key="parent" ref="1054432492"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">410</int>
-						<reference key="object" ref="413269307"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Updater</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">414</int>
-						<reference key="object" ref="954667708"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="841218599"/>
-						</object>
-						<reference key="parent" ref="1048779201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">415</int>
-						<reference key="object" ref="841218599"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="601170194"/>
-						</object>
-						<reference key="parent" ref="954667708"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">416</int>
-						<reference key="object" ref="601170194"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="409508073"/>
-							<reference ref="356864129"/>
-							<reference ref="1028006448"/>
-						</object>
-						<reference key="parent" ref="841218599"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">417</int>
-						<reference key="object" ref="409508073"/>
-						<reference key="parent" ref="601170194"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">419</int>
-						<reference key="object" ref="356864129"/>
-						<reference key="parent" ref="601170194"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">420</int>
-						<reference key="object" ref="1028006448"/>
-						<reference key="parent" ref="601170194"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">442</int>
-						<reference key="object" ref="898312631"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1062716368"/>
-						</object>
-						<reference key="parent" ref="23728330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">443</int>
-						<reference key="object" ref="1062716368"/>
-						<reference key="parent" ref="898312631"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">444</int>
-						<reference key="object" ref="200780219"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="221545613"/>
-						</object>
-						<reference key="parent" ref="23728330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">445</int>
-						<reference key="object" ref="221545613"/>
-						<reference key="parent" ref="200780219"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">446</int>
-						<reference key="object" ref="247298122"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="954547948"/>
-						</object>
-						<reference key="parent" ref="332598366"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">447</int>
-						<reference key="object" ref="954547948"/>
-						<reference key="parent" ref="247298122"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">448</int>
-						<reference key="object" ref="842132572"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="456853603"/>
-						</object>
-						<reference key="parent" ref="1048779201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">449</int>
-						<reference key="object" ref="456853603"/>
-						<reference key="parent" ref="842132572"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">450</int>
-						<reference key="object" ref="806259169"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="725806271"/>
-						</object>
-						<reference key="parent" ref="1048779201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">451</int>
-						<reference key="object" ref="725806271"/>
-						<reference key="parent" ref="806259169"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">457</int>
-						<reference key="object" ref="1009109497"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="878201725"/>
-						</object>
-						<reference key="parent" ref="1048779201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">458</int>
-						<reference key="object" ref="878201725"/>
-						<reference key="parent" ref="1009109497"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">463</int>
-						<reference key="object" ref="469378299"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="552368920"/>
-						</object>
-						<reference key="parent" ref="23728330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">464</int>
-						<reference key="object" ref="552368920"/>
-						<reference key="parent" ref="469378299"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">480</int>
-						<reference key="object" ref="62457548"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="607341761"/>
-						</object>
-						<reference key="parent" ref="23728330"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">481</int>
-						<reference key="object" ref="607341761"/>
-						<reference key="parent" ref="62457548"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">484</int>
-						<reference key="object" ref="701819170"/>
-						<reference key="parent" ref="783755954"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">485</int>
-						<reference key="object" ref="796707391"/>
-						<reference key="parent" ref="783755954"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">486</int>
-						<reference key="object" ref="854927877"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="177949206"/>
-						</object>
-						<reference key="parent" ref="1048779201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">487</int>
-						<reference key="object" ref="177949206"/>
-						<reference key="parent" ref="854927877"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">491</int>
-						<reference key="object" ref="23412822"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="630285587"/>
-						</object>
-						<reference key="parent" ref="1048779201"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">492</int>
-						<reference key="object" ref="630285587"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="479459549"/>
-						</object>
-						<reference key="parent" ref="23412822"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">493</int>
-						<reference key="object" ref="479459549"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="434429668"/>
-							<reference ref="302654188"/>
-							<reference ref="432828860"/>
-							<reference ref="770487737"/>
-							<reference ref="327548156"/>
-							<reference ref="583376135"/>
-						</object>
-						<reference key="parent" ref="630285587"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">494</int>
-						<reference key="object" ref="434429668"/>
-						<reference key="parent" ref="479459549"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">495</int>
-						<reference key="object" ref="302654188"/>
-						<reference key="parent" ref="479459549"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">496</int>
-						<reference key="object" ref="432828860"/>
-						<reference key="parent" ref="479459549"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">497</int>
-						<reference key="object" ref="770487737"/>
-						<reference key="parent" ref="479459549"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">498</int>
-						<reference key="object" ref="327548156"/>
-						<reference key="parent" ref="479459549"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">499</int>
-						<reference key="object" ref="583376135"/>
-						<reference key="parent" ref="479459549"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">508</int>
-						<reference key="object" ref="113289239"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="37767182"/>
-						</object>
-						<reference key="parent" ref="332598366"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">509</int>
-						<reference key="object" ref="725503362"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="603140150"/>
-						</object>
-						<reference key="parent" ref="332598366"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">510</int>
-						<reference key="object" ref="603140150"/>
-						<reference key="parent" ref="725503362"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">511</int>
-						<reference key="object" ref="37767182"/>
-						<reference key="parent" ref="113289239"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">514</int>
-						<reference key="object" ref="889335378"/>
-						<reference key="parent" ref="743346318"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">515</int>
-						<reference key="object" ref="98863414"/>
-						<reference key="parent" ref="743346318"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">516</int>
-						<reference key="object" ref="310764806"/>
-						<reference key="parent" ref="743346318"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">517</int>
-						<reference key="object" ref="1052421538"/>
-						<reference key="parent" ref="743346318"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">518</int>
-						<reference key="object" ref="814398830"/>
-						<reference key="parent" ref="743346318"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">519</int>
-						<reference key="object" ref="526914817"/>
-						<reference key="parent" ref="743346318"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>233.IBPluginDependency</string>
-					<string>234.IBPluginDependency</string>
-					<string>235.IBPluginDependency</string>
-					<string>236.IBPluginDependency</string>
-					<string>238.IBPluginDependency</string>
-					<string>239.IBPluginDependency</string>
-					<string>242.IBPluginDependency</string>
-					<string>243.IBPluginDependency</string>
-					<string>244.IBPluginDependency</string>
-					<string>252.IBPluginDependency</string>
-					<string>253.IBPluginDependency</string>
-					<string>254.IBPluginDependency</string>
-					<string>275.IBPluginDependency</string>
-					<string>276.IBPluginDependency</string>
-					<string>289.IBPluginDependency</string>
-					<string>290.IBPluginDependency</string>
-					<string>292.IBPluginDependency</string>
-					<string>301.IBPluginDependency</string>
-					<string>302.IBPluginDependency</string>
-					<string>304.IBPluginDependency</string>
-					<string>305.IBPluginDependency</string>
-					<string>306.IBPluginDependency</string>
-					<string>307.IBPluginDependency</string>
-					<string>308.IBPluginDependency</string>
-					<string>309.IBPluginDependency</string>
-					<string>315.IBPluginDependency</string>
-					<string>316.IBPluginDependency</string>
-					<string>317.IBPluginDependency</string>
-					<string>326.IBPluginDependency</string>
-					<string>327.IBPluginDependency</string>
-					<string>347.IBPluginDependency</string>
-					<string>348.IBPluginDependency</string>
-					<string>350.IBPluginDependency</string>
-					<string>351.IBPluginDependency</string>
-					<string>352.IBPluginDependency</string>
-					<string>353.IBPluginDependency</string>
-					<string>354.IBPluginDependency</string>
-					<string>355.IBPluginDependency</string>
-					<string>356.IBPluginDependency</string>
-					<string>357.IBPluginDependency</string>
-					<string>359.IBPluginDependency</string>
-					<string>360.IBPluginDependency</string>
-					<string>361.IBPluginDependency</string>
-					<string>362.IBPluginDependency</string>
-					<string>363.IBPluginDependency</string>
-					<string>364.IBPluginDependency</string>
-					<string>365.IBPluginDependency</string>
-					<string>368.IBPluginDependency</string>
-					<string>369.IBPluginDependency</string>
-					<string>370.IBPluginDependency</string>
-					<string>371.IBPluginDependency</string>
-					<string>372.IBPluginDependency</string>
-					<string>374.IBPluginDependency</string>
-					<string>375.IBPluginDependency</string>
-					<string>376.IBPluginDependency</string>
-					<string>377.IBPluginDependency</string>
-					<string>378.IBPluginDependency</string>
-					<string>379.IBPluginDependency</string>
-					<string>383.IBPluginDependency</string>
-					<string>384.IBPluginDependency</string>
-					<string>387.IBPluginDependency</string>
-					<string>388.IBPluginDependency</string>
-					<string>389.IBPluginDependency</string>
-					<string>390.IBPluginDependency</string>
-					<string>391.IBPluginDependency</string>
-					<string>393.IBPluginDependency</string>
-					<string>394.IBPluginDependency</string>
-					<string>395.IBPluginDependency</string>
-					<string>396.IBPluginDependency</string>
-					<string>398.IBPluginDependency</string>
-					<string>399.IBPluginDependency</string>
-					<string>401.IBPluginDependency</string>
-					<string>402.IBPluginDependency</string>
-					<string>406.IBPluginDependency</string>
-					<string>407.IBPluginDependency</string>
-					<string>410.IBPluginDependency</string>
-					<string>414.IBPluginDependency</string>
-					<string>415.IBPluginDependency</string>
-					<string>416.IBPluginDependency</string>
-					<string>417.IBPluginDependency</string>
-					<string>419.IBPluginDependency</string>
-					<string>420.IBPluginDependency</string>
-					<string>442.IBPluginDependency</string>
-					<string>443.IBPluginDependency</string>
-					<string>444.IBPluginDependency</string>
-					<string>445.IBPluginDependency</string>
-					<string>446.IBPluginDependency</string>
-					<string>447.IBPluginDependency</string>
-					<string>448.IBPluginDependency</string>
-					<string>449.IBPluginDependency</string>
-					<string>450.IBPluginDependency</string>
-					<string>451.IBPluginDependency</string>
-					<string>457.IBPluginDependency</string>
-					<string>458.IBPluginDependency</string>
-					<string>463.IBPluginDependency</string>
-					<string>464.IBPluginDependency</string>
-					<string>480.IBPluginDependency</string>
-					<string>481.IBPluginDependency</string>
-					<string>484.IBPluginDependency</string>
-					<string>485.IBPluginDependency</string>
-					<string>486.IBPluginDependency</string>
-					<string>487.IBPluginDependency</string>
-					<string>491.IBPluginDependency</string>
-					<string>492.IBPluginDependency</string>
-					<string>493.IBPluginDependency</string>
-					<string>494.IBPluginDependency</string>
-					<string>495.IBPluginDependency</string>
-					<string>496.IBPluginDependency</string>
-					<string>497.IBPluginDependency</string>
-					<string>498.IBPluginDependency</string>
-					<string>499.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>5.IBWindowTemplateEditedContentRect</string>
-					<string>508.IBPluginDependency</string>
-					<string>509.IBPluginDependency</string>
-					<string>510.IBPluginDependency</string>
-					<string>511.IBPluginDependency</string>
-					<string>514.IBPluginDependency</string>
-					<string>515.IBPluginDependency</string>
-					<string>516.IBPluginDependency</string>
-					<string>517.IBPluginDependency</string>
-					<string>518.IBPluginDependency</string>
-					<string>519.IBPluginDependency</string>
-					<string>6.IBPluginDependency</string>
-					<string>61.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{69, 656}, {500, 200}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">519</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">HBPreferencesController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">browseSendToApp:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">browseSendToApp:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">browseSendToApp:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>fAdvancedView</string>
-							<string>fAudioView</string>
-							<string>fGeneralView</string>
-							<string>fPictureView</string>
-							<string>fSendEncodeToAppField</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSView</string>
-							<string>NSView</string>
-							<string>NSView</string>
-							<string>NSView</string>
-							<string>NSTextField</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>fAdvancedView</string>
-							<string>fAudioView</string>
-							<string>fGeneralView</string>
-							<string>fPictureView</string>
-							<string>fSendEncodeToAppField</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fAdvancedView</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fAudioView</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fGeneralView</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPictureView</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSendEncodeToAppField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/HBPreferencesController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">SUUpdater</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">checkForUpdates:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">checkForUpdates:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">checkForUpdates:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">delegate</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">delegate</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">delegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/SUUpdater.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>NSMenuCheckmark</string>
-				<string>NSMenuMixedState</string>
-				<string>NSSwitch</string>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{11, 11}</string>
-				<string>{10, 3}</string>
-				<string>{15, 15}</string>
-			</object>
-		</object>
-	</data>
-</archive>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="14B23" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <deployment version="1060" identifier="macosx"/>
+ <development version="5100" identifier="xcode"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6250"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="HBPreferencesController">
+ <connections>
+ <outlet property="builtInTokenField" destination="Tk3-Ig-fFI" id="DBp-1P-k9z"/>
+ <outlet property="fAdvancedView" destination="236" id="246"/>
+ <outlet property="fAudioView" destination="235" id="247"/>
+ <outlet property="fGeneralView" destination="233" id="245"/>
+ <outlet property="fSendEncodeToAppField" destination="448" id="456"/>
+ <outlet property="formatTokenField" destination="6aa-GX-TuM" id="DyQ-f3-zBJ"/>
+ <outlet property="window" destination="5" id="187"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+ <window title="Preferences" allowsToolTipsWhenApplicationIsInactive="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Preferences">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="136" y="318" width="500" height="200"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+ <value key="minSize" type="size" width="212" height="107"/>
+ <view key="contentView" id="6">
+ <rect key="frame" x="0.0" y="0.0" width="500" height="200"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </view>
+ <connections>
+ <outlet property="delegate" destination="-2" id="185"/>
+ </connections>
+ <point key="canvasLocation" x="136" y="-286"/>
+ </window>
+ <userDefaultsController representsSharedInstance="YES" id="61" userLabel="Shared Defaults"/>
+ <customView id="233" userLabel="General">
+ <rect key="frame" x="0.0" y="0.0" width="500" height="376"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <popUpButton verticalHuggingPriority="750" id="374">
+ <rect key="frame" x="223" y="338" width="205" height="22"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <popUpButtonCell key="cell" type="push" title="Open Source" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="379" id="375">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="376">
+ <items>
+ <menuItem title="Do Nothing" id="378"/>
+ <menuItem title="Open Source" state="on" id="379"/>
+ <menuItem title="Open Source (Title Specific)" id="377"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <binding destination="61" name="selectedValue" keyPath="values.LaunchSourceBehavior" id="386"/>
+ </connections>
+ </popUpButton>
+ <popUpButton verticalHuggingPriority="750" id="414">
+ <rect key="frame" x="324" y="315" width="104" height="22"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <popUpButtonCell key="cell" type="push" title="Weekly" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="604800" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="417" id="415">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="416">
+ <items>
+ <menuItem title="Daily" tag="86400" id="419"/>
+ <menuItem title="Weekly" state="on" tag="604800" id="417"/>
+ <menuItem title="Monthly" tag="2629800" id="420"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <binding destination="410" name="enabled" keyPath="automaticallyChecksForUpdates" id="433"/>
+ <binding destination="410" name="selectedTag" keyPath="updateCheckInterval" id="434"/>
+ </connections>
+ </popUpButton>
+ <popUpButton verticalHuggingPriority="750" id="289">
+ <rect key="frame" x="255" y="184" width="96" height="22"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <popUpButtonCell key="cell" type="push" title="Auto" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="292" id="309">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="290">
+ <items>
+ <menuItem title="Auto" state="on" id="292"/>
+ <menuItem title=".m4v" id="484"/>
+ <menuItem title=".mp4" id="485"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <binding destination="61" name="selectedValue" keyPath="values.DefaultMpegExtension" id="490"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="276">
+ <rect key="frame" x="18" y="189" width="103" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Output files:" id="308">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="383">
+ <rect key="frame" x="124" y="343" width="96" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Source selection:" id="384">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="486">
+ <rect key="frame" x="124" y="189" width="128" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Default MP4 Extension:" id="487">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="275">
+ <rect key="frame" x="18" y="343" width="103" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="At launch:" id="307">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <button id="244">
+ <rect key="frame" x="124" y="231" width="86" height="18"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <buttonCell key="cell" type="check" title="Send file to:" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="306">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.sendToMetaX" id="266"/>
+ </connections>
+ </button>
+ <button id="243">
+ <rect key="frame" x="124" y="318" width="197" height="18"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <buttonCell key="cell" type="check" title="Automatically check for updates:" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="305">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="410" name="value" keyPath="automaticallyChecksForUpdates" id="429"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" id="242">
+ <rect key="frame" x="18" y="276" width="103" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="When Done:" id="304">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <button id="239">
+ <rect key="frame" x="124" y="164" width="313" height="18"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <buttonCell key="cell" type="check" title="Automatically name output files" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="302">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.DefaultAutoNaming" id="262"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" id="448">
+ <rect key="frame" x="209" y="233" width="125" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="None" id="449">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.SendCompletedEncodeToApp" id="453"/>
+ </connections>
+ </textFieldCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.SendCompletedEncodeToApp" id="454"/>
+ </connections>
+ </textField>
+ <button verticalHuggingPriority="750" id="450">
+ <rect key="frame" x="342" y="225" width="104" height="28"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="push" title="Browse ..." bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="451">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="browseSendToApp:" target="-2" id="455"/>
+ </connections>
+ </button>
+ <button id="457">
+ <rect key="frame" x="124" y="249" width="313" height="18"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <buttonCell key="cell" type="check" title="Play System Alert Sound" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="458">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.AlertWhenDoneSound" id="460"/>
+ </connections>
+ </button>
+ <popUpButton verticalHuggingPriority="750" id="491">
+ <rect key="frame" x="124" y="271" width="195" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Alert Window" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="495" id="492">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="493">
+ <items>
+ <menuItem title="Do Nothing" id="494"/>
+ <menuItem title="Alert Window" state="on" id="495"/>
+ <menuItem title="Growl Notification" id="499"/>
+ <menuItem title="Alert Window And Growl" id="496"/>
+ <menuItem title="Put Computer To Sleep" id="497"/>
+ <menuItem title="Shut Down Computer" id="498"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <binding destination="61" name="selectedValue" keyPath="values.AlertWhenDone" id="501"/>
+ </connections>
+ </popUpButton>
+ <tokenField verticalHuggingPriority="750" id="6aa-GX-TuM">
+ <rect key="frame" x="194" y="140" width="287" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <tokenFieldCell key="cell" controlSize="small" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="left" drawsBackground="YES" allowsEditingTextAttributes="YES" id="dHt-ry-PKg">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </tokenFieldCell>
+ <connections>
+ <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="VeX-1Z-Ejc"/>
+ <binding destination="61" name="value" keyPath="values.HBAutoNamingFormat" id="Sf1-9q-Gag">
+ <dictionary key="options">
+ <bool key="NSContinuouslyUpdatesValue" value="YES"/>
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <outlet property="delegate" destination="-2" id="3bd-m3-Fz5"/>
+ </connections>
+ </tokenField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="fF9-Q1-vYr">
+ <rect key="frame" x="125" y="142" width="63" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Format:" id="3dN-MN-DcP">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="RQc-sb-xRW"/>
+ </connections>
+ </textField>
+ <button id="DLn-Xh-Zkh">
+ <rect key="frame" x="142" y="57" width="234" height="20"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="check" title="Replace underscores with a space" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="pUi-lK-cHw">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="NEY-u9-7gj"/>
+ <binding destination="61" name="value" keyPath="values.HBAutoNamingRemoveUnderscore" id="8eN-wY-VqG"/>
+ </connections>
+ </button>
+ <button id="GNx-QT-RSv">
+ <rect key="frame" x="142" y="37" width="234" height="20"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="check" title="Remove common punctuation" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="wo5-iR-2mb">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="670-dr-Vj0"/>
+ <binding destination="61" name="value" keyPath="values.HBAutoNamingRemovePunctuation" id="aDU-h4-vOD"/>
+ </connections>
+ </button>
+ <button id="zXr-lf-3A4">
+ <rect key="frame" x="142" y="17" width="234" height="20"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="check" title="Change case to Title Case" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="ggR-Zs-P8G">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="OIc-Z7-E7O"/>
+ <binding destination="61" name="value" keyPath="values.HBAutoNamingTitleCase" id="xRh-dS-r4w"/>
+ </connections>
+ </button>
+ <tokenField verticalHuggingPriority="750" id="Tk3-Ig-fFI">
+ <rect key="frame" x="191" y="104" width="272" height="28"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <tokenFieldCell key="cell" controlSize="small" selectable="YES" allowsUndo="NO" alignment="left" allowsEditingTextAttributes="YES" id="cjy-yP-lqT">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </tokenFieldCell>
+ <connections>
+ <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="uxo-hQ-6mt"/>
+ <outlet property="delegate" destination="-2" id="P3H-mA-QsB"/>
+ </connections>
+ </tokenField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="LKY-ui-YVw">
+ <rect key="frame" x="192" y="82" width="204" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Drag to the above format field to add" id="dQ6-Dh-9sD">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ <point key="canvasLocation" x="-82" y="-471"/>
+ </customView>
+ <customView id="235" userLabel="Audio">
+ <rect key="frame" x="0.0" y="0.0" width="500" height="136"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <comboBox verticalHuggingPriority="750" id="253">
+ <rect key="frame" x="203" y="95" width="247" height="22"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <comboBoxCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" title="English" drawsBackground="YES" numberOfVisibleItems="10" id="316">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </comboBoxCell>
+ <connections>
+ <binding destination="-2" name="content" keyPath="self.languages.languagesArray" id="xPC-Fg-O3G"/>
+ <binding destination="61" name="value" keyPath="values.DefaultLanguage" previousBinding="xPC-Fg-O3G" id="I2t-Qy-TKa"/>
+ </connections>
+ </comboBox>
+ <textField verticalHuggingPriority="750" id="252">
+ <rect key="frame" x="18" y="99" width="179" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Native Language:" id="315">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <comboBox verticalHuggingPriority="750" id="508">
+ <rect key="frame" x="203" y="64" width="247" height="22"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <comboBoxCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" numberOfVisibleItems="10" id="511">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </comboBoxCell>
+ <connections>
+ <binding destination="-2" name="content" keyPath="self.languages.languagesArray" id="l02-3Q-yhI"/>
+ <binding destination="61" name="value" keyPath="values.AlternateLanguage" previousBinding="l02-3Q-yhI" id="M5z-5g-aQN"/>
+ </connections>
+ </comboBox>
+ <textField verticalHuggingPriority="750" id="509">
+ <rect key="frame" x="18" y="68" width="179" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Alternate Language:" id="510">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="mbd-FQ-sxW">
+ <rect key="frame" x="201" y="18" width="248" height="42"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="Note: these settings apply only to built-in presets. Use the audio defaults panel for custom presets." id="fIj-Tz-ghb">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ </customView>
+ <customView id="236" userLabel="Advanced">
+ <rect key="frame" x="0.0" y="-3" width="500" height="290"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <popUpButton verticalHuggingPriority="750" id="363">
+ <rect key="frame" x="284" y="62" width="66" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="369" id="364">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="365">
+ <items>
+ <menuItem title="0" id="370"/>
+ <menuItem title="1" state="on" id="369"/>
+ <menuItem title="2" id="368"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <binding destination="61" name="selectedValue" keyPath="values.LoggingLevel" id="373"/>
+ </connections>
+ </popUpButton>
+ <popUpButton verticalHuggingPriority="750" id="387">
+ <rect key="frame" x="337" y="249" width="76" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="0.25" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="391" id="388">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="389">
+ <items>
+ <menuItem title="1.0" id="394"/>
+ <menuItem title="0.50" id="393"/>
+ <menuItem title="0.25" state="on" id="391">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem title="0.20" id="390">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <binding destination="61" name="selectedValue" keyPath="values.x264CqSliderFractional" id="397"/>
+ </connections>
+ </popUpButton>
+ <button id="401">
+ <rect key="frame" x="125" y="17" width="339" height="18"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <buttonCell key="cell" type="check" title="Alert when updating built-in presets" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="402">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.AlertBuiltInPresetUpdate" id="403"/>
+ </connections>
+ </button>
+ <button id="398">
+ <rect key="frame" x="125" y="120" width="339" height="18"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <buttonCell key="cell" type="check" title="Use libdvdnav (instead of libdvdread)" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="399">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.UseDvdNav" id="400"/>
+ </connections>
+ </button>
+ <button id="347">
+ <rect key="frame" x="125" y="86" width="340" height="18"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <buttonCell key="cell" type="check" title="Put individual encode logs in same location as movie" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="348">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.EncodeLogLocation" id="349"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" id="442">
+ <rect key="frame" x="18" y="122" width="104" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="DVD-Video:" id="443">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="IV7-SY-HLR">
+ <rect key="frame" x="18" y="195" width="104" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Scan:" id="c0L-TU-WML">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="jPa-4p-Y29">
+ <rect key="frame" x="18" y="254" width="104" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="x264:" id="cqp-xU-GOe">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="350">
+ <rect key="frame" x="18" y="88" width="104" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Log:" id="351">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="371">
+ <rect key="frame" x="101" y="67" width="180" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Activity Log Verbosity Level:" id="372">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="359">
+ <rect key="frame" x="92" y="171" width="230" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Number of picture previews to scan:" id="360">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="463">
+ <rect key="frame" x="118" y="195" width="179" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Minimum length of title to scan:" id="464">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="UXr-op-aKN">
+ <rect key="frame" x="356" y="195" width="77" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="seconds" id="klQ-DW-Kc6">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="395">
+ <rect key="frame" x="118" y="254" width="216" height="14"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Constant Quality fractional granularity:" id="396">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="480">
+ <rect key="frame" x="303" y="193" width="48" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="481">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.MinTitleScanSeconds" id="483"/>
+ </connections>
+ </textField>
+ <button id="ybi-46-yhY">
+ <rect key="frame" x="126" y="229" width="286" height="20"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="check" title="Show Advanced Encoder Options Tab" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="Du1-9x-nHn">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.HBShowAdvancedTab" id="PgA-TV-kBr"/>
+ </connections>
+ </button>
+ <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="NGW-RG-tnZ">
+ <rect key="frame" x="20" y="46" width="460" height="5"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ 
+ </box>
+ <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="I0V-hM-Fq0">
+ <rect key="frame" x="20" y="150" width="460" height="5"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ 
+ </box>
+ <popUpButton verticalHuggingPriority="750" id="352">
+ <rect key="frame" x="325" y="166" width="73" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="353">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="354">
+ <items>
+ <menuItem title="10" id="355"/>
+ <menuItem title="15" id="356"/>
+ <menuItem title="20" id="357"/>
+ <menuItem title="25" id="361">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem title="30" id="362">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem title="35" id="514">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem title="40" id="515">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem title="45" id="516">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem title="50" id="517">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem title="55" id="518">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem title="60" id="519">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <binding destination="61" name="selectedValue" keyPath="values.PreviewsNumber" id="358"/>
+ </connections>
+ </popUpButton>
+ </subviews>
+ <point key="canvasLocation" x="-50" y="-68"/>
+ </customView>
+ <customObject id="410" userLabel="Updater" customClass="SUUpdater"/>
+ </objects>
+</document>

HandBrake-0.10.0.tar.bz2/macosx/English.lproj/Presets.xib Added

@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="HBPresetsViewController">
+ <connections>
+ <outlet property="outlineView" destination="00W-tb-wgY" id="T3u-ix-uIb"/>
+ <outlet property="treeController" destination="ohT-Pp-wBT" id="YGP-sN-dS3"/>
+ <outlet property="view" destination="Hz6-mo-xeY" id="xR8-5v-xDQ"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application"/>
+ <customView id="Hz6-mo-xeY">
+ <rect key="frame" x="0.0" y="0.0" width="230" height="325"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <subviews>
+ <scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="10" verticalLineScroll="16" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="uad-bt-uKD">
+ <rect key="frame" x="3" y="33" width="224" height="285"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <clipView key="contentView" id="Rcx-jI-nnq">
+ <rect key="frame" x="1" y="1" width="222" height="283"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="14" indentationPerLevel="16" outlineTableColumn="jhC-ge-H1w" id="00W-tb-wgY">
+ <rect key="frame" x="0.0" y="0.0" width="222" height="283"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <size key="intercellSpacing" width="3" height="2"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+ <tableColumns>
+ <tableColumn identifier="name" width="219" minWidth="16" maxWidth="1000" id="jhC-ge-H1w">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
+ </tableHeaderCell>
+ <textFieldCell key="dataCell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="4tC-UE-40G">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="ohT-Pp-wBT" name="editable" keyPath="arrangedObjects.isBuiltIn" id="JA3-ww-RjO">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ <binding destination="ohT-Pp-wBT" name="fontBold" keyPath="arrangedObjects.isDefault" id="Bki-AQ-Pa7"/>
+ <binding destination="ohT-Pp-wBT" name="value" keyPath="arrangedObjects.name" id="hDR-Al-iwT">
+ <dictionary key="options">
+ <string key="NSNullPlaceholder">Unamed Preset</string>
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </tableColumn>
+ </tableColumns>
+ <connections>
+ <action selector="clicked:" target="-2" id="8jb-bC-QI3"/>
+ <binding destination="ohT-Pp-wBT" name="content" keyPath="arrangedObjects" id="y8f-ht-Zs3"/>
+ <binding destination="ohT-Pp-wBT" name="selectionIndexPaths" keyPath="selectionIndexPaths" previousBinding="y8f-ht-Zs3" id="ntG-Tk-AkS"/>
+ <outlet property="dataSource" destination="-2" id="XrD-y9-BCi"/>
+ <outlet property="delegate" destination="-2" id="VEB-gf-oNP"/>
+ </connections>
+ </outlineView>
+ </subviews>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </clipView>
+ <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="RAh-Ad-miy">
+ <rect key="frame" x="-100" y="-100" width="222" height="16"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="xU9-j2-UAo">
+ <rect key="frame" x="-15" y="17" width="16" height="0.0"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ </scrollView>
+ <popUpButton verticalHuggingPriority="750" id="Ybq-Zt-sta">
+ <rect key="frame" x="58" y="3" width="35" height="23"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <popUpButtonCell key="cell" type="smallSquare" bezelStyle="smallSquare" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="2JY-O9-FR6">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="Presets Action Menu" id="LQk-kD-5sj">
+ <items>
+ <menuItem state="on" image="NSActionTemplate" hidden="YES" id="KPx-Ep-mb4"/>
+ <menuItem title="New Folder" id="Io0-Vm-Qez">
+ <connections>
+ <action selector="insertFolder:" target="-2" id="ufd-hE-TG1"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Make Default" id="D2t-YG-Frn">
+ <connections>
+ <action selector="setDefault:" target="-2" id="tLd-jt-H1g"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="QaO-y0-sMc"/>
+ <menuItem title="Update Built-in Presets" id="cm5-Kl-dB3">
+ <connections>
+ <action selector="updateBuiltInPresets:" target="-2" id="rND-6g-LMP"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ </popUpButton>
+ <button verticalHuggingPriority="750" id="kfi-wq-mgV">
+ <rect key="frame" x="3" y="3" width="24" height="23"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSAddTemplate" imagePosition="only" alignment="center" state="on" borderStyle="border" inset="3" id="OJ3-1k-3DY">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="addNewPreset:" target="-2" id="TYV-vH-8hk"/>
+ <binding destination="-2" name="enabled" keyPath="self.enabled" id="lmV-Y3-JoF"/>
+ </connections>
+ </button>
+ <button verticalHuggingPriority="750" id="b3V-8w-euU">
+ <rect key="frame" x="26" y="3" width="24" height="23"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSRemoveTemplate" imagePosition="only" alignment="left" borderStyle="border" inset="3" id="Kb1-6u-550">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="deletePreset:" target="-2" id="b6N-h7-25y"/>
+ <binding destination="ohT-Pp-wBT" name="enabled" keyPath="canRemove" id="WNd-yX-UEH"/>
+ </connections>
+ </button>
+ </subviews>
+ </customView>
+ <treeController objectClassName="HBPreset" childrenKeyPath="children" leafKeyPath="isLeaf" id="ohT-Pp-wBT">
+ <declaredKeys>
+ <string>name</string>
+ <string>children</string>
+ <string>isBuiltIn</string>
+ <string>isDefault</string>
+ </declaredKeys>
+ <connections>
+ <binding destination="-2" name="contentArray" keyPath="presets.root.children" id="A8P-Hb-YE9"/>
+ </connections>
+ </treeController>
+ </objects>
+ <resources>
+ <image name="NSActionTemplate" width="14" height="14"/>
+ <image name="NSAddTemplate" width="8" height="8"/>
+ <image name="NSRemoveTemplate" width="8" height="8"/>
+ </resources>
+</document>

HandBrake-0.9.9.tar.bz2/macosx/English.lproj/Queue.xib -> HandBrake-0.10.0.tar.bz2/macosx/English.lproj/Queue.xib Changed

@@ -1,1926 +1,169 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10F569</string>
-		<string key="IBDocument.InterfaceBuilderVersion">788</string>
-		<string key="IBDocument.AppKitVersion">1038.29</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">788</string>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="2577"/>
-			<integer value="2649"/>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys" id="0">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="543585533">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="678333032">
-				<string key="NSClassName">HBQueueController</string>
-			</object>
-			<object class="NSCustomObject" id="258430128">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="529995888">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="238545558">
-				<int key="NSWindowStyleMask">4111</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{893, 128}, {587, 432}}</string>
-				<int key="NSWTFlags">1886912512</int>
-				<string key="NSWindowTitle">Queue - HandBrake</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<object class="NSMutableString" key="NSViewClass">
-					<characters key="NS.bytes">View</characters>
-				</object>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
-				<string key="NSWindowContentMinSize">{525, 340}</string>
-				<object class="NSView" key="NSWindowView" id="431299686">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSCustomView" id="60629844">
-							<reference key="NSNextResponder" ref="431299686"/>
-							<int key="NSvFlags">274</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSScrollView" id="9160137">
-									<reference key="NSNextResponder" ref="60629844"/>
-									<int key="NSvFlags">274</int>
-									<object class="NSMutableArray" key="NSSubviews">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSClipView" id="13598910">
-											<reference key="NSNextResponder" ref="9160137"/>
-											<int key="NSvFlags">2304</int>
-											<object class="NSMutableArray" key="NSSubviews">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="NSOutlineView" id="790027174">
-													<reference key="NSNextResponder" ref="13598910"/>
-													<int key="NSvFlags">4352</int>
-													<string key="NSFrameSize">{517, 329}</string>
-													<reference key="NSSuperview" ref="13598910"/>
-													<bool key="NSEnabled">YES</bool>
-													<object class="_NSCornerView" key="NSCornerView">
-														<nil key="NSNextResponder"/>
-														<int key="NSvFlags">256</int>
-														<string key="NSFrame">{{518, 0}, {16, 17}}</string>
-													</object>
-													<object class="NSMutableArray" key="NSTableColumns">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSTableColumn" id="821940358">
-															<string key="NSIdentifier">icon</string>
-															<double key="NSWidth">38</double>
-															<double key="NSMinWidth">38</double>
-															<double key="NSMaxWidth">38</double>
-															<object class="NSTableHeaderCell" key="NSHeaderCell">
-																<int key="NSCellFlags">75628096</int>
-																<int key="NSCellFlags2">2048</int>
-																<string key="NSContents"/>
-																<object class="NSFont" key="NSSupport" id="26">
-																	<string key="NSName">LucidaGrande</string>
-																	<double key="NSSize">11</double>
-																	<int key="NSfFlags">3100</int>
-																</object>
-																<object class="NSColor" key="NSBackgroundColor" id="122009290">
-																	<int key="NSColorSpace">6</int>
-																	<string key="NSCatalogName">System</string>
-																	<string key="NSColorName">headerColor</string>
-																	<object class="NSColor" key="NSColor" id="983556133">
-																		<int key="NSColorSpace">3</int>
-																		<bytes key="NSWhite">MQA</bytes>
-																	</object>
-																</object>
-																<object class="NSColor" key="NSTextColor" id="204129071">
-																	<int key="NSColorSpace">6</int>
-																	<string key="NSCatalogName">System</string>
-																	<string key="NSColorName">headerTextColor</string>
-																	<object class="NSColor" key="NSColor" id="1016246953">
-																		<int key="NSColorSpace">3</int>
-																		<bytes key="NSWhite">MAA</bytes>
-																	</object>
-																</object>
-															</object>
-															<object class="NSImageCell" key="NSDataCell" id="592677893">
-																<int key="NSCellFlags">130560</int>
-																<int key="NSCellFlags2">33554432</int>
-																<int key="NSAlign">3</int>
-																<int key="NSScale">0</int>
-																<int key="NSStyle">0</int>
-																<bool key="NSAnimates">YES</bool>
-															</object>
-															<int key="NSResizingMask">3</int>
-															<bool key="NSIsResizeable">YES</bool>
-															<bool key="NSIsEditable">YES</bool>
-															<reference key="NSTableView" ref="790027174"/>
-														</object>
-														<object class="NSTableColumn" id="664777621">
-															<string key="NSIdentifier">desc</string>
-															<double key="NSWidth">450</double>
-															<double key="NSMinWidth">40</double>
-															<double key="NSMaxWidth">5000</double>
-															<object class="NSTableHeaderCell" key="NSHeaderCell">
-																<int key="NSCellFlags">75628096</int>
-																<int key="NSCellFlags2">2048</int>
-																<string key="NSContents"/>
-																<reference key="NSSupport" ref="26"/>
-																<object class="NSColor" key="NSBackgroundColor">
-																	<int key="NSColorSpace">3</int>
-																	<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
-																</object>
-																<reference key="NSTextColor" ref="204129071"/>
-															</object>
-															<object class="NSTextFieldCell" key="NSDataCell" id="574589932">
-																<int key="NSCellFlags">337772032</int>
-																<int key="NSCellFlags2">0</int>
-																<object class="NSFont" key="NSSupport" id="844481358">
-																	<string key="NSName">LucidaGrande</string>
-																	<double key="NSSize">12</double>
-																	<int key="NSfFlags">16</int>
-																</object>
-																<reference key="NSControlView" ref="790027174"/>
-																<object class="NSColor" key="NSBackgroundColor">
-																	<int key="NSColorSpace">6</int>
-																	<string key="NSCatalogName">System</string>
-																	<string key="NSColorName">textBackgroundColor</string>
-																	<reference key="NSColor" ref="983556133"/>
-																</object>
-																<object class="NSColor" key="NSTextColor" id="434514744">
-																	<int key="NSColorSpace">6</int>
-																	<string key="NSCatalogName">System</string>
-																	<string key="NSColorName">controlTextColor</string>
-																	<reference key="NSColor" ref="1016246953"/>
-																</object>
-															</object>
-															<int key="NSResizingMask">1</int>
-															<bool key="NSIsResizeable">YES</bool>
-															<reference key="NSTableView" ref="790027174"/>
-														</object>
-														<object class="NSTableColumn" id="498008730">
-															<string key="NSIdentifier">action</string>
-															<double key="NSWidth">20</double>
-															<double key="NSMinWidth">8</double>
-															<double key="NSMaxWidth">20</double>
-															<object class="NSTableHeaderCell" key="NSHeaderCell">
-																<int key="NSCellFlags">75628096</int>
-																<int key="NSCellFlags2">134219776</int>
-																<string key="NSContents"/>
-																<reference key="NSSupport" ref="26"/>
-																<reference key="NSBackgroundColor" ref="122009290"/>
-																<reference key="NSTextColor" ref="204129071"/>
-															</object>
-															<object class="NSButtonCell" key="NSDataCell" id="620017021">
-																<int key="NSCellFlags">67239424</int>
-																<int key="NSCellFlags2">134217728</int>
-																<string key="NSContents"/>
-																<reference key="NSSupport" ref="844481358"/>
-																<reference key="NSControlView" ref="790027174"/>
-																<int key="NSButtonFlags">135020799</int>
-																<int key="NSButtonFlags2">6</int>
-																<object class="NSCustomResource" key="NSNormalImage">
-																	<string key="NSClassName">NSImage</string>
-																	<string key="NSResourceName">Delete</string>
-																</object>
-																<string key="NSAlternateContents"/>
-																<string key="NSKeyEquivalent"/>
-																<int key="NSPeriodicDelay">400</int>
-																<int key="NSPeriodicInterval">75</int>
-															</object>
-															<reference key="NSTableView" ref="790027174"/>
-														</object>
-													</object>
-													<double key="NSIntercellSpacingWidth">3</double>
-													<double key="NSIntercellSpacingHeight">2</double>
-													<reference key="NSBackgroundColor" ref="983556133"/>
-													<object class="NSColor" key="NSGridColor">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">gridColor</string>
-														<object class="NSColor" key="NSColor">
-															<int key="NSColorSpace">3</int>
-															<bytes key="NSWhite">MC41AA</bytes>
-														</object>
-													</object>
-													<double key="NSRowHeight">17</double>
-													<int key="NSTvFlags">314605568</int>
-													<reference key="NSDelegate"/>
-													<reference key="NSDataSource"/>
-													<int key="NSColumnAutoresizingStyle">1</int>
-													<int key="NSDraggingSourceMaskForLocal">15</int>
-													<int key="NSDraggingSourceMaskForNonLocal">0</int>
-													<bool key="NSAllowsTypeSelect">YES</bool>
-													<int key="NSTableViewDraggingDestinationStyle">0</int>
-												</object>
-											</object>
-											<string key="NSFrame">{{1, 1}, {517, 329}}</string>
-											<reference key="NSSuperview" ref="9160137"/>
-											<reference key="NSNextKeyView" ref="790027174"/>
-											<reference key="NSDocView" ref="790027174"/>
-											<object class="NSColor" key="NSBGColor">
-												<int key="NSColorSpace">6</int>
-												<string key="NSCatalogName">System</string>
-												<string key="NSColorName">controlBackgroundColor</string>
-												<object class="NSColor" key="NSColor" id="724853981">
-													<int key="NSColorSpace">3</int>
-													<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-												</object>
-											</object>
-											<int key="NScvFlags">4</int>
-										</object>
-										<object class="NSScroller" id="459639248">
-											<reference key="NSNextResponder" ref="9160137"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{518, 1}, {15, 329}}</string>
-											<reference key="NSSuperview" ref="9160137"/>
-											<reference key="NSTarget" ref="9160137"/>
-											<string key="NSAction">_doScroller:</string>
-											<double key="NSPercent">0.71428570000000002</double>
-										</object>
-										<object class="NSScroller" id="636348341">
-											<reference key="NSNextResponder" ref="9160137"/>
-											<int key="NSvFlags">-2147483392</int>
-											<string key="NSFrame">{{-100, -100}, {282, 15}}</string>
-											<reference key="NSSuperview" ref="9160137"/>
-											<int key="NSsFlags">1</int>
-											<reference key="NSTarget" ref="9160137"/>
-											<string key="NSAction">_doScroller:</string>
-											<double key="NSPercent">0.9656652</double>
-										</object>
-									</object>
-									<string key="NSFrame">{{20, 20}, {534, 331}}</string>
-									<reference key="NSSuperview" ref="60629844"/>
-									<reference key="NSNextKeyView" ref="13598910"/>
-									<int key="NSsFlags">18</int>
-									<reference key="NSVScroller" ref="459639248"/>
-									<reference key="NSHScroller" ref="636348341"/>
-									<reference key="NSContentView" ref="13598910"/>
-									<bytes key="NSScrollAmts">AAAAAAAAAABBmAAAQZgAAA</bytes>
-								</object>
-								<object class="NSSlider" id="948250828">
-									<reference key="NSNextResponder" ref="60629844"/>
-									<int key="NSvFlags">-2147483356</int>
-									<string key="NSFrame">{{60, 1}, {180, 16}}</string>
-									<reference key="NSSuperview" ref="60629844"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSSliderCell" key="NSCell" id="1016294819">
-										<int key="NSCellFlags">67501824</int>
-										<int key="NSCellFlags2">262144</int>
-										<object class="NSMutableString" key="NSContents">
-											<characters key="NS.bytes"/>
-										</object>
-										<object class="NSFont" key="NSSupport" id="459826394">
-											<string key="NSName">Helvetica</string>
-											<double key="NSSize">12</double>
-											<int key="NSfFlags">16</int>
-										</object>
-										<reference key="NSControlView" ref="948250828"/>
-										<double key="NSMaxValue">30</double>
-										<double key="NSMinValue">0.0</double>
-										<double key="NSValue">2</double>
-										<double key="NSAltIncValue">0.0</double>
-										<int key="NSNumberOfTickMarks">31</int>
-										<int key="NSTickMarkPosition">1</int>
-										<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
-										<bool key="NSVertical">NO</bool>
-									</object>
-								</object>
-								<object class="NSSlider" id="252090132">
-									<reference key="NSNextResponder" ref="60629844"/>
-									<int key="NSvFlags">-2147483356</int>
-									<string key="NSFrame">{{296, 2}, {80, 16}}</string>
-									<reference key="NSSuperview" ref="60629844"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSSliderCell" key="NSCell" id="271127179">
-										<int key="NSCellFlags">67501824</int>
-										<int key="NSCellFlags2">262144</int>
-										<object class="NSMutableString" key="NSContents">
-											<characters key="NS.bytes"/>
-										</object>
-										<reference key="NSSupport" ref="459826394"/>
-										<reference key="NSControlView" ref="252090132"/>
-										<double key="NSMaxValue">10</double>
-										<double key="NSMinValue">0.0</double>
-										<double key="NSValue">3</double>
-										<double key="NSAltIncValue">0.0</double>
-										<int key="NSNumberOfTickMarks">11</int>
-										<int key="NSTickMarkPosition">1</int>
-										<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
-										<bool key="NSVertical">NO</bool>
-									</object>
-								</object>
-								<object class="NSTextField" id="316422061">
-									<reference key="NSNextResponder" ref="60629844"/>
-									<int key="NSvFlags">-2147483356</int>
-									<string key="NSFrame">{{17, 0}, {38, 14}}</string>
-									<reference key="NSSuperview" ref="60629844"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSTextFieldCell" key="NSCell" id="655488883">
-										<int key="NSCellFlags">67239424</int>
-										<int key="NSCellFlags2">272629760</int>
-										<string key="NSContents">Indent</string>
-										<reference key="NSSupport" ref="26"/>
-										<reference key="NSControlView" ref="316422061"/>
-										<object class="NSColor" key="NSBackgroundColor" id="987568653">
-											<int key="NSColorSpace">6</int>
-											<string key="NSCatalogName">System</string>
-											<string key="NSColorName">controlColor</string>
-											<reference key="NSColor" ref="724853981"/>
-										</object>
-										<reference key="NSTextColor" ref="434514744"/>
-									</object>
-								</object>
-								<object class="NSTextField" id="891125080">
-									<reference key="NSNextResponder" ref="60629844"/>
-									<int key="NSvFlags">-2147483356</int>
-									<string key="NSFrame">{{245, 1}, {46, 14}}</string>
-									<reference key="NSSuperview" ref="60629844"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSTextFieldCell" key="NSCell" id="402192242">
-										<int key="NSCellFlags">67239424</int>
-										<int key="NSCellFlags2">272629760</int>
-										<string key="NSContents">Spacing</string>
-										<reference key="NSSupport" ref="26"/>
-										<reference key="NSControlView" ref="891125080"/>
-										<reference key="NSBackgroundColor" ref="987568653"/>
-										<reference key="NSTextColor" ref="434514744"/>
-									</object>
-								</object>
-								<object class="NSButton" id="1065139278">
-									<reference key="NSNextResponder" ref="60629844"/>
-									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{6, -25}, {159, 16}}</string>
-									<reference key="NSSuperview" ref="60629844"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSButtonCell" key="NSCell" id="907474520">
-										<int key="NSCellFlags">67239424</int>
-										<int key="NSCellFlags2">134479872</int>
-										<string key="NSContents">quick way to intercept delete key</string>
-										<object class="NSFont" key="NSSupport">
-											<string key="NSName">LucidaGrande</string>
-											<double key="NSSize">9</double>
-											<int key="NSfFlags">3614</int>
-										</object>
-										<reference key="NSControlView" ref="1065139278"/>
-										<int key="NSButtonFlags">-2038021889</int>
-										<int key="NSButtonFlags2">34</int>
-										<object class="NSFont" key="NSAlternateImage">
-											<string key="NSName">LucidaGrande</string>
-											<double key="NSSize">9</double>
-											<int key="NSfFlags">16</int>
-										</object>
-										<string key="NSAlternateContents"/>
-										<string key="NSKeyEquivalent">&#x7f;</string>
-										<int key="NSPeriodicDelay">200</int>
-										<int key="NSPeriodicInterval">25</int>
-									</object>
-								</object>
-							</object>
-							<string key="NSFrame">{{0, 9}, {574, 358}}</string>
-							<reference key="NSSuperview" ref="431299686"/>
-							<string key="NSClassName">NSView</string>
-							<string key="NSExtension">NSResponder</string>
-						</object>
-						<object class="NSTextField" id="463845363">
-							<reference key="NSNextResponder" ref="431299686"/>
-							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{17, 407}, {148, 14}}</string>
-							<reference key="NSSuperview" ref="431299686"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="617812287">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">272760832</int>
-								<string key="NSContents">Pending Jobs</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="463845363"/>
-								<reference key="NSBackgroundColor" ref="987568653"/>
-								<reference key="NSTextColor" ref="434514744"/>
-							</object>
-						</object>
-						<object class="NSTextField" id="138063786">
-							<reference key="NSNextResponder" ref="431299686"/>
-							<int key="NSvFlags">266</int>
-							<string key="NSFrame">{{17, 373}, {560, 30}}</string>
-							<reference key="NSSuperview" ref="431299686"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="108133680">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">4325376</int>
-								<string key="NSContents">There are no jobs currently encoding</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="138063786"/>
-								<reference key="NSBackgroundColor" ref="987568653"/>
-								<reference key="NSTextColor" ref="434514744"/>
-							</object>
-						</object>
-					</object>
-					<string key="NSFrameSize">{587, 432}</string>
-					<reference key="NSSuperview"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
-				<string key="NSMinSize">{525, 362}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
-				<string key="NSFrameAutosaveName">QueueWindow</string>
-			</object>
-			<object class="NSMenu" id="771940260">
-				<string key="NSTitle"/>
-				<object class="NSMutableArray" key="NSMenuItems">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSMenuItem" id="16179858">
-						<reference key="NSMenu" ref="771940260"/>
-						<string key="NSTitle">Edit</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSOnImage" id="7190541">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuCheckmark</string>
-						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="681624584">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuMixedState</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="60102320">
-						<reference key="NSMenu" ref="771940260"/>
-						<string key="NSTitle">Delete</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="7190541"/>
-						<reference key="NSMixedImage" ref="681624584"/>
-					</object>
-					<object class="NSMenuItem" id="172286461">
-						<reference key="NSMenu" ref="771940260"/>
-						<string key="NSTitle">Show</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="7190541"/>
-						<reference key="NSMixedImage" ref="681624584"/>
-					</object>
-				</object>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fQueuePane</string>
-						<reference key="source" ref="678333032"/>
-						<reference key="destination" ref="60629844"/>
-					</object>
-					<int key="connectionID">2561</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fQueueCountField</string>
-						<reference key="source" ref="678333032"/>
-						<reference key="destination" ref="463845363"/>
-					</object>
-					<int key="connectionID">2564</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="238545558"/>
-						<reference key="destination" ref="678333032"/>
-					</object>
-					<int key="connectionID">2579</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fOutlineView</string>
-						<reference key="source" ref="678333032"/>
-						<reference key="destination" ref="790027174"/>
-					</object>
-					<int key="connectionID">2601</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">dataSource</string>
-						<reference key="source" ref="790027174"/>
-						<reference key="destination" ref="678333032"/>
-					</object>
-					<int key="connectionID">2602</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="790027174"/>
-						<reference key="destination" ref="678333032"/>
-					</object>
-					<int key="connectionID">2603</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">removeSelectedQueueItem:</string>
-						<reference key="source" ref="678333032"/>
-						<reference key="destination" ref="1065139278"/>
-					</object>
-					<int key="connectionID">2623</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="678333032"/>
-						<reference key="destination" ref="238545558"/>
-					</object>
-					<int key="connectionID">2645</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fProgressTextField</string>
-						<reference key="source" ref="678333032"/>
-						<reference key="destination" ref="138063786"/>
-					</object>
-					<int key="connectionID">2648</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">menu</string>
-						<reference key="source" ref="574589932"/>
-						<reference key="destination" ref="771940260"/>
-					</object>
-					<int key="connectionID">2653</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">editSelectedQueueItem:</string>
-						<reference key="source" ref="678333032"/>
-						<reference key="destination" ref="16179858"/>
-					</object>
-					<int key="connectionID">2654</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">removeSelectedQueueItem:</string>
-						<reference key="source" ref="678333032"/>
-						<reference key="destination" ref="60102320"/>
-					</object>
-					<int key="connectionID">2656</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">revealSelectedQueueItem:</string>
-						<reference key="source" ref="678333032"/>
-						<reference key="destination" ref="172286461"/>
-					</object>
-					<int key="connectionID">2657</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
-						<reference key="children" ref="543585533"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="678333032"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="258430128"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2576</int>
-						<reference key="object" ref="238545558"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="431299686"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Window</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2577</int>
-						<reference key="object" ref="431299686"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="60629844"/>
-							<reference ref="138063786"/>
-							<reference ref="463845363"/>
-						</object>
-						<reference key="parent" ref="238545558"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2547</int>
-						<reference key="object" ref="60629844"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="9160137"/>
-							<reference ref="948250828"/>
-							<reference ref="252090132"/>
-							<reference ref="316422061"/>
-							<reference ref="891125080"/>
-							<reference ref="1065139278"/>
-						</object>
-						<reference key="parent" ref="431299686"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2596</int>
-						<reference key="object" ref="9160137"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="790027174"/>
-							<reference ref="459639248"/>
-							<reference ref="636348341"/>
-						</object>
-						<reference key="parent" ref="60629844"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2597</int>
-						<reference key="object" ref="790027174"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="664777621"/>
-							<reference ref="498008730"/>
-							<reference ref="821940358"/>
-						</object>
-						<reference key="parent" ref="9160137"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2599</int>
-						<reference key="object" ref="664777621"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="574589932"/>
-						</object>
-						<reference key="parent" ref="790027174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2609</int>
-						<reference key="object" ref="574589932"/>
-						<reference key="parent" ref="664777621"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2604</int>
-						<reference key="object" ref="498008730"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="620017021"/>
-						</object>
-						<reference key="parent" ref="790027174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2605</int>
-						<reference key="object" ref="620017021"/>
-						<reference key="parent" ref="498008730"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2624</int>
-						<reference key="object" ref="821940358"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="592677893"/>
-						</object>
-						<reference key="parent" ref="790027174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2625</int>
-						<reference key="object" ref="592677893"/>
-						<reference key="parent" ref="821940358"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2610</int>
-						<reference key="object" ref="948250828"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1016294819"/>
-						</object>
-						<reference key="parent" ref="60629844"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2611</int>
-						<reference key="object" ref="252090132"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="271127179"/>
-						</object>
-						<reference key="parent" ref="60629844"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2614</int>
-						<reference key="object" ref="316422061"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="655488883"/>
-						</object>
-						<reference key="parent" ref="60629844"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2615</int>
-						<reference key="object" ref="891125080"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="402192242"/>
-						</object>
-						<reference key="parent" ref="60629844"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2622</int>
-						<reference key="object" ref="1065139278"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="907474520"/>
-						</object>
-						<reference key="parent" ref="60629844"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2638</int>
-						<reference key="object" ref="1016294819"/>
-						<reference key="parent" ref="948250828"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2639</int>
-						<reference key="object" ref="271127179"/>
-						<reference key="parent" ref="252090132"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2640</int>
-						<reference key="object" ref="655488883"/>
-						<reference key="parent" ref="316422061"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2641</int>
-						<reference key="object" ref="402192242"/>
-						<reference key="parent" ref="891125080"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2642</int>
-						<reference key="object" ref="907474520"/>
-						<reference key="parent" ref="1065139278"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2643</int>
-						<reference key="object" ref="459639248"/>
-						<reference key="parent" ref="9160137"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2644</int>
-						<reference key="object" ref="636348341"/>
-						<reference key="parent" ref="9160137"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="529995888"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2511</int>
-						<reference key="object" ref="463845363"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="617812287"/>
-						</object>
-						<reference key="parent" ref="431299686"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2637</int>
-						<reference key="object" ref="617812287"/>
-						<reference key="parent" ref="463845363"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2646</int>
-						<reference key="object" ref="138063786"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="108133680"/>
-						</object>
-						<reference key="parent" ref="431299686"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2647</int>
-						<reference key="object" ref="108133680"/>
-						<reference key="parent" ref="138063786"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2649</int>
-						<reference key="object" ref="771940260"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="16179858"/>
-							<reference ref="60102320"/>
-							<reference ref="172286461"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">ContextMenu</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2650</int>
-						<reference key="object" ref="16179858"/>
-						<reference key="parent" ref="771940260"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2652</int>
-						<reference key="object" ref="60102320"/>
-						<reference key="parent" ref="771940260"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2655</int>
-						<reference key="object" ref="172286461"/>
-						<reference key="parent" ref="771940260"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-3.IBPluginDependency</string>
-					<string>2511.IBPluginDependency</string>
-					<string>2511.ImportedFromIB2</string>
-					<string>2547.IBPluginDependency</string>
-					<string>2547.ImportedFromIB2</string>
-					<string>2576.IBEditorWindowLastContentRect</string>
-					<string>2576.IBPluginDependency</string>
-					<string>2576.IBWindowTemplateEditedContentRect</string>
-					<string>2576.ImportedFromIB2</string>
-					<string>2576.windowTemplate.hasMaxSize</string>
-					<string>2576.windowTemplate.hasMinSize</string>
-					<string>2576.windowTemplate.maxSize</string>
-					<string>2576.windowTemplate.minSize</string>
-					<string>2577.IBPluginDependency</string>
-					<string>2577.ImportedFromIB2</string>
-					<string>2596.IBPluginDependency</string>
-					<string>2596.ImportedFromIB2</string>
-					<string>2597.CustomClassName</string>
-					<string>2597.IBPluginDependency</string>
-					<string>2597.ImportedFromIB2</string>
-					<string>2599.IBPluginDependency</string>
-					<string>2599.ImportedFromIB2</string>
-					<string>2604.IBPluginDependency</string>
-					<string>2604.ImportedFromIB2</string>
-					<string>2605.IBPluginDependency</string>
-					<string>2605.ImportedFromIB2</string>
-					<string>2609.CustomClassName</string>
-					<string>2609.IBPluginDependency</string>
-					<string>2609.ImportedFromIB2</string>
-					<string>2610.IBPluginDependency</string>
-					<string>2610.ImportedFromIB2</string>
-					<string>2611.IBPluginDependency</string>
-					<string>2611.ImportedFromIB2</string>
-					<string>2614.IBPluginDependency</string>
-					<string>2614.ImportedFromIB2</string>
-					<string>2615.IBPluginDependency</string>
-					<string>2615.ImportedFromIB2</string>
-					<string>2622.IBPluginDependency</string>
-					<string>2622.ImportedFromIB2</string>
-					<string>2624.IBPluginDependency</string>
-					<string>2624.ImportedFromIB2</string>
-					<string>2625.IBPluginDependency</string>
-					<string>2625.ImportedFromIB2</string>
-					<string>2637.IBPluginDependency</string>
-					<string>2638.IBPluginDependency</string>
-					<string>2639.IBPluginDependency</string>
-					<string>2640.IBPluginDependency</string>
-					<string>2641.IBPluginDependency</string>
-					<string>2642.IBPluginDependency</string>
-					<string>2643.IBPluginDependency</string>
-					<string>2643.IBShouldRemoveOnLegacySave</string>
-					<string>2644.IBPluginDependency</string>
-					<string>2644.IBShouldRemoveOnLegacySave</string>
-					<string>2646.IBPluginDependency</string>
-					<string>2646.ImportedFromIB2</string>
-					<string>2647.IBPluginDependency</string>
-					<string>2649.IBEditorWindowLastContentRect</string>
-					<string>2649.IBPluginDependency</string>
-					<string>2650.IBPluginDependency</string>
-					<string>2652.IBPluginDependency</string>
-					<string>2655.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>{{77, 333}, {587, 432}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{77, 333}, {587, 432}}</string>
-					<integer value="1"/>
-					<boolean value="NO"/>
-					<integer value="1"/>
-					<string>{3.40282e+38, 3.40282e+38}</string>
-					<string>{525, 340}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>HBQueueOutlineView</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>HBImageAndTextCell</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{555, 544}, {96, 63}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">2657</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">HBImageAndTextCell</string>
-					<string key="superclassName">NSTextFieldCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">HBImageAndTextCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">HBImageAndTextCell</string>
-					<string key="superclassName">NSTextFieldCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">HBQueueController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>editSelectedQueueItem:</string>
-							<string>imageSpacingChanged:</string>
-							<string>indentChanged:</string>
-							<string>removeSelectedQueueItem:</string>
-							<string>revealSelectedQueueItem:</string>
-							<string>showQueueWindow:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>editSelectedQueueItem:</string>
-							<string>imageSpacingChanged:</string>
-							<string>indentChanged:</string>
-							<string>removeSelectedQueueItem:</string>
-							<string>revealSelectedQueueItem:</string>
-							<string>showQueueWindow:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">editSelectedQueueItem:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">imageSpacingChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">indentChanged:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">removeSelectedQueueItem:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">revealSelectedQueueItem:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showQueueWindow:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>fCurrentJobPane</string>
-							<string>fIndentation</string>
-							<string>fJobDescTextField</string>
-							<string>fJobIconView</string>
-							<string>fOutlineView</string>
-							<string>fProgressBar</string>
-							<string>fProgressTextField</string>
-							<string>fQueueCountField</string>
-							<string>fQueuePane</string>
-							<string>fSpacing</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSView</string>
-							<string>NSSlider</string>
-							<string>NSTextField</string>
-							<string>NSImageView</string>
-							<string>HBQueueOutlineView</string>
-							<string>NSProgressIndicator</string>
-							<string>NSTextField</string>
-							<string>NSTextField</string>
-							<string>NSView</string>
-							<string>NSSlider</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>fCurrentJobPane</string>
-							<string>fIndentation</string>
-							<string>fJobDescTextField</string>
-							<string>fJobIconView</string>
-							<string>fOutlineView</string>
-							<string>fProgressBar</string>
-							<string>fProgressTextField</string>
-							<string>fQueueCountField</string>
-							<string>fQueuePane</string>
-							<string>fSpacing</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fCurrentJobPane</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fIndentation</string>
-								<string key="candidateClassName">NSSlider</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fJobDescTextField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fJobIconView</string>
-								<string key="candidateClassName">NSImageView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fOutlineView</string>
-								<string key="candidateClassName">HBQueueOutlineView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fProgressBar</string>
-								<string key="candidateClassName">NSProgressIndicator</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fProgressTextField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fQueueCountField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fQueuePane</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fSpacing</string>
-								<string key="candidateClassName">NSSlider</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="333889241">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">HBQueueController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">HBQueueController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>cancelCurrentJob:</string>
-							<string>revealSelectedJobGroups:</string>
-							<string>togglePauseResume:</string>
-							<string>toggleStartCancel:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>cancelCurrentJob:</string>
-							<string>revealSelectedJobGroups:</string>
-							<string>togglePauseResume:</string>
-							<string>toggleStartCancel:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">cancelCurrentJob:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">revealSelectedJobGroups:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">togglePauseResume:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">toggleStartCancel:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">HBQueueOutlineView</string>
-					<string key="superclassName">NSOutlineView</string>
-					<reference key="sourceIdentifier" ref="333889241"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">HBQueueOutlineView</string>
-					<string key="superclassName">NSOutlineView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSActionCell</string>
-					<string key="superclassName">NSCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<string key="superclassName">NSResponder</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="1009815657">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="942825343">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="874636585">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSApplication</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSButton</string>
-					<string key="superclassName">NSControl</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSButtonCell</string>
-					<string key="superclassName">NSActionCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSCell</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSControl</string>
-					<string key="superclassName">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="596505546">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSFormatter</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSImageCell</string>
-					<string key="superclassName">NSCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSImageCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSImageView</string>
-					<string key="superclassName">NSControl</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSImageView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSMenu</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="721965304">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSMenuItem</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="529283491">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="1009815657"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="942825343"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="874636585"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="596505546"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSDragging.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<reference key="sourceIdentifier" ref="721965304"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="440847546">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="415747133">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="165950663">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSError.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Growl.framework/Headers/GrowlApplicationBridge.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">ImageKit.framework/Headers/IKImageBrowserView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">ImageKit.framework/Headers/IKSaveOptions.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">ImageKit.framework/Headers/ImageKitDeprecated.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">PDFKit.framework/Headers/PDFDocument.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">PDFKit.framework/Headers/PDFView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QTKit.framework/Headers/QTCaptureDecompressedAudioOutput.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QTKit.framework/Headers/QTCaptureDecompressedVideoOutput.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QTKit.framework/Headers/QTCaptureFileOutput.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QTKit.framework/Headers/QTCaptureVideoPreviewOutput.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QTKit.framework/Headers/QTCaptureView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QTKit.framework/Headers/QTMovie.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QTKit.framework/Headers/QTMovieView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QuartzComposer.framework/Headers/QCCompositionParameterView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QuartzComposer.framework/Headers/QCCompositionPickerView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QuartzFilters.framework/Headers/QuartzFilterManager.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QuickLookUI.framework/Headers/QLPreviewPanel.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Sparkle.framework/Headers/SUAppcast.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Sparkle.framework/Headers/SUUpdater.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSOutlineView</string>
-					<string key="superclassName">NSTableView</string>
-					<reference key="sourceIdentifier" ref="440847546"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSProgressIndicator</string>
-					<string key="superclassName">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSProgressIndicator.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSResponder</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSResponder</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSScrollView</string>
-					<string key="superclassName">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSScrollView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSScroller</string>
-					<string key="superclassName">NSControl</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSScroller.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSSlider</string>
-					<string key="superclassName">NSControl</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSSlider.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSSliderCell</string>
-					<string key="superclassName">NSActionCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSSliderCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSTableColumn</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSTableColumn.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSTableView</string>
-					<string key="superclassName">NSControl</string>
-					<reference key="sourceIdentifier" ref="415747133"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSTextField</string>
-					<string key="superclassName">NSControl</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSTextField.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSTextFieldCell</string>
-					<string key="superclassName">NSActionCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSClipView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSView</string>
-					<reference key="sourceIdentifier" ref="529283491"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSView</string>
-					<string key="superclassName">NSResponder</string>
-					<reference key="sourceIdentifier" ref="165950663"/>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSWindow</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSWindow</string>
-					<string key="superclassName">NSResponder</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSWindow.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSWindow</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSWindowController</string>
-					<string key="superclassName">NSResponder</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">showWindow:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">showWindow:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">showWindow:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../HandBrake.xcodeproj</string>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>Delete</string>
-				<string>NSMenuCheckmark</string>
-				<string>NSMenuMixedState</string>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{16, 16}</string>
-				<string>{9, 8}</string>
-				<string>{7, 2}</string>
-			</object>
-		</object>
-	</data>
-</archive>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F14" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <deployment version="1060" identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="HBQueueController">
+ <connections>
+ <outlet property="fOutlineView" destination="2597" id="2601"/>
+ <outlet property="fProgressTextField" destination="2646" id="2648"/>
+ <outlet property="fQueueCountField" destination="2511" id="2564"/>
+ <outlet property="window" destination="2576" id="2645"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application"/>
+ <window title="Queue - HandBrake" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="QueueWindow" animationBehavior="default" id="2576" userLabel="Window">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" unifiedTitleAndToolbar="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="893" y="128" width="574" height="423"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
+ <value key="minSize" type="size" width="525" height="340"/>
+ <view key="contentView" id="2577">
+ <rect key="frame" x="0.0" y="0.0" width="574" height="423"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <scrollView horizontalLineScroll="19" horizontalPageScroll="0.0" verticalLineScroll="19" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="2596">
+ <rect key="frame" x="20" y="20" width="534" height="338"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <clipView key="contentView" id="B5m-TR-ErO">
+ <rect key="frame" x="1" y="1" width="532" height="336"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="2624" id="2597" customClass="HBQueueOutlineView">
+ <rect key="frame" x="0.0" y="0.0" width="532" height="336"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <size key="intercellSpacing" width="3" height="2"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+ <tableColumns>
+ <tableColumn identifier="icon" width="38" minWidth="38" maxWidth="38" id="2624">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <imageCell key="dataCell" refusesFirstResponder="YES" alignment="left" animates="YES" imageAlignment="topRight" imageScaling="proportionallyDown" id="2625"/>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ </tableColumn>
+ <tableColumn identifier="desc" editable="NO" width="465" minWidth="40" maxWidth="5000" id="2599">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
+ </tableHeaderCell>
+ <textFieldCell key="dataCell" selectable="YES" editable="YES" alignment="left" id="2609" customClass="HBImageAndTextCell">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <connections>
+ <outlet property="menu" destination="2649" id="2653"/>
+ </connections>
+ </textFieldCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
+ </tableColumn>
+ <tableColumn identifier="action" editable="NO" width="20" minWidth="8" maxWidth="20" id="2604">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <buttonCell key="dataCell" type="square" bezelStyle="shadowlessSquare" image="Delete" imagePosition="above" alignment="center" inset="2" id="2605">
+ <behavior key="behavior" lightByContents="YES"/>
+ 
+ </buttonCell>
+ </tableColumn>
+ </tableColumns>
+ <connections>
+ <outlet property="dataSource" destination="-2" id="2602"/>
+ <outlet property="delegate" destination="-2" id="2603"/>
+ </connections>
+ </outlineView>
+ </subviews>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </clipView>
+ <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="2644">
+ <rect key="frame" x="-100" y="-100" width="282" height="15"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="2643">
+ <rect key="frame" x="517" y="1" width="16" height="336"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ </scrollView>
+ <textField verticalHuggingPriority="750" id="2511">
+ <rect key="frame" x="17" y="399" width="540" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="Pending Jobs" id="2637">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="2646">
+ <rect key="frame" x="17" y="366" width="540" height="29"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="There are no jobs currently encoding" id="2647">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ </view>
+ <toolbar key="toolbar" implicitIdentifier="0FE76B40-49B7-48AE-B44E-D1B8034BC88A" autosavesConfiguration="NO" displayMode="iconAndLabel" sizeMode="regular" id="ZVb-ld-0UP">
+ <allowedToolbarItems>
+ <toolbarItem implicitItemIdentifier="609C5CFE-D854-4567-9CC2-70E109CBA332" explicitItemIdentifier="HBQueueStartCancelToolbarIdentifier" label="Start" paletteLabel="Start/Cancel" toolTip="Start Encoding" tag="-1" image="encode" id="SX6-mq-Hck">
+ <connections>
+ <action selector="toggleStartCancel:" target="-2" id="ABS-fA-RwJ"/>
+ </connections>
+ </toolbarItem>
+ <toolbarItem implicitItemIdentifier="7DB01500-5492-42BC-BDEE-55E9EF3765A1" explicitItemIdentifier="HBQueuePauseResumeToolbarIdentifier" label="Pause" paletteLabel="Pause/Resume" toolTip="Pause Encoding" tag="-1" image="pauseencode" id="s7o-pK-heI">
+ <connections>
+ <action selector="togglePauseResume:" target="-2" id="bmr-hx-loD"/>
+ </connections>
+ </toolbarItem>
+ <toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="rHN-a0-oZQ"/>
+ <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="QuV-M8-cet"/>
+ </allowedToolbarItems>
+ <defaultToolbarItems>
+ <toolbarItem reference="SX6-mq-Hck"/>
+ <toolbarItem reference="s7o-pK-heI"/>
+ <toolbarItem reference="QuV-M8-cet"/>
+ </defaultToolbarItems>
+ </toolbar>
+ <connections>
+ <outlet property="delegate" destination="-2" id="2579"/>
+ </connections>
+ </window>
+ <menu id="2649" userLabel="ContextMenu">
+ <items>
+ <menuItem title="Edit" id="2650">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="editSelectedQueueItem:" target="-2" id="2654"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Delete" id="2652">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="removeSelectedQueueItem:" target="-2" id="2656"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Show" id="2655">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="revealSelectedQueueItem:" target="-2" id="2657"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </objects>
+ <resources>
+ <image name="Delete" width="16" height="16"/>
+ <image name="encode" width="24" height="24"/>
+ <image name="pauseencode" width="24" height="24"/>
+ </resources>
+</document>

HandBrake-0.10.0.tar.bz2/macosx/English.lproj/Subtitles.xib Added

@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F14" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <deployment version="1060" defaultVersion="1060" identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="HBSubtitlesController">
+ <connections>
+ <outlet property="configureDefaults" destination="QsM-28-Pya" id="AbY-A5-kzy"/>
+ <outlet property="fTableView" destination="0yM-wE-D2x" id="0vq-y5-Ubi"/>
+ <outlet property="reloadDefaults" destination="Vxx-gk-9kY" id="9fr-kb-QiD"/>
+ <outlet property="trackPopUp" destination="2Tb-KC-Ugi" id="kwx-uG-p4q"/>
+ <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application"/>
+ <customView id="Hz6-mo-xeY">
+ <rect key="frame" x="0.0" y="0.0" width="926" height="322"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <subviews>
+ <scrollView autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="Syo-rH-vof">
+ <rect key="frame" x="20" y="20" width="886" height="266"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <clipView key="contentView" id="ljc-nW-Cnc">
+ <rect key="frame" x="1" y="17" width="884" height="248"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="25" headerView="IiW-3a-Drv" id="0yM-wE-D2x">
+ <rect key="frame" x="0.0" y="0.0" width="884" height="248"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <size key="intercellSpacing" width="3" height="2"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+ <tableColumns>
+ <tableColumn identifier="track" editable="NO" width="322" minWidth="40" maxWidth="1000" id="N3S-st-yGv">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Track">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
+ </tableHeaderCell>
+ <popUpButtonCell key="dataCell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="kzn-6s-3Ka">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="Umu-1b-U1Z">
+ <items>
+ <menuItem title="Pop Up" id="cSW-OC-qKA"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ </tableColumn>
+ <tableColumn identifier="forced" width="76" minWidth="10" maxWidth="3.4028229999999999e+38" id="klV-Gy-igk">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="Forced Only">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <buttonCell key="dataCell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="only" alignment="left" controlSize="small" continuous="YES" inset="2" id="JLr-Qi-X0X">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ </tableColumn>
+ <tableColumn identifier="burned" width="64" minWidth="10" maxWidth="3.4028229999999999e+38" id="fIe-Fg-ufj">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="Burned In">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <buttonCell key="dataCell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="only" alignment="left" controlSize="small" continuous="YES" inset="2" id="R9w-Bn-CCt">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ </tableColumn>
+ <tableColumn identifier="default" width="51" minWidth="10" maxWidth="3.4028229999999999e+38" id="fvq-pE-sOC">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="Default">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <buttonCell key="dataCell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="only" alignment="left" controlSize="small" continuous="YES" inset="2" id="ooy-Sh-Edm">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ </tableColumn>
+ <tableColumn identifier="srt_lang" width="173" minWidth="10" maxWidth="3.4028229999999999e+38" id="9ka-9O-WDj">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Srt Language">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <popUpButtonCell key="dataCell" type="bevel" title="Pop Up" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" continuous="YES" state="on" borderStyle="bezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="vHW-fn-RSG" id="2Qz-Lh-O8g">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="UOP-xa-WpP">
+ <items>
+ <menuItem title="Pop Up" state="on" id="vHW-fn-RSG"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ </tableColumn>
+ <tableColumn identifier="srt_charcode" width="113" minWidth="10" maxWidth="3.4028229999999999e+38" id="1Qg-We-ltR">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Srt Char Code">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <popUpButtonCell key="dataCell" type="bevel" title="Pop Up" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" continuous="YES" state="on" borderStyle="bezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="xt1-a1-JhF" id="AdJ-Mv-JI2">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="ABd-Ec-K2L">
+ <items>
+ <menuItem title="Pop Up" state="on" id="xt1-a1-JhF"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ </tableColumn>
+ <tableColumn identifier="srt_offset" width="64" minWidth="10" maxWidth="3.4028229999999999e+38" id="Fgh-pZ-6uu">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Srt Offset">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <textFieldCell key="dataCell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" sendsActionOnEndEditing="YES" alignment="center" title="Text" id="QRj-KI-a03">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ </tableColumn>
+ </tableColumns>
+ <connections>
+ <outlet property="dataSource" destination="-2" id="DH5-v0-2ba"/>
+ <outlet property="delegate" destination="-2" id="Dfm-tw-89m"/>
+ <outlet property="menu" destination="KgC-dn-Hq2" id="Iff-7t-kdg"/>
+ </connections>
+ </tableView>
+ </subviews>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </clipView>
+ <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="toe-s0-pVk">
+ <rect key="frame" x="-100" y="-100" width="685" height="15"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="GfM-TU-Tmr">
+ <rect key="frame" x="-15" y="17" width="16" height="0.0"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <tableHeaderView key="headerView" id="IiW-3a-Drv">
+ <rect key="frame" x="0.0" y="0.0" width="884" height="17"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </tableHeaderView>
+ </scrollView>
+ <popUpButton verticalHuggingPriority="750" id="2Tb-KC-Ugi">
+ <rect key="frame" x="17" y="291" width="88" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Track" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="8ZD-D6-TLA">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="Fr7-eG-NuL">
+ <items>
+ <menuItem title="Track" state="on" hidden="YES" id="TJO-RZ-jgb"/>
+ <menuItem title="Add All" id="4PX-In-DpF">
+ <connections>
+ <action selector="addAll:" target="-2" id="tuS-uF-dje"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Add External SRT…" id="HW0-PS-t0U">
+ <connections>
+ <action selector="browseImportSrtFile:" target="-2" id="dog-BP-my4"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="2hO-bG-5qB"/>
+ <menuItem title="Remove All" id="mVi-zH-KUq">
+ <connections>
+ <action selector="removeAll:" target="-2" id="QsA-lb-0rD"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ </popUpButton>
+ <button verticalHuggingPriority="750" id="QsM-28-Pya">
+ <rect key="frame" x="110" y="288" width="140" height="28"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="push" title="Configure Defaults…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="oxg-bs-1si">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="showSettingsSheet:" target="-2" id="OAA-S8-tfS"/>
+ </connections>
+ </button>
+ <button verticalHuggingPriority="750" id="Vxx-gk-9kY">
+ <rect key="frame" x="248" y="288" width="116" height="28"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="push" title="Reload Defaults" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="jG8-uo-1tv">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="addTracksFromDefaults:" target="-2" id="GOz-FT-Atg"/>
+ </connections>
+ </button>
+ </subviews>
+ </customView>
+ <menu id="KgC-dn-Hq2">
+ <items>
+ <menuItem title="Add All" id="S2I-Jd-Lyg">
+ <attributedString key="attributedTitle"/>
+ <connections>
+ <action selector="addAll:" target="-2" id="ojh-vi-2gX"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Add External SRT…" id="fXD-7h-jMl">
+ <connections>
+ <action selector="browseImportSrtFile:" target="-2" id="tEu-2l-wjN"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="Pr7-iM-rgd"/>
+ <menuItem title="Remove All" id="R8a-qg-ASg">
+ <connections>
+ <action selector="removeAll:" target="-2" id="8yF-Gu-7bi"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="eER-z8-aB9"/>
+ <menuItem title="Reload Defaults" id="jcM-HL-QJ6">
+ <connections>
+ <action selector="addTracksFromDefaults:" target="-2" id="IQq-bX-u1t"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Configure Defaults…" id="pwm-PV-1x4">
+ <connections>
+ <action selector="showSettingsSheet:" target="-2" id="aQq-Fi-0Ro"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </objects>
+</document>

HandBrake-0.10.0.tar.bz2/macosx/English.lproj/SubtitlesDefaults.xib Added

@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="14A361c" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <deployment version="1060" defaultVersion="1060" identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="HBSubtitlesDefaultsController">
+ <connections>
+ <outlet property="showAllButton" destination="QAt-5X-NBT" id="3IW-6r-piX"/>
+ <outlet property="tableController" destination="ZBe-aP-wvq" id="HBN-Z2-bbo"/>
+ <outlet property="window" destination="kwM-lz-5lG" id="rob-Fo-JhL"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application"/>
+ <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="kwM-lz-5lG">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="283" y="305" width="427" height="304"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
+ <value key="minSize" type="size" width="427" height="304"/>
+ <view key="contentView" id="ZP2-Cp-K5w">
+ <rect key="frame" x="0.0" y="0.0" width="427" height="304"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="fPg-3n-1TN">
+ <rect key="frame" x="-2" y="268" width="157" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Track Selection Behavior:" id="GbM-vm-RC2">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Jsz-Er-bsF">
+ <rect key="frame" x="-2" y="244" width="157" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Languages:" id="mAT-Jp-SG1">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Hqz-Lw-gAu">
+ <rect key="frame" x="-2" y="66" width="157" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Options:" id="NJl-q3-zXL">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="oiD-QI-wly">
+ <rect key="frame" x="158" y="263" width="252" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="None" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="mvw-Hg-JFM" id="21e-KY-8TR">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="Kwy-lU-VuU">
+ <items>
+ <menuItem title="None" state="on" id="mvw-Hg-JFM"/>
+ <menuItem title="First Matching Selected Languages" id="jDd-Ji-7Sm"/>
+ <menuItem title="All Matching Selected Languages" id="GZP-q7-SYy"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <binding destination="-2" name="selectedIndex" keyPath="self.settings.trackSelectionBehavior" id="sKn-Mr-Hce"/>
+ </connections>
+ </popUpButton>
+ <button toolTip="Closed captions are text subtitles that can be added to any container as a soft subtitle track (not burned)." id="uF5-6E-EIe">
+ <rect key="frame" x="158" y="63" width="251" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <buttonCell key="cell" type="check" title="Add Closed Captions when available" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="66v-2g-DHn">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.settings.addCC" id="JNz-WE-LD3"/>
+ </connections>
+ </button>
+ <button toolTip="This search pass finds short sequences of foreign audio and provides subtitles for them." id="OOC-GZ-OFA">
+ <rect key="frame" x="158" y="45" width="251" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <buttonCell key="cell" type="check" title="Add &quot;Foreign Audio Search&quot;" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="vNY-OC-hTJ">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.settings.addForeignAudioSearch" id="UZC-m0-Mco"/>
+ </connections>
+ </button>
+ <scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="10" verticalLineScroll="16" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="aTC-39-h6S">
+ <rect key="frame" x="161" y="123" width="246" height="135"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
+ <clipView key="contentView" id="TdE-Sh-NcS">
+ <rect key="frame" x="1" y="1" width="244" height="133"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" autosaveColumns="NO" rowHeight="14" id="Of7-71-Ci6">
+ <rect key="frame" x="0.0" y="0.0" width="244" height="133"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <size key="intercellSpacing" width="3" height="2"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+ <tableColumns>
+ <tableColumn identifier="checkBox" width="20" minWidth="20" maxWidth="20" id="G44-XP-6xE">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
+ </tableHeaderCell>
+ <buttonCell key="dataCell" type="check" bezelStyle="regularSquare" imagePosition="left" controlSize="small" lineBreakMode="truncatingMiddle" inset="2" id="6by-yL-8VC">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="ZBe-aP-wvq" name="value" keyPath="arrangedObjects.isSelected" id="fRp-oC-H6C"/>
+ </connections>
+ </tableColumn>
+ <tableColumn identifier="name" width="210" minWidth="10" maxWidth="2000" id="IJ6-jx-Nba">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
+ 
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+ </tableHeaderCell>
+ <textFieldCell key="dataCell" controlSize="small" lineBreakMode="truncatingMiddle" alignment="left" title="Text Cell" id="lY3-CN-AmZ">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="ZBe-aP-wvq" name="value" keyPath="arrangedObjects.language" id="y6d-Rn-DIv"/>
+ </connections>
+ </tableColumn>
+ </tableColumns>
+ <connections>
+ <binding destination="ZBe-aP-wvq" name="content" keyPath="arrangedObjects" id="ak7-UG-Fqe"/>
+ <outlet property="dataSource" destination="ZBe-aP-wvq" id="bDe-Wj-fNO"/>
+ <outlet property="delegate" destination="ZBe-aP-wvq" id="Tgj-bB-hZ2"/>
+ </connections>
+ </tableView>
+ </subviews>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </clipView>
+ <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="bXf-U5-ogz">
+ <rect key="frame" x="1" y="118" width="244" height="16"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="BWM-rq-VTg">
+ <rect key="frame" x="-15" y="1" width="16" height="0.0"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ </scrollView>
+ <button verticalHuggingPriority="750" id="QAt-5X-NBT">
+ <rect key="frame" x="161" y="93" width="71" height="23"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <buttonCell key="cell" type="smallSquare" title="Show All" bezelStyle="smallSquare" imagePosition="overlaps" alignment="center" controlSize="small" borderStyle="border" inset="3" id="PiQ-bA-7P1">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="edit:" target="-2" id="13y-nD-hEj"/>
+ </connections>
+ </button>
+ <button verticalHuggingPriority="750" id="sC2-52-liU">
+ <rect key="frame" x="358" y="14" width="54" height="28"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <buttonCell key="cell" type="push" title="Done" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="kDe-1L-VkD">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="done:" target="-2" id="Rdg-PN-7l6"/>
+ </connections>
+ </button>
+ </subviews>
+ </view>
+ </window>
+ <arrayController objectClassName="HBLang" id="ZBe-aP-wvq" userLabel="Table Controller" customClass="HBLanguageArrayController">
+ <declaredKeys>
+ <string>language</string>
+ <string>isSelected</string>
+ </declaredKeys>
+ <connections>
+ <binding destination="-2" name="contentArray" keyPath="languagesList.languagesArray" id="vKV-y3-Zbg"/>
+ <outlet property="tableView" destination="Of7-71-Ci6" id="QIg-ml-iKO"/>
+ </connections>
+ </arrayController>
+ </objects>
+</document>

HandBrake-0.10.0.tar.bz2/macosx/English.lproj/Video.xib Added

@@ -0,0 +1,493 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <deployment version="1060" identifier="macosx"/>
+ <development version="5100" identifier="xcode"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6250"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="HBVideoController">
+ <connections>
+ <outlet property="fDisplayPresetsAdditonalOptionsLabel" destination="ijg-ux-uvb" id="Zhw-D7-xOs"/>
+ <outlet property="fDisplayPresetsAdditonalOptionsTextField" destination="oJk-ur-wgc" id="TUr-Lt-UHQ"/>
+ <outlet property="fDisplayX264PresetsUnparseTextField" destination="wk1-2U-z4i" id="aIk-h1-bOP"/>
+ <outlet property="fDividerLine" destination="g5v-MD-kdo" id="jZS-ae-kGM"/>
+ <outlet property="fEncoderOptionsLabel" destination="mkM-81-g3d" id="eWq-95-kTO"/>
+ <outlet property="fFastDecodeCheck" destination="z7F-H2-Vfr" id="usU-aE-DUt"/>
+ <outlet property="fFramerateCfrCell" destination="ZRE-Ig-mhJ" id="vqQ-Pd-63o"/>
+ <outlet property="fFramerateMatrix" destination="Xe2-d5-nEH" id="GCQ-qu-zBk"/>
+ <outlet property="fFramerateVfrPfrCell" destination="DD4-13-4gw" id="Cwu-GV-AKd"/>
+ <outlet property="fLavcOptionsLabel" destination="26w-dz-St2" id="R7C-nz-BBZ"/>
+ <outlet property="fLavcOptionsTextField" destination="mL3-yC-hUj" id="DHu-CV-Emx"/>
+ <outlet property="fLevelPopUp" destination="P7c-Zk-G99" id="dHU-91-P9m"/>
+ <outlet property="fLevelPopUpLabel" destination="BY1-IG-JvI" id="kmr-tF-K73"/>
+ <outlet property="fPictureFiltersField" destination="gPF-Jh-4d0" id="6AQ-Ee-tFl"/>
+ <outlet property="fPictureSettingsField" destination="9L5-i4-5eu" id="elr-IU-9BI"/>
+ <outlet property="fPresetSelectedTextField" destination="gvn-wG-crj" id="vzQ-yp-EBS"/>
+ <outlet property="fPresetSliderLabel" destination="0sa-ep-yfr" id="DVa-aK-Cq4"/>
+ <outlet property="fPresetView" destination="2dX-Hf-Hxl" id="OEP-rM-gGp"/>
+ <outlet property="fPresetsBox" destination="A4U-3F-pYq" id="m5l-h9-Ak8"/>
+ <outlet property="fPresetsSlider" destination="Biw-5K-pPD" id="ixn-dK-MaZ"/>
+ <outlet property="fProfilePopUp" destination="CPP-lh-FbN" id="rch-3L-jwi"/>
+ <outlet property="fProfilePopUpLabel" destination="dY9-5D-mXX" id="Lno-BZ-ZMH"/>
+ <outlet property="fSimplePresetView" destination="aRi-vN-oR0" id="e0P-NK-oHv"/>
+ <outlet property="fTunePopUp" destination="A7d-wM-Xmp" id="J1a-PP-NEr"/>
+ <outlet property="fTunePopUpLabel" destination="gzq-SL-YVY" id="uCk-oz-Mow"/>
+ <outlet property="fVidBitrateCell" destination="6tI-Qz-3bJ" id="oWy-lK-5aZ"/>
+ <outlet property="fVidBitrateField" destination="A3o-Zx-OfM" id="IzD-XM-sDC"/>
+ <outlet property="fVidConstantCell" destination="au3-pU-KX6" id="M31-Xr-Rsv"/>
+ <outlet property="fVidEncoderField" destination="rOd-nt-22T" id="SRE-gy-wx1"/>
+ <outlet property="fVidEncoderPopUp" destination="xwK-Yu-a1e" id="9tr-GG-Nmf"/>
+ <outlet property="fVidQualityField" destination="gfa-Hb-cDP" id="7ps-7F-2H7"/>
+ <outlet property="fVidQualityMatrix" destination="lsD-0N-H8k" id="4hj-lZ-N2T"/>
+ <outlet property="fVidQualityRFField" destination="Pai-3Q-Gs3" id="t8C-Nj-EIy"/>
+ <outlet property="fVidQualityRFLabel" destination="1au-ZO-l1i" id="UsV-Jy-dwJ"/>
+ <outlet property="fVidQualitySlider" destination="GPu-Ht-bKg" id="faR-df-PGL"/>
+ <outlet property="fVidRateField" destination="bAn-iZ-ieF" id="yiZ-OW-nxA"/>
+ <outlet property="fVidRatePopUp" destination="9tc-EO-QMd" id="O1B-x4-qfm"/>
+ <outlet property="fVidTurboPassCheck" destination="olm-zg-k9Y" id="r9Y-Ym-R0Y"/>
+ <outlet property="fVidTwoPassCheck" destination="bnV-aE-FVh" id="yPb-4E-8CL"/>
+ <outlet property="fX264UseAdvancedOptionsCheck" destination="Zs7-1Y-50A" id="WWx-OC-tor"/>
+ <outlet property="view" destination="wAC-5p-nXb" id="i3V-vv-tDn"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+ <view id="wAC-5p-nXb">
+ <rect key="frame" x="0.0" y="0.0" width="920" height="315"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" id="gfa-Hb-cDP">
+ <rect key="frame" x="279" y="289" width="69" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Quality:" id="F3s-qR-qeE">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="A3o-Zx-OfM">
+ <rect key="frame" x="507" y="241" width="78" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="eQl-KB-XJu">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <action selector="bitrateFieldChanged:" target="-2" id="zC1-Yc-rrz"/>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="750" id="9L5-i4-5eu">
+ <rect key="frame" x="18" y="25" width="884" height="14"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Picture Settings:" id="UWU-31-FxR">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="pictureSettingsField" id="DEV-9e-Gv2"/>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="750" id="Pai-3Q-Gs3">
+ <rect key="frame" x="530" y="288" width="50" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" id="bvD-W7-O0N">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="309" maximumFractionDigits="3" id="efn-Vj-Jp7"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="gPF-Jh-4d0">
+ <rect key="frame" x="18" y="9" width="884" height="14"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Picture Filters:" id="l1l-8S-ttm">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="pictureFiltersField" id="SoL-dS-2OQ"/>
+ </connections>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="9tc-EO-QMd">
+ <rect key="frame" x="110" y="258" width="149" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="0VS-Ah-Q3S">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="Jj0-Qw-HF8">
+ <items>
+ <menuItem id="Xzy-hl-maq"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="videoFrameRateChanged:" target="-2" id="cxw-2p-JT9"/>
+ </connections>
+ </popUpButton>
+ <button id="bnV-aE-FVh">
+ <rect key="frame" x="379" y="222" width="124" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="check" title="2-pass encoding" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="nPA-nO-Eik">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="twoPassCheckboxChanged:" target="-2" id="W4m-Bw-R57"/>
+ </connections>
+ </button>
+ <button id="olm-zg-k9Y">
+ <rect key="frame" x="504" y="222" width="107" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="check" title="Turbo first pass" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="vSc-VB-NEv">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ </button>
+ <popUpButton verticalHuggingPriority="750" id="xwK-Yu-a1e">
+ <rect key="frame" x="110" y="284" width="149" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="KHu-7m-NR7">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="6Cs-jo-8Q6">
+ <items>
+ <menuItem id="cZC-bI-lgS"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="videoEncoderPopUpChanged:" target="-2" id="ojB-Jd-Au6"/>
+ <binding destination="-2" name="selectedTag" keyPath="self.codec" id="CvW-H4-Tco"/>
+ </connections>
+ </popUpButton>
+ <textField verticalHuggingPriority="750" id="bAn-iZ-ieF">
+ <rect key="frame" x="6" y="263" width="101" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Framerate (FPS):" id="SJc-tv-AMH">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="rOd-nt-22T">
+ <rect key="frame" x="6" y="289" width="101" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Video Codec:" id="Mrb-6Q-0YM">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <matrix verticalHuggingPriority="750" allowsEmptySelection="NO" autosizesCells="NO" id="lsD-0N-H8k">
+ <rect key="frame" x="354" y="234" width="145" height="70"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <size key="cellSize" width="145" height="18"/>
+ <size key="intercellSpacing" width="2" height="26"/>
+ <buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" inset="2" id="ISq-P4-S73">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <cells>
+ <column>
+ <buttonCell type="radio" title="Constant Quality" imagePosition="left" alignment="left" controlSize="small" state="on" tag="1" inset="2" id="au3-pU-KX6">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <buttonCell type="radio" title="Average Bitrate (kbps):" imagePosition="left" alignment="left" controlSize="small" inset="2" id="6tI-Qz-3bJ">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ </column>
+ </cells>
+ <connections>
+ <action selector="videoMatrixChanged:" target="-2" id="rGb-Wc-eBW"/>
+ <binding destination="-2" name="selectedTag" keyPath="self.qualityType" id="JkP-GB-eWw"/>
+ </connections>
+ </matrix>
+ <matrix verticalHuggingPriority="750" allowsEmptySelection="NO" id="Xe2-d5-nEH">
+ <rect key="frame" x="113" y="215" width="143" height="38"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <size key="cellSize" width="143" height="18"/>
+ <size key="intercellSpacing" width="4" height="2"/>
+ <buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" inset="2" id="M9p-y9-GDo">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <cells>
+ <column>
+ <buttonCell type="radio" title="Variable Framerate" imagePosition="left" alignment="left" controlSize="small" state="on" tag="1" inset="2" id="DD4-13-4gw">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <buttonCell type="radio" title="Constant Framerate" imagePosition="left" alignment="left" controlSize="small" inset="2" id="ZRE-Ig-mhJ">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ </column>
+ </cells>
+ </matrix>
+ <box autoresizesSubviews="NO" title="x264 Presets" borderType="none" titlePosition="noTitle" id="A4U-3F-pYq">
+ <rect key="frame" x="0.0" y="63" width="923" height="134"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <view key="contentView">
+ <rect key="frame" x="0.0" y="0.0" width="923" height="134"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ </view>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </box>
+ <slider verticalHuggingPriority="750" id="GPu-Ht-bKg">
+ <rect key="frame" x="382" y="265" width="518" height="17"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <sliderCell key="cell" controlSize="mini" continuous="YES" state="on" alignment="left" maxValue="51" doubleValue="33.149999999999999" tickMarkPosition="above" numberOfTickMarks="101" allowsTickMarkValuesOnly="YES" sliderType="linear" id="hOs-xu-ZdT">
+ 
+ </sliderCell>
+ <connections>
+ <action selector="qualitySliderChanged:" target="-2" id="nSh-RA-OCo"/>
+ </connections>
+ </slider>
+ <textField verticalHuggingPriority="750" id="1au-ZO-l1i">
+ <rect key="frame" x="505" y="288" width="28" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="RF:" id="rRB-9F-pHn">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="aeW-F6-jrd">
+ <rect key="frame" x="20" y="45" width="880" height="5"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ 
+ </box>
+ </subviews>
+ <point key="canvasLocation" x="185" y="286.5"/>
+ </view>
+ <customView id="2dX-Hf-Hxl" userLabel="x264/x264 presets view">
+ <rect key="frame" x="0.0" y="0.0" width="920" height="134"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <subviews>
+ <slider verticalHuggingPriority="750" id="Biw-5K-pPD">
+ <rect key="frame" x="120" y="97" width="123" height="17"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <string key="toolTip">Adjust encoder settings to trade off compression efficiency against encoding speed.
+
+This estabilishes your default encoder settings. Tunes, profiles, levels and advances option string will be applied to this.
+You should generally set this option to the slowest you can bear since slower settings will result in better quality or smaller files.</string>
+ <sliderCell key="cell" controlSize="mini" continuous="YES" state="on" alignment="left" maxValue="5" tickMarkPosition="above" numberOfTickMarks="2" allowsTickMarkValuesOnly="YES" sliderType="linear" id="suZ-F3-AGy"/>
+ <connections>
+ <action selector="presetsSliderChanged:" target="-2" id="bKH-cB-TyO"/>
+ </connections>
+ </slider>
+ <textField verticalHuggingPriority="750" id="0sa-ep-yfr">
+ <rect key="frame" x="35" y="99" width="79" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Preset:" id="iab-iA-j04">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="gzq-SL-YVY">
+ <rect key="frame" x="35" y="78" width="79" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Tune:" id="zSD-4Y-1cI">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="dY9-5D-mXX">
+ <rect key="frame" x="35" y="57" width="79" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Profile:" id="hib-wi-BDx">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="BY1-IG-JvI">
+ <rect key="frame" x="35" y="36" width="79" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Level:" id="QyZ-rl-uGw">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" id="A7d-wM-Xmp">
+ <rect key="frame" x="119" y="77" width="126" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <string key="toolTip">Tune settings to optimize for common scenarios.
+
+This can improve efficiency for particular source characteristics or set characteristics of the output file. Changes will be applied after the preset but before all other parameters.</string>
+ <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="rl3-yb-lhe" id="dy8-w4-ycN">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="c4N-uO-iVC">
+ <items>
+ <menuItem title="Item 1" state="on" id="rl3-yb-lhe"/>
+ <menuItem title="Item 2" id="Oh1-Pi-VOR"/>
+ <menuItem title="Item 3" id="8PG-Nw-5ky"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="x264PresetsChangedDisplayExpandedOptions:" target="-2" id="NXN-UM-juC"/>
+ </connections>
+ </popUpButton>
+ <popUpButton verticalHuggingPriority="750" id="CPP-lh-FbN">
+ <rect key="frame" x="119" y="56" width="126" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <string key="toolTip">Sets and ensures compliance with the specified profile.
+Overrides all other settings.</string>
+ <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="mmg-zN-rCB" id="oOm-hC-AoS">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="7CG-ga-88H">
+ <items>
+ <menuItem title="Item 1" state="on" id="mmg-zN-rCB"/>
+ <menuItem title="Item 2" id="got-Ie-NJ2"/>
+ <menuItem title="Item 3" id="Dgy-rE-2Tr"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="x264PresetsChangedDisplayExpandedOptions:" target="-2" id="WDW-WH-NRA"/>
+ </connections>
+ </popUpButton>
+ <popUpButton toolTip="Sets and ensures compliance with the specified level. Overrides all other settings." verticalHuggingPriority="750" id="P7c-Zk-G99">
+ <rect key="frame" x="119" y="35" width="126" height="15"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="kAg-9O-5hF" id="PhX-Wa-Vhs">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="pPu-oR-2R8">
+ <items>
+ <menuItem title="Item 1" state="on" id="kAg-9O-5hF"/>
+ <menuItem title="Item 2" id="D7y-fr-REA"/>
+ <menuItem title="Item 3" id="b0U-ow-7Mq"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <action selector="x264PresetsChangedDisplayExpandedOptions:" target="-2" id="vbv-LQ-CX5"/>
+ </connections>
+ </popUpButton>
+ <button id="z7F-H2-Vfr">
+ <rect key="frame" x="261" y="77" width="108" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <string key="toolTip">Reduce decoder CPU usage.
+Set this if your device is struggling to play the output (dropped frames).</string>
+ <buttonCell key="cell" type="check" title="Fast Decode" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="5De-nU-l3h">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="x264PresetsChangedDisplayExpandedOptions:" target="-2" id="UYm-bq-oxP"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" id="ijg-ux-uvb">
+ <rect key="frame" x="261" y="58" width="110" height="13"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Additional Options:" id="ZSm-03-g0B">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="oJk-ur-wgc">
+ <rect key="frame" x="377" y="35" width="523" height="37"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="IID-yp-or8">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <action selector="x264PresetsChangedDisplayExpandedOptions:" target="-2" id="wJH-X4-1oP"/>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="750" id="gvn-wG-crj">
+ <rect key="frame" x="250" y="100" width="129" height="13"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" id="rHx-Kg-tc2">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <button toolTip="Use Advanced Options tab for x264 settings. Use at your own risk!" id="Zs7-1Y-50A">
+ <rect key="frame" x="117" y="118" width="209" height="18"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="check" title="Use Advanced Options Panel" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="sa6-r3-eVr">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="updateEncoderOptionsWidgets:" target="-2" id="kT9-0X-dVp"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" id="wk1-2U-z4i">
+ <rect key="frame" x="18" y="0.0" width="883" height="29"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" alignment="left" title="Unparse:" id="G8P-IF-mpl">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="mkM-81-g3d">
+ <rect key="frame" x="-2" y="120" width="116" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Encoder Options:" id="XIe-8Z-tIF">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="g5v-MD-kdo">
+ <rect key="frame" x="120" y="124" width="780" height="5"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ 
+ </box>
+ </subviews>
+ <point key="canvasLocation" x="185" y="576"/>
+ </customView>
+ <customView id="aRi-vN-oR0" userLabel="ffmpeg presets view">
+ <rect key="frame" x="0.0" y="0.0" width="920" height="34"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="mL3-yC-hUj">
+ <rect key="frame" x="120" y="2" width="545" height="32"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="z0u-VS-m0l">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="26w-dz-St2">
+ <rect key="frame" x="6" y="20" width="108" height="14"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Encoder Options:" id="7bP-tR-sAX">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ <point key="canvasLocation" x="185" y="727"/>
+ </customView>
+ </objects>
+</document>

HandBrake-0.9.9.tar.bz2/macosx/HBAdvancedController.h -> HandBrake-0.10.0.tar.bz2/macosx/HBAdvancedController.h Changed

@@ -5,22 +5,23 @@
 It may be used under the terms of the GNU General Public License. */
 
 #import <Cocoa/Cocoa.h>
+#import "HBViewValidation.h"
 
-@interface HBAdvancedController : NSObject
+/**
+ * HBAdvancedController
+ */
+@interface HBAdvancedController : NSViewController <HBViewValidation>
 {
 /* Advanced Tab for opts fX264optView*/
- NSBox * fOptionsBox;
- 
- IBOutlet NSView * fX264optView;
+ IBOutlet NSBox * fOptionsBox;
+
 IBOutlet NSView * fEmptyView;
+
+ IBOutlet NSView * fX264optView;
 IBOutlet NSTextField * fX264optViewTitleLabel;
 IBOutlet NSTextField * fDisplayX264OptionsLabel;
 IBOutlet NSTextField * fDisplayX264Options;
- IBOutlet NSTextField * fDisplayLavcOptionsLabel;
- IBOutlet NSTextField * fDisplayLavcOptions;
- 
- IBOutlet NSTextField * fDisplayTheoraOptionsLabel;
- 
+
 IBOutlet NSTextField * fX264optBframesLabel;
 IBOutlet NSPopUpButton * fX264optBframesPopUp;
 IBOutlet NSTextField * fX264optRefLabel;
@@ -61,15 +62,10 @@
 }
 
 // x264 Advanced Panel Methods
-- (void) setView: (NSBox *) box;
-- (BOOL) loadMyNibFile;
+
 - (NSString *) optionsString;
-- (NSString *) optionsStringLavc;
 - (void) setOptions: (NSString *)string;
-- (void) setLavcOptions: (NSString *)string;
-- (void) enableUI: (bool) b;
 - (void) setHidden: (BOOL) hide;
-- (void) setLavcOptsEnabled: (BOOL) lavc;
 - (IBAction) X264AdvancedOptionsAnimate: (id) sender;
 - (IBAction) X264AdvancedOptionsSet: (id) sender;
 - (IBAction) X264AdvancedOptionsStandardizeOptString: (id) sender;

HandBrake-0.9.9.tar.bz2/macosx/HBAdvancedController.m -> HandBrake-0.10.0.tar.bz2/macosx/HBAdvancedController.m Changed

@@ -8,29 +8,21 @@
 
 @implementation HBAdvancedController
 
-- (id)init
+- (instancetype)init
 {
- [super init];
- [self loadMyNibFile];
- 
- return self;
-}
+ self = [super initWithNibName:@"AdvancedView" bundle:nil];
+ if (self)
+ {
 
-- (void) setView: (NSBox *) box
-{
- fOptionsBox = box;
- [fOptionsBox setContentView:fX264optView];
+ }
+
+ return self;
 }
 
-- (BOOL) loadMyNibFile
+- (void)loadView
 {
- if(![NSBundle loadNibNamed:@"AdvancedView" owner:self])
- {
- NSLog(@"Warning! Could not load myNib file.\n");
- return NO;
- }
- 
- return YES;
+ [super loadView];
+ [self setHidden:NO];
 }
 
 - (NSString *) optionsString
@@ -38,25 +30,15 @@
 return [fDisplayX264Options stringValue];
 }
 
-- (NSString *) optionsStringLavc
-{
- return [fDisplayLavcOptions stringValue];
-}
-
 - (void) setOptions: (NSString *)string
 {
 [fDisplayX264Options setStringValue:string];
 [self X264AdvancedOptionsSet:nil];
 }
 
-- (void) setLavcOptions: (NSString *)string
-{
- [fDisplayLavcOptions setStringValue:string];
-}
-
 - (void) setHidden: (BOOL) hide
 {
- if(hide)
+ if (hide)
 {
 [fOptionsBox setContentView:fEmptyView];
 }
@@ -67,24 +49,7 @@
 return;
 }
 
-- (void) setLavcOptsEnabled: (BOOL) lavc
-{
- if(lavc)
- {
- [fDisplayLavcOptions setHidden:NO];
- [fDisplayLavcOptionsLabel setHidden:NO];
- [fDisplayTheoraOptionsLabel setHidden:YES];
- }
- else
- {
- [fDisplayLavcOptions setHidden:YES];
- [fDisplayLavcOptionsLabel setHidden:YES];
- [fDisplayTheoraOptionsLabel setHidden:NO];
- }
- return;
-}
-
- - (void) enableUI: (bool) b
+ - (void)setUIEnabled:(BOOL)flag
 {
 unsigned i;
 NSControl * controls[] =
@@ -105,16 +70,14 @@
 NSTextField * tf = (NSTextField *) controls[i];
 if( ![tf isBezeled] )
 {
- [tf setTextColor: b ? [NSColor controlTextColor] :
+ [tf setTextColor: flag ? [NSColor controlTextColor] :
 [NSColor disabledControlTextColor]];
 continue;
 }
 }
- [controls[i] setEnabled: b];
+ [controls[i] setEnabled: flag];
 
 }
- 
- [fX264optView setWantsLayer:YES];
 }
 
 - (void)dealloc
@@ -381,8 +344,8 @@
 currentOptsArray = [currentOptString componentsSeparatedByString:@":"];
 
 /*iterate through the array and get <opts> and <values*/
- int loopcounter;
- int currentOptsArrayCount = [currentOptsArray count];
+ NSUInteger loopcounter;
+ NSUInteger currentOptsArrayCount = [currentOptsArray count];
 for (loopcounter = 0; loopcounter < currentOptsArrayCount; loopcounter++)
 {
 thisOpt = [currentOptsArray objectAtIndex:loopcounter];
@@ -699,8 +662,8 @@
 currentOptsArray = [currentOptString componentsSeparatedByString:@":"];
 
 /*iterate through the array and get <opts> and <values*/
- int loopcounter;
- int currentOptsArrayCount = [currentOptsArray count];
+ NSUInteger loopcounter;
+ NSUInteger currentOptsArrayCount = [currentOptsArray count];
 for (loopcounter = 0; loopcounter < currentOptsArrayCount; loopcounter++)
 {
 thisOpt = [currentOptsArray objectAtIndex:loopcounter];
@@ -1033,7 +996,7 @@
 {
 /* Otherwise the format is deblock=a,b, where a and b both have an array
 offset of 7 because deblocking values start at -6 instead of at zero. */
- thisOpt = [NSString stringWithFormat:@"%@=%d,%d",optName, ([fX264optAlphaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optAlphaDeblockPopUp indexOfSelectedItem]-7 : 0,([fX264optBetaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optBetaDeblockPopUp indexOfSelectedItem]-7 : 0];
+ thisOpt = [NSString stringWithFormat:@"%@=%ld,%ld",optName, ([fX264optAlphaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optAlphaDeblockPopUp indexOfSelectedItem]-7 : 0,([fX264optBetaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optBetaDeblockPopUp indexOfSelectedItem]-7 : 0];
 }
 }
 
@@ -1208,19 +1171,19 @@
 /* Motion estimation range uses an odd array offset because in addition
 to starting with index 0 as default, index 1 starts at 4 instead of 1,
 because merange can't go below 4. So it has to be handled separately. */
- thisOpt = [NSString stringWithFormat:@"%@=%d",optName,[sender indexOfSelectedItem]+3];
+ thisOpt = [NSString stringWithFormat:@"%@=%ld",optName,[sender indexOfSelectedItem]+3];
 }
 
 else if ([optName isEqualToString:@"b-adapt"])
 {
 /* B-adapt starts at index 0 with default then goes 0, 1, 2)*/
- thisOpt = [NSString stringWithFormat:@"%@=%d", optName, [sender indexOfSelectedItem]-1];
+ thisOpt = [NSString stringWithFormat:@"%@=%ld", optName, [sender indexOfSelectedItem]-1];
 }
 
 else if ([optName isEqualToString:@"ref"])
 {
 /* Refs use actual index numbers */
- thisOpt = [NSString stringWithFormat:@"%@=%d",optName,[sender indexOfSelectedItem]];
+ thisOpt = [NSString stringWithFormat:@"%@=%ld",optName,(long)[sender indexOfSelectedItem]];
 }
 
 else // we have a valid value to change, so change it
@@ -1230,7 +1193,7 @@
 Basically, any options that are PopUp menus with index 0 as default and
 index 1 as 0, with numerical values, are all handled right here. All of
 the above stuff is for the exceptions to the general case. */
- thisOpt = [NSString stringWithFormat:@"%@=%d",optName,[sender indexOfSelectedItem]-1];
+ thisOpt = [NSString stringWithFormat:@"%@=%ld",optName,[sender indexOfSelectedItem]-1];
 }
 
 return thisOpt;
@@ -1271,7 +1234,6 @@
 
 NSString * thisOpt = @""; // The separated option such as "bframes=3"
 NSString * optName = @""; // The option name such as "bframes"
- NSString * optValue = @""; // The option value such as "3"
 NSArray *currentOptsArray;
 
 /* Get the current opt string being displayed. */
@@ -1297,8 +1259,8 @@
 currentOptsArray = [currentOptString componentsSeparatedByString:@":"];
 
 /* Iterate through the array and get <opts> and <values*/
- int loopcounter;
- int currentOptsArrayCount = [currentOptsArray count];
+ NSUInteger loopcounter;
+ NSUInteger currentOptsArrayCount = [currentOptsArray count];
 for (loopcounter = 0; loopcounter < currentOptsArrayCount; loopcounter++)
 {
 thisOpt = [currentOptsArray objectAtIndex:loopcounter];
@@ -1310,7 +1272,6 @@
 already have at least one option=value pair in them. */
 
 optName = [thisOpt substringToIndex:splitOptRange.location];
- optValue = [thisOpt substringFromIndex:splitOptRange.location + 1];
 
 /*If the optNameToChange is found, appropriately change the value or delete it if
 "Unspecified" is set.*/

HandBrake-0.9.9.tar.bz2/macosx/HBAudio.h -> HandBrake-0.10.0.tar.bz2/macosx/HBAudio.h Changed

HandBrake-0.9.9.tar.bz2/macosx/HBAudio.m -> HandBrake-0.10.0.tar.bz2/macosx/HBAudio.m Changed

@@ -10,8 +10,7 @@
 #import "hb.h"
 
 NSString *keyAudioCodecName = @"keyAudioCodecName";
-NSString *keyAudioMP4 = @"keyAudioMP4";
-NSString *keyAudioMKV = @"keyAudioMKV";
+NSString *keyAudioSupportedMuxers = @"keyAudioSupportedMuxers";
 NSString *keyAudioSampleRateName = @"keyAudioSampleRateName";
 NSString *keyAudioBitrateName = @"keyAudioBitrateName";
 NSString *keyAudioMustMatchTrack = @"keyAudioMustMatchTrack";
@@ -42,7 +41,7 @@
 
 while (nil != (dict = [enumerator nextObject]) && !retval)
 {
- if (nil != (aValue = [dict objectForKey: aKey]) && [aValue isEqual: anObject])
+ if (nil != (aValue = dict[aKey]) && [aValue isEqual: anObject])
 {
 retval = dict;
 }
@@ -65,88 +64,64 @@
 #pragma mark -
 #pragma mark Object Setup
 
-+ (void) load
++ (void) initialize
 
 {
 if ([HBAudio class] == self)
 {
- int i, audioMustMatch;
- BOOL muxMKV, muxMP4;
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- NSDictionary *dict;
-
 masterCodecArray = [[NSMutableArray alloc] init]; // knowingly leaked
- for (i = 0; i < hb_audio_encoders_count; i++)
+ for (const hb_encoder_t *audio_encoder = hb_audio_encoder_get_next(NULL);
+ audio_encoder != NULL;
+ audio_encoder = hb_audio_encoder_get_next(audio_encoder))
 {
- if ((hb_audio_encoders[i].encoder & HB_ACODEC_PASS_FLAG) &&
- (hb_audio_encoders[i].encoder != HB_ACODEC_AUTO_PASS))
+ id audioMustMatchTrack;
+ if ((audio_encoder->codec & HB_ACODEC_PASS_FLAG) &&
+ (audio_encoder->codec != HB_ACODEC_AUTO_PASS))
 {
- audioMustMatch = (hb_audio_encoders[i].encoder & ~HB_ACODEC_PASS_FLAG);
+ audioMustMatchTrack = @(audio_encoder->codec &
+ ~HB_ACODEC_PASS_FLAG);
 }
 else
 {
- audioMustMatch = 0;
- }
- muxMKV = (hb_audio_encoders[i].muxers & HB_MUX_MKV) ? YES : NO;
- muxMP4 = (hb_audio_encoders[i].muxers & HB_MUX_MP4) ? YES : NO;
- if (audioMustMatch)
- {
- [masterCodecArray addObject: [NSDictionary dictionaryWithObjectsAndKeys:
- [NSString stringWithUTF8String: hb_audio_encoders[i].human_readable_name], keyAudioCodecName,
- [NSNumber numberWithInt: hb_audio_encoders[i].encoder], keyAudioCodec,
- [NSNumber numberWithBool: muxMP4], keyAudioMP4,
- [NSNumber numberWithBool: muxMKV], keyAudioMKV,
- [NSNumber numberWithInt: audioMustMatch], keyAudioMustMatchTrack,
- nil]];
- }
- else
- {
- [masterCodecArray addObject: [NSDictionary dictionaryWithObjectsAndKeys:
- [NSString stringWithUTF8String: hb_audio_encoders[i].human_readable_name], keyAudioCodecName,
- [NSNumber numberWithInt: hb_audio_encoders[i].encoder], keyAudioCodec,
- [NSNumber numberWithBool: muxMP4], keyAudioMP4,
- [NSNumber numberWithBool: muxMKV], keyAudioMKV,
- [NSNumber numberWithBool: NO], keyAudioMustMatchTrack,
- nil]];
+ audioMustMatchTrack = @NO;
 }
+ [masterCodecArray addObject:@{keyAudioCodecName: @(audio_encoder->name),
+ keyAudioCodec: @(audio_encoder->codec),
+ keyAudioSupportedMuxers: @(audio_encoder->muxers),
+ keyAudioMustMatchTrack: audioMustMatchTrack}];
 }
 
 masterMixdownArray = [[NSMutableArray alloc] init]; // knowingly leaked
- for (i = 0; i < hb_audio_mixdowns_count; i++)
+ for (const hb_mixdown_t *mixdown = hb_mixdown_get_next(NULL);
+ mixdown != NULL;
+ mixdown = hb_mixdown_get_next(mixdown))
 {
- [masterMixdownArray addObject: [NSDictionary dictionaryWithObjectsAndKeys:
- [NSString stringWithUTF8String: hb_audio_mixdowns[i].human_readable_name], keyAudioMixdownName,
- [NSNumber numberWithInt: hb_audio_mixdowns[i].amixdown], keyAudioMixdown,
- nil]];
+ [masterMixdownArray addObject:@{keyAudioMixdownName: @(mixdown->name),
+ keyAudioMixdown: @(mixdown->amixdown)}];
 }
 
 // Note that for the Auto value we use 0 for the sample rate because our controller will give back the track's
 // input sample rate when it finds this 0 value as the selected sample rate. We do this because the input
 // sample rate depends on the track, which means it depends on the title, so cannot be nicely set up here.
 masterSampleRateArray = [[NSMutableArray alloc] init]; // knowingly leaked
- [masterSampleRateArray addObject: [NSDictionary dictionaryWithObjectsAndKeys:
- NSLocalizedString(@"Auto", @"Auto"), keyAudioSampleRateName,
- [NSNumber numberWithInt: 0], keyAudioSamplerate,
- nil]];
- for (i = 0; i < hb_audio_rates_count; i++)
+ [masterSampleRateArray addObject:@{keyAudioSampleRateName: @"Auto",
+ keyAudioSamplerate: @0}];
+ for (const hb_rate_t *audio_samplerate = hb_audio_samplerate_get_next(NULL);
+ audio_samplerate != NULL;
+ audio_samplerate = hb_audio_samplerate_get_next(audio_samplerate))
 {
- [masterSampleRateArray addObject: [NSDictionary dictionaryWithObjectsAndKeys:
- [NSString stringWithUTF8String: hb_audio_rates[i].string], keyAudioSampleRateName,
- [NSNumber numberWithInt: hb_audio_rates[i].rate], keyAudioSamplerate,
- nil]];
+ [masterSampleRateArray addObject:@{keyAudioSampleRateName: @(audio_samplerate->name),
+ keyAudioSamplerate: @(audio_samplerate->rate)}];
 }
 
 masterBitRateArray = [[NSMutableArray alloc] init]; // knowingly leaked
- for (i = 0; i < hb_audio_bitrates_count; i++)
+ for (const hb_rate_t *audio_bitrate = hb_audio_bitrate_get_next(NULL);
+ audio_bitrate != NULL;
+ audio_bitrate = hb_audio_bitrate_get_next(audio_bitrate))
 {
- dict = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSString stringWithUTF8String: hb_audio_bitrates[i].string], keyAudioBitrateName,
- [NSNumber numberWithInt: hb_audio_bitrates[i].rate], keyAudioBitrate,
- nil];
- [masterBitRateArray addObject: dict];
+ [masterBitRateArray addObject:@{keyAudioBitrateName: @(audio_bitrate->name),
+ keyAudioBitrate: @(audio_bitrate->rate)}];
 }
-
- [pool release];
 }
 }
 
@@ -156,40 +131,26 @@
 
 {
 NSMutableArray *permittedCodecs = [NSMutableArray array];
- unsigned int count = [masterCodecArray count];
+ NSUInteger count = [masterCodecArray count];
 NSDictionary *dict;
- NSString *keyThatAllows = nil;
-
- // Determine which key we use to see which codecs are permitted
- switch ([videoContainerTag intValue])
- {
- case HB_MUX_MP4:
- keyThatAllows = keyAudioMP4;
- break;
- case HB_MUX_MKV:
- keyThatAllows = keyAudioMKV;
- break;
- default:
- keyThatAllows = @"error condition";
- break;
- }
 
 // First get a list of the permitted codecs based on the internal rules
- if (nil != track && [self enabled])
+ if (nil != self.track && self.enabled)
 {
 BOOL goodToAdd;
 
 for (unsigned int i = 0; i < count; i++)
 {
- dict = [masterCodecArray objectAtIndex: i];
+ dict = masterCodecArray[i];
 
 // First make sure only codecs permitted by the container are here
- goodToAdd = [[dict objectForKey: keyThatAllows] boolValue];
+ goodToAdd = !!([dict[keyAudioSupportedMuxers] intValue] &
+ [self.videoContainerTag intValue]);
 
 // Now we make sure if DTS or AC3 is not available in the track it is not put in the codec list, but in a general way
- if ([[dict objectForKey: keyAudioMustMatchTrack] boolValue])
+ if ([dict[keyAudioMustMatchTrack] boolValue])
 {
- if ([[dict objectForKey: keyAudioMustMatchTrack] intValue] != [[[self track] objectForKey: keyAudioInputCodec] intValue])
+ if ([dict[keyAudioMustMatchTrack] intValue] != [self.track[keyAudioInputCodec] intValue])
 {
 goodToAdd = NO;
 }
@@ -206,15 +167,15 @@
 [self setCodecs: permittedCodecs];
 
 // Ensure our codec is on the list of permitted codecs
- if (![self codec] || ![permittedCodecs containsObject: [self codec]])
+ if (!self.codec || ![permittedCodecs containsObject: self.codec])
 {
 if (0 < [permittedCodecs count])
 {
- [self setCodec: [permittedCodecs objectAtIndex: 0]]; // This should be defaulting to Core Audio
+ self.codec = permittedCodecs[0]; // This should be defaulting to Core Audio
 }
 else
 {
- [self setCodec: nil];
+ self.codec = nil;
 }
 }
 }
@@ -226,15 +187,15 @@
 NSDictionary *dict;
 int currentMixdown;
 
- unsigned long long channelLayout = [[track objectForKey: keyAudioInputChannelLayout] unsignedLongLongValue];
- unsigned int count = [masterMixdownArray count];
- int codecCodec = [[codec objectForKey: keyAudioCodec] intValue];
- int theDefaultMixdown = hb_get_default_mixdown(codecCodec, channelLayout);
+ unsigned long long channelLayout = [self.track[keyAudioInputChannelLayout] unsignedLongLongValue];
+ NSUInteger count = [masterMixdownArray count];
+ int codecCodec = [self.codec[keyAudioCodec] intValue];
+ int theDefaultMixdown = hb_mixdown_get_default(codecCodec, channelLayout);
 
 for (unsigned int i = 0; i < count; i++)
 {
- dict = [masterMixdownArray objectAtIndex: i];
- currentMixdown = [[dict objectForKey: keyAudioMixdown] intValue];
+ dict = masterMixdownArray[i];
+ currentMixdown = [dict[keyAudioMixdown] intValue];
 
 if (hb_mixdown_is_supported(currentMixdown, codecCodec, channelLayout))
 {
@@ -242,24 +203,24 @@
 }
 }
 
- if (![self enabled])
+ if (!self.enabled)
 {
 permittedMixdowns = nil;
 }
 
 // Now make sure the permitted list and the actual ones matches
- [self setMixdowns: permittedMixdowns];
+ self.mixdowns = permittedMixdowns;
 
 // Select the proper one
 if (shouldSetDefault)
 {
- [self setMixdown: [permittedMixdowns dictionaryWithObject: [NSNumber numberWithInt: theDefaultMixdown]
- matchingKey: keyAudioMixdown]];
+ self.mixdown = [permittedMixdowns dictionaryWithObject: @(theDefaultMixdown)
+ matchingKey: keyAudioMixdown];
 }
 
- if (![self mixdown] || ![permittedMixdowns containsObject: [self mixdown]])
+ if (!self.mixdown || ![permittedMixdowns containsObject: self.mixdown])
 {
- [self setMixdown: [permittedMixdowns lastObject]];
+ self.mixdown = [permittedMixdowns lastObject];
 }
 }
 
@@ -273,51 +234,47 @@
 int currentBitRate;
 BOOL shouldAdd;
 
- unsigned int count = [masterBitRateArray count];
- int trackInputBitRate = [[[self track] objectForKey: keyAudioInputBitrate] intValue];
- int theSampleRate = [[[self sampleRate] objectForKey: keyAudioSamplerate] intValue];
+ NSUInteger count = [masterBitRateArray count];
+ int trackInputBitRate = [self.track[keyAudioInputBitrate] intValue];
+ int theSampleRate = [self.sampleRate[keyAudioSamplerate] intValue];
 
 if (0 == theSampleRate) // this means Auto
 {
- theSampleRate = [[[self track] objectForKey: keyAudioInputSampleRate] intValue];
+ theSampleRate = [self.track[keyAudioInputSampleRate] intValue];
 }
 
- int ourCodec = [[codec objectForKey: keyAudioCodec] intValue];
- int ourMixdown = [[[self mixdown] objectForKey: keyAudioMixdown] intValue];
- hb_get_audio_bitrate_limits(ourCodec, theSampleRate, ourMixdown, &minBitRate, &maxBitRate);
- int theDefaultBitRate = hb_get_default_audio_bitrate(ourCodec, theSampleRate, ourMixdown);
+ int ourCodec = [self.codec[keyAudioCodec] intValue];
+ int ourMixdown = [self.mixdown[keyAudioMixdown] intValue];
+ int theDefaultBitRate = hb_audio_bitrate_get_default(ourCodec, theSampleRate, ourMixdown);
+ hb_audio_bitrate_get_limits(ourCodec, theSampleRate, ourMixdown, &minBitRate, &maxBitRate);
 
- BOOL codecIsPassthru = ([[codec objectForKey: keyAudioCodec] intValue] & HB_ACODEC_PASS_FLAG) ? YES : NO;
+ BOOL codecIsPassthru = ([self.codec[keyAudioCodec] intValue] & HB_ACODEC_PASS_FLAG) ? YES : NO;
 BOOL codecIsLossless = (theDefaultBitRate == -1) ? YES : NO;
 
 if (codecIsPassthru)
 {
- NSDictionary *sourceBitRate = [masterBitRateArray dictionaryWithObject: [NSNumber numberWithInt: trackInputBitRate]
+ NSDictionary *sourceBitRate = [masterBitRateArray dictionaryWithObject: @(trackInputBitRate)
 matchingKey: keyAudioBitrate];
 if (!sourceBitRate)
 {
 // the source bitrate isn't in the master array - create it
- sourceBitRate = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSString stringWithFormat: @"%d", trackInputBitRate], keyAudioBitrateName,
- [NSNumber numberWithInt: trackInputBitRate], keyAudioBitrate,
- nil];
+ sourceBitRate = @{keyAudioBitrateName: [NSString stringWithFormat: @"%d", trackInputBitRate],
+ keyAudioBitrate: @(trackInputBitRate)};
 }
 [permittedBitRates addObject: sourceBitRate];
 }
 else if (codecIsLossless)
 {
- NSDictionary *bitRateNotApplicable = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSString stringWithString: @"N/A"], keyAudioBitrateName,
- [NSNumber numberWithInt: -1], keyAudioBitrate,
- nil];
+ NSDictionary *bitRateNotApplicable = @{keyAudioBitrateName: @"N/A",
+ keyAudioBitrate: @-1};
 [permittedBitRates addObject: bitRateNotApplicable];
 }
 else
 {
 for (unsigned int i = 0; i < count; i++)
 {
- dict = [masterBitRateArray objectAtIndex: i];
- currentBitRate = [[dict objectForKey: keyAudioBitrate] intValue];
+ dict = masterBitRateArray[i];
+ currentBitRate = [dict[keyAudioBitrate] intValue];
 
 // First ensure the bitrate falls within range of the codec
 shouldAdd = (currentBitRate >= minBitRate && currentBitRate <= maxBitRate);
@@ -329,13 +286,13 @@
 }
 }
 
- if (![self enabled])
+ if (!self.enabled)
 {
 permittedBitRates = nil;
 }
 
 // Make sure we are updated with the permitted list
- [self setBitRates: permittedBitRates];
+ self.bitRates = permittedBitRates;
 
 // Select the proper one
 if (shouldSetDefault)
@@ -343,114 +300,92 @@
 [self setBitRateFromName: [NSString stringWithFormat:@"%d", theDefaultBitRate]];
 }
 
- if (![self bitRate] || ![permittedBitRates containsObject: [self bitRate]])
- {
- [self setBitRate: [permittedBitRates lastObject]];
- }
-}
-
-- (id) init
-
-{
- if (self = [super init])
+ if (!self.bitRate || ![permittedBitRates containsObject: self.bitRate])
 {
- [self addObserver: self forKeyPath: @"videoContainerTag" options: 0 context: NULL];
- [self addObserver: self forKeyPath: @"track" options: NSKeyValueObservingOptionOld context: NULL];
- [self addObserver: self forKeyPath: @"codec" options: 0 context: NULL];
- [self addObserver: self forKeyPath: @"mixdown" options: 0 context: NULL];
- [self addObserver: self forKeyPath: @"sampleRate" options: 0 context: NULL];
+ self.bitRate = [permittedBitRates lastObject];
 }
- return self;
 }
 
 #pragma mark -
 #pragma mark Accessors
 
-@synthesize track;
-@synthesize codec;
-@synthesize mixdown;
-@synthesize sampleRate;
-@synthesize bitRate;
-@synthesize drc;
-@synthesize gain;
-@synthesize videoContainerTag;
-@synthesize controller;
-
-@synthesize codecs;
-@synthesize mixdowns;
-@synthesize bitRates;
-
 - (NSArray *) sampleRates
 {
 return masterSampleRateArray;
 }
 
 - (void) dealloc
-
 {
- [self removeObserver: self forKeyPath: @"videoContainerTag"];
- [self removeObserver: self forKeyPath: @"track"];
- [self removeObserver: self forKeyPath: @"codec"];
- [self removeObserver: self forKeyPath: @"mixdown"];
- [self removeObserver: self forKeyPath: @"sampleRate"];
- [self setTrack: nil];
- [self setCodec: nil];
- [self setMixdown: nil];
- [self setSampleRate: nil];
- [self setBitRate: nil];
- [self setDrc: nil];
- [self setGain: nil];
- [self setVideoContainerTag: nil];
- [self setCodecs: nil];
- [self setMixdowns: nil];
- [self setBitRates: nil];
+ [_track release];
+ [_codec release];
+ [_mixdown release];
+ [_sampleRate release];
+ [_bitRate release];
+ [_drc release];
+ [_gain release];
+ [_videoContainerTag release];
+ [_codecs release];
+ [_mixdowns release];
+ [_bitRates release];
+
 [super dealloc];
 }
 
 #pragma mark -
-#pragma mark KVO
+#pragma mark Setters
 
-- (void) observeValueForKeyPath: (NSString *) keyPath ofObject: (id) object change: (NSDictionary *) change context: (void *) context
+- (void)setVideoContainerTag:(NSNumber *)videoContainerTag
+{
+ [_videoContainerTag autorelease];
+ _videoContainerTag = [videoContainerTag retain];
+ [self updateCodecs];
+}
 
+- (void)setTrack:(NSDictionary *)track
 {
- if ([keyPath isEqualToString: @"videoContainerTag"])
+ NSDictionary *oldValue = _track;
+ _track = [track retain];
+ if (nil != _track)
 {
 [self updateCodecs];
- }
- else if ([keyPath isEqualToString: @"track"])
- {
- if (nil != [self track])
+ [self updateMixdowns: YES];
+ if (self.enabled)
 {
- [self updateCodecs];
- [self updateMixdowns: YES];
- if ([self enabled])
- {
- [self setSampleRate: [[self sampleRates] objectAtIndex: 0]]; // default to Auto
- }
- if ([[controller noneTrack] isEqual: [change objectForKey: NSKeyValueChangeOldKey]])
- {
- [controller switchingTrackFromNone: self];
- }
- if ([[controller noneTrack] isEqual: [self track]])
- {
- [controller settingTrackToNone: self];
- }
+ self.sampleRate = self.sampleRates[0]; // default to Auto
+ }
+ if ([self.controller.noneTrack isEqual: oldValue])
+ {
+ [self.controller switchingTrackFromNone: self];
+ }
+ if ([self.controller.noneTrack isEqual: self.track])
+ {
+ [self.controller settingTrackToNone: self];
 }
 }
- else if ([keyPath isEqualToString: @"codec"])
- {
- [self updateMixdowns: YES];
- [self updateBitRates: YES];
- }
- else if ([keyPath isEqualToString: @"mixdown"])
- {
- [self updateBitRates: YES];
- [[NSNotificationCenter defaultCenter] postNotificationName: HBMixdownChangedNotification object: self];
- }
- else if ([keyPath isEqualToString: @"sampleRate"])
- {
- [self updateBitRates: NO];
- }
+ [oldValue release];
+}
+
+- (void)setCodec:(NSDictionary *)codec
+{
+ [_codec autorelease];
+ _codec = [codec retain];
+ [self updateMixdowns: YES];
+ [self updateBitRates: YES];
+}
+
+- (void)setMixdown:(NSDictionary *)mixdown
+{
+ [_mixdown autorelease];
+ _mixdown = [mixdown retain];
+ [self updateBitRates: YES];
+ [[NSNotificationCenter defaultCenter] postNotificationName: HBMixdownChangedNotification object: self];
+}
+
+- (void)setSampleRate:(NSDictionary *)sampleRate
+{
+ [_sampleRate autorelease];
+ _sampleRate = [sampleRate retain];
+ [self updateBitRates: NO];
 }
 
 #pragma mark -
@@ -459,19 +394,19 @@
 - (void) setTrackFromIndex: (int) aValue
 
 {
- [self setTrack: [self.controller.masterTrackArray dictionaryWithObject: [NSNumber numberWithInt: aValue]
- matchingKey: keyAudioTrackIndex]];
+ self.track = [self.controller.masterTrackArray dictionaryWithObject: @(aValue)
+ matchingKey: keyAudioTrackIndex];
 }
 
 // This returns whether it is able to set the actual codec desired.
 - (BOOL) setCodecFromName: (NSString *) aValue
 
 {
- NSDictionary *dict = [[self codecs] dictionaryWithObject: aValue matchingKey: keyAudioCodecName];
+ NSDictionary *dict = [self.codecs dictionaryWithObject: aValue matchingKey: keyAudioCodecName];
 
 if (nil != dict)
 {
- [self setCodec: dict];
+ self.codec = dict;
 }
 return (nil != dict);
 }
@@ -479,33 +414,33 @@
 - (void) setMixdownFromName: (NSString *) aValue
 
 {
- NSDictionary *dict = [[self mixdowns] dictionaryWithObject: aValue matchingKey: keyAudioMixdownName];
+ NSDictionary *dict = [self.mixdowns dictionaryWithObject: aValue matchingKey: keyAudioMixdownName];
 
 if (nil != dict)
 {
- [self setMixdown: dict];
+ self.mixdown = dict;
 }
 }
 
 - (void) setSampleRateFromName: (NSString *) aValue
 
 {
- NSDictionary *dict = [[self sampleRates] dictionaryWithObject: aValue matchingKey: keyAudioSampleRateName];
+ NSDictionary *dict = [self.sampleRates dictionaryWithObject: aValue matchingKey: keyAudioSampleRateName];
 
 if (nil != dict)
 {
- [self setSampleRate: dict];
+ self.sampleRate = dict;
 }
 }
 
 - (void) setBitRateFromName: (NSString *) aValue
 
 {
- NSDictionary *dict = [[self bitRates] dictionaryWithObject: aValue matchingKey: keyAudioBitrateName];
+ NSDictionary *dict = [self.bitRates dictionaryWithObject: aValue matchingKey: keyAudioBitrateName];
 
 if (nil != dict)
 {
- [self setBitRate: dict];
+ self.bitRate = dict;
 }
 }
 
@@ -513,36 +448,21 @@
 #pragma mark -
 #pragma mark Validation
 
-// Because we have indicated that the binding for the drc validates immediately we can implement the
-// key value binding method to ensure the drc stays in our accepted range.
-- (BOOL) validateDrc: (id *) ioValue error: (NSError *) outError
-
-{
- BOOL retval = YES;
-
- if (nil != *ioValue)
- {
- if (0.0 < [*ioValue floatValue] && 1.0 > [*ioValue floatValue])
- {
- *ioValue = [NSNumber numberWithFloat: 1.0];
- }
- }
-
- return retval;
-}
-
 // Because we have indicated that the binding for the gain validates immediately we can implement the
 // key value binding method to ensure the gain stays in our accepted range.
-
-- (BOOL) validateGain: (id *) ioValue error: (NSError *) outError
+- (BOOL)validateGain:(id *)ioValue error:(NSError *)outError
 {
 BOOL retval = YES;
 
 if (nil != *ioValue)
 {
- if (0.0 < [*ioValue floatValue] && 1.0 > [*ioValue floatValue])
+ if ([*ioValue intValue] < -20)
+ {
+ *ioValue = @(-20);
+ }
+ else if ([*ioValue intValue] > 20)
 {
- *ioValue = [NSNumber numberWithFloat: 0.0];
+ *ioValue = @20;
 }
 }
 
@@ -555,17 +475,17 @@
 - (BOOL) enabled
 
 {
- return (nil != track) ? (![track isEqual: [controller noneTrack]]) : NO;
+ return (nil != self.track) ? (![self.track isEqual: self.controller.noneTrack]) : NO;
 }
 
 - (BOOL) mixdownEnabled
 
 {
- BOOL retval = [self enabled];
+ BOOL retval = self.enabled;
 
 if (retval)
 {
- int myMixdown = [[[self mixdown] objectForKey: keyAudioMixdown] intValue];
+ int myMixdown = [self.mixdown[keyAudioMixdown] intValue];
 if (myMixdown == HB_AMIXDOWN_NONE)
 {
 // "None" mixdown (passthru)
@@ -578,12 +498,12 @@
 - (BOOL) bitrateEnabled
 
 {
- BOOL retval = [self enabled];
+ BOOL retval = self.enabled;
 
 if (retval)
 {
- int myCodecCodec = [[[self codec] objectForKey: keyAudioCodec] intValue];
- int myCodecDefaultBitrate = hb_get_default_audio_bitrate(myCodecCodec, 0, 0);
+ int myCodecCodec = [self.codec[keyAudioCodec] intValue];
+ int myCodecDefaultBitrate = hb_audio_bitrate_get_default(myCodecCodec, 0, 0);
 if (myCodecDefaultBitrate < 0)
 {
 retval = NO;
@@ -592,16 +512,17 @@
 return retval;
 }
 
-- (BOOL) AC3Enabled
+- (BOOL) DRCEnabled
 
 {
- BOOL retval = [self enabled];
+ BOOL retval = self.enabled;
 
 if (retval)
 {
- int myTrackCodec = [[[self track] objectForKey: keyAudioInputCodec] intValue];
- int myCodecCodec = [[[self codec] objectForKey: keyAudioCodec] intValue];
- if (HB_ACODEC_AC3 != myTrackCodec || HB_ACODEC_AC3_PASS == myCodecCodec)
+ int myTrackParam = [self.track[keyAudioInputCodecParam] intValue];
+ int myTrackCodec = [self.track[keyAudioInputCodec] intValue];
+ int myCodecCodec = [self.codec[keyAudioCodec] intValue];
+ if (!hb_audio_can_apply_drc(myTrackCodec, myTrackParam, myCodecCodec))
 {
 retval = NO;
 }
@@ -612,11 +533,11 @@
 - (BOOL) PassThruDisabled
 
 {
- BOOL retval = [self enabled];
+ BOOL retval = self.enabled;
 
 if (retval)
 {
- int myCodecCodec = [[[self codec] objectForKey: keyAudioCodec] intValue];
+ int myCodecCodec = [self.codec[keyAudioCodec] intValue];
 if (myCodecCodec & HB_ACODEC_PASS_FLAG)
 {
 retval = NO;
@@ -638,7 +559,7 @@
 {
 retval = [NSSet setWithObjects: @"track", @"codec", nil];
 }
- else if ([key isEqualToString: @"AC3Enabled"])
+ else if ([key isEqualToString: @"DRCEnabled"])
 {
 retval = [NSSet setWithObjects: @"track", @"codec", nil];
 }

HandBrake-0.9.9.tar.bz2/macosx/HBAudioController.h -> HandBrake-0.10.0.tar.bz2/macosx/HBAudioController.h Changed

@@ -6,41 +6,39 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import "hb.h"
+#import "HBViewValidation.h"
 
 extern NSString *keyAudioTrackIndex;
 extern NSString *keyAudioTrackName;
 extern NSString *keyAudioInputBitrate;
 extern NSString *keyAudioInputSampleRate;
 extern NSString *keyAudioInputCodec;
+extern NSString *keyAudioInputCodecParam;
 extern NSString *keyAudioInputChannelLayout;
+
 extern NSString *HBMixdownChangedNotification;
 
 @class HBAudio;
-
-@interface HBAudioController : NSObject
-
-{
- id myController;
- NSMutableArray * audioArray; // the configured audio information
- NSArray * masterTrackArray; // the master list of audio tracks from the title
- NSDictionary * noneTrack; // this represents no audio track selection
- NSNumber * videoContainerTag; // initially is the default HB_MUX_MP4
-}
+@class HBAudioDefaults;
+/**
+ * HBAudioController
+ *
+ * Responds to HBContainerChangedNotification and HBTitleChangedNotification notifications.
+ */
+@interface HBAudioController : NSViewController <HBViewValidation>
 
 @property (nonatomic, readonly, retain) NSArray *masterTrackArray;
 @property (nonatomic, readonly) NSDictionary *noneTrack;
-@property (nonatomic, retain) NSNumber *videoContainerTag;
-
-- (void) setHBController: (id) aController;
-- (void) prepareAudioForQueueFileJob: (NSMutableDictionary *) aDict;
-- (void) prepareAudioForJob: (hb_job_t *) aJob;
-- (void) prepareAudioForPreset: (NSMutableArray *) anArray;
-- (void) addTracksFromQueue: (NSMutableDictionary *) aQueue;
-- (void) addTracksFromPreset: (NSMutableDictionary *) aPreset;
-- (void) addAllTracksFromPreset: (NSMutableDictionary *) aPreset;
+
+@property(nonatomic, readonly) HBAudioDefaults *settings;
+
+// Get the list of audio tracks
+@property (readonly, nonatomic, copy) NSArray *audioTracks;
+
+- (void) applySettingsFromPreset:(NSDictionary *)preset;
+- (void) addTracksFromQueue: (NSArray *) queueArray;
+
 - (BOOL) anyCodecMatches: (int) aCodecValue;
-- (void) addNewAudioTrack;
 - (void) settingTrackToNone: (HBAudio *) newNoneTrack;
 - (void) switchingTrackFromNone: (HBAudio *) noLongerNoneTrack;
 
@@ -48,9 +46,9 @@
 
 @interface HBAudioController (KVC)
 
-- (unsigned int) countOfAudioArray;
-- (HBAudio *) objectInAudioArrayAtIndex: (unsigned int) index;
-- (void) insertObject: (HBAudio *) audioObject inAudioArrayAtIndex: (unsigned int) index;
-- (void) removeObjectFromAudioArrayAtIndex: (unsigned int) index;
+- (NSUInteger) countOfAudioArray;
+- (HBAudio *) objectInAudioArrayAtIndex: (NSUInteger) index;
+- (void) insertObject: (HBAudio *) audioObject inAudioArrayAtIndex: (NSUInteger) index;
+- (void) removeObjectFromAudioArrayAtIndex: (NSUInteger) index;
 
 @end

HandBrake-0.9.9.tar.bz2/macosx/HBAudioController.m -> HandBrake-0.10.0.tar.bz2/macosx/HBAudioController.m Changed

@@ -8,23 +8,45 @@
 #import "HBAudioController.h"
 #import "Controller.h"
 #import "HBAudio.h"
+#import "HBAudioDefaults.h"
+#import "HBAudioDefaultsController.h"
+#import "HBAudioTrackPreset.h"
 #import "hb.h"
+#include "lang.h"
 
 NSString *keyAudioTrackIndex = @"keyAudioTrackIndex";
 NSString *keyAudioTrackName = @"keyAudioTrackName";
 NSString *keyAudioInputBitrate = @"keyAudioInputBitrate";
 NSString *keyAudioInputSampleRate = @"keyAudioInputSampleRate";
 NSString *keyAudioInputCodec = @"keyAudioInputCodec";
+NSString *keyAudioInputCodecParam = @"keyAudioInputCodecParam";
 NSString *keyAudioInputChannelLayout = @"keyAudioInputChannelLayout";
+NSString *keyAudioTrackLanguageIsoCode = @"keyAudioTrackLanguageIsoCode";
+
 NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
 
 
-@interface HBAudioController ()
+@interface HBAudioController () {
+ IBOutlet NSTableView * fTableView;
+
+ NSMutableArray * audioArray; // the configured audio information
+ NSArray * masterTrackArray; // the master list of audio tracks from the title
+ NSDictionary * noneTrack; // this represents no audio track selection
+}
+
+@property (assign) IBOutlet NSPopUpButton *trackPopup;
+@property (assign) IBOutlet NSButton *configureDefaults;
+@property (assign) IBOutlet NSButton *reloadDefaults;
+@property (nonatomic, readwrite) BOOL enabled;
 
 @property (nonatomic, readwrite, retain) NSArray *masterTrackArray;
+@property (nonatomic, retain) NSNumber *videoContainerTag; // initially is the default HB_MUX_MP4
 
-@end // interface HBAudioController
+// Defaults
+@property (nonatomic, readwrite, retain) HBAudioDefaultsController *defaultsController;
+@property (nonatomic, readwrite, retain) HBAudioDefaults *settings;
 
+@end
 
 @implementation HBAudioController
 
@@ -35,13 +57,18 @@
 @synthesize noneTrack;
 @synthesize videoContainerTag;
 
-- (id) init
-
+- (instancetype)init
 {
- if (self = [super init])
+ self = [super initWithNibName:@"Audio" bundle:nil];
+ if (self)
 {
- [self setVideoContainerTag: [NSNumber numberWithInt: HB_MUX_MP4]];
+ [self setVideoContainerTag: @HB_MUX_MP4];
 audioArray = [[NSMutableArray alloc] init];
+
+ /* register that we are interested in changes made to the video container */
+ NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
+ [center addObserver: self selector: @selector(containerChanged:) name: HBContainerChangedNotification object: nil];
+ [center addObserver: self selector: @selector(titleChanged:) name: HBTitleChangedNotification object: nil];
 }
 return self;
 }
@@ -57,462 +84,324 @@
 [super dealloc];
 }
 
-- (void) setHBController: (id) aController
-
+- (IBAction)addAllAudioTracks:(id)sender
 {
- NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
- myController = aController;
+ [self addTracksFromDefaults:YES];
+}
 
- /* register that we are interested in changes made to the video container */
- [center addObserver: self selector: @selector(containerChanged:) name: HBContainerChangedNotification object: aController];
- [center addObserver: self selector: @selector(titleChanged:) name: HBTitleChangedNotification object: aController];
+- (IBAction)removeAll:(id)sender
+{
+ [self _clearAudioArray];
+ [self switchingTrackFromNone:nil];
 }
 
-- (void) _clearAudioArray
+- (void)setUIEnabled:(BOOL)flag
+{
+ self.enabled = flag;
+ [fTableView setEnabled:flag];
+ [self.trackPopup setEnabled:flag];
+ [self.configureDefaults setEnabled:flag];
+ [self.reloadDefaults setEnabled:flag];
+}
 
+- (BOOL)validateUserInterfaceItem:(id < NSValidatedUserInterfaceItem >)anItem
 {
- while (0 < [self countOfAudioArray])
- {
- [self removeObjectFromAudioArrayAtIndex: 0];
- }
+ return self.enabled;
 }
 
 #pragma mark -
 #pragma mark HBController Support
 
-- (void) prepareAudioForQueueFileJob: (NSMutableDictionary *) aDict
+- (NSArray *)audioTracks
 
 {
- unsigned int audioArrayCount = [self countOfAudioArray];
- for (unsigned int counter = 0; counter < audioArrayCount; counter++)
+ NSMutableArray *tracksArray = [NSMutableArray array];
+
+ NSUInteger audioArrayCount = [self countOfAudioArray];
+ for (NSUInteger counter = 0; counter < audioArrayCount; counter++)
 {
 HBAudio *anAudio = [self objectInAudioArrayAtIndex: counter];
 if ([anAudio enabled])
 {
- NSString *prefix = [NSString stringWithFormat: @"Audio%d", counter + 1];
- NSNumber *sampleRateToUse = ([[[anAudio sampleRate] objectForKey: keyAudioSamplerate] intValue] == 0 ?
- [[anAudio track] objectForKey: keyAudioInputSampleRate] :
- [[anAudio sampleRate] objectForKey: keyAudioSamplerate]);
-
- [aDict setObject: [[anAudio track] objectForKey: keyAudioTrackIndex] forKey: [prefix stringByAppendingString: @"Track"]];
- [aDict setObject: [[anAudio track] objectForKey: keyAudioTrackName] forKey: [prefix stringByAppendingString: @"TrackDescription"]];
- [aDict setObject: [[anAudio codec] objectForKey: keyAudioCodecName] forKey: [prefix stringByAppendingString: @"Encoder"]];
- [aDict setObject: [[anAudio mixdown] objectForKey: keyAudioMixdownName] forKey: [prefix stringByAppendingString: @"Mixdown"]];
- [aDict setObject: [[anAudio sampleRate] objectForKey: keyAudioSampleRateName] forKey: [prefix stringByAppendingString: @"Samplerate"]];
- [aDict setObject: [[anAudio bitRate] objectForKey: keyAudioBitrateName] forKey: [prefix stringByAppendingString: @"Bitrate"]];
+ NSMutableDictionary *dict = [NSMutableDictionary dictionary];
+ NSNumber *sampleRateToUse = ([anAudio.sampleRate[keyAudioSamplerate] intValue] == 0 ?
+ anAudio.track[keyAudioInputSampleRate] :
+ anAudio.sampleRate[keyAudioSamplerate]);
+
+ dict[@"Track"] = @([anAudio.track[keyAudioTrackIndex] intValue] -1);
+ dict[@"TrackDescription"] = anAudio.track[keyAudioTrackName];
+ dict[@"Encoder"] = anAudio.codec[keyAudioCodecName];
+ dict[@"Mixdown"] = anAudio.mixdown[keyAudioMixdownName];
+ dict[@"Samplerate"] = anAudio.sampleRate[keyAudioSampleRateName];
+ dict[@"Bitrate"] = anAudio.bitRate[keyAudioBitrateName];
 
 // output is not passthru so apply gain
- if (!([[[anAudio codec] objectForKey: keyAudioCodec] intValue] & HB_ACODEC_PASS_FLAG))
+ if (!([[anAudio codec][keyAudioCodec] intValue] & HB_ACODEC_PASS_FLAG))
 {
- [aDict setObject: [anAudio gain] forKey: [prefix stringByAppendingString: @"TrackGainSlider"]];
+ dict[@"TrackGainSlider"] = anAudio.gain;
 }
 else
 {
 // output is passthru - the Gain dial is disabled so don't apply its value
- [aDict setObject: [NSNumber numberWithInt:0] forKey: [prefix stringByAppendingString: @"TrackGainSlider"]];
+ dict[@"TrackGainSlider"] = @0;
 }
 
- if ((HB_ACODEC_AC3 == [[[anAudio track] objectForKey: keyAudioInputCodec] intValue]) &&
- (HB_ACODEC_AC3_PASS != [[[anAudio codec] objectForKey: keyAudioCodec] intValue]))
+ if (hb_audio_can_apply_drc([anAudio.track[keyAudioInputCodec] intValue],
+ [anAudio.track[keyAudioInputCodecParam] intValue],
+ [anAudio.codec[keyAudioCodec] intValue]))
 {
- [aDict setObject: [anAudio drc] forKey: [prefix stringByAppendingString: @"TrackDRCSlider"]];
+ dict[@"TrackDRCSlider"] = anAudio.drc;
 }
 else
 {
 // source isn't AC3 or output is passthru - the DRC dial is disabled so don't apply its value
- [aDict setObject: [NSNumber numberWithInt:0] forKey: [prefix stringByAppendingString: @"TrackDRCSlider"]];
+ dict[@"TrackDRCSlider"] = @0;
 }
 
- prefix = [NSString stringWithFormat: @"JobAudio%d", counter + 1];
- [aDict setObject: [[anAudio codec] objectForKey: keyAudioCodec] forKey: [prefix stringByAppendingString: @"Encoder"]];
- [aDict setObject: [[anAudio mixdown] objectForKey: keyAudioMixdown] forKey: [prefix stringByAppendingString: @"Mixdown"]];
- [aDict setObject: sampleRateToUse forKey: [prefix stringByAppendingString: @"Samplerate"]];
- [aDict setObject: [[anAudio bitRate] objectForKey: keyAudioBitrate] forKey: [prefix stringByAppendingString: @"Bitrate"]];
- }
- }
-}
-
-- (void) prepareAudioForJob: (hb_job_t *) aJob
-
-{
- unsigned int i;
-
- // First clear out any audio tracks in the job currently
- int audiotrack_count = hb_list_count(aJob->list_audio);
- for(i = 0; i < audiotrack_count; i++)
+ dict[@"JobEncoder"] = anAudio.codec[keyAudioCodec];
+ dict[@"JobMixdown"] = anAudio.mixdown[keyAudioMixdown];
+ dict[@"JobSamplerate"] = sampleRateToUse;
+ dict[@"JobBitrate"] = anAudio.bitRate[keyAudioBitrate];
 
- {
- hb_audio_t *temp_audio = (hb_audio_t *) hb_list_item(aJob->list_audio, 0);
- hb_list_rem(aJob->list_audio, temp_audio);
- }
-
- // Now add audio tracks based on the current settings
- unsigned int audioArrayCount = [self countOfAudioArray];
- for (i = 0; i < audioArrayCount; i++)
- {
- HBAudio *anAudio = [self objectInAudioArrayAtIndex:i];
- if ([anAudio enabled])
- {
- NSNumber *sampleRateToUse = ([[[anAudio sampleRate] objectForKey:keyAudioSamplerate] intValue] == 0 ?
- [[anAudio track] objectForKey:keyAudioInputSampleRate] :
- [[anAudio sampleRate] objectForKey:keyAudioSamplerate]);
-
- hb_audio_config_t *audio = (hb_audio_config_t*)calloc(1, sizeof(*audio));
- hb_audio_config_init(audio);
- audio->in.track = [[[anAudio track] objectForKey:keyAudioTrackIndex] intValue] - 1;
- /* We go ahead and assign values to our audio->out.<properties> */
- audio->out.track = audio->in.track;
- audio->out.codec = [[[anAudio codec] objectForKey:keyAudioCodec] intValue];
- audio->out.compression_level = hb_get_default_audio_compression(audio->out.codec);
- audio->out.mixdown = [[[anAudio mixdown] objectForKey:keyAudioMixdown] intValue];
- audio->out.normalize_mix_level = 0;
- audio->out.bitrate = [[[anAudio bitRate] objectForKey:keyAudioBitrate] intValue];
- audio->out.samplerate = [sampleRateToUse intValue];
- audio->out.dynamic_range_compression = [[anAudio drc] floatValue];
- audio->out.gain = [[anAudio gain] floatValue];
- audio->out.dither_method = hb_audio_dither_get_default();
-
- hb_audio_add(aJob, audio);
- free(audio);
+ [tracksArray addObject:dict];
 }
 }
-}
-
-- (void) prepareAudioForPreset: (NSMutableArray *) anArray
-
-{
- unsigned int audioArrayCount = [self countOfAudioArray];
- unsigned int i;
 
- for (i = 0; i < audioArrayCount; i++)
- {
- HBAudio *anAudio = [self objectInAudioArrayAtIndex: i];
- if ([anAudio enabled])
- {
- NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithCapacity: 7];
- [dict setObject: [[anAudio track] objectForKey: keyAudioTrackIndex] forKey: @"AudioTrack"];
- [dict setObject: [[anAudio track] objectForKey: keyAudioTrackName] forKey: @"AudioTrackDescription"];
- [dict setObject: [[anAudio codec] objectForKey: keyAudioCodecName] forKey: @"AudioEncoder"];
- [dict setObject: [[anAudio mixdown] objectForKey: keyAudioMixdownName] forKey: @"AudioMixdown"];
- [dict setObject: [[anAudio sampleRate] objectForKey: keyAudioSampleRateName] forKey: @"AudioSamplerate"];
- [dict setObject: [[anAudio bitRate] objectForKey: keyAudioBitrateName] forKey: @"AudioBitrate"];
- [dict setObject: [anAudio drc] forKey: @"AudioTrackDRCSlider"];
- [dict setObject: [anAudio gain] forKey: @"AudioTrackGainSlider"];
- [anArray addObject: dict];
- [dict release];
- }
- }
+ return tracksArray;
 }
 
-- (void) addTracksFromQueue: (NSMutableDictionary *) aQueue
+- (void) addTracksFromQueue: (NSArray *) queueArray
 
 {
- NSString *base;
- int value;
- int maximumNumberOfAllowedAudioTracks = [HBController maximumNumberOfAllowedAudioTracks];
-
 // Reinitialize the configured list of audio tracks
 [self _clearAudioArray];
 
 // The following is the pattern to follow, but with Audio%dTrack being the key to seek...
 // Can we assume that there will be no skip in the data?
- for (unsigned int i = 1; i <= maximumNumberOfAllowedAudioTracks; i++)
+ for (NSDictionary *audioDict in queueArray)
 {
- base = [NSString stringWithFormat: @"Audio%d", i];
- value = [[aQueue objectForKey: [base stringByAppendingString: @"Track"]] intValue];
- if (0 < value)
- {
- HBAudio *newAudio = [[HBAudio alloc] init];
- [newAudio setController: self];
- [self insertObject: newAudio inAudioArrayAtIndex: [self countOfAudioArray]];
- [newAudio setVideoContainerTag: [self videoContainerTag]];
- [newAudio setTrackFromIndex: value];
- [newAudio setCodecFromName: [aQueue objectForKey: [base stringByAppendingString: @"Encoder"]]];
- [newAudio setMixdownFromName: [aQueue objectForKey: [base stringByAppendingString: @"Mixdown"]]];
- [newAudio setSampleRateFromName: [aQueue objectForKey: [base stringByAppendingString: @"Samplerate"]]];
- [newAudio setBitRateFromName: [aQueue objectForKey: [base stringByAppendingString: @"Bitrate"]]];
- [newAudio setDrc: [aQueue objectForKey: [base stringByAppendingString: @"TrackDRCSlider"]]];
- [newAudio setGain: [aQueue objectForKey: [base stringByAppendingString: @"TrackGainSlider"]]];
- [newAudio release];
- }
+ HBAudio *newAudio = [[HBAudio alloc] init];
+ [newAudio setController: self];
+ [self insertObject: newAudio inAudioArrayAtIndex: [self countOfAudioArray]];
+ [newAudio setVideoContainerTag: [self videoContainerTag]];
+ [newAudio setTrackFromIndex: [audioDict[@"Track"] intValue] + 1];
+ [newAudio setCodecFromName: audioDict[@"Encoder"]];
+ [newAudio setMixdownFromName: audioDict[@"Mixdown"]];
+ [newAudio setSampleRateFromName: audioDict[@"Samplerate"]];
+ [newAudio setBitRateFromName: audioDict[@"Bitrate"]];
+ [newAudio setDrc: audioDict[@"TrackDRCSlider"]];
+ [newAudio setGain: audioDict[@"TrackGainSlider"]];
+ [newAudio release];
 }
 
 [self switchingTrackFromNone: nil]; // see if we need to add one to the list
 }
 
-// This routine takes the preset and will return the value for the key AudioList
-// if it exists, otherwise it creates an array from the data in the present.
-- (NSArray *) _presetAudioArrayFromPreset: (NSMutableDictionary *) aPreset
-
+- (void)applySettingsFromPreset:(NSDictionary *)preset
 {
- NSArray *retval = [aPreset objectForKey: @"AudioList"];
+ self.settings = [[[HBAudioDefaults alloc] init] autorelease];
+ [self.settings applySettingsFromPreset:preset];
+ [self.settings validateEncoderFallbackForVideoContainer:[self.videoContainerTag intValue]];
 
- if (!retval)
+ [self addTracksFromDefaults:NO];
+}
+
+- (void) _clearAudioArray
+{
+ while (0 < [self countOfAudioArray])
 {
- int maximumNumberOfAllowedAudioTracks = [HBController maximumNumberOfAllowedAudioTracks];
- NSString *base;
- NSMutableArray *whatToUse = [NSMutableArray array];
- for (unsigned int i = 1; i <= maximumNumberOfAllowedAudioTracks; i++)
- {
- base = [NSString stringWithFormat: @"Audio%d", i];
- if (nil != [aPreset objectForKey: [base stringByAppendingString: @"Track"]])
- {
- [whatToUse addObject: [NSDictionary dictionaryWithObjectsAndKeys:
- [aPreset objectForKey: [base stringByAppendingString: @"Encoder"]], @"AudioEncoder",
- [aPreset objectForKey: [base stringByAppendingString: @"Mixdown"]], @"AudioMixdown",
- [aPreset objectForKey: [base stringByAppendingString: @"Samplerate"]], @"AudioSamplerate",
- [aPreset objectForKey: [base stringByAppendingString: @"Bitrate"]], @"AudioBitrate",
- [aPreset objectForKey: [base stringByAppendingString: @"TrackDRCSlider"]], @"AudioTrackDRCSlider",
- [aPreset objectForKey: [base stringByAppendingString: @"TrackGainSlider"]], @"AudioTrackGainSlider",
- nil]];
- }
- }
- retval = whatToUse;
+ [self removeObjectFromAudioArrayAtIndex: 0];
 }
- return retval;
 }
 
-// This uses the templateAudioArray from the preset to create the audios for the specified trackIndex
-- (void) _processPresetAudioArray: (NSArray *) templateAudioArray forTrack: (unsigned int) trackIndex andType: (int) aType
+/**
+ * Uses the templateAudioArray from the preset to create the audios for the specified trackIndex.
+ *
+ * @param templateAudioArray the track template.
+ * @param trackIndex the index of the source track.
+ * @param firstOnly use only the first track of the template or all.
+ */
+- (void) _processPresetAudioArray: (NSArray *) templateAudioArray forTrack: (NSUInteger) trackIndex firstOnly: (BOOL) firstOnly
 
 {
- NSEnumerator *enumerator = [templateAudioArray objectEnumerator];
- NSMutableDictionary *dict;
- NSString *key;
- int maximumNumberOfAllowedAudioTracks = [HBController maximumNumberOfAllowedAudioTracks];
-
- while (nil != (dict = [enumerator nextObject]))
+ for (HBAudioTrackPreset *preset in templateAudioArray)
 {
- // copy the dictionary since we may need to alter it
- dict = [NSMutableDictionary dictionaryWithDictionary:dict];
-
- if ([self countOfAudioArray] < maximumNumberOfAllowedAudioTracks)
+ BOOL fallenBack = NO;
+ HBAudio *newAudio = [[HBAudio alloc] init];
+ [newAudio setController: self];
+ [self insertObject: newAudio inAudioArrayAtIndex: [self countOfAudioArray]];
+ [newAudio setVideoContainerTag: [self videoContainerTag]];
+ [newAudio setTrackFromIndex: (int)trackIndex];
+ 
+ const char *name = hb_audio_encoder_get_name(preset.encoder);
+ NSString *audioEncoder = nil;
+ 
+ // Check if we need to use a fallback
+ if (name)
 {
- BOOL fallenBack = NO;
- HBAudio *newAudio = [[HBAudio alloc] init];
- [newAudio setController: self];
- [self insertObject: newAudio inAudioArrayAtIndex: [self countOfAudioArray]];
- [newAudio setVideoContainerTag: [self videoContainerTag]];
- [newAudio setTrackFromIndex: trackIndex];
-
- key = [dict objectForKey: @"AudioEncoder"];
-
- // map faac to ca_aac for built-in presets (can be disabled in preferences)
- if (0 == aType &&
- [[NSUserDefaults standardUserDefaults] boolForKey: @"UseCoreAudio"] &&
- [key isEqualToString: @"AAC (faac)"])
+ audioEncoder = @(name);
+ if (preset.encoder & HB_ACODEC_PASS_FLAG &&
+ ![newAudio setCodecFromName:audioEncoder])
 {
- [dict setObject: @"AAC (CoreAudio)" forKey: @"AudioEncoder"];
- }
-
- // passthru fallbacks
- if ([key isEqualToString: @"AAC Passthru"])
- {
- if (![newAudio setCodecFromName: key])
- {
- [dict setObject: @"AAC (CoreAudio)" forKey: @"AudioEncoder"];
- fallenBack = YES;
- }
- }
- else if ([key isEqualToString: @"AC3 Passthru"])
- {
- if (![newAudio setCodecFromName: key])
- {
- [dict setObject: @"AC3 (ffmpeg)" forKey: @"AudioEncoder"];
- fallenBack = YES;
- }
- }
- else if ([key isEqualToString: @"MP3 Passthru"])
- {
- if (![newAudio setCodecFromName: key])
+ int passthru, fallback;
+ fallenBack = YES;
+ passthru = hb_audio_encoder_get_from_name([audioEncoder UTF8String]);
+ fallback = hb_audio_encoder_get_fallback_for_passthru(passthru);
+ name = hb_audio_encoder_get_name(fallback);
+ 
+ // If we couldn't find an encoder for the passthru format
+ // fall back to the selected encoder fallback
+ if (name == NULL)
 {
- [dict setObject: @"MP3 (lame)" forKey: @"AudioEncoder"];
- fallenBack = YES;
+ name = hb_audio_encoder_get_name(self.settings.encoderFallback);
 }
 }
-
- // map legacy encoder names
- if ([key isEqualToString: @"AC3"])
- {
- [dict setObject: @"AC3 (ffmpeg)" forKey: @"AudioEncoder"];
- }
-
- // If our preset does not contain a drc or gain value set it to a default of 0.0
- if (![dict objectForKey: @"AudioTrackDRCSlider"])
- {
- [dict setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
- }
- if (![dict objectForKey: @"AudioTrackGainSlider"])
+ else
 {
- [dict setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
+ name = hb_audio_encoder_sanitize_name([audioEncoder UTF8String]);
 }
-
- // map legacy mixdowns
- key = [dict objectForKey: @"AudioMixdown"];
- if ([key isEqualToString: @"AC3 Passthru"] ||
- [key isEqualToString: @"DTS Passthru"] ||
- [key isEqualToString: @"DTS-HD Passthru"])
+ audioEncoder = @(name);
+ }
+ 
+ // If our preset wants us to support a codec that the track does not support, instead
+ // of changing the codec we remove the audio instead.
+ if ([newAudio setCodecFromName:audioEncoder])
+ {
+ const char *mixdown = hb_mixdown_get_name(preset.mixdown);
+ if (mixdown)
 {
- [dict setObject: @"None" forKey: @"AudioMixdown"];
+ [newAudio setMixdownFromName: @(mixdown)];
 }
- else if ([key isEqualToString: @"6-channel discrete"])
+ 
+ const char *sampleRateName = hb_audio_samplerate_get_name(preset.sampleRate);
+ if (!sampleRateName)
 {
- [dict setObject: @"5.1 Channels" forKey: @"AudioMixdown"];
+ [newAudio setSampleRateFromName: @"Auto"];
 }
-
- // If our preset wants us to support a codec that the track does not support, instead
- // of changing the codec we remove the audio instead.
- if ([newAudio setCodecFromName: [dict objectForKey: @"AudioEncoder"]])
+ else
 {
- [newAudio setMixdownFromName: [dict objectForKey: @"AudioMixdown"]];
- [newAudio setSampleRateFromName: [dict objectForKey: @"AudioSamplerate"]];
- if (!fallenBack)
- {
- [newAudio setBitRateFromName: [dict objectForKey: @"AudioBitrate"]];
- }
- [newAudio setDrc: [dict objectForKey: @"AudioTrackDRCSlider"]];
- [newAudio setGain: [dict objectForKey: @"AudioTrackGainSlider"]];
+ [newAudio setSampleRateFromName: @(sampleRateName)];
 }
- else
+ if (!fallenBack)
 {
- [self removeObjectFromAudioArrayAtIndex: [self countOfAudioArray] - 1];
+ [newAudio setBitRateFromName: [NSString stringWithFormat:@"%d", preset.bitRate]];
 }
- [newAudio release];
+ [newAudio setDrc: @(preset.drc)];
+ [newAudio setGain: @(preset.gain)];
+ }
+ else
+ {
+ [self removeObjectFromAudioArrayAtIndex: [self countOfAudioArray] - 1];
+ }
+ [newAudio release];
+ 
+ if (firstOnly)
+ {
+ break;
 }
 }
 }
 
-// This matches the FIRST track with the specified prefix, otherwise it uses the defaultIfNotFound value
-- (unsigned int) _trackWithTitlePrefix: (NSString *) prefix defaultIfNotFound: (unsigned int) defaultIfNotFound
-
+/**
+ * Matches the source audio tracks with the specific language iso code.
+ *
+ * @param isoCode the iso code to match.
+ * @param selectOnlyFirst whether to match only the first track for the iso code.
+ *
+ * @return a NSIndexSet with the index of the matched tracks.
+ */
+- (NSIndexSet *) _tracksWithISOCode: (NSString *) isoCode selectOnlyFirst: (BOOL) selectOnlyFirst
 {
- unsigned int retval = defaultIfNotFound;
- int count = [masterTrackArray count];
- NSString *languageTitle;
- BOOL found = NO;
-
+ NSMutableIndexSet *indexes = [NSMutableIndexSet indexSet];
+ 
 // We search for the prefix noting that our titles have the format %d: %s where the %s is the prefix
- for (unsigned int i = 1; i < count && !found; i++) // Note that we skip the "None" track
- {
- languageTitle = [[masterTrackArray objectAtIndex: i] objectForKey: keyAudioTrackName];
- if ([[languageTitle substringFromIndex: [languageTitle rangeOfString: @" "].location + 1] hasPrefix: prefix])
+ [masterTrackArray enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+ if (idx) // Note that we skip the "None" track
 {
- retval = i;
- found = YES;
+ if ([isoCode isEqualToString:@"und"] || [obj[keyAudioTrackLanguageIsoCode] isEqualToString:isoCode])
+ {
+ [indexes addIndex:idx];
+ 
+ if (selectOnlyFirst)
+ {
+ *stop = YES;
+ }
+ }
 }
- }
- return retval;
-}
+ }];
 
-// When we add a track and we do not have a preset to use for the track we use
-// this bogus preset to do the dirty work.
-- (NSMutableDictionary *) _defaultPreset
+ return indexes;
+}
 
+- (void) _processPresetAudioArray: (NSArray *) templateAudioArray forTracks: (NSIndexSet *) trackIndexes firstOnly: (BOOL) firstOnly
 {
- static NSMutableDictionary *retval = nil;
-
- if (!retval)
- {
- retval = [[NSMutableDictionary dictionaryWithObjectsAndKeys:
- [NSArray arrayWithObject:
- [NSDictionary dictionaryWithObjectsAndKeys:
- [NSNumber numberWithInt: 1], @"AudioTrack",
- @"AAC (faac)", @"AudioEncoder",
- @"Dolby Pro Logic II", @"AudioMixdown",
- @"Auto", @"AudioSamplerate",
- @"160", @"AudioBitrate",
- [NSNumber numberWithFloat: 0.0], @"AudioTrackDRCSlider",
- [NSNumber numberWithFloat: 0.0], @"AudioTrackGainSlider",
- nil]], @"AudioList", nil] retain];
- }
- return retval;
+ __block BOOL firsTrack = firstOnly;
+ [trackIndexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
+ // Add the track
+ [self _processPresetAudioArray: self.settings.tracksArray forTrack:idx firstOnly:firsTrack];
+ firsTrack = self.settings.secondaryEncoderMode ? YES : NO;
+ }];
 }
 
-- (void) addTracksFromPreset: (NSMutableDictionary *) aPreset allTracks: (BOOL) allTracks
+- (void) addTracksFromDefaults: (BOOL) allTracks
 
 {
- id whatToUse = [self _presetAudioArrayFromPreset: aPreset];
- NSMutableArray *tracksToAdd = [[NSMutableArray alloc] init];
+ BOOL firstTrack = NO;
+ NSMutableIndexSet *tracksAdded = [NSMutableIndexSet indexSet];
+ NSMutableIndexSet *tracksToAdd = [NSMutableIndexSet indexSet];
 
- NSArray* preferredLanguages = [NSArray arrayWithObjects: 
- [[NSUserDefaults standardUserDefaults] stringForKey: @"DefaultLanguage"],
- [[NSUserDefaults standardUserDefaults] stringForKey: @"AlternateLanguage"],
- nil];
+ // Reinitialize the configured list of audio tracks
+ [self _clearAudioArray];
 
- // Add tracks of Default and Alternate Language by name
- for(id languageName in preferredLanguages)
+ if (self.settings.trackSelectionBehavior != HBAudioTrackSelectionBehaviorNone)
 {
- int trackNumber = [self _trackWithTitlePrefix: languageName defaultIfNotFound: 0];
- 
- if(trackNumber > 0 && [tracksToAdd indexOfObject:[NSNumber numberWithInt:trackNumber]] == NSNotFound)
+ // Add tracks of Default and Alternate Language by name
+ for (NSString *languageISOCode in self.settings.trackSelectionLanguages)
 {
- [tracksToAdd addObject:[NSNumber numberWithInt:trackNumber]];
+ NSMutableIndexSet *tracksIndexes = [[self _tracksWithISOCode: languageISOCode
+ selectOnlyFirst: self.settings.trackSelectionBehavior == HBAudioTrackSelectionBehaviorFirst] mutableCopy];
+ [tracksIndexes removeIndexes:tracksAdded];
+ if (tracksIndexes.count)
+ {
+ [self _processPresetAudioArray:self.settings.tracksArray forTracks:tracksIndexes firstOnly:firstTrack];
+ firstTrack = self.settings.secondaryEncoderMode ? YES : NO;
+ [tracksAdded addIndexes:tracksIndexes];
+ }
+ [tracksIndexes release];
 }
- }
-
- // If no preferred Language was found, add standard track 1
- if([tracksToAdd count] == 0)
- {
- [tracksToAdd addObject:[NSNumber numberWithInt:1]];
- }
 
- // If all tracks should be added, add all track numbers that are not yet processed
- if (allTracks)
- {
- unsigned int count = [masterTrackArray count];
- for (unsigned int i = 1; i < count; i++)
+ // If no preferred Language was found, add standard track 1
+ if (tracksAdded.count == 0 && masterTrackArray.count > 1)
 {
- NSNumber *trackNumber = [NSNumber numberWithInt:i];
- if([tracksToAdd indexOfObject:trackNumber] == NSNotFound)
- {
- [tracksToAdd addObject:trackNumber];
- }
+ [tracksToAdd addIndex:1];
 }
 }
- 
- // Reinitialize the configured list of audio tracks
- [self _clearAudioArray];
 
- for(id trackNumber in tracksToAdd)
+ // If all tracks should be added, add all track numbers that are not yet processed
+ if (allTracks)
 {
- [self _processPresetAudioArray: whatToUse forTrack:[trackNumber intValue] andType: [[aPreset objectForKey: @"Type"] intValue]];
+ [tracksToAdd addIndexesInRange:NSMakeRange(1, masterTrackArray.count - 1)];
+ [tracksToAdd removeIndexes:tracksAdded];
 }
-}
-
-- (void) _ensureAtLeastOneNonEmptyTrackExists
 
-{
- int count = [self countOfAudioArray];
- if (0 == count || ![[self objectInAudioArrayAtIndex: 0] enabled])
+ if (tracksToAdd.count)
 {
- [self addTracksFromPreset: [self _defaultPreset] allTracks: NO];
+ [self _processPresetAudioArray:self.settings.tracksArray forTracks:tracksToAdd firstOnly:firstTrack];
 }
- [self switchingTrackFromNone: nil]; // this ensures there is a None track at the end of the list
-}
-
-- (void) addTracksFromPreset: (NSMutableDictionary *) aPreset
 
-{
- [self addTracksFromPreset: aPreset allTracks: NO];
- [self _ensureAtLeastOneNonEmptyTrackExists];
-}
-
-- (void) addAllTracksFromPreset: (NSMutableDictionary *) aPreset
-
-{
- [self addTracksFromPreset: aPreset allTracks: YES];
- [self _ensureAtLeastOneNonEmptyTrackExists];
+ // Add an None item
+ [self switchingTrackFromNone: nil];
 }
 
 - (BOOL) anyCodecMatches: (int) aCodecValue
 
 {
 BOOL retval = NO;
- unsigned int audioArrayCount = [self countOfAudioArray];
- for (unsigned int i = 0; i < audioArrayCount && !retval; i++)
+ NSUInteger audioArrayCount = [self countOfAudioArray];
+ for (NSUInteger i = 0; i < audioArrayCount && !retval; i++)
 {
 HBAudio *anAudio = [self objectInAudioArrayAtIndex: i];
- if ([anAudio enabled] && aCodecValue == [[[anAudio codec] objectForKey: keyAudioCodec] intValue])
+ if ([anAudio enabled] && aCodecValue == [[anAudio codec][keyAudioCodec] intValue])
 {
 retval = YES;
 }
@@ -528,8 +417,8 @@
 [self insertObject: newAudio inAudioArrayAtIndex: [self countOfAudioArray]];
 [newAudio setVideoContainerTag: [self videoContainerTag]];
 [newAudio setTrack: noneTrack];
- [newAudio setDrc: [NSNumber numberWithFloat: 0.0]];
- [newAudio setGain: [NSNumber numberWithFloat: 0.0]];
+ [newAudio setDrc: @0.0f];
+ [newAudio setGain: @0.0f];
 [newAudio release];
 }
 
@@ -554,26 +443,22 @@
 - (void) switchingTrackFromNone: (HBAudio *) noLongerNoneTrack
 
 {
- int count = [self countOfAudioArray];
+ NSUInteger count = [self countOfAudioArray];
 BOOL needToAdd = NO;
- int maximumNumberOfAllowedAudioTracks = [HBController maximumNumberOfAllowedAudioTracks];
 
- // If there is no last track that is None and we are less than our maximum number of permitted tracks, we add one.
- if (count < maximumNumberOfAllowedAudioTracks)
+ // If there is no last track that is None we add one.
+ if (0 < count)
 {
- if (0 < count)
- {
- HBAudio *lastAudio = [self objectInAudioArrayAtIndex: count - 1];
- if ([lastAudio enabled])
- {
- needToAdd = YES;
- }
- }
- else
+ HBAudio *lastAudio = [self objectInAudioArrayAtIndex: count - 1];
+ if ([lastAudio enabled])
 {
 needToAdd = YES;
 }
 }
+ else
+ {
+ needToAdd = YES;
+ }
 
 if (needToAdd)
 {
@@ -587,25 +472,29 @@
 {
 NSDictionary *notDict = [aNotification userInfo];
 
- [self setVideoContainerTag: [notDict objectForKey: keyContainerTag]];
+ [self setVideoContainerTag: notDict[keyContainerTag]];
 
 // Update each of the instances because this value influences possible settings.
- NSEnumerator *enumerator = [audioArray objectEnumerator];
- HBAudio *audioObject;
-
- while (nil != (audioObject = [enumerator nextObject]))
+ for (HBAudio *audioObject in audioArray)
 {
 [audioObject setVideoContainerTag: [self videoContainerTag]];
 }
+
+ // Update the Auto Passthru Fallback Codec Popup
+ // lets get the tag of the currently selected item first so we might reset it later
+ [self.settings validateEncoderFallbackForVideoContainer:[self.videoContainerTag intValue]];
 }
 
 - (void) titleChanged: (NSNotification *) aNotification
 
 {
 NSDictionary *notDict = [aNotification userInfo];
- NSData *theData = [notDict objectForKey: keyTitleTag];
+ NSData *theData = notDict[keyTitleTag];
 hb_title_t *title = NULL;
 
+ // Reinitialize the configured list of audio tracks
+ [self _clearAudioArray];
+ 
 [theData getBytes: &title length: sizeof(title)];
 if (title)
 {
@@ -616,58 +505,77 @@
 // Reinitialize the master list of available audio tracks from this title
 NSMutableArray *newTrackArray = [NSMutableArray array];
 [noneTrack release];
- noneTrack = [[NSDictionary dictionaryWithObjectsAndKeys:
- [NSNumber numberWithInt: 0], keyAudioTrackIndex,
- NSLocalizedString(@"None", @"None"), keyAudioTrackName,
- [NSNumber numberWithInt: 0], keyAudioInputCodec,
- nil] retain];
+ noneTrack = [@{keyAudioTrackIndex: @0,
+ keyAudioTrackName: NSLocalizedString(@"None", @"None"),
+ keyAudioInputCodec: @0} retain];
 [newTrackArray addObject: noneTrack];
 for (i = 0; i < count; i++)
 {
 audio = (hb_audio_config_t *) hb_list_audio_config_item(list, i);
- [newTrackArray addObject: [NSDictionary dictionaryWithObjectsAndKeys:
- [NSNumber numberWithInt: i + 1], keyAudioTrackIndex,
- [NSString stringWithFormat: @"%d: %s", i, audio->lang.description], keyAudioTrackName,
- [NSNumber numberWithInt: audio->in.bitrate / 1000], keyAudioInputBitrate,
- [NSNumber numberWithInt: audio->in.samplerate], keyAudioInputSampleRate,
- [NSNumber numberWithInt: audio->in.codec], keyAudioInputCodec,
- [NSNumber numberWithUnsignedLongLong: audio->in.channel_layout], keyAudioInputChannelLayout,
- nil]];
+ [newTrackArray addObject: @{keyAudioTrackIndex: @(i + 1),
+ keyAudioTrackName: [NSString stringWithFormat: @"%d: %s", i, audio->lang.description],
+ keyAudioInputBitrate: @(audio->in.bitrate / 1000),
+ keyAudioInputSampleRate: @(audio->in.samplerate),
+ keyAudioInputCodec: [NSNumber numberWithUnsignedInteger: audio->in.codec],
+ keyAudioInputCodecParam: [NSNumber numberWithUnsignedInteger: audio->in.codec_param],
+ keyAudioInputChannelLayout: @(audio->in.channel_layout),
+ keyAudioTrackLanguageIsoCode: @(audio->lang.iso639_2)}];
 }
 self.masterTrackArray = newTrackArray;
+ [self switchingTrackFromNone: nil]; // this ensures there is a None track at the end of the list
 }
-
- // Reinitialize the configured list of audio tracks
- [self _clearAudioArray];
-
- if (![myController hasValidPresetSelected])
+ else
 {
- [self _ensureAtLeastOneNonEmptyTrackExists];
+ self.masterTrackArray = nil;
 }
+
+}
+
+#pragma mark - Defaults
+
+- (IBAction)showSettingsSheet:(id)sender
+{
+ self.defaultsController = [[[HBAudioDefaultsController alloc] initWithSettings:self.settings] autorelease];
+
+	[NSApp beginSheet:[self.defaultsController window]
+ modalForWindow:[[self view] window]
+ modalDelegate:self
+ didEndSelector:@selector(sheetDidEnd)
+ contextInfo:NULL];
+}
+
+- (void)sheetDidEnd
+{
+ self.defaultsController = nil;
+}
+
+- (IBAction)reloadDefaults:(id)sender
+{
+ [self addTracksFromDefaults:NO];
 }
 
 #pragma mark -
 #pragma mark KVC
 
-- (unsigned int) countOfAudioArray
+- (NSUInteger) countOfAudioArray
 
 {
 return [audioArray count];
 }
 
-- (HBAudio *) objectInAudioArrayAtIndex: (unsigned int) index
+- (HBAudio *) objectInAudioArrayAtIndex: (NSUInteger) index
 
 {
- return [audioArray objectAtIndex: index];
+ return audioArray[index];
 }
 
-- (void) insertObject: (HBAudio *) audioObject inAudioArrayAtIndex: (unsigned int) index;
+- (void) insertObject: (HBAudio *) audioObject inAudioArrayAtIndex: (NSUInteger) index;
 
 {
 [audioArray insertObject: audioObject atIndex: index];
 }
 
-- (void) removeObjectFromAudioArrayAtIndex: (unsigned int) index
+- (void) removeObjectFromAudioArrayAtIndex: (NSUInteger) index
 
 {
 [audioArray removeObjectAtIndex: index];

HandBrake-0.10.0.tar.bz2/macosx/HBAudioDefaults.h Added

@@ -0,0 +1,42 @@
+/* HBAudioSettings.h $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import <Foundation/Foundation.h>
+
+typedef NS_ENUM(NSUInteger, HBAudioTrackSelectionBehavior) {
+ HBAudioTrackSelectionBehaviorNone,
+ HBAudioTrackSelectionBehaviorFirst,
+ HBAudioTrackSelectionBehaviorAll,
+};
+
+/**
+ * HBAudioSettings
+ * Stores the audio defaults settings.
+ */
+@interface HBAudioDefaults : NSObject
+
+@property (nonatomic, readwrite) HBAudioTrackSelectionBehavior trackSelectionBehavior;
+@property (nonatomic, readwrite, retain) NSMutableArray *trackSelectionLanguages;
+
+@property (nonatomic, readwrite, retain) NSMutableArray *tracksArray;
+
+@property(nonatomic, readwrite) BOOL allowAACPassthru;
+@property(nonatomic, readwrite) BOOL allowAC3Passthru;
+@property(nonatomic, readwrite) BOOL allowDTSHDPassthru;
+@property(nonatomic, readwrite) BOOL allowDTSPassthru;
+@property(nonatomic, readwrite) BOOL allowMP3Passthru;
+
+@property(nonatomic, readwrite) int encoderFallback;
+@property(nonatomic, readwrite) BOOL secondaryEncoderMode;
+
+@property(nonatomic, readonly) NSArray *audioEncoderFallbacks;
+
+- (void)applySettingsFromPreset:(NSDictionary *)preset;
+- (void)prepareAudioDefaultsForPreset:(NSMutableDictionary *)preset;
+
+- (void)validateEncoderFallbackForVideoContainer:(int)container;
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBAudioDefaults.m Added

@@ -0,0 +1,243 @@
+/* HBAudioSettings.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBAudioDefaults.h"
+#import "HBAudioTrackPreset.h"
+#import "hb.h"
+#import "lang.h"
+
+@interface HBAudioDefaults ()
+
+@property (nonatomic, readwrite) int container;
+
+@end
+
+@implementation HBAudioDefaults
+
+- (instancetype)init
+{
+ self = [super init];
+ if (self) {
+ _encoderFallback = HB_ACODEC_AC3;
+ _trackSelectionLanguages = [[NSMutableArray alloc] init];
+ _tracksArray = [[NSMutableArray alloc] init];
+ _trackSelectionBehavior = HBAudioTrackSelectionBehaviorFirst;
+ _container = HB_MUX_MKV;
+ }
+ return self;
+}
+
+- (void)dealloc
+{
+ [_trackSelectionLanguages release];
+ [_tracksArray release];
+ [super dealloc];
+}
+
+- (NSArray *)audioEncoderFallbacks
+{
+ NSMutableArray *fallbacks = [[NSMutableArray alloc] init];
+ for (const hb_encoder_t *audio_encoder = hb_audio_encoder_get_next(NULL);
+ audio_encoder != NULL;
+ audio_encoder = hb_audio_encoder_get_next(audio_encoder))
+ {
+ if ((audio_encoder->codec & HB_ACODEC_PASS_FLAG) == 0 &&
+ (audio_encoder->muxers & self.container))
+ {
+ [fallbacks addObject:@(audio_encoder->name)];
+ }
+ }
+ return [fallbacks autorelease];
+}
+
+- (NSString *)isoCodeForNativeLang:(NSString *)language
+{
+ const iso639_lang_t *lang = lang_get_next(NULL);
+ for (lang = lang_get_next(lang); lang != NULL; lang = lang_get_next(lang))
+ {
+ NSString *nativeLanguage = strlen(lang->native_name) ? @(lang->native_name) : @(lang->eng_name);
+
+ if ([language isEqualToString:nativeLanguage])
+ {
+ return @(lang->iso639_2);
+ }
+ }
+
+ return nil;
+}
+
+- (void)applySettingsFromPreset:(NSDictionary *)preset
+{
+ // Track selection behavior
+ if ([preset[@"AudioTrackSelectionBehavior"] isEqualToString:@"first"])
+ {
+ self.trackSelectionBehavior = HBAudioTrackSelectionBehaviorFirst;
+ }
+ else if ([preset[@"AudioTrackSelectionBehavior"] isEqualToString:@"all"])
+ {
+ self.trackSelectionBehavior = HBAudioTrackSelectionBehaviorAll;
+ }
+ else if ([preset[@"AudioTrackSelectionBehavior"] isEqualToString:@"none"])
+ {
+ self.trackSelectionBehavior = HBAudioTrackSelectionBehaviorNone;
+ }
+ else
+ {
+ // Keep the previous behavior for the old presets
+ self.trackSelectionBehavior = HBAudioTrackSelectionBehaviorFirst;
+ }
+ self.trackSelectionLanguages = [NSMutableArray arrayWithArray:preset[@"AudioLanguageList"]];
+
+ // If the preset is one of the built in, set some additional options
+ if ([preset[@"Type"] intValue] == 0)
+ {
+ self.trackSelectionBehavior = HBAudioTrackSelectionBehaviorFirst;
+ if (self.trackSelectionLanguages.count == 0)
+ {
+ if ([[NSUserDefaults standardUserDefaults] stringForKey:@"DefaultLanguage"])
+ {
+ NSString *lang = [self isoCodeForNativeLang:[[NSUserDefaults standardUserDefaults] stringForKey:@"DefaultLanguage"]];
+ if (lang)
+ {
+ [self.trackSelectionLanguages addObject:lang];
+ }
+ }
+ if ([[NSUserDefaults standardUserDefaults] stringForKey:@"AlternateLanguage"])
+ {
+ NSString *lang = [self isoCodeForNativeLang:[[NSUserDefaults standardUserDefaults] stringForKey:@"AlternateLanguage"]];
+ if (lang)
+ {
+ [self.trackSelectionLanguages addObject:lang];
+ }
+ }
+ }
+ }
+
+ // Passthru settings
+ self.allowAACPassthru = [preset[@"AudioAllowAACPass"] boolValue];
+ self.allowAC3Passthru = [preset[@"AudioAllowAC3Pass"] boolValue];
+ self.allowDTSHDPassthru = [preset[@"AudioAllowDTSHDPass"] boolValue];
+ self.allowDTSPassthru= [preset[@"AudioAllowDTSPass"] boolValue];
+ self.allowMP3Passthru = [preset[@"AudioAllowMP3Pass"] boolValue];
+
+ self.secondaryEncoderMode = [preset[@"AudioSecondaryEncoderMode"] boolValue];
+
+ if (preset[@"AudioEncoderFallback"])
+ {
+ // map legacy encoder names via libhb
+ const char *strValue = hb_audio_encoder_sanitize_name([preset[@"AudioEncoderFallback"] UTF8String]);
+ self.encoderFallback = hb_audio_encoder_get_from_name(strValue);
+ }
+
+ [self.tracksArray removeAllObjects];
+
+ for (NSDictionary *track in preset[@"AudioList"])
+ {
+ HBAudioTrackPreset *newTrack = [[HBAudioTrackPreset alloc] init];
+ if ([track[@"AudioEncoder"] isKindOfClass:[NSString class]])
+ {
+ newTrack.encoder = hb_audio_encoder_get_from_name([track[@"AudioEncoder"] UTF8String]);
+ }
+ if ([track[@"AudioMixdown"] isKindOfClass:[NSString class]])
+ {
+ newTrack.mixdown = hb_mixdown_get_from_name([track[@"AudioMixdown"] UTF8String]);
+ }
+ if ([track[@"AudioSamplerate"] isKindOfClass:[NSString class]])
+ {
+ newTrack.sampleRate = hb_audio_samplerate_get_from_name([track[@"AudioSamplerate"] UTF8String]);
+
+ // Set to "Auto" if we didn't find a valid sample rate.
+ if (newTrack.sampleRate == -1)
+ {
+ newTrack.sampleRate = 0;
+ }
+ }
+ newTrack.bitRate = [track[@"AudioBitrate"] intValue];
+
+ newTrack.drc = [track[@"AudioTrackDRCSlider"] floatValue];
+ newTrack.gain = [track[@"AudioTrackGainSlider"] intValue];
+ [self.tracksArray addObject:newTrack];
+ [newTrack release];
+ }
+}
+
+- (void)prepareAudioDefaultsForPreset:(NSMutableDictionary *)preset
+{
+ // Track selection behavior
+ if (self.trackSelectionBehavior == HBAudioTrackSelectionBehaviorFirst)
+ {
+ preset[@"AudioTrackSelectionBehavior"] = @"first";
+ }
+ else if (self.trackSelectionBehavior == HBAudioTrackSelectionBehaviorAll)
+ {
+ preset[@"AudioTrackSelectionBehavior"] = @"all";
+ }
+ else
+ {
+ preset[@"AudioTrackSelectionBehavior"] = @"none";
+ }
+ preset[@"AudioLanguageList"] = [[self.trackSelectionLanguages copy] autorelease];
+
+ // Passthru settings
+ preset[@"AudioAllowAACPass"] = @(self.allowAACPassthru);
+ preset[@"AudioAllowAC3Pass"] = @(self.allowAC3Passthru);
+ preset[@"AudioAllowDTSHDPass"] = @(self.allowDTSHDPassthru);
+ preset[@"AudioAllowDTSPass"] = @(self.allowDTSPassthru);
+ preset[@"AudioAllowMP3Pass"] = @(self.allowMP3Passthru);
+
+ preset[@"AudioEncoderFallback"] = @(hb_audio_encoder_get_name(self.encoderFallback));
+
+ preset[@"AudioSecondaryEncoderMode"] = @(self.secondaryEncoderMode);
+
+ NSMutableArray *audioList = [[NSMutableArray alloc] init];
+
+ for (HBAudioTrackPreset *track in self.tracksArray)
+ {
+ NSString *sampleRate = @"Auto";
+ if (hb_audio_samplerate_get_name(track.sampleRate))
+ {
+ sampleRate = @(hb_audio_samplerate_get_name(track.sampleRate));
+ }
+ NSDictionary *newTrack = @{@"AudioEncoder": @(hb_audio_encoder_get_name(track.encoder)),
+ @"AudioMixdown": @(hb_mixdown_get_name(track.mixdown)),
+ @"AudioSamplerate": sampleRate,
+ @"AudioBitrate": @(track.bitRate),
+ @"AudioTrackDRCSlider": @(track.drc),
+ @"AudioTrackGainSlider": @(track.gain)};
+
+ [audioList addObject:newTrack];
+ }
+
+ preset[@"AudioList"] = audioList;
+ [audioList release];
+}
+
+- (void)validateEncoderFallbackForVideoContainer:(int)container
+{
+ BOOL isValid = NO;
+ for (const hb_encoder_t *audio_encoder = hb_audio_encoder_get_next(NULL);
+ audio_encoder != NULL;
+ audio_encoder = hb_audio_encoder_get_next(audio_encoder))
+ {
+ if (audio_encoder->muxers & container)
+ {
+ if (audio_encoder->codec == self.encoderFallback)
+ {
+ isValid = YES;
+ break;
+ }
+ }
+ }
+
+ if (!isValid)
+ {
+ self.encoderFallback = HB_ACODEC_AC3;
+ }
+
+ self.container = container;
+}
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBAudioDefaultsController.h Added

HandBrake-0.10.0.tar.bz2/macosx/HBAudioDefaultsController.m Added

@@ -0,0 +1,104 @@
+/* HBAudioDefaultsController.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBAudioDefaultsController.h"
+#import "HBAudioDefaults.h"
+#import "HBLanguagesSelection.h"
+
+static void *HBAudioDefaultsContex = &HBAudioDefaultsContex;
+
+@interface HBAudioDefaultsController ()
+
+@property (nonatomic, readonly) HBAudioDefaults *settings;
+
+@property (nonatomic, readonly) HBLanguagesSelection *languagesList;
+@property (assign) IBOutlet HBLanguageArrayController *tableController;
+@property (assign) IBOutlet NSButton *showAllButton;
+
+@property (assign) IBOutlet NSArrayController *tracksController;
+
+@end
+
+@implementation HBAudioDefaultsController
+
+- (instancetype)initWithSettings:(HBAudioDefaults *)settings
+{
+ self = [super initWithWindowNibName:@"AudioDefaults"];
+ if (self)
+ {
+ _settings = [settings retain];
+ _languagesList = [[HBLanguagesSelection alloc] initWithLanguages:_settings.trackSelectionLanguages];
+ }
+ return self;
+}
+
+- (void)windowDidLoad
+{
+ [self addObserver:self forKeyPath:@"tableController.showSelectedOnly" options:0 context:HBAudioDefaultsContex];
+
+ if (self.settings.trackSelectionLanguages.count)
+ {
+ self.tableController.showSelectedOnly = YES;
+ }
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+ if (context == HBAudioDefaultsContex)
+ {
+ if ([keyPath isEqualToString:@"tableController.showSelectedOnly"])
+ {
+ [self.showAllButton setState:!self.tableController.showSelectedOnly];
+ }
+ }
+ else
+ {
+ [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+ }
+}
+
+- (IBAction)edit:(id)sender
+{
+ self.tableController.showSelectedOnly = !self.tableController.showSelectedOnly;
+}
+
+- (IBAction)addTrack:(id)sender
+{
+ if ([sender selectedSegment])
+ {
+ if ([[self.tracksController arrangedObjects] count] && self.tracksController.selectionIndex != NSNotFound)
+ {
+ [self.tracksController removeObjectAtArrangedObjectIndex:self.tracksController.selectionIndex];
+ }
+ }
+ else
+ {
+ [self.tracksController add:sender];
+ }
+}
+
+- (IBAction)done:(id)sender
+{
+ [[self window] orderOut:nil];
+ [NSApp endSheet:[self window]];
+
+ [self.settings.trackSelectionLanguages removeAllObjects];
+ [self.settings.trackSelectionLanguages addObjectsFromArray:self.languagesList.selectedLanguages];
+}
+
+- (void)dealloc
+{
+ [_settings release];
+ [_languagesList release];
+
+ @try {
+ [self removeObserver:self forKeyPath:@"tableController.showSelectedOnly"];
+ } @catch (NSException * __unused exception) {}
+
+ [super dealloc];
+}
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBAudioTrackPreset.h Added

@@ -0,0 +1,53 @@
+//
+// HBAudioEncoder.h
+// HandBrake
+//
+// Created by Damiano Galassi on 30/07/14.
+//
+//
+
+#import <Foundation/Foundation.h>
+
+/**
+ * HBAudioTrackPreset
+ * a KVO enabled class used in the Audio Defaults panels,
+ * automatically validates the values.
+ */
+@interface HBAudioTrackPreset : NSObject
+
+/**
+ * track properties.
+ */
+@property (nonatomic, readwrite) int encoder;
+@property (nonatomic, readwrite) int mixdown;
+@property (nonatomic, readwrite) int sampleRate;
+@property (nonatomic, readwrite) int bitRate;
+
+@property (nonatomic, readwrite) int gain;
+@property (nonatomic, readwrite) float drc;
+
+/**
+ * Arrays of possible options for the track properties.
+ */
+@property (nonatomic, readonly) NSArray *encoders;
+@property (nonatomic, readonly) NSArray *mixdowns;
+@property (nonatomic, readonly) NSArray *samplerates;
+@property (nonatomic, readonly) NSArray *bitrates;
+
+@end
+
+/**
+ * A series of value trasformers to bridge the libhb enums
+ * to the textual rapresentations used in the interface.
+ */
+@interface HBEncoderTrasformer : NSValueTransformer
+@end
+
+@interface HBMixdownTrasformer : NSValueTransformer
+@end
+
+@interface HBSampleRateTrasformer : NSValueTransformer
+@end
+
+@interface HBIntegerTrasformer : NSValueTransformer
+@end
\ No newline at end of file

HandBrake-0.10.0.tar.bz2/macosx/HBAudioTrackPreset.m Added

@@ -0,0 +1,346 @@
+//
+// HBAudioEncoder.m
+// HandBrake
+//
+// Created by Damiano Galassi on 30/07/14.
+//
+//
+
+#import "HBAudioTrackPreset.h"
+#include "hb.h"
+
+#define DEFAULT_SAMPLERATE 48000
+
+static void *HBAudioEncoderContex = &HBAudioEncoderContex;
+
+@implementation HBAudioTrackPreset
+
+- (instancetype)init
+{
+ self = [super init];
+ if (self) {
+ // defaults settings
+ _encoder = HB_ACODEC_CA_AAC;
+ _sampleRate = 0;
+ _bitRate = 160;
+ _mixdown = HB_AMIXDOWN_DOLBYPLII;
+ }
+ return self;
+}
+
+#pragma mark - Setters override
+
+- (void)setEncoder:(int)encoder
+{
+ _encoder = encoder;
+ [self validateMixdown];
+ [self validateBitrate];
+}
+
+- (void)setMixdown:(int)mixdown
+{
+ _mixdown = mixdown;
+ [self validateBitrate];
+}
+
+- (void)setSampleRate:(int)sampleRate
+{
+ _sampleRate = sampleRate;
+ [self validateBitrate];
+}
+
+#pragma mark -
+#pragma mark Validation
+
+/**
+ * Validates the mixdown property.
+ */
+- (void)validateMixdown
+{
+ if (!hb_mixdown_has_codec_support(self.mixdown, self.encoder))
+ {
+ self.mixdown = hb_mixdown_get_default(self.encoder, 0);
+ }
+}
+
+- (void)validateBitrate
+{
+ int minBitRate = 0;
+ int maxBitRate = 0;
+
+ int sampleRate = self.sampleRate ? self.sampleRate : DEFAULT_SAMPLERATE;
+
+ hb_audio_bitrate_get_limits(self.encoder, sampleRate, self.mixdown, &minBitRate, &maxBitRate);
+
+ if (self.bitRate < minBitRate || self.bitRate > maxBitRate)
+ {
+ self.bitRate = maxBitRate;
+ }
+}
+
+- (BOOL)mixdownEnabled
+{
+ BOOL retval = YES;
+
+ if (self.mixdown == HB_AMIXDOWN_NONE)
+ {
+ // "None" mixdown (passthru)
+ retval = NO;
+ }
+
+ return retval;
+}
+
+- (BOOL)bitrateEnabled
+{
+ BOOL retval = YES;
+
+ int myCodecDefaultBitrate = hb_audio_bitrate_get_default(self.encoder, 0, 0);
+ if (myCodecDefaultBitrate < 0)
+ {
+ retval = NO;
+ }
+ return retval;
+}
+
+- (BOOL)passThruDisabled
+{
+ BOOL retval = YES;
+
+ if (self.encoder & HB_ACODEC_PASS_FLAG)
+ {
+ retval = NO;
+ }
+
+ return retval;
+}
+
+// Because we have indicated that the binding for the gain validates immediately we can implement the
+// key value binding method to ensure the gain stays in our accepted range.
+- (BOOL)validateGain:(id *)ioValue error:(NSError *)outError
+{
+ BOOL retval = YES;
+
+ if (nil != *ioValue)
+ {
+ if ([*ioValue intValue] < -20)
+ {
+ *ioValue = @(-20);
+ }
+ else if ([*ioValue intValue] > 20)
+ {
+ *ioValue = @20;
+ }
+ }
+
+ return retval;
+}
+
+#pragma mark - Options
+
+- (NSArray *)encoders
+{
+ NSMutableArray *encoders = [[NSMutableArray alloc] init];
+ for (const hb_encoder_t *audio_encoder = hb_audio_encoder_get_next(NULL);
+ audio_encoder != NULL;
+ audio_encoder = hb_audio_encoder_get_next(audio_encoder))
+ {
+ [encoders addObject:@(audio_encoder->name)];
+ }
+ return [encoders autorelease];
+}
+
+- (NSArray *)mixdowns
+{
+ NSMutableArray *mixdowns = [[NSMutableArray alloc] init];
+ for (const hb_mixdown_t *mixdown = hb_mixdown_get_next(NULL);
+ mixdown != NULL;
+ mixdown = hb_mixdown_get_next(mixdown))
+ {
+ if (hb_mixdown_has_codec_support(mixdown->amixdown, self.encoder))
+ {
+ [mixdowns addObject:@(mixdown->name)];
+ }
+ }
+ return [mixdowns autorelease];
+}
+
+- (NSArray *)samplerates
+{
+ NSMutableArray *samplerates = [[NSMutableArray alloc] init];
+ for (const hb_rate_t *audio_samplerate = hb_audio_samplerate_get_next(NULL);
+ audio_samplerate != NULL;
+ audio_samplerate = hb_audio_samplerate_get_next(audio_samplerate))
+ {
+ [samplerates addObject:@(audio_samplerate->name)];
+ }
+ return [samplerates autorelease];
+}
+
+- (NSArray *)bitrates
+{
+ int minBitRate = 0;
+ int maxBitRate = 0;
+
+ // If the samplerate is "Auto" pass a fake sampleRate to get the bitrates
+ int sampleRate = self.sampleRate ? self.sampleRate : DEFAULT_SAMPLERATE;
+
+ hb_audio_bitrate_get_limits(self.encoder, sampleRate, self.mixdown, &minBitRate, &maxBitRate);
+
+ NSMutableArray *bitrates = [[NSMutableArray alloc] init];
+ for (const hb_rate_t *audio_bitrate = hb_audio_bitrate_get_next(NULL);
+ audio_bitrate != NULL;
+ audio_bitrate = hb_audio_bitrate_get_next(audio_bitrate))
+ {
+ if (audio_bitrate->rate >= minBitRate && audio_bitrate->rate <= maxBitRate)
+ {
+ [bitrates addObject:@(audio_bitrate->name)];
+ }
+ }
+ return [bitrates autorelease];
+}
+
++ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key
+{
+ NSSet *retval = nil;
+
+ // Tell KVO to reaload the *enabled keyPaths
+ // after a change to encoder.
+ if ([key isEqualToString:@"bitrateEnabled"] ||
+ [key isEqualToString:@"passThruDisabled"] ||
+ [key isEqualToString:@"mixdownEnabled"])
+ {
+ retval = [NSSet setWithObjects:@"encoder", nil];
+ }
+
+ return retval;
+}
+
+@end
+
+#pragma mark - Value Trasformers
+
+@implementation HBEncoderTrasformer
+
++ (Class)transformedValueClass
+{
+ return [NSString class];
+}
+
+- (id)transformedValue:(id)value
+{
+ const char *name = hb_audio_encoder_get_name([value intValue]);
+ if (name)
+ {
+ return @(name);
+ }
+ else
+ {
+ return nil;
+ }
+}
+
++ (BOOL)allowsReverseTransformation
+{
+ return YES;
+}
+
+- (id)reverseTransformedValue:(id)value
+{
+ return @(hb_audio_encoder_get_from_name([value UTF8String]));
+}
+
+@end
+
+@implementation HBMixdownTrasformer
+
++ (Class)transformedValueClass
+{
+ return [NSString class];
+}
+
+- (id)transformedValue:(id)value
+{
+ const char *name = hb_mixdown_get_name([value intValue]);
+ if (name)
+ {
+ return @(name);
+ }
+ else
+ {
+ return nil;
+ }
+}
+
++ (BOOL)allowsReverseTransformation
+{
+ return YES;
+}
+
+- (id)reverseTransformedValue:(id)value
+{
+ return @(hb_mixdown_get_from_name([value UTF8String]));
+}
+
+@end
+
+@implementation HBSampleRateTrasformer
+
++ (Class)transformedValueClass
+{
+ return [NSString class];
+}
+
+- (id)transformedValue:(id)value
+{
+ const char *name = hb_audio_samplerate_get_name([value intValue]);
+ if (name)
+ {
+ return @(name);
+ }
+ else
+ {
+ return nil;
+ }
+}
+
++ (BOOL)allowsReverseTransformation
+{
+ return YES;
+}
+
+- (id)reverseTransformedValue:(id)value
+{
+ int sampleRate = hb_audio_samplerate_get_from_name([value UTF8String]);
+ if (sampleRate < 0)
+ {
+ sampleRate = 0;
+ }
+ return @(sampleRate);
+}
+
+@end
+
+@implementation HBIntegerTrasformer
+
++ (Class)transformedValueClass
+{
+ return [NSString class];
+}
+
+- (id)transformedValue:(id)value
+{
+ return [value stringValue];
+}
+
++ (BOOL)allowsReverseTransformation
+{
+ return YES;
+}
+
+- (id)reverseTransformedValue:(id)value
+{
+ return @([value intValue]);
+}
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBChapterTitlesController.h Added

HandBrake-0.10.0.tar.bz2/macosx/HBChapterTitlesController.m Added

@@ -0,0 +1,313 @@
+/* ChapterTitles.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+ 
+#import "HBChapterTitlesController.h"
+#import "Controller.h"
+#include "hb.h"
+
+@interface HBChapterTitlesController () <NSTableViewDataSource, NSTableViewDelegate>
+{
+ NSMutableArray *fChapterTitlesArray;
+
+ IBOutlet NSTableView * fChapterTable;
+	IBOutlet NSButton * fLoadChaptersButton;
+	IBOutlet NSButton * fSaveChaptersButton;
+ IBOutlet NSButton * fCreateChaptersMarkers;
+	IBOutlet NSTableColumn * fChapterTableNameColumn;
+}
+
+@end
+
+@implementation HBChapterTitlesController
+
+- (instancetype)init
+{
+ self = [super initWithNibName:@"ChaptersTitles" bundle:nil];
+ if (self)
+ {
+ fChapterTitlesArray = [[[NSMutableArray alloc] init] retain];
+ [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(titleChanged:) name: HBTitleChangedNotification object: nil];
+ }
+ return self;
+}
+
+- (void)dealloc
+{
+ [fChapterTitlesArray release];
+ [super dealloc];
+}
+
+- (void)titleChanged:(NSNotification *)aNotification
+{
+ NSDictionary *notDict = [aNotification userInfo];
+ NSData *theData = [notDict objectForKey: keyTitleTag];
+ hb_title_t *title = NULL;
+
+ [theData getBytes: &title length: sizeof(title)];
+
+ [fChapterTitlesArray removeAllObjects];
+
+ if (title)
+ {
+ for (int i = 0; i < hb_list_count(title->job->list_chapter); i++)
+ {
+ hb_chapter_t *chapter = hb_list_item(title->job->list_chapter, i);
+ if (chapter != NULL)
+ {
+ if (chapter->title != NULL)
+ {
+ [fChapterTitlesArray addObject:[NSString
+ stringWithFormat:@"%s",
+ chapter->title]];
+ }
+ else
+ {
+ [fChapterTitlesArray addObject:[NSString
+ stringWithFormat:@"Chapter %d",
+ i + 1]];
+ }
+ }
+ }
+ }
+
+ [fChapterTable reloadData];
+}
+
+- (void)addChaptersFromQueue:(NSMutableArray *)newChaptersArray
+{
+ [fChapterTitlesArray removeAllObjects];
+ [fChapterTitlesArray addObjectsFromArray:newChaptersArray];
+ [fChapterTable reloadData];
+}
+
+- (void)setUIEnabled:(BOOL)flag
+{
+ [fCreateChaptersMarkers setEnabled:flag];
+ [fChapterTable setEnabled:flag];
+ [fLoadChaptersButton setEnabled:flag];
+ [fSaveChaptersButton setEnabled:flag];
+}
+
+- (NSArray *)chapterTitlesArray
+{
+ return [NSArray arrayWithArray:fChapterTitlesArray];
+}
+
+- (IBAction)createChapterMarkersChanged:(id)sender
+{
+ [[NSNotificationCenter defaultCenter] postNotificationName:HBMixdownChangedNotification object:self];
+}
+
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
+{
+ return [fChapterTitlesArray count];
+}
+
+- (void)tableView:(NSTableView *)aTableView
+ setObjectValue:(id)anObject
+ forTableColumn:(NSTableColumn *)aTableColumn
+ row:(NSInteger)rowIndex
+{
+ if (aTableColumn != nil && [[aTableColumn identifier] intValue] == 2)
+ {
+ [fChapterTitlesArray replaceObjectAtIndex:rowIndex
+ withObject:[NSString
+ stringWithString:anObject]];
+ }
+}
+
+- (id)tableView:(NSTableView *)aTableView
+ objectValueForTableColumn:(NSTableColumn *)aTableColumn
+ row:(NSInteger)rowIndex
+{
+ if ([[aTableColumn identifier] intValue] == 1)
+ {
+ return [NSString stringWithFormat:@"%ld", rowIndex + 1];
+ }
+ else
+ {
+ return [NSString stringWithString:[fChapterTitlesArray
+ objectAtIndex:rowIndex]];
+ }
+ return @"__DATA ERROR__";
+}
+
+/* Method to edit the next chapter when the user presses Return. We have to use
+a timer to avoid interfering with the chain of events that handles the edit. */
+- (void)controlTextDidEndEditing: (NSNotification *) notification
+{
+ NSTableView *chapterTable = [notification object];
+ NSInteger column = [chapterTable editedColumn];
+ NSInteger row = [chapterTable editedRow];
+ NSInteger textMovement;
+
+ // Edit the cell in the next row, same column
+ row++;
+ textMovement = [[[notification userInfo] objectForKey:@"NSTextMovement"] integerValue];
+ if( textMovement == NSReturnTextMovement && row < [chapterTable numberOfRows] )
+ {
+ NSArray *info = [NSArray arrayWithObjects:chapterTable,
+ [NSNumber numberWithInteger:column], [NSNumber numberWithInteger:row], nil];
+ /* The delay is unimportant; editNextRow: won't be called until the responder
+ chain finishes because the event loop containing the timer is on this thread */
+ [self performSelector:@selector(editNextRow:) withObject:info afterDelay:0.0];
+ }
+}
+
+- (void)editNextRow: (id) objects
+{
+ NSTableView *chapterTable = [objects objectAtIndex:0];
+ NSInteger column = [[objects objectAtIndex:1] integerValue];
+ NSInteger row = [[objects objectAtIndex:2] integerValue];
+
+ if( row >= 0 && row < [chapterTable numberOfRows] )
+ {
+ [chapterTable selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
+ [chapterTable editColumn:column row:row withEvent:nil select:YES];
+ }
+}
+
+#pragma mark -
+#pragma mark Chapter Files Import / Export
+
+- (IBAction) browseForChapterFile: (id) sender
+{
+ /* We get the current file name and path from the destination field here */
+ NSString *sourceDirectory = [[NSUserDefaults standardUserDefaults] stringForKey:@"LastDestinationDirectory"];
+
+	/* Open a panel to let the user choose the file */
+	NSOpenPanel *panel = [NSOpenPanel openPanel];
+ [panel setDirectoryURL:[NSURL fileURLWithPath:sourceDirectory]];
+ [panel setAllowedFileTypes:@[@"csv"]];
+
+ [panel beginSheetModalForWindow:[[self view] window] completionHandler:^(NSInteger result) {
+ NSArray *chaptersArray = nil; /* temp array for chapters */
+ NSMutableArray *chaptersMutableArray = nil; /* temp array for chapters */
+ NSString *chapterName = nil; 	/* temp string from file */
+ NSInteger chapters, i;
+
+ if (result == NSOKButton) /* if they click OK */
+ {
+ chapterName = [[NSString alloc] initWithContentsOfURL:[panel URL] encoding:NSUTF8StringEncoding error:NULL];
+ chaptersArray = [chapterName componentsSeparatedByString:@"\n"];
+ [chapterName release];
+ chaptersMutableArray = [[chaptersArray mutableCopy] autorelease];
+ chapters = [self numberOfRowsInTableView:fChapterTable];
+ if ([chaptersMutableArray count] > 0)
+ {
+ /* if last item is empty remove it */
+ if ([[chaptersMutableArray objectAtIndex:[chaptersArray count]-1] length] == 0)
+ {
+ [chaptersMutableArray removeLastObject];
+ }
+ }
+ /* if chapters in table is not equal to array count */
+ if ((unsigned int) chapters != [chaptersMutableArray count])
+ {
+ [panel close];
+ [[NSAlert alertWithMessageText:NSLocalizedString(@"Unable to load chapter file", @"Unable to load chapter file")
+ defaultButton:NSLocalizedString(@"OK", @"OK")
+ alternateButton:NULL
+ otherButton:NULL
+ informativeTextWithFormat:NSLocalizedString(@"%d chapters expected, %d chapters found in %@", @"%d chapters expected, %d chapters found in %@"),
+ chapters, [chaptersMutableArray count], [[panel URL] lastPathComponent]] runModal];
+ return;
+ }
+ /* otherwise, go ahead and populate table with array */
+ for (i=0; i<chapters; i++)
+ {
+
+ if([[chaptersMutableArray objectAtIndex:i] length] > 5)
+ {
+ /* avoid a segfault */
+ /* Get the Range.location of the first comma in the line and then put everything after that into chapterTitle */
+ NSRange firstCommaRange = [[chaptersMutableArray objectAtIndex:i] rangeOfString:@","];
+ NSString *chapterTitle = [[chaptersMutableArray objectAtIndex:i] substringFromIndex:firstCommaRange.location + 1];
+ /* Since we store our chapterTitle commas as "\," for the cli, we now need to remove the escaping "\" from the title */
+ chapterTitle = [chapterTitle stringByReplacingOccurrencesOfString:@"\\," withString:@","];
+ [self tableView:fChapterTable
+ setObjectValue:chapterTitle
+ forTableColumn:fChapterTableNameColumn
+ row:i];
+ }
+ else
+ {
+ [panel close];
+ [[NSAlert alertWithMessageText:NSLocalizedString(@"Unable to load chapter file", @"Unable to load chapter file")
+ defaultButton:NSLocalizedString(@"OK", @"OK")
+ alternateButton:NULL
+ otherButton:NULL
+ informativeTextWithFormat:NSLocalizedString(@"%@ was not formatted as expected.", @"%@ was not formatted as expected."), [[panel URL] lastPathComponent]] runModal];
+ [fChapterTable reloadData];
+ return;
+ }
+ }
+ [fChapterTable reloadData];
+ }
+ }];
+}
+
+- (IBAction) browseForChapterFileSave: (id) sender
+{
+ NSString *destinationDirectory = [[NSUserDefaults standardUserDefaults] stringForKey:@"LastDestinationDirectory"];
+
+ /* Open a panel to let the user save to a file */
+ NSSavePanel *panel = [NSSavePanel savePanel];
+ [panel setAllowedFileTypes:@[@"csv"]];
+ [panel setDirectoryURL:[NSURL fileURLWithPath:destinationDirectory]];
+ //[panel setNameFieldStringValue:[[[fDstFile2Field stringValue] lastPathComponent] stringByDeletingPathExtension]];
+
+ [panel beginSheetModalForWindow:[[self view] window] completionHandler:^(NSInteger result) {
+ NSString *chapterName; /* pointer for string for later file-writing */
+ NSString *chapterTitle;
+ NSError *saveError = nil;
+ NSInteger chapters, i; /* ints for the number of chapters in the table and the loop */
+
+ if( result == NSOKButton ) /* if they clicked OK */
+ {
+ chapters = [self numberOfRowsInTableView:fChapterTable];
+ chapterName = [NSString string];
+ for (i=0; i<chapters; i++)
+ {
+ /* put each chapter title from the table into the array */
+ if (i<9)
+ { /* if i is from 0 to 8 (chapters 1 to 9) add two leading zeros */
+ chapterName = [chapterName stringByAppendingFormat:@"00%ld,",i+1];
+ }
+ else if (i<99)
+ { /* if i is from 9 to 98 (chapters 10 to 99) add one leading zero */
+ chapterName = [chapterName stringByAppendingFormat:@"0%ld,",i+1];
+ }
+ else if (i<999)
+ { /* in case i is from 99 to 998 (chapters 100 to 999) no leading zeros */
+ chapterName = [chapterName stringByAppendingFormat:@"%ld,",i+1];
+ }
+
+ chapterTitle = [self tableView:fChapterTable objectValueForTableColumn:fChapterTableNameColumn row:i];
+ /* escape any commas in the chapter name with "\," */
+ chapterTitle = [chapterTitle stringByReplacingOccurrencesOfString:@"," withString:@"\\,"];
+ chapterName = [chapterName stringByAppendingString:chapterTitle];
+ if (i+1 != chapters)
+ { /* if not the last chapter */
+ chapterName = [chapterName stringByAppendingString:@ "\n"];
+ }
+
+
+ }
+ /* try to write it to where the user wanted */
+ if (![chapterName writeToURL:[panel URL]
+ atomically:NO
+ encoding:NSUTF8StringEncoding
+ error:&saveError])
+ {
+ [panel close];
+ [[NSAlert alertWithError:saveError] runModal];
+ }
+ }
+ }];
+}
+
+@end

HandBrake-0.9.9.tar.bz2/macosx/HBCore.m -> HandBrake-0.10.0.tar.bz2/macosx/HBCore.m Changed

HandBrake-0.9.9.tar.bz2/macosx/HBDVDDetector.m -> HandBrake-0.10.0.tar.bz2/macosx/HBDVDDetector.m Changed

@@ -10,6 +10,7 @@
 #include <IOKit/IOKitLib.h>
 #include <IOKit/storage/IOMedia.h>
 #include <IOKit/storage/IODVDMedia.h>
+#include <sys/mount.h>
 
 #import "HBDVDDetector.h"
 
@@ -79,49 +80,17 @@
 return bsdName;
 }
 
- OSStatus err;
- FSRef ref;
- err = FSPathMakeRef( (const UInt8 *) [path fileSystemRepresentation],
- &ref, NULL );
- if( err != noErr )
- {
- return nil;
- }
-
- // Get the volume reference number.
- FSCatalogInfo catalogInfo;
- err = FSGetCatalogInfo( &ref, kFSCatInfoVolume, &catalogInfo, NULL, NULL,
- NULL);
- if( err != noErr )
- {
- return nil;
- }
- FSVolumeRefNum volRefNum = catalogInfo.volume;
-
- // Now let's get the device name
- GetVolParmsInfoBuffer volumeParms;
- err = FSGetVolumeParms ( volRefNum, &volumeParms, sizeof( volumeParms ) );
+ struct statfs s;
+ statfs([path fileSystemRepresentation], &s);
 
- if( err != noErr )
- {
- return nil;
- }
-
- // A version 4 GetVolParmsInfoBuffer contains the BSD node name in the vMDeviceID field.
- // It is actually a char * value. This is mentioned in the header CoreServices/CarbonCore/Files.h.
- if( volumeParms.vMVersion < 4 )
- {
- return nil;
- }
+ bsdName = @(s.f_mntfromname);
 
- // vMDeviceID might be zero as is reported with experimental ZFS (zfs-119) support in Leopard.
- if( !volumeParms.vMDeviceID )
+ if ([bsdName hasPrefix:@"/dev/"])
 {
- return nil;
+ bsdName = [bsdName substringFromIndex:5];
 }
 
- bsdName = [[NSString stringWithUTF8String:(const char *)volumeParms.vMDeviceID] retain];
- return bsdName;
+ return [bsdName retain];
 }

HandBrake-0.10.0.tar.bz2/macosx/HBDockTile.h Added

HandBrake-0.10.0.tar.bz2/macosx/HBDockTile.m Added

@@ -0,0 +1,77 @@
+//
+// HBDockTile.m
+// HandBrake
+//
+// Created by Damiano Galassi on 20/08/14.
+//
+//
+
+#import "HBDockTile.h"
+#import "DockTextField.h"
+
+NSString *dockTilePercentFormat = @"%2.1f%%";
+
+@interface HBDockTile ()
+
+@property (nonatomic, retain) NSDockTile *dockTile;
+@property (nonatomic, retain) NSImage *image;
+@property (nonatomic, retain) DockTextField * percentField;
+@property (nonatomic, retain) DockTextField * timeField;
+
+@end
+
+@implementation HBDockTile
+
+- (instancetype)initWithDockTile:(NSDockTile *)dockTile image:(NSImage *)image
+{
+ self = [super init];
+ if (self)
+ {
+ _dockTile = [dockTile retain];
+ _image = [image retain];
+
+ NSImageView *iv = [[NSImageView alloc] init];
+ [iv setImage:_image];
+ [dockTile setContentView:iv];
+
+ _percentField = [[DockTextField alloc] initWithFrame:NSMakeRect(0.0f, 32.0f, [dockTile size].width, 30.0f)];
+ [_percentField changeGradientColors:[NSColor colorWithDeviceRed:0.4f green:0.6f blue:0.4f alpha:1.0f] endColor:[NSColor colorWithDeviceRed:0.2f green:0.4f blue:0.2f alpha:1.0f]];
+ [iv addSubview:_percentField];
+
+ _timeField = [[DockTextField alloc] initWithFrame:NSMakeRect(0.0f, 0.0f, [dockTile size].width, 30.0f)];
+ [_timeField changeGradientColors:[NSColor colorWithDeviceRed:0.6f green:0.4f blue:0.4f alpha:1.0f] endColor:[NSColor colorWithDeviceRed:0.4f green:0.2f blue:0.2f alpha:1.0f]];
+ [iv addSubview:_timeField];
+ [iv release];
+ }
+ return self;
+}
+
+- (void)dealloc
+{
+ [_dockTile release];
+ [_image release];
+ [_percentField release];
+ [_timeField release];
+
+ [super dealloc];
+}
+
+- (void)updateDockIcon:(double)progress withETA:(NSString *)etaStr
+{
+ if (progress < 0.0 || progress > 1.0)
+ {
+ [_percentField setHidden:YES];
+ [_timeField setHidden:YES];
+ }
+ else
+ {
+ [_percentField setTextToDisplay:[NSString stringWithFormat:dockTilePercentFormat, progress * 100]];
+ [_percentField setHidden:NO];
+ [_timeField setTextToDisplay:etaStr];
+ [_timeField setHidden:NO];
+ }
+
+ [_dockTile display];
+}
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBFilters.h Added

@@ -0,0 +1,74 @@
+/* HBFilters.h $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import <Foundation/Foundation.h>
+
+/**
+ * Filters settings.
+ */
+@interface HBFilters : NSObject
+
+- (void)prepareFiltersForPreset:(NSMutableDictionary *)preset;
+- (void)applySettingsFromPreset:(NSDictionary *)preset;
+
+@property (nonatomic, readwrite) NSInteger detelecine;
+@property (nonatomic, readwrite, copy) NSString *detelecineCustomString;
+
+@property (nonatomic, readwrite) NSInteger deinterlace;
+@property (nonatomic, readwrite, copy) NSString *deinterlaceCustomString;
+
+@property (nonatomic, readwrite) NSInteger decomb;
+@property (nonatomic, readwrite, copy) NSString *decombCustomString;
+
+@property (nonatomic, readwrite, copy) NSString *denoise;
+@property (nonatomic, readwrite, copy) NSString *denoisePreset;
+@property (nonatomic, readwrite, copy) NSString *denoiseTune;
+@property (nonatomic, readwrite, copy) NSString *denoiseCustomString;
+
+@property (nonatomic, readwrite) NSInteger deblock;
+@property (nonatomic, readwrite) BOOL grayscale;
+
+@property (nonatomic, readwrite) BOOL useDecomb;
+
+/**
+ * A textual summary of the filters settings.
+ */
+@property (nonatomic, readonly) NSString *summary;
+
+/**
+ * Getters to get the possible values for the filters.
+ */
++ (NSDictionary *)denoisePresetDict;
++ (NSDictionary *)nlmeansTunesDict;
++ (NSDictionary *)denoiseTypesDict;
+
+@property (nonatomic, readonly) NSArray *detelecineSettings;
+@property (nonatomic, readonly) NSArray *deinterlaceSettings;
+@property (nonatomic, readonly) NSArray *decombSettings;
+
+@property (nonatomic, readonly) NSArray *denoiseTypes;
+@property (nonatomic, readonly) NSArray *denoisePresets;
+@property (nonatomic, readonly) NSArray *denoiseTunes;
+
+@end
+
+/**
+ * A collection of NSValueTransformer to map between localized UI values
+ * and the internals values.
+ */
+
+@interface HBGenericDictionaryTransformer : NSValueTransformer
+@property (nonatomic, retain) NSDictionary *dict;
+@end
+
+@interface HBDenoisePresetTransformer : HBGenericDictionaryTransformer
+@end
+
+@interface HBDenoiseTuneTransformer : HBGenericDictionaryTransformer
+@end
+
+@interface HBDenoiseTransformer : HBGenericDictionaryTransformer
+@end
\ No newline at end of file

HandBrake-0.10.0.tar.bz2/macosx/HBFilters.m Added

@@ -0,0 +1,453 @@
+/* HBFilters.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBFilters.h"
+
+@implementation HBGenericDictionaryTransformer
+
++ (Class)transformedValueClass
+{
+ return [NSString class];
+}
+
+- (id)transformedValue:(id)value
+{
+ return [[self.dict allKeysForObject:value] firstObject];
+}
+
++ (BOOL)allowsReverseTransformation
+{
+ return YES;
+}
+
+- (id)reverseTransformedValue:(id)value
+{
+ return [self.dict valueForKey:value];
+}
+
+@end
+
+@implementation HBDenoisePresetTransformer
+
+- (instancetype)init
+{
+ if (self = [super init])
+ self.dict = [HBFilters denoisePresetDict];
+
+ return self;
+}
+
+@end
+
+@implementation HBDenoiseTuneTransformer
+
+- (instancetype)init
+{
+ if (self = [super init])
+ self.dict = [HBFilters nlmeansTunesDict];
+
+ return self;
+}
+
+@end
+
+@implementation HBDenoiseTransformer
+
+- (instancetype)init
+{
+ if (self = [super init])
+ self.dict = [HBFilters denoiseTypesDict];
+
+ return self;
+}
+
+@end
+
+static NSDictionary *_denoiseTypesDict;
+static NSDictionary *_denoisePresetsDict;
+static NSDictionary *_nlmeansTunesDict;
+
+@implementation HBFilters
+
++ (void)initialize
+{
+ if (self == [HBFilters class]) {
+ _denoiseTypesDict = [@{NSLocalizedString(@"Off", nil): @"off",
+ NSLocalizedString(@"NLMeans", nil): @"nlmeans",
+ NSLocalizedString(@"HQDN3D", nil): @"hqdn3d"} retain];
+
+ _denoisePresetsDict = [@{NSLocalizedString(@"Custom", nil): @"none",
+ NSLocalizedString(@"Ultralight", nil): @"ultralight",
+ NSLocalizedString(@"Light", nil): @"light",
+ NSLocalizedString(@"Medium", nil) : @"medium",
+ NSLocalizedString(@"Strong", nil) : @"strong"} retain];
+
+ _nlmeansTunesDict = [@{NSLocalizedString(@"None", nil): @"none",
+ NSLocalizedString(@"Film", nil): @"film",
+ NSLocalizedString(@"Grain", nil): @"grain",
+ NSLocalizedString(@"High Motion", nil): @"highmotion",
+ NSLocalizedString(@"Animation", nil) : @"animation"} retain];
+ }
+}
+
+- (instancetype)init
+{
+ self = [super init];
+ if (self)
+ {
+ _detelecineCustomString = @"";
+ _deinterlaceCustomString = @"";
+ _decombCustomString = @"";
+ _denoise = @"off";
+ _denoiseCustomString = @"";
+ _denoisePreset = @"medium";
+ _denoiseTune = @"none";
+ }
+ return self;
+}
+
+- (void)prepareFiltersForPreset:(NSMutableDictionary *)preset
+{
+ preset[@"PictureDecombDeinterlace"] = @(self.useDecomb);
+
+ preset[@"PictureDeinterlace"] = @(self.deinterlace);
+ preset[@"PictureDeinterlaceCustom"] = self.deinterlaceCustomString;
+
+ preset[@"PictureDecomb"] = @(self.decomb);
+ preset[@"PictureDecombCustom"] = self.decombCustomString;
+
+ preset[@"PictureDetelecine"] = @(self.detelecine);
+ preset[@"PictureDetelecineCustom"] = self.detelecineCustomString;
+
+ preset[@"PictureDenoiseFilter"] = self.denoise;
+ preset[@"PictureDenoisePreset"] = self.denoisePreset;
+ preset[@"PictureDenoiseTune"] = self.denoiseTune;
+ preset[@"PictureDenoiseCustom"] = self.denoiseCustomString;
+
+ preset[@"PictureDeblock"] = @(self.deblock);
+ preset[@"VideoGrayScale"] = @(self.grayscale);
+}
+
+- (void)applySettingsFromPreset:(NSDictionary *)preset
+{
+ /* If the preset has an objectForKey:@"UsesPictureFilters", and handle the filters here */
+ if (preset[@"UsesPictureFilters"] && [preset[@"UsesPictureFilters"] intValue] > 0)
+ {
+ /* We only allow *either* Decomb or Deinterlace. So check for the PictureDecombDeinterlace key. */
+ self.useDecomb = 1;
+ self.decomb = 0;
+ self.deinterlace = 0;
+ if ([preset[@"PictureDecombDeinterlace"] intValue] == 1)
+ {
+ /* we are using decomb */
+ /* Decomb */
+ if ([preset[@"PictureDecomb"] intValue] > 0)
+ {
+ self.decomb = [preset[@"PictureDecomb"] intValue];
+
+ /* if we are using "Custom" in the decomb setting, also set the custom string*/
+ if ([preset[@"PictureDecomb"] intValue] == 1)
+ {
+ self.decombCustomString = preset[@"PictureDecombCustom"];
+ }
+ }
+ }
+ else
+ {
+ /* We are using Deinterlace */
+ /* Deinterlace */
+ if ([preset[@"PictureDeinterlace"] intValue] > 0)
+ {
+ self.useDecomb = 0;
+ self.deinterlace = [preset[@"PictureDeinterlace"] intValue];
+ /* if we are using "Custom" in the deinterlace setting, also set the custom string*/
+ if ([preset[@"PictureDeinterlace"] intValue] == 1)
+ {
+ self.deinterlaceCustomString = preset[@"PictureDeinterlaceCustom"];
+ }
+ }
+ }
+
+ /* Detelecine */
+ if ([preset[@"PictureDetelecine"] intValue] > 0)
+ {
+ self.detelecine = [preset[@"PictureDetelecine"] intValue];
+ /* if we are using "Custom" in the detelecine setting, also set the custom string*/
+ if ([preset[@"PictureDetelecine"] intValue] == 1)
+ {
+ self.detelecineCustomString = preset[@"PictureDetelecineCustom"];
+ }
+ }
+ else
+ {
+ self.detelecine = 0;
+ }
+
+ /* Denoise */
+ if (preset[@"PictureDenoise"])
+ {
+ // Old preset denoise format, try to map it to the new one
+ if ([preset[@"PictureDenoise"] intValue] > 0)
+ {
+ self.denoise = @"hqdn3d";
+ /* if we are using "Custom" in the denoise setting, also set the custom string*/
+ if ([preset[@"PictureDenoise"] intValue] == 1)
+ {
+ self.denoisePreset = @"custom";
+ self.denoiseCustomString = preset[@"PictureDenoiseCustom"];
+ }
+ switch ([preset[@"PictureDenoise"] intValue]) {
+ case 2:
+ self.denoisePreset = @"light";
+ break;
+ case 3:
+ self.denoisePreset = @"medium";
+ break;
+ case 4:
+ self.denoisePreset = @"strong";
+ break;
+ default:
+ self.denoisePreset = @"medium";
+ break;
+ }
+ }
+ else
+ {
+ self.denoise = @"off";
+ }
+ }
+ else
+ {
+ // New format, read the values directly
+ self.denoise = preset[@"PictureDenoiseFilter"];
+ self.denoisePreset = preset[@"PictureDenoisePreset"];
+ self.denoiseTune = preset[@"PictureDenoiseTune"];
+ self.denoiseCustomString = preset[@"PictureDenoiseCustom"];
+ }
+
+ /* Deblock */
+ if ([preset[@"PictureDeblock"] intValue] == 1)
+ {
+ /* if its a one, then its the old on/off deblock, set on to 5*/
+ self.deblock = 5;
+ }
+ else
+ {
+ /* use the settings intValue */
+ self.deblock = [preset[@"PictureDeblock"] intValue];
+ }
+
+ self.grayscale = [preset[@"VideoGrayScale"] intValue];
+ }
+}
+
+- (NSString *)summary
+{
+ NSMutableString *summary = [NSMutableString string];
+
+ /* Detelecine */
+ switch (self.detelecine)
+ {
+ case 1:
+ [summary appendFormat:@" - Detelecine (%@)", self.detelecineCustomString];
+ break;
+
+ case 2:
+ [summary appendString:@" - Detelecine (Default)"];
+ break;
+
+ default:
+ break;
+ }
+
+ if (self.useDecomb)
+ {
+ /* Decomb */
+ switch (self.decomb)
+ {
+ case 1:
+ [summary appendFormat:@" - Decomb (%@)", self.decombCustomString];
+ break;
+
+ case 2:
+ [summary appendString:@" - Decomb (Default)"];
+ break;
+
+ case 3:
+ [summary appendString:@" - Decomb (Fast)"];
+ break;
+
+ case 4:
+ [summary appendString:@" - Decomb (Bob)"];
+ break;
+
+ default:
+ break;
+ }
+ }
+ else
+ {
+ /* Deinterlace */
+ switch (self.deinterlace)
+ {
+ case 1:
+ [summary appendFormat:@" - Deinterlace (%@)", self.deinterlaceCustomString];
+ break;
+
+ case 2:
+ [summary appendString:@" - Deinterlace (Fast)"];
+ break;
+
+ case 3:
+ [summary appendString:@" - Deinterlace (Slow)"];
+ break;
+
+ case 4:
+ [summary appendString:@" - Deinterlace (Slower)"];
+ break;
+
+ case 5:
+ [summary appendString:@" - Deinterlace (Bob)"];
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ /* Deblock */
+ if (self.deblock > 0)
+ {
+ [summary appendFormat:@" - Deblock (%ld)", self.deblock];
+ }
+
+ /* Denoise */
+ if (![self.denoise isEqualToString:@"off"])
+ {
+ [summary appendFormat:@" - Denoise (%@", [[_denoiseTypesDict allKeysForObject:self.denoise] firstObject]];
+ if (![self.denoisePreset isEqualToString:@"none"])
+ {
+ [summary appendFormat:@", %@", [[_denoisePresetsDict allKeysForObject:self.denoisePreset] firstObject]];
+
+ if ([self.denoise isEqualToString:@"nlmeans"])
+ {
+ [summary appendFormat:@", %@", [[_nlmeansTunesDict allKeysForObject:self.denoiseTune] firstObject]];
+ }
+ }
+ else
+ {
+ [summary appendFormat:@", %@", self.denoiseCustomString];
+ }
+
+ [summary appendString:@")"];
+
+ }
+
+ /* Grayscale */
+ if (self.grayscale)
+ {
+ [summary appendString:@" - Grayscale"];
+ }
+
+ if ([summary hasPrefix:@" - "])
+ {
+ [summary deleteCharactersInRange:NSMakeRange(0, 3)];
+ }
+
+ return [NSString stringWithString:summary];
+}
+
+// Override setter to avoid nil values.
+- (void)setDetelecineCustomString:(NSString *)detelecineCustomString
+{
+ [_detelecineCustomString autorelease];
+
+ if (detelecineCustomString)
+ {
+ _detelecineCustomString = [detelecineCustomString copy];
+ }
+ else
+ {
+ _detelecineCustomString = @"";
+ }
+}
+
+- (void)setDeinterlaceCustomString:(NSString *)deinterlaceCustomString
+{
+ [_deinterlaceCustomString autorelease];
+
+ if (deinterlaceCustomString)
+ {
+ _deinterlaceCustomString = [deinterlaceCustomString copy];
+ }
+ else
+ {
+ _deinterlaceCustomString = @"";
+ }
+}
+
+- (void)setDenoiseCustomString:(NSString *)denoiseCustomString
+{
+ [_denoiseCustomString autorelease];
+
+ if (denoiseCustomString)
+ {
+ _denoiseCustomString = [denoiseCustomString copy];
+ }
+ else
+ {
+ _denoiseCustomString = @"";
+ }
+}
+
+#pragma mark - Valid values
+
++ (NSDictionary *)denoisePresetDict
+{
+ return _denoisePresetsDict;
+}
+
++ (NSDictionary *)nlmeansTunesDict
+{
+ return _nlmeansTunesDict;
+}
+
++ (NSDictionary *)denoiseTypesDict
+{
+ return _denoiseTypesDict;
+}
+
+- (NSArray *)detelecineSettings
+{
+ return @[@"Off", @"Custom", @"Default"];
+}
+
+- (NSArray *)decombSettings
+{
+ return @[@"Off", @"Custom", @"Default", @"Fast", @"Bob"];
+}
+
+- (NSArray *)deinterlaceSettings
+{
+ return @[@"Off", @"Custom", @"Fast", @"Slow", @"Slower", @"Bob"];
+}
+
+- (NSArray *)denoiseTypes
+{
+ return @[@"Off", @"NLMeans", @"HQDN3D"];
+}
+
+- (NSArray *)denoisePresets
+{
+ return @[@"Custom", @"Ultralight", @"Light", @"Medium", @"Strong"];
+}
+
+- (NSArray *)denoiseTunes
+{
+ return @[@"None", @"Film", @"Grain", @"High Motion", @"Animation"];
+}
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBHUDButtonCell.h Added

HandBrake-0.10.0.tar.bz2/macosx/HBHUDButtonCell.m Added

HandBrake-0.10.0.tar.bz2/macosx/HBHUDView.h Added

HandBrake-0.10.0.tar.bz2/macosx/HBHUDView.m Added

@@ -0,0 +1,72 @@
+/* HBHUDButtonCell.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBHUDView.h"
+
+@interface NSView (HBHUDViewExtension)
+
+- (void)setBlendingMode:(int)mode;
+- (void)setMaterial:(int)material;
+- (void)setState:(int)state;
+
+@end
+
+@implementation HBHUDView
+
++ (void)setupNewStyleHUD:(NSView *)view
+{
+ [view setWantsLayer:YES];
+ [view.layer setCornerRadius:4];
+
+ // Hardcode the values so we can
+ // compile it with the 10.9 sdk.
+ [view setBlendingMode:1];
+ [view setMaterial:2];
+ [view setState:1];
+
+ [view setAppearance:[NSClassFromString(@"NSAppearance") appearanceNamed:@"NSAppearanceNameVibrantDark"]];
+}
+
+- (void)drawRect:(NSRect)dirtyRect
+{
+ NSGraphicsContext *theContext = [NSGraphicsContext currentContext];
+ [theContext saveGraphicsState];
+
+ NSRect rect = NSMakeRect(0.0, 0.0, [self frame].size.width, [self frame].size.height);
+
+ // Draw a standard HUD with black transparent background and white border.
+ [[NSColor colorWithCalibratedRed:0.0 green:0.0 blue:0.0 alpha:0.6] setFill];
+ [[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(rect, 1, 1) xRadius:14.0 yRadius:14.0] fill];
+
+ [[NSColor whiteColor] setStroke];
+ [NSBezierPath setDefaultLineWidth:2.0];
+ [[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(rect, 1, 1) xRadius:14.0 yRadius:14.0] stroke];
+
+ [theContext restoreGraphicsState];
+}
+
+- (instancetype)initWithFrame:(NSRect)frame
+{
+ if (NSClassFromString(@"NSVisualEffectView"))
+ {
+ // If NSVisualEffectView class is loaded
+ // release ourself and return a NSVisualEffectView instance instead.
+ [self release];
+ self = [[NSClassFromString(@"NSVisualEffectView") alloc] initWithFrame:frame];
+ if (self)
+ {
+ [HBHUDView setupNewStyleHUD:self];
+ }
+ }
+ else
+ {
+ self = [super initWithFrame:frame];
+ }
+
+ return self;
+}
+
+@end
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/macosx/HBImageAndTextCell.m -> HandBrake-0.10.0.tar.bz2/macosx/HBImageAndTextCell.m Changed

HandBrake-0.10.0.tar.bz2/macosx/HBJob.h Added

@@ -0,0 +1,56 @@
+/* HBJob.h $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import <Foundation/Foundation.h>
+
+#include "hb.h"
+
+@class HBPreset;
+
+@class HBVideo;
+@class HBPicture;
+@class HBFilters;
+
+@class HBAudioSettings;
+@class HBSubtitlesSettings;
+
+/**
+ * HBJob
+ */
+@interface HBJob : NSObject <NSCoding, NSCopying>
+
+- (instancetype)initWithTitle:(hb_title_t *)title url:(NSURL *)fileURL andPreset:(HBPreset *)preset;
+
+// libhb
+@property (nonatomic, readonly) hb_title_t *title;
+@property (nonatomic, readonly) NSURL *fileURL;
+
+// Old job format
+@property (nonatomic, readwrite, retain) NSDictionary *jobDict;
+@property (nonatomic, readonly) NSAttributedString *jobDescription;
+
+// Job settings
+
+@property (nonatomic, readwrite) int fileFormat;
+
+@property (nonatomic, readwrite) BOOL mp4LargeFile;
+@property (nonatomic, readwrite) BOOL mp4HttpOptimize;
+@property (nonatomic, readwrite) BOOL mp4iPodCompatible;
+
+@property (nonatomic, readonly) HBVideo *video;
+@property (nonatomic, readonly) HBPicture *picture;
+@property (nonatomic, readonly) HBFilters *filters;
+
+// Defaults settings
+@property (nonatomic, readonly) HBAudioSettings *audioSettings;
+@property (nonatomic, readonly) HBSubtitlesSettings *subtitlesSettings;
+
+// File resources
+@property (nonatomic, readonly) NSMutableArray *audioTracks;
+@property (nonatomic, readonly) NSMutableArray *subtitlesTracks;
+@property (nonatomic, readonly) NSMutableArray *chapters;
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBJob.m Added

@@ -0,0 +1,191 @@
+/* HBJob.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBJob.h"
+#import "HBAudioSettings.h"
+#import "HBSubtitlesSettings.h"
+#import "HBPreset.h"
+
+#include "lang.h"
+
+extern NSString *keyAudioTrackIndex;
+extern NSString *keyAudioTrackName;
+extern NSString *keyAudioInputBitrate;
+extern NSString *keyAudioInputSampleRate;
+extern NSString *keyAudioInputCodec;
+extern NSString *keyAudioInputCodecParam;
+extern NSString *keyAudioInputChannelLayout;
+extern NSString *keyAudioTrackLanguageIsoCode;
+
+extern NSString *keySubTrackName;
+extern NSString *keySubTrackIndex;
+extern NSString *keySubTrackLanguage;
+extern NSString *keySubTrackLanguageIsoCode;
+extern NSString *keySubTrackType;
+
+extern NSString *keySubTrackForced;
+extern NSString *keySubTrackBurned;
+extern NSString *keySubTrackDefault;
+
+extern NSString *keySubTrackSrtOffset;
+extern NSString *keySubTrackSrtFilePath;
+extern NSString *keySubTrackSrtCharCode;
+
+@implementation HBJob
+
+- (instancetype)initWithTitle:(hb_title_t *)title url:(NSURL *)fileURL andPreset:(HBPreset *)preset
+{
+ self = [super init];
+ if (self) {
+ _title = title;
+ _fileURL = [fileURL copy];
+
+ _audioTracks = [[NSMutableArray alloc] init];
+ _subtitlesTracks = [[NSMutableArray alloc] init];
+ _chapters = [[NSMutableArray alloc] init];
+
+ _audioSettings = [[HBAudioSettings alloc] init];
+ _subtitlesSettings = [[HBSubtitlesSettings alloc] init];
+
+ [self loadAudioTracks];
+ [self loadSubtitlesTracks];
+ [self loadChapters];
+ }
+ return self;
+}
+
+- (void)applyPreset:(HBPreset *)preset
+{
+ [self.audioSettings applySettingsFromPreset:preset.content];
+ [self.subtitlesSettings applySettingsFromPreset:preset.content];
+}
+
+#pragma mark - initialization
+
+- (void)loadAudioTracks
+{
+ hb_audio_config_t *audio;
+ hb_list_t *list = self.title->list_audio;
+ int count = hb_list_count(list);
+
+ // Initialize the audio list of available audio tracks from this title
+ for (int i = 0; i < count; i++)
+ {
+ audio = (hb_audio_config_t *) hb_list_audio_config_item(list, i);
+ [self.audioTracks addObject: @{keyAudioTrackIndex: @(i + 1),
+ keyAudioTrackName: [NSString stringWithFormat: @"%d: %s", i, audio->lang.description],
+ keyAudioInputBitrate: @(audio->in.bitrate / 1000),
+ keyAudioInputSampleRate: @(audio->in.samplerate),
+ keyAudioInputCodec: [NSNumber numberWithUnsignedInteger: audio->in.codec],
+ keyAudioInputCodecParam: [NSNumber numberWithUnsignedInteger: audio->in.codec_param],
+ keyAudioInputChannelLayout: @(audio->in.channel_layout),
+ keyAudioTrackLanguageIsoCode: @(audio->lang.iso639_2)}];
+ }
+}
+
+- (void)loadSubtitlesTracks
+{
+ hb_subtitle_t *subtitle;
+ hb_list_t *list = self.title->list_audio;
+ int count = hb_list_count(list);
+
+ NSMutableArray *forcedSourceNamesArray = [[NSMutableArray alloc] init];
+ //NSString *foreignAudioSearchTrackName = nil;
+
+ for (int i = 0; i < count; i++)
+ {
+ subtitle = (hb_subtitle_t *)hb_list_item(self.title->list_subtitle, i);
+
+ /* Human-readable representation of subtitle->source */
+ NSString *bitmapOrText = subtitle->format == PICTURESUB ? @"Bitmap" : @"Text";
+ NSString *subSourceName = @(hb_subsource_name(subtitle->source));
+
+ /* if the subtitle track can be forced, add its source name to the array */
+ if (hb_subtitle_can_force(subtitle->source) && [forcedSourceNamesArray containsObject:subSourceName] == NO)
+ {
+ [forcedSourceNamesArray addObject:subSourceName];
+ }
+
+ // Use the native language name if available
+ iso639_lang_t *language = lang_for_code2(subtitle->iso639_2);
+ NSString *nativeLanguage = strlen(language->native_name) ? @(language->native_name) : @(language->eng_name);
+
+ /* create a dictionary of source subtitle information to store in our array */
+ [self.subtitlesTracks addObject:@{keySubTrackName: [NSString stringWithFormat:@"%d: %@ (%@) (%@)", i, nativeLanguage, bitmapOrText, subSourceName],
+ keySubTrackIndex: @(i),
+ keySubTrackType: @(subtitle->source),
+ keySubTrackLanguage: nativeLanguage,
+ keySubTrackLanguageIsoCode: @(subtitle->iso639_2)}];
+ }
+
+ /* now set the name of the Foreign Audio Search track */
+ if ([forcedSourceNamesArray count])
+ {
+ [forcedSourceNamesArray sortUsingComparator:^(id obj1, id obj2)
+ {
+ return [((NSString *)obj1) compare:((NSString *)obj2)];
+ }];
+
+ NSString *tempList = @"";
+ for (NSString *tempString in forcedSourceNamesArray)
+ {
+ if ([tempList length])
+ {
+ tempList = [tempList stringByAppendingString:@", "];
+ }
+ tempList = [tempList stringByAppendingString:tempString];
+ }
+ //foreignAudioSearchTrackName = [NSString stringWithFormat:@"Foreign Audio Search (Bitmap) (%@)", tempList];
+ }
+ else
+ {
+ //foreignAudioSearchTrackName = @"Foreign Audio Search (Bitmap)";
+ }
+ [forcedSourceNamesArray release];
+}
+
+- (void)loadChapters
+{
+ for (int i = 0; i < hb_list_count(self.title->job->list_chapter); i++)
+ {
+ hb_chapter_t *chapter = hb_list_item(self.title->job->list_chapter, i);
+ if (chapter != NULL)
+ {
+ if (chapter->title != NULL)
+ {
+ [self.chapters addObject:[NSString
+ stringWithFormat:@"%s",
+ chapter->title]];
+ }
+ else
+ {
+ [self.chapters addObject:[NSString
+ stringWithFormat:@"Chapter %d",
+ i + 1]];
+ }
+ }
+ }
+}
+
+#pragma mark - NSCoding
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+}
+
+- (id)initWithCoder:(NSCoder *)decoder
+{
+ return nil;
+}
+
+#pragma mark - NSCopying
+
+- (instancetype)copyWithZone:(NSZone *)zone
+{
+ return nil;
+}
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBLanguagesSelection.h Added

@@ -0,0 +1,57 @@
+/* HBLanguagesSelection.h $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import <Foundation/Foundation.h>
+#import <Cocoa/Cocoa.h>
+
+/**
+ * A collection of KVO enabled model and controllers class
+ * used to populate the languages selection table view
+ */
+
+/**
+ * HBLang
+ */
+@interface HBLang : NSObject <NSCopying>
+
+@property (nonatomic, readwrite) BOOL isSelected;
+@property (nonatomic, readonly) NSString *language;
+@property (nonatomic, readonly) NSString *iso639_2;
+
+- (instancetype)initWithLanguage:(NSString *)value iso639_2code:(NSString *)code;
+
+@end;
+
+/**
+ * HBLanguagesSelection
+ */
+@interface HBLanguagesSelection : NSObject
+
+@property (nonatomic, readonly) NSMutableArray *languagesArray;
+@property (nonatomic, readonly) NSArray *selectedLanguages;
+
+- (instancetype)initWithLanguages:(NSArray *)languages;
+
+@end
+
+/**
+ * HBLanguageArrayController
+ */
+@interface HBLanguageArrayController : NSArrayController <NSTableViewDelegate>
+
+/**
+ * Set whether to show only the selected languages or all languages
+ */
+@property (nonatomic, readwrite) BOOL showSelectedOnly;
+
+/**
+ * Set whether the user can drag the table view's elements.
+ */
+@property (nonatomic, readwrite) BOOL isDragginEnabled;
+
+@property (assign) IBOutlet NSTableView *tableView;
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBLanguagesSelection.m Added

@@ -0,0 +1,302 @@
+/* HBLanguagesSelection.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBLanguagesSelection.h"
+#include "lang.h"
+
+@implementation HBLang
+
+- (instancetype)initWithLanguage:(NSString *)value iso639_2code:(NSString *)code
+{
+ self = [super init];
+ if (self)
+ {
+ _language = [value retain];
+ _iso639_2 = [code retain];
+ }
+ return self;
+}
+
+- (instancetype)copyWithZone:(NSZone *)zone
+{
+ HBLang *lang = [[self class] allocWithZone:zone];
+
+ lang->_isSelected = self.isSelected;
+ lang->_language = [self.language retain];
+ lang->_iso639_2 = [self.iso639_2 retain];
+
+ return lang;
+}
+
+- (void)dealloc
+{
+ [_language release];
+ [_iso639_2 release];
+
+ [super dealloc];
+}
+
+- (NSString *)description
+{
+ return self.language;
+}
+
+@end
+
+@implementation HBLanguagesSelection
+
+- (instancetype)init
+{
+ self = [self initWithLanguages:nil];
+ return self;
+}
+
+- (instancetype)initWithLanguages:(NSArray *)languages
+{
+ self = [super init];
+ if (self)
+ {
+ NSMutableArray *internal = [[NSMutableArray alloc] init];
+ NSMutableArray *selected = [[NSMutableArray alloc] init];
+
+ const iso639_lang_t *lang = lang_get_next(NULL);
+ for (lang = lang_get_next(lang); lang != NULL; lang = lang_get_next(lang))
+ {
+ NSString *nativeLanguage = strlen(lang->native_name) ? @(lang->native_name) : @(lang->eng_name);
+
+ HBLang *item = [[HBLang alloc] initWithLanguage:nativeLanguage
+ iso639_2code:@(lang->iso639_2)];
+ if ([languages containsObject:item.iso639_2])
+ {
+ item.isSelected = YES;
+ [selected addObject:item];
+ }
+ else
+ {
+ [internal addObject:item];
+ }
+ 
+ [item release];
+ }
+
+ // Add the (Any) item.
+ HBLang *item = [[[HBLang alloc] initWithLanguage:@"(Any)"
+ iso639_2code:@"und"] autorelease];
+ if ([languages containsObject:item.iso639_2])
+ {
+ item.isSelected = YES;
+ }
+ [internal insertObject:item atIndex:0];
+
+ // Insert the selected items
+ // in the original order.
+ [selected sortUsingComparator:^NSComparisonResult(id obj1, id obj2) {
+ return [languages indexOfObject:[obj1 iso639_2]] - [languages indexOfObject:[obj2 iso639_2]];
+ }];
+
+ [internal insertObjects:selected
+ atIndexes:[NSIndexSet indexSetWithIndexesInRange:(NSMakeRange(1, selected.count))]];
+ [selected release];
+
+ _languagesArray = internal;
+ }
+
+ return self;
+}
+
+- (NSArray *)selectedLanguages
+{
+ NSMutableArray *selected = [[[NSMutableArray alloc] init] autorelease];
+ for (HBLang *lang in self.languagesArray)
+ {
+ if (lang.isSelected)
+ {
+ [selected addObject:lang.iso639_2];
+ }
+ }
+
+ return [[selected copy] autorelease];
+}
+
+- (void)dealloc
+{
+ [_languagesArray release];
+
+ [super dealloc];
+}
+
+@end
+
+NSString *kHBLanguagesDragRowsType = @"kHBLanguagesDragRowsType";
+
+@implementation HBLanguageArrayController
+
+- (void)setShowSelectedOnly:(BOOL)showSelectedOnly
+{
+ _showSelectedOnly = showSelectedOnly;
+ [self rearrangeObjects];
+}
+
+- (NSArray *)arrangeObjects:(NSArray *)objects
+{
+ if (!self.showSelectedOnly) {
+ return [super arrangeObjects:objects];
+ }
+
+ // Returns a filtered array with only the selected items
+ NSMutableArray *filteredObjects = [NSMutableArray arrayWithCapacity:[objects count]];
+ for (id item in objects)
+ {
+ if ([[item valueForKeyPath:@"isSelected"] boolValue])
+ {
+ [filteredObjects addObject:item];
+ }
+ }
+
+ return [super arrangeObjects:filteredObjects];
+}
+
+- (void) awakeFromNib
+{
+	[self.tableView registerForDraggedTypes:@[kHBLanguagesDragRowsType]];
+	self.isDragginEnabled = YES;
+}
+
+#pragma mark - NSTableView Delegate
+
+- (NSString *)tableView:(NSTableView *)tableView typeSelectStringForTableColumn:(NSTableColumn *)tableColumn
+ row:(NSInteger)row
+{
+ if ([[tableColumn identifier] isEqualToString:@"name"])
+ {
+ NSUInteger tableColumnIndex = [[tableView tableColumns] indexOfObject:tableColumn];
+ return [[tableView preparedCellAtColumn:tableColumnIndex
+ row:row] stringValue];
+ }
+ return nil;
+}
+
+- (BOOL)tableView:(NSTableView *)tableView writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard *)pboard
+{
+ if (self.isDragginEnabled)
+	{
+ NSData *data = nil;
+ if (self.showSelectedOnly)
+ {
+ // If the show selected only filter
+ // is enabled, we need to modify the rowIndexes
+ // to match the position of the elements in the unfiltered array
+ NSArray *filteredArray = [[self arrangedObjects] copy];
+ self.showSelectedOnly = NO;
+ NSArray *unfilteredArray = [self arrangedObjects];
+
+ NSMutableIndexSet *unfilteredIndexes = [NSMutableIndexSet indexSet];
+ NSUInteger currentIndex = [rowIndexes firstIndex];
+ while (currentIndex != NSNotFound)
+ {
+ NSUInteger newIndex = [unfilteredArray indexOfObject:filteredArray[currentIndex]];
+ [unfilteredIndexes addIndex:newIndex];
+ currentIndex = [rowIndexes indexGreaterThanIndex:currentIndex];
+ }
+
+ data = [NSKeyedArchiver archivedDataWithRootObject:unfilteredIndexes];
+ [filteredArray release];
+ }
+ else
+ {
+ data = [NSKeyedArchiver archivedDataWithRootObject:rowIndexes];
+ }
+
+ [pboard declareTypes:@[kHBLanguagesDragRowsType] owner:self];
+ [pboard setData:data forType:kHBLanguagesDragRowsType];
+ }
+ 
+ return self.isDragginEnabled;
+}
+
+- (NSDragOperation)tableView:(NSTableView *)view
+ validateDrop:(id <NSDraggingInfo>)info
+ proposedRow:(NSInteger)row
+ proposedDropOperation:(NSTableViewDropOperation)operation
+{
+ NSDragOperation dragOp = NSDragOperationNone;
+
+ // if drag source is our own table view, it's a move or a copy
+ if ([info draggingSource] == view)
+	{
+		// At a minimum, allow move
+		dragOp = NSDragOperationMove;
+ }
+
+ [view setDropRow:row dropOperation:NSTableViewDropAbove];
+
+ return dragOp;
+}
+
+- (BOOL)tableView:(NSTableView *)view acceptDrop:(id <NSDraggingInfo>)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)operation
+{
+ if (([info draggingSourceOperationMask] == NSDragOperationCopy))
+ {
+ return NO;
+ }
+
+ if ([info draggingSource] == view)
+ {
+ // Get the index set from the pasteBoard.
+ NSData *rowData = [[info draggingPasteboard] dataForType:kHBLanguagesDragRowsType];
+ NSIndexSet *indexSet = [NSKeyedUnarchiver unarchiveObjectWithData:rowData];
+
+ NSUInteger i = [indexSet countOfIndexesInRange:NSMakeRange(0, row)];
+
+ // Rearrage the objects.
+ [self moveObjectsInArrangedObjectsFromIndexes:indexSet toIndex:row];
+
+ // Update the selection.
+ row -= i;
+ NSIndexSet *selectionSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(row, [indexSet count])];
+ [view selectRowIndexes:selectionSet byExtendingSelection:NO];
+
+		return YES;
+ }
+
+ return NO;
+}
+
+- (void)moveObjectsInArrangedObjectsFromIndexes:(NSIndexSet *)indexSet toIndex:(NSUInteger)insertIndex
+{
+ NSArray	*objects = [self arrangedObjects];
+
+ NSInteger aboveInsertIndexCount = 0;
+ NSInteger removeIndex;
+
+ NSUInteger thisIndex = [indexSet lastIndex];
+ while (thisIndex != NSNotFound)
+	{
+		if (thisIndex >= insertIndex)
+		{
+			removeIndex = thisIndex + aboveInsertIndexCount;
+			aboveInsertIndexCount += 1;
+		}
+		else
+		{
+			removeIndex = thisIndex;
+			insertIndex -= 1;
+		}
+
+		// Get the object we're moving
+		id object = objects[removeIndex];
+
+		// Move the object
+		[object retain];
+		[self removeObjectAtArrangedObjectIndex:removeIndex];
+		[self insertObject:object atArrangedObjectIndex:insertIndex];
+		[object release];
+
+		thisIndex = [indexSet indexLessThanIndex:thisIndex];
+ }
+}
+
+@end

HandBrake-0.9.9.tar.bz2/macosx/HBOutputPanelController.m -> HandBrake-0.10.0.tar.bz2/macosx/HBOutputPanelController.m Changed

@@ -7,6 +7,7 @@
 
 #import "HBOutputPanelController.h"
 #import "HBOutputRedirect.h"
+#import "HBUtilities.h"
 
 /// Maximum amount of characters that can be shown in the view.
 // Original value used by cleaner
@@ -21,6 +22,9 @@
 // lets use this higher value for now for better gui debugging
 #define TextStorageLowerSizeLimit 120000
 
+@interface HBOutputPanelController () <HBOutputRedirectListening>
+@end
+
 @implementation HBOutputPanelController
 
 /**
@@ -48,8 +52,7 @@
 * default with the users text editor instead of the .log default Console.app, should
 * create less confusion for less experienced users when we ask them to paste the log for support
 */
- outputLogFile = @"~/Library/Application Support/HandBrake/HandBrake-activitylog.txt";
- outputLogFile = [[outputLogFile stringByExpandingTildeInPath]retain];
+ outputLogFile = [[[HBUtilities appSupportPath] stringByAppendingPathComponent:@"HandBrake-activitylog.txt"] retain];
 
 /* We check for an existing output log file here */
 if( [fileManager fileExistsAtPath:outputLogFile] == 0 )
@@ -131,10 +134,7 @@
 }
 else // if we are putting it in the default ~/Libraries/Application Support/HandBrake/EncodeLogs logs directory
 {
- NSString *libraryDir = [NSSearchPathForDirectoriesInDomains( NSLibraryDirectory,
- NSUserDomainMask,
- YES ) objectAtIndex:0];
- NSString *encodeLogDirectory = [[[libraryDir stringByAppendingPathComponent:@"Application Support"] stringByAppendingPathComponent:@"HandBrake"] stringByAppendingPathComponent:@"EncodeLogs"];
+ NSString *encodeLogDirectory = [[HBUtilities appSupportPath] stringByAppendingPathComponent:@"EncodeLogs"];
 if( ![[NSFileManager defaultManager] fileExistsAtPath:encodeLogDirectory] )
 {
 [[NSFileManager defaultManager] createDirectoryAtPath:encodeLogDirectory
@@ -252,10 +252,7 @@
 - (IBAction)openEncodeLogDirectory:(id)sender
 {
 /* Opens the activity window log file in the users default text editor */
- NSString *libraryDir = [NSSearchPathForDirectoriesInDomains( NSLibraryDirectory,
- NSUserDomainMask,
- YES ) objectAtIndex:0];
- NSString *encodeLogDirectory = [[[libraryDir stringByAppendingPathComponent:@"Application Support"] stringByAppendingPathComponent:@"HandBrake"] stringByAppendingPathComponent:@"EncodeLogs"];
+ NSString *encodeLogDirectory = [[HBUtilities appSupportPath] stringByAppendingPathComponent:@"EncodeLogs"];
 if( ![[NSFileManager defaultManager] fileExistsAtPath:encodeLogDirectory] )
 {
 [[NSFileManager defaultManager] createDirectoryAtPath:encodeLogDirectory

HandBrake-0.9.9.tar.bz2/macosx/HBOutputRedirect.h -> HandBrake-0.10.0.tar.bz2/macosx/HBOutputRedirect.h Changed

HandBrake-0.9.9.tar.bz2/macosx/HBOutputRedirect.m -> HandBrake-0.10.0.tar.bz2/macosx/HBOutputRedirect.m Changed

@@ -13,6 +13,9 @@
 /// Global pointer to HBOutputRedirect object that manages redirects for stderr.
 static HBOutputRedirect *g_stderrRedirect = nil;
 
+static int stdoutwrite(void *inFD, const char *buffer, int size);
+static int stderrwrite(void *inFD, const char *buffer, int size);
+
 @interface HBOutputRedirect (Private)
 - (id)initWithStream:(FILE *)aStream selector:(SEL)aSelector;
 - (void)startRedirect;
@@ -74,7 +77,7 @@
 * Adds specified object as listener for this output. Method @c stdoutRedirect:
 * or @c stderrRedirect: of the listener is called to redirect the output.
 */
-- (void)addListener:(id)aListener
+- (void)addListener:(id <HBOutputRedirectListening>)aListener
 {
 	NSAssert2([aListener respondsToSelector:forwardingSelector], @"Object %@ doesn't respond to selector \"%@\"", aListener, NSStringFromSelector(forwardingSelector));
 
@@ -91,7 +94,7 @@
 /**
 * Stops forwarding for this output to the specified listener object.
 */
-- (void)removeListener:(id)aListener
+- (void)removeListener:(id <HBOutputRedirectListening>)aListener
 {
 	if ([listeners containsObject:aListener])
 	{
@@ -135,7 +138,6 @@
 		forwardingSelector = aSelector;
 		stream = aStream;
 		oldWriteFunc = NULL;
-		lock = [[NSLock alloc] init];
 	}
 	return self;
 }

HandBrake-0.10.0.tar.bz2/macosx/HBPicture.h Added

HandBrake-0.10.0.tar.bz2/macosx/HBPicture.m Added

HandBrake-0.9.9.tar.bz2/macosx/HBPreferencesController.h -> HandBrake-0.10.0.tar.bz2/macosx/HBPreferencesController.h Changed

HandBrake-0.9.9.tar.bz2/macosx/HBPreferencesController.m -> HandBrake-0.10.0.tar.bz2/macosx/HBPreferencesController.m Changed

@@ -4,8 +4,9 @@
 */
 
 #import "HBPreferencesController.h"
+#import "HBLanguagesSelection.h"
+
 #define TOOLBAR_GENERAL @"TOOLBAR_GENERAL"
-#define TOOLBAR_PICTURE @"TOOLBAR_PICTURE"
 #define TOOLBAR_AUDIO @"TOOLBAR_AUDIO"
 #define TOOLBAR_ADVANCED @"TOOLBAR_ADVANCED"
 
@@ -20,13 +21,27 @@
 * preference settings are added that cannot be handled with Cocoa bindings).
 */
 
-@interface HBPreferencesController (Private)
+@interface HBPreferencesController () <NSTokenFieldDelegate>
+{
+ IBOutlet NSView * fGeneralView, * fAudioView, * fAdvancedView;
+ IBOutlet NSTextField * fSendEncodeToAppField;
+}
+
+/* Manage the send encode to xxx.app windows and field */
+- (IBAction) browseSendToApp: (id) sender;
 
 - (void) setPrefView: (id) sender;
 - (NSToolbarItem *)toolbarItemWithIdentifier: (NSString *)identifier
 label: (NSString *)label
 image: (NSImage *)image;
 
+@property (assign) IBOutlet NSTokenField *formatTokenField;
+@property (assign) IBOutlet NSTokenField *builtInTokenField;
+@property (nonatomic, readonly) NSArray *buildInFormatTokens;
+@property (nonatomic, retain) NSArray *matches;
+
+@property (nonatomic, retain) HBLanguagesSelection *languages;
+
 @end
 
 @implementation HBPreferencesController
@@ -41,31 +56,28 @@
 {
 NSString *desktopDirectory = [@"~/Desktop" stringByExpandingTildeInPath];
 
- [[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
- @"YES", @"CheckForUpdates",
- @"Open Source", @"LaunchSourceBehavior",
- @"English", @"DefaultLanguage",
- @"YES", @"UseCoreAudio",
- @"Auto", @"DefaultMpegExtension",
- @"YES", @"UseDvdNav",
- @"", @"DefAdvancedx264Flags",
- @"YES", @"DefaultPresetsDrawerShow",
- desktopDirectory, @"LastDestinationDirectory",
- desktopDirectory, @"LastSourceDirectory",
- @"NO", @"DefaultAutoNaming",
- @"NO", @"DisableDvdAutoDetect",
- @"Alert Window", @"AlertWhenDone",
- @"YES", @"AlertWhenDoneSound",
- @"1", @"LoggingLevel",
- @"NO", @"EncodeLogLocation",
- @"10", @"MinTitleScanSeconds",
- @"10", @"PreviewsNumber",
- @"", @"Drawer Size",
- @"0.25", @"x264CqSliderFractional",
- @"YES", @"AlertBuiltInPresetUpdate",
- @"MetaX", @"SendCompletedEncodeToApp",
- @"NO", @"ShowAdvancedOptsForAutoPassthru",
- nil]];
+ [[NSUserDefaults standardUserDefaults] registerDefaults:@{
+ @"LaunchSourceBehavior": @"Open Source",
+ @"DefaultLanguage": @"English",
+ @"DefaultMpegExtension": @"Auto",
+ @"UseDvdNav": @"YES",
+ @"HBDefaultPresetsDrawerShow": @YES,
+ @"LastDestinationDirectory": desktopDirectory,
+ @"LastSourceDirectory": desktopDirectory,
+ @"DefaultAutoNaming": @NO,
+ @"AlertWhenDone": @"Alert Window",
+ @"AlertWhenDoneSound": @"YES",
+ @"LoggingLevel": @"1",
+ @"EncodeLogLocation": @"NO",
+ @"MinTitleScanSeconds": @"10",
+ @"PreviewsNumber": @"10",
+ @"Drawer Size": @"",
+ @"x264CqSliderFractional": @"0.25",
+ @"AlertBuiltInPresetUpdate": @"YES",
+ @"SendCompletedEncodeToApp": @"MetaX",
+ @"HBShowAdvancedTab": @NO,
+ @"HBAutoNamingFormat": @[@"{Source}", @" ", @"{Title}"]
+ }];
 }
 
 /**
@@ -78,11 +90,18 @@
 {
 if (self = [super initWithWindowNibName:@"Preferences"])
 {
+ _languages = [[HBLanguagesSelection alloc] init];
 NSAssert([self window], @"[HBPreferencesController init] window outlet is not connected in Preferences.nib");
 }
 return self;
 }
 
+- (void)dealloc
+{
+ [_languages release];
+ [super dealloc];
+}
+
 /**
 * -[HBPreferencesController awakeFromNib]
 *
@@ -99,6 +118,14 @@
 [toolbar setSizeMode: NSToolbarSizeModeRegular];
 [[self window] setToolbar: toolbar];
 
+ // Format token field initialization
+ [self.formatTokenField setTokenizingCharacterSet:[NSCharacterSet characterSetWithCharactersInString:@"%%"]];
+ [self.formatTokenField setCompletionDelay:0.2];
+
+ _buildInFormatTokens = [@[@"{Source}", @"{Title}", @"{Date}", @"{Time}", @"{Chapters}", @"{Quality/Bitrate}"] retain];
+ [self.builtInTokenField setTokenizingCharacterSet:[NSCharacterSet characterSetWithCharactersInString:@"%%"]];
+ [self.builtInTokenField setStringValue:[self.buildInFormatTokens componentsJoinedByString:@"%%"]];
+
 [toolbar setSelectedItemIdentifier: TOOLBAR_GENERAL];
 [self setPrefView:nil];
 }
@@ -113,12 +140,6 @@
 label:NSLocalizedString(@"General", @"Preferences General Toolbar Item")
 image:[NSImage imageNamed:@"settings"]];
 }
- else if ( [ident isEqualToString:TOOLBAR_PICTURE] )
- {
- return [self toolbarItemWithIdentifier:ident
- label:NSLocalizedString(@"Picture", @"Preferences Picture Toolbar Item")
- image:[NSImage imageNamed:@"picturesettings"]];
- }
 else if ( [ident isEqualToString:TOOLBAR_AUDIO] )
 {
 return [self toolbarItemWithIdentifier:ident
@@ -147,8 +168,7 @@
 
 - (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar
 {
- return [NSArray arrayWithObjects: TOOLBAR_GENERAL, /*TOOLBAR_PICTURE, */
- TOOLBAR_AUDIO, TOOLBAR_ADVANCED, nil];
+ return @[TOOLBAR_GENERAL, TOOLBAR_AUDIO, TOOLBAR_ADVANCED];
 }
 
 /* Manage the send encode to xxx.app windows and field */
@@ -170,34 +190,87 @@
 	{
 		sendToAppDirectory = @"/Applications";
 	}
- [panel beginSheetForDirectory: sendToAppDirectory file: nil types: nil
- modalForWindow: [self window] modalDelegate: self
- didEndSelector: @selector( browseSendToAppDone:returnCode:contextInfo: )
- contextInfo: sender]; 
+ [panel setDirectoryURL:[NSURL fileURLWithPath:sendToAppDirectory]];
+
+ [panel beginSheetModalForWindow:[self window] completionHandler:^(NSInteger result) {
+ if (result == NSOKButton)
+ {
+ NSURL *sendToAppURL = [panel URL];
+ NSURL *sendToAppDirectory = [sendToAppURL URLByDeletingLastPathComponent];
+ [[NSUserDefaults standardUserDefaults] setObject:[sendToAppDirectory path] forKey:@"LastSendToAppDirectory"];
+
+ NSString *sendToAppName = [[sendToAppURL lastPathComponent] stringByDeletingPathExtension];
+ /* we set the name of the app to send to in the display field */
+ [fSendEncodeToAppField setStringValue:sendToAppName];
+ [[NSUserDefaults standardUserDefaults] setObject:[fSendEncodeToAppField stringValue] forKey:@"SendCompletedEncodeToApp"];
+ }
+ }];
+}
+
+#pragma mark - Format Token Field Delegate
+
+- (NSString *)tokenField:(NSTokenField *)tokenField displayStringForRepresentedObject:(id)representedObject
+{
+ if ([representedObject rangeOfString: @"{"].location == 0)
+ {
+ return [(NSString *)representedObject substringWithRange:NSMakeRange(1, [(NSString*)representedObject length]-2)];
+ }
+
+ return representedObject;
 }
 
-- (void) browseSendToAppDone: (NSOpenPanel *) sheet
- returnCode: (int) returnCode contextInfo: (void *) contextInfo
+- (NSTokenStyle)tokenField:(NSTokenField *)tokenField styleForRepresentedObject:(id)representedObject
 {
- if( returnCode == NSOKButton )
+ if ([representedObject rangeOfString: @"{"].location == 0)
 {
- NSString *sendToAppPath = [[sheet filenames] objectAtIndex: 0];
- NSString *sendToAppDirectory = [sendToAppPath stringByDeletingLastPathComponent];
- [[NSUserDefaults standardUserDefaults] setObject:sendToAppDirectory forKey:@"LastSendToAppDirectory"];
- [sheet orderOut: self];
- NSString *sendToAppName;
- sendToAppName = [[sendToAppPath lastPathComponent] stringByDeletingPathExtension];
- /* we set the name of the app to send to in the display field */
- [fSendEncodeToAppField setStringValue:sendToAppName];
- [[NSUserDefaults standardUserDefaults] setObject:[fSendEncodeToAppField stringValue] forKey:@"SendCompletedEncodeToApp"];
- 
+ return NSRoundedTokenStyle;
+ }
+ else
+ {
+ return NSPlainTextTokenStyle;
 }
 }
 
+- (id)tokenField:(NSTokenField *)tokenField representedObjectForEditingString:(NSString *)editingString
+{
+ return editingString;
+}
+
+- (NSArray *)tokenField:(NSTokenField *)tokenField completionsForSubstring:(NSString *)substring indexOfToken:(NSInteger)tokenIndex
+ indexOfSelectedItem:(NSInteger *)selectedIndex
+{
+ self.matches = [self.buildInFormatTokens filteredArrayUsingPredicate:
+ [NSPredicate predicateWithFormat:@"SELF beginswith[cd] %@", substring]];
+ return self.matches;
+}
+
+- (NSString *)tokenField:(NSTokenField *)tokenField editingStringForRepresentedObject:(id)representedObject
+{
+ if ([representedObject rangeOfString: @"{"].location == 0)
+ {
+ return [NSString stringWithFormat:@"%%%@%%", representedObject];
+ }
+ else
+ {
+ return representedObject;
+ }
+}
+
+- (NSArray *)tokenField:(NSTokenField *)tokenField shouldAddObjects:(NSArray *)tokens atIndex:(NSUInteger)index
+{
+ return tokens;
+}
+
+- (BOOL)tokenField:(NSTokenField *)tokenField writeRepresentedObjects:(NSArray *)objects toPasteboard:(NSPasteboard *)pboard
+{
+ NSString *format = [objects componentsJoinedByString:@"%%"];
+ [pboard setString:format forType:NSPasteboardTypeString];
+
+ return YES;
+}
 
-@end
 
-@implementation HBPreferencesController (Private)
+#pragma mark - Private methods
 
 - (void) setPrefView: (id) sender
 {
@@ -205,9 +278,7 @@
 if( sender )
 {
 NSString * identifier = [sender itemIdentifier];
- if( [identifier isEqualToString: TOOLBAR_PICTURE] )
- view = fPictureView;
- else if( [identifier isEqualToString: TOOLBAR_AUDIO] )
+ if( [identifier isEqualToString: TOOLBAR_AUDIO] )
 view = fAudioView;
 else if( [identifier isEqualToString: TOOLBAR_ADVANCED] )
 view = fAdvancedView;

HandBrake-0.10.0.tar.bz2/macosx/HBPreset.h Added

HandBrake-0.10.0.tar.bz2/macosx/HBPreset.m Added

@@ -0,0 +1,104 @@
+/* HBPreset.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBPreset.h"
+
+@implementation HBPreset
+
+- (instancetype)initWithName:(NSString *)title content:(NSDictionary *)content builtIn:(BOOL)builtIn;
+{
+ self = [self init];
+ if (self)
+ {
+ _name = [title copy];
+ _isBuiltIn = builtIn;
+ _content = [content retain];
+ _presetDescription = [content[@"PresetDescription"] copy];
+ }
+ return self;
+}
+
+- (instancetype)initWithFolderName:(NSString *)title builtIn:(BOOL)builtIn;
+{
+ self = [self init];
+ if (self)
+ {
+ _name = [title copy];
+ _isBuiltIn = builtIn;
+ self.isLeaf = NO;
+ }
+ return self;
+}
+
+- (instancetype)init
+{
+ self = [super init];
+ if (self)
+ {
+ _name = @"New Preset";
+ _presetDescription = @"";
+ self.isLeaf = YES;
+ }
+ return self;
+}
+
+- (void)dealloc
+{
+ [_name release];
+ [_content release];
+ [_presetDescription release];
+
+ [super dealloc];
+}
+
+- (id)copyWithZone:(NSZone *)zone
+{
+ HBPreset *node = [[self class] allocWithZone:zone];
+ node->_name = [self.name copy];
+ node->_content = [self.content copy];
+ node->_presetDescription = [self.presetDescription copy];
+ for (HBPreset *children in self.children)
+ {
+ [node.children addObject:[[children copy] autorelease]];
+ }
+
+ return node;
+}
+
+- (NSUInteger)hash
+{
+ return self.name.hash + self.isBuiltIn + self.isLeaf;
+}
+
+- (void)setName:(NSString *)name
+{
+ [_name autorelease];
+ _name = [name copy];
+
+ [self.delegate nodeDidChange];
+}
+
+#pragma mark - KVC
+
+- (BOOL)validateName:(id *)ioValue error:(NSError * __autoreleasing *)outError
+{
+ // Return an error is the name is empty
+ if (![*ioValue length])
+ {
+ if (outError)
+ {
+ *outError = [[NSError alloc] initWithDomain:@"HBErrorDomain"
+ code:0
+ userInfo:@{NSLocalizedDescriptionKey:@"The preset title cannot be empty.",
+ NSLocalizedRecoverySuggestionErrorKey:@"Please enter a title."}];
+ }
+ return NO;
+ }
+
+ return YES;
+}
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBPresetsManager.h Added

@@ -0,0 +1,81 @@
+/* HBPresetsManager.h $
+ 
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import <Cocoa/Cocoa.h>
+
+@class HBPreset;
+
+/**
+ * Posted when a preset is changed/added/deleted.
+ */
+extern NSString *HBPresetsChangedNotification;
+
+/**
+ * HBPresetManager
+ * Manages the load/save of presets to an in memory tree.
+ */
+@interface HBPresetsManager : NSObject
+
+/**
+ * The root of the presets tree.
+ */
+@property (nonatomic, readonly) HBPreset *root;
+
+/**
+ * defaultPreset and its index path in the tree
+ */
+@property (nonatomic, readwrite, retain) HBPreset *defaultPreset;
+
+/**
+ * Returs a HBPresetManager with the presets loaded at the passed URL.
+ *
+ * @param url the URL of the presets file to load.
+ *
+ * @return the initialized presets manager.
+ */
+- (instancetype)initWithURL:(NSURL *)url;
+
+/**
+ * Checks the version number of the builtin presets.
+ *
+ * @return YES if the builtin presets are out of date.
+ */
+- (BOOL)checkBuiltInsForUpdates;
+
+/**
+ * Saves the presets to disk.
+ */
+- (BOOL)savePresets;
+
+/**
+ * Adds a given preset to the manager.
+ *
+ * @param preset the preset dict.
+ */
+- (void)addPreset:(NSDictionary *)preset;
+
+/**
+ * Deletes the presets at the specified index path.
+ *
+ * @param idx the NSIndexPath of the preset to delete.
+ */
+- (void)deletePresetAtIndexPath:(NSIndexPath *)idx;
+
+/**
+ * Returns the index path of the specified object.
+ *
+ * @param preset the preset.
+ *
+ * @return The index path whose corresponding value is equal to the preset. Returns nil if not found.
+ */
+- (NSIndexPath *)indexPathOfPreset:(HBPreset *)preset;
+
+/**
+ * Adds back the built in presets.
+ */
+- (void)generateBuiltInPresets;
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBPresetsManager.m Added

@@ -0,0 +1,1704 @@
+/* HBPresets.m $
+ 
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBPresetsManager.h"
+#import "HBPreset.h"
+
+#import "HBUtilities.h"
+
+NSString *HBPresetsChangedNotification = @"HBPresetsChangedNotification";
+
+@interface HBPresetsManager () <HBTreeNodeDelegate>
+
+@property (nonatomic, readonly, copy) NSURL *fileURL;
+
+/* Dictionaries for individual presets ("Devices" folder) */
+- (NSDictionary *)createUniversalPreset;
+- (NSDictionary *)createiPodPreset;
+- (NSDictionary *)createiPhoneiPodtouchPreset;
+- (NSDictionary *)createiPadPreset;
+- (NSDictionary *)createAppleTVPreset;
+- (NSDictionary *)createAppleTV2Preset;
+- (NSDictionary *)createAppleTV3Preset;
+- (NSDictionary *)createAndroidPreset;
+- (NSDictionary *)createAndroidTabletPreset;
+- (NSDictionary *)createW8PhonePreset;
+
+/* Dictionaries for individual presets ("Regular" folder) */
+- (NSDictionary *)createNormalPreset;
+- (NSDictionary *)createHighProfilePreset;
+
+@end
+
+@implementation HBPresetsManager
+
+- (instancetype)init
+{
+ self = [super init];
+ if (self)
+ {
+ // Init the root of the tree, it won't never be shown in the UI
+ _root = [[HBPreset alloc] initWithFolderName:@"Root" builtIn:YES];
+ _root.delegate = self;
+ }
+ return self;
+}
+
+- (instancetype)initWithURL:(NSURL *)url
+{
+ self = [self init];
+ if (self)
+ {
+ _fileURL = [url copy];
+ [self loadPresetsFromURL:url];
+ }
+ return self;
+}
+
+- (void)dealloc
+{
+ [_fileURL release];
+ [_defaultPreset release];
+
+ [_root release];
+
+ [super dealloc];
+}
+
+- (NSIndexPath *)indexPathOfPreset:(HBPreset *)preset
+{
+ __block NSIndexPath *retValue = nil;
+
+ // Visit the whole tree to find the index path.
+ [self.root enumerateObjectsUsingBlock:^(id obj, NSIndexPath *idx, BOOL *stop)
+ {
+ if ([obj isEqualTo:preset])
+ {
+ retValue = [idx retain];
+ *stop = YES;
+ }
+ }];
+
+ return [retValue autorelease];
+}
+
+#pragma mark - HBTreeNode delegate
+
+- (void)nodeDidChange
+{
+ [[NSNotificationCenter defaultCenter] postNotificationName:HBPresetsChangedNotification object:nil];
+}
+
+#pragma mark - Load/Save
+
+- (BOOL)loadPresetsFromURL:(NSURL *)url
+{
+ NSArray *presetsArray = [[NSArray alloc] initWithContentsOfURL:url];
+
+ for (NSDictionary *child in presetsArray)
+ {
+ [self.root.children addObject:[self loadFromDict:child]];
+ }
+
+ [presetsArray release];
+
+ // If the preset list is empty,
+ // readd the built in presets.
+ if (self.root.children.count == 0)
+ {
+ [self generateBuiltInPresets];
+ }
+
+ if (self.defaultPreset == nil)
+ {
+ [self selectNewDefault];
+ }
+
+ return YES;
+}
+
+- (BOOL)savePresetsToURL:(NSURL *)url
+{
+ NSMutableArray *presetsArray = [[[NSMutableArray alloc] init] autorelease];
+
+ for (HBPreset *node in self.root.children)
+ {
+ [presetsArray addObject:[self convertToDict:node]];
+ }
+
+ return [presetsArray writeToURL:url atomically:YES];
+ 
+ return YES;
+}
+
+- (BOOL)savePresets
+{
+ return [self savePresetsToURL:self.fileURL];
+}
+
+#pragma mark - NSDictionary conversions
+
+/**
+ * Converts the NSDictionary to a HBPreset object,
+ */
+- (HBPreset *)loadFromDict:(NSDictionary *)dict
+{
+ HBPreset *node = nil;
+ if ([dict[@"Folder"] boolValue])
+ {
+ node = [[[HBPreset alloc] initWithFolderName:dict[@"PresetName"]
+ builtIn:![dict[@"Type"] boolValue]] autorelease];
+
+ for (NSDictionary *child in dict[@"ChildrenArray"])
+ {
+ [node.children addObject:[self loadFromDict:child]];
+ }
+ }
+ else
+ {
+ node = [[[HBPreset alloc] initWithName:dict[@"PresetName"]
+ content:dict
+ builtIn:![dict[@"Type"] boolValue]] autorelease];
+ node.isDefault = [dict[@"Default"] boolValue];
+
+ if ([dict[@"Default"] boolValue])
+ {
+ self.defaultPreset = node;
+ }
+ }
+
+ if (!node.isBuiltIn)
+ {
+ node.delegate = self;
+ }
+
+ return node;
+}
+
+/**
+ * Converts the HBPreset and its childrens to a NSDictionary.
+ */
+- (NSDictionary *)convertToDict:(HBPreset *)node
+{
+ NSMutableDictionary *output = [[NSMutableDictionary alloc] init];
+ [output addEntriesFromDictionary:node.content];
+
+ output[@"PresetName"] = node.name;
+ output[@"Folder"] = @(!node.isLeaf);
+ output[@"Type"] = @(!node.isBuiltIn);
+ output[@"Default"] = @(node.isDefault);
+
+ if (!node.isLeaf)
+ {
+ NSMutableArray *childArray = [[NSMutableArray alloc] init];
+ for (HBPreset *child in node.children)
+ {
+ [childArray addObject:[self convertToDict:child]];
+ }
+
+ output[@"ChildrenArray"] = childArray;
+ [childArray release];
+ }
+
+ return [output autorelease];
+}
+
+#pragma mark - Presets Management
+
+- (BOOL)checkBuiltInsForUpdates
+{
+ __block BOOL retValue = NO;
+
+ [self.root enumerateObjectsUsingBlock:^(id obj, NSIndexPath *idx, BOOL *stop) {
+ NSDictionary *dict = [obj content];
+
+ if ([obj isBuiltIn] && [obj isLeaf])
+ {
+ if (!dict[@"PresetBuildNumber"] ||
+ [dict[@"PresetBuildNumber"] intValue] < [[[NSBundle mainBundle] infoDictionary][@"CFBundleVersion"] intValue])
+ {
+ retValue = YES;
+ *stop = YES;
+ }
+ }
+ }];
+
+ return retValue;
+}
+
+- (void)addPreset:(NSDictionary *)preset
+{
+ HBPreset *presetNode = [[HBPreset alloc] initWithName:preset[@"PresetName"]
+ content:preset
+ builtIn:NO];
+
+ [self.root insertObject:presetNode inChildrenAtIndex:[self.root countOfChildren]];
+ [presetNode release];
+
+ [self savePresets];
+}
+
+- (void)deletePresetAtIndexPath:(NSIndexPath *)idx
+{
+ HBPreset *parentNode = self.root;
+
+ // Find the preset parent array
+ // and delete it.
+ NSUInteger currIdx = 0;
+ NSUInteger i = 0;
+ for (i = 0; i < idx.length - 1; i++)
+ {
+ currIdx = [idx indexAtPosition:i];
+
+ if (parentNode.children.count > currIdx)
+ {
+ parentNode = [parentNode.children objectAtIndex:currIdx];
+ }
+ }
+
+ currIdx = [idx indexAtPosition:i];
+
+ if (parentNode.children.count > currIdx)
+ {
+ if ([[parentNode.children objectAtIndex:currIdx] isDefault])
+ {
+ [parentNode removeObjectFromChildrenAtIndex:currIdx];
+ // Try to select a new default preset
+ [self selectNewDefault];
+ }
+ else
+ {
+ [parentNode removeObjectFromChildrenAtIndex:currIdx];
+ }
+ }
+}
+
+/**
+ * Private method to select a new default
+ * when the default preset is deleted.
+ */
+- (void)selectNewDefault
+{
+ __block HBPreset *normalPreset = nil;
+ __block HBPreset *firstUserPreset = nil;
+
+ // Search for a possibile new default preset
+ // Try to use "Normal" or the first user preset.
+ [self.root enumerateObjectsUsingBlock:^(id obj, NSIndexPath *idx, BOOL *stop) {
+ if ([obj isBuiltIn] && [obj isLeaf])
+ {
+ if ([[obj name] isEqualToString:@"Normal"])
+ {
+ normalPreset = obj;
+ }
+ }
+ else if ([obj isLeaf])
+ {
+ firstUserPreset = obj;
+ *stop = YES;
+ }
+ }];
+
+ if (normalPreset)
+ {
+ self.defaultPreset = normalPreset;
+ normalPreset.isDefault = YES;
+ }
+ else if (firstUserPreset)
+ {
+ self.defaultPreset = firstUserPreset;
+ firstUserPreset.isDefault = YES;
+ }
+}
+
+- (void)setDefaultPreset:(HBPreset *)defaultPreset
+{
+ if (defaultPreset && defaultPreset.isLeaf)
+ {
+ if (_defaultPreset)
+ {
+ _defaultPreset.isDefault = NO;
+ [_defaultPreset autorelease];
+ }
+ defaultPreset.isDefault = YES;
+ _defaultPreset = [defaultPreset retain];
+
+ [self nodeDidChange];
+ }
+}
+
+#pragma mark - Built In Generation
+
+- (void)loadPresetsForType:(NSString *)type fromSel:(SEL[])selArray length:(int)len
+{
+ HBPreset *folderNode = [[HBPreset alloc] initWithFolderName:type builtIn:YES];
+
+ for (int i = 0; i < len; i++)
+ {
+ NSMutableDictionary *presetDict = [self performSelector:selArray[i]];
+ presetDict[@"PresetBuildNumber"] = [[NSBundle mainBundle] infoDictionary][@"CFBundleVersion"];
+ HBPreset *presetNode = [[HBPreset alloc] initWithName:presetDict[@"PresetName"]
+ content:presetDict
+ builtIn:YES];
+ [folderNode.children addObject:presetNode];
+ [presetNode release];
+ }
+
+ [self.root insertObject:folderNode inChildrenAtIndex:0];
+ [folderNode release];
+}
+
+/**
+ * Built-in preset folders at the root of the hierarchy
+ *
+ * Re-create new built-in presets programmatically and add them to the array
+ *
+ * Note: the built-in presets will *not* sort themselves alphabetically,
+ * so they will appear in the order you create them.
+ */
+- (void)generateBuiltInPresets
+{
+ SEL devicesPresets[] = { @selector(createUniversalPreset),
+ @selector(createiPodPreset),
+ @selector(createiPhoneiPodtouchPreset),
+ @selector(createiPadPreset),
+ @selector(createAppleTVPreset),
+ @selector(createAppleTV2Preset),
+ @selector(createAppleTV3Preset),
+ @selector(createAndroidPreset),
+ @selector(createAndroidTabletPreset),
+ @selector(createW8PhonePreset)
+ };
+ 
+ SEL regularPresets[] = { @selector(createNormalPreset),
+ @selector(createHighProfilePreset)};
+ 
+ [self deleteBuiltInPresets];
+
+ [self loadPresetsForType:@"Regular" fromSel:regularPresets length:2];
+ [self loadPresetsForType:@"Devices" fromSel:devicesPresets length:10];
+
+ if (self.defaultPreset == nil)
+ {
+ [self selectNewDefault];
+ }
+
+
+ [HBUtilities writeToActivityLog: "built in presets updated to build number: %d", [[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] intValue]];
+}
+
+- (void)deleteBuiltInPresets
+{
+ [self willChangeValueForKey:@"root"];
+ NSMutableArray *nodeToRemove = [[NSMutableArray alloc] init];
+ for (HBPreset *node in self.root.children)
+ {
+ if (node.isBuiltIn)
+ {
+ [nodeToRemove addObject:node];
+ }
+ }
+ [self.root.children removeObjectsInArray:nodeToRemove];
+ [nodeToRemove release];
+ [self didChangeValueForKey:@"root"];
+}
+
+#pragma mark -
+#pragma mark Individual Preset Definitions
+/* These NSDictionary definitions contain settings for one built-in preset */
+
+- (NSMutableDictionary *)createUniversalPreset
+{
+ NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
+ 
+ /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+ preset[@"PresetName"] = @"Universal";
+ preset[@"Type"] = @0; //factory
+ preset[@"Default"] = @0;
+ preset[@"Folder"] = @NO;
+ preset[@"PresetDescription"] = @"HandBrake's settings for compatibility with all Apple devices (including the iPod 6G and later). Includes Dolby Digital audio for surround sound.";
+ 
+ /* Container format and related settings */
+ preset[@"FileFormat"] = @"MP4 file";
+ preset[@"Mp4LargeFile"] = @0;
+ preset[@"Mp4HttpOptimize"] = @0;
+ preset[@"Mp4iPodCompatible"] = @0;
+ 
+ /* Chapter markers */
+ preset[@"ChapterMarkers"] = @1;
+ 
+ /* Video encoder and advanced options */
+ preset[@"VideoEncoder"] = @"H.264 (x264)";
+ preset[@"x264Option"] = @"";
+ preset[@"x264UseAdvancedOptions"] = @0;
+ preset[@"VideoPreset"] = @"fast";
+ preset[@"VideoTune"] = @"";
+ preset[@"VideoOptionExtra"] = @"";
+ preset[@"VideoProfile"] = @"baseline";
+ preset[@"VideoLevel"] = @"3.0";
+ 
+ /* Video rate control */
+ preset[@"VideoAvgBitrate"] = @"2500";
+ preset[@"VideoTwoPass"] = @0;
+ preset[@"VideoTurboTwoPass"] = @0;
+ preset[@"VideoQualityType"] = @2; //cq
+ preset[@"VideoQualitySlider"] = @20.0f;
+ 
+ /* Video frame rate */
+ preset[@"VideoFramerate"] = @"30";
+ preset[@"VideoFramerateMode"] = @"pfr";
+ 
+ /* Picture size */
+ preset[@"UsesPictureSettings"] = @1;
+ preset[@"PictureWidth"] = @720;
+ preset[@"PictureHeight"] = @576;
+ preset[@"PicturePAR"] = @2; //loose
+ preset[@"PictureModulus"] = @2;
+ preset[@"PictureKeepRatio"] = @0; //set to 0 for Loose (FIXME: why?)
+ 
+ /* Picture filters */
+ preset[@"UsesPictureFilters"] = @1;
+ preset[@"PictureDecomb"] = @0; //off
+ preset[@"PictureDecombCustom"] = @"";
+ preset[@"PictureDecombDeinterlace"] = @1; //decomb
+ preset[@"PictureDeinterlace"] = @0;
+ preset[@"PictureDeinterlaceCustom"] = @"";
+ preset[@"PictureDetelecine"] = @0;
+ preset[@"PictureDetelecineCustom"] = @"";
+ preset[@"PictureDenoise"] = @0;
+ preset[@"PictureDenoiseCustom"] = @"";
+ preset[@"PictureDeblock"] = @0;
+ preset[@"VideoGrayScale"] = @0;
+ 
+ /* Picture crop */
+ preset[@"PictureAutoCrop"] = @1;
+ preset[@"PictureTopCrop"] = @0;
+ preset[@"PictureBottomCrop"] = @0;
+ preset[@"PictureLeftCrop"] = @0;
+ preset[@"PictureRightCrop"] = @0;
+ 
+ /* Auto Passthru */
+ preset[@"AudioEncoderFallback"] = @"AC3 (ffmpeg)";
+ preset[@"AudioAllowAACPass"] = @1;
+ preset[@"AudioAllowAC3Pass"] = @1;
+ preset[@"AudioAllowDTSHDPass"] = @1;
+ preset[@"AudioAllowDTSPass"] = @1;
+ preset[@"AudioAllowMP3Pass"] = @1;
+ 
+ /* Audio track list - no need to add "None" at the end */
+ NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+ /* Track 1 */
+ NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
+ audioTrack1Array[@"AudioTrack"] = @1;
+ audioTrack1Array[@"AudioEncoder"] = @"AAC (avcodec)";
+ audioTrack1Array[@"AudioMixdown"] = @"Dolby Pro Logic II";
+ audioTrack1Array[@"AudioSamplerate"] = @"Auto";
+ audioTrack1Array[@"AudioBitrate"] = @"160";
+ audioTrack1Array[@"AudioTrackGainSlider"] = @0.0f;
+ audioTrack1Array[@"AudioTrackDRCSlider"] = @0.0f;
+ [audioTrack1Array autorelease];
+ [audioListArray addObject:audioTrack1Array];
+ /* Track 2 */
+ NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
+ audioTrack2Array[@"AudioTrack"] = @1;
+ audioTrack2Array[@"AudioEncoder"] = @"AC3 Passthru";
+ audioTrack2Array[@"AudioMixdown"] = @"None";
+ audioTrack2Array[@"AudioSamplerate"] = @"Auto";
+ audioTrack2Array[@"AudioBitrate"] = @"160";
+ audioTrack2Array[@"AudioTrackGainSlider"] = @0.0f;
+ audioTrack2Array[@"AudioTrackDRCSlider"] = @0.0f;
+ [audioTrack2Array autorelease];
+ [audioListArray addObject:audioTrack2Array];
+ /* Add the audio track(s) to the preset's audio list */
+ preset[@"AudioList"] = [NSMutableArray arrayWithArray:audioListArray];
+ [audioListArray release];
+ 
+ /* Subtitles (note: currently ignored) */
+ preset[@"Subtitles"] = @"None";
+ 
+ /* Clean up and return the preset */
+ [preset autorelease];
+ return preset;
+}
+
+- (NSMutableDictionary *)createiPodPreset
+{
+ NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
+ 
+ /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+ preset[@"PresetName"] = @"iPod";
+ preset[@"Type"] = @0; //factory
+ preset[@"Default"] = @0;
+ preset[@"Folder"] = @NO;
+ preset[@"PresetDescription"] = @"HandBrake's settings for playback on the iPod with Video (all generations).";
+ 
+ /* Container format and related settings */
+ preset[@"FileFormat"] = @"MP4 file";
+ preset[@"Mp4LargeFile"] = @0;
+ preset[@"Mp4HttpOptimize"] = @0;
+ preset[@"Mp4iPodCompatible"] = @1;
+ 
+ /* Chapter markers */
+ preset[@"ChapterMarkers"] = @1;
+ 
+ /* Video encoder and advanced options */
+ preset[@"VideoEncoder"] = @"H.264 (x264)";
+ preset[@"x264Option"] = @"";
+ preset[@"x264UseAdvancedOptions"] = @0;
+ preset[@"VideoPreset"] = @"medium";
+ preset[@"VideoTune"] = @"";
+ preset[@"VideoOptionExtra"] = @"";
+ preset[@"VideoProfile"] = @"baseline";
+ preset[@"VideoLevel"] = @"1.3";
+ 
+ /* Video rate control */
+ preset[@"VideoAvgBitrate"] = @"2500";
+ preset[@"VideoTwoPass"] = @0;
+ preset[@"VideoTurboTwoPass"] = @0;
+ preset[@"VideoQualityType"] = @2; //cq
+ preset[@"VideoQualitySlider"] = @22.0f;
+ 
+ /* Video frame rate */
+ preset[@"VideoFramerate"] = @"30";
+ preset[@"VideoFramerateMode"] = @"pfr";
+ 
+ /* Picture size */
+ preset[@"UsesPictureSettings"] = @1;
+ preset[@"PictureWidth"] = @320;
+ preset[@"PictureHeight"] = @240;
+ preset[@"PicturePAR"] = @0; //none
+ preset[@"PictureModulus"] = @2;
+ preset[@"PictureKeepRatio"] = @1;
+ 
+ /* Picture filters */
+ preset[@"UsesPictureFilters"] = @1;
+ preset[@"PictureDecomb"] = @0; //off
+ preset[@"PictureDecombCustom"] = @"";
+ preset[@"PictureDecombDeinterlace"] = @1; //decomb
+ preset[@"PictureDeinterlace"] = @0;
+ preset[@"PictureDeinterlaceCustom"] = @"";
+ preset[@"PictureDetelecine"] = @0;
+ preset[@"PictureDetelecineCustom"] = @"";
+ preset[@"PictureDenoise"] = @0;
+ preset[@"PictureDenoiseCustom"] = @"";
+ preset[@"PictureDeblock"] = @0;
+ preset[@"VideoGrayScale"] = @0;
+ 
+ /* Picture crop */
+ preset[@"PictureAutoCrop"] = @1;
+ preset[@"PictureTopCrop"] = @0;
+ preset[@"PictureBottomCrop"] = @0;
+ preset[@"PictureLeftCrop"] = @0;
+ preset[@"PictureRightCrop"] = @0;
+ 
+ /* Auto Passthru */
+ preset[@"AudioEncoderFallback"] = @"AC3 (ffmpeg)";
+ preset[@"AudioAllowAACPass"] = @1;
+ preset[@"AudioAllowAC3Pass"] = @1;
+ preset[@"AudioAllowDTSHDPass"] = @1;
+ preset[@"AudioAllowDTSPass"] = @1;
+ preset[@"AudioAllowMP3Pass"] = @1;
+ 
+ /* Audio track list - no need to add "None" at the end */
+ NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+ /* Track 1 */
+ NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
+ audioTrack1Array[@"AudioTrack"] = @1;
+ audioTrack1Array[@"AudioEncoder"] = @"AAC (avcodec)";
+ audioTrack1Array[@"AudioMixdown"] = @"Dolby Pro Logic II";
+ audioTrack1Array[@"AudioSamplerate"] = @"Auto";
+ audioTrack1Array[@"AudioBitrate"] = @"160";
+ audioTrack1Array[@"AudioTrackGainSlider"] = @0.0f;
+ audioTrack1Array[@"AudioTrackDRCSlider"] = @0.0f;
+ [audioTrack1Array autorelease];
+ [audioListArray addObject:audioTrack1Array];
+ /* Add the audio track(s) to the preset's audio list */
+ preset[@"AudioList"] = [NSMutableArray arrayWithArray:audioListArray];
+ [audioListArray release];
+ 
+ /* Subtitles (note: currently ignored) */
+ preset[@"Subtitles"] = @"None";
+ 
+ /* Clean up and return the preset */
+ [preset autorelease];
+ return preset;
+}
+
+- (NSMutableDictionary *)createiPhoneiPodtouchPreset
+{
+ NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
+ 
+ /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+ preset[@"PresetName"] = @"iPhone & iPod touch";
+ preset[@"Type"] = @0; //factory
+ preset[@"Default"] = @0;
+ preset[@"Folder"] = @NO;
+ preset[@"PresetDescription"] = @"HandBrake's settings for handheld iOS devices (iPhone 4, iPod touch 3G and later).";
+ 
+ /* Container format and related settings */
+ preset[@"FileFormat"] = @"MP4 file";
+ preset[@"Mp4LargeFile"] = @1;
+ preset[@"Mp4HttpOptimize"] = @0;
+ preset[@"Mp4iPodCompatible"] = @0;
+ 
+ /* Chapter markers */
+ preset[@"ChapterMarkers"] = @1;
+ 
+ /* Video encoder and advanced options */
+ preset[@"VideoEncoder"] = @"H.264 (x264)";
+ preset[@"x264Option"] = @"";
+ preset[@"x264UseAdvancedOptions"] = @0;
+ preset[@"VideoPreset"] = @"medium";
+ preset[@"VideoTune"] = @"";
+ preset[@"VideoOptionExtra"] = @"";
+ preset[@"VideoProfile"] = @"high";
+ preset[@"VideoLevel"] = @"3.1";
+ 
+ /* Video rate control */
+ preset[@"VideoAvgBitrate"] = @"2500";
+ preset[@"VideoTwoPass"] = @0;
+ preset[@"VideoTurboTwoPass"] = @0;
+ preset[@"VideoQualityType"] = @2; //cq
+ preset[@"VideoQualitySlider"] = @22.0f;
+ 
+ /* Video frame rate */
+ preset[@"VideoFramerate"] = @"30";
+ preset[@"VideoFramerateMode"] = @"pfr";
+ 
+ /* Picture size */
+ preset[@"UsesPictureSettings"] = @1;
+ preset[@"PictureWidth"] = @960;
+ preset[@"PictureHeight"] = @640;
+ preset[@"PicturePAR"] = @2; //loose
+ preset[@"PictureModulus"] = @2;
+ preset[@"PictureKeepRatio"] = @0; //set to 0 for Loose (FIXME: why?)
+ 
+ /* Picture filters */
+ preset[@"UsesPictureFilters"] = @1;
+ preset[@"PictureDecomb"] = @0; //off
+ preset[@"PictureDecombCustom"] = @"";
+ preset[@"PictureDecombDeinterlace"] = @1; //decomb
+ preset[@"PictureDeinterlace"] = @0;
+ preset[@"PictureDeinterlaceCustom"] = @"";
+ preset[@"PictureDetelecine"] = @0;
+ preset[@"PictureDetelecineCustom"] = @"";
+ preset[@"PictureDenoise"] = @0;
+ preset[@"PictureDenoiseCustom"] = @"";
+ preset[@"PictureDeblock"] = @0;
+ preset[@"VideoGrayScale"] = @0;
+ 
+ /* Picture crop */
+ preset[@"PictureAutoCrop"] = @1;
+ preset[@"PictureTopCrop"] = @0;
+ preset[@"PictureBottomCrop"] = @0;
+ preset[@"PictureLeftCrop"] = @0;
+ preset[@"PictureRightCrop"] = @0;
+ 
+ /* Auto Passthru */
+ preset[@"AudioEncoderFallback"] = @"AC3 (ffmpeg)";
+ preset[@"AudioAllowAACPass"] = @1;
+ preset[@"AudioAllowAC3Pass"] = @1;
+ preset[@"AudioAllowDTSHDPass"] = @1;
+ preset[@"AudioAllowDTSPass"] = @1;
+ preset[@"AudioAllowMP3Pass"] = @1;
+ 
+ /* Audio track list - no need to add "None" at the end */
+ NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+ /* Track 1 */
+ NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
+ audioTrack1Array[@"AudioTrack"] = @1;
+ audioTrack1Array[@"AudioEncoder"] = @"AAC (avcodec)";
+ audioTrack1Array[@"AudioMixdown"] = @"Dolby Pro Logic II";
+ audioTrack1Array[@"AudioSamplerate"] = @"Auto";
+ audioTrack1Array[@"AudioBitrate"] = @"160";
+ audioTrack1Array[@"AudioTrackGainSlider"] = @0.0f;
+ audioTrack1Array[@"AudioTrackDRCSlider"] = @0.0f;
+ [audioTrack1Array autorelease];
+ [audioListArray addObject:audioTrack1Array];
+ /* Add the audio track(s) to the preset's audio list */
+ preset[@"AudioList"] = [NSMutableArray arrayWithArray:audioListArray];
+ [audioListArray release];
+ 
+ /* Subtitles (note: currently ignored) */
+ preset[@"Subtitles"] = @"None";
+ 
+ /* Clean up and return the preset */
+ [preset autorelease];
+ return preset;
+}
+
+- (NSMutableDictionary *)createiPadPreset
+{
+ NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
+ 
+ /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+ preset[@"PresetName"] = @"iPad";
+ preset[@"Type"] = @0; //factory
+ preset[@"Default"] = @0;
+ preset[@"Folder"] = @NO;
+ preset[@"PresetDescription"] = @"HandBrake's settings for playback on the iPad (all generations).";
+ 
+ /* Container format and related settings */
+ preset[@"FileFormat"] = @"MP4 file";
+ preset[@"Mp4LargeFile"] = @1;
+ preset[@"Mp4HttpOptimize"] = @0;
+ preset[@"Mp4iPodCompatible"] = @0;
+ 
+ /* Chapter markers */
+ preset[@"ChapterMarkers"] = @1;
+ 
+ /* Video encoder and advanced options */
+ preset[@"VideoEncoder"] = @"H.264 (x264)";
+ preset[@"x264Option"] = @"";
+ preset[@"x264UseAdvancedOptions"] = @0;
+ preset[@"VideoPreset"] = @"medium";
+ preset[@"VideoTune"] = @"";
+ preset[@"VideoOptionExtra"] = @"";
+ preset[@"VideoProfile"] = @"high";
+ preset[@"VideoLevel"] = @"3.1";
+ 
+ /* Video rate control */
+ preset[@"VideoAvgBitrate"] = @"2500";
+ preset[@"VideoTwoPass"] = @0;
+ preset[@"VideoTurboTwoPass"] = @0;
+ preset[@"VideoQualityType"] = @2; //cq
+ preset[@"VideoQualitySlider"] = @20.0f;
+ 
+ /* Video frame rate */
+ preset[@"VideoFramerate"] = @"30";
+ preset[@"VideoFramerateMode"] = @"pfr";
+ 
+ /* Picture size */
+ preset[@"UsesPictureSettings"] = @1;
+ preset[@"PictureWidth"] = @1280;
+ preset[@"PictureHeight"] = @720;
+ preset[@"PicturePAR"] = @2; //loose
+ preset[@"PictureModulus"] = @2;
+ preset[@"PictureKeepRatio"] = @0; //set to 0 for Loose (FIXME: why?)
+ 
+ /* Picture filters */
+ preset[@"UsesPictureFilters"] = @1;
+ preset[@"PictureDecomb"] = @0; //off
+ preset[@"PictureDecombCustom"] = @"";
+ preset[@"PictureDecombDeinterlace"] = @1; //decomb
+ preset[@"PictureDeinterlace"] = @0;
+ preset[@"PictureDeinterlaceCustom"] = @"";
+ preset[@"PictureDetelecine"] = @0;
+ preset[@"PictureDetelecineCustom"] = @"";
+ preset[@"PictureDenoise"] = @0;
+ preset[@"PictureDenoiseCustom"] = @"";
+ preset[@"PictureDeblock"] = @0;
+ preset[@"VideoGrayScale"] = @0;
+ 
+ /* Picture crop */
+ preset[@"PictureAutoCrop"] = @1;
+ preset[@"PictureTopCrop"] = @0;
+ preset[@"PictureBottomCrop"] = @0;
+ preset[@"PictureLeftCrop"] = @0;
+ preset[@"PictureRightCrop"] = @0;
+ 
+ /* Auto Passthru */
+ preset[@"AudioEncoderFallback"] = @"AC3 (ffmpeg)";
+ preset[@"AudioAllowAACPass"] = @1;
+ preset[@"AudioAllowAC3Pass"] = @1;
+ preset[@"AudioAllowDTSHDPass"] = @1;
+ preset[@"AudioAllowDTSPass"] = @1;
+ preset[@"AudioAllowMP3Pass"] = @1;
+ 
+ /* Audio track list - no need to add "None" at the end */
+ NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+ /* Track 1 */
+ NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
+ audioTrack1Array[@"AudioTrack"] = @1;
+ audioTrack1Array[@"AudioEncoder"] = @"AAC (avcodec)";
+ audioTrack1Array[@"AudioMixdown"] = @"Dolby Pro Logic II";
+ audioTrack1Array[@"AudioSamplerate"] = @"Auto";
+ audioTrack1Array[@"AudioBitrate"] = @"160";
+ audioTrack1Array[@"AudioTrackGainSlider"] = @0.0f;
+ audioTrack1Array[@"AudioTrackDRCSlider"] = @0.0f;
+ [audioTrack1Array autorelease];
+ [audioListArray addObject:audioTrack1Array];
+ /* Add the audio track(s) to the preset's audio list */
+ preset[@"AudioList"] = [NSMutableArray arrayWithArray:audioListArray];
+ [audioListArray release];
+ 
+ /* Subtitles (note: currently ignored) */
+ preset[@"Subtitles"] = @"None";
+ 
+ /* Clean up and return the preset */
+ [preset autorelease];
+ return preset;
+}
+
+- (NSMutableDictionary *)createAppleTVPreset
+{
+ NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
+ 
+ /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+ preset[@"PresetName"] = @"AppleTV";
+ preset[@"Type"] = @0; //factory
+ preset[@"Default"] = @0;
+ preset[@"Folder"] = @NO;
+ preset[@"PresetDescription"] = @"HandBrake's settings for the original AppleTV. Includes Dolby Digital audio for surround sound. Also compatible with iOS devices released since 2009.";
+ 
+ /* Container format and related settings */
+ preset[@"FileFormat"] = @"MP4 file";
+ preset[@"Mp4LargeFile"] = @1;
+ preset[@"Mp4HttpOptimize"] = @0;
+ preset[@"Mp4iPodCompatible"] = @0;
+ 
+ /* Chapter markers */
+ preset[@"ChapterMarkers"] = @1;
+ 
+ /* Video encoder and advanced options */
+ preset[@"VideoEncoder"] = @"H.264 (x264)";
+ preset[@"x264Option"] = @"";
+ preset[@"x264UseAdvancedOptions"] = @0;
+ preset[@"VideoPreset"] = @"medium";
+ preset[@"VideoTune"] = @"";
+ preset[@"VideoOptionExtra"] = @"qpmin=4:cabac=0:ref=2:b-pyramid=none:weightb=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500";
+ preset[@"VideoProfile"] = @"high";
+ preset[@"VideoLevel"] = @"3.1";
+ 
+ /* Video rate control */
+ preset[@"VideoAvgBitrate"] = @"2500";
+ preset[@"VideoTwoPass"] = @0;
+ preset[@"VideoTurboTwoPass"] = @0;
+ preset[@"VideoQualityType"] = @2; //cq
+ preset[@"VideoQualitySlider"] = @20.0f;
+ 
+ /* Video frame rate */
+ preset[@"VideoFramerate"] = @"30";
+ preset[@"VideoFramerateMode"] = @"pfr";
+ 
+ /* Picture size */
+ preset[@"UsesPictureSettings"] = @1;
+ preset[@"PictureWidth"] = @960;
+ preset[@"PictureHeight"] = @720;
+ preset[@"PicturePAR"] = @2; //loose
+ preset[@"PictureModulus"] = @2;
+ preset[@"PictureKeepRatio"] = @0; //set to 0 for Loose (FIXME: why?)
+ 
+ /* Picture filters */
+ preset[@"UsesPictureFilters"] = @1;
+ preset[@"PictureDecomb"] = @0; //off
+ preset[@"PictureDecombCustom"] = @"";
+ preset[@"PictureDecombDeinterlace"] = @1; //decomb
+ preset[@"PictureDeinterlace"] = @0;
+ preset[@"PictureDeinterlaceCustom"] = @"";
+ preset[@"PictureDetelecine"] = @0;
+ preset[@"PictureDetelecineCustom"] = @"";
+ preset[@"PictureDenoise"] = @0;
+ preset[@"PictureDenoiseCustom"] = @"";
+ preset[@"PictureDeblock"] = @0;
+ preset[@"VideoGrayScale"] = @0;
+ 
+ /* Picture crop */
+ preset[@"PictureAutoCrop"] = @1;
+ preset[@"PictureTopCrop"] = @0;
+ preset[@"PictureBottomCrop"] = @0;
+ preset[@"PictureLeftCrop"] = @0;
+ preset[@"PictureRightCrop"] = @0;
+ 
+ /* Auto Passthru */
+ preset[@"AudioEncoderFallback"] = @"AC3 (ffmpeg)";
+ preset[@"AudioAllowAACPass"] = @1;
+ preset[@"AudioAllowAC3Pass"] = @1;
+ preset[@"AudioAllowDTSHDPass"] = @1;
+ preset[@"AudioAllowDTSPass"] = @1;
+ preset[@"AudioAllowMP3Pass"] = @1;
+ 
+ /* Audio track list - no need to add "None" at the end */
+ NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+ /* Track 1 */
+ NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
+ audioTrack1Array[@"AudioTrack"] = @1;
+ audioTrack1Array[@"AudioEncoder"] = @"AAC (avcodec)";
+ audioTrack1Array[@"AudioMixdown"] = @"Dolby Pro Logic II";
+ audioTrack1Array[@"AudioSamplerate"] = @"Auto";
+ audioTrack1Array[@"AudioBitrate"] = @"160";
+ audioTrack1Array[@"AudioTrackGainSlider"] = @0.0f;
+ audioTrack1Array[@"AudioTrackDRCSlider"] = @0.0f;
+ [audioTrack1Array autorelease];
+ [audioListArray addObject:audioTrack1Array];
+ /* Track 2 */
+ NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
+ audioTrack2Array[@"AudioTrack"] = @1;
+ audioTrack2Array[@"AudioEncoder"] = @"AC3 Passthru";
+ audioTrack2Array[@"AudioMixdown"] = @"None";
+ audioTrack2Array[@"AudioSamplerate"] = @"Auto";
+ audioTrack2Array[@"AudioBitrate"] = @"160";
+ audioTrack2Array[@"AudioTrackGainSlider"] = @0.0f;
+ audioTrack2Array[@"AudioTrackDRCSlider"] = @0.0f;
+ [audioTrack2Array autorelease];
+ [audioListArray addObject:audioTrack2Array];
+ /* Add the audio track(s) to the preset's audio list */
+ preset[@"AudioList"] = [NSMutableArray arrayWithArray:audioListArray];
+ [audioListArray release];
+ 
+ /* Subtitles (note: currently ignored) */
+ preset[@"Subtitles"] = @"None";
+ 
+ /* Clean up and return the preset */
+ [preset autorelease];
+ return preset;
+}
+
+- (NSMutableDictionary *)createAppleTV2Preset
+{
+ NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
+ 
+ /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+ preset[@"PresetName"] = @"AppleTV 2";
+ preset[@"Type"] = @0; //factory
+ preset[@"Default"] = @0;
+ preset[@"Folder"] = @NO;
+ preset[@"PresetDescription"] = @"HandBrake's settings for the second-generation AppleTV. Includes Dolby Digital audio for surround sound. NOT compatible with the original AppleTV.";
+ 
+ /* Container format and related settings */
+ preset[@"FileFormat"] = @"MP4 file";
+ preset[@"Mp4LargeFile"] = @1;
+ preset[@"Mp4HttpOptimize"] = @0;
+ preset[@"Mp4iPodCompatible"] = @0;
+ 
+ /* Chapter markers */
+ preset[@"ChapterMarkers"] = @1;
+ 
+ /* Video encoder and advanced options */
+ preset[@"VideoEncoder"] = @"H.264 (x264)";
+ preset[@"x264Option"] = @"";
+ preset[@"x264UseAdvancedOptions"] = @0;
+ preset[@"VideoPreset"] = @"medium";
+ preset[@"VideoTune"] = @"";
+ preset[@"VideoOptionExtra"] = @"";
+ preset[@"VideoProfile"] = @"high";
+ preset[@"VideoLevel"] = @"3.1";
+ 
+ /* Video rate control */
+ preset[@"VideoAvgBitrate"] = @"2500";
+ preset[@"VideoTwoPass"] = @0;
+ preset[@"VideoTurboTwoPass"] = @0;
+ preset[@"VideoQualityType"] = @2; //cq
+ preset[@"VideoQualitySlider"] = @20.0f;
+ 
+ /* Video frame rate */
+ preset[@"VideoFramerate"] = @"30";
+ preset[@"VideoFramerateMode"] = @"pfr";
+ 
+ /* Picture size */
+ preset[@"UsesPictureSettings"] = @1;
+ preset[@"PictureWidth"] = @1280;
+ preset[@"PictureHeight"] = @720;
+ preset[@"PicturePAR"] = @2; //loose
+ preset[@"PictureModulus"] = @2;
+ preset[@"PictureKeepRatio"] = @0; //set to 0 for Loose (FIXME: why?)
+ 
+ /* Picture filters */
+ preset[@"UsesPictureFilters"] = @1;
+ preset[@"PictureDecomb"] = @0; //off
+ preset[@"PictureDecombCustom"] = @"";
+ preset[@"PictureDecombDeinterlace"] = @1; //decomb
+ preset[@"PictureDeinterlace"] = @0;
+ preset[@"PictureDeinterlaceCustom"] = @"";
+ preset[@"PictureDetelecine"] = @0;
+ preset[@"PictureDetelecineCustom"] = @"";
+ preset[@"PictureDenoise"] = @0;
+ preset[@"PictureDenoiseCustom"] = @"";
+ preset[@"PictureDeblock"] = @0;
+ preset[@"VideoGrayScale"] = @0;
+ 
+ /* Picture crop */
+ preset[@"PictureAutoCrop"] = @1;
+ preset[@"PictureTopCrop"] = @0;
+ preset[@"PictureBottomCrop"] = @0;
+ preset[@"PictureLeftCrop"] = @0;
+ preset[@"PictureRightCrop"] = @0;
+ 
+ /* Auto Passthru */
+ preset[@"AudioEncoderFallback"] = @"AC3 (ffmpeg)";
+ preset[@"AudioAllowAACPass"] = @1;
+ preset[@"AudioAllowAC3Pass"] = @1;
+ preset[@"AudioAllowDTSHDPass"] = @1;
+ preset[@"AudioAllowDTSPass"] = @1;
+ preset[@"AudioAllowMP3Pass"] = @1;
+ 
+ /* Audio track list - no need to add "None" at the end */
+ NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+ /* Track 1 */
+ NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
+ audioTrack1Array[@"AudioTrack"] = @1;
+ audioTrack1Array[@"AudioEncoder"] = @"AAC (avcodec)";
+ audioTrack1Array[@"AudioMixdown"] = @"Dolby Pro Logic II";
+ audioTrack1Array[@"AudioSamplerate"] = @"Auto";
+ audioTrack1Array[@"AudioBitrate"] = @"160";
+ audioTrack1Array[@"AudioTrackGainSlider"] = @0.0f;
+ audioTrack1Array[@"AudioTrackDRCSlider"] = @0.0f;
+ [audioTrack1Array autorelease];
+ [audioListArray addObject:audioTrack1Array];
+ /* Track 2 */
+ NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
+ audioTrack2Array[@"AudioTrack"] = @1;
+ audioTrack2Array[@"AudioEncoder"] = @"AC3 Passthru";
+ audioTrack2Array[@"AudioMixdown"] = @"None";
+ audioTrack2Array[@"AudioSamplerate"] = @"Auto";
+ audioTrack2Array[@"AudioBitrate"] = @"160";
+ audioTrack2Array[@"AudioTrackGainSlider"] = @0.0f;
+ audioTrack2Array[@"AudioTrackDRCSlider"] = @0.0f;
+ [audioTrack2Array autorelease];
+ [audioListArray addObject:audioTrack2Array];
+ /* Add the audio track(s) to the preset's audio list */
+ preset[@"AudioList"] = [NSMutableArray arrayWithArray:audioListArray];
+ [audioListArray release];
+ 
+ /* Subtitles (note: currently ignored) */
+ preset[@"Subtitles"] = @"None";
+ 
+ /* Clean up and return the preset */
+ [preset autorelease];
+ return preset;
+}
+
+- (NSMutableDictionary *)createAppleTV3Preset
+{
+ NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
+ 
+ /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+ preset[@"PresetName"] = @"AppleTV 3";
+ preset[@"Type"] = @0; //factory
+ preset[@"Default"] = @0;
+ preset[@"Folder"] = @NO;
+ preset[@"PresetDescription"] = @"HandBrake's settings for the third-generation AppleTV. Includes Dolby Digital audio for surround sound. NOT compatible with the original AppleTV. May stutter on the second-generation AppleTV.";
+ 
+ /* Container format and related settings */
+ preset[@"FileFormat"] = @"MP4 file";
+ preset[@"Mp4LargeFile"] = @1;
+ preset[@"Mp4HttpOptimize"] = @0;
+ preset[@"Mp4iPodCompatible"] = @0;
+ 
+ /* Chapter markers */
+ preset[@"ChapterMarkers"] = @1;
+ 
+ /* Video encoder and advanced options */
+ preset[@"VideoEncoder"] = @"H.264 (x264)";
+ preset[@"x264Option"] = @"";
+ preset[@"x264UseAdvancedOptions"] = @0;
+ preset[@"VideoPreset"] = @"medium";
+ preset[@"VideoTune"] = @"";
+ preset[@"VideoOptionExtra"] = @"";
+ preset[@"VideoProfile"] = @"high";
+ preset[@"VideoLevel"] = @"4.0";
+ 
+ /* Video rate control */
+ preset[@"VideoAvgBitrate"] = @"2500";
+ preset[@"VideoTwoPass"] = @0;
+ preset[@"VideoTurboTwoPass"] = @0;
+ preset[@"VideoQualityType"] = @2; //cq
+ preset[@"VideoQualitySlider"] = @20.0f;
+ 
+ /* Video frame rate */
+ preset[@"VideoFramerate"] = @"30";
+ preset[@"VideoFramerateMode"] = @"pfr";
+ 
+ /* Picture size */
+ preset[@"UsesPictureSettings"] = @1;
+ preset[@"PictureWidth"] = @1920;
+ preset[@"PictureHeight"] = @1080;
+ preset[@"PicturePAR"] = @2; //loose
+ preset[@"PictureModulus"] = @2;
+ preset[@"PictureKeepRatio"] = @0; //set to 0 for Loose (FIXME: why?)
+ 
+ /* Picture filters */
+ preset[@"UsesPictureFilters"] = @1;
+ preset[@"PictureDecomb"] = @3; //fast
+ preset[@"PictureDecombCustom"] = @"";
+ preset[@"PictureDecombDeinterlace"] = @1; //decomb
+ preset[@"PictureDeinterlace"] = @0;
+ preset[@"PictureDeinterlaceCustom"] = @"";
+ preset[@"PictureDetelecine"] = @0;
+ preset[@"PictureDetelecineCustom"] = @"";
+ preset[@"PictureDenoise"] = @0;
+ preset[@"PictureDenoiseCustom"] = @"";
+ preset[@"PictureDeblock"] = @0;
+ preset[@"VideoGrayScale"] = @0;
+ 
+ /* Picture crop */
+ preset[@"PictureAutoCrop"] = @1;
+ preset[@"PictureTopCrop"] = @0;
+ preset[@"PictureBottomCrop"] = @0;
+ preset[@"PictureLeftCrop"] = @0;
+ preset[@"PictureRightCrop"] = @0;
+ 
+ /* Auto Passthru */
+ preset[@"AudioEncoderFallback"] = @"AC3 (ffmpeg)";
+ preset[@"AudioAllowAACPass"] = @1;
+ preset[@"AudioAllowAC3Pass"] = @1;
+ preset[@"AudioAllowDTSHDPass"] = @1;
+ preset[@"AudioAllowDTSPass"] = @1;
+ preset[@"AudioAllowMP3Pass"] = @1;
+ 
+ /* Audio track list - no need to add "None" at the end */
+ NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+ /* Track 1 */
+ NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
+ audioTrack1Array[@"AudioTrack"] = @1;
+ audioTrack1Array[@"AudioEncoder"] = @"AAC (avcodec)";
+ audioTrack1Array[@"AudioMixdown"] = @"Dolby Pro Logic II";
+ audioTrack1Array[@"AudioSamplerate"] = @"Auto";
+ audioTrack1Array[@"AudioBitrate"] = @"160";
+ audioTrack1Array[@"AudioTrackGainSlider"] = @0.0f;
+ audioTrack1Array[@"AudioTrackDRCSlider"] = @0.0f;
+ [audioTrack1Array autorelease];
+ [audioListArray addObject:audioTrack1Array];
+ /* Track 2 */
+ NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
+ audioTrack2Array[@"AudioTrack"] = @1;
+ audioTrack2Array[@"AudioEncoder"] = @"AC3 Passthru";
+ audioTrack2Array[@"AudioMixdown"] = @"None";
+ audioTrack2Array[@"AudioSamplerate"] = @"Auto";
+ audioTrack2Array[@"AudioBitrate"] = @"160";
+ audioTrack2Array[@"AudioTrackGainSlider"] = @0.0f;
+ audioTrack2Array[@"AudioTrackDRCSlider"] = @0.0f;
+ [audioTrack2Array autorelease];
+ [audioListArray addObject:audioTrack2Array];
+ /* Add the audio track(s) to the preset's audio list */
+ preset[@"AudioList"] = [NSMutableArray arrayWithArray:audioListArray];
+ [audioListArray release];
+ 
+ /* Subtitles (note: currently ignored) */
+ preset[@"Subtitles"] = @"None";
+ 
+ /* Clean up and return the preset */
+ [preset autorelease];
+ return preset;
+}
+
+- (NSMutableDictionary *)createAndroidPreset
+{
+ NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
+ 
+ /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+ preset[@"PresetName"] = @"Android";
+ preset[@"Type"] = @0; //factory
+ preset[@"Default"] = @0;
+ preset[@"Folder"] = @NO;
+ preset[@"PresetDescription"] = @"HandBrake's settings for midrange devices running Android 2.3 or later.";
+ 
+ /* Container format and related settings */
+ preset[@"FileFormat"] = @"MP4 file";
+ preset[@"Mp4LargeFile"] = @0;
+ preset[@"Mp4HttpOptimize"] = @0;
+ preset[@"Mp4iPodCompatible"] = @0;
+ 
+ /* Chapter markers */
+ preset[@"ChapterMarkers"] = @0;
+ 
+ /* Video encoder and advanced options */
+ preset[@"VideoEncoder"] = @"H.264 (x264)";
+ preset[@"x264Option"] = @"";
+ preset[@"x264UseAdvancedOptions"] = @0;
+ preset[@"VideoPreset"] = @"medium";
+ preset[@"VideoTune"] = @"";
+ preset[@"VideoOptionExtra"] = @"";
+ preset[@"VideoProfile"] = @"main";
+ preset[@"VideoLevel"] = @"3.0";
+ 
+ /* Video rate control */
+ preset[@"VideoAvgBitrate"] = @"2500";
+ preset[@"VideoTwoPass"] = @0;
+ preset[@"VideoTurboTwoPass"] = @0;
+ preset[@"VideoQualityType"] = @2; //cq
+ preset[@"VideoQualitySlider"] = @22.0f;
+ 
+ /* Video frame rate */
+ preset[@"VideoFramerate"] = @"30";
+ preset[@"VideoFramerateMode"] = @"pfr";
+ 
+ /* Picture size */
+ preset[@"UsesPictureSettings"] = @1;
+ preset[@"PictureWidth"] = @720;
+ preset[@"PictureHeight"] = @576;
+ preset[@"PicturePAR"] = @2; //loose
+ preset[@"PictureModulus"] = @2;
+ preset[@"PictureKeepRatio"] = @0; //set to 0 for Loose (FIXME: why?)
+ 
+ /* Picture filters */
+ preset[@"UsesPictureFilters"] = @1;
+ preset[@"PictureDecomb"] = @0; //off
+ preset[@"PictureDecombCustom"] = @"";
+ preset[@"PictureDecombDeinterlace"] = @1; //decomb
+ preset[@"PictureDeinterlace"] = @0;
+ preset[@"PictureDeinterlaceCustom"] = @"";
+ preset[@"PictureDetelecine"] = @0;
+ preset[@"PictureDetelecineCustom"] = @"";
+ preset[@"PictureDenoise"] = @0;
+ preset[@"PictureDenoiseCustom"] = @"";
+ preset[@"PictureDeblock"] = @0;
+ preset[@"VideoGrayScale"] = @0;
+ 
+ /* Picture crop */
+ preset[@"PictureAutoCrop"] = @1;
+ preset[@"PictureTopCrop"] = @0;
+ preset[@"PictureBottomCrop"] = @0;
+ preset[@"PictureLeftCrop"] = @0;
+ preset[@"PictureRightCrop"] = @0;
+ 
+ /* Auto Passthru */
+ preset[@"AudioEncoderFallback"] = @"AC3 (ffmpeg)";
+ preset[@"AudioAllowAACPass"] = @1;
+ preset[@"AudioAllowAC3Pass"] = @1;
+ preset[@"AudioAllowDTSHDPass"] = @1;
+ preset[@"AudioAllowDTSPass"] = @1;
+ preset[@"AudioAllowMP3Pass"] = @1;
+ 
+ /* Audio track list - no need to add "None" at the end */
+ NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+ /* Track 1 */
+ NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
+ audioTrack1Array[@"AudioTrack"] = @1;
+ audioTrack1Array[@"AudioEncoder"] = @"AAC (avcodec)";
+ audioTrack1Array[@"AudioMixdown"] = @"Dolby Pro Logic II";
+ audioTrack1Array[@"AudioSamplerate"] = @"Auto";
+ audioTrack1Array[@"AudioBitrate"] = @"128";
+ audioTrack1Array[@"AudioTrackGainSlider"] = @0.0f;
+ audioTrack1Array[@"AudioTrackDRCSlider"] = @0.0f;
+ [audioTrack1Array autorelease];
+ [audioListArray addObject:audioTrack1Array];
+ /* Add the audio track(s) to the preset's audio list */
+ preset[@"AudioList"] = [NSMutableArray arrayWithArray:audioListArray];
+ [audioListArray release];
+ 
+ /* Subtitles (note: currently ignored) */
+ preset[@"Subtitles"] = @"None";
+ 
+ /* Clean up and return the preset */
+ [preset autorelease];
+ return preset;
+}
+
+- (NSMutableDictionary *)createAndroidTabletPreset
+{
+ NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
+ 
+ /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+ preset[@"PresetName"] = @"Android Tablet";
+ preset[@"Type"] = @0; //factory
+ preset[@"Default"] = @0;
+ preset[@"Folder"] = @NO;
+ preset[@"PresetDescription"] = @"HandBrake's preset for tablets running Android 2.3 or later.";
+ 
+ /* Container format and related settings */
+ preset[@"FileFormat"] = @"MP4 file";
+ preset[@"Mp4LargeFile"] = @0;
+ preset[@"Mp4HttpOptimize"] = @0;
+ preset[@"Mp4iPodCompatible"] = @0;
+ 
+ /* Chapter markers */
+ preset[@"ChapterMarkers"] = @0;
+ 
+ /* Video encoder and advanced options */
+ preset[@"VideoEncoder"] = @"H.264 (x264)";
+ preset[@"x264Option"] = @"";
+ preset[@"x264UseAdvancedOptions"] = @0;
+ preset[@"VideoPreset"] = @"medium";
+ preset[@"VideoTune"] = @"";
+ preset[@"VideoOptionExtra"] = @"";
+ preset[@"VideoProfile"] = @"main";
+ preset[@"VideoLevel"] = @"3.1";
+ 
+ /* Video rate control */
+ preset[@"VideoAvgBitrate"] = @"2500";
+ preset[@"VideoTwoPass"] = @0;
+ preset[@"VideoTurboTwoPass"] = @0;
+ preset[@"VideoQualityType"] = @2; //cq
+ preset[@"VideoQualitySlider"] = @22.0f;
+ 
+ /* Video frame rate */
+ preset[@"VideoFramerate"] = @"30";
+ preset[@"VideoFramerateMode"] = @"pfr";
+ 
+ /* Picture size */
+ preset[@"UsesPictureSettings"] = @1;
+ preset[@"PictureWidth"] = @1280;
+ preset[@"PictureHeight"] = @720;
+ preset[@"PicturePAR"] = @2; //loose
+ preset[@"PictureModulus"] = @2;
+ preset[@"PictureKeepRatio"] = @0; //set to 0 for Loose (FIXME: why?)
+ 
+ /* Picture filters */
+ preset[@"UsesPictureFilters"] = @1;
+ preset[@"PictureDecomb"] = @0; //off
+ preset[@"PictureDecombCustom"] = @"";
+ preset[@"PictureDecombDeinterlace"] = @1; //decomb
+ preset[@"PictureDeinterlace"] = @0;
+ preset[@"PictureDeinterlaceCustom"] = @"";
+ preset[@"PictureDetelecine"] = @0;
+ preset[@"PictureDetelecineCustom"] = @"";
+ preset[@"PictureDenoise"] = @0;
+ preset[@"PictureDenoiseCustom"] = @"";
+ preset[@"PictureDeblock"] = @0;
+ preset[@"VideoGrayScale"] = @0;
+ 
+ /* Picture crop */
+ preset[@"PictureAutoCrop"] = @1;
+ preset[@"PictureTopCrop"] = @0;
+ preset[@"PictureBottomCrop"] = @0;
+ preset[@"PictureLeftCrop"] = @0;
+ preset[@"PictureRightCrop"] = @0;
+ 
+ /* Auto Passthru */
+ preset[@"AudioEncoderFallback"] = @"AC3 (ffmpeg)";
+ preset[@"AudioAllowAACPass"] = @1;
+ preset[@"AudioAllowAC3Pass"] = @1;
+ preset[@"AudioAllowDTSHDPass"] = @1;
+ preset[@"AudioAllowDTSPass"] = @1;
+ preset[@"AudioAllowMP3Pass"] = @1;
+ 
+ /* Audio track list - no need to add "None" at the end */
+ NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+ /* Track 1 */
+ NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
+ audioTrack1Array[@"AudioTrack"] = @1;
+ audioTrack1Array[@"AudioEncoder"] = @"AAC (avcodec)";
+ audioTrack1Array[@"AudioMixdown"] = @"Dolby Pro Logic II";
+ audioTrack1Array[@"AudioSamplerate"] = @"Auto";
+ audioTrack1Array[@"AudioBitrate"] = @"128";
+ audioTrack1Array[@"AudioTrackGainSlider"] = @0.0f;
+ audioTrack1Array[@"AudioTrackDRCSlider"] = @0.0f;
+ [audioTrack1Array autorelease];
+ [audioListArray addObject:audioTrack1Array];
+ /* Add the audio track(s) to the preset's audio list */
+ preset[@"AudioList"] = [NSMutableArray arrayWithArray:audioListArray];
+ [audioListArray release];
+ 
+ /* Subtitles (note: currently ignored) */
+ preset[@"Subtitles"] = @"None";
+ 
+ /* Clean up and return the preset */
+ [preset autorelease];
+ return preset;
+}
+
+- (NSMutableDictionary *)createW8PhonePreset
+{
+ NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
+ 
+ /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+ preset[@"PresetName"] = @"Windows Phone 8";
+ preset[@"Type"] = @0; //factory
+ preset[@"Default"] = @0;
+ preset[@"Folder"] = @NO;
+ preset[@"PresetDescription"] = @"HandBrake's preset for Windows Phone 8 devices";
+ 
+ /* Container format and related settings */
+ preset[@"FileFormat"] = @"MP4 file";
+ preset[@"Mp4LargeFile"] = @0;
+ preset[@"Mp4HttpOptimize"] = @0;
+ preset[@"Mp4iPodCompatible"] = @0;
+ 
+ /* Chapter markers */
+ preset[@"ChapterMarkers"] = @0;
+ 
+ /* Video encoder and advanced options */
+ preset[@"VideoEncoder"] = @"H.264 (x264)";
+ preset[@"x264Option"] = @"";
+ preset[@"x264UseAdvancedOptions"] = @0;
+ preset[@"VideoPreset"] = @"medium";
+ preset[@"VideoTune"] = @"";
+ preset[@"VideoOptionExtra"] = @"";
+ preset[@"VideoProfile"] = @"main";
+ preset[@"VideoLevel"] = @"3.1";
+ 
+ /* Video rate control */
+ preset[@"VideoAvgBitrate"] = @"2500";
+ preset[@"VideoTwoPass"] = @0;
+ preset[@"VideoTurboTwoPass"] = @0;
+ preset[@"VideoQualityType"] = @2; //cq
+ preset[@"VideoQualitySlider"] = @22.0f;
+ 
+ /* Video frame rate */
+ preset[@"VideoFramerate"] = @"30";
+ preset[@"VideoFramerateMode"] = @"pfr";
+ 
+ /* Picture size */
+ preset[@"UsesPictureSettings"] = @1;
+ preset[@"PictureWidth"] = @1280;
+ preset[@"PictureHeight"] = @720;
+ preset[@"PicturePAR"] = @0; //None
+ preset[@"PictureModulus"] = @2;
+ preset[@"PictureKeepRatio"] = @1;
+ 
+ /* Picture filters */
+ preset[@"UsesPictureFilters"] = @1;
+ preset[@"PictureDecomb"] = @0; //off
+ preset[@"PictureDecombCustom"] = @"";
+ preset[@"PictureDecombDeinterlace"] = @1; //decomb
+ preset[@"PictureDeinterlace"] = @0;
+ preset[@"PictureDeinterlaceCustom"] = @"";
+ preset[@"PictureDetelecine"] = @0;
+ preset[@"PictureDetelecineCustom"] = @"";
+ preset[@"PictureDenoise"] = @0;
+ preset[@"PictureDenoiseCustom"] = @"";
+ preset[@"PictureDeblock"] = @0;
+ preset[@"VideoGrayScale"] = @0;
+ 
+ /* Picture crop */
+ preset[@"PictureAutoCrop"] = @1;
+ preset[@"PictureTopCrop"] = @0;
+ preset[@"PictureBottomCrop"] = @0;
+ preset[@"PictureLeftCrop"] = @0;
+ preset[@"PictureRightCrop"] = @0;
+ 
+ /* Auto Passthru */
+ preset[@"AudioEncoderFallback"] = @"AC3 (ffmpeg)";
+ preset[@"AudioAllowAACPass"] = @1;
+ preset[@"AudioAllowAC3Pass"] = @1;
+ preset[@"AudioAllowDTSHDPass"] = @1;
+ preset[@"AudioAllowDTSPass"] = @1;
+ preset[@"AudioAllowMP3Pass"] = @1;
+ 
+ /* Audio track list - no need to add "None" at the end */
+ NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+ /* Track 1 */
+ NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
+ audioTrack1Array[@"AudioTrack"] = @1;
+ audioTrack1Array[@"AudioEncoder"] = @"AAC (avcodec)";
+ audioTrack1Array[@"AudioMixdown"] = @"Dolby Pro Logic II";
+ audioTrack1Array[@"AudioSamplerate"] = @"Auto";
+ audioTrack1Array[@"AudioBitrate"] = @"128";
+ audioTrack1Array[@"AudioTrackGainSlider"] = @0.0f;
+ audioTrack1Array[@"AudioTrackDRCSlider"] = @0.0f;
+ [audioTrack1Array autorelease];
+ [audioListArray addObject:audioTrack1Array];
+ /* Add the audio track(s) to the preset's audio list */
+ preset[@"AudioList"] = [NSMutableArray arrayWithArray:audioListArray];
+ [audioListArray release];
+ 
+ /* Subtitles (note: currently ignored) */
+ preset[@"Subtitles"] = @"None";
+ 
+ /* Clean up and return the preset */
+ [preset autorelease];
+ return preset;
+}
+
+- (NSMutableDictionary *)createNormalPreset
+{
+ NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
+ 
+ /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+ preset[@"PresetName"] = @"Normal";
+ preset[@"Type"] = @0; //factory
+ preset[@"Default"] = @1; //default
+ preset[@"Folder"] = @NO;
+ preset[@"PresetDescription"] = @"HandBrake's normal, default settings.";
+ 
+ /* Container format and related settings */
+ preset[@"FileFormat"] = @"MP4 file";
+ preset[@"Mp4LargeFile"] = @0;
+ preset[@"Mp4HttpOptimize"] = @0;
+ preset[@"Mp4iPodCompatible"] = @0;
+ 
+ /* Chapter markers */
+ preset[@"ChapterMarkers"] = @1;
+ 
+ /* Video encoder and advanced options */
+ preset[@"VideoEncoder"] = @"H.264 (x264)";
+ preset[@"x264Option"] = @"";
+ preset[@"x264UseAdvancedOptions"] = @0;
+ preset[@"VideoPreset"] = @"veryfast";
+ preset[@"VideoTune"] = @"";
+ preset[@"VideoOptionExtra"] = @"";
+ preset[@"VideoProfile"] = @"main";
+ preset[@"VideoLevel"] = @"4.0";
+ 
+ /* Video rate control */
+ preset[@"VideoAvgBitrate"] = @"2500";
+ preset[@"VideoTwoPass"] = @0;
+ preset[@"VideoTurboTwoPass"] = @0;
+ preset[@"VideoQualityType"] = @2; //cq
+ preset[@"VideoQualitySlider"] = @20.0f;
+ 
+ /* Video frame rate */
+ preset[@"VideoFramerate"] = @"Same as source";
+ preset[@"VideoFramerateMode"] = @"vfr";
+ 
+ /* Picture size */
+ preset[@"UsesPictureSettings"] = @1;
+ preset[@"PictureWidth"] = @0;
+ preset[@"PictureHeight"] = @0;
+ preset[@"PicturePAR"] = @2; //loose
+ preset[@"PictureModulus"] = @2;
+ preset[@"PictureKeepRatio"] = @0; //set to 0 for Loose (FIXME: why?)
+ 
+ /* Picture filters */
+ preset[@"UsesPictureFilters"] = @1;
+ preset[@"PictureDecomb"] = @0; //off
+ preset[@"PictureDecombCustom"] = @"";
+ preset[@"PictureDecombDeinterlace"] = @1; //decomb
+ preset[@"PictureDeinterlace"] = @0;
+ preset[@"PictureDeinterlaceCustom"] = @"";
+ preset[@"PictureDetelecine"] = @0;
+ preset[@"PictureDetelecineCustom"] = @"";
+ preset[@"PictureDenoise"] = @0;
+ preset[@"PictureDenoiseCustom"] = @"";
+ preset[@"PictureDeblock"] = @0;
+ preset[@"VideoGrayScale"] = @0;
+ 
+ /* Picture crop */
+ preset[@"PictureAutoCrop"] = @1;
+ preset[@"PictureTopCrop"] = @0;
+ preset[@"PictureBottomCrop"] = @0;
+ preset[@"PictureLeftCrop"] = @0;
+ preset[@"PictureRightCrop"] = @0;
+ 
+ /* Auto Passthru */
+ preset[@"AudioEncoderFallback"] = @"AC3 (ffmpeg)";
+ preset[@"AudioAllowAACPass"] = @1;
+ preset[@"AudioAllowAC3Pass"] = @1;
+ preset[@"AudioAllowDTSHDPass"] = @1;
+ preset[@"AudioAllowDTSPass"] = @1;
+ preset[@"AudioAllowMP3Pass"] = @1;
+ 
+ /* Audio track list - no need to add "None" at the end */
+ NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+ /* Track 1 */
+ NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
+ audioTrack1Array[@"AudioTrack"] = @1;
+ audioTrack1Array[@"AudioEncoder"] = @"AAC (avcodec)";
+ audioTrack1Array[@"AudioMixdown"] = @"Dolby Pro Logic II";
+ audioTrack1Array[@"AudioSamplerate"] = @"Auto";
+ audioTrack1Array[@"AudioBitrate"] = @"160";
+ audioTrack1Array[@"AudioTrackGainSlider"] = @0.0f;
+ audioTrack1Array[@"AudioTrackDRCSlider"] = @0.0f;
+ [audioTrack1Array autorelease];
+ [audioListArray addObject:audioTrack1Array];
+ /* Add the audio track(s) to the preset's audio list */
+ preset[@"AudioList"] = [NSMutableArray arrayWithArray:audioListArray];
+ [audioListArray release];
+ 
+ /* Subtitles (note: currently ignored) */
+ preset[@"Subtitles"] = @"None";
+ 
+ /* Clean up and return the preset */
+ [preset autorelease];
+ return preset;
+}
+
+- (NSMutableDictionary *)createHighProfilePreset
+{
+ NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
+ 
+ /* Preset properties (name, type: factory/user, default, folder, tooltip) */
+ preset[@"PresetName"] = @"High Profile";
+ preset[@"Type"] = @0; //factory
+ preset[@"Default"] = @0;
+ preset[@"Folder"] = @NO;
+ preset[@"PresetDescription"] = @"HandBrake's general-purpose preset for High Profile H.264 video.";
+ 
+ /* Container format and related settings */
+ preset[@"FileFormat"] = @"MP4 file";
+ preset[@"Mp4LargeFile"] = @1;
+ preset[@"Mp4HttpOptimize"] = @0;
+ preset[@"Mp4iPodCompatible"] = @0;
+ 
+ /* Chapter markers */
+ preset[@"ChapterMarkers"] = @1;
+ 
+ /* Video encoder and advanced options */
+ preset[@"VideoEncoder"] = @"H.264 (x264)";
+ preset[@"x264Option"] = @"";
+ preset[@"x264UseAdvancedOptions"] = @0;
+ preset[@"VideoPreset"] = @"medium";
+ preset[@"VideoTune"] = @"";
+ preset[@"VideoOptionExtra"] = @"";
+ preset[@"VideoProfile"] = @"high";
+ preset[@"VideoLevel"] = @"4.1";
+ 
+ /* Video rate control */
+ preset[@"VideoAvgBitrate"] = @"2500";
+ preset[@"VideoTwoPass"] = @0;
+ preset[@"VideoTurboTwoPass"] = @0;
+ preset[@"VideoQualityType"] = @2; //cq
+ preset[@"VideoQualitySlider"] = @20.0f;
+ 
+ /* Video frame rate */
+ preset[@"VideoFramerate"] = @"Same as source";
+ preset[@"VideoFramerateMode"] = @"vfr";
+ 
+ /* Picture size */
+ preset[@"UsesPictureSettings"] = @1;
+ preset[@"PictureWidth"] = @0;
+ preset[@"PictureHeight"] = @0;
+ preset[@"PicturePAR"] = @2; //loose
+ preset[@"PictureModulus"] = @2;
+ preset[@"PictureKeepRatio"] = @0; //set to 0 for Loose (FIXME: why?)
+ 
+ /* Picture filters */
+ preset[@"UsesPictureFilters"] = @1;
+ preset[@"PictureDecomb"] = @2; //default
+ preset[@"PictureDecombCustom"] = @"";
+ preset[@"PictureDecombDeinterlace"] = @1; //decomb
+ preset[@"PictureDeinterlace"] = @0;
+ preset[@"PictureDeinterlaceCustom"] = @"";
+ preset[@"PictureDetelecine"] = @0;
+ preset[@"PictureDetelecineCustom"] = @"";
+ preset[@"PictureDenoise"] = @0;
+ preset[@"PictureDenoiseCustom"] = @"";
+ preset[@"PictureDeblock"] = @0;
+ preset[@"VideoGrayScale"] = @0;
+ 
+ /* Picture crop */
+ preset[@"PictureAutoCrop"] = @1;
+ preset[@"PictureTopCrop"] = @0;
+ preset[@"PictureBottomCrop"] = @0;
+ preset[@"PictureLeftCrop"] = @0;
+ preset[@"PictureRightCrop"] = @0;
+ 
+ /* Auto Passthru */
+ preset[@"AudioEncoderFallback"] = @"AC3 (ffmpeg)";
+ preset[@"AudioAllowAACPass"] = @1;
+ preset[@"AudioAllowAC3Pass"] = @1;
+ preset[@"AudioAllowDTSHDPass"] = @1;
+ preset[@"AudioAllowDTSPass"] = @1;
+ preset[@"AudioAllowMP3Pass"] = @1;
+ 
+ /* Audio track list - no need to add "None" at the end */
+ NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+ /* Track 1 */
+ NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
+ audioTrack1Array[@"AudioTrack"] = @1;
+ audioTrack1Array[@"AudioEncoder"] = @"AAC (avcodec)";
+ audioTrack1Array[@"AudioMixdown"] = @"Dolby Pro Logic II";
+ audioTrack1Array[@"AudioSamplerate"] = @"Auto";
+ audioTrack1Array[@"AudioBitrate"] = @"160";
+ audioTrack1Array[@"AudioTrackGainSlider"] = @0.0f;
+ audioTrack1Array[@"AudioTrackDRCSlider"] = @0.0f;
+ [audioTrack1Array autorelease];
+ [audioListArray addObject:audioTrack1Array];
+ /* Track 2 */
+ NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
+ audioTrack2Array[@"AudioTrack"] = @1;
+ audioTrack2Array[@"AudioEncoder"] = @"AC3 Passthru";
+ audioTrack2Array[@"AudioMixdown"] = @"None";
+ audioTrack2Array[@"AudioSamplerate"] = @"Auto";
+ audioTrack2Array[@"AudioBitrate"] = @"160";
+ audioTrack2Array[@"AudioTrackGainSlider"] = @0.0f;
+ audioTrack2Array[@"AudioTrackDRCSlider"] = @0.0f;
+ [audioTrack2Array autorelease];
+ [audioListArray addObject:audioTrack2Array];
+ /* Add the audio track(s) to the preset's audio list */
+ preset[@"AudioList"] = [NSMutableArray arrayWithArray:audioListArray];
+ [audioListArray release];
+ 
+ /* Subtitles (note: currently ignored) */
+ preset[@"Subtitles"] = @"None";
+ 
+ /* Clean up and return the preset */
+ [preset autorelease];
+ return preset;
+}
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBPresetsViewController.h Added

HandBrake-0.10.0.tar.bz2/macosx/HBPresetsViewController.m Added

@@ -0,0 +1,407 @@
+/* HBPresetsViewController.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBPresetsViewController.h"
+#import "HBPresetsManager.h"
+#import "HBPreset.h"
+
+// drag and drop pasteboard type
+#define kHandBrakePresetPBoardType @"handBrakePresetPBoardType"
+
+@interface HBPresetsViewController () <NSOutlineViewDelegate>
+
+@property (nonatomic, retain) HBPresetsManager *presets;
+@property (nonatomic, assign) IBOutlet NSTreeController *treeController;
+
+/**
+ * Helper var for drag & drop
+ */
+@property (nonatomic, retain) NSArray *dragNodesArray;
+
+/**
+ * The status (expanded or not) of the folders.
+ */
+@property (nonatomic, retain) NSMutableArray *expandedNodes;
+
+@property (assign) IBOutlet NSOutlineView *outlineView;
+
+@property (nonatomic) BOOL enabled;
+
+@end
+
+@implementation HBPresetsViewController
+
+- (instancetype)initWithPresetManager:(HBPresetsManager *)presetManager
+{
+ self = [super initWithNibName:@"Presets" bundle:nil];
+ if (self)
+ {
+ _presets = [presetManager retain];
+ _expandedNodes = [[NSArray arrayWithArray:[[NSUserDefaults standardUserDefaults]
+ objectForKey:@"HBPreviewViewExpandedStatus"]] mutableCopy];
+ }
+ return self;
+}
+
+- (void)dealloc
+{
+ self.presets = nil;
+ self.dragNodesArray = nil;
+ self.expandedNodes = nil;
+ 
+ [super dealloc];
+}
+
+- (void)loadView
+{
+ [super loadView];
+
+ // drag and drop support
+	[self.outlineView registerForDraggedTypes:@[kHandBrakePresetPBoardType]];
+
+ // Re-expand the items
+ [self expandNodes:[self.treeController.arrangedObjects childNodes]];
+
+ [self.treeController setSelectionIndexPath:[self.presets indexPathOfPreset:self.presets.defaultPreset]];
+}
+
+- (BOOL)validateUserInterfaceItem:(id < NSValidatedUserInterfaceItem >)anItem
+{
+ SEL action = anItem.action;
+
+ if (action == @selector(setDefault:))
+ {
+ if (![[[self.treeController selectedObjects] firstObject] isLeaf])
+ {
+ return NO;
+ }
+ }
+
+ return YES;
+}
+
+#pragma mark - HBViewValidation methods
+
+- (void)setUIEnabled:(BOOL)flag
+{
+ self.enabled = flag;
+}
+
+#pragma mark - UI Methods
+
+- (IBAction)clicked:(id)sender
+{
+ if (self.delegate && [[self.treeController.selectedObjects firstObject] isLeaf])
+ {
+ [self.delegate selectionDidChange];
+ }
+}
+
+- (IBAction)addNewPreset:(id)sender
+{
+ if (self.delegate)
+ {
+ [self.delegate showAddPresetPanel:sender];
+ }
+}
+
+- (IBAction)deletePreset:(id)sender
+{
+ if ([self.treeController canRemove])
+ {
+ // Save the current selection path and apply it again after the deletion
+ NSIndexPath *currentSelection = [self.treeController selectionIndexPath];
+ /* Alert user before deleting preset */
+ NSAlert *alert = [NSAlert alertWithMessageText:@"Warning!"
+ defaultButton:@"OK"
+ alternateButton:@"Cancel"
+ otherButton:nil
+ informativeTextWithFormat:@"Are you sure that you want to delete the selected preset?"];
+ [alert setAlertStyle:NSCriticalAlertStyle];
+
+ NSInteger status = [alert runModal];
+
+ if (status == NSAlertDefaultReturn)
+ {
+ [self.presets deletePresetAtIndexPath:[self.treeController selectionIndexPath]];
+ }
+ [self.treeController setSelectionIndexPath:currentSelection];
+ }
+}
+
+- (IBAction)insertFolder:(id)sender
+{
+ NSIndexPath *selectionIndexPath = [self.treeController selectionIndexPath];
+ if (!selectionIndexPath || [[[self.treeController selectedObjects] firstObject] isBuiltIn])
+ {
+ selectionIndexPath = [NSIndexPath indexPathWithIndex:self.presets.root.children.count];
+ }
+
+ HBPreset *node = [[HBPreset alloc] initWithFolderName:@"New Folder" builtIn:NO];
+ [self.treeController insertObject:node atArrangedObjectIndexPath:selectionIndexPath];
+ [node autorelease];
+}
+
+- (IBAction)setDefault:(id)sender
+{
+ HBPreset *selectedNode = [[self.treeController selectedObjects] firstObject];
+ if ([[selectedNode valueForKey:@"isLeaf"] boolValue])
+ {
+ self.presets.defaultPreset = selectedNode;
+ }
+}
+
+- (void)deselect
+{
+ [self.treeController setSelectionIndexPath:nil];
+}
+
+- (void)setSelection:(HBPreset *)preset
+{
+ NSIndexPath *idx = [self.presets indexPathOfPreset:preset];
+
+ if (idx)
+ {
+ [self.treeController setSelectionIndexPath:idx];
+ }
+}
+
+- (HBPreset *)selectedPreset
+{
+ HBPreset *selectedNode = [[self.treeController selectedObjects] firstObject];
+ if ([[selectedNode valueForKey:@"isLeaf"] boolValue])
+ {
+ return selectedNode;
+ }
+ else
+ {
+ return self.presets.defaultPreset;
+ }
+}
+
+- (IBAction)updateBuiltInPresets:(id)sender
+{
+ [self.presets generateBuiltInPresets];
+
+ // Re-expand the items
+ [self expandNodes:[self.treeController.arrangedObjects childNodes]];
+}
+
+#pragma mark - Added Functionality (optional)
+
+/* We use this to provide tooltips for the items in the presets outline view */
+- (NSString *)outlineView:(NSOutlineView *)fPresetsOutlineView
+ toolTipForCell:(NSCell *)cell
+ rect:(NSRectPointer)rect
+ tableColumn:(NSTableColumn *)tc
+ item:(id)item
+ mouseLocation:(NSPoint)mouseLocation
+{
+ return [[item representedObject] presetDescription];
+}
+
+/* Use to customize the font and display characteristics of the title cell */
+- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
+{
+ NSColor *fontColor;
+ 
+ if ([self.outlineView selectedRow] == [self.outlineView rowForItem:item])
+ {
+ fontColor = [NSColor blackColor];
+ }
+ else
+ {
+ if ([[item representedObject] isBuiltIn])
+ {
+ fontColor = [NSColor blueColor];
+ }
+ else // User created preset, use a black font
+ {
+ fontColor = [NSColor blackColor];
+ }
+ }
+
+ [cell setTextColor:fontColor];
+}
+
+#pragma mark - Expanded node persitence methods
+
+- (void)expandNodes:(NSArray *)childNodes
+{
+ for (id node in childNodes)
+ {
+ [self expandNodes:[node childNodes]];
+ if ([self.expandedNodes containsObject:@([[node representedObject] hash])])
+ [self.outlineView expandItem:node expandChildren:YES];
+ }
+}
+
+- (void)outlineViewItemDidExpand:(NSNotification *)notification
+{
+ HBPreset *node = [[[notification userInfo] valueForKey:@"NSObject"] representedObject];
+ if (![self.expandedNodes containsObject:@(node.hash)])
+ {
+ [self.expandedNodes addObject:@(node.hash)];
+ [[NSUserDefaults standardUserDefaults] setObject:self.expandedNodes forKey:@"HBPreviewViewExpandedStatus"];
+ }
+}
+
+- (void)outlineViewItemDidCollapse:(NSNotification *)notification
+{
+ HBPreset *node = [[[notification userInfo] valueForKey:@"NSObject"] representedObject];
+ [self.expandedNodes removeObject:@(node.hash)];
+ [[NSUserDefaults standardUserDefaults] setObject:self.expandedNodes forKey:@"HBPreviewViewExpandedStatus"];
+}
+
+#pragma mark - Drag & Drops
+
+/**
+ * draggingSourceOperationMaskForLocal <NSDraggingSource override>
+ */
+- (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL)isLocal
+{
+	return NSDragOperationMove;
+}
+
+/**
+ * outlineView:writeItems:toPasteboard
+ */
+- (BOOL)outlineView:(NSOutlineView *)ov writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard
+{
+ // Return no if we are trying to drag a built-in preset
+ for (id item in items) {
+ if ([[item representedObject] isBuiltIn])
+ return NO;
+ }
+
+ [pboard declareTypes:@[kHandBrakePresetPBoardType] owner:self];
+
+	// keep track of this nodes for drag feedback in "validateDrop"
+	self.dragNodesArray = items;
+
+	return YES;
+}
+
+/**
+ *	outlineView:validateDrop:proposedItem:proposedChildrenIndex:
+ *
+ *	This method is used by NSOutlineView to determine a valid drop target.
+ */
+ - (NSDragOperation)outlineView:(NSOutlineView *)ov
+ validateDrop:(id <NSDraggingInfo>)info
+ proposedItem:(id)item
+ proposedChildIndex:(NSInteger)index
+{
+	NSDragOperation result = NSDragOperationNone;
+
+	if (!item)
+	{
+ if (index == 0)
+ {
+ // don't allow to drop on top
+ result = NSDragOperationNone;
+ }
+ else
+ {
+ // no item to drop on
+ result = NSDragOperationGeneric;
+ }
+	}
+	else
+	{
+ if (index == -1 || [[item representedObject] isBuiltIn] || [self.dragNodesArray containsObject:item])
+ {
+ // don't allow dropping on a child
+ result = NSDragOperationNone;
+ }
+ else
+ {
+ // drop location is a container
+ result = NSDragOperationMove;
+ }
+	}
+
+	return result;
+}
+
+/**
+ *	handleInternalDrops:pboard:withIndexPath:
+ *
+ *	The user is doing an intra-app drag within the outline view.
+ */
+- (void)handleInternalDrops:(NSPasteboard *)pboard withIndexPath:(NSIndexPath *)indexPath
+{
+	// user is doing an intra app drag within the outline view:
+	NSArray *newNodes = self.dragNodesArray;
+
+	// move the items to their new place (we do this backwards, otherwise they will end up in reverse order)
+	NSInteger idx;
+	for (idx = ([newNodes count] - 1); idx >= 0; idx--)
+	{
+		[self.treeController moveNode:newNodes[idx] toIndexPath:indexPath];
+
+ // Call manually this because the NSTreeController doesn't call
+ // the KVC accessors method for the root node.
+ if (indexPath.length == 1)
+ {
+ [self.presets performSelector:@selector(nodeDidChange)];
+ }
+	}
+
+	// keep the moved nodes selected
+	NSMutableArray *indexPathList = [NSMutableArray array];
+ for (NSUInteger i = 0; i < [newNodes count]; i++)
+	{
+		[indexPathList addObject:[newNodes[i] indexPath]];
+	}
+	[self.treeController setSelectionIndexPaths: indexPathList];
+}
+
+/**
+ *	outlineView:acceptDrop:item:childIndex
+ *
+ *	This method is called when the mouse is released over an outline view that previously decided to allow a drop
+ *	via the validateDrop method. The data source should incorporate the data from the dragging pasteboard at this time.
+ *	'index' is the location to insert the data as a child of 'item', and are the values previously set in the validateDrop: method.
+ *
+ */
+- (BOOL)outlineView:(NSOutlineView *)ov acceptDrop:(id <NSDraggingInfo>)info item:(id)targetItem childIndex:(NSInteger)index
+{
+	// note that "targetItem" is a NSTreeNode proxy
+	//
+	BOOL result = NO;
+
+	// find the index path to insert our dropped object(s)
+	NSIndexPath *indexPath;
+	if (targetItem)
+	{
+		// drop down inside the tree node:
+		// feth the index path to insert our dropped node
+		indexPath = [[targetItem indexPath] indexPathByAddingIndex:index];
+	}
+	else
+	{
+		// drop at the top root level
+		if (index == -1)	// drop area might be ambibuous (not at a particular location)
+			indexPath = [NSIndexPath indexPathWithIndex:self.presets.root.children.count]; // drop at the end of the top level
+		else
+			indexPath = [NSIndexPath indexPathWithIndex:index]; // drop at a particular place at the top level
+	}
+
+	NSPasteboard *pboard = [info draggingPasteboard];	// get the pasteboard
+
+	// check the dragging type -
+	if ([pboard availableTypeFromArray:@[kHandBrakePresetPBoardType]])
+	{
+		// user is doing an intra-app drag within the outline view
+		[self handleInternalDrops:pboard withIndexPath:indexPath];
+		result = YES;
+	}
+
+	return result;
+}
+
+@end

HandBrake-0.9.9.tar.bz2/macosx/HBPreviewController.h -> HandBrake-0.10.0.tar.bz2/macosx/HBPreviewController.h Changed

@@ -1,129 +1,23 @@
 /* $Id: HBPreviewController.h,v 1.6 2005/04/14 20:40:05 titer Exp $
 
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License. */
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
 
 #import <Cocoa/Cocoa.h>
-
 #include "hb.h"
-/* Needed for Quicktime movie previews */
-#import <QTKit/QTKit.h> 
 
 @class HBController;
 
-@interface PreviewController : NSWindowController <NSWindowDelegate>
-{
- hb_handle_t * fHandle;
- hb_title_t * fTitle;
-
- HBController * fHBController; // reference to HBController
- 
- NSMutableDictionary * fPicturePreviews; // NSImages, one for each preview libhb creates, created lazily
- int fPicture;
-
- CALayer * fWhiteBackground;
- CALayer * fPictureLayer;
- IBOutlet NSBox * fPictureControlBox;
- IBOutlet NSBox * fEncodingControlBox;
- IBOutlet NSBox * fMoviePlaybackControlBox;
-
- IBOutlet NSSlider * fPictureSlider;
- IBOutlet NSTextField * fInfoField;
- IBOutlet NSTextField * fscaleInfoField;
- 
- CGFloat backingScaleFactor;
- 
- /* Hud Control Overlay */
- NSTimer * fHudTimer;
- int hudTimerSeconds;
- 
- /* Full Screen Mode Toggle */
- BOOL scaleToScreen;
- IBOutlet NSButton * fScaleToScreenToggleButton;
- IBOutlet NSButton * fPictureSettingsToggleButton;
- 
- /* Movie Previews */
- QTMovie * aMovie;
- IBOutlet QTMovieView * fMovieView;
- /* Playback Panel Controls */
- IBOutlet NSButton * fPlayPauseButton;
- IBOutlet NSButton * fGoToBeginningButton;
- IBOutlet NSButton * fGoToEndButton;
- IBOutlet NSButton * fGoForwardOneFrameButton;
- IBOutlet NSButton * fGoBackwardOneFrameButton;
- IBOutlet NSSlider * fMovieScrubberSlider;
- IBOutlet NSButton * fGoToStillPreviewButton;
- IBOutlet NSTextField * fMovieInfoField;
- NSTimer * fMovieTimer;
- 
- IBOutlet NSButton * fCreatePreviewMovieButton;
- IBOutlet NSButton * fCancelPreviewMovieButton;
- IBOutlet NSButton * fShowPreviewMovieButton;
- NSString * fPreviewMoviePath;
- IBOutlet NSProgressIndicator * fMovieCreationProgressIndicator;
- hb_handle_t * fPreviewLibhb; // private libhb for creating previews
- NSInteger fEncodeState;
- NSTimer * fLibhbTimer; // timer for retrieving state from libhb
- IBOutlet NSTextField * fPreviewMovieStatusField; 
- IBOutlet NSPopUpButton * fPreviewMovieLengthPopUp; // popup of choices for length of preview in seconds
-}
-- (id)init;
-
-- (void) SetHandle: (hb_handle_t *) handle;
-- (void) SetTitle: (hb_title_t *) title;
-- (void) setHBController: (HBController *)controller;
-- (void) displayPreview;
-
-- (IBAction) settingsChanged: (id) sender;
-- (IBAction) pictureSliderChanged: (id) sender;
-- (IBAction) showPictureSettings:(id)sender;
-- (NSString*) pictureSizeInfoString;
-
-- (IBAction) toggleScaleToScreen:(id)sender;
+@interface HBPreviewController : NSWindowController <NSWindowDelegate>
 
-/* HUD overlay */
-- (void) enableHudControls;
-- (void) disableHudControls;
+@property (nonatomic) BOOL deinterlacePreview;
+@property (nonatomic, readonly) NSString *pictureSizeInfoString;
 
-- (void) startHudTimer;
-- (void) stopHudTimer;
+@property (nonatomic, assign) HBController *delegate;
+@property (nonatomic, assign) hb_handle_t *handle;
+@property (nonatomic, assign) hb_title_t *title;
 
-/* Movie Previews */
-- (void) startReceivingLibhbNotifications;
-- (void) stopReceivingLibhbNotifications;
+- (void) reload;
 
-- (void) installMovieCallbacks;
-- (void) removeMovieCallbacks;
-
-- (IBAction) cancelCreateMoviePreview: (id) sender;
-- (IBAction) createMoviePreview: (id) sender;
-- (void) libhbStateChanged: (hb_state_t ) state;
-- (IBAction) showMoviePreview: (NSString *) path;
-- (IBAction) showPicturesPreview: (id) sender;
-- (IBAction) toggleMoviePreviewPlayPause: (id) sender;
-- (IBAction) moviePlaybackGoToBeginning: (id) sender;
-- (IBAction) moviePlaybackGoToEnd: (id) sender;
-- (IBAction) moviePlaybackGoBackwardOneFrame: (id) sender;
-- (IBAction) moviePlaybackGoForwardOneFrame: (id) sender;
-
-- (void) initPreviewScrubberForMovie;
-- (void) adjustPreviewScrubberForCurrentMovieTime;
-- (IBAction) previewScrubberChanged: (id) sender;
-- (BOOL) isPlaying;
-
-- (void) startMovieTimer;
-- (void) stopMovieTimer;
-
-- (NSString*) SMTPETimecode: (QTTime)time;
-- (QTTime)SliderToQTTime:(double)time;
-
-- (IBAction) previewDurationPopUpChanged: (id) sender;
-
-+ (NSImage *) makeImageForPicture: (NSInteger)pictureIndex
- libhb:(hb_handle_t*)handle
- title:(hb_title_t*)title;
-- (NSImage *) imageForPicture: (NSInteger) pictureIndex;
-- (void) purgeImageCache;
 @end
-

HandBrake-0.9.9.tar.bz2/macosx/HBPreviewController.m -> HandBrake-0.10.0.tar.bz2/macosx/HBPreviewController.m Changed

@@ -1,39 +1,137 @@
 /* $Id: HBPreviewController.mm,v 1.11 2005/08/01 15:10:44 titer Exp $
 
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License. */
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
 
 #import "HBPreviewController.h"
+#import "HBPreviewGenerator.h"
+#import "HBUtilities.h"
 #import "Controller.h"
+#import <QTKit/QTKit.h>
 
-#define BORDER_SIZE 2.0
-#define HB_NUM_HBLIB_PICTURES 20 // # of preview pictures libhb should generate
+@implementation QTMovieView (HBQTMovieViewExtensions)
 
-@implementation QTMovieView (HBExtensions)
-- (void) mouseMoved:(NSEvent *)theEvent
+- (void) mouseMoved: (NSEvent *) theEvent
 {
 [super mouseMoved:theEvent];
 }
+
+@end
+
+@implementation QTMovie (HBQTMovieExtensions)
+
+- (BOOL) isPlaying
+{
+ if ([self rate])
+ return YES;
+ else
+ return NO;
+}
+
+- (NSString *) timecode
+{
+ QTTime time = [self currentTime];
+ double timeInSeconds = (double)time.timeValue / time.timeScale;
+	UInt16 seconds = fmod(timeInSeconds, 60.0);
+	UInt16 minutes = fmod(timeInSeconds / 60.0, 60.0);
+	UInt16 hours = timeInSeconds / (60.0 * 60.0);
+	UInt16 milliseconds = (timeInSeconds - (int) timeInSeconds) * 1000;
+	return [NSString stringWithFormat:@"%02d:%02d:%02d.%03d", hours, minutes, seconds, milliseconds];
+}
+
+- (void) setCurrentTimeDouble: (double) value
+{
+	long timeScale = [[self attributeForKey:QTMovieTimeScaleAttribute] longValue];
+	[self setCurrentTime:QTMakeTime(value * timeScale, timeScale)];
+}
+
 @end
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
 @interface NSWindow(HBExtensions)
-
 @property (readonly) CGFloat backingScaleFactor;
-
 @end
 #endif
 
-@interface PreviewController (Private)
+#define BORDER_SIZE 2.0
+// make min width and height of preview window large enough for hud
+#define MIN_WIDTH 480.0
+#define MIN_HEIGHT 360.0
+
+#define ANIMATION_DUR 0.15
+
+typedef enum ViewMode : NSUInteger {
+ ViewModePicturePreview,
+ ViewModeEncoding,
+ ViewModeMoviePreview
+} ViewMode;
+
+@interface HBPreviewController () <HBPreviewGeneratorDelegate>
+{
+ /* HUD boxes */
+ IBOutlet NSView * fPictureControlBox;
+ IBOutlet NSView * fEncodingControlBox;
+ IBOutlet NSView * fMoviePlaybackControlBox;
+
+ IBOutlet NSSlider * fPictureSlider;
+ IBOutlet NSTextField * fInfoField;
+ IBOutlet NSTextField * fscaleInfoField;
+
+ /* Full Screen Mode Toggle */
+ IBOutlet NSButton * fScaleToScreenToggleButton;
+
+ /* Movie Previews */
+ IBOutlet QTMovieView * fMovieView;
+ /* Playback Panel Controls */
+ IBOutlet NSButton * fPlayPauseButton;
+ IBOutlet NSSlider * fMovieScrubberSlider;
+ IBOutlet NSTextField * fMovieInfoField;
+
+ IBOutlet NSProgressIndicator * fMovieCreationProgressIndicator;
+ IBOutlet NSTextField * fPreviewMovieStatusField;
+
+ /* Popup of choices for length of preview in seconds */
+ IBOutlet NSPopUpButton * fPreviewMovieLengthPopUp;
+}
+
+@property (nonatomic) CALayer *backLayer;
+@property (nonatomic) CALayer *pictureLayer;
+
+@property (nonatomic) CGFloat backingScaleFactor;
+
+@property (nonatomic) ViewMode currentViewMode;
+@property (nonatomic) BOOL scaleToScreen;
+
+@property (nonatomic, retain) NSTimer *hudTimer;
+
+@property (nonatomic, retain) HBPreviewGenerator *generator;
+@property (nonatomic) NSUInteger pictureIndex;
+
+@property (nonatomic, retain) QTMovie *movie;
+@property (nonatomic, retain) NSTimer *movieTimer;
+
+/* Pictures HUD actions */
+- (IBAction) previewDurationPopUpChanged: (id) sender;
+- (IBAction) pictureSliderChanged: (id) sender;
+- (IBAction) showPictureSettings:(id)sender;
+- (IBAction) toggleScaleToScreen:(id)sender;
+
+- (IBAction) cancelCreateMoviePreview: (id) sender;
+- (IBAction) createMoviePreview: (id) sender;
+
+/* Movie HUD actions */
+- (IBAction) showPicturesPreview: (id) sender;
+- (IBAction) toggleMoviePreviewPlayPause: (id) sender;
+- (IBAction) moviePlaybackGoToBeginning: (id) sender;
+- (IBAction) moviePlaybackGoToEnd: (id) sender;
+- (IBAction) previewScrubberChanged: (id) sender;
 
-- (NSSize)optimalViewSizeForImageSize: (NSSize)imageSize;
-- (void)resizeWindowForViewSize: (NSSize)viewSize;
 @end
 
-@implementation PreviewController
+@implementation HBPreviewController
 
-- (id)init
+- (id) init
 {
 	if (self = [super initWithWindowNibName:@"PicturePreview"])
 	{
@@ -46,21 +144,12 @@
 // If/when we switch a lot of this stuff to bindings, this can probably
 // go away.
 [self window];
- 
-		fPicturePreviews = [[NSMutableDictionary dictionaryWithCapacity: HB_NUM_HBLIB_PICTURES] retain];
- /* Init libhb with check for updates libhb style set to "0" so its ignored and lets sparkle take care of it */
- int loggingLevel = [[[NSUserDefaults standardUserDefaults] objectForKey:@"LoggingLevel"] intValue];
- fPreviewLibhb = hb_init(loggingLevel, 0);
-	}
-	return self;
-}
 
-- (void)setHBController: (HBController *)controller
-{
- fHBController = controller;
+ }
+	return self;
 }
 
-- (void)awakeFromNib
+- (void) awakeFromNib
 {
 [[self window] setDelegate:self];
 
@@ -69,274 +158,572 @@
 
 [self setWindowFrameAutosaveName:@"Preview"];
 [[self window] setExcludedFromWindowsMenu:YES];
- 
+
 /* lets set the preview window to accept mouse moved events */
 [[self window] setAcceptsMouseMovedEvents:YES];
- [self startReceivingLibhbNotifications];
- 
- hudTimerSeconds = 0;
+
 /* we set the progress indicator to not use threaded animation
 * as it causes a conflict with the qtmovieview's controllerbar
- */
+ */
 [fMovieCreationProgressIndicator setUsesThreadedAnimation:NO];
- 
- /* we set the preview length popup in seconds */
- [fPreviewMovieLengthPopUp removeAllItems];
- [fPreviewMovieLengthPopUp addItemWithTitle: @"15"];
- [fPreviewMovieLengthPopUp addItemWithTitle: @"30"];
- [fPreviewMovieLengthPopUp addItemWithTitle: @"45"];
- [fPreviewMovieLengthPopUp addItemWithTitle: @"60"];
- [fPreviewMovieLengthPopUp addItemWithTitle: @"90"];
- [fPreviewMovieLengthPopUp addItemWithTitle: @"105"];
- [fPreviewMovieLengthPopUp addItemWithTitle: @"120"];
- [fPreviewMovieLengthPopUp addItemWithTitle: @"135"];
- [fPreviewMovieLengthPopUp addItemWithTitle: @"150"];
- [fPreviewMovieLengthPopUp addItemWithTitle: @"165"];
- [fPreviewMovieLengthPopUp addItemWithTitle: @"180"];
- [fPreviewMovieLengthPopUp addItemWithTitle: @"195"];
- [fPreviewMovieLengthPopUp addItemWithTitle: @"210"];
- [fPreviewMovieLengthPopUp addItemWithTitle: @"225"];
- [fPreviewMovieLengthPopUp addItemWithTitle: @"240"];
 
 	[fMovieView setHidden:YES];
 [fMovieView setDelegate:self];
+ [fMovieView setControllerVisible:NO];
+
+ /* we set the preview length popup in seconds */
+ [fPreviewMovieLengthPopUp removeAllItems];
+ [fPreviewMovieLengthPopUp addItemsWithTitles:@[@"15", @"30", @"45", @"60", @"90",
+ @"120", @"150", @"180", @"210", @"240"]];
+
+ if ([[NSUserDefaults standardUserDefaults] objectForKey:@"PreviewLength"])
+ [fPreviewMovieLengthPopUp selectItemWithTitle:[[NSUserDefaults standardUserDefaults]
+ objectForKey:@"PreviewLength"]];
+ if (![fPreviewMovieLengthPopUp selectedItem])
+ /* currently hard set default to 15 seconds */
+ [fPreviewMovieLengthPopUp selectItemAtIndex: 0];
 
 /* Setup our layers for core animation */
 [[[self window] contentView] setWantsLayer:YES];
- [fPictureControlBox setWantsLayer:YES];
- [fEncodingControlBox setWantsLayer:YES];
- [fMoviePlaybackControlBox setWantsLayer:YES];
- 
- fWhiteBackground = [CALayer layer];
- [fWhiteBackground setBounds:CGRectMake(0.0, 0.0, 480.0, 360.0)];
- [fWhiteBackground setPosition:CGPointMake([[[self window] contentView] frame].size.width /2,
- [[[self window] contentView] frame].size.height /2)];
- 
- [fWhiteBackground setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
+
+ self.backLayer = [CALayer layer];
+ [self.backLayer setBounds:CGRectMake(0.0, 0.0, MIN_WIDTH, MIN_HEIGHT)];
+ [self.backLayer setPosition:CGPointMake([[[self window] contentView] frame].size.width /2,
+ [[[self window] contentView] frame].size.height /2)];
+
+ [self.backLayer setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
 CGColorRef white = CGColorCreateGenericRGB(1.0, 1.0, 1.0, 1.0);
- [fWhiteBackground setBackgroundColor: white];
+ [self.backLayer setBackgroundColor: white];
 CFRelease(white);
- [fWhiteBackground setShadowOpacity:0.5f];
- [fWhiteBackground setShadowOffset:CGSizeMake(0, 0)];
+ [self.backLayer setShadowOpacity:0.5f];
+ [self.backLayer setShadowOffset:CGSizeMake(0, 0)];
 
- fPictureLayer = [CALayer layer];
- [fPictureLayer setBounds:CGRectMake(0.0, 0.0, 476.0, 356.0)];
- [fPictureLayer setPosition:CGPointMake([[[self window] contentView] frame].size.width /2,
- [[[self window] contentView] frame].size.height /2)];
- 
- [fPictureLayer setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
+ self.pictureLayer = [CALayer layer];
+ [self.pictureLayer setBounds:CGRectMake(0.0, 0.0, MIN_WIDTH - (BORDER_SIZE * 2), MIN_HEIGHT - (BORDER_SIZE * 2))];
+ [self.pictureLayer setPosition:CGPointMake([[[self window] contentView] frame].size.width /2,
+ [[[self window] contentView] frame].size.height /2)];
 
- NSMutableDictionary *actions = [NSMutableDictionary
- dictionaryWithDictionary:[fPictureLayer actions]];
+ [self.pictureLayer setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
 
 // Disable fade on contents change
+ NSMutableDictionary *actions = [NSMutableDictionary
+ dictionaryWithDictionary:[self.pictureLayer actions]];
+
 [actions setObject:[NSNull null] forKey:@"contents"];
- [fPictureLayer setActions:actions];
+ [self.pictureLayer setActions:actions];
 
- [[[[self window] contentView] layer] insertSublayer:fWhiteBackground below: [fMovieView layer]];
- [[[[self window] contentView] layer] insertSublayer:fPictureLayer below: [fMovieView layer]];
+ [[[[self window] contentView] layer] insertSublayer:self.backLayer below: [fMovieView layer]];
+ [[[[self window] contentView] layer] insertSublayer:self.pictureLayer below: [fMovieView layer]];
 
 /* relocate our hud origins */
 NSPoint hudControlBoxOrigin = [fMoviePlaybackControlBox frame].origin;
 [fPictureControlBox setFrameOrigin:hudControlBoxOrigin];
 [fEncodingControlBox setFrameOrigin:hudControlBoxOrigin];
 [fMoviePlaybackControlBox setFrameOrigin:hudControlBoxOrigin];
- 
+
+ /* set the current scale factor */
 if( [[self window] respondsToSelector:@selector( backingScaleFactor )] )
- backingScaleFactor = [[self window] backingScaleFactor];
+ self.backingScaleFactor = [[self window] backingScaleFactor];
 else
- backingScaleFactor = 1.0;
- 
- [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(titleChanged:) name: HBTitleChangedNotification object:nil];
+ self.backingScaleFactor = 1.0;
 }
 
-- (void) titleChanged: (NSNotification *) aNotification
+- (void) setTitle: (hb_title_t *) title
 {
- /* Notification from HBController, only used to stop
- * an encoding while the HBController is scanning a new title
- */
- [self cancelCreateMoviePreview:self];
+ _title = title;
+
+ self.generator.delegate = nil;
+ [self.generator cancel];
+ self.generator = nil;
+
+ if (_title)
+ {
+ /* alloc and init a generator for the current title */
+ self.generator = [[[HBPreviewGenerator alloc] initWithHandle:self.handle andTitle:self.title] autorelease];
+
+ /* adjust the preview slider length */
+ [fPictureSlider setMaxValue: self.generator.imagesCount - 1.0];
+ [fPictureSlider setNumberOfTickMarks: self.generator.imagesCount];
+
+ [self switchViewToMode:ViewModePicturePreview];
+ [self displayPreview];
+ }
 }
 
-- (void)windowWillClose:(NSNotification *)aNotification
+- (void) reload
 {
- /* Upon closing the preview window, we make sure we clean up any
- * preview movie that might be playing or encoding. However, first
- * make sure we have a preview picture before calling pictureSliderChanged
- * to go back to still previews .. just in case nothing is loaded up like in
- * a Launch, cancel new scan then quit type scenario.
- */
+ if (self.title)
+ {
+ // Purge the existing picture previews so they get recreated the next time
+ // they are needed.
+ [self.generator purgeImageCache];
+ [self switchViewToMode:ViewModePicturePreview];
+ [self displayPreview];
+ }
+}
 
- if (fEncodeState || [self isPlaying])
+- (void) showWindow: (id) sender
+{
+ if (self.currentViewMode == ViewModeMoviePreview)
+ {
+ [self startMovieTimer];
+ }
+
+ [super showWindow:sender];
+}
+
+- (void) windowWillClose: (NSNotification *) aNotification
+{
+ if (self.currentViewMode == ViewModeEncoding)
 {
 [self cancelCreateMoviePreview:self];
+ }
+ else if (self.currentViewMode == ViewModeMoviePreview)
+ {
 [fMovieView pause:self];
 [self stopMovieTimer];
 }
 
- hudTimerSeconds = 0;
+ [self.generator purgeImageCache];
 [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"PreviewWindowIsOpen"];
 }
 
-- (void) dealloc
+- (void) windowDidChangeBackingProperties: (NSNotification *) notification
 {
- hb_stop(fPreviewLibhb);
- if (fPreviewMoviePath)
+ NSWindow *theWindow = (NSWindow *)[notification object];
+
+ CGFloat newBackingScaleFactor = [theWindow backingScaleFactor];
+ CGFloat oldBackingScaleFactor = [[[notification userInfo]
+ objectForKey:@"NSBackingPropertyOldScaleFactorKey"]
+ doubleValue];
+
+ if (newBackingScaleFactor != oldBackingScaleFactor)
 {
- [[NSFileManager defaultManager] removeItemAtPath:fPreviewMoviePath error:nil];
- [fPreviewMoviePath release];
+ // Scale factor changed, update the preview window
+ // to the new situation
+ self.backingScaleFactor = newBackingScaleFactor;
+ if (self.title)
+ [self reload];
 }
- 
- [fLibhbTimer invalidate];
- [fLibhbTimer release];
- 
- [fHudTimer invalidate];
- [fHudTimer release];
- 
- [fMovieTimer invalidate];
- [fMovieTimer release];
- 
- [fPicturePreviews release];
- 
- hb_close(&fPreviewLibhb);
- 
- [self removeMovieCallbacks];
- 
- [super dealloc];
 }
 
-- (void) SetHandle: (hb_handle_t *) handle
+/**
+ * Given the size of the preview image to be shown, returns the best possible
+ * size for the view.
+ */
+- (NSSize) optimalViewSizeForImageSize: (NSSize) imageSize
 {
- fHandle = handle;
- 
- /* adjust the preview slider length */
- /* We use our advance pref to determine how many previews we scanned */
- int hb_num_previews = [[[NSUserDefaults standardUserDefaults] objectForKey:@"PreviewsNumber"] intValue];
- [fPictureSlider setMaxValue: hb_num_previews - 1.0];
- [fPictureSlider setNumberOfTickMarks: hb_num_previews];
- 
- if ([[NSUserDefaults standardUserDefaults] objectForKey:@"PreviewLength"])
+ CGFloat minWidth = MIN_WIDTH;
+ CGFloat minHeight = MIN_HEIGHT;
+
+ NSSize screenSize = [[[self window] screen] visibleFrame].size;
+ CGFloat maxWidth = screenSize.width;
+ CGFloat maxHeight = screenSize.height;
+
+ NSSize resultSize = imageSize;
+ CGFloat resultPar = resultSize.width / resultSize.height;
+
+ //note, a mbp 15" at 1440 x 900 is a 1.6 ar
+ CGFloat screenAspect = screenSize.width / screenSize.height;
+
+ if ( resultSize.width > maxWidth || resultSize.height > maxHeight )
 {
- [fPreviewMovieLengthPopUp selectItemWithTitle:[[NSUserDefaults standardUserDefaults] objectForKey:@"PreviewLength"]];
+ 	// Source is larger than screen in one or more dimensions
+ if ( resultPar > screenAspect )
+ {
+ // Source aspect wider than screen aspect, snap to max width and vary height
+ resultSize.width = maxWidth;
+ resultSize.height = (maxWidth / resultPar);
+ }
+ else
+ {
+ // Source aspect narrower than screen aspect, snap to max height vary width
+ resultSize.height = maxHeight;
+ resultSize.width = (maxHeight * resultPar);
+ }
 }
- else
+
+ // If necessary, grow to minimum dimensions to ensure controls overlay is not obstructed
+ if ( resultSize.width < minWidth )
+ resultSize.width = minWidth;
+ if ( resultSize.height < minHeight )
+ resultSize.height = minHeight;
+
+ return resultSize;
+}
+
+/**
+ * Resizes the entire window to accomodate a view of a particular size.
+ */
+- (void) resizeWindowForViewSize: (NSSize) viewSize
+{
+ NSSize currentSize = [[[self window] contentView] frame].size;
+ NSRect frame = [[self window] frame];
+
+ // Calculate border around content region of the frame
+ int borderX = frame.size.width - currentSize.width;
+ int borderY = frame.size.height - currentSize.height;
+
+ // Make sure the frame is smaller than the screen
+ NSSize maxSize = [[[self window] screen] visibleFrame].size;
+
+ /* if we are not Scale To Screen, put an 10% of visible screen on the window */
+ if (self.scaleToScreen == NO)
 {
- /* currently hard set default to 15 seconds */
- [fPreviewMovieLengthPopUp selectItemAtIndex: 0];
+ maxSize.width = maxSize.width * 0.90;
+ maxSize.height = maxSize.height * 0.90;
+ }
+
+ // Set the new frame size
+ // Add the border to the new frame size so that the content region
+ // of the frame is large enough to accomodate the preview image
+ frame.size.width = viewSize.width + borderX;
+ frame.size.height = viewSize.height + borderY;
+
+ /* compare frame to max size of screen */
+ if( frame.size.width > maxSize.width )
+ {
+ frame.size.width = maxSize.width;
+ }
+ if( frame.size.height > maxSize.height )
+ {
+ frame.size.height = maxSize.height;
+ }
+
+ /* Since upon launch we can open up the preview window if it was open
+ * the last time we quit (and at the size it was) we want to make
+ * sure that upon resize we do not have the window off the screen
+ * So check the origin against the screen origin and adjust if
+ * necessary.
+ */
+ NSSize screenSize = [[[self window] screen] visibleFrame].size;
+ NSPoint screenOrigin = [[[self window] screen] visibleFrame].origin;
+
+ /* our origin is off the screen to the left*/
+ if (frame.origin.x < screenOrigin.x)
+ {
+ /* so shift our origin to the right */
+ frame.origin.x = screenOrigin.x;
+ }
+ else if ((frame.origin.x + frame.size.width) > (screenOrigin.x + screenSize.width))
+ {
+ /* the right side of the preview is off the screen, so shift to the left */
+ frame.origin.x = (screenOrigin.x + screenSize.width) - frame.size.width;
+ }
+
+ if (self.scaleToScreen == YES)
+ {
+ /* our origin is off the screen to the top*/
+ if (frame.origin.y < screenOrigin.y)
+ {
+ /* so shift our origin to the bottom */
+ frame.origin.y = screenOrigin.y;
+ }
+ else if ((frame.origin.y + frame.size.height) > (screenOrigin.y + screenSize.height))
+ {
+ /* the top side of the preview is off the screen, so shift to the bottom */
+ frame.origin.y = (screenOrigin.y + screenSize.height) - frame.size.height;
+ }
 }
+
+ [[self window] setFrame:frame display:YES animate:YES];
 }
 
-- (void) SetTitle: (hb_title_t *) title
+
+/**
+ * Enable/Disable an arbitrary number of UI elements.
+ * @param boxes an array of UI elements
+ * @param indexes a set of indexes of the elements in boxes to be enabled
+ */
+- (void) toggleBoxes: (NSArray *) boxes usingIndexes: (NSIndexSet *) indexes
 {
- fTitle = title;
- fPicture = 0;
+ [NSAnimationContext beginGrouping];
+ [[NSAnimationContext currentContext] setDuration:ANIMATION_DUR];
 
- [self settingsChanged:nil];
+ [boxes enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+ BOOL hide = [indexes containsIndex:idx] ? NO : YES;
+ if (hide)
+ {
+ [self hideHudWithAnimation:obj];
+ }
+ else
+ {
+ [self showHudWithAnimation:obj];
+ }
+ }];
+
+ [NSAnimationContext endGrouping];
 }
 
-- (void)windowDidChangeBackingProperties:(NSNotification *)notification {
- 
- NSWindow *theWindow = (NSWindow *)[notification object];
- 
- CGFloat newBackingScaleFactor = [theWindow backingScaleFactor];
- CGFloat oldBackingScaleFactor = [[[notification userInfo]
- objectForKey:@"NSBackingPropertyOldScaleFactorKey"]
- doubleValue];
- if( newBackingScaleFactor != oldBackingScaleFactor )
+/**
+ * Switch the preview controller to one of his view mode:
+ * ViewModePicturePreview, ViewModeEncoding, ViewModeMoviePreview
+ * This methods is the only way to change the mode, do not try otherwise.
+ * @param mode ViewMode mode
+ */
+- (void) switchViewToMode: (ViewMode) mode
+{
+ switch (mode) {
+ case ViewModePicturePreview:
+ {
+ if (self.currentViewMode == ViewModeEncoding)
+ {
+ [self toggleBoxes:@[fPictureControlBox, fEncodingControlBox]
+ usingIndexes:[NSIndexSet indexSetWithIndex:0]];
+ [fMovieCreationProgressIndicator stopAnimation:self];
+ }
+ else if (self.currentViewMode == ViewModeMoviePreview)
+ {
+ /* Stop playback and remove the observers */
+ [fMovieView pause:self];
+ [self stopMovieTimer];
+ [self removeMovieObservers];
+
+ [self toggleBoxes:@[fPictureControlBox, fMoviePlaybackControlBox, fMovieView]
+ usingIndexes:[NSIndexSet indexSetWithIndex:0]];
+
+ /* Release the movie */
+ [fMovieView setMovie:nil];
+ self.movie = nil;
+ }
+
+ break;
+ }
+
+ case ViewModeEncoding:
+ {
+ [fMovieCreationProgressIndicator setDoubleValue:0];
+ [fMovieCreationProgressIndicator startAnimation:self];
+ [self toggleBoxes:@[fEncodingControlBox, fPictureControlBox, fMoviePlaybackControlBox]
+ usingIndexes:[NSIndexSet indexSetWithIndex:0]];
+
+ break;
+ }
+
+ case ViewModeMoviePreview:
+ {
+ [self toggleBoxes:@[fMovieView, fMoviePlaybackControlBox, fEncodingControlBox, fPictureControlBox]
+ usingIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, 2)]];
+
+ [fMovieCreationProgressIndicator stopAnimation:self];
+ [self initPreviewScrubberForMovie];
+ [self startMovieTimer];
+
+ /* Install movie notifications */
+ [self addMovieObservers];
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ self.currentViewMode = mode;
+}
+
+- (void) dealloc
+{
+ [_hudTimer invalidate];
+ [_hudTimer release];
+
+ [_movieTimer invalidate];
+ [_movieTimer release];
+
+ [_generator cancel];
+ [_generator release];
+
+ [self removeMovieObservers];
+
+ [super dealloc];
+}
+
+#pragma mark -
+#pragma mark Hud Control Overlay
+
+- (void) mouseMoved: (NSEvent *) theEvent
+{
+ [super mouseMoved:theEvent];
+ NSPoint mouseLoc = [theEvent locationInWindow];
+
+ /* Test for mouse location to show/hide hud controls */
+ if (self.currentViewMode != ViewModeEncoding && self.title)
 {
- // Scale factor changed, update the preview window
- // to the new situation
- backingScaleFactor = newBackingScaleFactor;
- if (fTitle)
- [self pictureSliderChanged:self];
+ /* Since we are not encoding, verify which control hud to show
+ * or hide based on aMovie ( aMovie indicates we need movie controls )
+ */
+ NSView *hud;
+ if (self.currentViewMode == !ViewModeMoviePreview) // No movie loaded up
+ {
+ hud = fPictureControlBox;
+ }
+ else // We have a movie
+ {
+ hud = fMoviePlaybackControlBox;
+ }
+
+ if (NSPointInRect(mouseLoc, [hud frame]))
+ {
+ [self showHudWithAnimation:hud];
+ [self stopHudTimer];
+ }
+		else if (NSPointInRect(mouseLoc, [[[self window] contentView] frame]))
+ {
+ [self showHudWithAnimation:hud];
+ [self startHudTimer];
+ }
+ else
+ {
+ [self hideHudWithAnimation:hud];
+ [self stopHudTimer];
+ }
+	}
+}
+
+- (void)showHudWithAnimation:(NSView *)hud
+{
+ // The standard view animator doesn't play
+ // nicely with the Yosemite visual effects yet.
+ // So let's do the fade ourself.
+ if (hud.layer.opacity == 0 || [hud isHidden])
+ {
+ [hud setHidden:NO];
+
+ [CATransaction begin];
+ CABasicAnimation *fadeInAnimation = [CABasicAnimation animationWithKeyPath:@"opacity"];
+ fadeInAnimation.fromValue = @(0.0);
+ fadeInAnimation.toValue = @(1.0);
+ fadeInAnimation.beginTime = 0.0;
+ fadeInAnimation.duration = ANIMATION_DUR;
+
+ [hud.layer addAnimation:fadeInAnimation forKey:nil];
+ [hud.layer setOpacity:1];
+
+ [CATransaction commit];
 }
 }
 
-// Adjusts the window to draw the current picture (fPicture) adjusting its size as
-// necessary to display as much of the picture as possible.
+- (void)hideHudWithAnimation:(NSView *)hud
+{
+ if (hud.layer.opacity != 0)
+ {
+ [CATransaction begin];
+ [CATransaction setCompletionBlock:^{
+ if (hud.layer.opacity == 0)
+ {
+ [hud setHidden:YES];
+ }
+ }];
+ CABasicAnimation *fadeInAnimation = [CABasicAnimation animationWithKeyPath:@"opacity"];
+ fadeInAnimation.fromValue = @([hud.layer.presentationLayer opacity]);
+ fadeInAnimation.toValue = @(0.0);
+ fadeInAnimation.beginTime = 0.0;
+ fadeInAnimation.duration = ANIMATION_DUR;
+
+ [hud.layer addAnimation:fadeInAnimation forKey:nil];
+ [hud.layer setOpacity:0];
+
+ [CATransaction commit];
+ }
+}
+
+- (void) startHudTimer
+{
+	if (self.hudTimer)
+ {
+ [self.hudTimer setFireDate:[NSDate dateWithTimeIntervalSinceNow:8.0]];
+	}
+ else
+ {
+ self.hudTimer = [NSTimer scheduledTimerWithTimeInterval:8.0 target:self selector:@selector(hudTimerFired:)
+ userInfo:nil repeats:YES];
+ }
+}
+
+- (void) stopHudTimer
+{
+ [self.hudTimer invalidate];
+ self.hudTimer = nil;
+}
+
+- (void) hudTimerFired: (NSTimer *)theTimer
+{
+ /* Regardless which control box is active, after the timer
+ * period we want either one to fade to hidden.
+ */
+ [self hideHudWithAnimation:fPictureControlBox];
+ [self hideHudWithAnimation:fMoviePlaybackControlBox];
+
+ [self stopHudTimer];
+}
+
+#pragma mark -
+#pragma mark Still previews mode
+
+/**
+ * Adjusts the window to draw the current picture (fPicture) adjusting its size as
+ * necessary to display as much of the picture as possible.
+ */
 - (void) displayPreview
 {
- hb_job_t * job = fTitle->job;
+ hb_title_t *title = self.title;
 
- NSImage *fPreviewImage = [self imageForPicture: fPicture];
+ NSImage *fPreviewImage = [self.generator imageAtIndex:self.pictureIndex shouldCache:YES];
 NSSize imageScaledSize = [fPreviewImage size];
- [fPictureLayer setContents:fPreviewImage];
+ [self.pictureLayer setContents:fPreviewImage];
 
- NSSize displaySize = NSMakeSize( ( CGFloat )fTitle->width, ( CGFloat )fTitle->height );
+ NSSize displaySize = NSMakeSize( ( CGFloat )title->width, ( CGFloat )title->height );
 NSString *sizeInfoString;
 
 /* Set the picture size display fields below the Preview Picture*/
- int output_width, output_height, output_par_width, output_par_height;
 int display_width;
- if( fTitle->job->anamorphic.mode == 1 ) // Original PAR Implementation
+ display_width = title->job->width * title->job->anamorphic.par_width / title->job->anamorphic.par_height;
+ if (title->job->anamorphic.mode == HB_ANAMORPHIC_STRICT) // Original PAR Implementation
 {
- output_width = fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3];
- output_height = fTitle->height-fTitle->job->crop[0]-fTitle->job->crop[1];
- display_width = output_width * fTitle->job->anamorphic.par_width / fTitle->job->anamorphic.par_height;
 sizeInfoString = [NSString stringWithFormat:
 @"Source: %dx%d, Output: %dx%d, Anamorphic: %dx%d Strict",
- fTitle->width, fTitle->height, output_width, output_height, display_width, output_height];
- 
- displaySize.width = display_width;
- displaySize.height = fTitle->height;
- imageScaledSize.width = display_width;
- imageScaledSize.height = output_height;
+ title->width, title->height, title->job->width, title->job->height, display_width, title->job->height];
 }
- else if (fTitle->job->anamorphic.mode == 2) // Loose Anamorphic
+ else if (title->job->anamorphic.mode == HB_ANAMORPHIC_LOOSE) // Loose Anamorphic
 {
- hb_set_anamorphic_size(job, &output_width, &output_height, &output_par_width, &output_par_height);
- display_width = output_width * output_par_width / output_par_height;
 sizeInfoString = [NSString stringWithFormat:
 @"Source: %dx%d, Output: %dx%d, Anamorphic: %dx%d Loose",
- fTitle->width, fTitle->height, output_width, output_height, display_width, output_height];
- 
- displaySize.width = display_width;
- displaySize.height = fTitle->height;
- imageScaledSize.width = display_width;
- imageScaledSize.height = output_height;
+ title->width, title->height, title->job->width, title->job->height, display_width, title->job->height];
 }
- else if (fTitle->job->anamorphic.mode == 3) // Custom Anamorphic
+ else if (title->job->anamorphic.mode == HB_ANAMORPHIC_CUSTOM) // Custom Anamorphic
 {
- hb_set_anamorphic_size(job, &output_width, &output_height, &output_par_width, &output_par_height);
 sizeInfoString = [NSString stringWithFormat:
 @"Source: %dx%d, Output: %dx%d, Anamorphic: %dx%d Custom",
- fTitle->width, fTitle->height, output_width, output_height, fTitle->job->anamorphic.dar_width, fTitle->job->anamorphic.dar_height];
- 
- displaySize.width = fTitle->job->anamorphic.dar_width + fTitle->job->crop[2] + fTitle->job->crop[3] ;
- displaySize.height = fTitle->job->anamorphic.dar_height + fTitle->job->crop[0] + fTitle->job->crop[1];
- imageScaledSize.width = (int)fTitle->job->anamorphic.dar_width;
- imageScaledSize.height = (int)fTitle->job->height;
+ title->width, title->height, title->job->width, title->job->height, display_width, title->job->height];
 }
 else // No Anamorphic
 {
 sizeInfoString = [NSString stringWithFormat:
- @"Source: %dx%d, Output: %dx%d", fTitle->width, fTitle->height,
- fTitle->job->width, fTitle->job->height];
- 
- displaySize.width = fTitle->width;
- displaySize.height = fTitle->height;
- imageScaledSize.width = fTitle->job->width;
- imageScaledSize.height = fTitle->job->height;
+ @"Source: %dx%d, Output: %dx%d",
+ title->width, title->height, title->job->width, title->job->height];
 }
+ displaySize.width = display_width;
+ displaySize.height = title->job->height;
+ imageScaledSize.width = display_width;
+ imageScaledSize.height = title->job->height;
 
- if( backingScaleFactor != 1.0 )
+ if (self.backingScaleFactor != 1.0)
 {
 // HiDPI mode usually display everything
 // with douple pixel count, but we don't
 // want to double the size of the video
- displaySize.height /= backingScaleFactor;
- displaySize.width /= backingScaleFactor;
- imageScaledSize.height /= backingScaleFactor;
- imageScaledSize.width /= backingScaleFactor;
+ displaySize.height /= self.backingScaleFactor;
+ displaySize.width /= self.backingScaleFactor;
+ imageScaledSize.height /= self.backingScaleFactor;
+ imageScaledSize.width /= self.backingScaleFactor;
 }
 
 // Get the optimal view size for the image
 NSSize viewSize = [self optimalViewSizeForImageSize:displaySize];
 viewSize.width += BORDER_SIZE * 2;
 viewSize.height += BORDER_SIZE * 2;
- 
+
 NSSize windowSize;
- if (scaleToScreen == YES)
+ if (self.scaleToScreen == YES)
 // Scale the window to the max possible size
 windowSize = [[[self window] screen] visibleFrame].size;
 else
@@ -348,14 +735,14 @@
 areaSize.width -= BORDER_SIZE * 2;
 areaSize.height -= BORDER_SIZE * 2;
 
- if (scaleToScreen == YES)
+ if (self.scaleToScreen == YES)
 {
 /* We are in Scale To Screen mode so, we have to get the ratio for height and width against the window
 *size so we can scale from there.
 */
 CGFloat pictureAspectRatio = imageScaledSize.width / imageScaledSize.height;
 CGFloat areaAspectRatio = areaSize.width / areaSize.height;
- 
+
 if (pictureAspectRatio > areaAspectRatio)
 {
 viewSize.width = areaSize.width;
@@ -376,7 +763,7 @@
 {
 CGFloat pictureAspectRatio = imageScaledSize.width / imageScaledSize.height;
 CGFloat areaAspectRatio = areaSize.width / areaSize.height;
- 
+
 if (pictureAspectRatio > areaAspectRatio)
 {
 viewSize.width = areaSize.width;
@@ -391,539 +778,182 @@
 }
 
 // Resize the CALayers
- [fWhiteBackground setBounds:CGRectMake(0, 0, viewSize.width + (BORDER_SIZE * 2), viewSize.height + (BORDER_SIZE * 2))];
- [fPictureLayer setBounds:CGRectMake(0, 0, viewSize.width, viewSize.height)];
+ [self.backLayer setBounds:CGRectMake(0, 0, viewSize.width + (BORDER_SIZE * 2), viewSize.height + (BORDER_SIZE * 2))];
+ [self.pictureLayer setBounds:CGRectMake(0, 0, viewSize.width, viewSize.height)];
 
 NSString *scaleString;
- CGFloat scale = ( ( CGFloat )[fPictureLayer frame].size.width) / ( ( CGFloat )imageScaledSize.width);
+ CGFloat scale = ( ( CGFloat )[self.pictureLayer frame].size.width) / ( ( CGFloat )imageScaledSize.width);
 if (scale * 100.0 != 100)
- scaleString = [NSString stringWithFormat:
- NSLocalizedString( @" (%.0f%% actual size)",
- @"String shown when a preview is scaled" ), scale * 100.0];
+ scaleString = [NSString stringWithFormat:@" (%.0f%% actual size)", scale * 100.0];
 else
 scaleString = @"(Actual size)";
- 
- if (scaleToScreen == YES)
+
+ if (_scaleToScreen == YES)
 scaleString = [scaleString stringByAppendingString:@" Scaled To Screen"];
 
 /* Set the info fields in the hud controller */
 [fInfoField setStringValue: [NSString stringWithFormat:
 @"%@", sizeInfoString]];
- 
+
 [fscaleInfoField setStringValue: [NSString stringWithFormat:
 @"%@", scaleString]];
+
 /* Set the info field in the window title bar */
 [[self window] setTitle:[NSString stringWithFormat: @"Preview - %@ %@",sizeInfoString, scaleString]];
 }
 
-- (IBAction) previewDurationPopUpChanged: (id) sender
-{
- [[NSUserDefaults standardUserDefaults] setObject:[fPreviewMovieLengthPopUp titleOfSelectedItem] forKey:@"PreviewLength"];
-}
- 
-- (IBAction) settingsChanged: (id) sender
-{
- // Purge the existing picture previews so they get recreated the next time
- // they are needed.
- [self purgeImageCache];
- [self pictureSliderChanged:nil];
-}
-
-- (IBAction) pictureSliderChanged: (id) sender
-{
- /* Run cancelCreateMoviePreview in case a preview is being encoded and then cancel if so */
- [self cancelCreateMoviePreview:nil];
- 
- // Show the picture view
- if (aMovie)
- {
- [fMoviePlaybackControlBox setHidden:YES];
- [fMovieView pause:nil];
- [fMovieView setHidden:YES];
- [fMovieView setMovie:nil];
- aMovie = nil;
- }
- 
- int newPicture = [fPictureSlider intValue];
- if (newPicture != fPicture)
- {
- fPicture = newPicture;
- }
- [self displayPreview];
- 
-}
-
-- (IBAction)showWindow:(id)sender
-{
- if (aMovie)
- [self startMovieTimer];
- 
- [super showWindow:sender];
-}
-- (NSString*) pictureSizeInfoString
-{
- return [fInfoField stringValue];
-}
-
-- (IBAction)showPictureSettings:(id)sender
-{
- [fHBController showPicturePanel:self];
-}
-
-#pragma mark Hud Control Overlay
-/* enableHudControls and disableHudControls are used to sync enableUI
- * in HBController so that during a scan we do not attempt to access source
- * images, etc. which can cause a crash. In general this ui behavior will mirror
- * the main window ui's enableUI method and in fact is called from there */
-- (void) enableHudControls
-{
- [fPictureSlider setEnabled:YES];
- [fScaleToScreenToggleButton setEnabled:YES];
- [fCreatePreviewMovieButton setEnabled:YES];
- [fGoToStillPreviewButton setEnabled:YES];
-}
-
-- (void) disableHudControls
-{
- [fPictureSlider setEnabled:NO];
- [fScaleToScreenToggleButton setEnabled:NO];
- [fCreatePreviewMovieButton setEnabled:NO];
- [fGoToStillPreviewButton setEnabled:NO];
-}
-
-- (void) mouseMoved:(NSEvent *)theEvent
-{
- [super mouseMoved:theEvent];
- NSPoint mouseLoc = [theEvent locationInWindow];
- 
- /* Test for mouse location to show/hide hud controls */
- if( fEncodeState != 1 )
- {
- /* Since we are not encoding, verify which control hud to show
- * or hide based on aMovie ( aMovie indicates we need movie controls )
- */
- NSBox *hudBoxToShow;
- if ( aMovie == nil ) // No movie loaded up
- {
- hudBoxToShow = fPictureControlBox;
- }
- else // We have a movie
- {
- hudBoxToShow = fMoviePlaybackControlBox;
- }
- 
- if( NSPointInRect( mouseLoc, [fPictureControlBox frame] ) )
- {
- [[hudBoxToShow animator] setHidden: NO];
- [self stopHudTimer];
- }
-		else if( NSPointInRect( mouseLoc, [[[self window] contentView] frame] ) )
- {
- [[hudBoxToShow animator] setHidden: NO];
- [self startHudTimer];
- }
- else
- {
- [[hudBoxToShow animator] setHidden: YES];
- }
-	}
-}
-
-- (void) startHudTimer
-{
-	if( fHudTimer ) {
-		[fHudTimer invalidate];
-		[fHudTimer release];
-	}
- fHudTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(hudTimerFired:) userInfo:nil repeats:YES];
- [fHudTimer retain];
-}
-
-- (void) stopHudTimer
-{
- if( fHudTimer )
- {
- [fHudTimer invalidate];
- [fHudTimer release];
- fHudTimer = nil;
- hudTimerSeconds = 0;
- }
-}
-
-- (void) hudTimerFired: (NSTimer*)theTimer
-{
- hudTimerSeconds++;
- if( hudTimerSeconds >= 10 ) 
- {
- /* Regardless which control box is active, after the timer
- * period we want either one to fade to hidden.
- */
- [[fPictureControlBox animator] setHidden: YES];
- [[fMoviePlaybackControlBox animator] setHidden: YES];
- [self stopHudTimer];
- }
-}
-
-- (IBAction)toggleScaleToScreen:(id)sender
-{
- if (scaleToScreen == YES)
- {
- scaleToScreen = NO;
- /* make sure we are set to a still preview */
- [self pictureSliderChanged:nil];
- [fScaleToScreenToggleButton setTitle:@"Scale To Screen"];
- }
- else
- {
- scaleToScreen = YES;
- /* make sure we are set to a still preview */
- [self pictureSliderChanged:nil];
- [fScaleToScreenToggleButton setTitle:@"Actual Scale"];
- }
- 
-}
-
-#pragma mark Still Preview Image Processing
-
-// This function converts an image created by libhb (specified via pictureIndex) into
-// an NSImage suitable for the GUI code to use. If removeBorders is YES,
-// makeImageForPicture crops the image generated by libhb stripping off the gray
-// border around the content. This is the low-level method that generates the image.
-// -imageForPicture calls this function whenever it can't find an image in its cache.
-+ (NSImage *) makeImageForPicture: (NSInteger)pictureIndex
- libhb:(hb_handle_t*)handle
- title:(hb_title_t*)title
-{
- static uint8_t * buffer;
- static int bufferSize;
-
- // Make sure we have a big enough buffer to receive the image from libhb. libhb
- int dstWidth = title->job->width;
- int dstHeight = title->job->height;
- 
- int newSize;
- newSize = dstWidth * dstHeight * 4;
- if( bufferSize < newSize )
- {
- bufferSize = newSize;
- buffer = (uint8_t *) realloc( buffer, bufferSize );
- }
-
- hb_get_preview( handle, title->job, (int)pictureIndex, buffer );
-
- // Create an NSBitmapImageRep and copy the libhb image into it, converting it from
- // libhb's format to one suitable for NSImage. Along the way, we'll strip off the
- // border around libhb's image.
- 
- // The image data returned by hb_get_preview is 4 bytes per pixel, BGRA format.
- // Alpha is ignored.
- 
- NSBitmapFormat bitmapFormat = (NSBitmapFormat)NSAlphaFirstBitmapFormat;
- NSBitmapImageRep * imgrep = [[[NSBitmapImageRep alloc]
- initWithBitmapDataPlanes:nil
- pixelsWide:dstWidth
- pixelsHigh:dstHeight
- bitsPerSample:8
- samplesPerPixel:3 // ignore alpha
- hasAlpha:NO
- isPlanar:NO
- colorSpaceName:NSCalibratedRGBColorSpace
- bitmapFormat:bitmapFormat
- bytesPerRow:dstWidth * 4
- bitsPerPixel:32] autorelease];
-
- UInt32 * src = (UInt32 *)buffer;
- UInt32 * dst = (UInt32 *)[imgrep bitmapData];
- int r, c;
- for (r = 0; r < dstHeight; r++)
- {
- for (c = 0; c < dstWidth; c++)
-#if TARGET_RT_LITTLE_ENDIAN
- *dst++ = Endian32_Swap(*src++);
-#else
- *dst++ = *src++;
-#endif
- }
-
- NSImage * img = [[[NSImage alloc] initWithSize: NSMakeSize(dstWidth, dstHeight)] autorelease];
- [img addRepresentation:imgrep];
-
- return img;
-}
-
-// Returns the preview image for the specified index, retrieving it from its internal
-// cache or by calling makeImageForPicture if it is not cached. Generally, you should
-// use imageForPicture so that images are cached. Calling makeImageForPicture will
-// always generate a new copy of the image.
-- (NSImage *) imageForPicture: (NSInteger) pictureIndex
+- (IBAction) previewDurationPopUpChanged: (id) sender
 {
- // The preview for the specified index may not currently exist, so this method
- // generates it if necessary.
- NSNumber * key = [NSNumber numberWithInteger:pictureIndex];
- NSImage * theImage = [fPicturePreviews objectForKey:key];
- if (!theImage)
- {
- theImage = [PreviewController makeImageForPicture:pictureIndex libhb:fHandle title:fTitle];
- [fPicturePreviews setObject:theImage forKey:key];
- }
- return theImage;
+ [[NSUserDefaults standardUserDefaults] setObject:[fPreviewMovieLengthPopUp titleOfSelectedItem] forKey:@"PreviewLength"];
 }
 
-// Purges all images from the cache. The next call to imageForPicture will cause a new
-// image to be generated.
-- (void) purgeImageCache
+- (void) setDeinterlacePreview: (BOOL) deinterlacePreview
 {
- [fPicturePreviews removeAllObjects];
+ _deinterlacePreview = deinterlacePreview;
+ self.generator.deinterlace = deinterlacePreview;
 }
 
-#pragma mark Movie Preview
-
-- (IBAction) cancelCreateMoviePreview: (id) sender
+- (IBAction) pictureSliderChanged: (id) sender
 {
- hb_state_t s;
- hb_get_state2(fPreviewLibhb, &s);
- 
- if (fEncodeState && (s.state == HB_STATE_WORKING ||
- s.state == HB_STATE_PAUSED))
- {
- fEncodeState = 2;
- hb_stop(fPreviewLibhb);
- hb_system_sleep_allow(fPreviewLibhb);
- [NSAnimationContext beginGrouping];
- [[NSAnimationContext currentContext] setDuration:0.2];
- [[fEncodingControlBox animator] setHidden:YES];
- [[fPictureControlBox animator] setHidden:NO];
- [NSAnimationContext endGrouping];
-
- return;
+ if ((self.pictureIndex != [fPictureSlider intValue] || !sender) && self.title) {
+ self.pictureIndex = [fPictureSlider intValue];
+ [self displayPreview];
 }
 }
 
-- (IBAction) createMoviePreview: (id) sender
-{ 
- /* Rip or Cancel ? */
- hb_state_t s;
- hb_get_state2( fPreviewLibhb, &s );
- 
- /* we use controller.mm's prepareJobForPreview to go ahead and set all of our settings
- * however, we want to use a temporary destination field of course
- * so that we do not put our temp preview in the users chosen
- * directory */
- 
- hb_job_t * job = fTitle->job;
- 
- /* We run our current setting through prepeareJob in Controller.mm
- * just as if it were a regular encode */
- 
- [fHBController prepareJobForPreview];
- 
- /* Make sure we have a Preview sub directory with our pidnum attached */
- NSString *PreviewDirectory = [NSString stringWithFormat:@"~/Library/Application Support/HandBrake/Previews/%d", [fHBController getPidnum]];
- PreviewDirectory = [PreviewDirectory stringByExpandingTildeInPath];
- if( ![[NSFileManager defaultManager] fileExistsAtPath:PreviewDirectory] )
- {
- [[NSFileManager defaultManager] createDirectoryAtPath:PreviewDirectory 
- withIntermediateDirectories:NO 
- attributes:nil 
- error:nil];
- }
- /* Destination file. We set this to our preview directory
- * changing the extension appropriately.*/
- if (fTitle->job->mux == HB_MUX_MP4) // MP4 file
- {
- /* we use .m4v for our mp4 files so that ac3 and chapters in mp4 will play properly */
- fPreviewMoviePath = [PreviewDirectory stringByAppendingString:@"/preview_temp.m4v"];
- }
- else if (fTitle->job->mux == HB_MUX_MKV) // MKV file
+- (IBAction) toggleScaleToScreen: (id) sender
+{
+ if (self.scaleToScreen == YES)
 {
- fPreviewMoviePath = [PreviewDirectory stringByAppendingString:@"/preview_temp.mkv"];
+ self.scaleToScreen = NO;
+ /* make sure we are set to a still preview */
+ [self displayPreview];
+ [fScaleToScreenToggleButton setTitle:@"Scale To Screen"];
 }
- 
- fPreviewMoviePath = [[fPreviewMoviePath stringByExpandingTildeInPath]retain];
- 
- /* See if there is an existing preview file, if so, delete it */
- if( ![[NSFileManager defaultManager] fileExistsAtPath:fPreviewMoviePath] )
+ else
 {
- [[NSFileManager defaultManager] removeItemAtPath:fPreviewMoviePath error:nil];
+ self.scaleToScreen = YES;
+ /* make sure we are set to a still preview */
+ [self displayPreview];
+ [fScaleToScreenToggleButton setTitle:@"Actual Scale"];
 }
- 
- /* We now direct our preview encode to fPreviewMoviePath */
- hb_job_set_file(fTitle->job, [fPreviewMoviePath UTF8String]);
- 
- /* We use our advance pref to determine how many previews to scan */
- int hb_num_previews = [[[NSUserDefaults standardUserDefaults] objectForKey:@"PreviewsNumber"] intValue];
- job->start_at_preview = fPicture + 1;
- job->seek_points = hb_num_previews;
- 
- /* we use the preview duration popup to get the specified
- * number of seconds for the preview encode.
- */
- 
- job->pts_to_stop = [[fPreviewMovieLengthPopUp titleOfSelectedItem] intValue] * 90000LL;
- 
- /* lets go ahead and send it off to libhb
- * Note: unlike a full encode, we only send 1 pass regardless if the final encode calls for 2 passes.
- * this should suffice for a fairly accurate short preview and cuts our preview generation time in half.
- * However we also need to take into account the indepth scan for subtitles.
- */
- /*
- * If scanning we need to do some extra setup of the job.
- */
- if( job->indepth_scan == 1 )
- {
- char *x264opts_tmp;
- 
- /*
- * When subtitle scan is enabled do a fast pre-scan job
- * which will determine which subtitles to enable, if any.
- */
- job->pass = -1;
- x264opts_tmp = job->advanced_opts;
- 
- job->advanced_opts = NULL;
- job->indepth_scan = 1; 
- /*
- * Add the pre-scan job
- */
- hb_add( fPreviewLibhb, job );
- job->advanced_opts = x264opts_tmp;
- } 
- /* Go ahead and perform the actual encoding preview scan */
- job->indepth_scan = 0;
- job->pass = 0;
- hb_add( fPreviewLibhb, job );
-
- /* we need to clean up the various lists after the job(s) have been set */
- hb_job_reset( job );
-
- [fMovieCreationProgressIndicator setDoubleValue:0];
-
- [NSAnimationContext beginGrouping];
- [[NSAnimationContext currentContext] setDuration:0.2];
- [[fEncodingControlBox animator] setHidden: NO];
- [[fPictureControlBox animator] setHidden: YES];
- [NSAnimationContext endGrouping];
-
- /* Let fPreviewLibhb do the job */
- fEncodeState = 1;
- hb_system_sleep_prevent(fPreviewLibhb);
- hb_start(fPreviewLibhb);
-	
 }
 
-- (void) startReceivingLibhbNotifications
+- (NSString *) pictureSizeInfoString
 {
- if (!fLibhbTimer)
- {
- fLibhbTimer = [NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(libhbTimerFired:) userInfo:nil repeats:YES];
- [fLibhbTimer retain];
- }
+ return [fInfoField stringValue];
 }
 
-- (void) stopReceivingLibhbNotifications
+- (IBAction) showPictureSettings: (id) sender
 {
- if (fLibhbTimer)
- {
- [fLibhbTimer invalidate];
- [fLibhbTimer release];
- fLibhbTimer = nil;
- }
+ [self.delegate showPicturePanel:self];
+}
+
+#pragma mark -
+#pragma mark Movie preview mode
+
+- (void) updateProgress: (double) progress info: (NSString *) progressInfo {
+ [fPreviewMovieStatusField setStringValue: progressInfo];
+
+ [fMovieCreationProgressIndicator setIndeterminate: NO];
+ [fMovieCreationProgressIndicator setDoubleValue: progress];
 }
-- (void) libhbTimerFired: (NSTimer*)theTimer
+
+- (void)didCancelMovieCreation
 {
- hb_state_t s;
- hb_get_state( fPreviewLibhb, &s );
- [self libhbStateChanged: s];
+ [self switchViewToMode:ViewModePicturePreview];
 }
 
-- (void) libhbStateChanged: (hb_state_t)state
+- (void) didCreateMovieAtURL: (NSURL *) fileURL
 {
- switch( state.state )
+ /* Load the new movie into fMovieView */
+ if (fileURL)
 {
- case HB_STATE_IDLE:
- case HB_STATE_SCANNING:
- case HB_STATE_SCANDONE:
- break;
- 
- case HB_STATE_WORKING:
+		NSError *outError;
+		NSDictionary *movieAttributes = @{QTMovieURLAttribute: fileURL,
+ QTMovieAskUnresolvedDataRefsAttribute: @(NO),
+ @"QTMovieOpenForPlaybackAttribute": @(YES),
+ @"QTMovieOpenAsyncRequiredAttribute": @(NO),
+ @"QTMovieOpenAsyncOKAttribute": @(NO),
+ @"QTMovieIsSteppableAttribute": @(YES),
+ QTMovieApertureModeAttribute: QTMovieApertureModeClean};
+
+ QTMovie *movie = [[[QTMovie alloc] initWithAttributes:movieAttributes error:&outError] autorelease];
+
+		if (!movie)
+ {
+ [HBUtilities writeToActivityLog: "showMoviePreview: Unable to open movie"];
+ [self switchViewToMode:ViewModePicturePreview];
+		}
+ else
 {
-#define p state.param.working
- NSMutableString * string;
-			/* Update text field */
-			string = [NSMutableString stringWithFormat: NSLocalizedString( @"Encoding preview: %.2f %%", @"" ), 100.0 * p.progress];
- 
-			if( p.seconds > -1 )
+ /* Scale the fMovieView to the picture player size */
+ [fMovieView setFrameSize:[self.pictureLayer frame].size];
+ [fMovieView setFrameOrigin:[self.pictureLayer frame].origin];
+
+ [fMovieView setMovie:movie];
+ [movie setDelegate:self];
+
+ // get and enable subtitles
+ NSArray *subtitlesArray = [movie tracksOfMediaType: @"sbtl"];
+ if (subtitlesArray && [subtitlesArray count])
 {
- [string appendFormat:
- NSLocalizedString( @" (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)", @"" ),
- p.rate_cur, p.rate_avg, p.hours, p.minutes, p.seconds];
+ // enable the first tx3g subtitle track
+ [[subtitlesArray objectAtIndex: 0] setEnabled: YES];
 }
- [fPreviewMovieStatusField setStringValue: string];
- 
- [fMovieCreationProgressIndicator setIndeterminate: NO];
- /* Update slider */
- [fMovieCreationProgressIndicator setDoubleValue: 100.0 * p.progress];
- 
- break;
- 
- }
-#undef p
- 
-#define p state.param.muxing
- case HB_STATE_MUXING:
- {
- // Update fMovieCreationProgressIndicator
- [fMovieCreationProgressIndicator setIndeterminate: YES];
- [fMovieCreationProgressIndicator startAnimation: nil];
- [fPreviewMovieStatusField setStringValue: NSLocalizedString( @"Muxing Preview ...", @"" )];
- break;
- }
-#undef p			
- case HB_STATE_PAUSED:
- [fMovieCreationProgressIndicator stopAnimation: nil];
- break;
-			
- case HB_STATE_WORKDONE:
- {
- // Delete all remaining jobs since libhb doesn't do this on its own.
- hb_job_t * job;
- while( ( job = hb_job(fPreviewLibhb, 0) ) )
- hb_rem( fHandle, job );
- 
- [fPreviewMovieStatusField setStringValue: @""];
- [fMovieCreationProgressIndicator stopAnimation: nil];
-
- if (fEncodeState != 2)
+ else
 {
- // Show the movie view
- [self showMoviePreview:fPreviewMoviePath];
+ // Perian subtitles
+ subtitlesArray = [movie tracksOfMediaType: QTMediaTypeVideo];
+ if (subtitlesArray && ([subtitlesArray count] >= 2))
+ {
+ // track 0 should be video, other video tracks should
+ // be subtitles; force-enable the first subs track
+ [[subtitlesArray objectAtIndex: 1] setEnabled: YES];
+ }
 }
- 
- fEncodeState = 0;
- /* Done encoding, allow system sleep for the preview handle */
- hb_system_sleep_allow(fPreviewLibhb);
- break;
+
+ // to actually play the movie
+ self.movie = movie;
+
+ [self switchViewToMode:ViewModeMoviePreview];
+
+ [fMovieView play:movie];
 }
 }
 }
 
+- (IBAction) cancelCreateMoviePreview: (id) sender
+{
+ [self.generator cancel];
+}
+
+- (IBAction) createMoviePreview: (id) sender
+{
+ if (!self.generator)
+ return;
+
+ self.generator.delegate = self;
+ [self.delegate prepareJobForPreview];
+ [self.generator createMovieAsyncWithImageIndex:self.pictureIndex
+ andDuration:[[fPreviewMovieLengthPopUp titleOfSelectedItem] intValue]];
+
+ [self switchViewToMode:ViewModeEncoding];
+}
+
 - (IBAction) toggleMoviePreviewPlayPause: (id) sender
 {
 /* make sure a movie is even loaded up */
- if (aMovie != nil)
+ if (self.movie)
 {
- /* For some stupid reason there is no "isPlaying" method for a QTMovie
- * object, given that, we detect the rate to determine whether the movie
- * is playing or not.
- */
- if ([self isPlaying]) // we are playing
+ if ([self.movie isPlaying]) // we are playing
 {
- [fMovieView pause:aMovie];
+ [fMovieView pause:self.movie];
 [fPlayPauseButton setState: NSOnState];
 }
 else // we are paused or stopped
 {
- [fMovieView play:aMovie];
+ [fMovieView play:self.movie];
 [fPlayPauseButton setState: NSOffState];
 }
 }
@@ -931,322 +961,134 @@
 
 - (IBAction) moviePlaybackGoToBeginning: (id) sender
 {
- /* make sure a movie is even loaded up */
- if (aMovie != nil)
- {
- [fMovieView gotoBeginning:aMovie];
- }
+ [fMovieView gotoBeginning:self.movie];
 }
 
 - (IBAction) moviePlaybackGoToEnd: (id) sender
 {
- /* make sure a movie is even loaded up */
- if (aMovie != nil)
- {
- [fMovieView gotoEnd:aMovie];
- }
-}
-
-- (IBAction) moviePlaybackGoBackwardOneFrame: (id) sender
-{
- /* make sure a movie is even loaded up */
- if (aMovie != nil)
- {
- [fMovieView pause:aMovie]; // Pause the movie
- [fMovieView stepBackward:aMovie];
- }
-}
-
-- (IBAction) moviePlaybackGoForwardOneFrame: (id) sender
-{
- /* make sure a movie is even loaded up */
- if (aMovie != nil)
- {
- [fMovieView pause:aMovie]; // Pause the movie
- [fMovieView stepForward:aMovie];
- }
+ [fMovieView gotoEnd:self.movie];
 }
 
 - (void) startMovieTimer
 {
-	if( fMovieTimer ) {
-		[fMovieTimer invalidate];
-		[fMovieTimer release];
-	}
- fMovieTimer = [NSTimer scheduledTimerWithTimeInterval:0.10 target:self selector:@selector(movieTimerFired:) userInfo:nil repeats:YES];
- [fMovieTimer retain];
+	if (!self.movieTimer)
+ {
+ self.movieTimer = [NSTimer scheduledTimerWithTimeInterval:0.09 target:self
+ selector:@selector(movieTimerFired:)
+ userInfo:nil repeats:YES];
+ }
 }
 
 - (void) stopMovieTimer
 {
- if( fMovieTimer )
- {
- [fMovieTimer invalidate];
- [fMovieTimer release];
- fMovieTimer = nil;
- }
+ [self.movieTimer invalidate];
+ self.movieTimer = nil;
 }
 
-- (void) movieTimerFired: (NSTimer*)theTimer
+- (void) movieTimerFired: (NSTimer *)theTimer
 {
- if (aMovie != nil)
+ if (self.movie != nil)
 {
 [self adjustPreviewScrubberForCurrentMovieTime];
- [fMovieInfoField setStringValue: [self SMTPETimecode:[aMovie currentTime]]];
+ [fMovieInfoField setStringValue: [self.movie timecode]];
 }
 }
 
 - (IBAction) showPicturesPreview: (id) sender
 {
- [fMovieView pause:self];
- [self stopMovieTimer];
-
- [NSAnimationContext beginGrouping];
- [[NSAnimationContext currentContext] setDuration:0.2];
- [[fMoviePlaybackControlBox animator] setHidden:YES];
- [[fMovieView animator] setHidden:YES];
- [[fPictureControlBox animator] setHidden:NO];
- [NSAnimationContext endGrouping];
-
- [fMovieView setMovie:nil];
- aMovie = nil;
+ [self switchViewToMode:ViewModePicturePreview];
 }
 
+#pragma mark -
+#pragma mark Movie Playback Scrubber
 
-- (IBAction) showMoviePreview: (NSString *) path
+// Initialize the preview scrubber min/max to appropriate values for the current movie
+- (void) initPreviewScrubberForMovie
 {
- /* Since the gray background for the still images is part of
- * fPictureView, lets leave the picture view visible and postion
- * the fMovieView over the image portion of fPictureView so
- * we retain the gray cropping border we have already established
- * with the still previews
- */
- 
- /* Load the new movie into fMovieView */
- if (path) 
- {
-		NSError	 *outError;
-		NSURL *movieUrl = [NSURL fileURLWithPath:path];
-		NSDictionary *movieAttributes = [NSDictionary dictionaryWithObjectsAndKeys:
-										 movieUrl, QTMovieURLAttribute,
-										 [NSNumber numberWithBool:NO], QTMovieAskUnresolvedDataRefsAttribute,
-										 [NSNumber numberWithBool:YES], @"QTMovieOpenForPlaybackAttribute",
-										 [NSNumber numberWithBool:NO], @"QTMovieOpenAsyncRequiredAttribute",								
-										 [NSNumber numberWithBool:NO], @"QTMovieOpenAsyncOKAttribute",
- [NSNumber numberWithBool:YES], @"QTMovieIsSteppableAttribute",
-										 QTMovieApertureModeClean, QTMovieApertureModeAttribute,
-										 nil];
- 
- aMovie = [[[QTMovie alloc] initWithAttributes:movieAttributes error:&outError] autorelease];
- 
-		if (!aMovie) 
- {
- [fHBController writeToActivityLog: "showMoviePreview: Unable to open movie"];
-		}
- else 
- {
- NSRect movieBounds;
-
- [fMovieView setControllerVisible:NO];
-
- /* we get some size information from the preview movie */
- NSSize movieSize = [[aMovie attributeForKey:QTMovieNaturalSizeAttribute] sizeValue];
- movieBounds = [fMovieView movieBounds];
- movieBounds.size.height = movieSize.height;
- /* We also get our view size to use for scaling fMovieView's size */
- NSSize scaledMovieViewSize = [fPictureLayer frame].size;
- movieBounds.size.width = movieSize.width;
- 
- /* we need to account for an issue where the scaledMovieViewSize > the window size */
- if (scaledMovieViewSize.height > [[self window] frame].size.height)
- {
- [fHBController writeToActivityLog: "showMoviePreview: Our window is not tall enough to show the controller bar ..."];
- }
- 
- /* Scale the fMovieView to scaledMovieViewSize */
- [fMovieView setFrameSize:scaledMovieViewSize];
- 
- /*set our origin try using fPictureViewArea or fPictureView */
- NSPoint origin = [fPictureLayer frame].origin;
- origin.x += trunc( ( [fPictureLayer frame].size.width -
- [fMovieView frame].size.width ) / 2.0 );
- origin.y += trunc( ( ( [fPictureLayer frame].size.height -
- [fMovieView frame].size.height ) / 2.0 ) );
-
- [fMovieView setFrameOrigin:origin];
- [fMovieView setMovie:aMovie];
- 
- // get and enable subtitles
- NSArray *subtitlesArray;
- subtitlesArray = [aMovie tracksOfMediaType: @"sbtl"];
- if( subtitlesArray && [subtitlesArray count] )
- {
- // enable the first TX3G subtitle track
- [[subtitlesArray objectAtIndex: 0] setEnabled: YES];
- }
- else
- {
- // Perian subtitles
- subtitlesArray = [aMovie tracksOfMediaType: QTMediaTypeVideo];
- if( subtitlesArray && ( [subtitlesArray count] >= 2 ) )
- {
- // track 0 should be video, other video tracks should
- // be subtitles; force-enable the first subs track
- [[subtitlesArray objectAtIndex: 1] setEnabled: YES];
- }
- }
- 
- // to actually play the movie
- [NSAnimationContext beginGrouping];
- [[NSAnimationContext currentContext] setDuration:0.2];
- [[fEncodingControlBox animator] setHidden: YES];
- [[fMovieView animator] setHidden:NO];
- [[fMoviePlaybackControlBox animator] setHidden: NO];
- [NSAnimationContext endGrouping];
+ QTTime duration = [self.movie duration];
+ CGFloat result = duration.timeValue / duration.timeScale;
 
- [self initPreviewScrubberForMovie];
- [self startMovieTimer];
- /* Install amovie notifications */
- [aMovie setDelegate:self];
- [self installMovieCallbacks];
- [fMovieView play:aMovie];
- }
- }
+ [fMovieScrubberSlider setMinValue:0.0];
+ [fMovieScrubberSlider setMaxValue: result];
+ [fMovieScrubberSlider setDoubleValue: 0.0];
 }
 
-#pragma mark *** Movie Playback Scrubber and time code methods ***
-
-// Initialize the preview scrubber min/max to appropriate values for the current movie
--(void) initPreviewScrubberForMovie
+- (void) adjustPreviewScrubberForCurrentMovieTime
 {
- if (aMovie)
- {
- QTTime duration = [aMovie duration];
- CGFloat result = duration.timeValue / duration.timeScale;
- 
- [fMovieScrubberSlider setMinValue:0.0];
- [fMovieScrubberSlider setMaxValue: result];
- [fMovieScrubberSlider setDoubleValue: 0.0];
- }
-}
+ QTTime time = [self.movie currentTime];
 
--(void) adjustPreviewScrubberForCurrentMovieTime
-{
- if (aMovie)
- {
- QTTime time = [aMovie currentTime];
- 
- CGFloat result = (CGFloat)time.timeValue / (CGFloat)time.timeScale;;
- [fMovieScrubberSlider setDoubleValue:result];
- }
+ CGFloat result = (CGFloat)time.timeValue / (CGFloat)time.timeScale;;
+ [fMovieScrubberSlider setDoubleValue:result];
 }
 
 - (IBAction) previewScrubberChanged: (id) sender
 {
- if (aMovie)
- {
- [fMovieView pause:aMovie];
- QTTime time = [self SliderToQTTime:[fMovieScrubberSlider doubleValue]];
- [aMovie setCurrentTime:time];
- [fMovieInfoField setStringValue: [self SMTPETimecode:time]];
- }
-}
-
-- (BOOL) isPlaying
-{
- if (aMovie != nil)
- {
- /* For some stupid reason there is no "isPlaying" method for a QTMovie
- * object, given that, we detect the rate to determine whether the movie
- * is playing or not.
- */
- if ([aMovie rate] != 0.0f) // we are playing
- return YES;
- else // we are paused or stopped
- return NO;
- }
- return NO;
+ [fMovieView pause:self.movie];
+ [self.movie setCurrentTimeDouble:[fMovieScrubberSlider doubleValue]];
+ [fMovieInfoField setStringValue: [self.movie timecode]];
 }
 
-#pragma mark *** Movie Notifications ***
+#pragma mark -
+#pragma mark Movie Notifications
 
-- (void) installMovieCallbacks
+- (void) addMovieObservers
 {
- /*Notification for any time the movie rate changes */
+ /* Notification for any time the movie rate changes */
 [[NSNotificationCenter defaultCenter] addObserver:self
 selector:@selector(movieRateDidChange:)
 name:@"QTMovieRateDidChangeNotification"
- object:aMovie];
- /*Notification for when the movie ends */
- [[NSNotificationCenter defaultCenter] addObserver:self 
- selector:@selector(movieDidEnd:)
- name:@"QTMovieDidEndNotification"
- object:aMovie];
+ object:self.movie];
 }
 
-- (void)removeMovieCallbacks
+- (void) removeMovieObservers
 {
- if (aMovie)
- {
- /*Notification for any time the movie rate changes */
- [[NSNotificationCenter defaultCenter] removeObserver:self
- name:@"QTMovieRateDidChangeNotification"
- object:aMovie];
- /*Notification for when the movie ends */
- [[NSNotificationCenter defaultCenter] removeObserver:self
- name:@"QTMovieDidEndNotification"
- object:aMovie];
- }
+ /*Notification for any time the movie rate changes */
+ [[NSNotificationCenter defaultCenter] removeObserver:self
+ name:@"QTMovieRateDidChangeNotification"
+ object:self.movie];
 }
 
-- (void)movieRateDidChange:(NSNotification *)notification
+- (void) movieRateDidChange: (NSNotification *) notification
 {
- if (aMovie != nil)
- {
- if ([self isPlaying])
- [fPlayPauseButton setState: NSOnState];
- else
- [fPlayPauseButton setState: NSOffState];
- }
+ if ([self.movie isPlaying])
+ [fPlayPauseButton setState: NSOnState];
+ else
+ [fPlayPauseButton setState: NSOffState];
 }
 
-/* This notification is not currently used. However we should keep it "just in case" as
- * live preview playback is enhanced.
- */
-- (void)movieDidEnd:(NSNotification *)notification
-{
- //[fHBController writeToActivityLog: "Movie DidEnd Notification Received"];
-}
+#pragma mark -
+#pragma mark Keyboard and mouse wheel control
 
 /* fMovieView Keyboard controls */
-- (void)keyDown:(NSEvent *)event
+- (void) keyDown: (NSEvent *) event
 {
 unichar key = [[event charactersIgnoringModifiers] characterAtIndex:0];
+ QTMovie *movie = self.movie;
 
- if (aMovie)
+ if (movie)
 {
 if (key == 32)
 {
- if ([self isPlaying])
- [fMovieView pause:aMovie];
+ if ([movie isPlaying])
+ [fMovieView pause:movie];
 else
- [fMovieView play:aMovie];
+ [fMovieView play:movie];
 }
 else if (key == 'k')
- [fMovieView pause:aMovie];
+ [fMovieView pause:movie];
 else if (key == 'l')
 {
- float rate = [aMovie rate];
+ float rate = [movie rate];
 rate += 1.0f;
- [fMovieView play:aMovie];
- [aMovie setRate:rate];
+ [fMovieView play:movie];
+ [movie setRate:rate];
 }
 else if (key == 'j')
 {
- float rate = [aMovie rate];
+ float rate = [movie rate];
 rate -= 1.0f;
- [fMovieView play:aMovie];
- [aMovie setRate:rate];
+ [fMovieView play:movie];
+ [movie setRate:rate];
 }
 else if ([event modifierFlags] & NSAlternateKeyMask && key == NSLeftArrowFunctionKey)
 [fMovieView gotoBeginning:self];
@@ -1259,16 +1101,16 @@
 else
 [super keyDown:event];
 }
- else if (!fEncodeState)
+ else if (self.currentViewMode != ViewModeEncoding)
 {
 if (key == NSLeftArrowFunctionKey)
 {
- [fPictureSlider setIntegerValue:fPicture > [fPictureSlider minValue] ? fPicture - 1 : fPicture];
+ [fPictureSlider setIntegerValue:self.pictureIndex > [fPictureSlider minValue] ? self.pictureIndex - 1 : self.pictureIndex];
 [self pictureSliderChanged:self];
 }
 else if (key == NSRightArrowFunctionKey)
 {
- [fPictureSlider setIntegerValue:fPicture < [fPictureSlider maxValue] ? fPicture + 1 : fPicture];
+ [fPictureSlider setIntegerValue:self.pictureIndex < [fPictureSlider maxValue] ? self.pictureIndex + 1 : self.pictureIndex];
 [self pictureSliderChanged:self];
 }
 else
@@ -1278,192 +1120,21 @@
 [super keyDown:event];
 }
 
-#pragma mark *** QTTime Utilities ***
-
-	// convert a time value (long) to a QTTime structure
--(QTTime)SliderToQTTime:(double)value
-{
-	long timeScale = [[aMovie attributeForKey:QTMovieTimeScaleAttribute] longValue];
-	return QTMakeTime(value * timeScale, timeScale);
-}
-
-/* Since MacOSX Leopard QTKit has taken over some responsibility for assessing movie playback
- * information from the old QuickTime carbon api ( time code information as well as fps, etc.).
- * However, the QTKit devs at apple were not really big on documentation and further ...
- * QuickTimes ability to playback HB's largely variable framerate output makes perfectly frame
- * accurate information at best convoluted. Still, for the purpose of a custom hud based custom
- * playback scrubber slider this has so far proven to be as accurate as I have found. To say it
- * could use some better accuracy is not understating it enough probably.
- * Most of this was gleaned from this obscure Apple Mail list thread:
- * http://www.mailinglistarchive.com/quicktime-api@lists.apple.com/msg05642.html
- * Now as we currently do not show a QTKit control bar with scrubber for display sizes > container
- * size, this seems to facilitate playback control from the HB custom HUD controller fairly close
- * to the built in controller bar.
- * Further work needs to be done to try to get accurate frame by frame playback display if we want it.
- * Note that the keyboard commands for frame by frame step through etc. work as always.
- */
-
-// Returns a human readable string from the currentTime of movie playback
-- (NSString*) SMTPETimecode:(QTTime)time
-{
- NSString *smtpeTimeCodeString;
- int days, hour, minute, second, frame;
- long long result;
- 
- result = time.timeValue / time.timeScale; // second
- frame = (time.timeValue % time.timeScale) / 100;
- 
- second = result % 60;
- 
- result = result / 60; // minute
- minute = result % 60;
- 
- result = result / 60; // hour
- hour = result % 24;
- days = result;
- 
- smtpeTimeCodeString = [NSString stringWithFormat:@"%02d:%02d:%02d", hour, minute, second]; // hh:mm:ss
- return smtpeTimeCodeString;
-}
-
-@end
-
-@implementation PreviewController (Private)
-
-//
-// -[PictureController(Private) optimalViewSizeForImageSize:]
-//
-// Given the size of the preview image to be shown, returns the best possible
-// size for the view.
-//
-- (NSSize)optimalViewSizeForImageSize: (NSSize)imageSize
+- (void) scrollWheel: (NSEvent *) theEvent
 {
- // The min size is 480x360
- CGFloat minWidth = 480.0;
- CGFloat minHeight = 360.0;
-
- NSSize screenSize = [[[self window] screen] visibleFrame].size;
- CGFloat maxWidth = screenSize.width;
- CGFloat maxHeight = screenSize.height;
-
- NSSize resultSize = imageSize;
- CGFloat resultPar = resultSize.width / resultSize.height;
-
- //note, a mbp 15" at 1440 x 900 is a 1.6 ar
- CGFloat screenAspect = screenSize.width / screenSize.height;
-
- if ( resultSize.width > maxWidth || resultSize.height > maxHeight )
+ if (self.currentViewMode != ViewModeEncoding)
 {
- 	// Source is larger than screen in one or more dimensions
- if ( resultPar > screenAspect )
+ if ([theEvent deltaY] < 0)
 {
- // Source aspect wider than screen aspect, snap to max width and vary height
- resultSize.width = maxWidth;
- resultSize.height = (maxWidth / resultPar);
+ [fPictureSlider setIntegerValue:self.pictureIndex < [fPictureSlider maxValue] ? self.pictureIndex + 1 : self.pictureIndex];
+ [self pictureSliderChanged:self];
 }
- else
+ else if ([theEvent deltaY] > 0)
 {
- // Source aspect narrower than screen aspect, snap to max height vary width
- resultSize.height = maxHeight;
- resultSize.width = (maxHeight * resultPar);
+ [fPictureSlider setIntegerValue:self.pictureIndex > [fPictureSlider minValue] ? self.pictureIndex - 1 : self.pictureIndex];
+ [self pictureSliderChanged:self];
 }
 }
-
- // If necessary, grow to minimum dimensions to ensure controls overlay is not obstructed
- if ( resultSize.width < minWidth )
- resultSize.width = minWidth;
- if ( resultSize.height < minHeight )
- resultSize.height = minHeight;
-
- return resultSize;
-}
-
-//
-// -[PictureController(Private) resizeWindowForViewSize:]
-//
-// Resizes the entire window to accomodate a view of a particular size.
-//
-- (void)resizeWindowForViewSize: (NSSize)viewSize
-{
- // Figure out the deltas for the new frame area
- NSSize currentSize = [[[self window] contentView] frame].size;
- CGFloat deltaX = viewSize.width - currentSize.width;
- CGFloat deltaY = viewSize.height - currentSize.height;
- 
- // Now resize the whole panel by those same deltas, but don't exceed the min
- NSRect frame = [[self window] frame];
- NSSize maxSize = [[[self window] screen] visibleFrame].size;
- /* if we are not Scale To Screen, put an 10% of visible screen on the window */
- if (scaleToScreen == NO )
- {
- maxSize.width = maxSize.width * 0.90;
- maxSize.height = maxSize.height * 0.90;
- }
- 
- /* Set our min size to the storage size */
- NSSize minSize;
- minSize.width = fTitle->width / backingScaleFactor;
- minSize.height = fTitle->height / backingScaleFactor;
- 
- frame.size.width += deltaX;
- frame.size.height += deltaY;
- if( frame.size.width < minSize.width )
- {
- frame.size.width = minSize.width;
- deltaX = frame.size.width - currentSize.width;
- }
- if( frame.size.height < minSize.height )
- {
- frame.size.height = minSize.height;
- deltaY = frame.size.height - currentSize.height;
- }
- /* compare frame to max size of screen */
- 
- if( frame.size.width > maxSize.width )
- {
- frame.size.width = maxSize.width;
- }
- 
- if( frame.size.height > maxSize.height )
- {
- frame.size.height = maxSize.height;
- }
- 
- // But now the sheet is off-center, so also shift the origin to center it and
- // keep the top aligned.
- if( frame.size.width != [[self window] frame].size.width )
- frame.origin.x -= (deltaX / 2.0);
- 
- /* Since upon launch we can open up the preview window if it was open
- * the last time we quit (and at the size it was) we want to make
- * sure that upon resize we do not have the window off the screen
- * So check the origin against the screen origin and adjust if
- * necessary.
- */
- NSSize screenSize = [[[self window] screen] visibleFrame].size;
- NSPoint screenOrigin = [[[self window] screen] frame].origin;
- if (screenSize.height < frame.size.height)
- {
- frame.size.height = screenSize.height;
- }
- if (screenSize.width < frame.size.width)
- {
- frame.size.width = screenSize.width;
- }
- 
- /* our origin is off the screen to the left*/
- if (frame.origin.x < screenOrigin.x)
- {
- /* so shift our origin to the right */
- frame.origin.x = screenOrigin.x;
- }
- else if ((frame.origin.x + frame.size.width) > (screenOrigin.x + screenSize.width))
- {
- /* the right side of the preview is off the screen, so shift to the left */
- frame.origin.x = (screenOrigin.x + screenSize.width) - frame.size.width;
- }
- 
- [[self window] setFrame:frame display:YES animate:YES];
 }
 
 @end

HandBrake-0.10.0.tar.bz2/macosx/HBPreviewGenerator.h Added

@@ -0,0 +1,35 @@
+/* HBPreviewGenerator.h $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import <Cocoa/Cocoa.h>
+#include "hb.h"
+
+@protocol HBPreviewGeneratorDelegate <NSObject>
+
+- (void) didCreateMovieAtURL: (NSURL *) fileURL;
+- (void) didCancelMovieCreation;
+
+- (void) updateProgress: (double) progress info: (NSString *) progressInfo;
+
+@end
+
+@interface HBPreviewGenerator : NSObject
+
+@property (nonatomic, assign) id <HBPreviewGeneratorDelegate> delegate;
+@property (nonatomic) BOOL deinterlace;
+
+- (id) initWithHandle: (hb_handle_t *) handle andTitle: (hb_title_t *) title;
+
+/* Still image generator */
+- (NSImage *) imageAtIndex: (NSUInteger) index shouldCache: (BOOL) cache;
+- (NSUInteger) imagesCount;
+- (void) purgeImageCache;
+
+/* Video generator */
+- (BOOL) createMovieAsyncWithImageIndex: (NSUInteger) index andDuration: (NSUInteger) duration;
+- (void) cancel;
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBPreviewGenerator.m Added

@@ -0,0 +1,427 @@
+/* HBPreviewGenerator.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+//
+
+#import "HBPreviewGenerator.h"
+#import "HBUtilities.h"
+#import "Controller.h"
+
+typedef enum EncodeState : NSUInteger {
+ EncodeStateIdle,
+ EncodeStateWorking,
+ EncodeStateCancelled,
+} EncodeState;
+
+@interface HBPreviewGenerator ()
+
+@property (nonatomic, readonly, retain) NSMutableDictionary *picturePreviews;
+@property (nonatomic, readonly) NSUInteger imagesCount;
+@property (nonatomic, readonly) hb_handle_t *handle;
+@property (nonatomic, readonly) hb_title_t *title;
+
+@property (nonatomic) hb_handle_t *privateHandle;
+@property (nonatomic) NSTimer *timer;
+@property (nonatomic) EncodeState encodeState;
+
+@property (nonatomic, retain) NSURL *fileURL;
+
+@end
+
+@implementation HBPreviewGenerator
+
+- (id) initWithHandle: (hb_handle_t *) handle andTitle: (hb_title_t *) title
+{
+ self = [super init];
+ if (self)
+ {
+ _handle = handle;
+ _title = title;
+ _picturePreviews = [[NSMutableDictionary alloc] init];
+ _imagesCount = [[[NSUserDefaults standardUserDefaults] objectForKey:@"PreviewsNumber"] intValue];
+ }
+ return self;
+}
+
+#pragma mark -
+#pragma mark Preview images
+
+/**
+ * Returns the picture preview at the specified index
+ *
+ * @param index picture index in title.
+ */
+- (NSImage *) imageAtIndex: (NSUInteger) index shouldCache: (BOOL) cache
+{
+ if (index >= self.imagesCount)
+ return nil;
+
+ // The preview for the specified index may not currently exist, so this method
+ // generates it if necessary.
+ NSImage *theImage = [self.picturePreviews objectForKey:@(index)];
+
+ if (!theImage)
+ {
+ theImage = [HBPreviewGenerator makeImageForPicture:index
+ libhb:self.handle
+ title:self.title
+ deinterlace:self.deinterlace];
+ if (cache && theImage)
+ [self.picturePreviews setObject:theImage forKey:@(index)];
+ }
+
+ return theImage;
+}
+
+/**
+ * Purges all images from the cache. The next call to imageAtIndex: will cause a new
+ * image to be generated.
+ */
+- (void) purgeImageCache
+{
+ [self.picturePreviews removeAllObjects];
+}
+
+/** 
+ * This function converts an image created by libhb (specified via pictureIndex) into
+ * an NSImage suitable for the GUI code to use. If removeBorders is YES,
+ * makeImageForPicture crops the image generated by libhb stripping off the gray
+ * border around the content. This is the low-level method that generates the image.
+ * -imageForPicture calls this function whenever it can't find an image in its cache.
+ *
+ * @param pictureIndex Index in title.
+ * @param handle Handle to hb_handle_t.
+ * @param title Handle to hb_title_t of desired title.
+ * @param deinterlace Whether the preview image must be deinterlaced or not.
+ */
++ (NSImage *) makeImageForPicture: (NSUInteger) pictureIndex
+ libhb: (hb_handle_t *) handle
+ title: (hb_title_t *) title
+ deinterlace: (BOOL) deinterlace
+{
+ NSImage *img = nil;
+
+ hb_ui_geometry_t geo;
+ geo.width = title->job->width;
+ geo.height = title->job->height;
+ // HBPreviewController will scale the image later,
+ // ignore the par.
+ geo.par.num = 1;
+ geo.par.den = 1;
+ memcpy(geo.crop, title->job->crop, sizeof(int[4]));
+
+ hb_image_t *image;
+ image = hb_get_preview2(handle, title->index, (int)pictureIndex, &geo, deinterlace);
+
+ if (image)
+ {
+ // Create an NSBitmapImageRep and copy the libhb image into it, converting it from
+ // libhb's format to one suitable for NSImage.
+
+ // The image data returned by hb_get_preview2 is 4 bytes per pixel, BGRA format.
+ // Alpha is ignored.
+ NSBitmapImageRep *imgrep = [[[NSBitmapImageRep alloc]
+ initWithBitmapDataPlanes:nil
+ pixelsWide:image->width
+ pixelsHigh:image->height
+ bitsPerSample:8
+ samplesPerPixel:3 // ignore alpha
+ hasAlpha:NO
+ isPlanar:NO
+ colorSpaceName:NSCalibratedRGBColorSpace
+ bitmapFormat:NSAlphaFirstBitmapFormat
+ bytesPerRow:image->width * 4
+ bitsPerPixel:32] autorelease];
+
+ UInt8 *src_line = image->data;
+ UInt32 *dst = (UInt32 *)[imgrep bitmapData];
+ for (int r = 0; r < image->height; r++)
+ {
+ UInt32 *src = (UInt32 *)src_line;
+ for (int c = 0; c < image->width; c++)
+ {
+#if TARGET_RT_LITTLE_ENDIAN
+ *dst++ = Endian32_Swap(*src++);
+#else
+ *dst++ = *src++;
+#endif
+ }
+ src_line += image->plane[0].stride;
+ }
+
+ img = [[[NSImage alloc] initWithSize: NSMakeSize(image->width, image->height)] autorelease];
+ [img addRepresentation:imgrep];
+ }
+
+ hb_image_close(&image);
+
+ return img;
+}
+
+#pragma mark -
+#pragma mark Preview movie
+
++ (NSURL *) generateFileURLForType:(NSString *) type
+{
+ NSString *previewDirectory = [NSString stringWithFormat:@"%@/Previews/%d", [HBUtilities appSupportPath], getpid()];
+
+ if (![[NSFileManager defaultManager] fileExistsAtPath:previewDirectory])
+ {
+ if (![[NSFileManager defaultManager] createDirectoryAtPath:previewDirectory
+ withIntermediateDirectories:NO
+ attributes:nil
+ error:nil])
+ return nil;
+ }
+
+ return [[NSURL fileURLWithPath:previewDirectory]
+ URLByAppendingPathComponent:[NSString stringWithFormat:@"preview_temp.%@", type]];
+}
+
+/**
+ * This function start the encode of a movie preview, the delegate will be
+ * called with the updated the progress info and the fileURL.
+ * The called must call HBController prepareJobForPreview before this.
+ *
+ * @param index picture index in title.
+ * @param duration the duration in seconds of the preview movie.
+ */
+- (BOOL) createMovieAsyncWithImageIndex: (NSUInteger) index andDuration: (NSUInteger) duration;
+{
+ /* return if an encoding if already started */
+ if (self.encodeState || index >= self.imagesCount)
+ return NO;
+
+ hb_job_t *job = self.title->job;
+
+ /* Generate the file url and directories. */
+ if (job->mux & HB_MUX_MASK_MP4)
+ {
+ /* we use .m4v for our mp4 files so that ac3 and chapters in mp4 will play properly */
+ self.fileURL = [HBPreviewGenerator generateFileURLForType:@"m4v"];
+ }
+ else if (job->mux & HB_MUX_MASK_MKV)
+ {
+ self.fileURL = [HBPreviewGenerator generateFileURLForType:@"mkv"];
+ }
+
+ /* return if we couldn't get the fileURL */
+ if (!self.fileURL)
+ return NO;
+
+ /* See if there is an existing preview file, if so, delete it */
+ if (![[NSFileManager defaultManager] fileExistsAtPath:[self.fileURL path]])
+ {
+ [[NSFileManager defaultManager] removeItemAtPath:[self.fileURL path] error:NULL];
+ }
+
+ /* We now direct our preview encode to fileURL path */
+ hb_job_set_file(job, [[self.fileURL path] UTF8String]);
+
+ /* We use our advance pref to determine how many previews to scan */
+ job->start_at_preview = (int)index + 1;
+ job->seek_points = (int)self.imagesCount;
+ job->pts_to_stop = duration * 90000LL;
+
+ /* lets go ahead and send it off to libhb
+ * Note: unlike a full encode, we only send 1 pass regardless if the final encode calls for 2 passes.
+ * this should suffice for a fairly accurate short preview and cuts our preview generation time in half.
+ * However we also need to take into account the indepth scan for subtitles.
+ */
+
+ int loggingLevel = [[[NSUserDefaults standardUserDefaults] objectForKey:@"LoggingLevel"] intValue];
+ self.privateHandle = hb_init(loggingLevel, 0);
+
+ /*
+ * If scanning we need to do some extra setup of the job.
+ */
+ if (job->indepth_scan == 1)
+ {
+ char *encoder_preset_tmp = job->encoder_preset != NULL ? strdup(job->encoder_preset) : NULL;
+ char *encoder_tune_tmp = job->encoder_tune != NULL ? strdup(job->encoder_tune) : NULL;
+ char *encoder_options_tmp = job->encoder_options != NULL ? strdup(job->encoder_options) : NULL;
+ char *encoder_profile_tmp = job->encoder_profile != NULL ? strdup(job->encoder_profile) : NULL;
+ char *encoder_level_tmp = job->encoder_level != NULL ? strdup(job->encoder_level) : NULL;
+ /*
+ * When subtitle scan is enabled do a fast pre-scan job
+ * which will determine which subtitles to enable, if any.
+ */
+ hb_job_set_encoder_preset (job, NULL);
+ hb_job_set_encoder_tune (job, NULL);
+ hb_job_set_encoder_options(job, NULL);
+ hb_job_set_encoder_profile(job, NULL);
+ hb_job_set_encoder_level (job, NULL);
+ job->pass = -1;
+ hb_add(self.privateHandle, job);
+ /*
+ * reset the advanced settings
+ */
+ hb_job_set_encoder_preset (job, encoder_preset_tmp);
+ hb_job_set_encoder_tune (job, encoder_tune_tmp);
+ hb_job_set_encoder_options(job, encoder_options_tmp);
+ hb_job_set_encoder_profile(job, encoder_profile_tmp);
+ hb_job_set_encoder_level (job, encoder_level_tmp);
+ free(encoder_preset_tmp);
+ free(encoder_tune_tmp);
+ free(encoder_options_tmp);
+ free(encoder_profile_tmp);
+ free(encoder_level_tmp);
+ }
+
+ /* Go ahead and perform the actual encoding preview scan */
+ job->indepth_scan = 0;
+ job->pass = 0;
+
+ hb_add(self.privateHandle, job);
+
+ /* we need to clean up the various lists after the job(s) have been set */
+ hb_job_reset(job);
+
+ /* start the actual encode */
+ self.encodeState = EncodeStateWorking;
+ hb_system_sleep_prevent(self.privateHandle);
+
+ [self startHBTimer];
+
+ hb_start(self.privateHandle);
+
+ return YES;
+}
+
+/**
+ * Cancels the encoding process
+ */
+- (void) cancel
+{
+ if (self.privateHandle)
+ {
+ hb_state_t s;
+ hb_get_state2(self.privateHandle, &s);
+
+ if (self.encodeState && (s.state == HB_STATE_WORKING ||
+ s.state == HB_STATE_PAUSED))
+ {
+ self.encodeState = EncodeStateCancelled;
+ hb_stop(self.privateHandle);
+ hb_system_sleep_allow(self.privateHandle);
+ }
+ }
+}
+
+- (void) startHBTimer
+{
+ if (!self.timer)
+ {
+ self.timer = [NSTimer scheduledTimerWithTimeInterval:0.5
+ target:self
+ selector:@selector(updateState)
+ userInfo:nil
+ repeats:YES];
+ }
+}
+
+- (void) stopHBTimer
+{
+ [self.timer invalidate];
+ self.timer = nil;
+}
+
+- (void) updateState
+{
+ hb_state_t s;
+ hb_get_state(self.privateHandle, &s);
+
+ switch( s.state )
+ {
+ case HB_STATE_IDLE:
+ case HB_STATE_SCANNING:
+ case HB_STATE_SCANDONE:
+ break;
+
+ case HB_STATE_WORKING:
+ {
+			NSMutableString *info = [NSMutableString stringWithFormat: @"Encoding preview: %.2f %%", 100.0 * s.param.working.progress];
+
+			if( s.param.working.seconds > -1 )
+ {
+ [info appendFormat:@" (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)",
+ s.param.working.rate_cur, s.param.working.rate_avg, s.param.working.hours,
+ s.param.working.minutes, s.param.working.seconds];
+ }
+
+ double progress = 100.0 * s.param.working.progress;
+
+ [self.delegate updateProgress:progress info:info];
+
+ break;
+ }
+
+ case HB_STATE_MUXING:
+ {
+ NSString *info = @"Muxing Preview…";
+ double progress = 100.0;
+
+ [self.delegate updateProgress:progress info:info];
+
+ break;
+ }
+
+ case HB_STATE_PAUSED:
+ break;
+
+ case HB_STATE_WORKDONE:
+ {
+ [self stopHBTimer];
+
+ // Delete all remaining jobs since libhb doesn't do this on its own.
+ hb_job_t * job;
+ while( ( job = hb_job(self.privateHandle, 0) ) )
+ hb_rem( self.handle, job );
+
+ hb_system_sleep_allow(self.privateHandle);
+ hb_stop(self.privateHandle);
+ hb_close(&_privateHandle);
+ self.privateHandle = NULL;
+
+ /* Encode done, call the delegate and close libhb handle */
+ if (self.encodeState != EncodeStateCancelled)
+ {
+ [self.delegate didCreateMovieAtURL:self.fileURL];
+ }
+ else
+ {
+ [self.delegate didCancelMovieCreation];
+ }
+
+ self.encodeState = EncodeStateIdle;
+
+ break;
+ }
+ }
+}
+
+#pragma mark -
+
+- (void) dealloc
+{
+ [_timer invalidate];
+ [_timer release];
+ _timer = nil;
+
+ if (_privateHandle) {
+ hb_system_sleep_allow(self.privateHandle);
+ hb_stop(_privateHandle);
+ hb_close(&_privateHandle);
+ }
+
+ [_fileURL release];
+ _fileURL = nil;
+ [_picturePreviews release];
+ _picturePreviews = nil;
+
+ [super dealloc];
+}
+
+@end

HandBrake-0.9.9.tar.bz2/macosx/HBQueueController.h -> HandBrake-0.10.0.tar.bz2/macosx/HBQueueController.h Changed

@@ -10,12 +10,6 @@
 
 @class HBController;
 
-
-#define HB_QUEUE_DRAGGING 0 // <--- NOT COMPLETELY FUNCTIONAL YET
-#define HB_OUTLINE_METRIC_CONTROLS 0 // for tweaking the outline cell spacings
-
-
-
 //------------------------------------------------------------------------------------
 // As usual, we need to subclass NSOutlineView to handle a few special cases:
 //
@@ -35,96 +29,18 @@
 // drag an image of the queue's icon and desc columns.
 
 @interface HBQueueOutlineView : NSOutlineView
-{
 
-BOOL fIsDragging;
-
-}
-
-- (BOOL) isDragging;
+@property (nonatomic, readonly) BOOL isDragging;
 
 @end
 
+@interface HBQueueController : NSWindowController <NSToolbarDelegate, NSWindowDelegate>
 
-
-
-@interface HBQueueController : NSWindowController
-{
- hb_handle_t *fQueueEncodeLibhb; // reference to libhb
- HBController *fHBController; // reference to HBController
- NSMutableArray *fJobGroups; // mirror image of the queue array from controller.mm
- 
- int pidNum; // Records the PID number from HBController for this instance
- int fEncodingQueueItem; // corresponds to the index of fJobGroups encoding item
- int fPendingCount; // Number of various kinds of job groups in fJobGroups.
- int fCompletedCount;
- int fCanceledCount;
- int fWorkingCount;
- BOOL fJobGroupCountsNeedUpdating;
-
- BOOL fCurrentJobPaneShown; // NO when fCurrentJobPane has been shifted out of view (see showCurrentJobPane)
- NSMutableIndexSet *fSavedExpandedItems; // used by save/restoreOutlineViewState to preserve which items are expanded
- NSMutableIndexSet *fSavedSelectedItems; // used by save/restoreOutlineViewState to preserve which items are selected
-#if HB_QUEUE_DRAGGING
- NSArray *fDraggedNodes;
-#endif
- NSTimer *fAnimationTimer; // animates the icon of the current job in the queue outline view
- int fAnimationIndex; // used to generate name of image used to animate the current job in the queue outline view
-
- // +------------------window-------------------+
- // |+-------------fCurrentJobPane-------------+|
- // || ||
- // || ||
- // || ||
- // |+-----------------------------------------+|
- // |+---------------fQueuePane----------------+|
- // || ||
- // || ||
- // || ||
- // || ||
- // || ||
- // || ||
- // || ||
- // |+-----------------------------------------+|
- // +-------------------------------------------+
-
- // fCurrentJobPane - visible only when processing a job
- IBOutlet NSView *fCurrentJobPane;
- IBOutlet NSImageView *fJobIconView;
- IBOutlet NSTextField *fJobDescTextField;
- IBOutlet NSProgressIndicator *fProgressBar;
- IBOutlet NSTextField *fProgressTextField;
-
- // fQueuePane - always visible; fills entire window when fCurrentJobPane is hidden
- IBOutlet NSView *fQueuePane;
- IBOutlet HBQueueOutlineView *fOutlineView;
- IBOutlet NSTextField *fQueueCountField;
- NSArray *fDraggedNodes;
- BOOL fIsDragging;
-#if HB_OUTLINE_METRIC_CONTROLS
- IBOutlet NSSlider *fIndentation; // debug
- IBOutlet NSSlider *fSpacing; // debug
-#endif
-
-}
 - (void)setPidNum: (int)myPidnum;
 - (void)setHandle: (hb_handle_t *)handle;
 - (void)setHBController: (HBController *)controller;
 
-- (void)setupToolbar;
-
 - (void)setQueueArray: (NSMutableArray *)QueueFileArray;
-- (id)outlineView:(NSOutlineView *)fOutlineView child:(NSInteger)index ofItem:(id)item;
-
-- (BOOL)outlineView:(NSOutlineView *)fOutlineView isItemExpandable:(id)item;
-
-- (BOOL)outlineView:(NSOutlineView *)fOutlineView shouldExpandItem:(id)item;
-
-- (NSInteger)outlineView:(NSOutlineView *)fOutlineView numberOfChildrenOfItem:(id)item;
-
-- (id)outlineView:(NSOutlineView *)fOutlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item;
-
-- (void)outlineView:(NSOutlineView *)fOutlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item;
 
 /* Animate the icon for the current encode */
 - (void) animateWorkingEncodeIconInQueue;
@@ -134,19 +50,9 @@
 
 - (IBAction)showQueueWindow: (id)sender;
 
-
 /* control encodes in the window */
 - (IBAction)removeSelectedQueueItem: (id)sender;
 - (IBAction)revealSelectedQueueItem: (id)sender;
 - (IBAction)editSelectedQueueItem: (id)sender;
 
-#if HB_OUTLINE_METRIC_CONTROLS
-- (IBAction)imageSpacingChanged: (id)sender;
-- (IBAction)indentChanged: (id)sender;
-#endif
-
-
-
-
-
 @end

HandBrake-0.9.9.tar.bz2/macosx/HBQueueController.mm -> HandBrake-0.10.0.tar.bz2/macosx/HBQueueController.mm Changed

@@ -7,15 +7,14 @@
 #import "HBQueueController.h"
 #import "Controller.h"
 #import "HBImageAndTextCell.h"
+#import "HBUtilities.h"
 
 #define HB_ROW_HEIGHT_TITLE_ONLY 17.0
-#define HB_ROW_HEIGHT_FULL_DESCRIPTION 200.0
+
 // Pasteboard type for or drag operations
-#define DragDropSimplePboardType 	@"MyCustomOutlineViewPboardType"
+#define DragDropSimplePboardType @"HBQueueCustomOutlineViewPboardType"
 
-//------------------------------------------------------------------------------------
 #pragma mark -
-//------------------------------------------------------------------------------------
 
 //------------------------------------------------------------------------------------
 // NSMutableAttributedString (HBAdditions)
@@ -28,10 +27,9 @@
 @implementation NSMutableAttributedString (HBAdditions)
 - (void) appendString: (NSString*)aString withAttributes: (NSDictionary *)aDictionary
 {
- NSAttributedString * s = [[[NSAttributedString alloc]
- initWithString: aString
- attributes: aDictionary] autorelease];
- [self appendAttributedString: s];
+ NSAttributedString *s = [[[NSAttributedString alloc] initWithString:aString
+ attributes:aDictionary] autorelease];
+ [self appendAttributedString:s];
 }
 @end
 
@@ -47,44 +45,118 @@
 [super viewDidEndLiveResize];
 }
 
-
-
 /* This should be for dragging, we take this info from the presets right now */
-- (NSImage *)dragImageForRowsWithIndexes:(NSIndexSet *)dragRows tableColumns:(NSArray *)tableColumns event:(NSEvent*)dragEvent offset:(NSPointPointer)dragImageOffset
+- (NSImage *)dragImageForRowsWithIndexes:(NSIndexSet *)dragRows
+ tableColumns:(NSArray *)tableColumns
+ event:(NSEvent *)dragEvent
+ offset:(NSPointPointer)dragImageOffset
 {
- fIsDragging = YES;
+ _isDragging = YES;
 
 // By default, NSTableView only drags an image of the first column. Change this to
 // drag an image of the queue's icon and desc and action columns.
- NSArray * cols = [NSArray arrayWithObjects: [self tableColumnWithIdentifier:@"desc"], [self tableColumnWithIdentifier:@"icon"],[self tableColumnWithIdentifier:@"action"], nil];
+ NSArray * cols = @[[self tableColumnWithIdentifier:@"desc"], [self tableColumnWithIdentifier:@"icon"],[self tableColumnWithIdentifier:@"action"]];
 return [super dragImageForRowsWithIndexes:dragRows tableColumns:cols event:dragEvent offset:dragImageOffset];
 }
 
-
-
-- (void) mouseDown:(NSEvent *)theEvent
+- (void)mouseDown:(NSEvent *)theEvent
 {
 [super mouseDown:theEvent];
-	fIsDragging = NO;
+	_isDragging = NO;
 }
 
+- (void)keyDown:(NSEvent *)event
+{
+ id delegate = [self delegate];
 
+ unichar key = [[event charactersIgnoringModifiers] characterAtIndex:0];
+ if ((key == NSDeleteCharacter || key == NSDeleteFunctionKey) &&
+ [delegate respondsToSelector:@selector(removeSelectedQueueItem:)])
+ {
+ if ([self selectedRow] == -1)
+ {
+ NSBeep();
+ }
+ else
+ {
+ [delegate removeSelectedQueueItem:self];
+ }
+ return;
+ }
+ else
+ {
+ [super keyDown:event];
+ }
+}
 
-- (BOOL) isDragging;
+/**
+ * An index set containing the indexes of the targeted rows.
+ * If the selected row indexes contain the clicked row index, it returns every selected row,
+ * otherwise it returns only the clicked row index.
+ */
+- (NSIndexSet *)targetedRowIndexes
 {
- return fIsDragging;
+ NSMutableIndexSet *rowIndexes = [NSMutableIndexSet indexSet];
+ NSIndexSet *selectedRowIndexes = [self selectedRowIndexes];
+ NSInteger clickedRow = [self clickedRow];
+
+ if (clickedRow != -1)
+ {
+ [rowIndexes addIndex:clickedRow];
+
+ // If we clicked on a selected row, then we want to consider all rows in the selection. Otherwise, we only consider the clicked on row.
+ if ([selectedRowIndexes containsIndex:clickedRow])
+ {
+ [rowIndexes addIndexes:selectedRowIndexes];
+ }
+ }
+ else
+ {
+ [rowIndexes addIndexes:selectedRowIndexes];
+ }
+
+ return [[rowIndexes copy] autorelease];
 }
 
 @end
 
-#pragma mark Toolbar Identifiers
-// Toolbar identifiers
-static NSString* HBQueueToolbar = @"HBQueueToolbar1";
-static NSString* HBQueueStartCancelToolbarIdentifier = @"HBQueueStartCancelToolbarIdentifier";
-static NSString* HBQueuePauseResumeToolbarIdentifier = @"HBQueuePauseResumeToolbarIdentifier";
-
 #pragma mark -
 
+@interface HBQueueController ()
+{
+ hb_handle_t *fQueueEncodeLibhb; // reference to libhb
+ HBController *fHBController; // reference to HBController
+ NSMutableArray *fJobGroups; // mirror image of the queue array from controller.mm
+
+ int pidNum; // Records the PID number from HBController for this instance
+ int fEncodingQueueItem; // corresponds to the index of fJobGroups encoding item
+ int fPendingCount; // Number of various kinds of job groups in fJobGroups.
+ int fWorkingCount;
+ BOOL fJobGroupCountsNeedUpdating;
+
+ BOOL fCurrentJobPaneShown; // NO when fCurrentJobPane has been shifted out of view (see showCurrentJobPane)
+ NSMutableIndexSet *fSavedExpandedItems; // used by save/restoreOutlineViewState to preserve which items are expanded
+ NSMutableIndexSet *fSavedSelectedItems; // used by save/restoreOutlineViewState to preserve which items are selected
+
+ NSTimer *fAnimationTimer; // animates the icon of the current job in the queue outline view
+ int fAnimationIndex; // used to generate name of image used to animate the current job in the queue outline view
+
+ IBOutlet NSTextField *fProgressTextField;
+
+ IBOutlet HBQueueOutlineView *fOutlineView;
+ IBOutlet NSTextField *fQueueCountField;
+ NSArray *fDraggedNodes;
+
+ // Text Styles
+ NSMutableParagraphStyle *ps;
+ NSDictionary *detailAttr;
+ NSDictionary *detailBoldAttr;
+ NSDictionary *titleAttr;
+ NSDictionary *shortHeightAttr;
+}
+
+@end
+
 @implementation HBQueueController
 
 //------------------------------------------------------------------------------------
@@ -102,33 +174,25 @@
 [self window];
 
 // Our defaults
- [[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
- @"NO", @"QueueWindowIsOpen",
- @"NO", @"QueueShowsDetail",
- @"YES", @"QueueShowsJobsAsGroups",
- nil]];
+ [[NSUserDefaults standardUserDefaults] registerDefaults:@{@"QueueWindowIsOpen": @"NO"}];
 
 fJobGroups = [[NSMutableArray arrayWithCapacity:0] retain];
- }
 
- return self;
+ [self initStyles];
+ }
+
+ return self;
 }
 
-- (void)setQueueArray: (NSMutableArray *)QueueFileArray
+- (void)setQueueArray:(NSMutableArray *)QueueFileArray
 {
 [fJobGroups setArray:QueueFileArray];
- fIsDragging = NO; 
- /* First stop any timer working now */
- //[self stopAnimatingCurrentJobGroupInQueue];
+
 [fOutlineView reloadData];
- 
- 
- 
+
 /* lets get the stats on the status of the queue array */
 
 fPendingCount = 0;
- fCompletedCount = 0;
- fCanceledCount = 0;
 fWorkingCount = 0;
 
 /* We use a number system to set the encode status of the queue item
@@ -140,35 +204,27 @@
 */
 	int i = 0;
 NSDictionary *thisQueueDict = nil;
-	for(id tempObject in fJobGroups)
+	for (id tempObject in fJobGroups)
 	{
 		thisQueueDict = tempObject;
-		if ([[thisQueueDict objectForKey:@"Status"] intValue] == 0) // Completed
-		{
-			fCompletedCount++;	
-		}
-		if ([[thisQueueDict objectForKey:@"Status"] intValue] == 1) // being encoded
+		if ([thisQueueDict[@"Status"] intValue] == 1) // being encoded
 		{
 			fWorkingCount++;
 /* we have an encoding job so, lets start the animation timer */
- if ([thisQueueDict objectForKey:@"EncodingPID"] && [[thisQueueDict objectForKey:@"EncodingPID"] intValue] == pidNum)
+ if (thisQueueDict[@"EncodingPID"] && [thisQueueDict[@"EncodingPID"] intValue] == pidNum)
 {
 fEncodingQueueItem = i;
 }
 		}
- if ([[thisQueueDict objectForKey:@"Status"] intValue] == 2) // pending		
+ if ([thisQueueDict[@"Status"] intValue] == 2) // pending		
 {
 			fPendingCount++;
 		}
- if ([[thisQueueDict objectForKey:@"Status"] intValue] == 3) // cancelled		
- {
-			fCanceledCount++;
-		}
 		i++;
 	}
 
 /* Set the queue status field in the queue window */
- NSMutableString * string;
+ NSMutableString *string;
 if (fPendingCount == 0)
 {
 string = [NSMutableString stringWithFormat: NSLocalizedString( @"No encode pending", @"" )];
@@ -190,11 +246,9 @@
 * instead of running another timer here polling libhb
 * for encoding status
 */
-- (void)setQueueStatusString: (NSString *)statusString
+- (void)setQueueStatusString:(NSString *)statusString
 {
- 
 [fProgressTextField setStringValue:statusString];
- 
 }
 
 //------------------------------------------------------------------------------------
@@ -211,6 +265,12 @@
 [fSavedExpandedItems release];
 [fSavedSelectedItems release];
 
+ [ps release];
+ [detailAttr release];
+ [detailBoldAttr release];
+ [titleAttr release];
+ [shortHeightAttr release];
+
 [[NSNotificationCenter defaultCenter] removeObserver:self];
 
 [super dealloc];
@@ -235,7 +295,7 @@
 - (void)setPidNum: (int)myPidnum
 {
 pidNum = myPidnum;
- [fHBController writeToActivityLog: "HBQueueController : My Pidnum is %d", pidNum];
+ [HBUtilities writeToActivityLog: "HBQueueController : My Pidnum is %d", pidNum];
 }
 
 #pragma mark -
@@ -250,42 +310,24 @@
 [self startAnimatingCurrentWorkingEncodeInQueue];
 }
 
-
-
 //------------------------------------------------------------------------------------
-// awakeFromNib
+// windowDidLoad
 //------------------------------------------------------------------------------------
-- (void)awakeFromNib
+- (void)windowDidLoad
 {
- [self setupToolbar];
-
- if( ![[self window] setFrameUsingName:@"Queue"] )
- [[self window] center];
- [self setWindowFrameAutosaveName:@"Queue"];
-
 /* lets setup our queue list outline view for drag and drop here */
- [fOutlineView registerForDraggedTypes: [NSArray arrayWithObject:DragDropSimplePboardType] ];
+ [fOutlineView registerForDraggedTypes: @[DragDropSimplePboardType] ];
 [fOutlineView setDraggingSourceOperationMask:NSDragOperationEvery forLocal:YES];
 [fOutlineView setVerticalMotionCanBeginDrag: YES];
 
-
 // Don't allow autoresizing of main column, else the "delete" column will get
 // pushed out of view.
 [fOutlineView setAutoresizesOutlineColumn: NO];
 
-#if HB_OUTLINE_METRIC_CONTROLS
- [fIndentation setHidden: NO];
- [fSpacing setHidden: NO];
- [fIndentation setIntegerValue:[fOutlineView indentationPerLevel]]; // debug
- [fSpacing setIntegerValue:3]; // debug
-#endif
-
 // Show/hide UI elements
 fCurrentJobPaneShown = NO; // it's shown in the nib
-
 }
 
-
 //------------------------------------------------------------------------------------
 // windowWillClose
 //------------------------------------------------------------------------------------
@@ -298,109 +340,6 @@
 #pragma mark Toolbar
 
 //------------------------------------------------------------------------------------
-// setupToolbar
-//------------------------------------------------------------------------------------
-- (void)setupToolbar
-{
- // Create a new toolbar instance, and attach it to our window
- NSToolbar *toolbar = [[[NSToolbar alloc] initWithIdentifier: HBQueueToolbar] autorelease];
-
- // Set up toolbar properties: Allow customization, give a default display mode, and remember state in user defaults
- [toolbar setAllowsUserCustomization: YES];
- [toolbar setAutosavesConfiguration: YES];
- [toolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel];
-
- // We are the delegate
- [toolbar setDelegate: self];
-
- // Attach the toolbar to our window
- [[self window] setToolbar:toolbar];
-}
-
-//------------------------------------------------------------------------------------
-// toolbar:itemForItemIdentifier:willBeInsertedIntoToolbar:
-//------------------------------------------------------------------------------------
-- (NSToolbarItem *)toolbar:(NSToolbar *)toolbar
- itemForItemIdentifier:(NSString *)itemIdentifier
- willBeInsertedIntoToolbar:(BOOL)flag
-{
- // Required delegate method: Given an item identifier, this method returns an item.
- // The toolbar will use this method to obtain toolbar items that can be displayed
- // in the customization sheet, or in the toolbar itself.
-
- NSToolbarItem *toolbarItem = nil;
-
- if ([itemIdentifier isEqual: HBQueueStartCancelToolbarIdentifier])
- {
- toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdentifier] autorelease];
-
- // Set the text label to be displayed in the toolbar and customization palette
- [toolbarItem setLabel: @"Start"];
- [toolbarItem setPaletteLabel: @"Start/Cancel"];
-
- // Set up a reasonable tooltip, and image
- [toolbarItem setToolTip: @"Start Encoding"];
- [toolbarItem setImage: [NSImage imageNamed: @"encode"]];
-
- // Tell the item what message to send when it is clicked
- [toolbarItem setTarget: self];
- [toolbarItem setAction: @selector(toggleStartCancel:)];
- }
-
- if ([itemIdentifier isEqual: HBQueuePauseResumeToolbarIdentifier])
- {
- toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdentifier] autorelease];
-
- // Set the text label to be displayed in the toolbar and customization palette
- [toolbarItem setLabel: @"Pause"];
- [toolbarItem setPaletteLabel: @"Pause/Resume"];
-
- // Set up a reasonable tooltip, and image
- [toolbarItem setToolTip: @"Pause Encoding"];
- [toolbarItem setImage: [NSImage imageNamed: @"pauseencode"]];
-
- // Tell the item what message to send when it is clicked
- [toolbarItem setTarget: self];
- [toolbarItem setAction: @selector(togglePauseResume:)];
- }
-
- return toolbarItem;
-}
-
-//------------------------------------------------------------------------------------
-// toolbarDefaultItemIdentifiers:
-//------------------------------------------------------------------------------------
-- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar
-{
- // Required delegate method: Returns the ordered list of items to be shown in the
- // toolbar by default.
-
- return [NSArray arrayWithObjects:
- HBQueueStartCancelToolbarIdentifier,
- HBQueuePauseResumeToolbarIdentifier,
- nil];
-}
-
-//------------------------------------------------------------------------------------
-// toolbarAllowedItemIdentifiers:
-//------------------------------------------------------------------------------------
-- (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar
-{
- // Required delegate method: Returns the list of all allowed items by identifier.
- // By default, the toolbar does not assume any items are allowed, even the
- // separator. So, every allowed item must be explicitly listed.
-
- return [NSArray arrayWithObjects:
- HBQueueStartCancelToolbarIdentifier,
- HBQueuePauseResumeToolbarIdentifier,
- NSToolbarCustomizeToolbarItemIdentifier,
- NSToolbarFlexibleSpaceItemIdentifier,
- NSToolbarSpaceItemIdentifier,
- NSToolbarSeparatorItemIdentifier,
- nil];
-}
-
-//------------------------------------------------------------------------------------
 // validateToolbarItem:
 //------------------------------------------------------------------------------------
 - (BOOL) validateToolbarItem: (NSToolbarItem *) toolbarItem
@@ -415,7 +354,7 @@
 hb_state_t s;
 hb_get_state2 (fQueueEncodeLibhb, &s);
 
- if ([[toolbarItem itemIdentifier] isEqual: HBQueueStartCancelToolbarIdentifier])
+ if ([[toolbarItem itemIdentifier] isEqualToString:@"HBQueueStartCancelToolbarIdentifier"])
 {
 if ((s.state == HB_STATE_PAUSED) || (s.state == HB_STATE_WORKING) || (s.state == HB_STATE_MUXING))
 {
@@ -442,7 +381,7 @@
 }
 }
 
- if ([[toolbarItem itemIdentifier] isEqual: HBQueuePauseResumeToolbarIdentifier])
+ if ([[toolbarItem itemIdentifier] isEqualToString:@"HBQueuePauseResumeToolbarIdentifier"])
 {
 if (s.state == HB_STATE_PAUSED)
 {
@@ -481,37 +420,40 @@
 //------------------------------------------------------------------------------------
 - (IBAction)removeSelectedQueueItem: (id)sender
 {
- NSIndexSet * selectedRows = [fOutlineView selectedRowIndexes];
- NSUInteger row = [selectedRows firstIndex];
+ NSIndexSet *targetedRow = [fOutlineView targetedRowIndexes];
+ NSUInteger row = [targetedRow firstIndex];
 if( row == NSNotFound )
 return;
 /* if this is a currently encoding job, we need to be sure to alert the user,
 * to let them decide to cancel it first, then if they do, we can come back and
 * remove it */
 
- if ([[[fJobGroups objectAtIndex:row] objectForKey:@"Status"] integerValue] == 1)
+ if ([fJobGroups[row][@"Status"] integerValue] == 1)
 {
 /* We pause the encode here so that it doesn't finish right after and then
 * screw up the sync while the window is open
 */
 [fHBController Pause:NULL];
- NSString * alertTitle = [NSString stringWithFormat:NSLocalizedString(@"Stop This Encode and Remove It ?", nil)];
+ NSString *alertTitle = [NSString stringWithFormat:NSLocalizedString(@"Stop This Encode and Remove It ?", nil)];
 // Which window to attach the sheet to?
- NSWindow * docWindow = nil;
+ NSWindow *docWindow = nil;
 if ([sender respondsToSelector: @selector(window)])
+ {
 docWindow = [sender window];
- 
- 
- NSBeginCriticalAlertSheet(
- alertTitle,
- NSLocalizedString(@"Keep Encoding", nil),
- nil,
- NSLocalizedString(@"Stop Encoding and Delete", nil),
- docWindow, self,
- nil, @selector(didDimissCancelCurrentJob:returnCode:contextInfo:), nil,
- NSLocalizedString(@"Your movie will be lost if you don't continue encoding.", nil));
- 
- // didDimissCancelCurrentJob:returnCode:contextInfo: will be called when the dialog is dismissed
+ }
+
+ NSAlert *alert = [[NSAlert alloc] init];
+ [alert setMessageText:alertTitle];
+ [alert setInformativeText:NSLocalizedString(@"Your movie will be lost if you don't continue encoding.", nil)];
+ [alert addButtonWithTitle:NSLocalizedString(@"Keep Encoding", nil)];
+ [alert addButtonWithTitle:NSLocalizedString(@"Stop Encoding and Delete", nil)];
+ [alert setAlertStyle:NSCriticalAlertStyle];
+
+ [alert beginSheetModalForWindow:docWindow
+ modalDelegate:self
+ didEndSelector:@selector(didDimissCancelCurrentJob:returnCode:contextInfo:)
+ contextInfo:nil];
+ [alert release];
 }
 else
 { 
@@ -529,7 +471,7 @@
 * [fHBController Pause:NULL]; Again will resume encoding
 */
 [fHBController Pause:NULL];
- if (returnCode == NSAlertOtherReturn)
+ if (returnCode == NSAlertSecondButtonReturn)
 {
 /* We need to save the currently encoding item number first */
 int encodingItemToRemove = fEncodingQueueItem;
@@ -550,21 +492,20 @@
 //------------------------------------------------------------------------------------
 - (IBAction)revealSelectedQueueItem: (id)sender
 {
- NSIndexSet * selectedRows = [fOutlineView selectedRowIndexes];
- NSInteger row = [selectedRows firstIndex];
+ NSIndexSet *targetedRow = [fOutlineView targetedRowIndexes];
+ NSInteger row = [targetedRow firstIndex];
 if (row != NSNotFound)
 {
 while (row != NSNotFound)
 {
- NSMutableDictionary *queueItemToOpen = [fOutlineView itemAtRow: row];
- [[NSWorkspace sharedWorkspace] selectFile:[queueItemToOpen objectForKey:@"DestinationPath"] inFileViewerRootedAtPath:nil];
+ NSMutableDictionary *queueItemToOpen = [fOutlineView itemAtRow: row];
+ [[NSWorkspace sharedWorkspace] selectFile:queueItemToOpen[@"DestinationPath"] inFileViewerRootedAtPath:nil];
 
- row = [selectedRows indexGreaterThanIndex: row];
+ row = [targetedRow indexGreaterThanIndex: row];
 }
 }
 }
 
-
 //------------------------------------------------------------------------------------
 // Starts or cancels the processing of jobs depending on the current state
 //------------------------------------------------------------------------------------
@@ -576,7 +517,7 @@
 hb_get_state2 (fQueueEncodeLibhb, &s);
 
 if ((s.state == HB_STATE_PAUSED) || (s.state == HB_STATE_WORKING) || (s.state == HB_STATE_MUXING))
- [fHBController Cancel: fQueuePane]; // sender == fQueuePane so that warning alert shows up on queue window
+ [fHBController Cancel: self];
 
 else if (fPendingCount > 0)
 [fHBController Rip: NULL];
@@ -610,51 +551,56 @@
 //------------------------------------------------------------------------------------
 - (IBAction)editSelectedQueueItem: (id)sender
 {
- NSIndexSet * selectedRows = [fOutlineView selectedRowIndexes];
- NSUInteger row = [selectedRows firstIndex];
- if( row == NSNotFound )
+ NSInteger row = [fOutlineView clickedRow];
+ if (row == NSNotFound)
+ {
 return;
+ }
+
 /* if this is a currently encoding job, we need to be sure to alert the user,
 * to let them decide to cancel it first, then if they do, we can come back and
 * remove it */
 
- if ([[[fJobGroups objectAtIndex:row] objectForKey:@"Status"] integerValue] == 1)
+ if ([fJobGroups[row][@"Status"] integerValue] == 1)
 {
 /* We pause the encode here so that it doesn't finish right after and then
 * screw up the sync while the window is open
 */
 [fHBController Pause:NULL];
- NSString * alertTitle = [NSString stringWithFormat:NSLocalizedString(@"Stop This Encode and Remove It ?", nil)];
+ NSString *alertTitle = [NSString stringWithFormat:NSLocalizedString(@"Stop This Encode and Remove It ?", nil)];
 // Which window to attach the sheet to?
- NSWindow * docWindow = nil;
+ NSWindow *docWindow = nil;
 if ([sender respondsToSelector: @selector(window)])
+ {
 docWindow = [sender window];
- 
- 
- NSBeginCriticalAlertSheet(
- alertTitle,
- NSLocalizedString(@"Keep Encoding", nil),
- nil,
- NSLocalizedString(@"Stop Encoding and Delete", nil),
- docWindow, self,
- nil, @selector(didDimissCancelCurrentJob:returnCode:contextInfo:), nil,
- NSLocalizedString(@"Your movie will be lost if you don't continue encoding.", nil));
- 
+ }
+
+ NSAlert *alert = [[NSAlert alloc] init];
+ [alert setMessageText:alertTitle];
+ [alert setInformativeText:NSLocalizedString(@"Your movie will be lost if you don't continue encoding.", nil)];
+ [alert addButtonWithTitle:NSLocalizedString(@"Keep Encoding", nil)];
+ [alert addButtonWithTitle:NSLocalizedString(@"Stop Encoding and Delete", nil)];
+ [alert setAlertStyle:NSCriticalAlertStyle];
+
+ [alert beginSheetModalForWindow:docWindow
+ modalDelegate:self
+ didEndSelector:@selector(didDimissCancelCurrentJob:returnCode:contextInfo:)
+ contextInfo:nil];
+ [alert release];
 }
 else
 { 
- /* since we are not a currently encoding item, we can just be cancelled */
- [fHBController rescanQueueItemToMainWindow:[[fJobGroups objectAtIndex:row] objectForKey:@"SourcePath"] scanTitleNum:[[[fJobGroups objectAtIndex:row] objectForKey:@"TitleNumber"] integerValue] selectedQueueItem:row];
+ /* since we are not a currently encoding item, we can just be cancelled */
+ [fHBController rescanQueueItemToMainWindow:fJobGroups[row][@"SourcePath"]
+ scanTitleNum:[fJobGroups[row][@"TitleNumber"] integerValue]
+ selectedQueueItem:row];
 
 }
 }
 
 
 #pragma mark -
-#pragma mark Animate Endcoding Item
-
-
-
+#pragma mark Animate Encoding Item
 
 //------------------------------------------------------------------------------------
 // Starts animating the job icon of the currently processing job in the queue outline
@@ -733,7 +679,7 @@
 insertIndex--;
 }
 
- id object = [[array objectAtIndex:removeIndex] retain];
+ id object = [array[removeIndex] retain];
 [array removeObjectAtIndex:removeIndex];
 [array insertObject:object atIndex:insertIndex];
 [object release];
@@ -750,7 +696,7 @@
 - (id)outlineView:(NSOutlineView *)fOutlineView child:(NSInteger)index ofItem:(id)item
 {
 if (item == nil)
- return [fJobGroups objectAtIndex:index];
+ return fJobGroups[index];
 
 // We are only one level deep, so we can't be asked about children
 NSAssert (NO, @"HBQueueController outlineView:child:ofItem: can't handle nested items.");
@@ -768,7 +714,7 @@
 {
 // Our outline view has no levels, but we can still expand every item. Doing so
 // just makes the row taller. See heightOfRowByItem below.
-return ![(HBQueueOutlineView*)outlineView isDragging];
+ return ![(HBQueueOutlineView *)outlineView isDragging];
 }
 
 - (NSInteger)outlineView:(NSOutlineView *)fOutlineView numberOfChildrenOfItem:(id)item
@@ -783,14 +729,14 @@
 
 - (void)outlineViewItemDidCollapse:(NSNotification *)notification
 {
- id item = [[notification userInfo] objectForKey:@"NSObject"];
+ id item = [notification userInfo][@"NSObject"];
 NSInteger row = [fOutlineView rowForItem:item];
 [fOutlineView noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(row,1)]];
 }
 
 - (void)outlineViewItemDidExpand:(NSNotification *)notification
 {
- id item = [[notification userInfo] objectForKey:@"NSObject"];
+ id item = [notification userInfo][@"NSObject"];
 NSInteger row = [fOutlineView rowForItem:item];
 [fOutlineView noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(row,1)]];
 }
@@ -799,94 +745,22 @@
 {
 if ([outlineView isItemExpanded: item])
 {
- /* Below is the original code to accommodate a live resize,
- * however as stated in travistex's comments it's very buggy.
- * For now I will leave it here ... commented out and use
- * the code below to determine the row height based on each
- * encodes optional parameters and how they are displayed. */
- 
- // Short-circuit here if in a live resize primarily to fix a bug but also to
- // increase resposivness during a resize. There's a bug in NSTableView that
- // causes row heights to get messed up if you try to change them during a live
- // resize. So if in a live resize, simply return the previously calculated
- // height. The row heights will get fixed up after the resize because we have
- // implemented viewDidEndLiveResize to force all of them to be recalculated.
- // if ([outlineView inLiveResize] && [item lastDescriptionHeight] > 0)
- // return [item lastDescriptionHeight];
- 
- // CGFloat width = [[outlineView tableColumnWithIdentifier: @"desc"] width];
- // Column width is NOT what is ultimately used. I can't quite figure out what
- // width to use for calculating text metrics. No matter how I tweak this value,
- // there are a few conditions in which the drawn text extends below the bounds
- // of the row cell. In previous versions, which ran under Tiger, I was
- // reducing width by 47 pixles.
- // width -= 2; // (?) for intercell spacing
- 
- // CGFloat height = [item heightOfDescriptionForWidth: width];
- // return height;
- 
- /* So, we know several rows of text that are in all queue items for display.
- * These are the title line, Preset, Format, Destination, Picture, and Video Lines
- */
- CGFloat rowHeightNonTitle = 15.0;
- /* Add the title line height, then the non title line height for Preset, Format, Destination
- * Picture and Video
- */
- CGFloat itemHeightForDisplay = HB_ROW_HEIGHT_TITLE_ONLY + (rowHeightNonTitle * 5);
- 
- /* get our item row number so we an use it to calc how many lines we have to display based
- * on MP4 Options, Filter Options, X264 Options, Audio Tracks and Subtitles from our queue array */
- int itemRowNum = [outlineView rowForItem: item];
- NSMutableDictionary *queueItemToCheck = [outlineView itemAtRow: itemRowNum];
- 
- /* Check to see if we need to allow for container options */
- if ([[queueItemToCheck objectForKey:@"MuxerOptionsSummary"] length])
- {
- itemHeightForDisplay += rowHeightNonTitle;
- }
+ // It is important to use a constant value when calculating the height. Querying the tableColumn width will not work, since it dynamically changes as the user resizes -- however, we don't get a notification that the user "did resize" it until after the mouse is let go. We use the latter as a hook for telling the table that the heights changed. We must return the same height from this method every time, until we tell the table the heights have changed. Not doing so will quicly cause drawing problems.
+ NSTableColumn *tableColumnToWrap = (NSTableColumn *) [outlineView tableColumns][1];
+ NSInteger columnToWrap = [outlineView.tableColumns indexOfObject:tableColumnToWrap];
 
- /* check to see if we need to allow for the Picture Filters row */
- if ([[queueItemToCheck objectForKey:@"PictureFiltersSummary"] length])
- {
- itemHeightForDisplay += rowHeightNonTitle;
- }
+ // Grab the fully prepared cell with our content filled in. Note that in IB the cell's Layout is set to Wraps.
+ NSCell *cell = [outlineView preparedCellAtColumn:columnToWrap row:[outlineView rowForItem:item]];
 
- /* check to see if we need a line to display x264/lavc options */
- if ([[queueItemToCheck objectForKey:@"VideoEncoder"] isEqualToString: @"H.264 (x264)"])
- {
- itemHeightForDisplay += rowHeightNonTitle * 2;
- }
- else if (![[queueItemToCheck objectForKey:@"VideoEncoder"] isEqualToString: @"VP3 (Theora)"])
- {
- itemHeightForDisplay += rowHeightNonTitle;
- }
- 
- /* check to see how many audio track lines to allow for */
-		unsigned int ourMaximumNumberOfAudioTracks = [HBController maximumNumberOfAllowedAudioTracks];
-		int actualCountOfAudioTracks = 0;
- BOOL autoPassthruPresent = NO;
-		for (unsigned int i = 1; i <= ourMaximumNumberOfAudioTracks; i++) {
-			if (0 < [[queueItemToCheck objectForKey: [NSString stringWithFormat: @"Audio%dTrack", i]] intValue])
- {
-				actualCountOfAudioTracks++;
-			}
- if (HB_ACODEC_AUTO_PASS == [[queueItemToCheck objectForKey: [NSString stringWithFormat: @"JobAudio%dEncoder", i]] intValue])
- {
- autoPassthruPresent = YES;
- }
-		}
-		itemHeightForDisplay += (actualCountOfAudioTracks * rowHeightNonTitle * 2);
- 
- if (autoPassthruPresent == YES)
- {
- itemHeightForDisplay += rowHeightNonTitle * 2;
- }
- 
- /* add in subtitle lines for each subtitle in the SubtitleList array */
- itemHeightForDisplay += rowHeightNonTitle * [[queueItemToCheck objectForKey:@"SubtitleList"] count];
- 
- return itemHeightForDisplay;
+ // See how tall it naturally would want to be if given a restricted with, but unbound height
+ NSRect constrainedBounds = NSMakeRect(0, 0, [tableColumnToWrap width], CGFLOAT_MAX);
+ NSSize naturalSize = [cell cellSizeForBounds:constrainedBounds];
 
+ // Make sure we have a minimum height -- use the table's set height as the minimum.
+ if (naturalSize.height > [outlineView rowHeight])
+ return naturalSize.height;
+ else
+ return [outlineView rowHeight];
 }
 else
 {
@@ -894,112 +768,72 @@
 }
 }
 
-- (CGFloat) heightOfDescriptionForWidth:(CGFloat)width
+- (void)initStyles
 {
- // Try to return the cached value if no changes have happened since the last time
- //if ((width == fLastDescriptionWidth) && (fLastDescriptionHeight != 0) && !fNeedsDescription)
- // return fLastDescriptionHeight;
-
- //if (fNeedsDescription)
- // [self updateDescription];
-
- // Calculate the height
- //NSRect bounds = [fDescription boundingRectWithSize:NSMakeSize(width, 10000) options:NSStringDrawingUsesLineFragmentOrigin];
- //fLastDescriptionHeight = bounds.size.height + 6.0; // add some border to bottom
- //fLastDescriptionWidth = width;
- return HB_ROW_HEIGHT_FULL_DESCRIPTION;
-
-/* supposedly another way to do this, in case boundingRectWithSize isn't working
- NSTextView* tmpView = [[NSTextView alloc] initWithFrame:NSMakeRect(0, 0, width, 1)];
- [[tmpView textStorage] setAttributedString:aString];
- [tmpView setHorizontallyResizable:NO];
- [tmpView setVerticallyResizable:YES];
-// [[tmpView textContainer] setHeightTracksTextView: YES];
-// [[tmpView textContainer] setContainerSize: NSMakeSize(width, 10000)];
- [tmpView sizeToFit];
- float height = [tmpView frame].size.height;
- [tmpView release];
- return height;
-*/
-}
+ // Attributes
+ ps = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] retain];
+ [ps setHeadIndent: 40.0];
+ [ps setParagraphSpacing: 1.0];
+ [ps setTabStops:@[]]; // clear all tabs
+ [ps addTabStop: [[[NSTextTab alloc] initWithType: NSLeftTabStopType location: 20.0] autorelease]];
 
-- (CGFloat) lastDescriptionHeight
-{
- return HB_ROW_HEIGHT_FULL_DESCRIPTION;
+ detailAttr = [@{NSFontAttributeName: [NSFont systemFontOfSize:10.0],
+ NSParagraphStyleAttributeName: ps} retain];
+
+ detailBoldAttr = [@{NSFontAttributeName: [NSFont boldSystemFontOfSize:10.0],
+ NSParagraphStyleAttributeName: ps} retain];
+
+ titleAttr = [@{NSFontAttributeName: [NSFont systemFontOfSize:[NSFont systemFontSize]],
+ NSParagraphStyleAttributeName: ps} retain];
+
+ shortHeightAttr = [@{NSFontAttributeName: [NSFont systemFontOfSize:2.0]} retain];
 }
 
 - (id)outlineView:(NSOutlineView *)fOutlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
 {
 if ([[tableColumn identifier] isEqualToString:@"desc"])
 {
- 
- 
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 /* Below should be put into a separate method but I am way too f'ing lazy right now */
- NSMutableAttributedString * finalString = [[[NSMutableAttributedString alloc] initWithString: @""] autorelease];
- // Attributes
- NSMutableParagraphStyle * ps = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] retain];
- [ps setHeadIndent: 40.0];
- [ps setParagraphSpacing: 1.0];
- [ps setTabStops:[NSArray array]]; // clear all tabs
- [ps addTabStop: [[[NSTextTab alloc] initWithType: NSLeftTabStopType location: 20.0] autorelease]];
- 
- 
- NSDictionary* detailAttr = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSFont systemFontOfSize:10.0], NSFontAttributeName,
- ps, NSParagraphStyleAttributeName,
- nil];
- 
- NSDictionary* detailBoldAttr = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSFont boldSystemFontOfSize:10.0], NSFontAttributeName,
- ps, NSParagraphStyleAttributeName,
- nil];
- 
- NSDictionary* titleAttr = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSFont systemFontOfSize:[NSFont systemFontSize]], NSFontAttributeName,
- ps, NSParagraphStyleAttributeName,
- nil];
- 
- NSDictionary* shortHeightAttr = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSFont systemFontOfSize:2.0], NSFontAttributeName,
- nil];
+ NSMutableAttributedString * finalString = [[NSMutableAttributedString alloc] initWithString: @""];
 
 /* First line, we should strip the destination path and just show the file name and add the title num and chapters (if any) */
 NSString * summaryInfo;
 
- NSString * titleString = [NSString stringWithFormat:@"Title %d", [[item objectForKey:@"TitleNumber"] intValue]];
+ NSString * titleString = [NSString stringWithFormat:@"Title %d", [item[@"TitleNumber"] intValue]];
 
 NSString * startStopString = @"";
- if ([[item objectForKey:@"fEncodeStartStop"] intValue] == 0)
+ if ([item[@"fEncodeStartStop"] intValue] == 0)
 {
 /* Start Stop is chapters */
- startStopString = ([[item objectForKey:@"ChapterStart"] intValue] == [[item objectForKey:@"ChapterEnd"] intValue]) ?
- [NSString stringWithFormat:@"Chapter %d", [[item objectForKey:@"ChapterStart"] intValue]] :
- [NSString stringWithFormat:@"Chapters %d through %d", [[item objectForKey:@"ChapterStart"] intValue], [[item objectForKey:@"ChapterEnd"] intValue]];
+ startStopString = ([item[@"ChapterStart"] intValue] == [item[@"ChapterEnd"] intValue]) ?
+ [NSString stringWithFormat:@"Chapter %d", [item[@"ChapterStart"] intValue]] :
+ [NSString stringWithFormat:@"Chapters %d through %d", [item[@"ChapterStart"] intValue], [item[@"ChapterEnd"] intValue]];
 }
- else if ([[item objectForKey:@"fEncodeStartStop"] intValue] == 1)
+ else if ([item[@"fEncodeStartStop"] intValue] == 1)
 {
 /* Start Stop is seconds */
- startStopString = [NSString stringWithFormat:@"Seconds %d through %d", [[item objectForKey:@"StartSeconds"] intValue], [[item objectForKey:@"StartSeconds"] intValue] + [[item objectForKey:@"StopSeconds"] intValue]];
+ startStopString = [NSString stringWithFormat:@"Seconds %d through %d", [item[@"StartSeconds"] intValue], [item[@"StartSeconds"] intValue] + [item[@"StopSeconds"] intValue]];
 }
- else if ([[item objectForKey:@"fEncodeStartStop"] intValue] == 2)
+ else if ([item[@"fEncodeStartStop"] intValue] == 2)
 {
 /* Start Stop is Frames */
- startStopString = [NSString stringWithFormat:@"Frames %d through %d", [[item objectForKey:@"StartFrame"] intValue], [[item objectForKey:@"StartFrame"] intValue] + [[item objectForKey:@"StopFrame"] intValue]];
+ startStopString = [NSString stringWithFormat:@"Frames %d through %d", [item[@"StartFrame"] intValue], [item[@"StartFrame"] intValue] + [item[@"StopFrame"] intValue]];
 }
 
 NSString * passesString = @"";
 /* check to see if our first subtitle track is Foreign Language Search, in which case there is an in depth scan */
- if ([item objectForKey:@"SubtitleList"] && [[[[item objectForKey:@"SubtitleList"] objectAtIndex:0] objectForKey:@"subtitleSourceTrackNum"] intValue] == 1)
+ if ([item[@"SubtitleList"] count] && [item[@"SubtitleList"][0][@"keySubTrackIndex"] intValue] == -1)
 {
 passesString = [passesString stringByAppendingString:@"1 Foreign Language Search Pass - "];
 }
- if ([[item objectForKey:@"VideoTwoPass"] intValue] == 0)
+ if ([item[@"VideoTwoPass"] intValue] == 0)
 {
 passesString = [passesString stringByAppendingString:@"1 Video Pass"];
 }
 else
 {
- if ([[item objectForKey:@"VideoTurboTwoPass"] intValue] == 1)
+ if ([item[@"VideoTurboTwoPass"] intValue] == 1)
 {
 passesString = [passesString stringByAppendingString:@"2 Video Passes First Turbo"];
 }
@@ -1009,10 +843,10 @@
 }
 }
 
- [finalString appendString:[NSString stringWithFormat:@"%@", [item objectForKey:@"SourceName"]] withAttributes:titleAttr];
+ [finalString appendString:[NSString stringWithFormat:@"%@", item[@"SourceName"]] withAttributes:titleAttr];
 
 /* lets add the output file name to the title string here */
- NSString * outputFilenameString = [[item objectForKey:@"DestinationPath"] lastPathComponent];
+ NSString * outputFilenameString = [item[@"DestinationPath"] lastPathComponent];
 
 summaryInfo = [NSString stringWithFormat: @" (%@, %@, %@) -> %@", titleString, startStopString, passesString, outputFilenameString];
 
@@ -1024,60 +858,52 @@
 
 /* Second Line (Preset Name)*/
 [finalString appendString: @"Preset: " withAttributes:detailBoldAttr];
- [finalString appendString:[NSString stringWithFormat:@"%@\n", [item objectForKey:@"PresetName"]] withAttributes:detailAttr];
+ [finalString appendString:[NSString stringWithFormat:@"%@\n", item[@"PresetName"]] withAttributes:detailAttr];
 
 /* Third Line (Format Summary) */
 NSString * audioCodecSummary = @"";	//	This seems to be set by the last track we have available...
 /* Lets also get our audio track detail since we are going through the logic for use later */
-		unsigned int ourMaximumNumberOfAudioTracks = [HBController maximumNumberOfAllowedAudioTracks];
-		NSMutableArray *audioDetails = [NSMutableArray arrayWithCapacity: ourMaximumNumberOfAudioTracks];
-		NSString *base;
-		NSString *detailString;
-		NSNumber *drc;
- NSNumber *gain;
+
+		NSMutableArray *audioDetails = [NSMutableArray arrayWithCapacity: [item[@"AudioList"] count]];
 BOOL autoPassthruPresent = NO;
-		for (unsigned int i = 1; i <= ourMaximumNumberOfAudioTracks; i++) {
-			base = [NSString stringWithFormat: @"Audio%d", i];
-			if (0 < [[item objectForKey: [base stringByAppendingString: @"Track"]] intValue])
+
+ for (NSDictionary *audioTrack in item[@"AudioList"])
+ {
+ audioCodecSummary = [NSString stringWithFormat: @"%@", audioTrack[@"Encoder"]];
+ NSNumber *drc = audioTrack[@"TrackDRCSlider"];
+ NSNumber *gain = audioTrack[@"TrackGainSlider"];
+ NSString *detailString = [NSString stringWithFormat: @"%@ Encoder: %@ Mixdown: %@ SampleRate: %@(khz) Bitrate: %@(kbps), DRC: %@, Gain: %@",
+ audioTrack[@"TrackDescription"],
+ audioTrack[@"Encoder"],
+ audioTrack[@"Mixdown"],
+ audioTrack[@"Samplerate"],
+ audioTrack[@"Bitrate"],
+ (0.0 < [drc floatValue]) ? (NSObject *)drc : (NSObject *)@"Off",
+ (0.0 != [gain floatValue]) ? (NSObject *)gain : (NSObject *)@"Off"
+ ];
+ [audioDetails addObject: detailString];
+ // check if we have an Auto Passthru output track
+ if ([audioTrack[@"Encoder"] isEqualToString: @"Auto Passthru"])
 {
-				audioCodecSummary = [NSString stringWithFormat: @"%@", [item objectForKey: [base stringByAppendingString: @"Encoder"]]];
-				drc = [item objectForKey: [base stringByAppendingString: @"TrackDRCSlider"]];
- gain = [item objectForKey: [base stringByAppendingString: @"TrackGainSlider"]];
-				detailString = [NSString stringWithFormat: @"%@ Encoder: %@ Mixdown: %@ SampleRate: %@(khz) Bitrate: %@(kbps), DRC: %@, Gain: %@",
-								[item objectForKey: [base stringByAppendingString: @"TrackDescription"]],
-								[item objectForKey: [base stringByAppendingString: @"Encoder"]],
-								[item objectForKey: [base stringByAppendingString: @"Mixdown"]],
-								[item objectForKey: [base stringByAppendingString: @"Samplerate"]],
-								[item objectForKey: [base stringByAppendingString: @"Bitrate"]],
- (0.0 < [drc floatValue]) ? (NSObject *)drc : (NSObject *)@"Off",
-								(0.0 != [gain floatValue]) ? (NSObject *)gain : (NSObject *)@"Off"
-								]
- ;
-				[audioDetails addObject: detailString];
- // check if we have an Auto Passthru output track
- if ([[item objectForKey: [NSString stringWithFormat: @"Audio%dEncoder", i]] isEqualToString: @"Auto Passthru"])
- {
- autoPassthruPresent = YES;
- }
-			}
-		}
- 
- 
+ autoPassthruPresent = YES;
+ }
+ }
+
 NSString * jobFormatInfo;
- if ([[item objectForKey:@"ChapterMarkers"] intValue] == 1)
- jobFormatInfo = [NSString stringWithFormat:@"%@ Container, %@ Video %@ Audio, Chapter Markers\n", [item objectForKey:@"FileFormat"], [item objectForKey:@"VideoEncoder"], audioCodecSummary];
+ if ([item[@"ChapterMarkers"] intValue] == 1)
+ jobFormatInfo = [NSString stringWithFormat:@"%@ Container, %@ Video %@ Audio, Chapter Markers\n", item[@"FileFormat"], item[@"VideoEncoder"], audioCodecSummary];
 else
- jobFormatInfo = [NSString stringWithFormat:@"%@ Container, %@ Video %@ Audio\n", [item objectForKey:@"FileFormat"], [item objectForKey:@"VideoEncoder"], audioCodecSummary];
+ jobFormatInfo = [NSString stringWithFormat:@"%@ Container, %@ Video %@ Audio\n", item[@"FileFormat"], item[@"VideoEncoder"], audioCodecSummary];
 
 
 [finalString appendString: @"Format: " withAttributes:detailBoldAttr];
 [finalString appendString: jobFormatInfo withAttributes:detailAttr];
 
 /* Optional String for muxer options */
- if ([[item objectForKey:@"MuxerOptionsSummary"] length])
+ if ([item[@"MuxerOptionsSummary"] length])
 {
 NSString *containerOptions = [NSString stringWithFormat:@"%@",
- [item objectForKey:@"MuxerOptionsSummary"]];
+ item[@"MuxerOptionsSummary"]];
 [finalString appendString:@"Container Options: " withAttributes:detailBoldAttr];
 [finalString appendString:containerOptions withAttributes:detailAttr];
 [finalString appendString:@"\n" withAttributes:detailAttr];
@@ -1085,13 +911,13 @@
 
 /* Fourth Line (Destination Path)*/
 [finalString appendString: @"Destination: " withAttributes:detailBoldAttr];
- [finalString appendString: [item objectForKey:@"DestinationPath"] withAttributes:detailAttr];
+ [finalString appendString: item[@"DestinationPath"] withAttributes:detailAttr];
 [finalString appendString:@"\n" withAttributes:detailAttr];
 
 /* Fifth Line Picture Details*/
 NSString *pictureInfo = [NSString stringWithFormat:@"%@",
- [item objectForKey:@"PictureSettingsSummary"]];
- if ([[item objectForKey:@"PictureKeepRatio"] intValue] == 1)
+ item[@"PictureSettingsSummary"]];
+ if ([item[@"PictureKeepRatio"] intValue] == 1)
 {
 pictureInfo = [pictureInfo stringByAppendingString:@" Keep Aspect Ratio"];
 }
@@ -1100,10 +926,10 @@
 [finalString appendString:@"\n" withAttributes:detailAttr];
 
 /* Optional String for Picture Filters */
- if ([[item objectForKey:@"PictureFiltersSummary"] length])
+ if ([item[@"PictureFiltersSummary"] length])
 {
 NSString *pictureFilters = [NSString stringWithFormat:@"%@",
- [item objectForKey:@"PictureFiltersSummary"]];
+ item[@"PictureFiltersSummary"]];
 [finalString appendString:@"Filters: " withAttributes:detailBoldAttr];
 [finalString appendString:pictureFilters withAttributes:detailAttr];
 [finalString appendString:@"\n" withAttributes:detailAttr];
@@ -1111,12 +937,12 @@
 
 /* Sixth Line Video Details*/
 NSString * videoInfo;
- videoInfo = [NSString stringWithFormat:@"Encoder: %@", [item objectForKey:@"VideoEncoder"]];
+ videoInfo = [NSString stringWithFormat:@"Encoder: %@", item[@"VideoEncoder"]];
 
 /* for framerate look to see if we are using vfr detelecine */
- if ([[item objectForKey:@"JobIndexVideoFramerate"] intValue] == 0)
+ if ([item[@"JobIndexVideoFramerate"] intValue] == 0)
 {
- if ([[item objectForKey:@"VideoFramerateMode"] isEqualToString:@"vfr"])
+ if ([item[@"VideoFramerateMode"] isEqualToString:@"vfr"])
 {
 /* we are using same as source with vfr detelecine */
 videoInfo = [NSString stringWithFormat:@"%@ Framerate: Same as source (Variable Frame Rate)", videoInfo];
@@ -1130,101 +956,96 @@
 else
 {
 /* we have a specified, constant framerate */
- if ([[item objectForKey:@"VideoFramerateMode"] isEqualToString:@"pfr"])
+ if ([item[@"VideoFramerateMode"] isEqualToString:@"pfr"])
 {
- videoInfo = [NSString stringWithFormat:@"%@ Framerate: %@ (Peak Frame Rate)", videoInfo ,[item objectForKey:@"VideoFramerate"]];
+ videoInfo = [NSString stringWithFormat:@"%@ Framerate: %@ (Peak Frame Rate)", videoInfo ,item[@"VideoFramerate"]];
 }
 else
 {
- videoInfo = [NSString stringWithFormat:@"%@ Framerate: %@ (Constant Frame Rate)", videoInfo ,[item objectForKey:@"VideoFramerate"]];
+ videoInfo = [NSString stringWithFormat:@"%@ Framerate: %@ (Constant Frame Rate)", videoInfo ,item[@"VideoFramerate"]];
 }
 }
 
- if ([[item objectForKey:@"VideoQualityType"] intValue] == 0)// Target Size MB
+ if ([item[@"VideoQualityType"] intValue] == 0)// Target Size MB
 {
- videoInfo = [NSString stringWithFormat:@"%@ Target Size: %@(MB) (%d(kbps) abr)", videoInfo ,[item objectForKey:@"VideoTargetSize"],[[item objectForKey:@"VideoAvgBitrate"] intValue]];
+ videoInfo = [NSString stringWithFormat:@"%@ Target Size: %@(MB) (%d(kbps) abr)", videoInfo ,item[@"VideoTargetSize"],[item[@"VideoAvgBitrate"] intValue]];
 }
- else if ([[item objectForKey:@"VideoQualityType"] intValue] == 1) // ABR
+ else if ([item[@"VideoQualityType"] intValue] == 1) // ABR
 {
- videoInfo = [NSString stringWithFormat:@"%@ Bitrate: %d(kbps)", videoInfo ,[[item objectForKey:@"VideoAvgBitrate"] intValue]];
+ videoInfo = [NSString stringWithFormat:@"%@ Bitrate: %d(kbps)", videoInfo ,[item[@"VideoAvgBitrate"] intValue]];
 }
 else // CRF
 {
- videoInfo = [NSString stringWithFormat:@"%@ Constant Quality: %.2f", videoInfo ,[[item objectForKey:@"VideoQualitySlider"] floatValue]];
+ videoInfo = [NSString stringWithFormat:@"%@ Constant Quality: %.2f", videoInfo ,[item[@"VideoQualitySlider"] floatValue]];
 }
 
 [finalString appendString: @"Video: " withAttributes:detailBoldAttr];
 [finalString appendString: videoInfo withAttributes:detailAttr];
 [finalString appendString:@"\n" withAttributes:detailAttr];
 
- if ([[item objectForKey:@"VideoEncoder"] isEqualToString: @"H.264 (x264)"])
+ if ([item[@"VideoEncoder"] isEqualToString: @"H.264 (x264)"] || [item[@"VideoEncoder"] isEqualToString: @"H.265 (x265)"])
 {
- /* we are using x264 */
- NSString *x264Info = @"";
- if ([[item objectForKey:@"x264UseAdvancedOptions"] intValue])
+ /* we are using x264/x265 */
+ NSString *encoderPresetInfo = @"";
+ if ([item[@"x264UseAdvancedOptions"] intValue])
 {
 // we are using the old advanced panel
- if ([item objectForKey:@"x264Option"] &&
- [[item objectForKey:@"x264Option"] length])
+ if (item[@"x264Option"] &&
+ [item[@"x264Option"] length])
 {
- x264Info = [x264Info stringByAppendingString: [item objectForKey:@"x264Option"]];
+ encoderPresetInfo = [encoderPresetInfo stringByAppendingString: item[@"x264Option"]];
 }
 else
 {
- x264Info = [x264Info stringByAppendingString: @"default settings"];
+ encoderPresetInfo = [encoderPresetInfo stringByAppendingString: @"default settings"];
 }
 }
 else
 {
 // we are using the x264 system
- x264Info = [x264Info stringByAppendingString: [NSString stringWithFormat:@"Preset: %@", [item objectForKey:@"x264Preset"]]];
- if ([[item objectForKey:@"x264Tune"] length])
+ encoderPresetInfo = [encoderPresetInfo stringByAppendingString: [NSString stringWithFormat:@"Preset: %@", item[@"VideoPreset"]]];
+ if ([item[@"VideoTune"] length])
 {
- x264Info = [x264Info stringByAppendingString: [NSString stringWithFormat:@" - Tune: %@", [item objectForKey:@"x264Tune"]]];
+ encoderPresetInfo = [encoderPresetInfo stringByAppendingString: [NSString stringWithFormat:@" - Tune: %@", item[@"VideoTune"]]];
 }
- if ([[item objectForKey:@"x264OptionExtra"] length])
+ if ([item[@"VideoOptionExtra"] length])
 {
- x264Info = [x264Info stringByAppendingString: [NSString stringWithFormat:@" - Options: %@", [item objectForKey:@"x264OptionExtra"]]];
+ encoderPresetInfo = [encoderPresetInfo stringByAppendingString: [NSString stringWithFormat:@" - Options: %@", item[@"VideoOptionExtra"]]];
 }
- if ([[item objectForKey:@"h264Profile"] length])
+ if ([item[@"VideoProfile"] length])
 {
- x264Info = [x264Info stringByAppendingString: [NSString stringWithFormat:@" - Profile: %@", [item objectForKey:@"h264Profile"]]];
+ encoderPresetInfo = [encoderPresetInfo stringByAppendingString: [NSString stringWithFormat:@" - Profile: %@", item[@"VideoProfile"]]];
 }
- if ([[item objectForKey:@"h264Level"] length])
+ if ([item[@"VideoLevel"] length])
 {
- x264Info = [x264Info stringByAppendingString: [NSString stringWithFormat:@" - Level: %@", [item objectForKey:@"h264Level"]]];
+ encoderPresetInfo = [encoderPresetInfo stringByAppendingString: [NSString stringWithFormat:@" - Level: %@", item[@"VideoLevel"]]];
 }
 }
- [finalString appendString: @"x264: " withAttributes:detailBoldAttr];
- [finalString appendString: x264Info withAttributes:detailAttr];
+ [finalString appendString: @"Encoder Options: " withAttributes:detailBoldAttr];
+ [finalString appendString: encoderPresetInfo withAttributes:detailAttr];
 [finalString appendString:@"\n" withAttributes:detailAttr];
 }
- else if (![[item objectForKey:@"VideoEncoder"] isEqualToString: @"VP3 (Theora)"])
+ else if (![item[@"VideoEncoder"] isEqualToString: @"VP3 (Theora)"])
 {
 /* we are using libavcodec */
 NSString *lavcInfo = @"";
- if ([item objectForKey:@"lavcOption"] &&
- [[item objectForKey:@"lavcOption"] length])
+ if (item[@"VideoOptionExtra"] &&
+ [item[@"VideoOptionExtra"] length])
 {
- lavcInfo = [lavcInfo stringByAppendingString: [item objectForKey:@"lavcOption"]];
+ lavcInfo = [lavcInfo stringByAppendingString: item[@"VideoOptionExtra"]];
 }
 else
 {
 lavcInfo = [lavcInfo stringByAppendingString: @"default settings"];
 }
- [finalString appendString: @"ffmpeg: " withAttributes:detailBoldAttr];
+ [finalString appendString: @"Encoder Options: " withAttributes:detailBoldAttr];
 [finalString appendString: lavcInfo withAttributes:detailAttr];
 [finalString appendString:@"\n" withAttributes:detailAttr];
 }
- 
- 
- 
- 
+
 /* Seventh Line Audio Details*/
- NSEnumerator *audioDetailEnumerator = [audioDetails objectEnumerator];
-		NSString *anAudioDetail;
 		int audioDetailCount = 0;
-		while (nil != (anAudioDetail = [audioDetailEnumerator nextObject])) {
+		for (NSString *anAudioDetail in audioDetails) {
 			audioDetailCount++;
 			if (0 < [anAudioDetail length]) {
 				[finalString appendString: [NSString stringWithFormat: @"Audio Track %d ", audioDetailCount] withAttributes: detailBoldAttr];
@@ -1232,18 +1053,19 @@
 				[finalString appendString: @"\n" withAttributes: detailAttr];
 			}
 		}
- 
+
 /* Eigth Line Auto Passthru Details */
 // only print Auto Passthru settings if we have an Auro Passthru output track
 if (autoPassthruPresent == YES)
 {
 NSString *autoPassthruFallback = @"", *autoPassthruCodecs = @"";
- autoPassthruFallback = [autoPassthruFallback stringByAppendingString: [item objectForKey: @"AudioEncoderFallback"]];
- if (0 < [[item objectForKey: @"AudioAllowAACPass"] intValue])
+ NSDictionary *audioDefaults = item[@"AudioDefaults"];
+ autoPassthruFallback = [autoPassthruFallback stringByAppendingString: audioDefaults[@"AudioEncoderFallback"]];
+ if (0 < [audioDefaults[@"AudioAllowAACPass"] intValue])
 {
 autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString: @"AAC"];
 }
- if (0 < [[item objectForKey: @"AudioAllowAC3Pass"] intValue])
+ if (0 < [audioDefaults[@"AudioAllowAC3Pass"] intValue])
 {
 if (0 < [autoPassthruCodecs length])
 {
@@ -1251,7 +1073,7 @@
 }
 autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString: @"AC3"];
 }
- if (0 < [[item objectForKey: @"AudioAllowDTSHDPass"] intValue])
+ if (0 < [audioDefaults[@"AudioAllowDTSHDPass"] intValue])
 {
 if (0 < [autoPassthruCodecs length])
 {
@@ -1259,7 +1081,7 @@
 }
 autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString: @"DTS-HD"];
 }
- if (0 < [[item objectForKey: @"AudioAllowDTSPass"] intValue])
+ if (0 < [audioDefaults[@"AudioAllowDTSPass"] intValue])
 {
 if (0 < [autoPassthruCodecs length])
 {
@@ -1267,7 +1089,7 @@
 }
 autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString: @"DTS"];
 }
- if (0 < [[item objectForKey: @"AudioAllowMP3Pass"] intValue])
+ if (0 < [audioDefaults[@"AudioAllowMP3Pass"] intValue])
 {
 if (0 < [autoPassthruCodecs length])
 {
@@ -1291,50 +1113,41 @@
 }
 
 /* Ninth Line Subtitle Details */
- 
- int i = 0;
- NSEnumerator *enumerator = [[item objectForKey:@"SubtitleList"] objectEnumerator];
- id tempObject;
- while (tempObject = [enumerator nextObject])
+ for (id tempObject in item[@"SubtitleList"])
 {
- /* since the subtitleSourceTrackNum 0 is "None" in our array of the subtitle popups,
- * we want to ignore it for display as well as encoding.
- */
- if ([[tempObject objectForKey:@"subtitleSourceTrackNum"] intValue] > 0)
- { 
- /* remember that index 0 of Subtitles can contain "Foreign Audio Search*/
- [finalString appendString: @"Subtitle: " withAttributes:detailBoldAttr];
- [finalString appendString: [tempObject objectForKey:@"subtitleSourceTrackName"] withAttributes:detailAttr];
- if ([[tempObject objectForKey:@"subtitleTrackForced"] intValue] == 1)
- {
- [finalString appendString: @" - Forced Only" withAttributes:detailAttr];
- }
- if ([[tempObject objectForKey:@"subtitleTrackBurned"] intValue] == 1)
- {
- [finalString appendString: @" - Burned In" withAttributes:detailAttr];
- }
- if ([[tempObject objectForKey:@"subtitleTrackDefault"] intValue] == 1)
- {
- [finalString appendString: @" - Default" withAttributes:detailAttr];
- }
- [finalString appendString:@"\n" withAttributes:detailAttr];
+ /* remember that index 0 of Subtitles can contain "Foreign Audio Search*/
+ [finalString appendString: @"Subtitle: " withAttributes:detailBoldAttr];
+ [finalString appendString: tempObject[@"keySubTrackName"] withAttributes:detailAttr];
+ if ([tempObject[@"keySubTrackForced"] intValue] == 1)
+ {
+ [finalString appendString: @" - Forced Only" withAttributes:detailAttr];
 }
- i++;
- } 
- 
- return finalString;
+ if ([tempObject[@"keySubTrackBurned"] intValue] == 1)
+ {
+ [finalString appendString: @" - Burned In" withAttributes:detailAttr];
+ }
+ if ([tempObject[@"keySubTrackDefault"] intValue] == 1)
+ {
+ [finalString appendString: @" - Default" withAttributes:detailAttr];
+ }
+ [finalString appendString:@"\n" withAttributes:detailAttr];
+ }
+
+ [pool release];
+
+ return [finalString autorelease];
 }
 else if ([[tableColumn identifier] isEqualToString:@"icon"])
 {
- if ([[item objectForKey:@"Status"] intValue] == 0)
+ if ([item[@"Status"] intValue] == 0)
 {
 return [NSImage imageNamed:@"EncodeComplete"];
 }
- else if ([[item objectForKey:@"Status"] intValue] == 1)
+ else if ([item[@"Status"] intValue] == 1)
 {
 return [NSImage imageNamed: [NSString stringWithFormat: @"EncodeWorking%d", fAnimationIndex]];
 }
- else if ([[item objectForKey:@"Status"] intValue] == 3)
+ else if ([item[@"Status"] intValue] == 3)
 {
 return [NSImage imageNamed:@"EncodeCanceled"];
 }
@@ -1354,8 +1167,6 @@
 {
 if ([[tableColumn identifier] isEqualToString:@"desc"])
 {
-
-
 // nb: The "desc" column is currently an HBImageAndTextCell. However, we are longer
 // using the image portion of the cell so we could switch back to a regular NSTextFieldCell.
 
@@ -1367,7 +1178,7 @@
 [cell setEnabled: YES];
 BOOL highlighted = [outlineView isRowSelected:[outlineView rowForItem: item]] && [[outlineView window] isKeyWindow] && ([[outlineView window] firstResponder] == outlineView);
 
- if ([[item objectForKey:@"Status"] intValue] == 0 || ([[item objectForKey:@"Status"] intValue] == 1 && [[item objectForKey:@"EncodingPID"] intValue] != pidNum))
+ if ([item[@"Status"] intValue] == 0 || ([item[@"Status"] intValue] == 1 && [item[@"EncodingPID"] intValue] != pidNum))
 {
 [cell setAction: @selector(revealSelectedQueueItem:)];
 if (highlighted)
@@ -1415,7 +1226,7 @@
 - (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pboard
 {
 // Dragging is only allowed of the pending items.
- if ([[[items objectAtIndex:0] objectForKey:@"Status"] integerValue] != 2) // 2 is pending
+ if ([items[0][@"Status"] integerValue] != 2) // 2 is pending
 {
 return NO;
 }
@@ -1425,7 +1236,7 @@
 fDraggedNodes = items;
 
 // Provide data for our custom type, and simple NSStrings.
- [pboard declareTypes:[NSArray arrayWithObjects: DragDropSimplePboardType, nil] owner:self];
+ [pboard declareTypes:@[DragDropSimplePboardType] owner:self];
 
 // the actual data doesn't matter since DragDropSimplePboardType drags aren't recognized by anyone but us!.
 [pboard setData:[NSData data] forType:DragDropSimplePboardType];
@@ -1480,5 +1291,4 @@
 return YES;
 }
 
-
 @end

HandBrake-0.10.0.tar.bz2/macosx/HBSubtitlesController.h Added

@@ -0,0 +1,41 @@
+/* $Id: HBSubtitles.h
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import <Cocoa/Cocoa.h>
+#import "HBViewValidation.h"
+
+extern NSString *keySubTrackName;
+extern NSString *keySubTrackIndex;
+extern NSString *keySubTrackLanguage;
+extern NSString *keySubTrackLanguageIsoCode;
+extern NSString *keySubTrackType;
+
+extern NSString *keySubTrackForced;
+extern NSString *keySubTrackBurned;
+extern NSString *keySubTrackDefault;
+
+extern NSString *keySubTrackSrtOffset;
+extern NSString *keySubTrackSrtFilePath;
+extern NSString *keySubTrackSrtCharCode;
+
+@class HBSubtitlesDefaults;
+
+/**
+ * HBSubtitlesController
+ * Responds to HBContainerChangedNotification and HBTitleChangedNotification notifications.
+ */
+@interface HBSubtitlesController : NSViewController <HBViewValidation>
+
+- (void)addTracksFromQueue:(NSArray *)queueSubtitleArray;
+
+- (void)applySettingsFromPreset:(NSDictionary *)preset;
+
+// Get the list of subtitles tracks
+@property (readonly, nonatomic, copy) NSArray *subtitles;
+
+@property (nonatomic, readonly) HBSubtitlesDefaults *settings;
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBSubtitlesController.m Added

@@ -0,0 +1,1005 @@
+/* $Id: HBSubtitles.m
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBSubtitlesController.h"
+#import "HBSubtitlesDefaultsController.h"
+#import "HBSubtitlesDefaults.h"
+
+#import "Controller.h"
+#include "hb.h"
+#include "lang.h"
+
+NSString *keySubTrackSelectionIndex = @"keySubTrackSelectionIndex";
+NSString *keySubTrackName = @"keySubTrackName";
+NSString *keySubTrackIndex = @"keySubTrackIndex";
+NSString *keySubTrackLanguage = @"keySubTrackLanguage";
+NSString *keySubTrackLanguageIsoCode = @"keySubTrackLanguageIsoCode";
+NSString *keySubTrackType = @"keySubTrackType";
+
+NSString *keySubTrackForced = @"keySubTrackForced";
+NSString *keySubTrackBurned = @"keySubTrackBurned";
+NSString *keySubTrackDefault = @"keySubTrackDefault";
+
+NSString *keySubTrackSrtOffset = @"keySubTrackSrtOffset";
+NSString *keySubTrackSrtFilePath = @"keySubTrackSrtFilePath";
+NSString *keySubTrackSrtCharCode = @"keySubTrackSrtCharCode";
+NSString *keySubTrackSrtCharCodeIndex = @"keySubTrackSrtCharCodeIndex";
+NSString *keySubTrackLanguageIndex = @"keySubTrackLanguageIndex";
+
+#define CHAR_CODE_DEFAULT_INDEX 11
+
+@interface HBSubtitlesController () <NSTableViewDataSource, NSTableViewDelegate>
+
+// IBOutles
+@property (assign) IBOutlet NSTableView *fTableView;
+
+@property (assign) IBOutlet NSPopUpButton *trackPopUp;
+@property (assign) IBOutlet NSButton *configureDefaults;
+@property (assign) IBOutlet NSButton *reloadDefaults;
+
+@property (nonatomic, readwrite) BOOL enabled;
+
+// Subtitles arrays
+@property (nonatomic, readonly) NSMutableArray *subtitleArray;
+@property (nonatomic, readonly) NSMutableArray *subtitleSourceArray;
+
+@property (nonatomic, readwrite, retain) NSString *foreignAudioSearchTrackName;
+@property (nonatomic, readwrite) int container;
+
+// Defaults
+@property (nonatomic, readwrite, retain) HBSubtitlesDefaultsController *defaultsController;
+@property (nonatomic, readwrite, retain) HBSubtitlesDefaults *settings;
+
+// Table view cells models
+@property (nonatomic, readonly) NSArray *charCodeArray;
+@property (nonatomic, readwrite) BOOL foreignAudioSearchSelected;
+
+@property (nonatomic, readonly) NSArray *languagesArray;
+@property (nonatomic, readonly) NSInteger languagesArrayDefIndex;
+
+// Cached table view's cells
+@property (nonatomic, readonly) NSPopUpButtonCell *languagesCell;
+@property (nonatomic, readonly) NSPopUpButtonCell *encodingsCell;
+
+@end
+
+@implementation HBSubtitlesController
+
+- (instancetype)init
+{
+ self = [super initWithNibName:@"Subtitles" bundle:nil];
+ if (self)
+ {
+ _subtitleSourceArray = [[NSMutableArray alloc] init];
+ _subtitleArray = [[NSMutableArray alloc] init];
+ _languagesArray = [[self populateLanguageArray] retain];
+
+ // populate the charCodeArray.
+ _charCodeArray = [@[@"ANSI_X3.4-1968", @"ANSI_X3.4-1986", @"ANSI_X3.4", @"ANSI_X3.110-1983", @"ANSI_X3.110", @"ASCII",
+ @"ECMA-114", @"ECMA-118", @"ECMA-128", @"ECMA-CYRILLIC", @"IEC_P27-1", @"ISO-8859-1", @"ISO-8859-2",
+ @"ISO-8859-3", @"ISO-8859-4", @"ISO-8859-5", @"ISO-8859-6", @"ISO-8859-7", @"ISO-8859-8", @"ISO-8859-9",
+ @"ISO-8859-9E", @"ISO-8859-10", @"ISO-8859-11", @"ISO-8859-13", @"ISO-8859-14", @"ISO-8859-15", @"ISO-8859-16",
+ @"UTF-7", @"UTF-8", @"UTF-16", @"UTF-16LE", @"UTF-16BE", @"UTF-32", @"UTF-32LE", @"UTF-32BE"] retain];
+
+ // Register as observer for the HBController notifications.
+ [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(containerChanged:) name: HBContainerChangedNotification object: nil];
+ [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(titleChanged:) name: HBTitleChangedNotification object: nil];
+ }
+
+ return self;
+}
+
+- (void)setUIEnabled:(BOOL)flag
+{
+ [self.trackPopUp setEnabled:flag];
+ [self.configureDefaults setEnabled:flag];
+ [self.reloadDefaults setEnabled:flag];
+ [self.fTableView setEnabled:flag];
+ self.enabled = flag;
+}
+
+- (void)titleChanged:(NSNotification *)aNotification
+{
+ NSDictionary *notDict = [aNotification userInfo];
+ NSData *theData = notDict[keyTitleTag];
+ hb_title_t *title = NULL;
+ [theData getBytes: &title length: sizeof(title)];
+
+ /* reset the subtitles arrays */
+ [self.subtitleArray removeAllObjects];
+ [self.subtitleSourceArray removeAllObjects];
+
+ if (title)
+ {
+ /* now populate the array with the source subtitle track info */
+ NSMutableArray *forcedSourceNamesArray = [[NSMutableArray alloc] init];
+ for (int i = 0; i < hb_list_count(title->list_subtitle); i++)
+ {
+ hb_subtitle_t *subtitle = (hb_subtitle_t *)hb_list_item(title->list_subtitle, i);
+
+ /* Human-readable representation of subtitle->source */
+ NSString *bitmapOrText = subtitle->format == PICTURESUB ? @"Bitmap" : @"Text";
+ NSString *subSourceName = @(hb_subsource_name(subtitle->source));
+
+ /* if the subtitle track can be forced, add its source name to the array */
+ if (hb_subtitle_can_force(subtitle->source) && [forcedSourceNamesArray containsObject:subSourceName] == NO)
+ {
+ [forcedSourceNamesArray addObject:subSourceName];
+ }
+
+ // Use the native language name if available
+ iso639_lang_t *language = lang_for_code2(subtitle->iso639_2);
+ NSString *nativeLanguage = strlen(language->native_name) ? @(language->native_name) : @(language->eng_name);
+
+ /* create a dictionary of source subtitle information to store in our array */
+ [self.subtitleSourceArray addObject:@{keySubTrackName: [NSString stringWithFormat:@"%d: %@ (%@) (%@)", i, nativeLanguage, bitmapOrText, subSourceName],
+ keySubTrackIndex: @(i),
+ keySubTrackType: @(subtitle->source),
+ keySubTrackLanguage: nativeLanguage,
+ keySubTrackLanguageIsoCode: @(subtitle->iso639_2)}];
+ }
+
+ /* now set the name of the Foreign Audio Search track */
+ if ([forcedSourceNamesArray count])
+ {
+ [forcedSourceNamesArray sortUsingComparator:^(id obj1, id obj2)
+ {
+ return [((NSString *)obj1) compare:((NSString *)obj2)];
+ }];
+
+ NSString *tempList = @"";
+ for (NSString *tempString in forcedSourceNamesArray)
+ {
+ if ([tempList length])
+ {
+ tempList = [tempList stringByAppendingString:@", "];
+ }
+ tempList = [tempList stringByAppendingString:tempString];
+ }
+ self.foreignAudioSearchTrackName = [NSString stringWithFormat:@"Foreign Audio Search (Bitmap) (%@)", tempList];
+ }
+ else
+ {
+ self.foreignAudioSearchTrackName = @"Foreign Audio Search (Bitmap)";
+ }
+ [forcedSourceNamesArray release];
+
+ // Append an empty track at the end
+ // to display a "None" row in the table view
+ [self.subtitleArray addObject:[self createSubtitleTrack]];
+ }
+
+ [self.fTableView reloadData]; 
+}
+
+- (void)containerChanged:(NSNotification *)aNotification
+{
+ NSDictionary *notDict = [aNotification userInfo];
+ self.container = [notDict[keyContainerTag] intValue];
+
+ [self validatePassthru];
+
+ [self.fTableView reloadData];
+}
+
+- (NSArray *)subtitles
+{
+ NSMutableArray *ret = [self.subtitleArray mutableCopy];
+ [ret removeLastObject];
+ return [ret autorelease];
+}
+
+- (void)addTracksFromQueue:(NSArray *)queueSubtitleArray
+{
+ /* Note: we need to look for external subtitles so it can be added to the source array track.
+ * Remember the source container subs are already loaded with resetTitle which is already called
+ * so any external sub sources need to be added to our source subs here
+ */
+ for (id tempObject in queueSubtitleArray)
+ {
+ /* We have an srt track */
+ if ([tempObject[keySubTrackType] intValue] == SRTSUB)
+ {
+ NSString *filePath = tempObject[keySubTrackSrtFilePath];
+ /* create a dictionary of source subtitle information to store in our array */
+ [self.subtitleSourceArray addObject:@{keySubTrackIndex: @(self.subtitleSourceArray.count + 1),
+ keySubTrackName: [filePath lastPathComponent],
+ keySubTrackType: @(SRTSUB),
+ keySubTrackSrtFilePath: filePath}];
+ }
+ }
+
+ // Set the subtitleArray to the newSubtitleArray
+ [self.subtitleArray setArray:queueSubtitleArray];
+ [self.subtitleArray addObject:[self createSubtitleTrack]];
+ [self.fTableView reloadData];
+}
+
+- (void)applySettingsFromPreset:(NSDictionary *)preset
+{
+ self.settings = [[[HBSubtitlesDefaults alloc] init] autorelease];
+ [self.settings applySettingsFromPreset:preset];
+
+ [self addTracksFromDefaults:self];
+}
+
+#pragma mark - Actions
+
+- (BOOL)validateUserInterfaceItem:(id < NSValidatedUserInterfaceItem >)anItem
+{
+ return self.enabled;
+}
+
+/**
+ * Add every subtitles track that still isn't in the subtitles array.
+ */
+- (IBAction)addAll:(id)sender
+{
+ [self.subtitleArray removeAllObjects];
+
+ // Add the foreign audio search pass
+ [self addTrack:[self trackFromSourceTrackIndex:-1]];
+
+ // Add the remainings tracks
+ for (NSDictionary *track in self.subtitleSourceArray)
+ {
+ NSInteger sourceIndex = [track[keySubTrackIndex] integerValue];
+ [self addTrack:[self trackFromSourceTrackIndex:sourceIndex]];
+ }
+
+ [self.subtitleArray addObject:[self createSubtitleTrack]];
+ [self validatePassthru];
+ [self.fTableView reloadData];
+}
+
+/**
+ * Remove all the subtitles tracks.
+ */
+- (IBAction)removeAll:(id)sender
+{
+ [self.subtitleArray removeAllObjects];
+ [self.subtitleArray addObject:[self createSubtitleTrack]];
+ [self.fTableView reloadData];
+}
+
+/**
+ * Remove all the subtitles tracks and
+ * add new ones based on the defaults settings
+ */
+- (IBAction)addTracksFromDefaults:(id)sender
+{
+ // Keeps a set of the indexes of the added track
+ // so we don't add the same track twice.
+ NSMutableIndexSet *tracksAdded = [NSMutableIndexSet indexSet];
+
+ [self.subtitleArray removeAllObjects];
+
+ // Add the foreign audio search pass
+ if (self.settings.addForeignAudioSearch)
+ {
+ [self addTrack:[self trackFromSourceTrackIndex:-1]];
+ }
+
+ // Add the tracks for the selected languages
+ if (self.settings.trackSelectionBehavior != HBSubtitleTrackSelectionBehaviorNone)
+ {
+ for (NSString *lang in self.settings.trackSelectionLanguages)
+ {
+ for (NSDictionary *track in self.subtitleSourceArray)
+ {
+ if ([lang isEqualToString:@"und"] || [track[keySubTrackLanguageIsoCode] isEqualToString:lang])
+ {
+ NSInteger sourceIndex = [track[keySubTrackIndex] intValue];
+
+ if (![tracksAdded containsIndex:sourceIndex])
+ {
+ [self addTrack:[self trackFromSourceTrackIndex:sourceIndex]];
+ }
+ [tracksAdded addIndex:sourceIndex];
+
+ if (self.settings.trackSelectionBehavior == HBSubtitleTrackSelectionBehaviorFirst)
+ {
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ // Add the closed captions track if there is one.
+ if (self.settings.addCC)
+ {
+ for (NSDictionary *track in self.subtitleSourceArray)
+ {
+ if ([track[keySubTrackType] intValue] == CC608SUB)
+ {
+ NSInteger sourceIndex = [track[keySubTrackIndex] intValue];
+ if (![tracksAdded containsIndex:sourceIndex])
+ {
+ [self addTrack:[self trackFromSourceTrackIndex:sourceIndex]];
+ }
+
+ if (self.settings.trackSelectionBehavior == HBSubtitleTrackSelectionBehaviorFirst)
+ {
+ break;
+ }
+ }
+ }
+ }
+
+ // Add an empty track
+ [self.subtitleArray addObject:[self createSubtitleTrack]];
+
+ [self validatePassthru];
+ [self.fTableView reloadData];
+}
+
+- (IBAction)showSettingsSheet:(id)sender
+{
+ self.defaultsController = [[[HBSubtitlesDefaultsController alloc] initWithSettings:self.settings] autorelease];
+
+	[NSApp beginSheet:[self.defaultsController window]
+ modalForWindow:[[self view] window]
+ modalDelegate:self
+ didEndSelector:@selector(sheetDidEnd)
+ contextInfo:NULL];
+}
+
+- (void)sheetDidEnd
+{
+ self.defaultsController = nil;
+}
+
+#pragma mark - Subtitles tracks creation and validation
+
+/**
+ * Convenience method to add a track to subtitlesArray.
+ * It calculates the keySubTrackSelectionIndex.
+ *
+ * @param track the track to add.
+ */
+- (void)addTrack:(NSMutableDictionary *)newTrack
+{
+ newTrack[keySubTrackSelectionIndex] = @([newTrack[keySubTrackIndex] integerValue] + 1 + (self.subtitleArray.count == 0));
+ [self.subtitleArray addObject:newTrack];
+}
+
+/**
+ * Creates a new subtitle track.
+ */
+- (NSMutableDictionary *)createSubtitleTrack
+{
+ NSMutableDictionary *newSubtitleTrack = [[NSMutableDictionary alloc] init];
+ newSubtitleTrack[keySubTrackIndex] = @0;
+ newSubtitleTrack[keySubTrackSelectionIndex] = @0;
+ newSubtitleTrack[keySubTrackName] = @"None";
+ newSubtitleTrack[keySubTrackForced] = @0;
+ newSubtitleTrack[keySubTrackBurned] = @0;
+ newSubtitleTrack[keySubTrackDefault] = @0;
+
+ return [newSubtitleTrack autorelease];
+}
+
+/**
+ * Creates a new track dictionary from a source track.
+ *
+ * @param index the index of the source track in the subtitlesSourceArray,
+ * -1 means a Foreign Audio Search pass.
+ *
+ * @return a new mutable track dictionary.
+ */
+- (NSMutableDictionary *)trackFromSourceTrackIndex:(NSInteger)index
+{
+ NSMutableDictionary *track = [self createSubtitleTrack];
+
+ if (index == -1)
+ {
+ /*
+ * we are foreign lang search, which is inherently bitmap
+ *
+ * since it can be either VOBSUB or PGS and the latter can't be
+ * passed through to MP4, we need to know whether there are any
+ * PGS tracks in the source - otherwise we can just set the
+ * source track type to VOBSUB
+ */
+ int subtitleTrackType = VOBSUB;
+ if ([self.foreignAudioSearchTrackName rangeOfString:@(hb_subsource_name(PGSSUB))].location != NSNotFound)
+ {
+ subtitleTrackType = PGSSUB;
+ }
+ // Use -1 to indicate the foreign lang search
+ track[keySubTrackIndex] = @(-1);
+ track[keySubTrackName] = self.foreignAudioSearchTrackName;
+ track[keySubTrackType] = @(subtitleTrackType);
+ // foreign lang search is most useful when combined w/Forced Only - make it default
+ track[keySubTrackForced] = @1;
+ }
+ else
+ {
+ NSDictionary *sourceTrack = self.subtitleSourceArray[index];
+
+ track[keySubTrackIndex] = @(index);
+ track[keySubTrackName] = sourceTrack[keySubTrackName];
+
+ /* check to see if we are an srt, in which case set our file path and source track type kvp's*/
+ if ([self.subtitleSourceArray[index][keySubTrackType] intValue] == SRTSUB)
+ {
+ track[keySubTrackType] = @(SRTSUB);
+ track[keySubTrackSrtFilePath] = sourceTrack[keySubTrackSrtFilePath];
+
+ track[keySubTrackLanguageIndex] = @(self.languagesArrayDefIndex);
+ track[keySubTrackLanguageIsoCode] = self.languagesArray[self.languagesArrayDefIndex][1];
+
+ track[keySubTrackSrtCharCodeIndex] = @(CHAR_CODE_DEFAULT_INDEX);
+ track[keySubTrackSrtCharCode] = self.charCodeArray[CHAR_CODE_DEFAULT_INDEX];
+ }
+ else
+ {
+ track[keySubTrackType] = sourceTrack[keySubTrackType];
+ }
+ }
+
+ if (!hb_subtitle_can_burn([track[keySubTrackType] intValue]))
+ {
+ /* the source track cannot be burned in, so uncheck the widget */
+ track[keySubTrackBurned] = @0;
+ }
+
+ if (!hb_subtitle_can_force([track[keySubTrackType] intValue]))
+ {
+ /* the source track does not support forced flags, so uncheck the widget */
+ track[keySubTrackForced] = @0;
+ }
+
+ return track;
+}
+
+/**
+ * Checks whether any subtitles in the list cannot be passed through.
+ * Set the first of any such subtitles to burned-in, remove the others.
+ */
+- (void)validatePassthru
+{
+ int subtitleTrackType;
+ BOOL convertToBurnInUsed = NO;
+ NSMutableArray *tracksToDelete = [[NSMutableArray alloc] init];
+
+ // convert any non-None incompatible tracks to burn-in or remove them
+ for (id tempObject in self.subtitleArray)
+ {
+ if (tempObject[keySubTrackType] == nil)
+ {
+ continue;
+ }
+
+ subtitleTrackType = [tempObject[keySubTrackType] intValue];
+ if (!hb_subtitle_can_pass(subtitleTrackType, self.container))
+ {
+ if (convertToBurnInUsed == NO)
+ {
+ //we haven't set any track to burned-in yet, so we can
+ tempObject[keySubTrackBurned] = @1;
+ convertToBurnInUsed = YES; //remove any additional tracks
+ }
+ else
+ {
+ //we already have a burned-in track, we must remove others
+ [tracksToDelete addObject:tempObject];
+ }
+ }
+ }
+ //if we converted a track to burned-in, unset it for tracks that support passthru
+ if (convertToBurnInUsed == YES)
+ {
+ for (id tempObject in self.subtitleArray)
+ {
+ if (tempObject[keySubTrackType] == nil)
+ {
+ continue;
+ }
+
+ subtitleTrackType = [tempObject[keySubTrackType] intValue];
+ if (hb_subtitle_can_pass(subtitleTrackType, self.container))
+ {
+ tempObject[keySubTrackBurned] = @0;
+ }
+ }
+ }
+
+ if (tracksToDelete.count)
+ {
+ [self.subtitleArray removeObjectsInArray:tracksToDelete];
+ [self.fTableView reloadData];
+ }
+
+ [tracksToDelete release];
+}
+
+- (void)validateBurned:(NSInteger)index
+{
+ [self.subtitleArray enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop)
+ {
+ if (idx != index)
+ {
+ obj[keySubTrackBurned] = @0;
+ }
+ }];
+ [self validatePassthru];
+}
+
+- (void)validateDefault:(NSInteger)index
+{
+ [self.subtitleArray enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop)
+ {
+ if (idx != index)
+ {
+ obj[keySubTrackDefault] = @0;
+ }
+ }];
+}
+
+#pragma mark -
+#pragma mark Subtitle Table Data Source Methods
+
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
+{
+ return self.subtitleArray.count;
+}
+
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
+{
+ NSDictionary *track = self.subtitleArray[rowIndex];
+
+ if ([[aTableColumn identifier] isEqualToString:@"track"])
+ {
+ NSNumber *index = track[keySubTrackSelectionIndex];
+ if (index)
+ return index;
+ else
+ return @0;
+ }
+ else if ([[aTableColumn identifier] isEqualToString:@"forced"])
+ {
+ return track[keySubTrackForced];
+ }
+ else if ([[aTableColumn identifier] isEqualToString:@"burned"])
+ {
+ return track[keySubTrackBurned];
+ }
+ else if ([[aTableColumn identifier] isEqualToString:@"default"])
+ {
+ return track[keySubTrackDefault];
+ }
+ /* These next three columns only apply to srt's. they are disabled for source subs */
+ else if ([[aTableColumn identifier] isEqualToString:@"srt_lang"])
+ {
+ if ([track[keySubTrackType] intValue] == SRTSUB)
+ {
+ return track[keySubTrackLanguageIndex];
+ }
+ else
+ {
+ return @0;
+ }
+ }
+ else if ([[aTableColumn identifier] isEqualToString:@"srt_charcode"])
+ {
+ if ([track[keySubTrackType] intValue] == SRTSUB)
+ {
+ return track[keySubTrackSrtCharCodeIndex];
+ }
+ else
+ {
+ return @0;
+ }
+ }
+ else if ([[aTableColumn identifier] isEqualToString:@"srt_offset"])
+ {
+ if (track[keySubTrackSrtOffset])
+ {
+ return [track[keySubTrackSrtOffset] stringValue];
+ }
+ else
+ {
+ return @"0";
+ }
+ }
+
+ return nil;
+}
+
+/**
+ * Called whenever a widget in the table is edited or changed, we use it to record the change in the controlling array
+ * including removing and adding new tracks via the "None" ("track" index of 0)
+ */
+- (void)tableView:(NSTableView *)aTableView setObjectValue:(id)anObject forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
+{
+ if ([[aTableColumn identifier] isEqualToString:@"track"])
+ {
+ /* Set the array to track if we are vobsub (picture sub) */
+ if ([anObject intValue] > 0)
+ {
+ NSMutableDictionary *newTrack = [self trackFromSourceTrackIndex:[anObject integerValue] - 1 - (rowIndex == 0)];
+ // Selection index calculation
+ newTrack[keySubTrackSelectionIndex] = @([anObject integerValue]);
+ self.subtitleArray[rowIndex] = newTrack;
+ }
+ }
+ else if ([[aTableColumn identifier] isEqualToString:@"forced"])
+ {
+ self.subtitleArray[rowIndex][keySubTrackForced] = @([anObject intValue]);
+ }
+ else if ([[aTableColumn identifier] isEqualToString:@"burned"])
+ {
+ self.subtitleArray[rowIndex][keySubTrackBurned] = @([anObject intValue]);
+ if([anObject intValue] == 1)
+ {
+ /* Burned In and Default are mutually exclusive */
+ self.subtitleArray[rowIndex][keySubTrackDefault] = @0;
+ }
+ /* now we need to make sure no other tracks are set to burned if we have set burned */
+ if ([anObject intValue] == 1)
+ {
+ [self validateBurned:rowIndex];
+ }
+ }
+ else if ([[aTableColumn identifier] isEqualToString:@"default"])
+ {
+ self.subtitleArray[rowIndex][keySubTrackDefault] = @([anObject intValue]);
+ if([anObject intValue] == 1)
+ {
+ /* Burned In and Default are mutually exclusive */
+ self.subtitleArray[rowIndex][keySubTrackBurned] = @0;
+ }
+ /* now we need to make sure no other tracks are set to default */
+ if ([anObject intValue] == 1)
+ {
+ [self validateDefault:rowIndex];
+ }
+ }
+ /* These next three columns only apply to srt's. they are disabled for source subs */
+ else if ([[aTableColumn identifier] isEqualToString:@"srt_lang"])
+ {
+ self.subtitleArray[rowIndex][keySubTrackLanguageIndex] = @([anObject intValue]);
+ self.subtitleArray[rowIndex][keySubTrackLanguageIsoCode] = self.languagesArray[[anObject intValue]][1];
+ }
+ else if ([[aTableColumn identifier] isEqualToString:@"srt_charcode"])
+ {
+ /* charCodeArray */
+ self.subtitleArray[rowIndex][keySubTrackSrtCharCodeIndex] = @([anObject intValue]);
+ self.subtitleArray[rowIndex][keySubTrackSrtCharCode] = self.charCodeArray[[anObject intValue]];
+ }
+ else if ([[aTableColumn identifier] isEqualToString:@"srt_offset"])
+ {
+ self.subtitleArray[rowIndex][keySubTrackSrtOffset] = @([anObject integerValue]);
+ }
+
+ /* now lets do a bit of logic to add / remove tracks as necessary via the "None" track (index 0) */
+ if ([[aTableColumn identifier] isEqualToString:@"track"])
+ {
+ /* Since currently no quicktime based playback devices support soft vobsubs in mp4, we make sure "burned in" is specified
+ * by default to avoid massive confusion and anarchy. However we also want to guard against multiple burned in subtitle tracks
+ * as libhb would ignore all but the first one anyway. Plus it would probably be stupid.
+ */
+ if ((self.container & HB_MUX_MASK_MP4) && ([anObject intValue] != 0))
+ {
+ if ([self.subtitleArray[rowIndex][keySubTrackType] intValue] == VOBSUB)
+ {
+ /* lets see if there are currently any burned in subs specified */
+ BOOL subtrackBurnedInFound = NO;
+ for (id tempObject in self.subtitleArray)
+ {
+ if ([tempObject[keySubTrackBurned] intValue] == 1)
+ {
+ subtrackBurnedInFound = YES;
+ }
+ }
+ /* if we have no current vobsub set to burn it in ... burn it in by default */
+ if (!subtrackBurnedInFound)
+ {
+ self.subtitleArray[rowIndex][keySubTrackBurned] = @1;
+ /* Burned In and Default are mutually exclusive */
+ self.subtitleArray[rowIndex][keySubTrackDefault] = @0;
+ }
+ }
+ }
+
+ /* We use the track popup index number (presumes index 0 is "None" which is ignored and only used to remove tracks if need be)
+ * to determine whether to 1 modify an existing track, 2. add a new empty "None" track or 3. remove an existing track.
+ */
+
+ if ([anObject intValue] != 0 && rowIndex == [self.subtitleArray count] - 1) // if we have a last track which != "None"
+ {
+ /* add a new empty None track */
+ [self.subtitleArray addObject:[self createSubtitleTrack]];
+ }
+ else if ([anObject intValue] == 0 && rowIndex != ([self.subtitleArray count] -1))// if this track is set to "None" and not the last track displayed
+ {
+ /* we know the user chose to remove this track by setting it to None, so remove it from the array */
+ /* However,if this is the first track we have to reset the selected index of the next track by + 1, since it will now become
+ * the first track, which has to account for the extra "Foreign Language Search" index. */
+ if (rowIndex == 0 && [self.subtitleArray[1][keySubTrackSelectionIndex] intValue] != 0)
+ {
+ /* get the index of the selection in row one (which is track two) */
+ int trackOneSelectedIndex = [self.subtitleArray[1][keySubTrackSelectionIndex] intValue];
+ /* increment the index of the subtitle menu item by one, to account for Foreign Language Search which is unique to the first track */
+ self.subtitleArray[1][keySubTrackSelectionIndex] = @(trackOneSelectedIndex + 1);
+ }
+ /* now that we have made the adjustment for track one (index 0) go ahead and delete the track */
+ [self.subtitleArray removeObjectAtIndex: rowIndex];
+ }
+
+ // Validate the current passthru tracks.
+ [self validatePassthru];
+ }
+
+ [aTableView reloadData];
+}
+
+#pragma mark -
+#pragma mark Subtitle Table Delegate Methods
+
+- (NSCell *)tableView:(NSTableView *)tableView dataCellForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex
+{
+ if ([[tableColumn identifier] isEqualToString:@"track"])
+ {
+ // 'track' is a popup of all available source subtitle tracks for the given title
+ NSPopUpButtonCell *cellTrackPopup = [[NSPopUpButtonCell alloc] init];
+ [cellTrackPopup setControlSize:NSSmallControlSize];
+ [cellTrackPopup setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]]];
+
+ // Add our initial "None" track which we use to add source tracks or remove tracks.
+ // "None" is always index 0.
+ [[cellTrackPopup menu] addItemWithTitle:@"None" action:NULL keyEquivalent:@""];
+
+ // Foreign Audio Search (index 1 in the popup) is only available for the first track
+ if (rowIndex == 0)
+ {
+ [[cellTrackPopup menu] addItemWithTitle:self.foreignAudioSearchTrackName action:NULL keyEquivalent:@""];
+ }
+
+ for (NSDictionary *track in self.subtitleSourceArray)
+ {
+ [[cellTrackPopup menu] addItemWithTitle:track[keySubTrackName] action:NULL keyEquivalent:@""];
+ }
+
+ return [cellTrackPopup autorelease];
+ }
+ else if ([[tableColumn identifier] isEqualToString:@"srt_lang"])
+ {
+ return self.languagesCell;
+ }
+ else if ([[tableColumn identifier] isEqualToString:@"srt_charcode"])
+ {
+ return self.encodingsCell;
+ }
+
+ return nil;
+}
+
+/**
+ * Enables/Disables the table view cells.
+ */
+- (void)tableView:(NSTableView *)aTableView willDisplayCell:(id)aCell forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
+{
+ if ([[aTableColumn identifier] isEqualToString:@"track"])
+ {
+ return;
+ }
+
+ // If the Track is None, we disable the other cells as None is an empty track
+ if ([self.subtitleArray[rowIndex][keySubTrackSelectionIndex] intValue] == 0)
+ {
+ [aCell setEnabled:NO];
+ }
+ else
+ {
+ // Since we have a valid track, we go ahead and enable the rest of the widgets and set them according to the controlling array */
+ [aCell setEnabled:YES];
+ }
+
+ if ([[aTableColumn identifier] isEqualToString:@"forced"])
+ {
+ // Disable the "Forced Only" checkbox if a) the track is "None" or b) the subtitle track doesn't support forced flags
+ if (![self.subtitleArray[rowIndex][keySubTrackSelectionIndex] intValue] ||
+ !hb_subtitle_can_force([self.subtitleArray[rowIndex][keySubTrackType] intValue]))
+ {
+ [aCell setEnabled:NO];
+ }
+ else
+ {
+ [aCell setEnabled:YES];
+ }
+ }
+ else if ([[aTableColumn identifier] isEqualToString:@"burned"])
+ {
+ /*
+ * Disable the "Burned In" checkbox if:
+ * a) the track is "None" OR
+ * b) the subtitle track can't be burned in OR
+ * c) the subtitle track can't be passed through (e.g. PGS w/MP4)
+ */
+ int subtitleTrackType = [self.subtitleArray[rowIndex][keySubTrackType] intValue];
+ if (![self.subtitleArray[rowIndex][keySubTrackSelectionIndex] intValue] ||
+ !hb_subtitle_can_burn(subtitleTrackType) || !hb_subtitle_can_pass(subtitleTrackType, self.container))
+ {
+ [aCell setEnabled:NO];
+ }
+ else
+ {
+ [aCell setEnabled:YES];
+ }
+ }
+ else if ([[aTableColumn identifier] isEqualToString:@"default"])
+ {
+ /*
+ * Disable the "Default" checkbox if:
+ * a) the track is "None" OR
+ * b) the subtitle track can't be passed through (e.g. PGS w/MP4)
+ */
+ if (![self.subtitleArray[rowIndex][keySubTrackSelectionIndex] intValue] ||
+ !hb_subtitle_can_pass([self.subtitleArray[rowIndex][keySubTrackType] intValue], self.container))
+ {
+ [aCell setEnabled:NO];
+ }
+ else
+ {
+ [aCell setEnabled:YES];
+ }
+ }
+ /* These next three columns only apply to srt's. they are disabled for source subs */
+ else if ([[aTableColumn identifier] isEqualToString:@"srt_lang"])
+ {
+ /* We have an srt file so set the track type (Source or SRT, and the srt file path ) kvp's*/
+ if ([self.subtitleArray[rowIndex][keySubTrackType] intValue] == SRTSUB)
+ {
+ [aCell setEnabled:YES];
+ }
+ else
+ {
+ [aCell setEnabled:NO];
+ }
+ }
+ else if ([[aTableColumn identifier] isEqualToString:@"srt_charcode"])
+ {
+ /* We have an srt file so set the track type (Source or SRT, and the srt file path ) kvp's*/
+ if ([self.subtitleArray[rowIndex][keySubTrackType] intValue] == SRTSUB)
+ {
+ [aCell setEnabled:YES];
+ }
+ else
+ {
+ [aCell setEnabled:NO];
+ }
+ }
+ else if ([[aTableColumn identifier] isEqualToString:@"srt_offset"])
+ {
+ if ([self.subtitleArray[rowIndex][keySubTrackType] intValue] == SRTSUB)
+ {
+ [aCell setEnabled:YES];
+ }
+ else
+ {
+ [aCell setEnabled:NO];
+ }
+ }
+}
+
+#pragma mark - Srt import
+
+/**
+ * Imports a srt file.
+ *
+ * @param sender
+ */
+- (IBAction)browseImportSrtFile:(id)sender
+{
+ NSOpenPanel *panel = [NSOpenPanel openPanel];
+ [panel setAllowsMultipleSelection:NO];
+ [panel setCanChooseFiles:YES];
+ [panel setCanChooseDirectories:NO];
+
+ NSURL *sourceDirectory;
+	if ([[NSUserDefaults standardUserDefaults] URLForKey:@"LastSrtImportDirectoryURL"])
+	{
+		sourceDirectory = [[NSUserDefaults standardUserDefaults] URLForKey:@"LastSrtImportDirectoryURL"];
+	}
+	else
+	{
+		sourceDirectory = [[NSURL fileURLWithPath:NSHomeDirectory()] URLByAppendingPathComponent:@"Desktop"];
+	}
+
+ /* we open up the browse srt sheet here and call for browseImportSrtFileDone after the sheet is closed */
+ NSArray *fileTypes = @[@"plist", @"srt"];
+ [panel setDirectoryURL:sourceDirectory];
+ [panel setAllowedFileTypes:fileTypes];
+ [panel beginSheetModalForWindow:[[self view] window] completionHandler:^(NSInteger result) {
+ if (result == NSOKButton)
+ {
+ NSURL *importSrtFileURL = [panel URL];
+ NSURL *importSrtDirectory = [importSrtFileURL URLByDeletingLastPathComponent];
+ [[NSUserDefaults standardUserDefaults] setURL:importSrtDirectory forKey:@"LastSrtImportDirectoryURL"];
+
+ /* Create a new entry for the subtitle source array so it shows up in our subtitle source list */
+ NSString *displayname = [importSrtFileURL lastPathComponent];// grok an appropriate display name from the srt subtitle */
+
+ /* create a dictionary of source subtitle information to store in our array */
+ [self.subtitleSourceArray addObject:@{keySubTrackIndex: @(self.subtitleSourceArray.count),
+ keySubTrackName: displayname,
+ keySubTrackType: @(SRTSUB),
+ keySubTrackSrtFilePath: importSrtFileURL.path}];
+
+ // Now create a new srt subtitle dictionary assuming the user wants to add it to their list
+ NSMutableDictionary *newSubtitleSrtTrack = [self trackFromSourceTrackIndex:self.subtitleSourceArray.count - 1];
+ // Calculate the pop up selection index
+ newSubtitleSrtTrack[keySubTrackSelectionIndex] = @(self.subtitleSourceArray.count + (self.subtitleArray.count == 1));
+ [self.subtitleArray insertObject:newSubtitleSrtTrack atIndex:self.subtitleArray.count - 1];
+
+ [self.fTableView reloadData];
+ }
+ }];
+}
+
+#pragma mark - UI cells
+
+- (NSArray *)populateLanguageArray
+{
+ NSMutableArray *languages = [[[NSMutableArray alloc] init] autorelease];
+
+ for (const iso639_lang_t * lang = lang_get_next(NULL); lang != NULL; lang = lang_get_next(lang))
+ {
+ [languages addObject:@[@(lang->eng_name),
+ @(lang->iso639_2)]];
+ if (!strcasecmp(lang->eng_name, "English"))
+ {
+ _languagesArrayDefIndex = [languages count] - 1;
+ }
+ }
+ return [[languages copy] autorelease];
+}
+
+@synthesize languagesCell = _languagesCell;
+
+- (NSPopUpButtonCell *)languagesCell
+{
+ if (!_languagesCell)
+ {
+ // 'srt_lang' is a popup of commonly used languages to be matched to the source srt file
+ _languagesCell = [[NSPopUpButtonCell alloc] init];
+ // Set the Popups properties
+ [_languagesCell setControlSize:NSSmallControlSize];
+ [_languagesCell setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]]];
+
+ // list our languages as per the languagesArray
+ for (NSArray *lang in self.languagesArray)
+ {
+ [[_languagesCell menu] addItemWithTitle:lang[0] action:NULL keyEquivalent:@""];
+ }
+ }
+ return _languagesCell;
+}
+
+@synthesize encodingsCell = _encodingsCell;
+
+- (NSPopUpButtonCell *)encodingsCell
+{
+ if (!_encodingsCell) {
+ // 'srt_charcode' is a popup of commonly used character codes to be matched to the source srt file
+ _encodingsCell = [[NSPopUpButtonCell alloc] init];
+ // Set the Popups properties
+ [_encodingsCell setControlSize:NSSmallControlSize];
+ [_encodingsCell setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]]];
+
+ // list our character codes, as per charCodeArray
+ for (NSString *charCode in self.charCodeArray)
+ {
+ [[_encodingsCell menu] addItemWithTitle:charCode action: NULL keyEquivalent: @""];
+ }
+ }
+ return _encodingsCell;
+}
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBSubtitlesDefaults.h Added

HandBrake-0.10.0.tar.bz2/macosx/HBSubtitlesDefaults.m Added

@@ -0,0 +1,68 @@
+/* HBSubtitlesSettings.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBSubtitlesDefaults.h"
+
+@implementation HBSubtitlesDefaults
+
+- (instancetype)init
+{
+ self = [super init];
+ if (self)
+ {
+ _trackSelectionLanguages = [[NSMutableArray alloc] init];
+ }
+ return self;
+}
+
+- (void)applySettingsFromPreset:(NSDictionary *)preset
+{
+ if ([preset[@"SubtitleTrackSelectionBehavior"] isEqualToString:@"first"])
+ {
+ self.trackSelectionBehavior = HBSubtitleTrackSelectionBehaviorFirst;
+ }
+ else if ([preset[@"SubtitleTrackSelectionBehavior"] isEqualToString:@"all"])
+ {
+ self.trackSelectionBehavior = HBSubtitleTrackSelectionBehaviorAll;
+ }
+ else
+ {
+ self.trackSelectionBehavior = HBSubtitleTrackSelectionBehaviorNone;
+ }
+ self.trackSelectionLanguages = [NSMutableArray arrayWithArray:preset[@"SubtitleLanguageList"]];
+ self.addCC = [preset[@"SubtitleAddCC"] boolValue];
+ self.addForeignAudioSearch = [preset[@"SubtitleAddForeignAudioSearch"] boolValue];
+ self.addForeignAudioSubtitle = [preset[@"SubtitleAddForeignAudioSubtitle"] boolValue];
+}
+
+- (void)prepareSubtitlesDefaultsForPreset:(NSMutableDictionary *)preset
+{
+ if (self.trackSelectionBehavior == HBSubtitleTrackSelectionBehaviorFirst)
+ {
+ preset[@"SubtitleTrackSelectionBehavior"] = @"first";
+ }
+ else if (self.trackSelectionBehavior == HBSubtitleTrackSelectionBehaviorAll)
+ {
+ preset[@"SubtitleTrackSelectionBehavior"] = @"all";
+ }
+ else
+ {
+ preset[@"SubtitleTrackSelectionBehavior"] = @"none";
+ }
+
+ preset[@"SubtitleLanguageList"] = [[self.trackSelectionLanguages copy] autorelease];
+ preset[@"SubtitleAddCC"] = @(self.addCC);
+ preset[@"SubtitleAddForeignAudioSearch"] = @(self.addForeignAudioSearch);
+ preset[@"SubtitleAddForeignAudioSubtitle"] = @(self.addForeignAudioSubtitle);
+}
+
+- (void)dealloc
+{
+ [_trackSelectionLanguages release];
+ [super dealloc];
+}
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBSubtitlesDefaultsController.h Added

HandBrake-0.10.0.tar.bz2/macosx/HBSubtitlesDefaultsController.m Added

@@ -0,0 +1,87 @@
+/* HBSubtitlesDefaultsController.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBSubtitlesDefaultsController.h"
+#import "HBSubtitlesDefaults.h"
+#import "HBLanguagesSelection.h"
+
+static void *HBSubtitlesDefaultsContex = &HBSubtitlesDefaultsContex;
+
+@interface HBSubtitlesDefaultsController ()
+
+@property (nonatomic, readonly) HBSubtitlesDefaults *settings;
+
+@property (nonatomic, readonly) HBLanguagesSelection *languagesList;
+@property (assign) IBOutlet HBLanguageArrayController *tableController;
+@property (assign) IBOutlet NSButton *showAllButton;
+
+@end
+
+@implementation HBSubtitlesDefaultsController
+
+- (instancetype)initWithSettings:(HBSubtitlesDefaults *)settings
+{
+ self = [super initWithWindowNibName:@"SubtitlesDefaults"];
+ if (self)
+ {
+ _settings = [settings retain];
+ _languagesList = [[HBLanguagesSelection alloc] initWithLanguages:_settings.trackSelectionLanguages];
+ }
+ return self;
+}
+
+- (void)windowDidLoad
+{
+ [self addObserver:self forKeyPath:@"tableController.showSelectedOnly" options:0 context:HBSubtitlesDefaultsContex];
+
+ if (self.settings.trackSelectionLanguages.count)
+ {
+ self.tableController.showSelectedOnly = YES;
+ }
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+ if (context == HBSubtitlesDefaultsContex)
+ {
+ if ([keyPath isEqualToString:@"tableController.showSelectedOnly"])
+ {
+ [self.showAllButton setState:!self.tableController.showSelectedOnly];
+ }
+ }
+ else
+ {
+ [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+ }
+}
+
+- (IBAction)edit:(id)sender
+{
+ self.tableController.showSelectedOnly = !self.tableController.showSelectedOnly;
+}
+
+- (IBAction)done:(id)sender
+{
+ [[self window] orderOut:nil];
+ [NSApp endSheet:[self window]];
+
+ [self.settings.trackSelectionLanguages removeAllObjects];
+ [self.settings.trackSelectionLanguages addObjectsFromArray:self.languagesList.selectedLanguages];
+}
+
+- (void)dealloc
+{
+ [_settings release];
+ [_languagesList release];
+
+ @try {
+ [self removeObserver:self forKeyPath:@"tableController.showSelectedOnly"];
+ } @catch (NSException * __unused exception) {}
+
+ [super dealloc];
+}
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBTreeNode.h Added

@@ -0,0 +1,44 @@
+/* HBTreeNode.h $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import <Foundation/Foundation.h>
+
+/**
+ * Notify a delegate that something changed in the tree.
+ * KVO observing a tree looked complicated an expensive, so this is a lightweight
+ * way to track the changes we need to know.
+ */
+@protocol HBTreeNodeDelegate <NSObject>
+
+- (void)nodeDidChange;
+
+@end
+
+/**
+ * HBTreeNode
+ */
+@interface HBTreeNode : NSObject
+
+// NSTreeController required properties
+@property (nonatomic, readonly) NSMutableArray *children;
+@property (nonatomic) BOOL isLeaf;
+
+@property (nonatomic, assign) id<HBTreeNodeDelegate> delegate;
+
+/**
+ * Executes a given block using each object in the tree, starting with the root object and continuing through the tree to the last object.
+ *
+ * @param block The block to apply to elements in the tree.
+ */
+- (void)enumerateObjectsUsingBlock:(void (^)(id obj, NSIndexPath *idx, BOOL *stop))block;
+
+// KVC Accessor Methods
+- (NSUInteger)countOfChildren;
+- (id)objectInChildrenAtIndex:(NSUInteger)index;
+- (void)insertObject:(HBTreeNode *)presetObject inChildrenAtIndex:(NSUInteger)index;
+- (void)removeObjectFromChildrenAtIndex:(NSUInteger)index;
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBTreeNode.m Added

@@ -0,0 +1,95 @@
+/* HBTreeNode.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBTreeNode.h"
+
+@implementation HBTreeNode
+
+- (instancetype)init
+{
+ self = [super init];
+ if (self) {
+ _children = [[NSMutableArray alloc] init];
+ _isLeaf = YES;
+ }
+ return self;
+}
+
+- (void)dealloc
+{
+ [_children release];
+ [super dealloc];
+}
+
+- (NSUInteger)countOfChildren
+{
+ return self.children.count;
+}
+
+- (id)objectInChildrenAtIndex:(NSUInteger)index
+{
+ return [self.children objectAtIndex:index];
+}
+
+- (void)insertObject:(HBTreeNode *)presetObject inChildrenAtIndex:(NSUInteger)index
+{
+ [self.children insertObject:presetObject atIndex:index];
+ [presetObject setDelegate:self.delegate];
+
+ [self.delegate nodeDidChange];
+}
+
+- (void)removeObjectFromChildrenAtIndex:(NSUInteger)index
+{
+ [self.children removeObjectAtIndex:index];
+ [self.delegate nodeDidChange];
+}
+
+#pragma mark - Enumeration
+
+- (void)enumerateObjectsUsingBlock:(void (^)(id obj, NSIndexPath *idx, BOOL *stop))block
+{
+ BOOL stop = NO;
+ NSMutableArray *queue = [[NSMutableArray alloc] init];
+ NSMutableArray *indexesQueue = [[NSMutableArray alloc] init];
+
+ [queue addObject:self];
+ [indexesQueue addObject:[[[NSIndexPath alloc] init] autorelease]];
+
+ HBTreeNode *node = nil;
+ while ((node = [queue lastObject]) != nil)
+ {
+ // Get the index path of the current object
+ NSIndexPath *indexPath = [indexesQueue lastObject];
+
+ // Call the block
+ block(node, indexPath, &stop);
+
+ if (stop)
+ {
+ break;
+ }
+
+ [indexesQueue removeLastObject];
+
+ for (NSInteger i = node.children.count - 1; i >= 0; i--)
+ {
+ [indexesQueue addObject:[indexPath indexPathByAddingIndex:i]];
+ }
+
+ [queue removeLastObject];
+
+ for (id childNode in [node.children reverseObjectEnumerator])
+ {
+ [queue addObject:childNode];
+ }
+ }
+ 
+ [queue release];
+ [indexesQueue release];
+}
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBUtilities.h Added

@@ -0,0 +1,44 @@
+/* HBUtilities.h $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import <Foundation/Foundation.h>
+
+@interface HBUtilities : NSObject
+
+/**
+ * Returns the path of the current <user>/Library/Application Support/HandBrake folder.
+ */
++ (NSString *)appSupportPath;
+
+/**
+ * Writes a message to standard error.
+ * The message will show up in the output panel and in the activity log.
+ *
+ * @param format a standard c format string with varargs.
+ */
++ (void)writeToActivityLog:(const char *)format, ...;
+
+/**
+ * Generates a file name automatically based on the inputs,
+ * it can be configured with NSUserDefaults.
+ *
+ * @param sourceName the name of the source file
+ * @param title the title number
+ * @param chaptersRange the selected chapters range
+ * @param quality the video encoder quality
+ * @param bitrate the video encoder bitrate
+ * @param videoCodec the video encoder type
+ *
+ * @return a NSString containing the required info
+ */
++ (NSString *)automaticNameForSource:(NSString *)sourceName
+ title:(NSUInteger)title
+ chapters:(NSRange)chaptersRange
+ quality:(NSString *)quality
+ bitrate:(NSString *)bitrate
+ videoCodec:(uint32_t)codec;
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBUtilities.m Added

@@ -0,0 +1,130 @@
+/* HBUtilities.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBUtilities.h"
+#include "common.h"
+
+@implementation HBUtilities
+
++ (NSString *)appSupportPath
+{
+ NSString *appSupportPath = [[NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory,
+ NSUserDomainMask,
+ YES) firstObject] stringByAppendingPathComponent:@"HandBrake"];
+
+ NSFileManager *fileManager = [NSFileManager defaultManager];
+ if (![fileManager fileExistsAtPath:appSupportPath])
+ [fileManager createDirectoryAtPath:appSupportPath withIntermediateDirectories:YES attributes:nil error:NULL];
+
+ return appSupportPath;
+}
+
++ (void)writeToActivityLog:(const char *)format, ...
+{
+ va_list args;
+ va_start(args, format);
+ if (format != nil)
+ {
+ char str[1024];
+ vsnprintf(str, 1024, format, args);
+
+ time_t _now = time(NULL);
+ struct tm *now = localtime(&_now);
+ fprintf(stderr, "[%02d:%02d:%02d] macgui: %s\n", now->tm_hour, now->tm_min, now->tm_sec, str);
+ }
+ va_end(args);
+}
+
++ (NSString *)automaticNameForSource:(NSString *)sourceName
+ title:(NSUInteger)title
+ chapters:(NSRange)chaptersRange
+ quality:(NSString *)quality
+ bitrate:(NSString *)bitrate
+ videoCodec:(uint32_t)codec
+{
+ NSMutableString *name = [[[NSMutableString alloc] init] autorelease];
+ // The format array contains the tokens as NSString
+ NSArray *format = [[NSUserDefaults standardUserDefaults] objectForKey:@"HBAutoNamingFormat"];
+
+ for (NSString *formatKey in format)
+ {
+ if ([formatKey isEqualToString:@"{Source}"])
+ {
+ if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"HBAutoNamingRemoveUnderscore"] boolValue])
+ {
+ sourceName = [sourceName stringByReplacingOccurrencesOfString:@"_" withString:@" "];
+ }
+ if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"HBAutoNamingRemovePunctuation"] boolValue])
+ {
+ sourceName = [sourceName stringByReplacingOccurrencesOfString:@"-" withString:@""];
+ sourceName = [sourceName stringByReplacingOccurrencesOfString:@"." withString:@""];
+ sourceName = [sourceName stringByReplacingOccurrencesOfString:@"," withString:@""];
+ sourceName = [sourceName stringByReplacingOccurrencesOfString:@";" withString:@""];
+ }
+ if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"HBAutoNamingTitleCase"] boolValue])
+ {
+ sourceName = [sourceName capitalizedString];
+ }
+ [name appendString:sourceName];
+ }
+ else if ([formatKey isEqualToString:@"{Title}"])
+ {
+ [name appendFormat:@"%lu", (unsigned long)title];
+ }
+ else if ([formatKey isEqualToString:@"{Date}"])
+ {
+ NSDate *date = [NSDate date];
+ NSString *dateString = nil;
+ NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+ [formatter setDateStyle:NSDateFormatterShortStyle];
+ [formatter setTimeStyle:NSDateFormatterNoStyle];
+ dateString = [[formatter stringFromDate:date] stringByReplacingOccurrencesOfString:@"/" withString:@"-"];
+ [name appendString:dateString];
+ }
+ else if ([formatKey isEqualToString:@"{Time}"])
+ {
+ NSDate *date = [NSDate date];
+ NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+ [formatter setDateStyle:NSDateFormatterNoStyle];
+ [formatter setTimeStyle:NSDateFormatterShortStyle];
+ [name appendString:[formatter stringFromDate:date]];
+ }
+ else if ([formatKey isEqualToString:@"{Chapters}"])
+ {
+ if (chaptersRange.location == chaptersRange.length)
+ {
+ [name appendFormat:@"%lu", (unsigned long)chaptersRange.location];
+ }
+ else
+ {
+ [name appendFormat:@"%lu-%lu", (unsigned long)chaptersRange.location, (unsigned long)chaptersRange.length];
+ }
+ }
+ else if ([formatKey isEqualToString:@"{Quality/Bitrate}"])
+ {
+ if (quality)
+ {
+ // Append the right quality suffix for the selected codec (rf/qp)
+ [name appendString:[[NSString stringWithUTF8String:hb_video_quality_get_name(codec)] lowercaseString]];
+ [name appendString:quality];
+ }
+ else
+ {
+ [name appendString:@"abr"];
+ [name appendString:bitrate];
+ }
+ }
+ else
+ {
+ [name appendString:formatKey];
+ }
+ }
+
+ return [[name copy] autorelease];
+}
+
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBVideo.h Added

HandBrake-0.10.0.tar.bz2/macosx/HBVideo.m Added

HandBrake-0.10.0.tar.bz2/macosx/HBVideoController.h Added

@@ -0,0 +1,51 @@
+/* HBVideoController.h $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import <Cocoa/Cocoa.h>
+#import "HBViewValidation.h"
+
+#include "hb.h"
+
+@class HBController;
+@class HBAdvancedController;
+
+extern NSString *HBVideoEncoderChangedNotification;
+
+/**
+ * HBVideoController
+ *
+ * Responds to HBContainerChangedNotification and HBTitleChangedNotification notifications.
+ */
+@interface HBVideoController : NSViewController <HBViewValidation>
+
+// Methods to apply the settings to the controller
+- (void)applyVideoSettingsFromQueue:(NSDictionary *)queueToApply;
+- (void)applySettingsFromPreset:(NSDictionary *)preset;
+
+// Methods to get back the controller settings
+- (void)prepareVideoForQueueFileJob:(NSMutableDictionary *)queueFileJob;
+- (void)prepareVideoForJobPreview:(hb_job_t *)job andTitle:(hb_title_t *)title;
+- (void)prepareVideoForPreset:(NSMutableDictionary *)preset;
+
+- (IBAction)x264PresetsChangedDisplayExpandedOptions:(id)sender;
+
+@property (nonatomic, copy, readwrite) NSString *pictureSettingsField;
+@property (nonatomic, copy, readwrite) NSString *pictureFiltersField;
+
+// Property exposed for the auto name function
+@property (nonatomic, readonly) int codec;
+@property (nonatomic, readonly) int qualityType;
+@property (nonatomic, readonly) NSString *selectedBitrate;
+@property (nonatomic, readonly) NSString *selectedQuality;
+
+// Property updates when the video size changes
+@property (nonatomic, readwrite) NSUInteger fPresetsWidthForUnparse;
+@property (nonatomic, readwrite) NSUInteger fPresetsHeightForUnparse;
+
+@property (nonatomic, retain, readwrite) HBController *fHBController;
+@property (nonatomic, retain, readwrite) HBAdvancedController *fAdvancedOptions;
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBVideoController.m Added

@@ -0,0 +1,1458 @@
+/* HBVideoController.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBVideoController.h"
+
+#include "hb.h"
+
+#import "Controller.h"
+#import "HBAdvancedController.h"
+
+NSString *HBVideoEncoderChangedNotification = @"HBVideoEncoderChangedNotification";
+
+@interface HBVideoController () {
+ /* Framerate */
+ /* Radio Button Framerate Controls */
+ IBOutlet NSMatrix * fFramerateMatrix;
+ IBOutlet NSButtonCell * fFramerateVfrPfrCell;
+ IBOutlet NSButtonCell * fFramerateCfrCell;
+
+ /* Video Encoder */
+ IBOutlet NSTextField * fVidRateField;
+ IBOutlet NSPopUpButton * fVidRatePopUp;
+ IBOutlet NSTextField * fVidEncoderField;
+ IBOutlet NSPopUpButton * fVidEncoderPopUp;
+ IBOutlet NSTextField * fVidQualityField;
+ IBOutlet NSTextField * fVidQualityRFLabel;
+ IBOutlet NSTextField * fVidQualityRFField;
+ IBOutlet NSMatrix * fVidQualityMatrix;
+ IBOutlet NSButtonCell * fVidBitrateCell;
+ IBOutlet NSTextField * fVidBitrateField;
+ IBOutlet NSButtonCell * fVidConstantCell;
+ IBOutlet NSSlider * fVidQualitySlider;
+ IBOutlet NSButton * fVidTwoPassCheck;
+ IBOutlet NSButton * fVidTurboPassCheck;
+
+ /* Status read out fields for picture settings and video filters */
+ IBOutlet NSTextField * fPictureSettingsField;
+ IBOutlet NSTextField * fPictureFiltersField;
+
+
+ /* Encoder options views */
+ IBOutlet NSView *fPresetView;
+ IBOutlet NSView *fSimplePresetView;
+
+ IBOutlet NSTextField *fEncoderOptionsLabel;
+
+ /* Simple Presets Box */
+ IBOutlet NSTextField *fLavcOptionsTextField;
+ IBOutlet NSTextField *fLavcOptionsLabel;
+
+ /* x264/x265 Presets Box */
+ NSArray * fPresetNames;
+ NSUInteger fMediumPresetIndex;
+ IBOutlet NSButton * fX264UseAdvancedOptionsCheck;
+ IBOutlet NSBox * fDividerLine;
+ IBOutlet NSBox * fPresetsBox;
+ IBOutlet NSSlider * fPresetsSlider;
+ IBOutlet NSTextField * fPresetSliderLabel;
+ IBOutlet NSTextField * fPresetSelectedTextField;
+ IBOutlet NSPopUpButton * fTunePopUp;
+ IBOutlet NSTextField * fTunePopUpLabel;
+ IBOutlet NSPopUpButton * fProfilePopUp;
+ IBOutlet NSTextField * fProfilePopUpLabel;
+ IBOutlet NSPopUpButton * fLevelPopUp;
+ IBOutlet NSTextField * fLevelPopUpLabel;
+ IBOutlet NSButton * fFastDecodeCheck;
+ IBOutlet NSTextField * fDisplayPresetsAdditonalOptionsTextField;
+ IBOutlet NSTextField * fDisplayPresetsAdditonalOptionsLabel;
+ // Text Field to show the expanded opts from unparse()
+ IBOutlet NSTextField * fDisplayX264PresetsUnparseTextField;
+ char * fX264PresetsUnparsedUTF8String;
+}
+
+@property (nonatomic, readwrite) int codec;
+@property (nonatomic, readwrite) int qualityType;
+
+@end
+
+@implementation HBVideoController
+
+- (void)setPictureSettingsField:(NSString *)string
+{
+ if (string)
+ {
+ [_pictureSettingsField autorelease];
+ _pictureSettingsField = [[NSString stringWithFormat:@"Picture Settings: %@", string] retain];
+ }
+}
+
+- (void)setPictureFiltersField:(NSString *)string
+{
+ if (string)
+ {
+ [_pictureFiltersField autorelease];
+ _pictureFiltersField = [[NSString stringWithFormat:@"Picture Filters: %@", string] retain];
+ }
+}
+
+- (NSString *)selectedBitrate
+{
+ return [fVidBitrateField stringValue];
+}
+
+- (NSString *)selectedQuality
+{
+ return [fVidQualityRFField stringValue];
+}
+
+
+- (instancetype)init
+{
+ self = [super initWithNibName:@"Video" bundle:nil];
+ if (self)
+ {
+ /*
+ * initialize fX264PresetsUnparsedUTF8String as early as possible
+ * avoids an invalid free
+ */
+ fX264PresetsUnparsedUTF8String = NULL;
+ _pictureFiltersField = @"Picture Filters:";
+ _pictureSettingsField = @"Picture Settings:";
+
+ NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
+
+ /* register that we are interested in changes made to the video container */
+ [center addObserver:self selector: @selector(containerChanged:) name:HBContainerChangedNotification object:nil];
+ [center addObserver:self selector: @selector(titleChanged:) name:HBTitleChangedNotification object:nil];
+
+ // Observe the andvanced tab preference.
+ [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
+ forKeyPath:@"values.HBShowAdvancedTab"
+ options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial
+ context:NULL];
+ }
+
+ return self;
+}
+
+- (void)loadView {
+ [super loadView];
+
+ /* Video encoder */
+ [fVidEncoderPopUp removeAllItems];
+ [fVidEncoderPopUp addItemWithTitle:@"H.264 (x264)"];
+
+ /* setup our x264/x265 presets widgets */
+ [self switchPresetViewForEncoder:HB_VCODEC_X264];
+
+ /* Video quality */
+	[fVidBitrateField setIntValue: 1000];
+ self.qualityType = 0;
+
+ [self videoMatrixChanged:nil];
+
+ /* Video framerate */
+ [fVidRatePopUp removeAllItems];
+ NSMenuItem *menuItem = [[fVidRatePopUp menu] addItemWithTitle:@"Same as source"
+ action:nil
+ keyEquivalent:@""];
+ [menuItem setTag:hb_video_framerate_get_from_name("Same as source")];
+ for (const hb_rate_t *video_framerate = hb_video_framerate_get_next(NULL);
+ video_framerate != NULL;
+ video_framerate = hb_video_framerate_get_next(video_framerate))
+ {
+ NSString *itemTitle;
+ if (!strcmp(video_framerate->name, "23.976"))
+ {
+ itemTitle = @"23.976 (NTSC Film)";
+ }
+ else if (!strcmp(video_framerate->name, "25"))
+ {
+ itemTitle = @"25 (PAL Film/Video)";
+ }
+ else if (!strcmp(video_framerate->name, "29.97"))
+ {
+ itemTitle = @"29.97 (NTSC Video)";
+ }
+ else
+ {
+ itemTitle = @(video_framerate->name);
+ }
+ menuItem = [[fVidRatePopUp menu] addItemWithTitle:itemTitle
+ action:nil
+ keyEquivalent:@""];
+ [menuItem setTag:video_framerate->rate];
+ }
+ [fVidRatePopUp selectItemAtIndex:0];
+
+ /* We disable the Turbo 1st pass checkbox since we are not x264 */
+	[fVidTurboPassCheck setEnabled: NO];
+	[fVidTurboPassCheck setState: NSOffState];
+}
+
+- (void)setUIEnabled:(BOOL)flag {
+ NSControl *controls[] =
+ {
+ fFramerateMatrix,
+ fVidRateField,
+ fVidRatePopUp,
+ fVidEncoderField,
+ fVidEncoderPopUp,
+ fVidQualityField,
+ fVidQualityRFLabel,
+ fVidQualityRFField,
+ fVidQualityMatrix,
+ fVidBitrateField,
+ fVidQualitySlider,
+ fVidTwoPassCheck,
+ fVidTurboPassCheck,
+ fEncoderOptionsLabel,
+ fPictureSettingsField,
+ fPictureFiltersField
+ };
+
+ for (unsigned i = 0; i < (sizeof(controls) / sizeof(NSControl *)); i++)
+ {
+ if ([[controls[i] className] isEqualToString: @"NSTextField"])
+ {
+ NSTextField *tf = (NSTextField *)controls[i];
+ if (![tf isBezeled])
+ {
+ [tf setTextColor: (flag ?
+ [NSColor controlTextColor] :
+ [NSColor disabledControlTextColor])];
+ continue;
+ }
+ }
+ [controls[i] setEnabled:flag];
+ }
+
+ [self videoMatrixChanged:nil];
+ [self enableEncoderOptionsWidgets:flag];
+}
+
+- (void)containerChanged:(NSNotification *)aNotification
+{
+ NSDictionary *notDict = [aNotification userInfo];
+
+ int videoContainer = [notDict[keyContainerTag] intValue];
+
+ /* lets get the tag of the currently selected item first so we might reset it later */
+ int selectedVidEncoderTag = self.codec;
+ BOOL encoderSupported = NO;
+
+ /* Note: we now store the video encoder int values from common.c in the tags of each popup for easy retrieval later */
+ [fVidEncoderPopUp removeAllItems];
+ for (const hb_encoder_t *video_encoder = hb_video_encoder_get_next(NULL);
+ video_encoder != NULL;
+ video_encoder = hb_video_encoder_get_next(video_encoder))
+ {
+ if (video_encoder->muxers & videoContainer)
+ {
+ NSMenuItem *menuItem = [[fVidEncoderPopUp menu] addItemWithTitle:@(video_encoder->name)
+ action:nil
+ keyEquivalent:@""];
+ [menuItem setTag:video_encoder->codec];
+
+ if (selectedVidEncoderTag == video_encoder->codec)
+ {
+ encoderSupported = YES;
+ }
+ }
+ }
+
+ if (!encoderSupported)
+ {
+ self.codec = hb_video_encoder_get_default(videoContainer);
+ [self videoEncoderPopUpChanged:nil];
+ }
+ else
+ {
+ self.codec = selectedVidEncoderTag;
+ }
+
+ [fVidEncoderPopUp selectItemWithTag:self.codec];
+
+}
+
+- (void)titleChanged:(NSNotification *)aNotification
+{
+ [fVidRatePopUp selectItemAtIndex: 0];
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+ if (context == NULL)
+ {
+ if ([keyPath isEqualToString:@"values.HBShowAdvancedTab"])
+ {
+ [self validateAdvancedOptionsCheckBoxForEncoder:self.codec];
+ }
+ }
+ else
+ {
+ [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+ }
+}
+
+- (void)validateAdvancedOptionsCheckBoxForEncoder:(int)encoder
+{
+ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"HBShowAdvancedTab"] && (encoder == HB_VCODEC_X264))
+ {
+ [fX264UseAdvancedOptionsCheck setHidden:NO];
+ [fDividerLine setHidden:YES];
+ [fEncoderOptionsLabel setStringValue:NSLocalizedString(@"Encoder Options:", @"")];
+ }
+ else
+ {
+ [fX264UseAdvancedOptionsCheck setHidden:YES];
+ [fDividerLine setHidden:NO];
+ [fEncoderOptionsLabel setStringValue:NSLocalizedString(@"Encoder Options", @"")];
+ }
+}
+
+#pragma mark - apply settings
+
+- (void)applyVideoSettingsFromQueue:(NSDictionary *)queueToApply
+{
+ /* video encoder */
+ self.codec = [queueToApply[@"JobVideoEncoderVcodec"] intValue];
+
+ /* Lets run through the following functions to get variables set there */
+ [self videoEncoderPopUpChanged:nil];
+
+ /* advanced x264 options */
+ if ([queueToApply[@"x264UseAdvancedOptions"] intValue])
+ {
+ // we are using the advanced panel
+ [self.fAdvancedOptions setOptions:queueToApply[@"x264Option"]];
+ // preset does not use the x264 preset system, reset the widgets
+ [self setPreset: nil];
+ [self setTune: nil];
+ [self setOptionExtra:queueToApply[@"x264Option"]];
+ [self setProfile: nil];
+ [self setLevel: nil];
+ // enable the advanced panel and update the widgets
+ [fX264UseAdvancedOptionsCheck setState:NSOnState];
+ [self updateEncoderOptionsWidgets:nil];
+ }
+ else if (self.codec == HB_VCODEC_X264 || self.codec == HB_VCODEC_X265)
+ {
+ // we are using the x264 preset system
+ [self setPreset: queueToApply[@"VideoPreset"]];
+ [self setTune: queueToApply[@"VideoTune"]];
+ [self setOptionExtra:queueToApply[@"VideoOptionExtra"]];
+ [self setProfile: queueToApply[@"VideoProfile"]];
+ [self setLevel: queueToApply[@"VideoLevel"]];
+ // preset does not use the advanced panel, reset it
+ [self.fAdvancedOptions setOptions:@""];
+ // disable the advanced panel and update the widgets
+ [fX264UseAdvancedOptionsCheck setState:NSOffState];
+ [self updateEncoderOptionsWidgets:nil];
+ }
+ else
+ {
+ self.lavcOptions = queueToApply[@"VideoOptionExtra"];
+ }
+
+ /* Video quality */
+ self.qualityType = [queueToApply[@"VideoQualityType"] intValue] - 1;
+
+ [fVidBitrateField setStringValue:queueToApply[@"VideoAvgBitrate"]];
+
+ int direction;
+ float minValue, maxValue, granularity;
+
+ hb_video_quality_get_limits(self.codec, &minValue, &maxValue, &granularity, &direction);
+
+ if (!direction)
+ {
+ [fVidQualitySlider setFloatValue:[queueToApply[@"VideoQualitySlider"] floatValue]];
+ }
+ else
+ {
+ /*
+ * Since ffmpeg and x264 use an "inverted" slider (lower values
+ * indicate a higher quality) we invert the value on the slider
+ */
+ [fVidQualitySlider setFloatValue:([fVidQualitySlider minValue] +
+ [fVidQualitySlider maxValue] -
+ [queueToApply[@"VideoQualitySlider"] floatValue])];
+ }
+
+ [self videoMatrixChanged:nil];
+
+ /* Video framerate */
+ if ([queueToApply[@"VideoFramerate"] isEqualToString:@"Same as source"])
+ {
+ /* Now set the Video Frame Rate Mode to either vfr or cfr according to the preset */
+ if ([queueToApply[@"VideoFramerateMode"] isEqualToString:@"vfr"])
+ {
+ [fFramerateMatrix selectCellAtRow:0 column:0]; // we want vfr
+ }
+ else
+ {
+ [fFramerateMatrix selectCellAtRow:1 column:0]; // we want cfr
+ }
+ }
+ else
+ {
+ /* Now set the Video Frame Rate Mode to either pfr or cfr according to the preset */
+ if ([queueToApply[@"VideoFramerateMode"] isEqualToString:@"pfr"])
+ {
+ [fFramerateMatrix selectCellAtRow:0 column:0]; // we want pfr
+ }
+ else
+ {
+ [fFramerateMatrix selectCellAtRow:1 column:0]; // we want cfr
+ }
+ }
+ [fVidRatePopUp selectItemWithTitle:queueToApply[@"VideoFramerate"]];
+ [self videoFrameRateChanged:nil];
+
+ /* 2 Pass Encoding */
+ [fVidTwoPassCheck setState:[queueToApply[@"VideoTwoPass"] intValue]];
+ [self twoPassCheckboxChanged:nil];
+ /* Turbo 1st pass for 2 Pass Encoding */
+ [fVidTurboPassCheck setState:[queueToApply[@"VideoTurboTwoPass"] intValue]];
+}
+
+- (void)applySettingsFromPreset:(NSDictionary *)preset
+{
+ /* map legacy encoder names via libhb */
+ const char *strValue = hb_video_encoder_sanitize_name([preset[@"VideoEncoder"] UTF8String]);
+
+ self.codec = hb_video_encoder_get_from_name(strValue);
+ [self videoEncoderPopUpChanged:nil];
+
+ if (self.codec == HB_VCODEC_X264 || self.codec == HB_VCODEC_X265)
+ {
+ if (self.codec == HB_VCODEC_X264 &&
+ (!preset[@"x264UseAdvancedOptions"] ||
+ [preset[@"x264UseAdvancedOptions"] intValue]))
+ {
+ /*
+ * x264UseAdvancedOptions is not set (legacy preset)
+ * or set to 1 (enabled), so we use the old advanced panel
+ */
+ if (preset[@"x264Option"])
+ {
+ /* we set the advanced options string here if applicable */
+ [self.fAdvancedOptions setOptions:preset[@"x264Option"]];
+ [self setOptionExtra:preset[@"x264Option"]];
+ }
+ else
+ {
+ [self.fAdvancedOptions setOptions:@""];
+ [self setOptionExtra:nil];
+ }
+ /* preset does not use the x264 preset system, reset the widgets */
+ [self setPreset: nil];
+ [self setTune: nil];
+ [self setProfile:nil];
+ [self setLevel: nil];
+
+ /* we enable the advanced panel and update the widgets */
+ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"HBShowAdvancedTab"])
+ {
+ [fX264UseAdvancedOptionsCheck setState:NSOnState];
+ }
+ else
+ {
+ [fX264UseAdvancedOptionsCheck setState:NSOffState];
+ }
+ [self updateEncoderOptionsWidgets:nil];
+ }
+ else
+ {
+ // x264UseAdvancedOptions is set to 0 (disabled),
+ // so we use the new preset system and
+ // disable the advanced panel
+ [self.fAdvancedOptions setOptions:@""];
+ [fX264UseAdvancedOptionsCheck setState:NSOffState];
+
+ if (preset[@"x264Preset"])
+ {
+ // Read the old x264 preset keys
+ [self setPreset: preset[@"x264Preset"]];
+ [self setTune: preset[@"x264Tune"]];
+ [self setOptionExtra:preset[@"x264OptionExtra"]];
+ [self setProfile: preset[@"h264Profile"]];
+ [self setLevel: preset[@"h264Level"]];
+ }
+ else
+ {
+ // Read the new preset keys (0.10)
+ [self setPreset: preset[@"VideoPreset"]];
+ [self setTune: preset[@"VideoTune"]];
+ [self setOptionExtra:preset[@"VideoOptionExtra"]];
+ [self setProfile: preset[@"VideoProfile"]];
+ [self setLevel: preset[@"VideoLevel"]];
+ }
+
+ [self updateEncoderOptionsWidgets:nil];
+ }
+ }
+ else
+ {
+ if (preset[@"lavcOption"])
+ {
+ // Load the old format
+ self.lavcOptions = preset[@"lavcOption"];
+ }
+ else
+ {
+ self.lavcOptions = preset[@"VideoOptionExtra"];
+ }
+ }
+
+ int qualityType = [preset[@"VideoQualityType"] intValue] - 1;
+ /* Note since the removal of Target Size encoding, the possible values for VideoQuality type are 0 - 1.
+ * Therefore any preset that uses the old 2 for Constant Quality would now use 1 since there is one less index
+ * for the fVidQualityMatrix. It should also be noted that any preset that used the deprecated Target Size
+ * setting of 0 would set us to 0 or ABR since ABR is now tagged 0. Fortunately this does not affect any built-in
+ * presets since they all use Constant Quality or Average Bitrate.*/
+ if (qualityType == -1)
+ {
+ qualityType = 0;
+ }
+ self.qualityType = qualityType;
+
+ [fVidBitrateField setStringValue:preset[@"VideoAvgBitrate"]];
+
+ int direction;
+ float minValue, maxValue, granularity;
+
+ hb_video_quality_get_limits(self.codec, &minValue, &maxValue, &granularity, &direction);
+
+ if (!direction)
+ {
+ [fVidQualitySlider setFloatValue:[preset[@"VideoQualitySlider"] floatValue]];
+ }
+ else
+ {
+ /*
+ * Since ffmpeg and x264 use an "inverted" slider (lower values
+ * indicate a higher quality) we invert the value on the slider
+ */
+ [fVidQualitySlider setFloatValue:([fVidQualitySlider minValue] +
+ [fVidQualitySlider maxValue] -
+ [preset[@"VideoQualitySlider"] floatValue])];
+ }
+
+ [self videoMatrixChanged:nil];
+
+ /* Video framerate */
+ if ([preset[@"VideoFramerate"] isEqualToString:@"Same as source"])
+ {
+ /* Now set the Video Frame Rate Mode to either vfr or cfr according to the preset */
+ if (!preset[@"VideoFramerateMode"] ||
+ [preset[@"VideoFramerateMode"] isEqualToString:@"vfr"])
+ {
+ [fFramerateMatrix selectCellAtRow:0 column:0]; // we want vfr
+ }
+ else
+ {
+ [fFramerateMatrix selectCellAtRow:1 column:0]; // we want cfr
+ }
+ }
+ else
+ {
+ /* Now set the Video Frame Rate Mode to either pfr or cfr according to the preset */
+ if ([preset[@"VideoFramerateMode"] isEqualToString:@"pfr"] ||
+ [preset[@"VideoFrameratePFR"] intValue] == 1)
+ {
+ [fFramerateMatrix selectCellAtRow:0 column:0]; // we want pfr
+ }
+ else
+ {
+ [fFramerateMatrix selectCellAtRow:1 column:0]; // we want cfr
+ }
+ }
+ /* map legacy names via libhb */
+ int intValue = hb_video_framerate_get_from_name([preset[@"VideoFramerate"] UTF8String]);
+ [fVidRatePopUp selectItemWithTag:intValue];
+ [self videoFrameRateChanged:nil];
+
+ /* 2 Pass Encoding */
+ [fVidTwoPassCheck setState:[preset[@"VideoTwoPass"] intValue]];
+ [self twoPassCheckboxChanged:nil];
+
+ /* Turbo 1st pass for 2 Pass Encoding */
+ [fVidTurboPassCheck setState:[preset[@"VideoTurboTwoPass"] intValue]];
+}
+
+- (void)prepareVideoForQueueFileJob:(NSMutableDictionary *)queueFileJob
+{
+ queueFileJob[@"VideoEncoder"] = @(hb_video_encoder_get_name(self.codec));
+
+ /* x264 advanced options */
+ if ([fX264UseAdvancedOptionsCheck state])
+ {
+ // we are using the advanced panel
+ queueFileJob[@"x264UseAdvancedOptions"] = @1;
+ queueFileJob[@"x264Option"] = [self.fAdvancedOptions optionsString];
+ }
+ else if (self.codec == HB_VCODEC_X264 || self.codec == HB_VCODEC_X265)
+ {
+ // we are using the x264/x265 preset system
+ queueFileJob[@"x264UseAdvancedOptions"] = @0;
+ queueFileJob[@"VideoPreset"] = [self preset];
+ queueFileJob[@"VideoTune"] = [self tune];
+ queueFileJob[@"VideoOptionExtra"] = [self optionExtra];
+ queueFileJob[@"VideoProfile"] = [self profile];
+ queueFileJob[@"VideoLevel"] = [self level];
+ }
+ else
+ {
+ /* FFmpeg (lavc) Option String */
+ queueFileJob[@"VideoOptionExtra"] = self.lavcOptions;
+ }
+
+	queueFileJob[@"VideoQualityType"] = @(self.qualityType + 1);
+	queueFileJob[@"VideoAvgBitrate"] = [fVidBitrateField stringValue];
+	queueFileJob[@"VideoQualitySlider"] = @([fVidQualityRFField floatValue]);
+ /* Framerate */
+ queueFileJob[@"VideoFramerate"] = [fVidRatePopUp titleOfSelectedItem];
+ /* Frame Rate Mode */
+ if ([fFramerateMatrix selectedRow] == 1) // if selected we are cfr regardless of the frame rate popup
+ {
+ queueFileJob[@"VideoFramerateMode"] = @"cfr";
+ }
+ else
+ {
+ if ([fVidRatePopUp indexOfSelectedItem] == 0) // Same as source frame rate
+ {
+ queueFileJob[@"VideoFramerateMode"] = @"vfr";
+ }
+ else
+ {
+ queueFileJob[@"VideoFramerateMode"] = @"pfr";
+ }
+
+ }
+
+	/* 2 Pass Encoding */
+	queueFileJob[@"VideoTwoPass"] = @([fVidTwoPassCheck state]);
+	/* Turbo 2 pass Encoding fVidTurboPassCheck*/
+	queueFileJob[@"VideoTurboTwoPass"] = @([fVidTurboPassCheck state]);
+
+ /* Video encoder */
+	queueFileJob[@"JobVideoEncoderVcodec"] = @(self.codec);
+
+ /* Framerate */
+ queueFileJob[@"JobIndexVideoFramerate"] = @([[fVidRatePopUp selectedItem] tag]);
+}
+
+- (void)prepareVideoForJobPreview:(hb_job_t *)job andTitle:(hb_title_t *)title
+{
+ job->vcodec = self.codec;
+ job->fastfirstpass = 0;
+
+ job->chapter_markers = 0;
+
+	if (job->vcodec == HB_VCODEC_X264)
+ {
+ /* advanced x264 options */
+ NSString *tmpString;
+ // translate zero-length strings to NULL for libhb
+ const char *encoder_preset = NULL;
+ const char *encoder_tune = NULL;
+ const char *encoder_options = NULL;
+ const char *encoder_profile = NULL;
+ const char *encoder_level = NULL;
+ if ([fX264UseAdvancedOptionsCheck state])
+ {
+ // we are using the advanced panel
+ if ([(tmpString = [self.fAdvancedOptions optionsString]) length])
+ {
+ encoder_options = [tmpString UTF8String];
+ }
+ }
+ else
+ {
+ // we are using the x264 preset system
+ if ([(tmpString = [self tune]) length])
+ {
+ encoder_tune = [tmpString UTF8String];
+ }
+ if ([(tmpString = [self optionExtra]) length])
+ {
+ encoder_options = [tmpString UTF8String];
+ }
+ if ([(tmpString = [self profile]) length])
+ {
+ encoder_profile = [tmpString UTF8String];
+ }
+ if ([(tmpString = [self level]) length])
+ {
+ encoder_level = [tmpString UTF8String];
+ }
+ encoder_preset = [[self preset] UTF8String];
+ }
+ hb_job_set_encoder_preset (job, encoder_preset);
+ hb_job_set_encoder_tune (job, encoder_tune);
+ hb_job_set_encoder_options(job, encoder_options);
+ hb_job_set_encoder_profile(job, encoder_profile);
+ hb_job_set_encoder_level (job, encoder_level);
+ }
+ else if (job->vcodec & HB_VCODEC_FFMPEG_MASK)
+ {
+ hb_job_set_encoder_options(job, [self.lavcOptions UTF8String]);
+ }
+
+ /* Video settings */
+ int fps_mode, fps_num, fps_den;
+ if( [fVidRatePopUp indexOfSelectedItem] > 0 )
+ {
+ /* a specific framerate has been chosen */
+ fps_num = 27000000;
+ fps_den = (int)[[fVidRatePopUp selectedItem] tag];
+ if ([fFramerateMatrix selectedRow] == 1)
+ {
+ // CFR
+ fps_mode = 1;
+ }
+ else
+ {
+ // PFR
+ fps_mode = 2;
+ }
+ }
+ else
+ {
+ /* same as source */
+ fps_num = title->rate;
+ fps_den = title->rate_base;
+ if ([fFramerateMatrix selectedRow] == 1)
+ {
+ // CFR
+ fps_mode = 1;
+ }
+ else
+ {
+ // VFR
+ fps_mode = 0;
+ }
+ }
+
+ switch (self.qualityType)
+ {
+ case 0:
+ /* ABR */
+ job->vquality = -1.0;
+ job->vbitrate = [fVidBitrateField intValue];
+ break;
+ case 1:
+ /* Constant Quality */
+ job->vquality = [fVidQualityRFField floatValue];
+ job->vbitrate = 0;
+ break;
+ }
+
+ /* Add framerate shaping filter */
+ hb_filter_object_t *filter = hb_filter_init(HB_FILTER_VFR);
+ hb_add_filter(job, filter, [[NSString stringWithFormat:@"%d:%d:%d",
+ fps_mode, fps_num, fps_den] UTF8String]);
+}
+
+- (void)prepareVideoForPreset:(NSMutableDictionary *)preset
+{
+ preset[@"VideoEncoder"] = @(hb_video_encoder_get_name(self.codec));
+
+ /* x264 Options, this will either be advanced panel or the video tabs x264 presets panel with modded option string */
+ if ([fX264UseAdvancedOptionsCheck state] == NSOnState)
+ {
+ /* use the old advanced panel */
+ preset[@"x264UseAdvancedOptions"] = @1;
+ preset[@"x264Option"] = [self.fAdvancedOptions optionsString];
+ }
+ else if (self.codec == HB_VCODEC_X264 || self.codec == HB_VCODEC_X265)
+ {
+ /* use the x264 preset system */
+ preset[@"x264UseAdvancedOptions"] = @0;
+ preset[@"VideoPreset"] = [self preset];
+ preset[@"VideoTune"] = [self tune];
+ preset[@"VideoOptionExtra"] = [self optionExtra];
+ preset[@"VideoProfile"] = [self profile];
+ preset[@"VideoLevel"] = [self level];
+
+ /*
+ * bonus: set the unparsed options to make the preset compatible
+ * with old HB versions
+ */
+ if (fX264PresetsUnparsedUTF8String != NULL)
+ {
+ preset[@"x264Option"] = @(fX264PresetsUnparsedUTF8String);
+ }
+ else
+ {
+ preset[@"x264Option"] = @"";
+ }
+ }
+ else
+ {
+ /* FFmpeg (lavc) Option String */
+ preset[@"VideoOptionExtra"] = self.lavcOptions;
+ }
+
+ /* though there are actually only 0 - 1 types available in the ui we need to map to the old 0 - 2
+ * set of indexes from when we had 0 == Target , 1 == Abr and 2 == Constant Quality for presets
+ * to take care of any legacy presets. */
+ preset[@"VideoQualityType"] = @(self.qualityType +1);
+ preset[@"VideoAvgBitrate"] = [fVidBitrateField stringValue];
+ preset[@"VideoQualitySlider"] = @([fVidQualityRFField floatValue]);
+
+ /* Video framerate and framerate mode */
+ if ([fFramerateMatrix selectedRow] == 1)
+ {
+ preset[@"VideoFramerateMode"] = @"cfr";
+ }
+ if ([fVidRatePopUp indexOfSelectedItem] == 0) // Same as source is selected
+ {
+ preset[@"VideoFramerate"] = @"Same as source";
+
+ if ([fFramerateMatrix selectedRow] == 0)
+ {
+ preset[@"VideoFramerateMode"] = @"vfr";
+ }
+ }
+ else // translate the rate (selected item's tag) to the official libhb name
+ {
+ preset[@"VideoFramerate"] = [NSString stringWithFormat:@"%s",
+ hb_video_framerate_get_name((int)[[fVidRatePopUp selectedItem] tag])];
+
+ if ([fFramerateMatrix selectedRow] == 0)
+ {
+ preset[@"VideoFramerateMode"] = @"pfr";
+ }
+ }
+
+
+
+ /* 2 Pass Encoding */
+ preset[@"VideoTwoPass"] = @([fVidTwoPassCheck state]);
+ /* Turbo 2 pass Encoding fVidTurboPassCheck*/
+ preset[@"VideoTurboTwoPass"] = @([fVidTurboPassCheck state]);
+}
+
+#pragma mark - Video
+
+- (IBAction) videoEncoderPopUpChanged: (id) sender
+{
+ [self switchPresetViewForEncoder:self.codec];
+
+ [[NSNotificationCenter defaultCenter] postNotificationName:HBVideoEncoderChangedNotification object:self];
+
+ [self setupQualitySlider];
+	[self twoPassCheckboxChanged: sender];
+}
+
+- (IBAction) twoPassCheckboxChanged: (id) sender
+{
+	/* check to see if x264 is chosen */
+	if(self.codec == HB_VCODEC_X264)
+ {
+		if( [fVidTwoPassCheck state] == NSOnState)
+		{
+			[fVidTurboPassCheck setHidden: NO];
+		}
+		else
+		{
+			[fVidTurboPassCheck setHidden: YES];
+			[fVidTurboPassCheck setState: NSOffState];
+		}
+		/* Make sure Two Pass is checked if Turbo is checked */
+		if( [fVidTurboPassCheck state] == NSOnState)
+		{
+			[fVidTwoPassCheck setState: NSOnState];
+		}
+	}
+	else
+	{
+		[fVidTurboPassCheck setHidden: YES];
+		[fVidTurboPassCheck setState: NSOffState];
+	}
+
+	/* We call method method to change UI to reflect whether a preset is used or not*/
+	[self.fHBController customSettingUsed: sender];
+}
+
+- (IBAction ) videoFrameRateChanged: (id) sender
+{
+ /* if no valid framerate is selected, use "Same as source" */
+ if ([fVidRatePopUp selectedItem] == nil)
+ {
+ [fVidRatePopUp selectItemAtIndex:0];
+ }
+
+ /* Hide and set the PFR Checkbox to OFF if we are set to Same as Source */
+ /* Depending on whether or not Same as source is selected modify the title for
+ * fFramerateVfrPfrCell*/
+ if ([fVidRatePopUp indexOfSelectedItem] == 0) // We are Same as Source
+ {
+ [fFramerateVfrPfrCell setTitle:@"Variable Framerate"];
+ }
+ else
+ {
+ [fFramerateVfrPfrCell setTitle:@"Peak Framerate (VFR)"];
+
+
+ }
+
+ /* We call method method to change UI to reflect whether a preset is used or not*/
+	[self.fHBController customSettingUsed: sender];
+}
+
+- (IBAction) videoMatrixChanged: (id) sender;
+{
+ /* We use the selectedCell: tag of the fVidQualityMatrix instead of selectedRow
+ * so that the order of the video controls can be switched around.
+ * Constant quality is 1 and Average bitrate is 0 for reference. */
+ bool bitrate, quality;
+ bitrate = quality = false;
+ if( [fVidQualityMatrix isEnabled] )
+ {
+ switch(self.qualityType)
+ {
+ case 0:
+ bitrate = true;
+ break;
+ case 1:
+ quality = true;
+ break;
+ }
+ }
+
+ [fVidBitrateField setEnabled: bitrate];
+ [fVidQualitySlider setEnabled: quality];
+ [fVidQualityRFField setEnabled: quality];
+ [fVidQualityRFLabel setEnabled: quality];
+ [fVidTwoPassCheck setEnabled: !quality &&
+ [fVidQualityMatrix isEnabled]];
+ if( quality )
+ {
+ [fVidTwoPassCheck setState: NSOffState];
+		[fVidTurboPassCheck setHidden: YES];
+		[fVidTurboPassCheck setState: NSOffState];
+ }
+
+ [self qualitySliderChanged: sender];
+	[self.fHBController customSettingUsed: sender];
+}
+
+/* Use this method to setup the quality slider for cq/rf values depending on
+ * the video encoder selected.
+ */
+- (void) setupQualitySlider
+{
+ /*
+ * Get the current slider maxValue to check for a change in slider scale
+ * later so that we can choose a new similar value on the new slider scale
+ */
+ float previousMaxValue = [fVidQualitySlider maxValue];
+ float previousPercentOfSliderScale = ([fVidQualitySlider floatValue] /
+ ([fVidQualitySlider maxValue] -
+ [fVidQualitySlider minValue] + 1));
+ [fVidQualityRFLabel setStringValue:[NSString stringWithFormat:@"%s",
+ hb_video_quality_get_name(self.codec)]];
+ int direction;
+ float minValue, maxValue, granularity;
+ hb_video_quality_get_limits([self codec],
+ &minValue, &maxValue, &granularity, &direction);
+ if (granularity < 1.0f)
+ {
+ /*
+ * Encoders that allow fractional CQ values often have a low granularity
+ * which makes the slider hard to use, so use a value from preferences.
+ */
+ granularity = [[NSUserDefaults standardUserDefaults]
+ floatForKey:@"x264CqSliderFractional"];
+ }
+ [fVidQualitySlider setMinValue:minValue];
+ [fVidQualitySlider setMaxValue:maxValue];
+ [fVidQualitySlider setNumberOfTickMarks:((maxValue - minValue) *
+ (1.0f / granularity)) + 1];
+
+ /* check to see if we have changed slider scales */
+ if (previousMaxValue != maxValue)
+ {
+ /*
+ * if so, convert the old setting to the new scale as close as possible
+ * based on percentages
+ */
+ [fVidQualitySlider setFloatValue:((maxValue - minValue + 1.) *
+ (previousPercentOfSliderScale))];
+ }
+
+ [self qualitySliderChanged:nil];
+}
+
+- (IBAction) qualitySliderChanged: (id) sender
+{
+ /*
+ * Our constant quality slider is in a range based
+ * on each encoders qp/rf values. The range depends
+ * on the encoder. Also, the range is inverse of quality
+ * for all of the encoders *except* for theora
+ * (ie. as the "quality" goes up, the cq or rf value
+ * actually goes down). Since the IB sliders always set
+ * their max value at the right end of the slider, we
+ * will calculate the inverse, so as the slider floatValue
+ * goes up, we will show the inverse in the rf field
+ * so, the floatValue at the right for x264 would be 51
+ * and our rf field needs to show 0 and vice versa.
+ */
+ int direction;
+ float minValue, maxValue, granularity;
+ float inverseValue = ([fVidQualitySlider minValue] +
+ [fVidQualitySlider maxValue] -
+ [fVidQualitySlider floatValue]);
+
+ hb_video_quality_get_limits(self.codec, &minValue, &maxValue, &granularity, &direction);
+
+ if (!direction)
+ {
+ [fVidQualityRFField setStringValue:[NSString stringWithFormat:@"%.2f",
+ [fVidQualitySlider floatValue]]];
+ }
+ else
+ {
+ [fVidQualityRFField setStringValue:[NSString stringWithFormat:@"%.2f",
+ inverseValue]];
+ }
+ /* Show a warning if x264 and rf 0 which is lossless */
+ if (self.codec == HB_VCODEC_X264 && inverseValue == 0.0)
+ {
+ [fVidQualityRFField setStringValue:[NSString stringWithFormat:@"%.2f (Warning: Lossless)",
+ inverseValue]];
+ }
+
+ [self.fHBController customSettingUsed: sender];
+}
+
+- (IBAction)bitrateFieldChanged:(id)sender
+{
+ [self.fHBController customSettingUsed: sender];
+}
+
+#pragma mark - Video x264/x265 Presets
+
+- (void)switchPresetViewForEncoder:(int)encoder
+{
+ [self.fAdvancedOptions setHidden:YES];
+
+ if (encoder == HB_VCODEC_X264 || encoder == HB_VCODEC_X265)
+ {
+ [fPresetsBox setContentView:fPresetView];
+ [self setupPresetsWidgetsForEncoder:encoder];
+
+ if (encoder == HB_VCODEC_X264)
+ {
+ [self.fAdvancedOptions setHidden:NO];
+ }
+ }
+ else if (encoder & HB_VCODEC_FFMPEG_MASK)
+ {
+ [fPresetsBox setContentView:fSimplePresetView];
+ }
+ else
+ {
+ [fPresetsBox setContentView:nil];
+ }
+}
+
+- (void) setupPresetsWidgetsForEncoder:(int)encoder
+{
+ [self validateAdvancedOptionsCheckBoxForEncoder:(int)encoder];
+
+ if (encoder == HB_VCODEC_X264)
+ {
+ [fFastDecodeCheck setHidden:NO];
+ }
+ else
+ {
+ [fFastDecodeCheck setHidden:YES];
+ }
+
+ NSUInteger i;
+ // populate the preset system widgets via hb_video_encoder_get_* functions.
+ // store preset names
+ const char* const *presets = hb_video_encoder_get_presets(encoder);
+ NSMutableArray *tmp_array = [[NSMutableArray alloc] init];
+ for (i = 0; presets[i] != NULL; i++)
+ {
+ [tmp_array addObject:@(presets[i])];
+ if (!strcasecmp(presets[i], "medium"))
+ {
+ fMediumPresetIndex = i;
+ }
+ }
+ [fPresetNames autorelease];
+ fPresetNames = [[NSArray alloc] initWithArray:tmp_array];
+ [tmp_array release];
+ // setup the preset slider
+ [fPresetsSlider setMinValue:0];
+ [fPresetsSlider setMaxValue:[fPresetNames count]-1];
+ [fPresetsSlider setNumberOfTickMarks:[fPresetNames count]];
+ [fPresetsSlider setIntegerValue:fMediumPresetIndex];
+ [fPresetsSlider setTickMarkPosition:NSTickMarkAbove];
+ [fPresetsSlider setAllowsTickMarkValuesOnly:YES];
+ [self presetsSliderChanged: nil];
+ // setup the tune popup
+ [fTunePopUp removeAllItems];
+ [fTunePopUp addItemWithTitle: @"none"];
+ const char* const *tunes = hb_video_encoder_get_tunes(encoder);
+ for (int i = 0; tunes[i] != NULL; i++)
+ {
+ // we filter out "fastdecode" as we have a dedicated checkbox for it
+ if (strcasecmp(tunes[i], "fastdecode") != 0)
+ {
+ [fTunePopUp addItemWithTitle: @(tunes[i])];
+ }
+ }
+ // the fastdecode checkbox is off by default
+ [fFastDecodeCheck setState: NSOffState];
+ // setup the h264 profile popup
+ [fProfilePopUp removeAllItems];
+ const char* const *profiles = hb_video_encoder_get_profiles(encoder);
+ for (int i = 0; profiles[i] != NULL; i++)
+ {
+ [fProfilePopUp addItemWithTitle: @(profiles[i])];
+ }
+ // setup the level popup
+ [fLevelPopUp removeAllItems];
+ const char* const *levels = hb_video_encoder_get_levels(encoder);
+ for (int i = 0; levels != NULL && levels[i] != NULL; i++)
+ {
+ [fLevelPopUp addItemWithTitle: @(levels[i])];
+ }
+ if ([[fLevelPopUp itemArray] count] == 0)
+ {
+ [fLevelPopUp addItemWithTitle:@"auto"];
+ }
+ // clear the additional x264 options
+ [fDisplayPresetsAdditonalOptionsTextField setStringValue:@""];
+}
+
+- (void) enableEncoderOptionsWidgets: (BOOL) enable
+{
+ NSControl *controls[] =
+ {
+ fPresetsSlider, fPresetSliderLabel, fPresetSelectedTextField,
+ fTunePopUp, fTunePopUpLabel, fFastDecodeCheck,
+ fDisplayPresetsAdditonalOptionsTextField, fDisplayPresetsAdditonalOptionsLabel,
+ fProfilePopUp, fProfilePopUpLabel,
+ fLevelPopUp, fLevelPopUpLabel,
+ fDisplayX264PresetsUnparseTextField,
+ };
+
+ // check whether the x264 preset system and the advanced panel should be enabled
+ BOOL enable_x264_controls = (enable && [fX264UseAdvancedOptionsCheck state] == NSOffState);
+ BOOL enable_advanced_panel = (enable && [fX264UseAdvancedOptionsCheck state] == NSOnState);
+
+ // enable/disable the checkbox and advanced panel
+ [fX264UseAdvancedOptionsCheck setEnabled:enable];
+ [self.fAdvancedOptions setUIEnabled:enable_advanced_panel];
+
+ // enable/disable the x264 preset system controls
+ for (unsigned i = 0; i < (sizeof(controls) / sizeof(NSControl*)); i++)
+ {
+ if ([[controls[i] className] isEqualToString: @"NSTextField"])
+ {
+ NSTextField *tf = (NSTextField*)controls[i];
+ if (![tf isBezeled])
+ {
+ [tf setTextColor:(enable_x264_controls ?
+ [NSColor controlTextColor] :
+ [NSColor disabledControlTextColor])];
+ continue;
+ }
+ }
+ [controls[i] setEnabled:enable_x264_controls];
+ }
+}
+
+- (IBAction) updateEncoderOptionsWidgets: (id) sender
+{
+ if ([fX264UseAdvancedOptionsCheck state] == NSOnState)
+ {
+ /*
+ * we are using or switching to the advanced panel
+ *
+ * if triggered by selectPreset or applyQueueSettingToMainWindow,
+ * the options string will have been specified explicitly - leave it.
+ *
+ * if triggered by the advanced panel on/off checkbox, set the options
+ * string to the value of the unparsed x264 preset system string.
+ */
+ if (sender == fX264UseAdvancedOptionsCheck)
+ {
+ if (fX264PresetsUnparsedUTF8String != NULL)
+ {
+ [self.fAdvancedOptions setOptions:@(fX264PresetsUnparsedUTF8String)];
+ }
+ else
+ {
+ [self.fAdvancedOptions setOptions:@""];
+ }
+ }
+ }
+ // enable/disable, populate and update the various widgets
+ [self enableEncoderOptionsWidgets: YES];
+ [self presetsSliderChanged:nil];
+ [self.fAdvancedOptions X264AdvancedOptionsSet: nil];
+}
+
+#pragma mark - Lavc presets
+
+- (void) setLavcOptions: (NSString *)optionExtra
+{
+ if (!optionExtra)
+ {
+ [fLavcOptionsTextField setStringValue:@""];
+ return;
+ }
+ [fLavcOptionsTextField setStringValue:optionExtra];
+}
+
+- (NSString *) lavcOptions
+{
+ return [fLavcOptionsTextField stringValue];
+}
+
+#pragma mark -
+#pragma mark x264/x265 preset system
+
+- (NSString *) preset
+{
+ return (NSString *)fPresetNames[[fPresetsSlider intValue]];
+}
+
+- (NSString *) tune
+{
+ NSString *tune = @"";
+ if ([fTunePopUp indexOfSelectedItem])
+ {
+ tune = [tune stringByAppendingString:
+ [fTunePopUp titleOfSelectedItem]];
+ }
+ if ([fFastDecodeCheck state])
+ {
+ if ([tune length])
+ {
+ tune = [tune stringByAppendingString: @","];
+ }
+ tune = [tune stringByAppendingString: @"fastdecode"];
+ }
+ return tune;
+}
+
+- (NSString *) optionExtra
+{
+ return [fDisplayPresetsAdditonalOptionsTextField stringValue];
+}
+
+- (NSString *) profile
+{
+ if ([fProfilePopUp indexOfSelectedItem])
+ {
+ return [fProfilePopUp titleOfSelectedItem];
+ }
+ return @"";
+}
+
+- (NSString *) level
+{
+ if ([fLevelPopUp indexOfSelectedItem])
+ {
+ return [fLevelPopUp titleOfSelectedItem];
+ }
+ return @"";
+}
+
+- (void) setPreset: (NSString *)preset
+{
+ if (preset)
+ {
+ for (NSString *name in fPresetNames)
+ {
+ if ([name isEqualToString:preset])
+ {
+ [fPresetsSlider setIntegerValue:
+ [fPresetNames indexOfObject:name]];
+ return;
+ }
+ }
+ }
+ [fPresetsSlider setIntegerValue:fMediumPresetIndex];
+}
+
+- (void) setTune: (NSString *)tune
+{
+ if (!tune)
+ {
+ [fTunePopUp selectItemAtIndex:0];
+ [fFastDecodeCheck setState:NSOffState];
+ return;
+ }
+ // handle fastdecode
+ if ([tune rangeOfString:@"fastdecode"].location != NSNotFound)
+ {
+ [fFastDecodeCheck setState:NSOnState];
+ }
+ else
+ {
+ [fFastDecodeCheck setState:NSOffState];
+ }
+ // filter out fastdecode
+ tune = [tune stringByReplacingOccurrencesOfString:@","
+ withString:@""];
+ tune = [tune stringByReplacingOccurrencesOfString:@"fastdecode"
+ withString:@""];
+ // set the tune
+ [fTunePopUp selectItemWithTitle:tune];
+ // fallback
+ if ([fTunePopUp indexOfSelectedItem] == -1)
+ {
+ [fTunePopUp selectItemAtIndex:0];
+ }
+}
+
+- (void) setOptionExtra: (NSString *)optionExtra
+{
+ if (!optionExtra)
+ {
+ [fDisplayPresetsAdditonalOptionsTextField setStringValue:@""];
+ return;
+ }
+ [fDisplayPresetsAdditonalOptionsTextField setStringValue:optionExtra];
+}
+
+- (void) setProfile: (NSString *)profile
+{
+ if (!profile)
+ {
+ [fProfilePopUp selectItemAtIndex:0];
+ return;
+ }
+ // set the profile
+ [fProfilePopUp selectItemWithTitle:profile];
+ // fallback
+ if ([fProfilePopUp indexOfSelectedItem] == -1)
+ {
+ [fProfilePopUp selectItemAtIndex:0];
+ }
+}
+
+- (void) setLevel: (NSString *)level
+{
+ if (!level)
+ {
+ [fLevelPopUp selectItemAtIndex:0];
+ return;
+ }
+ // set the level
+ [fLevelPopUp selectItemWithTitle:level];
+ // fallback
+ if ([fLevelPopUp indexOfSelectedItem] == -1)
+ {
+ [fLevelPopUp selectItemAtIndex:0];
+ }
+}
+
+- (IBAction) presetsSliderChanged: (id) sender
+{
+ // we assume the preset names and slider were setup properly
+ [fPresetSelectedTextField setStringValue: [self preset]];
+
+ if (self.codec == HB_VCODEC_X264)
+ {
+ [self x264PresetsChangedDisplayExpandedOptions:nil];
+ [fDisplayX264PresetsUnparseTextField setHidden:NO];
+ }
+ else
+ {
+ [fDisplayX264PresetsUnparseTextField setHidden:YES];
+ }
+
+}
+
+/* This is called everytime a x264 widget in the video tab is changed to
+ display the expanded options in a text field via outlet fDisplayX264PresetsUnparseTextField
+ */
+- (IBAction) x264PresetsChangedDisplayExpandedOptions: (id) sender
+
+{
+ if (self.codec != HB_VCODEC_X264)
+ {
+ return;
+ }
+
+ /* API reference:
+ *
+ * char * hb_x264_param_unparse(const char *x264_preset,
+ * const char *x264_tune,
+ * const char *x264_encopts,
+ * const char *h264_profile,
+ * const char *h264_level,
+ * int width, int height);
+ */
+ NSString *tmpString;
+ const char *x264_preset = [[self preset] UTF8String];
+ const char *x264_tune = NULL;
+ const char *advanced_opts = NULL;
+ const char *h264_profile = NULL;
+ const char *h264_level = NULL;
+ int width = 1;
+ int height = 1;
+ // prepare the tune, advanced options, profile and level
+ if ([(tmpString = [self tune]) length])
+ {
+ x264_tune = [tmpString UTF8String];
+ }
+ if ([(tmpString = [self optionExtra]) length])
+ {
+ advanced_opts = [tmpString UTF8String];
+ }
+ if ([(tmpString = [self profile]) length])
+ {
+ h264_profile = [tmpString UTF8String];
+ }
+ if ([(tmpString = [self level]) length])
+ {
+ h264_level = [tmpString UTF8String];
+ }
+ // width and height must be non-zero
+ if (_fPresetsWidthForUnparse && _fPresetsHeightForUnparse)
+ {
+ width = (int)_fPresetsWidthForUnparse;
+ height = (int)_fPresetsHeightForUnparse;
+ }
+ // free the previous unparsed string
+ free(fX264PresetsUnparsedUTF8String);
+ // now, unparse
+ fX264PresetsUnparsedUTF8String = hb_x264_param_unparse(x264_preset,
+ x264_tune,
+ advanced_opts,
+ h264_profile,
+ h264_level,
+ width, height);
+ // update the text field
+ if (fX264PresetsUnparsedUTF8String != NULL)
+ {
+ [fDisplayX264PresetsUnparseTextField setStringValue:
+ [NSString stringWithFormat:@"x264 Unparse: %s",
+ fX264PresetsUnparsedUTF8String]];
+ }
+ else
+ {
+ [fDisplayX264PresetsUnparseTextField setStringValue:@"x264 Unparse:"];
+ }
+}
+
+@end

HandBrake-0.10.0.tar.bz2/macosx/HBViewValidation.h Added

HandBrake-0.9.9.tar.bz2/macosx/HandBrake.xcodeproj/project.pbxproj -> HandBrake-0.10.0.tar.bz2/macosx/HandBrake.xcodeproj/project.pbxproj Changed

@@ -9,6 +9,8 @@
 /* Begin PBXBuildFile section */
 		226268E01572CC7300477B4E /* libavresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226268DF1572CC7300477B4E /* libavresample.a */; };
 		226268E11572CC7300477B4E /* libavresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226268DF1572CC7300477B4E /* libavresample.a */; };
+		22DD2C4A177B94DB00EF50D3 /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22DD2C49177B94DB00EF50D3 /* libvpx.a */; };
+		22DD2C4B177B95DA00EF50D3 /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22DD2C49177B94DB00EF50D3 /* libvpx.a */; };
 		273F202314ADB8650021BE6D /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202214ADB8650021BE6D /* IOKit.framework */; };
 		273F202614ADB8A40021BE6D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202514ADB8A40021BE6D /* libz.dylib */; };
 		273F202814ADB8BE0021BE6D /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202714ADB8BE0021BE6D /* libbz2.dylib */; };
@@ -19,7 +21,6 @@
 		273F208914ADBE3B0021BE6D /* fakexcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 273F208514ADBE3B0021BE6D /* fakexcode.cpp */; };
 		273F208A14ADBE3B0021BE6D /* parsecsv.c in Sources */ = {isa = PBXBuildFile; fileRef = 273F208614ADBE3B0021BE6D /* parsecsv.c */; };
 		273F208B14ADBE3B0021BE6D /* test.c in Sources */ = {isa = PBXBuildFile; fileRef = 273F208814ADBE3B0021BE6D /* test.c */; };
-		273F20AB14ADBE670021BE6D /* ChapterTitles.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F208D14ADBE670021BE6D /* ChapterTitles.m */; };
 		273F20AC14ADBE670021BE6D /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F208F14ADBE670021BE6D /* Controller.m */; };
 		273F20AD14ADBE670021BE6D /* HBAdvancedController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209014ADBE670021BE6D /* HBAdvancedController.m */; };
 		273F20AE14ADBE670021BE6D /* HBAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209214ADBE670021BE6D /* HBAudio.m */; };
@@ -29,10 +30,9 @@
 		273F20B314ADBE670021BE6D /* HBOutputPanelController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209C14ADBE670021BE6D /* HBOutputPanelController.m */; };
 		273F20B414ADBE670021BE6D /* HBOutputRedirect.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209E14ADBE670021BE6D /* HBOutputRedirect.m */; };
 		273F20B514ADBE670021BE6D /* HBPreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F20A014ADBE670021BE6D /* HBPreferencesController.m */; };
-		273F20B614ADBE670021BE6D /* HBPresets.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F20A214ADBE670021BE6D /* HBPresets.m */; };
-		273F20B714ADBE670021BE6D /* HBPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F20A414ADBE670021BE6D /* HBPreviewController.m */; };
+		273F20B614ADBE670021BE6D /* HBPresetsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F20A214ADBE670021BE6D /* HBPresetsManager.m */; };
+		273F20B714ADBE670021BE6D /* HBPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F20A414ADBE670021BE6D /* HBPreviewController.m */; settings = {COMPILER_FLAGS = "-Wno-deprecated-declarations"; }; };
 		273F20B814ADBE670021BE6D /* HBQueueController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 273F20A614ADBE670021BE6D /* HBQueueController.mm */; };
-		273F20B914ADBE670021BE6D /* HBSubtitles.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F20A814ADBE670021BE6D /* HBSubtitles.m */; };
 		273F20BA14ADBE670021BE6D /* PictureController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F20AA14ADBE670021BE6D /* PictureController.m */; };
 		273F20BE14ADC09F0021BE6D /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 273F20BD14ADC09F0021BE6D /* main.mm */; };
 		273F20C314ADC4AE0021BE6D /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202914ADB8D60021BE6D /* libiconv.dylib */; };
@@ -41,24 +41,19 @@
 		273F20C614ADC4F50021BE6D /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202214ADB8650021BE6D /* IOKit.framework */; };
 		273F20C814ADC4FF0021BE6D /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F20C714ADC4FF0021BE6D /* QTKit.framework */; };
 		273F20C914ADC5150021BE6D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202F14ADB9790021BE6D /* AudioToolbox.framework */; };
-		273F20CB14ADC89A0021BE6D /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 273F20BF14ADC1250021BE6D /* Growl.framework */; };
-		273F20CC14ADC8A10021BE6D /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 273F20C014ADC1250021BE6D /* Sparkle.framework */; };
+		273F20CB14ADC89A0021BE6D /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 273F20BF14ADC1250021BE6D /* Growl.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		273F20CC14ADC8A10021BE6D /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 273F20C014ADC1250021BE6D /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		273F214C14ADCBF80021BE6D /* Delete.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212514ADCBF70021BE6D /* Delete.png */; };
 		273F214D14ADCBF80021BE6D /* DeleteHighlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212614ADCBF70021BE6D /* DeleteHighlight.png */; };
 		273F214E14ADCBF80021BE6D /* DeleteHighlightPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212714ADCBF70021BE6D /* DeleteHighlightPressed.png */; };
 		273F214F14ADCBF80021BE6D /* DeletePressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212814ADCBF70021BE6D /* DeletePressed.png */; };
 		273F215114ADCBF80021BE6D /* EncodeCanceled.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212A14ADCBF80021BE6D /* EncodeCanceled.png */; };
-		273F215214ADCBF80021BE6D /* EncodeComplete.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212B14ADCBF80021BE6D /* EncodeComplete.png */; };
 		273F215314ADCBF80021BE6D /* EncodeWorking0.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212C14ADCBF80021BE6D /* EncodeWorking0.png */; };
 		273F215414ADCBF80021BE6D /* EncodeWorking1.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212D14ADCBF80021BE6D /* EncodeWorking1.png */; };
 		273F215514ADCBF80021BE6D /* EncodeWorking2.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212E14ADCBF80021BE6D /* EncodeWorking2.png */; };
 		273F215614ADCBF80021BE6D /* EncodeWorking3.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212F14ADCBF80021BE6D /* EncodeWorking3.png */; };
 		273F215714ADCBF80021BE6D /* EncodeWorking4.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213014ADCBF80021BE6D /* EncodeWorking4.png */; };
 		273F215814ADCBF80021BE6D /* EncodeWorking5.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213114ADCBF80021BE6D /* EncodeWorking5.png */; };
-		273F215B14ADCBF80021BE6D /* JobPassFirstSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213414ADCBF80021BE6D /* JobPassFirstSmall.png */; };
-		273F215D14ADCBF80021BE6D /* JobPassSecondSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213614ADCBF80021BE6D /* JobPassSecondSmall.png */; };
-		273F215F14ADCBF80021BE6D /* JobPassSubtitleSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213814ADCBF80021BE6D /* JobPassSubtitleSmall.png */; };
-		273F216014ADCBF80021BE6D /* JobPassUnknownSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213914ADCBF80021BE6D /* JobPassUnknownSmall.png */; };
 		273F216114ADCBF80021BE6D /* JobSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213A14ADCBF80021BE6D /* JobSmall.png */; };
 		273F216714ADCBF80021BE6D /* Reveal.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F214014ADCBF80021BE6D /* Reveal.png */; };
 		273F216814ADCBF80021BE6D /* RevealHighlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F214114ADCBF80021BE6D /* RevealHighlight.png */; };
@@ -74,10 +69,8 @@
 		273F219114ADDDA10021BE6D /* Queue.xib in Resources */ = {isa = PBXBuildFile; fileRef = 273F218814ADDDA10021BE6D /* Queue.xib */; };
 		273F21C114ADE7A20021BE6D /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F20BF14ADC1250021BE6D /* Growl.framework */; };
 		273F21C214ADE7BC0021BE6D /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F20C014ADC1250021BE6D /* Sparkle.framework */; };
-		27D6C72514B1019100B785E4 /* libhb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72414B1019100B785E4 /* libhb.a */; };
-		27D6C72614B1019100B785E4 /* libhb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72414B1019100B785E4 /* libhb.a */; };
-		27D6C74114B102DA00B785E4 /* liba52.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72714B102DA00B785E4 /* liba52.a */; };
-		27D6C74214B102DA00B785E4 /* liba52.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72714B102DA00B785E4 /* liba52.a */; };
+		27D6C72514B1019100B785E4 /* libhandbrake.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72414B1019100B785E4 /* libhandbrake.a */; };
+		27D6C72614B1019100B785E4 /* libhandbrake.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72414B1019100B785E4 /* libhandbrake.a */; };
 		27D6C74314B102DA00B785E4 /* libass.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72814B102DA00B785E4 /* libass.a */; };
 		27D6C74414B102DA00B785E4 /* libass.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72814B102DA00B785E4 /* libass.a */; };
 		27D6C74514B102DA00B785E4 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72914B102DA00B785E4 /* libavcodec.a */; };
@@ -92,22 +85,14 @@
 		27D6C75014B102DA00B785E4 /* libdvdnav.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72E14B102DA00B785E4 /* libdvdnav.a */; };
 		27D6C75114B102DA00B785E4 /* libdvdread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72F14B102DA00B785E4 /* libdvdread.a */; };
 		27D6C75214B102DA00B785E4 /* libdvdread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72F14B102DA00B785E4 /* libdvdread.a */; };
-		27D6C75314B102DA00B785E4 /* libfaac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73014B102DA00B785E4 /* libfaac.a */; };
-		27D6C75414B102DA00B785E4 /* libfaac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73014B102DA00B785E4 /* libfaac.a */; };
 		27D6C75514B102DA00B785E4 /* libfontconfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73114B102DA00B785E4 /* libfontconfig.a */; };
 		27D6C75614B102DA00B785E4 /* libfontconfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73114B102DA00B785E4 /* libfontconfig.a */; };
 		27D6C75714B102DA00B785E4 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73214B102DA00B785E4 /* libfreetype.a */; };
 		27D6C75814B102DA00B785E4 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73214B102DA00B785E4 /* libfreetype.a */; };
 		27D6C75914B102DA00B785E4 /* libfribidi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73314B102DA00B785E4 /* libfribidi.a */; };
 		27D6C75A14B102DA00B785E4 /* libfribidi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73314B102DA00B785E4 /* libfribidi.a */; };
-		27D6C75B14B102DA00B785E4 /* libmkv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73414B102DA00B785E4 /* libmkv.a */; };
-		27D6C75C14B102DA00B785E4 /* libmkv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73414B102DA00B785E4 /* libmkv.a */; };
 		27D6C75E14B102DA00B785E4 /* libmp3lame.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73614B102DA00B785E4 /* libmp3lame.a */; };
 		27D6C75F14B102DA00B785E4 /* libmp3lame.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73614B102DA00B785E4 /* libmp3lame.a */; };
-		27D6C76014B102DA00B785E4 /* libmp4v2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73714B102DA00B785E4 /* libmp4v2.a */; };
-		27D6C76114B102DA00B785E4 /* libmp4v2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73714B102DA00B785E4 /* libmp4v2.a */; };
-		27D6C76214B102DA00B785E4 /* libmpeg2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73814B102DA00B785E4 /* libmpeg2.a */; };
-		27D6C76314B102DA00B785E4 /* libmpeg2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73814B102DA00B785E4 /* libmpeg2.a */; };
 		27D6C76414B102DA00B785E4 /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73914B102DA00B785E4 /* libogg.a */; };
 		27D6C76514B102DA00B785E4 /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73914B102DA00B785E4 /* libogg.a */; };
 		27D6C76614B102DA00B785E4 /* libsamplerate.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73A14B102DA00B785E4 /* libsamplerate.a */; };
@@ -126,11 +111,54 @@
 		27D6C77314B102DA00B785E4 /* libxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C74014B102DA00B785E4 /* libxml2.a */; };
 		3490BCB41614CF8D002A5AD7 /* HandBrake.icns in Resources */ = {isa = PBXBuildFile; fileRef = 3490BCB31614CF8D002A5AD7 /* HandBrake.icns */; };
 		46AB433515F98A2B009C0961 /* DockTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 46AB433415F98A2B009C0961 /* DockTextField.m */; };
+		A90A0CAF1988D57200DA65CE /* HBAudioTrackPreset.m in Sources */ = {isa = PBXBuildFile; fileRef = A90A0CAE1988D57200DA65CE /* HBAudioTrackPreset.m */; };
+		A91726E7197291BC00D1AFEF /* HBChapterTitlesController.m in Sources */ = {isa = PBXBuildFile; fileRef = A91726E6197291BC00D1AFEF /* HBChapterTitlesController.m */; };
+		A91C024D1A16516A00DEA6F3 /* JobSmall@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A91C024C1A16516A00DEA6F3 /* JobSmall@2x.png */; };
+		A91C02521A165EA200DEA6F3 /* EncodeComplete.png in Resources */ = {isa = PBXBuildFile; fileRef = A91C02501A165EA200DEA6F3 /* EncodeComplete.png */; };
+		A91C02531A165EA200DEA6F3 /* EncodeComplete@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A91C02511A165EA200DEA6F3 /* EncodeComplete@2x.png */; };
+		A91C025A1A166BE300DEA6F3 /* EncodeWorking0@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A91C02541A166BE300DEA6F3 /* EncodeWorking0@2x.png */; };
+		A91C025B1A166BE300DEA6F3 /* EncodeWorking1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A91C02551A166BE300DEA6F3 /* EncodeWorking1@2x.png */; };
+		A91C025C1A166BE300DEA6F3 /* EncodeWorking2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A91C02561A166BE300DEA6F3 /* EncodeWorking2@2x.png */; };
+		A91C025D1A166BE300DEA6F3 /* EncodeWorking3@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A91C02571A166BE300DEA6F3 /* EncodeWorking3@2x.png */; };
+		A91C025E1A166BE300DEA6F3 /* EncodeWorking4@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A91C02581A166BE300DEA6F3 /* EncodeWorking4@2x.png */; };
+		A91C025F1A166BE300DEA6F3 /* EncodeWorking5@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A91C02591A166BE300DEA6F3 /* EncodeWorking5@2x.png */; };
+		A9204DC51A16C5AB007CA74C /* Delete@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9204DC21A16C5AB007CA74C /* Delete@2x.png */; };
+		A9204DC61A16C5AB007CA74C /* DeleteHighlightPressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9204DC31A16C5AB007CA74C /* DeleteHighlightPressed@2x.png */; };
+		A9204DC71A16C5AB007CA74C /* DeletePressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9204DC41A16C5AB007CA74C /* DeletePressed@2x.png */; };
+		A9252C041A17343500B8B7F8 /* DeleteHighlight@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9252C031A17343500B8B7F8 /* DeleteHighlight@2x.png */; };
+		A9252C091A173D4800B8B7F8 /* Reveal@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9252C051A173D4800B8B7F8 /* Reveal@2x.png */; };
+		A9252C0A1A173D4800B8B7F8 /* RevealHighlight@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9252C061A173D4800B8B7F8 /* RevealHighlight@2x.png */; };
+		A9252C0B1A173D4800B8B7F8 /* RevealHighlightPressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9252C071A173D4800B8B7F8 /* RevealHighlightPressed@2x.png */; };
+		A9252C0C1A173D4800B8B7F8 /* RevealPressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9252C081A173D4800B8B7F8 /* RevealPressed@2x.png */; };
+		A932E26C1988334B0047D13E /* AudioDefaults.xib in Resources */ = {isa = PBXBuildFile; fileRef = A932E26A1988334B0047D13E /* AudioDefaults.xib */; };
+		A932E26F198833920047D13E /* HBAudioDefaultsController.m in Sources */ = {isa = PBXBuildFile; fileRef = A932E26E198833920047D13E /* HBAudioDefaultsController.m */; };
+		A932E273198834130047D13E /* HBAudioDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = A932E272198834130047D13E /* HBAudioDefaults.m */; };
+		A93E0ED31972957000FD67FB /* HBVideoController.m in Sources */ = {isa = PBXBuildFile; fileRef = A93E0ED11972957000FD67FB /* HBVideoController.m */; };
+		A93E0ED71972958C00FD67FB /* Video.xib in Resources */ = {isa = PBXBuildFile; fileRef = A93E0ED51972958C00FD67FB /* Video.xib */; };
+		A9523937199A6AAE00588AEF /* HBFilters.m in Sources */ = {isa = PBXBuildFile; fileRef = A9523936199A6AAE00588AEF /* HBFilters.m */; };
+		A967E4BA1A16768200DF1DFC /* EncodeCanceled@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A967E4B91A16768200DF1DFC /* EncodeCanceled@2x.png */; };
+		A98C29C41977B10600AF5DED /* HBLanguagesSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = A98C29C31977B10600AF5DED /* HBLanguagesSelection.m */; };
+		A9935213196F38A70069C6B7 /* ChaptersTitles.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9935211196F38A70069C6B7 /* ChaptersTitles.xib */; };
+		A9AA447A1970664A00D7DEFC /* HBUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = A9AA44791970664A00D7DEFC /* HBUtilities.m */; };
+		A9BB0F2719A0ECE40079F1C1 /* HBHUDButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A9BB0F2619A0ECE40079F1C1 /* HBHUDButtonCell.m */; };
+		A9C0DB85197E7B0000DF55B3 /* SubtitlesDefaults.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9C0DB83197E7B0000DF55B3 /* SubtitlesDefaults.xib */; };
+		A9C9F88919A733FE00DC8923 /* HBHUDView.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C9F88819A733FE00DC8923 /* HBHUDView.m */; };
+		A9CF25F11990D62C0023F727 /* Presets.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9CF25EF1990D62C0023F727 /* Presets.xib */; };
+		A9CF25F41990D64E0023F727 /* HBPreset.m in Sources */ = {isa = PBXBuildFile; fileRef = A9CF25F31990D64E0023F727 /* HBPreset.m */; };
+		A9CF25F71990D6820023F727 /* HBPresetsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9CF25F61990D6820023F727 /* HBPresetsViewController.m */; };
+		A9D1E41718262364002F6424 /* HBPreviewGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D1E41618262364002F6424 /* HBPreviewGenerator.m */; };
+		A9D488A51996270300E9B1BA /* HBTreeNode.m in Sources */ = {isa = PBXBuildFile; fileRef = A9D488A41996270300E9B1BA /* HBTreeNode.m */; };
+		A9DC6C52196F04F6002AE6B4 /* HBSubtitlesController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9DC6C50196F04F6002AE6B4 /* HBSubtitlesController.m */; };
+		A9DC6C56196F0517002AE6B4 /* Subtitles.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9DC6C54196F0517002AE6B4 /* Subtitles.xib */; };
 		A9E1467B16BC2ABD00C307BC /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9E1467A16BC2ABD00C307BC /* QuartzCore.framework */; };
 		A9E1468016BC2AD800C307BC /* next-p.pdf in Resources */ = {isa = PBXBuildFile; fileRef = A9E1467C16BC2AD800C307BC /* next-p.pdf */; };
 		A9E1468116BC2AD800C307BC /* pause-p.pdf in Resources */ = {isa = PBXBuildFile; fileRef = A9E1467D16BC2AD800C307BC /* pause-p.pdf */; };
 		A9E1468216BC2AD800C307BC /* play-p.pdf in Resources */ = {isa = PBXBuildFile; fileRef = A9E1467E16BC2AD800C307BC /* play-p.pdf */; };
 		A9E1468316BC2AD800C307BC /* prev-p.pdf in Resources */ = {isa = PBXBuildFile; fileRef = A9E1467F16BC2AD800C307BC /* prev-p.pdf */; };
+		A9F2EB6F196F12C800066546 /* Audio.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9F2EB6D196F12C800066546 /* Audio.xib */; };
+		A9F472891976B7F30009EC65 /* HBSubtitlesDefaultsController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9F472871976B7F30009EC65 /* HBSubtitlesDefaultsController.m */; };
+		A9F4728D1976BAA70009EC65 /* HBSubtitlesDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = A9F4728C1976BAA70009EC65 /* HBSubtitlesDefaults.m */; };
+		A9F7102619A475EC00F61301 /* HBDockTile.m in Sources */ = {isa = PBXBuildFile; fileRef = A9F7102519A475EC00F61301 /* HBDockTile.m */; };
 		D2BCB10916F5152C0084604C /* activity.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB0F616F515230084604C /* activity.png */; };
 		D2BCB10A16F5152C0084604C /* activity@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB0F716F515230084604C /* activity@2x.png */; };
 		D2BCB10B16F5152C0084604C /* addqueue.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB0F816F515240084604C /* addqueue.png */; };
@@ -201,7 +229,11 @@
 
 /* Begin PBXFileReference section */
 		226268DF1572CC7300477B4E /* libavresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavresample.a; path = external/contrib/lib/libavresample.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		22CC9E74191EBEA500C69D81 /* libx265.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libx265.a; path = external/contrib/lib/libx265.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		22DD2C49177B94DB00EF50D3 /* libvpx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvpx.a; path = external/contrib/lib/libvpx.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		271BA4C014B119F800BC1D2C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Info.plist; path = external/macosx/Info.plist; sourceTree = BUILT_PRODUCTS_DIR; };
+		271E74EF182F260C0077C311 /* osx109.i386.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = osx109.i386.xcconfig; sourceTree = "<group>"; };
+		271E74F0182F260C0077C311 /* osx109.x86_64.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = osx109.x86_64.xcconfig; sourceTree = "<group>"; };
 		273F1FFF14ADAE950021BE6D /* HandBrakeCLI */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = HandBrakeCLI; sourceTree = BUILT_PRODUCTS_DIR; };
 		273F202214ADB8650021BE6D /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		273F202514ADB8A40021BE6D /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
@@ -218,8 +250,6 @@
 		273F208614ADBE3B0021BE6D /* parsecsv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parsecsv.c; sourceTree = "<group>"; };
 		273F208714ADBE3B0021BE6D /* parsecsv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parsecsv.h; sourceTree = "<group>"; };
 		273F208814ADBE3B0021BE6D /* test.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = test.c; sourceTree = "<group>"; };
-		273F208C14ADBE670021BE6D /* ChapterTitles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChapterTitles.h; sourceTree = "<group>"; };
-		273F208D14ADBE670021BE6D /* ChapterTitles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChapterTitles.m; sourceTree = "<group>"; };
 		273F208E14ADBE670021BE6D /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Controller.h; sourceTree = "<group>"; };
 		273F208F14ADBE670021BE6D /* Controller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Controller.m; sourceTree = "<group>"; };
 		273F209014ADBE670021BE6D /* HBAdvancedController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAdvancedController.m; sourceTree = "<group>"; };
@@ -237,14 +267,11 @@
 		273F209E14ADBE670021BE6D /* HBOutputRedirect.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBOutputRedirect.m; sourceTree = "<group>"; };
 		273F209F14ADBE670021BE6D /* HBPreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPreferencesController.h; sourceTree = "<group>"; };
 		273F20A014ADBE670021BE6D /* HBPreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPreferencesController.m; sourceTree = "<group>"; };
-		273F20A114ADBE670021BE6D /* HBPresets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPresets.h; sourceTree = "<group>"; };
-		273F20A214ADBE670021BE6D /* HBPresets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPresets.m; sourceTree = "<group>"; };
+		273F20A114ADBE670021BE6D /* HBPresetsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPresetsManager.h; sourceTree = "<group>"; };
+		273F20A214ADBE670021BE6D /* HBPresetsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPresetsManager.m; sourceTree = "<group>"; };
 		273F20A314ADBE670021BE6D /* HBPreviewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPreviewController.h; sourceTree = "<group>"; };
 		273F20A414ADBE670021BE6D /* HBPreviewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPreviewController.m; sourceTree = "<group>"; };
-		273F20A514ADBE670021BE6D /* HBQueueController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBQueueController.h; sourceTree = "<group>"; };
-		273F20A614ADBE670021BE6D /* HBQueueController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HBQueueController.mm; sourceTree = "<group>"; };
-		273F20A714ADBE670021BE6D /* HBSubtitles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBSubtitles.h; sourceTree = "<group>"; };
-		273F20A814ADBE670021BE6D /* HBSubtitles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBSubtitles.m; sourceTree = "<group>"; };
+		273F20A614ADBE670021BE6D /* HBQueueController.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = HBQueueController.mm; sourceTree = "<group>"; };
 		273F20A914ADBE670021BE6D /* PictureController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureController.h; sourceTree = "<group>"; };
 		273F20AA14ADBE670021BE6D /* PictureController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PictureController.m; sourceTree = "<group>"; };
 		273F20BD14ADC09F0021BE6D /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
@@ -256,24 +283,19 @@
 		273F212714ADCBF70021BE6D /* DeleteHighlightPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeleteHighlightPressed.png; sourceTree = "<group>"; };
 		273F212814ADCBF70021BE6D /* DeletePressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeletePressed.png; sourceTree = "<group>"; };
 		273F212A14ADCBF80021BE6D /* EncodeCanceled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeCanceled.png; sourceTree = "<group>"; };
-		273F212B14ADCBF80021BE6D /* EncodeComplete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeComplete.png; sourceTree = "<group>"; };
 		273F212C14ADCBF80021BE6D /* EncodeWorking0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking0.png; sourceTree = "<group>"; };
 		273F212D14ADCBF80021BE6D /* EncodeWorking1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking1.png; sourceTree = "<group>"; };
 		273F212E14ADCBF80021BE6D /* EncodeWorking2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking2.png; sourceTree = "<group>"; };
 		273F212F14ADCBF80021BE6D /* EncodeWorking3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking3.png; sourceTree = "<group>"; };
 		273F213014ADCBF80021BE6D /* EncodeWorking4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking4.png; sourceTree = "<group>"; };
 		273F213114ADCBF80021BE6D /* EncodeWorking5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking5.png; sourceTree = "<group>"; };
-		273F213414ADCBF80021BE6D /* JobPassFirstSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassFirstSmall.png; sourceTree = "<group>"; };
-		273F213614ADCBF80021BE6D /* JobPassSecondSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassSecondSmall.png; sourceTree = "<group>"; };
-		273F213814ADCBF80021BE6D /* JobPassSubtitleSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassSubtitleSmall.png; sourceTree = "<group>"; };
-		273F213914ADCBF80021BE6D /* JobPassUnknownSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassUnknownSmall.png; sourceTree = "<group>"; };
 		273F213A14ADCBF80021BE6D /* JobSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobSmall.png; sourceTree = "<group>"; };
 		273F214014ADCBF80021BE6D /* Reveal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Reveal.png; sourceTree = "<group>"; };
 		273F214114ADCBF80021BE6D /* RevealHighlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RevealHighlight.png; sourceTree = "<group>"; };
 		273F214214ADCBF80021BE6D /* RevealHighlightPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RevealHighlightPressed.png; sourceTree = "<group>"; };
 		273F214314ADCBF80021BE6D /* RevealPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RevealPressed.png; sourceTree = "<group>"; };
 		273F217B14ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = AdvancedView.xib; sourceTree = "<group>"; };
-		273F217D14ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = "<group>"; };
+		273F217D14ADDDA10021BE6D /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = "<group>"; };
 		273F217F14ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = MainMenu.xib; sourceTree = "<group>"; };
 		273F218114ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = OutputPanel.xib; sourceTree = "<group>"; };
 		273F218314ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = PicturePreview.xib; sourceTree = "<group>"; };
@@ -285,8 +307,11 @@
 		277A3FD014AE84C500A835E4 /* osx106.i386.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = osx106.i386.xcconfig; sourceTree = "<group>"; };
 		277A3FD114AE84C500A835E4 /* osx106.x86_64.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = osx106.x86_64.xcconfig; sourceTree = "<group>"; };
 		277A3FD214AE84C500A835E4 /* osx107.x86_64.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = osx107.x86_64.xcconfig; sourceTree = "<group>"; };
-		27D6C72414B1019100B785E4 /* libhb.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhb.a; path = external/libhb/libhb.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		27D6C72714B102DA00B785E4 /* liba52.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liba52.a; path = external/contrib/lib/liba52.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		277EFE8917ED4F5D001D4A6A /* osx108.i386.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = osx108.i386.xcconfig; sourceTree = "<group>"; };
+		277EFE8B17ED4F63001D4A6A /* osx108.x86_64.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = osx108.x86_64.xcconfig; sourceTree = "<group>"; };
+		277EFE8D17ED5628001D4A6A /* supplemental.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = supplemental.xcconfig; sourceTree = "<group>"; };
+		277EFE9217ED799E001D4A6A /* libfdk-aac.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libfdk-aac.a"; path = "external/contrib/lib/libfdk-aac.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		27D6C72414B1019100B785E4 /* libhandbrake.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhandbrake.a; path = external/libhb/libhandbrake.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C72814B102DA00B785E4 /* libass.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libass.a; path = external/contrib/lib/libass.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C72914B102DA00B785E4 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = external/contrib/lib/libavcodec.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C72A14B102DA00B785E4 /* libavformat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavformat.a; path = external/contrib/lib/libavformat.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -294,14 +319,10 @@
 		27D6C72C14B102DA00B785E4 /* libbluray.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbluray.a; path = external/contrib/lib/libbluray.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C72E14B102DA00B785E4 /* libdvdnav.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdvdnav.a; path = external/contrib/lib/libdvdnav.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C72F14B102DA00B785E4 /* libdvdread.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdvdread.a; path = external/contrib/lib/libdvdread.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		27D6C73014B102DA00B785E4 /* libfaac.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfaac.a; path = external/contrib/lib/libfaac.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C73114B102DA00B785E4 /* libfontconfig.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfontconfig.a; path = external/contrib/lib/libfontconfig.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C73214B102DA00B785E4 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = external/contrib/lib/libfreetype.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C73314B102DA00B785E4 /* libfribidi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfribidi.a; path = external/contrib/lib/libfribidi.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		27D6C73414B102DA00B785E4 /* libmkv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmkv.a; path = external/contrib/lib/libmkv.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C73614B102DA00B785E4 /* libmp3lame.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmp3lame.a; path = external/contrib/lib/libmp3lame.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		27D6C73714B102DA00B785E4 /* libmp4v2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmp4v2.a; path = external/contrib/lib/libmp4v2.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		27D6C73814B102DA00B785E4 /* libmpeg2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmpeg2.a; path = external/contrib/lib/libmpeg2.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C73914B102DA00B785E4 /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = external/contrib/lib/libogg.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C73A14B102DA00B785E4 /* libsamplerate.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsamplerate.a; path = external/contrib/lib/libsamplerate.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C73B14B102DA00B785E4 /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = external/contrib/lib/libswscale.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -311,14 +332,78 @@
 		27D6C73F14B102DA00B785E4 /* libx264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libx264.a; path = external/contrib/lib/libx264.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		27D6C74014B102DA00B785E4 /* libxml2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxml2.a; path = external/contrib/lib/libxml2.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		3490BCB31614CF8D002A5AD7 /* HandBrake.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HandBrake.icns; sourceTree = "<group>"; };
-		34FF2FC014EEC363004C2400 /* HBAdvancedController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAdvancedController.h; sourceTree = "<group>"; };
 		46AB433315F98A2B009C0961 /* DockTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DockTextField.h; sourceTree = "<group>"; };
 		46AB433415F98A2B009C0961 /* DockTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DockTextField.m; sourceTree = "<group>"; };
+		A90A0CAD1988D57200DA65CE /* HBAudioTrackPreset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudioTrackPreset.h; sourceTree = "<group>"; };
+		A90A0CAE1988D57200DA65CE /* HBAudioTrackPreset.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudioTrackPreset.m; sourceTree = "<group>"; };
+		A91726E5197291BC00D1AFEF /* HBChapterTitlesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBChapterTitlesController.h; sourceTree = "<group>"; };
+		A91726E6197291BC00D1AFEF /* HBChapterTitlesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBChapterTitlesController.m; sourceTree = "<group>"; };
+		A919C7AC199369180049E6A3 /* HBViewValidation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBViewValidation.h; sourceTree = "<group>"; };
+		A91C024C1A16516A00DEA6F3 /* JobSmall@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "JobSmall@2x.png"; sourceTree = "<group>"; };
+		A91C02501A165EA200DEA6F3 /* EncodeComplete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeComplete.png; sourceTree = "<group>"; };
+		A91C02511A165EA200DEA6F3 /* EncodeComplete@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "EncodeComplete@2x.png"; sourceTree = "<group>"; };
+		A91C02541A166BE300DEA6F3 /* EncodeWorking0@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "EncodeWorking0@2x.png"; sourceTree = "<group>"; };
+		A91C02551A166BE300DEA6F3 /* EncodeWorking1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "EncodeWorking1@2x.png"; sourceTree = "<group>"; };
+		A91C02561A166BE300DEA6F3 /* EncodeWorking2@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "EncodeWorking2@2x.png"; sourceTree = "<group>"; };
+		A91C02571A166BE300DEA6F3 /* EncodeWorking3@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "EncodeWorking3@2x.png"; sourceTree = "<group>"; };
+		A91C02581A166BE300DEA6F3 /* EncodeWorking4@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "EncodeWorking4@2x.png"; sourceTree = "<group>"; };
+		A91C02591A166BE300DEA6F3 /* EncodeWorking5@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "EncodeWorking5@2x.png"; sourceTree = "<group>"; };
+		A9204DC21A16C5AB007CA74C /* Delete@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Delete@2x.png"; sourceTree = "<group>"; };
+		A9204DC31A16C5AB007CA74C /* DeleteHighlightPressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DeleteHighlightPressed@2x.png"; sourceTree = "<group>"; };
+		A9204DC41A16C5AB007CA74C /* DeletePressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DeletePressed@2x.png"; sourceTree = "<group>"; };
+		A9252C031A17343500B8B7F8 /* DeleteHighlight@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DeleteHighlight@2x.png"; sourceTree = "<group>"; };
+		A9252C051A173D4800B8B7F8 /* Reveal@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Reveal@2x.png"; sourceTree = "<group>"; };
+		A9252C061A173D4800B8B7F8 /* RevealHighlight@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "RevealHighlight@2x.png"; sourceTree = "<group>"; };
+		A9252C071A173D4800B8B7F8 /* RevealHighlightPressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "RevealHighlightPressed@2x.png"; sourceTree = "<group>"; };
+		A9252C081A173D4800B8B7F8 /* RevealPressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "RevealPressed@2x.png"; sourceTree = "<group>"; };
+		A932E26B1988334B0047D13E /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = AudioDefaults.xib; sourceTree = "<group>"; };
+		A932E26D198833920047D13E /* HBAudioDefaultsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudioDefaultsController.h; sourceTree = "<group>"; };
+		A932E26E198833920047D13E /* HBAudioDefaultsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudioDefaultsController.m; sourceTree = "<group>"; };
+		A932E271198834130047D13E /* HBAudioDefaults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudioDefaults.h; sourceTree = "<group>"; };
+		A932E272198834130047D13E /* HBAudioDefaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudioDefaults.m; sourceTree = "<group>"; };
+		A93E0ED01972957000FD67FB /* HBVideoController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBVideoController.h; sourceTree = "<group>"; };
+		A93E0ED11972957000FD67FB /* HBVideoController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBVideoController.m; sourceTree = "<group>"; };
+		A93E0ED61972958C00FD67FB /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Video.xib; sourceTree = "<group>"; };
+		A9523935199A6AAE00588AEF /* HBFilters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBFilters.h; sourceTree = "<group>"; };
+		A9523936199A6AAE00588AEF /* HBFilters.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBFilters.m; sourceTree = "<group>"; };
+		A967E4B91A16768200DF1DFC /* EncodeCanceled@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "EncodeCanceled@2x.png"; sourceTree = "<group>"; };
+		A98C29C21977B10600AF5DED /* HBLanguagesSelection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBLanguagesSelection.h; sourceTree = "<group>"; };
+		A98C29C31977B10600AF5DED /* HBLanguagesSelection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBLanguagesSelection.m; sourceTree = "<group>"; };
+		A9935212196F38A70069C6B7 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = ChaptersTitles.xib; sourceTree = "<group>"; };
+		A9AA44781970664A00D7DEFC /* HBUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBUtilities.h; sourceTree = "<group>"; };
+		A9AA44791970664A00D7DEFC /* HBUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBUtilities.m; sourceTree = "<group>"; };
+		A9AA447B1970724D00D7DEFC /* HBAdvancedController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBAdvancedController.h; sourceTree = "<group>"; };
+		A9AA447C1970726500D7DEFC /* HBQueueController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBQueueController.h; sourceTree = "<group>"; };
+		A9AA447D1970729300D7DEFC /* HBPreviewGenerator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBPreviewGenerator.h; sourceTree = "<group>"; };
+		A9B34D74197696FE00871B7D /* DiskArbitration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiskArbitration.framework; path = System/Library/Frameworks/DiskArbitration.framework; sourceTree = SDKROOT; };
+		A9BB0F2519A0ECE40079F1C1 /* HBHUDButtonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBHUDButtonCell.h; sourceTree = "<group>"; };
+		A9BB0F2619A0ECE40079F1C1 /* HBHUDButtonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBHUDButtonCell.m; sourceTree = "<group>"; };
+		A9C0DB84197E7B0000DF55B3 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = SubtitlesDefaults.xib; sourceTree = "<group>"; };
+		A9C9F88719A733FE00DC8923 /* HBHUDView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBHUDView.h; sourceTree = "<group>"; };
+		A9C9F88819A733FE00DC8923 /* HBHUDView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBHUDView.m; sourceTree = "<group>"; };
+		A9CF25F01990D62C0023F727 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Presets.xib; sourceTree = "<group>"; };
+		A9CF25F21990D64E0023F727 /* HBPreset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPreset.h; sourceTree = "<group>"; };
+		A9CF25F31990D64E0023F727 /* HBPreset.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPreset.m; sourceTree = "<group>"; };
+		A9CF25F51990D6820023F727 /* HBPresetsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPresetsViewController.h; sourceTree = "<group>"; };
+		A9CF25F61990D6820023F727 /* HBPresetsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPresetsViewController.m; sourceTree = "<group>"; };
+		A9D1E41618262364002F6424 /* HBPreviewGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPreviewGenerator.m; sourceTree = "<group>"; };
+		A9D488A31996270300E9B1BA /* HBTreeNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBTreeNode.h; sourceTree = "<group>"; };
+		A9D488A41996270300E9B1BA /* HBTreeNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBTreeNode.m; sourceTree = "<group>"; };
+		A9DC6C4F196F04F6002AE6B4 /* HBSubtitlesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBSubtitlesController.h; sourceTree = SOURCE_ROOT; };
+		A9DC6C50196F04F6002AE6B4 /* HBSubtitlesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBSubtitlesController.m; sourceTree = SOURCE_ROOT; };
+		A9DC6C55196F0517002AE6B4 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Subtitles.xib; sourceTree = "<group>"; };
 		A9E1467A16BC2ABD00C307BC /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
 		A9E1467C16BC2AD800C307BC /* next-p.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "next-p.pdf"; sourceTree = "<group>"; };
 		A9E1467D16BC2AD800C307BC /* pause-p.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "pause-p.pdf"; sourceTree = "<group>"; };
 		A9E1467E16BC2AD800C307BC /* play-p.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "play-p.pdf"; sourceTree = "<group>"; };
 		A9E1467F16BC2AD800C307BC /* prev-p.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "prev-p.pdf"; sourceTree = "<group>"; };
+		A9F2EB6E196F12C800066546 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Audio.xib; sourceTree = "<group>"; };
+		A9F472861976B7F30009EC65 /* HBSubtitlesDefaultsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBSubtitlesDefaultsController.h; sourceTree = "<group>"; };
+		A9F472871976B7F30009EC65 /* HBSubtitlesDefaultsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBSubtitlesDefaultsController.m; sourceTree = "<group>"; };
+		A9F4728B1976BAA70009EC65 /* HBSubtitlesDefaults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBSubtitlesDefaults.h; sourceTree = "<group>"; };
+		A9F4728C1976BAA70009EC65 /* HBSubtitlesDefaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBSubtitlesDefaults.m; sourceTree = "<group>"; };
+		A9F7102419A475EC00F61301 /* HBDockTile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBDockTile.h; sourceTree = "<group>"; };
+		A9F7102519A475EC00F61301 /* HBDockTile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBDockTile.m; sourceTree = "<group>"; };
 		D2BCB0F616F515230084604C /* activity.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = activity.png; sourceTree = "<group>"; };
 		D2BCB0F716F515230084604C /* activity@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "activity@2x.png"; sourceTree = "<group>"; };
 		D2BCB0F816F515240084604C /* addqueue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = addqueue.png; sourceTree = "<group>"; };
@@ -353,13 +438,12 @@
 			buildActionMask = 2147483647;
 			files = (
 				273F203014ADB9790021BE6D /* AudioToolbox.framework in Frameworks */,
-				273F202314ADB8650021BE6D /* IOKit.framework in Frameworks */,
 				273F203314ADB9F00021BE6D /* CoreServices.framework in Frameworks */,
-				273F202A14ADB8D60021BE6D /* libiconv.dylib in Frameworks */,
+				273F202314ADB8650021BE6D /* IOKit.framework in Frameworks */,
 				273F202814ADB8BE0021BE6D /* libbz2.dylib in Frameworks */,
+				273F202A14ADB8D60021BE6D /* libiconv.dylib in Frameworks */,
 				273F202614ADB8A40021BE6D /* libz.dylib in Frameworks */,
-				27D6C72614B1019100B785E4 /* libhb.a in Frameworks */,
-				27D6C74214B102DA00B785E4 /* liba52.a in Frameworks */,
+				27D6C72614B1019100B785E4 /* libhandbrake.a in Frameworks */,
 				27D6C74414B102DA00B785E4 /* libass.a in Frameworks */,
 				27D6C74614B102DA00B785E4 /* libavcodec.a in Frameworks */,
 				27D6C74814B102DA00B785E4 /* libavformat.a in Frameworks */,
@@ -368,20 +452,17 @@
 				27D6C74C14B102DA00B785E4 /* libbluray.a in Frameworks */,
 				27D6C75014B102DA00B785E4 /* libdvdnav.a in Frameworks */,
 				27D6C75214B102DA00B785E4 /* libdvdread.a in Frameworks */,
-				27D6C75414B102DA00B785E4 /* libfaac.a in Frameworks */,
 				27D6C75614B102DA00B785E4 /* libfontconfig.a in Frameworks */,
 				27D6C75814B102DA00B785E4 /* libfreetype.a in Frameworks */,
 				27D6C75A14B102DA00B785E4 /* libfribidi.a in Frameworks */,
-				27D6C75C14B102DA00B785E4 /* libmkv.a in Frameworks */,
 				27D6C75F14B102DA00B785E4 /* libmp3lame.a in Frameworks */,
-				27D6C76114B102DA00B785E4 /* libmp4v2.a in Frameworks */,
-				27D6C76314B102DA00B785E4 /* libmpeg2.a in Frameworks */,
 				27D6C76514B102DA00B785E4 /* libogg.a in Frameworks */,
 				27D6C76714B102DA00B785E4 /* libsamplerate.a in Frameworks */,
 				27D6C76914B102DA00B785E4 /* libswscale.a in Frameworks */,
 				27D6C76B14B102DA00B785E4 /* libtheora.a in Frameworks */,
 				27D6C76D14B102DA00B785E4 /* libvorbis.a in Frameworks */,
 				27D6C76F14B102DA00B785E4 /* libvorbisenc.a in Frameworks */,
+				22DD2C4B177B95DA00EF50D3 /* libvpx.a in Frameworks */,
 				27D6C77114B102DA00B785E4 /* libx264.a in Frameworks */,
 				27D6C77314B102DA00B785E4 /* libxml2.a in Frameworks */,
 			);
@@ -391,18 +472,17 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A9E1467B16BC2ABD00C307BC /* QuartzCore.framework in Frameworks */,
-				273F21C114ADE7A20021BE6D /* Growl.framework in Frameworks */,
-				273F21C214ADE7BC0021BE6D /* Sparkle.framework in Frameworks */,
 				273F20C914ADC5150021BE6D /* AudioToolbox.framework in Frameworks */,
-				273F20C814ADC4FF0021BE6D /* QTKit.framework in Frameworks */,
-				273F20C614ADC4F50021BE6D /* IOKit.framework in Frameworks */,
 				273F203C14ADBC210021BE6D /* Cocoa.framework in Frameworks */,
-				273F20C314ADC4AE0021BE6D /* libiconv.dylib in Frameworks */,
+				273F21C114ADE7A20021BE6D /* Growl.framework in Frameworks */,
+				273F20C614ADC4F50021BE6D /* IOKit.framework in Frameworks */,
+				273F20C814ADC4FF0021BE6D /* QTKit.framework in Frameworks */,
+				A9E1467B16BC2ABD00C307BC /* QuartzCore.framework in Frameworks */,
+				273F21C214ADE7BC0021BE6D /* Sparkle.framework in Frameworks */,
 				273F20C414ADC4B60021BE6D /* libbz2.dylib in Frameworks */,
+				273F20C314ADC4AE0021BE6D /* libiconv.dylib in Frameworks */,
 				273F20C514ADC4BD0021BE6D /* libz.dylib in Frameworks */,
-				27D6C72514B1019100B785E4 /* libhb.a in Frameworks */,
-				27D6C74114B102DA00B785E4 /* liba52.a in Frameworks */,
+				27D6C72514B1019100B785E4 /* libhandbrake.a in Frameworks */,
 				27D6C74314B102DA00B785E4 /* libass.a in Frameworks */,
 				27D6C74514B102DA00B785E4 /* libavcodec.a in Frameworks */,
 				27D6C74714B102DA00B785E4 /* libavformat.a in Frameworks */,
@@ -411,20 +491,17 @@
 				27D6C74B14B102DA00B785E4 /* libbluray.a in Frameworks */,
 				27D6C74F14B102DA00B785E4 /* libdvdnav.a in Frameworks */,
 				27D6C75114B102DA00B785E4 /* libdvdread.a in Frameworks */,
-				27D6C75314B102DA00B785E4 /* libfaac.a in Frameworks */,
 				27D6C75514B102DA00B785E4 /* libfontconfig.a in Frameworks */,
 				27D6C75714B102DA00B785E4 /* libfreetype.a in Frameworks */,
 				27D6C75914B102DA00B785E4 /* libfribidi.a in Frameworks */,
-				27D6C75B14B102DA00B785E4 /* libmkv.a in Frameworks */,
 				27D6C75E14B102DA00B785E4 /* libmp3lame.a in Frameworks */,
-				27D6C76014B102DA00B785E4 /* libmp4v2.a in Frameworks */,
-				27D6C76214B102DA00B785E4 /* libmpeg2.a in Frameworks */,
 				27D6C76414B102DA00B785E4 /* libogg.a in Frameworks */,
 				27D6C76614B102DA00B785E4 /* libsamplerate.a in Frameworks */,
 				27D6C76814B102DA00B785E4 /* libswscale.a in Frameworks */,
 				27D6C76A14B102DA00B785E4 /* libtheora.a in Frameworks */,
 				27D6C76C14B102DA00B785E4 /* libvorbis.a in Frameworks */,
 				27D6C76E14B102DA00B785E4 /* libvorbisenc.a in Frameworks */,
+				22DD2C4A177B94DB00EF50D3 /* libvpx.a in Frameworks */,
 				27D6C77014B102DA00B785E4 /* libx264.a in Frameworks */,
 				27D6C77214B102DA00B785E4 /* libxml2.a in Frameworks */,
 			);
@@ -436,8 +513,7 @@
 		271BA4C714B1236D00BC1D2C /* Static Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				27D6C72414B1019100B785E4 /* libhb.a */,
-				27D6C72714B102DA00B785E4 /* liba52.a */,
+				27D6C72414B1019100B785E4 /* libhandbrake.a */,
 				27D6C72814B102DA00B785E4 /* libass.a */,
 				27D6C72914B102DA00B785E4 /* libavcodec.a */,
 				27D6C72A14B102DA00B785E4 /* libavformat.a */,
@@ -446,20 +522,17 @@
 				27D6C72C14B102DA00B785E4 /* libbluray.a */,
 				27D6C72E14B102DA00B785E4 /* libdvdnav.a */,
 				27D6C72F14B102DA00B785E4 /* libdvdread.a */,
-				27D6C73014B102DA00B785E4 /* libfaac.a */,
 				27D6C73114B102DA00B785E4 /* libfontconfig.a */,
 				27D6C73214B102DA00B785E4 /* libfreetype.a */,
 				27D6C73314B102DA00B785E4 /* libfribidi.a */,
-				27D6C73414B102DA00B785E4 /* libmkv.a */,
 				27D6C73614B102DA00B785E4 /* libmp3lame.a */,
-				27D6C73714B102DA00B785E4 /* libmp4v2.a */,
-				27D6C73814B102DA00B785E4 /* libmpeg2.a */,
 				27D6C73914B102DA00B785E4 /* libogg.a */,
 				27D6C73A14B102DA00B785E4 /* libsamplerate.a */,
 				27D6C73B14B102DA00B785E4 /* libswscale.a */,
 				27D6C73C14B102DA00B785E4 /* libtheora.a */,
 				27D6C73D14B102DA00B785E4 /* libvorbis.a */,
 				27D6C73E14B102DA00B785E4 /* libvorbisenc.a */,
+				22DD2C49177B94DB00EF50D3 /* libvpx.a */,
 				27D6C73F14B102DA00B785E4 /* libx264.a */,
 				27D6C74014B102DA00B785E4 /* libxml2.a */,
 			);
@@ -513,15 +586,16 @@
 		273F203414ADBAC30021BE6D /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				A9E1467A16BC2ABD00C307BC /* QuartzCore.framework */,
-				273F20C714ADC4FF0021BE6D /* QTKit.framework */,
+				A9B34D74197696FE00871B7D /* DiskArbitration.framework */,
 				273F202F14ADB9790021BE6D /* AudioToolbox.framework */,
 				273F203B14ADBC210021BE6D /* Cocoa.framework */,
 				273F203214ADB9F00021BE6D /* CoreServices.framework */,
 				273F202214ADB8650021BE6D /* IOKit.framework */,
+				273F20C714ADC4FF0021BE6D /* QTKit.framework */,
+				A9E1467A16BC2ABD00C307BC /* QuartzCore.framework */,
 				273F203D14ADBC210021BE6D /* Other Frameworks */,
-				273F202914ADB8D60021BE6D /* libiconv.dylib */,
 				273F202714ADB8BE0021BE6D /* libbz2.dylib */,
+				273F202914ADB8D60021BE6D /* libiconv.dylib */,
 				273F202514ADB8A40021BE6D /* libz.dylib */,
 			);
 			name = Frameworks;
@@ -540,38 +614,20 @@
 		273F204114ADBC210021BE6D /* HandBrake */ = {
 			isa = PBXGroup;
 			children = (
-				273F208C14ADBE670021BE6D /* ChapterTitles.h */,
-				273F208D14ADBE670021BE6D /* ChapterTitles.m */,
-				273F208E14ADBE670021BE6D /* Controller.h */,
-				273F208F14ADBE670021BE6D /* Controller.m */,
-				46AB433315F98A2B009C0961 /* DockTextField.h */,
-				46AB433415F98A2B009C0961 /* DockTextField.m */,
-				34FF2FC014EEC363004C2400 /* HBAdvancedController.h */,
-				273F209014ADBE670021BE6D /* HBAdvancedController.m */,
-				273F209114ADBE670021BE6D /* HBAudio.h */,
-				273F209214ADBE670021BE6D /* HBAudio.m */,
-				273F209314ADBE670021BE6D /* HBAudioController.h */,
-				273F209414ADBE670021BE6D /* HBAudioController.m */,
+				A9B34D6F197683FE00871B7D /* Controllers */,
+				A98C29C51977C00000AF5DED /* Core */,
+				A952392E199A647F00588AEF /* Presets */,
+				A9AA447D1970729300D7DEFC /* HBPreviewGenerator.h */,
+				A9D1E41618262364002F6424 /* HBPreviewGenerator.m */,
+				A9AA44781970664A00D7DEFC /* HBUtilities.h */,
+				A9AA44791970664A00D7DEFC /* HBUtilities.m */,
 				273F209714ADBE670021BE6D /* HBDVDDetector.h */,
 				273F209814ADBE670021BE6D /* HBDVDDetector.m */,
-				273F209914ADBE670021BE6D /* HBImageAndTextCell.h */,
-				273F209A14ADBE670021BE6D /* HBImageAndTextCell.m */,
-				273F209B14ADBE670021BE6D /* HBOutputPanelController.h */,
-				273F209C14ADBE670021BE6D /* HBOutputPanelController.m */,
 				273F209D14ADBE670021BE6D /* HBOutputRedirect.h */,
 				273F209E14ADBE670021BE6D /* HBOutputRedirect.m */,
-				273F209F14ADBE670021BE6D /* HBPreferencesController.h */,
-				273F20A014ADBE670021BE6D /* HBPreferencesController.m */,
-				273F20A114ADBE670021BE6D /* HBPresets.h */,
-				273F20A214ADBE670021BE6D /* HBPresets.m */,
-				273F20A314ADBE670021BE6D /* HBPreviewController.h */,
-				273F20A414ADBE670021BE6D /* HBPreviewController.m */,
-				273F20A514ADBE670021BE6D /* HBQueueController.h */,
-				273F20A614ADBE670021BE6D /* HBQueueController.mm */,
-				273F20A714ADBE670021BE6D /* HBSubtitles.h */,
-				273F20A814ADBE670021BE6D /* HBSubtitles.m */,
-				273F20A914ADBE670021BE6D /* PictureController.h */,
-				273F20AA14ADBE670021BE6D /* PictureController.m */,
+				A98C29C21977B10600AF5DED /* HBLanguagesSelection.h */,
+				A98C29C31977B10600AF5DED /* HBLanguagesSelection.m */,
+				A9B34D711976844500871B7D /* UI Views */,
 				273F20BD14ADC09F0021BE6D /* main.mm */,
 			);
 			name = HandBrake;
@@ -629,23 +685,36 @@
 				A9E1467D16BC2AD800C307BC /* pause-p.pdf */,
 				A9E1467E16BC2AD800C307BC /* play-p.pdf */,
 				A9E1467F16BC2AD800C307BC /* prev-p.pdf */,
+				A9204DC21A16C5AB007CA74C /* Delete@2x.png */,
+				A9252C031A17343500B8B7F8 /* DeleteHighlight@2x.png */,
+				A9204DC31A16C5AB007CA74C /* DeleteHighlightPressed@2x.png */,
+				A9204DC41A16C5AB007CA74C /* DeletePressed@2x.png */,
 				273F212514ADCBF70021BE6D /* Delete.png */,
 				273F212614ADCBF70021BE6D /* DeleteHighlight.png */,
 				273F212714ADCBF70021BE6D /* DeleteHighlightPressed.png */,
 				273F212814ADCBF70021BE6D /* DeletePressed.png */,
 				273F212A14ADCBF80021BE6D /* EncodeCanceled.png */,
-				273F212B14ADCBF80021BE6D /* EncodeComplete.png */,
+				A967E4B91A16768200DF1DFC /* EncodeCanceled@2x.png */,
+				A91C02501A165EA200DEA6F3 /* EncodeComplete.png */,
+				A91C02511A165EA200DEA6F3 /* EncodeComplete@2x.png */,
 				273F212C14ADCBF80021BE6D /* EncodeWorking0.png */,
 				273F212D14ADCBF80021BE6D /* EncodeWorking1.png */,
 				273F212E14ADCBF80021BE6D /* EncodeWorking2.png */,
 				273F212F14ADCBF80021BE6D /* EncodeWorking3.png */,
 				273F213014ADCBF80021BE6D /* EncodeWorking4.png */,
 				273F213114ADCBF80021BE6D /* EncodeWorking5.png */,
-				273F213414ADCBF80021BE6D /* JobPassFirstSmall.png */,
-				273F213614ADCBF80021BE6D /* JobPassSecondSmall.png */,
-				273F213814ADCBF80021BE6D /* JobPassSubtitleSmall.png */,
-				273F213914ADCBF80021BE6D /* JobPassUnknownSmall.png */,
+				A91C02541A166BE300DEA6F3 /* EncodeWorking0@2x.png */,
+				A91C02551A166BE300DEA6F3 /* EncodeWorking1@2x.png */,
+				A91C02561A166BE300DEA6F3 /* EncodeWorking2@2x.png */,
+				A91C02571A166BE300DEA6F3 /* EncodeWorking3@2x.png */,
+				A91C02581A166BE300DEA6F3 /* EncodeWorking4@2x.png */,
+				A91C02591A166BE300DEA6F3 /* EncodeWorking5@2x.png */,
 				273F213A14ADCBF80021BE6D /* JobSmall.png */,
+				A91C024C1A16516A00DEA6F3 /* JobSmall@2x.png */,
+				A9252C051A173D4800B8B7F8 /* Reveal@2x.png */,
+				A9252C061A173D4800B8B7F8 /* RevealHighlight@2x.png */,
+				A9252C071A173D4800B8B7F8 /* RevealHighlightPressed@2x.png */,
+				A9252C081A173D4800B8B7F8 /* RevealPressed@2x.png */,
 				273F214014ADCBF80021BE6D /* Reveal.png */,
 				273F214114ADCBF80021BE6D /* RevealHighlight.png */,
 				273F214214ADCBF80021BE6D /* RevealHighlightPressed.png */,
@@ -657,9 +726,16 @@
 		273F217914ADDDA10021BE6D /* English.lproj */ = {
 			isa = PBXGroup;
 			children = (
-				273F217A14ADDDA10021BE6D /* AdvancedView.xib */,
 				273F217C14ADDDA10021BE6D /* InfoPlist.strings */,
 				273F217E14ADDDA10021BE6D /* MainMenu.xib */,
+				A9CF25EF1990D62C0023F727 /* Presets.xib */,
+				A93E0ED51972958C00FD67FB /* Video.xib */,
+				A9F2EB6D196F12C800066546 /* Audio.xib */,
+				A932E26A1988334B0047D13E /* AudioDefaults.xib */,
+				A9DC6C54196F0517002AE6B4 /* Subtitles.xib */,
+				A9C0DB83197E7B0000DF55B3 /* SubtitlesDefaults.xib */,
+				273F217A14ADDDA10021BE6D /* AdvancedView.xib */,
+				A9935211196F38A70069C6B7 /* ChaptersTitles.xib */,
 				273F218014ADDDA10021BE6D /* OutputPanel.xib */,
 				273F218214ADDDA10021BE6D /* PicturePreview.xib */,
 				273F218414ADDDA10021BE6D /* PictureSettings.xib */,
@@ -692,19 +768,141 @@
 				277A3FD114AE84C500A835E4 /* osx106.x86_64.xcconfig */,
 				276941FA14B161B70027798C /* osx107.i386.xcconfig */,
 				277A3FD214AE84C500A835E4 /* osx107.x86_64.xcconfig */,
+				277EFE8917ED4F5D001D4A6A /* osx108.i386.xcconfig */,
+				277EFE8B17ED4F63001D4A6A /* osx108.x86_64.xcconfig */,
+				271E74EF182F260C0077C311 /* osx109.i386.xcconfig */,
+				271E74F0182F260C0077C311 /* osx109.x86_64.xcconfig */,
+				277EFE8D17ED5628001D4A6A /* supplemental.xcconfig */,
 			);
 			path = xcconfig;
 			sourceTree = "<group>";
 		};
+		277EFE8E17ED71A2001D4A6A /* Static Libraries (optional) */ = {
+			isa = PBXGroup;
+			children = (
+				277EFE9217ED799E001D4A6A /* libfdk-aac.a */,
+				22CC9E74191EBEA500C69D81 /* libx265.a */,
+			);
+			name = "Static Libraries (optional)";
+			sourceTree = "<group>";
+		};
 		27D6C72314B1013400B785E4 /* Products (external) */ = {
 			isa = PBXGroup;
 			children = (
 				271BA4C914B1238E00BC1D2C /* Support */,
 				271BA4C714B1236D00BC1D2C /* Static Libraries */,
+				277EFE8E17ED71A2001D4A6A /* Static Libraries (optional) */,
 			);
 			name = "Products (external)";
 			sourceTree = "<group>";
 		};
+		A932E270198833960047D13E /* Audio Defaults */ = {
+			isa = PBXGroup;
+			children = (
+				A932E26D198833920047D13E /* HBAudioDefaultsController.h */,
+				A932E26E198833920047D13E /* HBAudioDefaultsController.m */,
+			);
+			name = "Audio Defaults";
+			sourceTree = "<group>";
+		};
+		A952392E199A647F00588AEF /* Presets */ = {
+			isa = PBXGroup;
+			children = (
+				273F20A114ADBE670021BE6D /* HBPresetsManager.h */,
+				273F20A214ADBE670021BE6D /* HBPresetsManager.m */,
+				A9CF25F21990D64E0023F727 /* HBPreset.h */,
+				A9CF25F31990D64E0023F727 /* HBPreset.m */,
+				A9D488A31996270300E9B1BA /* HBTreeNode.h */,
+				A9D488A41996270300E9B1BA /* HBTreeNode.m */,
+			);
+			name = Presets;
+			sourceTree = "<group>";
+		};
+		A98C29C51977C00000AF5DED /* Core */ = {
+			isa = PBXGroup;
+			children = (
+				A932E271198834130047D13E /* HBAudioDefaults.h */,
+				A932E272198834130047D13E /* HBAudioDefaults.m */,
+				A9F4728B1976BAA70009EC65 /* HBSubtitlesDefaults.h */,
+				A9F4728C1976BAA70009EC65 /* HBSubtitlesDefaults.m */,
+				273F209114ADBE670021BE6D /* HBAudio.h */,
+				273F209214ADBE670021BE6D /* HBAudio.m */,
+				A90A0CAD1988D57200DA65CE /* HBAudioTrackPreset.h */,
+				A90A0CAE1988D57200DA65CE /* HBAudioTrackPreset.m */,
+				A9523935199A6AAE00588AEF /* HBFilters.h */,
+				A9523936199A6AAE00588AEF /* HBFilters.m */,
+			);
+			name = Core;
+			sourceTree = "<group>";
+		};
+		A9B34D6F197683FE00871B7D /* Controllers */ = {
+			isa = PBXGroup;
+			children = (
+				273F208E14ADBE670021BE6D /* Controller.h */,
+				273F208F14ADBE670021BE6D /* Controller.m */,
+				A9B34D701976841800871B7D /* Main Window View Controllers */,
+				A9AA447C1970726500D7DEFC /* HBQueueController.h */,
+				273F20A614ADBE670021BE6D /* HBQueueController.mm */,
+				273F209B14ADBE670021BE6D /* HBOutputPanelController.h */,
+				273F209C14ADBE670021BE6D /* HBOutputPanelController.m */,
+				273F209F14ADBE670021BE6D /* HBPreferencesController.h */,
+				273F20A014ADBE670021BE6D /* HBPreferencesController.m */,
+				273F20A914ADBE670021BE6D /* PictureController.h */,
+				273F20AA14ADBE670021BE6D /* PictureController.m */,
+				273F20A314ADBE670021BE6D /* HBPreviewController.h */,
+				273F20A414ADBE670021BE6D /* HBPreviewController.m */,
+			);
+			name = Controllers;
+			sourceTree = "<group>";
+		};
+		A9B34D701976841800871B7D /* Main Window View Controllers */ = {
+			isa = PBXGroup;
+			children = (
+				A9CF25F51990D6820023F727 /* HBPresetsViewController.h */,
+				A9CF25F61990D6820023F727 /* HBPresetsViewController.m */,
+				A93E0ED01972957000FD67FB /* HBVideoController.h */,
+				A93E0ED11972957000FD67FB /* HBVideoController.m */,
+				A9AA447B1970724D00D7DEFC /* HBAdvancedController.h */,
+				273F209014ADBE670021BE6D /* HBAdvancedController.m */,
+				273F209314ADBE670021BE6D /* HBAudioController.h */,
+				273F209414ADBE670021BE6D /* HBAudioController.m */,
+				A932E270198833960047D13E /* Audio Defaults */,
+				A9DC6C4F196F04F6002AE6B4 /* HBSubtitlesController.h */,
+				A9DC6C50196F04F6002AE6B4 /* HBSubtitlesController.m */,
+				A9F472851976B7AA0009EC65 /* Subtitles Defaults */,
+				A91726E5197291BC00D1AFEF /* HBChapterTitlesController.h */,
+				A91726E6197291BC00D1AFEF /* HBChapterTitlesController.m */,
+				A919C7AC199369180049E6A3 /* HBViewValidation.h */,
+			);
+			name = "Main Window View Controllers";
+			sourceTree = "<group>";
+		};
+		A9B34D711976844500871B7D /* UI Views */ = {
+			isa = PBXGroup;
+			children = (
+				46AB433315F98A2B009C0961 /* DockTextField.h */,
+				46AB433415F98A2B009C0961 /* DockTextField.m */,
+				A9F7102419A475EC00F61301 /* HBDockTile.h */,
+				A9F7102519A475EC00F61301 /* HBDockTile.m */,
+				273F209914ADBE670021BE6D /* HBImageAndTextCell.h */,
+				273F209A14ADBE670021BE6D /* HBImageAndTextCell.m */,
+				A9BB0F2519A0ECE40079F1C1 /* HBHUDButtonCell.h */,
+				A9BB0F2619A0ECE40079F1C1 /* HBHUDButtonCell.m */,
+				A9C9F88719A733FE00DC8923 /* HBHUDView.h */,
+				A9C9F88819A733FE00DC8923 /* HBHUDView.m */,
+			);
+			name = "UI Views";
+			sourceTree = "<group>";
+		};
+		A9F472851976B7AA0009EC65 /* Subtitles Defaults */ = {
+			isa = PBXGroup;
+			children = (
+				A9F472861976B7F30009EC65 /* HBSubtitlesDefaultsController.h */,
+				A9F472871976B7F30009EC65 /* HBSubtitlesDefaultsController.m */,
+			);
+			name = "Subtitles Defaults";
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXLegacyTarget section */
@@ -720,7 +918,7 @@
 			);
 			name = external;
 			passBuildSettingsInEnvironment = 1;
-			productName = libhb;
+			productName = libhandbrake;
 		};
 /* End PBXLegacyTarget section */
 
@@ -768,7 +966,7 @@
 		273F1FE014AD9DA40021BE6D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0610;
 			};
 			buildConfigurationList = 273F1FE314AD9DA40021BE6D /* Build configuration list for PBXProject "HandBrake" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -799,25 +997,28 @@
 				273F214D14ADCBF80021BE6D /* DeleteHighlight.png in Resources */,
 				273F214E14ADCBF80021BE6D /* DeleteHighlightPressed.png in Resources */,
 				273F214F14ADCBF80021BE6D /* DeletePressed.png in Resources */,
+				A9F2EB6F196F12C800066546 /* Audio.xib in Resources */,
 				273F215114ADCBF80021BE6D /* EncodeCanceled.png in Resources */,
-				273F215214ADCBF80021BE6D /* EncodeComplete.png in Resources */,
 				273F215314ADCBF80021BE6D /* EncodeWorking0.png in Resources */,
+				A91C025E1A166BE300DEA6F3 /* EncodeWorking4@2x.png in Resources */,
 				273F215414ADCBF80021BE6D /* EncodeWorking1.png in Resources */,
 				273F215514ADCBF80021BE6D /* EncodeWorking2.png in Resources */,
 				273F215614ADCBF80021BE6D /* EncodeWorking3.png in Resources */,
 				273F215714ADCBF80021BE6D /* EncodeWorking4.png in Resources */,
 				273F215814ADCBF80021BE6D /* EncodeWorking5.png in Resources */,
-				273F215B14ADCBF80021BE6D /* JobPassFirstSmall.png in Resources */,
-				273F215D14ADCBF80021BE6D /* JobPassSecondSmall.png in Resources */,
-				273F215F14ADCBF80021BE6D /* JobPassSubtitleSmall.png in Resources */,
-				273F216014ADCBF80021BE6D /* JobPassUnknownSmall.png in Resources */,
+				A9CF25F11990D62C0023F727 /* Presets.xib in Resources */,
 				273F216114ADCBF80021BE6D /* JobSmall.png in Resources */,
 				273F216714ADCBF80021BE6D /* Reveal.png in Resources */,
 				273F216814ADCBF80021BE6D /* RevealHighlight.png in Resources */,
+				A91C02521A165EA200DEA6F3 /* EncodeComplete.png in Resources */,
 				273F216914ADCBF80021BE6D /* RevealHighlightPressed.png in Resources */,
 				273F216A14ADCBF80021BE6D /* RevealPressed.png in Resources */,
 				273F218A14ADDDA10021BE6D /* AdvancedView.xib in Resources */,
 				273F218B14ADDDA10021BE6D /* InfoPlist.strings in Resources */,
+				A967E4BA1A16768200DF1DFC /* EncodeCanceled@2x.png in Resources */,
+				A9252C091A173D4800B8B7F8 /* Reveal@2x.png in Resources */,
+				A9204DC61A16C5AB007CA74C /* DeleteHighlightPressed@2x.png in Resources */,
+				A932E26C1988334B0047D13E /* AudioDefaults.xib in Resources */,
 				273F218C14ADDDA10021BE6D /* MainMenu.xib in Resources */,
 				273F218D14ADDDA10021BE6D /* OutputPanel.xib in Resources */,
 				273F218E14ADDDA10021BE6D /* PicturePreview.xib in Resources */,
@@ -830,22 +1031,38 @@
 				A9E1468216BC2AD800C307BC /* play-p.pdf in Resources */,
 				A9E1468316BC2AD800C307BC /* prev-p.pdf in Resources */,
 				D2BCB10916F5152C0084604C /* activity.png in Resources */,
+				A91C025D1A166BE300DEA6F3 /* EncodeWorking3@2x.png in Resources */,
 				D2BCB10A16F5152C0084604C /* activity@2x.png in Resources */,
 				D2BCB10B16F5152C0084604C /* addqueue.png in Resources */,
 				D2BCB10C16F5152C0084604C /* addqueue@2x.png in Resources */,
 				D2BCB10D16F5152C0084604C /* advanced.png in Resources */,
+				A9204DC51A16C5AB007CA74C /* Delete@2x.png in Resources */,
+				A9C0DB85197E7B0000DF55B3 /* SubtitlesDefaults.xib in Resources */,
+				A91C025A1A166BE300DEA6F3 /* EncodeWorking0@2x.png in Resources */,
 				D2BCB10E16F5152C0084604C /* advanced@2x.png in Resources */,
+				A91C025B1A166BE300DEA6F3 /* EncodeWorking1@2x.png in Resources */,
 				D2BCB10F16F5152C0084604C /* audio.png in Resources */,
 				D2BCB11016F5152C0084604C /* audio@2x.png in Resources */,
 				D2BCB11116F5152C0084604C /* encode.png in Resources */,
 				D2BCB11216F5152C0084604C /* encode@2x.png in Resources */,
 				D2BCB11316F5152C0084604C /* pauseencode.png in Resources */,
+				A91C02531A165EA200DEA6F3 /* EncodeComplete@2x.png in Resources */,
+				A9DC6C56196F0517002AE6B4 /* Subtitles.xib in Resources */,
 				D2BCB11416F5152C0084604C /* pauseencode@2x.png in Resources */,
+				A9252C0A1A173D4800B8B7F8 /* RevealHighlight@2x.png in Resources */,
 				D2BCB11516F5152C0084604C /* picturesettings.png in Resources */,
+				A93E0ED71972958C00FD67FB /* Video.xib in Resources */,
+				A9252C0B1A173D4800B8B7F8 /* RevealHighlightPressed@2x.png in Resources */,
 				D2BCB11616F5152C0084604C /* picturesettings@2x.png in Resources */,
 				D2BCB11716F5152C0084604C /* presets.png in Resources */,
+				A9252C0C1A173D4800B8B7F8 /* RevealPressed@2x.png in Resources */,
+				A9204DC71A16C5AB007CA74C /* DeletePressed@2x.png in Resources */,
 				D2BCB11816F5152C0084604C /* presets@2x.png in Resources */,
+				A91C025F1A166BE300DEA6F3 /* EncodeWorking5@2x.png in Resources */,
+				A91C025C1A166BE300DEA6F3 /* EncodeWorking2@2x.png in Resources */,
+				A91C024D1A16516A00DEA6F3 /* JobSmall@2x.png in Resources */,
 				D2BCB11916F5152C0084604C /* preview.png in Resources */,
+				A9935213196F38A70069C6B7 /* ChaptersTitles.xib in Resources */,
 				D2BCB11A16F5152C0084604C /* preview@2x.png in Resources */,
 				D2BCB11B16F5152C0084604C /* settings@2x.png in Resources */,
 				D2BCB12316F5154E0084604C /* settings.png in Resources */,
@@ -854,6 +1071,7 @@
 				D2BCB12616F5154E0084604C /* source.png in Resources */,
 				D2BCB12716F5154E0084604C /* source@2x.png in Resources */,
 				D2BCB12816F5154E0084604C /* stopencode.png in Resources */,
+				A9252C041A17343500B8B7F8 /* DeleteHighlight@2x.png in Resources */,
 				D2BCB12916F5154E0084604C /* stopencode@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -875,7 +1093,12 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				273F20AB14ADBE670021BE6D /* ChapterTitles.m in Sources */,
+				A9F7102619A475EC00F61301 /* HBDockTile.m in Sources */,
+				A98C29C41977B10600AF5DED /* HBLanguagesSelection.m in Sources */,
+				A9BB0F2719A0ECE40079F1C1 /* HBHUDButtonCell.m in Sources */,
+				A932E273198834130047D13E /* HBAudioDefaults.m in Sources */,
+				A9523937199A6AAE00588AEF /* HBFilters.m in Sources */,
+				A9AA447A1970664A00D7DEFC /* HBUtilities.m in Sources */,
 				273F20AC14ADBE670021BE6D /* Controller.m in Sources */,
 				273F20AD14ADBE670021BE6D /* HBAdvancedController.m in Sources */,
 				273F20AE14ADBE670021BE6D /* HBAudio.m in Sources */,
@@ -885,13 +1108,24 @@
 				273F20B314ADBE670021BE6D /* HBOutputPanelController.m in Sources */,
 				273F20B414ADBE670021BE6D /* HBOutputRedirect.m in Sources */,
 				273F20B514ADBE670021BE6D /* HBPreferencesController.m in Sources */,
-				273F20B614ADBE670021BE6D /* HBPresets.m in Sources */,
+				A9DC6C52196F04F6002AE6B4 /* HBSubtitlesController.m in Sources */,
+				A9F472891976B7F30009EC65 /* HBSubtitlesDefaultsController.m in Sources */,
+				A9CF25F41990D64E0023F727 /* HBPreset.m in Sources */,
+				A9F4728D1976BAA70009EC65 /* HBSubtitlesDefaults.m in Sources */,
+				A93E0ED31972957000FD67FB /* HBVideoController.m in Sources */,
+				273F20B614ADBE670021BE6D /* HBPresetsManager.m in Sources */,
 				273F20B714ADBE670021BE6D /* HBPreviewController.m in Sources */,
+				A9D1E41718262364002F6424 /* HBPreviewGenerator.m in Sources */,
+				A90A0CAF1988D57200DA65CE /* HBAudioTrackPreset.m in Sources */,
 				273F20B814ADBE670021BE6D /* HBQueueController.mm in Sources */,
-				273F20B914ADBE670021BE6D /* HBSubtitles.m in Sources */,
 				273F20BA14ADBE670021BE6D /* PictureController.m in Sources */,
+				A9CF25F71990D6820023F727 /* HBPresetsViewController.m in Sources */,
 				273F20BE14ADC09F0021BE6D /* main.mm in Sources */,
+				A91726E7197291BC00D1AFEF /* HBChapterTitlesController.m in Sources */,
+				A9C9F88919A733FE00DC8923 /* HBHUDView.m in Sources */,
+				A932E26F198833920047D13E /* HBAudioDefaultsController.m in Sources */,
 				46AB433515F98A2B009C0961 /* DockTextField.m in Sources */,
+				A9D488A51996270300E9B1BA /* HBTreeNode.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -975,6 +1209,62 @@
 			name = Queue.xib;
 			sourceTree = "<group>";
 		};
+		A932E26A1988334B0047D13E /* AudioDefaults.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				A932E26B1988334B0047D13E /* English */,
+			);
+			name = AudioDefaults.xib;
+			sourceTree = "<group>";
+		};
+		A93E0ED51972958C00FD67FB /* Video.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				A93E0ED61972958C00FD67FB /* English */,
+			);
+			name = Video.xib;
+			sourceTree = "<group>";
+		};
+		A9935211196F38A70069C6B7 /* ChaptersTitles.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				A9935212196F38A70069C6B7 /* English */,
+			);
+			name = ChaptersTitles.xib;
+			sourceTree = "<group>";
+		};
+		A9C0DB83197E7B0000DF55B3 /* SubtitlesDefaults.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				A9C0DB84197E7B0000DF55B3 /* English */,
+			);
+			name = SubtitlesDefaults.xib;
+			sourceTree = "<group>";
+		};
+		A9CF25EF1990D62C0023F727 /* Presets.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				A9CF25F01990D62C0023F727 /* English */,
+			);
+			name = Presets.xib;
+			sourceTree = "<group>";
+		};
+		A9DC6C54196F0517002AE6B4 /* Subtitles.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				A9DC6C55196F0517002AE6B4 /* English */,
+			);
+			name = Subtitles.xib;
+			sourceTree = "<group>";
+		};
+		A9F2EB6D196F12C800066546 /* Audio.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				A9F2EB6E196F12C800066546 /* English */,
+			);
+			name = Audio.xib;
+			sourceTree = "<group>";
+		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
@@ -983,7 +1273,15 @@
 			baseConfigurationReference = 275916DA14B2AB27007211E9 /* native.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				EXTERNAL_BUILD = "$(CONFIGURATION_BUILD_DIR)/external";
 				EXTERNAL_DRIVER = xcode;
 				EXTERNAL_JOBS = auto;
@@ -995,11 +1293,20 @@
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OTHER_LDFLAGS = (
+					"-filelist",
+					"$(EXTERNAL_BUILD)/macosx/osl.filelist.txt",
+				);
+				SDKROOT = macosx;
 				SHARED_PRECOMPS_DIR = "$(CONFIGURATION_TEMP_DIR)/PrecompiledHeaders";
 				STRIP_INSTALLED_PRODUCT = NO;
 			};
@@ -1010,19 +1317,36 @@
 			baseConfigurationReference = 275916DA14B2AB27007211E9 /* native.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				EXTERNAL_BUILD = "$(CONFIGURATION_BUILD_DIR)/external";
 				EXTERNAL_DRIVER = xcode;
 				EXTERNAL_JOBS = auto;
 				EXTERNAL_SRC = ..;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OTHER_LDFLAGS = (
+					"-filelist",
+					"$(EXTERNAL_BUILD)/macosx/osl.filelist.txt",
+				);
+				SDKROOT = macosx;
 				SHARED_PRECOMPS_DIR = "$(CONFIGURATION_TEMP_DIR)/PrecompiledHeaders";
 				STRIP_INSTALLED_PRODUCT = YES;
 			};
@@ -1063,6 +1387,7 @@
 		273F205414ADBC210021BE6D /* debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
@@ -1085,6 +1410,7 @@
 		273F205514ADBC210021BE6D /* release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)\"",

HandBrake-0.9.9.tar.bz2/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [DEBUG].xcscheme -> HandBrake-0.10.0.tar.bz2/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [DEBUG].xcscheme Changed

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
+ LastUpgradeVersion = "0610"
 version = "1.3">
 <BuildAction
 parallelizeBuildables = "YES"
@@ -36,7 +37,7 @@
 </BuildActionEntries>
 </BuildAction>
 <TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
 shouldUseLaunchSchemeArgsEnv = "YES"
 buildConfiguration = "debug">
@@ -53,11 +54,12 @@
 </MacroExpansion>
 </TestAction>
 <LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
 launchStyle = "0"
 useCustomWorkingDirectory = "NO"
 buildConfiguration = "debug"
+ ignoresPersistentStateOnLaunch = "NO"
 debugDocumentVersioning = "YES"
 allowLocationSimulation = "YES">
 <BuildableProductRunnable>

HandBrake-0.9.9.tar.bz2/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [RELEASE].xcscheme -> HandBrake-0.10.0.tar.bz2/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [RELEASE].xcscheme Changed

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
+ LastUpgradeVersion = "0610"
 version = "1.3">
 <BuildAction
 parallelizeBuildables = "YES"
@@ -36,7 +37,7 @@
 </BuildActionEntries>
 </BuildAction>
 <TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
 shouldUseLaunchSchemeArgsEnv = "YES"
 buildConfiguration = "release">
@@ -53,11 +54,12 @@
 </MacroExpansion>
 </TestAction>
 <LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
 launchStyle = "0"
 useCustomWorkingDirectory = "NO"
 buildConfiguration = "release"
+ ignoresPersistentStateOnLaunch = "NO"
 debugDocumentVersioning = "YES"
 allowLocationSimulation = "YES">
 <BuildableProductRunnable>

HandBrake-0.9.9.tar.bz2/macosx/Info.plist.m4 -> HandBrake-0.10.0.tar.bz2/macosx/Info.plist.m4 Changed

HandBrake-0.9.9.tar.bz2/macosx/InstantHandBrake/InstantHandBrake.xcodeproj/project.pbxproj -> HandBrake-0.10.0.tar.bz2/macosx/InstantHandBrake/InstantHandBrake.xcodeproj/project.pbxproj Changed

HandBrake-0.9.9.tar.bz2/macosx/InstantHandBrake/libhb.xcodeproj/project.pbxproj -> HandBrake-0.10.0.tar.bz2/macosx/InstantHandBrake/libhb.xcodeproj/project.pbxproj Changed

@@ -10,11 +10,9 @@
 		A9DB39100D37EA0300F77345 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = A9DB38E70D37EA0300F77345 /* common.c */; };
 		A9DB39110D37EA0300F77345 /* common.h in Headers */ = {isa = PBXBuildFile; fileRef = A9DB38E80D37EA0300F77345 /* common.h */; };
 		A9DB39120D37EA0300F77345 /* deblock.c in Sources */ = {isa = PBXBuildFile; fileRef = A9DB38E90D37EA0300F77345 /* deblock.c */; };
-		A9DB39130D37EA0300F77345 /* deca52.c in Sources */ = {isa = PBXBuildFile; fileRef = A9DB38EA0D37EA0300F77345 /* deca52.c */; };
 		A9DB39140D37EA0300F77345 /* decavcodec.c in Sources */ = {isa = PBXBuildFile; fileRef = A9DB38EB0D37EA0300F77345 /* decavcodec.c */; };
 		A9DB39150D37EA0300F77345 /* decdca.c in Sources */ = {isa = PBXBuildFile; fileRef = A9DB38EC0D37EA0300F77345 /* decdca.c */; };
 		A9DB39160D37EA0300F77345 /* declpcm.c in Sources */ = {isa = PBXBuildFile; fileRef = A9DB38ED0D37EA0300F77345 /* declpcm.c */; };
-		A9DB39170D37EA0300F77345 /* decmpeg2.c in Sources */ = {isa = PBXBuildFile; fileRef = A9DB38EE0D37EA0300F77345 /* decmpeg2.c */; };
 		A9DB39180D37EA0300F77345 /* decsub.c in Sources */ = {isa = PBXBuildFile; fileRef = A9DB38EF0D37EA0300F77345 /* decsub.c */; };
 		A9DB39190D37EA0300F77345 /* deinterlace.c in Sources */ = {isa = PBXBuildFile; fileRef = A9DB38F00D37EA0300F77345 /* deinterlace.c */; };
 		A9DB391A0D37EA0300F77345 /* demuxmpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = A9DB38F10D37EA0300F77345 /* demuxmpeg.c */; };
@@ -48,7 +46,6 @@
 		A9DB39360D37EA0300F77345 /* sync.c in Sources */ = {isa = PBXBuildFile; fileRef = A9DB390D0D37EA0300F77345 /* sync.c */; };
 		A9DB39370D37EA0300F77345 /* update.c in Sources */ = {isa = PBXBuildFile; fileRef = A9DB390E0D37EA0300F77345 /* update.c */; };
 		A9DB39380D37EA0300F77345 /* work.c in Sources */ = {isa = PBXBuildFile; fileRef = A9DB390F0D37EA0300F77345 /* work.c */; };
-		A9DB39B20D37EB4700F77345 /* liba52.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9DB399D0D37EB4700F77345 /* liba52.a */; };
 		A9DB39B30D37EB4700F77345 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9DB399E0D37EB4700F77345 /* libavcodec.a */; };
 		A9DB39B40D37EB4700F77345 /* libavformat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9DB399F0D37EB4700F77345 /* libavformat.a */; };
 		A9DB39B50D37EB4700F77345 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9DB39A00D37EB4700F77345 /* libavutil.a */; };
@@ -59,7 +56,6 @@
 		A9DB39BA0D37EB4700F77345 /* libmkv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9DB39A50D37EB4700F77345 /* libmkv.a */; };
 		A9DB39BB0D37EB4700F77345 /* libmp3lame.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9DB39A60D37EB4700F77345 /* libmp3lame.a */; };
 		A9DB39BC0D37EB4700F77345 /* libmp4v2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9DB39A70D37EB4700F77345 /* libmp4v2.a */; };
-		A9DB39BD0D37EB4700F77345 /* libmpeg2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9DB39A80D37EB4700F77345 /* libmpeg2.a */; };
 		A9DB39BE0D37EB4700F77345 /* libmpeg2convert.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9DB39A90D37EB4700F77345 /* libmpeg2convert.a */; };
 		A9DB39BF0D37EB4700F77345 /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9DB39AA0D37EB4700F77345 /* libogg.a */; };
 		A9DB39C00D37EB4700F77345 /* libsamplerate.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9DB39AB0D37EB4700F77345 /* libsamplerate.a */; };
@@ -72,7 +68,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		0DFF0B720B6BC6E600549488 /* libhb.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhb.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		0DFF0B720B6BC6E600549488 /* libhandbrake.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhandbrake.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
@@ -81,11 +77,9 @@
 		A9DB38E70D37EA0300F77345 /* common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = common.c; path = ../../libhb/common.c; sourceTree = SOURCE_ROOT; };
 		A9DB38E80D37EA0300F77345 /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = common.h; path = ../../libhb/common.h; sourceTree = SOURCE_ROOT; };
 		A9DB38E90D37EA0300F77345 /* deblock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = deblock.c; path = ../../libhb/deblock.c; sourceTree = SOURCE_ROOT; };
-		A9DB38EA0D37EA0300F77345 /* deca52.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = deca52.c; path = ../../libhb/deca52.c; sourceTree = SOURCE_ROOT; };
 		A9DB38EB0D37EA0300F77345 /* decavcodec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = decavcodec.c; path = ../../libhb/decavcodec.c; sourceTree = SOURCE_ROOT; };
 		A9DB38EC0D37EA0300F77345 /* decdca.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = decdca.c; path = ../../libhb/decdca.c; sourceTree = SOURCE_ROOT; };
 		A9DB38ED0D37EA0300F77345 /* declpcm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = declpcm.c; path = ../../libhb/declpcm.c; sourceTree = SOURCE_ROOT; };
-		A9DB38EE0D37EA0300F77345 /* decmpeg2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = decmpeg2.c; path = ../../libhb/decmpeg2.c; sourceTree = SOURCE_ROOT; };
 		A9DB38EF0D37EA0300F77345 /* decsub.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = decsub.c; path = ../../libhb/decsub.c; sourceTree = SOURCE_ROOT; };
 		A9DB38F00D37EA0300F77345 /* deinterlace.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = deinterlace.c; path = ../../libhb/deinterlace.c; sourceTree = SOURCE_ROOT; };
 		A9DB38F10D37EA0300F77345 /* demuxmpeg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = demuxmpeg.c; path = ../../libhb/demuxmpeg.c; sourceTree = SOURCE_ROOT; };
@@ -119,7 +113,6 @@
 		A9DB390D0D37EA0300F77345 /* sync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync.c; path = ../../libhb/sync.c; sourceTree = SOURCE_ROOT; };
 		A9DB390E0D37EA0300F77345 /* update.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = update.c; path = ../../libhb/update.c; sourceTree = SOURCE_ROOT; };
 		A9DB390F0D37EA0300F77345 /* work.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = work.c; path = ../../libhb/work.c; sourceTree = SOURCE_ROOT; };
-		A9DB399D0D37EB4700F77345 /* liba52.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liba52.a; path = ../../contrib/lib/liba52.a; sourceTree = SOURCE_ROOT; };
 		A9DB399E0D37EB4700F77345 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = ../../contrib/lib/libavcodec.a; sourceTree = SOURCE_ROOT; };
 		A9DB399F0D37EB4700F77345 /* libavformat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavformat.a; path = ../../contrib/lib/libavformat.a; sourceTree = SOURCE_ROOT; };
 		A9DB39A00D37EB4700F77345 /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = ../../contrib/lib/libavutil.a; sourceTree = SOURCE_ROOT; };
@@ -130,7 +123,6 @@
 		A9DB39A50D37EB4700F77345 /* libmkv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmkv.a; path = ../../contrib/lib/libmkv.a; sourceTree = SOURCE_ROOT; };
 		A9DB39A60D37EB4700F77345 /* libmp3lame.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmp3lame.a; path = ../../contrib/lib/libmp3lame.a; sourceTree = SOURCE_ROOT; };
 		A9DB39A70D37EB4700F77345 /* libmp4v2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmp4v2.a; path = ../../contrib/lib/libmp4v2.a; sourceTree = SOURCE_ROOT; };
-		A9DB39A80D37EB4700F77345 /* libmpeg2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmpeg2.a; path = ../../contrib/lib/libmpeg2.a; sourceTree = SOURCE_ROOT; };
 		A9DB39A90D37EB4700F77345 /* libmpeg2convert.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmpeg2convert.a; path = ../../contrib/lib/libmpeg2convert.a; sourceTree = SOURCE_ROOT; };
 		A9DB39AA0D37EB4700F77345 /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = ../../contrib/lib/libogg.a; sourceTree = SOURCE_ROOT; };
 		A9DB39AB0D37EB4700F77345 /* libsamplerate.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsamplerate.a; path = ../../contrib/lib/libsamplerate.a; sourceTree = SOURCE_ROOT; };
@@ -147,7 +139,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A9DB39B20D37EB4700F77345 /* liba52.a in Frameworks */,
 				A9DB39B30D37EB4700F77345 /* libavcodec.a in Frameworks */,
 				A9DB39B40D37EB4700F77345 /* libavformat.a in Frameworks */,
 				A9DB39B50D37EB4700F77345 /* libavutil.a in Frameworks */,
@@ -158,7 +149,6 @@
 				A9DB39BA0D37EB4700F77345 /* libmkv.a in Frameworks */,
 				A9DB39BB0D37EB4700F77345 /* libmp3lame.a in Frameworks */,
 				A9DB39BC0D37EB4700F77345 /* libmp4v2.a in Frameworks */,
-				A9DB39BD0D37EB4700F77345 /* libmpeg2.a in Frameworks */,
 				A9DB39BE0D37EB4700F77345 /* libmpeg2convert.a in Frameworks */,
 				A9DB39BF0D37EB4700F77345 /* libogg.a in Frameworks */,
 				A9DB39C00D37EB4700F77345 /* libsamplerate.a in Frameworks */,
@@ -177,7 +167,7 @@
 		19C28FACFE9D520D11CA2CBB /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				0DFF0B720B6BC6E600549488 /* libhb.a */,
+				0DFF0B720B6BC6E600549488 /* libhandbrake.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -188,11 +178,9 @@
 				A9DB38E70D37EA0300F77345 /* common.c */,
 				A9DB38E80D37EA0300F77345 /* common.h */,
 				A9DB38E90D37EA0300F77345 /* deblock.c */,
-				A9DB38EA0D37EA0300F77345 /* deca52.c */,
 				A9DB38EB0D37EA0300F77345 /* decavcodec.c */,
 				A9DB38EC0D37EA0300F77345 /* decdca.c */,
 				A9DB38ED0D37EA0300F77345 /* declpcm.c */,
-				A9DB38EE0D37EA0300F77345 /* decmpeg2.c */,
 				A9DB38EF0D37EA0300F77345 /* decsub.c */,
 				A9DB38F00D37EA0300F77345 /* deinterlace.c */,
 				A9DB38F10D37EA0300F77345 /* demuxmpeg.c */,
@@ -235,7 +223,6 @@
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				A9DB399D0D37EB4700F77345 /* liba52.a */,
 				A9DB399E0D37EB4700F77345 /* libavcodec.a */,
 				A9DB399F0D37EB4700F77345 /* libavformat.a */,
 				A9DB39A00D37EB4700F77345 /* libavutil.a */,
@@ -246,7 +233,6 @@
 				A9DB39A50D37EB4700F77345 /* libmkv.a */,
 				A9DB39A60D37EB4700F77345 /* libmp3lame.a */,
 				A9DB39A70D37EB4700F77345 /* libmp4v2.a */,
-				A9DB39A80D37EB4700F77345 /* libmpeg2.a */,
 				A9DB39A90D37EB4700F77345 /* libmpeg2convert.a */,
 				A9DB39AA0D37EB4700F77345 /* libogg.a */,
 				A9DB39AB0D37EB4700F77345 /* libsamplerate.a */,
@@ -283,9 +269,9 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		0DFF0B710B6BC6E600549488 /* libhb */ = {
+		0DFF0B710B6BC6E600549488 /* libhandbrake */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 0DFF0B730B6BC70400549488 /* Build configuration list for PBXNativeTarget "libhb" */;
+			buildConfigurationList = 0DFF0B730B6BC70400549488 /* Build configuration list for PBXNativeTarget "libhandbrake" */;
 			buildPhases = (
 				0DFF0B6E0B6BC6E600549488 /* Headers */,
 				0DFF0B6F0B6BC6E600549488 /* Sources */,
@@ -295,9 +281,9 @@
 			);
 			dependencies = (
 			);
-			name = libhb;
+			name = libhandbrake;
 			productName = libmediafork;
-			productReference = 0DFF0B720B6BC6E600549488 /* libhb.a */;
+			productReference = 0DFF0B720B6BC6E600549488 /* libhandbrake.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 /* End PBXNativeTarget section */
@@ -305,14 +291,14 @@
 /* Begin PBXProject section */
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
-			buildConfigurationList = 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "libhb" */;
+			buildConfigurationList = 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "libhandbrake" */;
 			compatibilityVersion = "Xcode 2.4";
 			hasScannedForEncodings = 1;
 			mainGroup = 29B97314FDCFA39411CA2CEA /* HandBrake */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				0DFF0B710B6BC6E600549488 /* libhb */,
+				0DFF0B710B6BC6E600549488 /* libhandbrake */,
 			);
 		};
 /* End PBXProject section */
@@ -324,11 +310,9 @@
 			files = (
 				A9DB39100D37EA0300F77345 /* common.c in Sources */,
 				A9DB39120D37EA0300F77345 /* deblock.c in Sources */,
-				A9DB39130D37EA0300F77345 /* deca52.c in Sources */,
 				A9DB39140D37EA0300F77345 /* decavcodec.c in Sources */,
 				A9DB39150D37EA0300F77345 /* decdca.c in Sources */,
 				A9DB39160D37EA0300F77345 /* declpcm.c in Sources */,
-				A9DB39170D37EA0300F77345 /* decmpeg2.c in Sources */,
 				A9DB39180D37EA0300F77345 /* decsub.c in Sources */,
 				A9DB39190D37EA0300F77345 /* deinterlace.c in Sources */,
 				A9DB391A0D37EA0300F77345 /* demuxmpeg.c in Sources */,
@@ -519,7 +503,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		0DFF0B730B6BC70400549488 /* Build configuration list for PBXNativeTarget "libhb" */ = {
+		0DFF0B730B6BC70400549488 /* Build configuration list for PBXNativeTarget "libhandbrake" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				0DFF0B740B6BC70400549488 /* Development */,
@@ -529,7 +513,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Deployment;
 		};
-		4D4E7BC4087804870051572B /* Build configuration list for PBXProject "libhb" */ = {
+		4D4E7BC4087804870051572B /* Build configuration list for PBXProject "libhandbrake" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				4D4E7BC5087804870051572B /* Development */,

HandBrake-0.9.9.tar.bz2/macosx/PictureController.h -> HandBrake-0.10.0.tar.bz2/macosx/PictureController.h Changed

@@ -5,231 +5,28 @@
 It may be used under the terms of the GNU General Public License. */
 
 #import <Cocoa/Cocoa.h>
+#import "HBFilters.h"
+#include "hb.h"
 
-#include "hb.h" 
+@protocol HBPictureControllerDelegate <NSObject>
 
-@class HBController;
-@class PreviewController;
+- (void) pictureSettingsDidChange;
 
+@end
 
+@interface HBPictureController : NSWindowController <NSWindowDelegate>
 
-//#define HB_NUM_HBLIB_PICTURES 20 // # of preview pictures libhb should generate
-
-@interface PictureController : NSWindowController
-{
- hb_handle_t * fHandle;
- hb_title_t * fTitle;
-
- HBController *fHBController;
- PreviewController *fPreviewController; // reference to HBController
- 
- IBOutlet NSWindow * fPictureWindow;
- 
- IBOutlet NSTabView * fSizeFilterView;
- IBOutlet NSTabViewItem * fSizeTabView;
- IBOutlet NSTabViewItem * fFilterTabView;
- 
- /* Picture Sizing */
- 
- NSMutableDictionary * fPicturePreviews; // NSImages, one for each preview libhb creates, created lazily
- int fPicture;
-
-
- IBOutlet NSBox * fPictureSizeBox;
- IBOutlet NSBox * fPictureCropBox;
- 
- IBOutlet NSTextField * fWidthLabel;
- IBOutlet NSTextField * fWidthField;
- IBOutlet NSStepper * fWidthStepper;
- IBOutlet NSTextField * fHeightField;
- IBOutlet NSStepper * fHeightStepper;
- IBOutlet NSTextField * fRatioLabel;
- IBOutlet NSTextField * fRatioLabel2; // shown for capuj
- IBOutlet NSButton * fRatioCheck;
- IBOutlet NSMatrix * fCropMatrix;
- IBOutlet NSTextField * fCropTopField;
- IBOutlet NSStepper * fCropTopStepper;
- IBOutlet NSTextField * fCropBottomField;
- IBOutlet NSStepper * fCropBottomStepper;
- IBOutlet NSTextField * fCropLeftField;
- IBOutlet NSStepper * fCropLeftStepper;
- IBOutlet NSTextField * fCropRightField;
- IBOutlet NSStepper * fCropRightStepper;
- 
- IBOutlet NSTextField * fModulusLabel;
- IBOutlet NSPopUpButton * fModulusPopUp;
- /* linkers for capuj */
- IBOutlet NSBox * fStorageLinkBox;
- IBOutlet NSSlider * fStorageLinkSlider;
- IBOutlet NSTextField * fStorageLinkParLabel;
- IBOutlet NSTextField * fStorageLinkDisplayLabel;
- 
- IBOutlet NSSlider * fParLinkSlider;
- IBOutlet NSTextField * fParLinkStorageLabel;
- IBOutlet NSTextField * fParLinkDisplayLabel;
- 
- IBOutlet NSSlider * fDisplayLinkSlider;
- IBOutlet NSTextField * fDisplayLinkStorageLabel;
- IBOutlet NSTextField * fDisplayLinkParLabel;
- 
- 
- IBOutlet NSTextField * fDisplayWidthField;
- IBOutlet NSTextField * fDisplayWidthLabel;
- 
- IBOutlet NSTextField * fParWidthField;
- IBOutlet NSTextField * fParHeightField;
- IBOutlet NSTextField * fParWidthLabel;
- IBOutlet NSTextField * fParHeightLabel;
-
- /* for now we setup some values to remember our pars and dars
- * from scan
- */
- float titleDarWidth;
- float titleDarHeight;
- 
- int titleParWidth;
- int titleParHeight;
- float dar;
- IBOutlet NSButton * fResetParDarButton;
- 
-	IBOutlet NSPopUpButton * fAnamorphicPopUp;
- IBOutlet NSTextField * fSizeInfoField;
-	
- IBOutlet NSButton * fPreviewOpenButton;
- IBOutlet NSButton * fPictureFiltersOpenButton;
- 
- int MaxOutputWidth;
- int MaxOutputHeight;
- BOOL autoCrop;
- 
- int output_width, output_height, output_par_width, output_par_height;
- int display_width;
- 
- int modulus;
- 
- /* used to track the previous state of the keep aspect
- ratio checkbox when turning anamorphic on, so it can be
- returned to the previous state when anamorphic is turned
- off */
- BOOL keepAspectRatioPreviousState;
- 
- 
- /* Video Filters */
- 
- IBOutlet NSBox * fPictureFilterBox;
-
- IBOutlet NSBox * fDetelecineBox;
- IBOutlet NSPopUpButton * fDetelecinePopUp;
- IBOutlet NSTextField * fDetelecineField;
- 
- IBOutlet NSBox * fDecombDeinterlaceBox;
- IBOutlet NSSlider * fDecombDeinterlaceSlider;
- 
- IBOutlet NSBox * fDecombBox;
- IBOutlet NSPopUpButton * fDecombPopUp;
- IBOutlet NSTextField * fDecombField;
- 
- IBOutlet NSBox * fDeinterlaceBox;
- IBOutlet NSPopUpButton * fDeinterlacePopUp;
- IBOutlet NSTextField * fDeinterlaceField;
-
- IBOutlet NSBox * fDenoiseBox;
- IBOutlet NSPopUpButton * fDenoisePopUp;
- IBOutlet NSTextField * fDenoiseField;
-	
- 
- IBOutlet NSBox * fDeblockBox; // also holds the grayscale box
- IBOutlet NSButton * fDeblockCheck;
- IBOutlet NSTextField * fDeblockField;
- IBOutlet NSSlider * fDeblockSlider;
- 
- IBOutlet NSButton * fGrayscaleCheck;
+@property (nonatomic, readwrite, retain) HBFilters *filters;
+@property (nonatomic, readwrite) BOOL autoCrop;
 
- IBOutlet NSTextField * fInfoField;
-	
+@property (nonatomic, readwrite, assign) id <HBPictureControllerDelegate> delegate;
 
- 
- struct {
- int detelecine;
- int deinterlace;
- int decomb;
- int usedecomb;
- int denoise;
- int deblock;
- int grayscale;
- } fPictureFilterSettings;
- 
-}
-- (id)init;
+- (void) setHandle:(hb_handle_t *) handle;
+- (void) setTitle:(hb_title_t *) title;
 
-- (void) SetHandle: (hb_handle_t *) handle;
-- (void) SetTitle: (hb_title_t *) title;
-- (void)setHBController: (HBController *)controller;
 - (IBAction) showPictureWindow: (id)sender;
-- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem;
-- (IBAction) resizeInspectorForTab: (id)sender;
 - (IBAction) showPreviewWindow: (id)sender;
 
-- (void) enablePreviewHudControls;
-- (void) disablePreviewHudControls;
-
-- (IBAction) adjustSizingDisplay: (id) sender;
-
-
-- (IBAction) SettingsChanged: (id) sender;
-
-- (NSString*) getPictureSizeInfoString;
-- (void)reloadStillPreview;
-
-- (BOOL) autoCrop;
-- (void) setAutoCrop: (BOOL) setting;
-
-- (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title;
-- (IBAction) storageLinkChanged: (id) sender;
-- (IBAction) parLinkChanged: (id) sender;
-- (IBAction) displayLinkChanged: (id) sender;
-
-- (void) setToWindowedMode;
-
-/* Filter Actions */
-- (void) setInitialPictureFilters;
-- (IBAction) FilterSettingsChanged: (id) sender;
-- (IBAction) adjustFilterDisplay: (id) sender;
-- (IBAction) modeDecombDeinterlaceSliderChanged: (id) sender;
-- (IBAction) deblockSliderChanged: (id) sender;
-
-- (void) decombDeinterlacePreviewImage;
-
-- (int) detelecine;
-- (NSString*) detelecineCustomString;
-- (void) setDetelecine: (int) setting;
-- (void) setDetelecineCustomString: (NSString*) string;
-
-- (int) useDecomb;
-- (void) setUseDecomb: (int) setting;
-
-- (int) decomb;
-- (NSString*) decombCustomString;
-- (void) setDecomb: (int) setting;
-- (void) setDecombCustomString: (NSString*) string;
-
-- (int) deinterlace;
-- (NSString*) deinterlaceCustomString;
-- (void) setDeinterlace: (int) setting;
-- (void) setDeinterlaceCustomString: (NSString*) string; 
-
-- (int) denoise;
-- (NSString*) denoiseCustomString;
-- (void) setDenoise: (int) setting;
-- (void) setDenoiseCustomString: (NSString*) string;
-
-- (int) deblock;
-- (void) setDeblock: (int) setting;
-
-- (int) grayscale;
-- (void) setGrayscale: (int) setting;
-
-
+- (NSString *) pictureSizeInfoString;
 
 @end
-

HandBrake-0.9.9.tar.bz2/macosx/PictureController.m -> HandBrake-0.10.0.tar.bz2/macosx/PictureController.m Changed

@@ -1,21 +1,107 @@
 /* $Id: PictureController.mm,v 1.11 2005/08/01 15:10:44 titer Exp $
 
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License. */
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
 
-#import "PictureController.h"
 #import "Controller.h"
+#import "PictureController.h"
 #import "HBPreviewController.h"
 
+@interface HBCustomFilterTransformer : NSValueTransformer
+@end
+
+@implementation HBCustomFilterTransformer
+
++ (Class)transformedValueClass
+{
+ return [NSNumber class];
+}
+
+- (id)transformedValue:(id)value
+{
+ if ([value intValue] == 1)
+ return @NO;
+ else
+ return @YES;
+}
+
++ (BOOL)allowsReverseTransformation
+{
+ return NO;
+}
+
+@end
+
+static void *HBPictureControllerContext = &HBPictureControllerContext;
+
+@interface HBPictureController ()
+{
+ hb_title_t * fTitle;
+
+ HBPreviewController * fPreviewController;
+
+ /* Picture Sizing */
+ IBOutlet NSTabView * fSizeFilterView;
+ IBOutlet NSBox * fPictureSizeBox;
+ IBOutlet NSBox * fPictureCropBox;
+
+ IBOutlet NSTextField * fWidthField;
+ IBOutlet NSStepper * fWidthStepper;
+ IBOutlet NSTextField * fHeightField;
+ IBOutlet NSStepper * fHeightStepper;
+ IBOutlet NSTextField * fRatioLabel;
+ IBOutlet NSButton * fRatioCheck;
+ IBOutlet NSMatrix * fCropMatrix;
+ IBOutlet NSTextField * fCropTopField;
+ IBOutlet NSStepper * fCropTopStepper;
+ IBOutlet NSTextField * fCropBottomField;
+ IBOutlet NSStepper * fCropBottomStepper;
+ IBOutlet NSTextField * fCropLeftField;
+ IBOutlet NSStepper * fCropLeftStepper;
+ IBOutlet NSTextField * fCropRightField;
+ IBOutlet NSStepper * fCropRightStepper;
+
+ IBOutlet NSTextField * fModulusLabel;
+ IBOutlet NSPopUpButton * fModulusPopUp;
+
+ IBOutlet NSTextField * fDisplayWidthField;
+ IBOutlet NSTextField * fDisplayWidthLabel;
 
+ IBOutlet NSTextField * fParWidthField;
+ IBOutlet NSTextField * fParHeightField;
+ IBOutlet NSTextField * fParWidthLabel;
+ IBOutlet NSTextField * fParHeightLabel;
 
-@implementation PictureController
+	IBOutlet NSPopUpButton * fAnamorphicPopUp;
+ IBOutlet NSTextField * fSizeInfoField;
 
-- (id)init
+ /* Video Filters */
+ IBOutlet NSBox * fDetelecineBox;
+ IBOutlet NSBox * fDecombDeinterlaceBox;
+ IBOutlet NSBox * fDecombBox;
+ IBOutlet NSBox * fDeinterlaceBox;
+
+ IBOutlet NSTextField * fDeblockField;
+
+ IBOutlet NSTextField *fDenoisePreset;
+ IBOutlet NSPopUpButton *fDenoisePresetPopUp;
+ IBOutlet NSTextField *fDenoiseTuneLabel;
+ IBOutlet NSPopUpButton *fDenoiseTunePopUp;
+ IBOutlet NSTextField *fDenoiseCustomLabel;
+ IBOutlet NSTextField *fDenoiseCustomField;
+}
+
+@end
+
+@implementation HBPictureController
+
+- (instancetype)init
 {
 	if (self = [super initWithWindowNibName:@"PictureSettings"])
 	{
+ _filters = [[HBFilters alloc] init];
+
 // NSWindowController likes to lazily load its window. However since
 // this controller tries to set all sorts of outlets before the window
 // is displayed, we need it to load immediately. The correct way to do
@@ -25,114 +111,388 @@
 // If/when we switch a lot of this stuff to bindings, this can probably
 // go away.
 [self window];
- 
-	fPreviewController = [[PreviewController alloc] init];
+
+ // Add the observers for the filters values
+ NSArray *observerdKeyPaths = @[@"filters.detelecine", @"filters.detelecineCustomString",
+ @"filters.deinterlace", @"filters.deinterlaceCustomString",
+ @"filters.decomb", @"filters.decombCustomString",
+ @"filters.denoise", @"filters.denoisePreset",
+ @"filters.denoiseTune", @"filters.denoiseCustomString",
+ @"filters.deblock", @"filters.grayscale", @"filters.useDecomb"];
+ for (NSString *keyPath in observerdKeyPaths)
+ {
+ [self addObserver:self forKeyPath:keyPath options:NSKeyValueObservingOptionInitial context:HBPictureControllerContext];
+ }
+
+ fPreviewController = [[HBPreviewController alloc] init];
 }
+
 	return self;
 }
 
-//------------------------------------------------------------------------------------
-// Displays and brings the picture window to the front
-//------------------------------------------------------------------------------------
-- (IBAction) showPictureWindow: (id)sender
+- (void) dealloc
 {
-
-
- if ([[self window] isVisible])
+ NSArray *observerdKeyPaths = @[@"filters.detelecine", @"filters.detelecineCustomString",
+ @"filters.deinterlace", @"filters.deinterlaceCustomString",
+ @"filters.decomb", @"filters.decombCustomString",
+ @"filters.denoise", @"filters.denoisePreset",
+ @"filters.denoiseTune", @"filters.denoiseCustomString",
+ @"filters.deblock", @"filters.grayscale", @"filters.useDecomb"];
+ @try {
+ for (NSString *keyPath in observerdKeyPaths)
 {
- [[self window] close];
- }
- else
- {
- [self showWindow:sender];
- [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PictureSizeWindowIsOpen"];
- [self setToWindowedMode];
+ [self removeObserver:self forKeyPath:keyPath];
 }
 
- [self adjustFilterDisplay:nil];
+ } @catch (NSException * __unused exception) {}
+
+ [_filters release];
+ [fPreviewController release];
+ [super dealloc];
+}
+
+- (void)windowDidLoad
+{
+ [[self window] setExcludedFromWindowsMenu:YES];
+
+ // Set the panel appearance explicity to aqua.
+ // can be removed when Apple will fix UI appearance on Yosemite.
+ if (NSClassFromString(@"NSVisualEffectView")) {
+ [self.window setAppearance:[NSClassFromString(@"NSAppearance") appearanceNamed:@"NSAppearanceNameAqua"]];
+ }
+
+ /* Populate the user interface */
+ [fWidthStepper setValueWraps: NO];
+ [fHeightStepper setValueWraps: NO];
+
+ [fCropTopStepper setIncrement: 2];
+ [fCropTopStepper setMinValue: 0];
+ [fCropBottomStepper setIncrement: 2];
+ [fCropBottomStepper setMinValue: 0];
+ [fCropLeftStepper setIncrement: 2];
+ [fCropLeftStepper setMinValue: 0];
+ [fCropRightStepper setIncrement: 2];
+ [fCropRightStepper setMinValue: 0];
+
+ /* Populate the Anamorphic NSPopUp button here */
+ [fAnamorphicPopUp removeAllItems];
+ [fAnamorphicPopUp addItemsWithTitles:@[@"None", @"Strict", @"Loose", @"Custom"]];
+
+ /* populate the modulus popup here */
+ [fModulusPopUp removeAllItems];
+ [fModulusPopUp addItemsWithTitles:@[@"16", @"8", @"4", @"2"]];
+
+ [self resizeInspectorForTab:nil];
 [self adjustSizingDisplay:nil];
 }
 
+- (void) setHandle: (hb_handle_t *) handle
+{
+ [fPreviewController setHandle: handle];
+ [fPreviewController setDelegate:(HBController *)self.delegate];
+}
+
+- (void) setTitle: (hb_title_t *) title
+{
+ fTitle = title;
 
+ if (!title) {
+ [fPreviewController setTitle:NULL];
+ return;
+ }
 
-/* this method is used to detect clicking on a tab in fSizeFilterView */
-- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem
+ hb_job_t * job = title->job;
+
+ fTitle = title;
+
+ [fAnamorphicPopUp selectItemAtIndex: job->anamorphic.mode];
+ if (job->anamorphic.mode == HB_ANAMORPHIC_STRICT)
+ {
+ [fWidthStepper setEnabled: NO];
+ [fHeightStepper setEnabled: NO];
+ [fWidthField setEditable:NO];
+ [fHeightField setEditable:NO];
+ }
+ else
+ {
+ [fWidthStepper setEnabled: YES];
+ [fHeightStepper setEnabled: YES];
+ [fWidthField setEditable:YES];
+ [fHeightField setEditable:YES];
+ }
+ if (job->anamorphic.mode == HB_ANAMORPHIC_STRICT ||
+ job->anamorphic.mode == HB_ANAMORPHIC_LOOSE)
+ {
+ job->anamorphic.keep_display_aspect = 1;
+ [fRatioCheck setState: NSOnState];
+ [fRatioCheck setEnabled: NO];
+ }
+ else
+ {
+ [fRatioCheck setEnabled: YES];
+ [fRatioCheck setState: job->anamorphic.keep_display_aspect ?
+ NSOnState : NSOffState];
+ }
+ [fParWidthField setEnabled: !job->anamorphic.keep_display_aspect];
+ [fParHeightField setEnabled: !job->anamorphic.keep_display_aspect];
+ [fDisplayWidthField setEnabled: !job->anamorphic.keep_display_aspect];
+
+ if (job->modulus)
+ {
+ [fModulusPopUp selectItemWithTitle: [NSString stringWithFormat:@"%d",job->modulus]];
+ [fWidthStepper setIncrement: job->modulus];
+ [fHeightStepper setIncrement: job->modulus];
+ }
+ else
+ {
+ [fModulusPopUp selectItemAtIndex: 0];
+ [fWidthStepper setIncrement: 16];
+ [fHeightStepper setIncrement: 16];
+ }
+
+ if (self.autoCrop)
+ {
+ [fCropMatrix selectCellAtRow: 0 column:0];
+
+ /* If auto, lets set the crop steppers according to
+ * current fTitle->crop values */
+ memcpy( job->crop, fTitle->crop, 4 * sizeof( int ) );
+ [fCropTopStepper setIntValue: fTitle->crop[0]];
+ [fCropTopField setIntValue: fTitle->crop[0]];
+ [fCropBottomStepper setIntValue: fTitle->crop[1]];
+ [fCropBottomField setIntValue: fTitle->crop[1]];
+ [fCropLeftStepper setIntValue: fTitle->crop[2]];
+ [fCropLeftField setIntValue: fTitle->crop[2]];
+ [fCropRightStepper setIntValue: fTitle->crop[3]];
+ [fCropRightField setIntValue: fTitle->crop[3]];
+ }
+ else
+ {
+ [fCropMatrix selectCellAtRow: 1 column:0];
+ [fCropTopStepper setIntValue: job->crop[0]];
+ [fCropTopField setIntValue: job->crop[0]];
+ [fCropBottomStepper setIntValue: job->crop[1]];
+ [fCropBottomField setIntValue: job->crop[1]];
+ [fCropLeftStepper setIntValue: job->crop[2]];
+ [fCropLeftField setIntValue: job->crop[2]];
+ [fCropRightStepper setIntValue: job->crop[3]];
+ [fCropRightField setIntValue: job->crop[3]];
+ }
+
+ [fCropTopStepper setEnabled: !self.autoCrop];
+ [fCropBottomStepper setEnabled: !self.autoCrop];
+ [fCropLeftStepper setEnabled: !self.autoCrop];
+ [fCropRightStepper setEnabled: !self.autoCrop];
+
+ [fCropTopField setEditable: !self.autoCrop];
+ [fCropBottomField setEditable: !self.autoCrop];
+ [fCropLeftField setEditable: !self.autoCrop];
+ [fCropRightField setEditable: !self.autoCrop];
+
+ [fWidthStepper setMaxValue: title->width - job->crop[2] - job->crop[3]];
+ [fWidthStepper setIntValue: job->width];
+ [fWidthField setIntValue: job->width];
+ [fHeightStepper setMaxValue: title->height - job->crop[0] - job->crop[1]];
+ [fHeightStepper setIntValue: job->height];
+ [fHeightField setIntValue: job->height];
+ [fCropTopStepper setMaxValue: title->height/2-2];
+ [fCropBottomStepper setMaxValue: title->height/2-2];
+ [fCropLeftStepper setMaxValue: title->width/2-2];
+ [fCropRightStepper setMaxValue: title->width/2-2];
+
+ [fParWidthField setIntValue: job->anamorphic.par_width];
+ [fParHeightField setIntValue: job->anamorphic.par_height];
+
+ int display_width;
+ display_width = job->width * job->anamorphic.par_width /
+ job->anamorphic.par_height;
+ [fDisplayWidthField setIntValue: display_width];
+
+ [fPreviewController setTitle:title];
+
+ [self settingsChanged:nil];
+}
+
+#pragma mark - KVO
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
 {
+ if (context == HBPictureControllerContext)
+ {
+ // We use KVO to update the panel
+ // and notify the main controller of the changes
+ // in the filters settings.
+ if ([keyPath isEqualToString:@"filters.useDecomb"])
+ {
+ if (self.filters.useDecomb)
+ {
+ [fDecombBox setHidden:NO];
+ [fDeinterlaceBox setHidden:YES];
+ }
+ else
+ {
+ [fDecombBox setHidden:YES];
+ [fDeinterlaceBox setHidden:NO];
+ }
+ }
+ else if ([keyPath isEqualToString:@"filters.deblock"])
+ {
+ // The minimum deblock value is 5,
+ // set it to 0 if the value is
+ // less than 4.
+ if (self.filters.deblock == 4)
+ {
+ [fDeblockField setStringValue: @"Off"];
+ self.filters.deblock = 0;
+ }
+ else if (self.filters.deblock > 4)
+ {
+ [fDeblockField setStringValue:[NSString stringWithFormat: @"%.0ld", (long)self.filters.deblock]];
+ }
+ }
+ else if ([keyPath isEqualToString:@"filters.deinterlace"] || [keyPath isEqualToString:@"filters.decomb"])
+ {
+ // Might need to update the preview images with
+ // the new deinterlace/decomb setting.
+ if ((self.filters.deinterlace && !self.filters.useDecomb) ||
+ (self.filters.decomb && self.filters.useDecomb))
+ {
+ fPreviewController.deinterlacePreview = YES;
+ }
+ else
+ {
+ fPreviewController.deinterlacePreview = NO;
+ }
+ [fPreviewController reload];
+ }
+ else if ([keyPath isEqualToString:@"filters.denoise"] || [keyPath isEqualToString:@"filters.denoisePreset"])
+ {
+ [self validateDenoiseUI];
+ }
+
+ // If one of the filters properties changes
+ // update the UI in the main window
+ if ([keyPath hasPrefix:@"filters"])
+ {
+ [self.delegate pictureSettingsDidChange];
+ }
+ }
+ else
+ {
+ [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+ }
+}
 
-[self resizeInspectorForTab:nil];
+/**
+ * Validates the denoise UI items,
+ * disables/enables the right ones.
+ */
+- (void)validateDenoiseUI
+{
+ if ([self.filters.denoise isEqualToString:@"off"])
+ {
+ NSArray *uiElements = @[fDenoisePreset, fDenoisePresetPopUp,
+ fDenoiseTuneLabel, fDenoiseTunePopUp,
+ fDenoiseCustomLabel, fDenoiseCustomField];
+ for (NSView *view in uiElements)
+ [view setHidden:YES];
+ }
+ else
+ {
+ NSArray *uiElements = @[fDenoisePreset, fDenoisePresetPopUp];
+ for (NSView *view in uiElements)
+ [view setHidden:NO];
 
+ if ([self.filters.denoisePreset isEqualToString:@"none"])
+ {
+ [fDenoiseTuneLabel setHidden:YES];
+ [fDenoiseTunePopUp setHidden:YES];
+ [fDenoiseCustomLabel setHidden:NO];
+ [fDenoiseCustomField setHidden:NO];
+ }
+ else if ([self.filters.denoise isEqualToString:@"hqdn3d"])
+ {
+ [fDenoiseTuneLabel setHidden:YES];
+ [fDenoiseTunePopUp setHidden:YES];
+ [fDenoiseCustomLabel setHidden:YES];
+ [fDenoiseCustomField setHidden:YES];
+ }
+ else
+ {
+ [fDenoiseTuneLabel setHidden:NO];
+ [fDenoiseTunePopUp setHidden:NO];
+ [fDenoiseCustomLabel setHidden:YES];
+ [fDenoiseCustomField setHidden:YES];
+ }
+ }
 }
 
 #pragma mark -
+#pragma mark Interface Resize
 
-/* resizeInspectorForTab is called at launch, and each time either the 
+/**
+ * resizeInspectorForTab is called at launch, and each time either the
 * Size or Filters tab is clicked. Size gives a horizontally oriented
 * inspector and Filters is a vertically aligned inspector.
 */
-- (IBAction) resizeInspectorForTab: (id)sender
+- (void) resizeInspectorForTab: (id) sender
 {
 NSRect frame = [[self window] frame];
 NSSize screenSize = [[[self window] screen] frame].size;
 NSPoint screenOrigin = [[[self window] screen] frame].origin;
- 
+
 /* We base our inspector size/layout on which tab is active for fSizeFilterView */
 /* we are 1 which is Filters*/
 if ([fSizeFilterView indexOfTabViewItem: [fSizeFilterView selectedTabViewItem]] == 1)
 {
- frame.size.width = 314;
+ frame.size.width = 484;
 /* we glean the height from the size of the boxes plus the extra window space
 * needed for non boxed display
 */
- frame.size.height = 110.0 + [fDetelecineBox frame].size.height + [fDecombDeinterlaceBox frame].size.height + [fDenoiseBox frame].size.height + [fDeblockBox frame].size.height;
+ frame.size.height = 100.0 + [fDetelecineBox frame].size.height + [fDecombDeinterlaceBox frame].size.height;
 /* Hide the size readout at the bottom as the vertical inspector is not wide enough */
- [fSizeInfoField setHidden:YES];
 }
 else // we are Tab index 0 which is size
 {
- frame.size.width = 50.0 + [fPictureSizeBox frame].size.width + [fPictureCropBox frame].size.width;
- frame.size.height = [fPictureSizeBox frame].size.height + 85;
+ frame.size.width = 30.0 + [fPictureSizeBox frame].size.width + [fPictureCropBox frame].size.width;
+ frame.size.height = [fPictureSizeBox frame].size.height + 90;
 /* hide the size summary field at the bottom */
- [fSizeInfoField setHidden:NO]; 
 }
 /* get delta's for the change in window size */
 CGFloat deltaX = frame.size.width - [[self window] frame].size.width;
 CGFloat deltaY = frame.size.height - [[self window] frame].size.height;
- 
- /* Check to see if we have changed the height from current */
- //if (frame.size.height != [[self window] frame].size.height)
- //{
- /* change the inspector origin via the deltaY */
- frame.origin.y -= deltaY;
- /* keep the inspector centered so the tabs stay in place */
- frame.origin.x -= deltaX / 2.0;
- //}
- 
- /* we make sure we are not horizontally off of our screen.
+
+ /* change the inspector origin via the deltaY */
+ frame.origin.y -= deltaY;
+ /* keep the inspector centered so the tabs stay in place */
+ frame.origin.x -= deltaX / 2.0;
+
+ /* we make sure we are not horizontally off of our screen.
 * this would be the case if we are on the vertical filter tab
 * and we hit the size tab and the inspector grows horizontally
 * off the screen to the right
- */
+ */
 if ((frame.origin.x + frame.size.width) > (screenOrigin.x + screenSize.width))
 {
 /* the right side of the preview is off the screen, so shift to the left */
 frame.origin.x = (screenOrigin.x + screenSize.width) - frame.size.width;
 }
- 
+
 [[self window] setFrame:frame display:YES animate:YES];
 }
 
-- (IBAction) adjustSizingDisplay: (id) sender
+- (void) adjustSizingDisplay: (id) sender
 {
 NSSize pictureSizingBoxSize = [fPictureSizeBox frame].size;
- 
+
 NSPoint fPictureSizeBoxOrigin = [fPictureSizeBox frame].origin;
 NSSize pictureCropBoxSize = [fPictureCropBox frame].size;
 NSPoint fPictureCropBoxOrigin = [fPictureCropBox frame].origin;
- 
- if ([fAnamorphicPopUp indexOfSelectedItem] == 3) // custom / power user jamboree
- {
- pictureSizingBoxSize.width = 530;
- 
+
+ if ([fAnamorphicPopUp indexOfSelectedItem] == HB_ANAMORPHIC_CUSTOM)
+ { // custom / power user jamboree
+ pictureSizingBoxSize.width = 350;
+
 /* Set visibility of capuj widgets */
 [fParWidthField setHidden: NO];
 [fParHeightField setHidden: NO];
@@ -140,39 +500,11 @@
 [fParHeightLabel setHidden: NO];
 [fDisplayWidthField setHidden: NO];
 [fDisplayWidthLabel setHidden: NO];
- /* adjust/move keep ar checkbox */
- [fRatioLabel setHidden: YES];
- [fRatioLabel2 setHidden: NO];
- 
- /* Optionally swith the Storage and Display width positions*/
- /*
- NSPoint fWidthLabelOrigin = [fWidthLabel frame].origin;
- NSPoint fWidthFieldOrigin = [fWidthField frame].origin;
- NSPoint fWidthStepperOrigin = [fWidthStepper frame].origin;
- fWidthFieldOrigin.x = [fRatioLabel2 frame].origin.x + [fRatioLabel2 frame].size.width + 4;
- [fWidthField setFrameOrigin:fWidthFieldOrigin];
-
- fWidthStepperOrigin.x = [fWidthField frame].origin.x + [fWidthField frame].size.width + 4;
- [fWidthStepper setFrameOrigin:fWidthStepperOrigin];
- 
- fWidthLabelOrigin.x = [fWidthField frame].origin.x - [fWidthLabel frame].size.width - 4;
- [fWidthLabel setFrameOrigin:fWidthLabelOrigin];
- [fWidthLabel setStringValue:@"Storage Width:"];
- */
- 
- /* set the origin for fRatioCheck so origin.y == fRatioLabel2
- * and origin.x == fDisplayWidthField
- */
- NSPoint fRatioCheckOrigin = [fRatioCheck frame].origin;
- fRatioCheckOrigin.y = [fRatioLabel2 frame].origin.y - 2;
- fRatioCheckOrigin.x = [fRatioLabel2 frame].origin.x + [fRatioLabel2 frame].size.width + 4;
- [fRatioCheck setFrameOrigin:fRatioCheckOrigin];
- 
 }
 else
 {
 pictureSizingBoxSize.width = 200;
- 
+
 /* Set visibility of capuj widgets */
 [fParWidthField setHidden: YES];
 [fParHeightField setHidden: YES];
@@ -180,867 +512,342 @@
 [fParHeightLabel setHidden: YES];
 [fDisplayWidthField setHidden: YES];
 [fDisplayWidthLabel setHidden: YES];
- /* adjust/move keep ar checkbox */
- [fRatioLabel setHidden: NO];
- [fRatioLabel2 setHidden: YES];
- 
- /* Optionally swith the Storage and Display width positions*/
- 
- /*
- NSPoint fWidthLabelOrigin = [fWidthLabel frame].origin;
- NSPoint fWidthFieldOrigin = [fWidthField frame].origin;
- NSPoint fWidthStepperOrigin = [fWidthStepper frame].origin;
- 
- fWidthFieldOrigin.x = [fHeightField frame].origin.x;
- [fWidthField setFrameOrigin:fWidthFieldOrigin];
- 
- fWidthStepperOrigin.x = [fHeightStepper frame].origin.x;
- [fWidthStepper setFrameOrigin:fWidthStepperOrigin];
- 
- fWidthLabelOrigin.x = [fWidthField frame].origin.x - [fWidthLabel frame].size.width -4;
- [fWidthLabel setFrameOrigin:fWidthLabelOrigin];
- [fWidthLabel setStringValue:@"Width:"];
- */
- 
- 
- /* set the origin for fRatioCheck so origin.y == fRatioLabel
- * and origin.x == fWidthStepper
- */
- NSPoint fRatioCheckOrigin = [fRatioCheck frame].origin;
- fRatioCheckOrigin.y = [fRatioLabel frame].origin.y - 2;
- fRatioCheckOrigin.x = [fWidthStepper frame].origin.x - 2;
- [fRatioCheck setFrameOrigin:fRatioCheckOrigin];
- 
 }
- 
+
 /* Check to see if we have changed the size from current */
- if (pictureSizingBoxSize.height != [fPictureSizeBox frame].size.height || pictureSizingBoxSize.width != [fPictureSizeBox frame].size.width)
+ if (pictureSizingBoxSize.height != [fPictureSizeBox frame].size.height ||
+ pictureSizingBoxSize.width != [fPictureSizeBox frame].size.width)
 {
 /* Get our delta for the change in picture size box height */
- CGFloat deltaYSizeBoxShift = pictureSizingBoxSize.height - [fPictureSizeBox frame].size.height;
+ CGFloat deltaYSizeBoxShift = pictureSizingBoxSize.height -
+ [fPictureSizeBox frame].size.height;
 fPictureSizeBoxOrigin.y -= deltaYSizeBoxShift;
 /* Get our delta for the change in picture size box width */
- CGFloat deltaXSizeBoxShift = pictureSizingBoxSize.width - [fPictureSizeBox frame].size.width;
+ CGFloat deltaXSizeBoxShift = pictureSizingBoxSize.width -
+ [fPictureSizeBox frame].size.width;
 //fPictureSizeBoxOrigin.x += deltaXSizeBoxShift;
 /* set our new Picture size box size */
 [fPictureSizeBox setFrameSize:pictureSizingBoxSize];
 [fPictureSizeBox setFrameOrigin:fPictureSizeBoxOrigin];
- 
+
 pictureCropBoxSize.height += deltaYSizeBoxShift;
 fPictureCropBoxOrigin.y -= deltaYSizeBoxShift;
 fPictureCropBoxOrigin.x += deltaXSizeBoxShift;
- 
+
 [fPictureCropBox setFrameSize:pictureCropBoxSize];
 [[fPictureCropBox animator] setFrameOrigin:fPictureCropBoxOrigin];
 }
 
- 
 /* now we call to resize the entire inspector window */
- [self resizeInspectorForTab:nil];
+ [self resizeInspectorForTab:nil];
 }
 
-- (IBAction) adjustFilterDisplay: (id) sender
+- (NSString *) pictureSizeInfoString
 {
- 
- NSBox * filterBox = nil;
- NSTextField * filterField;
- if (sender == fDetelecinePopUp)
- {
- filterBox = fDetelecineBox;
- filterField = fDetelecineField;
- }
- 
- if (sender == fDecombDeinterlaceSlider)
- {
- if ([fDecombDeinterlaceSlider floatValue] == 0.0)
- {
- filterBox = fDecombBox;
- filterField = fDecombField;
- }
- else
- {
- filterBox = fDeinterlaceBox;
- filterField = fDeinterlaceField;
- }
- }
- 
- if (sender == fDecombPopUp)
- {
- filterBox = fDecombBox;
- filterField = fDecombField;
- }
- if (sender == fDeinterlacePopUp)
- {
- filterBox = fDeinterlaceBox;
- filterField = fDeinterlaceField;
- }
- 
- if (sender == fDenoisePopUp)
- {
- filterBox = fDenoiseBox;
- filterField = fDenoiseField;
- }
- 
- NSSize currentSize = [filterBox frame].size;
- NSRect boxFrame = [filterBox frame];
- 
- if ([sender titleOfSelectedItem] == @"Custom")
+ return [fSizeInfoField stringValue];
+}
+
+#pragma mark -
+
+/**
+ * Displays and brings the picture window to the front
+ */
+- (IBAction) showPictureWindow: (id) sender
+{
+ if ([[self window] isVisible])
 {
- 
- currentSize.height = 60;
- 
+ [[self window] close];
 }
 else
 {
- currentSize.height = 30;
- 
+ [self showWindow:sender];
+ [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PictureSizeWindowIsOpen"];
+ /* Set the window back to Floating Window mode
+ * This will put the window always on top, but
+ * since we have Hide on Deactivate set in our
+ * xib, if other apps are put in focus we will
+ * hide properly to stay out of the way
+ */
+ [[self window] setLevel:NSFloatingWindowLevel];
 }
- /* Check to see if we have changed the size from current */
- if (currentSize.height != [filterBox frame].size.height)
- {
- /* We are changing the size of the box, so recalc the origin */
- NSPoint boxOrigin = [filterBox frame].origin;
- /* We get the deltaY here for how much we are expanding/contracting the box vertically */
- CGFloat deltaYBoxShift = currentSize.height - [filterBox frame].size.height;
- boxOrigin.y -= deltaYBoxShift;
- 
- boxFrame.size.height = currentSize.height;
- boxFrame.origin.y = boxOrigin.y;
- [filterBox setFrame:boxFrame];
- 
- /* go ahead and resize the box */
- //[[filterBox animator] setFrameSize:currentSize];
- //[[filterBox animator] setFrameOrigin:origin];
- 
- 
- if (filterBox == fDecombBox || filterBox == fDeinterlaceBox)
- {
- /* fDecombDeinterlaceBox*/
- NSSize decombDeinterlaceBoxSize = [fDecombDeinterlaceBox frame].size;
- NSPoint decombDeinterlaceBoxOrigin = [fDecombDeinterlaceBox frame].origin;
- 
- //decombDeinterlaceBoxSize.height = [filterBox frame].size.height + 50;
- if (sender == fDecombDeinterlaceSlider)
- {
- [fHBController writeToActivityLog: "Sender is deinterlace decomb slider"];
- }
- 
- if ([fDeinterlaceBox isHidden] == YES)
- {
- decombDeinterlaceBoxSize.height = [fDecombBox frame].size.height + 50;
- [fHBController writeToActivityLog: "Resize by Decomb box"];
- }
- else
- {
- decombDeinterlaceBoxSize.height = [fDeinterlaceBox frame].size.height + 50;
- [fHBController writeToActivityLog: "Resize by Deinterlace box"];
- }
- /* get delta's for the change in window size */
- 
- CGFloat deltaYdecombDeinterlace = decombDeinterlaceBoxSize.height - [fDecombDeinterlaceBox frame].size.height;
- 
- deltaYBoxShift = deltaYdecombDeinterlace;
- 
- decombDeinterlaceBoxOrigin.y -= deltaYdecombDeinterlace;
- 
- [fDecombDeinterlaceBox setFrameSize:decombDeinterlaceBoxSize];
- [fDecombDeinterlaceBox setFrameOrigin:decombDeinterlaceBoxOrigin];
- }
 
- /* now we must reset the origin of each box below the adjusted box*/
- NSPoint decombDeintOrigin = [fDecombDeinterlaceBox frame].origin;
- NSPoint denoiseOrigin = [fDenoiseBox frame].origin;
- NSPoint deblockOrigin = [fDeblockBox frame].origin;
- if (sender == fDetelecinePopUp)
- {
- decombDeintOrigin.y -= deltaYBoxShift;
- [fDecombDeinterlaceBox setFrameOrigin:decombDeintOrigin];
- 
- denoiseOrigin.y -= deltaYBoxShift;
- [fDenoiseBox setFrameOrigin:denoiseOrigin];
- 
- deblockOrigin.y -= deltaYBoxShift;
- [fDeblockBox setFrameOrigin:deblockOrigin];
- }
- if (sender == fDecombPopUp || sender == fDeinterlacePopUp)
- {
- denoiseOrigin.y -= deltaYBoxShift;
- [fDenoiseBox setFrameOrigin:denoiseOrigin];
- 
- deblockOrigin.y -= deltaYBoxShift;
- [fDeblockBox setFrameOrigin:deblockOrigin];
- }
- 
- if (sender == fDenoisePopUp)
- {
- deblockOrigin.y -= deltaYBoxShift;
- [fDeblockBox setFrameOrigin:deblockOrigin];
- }
- 
- /* now we call to resize the entire inspector window */
- [self resizeInspectorForTab:nil];
- }
- 
+ [self resizeInspectorForTab:nil];
+ [self adjustSizingDisplay:nil];
 }
 
-
-#pragma mark -
-
-
-
-- (IBAction) showPreviewWindow: (id)sender
+- (IBAction) showPreviewWindow: (id) sender
 {
 [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PreviewWindowIsOpen"];
 [fPreviewController showWindow:sender];
 }
 
-- (void) enablePreviewHudControls
+- (void) windowWillClose: (NSNotification *)aNotification
 {
- [fPreviewController enableHudControls];
+ [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"PictureSizeWindowIsOpen"];
 }
 
-- (void) disablePreviewHudControls
+/**
+ * This method is used to detect clicking on a tab in fSizeFilterView
+ */
+- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem
 {
- [fPreviewController disableHudControls];
+ [self resizeInspectorForTab:nil];
 }
 
-- (void) setToWindowedMode
-{
- /* Set the window back to Floating Window mode 
- * This will put the window always on top, but
- * since we have Hide on Deactivate set in our
- * xib, if other apps are put in focus we will
- * hide properly to stay out of the way
- */
- [[self window] setLevel:NSFloatingWindowLevel];
-}
+#pragma mark - Picture Update Logic
 
-- (void)setHBController: (HBController *)controller
+- (IBAction) settingsChanged: (id) sender
 {
- fHBController = controller;
- [fPreviewController setHBController: controller];
- 
-}
-
-- (void)awakeFromNib
-{
- [fPictureWindow setDelegate:self];
- if( ![[self window] setFrameUsingName:@"PictureSizing"] )
- [[self window] center];
- [self setWindowFrameAutosaveName:@"PictureSizing"];
- [[self window] setExcludedFromWindowsMenu:YES];
- 
- [self setInitialPictureFilters];
- 
- /* Setup our layers for core animation */
- [fSizeFilterView setWantsLayer:YES];
- [fPictureSizeBox setWantsLayer:YES];
- [fPictureCropBox setWantsLayer:YES];
- 
-}
-
-
-- (void)windowWillClose:(NSNotification *)aNotification
-{
-[[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"PictureSizeWindowIsOpen"];
-}
-
-- (BOOL)windowShouldClose:(id)fPictureWindow
-{
- return YES;
-}
-
-- (void) dealloc
-{
- [fPreviewController release];
- [super dealloc];
-}
-
-- (void) SetHandle: (hb_handle_t *) handle
-{
- fHandle = handle;
- 
- [fPreviewController SetHandle: fHandle];
-}
-
-- (void) SetTitle: (hb_title_t *) title
-{
- hb_job_t * job = title->job;
-
- fTitle = title;
+ if (!fTitle)
+ return;
 
- [fWidthStepper setValueWraps: NO];
- [fWidthStepper setIncrement: 16];
- [fWidthStepper setMinValue: 64];
- [fHeightStepper setValueWraps: NO];
- [fHeightStepper setIncrement: 16];
- [fHeightStepper setMinValue: 64];
- 
- [fCropTopStepper setIncrement: 2];
- [fCropTopStepper setMinValue: 0];
- [fCropBottomStepper setIncrement: 2];
- [fCropBottomStepper setMinValue: 0];
- [fCropLeftStepper setIncrement: 2];
- [fCropLeftStepper setMinValue: 0];
- [fCropRightStepper setIncrement: 2];
- [fCropRightStepper setMinValue: 0];
- 
- [fWidthStepper setMaxValue: title->width];
- [fWidthStepper setIntValue: job->width];
- [fWidthField setIntValue: job->width];
- [fHeightStepper setMaxValue: title->height];
- [fHeightStepper setIntValue: job->height];
- [fHeightField setIntValue: job->height];
- [fRatioCheck setState: job->keep_ratio ? NSOnState : NSOffState];
- [fCropTopStepper setMaxValue: title->height/2-2];
- [fCropBottomStepper setMaxValue: title->height/2-2];
- [fCropLeftStepper setMaxValue: title->width/2-2];
- [fCropRightStepper setMaxValue: title->width/2-2];
+ hb_job_t * job = fTitle->job;
+ int keep = 0, dar_updated = 0;
 
- /* Populate the Anamorphic NSPopUp button here */
- [fAnamorphicPopUp removeAllItems];
- [fAnamorphicPopUp addItemWithTitle: @"None"];
- [fAnamorphicPopUp addItemWithTitle: @"Strict"];
- [fAnamorphicPopUp addItemWithTitle: @"Loose"];
- [fAnamorphicPopUp addItemWithTitle: @"Custom"];
- [fAnamorphicPopUp selectItemAtIndex: job->anamorphic.mode];
- 
- //[self adjustSizingDisplay:nil];
- 
- /* populate the modulus popup here */
- [fModulusPopUp removeAllItems];
- [fModulusPopUp addItemWithTitle: @"16"];
- [fModulusPopUp addItemWithTitle: @"8"];
- [fModulusPopUp addItemWithTitle: @"4"];
- [fModulusPopUp addItemWithTitle: @"2"];
- if (job->modulus)
+ if (sender == fAnamorphicPopUp)
 {
- [fModulusPopUp selectItemWithTitle: [NSString stringWithFormat:@"%d",job->modulus]];
+ job->anamorphic.mode = (int)[fAnamorphicPopUp indexOfSelectedItem];
+ if (job->anamorphic.mode == HB_ANAMORPHIC_STRICT)
+ {
+ [fModulusLabel setHidden: YES];
+ [fModulusPopUp setHidden: YES];
+ [fWidthStepper setEnabled: NO];
+ [fHeightStepper setEnabled: NO];
+ [fWidthField setEditable:NO];
+ [fHeightField setEditable:NO];
+ }
+ else
+ {
+ [fModulusLabel setHidden: NO];
+ [fModulusPopUp setHidden: NO];
+ [fWidthStepper setEnabled: YES];
+ [fHeightStepper setEnabled: YES];
+ [fWidthField setEditable:YES];
+ [fHeightField setEditable:YES];
+ }
+ if (job->anamorphic.mode == HB_ANAMORPHIC_STRICT ||
+ job->anamorphic.mode == HB_ANAMORPHIC_LOOSE)
+ {
+ job->anamorphic.keep_display_aspect = 1;
+ [fRatioCheck setState: NSOnState];
+ [fRatioCheck setEnabled: NO];
+ }
+ else
+ {
+ [fRatioCheck setEnabled: YES];
+ [fRatioCheck setState: job->anamorphic.keep_display_aspect ?
+ NSOnState : NSOffState];
+ }
 }
- else
+ else if (sender == fModulusPopUp)
 {
- [fModulusPopUp selectItemAtIndex: 0];
+ job->modulus = [[fModulusPopUp titleOfSelectedItem] intValue];
+ [fWidthStepper setIncrement: job->modulus];
+ [fHeightStepper setIncrement: job->modulus];
 }
- 
- 
- /* We initially set the previous state of keep ar to on */
- keepAspectRatioPreviousState = 1;
-	if (!autoCrop)
-	{
- [fCropMatrix selectCellAtRow: 1 column:0];
- /* If auto, lets set the crop steppers according to current job->crop values */
- [fCropTopStepper setIntValue: job->crop[0]];
- [fCropTopField setIntValue: job->crop[0]];
- [fCropBottomStepper setIntValue: job->crop[1]];
- [fCropBottomField setIntValue: job->crop[1]];
- [fCropLeftStepper setIntValue: job->crop[2]];
- [fCropLeftField setIntValue: job->crop[2]];
- [fCropRightStepper setIntValue: job->crop[3]];
- [fCropRightField setIntValue: job->crop[3]];
-	}
-	else
-	{
- [fCropMatrix selectCellAtRow: 0 column:0];
-	}
-	
- /* Set filters widgets according to the filters struct */
- [fDetelecinePopUp selectItemAtIndex:fPictureFilterSettings.detelecine];
- [fDecombPopUp selectItemAtIndex:fPictureFilterSettings.decomb];
- [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
- [fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
- [fDeblockSlider setFloatValue:fPictureFilterSettings.deblock];
- [fGrayscaleCheck setState:fPictureFilterSettings.grayscale];
- 
- [self deblockSliderChanged: nil];
- 
- fPicture = 0;
- MaxOutputWidth = title->width - job->crop[2] - job->crop[3];
- MaxOutputHeight = title->height - job->crop[0] - job->crop[1];
- 
- titleDarWidth = job->anamorphic.dar_width;
- titleDarHeight = job->anamorphic.dar_height;
- 
- titleParWidth = job->anamorphic.par_width;
- titleParHeight = job->anamorphic.par_height;
- 
- [self SettingsChanged:nil];
-}
-
-- (IBAction) storageLinkChanged: (id) sender
-{
- /* since we have a tickless slider, make sure we are at 0.0 or 1.0 */
- if ([fStorageLinkSlider floatValue] < 0.50)
- {
- [fStorageLinkSlider setFloatValue:0.0];
- /* set slider labels to reflect choice */
- [fStorageLinkParLabel setEnabled:YES];
- [fStorageLinkDisplayLabel setEnabled:NO];
 
- }
- else
+ if (sender == fRatioCheck)
 {
- [fStorageLinkSlider setFloatValue:1.0];
- /* set slider labels to reflect choice */
- [fStorageLinkParLabel setEnabled:NO];
- [fStorageLinkDisplayLabel setEnabled:YES];
+ job->anamorphic.keep_display_aspect = [fRatioCheck state] == NSOnState;
+ [fParWidthField setEnabled: !job->anamorphic.keep_display_aspect];
+ [fParHeightField setEnabled: !job->anamorphic.keep_display_aspect];
+ [fDisplayWidthField setEnabled: !job->anamorphic.keep_display_aspect];
 }
- 
-}
 
-- (IBAction) parLinkChanged: (id) sender
-{
- /* since we have a tickless slider, make sure we are at 0.0 or 1.0 */
- if ([fParLinkSlider floatValue] < 0.50)
+ if (sender == fHeightStepper || sender == fHeightField)
 {
- [fParLinkSlider setFloatValue:0.0];
- /* set slider labels to reflect choice */
- [fParLinkStorageLabel setEnabled:YES];
- [fParLinkDisplayLabel setEnabled:NO];
+ keep |= HB_KEEP_HEIGHT;
+
+ if (sender == fHeightStepper)
+ job->height = [fHeightStepper intValue];
+ else
+ job->height = [fHeightField intValue];
 }
- else
+
+ if (sender == fWidthStepper || sender == fWidthField)
 {
- [fParLinkSlider setFloatValue:1.0];
- /* set slider labels to reflect choice */
- [fParLinkStorageLabel setEnabled:NO];
- [fParLinkDisplayLabel setEnabled:YES];
+ keep |= HB_KEEP_WIDTH;
+
+ if (sender == fWidthStepper)
+ job->width = [fWidthStepper intValue];
+ else
+ job->width = [fWidthField intValue];
 }
- 
-}
 
-- (IBAction) displayLinkChanged: (id) sender
-{
- /* since we have a tickless slider, make sure we are at 0.0 or 1.0 */
- if ([fDisplayLinkSlider floatValue] < 0.50)
+ if (sender == fParWidthField || sender == fParHeightField)
 {
- [fDisplayLinkSlider setFloatValue:0.0];
- /* set slider labels to reflect choice */
- [fDisplayLinkStorageLabel setEnabled:YES];
- [fDisplayLinkParLabel setEnabled:NO];
+ job->anamorphic.par_width = [fParWidthField intValue];
+ job->anamorphic.par_height = [fParHeightField intValue];
 }
- else
+
+ if (sender == fDisplayWidthField)
 {
- [fDisplayLinkSlider setFloatValue:1.0];
- /* set slider labels to reflect choice */
- [fDisplayLinkStorageLabel setEnabled:NO];
- [fDisplayLinkParLabel setEnabled:YES];
+ dar_updated = 1;
+ job->anamorphic.dar_width = [fDisplayWidthField intValue];
+ job->anamorphic.dar_height = [fHeightStepper intValue];
 }
- 
-} 
-
-- (IBAction) SettingsChanged: (id) sender
-{
- hb_job_t * job = fTitle->job;
 
- /* if we are anything but strict anamorphic */
- if ([fAnamorphicPopUp indexOfSelectedItem] != 1)
+ if (sender == fCropMatrix)
 {
- [fModulusLabel setHidden:NO];
- [fModulusPopUp setHidden:NO];
- if (sender == fModulusPopUp)
+ if (self.autoCrop != ( [fCropMatrix selectedRow] == 0 ))
 {
- /* do a dry run with hb_fix aspect to get new modulus */
- job->modulus = [[fModulusPopUp titleOfSelectedItem] intValue];
- job->keep_ratio = 1;
- hb_fix_aspect( job, HB_KEEP_WIDTH );
- if( job->height > fTitle->height )
+ self.autoCrop = !self.autoCrop;
+ if (self.autoCrop)
 {
- job->height = fTitle->height;
- hb_fix_aspect( job, HB_KEEP_HEIGHT );
+ /* If auto, lets set the crop steppers according to
+ * current fTitle->crop values */
+ memcpy( job->crop, fTitle->crop, 4 * sizeof( int ) );
+ [fCropTopStepper setIntValue: fTitle->crop[0]];
+ [fCropTopField setIntValue: fTitle->crop[0]];
+ [fCropBottomStepper setIntValue: fTitle->crop[1]];
+ [fCropBottomField setIntValue: fTitle->crop[1]];
+ [fCropLeftStepper setIntValue: fTitle->crop[2]];
+ [fCropLeftField setIntValue: fTitle->crop[2]];
+ [fCropRightStepper setIntValue: fTitle->crop[3]];
+ [fCropRightField setIntValue: fTitle->crop[3]];
 }
- [fWidthStepper setIntValue: job->width];
- [fWidthField setIntValue: job->width];
- if( [fAnamorphicPopUp indexOfSelectedItem] != 2) // if we are not loose or custom
- {
- [fHeightStepper setIntValue: job->height];
- [fHeightField setIntValue: job->height];
- } 
+ [fCropTopStepper setEnabled: !self.autoCrop];
+ [fCropBottomStepper setEnabled: !self.autoCrop];
+ [fCropLeftStepper setEnabled: !self.autoCrop];
+ [fCropRightStepper setEnabled: !self.autoCrop];
+
+ [fCropTopField setEditable: !self.autoCrop];
+ [fCropBottomField setEditable: !self.autoCrop];
+ [fCropLeftField setEditable: !self.autoCrop];
+ [fCropRightField setEditable: !self.autoCrop];
 }
 }
- else
+ if (sender == fCropTopStepper)
 {
- /* we are strict so hide the mod popup since libhb uses mod 2 for strict anamorphic*/
- [fModulusLabel setHidden:YES];
- [fModulusPopUp setHidden:YES];
+ job->crop[0] = [fCropTopStepper intValue];
+ [fCropTopField setIntValue: job->crop[0]];
+ [fHeightStepper setMaxValue: fTitle->height - job->crop[0] - job->crop[1]];
 }
-
- job->modulus = [[fModulusPopUp titleOfSelectedItem] intValue];
- 
- [fWidthStepper setIncrement: job->modulus];
- [fHeightStepper setIncrement: job->modulus];
-
- /* Since custom anamorphic allows for a height setting > fTitle->height
- * check to make sure it is returned to fTitle->height for all other modes
- */
- [fHeightStepper setMaxValue: fTitle->height];
- 
- autoCrop = ( [fCropMatrix selectedRow] == 0 );
- [fCropTopStepper setEnabled: !autoCrop];
- [fCropBottomStepper setEnabled: !autoCrop];
- [fCropLeftStepper setEnabled: !autoCrop];
- [fCropRightStepper setEnabled: !autoCrop];
- 
- if( autoCrop )
+ if (sender == fCropBottomStepper)
 {
- memcpy( job->crop, fTitle->crop, 4 * sizeof( int ) );
+ job->crop[1] = [fCropBottomStepper intValue];
+ [fCropBottomField setIntValue: job->crop[1]];
+ [fHeightStepper setMaxValue: fTitle->height - job->crop[0] - job->crop[1]];
 }
- else
+ if (sender == fCropLeftStepper)
 {
- job->crop[0] = [fCropTopStepper intValue];
- job->crop[1] = [fCropBottomStepper intValue];
 job->crop[2] = [fCropLeftStepper intValue];
- job->crop[3] = [fCropRightStepper intValue];
+ [fCropLeftField setIntValue: job->crop[2]];
+ [fWidthStepper setMaxValue: fTitle->width - job->crop[2] - job->crop[3]];
 }
- 
- [fRatioCheck setEnabled: YES];
-
- 
- [fParWidthField setEnabled: NO];
- [fParHeightField setEnabled: NO];
- [fDisplayWidthField setEnabled: NO];
- 
- /* If we are not custom anamorphic, make sure we retain the orginal par */
- if( [fAnamorphicPopUp indexOfSelectedItem] != 3 )
+ if (sender == fCropRightStepper)
 {
- job->anamorphic.par_width = titleParWidth;
- job->anamorphic.par_height = titleParHeight;
- [fRatioLabel setHidden: NO];
+ job->crop[3] = [fCropRightStepper intValue];
+ [fCropRightField setIntValue: job->crop[3]];
+ [fWidthStepper setMaxValue: fTitle->width - job->crop[2] - job->crop[3]];
 }
- 
-	if( [fAnamorphicPopUp indexOfSelectedItem] > 0 )
-	{
- if ([fAnamorphicPopUp indexOfSelectedItem] == 1) // strict
- {
- [fWidthStepper setIntValue: fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3]];
- [fWidthField setIntValue: fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3]];
- 
- /* This will show correct anamorphic height values, but
- show distorted preview picture ratio */
- [fHeightStepper setIntValue: fTitle->height-fTitle->job->crop[0]-fTitle->job->crop[1]];
- [fHeightField setIntValue: fTitle->height-fTitle->job->crop[0]-fTitle->job->crop[1]];
- job->width = [fWidthStepper intValue];
- job->height = [fHeightStepper intValue];
- 
- job->anamorphic.mode = 1;
- [fWidthStepper setEnabled: NO];
- [fWidthField setEnabled: NO];
- [fHeightStepper setEnabled: NO];
- [fHeightField setEnabled: NO];
- [fRatioCheck setEnabled: NO];
- }
- else if ([fAnamorphicPopUp indexOfSelectedItem] == 2) // Loose anamorphic
+
+ if (sender == fCropTopField)
+ {
+ int cropValue = [fCropTopField intValue];
+ if (cropValue >= 0 && (cropValue <= fTitle->height/2-2))
 {
- job->anamorphic.mode = 2;
- [fWidthStepper setEnabled: YES];
- [fWidthField setEnabled: YES];
- [fRatioCheck setEnabled: NO];
- [fHeightStepper setEnabled: NO];
- [fHeightField setEnabled: NO];
- /* We set job->width and call hb_set_anamorphic_size in libhb to do a "dry run" to get
- * the values to be used by libhb for loose anamorphic
- */
- /* if the sender is the anamorphic popup, then we know that loose anamorphic has just
- * been turned on, so snap the width to full width for the source.
- */
- if (sender == fAnamorphicPopUp)
- {
- [fWidthStepper setIntValue: fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3]];
- [fWidthField setIntValue: fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3]];
- }
- job->width = [fWidthStepper intValue];
- hb_set_anamorphic_size(job, &output_width, &output_height, &output_par_width, &output_par_height);
- [fHeightStepper setIntValue: output_height];
- [fHeightField setIntValue: output_height];
- job->height = [fHeightStepper intValue];
- 
+ job->crop[0] = cropValue;
+ [fCropTopStepper setIntValue:cropValue];
+ [fHeightStepper setMaxValue: fTitle->height - job->crop[0] - job->crop[1]];
 }
- else if ([fAnamorphicPopUp indexOfSelectedItem] == 3) // custom / power user jamboree
+ else
 {
-
-#pragma mark - STARTCapuj
-
- job->anamorphic.mode = 3;
- 
- /* Set the status of our custom ana only widgets accordingly */
- [fModulusPopUp setEnabled:YES];
- 
- [fWidthStepper setEnabled: YES];
- [fWidthField setEnabled: YES];
- 
- [fHeightStepper setEnabled: YES];
- /* for capuj the storage field is immaterial */
- [fHeightField setEnabled: YES];
- 
- [fRatioCheck setEnabled: YES];
- if (sender == fRatioCheck)
- {
- if ([fRatioCheck state] == NSOnState)
- {
- [fParWidthField setEnabled: NO];
- [fParHeightField setEnabled: NO]; 
- }
- else
- {
- [fParWidthField setEnabled: YES];
- [fParHeightField setEnabled: YES];
- }
- }
- 
- [fParWidthField setEnabled: YES];
- [fParHeightField setEnabled: YES];
- 
- [fDisplayWidthField setEnabled: YES];
- 
- 
- /* If we are coming into custom anamorphic we reset the par to original
- * which gives us a way back if things get hosed up.
- */
- 
- if (sender == fAnamorphicPopUp)
- {
- /* When entering custom anamorphic, we start with keep ar on */
- [fRatioCheck setState: NSOnState];
- /*
- KEEPING ASPECT RATIO
- Disable editing: PIXEL WIDTH, PIXEL HEIGHT
- */
- [fParWidthField setEnabled: NO];
- [fParHeightField setEnabled: NO];
- 
- job->width = [fWidthStepper intValue];
- job->height = [fHeightStepper intValue];
-
- /* make sure our par is set back to original */
- job->anamorphic.par_width = titleParWidth;
- job->anamorphic.par_height = titleParHeight;
- 
- [fParWidthField setIntValue: titleParWidth];
- [fParHeightField setIntValue: titleParHeight];
- 
- /* modify our par dims from our storage dims */
- hb_set_anamorphic_size(job, &output_width, &output_height, &output_par_width, &output_par_height);
- float par_display_width = (float)output_width * (float)output_par_width / (float)output_par_height;
- 
- /* go ahead and mod the display dims */
- [fDisplayWidthField setStringValue: [NSString stringWithFormat:@"%.2f", par_display_width]];
- 
- job->anamorphic.dar_width = [fDisplayWidthField floatValue];
- job->anamorphic.dar_height = (float)[fHeightStepper intValue];
- 
- /* Set our dar here assuming we are just coming into capuj mode */
- dar = [fDisplayWidthField floatValue] / (float)[fHeightField intValue];
- 
- }
-
- /* For capuj we disable these fields if we are keeping the dispay aspect */
- if ([fRatioCheck state] == NSOnState)
- {
- /*
- KEEPING ASPECT RATIO
- DAR = DISPLAY WIDTH / DISPLAY HEIGHT (cache after every modification) */
- /*Disable editing: PIXEL WIDTH, PIXEL HEIGHT */
- 
- [fParWidthField setEnabled: NO];
- [fParHeightField setEnabled: NO];
- 
- /* Changing DISPLAY WIDTH: */
- if (sender == fDisplayWidthField)
- {
- job->anamorphic.dar_width = [fDisplayWidthField floatValue];
- /* Changes HEIGHT to keep DAR */
- /* calculate the height to retain the dar */
- int raw_calulated_height = (int)((int)[fDisplayWidthField floatValue] / dar);
- /* now use the modulus to go lower if there is a remainder */
- /* Note to me, raw_calulated_height % [[fModulusPopUp titleOfSelectedItem] intValue]
- * gives me the remainder we are not mod (whatever our modulus is) subtract that from
- * the actual calculated value derived from the dar to round down to the nearest mod value.
- * This should be desireable over rounding up to the next mod value
- */
- int modulus_height = raw_calulated_height - (raw_calulated_height % [[fModulusPopUp titleOfSelectedItem] intValue]);
- if (modulus_height > fTitle->height)
- {
- [fHeightStepper setMaxValue: modulus_height];
- }
- [fHeightStepper setIntValue: modulus_height];
- job->anamorphic.dar_height = (float)[fHeightStepper intValue];
- job->height = [fHeightStepper intValue];
- 
- /* Changes PIXEL WIDTH to new DISPLAY WIDTH */
- [fParWidthField setIntValue: [fDisplayWidthField intValue]];
- job->anamorphic.par_width = [fParWidthField intValue];
- /* Changes PIXEL HEIGHT to STORAGE WIDTH */
- [fParHeightField setIntValue: [fWidthField intValue]];
- job->anamorphic.par_height = [fParHeightField intValue];
- 
- }
- /* Changing HEIGHT: */
- if (sender == fHeightStepper)
- {
- job->anamorphic.dar_height = (float)[fHeightStepper intValue];
- job->height = [fHeightStepper intValue];
- 
- /* Changes DISPLAY WIDTH to keep DAR*/
- [fDisplayWidthField setStringValue: [NSString stringWithFormat: @"%.2f",[fHeightStepper intValue] * dar]];
- job->anamorphic.dar_width = [fDisplayWidthField floatValue];
- /* Changes PIXEL WIDTH to new DISPLAY WIDTH */
- [fParWidthField setIntValue: [fDisplayWidthField intValue]];
- job->anamorphic.par_width = [fParWidthField intValue];
- /* Changes PIXEL HEIGHT to STORAGE WIDTH */
- [fParHeightField setIntValue: [fWidthField intValue]];
- job->anamorphic.par_height = [fParHeightField intValue];
- }
- /* Changing STORAGE_WIDTH: */
- if (sender == fWidthStepper)
- {
- job->width = [fWidthStepper intValue];
- 
- job->anamorphic.dar_width = [fDisplayWidthField floatValue];
- job->anamorphic.dar_height = [fHeightStepper floatValue];
- 
- /* Changes PIXEL WIDTH to DISPLAY WIDTH */
- [fParWidthField setIntValue: [fDisplayWidthField intValue]];
- job->anamorphic.par_width = [fParWidthField intValue];
- /* Changes PIXEL HEIGHT to new STORAGE WIDTH */
- [fParHeightField setIntValue: [fWidthStepper intValue]];
- job->anamorphic.par_height = [fParHeightField intValue];
- }
- }
- else if ([fRatioCheck state] == NSOffState)
- {
- /* Changing STORAGE_WIDTH: */
- if (sender == fWidthStepper)
- {
- job->width = [fWidthStepper intValue];
- /* changes DISPLAY WIDTH to STORAGE WIDTH * PIXEL WIDTH / PIXEL HEIGHT */
- [fDisplayWidthField setStringValue: [NSString stringWithFormat: @"%.2f",(float)[fWidthStepper intValue] * [fParWidthField intValue] / [fParHeightField intValue]]];
- job->anamorphic.dar_width = [fDisplayWidthField floatValue];
- }
- /* Changing PIXEL dimensions */
- if (sender == fParWidthField || sender == fParHeightField)
- {
- job->anamorphic.par_width = [fParWidthField intValue];
- job->anamorphic.par_height = [fParHeightField intValue];
- /* changes DISPLAY WIDTH to STORAGE WIDTH * PIXEL WIDTH / PIXEL HEIGHT */
- [fDisplayWidthField setStringValue: [NSString stringWithFormat: @"%.2f",(float)[fWidthStepper intValue] * [fParWidthField intValue] / [fParHeightField intValue]]];
- job->anamorphic.dar_width = [fDisplayWidthField floatValue];
- }
- /* Changing DISPLAY WIDTH: */
- if (sender == fDisplayWidthField)
- {
- job->anamorphic.dar_width = [fDisplayWidthField floatValue];
- job->anamorphic.dar_height = (float)[fHeightStepper intValue];
- /* changes PIXEL WIDTH to DISPLAY WIDTH and PIXEL HEIGHT to STORAGE WIDTH */
- [fParWidthField setIntValue: [fDisplayWidthField intValue]];
- job->anamorphic.par_width = [fParWidthField intValue];
- 
- [fParHeightField setIntValue: [fWidthField intValue]];
- job->anamorphic.par_height = [fParHeightField intValue];
- hb_set_anamorphic_size(job, &output_width, &output_height, &output_par_width, &output_par_height);
- }
- /* Changing HEIGHT: */
- if (sender == fHeightStepper)
- {
- /* just....changes the height.*/
- job->anamorphic.dar_height = [fHeightStepper intValue];
- job->height = [fHeightStepper intValue];
- }
- 
- }
- 
-#pragma mark - END Capuj 
+ [fCropLeftField setIntValue:job->crop[0]];
 }
- 
- /* if the sender is the Anamorphic checkbox, record the state
- of KeepAspect Ratio so it can be reset if Anamorphic is unchecked again */
- if (sender == fAnamorphicPopUp)
+ }
+ else if (sender == fCropBottomField)
+ {
+ int cropValue = [fCropBottomField intValue];
+ if (cropValue >= 0 && (cropValue <= fTitle->height/2-2))
 {
- keepAspectRatioPreviousState = [fRatioCheck state];
+ job->crop[1] = cropValue;
+ [fCropBottomStepper setIntValue:cropValue];
+ [fHeightStepper setMaxValue: fTitle->height - job->crop[0] - job->crop[1]];
 }
- if ([fAnamorphicPopUp indexOfSelectedItem] != 3)
+ else
 {
- [fRatioCheck setState:NSOffState];
+ [fCropLeftField setIntValue:job->crop[1]];
 }
- 
 }
- else
-	{
- job->width = [fWidthStepper intValue];
- job->height = [fHeightStepper intValue];
- job->anamorphic.mode = 0;
- [fWidthStepper setEnabled: YES];
- [fWidthField setEnabled: YES];
- [fHeightStepper setEnabled: YES];
- [fHeightField setEnabled: YES];
- [fRatioCheck setEnabled: YES];
- /* if the sender is the Anamorphic checkbox, we return the
- keep AR checkbox to its previous state */
- if (sender == fAnamorphicPopUp)
+ else if (sender == fCropLeftField)
+ {
+ int cropValue = [fCropLeftField intValue];
+ if (cropValue >= 0 && (cropValue <= fTitle->width/2-2))
 {
- [fRatioCheck setState:keepAspectRatioPreviousState];
+ job->crop[2] = cropValue;
+ [fCropLeftStepper setIntValue:cropValue];
+ [fWidthStepper setMaxValue: fTitle->width - job->crop[2] - job->crop[3]];
 }
- 
-	}
-	
- if ([fAnamorphicPopUp indexOfSelectedItem] != 3)
- {
- job->keep_ratio = ( [fRatioCheck state] == NSOnState );
- if( job->keep_ratio )
+ else
 {
- if( sender == fWidthStepper || sender == fRatioCheck ||
- sender == fCropTopStepper || sender == fCropBottomStepper|| 
- sender == fCropMatrix || sender == nil )
- {
- hb_fix_aspect( job, HB_KEEP_WIDTH );
- if( job->height > fTitle->height )
- {
- job->height = fTitle->height;
- hb_fix_aspect( job, HB_KEEP_HEIGHT );
- }
- }
- else
- {
- hb_fix_aspect( job, HB_KEEP_HEIGHT );
- if( job->width > fTitle->width )
- {
- job->width = fTitle->width;
- hb_fix_aspect( job, HB_KEEP_WIDTH );
- }
- }
- 
+ [fCropLeftField setIntValue:job->crop[2]];
 }
 }
- 
- // hb_get_preview can't handle sizes that are larger than the original title
- if ([fAnamorphicPopUp indexOfSelectedItem] != 3)
+ else if (sender == fCropRightField)
 {
- // dimensions
- if( job->width > fTitle->width )
+ int cropValue = [fCropRightField intValue];
+ if (cropValue >= 0 && (cropValue <= fTitle->width/2-2))
 {
- job->width = fTitle->width;
+ job->crop[3] = cropValue;
+ [fCropRightStepper setIntValue:cropValue];
+ [fWidthStepper setMaxValue: fTitle->width - job->crop[2] - job->crop[3]];
 }
- 
- if( job->height > fTitle->height )
+ else
 {
- job->height = fTitle->height;
+ [fCropLeftField setIntValue:job->crop[3]];
 }
 }
- 
- [fWidthStepper setIntValue: job->width];
- [fWidthField setIntValue: job->width];
- if( [fAnamorphicPopUp indexOfSelectedItem] != 2) // if we are not loose or custom
- {
- [fHeightStepper setIntValue: job->height];
- [fHeightField setIntValue: job->height];
- }
- 
- [fCropTopStepper setIntValue: job->crop[0]];
- [fCropTopField setIntValue: job->crop[0]];
- [fCropBottomStepper setIntValue: job->crop[1]];
- [fCropBottomField setIntValue: job->crop[1]];
- [fCropLeftStepper setIntValue: job->crop[2]];
- [fCropLeftField setIntValue: job->crop[2]];
- [fCropRightStepper setIntValue: job->crop[3]];
- [fCropRightField setIntValue: job->crop[3]];
- 
+
+ keep |= !!job->anamorphic.keep_display_aspect * HB_KEEP_DISPLAY_ASPECT;
+
+ hb_geometry_t srcGeo, resultGeo;
+ hb_ui_geometry_t uiGeo;
+
+ srcGeo.width = fTitle->width;
+ srcGeo.height = fTitle->height;
+ srcGeo.par.num = fTitle->pixel_aspect_width;
+ srcGeo.par.den = fTitle->pixel_aspect_height;
+
+ uiGeo.mode = job->anamorphic.mode;
+ uiGeo.keep = keep;
+ uiGeo.itu_par = 0;
+ uiGeo.modulus = job->modulus;
+ memcpy(uiGeo.crop, job->crop, sizeof(int[4]));
+ uiGeo.width = job->width;
+ uiGeo.height = job->height;
+ /* Modulus added to maxWidth/maxHeight to allow a small amount of
+ * upscaling to the next mod boundary.
+ */
+ uiGeo.maxWidth = fTitle->width - job->crop[2] - job->crop[3] + job->modulus - 1;
+ uiGeo.maxHeight = fTitle->height - job->crop[0] - job->crop[1] + job->modulus - 1;
+ uiGeo.par.num = job->anamorphic.par_width;
+ uiGeo.par.den = job->anamorphic.par_height;
+ uiGeo.dar.num = 0;
+ uiGeo.dar.den = 0;
+ if (job->anamorphic.mode == HB_ANAMORPHIC_CUSTOM && dar_updated)
+ {
+ uiGeo.dar.num = job->anamorphic.dar_width;
+ uiGeo.dar.den = job->anamorphic.dar_height;
+ }
+ hb_set_anamorphic_size2(&srcGeo, &uiGeo, &resultGeo);
+
+ job->width = resultGeo.width;
+ job->height = resultGeo.height;
+ job->anamorphic.par_width = resultGeo.par.num;
+ job->anamorphic.par_height = resultGeo.par.den;
+
+ int display_width;
+ display_width = resultGeo.width * resultGeo.par.num / resultGeo.par.den;
+
+ [fWidthStepper setIntValue: resultGeo.width];
+ [fWidthField setIntValue: resultGeo.width];
+ [fHeightStepper setIntValue: resultGeo.height];
+ [fHeightField setIntValue: resultGeo.height];
+ [fParWidthField setIntValue: resultGeo.par.num];
+ [fParHeightField setIntValue: resultGeo.par.den];
+ [fDisplayWidthField setIntValue: display_width];
+
 /*
 * Sanity-check here for previews < 16 pixels to avoid crashing
 * hb_get_preview(). In fact, let's get previews at least 64 pixels in both
@@ -1048,353 +855,21 @@
 */
 if (job->width >= 64 && job->height >= 64)
 {
- [self reloadStillPreview];
+ [fPreviewController reload];
 }
- 
+
 /* we get the sizing info to display from fPreviewController */
 [fSizeInfoField setStringValue: [fPreviewController pictureSizeInfoString]];
- 
- if (sender != nil)
- {
- [fHBController pictureSettingsDidChange];
- } 
- 
- if ([[self window] isVisible])
- { 
- [self adjustSizingDisplay:nil];
- }
- 
-}
-
-- (NSString*) getPictureSizeInfoString
-{
- return [fSizeInfoField stringValue];
-}
-
-- (void)reloadStillPreview
-{
- [fPreviewController SetTitle:fTitle];
-}
-
-
-#pragma mark -
-
-- (BOOL) autoCrop
-{
- return autoCrop;
-}
-- (void) setAutoCrop: (BOOL) setting
-{
- autoCrop = setting;
-}
-
-- (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title
-{
- //[self SetTitle:title];
- [self showWindow:sender];
- //[self adjustSizingDisplay:nil];
- //[self adjustFilterDisplay:nil];
-
-}
-
-
-#pragma mark -
-/* we use this to setup the initial picture filters upon first launch, after that their states
-are maintained across different sources */
-- (void) setInitialPictureFilters
-{
-	/* we use a popup to show the detelecine settings */
-	[fDetelecinePopUp removeAllItems];
- [fDetelecinePopUp addItemWithTitle: @"Off"];
- [fDetelecinePopUp addItemWithTitle: @"Custom"];
- [fDetelecinePopUp addItemWithTitle: @"Default"];
- [fDetelecinePopUp selectItemAtIndex: fPictureFilterSettings.detelecine];
- 
- [self modeDecombDeinterlaceSliderChanged:nil];
- /* we use a popup to show the decomb settings */
-	[fDecombPopUp removeAllItems];
- [fDecombPopUp addItemWithTitle: @"Off"];
- [fDecombPopUp addItemWithTitle: @"Custom"];
- [fDecombPopUp addItemWithTitle: @"Default"];
- [fDecombPopUp addItemWithTitle: @"Fast"];
- [fDecombPopUp addItemWithTitle: @"Bob"];
- 
- [fDecombPopUp selectItemAtIndex: fPictureFilterSettings.decomb];
- 
- /* we use a popup to show the deinterlace settings */
-	[fDeinterlacePopUp removeAllItems];
- [fDeinterlacePopUp addItemWithTitle: @"Off"];
- [fDeinterlacePopUp addItemWithTitle: @"Custom"];
- [fDeinterlacePopUp addItemWithTitle: @"Fast"];
- [fDeinterlacePopUp addItemWithTitle: @"Slow"];
- [fDeinterlacePopUp addItemWithTitle: @"Slower"];
- [fDeinterlacePopUp addItemWithTitle: @"Bob"];
- 
-	/* Set deinterlaces level according to the integer in the main window */
-	[fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
-
-	/* we use a popup to show the denoise settings */
-	[fDenoisePopUp removeAllItems];
- [fDenoisePopUp addItemWithTitle: @"Off"];
- [fDenoisePopUp addItemWithTitle: @"Custom"];
- [fDenoisePopUp addItemWithTitle: @"Weak"];
-	[fDenoisePopUp addItemWithTitle: @"Medium"];
- [fDenoisePopUp addItemWithTitle: @"Strong"];
-	/* Set denoises level according to the integer in the main window */
-	[fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
- 
-
-}
-
-
 
-
-- (IBAction) modeDecombDeinterlaceSliderChanged: (id) sender
-{
- 
- /* since its a tickless slider, we have to make sure we are on or off */
- if ([fDecombDeinterlaceSlider floatValue] < 0.50)
- {
- [fDecombDeinterlaceSlider setFloatValue:0.0];
- }
- else
- {
- [fDecombDeinterlaceSlider setFloatValue:1.0];
- }
- 
- 
- /* Decomb selected*/
- if ([fDecombDeinterlaceSlider floatValue] == 0.0)
- {
- [fDecombBox setHidden:NO];
- [fDeinterlaceBox setHidden:YES];
- fPictureFilterSettings.decomb = [fDecombPopUp indexOfSelectedItem];
- fPictureFilterSettings.usedecomb = 1;
- fPictureFilterSettings.deinterlace = 0;
- [fDecombPopUp selectItemAtIndex:fPictureFilterSettings.decomb];
- [self adjustFilterDisplay:fDecombPopUp];
- }
- else
- {
- [fDecombBox setHidden:YES];
- [fDeinterlaceBox setHidden:NO];
- fPictureFilterSettings.usedecomb = 0;
- fPictureFilterSettings.decomb = 0;
- [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
- [self adjustFilterDisplay:fDeinterlacePopUp];
- }
- [self FilterSettingsChanged: fDecombDeinterlaceSlider];
-}
-
-
-- (IBAction) FilterSettingsChanged: (id) sender
-{
- 
- fPictureFilterSettings.detelecine = [fDetelecinePopUp indexOfSelectedItem];
- [self adjustFilterDisplay:fDetelecinePopUp];
- 
- fPictureFilterSettings.decomb = [fDecombPopUp indexOfSelectedItem];
- [self adjustFilterDisplay:fDecombPopUp];
- 
- fPictureFilterSettings.deinterlace = [fDeinterlacePopUp indexOfSelectedItem];
- [self adjustFilterDisplay:fDeinterlacePopUp];
- 
- fPictureFilterSettings.denoise = [fDenoisePopUp indexOfSelectedItem];
- [self adjustFilterDisplay:fDenoisePopUp];
- 
- if ([fDeblockField stringValue] == @"Off")
- {
- fPictureFilterSettings.deblock = 0;
- }
- else
- {
- fPictureFilterSettings.deblock = [fDeblockField intValue];
- }
- 
- fPictureFilterSettings.grayscale = [fGrayscaleCheck state];
- 
- [self decombDeinterlacePreviewImage];
- 
 if (sender != nil)
 {
- [fHBController pictureSettingsDidChange];
- 
- } 
-
-}
-
-- (void) decombDeinterlacePreviewImage
-{
- /* XXX: make sure we actually have a title before de-referencing it */
- if (fTitle == NULL)
- {
- return;
- }
- 
- if ([fDecombDeinterlaceSlider floatValue] < 0.50)
- {
- /* Since Libhb only shows a deinterlaced preview image via deinterlace .. for decomb we
- do a quick switch to get libhb to show a deinterlaced image if needed even though deinterlace
- has not been changed by the user. so we temporarily switch deinterace accoring to decomb then
- call reloadStillPreview quickly and then switch deinterlace back to its proper state.
- */
- 
- // decomb is chosen
- if (fPictureFilterSettings.decomb > 0)
- {
- /* Temporarily turn on deinterlacing .... */
- fTitle->job->deinterlace = 1;
- /* Grab a still preview ... */
- [self reloadStillPreview];
- /* ... then reset deinterlace back to where specified in the ui */
- fTitle->job->deinterlace = [fDeinterlacePopUp indexOfSelectedItem];
- 
- }
- else
- {
- [self reloadStillPreview]; 
- }
- 
- }
- else
- {
- fTitle->job->deinterlace = [fDeinterlacePopUp indexOfSelectedItem];
- [self reloadStillPreview];
- }
-}
-#pragma mark -
-
-- (IBAction) deblockSliderChanged: (id) sender
-{
- if ([fDeblockSlider floatValue] == 4.0)
- {
- [fDeblockField setStringValue: [NSString stringWithFormat: @"Off"]];
+ [self.delegate pictureSettingsDidChange];
 }
- else
- {
- [fDeblockField setStringValue: [NSString stringWithFormat: @"%.0f", [fDeblockSlider floatValue]]];
- }
-	[self FilterSettingsChanged: sender];
-}
-
-
-- (int) detelecine
-{
- return fPictureFilterSettings.detelecine;
-}
-
-- (NSString*) detelecineCustomString
-{
- return [fDetelecineField stringValue];
-}
-
-- (void) setDetelecine: (int) setting
-{
- fPictureFilterSettings.detelecine = setting;
-}
-
-- (void) setDetelecineCustomString: (NSString*) string 
-{
- [fDetelecineField setStringValue:string];
-}
-
-- (int) deinterlace
-{
- return fPictureFilterSettings.deinterlace;
-}
-- (NSString*) deinterlaceCustomString
-{
- return [fDeinterlaceField stringValue];
-}
-
-- (void) setDeinterlaceCustomString: (NSString*) string 
-{
- [fDeinterlaceField setStringValue:string];
-}
 
-- (void) setDeinterlace: (int) setting 
-{
- fPictureFilterSettings.deinterlace = setting;
-}
-- (int) decomb
-{
- return fPictureFilterSettings.decomb;
-}
-
-- (NSString*) decombCustomString
-{
- return [fDecombField stringValue];
-}
-
-- (int) useDecomb
-{
- return fPictureFilterSettings.usedecomb;
-}
-
-- (void) setUseDecomb: (int) setting
-{
- fPictureFilterSettings.usedecomb = setting;
- if (fPictureFilterSettings.usedecomb == 1)
- {
- [fDecombDeinterlaceSlider setFloatValue:0.0];
- }
- else
+ if ([[self window] isVisible])
 {
- [fDecombDeinterlaceSlider setFloatValue:1.0];
+ [self adjustSizingDisplay:nil];
 }
- [self modeDecombDeinterlaceSliderChanged:nil];
-}
-
-- (void) setDecomb: (int) setting {
- fPictureFilterSettings.decomb = setting;
-}
-
-- (void) setDecombCustomString: (NSString*) string 
-{
- [fDecombField setStringValue:string];
-}
-
-- (int) denoise
-{
- return fPictureFilterSettings.denoise;
 }
 
-- (NSString*) denoiseCustomString
-{
- return [fDenoiseField stringValue];
-}
-
-- (void) setDenoiseCustomString: (NSString*) string 
-{
- [fDenoiseField setStringValue:string];
-}
-
-- (void) setDenoise: (int) setting
-{
- fPictureFilterSettings.denoise = setting;
-}
-
-- (int) deblock
-{
- return fPictureFilterSettings.deblock;
-}
-
-- (void) setDeblock: (int) setting
-{
- fPictureFilterSettings.deblock = setting;
-}
-
-- (int) grayscale
-{
- return fPictureFilterSettings.grayscale;
-}
-
-- (void) setGrayscale: (int) setting
-{
- fPictureFilterSettings.grayscale = setting;
-}
-
-
-
 @end
-

HandBrake-0.10.0.tar.bz2/macosx/icons/Delete@2x.png Added

HandBrake-0.10.0.tar.bz2/macosx/icons/DeleteHighlight@2x.png Added

HandBrake-0.10.0.tar.bz2/macosx/icons/DeleteHighlightPressed@2x.png Added

HandBrake-0.10.0.tar.bz2/macosx/icons/DeletePressed@2x.png Added

HandBrake-0.10.0.tar.bz2/macosx/icons/EncodeCanceled@2x.png Added

HandBrake-0.10.0.tar.bz2/macosx/icons/EncodeComplete@2x.png Added

HandBrake-0.10.0.tar.bz2/macosx/icons/EncodeWorking0@2x.png Added

HandBrake-0.10.0.tar.bz2/macosx/icons/EncodeWorking1@2x.png Added

HandBrake-0.10.0.tar.bz2/macosx/icons/EncodeWorking2@2x.png Added

HandBrake-0.10.0.tar.bz2/macosx/icons/EncodeWorking3@2x.png Added

HandBrake-0.10.0.tar.bz2/macosx/icons/EncodeWorking4@2x.png Added

HandBrake-0.10.0.tar.bz2/macosx/icons/EncodeWorking5@2x.png Added

HandBrake-0.10.0.tar.bz2/macosx/icons/JobSmall@2x.png Added

HandBrake-0.10.0.tar.bz2/macosx/icons/Reveal@2x.png Added

HandBrake-0.10.0.tar.bz2/macosx/icons/RevealHighlight@2x.png Added

HandBrake-0.10.0.tar.bz2/macosx/icons/RevealHighlightPressed@2x.png Added

HandBrake-0.10.0.tar.bz2/macosx/icons/RevealPressed@2x.png Added

HandBrake-0.9.9.tar.bz2/macosx/icons/stopencode.png -> HandBrake-0.10.0.tar.bz2/macosx/icons/stopencode.png Changed

HandBrake-0.9.9.tar.bz2/macosx/icons/stopencode@2x.png -> HandBrake-0.10.0.tar.bz2/macosx/icons/stopencode@2x.png Changed

HandBrake-0.9.9.tar.bz2/macosx/main.mm -> HandBrake-0.10.0.tar.bz2/macosx/main.mm Changed

@@ -11,6 +11,10 @@
 
 #import "hb.h"
 
+void SigHandler( int signal );
+void hb_error_handler( const char *errmsg );
+char * str_printf(const char *fmt, ...);
+
 void SigHandler( int signal )
 {
     [NSApp terminate: NULL];
@@ -22,11 +26,9 @@
  * Change this to display a dialog box - and maybe move it somewhere else,
  * this is the only place I could find that looked like C :)
 ****************************************************************************/
-extern "C" {
-    void hb_error_handler( const char *errmsg )
-    {
-         fprintf(stderr, "GUI ERROR dialog: %s\n", errmsg );
-    }
+void hb_error_handler( const char *errmsg )
+{
+    fprintf(stderr, "GUI ERROR dialog: %s\n", errmsg );
 }
 
 char * str_printf(const char *fmt, ...)
@@ -64,9 +66,10 @@
     }
 }
 
-int main( int argc, const char ** argv )
+int main(int argc, const char **argv)
 {
-    signal( SIGINT, SigHandler );
+    signal(SIGINT, SigHandler);
+    hb_global_init();
     hb_register_error_handler(&hb_error_handler);
-    return NSApplicationMain( argc, argv );
+    return NSApplicationMain(argc, argv);
 }

HandBrake-0.9.9.tar.bz2/macosx/module.defs -> HandBrake-0.10.0.tar.bz2/macosx/module.defs Changed

@@ -7,10 +7,12 @@
 MACOSX.m4.in  = $(wildcard $(MACOSX.src/)*.m4)
 MACOSX.m4.out = $(MACOSX.m4.in:$(MACOSX.src/)%.m4=$(MACOSX.build/)%)
 
+MACOSX.osl.filelist = $(MACOSX.build/)osl.filelist.txt
+
 ###############################################################################
 
 BUILD.out += $(MACOSX.m4.out)
-BUILD.out += $(MACOSX.m4.wc.out)
+BUILD.out += $(MACOSX.osl.filelist)
 
 ###############################################################################
 
@@ -25,14 +27,18 @@
 MACOSX.map.g.std  = debug
 MACOSX.map.g.max  = debug
 
-ifeq (1,$(FEATURE.fdk_aac))
-MACOSX.extra_ldflags = OTHER_LDFLAGS='$(abspath $(BUILD))/contrib/lib/libfdk-aac.a'
-endif
-
 ## xcconfig: must be one of macosx/xcconfig/*.xcconfig
 MACOSX.xcconfig = $(foreach x,$(XCODE.xcconfig),-xcconfig $(MACOSX.src/)xcconfig/$(x))
 MACOSX.sdk      = $(foreach sdk,$(GCC.sysroot),-sdk $(sdk))
 
+## some optional features use ifdef directives outside of libhb (e.g. CLI)
+ifeq (1,$(FEATURE.x265))
+    MACOSX.GCC.D += -DUSE_X265
+endif
+
+## extra CFLAGS: macro definitions
+MACOSX.extra_cflags = OTHER_CFLAGS='$(MACOSX.GCC.D)'
+
 ## launch a build thru xcode; which in turn will do a nested make against
 ## this build system with normal build rules enabled.
 ##
@@ -58,6 +64,6 @@
         EXTERNAL_JOBS='$(BUILD.jobs)' \
         EXTERNAL_VARS='$(-*-command-variables-*-)' \
         \
-        $(MACOSX.extra_ldflags) \
+        $(MACOSX.extra_cflags) \
         \
         $(2) )

HandBrake-0.9.9.tar.bz2/macosx/module.rules -> HandBrake-0.10.0.tar.bz2/macosx/module.rules Changed

HandBrake-0.9.9.tar.bz2/macosx/xcconfig/base/os.osx106.xcconfig -> HandBrake-0.10.0.tar.bz2/macosx/xcconfig/base/os.osx106.xcconfig Changed

HandBrake-0.10.0.tar.bz2/macosx/xcconfig/base/os.osx108.xcconfig Added

HandBrake-0.10.0.tar.bz2/macosx/xcconfig/base/os.osx109.xcconfig Added

HandBrake-0.9.9.tar.bz2/macosx/xcconfig/native.xcconfig -> HandBrake-0.10.0.tar.bz2/macosx/xcconfig/native.xcconfig Changed

HandBrake-0.10.0.tar.bz2/macosx/xcconfig/osx108.i386.xcconfig Added

HandBrake-0.10.0.tar.bz2/macosx/xcconfig/osx108.x86_64.xcconfig Added

HandBrake-0.10.0.tar.bz2/macosx/xcconfig/osx109.i386.xcconfig Added

HandBrake-0.10.0.tar.bz2/macosx/xcconfig/osx109.x86_64.xcconfig Added

HandBrake-0.10.0.tar.bz2/macosx/xcconfig/supplemental.xcconfig Added

HandBrake-0.9.9.tar.bz2/make/configure.py -> HandBrake-0.10.0.tar.bz2/make/configure.py Changed

@@ -247,6 +247,7 @@
 self._dumpSession( cfg.infof )
 cfg.errln( 'unable to continue' )
 self._dumpSession( cfg.verbosef )
+ self._failSession()
 else:
 cfg.infof( '(%s) %s\n', self.msg_pass, self.msg_end )
 self._dumpSession( cfg.verbosef )
@@ -261,6 +262,9 @@
 def _parseSession( self ):
 pass
 
+ def _failSession( self ):
+ pass
+
 def run( self ):
 if self.run_done:
 return
@@ -699,7 +703,7 @@
 self.root = 'svn://nowhere.com/project'
 self.branch = 'unknown'
 self.uuid = '00000000-0000-0000-0000-000000000000';
- self.rev = 5474
+ self.rev = 0
 self.date = '0000-00-00 00:00:00 -0000'
 self.official = 0
 self.type = 'unofficial'
@@ -743,6 +747,30 @@
 
 self.msg_end = self.url
 
+ def _failSession( self ):
+ # Look for svn info in version file.
+ #
+ # Version file would be created manually by source packager.
+ # e.g.
+ # $ svn info HandBrake > HandBrake/version.txt
+ # $ tar -czf handbrake-source.tgz --exclude .svn HandBrake
+ cfg.infof( 'probe: version.txt...' )
+ try:
+ hvp = os.path.join( cfg.src_dir, 'version.txt' )
+ if os.path.isfile( hvp ) and os.path.getsize( hvp ) > 0:
+ file = open( hvp, 'r' )
+ self.session = file.readlines()
+ file.close()
+ if self.session:
+ self._parseSession()
+ if self.rev != 0:
+ cfg.infof( '(pass)\n' )
+ else:
+ cfg.infof( '(fail)\n' )
+
+ except:
+ cfg.infof( '(fail)\n' )
+
 ###############################################################################
 ##
 ## project object.
@@ -757,16 +785,16 @@
 self.name = 'HandBrake'
 self.acro_lower = 'hb'
 self.acro_upper = 'HB'
- self.url_website = 'http://handbrake.fr'
- self.url_community = 'http://forum.handbrake.fr'
+ self.url_website = 'https://handbrake.fr'
+ self.url_community = 'https://forum.handbrake.fr'
 self.url_irc = 'irc://irc.freenode.net/handbrake'
 
 self.name_lower = self.name.lower()
 self.name_upper = self.name.upper()
 
 self.vmajor = 0
- self.vminor = 9
- self.vpoint = 9
+ self.vminor = 10
+ self.vpoint = 0
 
 def _action( self ):
 ## add architecture to URL only for Mac
@@ -794,8 +822,8 @@
 self.build = time.strftime('%Y%m%d') + '99'
 self.title = '%s rev%d (%s)' % (self.name,repo.rev,self.build)
 
- self.url_appcast = 'http://handbrake.fr/appcast%s%s.xml' % (url_ctype,url_arch)
- self.url_appnote = 'http://handbrake.fr/appcast/%s.html' % (url_ntype)
+ self.url_appcast = 'https://handbrake.fr/appcast%s%s.xml' % (url_ctype,url_arch)
+ self.url_appnote = 'https://handbrake.fr/appcast/%s.html' % (url_ntype)
 
 self.msg_end = '%s (%s)' % (self.name,repo.type)
 self.fail = False
@@ -1173,11 +1201,23 @@
 grp.add_option( '--enable-gtk-mingw', default=False, action='store_true', help=h )
 h = IfHost( 'disable gstreamer (live preview)', '*-*-linux*', none=optparse.SUPPRESS_HELP ).value
 grp.add_option( '--disable-gst', default=False, action='store_true', help=h )
- h = IfHost( 'enable use of ffmpeg mpeg2 decoding', '*-*-*', none=optparse.SUPPRESS_HELP ).value
- grp.add_option( '--enable-ff-mpeg2', default=False, action='store_true', help=h )
+ h = IfHost( 'enable use of Intel Quick Sync Video hardware acceleration', '*-*-*', none=optparse.SUPPRESS_HELP ).value
+ grp.add_option( '--enable-qsv', default=False, action='store_true', help=h )
+
+ h = IfHost( 'enable HWD features', '*-*-*', none=optparse.SUPPRESS_HELP ).value
+ grp.add_option( '--enable-hwd', default=False, action='store_true', help=h )
+ 
+ h = IfHost( 'enable use of x265 encoding', '*-*-*', none=optparse.SUPPRESS_HELP ).value
+ grp.add_option( '--enable-x265', default=True, action='store_true', help=h )
+ grp.add_option( '--disable-x265', dest="enable_x265", action='store_false' )
 
 h = IfHost( 'enable use of fdk-aac encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
- grp.add_option( '--enable-fdk-aac', default=False, action='store_true', help=h )
+ grp.add_option( '--enable-fdk-aac', dest="enable_fdk_aac", default=not host.match( '*-*-darwin*' ), action='store_true', help=h )
+ grp.add_option( '--disable-fdk-aac', dest="enable_fdk_aac", action='store_false' )
+
+ h = IfHost( 'enable use of libav aac encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
+ grp.add_option( '--enable-libav-aac', dest="enable_libav_aac", default=not host.match( '*-*-darwin*' ), action='store_true', help=h )
+ grp.add_option( '--disable-libav-aac', dest="enable_libav_aac", action='store_false' )
 
 cli.add_option_group( grp )
 
@@ -1208,6 +1248,10 @@
 grp.add_option( '--enable-local-yasm', default=False, action='store_true', help=h )
 h = IfHost( 'Build and use local autotools', '*-*-*', none=optparse.SUPPRESS_HELP ).value
 grp.add_option( '--enable-local-autotools', default=False, action='store_true', help=h )
+ h = IfHost( 'Build and use local cmake', '*-*-*', none=optparse.SUPPRESS_HELP ).value
+ grp.add_option( '--enable-local-cmake', default=False, action='store_true', help=h )
+ h = IfHost( 'Build and use local pkg-config', '*-*-darwin*', none=optparse.SUPPRESS_HELP ).value
+ grp.add_option( '--enable-local-pkgconfig', default=False, action='store_true', help=h )
 
 cli.add_option_group( grp )
 
@@ -1377,7 +1421,9 @@
 yasm = ToolProbe( 'YASM.exe', 'yasm', abort=False, minversion=[1,2,0] )
 autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', abort=False )
 automake = ToolProbe( 'AUTOMAKE.exe', 'automake', abort=False )
+ cmake = ToolProbe( 'CMAKE.exe', 'cmake', abort=False )
 libtool = ToolProbe( 'LIBTOOL.exe', 'libtool', abort=False )
+ pkgconfig = ToolProbe( 'PKGCONFIG.exe', 'pkg-config', abort=False )
 
 xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', abort=False )
 lipo = ToolProbe( 'LIPO.exe', 'lipo', abort=False )
@@ -1449,6 +1495,16 @@
 stdout.write( 'note: enabling local autotools\n' )
 options.enable_local_autotools = True
 
+ ## enable local cmake when cmake probe fails
+ if not options.enable_local_cmake and (Tools.cmake.fail):
+ stdout.write( 'note: enabling local cmake\n' )
+ options.enable_local_cmake = True
+
+ ## enable local pkg-config when probe fails
+ if not options.enable_local_pkgconfig and Tools.pkgconfig.fail:
+ stdout.write( 'note: enabling local pkgconfig\n' )
+ options.enable_local_pkgconfig = True
+
 if build.system == 'mingw':
 dlfcn_test = """
 #include <dlfcn.h>
@@ -1524,6 +1580,42 @@
 iconv = LDProbe( 'static iconv', '%s -static' % Tools.gcc.pathname, '-liconv', iconv_test )
 iconv.run()
 
+ regex_test = """
+#include <stdio.h>
+#include <regex.h>
+
+int match(regex_t *x, char *s)
+{
+ regmatch_t matches[1];
+ return regexec(x, s, 1, matches, 0);
+}
+
+int main()
+{
+ int rv;
+ regex_t exp;
+
+ rv = regcomp(&exp, "^[0-9]+$";", REG_EXTENDED);
+ if (rv != 0) {
+ return 1;
+ }
+
+ if (match(&exp, "7") != 0)
+ {
+ return 1;
+ }
+ if (match(&exp, "foo") == 0)
+ {
+ return 1;
+ }
+
+ regfree(&exp);
+ return 0;
+}
+"""
+ regex = LDProbe( 'static regex', '%s -static' % Tools.gcc.pathname, '-lregex', regex_test )
+ regex.run()
+
 ## cfg hook before doc prep
 cfg.doc_ready()
 
@@ -1612,14 +1704,19 @@
 doc.addBlank()
 doc.add( 'FEATURE.local_yasm', int( options.enable_local_yasm ))
 doc.add( 'FEATURE.local_autotools', int( options.enable_local_autotools ))
+ doc.add( 'FEATURE.local_cmake', int( options.enable_local_cmake ))
+ doc.add( 'FEATURE.local_pkgconfig', int( options.enable_local_pkgconfig ))
 doc.add( 'FEATURE.asm', 'disabled' )
 doc.add( 'FEATURE.gtk', int( not options.disable_gtk ))
 doc.add( 'FEATURE.gtk.update.checks', int( not options.disable_gtk_update_checks ))
 doc.add( 'FEATURE.gtk.mingw', int( options.enable_gtk_mingw ))
 doc.add( 'FEATURE.gst', int( not options.disable_gst ))
- doc.add( 'FEATURE.ff.mpeg2', int( options.enable_ff_mpeg2 ))
- doc.add( 'FEATURE.fdk_aac', int( options.enable_fdk_aac ))
+ doc.add( 'FEATURE.fdk_aac', int( options.enable_fdk_aac ))
+ doc.add( 'FEATURE.libav_aac', int( options.enable_libav_aac ))
+ doc.add( 'FEATURE.qsv', int( options.enable_qsv ))
+ doc.add( 'FEATURE.hwd', int( options.enable_hwd ))
 doc.add( 'FEATURE.xcode', int( not (Tools.xcodebuild.fail or options.disable_xcode or options.cross) ))
+ doc.add( 'FEATURE.x265', int( options.enable_x265 ))
 
 if not Tools.xcodebuild.fail and not options.disable_xcode:
 doc.addBlank()
@@ -1642,6 +1739,8 @@
 doc.add( 'HAS.libz', 1 )
 if not iconv.fail:
 doc.add( 'HAS.iconv', 1 )
+ if not regex.fail:
+ doc.add( 'HAS.regex', 1 )
 
 doc.addMake( '' )
 doc.addMake( '## define debug mode and optimize before other includes' )
@@ -1670,6 +1769,11 @@
 doc.add( 'GCC.sysroot', '' )
 doc.add( 'GCC.minver', '' )
 
+ if build.match( 'i?86-*' ):
+ doc.add( 'LIBHB.GCC.D', 'ARCH_X86_32', append=True )
+ elif build.match( 'x86_64-*' ):
+ doc.add( 'LIBHB.GCC.D', 'ARCH_X86_64', append=True )
+
 if options.enable_asm and ( not Tools.yasm.fail or options.enable_local_yasm ):
 asm = ''
 if build.match( 'i?86-*' ):

HandBrake-0.9.9.tar.bz2/make/include/contrib.defs -> HandBrake-0.10.0.tar.bz2/make/include/contrib.defs Changed

@@ -1,6 +1,7 @@
 CONTRIB.build/    = $(BUILD/)contrib/
 CONTRIB.download/ = $(SRC/)download/
 CONTRIB.host      = $(if $(filter 1,$(BUILD.cross)),$(BUILD.spec))
+CONTRIB.spec      = $(if $(filter 1,$(BUILD.cross)),$(HOST.spec))
 
 ###############################################################################
 
@@ -71,6 +72,7 @@
     $(1).CONFIGURE.bootstrap  =
     $(1).CONFIGURE.exe        = ./configure
     $(1).CONFIGURE.host       = $$(CONTRIB.host)
+    $(1).CONFIGURE.build      = $$(CONTRIB.spec)
     $(1).CONFIGURE.prefix     = $$(call fn.ABSOLUTE,$$(CONTRIB.build/))
     $(1).CONFIGURE.deps       = --disable-dependency-tracking
     $(1).CONFIGURE.shared     = --disable-shared
@@ -79,9 +81,10 @@
 
     $(1).CONFIGURE.args.dir    = cd $$(1);
     $(1).CONFIGURE.args.host   = --host=$$(1)
+    $(1).CONFIGURE.args.build  = --build=$$(1)
     $(1).CONFIGURE.args.prefix = --prefix=$$(1)
 
-    $(1).CONFIGURE.args = !sete @dir !bootstrap !env !exe @host @prefix !deps !shared !static !extra
+    $(1).CONFIGURE.args = !sete @dir !bootstrap !env !exe @host @build @prefix !deps !shared !static !extra
 
     $(1).CONFIGURE.env.LOCAL_PATH =
     $(1).CONFIGURE.env.CC       = CC=$$($(1).GCC.gcc)
@@ -91,21 +94,21 @@
     ## debug=max or optimizations=none.  Otherwise, use the contribs defaults
     ifeq (max,$$($(1).GCC.g))
         ifeq (none,$$($(1).GCC.O))
-            $(1).CONFIGURE.env.CFLAGS   = CFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g .O *D)"
+            $(1).CONFIGURE.env.CFLAGS   = CFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?c_std ?extra .g .O *D)"
             $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g .O *D)"
         else
-            $(1).CONFIGURE.env.CFLAGS   = CFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g *D)"
+            $(1).CONFIGURE.env.CFLAGS   = CFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?c_std ?extra .g *D)"
             $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g *D)"
         endif
     else
-        $(1).CONFIGURE.env.CFLAGS   = CFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra *D)"
+        $(1).CONFIGURE.env.CFLAGS   = CFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?c_std ?extra *D)"
         $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra *D)"
     endif
     $(1).CONFIGURE.env.CPPFLAGS = CPPFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra *D)"
     $(1).CONFIGURE.env.LDFLAGS  = LDFLAGS="-L$$(call fn.ABSOLUTE,$(CONTRIB.build/))lib $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra.exe *D)"
     $(1).CONFIGURE.env.PKG_CONFIG_PATH  = PKG_CONFIG_PATH="$$(call fn.ABSOLUTE,$$(CONTRIB.build/))lib/pkgconfig"
 
-    $(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LDFLAGS !PKG_CONFIG_PATH !LOCAL_PATH
+    $(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LD !LDFLAGS !PKG_CONFIG_PATH !LOCAL_PATH !CROSS
     $(1).CONFIGURE.env = $$(call fn.ARGS,$(1).CONFIGURE.env,$$($(1).CONFIGURE.env.args))
 
     $(1).CONFIGURE.target = $$($(1).build/).stamp.configure

HandBrake-0.9.9.tar.bz2/make/include/function.defs -> HandBrake-0.10.0.tar.bz2/make/include/function.defs Changed

HandBrake-0.9.9.tar.bz2/make/include/gcc.defs -> HandBrake-0.10.0.tar.bz2/make/include/gcc.defs Changed

@@ -4,6 +4,7 @@
 GCC.strip   = $$(if $$(filter none,$$(GCC.g)),1)
 GCC.dylib   = 1
 GCC.pipe    = 1
+GCC.c_std   = 1
 GCC.ML      = 1
 GCC.H       = 0
 GCC.W       = all
@@ -50,6 +51,7 @@
 GCC.args.minver    = -mmacosx-version-min=$(1)
 GCC.args.vis       = -fvisibility=hidden
 GCC.args.pic       = -fPIC
+GCC.args.c_std     = -std=gnu99
 GCC.args.g.none    = -g0
 GCC.args.g.min     = -gdwarf-2 -g1
 GCC.args.g.std     = -gdwarf-2
@@ -81,9 +83,10 @@
 
 define import.GCC
     $(1).GCC.gcc = $$(GCC.gcc)
-    $(1).GCC.gxx = $$(dir $$($(1).GCC.gcc))$$(subst gcc,g++,$$(notdir $$($(1).GCC.gcc)))
+    $(1).GCC.gxx = $$(dir $$($(1).GCC.gcc))$$(subst clang,clang++,$$(subst gcc,g++,$$(notdir $$($(1).GCC.gcc))))
 
     $(1).GCC.pipe    = $$(GCC.pipe)
+    $(1).GCC.c_std   = $$(GCC.c_std)
     $(1).GCC.strip   = $$(if $$(filter none,$$($(1).GCC.g)),1)
     $(1).GCC.dylib   = $$(GCC.dylib)
     $(1).GCC.ML      = $$(GCC.ML) 
@@ -118,6 +121,7 @@
     $(1).GCC.extra.exe++   = $$(GCC.extra.exe++)
 
     $(1).GCC.args.pipe      = $$(GCC.args.pipe)
+    $(1).GCC.args.c_std     = $$(GCC.args.c_std)
     $(1).GCC.args.strip     = $$(GCC.args.strip)
     $(1).GCC.args.dylib     = $$(GCC.args.dylib)
     $(1).GCC.args.ML        = $$(GCC.args.ML)
@@ -161,11 +165,11 @@
     $(1).GCC.o = -o $$(3)
 
     # FUNCTION: C precompiled headers
-    $(1).GCC.H_O.args = !gcc ?pipe ?ML ?H *W *archs *sysroot *minver ?vis ?pic .g .O ?extra ?extra.h_o *D *I !c !o
+    $(1).GCC.H_O.args = !gcc ?c_std ?pipe ?ML ?H *W *archs *sysroot *minver ?vis ?pic .g .O ?extra ?extra.h_o *D *I !c !o
     $(1).GCC.H_O = $$(call fn.ARGS,$(1).GCC,$$($(1).GCC.H_O.args),$$(1),$$(2))
 
     # FUNCTION: C compile source
-    $(1).GCC.C_O.args = !gcc ?pipe ?ML ?H *W *archs *sysroot *minver ?vis ?pic .g .O ?extra ?extra.c_o *D *I !c !o
+    $(1).GCC.C_O.args = !gcc ?c_std ?pipe ?ML ?H *W *archs *sysroot *minver ?vis ?pic .g .O ?extra ?extra.c_o *D *I !c !o
     $(1).GCC.C_O = $$(call fn.ARGS,$(1).GCC,$$($(1).GCC.C_O.args),$$(1),$$(2))
 
     # FUNCTION: C++ precompile headers
@@ -181,11 +185,11 @@
     $(1).GCC.i = $$(4)
 
     # FUNCTION: C link dynamic-lib
-    $(1).GCC.DYLIB.args = !gcc ?pipe ?strip ?dylib ?extra.dylib ?ML *W *archs *sysroot *minver ?vis ?pic .g .O ?extra *D *I !o ?muldefs ?start !i *F *f *L *l *i !a ?end
+    $(1).GCC.DYLIB.args = !gcc ?c_std ?pipe ?strip ?dylib ?extra.dylib ?ML *W *archs *sysroot *minver ?vis ?pic .g .O ?extra *D *I !o ?muldefs ?start !i *F *f *L *l *i !a ?end
     $(1).GCC.DYLIB = $$(call fn.ARGS,$(1).GCC,$$($(1).GCC.DYLIB.args),$$(1),$$(2))
 
     # FUNCTION: C link executable
-    $(1).GCC.EXE.args = !gcc ?pipe ?strip ?extra.exe ?ML *W *archs *sysroot *minver ?vis ?pic .g .O ?extra *D *I !o ?muldefs ?start !i *F *f *L *l *i !a ?end
+    $(1).GCC.EXE.args = !gcc ?c_std ?pipe ?strip ?extra.exe ?ML *W *archs *sysroot *minver ?vis ?pic .g .O ?extra *D *I !o ?muldefs ?start !i *F *f *L *l *i !a ?end
     $(1).GCC.EXE = $$(call fn.ARGS,$(1).GCC,$$($(1).GCC.EXE.args),$$(1),$$(2))
 
     # FUNCTION: C++ link dynamic-lib

HandBrake-0.9.9.tar.bz2/make/include/main.defs -> HandBrake-0.10.0.tar.bz2/make/include/main.defs Changed

@@ -8,18 +8,30 @@
 
 ###############################################################################
 
+ifeq (1,$(FEATURE.local_pkgconfig))
+    MODULES += contrib/pkgconfig
+endif
+
+HB_TOOLS_PATH =
+ifeq (1,$(FEATURE.local_cmake))
+    MODULES += contrib/cmake
+    HB_TOOLS_PATH = $(call fn.ABSOLUTE,$(CONTRIB.build/)bin)
+endif
+
 ifeq (1,$(FEATURE.local_autotools))
     MODULES += contrib/autoconf
     MODULES += contrib/automake
     MODULES += contrib/libtool
     MODULES += contrib/m4
     AUTOTOOL_MODULES = AUTOCONF AUTOMAKE LIBTOOL M4
-    PATH := $(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)
+    HB_TOOLS_PATH = $(call fn.ABSOLUTE,$(CONTRIB.build/)bin)
 else
     AUTOTOOL_MODULES =
 endif
 
-MODULES += contrib/a52dec
+ifneq (,$(HB_TOOLS_PATH))
+    PATH := $(HB_TOOLS_PATH):$(PATH)
+endif
 
 ifneq (,$(filter $(BUILD.system),cygwin mingw))
 ifneq ($(HAS.bz2),1)
@@ -37,21 +49,23 @@
     MODULES += contrib/libvorbis
     MODULES += contrib/libtheora
     MODULES += contrib/libsamplerate
+    MODULES += contrib/lame
+    MODULES += contrib/x264
 endif
 
 ifeq (1,$(FEATURE.fdk_aac))
     MODULES += contrib/fdk-aac
 endif
 
-MODULES += contrib/lame
-MODULES += contrib/faac
+ifeq (1,$(FEATURE.x265))
+    MODULES += contrib/x265
+endif
+
 MODULES += contrib/ffmpeg
+MODULES += contrib/libvpx
 MODULES += contrib/libdvdread
 MODULES += contrib/libdvdnav
 MODULES += contrib/libbluray
-MODULES += contrib/libmkv
-MODULES += contrib/mp4v2
-MODULES += contrib/mpeg2dec
 
 ifneq (,$(filter $(BUILD.system),mingw))
 ifneq ($(HAS.pthread),1)
@@ -59,7 +73,9 @@
 endif
 endif
 
-MODULES += contrib/x264
+ifeq (1,$(FEATURE.qsv))
+    MODULES += contrib/libmfx
+endif
 
 ifneq (,$(filter $(BUILD.system),cygwin mingw))
 ifneq ($(HAS.iconv),1)
@@ -68,6 +84,9 @@
 ifneq ($(HAS.libz),1)
     MODULES += contrib/zlib
 endif
+ifneq ($(HAS.regex),1)
+    MODULES += contrib/libgnurx
+endif
 endif
 
 ifneq (,$(filter $(BUILD.system),solaris))
@@ -96,6 +115,11 @@
     MODULES += gtk
 endif
 
+ifeq (1-kfreebsd,$(FEATURE.gtk)-$(BUILD.system))
+    ## build gtk when gtk+kfreebsd
+    MODULES += gtk
+endif
+
 ifeq (1-gnu,$(FEATURE.gtk)-$(BUILD.system))
     ## build gtk when gtk+gnu
     MODULES += gtk

HandBrake-0.9.9.tar.bz2/make/xcodemake -> HandBrake-0.10.0.tar.bz2/make/xcodemake Changed

@@ -106,15 +106,21 @@
         driver="--xcode-driver=$EXTERNAL_DRIVER"
     fi
 
+    ## determine which compiler to use based on Xcode environment (project).
     case "$GCC_VERSION" in
     com.apple.compilers.llvmgcc42)
-        gcc="--gcc=$DEVELOPER_BIN_DIR/llvm-gcc-4.2"
+        gcc="--gcc=`$DEVELOPER_BIN_DIR/xcodebuild -find-executable llvm-gcc-4.2`"
         ;;
     com.apple.compilers.llvm.clang.1_0)
-        gcc="--gcc=$DEVELOPER_BIN_DIR/clang"
+        gcc="--gcc=`$DEVELOPER_BIN_DIR/xcodebuild -find-executable clang`"
         ;;
     *)
-        gcc=
+        echo "*********************************************************************"
+        echo "***"
+        echo "*** ERROR: unexpected value for GCC_VERSION: $GCC_VERSION"
+        echo "***"
+        echo "*********************************************************************"
+        exit 1
         ;;
     esac
 
@@ -145,6 +151,14 @@
         minver=
     fi
 
+    ## pickup user setting from Xcode IDE and avoid recursion
+    if [ -n "$EXTERNAL_CONFIGURE" ]; then
+        extconf="$EXTERNAL_CONFIGURE"
+    else
+        extconf=
+    fi
+    EXTERNAL_CONFIGURE=
+
     ## invoke configure with (hidden) option which indicates conf performed by xcode
     (set -ex; $EXTERNAL_SRC/configure --force \
         $EXTERNAL_CONF_ARGS \
@@ -152,7 +166,7 @@
         $driver \
         --xcode-symroot="$SYMROOT" \
         --xcode-config="$EXTERNAL_XCCONFIG" \
-        $gcc $arch $debug $sysroot $minver)
+        $gcc $arch $debug $sysroot $minver $extconf)
     [ $? -ne 0 ] && exit 1
 fi

HandBrake-0.9.9.tar.bz2/pkg/linux/debian/control.precise -> HandBrake-0.10.0.tar.bz2/pkg/linux/debian/control.precise Changed

@@ -2,7 +2,7 @@
 Section: graphics
 Priority: optional
 Maintainer: John Stebbins <jstebbins.hb@gmail.com>
-Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libwebkitgtk-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, subversion, python (>= 2.6), libappindicator-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libgtk-3-dev, libwebkitgtk-3.0-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, python (>= 2.6), libappindicator-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
 Standards-Version: 3.8.4
 Homepage: http://www.handbrake.fr/
 
@@ -19,7 +19,7 @@
 
 Package: handbrake-gtk
 Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, libwebkitgtk-1.0-0, libnotify4
+Depends: ${shlibs:Depends}, ${misc:Depends}, libwebkitgtk-3.0-0, libnotify4
 Conflicts: handbrake
 Description: versatile DVD ripper and video transcoder - GTK GUI
 HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos

HandBrake-0.9.9.tar.bz2/pkg/linux/debian/control.quantal -> HandBrake-0.10.0.tar.bz2/pkg/linux/debian/control.quantal Changed

@@ -2,7 +2,7 @@
 Section: graphics
 Priority: optional
 Maintainer: John Stebbins <jstebbins.hb@gmail.com>
-Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libgtk-3-dev, libwebkitgtk-3.0-dev, libnotify-dev, libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, wget, subversion, python (>= 2.6), libappindicator3-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libgtk-3-dev, libwebkitgtk-3.0-dev, libnotify-dev, libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, wget, python (>= 2.6), libappindicator3-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
 Standards-Version: 3.8.4
 Homepage: http://www.handbrake.fr/

HandBrake-0.9.9.tar.bz2/pkg/linux/debian/control.raring -> HandBrake-0.10.0.tar.bz2/pkg/linux/debian/control.raring Changed

@@ -2,7 +2,7 @@
 Section: graphics
 Priority: optional
 Maintainer: John Stebbins <jstebbins.hb@gmail.com>
-Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libgtk-3-dev, libwebkitgtk-3.0-dev, libnotify-dev, libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, wget, subversion, python (>= 2.6), libappindicator3-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libgtk-3-dev, libwebkitgtk-3.0-dev, libnotify-dev, libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, wget, python (>= 2.6), libappindicator3-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
 Standards-Version: 3.8.4
 Homepage: http://www.handbrake.fr/

HandBrake-0.10.0.tar.bz2/pkg/linux/debian/control.saucy Added

@@ -0,0 +1,30 @@
+Source: handbrake
+Section: graphics
+Priority: optional
+Maintainer: John Stebbins <jstebbins.hb@gmail.com>
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libgtk-3-dev, libwebkitgtk-3.0-dev, libnotify-dev, libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, wget, python (>= 2.6), libappindicator3-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
+Standards-Version: 3.8.4
+Homepage: http://www.handbrake.fr/
+
+Package: handbrake-cli
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - command line
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the command-line variant,
+ HandBrakeCLI
+
+Package: handbrake-gtk
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer1.0-libav, gstreamer1.0-plugins-base, gstreamer1.0-plugins-good, gstreamer1.0-plugins-bad, gstreamer1.0-plugins-ugly, gstreamer1.0-pulseaudio
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - GTK GUI
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the graphical variant, ghb.
+
+

HandBrake-0.10.0.tar.bz2/pkg/linux/debian/control.trusty Added

@@ -0,0 +1,30 @@
+Source: handbrake
+Section: graphics
+Priority: optional
+Maintainer: John Stebbins <jstebbins.hb@gmail.com>
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.2.0), cmake, libbz2-dev, zlib1g-dev, libgtk-3-dev, libwebkitgtk-3.0-dev, libnotify-dev, libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, wget, python (>= 2.6), libappindicator3-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev, libmp3lame-dev, libx264-dev
+Standards-Version: 3.8.4
+Homepage: http://www.handbrake.fr/
+
+Package: handbrake-cli
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - command line
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the command-line variant,
+ HandBrakeCLI
+
+Package: handbrake-gtk
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer1.0-libav, gstreamer1.0-plugins-base, gstreamer1.0-plugins-good, gstreamer1.0-plugins-bad, gstreamer1.0-plugins-ugly, gstreamer1.0-pulseaudio
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - GTK GUI
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the graphical variant, ghb.
+
+

HandBrake-0.10.0.tar.bz2/pkg/linux/debian/control.utopic Added

@@ -0,0 +1,30 @@
+Source: handbrake
+Section: graphics
+Priority: optional
+Maintainer: John Stebbins <jstebbins.hb@gmail.com>
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.2.0), cmake, libbz2-dev, zlib1g-dev, libgtk-3-dev, libwebkitgtk-3.0-dev, libnotify-dev, libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, wget, python (>= 2.6), libappindicator3-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev, libmp3lame-dev, libx264-dev
+Standards-Version: 3.8.4
+Homepage: http://www.handbrake.fr/
+
+Package: handbrake-cli
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - command line
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the command-line variant,
+ HandBrakeCLI
+
+Package: handbrake-gtk
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer1.0-libav, gstreamer1.0-plugins-base, gstreamer1.0-plugins-good, gstreamer1.0-plugins-bad, gstreamer1.0-plugins-ugly, gstreamer1.0-pulseaudio
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - GTK GUI
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the graphical variant, ghb.
+
+

HandBrake-0.9.9.tar.bz2/pkg/linux/debian/handbrake-gtk.install -> HandBrake-0.10.0.tar.bz2/pkg/linux/debian/handbrake-gtk.install Changed

HandBrake-0.9.9.tar.bz2/pkg/linux/debian/rules.precise -> HandBrake-0.10.0.tar.bz2/pkg/linux/debian/rules.precise Changed

HandBrake-0.9.9.tar.bz2/pkg/linux/debian/rules.quantal -> HandBrake-0.10.0.tar.bz2/pkg/linux/debian/rules.quantal Changed

HandBrake-0.9.9.tar.bz2/pkg/linux/debian/rules.raring -> HandBrake-0.10.0.tar.bz2/pkg/linux/debian/rules.raring Changed

HandBrake-0.10.0.tar.bz2/pkg/linux/debian/rules.saucy Added

@@ -0,0 +1,85 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
+endif
+
+PKGDESTDIR   = ../
+CONFIGURE    = ./configure
+BUILDDIR     = build
+FORCEVERSION = 
+
+$(BUILDDIR)/GNUmakefile: $(CONFIGURE)
+	dh_testdir
+	unset CFLAGS; unset CPPLAGS; unset CXXLAGS; $(CONFIGURE) --enable-local-yasm --disable-gtk-update-checks --disable-libmkv --disable-mp4v2 --prefix=/usr
+
+build:  $(BUILDDIR)/GNUmakefile
+	dh_testdir
+	#We must build both the main project and the GTK project
+	unset CFLAGS ; unset CPPLAGS ; unset CXXLAGS; $(MAKE) -C $(BUILDDIR)
+
+clean: 
+	dh_testdir
+	dh_testroot
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	$(MAKE) -C $(BUILDDIR) DESTDIR=$(CURDIR)/debian/tmp install
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -i
+	dh_installdocs -i
+	dh_install --sourcedir=debian/tmp -i
+	dh_icons -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i $(FORCEVERSION)
+	dh_md5sums -i
+	dh_builddeb --destdir=$(PKGDESTDIR) -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_install --sourcedir=debian/tmp -a
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installman -a
+	dh_link -a
+	dh_icons -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a $(FORCEVERSION)
+	dh_md5sums -a
+	dh_builddeb -a --destdir=$(PKGDESTDIR) -- -Zbzip2
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

HandBrake-0.10.0.tar.bz2/pkg/linux/debian/rules.trusty Added

@@ -0,0 +1,85 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
+endif
+
+PKGDESTDIR   = ../
+CONFIGURE    = ./configure
+BUILDDIR     = build
+FORCEVERSION = 
+
+$(BUILDDIR)/GNUmakefile: $(CONFIGURE)
+	dh_testdir
+	unset CFLAGS; unset CPPLAGS; unset CXXLAGS; $(CONFIGURE) --disable-gtk-update-checks --prefix=/usr
+
+build:  $(BUILDDIR)/GNUmakefile
+	dh_testdir
+	#We must build both the main project and the GTK project
+	unset CFLAGS ; unset CPPLAGS ; unset CXXLAGS; $(MAKE) -C $(BUILDDIR)
+
+clean: 
+	dh_testdir
+	dh_testroot
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	$(MAKE) -C $(BUILDDIR) DESTDIR=$(CURDIR)/debian/tmp install
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -i
+	dh_installdocs -i
+	dh_install --sourcedir=debian/tmp -i
+	dh_icons -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i $(FORCEVERSION)
+	dh_md5sums -i
+	dh_builddeb --destdir=$(PKGDESTDIR) -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_install --sourcedir=debian/tmp -a
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installman -a
+	dh_link -a
+	dh_icons -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a $(FORCEVERSION)
+	dh_md5sums -a
+	dh_builddeb -a --destdir=$(PKGDESTDIR) -- -Zbzip2
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

HandBrake-0.10.0.tar.bz2/pkg/linux/debian/rules.utopic Added

@@ -0,0 +1,85 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
+endif
+
+PKGDESTDIR   = ../
+CONFIGURE    = ./configure
+BUILDDIR     = build
+FORCEVERSION = 
+
+$(BUILDDIR)/GNUmakefile: $(CONFIGURE)
+	dh_testdir
+	unset CFLAGS; unset CPPLAGS; unset CXXLAGS; $(CONFIGURE) --disable-gtk-update-checks --prefix=/usr
+
+build:  $(BUILDDIR)/GNUmakefile
+	dh_testdir
+	#We must build both the main project and the GTK project
+	unset CFLAGS ; unset CPPLAGS ; unset CXXLAGS; $(MAKE) -C $(BUILDDIR)
+
+clean: 
+	dh_testdir
+	dh_testroot
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	$(MAKE) -C $(BUILDDIR) DESTDIR=$(CURDIR)/debian/tmp install
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -i
+	dh_installdocs -i
+	dh_install --sourcedir=debian/tmp -i
+	dh_icons -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i $(FORCEVERSION)
+	dh_md5sums -i
+	dh_builddeb --destdir=$(PKGDESTDIR) -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_install --sourcedir=debian/tmp -a
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installman -a
+	dh_link -a
+	dh_icons -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a $(FORCEVERSION)
+	dh_md5sums -a
+	dh_builddeb -a --destdir=$(PKGDESTDIR) -- -Zbzip2
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

HandBrake-0.9.9.tar.bz2/pkg/linux/module.rules -> HandBrake-0.10.0.tar.bz2/pkg/linux/module.rules Changed

@@ -28,7 +28,8 @@
 #	tar c --exclude build ../* | tar x -C $(STAGE.out.rpm.src/)$(PKG.basename)
 	-$(RM.exe) -rf $(STAGE.out.src/)
 	make contrib.fetch
-	svn co -r$(HB.repo.rev) $(HB.repo.url) $@/$(PKG.basename)
+	svn export -r$(HB.repo.rev) $(HB.repo.url) $@/$(PKG.basename)
+	svn info $(HB.repo.url)@$(HB.repo.rev) > $@/$(PKG.basename)/version.txt
 	-$(MKDIR.exe) $(STAGE.out.rpm.src/)$(PKG.basename)/download
 	$(CP.exe) $(SRC/)download/*.tar.* $(STAGE.out.rpm.src/)$(PKG.basename)/download
 
@@ -76,59 +77,35 @@
 # Debian source package rules
 #
 pkg.push.src.deb:: $(PKG.src.deb.stamp)
-	(cd $(STAGE.out.src/)raring && dput handbrake-snapshots handbrake_$(HB.version)ppa1~raring1_source.changes )
-	(cd $(STAGE.out.src/)quantal && dput handbrake-snapshots handbrake_$(HB.version)ppa1~quantal1_source.changes )
-	(cd $(STAGE.out.src/)precise && dput handbrake-snapshots handbrake_$(HB.version)ppa1~precise1_source.changes )
-	(cd $(STAGE.out.src/)oneiric && dput handbrake-snapshots handbrake_$(HB.version)ppa1~oneiric1_source.changes )
+	(cd $(STAGE.out.src/)utopic && dput handbrake-snapshots handbrake_$(HB.version)ppa1~utopic1_source.changes )
+	(cd $(STAGE.out.src/)trusty && dput handbrake-snapshots handbrake_$(HB.version)ppa1~trusty1_source.changes )
 
 $(PKG.src.deb.stamp): GNUmakefile
 	-$(RM.exe) -rf $(STAGE.out.src/)
 	make contrib.fetch
-	svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)raring/$(PKG.deb.basename)
-	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)raring/$(PKG.deb.basename)
-	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)raring/$(PKG.deb.basename)
-	$(CP.exe) $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/control.raring $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/control
-	$(CP.exe) $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/rules.raring $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/rules
-	echo "handbrake ($(HB.version)ppa1~raring1) raring; urgency=low" > $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/changelog
-	echo " * Snapshot" >> $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/changelog
-	echo " - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/changelog
-	echo "" >> $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/changelog
-	echo " -- John Stebbins <jstebbins.hb@gmail.com> Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)raring/$(PKG.deb.basename)/debian/changelog
-	$(TAR.exe) czf $(STAGE.out.src/)raring/$(PKG.src.deb.tar) -C $(STAGE.out.src/)raring $(PKG.deb.basename)
-	(cd $(STAGE.out.src/)raring/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
-	svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)quantal/$(PKG.deb.basename)
-	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)quantal/$(PKG.deb.basename)
-	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)quantal/$(PKG.deb.basename)
-	$(CP.exe) $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/control.quantal $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/control
-	$(CP.exe) $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/rules.quantal $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/rules
-	echo "handbrake ($(HB.version)ppa1~quantal1) quantal; urgency=low" > $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/changelog
-	echo " * Snapshot" >> $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/changelog
-	echo " - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/changelog
-	echo "" >> $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/changelog
-	echo " -- John Stebbins <jstebbins.hb@gmail.com> Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)quantal/$(PKG.deb.basename)/debian/changelog
-	$(TAR.exe) czf $(STAGE.out.src/)quantal/$(PKG.src.deb.tar) -C $(STAGE.out.src/)quantal $(PKG.deb.basename)
-	(cd $(STAGE.out.src/)quantal/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
-	svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)precise/$(PKG.deb.basename)
-	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)precise/$(PKG.deb.basename)
-	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)precise/$(PKG.deb.basename)
-	$(CP.exe) $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/control.precise $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/control
-	$(CP.exe) $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/rules.precise $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/rules
-	echo "handbrake ($(HB.version)ppa1~precise1) precise; urgency=low" > $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/changelog
-	echo " * Snapshot" >> $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/changelog
-	echo " - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/changelog
-	echo "" >> $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/changelog
-	echo " -- John Stebbins <jstebbins.hb@gmail.com> Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)precise/$(PKG.deb.basename)/debian/changelog
-	$(TAR.exe) czf $(STAGE.out.src/)precise/$(PKG.src.deb.tar) -C $(STAGE.out.src/)precise $(PKG.deb.basename)
-	(cd $(STAGE.out.src/)precise/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
-	svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)oneiric/$(PKG.deb.basename)
-	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)oneiric/$(PKG.deb.basename)
-	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)oneiric/$(PKG.deb.basename)
-	$(CP.exe) $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/control.oneiric $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/control
-	$(CP.exe) $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/rules.oneiric $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/rules
-	echo "handbrake ($(HB.version)ppa1~oneiric1) oneiric; urgency=low" > $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/changelog
-	echo " * Snapshot" >> $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/changelog
-	echo " - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/changelog
-	echo "" >> $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/changelog
-	echo " -- John Stebbins <jstebbins.hb@gmail.com> Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)oneiric/$(PKG.deb.basename)/debian/changelog
-	$(TAR.exe) czf $(STAGE.out.src/)oneiric/$(PKG.src.deb.tar) -C $(STAGE.out.src/)oneiric $(PKG.deb.basename)
-	(cd $(STAGE.out.src/)oneiric/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
+	svn export -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)utopic/$(PKG.deb.basename)
+	svn info $(HB.repo.url)@$(HB.repo.rev) > $(STAGE.out.src/)utopic/$(PKG.deb.basename)/version.txt
+	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)utopic/$(PKG.deb.basename)
+	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)utopic/$(PKG.deb.basename)
+	$(CP.exe) $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/control.utopic $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/control
+	$(CP.exe) $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/rules.utopic $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/rules
+	echo "handbrake ($(HB.version)ppa1~utopic1) utopic; urgency=low" > $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/changelog
+	echo " * Snapshot" >> $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/changelog
+	echo " - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/changelog
+	echo "" >> $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/changelog
+	echo " -- John Stebbins <jstebbins.hb@gmail.com> Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/changelog
+	$(TAR.exe) czf $(STAGE.out.src/)utopic/$(PKG.src.deb.tar) -C $(STAGE.out.src/)utopic $(PKG.deb.basename)
+	(cd $(STAGE.out.src/)utopic/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
+	svn export -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)trusty/$(PKG.deb.basename)
+	svn info $(HB.repo.url)@$(HB.repo.rev) > $(STAGE.out.src/)trusty/$(PKG.deb.basename)/version.txt
+	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)trusty/$(PKG.deb.basename)
+	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)trusty/$(PKG.deb.basename)
+	$(CP.exe) $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/control.trusty $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/control
+	$(CP.exe) $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/rules.trusty $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/rules
+	echo "handbrake ($(HB.version)ppa1~trusty1) trusty; urgency=low" > $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
+	echo " * Snapshot" >> $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
+	echo " - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
+	echo "" >> $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
+	echo " -- John Stebbins <jstebbins.hb@gmail.com> Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
+	$(TAR.exe) czf $(STAGE.out.src/)trusty/$(PKG.src.deb.tar) -C $(STAGE.out.src/)trusty $(PKG.deb.basename)
+	(cd $(STAGE.out.src/)trusty/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)

HandBrake-0.9.9.tar.bz2/pkg/module.rules -> HandBrake-0.10.0.tar.bz2/pkg/module.rules Changed

HandBrake-0.9.9.tar.bz2/scripts/manicure.rb -> HandBrake-0.10.0.tar.bz2/scripts/manicure.rb Changed

@@ -273,23 +273,23 @@
 
 #Filename suffix
 case hash["FileFormat"]
- when /MP4/
+ when /MPEG-4/, /MP4/
 commandString << "mp4 "
- when /MKV/
+ when /Matroska/, /MKV/
 commandString << "mkv "
 end
 
 #Video encoder
- if hash["VideoEncoder"] != "MPEG-4 (FFmpeg)"
- commandString << " -e "
- case hash["VideoEncoder"]
- when /x264/
- commandString << "x264"
- when /Theora/
- commandString << "theora"
- when /MPEG/
- commandString << "ffmpeg2"
- end
+ commandString << " -e "
+ case hash["VideoEncoder"]
+ when /x264/
+ commandString << "x264"
+ when /Theora/
+ commandString << "theora"
+ when /MPEG-4/
+ commandString << "ffmpeg4"
+ when /MPEG-2/
+ commandString << "ffmpeg2"
 end
 
 #VideoRateControl
@@ -342,23 +342,21 @@
 when /AC3 Pass/
 audioEncoders << "copy:ac3"
 when /AC3/
- audioEncoders << "ffac3"
+ audioEncoders << "ac3"
 when /DTS Pass/
 audioEncoders << "copy:dts"
 when /DTS-HD Pass/
 audioEncoders << "copy:dtshd"
 when /AAC Pass/
 audioEncoders << "copy:aac"
+ when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
+ audioEncoders << "av_aac"
 when "AAC (FDK)"
 audioEncoders << "fdk_aac"
- when "AAC (faac)"
- audioEncoders << "faac"
- when "AAC (ffmpeg)"
- audioEncoders << "ffaac"
- when "AAC (CoreAudio)"
- audioEncoders << "ca_aac"
 when "HE-AAC (FDK)"
 audioEncoders << "fdk_haac"
+ when "AAC (CoreAudio)"
+ audioEncoders << "ca_aac"
 when "HE-AAC (CoreAudio)"
 audioEncoders << "ca_haac"
 when /Vorbis/
@@ -366,17 +364,21 @@
 when /MP3 Pass/
 audioEncoders << "copy:mp3"
 when /MP3/
- audioEncoders << "lame"
- when "FLAC (ffmpeg)"
- audioEncoders << "ffflac"
- when "FLAC (24-bit)"
- audioEncoders << "ffflac24"
+ audioEncoders << "mp3"
+ when "FLAC (ffmpeg)", "FLAC 16-bit"
+ audioEncoders << "flac16"
+ when "FLAC (24-bit)", "FLAC 24-bit"
+ audioEncoders << "flac24"
 when /Auto Pass/
 audioEncoders << "copy"
 end
 
 #Mixdowns
 case audioTrack["AudioMixdown"]
+ when "Mono (Left Only)"
+ audioMixdowns << "left_only"
+ when "Mono (Right Only)"
+ audioMixdowns << "right_only"
 when /Mono/
 audioMixdowns << "mono"
 when /Stereo/
@@ -385,10 +387,16 @@
 audioMixdowns << "dpl1"
 when /Dolby Pro Logic II/
 audioMixdowns << "dpl2"
- when /discrete/
- audioMixdowns << "6ch"
+ when /5.1/, /discrete/
+ audioMixdowns << "5point1"
+ when /6.1/
+ audioMixdowns << "6point1"
+ when "7.1 (5F/2R/LFE)"
+ audioMixdowns << "5_2_lfe"
+ when /7.1/
+ audioMixdowns << "7point1"
 when /None/
- audioMixdowns << "auto"
+ audioMixdowns << "none"
 end
 
 #Samplerates
@@ -457,17 +465,25 @@
 
 case hash["AudioEncoderFallback"]
 when /AC3/
- audioEncoderFallback << "ffac3"
- when "AAC (ffmpeg)"
- audioEncoderFallback << "ffaac"
- when /AAC/
- audioEncoderFallback << "faac"
+ audioEncoderFallback << "ac3"
+ when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
+ audioEncoderFallback << "av_aac"
+ when "AAC (FDK)"
+ audioEncoderFallback << "fdk_aac"
+ when "HE-AAC (FDK)"
+ audioEncoderFallback << "fdk_haac"
+ when "AAC (CoreAudio)"
+ audioEncoderFallback << "ca_aac"
+ when "HE-AAC (CoreAudio)"
+ audioEncoderFallback << "ca_haac"
 when /Vorbis/
 audioEncoderFallback << "vorbis"
 when /MP3/
- audioEncoderFallback << "lame"
- when /FLAC/
- audioEncoderFallback << "ffflac"
+ audioEncoderFallback << "mp3"
+ when "FLAC (ffmpeg)", "FLAC 16-bit"
+ audioEncoderFallback << "flac16"
+ when "FLAC (24-bit)", "FLAC 24-bit"
+ audioEncoderFallback << "flac24"
 end
 
 if audioEncoderFallback.size > 0
@@ -477,8 +493,12 @@
 #Container
 commandString << " -f "
 case hash["FileFormat"]
+ when "MPEG-4 (mp4v2)"
+ commandString << "mp4v2"
 when /MP4/
 commandString << "mp4"
+ when "Matroska (libmkv)"
+ commandString << "libmkv"
 when /MKV/
 commandString << "mkv"
 end
@@ -664,16 +684,16 @@
 commandString << '+ ' << hash["PresetName"] << ":"
 
 #Video encoder
- if hash["VideoEncoder"] != "MPEG-4 (FFmpeg)"
- commandString << " -e "
- case hash["VideoEncoder"]
- when /x264/
- commandString << "x264"
- when /Theora/
- commandString << "theora"
- when /MPEG/
- commandString << "ffmpeg2"
- end
+ commandString << " -e "
+ case hash["VideoEncoder"]
+ when /x264/
+ commandString << "x264"
+ when /Theora/
+ commandString << "theora"
+ when /MPEG-4/
+ commandString << "ffmpeg4"
+ when /MPEG-2/
+ commandString << "ffmpeg2"
 end
 
 #VideoRateControl
@@ -726,23 +746,21 @@
 when /AC3 Pass/
 audioEncoders << "copy:ac3"
 when /AC3/
- audioEncoders << "ffac3"
+ audioEncoders << "ac3"
 when /DTS Pass/
 audioEncoders << "copy:dts"
 when /DTS-HD Pass/
 audioEncoders << "copy:dtshd"
 when /AAC Pass/
 audioEncoders << "copy:aac"
+ when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
+ audioEncoders << "av_aac"
 when "AAC (FDK)"
 audioEncoders << "fdk_aac"
- when "AAC (faac)"
- audioEncoders << "faac"
- when "AAC (ffmpeg)"
- audioEncoders << "ffaac"
- when "AAC (CoreAudio)"
- audioEncoders << "ca_aac"
 when "HE-AAC (FDK)"
 audioEncoders << "fdk_haac"
+ when "AAC (CoreAudio)"
+ audioEncoders << "ca_aac"
 when "HE-AAC (CoreAudio)"
 audioEncoders << "ca_haac"
 when /Vorbis/
@@ -750,17 +768,21 @@
 when /MP3 Pass/
 audioEncoders << "copy:mp3"
 when /MP3/
- audioEncoders << "lame"
- when "FLAC (ffmpeg)"
- audioEncoders << "ffflac"
- when "FLAC (24-bit)"
- audioEncoders << "ffflac24"
+ audioEncoders << "mp3"
+ when "FLAC (ffmpeg)", "FLAC 16-bit"
+ audioEncoders << "flac16"
+ when "FLAC (24-bit)", "FLAC 24-bit"
+ audioEncoders << "flac24"
 when /Auto Pass/
 audioEncoders << "copy"
 end
 
 #Mixdowns
 case audioTrack["AudioMixdown"]
+ when "Mono (Left Only)"
+ audioMixdowns << "left_only"
+ when "Mono (Right Only)"
+ audioMixdowns << "right_only"
 when /Mono/
 audioMixdowns << "mono"
 when /Stereo/
@@ -769,10 +791,16 @@
 audioMixdowns << "dpl1"
 when /Dolby Pro Logic II/
 audioMixdowns << "dpl2"
- when /discrete/
- audioMixdowns << "6ch"
+ when /5.1/, /discrete/
+ audioMixdowns << "5point1"
+ when /6.1/
+ audioMixdowns << "6point1"
+ when "7.1 (5F/2R/LFE)"
+ audioMixdowns << "5_2_lfe"
+ when /7.1/
+ audioMixdowns << "7point1"
 when /None/
- audioMixdowns << "auto"
+ audioMixdowns << "none"
 end
 
 #Samplerates
@@ -841,17 +869,25 @@
 
 case hash["AudioEncoderFallback"]
 when /AC3/
- audioEncoderFallback << "ffac3"
- when "AAC (ffmpeg)"
- audioEncoderFallback << "ffaac"
- when /AAC/
- audioEncoderFallback << "faac"
+ audioEncoderFallback << "ac3"
+ when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
+ audioEncoderFallback << "av_aac"
+ when "AAC (FDK)"
+ audioEncoderFallback << "fdk_aac"
+ when "HE-AAC (FDK)"
+ audioEncoderFallback << "fdk_haac"
+ when "AAC (CoreAudio)"
+ audioEncoderFallback << "ca_aac"
+ when "HE-AAC (CoreAudio)"
+ audioEncoderFallback << "ca_haac"
 when /Vorbis/
 audioEncoderFallback << "vorbis"
 when /MP3/
- audioEncoderFallback << "lame"
- when /FLAC/
- audioEncoderFallback << "ffflac"
+ audioEncoderFallback << "mp3"
+ when "FLAC (ffmpeg)", "FLAC 16-bit"
+ audioEncoderFallback << "flac16"
+ when "FLAC (24-bit)", "FLAC 24-bit"
+ audioEncoderFallback << "flac24"
 end
 
 if audioEncoderFallback.size > 0
@@ -861,8 +897,12 @@
 #Container
 commandString << " -f "
 case hash["FileFormat"]
+ when "MPEG-4 (mp4v2)"
+ commandString << "mp4v2"
 when /MP4/
 commandString << "mp4"
+ when "Matroska (libmkv)"
+ commandString << "libmkv"
 when /MKV/
 commandString << "mkv"
 end
@@ -1020,13 +1060,17 @@
 
 commandString = "if (!strcasecmp(preset_name, \"" << hash["PresetName"] << "\"))\n{\n "
 
- #Filename suffix
+ #Container
 commandString << "if( !mux )\n "
 commandString << "{\n "
 
 case hash["FileFormat"]
+ when "MPEG-4 (mp4v2)"
+ commandString << " mux = " << "HB_MUX_MP4V2;\n "
 when /MP4/
 commandString << " mux = " << "HB_MUX_MP4;\n "
+ when "Matroska (libmkv)"
+ commandString << " mux = " << "HB_MUX_LIBMKV;\n "
 when /MKV/
 commandString << " mux = " << "HB_MUX_MKV;\n "
 end
@@ -1048,16 +1092,16 @@
 end
 
 #Video encoder
- if hash["VideoEncoder"] != "MPEG-4 (FFmpeg)"
- commandString << "vcodec = "
- case hash["VideoEncoder"]
- when /x264/
- commandString << "HB_VCODEC_X264;\n "
- when /Theora/
- commandString << "HB_VCODEC_THEORA;\n " 
- when /MPEG/
- commandString << "HB_VCODEC_FFMPEG_MPEG2;\n "
- end
+ commandString << "vcodec = "
+ case hash["VideoEncoder"]
+ when /x264/
+ commandString << "HB_VCODEC_X264;\n "
+ when /Theora/
+ commandString << "HB_VCODEC_THEORA;\n "
+ when /MPEG-4/
+ commandString << "HB_VCODEC_FFMPEG_MPEG4;\n "
+ when /MPEG-2/
+ commandString << "HB_VCODEC_FFMPEG_MPEG2;\n "
 end
 
 #VideoRateControl
@@ -1073,23 +1117,23 @@
 #FPS
 if hash["VideoFramerate"] != "Same as source"
 if hash["VideoFramerate"] == "23.976 (NTSC Film)"
- commandString << "job->vrate_base = " << "1126125;\n "
+ commandString << "filter_vrate_base = " << "1126125;\n "
 elsif hash["VideoFramerate"] == "29.97 (NTSC Video)"
- commandString << "job->vrate_base = " << "900900;\n "
+ commandString << "filter_vrate_base = " << "900900;\n "
 elsif hash["VideoFramerate"] == "25 (PAL Film/Video)"
- commandString << "job->vrate_base = " << "1080000;\n "
+ commandString << "filter_vrate_base = " << "1080000;\n "
 else
- commandString << "job->vrate_base = " << (27000000 / hash["VideoFramerate"].to_i).to_s << ";\n "
+ commandString << "filter_vrate_base = " << (27000000 / hash["VideoFramerate"].to_i).to_s << ";\n "
 end
 # not same as source: pfr, else default (cfr)
 if hash["VideoFramerateMode"] == "pfr"
- commandString << "job->cfr = 2;\n "
+ commandString << "filter_cfr = 2;\n "
 else
- commandString << "job->cfr = 1;\n "
+ commandString << "filter_cfr = 1;\n "
 end
 # same as source: cfr, else default (vfr)
 elsif hash["VideoFramerateMode"] == "cfr"
- commandString << "job->cfr = 1;\n "
+ commandString << "filter_cfr = 1;\n "
 end
 
 #Audio tracks
@@ -1112,23 +1156,21 @@
 when /AC3 Pass/
 audioEncoders << "copy:ac3"
 when /AC3/
- audioEncoders << "ffac3"
+ audioEncoders << "ac3"
 when /DTS Pass/
 audioEncoders << "copy:dts"
 when /DTS-HD Pass/
 audioEncoders << "copy:dtshd"
 when /AAC Pass/
 audioEncoders << "copy:aac"
+ when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
+ audioEncoders << "av_aac"
 when "AAC (FDK)"
 audioEncoders << "fdk_aac"
- when "AAC (faac)"
- audioEncoders << "faac"
- when "AAC (ffmpeg)"
- audioEncoders << "ffaac"
- when "AAC (CoreAudio)"
- audioEncoders << "ca_aac"
 when "HE-AAC (FDK)"
 audioEncoders << "fdk_haac"
+ when "AAC (CoreAudio)"
+ audioEncoders << "ca_aac"
 when "HE-AAC (CoreAudio)"
 audioEncoders << "ca_haac"
 when /Vorbis/
@@ -1136,17 +1178,21 @@
 when /MP3 Pass/
 audioEncoders << "copy:mp3"
 when /MP3/
- audioEncoders << "lame"
- when "FLAC (ffmpeg)"
- audioEncoders << "ffflac"
- when "FLAC (24-bit)"
- audioEncoders << "ffflac24"
+ audioEncoders << "mp3"
+ when "FLAC (ffmpeg)", "FLAC 16-bit"
+ audioEncoders << "flac16"
+ when "FLAC (24-bit)", "FLAC 24-bit"
+ audioEncoders << "flac24"
 when /Auto Pass/
 audioEncoders << "copy"
 end
 
 #Mixdowns
 case audioTrack["AudioMixdown"]
+ when "Mono (Left Only)"
+ audioMixdowns << "left_only"
+ when "Mono (Right Only)"
+ audioMixdowns << "right_only"
 when /Mono/
 audioMixdowns << "mono"
 when /Stereo/
@@ -1155,10 +1201,16 @@
 audioMixdowns << "dpl1"
 when /Dolby Pro Logic II/
 audioMixdowns << "dpl2"
- when /discrete/
- audioMixdowns << "6ch"
+ when /5.1/, /discrete/
+ audioMixdowns << "5point1"
+ when /6.1/
+ audioMixdowns << "6point1"
+ when "7.1 (5F/2R/LFE)"
+ audioMixdowns << "5_2_lfe"
+ when /7.1/
+ audioMixdowns << "7point1"
 when /None/
- audioMixdowns << "auto"
+ audioMixdowns << "none"
 end
 
 #Samplerates
@@ -1245,27 +1297,25 @@
 
 case hash["AudioEncoderFallback"]
 when /AC3/
- audioEncoderFallback << "ffac3"
+ audioEncoderFallback << "ac3"
+ when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
+ audioEncoderFallback << "av_aac"
 when "AAC (FDK)"
 audioEncoderFallback << "fdk_aac"
- when "AAC (faac)"
- audioEncoderFallback << "faac"
- when "AAC (ffmpeg)"
- audioEncoderFallback << "ffaac"
- when "AAC (CoreAudio)"
- audioEncoderFallback << "ca_aac"
 when "HE-AAC (FDK)"
 audioEncoderFallback << "fdk_haac"
+ when "AAC (CoreAudio)"
+ audioEncoderFallback << "ca_aac"
 when "HE-AAC (CoreAudio)"
 audioEncoderFallback << "ca_haac"
 when /Vorbis/
 audioEncoderFallback << "vorbis"
 when /MP3/
- audioEncoderFallback << "lame"
- when "FLAC (ffmpeg)"
- audioEncoderFallback << "ffflac"
- when "FLAC (24-bit)"
- audioEncoderFallback << "ffflac24"
+ audioEncoderFallback << "mp3"
+ when "FLAC (ffmpeg)", "FLAC 16-bit"
+ audioEncoderFallback << "flac16"
+ when "FLAC (24-bit)", "FLAC 24-bit"
+ audioEncoderFallback << "flac24"
 end
 
 if audioEncoderFallback.size > 0
@@ -1377,11 +1427,11 @@
 when 1
 commandString << "denoise_opt = \"" << hash["PictureDenoiseCustom"].to_s << "\";\n "
 when 2
- commandString << "denoise_opt = \"2:1:2:3\";\n "
+ commandString << "denoise_opt = \"2:1:1:2:3:3\";\n "
 when 3
- commandString << "denoise_opt = \"3:2:2:3\";\n "
+ commandString << "denoise_opt = \"3:2:2:2:3:3\";\n "
 when 4
- commandString << "denoise_opt = \"7:7:5:5\";\n "
+ commandString << "denoise_opt = \"7:7:7:5:5:5\";\n "
 end
 
 if hash["PictureDecomb"].to_i != 0
@@ -1496,16 +1546,16 @@
 commandString << "+ " << hash["PresetName"] << ": "
 
 #Video encoder
- if hash["VideoEncoder"] != "MPEG-4 (FFmpeg)"
- commandString << " -e "
- case hash["VideoEncoder"]
- when /x264/
- commandString << "x264 "
- when /Theora/
- commandString << "theora "
- when /MPEG/
- commandString << "ffmpeg2 "
- end
+ commandString << " -e "
+ case hash["VideoEncoder"]
+ when /x264/
+ commandString << "x264 "
+ when /Theora/
+ commandString << "theora "
+ when /MPEG-4/
+ commandString << "ffmpeg4 "
+ when /MPEG-2/
+ commandString << "ffmpeg2 "
 end
 
 #VideoRateControl
@@ -1558,23 +1608,21 @@
 when /AC3 Pass/
 audioEncoders << "copy:ac3"
 when /AC3/
- audioEncoders << "ffac3"
+ audioEncoders << "ac3"
 when /DTS Pass/
 audioEncoders << "copy:dts"
 when /DTS-HD Pass/
 audioEncoders << "copy:dtshd"
 when /AAC Pass/
 audioEncoders << "copy:aac"
+ when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
+ audioEncoders << "av_aac"
 when "AAC (FDK)"
 audioEncoders << "fdk_aac"
- when "AAC (faac)"
- audioEncoders << "faac"
- when "AAC (ffmpeg)"
- audioEncoders << "ffaac"
- when "AAC (CoreAudio)"
- audioEncoders << "ca_aac"
 when "HE-AAC (FDK)"
 audioEncoders << "fdk_haac"
+ when "AAC (CoreAudio)"
+ audioEncoders << "ca_aac"
 when "HE-AAC (CoreAudio)"
 audioEncoders << "ca_haac"
 when /Vorbis/
@@ -1582,17 +1630,21 @@
 when /MP3 Pass/
 audioEncoders << "copy:mp3"
 when /MP3/
- audioEncoders << "lame"
- when "FLAC (ffmpeg)"
- audioEncoders << "ffflac"
- when "FLAC (24-bit)"
- audioEncoders << "ffflac24"
+ audioEncoders << "mp3"
+ when "FLAC (ffmpeg)", "FLAC 16-bit"
+ audioEncoders << "flac16"
+ when "FLAC (24-bit)", "FLAC 24-bit"
+ audioEncoders << "flac24"
 when /Auto Pass/
 audioEncoders << "copy"
 end
 
 #Mixdowns
 case audioTrack["AudioMixdown"]
+ when "Mono (Left Only)"
+ audioMixdowns << "left_only"
+ when "Mono (Right Only)"
+ audioMixdowns << "right_only"
 when /Mono/
 audioMixdowns << "mono"
 when /Stereo/
@@ -1601,10 +1653,16 @@
 audioMixdowns << "dpl1"
 when /Dolby Pro Logic II/
 audioMixdowns << "dpl2"
- when /discrete/
- audioMixdowns << "6ch"
+ when /5.1/, /discrete/
+ audioMixdowns << "5point1"
+ when /6.1/
+ audioMixdowns << "6point1"
+ when "7.1 (5F/2R/LFE)"
+ audioMixdowns << "5_2_lfe"
+ when /7.1/
+ audioMixdowns << "7point1"
 when /None/
- audioMixdowns << "auto"
+ audioMixdowns << "none"
 end
 
 #Samplerates
@@ -1673,17 +1731,25 @@
 
 case hash["AudioEncoderFallback"]
 when /AC3/
- audioEncoderFallback << "ffac3"
- when "AAC (ffmpeg)"
- audioEncoderFallback << "ffaac"
- when /AAC/
- audioEncoderFallback << "faac"
+ audioEncoderFallback << "ac3"
+ when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
+ audioEncoderFallback << "av_aac"
+ when "AAC (FDK)"
+ audioEncoderFallback << "fdk_aac"
+ when "HE-AAC (FDK)"
+ audioEncoderFallback << "fdk_haac"
+ when "AAC (CoreAudio)"
+ audioEncoderFallback << "ca_aac"
+ when "HE-AAC (CoreAudio)"
+ audioEncoderFallback << "ca_haac"
 when /Vorbis/
 audioEncoderFallback << "vorbis"
 when /MP3/
- audioEncoderFallback << "lame"
- when /FLAC/
- audioEncoderFallback << "ffflac"
+ audioEncoderFallback << "mp3"
+ when "FLAC (ffmpeg)", "FLAC 16-bit"
+ audioEncoderFallback << "flac16"
+ when "FLAC (24-bit)", "FLAC 24-bit"
+ audioEncoderFallback << "flac24"
 end
 
 if audioEncoderFallback.size > 0
@@ -1693,8 +1759,12 @@
 #Container
 commandString << " -f "
 case hash["FileFormat"]
+ when "MPEG-4 (mp4v2)"
+ commandString << "mp4v2"
 when /MP4/
 commandString << "mp4"
+ when "Matroska (libmkv)"
+ commandString << "libmkv"
 when /MKV/
 commandString << "mkv"
 end
@@ -1852,17 +1922,22 @@
 
 end
 
-# First grab the specified CLI options
-options = readOptions
-
-# Only run if one of the useful CLI flags have been passed
-if options.cliraw == true || options.cliparse == true || options.api == true || options.apilist == true
- # This line is the ignition -- generates hashes of
- # presets and then displays them to the screen
- # with the options the user selects on the CLI. 
- Display.new( Presets.new.hashMasterList, options )
-else
- # Direct the user to the help
- puts "\n\tUsage: manicure.rb [options]"
- puts "\tSee help with -h or --help"
+# CLI invocation only
+if __FILE__ == $0
+
+ # First grab the specified CLI options
+ options = readOptions
+
+ # Only run if one of the useful CLI flags have been passed
+ if options.cliraw == true || options.cliparse == true || options.api == true || options.apilist == true
+ # This line is the ignition -- generates hashes of
+ # presets and then displays them to the screen
+ # with the options the user selects on the CLI. 
+ Display.new( Presets.new.hashMasterList, options )
+ else
+ # Direct the user to the help
+ puts "\n\tUsage: manicure.rb [options]"
+ puts "\tSee help with -h or --help"
+ end
+
 end

HandBrake-0.9.9.tar.bz2/test/module.defs -> HandBrake-0.10.0.tar.bz2/test/module.defs Changed

@@ -14,15 +14,21 @@
 TEST.libs = $(LIBHB.a)
 
 TEST.GCC.l = \
-        a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \
-        fontconfig freetype fribidi mkv mpeg2 mp3lame mp4v2 ogg \
-        samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \
-        bluray xml2 bz2 z
+        ass avcodec avformat avutil avresample dvdnav dvdread \
+        fontconfig fribidi mp3lame ogg \
+        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 \
+        bluray freetype xml2 bz2 z
 
-ifeq (1,$(FEATURE.fdk_aac))
-TEST.GCC.l += fdk-aac
+ifeq (1,$(FEATURE.qsv))
+    TEST.GCC.D += USE_QSV HAVE_THREADS=1
 endif
 
+ifeq (1,$(FEATURE.x265))
+    TEST.GCC.D += USE_X265
+endif
+
+TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))
+
 TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
 
 ###############################################################################
@@ -42,13 +48,19 @@
     TEST.GCC.l += iconv
 else ifeq ($(BUILD.system),linux)
     TEST.GCC.l += pthread dl m
+else ifeq ($(BUILD.system),kfreebsd)
+    TEST.GCC.l += pthread dl m
 else ifeq ($(BUILD.system),solaris)
     TEST.GCC.l += pthread nsl socket iconv
+    TEST.GCC.D += _POSIX_C_SOURCE=200112L __EXTENSIONS__
 else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
 ifeq ($(HAS.dlfcn),1)
     TEST.GCC.l += dl
 endif
-    TEST.GCC.l += pthreadGC2 iconv ws2_32
-    TEST.GCC.D += PTW32_STATIC_LIB
-	TEST.GCC.args.extra.exe++ += -static
+ifeq (1,$(FEATURE.hwd))
+    TEST.GCC.D += USE_HWD
 endif
+    TEST.GCC.l += pthreadGC2 iconv ws2_32 regex
+    TEST.GCC.D += PTW32_STATIC_LIB
+    TEST.GCC.args.extra.exe++ += -static
+endif #   (1-mingw,$(BUILD.cross)-$(BUILD.system))

HandBrake-0.9.9.tar.bz2/test/parsecsv.c -> HandBrake-0.10.0.tar.bz2/test/parsecsv.c Changed

HandBrake-0.9.9.tar.bz2/test/parsecsv.h -> HandBrake-0.10.0.tar.bz2/test/parsecsv.h Changed

HandBrake-0.9.9.tar.bz2/test/test.c -> HandBrake-0.10.0.tar.bz2/test/test.c Changed

@@ -1,12 +1,14 @@
 /* test.c
 
- Copyright (c) 2003-2013 HandBrake Team
+ Copyright (c) 2003-2014 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
 For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
 */
 
+#include <stdio.h>
+#include <stdlib.h>
 #include <signal.h>
 #include <getopt.h>
 #include <sys/time.h>
@@ -15,6 +17,7 @@
 #include <inttypes.h>
 
 #if defined( __MINGW32__ )
+#include <windows.h>
 #include <conio.h>
 #endif
 
@@ -25,6 +28,11 @@
 #include "hb.h"
 #include "lang.h"
 #include "parsecsv.h"
+#include "openclwrapper.h"
+
+#ifdef USE_QSV
+#include "qsv_common.h"
+#endif
 
 #if defined( __APPLE_CC__ )
 #import <CoreServices/CoreServices.h>
@@ -52,6 +60,9 @@
 static char * deblock_opt = 0;
 static int denoise = 0;
 static char * denoise_opt = 0;
+static int nlmeans = 0;
+static char * nlmeans_opt = NULL;
+static char * nlmeans_tune_opt = NULL;
 static int detelecine = 0;
 static char * detelecine_opt = 0;
 static int decomb = 0;
@@ -88,6 +99,7 @@
 static char ** srtoffset = NULL;
 static char ** srtlang = NULL;
 static int srtdefault = -1;
+static int srtburn = -1;
 static int subtitle_scan = 0;
 static int width = 0;
 static int height = 0;
@@ -132,8 +144,15 @@
 static int64_t stop_at_pts = 0;
 static int stop_at_frame = 0;
 static uint64_t min_title_duration = 10;
+static int use_opencl = 0;
+static int use_hwd = 0;
+#ifdef USE_QSV
+static int qsv_async_depth = -1;
+static int qsv_decode = 1;
+#endif
 
 /* Exit cleanly on Ctrl-C */
+static volatile hb_error_code done_error = HB_ERROR_NONE;
 static volatile int die = 0;
 static void SigHandler( int );
 
@@ -153,14 +172,11 @@
 static int CheckOptions( int argc, char ** argv );
 static int HandleEvents( hb_handle_t * h );
 
-static int get_dither_for_string(const char *dither);
-static int get_acodec_for_string(const char *codec);
-static const char* get_string_for_acodec(int acodec);
-
-static int is_sample_rate_valid(int rate);
 static void str_vfree( char **strv );
 static char** str_split( char *str, char delem );
 
+static void print_string_list(FILE *out, const char* const *list, const char *prefix);
+
 #ifdef __APPLE_CC__
 static char* bsd_name_for_path(char *path);
 static int device_is_dvd(char *device);
@@ -183,22 +199,61 @@
 fprintf( stderr, "ERROR: %s\n", errmsg );
 }
 
+static int get_argv_utf8(int *argc_ptr, char ***argv_ptr)
+{
+#if defined( __MINGW32__ )
+ int ret = 0;
+ int argc;
+ char **argv;
+
+ wchar_t **argv_utf16 = CommandLineToArgvW(GetCommandLineW(), &argc);
+ if (argv_utf16)
+ {
+ int i;
+ int offset = (argc+1) * sizeof(char*);
+ int size = offset;
+
+ for(i = 0; i < argc; i++)
+ size += WideCharToMultiByte(CP_UTF8, 0, argv_utf16[i], -1, NULL, 0, NULL, NULL );
+
+ argv = malloc(size);
+ if (argv)
+ {
+ for (i = 0; i < argc; i++)
+ {
+ argv[i] = (char*)argv + offset;
+ offset += WideCharToMultiByte(CP_UTF8, 0, argv_utf16[i], -1, argv[i], size-offset, NULL, NULL);
+ }
+ argv[argc] = NULL;
+ ret = 1;
+ }
+ LocalFree(argv_utf16);
+ }
+ if (ret)
+ {
+ *argc_ptr = argc;
+ *argv_ptr = argv;
+ }
+ return ret;
+#else
+ // On other systems, assume command line is already utf8
+ return 1;
+#endif
+}
+
 int main( int argc, char ** argv )
 {
 hb_handle_t * h;
 int build;
 char * version;
 
-/* win32 _IOLBF (line-buffering) is the same as _IOFBF (full-buffering).
- * force it to unbuffered otherwise informative output is not easily parsed.
- */
-#if defined( _WIN32 ) || defined( __MINGW32__ )
- setvbuf( stdout, NULL, _IONBF, 0 );
- setvbuf( stderr, NULL, _IONBF, 0 );
-#endif
+ hb_global_init();
 
 audios = hb_list_init();
 
+ // Get utf8 command line if windows
+ get_argv_utf8(&argc, &argv);
+
 /* Parse command line */
 if( ParseOptions( argc, argv ) ||
 CheckOptions( argc, argv ) )
@@ -253,9 +308,10 @@
 titleindex = 0;
 }
 
+
 hb_system_sleep_prevent(h);
- hb_scan(h, input, titleindex, preview_count, store_previews,
- min_title_duration * 90000LL);
+ hb_gui_use_hwd_flag = use_hwd;
+ hb_scan( h, input, titleindex, preview_count, store_previews, min_title_duration * 90000LL );
 
 /* Wait... */
 while( !die )
@@ -267,6 +323,7 @@
 case 0x03: /* ctrl-c */
 case 'q':
 fprintf( stdout, "\nEncoding Quit by user command\n" );
+ done_error = HB_ERROR_CANCELED;
 die = 1;
 break;
 case 'p':
@@ -318,6 +375,7 @@
 {
 case 'q':
 fprintf( stdout, "\nEncoding Quit by user command\n" );
+ done_error = HB_ERROR_CANCELED;
 die = 1;
 break;
 case 'p':
@@ -380,13 +438,15 @@
 free(advanced_opts);
 free(h264_profile);
 free(h264_level);
+ free(nlmeans_opt);
+ free(nlmeans_tune_opt);
 
 // write a carriage return to stdout
 // avoids overlap / line wrapping when stderr is redirected
 fprintf(stdout, "\n");
 fprintf(stderr, "HandBrake has exited.\n");
 
- return 0;
+ return done_error;
 }
 
 static void PrintTitleInfo( hb_title_t * title, int feature )
@@ -426,6 +486,14 @@
 (float) title->rate / title->rate_base );
 fprintf( stderr, " + autocrop: %d/%d/%d/%d\n", title->crop[0],
 title->crop[1], title->crop[2], title->crop[3] );
+
+ fprintf(stderr, " + support opencl: %s\n", title->opencl_support ? "yes" : "no");
+#ifdef USE_HWD
+ fprintf(stderr, " + support hwd: %s\n", title->hwd_support ? "yes" : "no");
+#else
+ fprintf(stderr, " + support hwd: not built-in\n");
+#endif
+
 fprintf( stderr, " + chapters:\n" );
 for( i = 0; i < hb_list_count( title->list_chapter ); i++ )
 {
@@ -577,7 +645,9 @@
 static int HandleEvents( hb_handle_t * h )
 {
 hb_state_t s;
+ const hb_encoder_t *encoder;
 int tmp_num_audio_tracks;
+ int filter_cfr, filter_vrate, filter_vrate_base;
 
 hb_get_state( h, &s );
 switch( s.state )
@@ -628,11 +698,12 @@
 {
 /* No valid title, stop right there */
 fprintf( stderr, "No title found.\n" );
+ done_error = HB_ERROR_WRONG_INPUT;
 die = 1;
 break;
 }
-	 if( main_feature )
-	 {
+ if( main_feature )
+ {
 int i;
 int main_feature_idx=0;
 int main_feature_pos=-1;
@@ -664,6 +735,7 @@
 if( main_feature_pos == -1 )
 {
 fprintf( stderr, "No main feature title found.\n" );
+ done_error = HB_ERROR_WRONG_INPUT;
 die = 1;
 break;
 }
@@ -687,7 +759,10 @@
 PrintTitleInfo( title, title_set->feature );
 
 /* Set job settings */
- job = hb_job_init( title );
+ job = hb_job_init(title);
+ filter_cfr = job->cfr;
+ filter_vrate = job->vrate;
+ filter_vrate_base = job->vrate_base;
 
 
 if( chapter_start && chapter_end && !stop_at_pts && !start_at_preview && !stop_at_frame && !start_at_pts && !start_at_frame )
@@ -717,15 +792,15 @@
 }
 vcodec = HB_VCODEC_X264;
 job->vquality = 20.0;
- job->vrate_base = 900000;
- job->cfr = 2;
+ filter_vrate_base = 900000;
+ filter_cfr = 2;
 if( !atracks )
 {
 atracks = strdup("1,1");
 }
 if( !acodecs )
 {
- acodecs = strdup("faac,copy:ac3");
+ acodecs = strdup("ffaac,copy:ac3");
 }
 if( !abitrates )
 {
@@ -733,7 +808,7 @@
 }
 if( !mixdowns )
 {
- mixdowns = strdup("dpl2,auto");
+ mixdowns = strdup("dpl2,none");
 }
 if( !arates )
 {
@@ -787,15 +862,15 @@
 job->ipod_atom = 1;
 vcodec = HB_VCODEC_X264;
 job->vquality = 22.0;
- job->vrate_base = 900000;
- job->cfr = 2;
+ filter_vrate_base = 900000;
+ filter_cfr = 2;
 if( !atracks )
 {
 atracks = strdup("1");
 }
 if( !acodecs )
 {
- acodecs = strdup("faac");
+ acodecs = strdup("ffaac");
 }
 if( !abitrates )
 {
@@ -853,15 +928,15 @@
 job->largeFileSize = 1;
 vcodec = HB_VCODEC_X264;
 job->vquality = 22.0;
- job->vrate_base = 900000;
- job->cfr = 2;
+ filter_vrate_base = 900000;
+ filter_cfr = 2;
 if( !atracks )
 {
 atracks = strdup("1");
 }
 if( !acodecs )
 {
- acodecs = strdup("faac");
+ acodecs = strdup("ffaac");
 }
 if( !abitrates )
 {
@@ -923,15 +998,15 @@
 job->largeFileSize = 1;
 vcodec = HB_VCODEC_X264;
 job->vquality = 20.0;
- job->vrate_base = 900000;
- job->cfr = 2;
+ filter_vrate_base = 900000;
+ filter_cfr = 2;
 if( !atracks )
 {
 atracks = strdup("1");
 }
 if( !acodecs )
 {
- acodecs = strdup("faac");
+ acodecs = strdup("ffaac");
 }
 if( !abitrates )
 {
@@ -993,15 +1068,15 @@
 job->largeFileSize = 1;
 vcodec = HB_VCODEC_X264;
 job->vquality = 20.0;
- job->vrate_base = 900000;
- job->cfr = 2;
+ filter_vrate_base = 900000;
+ filter_cfr = 2;
 if( !atracks )
 {
 atracks = strdup("1,1");
 }
 if( !acodecs )
 {
- acodecs = strdup("faac,copy:ac3");
+ acodecs = strdup("ffaac,copy:ac3");
 }
 if( !abitrates )
 {
@@ -1009,7 +1084,7 @@
 }
 if( !mixdowns )
 {
- mixdowns = strdup("dpl2,auto");
+ mixdowns = strdup("dpl2,none");
 }
 if( !arates )
 {
@@ -1067,15 +1142,15 @@
 job->largeFileSize = 1;
 vcodec = HB_VCODEC_X264;
 job->vquality = 20.0;
- job->vrate_base = 900000;
- job->cfr = 2;
+ filter_vrate_base = 900000;
+ filter_cfr = 2;
 if( !atracks )
 {
 atracks = strdup("1,1");
 }
 if( !acodecs )
 {
- acodecs = strdup("faac,copy:ac3");
+ acodecs = strdup("ffaac,copy:ac3");
 }
 if( !abitrates )
 {
@@ -1083,7 +1158,7 @@
 }
 if( !mixdowns )
 {
- mixdowns = strdup("dpl2,auto");
+ mixdowns = strdup("dpl2,none");
 }
 if( !arates )
 {
@@ -1137,15 +1212,15 @@
 job->largeFileSize = 1;
 vcodec = HB_VCODEC_X264;
 job->vquality = 20.0;
- job->vrate_base = 900000;
- job->cfr = 2;
+ filter_vrate_base = 900000;
+ filter_cfr = 2;
 if( !atracks )
 {
 atracks = strdup("1,1");
 }
 if( !acodecs )
 {
- acodecs = strdup("faac,copy:ac3");
+ acodecs = strdup("ffaac,copy:ac3");
 }
 if( !abitrates )
 {
@@ -1153,7 +1228,7 @@
 }
 if( !mixdowns )
 {
- mixdowns = strdup("dpl2,auto");
+ mixdowns = strdup("dpl2,none");
 }
 if( !arates )
 {
@@ -1208,15 +1283,15 @@
 }
 vcodec = HB_VCODEC_X264;
 job->vquality = 22.0;
- job->vrate_base = 900000;
- job->cfr = 2;
+ filter_vrate_base = 900000;
+ filter_cfr = 2;
 if( !atracks )
 {
 atracks = strdup("1");
 }
 if( !acodecs )
 {
- acodecs = strdup("faac");
+ acodecs = strdup("ffaac");
 }
 if( !abitrates )
 {
@@ -1276,15 +1351,15 @@
 }
 vcodec = HB_VCODEC_X264;
 job->vquality = 22.0;
- job->vrate_base = 900000;
- job->cfr = 2;
+ filter_vrate_base = 900000;
+ filter_cfr = 2;
 if( !atracks )
 {
 atracks = strdup("1");
 }
 if( !acodecs )
 {
- acodecs = strdup("faac");
+ acodecs = strdup("ffaac");
 }
 if( !abitrates )
 {
@@ -1336,6 +1411,74 @@
 }
 modulus = 2;
 }
+ if (!strcasecmp(preset_name, "Windows Phone 8"))
+ {
+ if( !mux )
+ {
+ mux = HB_MUX_MP4;
+ }
+ vcodec = HB_VCODEC_X264;
+ job->vquality = 22.0;
+ filter_vrate_base = 900000;
+ filter_cfr = 2;
+ if( !atracks )
+ {
+ atracks = strdup("1");
+ }
+ if( !acodecs )
+ {
+ acodecs = strdup("ffaac");
+ }
+ if( !abitrates )
+ {
+ abitrates = str_split("128", ',');
+ }
+ if( !mixdowns )
+ {
+ mixdowns = strdup("dpl2");
+ }
+ if( !arates )
+ {
+ arates = strdup("Auto");
+ }
+ if( !dynamic_range_compression )
+ {
+ dynamic_range_compression = strdup("0.0");
+ }
+ if( allowed_audio_copy == -1 )
+ {
+ allowed_audio_copy = 0;
+ allowed_audio_copy |= HB_ACODEC_AAC_PASS;
+ allowed_audio_copy |= HB_ACODEC_AC3_PASS;
+ allowed_audio_copy |= HB_ACODEC_DCA_HD_PASS;
+ allowed_audio_copy |= HB_ACODEC_DCA_PASS;
+ allowed_audio_copy |= HB_ACODEC_MP3_PASS;
+ allowed_audio_copy &= HB_ACODEC_PASS_MASK;
+ }
+ if( acodec_fallback == NULL )
+ {
+ acodec_fallback = "ffac3";
+ }
+ maxWidth = 1280;
+ maxHeight = 720;
+ if (x264_preset == NULL)
+ {
+ x264_preset = strdup("medium");
+ }
+ if (h264_profile == NULL)
+ {
+ h264_profile = strdup("main");
+ }
+ if (h264_level == NULL)
+ {
+ h264_level = strdup("3.1");
+ }
+ if( !anamorphic_mode )
+ {
+ anamorphic_mode = 0;
+ }
+ modulus = 2;
+ }
 if (!strcasecmp(preset_name, "Normal"))
 {
 if( !mux )
@@ -1350,7 +1493,7 @@
 }
 if( !acodecs )
 {
- acodecs = strdup("faac");
+ acodecs = strdup("ffaac");
 }
 if( !abitrates )
 {
@@ -1416,7 +1559,7 @@
 }
 if( !acodecs )
 {
- acodecs = strdup("faac,copy:ac3");
+ acodecs = strdup("ffaac,copy:ac3");
 }
 if( !abitrates )
 {
@@ -1424,7 +1567,7 @@
 }
 if( !mixdowns )
 {
- mixdowns = strdup("dpl2,auto");
+ mixdowns = strdup("dpl2,none");
 }
 if( !arates )
 {
@@ -1470,9 +1613,9 @@
 }
 }
 
-			if ( chapter_markers )
-			{
-				job->chapter_markers = chapter_markers;
+ if ( chapter_markers )
+ {
+ job->chapter_markers = chapter_markers;
 
 if( marker_file != NULL )
 {
@@ -1518,19 +1661,18 @@
 hb_close_csv_file( file );
 }
 }
-			}
+ }
 
- if( crop[0] >= 0 && crop[1] >= 0 &&
- crop[2] >= 0 && crop[3] >= 0 )
+ if (crop[0] < 0 || crop[1] < 0 || crop[2] < 0 || crop[3] < 0)
 {
- memcpy( job->crop, crop, 4 * sizeof( int ) );
+ memcpy(crop, title->crop, sizeof(int[4]));
 }
 
 if( loose_crop >= 0 )
 {
- int mod = modulus > 0 ? modulus : 16;
- apply_loose_crop(title->height, &job->crop[0], &job->crop[1], mod, loose_crop);
- apply_loose_crop(title->width, &job->crop[2], &job->crop[3], mod, loose_crop);
+ int mod = modulus > 0 ? modulus : 2;
+ apply_loose_crop(title->height, &crop[0], &crop[1], mod, loose_crop);
+ apply_loose_crop(title->width, &crop[2], &crop[3], mod, loose_crop);
 }
 
 job->deinterlace = deinterlace;
@@ -1538,6 +1680,9 @@
 
 hb_filter_object_t * filter;
 
+ job->use_detelecine = detelecine;
+ job->use_decomb = decomb;
+
 /* Add selected filters */
 if( detelecine )
 {
@@ -1564,213 +1709,130 @@
 filter = hb_filter_init( HB_FILTER_DENOISE );
 hb_add_filter( job, filter, denoise_opt );
 }
+ if( nlmeans )
+ {
+ filter = hb_filter_init( HB_FILTER_NLMEANS );
+ hb_add_filter( job, filter, nlmeans_opt );
+ }
 if( rotate )
 {
 filter = hb_filter_init( HB_FILTER_ROTATE );
 hb_add_filter( job, filter, rotate_opt);
 }
 
-
- if (maxWidth)
- job->maxWidth = maxWidth;
- if (maxHeight)
- job->maxHeight = maxHeight;
-
- switch( anamorphic_mode )
+ if (use_hwd)
 {
- case 0: // Non-anamorphic
+ job->use_hwd = use_hwd;
+ }
 
- if (modulus)
- {
- job->modulus = modulus;
- }
- 
- if( width && height )
- {
- job->width = width;
- job->height = height;
- }
- else if( width )
- {
- job->width = width;
- // do not exceed source dimensions by default
- if( !maxHeight )
- job->maxHeight = title->height;
- hb_fix_aspect( job, HB_KEEP_WIDTH );
- }
- else if( height )
- {
- job->height = height;
- // do not exceed source dimensions by default
- if( !maxWidth )
- job->maxWidth = title->width;
- hb_fix_aspect( job, HB_KEEP_HEIGHT );
- }
- else if( !width && !height )
- {
- /* Default to cropped width when one isn't specified
- * avoids rounding to mod 16 regardless of modulus */
- job->width = title->width - job->crop[2] - job->crop[3];
- // do not exceed source dimensions by default
- if( !maxHeight )
- job->maxHeight = title->height;
- hb_fix_aspect( job, HB_KEEP_WIDTH );
- }
+ hb_geometry_t srcGeo, resultGeo;
+ hb_ui_geometry_t uiGeo;
 
- break;
- 
- case 1: // Strict anammorphic
- job->anamorphic.mode = anamorphic_mode;
- break;
- 
- case 2: // Loose anamorphic
- job->anamorphic.mode = 2;
- 
- if (modulus)
- {
- job->modulus = modulus;
- }
- 
- if( itu_par )
- {
- job->anamorphic.itu_par = itu_par;
- }
- 
- if( width )
- {
- job->width = width;
- }
- else if( !width && !height )
- {
- /* Default to full width when one isn't specified for loose anamorphic */
- job->width = title->width - job->crop[2] - job->crop[3];
- }
- 
- break;
- 
- case 3: // Custom Anamorphic 3: Power User Jamboree 
- job->anamorphic.mode = 3;
- 
- if (modulus)
- {
- job->modulus = modulus;
- }
- 
- if( itu_par )
- {
- job->anamorphic.itu_par = itu_par;
- }
- 
- if( par_width && par_height )
- {
- job->anamorphic.par_width = par_width;
- job->anamorphic.par_height = par_height;
- }
- 
- if( keep_display_aspect )
- {
- job->anamorphic.keep_display_aspect = 1;
- 
- /* First, what *is* the display aspect? */
- int cropped_width = title->width - job->crop[2] - job->crop[3];
- int cropped_height = title->height - job->crop[0] - job->crop[1];
- 
- /* XXX -- I'm assuming people want to keep the source
- display AR even though they might have already
- asked for ITU values instead. */
- float source_display_width = (float)cropped_width *
- (float)title->pixel_aspect_width / (float)title->pixel_aspect_height;
- float display_aspect = source_display_width / (float)cropped_height;
- /* When keeping display aspect, we have to rank some values
- by priority in order to consistently handle situations
- when more than one might be specified by default.
- 
- * First off, PAR gets ignored. (err make this reality)
- * Height will be respected over all other settings,
- * If it isn't set, display_width will be followed.
- * If it isn't set, width will be followed. */
- if( height )
- {
- /* We scale the display width to the new height */
- display_width = (int)( (double)height * display_aspect );
- }
- else if( display_width )
- {
- /* We scale the height to the new display width */
- height = (int)( (double)display_width / display_aspect );
- }
- }
- 
- if( display_width )
- {
- /* Adjust the PAR to create the new display width
- from the default job width. */
- job->anamorphic.dar_width = display_width;
- 
- job->anamorphic.dar_height = height ?
- height :
- title->height - job->crop[0] - job->crop[1];
- }
- 
- if( width && height )
- {
- /* Use these storage dimensions */
- job->width = width;
- job->height = height;
- }
- else if( width )
- {
- /* Use just this storage width */
- job->width = width;
- job->height = title->height - job->crop[0] - job->crop[1];
- }
- else if( height )
- {
- /* Use just this storage height. */
- job->height = height;
- job->width = title->width - job->crop[2] - job->crop[3];
- }
- else if( !width && !height )
- {
- /* Assume source dimensions after cropping. */
- job->width = title->width - job->crop[2] - job->crop[3];
- job->height = title->height - job->crop[0] - job->crop[1];
- }
- 
- break;
+ srcGeo.width = title->width;
+ srcGeo.height = title->height;
+ srcGeo.par.num = title->pixel_aspect_width;
+ srcGeo.par.den = title->pixel_aspect_height;
+
+ keep_display_aspect |= anamorphic_mode != HB_ANAMORPHIC_CUSTOM;
+ uiGeo.mode = job->anamorphic.mode = anamorphic_mode;
+ if (width != 0 && height != 0)
+ {
+ if (anamorphic_mode == HB_ANAMORPHIC_NONE)
+ {
+ keep_display_aspect = 0;
+ }
+ else
+ {
+ uiGeo.mode = HB_ANAMORPHIC_CUSTOM;
+ }
+ }
+ job->anamorphic.keep_display_aspect = keep_display_aspect;
+ uiGeo.keep = !!keep_display_aspect * HB_KEEP_DISPLAY_ASPECT;
+ uiGeo.itu_par = job->anamorphic.itu_par = itu_par;
+ uiGeo.modulus = job->modulus = modulus;
+ memcpy(uiGeo.crop, crop, sizeof(int[4]));
+ if (width == 0)
+ {
+ uiGeo.width = title->width - crop[2] - crop[3];
+ }
+ else
+ {
+ uiGeo.keep |= HB_KEEP_WIDTH;
+ uiGeo.width = width;
+ }
+ if (height == 0)
+ {
+ uiGeo.height = title->height - crop[0] - crop[1];
+ }
+ else
+ {
+ uiGeo.keep |= HB_KEEP_HEIGHT;
+ uiGeo.height = height;
+ }
+ uiGeo.maxWidth = maxWidth;
+ uiGeo.maxHeight = maxHeight;
+ uiGeo.dar.num = 0;
+ uiGeo.dar.den = 0;
+ if( par_width && par_height )
+ {
+ uiGeo.par.num = par_width;
+ uiGeo.par.den = par_height;
+ }
+ else if (display_width != 0 && width != 0)
+ {
+ if (height != 0)
+ {
+ fprintf(stderr, "display_width (%d), width (%d), and height (%d) can not all be specified, ignoring height", display_width, width, height);
+ }
+ uiGeo.par.num = display_width;
+ uiGeo.par.den = width;
+ }
+ else if (display_width != 0)
+ {
+ uiGeo.dar.num = display_width;
+ uiGeo.dar.den = uiGeo.height;
 }
- // Validate and adjust job picture dimensions
- hb_validate_size( job );
+ else
+ {
+ uiGeo.par = srcGeo.par;
+ }
+
+ hb_set_anamorphic_size2(&srcGeo, &uiGeo, &resultGeo);
+ job->width = resultGeo.width;
+ job->height = resultGeo.height;
+ job->anamorphic.par_width = resultGeo.par.num;
+ job->anamorphic.par_height = resultGeo.par.den;
+ memcpy(job->crop, crop, sizeof(int[4]));
 
 // Add filter that does cropping and scaling
 char * filter_str;
 filter_str = hb_strdup_printf("%d:%d:%d:%d:%d:%d",
- job->width, job->height, 
- job->crop[0], job->crop[1], job->crop[2], job->crop[3] );
+ job->width, job->height, crop[0], crop[1], crop[2], crop[3] );
+ 
 filter = hb_filter_init( HB_FILTER_CROP_SCALE );
 hb_add_filter( job, filter, filter_str );
 free( filter_str );
 
 // Add framerate shaping filter
- if( vrate )
+ if (vrate)
 {
- job->cfr = cfr;
- job->vrate = 27000000;
- job->vrate_base = vrate;
+ filter_cfr = cfr;
+ filter_vrate = 27000000;
+ filter_vrate_base = vrate;
 }
- else if ( cfr )
+ else if (cfr)
 {
 // cfr or pfr flag with no rate specified implies
 // use the title rate.
- job->cfr = cfr;
- job->vrate = title->rate;
- job->vrate_base = title->rate_base;
- }
- filter_str = hb_strdup_printf("%d:%d:%d",
- job->cfr, job->vrate, job->vrate_base );
- filter = hb_filter_init( HB_FILTER_VFR );
- hb_add_filter( job, filter, filter_str );
- free( filter_str );
+ filter_cfr = cfr;
+ filter_vrate = title->rate;
+ filter_vrate_base = title->rate_base;
+ }
+ filter = hb_filter_init(HB_FILTER_VFR);
+ filter_str = hb_strdup_printf("%d:%d:%d", filter_cfr, filter_vrate,
+ filter_vrate_base);
+ hb_add_filter(job, filter, filter_str);
+ free(filter_str);
 
 // hb_job_init() will set a default muxer for us
 // only override it if a specific muxer has been set
@@ -1803,10 +1865,34 @@
 job->vquality = -1.0;
 job->vbitrate = vbitrate;
 }
- if( vcodec )
+
+ /* Set video encoder and check muxer compatibility */
+ if (vcodec)
 {
 job->vcodec = vcodec;
 }
+ encoder = NULL;
+ while ((encoder = hb_video_encoder_get_next(encoder)) != NULL)
+ {
+ if ((encoder->codec == job->vcodec) &&
+ (encoder->muxers & job->mux) == 0)
+ {
+ hb_error("incompatible video encoder '%s' for muxer '%s'",
+ hb_video_encoder_get_short_name(job->vcodec),
+ hb_container_get_short_name (job->mux));
+ done_error = HB_ERROR_INIT;
+ die = 1;
+ return -1;
+ }
+ }
+
+#ifdef USE_QSV
+ if (qsv_async_depth >= 0)
+ {
+ job->qsv.async_depth = qsv_async_depth;
+ }
+ job->qsv.decode = qsv_decode;
+#endif
 
 /* Grab audio tracks */
 if( atracks )
@@ -1962,10 +2048,10 @@
 token = acodecs;
 while ( token != NULL )
 {
- if ((acodec = get_acodec_for_string(token)) == -1)
+ if ((acodec = hb_audio_encoder_get_from_name(token)) <= 0)
 {
 fprintf(stderr, "Invalid codec %s, using default for container.\n", token);
- acodec = hb_get_default_audio_encoder(job->mux);
+ acodec = hb_audio_encoder_get_default(job->mux);
 }
 if( i < num_audio_tracks )
 {
@@ -2003,13 +2089,35 @@
 * then use that codec instead.
 */
 if (i != 1)
- acodec = hb_get_default_audio_encoder(job->mux);
+ acodec = hb_audio_encoder_get_default(job->mux);
 for ( ; i < num_audio_tracks; i++)
 {
 audio = hb_list_audio_config_item(job->list_audio, i);
 audio->out.codec = acodec;
 }
 }
+ // sanity check muxer compatibility
+ for (i = 0; i < num_audio_tracks; i++)
+ {
+ encoder = NULL;
+ audio = hb_list_audio_config_item(job->list_audio, i);
+ if (audio != NULL)
+ {
+ while ((encoder = hb_audio_encoder_get_next(encoder)) != NULL)
+ {
+ if ((encoder->codec == audio->out.codec) &&
+ (encoder->muxers & job->mux) == 0)
+ {
+ hb_error("audio track %d: incompatible encoder '%s' for muxer '%s'", i + 1,
+ hb_audio_encoder_get_short_name(audio->out.codec),
+ hb_container_get_short_name (job->mux));
+ done_error = HB_ERROR_INIT;
+ die = 1;
+ return -1;
+ }
+ }
+ }
+ }
 /* Audio Codecs */
 
 /* Sample Rate */
@@ -2022,18 +2130,7 @@
 token = arates;
 while ( token != NULL )
 {
- arate = atoi(token);
 audio = hb_list_audio_config_item(job->list_audio, i);
- int j;
-
- for( j = 0; j < hb_audio_rates_count; j++ )
- {
- if( !strcmp( token, hb_audio_rates[j].string ) )
- {
- arate = hb_audio_rates[j].rate;
- break;
- }
- }
 
 if( audio != NULL )
 {
@@ -2042,9 +2139,15 @@
 arate = audio->in.samplerate;
 auto_sample_rate = 1;
 }
- if (!is_sample_rate_valid(arate))
+ else
+ {
+ arate = hb_audio_samplerate_get_from_name(token);
+ }
+ if (arate <= 0)
 {
- fprintf(stderr, "Invalid sample rate %d, using input rate %d\n", arate, audio->in.samplerate);
+ fprintf(stderr,
+ "Invalid sample rate %s, using input rate %d\n",
+ token, audio->in.samplerate);
 arate = audio->in.samplerate;
 }
 
@@ -2087,8 +2190,8 @@
 token = mixdowns;
 while ( token != NULL )
 {
- mixdown = hb_mixdown_get_mixdown_from_short_name(token);
- audio = hb_list_audio_config_item(job->list_audio, i);
+ mixdown = hb_mixdown_get_from_name(token);
+ audio = hb_list_audio_config_item(job->list_audio, i);
 if( audio != NULL )
 {
 audio->out.mixdown = mixdown;
@@ -2295,8 +2398,8 @@
 int dither_method = hb_audio_dither_get_default();
 for (i = 0; audio_dither[i] != NULL; i++)
 {
- dither_method = get_dither_for_string(audio_dither[i]);
- audio = hb_list_audio_config_item(job->list_audio, i);
+ dither_method = hb_audio_dither_get_from_name(audio_dither[i]);
+ audio = hb_list_audio_config_item(job->list_audio, i);
 if (audio != NULL)
 {
 if (hb_audio_dither_is_supported(audio->out.codec))
@@ -2418,45 +2521,30 @@
 {
 // Auto Passthru
 job->acodec_copy_mask = allowed_audio_copy == -1 ? HB_ACODEC_PASS_MASK : allowed_audio_copy;
- job->acodec_fallback = acodec_fallback ? get_acodec_for_string( acodec_fallback ) : 0;
- // sanitize the fallback; -1 isn't a valid HB_ACODEC_* value
- if( job->acodec_fallback == -1 )
- job->acodec_fallback = 0;
+ job->acodec_fallback = hb_audio_encoder_get_from_name(acodec_fallback);
 }
 else if( ( audio->out.codec & HB_ACODEC_PASS_FLAG ) &&
 !( audio->out.codec & audio->in.codec & HB_ACODEC_PASS_MASK ) )
 {
- if( audio->out.codec == HB_ACODEC_AAC_PASS )
- {
- fprintf( stderr, "AAC Passthru requested and input codec is not AAC for track %d, using AAC encoder\n",
- audio->out.track );
- audio->out.codec = hb_audio_encoders[0].encoder;
- }
- else if( audio->out.codec == HB_ACODEC_AC3_PASS )
- {
- fprintf( stderr, "AC3 Passthru requested and input codec is not AC3 for track %d, using AC3 encoder\n",
- audio->out.track );
- audio->out.codec = HB_ACODEC_AC3;
- }
- else if( audio->out.codec == HB_ACODEC_MP3_PASS )
- {
- fprintf( stderr, "MP3 Passthru requested and input codec is not MP3 for track %d, using MP3 encoder\n",
- audio->out.track );
- audio->out.codec = HB_ACODEC_LAME;
- }
- else
+ // passthru fallbacks
+ int requested_passthru = audio->out.codec;
+ audio->out.codec =
+ hb_audio_encoder_get_fallback_for_passthru(requested_passthru);
+ if (!(audio->out.codec & HB_ACODEC_MASK))
 {
 // Passthru not possible, drop audio.
- fprintf( stderr, "Passthru requested and input codec is not the same as output codec for track %d, dropping track\n",
- audio->out.track );
- hb_audio_t * item = hb_list_item( job->list_audio, i );
- hb_list_rem( job->list_audio, item );
+ fprintf(stderr,
+ "Passthru requested and input codec is not the same as output codec for track %d, dropping track\n",
+ audio->out.track);
+ hb_audio_t *item = hb_list_item(job->list_audio, i);
+ hb_list_rem(job->list_audio, item);
+ hb_audio_close(&item);
 continue;
 }
- // we didn't drop the track, set the mixdown and bitrate from libhb defaults
- audio->out.mixdown = hb_get_default_mixdown( audio->out.codec, audio->in.channel_layout );
- audio->out.bitrate = hb_get_default_audio_bitrate( audio->out.codec, audio->out.samplerate,
- audio->out.mixdown );
+ fprintf(stderr,
+ "%s requested and input codec is not compatible for track %d, using %s encoder\n",
+ hb_audio_encoder_get_name(requested_passthru), audio->out.track,
+ hb_audio_encoder_get_name(audio->out.codec));
 }
 // we didn't drop the track
 i++;
@@ -2565,16 +2653,6 @@
 }
 }
 
- if ( sub_burned )
- {
- char * filter_str;
- filter_str = hb_strdup_printf("%d:%d:%d:%d",
- job->crop[0], job->crop[1], job->crop[2], job->crop[3] );
- filter = hb_filter_init( HB_FILTER_RENDER_SUB );
- hb_add_filter( job, filter, filter_str);
- free( filter_str );
- }
-
 if( srtfile )
 {
 int i;
@@ -2586,6 +2664,23 @@
 int64_t offset = 0;
 char *lang = "und";
 
+ if (srtburn == i + 1 && hb_subtitle_can_burn(SRTSUB))
+ {
+ // Only allow one subtitle to be burned into video
+ if ( sub_burned )
+ {
+ fprintf( stderr, "Warning: Skipping SRT track %d, can't have more than one track burnt in\n", i+1 );
+ continue;
+ }
+ sub_burned = 1;
+
+ // Mark as burn-in
+ sub_config.dest = RENDERSUB;
+ }
+ else
+ {
+ sub_config.dest = PASSTHRUSUB;
+ }
 if( srtcodeset && srtcodeset[i] )
 {
 codeset = srtcodeset[i];
@@ -2598,8 +2693,7 @@
 {
 lang = srtlang[i];
 }
- sub_config.default_track = 
- ( srtdefault != -1 ) && ( srtdefault == i + 1 );
+ sub_config.default_track = srtdefault == i + 1;
 sub_config.force = 0;
 strncpy( sub_config.src_filename, srtfile[i], 255);
 sub_config.src_filename[255] = 0;
@@ -2611,6 +2705,16 @@
 }
 }
 
+ if ( sub_burned )
+ {
+ char * filter_str;
+ filter_str = hb_strdup_printf("%d:%d:%d:%d",
+ crop[0], crop[1], crop[2], crop[3] );
+ filter = hb_filter_init( HB_FILTER_RENDER_SUB );
+ hb_add_filter( job, filter, filter_str);
+ free( filter_str );
+ }
+
 if( native_language )
 {
 audio = hb_list_audio_config_item(job->list_audio, 0);
@@ -2663,7 +2767,7 @@
 }
 sub_config = subtitle->config;
 
- if( mux == HB_MUX_MKV || subtitle->format == TEXTSUB)
+ if ((mux & HB_MUX_MASK_MKV) || subtitle->format == TEXTSUB)
 {
 sub_config.dest = PASSTHRUSUB;
 }
@@ -2689,10 +2793,10 @@
 job->color_matrix_code = color_matrix_code;
 }
 
- hb_job_set_x264_preset(job, x264_preset);
- hb_job_set_x264_tune(job, x264_tune);
- hb_job_set_h264_profile(job, h264_profile);
- hb_job_set_h264_level(job, h264_level);
+ hb_job_set_encoder_preset (job, x264_preset);
+ hb_job_set_encoder_tune (job, x264_tune);
+ hb_job_set_encoder_profile(job, h264_profile);
+ hb_job_set_encoder_level (job, h264_level);
 
 if (maxWidth)
 job->maxWidth = maxWidth;
@@ -2728,7 +2832,10 @@
 job->frame_to_start = start_at_frame;
 subtitle_scan = 0;
 }
- 
+
+ /* OpenCL */
+ job->use_opencl = use_opencl;
+
 if( subtitle_scan )
 {
 /*
@@ -2737,7 +2844,7 @@
 */
 job->pass = -1;
 
- hb_job_set_advanced_opts(job, NULL);
+ hb_job_set_encoder_options(job, NULL);
 
 job->indepth_scan = subtitle_scan;
 fprintf( stderr, "Subtitle Scan Enabled - enabling "
@@ -2749,7 +2856,7 @@
 hb_add( h, job );
 }
 
- hb_job_set_advanced_opts(job, advanced_opts);
+ hb_job_set_encoder_options(job, advanced_opts);
 
 if( twoPass )
 {
@@ -2855,6 +2962,7 @@
 fprintf( stderr, "\nEncode failed (error %x).\n",
 p.error );
 }
+ done_error = p.error;
 die = 1;
 break;
 #undef p
@@ -2868,6 +2976,7 @@
 static volatile int64_t i_die_date = 0;
 void SigHandler( int i_signal )
 {
+ done_error = HB_ERROR_CANCELED;
 if( die == 0 )
 {
 die = 1;
@@ -2878,7 +2987,7 @@
 else if( i_die_date + 500 < hb_get_date() )
 {
 fprintf( stderr, "Dying badly, files might remain in your /tmp\n" );
- exit( 1 );
+ exit( done_error );
 }
 }
 
@@ -2887,10 +2996,14 @@
 ****************************************************************************/
 static void ShowHelp()
 {
- int i, j, len;
+ int i;
+ const char *name;
+ const hb_rate_t *rate;
+ const hb_dither_t *dither;
+ const hb_mixdown_t *mixdown;
+ const hb_encoder_t *encoder;
+ const hb_container_t *container;
 FILE* const out = stdout;
- const char * const *x264_opts;
- char tmp[80];
 
 fprintf( out,
 "Syntax: HandBrakeCLI [options] -i <device> -o <file>\n"
@@ -2904,6 +3017,7 @@
 " double quotation marks\n"
 " -z, --preset-list See a list of available built-in presets\n"
 " --no-dvdnav Do not use dvdnav for reading DVDs\n"
+ " --no-opencl Disable use of OpenCL\n"
 "\n"
 
 "### Source Options-----------------------------------------------------------\n\n"
@@ -2930,137 +3044,88 @@
 
 "### Destination Options------------------------------------------------------\n\n"
 " -o, --output <string> Set output file name\n"
- " -f, --format <string> Set output format (mp4/mkv, default:\n"
- " autodetected from file name)\n"
+ " -f, --format <string> Set output container format (");
+ container = NULL;
+ while ((container = hb_container_get_next(container)) != NULL)
+ {
+ fprintf(out, "%s", container->short_name);
+ if (hb_container_get_next(container) != NULL)
+ {
+ fprintf(out, "/");
+ }
+ else
+ {
+ fprintf(out, ")\n");
+ }
+ }
+ fprintf(out,
+ " (default: autodetected from file name)\n"
 " -m, --markers Add chapter markers\n"
 " -4, --large-file Create 64-bit mp4 files that can hold more than 4 GB\n"
 " of data. Note: breaks pre-iOS iPod compatibility.\n"
 " -O, --optimize Optimize mp4 files for HTTP streaming (\"fast start\")\n"
 " -I, --ipod-atom Mark mp4 files so 5.5G iPods will accept them\n"
+ " -P, --use-opencl Use OpenCL where applicable\n"
+ " -U, --use-hwd Use DXVA2 hardware decoding\n"
 "\n"
 
 
 "### Video Options------------------------------------------------------------\n\n"
 " -e, --encoder <string> Set video library encoder\n"
 " Options: " );
- for( i = 0; i < hb_video_encoders_count; i++ )
+ name = NULL;
+ encoder = NULL;
+ while ((encoder = hb_video_encoder_get_next(encoder)) != NULL)
 {
- fprintf( out, "%s", hb_video_encoders[i].short_name );
- if( i != hb_video_encoders_count - 1 )
- fprintf( out, "/" );
- else
- fprintf( out, "\n" );
- }
- for( i = 0; i < hb_video_encoders_count; i++ )
- {
- if( hb_video_encoders[i].encoder == vcodec )
+ fprintf(out, "%s", encoder->short_name);
+ if (hb_video_encoder_get_next(encoder) != NULL)
 {
- fprintf( out, " (default: %s)\n",
- hb_video_encoders[i].short_name );
- break;
+ fprintf(out, "/");
 }
- }
- fprintf( out,
- " --x264-preset When using x264, selects the x264 preset:\n"
- " <string> ");
- x264_opts = hb_x264_presets();
- tmp[0] = 0;
- len = 0;
- while( x264_opts && *x264_opts )
- {
- strncat( tmp, *x264_opts++, 79 - len );
- if( *x264_opts )
- strcat( tmp, "/" );
- len = strlen( tmp );
- if( len > 40 && *x264_opts )
+ else
 {
- fprintf( out, "%s\n ", tmp );
- len = 0;
- tmp[0] = 0;
+ fprintf(out, "\n");
 }
- }
- if( len )
- fprintf( out, "%s\n", tmp );
- fprintf( out,
- " --x264-tune When using x264, selects the x264 tuning:\n"
- " <string> ");
- x264_opts = hb_x264_tunes();
- tmp[0] = 0;
- len = 0;
- while( x264_opts && *x264_opts )
- {
- strncat( tmp, *x264_opts++, 79 - len );
- if( *x264_opts )
- strcat( tmp, "/" );
- len = strlen( tmp );
- if( len > 40 && *x264_opts )
+ if (encoder->codec == vcodec)
 {
- fprintf( out, "%s\n ", tmp );
- len = 0;
- tmp[0] = 0;
+ name = encoder->short_name;
 }
 }
- if( len )
- fprintf( out, "%s\n", tmp );
- fprintf( out,
- " -x, --encopts <string> Specify advanced encoder options in the\n"
- " same style as mencoder (x264 and ffmpeg only):\n"
+ fprintf(out, " (default: %s)\n", name);
+ fprintf(out,
+ " --encoder-preset Adjust video encoding settings for a particular\n"
+ " <string> speed/efficiency tradeoff (encoder-specific)\n"
+ " --encoder-preset-list List supported --encoder-preset values for the\n"
+ " <string> specified video encoder\n"
+ " --encoder-tune Adjust video encoding settings for a particular\n"
+ " <string> type of souce or situation (encoder-specific)\n"
+ " --encoder-tune-list List supported --encoder-tune values for the\n"
+ " <string> specified video encoder\n"
+ " -x, --encopts <string> Specify advanced encoding options in the same\n"
+ " style as mencoder (all encoders except theora):\n"
 " option1=value1:option2=value2\n"
- " --h264-profile When using x264, ensures compliance with the\n"
- " <string> specified H.264 profile:\n"
- " ");
- x264_opts = hb_h264_profiles();
- tmp[0] = 0;
- len = 0;
- while( x264_opts && *x264_opts )
- {
- strncat( tmp, *x264_opts++, 79 - len );
- if( *x264_opts )
- strcat( tmp, "/" );
- len = strlen( tmp );
- if( len > 40 && *x264_opts )
- {
- fprintf( out, "%s\n ", tmp );
- len = 0;
- tmp[0] = 0;
- }
- }
- if( len )
- fprintf( out, "%s\n", tmp );
- fprintf( out,
- " --h264-level When using x264, ensures compliance with the\n"
- " <string> specified H.264 level:\n"
- " ");
- x264_opts = hb_h264_levels();
- tmp[0] = 0;
- len = 0;
- while( x264_opts && *x264_opts )
- {
- strncat( tmp, *x264_opts++, 79 - len );
- if( *x264_opts )
- strcat( tmp, "/" );
- len = strlen( tmp );
- if( len > 40 && *x264_opts )
- {
- fprintf( out, "%s\n ", tmp );
- len = 0;
- tmp[0] = 0;
- }
- }
- if( len )
- fprintf( out, "%s\n", tmp );
- fprintf( out,
+ " --encoder-profile Ensures compliance with the requested codec\n"
+ " <string> profile (encoder-specific)\n"
+ " --encoder-profile-list List supported --encoder-profile values for the\n"
+ " <string> specified video encoder\n"
+ " --encoder-level Ensures compliance with the requested codec\n"
+ " <string> level (encoder-specific)\n"
+ " --encoder-level-list List supported --encoder-level values for the\n"
+ " <string> specified video encoder\n"
 " -q, --quality <number> Set video quality\n"
 " -b, --vb <kb/s> Set video bitrate (default: 1000)\n"
 " -2, --two-pass Use two-pass mode\n"
 " -T, --turbo When using 2-pass use \"turbo\" options on the\n"
 " 1st pass to improve speed (only works with x264)\n"
 " -r, --rate Set video framerate (" );
- for( i = 0; i < hb_video_rates_count; i++ )
+ rate = NULL;
+ while ((rate = hb_video_framerate_get_next(rate)) != NULL)
 {
- fprintf( out, "%s", hb_video_rates[i].string );
- if( i != hb_video_rates_count - 1 )
- fprintf( out, "/" );
+ fprintf(out, "%s", rate->name);
+ if (hb_video_framerate_get_next(rate) != NULL)
+ {
+ fprintf(out, "/");
+ }
 }
 fprintf( out, ")\n"
 " Be aware that not specifying a framerate lets\n"
@@ -3084,33 +3149,44 @@
 " tracks, default: first one).\n"
 " Multiple output tracks can be used for one input.\n"
 " -E, --aencoder <string> Audio encoder(s):\n" );
- for (i = 0; i < hb_audio_encoders_count; i++)
+ encoder = NULL;
+ while ((encoder = hb_audio_encoder_get_next(encoder)) != NULL)
 {
 fprintf(out, " %s\n",
- hb_audio_encoders[i].short_name);
+ encoder->short_name);
 }
 fprintf(out,
 " copy:* will passthrough the corresponding\n"
 " audio unmodified to the muxer if it is a\n"
 " supported passthrough audio type.\n"
 " Separated by commas for more than one audio track.\n"
- " (default: %s for mp4, %s for mkv)\n",
- get_string_for_acodec(hb_get_default_audio_encoder(HB_MUX_MP4)),
- get_string_for_acodec(hb_get_default_audio_encoder(HB_MUX_MKV)));
+ " Defaults:\n");
+ container = NULL;
+ while ((container = hb_container_get_next(container)) != NULL)
+ {
+ int audio_encoder = hb_audio_encoder_get_default(container->format);
+ fprintf(out, " %-8s %s\n",
+ container->short_name,
+ hb_audio_encoder_get_short_name(audio_encoder));
+ }
 fprintf(out,
 " --audio-copy-mask Set audio codecs that are permitted when the\n"
 " <string> \"copy\" audio encoder option is specified\n"
 " (" );
- for (i = j = 0; i < hb_audio_encoders_count; i++)
+ i = 0;
+ encoder = NULL;
+ while ((encoder = hb_audio_encoder_get_next(encoder)) != NULL)
 {
- if ((hb_audio_encoders[i].encoder & HB_ACODEC_PASS_FLAG) &&
- (hb_audio_encoders[i].encoder != HB_ACODEC_AUTO_PASS))
+ if ((encoder->codec & HB_ACODEC_PASS_FLAG) &&
+ (encoder->codec != HB_ACODEC_AUTO_PASS))
 {
- if (j)
+ if (i)
+ {
 fprintf(out, "/");
+ }
+ i = 1;
 // skip "copy:"
- fprintf(out, "%s", hb_audio_encoders[i].short_name + 5);
- j = 1;
+ fprintf(out, "%s", encoder->short_name + 5);
 }
 }
 fprintf(out, ", default: all).\n"
@@ -3128,25 +3204,25 @@
 " Separated by commas for more than one audio track.\n"
 " -6, --mixdown <string> Format(s) for audio downmixing/upmixing:\n");
 // skip HB_AMIXDOWN_NONE
- for (i = 1; i < hb_audio_mixdowns_count; i++)
+ mixdown = hb_mixdown_get_next(NULL);
+ while((mixdown = hb_mixdown_get_next(mixdown)) != NULL)
 {
 fprintf(out, " %s\n",
- hb_audio_mixdowns[i].short_name);
+ mixdown->short_name);
 }
 fprintf(out,
 " Separated by commas for more than one audio track.\n"
 " Defaults:\n");
- for (i = 0; i < hb_audio_encoders_count; i++)
+ encoder = NULL;
+ while((encoder = hb_audio_encoder_get_next(encoder)) != NULL)
 {
- if (!(hb_audio_encoders[i].encoder & HB_ACODEC_PASS_FLAG))
+ if (!(encoder->codec & HB_ACODEC_PASS_FLAG))
 {
 // layout: UINT64_MAX (all channels) should work with any mixdown
- int mixdown = hb_get_default_mixdown(hb_audio_encoders[i].encoder,
- UINT64_MAX);
+ int mixdown = hb_mixdown_get_default(encoder->codec, UINT64_MAX);
 // assumes that the encoder short name is <= 16 characters long
 fprintf(out, " %-16s up to %s\n",
- hb_audio_encoders[i].short_name,
- hb_mixdown_get_short_name_from_mixdown(mixdown));
+ encoder->short_name, hb_mixdown_get_short_name(mixdown));
 }
 }
 fprintf(out,
@@ -3155,11 +3231,14 @@
 " 0 = Disable Normalization (default)\n"
 " 1 = Enable Normalization\n"
 " -R, --arate Set audio samplerate(s) (" );
- for( i = 0; i < hb_audio_rates_count; i++ )
+ rate = NULL;
+ while ((rate = hb_audio_samplerate_get_next(rate)) != NULL)
 {
- fprintf( out, "%s", hb_audio_rates[i].string );
- if( i != hb_audio_rates_count - 1 )
- fprintf( out, "/" );
+ fprintf(out, "%s", rate->name);
+ if (hb_audio_samplerate_get_next(rate) != NULL)
+ {
+ fprintf(out, "/");
+ }
 }
 fprintf( out, " kHz)\n"
 " Separated by commas for more than one audio track.\n"
@@ -3174,30 +3253,35 @@
 " --adither <string> Apply dithering to the audio before encoding.\n"
 " Separated by commas for more than one audio track.\n"
 " Only supported by some encoders (");
- for (i = j = 0; i < hb_audio_encoders_count; i++)
+ i = 0;
+ encoder = NULL;
+ while ((encoder = hb_audio_encoder_get_next(encoder)) != NULL)
 {
- if (hb_audio_dither_is_supported(hb_audio_encoders[i].encoder))
+ if (hb_audio_dither_is_supported(encoder->codec))
 {
- if (j)
+ if (i)
+ {
 fprintf(out, "/");
- fprintf(out, "%s", hb_audio_encoders[i].short_name);
- j = 1;
+ }
+ i = 1;
+ fprintf(out, "%s", encoder->short_name);
 }
 }
 fprintf(out, ").\n");
 fprintf(out,
 " Options:\n");
- for (i = 0; i < hb_audio_dithers_count; i++)
+ dither = NULL;
+ while ((dither = hb_audio_dither_get_next(dither)) != NULL)
 {
- if (hb_audio_dithers[i].method == hb_audio_dither_get_default())
+ if (dither->method == hb_audio_dither_get_default())
 {
 fprintf(out, " %s (default)\n",
- hb_audio_dithers[i].short_name);
+ dither->short_name);
 }
 else
 {
 fprintf(out, " %s\n",
- hb_audio_dithers[i].short_name);
+ dither->short_name);
 }
 }
 fprintf(out,
@@ -3238,10 +3322,17 @@
 
 "### Filters---------------------------------------------------------\n\n"
 
- " -d, --deinterlace Deinterlace video with Libav, yadif or mcdeint\n"
- " <fast/slow/slower/bob> or omitted (default settings)\n"
+ " -d, --deinterlace Unconditionally deinterlaces all frames\n"
+ " <fast/slow/slower/bob");
+#ifdef USE_QSV
+if (hb_qsv_available())
+{
+ fprintf(out, "/qsv");
+}
+#endif
+ fprintf( out, "> or omitted (default settings)\n"
 " or\n"
- " <YM:FD:MM:QP> (default 0:-1:-1:1)\n"
+ " <YM:FD> (default 0:-1)\n"
 " -5, --decomb Selectively deinterlaces when it detects combing\n"
 " <fast/bob> or omitted (default settings)\n"
 " or\n"
@@ -3253,13 +3344,27 @@
 " specify a constant framerate (--rate 29.97)\n"
 " <L:R:T:B:SB:MP:FD> (default 1:1:4:4:0:0:-1)\n"
 " -8, --denoise Denoise video with hqdn3d filter\n"
- " <weak/medium/strong> or omitted (default settings)\n"
+ " <ultralight/light/medium/strong> or omitted (default settings)\n"
+ " or\n"
+ " <SL:SCb:SCr:TL:TCb:TCr>\n"
+ " (default: 4:3:3:6:4.5:4.5)\n"
+ " --nlmeans Denoise video with nlmeans filter\n"
+ " <ultralight/light/medium/strong> or omitted\n"
 " or\n"
- " <SL:SC:TL:TC> (default 4:3:6:4.5)\n"
+ " <SY:OTY:PSY:RY:FY:PY:Sb:OTb:PSb:Rb:Fb:Pb:Sr:OTr:PSr:Rr:Fr:Pr>\n"
+ " (default 8:1:7:3:2:0)\n"
+ " --nlmeans-tune Tune nlmeans filter to content type\n"
+ " Note: only works in conjunction with presets\n"
+ " ultralight/light/medium/strong.\n"
+ " <none/film/grain/highmotion/animation> or omitted (default none)\n"
 " -7, --deblock Deblock video with pp7 filter\n"
 " <QP:M> (default 5:2)\n"
- " --rotate Flips images axes\n"
- " <M> (default 3)\n"
+ " --rotate <mode> Rotate image or flip its axes.\n"
+ " Modes: (can be combined)\n"
+ " 1 vertical flip\n"
+ " 2 horizontal flip\n"
+ " 4 rotate clockwise 90 degrees\n"
+ " Default: 3 (vertical and horizontal flip)\n"
 " -g, --grayscale Grayscale encoding\n"
 "\n"
 
@@ -3321,11 +3426,26 @@
 " means no subtitle will be automatically displayed\n"
 " If \"number\" is omitted, the first srt is default.\n"
 " \"number\" is an 1 based index into the srt-file list\n"
+ " --srt-burn \"Burn\" the selected srt subtitle into the video track\n"
+ " <number> If \"number\" is omitted, the first srt is burned.\n"
+ " \"number\" is an 1 based index into the srt-file list\n"
 "\n"
+ );
 
-
+#ifdef USE_QSV
+if (hb_qsv_available())
+{
+ fprintf( out,
+ "### Intel Quick Sync Video------------------------------------------------------\n\n"
+ " --disable-qsv-decoding Force software decoding of the video track.\n"
+ " --qsv-async-depth Specifies how many asynchronous operations should be\n"
+ " performed before the result is explicitly synchronized.\n"
+ " Default: 4. If zero, the value is not specified.\n"
+ "\n"
 );
 }
+#endif
+}
 
 /****************************************************************************
 * ShowPresets:
@@ -3335,31 +3455,71 @@
 fprintf( stderr, "%s - %s - %s\n", HB_PROJECT_TITLE, HB_PROJECT_BUILD_TITLE, HB_PROJECT_URL_WEBSITE );
 
 printf("\n< Devices\n");
- printf("\n + Universal: -e x264 -q 20.0 -r 30 --pfr -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 720 -Y 576 --loose-anamorphic --modulus 2 -m --x264-preset fast --h264-profile baseline --h264-level 3.0\n");
- printf("\n + iPod: -e x264 -q 22.0 -r 30 --pfr -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -I -X 320 -Y 240 --modulus 2 -m --x264-preset medium --h264-profile baseline --h264-level 1.3\n");
- printf("\n + iPhone & iPod touch: -e x264 -q 22.0 -r 30 --pfr -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 960 -Y 640 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1\n");
- printf("\n + iPad: -e x264 -q 20.0 -r 30 --pfr -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 1280 -Y 720 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1\n");
- printf("\n + AppleTV: -e x264 -q 20.0 -r 30 --pfr -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 960 -Y 720 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1 -x qpmin=4:cabac=0:ref=2:b-pyramid=none:weightb=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\n");
- printf("\n + AppleTV 2: -e x264 -q 20.0 -r 30 --pfr -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 1280 -Y 720 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1\n");
- printf("\n + AppleTV 3: -e x264 -q 20.0 -r 30 --pfr -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 1920 -Y 1080 --decomb=fast --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 4.0\n");
- printf("\n + Android: -e x264 -q 22.0 -r 30 --pfr -a 1 -E faac -B 128 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 720 -Y 576 --loose-anamorphic --modulus 2 --x264-preset medium --h264-profile main --h264-level 3.0\n");
- printf("\n + Android Tablet: -e x264 -q 22.0 -r 30 --pfr -a 1 -E faac -B 128 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 1280 -Y 720 --loose-anamorphic --modulus 2 --x264-preset medium --h264-profile main --h264-level 3.1\n");
- printf("\n>\n");
+ printf("\n + Universal: -e x264 -q 20.0 -r 30 --pfr -a 1,1 -E ffaac,copy:ac3 -B 160,160 -6 dpl2,none -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 720 -Y 576 --loose-anamorphic --modulus 2 -m --x264-preset fast --h264-profile baseline --h264-level 3.0\n");
+ printf("\n + iPod: -e x264 -q 22.0 -r 30 --pfr -a 1 -E ffaac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -I -X 320 -Y 240 --modulus 2 -m --x264-preset medium --h264-profile baseline --h264-level 1.3\n");
+ printf("\n + iPhone & iPod touch: -e x264 -q 22.0 -r 30 --pfr -a 1 -E ffaac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 960 -Y 640 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1\n");
+ printf("\n + iPad: -e x264 -q 20.0 -r 30 --pfr -a 1 -E ffaac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 1280 -Y 720 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1\n");
+ printf("\n + AppleTV: -e x264 -q 20.0 -r 30 --pfr -a 1,1 -E ffaac,copy:ac3 -B 160,160 -6 dpl2,none -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 960 -Y 720 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1 -x qpmin=4:cabac=0:ref=2:b-pyramid=none:weightb=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\n");
+ printf("\n + AppleTV 2: -e x264 -q 20.0 -r 30 --pfr -a 1,1 -E ffaac,copy:ac3 -B 160,160 -6 dpl2,none -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 1280 -Y 720 --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 3.1\n");
+ printf("\n + AppleTV 3: -e x264 -q 20.0 -r 30 --pfr -a 1,1 -E ffaac,copy:ac3 -B 160,160 -6 dpl2,none -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 -X 1920 -Y 1080 --decomb=fast --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 4.0\n");
+ printf("\n + Android: -e x264 -q 22.0 -r 30 --pfr -a 1 -E ffaac -B 128 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 720 -Y 576 --loose-anamorphic --modulus 2 --x264-preset medium --h264-profile main --h264-level 3.0\n");
+ printf("\n + Android Tablet: -e x264 -q 22.0 -r 30 --pfr -a 1 -E ffaac -B 128 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 1280 -Y 720 --loose-anamorphic --modulus 2 --x264-preset medium --h264-profile main --h264-level 3.1\n");
+ printf("\n + Windows Phone 8: -e x264 -q 22.0 -r 30 --pfr -a 1 -E ffaac -B 128 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -X 1280 -Y 720 --modulus 2 --x264-preset medium --h264-profile main --h264-level 3.1\n");
+	printf("\n>\n");
 printf("\n< Regular\n");
- printf("\n + Normal: -e x264 -q 20.0 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 --loose-anamorphic --modulus 2 -m --x264-preset veryfast --h264-profile main --h264-level 4.0\n");
- printf("\n + High Profile: -e x264 -q 20.0 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 --decomb --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 4.1\n");
+ printf("\n + Normal: -e x264 -q 20.0 -a 1 -E ffaac -B 160 -6 dpl2 -R Auto -D 0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 --loose-anamorphic --modulus 2 -m --x264-preset veryfast --h264-profile main --h264-level 4.0\n");
+ printf("\n + High Profile: -e x264 -q 20.0 -a 1,1 -E ffaac,copy:ac3 -B 160,160 -6 dpl2,none -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mp4 -4 --decomb --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 4.1\n");
 printf("\n>\n");
 }
 
-static char * hb_strndup( char * str, int len )
+static char* strchr_quote(char *pos, char c, char q)
+{
+ if (pos == NULL)
+ return NULL;
+
+ while (*pos != 0 && *pos != c)
+ {
+ if (*pos == q)
+ {
+ pos = strchr_quote(pos+1, q, 0);
+ if (pos == NULL)
+ return NULL;
+ pos++;
+ }
+ else if (*pos == '\\' && *(pos+1) != 0)
+ pos += 2;
+ else
+ pos++;
+ }
+ if (*pos != c)
+ return NULL;
+ return pos;
+}
+
+static char *strndup_quote(char *str, char q, int len)
 {
-	char * res;
-	int str_len = strlen( str );
+ if (str == NULL)
+ return NULL;
 
-	res = malloc( len > str_len ? str_len + 1 : len + 1 );
-	strncpy( res, str, len );
-	res[len] = '\0';
-	return res;
+ char * res;
+ int str_len = strlen( str );
+ int src = 0, dst = 0;
+ res = malloc( len > str_len ? str_len + 1 : len + 1 );
+
+ while (str[src] != 0 && src < len)
+ {
+ if (str[src] == q)
+ src++;
+ else if (str[src] == '\\' && str[src+1] != 0)
+ {
+ res[dst++] = str[src+1];
+ src += 2;
+ }
+ else
+ res[dst++] = str[src++];
+ }
+ res[dst] = '\0';
+ return res;
 }
 
 static char** str_split( char *str, char delem )
@@ -3368,7 +3528,12 @@
 char * end;
 char ** ret;
 int count, i;
+ char quote = '"';
 
+ if (delem == '"')
+ {
+ quote = '\'';
+ }
 if ( str == NULL || str[0] == 0 )
 {
 ret = malloc( sizeof(char*) );
@@ -3379,7 +3544,7 @@
 // Find number of elements in the string
 count = 1;
 pos = str;
- while ( ( pos = strchr( pos, delem ) ) != NULL )
+ while ( ( pos = strchr_quote( pos, delem, quote ) ) != NULL )
 {
 count++;
 pos++;
@@ -3390,11 +3555,11 @@
 pos = str;
 for ( i = 0; i < count - 1; i++ )
 {
- end = strchr( pos, delem );
- ret[i] = hb_strndup(pos, end - pos);
+ end = strchr_quote( pos, delem, quote );
+ ret[i] = strndup_quote(pos, quote, end - pos);
 pos = end + 1;
 }
- ret[i] = strdup(pos);
+ ret[i] = strndup_quote(pos, quote, strlen(pos));
 
 return ret;
 }
@@ -3434,39 +3599,50 @@
 static int ParseOptions( int argc, char ** argv )
 {
 
- #define PREVIEWS 257
- #define START_AT_PREVIEW 258
- #define START_AT 259
- #define STOP_AT 260
- #define ANGLE 261
- #define DVDNAV 262
- #define DISPLAY_WIDTH 263
- #define PIXEL_ASPECT 264
- #define MODULUS 265
- #define KEEP_DISPLAY_ASPECT 266
- #define SUB_BURNED 267
- #define SUB_DEFAULT 268
- #define NATIVE_DUB 269
- #define SRT_FILE 270
- #define SRT_CODESET 271
- #define SRT_OFFSET 272
- #define SRT_LANG 273
- #define SRT_DEFAULT 274
- #define ROTATE_FILTER 275
- #define SCAN_ONLY 276
- #define MAIN_FEATURE 277
- #define MIN_DURATION 278
- #define AUDIO_GAIN 279
- #define ALLOWED_AUDIO_COPY 280
- #define AUDIO_FALLBACK 281
- #define LOOSE_CROP 282
- #define X264_PRESET 283
- #define X264_TUNE 284
- #define H264_PROFILE 285
- #define H264_LEVEL 286
- #define NORMALIZE_MIX 287
- #define AUDIO_DITHER 288
- 
+ #define PREVIEWS 257
+ #define START_AT_PREVIEW 258
+ #define START_AT 259
+ #define STOP_AT 260
+ #define ANGLE 261
+ #define DVDNAV 262
+ #define DISPLAY_WIDTH 263
+ #define PIXEL_ASPECT 264
+ #define MODULUS 265
+ #define KEEP_DISPLAY_ASPECT 266
+ #define SUB_BURNED 267
+ #define SUB_DEFAULT 268
+ #define NATIVE_DUB 269
+ #define SRT_FILE 270
+ #define SRT_CODESET 271
+ #define SRT_OFFSET 272
+ #define SRT_LANG 273
+ #define SRT_DEFAULT 274
+ #define SRT_BURN 275
+ #define ROTATE_FILTER 276
+ #define SCAN_ONLY 277
+ #define MAIN_FEATURE 278
+ #define MIN_DURATION 279
+ #define AUDIO_GAIN 280
+ #define ALLOWED_AUDIO_COPY 281
+ #define AUDIO_FALLBACK 282
+ #define LOOSE_CROP 283
+ #define ENCODER_PRESET 284
+ #define ENCODER_PRESET_LIST 285
+ #define ENCODER_TUNE 286
+ #define ENCODER_TUNE_LIST 287
+ #define ENCODER_PROFILE 288
+ #define ENCODER_PROFILE_LIST 289
+ #define ENCODER_LEVEL 290
+ #define ENCODER_LEVEL_LIST 291
+ #define NO_OPENCL 292
+ #define NORMALIZE_MIX 293
+ #define AUDIO_DITHER 294
+ #define QSV_BASELINE 295
+ #define QSV_ASYNC_DEPTH 296
+ #define QSV_IMPLEMENTATION 297
+ #define FILTER_NLMEANS 298
+ #define FILTER_NLMEANS_TUNE 299
+
 for( ;; )
 {
 static struct option long_options[] =
@@ -3474,7 +3650,15 @@
 { "help", no_argument, NULL, 'h' },
 { "update", no_argument, NULL, 'u' },
 { "verbose", optional_argument, NULL, 'v' },
- { "no-dvdnav", no_argument, NULL, DVDNAV },
+ { "no-dvdnav", no_argument, NULL, DVDNAV },
+ { "no-opencl", no_argument, NULL, NO_OPENCL },
+
+#ifdef USE_QSV
+ { "qsv-baseline", no_argument, NULL, QSV_BASELINE, },
+ { "qsv-async-depth", required_argument, NULL, QSV_ASYNC_DEPTH, },
+ { "qsv-implementation", required_argument, NULL, QSV_IMPLEMENTATION, },
+ { "disable-qsv-decoding", no_argument, &qsv_decode, 0, },
+#endif
 
 { "format", required_argument, NULL, 'f' },
 { "input", required_argument, NULL, 'i' },
@@ -3482,6 +3666,8 @@
 { "large-file", no_argument, NULL, '4' },
 { "optimize", no_argument, NULL, 'O' },
 { "ipod-atom", no_argument, NULL, 'I' },
+ { "use-opencl", no_argument, NULL, 'P' },
+ { "use-hwd", no_argument, NULL, 'U' },
 
 { "title", required_argument, NULL, 't' },
 { "min-duration",required_argument, NULL, MIN_DURATION },
@@ -3504,7 +3690,8 @@
 { "srt-codeset", required_argument, NULL, SRT_CODESET },
 { "srt-offset", required_argument, NULL, SRT_OFFSET },
 { "srt-lang", required_argument, NULL, SRT_LANG },
- { "srt-default", optional_argument, NULL, SRT_DEFAULT },
+ { "srt-default", optional_argument, NULL, SRT_DEFAULT },
+ { "srt-burn", optional_argument, NULL, SRT_BURN },
 { "native-language", required_argument, NULL,'N' },
 { "native-dub", no_argument, NULL, NATIVE_DUB },
 { "encoder", required_argument, NULL, 'e' },
@@ -3513,6 +3700,8 @@
 { "deinterlace", optional_argument, NULL, 'd' },
 { "deblock", optional_argument, NULL, '7' },
 { "denoise", optional_argument, NULL, '8' },
+ { "nlmeans", optional_argument, NULL, FILTER_NLMEANS },
+ { "nlmeans-tune",required_argument, NULL, FILTER_NLMEANS_TUNE },
 { "detelecine", optional_argument, NULL, '9' },
 { "decomb", optional_argument, NULL, '5' },
 { "grayscale", no_argument, NULL, 'g' },
@@ -3530,6 +3719,28 @@
 { "crop", required_argument, NULL, 'n' },
 { "loose-crop", optional_argument, NULL, LOOSE_CROP },
 
+ // mapping of legacy option names for backwards compatibility
+ { "qsv-preset", required_argument, NULL, ENCODER_PRESET, },
+ { "x264-preset", required_argument, NULL, ENCODER_PRESET, },
+ { "x265-preset", required_argument, NULL, ENCODER_PRESET, },
+ { "x264-tune", required_argument, NULL, ENCODER_TUNE, },
+ { "x265-tune", required_argument, NULL, ENCODER_TUNE, },
+ { "x264-profile", required_argument, NULL, ENCODER_PROFILE, },
+ { "h264-profile", required_argument, NULL, ENCODER_PROFILE, },
+ { "h265-profile", required_argument, NULL, ENCODER_PROFILE, },
+ { "h264-level", required_argument, NULL, ENCODER_LEVEL, },
+ { "h265-level", required_argument, NULL, ENCODER_LEVEL, },
+ // encoder preset/tune/options/profile/level
+ { "encoder-preset", required_argument, NULL, ENCODER_PRESET, },
+ { "encoder-preset-list", required_argument, NULL, ENCODER_PRESET_LIST, },
+ { "encoder-tune", required_argument, NULL, ENCODER_TUNE, },
+ { "encoder-tune-list", required_argument, NULL, ENCODER_TUNE_LIST, },
+ { "encopts", required_argument, NULL, 'x', },
+ { "encoder-profile", required_argument, NULL, ENCODER_PROFILE, },
+ { "encoder-profile-list", required_argument, NULL, ENCODER_PROFILE_LIST, },
+ { "encoder-level", required_argument, NULL, ENCODER_LEVEL, },
+ { "encoder-level-list", required_argument, NULL, ENCODER_LEVEL_LIST, },
+
 { "vb", required_argument, NULL, 'b' },
 { "quality", required_argument, NULL, 'q' },
 { "ab", required_argument, NULL, 'B' },
@@ -3537,12 +3748,6 @@
 { "ac", required_argument, NULL, 'C' },
 { "rate", required_argument, NULL, 'r' },
 { "arate", required_argument, NULL, 'R' },
- { "x264-preset", required_argument, NULL, X264_PRESET },
- { "x264-tune", required_argument, NULL, X264_TUNE },
- { "encopts", required_argument, NULL, 'x' },
- { "x264-profile", required_argument, NULL, H264_PROFILE },
- { "h264-profile", required_argument, NULL, H264_PROFILE },
- { "h264-level", required_argument, NULL, H264_LEVEL },
 { "turbo", no_argument, NULL, 'T' },
 { "maxHeight", required_argument, NULL, 'Y' },
 { "maxWidth", required_argument, NULL, 'X' },
@@ -3569,7 +3774,7 @@
 
 cur_optind = optind;
 c = getopt_long( argc, argv,
- "hv::uC:f:4i:Io:t:c:m::M:a:A:6:s:UF::N:e:E:Q:C:"
+ "hv::uC:f:4i:Io:PUt:c:m::M:a:A:6:s:F::N:e:E:Q:C:"
 "2dD:7895gOw:l:n:b:q:S:B:r:R:x:TY:X:Z:z",
 long_options, &option_index );
 if( c < 0 )
@@ -3640,6 +3845,12 @@
 case 'I':
 ipod_atom = 1;
 break;
+ case 'P':
+ use_opencl = 1;
+ break;
+ case 'U':
+ use_hwd = 1;
+ break;
 
 case 't':
 titleindex = atoi( optarg );
@@ -3671,6 +3882,9 @@
 }
 break;
 }
+ case NO_OPENCL:
+ use_opencl = 0;
+ break;
 case ANGLE:
 angle = atoi( optarg );
 break;
@@ -3776,6 +3990,16 @@
 srtdefault = 1 ;
 }
 break;
+ case SRT_BURN:
+ if( optarg != NULL )
+ {
+ srtburn = atoi( optarg );
+ }
+ else
+ {
+ srtburn = 1 ;
+ }
+ break;
 case '2':
 twoPass = 1;
 break;
@@ -3815,25 +4039,26 @@
 case '8':
 if( optarg != NULL )
 {
- if (!( strcmp( optarg, "weak" ) ))
- {
- denoise_opt = "2:1:2:3";
- }
- else if (!( strcmp( optarg, "medium" ) ))
- {
- denoise_opt = "3:2:2:3";
- }
- else if (!( strcmp( optarg, "strong" ) ))
- {
- denoise_opt = "7:7:5:5";
- }
- else
- {
- denoise_opt = strdup( optarg );
- }
+ free(denoise_opt);
+ denoise_opt = strdup( optarg );
 }
 denoise = 1;
 break;
+ case FILTER_NLMEANS:
+ if (optarg != NULL)
+ {
+ free(nlmeans_opt);
+ nlmeans_opt = strdup(optarg);
+ }
+ nlmeans = 1;
+ break;
+ case FILTER_NLMEANS_TUNE:
+ if (optarg != NULL)
+ {
+ free(nlmeans_tune_opt);
+ nlmeans_tune_opt = strdup(optarg);
+ }
+ break;
 case '9':
 if( optarg != NULL )
 {
@@ -3890,18 +4115,10 @@
 break;
 case 'e':
 {
- int i;
- for( i = 0, vcodec = 0; i < hb_video_encoders_count; i++ )
+ vcodec = hb_video_encoder_get_from_name(optarg);
+ if (vcodec <= 0)
 {
- if( !strcasecmp( hb_video_encoders[i].short_name, optarg ) )
- {
- vcodec = hb_video_encoders[i].encoder;
- break;
- }
- }
- if( !vcodec )
- {
- fprintf( stderr, "invalid codec (%s)\n", optarg );
+ fprintf(stderr, "invalid codec (%s)\n", optarg);
 return -1;
 }
 break;
@@ -3936,21 +4153,13 @@
 break;
 case 'r':
 {
- int i;
- vrate = 0;
- for( i = 0; i < hb_video_rates_count; i++ )
- {
- if( !strcmp( optarg, hb_video_rates[i].string ) )
- {
- vrate = hb_video_rates[i].rate;
- break;
- }
- }
- if( !vrate )
+ vrate = hb_video_framerate_get_from_name(optarg);
+ if (vrate <= 0)
 {
- fprintf( stderr, "invalid framerate %s\n", optarg );
+ vrate = 0;
+ fprintf(stderr, "invalid framerate %s\n", optarg);
 }
- else if ( cfr == 0 )
+ else if (!cfr)
 {
 cfr = 1;
 }
@@ -3977,21 +4186,49 @@
 case 'C':
 acompressions = str_split( optarg, ',' );
 break;
- case X264_PRESET:
+ case ENCODER_PRESET:
 x264_preset = strdup( optarg );
 break;
- case X264_TUNE:
+ case ENCODER_TUNE:
 x264_tune = strdup( optarg );
 break;
 case 'x':
 advanced_opts = strdup( optarg );
 break;
- case H264_PROFILE:
+ case ENCODER_PROFILE:
 h264_profile = strdup( optarg );
 break;
- case H264_LEVEL:
+ case ENCODER_LEVEL:
 h264_level = strdup( optarg );
 break;
+ case ENCODER_PRESET_LIST:
+ fprintf(stderr, "Available --encoder-preset values for '%s' encoder:\n",
+ hb_video_encoder_get_short_name(hb_video_encoder_get_from_name(optarg)));
+ print_string_list(stderr,
+ hb_video_encoder_get_presets(hb_video_encoder_get_from_name(optarg)),
+ " ");
+ exit(0);
+ case ENCODER_TUNE_LIST:
+ fprintf(stderr, "Available --encoder-tune values for '%s' encoder:\n",
+ hb_video_encoder_get_short_name(hb_video_encoder_get_from_name(optarg)));
+ print_string_list(stderr,
+ hb_video_encoder_get_tunes(hb_video_encoder_get_from_name(optarg)),
+ " ");
+ exit(0);
+ case ENCODER_PROFILE_LIST:
+ fprintf(stderr, "Available --encoder-profile values for '%s' encoder:\n",
+ hb_video_encoder_get_short_name(hb_video_encoder_get_from_name(optarg)));
+ print_string_list(stderr,
+ hb_video_encoder_get_profiles(hb_video_encoder_get_from_name(optarg)),
+ " ");
+ exit(0);
+ case ENCODER_LEVEL_LIST:
+ fprintf(stderr, "Available --encoder-level values for '%s' encoder:\n",
+ hb_video_encoder_get_short_name(hb_video_encoder_get_from_name(optarg)));
+ print_string_list(stderr,
+ hb_video_encoder_get_levels(hb_video_encoder_get_from_name(optarg)),
+ " ");
+ exit(0);
 case 'T':
 turbo_opts_enabled = 1;
 break;
@@ -4063,28 +4300,33 @@
 }
 case ALLOWED_AUDIO_COPY:
 {
- int i, j;
- char **allowed = str_split( optarg, ',' );
+ allowed_audio_copy = 0;
+ const hb_encoder_t *audio_encoder = NULL;
+ char **allowed = str_split(optarg, ',');
 
- allowed_audio_copy = 0;
- for( i = 0; allowed[i]; i++ )
+ while ((audio_encoder = hb_audio_encoder_get_next(audio_encoder)) != NULL)
 {
- for( j = 0; j < hb_audio_encoders_count; j++ )
+ if ((audio_encoder->codec & HB_ACODEC_PASS_FLAG) &&
+ (audio_encoder->codec != HB_ACODEC_AUTO_PASS))
 {
- const char *encoder = hb_audio_encoders[j].short_name;
- // skip "copy:"
- if( strlen( encoder ) > 5 )
- encoder += 5;
- if( !strcmp( allowed[i], encoder ) )
+ int i = -1;
+ while(allowed[++i] != NULL)
 {
- allowed_audio_copy |= hb_audio_encoders[j].encoder;
- break;
+ // skip "copy:"
+ if (!strcasecmp(allowed[i],
+ audio_encoder->short_name + 5))
+ {
+ allowed_audio_copy |= audio_encoder->codec;
+ break;
+ }
 }
 }
 }
+
 allowed_audio_copy &= HB_ACODEC_PASS_MASK;
- str_vfree( allowed );
- } break;
+ str_vfree(allowed);
+ break;
+ }
 case AUDIO_FALLBACK:
 acodec_fallback = strdup( optarg );
 break;
@@ -4102,10 +4344,57 @@
 case MIN_DURATION:
 min_title_duration = strtol( optarg, NULL, 0 );
 break;
+#ifdef USE_QSV
+ case QSV_BASELINE:
+ hb_qsv_force_workarounds();
+ break;
+ case QSV_ASYNC_DEPTH:
+ qsv_async_depth = atoi(optarg);
+ break;
+ case QSV_IMPLEMENTATION:
+ hb_qsv_impl_set_preferred(optarg);
+ break;
+#endif
 default:
 fprintf( stderr, "unknown option (%s)\n", argv[cur_optind] );
 return -1;
 }
+
+ }
+
+ if (nlmeans)
+ {
+ char *opt = hb_generate_filter_settings(HB_FILTER_NLMEANS,
+ nlmeans_opt, nlmeans_tune_opt);
+ if (opt != NULL)
+ {
+ free(nlmeans_opt);
+ nlmeans_opt = opt;
+ }
+ else if (nlmeans_opt != NULL)
+ {
+ fprintf(stderr, "Invalid parameters for nlmeans (%s).", nlmeans_opt);
+ return -1;
+ }
+ else if (nlmeans_tune_opt != NULL)
+ {
+ fprintf(stdout, "Default nlmeans parameters specified; ignoring nlmeans tune (%s).\n", nlmeans_tune_opt);
+ }
+ }
+ if (denoise)
+ {
+ char *opt = hb_generate_filter_settings(HB_FILTER_DENOISE,
+ denoise_opt, NULL);
+ if (opt != NULL)
+ {
+ free(denoise_opt);
+ denoise_opt = opt;
+ }
+ else if (denoise_opt != NULL)
+ {
+ fprintf(stderr, "Invalid parameters for hqdn3d (%s).", denoise_opt);
+ return -1;
+ }
 }
 
 return 0;
@@ -4135,95 +4424,69 @@
 return 1;
 }
 
- if( !format )
+ if (format == NULL)
 {
- char * p = strrchr( output, '.' );
-
 /* autodetect */
- if( p && ( !strcasecmp( p, ".mp4" ) ||
- !strcasecmp( p, ".m4v" ) ) )
+ const char *extension = strrchr(output, '.');
+ if (extension != NULL)
 {
- mux = HB_MUX_MP4;
+ // skip '.'
+ mux = hb_container_get_from_extension(extension + 1);
 }
- else if( p && !strcasecmp(p, ".mkv" ) )
- {
- mux = HB_MUX_MKV;
- }
- else
+ if (mux <= 0)
 {
- fprintf( stderr, "Output format couldn't be guessed "
- "from file name, using default.\n" );
+ fprintf(stderr,
+ "Output format can't be guessed from file name (%s), "
+ "using default.\n", output);
+ // reset the muxer (use default)
+ mux = 0;
 return 0;
 }
 }
- else if( !strcasecmp( format, "mp4" ) ||
- !strcasecmp( format, "m4v" ) )
- {
- mux = HB_MUX_MP4;
- }
- else if( !strcasecmp( format, "mkv" ) )
- {
- mux = HB_MUX_MKV;
- }
 else
 {
- fprintf( stderr, "Invalid output format (%s). Possible "
- "choices are mp4, m4v and mkv\n.", format );
- return 1;
+ mux = hb_container_get_from_name(format);
+ if (mux <= 0)
+ {
+ fprintf(stderr, "Invalid output format (%s).", format);
+ fprintf(stderr, "Possible choices are: ");
+ const hb_container_t *container = NULL;
+ while ((container = hb_container_get_next(container)) != NULL)
+ {
+ fprintf(stderr, "%s", container->short_name);
+ if (hb_container_get_next(container) != NULL)
+ {
+ fprintf(stderr, ", ");
+ }
+ else
+ {
+ fprintf(stderr, "\n");
+ }
+ }
+ return 1;
+ }
 }
 }
 
 return 0;
 }
 
-static int get_dither_for_string(const char *dither)
-{
- int i;
- for (i = 0; i < hb_audio_dithers_count; i++)
- {
- if (!strcasecmp(hb_audio_dithers[i].short_name, dither))
- {
- return hb_audio_dithers[i].method;
- }
- }
- return hb_audio_dither_get_default();
-}
-
-static int get_acodec_for_string(const char *codec)
+static void print_string_list(FILE *out, const char* const *list, const char *prefix)
 {
- int i;
- for (i = 0; i < hb_audio_encoders_count; i++)
+ if (out != NULL && prefix != NULL)
 {
- if (!strcasecmp(hb_audio_encoders[i].short_name, codec))
+ if (list != NULL)
 {
- return hb_audio_encoders[i].encoder;
+ while (*list != NULL)
+ {
+ fprintf(out, "%s%s\n", prefix, *list++);
+ }
 }
- }
- return -1;
-}
-
-static const char* get_string_for_acodec(int acodec)
-{
- int i;
- for (i = 0; i < hb_audio_encoders_count; i++)
- {
- if (hb_audio_encoders[i].encoder == acodec)
+ else
 {
- return hb_audio_encoders[i].short_name;
+ fprintf(out, "%s" "Option not supported by encoder\n", prefix);
 }
 }
- return NULL;
-}
-
-static int is_sample_rate_valid(int rate)
-{
- int i;
- for( i = 0; i < hb_audio_rates_count; i++ )
- {
- if (rate == hb_audio_rates[i].rate)
- return 1;
- }
- return 0;
 }
 
 #ifdef __APPLE_CC__

HandBrake-0.10.0.tar.bz2/version.txt Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/EventArgs/EncodeCompletedEventArgs.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/EventArgs/EncodeCompletedEventArgs.cs Changed

@@ -12,6 +12,8 @@
 using System;
 using System.Runtime.Serialization;
 
+ using HandBrake.ApplicationServices.Model;
+
 /// <summary>
 /// Encode Progress Event Args
 /// </summary>
@@ -30,14 +32,24 @@
 /// <param name="errorInformation">
 /// The error information.
 /// </param>
- public EncodeCompletedEventArgs(bool sucessful, Exception exception, string errorInformation)
+ /// <param name="filename">
+ /// The filename.
+ /// </param>
+ public EncodeCompletedEventArgs(bool sucessful, Exception exception, string errorInformation, string filename)
 {
 this.Successful = sucessful;
 this.Exception = exception;
 this.ErrorInformation = errorInformation;
+ this.FileName = filename;
 }
 
 /// <summary>
+ /// Gets or sets the file name.
+ /// </summary>
+ [DataMember]
+ public string FileName { get; set; }
+
+ /// <summary>
 /// Gets or sets a value indicating whether Successful.
 /// </summary>
 [DataMember]

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/EventArgs/QueueCompletedEventArgs.cs Added

@@ -0,0 +1,38 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="QueueCompletedEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Queue Completed Event Args
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.EventArgs
+{
+ using System;
+ using System.Runtime.Serialization;
+
+ /// <summary>
+ /// Queue Completed Event Args
+ /// </summary>
+ [DataContract]
+ public class QueueCompletedEventArgs : EventArgs
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="QueueCompletedEventArgs"/> class. 
+ /// </summary>
+ /// <param name="wasManuallyStopped">
+ /// The was Manually Stopped.
+ /// </param>
+ public QueueCompletedEventArgs(bool wasManuallyStopped)
+ {
+ this.WasManuallyStopped = wasManuallyStopped;
+ }
+
+ /// <summary>
+ /// Gets a value indicating whether the queue WasManuallyStopped.
+ /// </summary>
+ [DataMember]
+ public bool WasManuallyStopped { get; private set; }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Factories/PlistPresetFactory.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Factories/PlistPresetFactory.cs Changed

@@ -11,15 +11,19 @@
 {
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+ using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
 
 using HandBrake.ApplicationServices.Model;
+ using HandBrake.ApplicationServices.Model.Audio;
 using HandBrake.ApplicationServices.Model.Encoding;
+ using HandBrake.ApplicationServices.Model.Subtitle;
 using HandBrake.ApplicationServices.Services;
 using HandBrake.ApplicationServices.Utilities;
 using HandBrake.Interop.Model.Encoding;
 using HandBrake.Interop.Model.Encoding.x264;
+ using HandBrake.Interop.Model.Encoding.x265;
 
 /// <summary>
 /// A Factory to translate a Plist object into a Preset.
@@ -27,6 +31,20 @@
 public class PlistPresetFactory
 {
 /// <summary>
+ /// The lang list.
+ /// </summary>
+ private static IDictionary<string, string> langList;
+
+ /// <summary>
+ /// Initializes static members of the <see cref="PlistPresetFactory"/> class. 
+ /// </summary>
+ static PlistPresetFactory()
+ {
+ IDictionary<string, string> langMap = LanguageUtilities.MapLanguages();
+ langList = (from entry in langMap select entry).ToDictionary(pair => pair.Value, pair => pair.Key);
+ }
+
+ /// <summary>
 /// The create preset.
 /// </summary>
 /// <param name="plist">
@@ -37,7 +55,13 @@
 /// </returns>
 public static Preset CreatePreset(PList plist)
 {
- Preset preset = new Preset { Task = new EncodeTask(), Category = PresetService.UserPresetCatgoryName };
+ Preset preset = new Preset
+ {
+ Task = new EncodeTask(),
+ Category = PresetService.UserPresetCatgoryName,
+ AudioTrackBehaviours = new AudioBehaviours(),
+ SubtitleTrackBehaviours = new SubtitleBehaviours()
+ };
 
 // Parse the settings out.
 foreach (var item in plist)
@@ -79,7 +103,6 @@
 preset.Task.MaxHeight = preset.Task.Width;
 }
 
-
 return preset;
 }
 
@@ -103,9 +126,6 @@
 case "Mp4HttpOptimize":
 preset.Task.OptimizeMP4 = kvp.Value == 1;
 break;
- case "Mp4LargeFile":
- preset.Task.LargeFile = kvp.Value == 1;
- break;
 case "Mp4iPodCompatible":
 preset.Task.IPod5GSupport = kvp.Value == 1;
 break;
@@ -153,7 +173,7 @@
 preset.Task.CustomDecomb = kvp.Value;
 break;
 case "PictureDecombDeinterlace":
- preset.UseDeinterlace = kvp.Value == 1;
+ preset.UseDeinterlace = kvp.Value == true;
 break;
 case "PictureDeinterlace":
 preset.Task.Deinterlace = (Deinterlace)kvp.Value;
@@ -164,6 +184,12 @@
 case "PictureDenoise":
 preset.Task.Denoise = (Denoise)kvp.Value;
 break;
+ case "DenoisePreset":
+ preset.Task.DenoisePreset = (DenoisePreset)kvp.Value; // TODO to be confirmed.
+ break;
+ case "DenoiseTune":
+ preset.Task.DenoiseTune = (DenoiseTune)kvp.Value; // TODO to be confirmed.
+ break;
 case "PictureDenoiseCustom":
 preset.Task.CustomDenoise = kvp.Value;
 break;
@@ -203,7 +229,7 @@
 }
 break;
 case "VideoGrayScale":
- preset.Task.Grayscale = kvp.Value == 1;
+ preset.Task.Grayscale = kvp.Value == true;
 break;
 case "VideoQualitySlider":
 preset.Task.Quality = double.Parse(kvp.Value.ToString(), CultureInfo.InvariantCulture);
@@ -238,10 +264,22 @@
 case "h264Level":
 preset.Task.H264Level = kvp.Value;
 break;
+ case "QsvPreset":
+ preset.Task.QsvPreset = EnumHelper<QsvPreset>.GetValue(kvp.Value, true);
+ break;
+ case "h265Profile":
+ preset.Task.H265Profile = EnumHelper<x265Profile>.GetValue(kvp.Value, true);
+ break;
+ case "x265Tune":
+ preset.Task.X265Tune = EnumHelper<x265Tune>.GetValue(kvp.Value, true);
+ break;
+ case "x265Preset":
+ preset.Task.X265Preset = EnumHelper<x265Preset>.GetValue(kvp.Value, true);
+ break;
 
 // Chapter Markers Tab
 case "ChapterMarkers":
- preset.Task.IncludeChapterMarkers = kvp.Value == 1;
+ preset.Task.IncludeChapterMarkers = kvp.Value == true;
 break;
 
 // Advanced x264 tab
@@ -270,7 +308,7 @@
 preset.Name = kvp.Value;
 break;
 case "Type":
- //preset.Task.Type = kvp.Value; // TODO find out what this is
+ // preset.Task.Type = kvp.Value; // TODO find out what this is
 break;
 case "UsesMaxPictureSettings":
 // TODO Not sure if this is used now!?
@@ -284,23 +322,55 @@
 
 // Allowed Passthru
 case "AudioAllowAACPass":
- preset.Task.AllowedPassthruOptions.AudioAllowAACPass = kvp.Value == 1;
+ preset.Task.AllowedPassthruOptions.AudioAllowAACPass = kvp.Value == true;
 break;
 case "AudioAllowAC3Pass":
- preset.Task.AllowedPassthruOptions.AudioAllowAC3Pass = kvp.Value == 1;
+ preset.Task.AllowedPassthruOptions.AudioAllowAC3Pass = kvp.Value == true;
 break;
 case "AudioAllowDTSHDPass":
- preset.Task.AllowedPassthruOptions.AudioAllowDTSHDPass = kvp.Value == 1;
+ preset.Task.AllowedPassthruOptions.AudioAllowDTSHDPass = kvp.Value == true;
 break;
 case "AudioAllowDTSPass":
- preset.Task.AllowedPassthruOptions.AudioAllowDTSPass = kvp.Value == 1;
+ preset.Task.AllowedPassthruOptions.AudioAllowDTSPass = kvp.Value == true;
 break;
 case "AudioAllowMP3Pass":
- preset.Task.AllowedPassthruOptions.AudioAllowMP3Pass = kvp.Value == 1;
+ preset.Task.AllowedPassthruOptions.AudioAllowMP3Pass = kvp.Value == true;
 break;
 case "AudioEncoderFallback":
 preset.Task.AllowedPassthruOptions.AudioEncoderFallback = EnumHelper<AudioEncoder>.GetValue(kvp.Value);
 break;
+
+ // Audio Defaults
+ case "AudioLanguageList":
+ preset.AudioTrackBehaviours.SelectedLangauges = new BindingList<string>(ParseLangaugeCodeList(kvp.Value));
+ break;
+ case "AudioSecondaryEncoderMode":
+ break;
+ case "AudioTrackSelectionBehavior":
+ preset.AudioTrackBehaviours.SelectedBehaviour = kvp.Value == "all"
+ ? AudioBehaviourModes.AllMatching
+ : kvp.Value == "first"
+ ? AudioBehaviourModes.FirstMatch
+ : AudioBehaviourModes.None;
+ break;
+
+ // Subtitle Defaults
+ case "SubtitleAddForeignAudioSearch":
+ preset.SubtitleTrackBehaviours.AddForeignAudioScanTrack = kvp.Value == true;
+ break;
+ case "SubtitleAddCC":
+ preset.SubtitleTrackBehaviours.AddClosedCaptions = kvp.Value == true;
+ break;
+ case "SubtitleLanguageList":
+ preset.SubtitleTrackBehaviours.SelectedLangauges = new BindingList<string>(ParseLangaugeCodeList(kvp.Value));
+ break;
+ case "SubtitleTrackSelectionBehavior":
+ preset.SubtitleTrackBehaviours.SelectedBehaviour = kvp.Value == "all"
+ ? SubtitleBehaviourModes.AllMatching
+ : kvp.Value == "first"
+ ? SubtitleBehaviourModes.FirstMatch
+ : SubtitleBehaviourModes.None;
+ break;
 }
 }
 
@@ -319,6 +389,30 @@
 }
 
 /// <summary>
+ /// The parse langauge code list.
+ /// </summary>
+ /// <param name="languages">
+ /// The languages.
+ /// </param>
+ /// <returns>
+ /// The <see cref="IEnumerable"/>.
+ /// </returns>
+ private static IEnumerable<string> ParseLangaugeCodeList(IEnumerable<object> languages)
+ {
+ List<string> languageCodesList = new List<string>();
+ foreach (var item in languages)
+ {
+ string language;
+ if (langList.TryGetValue(item.ToString(), out language))
+ {
+ languageCodesList.Add(language);
+ } 
+ }
+
+ return languageCodesList;
+ }
+
+ /// <summary>
 /// Parse an audio track's parameters.
 /// </summary>
 /// <param name="audioTrack">
@@ -344,16 +438,16 @@
 track.MixDown = Converters.GetAudioMixDown(item.Value.Trim());
 break;
 case "AudioSamplerate":
- track.SampleRate = item.Value == "Auto" ? 0 : double.Parse(item.Value, CultureInfo.InvariantCulture);
+ track.SampleRate = item.Value == "Auto" ? 0 : double.Parse(item.Value);
 break;
 case "AudioTrack":
- //track.SourceTrack = value; We don't do anything with this one.
+ // track.SourceTrack = value; We don't do anything with this one.
 break;
 case "AudioTrackDRCSlider":
- track.DRC = double.Parse(item.Value.ToString(), CultureInfo.InvariantCulture);
+ track.DRC = item.Value;
 break;
 case "AudioTrackGainSlider":
- track.Gain = int.Parse(item.Value.ToString(), CultureInfo.InvariantCulture);
+ track.Gain = (int)item.Value;
 break;
 }
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj Changed

@@ -35,6 +35,7 @@
 <PlatformTarget>x64</PlatformTarget>
 <OutputPath>bin\Debug\</OutputPath>
 <DefineConstants>TRACE;DEBUG</DefineConstants>
+ <UseVSHostingProcess>true</UseVSHostingProcess>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
 <PlatformTarget>x64</PlatformTarget>
@@ -44,6 +45,20 @@
 <DebugType>pdbonly</DebugType>
 <DebugSymbols>true</DebugSymbols>
 </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x86' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x86\Debug31\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <PlatformTarget>x86</PlatformTarget>
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x64' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x64\Debug31\</OutputPath>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
+ <PlatformTarget>x64</PlatformTarget>
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
 <ItemGroup>
 <Reference Include="Caliburn.Micro, Version=1.3.1.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
 <SpecificVersion>False</SpecificVersion>
@@ -66,6 +81,7 @@
 <RequiredTargetFramework>3.5</RequiredTargetFramework>
 </Reference>
 <Reference Include="System.Drawing" />
+ <Reference Include="System.Management" />
 <Reference Include="System.Runtime.Serialization" />
 <Reference Include="System.ServiceModel" />
 <Reference Include="System.Windows.Forms" />
@@ -83,6 +99,7 @@
 <ItemGroup>
 <Compile Include="Collections\SerializableDictionary.cs" />
 <Compile Include="Converters\EnumToDescConverter.cs" />
+ <Compile Include="EventArgs\QueueCompletedEventArgs.cs" />
 <Compile Include="EventArgs\SettingChangedEventArgs.cs" />
 <Compile Include="Exceptions\GeneralApplicationException.cs" />
 <Compile Include="EventArgs\EncodeCompletedEventArgs.cs" />
@@ -94,10 +111,16 @@
 <Compile Include="Factories\PlistPresetFactory.cs" />
 <Compile Include="Isolation\BackgroundServiceConnector.cs" />
 <Compile Include="Isolation\IsolatedEncodeService.cs" />
- <Compile Include="Isolation\IsolatedScanService.cs" />
+ <Compile Include="Model\Audio\AudioBehaviourModes.cs" />
+ <Compile Include="Model\Audio\AudioBehaviours.cs" />
+ <Compile Include="Model\Encoding\DenoisePreset.cs" />
+ <Compile Include="Model\Encoding\DenoiseTune.cs" />
+ <Compile Include="Model\HBConfiguration.cs" />
+ <Compile Include="Model\Subtitle\SubtitleBehaviourModes.cs" />
+ <Compile Include="Model\Subtitle\SubtitleBehaviours.cs" />
+ <Compile Include="Model\VideoScaler.cs" />
 <Compile Include="Services\Interfaces\IEncodeServiceWrapper.cs" />
 <Compile Include="Services\Interfaces\IHbServiceCallback.cs" />
- <Compile Include="Services\Interfaces\IScanServiceWrapper.cs" />
 <Compile Include="Services\Interfaces\IServerService.cs" />
 <Compile Include="Services\ServerService.cs" />
 <Compile Include="Utilities\Converters.cs" />
@@ -124,10 +147,8 @@
 <Compile Include="Model\QueueTask.cs" />
 <Compile Include="Model\Encoding\SubtitleType.cs" />
 <Compile Include="Parsing\Audio.cs" />
- <Compile Include="Parsing\AudioHelper.cs" />
 <Compile Include="Parsing\Chapter.cs" />
 <Compile Include="Parsing\Source.cs" />
- <Compile Include="Parsing\Parser.cs" />
 <Compile Include="Parsing\Subtitle.cs" />
 <Compile Include="Parsing\Title.cs" />
 <Compile Include="Properties\Resources.Designer.cs">
@@ -142,14 +163,10 @@
 <Compile Include="Services\Interfaces\IQueueProcessor.cs" />
 <Compile Include="Services\Interfaces\IScan.cs" />
 <Compile Include="Services\Interfaces\IPresetService.cs" />
- <Compile Include="Services\Interfaces\IUserSettingService.cs" />
 <Compile Include="Services\LibEncode.cs" />
 <Compile Include="Services\LibScan.cs" />
 <Compile Include="Services\PresetService.cs" />
 <Compile Include="Services\QueueProcessor.cs" />
- <Compile Include="Services\ScanService.cs" />
- <Compile Include="Services\UserSettingService.cs" />
- <Compile Include="ASUserSettingConstants.cs" />
 <Compile Include="Utilities\AppcastReader.cs" />
 <Compile Include="Utilities\CharCodesUtilities.cs" />
 <Compile Include="Utilities\GeneralUtilities.cs" />
@@ -168,6 +185,7 @@
 <EmbeddedResource Include="Properties\Resources.resx">
 <Generator>ResXFileCodeGenerator</Generator>
 <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <SubType>Designer</SubType>
 </EmbeddedResource>
 </ItemGroup>
 <ItemGroup>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Isolation/BackgroundServiceConnector.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Isolation/BackgroundServiceConnector.cs Changed

@@ -139,8 +139,6 @@
 
 #region Implemented Interfaces
 
- #region IDisposable
-
 /// <summary>
 /// The dispose.
 /// </summary>
@@ -149,37 +147,6 @@
 this.Service.Unsubscribe();
 }
 
- #endregion
-
- #region IHbServiceCallback
-
- /// <summary>
- /// The scan completed.
- /// </summary>
- /// <param name="eventArgs">
- /// The event args.
- /// </param>
- public virtual void ScanCompletedCallback(ScanCompletedEventArgs eventArgs)
- {
- }
-
- /// <summary>
- /// The scan progress.
- /// </summary>
- /// <param name="eventArgs">
- /// The event args.
- /// </param>
- public virtual void ScanProgressCallback(ScanProgressEventArgs eventArgs)
- {
- }
-
- /// <summary>
- /// The scan started callback.
- /// </summary>
- public virtual void ScanStartedCallback()
- {
- }
-
 /// <summary>
 /// The encode progress callback.
 /// </summary>
@@ -208,7 +175,5 @@
 }
 
 #endregion
-
- #endregion
 }
 }
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Isolation/IsolatedEncodeService.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Isolation/IsolatedEncodeService.cs Changed

@@ -93,6 +93,22 @@
 }
 
 /// <summary>
+ /// Gets a value indicating whether can pause.
+ /// </summary>
+ public bool CanPause
+ {
+ get
+ {
+ return false; // TODO make this work.
+ }
+ }
+
+ /// <summary>
+ /// Gets a value indicating whether is pasued.
+ /// </summary>
+ public bool IsPasued { get; private set; }
+
+ /// <summary>
 /// Gets a value indicating whether IsEncoding.
 /// </summary>
 public bool IsEncoding
@@ -151,9 +167,12 @@
 /// <param name="destination">
 /// The destination.
 /// </param>
- public void ProcessLogs(string destination)
+ /// <param name="configuration">
+ /// The configuration.
+ /// </param>
+ public void ProcessLogs(string destination, HBConfiguration configuration)
 {
- ThreadPool.QueueUserWorkItem(delegate { this.Service.ProcessEncodeLogs(destination); });
+ ThreadPool.QueueUserWorkItem(delegate { this.Service.ProcessEncodeLogs(destination, configuration); });
 }
 
 /// <summary>
@@ -162,13 +181,24 @@
 /// <param name="job">
 /// The job.
 /// </param>
- /// <param name="enableLogging">
- /// The enable Logging.
- /// </param>
- public void Start(QueueTask job, bool enableLogging)
+ public void Start(QueueTask job)
 {
 ThreadPool.QueueUserWorkItem(
- delegate { this.Service.StartEncode(job, enableLogging); });
+ delegate { this.Service.StartEncode(job); });
+ }
+
+ /// <summary>
+ /// The pause.
+ /// </summary>
+ public void Pause()
+ {
+ }
+
+ /// <summary>
+ /// The resume.
+ /// </summary>
+ public void Resume()
+ {
 }
 
 /// <summary>

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Audio Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Audio/AudioBehaviourModes.cs Added

@@ -0,0 +1,28 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AudioBehaviourModes.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The audio behaviours.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Model.Audio
+{
+ using System.ComponentModel.DataAnnotations;
+
+ /// <summary>
+ /// The audio behaviours.
+ /// </summary>
+ public enum AudioBehaviourModes
+ {
+ [Display(Name = "None")]
+ None = 0,
+
+ [Display(Name = "First Matching Selected Language")]
+ FirstMatch,
+
+ [Display(Name = "All Matching Selected Languages")]
+ AllMatching,
+ }
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Audio/AudioBehaviours.cs Added

@@ -0,0 +1,115 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AudioBehaviours.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Audio Behaviours
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Model.Audio
+{
+ using System.ComponentModel;
+
+ using Caliburn.Micro;
+
+ /// <summary>
+ /// Audio Behaviours
+ /// </summary>
+ public class AudioBehaviours : PropertyChangedBase
+ {
+ /// <summary>
+ /// The selected behaviour.
+ /// </summary>
+ private AudioBehaviourModes selectedBehaviour;
+
+ /// <summary>
+ /// The selected langauges.
+ /// </summary>
+ private BindingList<string> selectedLangauges;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="AudioBehaviours"/> class.
+ /// </summary>
+ public AudioBehaviours()
+ {
+ this.SelectedBehaviour = AudioBehaviourModes.None;
+ this.SelectedLangauges = new BindingList<string>();
+ }
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="AudioBehaviours"/> class.
+ /// </summary>
+ /// <param name="behaviours">
+ /// The behaviours.
+ /// </param>
+ public AudioBehaviours(AudioBehaviours behaviours)
+ {
+ this.SelectedBehaviour = behaviours.SelectedBehaviour;
+ this.SelectedLangauges = new BindingList<string>(behaviours.selectedLangauges);
+ }
+
+ /// <summary>
+ /// Gets or sets the selected behaviour.
+ /// </summary>
+ public AudioBehaviourModes SelectedBehaviour
+ {
+ get
+ {
+ return this.selectedBehaviour;
+ }
+ 
+ set
+ {
+ if (value == this.selectedBehaviour)
+ {
+ return;
+ }
+ this.selectedBehaviour = value;
+ this.NotifyOfPropertyChange(() => this.SelectedBehaviour);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the selected langauges.
+ /// </summary>
+ public BindingList<string> SelectedLangauges
+ {
+ get
+ {
+ return this.selectedLangauges;
+ }
+ set
+ {
+ if (Equals(value, this.selectedLangauges))
+ {
+ return;
+ }
+ this.selectedLangauges = value;
+ this.NotifyOfPropertyChange(() => this.SelectedLangauges);
+ }
+ }
+
+ /// <summary>
+ /// Clone this object
+ /// </summary>
+ /// <returns>
+ /// The <see cref="object"/>.
+ /// </returns>
+ public AudioBehaviours Clone()
+ {
+ AudioBehaviours cloned = new AudioBehaviours
+ {
+ SelectedBehaviour = this.selectedBehaviour,
+ SelectedLangauges = new BindingList<string>()
+ };
+
+ foreach (var item in this.SelectedLangauges)
+ {
+ cloned.SelectedLangauges.Add(item);
+ }
+
+ return cloned;
+ }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs Changed

@@ -18,6 +18,7 @@
 using HandBrake.Interop.Model;
 using HandBrake.Interop.Model.Encoding;
 using HandBrake.Interop.Model.Encoding.x264;
+ using HandBrake.Interop.Model.Encoding.x265;
 
 using OutputFormat = HandBrake.ApplicationServices.Model.Encoding.OutputFormat;
 
@@ -33,6 +34,11 @@
 /// </summary>
 private bool showAdvancedTab;
 
+ /// <summary>
+ /// The advanced encoder options.
+ /// </summary>
+ private string advancedEncoderOptions;
+
 #endregion
 
 /// <summary>
@@ -46,9 +52,14 @@
 this.ChapterNames = new ObservableCollection<ChapterMarker>();
 this.AllowedPassthruOptions = new AllowedPassthru();
 this.X264Preset = x264Preset.Medium;
+ this.QsvPreset = QsvPreset.Quality;
 this.H264Profile = x264Profile.None;
 this.X264Tune = x264Tune.None;
 this.Modulus = 16;
+
+ this.H265Profile = x265Profile.None;
+ this.X265Preset = x265Preset.VeryFast;
+ this.X265Tune = x265Tune.None;
 }
 
 /// <summary>
@@ -87,6 +98,8 @@
 this.Decomb = task.Decomb;
 this.Deinterlace = task.Deinterlace;
 this.Denoise = task.Denoise;
+ this.DenoisePreset = task.DenoisePreset;
+ this.DenoiseTune = task.DenoiseTune;
 this.Destination = task.Destination;
 this.Detelecine = task.Detelecine;
 this.DisplayWidth = task.DisplayWidth;
@@ -99,7 +112,6 @@
 this.IncludeChapterMarkers = task.IncludeChapterMarkers;
 this.IPod5GSupport = task.IPod5GSupport;
 this.KeepDisplayAspect = task.KeepDisplayAspect;
- this.LargeFile = task.LargeFile;
 this.MaxHeight = task.MaxHeight;
 this.MaxWidth = task.MaxWidth;
 this.Modulus = task.Modulus;
@@ -126,6 +138,7 @@
 this.VideoEncodeRateType = task.VideoEncodeRateType;
 this.Width = task.Width;
 this.X264Preset = task.X264Preset;
+ this.QsvPreset = task.QsvPreset;
 this.H264Profile = task.H264Profile;
 this.X264Tune = task.X264Tune;
 this.H264Level = task.H264Level;
@@ -134,6 +147,12 @@
 
 this.PreviewStartAt = task.PreviewStartAt;
 this.PreviewDuration = task.PreviewDuration;
+
+ this.ShowAdvancedTab = task.ShowAdvancedTab;
+
+ this.X265Preset = task.X265Preset;
+ this.X265Tune = task.X265Tune;
+ this.H265Profile = task.H265Profile;
 }
 
 #region Source
@@ -186,11 +205,6 @@
 public OutputFormat OutputFormat { get; set; }
 
 /// <summary>
- /// Gets or sets a value indicating whether LargeFile.
- /// </summary>
- public bool LargeFile { get; set; }
-
- /// <summary>
 /// Gets or sets a value indicating whether Optimize.
 /// </summary>
 public bool OptimizeMP4 { get; set; }
@@ -302,6 +316,16 @@
 public Denoise Denoise { get; set; }
 
 /// <summary>
+ /// Gets or sets the denoise preset.
+ /// </summary>
+ public DenoisePreset DenoisePreset { get; set; }
+
+ /// <summary>
+ /// Gets or sets the denoise tune.
+ /// </summary>
+ public DenoiseTune DenoiseTune { get; set; }
+
+ /// <summary>
 /// Gets or sets CustomDenoise.
 /// </summary>
 public string CustomDenoise { get; set; }
@@ -407,7 +431,17 @@
 /// <summary>
 /// Gets or sets AdvancedEncoderOptions.
 /// </summary>
- public string AdvancedEncoderOptions { get; set; }
+ public string AdvancedEncoderOptions
+ {
+ get
+ {
+ return this.advancedEncoderOptions;
+ }
+ set
+ {
+ this.advancedEncoderOptions = value;
+ }
+ }
 
 /// <summary>
 /// Gets or sets x264Preset.
@@ -415,6 +449,11 @@
 public x264Preset X264Preset { get; set; }
 
 /// <summary>
+ /// Gets or sets the qsv preset.
+ /// </summary>
+ public QsvPreset QsvPreset { get; set; }
+
+ /// <summary>
 /// Gets or sets x264Profile.
 /// </summary>
 public x264Profile H264Profile { get; set; }
@@ -439,6 +478,21 @@
 /// </summary>
 public string ExtraAdvancedArguments { get; set; }
 
+ /// <summary>
+ /// Gets or sets x265Preset.
+ /// </summary>
+ public x265Preset X265Preset { get; set; }
+
+ /// <summary>
+ /// Gets or sets x265Profile.
+ /// </summary>
+ public x265Profile H265Profile { get; set; }
+
+ /// <summary>
+ /// Gets or sets X265Tune.
+ /// </summary>
+ public x265Tune X265Tune { get; set; }
+
 #endregion
 
 #region Preview
@@ -464,9 +518,9 @@
 {
 get
 {
- if (this.OutputFormat == OutputFormat.M4V || this.OutputFormat == OutputFormat.Mp4)
+ if (this.OutputFormat == OutputFormat.Mp4)
 {
- bool audio = this.AudioTracks.Any(item => item.Encoder == AudioEncoder.Ac3Passthrough || 
+ bool audio = this.AudioTracks.Any(item => item.Encoder == AudioEncoder.Ac3Passthrough ||
 item.Encoder == AudioEncoder.Ac3 || item.Encoder == AudioEncoder.DtsPassthrough || item.Encoder == AudioEncoder.Passthrough);
 
 bool subtitles = this.SubtitleTracks.Any(track => track.SubtitleType != SubtitleType.VobSub);

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs Changed

@@ -63,7 +63,10 @@
 [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
 private Audio scannedTrack;
 
- private string trackName;
+ /// <summary>
+ /// The is default.
+ /// </summary>
+ private bool isDefault;
 
 #endregion
 
@@ -75,7 +78,7 @@
 public AudioTrack()
 {
 // Default Values
- this.Encoder = AudioEncoder.Faac;
+ this.Encoder = AudioEncoder.ffaac;
 this.MixDown = Mixdown.DolbyProLogicII;
 this.SampleRate = 48;
 this.Bitrate = 160;
@@ -184,6 +187,21 @@
 }
 
 /// <summary>
+ /// Gets or sets a value indicating whether is default.
+ /// </summary>
+ public bool IsDefault
+ {
+ get
+ {
+ return this.isDefault;
+ }
+ set
+ {
+ this.isDefault = value;
+ }
+ }
+
+ /// <summary>
 /// Gets or sets Audio Encoder
 /// </summary>
 public AudioEncoder Encoder
@@ -341,7 +359,7 @@
 {
 get
 {
- return this.IsPassthru || this.Encoder == AudioEncoder.ffflac;
+ return this.IsPassthru || this.Encoder == AudioEncoder.ffflac || this.Encoder == AudioEncoder.ffflac24;
 }
 }
 
@@ -352,7 +370,7 @@
 {
 get
 {
- return this.IsPassthru || this.Encoder == AudioEncoder.ffflac;
+ return this.IsPassthru || this.Encoder == AudioEncoder.ffflac || this.Encoder == AudioEncoder.ffflac24;
 }
 }
 
@@ -367,17 +385,7 @@
 /// <summary>
 /// Gets or sets the track name.
 /// </summary>
- public string TrackName
- {
- get
- {
- return this.trackName;
- }
- set
- {
- this.trackName = value;
- }
- }
+ public string TrackName { get; set; }
 
 #endregion
 }

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/DenoisePreset.cs Added

@@ -0,0 +1,37 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="DenoisePreset.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the DenoisePreset type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Model.Encoding
+{
+ using System.ComponentModel.DataAnnotations;
+
+ /// <summary>
+ /// The denoise preset.
+ /// </summary>
+ public enum DenoisePreset
+ {
+ [Display(Name = "Weak")]
+ Weak = 0,
+
+ [Display(Name = "Medium")]
+ Medium,
+
+ [Display(Name = "Strong")]
+ Strong,
+
+ [Display(Name = "Custom")]
+ Custom,
+
+ [Display(Name = "Ultralight")] // NLMeans only
+ Ultralight,
+
+ [Display(Name = "Light")] // NLMeans only
+ Light,
+ }
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/DenoiseTune.cs Added

@@ -0,0 +1,34 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="DenoiseTune.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the DenoiseTune type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Model.Encoding
+{
+ using System.ComponentModel.DataAnnotations;
+
+ /// <summary>
+ /// The denoise tune.
+ /// </summary>
+ public enum DenoiseTune
+ {
+ [Display(Name = "None")]
+ None = 0,
+
+ [Display(Name = "Film")]
+ Film,
+
+ [Display(Name = "Grain")]
+ Grain,
+
+ [Display(Name = "High Motion")]
+ HighMotion,
+
+ [Display(Name = "Animation")]
+ Animation,
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs Changed

@@ -233,8 +233,7 @@
             {
                 if (this.SourceTrack != null)
                 {
-                    return this.SourceTrack.SubtitleType == SubtitleType.VobSub || this.SourceTrack.SubtitleType == SubtitleType.PGS
-                        || this.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch;
+                    return this.SourceTrack.CanForce || this.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch;
                 }
 
                 return false;
@@ -247,11 +246,15 @@
         public bool CanBeBurned
         {
             get
-            {
+            {    
                 if (this.SourceTrack != null)
                 {
-                    return this.SourceTrack.SubtitleType == SubtitleType.VobSub || this.SourceTrack.SubtitleType == SubtitleType.PGS
-                        || this.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch || this.SourceTrack.SubtitleType == SubtitleType.SSA;
+                    return this.SourceTrack.CanBurnIn || this.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch || this.SubtitleType == SubtitleType.SRT;
+                }
+
+                if (this.SubtitleType == SubtitleType.SRT)
+                {
+                    return true;
                 }
 
                 return false;

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/HBConfiguration.cs Added

@@ -0,0 +1,77 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBConfiguration.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// HandBrakes Configuration options
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Model
+{
+ /// <summary>
+ /// HandBrakes configuration options
+ /// </summary>
+ public class HBConfiguration
+ {
+ /// <summary>
+ /// Gets or sets a value indicating whether is logging enabled.
+ /// </summary>
+ public bool IsLoggingEnabled { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether is dvd nav disabled.
+ /// </summary>
+ public bool IsDvdNavDisabled { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether disable quick sync decoding.
+ /// </summary>
+ public bool DisableQuickSyncDecoding { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether enable dxva.
+ /// </summary>
+ public bool EnableDxva { get; set; }
+
+ /// <summary>
+ /// Gets or sets the scaling mode.
+ /// </summary>
+ public VideoScaler ScalingMode { get; set; }
+
+ /// <summary>
+ /// Gets or sets the preview scan count.
+ /// </summary>
+ public int PreviewScanCount { get; set; }
+
+ /// <summary>
+ /// Gets or sets the verbosity.
+ /// </summary>
+ public int Verbosity { get; set; }
+
+ /// <summary>
+ /// Gets or sets the min scan duration.
+ /// </summary>
+ public int MinScanDuration { get; set; }
+
+ /// <summary>
+ /// Gets or sets the process priority.
+ /// </summary>
+ public string ProcessPriority { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether save log to copy directory.
+ /// </summary>
+ public bool SaveLogToCopyDirectory { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether save log with video.
+ /// </summary>
+ public bool SaveLogWithVideo{ get; set; }
+
+ /// <summary>
+ /// Gets or sets the save log copy directory.
+ /// </summary>
+ public string SaveLogCopyDirectory { get; set; }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Preset.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Preset.cs Changed

@@ -11,6 +11,9 @@
 {
 using Caliburn.Micro;
 
+ using HandBrake.ApplicationServices.Model.Audio;
+ using HandBrake.ApplicationServices.Model.Subtitle;
+
 /// <summary>
 /// A Preset for encoding with.
 /// </summary>
@@ -89,11 +92,49 @@
 /// </summary>
 public string Version { get; set; }
 
+ /// <summary>
+ /// Gets or sets the audio track behaviours.
+ /// </summary>
+ public AudioBehaviours AudioTrackBehaviours { get; set; }
+
+ /// <summary>
+ /// Gets or sets the subtitle track behaviours.
+ /// </summary>
+ public SubtitleBehaviours SubtitleTrackBehaviours { get; set; }
+
 #endregion
 
 #region Public Methods
 
 /// <summary>
+ /// Update this preset.
+ /// The given parameters should be copy-constructed.
+ /// </summary>
+ /// <param name="task">
+ /// The task.
+ /// </param>
+ /// <param name="audioBehaviours">
+ /// The audio behaviours.
+ /// </param>
+ /// <param name="subtitleBehaviours">
+ /// The subtitle behaviours.
+ /// </param>
+ public void Update(EncodeTask task, AudioBehaviours audioBehaviours, SubtitleBehaviours subtitleBehaviours)
+ {
+ // Copy over Max Width / Height for the following picture settings modes.
+ if (this.PictureSettingsMode == PresetPictureSettingsMode.Custom
+ || this.PictureSettingsMode == PresetPictureSettingsMode.SourceMaximum)
+ {
+ task.MaxWidth = this.Task.MaxWidth;
+ task.MaxHeight = this.Task.MaxHeight;
+ }
+
+ this.Task = task;
+ this.AudioTrackBehaviours = audioBehaviours;
+ this.SubtitleTrackBehaviours = subtitleBehaviours;
+ }
+
+ /// <summary>
 /// Override the ToString Method
 /// </summary>
 /// <returns>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/PresetPictureSettingsMode.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/PresetPictureSettingsMode.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs Changed

@@ -38,14 +38,25 @@
 }
 
 /// <summary>
- /// Gets or sets ScannedSource.
+ /// Initializes a new instance of the <see cref="QueueTask"/> class.
 /// </summary>
- public Source ScannedSource { get; set; } 
+ /// <param name="task">
+ /// The task.
+ /// </param>
+ /// <param name="configuration">
+ /// The configuration.
+ /// </param>
+ public QueueTask(EncodeTask task, HBConfiguration configuration)
+ {
+ this.Task = task;
+ this.Configuration = configuration;
+ this.Status = QueueItemStatus.Waiting;
+ }
 
 /// <summary>
- /// Gets or sets a value indicating whether if this is a user or GUI generated query
+ /// Gets or sets ScannedSource.
 /// </summary>
- public bool CustomQuery { get; set; }
+ public Source ScannedSource { get; set; } 
 
 /// <summary>
 /// Gets or sets Status.
@@ -65,10 +76,15 @@
 }
 
 /// <summary>
- /// Gets or sets the Encode Task.
+ /// Gets or sets the task.
 /// </summary>
 public EncodeTask Task { get; set; }
 
+ /// <summary>
+ /// Gets or sets the configuration.
+ /// </summary>
+ public HBConfiguration Configuration { get; set; }
+
 #endregion
 
 /// <summary>
@@ -82,7 +98,7 @@
 /// </returns>
 protected bool Equals(QueueTask other)
 {
- return Equals(this.ScannedSource, other.ScannedSource) && this.CustomQuery.Equals(other.CustomQuery) && Equals(this.Task, other.Task) && this.status == other.status;
+ return Equals(this.ScannedSource, other.ScannedSource) && Equals(this.Task, other.Task) && this.status == other.status;
 }
 
 /// <summary>
@@ -125,7 +141,6 @@
 unchecked
 {
 int hashCode = (this.ScannedSource != null ? this.ScannedSource.GetHashCode() : 0);
- hashCode = (hashCode * 397) ^ this.CustomQuery.GetHashCode();
 hashCode = (hashCode * 397) ^ (this.Task != null ? this.Task.GetHashCode() : 0);
 hashCode = (hashCode * 397) ^ (int)this.status;
 return hashCode;

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Subtitle Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Subtitle/SubtitleBehaviourModes.cs Added

@@ -0,0 +1,28 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SubtitleBehaviourModes.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The subtitle behaviours modes.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Model.Subtitle
+{
+ using System.ComponentModel.DataAnnotations;
+
+ /// <summary>
+ /// The subtitle behaviours modes.
+ /// </summary>
+ public enum SubtitleBehaviourModes
+ {
+ [Display(Name = "None")]
+ None = 0,
+
+ [Display(Name = "First Matching Selected Language")]
+ FirstMatch,
+
+ [Display(Name = "All Matching Selected Languages")]
+ AllMatching,
+ }
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Subtitle/SubtitleBehaviours.cs Added

@@ -0,0 +1,166 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SubtitleBehaviours.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// A class to track the behaviours of audio track selection
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Model.Subtitle
+{
+ using System.ComponentModel;
+
+ using Caliburn.Micro;
+
+ /// <summary>
+ /// A class to track the behaviours of audio track selection
+ /// </summary>
+ public class SubtitleBehaviours : PropertyChangedBase
+ {
+ /// <summary>
+ /// The selected behaviour.
+ /// </summary>
+ private SubtitleBehaviourModes selectedBehaviour;
+
+ /// <summary>
+ /// The selected langauges.
+ /// </summary>
+ private BindingList<string> selectedLangauges;
+
+ /// <summary>
+ /// The add foreign audio scan track.
+ /// </summary>
+ private bool addForeignAudioScanTrack;
+
+ /// <summary>
+ /// The add closed captions.
+ /// </summary>
+ private bool addClosedCaptions;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="SubtitleBehaviours"/> class.
+ /// </summary>
+ public SubtitleBehaviours()
+ {
+ this.SelectedBehaviour = SubtitleBehaviourModes.None;
+ this.SelectedLangauges = new BindingList<string>();
+ }
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="SubtitleBehaviours"/> class.
+ /// </summary>
+ /// <param name="behaviours">
+ /// The behaviours.
+ /// </param>
+ public SubtitleBehaviours(SubtitleBehaviours behaviours)
+ {
+ this.SelectedBehaviour = behaviours.selectedBehaviour;
+ this.SelectedLangauges = new BindingList<string>(behaviours.SelectedLangauges);
+ }
+
+ /// <summary>
+ /// Gets or sets the selected behaviour.
+ /// </summary>
+ public SubtitleBehaviourModes SelectedBehaviour
+ {
+ get
+ {
+ return this.selectedBehaviour;
+ }
+ set
+ {
+ if (value == this.selectedBehaviour)
+ {
+ return;
+ }
+ this.selectedBehaviour = value;
+ this.NotifyOfPropertyChange(() => this.SelectedBehaviour);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the selected langages.
+ /// </summary>
+ public BindingList<string> SelectedLangauges
+ {
+ get
+ {
+ return this.selectedLangauges;
+ }
+ set
+ {
+ if (Equals(value, this.selectedLangauges))
+ {
+ return;
+ }
+ this.selectedLangauges = value;
+ this.NotifyOfPropertyChange(() => this.SelectedLangauges);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether add foreign audio scan track.
+ /// </summary>
+ public bool AddForeignAudioScanTrack
+ {
+ get
+ {
+ return this.addForeignAudioScanTrack;
+ }
+ set
+ {
+ if (value.Equals(this.addForeignAudioScanTrack))
+ {
+ return;
+ }
+ this.addForeignAudioScanTrack = value;
+ this.NotifyOfPropertyChange(() => this.AddForeignAudioScanTrack);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether add closed captions.
+ /// </summary>
+ public bool AddClosedCaptions
+ {
+ get
+ {
+ return this.addClosedCaptions;
+ }
+ set
+ {
+ if (value.Equals(this.addClosedCaptions))
+ {
+ return;
+ }
+ this.addClosedCaptions = value;
+ this.NotifyOfPropertyChange(() => this.AddClosedCaptions);
+ }
+ }
+
+ /// <summary>
+ /// Clone this object
+ /// </summary>
+ /// <returns>
+ /// The <see cref="object"/>.
+ /// </returns>
+ public SubtitleBehaviours Clone()
+ {
+ SubtitleBehaviours cloned = new SubtitleBehaviours
+ {
+ SelectedBehaviour = this.selectedBehaviour,
+ SelectedLangauges = new BindingList<string>(),
+ AddClosedCaptions = this.addClosedCaptions,
+ AddForeignAudioScanTrack = this.addForeignAudioScanTrack,
+ };
+
+ foreach (var item in this.SelectedLangauges)
+ {
+ cloned.SelectedLangauges.Add(item);
+ }
+
+ return cloned;
+ }
+ }
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/VideoScaler.cs Added

@@ -0,0 +1,28 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="VideoScaler.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The different scaling modes available in HandBrake
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Model
+{
+ using System.ComponentModel.DataAnnotations;
+
+ /// <summary>
+ /// The different scaling modes available in HandBrake
+ /// </summary>
+ public enum VideoScaler
+ {
+ [Display(Name = "Lanczos (default)")]
+ Lanczos = 0,
+
+ // [Display(Name = "Bicubic")]
+ // Bicubic,
+
+ [Display(Name = "Bicubic (OpenCL)")]
+ BicubicCl,
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Audio.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Audio.cs Changed

@@ -105,12 +105,7 @@
 return this.Description;
 }
 
- if (this.Description == null)
- {
- return string.Format("{0} {1} ({2})", this.TrackNumber, this.Language, this.Format);
- }
-
- return string.Format("{0} {1} ({2}) ({3})", this.TrackNumber, this.Language, this.Format, this.Description);
+ return string.Format("{0} {1}", this.TrackNumber, this.Description);
 }
 
 /// <summary>
@@ -128,10 +123,12 @@
 {
 return false;
 }
+
 if (ReferenceEquals(this, other))
 {
 return true;
 }
+
 return other.TrackNumber == this.TrackNumber && object.Equals(other.Language, this.Language) && object.Equals(other.LanguageCode, this.LanguageCode) && object.Equals(other.Format, this.Format);
 }
 
@@ -148,14 +145,17 @@
 {
 return false;
 }
+
 if (ReferenceEquals(this, obj))
 {
 return true;
 }
+
 if (obj.GetType() != typeof(Audio))
 {
 return false;
 }
+
 return Equals((Audio)obj);
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Chapter.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Chapter.cs Changed

@@ -10,9 +10,7 @@
 namespace HandBrake.ApplicationServices.Parsing
 {
 using System;
- using System.Collections.Generic;
- using System.IO;
- using System.Text.RegularExpressions;
+ using System.Globalization;
 
 /// <summary>
 /// An object representing a Chapter aosciated with a Title, in a DVD
@@ -61,69 +59,12 @@
 public TimeSpan Duration { get; set; }
 
 /// <summary>
- /// Parse a CLI string to a Chapter object
- /// </summary>
- /// <param name="output">
- /// The output.
- /// </param>
- /// <returns>
- /// A chapter Object
- /// </returns>
- public static Chapter Parse(StringReader output)
- {
- // TODO add support for reading chapter names to the regex.
- string line = output.ReadLine();
- Match m = Regex.Match(line, @"^ \+ ([0-9]*): cells ([0-9]*)->([0-9]*), ([0-9]*) blocks, duration ([0-9]{2}:[0-9]{2}:[0-9]{2})");
- if (m.Success)
- {
- var thisChapter = new Chapter
- {
- ChapterNumber = int.Parse(m.Groups[1].Value.Trim()), 
- ChapterName = string.Empty,
- Duration = TimeSpan.Parse(m.Groups[5].Value)
- };
- return thisChapter;
- }
- return null;
- }
-
- /// <summary>
- /// Prase a list of strings / chatpers
- /// </summary>
- /// <param name="output">
- /// The output.
- /// </param>
- /// <returns>
- /// An array of chapter objects
- /// </returns>
- public static Chapter[] ParseList(StringReader output)
- {
- var chapters = new List<Chapter>();
-
- // this is to read the " + chapters:" line from the buffer
- // so we can start reading the chapters themselvs
- output.ReadLine();
-
- while (true)
- {
- // Start of the chapter list for this Title
- Chapter thisChapter = Parse(output);
-
- if (thisChapter != null)
- chapters.Add(thisChapter);
- else
- break;
- }
- return chapters.ToArray();
- }
-
- /// <summary>
 /// Override of the ToString method to make this object easier to use in the UI
 /// </summary>
 /// <returns>A string formatted as: {chapter #}</returns>
 public override string ToString()
 {
- return ChapterNumber.ToString();
+ return ChapterNumber.ToString(CultureInfo.InvariantCulture);
 }
 }
 }
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Source.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Source.cs Changed

@@ -10,11 +10,8 @@
 namespace HandBrake.ApplicationServices.Parsing
 {
 using System.Collections.Generic;
- using System.IO;
 using System.Runtime.Serialization;
 
- using HandBrake.ApplicationServices.Services.Interfaces;
-
 /// <summary>
 /// An object representing a scanned DVD
 /// </summary>
@@ -44,33 +41,6 @@
 public List<Title> Titles { get; set; }
 
 /// <summary>
- /// Parse the StreamReader output into a List of Titles
- /// </summary>
- /// <param name="output">
- /// The output.
- /// </param>
- /// <param name="isDvdNavDisabled">
- /// The is Dvd Nav Disabled.
- /// </param>
- /// <returns>
- /// A DVD object which contains a list of title inforamtion
- /// </returns>
- public static Source Parse(StreamReader output, bool isDvdNavDisabled)
- {
- var thisDVD = new Source();
-
- while (!output.EndOfStream)
- {
- if ((char) output.Peek() == '+')
- thisDVD.Titles.AddRange(Title.ParseList(output.ReadToEnd(), isDvdNavDisabled));
- else
- output.ReadLine();
- }
-
- return thisDVD;
- }
-
- /// <summary>
 /// Copy this Source to another Source Model
 /// </summary>
 /// <param name="source">

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Subtitle.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Subtitle.cs Changed

@@ -10,9 +10,7 @@
 namespace HandBrake.ApplicationServices.Parsing
 {
 using System;
- using System.Collections.Generic;
- using System.IO;
- using System.Text.RegularExpressions;
+ using System.Xml.Serialization;
 
 using HandBrake.ApplicationServices.Model.Encoding;
 using HandBrake.ApplicationServices.Utilities;
@@ -32,6 +30,9 @@
 /// <summary>
 /// Initializes a new instance of the <see cref="Subtitle"/> class.
 /// </summary>
+ /// <param name="sourceId">
+ /// The source Id.
+ /// </param>
 /// <param name="trackNumber">
 /// The track number.
 /// </param>
@@ -44,14 +45,27 @@
 /// <param name="subtitleType">
 /// The subtitle type.
 /// </param>
- public Subtitle(int trackNumber, string language, string languageCode, SubtitleType subtitleType)
+ /// <param name="canBurn">
+ /// The can Burn.
+ /// </param>
+ /// <param name="canForce">
+ /// The can Force.
+ /// </param>
+ public Subtitle(int sourceId, int trackNumber, string language, string languageCode, SubtitleType subtitleType, bool canBurn, bool canForce)
 {
+ this.SourceId = sourceId;
 this.TrackNumber = trackNumber;
 this.Language = language;
 this.LanguageCode = languageCode;
 this.SubtitleType = subtitleType;
+ this.CanBurnIn = canBurn;
+ this.CanForce = canForce;
 }
 
+ /// <summary>
+ /// Gets or sets the source id.
+ /// </summary>
+ public int SourceId { get; set; }
 
 /// <summary>
 /// Gets or sets the track number of this Subtitle
@@ -69,102 +83,47 @@
 public string LanguageCode { get; set; }
 
 /// <summary>
- /// Gets or sets the Subtitle Type
- /// </summary>
- public SubtitleType SubtitleType { get; set; }
-
- /// <summary>
- /// Gets Subtitle Type
+ /// Gets the language code clean.
+ /// TODO Remove this after fixing language code.
 /// </summary>
- public string TypeString
+ public string LanguageCodeClean
 {
 get
 {
- return EnumHelper<Enum>.GetDescription(this.SubtitleType);
+ if (this.LanguageCode != null)
+ {
+ return this.LanguageCode.Replace("iso639-2: ", string.Empty).Trim();
+ }
+ return string.Empty;
 }
 }
 
 /// <summary>
- /// Parse the input strings related to subtitles
+ /// Gets a value indicating whether can burn in.
 /// </summary>
- /// <param name="output">
- /// The output.
- /// </param>
- /// <returns>
- /// A Subitle object
- /// </returns>
- public static Subtitle Parse(StringReader output)
- {
- string curLine = output.ReadLine();
-
- // + 1, English (iso639-2: eng) (Text)(SSA)
- // + 1, English (iso639-2: eng) (Text)(UTF-8)
- Match m = Regex.Match(curLine, @"^ \+ ([0-9]*), ([A-Za-z, ]*) $(.*)$ $([a-zA-Z]*)$$([a-zA-Z0-9\-]*)$");
+ [XmlIgnore]
+ public bool CanBurnIn { get; private set; }
 
- if (m.Success && !curLine.Contains("HandBrake has exited."))
- {
- var thisSubtitle = new Subtitle
- {
- TrackNumber = int.Parse(m.Groups[1].Value.Trim()),
- Language = m.Groups[2].Value,
- LanguageCode = m.Groups[3].Value,
- };
-
- switch (m.Groups[5].Value)
- {
- case "VOBSUB":
- thisSubtitle.SubtitleType = SubtitleType.VobSub;
- break;
- case "SRT":
- thisSubtitle.SubtitleType = SubtitleType.SRT;
- break;
- case "CC":
- thisSubtitle.SubtitleType = SubtitleType.CC;
- break;
- case "UTF-8":
- thisSubtitle.SubtitleType = SubtitleType.UTF8Sub;
- break;
- case "TX3G":
- thisSubtitle.SubtitleType = SubtitleType.TX3G;
- break;
- case "SSA":
- thisSubtitle.SubtitleType = SubtitleType.SSA;
- break;
- case "PGS":
- thisSubtitle.SubtitleType = SubtitleType.PGS;
- break;
- default:
- thisSubtitle.SubtitleType = SubtitleType.Unknown;
- break;
- }
+ /// <summary>
+ /// Gets a value indicating whether can force.
+ /// </summary>
+ [XmlIgnore]
+ public bool CanForce { get; private set; }
 
- return thisSubtitle;
- }
- return null;
- }
+ /// <summary>
+ /// Gets or sets the Subtitle Type
+ /// </summary>
+ public SubtitleType SubtitleType { get; set; }
 
 /// <summary>
- /// Parse a list of Subtitle tracks from an input string.
+ /// Gets Subtitle Type
 /// </summary>
- /// <param name="output">
- /// The output.
- /// </param>
- /// <returns>
- /// An array of Subtitle objects
- /// </returns>
- public static IEnumerable<Subtitle> ParseList(StringReader output)
+ public string TypeString
 {
- var subtitles = new List<Subtitle>();
- while ((char)output.Peek() != '+')
+ get
 {
- Subtitle thisSubtitle = Parse(output);
-
- if (thisSubtitle != null)
- subtitles.Add(thisSubtitle);
- else
- break;
+ return EnumHelper<Enum>.GetDescription(this.SubtitleType);
 }
- return subtitles.ToArray();
 }
 
 /// <summary>
@@ -211,14 +170,17 @@
 {
 return false;
 }
+ 
 if (ReferenceEquals(this, obj))
 {
 return true;
 }
+ 
 if (obj.GetType() != typeof(Subtitle))
 {
 return false;
 }
+
 return Equals((Subtitle)obj);
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs Changed

@@ -11,10 +11,7 @@
 {
 using System;
 using System.Collections.Generic;
- using System.Globalization;
- using System.IO;
 using System.Linq;
- using System.Text.RegularExpressions;
 
 using HandBrake.Interop.Model;
 
@@ -115,138 +112,6 @@
 #endregion
 
 /// <summary>
- /// Parse the Title Information
- /// </summary>
- /// <param name="output">
- /// A StringReader of output data
- /// </param>
- /// <param name="isDvdNavDisabled">
- /// The is Dvd Nav Disabled.
- /// </param>
- /// <returns>
- /// A Title Object
- /// </returns>
- public static Title Parse(StringReader output, bool isDvdNavDisabled)
- {
- var thisTitle = new Title();
- string nextLine = output.ReadLine();
-
- // Get the Title Number
- Match m = Regex.Match(nextLine, @"^\+ title ([0-9]*):");
- if (m.Success)
- thisTitle.TitleNumber = int.Parse(m.Groups[1].Value.Trim());
- nextLine = output.ReadLine();
-
- // Detect if this is the main feature
- m = Regex.Match(nextLine, @" \+ Main Feature");
- if (m.Success)
- {
- thisTitle.MainTitle = true;
- nextLine = output.ReadLine();
- }
-
- // Get the stream name for file import
- m = Regex.Match(nextLine, @"^ \+ stream:");
- if (m.Success)
- {
- thisTitle.SourceName = nextLine.Replace("+ stream:", string.Empty).Trim();
- nextLine = output.ReadLine();
- }
-
- // Playlist
- m = Regex.Match(nextLine, @"^ \+ playlist:");
- if (m.Success)
- {
- thisTitle.Playlist = nextLine.Replace("+ playlist:", string.Empty).Trim();
- nextLine = output.ReadLine();
- }
-
- // Jump over the VTS and blocks line
- m = Regex.Match(nextLine, @"^ \+ vts:");
- if (nextLine.Contains("blocks") || nextLine.Contains("+ vts "))
- {
- nextLine = output.ReadLine();
- }
-
- // Multi-Angle Support if LibDvdNav is enabled
- m = Regex.Match(nextLine, @" \+ angle$s$ ([0-9]*)");
- if (m.Success)
- {
- string angleList = m.Value.Replace("+ angle(s) ", string.Empty).Trim();
- int angleCount;
- int.TryParse(angleList, out angleCount);
-
- thisTitle.AngleCount = angleCount;
- nextLine = output.ReadLine();
- }
-
- // Get duration for this title
- m = Regex.Match(nextLine, @"^ \+ duration: ([0-9]{2}:[0-9]{2}:[0-9]{2})");
- if (m.Success)
- thisTitle.Duration = TimeSpan.Parse(m.Groups[1].Value);
-
- // Get resolution, aspect ratio and FPS for this title
- m = Regex.Match(output.ReadLine(), @"^ \+ size: ([0-9]*)x([0-9]*), pixel aspect: ([0-9]*)/([0-9]*), display aspect: ([0-9]*\.[0-9]*), ([0-9]*\.[0-9]*) fps");
- if (m.Success)
- {
- thisTitle.Resolution = new Size(int.Parse(m.Groups[1].Value), int.Parse(m.Groups[2].Value));
- thisTitle.ParVal = new Size(int.Parse(m.Groups[3].Value), int.Parse(m.Groups[4].Value));
- thisTitle.AspectRatio = Math.Round(float.Parse(m.Groups[5].Value, CultureInfo.InvariantCulture), 2);
- thisTitle.Fps = float.Parse(m.Groups[6].Value, CultureInfo.InvariantCulture);
- }
-
- // Get autocrop region for this title
- m = Regex.Match(output.ReadLine(), @"^ \+ autocrop: ([0-9]*)/([0-9]*)/([0-9]*)/([0-9]*)");
- if (m.Success)
- {
- thisTitle.AutoCropDimensions = new Cropping
- {
- Top = int.Parse(m.Groups[1].Value),
- Bottom = int.Parse(m.Groups[2].Value),
- Left = int.Parse(m.Groups[3].Value),
- Right = int.Parse(m.Groups[4].Value)
- };
- }
-
- thisTitle.Chapters.AddRange(Chapter.ParseList(output));
-
- thisTitle.AudioTracks.AddRange(AudioHelper.ParseList(output));
-
- thisTitle.Subtitles.AddRange(Subtitle.ParseList(output));
-
- return thisTitle;
- }
-
- /// <summary>
- /// Return a list of parsed titles
- /// </summary>
- /// <param name="output">
- /// The Output
- /// </param>
- /// <param name="isDvdNavDisabled">
- /// The is Dvd Nav Disabled.
- /// </param>
- /// <returns>
- /// A List of titles
- /// </returns>
- public static Title[] ParseList(string output, bool isDvdNavDisabled)
- {
- var titles = new List<Title>();
- var sr = new StringReader(output);
-
- while (sr.Peek() == '+' || sr.Peek() == ' ')
- {
- // If the the character is a space, then chances are the line
- if (sr.Peek() == ' ') // If the character is a space, then chances are it's the combing detected line.
- sr.ReadLine(); // Skip over it
- else
- titles.Add(Parse(sr, isDvdNavDisabled));
- }
-
- return titles.ToArray();
- }
-
- /// <summary>
 /// Calcuate the Duration
 /// </summary>
 /// <param name="startPoint">The Start Point (Chapters)</param>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.Nightly.tmpl -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.Nightly.tmpl Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Base/EncodeBase.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Base/EncodeBase.cs Changed

@@ -34,11 +34,6 @@
 private static readonly object FileWriterLock = new object();
 
 /// <summary>
- /// The User Setting Service
- /// </summary>
- private readonly IUserSettingService userSettingService;
-
- /// <summary>
 /// The Log File Header
 /// </summary>
 private readonly StringBuilder header;
@@ -58,16 +53,10 @@
 /// <summary>
 /// Initializes a new instance of the <see cref="EncodeBase"/> class.
 /// </summary>
- /// <param name="userSettingService">
- /// The user Setting Service.
- /// </param>
- public EncodeBase(IUserSettingService userSettingService)
+ public EncodeBase()
 {
- this.userSettingService = userSettingService;
 this.logBuffer = new StringBuilder();
- header =
- GeneralUtilities.CreateCliLogHeader();
-
+ header = GeneralUtilities.CreateCliLogHeader();
 this.LogIndex = 0;
 }
 
@@ -197,7 +186,10 @@
 /// <param name="destination">
 /// The Destination File Path
 /// </param>
- public void ProcessLogs(string destination)
+ /// <param name="configuration">
+ /// The configuration.
+ /// </param>
+ public void ProcessLogs(string destination, HBConfiguration configuration)
 {
 try
 {
@@ -220,17 +212,16 @@
 File.Copy(tempLogFile, Path.Combine(logDir, encodeLogFile));
 
 // Save a copy of the log file in the same location as the enocde.
- if (this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SaveLogWithVideo))
+ if (configuration.SaveLogWithVideo)
 {
 File.Copy(tempLogFile, Path.Combine(encodeDestinationPath, encodeLogFile));
 }
 
 // Save a copy of the log file to a user specified location
- if (Directory.Exists(this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.SaveLogCopyDirectory)) &&
- this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SaveLogToCopyDirectory))
+ if (Directory.Exists(configuration.SaveLogCopyDirectory) && configuration.SaveLogToCopyDirectory)
 {
 File.Copy(
- tempLogFile, Path.Combine(this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.SaveLogCopyDirectory), encodeLogFile));
+ tempLogFile, Path.Combine(configuration.SaveLogCopyDirectory, encodeLogFile));
 }
 }
 catch (Exception)
@@ -299,7 +290,7 @@
 
 return null;
 }
- catch (Exception exc)
+ catch (Exception)
 {
 return null;
 }
@@ -320,13 +311,9 @@
 
 try
 {
- string query = QueryGeneratorUtility.GenerateQuery(new EncodeTask(encodeQueueTask.Task),
- userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount),
- userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity),
- userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav));
+ string query = QueryGeneratorUtility.GenerateQuery(new EncodeTask(encodeQueueTask.Task), encodeQueueTask.Configuration);
 this.logBuffer = new StringBuilder();
 this.logBuffer.AppendLine(String.Format("CLI Query: {0}", query));
- this.logBuffer.AppendLine(String.Format("User Query: {0}", encodeQueueTask.CustomQuery));
 this.logBuffer.AppendLine();
 
 // Clear the current Encode Logs)
@@ -343,7 +330,6 @@
 this.fileWriter = new StreamWriter(logFile) { AutoFlush = true };
 this.fileWriter.WriteLine(header);
 this.fileWriter.WriteLine(string.Format("CLI Query: {0}", query));
- this.fileWriter.WriteLine(string.Format("User Query: {0}", encodeQueueTask.CustomQuery));
 this.fileWriter.WriteLine();
 }
 catch (Exception)
@@ -385,7 +371,7 @@
 }
 }
 }
- catch (Exception exc)
+ catch (Exception)
 {
 // Do Nothing.
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Encode.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Encode.cs Changed

@@ -14,9 +14,8 @@
 using System.IO;
 using System.Windows.Forms;
 
- using Caliburn.Micro;
-
 using HandBrake.ApplicationServices.EventArgs;
+ using HandBrake.ApplicationServices.Exceptions;
 using HandBrake.ApplicationServices.Model;
 using HandBrake.ApplicationServices.Services.Base;
 using HandBrake.ApplicationServices.Services.Interfaces;
@@ -30,11 +29,6 @@
 #region Private Variables
 
 /// <summary>
- /// The User Setting Service
- /// </summary>
- private readonly IUserSettingService userSettingService;
-
- /// <summary>
 /// Gets the Process ID
 /// </summary>
 private int processId;
@@ -56,24 +50,28 @@
 
 #endregion
 
+ #region Properties
+
 /// <summary>
- /// Initializes a new instance of the <see cref="Encode"/> class.
+ /// Gets or sets The HB Process
 /// </summary>
- /// <param name="userSettingService">
- /// The user Setting Service.
- /// </param>
- public Encode(IUserSettingService userSettingService)
- : base(userSettingService)
+ protected Process HbProcess { get; set; }
+
+ /// <summary>
+ /// Gets a value indicating whether can pause.
+ /// </summary>
+ public bool CanPause
 {
- this.userSettingService = userSettingService;
+ get
+ {
+ return false;
+ }
 }
 
- #region Properties
-
 /// <summary>
- /// Gets or sets The HB Process
+ /// Gets a value indicating whether is pasued.
 /// </summary>
- protected Process HbProcess { get; set; }
+ public bool IsPasued { get; private set; }
 
 #endregion
 
@@ -86,23 +84,19 @@
 /// <param name="encodeQueueTask">
 /// The encodeQueueTask.
 /// </param>
- /// <param name="enableLogging">
- /// Enable Logging. When Disabled we onlt parse Standard Ouput for progress info. Standard Error log data is ignored.
- /// </param>
- public void Start(QueueTask encodeQueueTask, bool enableLogging)
+ public void Start(QueueTask encodeQueueTask)
 {
 try
 {
 if (this.IsEncoding)
 {
- throw new Exception("HandBrake is already encodeing.");
+ throw new GeneralApplicationException("HandBrake is already encodeing.", "Please try again in a minute", null);
 }
 
 this.IsEncoding = true;
-
 this.currentTask = encodeQueueTask;
 
- if (enableLogging)
+ if (encodeQueueTask.Configuration.IsLoggingEnabled)
 {
 try
 {
@@ -115,11 +109,6 @@
 }
 }
 
- if (this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.PreventSleep))
- {
- Win32.PreventSleep();
- }
-
 // Make sure the path exists, attempt to create it if it doesn't
 this.VerifyEncodeDestinationPath(currentTask);
 
@@ -129,20 +118,15 @@
 string query = this.currentTask.Task.IsPreviewEncode
 ? QueryGeneratorUtility.GeneratePreviewQuery(
 new EncodeTask(this.currentTask.Task),
+ encodeQueueTask.Configuration,
 this.currentTask.Task.PreviewEncodeDuration,
- this.currentTask.Task.PreviewEncodeStartAt,
- userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount),
- userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity),
- userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav))
- : QueryGeneratorUtility.GenerateQuery(new EncodeTask(this.currentTask.Task),
- userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount),
- userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity),
- userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav));
+ this.currentTask.Task.PreviewEncodeStartAt)
+ : QueryGeneratorUtility.GenerateQuery(new EncodeTask(this.currentTask.Task), encodeQueueTask.Configuration);
 
 ProcessStartInfo cliStart = new ProcessStartInfo(handbrakeCLIPath, query)
 {
 RedirectStandardOutput = true,
- RedirectStandardError = enableLogging,
+ RedirectStandardError = encodeQueueTask.Configuration.IsLoggingEnabled,
 UseShellExecute = false,
 CreateNoWindow = true
 };
@@ -153,7 +137,7 @@
 
 this.startTime = DateTime.Now;
 
- if (enableLogging)
+ if (encodeQueueTask.Configuration.IsLoggingEnabled)
 {
 this.HbProcess.ErrorDataReceived += this.HbProcErrorDataReceived;
 this.HbProcess.BeginErrorReadLine();
@@ -172,7 +156,7 @@
 }
 
 // Set the Process Priority
- switch (this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.ProcessPriority))
+ switch (encodeQueueTask.Configuration.ProcessPriority)
 {
 case "Realtime":
 this.HbProcess.PriorityClass = ProcessPriorityClass.RealTime;
@@ -200,14 +184,37 @@
 catch (Exception exc)
 {
 encodeQueueTask.Status = QueueItemStatus.Error;
+ this.IsEncoding = false;
 this.InvokeEncodeCompleted(
 new EncodeCompletedEventArgs(
- false, null, "An Error occured when trying to encode this source. "));
+ false, exc, "An Error occured when trying to encode this source. ", this.currentTask.Task.Destination));
 throw;
 }
 }
 
 /// <summary>
+ /// The pause.
+ /// </summary>
+ /// <exception cref="NotImplementedException">
+ /// This feature is not available for CLI based encoding.
+ /// </exception>
+ public void Pause()
+ {
+ throw new NotImplementedException("This feature is not available for CLI based encoding.");
+ }
+
+ /// <summary>
+ /// The resume.
+ /// </summary>
+ /// <exception cref="NotImplementedException">
+ /// This feature is not available for CLI based encoding.
+ /// </exception>
+ public void Resume()
+ {
+ throw new NotImplementedException("This feature is not available for CLI based encoding.");
+ }
+
+ /// <summary>
 /// Kill the CLI process
 /// </summary>
 public override void Stop()
@@ -256,22 +263,14 @@
 this.HbProcess.CancelOutputRead();
 this.ShutdownFileWriter();
 }
- catch (Exception exc)
+ catch (Exception)
 {
 // This exception doesn't warrent user interaction, but it should be logged (TODO)
 }
 
- Execute.OnUIThread(() =>
- {
- if (this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.PreventSleep))
- {
- Win32.AllowSleep();
- }
- });
-
 this.currentTask.Status = QueueItemStatus.Completed;
 this.IsEncoding = false;
- this.InvokeEncodeCompleted(new EncodeCompletedEventArgs(true, null, string.Empty));
+ this.InvokeEncodeCompleted(new EncodeCompletedEventArgs(true, null, string.Empty, this.currentTask.Task.Destination));
 }
 
 /// <summary>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IEncode.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IEncode.cs Changed

@@ -72,15 +72,32 @@
 int LogIndex { get; }
 
 /// <summary>
+ /// Gets a value indicating whether can pause.
+ /// </summary>
+ bool CanPause { get; }
+
+ /// <summary>
+ /// Gets a value indicating whether is pasued.
+ /// </summary>
+ bool IsPasued { get; }
+
+ /// <summary>
 /// Start with a LibHb EncodeJob Object
 /// </summary>
 /// <param name="job">
 /// The job.
 /// </param>
- /// <param name="enableLogging">
- /// The enable Logging.
- /// </param>
- void Start(QueueTask job, bool enableLogging);
+ void Start(QueueTask job);
+
+ /// <summary>
+ /// The pause.
+ /// </summary>
+ void Pause();
+
+ /// <summary>
+ /// The resume.
+ /// </summary>
+ void Resume();
 
 /// <summary>
 /// Kill the CLI process
@@ -93,7 +110,10 @@
 /// <param name="destination">
 /// The destination.
 /// </param>
- void ProcessLogs(string destination);
+ /// <param name="configuration">
+ /// The configuration.
+ /// </param>
+ void ProcessLogs(string destination, HBConfiguration configuration);
 
 /// <summary>
 /// Shutdown the service.

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IHbServiceCallback.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IHbServiceCallback.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueProcessor.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueProcessor.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IScan.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IScan.cs Changed

@@ -10,8 +10,10 @@
 namespace HandBrake.ApplicationServices.Services.Interfaces
 {
 using System;
+ using System.Windows.Media.Imaging;
 
 using HandBrake.ApplicationServices.EventArgs;
+ using HandBrake.ApplicationServices.Model;
 using HandBrake.ApplicationServices.Parsing;
 
 /// <summary>
@@ -81,30 +83,31 @@
 /// <param name="title">
 /// int title number. 0 for scan all
 /// </param>
- /// <param name="previewCount">
- /// The preview Count.
- /// </param>
 /// <param name="postAction">
 /// The post Action.
 /// </param>
- void Scan(string sourcePath, int title, int previewCount, Action<bool> postAction);
-
- /// <summary>
- /// Kill the scan
- /// </summary>
- void Stop();
+ /// <param name="configuration">
+ /// The configuraiton.
+ /// </param>
+ void Scan(string sourcePath, int title, Action<bool> postAction, HBConfiguration configuration);
 
 /// <summary>
- /// Take a Scan Log file, and process it as if it were from the CLI.
+ /// Get a Preview image for the current job and preview number.
 /// </summary>
- /// <param name="path">
- /// The path to the log file.
+ /// <param name="task">
+ /// The task.
+ /// </param>
+ /// <param name="preview">
+ /// The preview.
 /// </param>
- void DebugScanLog(string path);
+ /// <returns>
+ /// The <see cref="BitmapImage"/>.
+ /// </returns>
+ BitmapImage GetPreview(EncodeTask task, int preview);
 
 /// <summary>
- /// Shutdown the service.
+ /// Kill the scan
 /// </summary>
- void Shutdown();
+ void Stop();
 }
 }
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IServerService.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IServerService.cs Changed

@@ -13,7 +13,6 @@
 using System.ServiceModel;
 
 using HandBrake.ApplicationServices.Model;
- using HandBrake.ApplicationServices.Parsing;
 
 /// <summary>
 /// The HandBrakeService interface.
@@ -25,33 +24,9 @@
 /// Gets the activity log.
 /// </summary>
 [DataMember]
- string ScanActivityLog { get; }
-
- /// <summary>
- /// Gets the activity log.
- /// </summary>
- [DataMember]
 string EncodeActivityLog { get; }
 
 /// <summary>
- /// Gets the souce data.
- /// </summary>
- Source SouceData
- {
- [OperationContract]
- get;
- }
-
- /// <summary>
- /// Gets a value indicating whether is scanning.
- /// </summary>
- bool IsScanning
- {
- [OperationContract]
- get;
- }
-
- /// <summary>
 /// Gets a value indicating whether is encoding.
 /// </summary>
 bool IsEncoding
@@ -74,31 +49,13 @@
 void Stop();
 
 /// <summary>
- /// The scan source.
- /// </summary>
- /// <param name="path">
- /// The path.
- /// </param>
- /// <param name="title">
- /// The title.
- /// </param>
- /// <param name="previewCount">
- /// The preview Count.
- /// </param>
- [OperationContract]
- void ScanSource(string path, int title, int previewCount);
-
- /// <summary>
 /// Start and Encode
 /// </summary>
 /// <param name="job">
 /// The job.
 /// </param>
- /// <param name="enableLogging">
- /// The enable logging.
- /// </param>
 [OperationContract]
- void StartEncode(QueueTask job, bool enableLogging);
+ void StartEncode(QueueTask job);
 
 /// <summary>
 /// The process encode logs.
@@ -106,8 +63,11 @@
 /// <param name="destination">
 /// The destination.
 /// </param>
+ /// <param name="configuration">
+ /// The configuration.
+ /// </param>
 [OperationContract]
- void ProcessEncodeLogs(string destination);
+ void ProcessEncodeLogs(string destination, HBConfiguration configuration);
 
 /// <summary>
 /// Stop and Encode
@@ -116,12 +76,6 @@
 void StopEncode();
 
 /// <summary>
- /// Stop the scan.
- /// </summary>
- [OperationContract]
- void StopScan();
-
- /// <summary>
 /// Subscribe for callbacks from the called functions
 /// </summary>
 /// <returns>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs Changed

@@ -11,7 +11,6 @@
 {
 using System;
 using System.Diagnostics;
- using System.Globalization;
 
 using HandBrake.ApplicationServices.Model;
 using HandBrake.ApplicationServices.Services.Base;
@@ -35,12 +34,12 @@
 /// <summary>
 /// Lock for the log file
 /// </summary>
- private static readonly object logLock = new object();
+ private static readonly object LogLock = new object();
 
 /// <summary>
- /// The User Setting Service
+ /// The instance.
 /// </summary>
- private readonly IUserSettingService userSettingService;
+ private IHandBrakeInstance instance;
 
 /// <summary>
 /// The Start time of the current Encode;
@@ -48,54 +47,62 @@
 private DateTime startTime;
 
 /// <summary>
- /// An Instance of the HandBrake Interop Library
+ /// A flag to indicate if logging is enabled or not.
 /// </summary>
- private IHandBrakeInstance instance;
+ private bool loggingEnabled;
 
 /// <summary>
- /// A flag to indicate if logging is enabled or not.
+ /// The Current Task
 /// </summary>
- private bool loggingEnabled;
+ private QueueTask currentTask;
 
 #endregion
 
 /// <summary>
 /// Initializes a new instance of the <see cref="LibEncode"/> class.
 /// </summary>
- /// <param name="userSettingService">
- /// The user Setting Service.
- /// </param>
- /// <param name="handBrakeInstance">
- /// The hand Brake Instance.
- /// </param>
- public LibEncode(IUserSettingService userSettingService, IHandBrakeInstance handBrakeInstance)
- : base(userSettingService)
+ public LibEncode()
 {
- this.userSettingService = userSettingService;
-
- // Setup the HandBrake Instance
- this.instance = handBrakeInstance;
- this.instance.EncodeCompleted += this.InstanceEncodeCompleted;
- this.instance.EncodeProgress += this.InstanceEncodeProgress;
-
 HandBrakeUtils.MessageLogged += this.HandBrakeInstanceMessageLogged;
 HandBrakeUtils.ErrorLogged += this.HandBrakeInstanceErrorLogged;
 }
 
 /// <summary>
+ /// Gets a value indicating whether can pause.
+ /// </summary>
+ public bool CanPause
+ {
+ get
+ {
+ return true;
+ }
+ }
+
+ /// <summary>
+ /// Gets a value indicating whether is pasued.
+ /// </summary>
+ public bool IsPasued { get; private set; }
+
+ /// <summary>
 /// Start with a LibHb EncodeJob Object
 /// </summary>
 /// <param name="job">
 /// The job.
 /// </param>
- /// <param name="enableLogging">
- /// The enable Logging.
- /// </param>
- public void Start(QueueTask job, bool enableLogging)
+ public void Start(QueueTask job)
 {
+ // Setup
 this.startTime = DateTime.Now;
- this.loggingEnabled = enableLogging;
+ this.loggingEnabled = job.Configuration.IsLoggingEnabled;
+ this.currentTask = job;
 
+ // Create a new HandBrake instance
+ // Setup the HandBrake Instance
+ instance = new HandBrakeInstance();
+ instance.Initialize(1);
+ instance.EncodeCompleted += this.InstanceEncodeCompleted;
+ instance.EncodeProgress += this.InstanceEncodeProgress;
+ 
 try
 {
 // Sanity Checking and Setup
@@ -106,11 +113,8 @@
 
 this.IsEncoding = true;
 
- // Get an EncodeJob object for the Interop Library
- EncodeJob encodeJob = InteropModelCreator.GetEncodeJob(job);
-
 // Enable logging if required.
- if (enableLogging)
+ if (job.Configuration.IsLoggingEnabled)
 {
 try
 {
@@ -123,47 +127,45 @@
 }
 }
 
- // Prvent the system from sleeping if the user asks
- if (this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.PreventSleep) )
- {
- Win32.PreventSleep();
- }
-
 // Verify the Destination Path Exists, and if not, create it.
 this.VerifyEncodeDestinationPath(job);
 
- // Start the Encode
- this.instance.StartEncode(encodeJob);
+ // We have to scan the source again but only the title so the HandBrake instance is initialised correctly. 
+ // Since the UI sends the crop params down, we don't have to do all the previews.
+ instance.StartScan(job.Task.Source, job.Configuration.PreviewScanCount, job.Task.Title);
 
- // Set the Process Priority
- switch (this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.ProcessPriority))
- {
- case "Realtime":
- Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.RealTime;
- break;
- case "High":
- Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.High;
- break;
- case "Above Normal":
- Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.AboveNormal;
- break;
- case "Normal":
- Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.Normal;
- break;
- case "Low":
- Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.Idle;
- break;
- default:
- Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.BelowNormal;
- break;
- }
-
- // Fire the Encode Started Event
- this.InvokeEncodeStarted(EventArgs.Empty);
+ instance.ScanCompleted += delegate
+ {
+ ScanCompleted(job, instance);
+ };
 }
 catch (Exception exc)
 {
- this.InvokeEncodeCompleted(new EncodeCompletedEventArgs(false, exc, "An Error has occured."));
+ this.InvokeEncodeCompleted(new EncodeCompletedEventArgs(false, exc, "An Error has occured.", this.currentTask.Task.Destination));
+ }
+ }
+
+ /// <summary>
+ /// Pause the currently running encode.
+ /// </summary>
+ public void Pause()
+ {
+ if (this.instance != null)
+ {
+ this.instance.PauseEncode();
+ this.IsPasued = true;
+ }
+ }
+
+ /// <summary>
+ /// Resume the currently running encode.
+ /// </summary>
+ public void Resume()
+ {
+ if (this.instance != null)
+ {
+ this.instance.ResumeEncode();
+ this.IsPasued = false;
 }
 }
 
@@ -191,6 +193,50 @@
 // Nothing to do for this implementation.
 }
 
+ /// <summary>
+ /// The scan completed.
+ /// </summary>
+ /// <param name="job">
+ /// The job.
+ /// </param>
+ /// <param name="instance">
+ /// The instance.
+ /// </param>
+ private void ScanCompleted(QueueTask job, IHandBrakeInstance instance)
+ {
+ // Get an EncodeJob object for the Interop Library
+ EncodeJob encodeJob = InteropModelCreator.GetEncodeJob(job);
+
+ // Start the Encode
+ instance.StartEncode(encodeJob, job.Configuration.PreviewScanCount);
+
+ // Fire the Encode Started Event
+ this.InvokeEncodeStarted(EventArgs.Empty);
+
+ // Set the Process Priority
+ switch (job.Configuration.ProcessPriority)
+ {
+ case "Realtime":
+ Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.RealTime;
+ break;
+ case "High":
+ Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.High;
+ break;
+ case "Above Normal":
+ Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.AboveNormal;
+ break;
+ case "Normal":
+ Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.Normal;
+ break;
+ case "Low":
+ Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.Idle;
+ break;
+ default:
+ Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.BelowNormal;
+ break;
+ }
+ }
+
 #region HandBrakeInstance Event Handlers.
 /// <summary>
 /// Log a message
@@ -205,7 +251,7 @@
 {
 if (this.loggingEnabled)
 {
- lock (logLock)
+ lock (LogLock)
 {
 this.ProcessLogMessage(e.Message);
 }
@@ -225,7 +271,7 @@
 {
 if (this.loggingEnabled)
 {
- lock (logLock)
+ lock (LogLock)
 {
 this.ProcessLogMessage(e.Message);
 }
@@ -271,13 +317,8 @@
 
 this.InvokeEncodeCompleted(
 e.Error
- ? new EncodeCompletedEventArgs(false, null, string.Empty)
- : new EncodeCompletedEventArgs(true, null, string.Empty));
-
- if (this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.PreventSleep))
- {
- Win32.AllowSleep();
- }
+ ? new EncodeCompletedEventArgs(false, null, string.Empty, this.currentTask.Task.Destination)
+ : new EncodeCompletedEventArgs(true, null, string.Empty, this.currentTask.Task.Destination));
 
 this.ShutdownFileWriter();
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs Changed

@@ -11,21 +11,29 @@
 {
 using System;
 using System.Collections.Generic;
+ using System.IO;
 using System.Text;
- using System.Threading;
+ using System.Text.RegularExpressions;
+ using System.Windows.Media.Imaging;
 
 using HandBrake.ApplicationServices.EventArgs;
- using HandBrake.ApplicationServices.Model.Encoding;
+ using HandBrake.ApplicationServices.Model;
 using HandBrake.ApplicationServices.Parsing;
 using HandBrake.ApplicationServices.Services.Interfaces;
 using HandBrake.ApplicationServices.Utilities;
 using HandBrake.Interop;
 using HandBrake.Interop.EventArgs;
 using HandBrake.Interop.Interfaces;
+ using HandBrake.Interop.Model;
+ using HandBrake.Interop.SourceData;
 
 using AudioTrack = HandBrake.ApplicationServices.Parsing.Audio;
+ using Chapter = HandBrake.ApplicationServices.Parsing.Chapter;
 using ScanProgressEventArgs = HandBrake.Interop.EventArgs.ScanProgressEventArgs;
 using Size = System.Drawing.Size;
+ using Subtitle = HandBrake.ApplicationServices.Parsing.Subtitle;
+ using SubtitleType = HandBrake.ApplicationServices.Model.Encoding.SubtitleType;
+ using Title = HandBrake.ApplicationServices.Parsing.Title;
 
 /// <summary>
 /// Scan a Source
@@ -35,7 +43,7 @@
 /*
 * TODO
 * 1. Expose the Previews code.
- * 2. Expose the Logging.
+ * 2. Cleanup old instances.
 * 
 */
 
@@ -47,11 +55,6 @@
 static readonly object LogLock = new object();
 
 /// <summary>
- /// LibHB Instance
- /// </summary>
- private readonly IHandBrakeInstance instance;
-
- /// <summary>
 /// Log data from HandBrakeInstance
 /// </summary>
 private readonly StringBuilder logging;
@@ -66,27 +69,51 @@
 /// </summary>
 private string currentSourceScanPath;
 
+ /// <summary>
+ /// The log dir.
+ /// </summary>
+ private static string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
+
+ /// <summary>
+ /// The dvd info path.
+ /// </summary>
+ private string dvdInfoPath = Path.Combine(logDir, string.Format("last_scan_log{0}.txt", GeneralUtilities.ProcessId));
+
+ /// <summary>
+ /// The scan log.
+ /// </summary>
+ private StreamWriter scanLog;
+
+ /// <summary>
+ /// LibHB Instance
+ /// </summary>
+ private IHandBrakeInstance instance;
+
+ /// <summary>
+ /// The post scan operation.
+ /// </summary>
+ private Action<bool> postScanOperation;
+
 #endregion
 
 /// <summary>
 /// Initializes a new instance of the <see cref="LibScan"/> class. 
 /// </summary>
- /// <param name="handBrakeInstance">
- /// The hand Brake Instance.
- /// </param>
- public LibScan(IHandBrakeInstance handBrakeInstance)
+ public LibScan()
 {
 logging = new StringBuilder();
 
 header = GeneralUtilities.CreateCliLogHeader();
 
- instance = handBrakeInstance;
- instance.Initialize(1);
- instance.ScanProgress += this.InstanceScanProgress;
- instance.ScanCompleted += this.InstanceScanCompleted;
-
- HandBrakeUtils.MessageLogged += this.HandBrakeInstanceMessageLogged;
- HandBrakeUtils.ErrorLogged += this.HandBrakeInstanceErrorLogged;
+ try
+ {
+ HandBrakeUtils.MessageLogged += this.HandBrakeInstanceMessageLogged;
+ HandBrakeUtils.ErrorLogged += this.HandBrakeInstanceErrorLogged;
+ }
+ catch (Exception)
+ {
+ // Do nothing. 
+ }
 }
 
 #region Events
@@ -127,7 +154,8 @@
 {
 get
 {
- return string.IsNullOrEmpty(this.logging.ToString()) ? this.header + "No log data available..." : this.header + this.logging.ToString();
+ string noLog = "No log data available... Log data will show here after you scan a source. \n\nOpen the log file directory to get previous log files.";
+ return string.IsNullOrEmpty(this.logging.ToString()) ? this.header + noLog : this.header + this.logging.ToString();
 }
 }
 
@@ -145,16 +173,64 @@
 /// <param name="title">
 /// int title number. 0 for scan all
 /// </param>
- /// <param name="previewCount">
- /// The preview Count.
- /// </param>
 /// <param name="postAction">
 /// The post Action.
 /// </param>
- public void Scan(string sourcePath, int title, int previewCount, Action<bool> postAction)
+ /// <param name="configuraiton">
+ /// The configuraiton.
+ /// </param>
+ public void Scan(string sourcePath, int title, Action<bool> postAction, HBConfiguration configuraiton)
 {
- Thread t = new Thread(unused => this.ScanSource(sourcePath, title, previewCount));
- t.Start();
+ // Try to cleanup any previous scan instances.
+ if (instance != null)
+ {
+ try
+ {
+ this.scanLog.Close();
+ this.scanLog.Dispose();
+ instance.Dispose();
+ }
+ catch (Exception)
+ {
+ // Do Nothing
+ }
+ }
+
+ // Handle the post scan operation.
+ postScanOperation = postAction;
+
+ // Clear down the logging
+ this.logging.Clear();
+
+ try
+ {
+ // Make we don't pick up a stale last_scan_log_xyz.txt (and that we have rights to the file)
+ if (File.Exists(dvdInfoPath))
+ {
+ File.Delete(dvdInfoPath);
+ }
+ }
+ catch (Exception)
+ {
+ // Do nothing.
+ }
+
+ if (!Directory.Exists(Path.GetDirectoryName(dvdInfoPath)))
+ {
+ Directory.CreateDirectory(Path.GetDirectoryName(dvdInfoPath));
+ }
+
+ // Create a new scan log.
+ scanLog = new StreamWriter(dvdInfoPath);
+
+ // Create a new HandBrake Instance.
+ instance = new HandBrakeInstance();
+ instance.Initialize(1);
+ instance.ScanProgress += this.InstanceScanProgress;
+ instance.ScanCompleted += this.InstanceScanCompleted;
+
+ // Start the scan on a back
+ this.ScanSource(sourcePath, title, configuraiton.PreviewScanCount, configuraiton);
 }
 
 /// <summary>
@@ -163,28 +239,53 @@
 public void Stop()
 {
 instance.StopScan();
+
+ try
+ {
+ if (this.scanLog != null)
+ {
+ this.scanLog.Close();
+ this.scanLog.Dispose();
+ }
+ }
+ catch (Exception)
+ {
+ // Do Nothing.
+ }
 }
 
 /// <summary>
- /// Debug a Scan Log (Only Available for CLI Mode, not LIBHB)
+ /// Get a Preview image for the current job and preview number.
 /// </summary>
- /// <param name="path">
- /// The path.
+ /// <param name="job">
+ /// The job.
+ /// </param>
+ /// <param name="preview">
+ /// The preview.
 /// </param>
- /// <exception cref="NotImplementedException">
- /// (Only Available for CLI Mode, not LIBHB)
- /// </exception>
- public void DebugScanLog(string path)
+ /// <returns>
+ /// The <see cref="BitmapImage"/>.
+ /// </returns>
+ public BitmapImage GetPreview(EncodeTask job, int preview)
 {
- throw new NotImplementedException("Only Available when using the CLI mode. Not LibHB");
- }
+ if (this.instance == null)
+ {
+ return null;
+ }
 
- /// <summary>
- /// Shutdown the service.
- /// </summary>
- public void Shutdown()
- {
- // Nothing to do for this implementation.
+ EncodeJob encodeJob = InteropModelCreator.GetEncodeJob(job);
+
+ BitmapImage bitmapImage = null;
+ try
+ {
+ bitmapImage = this.instance.GetPreview(encodeJob, preview);
+ }
+ catch (AccessViolationException e)
+ {
+ Console.WriteLine(e);
+ }
+ 
+ return bitmapImage;
 }
 
 #endregion
@@ -203,7 +304,10 @@
 /// <param name="previewCount">
 /// The preview Count.
 /// </param>
- private void ScanSource(object sourcePath, int title, int previewCount)
+ /// <param name="configuraiton">
+ /// The configuraiton.
+ /// </param>
+ private void ScanSource(object sourcePath, int title, int previewCount, HBConfiguration configuraiton)
 {
 try
 {
@@ -217,10 +321,13 @@
 if (this.ScanStared != null)
 this.ScanStared(this, new EventArgs());
 
- if (title != 0)
- instance.StartScan(sourcePath.ToString(), previewCount, title);
- else
- instance.StartScan(sourcePath.ToString(), previewCount);
+ TimeSpan minDuration =
+ TimeSpan.FromSeconds(
+ configuraiton.MinScanDuration);
+
+ HandBrakeUtils.SetDvdNav(!configuraiton.IsDvdNavDisabled);
+
+ this.instance.StartScan(sourcePath.ToString(), previewCount, minDuration, title != 0 ? title : 0);
 }
 catch (Exception exc)
 {
@@ -245,6 +352,19 @@
 /// </param>
 private void InstanceScanCompleted(object sender, EventArgs e)
 {
+ // Write the log file out before we start processing incase we crash.
+ try
+ {
+ if (this.scanLog != null)
+ {
+ this.scanLog.Flush();
+ }
+ }
+ catch (Exception)
+ {
+ // Do Nothing.
+ }
+
 // TODO -> Might be a better place to fix this.
 string path = currentSourceScanPath;
 if (currentSourceScanPath.Contains("\""))
@@ -252,12 +372,19 @@
 path = currentSourceScanPath.Trim('\"');
 }
 
- this.SouceData = new Source { Titles = ConvertTitles(this.instance.Titles), ScanPath = path };
+ // Process into internal structures.
+ this.SouceData = new Source { Titles = ConvertTitles(this.instance.Titles, this.instance.FeatureTitle), ScanPath = path };
 
 IsScanning = false;
 
- if (this.ScanCompleted != null)
- this.ScanCompleted(this, new ScanCompletedEventArgs(false, null, string.Empty));
+ if (postScanOperation != null)
+ {
+ postScanOperation(true);
+ }
+ else
+ {
+ if (this.ScanCompleted != null) this.ScanCompleted(this, new ScanCompletedEventArgs(false, null, string.Empty));
+ }
 }
 
 /// <summary>
@@ -277,7 +404,8 @@
 new ApplicationServices.EventArgs.ScanProgressEventArgs
 {
 CurrentTitle = e.CurrentTitle,
- Titles = e.Titles
+ Titles = e.Titles,
+ Percentage = Math.Round((decimal)e.Progress * 100, 0)
 };
 
 this.ScanStatusChanged(this, eventArgs);
@@ -297,6 +425,11 @@
 {
 lock (LogLock)
 {
+ if (this.scanLog != null)
+ {
+ this.scanLog.WriteLine(e.Message);
+ }
+
 this.logging.AppendLine(e.Message);
 }
 }
@@ -314,6 +447,11 @@
 {
 lock (LogLock)
 {
+ if (this.scanLog != null)
+ {
+ this.scanLog.WriteLine(e.Message);
+ }
+
 this.logging.AppendLine(e.Message);
 }
 }
@@ -324,29 +462,36 @@
 /// <param name="titles">
 /// The titles.
 /// </param>
+ /// <param name="featureTitle">
+ /// The feature Title.
+ /// </param>
 /// <returns>
 /// The convert titles.
 /// </returns>
- private static List<Title> ConvertTitles(IEnumerable<Interop.SourceData.Title> titles)
+ private static List<Title> ConvertTitles(IEnumerable<Interop.SourceData.Title> titles, int featureTitle)
 {
 List<Title> titleList = new List<Title>();
 foreach (Interop.SourceData.Title title in titles)
 {
 Title converted = new Title
 {
- TitleNumber = title.TitleNumber, 
- Duration = title.Duration, 
- Resolution = new Size(title.Resolution.Width, title.Resolution.Height), 
- AspectRatio = title.AspectRatio, 
- AngleCount = title.AngleCount, 
- ParVal = new Size(title.ParVal.Width, title.ParVal.Height), 
+ TitleNumber = title.TitleNumber,
+ Duration = title.Duration,
+ Resolution = new Size(title.Resolution.Width, title.Resolution.Height),
+ AspectRatio = title.AspectRatio,
+ AngleCount = title.AngleCount,
+ ParVal = new Size(title.ParVal.Width, title.ParVal.Height),
 AutoCropDimensions = title.AutoCropDimensions,
- Fps = title.Framerate
+ Fps = title.Framerate,
+ SourceName = title.Path,
+ MainTitle = title.TitleNumber == featureTitle,
+ Playlist = title.InputType == InputType.Bluray ? string.Format(" {0:d5}.MPLS", title.Playlist).Trim() : null
 };
 
 foreach (Interop.SourceData.Chapter chapter in title.Chapters)
 {
- converted.Chapters.Add(new Chapter(chapter.ChapterNumber, string.Empty, chapter.Duration));
+ string chapterName = !string.IsNullOrEmpty(chapter.Name) ? chapter.Name : string.Empty;
+ converted.Chapters.Add(new Chapter(chapter.ChapterNumber, chapterName, chapter.Duration));
 }
 
 foreach (Interop.SourceData.AudioTrack track in title.AudioTracks)
@@ -381,9 +526,12 @@
 case Interop.SourceData.SubtitleSource.CC708:
 convertedType = SubtitleType.CC;
 break;
+ case Interop.SourceData.SubtitleSource.PGS:
+ convertedType = SubtitleType.PGS;
+ break;
 }
 
- converted.Subtitles.Add(new Subtitle(track.TrackNumber, track.Language, track.LanguageCode, convertedType));
+ converted.Subtitles.Add(new Subtitle(track.SubtitleSourceInt, track.TrackNumber, track.Language, track.LanguageCode, convertedType, track.CanBurn, track.CanSetForcedOnly));
 }
 
 titleList.Add(converted);

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs Changed

@@ -38,11 +38,6 @@
 private static readonly XmlSerializer Ser = new XmlSerializer(typeof(List<Preset>));
 
 /// <summary>
- /// The User Setting Service
- /// </summary>
- private readonly IUserSettingService userSettingService;
-
- /// <summary>
 /// User Preset Default Catgory Name
 /// </summary>
 public static string UserPresetCatgoryName = "User Presets";
@@ -60,30 +55,10 @@
 /// <summary>
 /// A Collection of presets
 /// </summary>
- private ObservableCollection<Preset> presets = new ObservableCollection<Preset>();
+ private readonly ObservableCollection<Preset> presets = new ObservableCollection<Preset>();
 
 #endregion
 
-
- /// <summary>
- /// Initializes a new instance of the <see cref="PresetService"/> class.
- /// </summary>
- /// <param name="userSettingService">
- /// The user Setting Service.
- /// </param>
- public PresetService(IUserSettingService userSettingService)
- {
- this.userSettingService = userSettingService;
-
- // If the preset file doesn't exist. Create it.
- if (!File.Exists(this.builtInPresetFile))
- {
- this.UpdateBuiltInPresets();
- }
-
- this.LoadPresets();
- }
-
 /// <summary>
 /// Gets a Collection of presets.
 /// </summary>
@@ -114,6 +89,20 @@
 #region Public Methods
 
 /// <summary>
+ /// The load.
+ /// </summary>
+ public void Load()
+ {
+ // If the preset file doesn't exist. Create it.
+ if (!File.Exists(this.builtInPresetFile))
+ {
+ this.UpdateBuiltInPresets();
+ }
+
+ this.LoadPresets();
+ }
+
+ /// <summary>
 /// Add a new preset to the system.
 /// Performs an Update if it already exists
 /// </summary>
@@ -313,6 +302,11 @@
 Task = QueryParserUtility.Parse(presetName[2])
 };
 
+ if (newPreset.Name == "iPod")
+ {
+ newPreset.Task.KeepDisplayAspect = true;
+ }
+
 newPreset.Task.AllowedPassthruOptions = new AllowedPassthru(true); // We don't want to override the built-in preset
 
 if (newPreset.Name == "Normal")
@@ -407,7 +401,7 @@
 // Recover from Error.
 if (File.Exists(file))
 {
- string disabledFile = file + ".old";
+ string disabledFile = string.Format("{0}.{1}", file, GeneralUtilities.ProcessId);
 File.Move(file, disabledFile);
 if (File.Exists(file))
 {
@@ -415,7 +409,7 @@
 }
 }
 } 
- catch(IOException)
+ catch (IOException)
 {
 // Give up
 }
@@ -446,11 +440,10 @@
 }
 } 
 }
- catch (Exception exc)
+ catch (Exception)
 {
 RecoverFromCorruptedPresetFile(this.builtInPresetFile);
 this.UpdateBuiltInPresets();
- throw new GeneralApplicationException("HandBrake has detected corruption in the presets file and has attempted to rebuild this file.", "Please restart HandBrake before continuing.", exc); 
 }
 
 // Load in the users Presets from UserPresets.xml
@@ -471,7 +464,7 @@
 catch (Exception exc)
 {
 RecoverFromCorruptedPresetFile(this.userPresetFile);
- throw new GeneralApplicationException("HandBrake has detected corruption in the presets file and has attempted to rebuild this file.", "Please restart HandBrake before continuing.", exc); 
+ throw new GeneralApplicationException("HandBrake has detected a problem with your presets.", "Your old presets file has been renamed so that it doesn't get loaded on next launch.", exc); 
 }
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/QueueProcessor.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/QueueProcessor.cs Changed

@@ -12,10 +12,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
- using System.Diagnostics;
 using System.IO;
 using System.Linq;
- using System.Windows.Forms;
 using System.Xml.Serialization;
 
 using Caliburn.Micro;
@@ -44,14 +42,14 @@
 private readonly BindingList<QueueTask> queue = new BindingList<QueueTask>();
 
 /// <summary>
- /// The User Setting Service
+ /// HandBrakes Queue file with a place holder for an extra string.
 /// </summary>
- private readonly IUserSettingService userSettingService;
+ private readonly string queueFile;
 
 /// <summary>
- /// HandBrakes Queue file with a place holder for an extra string.
+ /// The clear completed.
 /// </summary>
- private string queueFile;
+ private bool clearCompleted;
 
 #endregion
 
@@ -63,15 +61,11 @@
 /// <param name="encodeService">
 /// The encode Service.
 /// </param>
- /// <param name="userSettingService">
- /// The user Setting Service.
- /// </param>
 /// <exception cref="ArgumentNullException">
 /// Services are not setup
 /// </exception>
- public QueueProcessor(IEncodeServiceWrapper encodeService, IUserSettingService userSettingService)
+ public QueueProcessor(IEncodeServiceWrapper encodeService)
 {
- this.userSettingService = userSettingService;
 this.EncodeService = encodeService;
 
 // If this is the first instance, just use the main queue file, otherwise add the instance id to the filename.
@@ -93,6 +87,17 @@
 /// </param>
 public delegate void QueueProgressStatus(object sender, QueueProgressEventArgs e);
 
+ /// <summary>
+ /// The queue completed.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
+ public delegate void QueueCompletedEventDelegate(object sender, QueueCompletedEventArgs e);
+
 #endregion
 
 #region Events
@@ -111,7 +116,7 @@
 /// <summary>
 /// Fires when the entire encode queue has completed.
 /// </summary>
- public event EventHandler QueueCompleted;
+ public event QueueCompletedEventDelegate QueueCompleted;
 
 /// <summary>
 /// Fires when a pause to the encode queue has been requested.
@@ -215,7 +220,7 @@
 /// </returns>
 public bool CheckForDestinationPathDuplicates(string destination)
 {
- return this.queue.Any(job => job.Task != null && job.Task.Destination.Contains(destination.Replace("\\\\", "\\")));
+ return this.queue.Any(job => job.Task != null && job.Status == QueueItemStatus.Waiting && job.Task.Destination != null && job.Task.Destination.Contains(destination.Replace("\\\\", "\\")));
 }
 
 /// <summary>
@@ -238,15 +243,15 @@
 {
 Execute.OnUIThread(
 () =>
+ {
+ List<QueueTask> deleteList =
+ this.queue.Where(task => task.Status == QueueItemStatus.Completed).ToList();
+ foreach (QueueTask item in deleteList)
 {
- List<QueueTask> deleteList =
- this.queue.Where(task => task.Status == QueueItemStatus.Completed).ToList();
- foreach (QueueTask item in deleteList)
- {
- this.queue.Remove(item);
- }
- this.InvokeQueueChanged(EventArgs.Empty);
- });
+ this.queue.Remove(item);
+ }
+ this.InvokeQueueChanged(EventArgs.Empty);
+ });
 }
 
 /// <summary>
@@ -381,8 +386,8 @@
 catch (Exception exc)
 {
 throw new GeneralApplicationException(
- "Unable to restore queue file.", 
- "The file may be corrupted or from an older incompatible version of HandBrake", 
+ "Unable to restore queue file.",
+ "The file may be corrupted or from an older incompatible version of HandBrake",
 exc);
 }
 
@@ -427,16 +432,32 @@
 /// Starts encoding the first job in the queue and continues encoding until all jobs
 /// have been encoded.
 /// </summary>
- public void Start()
+ /// <param name="isClearCompleted">
+ /// The is Clear Completed.
+ /// </param>
+ public void Start(bool isClearCompleted)
 {
 if (this.IsProcessing)
 {
 throw new Exception("Already Processing the Queue");
 }
 
- this.IsProcessing = true;
+ clearCompleted = isClearCompleted;
+
+ this.EncodeService.EncodeCompleted -= this.EncodeServiceEncodeCompleted;
 this.EncodeService.EncodeCompleted += this.EncodeServiceEncodeCompleted;
- this.ProcessNextJob();
+
+ if (this.EncodeService.CanPause && this.EncodeService.IsEncoding)
+ {
+ this.EncodeService.Resume();
+ }
+
+ if (!this.EncodeService.IsEncoding)
+ {
+ this.ProcessNextJob();
+ }
+
+ this.IsProcessing = true;
 }
 
 #endregion
@@ -457,7 +478,7 @@
 this.LastProcessedJob.Status = QueueItemStatus.Completed;
 
 // Clear the completed item of the queue if the setting is set.
- if (this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.ClearCompletedFromQueue))
+ if (clearCompleted)
 {
 this.ClearCompleted();
 }
@@ -469,13 +490,7 @@
 }
 
 // Handling Log Data 
- this.EncodeService.ProcessLogs(this.LastProcessedJob.Task.Destination);
-
- // Post-Processing
- if (e.Successful)
- {
- this.SendToApplication(this.LastProcessedJob.Task.Destination);
- }
+ this.EncodeService.ProcessLogs(this.LastProcessedJob.Task.Destination, this.LastProcessedJob.Configuration);
 
 // Move onto the next job.
 if (this.IsProcessing)
@@ -485,41 +500,12 @@
 else
 {
 this.EncodeService.EncodeCompleted -= this.EncodeServiceEncodeCompleted;
- this.InvokeQueueCompleted(EventArgs.Empty);
+ this.OnQueueCompleted(new QueueCompletedEventArgs(true));
 this.BackupQueue(string.Empty);
 }
 }
 
 /// <summary>
- /// Perform an action after an encode. e.g a shutdown, standby, restart etc.
- /// </summary>
- private void Finish()
- {
- // Do something whent he encode ends.
- switch (this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.WhenCompleteAction))
- {
- case "Shutdown":
- Process.Start("Shutdown", "-s -t 60");
- break;
- case "Log off":
- Win32.ExitWindowsEx(0, 0);
- break;
- case "Suspend":
- Application.SetSuspendState(PowerState.Suspend, true, true);
- break;
- case "Hibernate":
- Application.SetSuspendState(PowerState.Hibernate, true, true);
- break;
- case "Lock System":
- Win32.LockWorkStation();
- break;
- case "Quit HandBrake":
- Execute.OnUIThread(Application.Exit);
- break;
- }
- }
-
- /// <summary>
 /// Invoke the JobProcessingStarted event
 /// </summary>
 /// <param name="e">
@@ -559,16 +545,16 @@
 }
 
 /// <summary>
- /// Invoke the QueueCompleted event.
+ /// Invoke the QueuePaused event
 /// </summary>
 /// <param name="e">
 /// The EventArgs.
 /// </param>
- private void InvokeQueueCompleted(EventArgs e)
+ private void InvokeQueuePaused(EventArgs e)
 {
 this.IsProcessing = false;
 
- EventHandler handler = this.QueueCompleted;
+ EventHandler handler = this.QueuePaused;
 if (handler != null)
 {
 handler(this, e);
@@ -576,18 +562,20 @@
 }
 
 /// <summary>
- /// Invoke the QueuePaused event
+ /// The on queue completed.
 /// </summary>
 /// <param name="e">
- /// The EventArgs.
+ /// The e.
 /// </param>
- private void InvokeQueuePaused(EventArgs e)
+ protected virtual void OnQueueCompleted(QueueCompletedEventArgs e)
 {
- EventHandler handler = this.QueuePaused;
+ QueueCompletedEventDelegate handler = this.QueueCompleted;
 if (handler != null)
 {
 handler(this, e);
 }
+
+ this.IsProcessing = false;
 }
 
 /// <summary>
@@ -599,7 +587,7 @@
 if (job != null)
 {
 this.InvokeJobProcessingStarted(new QueueProgressEventArgs(job));
- this.EncodeService.Start(job, true);
+ this.EncodeService.Start(job);
 }
 else
 {
@@ -607,32 +595,7 @@
 this.EncodeService.EncodeCompleted -= this.EncodeServiceEncodeCompleted;
 
 // Fire the event to tell connected services.
- this.InvokeQueueCompleted(EventArgs.Empty);
-
- // Run the After encode completeion work
- this.Finish();
- }
- }
-
- /// <summary>
- /// Send a file to a 3rd party application after encoding has completed.
- /// </summary>
- /// <param name="file">
- /// The file path
- /// </param>
- private void SendToApplication(string file)
- {
- if (this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SendFile) &&
- !string.IsNullOrEmpty(this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileTo)))
- {
- string args = string.Format(
- "{0} \"{1}\"", 
- this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileToArgs), 
- file);
- var vlc =
- new ProcessStartInfo(
- this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileTo), args);
- Process.Start(vlc);
+ this.OnQueueCompleted(new QueueCompletedEventArgs(false));
 }
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/ServerService.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/ServerService.cs Changed

@@ -11,27 +11,19 @@
 {
 using System;
 using System.Collections.Generic;
- using System.Runtime.Serialization;
 using System.ServiceModel;
 using System.Threading;
- using System.Windows;
 
- using HandBrake.ApplicationServices.EventArgs;
 using HandBrake.ApplicationServices.Model;
- using HandBrake.ApplicationServices.Parsing;
 using HandBrake.ApplicationServices.Services.Interfaces;
- using HandBrake.Interop;
- using HandBrake.Interop.Interfaces;
 
 using EncodeCompletedEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs;
 using EncodeProgressEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs;
- using ScanProgressEventArgs = HandBrake.ApplicationServices.EventArgs.ScanProgressEventArgs;
 
 /// <summary>
 /// HandBrake WCF Service
 /// </summary>
- [ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall, IncludeExceptionDetailInFaults = true, 
- ConcurrencyMode = ConcurrencyMode.Single)]
+ [ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall, IncludeExceptionDetailInFaults = true, ConcurrencyMode = ConcurrencyMode.Single)]
 public class ServerService : IServerService
 {
 #region Constants and Fields
@@ -47,11 +39,6 @@
 private static IEncode encodeService;
 
 /// <summary>
- /// The scan service.
- /// </summary>
- private static IScan scanService;
-
- /// <summary>
 /// The host.
 /// </summary>
 private static ServiceHost host;
@@ -68,18 +55,6 @@
 /// <summary>
 /// Gets the activity log.
 /// </summary>
- [DataMember]
- public string ActivityLog
- {
- get
- {
- return scanService.ActivityLog;
- }
- }
-
- /// <summary>
- /// Gets the activity log.
- /// </summary>
 public string EncodeActivityLog { get; private set; }
 
 /// <summary>
@@ -88,34 +63,10 @@
 public bool IsEncoding { get; private set; }
 
 /// <summary>
- /// Gets a value indicating whether is scanning.
- /// </summary>
- [DataMember]
- public bool IsScanning
- {
- get
- {
- return scanService.IsScanning;
- }
- }
-
- /// <summary>
 /// Gets the activity log.
 /// </summary>
 public string ScanActivityLog { get; private set; }
 
- /// <summary>
- /// Gets the souce data.
- /// </summary>
- [DataMember]
- public Source SouceData
- {
- get
- {
- return scanService.SouceData;
- }
- }
-
 #endregion
 
 #region Implemented Interfaces
@@ -128,31 +79,12 @@
 /// <param name="destination">
 /// The destination.
 /// </param>
- public void ProcessEncodeLogs(string destination)
- {
- encodeService.ProcessLogs(destination);
- }
-
- /// <summary>
- /// The scan source.
- /// </summary>
- /// <param name="path">
- /// The path.
- /// </param>
- /// <param name="title">
- /// The title.
+ /// <param name="configuration">
+ /// The configuration.
 /// </param>
- /// <param name="previewCount">
- /// The preview Count.
- /// </param>
- public void ScanSource(string path, int title, int previewCount)
+ public void ProcessEncodeLogs(string destination, HBConfiguration configuration)
 {
- Console.WriteLine("Starting Source Scan for: " + path);
- scanService.ScanStared += this.ScanStaredHandler;
- scanService.ScanStatusChanged += this.ScanStatusChangedHandler;
- scanService.ScanCompleted += this.ScanCompletedHandler;
-
- scanService.Scan(path, title, previewCount, null);
+ encodeService.ProcessLogs(destination, configuration);
 }
 
 /// <summary>
@@ -172,10 +104,7 @@
 Console.WriteLine("Service Started. Waiting for Clients...");
 
 // Setup the services we are going to use.
- IHandBrakeInstance instance = new HandBrakeInstance();
- scanService = new LibScan(instance);
- encodeService = new LibEncode(new UserSettingService(), instance); // TODO this needs wired up with castle
-
+ encodeService = new LibEncode(); 
 shutdownFlag = new ManualResetEvent(false);
 shutdownFlag.WaitOne();
 }
@@ -187,16 +116,13 @@
 /// <param name="job">
 /// The job.
 /// </param>
- /// <param name="enableLogging">
- /// The enable logging.
- /// </param>
- public void StartEncode(QueueTask job, bool enableLogging)
+ public void StartEncode(QueueTask job)
 {
 Console.WriteLine("Starting Source Encode for: " + job.Task.Source);
 encodeService.EncodeCompleted += this.EncodeServiceEncodeCompleted;
 encodeService.EncodeStarted += this.encodeService_EncodeStarted;
 encodeService.EncodeStatusChanged += this.encodeService_EncodeStatusChanged;
- encodeService.Start(job, enableLogging);
+ encodeService.Start(job);
 }
 
 /// <summary>
@@ -207,7 +133,7 @@
 if (host != null)
 {
 host.BeginClose(null, null);
- //host.Abort(); 
+ // host.Abort(); 
 shutdownFlag.Set();
 }
 }
@@ -221,14 +147,6 @@
 }
 
 /// <summary>
- /// Stop the scan.
- /// </summary>
- public void StopScan()
- {
- scanService.Stop();
- }
-
- /// <summary>
 /// The subscribe.
 /// </summary>
 /// <returns>
@@ -292,88 +210,6 @@
 #region Methods
 
 /// <summary>
- /// The scan service scan completed event handler
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
- private void ScanCompletedHandler(object sender, ScanCompletedEventArgs e)
- {
- Subscribers.ForEach(
- delegate(IHbServiceCallback callback)
- {
- if (((ICommunicationObject)callback).State == CommunicationState.Opened)
- {
- Console.WriteLine("Scan Completed Callback");
- callback.ScanCompletedCallback(e);
- }
- else
- {
- Subscribers.Remove(callback);
- }
- });
-
- scanService.ScanStared -= this.ScanStaredHandler;
- scanService.ScanStatusChanged -= this.ScanStatusChangedHandler;
- scanService.ScanCompleted -= this.ScanCompletedHandler;
- }
-
- /// <summary>
- /// The scan service scan stared.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
- private void ScanStaredHandler(object sender, EventArgs e)
- {
- Subscribers.ForEach(
- delegate(IHbServiceCallback callback)
- {
- if (((ICommunicationObject)callback).State == CommunicationState.Opened)
- {
- Console.WriteLine("Scan Started Callback");
- callback.ScanStartedCallback();
- }
- else
- {
- Subscribers.Remove(callback);
- }
- });
- }
-
- /// <summary>
- /// The scan service scan status changed event handler
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
- private void ScanStatusChangedHandler(object sender, ScanProgressEventArgs e)
- {
- Subscribers.ForEach(
- delegate(IHbServiceCallback callback)
- {
- if (((ICommunicationObject)callback).State == CommunicationState.Opened)
- {
- Console.WriteLine("Scan Changed Callback");
- callback.ScanProgressCallback(e);
- }
- else
- {
- Subscribers.Remove(callback);
- }
- });
- }
-
- /// <summary>
 /// The encode service_ encode completed.
 /// </summary>
 /// <param name="sender">

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Settings.StyleCop -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Settings.StyleCop Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs Changed

@@ -15,6 +15,7 @@
 using HandBrake.ApplicationServices.Model.Encoding;
 using HandBrake.Interop.Model.Encoding;
 using HandBrake.Interop.Model.Encoding.x264;
+ using HandBrake.Interop.Model.Encoding.x265;
 
 /// <summary>
 /// A class to convert various things to native C# objects
@@ -25,7 +26,7 @@
 * TODO:
 * - Many of these converters can be ditched at a later point. Should be able to model all this within the enums themsevles.
 * 
- **/ 
+ **/
 
 /// <summary>
 /// Convert HandBrakes time remaining into a TimeSpan
@@ -129,7 +130,7 @@
 {
 case Mixdown.Auto:
 case Mixdown.None:
- return "auto";
+ return "none";
 case Mixdown.Mono:
 return "mono";
 case Mixdown.LeftOnly:
@@ -160,60 +161,31 @@
 /// </summary>
 /// <param name="audioEnc">The Audio Encoder</param>
 /// <returns>The GUI representation of that audio encoder</returns>
- public static string GetGUIAudioEncoder(string audioEnc)
- {
- switch (audioEnc)
- {
- case "faac":
- return "AAC (faac)";
- case "lame":
- return "MP3 (lame)";
- case "vorbis":
- return "Vorbis (vorbis)";
- case "ffac3":
- return "AC3 (ffmpeg)";
- case "copy:ac3":
- return "AC3 Passthru";
- case "copy:dts":
- return "DTS Passthru";
- case "copy:dtshd":
- return "MP3 Passthru";
- case "copy:mp3":
- return "AAC Passthru";
- case "copy:aac":
- return "DTS-HD Passthru";
- case "ffaac":
- return "AAC (ffmpeg)";
- case "ffflac":
- return "Flac (ffmpeg)";
- case "copy":
- return "Auto Passthru";
- default:
- return "AAC (faac)";
- }
- }
-
- /// <summary>
- /// Get the GUI equiv to a CLI audio encoder
- /// </summary>
- /// <param name="audioEnc">The Audio Encoder</param>
- /// <returns>The GUI representation of that audio encoder</returns>
 public static AudioEncoder GetAudioEncoderFromCliString(string audioEnc)
 {
 switch (audioEnc)
 {
 case "faac":
- return AudioEncoder.Faac;
 case "ffaac":
 return AudioEncoder.ffaac;
+ case "fdk_aac":
+ return AudioEncoder.fdkaac;
+ case "fdk_haac":
+ return AudioEncoder.fdkheaac;
+ case "mp3":
 case "lame":
 return AudioEncoder.Lame;
 case "vorbis":
 return AudioEncoder.Vorbis;
+ case "ac3":
 case "ffac3":
 return AudioEncoder.Ac3;
+ case "flac16":
 case "ffflac":
 return AudioEncoder.ffflac;
+ case "flac24":
+ case "ffflac24":
+ return AudioEncoder.ffflac24;
 case "copy:ac3":
 return AudioEncoder.Ac3Passthrough;
 case "copy:dts":
@@ -227,7 +199,7 @@
 case "copy":
 return AudioEncoder.Passthrough;
 default:
- return AudioEncoder.Faac;
+ return AudioEncoder.ffaac;
 }
 }
 
@@ -240,17 +212,25 @@
 {
 switch (audioEnc)
 {
- case "AAC (faac)":
- return AudioEncoder.Faac;
+ case "AAC (faac)": 
 case "AAC (ffmpeg)":
+ case "AAC (avcodec)":
 return AudioEncoder.ffaac;
+ case "AAC (FDK)":
 case "AAC (CoreAudio)":
- return AudioEncoder.Faac;
+ return AudioEncoder.fdkaac;
+ case "HE-AAC (FDK)":
+ case "HE-AAC (CoreAudio)":
+ case "HE-AAC":
+ return AudioEncoder.fdkheaac;
 case "MP3 (lame)":
+ case "MP3":
 return AudioEncoder.Lame;
 case "Vorbis (vorbis)":
+ case "Vorbis":
 return AudioEncoder.Vorbis;
 case "AC3 (ffmpeg)":
+ case "AC3":
 return AudioEncoder.Ac3;
 case "AC3 Passthru":
 return AudioEncoder.Ac3Passthrough;
@@ -262,12 +242,16 @@
 return AudioEncoder.AacPassthru;
 case "MP3 Passthru":
 return AudioEncoder.Mp3Passthru;
- case "Flac (ffmpeg)":
+ case "FLAC (ffmpeg)":
+ case "FLAC 16-bit":
 return AudioEncoder.ffflac;
+ case "FLAC (24-bit)":
+ case "FLAC 24-bit":
+ return AudioEncoder.ffflac24;
 case "Auto Passthru":
 return AudioEncoder.Passthrough;
 default:
- return AudioEncoder.Faac;
+ return AudioEncoder.ffaac;
 }
 }
 
@@ -282,40 +266,12 @@
 /// </returns>
 public static string GetCliAudioEncoder(AudioEncoder selectedEncoder)
 {
- switch (selectedEncoder)
- {
- case AudioEncoder.Faac:
- return "faac";
- case AudioEncoder.ffaac:
- return "ffaac";
- case AudioEncoder.Lame:
- return "lame";
- case AudioEncoder.Vorbis:
- return "vorbis";
- case AudioEncoder.Ac3Passthrough:
- return "copy:ac3";
- case AudioEncoder.DtsPassthrough:
- return "copy:dts";
- case AudioEncoder.DtsHDPassthrough:
- return "copy:dtshd";
- case AudioEncoder.Ac3:
- return "ffac3";
- case AudioEncoder.AacPassthru:
- return "copy:aac";
- case AudioEncoder.Mp3Passthru:
- return "copy:mp3";
- case AudioEncoder.Passthrough:
- return "copy";
- case AudioEncoder.ffflac:
- return "ffflac";
- default:
- return "faac";
- }
+ return EnumHelper<AudioEncoder>.GetShortName(selectedEncoder);
 }
 
 #endregion
 
- #region Video 
+ #region Video
 
 /// <summary>
 /// Get the Video Encoder for a given string
@@ -330,16 +286,23 @@
 {
 switch (encoder)
 {
- case "":
 case "ffmpeg":
 case "ffmpeg4":
+ case "mpeg4":
 return VideoEncoder.FFMpeg;
 case "ffmpeg2":
+ case "mpeg2":
 return VideoEncoder.FFMpeg2;
 case "x264":
 return VideoEncoder.X264;
+ case "qsv_h264":
+ return VideoEncoder.QuickSync;
 case "theora":
 return VideoEncoder.Theora;
+ case "x265":
+ return VideoEncoder.X265;
+ case "VP8":
+ return VideoEncoder.VP8;
 default:
 return VideoEncoder.X264;
 }
@@ -359,13 +322,19 @@
 switch (encoder)
 {
 case VideoEncoder.FFMpeg:
- return "ffmpeg4";
+ return "mpeg4";
 case VideoEncoder.FFMpeg2:
- return "ffmpeg2";
+ return "mpeg2";
 case VideoEncoder.X264:
 return "x264";
+ case VideoEncoder.QuickSync:
+ return "qsv_h264";
 case VideoEncoder.Theora:
 return "theora";
+ case VideoEncoder.X265:
+ return "x265";
+ case VideoEncoder.VP8:
+ return "VP8";
 default:
 return "x264";
 }
@@ -432,12 +401,6 @@
 return x264Profile.Main;
 case "high":
 return x264Profile.High;
- //case "high10":
- // return x264Profile.High10;
- //case "high422":
- // return x264Profile.High422;
- //case "high444":
- // return x264Profile.High444;
 default:
 return x264Profile.Main;
 }
@@ -477,6 +440,94 @@
 
 #endregion
 
+ #region x265
+
+ /// <summary>
+ /// Get the x265Preset from a cli parameter
+ /// </summary>
+ /// <param name="preset">
+ /// The preset.
+ /// </param>
+ /// <returns>
+ /// The x265Preset enum value
+ /// </returns>
+ public static x265Preset Getx265PresetFromCli(string preset)
+ {
+ switch (preset)
+ {
+ case "ultrafast":
+ return x265Preset.Ultrafast;
+ case "superfast":
+ return x265Preset.Superfast;
+ case "veryfast":
+ return x265Preset.VeryFast;
+ case "faster":
+ return x265Preset.Faster;
+ case "fast":
+ return x265Preset.Fast;
+ case "medium":
+ return x265Preset.Medium;
+ case "slow":
+ return x265Preset.Slow;
+ case "slower":
+ return x265Preset.Slower;
+ case "veryslow":
+ return x265Preset.VerySlow;
+ case "placebo":
+ return x265Preset.Placebo;
+ default:
+ return x265Preset.Faster;
+ }
+ }
+
+ /// <summary>
+ /// Get the x265 Profile from the cli
+ /// </summary>
+ /// <param name="profile">
+ /// The preset.
+ /// </param>
+ /// <returns>
+ /// The x265Profile enum value
+ /// </returns>
+ public static x265Profile Getx265ProfileFromCli(string profile)
+ {
+ switch (profile)
+ {
+ case "mainstillpicture":
+ return x265Profile.Mainstillpicture;
+ case "main":
+ return x265Profile.Main;
+ case "main10":
+ return x265Profile.Main10;
+ default:
+ return x265Profile.Main;
+ }
+ }
+
+ /// <summary>
+ /// Get x265Tune enum from a cli string
+ /// </summary>
+ /// <param name="tune">
+ /// The tune.
+ /// </param>
+ /// <returns>
+ /// The x265Tune enum value
+ /// </returns>
+ public static x265Tune Getx265TuneFromCli(string tune)
+ {
+ switch (tune)
+ {
+ case "psnr":
+ return x265Tune.Psnr;
+ case "ssim":
+ return x265Tune.Ssim;
+ default:
+ return x265Tune.Psnr;
+ }
+ }
+
+ #endregion
+
 #region File Format
 
 /// <summary>
@@ -495,7 +546,7 @@
 default:
 return OutputFormat.Mp4;
 case "m4v":
- return OutputFormat.M4V;
+ return OutputFormat.Mp4;
 case "mkv":
 return OutputFormat.Mkv;
 }
@@ -516,7 +567,7 @@
 {
 default:
 return "mp4";
- case OutputFormat.M4V:
+ case OutputFormat.Mp4:
 return "m4v";
 case OutputFormat.Mkv:
 return "mkv";

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/EnumHelper.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/EnumHelper.cs Changed

@@ -14,9 +14,12 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
+ using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 
+ using HandBrake.Interop.Attributes;
+
 /// <summary>
 /// Enum Helpers
 /// </summary>
@@ -82,15 +85,33 @@
 {
 return val;
 }
-
- if (insensitiveCase && currDescription.ToLower() == description.ToLower() ||
- currDisplay.ToLower() == description.ToLower())
+ 
+ if (insensitiveCase && (currDescription.ToLower() == description.ToLower() || currDisplay.ToLower() == description.ToLower()))
 {
 return val;
 }
 }
 
- throw new ArgumentOutOfRangeException("The Description for the enum was not recognized.");
+ Debug.WriteLine("EnumHelper.GetValue: The Description for the enum was not recognized: " + description);
+
+ return default(T);
+ }
+
+ /// <summary>
+ /// The get short name.
+ /// </summary>
+ /// <param name="value">
+ /// The value.
+ /// </param>
+ /// <returns>
+ /// The <see cref="string"/>.
+ /// </returns>
+ public static string GetShortName(T value)
+ {
+ FieldInfo fieldInfo = value.GetType().GetField(value.ToString());
+ ShortName[] attributes = (ShortName[])fieldInfo.GetCustomAttributes(typeof(ShortName), false);
+
+ return (attributes.Length > 0) ? attributes[0].Name : value.ToString(); 
 }
 
 /// <summary>
@@ -110,9 +131,6 @@
 /// <param name="enumType">
 /// The enum type.
 /// </param>
- /// <typeparam name="T">
- /// The type of the enum
- /// </typeparam>
 /// <returns>
 /// A collection of strings that represent all the enum values
 /// </returns>
@@ -130,9 +148,6 @@
 /// <param name="items">
 /// The items.
 /// </param>
- /// <typeparam name="T">
- /// The type of the enum
- /// </typeparam>
 /// <returns>
 /// A collection of strings that represent all the enum values
 /// </returns>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs Changed

@@ -12,11 +12,9 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
- using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
- using System.Text.RegularExpressions;
 using System.Windows.Forms;
 
 using HandBrake.ApplicationServices.Model;
@@ -33,6 +31,11 @@
 /// </summary>
 private static readonly string LogDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
 
+ /// <summary>
+ /// The is lib hb present.
+ /// </summary>
+ private static bool? isLibHbPresent;
+
 #endregion
 
 #region Properties
@@ -48,6 +51,22 @@
 }
 }
 
+ /// <summary>
+ /// Gets a value indicating whether is lib hb present.
+ /// </summary>
+ public static bool IsLibHbPresent
+ {
+ get
+ {
+ if (isLibHbPresent == null)
+ {
+ isLibHbPresent = File.Exists(Path.Combine(Application.StartupPath, "hb.dll"));
+ }
+
+ return isLibHbPresent.Value;
+ }
+ }
+
 #endregion
 
 #region Public Methods
@@ -69,13 +88,20 @@
 // Delete old and excessivly large files (> ~50MB).
 foreach (FileInfo file in logFiles)
 {
- if (file.LastWriteTime < DateTime.Now.AddDays(-daysToKeep))
+ try
 {
- File.Delete(file.FullName);
+ if (file.LastWriteTime < DateTime.Now.AddDays(-daysToKeep))
+ {
+ File.Delete(file.FullName);
+ }
+ else if (file.Length > 50000000)
+ {
+ File.Delete(file.FullName);
+ }
 }
- else if (file.Length > 50000000)
+ catch (Exception)
 {
- File.Delete(file.FullName);
+ // Silently ignore files we can't delete. They are probably being used by the app right now.
 }
 }
 }
@@ -91,10 +117,17 @@
 {
 var logHeader = new StringBuilder();
 
+ StringBuilder gpuBuilder = new StringBuilder();
+ foreach (var item in SystemInfo.GetGPUInfo)
+ {
+ gpuBuilder.AppendLine(string.Format(" {0}", item));
+ }
+
 logHeader.AppendLine(String.Format("HandBrake {0} - {1}", VersionHelper.GetVersion(), VersionHelper.GetPlatformBitnessVersion()));
- logHeader.AppendLine(String.Format("OS: {0}", Environment.OSVersion));
+ logHeader.AppendLine(String.Format("OS: {0} - {1}", Environment.OSVersion, Environment.Is64BitOperatingSystem ? "64bit" : "32bit"));
 logHeader.AppendLine(String.Format("CPU: {0}", SystemInfo.GetCpuCount));
- logHeader.Append(String.Format("Ram: {0} MB, ", SystemInfo.TotalPhysicalMemory));
+ logHeader.AppendLine(String.Format("Ram: {0} MB, ", SystemInfo.TotalPhysicalMemory));
+ logHeader.AppendLine(String.Format("GPU Information:{0}{1}", Environment.NewLine, gpuBuilder.ToString().TrimEnd()));
 logHeader.AppendLine(String.Format("Screen: {0}x{1}", SystemInfo.ScreenBounds.Bounds.Width, SystemInfo.ScreenBounds.Bounds.Height));
 logHeader.AppendLine(String.Format("Temp Dir: {0}", Path.GetTempPath()));
 logHeader.AppendLine(String.Format("Install Dir: {0}", Application.StartupPath));

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs Changed

@@ -17,6 +17,7 @@
 using HandBrake.ApplicationServices.Model.Encoding;
 using HandBrake.Interop.Model;
 using HandBrake.Interop.Model.Encoding;
+ using HandBrake.Interop.Model.Encoding.x264;
 
 /// <summary>
 /// A Utility Class to Convert a 
@@ -24,13 +25,13 @@
 public class InteropModelCreator
 {
 /// <summary>
- /// Get an EncodeJob model for a LibHB Encode.
+ /// The get encode job.
 /// </summary>
 /// <param name="task">
 /// The task.
 /// </param>
 /// <returns>
- /// An Interop.EncodeJob model.
+ /// The <see cref="EncodeJob"/>.
 /// </returns>
 public static EncodeJob GetEncodeJob(QueueTask task)
 {
@@ -40,17 +41,29 @@
 return null;
 }
 
+ return GetEncodeJob(task.Task);
+ }
+
+ /// <summary>
+ /// Get an EncodeJob model for a LibHB Encode.
+ /// </summary>
+ /// <param name="task">
+ /// The task.
+ /// </param>
+ /// <returns>
+ /// An Interop.EncodeJob model.
+ /// </returns>
+ public static EncodeJob GetEncodeJob(EncodeTask task)
+ {
 // The current Job Configuration
- EncodeTask work = task.Task;
+ EncodeTask work = task;
 
 // Which will be converted to this EncodeJob Model.
 EncodeJob job = new EncodeJob();
-
 EncodingProfile profile = new EncodingProfile();
 job.EncodingProfile = profile;
 
- profile.Anamorphic = work.Anamorphic;
-
+ // Audio Settings
 profile.AudioEncodings = new List<AudioEncoding>();
 job.ChosenAudioTracks = new List<int>();
 foreach (AudioTrack track in work.AudioTracks)
@@ -63,7 +76,7 @@
 Encoder = Converters.GetCliAudioEncoder(track.Encoder),
 InputNumber = track.Track.HasValue ? track.Track.Value : 0,
 Mixdown = Converters.GetCliMixDown(track.MixDown),
- SampleRateRaw = GetSampleRateRaw(track.SampleRate), 
+ SampleRateRaw = GetSampleRateRaw(track.SampleRate),
 };
 
 profile.AudioEncodings.Add(newTrack);
@@ -72,6 +85,59 @@
 job.ChosenAudioTracks.Add(track.Track.Value);
 }
 }
+
+ // Title Settings
+ job.OutputPath = work.Destination;
+ job.SourcePath = work.Source;
+ job.Title = work.Title;
+ // job.SourceType = work.Type;
+ switch (work.PointToPointMode)
+ {
+ case PointToPointMode.Chapters:
+ job.RangeType = VideoRangeType.Chapters;
+ break;
+ case PointToPointMode.Seconds:
+ job.RangeType = VideoRangeType.Seconds;
+ break;
+ case PointToPointMode.Frames:
+ job.RangeType = VideoRangeType.Frames;
+ break;
+ }
+
+ if (work.PointToPointMode == PointToPointMode.Seconds)
+ {
+ job.SecondsEnd = work.EndPoint;
+ job.SecondsStart = work.StartPoint;
+ }
+ if (work.PointToPointMode == PointToPointMode.Chapters)
+ {
+ job.ChapterStart = work.StartPoint;
+ job.ChapterEnd = work.EndPoint;
+ }
+ if (work.PointToPointMode == PointToPointMode.Frames)
+ {
+ job.FramesEnd = work.EndPoint;
+ job.FramesStart = work.StartPoint;
+ }
+
+ job.Angle = work.Angle;
+ job.EncodingProfile = profile;
+
+ // Output Settings
+ profile.IPod5GSupport = work.IPod5GSupport;
+ profile.Optimize = work.OptimizeMP4;
+ switch (work.OutputFormat)
+ {
+ case OutputFormat.Mp4:
+ profile.ContainerName = "av_mp4"; // TODO make part of enum.
+ break;
+ case OutputFormat.Mkv:
+ profile.ContainerName = "av_mkv"; // TODO make part of enum.
+ break;
+ }
+
+ // Picture Settings
+ profile.Anamorphic = work.Anamorphic;
 profile.Cropping = new Cropping
 {
 Top = work.Cropping.Top,
@@ -79,102 +145,73 @@
 Left = work.Cropping.Left,
 Right = work.Cropping.Right
 };
-
 profile.CroppingType = CroppingType.Custom; // TODO deal with this better
+ profile.DisplayWidth = work.DisplayWidth.HasValue
+ ? int.Parse(Math.Round(work.DisplayWidth.Value, 0).ToString())
+ : 0;
+ profile.PixelAspectX = work.PixelAspectX;
+ profile.PixelAspectY = work.PixelAspectY;
+ profile.Height = work.Height.HasValue ? work.Height.Value : 0;
+ profile.KeepDisplayAspect = work.KeepDisplayAspect;
+ profile.MaxHeight = work.MaxHeight.HasValue ? work.MaxHeight.Value : 0;
+ profile.MaxWidth = work.MaxWidth.HasValue ? work.MaxWidth.Value : 0;
+ profile.Modulus = work.Modulus.HasValue ? work.Modulus.Value : 16;
+ profile.UseDisplayWidth = true;
+ profile.Width = work.Width.HasValue ? work.Width.Value : 0;
+
+ // Filter Settings
 profile.CustomDecomb = work.CustomDecomb;
 profile.CustomDeinterlace = work.CustomDeinterlace;
 profile.CustomDenoise = work.CustomDenoise;
 profile.CustomDetelecine = work.CustomDetelecine;
- profile.Deblock = work.Deblock;
+ if (work.Deblock > 4)
+ profile.Deblock = work.Deblock;
 profile.Decomb = work.Decomb;
 profile.Deinterlace = work.Deinterlace;
 profile.Denoise = work.Denoise;
 profile.Detelecine = work.Detelecine;
- profile.DisplayWidth = work.DisplayWidth.HasValue
- ? int.Parse(Math.Round(work.DisplayWidth.Value, 0).ToString())
- : 0;
- profile.Framerate = work.Framerate.HasValue ? work.Framerate.Value : 0;
 profile.Grayscale = work.Grayscale;
- profile.Height = work.Height.HasValue ? work.Height.Value : 0;
- profile.IPod5GSupport = work.IPod5GSupport;
- profile.IncludeChapterMarkers = work.IncludeChapterMarkers;
- profile.KeepDisplayAspect = work.KeepDisplayAspect;
- profile.LargeFile = work.LargeFile;
- profile.MaxHeight = work.MaxHeight.HasValue ? work.MaxHeight.Value : 0;
- profile.MaxWidth = work.MaxWidth.HasValue ? work.MaxWidth.Value : 0;
- profile.Modulus = work.Modulus.HasValue ? work.Modulus.Value : 16;
- profile.Optimize = work.OptimizeMP4;
- switch (work.OutputFormat)
- {
- case OutputFormat.Mp4:
- case OutputFormat.M4V:
- profile.OutputFormat = Container.Mp4;
- break;
- case OutputFormat.Mkv:
- profile.OutputFormat = Container.Mkv;
- break;
- }
- profile.ConstantFramerate = work.FramerateMode == FramerateMode.CFR;
- profile.PixelAspectX = work.PixelAspectX;
- profile.PixelAspectY = work.PixelAspectY;
 
- switch (work.OutputFormat)
- {
- case OutputFormat.Mp4:
- profile.PreferredExtension = OutputExtension.Mp4;
- break;
- case OutputFormat.M4V:
- profile.PreferredExtension = OutputExtension.M4v;
- break;
- }
+ // Video Settings
+ profile.Framerate = work.Framerate.HasValue ? work.Framerate.Value : 0;
+ profile.ConstantFramerate = work.FramerateMode == FramerateMode.CFR;
 profile.Quality = work.Quality.HasValue ? work.Quality.Value : 0;
- profile.UseDisplayWidth = true;
 profile.VideoBitrate = work.VideoBitrate.HasValue ? work.VideoBitrate.Value : 0;
 profile.VideoEncodeRateType = work.VideoEncodeRateType;
 profile.VideoEncoder = Converters.GetVideoEncoder(work.VideoEncoder);
- profile.Width = work.Width.HasValue ? work.Width.Value : 0;
- profile.X264Options = work.AdvancedEncoderOptions;
 
- if (work.PointToPointMode == PointToPointMode.Chapters)
+ if (work.VideoEncoder == VideoEncoder.X264)
 {
- job.ChapterStart = work.StartPoint;
- job.ChapterEnd = work.EndPoint;
- }
+ profile.VideoPreset = work.X264Preset.ToString().ToLower().Replace(" ", string.Empty);
+ profile.VideoTunes = new List<string>();
 
- job.Angle = work.Angle;
- job.EncodingProfile = profile;
- if (work.PointToPointMode == PointToPointMode.Frames)
+ if (work.X264Tune != x264Tune.None)
+ {
+ profile.VideoTunes.Add(work.X264Tune.ToString().ToLower().Replace(" ", string.Empty));
+ }
+
+ if (work.FastDecode)
+ {
+ profile.VideoTunes.Add("fastdecode");
+ }
+ }
+ else if (work.VideoEncoder == VideoEncoder.X265)
 {
- job.FramesEnd = work.EndPoint;
- job.FramesStart = work.StartPoint;
+ profile.VideoPreset = work.X265Preset.ToString().ToLower().Replace(" ", string.Empty);
+ profile.VideoProfile = work.H265Profile.ToString().ToLower().Replace(" ", string.Empty);
+ profile.VideoTunes = new List<string>();
 }
 
+ profile.VideoLevel = work.H264Level;
+ profile.VideoProfile = work.H264Profile.ToString().ToLower().Replace(" ", string.Empty); // TODO change these away from strings.
+
+ // Chapter Markers
+ profile.IncludeChapterMarkers = work.IncludeChapterMarkers;
 job.CustomChapterNames = work.ChapterNames.Select(item => item.ChapterName).ToList();
 job.UseDefaultChapterNames = work.IncludeChapterMarkers;
 
- job.OutputPath = work.Destination;
- switch (work.PointToPointMode)
- {
- case PointToPointMode.Chapters:
- job.RangeType = VideoRangeType.Chapters;
- break;
- case PointToPointMode.Seconds:
- job.RangeType = VideoRangeType.Seconds;
- break;
- case PointToPointMode.Frames:
- job.RangeType = VideoRangeType.Frames;
- break;
- }
-
- if (work.PointToPointMode == PointToPointMode.Seconds)
- {
- job.SecondsEnd = work.EndPoint;
- job.SecondsStart = work.StartPoint;
- }
-
- job.SourcePath = work.Source;
- // job.SourceType = work.Type;
- job.Title = work.Title;
+ // Advanced Settings
+ profile.VideoOptions = work.AdvancedEncoderOptions;
 
 // Subtitles
 job.Subtitles = new Subtitles { SourceSubtitles = new List<SourceSubtitle>(), SrtSubtitles = new List<SrtSubtitle>() };

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs Changed

@@ -10,6 +10,8 @@
 namespace HandBrake.ApplicationServices.Utilities
 {
 using System.Collections.Generic;
+ using System.Collections.Specialized;
+ using System.Linq;
 
 /// <summary>
 /// Language Utilities
@@ -17,12 +19,22 @@
 public class LanguageUtilities
 {
 /// <summary>
+ /// The language map.
+ /// </summary>
+ private static IDictionary<string, string> languageMap;
+
+ /// <summary>
 /// Map languages and their iso639_2 value into a IDictionary
 /// </summary>
 /// <returns>A Dictionary containing the language and iso code</returns>
 public static IDictionary<string, string> MapLanguages()
 {
- IDictionary<string, string> languageMap = new Dictionary<string, string>
+ if (languageMap != null)
+ {
+ return languageMap;
+ }
+
+ languageMap = new Dictionary<string, string>
 {
 {"(Any)", "und"}, 
 {"Afar", "aar"}, 
@@ -213,5 +225,66 @@
 };
 return languageMap;
 }
+
+ /// <summary>
+ /// The get language codes.
+ /// </summary>
+ /// <param name="userLanguages">
+ /// The user languages.
+ /// </param>
+ /// <returns>
+ /// The <see cref="IList"/>.
+ /// </returns>
+ public static List<string> GetLanguageCodes(StringCollection userLanguages)
+ {
+ // Translate to Iso Codes
+ List<string> iso6392Codes = new List<string>();
+ foreach (var item in userLanguages)
+ {
+ string isoCode;
+ if (LanguageUtilities.MapLanguages().TryGetValue(item, out isoCode))
+ {
+ iso6392Codes.Add(isoCode);
+ }
+ }
+
+ return iso6392Codes;
+ }
+
+ /// <summary>
+ /// The get language codes.
+ /// </summary>
+ /// <param name="userLanguages">
+ /// The user languages.
+ /// </param>
+ /// <returns>
+ /// The <see cref="List"/>.
+ /// </returns>
+ public static List<string> GetLanguageCodes(IList<string> userLanguages)
+ {
+ // Translate to Iso Codes
+ List<string> iso6392Codes = new List<string>();
+ foreach (var item in userLanguages)
+ {
+ string isoCode;
+ if (LanguageUtilities.MapLanguages().TryGetValue(item, out isoCode))
+ {
+ iso6392Codes.Add(isoCode);
+ }
+ }
+
+ return iso6392Codes;
+ }
+
+ /// <summary>
+ /// The get iso codes.
+ /// </summary>
+ /// <returns>
+ /// The <see cref="List"/>.
+ /// </returns>
+ public static List<string> GetIsoCodes()
+ {
+ return MapLanguages().Values.ToList();
+ }
 }
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/PList.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/PList.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs Changed

@@ -127,128 +127,54 @@
 /// </param>
 private static void AddEncodeSettings(XmlTextWriter xmlWriter, EncodeTask parsed, Preset preset, string build)
 {
- AddEncodeElement(xmlWriter, "AudioAllowAACPass", "integer", getNullBoolValue(parsed.AllowedPassthruOptions.AudioAllowAACPass));
- AddEncodeElement(xmlWriter, "AudioAllowAC3Pass", "integer", getNullBoolValue(parsed.AllowedPassthruOptions.AudioAllowAC3Pass));
- AddEncodeElement(xmlWriter, "AudioAllowDTSHDPass", "integer", getNullBoolValue(parsed.AllowedPassthruOptions.AudioAllowDTSHDPass));
- AddEncodeElement(xmlWriter, "AudioAllowDTSPass", "integer", getNullBoolValue(parsed.AllowedPassthruOptions.AudioAllowDTSPass));
- AddEncodeElement(xmlWriter, "AudioAllowMP3Pass", "integer", getNullBoolValue(parsed.AllowedPassthruOptions.AudioAllowMP3Pass));
+ AddBooleanElement(xmlWriter, "AudioAllowAACPass", parsed.AllowedPassthruOptions.AudioAllowAACPass);
+ AddBooleanElement(xmlWriter, "AudioAllowAC3Pass", parsed.AllowedPassthruOptions.AudioAllowAC3Pass);
+ AddBooleanElement(xmlWriter, "AudioAllowDTSHDPass", parsed.AllowedPassthruOptions.AudioAllowDTSHDPass);
+ AddBooleanElement(xmlWriter, "AudioAllowDTSPass", parsed.AllowedPassthruOptions.AudioAllowDTSPass);
+ AddBooleanElement(xmlWriter, "AudioAllowMP3Pass", parsed.AllowedPassthruOptions.AudioAllowMP3Pass);
+
+ // TODO Update
 AddEncodeElement(xmlWriter, "AudioEncoderFallback", "string", EnumHelper<AudioEncoder>.GetDisplay(parsed.AllowedPassthruOptions.AudioEncoderFallback));
 
- AddEncodeElement(xmlWriter, "ChapterMarkers", "integer", parsed.IncludeChapterMarkers ? "1" : "0");
+ AddBooleanElement(xmlWriter, "ChapterMarkers", parsed.IncludeChapterMarkers);
 AddEncodeElement(xmlWriter, "Default", "integer", "0");
- AddEncodeElement(xmlWriter, "FileFormat", "string", (parsed.OutputFormat == OutputFormat.Mp4 || parsed.OutputFormat == OutputFormat.M4V) ? "MP4 file" : "MKV file");
+ AddEncodeElement(xmlWriter, "FileFormat", "string", (parsed.OutputFormat == OutputFormat.Mp4) ? "MP4 file" : "MKV file"); // TODO
 AddBooleanElement(xmlWriter, "Folder", false);
 AddEncodeElement(xmlWriter, "Mp4HttpOptimize", "integer", parsed.OptimizeMP4 ? "1" : "0");
- AddEncodeElement(xmlWriter, "Mp4LargeFile", "integer", parsed.LargeFile ? "1" : "0");
 AddEncodeElement(xmlWriter, "Mp4iPodCompatible", "integer", parsed.IPod5GSupport ? "1" : "0");
 AddEncodeElement(xmlWriter, "PictureAutoCrop", "integer", "1");
- AddEncodeElement(xmlWriter, "PictureBottomCrop", "integer", parsed.Cropping.Bottom.ToString());
+ 
 
 // Filters
 AddEncodeElement(xmlWriter, "PictureDeblock", "integer", parsed.Deblock.ToString());
 
- switch (parsed.Decomb)
- {
- case Decomb.Off:
- AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "0");
- AddEncodeElement(xmlWriter, "PictureDecombCustom", "string", string.Empty);
- break;
- case Decomb.Default:
- AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "2");
- AddEncodeElement(xmlWriter, "PictureDecombCustom", "string", string.Empty);
- break;
- case Decomb.Fast:
- AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "3");
- AddEncodeElement(xmlWriter, "PictureDecombCustom", "string", string.Empty);
- break;
- case Decomb.Bob:
- AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "4");
- AddEncodeElement(xmlWriter, "PictureDecombCustom", "string", string.Empty);
- break;
- case Decomb.Custom:
- AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "1");
- AddEncodeElement(xmlWriter, "PictureDecombCustom", "string", parsed.CustomDecomb);
- break;
- }
- AddEncodeElement(xmlWriter, "PictureDecombDeinterlace", "integer", parsed.Decomb != Decomb.Off ? "0" : "1");
+ AddBooleanElement(xmlWriter, "PictureDecombDeinterlace", parsed.Decomb != Decomb.Off);
+ AddEncodeElement(xmlWriter, "PictureDecombCustom", "string", parsed.Decomb == Decomb.Custom ? parsed.CustomDecomb : string.Empty);
+ AddEncodeElement(xmlWriter, "PictureDecomb", "integer", ((int)parsed.Decomb).ToString());
+ AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", parsed.Deinterlace == Deinterlace.Custom ? parsed.CustomDeinterlace : string.Empty);
+ AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", ((int)parsed.Deinterlace).ToString());
 
- switch (parsed.Deinterlace)
- {
- case Deinterlace.Off:
- AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "0");
- AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", string.Empty);
- break;
- case Deinterlace.Fast:
- AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "2");
- AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", string.Empty);
- break;
- case Deinterlace.Slow:
- AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "3");
- AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", string.Empty);
- break;
- case Deinterlace.Slower:
- AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "4");
- AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", string.Empty);
- break;
- case Deinterlace.Bob:
- AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "5");
- AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", string.Empty);
- break;
- case Deinterlace.Custom:
- AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "1");
- AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", parsed.CustomDeinterlace);
- break;
- }
 
- switch (parsed.Denoise)
+ AddEncodeElement(xmlWriter, "PictureDenoiseFilter", "string", parsed.Denoise.ToString().ToLower());
+ AddEncodeElement(xmlWriter, "PictureDenoiseCustom", "string", parsed.DenoisePreset == DenoisePreset.Custom ? parsed.CustomDenoise : string.Empty);
+ AddEncodeElement(xmlWriter, "PictureDenoisePreset", "string", parsed.DenoisePreset.ToString().ToLower());
+ if (parsed.Denoise == Denoise.NLMeans)
 {
- case Denoise.Off:
- AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "0");
- AddEncodeElement(xmlWriter, "PictureDenoiseCustom", "string", string.Empty);
- break;
- case Denoise.Weak:
- AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "2");
- AddEncodeElement(xmlWriter, "PictureDenoiseCustom", "string", string.Empty);
- break;
- case Denoise.Medium:
- AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "3");
- AddEncodeElement(xmlWriter, "PictureDenoiseCustom", "string", string.Empty);
- break;
- case Denoise.Strong:
- AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "4");
- AddEncodeElement(xmlWriter, "PictureDenoiseCustom", "string", string.Empty);
- break;
- case Denoise.Custom:
- AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "1");
- AddEncodeElement(xmlWriter, "PictureDenoiseCustom", "string", parsed.CustomDenoise);
- break;
+ AddEncodeElement(xmlWriter, "PictureDenoiseTune", "string", parsed.DenoiseTune.ToString().ToLower());
 }
 
- int detelecine = 0;
- switch (parsed.Detelecine)
- {
- case Detelecine.Off:
- detelecine = 0;
- break;
- case Detelecine.Default:
- detelecine = 2;
- break;
- case Detelecine.Custom:
- detelecine = 1;
- break;
- }
-
- AddEncodeElement(xmlWriter, "PictureDetelecine", "integer", detelecine.ToString());
- AddEncodeElement(xmlWriter, "PictureDetelecineCustom", "string", detelecine == 1 ? parsed.CustomDecomb : string.Empty);
+ AddEncodeElement(xmlWriter, "PictureDetelecine", "integer", ((int)parsed.Detelecine).ToString());
+ AddEncodeElement(xmlWriter, "PictureDetelecineCustom", "string", parsed.Detelecine == Detelecine.Custom ? parsed.CustomDecomb : string.Empty);
 
 // Picture Settings
 AddEncodeElement(xmlWriter, "PictureHeight", "integer", parsed.Height.ToString());
- AddEncodeElement(xmlWriter, "PictureKeepRatio", "integer", parsed.KeepDisplayAspect ? "1" : "0");
- AddEncodeElement(xmlWriter, "PictureLeftCrop", "integer", parsed.Cropping.Left.ToString());
+ AddEncodeElement(xmlWriter, "PictureKeepRatio", "integer", parsed.KeepDisplayAspect ? "1" : "0"); 
 AddEncodeElement(xmlWriter, "PictureModulus", "integer", parsed.Modulus.ToString());
 AddEncodeElement(xmlWriter, "PicturePAR", "integer", ((int)parsed.Anamorphic).ToString());
+ AddEncodeElement(xmlWriter, "PictureLeftCrop", "integer", parsed.Cropping.Left.ToString());
 AddEncodeElement(xmlWriter, "PictureRightCrop", "integer", parsed.Cropping.Right.ToString());
 AddEncodeElement(xmlWriter, "PictureTopCrop", "integer", parsed.Cropping.Top.ToString());
+ AddEncodeElement(xmlWriter, "PictureBottomCrop", "integer", parsed.Cropping.Bottom.ToString());
 AddEncodeElement(xmlWriter, "PictureWidth", "integer", parsed.Width.ToString());
 
 // Preset Information
@@ -260,14 +186,14 @@
 // Preset Settings
 AddEncodeElement(xmlWriter, "UsesMaxPictureSettings", "integer", (parsed.MaxWidth != 0 || parsed.MaxHeight != 0) ? "1" : "0");
 AddEncodeElement(xmlWriter, "UsesPictureFilters", "integer", "1");
- AddEncodeElement(xmlWriter, "UsesPictureSettings", "integer", "2");
+ AddEncodeElement(xmlWriter, "UsesPictureSettings", "integer", "1");
 
 // Video Settings
 AddEncodeElement(xmlWriter, "VideoAvgBitrate", "string", parsed.VideoBitrate.ToString());
 AddEncodeElement(xmlWriter, "VideoEncoder", "string", EnumHelper<VideoEncoder>.GetDisplay(parsed.VideoEncoder));
 AddEncodeElement(xmlWriter, "VideoFramerate", "string", parsed.Framerate == null ? "Same as source" : parsed.Framerate.ToString());
 AddEncodeElement(xmlWriter, "VideoFramerateMode", "string", parsed.FramerateMode.ToString().ToLower());
- AddEncodeElement(xmlWriter, "VideoGrayScale", "integer", parsed.Grayscale ? "1" : "0");
+ AddBooleanElement(xmlWriter, "VideoGrayScale", parsed.Grayscale);
 AddEncodeElement(xmlWriter, "VideoQualitySlider", "real", parsed.Quality.ToString());
 AddEncodeElement(xmlWriter, "h264Level", "string", parsed.H264Level);
 AddEncodeElement(xmlWriter, "x264OptionExtra", "string", parsed.AdvancedEncoderOptions);
@@ -279,6 +205,11 @@
 tune = tune == "none" ? "fastdecode" : tune + ",fastdecode";
 }
 AddEncodeElement(xmlWriter, "x264Tune", "string", tune);
+ AddEncodeElement(xmlWriter, "x264UseAdvancedOptions", "integer", parsed.ShowAdvancedTab ? "1" : "0");
+
+ AddEncodeElement(xmlWriter, "h265Profile", "string", parsed.H265Profile.ToString().ToLower());
+ AddEncodeElement(xmlWriter, "x265Preset", "string", parsed.X265Preset.ToString().ToLower());
+ AddEncodeElement(xmlWriter, "x265Tune", "string", parsed.X265Tune.ToString().ToLower());
 
 int videoQualityType = 0;
 if (parsed.VideoBitrate != null) videoQualityType = 1;
@@ -305,12 +236,12 @@
 /// <param name="value">
 /// The value.
 /// </param>
- private static void AddBooleanElement(XmlTextWriter xmlWriter, string keyName, bool value)
+ private static void AddBooleanElement(XmlTextWriter xmlWriter, string keyName, bool? value)
 {
 xmlWriter.WriteStartElement("key");
 xmlWriter.WriteString(keyName);
 xmlWriter.WriteEndElement();
- xmlWriter.WriteStartElement(value ? "true" : "false");
+ xmlWriter.WriteStartElement(value.HasValue ? value.Value ? "true" : "false" : "false");
 xmlWriter.WriteEndElement();
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs Changed

@@ -19,6 +19,7 @@
 using HandBrake.ApplicationServices.Model.Encoding;
 using HandBrake.Interop.Model.Encoding;
 using HandBrake.Interop.Model.Encoding.x264;
+ using HandBrake.Interop.Model.Encoding.x265;
 
 /// <summary>
 /// Generate a CLI Query for HandBrakeCLI
@@ -31,19 +32,13 @@
 /// <param name="task">
 /// The task.
 /// </param>
- /// <param name="previewScanCount">
- /// The preview Scan Count.
- /// </param>
- /// <param name="verbosity">
- /// The verbosity.
- /// </param>
- /// <param name="disableLibDvdNav">
- /// The disable Lib Dvd Nav.
+ /// <param name="configuration">
+ /// The configuration.
 /// </param>
 /// <returns>
 /// A Cli Query
 /// </returns>
- public static string GenerateQuery(EncodeTask task, int previewScanCount, int verbosity, bool disableLibDvdNav)
+ public static string GenerateQuery(EncodeTask task, HBConfiguration configuration)
 {
 if (string.IsNullOrEmpty(task.Source))
 {
@@ -51,9 +46,9 @@
 }
 
 string query = string.Empty;
- query += SourceQuery(task, null, null, previewScanCount);
+ query += SourceQuery(task, null, null, configuration.PreviewScanCount);
 query += DestinationQuery(task);
- query += GenerateTabbedComponentsQuery(task, true, verbosity, disableLibDvdNav);
+ query += GenerateTabbedComponentsQuery(task, true, configuration.Verbosity, configuration.IsDvdNavDisabled, configuration.DisableQuickSyncDecoding, configuration.EnableDxva, configuration.ScalingMode == VideoScaler.BicubicCl);
 
 return query;
 }
@@ -64,30 +59,24 @@
 /// <param name="task">
 /// The task.
 /// </param>
+ /// <param name="configuration">
+ /// The configuration.
+ /// </param>
 /// <param name="duration">
 /// The duration.
 /// </param>
 /// <param name="startAtPreview">
 /// The start At Preview.
 /// </param>
- /// <param name="previewScanCount">
- /// The preview Scan Count.
- /// </param>
- /// <param name="verbosity">
- /// The verbosity.
- /// </param>
- /// <param name="disableLibDvdNav">
- /// The disable Lib Dvd Nav.
- /// </param>
 /// <returns>
 /// A Cli query suitable for generating a preview video.
 /// </returns>
- public static string GeneratePreviewQuery(EncodeTask task, int duration, string startAtPreview, int previewScanCount, int verbosity, bool disableLibDvdNav)
+ public static string GeneratePreviewQuery(EncodeTask task, HBConfiguration configuration, int duration, string startAtPreview)
 {
 string query = string.Empty;
- query += SourceQuery(task, duration, startAtPreview, previewScanCount);
+ query += SourceQuery(task, duration, startAtPreview, configuration.PreviewScanCount);
 query += DestinationQuery(task);
- query += GenerateTabbedComponentsQuery(task, true, verbosity, disableLibDvdNav);
+ query += GenerateTabbedComponentsQuery(task, true, configuration.Verbosity, configuration.IsDvdNavDisabled, configuration.DisableQuickSyncDecoding, false, false);
 
 return query;
 }
@@ -109,10 +98,19 @@
 /// <param name="disableLibDvdNav">
 /// The disable Lib Dvd Nav.
 /// </param>
+ /// <param name="disableQsvDecode">
+ /// The disable Qsv Decode.
+ /// </param>
+ /// <param name="enableHwd">
+ /// The enable Hwd.
+ /// </param>
+ /// <param name="enableOpenCL">
+ /// The enable Open CL.
+ /// </param>
 /// <returns>
 /// The CLI query for the Tabbed section of the main window UI
 /// </returns>
- private static string GenerateTabbedComponentsQuery(EncodeTask task, bool enableFilters, int verbosity, bool disableLibDvdNav)
+ private static string GenerateTabbedComponentsQuery(EncodeTask task, bool enableFilters, int verbosity, bool disableLibDvdNav, bool disableQsvDecode, bool enableHwd, bool enableOpenCL)
 {
 string query = string.Empty;
 
@@ -142,7 +140,7 @@
 query += AdvancedQuery(task);
 
 // Extra Settings
- query += ExtraSettings(verbosity, disableLibDvdNav);
+ query += ExtraSettings(verbosity, disableLibDvdNav, disableQsvDecode, enableHwd, enableOpenCL, task.VideoEncoder == VideoEncoder.QuickSync);
 
 return query;
 }
@@ -234,9 +232,6 @@
 query += string.Format(" -f {0} ", EnumHelper<Enum>.GetDescription(task.OutputFormat).ToLower());
 
 // These are output settings features
- if (task.LargeFile)
- query += " -4 ";
-
 if (task.IPod5GSupport)
 query += " -I ";
 
@@ -261,17 +256,17 @@
 
 if (task.Anamorphic != Anamorphic.Strict)
 {
- //if (task.MaxWidth.HasValue) query += string.Format(" -X {0}", task.MaxWidth);
 if (task.Width.HasValue && task.Width != 0) query += string.Format(" -w {0}", task.Width);
 
- //if (task.MaxHeight.HasValue) query += string.Format(" -Y {0}", task.MaxHeight);
 if (task.Height.HasValue && task.Height != 0) query += string.Format(" -l {0}", task.Height);
 }
 
- if (task.HasCropping)
- {
- query += string.Format(" --crop {0}:{1}:{2}:{3}", task.Cropping.Top, task.Cropping.Bottom, task.Cropping.Left, task.Cropping.Right);
- }
+ query += string.Format(
+ " --crop {0}:{1}:{2}:{3}",
+ task.Cropping.Top,
+ task.Cropping.Bottom,
+ task.Cropping.Left,
+ task.Cropping.Right);
 
 switch (task.Anamorphic)
 {
@@ -377,23 +372,65 @@
 break;
 }
 
- switch (task.Denoise) // Denoise
+ if (task.Denoise == Denoise.hqdn3d)
 {
- case Denoise.Weak:
- query += " --denoise=\"weak\"";
- break;
- case Denoise.Medium:
- query += " --denoise=\"medium\"";
- break;
- case Denoise.Strong:
- query += " --denoise=\"strong\"";
- break;
- case Denoise.Custom:
- query += string.Format(" --denoise=\"{0}\"", task.CustomDenoise);
- break;
- default:
- query += string.Empty;
- break;
+ switch (task.DenoisePreset) // Denoise
+ {
+ case DenoisePreset.Weak:
+ query += " --denoise=\"weak\"";
+ break;
+ case DenoisePreset.Medium:
+ query += " --denoise=\"medium\"";
+ break;
+ case DenoisePreset.Strong:
+ query += " --denoise=\"strong\"";
+ break;
+ case DenoisePreset.Custom:
+ query += string.Format(" --denoise=\"{0}\"", task.CustomDenoise);
+ break;
+ }
+ }
+
+ // NL Means
+ if (task.Denoise == Denoise.NLMeans)
+ {
+ switch (task.DenoisePreset) // Denoise
+ {
+ case DenoisePreset.Light:
+ query += " --nlmeans=\"light\"";
+ break;
+ case DenoisePreset.Ultralight:
+ query += " --nlmeans=\"ultralight\"";
+ break;
+ case DenoisePreset.Medium:
+ query += " --nlmeans=\"medium\"";
+ break;
+ case DenoisePreset.Strong:
+ query += " --nlmeans=\"strong\"";
+ break;
+ default:
+ query += string.Empty;
+ break;
+ }
+
+ switch (task.DenoiseTune)
+ {
+ case DenoiseTune.Animation:
+ query += " --nlmeans-tune=\"animation\"";
+ break;
+ case DenoiseTune.Film:
+ query += " --nlmeans-tune=\"film\"";
+ break;
+ case DenoiseTune.Grain:
+ query += " --nlmeans-tune=\"grain\"";
+ break;
+ case DenoiseTune.HighMotion:
+ query += " --nlmeans-tune=\"highmotion\"";
+ break;
+ default:
+ query += string.Empty;
+ break;
+ }
 }
 
 if (task.Deblock > 4)
@@ -429,12 +466,21 @@
 case VideoEncoder.X264:
 query += " -e x264";
 break;
+ case VideoEncoder.QuickSync:
+ query += " -e qsv_h264";
+ break;
 case VideoEncoder.Theora:
 query += " -e theora";
 break;
+ case VideoEncoder.VP8:
+ query += " -e VP8";
+ break;
 default:
 query += " -e x264";
 break;
+ case VideoEncoder.X265:
+ query += " -e x265";
+ break;
 }
 
 switch (task.VideoEncodeRateType)
@@ -444,27 +490,14 @@
 query += string.Format(" -b {0}", task.VideoBitrate.Value);
 break;
 case VideoEncodeRateType.ConstantQuality:
- double value;
- switch (task.VideoEncoder)
- {
- case VideoEncoder.FFMpeg:
- case VideoEncoder.FFMpeg2:
- query += string.Format(" -q {0}", task.Quality.Value.ToString(CultureInfo.InvariantCulture));
- break;
- case VideoEncoder.X264:
- query += string.Format(" -q {0}", task.Quality.Value.ToString(CultureInfo.InvariantCulture));
- break;
- case VideoEncoder.Theora:
- query += string.Format(" -q {0}", task.Quality.Value.ToString(CultureInfo.InvariantCulture));
- break;
- }
+ query += string.Format(" -q {0}", task.Quality.Value.ToString(CultureInfo.InvariantCulture));
 break;
 }
 
 if (task.TwoPass)
 query += " -2 ";
 
- if (task.TurboFirstPass)
+ if (task.TurboFirstPass && task.VideoEncoder == VideoEncoder.X264)
 query += " -T ";
 
 if (task.Framerate.HasValue)
@@ -577,7 +610,7 @@
 firstLoop = false;
 }
 else
- audioItems += "," + Converters.GetCliAudioEncoder(item);
+ audioItems += "," + Converters.GetCliAudioEncoder(item);
 }
 if (audioItems.Trim() != String.Empty)
 query += " -E " + audioItems;
@@ -603,7 +636,7 @@
 // Sample Rate (-R)
 foreach (double item in samplerates)
 {
- string add = (item == 0.0) ? "Auto" : item.ToString();
+ string add = (item == 0.0) ? "Auto" : item.ToString(new CultureInfo("en-US"));
 if (firstLoop)
 {
 audioItems = add;
@@ -678,16 +711,18 @@
 foundTrackName = true;
 }
 
+ string fixedTrackName = trackName != null ? trackName.Replace(",", "\\,") : string.Empty;
+
 if (firstLoop)
 {
- audioItems = string.IsNullOrEmpty(trackName) ? "\"\"" : string.Format("\"{0}\"", trackName.Trim());
+ audioItems = string.IsNullOrEmpty(fixedTrackName) ? string.Empty : string.Format("{0}", fixedTrackName.Trim());
 firstLoop = false;
 }
 else
- audioItems += "," + (string.IsNullOrEmpty(trackName) ? "\"\"" : string.Format("\"{0}\"", trackName.Trim()));
+ audioItems += "," + (string.IsNullOrEmpty(fixedTrackName) ? string.Empty : string.Format("{0}", fixedTrackName.Trim()));
 }
 if (foundTrackName)
- query += string.Format(" --aname={0}", audioItems);
+ query += string.Format(" --aname=\"{0}\"", audioItems);
 
 // Passthru Settings
 if (task.AllowedPassthruOptions != null)
@@ -726,10 +761,10 @@
 {
 query += string.Format(" --audio-copy-mask {0}", fallbackEncoders);
 }
- } 
+ }
 else
 {
- query += string.Format(" --audio-copy-mask none"); 
+ query += string.Format(" --audio-copy-mask none");
 }
 
 query += string.Format(" --audio-fallback {0}", Converters.GetCliAudioEncoder(task.AllowedPassthruOptions.AudioEncoderFallback));
@@ -764,6 +799,7 @@
 string srtOffset = String.Empty;
 string srtLang = String.Empty;
 string srtDefault = String.Empty;
+ int? srtBurnTrack = null;
 int srtCount = 0;
 int subCount = 0;
 
@@ -784,11 +820,13 @@
 if (item.Default)
 srtDefault = srtCount.ToString();
 
- itemToAdd = item.SrtPath;
+ itemToAdd = item.SrtPath.Replace("\\", "\\\\").Replace(",", "\\,");
 srtFile += srtFile == string.Empty ? itemToAdd : "," + itemToAdd;
 
 itemToAdd = item.SrtOffset.ToString();
 srtOffset += srtOffset == string.Empty ? itemToAdd : "," + itemToAdd;
+ if (item.Burned)
+ srtBurnTrack = srtCount;
 }
 else // We have Bitmap or CC
 {
@@ -844,6 +882,8 @@
 query += " --srt-lang " + srtLang;
 if (srtDefault != string.Empty)
 query += " --srt-default=" + srtDefault;
+ if (srtBurnTrack.HasValue)
+ query += " --srt-burn=" + srtBurnTrack.Value;
 }
 }
 
@@ -899,57 +939,105 @@
 /// </returns>
 private static string AdvancedQuery(EncodeTask task)
 {
+ string query = string.Empty;
+
+ // X264 Only
 if (task.VideoEncoder == VideoEncoder.X264)
 {
- string query = string.Empty; 
-
- if (task.X264Preset != x264Preset.Medium)
+ if (!task.ShowAdvancedTab)
 {
- query += string.Format(" --x264-preset={0} ", task.X264Preset.ToString().ToLower().Replace(" ", string.Empty));
- }
+ if (task.X264Preset != x264Preset.Medium)
+ {
+ query += string.Format(
+ " --encoder-preset={0} ", task.X264Preset.ToString().ToLower().Replace(" ", string.Empty));
+ }
 
- if (task.H264Profile != x264Profile.None)
- {
- query += string.Format(" --x264-profile={0} ", task.H264Profile.ToString().ToLower().Replace(" ", string.Empty));
+ if (task.X264Tune != x264Tune.None)
+ {
+ string tune = string.Empty;
+
+ if (task.FastDecode)
+ {
+ tune = "fastdecode";
+ }
+
+ string tuneDropdown = task.X264Tune.ToString().ToLower().Replace(" ", string.Empty);
+ if (task.X264Tune != x264Tune.None && !string.IsNullOrEmpty(tuneDropdown))
+ {
+ tune = string.IsNullOrEmpty(tune) ? tuneDropdown : string.Format(",{0}", tuneDropdown);
+ }
+
+ query += string.Format(" --encoder-tune=\"{0}\" ", tune);
+ }
+
+ if (!string.IsNullOrEmpty(task.ExtraAdvancedArguments))
+ {
+ query += string.Format(" -x {0}", task.ExtraAdvancedArguments);
+ }
 }
+ }
 
- if (task.X264Tune != x264Tune.None)
+ // X265 Only
+ if (task.VideoEncoder == VideoEncoder.X265)
+ {
+ if (!task.ShowAdvancedTab)
 {
- string tune = string.Empty;
+ if (task.X265Preset != x265Preset.Medium)
+ {
+ query += string.Format(
+ " --encoder-preset={0} ", task.X265Preset.ToString().ToLower().Replace(" ", string.Empty));
+ }
 
- if (task.FastDecode)
+ if (task.X265Tune != x265Tune.None)
 {
- tune = "fastdecode";
+ query += string.Format(
+ " --encoder-tune=\"{0}\" ", task.X265Tune.ToString().ToLower().Replace(" ", string.Empty));
 }
 
- string tuneDropdown = task.X264Tune.ToString().ToLower().Replace(" ", string.Empty);
- if (task.X264Tune != x264Tune.None && !string.IsNullOrEmpty(tuneDropdown))
+ if (task.H265Profile != x265Profile.None)
 {
- tune = string.IsNullOrEmpty(tune) ? tuneDropdown : string.Format(",{0}", tuneDropdown); 
+ query += string.Format(
+ " --encoder-profile={0} ", task.H265Profile.ToString().ToLower().Replace(" ", string.Empty));
 }
 
- query += string.Format(" --x264-tune=\"{0}\" ", tune);
+ if (!string.IsNullOrEmpty(task.ExtraAdvancedArguments))
+ {
+ query += string.Format(" -x {0}", task.ExtraAdvancedArguments);
+ }
 }
+ }
 
- if (task.H264Level != "Auto")
- {
- query += string.Format(" --h264-level=\"{0}\" ", task.H264Level);
- }
+ // QSV Only
+ if (task.VideoEncoder == VideoEncoder.QuickSync)
+ {
+ query += string.Format(" --encoder-preset={0}", task.QsvPreset.ToString().ToLower());
+ }
 
- if (!string.IsNullOrEmpty(task.AdvancedEncoderOptions))
- {
- query += string.Format(" -x {0}", task.AdvancedEncoderOptions);
- }
+ // options that apply to all encoders
+ if (!string.IsNullOrEmpty(task.AdvancedEncoderOptions))
+ {
+ query += string.Format(" -x {0}", task.AdvancedEncoderOptions);
+ }
 
- if (!string.IsNullOrEmpty(task.ExtraAdvancedArguments))
+ // Options that apply to both x264 and QuickSync
+ if (task.VideoEncoder == VideoEncoder.QuickSync || task.VideoEncoder == VideoEncoder.X264)
+ {
+ // when using x264 with the advanced panel, the H.264 profile/level widgets are disabled
+ if (!(task.VideoEncoder == VideoEncoder.X264 && task.ShowAdvancedTab))
 {
- query += string.Format(" -x {0}", task.ExtraAdvancedArguments);
+ if (task.H264Level != "Auto")
+ {
+ query += string.Format(" --encoder-level=\"{0}\" ", task.H264Level);
+ }
+ if (task.H264Profile != x264Profile.None)
+ {
+ query += string.Format(
+ " --encoder-profile={0} ", task.H264Profile.ToString().ToLower().Replace(" ", string.Empty));
+ }
 }
-
- return query;
 }
 
- return string.IsNullOrEmpty(task.AdvancedEncoderOptions) ? string.Empty : string.Format(" -x {0}", task.AdvancedEncoderOptions);
+ return query;
 }
 
 /// <summary>
@@ -961,10 +1049,22 @@
 /// <param name="disableLibdvdNav">
 /// The disable Libdvd Nav.
 /// </param>
+ /// <param name="disableQsvDecode">
+ /// The disable Qsv Decode.
+ /// </param>
+ /// <param name="enableHwd">
+ /// The enable Hwd.
+ /// </param>
+ /// <param name="enableOpenCL">
+ /// The enable Open CL.
+ /// </param>
+ /// <param name="isQsv">
+ /// The is Qsv.
+ /// </param>
 /// <returns>
 /// A Cli Query as a string
 /// </returns>
- private static string ExtraSettings(int verbosity, bool disableLibdvdNav)
+ private static string ExtraSettings(int verbosity, bool disableLibdvdNav, bool disableQsvDecode, bool enableHwd, bool enableOpenCL, bool isQsv)
 {
 string query = string.Empty;
 
@@ -975,6 +1075,17 @@
 if (disableLibdvdNav)
 query += " --no-dvdnav";
 
+ if (disableQsvDecode)
+ query += " --disable-qsv-decoding";
+
+ if (enableOpenCL && !isQsv)
+ query += " -P ";
+
+ if (enableHwd && !isQsv)
+ {
+ query += " -U ";
+ }
+
 return query;
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs Changed

@@ -54,7 +54,6 @@
             // Output Settings
             Match format = Regex.Match(input, @"-f ([a-zA-Z0-9]+)");
             Match grayscale = Regex.Match(input, @" -g");
-            Match largerMp4 = Regex.Match(input, @" -4");
             Match ipodAtom = Regex.Match(input, @" -I");
 
             // Picture Settings Tab
@@ -75,9 +74,11 @@
 
             // Picture Settings - Filters
             Match decomb = Regex.Match(input, @" --decomb");
-            Match decombValue = Regex.Match(input, @" --decomb=\""([a-zA-Z0-9.:]*)\""");
+            Match decombValue = Regex.Match(input, @" --decomb=([a-zA-Z0-9.:""\\]*)");
             Match deinterlace = Regex.Match(input, @"--deinterlace=\""([a-zA-Z0-9.:]*)\""");
             Match denoise = Regex.Match(input, @"--denoise=\""([a-zA-Z0-9.:]*)\""");
+            Match nlmeans = Regex.Match(input, @"--nlmeans=\""([a-zA-Z0-9.:]*)\""");
+            Match nlmeansTune = Regex.Match(input, @"--nlmeans-tune=\""([a-zA-Z0-9.:]*)\""");
             Match deblock = Regex.Match(input, @"--deblock=([0-9:]*)");
             Match detelecine = Regex.Match(input, @"--detelecine");
             Match detelecineValue = Regex.Match(input, @" --detelecine=\""([a-zA-Z0-9.:]*)\""");
@@ -115,6 +116,9 @@
             Match x264Profile = Regex.Match(input, @"--x264-profile([=a-zA-Z0-9\s ]*)");
             Match h264Level = Regex.Match(input, @"--h264-level([=a-zA-Z0-9.\s ]*)");
 
+            Match x265Profile = Regex.Match(input, @"--x265-profile([=a-zA-Z0-9\s ]*)");
+            Match x265Tune = Regex.Match(input, @"--x265-tune([=,a-zA-Z0-9\s ]*)");
+            Match x265Preset = Regex.Match(input, @"--x265-preset([=a-zA-Z0-9\s ]*)");
             #endregion
 
             #region Set Varibles
@@ -152,7 +156,6 @@
                 {
                     parsed.OutputFormat = Converters.GetFileFormat(format.Groups[1].ToString());
                 }
-                parsed.LargeFile = largerMp4.Success;
                 parsed.IPod5GSupport = ipodAtom.Success;
                 parsed.OptimizeMP4 = optimizeMP4.Success;
 
@@ -272,24 +275,64 @@
                 parsed.Denoise = Denoise.Off;
                 if (denoise.Success)
                 {
+                    parsed.Denoise = Denoise.hqdn3d;
                     switch (denoise.ToString().Replace("--denoise=", string.Empty).Replace("\"", string.Empty))
                     {
                         case "weak":
-                            parsed.Denoise = Denoise.Weak;
+                            parsed.DenoisePreset = DenoisePreset.Weak;
                             break;
                         case "medium":
-                            parsed.Denoise = Denoise.Medium;
+                            parsed.DenoisePreset = DenoisePreset.Medium;
                             break;
                         case "strong":
-                            parsed.Denoise = Denoise.Strong;
+                            parsed.DenoisePreset = DenoisePreset.Strong;
                             break;
                         default:
-                            parsed.Denoise = Denoise.Custom;
+                            parsed.DenoisePreset = DenoisePreset.Custom;
                             parsed.CustomDenoise = denoise.ToString().Replace("--denoise=", string.Empty).Replace("\"", string.Empty);
                             break;
                     }
                 }
 
+                if (nlmeans.Success)
+                {
+                    parsed.Denoise = Denoise.NLMeans;
+                    switch (nlmeans.ToString().Replace("--nlmeans=", string.Empty).Replace("\"", string.Empty))
+                    {
+                        case "ultralight":
+                            parsed.DenoisePreset = DenoisePreset.Ultralight;
+                            break;
+                        case "light":
+                            parsed.DenoisePreset = DenoisePreset.Light;
+                            break;
+                        case "medium":
+                            parsed.DenoisePreset = DenoisePreset.Medium;
+                            break;
+                        case "strong":
+                            parsed.DenoisePreset = DenoisePreset.Strong;
+                            break;
+                    }
+
+                    if (nlmeansTune.Success)
+                    {
+                        switch (nlmeansTune.ToString().Replace("--nlmeans-tune=", string.Empty).Replace("\"", string.Empty))
+                        {
+                            case "animation":
+                                parsed.DenoiseTune = DenoiseTune.Animation;
+                                break;
+                            case "film":
+                                parsed.DenoiseTune = DenoiseTune.Film;
+                                break;
+                            case "grain":
+                                parsed.DenoiseTune = DenoiseTune.Grain;
+                                break;
+                            case "highmotion":
+                                parsed.DenoiseTune = DenoiseTune.HighMotion;
+                                break;
+                        }                      
+                    }
+                }
+
                 parsed.Deblock = 0;
                 if (deblock.Success)
                 {
@@ -477,7 +520,33 @@
 
                     parsed.X264Tune = Converters.Getx264TuneFromCli(tuneOptions);
                 }
-                  
+
+                if (x265Preset.Success)
+                    parsed.X265Preset =
+                        Converters.Getx265PresetFromCli(x265Preset.ToString().Replace("--x265-preset", string.Empty).Replace("=", string.Empty).Trim());
+
+                if (h264Profile.Success)
+                    parsed.H265Profile =
+                        Converters.Getx265ProfileFromCli(h264Profile.ToString().Replace("--h265-profile", string.Empty).Replace("=", string.Empty).Trim());
+
+                if (x265Profile.Success)
+                    parsed.H265Profile =
+                       Converters.Getx265ProfileFromCli(x265Profile.ToString().Replace("--x265-profile", string.Empty).Replace("=", string.Empty).Trim());
+
+                if (x265Tune.Success)
+                {
+                    string tuneOptions =
+                        x265Tune.ToString().Replace("--x265-tune", string.Empty).Replace("=", string.Empty).Trim();
+
+                    parsed.FastDecode = tuneOptions.Contains("fastdecode");
+
+                    // Remove these options. They are not in the dropdown.
+                    tuneOptions = tuneOptions.Replace("fastdecode", string.Empty).Replace(
+                        ",", string.Empty);
+
+                    parsed.X265Tune = Converters.Getx265TuneFromCli(tuneOptions);
+                }
+
                 #endregion
             }
             catch (Exception exc)

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs Changed

@@ -9,8 +9,16 @@
 
 namespace HandBrake.ApplicationServices.Utilities
 {
+ using System;
+ using System.Collections.Generic;
+ using System.Globalization;
+ using System.Management;
+ using System.Text.RegularExpressions;
+ using System.Windows.Documents;
 using System.Windows.Forms;
 
+ using HandBrake.Interop.HbLib;
+
 using Microsoft.Win32;
 
 /// <summary>
@@ -56,5 +64,93 @@
 {
 get { return Screen.PrimaryScreen; }
 }
+
+ /// <summary>
+ /// Gets a value indicating whether is qsv available.
+ /// </summary>
+ public static bool IsQsvAvailable
+ {
+ get
+ {
+ try
+ {
+ if (!GeneralUtilities.IsLibHbPresent)
+ {
+ return false; // Feature is disabled.
+ }
+
+ return HBFunctions.hb_qsv_available() == 1;
+ }
+ catch (Exception)
+ {
+ // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
+ return false;
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets a value indicating whether is hsw or newer.
+ /// </summary>
+ public static bool IsHswOrNewer
+ {
+ get
+ {
+ // TODO replace with a call to libhb
+ string cpu = GetCpuCount.ToString();
+ if (cpu.Contains("Intel"))
+ {
+ Match match = Regex.Match(cpu, "([0-9]{4})");
+ if (match.Success)
+ {
+ string cpuId = match.Groups[0].ToString();
+ int cpuNumber;
+ if (int.TryParse(cpuId, out cpuNumber))
+ {
+ if (cpuNumber > 4000)
+ {
+ return true;
+ }
+ }
+ }
+ }
+
+ return false;
+ }
+ }
+
+ /// <summary>
+ /// Gets the get gpu driver version.
+ /// </summary>
+ public static List<string> GetGPUInfo
+ {
+ get
+ {
+ List<string> gpuInfo = new List<string>();
+ ManagementObjectSearcher searcher = new ManagementObjectSearcher(
+ "select * from " + "Win32_VideoController");
+
+ foreach (ManagementObject share in searcher.Get())
+ {
+ string gpu = string.Empty, version = string.Empty;
+
+ foreach (PropertyData PC in share.Properties)
+ {
+ if (!string.IsNullOrEmpty(PC.Name) && PC.Value != null)
+ {
+ if (PC.Name.Equals("DriverVersion")) version = PC.Value.ToString();
+ if (PC.Name.Equals("Name")) gpu = PC.Value.ToString();
+ }
+ }
+
+ if (!string.IsNullOrEmpty(gpu) && !string.IsNullOrEmpty(version))
+ {
+ gpuInfo.Add(string.Format("{0} - {1}", gpu, version));
+ }
+ }
+
+ return gpuInfo;
+ }
+ }
 }
 }
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/Win32.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/Win32.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/Win7.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/Win7.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/app.config -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.ApplicationServices/app.config Changed

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Attributes Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Attributes/ShortName.cs Added

@@ -0,0 +1,35 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ShortName.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// A Short Name for an enum value
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Attributes
+{
+ using System;
+
+ /// <summary>
+ /// A Short Name for an enum value
+ /// </summary>
+ public class ShortName : Attribute
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="ShortName"/> class.
+ /// </summary>
+ /// <param name="shortName">
+ /// The short name.
+ /// </param>
+ public ShortName(string shortName)
+ {
+ this.Name = shortName;
+ }
+
+ /// <summary>
+ /// Gets or sets the short name.
+ /// </summary>
+ public string Name { get; set; }
+ }
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Converters Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Converters/Converters.cs Added

@@ -0,0 +1,225 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Converters.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the Converters type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Converters
+{
+ using System;
+ using System.Collections.Generic;
+ using System.Globalization;
+
+ using HandBrake.Interop.HbLib;
+ using HandBrake.Interop.Helpers;
+ using HandBrake.Interop.Model;
+ using HandBrake.Interop.Model.Encoding;
+ using HandBrake.Interop.SourceData;
+
+ /// <summary>
+	/// Converters for various encoding values.
+	/// </summary>
+	public static class Converters
+	{
+		/// <summary>
+		/// Video Frame Rates
+		/// </summary>
+		private static readonly Dictionary<double, int> VideoRates;
+
+		/// <summary>
+		/// Initializes static members of the Converters class.
+		/// </summary>
+		static Converters()
+		{
+			HandBrakeUtils.EnsureGlobalInit();
+
+			VideoRates = new Dictionary<double, int>();
+			foreach (var framerate in Encoders.VideoFramerates)
+			{
+				VideoRates.Add(double.Parse(framerate.Name, CultureInfo.InvariantCulture), framerate.Rate);
+			}
+		}
+
+		/// <summary>
+		/// Convert Framerate to Video Rates
+		/// </summary>
+		/// <param name="framerate">
+		/// The framerate.
+		/// </param>
+		/// <returns>
+		/// The vrate if a valid framerate is passed in.
+		/// </returns>
+		/// <exception cref="ArgumentException">
+		/// Thrown when framerate is invalid.
+		/// </exception>
+		public static int FramerateToVrate(double framerate)
+		{
+			if (!VideoRates.ContainsKey(framerate))
+			{
+				throw new ArgumentException("Framerate not recognized.", "framerate");
+			}
+
+			return VideoRates[framerate];
+		}
+
+		/// <summary>
+		/// Convert Native HB Internal Audio int to a AudioCodec model.
+		/// </summary>
+		/// <param name="codec">
+		/// The codec.
+		/// </param>
+		/// <returns>
+		/// An AudioCodec object.
+		/// </returns>
+		public static AudioCodec NativeToAudioCodec(uint codec)
+		{
+			switch (codec)
+			{
+				case NativeConstants.HB_ACODEC_AC3:
+					return AudioCodec.Ac3;
+				case NativeConstants.HB_ACODEC_DCA:
+					return AudioCodec.Dts;
+				case NativeConstants.HB_ACODEC_DCA_HD:
+					return AudioCodec.DtsHD;
+				case NativeConstants.HB_ACODEC_LAME:
+				case NativeConstants.HB_ACODEC_MP3:
+					return AudioCodec.Mp3;
+				case NativeConstants.HB_ACODEC_FFAAC:
+				case NativeConstants.HB_ACODEC_CA_AAC:
+				case NativeConstants.HB_ACODEC_CA_HAAC:
+				case NativeConstants.HB_ACODEC_FDK_HAAC: // TODO Check this is correct
+				case NativeConstants.HB_ACODEC_FDK_AAC: // TODO Check this is correct
+					return AudioCodec.Aac;
+				case NativeConstants.HB_ACODEC_FFFLAC:
+					return AudioCodec.Flac;
+
+				default:
+					return AudioCodec.Other;
+			}
+		}
+
+		/// <summary>
+		/// Converts a native HB encoder structure to an Encoder model.
+		/// </summary>
+		/// <param name="encoder">The structure to convert.</param>
+		/// <returns>The converted model.</returns>
+		public static HBVideoEncoder NativeToVideoEncoder(hb_encoder_s encoder)
+		{
+			return new HBVideoEncoder
+			{
+				Id = encoder.codec,
+				ShortName = encoder.short_name,
+				DisplayName = encoder.name,
+				CompatibleContainers = encoder.muxers
+			};
+		}
+
+		/// <summary>
+		/// Converts a native HB encoder structure to an Encoder model.
+		/// </summary>
+		/// <param name="encoder">The structure to convert.</param>
+		/// <returns>The converted model.</returns>
+		public static HBAudioEncoder NativeToAudioEncoder(hb_encoder_s encoder)
+		{
+			var result = new HBAudioEncoder
+			 {
+			 Id = encoder.codec,
+			 ShortName = encoder.short_name,
+			 DisplayName = encoder.name,
+			 CompatibleContainers = encoder.muxers,
+			 QualityLimits = Encoders.GetAudioQualityLimits(encoder.codec),
+			 DefaultQuality = HBFunctions.hb_audio_quality_get_default((uint)encoder.codec),
+			 CompressionLimits = Encoders.GetAudioCompressionLimits(encoder.codec),
+			 DefaultCompression =
+			 HBFunctions.hb_audio_compression_get_default((uint)encoder.codec)
+			 };
+
+		 return result;
+		}
+
+		/// <summary>
+		/// Converts a native HB rate structure to an HBRate object.
+		/// </summary>
+		/// <param name="rate">The structure to convert.</param>
+		/// <returns>The converted rate object.</returns>
+		public static HBRate NativeToRate(hb_rate_s rate)
+		{
+			return new HBRate
+				{
+					Name = rate.name,
+					Rate = rate.rate
+				};
+		}
+
+		/// <summary>
+		/// Converts a native HB mixdown structure to a Mixdown model.
+		/// </summary>
+		/// <param name="mixdown">The structure to convert.</param>
+		/// <returns>The converted model.</returns>
+		public static HBMixdown NativeToMixdown(hb_mixdown_s mixdown)
+		{
+			return new HBMixdown
+				{
+					Id = mixdown.amixdown,
+					ShortName = mixdown.short_name,
+					DisplayName = mixdown.name
+				};
+		}
+
+		/// <summary>
+		/// Converts a native HB container structure into an HBContainer object.
+		/// </summary>
+		/// <param name="container">The structure to convert.</param>
+		/// <returns>The converted structure.</returns>
+		public static HBContainer NativeToContainer(hb_container_s container)
+		{
+			return new HBContainer
+				{
+					DisplayName = container.name,
+					ShortName = container.short_name,
+					DefaultExtension = container.default_extension,
+					Id = container.format
+				};
+		}
+
+		/// <summary>
+		/// Converts a native language structure to a Language object.
+		/// </summary>
+		/// <param name="language">The structure to convert.</param>
+		/// <returns>The converted structure.</returns>
+		public static Language NativeToLanguage(iso639_lang_t language)
+		{
+			string englishName = InteropUtilities.ToStringFromUtf8Ptr(language.eng_name);
+			string nativeName = InteropUtilities.ToStringFromUtf8Ptr(language.native_name);
+			return new Language
+				{
+					Code = language.iso639_2,
+					EnglishName = englishName,
+					NativeName = nativeName
+				};
+		}
+
+		/// <summary>
+		/// Converts the PTS amount to a TimeSpan. There may be some accuracy loss here.
+		/// </summary>
+		/// <param name="pts">The PTS to convert.</param>
+		/// <returns>The timespan for it.</returns>
+		public static TimeSpan PtsToTimeSpan(ulong pts)
+		{
+			return TimeSpan.FromTicks((long)((pts * 10000000) / 90000));
+		}
+
+		/// <summary>
+		/// Converts the PTS amount to seconds.
+		/// </summary>
+		/// <param name="pts">The PTS to convert.</param>
+		/// <returns>The corresponding number of seconds.</returns>
+		public static double PtsToSeconds(ulong pts)
+		{
+			return (double)pts / 90000;
+		}
+	}
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/EncodeCompletedEventArgs.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/EncodeCompletedEventArgs.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs Changed

@@ -9,1878 +9,2009 @@
 
 namespace HandBrake.Interop
 {
-	using System;
-	using System.Collections.Generic;
-	using System.Globalization;
-	using System.IO;
-	using System.Linq;
-	using System.Runtime.InteropServices;
-	using System.Windows.Media.Imaging;
-
-	using HandBrake.Interop.EventArgs;
-	using HandBrake.Interop.HbLib;
-	using HandBrake.Interop.Interfaces;
-	using HandBrake.Interop.Model;
-	using HandBrake.Interop.Model.Encoding;
-	using HandBrake.Interop.SourceData;
-
-	/// <summary>
-	/// A wrapper for a HandBrake instance.
-	/// </summary>
-	public class HandBrakeInstance : IHandBrakeInstance, IDisposable
-	{
-		/// <summary>
-		/// The modulus for picture size when auto-sizing dimensions.
-		/// </summary>
-		private const int PictureAutoSizeModulus = 2;
-
-		/// <summary>
-		/// The number of MS between status polls when scanning.
-		/// </summary>
-		private const double ScanPollIntervalMs = 200;
-
-		/// <summary>
-		/// The number of MS between status polls when encoding.
-		/// </summary>
-		private const double EncodePollIntervalMs = 200;
-
-		/// <summary>
-		/// X264 options to add for a turbo first pass.
-		/// </summary>
-		private const string TurboX264Opts = "ref=1:subme=2:me=dia:analyse=none:trellis=0:no-fast-pskip=0:8x8dct=0:weightb=0";
-
-		/// <summary>
-		/// Lock for creation of handbrake instances;
-		/// </summary>
-		private static object instanceCreationLock = new object();
-
-		/// <summary>
-		/// True if a handbrake instance has been created.
-		/// </summary>
-		private static bool globalInitialized;
-
-		/// <summary>
-		/// The native handle to the HandBrake instance.
-		/// </summary>
-		private IntPtr hbHandle;
-
-		/// <summary>
-		/// The number of previews created during scan.
-		/// </summary>
-		private int previewCount;
-
-		/// <summary>
-		/// The timer to poll for scan status.
-		/// </summary>
-		private System.Timers.Timer scanPollTimer;
-
-		/// <summary>
-		/// The timer to poll for encode status.
-		/// </summary>
-		private System.Timers.Timer encodePollTimer;
-
-		/// <summary>
-		/// The list of original titles in native structure form.
-		/// </summary>
-		private List<hb_title_s> originalTitles;
-
-		/// <summary>
-		/// The list of titles on this instance.
-		/// </summary>
-		private List<Title> titles;
-
-		/// <summary>
-		/// The current encode job for this instance.
-		/// </summary>
-		private EncodeJob currentJob;
-
-		/// <summary>
-		/// True if the current job is scanning for subtitles.
-		/// </summary>
-		private bool subtitleScan;
-
-		/// <summary>
-		/// The index of the default title.
-		/// </summary>
-		private int featureTitle;
-
-		/// <summary>
-		/// A list of native memory locations allocated by this instance.
-		/// </summary>
-		private List<IntPtr> encodeAllocatedMemory;
-
-		/// <summary>
-		/// A value indicating whether this object has been disposed or not.
-		/// </summary>
-		private bool disposed;
-
-		/// <summary>
-		/// Finalizes an instance of the HandBrakeInstance class.
-		/// </summary>
-		~HandBrakeInstance()
-		{
-			this.Dispose(false);
-		}
-
-		/// <summary>
-		/// Fires for progress updates when scanning.
-		/// </summary>
-		public event EventHandler<ScanProgressEventArgs> ScanProgress;
-
-		/// <summary>
-		/// Fires when a scan has completed.
-		/// </summary>
-		public event EventHandler<System.EventArgs> ScanCompleted;
-
-		/// <summary>
-		/// Fires for progress updates when encoding.
-		/// </summary>
-		public event EventHandler<EncodeProgressEventArgs> EncodeProgress;
-
-		/// <summary>
-		/// Fires when an encode has completed.
-		/// </summary>
-		public event EventHandler<EncodeCompletedEventArgs> EncodeCompleted;
-
-		/// <summary>
-		/// Gets the list of titles on this instance.
-		/// </summary>
-		public List<Title> Titles
-		{
-			get
-			{
-				return this.titles;
-			}
-		}
-
-		/// <summary>
-		/// Gets the number of previews created during scan.
-		/// </summary>
-		public int PreviewCount
-		{
-			get
-			{
-				return this.previewCount;
-			}
-		}
-
-		/// <summary>
-		/// Gets the index of the default title.
-		/// </summary>
-		public int FeatureTitle
-		{
-			get
-			{
-				return this.featureTitle;
-			}
-		}
-
-		/// <summary>
-		/// Initializes this instance.
-		/// </summary>
-		/// <param name="verbosity">The code for the logging verbosity to use.</param>
-		public void Initialize(int verbosity)
-		{
-			lock (instanceCreationLock)
-			{
-				if (!globalInitialized)
-				{
-					globalInitialized = true;
-				}
-			}
-
-			HandBrakeUtils.RegisterLogger();
-			this.hbHandle = HBFunctions.hb_init(verbosity, update_check: 0);
-		}
-
-		/// <summary>
-		/// Starts scanning the given path.
-		/// </summary>
-		/// <param name="path">The path to the video to scan.</param>
-		/// <param name="previewCount">The number of preview images to make.</param>
-		/// <param name="minDuration">The minimum duration of a title to show up on the scan.</param>
-		public void StartScan(string path, int previewCount, TimeSpan minDuration)
-		{
-			this.StartScan(path, previewCount, minDuration, 0);
-		}
-
-		public void StartScan(string path, int previewCount)
-		{
-			this.StartScan(path, previewCount, TimeSpan.FromSeconds(10), 0);
-		}
-
-		/// <summary>
-		/// Starts a scan of the given path.
-		/// </summary>
-		/// <param name="path">The path of the video to scan.</param>
-		/// <param name="previewCount">The number of previews to make on each title.</param>
-		/// <param name="titleIndex">The title index to scan (1-based, 0 for all titles).</param>
-		public void StartScan(string path, int previewCount, int titleIndex)
-		{
-			this.StartScan(path, previewCount, TimeSpan.Zero, titleIndex);
-		}
-
-		/// <summary>
-		/// Stops an ongoing scan.
-		/// </summary>
-		public void StopScan()
-		{
-			HBFunctions.hb_scan_stop(this.hbHandle);
-		}
-
-		/// <summary>
-		/// Gets an image for the given job and preview
-		/// </summary>
-		/// <remarks>
-		/// Only incorporates sizing and aspect ratio into preview image.
-		/// </remarks>
-		/// <param name="job">The encode job to preview.</param>
-		/// <param name="previewNumber">The index of the preview to get (0-based).</param>
-		/// <returns>An image with the requested preview.</returns>
-		public BitmapImage GetPreview(EncodeJob job, int previewNumber)
-		{
-			IntPtr nativeJobPtr = HBFunctions.hb_job_init_by_index(this.hbHandle, this.GetTitleIndex(job.Title));
-			var nativeJob = InteropUtilities.ReadStructure<hb_job_s>(nativeJobPtr);
-
-			List<IntPtr> allocatedMemory = this.ApplyJob(ref nativeJob, job);
-			
-			// There are some problems with getting previews with deinterlacing. Disabling for now.
-			nativeJob.deinterlace = 0;
-
-			int outputWidth = nativeJob.width;
-			int outputHeight = nativeJob.height;
-			int imageBufferSize = outputWidth * outputHeight * 4;
-			IntPtr nativeBuffer = Marshal.AllocHGlobal(imageBufferSize);
-			allocatedMemory.Add(nativeBuffer);
-			HBFunctions.hb_get_preview(this.hbHandle, ref nativeJob, previewNumber, nativeBuffer);
-
-			// We've used the job to get the preview. Clean up the job.
-			InteropUtilities.CloseJob(nativeJobPtr);
-
-			// Copy the filled image buffer to a managed array.
-			byte[] managedBuffer = new byte[imageBufferSize];
-			Marshal.Copy(nativeBuffer, managedBuffer, 0, imageBufferSize);
-
-			// We've copied the data out of unmanaged memory. Clean up that memory now.
-			InteropUtilities.FreeMemory(allocatedMemory);
-
-			var bitmap = new System.Drawing.Bitmap(outputWidth, outputHeight);
-			System.Drawing.Imaging.BitmapData bitmapData = bitmap.LockBits(new System.Drawing.Rectangle(0, 0, outputWidth, outputHeight), System.Drawing.Imaging.ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format32bppRgb);
-
-			IntPtr ptr = bitmapData.Scan0;
-
-			for (int i = 0; i < nativeJob.height; i++)
-			{
-				Marshal.Copy(managedBuffer, i * nativeJob.width * 4, ptr, nativeJob.width * 4);
-				ptr = IntPtr.Add(ptr, bitmapData.Stride);
-			}
-
-			bitmap.UnlockBits(bitmapData);
-
-			using (var memoryStream = new MemoryStream())
-			{
-				try
-				{
-					bitmap.Save(memoryStream, System.Drawing.Imaging.ImageFormat.Bmp);
-				}
-				finally
-				{
-					bitmap.Dispose();
-				}
-
-				var wpfBitmap = new BitmapImage();
-				wpfBitmap.BeginInit();
-				wpfBitmap.CacheOption = BitmapCacheOption.OnLoad;
-				wpfBitmap.StreamSource = memoryStream;
-				wpfBitmap.EndInit();
-				wpfBitmap.Freeze();
-
-				return wpfBitmap;
-			}
-		}
-
-		/// <summary>
-		/// Calculates the video bitrate for the given job and target size.
-		/// </summary>
-		/// <param name="job">The encode job.</param>
-		/// <param name="sizeMB">The target size in MB.</param>
-		/// <param name="overallSelectedLengthSeconds">The currently selected encode length. Used in preview
-		/// for calculating bitrate when the target size would be wrong.</param>
-		/// <returns>The video bitrate in kbps.</returns>
-		public int CalculateBitrate(EncodeJob job, int sizeMB, double overallSelectedLengthSeconds = 0)
-		{
-			long availableBytes = ((long) sizeMB) * 1024 * 1024;
-
-			EncodingProfile profile = job.EncodingProfile;
-			Title title = this.GetTitle(job.Title);
-
-			double lengthSeconds = overallSelectedLengthSeconds > 0 ? overallSelectedLengthSeconds : HandBrakeUtils.GetJobLengthSeconds(job, title);
-			lengthSeconds += 1.5;
-
-			double outputFramerate;
-			if (profile.Framerate == 0)
-			{
-				outputFramerate = title.Framerate;
-			}
-			else
-			{
-				// Not sure what to do for VFR here hb_calc_bitrate never handled it...
-				// just use the peak for now.
-				outputFramerate = profile.Framerate;
-			}
-
-			long frames = (long)(lengthSeconds * outputFramerate);
-
-			availableBytes -= frames * HandBrakeUtils.ContainerOverheadPerFrame;
-
-			List<Tuple<AudioEncoding, int>> outputTrackList = this.GetOutputTracks(job, title);
-			availableBytes -= HandBrakeUtils.GetAudioSize(job, lengthSeconds, title, outputTrackList);
-
-			if (availableBytes < 0)
-			{
-				return 0;
-			}
-
-			// Video bitrate is in kilobits per second, or where 1 kbps is 1000 bits per second.
-			// So 1 kbps is 125 bytes per second.
-			return (int)(availableBytes / (125 * lengthSeconds));
-		}
-
-		/// <summary>
-		/// Gives estimated file size (in MB) of the given job and video bitrate.
-		/// </summary>
-		/// <param name="job">The encode job.</param>
-		/// <param name="videoBitrate">The video bitrate to be used (kbps).</param>
-		/// <returns>The estimated file size (in MB) of the given job and video bitrate.</returns>
-		public double CalculateFileSize(EncodeJob job, int videoBitrate)
-		{
-			long totalBytes = 0;
-
-			EncodingProfile profile = job.EncodingProfile;
-			Title title = this.GetTitle(job.Title);
-
-			double lengthSeconds = HandBrakeUtils.GetJobLengthSeconds(job, title);
-			lengthSeconds += 1.5;
-
-			double outputFramerate;
-			if (profile.Framerate == 0)
-			{
-				outputFramerate = title.Framerate;
-			}
-			else
-			{
-				// Not sure what to do for VFR here hb_calc_bitrate never handled it...
-				// just use the peak for now.
-				outputFramerate = profile.Framerate;
-			}
-
-			long frames = (long)(lengthSeconds * outputFramerate);
-
-			totalBytes += (long)(lengthSeconds * videoBitrate * 125);
-			totalBytes += frames * HandBrakeUtils.ContainerOverheadPerFrame;
-
-			List<Tuple<AudioEncoding, int>> outputTrackList = this.GetOutputTracks(job, title);
-			totalBytes += HandBrakeUtils.GetAudioSize(job, lengthSeconds, title, outputTrackList);
-
-			return (double)totalBytes / 1024 / 1024;
-		}
-
-		/// <summary>
-		/// Starts an encode with the given job.
-		/// </summary>
-		/// <param name="jobToStart">The job to start.</param>
-		public void StartEncode(EncodeJob jobToStart)
-		{
-			this.StartEncode(jobToStart, false, 0, 0, 0);
-		}
-
-		/// <summary>
-		/// Starts an encode with the given job.
-		/// </summary>
-		/// <param name="job">The job to start.</param>
-		/// <param name="preview">True if this is a preview encode.</param>
-		/// <param name="previewNumber">The preview number to start the encode at (0-based).</param>
-		/// <param name="previewSeconds">The number of seconds in the preview.</param>
-		/// <param name="overallSelectedLengthSeconds">The currently selected encode length. Used in preview
-		/// for calculating bitrate when the target size would be wrong.</param>
-		public void StartEncode(EncodeJob job, bool preview, int previewNumber, int previewSeconds, double overallSelectedLengthSeconds)
-		{
-			EncodingProfile profile = job.EncodingProfile;
-			this.currentJob = job;
-
-			IntPtr nativeJobPtr = HBFunctions.hb_job_init_by_index(this.hbHandle, this.GetTitleIndex(job.Title));
-			var nativeJob = InteropUtilities.ReadStructure<hb_job_s>(nativeJobPtr);
-
-			this.encodeAllocatedMemory = this.ApplyJob(ref nativeJob, job, preview, previewNumber, previewSeconds, overallSelectedLengthSeconds);
-
-			this.subtitleScan = false;
-			if (job.Subtitles.SourceSubtitles != null)
-			{
-				foreach (SourceSubtitle subtitle in job.Subtitles.SourceSubtitles)
-				{
-					if (subtitle.TrackNumber == 0)
-					{
-						this.subtitleScan = true;
-						break;
-					}
-				}
-			}
-
-			string x264Options = profile.X264Options ?? string.Empty;
-			IntPtr originalX264Options = Marshal.StringToHGlobalAnsi(x264Options);
-			this.encodeAllocatedMemory.Add(originalX264Options);
-
-			if (!string.IsNullOrEmpty(profile.X264Profile))
-			{
-				nativeJob.h264_profile = Marshal.StringToHGlobalAnsi(profile.X264Profile);
-				this.encodeAllocatedMemory.Add(nativeJob.h264_profile);
-			}
-
-			if (!string.IsNullOrEmpty(profile.X264Preset))
-			{
-				nativeJob.x264_preset = Marshal.StringToHGlobalAnsi(profile.X264Preset);
-				this.encodeAllocatedMemory.Add(nativeJob.x264_preset);
-			}
-
-			if (profile.X264Tunes != null && profile.X264Tunes.Count > 0)
-			{
-				nativeJob.x264_tune = Marshal.StringToHGlobalAnsi(string.Join(",", profile.X264Tunes));
-				this.encodeAllocatedMemory.Add(nativeJob.x264_tune);
-			}
-
-			if (!string.IsNullOrEmpty(job.EncodingProfile.H264Level))
-			{
-				nativeJob.h264_level = Marshal.StringToHGlobalAnsi(job.EncodingProfile.H264Level);
-				this.encodeAllocatedMemory.Add(nativeJob.h264_level);
-			}
-
-			if (this.subtitleScan)
-			{
-				// If we need to scan subtitles, enqueue a pre-processing job to do that.
-				nativeJob.pass = -1;
-				nativeJob.indepth_scan = 1;
-
-				nativeJob.advanced_opts = IntPtr.Zero;
-
-				HBFunctions.hb_add(this.hbHandle, ref nativeJob);
-			}
-
-			nativeJob.indepth_scan = 0;
-
-			if (job.EncodingProfile.TwoPass)
-			{
-				// First pass. Apply turbo options if needed.
-				nativeJob.pass = 1;
-				string firstPassAdvancedOptions = x264Options;
-				if (job.EncodingProfile.TurboFirstPass)
-				{
-					if (firstPassAdvancedOptions == string.Empty)
-					{
-						firstPassAdvancedOptions = TurboX264Opts;
-					}
-					else
-					{
-						firstPassAdvancedOptions += ":" + TurboX264Opts;
-					}
-				}
-
-				nativeJob.advanced_opts = Marshal.StringToHGlobalAnsi(firstPassAdvancedOptions);
-				this.encodeAllocatedMemory.Add(nativeJob.advanced_opts);
-
-				HBFunctions.hb_add(this.hbHandle, ref nativeJob);
-
-				// Second pass. Apply normal options.
-				nativeJob.pass = 2;
-				nativeJob.advanced_opts = originalX264Options;
-
-				HBFunctions.hb_add(this.hbHandle, ref nativeJob);
-			}
-			else
-			{
-				// One pass job.
-				nativeJob.pass = 0;
-				nativeJob.advanced_opts = originalX264Options;
-
-				HBFunctions.hb_add(this.hbHandle, ref nativeJob);
-			}
-
-			HBFunctions.hb_start(this.hbHandle);
-
-			// Should be safe to clean up the job we started with; a copy is in the queue now.
-			InteropUtilities.CloseJob(nativeJobPtr);
-
-			this.encodePollTimer = new System.Timers.Timer();
-			this.encodePollTimer.Interval = EncodePollIntervalMs;
-
-			this.encodePollTimer.Elapsed += (o, e) =>
-			{
-				this.PollEncodeProgress();
-			};
-			this.encodePollTimer.Start();
-		}
-
-		/// <summary>
-		/// Pauses the current encode.
-		/// </summary>
-		public void PauseEncode()
-		{
-			HBFunctions.hb_pause(this.hbHandle);
-		}
-
-		/// <summary>
-		/// Resumes a paused encode.
-		/// </summary>
-		public void ResumeEncode()
-		{
-			HBFunctions.hb_resume(this.hbHandle);
-		}
-
-		/// <summary>
-		/// Stops the current encode.
-		/// </summary>
-		public void StopEncode()
-		{
-			HBFunctions.hb_stop(this.hbHandle);
-
-			// Also remove all jobs from the queue (in case we stopped a 2-pass encode)
-			var currentJobs = new List<IntPtr>();
-
-			int jobs = HBFunctions.hb_count(this.hbHandle);
-			for (int i = 0; i < jobs; i++)
-			{
-				currentJobs.Add(HBFunctions.hb_job(this.hbHandle, 0));
-			}
-
-			foreach (IntPtr job in currentJobs)
-			{
-				HBFunctions.hb_rem(this.hbHandle, job);
-			}
-		}
-
-		/// <summary>
-		/// Gets the final size for a given encode job.
-		/// </summary>
-		/// <param name="job">The encode job to use.</param>
-		/// <param name="width">The storage width.</param>
-		/// <param name="height">The storage height.</param>
-		/// <param name="parWidth">The pixel aspect X number.</param>
-		/// <param name="parHeight">The pixel aspect Y number.</param>
-		public void GetSize(EncodeJob job, out int width, out int height, out int parWidth, out int parHeight)
-		{
-			Title title = this.GetTitle(job.Title);
-
-			if (job.EncodingProfile.Anamorphic == Anamorphic.None)
-			{
-				Size storageDimensions = CalculateNonAnamorphicOutput(job.EncodingProfile, title);
-
-				width = storageDimensions.Width;
-				height = storageDimensions.Height;
-
-				parWidth = 1;
-				parHeight = 1;
-
-				return;
-			}
-
-			IntPtr nativeJobPtr = HBFunctions.hb_job_init_by_index(this.hbHandle, this.GetTitleIndex(title));
-			var nativeJob = InteropUtilities.ReadStructure<hb_job_s>(nativeJobPtr);
-
-			List<IntPtr> allocatedMemory = this.ApplyJob(ref nativeJob, job);
-			InteropUtilities.FreeMemory(allocatedMemory);
-
-			InteropUtilities.CloseJob(nativeJobPtr);
-
-			// During the ApplyJob call, it modified nativeJob to have the correct width, height and PAR.
-			// We use those for the size.
-			width = nativeJob.width;
-			height = nativeJob.height;
-			parWidth = nativeJob.anamorphic.par_width;
-			parHeight = nativeJob.anamorphic.par_height;
-		}
-
-
-
-		/// <summary>
-		/// Frees any resources associated with this object.
-		/// </summary>
-		public void Dispose()
-		{
-			if (this.disposed)
-			{
-				return;
-			}
-
-			this.Dispose(true);
-			GC.SuppressFinalize(this);
-		}
-
-		/// <summary>
-		/// Frees any resources associated with this object.
-		/// </summary>
-		/// <param name="disposing">True if managed objects as well as unmanaged should be disposed.</param>
-		protected virtual void Dispose(bool disposing)
-		{
-			if (disposing)
-			{
-				// Free other state (managed objects).
-			}
-
-			// Free unmanaged objects.
-			IntPtr handlePtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)));
-			Marshal.WriteIntPtr(handlePtr, this.hbHandle);
-			HBFunctions.hb_close(handlePtr);
-			Marshal.FreeHGlobal(handlePtr);
-
-			this.disposed = true;
-		}
-
-		/// <summary>
-		/// Calculates the output size for a non-anamorphic job.
-		/// </summary>
-		/// <param name="profile">The encoding profile for the job.</param>
-		/// <param name="title">The title being encoded.</param>
-		/// <returns>The dimensions of the final encode.</returns>
-		private static Size CalculateNonAnamorphicOutput(EncodingProfile profile, Title title)
-		{
-			int sourceWidth = title.Resolution.Width;
-			int sourceHeight = title.Resolution.Height;
-
-			int width = profile.Width;
-			int height = profile.Height;
-
-			Cropping crop;
-			switch (profile.CroppingType)
-			{
-				case CroppingType.Automatic:
-					crop = title.AutoCropDimensions;
-					break;
-				case CroppingType.Custom:
-					crop = profile.Cropping;
-					break;
-				default:
-					crop = new Cropping();
-					break;
-			}
-
-			sourceWidth -= crop.Left;
-			sourceWidth -= crop.Right;
-
-			sourceHeight -= crop.Top;
-			sourceHeight -= crop.Bottom;
-
-			double croppedAspectRatio = ((double)sourceWidth * title.ParVal.Width) / (sourceHeight * title.ParVal.Height);
-
-			if (width == 0)
-			{
-				width = sourceWidth;
-			}
-
-			if (profile.MaxWidth > 0 && width > profile.MaxWidth)
-			{
-				width = profile.MaxWidth;
-			}
-
-			if (height == 0)
-			{
-				height = sourceHeight;
-			}
-
-			if (profile.MaxHeight > 0 && height > profile.MaxHeight)
-			{
-				height = profile.MaxHeight;
-			}
-
-			if (profile.KeepDisplayAspect)
-			{
-				if ((profile.Width == 0 && profile.Height == 0) || profile.Width == 0)
-				{
-					width = (int)((double)height * croppedAspectRatio);
-					if (profile.MaxWidth > 0 && width > profile.MaxWidth)
-					{
-						width = profile.MaxWidth;
-						height = (int)((double)width / croppedAspectRatio);
-						height = GetNearestValue(height, PictureAutoSizeModulus);
-					}
-
-					width = GetNearestValue(width, PictureAutoSizeModulus);
-				}
-				else if (profile.Height == 0)
-				{
-					height = (int)((double)width / croppedAspectRatio);
-					if (profile.MaxHeight > 0 && height > profile.MaxHeight)
-					{
-						height = profile.MaxHeight;
-						width = (int)((double)height * croppedAspectRatio);
-						width = GetNearestValue(width, PictureAutoSizeModulus);
-					}
-
-					height = GetNearestValue(height, PictureAutoSizeModulus);
-				}
-			}
-
-			return new Size(width, height);
-		}
-
-		/// <summary>
-		/// Gets the closest value to the given number divisible by the given modulus.
-		/// </summary>
-		/// <param name="number">The number to approximate.</param>
-		/// <param name="modulus">The modulus.</param>
-		/// <returns>The closest value to the given number divisible by the given modulus.</returns>
-		private static int GetNearestValue(int number, int modulus)
-		{
-			return modulus * ((number + modulus / 2) / modulus);
-		}
-
-		/// <summary>
-		/// Starts a scan of the given path.
-		/// </summary>
-		/// <param name="path">The path of the video to scan.</param>
-		/// <param name="previewCount">The number of previews to make on each title.</param>
-		/// <param name="minDuration">The minimum duration of a title to show up on the scan.</param>
-		/// <param name="titleIndex">The title index to scan (1-based, 0 for all titles).</param>
-		private void StartScan(string path, int previewCount, TimeSpan minDuration, int titleIndex)
-		{
-			this.previewCount = previewCount;
-			HBFunctions.hb_scan(this.hbHandle, path, titleIndex, previewCount, 1, (ulong)(minDuration.TotalSeconds * 90000));
-			this.scanPollTimer = new System.Timers.Timer();
-			this.scanPollTimer.Interval = ScanPollIntervalMs;
-
-			// Lambda notation used to make sure we can view any JIT exceptions the method throws
-			this.scanPollTimer.Elapsed += (o, e) =>
-			{
-				this.PollScanProgress();
-			};
-			this.scanPollTimer.Start();
-		}
-
-		/// <summary>
-		/// Checks the status of the ongoing scan.
-		/// </summary>
-		private void PollScanProgress()
-		{
-			var state = new hb_state_s();
-			HBFunctions.hb_get_state(this.hbHandle, ref state);
-
-			if (state.state == NativeConstants.HB_STATE_SCANNING)
-			{
-				if (this.ScanProgress != null)
-				{
-					hb_state_scanning_anon scanningState = state.param.scanning;
-
-					this.ScanProgress(this, new ScanProgressEventArgs
-						{
-							Progress = scanningState.progress,
-							CurrentPreview = scanningState.preview_cur,
-							Previews = scanningState.preview_count,
-							CurrentTitle = scanningState.title_cur,
-							Titles = scanningState.title_count
-						});
-				}
-			}
-			else if (state.state == NativeConstants.HB_STATE_SCANDONE)
-			{
-				this.titles = new List<Title>();
-
-				IntPtr titleSetPtr = HBFunctions.hb_get_title_set(this.hbHandle);
-				hb_title_set_s titleSet = InteropUtilities.ReadStructure<hb_title_set_s>(titleSetPtr);
-				this.originalTitles = titleSet.list_title.ToList<hb_title_s>();
-
-				foreach (hb_title_s title in this.originalTitles)
-				{
-					var newTitle = this.ConvertTitle(title);
-					this.titles.Add(newTitle);
-				}
-
-				if (this.originalTitles.Count > 0)
-				{
-					this.featureTitle = titleSet.feature;
-				}
-				else
-				{
-					this.featureTitle = 0;
-				}
-
-				this.scanPollTimer.Stop();
-
-				if (this.ScanCompleted != null)
-				{
-					this.ScanCompleted(this, new System.EventArgs());
-				}
-			}
-		}
-
-		/// <summary>
-		/// Checks the status of the ongoing encode.
-		/// </summary>
-		private void PollEncodeProgress()
-		{
-			hb_state_s state = new hb_state_s();
-			HBFunctions.hb_get_state(this.hbHandle, ref state);
-
-			if (state.state == NativeConstants.HB_STATE_WORKING)
-			{
-				if (this.EncodeProgress != null)
-				{
-					int pass = 1;
-					int rawJobNumber = state.param.working.job_cur;
-
-					if (this.currentJob.EncodingProfile.TwoPass)
-					{
-						if (this.subtitleScan)
-						{
-							switch (rawJobNumber)
-							{
-								case 1:
-									pass = -1;
-									break;
-								case 2:
-									pass = 1;
-									break;
-								case 3:
-									pass = 2;
-									break;
-								default:
-									break;
-							}
-						}
-						else
-						{
-							switch (rawJobNumber)
-							{
-								case 1:
-									pass = 1;
-									break;
-								case 2:
-									pass = 2;
-									break;
-								default:
-									break;
-							}
-						}
-					}
-					else
-					{
-						if (this.subtitleScan)
-						{
-							switch (rawJobNumber)
-							{
-								case 1:
-									pass = -1;
-									break;
-								case 2:
-									pass = 1;
-									break;
-								default:
-									break;
-							}
-						}
-						else
-						{
-							pass = 1;
-						}
-					}
-
-					var progressEventArgs = new EncodeProgressEventArgs
-					{
-						FractionComplete = state.param.working.progress,
-						CurrentFrameRate = state.param.working.rate_cur,
-						AverageFrameRate = state.param.working.rate_avg,
-						EstimatedTimeLeft = new TimeSpan(state.param.working.hours, state.param.working.minutes, state.param.working.seconds),
-						Pass = pass
-					};
-
-					this.EncodeProgress(this, progressEventArgs);
-				}
-			}
-			else if (state.state == NativeConstants.HB_STATE_WORKDONE)
-			{
-				InteropUtilities.FreeMemory(this.encodeAllocatedMemory);
-				this.encodePollTimer.Stop();
+ using System;
+ using System.Collections.Generic;
+ using System.Diagnostics;
+ using System.Globalization;
+ using System.IO;
+ using System.Linq;
+ using System.Runtime.InteropServices;
+ using System.Text;
+ using System.Windows.Media;
+ using System.Windows.Media.Imaging;
+
+ using HandBrake.Interop.EventArgs;
+ using HandBrake.Interop.HbLib;
+ using HandBrake.Interop.Helpers;
+ using HandBrake.Interop.Interfaces;
+ using HandBrake.Interop.Model;
+ using HandBrake.Interop.Model.Encoding;
+ using HandBrake.Interop.SourceData;
+
+ /// <summary>
+ /// A wrapper for a HandBrake instance.
+ /// </summary>
+ public class HandBrakeInstance : IHandBrakeInstance, IDisposable
+ {
+ /// <summary>
+ /// The modulus for picture size when auto-sizing dimensions.
+ /// </summary>
+ private const int PictureAutoSizeModulus = 2;
+
+ /// <summary>
+ /// The number of MS between status polls when scanning.
+ /// </summary>
+ private const double ScanPollIntervalMs = 200;
+
+ /// <summary>
+ /// The number of MS between status polls when encoding.
+ /// </summary>
+ private const double EncodePollIntervalMs = 200;
+
+ /// <summary>
+ /// X264 options to add for a turbo first pass.
+ /// </summary>
+ private const string TurboX264Opts = "ref=1:subme=2:me=dia:analyse=none:trellis=0:no-fast-pskip=0:8x8dct=0:weightb=0";
+
+ /// <summary>
+ /// The native handle to the HandBrake instance.
+ /// </summary>
+ private IntPtr hbHandle;
+
+ /// <summary>
+ /// The number of previews created during scan.
+ /// </summary>
+ private int previewCount;
+
+ /// <summary>
+ /// The timer to poll for scan status.
+ /// </summary>
+ private System.Timers.Timer scanPollTimer;
+
+ /// <summary>
+ /// The timer to poll for encode status.
+ /// </summary>
+ private System.Timers.Timer encodePollTimer;
+
+ /// <summary>
+ /// The list of original titles in native structure form.
+ /// </summary>
+ private List<hb_title_s> originalTitles;
+
+ /// <summary>
+ /// The list of titles on this instance.
+ /// </summary>
+ private List<Title> titles;
+
+ /// <summary>
+ /// The current encode job for this instance.
+ /// </summary>
+ private EncodeJob currentJob;
+
+ /// <summary>
+ /// True if the current job is scanning for subtitles.
+ /// </summary>
+ private bool subtitleScan;
+
+ /// <summary>
+ /// The index of the default title.
+ /// </summary>
+ private int featureTitle;
+
+ /// <summary>
+ /// A list of native memory locations allocated by this instance.
+ /// </summary>
+ private List<IntPtr> encodeAllocatedMemory;
+
+ /// <summary>
+ /// A value indicating whether this object has been disposed or not.
+ /// </summary>
+ private bool disposed;
+
+ /// <summary>
+ /// Finalizes an instance of the HandBrakeInstance class.
+ /// </summary>
+ ~HandBrakeInstance()
+ {
+ this.Dispose(false);
+ }
+
+ /// <summary>
+ /// Fires for progress updates when scanning.
+ /// </summary>
+ public event EventHandler<ScanProgressEventArgs> ScanProgress;
+
+ /// <summary>
+ /// Fires when a scan has completed.
+ /// </summary>
+ public event EventHandler<System.EventArgs> ScanCompleted;
+
+ /// <summary>
+ /// Fires for progress updates when encoding.
+ /// </summary>
+ public event EventHandler<EncodeProgressEventArgs> EncodeProgress;
+
+ /// <summary>
+ /// Fires when an encode has completed.
+ /// </summary>
+ public event EventHandler<EncodeCompletedEventArgs> EncodeCompleted;
+
+ /// <summary>
+ /// Gets the list of titles on this instance.
+ /// </summary>
+ public List<Title> Titles
+ {
+ get
+ {
+ return this.titles;
+ }
+ }
+
+ /// <summary>
+ /// Gets the number of previews created during scan.
+ /// </summary>
+ public int PreviewCount
+ {
+ get
+ {
+ return this.previewCount;
+ }
+ }
+
+ /// <summary>
+ /// Gets the index of the default title.
+ /// </summary>
+ public int FeatureTitle
+ {
+ get
+ {
+ return this.featureTitle;
+ }
+ }
+
+ /// <summary>
+ /// Gets the HandBrake version string.
+ /// </summary>
+ public string Version
+ {
+ get
+ {
+ var versionPtr = HBFunctions.hb_get_version(this.hbHandle);
+ return Marshal.PtrToStringAnsi(versionPtr);
+ }
+ }
+
+ /// <summary>
+ /// Gets the HandBrake build number.
+ /// </summary>
+ public int Build
+ {
+ get
+ {
+ return HBFunctions.hb_get_build(this.hbHandle);
+ }
+ }
+
+ /// <summary>
+ /// Initializes this instance.
+ /// </summary>
+ /// <param name="verbosity">The code for the logging verbosity to use.</param>
+ public void Initialize(int verbosity)
+ {
+ HandBrakeUtils.EnsureGlobalInit();
+
+ HandBrakeUtils.RegisterLogger();
+ this.hbHandle = HBFunctions.hb_init(verbosity, update_check: 0);
+ }
+
+ /// <summary>
+ /// Starts scanning the given path.
+ /// </summary>
+ /// <param name="path">The path to the video to scan.</param>
+ /// <param name="previewCount">The number of preview images to make.</param>
+ /// <param name="minDuration">The minimum duration of a title to show up on the scan.</param>
+ public void StartScan(string path, int previewCount, TimeSpan minDuration)
+ {
+ this.StartScan(path, previewCount, minDuration, 0);
+ }
+
+ /// <summary>
+ /// Starts a scan for the given input path.
+ /// </summary>
+ /// <param name="path">The path of the video to scan.</param>
+ /// <param name="previewCount">The number of preview images to generate for each title while scanning.</param>
+ public void StartScan(string path, int previewCount)
+ {
+ this.StartScan(path, previewCount, TimeSpan.FromSeconds(10), 0);
+ }
+
+ /// <summary>
+ /// Starts a scan of the given path.
+ /// </summary>
+ /// <param name="path">The path of the video to scan.</param>
+ /// <param name="previewCount">The number of preview images to generate for each title while scanning.</param>
+ /// <param name="titleIndex">The title index to scan (1-based, 0 for all titles).</param>
+ public void StartScan(string path, int previewCount, int titleIndex)
+ {
+ this.StartScan(path, previewCount, TimeSpan.Zero, titleIndex);
+ }
+
+ /// <summary>
+ /// Starts a scan of the given path.
+ /// </summary>
+ /// <param name="path">The path of the video to scan.</param>
+ /// <param name="previewCount">The number of previews to make on each title.</param>
+ /// <param name="minDuration">The minimum duration of a title to show up on the scan.</param>
+ /// <param name="titleIndex">The title index to scan (1-based, 0 for all titles).</param>
+ public void StartScan(string path, int previewCount, TimeSpan minDuration, int titleIndex)
+ {
+ this.previewCount = previewCount;
+
+ IntPtr pathPtr = InteropUtilities.ToUtf8PtrFromString(path);
+ HBFunctions.hb_scan(this.hbHandle, pathPtr, titleIndex, previewCount, 1, (ulong)(minDuration.TotalSeconds * 90000));
+ Marshal.FreeHGlobal(pathPtr);
+
+ this.scanPollTimer = new System.Timers.Timer();
+ this.scanPollTimer.Interval = ScanPollIntervalMs;
+
+ // Lambda notation used to make sure we can view any JIT exceptions the method throws
+ this.scanPollTimer.Elapsed += (o, e) =>
+ {
+ this.PollScanProgress();
+ };
+ this.scanPollTimer.Start();
+ }
+
+ /// <summary>
+ /// Stops an ongoing scan.
+ /// </summary>
+ public void StopScan()
+ {
+ HBFunctions.hb_scan_stop(this.hbHandle);
+ }
+
+ /// <summary>
+ /// Gets an image for the given job and preview
+ /// </summary>
+ /// <remarks>
+ /// Only incorporates sizing and aspect ratio into preview image.
+ /// </remarks>
+ /// <param name="job">The encode job to preview.</param>
+ /// <param name="previewNumber">The index of the preview to get (0-based).</param>
+ /// <returns>An image with the requested preview.</returns>
+ public BitmapImage GetPreview(EncodeJob job, int previewNumber)
+ {
+ IntPtr nativeJobPtr = HBFunctions.hb_job_init_by_index(this.hbHandle, this.GetTitleIndex(job.Title));
+ var nativeJob = InteropUtilities.ToStructureFromPtr<hb_job_s>(nativeJobPtr);
+
+ List<IntPtr> allocatedMemory = this.ApplyJob(ref nativeJob, job);
+
+ // There are some problems with getting previews with deinterlacing. Disabling for now.
+ nativeJob.deinterlace = 0;
+
+ int outputWidth = nativeJob.width;
+ int outputHeight = nativeJob.height;
+ int imageBufferSize = outputWidth * outputHeight * 4;
+ IntPtr nativeBuffer = Marshal.AllocHGlobal(imageBufferSize);
+ allocatedMemory.Add(nativeBuffer);
+ HBFunctions.hb_get_preview(this.hbHandle, ref nativeJob, previewNumber, nativeBuffer);
+
+ // We've used the job to get the preview. Clean up the job.
+ InteropUtilities.CloseJob(nativeJobPtr);
+
+ // Copy the filled image buffer to a managed array.
+ byte[] managedBuffer = new byte[imageBufferSize];
+ Marshal.Copy(nativeBuffer, managedBuffer, 0, imageBufferSize);
+
+ // We've copied the data out of unmanaged memory. Clean up that memory now.
+ InteropUtilities.FreeMemory(allocatedMemory);
+
+ var bitmap = new System.Drawing.Bitmap(outputWidth, outputHeight);
+ System.Drawing.Imaging.BitmapData bitmapData = bitmap.LockBits(new System.Drawing.Rectangle(0, 0, outputWidth, outputHeight), System.Drawing.Imaging.ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format32bppRgb);
+
+ IntPtr ptr = bitmapData.Scan0;
+
+ for (int i = 0; i < nativeJob.height; i++)
+ {
+ Marshal.Copy(managedBuffer, i * nativeJob.width * 4, ptr, nativeJob.width * 4);
+ ptr = IntPtr.Add(ptr, bitmapData.Stride);
+ }
+
+ bitmap.UnlockBits(bitmapData);
+
+ using (var memoryStream = new MemoryStream())
+ {
+ try
+ {
+ bitmap.Save(memoryStream, System.Drawing.Imaging.ImageFormat.Bmp);
+ }
+ finally
+ {
+ bitmap.Dispose();
+ }
+
+ var wpfBitmap = new BitmapImage();
+ wpfBitmap.BeginInit();
+ wpfBitmap.CacheOption = BitmapCacheOption.OnLoad;
+ wpfBitmap.StreamSource = memoryStream;
+ wpfBitmap.EndInit();
+ wpfBitmap.Freeze();
+
+ return wpfBitmap;
+ }
+ }
+
+ /// <summary>
+ /// Calculates the video bitrate for the given job and target size.
+ /// </summary>
+ /// <param name="job">The encode job.</param>
+ /// <param name="sizeMB">The target size in MB.</param>
+ /// <param name="overallSelectedLengthSeconds">The currently selected encode length. Used in preview
+ /// for calculating bitrate when the target size would be wrong.</param>
+ /// <returns>The video bitrate in kbps.</returns>
+ public int CalculateBitrate(EncodeJob job, int sizeMB, double overallSelectedLengthSeconds = 0)
+ {
+ long availableBytes = ((long)sizeMB) * 1024 * 1024;
+
+ EncodingProfile profile = job.EncodingProfile;
+ Title title = this.GetTitle(job.Title);
+
+ double lengthSeconds = overallSelectedLengthSeconds > 0 ? overallSelectedLengthSeconds : HandBrakeUtils.GetJobLengthSeconds(job, title);
+ lengthSeconds += 1.5;
+
+ double outputFramerate;
+ if (profile.Framerate == 0)
+ {
+ outputFramerate = title.Framerate;
+ }
+ else
+ {
+ // Not sure what to do for VFR here hb_calc_bitrate never handled it...
+ // just use the peak for now.
+ outputFramerate = profile.Framerate;
+ }
+
+ long frames = (long)(lengthSeconds * outputFramerate);
+
+ availableBytes -= frames * HandBrakeUtils.ContainerOverheadPerFrame;
+
+ List<Tuple<AudioEncoding, int>> outputTrackList = this.GetOutputTracks(job, title);
+ availableBytes -= HandBrakeUtils.GetAudioSize(job, lengthSeconds, title, outputTrackList);
+
+ if (availableBytes < 0)
+ {
+ return 0;
+ }
+
+ // Video bitrate is in kilobits per second, or where 1 kbps is 1000 bits per second.
+ // So 1 kbps is 125 bytes per second.
+ return (int)(availableBytes / (125 * lengthSeconds));
+ }
+
+ /// <summary>
+ /// Gives estimated file size (in MB) of the given job and video bitrate.
+ /// </summary>
+ /// <param name="job">The encode job.</param>
+ /// <param name="videoBitrate">The video bitrate to be used (kbps).</param>
+ /// <returns>The estimated file size (in MB) of the given job and video bitrate.</returns>
+ public double CalculateFileSize(EncodeJob job, int videoBitrate)
+ {
+ long totalBytes = 0;
+
+ EncodingProfile profile = job.EncodingProfile;
+ Title title = this.GetTitle(job.Title);
+
+ double lengthSeconds = HandBrakeUtils.GetJobLengthSeconds(job, title);
+ lengthSeconds += 1.5;
+
+ double outputFramerate;
+ if (profile.Framerate == 0)
+ {
+ outputFramerate = title.Framerate;
+ }
+ else
+ {
+ // Not sure what to do for VFR here hb_calc_bitrate never handled it...
+ // just use the peak for now.
+ outputFramerate = profile.Framerate;
+ }
+
+ long frames = (long)(lengthSeconds * outputFramerate);
+
+ totalBytes += (long)(lengthSeconds * videoBitrate * 125);
+ totalBytes += frames * HandBrakeUtils.ContainerOverheadPerFrame;
+
+ List<Tuple<AudioEncoding, int>> outputTrackList = this.GetOutputTracks(job, title);
+ totalBytes += HandBrakeUtils.GetAudioSize(job, lengthSeconds, title, outputTrackList);
+
+ return (double)totalBytes / 1024 / 1024;
+ }
+
+ /// <summary>
+ /// Starts an encode with the given job.
+ /// </summary>
+ /// <param name="jobToStart">
+ /// The job to start.
+ /// </param>
+ /// <param name="scanPreviewCount">
+ /// The scan Preview Count.
+ /// </param>
+ public void StartEncode(EncodeJob jobToStart, int scanPreviewCount)
+ {
+ this.StartEncode(jobToStart, false, 0, 0, 0, scanPreviewCount);
+ }
+
+ /// <summary>
+ /// Starts an encode with the given job.
+ /// </summary>
+ /// <param name="job">
+ /// The job to start.
+ /// </param>
+ /// <param name="preview">
+ /// True if this is a preview encode.
+ /// </param>
+ /// <param name="previewNumber">
+ /// The preview number to start the encode at (0-based).
+ /// </param>
+ /// <param name="previewSeconds">
+ /// The number of seconds in the preview.
+ /// </param>
+ /// <param name="overallSelectedLengthSeconds">
+ /// The currently selected encode length. Used in preview
+ /// for calculating bitrate when the target size would be wrong.
+ /// </param>
+ /// <param name="scanPreviewCount">
+ /// The scan Preview Count.
+ /// </param>
+ public void StartEncode(EncodeJob job, bool preview, int previewNumber, int previewSeconds, double overallSelectedLengthSeconds, int scanPreviewCount)
+ {
+ EncodingProfile profile = job.EncodingProfile;
+ if (job.ChosenAudioTracks == null)
+ {
+ throw new ArgumentException("job.ChosenAudioTracks cannot be null.");
+ }
+
+ this.previewCount = scanPreviewCount;
+ this.currentJob = job;
+
+ IntPtr nativeJobPtr = HBFunctions.hb_job_init_by_index(this.hbHandle, this.GetTitleIndex(job.Title));
+ var nativeJob = InteropUtilities.ToStructureFromPtr<hb_job_s>(nativeJobPtr);
+
+ this.encodeAllocatedMemory = this.ApplyJob(ref nativeJob, job, preview, previewNumber, previewSeconds, overallSelectedLengthSeconds);
+
+ this.subtitleScan = false;
+ if (job.Subtitles != null && job.Subtitles.SourceSubtitles != null)
+ {
+ foreach (SourceSubtitle subtitle in job.Subtitles.SourceSubtitles)
+ {
+ if (subtitle.TrackNumber == 0)
+ {
+ this.subtitleScan = true;
+ break;
+ }
+ }
+ }
+
+ string videoOptions = profile.VideoOptions ?? string.Empty;
+ IntPtr originalVideoOptions = Marshal.StringToHGlobalAnsi(videoOptions);
+ this.encodeAllocatedMemory.Add(originalVideoOptions);
+
+ if (!string.IsNullOrEmpty(profile.VideoProfile))
+ {
+ nativeJob.encoder_profile = Marshal.StringToHGlobalAnsi(profile.VideoProfile);
+ this.encodeAllocatedMemory.Add(nativeJob.encoder_profile);
+ }
+
+ if (!string.IsNullOrEmpty(profile.VideoPreset))
+ {
+ nativeJob.encoder_preset = Marshal.StringToHGlobalAnsi(profile.VideoPreset);
+ this.encodeAllocatedMemory.Add(nativeJob.encoder_preset);
+ }
+
+ if (profile.VideoTunes != null && profile.VideoTunes.Count > 0)
+ {
+ nativeJob.encoder_tune = Marshal.StringToHGlobalAnsi(string.Join(",", profile.VideoTunes));
+ this.encodeAllocatedMemory.Add(nativeJob.encoder_tune);
+ }
+
+ if (!string.IsNullOrEmpty(job.EncodingProfile.VideoLevel))
+ {
+ nativeJob.encoder_level = Marshal.StringToHGlobalAnsi(job.EncodingProfile.VideoLevel);
+ this.encodeAllocatedMemory.Add(nativeJob.encoder_level);
+ }
+
+ if (this.subtitleScan)
+ {
+ // If we need to scan subtitles, enqueue a pre-processing job to do that.
+ nativeJob.pass = -1;
+ nativeJob.indepth_scan = 1;
+
+ nativeJob.encoder_options = IntPtr.Zero;
+
+ HBFunctions.hb_add(this.hbHandle, ref nativeJob);
+ }
+
+ nativeJob.indepth_scan = 0;
+
+ if (job.EncodingProfile.VideoEncodeRateType != VideoEncodeRateType.ConstantQuality && job.EncodingProfile.TwoPass)
+ {
+ // First pass. Apply turbo options if needed.
+ nativeJob.pass = 1;
+ string firstPassAdvancedOptions = videoOptions;
+ if (job.EncodingProfile.TurboFirstPass)
+ {
+ if (firstPassAdvancedOptions == string.Empty)
+ {
+ firstPassAdvancedOptions = TurboX264Opts;
+ }
+ else
+ {
+ firstPassAdvancedOptions += ":" + TurboX264Opts;
+ }
+ }
+
+ nativeJob.encoder_options = Marshal.StringToHGlobalAnsi(firstPassAdvancedOptions);
+ this.encodeAllocatedMemory.Add(nativeJob.encoder_options);
+
+ HBFunctions.hb_add(this.hbHandle, ref nativeJob);
+
+ // Second pass. Apply normal options.
+ nativeJob.pass = 2;
+ nativeJob.encoder_options = originalVideoOptions;
+
+ HBFunctions.hb_add(this.hbHandle, ref nativeJob);
+ }
+ else
+ {
+ // One pass job.
+ nativeJob.pass = 0;
+ nativeJob.encoder_options = originalVideoOptions;
+
+ HBFunctions.hb_add(this.hbHandle, ref nativeJob);
+ }
+
+ HBFunctions.hb_start(this.hbHandle);
+
+ // Should be safe to clean up the job we started with; a copy is in the queue now.
+ InteropUtilities.CloseJob(nativeJobPtr);
+
+ this.encodePollTimer = new System.Timers.Timer();
+ this.encodePollTimer.Interval = EncodePollIntervalMs;
+
+ this.encodePollTimer.Elapsed += (o, e) =>
+ {
+ this.PollEncodeProgress();
+ };
+ this.encodePollTimer.Start();
+ }
+
+ /// <summary>
+ /// Pauses the current encode.
+ /// </summary>
+ public void PauseEncode()
+ {
+ HBFunctions.hb_pause(this.hbHandle);
+ }
+
+ /// <summary>
+ /// Resumes a paused encode.
+ /// </summary>
+ public void ResumeEncode()
+ {
+ HBFunctions.hb_resume(this.hbHandle);
+ }
+
+ /// <summary>
+ /// Stops the current encode.
+ /// </summary>
+ public void StopEncode()
+ {
+ HBFunctions.hb_stop(this.hbHandle);
+
+ // Also remove all jobs from the queue (in case we stopped a 2-pass encode)
+ var currentJobs = new List<IntPtr>();
+
+ int jobs = HBFunctions.hb_count(this.hbHandle);
+ for (int i = 0; i < jobs; i++)
+ {
+ currentJobs.Add(HBFunctions.hb_job(this.hbHandle, 0));
+ }
+
+ foreach (IntPtr job in currentJobs)
+ {
+ HBFunctions.hb_rem(this.hbHandle, job);
+ }
+ }
+
+ /// <summary>
+ /// Gets the final size for a given encode job.
+ /// </summary>
+ /// <param name="job">The encode job to use.</param>
+ /// <param name="width">The storage width.</param>
+ /// <param name="height">The storage height.</param>
+ /// <param name="parWidth">The pixel aspect X number.</param>
+ /// <param name="parHeight">The pixel aspect Y number.</param>
+ public void GetSize(EncodeJob job, out int width, out int height, out int parWidth, out int parHeight)
+ {
+ Title title = this.GetTitle(job.Title);
+
+ if (job.EncodingProfile.Anamorphic == Anamorphic.None)
+ {
+ Size storageDimensions = CalculateNonAnamorphicOutput(job.EncodingProfile, title);
+
+ width = storageDimensions.Width;
+ height = storageDimensions.Height;
+
+ parWidth = 1;
+ parHeight = 1;
+
+ return;
+ }
+
+ IntPtr nativeJobPtr = HBFunctions.hb_job_init_by_index(this.hbHandle, this.GetTitleIndex(title));
+ var nativeJob = InteropUtilities.ToStructureFromPtr<hb_job_s>(nativeJobPtr);
+
+ List<IntPtr> allocatedMemory = this.ApplyJob(ref nativeJob, job);
+ InteropUtilities.FreeMemory(allocatedMemory);
+
+ InteropUtilities.CloseJob(nativeJobPtr);
+
+ // During the ApplyJob call, it modified nativeJob to have the correct width, height and PAR.
+ // We use those for the size.
+ width = nativeJob.width;
+ height = nativeJob.height;
+ parWidth = nativeJob.anamorphic.par_width;
+ parHeight = nativeJob.anamorphic.par_height;
+ }
+
+
+
+ /// <summary>
+ /// Frees any resources associated with this object.
+ /// </summary>
+ public void Dispose()
+ {
+ if (this.disposed)
+ {
+ return;
+ }
+
+ this.Dispose(true);
+ GC.SuppressFinalize(this);
+ }
+
+ /// <summary>
+ /// Frees any resources associated with this object.
+ /// </summary>
+ /// <param name="disposing">True if managed objects as well as unmanaged should be disposed.</param>
+ protected virtual void Dispose(bool disposing)
+ {
+ if (disposing)
+ {
+ // Free other state (managed objects).
+ }
+
+ // Free unmanaged objects.
+ IntPtr handlePtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)));
+ Marshal.WriteIntPtr(handlePtr, this.hbHandle);
+ HBFunctions.hb_close(handlePtr);
+ Marshal.FreeHGlobal(handlePtr);
+
+ this.disposed = true;
+ }
+
+ /// <summary>
+ /// Calculates the output size for a non-anamorphic job.
+ /// </summary>
+ /// <param name="profile">The encoding profile for the job.</param>
+ /// <param name="title">The title being encoded.</param>
+ /// <returns>The dimensions of the final encode.</returns>
+ private static Size CalculateNonAnamorphicOutput(EncodingProfile profile, Title title)
+ {
+ int sourceWidth = title.Resolution.Width;
+ int sourceHeight = title.Resolution.Height;
+
+ int width = profile.Width;
+ int height = profile.Height;
+
+ Cropping crop;
+ switch (profile.CroppingType)
+ {
+ case CroppingType.Automatic:
+ crop = title.AutoCropDimensions;
+ break;
+ case CroppingType.Custom:
+ crop = profile.Cropping;
+ break;
+ default:
+ crop = new Cropping();
+ break;
+ }
+
+ sourceWidth -= crop.Left;
+ sourceWidth -= crop.Right;
+
+ sourceHeight -= crop.Top;
+ sourceHeight -= crop.Bottom;
+
+ double croppedAspectRatio = ((double)sourceWidth * title.ParVal.Width) / (sourceHeight * title.ParVal.Height);
+
+ if (width == 0)
+ {
+ width = sourceWidth;
+ }
+
+ if (profile.MaxWidth > 0 && width > profile.MaxWidth)
+ {
+ width = profile.MaxWidth;
+ }
+
+ if (height == 0)
+ {
+ height = sourceHeight;
+ }
+
+ if (profile.MaxHeight > 0 && height > profile.MaxHeight)
+ {
+ height = profile.MaxHeight;
+ }
+
+ if (profile.KeepDisplayAspect)
+ {
+ if ((profile.Width == 0 && profile.Height == 0) || profile.Width == 0)
+ {
+ width = (int)((double)height * croppedAspectRatio);
+ if (profile.MaxWidth > 0 && width > profile.MaxWidth)
+ {
+ width = profile.MaxWidth;
+ height = (int)((double)width / croppedAspectRatio);
+ height = GetNearestValue(height, PictureAutoSizeModulus);
+ }
+
+ width = GetNearestValue(width, PictureAutoSizeModulus);
+ }
+ else if (profile.Height == 0)
+ {
+ height = (int)((double)width / croppedAspectRatio);
+ if (profile.MaxHeight > 0 && height > profile.MaxHeight)
+ {
+ height = profile.MaxHeight;
+ width = (int)((double)height * croppedAspectRatio);
+ width = GetNearestValue(width, PictureAutoSizeModulus);
+ }
+
+ height = GetNearestValue(height, PictureAutoSizeModulus);
+ }
+ }
+
+ return new Size(width, height);
+ }
+
+ /// <summary>
+ /// Gets the closest value to the given number divisible by the given modulus.
+ /// </summary>
+ /// <param name="number">The number to approximate.</param>
+ /// <param name="modulus">The modulus.</param>
+ /// <returns>The closest value to the given number divisible by the given modulus.</returns>
+ private static int GetNearestValue(int number, int modulus)
+ {
+ return modulus * ((number + modulus / 2) / modulus);
+ }
+
+ /// <summary>
+ /// Checks the status of the ongoing scan.
+ /// </summary>
+ private void PollScanProgress()
+ {
+ var state = new hb_state_s();
+ HBFunctions.hb_get_state(this.hbHandle, ref state);
+
+ if (state.state == NativeConstants.HB_STATE_SCANNING)
+ {
+ if (this.ScanProgress != null)
+ {
+ hb_state_scanning_anon scanningState = state.param.scanning;
+
+ this.ScanProgress(this, new ScanProgressEventArgs
+ {
+ Progress = scanningState.progress,
+ CurrentPreview = scanningState.preview_cur,
+ Previews = scanningState.preview_count,
+ CurrentTitle = scanningState.title_cur,
+ Titles = scanningState.title_count
+ });
+ }
+ }
+ else if (state.state == NativeConstants.HB_STATE_SCANDONE)
+ {
+ this.titles = new List<Title>();
+
+ IntPtr titleSetPtr = HBFunctions.hb_get_title_set(this.hbHandle);
+ hb_title_set_s titleSet = InteropUtilities.ToStructureFromPtr<hb_title_set_s>(titleSetPtr);
+ this.originalTitles = titleSet.list_title.ToListFromHandBrakeList<hb_title_s>();
+
+ foreach (hb_title_s title in this.originalTitles)
+ {
+ this.titles.Add(this.ConvertTitle(title));
+ }
+
+ if (this.originalTitles.Count > 0)
+ {
+ this.featureTitle = titleSet.feature;
+ }
+ else
+ {
+ this.featureTitle = 0;
+ }
+
+ this.scanPollTimer.Stop();
+
+ if (this.ScanCompleted != null)
+ {
+ this.ScanCompleted(this, new System.EventArgs());
+ }
+ }
+ }
+
+ /// <summary>
+ /// Checks the status of the ongoing encode.
+ /// </summary>
+ private void PollEncodeProgress()
+ {
+ hb_state_s state = new hb_state_s();
+ HBFunctions.hb_get_state(this.hbHandle, ref state);
+
+ if (state.state == NativeConstants.HB_STATE_WORKING)
+ {
+ if (this.EncodeProgress != null)
+ {
+ int pass = 1;
+ int rawJobNumber = state.param.working.job_cur;
+
+ if (this.currentJob.EncodingProfile.VideoEncodeRateType != VideoEncodeRateType.ConstantQuality && this.currentJob.EncodingProfile.TwoPass)
+ {
+ if (this.subtitleScan)
+ {
+ switch (rawJobNumber)
+ {
+ case 1:
+ pass = -1;
+ break;
+ case 2:
+ pass = 1;
+ break;
+ case 3:
+ pass = 2;
+ break;
+ default:
+ break;
+ }
+ }
+ else
+ {
+ switch (rawJobNumber)
+ {
+ case 1:
+ pass = 1;
+ break;
+ case 2:
+ pass = 2;
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ else
+ {
+ if (this.subtitleScan)
+ {
+ switch (rawJobNumber)
+ {
+ case 1:
+ pass = -1;
+ break;
+ case 2:
+ pass = 1;
+ break;
+ default:
+ break;
+ }
+ }
+ else
+ {
+ pass = 1;
+ }
+ }
+
+ var progressEventArgs = new EncodeProgressEventArgs
+ {
+ FractionComplete = state.param.working.progress,
+ CurrentFrameRate = state.param.working.rate_cur,
+ AverageFrameRate = state.param.working.rate_avg,
+ EstimatedTimeLeft = new TimeSpan(state.param.working.hours, state.param.working.minutes, state.param.working.seconds),
+ Pass = pass
+ };
+
+ this.EncodeProgress(this, progressEventArgs);
+ }
+ }
+ else if (state.state == NativeConstants.HB_STATE_WORKDONE)
+ {
+ InteropUtilities.FreeMemory(this.encodeAllocatedMemory);
+ this.encodePollTimer.Stop();
 
 				if (this.EncodeCompleted != null)
 				{
-					this.EncodeCompleted(this, new EncodeCompletedEventArgs { Error = state.param.workdone.error > 0 });
-				}
-			}
-		}
-
-		/// <summary>
-		/// Applies the encoding job to the native memory structure and returns a list of memory
-		/// locations allocated during this.
-		/// </summary>
-		/// <param name="nativeJob">The native structure to apply to job info to.</param>
-		/// <param name="job">The job info to apply.</param>
-		/// <returns>The list of memory locations allocated for the job.</returns>
-		private List<IntPtr> ApplyJob(ref hb_job_s nativeJob, EncodeJob job)
-		{
-			return this.ApplyJob(ref nativeJob, job, false, 0, 0, 0);
-		}
-
-		/// <summary>
-		/// Applies the encoding job to the native memory structure and returns a list of memory
-		/// locations allocated during this.
-		/// </summary>
-		/// <param name="nativeJob">The native structure to apply to job info to.</param>
-		/// <param name="job">The job info to apply.</param>
-		/// <param name="preview">True if this is a preview encode.</param>
-		/// <param name="previewNumber">The preview number (0-based) to encode.</param>
-		/// <param name="previewSeconds">The number of seconds in the preview.</param>
-		/// <param name="overallSelectedLengthSeconds">The currently selected encode length. Used in preview
-		/// for calculating bitrate when the target size would be wrong.</param>
-		/// <returns>The list of memory locations allocated for the job.</returns>
-		private List<IntPtr> ApplyJob(ref hb_job_s nativeJob, EncodeJob job, bool preview, int previewNumber, int previewSeconds, double overallSelectedLengthSeconds)
-		{
-			var allocatedMemory = new List<IntPtr>();
-			Title title = this.GetTitle(job.Title);
-			hb_title_s originalTitle = this.GetOriginalTitle(job.Title);
-
-			EncodingProfile profile = job.EncodingProfile;
-
-			if (preview)
-			{
-				nativeJob.start_at_preview = previewNumber + 1;
-				nativeJob.seek_points = this.previewCount;
-
-				// There are 90,000 PTS per second.
-				nativeJob.pts_to_stop = previewSeconds * 90000;
-			}
-			else
-			{
-				switch (job.RangeType)
-				{
-					case VideoRangeType.All:
-						break;
-					case VideoRangeType.Chapters:
-						if (job.ChapterStart > 0 && job.ChapterEnd > 0)
-						{
-							nativeJob.chapter_start = job.ChapterStart;
-							nativeJob.chapter_end = job.ChapterEnd;
-						}
-						else
-						{
-							nativeJob.chapter_start = 1;
-							nativeJob.chapter_end = title.Chapters.Count;
-						}
-
-						break;
-					case VideoRangeType.Seconds:
-						if (job.SecondsStart < 0 || job.SecondsEnd < 0 || job.SecondsStart >= job.SecondsEnd)
-						{
-							throw new ArgumentException("Seconds range " + job.SecondsStart + "-" + job.SecondsEnd + " is invalid.", "job");
-						}
-
-						// If they've selected the "full" title duration, leave off the arguments to make it clean
-						if (job.SecondsStart > 0 || job.SecondsEnd < title.Duration.TotalSeconds)
-						{
-							// For some reason "pts_to_stop" actually means the number of pts to stop AFTER the start point.
-							nativeJob.pts_to_start = (int) (job.SecondsStart * 90000);
-							nativeJob.pts_to_stop = (int) ((job.SecondsEnd - job.SecondsStart) * 90000);
-						}
-						break;
-					case VideoRangeType.Frames:
-						if (job.FramesStart < 0 || job.FramesEnd < 0 || job.FramesStart >= job.FramesEnd)
-						{
-							throw new ArgumentException("Frames range " + job.FramesStart + "-" + job.FramesEnd + " is invalid.", "job");
-						}
-
-						// "frame_to_stop" actually means the number of frames total to encode AFTER the start point.
-						nativeJob.frame_to_start = job.FramesStart;
-						nativeJob.frame_to_stop = job.FramesEnd - job.FramesStart;
-						break;
-				}
-			}
-
-			// Chapter markers
-			nativeJob.chapter_markers = profile.IncludeChapterMarkers ? 1 : 0;
-
-			List<IntPtr> nativeChapters = nativeJob.list_chapter.ToIntPtrList();
-
-			if (!preview && profile.IncludeChapterMarkers)
-			{
-				int numChapters = title.Chapters.Count;
-
-				if (job.UseDefaultChapterNames)
-				{
-					for (int i = 0; i < numChapters; i++)
-					{
-						if (i < nativeChapters.Count)
-						{
-							HBFunctions.hb_chapter_set_title(nativeChapters[i], "Chapter " + (i + 1));
-						}
-					}
-				}
-				else
-				{
-					for (int i = 0; i < numChapters; i++)
-					{
-						if (i < nativeChapters.Count && i < job.CustomChapterNames.Count)
-						{
-							HBFunctions.hb_chapter_set_title(nativeChapters[i], job.CustomChapterNames[i]);
-						}
-					}
-				}
-			}
-
-			Cropping crop = GetCropping(profile, title);
-
-			nativeJob.crop[0] = crop.Top;
-			nativeJob.crop[1] = crop.Bottom;
-			nativeJob.crop[2] = crop.Left;
-			nativeJob.crop[3] = crop.Right;
-
-			var filterList = new List<hb_filter_object_s>();
-
-			// FILTERS: These must be added in the correct order since we cannot depend on the automatic ordering in hb_add_filter . Ordering is determined
-			// by the order they show up in the filters enum.
-
-			// Detelecine
-			if (profile.Detelecine != Detelecine.Off)
-			{
-				string settings = null;
-				if (profile.Detelecine == Detelecine.Custom)
-				{
-					settings = profile.CustomDetelecine;
-				}
-
-				this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_DETELECINE, settings, allocatedMemory);
-			}
-
-			// Decomb
-			if (profile.Decomb != Decomb.Off)
-			{
-				string settings = null;
-				switch (profile.Decomb)
-				{
-					case Decomb.Default:
-						break;
-					case Decomb.Fast:
-						settings = "7:2:6:9:1:80";
-						break;
-					case Decomb.Bob:
-						settings = "455";
-						break;
-					case Decomb.Custom:
-						settings = profile.CustomDecomb;
-						break;
-					default:
-						break;
-				}
-
-				this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_DECOMB, settings, allocatedMemory);
-			}
-
-			// Deinterlace
-			if (profile.Deinterlace != Deinterlace.Off)
-			{
-				nativeJob.deinterlace = 1;
-				string settings = null;
-
-				switch (profile.Deinterlace)
-				{
-					case Deinterlace.Fast:
-						settings = "0";
-						break;
-					case Deinterlace.Slow:
-						settings = "1";
-						break;
-					case Deinterlace.Slower:
-						settings = "3";
-						break;
-					case Deinterlace.Bob:
-						settings = "15";
-						break;
-					case Deinterlace.Custom:
-						settings = profile.CustomDeinterlace;
-						break;
-					default:
-						break;
-				}
-
-				this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_DEINTERLACE, settings, allocatedMemory);
-			}
-			else
-			{
-				nativeJob.deinterlace = 0;
-			}
-
-			// VFR
-			if (profile.Framerate == 0)
-			{
-				if (profile.ConstantFramerate)
-				{
-					// CFR with "Same as Source". Use the title rate
-					nativeJob.cfr = 1;
-					nativeJob.vrate = originalTitle.rate;
-					nativeJob.vrate_base = originalTitle.rate_base;
-				}
-				else
-				{
-					// Pure VFR "Same as Source"
-					nativeJob.cfr = 0;
-				}
-			}
-			else
-			{
-				// Specified framerate
-				if (profile.ConstantFramerate)
-				{
-					// Mark as pure CFR
-					nativeJob.cfr = 1;
-				}
-				else
-				{
-					// Mark as peak framerate
-					nativeJob.cfr = 2;
-				}
-
-				nativeJob.vrate = 27000000;
-				nativeJob.vrate_base = Converters.FramerateToVrate(profile.Framerate);
-			}
-
-			string vfrSettings = string.Format(CultureInfo.InvariantCulture, "{0}:{1}:{2}", nativeJob.cfr, nativeJob.vrate, nativeJob.vrate_base);
-			this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_VFR, vfrSettings, allocatedMemory);
-
-			// Deblock
-			if (profile.Deblock > 0)
-			{
-				this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_DEBLOCK, profile.Deblock.ToString(CultureInfo.InvariantCulture), allocatedMemory);
-			}
-
-			// Denoise
-			if (profile.Denoise != Denoise.Off)
-			{
-				string settings = null;
-				switch (profile.Denoise)
-				{
-					case Denoise.Weak:
-						settings = "2:1:2:3";
-						break;
-					case Denoise.Medium:
-						settings = "3:2:2:3";
-						break;
-					case Denoise.Strong:
-						settings = "7:7:5:5";
-						break;
-					case Denoise.Custom:
-						settings = profile.CustomDenoise;
-						break;
-					default:
-						break;
-				}
-
-				this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_DENOISE, settings, allocatedMemory);
-			}
-
-			// Crop/scale
-			int width = profile.Width;
-			int height = profile.Height;
-
-			int cropHorizontal = crop.Left + crop.Right;
-			int cropVertical = crop.Top + crop.Bottom;
-
-			if (width == 0)
-			{
-				width = title.Resolution.Width - cropHorizontal;
-			}
-
-			if (profile.MaxWidth > 0 && width > profile.MaxWidth)
-			{
-				width = profile.MaxWidth;
-			}
-
-			if (height == 0)
-			{
-				height = title.Resolution.Height - cropVertical;
-			}
-
-			if (profile.MaxHeight > 0 && height > profile.MaxHeight)
-			{
-				height = profile.MaxHeight;
-			}
-
-			// The job width can sometimes start not clean, due to interference from
-			// preview generation. We reset it here to allow good calculations.
-			nativeJob.width = width;
-			nativeJob.height = height;
-
-			nativeJob.grayscale = profile.Grayscale ? 1 : 0;
-
-			switch (profile.Anamorphic)
-			{
-				case Anamorphic.None:
-					nativeJob.anamorphic.mode = 0;
-
-					Size outputSize = CalculateNonAnamorphicOutput(profile, title);
-					width = outputSize.Width;
-					height = outputSize.Height;
-
-					nativeJob.anamorphic.keep_display_aspect = profile.KeepDisplayAspect ? 1 : 0;
-
-					nativeJob.width = width;
-					nativeJob.height = height;
-
-					nativeJob.maxWidth = profile.MaxWidth;
-					nativeJob.maxHeight = profile.MaxHeight;
-
-					break;
-				case Anamorphic.Strict:
-					nativeJob.anamorphic.mode = 1;
-
-					nativeJob.anamorphic.par_width = title.ParVal.Width;
-					nativeJob.anamorphic.par_height = title.ParVal.Height;
-					break;
-				case Anamorphic.Loose:
-					nativeJob.anamorphic.mode = 2;
-
-					nativeJob.modulus = profile.Modulus;
-
-					nativeJob.width = width;
-
-					nativeJob.maxWidth = profile.MaxWidth;
-
-					nativeJob.anamorphic.par_width = title.ParVal.Width;
-					nativeJob.anamorphic.par_height = title.ParVal.Height;
-					break;
-				case Anamorphic.Custom:
-					nativeJob.anamorphic.mode = 3;
-
-					nativeJob.modulus = profile.Modulus;
-
-					if (profile.UseDisplayWidth)
-					{
-						if (profile.KeepDisplayAspect)
-						{
-							int cropWidth = title.Resolution.Width - cropHorizontal;
-							int cropHeight = title.Resolution.Height - cropVertical;
-
-							double displayAspect = ((double)(cropWidth * title.ParVal.Width)) / (cropHeight * title.ParVal.Height);
-							int displayWidth = profile.DisplayWidth;
-
-							if (profile.Height > 0)
-							{
-								displayWidth = (int)((double)profile.Height * displayAspect);
-							}
-							else if (displayWidth > 0)
-							{
-								height = (int)((double)displayWidth / displayAspect);
-							}
-							else
-							{
-								displayWidth = (int)((double)cropHeight * displayAspect);
-							}
-
-							nativeJob.anamorphic.dar_width = displayWidth;
-							nativeJob.anamorphic.dar_height = height;
-							nativeJob.anamorphic.keep_display_aspect = 1;
-						}
-						else
-						{
-							nativeJob.anamorphic.dar_width = profile.DisplayWidth;
-							nativeJob.anamorphic.dar_height = height;
-							nativeJob.anamorphic.keep_display_aspect = profile.KeepDisplayAspect ? 1 : 0;
-						}
-					}
-					else
-					{
-						nativeJob.anamorphic.par_width = profile.PixelAspectX;
-						nativeJob.anamorphic.par_height = profile.PixelAspectY;
-						nativeJob.anamorphic.keep_display_aspect = 0;
-					}
-
-					nativeJob.width = width;
-					nativeJob.height = height;
-
-					nativeJob.maxWidth = profile.MaxWidth;
-					nativeJob.maxHeight = profile.MaxHeight;
-
-					break;
-				default:
-					break;
-			}
-
-			// Need to fix up values before adding crop/scale filter
-			if (profile.Anamorphic != Anamorphic.None)
-			{
-				int anamorphicWidth = 0, anamorphicHeight = 0, anamorphicParWidth = 0, anamorphicParHeight = 0;
-
-				HBFunctions.hb_set_anamorphic_size(ref nativeJob, ref anamorphicWidth, ref anamorphicHeight, ref anamorphicParWidth, ref anamorphicParHeight);
-				nativeJob.width = anamorphicWidth;
-				nativeJob.height = anamorphicHeight;
-				nativeJob.anamorphic.par_width = anamorphicParWidth;
-				nativeJob.anamorphic.par_height = anamorphicParHeight;
-			}
-
-			string cropScaleSettings = string.Format(
-				CultureInfo.InvariantCulture,
-				"{0}:{1}:{2}:{3}:{4}:{5}",
-				nativeJob.width,
-				nativeJob.height,
-				nativeJob.crop[0],
-				nativeJob.crop[1],
-				nativeJob.crop[2],
-				nativeJob.crop[3]);
-			this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_CROP_SCALE, cropScaleSettings, allocatedMemory);
-
-
-
-
-
-			HBVideoEncoder videoEncoder = Encoders.VideoEncoders.FirstOrDefault(e => e.ShortName == profile.VideoEncoder);
-			if (videoEncoder == null)
-			{
-				throw new ArgumentException("Video encoder " + profile.VideoEncoder + " not recognized.");
-			}
-
-			nativeJob.vcodec = videoEncoder.Id;
-
-
-
-			// areBframes
-			// color_matrix
-			List<hb_audio_s> titleAudio = originalTitle.list_audio.ToList<hb_audio_s>();
-			
-			var audioList = new List<hb_audio_s>();
-			int numTracks = 0;
-
-			List<Tuple<AudioEncoding, int>> outputTrackList = this.GetOutputTracks(job, title);
-
-			if (!string.IsNullOrEmpty(profile.AudioEncoderFallback))
-			{
-				HBAudioEncoder audioEncoder = Encoders.GetAudioEncoder(profile.AudioEncoderFallback);
-				if (audioEncoder == null)
-				{
-					throw new ArgumentException("Unrecognized fallback audio encoder: " + profile.AudioEncoderFallback);
-				}
-
-				nativeJob.acodec_fallback = Encoders.GetAudioEncoder(profile.AudioEncoderFallback).Id;
-			}
-
-			nativeJob.acodec_copy_mask = (int)NativeConstants.HB_ACODEC_ANY;
-
-			foreach (Tuple<AudioEncoding, int> outputTrack in outputTrackList)
-			{
-				audioList.Add(this.ConvertAudioBack(outputTrack.Item1, titleAudio[outputTrack.Item2 - 1], numTracks++, allocatedMemory));
-			}
-
-			NativeList nativeAudioList = InteropUtilities.ConvertListBack<hb_audio_s>(audioList);
-			nativeJob.list_audio = nativeAudioList.ListPtr;
-			allocatedMemory.AddRange(nativeAudioList.AllocatedMemory);
-
-			// Create a new empty list
-			int totalSubtitles = 0;
-			if (job.Subtitles != null)
-			{
-				if (job.Subtitles.SourceSubtitles != null)
-				{
-					totalSubtitles += job.Subtitles.SourceSubtitles.Count;
-				}
-
-				if (job.Subtitles.SrtSubtitles != null)
-				{
-					totalSubtitles += job.Subtitles.SrtSubtitles.Count;
-				}
-			}
-
-			NativeList nativeSubtitleList = InteropUtilities.CreateNativeList(totalSubtitles + 2);
-			nativeJob.list_subtitle = nativeSubtitleList.ListPtr;
-			allocatedMemory.AddRange(nativeSubtitleList.AllocatedMemory);
-
-			if (job.Subtitles != null)
-			{
-				if (job.Subtitles.SourceSubtitles != null && job.Subtitles.SourceSubtitles.Count > 0)
-				{
-					List<hb_subtitle_s> titleSubtitles = originalTitle.list_subtitle.ToList<hb_subtitle_s>();
-
-					foreach (SourceSubtitle sourceSubtitle in job.Subtitles.SourceSubtitles)
-					{
-						if (sourceSubtitle.TrackNumber == 0)
-						{
-							// Use subtitle search.
-							nativeJob.select_subtitle_config.force = sourceSubtitle.Forced ? 1 : 0;
-							nativeJob.select_subtitle_config.default_track = sourceSubtitle.Default ? 1 : 0;
-
-							if (!sourceSubtitle.BurnedIn)
-							{
-								nativeJob.select_subtitle_config.dest = hb_subtitle_config_s_subdest.PASSTHRUSUB;
-							}
-
-							nativeJob.indepth_scan = 1;
-						}
-						else
-						{
-							// Use specified subtitle.
-							hb_subtitle_s nativeSubtitle = titleSubtitles[sourceSubtitle.TrackNumber - 1];
-							var subtitleConfig = new hb_subtitle_config_s();
-
-							subtitleConfig.force = sourceSubtitle.Forced ? 1 : 0;
-							subtitleConfig.default_track = sourceSubtitle.Default ? 1 : 0;
-
-							bool supportsBurn = nativeSubtitle.source == hb_subtitle_s_subsource.VOBSUB || nativeSubtitle.source == hb_subtitle_s_subsource.SSASUB || nativeSubtitle.source == hb_subtitle_s_subsource.PGSSUB;
-							if (supportsBurn && sourceSubtitle.BurnedIn)
-							{
-								subtitleConfig.dest = hb_subtitle_config_s_subdest.RENDERSUB;
-							}
-							else
-							{
-								subtitleConfig.dest = hb_subtitle_config_s_subdest.PASSTHRUSUB;
-							}
-
-							int subtitleAddSucceded = HBFunctions.hb_subtitle_add(ref nativeJob, ref subtitleConfig, sourceSubtitle.TrackNumber - 1);
-							if (subtitleAddSucceded == 0)
-							{
-								System.Diagnostics.Debug.WriteLine("Subtitle add failed");
-							}
-						}
-					}
-				}
-
-				if (job.Subtitles.SrtSubtitles != null)
-				{
-					foreach (SrtSubtitle srtSubtitle in job.Subtitles.SrtSubtitles)
-					{
-						var subtitleConfig = new hb_subtitle_config_s();
-
-						subtitleConfig.src_codeset = srtSubtitle.CharacterCode;
-						subtitleConfig.src_filename = srtSubtitle.FileName;
-						subtitleConfig.offset = srtSubtitle.Offset;
-						subtitleConfig.default_track = srtSubtitle.Default ? 1 : 0;
-
-						int srtAddSucceded = HBFunctions.hb_srt_add(ref nativeJob, ref subtitleConfig, srtSubtitle.LanguageCode);
-						if (srtAddSucceded == 0)
-						{
-							System.Diagnostics.Debug.WriteLine("SRT add failed");
-						}
-					}
-				}
-
-				bool hasBurnedSubtitle = job.Subtitles.SourceSubtitles.Any(s => s.BurnedIn);
-				if (hasBurnedSubtitle)
-				{
-					this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_RENDER_SUB, string.Format(CultureInfo.InvariantCulture, "{0}:{1}:{2}:{3}", crop.Top, crop.Bottom, crop.Left, crop.Right), allocatedMemory);
+					this.EncodeCompleted(this, new EncodeCompletedEventArgs { Error = state.param.workdone.error != hb_error_code.HB_ERROR_NONE });
 				}
-			}
-
-			// Construct final filter list
-			nativeJob.list_filter = this.ConvertFilterListToNative(filterList, allocatedMemory).ListPtr;
-
-			if (profile.OutputFormat == Container.Mp4)
-			{
-				nativeJob.mux = NativeConstants.HB_MUX_MP4;
+ }
+ }
+
+ /// <summary>
+ /// Applies the encoding job to the native memory structure and returns a list of memory
+ /// locations allocated during this.
+ /// </summary>
+ /// <param name="nativeJob">The native structure to apply to job info to.</param>
+ /// <param name="job">The job info to apply.</param>
+ /// <returns>The list of memory locations allocated for the job.</returns>
+ private List<IntPtr> ApplyJob(ref hb_job_s nativeJob, EncodeJob job)
+ {
+ return this.ApplyJob(ref nativeJob, job, false, 0, 0, 0);
+ }
+
+ /// <summary>
+ /// Applies the encoding job to the native memory structure and returns a list of memory
+ /// locations allocated during this.
+ /// </summary>
+ /// <param name="nativeJob">The native structure to apply to job info to.</param>
+ /// <param name="job">The job info to apply.</param>
+ /// <param name="preview">True if this is a preview encode.</param>
+ /// <param name="previewNumber">The preview number (0-based) to encode.</param>
+ /// <param name="previewSeconds">The number of seconds in the preview.</param>
+ /// <param name="overallSelectedLengthSeconds">The currently selected encode length. Used in preview
+ /// for calculating bitrate when the target size would be wrong.</param>
+ /// <returns>The list of memory locations allocated for the job.</returns>
+ private List<IntPtr> ApplyJob(ref hb_job_s nativeJob, EncodeJob job, bool preview, int previewNumber, int previewSeconds, double overallSelectedLengthSeconds)
+ {
+ var allocatedMemory = new List<IntPtr>();
+ Title title = this.GetTitle(job.Title);
+ hb_title_s originalTitle = this.GetOriginalTitle(job.Title);
+
+ EncodingProfile profile = job.EncodingProfile;
+
+ if (preview)
+ {
+ nativeJob.start_at_preview = previewNumber + 1;
+ nativeJob.seek_points = this.previewCount;
+
+ // There are 90,000 PTS per second.
+ nativeJob.pts_to_stop = previewSeconds * 90000;
+ }
+ else
+ {
+ switch (job.RangeType)
+ {
+ case VideoRangeType.All:
+ break;
+ case VideoRangeType.Chapters:
+ if (job.ChapterStart > 0 && job.ChapterEnd > 0)
+ {
+ nativeJob.chapter_start = job.ChapterStart;
+ nativeJob.chapter_end = job.ChapterEnd;
+ }
+ else
+ {
+ nativeJob.chapter_start = 1;
+ nativeJob.chapter_end = title.Chapters.Count;
+ }
+
+ break;
+ case VideoRangeType.Seconds:
+ if (job.SecondsStart < 0 || job.SecondsEnd < 0 || job.SecondsStart >= job.SecondsEnd)
+ {
+ throw new ArgumentException("Seconds range " + job.SecondsStart + "-" + job.SecondsEnd + " is invalid.", "job");
+ }
+
+ // If they've selected the "full" title duration, leave off the arguments to make it clean
+ if (job.SecondsStart > 0 || job.SecondsEnd < title.Duration.TotalSeconds)
+ {
+ // For some reason "pts_to_stop" actually means the number of pts to stop AFTER the start point.
+ nativeJob.pts_to_start = (int)(job.SecondsStart * 90000);
+ nativeJob.pts_to_stop = (int)((job.SecondsEnd - job.SecondsStart) * 90000);
+ }
+ break;
+ case VideoRangeType.Frames:
+ if (job.FramesStart < 0 || job.FramesEnd < 0 || job.FramesStart >= job.FramesEnd)
+ {
+ throw new ArgumentException("Frames range " + job.FramesStart + "-" + job.FramesEnd + " is invalid.", "job");
+ }
+
+ // "frame_to_stop" actually means the number of frames total to encode AFTER the start point.
+ nativeJob.frame_to_start = job.FramesStart;
+ nativeJob.frame_to_stop = job.FramesEnd - job.FramesStart;
+ break;
+ }
+ }
+
+ // Chapter markers
+ nativeJob.chapter_markers = profile.IncludeChapterMarkers ? 1 : 0;
+
+ List<IntPtr> nativeChapters = nativeJob.list_chapter.ToIntPtrList();
+
+ if (!preview && profile.IncludeChapterMarkers)
+ {
+ int numChapters = title.Chapters.Count;
+
+ if (job.UseDefaultChapterNames)
+ {
+ for (int i = 0; i < numChapters; i++)
+ {
+ if (i < nativeChapters.Count)
+ {
+ HBFunctions.hb_chapter_set_title(nativeChapters[i], "Chapter " + (i + 1));
+ }
+ }
+ }
+ else
+ {
+ for (int i = 0; i < numChapters; i++)
+ {
+ if (i < nativeChapters.Count && i < job.CustomChapterNames.Count)
+ {
+ IntPtr chapterNamePtr;
+
+ if (string.IsNullOrWhiteSpace(job.CustomChapterNames[i]))
+ {
+ chapterNamePtr = InteropUtilities.ToUtf8PtrFromString("Chapter " + (i + 1));
+ }
+ else
+ {
+ chapterNamePtr = InteropUtilities.ToUtf8PtrFromString(job.CustomChapterNames[i]);
+ }
+
+ HBFunctions.hb_chapter_set_title__ptr(nativeChapters[i], chapterNamePtr);
+ Marshal.FreeHGlobal(chapterNamePtr);
+ }
+ }
+ }
+ }
+
+ Cropping crop = GetCropping(profile, title);
+
+ nativeJob.crop[0] = crop.Top;
+ nativeJob.crop[1] = crop.Bottom;
+ nativeJob.crop[2] = crop.Left;
+ nativeJob.crop[3] = crop.Right;
+
+ var filterList = new List<hb_filter_object_s>();
+
+ // FILTERS: These must be added in the correct order since we cannot depend on the automatic ordering in hb_add_filter . Ordering is determined
+ // by the order they show up in the filters enum.
+
+ // Detelecine
+ if (profile.Detelecine != Detelecine.Off)
+ {
+ string settings = null;
+ if (profile.Detelecine == Detelecine.Custom)
+ {
+ settings = profile.CustomDetelecine;
+ }
+
+ this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_DETELECINE, settings, allocatedMemory);
+ }
+
+ // Decomb
+ if (profile.Decomb != Decomb.Off)
+ {
+ string settings = null;
+ switch (profile.Decomb)
+ {
+ case Decomb.Default:
+ break;
+ case Decomb.Fast:
+ settings = "7:2:6:9:1:80";
+ break;
+ case Decomb.Bob:
+ settings = "455";
+ break;
+ case Decomb.Custom:
+ settings = profile.CustomDecomb;
+ break;
+ default:
+ break;
+ }
+
+ this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_DECOMB, settings, allocatedMemory);
+ }
+
+ // Deinterlace
+ if (profile.Deinterlace != Deinterlace.Off)
+ {
+ nativeJob.deinterlace = 1;
+ string settings = null;
+
+ switch (profile.Deinterlace)
+ {
+ case Deinterlace.Fast:
+ settings = "0";
+ break;
+ case Deinterlace.Slow:
+ settings = "1";
+ break;
+ case Deinterlace.Slower:
+ settings = "3";
+ break;
+ case Deinterlace.Bob:
+ settings = "15";
+ break;
+ case Deinterlace.Custom:
+ settings = profile.CustomDeinterlace;
+ break;
+ default:
+ break;
+ }
+
+ this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_DEINTERLACE, settings, allocatedMemory);
+ }
+ else
+ {
+ nativeJob.deinterlace = 0;
+ }
+
+ // VFR
+ if (profile.Framerate == 0)
+ {
+ if (profile.ConstantFramerate)
+ {
+ // CFR with "Same as Source". Use the title rate
+ nativeJob.cfr = 1;
+ nativeJob.vrate = originalTitle.rate;
+ nativeJob.vrate_base = originalTitle.rate_base;
+ }
+ else
+ {
+ // Pure VFR "Same as Source"
+ nativeJob.cfr = 0;
+ }
+ }
+ else
+ {
+ // Specified framerate
+ if (profile.ConstantFramerate)
+ {
+ // Mark as pure CFR
+ nativeJob.cfr = 1;
+ }
+ else
+ {
+ // Mark as peak framerate
+ nativeJob.cfr = 2;
+ }
+
+ nativeJob.vrate = 27000000;
+ nativeJob.vrate_base = Converters.Converters.FramerateToVrate(profile.Framerate);
+ }
+
+ string vfrSettings = string.Format(CultureInfo.InvariantCulture, "{0}:{1}:{2}", nativeJob.cfr, nativeJob.vrate, nativeJob.vrate_base);
+ this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_VFR, vfrSettings, allocatedMemory);
+
+ // Deblock
+ if (profile.Deblock > 0)
+ {
+ this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_DEBLOCK, profile.Deblock.ToString(CultureInfo.InvariantCulture), allocatedMemory);
+ }
+
+ // Denoise
+ if (profile.Denoise != Denoise.Off)
+ {
+	 int filterType = profile.Denoise == Denoise.hqdn3d ? (int)hb_filter_ids.HB_FILTER_HQDN3D : (int)hb_filter_ids.HB_FILTER_NLMEANS;
+
+				this.AddFilterFromPreset(filterList, filterType, profile.DenoisePreset, profile.DenoiseTune);
+ }
+
+ // Crop/scale
+ int width = profile.Width;
+ int height = profile.Height;
+
+ int cropHorizontal = crop.Left + crop.Right;
+ int cropVertical = crop.Top + crop.Bottom;
+
+ if (width == 0)
+ {
+ width = title.Resolution.Width - cropHorizontal;
+ }
+
+ if (profile.MaxWidth > 0 && width > profile.MaxWidth)
+ {
+ width = profile.MaxWidth;
+ }
+
+ if (height == 0)
+ {
+ height = title.Resolution.Height - cropVertical;
+ }
+
+ if (profile.MaxHeight > 0 && height > profile.MaxHeight)
+ {
+ height = profile.MaxHeight;
+ }
+
+ // The job width can sometimes start not clean, due to interference from
+ // preview generation. We reset it here to allow good calculations.
+ nativeJob.width = width;
+ nativeJob.height = height;
+
+ nativeJob.grayscale = profile.Grayscale ? 1 : 0;
+
+ switch (profile.Anamorphic)
+ {
+ case Anamorphic.None:
+ nativeJob.anamorphic.mode = 0;
+
+ Size outputSize = CalculateNonAnamorphicOutput(profile, title);
+ width = outputSize.Width;
+ height = outputSize.Height;
+
+ nativeJob.anamorphic.keep_display_aspect = 0;
+					nativeJob.anamorphic.par_width = 1;
+					nativeJob.anamorphic.par_height = 1;
+
+ nativeJob.width = width;
+ nativeJob.height = height;
+
+ nativeJob.maxWidth = profile.MaxWidth;
+ nativeJob.maxHeight = profile.MaxHeight;
+
+		 nativeJob.modulus = 2;
+
+ break;
+ case Anamorphic.Strict:
+ nativeJob.anamorphic.mode = hb_anamorphic_mode_t.HB_ANAMORPHIC_STRICT;
+
+ nativeJob.anamorphic.par_width = title.ParVal.Width;
+ nativeJob.anamorphic.par_height = title.ParVal.Height;
+ break;
+ case Anamorphic.Loose:
+ nativeJob.anamorphic.mode = hb_anamorphic_mode_t.HB_ANAMORPHIC_LOOSE;
+
+ nativeJob.modulus = profile.Modulus;
+
+ nativeJob.width = width;
+
+ nativeJob.maxWidth = profile.MaxWidth;
+
+ nativeJob.anamorphic.par_width = title.ParVal.Width;
+ nativeJob.anamorphic.par_height = title.ParVal.Height;
+ break;
+ case Anamorphic.Custom:
+ nativeJob.anamorphic.mode = hb_anamorphic_mode_t.HB_ANAMORPHIC_CUSTOM;
+
+ nativeJob.modulus = profile.Modulus;
+
+ if (profile.UseDisplayWidth)
+ {
+ if (profile.KeepDisplayAspect)
+ {
+ int cropWidth = title.Resolution.Width - cropHorizontal;
+ int cropHeight = title.Resolution.Height - cropVertical;
+
+ double displayAspect = ((double)(cropWidth * title.ParVal.Width)) / (cropHeight * title.ParVal.Height);
+ int displayWidth = profile.DisplayWidth;
+
+ if (profile.Height > 0)
+ {
+ displayWidth = (int)((double)profile.Height * displayAspect);
+ }
+ else if (displayWidth > 0)
+ {
+ height = (int)((double)displayWidth / displayAspect);
+ }
+ else
+ {
+ displayWidth = (int)((double)height * displayAspect);
+ }
+
+ nativeJob.anamorphic.dar_width = displayWidth;
+ nativeJob.anamorphic.dar_height = height;
+ nativeJob.anamorphic.keep_display_aspect = 1;
+ }
+ else
+ {
+ nativeJob.anamorphic.dar_width = profile.DisplayWidth;
+ nativeJob.anamorphic.dar_height = height;
+ nativeJob.anamorphic.keep_display_aspect = 0;
+ }
+ }
+ else
+ {
+ nativeJob.anamorphic.par_width = profile.PixelAspectX;
+ nativeJob.anamorphic.par_height = profile.PixelAspectY;
+ nativeJob.anamorphic.keep_display_aspect = 0;
+ }
+
+ nativeJob.width = width;
+ nativeJob.height = height;
+
+ nativeJob.maxWidth = profile.MaxWidth;
+ nativeJob.maxHeight = profile.MaxHeight;
+
+ break;
+ default:
+ break;
+ }
+
+ // Need to fix up values before adding crop/scale filter
+ if (profile.Anamorphic != Anamorphic.None)
+ {
+ int anamorphicWidth = 0, anamorphicHeight = 0, anamorphicParWidth = 0, anamorphicParHeight = 0;
+
+ HBFunctions.hb_set_anamorphic_size(ref nativeJob, ref anamorphicWidth, ref anamorphicHeight, ref anamorphicParWidth, ref anamorphicParHeight);
+ nativeJob.width = anamorphicWidth;
+ nativeJob.height = anamorphicHeight;
+ nativeJob.anamorphic.par_width = anamorphicParWidth;
+ nativeJob.anamorphic.par_height = anamorphicParHeight;
+ }
+
+ string cropScaleSettings = string.Format(
+ CultureInfo.InvariantCulture,
+ "{0}:{1}:{2}:{3}:{4}:{5}",
+ nativeJob.width,
+ nativeJob.height,
+ nativeJob.crop[0],
+ nativeJob.crop[1],
+ nativeJob.crop[2],
+ nativeJob.crop[3]);
+ this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_CROP_SCALE, cropScaleSettings, allocatedMemory);
+
+
+
+
+
+ HBVideoEncoder videoEncoder = Encoders.VideoEncoders.FirstOrDefault(e => e.ShortName == profile.VideoEncoder);
+ if (videoEncoder == null)
+ {
+ throw new ArgumentException("Video encoder " + profile.VideoEncoder + " not recognized.");
+ }
+
+ nativeJob.vcodec = videoEncoder.Id;
+
+
+
+ // areBframes
+ // color_matrix
+ List<hb_audio_s> titleAudio = originalTitle.list_audio.ToListFromHandBrakeList<hb_audio_s>();
+
+ var audioList = new List<hb_audio_s>();
+ int numTracks = 0;
+
+ List<Tuple<AudioEncoding, int>> outputTrackList = this.GetOutputTracks(job, title);
+
+ if (!string.IsNullOrEmpty(profile.AudioEncoderFallback))
+ {
+ HBAudioEncoder audioEncoder = Encoders.GetAudioEncoder(profile.AudioEncoderFallback);
+ if (audioEncoder == null)
+ {
+ throw new ArgumentException("Unrecognized fallback audio encoder: " + profile.AudioEncoderFallback);
+ }
+
+ nativeJob.acodec_fallback = Encoders.GetAudioEncoder(profile.AudioEncoderFallback).Id;
+ }
+
+ nativeJob.acodec_copy_mask = (int)NativeConstants.HB_ACODEC_ANY;
+
+ foreach (Tuple<AudioEncoding, int> outputTrack in outputTrackList)
+ {
+	 AudioEncoding encoding = outputTrack.Item1;
+	 int trackNumber = outputTrack.Item2;
+
+				audioList.Add(this.ConvertAudioBack(encoding, titleAudio[trackNumber - 1], numTracks++, allocatedMemory));
+ }
+
+ NativeList nativeAudioList = InteropUtilities.ToHandBrakeListFromList<hb_audio_s>(audioList);
+ nativeJob.list_audio = nativeAudioList.Ptr;
+ allocatedMemory.AddRange(nativeAudioList.AllocatedMemory);
+
+ if (job.Subtitles != null)
+ {
+ if (job.Subtitles.SourceSubtitles != null && job.Subtitles.SourceSubtitles.Count > 0)
+ {
+ List<hb_subtitle_s> titleSubtitles = originalTitle.list_subtitle.ToListFromHandBrakeList<hb_subtitle_s>();
+
+ foreach (SourceSubtitle sourceSubtitle in job.Subtitles.SourceSubtitles)
+ {
+ if (sourceSubtitle.TrackNumber == 0)
+ {
+ // Use subtitle search.
+ nativeJob.select_subtitle_config.force = sourceSubtitle.Forced ? 1 : 0;
+ nativeJob.select_subtitle_config.default_track = sourceSubtitle.Default ? 1 : 0;
+
+ if (!sourceSubtitle.BurnedIn)
+ {
+ nativeJob.select_subtitle_config.dest = hb_subtitle_config_s_subdest.PASSTHRUSUB;
+ }
+
+ nativeJob.indepth_scan = 1;
+ }
+ else
+ {
+ // Use specified subtitle.
+ hb_subtitle_s nativeSubtitle = titleSubtitles[sourceSubtitle.TrackNumber - 1];
+ var subtitleConfig = new hb_subtitle_config_s();
+
+ subtitleConfig.force = sourceSubtitle.Forced ? 1 : 0;
+ subtitleConfig.default_track = sourceSubtitle.Default ? 1 : 0;
+
+ bool supportsBurn = nativeSubtitle.source == hb_subtitle_s_subsource.VOBSUB || nativeSubtitle.source == hb_subtitle_s_subsource.SSASUB || nativeSubtitle.source == hb_subtitle_s_subsource.PGSSUB;
+ if (supportsBurn && sourceSubtitle.BurnedIn)
+ {
+ subtitleConfig.dest = hb_subtitle_config_s_subdest.RENDERSUB;
+ }
+ else
+ {
+ subtitleConfig.dest = hb_subtitle_config_s_subdest.PASSTHRUSUB;
+ }
+
+ int subtitleAddSucceded = HBFunctions.hb_subtitle_add(ref nativeJob, ref subtitleConfig, sourceSubtitle.TrackNumber - 1);
+ if (subtitleAddSucceded == 0)
+ {
+ System.Diagnostics.Debug.WriteLine("Subtitle add failed");
+ }
+ }
+ }
+ }
+
+ if (job.Subtitles.SrtSubtitles != null)
+ {
+ foreach (SrtSubtitle srtSubtitle in job.Subtitles.SrtSubtitles)
+ {
+ var subtitleConfig = new hb_subtitle_config_s();
+
+	 subtitleConfig.dest = srtSubtitle.BurnedIn ? hb_subtitle_config_s_subdest.RENDERSUB : hb_subtitle_config_s_subdest.PASSTHRUSUB;
+ subtitleConfig.src_codeset = srtSubtitle.CharacterCode;
+ subtitleConfig.src_filename = srtSubtitle.FileName;
+ subtitleConfig.offset = srtSubtitle.Offset;
+ subtitleConfig.default_track = srtSubtitle.Default ? 1 : 0;
+
+ int srtAddSucceded = HBFunctions.hb_srt_add(ref nativeJob, ref subtitleConfig, srtSubtitle.LanguageCode);
+ if (srtAddSucceded == 0)
+ {
+ System.Diagnostics.Debug.WriteLine("SRT add failed");
+ }
+ }
+ }
+
+ bool hasBurnedSubtitle = job.Subtitles.SourceSubtitles != null && job.Subtitles.SourceSubtitles.Any(s => s.BurnedIn);
+ if (hasBurnedSubtitle)
+ {
+ this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_RENDER_SUB, string.Format(CultureInfo.InvariantCulture, "{0}:{1}:{2}:{3}", crop.Top, crop.Bottom, crop.Left, crop.Right), allocatedMemory);
+ }
+ }
+
+			// Rotate
+	 if (profile.FlipHorizontal || profile.FlipVertical || profile.Rotation != PictureRotation.None)
+	 {
+		 bool rotate90 = false;
+		 bool flipHorizontal = profile.FlipHorizontal;
+		 bool flipVertical = profile.FlipVertical;
+
+		 switch (profile.Rotation)
+		 {
+			 case PictureRotation.Clockwise90:
+				 rotate90 = true;
+				 break;
+			 case PictureRotation.Clockwise180:
+				 flipHorizontal = !flipHorizontal;
+				 flipVertical = !flipVertical;
+				 break;
+			 case PictureRotation.Clockwise270:
+				 rotate90 = true;
+				 flipHorizontal = !flipHorizontal;
+				 flipVertical = !flipVertical;
+				 break;
+		 }
+
+		 int rotateSetting = 0;
+				if (flipVertical)
+		 {
+			 rotateSetting |= 1;
+		 }
+
+				if (flipHorizontal)
+		 {
+			 rotateSetting |= 2;
+		 }
+
+				if (rotate90)
+		 {
+			 rotateSetting |= 4;
+		 }
+
+				this.AddFilter(filterList, (int)hb_filter_ids.HB_FILTER_ROTATE, rotateSetting.ToString(CultureInfo.InvariantCulture), allocatedMemory);
+	 }
+
+ // Construct final filter list
+ nativeJob.list_filter = this.ConvertFilterListToNative(filterList, allocatedMemory).Ptr;
+
+ if (profile.ScaleMethod == ScaleMethod.Bicubic)
+ {
+ HBFunctions.hb_get_opencl_env();
+ nativeJob.use_opencl = 1;
+ }
+ else
+ {
+ nativeJob.use_opencl = 0;
+ }
+
+ nativeJob.qsv.decode = profile.QsvDecode ? 1 : 0;
+ nativeJob.use_hwd = job.DxvaDecoding ? 1 : 0;
+
+ if (profile.ContainerName != null)
+ {
+ nativeJob.mux = HBFunctions.hb_container_get_from_name(profile.ContainerName);
+ }
+
+			if (job.OutputPath == null)
+			{
+				nativeJob.file = IntPtr.Zero;
 			}
 			else
 			{
-				nativeJob.mux = NativeConstants.HB_MUX_MKV;
-			}
-
-			nativeJob.file = job.OutputPath;
-
-			nativeJob.largeFileSize = profile.LargeFile ? 1 : 0;
-			nativeJob.mp4_optimize = profile.Optimize ? 1 : 0;
-			nativeJob.ipod_atom = profile.IPod5GSupport ? 1 : 0;
-
-			if (title.AngleCount > 1)
-			{
-				nativeJob.angle = job.Angle;
-			}
-
-			switch (profile.VideoEncodeRateType)
-			{
-				case VideoEncodeRateType.ConstantQuality:
-					nativeJob.vquality = (float)profile.Quality;
-					nativeJob.vbitrate = 0;
-					break;
-				case VideoEncodeRateType.AverageBitrate:
-					nativeJob.vquality = -1;
-					nativeJob.vbitrate = profile.VideoBitrate;
-					break;
-				case VideoEncodeRateType.TargetSize:
-					nativeJob.vquality = -1;
-					nativeJob.vbitrate = this.CalculateBitrate(job, profile.TargetSize, overallSelectedLengthSeconds);
-					break;
-				default:
-					break;
-			}
-
-			// frames_to_skip
-
-			return allocatedMemory;
-		}
-
-		/// <summary>
-		/// Gets a list of encodings and target track indices (1-based).
-		/// </summary>
-		/// <param name="job">The encode job</param>
-		/// <param name="title">The title the job is meant to encode.</param>
-		/// <returns>A list of encodings and target track indices (1-based).</returns>
-		private List<Tuple<AudioEncoding, int>> GetOutputTracks(EncodeJob job, Title title)
-		{
-			var list = new List<Tuple<AudioEncoding, int>>();
-
-			foreach (AudioEncoding encoding in job.EncodingProfile.AudioEncodings)
-			{
-				if (encoding.InputNumber == 0)
-				{
-					// Add this encoding for all chosen tracks
-					foreach (int chosenTrack in job.ChosenAudioTracks)
-					{
-						// In normal cases we'll never have a chosen audio track that doesn't exist but when batch encoding
-						// we just choose the first audio track without checking if it exists.
-						if (chosenTrack <= title.AudioTracks.Count)
-						{
-							list.Add(new Tuple<AudioEncoding, int>(encoding, chosenTrack));
-						}
-					}
-				}
-				else if (encoding.InputNumber <= job.ChosenAudioTracks.Count)
-				{
-					// Add this encoding for the specified track, if it exists
-					int trackNumber = job.ChosenAudioTracks[encoding.InputNumber - 1];
-
-					// In normal cases we'll never have a chosen audio track that doesn't exist but when batch encoding
-					// we just choose the first audio track without checking if it exists.
-					if (trackNumber <= title.AudioTracks.Count)
-					{
-						list.Add(new Tuple<AudioEncoding, int>(encoding, trackNumber));
-					}
-				}
-			}
-
-			return list;
-		}
+				IntPtr outputPathPtr = InteropUtilities.ToUtf8PtrFromString(job.OutputPath);
+				allocatedMemory.Add(outputPathPtr);
+				nativeJob.file = outputPathPtr;
+			}
+
+ nativeJob.largeFileSize = profile.LargeFile ? 1 : 0;
+ nativeJob.mp4_optimize = profile.Optimize ? 1 : 0;
+ nativeJob.ipod_atom = profile.IPod5GSupport ? 1 : 0;
+
+ if (title.AngleCount > 1)
+ {
+ nativeJob.angle = job.Angle;
+ }
+
+ switch (profile.VideoEncodeRateType)
+ {
+ case VideoEncodeRateType.ConstantQuality:
+ nativeJob.vquality = (float)profile.Quality;
+ nativeJob.vbitrate = 0;
+ break;
+ case VideoEncodeRateType.AverageBitrate:
+ nativeJob.vquality = -1;
+ nativeJob.vbitrate = profile.VideoBitrate;
+ break;
+ case VideoEncodeRateType.TargetSize:
+ nativeJob.vquality = -1;
+ nativeJob.vbitrate = this.CalculateBitrate(job, profile.TargetSize, overallSelectedLengthSeconds);
+ break;
+ default:
+ break;
+ }
+
+ // frames_to_skip
+
+ return allocatedMemory;
+ }
+
+ /// <summary>
+ /// Gets a list of encodings and target track indices (1-based).
+ /// </summary>
+ /// <param name="job">The encode job</param>
+ /// <param name="title">The title the job is meant to encode.</param>
+ /// <returns>A list of encodings and target track indices (1-based).</returns>
+ private List<Tuple<AudioEncoding, int>> GetOutputTracks(EncodeJob job, Title title)
+ {
+ var list = new List<Tuple<AudioEncoding, int>>();
+
+ foreach (AudioEncoding encoding in job.EncodingProfile.AudioEncodings)
+ {
+ if (encoding.InputNumber == 0)
+ {
+ // Add this encoding for all chosen tracks
+ foreach (int chosenTrack in job.ChosenAudioTracks)
+ {
+ // In normal cases we'll never have a chosen audio track that doesn't exist but when batch encoding
+ // we just choose the first audio track without checking if it exists.
+ if (chosenTrack <= title.AudioTracks.Count)
+ {
+ list.Add(new Tuple<AudioEncoding, int>(encoding, chosenTrack));
+ }
+ }
+ }
+ else if (encoding.InputNumber <= job.ChosenAudioTracks.Count)
+ {
+ // Add this encoding for the specified track, if it exists
+ int trackNumber = job.ChosenAudioTracks[encoding.InputNumber - 1];
+
+ // In normal cases we'll never have a chosen audio track that doesn't exist but when batch encoding
+ // we just choose the first audio track without checking if it exists.
+ if (trackNumber <= title.AudioTracks.Count)
+ {
+ list.Add(new Tuple<AudioEncoding, int>(encoding, trackNumber));
+ }
+ }
+ }
+
+ return list;
+ }
+
+ /// <summary>
+ /// Adds a filter to the given filter list.
+ /// </summary>
+ /// <param name="filterList">The list to add the filter to.</param>
+ /// <param name="filterType">The type of filter.</param>
+ /// <param name="settings">Settings for the filter.</param>
+ /// <param name="allocatedMemory">The list of allocated memory.</param>
+ private void AddFilter(List<hb_filter_object_s> filterList, int filterType, string settings, List<IntPtr> allocatedMemory)
+ {
+ IntPtr settingsNativeString = Marshal.StringToHGlobalAnsi(settings);
+ hb_filter_object_s filter = InteropUtilities.ToStructureFromPtr<hb_filter_object_s>(HBFunctions.hb_filter_init(filterType));
+ filter.settings = settingsNativeString;
+
+ allocatedMemory.Add(settingsNativeString);
+ filterList.Add(filter);
+ }
 
 		/// <summary>
-		/// Adds a filter to the given filter list.
+		/// Adds a filter to the given filter list with the provided preset and tune.
 		/// </summary>
 		/// <param name="filterList">The list to add the filter to.</param>
 		/// <param name="filterType">The type of filter.</param>
-		/// <param name="settings">Settings for the filter.</param>
-		/// <param name="allocatedMemory">The list of allocated memory.</param>
-		private void AddFilter(List<hb_filter_object_s> filterList, int filterType, string settings, List<IntPtr> allocatedMemory)
-		{
-			IntPtr settingsNativeString = Marshal.StringToHGlobalAnsi(settings);
-			hb_filter_object_s filter = InteropUtilities.ReadStructure<hb_filter_object_s>(HBFunctions.hb_filter_init(filterType));
-			filter.settings = settingsNativeString;
-
-			allocatedMemory.Add(settingsNativeString);
-			filterList.Add(filter);
-		}
-
-		/// <summary>
-		/// Converts the given filter list to a native list.
-		/// </summary>
-		/// <remarks>Sorts the list by filter ID before converting to a native list, as HB expects it that way.
-		/// The list memory itself will be added to the allocatedMemory list.</remarks>
-		/// <param name="filterList">The filter list to convert.</param>
-		/// <param name="allocatedMemory">The list of allocated memory to add to.</param>
-		/// <returns>The converted list.</returns>
-		private NativeList ConvertFilterListToNative(List<hb_filter_object_s> filterList, List<IntPtr> allocatedMemory)
-		{
-			var filterPtrList = new List<IntPtr>();
-
-			var sortedList = filterList.OrderBy(f => f.id);
-			foreach (var filter in sortedList)
-			{
-				IntPtr filterPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_filter_object_s)));
-				Marshal.StructureToPtr(filter, filterPtr, false);
-
-				allocatedMemory.Add(filterPtr);
-				filterPtrList.Add(filterPtr);
-			}
-
-			NativeList filterListNative = InteropUtilities.CreateIntPtrList(filterPtrList);
-			allocatedMemory.AddRange(filterListNative.AllocatedMemory);
-
-			return filterListNative;
-		}
-
-		/// <summary>
-		/// Gets the title, given the 1-based title number.
-		/// </summary>
-		/// <param name="titleNumber">The number of the title (1-based).</param>
-		/// <returns>The requested Title.</returns>
-		private Title GetTitle(int titleNumber)
-		{
-			return this.Titles.SingleOrDefault(title => title.TitleNumber == titleNumber);
-		}
-
-		/// <summary>
-		/// Gets the 1-based title index of the given title.
-		/// </summary>
-		/// <param name="titleNumber">The 1-based title title number.</param>
-		/// <returns>The 1-based title index.</returns>
-		private int GetTitleIndex(int titleNumber)
-		{
-			Title title = this.GetTitle(titleNumber);
-			return this.GetTitleIndex(title);
-		}
-
-		/// <summary>
-		/// Gets the 1-based title index of the given title.
-		/// </summary>
-		/// <param name="title">The title to look up</param>
-		/// <returns>The 1-based title index of the given title.</returns>
-		private int GetTitleIndex(Title title)
-		{
-			return this.Titles.IndexOf(title) + 1;
-		}
-
-		/// <summary>
-		/// Gets the native title object from the title index.
-		/// </summary>
-		/// <param name="titleIndex">The index of the title (1-based).</param>
-		/// <returns>Gets the native title object for the given index.</returns>
-		private hb_title_s GetOriginalTitle(int titleIndex)
-		{
-			List<hb_title_s> matchingTitles = this.originalTitles.Where(title => title.index == titleIndex).ToList();
-			if (matchingTitles.Count == 0)
-			{
-				throw new ArgumentException("Could not find specified title.");
-			}
-
-			if (matchingTitles.Count > 1)
-			{
-				throw new ArgumentException("Multiple titles matched.");
-			}
-
-			return matchingTitles[0];
-		}
-
-		/// <summary>
-		/// Applies an audio encoding to a native audio encoding base structure.
-		/// </summary>
-		/// <param name="encoding">The encoding to apply.</param>
-		/// <param name="baseStruct">The base native structure.</param>
-		/// <param name="outputTrack">The output track number (0-based).</param>
-		/// <param name="allocatedMemory">The collection of allocated memory.</param>
-		/// <returns>The resulting native audio structure.</returns>
-		private hb_audio_s ConvertAudioBack(AudioEncoding encoding, hb_audio_s baseStruct, int outputTrack, List<IntPtr> allocatedMemory)
-		{
-			hb_audio_s nativeAudio = baseStruct;
-			HBAudioEncoder encoder = Encoders.GetAudioEncoder(encoding.Encoder);
-
-			nativeAudio.config.output.track = outputTrack;
-			nativeAudio.config.output.codec = (uint)encoder.Id;
-
-			if (!encoder.IsPassthrough)
-			{
-				if (encoding.SampleRateRaw == 0)
-				{
-					nativeAudio.config.output.samplerate = nativeAudio.config.input.samplerate;
-				}
-				else
-				{
-					nativeAudio.config.output.samplerate = encoding.SampleRateRaw;
-				}
-
-				HBMixdown mixdown = Encoders.GetMixdown(encoding.Mixdown);
-				nativeAudio.config.output.mixdown = mixdown.Id;
-
-				if (encoding.EncodeRateType == AudioEncodeRateType.Bitrate)
-				{
-					// Disable quality targeting.
-					nativeAudio.config.output.quality = -1;
-
-					if (encoding.Bitrate == 0)
-					{
-						// Bitrate of 0 means auto: choose the default for this codec, sample rate and mixdown.
-						nativeAudio.config.output.bitrate = HBFunctions.hb_get_default_audio_bitrate(
-							nativeAudio.config.output.codec,
-							nativeAudio.config.output.samplerate,
-							nativeAudio.config.output.mixdown);
-					}
-					else
-					{
-						nativeAudio.config.output.bitrate = encoding.Bitrate;
-					}
-				}
-				else if (encoding.EncodeRateType == AudioEncodeRateType.Quality)
-				{
-					// Bitrate of -1 signals quality targeting.
-					nativeAudio.config.output.bitrate = -1;
-					nativeAudio.config.output.quality = encoding.Quality;
-				}
-
-				// If this encoder supports compression level, pass it in.
-				if (encoder.SupportsCompression)
-				{
-					nativeAudio.config.output.compression_level = encoding.Compression;
-				}
-
-				nativeAudio.config.output.dynamic_range_compression = encoding.Drc;
-				nativeAudio.config.output.gain = encoding.Gain;
-			}
-
-			if (!string.IsNullOrEmpty(encoding.Name))
-			{
-				IntPtr encodingNamePtr = Marshal.StringToHGlobalAnsi(encoding.Name);
-				nativeAudio.config.output.name = encodingNamePtr;
-				allocatedMemory.Add(encodingNamePtr);
-			}
-
-			nativeAudio.padding = new byte[MarshalingConstants.AudioPaddingBytes];
-
-			return nativeAudio;
-		}
-
-		/// <summary>
-		/// Converts a native title to a Title object.
-		/// </summary>
-		/// <param name="title">The native title structure.</param>
-		/// <returns>The managed Title object.</returns>
-		private Title ConvertTitle(hb_title_s title)
-		{
-			var newTitle = new Title
-			{
-				TitleNumber = title.index,
-				Playlist = title.playlist,
-				Resolution = new Size(title.width, title.height),
-				ParVal = new Size(title.pixel_aspect_width, title.pixel_aspect_height),
-				Duration = Converters.PtsToTimeSpan(title.duration),
-				DurationPts = title.duration,
-				AutoCropDimensions = new Cropping
-				{
-					Top = title.crop[0],
-					Bottom = title.crop[1],
-					Left = title.crop[2],
-					Right = title.crop[3]
-				},
-				AspectRatio = title.aspect,
-				AngleCount = title.angle_count,
-				VideoCodecName = title.video_codec_name,
-				Framerate = ((double)title.rate) / title.rate_base,
-				FramerateNumerator = title.rate,
-				FramerateDenominator = title.rate_base
-			};
-
-			switch (title.type)
-			{
-				case hb_title_type_anon.HB_STREAM_TYPE:
-					newTitle.InputType = InputType.Stream;
-					break;
-				case hb_title_type_anon.HB_DVD_TYPE:
-					newTitle.InputType = InputType.Dvd;
-					break;
-				case hb_title_type_anon.HB_BD_TYPE:
-					newTitle.InputType = InputType.Bluray;
-					break;
-			}
-
-			int currentSubtitleTrack = 1;
-			List<hb_subtitle_s> subtitleList = title.list_subtitle.ToList<hb_subtitle_s>();
-			foreach (hb_subtitle_s subtitle in subtitleList)
-			{
-				var newSubtitle = new Subtitle
-				{
-					TrackNumber = currentSubtitleTrack,
-					Language = subtitle.lang,
-					LanguageCode = subtitle.iso639_2
-				};
-
-				if (subtitle.format == hb_subtitle_s_subtype.PICTURESUB)
-				{
-					newSubtitle.SubtitleType = SubtitleType.Picture;
-				}
-				else if (subtitle.format == hb_subtitle_s_subtype.TEXTSUB)
-				{
-					newSubtitle.SubtitleType = SubtitleType.Text;
-				}
-
-				switch (subtitle.source)
-				{
-					case hb_subtitle_s_subsource.CC608SUB:
-						newSubtitle.SubtitleSource = SubtitleSource.CC608;
-						break;
-					case hb_subtitle_s_subsource.CC708SUB:
-						newSubtitle.SubtitleSource = SubtitleSource.CC708;
-						break;
-					case hb_subtitle_s_subsource.SRTSUB:
-						newSubtitle.SubtitleSource = SubtitleSource.SRT;
-						break;
-					case hb_subtitle_s_subsource.SSASUB:
-						newSubtitle.SubtitleSource = SubtitleSource.SSA;
-						break;
-					case hb_subtitle_s_subsource.TX3GSUB:
-						newSubtitle.SubtitleSource = SubtitleSource.TX3G;
-						break;
-					case hb_subtitle_s_subsource.UTF8SUB:
-						newSubtitle.SubtitleSource = SubtitleSource.UTF8;
-						break;
-					case hb_subtitle_s_subsource.VOBSUB:
-						newSubtitle.SubtitleSource = SubtitleSource.VobSub;
-						break;
-					case hb_subtitle_s_subsource.PGSSUB:
-						newSubtitle.SubtitleSource = SubtitleSource.PGS;
-						break;
-					default:
-						break;
-				}
-
-				newTitle.Subtitles.Add(newSubtitle);
+		/// <param name="preset">The preset name.</param>
+		/// <param name="tune">The tune name.</param>
+	 private void AddFilterFromPreset(List<hb_filter_object_s> filterList, int filterType, string preset, string tune)
+	 {
+		 IntPtr settingsPtr = HBFunctions.hb_generate_filter_settings(filterType, preset, tune);
 
-				currentSubtitleTrack++;
-			}
-
-			int currentAudioTrack = 1;
-			List<hb_audio_s> audioList = title.list_audio.ToList<hb_audio_s>();
-			foreach (hb_audio_s audio in audioList)
-			{
-				var newAudio = new AudioTrack
-				{
-					TrackNumber = currentAudioTrack,
-					Codec = Converters.NativeToAudioCodec(audio.config.input.codec),
-					CodecId = audio.config.input.codec,
-					Language = audio.config.lang.simple,
-					LanguageCode = audio.config.lang.iso639_2,
-					Description = audio.config.lang.description,
-					ChannelLayout = audio.config.input.channel_layout,
-					SampleRate = audio.config.input.samplerate,
-					Bitrate = audio.config.input.bitrate
-				};
-
-				newTitle.AudioTracks.Add(newAudio);
-
-				currentAudioTrack++;
-			}
-
-			List<hb_chapter_s> chapterList = title.list_chapter.ToList<hb_chapter_s>();
-			foreach (hb_chapter_s chapter in chapterList)
-			{
-				var newChapter = new Chapter
-				{
-					ChapterNumber = chapter.index,
-					Duration = Converters.PtsToTimeSpan(chapter.duration),
-					DurationPts = chapter.duration
-				};
+			hb_filter_object_s filter = InteropUtilities.ToStructureFromPtr<hb_filter_object_s>(HBFunctions.hb_filter_init(filterType));
+		 filter.settings = settingsPtr;
 
-				newTitle.Chapters.Add(newChapter);
-			}
-
-			return newTitle;
-		}
-
-		/// <summary>
-		/// Gets the cropping to use for the given encoding profile and title.
-		/// </summary>
-		/// <param name="profile">The encoding profile to use.</param>
-		/// <param name="title">The title being encoded.</param>
-		/// <returns>The cropping to use for the encode.</returns>
-		private static Cropping GetCropping(EncodingProfile profile, Title title)
-		{
-			Cropping crop;
-			switch (profile.CroppingType)
-			{
-				case CroppingType.Automatic:
-					crop = title.AutoCropDimensions;
-					break;
-				case CroppingType.Custom:
-					crop = profile.Cropping;
-					break;
-				default:
-					crop = new Cropping();
-					break;
-			}
-			return crop;
-		}
-	}
+			filterList.Add(filter);
+	 }
+
+ /// <summary>
+ /// Converts the given filter list to a native list.
+ /// </summary>
+ /// <remarks>Sorts the list by filter ID before converting to a native list, as HB expects it that way.
+ /// The list memory itself will be added to the allocatedMemory list.</remarks>
+ /// <param name="filterList">The filter list to convert.</param>
+ /// <param name="allocatedMemory">The list of allocated memory to add to.</param>
+ /// <returns>The converted list.</returns>
+ private NativeList ConvertFilterListToNative(List<hb_filter_object_s> filterList, List<IntPtr> allocatedMemory)
+ {
+ var filterPtrList = new List<IntPtr>();
+
+ var sortedList = filterList.OrderBy(f => f.id);
+ foreach (var filter in sortedList)
+ {
+ IntPtr filterPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_filter_object_s)));
+ Marshal.StructureToPtr(filter, filterPtr, false);
+
+ allocatedMemory.Add(filterPtr);
+ filterPtrList.Add(filterPtr);
+ }
+
+ NativeList filterListNative = InteropUtilities.ToHandBrakeListFromPtrList(filterPtrList);
+ allocatedMemory.AddRange(filterListNative.AllocatedMemory);
+
+ return filterListNative;
+ }
+
+ /// <summary>
+ /// Gets the title, given the 1-based title number.
+ /// </summary>
+ /// <param name="titleNumber">The number of the title (1-based).</param>
+ /// <returns>The requested Title.</returns>
+ private Title GetTitle(int titleNumber)
+ {
+ return this.Titles.SingleOrDefault(title => title.TitleNumber == titleNumber);
+ }
+
+ /// <summary>
+ /// Gets the 1-based title index of the given title.
+ /// </summary>
+ /// <param name="titleNumber">The 1-based title title number.</param>
+ /// <returns>The 1-based title index.</returns>
+ private int GetTitleIndex(int titleNumber)
+ {
+ Title title = this.GetTitle(titleNumber);
+ return this.GetTitleIndex(title);
+ }
+
+ /// <summary>
+ /// Gets the 1-based title index of the given title.
+ /// </summary>
+ /// <param name="title">The title to look up</param>
+ /// <returns>The 1-based title index of the given title.</returns>
+ private int GetTitleIndex(Title title)
+ {
+ return this.Titles.IndexOf(title) + 1;
+ }
+
+ /// <summary>
+ /// Gets the native title object from the title index.
+ /// </summary>
+ /// <param name="titleIndex">The index of the title (1-based).</param>
+ /// <returns>Gets the native title object for the given index.</returns>
+ private hb_title_s GetOriginalTitle(int titleIndex)
+ {
+ List<hb_title_s> matchingTitles = this.originalTitles.Where(title => title.index == titleIndex).ToList();
+ if (matchingTitles.Count == 0)
+ {
+ throw new ArgumentException("Could not find specified title.");
+ }
+
+ if (matchingTitles.Count > 1)
+ {
+ throw new ArgumentException("Multiple titles matched.");
+ }
+
+ return matchingTitles[0];
+ }
+
+ /// <summary>
+ /// Applies an audio encoding to a native audio encoding base structure.
+ /// </summary>
+ /// <param name="encoding">The encoding to apply.</param>
+ /// <param name="baseStruct">The base native structure.</param>
+ /// <param name="outputTrack">The output track number (0-based).</param>
+ /// <param name="allocatedMemory">The collection of allocated memory.</param>
+ /// <returns>The resulting native audio structure.</returns>
+ private hb_audio_s ConvertAudioBack(AudioEncoding encoding, hb_audio_s baseStruct, int outputTrack, List<IntPtr> allocatedMemory)
+ {
+ hb_audio_s nativeAudio = baseStruct;
+ HBAudioEncoder encoder = Encoders.GetAudioEncoder(encoding.Encoder);
+
+			if (encoder == null)
+			{
+				throw new InvalidOperationException("Could not find audio encoder " + encoding.Name);
+			}
+
+	 bool isPassthrough = encoder.IsPassthrough;
+
+	 HBAudioEncoder inputCodec = Encoders.GetAudioEncoder((int)baseStruct.config.input.codec);
+
+	 uint outputCodec = (uint)encoder.Id;
+	 if (encoding.PassthroughIfPossible && 
+				(encoder.Id == baseStruct.config.input.codec || 
+					inputCodec != null && (inputCodec.ShortName.ToLowerInvariant().Contains("aac") && encoder.ShortName.ToLowerInvariant().Contains("aac") ||
+					inputCodec.ShortName.ToLowerInvariant().Contains("mp3") && encoder.ShortName.ToLowerInvariant().Contains("mp3"))) &&
+				(inputCodec.Id & NativeConstants.HB_ACODEC_PASS_MASK) > 0)
+	 {
+				outputCodec = baseStruct.config.input.codec | NativeConstants.HB_ACODEC_PASS_FLAG;
+		 isPassthrough = true;
+	 }
+
+ nativeAudio.config.output.track = outputTrack;
+			nativeAudio.config.output.codec = outputCodec;
+ nativeAudio.config.output.compression_level = -1;
+ nativeAudio.config.output.samplerate = nativeAudio.config.input.samplerate;
+ nativeAudio.config.output.dither_method = -1;
+
+			if (!isPassthrough)
+ {
+ if (encoding.SampleRateRaw != 0)
+ {
+ nativeAudio.config.output.samplerate = encoding.SampleRateRaw;
+ }
+
+ HBMixdown mixdown = Encoders.GetMixdown(encoding.Mixdown);
+ nativeAudio.config.output.mixdown = mixdown.Id;
+
+ if (encoding.EncodeRateType == AudioEncodeRateType.Bitrate)
+ {
+ // Disable quality targeting.
+ nativeAudio.config.output.quality = -3;
+
+ if (encoding.Bitrate == 0)
+ {
+ // Bitrate of 0 means auto: choose the default for this codec, sample rate and mixdown.
+ nativeAudio.config.output.bitrate = HBFunctions.hb_audio_bitrate_get_default(
+ nativeAudio.config.output.codec,
+ nativeAudio.config.output.samplerate,
+ nativeAudio.config.output.mixdown);
+ }
+ else
+ {
+ nativeAudio.config.output.bitrate = encoding.Bitrate;
+ }
+ }
+ else if (encoding.EncodeRateType == AudioEncodeRateType.Quality)
+ {
+ // Bitrate of -1 signals quality targeting.
+ nativeAudio.config.output.bitrate = -1;
+ nativeAudio.config.output.quality = encoding.Quality;
+ }
+
+ // If this encoder supports compression level, pass it in.
+ if (encoder.SupportsCompression)
+ {
+ nativeAudio.config.output.compression_level = encoding.Compression;
+ }
+
+ nativeAudio.config.output.dynamic_range_compression = encoding.Drc;
+ nativeAudio.config.output.gain = encoding.Gain;
+ }
+
+ if (!string.IsNullOrEmpty(encoding.Name))
+ {
+ IntPtr encodingNamePtr = Marshal.StringToHGlobalAnsi(encoding.Name);
+ nativeAudio.config.output.name = encodingNamePtr;
+ allocatedMemory.Add(encodingNamePtr);
+ }
+
+	 if (nativeAudio.padding == null)
+	 {
+				nativeAudio.padding = new byte[MarshalingConstants.AudioPaddingBytes];
+	 }
+
+ return nativeAudio;
+ }
+
+ /// <summary>
+ /// Converts a native title to a Title object.
+ /// </summary>
+ /// <param name="title">The native title structure.</param>
+ /// <returns>The managed Title object.</returns>
+ private Title ConvertTitle(hb_title_s title)
+ {
+ var newTitle = new Title
+ {
+ TitleNumber = title.index,
+ Playlist = title.playlist,
+ Resolution = new Size(title.width, title.height),
+ ParVal = new Size(title.pixel_aspect_width, title.pixel_aspect_height),
+ Duration = Converters.Converters.PtsToTimeSpan(title.duration),
+ DurationPts = title.duration,
+ AutoCropDimensions = new Cropping
+ {
+ Top = title.crop[0],
+ Bottom = title.crop[1],
+ Left = title.crop[2],
+ Right = title.crop[3]
+ },
+ AspectRatio = title.aspect,
+ AngleCount = title.angle_count,
+ VideoCodecName = title.video_codec_name,
+ Framerate = ((double)title.rate) / title.rate_base,
+ FramerateNumerator = title.rate,
+ FramerateDenominator = title.rate_base,
+ Path = Encoding.UTF8.GetString(title.path).TrimEnd('\0')
+ };
+
+ switch (title.type)
+ {
+ case hb_title_type_anon.HB_STREAM_TYPE:
+ newTitle.InputType = InputType.Stream;
+ break;
+ case hb_title_type_anon.HB_DVD_TYPE:
+ newTitle.InputType = InputType.Dvd;
+ break;
+ case hb_title_type_anon.HB_BD_TYPE:
+ newTitle.InputType = InputType.Bluray;
+ break;
+ }
+
+ int currentSubtitleTrack = 1;
+ List<hb_subtitle_s> subtitleList = title.list_subtitle.ToListFromHandBrakeList<hb_subtitle_s>();
+ foreach (hb_subtitle_s subtitle in subtitleList)
+ {
+ var newSubtitle = new Subtitle
+ {
+ TrackNumber = currentSubtitleTrack,
+ Language = subtitle.lang,
+ LanguageCode = subtitle.iso639_2
+ };
+
+ if (subtitle.format == hb_subtitle_s_subtype.PICTURESUB)
+ {
+ newSubtitle.SubtitleType = SubtitleType.Picture;
+ }
+ else if (subtitle.format == hb_subtitle_s_subtype.TEXTSUB)
+ {
+ newSubtitle.SubtitleType = SubtitleType.Text;
+ }
+
+ newSubtitle.SubtitleSourceInt = (int)subtitle.source;
+
+ switch (subtitle.source)
+ {
+ case hb_subtitle_s_subsource.CC608SUB:
+ newSubtitle.SubtitleSource = SubtitleSource.CC608;
+ break;
+ case hb_subtitle_s_subsource.CC708SUB:
+ newSubtitle.SubtitleSource = SubtitleSource.CC708;
+ break;
+ case hb_subtitle_s_subsource.SRTSUB:
+ newSubtitle.SubtitleSource = SubtitleSource.SRT;
+ break;
+ case hb_subtitle_s_subsource.SSASUB:
+ newSubtitle.SubtitleSource = SubtitleSource.SSA;
+ break;
+ case hb_subtitle_s_subsource.TX3GSUB:
+ newSubtitle.SubtitleSource = SubtitleSource.TX3G;
+ break;
+ case hb_subtitle_s_subsource.UTF8SUB:
+ newSubtitle.SubtitleSource = SubtitleSource.UTF8;
+ break;
+ case hb_subtitle_s_subsource.VOBSUB:
+ newSubtitle.SubtitleSource = SubtitleSource.VobSub;
+ break;
+ case hb_subtitle_s_subsource.PGSSUB:
+ newSubtitle.SubtitleSource = SubtitleSource.PGS;
+ break;
+ default:
+ break;
+ }
+
+ newTitle.Subtitles.Add(newSubtitle);
+
+ currentSubtitleTrack++;
+ }
+
+ int currentAudioTrack = 1;
+ List<hb_audio_s> audioList = title.list_audio.ToListFromHandBrakeList<hb_audio_s>();
+ foreach (hb_audio_s audio in audioList)
+ {
+ var newAudio = new AudioTrack
+ {
+ TrackNumber = currentAudioTrack,
+ Codec = Converters.Converters.NativeToAudioCodec(audio.config.input.codec),
+					CodecParam = audio.config.input.codec_param,
+ CodecId = audio.config.input.codec,
+ Language = audio.config.lang.simple,
+ LanguageCode = audio.config.lang.iso639_2,
+ Description = audio.config.lang.description,
+ ChannelLayout = audio.config.input.channel_layout,
+ SampleRate = audio.config.input.samplerate,
+ Bitrate = audio.config.input.bitrate
+ };
+
+ newTitle.AudioTracks.Add(newAudio);
+
+ currentAudioTrack++;
+ }
+
+ List<hb_chapter_s> chapterList = title.list_chapter.ToListFromHandBrakeList<hb_chapter_s>();
+ foreach (hb_chapter_s chapter in chapterList)
+ {
+ var newChapter = new Chapter
+ {
+ Name = chapter.title,
+ ChapterNumber = chapter.index,
+ Duration = Converters.Converters.PtsToTimeSpan(chapter.duration),
+ DurationPts = chapter.duration
+ };
+
+ newTitle.Chapters.Add(newChapter);
+ }
+
+ return newTitle;
+ }
+
+ /// <summary>
+ /// Gets the cropping to use for the given encoding profile and title.
+ /// </summary>
+ /// <param name="profile">The encoding profile to use.</param>
+ /// <param name="title">The title being encoded.</param>
+ /// <returns>The cropping to use for the encode.</returns>
+ private static Cropping GetCropping(EncodingProfile profile, Title title)
+ {
+ Cropping crop;
+ switch (profile.CroppingType)
+ {
+ case CroppingType.Automatic:
+ crop = title.AutoCropDimensions;
+ break;
+ case CroppingType.Custom:
+ crop = profile.Cropping;
+ break;
+ default:
+ crop = new Cropping();
+ break;
+ }
+ return crop;
+ }
+ }
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj Changed

@@ -50,6 +50,7 @@
 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
 <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+ <UseVSHostingProcess>true</UseVSHostingProcess>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
 <OutputPath>bin\x64\Release\</OutputPath>
@@ -100,6 +101,28 @@
 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
 <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
 </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x64' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x64\Debug31\</OutputPath>
+ <DefineConstants>TRACE;DEBUG;X64</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x64</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+ <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x86' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x86\Debug31\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+ <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+ </PropertyGroup>
 <ItemGroup>
 <Reference Include="PresentationCore">
 <RequiredTargetFramework>3.0</RequiredTargetFramework>
@@ -124,26 +147,41 @@
 </Reference>
 </ItemGroup>
 <ItemGroup>
- <Compile Include="Converters.cs" />
+ <Compile Include="Attributes\ShortName.cs" />
+ <Compile Include="Converters\Converters.cs" />
 <Compile Include="EventArgs\EncodeCompletedEventArgs.cs" />
 <Compile Include="EventArgs\EncodeProgressEventArgs.cs" />
 <Compile Include="HandBrakeUtils.cs" />
 <Compile Include="HandBrakeInstance.cs" />
+ <Compile Include="HbLib\HBDelegates.cs" />
 <Compile Include="HbLib\HBFunctions.cs" />
 <Compile Include="HbLib\hb_audio.cs" />
 <Compile Include="HbLib\hb_chapter_s.cs" />
- <Compile Include="HbLib\hb_filter.cs" />
- <Compile Include="HbLib\hb_handle_s.cs" />
+ <Compile Include="HbLib\hb_container_s.cs" />
+ <Compile Include="HbLib\hb_encoder_s.cs" />
+ <Compile Include="HbLib\hb_error_code.cs" />
+ <Compile Include="HbLib\hb_filter_ids.cs" />
+ <Compile Include="HbLib\hb_filter_object_s.cs" />
+ <Compile Include="HbLib\hb_geometry.cs" />
+ <Compile Include="HbLib\hb_mixdown_s.cs" />
+ <Compile Include="HbLib\hb_rate_s.cs" />
+ <Compile Include="HbLib\hb_state_s.cs" />
 <Compile Include="HbLib\hb_subtitle.cs" />
- <Compile Include="HbLib\Misc.cs" />
+ <Compile Include="HbLib\hb_subtitle_config_s.cs" />
+ <Compile Include="HbLib\hb_title_set_s.cs" />
+ <Compile Include="HbLib\iso639_lang_t.cs" />
 <Compile Include="HbLib\hb_job_s.cs" />
 <Compile Include="HbLib\hb_title_s.cs" />
 <Compile Include="HbLib\NativeConstants.cs" />
 <Compile Include="Interfaces\IHandBrakeInstance.cs" />
- <Compile Include="InteropUtilities.cs" />
- <Compile Include="Language.cs" />
- <Compile Include="LanguageCodes.cs" />
- <Compile Include="MarshalingConstants.cs" />
+ <Compile Include="Helpers\InteropUtilities.cs" />
+ <Compile Include="Model\Encoding\PictureRotation.cs" />
+ <Compile Include="Model\Encoding\x265\x265Preset.cs" />
+ <Compile Include="Model\Encoding\x265\x265Profile.cs" />
+ <Compile Include="Model\Encoding\x265\x265Tune.cs" />
+ <Compile Include="Model\Language.cs" />
+ <Compile Include="Helpers\Languages.cs" />
+ <Compile Include="Helpers\MarshalingConstants.cs" />
 <Compile Include="EventArgs\MessageLoggedEventArgs.cs" />
 <Compile Include="Model\Cropping.cs" />
 <Compile Include="Model\EncodeJob.cs" />
@@ -159,11 +197,15 @@
 <Compile Include="Model\Encoding\Denoise.cs" />
 <Compile Include="Model\Encoding\Detelecine.cs" />
 <Compile Include="Model\Encoding\EncodingProfile.cs" />
+ <Compile Include="Model\Encoding\HBContainer.cs" />
 <Compile Include="Model\Encoding\HBMixdown.cs" />
+ <Compile Include="Model\Encoding\HBRate.cs" />
 <Compile Include="Model\Encoding\HBVideoEncoder.cs" />
 <Compile Include="Model\Encoding\Mixdown.cs" />
 <Compile Include="Model\Encoding\OutputExtension.cs" />
 <Compile Include="Model\Encoding\Container.cs" />
+ <Compile Include="Model\Encoding\QsvPreset.cs" />
+ <Compile Include="Model\Encoding\ScaleMethod.cs" />
 <Compile Include="Model\Encoding\VideoEncoder.cs" />
 <Compile Include="Model\Encoding\VideoEncodeRateType.cs" />
 <Compile Include="Model\Encoding\x264\x264Preset.cs" />
@@ -176,8 +218,9 @@
 <Compile Include="Model\SourceType.cs" />
 <Compile Include="Model\SrtSubtitle.cs" />
 <Compile Include="Model\Subtitles.cs" />
+ <Compile Include="Model\VideoQualityLimits.cs" />
 <Compile Include="Model\VideoRangeType.cs" />
- <Compile Include="NativeList.cs" />
+ <Compile Include="Helpers\NativeList.cs" />
 <Compile Include="Properties\AssemblyInfo.cs" />
 <Compile Include="EventArgs\ScanProgressEventArgs.cs" />
 <Compile Include="SourceData\AudioCodec.cs" />
@@ -188,7 +231,7 @@
 <Compile Include="SourceData\SubtitleSource.cs" />
 <Compile Include="SourceData\SubtitleType.cs" />
 <Compile Include="SourceData\Title.cs" />
- <Compile Include="Utilities.cs" />
+ <Compile Include="Helpers\Utilities.cs" />
 </ItemGroup>
 <ItemGroup>
 <BootstrapperPackage Include="Microsoft.Net.Client.3.5">

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs Changed

@@ -9,327 +9,374 @@
 
 namespace HandBrake.Interop
 {
-	using System;
-	using System.Collections.Generic;
-	using System.Runtime.InteropServices;
-
-	using HandBrake.Interop.EventArgs;
-	using HandBrake.Interop.HbLib;
-	using HandBrake.Interop.Model;
-	using HandBrake.Interop.Model.Encoding;
-	using HandBrake.Interop.SourceData;
-
-	/// <summary>
-	/// HandBrake Interop Utilities
-	/// </summary>
-	public static class HandBrakeUtils
-	{
-		/// <summary>
-		/// Estimated overhead in bytes for each frame in output container.
-		/// </summary>
-		internal const int ContainerOverheadPerFrame = 6;
-
-		/// <summary>
-		/// The callback for log messages from HandBrake.
-		/// </summary>
-		private static LoggingCallback loggingCallback;
-
-		/// <summary>
-		/// The callback for error messages from HandBrake.
-		/// </summary>
-		private static LoggingCallback errorCallback;
-
-		/// <summary>
-		/// Fires when HandBrake has logged a message.
-		/// </summary>
-		public static event EventHandler<MessageLoggedEventArgs> MessageLogged;
-
-		/// <summary>
-		/// Fires when HandBrake has logged an error.
-		/// </summary>
-		public static event EventHandler<MessageLoggedEventArgs> ErrorLogged;
-
-		/// <summary>
-		/// Enables or disables LibDVDNav. If disabled libdvdread will be used instead.
-		/// </summary>
-		/// <param name="enableDvdNav">True to enable LibDVDNav.</param>
-		public static void SetDvdNav(bool enableDvdNav)
-		{
-			HBFunctions.hb_dvd_set_dvdnav(enableDvdNav ? 1 : 0);
-		}
-
-		/// <summary>
-		/// Call before app shutdown. Performs global cleanup.
-		/// </summary>
-		public static void DisposeGlobal()
-		{
-			HBFunctions.hb_global_close();
-		}
-
-		/// <summary>
-		/// Register the logger.
-		/// </summary>
-		public static void RegisterLogger()
-		{
-			// Register the logger if we have not already
-			if (loggingCallback == null)
-			{
-				// Keep the callback as a member to prevent it from being garbage collected.
-				loggingCallback = new LoggingCallback(LoggingHandler);
-				errorCallback = new LoggingCallback(ErrorHandler);
-				HBFunctions.hb_register_logger(loggingCallback);
-				HBFunctions.hb_register_error_handler(errorCallback);
-			}
-		}
-
-		/// <summary>
-		/// Handles log messages from HandBrake.
-		/// </summary>
-		/// <param name="message">The log message (including newline).</param>
-		public static void LoggingHandler(string message)
-		{
-			if (!string.IsNullOrEmpty(message))
-			{
-				string[] messageParts = message.Split(new string[] { "\n" }, StringSplitOptions.RemoveEmptyEntries);
-
-				if (messageParts.Length > 0)
-				{
-					if (MessageLogged != null)
-					{
-						MessageLogged(null, new MessageLoggedEventArgs { Message = messageParts[0] });
-					}
-
-					System.Diagnostics.Debug.WriteLine(messageParts[0]);
-				}
-			}
-		}
-
-		/// <summary>
-		/// Handles errors from HandBrake.
-		/// </summary>
-		/// <param name="message">The error message.</param>
-		public static void ErrorHandler(string message)
-		{
-			if (!string.IsNullOrEmpty(message))
-			{
-				// This error happens in normal operations. Log it as a message.
-				if (message == "dvd: ifoOpen failed")
-				{
-					if (MessageLogged != null)
-					{
-						MessageLogged(null, new MessageLoggedEventArgs { Message = message });
-					}
-
-					return;
-				}
-
-				if (ErrorLogged != null)
-				{
-					ErrorLogged(null, new MessageLoggedEventArgs { Message = message });
-				}
-
-				System.Diagnostics.Debug.WriteLine("ERROR: " + message);
-			}
-		}
-
-		/// <summary>
-		/// Gets the standard x264 option name given the starting point.
-		/// </summary>
-		/// <returns>The standard x264 option name.</returns>
-		public static string SanitizeX264OptName(string name)
-		{
-			IntPtr namePtr = Marshal.StringToHGlobalAnsi(name);
-			string sanitizedName = Marshal.PtrToStringAnsi(HBFunctions.hb_x264_encopt_name(namePtr));
-			Marshal.FreeHGlobal(namePtr);
-			return sanitizedName;
-		}
-
-		/// <summary>
-		/// Checks to see if the given H.264 level is valid given the inputs.
-		/// </summary>
-		/// <param name="level">The level to check.</param>
-		/// <param name="width">The output picture width.</param>
-		/// <param name="height">The output picture height.</param>
-		/// <param name="fpsNumerator">The rate numerator.</param>
-		/// <param name="fpsDenominator">The rate denominator.</param>
-		/// <param name="interlaced">True if x264 interlaced output is enabled.</param>
-		/// <param name="fakeInterlaced">True if x264 fake interlacing is enabled.</param>
-		/// <returns>True if the level is valid.</returns>
-		public static bool IsH264LevelValid(string level, int width, int height, int fpsNumerator, int fpsDenominator, bool interlaced, bool fakeInterlaced)
-		{
-			return HBFunctions.hb_check_h264_level(
-				level, 
-				width, 
-				height, 
-				fpsNumerator, 
-				fpsDenominator, 
-				interlaced ? 1 : 0,
-				fakeInterlaced ? 1 : 0) == 0;
-		}
-
-		/// <summary>
-		/// Creates an X264 options string from the given settings.
-		/// </summary>
-		/// <param name="preset">The x264 preset.</param>
-		/// <param name="tunes">The x264 tunes being used.</param>
-		/// <param name="extraOptions">The extra options string.</param>
-		/// <param name="profile">The H.264 profile.</param>
-		/// <param name="level">The H.264 level.</param>
-		/// <param name="width">The width of the final picture.</param>
-		/// <param name="height">The height of the final picture.</param>
-		/// <returns>The full x264 options string from the given inputs.</returns>
-		public static string CreateX264OptionsString(
-			string preset, 
-			IList<string> tunes, 
-			string extraOptions, 
-			string profile,
-			string level, 
-			int width, 
-			int height)
-		{
-			if (width <= 0)
-			{
-				throw new ArgumentException("width must be positive.");
-			}
-
-			if (height <= 0)
-			{
-				throw new ArgumentException("height must be positive.");
-			}
-
-		 HBFunctions.hb_init(0, 0);
- IntPtr ptr = HBFunctions.hb_x264_param_unparse(
-				preset,
-				string.Join(",", tunes),
-				extraOptions,
-				profile,
-				level,
-				width,
-				height);
+ using System;
+ using System.Collections.Generic;
+ using System.Runtime.InteropServices;
+
+ using HandBrake.Interop.EventArgs;
+ using HandBrake.Interop.HbLib;
+ using HandBrake.Interop.Model;
+ using HandBrake.Interop.Model.Encoding;
+ using HandBrake.Interop.SourceData;
+
+ /// <summary>
+ /// HandBrake Interop Utilities
+ /// </summary>
+ public static class HandBrakeUtils
+ {
+ /// <summary>
+ /// Estimated overhead in bytes for each frame in output container.
+ /// </summary>
+ internal const int ContainerOverheadPerFrame = 6;
+
+ /// <summary>
+ /// The callback for log messages from HandBrake.
+ /// </summary>
+ private static LoggingCallback loggingCallback;
+
+ /// <summary>
+ /// The callback for error messages from HandBrake.
+ /// </summary>
+ private static LoggingCallback errorCallback;
+
+ /// <summary>
+ /// True if the global initialize function has been called.
+ /// </summary>
+ private static bool globalInitialized;
+
+ /// <summary>
+ /// Fires when HandBrake has logged a message.
+ /// </summary>
+ public static event EventHandler<MessageLoggedEventArgs> MessageLogged;
+
+ /// <summary>
+ /// Fires when HandBrake has logged an error.
+ /// </summary>
+ public static event EventHandler<MessageLoggedEventArgs> ErrorLogged;
+
+ /// <summary>
+ /// Initializes static members of the HandBrakeUtils class.
+ /// </summary>
+ static HandBrakeUtils()
+ {
+ if (!globalInitialized)
+ {
+ if (HBFunctions.hb_global_init() == -1)
+ {
+ throw new InvalidOperationException("HB global init failed.");
+ }
+
+ globalInitialized = true;
+ }
+ }
+
+ /// <summary>
+ /// Ensures the HB global initialize method has been called.
+ /// </summary>
+ public static void EnsureGlobalInit()
+ {
+ // Does nothing, but invokes static ctor.
+ }
+
+ /// <summary>
+ /// Enables or disables LibDVDNav. If disabled libdvdread will be used instead.
+ /// </summary>
+ /// <param name="enableDvdNav">True to enable LibDVDNav.</param>
+ public static void SetDvdNav(bool enableDvdNav)
+ {
+ HBFunctions.hb_dvd_set_dvdnav(enableDvdNav ? 1 : 0);
+ }
+
+ /// <summary>
+ /// Call before app shutdown. Performs global cleanup.
+ /// </summary>
+ public static void DisposeGlobal()
+ {
+ HBFunctions.hb_global_close();
+ }
+
+ /// <summary>
+ /// Register the logger.
+ /// </summary>
+ public static void RegisterLogger()
+ {
+ // Register the logger if we have not already
+ if (loggingCallback == null)
+ {
+ // Keep the callback as a member to prevent it from being garbage collected.
+ loggingCallback = LoggingHandler;
+ errorCallback = ErrorHandler;
+ HBFunctions.hb_register_logger(loggingCallback);
+ HBFunctions.hb_register_error_handler(errorCallback);
+ }
+ }
+
+ /// <summary>
+ /// Handles log messages from HandBrake.
+ /// </summary>
+ /// <param name="message">The log message (including newline).</param>
+ public static void LoggingHandler(string message)
+ {
+ if (!string.IsNullOrEmpty(message))
+ {
+ string[] messageParts = message.Split(new[] { "\n" }, StringSplitOptions.RemoveEmptyEntries);
+
+ if (messageParts.Length > 0)
+ {
+ message = messageParts[0];
+ SendMessageEvent(message);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Handles errors from HandBrake.
+ /// </summary>
+ /// <param name="message">The error message.</param>
+ public static void ErrorHandler(string message)
+ {
+ if (!string.IsNullOrEmpty(message))
+ {
+ // These errors happen in normal operations. Log them as messages.
+				if (message == "dvd: ifoOpen failed" || message.Contains("avformat_seek_file failed") || message.Contains("nav_get_title_list"))
+ {
+ SendMessageEvent(message);
+ return;
+ }
+
+ SendErrorEvent(message);
+ }
+ }
+
+ /// <summary>
+ /// Gets the standard x264 option name given the starting point.
+ /// </summary>
+ /// <param name="name">
+ /// The name.
+ /// </param>
+ /// <returns>
+ /// The standard x264 option name.
+ /// </returns>
+ public static string SanitizeX264OptName(string name)
+ {
+ IntPtr namePtr = Marshal.StringToHGlobalAnsi(name);
+ string sanitizedName = Marshal.PtrToStringAnsi(HBFunctions.hb_x264_encopt_name(namePtr));
+ Marshal.FreeHGlobal(namePtr);
+ return sanitizedName;
+ }
+
+ /// <summary>
+ /// Checks to see if the given H.264 level is valid given the inputs.
+ /// </summary>
+ /// <param name="level">The level to check.</param>
+ /// <param name="width">The output picture width.</param>
+ /// <param name="height">The output picture height.</param>
+ /// <param name="fpsNumerator">The rate numerator.</param>
+ /// <param name="fpsDenominator">The rate denominator.</param>
+ /// <param name="interlaced">True if x264 interlaced output is enabled.</param>
+ /// <param name="fakeInterlaced">True if x264 fake interlacing is enabled.</param>
+ /// <returns>True if the level is valid.</returns>
+ public static bool IsH264LevelValid(string level, int width, int height, int fpsNumerator, int fpsDenominator, bool interlaced, bool fakeInterlaced)
+ {
+ return HBFunctions.hb_check_h264_level(
+ level,
+ width,
+ height,
+ fpsNumerator,
+ fpsDenominator,
+ interlaced ? 1 : 0,
+ fakeInterlaced ? 1 : 0) == 0;
+ }
+
+ /// <summary>
+ /// Creates an X264 options string from the given settings.
+ /// </summary>
+ /// <param name="preset">The x264 preset.</param>
+ /// <param name="tunes">The x264 tunes being used.</param>
+ /// <param name="extraOptions">The extra options string.</param>
+ /// <param name="profile">The H.264 profile.</param>
+ /// <param name="level">The H.264 level.</param>
+ /// <param name="width">The width of the final picture.</param>
+ /// <param name="height">The height of the final picture.</param>
+ /// <returns>The full x264 options string from the given inputs.</returns>
+ public static string CreateX264OptionsString(
+ string preset,
+ IList<string> tunes,
+ string extraOptions,
+ string profile,
+ string level,
+ int width,
+ int height)
+ {
+ if (width <= 0)
+ {
+ throw new ArgumentException("width must be positive.");
+ }
+
+ if (height <= 0)
+ {
+ throw new ArgumentException("height must be positive.");
+ }
 
-		 string x264Settings = Marshal.PtrToStringAnsi(ptr);
+ IntPtr ptr = HBFunctions.hb_x264_param_unparse(
+ preset,
+ string.Join(",", tunes),
+ extraOptions,
+ profile,
+ level,
+ width,
+ height);
 
+ string x264Settings = Marshal.PtrToStringAnsi(ptr);
 
 return x264Settings;
-		}
-
-		/// <summary>
-		/// Gets the total number of seconds on the given encode job.
-		/// </summary>
-		/// <param name="job">The encode job to query.</param>
-		/// <param name="title">The title being encoded.</param>
-		/// <returns>The total number of seconds of video to encode.</returns>
-		internal static double GetJobLengthSeconds(EncodeJob job, Title title)
-		{
-			switch (job.RangeType)
-			{
-				case VideoRangeType.All:
-					return title.Duration.TotalSeconds;
-				case VideoRangeType.Chapters:
-					TimeSpan duration = TimeSpan.Zero;
-					for (int i = job.ChapterStart; i <= job.ChapterEnd; i++)
-					{
-						duration += title.Chapters[i - 1].Duration;
-					}
-
-					return duration.TotalSeconds;
-				case VideoRangeType.Seconds:
-					return job.SecondsEnd - job.SecondsStart;
-				case VideoRangeType.Frames:
-					return (job.FramesEnd - job.FramesStart) / title.Framerate;
-			}
-
-			return 0;
-		}
-
-		/// <summary>
-		/// Gets the number of audio samples used per frame for the given audio encoder.
-		/// </summary>
-		/// <param name="encoderName">The encoder to query.</param>
-		/// <returns>The number of audio samples used per frame for the given
-		/// audio encoder.</returns>
-		internal static int GetAudioSamplesPerFrame(string encoderName)
-		{
-			switch (encoderName)
-			{
-				case "faac":
-				case "ffaac":
-				case "copy:aac":
-				case "vorbis":
-					return 1024;
-				case "lame":
-				case "copy:mp3":
-					return 1152;
-				case "ffac3":
-				case "copy":
-				case "copy:ac3":
-				case "copy:dts":
-				case "copy:dtshd":
-					return 1536;
-			}
-
-			// Unknown encoder; make a guess.
-			return 1536;
-		}
-
-		/// <summary>
-		/// Gets the size in bytes for the audio with the given parameters.
-		/// </summary>
-		/// <param name="job">The encode job.</param>
-		/// <param name="lengthSeconds">The length of the encode in seconds.</param>
-		/// <param name="title">The title to encode.</param>
-		/// <param name="outputTrackList">The list of tracks to encode.</param>
-		/// <returns>The size in bytes for the audio with the given parameters.</returns>
-		internal static long GetAudioSize(EncodeJob job, double lengthSeconds, Title title, List<Tuple<AudioEncoding, int>> outputTrackList)
-		{
-			long audioBytes = 0;
-
-			foreach (Tuple<AudioEncoding, int> outputTrack in outputTrackList)
-			{
-				AudioEncoding encoding = outputTrack.Item1;
-				AudioTrack track = title.AudioTracks[outputTrack.Item2 - 1];
-
-				int samplesPerFrame = HandBrakeUtils.GetAudioSamplesPerFrame(encoding.Encoder);
-				int audioBitrate;
-
-				HBAudioEncoder audioEncoder = Encoders.GetAudioEncoder(encoding.Encoder);
-
-				if (audioEncoder.IsPassthrough)
-				{
-					// Input bitrate is in bits/second.
-					audioBitrate = track.Bitrate / 8;
-				}
-				else if (encoding.EncodeRateType == AudioEncodeRateType.Quality)
-				{
-					// Can't predict size of quality targeted audio encoding.
-					audioBitrate = 0;
-				}
-				else
-				{
-					int outputBitrate;
-					if (encoding.Bitrate > 0)
-					{
-						outputBitrate = encoding.Bitrate;
-					}
-					else
-					{
-						outputBitrate = Encoders.GetDefaultBitrate(
-							audioEncoder,
-							encoding.SampleRateRaw == 0 ? track.SampleRate : encoding.SampleRateRaw,
-							Encoders.SanitizeMixdown(Encoders.GetMixdown(encoding.Mixdown), audioEncoder, track.ChannelLayout));
-					}
-
-					// Output bitrate is in kbps.
-					audioBitrate = outputBitrate * 1000 / 8;
-				}
-
-				audioBytes += (long)(lengthSeconds * audioBitrate);
-
-				// Audio overhead
-				audioBytes += encoding.SampleRateRaw * ContainerOverheadPerFrame / samplesPerFrame;
-			}
-
-			return audioBytes;
-		}
-	}
+ }
+
+ /// <summary>
+ /// Gets the total number of seconds on the given encode job.
+ /// </summary>
+ /// <param name="job">The encode job to query.</param>
+ /// <param name="title">The title being encoded.</param>
+ /// <returns>The total number of seconds of video to encode.</returns>
+ internal static double GetJobLengthSeconds(EncodeJob job, Title title)
+ {
+ switch (job.RangeType)
+ {
+ case VideoRangeType.All:
+ return title.Duration.TotalSeconds;
+ case VideoRangeType.Chapters:
+ TimeSpan duration = TimeSpan.Zero;
+ for (int i = job.ChapterStart; i <= job.ChapterEnd; i++)
+ {
+ duration += title.Chapters[i - 1].Duration;
+ }
+
+ return duration.TotalSeconds;
+ case VideoRangeType.Seconds:
+ return job.SecondsEnd - job.SecondsStart;
+ case VideoRangeType.Frames:
+ return (job.FramesEnd - job.FramesStart) / title.Framerate;
+ }
+
+ return 0;
+ }
+
+ /// <summary>
+ /// Gets the number of audio samples used per frame for the given audio encoder.
+ /// </summary>
+ /// <param name="encoderName">The encoder to query.</param>
+ /// <returns>The number of audio samples used per frame for the given
+ /// audio encoder.</returns>
+ internal static int GetAudioSamplesPerFrame(string encoderName)
+ {
+ switch (encoderName)
+ {
+ case "faac":
+ case "ffaac":
+ case "copy:aac":
+ case "vorbis":
+ return 1024;
+ case "lame":
+ case "copy:mp3":
+ return 1152;
+ case "ffac3":
+ case "copy":
+ case "copy:ac3":
+ case "copy:dts":
+ case "copy:dtshd":
+ return 1536;
+ }
+
+ // Unknown encoder; make a guess.
+ return 1536;
+ }
+
+ /// <summary>
+ /// Gets the size in bytes for the audio with the given parameters.
+ /// </summary>
+ /// <param name="job">The encode job.</param>
+ /// <param name="lengthSeconds">The length of the encode in seconds.</param>
+ /// <param name="title">The title to encode.</param>
+ /// <param name="outputTrackList">The list of tracks to encode.</param>
+ /// <returns>The size in bytes for the audio with the given parameters.</returns>
+ internal static long GetAudioSize(EncodeJob job, double lengthSeconds, Title title, List<Tuple<AudioEncoding, int>> outputTrackList)
+ {
+ long audioBytes = 0;
+
+ foreach (Tuple<AudioEncoding, int> outputTrack in outputTrackList)
+ {
+ AudioEncoding encoding = outputTrack.Item1;
+ AudioTrack track = title.AudioTracks[outputTrack.Item2 - 1];
+
+ int samplesPerFrame = HandBrakeUtils.GetAudioSamplesPerFrame(encoding.Encoder);
+ int audioBitrate;
+
+ HBAudioEncoder audioEncoder = Encoders.GetAudioEncoder(encoding.Encoder);
+
+ if (audioEncoder.IsPassthrough)
+ {
+ // Input bitrate is in bits/second.
+ audioBitrate = track.Bitrate / 8;
+ }
+ else if (encoding.EncodeRateType == AudioEncodeRateType.Quality)
+ {
+ // Can't predict size of quality targeted audio encoding.
+ audioBitrate = 0;
+ }
+ else
+ {
+ int outputBitrate;
+ if (encoding.Bitrate > 0)
+ {
+ outputBitrate = encoding.Bitrate;
+ }
+ else
+ {
+ outputBitrate = Encoders.GetDefaultBitrate(
+ audioEncoder,
+ encoding.SampleRateRaw == 0 ? track.SampleRate : encoding.SampleRateRaw,
+ Encoders.SanitizeMixdown(Encoders.GetMixdown(encoding.Mixdown), audioEncoder, track.ChannelLayout));
+ }
+
+ // Output bitrate is in kbps.
+ audioBitrate = outputBitrate * 1000 / 8;
+ }
+
+ audioBytes += (long)(lengthSeconds * audioBitrate);
+
+ // Audio overhead
+ audioBytes += encoding.SampleRateRaw * ContainerOverheadPerFrame / samplesPerFrame;
+ }
+
+ return audioBytes;
+ }
+
+ /// <summary>
+ /// Sends the message logged event to any registered listeners.
+ /// </summary>
+ /// <param name="message">The message to send.</param>
+ private static void SendMessageEvent(string message)
+ {
+ if (MessageLogged != null)
+ {
+ MessageLogged(null, new MessageLoggedEventArgs { Message = message });
+ }
+
+ System.Diagnostics.Debug.WriteLine(message);
+ }
+
+ /// <summary>
+ /// Sends the error logged event to any registered listeners.
+ /// </summary>
+ /// <param name="message">The message to send</param>
+ private static void SendErrorEvent(string message)
+ {
+ if (ErrorLogged != null)
+ {
+ ErrorLogged(null, new MessageLoggedEventArgs { Message = message });
+ }
+
+ System.Diagnostics.Debug.WriteLine("ERROR: " + message);
+ }
+ }
 }

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HBDelegates.cs Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs Changed

@@ -13,6 +13,9 @@
 	using System;
 	using System.Runtime.InteropServices;
 
+	/// <summary>
+	/// Contains p-invoke function declarations to hblib.
+	/// </summary>
 	public static class HBFunctions
 	{
 		[DllImport("hb.dll", EntryPoint = "hb_register_logger", CallingConvention = CallingConvention.Cdecl)]
@@ -21,6 +24,9 @@
 		[DllImport("hb.dll", EntryPoint = "hb_register_error_handler", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void hb_register_error_handler(LoggingCallback callback);
 
+		[DllImport("hb.dll", EntryPoint = "hb_global_init", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_global_init();
+
 		/// Return Type: hb_handle_t*
 		///verbose: int
 		///update_check: int
@@ -38,20 +44,20 @@
 		/// Return Type: char*
 		///param0: hb_handle_t*
 		[DllImport("hb.dll", EntryPoint = "hb_get_version", CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr hb_get_version(ref hb_handle_s param0);
+		public static extern IntPtr hb_get_version(IntPtr hbHandle);
 
 
 		/// Return Type: int
 		///param0: hb_handle_t*
 		[DllImport("hb.dll", EntryPoint = "hb_get_build", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_get_build(ref hb_handle_s param0);
+		public static extern int hb_get_build(IntPtr hbHandle);
 
 
 		/// Return Type: int
 		///h: hb_handle_t*
 		///version: char**
 		[DllImport("hb.dll", EntryPoint = "hb_check_update", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_check_update(ref hb_handle_s h, ref IntPtr version);
+		public static extern int hb_check_update(IntPtr handle, ref IntPtr version);
 
 
 		/// Return Type: char*
@@ -73,7 +79,7 @@
 		///preview_count: int
 		///store_previews: int
 		[DllImport("hb.dll", EntryPoint = "hb_scan", CallingConvention = CallingConvention.Cdecl)]
-		public static extern void hb_scan(IntPtr hbHandle, [In] [MarshalAs(UnmanagedType.LPStr)] string path, int title_index, int preview_count, int store_previews, ulong min_duration);
+		public static extern void hb_scan(IntPtr hbHandle, IntPtr path, int title_index, int preview_count, int store_previews, ulong min_duration);
 
 		[DllImport("hb.dll", EntryPoint = "hb_scan_stop", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void hb_scan_stop(IntPtr hbHandle);
@@ -83,20 +89,6 @@
 		[DllImport("hb.dll", EntryPoint = "hb_get_titles", CallingConvention = CallingConvention.Cdecl)]
 		public static extern IntPtr hb_get_titles(IntPtr hbHandle);
 
-
-		/// Return Type: int
-		///buf: hb_buffer_t*
-		///width: int
-		///height: int
-		///color_equal: int
-		///color_diff: int
-		///threshold: int
-		///prog_equal: int
-		///prog_diff: int
-		///prog_threshold: int
-		[DllImport("hb.dll", EntryPoint = "hb_detect_comb", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_detect_comb(ref hb_buffer_s buf, int width, int height, int color_equal, int color_diff, int threshold, int prog_equal, int prog_diff, int prog_threshold);
-
 		/// Return Type: void
 		///param0: hb_handle_t*
 		///param1: hb_title_t*
@@ -122,6 +114,9 @@
 		[DllImport("hb.dll", EntryPoint = "hb_set_anamorphic_size", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void hb_set_anamorphic_size(ref hb_job_s job, ref int output_width, ref int output_height, ref int output_par_width, ref int output_par_height);
 
+ [DllImport("hb.dll", EntryPoint = "hb_set_anamorphic_size2", CallingConvention = CallingConvention.Cdecl)]
+ public static extern void hb_set_anamorphic_size2(ref hb_geometry_s sourceGeometry, ref hb_ui_geometry_s uiGeometry, ref hb_geometry_s result);
+ 
 
 		/// Return Type: int
 		///param0: hb_handle_t*
@@ -186,13 +181,13 @@
 		///param0: hb_handle_t*
 		///param1: hb_state_t*
 		[DllImport("hb.dll", EntryPoint = "hb_get_state2", CallingConvention = CallingConvention.Cdecl)]
-		public static extern void hb_get_state2(ref hb_handle_s param0, ref hb_state_s param1);
+		public static extern void hb_get_state2(IntPtr hbHandle, ref hb_state_s param1);
 
 
 		/// Return Type: int
 		///param0: hb_handle_t*
 		[DllImport("hb.dll", EntryPoint = "hb_get_scancount", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_get_scancount(ref hb_handle_s param0);
+		public static extern int hb_get_scancount(IntPtr hbHandle);
 
 
 		/// Return Type: void
@@ -203,88 +198,205 @@
 		[DllImport("hb.dll", EntryPoint = "hb_global_close", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void hb_global_close();
 
+		//hb_list_t * hb_list_init();
+		[DllImport("hb.dll", EntryPoint = "hb_list_init", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_list_init();
+
+		//int hb_list_count( const hb_list_t * );
+		[DllImport("hb.dll", EntryPoint = "hb_list_count", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_list_count(IntPtr listPtr);
+
+		//void hb_list_add( hb_list_t *, void * );
+		[DllImport("hb.dll", EntryPoint = "hb_list_add", CallingConvention = CallingConvention.Cdecl)]
+		public static extern void hb_list_add(IntPtr listPtr, IntPtr item);
+
+		//void hb_list_insert( hb_list_t * l, int pos, void * p );
+		[DllImport("hb.dll", EntryPoint = "hb_list_insert", CallingConvention = CallingConvention.Cdecl)]
+		public static extern void hb_list_insert(IntPtr listPtr, int pos, IntPtr item);
+
+		//void hb_list_rem( hb_list_t *, void * );
+		[DllImport("hb.dll", EntryPoint = "hb_list_rem", CallingConvention = CallingConvention.Cdecl)]
+		public static extern void hb_list_rem(IntPtr listPtr, IntPtr item);
+
+		//void * hb_list_item( const hb_list_t *, int );
+		[DllImport("hb.dll", EntryPoint = "hb_list_item", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_list_item(IntPtr listPtr, int itemIndex);
+
+		//void hb_list_close( hb_list_t ** );
+		[DllImport("hb.dll", EntryPoint = "hb_list_close", CallingConvention = CallingConvention.Cdecl)]
+		public static extern void hb_list_close(IntPtr listPtrPtr);
+
+
 		[DllImport("hb.dll", EntryPoint = "hb_subtitle_add", CallingConvention = CallingConvention.Cdecl)]
 		public static extern int hb_subtitle_add(ref hb_job_s job, ref hb_subtitle_config_s subtitleConfig, int track);
 
 		[DllImport("hb.dll", EntryPoint = "hb_srt_add", CallingConvention = CallingConvention.Cdecl)]
 		public static extern int hb_srt_add(ref hb_job_s job, ref hb_subtitle_config_s subtitleConfig, string lang);
 
+		[DllImport("hb.dll", EntryPoint = "hb_subtitle_can_force", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_subtitle_can_force(int source);
+
+		[DllImport("hb.dll", EntryPoint = "hb_subtitle_can_burn", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_subtitle_can_burn(int source);
+
+		[DllImport("hb.dll", EntryPoint = "hb_subtitle_can_pass", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_subtitle_can_pass(int source, int mux);
+
+
+
+//int hb_video_framerate_get_from_name(const char *name);
+//const char* hb_video_framerate_get_name(int framerate);
+//const char* hb_video_framerate_sanitize_name(const char *name);
+
+		// returns hb_rate_s
+		[DllImport("hb.dll", EntryPoint = "hb_video_framerate_get_next", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_video_framerate_get_next(IntPtr last);
+
+
+//int hb_audio_samplerate_get_best(uint32_t codec, int samplerate, int *sr_shift);
+//int hb_audio_samplerate_get_from_name(const char *name);
+//const char* hb_audio_samplerate_get_name(int samplerate);
+
+		// returns hb_rate_s
+		[DllImport("hb.dll", EntryPoint = "hb_audio_samplerate_get_next", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_audio_samplerate_get_next(IntPtr last);
+
+
+		[DllImport("hb.dll", EntryPoint = "hb_audio_bitrate_get_best", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_audio_bitrate_get_best(uint codec, int bitrate, int samplerate, int mixdown);
+
+		[DllImport("hb.dll", EntryPoint = "hb_audio_bitrate_get_default", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_audio_bitrate_get_default(uint codec, int samplerate, int mixdown);
+
+		[DllImport("hb.dll", EntryPoint = "hb_audio_bitrate_get_limits", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_audio_bitrate_get_limits(uint codec, int samplerate, int mixdown, ref int low, ref int high);
+
+		[DllImport("hb.dll", EntryPoint = "hb_audio_bitrate_get_next", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_audio_bitrate_get_next(IntPtr last);
+
+		[DllImport("hb.dll", EntryPoint = "hb_video_quality_get_limits", CallingConvention = CallingConvention.Cdecl)]
+		public static extern void hb_video_quality_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction);
+
+		[DllImport("hb.dll", EntryPoint = "hb_video_quality_get_name", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_video_quality_get_name(uint codec);
+
+		[DllImport("hb.dll", EntryPoint = "hb_audio_quality_get_limits", CallingConvention = CallingConvention.Cdecl)]
+		public static extern void hb_audio_quality_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction);
+
+//float hb_audio_quality_get_best(uint32_t codec, float quality);
+
+		[DllImport("hb.dll", EntryPoint = "hb_audio_quality_get_default", CallingConvention = CallingConvention.Cdecl)]
+		public static extern float hb_audio_quality_get_default(uint codec);
+
+
+		[DllImport("hb.dll", EntryPoint = "hb_audio_compression_get_limits", CallingConvention = CallingConvention.Cdecl)]
+		public static extern void hb_audio_compression_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction);
+
+//float hb_audio_compression_get_best(uint32_t codec, float compression);
+
+		[DllImport("hb.dll", EntryPoint = "hb_audio_compression_get_default", CallingConvention = CallingConvention.Cdecl)]
+		public static extern float hb_audio_compression_get_default(uint codec);
+
+
+//int hb_audio_dither_get_default();
+//int hb_audio_dither_get_default_method(); // default method, if enabled && supported
+//int hb_audio_dither_is_supported(uint32_t codec);
+//int hb_audio_dither_get_from_name(const char *name);
+//const char* hb_audio_dither_get_description(int method);
+//const hb_dither_t* hb_audio_dither_get_next(const hb_dither_t *last);
+
+		[DllImport("hb.dll", EntryPoint = "hb_audio_can_apply_drc", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_audio_can_apply_drc(uint codec, uint codec_param, int encoder);
 
 		[DllImport("hb.dll", EntryPoint = "hb_mixdown_is_supported", CallingConvention = CallingConvention.Cdecl)]
 		public static extern int hb_mixdown_is_supported(int mixdown, uint codec, ulong layout);
 
-		[DllImport("hb.dll", EntryPoint = "hb_mixdown_has_remix_support", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_mixdown_has_remix_support(int mixdown, ulong layout);
-
 		[DllImport("hb.dll", EntryPoint = "hb_mixdown_has_codec_support", CallingConvention = CallingConvention.Cdecl)]
 		public static extern int hb_mixdown_has_codec_support(int mixdown, uint codec);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_default_mixdown", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_get_default_mixdown(uint codec, ulong layout);
+		[DllImport("hb.dll", EntryPoint = "hb_mixdown_has_remix_support", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_mixdown_has_remix_support(int mixdown, ulong layout);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_best_mixdown", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_get_best_mixdown(uint codec, ulong layout, int mixdown);
+//int hb_mixdown_get_discrete_channel_count(int mixdown);
+//int hb_mixdown_get_low_freq_channel_count(int mixdown);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_best_audio_bitrate", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_get_best_audio_bitrate(uint codec, int bitrate, int samplerate, int mixdown);
+		[DllImport("hb.dll", EntryPoint = "hb_mixdown_get_best", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_mixdown_get_best(uint codec, ulong layout, int mixdown);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_default_audio_bitrate", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_get_default_audio_bitrate(uint codec, int samplerate, int mixdown);
+		[DllImport("hb.dll", EntryPoint = "hb_mixdown_get_default", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_mixdown_get_default(uint codec, ulong layout);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_audio_bitrate_limits", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_get_audio_bitrate_limits(uint codec, int samplerate, int mixdown, ref int low, ref int high);
+//int hb_mixdown_get_from_name(const char *name);
+//const char* hb_mixdown_get_name(int mixdown);
+//const char* hb_mixdown_get_short_name(int mixdown);
+//const char* hb_mixdown_sanitize_name(const char *name);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_audio_quality_limits", CallingConvention = CallingConvention.Cdecl)]
-		public static extern void hb_get_audio_quality_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction);
+		[DllImport("hb.dll", EntryPoint = "hb_mixdown_get_next", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_mixdown_get_next(IntPtr last);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_default_audio_quality", CallingConvention = CallingConvention.Cdecl)]
-		public static extern float hb_get_default_audio_quality(uint codec);
+//int hb_video_encoder_get_default(int muxer);
+//int hb_video_encoder_get_from_name(const char *name);
+//const char* hb_video_encoder_get_name(int encoder);
+//const char* hb_video_encoder_get_short_name(int encoder);
+//const char* hb_video_encoder_get_long_name(int encoder);
+//const char* hb_video_encoder_sanitize_name(const char *name);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_audio_compression_limits", CallingConvention = CallingConvention.Cdecl)]
-		public static extern void hb_get_audio_compression_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction);
+		[DllImport("hb.dll", EntryPoint = "hb_video_encoder_get_next", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_video_encoder_get_next(IntPtr last);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_default_audio_compression", CallingConvention = CallingConvention.Cdecl)]
-		public static extern float hb_get_default_audio_compression(uint codec);
+/*
+ * hb_audio_encoder_get_fallback_for_passthru() will sanitize a passthru codec
+ * to the matching audio encoder (if any is available).
+ *
+ * hb_audio_encoder_get_from_name(), hb_audio_encoder_sanitize_name() will
+ * sanitize legacy encoder names, but won't convert passthru to an encoder.
+ */
+//int hb_audio_encoder_get_fallback_for_passthru(int passthru);
+//int hb_audio_encoder_get_default(int muxer);
+//int hb_audio_encoder_get_from_name(const char *name);
+//const char* hb_audio_encoder_get_name(int encoder);
+//const char* hb_audio_encoder_get_short_name(int encoder);
+//const char* hb_audio_encoder_get_long_name(int encoder);
+//const char* hb_audio_encoder_sanitize_name(const char *name);
 
+		[DllImport("hb.dll", EntryPoint = "hb_audio_encoder_get_next", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_audio_encoder_get_next(IntPtr last);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_video_rates", CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr hb_get_video_rates();
+//int hb_container_get_from_name(const char *name);
+//int hb_container_get_from_extension(const char *extension); // not really a container name
+//const char* hb_container_get_name(int format);
+//const char* hb_container_get_short_name(int format);
+//const char* hb_container_get_long_name(int format);
+//const char* hb_container_get_default_extension(int format);
+//const char* hb_container_sanitize_name(const char *name);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_video_rates_count", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_get_video_rates_count();
+		[DllImport("hb.dll", EntryPoint = "hb_container_get_from_name", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_container_get_from_name([In] [MarshalAs(UnmanagedType.LPStr)] string name);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_audio_rates", CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr hb_get_audio_rates();
+		[DllImport("hb.dll", EntryPoint = "hb_container_get_next", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_container_get_next(IntPtr last);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_audio_rates_count", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_get_audio_rates_count();
+		[DllImport("hb.dll", EntryPoint = "hb_video_encoder_get_presets", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_video_encoder_get_presets(int encoder);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_audio_rates_default", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_get_audio_rates_default();
+		[DllImport("hb.dll", EntryPoint = "hb_video_encoder_get_tunes", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_video_encoder_get_tunes(int encoder);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_audio_bitrates", CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr hb_get_audio_bitrates();
+		[DllImport("hb.dll", EntryPoint = "hb_video_encoder_get_profiles", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_video_encoder_get_profiles(int encoder);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_audio_bitrates_count", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_get_audio_bitrates_count();
+		[DllImport("hb.dll", EntryPoint = "hb_video_encoder_get_levels", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_video_encoder_get_levels(int encoder);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_audio_mixdowns", CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr hb_get_audio_mixdowns();
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_audio_mixdowns_count", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_get_audio_mixdowns_count();
+		[DllImport("hb.dll", EntryPoint = "lang_get_next", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr lang_get_next(IntPtr last);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_video_encoders", CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr hb_get_video_encoders();
+		[DllImport("hb.dll", EntryPoint = "lang_for_code2", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr lang_for_code2([In] [MarshalAs(UnmanagedType.LPStr)] string code2);
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_video_encoders_count", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_get_video_encoders_count();
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_audio_encoders", CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr hb_get_audio_encoders();
 
-		[DllImport("hb.dll", EntryPoint = "hb_get_audio_encoders_count", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int hb_get_audio_encoders_count();
 
 
 		/// void hb_autopassthru_apply_settings( hb_job_t * job )
@@ -312,8 +424,8 @@
 		public static extern void hb_job_close(IntPtr job);
 
 		///void hb_job_set_advanced_opts( hb_job_t *job, const char *advanced_opts );
-		[DllImport("hb.dll", EntryPoint = "hb_job_set_advanced_opts", CallingConvention = CallingConvention.Cdecl)]
-		public static extern void hb_job_set_advanced_opts(ref hb_job_s job, IntPtr advanced_opts);
+ [DllImport("hb.dll", EntryPoint = "hb_job_set_encoder_options", CallingConvention = CallingConvention.Cdecl)]
+ public static extern void hb_job_set_encoder_options(ref hb_job_s job, IntPtr advanced_opts);
 
 		///void hb_job_set_file( hb_job_t *job, const char *file );
 		[DllImport("hb.dll", EntryPoint = "hb_job_set_file", CallingConvention = CallingConvention.Cdecl)]
@@ -323,6 +435,10 @@
 		[DllImport("hb.dll", EntryPoint = "hb_chapter_set_title", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void hb_chapter_set_title(IntPtr chapter, [In] [MarshalAs(UnmanagedType.LPStr)] string title);
 
+		///void hb_chapter_set_title(hb_chapter_t *chapter, const char *title);
+		[DllImport("hb.dll", EntryPoint = "hb_chapter_set_title", CallingConvention = CallingConvention.Cdecl)]
+		public static extern void hb_chapter_set_title__ptr(IntPtr chapter, IntPtr title);
+
 		/// void hb_add_filter( hb_job_t * job, hb_filter_object_t * filter, const char * settings ); 
 		[DllImport("hb.dll", EntryPoint = "hb_add_filter", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void hb_add_filter(ref hb_job_s job, ref hb_filter_object_s filter, IntPtr settings);
@@ -331,6 +447,12 @@
 		[DllImport("hb.dll", EntryPoint = "hb_filter_init", CallingConvention = CallingConvention.Cdecl)]
 		public static extern IntPtr hb_filter_init(int filter_id);
 
+		[DllImport("hb.dll", EntryPoint = "hb_generate_filter_settings", CallingConvention = CallingConvention.Cdecl)]
+		public static extern IntPtr hb_generate_filter_settings(
+			int filter_id,
+			[In] [MarshalAs(UnmanagedType.LPStr)] string preset,
+			[In] [MarshalAs(UnmanagedType.LPStr)] string tune);
+
 		[DllImport("hb.dll", EntryPoint = "hb_x264_encopt_name", CallingConvention = CallingConvention.Cdecl)]
 		public static extern IntPtr hb_x264_encopt_name(IntPtr name);
 
@@ -338,7 +460,7 @@
 		public static extern int hb_check_h264_level([In] [MarshalAs(UnmanagedType.LPStr)] string level, int width, int height, int fps_num, int fps_den, int interlaced, int fake_interlaced);
 
 		[DllImport("hb.dll", EntryPoint = "hb_x264_param_unparse", CallingConvention = CallingConvention.Cdecl)]
- public static extern IntPtr hb_x264_param_unparse(
+		public static extern IntPtr hb_x264_param_unparse(
 			[In] [MarshalAs(UnmanagedType.LPStr)] string x264_preset,
 			[In] [MarshalAs(UnmanagedType.LPStr)] string x264_tune,
 			[In] [MarshalAs(UnmanagedType.LPStr)] string x264_encopts,
@@ -346,5 +468,15 @@
 			[In] [MarshalAs(UnmanagedType.LPStr)] string h264_level,
 			int width,
 			int height);
+
+
+		[DllImport("hb.dll", EntryPoint = "hb_get_opencl_env", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_get_opencl_env();
+
+		[DllImport("hb.dll", EntryPoint = "hb_qsv_available", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_qsv_available();
+		
+		[DllImport("hb.dll", EntryPoint = "hb_qsv_info_init", CallingConvention = CallingConvention.Cdecl)]
+		public static extern int hb_qsv_info_init();
 	}
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs Changed

@@ -10,10 +10,10 @@
 
 namespace HandBrake.Interop.HbLib
 {
-	public partial class NativeConstants
+	public class NativeConstants
 	{
+		// Audio encoders
 		public const uint HB_ACODEC_MASK = 0x00FFFF00;
-		public const uint HB_ACODEC_FAAC = 0x00000100;
 		public const uint HB_ACODEC_LAME = 0x00000200;
 		public const uint HB_ACODEC_VORBIS = 0x00000400;
 		public const uint HB_ACODEC_AC3 = 0x00000800;
@@ -26,9 +26,10 @@
 		public const uint HB_ACODEC_DCA_HD = 0x00040000;
 		public const uint HB_ACODEC_MP3 = 0x00080000;
 		public const uint HB_ACODEC_FFFLAC = 0x00100000;
+		public const uint HB_ACODEC_FFFLAC24 = 0x00200000;
 		public const uint HB_ACODEC_FDK_AAC = 0x00400000;
 		public const uint HB_ACODEC_FDK_HAAC = 0x00800000;
-		public const uint HB_ACODEC_FF_MASK = 0x00FF2000;
+		public const uint HB_ACODEC_FF_MASK = 0x00FF2800;
 		public const uint HB_ACODEC_PASS_FLAG = 0x40000000;
 		public const uint HB_ACODEC_PASS_MASK = (HB_ACODEC_MP3 | HB_ACODEC_FFAAC | HB_ACODEC_DCA_HD | HB_ACODEC_AC3 | HB_ACODEC_DCA);
 		public const uint HB_ACODEC_AUTO_PASS = (HB_ACODEC_PASS_MASK | HB_ACODEC_PASS_FLAG);
@@ -39,25 +40,7 @@
 		public const uint HB_ACODEC_DCA_HD_PASS = (HB_ACODEC_DCA_HD | HB_ACODEC_PASS_FLAG);
 		public const uint HB_ACODEC_ANY = (HB_ACODEC_MASK | HB_ACODEC_PASS_FLAG);
 
-		public const int HB_SUBSTREAM_BD_TRUEHD = 0x72;
-		public const int HB_SUBSTREAM_BD_AC3 = 0x76;
-		public const int HB_SUBSTREAM_BD_DTSHD = 0x72;
-		public const int HB_SUBSTREAM_BD_DTS = 0x71;
-
-		public const int HB_VCODEC_MASK = 0x0000FF;
-		public const int HB_VCODEC_X264 = 0x000001;
-		public const int HB_VCODEC_THEORA = 0x000002;
-		public const int HB_VCODEC_FFMPEG_MPEG4 = 0x000010;
-		public const int HB_VCODEC_FFMPEG = HB_VCODEC_FFMPEG_MPEG4;
-		public const int HB_VCODEC_FFMPEG_MPEG2 = 0x000020;
-		public const int HB_VCODEC_FFMPEG_MASK = 0x0000F0;
-
-		public const int HB_MUX_MASK = 0xFF0000;
-		public const int HB_MUX_MP4 = 0x010000;
-		public const int HB_MUX_MKV = 0x200000;
-
-		public const int HBTF_NO_IDR = 1 << 0;
-
+		// Encode state
 		public const int HB_STATE_IDLE = 1;
 		public const int HB_STATE_SCANNING = 2;
 		public const int HB_STATE_SCANDONE = 4;
@@ -65,38 +48,5 @@
 		public const int HB_STATE_PAUSED = 16;
 		public const int HB_STATE_WORKDONE = 32;
 		public const int HB_STATE_MUXING = 64;
-
-		public const int HB_ERROR_NONE = 0;
-		public const int HB_ERROR_CANCELED = 1;
-		public const int HB_ERROR_UNKNOWN = 2;
-
-		public const int AUDIO_F_DOLBY = 1 << 31;
-
-		public const int HB_FRAME_IDR = 0x01;
-		public const int HB_FRAME_I = 0x02;
-		public const int HB_FRAME_AUDIO = 0x04;
-		public const int HB_FRAME_P = 0x10;
-		public const int HB_FRAME_B = 0x20;
-		public const int HB_FRAME_BREF = 0x40;
-		public const int HB_FRAME_KEY = 0x0F;
-		public const int HB_FRAME_REF = 0xF0;
-
-		public const int HB_CONFIG_MAX_SIZE = 8192;
-
-		// see https://developer.apple.com/quicktime/icefloe/dispatch019.html#colr
-		public const int HB_COLR_PRI_BT709 = 1;
-		public const int HB_COLR_PRI_UNDEF = 2;
-		public const int HB_COLR_PRI_EBUTECH = 5; // use for bt470bg
-		public const int HB_COLR_PRI_SMPTEC = 6; // smpte170m; also use for bt470m and smpte240m
-		// 0, 3-4, 7-65535: reserved
-		public const int HB_COLR_TRA_BT709 = 1; // also use for bt470m, bt470bg and smpte170m
-		public const int HB_COLR_TRA_UNDEF = 2;
-		public const int HB_COLR_TRA_SMPTE240M = 7;
-		// 0, 3-6, 8-65535: reserved
-		public const int HB_COLR_MAT_BT709 = 1;
-		public const int HB_COLR_MAT_UNDEF = 2;
-		public const int HB_COLR_MAT_SMPTE170M = 6; // also use for fcc and bt470bg
-		public const int HB_COLR_MAT_SMPTE240M = 7;
-		// 0, 3-5, 8-65535: reserved
 	}
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio.cs Changed

@@ -13,7 +13,9 @@
 	using System;
 	using System.Runtime.InteropServices;
 
-	[StructLayout(LayoutKind.Sequential)]
+	using HandBrake.Interop.Helpers;
+
+    [StructLayout(LayoutKind.Sequential)]
 	public struct hb_audio_s
 	{
 		/// int
@@ -26,8 +28,8 @@
 		[MarshalAs(UnmanagedType.ByValArray, SizeConst = MarshalingConstants.AudioPaddingBytes, ArraySubType = UnmanagedType.U1)]
 		public byte[] padding;
 
-		/// Anonymous_e6c7b779_b5a3_4e80_9fa8_13619d14f545
-		//public Anonymous_e6c7b779_b5a3_4e80_9fa8_13619d14f545 priv;
+		// Anonymous_e6c7b779_b5a3_4e80_9fa8_13619d14f545
+		// public Anonymous_e6c7b779_b5a3_4e80_9fa8_13619d14f545 priv;
 	}
 
 	[StructLayout(LayoutKind.Sequential)]
@@ -72,22 +74,8 @@
 		public int dither_method;
 
 		public IntPtr name;
-	}
 
-	public enum hb_mixdown
-	{
-		HB_INVALID_AMIXDOWN = -1,
-		HB_AMIXDOWN_NONE = 0,
-		HB_AMIXDOWN_MONO,
-		HB_AMIXDOWN_LEFT,
-		HB_AMIXDOWN_RIGHT,
-		HB_AMIXDOWN_STEREO,
-		HB_AMIXDOWN_DOLBY,
-		HB_AMIXDOWN_DOLBYPLII,
-		HB_AMIXDOWN_5POINT1,
-		HB_AMIXDOWN_6POINT1,
-		HB_AMIXDOWN_7POINT1,
-		HB_AMIXDOWN_5_2_LFE,
+		public int delay;
 	}
 
 	[StructLayout(LayoutKind.Sequential)]
@@ -129,6 +117,9 @@
 		/* Input bitrate (bps) */
 		public int bitrate;
 
+		/* Source matrix encoding mode, set by the audio decoder */
+		public int matrix_encoding;
+
 		/* Source channel layout, set by the audio decoder */
 		public ulong channel_layout;

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_container_s.cs Added

@@ -0,0 +1,29 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_container_s.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <auto-generated>Disable Stylecop Warnings for this file</auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.HbLib
+{
+	using System.Runtime.InteropServices;
+
+	[StructLayout(LayoutKind.Sequential)]
+	public struct hb_container_s
+	{
+		[MarshalAs(UnmanagedType.LPStr)]
+		public string name;
+
+		[MarshalAs(UnmanagedType.LPStr)]
+		public string short_name;
+
+		[MarshalAs(UnmanagedType.LPStr)]
+		public string long_name;
+
+		[MarshalAs(UnmanagedType.LPStr)]
+		public string default_extension;
+
+		public int format;
+	}
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_encoder_s.cs Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_error_code.cs Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_filter_ids.cs Added

@@ -0,0 +1,30 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_filter_ids.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <auto-generated> Disable Stylecop Warnings for this file </auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.HbLib
+{
+	public enum hb_filter_ids
+	{
+		HB_FILTER_QSV_PRE = 1, // for QSV - important to have before other filters 
+		// First, filters that may change the framerate (drop or dup frames)
+		HB_FILTER_DETELECINE,
+		HB_FILTER_DECOMB,
+		HB_FILTER_DEINTERLACE,
+		HB_FILTER_VFR,
+		// Filters that must operate on the original source image are next
+		HB_FILTER_DEBLOCK,
+		HB_FILTER_HQDN3D,
+		HB_FILTER_NLMEANS,
+		HB_FILTER_RENDER_SUB,
+		HB_FILTER_CROP_SCALE,
+		// Finally filters that don't care what order they are in,
+		// except that they must be after the above filters
+		HB_FILTER_ROTATE,
+		HB_FILTER_QSV_POST, // for QSV - important to have as a last one 
+		HB_FILTER_QSV, // default MSDK VPP filter 
+	}
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_filter_object_s.cs Added

@@ -0,0 +1,36 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_filter_object_s.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <auto-generated> Disable Stylecop Warnings for this file </auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.HbLib
+{
+	using System;
+	using System.Runtime.InteropServices;
+
+	[StructLayout(LayoutKind.Sequential)]
+	public struct hb_filter_object_s
+	{
+		public int id;
+		public int enforce_order;
+		public IntPtr name;
+		public IntPtr settings;
+
+		// Internal stuff we need to marshal
+		public IntPtr init;
+		public IntPtr work;
+		public IntPtr close;
+		public IntPtr info;
+		public IntPtr fifo_in;
+		public IntPtr fifo_out;
+		public IntPtr subtitle;
+		public IntPtr private_data;
+		public IntPtr thread;
+		public IntPtr done;
+		public int status;
+		public int chapter_val;
+		public long chapter_time;
+	}
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_geometry.cs Added

@@ -0,0 +1,116 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_geometry.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the hb_geometry type.
+// </summary>
+// <auto-generated>Disable Stylecop Warnings for this file</auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.HbLib
+{
+ using System.Runtime.InteropServices;
+
+ /// <summary>
+ /// The hb_geometry_s.
+ /// </summary>
+ [StructLayout(LayoutKind.Sequential)]
+ public struct hb_geometry_s
+ {
+ /// <summary>
+ /// The width.
+ /// </summary>
+ public int width;
+
+ /// <summary>
+ /// The height.
+ /// </summary>
+ public int height;
+
+ /// <summary>
+ /// The par.
+ /// </summary>
+ public hb_rational_t par;
+ }
+
+ /// <summary>
+ /// The hb_ui_geometry_s.
+ /// </summary>
+ [StructLayout(LayoutKind.Sequential)]
+ public struct hb_ui_geometry_s
+ {
+ /// <summary>
+ /// Anamorphic mode, see job struct anamorphic
+ /// </summary>
+ public int mode;
+
+ /// <summary>
+ /// Specifies settings that shouldn't be changed
+ /// </summary>
+ public int keep; 
+
+ /// <summary>
+ /// use dvd dimensions to determine PAR
+ /// </summary>
+ public int itu_par; 
+
+ /// <summary>
+ /// pixel alignment for loose anamorphic
+ /// </summary>
+ public int modulus; 
+
+ /// <summary>
+ /// Cropping
+ /// </summary>
+ [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.I4)]
+ public int[] crop;
+
+ /// <summary>
+ /// destination storage width
+ /// </summary>
+ public int width;
+
+ /// <summary>
+ /// destination storage height
+ /// </summary>
+ public int height; 
+
+ /// <summary>
+ /// max destination storage width
+ /// </summary>
+ public int maxWidth; 
+
+ /// <summary>
+ /// max destination storage height
+ /// </summary>
+ public int maxHeight;
+
+ /// <summary>
+ /// Pixel aspect used in custom anamorphic
+ /// </summary>
+ public hb_rational_t par; 
+
+ /// <summary>
+ /// Display aspect used in custom anamorphic
+ /// </summary>
+ public hb_rational_t dar;
+ }
+
+ /// <summary>
+ /// The hb_rational_t.
+ /// </summary>
+ [StructLayout(LayoutKind.Sequential)]
+ public struct hb_rational_t
+ {
+ /// <summary>
+ /// The num.
+ /// </summary>
+ public int num;
+
+ /// <summary>
+ /// The den.
+ /// </summary>
+ public int den;
+ }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_handle_s.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_handle_s.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs Changed

@@ -10,171 +10,231 @@
 
 namespace HandBrake.Interop.HbLib
 {
-	using System;
-	using System.Runtime.InteropServices;
+    using System;
+    using System.Runtime.InteropServices;
 
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_job_s
-	{
-		/// int
-		public int sequence_id;
+    using HandBrake.Interop.Helpers;
 
-		/// hb_title_t*
-		public IntPtr title;
+    [StructLayout(LayoutKind.Sequential)]
+    public struct hb_job_s
+    {
+        /// int
+        public int sequence_id;
 
-		public int feature;
+        /// hb_title_t*
+        public IntPtr title;
 
-		/// int
-		public int chapter_start;
+        public int feature;
 
-		/// int
-		public int chapter_end;
+        /// int
+        public int chapter_start;
 
-		/// int
-		public int chapter_markers;
+        /// int
+        public int chapter_end;
 
-		/// int[4]
-		[MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.I4)]
-		public int[] crop;
+        /// int
+        public int chapter_markers;
 
-		/// int
-		public int deinterlace;
+        /// int[4]
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.I4)]
+        public int[] crop;
 
-		/// hb_list_t*
-		public IntPtr list_filter;
+        /// int
+        public int deinterlace;
 
-		/// int
-		public int width;
+        /// hb_list_t*
+        public IntPtr list_filter;
 
-		/// int
-		public int height;
+        /// int
+        public int width;
 
-		/// int
-		public int keep_ratio;
+        /// int
+        public int height;
 
-		/// int
-		public int grayscale;
+        /// int
+        public int grayscale;
 
-		public hb_anamorphic_substruct anamorphic;
+        public hb_anamorphic_substruct anamorphic;
 
-		public int modulus;
+        public int modulus;
 
-		/// int
-		public int maxWidth;
+        /// int
+        public int maxWidth;
 
-		/// int
-		public int maxHeight;
+        /// int
+        public int maxHeight;
 
-		/// int
-		public int vcodec;
+        /// int
+        public int vcodec;
 
-		/// float
-		public float vquality;
+        /// float
+        public float vquality;
 
-		/// int
-		public int vbitrate;
+        /// int
+        public int vbitrate;
 
-		public int pfr_vrate;
+        /// int
+        public int vrate;
 
-		public int pfr_vrate_base;
+        /// int
+        public int vrate_base;
 
-		/// int
-		public int vrate;
+        /// int
+        public int cfr;
 
-		/// int
-		public int vrate_base;
+        /// int
+        public int pass;
 
-		/// int
-		public int cfr;
+        public int fastfirstpass;
 
-		/// int
-		public int pass;
+        public IntPtr encoder_preset;
 
-		public int fastfirstpass;
+        public IntPtr encoder_tune;
 
-		public IntPtr x264_preset;
+        public IntPtr encoder_options;
 
-		public IntPtr x264_tune;
+        public IntPtr encoder_profile;
 
-		public IntPtr advanced_opts;
+        public IntPtr encoder_level;
 
-		public IntPtr h264_profile;
+        /// int
+        public int areBframes;
 
-		public IntPtr h264_level;
+        public int color_matrix_code;
 
-		/// int
-		public int areBframes;
+        public int color_prim;
 
-		public int color_matrix_code;
+        public int color_transfer;
 
-		public int color_prim;
+        /// int
+        public int color_matrix;
 
-		public int color_transfer;
+        public IntPtr list_chapter;
 
-		/// int
-		public int color_matrix;
+        /// hb_list_t*
+        public IntPtr list_audio;
 
-		public IntPtr list_chapter;
+        public int acodec_copy_mask;
+        public int acodec_fallback;
 
-		/// hb_list_t*
-		public IntPtr list_audio;
+        /// hb_list_t*
+        public IntPtr list_subtitle;
 
-		public int acodec_copy_mask;
-		public int acodec_fallback;
+        public IntPtr list_attachment;
 
-		/// hb_list_t*
-		public IntPtr list_subtitle;
+        public IntPtr metadata;
 
-		public IntPtr list_attachment;
+        /// int
+        public int mux;
 
-		public IntPtr metadata;
+        /// char*
+        /// UTF-8 encoded
+        public IntPtr file;
 
-		/// int
-		public int mux;
+        /// int
+        public int largeFileSize;
 
-		/// char*
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string file;
+        /// int
+        public int mp4_optimize;
 
-		/// int
-		public int largeFileSize;
+        /// int
+        public int ipod_atom;
 
-		/// int
-		public int mp4_optimize;
+        /// int
+        public int indepth_scan;
 
-		/// int
-		public int ipod_atom;
+        /// hb_subtitle_config_t->hb_subtitle_config_s
+        public hb_subtitle_config_s select_subtitle_config;
 
-		/// int
-		public int indepth_scan;
+        /// int
+        public int angle;
 
-		/// hb_subtitle_config_t->hb_subtitle_config_s
-		public hb_subtitle_config_s select_subtitle_config;
+        public int frame_to_start;
 
-		/// int
-		public int angle;
+        public long pts_to_start;
 
-		public int frame_to_start;
+        /// int
+        public int frame_to_stop;
 
-		public long pts_to_start;
+        /// int64_t->int
+        public long pts_to_stop;
 
-		/// int
-		public int frame_to_stop;
+        /// int
+        public int start_at_preview;
 
-		/// int64_t->int
-		public long pts_to_stop;
+        /// int
+        public int seek_points;
 
-		/// int
-		public int start_at_preview;
+        /// uint32_t->unsigned int
+        public uint frames_to_skip;
 
-		/// int
-		public int seek_points;
+        public int use_opencl;
 
-		/// uint32_t->unsigned int
-		public uint frames_to_skip;
+        public int use_hwd;
 
-		// Padding for the part of the struct we don't care about marshaling.
-		[MarshalAs(UnmanagedType.ByValArray, SizeConst = MarshalingConstants.JobPaddingBytes, ArraySubType = UnmanagedType.U1)]
-		public byte[] padding;
-	}
+        public int use_decomb;
+
+        public int use_detelecine;
+
+        public qsv_s qsv;
+
+        // Padding for the part of the struct we don't care about marshaling.
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = MarshalingConstants.JobPaddingBytes, ArraySubType = UnmanagedType.U1)]
+        public byte[] padding;
+    }
+
+    public enum hb_anamorphic_mode_t
+    {
+        HB_ANAMORPHIC_NONE,
+        HB_ANAMORPHIC_STRICT,
+        HB_ANAMORPHIC_LOOSE,
+        HB_ANAMORPHIC_CUSTOM
+    } ;
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct hb_anamorphic_substruct
+    {
+        /// int
+        public hb_anamorphic_mode_t mode;
+
+        /// int
+        public int itu_par;
+
+        /// int
+        public int par_width;
+
+        /// int
+        public int par_height;
+
+        /// int
+        public int dar_width;
+
+        /// int
+        public int dar_height;
+
+        /// int
+        public int keep_display_aspect;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct qsv_enc_info_s
+    {
+        public int pic_struct;
+        public int align_width;
+        public int align_height;
+        public int is_init_done;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct qsv_s
+    {
+        public int decode;
+
+        public int async_depth;
+
+        /// av_qsv_context* 
+        public IntPtr ctx;
+
+        public qsv_enc_info_s enc_info;
+    }
 }

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_mixdown_s.cs Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_rate_s.cs Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_state_s.cs Added

@@ -0,0 +1,96 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_state_s.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <auto-generated>Disable Stylecop Warnings for this file</auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.HbLib
+{
+	using System.Runtime.InteropServices;
+
+	[StructLayout(LayoutKind.Sequential)]
+	public struct hb_state_s
+	{
+		/// int
+		public int state;
+		public hb_state_param_u param;
+	}
+
+	[StructLayout(LayoutKind.Explicit)]
+	public struct hb_state_param_u
+	{
+		[FieldOffset(0)]
+		public hb_state_scanning_anon scanning;
+
+		[FieldOffset(0)]
+		public hb_state_working_anon working;
+
+		[FieldOffset(0)]
+		public hb_state_workdone_anon workdone;
+
+		[FieldOffset(0)]
+		public hb_state_muxing_anon muxing;
+	}
+
+	[StructLayout(LayoutKind.Sequential)]
+	public struct hb_state_scanning_anon
+	{
+		public float progress;
+
+		public int preview_cur;
+
+		public int preview_count;
+
+		/// int
+		public int title_cur;
+
+		/// int
+		public int title_count;
+	}
+
+	[StructLayout(LayoutKind.Sequential)]
+	public struct hb_state_working_anon
+	{
+		/// float
+		public float progress;
+
+		/// int
+		public int job_cur;
+
+		/// int
+		public int job_count;
+
+		/// float
+		public float rate_cur;
+
+		/// float
+		public float rate_avg;
+
+		/// int
+		public int hours;
+
+		/// int
+		public int minutes;
+
+		/// int
+		public int seconds;
+
+		/// int
+		public int sequence_id;
+	}
+
+	[StructLayout(LayoutKind.Sequential)]
+	public struct hb_state_workdone_anon
+	{
+		/// int
+		public hb_error_code error;
+	}
+
+	[StructLayout(LayoutKind.Sequential)]
+	public struct hb_state_muxing_anon
+	{
+		/// float
+		public float progress;
+	}
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle.cs Changed

@@ -2,9 +2,6 @@
 // <copyright file="hb_subtitle.cs" company="HandBrake Project (http://handbrake.fr)">
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
-// <summary>
-// Defines the hb_subtitle_s type.
-// </summary>
 // <auto-generated> Disable Stylecop Warnings for this file </auto-generated>
 // --------------------------------------------------------------------------------------------------------------------
 
@@ -87,37 +84,6 @@
 		public IntPtr mux_data;
 	}
 
-	[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-	public struct hb_subtitle_config_s
-	{
-		/// hb_subtitle_config_s_subdest
-		public hb_subtitle_config_s_subdest dest;
-
-		/// int
-		public int force;
-
-		/// int
-		public int default_track;
-
-		/// char[128]
-		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-		public string src_filename;
-
-		/// char[40]
-		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 40)]
-		public string src_codeset;
-
-		/// int64_t->int
-		public long offset;
-	}
-
-	public enum hb_subtitle_config_s_subdest
-	{
-		RENDERSUB,
-
-		PASSTHRUSUB,
-	}
-
 	public enum hb_subtitle_s_subtype
 	{
 		PICTURESUB,

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle_config_s.cs Added

@@ -0,0 +1,42 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_subtitle_config_s.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <auto-generated> Disable Stylecop Warnings for this file </auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.HbLib
+{
+	using System.Runtime.InteropServices;
+
+	[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+	public struct hb_subtitle_config_s
+	{
+		/// hb_subtitle_config_s_subdest
+		public hb_subtitle_config_s_subdest dest;
+
+		/// int
+		public int force;
+
+		/// int
+		public int default_track;
+
+		/// char[128]
+		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+		public string src_filename;
+
+		/// char[40]
+		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 40)]
+		public string src_codeset;
+
+		/// int64_t->int
+		public long offset;
+	}
+
+	public enum hb_subtitle_config_s_subdest
+	{
+		RENDERSUB,
+
+		PASSTHRUSUB,
+	}
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs Changed

@@ -2,9 +2,6 @@
 // <copyright file="hb_title_s.cs" company="HandBrake Project (http://handbrake.fr)">
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
-// <summary>
-// Defines the hb_title_s type.
-// </summary>
 // <auto-generated> Disable Stylecop Warnings for this file </auto-generated>
 // --------------------------------------------------------------------------------------------------------------------
 
@@ -19,14 +16,14 @@
 		/// Anonymous_990d28ea_6cf3_4fbc_8143_4df9513e9550
 		public hb_title_type_anon type;
 
-		public uint reg_desc;
-
-		/// char[1024]
-		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 1024)]
-		public string path;
-
-		/// char[1024]
-		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 1024)]
+		public uint reg_desc;
+
+		/// char[1024]
+		[MarshalAs(UnmanagedType.ByValArray, SizeConst = 1024)]
+		public byte[] path;
+
+		/// char[1024]
+		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 1024)]
 		public string name;
 
 		/// int
@@ -138,6 +135,9 @@
 		/// int
 		public int data_rate;
 
+		/// int
+		public int video_decode_support;
+
 		/// hb_metadata_t*
 		public IntPtr metadata;
 
@@ -158,16 +158,10 @@
 
 		/// uint32_t->unsigned int
 		public uint flags;
-	}
 
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_title_set_s
-	{
-		///hb_list_t *
-		public IntPtr list_title;
+		public int opencl_support;
 
-		// int
-		public int feature;
+		public int hwd_support;
 	}
 
 	public enum hb_title_type_anon

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_set_s.cs Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/iso639_lang_t.cs Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/InteropUtilities.cs Added

@@ -0,0 +1,283 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="InteropUtilities.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Helper utilities for native interop.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Helpers
+{
+ using System;
+ using System.Collections.Generic;
+ using System.Linq;
+ using System.Runtime.InteropServices;
+ using System.Text;
+
+ using HandBrake.Interop.HbLib;
+
+ /// <summary>
+	/// Helper utilities for native interop.
+	/// </summary>
+	public static class InteropUtilities
+	{
+		/// <summary>
+		/// Reads the given native structure pointer.
+		/// </summary>
+		/// <typeparam name="T">The type to convert the structure to.</typeparam>
+		/// <param name="structPtr">The pointer to the native structure.</param>
+		/// <returns>The converted structure.</returns>
+		public static T ToStructureFromPtr<T>(IntPtr structPtr)
+		{
+			return (T)Marshal.PtrToStructure(structPtr, typeof(T));
+		}
+
+		/// <summary>
+		/// Reads the given native UTF-8 string.
+		/// </summary>
+		/// <param name="stringPtr">The pointer to the string.</param>
+		/// <returns>The resulting string.</returns>
+		public static string ToStringFromUtf8Ptr(IntPtr stringPtr)
+		{
+			var data = new List<byte>();
+			var ptr = stringPtr;
+			var offset = 0;
+			while (true)
+			{
+				byte ch = Marshal.ReadByte(ptr, offset++);
+				if (ch == 0)
+				{
+					break;
+				}
+
+				data.Add(ch);
+			}
+
+			return Encoding.UTF8.GetString(data.ToArray());
+		}
+
+		/// <summary>
+		/// Creates a pointer to a UTF-8 null-terminated string.
+		/// </summary>
+		/// <param name="str">
+		/// The string to encode.
+		/// </param>
+		/// <returns>
+		/// The <see cref="IntPtr"/>.
+		/// </returns>
+		public static IntPtr ToUtf8PtrFromString(string str)
+		{
+			byte[] bytes = Encoding.UTF8.GetBytes(str);
+			IntPtr stringPtr = Marshal.AllocHGlobal(bytes.Length + 1);
+			var offset = 0;
+			foreach (byte b in bytes)
+			{
+				Marshal.WriteByte(stringPtr, offset, b);
+				offset++;
+			}
+
+			Marshal.WriteByte(stringPtr, offset, 0);
+			return stringPtr;
+		}
+
+		/// <summary>
+		/// Converts the given native HandBrake list to a managed list.
+		/// </summary>
+		/// <typeparam name="T">The type of structure in the list.</typeparam>
+		/// <param name="listPtr">The pointer to the native list.</param>
+		/// <returns>The converted managed list.</returns>
+		public static List<T> ToListFromHandBrakeList<T>(this IntPtr listPtr)
+		{
+			List<T> returnList = new List<T>();
+			NativeList nativeList = new NativeList(listPtr);
+
+			for (int i = 0; i < nativeList.Count; i++)
+			{
+				IntPtr itemPtr = nativeList[i];
+				returnList.Add(ToStructureFromPtr<T>(itemPtr));
+			}
+
+			return returnList;
+		}
+
+		/// <summary>
+		/// Converts the HB list to a managed list of pointers.
+		/// </summary>
+		/// <param name="listPtr">The list to convert.</param>
+		/// <returns>The managed list of pointers.</returns>
+		public static List<IntPtr> ToIntPtrList(this IntPtr listPtr)
+		{
+			var returnList = new List<IntPtr>();
+			NativeList nativeList = new NativeList(listPtr);
+
+			for (int i = 0; i < nativeList.Count; i++)
+			{
+				IntPtr itemPtr = nativeList[i];
+				returnList.Add(itemPtr);
+			}
+
+			return returnList;
+		}
+
+		/// <summary>
+		/// Converts the given native array to a managed collection.
+		/// </summary>
+		/// <typeparam name="T">The type of item in the list.</typeparam>
+		/// <param name="arrayPtr">The pointer to the array.</param>
+		/// <param name="count">The number of items in the array.</param>
+		/// <returns>The converted collection.</returns>
+		public static List<T> ToListFromNativeArray<T>(IntPtr arrayPtr, int count)
+		{
+			IntPtr currentItem = arrayPtr;
+
+			var result = new List<T>();
+			for (int i = 0; i < count; i++)
+			{
+				T nativeEncoder = ToStructureFromPtr<T>(currentItem);
+				result.Add(nativeEncoder);
+
+				currentItem = IntPtr.Add(currentItem, Marshal.SizeOf(typeof(T)));
+			}
+
+			return result;
+		}
+
+		/// <summary>
+		/// Takes an array pointer and converts it into a list of strings.
+		/// </summary>
+		/// <param name="arrayPtr">A pointer to a raw list of strings.</param>
+		/// <returns>The list of strings.</returns>
+	 public static List<string> ToStringListFromArrayPtr(IntPtr arrayPtr)
+		{
+			if (arrayPtr == IntPtr.Zero)
+			{
+				return null;
+			}
+
+			return ToPtrListFromPtr(arrayPtr).Select(ptr => Marshal.PtrToStringAnsi(ptr)).ToList();
+		}
+
+	 /// <summary>
+		/// Finds all the pointers starting at the given location and puts them in a list. Stops when it finds zero for a pointer.
+		/// </summary>
+		/// <param name="arrayPtr">The address of the list of pointers.</param>
+		/// <returns>The list of pointers.</returns>
+	 public static List<IntPtr> ToPtrListFromPtr(IntPtr arrayPtr)
+	 {
+		 var result = new List<IntPtr>();
+		 int ptrSize = Marshal.SizeOf(typeof(IntPtr));
+		 IntPtr currentPtr = Marshal.ReadIntPtr(arrayPtr);
+			for (int i = 0; currentPtr != IntPtr.Zero; i++)
+			{
+				result.Add(currentPtr);
+			 currentPtr = Marshal.ReadIntPtr(arrayPtr, (i + 1) * ptrSize);
+		 }
+
+		 return result;
+	 }
+
+		/// <summary>
+		/// Creates a native HandBrake list from the given managed list of pointers.
+		/// </summary>
+		/// <param name="list">The managed list to convert.</param>
+		/// <returns>The converted native list.</returns>
+		public static NativeList ToHandBrakeListFromPtrList(List<IntPtr> list)
+		{
+			NativeList returnList = NativeList.CreateList();
+
+			foreach (IntPtr ptr in list)
+			{
+				returnList.Add(ptr);
+			}
+
+			return returnList;
+		}
+
+		/// <summary>
+		/// Creates a native HandBrake list from the given managed list of structures.
+		/// </summary>
+		/// <typeparam name="T">The type of structures in the list.</typeparam>
+		/// <param name="list">The managed list to convert.</param>
+		/// <returns>The converted native list.</returns>
+		public static NativeList ToHandBrakeListFromList<T>(List<T> list)
+		{
+			NativeList returnList = NativeList.CreateList();
+			foreach (T item in list)
+			{
+				IntPtr itemPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(T)));
+				returnList.AllocatedMemory.Add(itemPtr);
+				Marshal.StructureToPtr(item, itemPtr, false);
+
+				returnList.Add(itemPtr);
+			}
+
+			return returnList;
+		}
+
+		/// <summary>
+		/// Reads in a list of objects given an interator and a conversion function.
+		/// </summary>
+		/// <typeparam name="T1">The type of the struct given by the iterator.</typeparam>
+		/// <typeparam name="T2">The object type to convert to.</typeparam>
+		/// <param name="iterator">The iterator to use to build the list.</param>
+		/// <param name="converter">The converter to convert from the struct to the object.</param>
+		/// <returns>The list of objects.</returns>
+		public static List<T2> ToListFromIterator<T1, T2>(Func<IntPtr, IntPtr> iterator, Func<T1, T2> converter)
+		{
+			return ToListFromIterator<T1>(iterator).Select(converter).ToList();
+		} 
+
+		/// <summary>
+		/// Reads in a list of structs given an iterator.
+		/// </summary>
+		/// <typeparam name="T">The type of the struct.</typeparam>
+		/// <param name="iterator">The iterator to use to build the list.</param>
+		/// <returns>The list of structs.</returns>
+		public static List<T> ToListFromIterator<T>(Func<IntPtr, IntPtr> iterator)
+		{
+			var structureList = new List<T>();
+			IntPtr current = IntPtr.Zero;
+
+			current = iterator(current);
+			while (current != IntPtr.Zero)
+			{
+				T encoder = ToStructureFromPtr<T>(current);
+				structureList.Add(encoder);
+
+				current = iterator(current);
+			}
+
+			return structureList;
+		}
+
+		/// <summary>
+		/// Closes the given job.
+		/// </summary>
+		/// <param name="nativeJobPtr">The pointer to the job.</param>
+		public static void CloseJob(IntPtr nativeJobPtr)
+		{
+			// Create a point to the job pointer first.
+			IntPtr nativeJobPtrPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)));
+
+			// Assign the new pointer to the job pointer and tell HB to clean the job up.
+			Marshal.WriteIntPtr(nativeJobPtrPtr, nativeJobPtr);
+			HBFunctions.hb_job_close(nativeJobPtrPtr);
+
+			// Free the pointer we used.
+			Marshal.FreeHGlobal(nativeJobPtrPtr);
+		}
+
+		/// <summary>
+		/// Frees all the memory locations in the given list.
+		/// </summary>
+		/// <param name="memoryList">The list of memory locations to free.</param>
+		public static void FreeMemory(List<IntPtr> memoryList)
+		{
+			foreach (IntPtr memoryLocation in memoryList)
+			{
+				Marshal.FreeHGlobal(memoryLocation);
+			}
+		}
+	}
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Languages.cs Added

@@ -0,0 +1,51 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Languages.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Contains utilities for converting language codes.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Helpers
+{
+ using System.Collections.Generic;
+
+ using HandBrake.Interop.HbLib;
+ using HandBrake.Interop.Model;
+
+ /// <summary>
+	/// Contains utilities for converting language codes.
+	/// </summary>
+	public static class Languages
+	{
+		/// <summary>
+		/// The list of all languages.
+		/// </summary>
+		private static IList<Language> allLanguages; 
+
+		/// <summary>
+		/// Gets a list of all languages.
+		/// </summary>
+		public static IList<Language> AllLanguages
+		{
+			get
+			{
+			 return allLanguages
+			 ?? (allLanguages =
+			 InteropUtilities.ToListFromIterator<iso639_lang_t, Language>(HBFunctions.lang_get_next, Converters.Converters.NativeToLanguage));
+			}
+		}
+
+		/// <summary>
+		/// Gets the language object for the given code.
+		/// </summary>
+		/// <param name="code">The ISO-639-2 code for the language.</param>
+		/// <returns>Object that describes the language.</returns>
+		public static Language Get(string code)
+		{
+			iso639_lang_t language = InteropUtilities.ToStructureFromPtr<iso639_lang_t>(HBFunctions.lang_for_code2(code));
+			return Converters.Converters.NativeToLanguage(language);
+		}
+	}
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/MarshalingConstants.cs Added

@@ -0,0 +1,32 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="MarshalingConstants.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the MarshalingConstants type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Helpers
+{
+ /// <summary>
+ /// The marshaling constants.
+ /// </summary>
+ public static class MarshalingConstants
+	{
+#if X64
+		public const int JobPaddingBytes = 49272;
+		public const int AudioPaddingBytes = 49208;
+#else
+		/// <summary>
+	 /// Job Padding Bytes
+	 /// </summary>
+		public const int JobPaddingBytes = 49220;
+
+	 /// <summary>
+	 /// Audio Padding Bytes
+	 /// </summary>
+	 public const int AudioPaddingBytes = 49180;
+#endif
+	}
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/NativeList.cs Added

@@ -0,0 +1,127 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="NativeList.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Represents a HandBrake style native list.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Helpers
+{
+ using System;
+ using System.Collections.Generic;
+ using System.Diagnostics;
+ using System.Runtime.InteropServices;
+
+ using HandBrake.Interop.HbLib;
+
+ /// <summary>
+	/// Represents a HandBrake style native list.
+	/// </summary>
+	public class NativeList : IDisposable
+	{
+		/// <summary>
+		/// Initializes a new instance of the NativeList class.
+		/// </summary>
+		/// <param name="listPtr">The pointer to use for the list.</param>
+		public NativeList(IntPtr listPtr)
+		{
+			this.Ptr = listPtr;
+		}
+
+		/// <summary>
+		/// The list of native memory locations allocated for this list.
+		/// </summary>
+		private readonly List<IntPtr> allocatedMemory = new List<IntPtr>();
+
+		/// <summary>
+		/// Gets the pointer to the native list.
+		/// </summary>
+		public IntPtr Ptr { get; private set; }
+
+		/// <summary>
+		/// Gets the number of items in the list.
+		/// </summary>
+		public int Count
+		{
+			get
+ {
+ Debug.WriteLine("Got a Zero Pointer in the NativeList");
+ return this.Ptr == IntPtr.Zero ? 0 : HBFunctions.hb_list_count(this.Ptr);
+			}
+		}
+
+		/// <summary>
+		/// Gets the list of native memory locations allocated for this list.
+		/// </summary>
+		public List<IntPtr> AllocatedMemory
+		{
+			get
+			{
+				return this.allocatedMemory;
+			}
+		}
+
+		/// <summary>
+		/// Adds an item to the end of the list.
+		/// </summary>
+		/// <param name="item">The item to add.</param>
+		public void Add(IntPtr item)
+		{
+			HBFunctions.hb_list_add(this.Ptr, item);
+		}
+
+		/// <summary>
+		/// Inserts an item into the list.
+		/// </summary>
+		/// <param name="position">The index to insert the item at.</param>
+		/// <param name="item">The item to insert.</param>
+		public void Insert(int position, IntPtr item)
+		{
+			HBFunctions.hb_list_insert(this.Ptr, position, item);
+		}
+
+		/// <summary>
+		/// Removes an item from the list.
+		/// </summary>
+		/// <param name="item">The item to remove.</param>
+		public void Remove(IntPtr item)
+		{
+			HBFunctions.hb_list_rem(this.Ptr, item);
+		}
+
+		/// <summary>
+		/// Gets an item out of the list.
+		/// </summary>
+		/// <param name="i">Index in the list.</param>
+		/// <returns>The item at that index in the list.</returns>
+		public IntPtr this[int i]
+		{
+			get
+			{
+				return HBFunctions.hb_list_item(this.Ptr, i);
+			}
+		}
+
+		/// <summary>
+		/// Disposes resources associated with this object.
+		/// </summary>
+		public void Dispose()
+		{
+			IntPtr listPtrPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)));
+			Marshal.WriteIntPtr(listPtrPtr, this.Ptr);
+			HBFunctions.hb_list_close(listPtrPtr);
+			Marshal.FreeHGlobal(listPtrPtr);
+		}
+
+		/// <summary>
+		/// Creates a new list in unmanaged memory.
+		/// </summary>
+		/// <returns>The created list.</returns>
+		public static NativeList CreateList()
+		{
+			return new NativeList(HBFunctions.hb_list_init());
+		}
+	}
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Utilities.cs Added

@@ -0,0 +1,66 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Utilities.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the Utilities type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Helpers
+{
+ using HandBrake.Interop.Model.Encoding;
+
+ /// <summary>
+ /// The utilities.
+ /// </summary>
+ public static class Utilities
+	{
+ /// <summary>
+ /// Get the Greatest Common Factor
+ /// </summary>
+ /// <param name="a">
+ /// The a.
+ /// </param>
+ /// <param name="b">
+ /// The b.
+ /// </param>
+ /// <returns>
+ /// The greatest common factor
+ /// </returns>
+ public static int GreatestCommonFactor(int a, int b)
+		{
+			if (a == 0)
+			{
+				return b;
+			}
+
+			if (b == 0)
+			{
+				return a;
+			}
+
+			if (a > b)
+			{
+				return GreatestCommonFactor(a % b, b);
+			}
+ 
+ return GreatestCommonFactor(a, b % a);
+		}
+
+		/// <summary>
+		/// Determines if the given audio encoder is a passthrough encoder choice.
+		/// </summary>
+		/// <param name="encoder">The audio encoder to examine.</param>
+		/// <returns>True if the encoder is passthrough.</returns>
+		public static bool IsPassthrough(AudioEncoder encoder)
+		{
+			return encoder == AudioEncoder.Ac3Passthrough ||
+ encoder == AudioEncoder.DtsHDPassthrough ||
+ encoder == AudioEncoder.DtsPassthrough ||
+ encoder == AudioEncoder.Mp3Passthru || 
+ encoder == AudioEncoder.AacPassthru ||
+ encoder == AudioEncoder.Passthrough;
+		}
+	}
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Interfaces/IHandBrakeInstance.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Interfaces/IHandBrakeInstance.cs Changed

@@ -163,7 +163,10 @@
 /// <param name="jobToStart">
 /// The job to start.
 /// </param>
- void StartEncode(EncodeJob jobToStart);
+ /// <param name="scanPreviewCount">
+ /// The scan Preview Count.
+ /// </param>
+ void StartEncode(EncodeJob jobToStart, int scanPreviewCount);
 
 /// <summary>
 /// Starts an encode with the given job.
@@ -184,8 +187,11 @@
 /// The currently selected encode length. Used in preview
 /// for calculating bitrate when the target size would be wrong.
 /// </param>
+ /// <param name="scanPreviewCount">
+ /// The scan Preview Count.
+ /// </param>
 void StartEncode(
- EncodeJob job, bool preview, int previewNumber, int previewSeconds, double overallSelectedLengthSeconds);
+ EncodeJob job, bool preview, int previewNumber, int previewSeconds, double overallSelectedLengthSeconds, int scanPreviewCount);
 
 /// <summary>
 /// Starts scanning the given path.
@@ -212,6 +218,24 @@
 /// </param>
 void StartScan(string path, int previewCount, int titleIndex);
 
+
+ /// <summary>
+ /// Starts a scan of the given path.
+ /// </summary>
+ /// <param name="path">
+ /// The path of the video to scan.
+ /// </param>
+ /// <param name="previewCount">
+ /// The number of previews to make on each title.
+ /// </param>
+ /// <param name="minDuration">
+ /// The min Duration.
+ /// </param>
+ /// <param name="titleIndex">
+ /// The title index to scan (1-based, 0 for all titles).
+ /// </param>
+ void StartScan(string path, int previewCount, TimeSpan minDuration, int titleIndex);
+
 /// <summary>
 /// Stops the current encode.
 /// </summary>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/BitrateLimits.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/BitrateLimits.cs Changed

@@ -5,23 +5,23 @@
 // <summary>
 // Defines the BitrateLimits type.
 // </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Model
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model
 {
- /// <summary>
- /// The bitrate limits.
- /// </summary>
- public class BitrateLimits
+	/// <summary>
+	/// Represents bitrate limits as a range.
+	/// </summary>
+	public class BitrateLimits
 	{
- /// <summary>
- /// Gets or sets the low.
- /// </summary>
- public int Low { get; set; }
+		/// <summary>
+		/// The inclusive lower limit for the bitrate.
+		/// </summary>
+		public int Low { get; set; }
 
- /// <summary>
- /// Gets or sets the high.
- /// </summary>
- public int High { get; set; }
-	}
-}
+		/// <summary>
+		/// The inclusive upper limit for the bitrate.
+		/// </summary>
+		public int High { get; set; }
+	}
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/EncodeJob.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/EncodeJob.cs Changed

@@ -9,162 +9,168 @@
 
 namespace HandBrake.Interop.Model
 {
- using System;
- using System.Collections.Generic;
- using System.Xml.Serialization;
-
- using HandBrake.Interop.Model.Encoding;
-
- /// <summary>
- /// The encode job.
- /// </summary>
- public class EncodeJob
- {
- #region Properties
-
- /// <summary>
- /// Gets or sets the angle to encode. 0 for default, 1+ for specified angle.
- /// </summary>
- public int Angle { get; set; }
-
- /// <summary>
- /// Gets or sets the chapter end.
- /// </summary>
- public int ChapterEnd { get; set; }
-
- /// <summary>
- /// Gets or sets the chapter start.
- /// </summary>
- public int ChapterStart { get; set; }
-
- /// <summary>
- /// Gets or sets the list of chosen audio tracks (1-based)
- /// </summary>
- public List<int> ChosenAudioTracks { get; set; }
-
- /// <summary>
- /// Gets or sets the custom chapter names.
- /// </summary>
- public List<string> CustomChapterNames { get; set; }
-
- /// <summary>
- /// Gets or sets the encoding profile.
- /// </summary>
- public EncodingProfile EncodingProfile { get; set; }
-
- /// <summary>
- /// Gets or sets the frames end.
- /// </summary>
- public int FramesEnd { get; set; }
-
- /// <summary>
- /// Gets or sets the frames start.
- /// </summary>
- public int FramesStart { get; set; }
-
- /// <summary>
- /// Gets or sets the length. The length of video to encode.
- /// </summary>
- [XmlIgnore]
- public TimeSpan Length { get; set; }
-
- /// <summary>
- /// Gets or sets the output path.
- /// </summary>
- public string OutputPath { get; set; }
-
- /// <summary>
- /// Gets or sets the range type.
- /// </summary>
- public VideoRangeType RangeType { get; set; }
-
- /// <summary>
- /// Gets or sets the seconds end.
- /// </summary>
- public double SecondsEnd { get; set; }
-
- /// <summary>
- /// Gets or sets the seconds start.
- /// </summary>
- public double SecondsStart { get; set; }
-
- /// <summary>
- /// Gets or sets the source path.
- /// </summary>
- public string SourcePath { get; set; }
-
- /// <summary>
- /// Gets or sets the source type.
- /// </summary>
- public SourceType SourceType { get; set; }
-
- /// <summary>
- /// Gets or sets the subtitles.
- /// </summary>
- public Subtitles Subtitles { get; set; }
-
- /// <summary>
- /// Gets or sets the 1-based index of the title to encode.
- /// </summary>
- public int Title { get; set; }
-
- /// <summary>
- /// Gets or sets a value indicating whether use default chapter names.
- /// </summary>
- public bool UseDefaultChapterNames { get; set; }
-
- /// <summary>
- /// Gets or sets the xml length.
- /// </summary>
- [XmlElement("Length")]
- public string XmlLength
- {
- get
- {
- return this.Length.ToString();
- }
- set
- {
- this.Length = TimeSpan.Parse(value);
- }
- }
-
- #endregion
-
- #region Public Methods
-
- /// <summary>
- /// The clone.
- /// </summary>
- /// <returns>
- /// The <see cref="EncodeJob"/>.
- /// </returns>
- public EncodeJob Clone()
- {
- var clone = new EncodeJob
- {
- SourceType = this.SourceType, 
- SourcePath = this.SourcePath, 
- Title = this.Title, 
- Angle = this.Angle, 
- RangeType = this.RangeType, 
- ChapterStart = this.ChapterStart, 
- ChapterEnd = this.ChapterEnd, 
- SecondsStart = this.SecondsStart, 
- SecondsEnd = this.SecondsEnd, 
- FramesStart = this.FramesStart, 
- FramesEnd = this.FramesEnd, 
- ChosenAudioTracks = new List<int>(this.ChosenAudioTracks), 
- Subtitles = this.Subtitles, 
- UseDefaultChapterNames = this.UseDefaultChapterNames, 
- OutputPath = this.OutputPath, 
- EncodingProfile = this.EncodingProfile, 
- Length = this.Length
- };
-
- return clone;
- }
-
- #endregion
- }
+	using System;
+	using System.Collections.Generic;
+	using System.Xml.Serialization;
+
+	using HandBrake.Interop.Model.Encoding;
+
+	/// <summary>
+	/// The encode job.
+	/// </summary>
+	public class EncodeJob
+	{
+		#region Properties
+
+		/// <summary>
+		/// Gets or sets the angle to encode. 0 for default, 1+ for specified angle.
+		/// </summary>
+		public int Angle { get; set; }
+
+		/// <summary>
+		/// Gets or sets the chapter end.
+		/// </summary>
+		public int ChapterEnd { get; set; }
+
+		/// <summary>
+		/// Gets or sets the chapter start.
+		/// </summary>
+		public int ChapterStart { get; set; }
+
+		/// <summary>
+		/// Gets or sets the list of chosen audio tracks (1-based)
+		/// </summary>
+		public List<int> ChosenAudioTracks { get; set; }
+
+		/// <summary>
+		/// Gets or sets the custom chapter names.
+		/// </summary>
+		public List<string> CustomChapterNames { get; set; }
+
+		/// <summary>
+		/// Gets or sets the encoding profile.
+		/// </summary>
+		public EncodingProfile EncodingProfile { get; set; }
+
+		/// <summary>
+		/// Gets or sets the frames end.
+		/// </summary>
+		public int FramesEnd { get; set; }
+
+		/// <summary>
+		/// Gets or sets the frames start.
+		/// </summary>
+		public int FramesStart { get; set; }
+
+		/// <summary>
+		/// Gets or sets the length. The length of video to encode.
+		/// </summary>
+		[XmlIgnore]
+		public TimeSpan Length { get; set; }
+
+		/// <summary>
+		/// Gets or sets the output path.
+		/// </summary>
+		public string OutputPath { get; set; }
+
+		/// <summary>
+		/// Gets or sets the range type.
+		/// </summary>
+		public VideoRangeType RangeType { get; set; }
+
+		/// <summary>
+		/// Gets or sets the seconds end.
+		/// </summary>
+		public double SecondsEnd { get; set; }
+
+		/// <summary>
+		/// Gets or sets the seconds start.
+		/// </summary>
+		public double SecondsStart { get; set; }
+
+		/// <summary>
+		/// Gets or sets the source path.
+		/// </summary>
+		public string SourcePath { get; set; }
+
+		/// <summary>
+		/// Gets or sets the source type.
+		/// </summary>
+		public SourceType SourceType { get; set; }
+
+		/// <summary>
+		/// Gets or sets the subtitles.
+		/// </summary>
+		public Subtitles Subtitles { get; set; }
+
+		/// <summary>
+		/// Gets or sets the 1-based index of the title to encode.
+		/// </summary>
+		public int Title { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating whether use default chapter names.
+		/// </summary>
+		public bool UseDefaultChapterNames { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating whether to use DXVA hardware decoding.
+		/// </summary>
+		public bool DxvaDecoding { get; set; }
+
+		/// <summary>
+		/// Gets or sets the xml length.
+		/// </summary>
+		[XmlElement("Length")]
+		public string XmlLength
+		{
+			get
+			{
+				return this.Length.ToString();
+			}
+			set
+			{
+				this.Length = TimeSpan.Parse(value);
+			}
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// The clone.
+		/// </summary>
+		/// <returns>
+		/// The <see cref="EncodeJob"/>.
+		/// </returns>
+		public EncodeJob Clone()
+		{
+			var clone = new EncodeJob
+							{
+								SourceType = this.SourceType, 
+								SourcePath = this.SourcePath, 
+								Title = this.Title, 
+								Angle = this.Angle, 
+								RangeType = this.RangeType, 
+								ChapterStart = this.ChapterStart, 
+								ChapterEnd = this.ChapterEnd, 
+								SecondsStart = this.SecondsStart, 
+								SecondsEnd = this.SecondsEnd, 
+								FramesStart = this.FramesStart, 
+								FramesEnd = this.FramesEnd, 
+								ChosenAudioTracks = new List<int>(this.ChosenAudioTracks), 
+								Subtitles = this.Subtitles, 
+								UseDefaultChapterNames = this.UseDefaultChapterNames,
+								DxvaDecoding = this.DxvaDecoding,
+								OutputPath = this.OutputPath, 
+								EncodingProfile = this.EncodingProfile, 
+								Length = this.Length
+							};
+
+			return clone;
+		}
+
+		#endregion
+	}
 }
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs Changed

@@ -13,34 +13,59 @@
 	using System.Collections.Generic;
 	using System.Linq;
 
+	using HandBrake.Interop.Converters;
 	using HandBrake.Interop.HbLib;
+	using HandBrake.Interop.Helpers;
 	using HandBrake.Interop.Model.Encoding;
 	using HandBrake.Interop.SourceData;
 
- /// <summary>
- /// The encoders.
- /// </summary>
- public static class Encoders
+	/// <summary>
+	/// The encoders.
+	/// </summary>
+	public static class Encoders
 	{
-	 /// <summary>
-	 /// The audio encoders.
-	 /// </summary>
-	 private static List<HBAudioEncoder> audioEncoders;
+		/// <summary>
+		/// The audio encoders.
+		/// </summary>
+		private static List<HBAudioEncoder> audioEncoders;
+
+		/// <summary>
+		/// The video encoders.
+		/// </summary>
+		private static List<HBVideoEncoder> videoEncoders;
+
+		/// <summary>
+		/// Video framerates in pts.
+		/// </summary>
+		private static List<HBRate> videoFramerates; 
+
+		/// <summary>
+		/// List of HandBrake mixdowns.
+		/// </summary>
+		private static List<HBMixdown> mixdowns;
+
+		/// <summary>
+		/// List of HandBrake containers.
+		/// </summary>
+		private static List<HBContainer> containers; 
 
-	 /// <summary>
-	 /// The video encoders.
-	 /// </summary>
-	 private static List<HBVideoEncoder> videoEncoders;
+		/// <summary>
+		/// The audio bitrates.
+		/// </summary>
+		private static List<int> audioBitrates;
 
-	 /// <summary>
-	 /// The mixdowns.
-	 /// </summary>
-	 private static List<HBMixdown> mixdowns;
+		/// <summary>
+		/// Audio sample rates in Hz.
+		/// </summary>
+		private static List<HBRate> audioSampleRates; 
 
-	 /// <summary>
-	 /// The audio bitrates.
-	 /// </summary>
-	 private static List<int> audioBitrates; 
+		/// <summary>
+		/// Initializes static members of the Encoders class.
+		/// </summary>
+		static Encoders()
+		{
+			HandBrakeUtils.EnsureGlobalInit();
+		}
 
 		/// <summary>
 		/// Gets a list of supported audio encoders.
@@ -51,12 +76,7 @@
 			{
 				if (audioEncoders == null)
 				{
-					IntPtr encodersPtr = HBFunctions.hb_get_audio_encoders();
-					int encoderCount = HBFunctions.hb_get_audio_encoders_count();
-
-					audioEncoders = InteropUtilities.ConvertArray<hb_encoder_s>(encodersPtr, encoderCount)
-						.Select(Converters.NativeToAudioEncoder)
-						.ToList();
+					audioEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBAudioEncoder>(HBFunctions.hb_audio_encoder_get_next, Converters.NativeToAudioEncoder);
 				}
 
 				return audioEncoders;
@@ -72,12 +92,7 @@
 			{
 				if (videoEncoders == null)
 				{
-					IntPtr encodersPtr = HBFunctions.hb_get_video_encoders();
-					int encoderCount = HBFunctions.hb_get_video_encoders_count();
-
-					videoEncoders = InteropUtilities.ConvertArray<hb_encoder_s>(encodersPtr, encoderCount)
-						.Select(Converters.NativeToVideoEncoder)
-						.ToList();
+					videoEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBVideoEncoder>(HBFunctions.hb_video_encoder_get_next, Converters.NativeToVideoEncoder);
 				}
 
 				return videoEncoders;
@@ -85,6 +100,22 @@
 		}
 
 		/// <summary>
+		/// Gets a list of supported video framerates (in pts).
+		/// </summary>
+		public static List<HBRate> VideoFramerates
+		{
+			get
+			{
+				if (videoFramerates == null)
+				{
+					videoFramerates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(HBFunctions.hb_video_framerate_get_next, Converters.NativeToRate);
+				}
+
+				return videoFramerates;
+			}
+		} 
+
+		/// <summary>
 		/// Gets a list of supported mixdowns.
 		/// </summary>
 		public static List<HBMixdown> Mixdowns
@@ -93,12 +124,7 @@
 			{
 				if (mixdowns == null)
 				{
-					IntPtr mixdownsPtr = HBFunctions.hb_get_audio_mixdowns();
-					int mixdownsCount = HBFunctions.hb_get_audio_mixdowns_count();
-
-					mixdowns = InteropUtilities.ConvertArray<hb_mixdown_s>(mixdownsPtr, mixdownsCount)
-						.Select(Converters.NativeToMixdown)
-						.ToList();
+					mixdowns = InteropUtilities.ToListFromIterator<hb_mixdown_s, HBMixdown>(HBFunctions.hb_mixdown_get_next, Converters.NativeToMixdown);
 				}
 
 				return mixdowns;
@@ -114,12 +140,7 @@
 			{
 				if (audioBitrates == null)
 				{
-					IntPtr audioBitratesPtr = HBFunctions.hb_get_audio_bitrates();
-					int audioBitratesCount = HBFunctions.hb_get_audio_bitrates_count();
-
-					audioBitrates = InteropUtilities.ConvertArray<hb_rate_s>(audioBitratesPtr, audioBitratesCount)
-						.Select(b => b.rate)
-						.ToList();
+					audioBitrates = InteropUtilities.ToListFromIterator<hb_rate_s, int>(HBFunctions.hb_audio_bitrate_get_next, b => b.rate);
 				}
 
 				return audioBitrates;
@@ -127,6 +148,49 @@
 		}
 
 		/// <summary>
+		/// Gets a list of supported audio sample rates (in Hz).
+		/// </summary>
+		public static List<HBRate> AudioSampleRates
+		{
+			get
+			{
+				if (audioSampleRates == null)
+				{
+					audioSampleRates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(HBFunctions.hb_audio_samplerate_get_next, Converters.NativeToRate);
+				}
+
+				return audioSampleRates;
+			}
+		}
+
+		/// <summary>
+		/// Gets a list of supported containers.
+		/// </summary>
+		public static List<HBContainer> Containers
+		{
+			get
+			{
+				if (containers == null)
+				{
+					containers = InteropUtilities.ToListFromIterator<hb_container_s, HBContainer>(HBFunctions.hb_container_get_next, Converters.NativeToContainer);
+				}
+
+				return containers;
+			}
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether SRT subtitles can be burnt in.
+		/// </summary>
+		public static bool CanBurnSrt
+		{
+			get
+			{
+				return HBFunctions.hb_subtitle_can_burn((int)hb_subtitle_s_subsource.SRTSUB) > 0;
+			}
+		}
+
+		/// <summary>
 		/// Gets the audio encoder with the specified short name.
 		/// </summary>
 		/// <param name="shortName">The name of the audio encoder.</param>
@@ -137,6 +201,16 @@
 		}
 
 		/// <summary>
+		/// Gets the audio encoder with the specified codec ID.
+		/// </summary>
+		/// <param name="codecId">The ID of the audio encoder.</param>
+		/// <returns>The requested audio encoder.</returns>
+		public static HBAudioEncoder GetAudioEncoder(int codecId)
+		{
+			return AudioEncoders.SingleOrDefault(e => e.Id == codecId);
+		}
+
+		/// <summary>
 		/// Gets the video encoder with the specified short name.
 		/// </summary>
 		/// <param name="shortName">The name of the video encoder.</param>
@@ -157,6 +231,16 @@
 		}
 
 		/// <summary>
+		/// Gets the container with the specified short name.
+		/// </summary>
+		/// <param name="shortName">The name of the container.</param>
+		/// <returns>The requested container.</returns>
+		public static HBContainer GetContainer(string shortName)
+		{
+			return Containers.SingleOrDefault(c => c.ShortName == shortName);
+		}
+
+		/// <summary>
 		/// Determines if the given encoder is compatible with the given track.
 		/// </summary>
 		/// <param name="track">The audio track to examine.</param>
@@ -191,6 +275,27 @@
 		}
 
 		/// <summary>
+		/// Determines if DRC can be applied to the given track with the given encoder.
+		/// </summary>
+		/// <param name="track">The track to apply DRC to.</param>
+		/// <param name="encoder">The encoder to use for DRC.</param>
+		/// <returns>True if DRC can be applied to the track with the given encoder.</returns>
+		public static bool CanApplyDrc(AudioTrack track, HBAudioEncoder encoder)
+		{
+			return HBFunctions.hb_audio_can_apply_drc(track.CodecId, track.CodecParam, encoder.Id) > 0;
+		}
+
+		/// <summary>
+		/// Determines if the given input audio codec can be passed through.
+		/// </summary>
+		/// <param name="codecId">The input codec to consider.</param>
+		/// <returns>True if the codec can be passed through.</returns>
+		public static bool CanPassthroughAudio(int codecId)
+		{
+			return (codecId & NativeConstants.HB_ACODEC_PASS_MASK) > 0;
+		}
+
+		/// <summary>
 		/// Sanitizes a mixdown given the output codec and input channel layout.
 		/// </summary>
 		/// <param name="mixdown">The desired mixdown.</param>
@@ -199,7 +304,7 @@
 		/// <returns>A sanitized mixdown value.</returns>
 		public static HBMixdown SanitizeMixdown(HBMixdown mixdown, HBAudioEncoder encoder, ulong layout)
 		{
-			int sanitizedMixdown = HBFunctions.hb_get_best_mixdown((uint)encoder.Id, layout, mixdown.Id);
+			int sanitizedMixdown = HBFunctions.hb_mixdown_get_best((uint)encoder.Id, layout, mixdown.Id);
 			return Mixdowns.Single(m => m.Id == sanitizedMixdown);
 		}
 
@@ -211,7 +316,7 @@
 		/// <returns>The default mixdown for the given codec and channel layout.</returns>
 		public static HBMixdown GetDefaultMixdown(HBAudioEncoder encoder, ulong layout)
 		{
-			int defaultMixdown = HBFunctions.hb_get_default_mixdown((uint)encoder.Id, layout);
+			int defaultMixdown = HBFunctions.hb_mixdown_get_default((uint)encoder.Id, layout);
 			return Mixdowns.Single(m => m.Id == defaultMixdown);
 		}
 
@@ -227,12 +332,35 @@
 			int low = 0;
 			int high = 0;
 
-			HBFunctions.hb_get_audio_bitrate_limits((uint)encoder.Id, sampleRate, mixdown.Id, ref low, ref high);
+			HBFunctions.hb_audio_bitrate_get_limits((uint)encoder.Id, sampleRate, mixdown.Id, ref low, ref high);
 
 			return new BitrateLimits { Low = low, High = high };
 		}
 
 		/// <summary>
+		/// Gets the video quality limits for the given video codec.
+		/// </summary>
+		/// <param name="encoder">The video encoder to check.</param>
+		/// <returns>Limits on the video quality for the encoder.</returns>
+		public static VideoQualityLimits GetVideoQualityLimits(HBVideoEncoder encoder)
+		{
+			float low = 0;
+			float high = 0;
+			float granularity = 0;
+			int direction = 0;
+
+			HBFunctions.hb_video_quality_get_limits((uint)encoder.Id, ref low, ref high, ref granularity, ref direction);
+
+			return new VideoQualityLimits
+				{
+					Low = low,
+					High = high,
+					Granularity = granularity,
+					Ascending = direction == 0
+				};
+		}
+
+		/// <summary>
 		/// Sanitizes an audio bitrate given the output codec, sample rate and mixdown.
 		/// </summary>
 		/// <param name="audioBitrate">The desired audio bitrate.</param>
@@ -242,7 +370,7 @@
 		/// <returns>A sanitized audio bitrate.</returns>
 		public static int SanitizeAudioBitrate(int audioBitrate, HBAudioEncoder encoder, int sampleRate, HBMixdown mixdown)
 		{
-			return HBFunctions.hb_get_best_audio_bitrate((uint)encoder.Id, audioBitrate, sampleRate, mixdown.Id);
+			return HBFunctions.hb_audio_bitrate_get_best((uint)encoder.Id, audioBitrate, sampleRate, mixdown.Id);
 		}
 
 		/// <summary>
@@ -254,7 +382,7 @@
 		/// <returns>The default bitrate for these parameters.</returns>
 		public static int GetDefaultBitrate(HBAudioEncoder encoder, int sampleRate, HBMixdown mixdown)
 		{
-			return HBFunctions.hb_get_default_audio_bitrate((uint) encoder.Id, sampleRate, mixdown.Id);
+			return HBFunctions.hb_audio_bitrate_get_default((uint) encoder.Id, sampleRate, mixdown.Id);
 		}
 
 		/// <summary>
@@ -266,7 +394,7 @@
 		{
 			float low = 0, high = 0, granularity = 0;
 			int direction = 0;
-			HBFunctions.hb_get_audio_quality_limits((uint)encoderId, ref low, ref high, ref granularity, ref direction);
+			HBFunctions.hb_audio_quality_get_limits((uint)encoderId, ref low, ref high, ref granularity, ref direction);
 
 			return new RangeLimits
 			{
@@ -286,7 +414,7 @@
 		{
 			float low = 0, high = 0, granularity = 0;
 			int direction = 0;
-			HBFunctions.hb_get_audio_compression_limits((uint)encoderId, ref low, ref high, ref granularity, ref direction);
+			HBFunctions.hb_audio_compression_get_limits((uint)encoderId, ref low, ref high, ref granularity, ref direction);
 
 			return new RangeLimits
 			{

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Anamorphic.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Anamorphic.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncodeRateType.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncodeRateType.cs Changed

@@ -1,17 +1,18 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AudioEncodeRateType.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AudioEncodeRateType.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The audio encode rate type.
+// </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.Interop.Model.Encoding
-{
-	using System;
-	using System.Collections.Generic;
-	using System.Linq;
-	using System.Text;
-
-	public enum AudioEncodeRateType
+{
+ /// <summary>
+ /// The audio encode rate type.
+ /// </summary>
+ public enum AudioEncodeRateType
 	{
 		Bitrate,
 		Quality

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs Changed

@@ -11,45 +11,67 @@
 {
 using System.ComponentModel.DataAnnotations;
 
+ using HandBrake.Interop.Attributes;
+
 /// <summary>
 /// The audio encoder.
 /// </summary>
 public enum AudioEncoder
 {
- [Display(Name = "AAC (faac)")]
- Faac = 0,
-
- [Display(Name = "AAC (ffmpeg)")]
+ [Display(Name = "AAC (avcodec)")]
+ [ShortName("av_aac")]
 ffaac,
 
- [Display(Name = "MP3 (lame)")]
+ [Display(Name = "AAC (FDK)")]
+ [ShortName("fdk_aac")]
+ fdkaac,
+
+ [Display(Name = "HE-AAC (FDK)")]
+ [ShortName("fdk_haac")]
+ fdkheaac,
+
+ [Display(Name = "MP3")]
+ [ShortName("mp3")]
 Lame,
 
- [Display(Name = "AC3 (ffmpeg)")]
+ [Display(Name = "AC3")]
+ [ShortName("ac3")]
 Ac3,
 
 [Display(Name = "Auto Passthru")]
+ [ShortName("copy")]
 Passthrough,
 
 [Display(Name = "AC3 Passthru")]
+ [ShortName("copy:ac3")]
 Ac3Passthrough,
 
 [Display(Name = "DTS Passthru")]
+ [ShortName("copy:dts")]
 DtsPassthrough,
 
 [Display(Name = "DTS-HD Passthru")]
+ [ShortName("copy:dtshd")]
 DtsHDPassthrough,
 
 [Display(Name = "AAC Passthru")]
+ [ShortName("copy:aac")]
 AacPassthru,
 
 [Display(Name = "MP3 Passthru")]
+ [ShortName("copy:mp3")]
 Mp3Passthru,
 
- [Display(Name = "Vorbis (vorbis)")]
+ [Display(Name = "Vorbis")]
+ [ShortName("vorbis")]
 Vorbis,
 
- [Display(Name = "Flac (ffmpeg)")]
+ [Display(Name = "FLAC 16-bit")]
+ [ShortName("flac16")]
 ffflac,
+
+ [Display(Name = "FLAC 24-bit")]
+ [ShortName("flac24")]
+ ffflac24,
 }
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoding.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoding.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Container.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Container.cs Changed

@@ -1,22 +1,28 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Container.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Container.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the Container type.
+// </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.Interop.Model.Encoding
 {
 	using System;
-	using System.ComponentModel.DataAnnotations;
-
-	[Flags]
+	using System.ComponentModel.DataAnnotations;
+
+ /// <summary>
+ /// The container.
+ /// </summary>
+ [Flags]
 	public enum Container
 	{
 		None = 0x0,
 
 		[Display(Name = "MP4")]
-		Mp4,
+		MP4,
 		[Display(Name = "MKV")]
-		Mkv
+		MKV
 	}
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/CroppingType.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/CroppingType.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Decomb.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Decomb.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Denoise.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Denoise.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Detelecine.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Detelecine.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/EncodingProfile.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/EncodingProfile.cs Changed

@@ -9,124 +9,374 @@
 
 namespace HandBrake.Interop.Model.Encoding
 {
-	using System;
-	using System.Collections.Generic;
-
-	using HandBrake.Interop.Model;
-
-	public class EncodingProfile
-	{
-		public EncodingProfile()
-		{
-			this.Cropping = new Cropping();
-		}
-
-		public Container OutputFormat { get; set; }
-		public OutputExtension PreferredExtension { get; set; }
-		public bool IncludeChapterMarkers { get; set; }
-		public bool LargeFile { get; set; }
-		public bool Optimize { get; set; }
-		public bool IPod5GSupport { get; set; }
-
-		public int Width { get; set; }
-		public int Height { get; set; }
-		public int MaxWidth { get; set; }
-		public int MaxHeight { get; set; }
-		public CroppingType CroppingType { get; set; }
-		public Cropping Cropping { get; set; }
-		public Anamorphic Anamorphic { get; set; }
-		public bool UseDisplayWidth { get; set; }
-		public int DisplayWidth { get; set; }
-		public bool KeepDisplayAspect { get; set; }
-		public int PixelAspectX { get; set; }
-		public int PixelAspectY { get; set; }
-		public int Modulus { get; set; }
-
-		public Deinterlace Deinterlace { get; set; }
-		public string CustomDeinterlace { get; set; }
-		public Decomb Decomb { get; set; }
-		public string CustomDecomb { get; set; }
-		public Detelecine Detelecine { get; set; }
-		public string CustomDetelecine { get; set; }
-		public Denoise Denoise { get; set; }
-		public string CustomDenoise { get; set; }
-		public int Deblock { get; set; }
-		public bool Grayscale { get; set; }
-
-		public string VideoEncoder { get; set; }
-		public string X264Options { get; set; }
-		public string X264Profile { get; set; }
-		public string X264Preset { get; set; }
-
-		public List<string> X264Tunes { get; set; }
-		public string H264Level { get; set; }
-		public VideoEncodeRateType VideoEncodeRateType { get; set; }
-		public double Quality { get; set; }
-		public int TargetSize { get; set; }
-		public int VideoBitrate { get; set; }
-		public bool TwoPass { get; set; }
-		public bool TurboFirstPass { get; set; }
-		public double Framerate { get; set; }
-		public bool ConstantFramerate { get; set; }
-
-		public List<AudioEncoding> AudioEncodings { get; set; }
-		public string AudioEncoderFallback { get; set; }
-
-		public EncodingProfile Clone()
-		{
-			var profile = new EncodingProfile
-			{
-				OutputFormat = this.OutputFormat,
-				PreferredExtension = this.PreferredExtension,
-				IncludeChapterMarkers = this.IncludeChapterMarkers,
-				LargeFile = this.LargeFile,
-				Optimize = this.Optimize,
-				IPod5GSupport = this.IPod5GSupport,
-
-				Width = this.Width,
-				Height = this.Height,
-				MaxWidth = this.MaxWidth,
-				MaxHeight = this.MaxHeight,
-				CroppingType = this.CroppingType,
-				Cropping = this.Cropping.Clone(),
-				Anamorphic = this.Anamorphic,
-				UseDisplayWidth = this.UseDisplayWidth,
-				DisplayWidth = this.DisplayWidth,
-				KeepDisplayAspect = this.KeepDisplayAspect,
-				PixelAspectX = this.PixelAspectX,
-				PixelAspectY = this.PixelAspectY,
-				Modulus = this.Modulus,
-
-				Deinterlace = this.Deinterlace,
-				CustomDeinterlace = this.CustomDeinterlace,
-				Decomb = this.Decomb,
-				CustomDecomb = this.CustomDecomb,
-				Detelecine = this.Detelecine,
-				CustomDetelecine = this.CustomDetelecine,
-				Denoise = this.Denoise,
-				CustomDenoise = this.CustomDenoise,
-				Deblock = this.Deblock,
-				Grayscale = this.Grayscale,
-
-				VideoEncoder = this.VideoEncoder,
-				X264Options = this.X264Options,
-				X264Profile = this.X264Profile,
-				X264Preset = this.X264Preset,
-				X264Tunes = this.X264Tunes,
-				H264Level = this.H264Level,
-				VideoEncodeRateType = this.VideoEncodeRateType,
-				Quality = this.Quality,
-				TargetSize = this.TargetSize,
-				VideoBitrate = this.VideoBitrate,
-				TwoPass = this.TwoPass,
-				TurboFirstPass = this.TurboFirstPass,
-				Framerate = this.Framerate,
-				ConstantFramerate = this.ConstantFramerate,
-
-				AudioEncodings = new List<AudioEncoding>(this.AudioEncodings)
-			};
-
-			return profile;
-		}
-	}
+ using System.Collections.Generic;
+
+ using HandBrake.Interop.Model;
+
+ /// <summary>
+ /// The encoding profile.
+ /// </summary>
+ public class EncodingProfile
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="EncodingProfile"/> class.
+ /// </summary>
+ public EncodingProfile()
+ {
+ this.Cropping = new Cropping();
+ }
+
+ #region Destination and Output Settings
+
+ /// <summary>
+ /// Gets or sets the container name.
+ /// </summary>
+ public string ContainerName { get; set; }
+
+ /// <summary>
+ /// Gets or sets the preferred extension.
+ /// </summary>
+ public OutputExtension PreferredExtension { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether include chapter markers.
+ /// </summary>
+ public bool IncludeChapterMarkers { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether large file.
+ /// </summary>
+ public bool LargeFile { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether optimize.
+ /// </summary>
+ public bool Optimize { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether i pod 5 g support.
+ /// </summary>
+ public bool IPod5GSupport { get; set; }
+ #endregion
+
+ #region Picture Settings
+
+ /// <summary>
+ /// Gets or sets the width.
+ /// </summary>
+ public int Width { get; set; }
+
+ /// <summary>
+ /// Gets or sets the height.
+ /// </summary>
+ public int Height { get; set; }
+
+ /// <summary>
+ /// Gets or sets the max width.
+ /// </summary>
+ public int MaxWidth { get; set; }
+
+ /// <summary>
+ /// Gets or sets the max height.
+ /// </summary>
+ public int MaxHeight { get; set; }
+
+ /// <summary>
+ /// Gets or sets the scale method.
+ /// </summary>
+ public ScaleMethod ScaleMethod { get; set; }
+
+ /// <summary>
+ /// Gets or sets the cropping type.
+ /// </summary>
+ public CroppingType CroppingType { get; set; }
+
+ /// <summary>
+ /// Gets or sets the cropping.
+ /// </summary>
+ public Cropping Cropping { get; set; }
+
+ /// <summary>
+ /// Gets or sets the anamorphic.
+ /// </summary>
+ public Anamorphic Anamorphic { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether use display width.
+ /// </summary>
+ public bool UseDisplayWidth { get; set; }
+
+ /// <summary>
+ /// Gets or sets the display width.
+ /// </summary>
+ public int DisplayWidth { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether keep display aspect.
+ /// </summary>
+ public bool KeepDisplayAspect { get; set; }
+
+ /// <summary>
+ /// Gets or sets the pixel aspect x.
+ /// </summary>
+ public int PixelAspectX { get; set; }
+
+ /// <summary>
+ /// Gets or sets the pixel aspect y.
+ /// </summary>
+ public int PixelAspectY { get; set; }
+
+ /// <summary>
+ /// Gets or sets the modulus.
+ /// </summary>
+ public int Modulus { get; set; }
+
+		/// <summary>
+		/// Gets or sets the rotation.
+		/// </summary>
+		public PictureRotation Rotation { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the picture should be flipped horizontally.
+		/// </summary>
+		public bool FlipHorizontal { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the picture should be flipped vertically.
+		/// </summary>
+		public bool FlipVertical { get; set; }
+ #endregion
+
+ #region Filters
+
+ /// <summary>
+ /// Gets or sets the deinterlace.
+ /// </summary>
+ public Deinterlace Deinterlace { get; set; }
+
+ /// <summary>
+ /// Gets or sets the custom deinterlace.
+ /// </summary>
+ public string CustomDeinterlace { get; set; }
+
+ /// <summary>
+ /// Gets or sets the decomb.
+ /// </summary>
+ public Decomb Decomb { get; set; }
+
+ /// <summary>
+ /// Gets or sets the custom decomb.
+ /// </summary>
+ public string CustomDecomb { get; set; }
+
+ /// <summary>
+ /// Gets or sets the detelecine.
+ /// </summary>
+ public Detelecine Detelecine { get; set; }
+
+ /// <summary>
+ /// Gets or sets the custom detelecine.
+ /// </summary>
+ public string CustomDetelecine { get; set; }
+
+ /// <summary>
+ /// Gets or sets the denoise.
+ /// </summary>
+ public Denoise Denoise { get; set; }
+
+ /// <summary>
+ /// Gets or sets the denoise preset name.
+ /// </summary>
+ public string DenoisePreset { get; set; }
+
+ /// <summary>
+ /// Gets or sets the denoise tune name.
+ /// </summary>
+ public string DenoiseTune { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating whether we should use the provided
+		/// custom denoise string or we should use the preset and tune.
+		/// </summary>
+		public bool UseCustomDenoise { get; set; }
+
+ /// <summary>
+ /// Gets or sets the custom denoise.
+ /// </summary>
+ public string CustomDenoise { get; set; }
+
+ /// <summary>
+ /// Gets or sets the deblock.
+ /// </summary>
+ public int Deblock { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether the grayscale filter will be applied.
+ /// </summary>
+ public bool Grayscale { get; set; }
+ #endregion
+
+ #region Video
+
+ /// <summary>
+ /// Gets or sets the video encoder.
+ /// </summary>
+ public string VideoEncoder { get; set; }
+
+ /// <summary>
+ /// Gets or sets the video encoder options.
+ /// </summary>
+ public string VideoOptions { get; set; }
+
+ /// <summary>
+ /// Gets or sets the video encoder profile name.
+ /// </summary>
+ public string VideoProfile { get; set; }
+
+ /// <summary>
+ /// Gets or sets the video encoder preset name.
+ /// </summary>
+ public string VideoPreset { get; set; }
+
+ /// <summary>
+ /// Gets or sets the video encoder tunes.
+ /// </summary>
+ public List<string> VideoTunes { get; set; }
+
+		/// <summary>
+		/// Gets or sets the video encoder level.
+		/// </summary>
+		public string VideoLevel { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether to use QSV decoding.
+ /// </summary>
+ public bool QsvDecode { get; set; }
+
+ /// <summary>
+ /// Gets or sets the video encode rate type.
+ /// </summary>
+ public VideoEncodeRateType VideoEncodeRateType { get; set; }
+
+ /// <summary>
+ /// Gets or sets the quality.
+ /// </summary>
+ public double Quality { get; set; }
+
+ /// <summary>
+ /// Gets or sets the target size.
+ /// </summary>
+ public int TargetSize { get; set; }
+
+ /// <summary>
+ /// Gets or sets the video bitrate.
+ /// </summary>
+ public int VideoBitrate { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether two pass.
+ /// </summary>
+ public bool TwoPass { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether turbo first pass.
+ /// </summary>
+ public bool TurboFirstPass { get; set; }
+
+ /// <summary>
+ /// Gets or sets the framerate.
+ /// </summary>
+ public double Framerate { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether constant framerate.
+ /// </summary>
+ public bool ConstantFramerate { get; set; }
+ #endregion
+
+ #region Audio
+
+ /// <summary>
+ /// Gets or sets the audio encodings.
+ /// </summary>
+ public List<AudioEncoding> AudioEncodings { get; set; }
+
+ /// <summary>
+ /// Gets or sets the audio encoder fallback.
+ /// </summary>
+ public string AudioEncoderFallback { get; set; }
+ #endregion
+
+ /// <summary>
+ /// The clone.
+ /// </summary>
+ /// <returns>
+ /// The <see cref="EncodingProfile"/>.
+ /// </returns>
+ public EncodingProfile Clone()
+ {
+ var profile = new EncodingProfile
+ {
+ ContainerName = this.ContainerName,
+ PreferredExtension = this.PreferredExtension,
+ IncludeChapterMarkers = this.IncludeChapterMarkers,
+ LargeFile = this.LargeFile,
+ Optimize = this.Optimize,
+ IPod5GSupport = this.IPod5GSupport,
+
+ Width = this.Width,
+ Height = this.Height,
+ MaxWidth = this.MaxWidth,
+ MaxHeight = this.MaxHeight,
+ ScaleMethod = this.ScaleMethod,
+ CroppingType = this.CroppingType,
+ Cropping = this.Cropping.Clone(),
+ Anamorphic = this.Anamorphic,
+ UseDisplayWidth = this.UseDisplayWidth,
+ DisplayWidth = this.DisplayWidth,
+ KeepDisplayAspect = this.KeepDisplayAspect,
+ PixelAspectX = this.PixelAspectX,
+ PixelAspectY = this.PixelAspectY,
+ Modulus = this.Modulus,
+				Rotation = this.Rotation,
+				FlipHorizontal = this.FlipHorizontal,
+				FlipVertical = this.FlipVertical,
+
+ Deinterlace = this.Deinterlace,
+ CustomDeinterlace = this.CustomDeinterlace,
+ Decomb = this.Decomb,
+ CustomDecomb = this.CustomDecomb,
+ Detelecine = this.Detelecine,
+ CustomDetelecine = this.CustomDetelecine,
+ Denoise = this.Denoise,
+				DenoisePreset = this.DenoisePreset,
+				DenoiseTune = this.DenoiseTune,
+				UseCustomDenoise = this.UseCustomDenoise,
+ CustomDenoise = this.CustomDenoise,
+ Deblock = this.Deblock,
+ Grayscale = this.Grayscale,
+
+ VideoEncoder = this.VideoEncoder,
+				VideoOptions = this.VideoOptions,
+ VideoProfile = this.VideoProfile,
+ VideoPreset = this.VideoPreset,
+ VideoTunes = this.VideoTunes,
+				VideoLevel = this.VideoLevel,
+				QsvDecode = this.QsvDecode,
+ VideoEncodeRateType = this.VideoEncodeRateType,
+ Quality = this.Quality,
+ TargetSize = this.TargetSize,
+ VideoBitrate = this.VideoBitrate,
+ TwoPass = this.TwoPass,
+ TurboFirstPass = this.TurboFirstPass,
+ Framerate = this.Framerate,
+ ConstantFramerate = this.ConstantFramerate,
+
+ AudioEncodings = new List<AudioEncoding>(this.AudioEncodings),
+ AudioEncoderFallback = this.AudioEncoderFallback
+ };
+
+ return profile;
+ }
+ }
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBAudioEncoder.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBAudioEncoder.cs Changed

@@ -1,53 +1,96 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBAudioEncoder.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Model.Encoding
-{
-	using HandBrake.Interop.HbLib;
-
-	public class HBAudioEncoder
-	{
-		public string ShortName { get; set; }
-
-		public string DisplayName { get; set; }
-
-		public int Id { get; set; }
-
-		public Container CompatibleContainers { get; set; }
-
-		public bool SupportsQuality
-		{
-			get
-			{
-				return this.QualityLimits.High >= 0;
-			}
-		}
-
-		public RangeLimits QualityLimits { get; set; }
-
-		public float DefaultQuality { get; set; }
-
-		public bool SupportsCompression
-		{
-			get
-			{
-				return this.CompressionLimits.High >= 0;
-			}
-		}
-
-		public RangeLimits CompressionLimits { get; set; }
-
-		public float DefaultCompression { get; set; }
-
-		public bool IsPassthrough
-		{
-			get
-			{
-				return (this.Id & NativeConstants.HB_ACODEC_PASS_FLAG) > 0;
-			}
-		}
-	}
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBAudioEncoder.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The hb audio encoder.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model.Encoding
+{
+ using HandBrake.Interop.HbLib;
+
+ /// <summary>
+ /// The hb audio encoder.
+ /// </summary>
+ public class HBAudioEncoder
+ {
+ #region Public Properties
+
+ /// <summary>
+ /// Gets or sets the compatible containers.
+ /// </summary>
+ public int CompatibleContainers { get; set; }
+
+ /// <summary>
+ /// Gets or sets the compression limits.
+ /// </summary>
+ public RangeLimits CompressionLimits { get; set; }
+
+ /// <summary>
+ /// Gets or sets the default compression.
+ /// </summary>
+ public float DefaultCompression { get; set; }
+
+ /// <summary>
+ /// Gets or sets the default quality.
+ /// </summary>
+ public float DefaultQuality { get; set; }
+
+ /// <summary>
+ /// Gets or sets the display name.
+ /// </summary>
+ public string DisplayName { get; set; }
+
+ /// <summary>
+ /// Gets or sets the id.
+ /// </summary>
+ public int Id { get; set; }
+
+ /// <summary>
+ /// Gets a value indicating whether the encoder is passthrough.
+ /// </summary>
+ public bool IsPassthrough
+ {
+ get
+ {
+ return (this.Id & NativeConstants.HB_ACODEC_PASS_FLAG) > 0;
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the quality limits.
+ /// </summary>
+ public RangeLimits QualityLimits { get; set; }
+
+ /// <summary>
+ /// Gets or sets the short name.
+ /// </summary>
+ public string ShortName { get; set; }
+
+ /// <summary>
+ /// Gets a value indicating whether the encoder supports compression.
+ /// </summary>
+ public bool SupportsCompression
+ {
+ get
+ {
+ return this.CompressionLimits.High >= 0;
+ }
+ }
+
+ /// <summary>
+ /// Gets a value indicating whether the encoder supports quality.
+ /// </summary>
+ public bool SupportsQuality
+ {
+ get
+ {
+ return this.QualityLimits.High >= 0;
+ }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBContainer.cs Added

@@ -0,0 +1,41 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBContainer.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The hb container.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model.Encoding
+{
+ /// <summary>
+ /// The hb container.
+ /// </summary>
+ public class HBContainer
+ {
+ #region Public Properties
+
+ /// <summary>
+ /// Gets or sets the default extension.
+ /// </summary>
+ public string DefaultExtension { get; set; }
+
+ /// <summary>
+ /// Gets or sets the display name.
+ /// </summary>
+ public string DisplayName { get; set; }
+
+ /// <summary>
+ /// Gets or sets the id.
+ /// </summary>
+ public int Id { get; set; }
+
+ /// <summary>
+ /// Gets or sets the short name.
+ /// </summary>
+ public string ShortName { get; set; }
+
+ #endregion
+ }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBMixdown.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBMixdown.cs Changed

@@ -1,22 +1,36 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBMixdown.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Model.Encoding
-{
-	using System;
-	using System.Collections.Generic;
-	using System.Linq;
-	using System.Text;
-
-	public class HBMixdown
-	{
-		public string ShortName { get; set; }
-
-		public string DisplayName { get; set; }
-
-		public int Id { get; set; }
-	}
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBMixdown.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The hb mixdown.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model.Encoding
+{
+ /// <summary>
+ /// The hb mixdown.
+ /// </summary>
+ public class HBMixdown
+ {
+ #region Public Properties
+
+ /// <summary>
+ /// Gets or sets the display name.
+ /// </summary>
+ public string DisplayName { get; set; }
+
+ /// <summary>
+ /// Gets or sets the id.
+ /// </summary>
+ public int Id { get; set; }
+
+ /// <summary>
+ /// Gets or sets the short name.
+ /// </summary>
+ public string ShortName { get; set; }
+
+ #endregion
+ }
+}
\ No newline at end of file

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBRate.cs Added

@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBRate.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Represents a rate in HandBrake: audio sample rate or video framerate.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model.Encoding
+{
+	/// <summary>
+	/// Represents a rate in HandBrake: audio sample rate or video framerate.
+	/// </summary>
+	public class HBRate
+	{
+		/// <summary>
+		/// Gets or sets the name to use for this rate.
+		/// </summary>
+		public string Name { get; set; }
+
+		/// <summary>
+		/// Gets or sets the raw rate.
+		/// </summary>
+		public int Rate { get; set; }
+	}
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBVideoEncoder.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBVideoEncoder.cs Changed

@@ -1,19 +1,86 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBVideoEncoder.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Model.Encoding
-{
-	public class HBVideoEncoder
-	{
-		public string ShortName { get; set; }
-
-		public string DisplayName { get; set; }
-
-		public int Id { get; set; }
-
-		public Container CompatibleContainers { get; set; }
-	}
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBVideoEncoder.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The hb video encoder.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model.Encoding
+{
+	using System.Collections.Generic;
+
+	using HandBrake.Interop.HbLib;
+	using HandBrake.Interop.Helpers;
+
+	/// <summary>
+ /// The hb video encoder.
+ /// </summary>
+ public class HBVideoEncoder
+ {
+ /// <summary>
+ /// Gets or sets the compatible containers.
+ /// </summary>
+ public int CompatibleContainers { get; set; }
+
+ /// <summary>
+ /// Gets or sets the display name.
+ /// </summary>
+ public string DisplayName { get; set; }
+
+ /// <summary>
+ /// Gets or sets the id.
+ /// </summary>
+ public int Id { get; set; }
+
+ /// <summary>
+ /// Gets or sets the short name.
+ /// </summary>
+ public string ShortName { get; set; }
+
+		/// <summary>
+		/// Gets the list of presets this encoder supports. (null if the encoder doesn't support presets)
+		/// </summary>
+		public List<string> Presets
+		{
+			get
+			{
+				return InteropUtilities.ToStringListFromArrayPtr(HBFunctions.hb_video_encoder_get_presets(this.Id));
+			}
+		}
+
+		/// <summary>
+		/// Gets the list of tunes this encoder supports. (null if the encoder doesn't support tunes)
+		/// </summary>
+		public List<string> Tunes
+		{
+			get
+			{
+				return InteropUtilities.ToStringListFromArrayPtr(HBFunctions.hb_video_encoder_get_tunes(this.Id));
+			}
+		}
+
+		/// <summary>
+		/// Gets the list of profiles this encoder supports. (null if the encoder doesn't support profiles)
+		/// </summary>
+		public List<string> Profiles
+		{
+			get
+			{
+				return InteropUtilities.ToStringListFromArrayPtr(HBFunctions.hb_video_encoder_get_profiles(this.Id));
+			}
+		}
+
+		/// <summary>
+		/// Gets the list of levels this encoder supports. (null if the encoder doesn't support levels)
+		/// </summary>
+		public List<string> Levels
+		{
+			get
+			{
+				return InteropUtilities.ToStringListFromArrayPtr(HBFunctions.hb_video_encoder_get_levels(this.Id));
+			}
+		} 
+ }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/OutputExtension.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/OutputExtension.cs Changed

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/PictureRotation.cs Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/QsvPreset.cs Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/ScaleMethod.cs Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncodeRateType.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncodeRateType.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs Changed

@@ -2,24 +2,47 @@
 // <copyright file="VideoEncoder.cs" company="HandBrake Project (http://handbrake.fr)">
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
+// <summary>
+// The video encoder.
+// </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrake.Interop.Model.Encoding
 {
 	using System.ComponentModel.DataAnnotations;
 
-	public enum VideoEncoder
+	using HandBrake.Interop.Attributes;
+
+ /// <summary>
+ /// The video encoder.
+ /// </summary>
+ public enum VideoEncoder
 	{
 		[Display(Name = "H.264 (x264)")]
+ [ShortName("x264")]
 		X264 = 0,
 
-		[Display(Name = "MPEG-4 (FFmpeg)")]
+ [Display(Name = "H.264 (Intel QSV)")]
+ QuickSync,
+
+		[Display(Name = "MPEG-4")]
+ [ShortName("mpeg4")]
 		FFMpeg,
 
-		[Display(Name = "MPEG-2 (FFmpeg)")]
+		[Display(Name = "MPEG-2")]
+ [ShortName("mpeg2")]
 		FFMpeg2,
 
-		[Display(Name = "VP3 (Theora)")]
-		Theora
+		[Display(Name = "Theora")]
+ [ShortName("theora")]
+		Theora,
+
+ [Display(Name = "H.265 (x265)")]
+ [ShortName("x265")]
+ X265,
+
+ [Display(Name = "VP8")]
+ [ShortName("vp8")]
+ VP8
 	}
 }

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x265 Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x265/x265Preset.cs Added

@@ -0,0 +1,49 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="x265Preset.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the x265Preset type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model.Encoding.x265
+{
+ using System.ComponentModel.DataAnnotations;
+
+ /// <summary>
+ /// The X265 Preset
+ /// </summary>
+ public enum x265Preset
+ {
+ [Display(Name = "Ultrafast")]
+ Ultrafast,
+
+ [Display(Name = "Super Fast")]
+ Superfast,
+
+ [Display(Name = "Very Fast")]
+ VeryFast,
+
+ [Display(Name = "Faster")]
+ Faster,
+
+ [Display(Name = "Fast")]
+ Fast,
+
+ [Display(Name = "Medium")]
+ Medium,
+
+ [Display(Name = "Slow")]
+ Slow,
+
+ [Display(Name = "Slower")]
+ Slower,
+
+ [Display(Name = "Very Slow")]
+ VerySlow,
+
+ [Display(Name = "Placebo")]
+ Placebo,
+ }
+}
\ No newline at end of file

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x265/x265Profile.cs Added

@@ -0,0 +1,31 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="x265Profile.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The X265 Profile
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model.Encoding.x265
+{
+ using System.ComponentModel.DataAnnotations;
+
+ /// <summary>
+ /// The X265 Profile
+ /// </summary>
+ public enum x265Profile
+ {
+ [Display(Name = "Auto")]
+ None = 0,
+
+ [Display(Name = "Main")]
+ Main,
+
+ [Display(Name = "Main10")]
+ Main10,
+
+ [Display(Name = "Mainstillpicture")]
+ Mainstillpicture,
+ }
+}
\ No newline at end of file

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x265/x265Tune.cs Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Language.cs Added

@@ -0,0 +1,48 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Language.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Represents a language.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model
+{
+	/// <summary>
+	/// Represents a language.
+	/// </summary>
+	public class Language
+	{
+		/// <summary>
+		/// Gets or sets the english name of the language.
+		/// </summary>
+		public string EnglishName { get; set; }
+
+		/// <summary>
+		/// Gets or sets the native name of the language.
+		/// </summary>
+		public string NativeName { get; set; }
+
+		/// <summary>
+		/// Gets or sets the language code.
+		/// </summary>
+		public string Code { get; set; }
+
+		/// <summary>
+		/// Gets the display string for the language.
+		/// </summary>
+		public string Display
+		{
+			get
+			{
+				if (!string.IsNullOrEmpty(this.NativeName) && this.NativeName != this.EnglishName)
+				{
+					return this.EnglishName + " (" + this.NativeName + ")";
+				}
+
+				return this.EnglishName;
+			}
+		}
+	}
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceSubtitle.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceSubtitle.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SrtSubtitle.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/SrtSubtitle.cs Changed

@@ -14,18 +14,21 @@
 /// </summary>
 public class SrtSubtitle
 {
- #region Properties
-
 /// <summary>
 /// Gets or sets the character code.
 /// </summary>
 public string CharacterCode { get; set; }
 
 /// <summary>
- /// Gets or sets a value indicating whether default.
+ /// Gets or sets a value indicating whether the subtitle track should be marked as default.
 /// </summary>
 public bool Default { get; set; }
 
+		/// <summary>
+		/// Gets or sets a value indicating the subtitle track should be burned in.
+		/// </summary>
+		public bool BurnedIn { get; set; }
+
 /// <summary>
 /// Gets or sets the file name.
 /// </summary>
@@ -41,10 +44,6 @@
 /// </summary>
 public int Offset { get; set; }
 
- #endregion
-
- #region Public Methods
-
 /// <summary>
 /// The clone.
 /// </summary>
@@ -55,14 +54,13 @@
 {
 return new SrtSubtitle
 {
- Default = this.Default, 
+ Default = this.Default,
+						 BurnedIn = this.BurnedIn,
 FileName = this.FileName, 
 LanguageCode = this.LanguageCode, 
 CharacterCode = this.CharacterCode, 
 Offset = this.Offset
 };
 }
-
- #endregion
 }
 }
\ No newline at end of file

HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/VideoQualityLimits.cs Added

@@ -0,0 +1,37 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="VideoQualityLimits.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the VideoQualityLimits type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model
+{
+	/// <summary>
+	/// Represents limits on video quality for a particular encoder.
+	/// </summary>
+	public class VideoQualityLimits
+	{
+		/// <summary>
+		/// Gets or sets the inclusive lower limit for the quality.
+		/// </summary>
+		public float Low { get; set; }
+
+		/// <summary>
+		/// Gets or sets the inclusive upper limit for the quality.
+		/// </summary>
+		public float High { get; set; }
+
+		/// <summary>
+		/// Gets or sets the granularity for the quality.
+		/// </summary>
+		public float Granularity { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the quality increases as the number increases.
+		/// </summary>
+		public bool Ascending { get; set; }
+	}
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Properties/AssemblyInfo.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Properties/AssemblyInfo.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioCodec.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioCodec.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioTrack.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioTrack.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Chapter.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Chapter.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Subtitle.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Subtitle.cs Changed

@@ -9,7 +9,9 @@
 
 namespace HandBrake.Interop.SourceData
 {
- /// <summary>
+	using HandBrake.Interop.HbLib;
+
+	/// <summary>
 	/// An object that represents a subtitle associated with a Title, in a DVD
 	/// </summary>
 	public class Subtitle
@@ -40,6 +42,43 @@
 		public SubtitleSource SubtitleSource { get; set; }
 
 		/// <summary>
+		/// Gets or sets the subtitle source raw integer.
+		/// </summary>
+		public int SubtitleSourceInt { get; set; }
+
+		/// <summary>
+		/// Gets a value indicating whether the "forced only" flag can be set on this subtitle.
+		/// </summary>
+		public bool CanSetForcedOnly
+		{
+			get
+			{
+				return HBFunctions.hb_subtitle_can_force(this.SubtitleSourceInt) > 0;
+			}
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether this subtitle can be burned into the picture.
+		/// </summary>
+		public bool CanBurn
+		{
+			get
+			{
+				return HBFunctions.hb_subtitle_can_burn(this.SubtitleSourceInt) > 0;
+			}
+		}
+
+		/// <summary>
+		/// Returns true if the subtitle can be passed through using the given muxer.
+		/// </summary>
+		/// <param name="muxer">The muxer ID.</param>
+		/// <returns>True if the subtitle can be passed through.</returns>
+		public bool CanPass(int muxer)
+		{
+			return HBFunctions.hb_subtitle_can_pass(this.SubtitleSourceInt, muxer) > 0;
+		}
+
+		/// <summary>
 		/// Override of the ToString method to make this object easier to use in the UI
 		/// </summary>
 		/// <returns>A string formatted as: {track #} {language}</returns>
@@ -48,10 +87,10 @@
 			return string.Format("{0} {1} ({2})", this.TrackNumber, this.Language, this.SubtitleSource);
 		}
 
- /// <summary>
- /// Gets the display.
- /// </summary>
- public string Display
+		/// <summary>
+		/// Gets the display.
+		/// </summary>
+		public string Display
 		{
 			get
 			{

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Title.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Title.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Server/HandBrake.Server.csproj -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Server/HandBrake.Server.csproj Changed

@@ -36,11 +36,27 @@
 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
 <PlatformTarget>x64</PlatformTarget>
 <OutputPath>bin\Debug\</OutputPath>
+ <UseVSHostingProcess>true</UseVSHostingProcess>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
 <PlatformTarget>x64</PlatformTarget>
 <OutputPath>bin\Release\</OutputPath>
 </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x86' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x86\Debug31\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x64' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x64\Debug31\</OutputPath>
+ <PlatformTarget>x64</PlatformTarget>
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
 <ItemGroup>
 <Reference Include="System" />
 <Reference Include="System.Core" />

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Server/Program.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Server/Program.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Server/Properties/AssemblyInfo.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake.Server/Properties/AssemblyInfo.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake10.sln -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake10.sln Changed

@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30723.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.ApplicationServices", "HandBrake.ApplicationServices\HandBrake.ApplicationServices.csproj", "{087A2BA8-BAC2-4577-A46F-07FF9D420016}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeWPF", "HandBrakeWPF\HandBrakeWPF.csproj", "{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}"
@@ -12,14 +14,16 @@
 		build.xml = build.xml
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.Server", "HandBrake.Server\HandBrake.Server.csproj", "{36847BA0-6814-41E1-B1C3-1D9D874418E9}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Debug32|Any CPU = Debug32|Any CPU
+		Debug32|Mixed Platforms = Debug32|Mixed Platforms
+		Debug32|x64 = Debug32|x64
+		Debug32|x86 = Debug32|x86
 		Release|Any CPU = Release|Any CPU
 		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|x64 = Release|x64
@@ -33,6 +37,13 @@
 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x64.Build.0 = Debug|x64
 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x86.ActiveCfg = Debug|x86
 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x86.Build.0 = Debug|x86
+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug32|Any CPU.ActiveCfg = Debug32|x86
+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug32|Mixed Platforms.ActiveCfg = Debug32|x86
+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug32|Mixed Platforms.Build.0 = Debug32|x86
+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug32|x64.ActiveCfg = Debug32|x86
+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug32|x64.Build.0 = Debug32|x86
+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug32|x86.ActiveCfg = Debug32|x86
+		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug32|x86.Build.0 = Debug32|x86
 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|Any CPU.ActiveCfg = Release|x86
 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|Mixed Platforms.Build.0 = Release|x86
@@ -47,6 +58,13 @@
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x64.Build.0 = Debug|x64
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x86.ActiveCfg = Debug|x86
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|x86.Build.0 = Debug|x86
+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug32|Any CPU.ActiveCfg = Debug32|x86
+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug32|Mixed Platforms.ActiveCfg = Debug32|x86
+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug32|Mixed Platforms.Build.0 = Debug32|x86
+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug32|x64.ActiveCfg = Debug32|x86
+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug32|x64.Build.0 = Debug32|x86
+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug32|x86.ActiveCfg = Debug32|x86
+		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug32|x86.Build.0 = Debug32|x86
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|Any CPU.ActiveCfg = Release|x86
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Release|Mixed Platforms.Build.0 = Release|x86
@@ -61,6 +79,13 @@
 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x64.Build.0 = Debug|x64
 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x86.ActiveCfg = Debug|x86
 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x86.Build.0 = Debug|x86
+		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug32|Any CPU.ActiveCfg = Debug32|x86
+		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug32|Mixed Platforms.ActiveCfg = Debug32|x86
+		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug32|Mixed Platforms.Build.0 = Debug32|x86
+		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug32|x64.ActiveCfg = Debug32|x86
+		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug32|x64.Build.0 = Debug32|x86
+		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug32|x86.ActiveCfg = Debug32|x86
+		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug32|x86.Build.0 = Debug32|x86
 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|Any CPU.ActiveCfg = Release|x86
 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|Mixed Platforms.Build.0 = Release|x86
@@ -68,20 +93,6 @@
 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x64.Build.0 = Release|x64
 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x86.ActiveCfg = Release|x86
 		{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x86.Build.0 = Release|x86
-		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug|x64.ActiveCfg = Debug|x64
-		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug|x64.Build.0 = Debug|x64
-		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug|x86.ActiveCfg = Debug|x86
-		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Debug|x86.Build.0 = Debug|x86
-		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Release|Any CPU.ActiveCfg = Release|x86
-		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Release|Mixed Platforms.Build.0 = Release|x86
-		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Release|x64.ActiveCfg = Release|x64
-		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Release|x64.Build.0 = Release|x64
-		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Release|x86.ActiveCfg = Release|x86
-		{36847BA0-6814-41E1-B1C3-1D9D874418E9}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake10.sln.DotSettings -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrake10.sln.DotSettings Changed

@@ -3,6 +3,7 @@
 	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/IntelliSenseCompletingCharacters/IntelliSenseCompletingCharactersSettingCSharp/UpgradedFromVSSettings/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/LookupWindow/ShowSummary/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeEditing/Localization/CSharpLocalizationOptions/DontAnalyseVerbatimStrings/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=HandBrakeWPF_002EAnnotations/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CompareOfFloatsByEqualityOperator/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=LocalizableElement/@EntryIndexedValue">DO_NOT_SHOW</s:String>
@@ -19,8 +20,10 @@
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">StyleCop</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_ARGUMENT/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_ARRAY_AND_OBJECT_INITIALIZER/@EntryValue">True</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_AUTO_PROPERTY/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_FIELD/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_PROPERTY/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BETWEEN_USING_GROUPS/@EntryValue">1</s:Int64>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_ATTRIBUTE_STYLE/@EntryValue">SEPARATE</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_FIXED_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
@@ -54,6 +57,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_EXTENDS_LIST_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_PARAMETERS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/JavaScriptFormatOther/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CSharpMemberOrderPattern/CustomPattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-8"?&gt;&#xD;
 &lt;!-- Last updated 15.05.2012 --&gt;&#xD;
@@ -484,6 +488,8 @@
 	<s:Boolean x:Key="/Default/Environment/MemoryUsageIndicator/IsVisible/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/OpenDocument/OpenDocumentAfterModification/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SearchAndNavigation/MergeOccurences/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/UpdatesManger/IsDownloadUpdateDataAllowed/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/Environment/UserInterface/ShortcutSchemeName/@EntryValue">VS</s:String>
 	<s:String x:Key="/Default/Environment/UserInterface/ThemedIcon/PsiSymbolIcon/PsiSymbolIconThemeSelection/@EntryValue">SymbolsVs08</s:String>
@@ -1013,4 +1019,5 @@
 	<s:String x:Key="/Default/Housekeeping/VsSavedAutocompletionValue/OverrideParameterInfo/=JavaScript/@EntryIndexedValue">NotOverridden</s:String>
 	<s:String x:Key="/Default/Housekeeping/VsSavedAutocompletionValue/OverrideParameterInfo/=MsBuild/@EntryIndexedValue">NotOverridden</s:String>
 	<s:String x:Key="/Default/Housekeeping/VsSavedAutocompletionValue/OverrideParameterInfo/=VB/@EntryIndexedValue">NotOverridden</s:String>
-	<s:String x:Key="/Default/Housekeeping/VsSavedAutocompletionValue/OverrideParameterInfo/=Xaml/@EntryIndexedValue">NotOverridden</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/Housekeeping/VsSavedAutocompletionValue/OverrideParameterInfo/=Xaml/@EntryIndexedValue">NotOverridden</s:String>
+	<s:Int64 x:Key="/Default/StyleCopOptions/ParsingPerformance/@EntryValue">8</s:Int64></wpf:ResourceDictionary>
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/App.xaml.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/App.xaml.cs Changed

@@ -18,6 +18,7 @@
 
 using HandBrake.ApplicationServices.Exceptions;
 
+ using HandBrakeWPF.Utilities;
 using HandBrakeWPF.ViewModels;
 using HandBrakeWPF.ViewModels.Interfaces;
 
@@ -44,14 +45,40 @@
 /// </param>
 protected override void OnStartup(StartupEventArgs e)
 {
+ OperatingSystem OS = Environment.OSVersion;
+ if ((OS.Platform == PlatformID.Win32NT) && (OS.Version.Major == 5 && OS.Version.Minor <= 1))
+ {
+ MessageBox.Show("Windows XP and earlier are no longer supported. Version 0.9.9 was the last version to support these versions. ", "Notice", MessageBoxButton.OK, MessageBoxImage.Warning);
+ Application.Current.Shutdown();
+ return;
+ }
+
+ if (e.Args.Any(f => f.Equals("--instant")))
+ {
+ AppArguments.IsInstantHandBrake = true;
+ MessageBox.Show("Instant HandBrake is just a prototype for toying with ideas. It may or may not work, or even be included in future builds.", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning);
+ }
+
+ if (e.Args.Any(f => f.Equals("--reset")))
+ {
+ HandBrakeApp.ResetToDefaults();
+ Application.Current.Shutdown();
+ return;
+ }
+
+ if (e.Args.Any(f => f.Equals("--enable-libhb")))
+ {
+ AppArguments.EnableLibHB = true;
+ }
+
 base.OnStartup(e);
 
 // If we have a file dropped on the icon, try scanning it.
- string[] fileNames = e.Args;
- if (fileNames.Any() && (File.Exists(fileNames[0]) || Directory.Exists(fileNames[0])))
+ string[] args = e.Args;
+ if (args.Any() && (File.Exists(args[0]) || Directory.Exists(args[0])))
 {
 IMainViewModel mvm = IoC.Get<IMainViewModel>();
- mvm.StartScan(fileNames[0], 0);
+ mvm.StartScan(args[0], 0);
 }
 }
 
@@ -102,6 +129,20 @@
 {
 this.ShowError(e.Exception.InnerException);
 }
+ else if (e.Exception.InnerException != null && e.Exception.InnerException.GetType() == typeof(Castle.MicroKernel.ComponentActivator.ComponentActivatorException))
+ {
+ // Handle Component Activation Exceptions. Can happen when one of the services throws an execption when being constructed.
+ Exception innerException = e.Exception.InnerException.InnerException;
+ if (innerException != null && innerException.InnerException != null &&
+ innerException.InnerException.GetType() == typeof(GeneralApplicationException))
+ {
+ this.ShowError(innerException.InnerException);
+ }
+ else
+ {
+ this.ShowError(innerException);
+ }
+ }
 else
 {
 this.ShowError(e.Exception);
@@ -124,10 +165,10 @@
 if (windowManager != null)
 {
 ErrorViewModel errorView = new ErrorViewModel();
-
+ GeneralApplicationException applicationException = null;
 if (exception.GetType() == typeof(GeneralApplicationException))
 {
- GeneralApplicationException applicationException = exception as GeneralApplicationException;
+ applicationException = exception as GeneralApplicationException;
 if (applicationException != null)
 {
 string details = string.Format(
@@ -136,9 +177,7 @@
 Environment.NewLine,
 applicationException.Solution,
 Environment.NewLine,
- applicationException.ActualException != null
- ? applicationException.ActualException.ToString()
- : "No additional exception information available.");
+ applicationException.ActualException != null ? applicationException.ActualException.ToString() : "No additional exception information available.");
 
 errorView.ErrorMessage = applicationException.Error;
 errorView.Solution = applicationException.Solution;
@@ -150,7 +189,17 @@
 errorView.Details = exception.ToString();
 }
 
- windowManager.ShowDialog(errorView);
+ try
+ {
+ windowManager.ShowDialog(errorView);
+ }
+ catch (Exception)
+ {
+ if (applicationException != null)
+ {
+ MessageBox.Show(applicationException.Error + Environment.NewLine + Environment.NewLine + applicationException.Solution, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ }
+ }
 }
 }
 catch (Exception)

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/AppArguments.cs Added

@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AppArguments.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the AppArguments type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF
+{
+ /// <summary>
+ /// The app arguments.
+ /// </summary>
+ public class AppArguments
+ {
+ /// <summary>
+ /// Gets or sets a value indicating whether is instant hand brake.
+ /// </summary>
+ public static bool IsInstantHandBrake { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether enable lib hb.
+ /// </summary>
+ public static bool EnableLibHB { get; set; }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Commands/CancelScanCommand.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Commands/CancelScanCommand.cs Changed

@@ -22,7 +22,7 @@
 /// <summary>
 /// The scan service wrapper.
 /// </summary>
- private readonly IScanServiceWrapper scanServiceWrapper;
+ private readonly IScan scanServiceWrapper;
 
 /// <summary>
 /// Initializes a new instance of the <see cref="CancelScanCommand"/> class.
@@ -30,7 +30,7 @@
 /// <param name="ssw">
 /// The scan service wrapper.
 /// </param>
- public CancelScanCommand(IScanServiceWrapper ssw)
+ public CancelScanCommand(IScan ssw)
 {
 this.scanServiceWrapper = ssw;
 this.scanServiceWrapper.ScanStared += this.ScanServiceWrapperScanStared;
@@ -49,7 +49,7 @@
 /// </param>
 private void ScanServiceWrapperScanCompleted(object sender, HandBrake.ApplicationServices.EventArgs.ScanCompletedEventArgs e)
 {
- Caliburn.Micro.Execute.OnUIThread(() => this.CanExecuteChanged(sender, EventArgs.Empty)); 
+ Caliburn.Micro.Execute.OnUIThread(this.OnCanExecuteChanged); 
 }
 
 /// <summary>
@@ -64,7 +64,7 @@
 /// </param>
 private void ScanServiceWrapperScanStared(object sender, EventArgs e)
 {
- Caliburn.Micro.Execute.OnUIThread(() => this.CanExecuteChanged(sender, EventArgs.Empty)); 
+ Caliburn.Micro.Execute.OnUIThread(this.OnCanExecuteChanged); 
 }
 
 #region Implementation of ICommand
@@ -100,6 +100,18 @@
 /// </summary>
 public event EventHandler CanExecuteChanged;
 
+ /// <summary>
+ /// The on can execute changed.
+ /// </summary>
+ protected virtual void OnCanExecuteChanged()
+ {
+ EventHandler handler = this.CanExecuteChanged;
+ if (handler != null)
+ {
+ handler(this, EventArgs.Empty);
+ }
+ }
+
 #endregion
 }
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Commands/OpenOptionsScreenCommand.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Commands/OpenOptionsScreenCommand.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs Changed

@@ -10,6 +10,7 @@
 namespace HandBrakeWPF.Commands
 {
     using System;
+    using System.Windows;
     using System.Windows.Input;
 
     using Caliburn.Micro;
@@ -81,6 +82,12 @@
                 if (gesture.Modifiers == ModifierKeys.Control && gesture.Key == Key.F)
                 {
                     mainViewModel.FileScan();
+                    MessageBox.Show("Please use Ctrl-O in future. Ctrl-F is being deprecated in favour of something more standard. :)");
+                }
+
+                if (gesture.Modifiers == ModifierKeys.Control && gesture.Key == Key.O)
+                {
+                    mainViewModel.FileScan();
                 }
 
                 // Scan a Folder (Ctrl+R)
@@ -88,6 +95,11 @@
                 {
                     mainViewModel.FolderScan();
                 }
+
+                if (gesture.Modifiers == (ModifierKeys.Control | ModifierKeys.Shift) && gesture.Key == Key.D)
+                {
+                    mainViewModel.ShowCliQuery();
+                }
             }
         }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Commands/SourceMenuCommand.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Commands/SourceMenuCommand.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Constants.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Constants.cs Changed

@@ -17,11 +17,56 @@
 /// <summary>
 /// The appcast 64.
 /// </summary>
- public const string Appcast64 = "http://handbrake.fr/appcast.x86_64.xml";
+ public const string Appcast64 = "https://handbrake.fr/appcast.x86_64.xml";
 
 /// <summary>
 /// The appcast 32.
 /// </summary>
- public const string Appcast32 = "http://handbrake.fr/appcast.i386.xml";
+ public const string Appcast32 = "https://handbrake.fr/appcast.i386.xml";
+
+ /// <summary>
+ /// The appcast 32.
+ /// </summary>
+ public const string AppcastUnstable32 = "https://handbrake.fr/appcast_unstable.i386.xml";
+
+ /// <summary>
+ /// The appcast 32.
+ /// </summary>
+ public const string AppcastUnstable64 = "https://handbrake.fr/appcast_unstable.x86_64.xml";
+
+ /// <summary>
+ /// The any.
+ /// </summary>
+ public const string Any = "(Any)";
+
+ /// <summary>
+ /// The chapters.
+ /// </summary>
+ public const string Chapters = "{chapters}";
+
+ /// <summary>
+ /// The title.
+ /// </summary>
+ public const string Title = "{title}";
+
+ /// <summary>
+ /// The quality.
+ /// </summary>
+ public const string Quality = "{quality}";
+
+ /// <summary>
+ /// The quality.
+ /// </summary>
+ public const string Date = "{date}";
+
+ /// <summary>
+ /// The quality.
+ /// </summary>
+ public const string Time = "{time}";
+
+ /// <summary>
+ /// The bitrate.
+ /// </summary>
+ public const string Bitrate = "{bitrate}";
 }
 }

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Controls/DropButton Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Controls/DropButton/DropButton.cs Added

@@ -0,0 +1,65 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="DropButton.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the DropDownButton type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Controls.DropButton
+{
+ using System.Windows;
+ using System.Windows.Controls;
+ using System.Windows.Controls.Primitives;
+ using System.Windows.Data;
+
+ /// <summary>
+ /// The drop down button.
+ /// </summary>
+ public class DropButton : ToggleButton
+ {
+ /// <summary>
+ /// The drop down property.
+ /// </summary>
+ public static readonly DependencyProperty DropDownProperty =
+ DependencyProperty.Register("DropDown",
+ typeof(ContextMenu),
+ typeof(DropButton),
+ new UIPropertyMetadata(null));
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="DropButton"/> class.
+ /// </summary>
+ public DropButton()
+ {
+ // Bind the ToogleButton.IsChecked property to the drop-down's IsOpen property 
+ Binding binding = new Binding("DropDown.IsOpen") { Source = this };
+ this.SetBinding(IsCheckedProperty, binding);
+ }
+
+ /// <summary>
+ /// Gets or sets the drop down.
+ /// </summary>
+ public ContextMenu DropDown
+ {
+ get { return (ContextMenu)this.GetValue(DropDownProperty); }
+ set { this.SetValue(DropDownProperty, value); }
+ }
+
+ /// <summary>
+ /// Handle the users click on the button.
+ /// </summary>
+ protected override void OnClick()
+ {
+ if (this.DropDown != null)
+ {
+ // If there is a drop-down assigned to this button, then position and display it 
+
+ this.DropDown.PlacementTarget = this;
+ this.DropDown.Placement = PlacementMode.Bottom;
+ this.DropDown.IsOpen = true;
+ }
+ }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Controls/NumberBox.xaml -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Controls/NumberBox.xaml Changed

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml Added

@@ -0,0 +1,90 @@
+<UserControl x:Class="HandBrakeWPF.Controls.SourceSelection"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:cal="http://www.caliburnproject.org"
+ xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
+ Background="{Binding Path=Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}">
+
+ <Grid VerticalAlignment="Top" HorizontalAlignment="Center">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+ 
+ 
+ <StackPanel Orientation="Horizontal" Grid.Row="0" Margin="5,8,0,0">
+ <TextBlock Text="Source Selection" FontSize="14" FontWeight="Bold" /> 
+ </StackPanel>
+
+ 
+ <StackPanel Grid.Row="1" Orientation="Vertical" HorizontalAlignment="Left" Margin="5,5,0,0">
+ <StackPanel Orientation="Horizontal">
+ <TextBlock Text="Optionally choose a specific title: " />
+
+ <controls:NumberBox Width="60" Height="24" Margin="10,0,0,0"
+ Minimum="0" Maximum="1000" Number="{Binding TitleSpecificScan, Mode=TwoWay}" />
+ </StackPanel>
+
+ <TextBlock Text="Then choose your source: " Margin="0,10,0,0" />
+ </StackPanel>
+
+ 
+ <StackPanel Grid.Row="2" Orientation="Vertical" HorizontalAlignment="Left" Margin="5,5,0,0">
+
+ 
+ <Button AutomationProperties.Name="Choose Folder to Scan" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" cal:Message.Attach="[Event Click] = [Action FolderScan]"
+ Margin="0,0,0,7" Padding="8" HorizontalAlignment="Left">
+ 
+ <StackPanel Orientation="Horizontal" MinWidth="100">
+ <Image Source="../Views/Images/folder32.png" Width="32" />
+ <StackPanel Orientation="Vertical">
+ <TextBlock Text="Folder" VerticalAlignment="Center" Margin="5,0,0,0" />
+ <TextBlock Text="Open a VIDEO_TS folder or a batch of files" VerticalAlignment="Center" Margin="5,0,0,0" />
+ </StackPanel> 
+ </StackPanel>
+ </Button>
+
+ 
+ <Button AutomationProperties.Name="Choose File to Scan" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" cal:Message.Attach="[Event Click] = [Action FileScan]"
+ Margin="0,0,0,7" Padding="8" HorizontalAlignment="Left">
+ <StackPanel Orientation="Horizontal" MinWidth="100">
+ <Image Source="../Views/Images/File32.png" Width="32" />
+ <StackPanel Orientation="Vertical">
+ <TextBlock Text="File" VerticalAlignment="Center" Margin="5,0,0,0" />
+ <TextBlock Text="Open a single file." VerticalAlignment="Center" Margin="5,0,0,0" />
+ </StackPanel>
+ </StackPanel>
+ </Button>
+ 
+ <ListBox ItemsSource="{Binding Drives}" Background="Transparent" BorderThickness="0">
+ <ListBox.ItemTemplate>
+ <DataTemplate>
+ <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" 
+ cal:Message.Attach="[Event Click] = [Action ProcessDrive($this.Tag)]"
+ Margin="0,0,0,10" Padding="8" HorizontalAlignment="Left" 
+ Tag="{Binding}" AutomationProperties.Name="Choose Disc to Scan">
+ <StackPanel Orientation="Horizontal" MinWidth="100">
+ <Image Source="../Views/Images/Disc.png" Width="32" />
+ <StackPanel Orientation="Vertical">
+ <TextBlock Text="{Binding Text}" VerticalAlignment="Center" Margin="5,0,0,0" />
+ <TextBlock Text="Open this DVD or Bluray Drive" VerticalAlignment="Center" Margin="5,0,0,0" />
+ </StackPanel>
+ </StackPanel>
+ </Button>
+ </DataTemplate>
+ </ListBox.ItemTemplate>
+ 
+ </ListBox>
+ </StackPanel>
+
+ 
+ <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,10,10">
+ <Button cal:Message.Attach="[Event Click] = [Action CloseSourceSelection]" Content="Cancel" Padding="8,2" />
+ </StackPanel>
+
+ </Grid>
+</UserControl>

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml.cs Added

@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SourceSelection.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Interaction logic for SourceSelection.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Controls
+{
+ using System.Windows.Controls;
+
+ /// <summary>
+ /// Interaction logic for SourceSelection.xaml
+ /// </summary>
+ public partial class SourceSelection : UserControl
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="SourceSelection"/> class. 
+ /// </summary>
+ public SourceSelection()
+ {
+ this.InitializeComponent();
+ }
+ }
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Controls/SplitButton Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Controls/SplitButton/SplitMenuButton.cs Added

@@ -0,0 +1,297 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SplitMenuButton.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// A Split Menu Button Control
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Controls.SplitButton
+{
+ using System;
+ using System.Collections.ObjectModel;
+ using System.Windows;
+ using System.Windows.Controls;
+ using System.Windows.Input;
+
+ /// <summary>
+ /// A Split Menu Button Control
+ /// </summary>
+ [TemplatePart(Name = SplitElementName, Type = typeof(UIElement))]
+ public class SplitMenuButton : Button
+ {
+ #region Fields and Constants
+
+ /// <summary>
+ /// The split element name.
+ /// </summary>
+ private const string SplitElementName = "SplitElement";
+
+ /// <summary>
+ /// The item source for the context menu
+ /// </summary>
+ private readonly ObservableCollection<object> itemSource = new ObservableCollection<object>();
+
+ /// <summary>
+ /// The is mouse over split element.
+ /// </summary>
+ private bool IsMouseOverSplitElement;
+
+ /// <summary>
+ /// The context menu.
+ /// </summary>
+ private ContextMenu contextMenu;
+
+ /// <summary>
+ /// The context menu initial offset.
+ /// </summary>
+ private Point contextMenuInitialOffset;
+
+ /// <summary>
+ /// The logical child.
+ /// </summary>
+ private DependencyObject logicalChild;
+
+ /// <summary>
+ /// The split element.
+ /// </summary>
+ private UIElement splitElement;
+
+ #endregion
+
+ #region Constructors and Destructors
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="SplitMenuButton" /> class.
+ /// </summary>
+ public SplitMenuButton()
+ {
+ this.DefaultStyleKey = typeof(SplitMenuButton);
+ }
+
+ #endregion
+
+ #region Public Properties
+
+ /// <summary>
+ /// Gets the ItemSource for the Context Menu
+ /// </summary>
+ public Collection<object> ItemSource
+ {
+ get
+ {
+ return this.itemSource;
+ }
+ }
+
+ #endregion
+
+ #region Public Methods and Operators
+
+ /// <summary>
+ /// Called when the template is changed.
+ /// </summary>
+ public override void OnApplyTemplate()
+ {
+ // Unhook existing handlers
+ if (this.splitElement != null)
+ {
+ this.splitElement.MouseEnter -= this.SplitElement_MouseEnter;
+ this.splitElement.MouseLeave -= this.SplitElement_MouseLeave;
+ this.splitElement = null;
+ }
+ if (this.contextMenu != null)
+ {
+ this.contextMenu.Opened -= this.ContextMenu_Opened;
+ this.contextMenu.Closed -= this.ContextMenu_Closed;
+ this.contextMenu = null;
+ }
+
+ if (this.logicalChild != null)
+ {
+ this.RemoveLogicalChild(this.logicalChild);
+ this.logicalChild = null;
+ }
+
+ // Apply new template
+ base.OnApplyTemplate();
+
+ // Hook new event handlers
+ this.splitElement = this.GetTemplateChild(SplitElementName) as UIElement;
+ if (this.splitElement != null)
+ {
+ this.splitElement.MouseEnter += this.SplitElement_MouseEnter;
+ this.splitElement.MouseLeave += this.SplitElement_MouseLeave;
+
+ this.contextMenu = ContextMenuService.GetContextMenu(this.splitElement);
+ if (this.contextMenu != null)
+ {
+ // Add the ContextMenu as a logical child (for DataContext and RoutedCommands)
+ this.contextMenu.Visibility = Visibility.Collapsed;
+ this.contextMenu.IsOpen = true;
+ DependencyObject current = this.contextMenu;
+ do
+ {
+ this.logicalChild = current;
+ current = LogicalTreeHelper.GetParent(current);
+ }
+ while (null != current);
+
+ this.contextMenu.IsOpen = false; 
+ this.AddLogicalChild(this.logicalChild);
+
+ this.contextMenu.Opened += this.ContextMenu_Opened;
+ this.contextMenu.Closed += this.ContextMenu_Closed; 
+ }
+ }
+ }
+
+ #endregion
+
+ #region Methods
+
+ /// <summary>
+ /// Called when the Button is clicked.
+ /// </summary>
+ protected override void OnClick()
+ {
+ if (this.IsMouseOverSplitElement)
+ {
+ this.OpenButtonMenu();
+ }
+ else
+ {
+ base.OnClick();
+ }
+ }
+
+ /// <summary>
+ /// Called when a key is pressed.
+ /// </summary>
+ /// <param name="e">
+ /// The e.
+ /// </param>
+ protected override void OnKeyDown(KeyEventArgs e)
+ {
+ if (null == e)
+ {
+ throw new ArgumentNullException("e");
+ }
+
+ if (Key.Down == e.Key || Key.Up == e.Key)
+ {
+ this.Dispatcher.BeginInvoke((Action)this.OpenButtonMenu);
+ }
+ else
+ {
+ base.OnKeyDown(e);
+ }
+ }
+
+ /// <summary>
+ /// The open button menu.
+ /// </summary>
+ protected void OpenButtonMenu()
+ {
+ if ((0 < this.ItemSource.Count) && (null != this.contextMenu))
+ {
+ this.contextMenu.HorizontalOffset = 0;
+ this.contextMenu.VerticalOffset = 0;
+ this.contextMenu.Visibility = Visibility.Visible;
+ this.contextMenu.IsOpen = true;
+ }
+ }
+
+ /// <summary>
+ /// The context menu closed.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The RoutedEventArgs.
+ /// </param>
+ private void ContextMenu_Closed(object sender, RoutedEventArgs e)
+ {
+ this.LayoutUpdated -= this.SplitButton_LayoutUpdated;
+ this.Focus();
+ }
+
+ /// <summary>
+ /// The context menu opened.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The RoutedEventArgs.
+ /// </param>
+ private void ContextMenu_Opened(object sender, RoutedEventArgs e)
+ {
+ this.contextMenuInitialOffset = this.TranslatePoint(new Point(0, this.ActualHeight), this.contextMenu);
+ this.UpdateContextMenuOffsets();
+ this.LayoutUpdated += this.SplitButton_LayoutUpdated;
+ }
+
+ /// <summary>
+ /// The split button layout updated.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The EventArgs.
+ /// </param>
+ private void SplitButton_LayoutUpdated(object sender, EventArgs e)
+ {
+ this.UpdateContextMenuOffsets();
+ }
+
+ /// <summary>
+ /// The split element_ mouse enter.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The MouseEventArgs.
+ /// </param>
+ private void SplitElement_MouseEnter(object sender, MouseEventArgs e)
+ {
+ this.IsMouseOverSplitElement = true;
+ }
+
+ /// <summary>
+ /// The split element mouse leave.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The MouseEventArgs
+ /// </param>
+ private void SplitElement_MouseLeave(object sender, MouseEventArgs e)
+ {
+ this.IsMouseOverSplitElement = false;
+ }
+
+ /// <summary>
+ /// The update context menu offsets.
+ /// </summary>
+ private void UpdateContextMenuOffsets()
+ {
+ var currentOffset = new Point();
+ Point desiredOffset = this.contextMenuInitialOffset;
+
+ this.contextMenu.HorizontalOffset = desiredOffset.X - currentOffset.X;
+ this.contextMenu.VerticalOffset = desiredOffset.Y - currentOffset.Y;
+ if (FlowDirection.RightToLeft == this.FlowDirection)
+ {
+ this.contextMenu.HorizontalOffset *= -1;
+ }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/AdvancedVisibilityConverter.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Converters/AdvancedVisibilityConverter.cs Changed

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Converters/Audio/AudioBehaviourConverter.cs Added

@@ -0,0 +1,90 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AudioBehaviourConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Audio Behaviour Converter
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Audio
+{
+ using System;
+ using System.ComponentModel;
+ using System.Globalization;
+ using System.Linq;
+ using System.Windows.Data;
+
+ using HandBrake.ApplicationServices.Model.Audio;
+ using HandBrake.ApplicationServices.Utilities;
+
+ /// <summary>
+ /// Audio Behaviour Converter
+ /// </summary>
+ public class AudioBehaviourConverter : IValueConverter
+ {
+ /// <summary>
+ /// The convert.
+ /// </summary>
+ /// <param name="value">
+ /// The value.
+ /// </param>
+ /// <param name="targetType">
+ /// The target type.
+ /// </param>
+ /// <param name="parameter">
+ /// The parameter.
+ /// </param>
+ /// <param name="culture">
+ /// The culture.
+ /// </param>
+ /// <returns>
+ /// The <see cref="object"/>.
+ /// </returns>
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ if (value != null && value.GetType() == typeof(BindingList<AudioBehaviourModes>))
+ {
+ return
+ new BindingList<string>(
+ EnumHelper<AudioBehaviourModes>.GetEnumDisplayValues(typeof(AudioBehaviourModes)).ToList());
+ }
+
+ if (value != null && value.GetType() == typeof(AudioBehaviourModes))
+ {
+ return EnumHelper<AudioBehaviourModes>.GetDisplay((AudioBehaviourModes)value);
+ }
+
+ return null;
+ }
+
+ /// <summary>
+ /// The convert back.
+ /// </summary>
+ /// <param name="value">
+ /// The value.
+ /// </param>
+ /// <param name="targetType">
+ /// The target type.
+ /// </param>
+ /// <param name="parameter">
+ /// The parameter.
+ /// </param>
+ /// <param name="culture">
+ /// The culture.
+ /// </param>
+ /// <returns>
+ /// The <see cref="object"/>.
+ /// </returns>
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ string name = value as string;
+ if (!string.IsNullOrEmpty(name))
+ {
+ return EnumHelper<AudioBehaviourModes>.GetValue(name);
+ }
+
+ return null;
+ }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs Changed

@@ -70,14 +70,10 @@
 int samplerate = this.GetBestSampleRate(track);
 int srShift = this.GetSamplerateShift(samplerate);
 int lfeCount = this.GetLowFreqChannelCount(track.MixDown);
- int channels = this.GetChannelCount(track.MixDown) - lfeCount;
+ int channels = this.GetDiscreteChannelCount(track.MixDown) - lfeCount;
 
 switch (track.Encoder)
 {
- case AudioEncoder.Faac:
- low = (channels + lfeCount) * 32;
- max = (channels + lfeCount) * (192 >> srShift);
- break;
 case AudioEncoder.ffaac:
 low = ((channels + lfeCount) * 32);
 max = ((channels + lfeCount) * ((192 + (64 * ((samplerate << srShift) >= 44100 ? 1 : 0))) >> srShift));
@@ -101,8 +97,17 @@
 case AudioEncoder.Mp3Passthru:
 case AudioEncoder.Passthrough:
 case AudioEncoder.ffflac:
+ case AudioEncoder.ffflac24:
 max = 1536; // Since we don't care, just set it to the max.
 break;
+ case AudioEncoder.fdkaac:
+ low = channels * samplerate * 2 / 3000;
+ max = channels * samplerate * 6 / 1000;
+ break;
+ case AudioEncoder.fdkheaac:
+ low = (channels * (12 + (4 * (samplerate >= 44100 ? 1 : 0))));
+ max = (channels - (channels > 2 ? 1 : 0)) * (48 + (16 * (samplerate >= 22050 ? 1 : 0)));
+ break;
 default:
 max = 768;
 break;
@@ -132,7 +137,7 @@
 /// <returns>
 /// The System.Int32.
 /// </returns>
- private int GetChannelCount(Mixdown mixdown)
+ private int GetDiscreteChannelCount(Mixdown mixdown)
 {
 switch (mixdown)
 {
@@ -228,6 +233,10 @@
 {
 // AC-3 < 32 kHz suffers from poor hardware compatibility
 bestSamplerate = 32000;
+ } 
+ else if ((samplerate < 16000) && (track.Encoder == AudioEncoder.fdkheaac))
+ {
+ bestSamplerate = 16000;
 }
 else
 {

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs Changed

@@ -13,6 +13,7 @@
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Text;
+ using System.Threading.Tasks;
 using System.Windows.Data;
 
 using HandBrake.ApplicationServices.Model.Encoding;
@@ -39,18 +40,16 @@
 {
 foreach (AudioTrack track in tracks)
 {
- if (string.IsNullOrEmpty(audioTracks.ToString()))
- {
- audioTracks.Append(EnumHelper<AudioEncoder>.GetDisplay(track.Encoder));
- }
- else
- {
- audioTracks.Append(", " + EnumHelper<AudioEncoder>.GetDisplay(track.Encoder));
- }
+ string trackName = string.Format(
+ "{0} {1}",
+ track.ScannedTrack.TrackNumber,
+ track.ScannedTrack.Language);
+
+ audioTracks.Append(string.Format("{0} - {1} To {2}{3}", trackName, track.TrackName, EnumHelper<AudioEncoder>.GetDisplay(track.Encoder), Environment.NewLine)); 
 }
 }
 
- return audioTracks.ToString();
+ return audioTracks.ToString().Trim();
 }
 
 /// <summary>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs Changed

@@ -15,6 +15,7 @@
 using System;
 
 using HandBrake.ApplicationServices.Model;
+ using HandBrake.ApplicationServices.Model.Encoding;
 using HandBrake.ApplicationServices.Utilities;
 using HandBrake.Interop.Model.Encoding;
 using HandBrake.Interop.Model.Encoding.x264;
@@ -65,7 +66,10 @@
 {
 return EnumHelper<Mixdown>.GetEnumDisplayValues(typeof(Mixdown));
 }
- 
+ if (targetType == typeof(QsvPreset) || value.GetType() == typeof(QsvPreset))
+ {
+ return EnumHelper<QsvPreset>.GetDisplay((QsvPreset)value);
+ }
 if (value is IEnumerable<PresetPictureSettingsMode>)
 {
 return EnumHelper<PresetPictureSettingsMode>.GetEnumDisplayValues(typeof(PresetPictureSettingsMode));
@@ -86,8 +90,14 @@
 {
 return EnumHelper<Denoise>.GetEnumDisplayValues(typeof(Denoise));
 }
-
-
+ if (value is IEnumerable<VideoScaler>)
+ {
+ return EnumHelper<VideoScaler>.GetEnumDisplayValues(typeof(VideoScaler));
+ }
+ if (value is IEnumerable<OutputFormat>)
+ {
+ return EnumHelper<OutputFormat>.GetEnumDisplayValues(typeof(OutputFormat));
+ }
 
 // Single Items
 if (targetType == typeof(x264Preset) || value.GetType() == typeof(x264Preset))
@@ -136,6 +146,16 @@
 return EnumHelper<QueueItemStatus>.GetDisplay((QueueItemStatus)value);
 }
 
+ if (targetType == typeof(VideoScaler) || value.GetType() == typeof(VideoScaler))
+ {
+ return EnumHelper<VideoScaler>.GetDisplay((VideoScaler)value);
+ }
+
+ if (targetType == typeof(OutputFormat) || value.GetType() == typeof(OutputFormat))
+ {
+ return EnumHelper<OutputFormat>.GetDisplay((OutputFormat)value);
+ }
+
 return null;
 }
 
@@ -182,7 +202,10 @@
 {
 return EnumHelper<Mixdown>.GetValue(value.ToString());
 }
-
+ if (targetType == typeof(QsvPreset) || value.GetType() == typeof(QsvPreset))
+ {
+ return EnumHelper<QsvPreset>.GetValue(value.ToString());
+ }
 if (targetType == typeof(PresetPictureSettingsMode) || value.GetType() == typeof(PresetPictureSettingsMode))
 {
 return EnumHelper<PresetPictureSettingsMode>.GetValue(value.ToString());
@@ -203,6 +226,15 @@
 {
 return EnumHelper<Detelecine>.GetValue(value.ToString());
 }
+ if (targetType == typeof(VideoScaler) || value.GetType() == typeof(VideoScaler))
+ {
+ return EnumHelper<VideoScaler>.GetValue(value.ToString());
+ }
+
+ if (targetType == typeof(OutputFormat) || value.GetType() == typeof(OutputFormat))
+ {
+ return EnumHelper<OutputFormat>.GetValue(value.ToString());
+ }
 
 return null;
 }

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Converters/Filters Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs Added

@@ -0,0 +1,87 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="DenoisePresetConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the DenoisePresetConverter type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Filters
+{
+ using System;
+ using System.Collections.Generic;
+ using System.Globalization;
+ using System.Linq;
+ using System.Windows.Data;
+
+ using HandBrake.ApplicationServices.Model.Encoding;
+ using HandBrake.Interop.Model.Encoding;
+
+ /// <summary>
+ /// The denoise preset converter.
+ /// </summary>
+ public class DenoisePresetConverter : IMultiValueConverter
+ {
+ /// <summary>
+ /// The convert.
+ /// </summary>
+ /// <param name="values">
+ /// The values.
+ /// </param>
+ /// <param name="targetType">
+ /// The target type.
+ /// </param>
+ /// <param name="parameter">
+ /// The parameter.
+ /// </param>
+ /// <param name="culture">
+ /// The culture.
+ /// </param>
+ /// <returns>
+ /// The <see cref="object"/>.
+ /// </returns>
+ public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+ {
+ if (values.Any() && values.Count() == 2)
+ {
+ Denoise denoiseChoice = (Denoise)values[1];
+
+ if (denoiseChoice == Denoise.hqdn3d)
+ {
+ return new List<DenoisePreset> { DenoisePreset.Weak, DenoisePreset.Medium, DenoisePreset.Strong, DenoisePreset.Custom };
+ }
+
+ if (denoiseChoice == Denoise.NLMeans)
+ {
+ return new List<DenoisePreset> { DenoisePreset.Ultralight, DenoisePreset.Light, DenoisePreset.Medium, DenoisePreset.Strong };
+ } 
+ }
+
+ return Enumerable.Empty<DenoisePreset>();
+ }
+
+ /// <summary>
+ /// The convert back. Not used
+ /// </summary>
+ /// <param name="value">
+ /// The value.
+ /// </param>
+ /// <param name="targetTypes">
+ /// The target types.
+ /// </param>
+ /// <param name="parameter">
+ /// The parameter.
+ /// </param>
+ /// <param name="culture">
+ /// The culture.
+ /// </param>
+ /// <returns>
+ /// The Nothing. Not used
+ /// </returns>
+ public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/FullPathToFileNameConverter.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Converters/FullPathToFileNameConverter.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/InverseBooleanConverter.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Converters/InverseBooleanConverter.cs Changed

@@ -16,13 +16,9 @@
 /// <summary>
 /// The inverse boolean converter.
 /// </summary>
- [ValueConversion(typeof(bool), typeof(bool))]
+ [ValueConversion(typeof(bool?), typeof(bool))]
 public class InverseBooleanConverter : IValueConverter
 {
- #region Implemented Interfaces
-
- #region IValueConverter
-
 /// <summary>
 /// The convert.
 /// </summary>
@@ -43,12 +39,14 @@
 /// </returns>
 public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
 {
- if (targetType != typeof(bool))
+ if (targetType != typeof(bool?) && targetType != typeof(bool))
 {
 throw new InvalidOperationException("The target must be a boolean");
 }
 
- return !(bool)value;
+ bool result;
+ bool.TryParse(value.ToString(), out result);
+ return !result;
 }
 
 /// <summary>
@@ -71,11 +69,7 @@
 /// </returns>
 public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
 {
- throw new NotSupportedException();
+ return null;
 }
-
- #endregion
-
- #endregion
 }
 }
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs Changed

@@ -7,7 +7,6 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-
 namespace HandBrakeWPF.Converters.Options
 {
 using System;
@@ -41,9 +40,7 @@
 case OptionsTab.OutputFiles:
 if ((OptionsTab)parameter == OptionsTab.OutputFiles) return Visibility.Visible;
 break;
- case OptionsTab.AudioAndSubtitles:
- if ((OptionsTab)parameter == OptionsTab.AudioAndSubtitles) return Visibility.Visible;
- break;
+
 case OptionsTab.Advanced:
 if ((OptionsTab)parameter == OptionsTab.Advanced) return Visibility.Visible;
 break;
@@ -53,6 +50,9 @@
 case OptionsTab.About:
 if ((OptionsTab)parameter == OptionsTab.About) return Visibility.Visible;
 break;
+ case OptionsTab.Video:
+ if ((OptionsTab)parameter == OptionsTab.Video) return Visibility.Visible;
+ break;
 }
 }

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitleBehaviourConverter.cs Added

@@ -0,0 +1,90 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SubtitleBehaviourConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Subtitle Behaviour Converter
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Subtitles
+{
+ using System;
+ using System.ComponentModel;
+ using System.Globalization;
+ using System.Linq;
+ using System.Windows.Data;
+
+ using HandBrake.ApplicationServices.Model.Subtitle;
+ using HandBrake.ApplicationServices.Utilities;
+
+ /// <summary>
+ /// Subtitle Behaviour Converter
+ /// </summary>
+ public class SubtitleBehaviourConverter : IValueConverter
+ {
+ /// <summary>
+ /// The convert.
+ /// </summary>
+ /// <param name="value">
+ /// The value.
+ /// </param>
+ /// <param name="targetType">
+ /// The target type.
+ /// </param>
+ /// <param name="parameter">
+ /// The parameter.
+ /// </param>
+ /// <param name="culture">
+ /// The culture.
+ /// </param>
+ /// <returns>
+ /// The <see cref="object"/>.
+ /// </returns>
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ if (value != null && value.GetType() == typeof(BindingList<SubtitleBehaviourModes>))
+ {
+ return
+ new BindingList<string>(
+ EnumHelper<SubtitleBehaviourModes>.GetEnumDisplayValues(typeof(SubtitleBehaviourModes)).ToList());
+ }
+
+ if (value != null && value.GetType() == typeof(SubtitleBehaviourModes))
+ {
+ return EnumHelper<SubtitleBehaviourModes>.GetDisplay((SubtitleBehaviourModes)value);
+ }
+
+ return null;
+ }
+
+ /// <summary>
+ /// The convert back.
+ /// </summary>
+ /// <param name="value">
+ /// The value.
+ /// </param>
+ /// <param name="targetType">
+ /// The target type.
+ /// </param>
+ /// <param name="parameter">
+ /// The parameter.
+ /// </param>
+ /// <param name="culture">
+ /// The culture.
+ /// </param>
+ /// <returns>
+ /// The <see cref="object"/>.
+ /// </returns>
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ string name = value as string;
+ if (!string.IsNullOrEmpty(name))
+ {
+ return EnumHelper<SubtitleBehaviourModes>.GetValue(name);
+ }
+
+ return null;
+ }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs Changed

@@ -32,24 +32,20 @@
 public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
 {
 ObservableCollection<SubtitleTrack> tracks = value as ObservableCollection<SubtitleTrack>;
- StringBuilder audioTracks = new StringBuilder();
+ StringBuilder sutitleTracks = new StringBuilder();
 if (tracks != null)
 {
 foreach (SubtitleTrack track in tracks)
 {
- string text = track.SourceTrack != null ? track.SourceTrack.ToString() : (track.SrtFileName + ".srt");
- if (string.IsNullOrEmpty(audioTracks.ToString()))
- {
- audioTracks.Append(text);
- }
- else
- {
- audioTracks.Append(", " + text);
- }
+ string text = track.SourceTrack != null
+ ? track.SourceTrack.ToString()
+ : (track.SrtFileName + ".srt");
+
+ sutitleTracks.AppendLine(text);
 }
 }
 
- return string.IsNullOrEmpty(audioTracks.ToString()) ? "None" : audioTracks.ToString();
+ return string.IsNullOrEmpty(sutitleTracks.ToString()) ? "None" : sutitleTracks.ToString().Trim();
 }
 
 /// <summary>

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs Added

@@ -0,0 +1,67 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EncoderOptionsTooltipConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The x 264 queue tooltip converter.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Video
+{
+ using System;
+ using System.Globalization;
+ using System.Windows.Data;
+
+ using HandBrake.ApplicationServices.Model;
+ using HandBrake.ApplicationServices.Utilities;
+ using HandBrake.Interop.Model.Encoding;
+ using HandBrake.Interop.Model.Encoding.x264;
+
+ /// <summary>
+ /// The x 264 queue tooltip converter.
+ /// </summary>
+ public class EncoderOptionsTooltipConverter : IValueConverter
+ {
+ /// <summary>
+ /// Converts a value. 
+ /// </summary>
+ /// <returns>
+ /// A converted value. If the method returns null, the valid null value is used.
+ /// </returns>
+ /// <param name="value">The value produced by the binding source.</param><param name="targetType">The type of the binding target property.</param><param name="parameter">The converter parameter to use.</param><param name="culture">The culture to use in the converter.</param>
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ EncodeTask task = value as EncodeTask;
+ if (task != null && task.VideoEncoder == VideoEncoder.X264)
+ {
+ if (task.ShowAdvancedTab)
+ {
+ return task.AdvancedEncoderOptions;
+ }
+
+ return string.Format("Preset: {0}{5}Tune: {1}{5}Profile: {2}{5}Level: {3}{5}Extra Arguments: {4}{5}", 
+ EnumHelper<x264Preset>.GetDisplay(task.X264Preset),
+ EnumHelper<x264Tune>.GetDisplay(task.X264Tune),
+ task.H264Profile,
+ task.H264Level, 
+ string.IsNullOrEmpty(task.ExtraAdvancedArguments) ? "None" : task.ExtraAdvancedArguments,
+ Environment.NewLine);
+ }
+
+ return task != null ? task.AdvancedEncoderOptions.Trim() : string.Empty;
+ }
+
+ /// <summary>
+ /// Converts a value. 
+ /// </summary>
+ /// <returns>
+ /// A converted value. If the method returns null, the valid null value is used.
+ /// </returns>
+ /// <param name="value">The value that is produced by the binding target.</param><param name="targetType">The type to convert to.</param><param name="parameter">The converter parameter to use.</param><param name="culture">The culture to use in the converter.</param>
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Converters/Video/ScalingConverter.cs Added

@@ -0,0 +1,80 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ScalingConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Scaling Converter
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Video
+{
+ using System;
+ using System.Globalization;
+ using System.Windows.Data;
+
+ using HandBrake.ApplicationServices.Model;
+ using HandBrake.ApplicationServices.Utilities;
+
+ using HandBrakeWPF.Model;
+
+ /// <summary>
+ /// Video Scaling Converter
+ /// </summary>
+ public class ScalingConverter : IValueConverter
+ {
+ /// <summary>
+ /// The convert.
+ /// </summary>
+ /// <param name="value">
+ /// The value.
+ /// </param>
+ /// <param name="targetType">
+ /// The target type.
+ /// </param>
+ /// <param name="parameter">
+ /// The parameter.
+ /// </param>
+ /// <param name="culture">
+ /// The culture.
+ /// </param>
+ /// <returns>
+ /// The <see cref="object"/>.
+ /// </returns>
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ if (value != null)
+ {
+ return EnumHelper<VideoScaler>.GetDisplay((VideoScaler)value);
+ }
+
+ return VideoScaler.Lanczos;
+ }
+
+ /// <summary>
+ /// The convert back.
+ /// </summary>
+ /// <param name="value">
+ /// The value.
+ /// </param>
+ /// <param name="targetType">
+ /// The target type.
+ /// </param>
+ /// <param name="parameter">
+ /// The parameter.
+ /// </param>
+ /// <param name="culture">
+ /// The culture.
+ /// </param>
+ /// <returns>
+ /// The <see cref="object"/>.
+ /// </returns>
+ /// <exception cref="NotImplementedException">
+ /// Not Required.
+ /// </exception>
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs Changed

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Factories Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs Added

@@ -0,0 +1,70 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBConfigurationFactory.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// HBConfiguration Factory
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Factories
+{
+ using Caliburn.Micro;
+
+ using HandBrake.ApplicationServices.Model;
+ using HandBrake.ApplicationServices.Services.Interfaces;
+
+ using HandBrakeWPF.Services.Interfaces;
+
+ /// <summary>
+ /// HBConfiguration Factory
+ /// </summary>
+ public class HBConfigurationFactory
+ {
+ /// <summary>
+ /// The user setting service.
+ /// </summary>
+ private static readonly IUserSettingService UserSettingService = IoC.Get<IUserSettingService>();
+
+ /// <summary>
+ /// The create.
+ /// </summary>
+ /// <param name="isLoggingEnabled">
+ /// The is logging enabled.
+ /// </param>
+ /// <returns>
+ /// The <see cref="HBConfiguration"/>.
+ /// </returns>
+ public static HBConfiguration Create(bool isLoggingEnabled)
+ {
+ HBConfiguration config = new HBConfiguration
+ {
+ IsDvdNavDisabled = UserSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav),
+ IsLoggingEnabled = isLoggingEnabled,
+ DisableQuickSyncDecoding = UserSettingService.GetUserSetting<bool>(UserSettingConstants.DisableQuickSyncDecoding),
+ EnableDxva = UserSettingService.GetUserSetting<bool>(UserSettingConstants.EnableDxva),
+ ScalingMode = UserSettingService.GetUserSetting<VideoScaler>(UserSettingConstants.ScalingMode),
+ PreviewScanCount = UserSettingService.GetUserSetting<int>(UserSettingConstants.PreviewScanCount),
+ Verbosity = UserSettingService.GetUserSetting<int>(UserSettingConstants.Verbosity),
+ MinScanDuration = UserSettingService.GetUserSetting<int>(UserSettingConstants.MinScanDuration),
+ ProcessPriority = UserSettingService.GetUserSetting<string>(UserSettingConstants.ProcessPriority),
+ SaveLogToCopyDirectory = UserSettingService.GetUserSetting<bool>(UserSettingConstants.SaveLogToCopyDirectory),
+ SaveLogWithVideo = UserSettingService.GetUserSetting<bool>(UserSettingConstants.SaveLogWithVideo),
+ SaveLogCopyDirectory = UserSettingService.GetUserSetting<string>(UserSettingConstants.SaveLogCopyDirectory),
+ };
+
+ return config;
+ }
+
+ /// <summary>
+ /// The create.
+ /// </summary>
+ /// <returns>
+ /// The <see cref="HBConfiguration"/>.
+ /// </returns>
+ public static HBConfiguration Create()
+ {
+ return Create(true);
+ }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/HandBrakeWPF.csproj -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/HandBrakeWPF.csproj Changed

@@ -15,6 +15,7 @@
 <FileAlignment>512</FileAlignment>
 <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
 <WarningLevel>4</WarningLevel>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
 <PublishUrl>publish\</PublishUrl>
 <Install>true</Install>
 <InstallFrom>Disk</InstallFrom>
@@ -27,7 +28,6 @@
 <MapFileExtensions>true</MapFileExtensions>
 <ApplicationRevision>0</ApplicationRevision>
 <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
 <UseApplicationTrust>false</UseApplicationTrust>
 <BootstrapperEnabled>true</BootstrapperEnabled>
 </PropertyGroup>
@@ -62,6 +62,7 @@
 <ErrorReport>prompt</ErrorReport>
 <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
 <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+ <UseVSHostingProcess>true</UseVSHostingProcess>
 </PropertyGroup>
 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
 <OutputPath>bin\Release\</OutputPath>
@@ -71,6 +72,24 @@
 <PlatformTarget>x64</PlatformTarget>
 <ErrorReport>prompt</ErrorReport>
 </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x86' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x86\Debug31\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug32|x64' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x64\Debug31\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x64</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
 <ItemGroup>
 <Reference Include="Caliburn.Micro">
 <HintPath>..\libraries\caliburn\Caliburn.Micro.dll</HintPath>
@@ -88,20 +107,17 @@
 <Reference Include="GongSolutions.Wpf.DragDrop">
 <HintPath>..\libraries\WPFDragDrop\GongSolutions.Wpf.DragDrop.dll</HintPath>
 </Reference>
- <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\libraries\Growl.Connector.dll</HintPath>
- </Reference>
- <Reference Include="Growl.CoreLibrary, Version=2.0.0.0, Culture=neutral, PublicKeyToken=13e59d82e007b064, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\libraries\Growl.CoreLibrary.dll</HintPath>
+ <Reference Include="LumenWorks.Framework.IO">
+ <HintPath>..\libraries\CsvReader\LumenWorks.Framework.IO.dll</HintPath>
 </Reference>
 <Reference Include="Ookii.Dialogs.Wpf">
 <HintPath>..\libraries\OokiiDialogs\Ookii.Dialogs.Wpf.dll</HintPath>
 </Reference>
 <Reference Include="PresentationFramework" />
+ <Reference Include="PresentationFramework.Aero" />
 <Reference Include="System" />
 <Reference Include="System.ComponentModel.DataAnnotations" />
+ <Reference Include="System.Data" />
 <Reference Include="System.Drawing" />
 <Reference Include="System.Management" />
 <Reference Include="System.Runtime.Serialization" />
@@ -123,6 +139,7 @@
 <Generator>MSBuild:Compile</Generator>
 <SubType>Designer</SubType>
 </ApplicationDefinition>
+ <Compile Include="AppArguments.cs" />
 <Compile Include="AttachedProperties\MenuItemExtensions.cs" />
 <Compile Include="Commands\CancelScanCommand.cs" />
 <Compile Include="Commands\Interfaces\IAdvancedEncoderOptionsCommand.cs" />
@@ -131,6 +148,30 @@
 <Compile Include="Commands\SourceMenuCommand.cs" />
 <Compile Include="Commands\AdvancedEncoderOptionsCommand.cs" />
 <Compile Include="Constants.cs" />
+ <Compile Include="Controls\SplitButton\SplitMenuButton.cs" />
+ <Compile Include="Converters\Audio\AudioBehaviourConverter.cs" />
+ <Compile Include="Converters\Filters\DenoisePresetConverter.cs" />
+ <Compile Include="Converters\Subtitles\SubtitleBehaviourConverter.cs" />
+ <Compile Include="Converters\Video\ScalingConverter.cs" />
+ <Compile Include="Helpers\FileHelper.cs" />
+ <Compile Include="Model\ScanMode.cs" />
+ <Compile Include="Factories\HBConfigurationFactory.cs" />
+ <Compile Include="Services\Interfaces\IUserSettingService.cs" />
+ <Compile Include="Services\UserSettingService.cs" />
+ <Compile Include="Utilities\DelayedActionProcessor.cs" />
+ <Compile Include="Utilities\DPIAwareness.cs" />
+ <Compile Include="Utilities\HandBrakeApp.cs" />
+ <Compile Include="ViewModels\CountdownAlertViewModel.cs" />
+ <Compile Include="ViewModels\Interfaces\ICountdownAlertViewModel.cs" />
+ <Compile Include="Controls\SourceSelection.xaml.cs">
+ <DependentUpon>SourceSelection.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="ViewModels\Interfaces\IStaticPreviewViewModel.cs" />
+ <Compile Include="ViewModels\StaticPreviewViewModel.cs" />
+ <Compile Include="Views\CountdownAlertView.xaml.cs">
+ <DependentUpon>CountdownAlertView.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Controls\DropButton\DropButton.cs" />
 <Compile Include="Controls\TimeSpanBox.xaml.cs">
 <DependentUpon>TimeSpanBox.xaml</DependentUpon>
 </Compile>
@@ -153,25 +194,28 @@
 <Compile Include="Converters\Options\OptionsTabNameConverter.cs" />
 <Compile Include="Converters\Subtitles\SubtitlesQueueDisplayConverter.cs" />
 <Compile Include="Converters\Video\VideoEncoderConverter.cs" />
+ <Compile Include="Converters\Video\EncoderOptionsTooltipConverter.cs" />
 <Compile Include="Helpers\GrayscaleImage.cs" />
- <Compile Include="Helpers\GrowlCommunicator.cs" />
+ <Compile Include="Helpers\AppStyleHelper.cs" />
+ <Compile Include="Helpers\PictureSize.cs" />
 <Compile Include="Model\OptionsTab.cs" />
 <Compile Include="Model\SelectionTitle.cs" />
- <Compile Include="Services\DriveDetectService.cs" />
 <Compile Include="Services\EncodeServiceWrapper.cs" />
- <Compile Include="Services\Interfaces\IDriveDetectService.cs" />
 <Compile Include="Model\ShellWindow.cs" />
 <Compile Include="Model\SourceMenuItem.cs" />
 <Compile Include="Model\UpdateCheckInformation.cs" />
 <Compile Include="Model\DownloadStatus.cs" />
 <Compile Include="Services\Interfaces\INotificationService.cs" />
 <Compile Include="Services\Interfaces\IUpdateService.cs" />
+ <Compile Include="Services\Interfaces\IPrePostActionService.cs" />
 <Compile Include="Services\NotificationService.cs" />
- <Compile Include="Services\ScanServiceWrapper.cs" />
 <Compile Include="Services\UpdateService.cs" />
+ <Compile Include="Services\PrePostActionService.cs" />
 <Compile Include="ViewModels\AdvancedViewModel.cs" />
 <Compile Include="ViewModels\EncoderOptionsViewModel.cs" />
+ <Compile Include="ViewModels\InstantViewModel.cs" />
 <Compile Include="ViewModels\Interfaces\IEncoderOptionsViewModel.cs" />
+ <Compile Include="ViewModels\Interfaces\IInstantViewModel.cs" />
 <Compile Include="ViewModels\Interfaces\IX264ViewModel.cs" />
 <Compile Include="ViewModels\Interfaces\IQueueSelectionViewModel.cs" />
 <Compile Include="ViewModels\QueueSelectionViewModel.cs" />
@@ -181,6 +225,9 @@
 <Compile Include="Views\EncoderOptionsView.xaml.cs">
 <DependentUpon>EncoderOptionsView.xaml</DependentUpon>
 </Compile>
+ <Compile Include="Views\InstantView.xaml.cs">
+ <DependentUpon>InstantView.xaml</DependentUpon>
+ </Compile>
 <Compile Include="Views\QueueSelectionView.xaml.cs">
 <DependentUpon>QueueSelectionView.xaml</DependentUpon>
 </Compile>
@@ -191,6 +238,9 @@
 <Compile Include="ViewModels\Interfaces\ITitleSpecificViewModel.cs" />
 <Compile Include="ViewModels\ShellViewModel.cs" />
 <Compile Include="ViewModels\TitleSpecificViewModel.cs" />
+ <Compile Include="Views\StaticPreviewView.xaml.cs">
+ <DependentUpon>StaticPreviewView.xaml</DependentUpon>
+ </Compile>
 <Compile Include="Views\TitleSpecificView.xaml.cs">
 <DependentUpon>TitleSpecificView.xaml</DependentUpon>
 </Compile>
@@ -310,6 +360,7 @@
 <EmbeddedResource Include="Properties\Resources.resx">
 <Generator>PublicResXFileCodeGenerator</Generator>
 <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <SubType>Designer</SubType>
 </EmbeddedResource>
 <None Include="app.config" />
 <None Include="Installer\Installer.nsi" />
@@ -325,6 +376,18 @@
 <AppDesigner Include="Properties\" />
 </ItemGroup>
 <ItemGroup>
+ <Page Include="Themes\Generic.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
+ <Page Include="Controls\SourceSelection.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Views\CountdownAlertView.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
 <Page Include="Controls\TimeSpanBox.xaml">
 <Generator>MSBuild:Compile</Generator>
 <SubType>Designer</SubType>
@@ -349,6 +412,10 @@
 <Generator>MSBuild:Compile</Generator>
 <SubType>Designer</SubType>
 </Page>
+ <Page Include="Views\InstantView.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
 <Page Include="Views\QueueSelectionView.xaml">
 <Generator>MSBuild:Compile</Generator>
 <SubType>Designer</SubType>
@@ -357,6 +424,10 @@
 <SubType>Designer</SubType>
 <Generator>MSBuild:Compile</Generator>
 </Page>
+ <Page Include="Views\StaticPreviewView.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
 <Page Include="Views\TitleSpecificView.xaml">
 <SubType>Designer</SubType>
 <Generator>MSBuild:Compile</Generator>
@@ -427,9 +498,10 @@
 </Page>
 </ItemGroup>
 <ItemGroup>
- <Content Include="defaultsettings.xml">
+ <EmbeddedResource Include="defaultsettings.xml">
 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
 <Resource Include="Views\Images\add40.png" />
 <Resource Include="Views\Images\add.png" />
 <Resource Include="Views\Images\remove.png" />
@@ -469,7 +541,6 @@
 <Resource Include="Views\Images\ErrorX.png" />
 <Resource Include="Views\Images\AddToQueue_small.png" />
 <Resource Include="Views\Images\AddToQueue.png" />
- <Resource Include="Views\Images\window.png" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="..\HandBrake.ApplicationServices\HandBrake.ApplicationServices.csproj">
@@ -480,12 +551,42 @@
 <Project>{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}</Project>
 <Name>HandBrakeInterop</Name>
 </ProjectReference>
- <ProjectReference Include="..\HandBrake.Server\HandBrake.Server.csproj">
- <Project>{36847BA0-6814-41E1-B1C3-1D9D874418E9}</Project>
- <Name>HandBrake.Server</Name>
- </ProjectReference>
 </ItemGroup>
- <ItemGroup />
+ <ItemGroup>
+ <Resource Include="Views\Images\Advanced.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <Resource Include="Views\Images\Disc.png" />
+ <Resource Include="Views\Images\file.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
+ <Visible>False</Visible>
+ <ProductName>Microsoft .NET Framework 4 Client Profile %28x86 and x64%29</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <ItemGroup>
+ <Resource Include="Views\Images\folder32.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <Resource Include="Views\Images\File32.png" />
+ </ItemGroup>
 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 <Import Project="$(ProgramFiles)\MSBuild\StyleCop\v4.*\StyleCop.targets" />
 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Helpers/AppStyleHelper.cs Added

@@ -0,0 +1,39 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AppStyleHelper.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the AppStyleHelper type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Helpers
+{
+ using System.Windows;
+
+ using Caliburn.Micro;
+
+ using HandBrake.ApplicationServices.Services.Interfaces;
+
+ using HandBrakeWPF.Services.Interfaces;
+
+ /// <summary>
+ /// The AppStyle Helper.
+ /// </summary>
+ public class AppStyleHelper
+ {
+ /// <summary>
+ /// Gets a value indicating whether use system colours.
+ /// </summary>
+ public static bool UseSystemColours
+ {
+ get
+ {
+ IUserSettingService userSettingService = IoC.Get<IUserSettingService>();
+ bool useSystemColours = userSettingService.GetUserSetting<bool>(UserSettingConstants.UseSystemColours);
+
+ return useSystemColours || SystemParameters.HighContrast;
+ }
+ }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs Changed

@@ -18,7 +18,9 @@
 using HandBrake.ApplicationServices.Extensions;
 using HandBrake.ApplicationServices.Model;
 using HandBrake.ApplicationServices.Model.Encoding;
- using HandBrake.ApplicationServices.Services.Interfaces;
+ using HandBrake.Interop.Model.Encoding;
+
+ using HandBrakeWPF.Services.Interfaces;
 
 /// <summary>
 /// The Destination AutoName Helper
@@ -47,7 +49,7 @@
 }
 
 string autoNamePath = string.Empty;
- if (task.Title != 0) // TODO check.
+ if (task.Title != 0)
 {
 // Get the Source Name and remove any invalid characters
 string sourceName = Path.GetInvalidFileNameChars().Aggregate(sourceOrLabelName, (current, character) => current.Replace(character.ToString(), string.Empty));
@@ -56,6 +58,13 @@
 if (userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNameRemoveUnderscore))
 sourceName = sourceName.Replace("_", " ");
 
+ if (userSettingService.GetUserSetting<bool>(UserSettingConstants.RemovePunctuation))
+ {
+ sourceName = sourceName.Replace("-", string.Empty);
+ sourceName = sourceName.Replace(",", string.Empty);
+ sourceName = sourceName.Replace(".", string.Empty); 
+ }
+ 
 // Switch to "Title Case"
 if (userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNameTitleCase))
 sourceName = sourceName.ToTitleCase();
@@ -79,9 +88,21 @@
 {
 destinationFilename = userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat);
 destinationFilename = destinationFilename.Replace("{source}", sourceName)
- .Replace("{title}", dvdTitle)
- .Replace("{chapters}", combinedChapterTag)
- .Replace("{date}", DateTime.Now.Date.ToShortDateString().Replace('/', '-'));
+ .Replace(Constants.Title, dvdTitle)
+ .Replace(Constants.Chapters, combinedChapterTag)
+ .Replace(Constants.Date, DateTime.Now.Date.ToShortDateString().Replace('/', '-'))
+ .Replace(Constants.Time, DateTime.Now.ToString("HH:mm"));
+
+ if (task.VideoEncodeRateType == VideoEncodeRateType.ConstantQuality)
+ {
+ destinationFilename = destinationFilename.Replace(Constants.Quality, task.Quality.ToString());
+ destinationFilename = destinationFilename.Replace(Constants.Bitrate, string.Empty);
+ }
+ else
+ {
+ destinationFilename = destinationFilename.Replace(Constants.Bitrate, task.VideoBitrate.ToString());
+ destinationFilename = destinationFilename.Replace(Constants.Quality, string.Empty);
+ }
 }
 else
 destinationFilename = sourceName + "_T" + dvdTitle + "_C" + combinedChapterTag;
@@ -89,7 +110,7 @@
 /*
 * File Extension
 */
- if (task.OutputFormat == OutputFormat.Mp4 || task.OutputFormat == OutputFormat.M4V)
+ if (task.OutputFormat == OutputFormat.Mp4)
 {
 switch (userSettingService.GetUserSetting<int>(UserSettingConstants.UseM4v))
 {
@@ -170,21 +191,16 @@
 public static bool IsAutonamingEnabled()
 {
 IUserSettingService userSettingService = IoC.Get<IUserSettingService>();
- // If there is an auto name path, use it...
- if (userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Trim().StartsWith("{source_path}"))
- {
- return true;
- }
- else if (userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Contains("{source_folder_name}"))
- {
- return true;
- }
- else
+
+ if (!userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNaming))
 {
- return
- Directory.Exists(
- userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Trim());
+ return false;
 }
+
+ // If there is an auto name path, use it...
+ return userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Trim().StartsWith("{source_path}") ||
+ (userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Contains("{source_folder_name}") ||
+ Directory.Exists(userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Trim()));
 }
 }
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Helpers/CliCheckHelper.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Helpers/CliCheckHelper.cs Changed

@@ -14,12 +14,10 @@
 using System.IO;
 using System.Security.Cryptography;
 using System.Text.RegularExpressions;
+ using System.Windows.Forms;
 
 using Caliburn.Micro;
 
- using HandBrake.ApplicationServices;
- using HandBrake.ApplicationServices.Services.Interfaces;
-
 using HandBrakeWPF.Services.Interfaces;
 
 /// <summary>
@@ -43,7 +41,7 @@
 
 // Get the SHA1 Hash of HandBrakeCLI
 byte[] hash;
- using (Stream stream = File.OpenRead("HandBrakeCLI.exe"))
+ using (Stream stream = File.OpenRead(Path.Combine(Application.StartupPath, "HandBrakeCLI.exe")))
 {
 hash = SHA1.Create().ComputeHash(stream);
 }
@@ -58,7 +56,7 @@
 
 // It's not the same, so start the CLI to get it's version data.
 Process cliProcess = new Process();
- ProcessStartInfo handBrakeCli = new ProcessStartInfo("HandBrakeCLI.exe", " -u -v0")
+ ProcessStartInfo handBrakeCli = new ProcessStartInfo(Path.Combine(Application.StartupPath, "HandBrakeCLI.exe"), " -u -v0")
 {
 UseShellExecute = false,
 RedirectStandardError = true,
@@ -84,7 +82,7 @@
 int buildValue;
 int.TryParse(build, out buildValue);
 
- userSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeBuild, buildValue);
+ userSettingService.SetUserSetting(UserSettingConstants.HandBrakeBuild, buildValue);
 success = true;
 }
 }
@@ -108,7 +106,7 @@
 }
 catch (Exception e)
 {
- userSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeBuild, 0);
+ userSettingService.SetUserSetting(UserSettingConstants.HandBrakeBuild, 0);
 userSettingService.SetUserSetting(UserSettingConstants.HandBrakeExeHash, string.Empty);
 
 errorService.ShowError(

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Helpers/FileHelper.cs Added

@@ -0,0 +1,55 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="FileHelper.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Helper methods for dealing with files.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Helpers
+{
+ using System;
+ using System.IO;
+
+ /// <summary>
+ /// Helper methods for dealing with files.
+ /// </summary>
+ public class FileHelper
+ {
+ /// <summary>
+ /// The file path has invalid chars.
+ /// </summary>
+ /// <param name="path">
+ /// The path.
+ /// </param>
+ /// <returns>
+ /// The <see cref="bool"/>.
+ /// </returns>
+ public static bool FilePathHasInvalidChars(string path)
+ {
+ bool result = false;
+ if (!string.IsNullOrEmpty(path))
+ {
+ try
+ {
+ string file = Path.GetFileNameWithoutExtension(path);
+ string directory = Path.GetDirectoryName(path);
+
+ // TODO this may not be necessary.
+ if ((!string.IsNullOrEmpty(directory) && directory.Replace("\"", string.Empty).IndexOfAny(Path.GetInvalidPathChars()) != -1) ||
+ file.Replace("\"", string.Empty).IndexOfAny(Path.GetInvalidFileNameChars()) != -1)
+ {
+ return true;
+ }
+ }
+ catch (ArgumentException)
+ {
+ result = true;
+ }
+ }
+
+ return result;
+ }
+ }
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Helpers/PictureSize.cs Added

@@ -0,0 +1,221 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PictureSize.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the PictureSize type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Helpers
+{
+ using System;
+ using System.Diagnostics;
+ using System.Runtime.InteropServices;
+
+ using HandBrake.Interop.HbLib;
+ using HandBrake.Interop.Model;
+ using HandBrake.Interop.Model.Encoding;
+
+ /// <summary>
+ /// The picture size Helpers
+ /// </summary>
+ public class PictureSize
+ {
+ /// <summary>
+ /// The picture settings job.
+ /// </summary>
+ public class PictureSettingsJob
+ {
+ /// <summary>
+ /// Gets or sets the crop.
+ /// </summary>
+ public Cropping Crop { get; set; }
+
+ /// <summary>
+ /// Gets or sets the modulus.
+ /// </summary>
+ public int? Modulus { get; set; }
+
+ /// <summary>
+ /// Gets or sets the par w.
+ /// </summary>
+ public int ParW { get; set; }
+
+ /// <summary>
+ /// Gets or sets the par h.
+ /// </summary>
+ public int ParH { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether itu par.
+ /// </summary>
+ public bool ItuPar { get; set; }
+
+ /// <summary>
+ /// Gets or sets the width.
+ /// </summary>
+ public int Width { get; set; }
+
+ /// <summary>
+ /// Gets or sets the height.
+ /// </summary>
+ public int Height { get; set; }
+
+ /// <summary>
+ /// Gets or sets the anamorphic mode.
+ /// </summary>
+ public Anamorphic AnamorphicMode { get; set; }
+
+ /// <summary>
+ /// Gets or sets the max width.
+ /// </summary>
+ public int MaxWidth { get; set; }
+
+ /// <summary>
+ /// Gets or sets the max height.
+ /// </summary>
+ public int MaxHeight { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether keep display aspect.
+ /// </summary>
+ public bool KeepDisplayAspect { get; set; }
+
+ /// <summary>
+ /// Gets or sets the dar width.
+ /// </summary>
+ public int DarWidth { get; set; }
+
+ /// <summary>
+ /// Gets or sets the dar height.
+ /// </summary>
+ public int DarHeight { get; set; }
+ }
+
+ /// <summary>
+ /// The picture settings title.
+ /// </summary>
+ public class PictureSettingsTitle
+ {
+ /// <summary>
+ /// Gets or sets the width.
+ /// </summary>
+ public int Width { get; set; }
+
+ /// <summary>
+ /// Gets or sets the height.
+ /// </summary>
+ public int Height { get; set; }
+
+ /// <summary>
+ /// Gets or sets the par w.
+ /// </summary>
+ public int ParW { get; set; }
+
+ /// <summary>
+ /// Gets or sets the par h.
+ /// </summary>
+ public int ParH { get; set; }
+
+ /// <summary>
+ /// Gets or sets the aspect.
+ /// </summary>
+ public double Aspect { get; set; }
+ }
+
+ /// <summary>
+ /// The anamorphic result.
+ /// </summary>
+ public class AnamorphicResult
+ {
+ /// <summary>
+ /// Gets or sets the output width.
+ /// </summary>
+ public int OutputWidth { get; set; }
+
+ /// <summary>
+ /// Gets or sets the output height.
+ /// </summary>
+ public int OutputHeight { get; set; }
+
+ /// <summary>
+ /// Gets or sets the output par width.
+ /// </summary>
+ public double OutputParWidth { get; set; }
+
+ /// <summary>
+ /// Gets or sets the output par height.
+ /// </summary>
+ public double OutputParHeight { get; set; }
+ }
+
+ /// <summary>
+ /// The keep setting.
+ /// </summary>
+ public enum KeepSetting
+ {
+ HB_KEEP_WIDTH = 0x01,
+ HB_KEEP_HEIGHT = 0x02,
+ HB_KEEP_DISPLAY_ASPECT = 0x04
+ }
+
+ /// <summary>
+ /// The hb_set_anamorphic_size 2.
+ /// </summary>
+ /// <param name="job">
+ /// The job.
+ /// </param>
+ /// <param name="title">
+ /// The title.
+ /// </param>
+ /// <param name="setting">
+ /// The setting.
+ /// </param>
+ /// <returns>
+ /// The <see cref="AnamorphicResult"/>.
+ /// </returns>
+ public static AnamorphicResult hb_set_anamorphic_size2(PictureSettingsJob job, PictureSettingsTitle title, KeepSetting setting)
+ {
+ int outputHeight = 0;
+ int outputParHeight = 0;
+ int outputParWidth = 0;
+ int outputWidth = 0;
+
+ int settingMode = (int)setting + (job.KeepDisplayAspect ? 0x04 : 0);
+
+ hb_ui_geometry_s uiGeometry = new hb_ui_geometry_s
+ {
+ crop = new[] { job.Crop.Top, job.Crop.Bottom, job.Crop.Left, job.Crop.Right },
+ dar = new hb_rational_t { den = 0, num = 0 },
+ height = job.Height,
+ itu_par = 0,
+ keep = settingMode,
+ maxWidth = job.MaxWidth,
+ maxHeight = job.MaxHeight,
+ mode = (int)(hb_anamorphic_mode_t)job.AnamorphicMode,
+ modulus = job.Modulus.HasValue ? job.Modulus.Value : 16,
+ par = job.AnamorphicMode != Anamorphic.Custom ? new hb_rational_t { den = title.ParH, num = title.ParW } : new hb_rational_t { den = job.ParH, num = job.ParW },
+ width = job.Width,
+ };
+
+ hb_geometry_s sourceGeometry = new hb_geometry_s
+ {
+ width = title.Width,
+ height = title.Height,
+ par = new hb_rational_t { den = title.ParH, num = title.ParW }
+ };
+
+ hb_geometry_s result = new hb_geometry_s();
+
+ HBFunctions.hb_set_anamorphic_size2(ref sourceGeometry, ref uiGeometry, ref result);
+
+ outputWidth = result.width;
+ outputHeight = result.height;
+ outputParWidth = result.par.den;
+ outputParHeight = result.par.num;
+ Debug.WriteLine("hb_set_anamorphic_size2: {0}x{1}", outputWidth, outputHeight);
+ return new AnamorphicResult { OutputWidth = outputWidth, OutputHeight = outputHeight, OutputParWidth = outputParWidth, OutputParHeight = outputParHeight };
+ }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Installer/Installer.nsi -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Installer/Installer.nsi Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Installer/Installer64.nsi -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Installer/Installer64.nsi Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Model/OptionsTab.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Model/OptionsTab.cs Changed

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Model/ScanMode.cs Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Model/SelectionTitle.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Model/SelectionTitle.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Model/ShellWindow.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Model/ShellWindow.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Model/SourceMenuItem.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Model/SourceMenuItem.cs Changed

@@ -10,7 +10,6 @@
 namespace HandBrakeWPF.Model
 {
 using System.Collections.ObjectModel;
- using System.Windows.Controls;
 using System.Windows.Input;
 
 /// <summary>
@@ -37,18 +36,39 @@
 public ICommand Command { get; set; }
 
 /// <summary>
- /// Gets or sets the image.
+ /// Gets or sets the children.
 /// </summary>
- public Image Image { get; set; }
+ public ObservableCollection<SourceMenuItem> Children { get; set; }
 
 /// <summary>
- /// Gets or sets the children.
+ /// Gets or sets a value indicating whether is drive.
 /// </summary>
- public ObservableCollection<SourceMenuItem> Children { get; set; }
+ public bool IsDrive { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether is open folder.
+ /// </summary>
+ public bool IsOpenFolder { get; set; }
+
+ /// <summary>
+ /// Gets a value indicating whether is open file.
+ /// </summary>
+ public bool IsOpenFile
+ {
+ get
+ {
+ return !this.IsOpenFolder && !this.IsDrive && (this.Children == null || this.Children.Count == 0);
+ }
+ }
 
 /// <summary>
 /// Gets or sets the tag.
 /// </summary>
 public object Tag { get; set; }
+
+ /// <summary>
+ /// Gets or sets the input gesture text.
+ /// </summary>
+ public string InputGestureText { get; set; }
 }
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs Changed

@@ -1,7 +1,12 @@
-/* AssemblyInfo.cs $
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr>.
- It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ListBoxHelper.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Assembly Info
+// </summary>
+// <auto-generated/>
+// --------------------------------------------------------------------------------------------------------------------
 
 using System.Reflection;
 using System.Resources;
@@ -17,7 +22,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("HandBrake Team")]
 [assembly: AssemblyProduct("HandBrake")]
-[assembly: AssemblyCopyright("Copyright © HandBrake Team 2003-2013")]
+[assembly: AssemblyCopyright("Copyright © 2003-2014 HandBrake Team ")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.Nightly.tmpl -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.Nightly.tmpl Changed

@@ -1,7 +1,12 @@
-/* AssemblyInfo.cs $
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr>.
- It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ListBoxHelper.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Assembly Info
+// </summary>
+// <auto-generated/>
+// --------------------------------------------------------------------------------------------------------------------
 
 using System.Reflection;
 using System.Resources;
@@ -17,7 +22,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("HandBrake")]
 [assembly: AssemblyProduct("HandBrake")]
-[assembly: AssemblyCopyright("Copyright © HandBrake Team 2013")]
+[assembly: AssemblyCopyright("Copyright © 2003-2014 HandBrake Team")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.tmpl -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.tmpl Changed

@@ -1,7 +1,12 @@
-/* AssemblyInfo.cs $
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr>.
- It may be used under the terms of the GNU General Public License. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ListBoxHelper.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Assembly Info
+// </summary>
+// <auto-generated/>
+// --------------------------------------------------------------------------------------------------------------------
 
 using System.Reflection;
 using System.Resources;
@@ -17,7 +22,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("HandBrake")]
 [assembly: AssemblyProduct("HandBrake")]
-[assembly: AssemblyCopyright("Copyright © HandBrake Team 2013")]
+[assembly: AssemblyCopyright("Copyright © 2003-2014 HandBrake Team")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -56,5 +61,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.9.$WCREV$")]
+[assembly: AssemblyVersion("0.10.0.$WCREV$")]
 [assembly: NeutralResourcesLanguage("")]
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs Changed

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 // This code was generated by a tool.
-// Runtime Version:4.0.30319.296
+// Runtime Version:4.0.30319.18444
 //
 // Changes to this file may cause incorrect behavior and will be lost if
 // the code is regenerated.
@@ -61,7 +61,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Copyright (C) 2003-2013 The HandBrake Team
+ /// Looks up a localized string similar to Copyright (C) 2003-2014 The HandBrake Team
 ///
 ///This program is free software; you can redistribute it and/or
 ///modify it under the terms of the GNU General Public License
@@ -80,13 +80,13 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to You can optionally store a maximum resolution for encodes that use this preset. There are 3 modes:
+ /// Looks up a localized string similar to You can optionally store a picture settings with this preset. There are 3 modes:
 ///
- ///None: There is no maximum resolution for encodes using this preset. They will always use the source resolution minus any cropping that may be applied.
+ ///None: Picture settings are not stored in the preset. When loading a source, they will remain as-is within the bounds of the source resolution. This also affects Anamorphic, modulus, cropping etc.
 ///
- ///Custom: You can optionally set a Maximum width and height. When doing this an encode will be less than or equal to these values.
+ ///Custom: You can optionally set a Maximum width and Height. When doing this an encode will be less than or equal to these values. Keep Aspect Ratio will be automatically turned on.
 ///
- ///Source Maximum: Similar to custom, but the resolution of your current source is used as the Max width and Height values in [rest of string was truncated]&quot;;.
+ ///Source Maximum: Always encode at the sources [rest of string was truncated]&quot;;.
 /// </summary>
 public static string AddPreset_PictureSizeMode {
 get {
@@ -337,103 +337,604 @@
 }
 }
 
- public static System.Drawing.Bitmap logo64 {
+ /// <summary>
+ /// Looks up a localized string similar to Are you sure?.
+ /// </summary>
+ public static string AreYouSure {
 get {
- object obj = ResourceManager.GetObject("logo64", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
+ return ResourceManager.GetString("AreYouSure", resourceCulture);
 }
 }
 
 /// <summary>
- /// Looks up a localized string similar to Warning: RF 0 is Lossless!.
+ /// Looks up a localized string similar to Error.
 /// </summary>
- public static string Video_LosslessWarning {
+ public static string Error {
 get {
- return ResourceManager.GetString("Video_LosslessWarning", resourceCulture);
+ return ResourceManager.GetString("Error", resourceCulture);
 }
 }
 
 /// <summary>
- /// Looks up a localized string similar to A value of 0 means lossless and will result in a file size that is larger than the original source, 
- ///unless the source was also lossless. 
- ///
- ///x264&apos;s scale is logarithmic and lower values correspond to higher quality. 
- ///
- ///So small increases in value will result in progressively larger increases in the resulting file size. 
+ /// Looks up a localized string similar to HandBrake.
+ /// </summary>
+ public static string HandBrake_Title {
+ get {
+ return ResourceManager.GetString("HandBrake_Title", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to HandBrake is already encoding..
+ /// </summary>
+ public static string Main_AlreadyEncoding {
+ get {
+ return ResourceManager.GetString("Main_AlreadyEncoding", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Warning: It is not currently possible to use this feature if you require specific subtitle or audio tracks that the automatic selection feature (see options) doesn&apos;t support! Tracks are reset with every new source / title selected..
+ /// </summary>
+ public static string Main_AutoAdd_AudioAndSubWarning {
+ get {
+ return ResourceManager.GetString("Main_AutoAdd_AudioAndSubWarning", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Please choose a destination for the file..
+ /// </summary>
+ public static string Main_ChooseDestination {
+ get {
+ return ResourceManager.GetString("Main_ChooseDestination", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to The current file already exists, do you wish to overwrite it?.
+ /// </summary>
+ public static string Main_DestinationOverwrite {
+ get {
+ return ResourceManager.GetString("Main_DestinationOverwrite", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to There are jobs on the queue with the same destination path. Please choose a different path for this job..
+ /// </summary>
+ public static string Main_DuplicateDestinationOnQueue {
+ get {
+ return ResourceManager.GetString("Main_DuplicateDestinationOnQueue", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to The entered destination contained illegal characters. You must fix the path and filename before continuing..
+ /// </summary>
+ public static string Main_InvalidDestination {
+ get {
+ return ResourceManager.GetString("Main_InvalidDestination", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to , Pending Jobs {5}.
+ /// </summary>
+ public static string Main_JobsPending_addon {
+ get {
+ return ResourceManager.GetString("Main_JobsPending_addon", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to You cannot encode to a file with the same path and name as the source file. Please update the destination filename so that it does not match the source file..
+ /// </summary>
+ public static string Main_MatchingFileOverwriteWarning {
+ get {
+ return ResourceManager.GetString("Main_MatchingFileOverwriteWarning", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to New Default Preset Set: {0}.
+ /// </summary>
+ public static string Main_NewDefaultPreset {
+ get {
+ return ResourceManager.GetString("Main_NewDefaultPreset", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to A New Update is Available. Goto Tools Menu &gt; Options to Install.
+ /// </summary>
+ public static string Main_NewUpdate {
+ get {
+ return ResourceManager.GetString("Main_NewUpdate", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to No Preset selected..
+ /// </summary>
+ public static string Main_NoPresetSelected {
+ get {
+ return ResourceManager.GetString("Main_NoPresetSelected", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to You can not modify built in presets. Please select one of your own presets..
+ /// </summary>
+ public static string Main_NoUpdateOfBuiltInPresets {
+ get {
+ return ResourceManager.GetString("Main_NoUpdateOfBuiltInPresets", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Please select a folder..
+ /// </summary>
+ public static string Main_PleaseSelectFolder {
+ get {
+ return ResourceManager.GetString("Main_PleaseSelectFolder", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Preparing to encode ....
+ /// </summary>
+ public static string Main_PreparingToEncode {
+ get {
+ return ResourceManager.GetString("Main_PreparingToEncode", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to You can not import a preset with the same name as a built-in preset..
+ /// </summary>
+ public static string Main_PresetErrorBuiltInName {
+ get {
+ return ResourceManager.GetString("Main_PresetErrorBuiltInName", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Unable to import the selected preset..
+ /// </summary>
+ public static string Main_PresetImportFailed {
+ get {
+ return ResourceManager.GetString("Main_PresetImportFailed", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to The preset may be corrupted or from an older version of HandBrake which is not supported. 
+ ///Presets from older versions must be re-created in the current version..
+ /// </summary>
+ public static string Main_PresetImportFailedSolution {
+ get {
+ return ResourceManager.GetString("Main_PresetImportFailedSolution", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to This preset appears to already exist. Would you like to overwrite it?.
+ /// </summary>
+ public static string Main_PresetOverwriteWarning {
+ get {
+ return ResourceManager.GetString("Main_PresetOverwriteWarning", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Presets.
+ /// </summary>
+ public static string Main_Presets {
+ get {
+ return ResourceManager.GetString("Main_Presets", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Are you sure you wish to update the selected preset?.
+ /// </summary>
+ public static string Main_PresetUpdateConfrimation {
+ get {
+ return ResourceManager.GetString("Main_PresetUpdateConfrimation", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to The Preset has now been updated with your current settings..
+ /// </summary>
+ public static string Main_PresetUpdated {
+ get {
+ return ResourceManager.GetString("Main_PresetUpdated", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to HandBrake has determined your built-in presets are out of date... These presets will now be updated.
+ ///Your custom presets have not been updated so you may have to re-create these by deleting and re-adding them..
+ /// </summary>
+ public static string Main_PresetUpdateNotification {
+ get {
+ return ResourceManager.GetString("Main_PresetUpdateNotification", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Queue Finished.
+ /// </summary>
+ public static string Main_QueueFinished {
+ get {
+ return ResourceManager.GetString("Main_QueueFinished", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Scan Cancelled..
+ /// </summary>
+ public static string Main_ScanCancelled {
+ get {
+ return ResourceManager.GetString("Main_ScanCancelled", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Scan Completed.
+ /// </summary>
+ public static string Main_ScanCompleted {
+ get {
+ return ResourceManager.GetString("Main_ScanCompleted", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Scan failed: .
+ /// </summary>
+ public static string Main_ScanFailed_NoReason {
+ get {
+ return ResourceManager.GetString("Main_ScanFailed_NoReason", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Scan Failed... See Activity Log for details..
+ /// </summary>
+ public static string Main_ScanFailled_CheckLog {
+ get {
+ return ResourceManager.GetString("Main_ScanFailled_CheckLog", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Scanning source, please wait....
+ /// </summary>
+ public static string Main_ScanningPleaseWait {
+ get {
+ return ResourceManager.GetString("Main_ScanningPleaseWait", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Scanning Title {0} of {1} ({2}%).
+ /// </summary>
+ public static string Main_ScanningTitleXOfY {
+ get {
+ return ResourceManager.GetString("Main_ScanningTitleXOfY", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to You must first scan a source and setup your job before starting an encode..
+ /// </summary>
+ public static string Main_ScanSource {
+ get {
+ return ResourceManager.GetString("Main_ScanSource", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to You must first scan a source and setup your job before adding to the queue..
+ /// </summary>
+ public static string Main_ScanSourceFirst {
+ get {
+ return ResourceManager.GetString("Main_ScanSourceFirst", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Please select a preset..
+ /// </summary>
+ public static string Main_SelectPreset {
+ get {
+ return ResourceManager.GetString("Main_SelectPreset", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Please select a preset to update..
+ /// </summary>
+ public static string Main_SelectPresetForUpdate {
+ get {
+ return ResourceManager.GetString("Main_SelectPresetForUpdate", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Select &apos;Source&apos; to continue.
+ /// </summary>
+ public static string Main_SelectSource {
+ get {
+ return ResourceManager.GetString("Main_SelectSource", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to You must first set the destination path for the output file before adding to the queue..
+ /// </summary>
+ public static string Main_SetDestination {
+ get {
+ return ResourceManager.GetString("Main_SetDestination", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to You must turn on automatic file naming AND set a default path in preferences before you can add to the queue..
+ /// </summary>
+ public static string Main_TurnOnAutoFileNaming {
+ get {
+ return ResourceManager.GetString("Main_TurnOnAutoFileNaming", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Your system prevented HandBrake from launching a web browser..
+ /// </summary>
+ public static string Main_UnableToLoadHelpMessage {
+ get {
+ return ResourceManager.GetString("Main_UnableToLoadHelpMessage", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to You can still access the help pages by visiting the website directly at: https://handbrake.fr.
+ /// </summary>
+ public static string Main_UnableToLoadHelpSolution {
+ get {
+ return ResourceManager.GetString("Main_UnableToLoadHelpSolution", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to {0} Encodes Pending.
+ /// </summary>
+ public static string Main_XEncodesPending {
+ get {
+ return ResourceManager.GetString("Main_XEncodesPending", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Notice.
+ /// </summary>
+ public static string Notice {
+ get {
+ return ResourceManager.GetString("Notice", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to The format of the output file. In addition to any supported file system character, you can use the following placeholders that will be replaced when you change title or scan a source.
 ///
- ///Suggested values are: 18 to 20 for Standard Definition and 20 to 23 for High Definition..
+ ///Live Update Options: {source} {title} {chapters} 
+ ///Non-Live Options: {date} {time} {quality} {bitrate} (These only change if you scan a new source, change title or chapters).
 /// </summary>
- public static string Video_LosslessWarningTooltip {
+ public static string Options_AdditionalFormatOptions {
 get {
- return ResourceManager.GetString("Video_LosslessWarningTooltip", resourceCulture);
+ return ResourceManager.GetString("Options_AdditionalFormatOptions", resourceCulture);
 }
 }
 
 /// <summary>
- /// Looks up a localized string similar to Set the desired quality factor. The encoder targets a certain quality. 
- ///The scale used by each video encoder is different.
+ /// Looks up a localized string similar to Available additional Options: {source_path} or {source_folder_name} 
 ///
- ///x264&apos;s scale is logarithmic and lower values correspond to higher quality. 
- ///So small increases in value will result in progressively larger increases in the resulting file size. 
- ///A value of 0 means lossless and will result in a file size that is larger than the original source, 
- ///unless the source was also lossless. 
- ///Suggested values are: 18 to 20 for Standard Definition and 20 t [rest of string was truncated]&quot;;.
+ ///Not both at the same time!.
 /// </summary>
- public static string Video_QualitySlider {
+ public static string Options_DefaultPathAdditionalParams {
 get {
- return ResourceManager.GetString("Video_QualitySlider", resourceCulture);
+ return ResourceManager.GetString("Options_DefaultPathAdditionalParams", resourceCulture);
 }
 }
 
 /// <summary>
- /// Looks up a localized string similar to The full x264 list of parameters: 
- ///{0}.
+ /// Looks up a localized string similar to Overwrite?.
 /// </summary>
- public static string Video_x264ExtraArgs {
+ public static string Overwrite {
 get {
- return ResourceManager.GetString("Video_x264ExtraArgs", resourceCulture);
+ return ResourceManager.GetString("Overwrite", resourceCulture);
 }
 }
 
 /// <summary>
- /// Looks up a localized string similar to Reduce decoder CPU usage.
+ /// Looks up a localized string similar to Output: {0}.
+ /// </summary>
+ public static string PictureSettings_OutputResolution {
+ get {
+ return ResourceManager.GetString("PictureSettings_OutputResolution", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Preset Version.
+ /// </summary>
+ public static string Preset_OldVersion_Header {
+ get {
+ return ResourceManager.GetString("Preset_OldVersion_Header", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to The preset you are trying to import is from a different version of HandBrake. 
+ /// It may not be possible to import all the values from this preset. 
 ///
- ///Set this if your device is struggling to play the output. (i.e. dropped frames).
+ ///Do you wish to proceed?.
 /// </summary>
- public static string Video_x264FastDecode {
+ public static string Preset_OldVersion_Message {
 get {
- return ResourceManager.GetString("Video_x264FastDecode", resourceCulture);
+ return ResourceManager.GetString("Preset_OldVersion_Message", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Unable to import preset!.
+ /// </summary>
+ public static string Preset_UnableToImport_Header {
+ get {
+ return ResourceManager.GetString("Preset_UnableToImport_Header", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Unable to import the preset as it appears to be corrupted or from an older version of HandBrake..
+ /// </summary>
+ public static string Preset_UnableToImport_Message {
+ get {
+ return ResourceManager.GetString("Preset_UnableToImport_Message", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to The Built-in presets have been reset..
+ /// </summary>
+ public static string Presets_ResetComplete {
+ get {
+ return ResourceManager.GetString("Presets_ResetComplete", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Reset Complete.
+ /// </summary>
+ public static string Presets_ResetHeader {
+ get {
+ return ResourceManager.GetString("Presets_ResetHeader", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Still Preview.
+ /// </summary>
+ public static string Preview {
+ get {
+ return ResourceManager.GetString("Preview", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Still Preview (Scaled).
+ /// </summary>
+ public static string Preview_Scaled {
+ get {
+ return ResourceManager.GetString("Preview_Scaled", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Question.
+ /// </summary>
+ public static string Question {
+ get {
+ return ResourceManager.GetString("Question", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to WARNING: You do not have automatic file naming turned on. Please enable this in options..
+ /// </summary>
+ public static string QueueSelection_AutoNameWarning {
+ get {
+ return ResourceManager.GetString("QueueSelection_AutoNameWarning", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to WARNING: You do not currently have automatic audio and subtitle track selection setup. You can setup the default track selection behaviour in options..
+ /// </summary>
+ public static string QueueSelection_AutoTrackSelectionWarning {
+ get {
+ return ResourceManager.GetString("QueueSelection_AutoTrackSelectionWarning", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Ready.
+ /// </summary>
+ public static string State_Ready {
+ get {
+ return ResourceManager.GetString("State_Ready", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Updated.
+ /// </summary>
+ public static string Updated {
+ get {
+ return ResourceManager.GetString("Updated", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to WARNING: This feature is experimental and has known issues. Suitable for testing only!
+ ///Accelerates H.264, MPEG-4, VC1 and WMV3 only and can provide a small improvement on low end hardware..
+ /// </summary>
+ public static string Video_DxvaDecode {
+ get {
+ return ResourceManager.GetString("Video_DxvaDecode", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to The full list of encoder parameters: 
+ ///{0}.
+ /// </summary>
+ public static string Video_EncoderExtraArgs {
+ get {
+ return ResourceManager.GetString("Video_EncoderExtraArgs", resourceCulture);
 }
 }
 
 /// <summary>
 /// Looks up a localized string similar to Sets and ensures compliance with the specified H.264 Levels. This will override all other settings..
 /// </summary>
- public static string Video_x264Level {
+ public static string Video_EncoderLevel {
 get {
- return ResourceManager.GetString("Video_x264Level", resourceCulture);
+ return ResourceManager.GetString("Video_EncoderLevel", resourceCulture);
 }
 }
 
 /// <summary>
- /// Looks up a localized string similar to Adjusts x264 settings to trade off compression efficiency against encoding speed.
+ /// Looks up a localized string similar to Adjusts settings to trade off compression efficiency against encoding speed.
 ///
- ///This establishes your default x264 settings. Tunes, profiles, levels and advanced options string will be applied to this.
+ ///This establishes your default settings. Tunes, profiles, levels and advanced options string will be applied to this.
 ///
 ///You should generally set this option to the slowest you can bear since slower settings will result in better quality or smaller files..
 /// </summary>
- public static string Video_x264Preset {
+ public static string Video_EncoderPreset {
 get {
- return ResourceManager.GetString("Video_x264Preset", resourceCulture);
+ return ResourceManager.GetString("Video_EncoderPreset", resourceCulture);
 }
 }
 
 /// <summary>
- /// Looks up a localized string similar to Limit the H.264 profile of the output stream. This will override all other settings..
+ /// Looks up a localized string similar to Limit the profile of the output stream. This will override all other settings..
 /// </summary>
- public static string Video_x264Profile {
+ public static string Video_EncoderProfile {
 get {
- return ResourceManager.GetString("Video_x264Profile", resourceCulture);
+ return ResourceManager.GetString("Video_EncoderProfile", resourceCulture);
 }
 }
 
@@ -444,9 +945,119 @@
 ///
 ///Changes will be applied after the preset but before all other parameters..
 /// </summary>
- public static string Video_x264Tune {
+ public static string Video_EncoderTune {
+ get {
+ return ResourceManager.GetString("Video_EncoderTune", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Higher Quality |.
+ /// </summary>
+ public static string Video_HigherQuality {
+ get {
+ return ResourceManager.GetString("Video_HigherQuality", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Warning: RF 0 is Lossless!.
+ /// </summary>
+ public static string Video_LosslessWarning {
+ get {
+ return ResourceManager.GetString("Video_LosslessWarning", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to A value of 0 means lossless and will result in a file size that is larger than the original source, 
+ ///unless the source was also lossless. 
+ ///
+ ///x264 and x265&apos;s scale is logarithmic and lower values correspond to higher quality. 
+ ///
+ ///So small increases in value will result in progressively larger increases in the resulting file size..
+ /// </summary>
+ public static string Video_LosslessWarningTooltip {
+ get {
+ return ResourceManager.GetString("Video_LosslessWarningTooltip", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to | Lower Quality.
+ /// </summary>
+ public static string Video_LowQuality {
+ get {
+ return ResourceManager.GetString("Video_LowQuality", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Placebo Quality |.
+ /// </summary>
+ public static string Video_PlaceboQuality {
+ get {
+ return ResourceManager.GetString("Video_PlaceboQuality", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Set the desired quality factor. The encoder targets a certain quality. 
+ ///The scale used by each video encoder is different.
+ ///
+ ///x264&apos;s scale is logarithmic and lower values correspond to higher quality. 
+ ///So small changes in value will result in progressively larger increases or decreases in the resulting file size. 
+ ///A value of 0 means lossless and will result in a file size that is larger than the original source, 
+ ///unless the source was also lossless. 
+ ///Suggested values are: 18 to 20 for Standard Definiti [rest of string was truncated]&quot;;.
+ /// </summary>
+ public static string Video_QualitySlider {
+ get {
+ return ResourceManager.GetString("Video_QualitySlider", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to QuickSync hardware not detected! 
+ ///
+ ///In order to use the QuickSync encoder, you must:
+ ///
+ ///- Have a Intel CPU with HD Graphics and QuickSync support. 4th Generation Haswell or newer parts are recommended for best quality.
+ ///- Have the HD Graphics enabled. 
+ ///- On older versions of windows before 8.x, a monitor connected to the HD Graphics or GPU Virtualisation software installed is also required..
+ /// </summary>
+ public static string Video_QuickSyncNotAvailable {
+ get {
+ return ResourceManager.GetString("Video_QuickSyncNotAvailable", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to WARNING: OpenCL scaling is still in beta. It is only available for modern graphics cards that support OpenCL 1.1 or later. It will fallback to Lanczos software scaling when it is not available for use. Performance gain up to 5%. Minor decrease in quality in some cases..
+ /// </summary>
+ public static string Video_ScalingModes {
+ get {
+ return ResourceManager.GetString("Video_ScalingModes", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Reduce decoder CPU usage.
+ ///
+ ///Set this if your device is struggling to play the output. (i.e. dropped frames).
+ /// </summary>
+ public static string Video_x264FastDecode {
+ get {
+ return ResourceManager.GetString("Video_x264FastDecode", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Warning.
+ /// </summary>
+ public static string Warning {
 get {
- return ResourceManager.GetString("Video_x264Tune", resourceCulture);
+ return ResourceManager.GetString("Warning", resourceCulture);
 }
 }
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Properties/Resources.resx -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Properties/Resources.resx Changed

@@ -233,12 +233,8 @@
 Note that some devices and players, even those that support Main Profile, 
 may have problems with Weighted P-frame prediction: the Apple TV is completely incompatible with it, for example.</value>
 </data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="logo64" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\logo64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="Video_x264ExtraArgs" xml:space="preserve">
- <value>The full x264 list of parameters: 
+ <data name="Video_EncoderExtraArgs" xml:space="preserve">
+ <value>The full list of encoder parameters: 
 {0}</value>
 </data>
 <data name="Video_x264FastDecode" xml:space="preserve">
@@ -246,20 +242,20 @@
 
 Set this if your device is struggling to play the output. (i.e. dropped frames)</value>
 </data>
- <data name="Video_x264Level" xml:space="preserve">
+ <data name="Video_EncoderLevel" xml:space="preserve">
 <value>Sets and ensures compliance with the specified H.264 Levels. This will override all other settings.</value>
 </data>
- <data name="Video_x264Preset" xml:space="preserve">
- <value>Adjusts x264 settings to trade off compression efficiency against encoding speed.
+ <data name="Video_EncoderPreset" xml:space="preserve">
+ <value>Adjusts settings to trade off compression efficiency against encoding speed.
 
-This establishes your default x264 settings. Tunes, profiles, levels and advanced options string will be applied to this.
+This establishes your default settings. Tunes, profiles, levels and advanced options string will be applied to this.
 
 You should generally set this option to the slowest you can bear since slower settings will result in better quality or smaller files.</value>
 </data>
- <data name="Video_x264Profile" xml:space="preserve">
- <value>Limit the H.264 profile of the output stream. This will override all other settings.</value>
+ <data name="Video_EncoderProfile" xml:space="preserve">
+ <value>Limit the profile of the output stream. This will override all other settings.</value>
 </data>
- <data name="Video_x264Tune" xml:space="preserve">
+ <data name="Video_EncoderTune" xml:space="preserve">
 <value>Tune settings to optimise for common scenarios
 
 This can improve efficiency for particular source characteristics or set of characteristics of the output file.
@@ -271,11 +267,13 @@
 The scale used by each video encoder is different.
 
 x264's scale is logarithmic and lower values correspond to higher quality. 
-So small increases in value will result in progressively larger increases in the resulting file size. 
+So small changes in value will result in progressively larger increases or decreases in the resulting file size. 
 A value of 0 means lossless and will result in a file size that is larger than the original source, 
 unless the source was also lossless. 
 Suggested values are: 18 to 20 for Standard Definition and 20 to 23 for High Definition.
 
+x265 is early on in it's development, so there are no recommended values yet. You'll have to experiment.
+
 FFMpeg's and Theora's scale is more linear. These encoders do not have a lossless mode.</value>
 </data>
 <data name="Video_LosslessWarning" xml:space="preserve">
@@ -285,20 +283,18 @@
 <value>A value of 0 means lossless and will result in a file size that is larger than the original source, 
 unless the source was also lossless. 
 
-x264's scale is logarithmic and lower values correspond to higher quality. 
+x264 and x265's scale is logarithmic and lower values correspond to higher quality. 
 
-So small increases in value will result in progressively larger increases in the resulting file size. 
-
-Suggested values are: 18 to 20 for Standard Definition and 20 to 23 for High Definition.</value>
+So small increases in value will result in progressively larger increases in the resulting file size.</value>
 </data>
 <data name="AddPreset_PictureSizeMode" xml:space="preserve">
- <value>You can optionally store a maximum resolution for encodes that use this preset. There are 3 modes:
+ <value>You can optionally store a picture settings with this preset. There are 3 modes:
 
-None: There is no maximum resolution for encodes using this preset. They will always use the source resolution minus any cropping that may be applied.
+None: Picture settings are not stored in the preset. When loading a source, they will remain as-is within the bounds of the source resolution. This also affects Anamorphic, modulus, cropping etc.
 
-Custom: You can optionally set a Maximum width and height. When doing this an encode will be less than or equal to these values.
+Custom: You can optionally set a Maximum width and Height. When doing this an encode will be less than or equal to these values. Keep Aspect Ratio will be automatically turned on.
 
-Source Maximum: Similar to custom, but the resolution of your current source is used as the Max width and Height values instead.</value>
+Source Maximum: Always encode at the sources resolution where possible.</value>
 </data>
 <data name="Advanced_EncoderOptions" xml:space="preserve">
 <value>The options passed to the x264 encoder. 
@@ -306,7 +302,7 @@
 This box allows you to add or modify additional or current parameters as desired. </value>
 </data>
 <data name="About_GPL" xml:space="preserve">
- <value>Copyright (C) 2003-2013 The HandBrake Team
+ <value>Copyright (C) 2003-2014 The HandBrake Team
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -329,4 +325,222 @@
 
 If you do not use this tab, it can be hidden from: Tools Menu &gt; Options &gt; Advanced.</value>
 </data>
+ <data name="QueueSelection_AutoNameWarning" xml:space="preserve">
+ <value>WARNING: You do not have automatic file naming turned on. Please enable this in options.</value>
+ </data>
+ <data name="QueueSelection_AutoTrackSelectionWarning" xml:space="preserve">
+ <value>WARNING: You do not currently have automatic audio and subtitle track selection setup. You can setup the default track selection behaviour in options.</value>
+ </data>
+ <data name="Presets_ResetComplete" xml:space="preserve">
+ <value>The Built-in presets have been reset.</value>
+ </data>
+ <data name="Presets_ResetHeader" xml:space="preserve">
+ <value>Reset Complete</value>
+ </data>
+ <data name="Video_HigherQuality" xml:space="preserve">
+ <value>Higher Quality |</value>
+ </data>
+ <data name="Video_LowQuality" xml:space="preserve">
+ <value>| Lower Quality</value>
+ </data>
+ <data name="Video_PlaceboQuality" xml:space="preserve">
+ <value>Placebo Quality |</value>
+ </data>
+ <data name="Video_DxvaDecode" xml:space="preserve">
+ <value>WARNING: This feature is experimental and has known issues. Suitable for testing only!
+Accelerates H.264, MPEG-4, VC1 and WMV3 only and can provide a small improvement on low end hardware.</value>
+ </data>
+ <data name="Video_QuickSyncNotAvailable" xml:space="preserve">
+ <value>QuickSync hardware not detected! 
+
+In order to use the QuickSync encoder, you must:
+
+- Have a Intel CPU with HD Graphics and QuickSync support. 4th Generation Haswell or newer parts are recommended for best quality.
+- Have the HD Graphics enabled. 
+- On older versions of windows before 8.x, a monitor connected to the HD Graphics or GPU Virtualisation software installed is also required.</value>
+ </data>
+ <data name="Video_ScalingModes" xml:space="preserve">
+ <value>WARNING: OpenCL scaling is still in beta. It is only available for modern graphics cards that support OpenCL 1.1 or later. It will fallback to Lanczos software scaling when it is not available for use. Performance gain up to 5%. Minor decrease in quality in some cases.</value>
+ </data>
+ <data name="Error" xml:space="preserve">
+ <value>Error</value>
+ </data>
+ <data name="Main_AutoAdd_AudioAndSubWarning" xml:space="preserve">
+ <value>Warning: It is not currently possible to use this feature if you require specific subtitle or audio tracks that the automatic selection feature (see options) doesn't support! Tracks are reset with every new source / title selected.</value>
+ </data>
+ <data name="Main_ScanSourceFirst" xml:space="preserve">
+ <value>You must first scan a source and setup your job before adding to the queue.</value>
+ </data>
+ <data name="Main_TurnOnAutoFileNaming" xml:space="preserve">
+ <value>You must turn on automatic file naming AND set a default path in preferences before you can add to the queue.</value>
+ </data>
+ <data name="Warning" xml:space="preserve">
+ <value>Warning</value>
+ </data>
+ <data name="AreYouSure" xml:space="preserve">
+ <value>Are you sure?</value>
+ </data>
+ <data name="HandBrake_Title" xml:space="preserve">
+ <value>HandBrake</value>
+ </data>
+ <data name="Main_AlreadyEncoding" xml:space="preserve">
+ <value>HandBrake is already encoding.</value>
+ </data>
+ <data name="Main_ChooseDestination" xml:space="preserve">
+ <value>Please choose a destination for the file.</value>
+ </data>
+ <data name="Main_DestinationOverwrite" xml:space="preserve">
+ <value>The current file already exists, do you wish to overwrite it?</value>
+ </data>
+ <data name="Main_DuplicateDestinationOnQueue" xml:space="preserve">
+ <value>There are jobs on the queue with the same destination path. Please choose a different path for this job.</value>
+ </data>
+ <data name="Main_JobsPending_addon" xml:space="preserve">
+ <value>, Pending Jobs {5}</value>
+ </data>
+ <data name="Main_NewDefaultPreset" xml:space="preserve">
+ <value>New Default Preset Set: {0}</value>
+ </data>
+ <data name="Main_NewUpdate" xml:space="preserve">
+ <value>A New Update is Available. Goto Tools Menu &gt; Options to Install</value>
+ </data>
+ <data name="Main_NoPresetSelected" xml:space="preserve">
+ <value>No Preset selected.</value>
+ </data>
+ <data name="Main_NoUpdateOfBuiltInPresets" xml:space="preserve">
+ <value>You can not modify built in presets. Please select one of your own presets.</value>
+ </data>
+ <data name="Main_PleaseSelectFolder" xml:space="preserve">
+ <value>Please select a folder.</value>
+ </data>
+ <data name="Main_PreparingToEncode" xml:space="preserve">
+ <value>Preparing to encode ...</value>
+ </data>
+ <data name="Main_PresetErrorBuiltInName" xml:space="preserve">
+ <value>You can not import a preset with the same name as a built-in preset.</value>
+ </data>
+ <data name="Main_PresetOverwriteWarning" xml:space="preserve">
+ <value>This preset appears to already exist. Would you like to overwrite it?</value>
+ </data>
+ <data name="Main_Presets" xml:space="preserve">
+ <value>Presets</value>
+ </data>
+ <data name="Main_PresetUpdateConfrimation" xml:space="preserve">
+ <value>Are you sure you wish to update the selected preset?</value>
+ </data>
+ <data name="Main_PresetUpdated" xml:space="preserve">
+ <value>The Preset has now been updated with your current settings.</value>
+ </data>
+ <data name="Main_PresetUpdateNotification" xml:space="preserve">
+ <value>HandBrake has determined your built-in presets are out of date... These presets will now be updated.
+Your custom presets have not been updated so you may have to re-create these by deleting and re-adding them.</value>
+ </data>
+ <data name="Main_QueueFinished" xml:space="preserve">
+ <value>Queue Finished</value>
+ </data>
+ <data name="Main_ScanCancelled" xml:space="preserve">
+ <value>Scan Cancelled.</value>
+ </data>
+ <data name="Main_ScanCompleted" xml:space="preserve">
+ <value>Scan Completed</value>
+ </data>
+ <data name="Main_ScanFailed_NoReason" xml:space="preserve">
+ <value>Scan failed: </value>
+ </data>
+ <data name="Main_ScanFailled_CheckLog" xml:space="preserve">
+ <value>Scan Failed... See Activity Log for details.</value>
+ </data>
+ <data name="Main_ScanningPleaseWait" xml:space="preserve">
+ <value>Scanning source, please wait...</value>
+ </data>
+ <data name="Main_ScanningTitleXOfY" xml:space="preserve">
+ <value>Scanning Title {0} of {1} ({2}%)</value>
+ </data>
+ <data name="Main_ScanSource" xml:space="preserve">
+ <value>You must first scan a source and setup your job before starting an encode.</value>
+ </data>
+ <data name="Main_SelectPreset" xml:space="preserve">
+ <value>Please select a preset.</value>
+ </data>
+ <data name="Main_SelectPresetForUpdate" xml:space="preserve">
+ <value>Please select a preset to update.</value>
+ </data>
+ <data name="Main_SelectSource" xml:space="preserve">
+ <value>Select 'Source' to continue</value>
+ </data>
+ <data name="Main_XEncodesPending" xml:space="preserve">
+ <value>{0} Encodes Pending</value>
+ </data>
+ <data name="Notice" xml:space="preserve">
+ <value>Notice</value>
+ </data>
+ <data name="Overwrite" xml:space="preserve">
+ <value>Overwrite?</value>
+ </data>
+ <data name="Question" xml:space="preserve">
+ <value>Question</value>
+ </data>
+ <data name="State_Ready" xml:space="preserve">
+ <value>Ready</value>
+ </data>
+ <data name="Updated" xml:space="preserve">
+ <value>Updated</value>
+ </data>
+ <data name="Preset_OldVersion_Header" xml:space="preserve">
+ <value>Preset Version</value>
+ </data>
+ <data name="Preset_OldVersion_Message" xml:space="preserve">
+ <value>The preset you are trying to import is from a different version of HandBrake. 
+ It may not be possible to import all the values from this preset. 
+
+Do you wish to proceed?</value>
+ </data>
+ <data name="Preset_UnableToImport_Header" xml:space="preserve">
+ <value>Unable to import preset!</value>
+ </data>
+ <data name="Preset_UnableToImport_Message" xml:space="preserve">
+ <value>Unable to import the preset as it appears to be corrupted or from an older version of HandBrake.</value>
+ </data>
+ <data name="Main_SetDestination" xml:space="preserve">
+ <value>You must first set the destination path for the output file before adding to the queue.</value>
+ </data>
+ <data name="Main_InvalidDestination" xml:space="preserve">
+ <value>The entered destination contained illegal characters. You must fix the path and filename before continuing.</value>
+ </data>
+ <data name="Preview" xml:space="preserve">
+ <value>Still Preview</value>
+ </data>
+ <data name="Preview_Scaled" xml:space="preserve">
+ <value>Still Preview (Scaled)</value>
+ </data>
+ <data name="PictureSettings_OutputResolution" xml:space="preserve">
+ <value>Output: {0}</value>
+ </data>
+ <data name="Options_AdditionalFormatOptions" xml:space="preserve">
+ <value>The format of the output file. In addition to any supported file system character, you can use the following placeholders that will be replaced when you change title or scan a source.
+
+Live Update Options: {source} {title} {chapters} 
+Non-Live Options: {date} {time} {quality} {bitrate} (These only change if you scan a new source, change title or chapters)</value>
+ </data>
+ <data name="Options_DefaultPathAdditionalParams" xml:space="preserve">
+ <value>Available additional Options: {source_path} or {source_folder_name} 
+
+Not both at the same time!</value>
+ </data>
+ <data name="Main_MatchingFileOverwriteWarning" xml:space="preserve">
+ <value>You cannot encode to a file with the same path and name as the source file. Please update the destination filename so that it does not match the source file.</value>
+ </data>
+ <data name="Main_UnableToLoadHelpMessage" xml:space="preserve">
+ <value>Your system prevented HandBrake from launching a web browser.</value>
+ </data>
+ <data name="Main_UnableToLoadHelpSolution" xml:space="preserve">
+ <value>You can still access the help pages by visiting the website directly at: https://handbrake.fr</value>
+ </data>
+ <data name="Main_PresetImportFailed" xml:space="preserve">
+ <value>Unable to import the selected preset.</value>
+ </data>
+ <data name="Main_PresetImportFailedSolution" xml:space="preserve">
+ <value>The preset may be corrupted or from an older version of HandBrake which is not supported. 
+Presets from older versions must be re-created in the current version.</value>
+ </data>
 </root>
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs Changed

@@ -12,13 +12,15 @@
 namespace HandBrakeWPF.Services
 {
 using System;
+ using System.Windows.Forms;
 
 using HandBrake.ApplicationServices.Exceptions;
 using HandBrake.ApplicationServices.Isolation;
 using HandBrake.ApplicationServices.Model;
 using HandBrake.ApplicationServices.Services;
 using HandBrake.ApplicationServices.Services.Interfaces;
- using HandBrake.Interop;
+
+ using HandBrakeWPF.Services.Interfaces;
 
 using EncodeCompletedEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs;
 using EncodeProgressEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs;
@@ -49,7 +51,7 @@
 /// </param>
 public EncodeServiceWrapper(IUserSettingService userSettingService)
 {
- var useLibHb = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableLibHb);
+ var useLibHb = AppArguments.EnableLibHB ? AppArguments.EnableLibHB : userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableLibHb);
 var useProcessIsolation =
 userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableProcessIsolation);
 var port = userSettingService.GetUserSetting<string>(UserSettingConstants.ServerPort);
@@ -64,12 +66,7 @@
 }
 else
 {
- if (ScanServiceWrapper.HandbrakeInstance == null)
- {
- ScanServiceWrapper.HandbrakeInstance = new HandBrakeInstance();
- }
-
- this.encodeService = new LibEncode(userSettingService, ScanServiceWrapper.HandbrakeInstance);
+ this.encodeService = new LibEncode();
 }
 }
 catch (Exception exc)
@@ -84,7 +81,7 @@
 }
 else
 {
- this.encodeService = new Encode(userSettingService);
+ this.encodeService = new Encode();
 }
 
 this.encodeService.EncodeCompleted += this.EncodeServiceEncodeCompleted;
@@ -138,6 +135,28 @@
 }
 
 /// <summary>
+ /// Gets a value indicating whether can pause.
+ /// </summary>
+ public bool CanPause
+ {
+ get
+ {
+ return this.encodeService.CanPause;
+ }
+ }
+
+ /// <summary>
+ /// Gets a value indicating whether is pasued.
+ /// </summary>
+ public bool IsPasued
+ {
+ get
+ {
+ return this.encodeService.IsPasued;
+ }
+ }
+
+ /// <summary>
 /// Gets a value indicating whether IsEncoding.
 /// </summary>
 public bool IsEncoding
@@ -160,9 +179,12 @@
 /// <param name="destination">
 /// The destination.
 /// </param>
- public void ProcessLogs(string destination)
+ /// <param name="configuration">
+ /// The configuration.
+ /// </param>
+ public void ProcessLogs(string destination, HBConfiguration configuration)
 {
- this.encodeService.ProcessLogs(destination);
+ this.encodeService.ProcessLogs(destination, configuration);
 }
 
 /// <summary>
@@ -182,12 +204,25 @@
 /// <param name="job">
 /// The job.
 /// </param>
- /// <param name="enableLogging">
- /// The enable Logging.
- /// </param>
- public void Start(QueueTask job, bool enableLogging)
+ public void Start(QueueTask job)
+ {
+ this.encodeService.Start(job);
+ }
+
+ /// <summary>
+ /// The pause.
+ /// </summary>
+ public void Pause()
+ {
+ this.encodeService.Pause();
+ }
+
+ /// <summary>
+ /// The resume.
+ /// </summary>
+ public void Resume()
 {
- this.encodeService.Start(job, enableLogging);
+ this.encodeService.Resume();
 }
 
 /// <summary>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Services/Interfaces/INotificationService.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Services/Interfaces/INotificationService.cs Changed

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Services/Interfaces/IPrePostActionService.cs Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Services/Interfaces/IUserSettingService.cs Added

@@ -0,0 +1,71 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IUserSettingService.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The User Setting Service Interace.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services.Interfaces
+{
+ using HandBrake.ApplicationServices.EventArgs;
+
+ /// <summary>
+ /// The setting event handler.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
+ public delegate void SettingEventHandler(object sender, SettingChangedEventArgs e);
+
+ /// <summary>
+ /// The User Setting Service Interace.
+ /// </summary>
+ public interface IUserSettingService
+ {
+ /// <summary>
+ /// The setting changed.
+ /// </summary>
+ event SettingEventHandler SettingChanged;
+
+ /// <summary>
+ /// Set the specified user setting.
+ /// </summary>
+ /// <param name="name">
+ /// Name of the property
+ /// </param>
+ /// <param name="value">
+ /// The value to store.
+ /// </param>
+ void SetUserSetting(string name, object value);
+
+ /// <summary>
+ /// Get user setting for a given key.
+ /// </summary>
+ /// <param name="name">
+ /// The name.
+ /// </param>
+ /// <typeparam name="T">
+ /// The Type of the setting
+ /// </typeparam>
+ /// <returns>
+ /// The user setting
+ /// </returns>
+ T GetUserSetting<T>(string name);
+
+ /// <summary>
+ /// Get an StringCollection type user setting
+ /// </summary>
+ /// <param name="name">
+ /// The setting name
+ /// </param>
+ /// <returns>
+ /// The settings value
+ /// </returns>
+ System.Collections.Specialized.StringCollection GetUserSettingStringCollection(string name);
+ }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Services/NotificationService.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Services/NotificationService.cs Changed

@@ -11,7 +11,6 @@
 {
 using HandBrake.ApplicationServices.Services.Interfaces;
 
- using HandBrakeWPF.Helpers;
 using HandBrakeWPF.Services.Interfaces;
 
 /// <summary>
@@ -39,9 +38,8 @@
 public NotificationService(IEncodeServiceWrapper encodeService, IQueueProcessor queueProcessor, IUserSettingService userSettingService)
 {
 this.userSettingService = userSettingService;
- encodeService.EncodeCompleted += this.EncodeServiceEncodeCompleted;
- queueProcessor.QueueCompleted += this.QueueProcessorQueueCompleted;
- GrowlCommunicator.Register();
+ // encodeService.EncodeCompleted += this.EncodeServiceEncodeCompleted;
+ // queueProcessor.QueueCompleted += this.QueueProcessorQueueCompleted;
 }
 
 /// <summary>
@@ -55,10 +53,9 @@
 /// </param>
 private void QueueProcessorQueueCompleted(object sender, System.EventArgs e)
 {
- // Growl
 if (userSettingService.GetUserSetting<bool>(UserSettingConstants.GrowlQueue))
 {
- GrowlCommunicator.Notify("Queue Completed", "Put down that cocktail...\nyour Handbrake queue is done.");
+ // GrowlCommunicator.Notify("Queue Completed", "Put down that cocktail...\nyour Handbrake queue is done.");
 }
 }
 
@@ -73,11 +70,9 @@
 /// </param>
 private void EncodeServiceEncodeCompleted(object sender, HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs e)
 {
- // Growl
 if (userSettingService.GetUserSetting<bool>(UserSettingConstants.GrowlEncode))
 {
- GrowlCommunicator.Notify(
- "Encode Completed", "Put down that cocktail...\nyour Handbrake encode is done.");
+ // GrowlCommunicator.Notify("Encode Completed", "Put down that cocktail...\nyour Handbrake encode is done.");
 }
 }
 }

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Services/PrePostActionService.cs Added

@@ -0,0 +1,192 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PrePostActionService.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the WhenDoneService type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services
+{
+ using System.Diagnostics;
+ using System.Windows.Forms;
+
+ using Caliburn.Micro;
+
+ using HandBrake.ApplicationServices.EventArgs;
+ using HandBrake.ApplicationServices.Services.Interfaces;
+ using HandBrake.ApplicationServices.Utilities;
+
+ using HandBrakeWPF.Services.Interfaces;
+ using HandBrakeWPF.ViewModels.Interfaces;
+
+ using Application = System.Windows.Application;
+
+ /// <summary>
+ /// The when done service.
+ /// </summary>
+ public class PrePostActionService : IPrePostActionService
+ {
+ /// <summary>
+ /// The queue processor.
+ /// </summary>
+ private readonly IQueueProcessor queueProcessor;
+
+ /// <summary>
+ /// The user setting service.
+ /// </summary>
+ private readonly IUserSettingService userSettingService;
+
+ /// <summary>
+ /// The window manager.
+ /// </summary>
+ private readonly IWindowManager windowManager;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="PrePostActionService"/> class.
+ /// </summary>
+ /// <param name="queueProcessor">
+ /// The queue processor.
+ /// </param>
+ /// <param name="userSettingService">
+ /// The user Setting Service.
+ /// </param>
+ /// <param name="windowManager">
+ /// The window Manager.
+ /// </param>
+ public PrePostActionService(IQueueProcessor queueProcessor, IUserSettingService userSettingService, IWindowManager windowManager)
+ {
+ this.queueProcessor = queueProcessor;
+ this.userSettingService = userSettingService;
+ this.windowManager = windowManager;
+
+ this.queueProcessor.QueueCompleted += QueueProcessorQueueCompleted;
+ this.queueProcessor.EncodeService.EncodeCompleted += EncodeService_EncodeCompleted;
+ this.queueProcessor.EncodeService.EncodeStarted += EncodeService_EncodeStarted;
+ }
+
+ /// <summary>
+ /// The encode service_ encode started.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
+ private void EncodeService_EncodeStarted(object sender, System.EventArgs e)
+ {
+ if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PreventSleep))
+ {
+ Win32.PreventSleep();
+ }
+ }
+
+ /// <summary>
+ /// The encode service_ encode completed.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The EncodeCompletedEventArgs.
+ /// </param>
+ private void EncodeService_EncodeCompleted(object sender, HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs e)
+ {
+ // Send the file to the users requested applicaiton
+ if (e.Successful)
+ {
+ this.SendToApplication(e.FileName);
+ }
+
+ // Allow the system to sleep again.
+ Execute.OnUIThread(() =>
+ {
+ if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PreventSleep))
+ {
+ Win32.AllowSleep();
+ }
+ });
+ }
+
+ /// <summary>
+ /// The queue processor queue completed event handler.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
+ private void QueueProcessorQueueCompleted(object sender, QueueCompletedEventArgs e)
+ {
+ if (e.WasManuallyStopped)
+ {
+ return;
+ }
+
+ if (this.userSettingService.GetUserSetting<string>(UserSettingConstants.WhenCompleteAction) == "Do nothing")
+ {
+ return;
+ }
+
+ // Give the user the ability to cancel the shutdown. Default 60 second timer.
+ ICountdownAlertViewModel titleSpecificView = IoC.Get<ICountdownAlertViewModel>();
+ Caliburn.Micro.Execute.OnUIThread(
+ () =>
+ {
+ titleSpecificView.SetAction(this.userSettingService.GetUserSetting<string>(UserSettingConstants.WhenCompleteAction));
+ this.windowManager.ShowDialog(titleSpecificView);
+ });
+
+ if (!titleSpecificView.IsCancelled)
+ {
+ // Do something whent he encode ends.
+ switch (this.userSettingService.GetUserSetting<string>(UserSettingConstants.WhenCompleteAction))
+ {
+ case "Shutdown":
+ Process.Start("Shutdown", "-s -t 60");
+ break;
+ case "Log off":
+ Win32.ExitWindowsEx(0, 0);
+ break;
+ case "Suspend":
+ System.Windows.Forms.Application.SetSuspendState(PowerState.Suspend, true, true);
+ break;
+ case "Hibernate":
+ System.Windows.Forms.Application.SetSuspendState(PowerState.Hibernate, true, true);
+ break;
+ case "Lock System":
+ Win32.LockWorkStation();
+ break;
+ case "Quit HandBrake":
+ Execute.OnUIThread(() => Application.Current.Shutdown());
+ break;
+ }
+ }
+ }
+
+ /// <summary>
+ /// Send a file to a 3rd party application after encoding has completed.
+ /// </summary>
+ /// <param name="file">
+ /// The file path
+ /// </param>
+ private void SendToApplication(string file)
+ {
+ if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.SendFile) &&
+ !string.IsNullOrEmpty(this.userSettingService.GetUserSetting<string>(UserSettingConstants.SendFileTo)))
+ {
+ string args = string.Format(
+ "{0} \"{1}\"",
+ this.userSettingService.GetUserSetting<string>(UserSettingConstants.SendFileToArgs),
+ file);
+ var vlc =
+ new ProcessStartInfo(
+ this.userSettingService.GetUserSetting<string>(UserSettingConstants.SendFileTo), args);
+ Process.Start(vlc);
+ }
+ }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Services/UpdateService.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Services/UpdateService.cs Changed

@@ -14,8 +14,6 @@
 using System.Net;
 using System.Threading;
 
- using HandBrake.ApplicationServices;
- using HandBrake.ApplicationServices.Services.Interfaces;
 using HandBrake.ApplicationServices.Utilities;
 
 using HandBrakeWPF.Model;
@@ -87,12 +85,20 @@
 try
 {
 string url =
- VersionHelper.Is64Bit()
+ VersionHelper.Is64Bit() || Environment.Is64BitOperatingSystem
 ? Constants.Appcast64
 : Constants.Appcast32;
 
+ if (VersionHelper.IsNightly())
+ {
+ url =
+ VersionHelper.Is64Bit() || Environment.Is64BitOperatingSystem
+ ? Constants.AppcastUnstable64
+ : Constants.AppcastUnstable32;
+ }
+ 
 var currentBuild =
- this.userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild);
+ this.userSettingService.GetUserSetting<int>(UserSettingConstants.HandBrakeBuild);
 var skipBuild = this.userSettingService.GetUserSetting<int>(
 UserSettingConstants.Skipversion);

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Services/UserSettingService.cs Added

@@ -0,0 +1,227 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="UserSettingService.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The User Setting Serivce
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services
+{
+ using System;
+ using System.Collections.Specialized;
+ using System.IO;
+ using System.Linq;
+ using System.Reflection;
+ using System.Xml.Serialization;
+
+ using HandBrake.ApplicationServices.Collections;
+ using HandBrake.ApplicationServices.EventArgs;
+ using HandBrake.ApplicationServices.Exceptions;
+
+ using HandBrakeWPF.Services.Interfaces;
+
+ /// <summary>
+ /// The User Setting Serivce
+ /// </summary>
+ public class UserSettingService : IUserSettingService
+ {
+ /// <summary>
+ /// The Settings File
+ /// </summary>
+ private readonly string settingsFile = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\settings.xml";
+
+ /// <summary>
+ /// The XML Serializer 
+ /// </summary>
+ readonly XmlSerializer serializer = new XmlSerializer(typeof(SerializableDictionary<string, object>));
+
+ /// <summary>
+ /// The User Settings
+ /// </summary>
+ private SerializableDictionary<string, object> userSettings;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="UserSettingService"/> class.
+ /// </summary>
+ public UserSettingService()
+ {
+ this.Load();
+ }
+
+ /// <summary>
+ /// The setting changed.
+ /// </summary>
+ public event SettingEventHandler SettingChanged;
+
+ /// <summary>
+ /// Set the specified user setting.
+ /// </summary>
+ /// <param name="name">
+ /// Name of the property
+ /// </param>
+ /// <param name="value">
+ /// The value to store.
+ /// </param>
+ public void SetUserSetting(string name, object value)
+ {
+ this.userSettings[name] = value;
+ this.Save();
+
+ this.OnSettingChanged(new SettingChangedEventArgs { Key = name, Value = value });
+ }
+
+ /// <summary>
+ /// Get user setting for a given key.
+ /// </summary>
+ /// <param name="name">
+ /// The name.
+ /// </param>
+ /// <typeparam name="T">
+ /// The Type of the setting
+ /// </typeparam>
+ /// <returns>
+ /// The user setting
+ /// </returns>
+ public T GetUserSetting<T>(string name)
+ {
+ if (this.userSettings.ContainsKey(name))
+ {
+ return (T)this.userSettings[name];
+ }
+
+ return default(T);
+ }
+
+ /// <summary>
+ /// Get an StringCollection type user setting
+ /// </summary>
+ /// <param name="name">
+ /// The setting name
+ /// </param>
+ /// <returns>
+ /// The settings value
+ /// </returns>
+ public StringCollection GetUserSettingStringCollection(string name)
+ {
+ return (StringCollection)this.userSettings[name];
+ }
+
+ /// <summary>
+ /// The on setting changed.
+ /// </summary>
+ /// <param name="e">
+ /// The e.
+ /// </param>
+ protected virtual void OnSettingChanged(SettingChangedEventArgs e)
+ {
+ SettingEventHandler handler = this.SettingChanged;
+ if (handler != null)
+ {
+ handler(this, e);
+ }
+ }
+
+ /// <summary>
+ /// Save the User Settings
+ /// </summary>
+ private void Save()
+ {
+ try
+ {
+ string directory = Path.GetDirectoryName(this.settingsFile);
+ if (!string.IsNullOrEmpty(directory) && !Directory.Exists(directory))
+ {
+ Directory.CreateDirectory(directory);
+ }
+
+ using (FileStream strm = new FileStream(this.settingsFile, FileMode.Create, FileAccess.Write))
+ {
+ this.serializer.Serialize(strm, this.userSettings);
+ }
+ }
+ catch (Exception exc)
+ {
+ throw new GeneralApplicationException(
+ "A problem occured when trying to save your preferences.",
+ "Any settings you changed may need to be reset the next time HandBrake launches.",
+ exc);
+ }
+ }
+
+ /// <summary>
+ /// Load the User Settings
+ /// </summary>
+ private void Load()
+ {
+ try
+ {
+ // Load up the users current settings file.
+ if (File.Exists(this.settingsFile))
+ {
+ using (StreamReader reader = new StreamReader(this.settingsFile))
+ {
+ SerializableDictionary<string, object> data = (SerializableDictionary<string, object>)this.serializer.Deserialize(reader);
+ this.userSettings = data;
+ }
+ }
+ else
+ {
+ this.userSettings = new SerializableDictionary<string, object>();
+ }
+
+ // Add any missing / new settings
+ SerializableDictionary<string, object> defaults = this.GetDefaults();
+ foreach (var item in defaults.Where(item => !this.userSettings.Keys.Contains(item.Key)))
+ {
+ this.userSettings.Add(item.Key, item.Value);
+ this.Save();
+ }
+ }
+ catch (Exception exc)
+ {
+ try
+ {
+ this.userSettings = this.GetDefaults();
+ if (File.Exists(this.settingsFile))
+ {
+ File.Delete(this.settingsFile);
+ }
+ this.Save();
+
+ throw new GeneralApplicationException("Warning, your settings have been reset!", "Your user settings file was corrupted or inaccessible. Settings have been reset to defaults.", exc);
+ }
+ catch (Exception)
+ {
+ throw new GeneralApplicationException("Unable to load user settings file: " + this.settingsFile, "Your user settings file appears to be inaccessible or corrupted. You may have to delete the file and let HandBrake generate a new one.", exc);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Load Default Settings
+ /// </summary>
+ /// <returns>
+ /// The get defaults.
+ /// </returns>
+ private SerializableDictionary<string, object> GetDefaults()
+ {
+ try
+ {
+ Assembly assembly = Assembly.GetEntryAssembly();
+ Stream stream = assembly.GetManifestResourceStream("HandBrakeWPF.defaultsettings.xml");
+ if (stream != null)
+ {
+ return (SerializableDictionary<string, object>)this.serializer.Deserialize(stream);
+ }
+ }
+ catch (Exception)
+ {
+ return new SerializableDictionary<string, object>();
+ }
+
+ return new SerializableDictionary<string, object>();
+ }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs Changed

@@ -21,6 +21,7 @@
 using Castle.Windsor;
 
 using HandBrake.ApplicationServices;
+ using HandBrake.ApplicationServices.Services;
 using HandBrake.ApplicationServices.Services.Interfaces;
 
 using HandBrakeWPF.Commands;
@@ -57,10 +58,11 @@
 
 // Services
 this.windsorContainer.Register(Component.For<IUpdateService>().ImplementedBy<UpdateService>().LifeStyle.Is(LifestyleType.Singleton));
- this.windsorContainer.Register(Component.For<IDriveDetectService>().ImplementedBy<DriveDetectService>().LifeStyle.Is(LifestyleType.Singleton));
- this.windsorContainer.Register(Component.For<IScanServiceWrapper>().ImplementedBy<ScanServiceWrapper>().LifeStyle.Is(LifestyleType.Singleton));
+ this.windsorContainer.Register(Component.For<IScan>().ImplementedBy<LibScan>().LifeStyle.Is(LifestyleType.Singleton));
 this.windsorContainer.Register(Component.For<IEncodeServiceWrapper>().ImplementedBy<EncodeServiceWrapper>().LifeStyle.Is(LifestyleType.Singleton));
 this.windsorContainer.Register(Component.For<INotificationService>().ImplementedBy<NotificationService>().LifeStyle.Is(LifestyleType.Singleton));
+ this.windsorContainer.Register(Component.For<IPrePostActionService>().ImplementedBy<PrePostActionService>().LifeStyle.Is(LifestyleType.Singleton));
+ this.windsorContainer.Register(Component.For<IUserSettingService>().ImplementedBy<UserSettingService>());
 
 // Commands
 this.windsorContainer.Register(Component.For<IAdvancedEncoderOptionsCommand>().ImplementedBy<AdvancedEncoderOptionsCommand>().LifeStyle.Is(LifestyleType.Singleton));
@@ -78,8 +80,12 @@
 this.windsorContainer.Register(Component.For<IOptionsViewModel>().ImplementedBy<OptionsViewModel>().LifeStyle.Is(LifestyleType.Singleton));
 this.windsorContainer.Register(Component.For<ITitleSpecificViewModel>().ImplementedBy<TitleSpecificViewModel>().LifeStyle.Is(LifestyleType.Singleton));
 this.windsorContainer.Register(Component.For<IQueueSelectionViewModel>().ImplementedBy<QueueSelectionViewModel>().LifeStyle.Is(LifestyleType.Singleton));
- 
-
+ this.windsorContainer.Register(Component.For<ICountdownAlertViewModel>().ImplementedBy<CountdownAlertViewModel>().LifeStyle.Is(LifestyleType.Singleton));
+ 
+ // Experimental Services and Windows.
+ this.windsorContainer.Register(Component.For<IInstantViewModel>().ImplementedBy<InstantViewModel>().LifeStyle.Is(LifestyleType.Singleton));
+ this.windsorContainer.Register(Component.For<IStaticPreviewViewModel>().ImplementedBy<StaticPreviewViewModel>().LifeStyle.Is(LifestyleType.Singleton));
+ 
 // Tab Components
 this.windsorContainer.Register(Component.For<IAudioViewModel>().ImplementedBy<AudioViewModel>().LifeStyle.Is(LifestyleType.Singleton));
 this.windsorContainer.Register(Component.For<IX264ViewModel>().ImplementedBy<X264ViewModel>().LifeStyle.Is(LifestyleType.Singleton));
@@ -116,7 +122,7 @@
 /// The Service Requested
 /// </returns>
 protected override object GetInstance(Type service, string key)
- {
+ { 
 return string.IsNullOrWhiteSpace(key) ? this.windsorContainer.Resolve(service) : this.windsorContainer.Resolve(key, new { });
 }

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Themes Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Themes/Generic.xaml Added

@@ -0,0 +1,52 @@
+<ResourceDictionary
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mwt="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
+ xmlns:splitButton="clr-namespace:HandBrakeWPF.Controls.SplitButton">
+
+ <Style TargetType="{x:Type splitButton:SplitMenuButton}" BasedOn="{StaticResource {x:Type Button}}">
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type splitButton:SplitMenuButton}">
+ <mwt:ButtonChrome x:Name="Chrome" Background="{TemplateBinding Control.Background}" BorderBrush="{TemplateBinding Control.BorderBrush}" 
+ RenderDefaulted="{TemplateBinding Button.IsDefaulted}" RenderMouseOver="{TemplateBinding UIElement.IsMouseOver}" 
+ RenderPressed="{TemplateBinding ButtonBase.IsPressed}" SnapsToDevicePixels="True">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition/>
+ <ColumnDefinition Width="Auto"/>
+ <ColumnDefinition Width="Auto"/>
+ </Grid.ColumnDefinitions>
+ 
+ <ContentPresenter Content="{TemplateBinding ContentControl.Content}" ContentStringFormat="{TemplateBinding ContentControl.ContentStringFormat}" 
+ ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}" HorizontalAlignment="{TemplateBinding Control.HorizontalContentAlignment}"
+ Margin="5,0,5,0" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" 
+ VerticalAlignment="{TemplateBinding Control.VerticalContentAlignment}" />
+ 
+ <Rectangle Grid.Column="1" Width="1" Fill="{TemplateBinding Foreground}" Opacity="0.4" Margin="0 4 0 4"/>
+ 
+ <Grid x:Name="SplitElement" Grid.Column="2" Background="Transparent">
+ <ContextMenuService.ContextMenu>
+ <ContextMenu ItemsSource="{Binding ItemSource, RelativeSource={RelativeSource TemplatedParent}}" Foreground="{TemplateBinding Foreground}" FlowDirection="{TemplateBinding FlowDirection}"/>
+ </ContextMenuService.ContextMenu>
+ <Path Data="M 0,0 L 8,0 L 4,4 Z" Fill="{TemplateBinding Foreground}" Margin="5 0 5 0" VerticalAlignment="Center"/>
+ </Grid>
+ </Grid>
+ </mwt:ButtonChrome>
+ <ControlTemplate.Triggers>
+ <Trigger Property="UIElement.IsKeyboardFocused" Value="True">
+ <Setter Property="mwt:ButtonChrome.RenderDefaulted" TargetName="Chrome" Value="True" />
+ </Trigger>
+ <Trigger Property="ToggleButton.IsChecked" Value="True">
+ <Setter Property="mwt:ButtonChrome.RenderPressed" TargetName="Chrome" Value="True" />
+ </Trigger>
+ <Trigger Property="UIElement.IsEnabled" Value="False">
+ <Setter Property="Control.Foreground" Value="#FFADADAD" />
+ </Trigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
+</ResourceDictionary>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/UserSettingConstants.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/UserSettingConstants.cs Changed

@@ -17,9 +17,9 @@
 #region Constants and Fields
 
 /// <summary>
- /// Add Only One Per Langage
+ /// HandBrakes build
 /// </summary>
- public const string AddOnlyOneAudioPerLanguage = "addOnlyOneAudioPerLanguage";
+ public const string HandBrakeBuild = "HandBrakeBuild";
 
 /// <summary>
 /// Auto name format
@@ -62,21 +62,6 @@
 public const string DefaultPlayer = "defaultPlayer";
 
 /// <summary>
- /// Dub mode
- /// </summary>
- public const string DubMode = "DubMode";
-
- /// <summary>
- /// Dub Mode Audio
- /// </summary>
- public const string DubModeAudio = "DubModeAudio";
-
- /// <summary>
- /// Dub Mode Subs
- /// </summary>
- public const string DubModeSubtitle = "DubModeSubtitle";
-
- /// <summary>
 /// Last Update Check
 /// </summary>
 public const string LastUpdateCheckDate = "lastUpdateCheckDate";
@@ -92,31 +77,11 @@
 public const string MinTitleLength = "MinTitleLength";
 
 /// <summary>
- /// Native Language Audio
- /// </summary>
- public const string NativeLanguage = "NativeLanguage";
-
- /// <summary>
- /// Native Language Subs
- /// </summary>
- public const string NativeLanguageForSubtitles = "NativeLanguageSubtitles";
-
- /// <summary>
 /// Preset Notification
 /// </summary>
 public const string PresetNotification = "presetNotification";
 
 /// <summary>
- /// Selected Languages
- /// </summary>
- public const string SelectedLanguages = "SelectedLanguages";
-
- /// <summary>
- /// AUudio Passthru
- /// </summary>
- public const string ShowAdvancedAudioPassthruOpts = "ShowAdvancedAudioPassthruOpts";
-
- /// <summary>
 /// Skip Version
 /// </summary>
 public const string Skipversion = "skipversion";
@@ -127,11 +92,6 @@
 public const string UpdateStatus = "updateStatus";
 
 /// <summary>
- /// Closed Captions
- /// </summary>
- public const string UseClosedCaption = "useClosedCaption";
-
- /// <summary>
 /// Use m4v
 /// </summary>
 public const string UseM4v = "useM4v";
@@ -139,7 +99,7 @@
 /// <summary>
 /// Vlc Path
 /// </summary>
- public const string VLC_Path = "VLC_Path";
+ public const string VLCPath = "VLC_Path";
 
 /// <summary>
 /// The enable process isolation.
@@ -152,11 +112,6 @@
 public const string ServerPort = "ServerPort";
 
 /// <summary>
- /// Enable Debugging features within the GUI.
- /// </summary>
- public const string EnableDebugFeatures = "EnableDebugFeatures";
-
- /// <summary>
 /// Enable the use of LibHb instead of HandBrakeCLI
 /// </summary>
 public const string EnableLibHb = "EnableLibHb";
@@ -195,11 +150,116 @@
 /// The last preview duration
 /// </summary>
 public const string LastPreviewDuration = "LastPreviewDuration";
+ 
+ /// <summary>
+ /// When Complete Action
+ /// </summary>
+ public const string WhenCompleteAction = "WhenCompleteAction";
+
+ /// <summary>
+ /// Send file enabled.
+ /// </summary>
+ public const string SendFile = "SendFile";
+
+ /// <summary>
+ /// Send file to application path
+ /// </summary>
+ public const string SendFileTo = "SendFileTo";
+
+ /// <summary>
+ /// Send file to arguments
+ /// </summary>
+ public const string SendFileToArgs = "SendFileToArgs";
+
+ /// <summary>
+ /// Prevent Sleep
+ /// </summary>
+ public const string PreventSleep = "PreventSleep";
+
+ /// <summary>
+ /// The remove punctuation.
+ /// </summary>
+ public const string RemovePunctuation = "RemovePunctuation";
+
+ /// <summary>
+ /// The Show Preset Panel
+ /// </summary>
+ public const string ShowPresetPanel = "ShowPresetPanel";
+
+ /// <summary>
+ /// The use system colours.
+ /// </summary>
+ public const string UseSystemColours = "UseSystemColours";
+
+ /// <summary>
+ /// The reset when done action.
+ /// </summary>
+ public const string ResetWhenDoneAction = "ResetWhenDoneAction";
+
+ /// <summary>
+ /// The disable lib dvd nav.
+ /// </summary>
+ public const string DisableLibDvdNav = "DisableLibDvdNav";
+
+ /// <summary>
+ /// The disable quick sync decoding.
+ /// </summary>
+ public const string DisableQuickSyncDecoding = "DisableQuickSyncDecoding";
+
+ /// <summary>
+ /// The enable dxva.
+ /// </summary>
+ public const string EnableDxva = "EnableDxva";
+
+ /// <summary>
+ /// The scaling mode.
+ /// </summary>
+ public const string ScalingMode = "ScalingMode";
+
+ /// <summary>
+ /// Preview Scan Count
+ /// </summary>
+ public const string PreviewScanCount = "previewScanCount";
+
+ /// <summary>
+ /// The Verbosity
+ /// </summary>
+ public const string Verbosity = "Verbosity";
+
+ /// <summary>
+ /// Min Title Scan Duration
+ /// </summary>
+ public const string MinScanDuration = "MinTitleScanDuration";
+
+ /// <summary>
+ /// Process Priority
+ /// </summary>
+ public const string ProcessPriority = "ProcessPriority";
+
+ /// <summary>
+ /// Save Log Directory
+ /// </summary>
+ public const string SaveLogToCopyDirectory = "SaveLogToCopyDirectory";
+
+ /// <summary>
+ /// Save log with video
+ /// </summary>
+ public const string SaveLogWithVideo = "SaveLogWithVideo";
+
+ /// <summary>
+ /// Save copy of the log to a directory
+ /// </summary>
+ public const string SaveLogCopyDirectory = "SaveLogCopyDirectory";
+
+ /// <summary>
+ /// The clear completed from queue.
+ /// </summary>
+ public const string ClearCompletedFromQueue = "ClearCompletedFromQueue";
 
 /// <summary>
- /// Disable LibHb Features
+ /// The enable static preview.
 /// </summary>
- public const string DisableLibHbFeatures = "DisableLibHbFeatures";
+ public const string EnableStaticPreview = "EnableStaticPreview";
 
 #endregion
 }

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Utilities Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Utilities/DPIAwareness.cs Added

@@ -0,0 +1,66 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="DPIAwareness.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the DPIAwareness type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Utilities
+{
+ using System.Windows;
+ using System.Windows.Media;
+
+ /// <summary>
+ /// The dpi awareness.
+ /// </summary>
+ public class DPIAwareness
+ {
+ /// <summary>
+ /// The dx.
+ /// </summary>
+ private static double dx;
+
+ /// <summary>
+ /// The dy.
+ /// </summary>
+ private static double dy;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="DPIAwareness"/> class.
+ /// </summary>
+ public DPIAwareness()
+ {
+ var presentationSource = PresentationSource.FromVisual(Application.Current.MainWindow);
+ if (presentationSource != null && presentationSource.CompositionTarget != null)
+ {
+ Matrix m = presentationSource.CompositionTarget.TransformToDevice;
+ dx = m.M11;
+ dy = m.M22;
+ }
+ }
+
+ /// <summary>
+ /// Gets the dpix.
+ /// </summary>
+ public double Dpix
+ {
+ get
+ {
+ return dx;
+ }
+ }
+
+ /// <summary>
+ /// Gets the dpi y.
+ /// </summary>
+ public double DpiY
+ {
+ get
+ {
+ return dy;
+ }
+ }
+ }
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Utilities/DelayedActionProcessor.cs Added

@@ -0,0 +1,72 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="DelayedActionProcessor.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// An Action processor that supports queueing/delayed action processing.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Utilities
+{
+ using System;
+ using System.Timers;
+
+ /// <summary>
+ /// An Action processor that supports queueing/delayed action processing.
+ /// </summary>
+ public class DelayedActionProcessor
+ {
+ /// <summary>
+ /// The task.
+ /// </summary>
+ private Action task;
+
+ /// <summary>
+ /// The timer.
+ /// </summary>
+ private Timer timer;
+
+ /// <summary>
+ /// The set task.
+ /// </summary>
+ /// <param name="taskReset">
+ /// The task reset.
+ /// </param>
+ /// <param name="timems">
+ /// The timems.
+ /// </param>
+ public void PerformTask(Action taskReset, int timems)
+ {
+ if (timer != null)
+ {
+ timer.Stop();
+ timer.Close(); 
+ }
+
+ timer = new Timer(timems) { AutoReset = true };
+ timer.Elapsed += this.timer_Elapsed;
+ task = taskReset;
+ timer.Stop();
+ timer.Start();
+ }
+
+ /// <summary>
+ /// The timer_ elapsed.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
+ private void timer_Elapsed(object sender, ElapsedEventArgs e)
+ {
+ if (task != null)
+ {
+ timer.Stop();
+ task(); 
+ }
+ }
+ }
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Utilities/HandBrakeApp.cs Added

@@ -0,0 +1,63 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HandBrakeApp.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// A general Helper class for HandBrake GUI
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Utilities
+{
+ using System;
+ using System.Collections.Generic;
+ using System.IO;
+ using System.Linq;
+
+ /// <summary>
+ /// A general Helper class for HandBrake GUI
+ /// </summary>
+ public class HandBrakeApp
+ {
+ /// <summary>
+ /// The reset to defaults.
+ /// </summary>
+ public static void ResetToDefaults()
+ {
+ DeleteFile(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\presets.xml");
+ DeleteFile(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\user_presets.xml");
+ DeleteFile(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\settings.xml");
+
+ string tempPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), @"HandBrake\");
+ DirectoryInfo info = new DirectoryInfo(tempPath);
+ IEnumerable<FileInfo> logFiles = info.GetFiles("*.xml").Where(f => f.Name.StartsWith("hb_queue_recovery"));
+ foreach (FileInfo file in logFiles)
+ {
+ DeleteFile(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\" + file.Name);
+ }
+ }
+
+ /// <summary>
+ /// The delete file.
+ /// </summary>
+ /// <param name="file">
+ /// The file.
+ /// </param>
+ private static void DeleteFile(string file)
+ {
+ try
+ {
+ Console.WriteLine("Trying to deleting File: {0}", file);
+ if (File.Exists(file))
+ {
+ File.Delete(file);
+ Console.WriteLine("File was deleted successfully");
+ }
+ }
+ catch (Exception exc)
+ {
+ Console.WriteLine("Unable to Delete File: {0} {1} {2}", file, Environment.NewLine, exc);
+ }
+ }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs Changed

@@ -13,10 +13,15 @@
 using System.Windows;
 
 using HandBrake.ApplicationServices.Model;
+ using HandBrake.ApplicationServices.Model.Audio;
+ using HandBrake.ApplicationServices.Model.Subtitle;
+ using HandBrake.ApplicationServices.Parsing;
 using HandBrake.ApplicationServices.Services;
 using HandBrake.ApplicationServices.Services.Interfaces;
 using HandBrake.ApplicationServices.Utilities;
+ using HandBrake.Interop.Model.Encoding;
 
+ using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.ViewModels.Interfaces;
 
@@ -25,8 +30,6 @@
 /// </summary>
 public class AddPresetViewModel : ViewModelBase, IAddPresetViewModel
 {
- /* TODO this window is up for redesign. Quite a few nippy edge cases that can cause odd behaviour with importing presets. */
-
 /// <summary>
 /// Backing field for the Preset Service
 /// </summary>
@@ -48,6 +51,11 @@
 private bool showCustomInputs;
 
 /// <summary>
+ /// The source.
+ /// </summary>
+ private Title selectedTitle;
+
+ /// <summary>
 /// Initializes a new instance of the <see cref="AddPresetViewModel"/> class.
 /// </summary>
 /// <param name="presetService">
@@ -61,7 +69,7 @@
 this.presetService = presetService;
 this.errorService = errorService;
 this.Title = "Add Preset";
- this.Preset = new Preset { IsBuildIn = false, IsDefault = false, Category = PresetService.UserPresetCatgoryName, UsePictureFilters = true};
+ this.Preset = new Preset { IsBuildIn = false, IsDefault = false, Category = PresetService.UserPresetCatgoryName, UsePictureFilters = true };
 this.PictureSettingsModes = EnumHelper<PresetPictureSettingsMode>.GetEnumList();
 }
 
@@ -78,12 +86,12 @@
 /// <summary>
 /// Gets or sets CustomWidth.
 /// </summary>
- public int CustomWidth { get; set; }
+ public int? CustomWidth { get; set; }
 
 /// <summary>
 /// Gets or sets CustomHeight.
 /// </summary>
- public int CustomHeight { get; set; }
+ public int? CustomHeight { get; set; }
 
 /// <summary>
 /// Gets or sets a value indicating whether ShowCustomInputs.
@@ -123,9 +131,36 @@
 /// <param name="task">
 /// The Encode Task.
 /// </param>
- public void Setup(EncodeTask task)
+ /// <param name="title">
+ /// The title.
+ /// </param>
+ /// <param name="audioBehaviours">
+ /// The audio Behaviours.
+ /// </param>
+ /// <param name="subtitleBehaviours">
+ /// The subtitle Behaviours.
+ /// </param>
+ public void Setup(EncodeTask task, Title title, AudioBehaviours audioBehaviours, SubtitleBehaviours subtitleBehaviours)
 {
 this.Preset.Task = new EncodeTask(task);
+ this.Preset.AudioTrackBehaviours = audioBehaviours.Clone();
+ this.Preset.SubtitleTrackBehaviours = subtitleBehaviours.Clone();
+ this.selectedTitle = title;
+
+ switch (task.Anamorphic)
+ {
+ default:
+ this.SelectedPictureSettingMode = PresetPictureSettingsMode.Custom;
+ if (title != null && title.Resolution != null)
+ {
+ this.CustomWidth = title.Resolution.Width;
+ this.CustomHeight = title.Resolution.Height;
+ }
+ break;
+ case Anamorphic.Strict:
+ this.SelectedPictureSettingMode = PresetPictureSettingsMode.SourceMaximum;
+ break;
+ }
 }
 
 /// <summary>
@@ -135,22 +170,28 @@
 {
 if (string.IsNullOrEmpty(this.Preset.Name))
 {
- this.errorService.ShowMessageBox("A Preset must have a Name. Please fill out the Preset Name field.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ this.errorService.ShowMessageBox("A Preset must have a Name. Please fill out the Preset Name field.", Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 return;
 }
 
 if (this.presetService.CheckIfPresetExists(this.Preset.Name))
 {
- MessageBoxResult result = this.errorService.ShowMessageBox("A Preset with this name already exists. Would you like to overwrite it?", "Error", MessageBoxButton.YesNo, MessageBoxImage.Error);
- if (result == MessageBoxResult.No)
- {
- return;
- }
+ MessageBoxResult result = this.errorService.ShowMessageBox("A Preset with this name already exists. Would you like to overwrite it?", Resources.Error, MessageBoxButton.YesNo, MessageBoxImage.Error);
+ if (result == MessageBoxResult.No)
+ {
+ return;
+ }
+ }
+
+ if (this.SelectedPictureSettingMode == PresetPictureSettingsMode.SourceMaximum && this.selectedTitle == null)
+ {
+ this.errorService.ShowMessageBox("You must first scan a source to use the 'Source Maximum' Option.", Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ return;
 }
 
- if (this.SelectedPictureSettingMode == PresetPictureSettingsMode.SourceMaximum && (this.Preset.Task.Width == null || this.Preset.Task.Width == 0))
+ if (this.CustomWidth == null && this.CustomHeight == null && this.SelectedPictureSettingMode == PresetPictureSettingsMode.Custom)
 {
- this.errorService.ShowMessageBox("You must first scan a source to use the 'Source Maximum' Option.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ this.errorService.ShowMessageBox("The Custom Width or Height fields must be filled in for the 'Custom' option.", Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 return;
 }
 
@@ -174,8 +215,8 @@
 
 if (this.SelectedPictureSettingMode == PresetPictureSettingsMode.SourceMaximum)
 {
- this.Preset.Task.MaxWidth = this.Preset.Task.Width;
- this.Preset.Task.MaxHeight = this.Preset.Task.Height;
+ this.Preset.Task.MaxWidth = selectedTitle.Resolution.Width;
+ this.Preset.Task.MaxHeight = selectedTitle.Resolution.Height;
 }
 
 // Add the Preset

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs Changed

@@ -9,23 +9,21 @@
 
 namespace HandBrakeWPF.ViewModels
 {
- using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
- using System.Collections.Specialized;
+ using System.ComponentModel;
 using System.Linq;
 
 using Caliburn.Micro;
 
 using HandBrake.ApplicationServices.Model;
+ using HandBrake.ApplicationServices.Model.Audio;
 using HandBrake.ApplicationServices.Model.Encoding;
 using HandBrake.ApplicationServices.Parsing;
- using HandBrake.ApplicationServices.Services.Interfaces;
 using HandBrake.ApplicationServices.Utilities;
 using HandBrake.Interop.Model.Encoding;
 
- using HandBrakeWPF.Commands;
- using HandBrakeWPF.Model;
+ using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.ViewModels.Interfaces;
 
 /// <summary>
@@ -38,8 +36,26 @@
 /// </summary>
 private IEnumerable<Audio> sourceTracks;
 
+ /// <summary>
+ /// The current preset.
+ /// </summary>
 private Preset currentPreset;
 
+ /// <summary>
+ /// The show audio defaults panel.
+ /// </summary>
+ private bool showAudioDefaultsPanel;
+
+ /// <summary>
+ /// The available languages.
+ /// </summary>
+ private BindingList<string> availableLanguages;
+
+ /// <summary>
+ /// The audio behaviours.
+ /// </summary>
+ private AudioBehaviours audioBehaviours;
+
 #region Constructors and Destructors
 
 /// <summary>
@@ -58,6 +74,12 @@
 this.AudioEncoders = EnumHelper<AudioEncoder>.GetEnumList();
 this.AudioMixdowns = EnumHelper<Mixdown>.GetEnumList();
 this.SourceTracks = new List<Audio>();
+
+ this.AudioBehaviours = new AudioBehaviours();
+ this.SelectedAvailableToMove = new BindingList<string>();
+ this.SelectedLangaugesToMove = new BindingList<string>();
+ this.AvailableLanguages = new BindingList<string>();
+ this.SetupLanguages(null);
 }
 
 #endregion
@@ -65,6 +87,37 @@
 #region Properties
 
 /// <summary>
+ /// Gets or sets the audio behaviours.
+ /// </summary>
+ public AudioBehaviours AudioBehaviours
+ {
+ get
+ {
+ return this.audioBehaviours;
+ }
+ set
+ {
+ if (Equals(value, this.audioBehaviours))
+ {
+ return;
+ }
+ this.audioBehaviours = value;
+ this.NotifyOfPropertyChange(() => this.AudioBehaviours);
+ }
+ }
+
+ /// <summary>
+ /// Gets the audio behaviour modes.
+ /// </summary>
+ public BindingList<AudioBehaviourModes> AudioBehaviourModeList
+ {
+ get
+ {
+ return new BindingList<AudioBehaviourModes>(EnumHelper<AudioBehaviourModes>.GetEnumList().ToList());
+ }
+ }
+
+ /// <summary>
 /// Gets or sets AudioBitrates.
 /// </summary>
 public IEnumerable<int> AudioBitrates { get; set; }
@@ -106,16 +159,76 @@
 public EncodeTask Task { get; set; }
 
 /// <summary>
- /// Gets a value indicating whether ShowPassthruOptions.
+ /// Gets or sets a value indicating whether show audio defaults panel.
+ /// </summary>
+ public bool ShowAudioDefaultsPanel
+ {
+ get
+ {
+ return this.showAudioDefaultsPanel;
+ }
+ set
+ {
+ if (value.Equals(this.showAudioDefaultsPanel))
+ {
+ return;
+ }
+ this.showAudioDefaultsPanel = value;
+ this.NotifyOfPropertyChange(() => this.ShowAudioDefaultsPanel);
+ this.NotifyOfPropertyChange(() => this.PanelTitle);
+ this.NotifyOfPropertyChange(() => this.SwitchDisplayTitle);
+ }
+ }
+
+ /// <summary>
+ /// Gets the panel title.
+ /// </summary>
+ public string PanelTitle
+ {
+ get
+ {
+ return this.ShowAudioDefaultsPanel ? "Audio Defaults" : "Audio Tracks";
+ }
+ }
+
+ /// <summary>
+ /// Gets the switch display title.
 /// </summary>
- public bool ShowPassthruOptions
+ public string SwitchDisplayTitle
 {
 get
 {
- return this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAdvancedAudioPassthruOpts);
+ return this.ShowAudioDefaultsPanel ? "Switch to Tracks" : "Switch to Defaults";
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets AvailableLanguages.
+ /// </summary>
+ public BindingList<string> AvailableLanguages
+ {
+ get
+ {
+ return this.availableLanguages;
+ }
+
+ set
+ {
+ this.availableLanguages = value;
+ this.NotifyOfPropertyChange("AvailableLanguages");
 }
 }
 
+ /// <summary>
+ /// Gets or sets SelectedLangauges.
+ /// </summary>
+ public BindingList<string> SelectedAvailableToMove { get; set; }
+
+ /// <summary>
+ /// Gets or sets SelectedLangauges.
+ /// </summary>
+ public BindingList<string> SelectedLangaugesToMove { get; set; }
+
 #endregion
 
 #region Public Methods
@@ -177,16 +290,71 @@
 /// </summary>
 public void SetDefaultBehaviour()
 {
- OpenOptionsScreenCommand command = new OpenOptionsScreenCommand();
- command.Execute(OptionsTab.AudioAndSubtitles);
+ this.ShowAudioDefaultsPanel = true;
+ }
+
+ /// <summary>
+ /// The show audio defaults.
+ /// </summary>
+ public void ShowAudioDefaults()
+ {
+ this.ShowAudioDefaultsPanel = !this.ShowAudioDefaultsPanel;
+ }
+
+ /// <summary>
+ /// Audio List Move Left
+ /// </summary>
+ public void LanguageMoveRight()
+ {
+ if (this.SelectedAvailableToMove.Count > 0)
+ {
+ List<string> copiedList = SelectedAvailableToMove.ToList();
+ foreach (string item in copiedList)
+ {
+ this.AvailableLanguages.Remove(item);
+ this.AudioBehaviours.SelectedLangauges.Add(item);
+ }
+
+ this.AvailableLanguages = new BindingList<string>(this.AvailableLanguages.OrderBy(o => o).ToList());
+ }
+ }
+
+ /// <summary>
+ /// Audio List Move Right
+ /// </summary>
+ public void LanguageMoveLeft()
+ {
+ if (this.SelectedLangaugesToMove.Count > 0)
+ {
+ List<string> copiedList = SelectedLangaugesToMove.ToList();
+ foreach (string item in copiedList)
+ {
+ this.AudioBehaviours.SelectedLangauges.Remove(item);
+ this.AvailableLanguages.Add(item);
+ }
+ }
+
+ this.AvailableLanguages = new BindingList<string>(this.AvailableLanguages.OrderBy(o => o).ToList());
+ }
+
+ /// <summary>
+ /// Audio List Clear all selected languages
+ /// </summary>
+ public void LanguageClearAll()
+ {
+ foreach (string item in this.AudioBehaviours.SelectedLangauges)
+ {
+ this.AvailableLanguages.Add(item);
+ }
+ this.AvailableLanguages = new BindingList<string>(this.AvailableLanguages.OrderBy(o => o).ToList());
+
+ this.AudioBehaviours.SelectedLangauges.Clear();
 }
 
 #endregion
 
 #region Implemented Interfaces
 
- #region ITabInterface
-
 /// <summary>
 /// Setup this tab for the specified preset.
 /// </summary>
@@ -201,11 +369,16 @@
 this.Task = task;
 this.currentPreset = preset;
 
+ // Audio Behaviours
+ this.SetupLanguages(preset);
+
 if (preset != null && preset.Task != null)
 {
- this.AddTracksFromPreset(preset);
 this.Task.AllowedPassthruOptions = new AllowedPassthru(preset.Task.AllowedPassthruOptions);
+
+ this.SetupTracks();
 }
+
 this.NotifyOfPropertyChange(() => this.Task);
 }
 
@@ -239,7 +412,7 @@
 this.SourceTracks = title.AudioTracks;
 
 // Only reset the audio tracks if we have none, or if the task is null.
- if (this.Task == null || this.Task.AudioTracks.Count == 0)
+ if (this.Task == null)
 {
 this.SetPreset(preset, task);
 }
@@ -251,7 +424,7 @@
 }
 else
 {
- this.AutomaticTrackSelection();
+ this.SetupTracks();
 }
 
 // Force UI Updates
@@ -260,8 +433,6 @@
 
 #endregion
 
- #endregion
-
 #region Methods
 
 /// <summary>
@@ -290,12 +461,6 @@
 // For all the source audio tracks
 foreach (Audio sourceTrack in this.SourceTracks)
 {
- // Step 1: If "Add only One per language" is turned on, check to see if this language is already added.
- if (this.CanSkipSourceTrack(sourceTrack))
- {
- continue;
- }
-
 // Step 2: Check if the track list already contrains this track
 bool found = this.Task.AudioTracks.Any(audioTrack => Equals(audioTrack.ScannedTrack, sourceTrack));
 if (!found)
@@ -307,84 +472,89 @@
 }
 
 /// <summary>
- /// Add all remaining for selected languages.
+ /// Attempt to automatically select the correct audio tracks based on the users settings.
 /// </summary>
- public void AddAllRemainingForSelectedLanguages()
+ private void SetupTracks()
 {
- // Add them if they are not already added.
- foreach (Audio sourceTrack in this.GetSelectedLanguagesTracks())
+ if (!this.SourceTracks.Any())
 {
- // Step 1: If "Add only One per language" is turned on, check to see if this language is already added.
- if (this.CanSkipSourceTrack(sourceTrack))
- {
- continue;
- }
+ // Clear out the old tracks
+ this.Task.AudioTracks.Clear();
 
- // Step 2: Check if the track list already contrains this track
- bool found = this.Task.AudioTracks.Any(audioTrack => Equals(audioTrack.ScannedTrack, sourceTrack));
- if (!found)
- {
- // If it doesn't, add it.
- this.Add(sourceTrack);
- }
+ return;
 }
- }
 
- /// <summary>
- /// Add the required tracks for the current preset
- /// </summary>
- /// <param name="preset">
- /// The preset.
- /// </param>
- private void AddTracksFromPreset(Preset preset)
- {
- // Clear out the old tracks
+ // Step 1, Cleanup Previous Tracks
 this.Task.AudioTracks.Clear();
 
- // Add the preset audio tracks with the preferred language
- foreach (AudioTrack track in preset.Task.AudioTracks)
+ // Step 2, Sanity Check
+ if (this.SourceTracks == null || !this.SourceTracks.Any())
+ {
+ return;
+ }
+
+ // Step 3, Setup the tracks from the preset
+ foreach (AudioTrack track in this.currentPreset.Task.AudioTracks)
 {
 this.Task.AudioTracks.Add(new AudioTrack(track) { ScannedTrack = this.GetPreferredAudioTrack() });
 }
+ 
+ // Step 4, Handle the default selection behaviour.
+ switch (this.AudioBehaviours.SelectedBehaviour)
+ {
+ case AudioBehaviourModes.FirstMatch: // Adding all remaining audio tracks
+ this.AddFirstForSelectedLanguages();
+ break;
+ case AudioBehaviourModes.AllMatching: // Add Langauges tracks for the additional languages selected, in-order.
+ this.AddAllRemainingForSelectedLanguages();
+ break;
+ }
 }
 
 /// <summary>
- /// Attempt to automatically select the correct audio tracks based on the users settings.
+ /// The add first for selected languages.
 /// </summary>
- private void AutomaticTrackSelection()
+ private void AddFirstForSelectedLanguages()
 {
- if (!this.SourceTracks.Any())
- {
- // Clear out the old tracks
- this.Task.AudioTracks.Clear();
-
- return;
- }
-
- // We've changed source, so lets try reset the language, description and formats as close as possible to the previous track.
- foreach (AudioTrack track in this.Task.AudioTracks)
+ foreach (Audio sourceTrack in this.GetSelectedLanguagesTracks())
 {
- track.ScannedTrack = this.GetPreferredAudioTrack();
- }
+ // Step 2: Check if the track list already contrains this track
+ bool found = this.Task.AudioTracks.Any(audioTrack => Equals(audioTrack.ScannedTrack, sourceTrack));
+ if (!found)
+ {
+ // Check if we are already using this language
+ bool foundLanguage = false;
+ foreach (var item in this.Task.AudioTracks.Where(item => item.ScannedTrack != null && sourceTrack.LanguageCode.Contains(item.ScannedTrack.LanguageCode)))
+ {
+ foundLanguage = true;
+ }
+
+ if (foundLanguage)
+ {
+ continue;
+ }
 
- // Handle the default selection behaviour.
- int mode = this.UserSettingService.GetUserSetting<int>(UserSettingConstants.DubModeAudio);
- if (mode == 1 || mode == 2)
- {
- // First, we'll clear out all current tracks and go back to what the current preset has.
- // This will alteast provide a consistent behavior when switching tracks.
- this.Task.AudioTracks.Clear();
- this.AddTracksFromPreset(this.currentPreset);
+ // If it doesn't, add it.
+ this.Add(sourceTrack);
+ }
 }
+ }
 
- switch (mode)
+ /// <summary>
+ /// Add all remaining for selected languages.
+ /// </summary>
+ public void AddAllRemainingForSelectedLanguages()
+ {
+ // Add them if they are not already added.
+ foreach (Audio sourceTrack in this.GetSelectedLanguagesTracks())
 {
- case 1: // Adding all remaining audio tracks
- this.AddAllRemaining();
- break;
- case 2: // Add Langauges tracks for the additional languages selected, in-order.
- this.AddAllRemainingForSelectedLanguages();
- break;
+ // Step 2: Check if the track list already contrains this track
+ bool found = this.Task.AudioTracks.Any(audioTrack => Equals(audioTrack.ScannedTrack, sourceTrack));
+ if (!found)
+ {
+ // If it doesn't, add it.
+ this.Add(sourceTrack);
+ }
 }
 }
 
@@ -396,12 +566,18 @@
 /// </returns>
 private Audio GetPreferredAudioTrack()
 {
- // Get the preferred Language
- IEnumerable<Audio> preferredAudioTracks =
- this.SourceTracks.Where(
- item =>
- item.Language.Contains(
- this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguage)));
+ // The first track in the selected languages list is considered the preferred language.
+ // So, try match tracks on this.
+ IEnumerable<Audio> preferredAudioTracks = new List<Audio>();
+ if (this.AudioBehaviours.SelectedLangauges.Count > 0)
+ {
+ string langName = this.AudioBehaviours.SelectedLangauges.FirstOrDefault(w => !w.Equals(Constants.Any));
+ if (!string.IsNullOrEmpty(langName))
+ {
+ preferredAudioTracks = this.SourceTracks.Where(item => item.Language.Contains(langName));
+ }
+ }
+
 return preferredAudioTracks.FirstOrDefault() ?? this.SourceTracks.FirstOrDefault();
 }
 
@@ -414,34 +590,54 @@
 private IEnumerable<Audio> GetSelectedLanguagesTracks()
 {
 List<Audio> trackList = new List<Audio>();
- foreach (string language in this.UserSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages))
+
+ List<string> isoCodes = this.AudioBehaviours.SelectedLangauges.Contains(Constants.Any)
+ ? LanguageUtilities.GetIsoCodes()
+ : LanguageUtilities.GetLanguageCodes(
+ this.AudioBehaviours.SelectedLangauges.ToArray());
+
+ foreach (string code in isoCodes)
 {
- trackList.AddRange(this.SourceTracks.Where(source => source.Language.Trim() == language));
+ trackList.AddRange(this.SourceTracks.Where(source => source.LanguageCode.Trim() == code));
 }
 
 return trackList;
 }
 
 /// <summary>
- /// Checks to see if we can skip over the given source audio track.
- /// True when the user has set "Add only one per language" feature AND the language is contained in the track list.
+ /// The setup languages.
 /// </summary>
- /// <param name="sourceTrack">
- /// The source track.
+ /// <param name="preset">
+ /// The preset.
 /// </param>
- /// <returns>
- /// True when the user has set "Add only one per language" feature AND the language is contained in the track list
- /// </returns>
- private bool CanSkipSourceTrack(Audio sourceTrack)
+ private void SetupLanguages(Preset preset)
 {
- bool addOnlyOnePerLanguage = this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.AddOnlyOneAudioPerLanguage);
- bool sourceTrackLanguageFound = this.Task.AudioTracks.Any(audioTrack => audioTrack.ScannedTrack != null && sourceTrack.Language == audioTrack.ScannedTrack.Language);
- if (addOnlyOnePerLanguage && sourceTrackLanguageFound)
+ // Step 1, Set the behaviour mode
+ this.AudioBehaviours.SelectedBehaviour = AudioBehaviourModes.None;
+ this.AudioBehaviours.SelectedLangauges.Clear();
+
+ // Step 2, Get all the languages
+ IDictionary<string, string> langList = LanguageUtilities.MapLanguages();
+ langList = (from entry in langList orderby entry.Key ascending select entry).ToDictionary(pair => pair.Key, pair => pair.Value);
+
+ // Step 3, Setup Available Languages
+ this.AvailableLanguages.Clear();
+ foreach (string item in langList.Keys)
 {
- return true; // This track can be skipped.
+ this.AvailableLanguages.Add(item);
 }
 
- return false;
+ // Step 4, Set the Selected Languages 
+ if (preset != null && preset.AudioTrackBehaviours != null)
+ {
+ this.AudioBehaviours.SelectedBehaviour = preset.AudioTrackBehaviours.SelectedBehaviour;
+
+ foreach (string selectedItem in preset.AudioTrackBehaviours.SelectedLangauges)
+ {
+ this.AvailableLanguages.Remove(selectedItem);
+ this.AudioBehaviours.SelectedLangauges.Add(selectedItem);
+ }
+ }
 }
 
 #endregion

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs Changed

@@ -20,10 +20,12 @@
 using HandBrake.ApplicationServices.Model;
 using HandBrake.ApplicationServices.Model.Encoding;
 using HandBrake.ApplicationServices.Parsing;
- using HandBrake.ApplicationServices.Services.Interfaces;
 
+ using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.ViewModels.Interfaces;
 
+ using LumenWorks.Framework.IO.Csv;
+
 using Ookii.Dialogs.Wpf;
 
 /// <summary>
@@ -160,19 +162,17 @@
 IDictionary<int, string> chapterMap = new Dictionary<int, string>();
 try
 {
- var sr = new StreamReader(filename);
- string csv = sr.ReadLine();
- while (csv != null)
+ using (CsvReader csv = new CsvReader(new StreamReader(filename), false))
 {
- if (csv.Trim() != string.Empty)
+ while (csv.ReadNextRecord())
 {
- csv = csv.Replace("\\,", "<!comma!>");
- string[] contents = csv.Split(',');
- int chapter;
- int.TryParse(contents[0], out chapter);
- chapterMap.Add(chapter, contents[1].Replace("<!comma!>", ","));
+ if (csv.FieldCount == 2)
+ {
+ int chapter;
+ int.TryParse(csv[0], out chapter);
+ chapterMap[chapter] = csv[1];
+ }
 }
- csv = sr.ReadLine();
 }
 }
 catch (Exception)

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs Added

@@ -0,0 +1,151 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="CountdownAlertViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The Countdown Alert View Model
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels
+{
+ using System;
+ using System.Windows.Threading;
+
+ using HandBrakeWPF.ViewModels.Interfaces;
+
+ /// <summary>
+ /// The Countdown Alert View Model
+ /// </summary>
+ public class CountdownAlertViewModel : ViewModelBase, ICountdownAlertViewModel
+ {
+ #region Private Fields
+
+ /// <summary>
+ /// The countdown time.
+ /// </summary>
+ private const int CountdownTime = 60;
+
+ /// <summary>
+ /// The action.
+ /// </summary>
+ private string action;
+
+ /// <summary>
+ /// The timer.
+ /// </summary>
+ private DispatcherTimer timer;
+
+ #endregion
+
+ #region Constructors and Destructors
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="CountdownAlertViewModel"/> class.
+ /// </summary>
+ public CountdownAlertViewModel()
+ {
+ this.IsCancelled = false;
+
+ Caliburn.Micro.Execute.OnUIThread(
+ () =>
+ {
+ timer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(1) };
+ timer.Tick += this.timer_Tick;
+
+ timer.Start();
+ });
+ }
+
+ #endregion
+
+ #region Public Properties
+
+ /// <summary>
+ /// Gets or sets a value indicating whether is cancelled.
+ /// </summary>
+ public bool IsCancelled { get; set; }
+
+ /// <summary>
+ /// Gets the notice message.
+ /// </summary>
+ public string NoticeMessage
+ {
+ get
+ {
+ return string.Format("The following action '{0}' will occur in {1} seconds.", action, CountdownTime - this.Ticks);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the ticks.
+ /// </summary>
+ public int Ticks { get; set; }
+
+ #endregion
+
+ #region Public Methods and Operators
+
+ /// <summary>
+ /// The cancel.
+ /// </summary>
+ public void Cancel()
+ {
+ this.IsCancelled = true;
+ timer.Stop();
+ this.Ticks = 0;
+ this.TryClose();
+ }
+
+ /// <summary>
+ /// The proceed.
+ /// </summary>
+ public void Proceed()
+ {
+ this.IsCancelled = false;
+ timer.Stop();
+ this.Ticks = 0;
+ this.TryClose();
+ }
+
+ /// <summary>
+ /// The set action.
+ /// </summary>
+ /// <param name="actionMsg">
+ /// The action.
+ /// </param>
+ public void SetAction(string actionMsg)
+ {
+ this.Ticks = 0;
+ timer.Start();
+ this.action = actionMsg;
+ }
+
+ #endregion
+
+ #region Methods
+
+ /// <summary>
+ /// The timer_ tick.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
+ private void timer_Tick(object sender, EventArgs e)
+ {
+ this.Ticks = this.Ticks + 1;
+ this.NotifyOfPropertyChange(() => this.NoticeMessage);
+ if (this.Ticks > CountdownTime)
+ {
+ timer.Stop();
+ this.Ticks = 0;
+ this.TryClose();
+ }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/ErrorViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/ErrorViewModel.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs Changed

@@ -10,15 +10,17 @@
 namespace HandBrakeWPF.ViewModels
 {
 using System.Collections.Generic;
+ using System.Globalization;
 
 using Caliburn.Micro;
 
 using HandBrake.ApplicationServices.Model;
+ using HandBrake.ApplicationServices.Model.Encoding;
 using HandBrake.ApplicationServices.Parsing;
- using HandBrake.ApplicationServices.Services.Interfaces;
 using HandBrake.ApplicationServices.Utilities;
 using HandBrake.Interop.Model.Encoding;
 
+ using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.ViewModels.Interfaces;
 
 /// <summary>
@@ -26,6 +28,11 @@
 /// </summary>
 public class FiltersViewModel : ViewModelBase, IFiltersViewModel
 {
+ /// <summary>
+ /// The is deinterlace mode.
+ /// </summary>
+ private bool isDeinterlaceMode;
+
 #region Constructors and Destructors
 
 /// <summary>
@@ -41,6 +48,7 @@
 {
 this.CurrentTask = new EncodeTask();
 this.DeblockValue = 4; // OFF
+ this.IsDeinterlaceMode = true;
 }
 
 #endregion
@@ -138,7 +146,7 @@
 {
 get
 {
- return this.DeblockValue == 4 ? "Off" : this.DeblockValue.ToString();
+ return this.DeblockValue == 4 ? "Off" : this.DeblockValue.ToString(CultureInfo.InvariantCulture);
 }
 }
 
@@ -233,6 +241,11 @@
 // Show / Hide the Custom Control
 this.ShowDeinterlaceCustom = this.CurrentTask.Deinterlace == Deinterlace.Custom;
 this.NotifyOfPropertyChange(() => this.ShowDeinterlaceCustom);
+
+ if (value != Deinterlace.Off)
+ {
+ this.IsDeinterlaceMode = true;
+ }
 }
 }
 
@@ -259,6 +272,11 @@
 // Show / Hide the Custom Control
 this.ShowDecombCustom = this.CurrentTask.Decomb == Decomb.Custom;
 this.NotifyOfPropertyChange(() => this.ShowDecombCustom);
+
+ if (value != Decomb.Off)
+ {
+ this.IsDeinterlaceMode = false;
+ }
 }
 }
 
@@ -278,8 +296,13 @@
 this.NotifyOfPropertyChange(() => this.SelectedDenoise);
 
 // Show / Hide the Custom Control
- this.ShowDenoiseCustom = this.CurrentTask.Denoise == Denoise.Custom;
+ this.ShowDenoiseCustom = this.CurrentTask.Denoise == Denoise.hqdn3d && this.CurrentTask.DenoisePreset == DenoisePreset.Custom;
 this.NotifyOfPropertyChange(() => this.ShowDenoiseCustom);
+
+ this.SelectedDenoisePreset = this.CurrentTask.Denoise == Denoise.hqdn3d ? DenoisePreset.Weak : DenoisePreset.Ultralight; // Default so we don't have an invalid preset.
+
+ this.NotifyOfPropertyChange(() => this.ShowDenoiseOptions);
+ this.NotifyOfPropertyChange(() => this.ShowDenoiseTune);
 }
 }
 
@@ -324,6 +347,127 @@
 /// </summary>
 public bool ShowDetelecineCustom { get; set; }
 
+ /// <summary>
+ /// Gets or sets a value indicating whether is deinterlace mode.
+ /// </summary>
+ public bool IsDeinterlaceMode
+ {
+ get
+ {
+ return this.isDeinterlaceMode;
+ }
+ set
+ {
+ if (!object.Equals(this.isDeinterlaceMode, value))
+ {
+ this.isDeinterlaceMode = value;
+ this.NotifyOfPropertyChange(() => this.IsDeinterlaceMode);
+
+ this.DeinterlaceControlText = value ? "Deinterlace:" : "Decomb:";
+
+ if (value)
+ {
+ this.SelectedDecomb = Decomb.Off;
+ }
+ else
+ {
+ this.SelectedDeInterlace = Deinterlace.Off;
+ }
+
+ this.NotifyOfPropertyChange(() => this.DeinterlaceControlText);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the deinterlace control text.
+ /// </summary>
+ public string DeinterlaceControlText { get; set; }
+
+ /// <summary>
+ /// Gets or sets the selected denoise tune.
+ /// </summary>
+ public DenoiseTune SelectedDenoiseTune
+ {
+ get
+ {
+ return this.CurrentTask.DenoiseTune;
+ }
+
+ set
+ {
+ this.CurrentTask.DenoiseTune = value;
+ this.NotifyOfPropertyChange(() => this.SelectedDenoiseTune);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the selected denoise preset.
+ /// </summary>
+ public DenoisePreset SelectedDenoisePreset
+ {
+ get
+ {
+ return this.CurrentTask.DenoisePreset;
+ }
+
+ set
+ {
+ this.CurrentTask.DenoisePreset = value;
+ this.NotifyOfPropertyChange(() => this.SelectedDenoisePreset);
+
+ // Show / Hide the Custom Control
+ this.ShowDenoiseCustom = this.CurrentTask.Denoise == Denoise.hqdn3d && this.CurrentTask.DenoisePreset == DenoisePreset.Custom;
+ this.NotifyOfPropertyChange(() => this.ShowDenoiseCustom);
+ this.NotifyOfPropertyChange(() => this.ShowDenoiseOptions);
+ this.NotifyOfPropertyChange(() => this.ShowDenoiseTune);
+ }
+ }
+
+ /// <summary>
+ /// Gets the denoise presets.
+ /// </summary>
+ public IEnumerable<DenoisePreset> DenoisePresets
+ {
+ get
+ {
+ return EnumHelper<DenoisePreset>.GetEnumList();
+ }
+ }
+
+ /// <summary>
+ /// Gets the denoise tunes.
+ /// </summary>
+ public IEnumerable<DenoiseTune> DenoiseTunes
+ {
+ get
+ {
+ return EnumHelper<DenoiseTune>.GetEnumList();
+ }
+ }
+
+ /// <summary>
+ /// Gets a value indicating whether show denoise options.
+ /// </summary>
+ public bool ShowDenoiseOptions
+ {
+ get
+ {
+ return this.SelectedDenoise != Denoise.Off;
+ }
+ }
+
+ /// <summary>
+ /// Gets a value indicating whether show denoise tune.
+ /// </summary>
+ public bool ShowDenoiseTune
+ {
+ get
+ {
+ return this.SelectedDenoise == Denoise.NLMeans;
+ }
+ }
+
 #endregion
 
 #region Implemented Interfaces
@@ -352,6 +496,8 @@
 this.SelectedDetelecine = preset.Task.Detelecine;
 this.Grayscale = preset.Task.Grayscale;
 this.DeblockValue = preset.Task.Deblock == 0 ? 4 : preset.Task.Deblock;
+ this.SelectedDenoisePreset = preset.Task.DenoisePreset;
+ this.SelectedDenoiseTune = preset.Task.DenoiseTune;
 
 // Custom Values
 this.CustomDecomb = preset.Task.CustomDecomb;

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs Added

@@ -0,0 +1,1015 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="InstantViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The instant view model.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels
+{
+ using System;
+ using System.Collections.Generic;
+ using System.ComponentModel;
+ using System.Diagnostics;
+ using System.Globalization;
+ using System.IO;
+ using System.Linq;
+ using System.Threading;
+ using System.Windows;
+
+ using Caliburn.Micro;
+
+ using HandBrake.ApplicationServices;
+ using HandBrake.ApplicationServices.EventArgs;
+ using HandBrake.ApplicationServices.Model;
+ using HandBrake.ApplicationServices.Parsing;
+ using HandBrake.ApplicationServices.Services.Interfaces;
+ using HandBrake.ApplicationServices.Utilities;
+
+ using HandBrakeWPF.Commands;
+ using HandBrakeWPF.Factories;
+ using HandBrakeWPF.Helpers;
+ using HandBrakeWPF.Model;
+ using HandBrakeWPF.Services.Interfaces;
+ using HandBrakeWPF.ViewModels.Interfaces;
+ using HandBrakeWPF.Views;
+
+ using Microsoft.Win32;
+
+ using Ookii.Dialogs.Wpf;
+
+ /// <summary>
+ /// The instant view model.
+ /// </summary>
+ public class InstantViewModel : ViewModelBase, IInstantViewModel
+ {
+ #region Constants and Fields
+
+ /// <summary>
+ /// The encode service.
+ /// </summary>
+ private readonly IEncodeServiceWrapper encodeService;
+
+ /// <summary>
+ /// The error service.
+ /// </summary>
+ private readonly IErrorService errorService;
+
+ /// <summary>
+ /// The preset service.
+ /// </summary>
+ private readonly IPresetService presetService;
+
+ /// <summary>
+ /// The queue processor.
+ /// </summary>
+ private readonly IQueueProcessor queueProcessor;
+
+ /// <summary>
+ /// The scan service.
+ /// </summary>
+ private readonly IScan scanService;
+
+ /// <summary>
+ /// The shell view model.
+ /// </summary>
+ private readonly IShellViewModel shellViewModel;
+
+ /// <summary>
+ /// The update service.
+ /// </summary>
+ private readonly IUpdateService updateService;
+
+ /// <summary>
+ /// The user setting service.
+ /// </summary>
+ private readonly IUserSettingService userSettingService;
+
+ /// <summary>
+ /// Windows 7 API Pack wrapper
+ /// </summary>
+ private readonly Win7 windowsSeven = new Win7();
+
+ /// <summary>
+ /// The is encoding.
+ /// </summary>
+ private bool isEncoding;
+
+ /// <summary>
+ /// The last percentage complete value.
+ /// </summary>
+ private int lastEncodePercentage;
+
+ /// <summary>
+ /// The ordered by duration.
+ /// </summary>
+ private bool orderedByDuration;
+
+ /// <summary>
+ /// The ordered by title.
+ /// </summary>
+ private bool orderedByTitle;
+
+ /// <summary>
+ /// The output directory.
+ /// </summary>
+ private string outputDirectory;
+
+ /// <summary>
+ /// The program status label.
+ /// </summary>
+ private string programStatusLabel;
+
+ /// <summary>
+ /// The scanned source.
+ /// </summary>
+ private Source scannedSource;
+
+ /// <summary>
+ /// The selected preset.
+ /// </summary>
+ private Preset selectedPreset;
+
+ /// <summary>
+ /// The show status window.
+ /// </summary>
+ private bool showStatusWindow;
+
+ /// <summary>
+ /// The source label.
+ /// </summary>
+ private string sourceLabel;
+
+ /// <summary>
+ /// The status label.
+ /// </summary>
+ private string statusLabel;
+
+ #endregion
+
+ #region Constructors and Destructors
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="InstantViewModel"/> class.
+ /// </summary>
+ /// <param name="userSettingService">
+ /// The user setting service.
+ /// </param>
+ /// <param name="scanService">
+ /// The scan service.
+ /// </param>
+ /// <param name="encodeService">
+ /// The encode service.
+ /// </param>
+ /// <param name="presetService">
+ /// The preset service.
+ /// </param>
+ /// <param name="errorService">
+ /// The error service.
+ /// </param>
+ /// <param name="shellViewModel">
+ /// The shell view model.
+ /// </param>
+ /// <param name="updateService">
+ /// The update service.
+ /// </param>
+ /// <param name="notificationService">
+ /// The notification service.
+ /// </param>
+ /// <param name="whenDoneService">
+ /// The when done service.
+ /// </param>
+ public InstantViewModel(
+ IUserSettingService userSettingService,
+ IScan scanService, 
+ IEncodeServiceWrapper encodeService, 
+ IPresetService presetService, 
+ IErrorService errorService, 
+ IShellViewModel shellViewModel, 
+ IUpdateService updateService, 
+ INotificationService notificationService, 
+ IPrePostActionService whenDoneService)
+ {
+ this.userSettingService = userSettingService;
+ this.scanService = scanService;
+ this.encodeService = encodeService;
+ this.presetService = presetService;
+ this.errorService = errorService;
+ this.shellViewModel = shellViewModel;
+ this.updateService = updateService;
+
+ this.queueProcessor = IoC.Get<IQueueProcessor>();
+
+ // Setup Properties
+ this.TitleList = new BindingList<SelectionTitle>();
+ this.ScannedSource = new Source();
+
+ // Setup Events
+ this.scanService.ScanStared += this.ScanStared;
+ this.scanService.ScanCompleted += this.ScanCompleted;
+ this.scanService.ScanStatusChanged += this.ScanStatusChanged;
+ this.queueProcessor.JobProcessingStarted += this.QueueProcessorJobProcessingStarted;
+ this.queueProcessor.QueueCompleted += this.QueueCompleted;
+ this.queueProcessor.QueueChanged += this.QueueChanged;
+ this.queueProcessor.EncodeService.EncodeStatusChanged += this.EncodeStatusChanged;
+
+ this.Presets = this.presetService.Presets;
+ this.CancelScanCommand = new CancelScanCommand(this.scanService);
+ }
+
+ #endregion
+
+ #region Properties
+
+ /// <summary>
+ /// Gets or sets the cancel scan command.
+ /// </summary>
+ public CancelScanCommand CancelScanCommand { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether IsEncoding.
+ /// </summary>
+ public bool IsEncoding
+ {
+ get
+ {
+ return this.isEncoding;
+ }
+
+ set
+ {
+ this.isEncoding = value;
+ this.NotifyOfPropertyChange(() => this.IsEncoding);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether ordered by duration.
+ /// </summary>
+ public bool OrderedByDuration
+ {
+ get
+ {
+ return this.orderedByDuration;
+ }
+
+ set
+ {
+ this.orderedByDuration = value;
+ this.NotifyOfPropertyChange(() => this.OrderedByDuration);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether ordered by title.
+ /// </summary>
+ public bool OrderedByTitle
+ {
+ get
+ {
+ return this.orderedByTitle;
+ }
+
+ set
+ {
+ this.orderedByTitle = value;
+ this.NotifyOfPropertyChange(() => this.OrderedByTitle);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the output directory.
+ /// </summary>
+ public string OutputDirectory
+ {
+ get
+ {
+ return this.outputDirectory;
+ }
+ set
+ {
+ this.outputDirectory = value;
+ this.NotifyOfPropertyChange(() => this.OutputDirectory);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets Presets.
+ /// </summary>
+ public IEnumerable<Preset> Presets { get; set; }
+
+ /// <summary>
+ /// Gets or sets the Program Status Toolbar Label
+ /// This indicates the status of HandBrake
+ /// </summary>
+ public string ProgramStatusLabel
+ {
+ get
+ {
+ return string.IsNullOrEmpty(this.programStatusLabel) ? "Ready" : this.programStatusLabel;
+ }
+
+ set
+ {
+ if (!Equals(this.programStatusLabel, value))
+ {
+ this.programStatusLabel = value;
+ this.NotifyOfPropertyChange(() => this.ProgramStatusLabel);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets a value indicating progress percentage.
+ /// </summary>
+ public int ProgressPercentage { get; set; }
+
+ /// <summary>
+ /// Gets or sets the Last Scanned Source
+ /// This object contains information about the scanned source.
+ /// </summary>
+ public Source ScannedSource
+ {
+ get
+ {
+ return this.scannedSource;
+ }
+
+ set
+ {
+ this.scannedSource = value;
+
+ this.NotifyOfPropertyChange("ScannedSource");
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets SelectedPreset.
+ /// </summary>
+ public Preset SelectedPreset
+ {
+ get
+ {
+ return this.selectedPreset;
+ }
+ set
+ {
+ this.selectedPreset = value;
+ this.NotifyOfPropertyChange(() => this.SelectedPreset);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether ShowStatusWindow.
+ /// </summary>
+ public bool ShowStatusWindow
+ {
+ get
+ {
+ return this.showStatusWindow;
+ }
+
+ set
+ {
+ this.showStatusWindow = value;
+ this.NotifyOfPropertyChange(() => this.ShowStatusWindow);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the Source Label
+ /// This indicates the status of scans.
+ /// </summary>
+ public string SourceLabel
+ {
+ get
+ {
+ return string.IsNullOrEmpty(this.sourceLabel) ? "Select 'Source' to continue" : this.sourceLabel;
+ }
+
+ set
+ {
+ if (!Equals(this.sourceLabel, value))
+ {
+ this.sourceLabel = value;
+ this.NotifyOfPropertyChange("SourceLabel");
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets SourceName.
+ /// </summary>
+ public string SourceName
+ {
+ get
+ {
+ // Sanity Check
+ if (this.ScannedSource == null || this.ScannedSource.ScanPath == null)
+ {
+ return string.Empty;
+ }
+
+ // The title that is selected has a source name. This means it's part of a batch scan.
+ // if (selectedTitle != null && !string.IsNullOrEmpty(selectedTitle.SourceName))
+ // {
+ // return Path.GetFileNameWithoutExtension(selectedTitle.SourceName);
+ // }
+
+ // Check if we have a Folder, if so, check if it's a DVD / Bluray drive and get the label.
+ if (this.ScannedSource.ScanPath.EndsWith("\\"))
+ {
+ foreach (DriveInformation item in GeneralUtilities.GetDrives())
+ {
+ if (item.RootDirectory.Contains(this.ScannedSource.ScanPath))
+ {
+ return item.VolumeLabel;
+ }
+ }
+ }
+
+ if (Path.GetFileNameWithoutExtension(this.ScannedSource.ScanPath) != "VIDEO_TS")
+ {
+ return Path.GetFileNameWithoutExtension(this.ScannedSource.ScanPath);
+ }
+
+ return Path.GetFileNameWithoutExtension(Path.GetDirectoryName(this.ScannedSource.ScanPath));
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the Program Status Toolbar Label
+ /// This indicates the status of HandBrake
+ /// </summary>
+ public string StatusLabel
+ {
+ get
+ {
+ return string.IsNullOrEmpty(this.statusLabel) ? "Ready" : this.statusLabel;
+ }
+
+ set
+ {
+ if (!Equals(this.statusLabel, value))
+ {
+ this.statusLabel = value;
+ this.NotifyOfPropertyChange(() => this.StatusLabel);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the selected titles.
+ /// </summary>
+ public BindingList<SelectionTitle> TitleList { get; set; }
+
+ #endregion
+
+ #region Public Methods
+
+ /// <summary>
+ /// The Destination Path
+ /// </summary>
+ public void BrowseDestination()
+ {
+ var saveFileDialog = new SaveFileDialog
+ {
+ Filter = "mp4|*.mp4;*.m4v|mkv|*.mkv", 
+ CheckPathExists = true, 
+ AddExtension = true, 
+ DefaultExt = ".mp4", 
+ OverwritePrompt = true, 
+ };
+
+ saveFileDialog.ShowDialog();
+ this.OutputDirectory = Path.GetDirectoryName(saveFileDialog.FileName);
+ }
+
+ /// <summary>
+ /// Cancel a Scan
+ /// </summary>
+ public void CancelScan()
+ {
+ this.scanService.Stop();
+ }
+
+ /// <summary>
+ /// File Scan
+ /// </summary>
+ public void FileScan()
+ {
+ var dialog = new VistaOpenFileDialog { Filter = "All files (*.*)|*.*" };
+ dialog.ShowDialog();
+ this.StartScan(dialog.FileName, 0);
+ }
+
+ /// <summary>
+ /// Support dropping a file onto the main window to scan.
+ /// </summary>
+ /// <param name="e">
+ /// The DragEventArgs.
+ /// </param>
+ public void FilesDroppedOnWindow(DragEventArgs e)
+ {
+ if (e.Data.GetDataPresent(DataFormats.FileDrop))
+ {
+ var fileNames = e.Data.GetData(DataFormats.FileDrop, true) as string[];
+ if (fileNames != null && fileNames.Any() &&
+ (File.Exists(fileNames[0]) || Directory.Exists(fileNames[0])))
+ {
+ this.StartScan(fileNames[0], 0);
+ }
+ }
+
+ e.Handled = true;
+ }
+
+ /// <summary>
+ /// Folder Scan
+ /// </summary>
+ public void FolderScan()
+ {
+ var dialog = new VistaFolderBrowserDialog
+ {
+ Description = "Please select a folder.", 
+ UseDescriptionForTitle = true
+ };
+ dialog.ShowDialog();
+ this.StartScan(dialog.SelectedPath, 0);
+ }
+
+ /// <summary>
+ /// Launch the Help pages.
+ /// </summary>
+ public void LaunchHelp()
+ {
+ Process.Start("https://trac.handbrake.fr/wiki/HandBrakeGuide");
+ }
+
+ /// <summary>
+ /// The on load.
+ /// </summary>
+ public override void OnLoad()
+ {
+ // Check the CLI Executable.
+ CliCheckHelper.CheckCLIVersion();
+
+ // Perform an update check if required
+ // this.updateService.PerformStartupUpdateCheck(this.HandleUpdateCheckResults);
+
+ // Setup the presets.
+ this.presetService.Load();
+ if (this.presetService.CheckIfPresetsAreOutOfDate())
+ {
+ if (!this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PresetNotification))
+ {
+ this.errorService.ShowMessageBox(
+ "HandBrake has determined your built-in presets are out of date... These presets will now be updated." +
+ Environment.NewLine +
+ "Your custom presets have not been updated so you may have to re-create these by deleting and re-adding them.",
+ "Preset Update",
+ MessageBoxButton.OK,
+ MessageBoxImage.Information);
+ }
+ }
+
+ this.SelectedPreset = this.presetService.DefaultPreset;
+
+ // Log Cleaning
+ if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearOldLogs))
+ {
+ var clearLog = new Thread(() => GeneralUtilities.ClearLogFiles(30));
+ clearLog.Start();
+ }
+ base.OnLoad();
+ }
+
+ /// <summary>
+ /// Open the About Window
+ /// </summary>
+ public void OpenAboutApplication()
+ {
+ var command = new OpenOptionsScreenCommand();
+ command.Execute(OptionsTab.About);
+ }
+
+ /// <summary>
+ /// Open the Log Window
+ /// </summary>
+ public void OpenLogWindow()
+ {
+ Window window =
+ Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(LogView));
+
+ if (window != null)
+ {
+ var logvm = (ILogViewModel)window.DataContext;
+ logvm.SelectedTab = this.IsEncoding ? 0 : 1;
+ window.Activate();
+ }
+ else
+ {
+ var logvm = IoC.Get<ILogViewModel>();
+ logvm.SelectedTab = this.IsEncoding ? 0 : 1;
+ this.WindowManager.ShowWindow(logvm);
+ }
+ }
+
+ /// <summary>
+ /// Open the Options Window
+ /// </summary>
+ public void OpenOptionsWindow()
+ {
+ this.shellViewModel.DisplayWindow(ShellWindow.OptionsWindow);
+ }
+
+ /// <summary>
+ /// The order by duration.
+ /// </summary>
+ public void OrderByDuration()
+ {
+ this.TitleList =
+ new BindingList<SelectionTitle>(this.TitleList.OrderByDescending(o => o.Title.Duration).ToList());
+ this.NotifyOfPropertyChange(() => this.TitleList);
+ this.OrderedByTitle = false;
+ this.OrderedByDuration = true;
+ }
+
+ /// <summary>
+ /// The order by title.
+ /// </summary>
+ public void OrderByTitle()
+ {
+ this.TitleList = new BindingList<SelectionTitle>(this.TitleList.OrderBy(o => o.Title.TitleNumber).ToList());
+ this.NotifyOfPropertyChange(() => this.TitleList);
+ this.OrderedByTitle = true;
+ this.OrderedByDuration = false;
+ }
+
+ /// <summary>
+ /// Pause an Encode
+ /// </summary>
+ public void PauseEncode()
+ {
+ this.queueProcessor.Pause();
+ }
+
+ /// <summary>
+ /// The select all.
+ /// </summary>
+ public void SelectAll()
+ {
+ foreach (SelectionTitle item in this.TitleList)
+ {
+ item.IsSelected = true;
+ }
+ }
+
+ /// <summary>
+ /// The setup.
+ /// </summary>
+ /// <param name="scannedSource">
+ /// The scanned source.
+ /// </param>
+ public void Setup(Source scannedSource)
+ {
+ this.TitleList.Clear();
+
+ if (scannedSource != null)
+ {
+ IEnumerable<Title> titles = this.orderedByTitle
+ ? scannedSource.Titles
+ : scannedSource.Titles.OrderByDescending(o => o.Duration).ToList();
+
+ foreach (Title item in titles)
+ {
+ var title = new SelectionTitle(item, item.SourceName) { IsSelected = true };
+ this.TitleList.Add(title);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Shutdown this View
+ /// </summary>
+ public void Shutdown()
+ {
+ // Shutdown Service
+ this.encodeService.Shutdown();
+
+ // Unsubscribe from Events.
+ this.scanService.ScanStared -= this.ScanStared;
+ this.scanService.ScanCompleted -= this.ScanCompleted;
+ this.scanService.ScanStatusChanged -= this.ScanStatusChanged;
+
+ this.queueProcessor.QueueCompleted -= this.QueueCompleted;
+ this.queueProcessor.QueueChanged -= this.QueueChanged;
+ this.queueProcessor.JobProcessingStarted -= this.QueueProcessorJobProcessingStarted;
+ this.queueProcessor.EncodeService.EncodeStatusChanged -= this.EncodeStatusChanged;
+ }
+
+ /// <summary>
+ /// Start an Encode
+ /// </summary>
+ public void StartEncode()
+ {
+ // if (this.queueProcessor.IsProcessing)
+ // {
+ // this.errorService.ShowMessageBox("HandBrake is already encoding.", Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ // return;
+ // }
+
+ //// Check if we already have jobs, and if we do, just start the queue.
+ // if (this.queueProcessor.Count != 0)
+ // {
+ // this.queueProcessor.Start();
+ // return;
+ // }
+
+ //// Otherwise, perform Santiy Checking then add to the queue and start if everything is ok.
+ // if (this.SelectedTitle == null)
+ // {
+ // this.errorService.ShowMessageBox("You must first scan a source.", Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ // return;
+ // }
+
+ // if (string.IsNullOrEmpty(this.Destination))
+ // {
+ // this.errorService.ShowMessageBox("The Destination field was empty.", Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ // return;
+ // }
+
+ // if (File.Exists(this.Destination))
+ // {
+ // MessageBoxResult result = this.errorService.ShowMessageBox("The current file already exists, do you wish to overwrite it?", "Question", MessageBoxButton.YesNo, MessageBoxImage.Question);
+ // if (result == MessageBoxResult.No)
+ // {
+ // return;
+ // }
+ // }
+
+ //// Create the Queue Task and Start Processing
+ // QueueTask task = new QueueTask
+ // {
+ // Task = new EncodeTask(this.CurrentTask),
+ // CustomQuery = false
+ // };
+ // this.queueProcessor.Add(task);
+ // this.queueProcessor.Start();
+ // this.IsEncoding = true;
+ }
+
+ /// <summary>
+ /// Start a Scan
+ /// </summary>
+ /// <param name="filename">
+ /// The filename.
+ /// </param>
+ /// <param name="title">
+ /// The title.
+ /// </param>
+ public void StartScan(string filename, int title)
+ {
+ if (!string.IsNullOrEmpty(filename))
+ {
+ this.scanService.Scan(
+ filename, 
+ title, 
+ null,
+ HBConfigurationFactory.Create());
+ }
+ }
+
+ /// <summary>
+ /// Stop an Encode.
+ /// </summary>
+ public void StopEncode()
+ {
+ this.queueProcessor.Pause();
+ this.encodeService.Stop();
+ }
+
+ /// <summary>
+ /// The select all.
+ /// </summary>
+ public void UnSelectAll()
+ {
+ foreach (SelectionTitle item in this.TitleList)
+ {
+ item.IsSelected = false;
+ }
+ }
+
+ #endregion
+
+ #region Methods
+
+ /// <summary>
+ /// The Encode Status has changed Handler
+ /// </summary>
+ /// <param name="sender">
+ /// The Sender
+ /// </param>
+ /// <param name="e">
+ /// The Encode Progress Event Args
+ /// </param>
+ private void EncodeStatusChanged(object sender, EncodeProgressEventArgs e)
+ {
+ int percent;
+ int.TryParse(Math.Round(e.PercentComplete).ToString(CultureInfo.InvariantCulture), out percent);
+
+ Execute.OnUIThread(
+ () =>
+ {
+ if (this.queueProcessor.EncodeService.IsEncoding)
+ {
+ string josPending = string.Empty;
+ if (!AppArguments.IsInstantHandBrake)
+ {
+ josPending = ", Pending Jobs {5}";
+ }
+
+ this.ProgramStatusLabel =
+ string.Format(
+ "{0:00.00}%, FPS: {1:000.0}, Avg FPS: {2:000.0}, Time Remaining: {3}, Elapsed: {4:hh\\:mm\\:ss}" +
+ josPending, 
+ e.PercentComplete, 
+ e.CurrentFrameRate, 
+ e.AverageFrameRate, 
+ e.EstimatedTimeLeft, 
+ e.ElapsedTime, 
+ this.queueProcessor.Count);
+
+ if (this.lastEncodePercentage != percent && this.windowsSeven.IsWindowsSeven)
+ {
+ this.windowsSeven.SetTaskBarProgress(percent);
+ }
+
+ this.lastEncodePercentage = percent;
+ this.ProgressPercentage = percent;
+ this.NotifyOfPropertyChange(() => this.ProgressPercentage);
+ }
+ else
+ {
+ this.ProgramStatusLabel = "Queue Finished";
+ this.IsEncoding = false;
+
+ if (this.windowsSeven.IsWindowsSeven)
+ {
+ this.windowsSeven.SetTaskBarProgressToNoProgress();
+ }
+ }
+ });
+ }
+
+ /// <summary>
+ /// The queue changed.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The EventArgs.
+ /// </param>
+ private void QueueChanged(object sender, EventArgs e)
+ {
+ Execute.OnUIThread(
+ () => { this.ProgramStatusLabel = string.Format("{0} Encodes Pending", this.queueProcessor.Count); });
+ }
+
+ /// <summary>
+ /// The Queue has completed handler
+ /// </summary>
+ /// <param name="sender">
+ /// The Sender
+ /// </param>
+ /// <param name="e">
+ /// The EventArgs
+ /// </param>
+ private void QueueCompleted(object sender, EventArgs e)
+ {
+ this.IsEncoding = false;
+
+ Execute.OnUIThread(
+ () =>
+ {
+ this.ProgramStatusLabel = "Queue Finished";
+ this.IsEncoding = false;
+
+ if (this.windowsSeven.IsWindowsSeven)
+ {
+ this.windowsSeven.SetTaskBarProgressToNoProgress();
+ }
+ });
+ }
+
+ /// <summary>
+ /// Handle the Queue Starting Event
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
+ private void QueueProcessorJobProcessingStarted(object sender, QueueProgressEventArgs e)
+ {
+ Execute.OnUIThread(
+ () =>
+ {
+ this.ProgramStatusLabel = "Preparing to encode ...";
+ this.IsEncoding = true;
+ });
+ }
+
+ /// <summary>
+ /// Handle the Scan Completed Event
+ /// </summary>
+ /// <param name="sender">
+ /// The Sender
+ /// </param>
+ /// <param name="e">
+ /// The EventArgs
+ /// </param>
+ private void ScanCompleted(object sender, ScanCompletedEventArgs e)
+ {
+ this.scanService.SouceData.CopyTo(this.ScannedSource);
+ this.NotifyOfPropertyChange(() => this.ScannedSource);
+
+ Execute.OnUIThread(
+ () =>
+ {
+ if (this.scannedSource != null)
+ {
+ this.Setup(this.scannedSource);
+ }
+
+ if (e.Successful)
+ {
+ this.NotifyOfPropertyChange(() => this.ScannedSource);
+ this.NotifyOfPropertyChange(() => this.ScannedSource.Titles);
+ }
+
+ this.ShowStatusWindow = false;
+ if (e.Successful)
+ {
+ this.SourceLabel = this.SourceName;
+ this.StatusLabel = "Scan Completed";
+ }
+ else if (e.Cancelled)
+ {
+ this.SourceLabel = "Scan Cancelled.";
+ this.StatusLabel = "Scan Cancelled.";
+ }
+ else if (e.Exception == null && e.ErrorInformation != null)
+ {
+ this.SourceLabel = "Scan failed: " + e.ErrorInformation;
+ this.StatusLabel = "Scan failed: " + e.ErrorInformation;
+ }
+ else
+ {
+ this.SourceLabel = "Scan Failed... See Activity Log for details.";
+ this.StatusLabel = "Scan Failed... See Activity Log for details.";
+ }
+ });
+ }
+
+ /// <summary>
+ /// Handle the Scan Started Event
+ /// </summary>
+ /// <param name="sender">
+ /// The Sender
+ /// </param>
+ /// <param name="e">
+ /// The EventArgs
+ /// </param>
+ private void ScanStared(object sender, EventArgs e)
+ {
+ Execute.OnUIThread(
+ () =>
+ {
+ this.StatusLabel = "Scanning source, please wait...";
+ this.ShowStatusWindow = true;
+ });
+ }
+
+ /// <summary>
+ /// Handle the Scan Status Changed Event.
+ /// </summary>
+ /// <param name="sender">
+ /// The Sender
+ /// </param>
+ /// <param name="e">
+ /// The EventArgs
+ /// </param>
+ private void ScanStatusChanged(object sender, ScanProgressEventArgs e)
+ {
+ this.SourceLabel = string.Format("Scanning Title {0} of {1} ({2}%)", e.CurrentTitle, e.Titles, e.Percentage);
+ this.StatusLabel = string.Format("Scanning Title {0} of {1} ({2}%)", e.CurrentTitle, e.Titles, e.Percentage);
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs Changed

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/ICountdownAlertViewModel.cs Added

@@ -0,0 +1,30 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ICountdownAlertViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The Countdown Alert View Model Interface
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels.Interfaces
+{
+ /// <summary>
+ /// The Countdown Alert View Model Interface
+ /// </summary>
+ public interface ICountdownAlertViewModel
+ {
+ /// <summary>
+ /// Gets a value indicating whether is cancelled.
+ /// </summary>
+ bool IsCancelled { get; }
+
+ /// <summary>
+ /// The set action.
+ /// </summary>
+ /// <param name="action">
+ /// The action.
+ /// </param>
+ void SetAction(string action);
+ }
+}

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IInstantViewModel.cs Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IQueueSelectionViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IQueueSelectionViewModel.cs Changed

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs Added

@@ -0,0 +1,32 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IStaticPreviewViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The Static Preview View Model Interface
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels.Interfaces
+{
+ using HandBrake.ApplicationServices.Model;
+
+ /// <summary>
+ /// The Static Preview View Model Interface
+ /// </summary>
+ public interface IStaticPreviewViewModel
+ {
+ /// <summary>
+ /// The preview frame.
+ /// </summary>
+ /// <param name="task">
+ /// The task.
+ /// </param>
+ void UpdatePreviewFrame(EncodeTask task);
+
+ /// <summary>
+ /// Gets or sets a value indicating whether is open.
+ /// </summary>
+ bool IsOpen { get; set; }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs Changed

@@ -11,27 +11,30 @@
 {
 using System;
 using System.Collections.Generic;
+ using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Windows;
- using System.Windows.Media.Imaging;
 
 using Caliburn.Micro;
 
- using HandBrake.ApplicationServices;
 using HandBrake.ApplicationServices.Factories;
 using HandBrake.ApplicationServices.Model;
+ using HandBrake.ApplicationServices.Model.Audio;
 using HandBrake.ApplicationServices.Model.Encoding;
+ using HandBrake.ApplicationServices.Model.Subtitle;
 using HandBrake.ApplicationServices.Parsing;
 using HandBrake.ApplicationServices.Services.Interfaces;
 using HandBrake.ApplicationServices.Utilities;
 
 using HandBrakeWPF.Commands;
+ using HandBrakeWPF.Factories;
 using HandBrakeWPF.Helpers;
 using HandBrakeWPF.Model;
+ using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.ViewModels.Interfaces;
 using HandBrakeWPF.Views;
@@ -40,8 +43,6 @@
 
 using Ookii.Dialogs.Wpf;
 
- using Image = System.Windows.Controls.Image;
-
 /// <summary>
 /// HandBrakes Main Window
 /// </summary>
@@ -75,11 +76,6 @@
 private readonly IUpdateService updateService;
 
 /// <summary>
- /// The drive detect service.
- /// </summary>
- private readonly IDriveDetectService driveDetectService;
-
- /// <summary>
 /// Backing field for the user setting service.
 /// </summary>
 private readonly IUserSettingService userSettingService;
@@ -87,7 +83,7 @@
 /// <summary>
 /// The Source Scan Service.
 /// </summary>
- private readonly IScanServiceWrapper scanService;
+ private readonly IScan scanService;
 
 /// <summary>
 /// The Encode Service
@@ -165,14 +161,30 @@
 private EncodeTask queueEditTask;
 
 /// <summary>
- /// The Source Menu Backing Field
+ /// The last percentage complete value.
 /// </summary>
- private IEnumerable<SourceMenuItem> sourceMenu;
+ private int lastEncodePercentage;
 
 /// <summary>
- /// The last percentage complete value.
+ /// The is preset panel showing.
 /// </summary>
- private int lastEncodePercentage;
+ private bool isPresetPanelShowing;
+
+ /// <summary>
+ /// The show source selection.
+ /// </summary>
+ private bool showSourceSelection;
+
+ /// <summary>
+ /// The drives.
+ /// </summary>
+ private BindingList<SourceMenuItem> drives;
+
+ /// <summary>
+ /// The can pause.
+ /// </summary>
+ private bool canPause;
+
 #endregion
 
 /// <summary>
@@ -200,15 +212,17 @@
 /// <param name="updateService">
 /// The update Service.
 /// </param>
- /// <param name="driveDetectService">
- /// The drive Detect Service.
- /// </param>
 /// <param name="notificationService">
 /// The notification Service.
- /// *** Leave in Constructor. *** TODO find out why?
+ /// *** Leave in Constructor. *** 
+ /// </param>
+ /// <param name="whenDoneService">
+ /// The when Done Service.
+ /// *** Leave in Constructor. *** 
 /// </param>
- public MainViewModel(IUserSettingService userSettingService, IScanServiceWrapper scanService, IEncodeServiceWrapper encodeService, IPresetService presetService,
- IErrorService errorService, IShellViewModel shellViewModel, IUpdateService updateService, IDriveDetectService driveDetectService, INotificationService notificationService)
+ public MainViewModel(IUserSettingService userSettingService, IScan scanService, IEncodeServiceWrapper encodeService, IPresetService presetService,
+ IErrorService errorService, IShellViewModel shellViewModel, IUpdateService updateService, INotificationService notificationService,
+ IPrePostActionService whenDoneService)
 {
 this.scanService = scanService;
 this.encodeService = encodeService;
@@ -216,12 +230,11 @@
 this.errorService = errorService;
 this.shellViewModel = shellViewModel;
 this.updateService = updateService;
- this.driveDetectService = driveDetectService;
 this.userSettingService = userSettingService;
 this.queueProcessor = IoC.Get<IQueueProcessor>();
 
 // Setup Properties
- this.WindowTitle = "HandBrake";
+ this.WindowTitle = Resources.HandBrake_Title;
 this.CurrentTask = new EncodeTask();
 this.CurrentTask.PropertyChanged += this.CurrentTask_PropertyChanged;
 this.ScannedSource = new Source();
@@ -238,6 +251,7 @@
 
 this.Presets = this.presetService.Presets;
 this.CancelScanCommand = new CancelScanCommand(this.scanService);
+ this.Drives = new BindingList<SourceMenuItem>();
 }
 
 #region View Model Properties
@@ -306,7 +320,7 @@
 {
 get
 {
- return string.IsNullOrEmpty(this.programStatusLabel) ? "Ready" : this.programStatusLabel;
+ return string.IsNullOrEmpty(this.programStatusLabel) ? Resources.State_Ready : this.programStatusLabel;
 }
 
 set
@@ -327,7 +341,7 @@
 {
 get
 {
- return string.IsNullOrEmpty(this.statusLabel) ? "Ready" : this.statusLabel;
+ return string.IsNullOrEmpty(this.statusLabel) ? Resources.State_Ready : this.statusLabel;
 }
 
 set
@@ -341,22 +355,6 @@
 }
 
 /// <summary>
- /// Gets or sets the source menu.
- /// </summary>
- public IEnumerable<SourceMenuItem> SourceMenu
- {
- get
- {
- return this.sourceMenu;
- }
- set
- {
- this.sourceMenu = value;
- this.NotifyOfPropertyChange(() => SourceMenu);
- }
- }
-
- /// <summary>
 /// Gets or sets Presets.
 /// </summary>
 public IEnumerable<Preset> Presets { get; set; }
@@ -377,7 +375,6 @@
 if (this.SelectedPreset != null)
 {
 // Main Window Settings
- this.CurrentTask.LargeFile = selectedPreset.Task.LargeFile;
 this.CurrentTask.OptimizeMP4 = selectedPreset.Task.OptimizeMP4;
 this.CurrentTask.IPod5GSupport = selectedPreset.Task.IPod5GSupport;
 this.SelectedOutputFormat = selectedPreset.Task.OutputFormat;
@@ -418,7 +415,32 @@
 set
 {
 this.scannedSource = value;
- this.NotifyOfPropertyChange("ScannedSource");
+ this.NotifyOfPropertyChange(() => ScannedSource);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the title specific scan.
+ /// </summary>
+ public int TitleSpecificScan { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether the encode serivce supports pausing.
+ /// </summary>
+ public bool CanPause
+ {
+ get
+ {
+ return this.canPause;
+ }
+ set
+ {
+ if (value.Equals(this.canPause))
+ {
+ return;
+ }
+ this.canPause = value;
+ this.NotifyOfPropertyChange(() => this.CanPause);
 }
 }
 
@@ -430,7 +452,7 @@
 {
 get
 {
- return string.IsNullOrEmpty(this.sourceLabel) ? "Select 'Source' to continue" : this.sourceLabel;
+ return string.IsNullOrEmpty(this.sourceLabel) ? Resources.Main_SelectSource : this.sourceLabel;
 }
 
 set
@@ -438,7 +460,7 @@
 if (!Equals(this.sourceLabel, value))
 {
 this.sourceLabel = value;
- this.NotifyOfPropertyChange("SourceLabel");
+ this.NotifyOfPropertyChange(() => SourceLabel);
 }
 }
 }
@@ -457,7 +479,7 @@
 }
 
 // The title that is selected has a source name. This means it's part of a batch scan.
- if (selectedTitle != null && !string.IsNullOrEmpty(selectedTitle.SourceName))
+ if (selectedTitle != null && !string.IsNullOrEmpty(selectedTitle.SourceName) && !selectedTitle.SourceName.EndsWith("\\"))
 {
 return Path.GetFileNameWithoutExtension(selectedTitle.SourceName);
 }
@@ -467,7 +489,7 @@
 {
 foreach (DriveInformation item in GeneralUtilities.GetDrives())
 {
- if (item.RootDirectory.Contains(this.ScannedSource.ScanPath))
+ if (item.RootDirectory.Contains(this.ScannedSource.ScanPath.Replace("\\\\", "\\")))
 {
 return item.VolumeLabel;
 }
@@ -535,7 +557,7 @@
 }
 
 List<int> items = new List<int>();
- for (int i = 1; i <= this.selectedTitle.AngleCount + 1; i++)
+ for (int i = 1; i <= this.selectedTitle.AngleCount; i++)
 {
 items.Add(i);
 }
@@ -555,7 +577,7 @@
 set
 {
 duration = value;
- this.NotifyOfPropertyChange("Duration");
+ this.NotifyOfPropertyChange(() => Duration);
 }
 }
 
@@ -572,6 +594,7 @@
 set
 {
 this.isEncoding = value;
+ this.CanPause = value && this.encodeService.CanPause;
 this.NotifyOfPropertyChange(() => this.IsEncoding);
 }
 }
@@ -618,23 +641,12 @@
 {
 return new List<OutputFormat>
 {
- OutputFormat.Mp4, OutputFormat.Mkv
+ OutputFormat.Mp4, OutputFormat.Mkv
 };
 }
 }
 
 /// <summary>
- /// Gets a value indicating whether show debug menu.
- /// </summary>
- public bool ShowDebugMenu
- {
- get
- {
- return this.userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableDebugFeatures);
- }
- }
-
- /// <summary>
 /// Gets or sets the cancel scan command.
 /// </summary>
 public CancelScanCommand CancelScanCommand { get; set; }
@@ -650,8 +662,37 @@
 }
 set
 {
- this.CurrentTask.Destination = value;
- this.NotifyOfPropertyChange(() => this.Destination);
+ if (!object.Equals(this.CurrentTask.Destination, value))
+ {
+ this.CurrentTask.Destination = value;
+ this.NotifyOfPropertyChange(() => this.Destination);
+
+ if (!string.IsNullOrEmpty(this.CurrentTask.Destination))
+ {
+ string ext = string.Empty;
+ try
+ {
+ ext = Path.GetExtension(this.CurrentTask.Destination);
+ }
+ catch (ArgumentException)
+ {
+ this.errorService.ShowMessageBox(Resources.Main_InvalidDestination, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ }
+
+ switch (ext)
+ {
+ case ".mkv":
+ this.SelectedOutputFormat = OutputFormat.Mkv;
+ break;
+ case ".mp4":
+ this.SelectedOutputFormat = OutputFormat.Mp4;
+ break;
+ case ".m4v":
+ this.SelectedOutputFormat = OutputFormat.Mp4;
+ break;
+ }
+ }
+ }
 }
 }
 
@@ -695,11 +736,14 @@
 
 if (this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNaming))
 {
- this.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SourceName);
+ if (this.userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat) != null)
+ {
+ this.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SourceName);
+ }
 }
 this.NotifyOfPropertyChange(() => this.CurrentTask);
 
- this.Duration = this.selectedTitle.Duration.ToString();
+ this.Duration = this.DurationCalculation();
 
 // Setup the tab controls
 this.SetupTabs();
@@ -746,7 +790,16 @@
 
 if (this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNaming) && this.ScannedSource.ScanPath != null)
 {
- this.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SourceName);
+ if (this.SelectedPointToPoint == PointToPointMode.Chapters && this.userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat) != null &&
+ this.userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat).Contains(Constants.Chapters))
+ {
+ this.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SourceName);
+ }
+ }
+
+ if (this.SelectedStartPoint > this.SelectedEndPoint)
+ {
+ this.SelectedEndPoint = this.SelectedStartPoint;
 }
 }
 }
@@ -766,10 +819,16 @@
 this.NotifyOfPropertyChange(() => this.SelectedEndPoint);
 this.Duration = this.DurationCalculation();
 
- if (this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNaming) && this.ScannedSource.ScanPath != null)
+ if (this.SelectedPointToPoint == PointToPointMode.Chapters && this.userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat) != null &&
+ this.userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat).Contains(Constants.Chapters))
 {
 this.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SourceName);
 }
+
+ if (this.SelectedStartPoint > this.SelectedEndPoint && this.SelectedPointToPoint == PointToPointMode.Chapters)
+ {
+ this.SelectedStartPoint = this.SelectedEndPoint;
+ }
 }
 }
 
@@ -795,10 +854,9 @@
 return;
 }
 
-
 this.SelectedStartPoint = 1;
- this.SelectedEndPoint = selectedTitle.Chapters.Last().ChapterNumber;
- } 
+ this.SelectedEndPoint = selectedTitle.Chapters != null && selectedTitle.Chapters.Count > 0 ? selectedTitle.Chapters.Last().ChapterNumber : 1;
+ }
 else if (value == PointToPointMode.Seconds)
 {
 if (this.selectedTitle == null)
@@ -806,11 +864,10 @@
 return;
 }
 
-
 this.SelectedStartPoint = 0;
 
 int timeInSeconds;
- if (int.TryParse(selectedTitle.Duration.TotalSeconds.ToString(CultureInfo.InvariantCulture), out timeInSeconds))
+ if (int.TryParse(Math.Round(selectedTitle.Duration.TotalSeconds, 0).ToString(CultureInfo.InvariantCulture), out timeInSeconds))
 {
 this.SelectedEndPoint = timeInSeconds;
 }
@@ -830,7 +887,7 @@
 
 this.SelectedStartPoint = 0;
 int totalFrames;
- if (int.TryParse(estimatedTotalFrames.ToString(CultureInfo.InvariantCulture), out totalFrames))
+ if (int.TryParse(Math.Round(estimatedTotalFrames, 0).ToString(CultureInfo.InvariantCulture), out totalFrames))
 {
 this.SelectedEndPoint = totalFrames;
 }
@@ -850,17 +907,21 @@
 {
 return this.selectedOutputFormat;
 }
+
 set
 {
- this.selectedOutputFormat = value;
- this.CurrentTask.OutputFormat = value;
- this.NotifyOfPropertyChange(() => SelectedOutputFormat);
- this.NotifyOfPropertyChange(() => this.CurrentTask.OutputFormat);
- this.NotifyOfPropertyChange(() => IsMkv);
- this.SetExtension(string.Format(".{0}", this.selectedOutputFormat.ToString().ToLower())); // TODO, tidy up
+ if (!object.Equals(this.selectedOutputFormat, value))
+ {
+ this.selectedOutputFormat = value;
+ this.CurrentTask.OutputFormat = value;
+ this.NotifyOfPropertyChange(() => SelectedOutputFormat);
+ this.NotifyOfPropertyChange(() => this.CurrentTask.OutputFormat);
+ this.NotifyOfPropertyChange(() => IsMkv);
+ this.SetExtension(string.Format(".{0}", this.selectedOutputFormat.ToString().ToLower()));
 
- this.VideoViewModel.RefreshTask();
- this.AudioViewModel.RefreshTask();
+ this.VideoViewModel.RefreshTask();
+ this.AudioViewModel.RefreshTask();
+ }
 }
 }
 
@@ -875,6 +936,98 @@
 }
 }
 
+ /// <summary>
+ /// Gets or sets a value indicating whether is preset panel showing.
+ /// </summary>
+ public bool IsPresetPanelShowing
+ {
+ get
+ {
+ return this.isPresetPanelShowing;
+ }
+ set
+ {
+ if (!object.Equals(this.isPresetPanelShowing, value))
+ {
+ this.isPresetPanelShowing = value;
+ this.NotifyOfPropertyChange(() => this.IsPresetPanelShowing);
+
+ // Save the setting if it has changed.
+ if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowPresetPanel) != value)
+ {
+ this.userSettingService.SetUserSetting(UserSettingConstants.ShowPresetPanel, value);
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets a value indicating progress percentage.
+ /// </summary>
+ public int ProgressPercentage { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether show source selection.
+ /// </summary>
+ public bool ShowSourceSelection
+ {
+ get
+ {
+ return this.showSourceSelection;
+ }
+ set
+ {
+ if (value.Equals(this.showSourceSelection))
+ {
+ return;
+ }
+ this.showSourceSelection = value;
+ this.NotifyOfPropertyChange(() => this.ShowSourceSelection);
+
+ // Refresh the drives.
+ if (this.showSourceSelection)
+ {
+ this.Drives.Clear();
+ foreach (SourceMenuItem menuItem in from item in GeneralUtilities.GetDrives()
+ let driveInformation = item
+ select new SourceMenuItem
+ {
+ Text = string.Format("{0} ({1})", item.RootDirectory, item.VolumeLabel),
+ Command = new SourceMenuCommand(() => this.ProcessDrive(driveInformation)),
+ Tag = item,
+ IsDrive = true
+ })
+ {
+ this.Drives.Add(menuItem);
+ }
+
+ this.TitleSpecificScan = 0;
+ this.NotifyOfPropertyChange(() => this.TitleSpecificScan);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the drives.
+ /// </summary>
+ public BindingList<SourceMenuItem> Drives
+ {
+ get
+ {
+ return this.drives;
+ }
+ set
+ {
+ if (Equals(value, this.drives))
+ {
+ return;
+ }
+
+ this.drives = value;
+ this.NotifyOfPropertyChange(() => this.Drives);
+ }
+ }
+
 #endregion
 
 #region Load and Shutdown Handling
@@ -889,22 +1042,24 @@
 // Perform an update check if required
 this.updateService.PerformStartupUpdateCheck(this.HandleUpdateCheckResults);
 
+ // Show or Hide the Preset Panel.
+ this.IsPresetPanelShowing = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowPresetPanel);
+
 // Setup the presets.
+ this.presetService.Load();
 if (this.presetService.CheckIfPresetsAreOutOfDate())
 if (!this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PresetNotification))
- this.errorService.ShowMessageBox("HandBrake has determined your built-in presets are out of date... These presets will now be updated.",
- "Preset Update", MessageBoxButton.OK, MessageBoxImage.Information);
+ this.errorService.ShowMessageBox(Resources.Main_PresetUpdateNotification,
+ Resources.Notice, MessageBoxButton.OK, MessageBoxImage.Information);
 
 // Queue Recovery
- QueueRecoveryHelper.RecoverQueue(this.queueProcessor, this.errorService);
+ if (!AppArguments.IsInstantHandBrake)
+ {
+ QueueRecoveryHelper.RecoverQueue(this.queueProcessor, this.errorService);
+ }
 
 this.SelectedPreset = this.presetService.DefaultPreset;
 
- // Populate the Source menu with drives.
- this.SourceMenu = this.GenerateSourceMenu();
-
- this.driveDetectService.StartDetection(this.DriveTrayChanged);
-
 // Log Cleaning
 if (userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearOldLogs))
 {
@@ -919,9 +1074,6 @@
 public void Shutdown()
 {
 // Shutdown Service
- this.driveDetectService.Close();
-
- this.scanService.Shutdown();
 this.encodeService.Shutdown();
 
 // Unsubscribe from Events.
@@ -1020,7 +1172,14 @@
 /// </summary>
 public void LaunchHelp()
 {
- Process.Start("https://trac.handbrake.fr/wiki/HandBrakeGuide");
+ try
+ {
+ Process.Start("https://trac.handbrake.fr/wiki/HandBrakeGuide");
+ }
+ catch (Exception exc)
+ {
+ this.errorService.ShowError(Resources.Main_UnableToLoadHelpMessage, Resources.Main_UnableToLoadHelpSolution, exc);
+ }
 }
 
 /// <summary>
@@ -1035,28 +1194,55 @@
 /// <summary>
 /// Add the current task to the queue.
 /// </summary>
- public void AddToQueue()
+ /// <returns>
+ /// True if added, false if error.
+ /// </returns>
+ public bool AddToQueue()
 {
 if (this.ScannedSource == null || string.IsNullOrEmpty(this.ScannedSource.ScanPath) || this.ScannedSource.Titles.Count == 0)
 {
- this.errorService.ShowMessageBox("You must first scan a source and setup your job before adding to the queue.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
- return;
+ this.errorService.ShowMessageBox(Resources.Main_ScanSourceFirst, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ return false;
+ }
+
+ if (string.IsNullOrEmpty(this.CurrentTask.Destination))
+ {
+ this.errorService.ShowMessageBox(Resources.Main_SetDestination, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ return false;
+ }
+
+ // Sanity check the filename
+ if (!string.IsNullOrEmpty(this.Destination) && FileHelper.FilePathHasInvalidChars(this.Destination))
+ {
+ this.errorService.ShowMessageBox(Resources.Main_InvalidDestination, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ this.NotifyOfPropertyChange(() => this.Destination);
+ return false;
+ }
+
+ if (this.scannedSource != null && !string.IsNullOrEmpty(this.scannedSource.ScanPath) && this.Destination.ToLower() == this.scannedSource.ScanPath.ToLower())
+ {
+ this.errorService.ShowMessageBox(Resources.Main_MatchingFileOverwriteWarning, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ return false;
 }
 
- QueueTask task = new QueueTask { Task = new EncodeTask(this.CurrentTask) };
+ QueueTask task = new QueueTask(new EncodeTask(this.CurrentTask), HBConfigurationFactory.Create());
+
 if (!this.queueProcessor.CheckForDestinationPathDuplicates(task.Task.Destination))
 {
 this.queueProcessor.Add(task);
 }
 else
 {
- this.errorService.ShowMessageBox("There are jobs on the queue with the same destination path. Please choose a different path for this job.", "Error", MessageBoxButton.OK, MessageBoxImage.Warning);
+ this.errorService.ShowMessageBox(Resources.Main_DuplicateDestinationOnQueue, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Warning);
+ return false;
 }
 
 if (!this.IsEncoding)
 {
- this.ProgramStatusLabel = string.Format("{0} Encodes Pending", this.queueProcessor.Count);
+ this.ProgramStatusLabel = string.Format(Resources.Main_XEncodesPending, this.queueProcessor.Count);
 }
+
+ return true;
 }
 
 /// <summary>
@@ -1066,19 +1252,19 @@
 {
 if (this.ScannedSource == null || this.ScannedSource.Titles == null || this.ScannedSource.Titles.Count == 0)
 {
- this.errorService.ShowMessageBox("You must first scan a source and setup your job before adding to the queue.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ this.errorService.ShowMessageBox(Resources.Main_ScanSourceFirst, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 return;
 }
 
 if (!AutoNameHelper.IsAutonamingEnabled())
 {
- this.errorService.ShowMessageBox("You must turn on automatic file naming in preferences before you can add to the queue.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ this.errorService.ShowMessageBox(Resources.Main_TurnOnAutoFileNaming, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 return;
 }
 
 if (this.CurrentTask != null && this.CurrentTask.SubtitleTracks != null && this.CurrentTask.SubtitleTracks.Count > 0)
 {
- this.errorService.ShowMessageBox("Warning: It is not currently possible to use this feature if you require specific subtitle or audio tracks that the automatic selection feature (see options) doesn't support! Tracks are reset with every new source / title selected.", "Warning", MessageBoxButton.OK, MessageBoxImage.Error);
+ this.errorService.ShowMessageBox(Resources.Main_AutoAdd_AudioAndSubWarning, Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Error);
 }
 
 foreach (Title title in this.ScannedSource.Titles)
@@ -1095,20 +1281,27 @@
 {
 if (this.ScannedSource == null || this.ScannedSource.Titles == null || this.ScannedSource.Titles.Count == 0)
 {
- this.errorService.ShowMessageBox("You must first scan a source and setup your job before adding to the queue.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ this.errorService.ShowMessageBox(Resources.Main_ScanSourceFirst, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 return;
 }
 
 if (!AutoNameHelper.IsAutonamingEnabled())
 {
- this.errorService.ShowMessageBox("You must turn on automatic file naming in preferences before you can add to the queue.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ this.errorService.ShowMessageBox(Resources.Main_TurnOnAutoFileNaming, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 return;
 }
 
 Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(QueueSelectionViewModel));
 IQueueSelectionViewModel viewModel = IoC.Get<IQueueSelectionViewModel>();
 
- viewModel.Setup(this.ScannedSource, this.SourceName);
+ viewModel.Setup(this.ScannedSource, this.SourceName, (tasks) =>
+ {
+ foreach (SelectionTitle title in tasks)
+ {
+ this.SelectedTitle = title.Title;
+ this.AddToQueue();
+ }
+ });
 
 if (window != null)
 {
@@ -1125,63 +1318,25 @@
 /// </summary>
 public void FolderScan()
 {
- VistaFolderBrowserDialog dialog = new VistaFolderBrowserDialog { Description = "Please select a folder.", UseDescriptionForTitle = true };
- dialog.ShowDialog();
- this.StartScan(dialog.SelectedPath, 0);
- }
-
- /// <summary>
- /// File Scan
- /// </summary>
- public void FileScan()
- {
- VistaOpenFileDialog dialog = new VistaOpenFileDialog { Filter = "All files (*.*)|*.*" };
- dialog.ShowDialog();
- this.StartScan(dialog.FileName, 0);
- }
-
- /// <summary>
- /// Folder Scan
- /// </summary>
- public void FolderScanTitleSpecific()
- {
- VistaFolderBrowserDialog dialog = new VistaFolderBrowserDialog { Description = "Please select a folder.", UseDescriptionForTitle = true };
+ VistaFolderBrowserDialog dialog = new VistaFolderBrowserDialog { Description = Resources.Main_PleaseSelectFolder, UseDescriptionForTitle = true };
 dialog.ShowDialog();
 
- if (string.IsNullOrEmpty(dialog.SelectedPath))
- {
- return;
- }
-
- ITitleSpecificViewModel titleSpecificView = IoC.Get<ITitleSpecificViewModel>();
- this.WindowManager.ShowDialog(titleSpecificView);
+ ShowSourceSelection = false;
 
- if (titleSpecificView.SelectedTitle.HasValue)
- {
- this.StartScan(dialog.SelectedPath, titleSpecificView.SelectedTitle.Value);
- }
+ this.StartScan(dialog.SelectedPath, this.TitleSpecificScan);
 }
 
 /// <summary>
 /// File Scan
 /// </summary>
- public void FileScanTitleSpecific()
+ public void FileScan()
 {
- VistaOpenFileDialog dialog = new VistaOpenFileDialog { Filter = "All files (*.*)|*.*" };
+ OpenFileDialog dialog = new OpenFileDialog { Filter = "All files (*.*)|*.*" };
 dialog.ShowDialog();
 
- if (string.IsNullOrEmpty(dialog.FileName))
- {
- return;
- }
-
- ITitleSpecificViewModel titleSpecificView = IoC.Get<ITitleSpecificViewModel>();
- this.WindowManager.ShowDialog(titleSpecificView);
+ ShowSourceSelection = false;
 
- if (titleSpecificView.SelectedTitle.HasValue)
- {
- this.StartScan(dialog.FileName, titleSpecificView.SelectedTitle.Value);
- }
+ this.StartScan(dialog.FileName, this.TitleSpecificScan);
 }
 
 /// <summary>
@@ -1199,33 +1354,44 @@
 {
 if (this.queueProcessor.IsProcessing)
 {
- this.errorService.ShowMessageBox("HandBrake is already encoding.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ this.errorService.ShowMessageBox(Resources.Main_AlreadyEncoding, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 return;
 }
 
 // Check if we already have jobs, and if we do, just start the queue.
- if (this.queueProcessor.Count != 0)
+ if (this.queueProcessor.Count != 0 || this.encodeService.IsPasued)
 {
- this.queueProcessor.Start();
+ if (this.encodeService.IsPasued)
+ {
+ this.IsEncoding = true;
+ }
+
+ this.queueProcessor.Start(UserSettingService.GetUserSetting<bool>(UserSettingConstants.ClearCompletedFromQueue));
 return;
 }
 
 // Otherwise, perform Santiy Checking then add to the queue and start if everything is ok.
 if (this.SelectedTitle == null)
 {
- this.errorService.ShowMessageBox("You must first scan a source.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ this.errorService.ShowMessageBox(Resources.Main_ScanSource, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 return;
 }
 
 if (string.IsNullOrEmpty(this.Destination))
 {
- this.errorService.ShowMessageBox("The Destination field was empty.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ this.errorService.ShowMessageBox(Resources.Main_ChooseDestination, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ return;
+ }
+
+ if (this.scannedSource != null && !string.IsNullOrEmpty(this.scannedSource.ScanPath) && this.Destination.ToLower() == this.scannedSource.ScanPath.ToLower())
+ {
+ this.errorService.ShowMessageBox(Resources.Main_MatchingFileOverwriteWarning, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 return;
 }
 
 if (File.Exists(this.Destination))
 {
- MessageBoxResult result = this.errorService.ShowMessageBox("The current file already exists, do you wish to overwrite it?", "Question", MessageBoxButton.YesNo, MessageBoxImage.Question);
+ MessageBoxResult result = this.errorService.ShowMessageBox(Resources.Main_DestinationOverwrite, Resources.Question, MessageBoxButton.YesNo, MessageBoxImage.Question);
 if (result == MessageBoxResult.No)
 {
 return;
@@ -1233,14 +1399,11 @@
 }
 
 // Create the Queue Task and Start Processing
- QueueTask task = new QueueTask
- {
- Task = new EncodeTask(this.CurrentTask),
- CustomQuery = false
- };
- this.queueProcessor.Add(task);
- this.queueProcessor.Start();
- this.IsEncoding = true;
+ if (this.AddToQueue())
+ {
+ this.queueProcessor.Start(UserSettingService.GetUserSetting<bool>(UserSettingConstants.ClearCompletedFromQueue));
+ this.IsEncoding = true;
+ }
 }
 
 /// <summary>
@@ -1253,7 +1416,7 @@
 {
 // Rescan the source to make sure it's still valid
 this.queueEditTask = task;
- this.scanService.Scan(task.Source, task.Title, this.UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount), QueueEditAction);
+ this.scanService.Scan(task.Source, task.Title, QueueEditAction, HBConfigurationFactory.Create());
 }
 
 /// <summary>
@@ -1262,6 +1425,12 @@
 public void PauseEncode()
 {
 this.queueProcessor.Pause();
+
+ if (this.encodeService.CanPause)
+ {
+ this.encodeService.Pause();
+ this.IsEncoding = false;
+ }
 }
 
 /// <summary>
@@ -1287,28 +1456,26 @@
 public void ShowCliQuery()
 {
 this.errorService.ShowMessageBox(
- QueryGeneratorUtility.GenerateQuery(this.CurrentTask,
- userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount),
- userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity),
- userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav)),
+ QueryGeneratorUtility.GenerateQuery(this.CurrentTask, HBConfigurationFactory.Create()),
 "CLI Query",
 MessageBoxButton.OK,
 MessageBoxImage.Information);
 }
 
 /// <summary>
- /// The debug scan log.
+ /// The select source window.
 /// </summary>
- public void DebugScanLog()
+ public void SelectSourceWindow()
 {
- VistaOpenFileDialog dialog = new VistaOpenFileDialog();
-
- dialog.ShowDialog();
+ ShowSourceSelection = !ShowSourceSelection;
+ }
 
- if (File.Exists(dialog.FileName))
- {
- this.scanService.DebugScanLog(dialog.FileName);
- }
+ /// <summary>
+ /// The close source selection.
+ /// </summary>
+ public void CloseSourceSelection()
+ {
+ this.ShowSourceSelection = false;
 }
 
 #endregion
@@ -1347,39 +1514,64 @@
 AddExtension = true,
 DefaultExt = ".mp4",
 OverwritePrompt = true,
- FilterIndex = this.CurrentTask.OutputFormat == OutputFormat.Mkv ? 1 : 0,
 };
 
+ string extension = Path.GetExtension(this.CurrentTask.Destination);
+
+ saveFileDialog.FilterIndex = !string.IsNullOrEmpty(this.CurrentTask.Destination)
+ && !string.IsNullOrEmpty(extension)
+ ? (extension == ".mp4" || extension == ".m4v" ? 1 : 2)
+ : (this.CurrentTask.OutputFormat == OutputFormat.Mkv ? 2 : 0);
+
 if (this.CurrentTask != null && !string.IsNullOrEmpty(this.CurrentTask.Destination))
 {
- if (Directory.Exists(Path.GetDirectoryName(this.CurrentTask.Destination)))
- {
- saveFileDialog.InitialDirectory = Path.GetDirectoryName(this.CurrentTask.Destination) + "\\";
- }
+ saveFileDialog.InitialDirectory = Directory.Exists(Path.GetDirectoryName(this.CurrentTask.Destination))
+ ? Path.GetDirectoryName(this.CurrentTask.Destination) + "\\"
+ : null;
 
 saveFileDialog.FileName = Path.GetFileName(this.CurrentTask.Destination);
 }
 
- saveFileDialog.ShowDialog();
- this.Destination = saveFileDialog.FileName;
-
- // Set the Extension Dropdown. This will also set Mp4/m4v correctly.
- if (!string.IsNullOrEmpty(saveFileDialog.FileName))
+ bool? result = saveFileDialog.ShowDialog();
+ if (result.HasValue && result.Value)
 {
- switch (Path.GetExtension(saveFileDialog.FileName))
+ this.Destination = saveFileDialog.FileName;
+
+ // Set the Extension Dropdown. This will also set Mp4/m4v correctly.
+ if (!string.IsNullOrEmpty(saveFileDialog.FileName))
 {
- case ".mkv":
- this.SelectedOutputFormat = OutputFormat.Mkv;
- break;
- case ".mp4":
- this.SelectedOutputFormat = OutputFormat.Mp4;
- break;
- case ".m4v":
- this.SelectedOutputFormat = OutputFormat.M4V;
- break;
+ switch (Path.GetExtension(saveFileDialog.FileName))
+ {
+ case ".mkv":
+ this.SelectedOutputFormat = OutputFormat.Mkv;
+ break;
+ case ".mp4":
+ case ".m4v":
+ this.SelectedOutputFormat = OutputFormat.Mp4;
+ break;
+ }
+
+ this.NotifyOfPropertyChange(() => this.CurrentTask);
 }
+ }
+ }
 
- this.NotifyOfPropertyChange(() => this.CurrentTask);
+ /// <summary>
+ /// The open destination directory.
+ /// </summary>
+ public void OpenDestinationDirectory()
+ {
+ if (!string.IsNullOrEmpty(this.Destination))
+ {
+ string directory = Path.GetDirectoryName(this.Destination);
+ if (!string.IsNullOrEmpty(directory))
+ {
+ Process.Start(directory);
+ }
+ else
+ {
+ Process.Start(AppDomain.CurrentDomain.BaseDirectory);
+ }
 }
 }
 
@@ -1389,7 +1581,7 @@
 public void PresetAdd()
 {
 IAddPresetViewModel presetViewModel = IoC.Get<IAddPresetViewModel>();
- presetViewModel.Setup(this.CurrentTask);
+ presetViewModel.Setup(this.CurrentTask, this.SelectedTitle, this.AudioViewModel.AudioBehaviours, this.SubtitleViewModel.SubtitleBehaviours);
 this.WindowManager.ShowWindow(presetViewModel);
 }
 
@@ -1401,7 +1593,7 @@
 if (this.SelectedPreset == null)
 {
 this.errorService.ShowMessageBox(
- "Please select a preset to update.", "No Preset selected", MessageBoxButton.OK, MessageBoxImage.Warning);
+ Resources.Main_SelectPresetForUpdate, Resources.Main_NoPresetSelected, MessageBoxButton.OK, MessageBoxImage.Warning);
 
 return;
 }
@@ -1409,17 +1601,17 @@
 if (this.SelectedPreset.IsBuildIn)
 {
 this.errorService.ShowMessageBox(
- "You can not modify built in presets. Please select one of your own presets.", "No Preset selected", MessageBoxButton.OK, MessageBoxImage.Warning);
+ Resources.Main_NoUpdateOfBuiltInPresets, Resources.Main_NoPresetSelected, MessageBoxButton.OK, MessageBoxImage.Warning);
 return;
 }
 
- if (this.errorService.ShowMessageBox("Are you sure you wish to update the selected preset?", "Are you sure?", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
+ if (this.errorService.ShowMessageBox(Resources.Main_PresetUpdateConfrimation, Resources.AreYouSure, MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
 {
- this.SelectedPreset.Task = new EncodeTask(this.CurrentTask);
+ this.SelectedPreset.Update(new EncodeTask(this.CurrentTask), new AudioBehaviours(this.AudioViewModel.AudioBehaviours), new SubtitleBehaviours(this.SubtitleViewModel.SubtitleBehaviours));
 this.presetService.Update(this.SelectedPreset);
 
 this.errorService.ShowMessageBox(
- "The Preset has now been updated with your current settings.", "Preset Updated", MessageBoxButton.OK, MessageBoxImage.Information);
+ Resources.Main_PresetUpdated, Resources.Updated, MessageBoxButton.OK, MessageBoxImage.Information);
 }
 }
 
@@ -1434,7 +1626,7 @@
 }
 else
 {
- MessageBox.Show("Please select a preset.", "Presets", MessageBoxButton.OK, MessageBoxImage.Warning);
+ MessageBox.Show(Resources.Main_SelectPreset, Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);
 }
 }
 
@@ -1446,11 +1638,11 @@
 if (this.selectedPreset != null)
 {
 this.presetService.SetDefault(this.selectedPreset);
- MessageBox.Show(string.Format("New Default Preset Set: {0}", this.selectedPreset.Name), "Presets", MessageBoxButton.OK, MessageBoxImage.Warning);
+ MessageBox.Show(string.Format(Resources.Main_NewDefaultPreset, this.selectedPreset.Name), Resources.Main_Presets, MessageBoxButton.OK, MessageBoxImage.Information);
 }
 else
 {
- MessageBox.Show("Please select a preset.", "Presets", MessageBoxButton.OK, MessageBoxImage.Warning);
+ MessageBox.Show(Resources.Main_SelectPreset, Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);
 }
 }
 
@@ -1459,41 +1651,70 @@
 /// </summary>
 public void PresetImport()
 {
- VistaOpenFileDialog dialog = new VistaOpenFileDialog { Filter = "Plist (*.plist)|*.plist", CheckFileExists = true };
+ OpenFileDialog dialog = new OpenFileDialog() { Filter = "Plist (*.plist)|*.plist", CheckFileExists = true };
 dialog.ShowDialog();
 string filename = dialog.FileName;
 
 if (!string.IsNullOrEmpty(filename))
 {
 PList plist = new PList(filename);
- Preset preset = PlistPresetFactory.CreatePreset(plist);
 
- if (this.presetService.CheckIfPresetExists(preset.Name))
+ object build;
+ plist.TryGetValue("PresetBuildNumber", out build);
+
+ string buildNumber = build as string;
+ if (buildNumber == null)
+ {
+ MessageBox.Show(
+ Resources.Preset_UnableToImport_Message,
+ Resources.Preset_UnableToImport_Header,
+ MessageBoxButton.YesNo, MessageBoxImage.Question);
+ return;
+ }
+
+ if (buildNumber != userSettingService.GetUserSetting<int>(UserSettingConstants.HandBrakeBuild).ToString(CultureInfo.InvariantCulture))
 {
- if (!presetService.CanUpdatePreset(preset.Name))
+ MessageBoxResult result = MessageBox.Show(
+ Resources.Preset_OldVersion_Message,
+ Resources.Preset_OldVersion_Header,
+ MessageBoxButton.YesNo, MessageBoxImage.Question);
+
+ if (result == MessageBoxResult.No)
 {
- MessageBox.Show(
- "You can not import a preset with the same name as a built-in preset.",
- "Error",
- MessageBoxButton.OK,
- MessageBoxImage.Error);
 return;
 }
+ }
 
- MessageBoxResult result =
- MessageBox.Show(
- "This preset appears to already exist. Would you like to overwrite it?",
- "Overwrite preset?",
- MessageBoxButton.YesNo,
- MessageBoxImage.Warning);
- if (result == MessageBoxResult.Yes)
- {
- presetService.Update(preset);
- }
+ Preset preset = null;
+ try
+ {
+ preset = PlistPresetFactory.CreatePreset(plist);
 }
- else
+ catch (Exception exc)
 {
- presetService.Add(preset);
+ this.errorService.ShowError(Resources.Main_PresetImportFailed, Resources.Main_PresetImportFailedSolution, exc);
+ }
+
+ if (preset != null)
+ {
+ if (this.presetService.CheckIfPresetExists(preset.Name))
+ {
+ if (!presetService.CanUpdatePreset(preset.Name))
+ {
+ MessageBox.Show(Resources.Main_PresetErrorBuiltInName, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ return;
+ }
+
+ MessageBoxResult result = MessageBox.Show(Resources.Main_PresetOverwriteWarning, Resources.Overwrite, MessageBoxButton.YesNo, MessageBoxImage.Warning);
+ if (result == MessageBoxResult.Yes)
+ {
+ presetService.Update(preset);
+ }
+ }
+ else
+ {
+ presetService.Add(preset);
+ }
 }
 
 this.NotifyOfPropertyChange(() => this.Presets);
@@ -1505,7 +1726,7 @@
 /// </summary>
 public void PresetExport()
 {
- VistaSaveFileDialog savefiledialog = new VistaSaveFileDialog
+ SaveFileDialog savefiledialog = new SaveFileDialog
 {
 Filter = "plist|*.plist",
 CheckPathExists = true,
@@ -1524,13 +1745,12 @@
 PlistUtility.Export(
 savefiledialog.FileName,
 this.selectedPreset,
- userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild)
- .ToString(CultureInfo.InvariantCulture));
+ this.userSettingService.GetUserSetting<int>(UserSettingConstants.HandBrakeBuild).ToString(CultureInfo.InvariantCulture));
 }
 }
 else
 {
- MessageBox.Show("Please select a preset.", "Presets", MessageBoxButton.OK, MessageBoxImage.Warning);
+ MessageBox.Show(Resources.Main_SelectPreset, Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);
 }
 }
 
@@ -1540,8 +1760,24 @@
 public void PresetReset()
 {
 this.presetService.UpdateBuiltInPresets();
- this.NotifyOfPropertyChange("Presets");
+ this.NotifyOfPropertyChange(() => this.Presets);
 this.SelectedPreset = this.presetService.DefaultPreset;
+ this.errorService.ShowMessageBox(Resources.Presets_ResetComplete, Resources.Presets_ResetHeader, MessageBoxButton.OK, MessageBoxImage.Information);
+ }
+
+ /// <summary>
+ /// The preset select.
+ /// </summary>
+ /// <param name="tag">
+ /// The tag.
+ /// </param>
+ public void PresetSelect(object tag)
+ {
+ Preset preset = tag as Preset;
+ if (preset != null)
+ {
+ this.SelectedPreset = preset;
+ }
 }
 
 /// <summary>
@@ -1557,7 +1793,7 @@
 {
 if (!string.IsNullOrEmpty(filename))
 {
- this.scanService.Scan(filename, title, this.UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount), null);
+ this.scanService.Scan(filename, title, null, HBConfigurationFactory.Create());
 }
 }
 
@@ -1610,7 +1846,7 @@
 // Cleanup
 this.ShowStatusWindow = false;
 this.SourceLabel = this.SourceName;
- this.StatusLabel = "Scan Completed";
+ this.StatusLabel = Resources.Main_ScanCompleted;
 });
 }
 
@@ -1645,7 +1881,6 @@
 if (newExtension == ".mkv")
 {
 this.IsMkv = true;
- this.CurrentTask.LargeFile = false;
 this.CurrentTask.OptimizeMP4 = false;
 this.CurrentTask.IPod5GSupport = false;
 }
@@ -1692,15 +1927,20 @@
 }
 
 double startEndDuration = this.SelectedEndPoint - this.SelectedStartPoint;
+ TimeSpan output;
+
 switch (this.SelectedPointToPoint)
 {
 case PointToPointMode.Chapters:
- return this.SelectedTitle.CalculateDuration(this.SelectedStartPoint, this.SelectedEndPoint).ToString();
+ output = this.SelectedTitle.CalculateDuration(this.SelectedStartPoint, this.SelectedEndPoint);
+ return string.Format("{0:00}:{1:00}:{2:00}", output.Hours, output.Minutes, output.Seconds);
 case PointToPointMode.Seconds:
- return TimeSpan.FromSeconds(startEndDuration).ToString();
+ output = TimeSpan.FromSeconds(startEndDuration);
+ return string.Format("{0:00}:{1:00}:{2:00}", output.Hours, output.Minutes, output.Seconds);
 case PointToPointMode.Frames:
 startEndDuration = startEndDuration / selectedTitle.Fps;
- return TimeSpan.FromSeconds(startEndDuration).ToString();
+ output = TimeSpan.FromSeconds(Math.Round(startEndDuration, 2));
+ return string.Format("{0:00}:{1:00}:{2:00}", output.Hours, output.Minutes, output.Seconds);
 }
 
 return "--:--:--";
@@ -1716,7 +1956,7 @@
 {
 if (information.NewVersionAvailable)
 {
- this.ProgramStatusLabel = "A New Update is Available. Goto Tools Menu > Options to Install";
+ this.ProgramStatusLabel = Resources.Main_NewUpdate;
 }
 }
 
@@ -1734,8 +1974,8 @@
 /// </param>
 private void ScanStatusChanged(object sender, HandBrake.ApplicationServices.EventArgs.ScanProgressEventArgs e)
 {
- this.SourceLabel = string.Format("Scanning Title {0} of {1} ({2}%)", e.CurrentTitle, e.Titles, e.Percentage);
- this.StatusLabel = string.Format("Scanning Title {0} of {1} ({2}%)", e.CurrentTitle, e.Titles, e.Percentage);
+ this.SourceLabel = string.Format(Resources.Main_ScanningTitleXOfY, e.CurrentTitle, e.Titles, e.Percentage);
+ this.StatusLabel = string.Format(Resources.Main_ScanningTitleXOfY, e.CurrentTitle, e.Titles, e.Percentage);
 }
 
 /// <summary>
@@ -1764,21 +2004,22 @@
 if (e.Successful)
 {
 this.SourceLabel = this.SourceName;
- this.StatusLabel = "Scan Completed";
+ this.StatusLabel = Resources.Main_ScanCompleted;
 }
 else if (e.Cancelled)
 {
- this.SourceLabel = "Scan Cancelled.";
- this.StatusLabel = "Scan Cancelled.";
+ this.SourceLabel = Resources.Main_ScanCancelled;
+ this.StatusLabel = Resources.Main_ScanCancelled;
 }
 else if (e.Exception == null && e.ErrorInformation != null)
 {
- this.SourceLabel = "Scan failed: " + e.ErrorInformation;
- this.StatusLabel = "Scan failed: " + e.ErrorInformation;
+ this.SourceLabel = Resources.Main_ScanFailed_NoReason + e.ErrorInformation;
+ this.StatusLabel = Resources.Main_ScanFailed_NoReason + e.ErrorInformation;
 }
 else
 {
- this.SourceLabel = "Scan Failed... See Activity Log for details."; this.StatusLabel = "Scan Failed... See Activity Log for details.";
+ this.SourceLabel = Resources.Main_ScanFailled_CheckLog;
+ this.StatusLabel = Resources.Main_ScanFailled_CheckLog;
 }
 });
 }
@@ -1797,7 +2038,7 @@
 Execute.OnUIThread(
 () =>
 {
- this.StatusLabel = "Scanning source, please wait...";
+ this.StatusLabel = Resources.Main_ScanningPleaseWait;
 this.ShowStatusWindow = true;
 });
 }
@@ -1818,15 +2059,19 @@
 Math.Round(e.PercentComplete).ToString(CultureInfo.InvariantCulture),
 out percent);
 
-
 Execute.OnUIThread(
 () =>
 {
- if (this.IsEncoding)
+ if (this.queueProcessor.EncodeService.IsEncoding)
 {
+ string josPending = string.Empty;
+ if (!AppArguments.IsInstantHandBrake)
+ {
+ josPending = Resources.Main_JobsPending_addon;
+ }
+
 this.ProgramStatusLabel =
- string.Format(
- "{0:00.00}%, FPS: {1:000.0}, Avg FPS: {2:000.0}, Time Remaining: {3}, Elapsed: {4:hh\\:mm\\:ss}, Pending Jobs {5}",
+ string.Format("{0:00.00}%, FPS: {1:000.0}, Avg FPS: {2:000.0}, Time Remaining: {3}, Elapsed: {4:hh\\:mm\\:ss}" + josPending,
 e.PercentComplete,
 e.CurrentFrameRate,
 e.AverageFrameRate,
@@ -1840,6 +2085,18 @@
 }
 
 lastEncodePercentage = percent;
+ this.ProgressPercentage = percent;
+ this.NotifyOfPropertyChange(() => ProgressPercentage);
+ }
+ else
+ {
+ this.ProgramStatusLabel = Resources.Main_QueueFinished;
+ this.IsEncoding = false;
+
+ if (this.windowsSeven.IsWindowsSeven)
+ {
+ this.windowsSeven.SetTaskBarProgressToNoProgress();
+ }
 }
 });
 }
@@ -1858,7 +2115,7 @@
 Execute.OnUIThread(
 () =>
 {
- this.ProgramStatusLabel = "Preparing to encode ...";
+ this.ProgramStatusLabel = Resources.Main_PreparingToEncode;
 this.IsEncoding = true;
 });
 }
@@ -1879,7 +2136,7 @@
 Execute.OnUIThread(
 () =>
 {
- this.ProgramStatusLabel = "Queue Finished";
+ this.ProgramStatusLabel = Resources.Main_QueueFinished;
 this.IsEncoding = false;
 
 if (this.windowsSeven.IsWindowsSeven)
@@ -1903,7 +2160,7 @@
 Execute.OnUIThread(
 () =>
 {
- this.ProgramStatusLabel = string.Format("{0} Encodes Pending", this.queueProcessor.Count);
+ this.ProgramStatusLabel = string.Format(Resources.Main_XEncodesPending, this.queueProcessor.Count);
 });
 }
 
@@ -1913,79 +2170,25 @@
 /// <param name="item">
 /// The item.
 /// </param>
- private void ProcessDrive(object item)
+ public void ProcessDrive(object item)
 {
 if (item != null)
 {
- this.StartScan(((DriveInformation)item).RootDirectory, 0);
- }
- }
-
- /// <summary>
- /// The generate source menu.
- /// </summary>
- /// <returns>
- /// The System.Collections.Generic.IEnumerable`1[T -&gt; HandBrakeWPF.Model.SourceMenuItem].
- /// </returns>
- private IEnumerable<SourceMenuItem> GenerateSourceMenu()
- {
- List<SourceMenuItem> menuItems = new List<SourceMenuItem>();
-
- SourceMenuItem folderScan = new SourceMenuItem
- {
- Image = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/HandBrake;component/Views/Images/folder.png")), Width = 16, Height = 16 },
- Text = "Open Folder",
- Command = new SourceMenuCommand(this.FolderScan)
- };
- SourceMenuItem fileScan = new SourceMenuItem
- {
- Image = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/HandBrake;component/Views/Images/Movies.png")), Width = 16, Height = 16 },
- Text = "Open File",
- Command = new SourceMenuCommand(this.FileScan)
- };
-
- SourceMenuItem titleSpecific = new SourceMenuItem { Text = "Title Specific Scan" };
- SourceMenuItem folderScanTitle = new SourceMenuItem
- {
- Image = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/HandBrake;component/Views/Images/folder.png")), Width = 16, Height = 16 },
- Text = "Open Folder",
- Command = new SourceMenuCommand(this.FolderScanTitleSpecific)
- };
- SourceMenuItem fileScanTitle = new SourceMenuItem
- {
- Image = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/HandBrake;component/Views/Images/Movies.png")), Width = 16, Height = 16 },
- Text = "Open File",
- Command = new SourceMenuCommand(this.FileScanTitleSpecific)
- };
- titleSpecific.Children.Add(folderScanTitle);
- titleSpecific.Children.Add(fileScanTitle);
-
- menuItems.Add(folderScan);
- menuItems.Add(fileScan);
- menuItems.Add(titleSpecific);
-
- // Drives
- menuItems.AddRange(
- from item in GeneralUtilities.GetDrives()
- let driveInformation = item
- select
- new SourceMenuItem
- {
- Image = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/HandBrake;component/Views/Images/disc_small.png")), Width = 16, Height = 16 },
- Text = string.Format("{0} ({1})", item.RootDirectory, item.VolumeLabel),
- Command = new SourceMenuCommand(() => this.ProcessDrive(driveInformation)),
- Tag = item
- });
-
- return menuItems;
- }
+ if (item.GetType() == typeof(DriveInformation))
+ {
+ this.StartScan(((DriveInformation)item).RootDirectory, 0);
+ }
+ else if (item.GetType() == typeof(SourceMenuItem))
+ {
+ DriveInformation driveInfo = ((SourceMenuItem)item).Tag as DriveInformation;
+ if (driveInfo != null)
+ {
+ this.StartScan(driveInfo.RootDirectory, 0);
+ }
 
- /// <summary>
- /// The drive tray changed.
- /// </summary>
- private void DriveTrayChanged()
- {
- Caliburn.Micro.Execute.OnUIThread(() => this.SourceMenu = this.GenerateSourceMenu());
+ this.ShowSourceSelection = false;
+ }
+ }
 }
 
 /// <summary>
@@ -2017,10 +2220,10 @@
 /// </param>
 private void CurrentTask_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
 {
- if (e.PropertyName == UserSettingConstants.ShowAdvancedTab)
- {
- this.NotifyOfPropertyChange(() => this.ShowAdvancedTab);
- }
+ if (e.PropertyName == UserSettingConstants.ShowAdvancedTab)
+ {
+ this.NotifyOfPropertyChange(() => this.ShowAdvancedTab);
+ }
 }
 
 #endregion

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs Changed

@@ -10,8 +10,6 @@
 namespace HandBrakeWPF.ViewModels
 {
 using System;
- using System.Collections.Generic;
- using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
@@ -19,8 +17,9 @@
 using System.Linq;
 using System.Windows;
 
- using HandBrake.ApplicationServices;
- using HandBrake.ApplicationServices.Services.Interfaces;
+ using Caliburn.Micro;
+
+ using HandBrake.ApplicationServices.Model;
 using HandBrake.ApplicationServices.Utilities;
 
 using HandBrakeWPF.Model;
@@ -52,26 +51,6 @@
 private readonly IUpdateService updateService;
 
 /// <summary>
- /// The add audio mode options.
- /// </summary>
- private BindingList<string> addAudioModeOptions = new BindingList<string>();
-
- /// <summary>
- /// The add closed captions.
- /// </summary>
- private bool addClosedCaptions;
-
- /// <summary>
- /// The add only one audio track per language.
- /// </summary>
- private bool addOnlyOneAudioTrackPerLanguage;
-
- /// <summary>
- /// The add subtitle mode options.
- /// </summary>
- private BindingList<string> addSubtitleModeOptions = new BindingList<string>();
-
- /// <summary>
 /// The arguments.
 /// </summary>
 private string arguments;
@@ -92,11 +71,6 @@
 private string autonameFormat;
 
 /// <summary>
- /// The available languages.
- /// </summary>
- private BindingList<string> availableLanguages = new BindingList<string>();
-
- /// <summary>
 /// The change to title case.
 /// </summary>
 private bool changeToTitleCase;
@@ -142,11 +116,6 @@
 private bool disableLibdvdNav;
 
 /// <summary>
- /// The disable libhb features
- /// </summary>
- private bool disableLibhbFeatures;
-
- /// <summary>
 /// The disable p reset update check notification.
 /// </summary>
 private bool disablePresetUpdateCheckNotification;
@@ -207,16 +176,6 @@
 private bool removeUnderscores;
 
 /// <summary>
- /// The selected add audio mode.
- /// </summary>
- private int selectedAddAudioMode;
-
- /// <summary>
- /// The selected add subtitle mode.
- /// </summary>
- private int selectedAddSubtitleMode;
-
- /// <summary>
 /// The selected granulairty.
 /// </summary>
 private string selectedGranulairty;
@@ -227,21 +186,6 @@
 private int selectedMp4Extension;
 
 /// <summary>
- /// The selected preferred languages.
- /// </summary>
- private BindingList<string> preferredLanguages = new BindingList<string>();
-
- /// <summary>
- /// The selected preferred langauge.
- /// </summary>
- private string selectedPreferredLangauge;
-
- /// <summary>
- /// The selected preferred subtitle language
- /// </summary>
- private string selectedPreferredSubtitleLangauge;
-
- /// <summary>
 /// The selected preview count.
 /// </summary>
 private int selectedPreviewCount;
@@ -287,16 +231,6 @@
 private BindingList<string> whenDoneOptions = new BindingList<string>();
 
 /// <summary>
- /// Selected Langauges
- /// </summary>
- private BindingList<string> selectedLangauges = new BindingList<string>();
-
- /// <summary>
- /// The backing field for show advanced passthru options for Audio
- /// </summary>
- private bool showAdvancedPassthruOpts;
-
- /// <summary>
 /// Backing field for clear queue on encode completed.
 /// </summary>
 private bool clearQueueOnEncodeCompleted;
@@ -337,11 +271,6 @@
 private int serverPort;
 
 /// <summary>
- /// The server port.
- /// </summary>
- private bool enableDebugFeatures;
-
- /// <summary>
 /// Backing field for EnableLibHb
 /// </summary>
 private bool enableLibHb;
@@ -351,6 +280,46 @@
 /// </summary>
 private bool showAdvancedTab;
 
+ /// <summary>
+ /// The enable static preview.
+ /// </summary>
+ private bool enableStaticPreview;
+
+ /// <summary>
+ /// The remove punctuation.
+ /// </summary>
+ private bool removePunctuation;
+
+ /// <summary>
+ /// The use system colours for styles.
+ /// </summary>
+ private bool useSystemColoursForStyles;
+
+ /// <summary>
+ /// The reset when done action.
+ /// </summary>
+ private bool resetWhenDoneAction;
+
+ /// <summary>
+ /// The selected scaling mode.
+ /// </summary>
+ private VideoScaler selectedScalingMode;
+
+ /// <summary>
+ /// The enable dxva decoding.
+ /// </summary>
+ private bool enableDxvaDecoding;
+
+ /// <summary>
+ /// The disable quick sync decoding.
+ /// </summary>
+ private bool disableQuickSyncDecoding;
+
+ /// <summary>
+ /// The is cl scaling.
+ /// </summary>
+ private bool isClScaling;
+
 #endregion
 
 #region Constructors and Destructors
@@ -367,7 +336,7 @@
 /// <param name="updateService">
 /// The update Service.
 /// </param>
- public OptionsViewModel(IUserSettingService userSettingService, IShellViewModel shellViewModel, IUpdateService updateService )
+ public OptionsViewModel(IUserSettingService userSettingService, IShellViewModel shellViewModel, IUpdateService updateService)
 {
 this.Title = "Options";
 this.userSettingService = userSettingService;
@@ -429,6 +398,23 @@
 }
 
 /// <summary>
+ /// Gets or sets a value indicating whether reset when done action.
+ /// </summary>
+ public bool ResetWhenDoneAction
+ {
+ get
+ {
+ return this.resetWhenDoneAction;
+ }
+
+ set
+ {
+ this.resetWhenDoneAction = value;
+ this.NotifyOfPropertyChange("ResetWhenDoneAction");
+ }
+ }
+
+ /// <summary>
 /// Gets or sets CheckForUpdatesFrequencies.
 /// </summary>
 public BindingList<string> CheckForUpdatesFrequencies
@@ -597,6 +583,23 @@
 this.NotifyOfPropertyChange("WhenDoneOptions");
 }
 }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether use system colours.
+ /// </summary>
+ public bool UseSystemColoursForStylesForStyles
+ {
+ get
+ {
+ return this.useSystemColoursForStyles;
+ }
+ set
+ {
+ this.useSystemColoursForStyles = value;
+ this.NotifyOfPropertyChange(() => UseSystemColoursForStylesForStyles);
+ }
+ }
+
 #endregion
 
 #region Output Files
@@ -720,241 +723,41 @@
 }
 }
 
- #endregion
-
- #region Preview
- /// <summary>
- /// Gets or sets VLCPath.
- /// </summary>
- public string VLCPath
- {
- get
- {
- return this.vlcPath;
- }
-
- set
- {
- this.vlcPath = value;
- this.NotifyOfPropertyChange("VLCPath");
- }
- }
- #endregion
-
- #region Audio and Subtitles
-
- /// <summary>
- /// Gets or sets preferredLanguages.
- /// </summary>
- public BindingList<string> PreferredLanguages
- {
- get
- {
- return this.preferredLanguages;
- }
-
- set
- {
- this.preferredLanguages = value;
- this.NotifyOfPropertyChange("PreferredLanguages");
- }
- }
-
- /// <summary>
- /// Gets or sets SelectedPreferreedLangauge.
- /// </summary>
- public string SelectedPreferredLangauge
- {
- get
- {
- return this.selectedPreferredLangauge;
- }
-
- set
- {
- this.selectedPreferredLangauge = value;
- this.NotifyOfPropertyChange(() => SelectedPreferredLangauge);
- }
- }
-
- /// <summary>
- /// Gets or sets SelectedPreferredSubtitleLangauge.
- /// </summary>
- public string SelectedPreferredSubtitleLangauge
- {
- get
- {
- return this.selectedPreferredSubtitleLangauge;
- }
-
- set
- {
- this.selectedPreferredSubtitleLangauge = value;
- this.NotifyOfPropertyChange(() => SelectedPreferredSubtitleLangauge);
- }
- }
-
- /// <summary>
- /// Gets or sets AvailableLanguages.
- /// </summary>
- public BindingList<string> AvailableLanguages
- {
- get
- {
- return this.availableLanguages;
- }
-
- set
- {
- this.availableLanguages = value;
- this.NotifyOfPropertyChange("AvailableLanguages");
- }
- }
-
- /// <summary>
- /// Gets or sets SelectedLangauges.
- /// </summary>
- public BindingList<string> SelectedLangauges
- {
- get
- {
- return this.selectedLangauges;
- }
- set
- {
- this.selectedLangauges = value;
- this.NotifyOfPropertyChange("SelectedLangauges");
- }
- }
-
- /// <summary>
- /// Gets or sets SelectedLangauges.
- /// </summary>
- public BindingList<string> SelectedAvailableToMove { get; set; }
-
- /// <summary>
- /// Gets or sets SelectedLangauges.
- /// </summary>
- public BindingList<string> SelectedLangaugesToMove { get; set; }
-
- /// <summary>
- /// Gets or sets AddAudioModeOptions.
- /// </summary>
- public BindingList<string> AddAudioModeOptions
- {
- get
- {
- return this.addAudioModeOptions;
- }
-
- set
- {
- this.addAudioModeOptions = value;
- this.NotifyOfPropertyChange("AddAudioModeOptions");
- }
- }
-
- /// <summary>
- /// Gets or sets a value indicating whether AddClosedCaptions.
- /// </summary>
- public bool AddClosedCaptions
- {
- get
- {
- return this.addClosedCaptions;
- }
-
- set
- {
- this.addClosedCaptions = value;
- this.NotifyOfPropertyChange("AddClosedCaptions");
- }
- }
-
- /// <summary>
- /// Gets or sets a value indicating whether AddOnlyOneAudioTrackPerLanguage.
- /// </summary>
- public bool AddOnlyOneAudioTrackPerLanguage
- {
- get
- {
- return this.addOnlyOneAudioTrackPerLanguage;
- }
-
- set
- {
- this.addOnlyOneAudioTrackPerLanguage = value;
- this.NotifyOfPropertyChange("AddOnlyOneAudioTrackPerLanguage");
- }
- }
-
 /// <summary>
- /// Gets or sets AddSubtitleModeOptions.
+ /// Gets or sets a value indicating whether remove punctuation.
 /// </summary>
- public BindingList<string> AddSubtitleModeOptions
+ public bool RemovePunctuation
 {
 get
 {
- return this.addSubtitleModeOptions;
+ return this.removePunctuation;
 }
-
 set
 {
- this.addSubtitleModeOptions = value;
- this.NotifyOfPropertyChange("AddSubtitleModeOptions");
+ this.removePunctuation = value;
+ this.NotifyOfPropertyChange(() => RemovePunctuation);
 }
 }
 
- /// <summary>
- /// Gets or sets SelectedAddAudioMode.
- /// </summary>
- public int SelectedAddAudioMode
- {
- get
- {
- return this.selectedAddAudioMode;
- }
-
- set
- {
- this.selectedAddAudioMode = value;
- this.NotifyOfPropertyChange("SelectedAddAudioMode");
- }
- }
+ #endregion
 
+ #region Preview
 /// <summary>
- /// Gets or sets SelectedAddSubtitleMode.
+ /// Gets or sets VLCPath.
 /// </summary>
- public int SelectedAddSubtitleMode
+ public string VLCPath
 {
 get
 {
- return this.selectedAddSubtitleMode;
- }
-
- set
- {
- this.selectedAddSubtitleMode = value;
- this.NotifyOfPropertyChange("SelectedAddSubtitleMode");
+ return this.vlcPath;
 }
- }
 
- /// <summary>
- /// Gets or sets a value indicating whether ShowAdvancedPassthruOpts.
- /// </summary>
- public bool ShowAdvancedPassthruOpts
- {
- get
- {
- return this.showAdvancedPassthruOpts;
- }
 set
 {
- this.showAdvancedPassthruOpts = value;
- this.NotifyOfPropertyChange(() => this.ShowAdvancedPassthruOpts);
+ this.vlcPath = value;
+ this.NotifyOfPropertyChange("VLCPath");
 }
 }
-
 #endregion
 
 #region System and Logging
@@ -1300,70 +1103,154 @@
 }
 
 /// <summary>
- /// Gets or sets a value indicating whether debug features are enabled.
+ /// Gets or sets a value indicating whether enable lib hb.
 /// </summary>
- public bool EnableDebugFeatures
+ public bool EnableLibHb
 {
 get
 {
- return this.enableDebugFeatures;
+ return this.enableLibHb;
 }
 set
 {
- this.enableDebugFeatures = value;
- this.NotifyOfPropertyChange(() => this.EnableDebugFeatures);
+ this.enableLibHb = value;
+ this.NotifyOfPropertyChange(() => this.EnableLibHb);
 }
 }
 
 /// <summary>
 /// Gets or sets a value indicating whether enable lib hb.
 /// </summary>
- public bool EnableLibHb
+ public bool ShowAdvancedTab
 {
 get
 {
- return this.enableLibHb;
+ return this.showAdvancedTab;
 }
 set
 {
- this.enableLibHb = value;
- this.NotifyOfPropertyChange(() => this.EnableLibHb);
+ this.showAdvancedTab = value;
+ this.NotifyOfPropertyChange(() => this.ShowAdvancedTab);
 }
 }
 
 /// <summary>
- /// Gets or sets a value indicating whether enable lib hb.
+ /// Gets or sets a value indicating whether enable static preview.
 /// </summary>
- public bool ShowAdvancedTab
+ public bool EnableStaticPreview
 {
 get
 {
- return this.showAdvancedTab;
+ return this.enableStaticPreview;
 }
 set
 {
- this.showAdvancedTab = value;
- this.NotifyOfPropertyChange(() => this.ShowAdvancedTab);
+ this.enableStaticPreview = value;
+ this.NotifyOfPropertyChange(() => this.EnableStaticPreview);
 }
 }
 
+ #endregion
+
+ #region Video
+
 /// <summary>
- /// Gets or sets a value indicating whether DisableLibdvdNav.
+ /// Gets or sets a value indicating whether disable quick sync decoding.
 /// </summary>
- public bool DisableLibHbFeatures
+ public bool DisableQuickSyncDecoding
 {
 get
 {
- return this.disableLibhbFeatures;
+ return this.disableQuickSyncDecoding;
+ }
+ set
+ {
+ if (value.Equals(this.disableQuickSyncDecoding))
+ {
+ return;
+ }
+ this.disableQuickSyncDecoding = value;
+ this.NotifyOfPropertyChange(() => this.DisableQuickSyncDecoding);
 }
+ }
 
+ /// <summary>
+ /// Gets or sets a value indicating whether enable dxva decoding.
+ /// </summary>
+ public bool EnableDxvaDecoding
+ {
+ get
+ {
+ return this.enableDxvaDecoding;
+ }
 set
 {
- this.disableLibhbFeatures = value;
- this.NotifyOfPropertyChange("DisableLibHbFeatures");
+ if (value.Equals(this.enableDxvaDecoding))
+ {
+ return;
+ }
+ this.enableDxvaDecoding = value;
+ this.NotifyOfPropertyChange(() => this.EnableDxvaDecoding);
 }
 }
 
+ /// <summary>
+ /// Gets or sets the selected scaling mode.
+ /// </summary>
+ public VideoScaler SelectedScalingMode
+ {
+ get
+ {
+ return this.selectedScalingMode;
+ }
+ set
+ {
+ this.selectedScalingMode = value;
+ this.IsClScaling = value == VideoScaler.BicubicCl;
+ }
+ }
+
+ /// <summary>
+ /// Gets a value indicating whether is quick sync available.
+ /// </summary>
+ public bool IsQuickSyncAvailable
+ {
+ get
+ {
+ return SystemInfo.IsQsvAvailable;
+ }
+ }
+
+ /// <summary>
+ /// Gets the scaling options.
+ /// </summary>
+ public BindingList<VideoScaler> ScalingOptions
+ {
+ get
+ {
+ return new BindingList<VideoScaler>(EnumHelper<VideoScaler>.GetEnumList().ToList());
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether is cl scaling.
+ /// </summary>
+ public bool IsClScaling
+ {
+ get
+ {
+ return this.isClScaling;
+ }
+ set
+ {
+ if (value.Equals(this.isClScaling))
+ {
+ return;
+ }
+ this.isClScaling = value;
+ this.NotifyOfPropertyChange(() => this.IsClScaling);
+ }
+ }
 
 #endregion
 
@@ -1444,6 +1331,101 @@
 }
 
 /// <summary>
+ /// Close this window.
+ /// </summary>
+ public void Close()
+ {
+ this.Save();
+ this.shellViewModel.DisplayWindow(ShellWindow.MainWindow);
+ }
+
+ /// <summary>
+ /// Browse - Send File To
+ /// </summary>
+ public void BrowseSendFileTo()
+ {
+ VistaOpenFileDialog dialog = new VistaOpenFileDialog { Filter = "All files (*.*)|*.*" };
+ dialog.ShowDialog();
+ this.SendFileTo = Path.GetFileNameWithoutExtension(dialog.FileName);
+ this.sendFileToPath = dialog.FileName;
+ }
+
+ /// <summary>
+ /// Browse Auto Name Path
+ /// </summary>
+ public void BrowseAutoNamePath()
+ {
+ VistaFolderBrowserDialog dialog = new VistaFolderBrowserDialog { Description = "Please select a folder.", UseDescriptionForTitle = true };
+ dialog.ShowDialog();
+ this.AutoNameDefaultPath = dialog.SelectedPath;
+ }
+
+ /// <summary>
+ /// Browse VLC Path
+ /// </summary>
+ public void BrowseVlcPath()
+ {
+ VistaOpenFileDialog dialog = new VistaOpenFileDialog { Filter = "All files (*.exe)|*.exe" };
+ dialog.ShowDialog();
+ this.VLCPath = dialog.FileName;
+ }
+
+ /// <summary>
+ /// Browse - Log Path
+ /// </summary>
+ public void BrowseLogPath()
+ {
+ VistaFolderBrowserDialog dialog = new VistaFolderBrowserDialog { Description = "Please select a folder.", UseDescriptionForTitle = true };
+ dialog.ShowDialog();
+ this.LogDirectory = dialog.SelectedPath;
+ }
+
+ /// <summary>
+ /// View the Default Log Directory for HandBrake
+ /// </summary>
+ public void ViewLogDirectory()
+ {
+ string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
+ string windir = Environment.GetEnvironmentVariable("WINDIR");
+ Process prc = new Process { StartInfo = { FileName = windir + @"\explorer.exe", Arguments = logDir } };
+ prc.Start();
+ }
+
+ /// <summary>
+ /// Clear HandBrakes log directory.
+ /// </summary>
+ public void ClearLogHistory()
+ {
+ MessageBoxResult result = MessageBox.Show("Are you sure you wish to clear the log file directory?", "Clear Logs",
+ MessageBoxButton.YesNoCancel, MessageBoxImage.Question);
+ if (result == MessageBoxResult.Yes)
+ {
+ GeneralUtilities.ClearLogFiles(0);
+ MessageBox.Show("HandBrake's Log file directory has been cleared!", "Notice", MessageBoxButton.OK, MessageBoxImage.Information);
+ }
+ }
+
+ /// <summary>
+ /// Download an Update
+ /// </summary>
+ public void DownloadUpdate()
+ {
+ this.UpdateMessage = "Preparing for Update ...";
+ this.updateService.DownloadFile(this.updateInfo.DownloadFile, this.DownloadComplete, this.DownloadProgress);
+ }
+
+ /// <summary>
+ /// Check for updates
+ /// </summary>
+ public void PerformUpdateCheck()
+ {
+ this.UpdateMessage = "Checking for Updates ...";
+ this.updateService.CheckForUpdates(this.UpdateCheckComplete);
+ }
+
+ #endregion
+
+ /// <summary>
 /// Load User Settings
 /// </summary>
 public override void OnLoad()
@@ -1469,7 +1451,7 @@
 case 7:
 this.CheckForUpdatesFrequency = 1;
 break;
- case 30:
+ default:
 this.CheckForUpdatesFrequency = 2;
 break;
 }
@@ -1482,15 +1464,22 @@
 this.whenDoneOptions.Add("Hibernate");
 this.whenDoneOptions.Add("Lock System");
 this.whenDoneOptions.Add("Log off");
- // this.whenDoneOptions.Add("Quit HandBrake");
+ this.whenDoneOptions.Add("Quit HandBrake");
 this.WhenDone = userSettingService.GetUserSetting<string>("WhenCompleteAction");
+ if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ResetWhenDoneAction))
+ {
+ this.WhenDone = "Do nothing";
+ this.userSettingService.SetUserSetting(UserSettingConstants.WhenCompleteAction, "Do nothing");
+ }
 
 this.GrowlAfterEncode = userSettingService.GetUserSetting<bool>(UserSettingConstants.GrowlEncode);
 this.GrowlAfterQueue = userSettingService.GetUserSetting<bool>(UserSettingConstants.GrowlQueue);
- this.SendFileAfterEncode = this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SendFile);
- this.SendFileTo = Path.GetFileNameWithoutExtension(this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileTo)) ?? string.Empty;
- this.SendFileToPath = this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileTo) ?? string.Empty;
- this.Arguments = this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.SendFileToArgs) ?? string.Empty;
+ this.SendFileAfterEncode = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.SendFile);
+ this.SendFileTo = Path.GetFileNameWithoutExtension(this.userSettingService.GetUserSetting<string>(UserSettingConstants.SendFileTo)) ?? string.Empty;
+ this.SendFileToPath = this.userSettingService.GetUserSetting<string>(UserSettingConstants.SendFileTo) ?? string.Empty;
+ this.Arguments = this.userSettingService.GetUserSetting<string>(UserSettingConstants.SendFileToArgs) ?? string.Empty;
+ this.UseSystemColoursForStylesForStyles = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.UseSystemColours);
+ this.ResetWhenDoneAction = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ResetWhenDoneAction);
 
 // #############################
 // Output Settings
@@ -1519,70 +1508,21 @@
 
 // Title case
 this.ChangeToTitleCase = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNameTitleCase);
+ this.RemovePunctuation = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.RemovePunctuation);
 
 // #############################
 // Picture Tab
 // #############################
 
 // VLC Path
- this.VLCPath = this.userSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path) ?? string.Empty;
+ this.VLCPath = this.userSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath) ?? string.Empty;
 
 // #############################
- // Audio and Subtitles Tab
+ // Video
 // #############################
-
- this.SelectedAvailableToMove = new BindingList<string>();
- this.SelectedLangaugesToMove = new BindingList<string>();
-
- IDictionary<string, string> langList = LanguageUtilities.MapLanguages();
- langList = (from entry in langList orderby entry.Key ascending select entry).ToDictionary(pair => pair.Key, pair => pair.Value);
-
- this.selectedLangauges.Clear();
- foreach (string selectedItem in this.userSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages))
- {
- // removing wrong keys when a new Language list comes out.
- if (langList.ContainsKey(selectedItem))
- {
- this.selectedLangauges.Add(selectedItem);
- }
- }
-
- this.preferredLanguages.Clear();
- this.availableLanguages.Clear();
- foreach (string item in langList.Keys)
- {
- this.preferredLanguages.Add(item);
-
- // In the available languages should be no "Any" and no selected language.
- if ((item != "(Any)") && (!this.userSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages).Contains(item)))
- {
- this.availableLanguages.Add(item);
- }
- }
-
- this.SelectedPreferredLangauge = this.userSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguage) ?? string.Empty;
- this.SelectedPreferredSubtitleLangauge = this.userSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguageForSubtitles) ?? string.Empty;
-
- this.AddAudioModeOptions.Clear();
- this.AddAudioModeOptions.Add("None");
- this.AddAudioModeOptions.Add("Add All Remaining Tracks");
- this.AddAudioModeOptions.Add("Add All for Selected Languages");
-
- this.AddSubtitleModeOptions.Clear();
- this.AddSubtitleModeOptions.Add("None");
- this.AddSubtitleModeOptions.Add("Add All (Where possible)");
- this.AddSubtitleModeOptions.Add("Add First");
- this.AddSubtitleModeOptions.Add("Add all for Selected Languages");
- this.AddSubtitleModeOptions.Add("Add only for Prefered Language (First)");
- this.AddSubtitleModeOptions.Add("Add all for Prefered Language");
-
- this.SelectedAddAudioMode = this.userSettingService.GetUserSetting<int>(UserSettingConstants.DubModeAudio);
- this.SelectedAddSubtitleMode = this.userSettingService.GetUserSetting<int>(UserSettingConstants.DubModeSubtitle);
-
- this.AddOnlyOneAudioTrackPerLanguage = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.AddOnlyOneAudioPerLanguage);
-
- this.AddClosedCaptions = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.UseClosedCaption);
- this.ShowAdvancedPassthruOpts = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAdvancedAudioPassthruOpts);
+ this.DisableQuickSyncDecoding = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableQuickSyncDecoding);
+ this.EnableDxvaDecoding = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableDxva);
+ this.SelectedScalingMode = this.userSettingService.GetUserSetting<VideoScaler>(UserSettingConstants.ScalingMode);
 
 // #############################
 // CLI
@@ -1595,23 +1535,23 @@
 this.priorityLevelOptions.Add("Normal");
 this.priorityLevelOptions.Add("Below Normal");
 this.priorityLevelOptions.Add("Low");
- this.SelectedPriority = userSettingService.GetUserSetting<string>(ASUserSettingConstants.ProcessPriority);
+ this.SelectedPriority = userSettingService.GetUserSetting<string>(UserSettingConstants.ProcessPriority);
 
- this.PreventSleep = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.PreventSleep);
+ this.PreventSleep = userSettingService.GetUserSetting<bool>(UserSettingConstants.PreventSleep);
 
 // Log Verbosity Level
 this.logVerbosityOptions.Clear();
 this.logVerbosityOptions.Add(0);
 this.logVerbosityOptions.Add(1);
 this.logVerbosityOptions.Add(2);
- this.SelectedVerbosity = userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity);
+ this.SelectedVerbosity = userSettingService.GetUserSetting<int>(UserSettingConstants.Verbosity);
 
 // Logs
- this.CopyLogToEncodeDirectory = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SaveLogWithVideo);
- this.CopyLogToSepcficedLocation = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.SaveLogToCopyDirectory);
+ this.CopyLogToEncodeDirectory = userSettingService.GetUserSetting<bool>(UserSettingConstants.SaveLogWithVideo);
+ this.CopyLogToSepcficedLocation = userSettingService.GetUserSetting<bool>(UserSettingConstants.SaveLogToCopyDirectory);
 
 // The saved log path
- this.LogDirectory = userSettingService.GetUserSetting<string>(ASUserSettingConstants.SaveLogCopyDirectory) ?? string.Empty;
+ this.LogDirectory = userSettingService.GetUserSetting<string>(UserSettingConstants.SaveLogCopyDirectory) ?? string.Empty;
 
 this.ClearOldOlgs = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearOldLogs);
 
@@ -1622,7 +1562,7 @@
 // Minimise to Tray
 this.MinimiseToTray = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.MainWindowMinimize);
 this.DisablePresetUpdateCheckNotification = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PresetNotification);
- this.ClearQueueOnEncodeCompleted = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.ClearCompletedFromQueue);
+ this.ClearQueueOnEncodeCompleted = userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearCompletedFromQueue);
 this.ShowAdvancedTab = userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAdvancedTab);
 
 // Set the preview count
@@ -1638,7 +1578,7 @@
 this.PreviewPicturesToScan.Add(50);
 this.PreviewPicturesToScan.Add(55);
 this.PreviewPicturesToScan.Add(60);
- this.SelectedPreviewCount = this.userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount);
+ this.SelectedPreviewCount = this.userSettingService.GetUserSetting<int>(UserSettingConstants.PreviewScanCount);
 
 // x264 step
 this.ConstantQualityGranularity.Clear();
@@ -1648,171 +1588,21 @@
 this.SelectedGranulairty = userSettingService.GetUserSetting<double>(UserSettingConstants.X264Step).ToString("0.00", CultureInfo.InvariantCulture);
 
 // Min Title Length
- this.MinLength = this.userSettingService.GetUserSetting<int>(ASUserSettingConstants.MinScanDuration);
+ this.MinLength = this.userSettingService.GetUserSetting<int>(UserSettingConstants.MinScanDuration);
 
 // Use dvdnav
- this.DisableLibdvdNav = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav);
+ this.DisableLibdvdNav = userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav);
+
+ this.EnableStaticPreview = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableStaticPreview); 
 
 int port;
 int.TryParse(userSettingService.GetUserSetting<string>(UserSettingConstants.ServerPort), out port);
 this.ServerPort = port;
 this.EnableProcessIsolation = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableProcessIsolation);
- this.EnableDebugFeatures = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableDebugFeatures);
 this.EnableLibHb = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableLibHb);
-
- // LibHbFeatures
- this.DisableLibHbFeatures = userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibHbFeatures);
- }
-
- /// <summary>
- /// Close this window.
- /// </summary>
- public void Close()
- {
- this.Save();
- this.shellViewModel.DisplayWindow(ShellWindow.MainWindow);
 }
 
 /// <summary>
- /// Browse - Send File To
- /// </summary>
- public void BrowseSendFileTo()
- {
- VistaOpenFileDialog dialog = new VistaOpenFileDialog { Filter = "All files (*.*)|*.*" };
- dialog.ShowDialog();
- this.SendFileTo = Path.GetFileNameWithoutExtension(dialog.FileName);
- this.sendFileToPath = dialog.FileName;
- }
-
- /// <summary>
- /// Browse Auto Name Path
- /// </summary>
- public void BrowseAutoNamePath()
- {
- VistaFolderBrowserDialog dialog = new VistaFolderBrowserDialog { Description = "Please select a folder.", UseDescriptionForTitle = true };
- dialog.ShowDialog();
- this.AutoNameDefaultPath = dialog.SelectedPath;
- }
-
- /// <summary>
- /// Browse VLC Path
- /// </summary>
- public void BrowseVlcPath()
- {
- VistaOpenFileDialog dialog = new VistaOpenFileDialog { Filter = "All files (*.exe)|*.exe" };
- dialog.ShowDialog();
- this.VLCPath = dialog.FileName;
- }
-
- /// <summary>
- /// Audio List Move Left
- /// </summary>
- public void LanguageMoveRight()
- {
- if (this.SelectedAvailableToMove.Count > 0)
- {
- List<string> copiedList = SelectedAvailableToMove.ToList();
- foreach (string item in copiedList)
- {
- this.AvailableLanguages.Remove(item);
- this.SelectedLangauges.Add(item);
- }
-
- this.AvailableLanguages = new BindingList<string>(this.AvailableLanguages.OrderBy(o => o).ToList());
- }
- }
-
- /// <summary>
- /// Audio List Move Right
- /// </summary>
- public void LanguageMoveLeft()
- {
- if (this.SelectedLangaugesToMove.Count > 0)
- {
- List<string> copiedList = SelectedLangaugesToMove.ToList();
- foreach (string item in copiedList)
- {
- this.SelectedLangauges.Remove(item);
- this.AvailableLanguages.Add(item);
- }
- }
-
- this.AvailableLanguages = new BindingList<string>(this.AvailableLanguages.OrderBy(o => o).ToList());
- }
-
- /// <summary>
- /// Audio List Clear all selected languages
- /// </summary>
- public void LanguageClearAll()
- {
- foreach (string item in this.SelectedLangauges)
- {
- this.AvailableLanguages.Add(item);
- }
- this.AvailableLanguages = new BindingList<string>(this.AvailableLanguages.OrderBy(o => o).ToList());
-
- this.SelectedLangauges.Clear();
- }
-
- /// <summary>
- /// Browse - Log Path
- /// </summary>
- public void BrowseLogPath()
- {
- VistaFolderBrowserDialog dialog = new VistaFolderBrowserDialog { Description = "Please select a folder.", UseDescriptionForTitle = true };
- dialog.ShowDialog();
- this.LogDirectory = dialog.SelectedPath;
- }
-
- /// <summary>
- /// View the Default Log Directory for HandBrake
- /// </summary>
- public void ViewLogDirectory()
- {
- string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
- string windir = Environment.GetEnvironmentVariable("WINDIR");
- Process prc = new Process { StartInfo = { FileName = windir + @"\explorer.exe", Arguments = logDir } };
- prc.Start();
- }
-
- /// <summary>
- /// Clear HandBrakes log directory.
- /// </summary>
- public void ClearLogHistory()
- {
- MessageBoxResult result = MessageBox.Show("Are you sure you wish to clear the log file directory?", "Clear Logs",
- MessageBoxButton.YesNoCancel, MessageBoxImage.Question);
- if (result == MessageBoxResult.Yes)
- {
- GeneralUtilities.ClearLogFiles(0);
- MessageBox.Show("HandBrake's Log file directory has been cleared!", "Notice", MessageBoxButton.OK, MessageBoxImage.Information);
- }
- }
- #endregion
-
- #region Updates
-
- /// <summary>
- /// Download an Update
- /// </summary>
- public void DownloadUpdate()
- {
- this.UpdateMessage = "Preparing for Update ...";
- this.updateService.DownloadFile(this.updateInfo.DownloadFile, this.DownloadComplete, this.DownloadProgress);
- }
-
- /// <summary>
- /// Check for updates
- /// </summary>
- public void PerformUpdateCheck()
- {
- this.UpdateMessage = "Checking for Updates ...";
- this.updateService.CheckForUpdates(this.UpdateCheckComplete);
- }
-
- #endregion
-
- /// <summary>
 /// Save the settings selected
 /// </summary>
 private void Save()
@@ -1820,12 +1610,14 @@
 /* General */
 this.userSettingService.SetUserSetting(UserSettingConstants.UpdateStatus, this.CheckForUpdates);
 this.userSettingService.SetUserSetting(UserSettingConstants.DaysBetweenUpdateCheck, this.CheckForUpdatesFrequency);
- this.userSettingService.SetUserSetting(ASUserSettingConstants.WhenCompleteAction, this.WhenDone);
+ this.userSettingService.SetUserSetting(UserSettingConstants.WhenCompleteAction, this.WhenDone);
 this.userSettingService.SetUserSetting(UserSettingConstants.GrowlQueue, this.GrowlAfterQueue);
 this.userSettingService.SetUserSetting(UserSettingConstants.GrowlEncode, this.GrowlAfterEncode);
- this.userSettingService.SetUserSetting(ASUserSettingConstants.SendFileTo, this.SendFileToPath);
- this.userSettingService.SetUserSetting(ASUserSettingConstants.SendFile, this.SendFileAfterEncode);
- this.userSettingService.SetUserSetting(ASUserSettingConstants.SendFileToArgs, this.Arguments);
+ this.userSettingService.SetUserSetting(UserSettingConstants.SendFileTo, this.SendFileToPath);
+ this.userSettingService.SetUserSetting(UserSettingConstants.SendFile, this.SendFileAfterEncode);
+ this.userSettingService.SetUserSetting(UserSettingConstants.SendFileToArgs, this.Arguments);
+ this.userSettingService.SetUserSetting(UserSettingConstants.UseSystemColours, this.UseSystemColoursForStylesForStyles);
+ this.userSettingService.SetUserSetting(UserSettingConstants.ResetWhenDoneAction, this.ResetWhenDoneAction);
 
 /* Output Files */
 this.userSettingService.SetUserSetting(UserSettingConstants.AutoNaming, this.AutomaticallyNameFiles);
@@ -1834,51 +1626,44 @@
 this.userSettingService.SetUserSetting(UserSettingConstants.UseM4v, this.SelectedMp4Extension);
 this.userSettingService.SetUserSetting(UserSettingConstants.AutoNameRemoveUnderscore, this.RemoveUnderscores);
 this.userSettingService.SetUserSetting(UserSettingConstants.AutoNameTitleCase, this.ChangeToTitleCase);
+ this.userSettingService.SetUserSetting(UserSettingConstants.RemovePunctuation, this.RemovePunctuation);
 
 /* Previews */
- this.userSettingService.SetUserSetting(UserSettingConstants.VLC_Path, this.VLCPath);
-
- /* Audio and Subtitles */
- this.userSettingService.SetUserSetting(UserSettingConstants.NativeLanguage, this.SelectedPreferredLangauge);
- this.userSettingService.SetUserSetting(UserSettingConstants.NativeLanguageForSubtitles, this.SelectedPreferredSubtitleLangauge);
- StringCollection collection = new StringCollection();
- collection.AddRange(this.SelectedLangauges.ToArray());
- this.userSettingService.SetUserSetting(UserSettingConstants.SelectedLanguages, collection);
- this.userSettingService.SetUserSetting(UserSettingConstants.AddOnlyOneAudioPerLanguage, this.AddOnlyOneAudioTrackPerLanguage);
- this.userSettingService.SetUserSetting(UserSettingConstants.UseClosedCaption, this.AddClosedCaptions);
- this.userSettingService.SetUserSetting(UserSettingConstants.DubModeAudio, this.SelectedAddAudioMode);
- this.userSettingService.SetUserSetting(UserSettingConstants.DubModeSubtitle, this.SelectedAddSubtitleMode);
- this.userSettingService.SetUserSetting(UserSettingConstants.ShowAdvancedAudioPassthruOpts, this.ShowAdvancedPassthruOpts);
+ this.userSettingService.SetUserSetting(UserSettingConstants.VLCPath, this.VLCPath);
+ 
+ /* Video */
+ this.userSettingService.SetUserSetting(UserSettingConstants.DisableQuickSyncDecoding, this.DisableQuickSyncDecoding);
+ this.userSettingService.SetUserSetting(UserSettingConstants.EnableDxva, this.EnableDxvaDecoding);
+ this.userSettingService.SetUserSetting(UserSettingConstants.ScalingMode, this.SelectedScalingMode);
 
 /* System and Logging */
- userSettingService.SetUserSetting(ASUserSettingConstants.ProcessPriority, this.SelectedPriority);
- userSettingService.SetUserSetting(ASUserSettingConstants.PreventSleep, this.PreventSleep);
- userSettingService.SetUserSetting(ASUserSettingConstants.Verbosity, this.SelectedVerbosity);
- userSettingService.SetUserSetting(ASUserSettingConstants.SaveLogWithVideo, this.CopyLogToEncodeDirectory);
- userSettingService.SetUserSetting(ASUserSettingConstants.SaveLogToCopyDirectory, this.CopyLogToSepcficedLocation);
- userSettingService.SetUserSetting(ASUserSettingConstants.SaveLogCopyDirectory, this.LogDirectory);
+ userSettingService.SetUserSetting(UserSettingConstants.ProcessPriority, this.SelectedPriority);
+ userSettingService.SetUserSetting(UserSettingConstants.PreventSleep, this.PreventSleep);
+ userSettingService.SetUserSetting(UserSettingConstants.Verbosity, this.SelectedVerbosity);
+ userSettingService.SetUserSetting(UserSettingConstants.SaveLogWithVideo, this.CopyLogToEncodeDirectory);
+ userSettingService.SetUserSetting(UserSettingConstants.SaveLogToCopyDirectory, this.CopyLogToSepcficedLocation);
+ userSettingService.SetUserSetting(UserSettingConstants.SaveLogCopyDirectory, this.LogDirectory);
 userSettingService.SetUserSetting(UserSettingConstants.ClearOldLogs, this.ClearOldOlgs);
 
 /* Advanced */
 userSettingService.SetUserSetting(UserSettingConstants.MainWindowMinimize, this.MinimiseToTray);
 userSettingService.SetUserSetting(UserSettingConstants.PresetNotification, this.DisablePresetUpdateCheckNotification);
- userSettingService.SetUserSetting(ASUserSettingConstants.ClearCompletedFromQueue, this.ClearQueueOnEncodeCompleted);
- userSettingService.SetUserSetting(ASUserSettingConstants.PreviewScanCount, this.SelectedPreviewCount);
+ userSettingService.SetUserSetting(UserSettingConstants.ClearCompletedFromQueue, this.ClearQueueOnEncodeCompleted);
+ userSettingService.SetUserSetting(UserSettingConstants.PreviewScanCount, this.SelectedPreviewCount);
 userSettingService.SetUserSetting(UserSettingConstants.X264Step, double.Parse(this.SelectedGranulairty, CultureInfo.InvariantCulture));
 userSettingService.SetUserSetting(UserSettingConstants.ShowAdvancedTab, this.ShowAdvancedTab);
- userSettingService.SetUserSetting(UserSettingConstants.ShowAdvancedTab, this.ShowAdvancedTab);
+ userSettingService.SetUserSetting(UserSettingConstants.EnableStaticPreview, this.EnableStaticPreview);
 
 int value;
 if (int.TryParse(this.MinLength.ToString(CultureInfo.InvariantCulture), out value))
 {
- this.userSettingService.SetUserSetting(ASUserSettingConstants.MinScanDuration, value);
+ this.userSettingService.SetUserSetting(UserSettingConstants.MinScanDuration, value);
 }
 
- userSettingService.SetUserSetting(ASUserSettingConstants.DisableLibDvdNav, this.DisableLibdvdNav);
+ userSettingService.SetUserSetting(UserSettingConstants.DisableLibDvdNav, this.DisableLibdvdNav);
 userSettingService.SetUserSetting(UserSettingConstants.EnableProcessIsolation, this.EnableProcessIsolation);
- userSettingService.SetUserSetting(UserSettingConstants.ServerPort, this.ServerPort.ToString());
- userSettingService.SetUserSetting(UserSettingConstants.EnableDebugFeatures, this.EnableDebugFeatures);
- userSettingService.SetUserSetting(UserSettingConstants.DisableLibHbFeatures, this.DisableLibHbFeatures);
+ userSettingService.SetUserSetting(UserSettingConstants.ServerPort, this.ServerPort.ToString(CultureInfo.InvariantCulture));
+ userSettingService.SetUserSetting(UserSettingConstants.EnableLibHb, this.EnableLibHb);
 }
 
 /// <summary>
@@ -1894,7 +1679,12 @@
 {
 this.UpdateMessage = "A New Update is Available!";
 this.UpdateAvailable = true;
- } 
+ }
+ else if (Environment.Is64BitOperatingSystem && !System.Environment.Is64BitProcess)
+ {
+ this.UpdateMessage = "Your system supports the 64bit version of HandBrake! This offers performance and stability improvements over this 32bit version.";
+ this.UpdateAvailable = true;
+ }
 else
 {
 this.UpdateMessage = "There are no new updates at this time.";
@@ -1912,6 +1702,8 @@
 {
 if (info.TotalBytes == 0 || info.BytesRead == 0)
 {
+ this.UpdateAvailable = false;
+ this.UpdateMessage = info.WasSuccessful ? "Update Downloaded" : "Update Service Unavailable. You can try downloading the update from https://handbrake.fr";
 return;
 }
 
@@ -1932,10 +1724,10 @@
 private void DownloadComplete(DownloadStatus info)
 {
 this.UpdateAvailable = false;
- this.UpdateMessage = info.WasSuccessful ? "Update Downloaded" : "Update Failed. You can try downloading the update from http://handbrake.fr";
+ this.UpdateMessage = info.WasSuccessful ? "Update Downloaded" : "Update Failed. You can try downloading the update from https://handbrake.fr";
 
 Process.Start(Path.Combine(Path.GetTempPath(), "handbrake-setup.exe"));
- Application.Current.Shutdown();
+ Execute.OnUIThread(() => Application.Current.Shutdown());
 }
 
 /// <summary>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs Changed

@@ -11,18 +11,19 @@
 {
 using System;
 using System.Collections.Generic;
- using System.Drawing;
 using System.Globalization;
 
- using Caliburn.Micro;
-
 using HandBrake.ApplicationServices.Model;
 using HandBrake.ApplicationServices.Parsing;
- using HandBrake.ApplicationServices.Services.Interfaces;
+ using HandBrake.Interop.Model;
 using HandBrake.Interop.Model.Encoding;
 
+ using HandBrakeWPF.Helpers;
+ using HandBrakeWPF.Utilities;
 using HandBrakeWPF.ViewModels.Interfaces;
 
+ using Size = System.Drawing.Size;
+
 /// <summary>
 /// The Picture Settings View Model
 /// </summary>
@@ -98,6 +99,16 @@
 /// </summary>
 private bool showKeepAr = true;
 
+ /// <summary>
+ /// The delayed previewprocessor.
+ /// </summary>
+ private DelayedActionProcessor delayedPreviewprocessor = new DelayedActionProcessor();
+
+ /// <summary>
+ /// The current title.
+ /// </summary>
+ private Title currentTitle;
+
 #endregion
 
 #region Constructors and Destructors
@@ -105,21 +116,10 @@
 /// <summary>
 /// Initializes a new instance of the <see cref="HandBrakeWPF.ViewModels.PictureSettingsViewModel"/> class.
 /// </summary>
- /// <param name="windowManager">
- /// The window manager.
- /// </param>
- /// <param name="userSettingService">
- /// The user Setting Service.
- /// </param>
- public PictureSettingsViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
+ public PictureSettingsViewModel()
 {
 this.Task = new EncodeTask();
- this.SelectedModulus = 16;
- this.MaintainAspectRatio = true;
-
- // Default the Max Width / Height to 1080p format
- this.MaxHeight = 1080;
- this.MaxWidth = 1920;
+ this.Init();
 }
 
 #endregion
@@ -127,6 +127,11 @@
 #region Properties
 
 /// <summary>
+ /// Gets or sets the static preview view model.
+ /// </summary>
+ public IStaticPreviewViewModel StaticPreviewViewModel { get; set; }
+
+ /// <summary>
 /// Gets AnamorphicModes.
 /// </summary>
 public IEnumerable<Anamorphic> AnamorphicModes
@@ -138,351 +143,314 @@
 }
 
 /// <summary>
- /// Gets or sets CropBottom.
+ /// Gets or sets DisplaySize.
 /// </summary>
- public int CropBottom
+ public string DisplaySize
 {
 get
 {
- return this.Task.Cropping.Bottom;
+ return this.displaySize;
 }
 
 set
 {
- this.Task.Cropping.Bottom = value;
- this.NotifyOfPropertyChange(() => this.CropBottom);
- this.SetDisplaySize();
+ this.displaySize = value;
+ this.NotifyOfPropertyChange(() => this.DisplaySize);
 }
 }
 
 /// <summary>
- /// Gets or sets CropLeft.
+ /// Gets or sets a value indicating whether HeightControlEnabled.
 /// </summary>
- public int CropLeft
+ public bool HeightControlEnabled
 {
 get
 {
- return this.Task.Cropping.Left;
+ return this.heightControlEnabled;
 }
 
 set
 {
- this.Task.Cropping.Left = value;
- this.NotifyOfPropertyChange(() => this.CropLeft);
- this.SetDisplaySize();
+ this.heightControlEnabled = value;
+ this.NotifyOfPropertyChange(() => this.HeightControlEnabled);
 }
 }
 
 /// <summary>
- /// Gets or sets CropRight.
+ /// Gets ModulusValues.
 /// </summary>
- public int CropRight
+ public IEnumerable<int> ModulusValues
 {
 get
 {
- return this.Task.Cropping.Right;
- }
-
- set
- {
- this.Task.Cropping.Right = value;
- this.NotifyOfPropertyChange(() => this.CropRight);
- this.SetDisplaySize();
+ return new List<int> { 16, 8, 4, 2 };
 }
 }
 
 /// <summary>
- /// Gets or sets CropTop.
+ /// Gets or sets a value indicating whether ShowCustomAnamorphicControls.
 /// </summary>
- public int CropTop
+ public bool ShowCustomAnamorphicControls
 {
 get
 {
- return this.Task.Cropping.Top;
+ return this.showCustomAnamorphicControls;
 }
 
 set
 {
- this.Task.Cropping.Top = value;
- this.NotifyOfPropertyChange(() => this.CropTop);
- this.SetDisplaySize();
+ this.showCustomAnamorphicControls = value;
+ this.NotifyOfPropertyChange(() => this.ShowCustomAnamorphicControls);
 }
 }
 
 /// <summary>
- /// Gets or sets DisplaySize.
+ /// Gets or sets SourceInfo.
 /// </summary>
- public string DisplaySize
+ public string SourceInfo
 {
 get
 {
- return this.displaySize;
+ return this.sourceInfo;
 }
 
 set
 {
- this.displaySize = value;
- this.NotifyOfPropertyChange(() => this.DisplaySize);
+ this.sourceInfo = value;
+ this.NotifyOfPropertyChange(() => this.SourceInfo);
 }
 }
 
 /// <summary>
- /// Gets or sets DisplayWidth.
+ /// Gets or sets Task.
 /// </summary>
- public int DisplayWidth
- {
- get
- {
- return this.Task.DisplayWidth.HasValue
- ? int.Parse(Math.Round(this.Task.DisplayWidth.Value, 0).ToString(CultureInfo.InvariantCulture))
- : 0;
- }
-
- set
- {
- if (!object.Equals(this.Task.DisplayWidth, value))
- {
- this.Task.DisplayWidth = value;
- this.CustomAnamorphicAdjust();
- this.NotifyOfPropertyChange(() => this.DisplayWidth);
- }
- }
- }
+ public EncodeTask Task { get; set; }
 
 /// <summary>
- /// Gets or sets Height.
+ /// Gets or sets a value indicating whether WidthControlEnabled.
 /// </summary>
- public int Height
+ public bool WidthControlEnabled
 {
 get
 {
- return this.Task.Height.HasValue ? this.Task.Height.Value : 0;
+ return this.widthControlEnabled;
 }
 
 set
 {
- if (!object.Equals(this.Task.Height, value))
- {
- this.Task.Height = value;
- this.HeightAdjust();
- this.NotifyOfPropertyChange(() => this.Height);
- }
+ this.widthControlEnabled = value;
+ this.NotifyOfPropertyChange(() => this.WidthControlEnabled);
 }
 }
 
 /// <summary>
- /// Gets or sets a value indicating whether HeightControlEnabled.
+ /// Gets or sets a value indicating whether ShowModulus.
 /// </summary>
- public bool HeightControlEnabled
+ public bool ShowModulus
 {
 get
 {
- return this.heightControlEnabled;
+ return this.showModulus;
 }
-
 set
 {
- this.heightControlEnabled = value;
- this.NotifyOfPropertyChange(() => this.HeightControlEnabled);
+ this.showModulus = value;
+ this.NotifyOfPropertyChange(() => this.ShowModulus);
 }
 }
 
 /// <summary>
- /// Gets or sets a value indicating whether IsCustomCrop.
+ /// Gets or sets a value indicating whether ShowDisplaySize.
 /// </summary>
- public bool IsCustomCrop
+ public bool ShowDisplaySize
 {
 get
 {
- return this.Task.HasCropping;
+ return this.showDisplaySize;
 }
-
 set
 {
- this.Task.HasCropping = value;
- this.NotifyOfPropertyChange(() => this.IsCustomCrop);
+ this.showDisplaySize = value;
+ this.NotifyOfPropertyChange(() => this.ShowDisplaySize);
 }
 }
 
 /// <summary>
- /// Gets or sets a value indicating whether MaintainAspectRatio.
+ /// Gets or sets MaxHeight.
 /// </summary>
- public bool MaintainAspectRatio
+ public int MaxHeight
 {
 get
 {
- return this.Task.KeepDisplayAspect;
+ return this.maxHeight;
 }
-
 set
 {
- this.Task.KeepDisplayAspect = value;
- this.WidthAdjust();
- this.NotifyOfPropertyChange(() => this.MaintainAspectRatio);
+ this.maxHeight = value;
+ this.NotifyOfPropertyChange(() => this.MaxHeight);
 }
 }
 
 /// <summary>
- /// Gets ModulusValues.
+ /// Gets or sets MinHeight.
 /// </summary>
- public IEnumerable<int> ModulusValues
+ public int MaxWidth
 {
 get
 {
- return new List<int> { 16, 8, 4, 2 };
+ return this.maxWidth;
+ }
+ set
+ {
+ this.maxWidth = value;
+ this.NotifyOfPropertyChange(() => this.MaxWidth);
 }
 }
 
 /// <summary>
- /// Gets or sets ParHeight.
+ /// Gets or sets a value indicating whether show keep ar.
 /// </summary>
- public int ParHeight
+ public bool ShowKeepAR
 {
 get
 {
- return this.Task.PixelAspectY;
+ return this.showKeepAr;
 }
-
 set
 {
- if (!object.Equals(this.Task.PixelAspectY, value))
- {
- this.Task.PixelAspectY = value;
- this.CustomAnamorphicAdjust();
- this.NotifyOfPropertyChange(() => this.ParHeight);
- }
+ this.showKeepAr = value;
+ this.NotifyOfPropertyChange(() => this.ShowKeepAR);
 }
 }
 
 /// <summary>
- /// Gets or sets ParWidth.
+ /// Gets a value indicating whether is picture preview enabled.
 /// </summary>
- public int ParWidth
+ public bool IsPicturePreviewEnabled
 {
 get
 {
- return this.Task.PixelAspectX;
- }
-
- set
- {
- if (!object.Equals(this.Task.PixelAspectX, value))
- {
- this.Task.PixelAspectX = value;
- this.CustomAnamorphicAdjust();
- this.NotifyOfPropertyChange(() => this.ParWidth);
- }
+ return this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.EnableStaticPreview);
 }
 }
 
+ #endregion
+
+ #region Task Properties
+
 /// <summary>
- /// Gets or sets SelectedAnamorphicMode.
+ /// Gets or sets CropBottom.
 /// </summary>
- public Anamorphic SelectedAnamorphicMode
+ public int CropBottom
 {
 get
 {
- return this.Task.Anamorphic;
+ return this.Task.Cropping.Bottom;
 }
 
 set
 {
- this.Task.Anamorphic = value;
- this.AnamorphicAdjust();
- this.NotifyOfPropertyChange(() => this.SelectedAnamorphicMode);
+ this.Task.Cropping.Bottom = value;
+ this.NotifyOfPropertyChange(() => this.CropBottom);
+ this.RecaulcatePictureSettingsProperties(ChangedPictureField.Crop);
 }
 }
 
 /// <summary>
- /// Gets or sets SelectedModulus.
+ /// Gets or sets CropLeft.
 /// </summary>
- public int? SelectedModulus
+ public int CropLeft
 {
 get
 {
- return this.Task.Modulus;
+ return this.Task.Cropping.Left;
 }
 
 set
 {
- this.Task.Modulus = value;
- this.ModulusAdjust();
- this.NotifyOfPropertyChange(() => this.SelectedModulus);
+ this.Task.Cropping.Left = value;
+ this.NotifyOfPropertyChange(() => this.CropLeft);
+ this.RecaulcatePictureSettingsProperties(ChangedPictureField.Crop);
 }
 }
 
 /// <summary>
- /// Gets or sets a value indicating whether ShowCustomAnamorphicControls.
+ /// Gets or sets CropRight.
 /// </summary>
- public bool ShowCustomAnamorphicControls
+ public int CropRight
 {
 get
 {
- return this.showCustomAnamorphicControls;
+ return this.Task.Cropping.Right;
 }
 
 set
 {
- this.showCustomAnamorphicControls = value;
- this.NotifyOfPropertyChange(() => this.ShowCustomAnamorphicControls);
+ this.Task.Cropping.Right = value;
+ this.NotifyOfPropertyChange(() => this.CropRight);
+ this.RecaulcatePictureSettingsProperties(ChangedPictureField.Crop);
 }
 }
 
 /// <summary>
- /// Gets or sets a value indicating whether ShowModulus.
+ /// Gets or sets CropTop.
 /// </summary>
- public bool ShowModulus
+ public int CropTop
 {
 get
 {
- return this.showModulus;
+ return this.Task.Cropping.Top;
 }
+
 set
 {
- this.showModulus = value;
- this.NotifyOfPropertyChange(() => this.ShowModulus);
+ this.Task.Cropping.Top = value;
+ this.NotifyOfPropertyChange(() => this.CropTop);
+ this.RecaulcatePictureSettingsProperties(ChangedPictureField.Crop);
 }
 }
 
 /// <summary>
- /// Gets or sets a value indicating whether ShowDisplaySize.
+ /// Gets or sets a value indicating whether IsCustomCrop.
 /// </summary>
- public bool ShowDisplaySize
+ public bool IsCustomCrop
 {
 get
 {
- return this.showDisplaySize;
+ return this.Task.HasCropping;
 }
+
 set
 {
- this.showDisplaySize = value;
- this.NotifyOfPropertyChange(() => this.ShowDisplaySize);
+ this.Task.HasCropping = value;
+ this.NotifyOfPropertyChange(() => this.IsCustomCrop);
 }
 }
 
 /// <summary>
- /// Gets or sets SourceInfo.
+ /// Gets or sets DisplayWidth.
 /// </summary>
- public string SourceInfo
+ public int DisplayWidth
 {
 get
 {
- return this.sourceInfo;
+ return this.Task.DisplayWidth.HasValue
+ ? int.Parse(Math.Round(this.Task.DisplayWidth.Value, 0).ToString(CultureInfo.InvariantCulture))
+ : 0;
 }
 
 set
 {
- this.sourceInfo = value;
- this.NotifyOfPropertyChange(() => this.SourceInfo);
+ if (!object.Equals(this.Task.DisplayWidth, value))
+ {
+ this.Task.DisplayWidth = value;
+ this.NotifyOfPropertyChange(() => this.DisplayWidth);
+ this.RecaulcatePictureSettingsProperties(ChangedPictureField.DisplayWidth);
+ }
 }
 }
 
 /// <summary>
- /// Gets or sets Task.
- /// </summary>
- public EncodeTask Task { get; set; }
-
- /// <summary>
 /// Gets or sets Width.
 /// </summary>
 public int Width
@@ -497,96 +465,135 @@
 if (!object.Equals(this.Task.Width, value))
 {
 this.Task.Width = value;
- this.WidthAdjust();
 this.NotifyOfPropertyChange(() => this.Width);
+ this.RecaulcatePictureSettingsProperties(ChangedPictureField.Width);
 }
 }
 }
 
 /// <summary>
- /// Gets or sets a value indicating whether WidthControlEnabled.
+ /// Gets or sets Height.
 /// </summary>
- public bool WidthControlEnabled
+ public int Height
 {
 get
 {
- return this.widthControlEnabled;
+ return this.Task.Height.HasValue ? this.Task.Height.Value : 0;
 }
 
 set
 {
- this.widthControlEnabled = value;
- this.NotifyOfPropertyChange(() => this.WidthControlEnabled);
- }
- }
+ if (!object.Equals(this.Task.Height, value))
+ {
+ this.Task.Height = value;
+ this.NotifyOfPropertyChange(() => this.Height);
+ this.RecaulcatePictureSettingsProperties(ChangedPictureField.Height);
+ }
+ }
+ }
 
 /// <summary>
- /// Gets or sets MaxHeight.
+ /// Gets or sets a value indicating whether MaintainAspectRatio.
 /// </summary>
- public int MaxHeight
+ public bool MaintainAspectRatio
 {
 get
 {
- return this.maxHeight;
+ return this.Task.KeepDisplayAspect;
 }
+
 set
 {
- this.maxHeight = value;
- this.NotifyOfPropertyChange(() => this.MaxHeight);
+ this.Task.KeepDisplayAspect = value;
+ this.NotifyOfPropertyChange(() => this.MaintainAspectRatio);
+ this.RecaulcatePictureSettingsProperties(ChangedPictureField.MaintainAspectRatio);
 }
 }
 
 /// <summary>
- /// Gets or sets MinHeight.
+ /// Gets or sets ParHeight.
 /// </summary>
- public int MaxWidth
+ public int ParHeight
 {
 get
 {
- return this.maxWidth;
+ return this.Task.PixelAspectY;
 }
+
 set
 {
- this.maxWidth = value;
- this.NotifyOfPropertyChange(() => this.MaxWidth);
+ if (!object.Equals(this.Task.PixelAspectY, value))
+ {
+ this.Task.PixelAspectY = value;
+ this.NotifyOfPropertyChange(() => this.ParHeight);
+ this.RecaulcatePictureSettingsProperties(ChangedPictureField.ParH);
+ }
 }
 }
 
 /// <summary>
- /// Gets SourceAspect.
+ /// Gets or sets ParWidth.
 /// </summary>
- private Size SourceAspect
+ public int ParWidth
 {
 get
 {
- // display aspect = (width * par_width) / (height * par_height)
- return new Size(
- (this.sourceParValues.Width * this.sourceResolution.Width),
- (this.sourceParValues.Height * this.sourceResolution.Height));
+ return this.Task.PixelAspectX;
+ }
+
+ set
+ {
+ if (!object.Equals(this.Task.PixelAspectX, value))
+ {
+ this.Task.PixelAspectX = value;
+ this.NotifyOfPropertyChange(() => this.ParWidth);
+ this.RecaulcatePictureSettingsProperties(ChangedPictureField.ParW);
+ }
 }
 }
 
 /// <summary>
- /// Gets or sets a value indicating whether show keep ar.
+ /// Gets or sets SelectedAnamorphicMode.
 /// </summary>
- public bool ShowKeepAR
+ public Anamorphic SelectedAnamorphicMode
 {
 get
 {
- return this.showKeepAr;
+ return this.Task.Anamorphic;
 }
+
 set
 {
- this.showKeepAr = value;
- this.NotifyOfPropertyChange(() => this.ShowKeepAR);
+ if (!object.Equals(this.SelectedAnamorphicMode, value))
+ {
+ this.Task.Anamorphic = value;
+ this.NotifyOfPropertyChange(() => this.SelectedAnamorphicMode);
+ this.RecaulcatePictureSettingsProperties(ChangedPictureField.Anamorphic);
+ }
 }
 }
 
- #endregion
+ /// <summary>
+ /// Gets or sets SelectedModulus.
+ /// </summary>
+ public int? SelectedModulus
+ {
+ get
+ {
+ return this.Task.Modulus;
+ }
+
+ set
+ {
+ this.Task.Modulus = value;
+ this.NotifyOfPropertyChange(() => this.SelectedModulus);
+ this.RecaulcatePictureSettingsProperties(ChangedPictureField.Modulus);
+ }
+ }
 
- #region Implemented Interfaces
+ #endregion
 
- #region ITabInterface
+ #region Public Methods
 
 /// <summary>
 /// Setup this tab for the specified preset.
@@ -601,59 +608,63 @@
 {
 this.Task = task;
 
- // TODO: These all need to be handled correctly.
- this.SelectedAnamorphicMode = preset.Task.Anamorphic;
-
- // Set the limits on the UI Controls.
- this.MaxWidth = preset.Task.MaxWidth ?? this.sourceResolution.Width;
- this.MaxHeight = preset.Task.MaxHeight ?? this.sourceResolution.Height;
- this.Task.MaxWidth = preset.Task.MaxWidth;
- this.Task.MaxHeight = preset.Task.MaxHeight;
-
- // Setup the Width
- if (preset.Task.MaxWidth.HasValue)
+ // Handle built-in presets.
+ if (preset.IsBuildIn)
 {
- if (this.Width > preset.Task.MaxWidth)
- {
- // Limit the Width to the Max Width
- this.Width = preset.Task.MaxWidth.Value; 
- }
- else
- {
- // Figure out the best width based on the preset and source
- this.Width = preset.Task.Width ?? this.GetModulusValue(this.getRes((this.sourceResolution.Width - this.CropLeft - this.CropRight), preset.Task.MaxWidth.Value));
- }
+ preset.PictureSettingsMode = PresetPictureSettingsMode.Custom;
 }
- else
+
+ // Setup the Picture Sizes
+ switch (preset.PictureSettingsMode)
 {
- this.Width = preset.Task.Width ?? this.GetModulusValue((this.sourceResolution.Width - this.CropLeft - this.CropRight));
- }
+ default:
+ case PresetPictureSettingsMode.Custom:
+ case PresetPictureSettingsMode.SourceMaximum:
 
- // Set the Maintain Aspect ratio. This will calculate Height for us now.
- this.MaintainAspectRatio = preset.Task.Anamorphic == Anamorphic.None || preset.Task.KeepDisplayAspect;
+ // Anamorphic Mode
+ this.SelectedAnamorphicMode = preset.Task.Anamorphic;
 
- // Set Height, but only if necessary.
- if (preset.Task.MaxHeight.HasValue)
- {
- if (this.Height > preset.Task.MaxHeight)
- {
- // Limit the Height to the Max Height of the preset. Setting this will recalculate the width.
- this.Height = preset.Task.MaxHeight.Value;
- }
- else
- {
- // Only calculate height if Maintain Aspect ratio is off.
- if (!this.MaintainAspectRatio)
+ // Modulus
+ if (preset.Task.Modulus.HasValue)
 {
- this.Height = preset.Task.Height ??
- this.getRes(
- (this.sourceResolution.Height - this.CropTop - this.CropBottom),
- preset.Task.MaxHeight.Value);
+ this.SelectedModulus = preset.Task.Modulus;
 }
- }
+
+ // Set the Maintain Aspect ratio.
+ this.MaintainAspectRatio = preset.Task.KeepDisplayAspect;
+
+ // Set the Maximum so libhb can correctly manage the size.
+ if (preset.PictureSettingsMode == PresetPictureSettingsMode.SourceMaximum)
+ {
+ this.MaxWidth = this.sourceResolution.Width;
+ this.MaxHeight = this.sourceResolution.Height;
+ }
+ else
+ {
+ this.MaxWidth = preset.Task.MaxWidth ?? this.sourceResolution.Width;
+ this.MaxHeight = preset.Task.MaxHeight ?? this.sourceResolution.Height; 
+ } 
+
+ // Set the width, then check the height doesn't breach the max height and correct if necessary.
+ int width = this.GetModulusValue(this.GetRes((this.sourceResolution.Width - this.CropLeft - this.CropRight), preset.Task.MaxWidth)); 
+ this.Width = width;
+
+ // If we have a max height, make sure we havn't breached it.
+ int height = this.GetModulusValue(this.GetRes((this.sourceResolution.Height - this.CropTop - this.CropBottom), preset.Task.MaxHeight));
+ if (preset.Task.MaxHeight.HasValue && this.Height > preset.Task.MaxHeight.Value)
+ {
+ this.Height = height;
+ }
+ break;
+ case PresetPictureSettingsMode.None:
+ // Do Nothing except reset the Max Width/Height
+ this.MaxWidth = this.sourceResolution.Width;
+ this.MaxHeight = this.sourceResolution.Height;
+ this.SelectedAnamorphicMode = preset.Task.Anamorphic;
+ break;
 }
 
- // Anamorphic
+ // Custom Anamorphic
 if (preset.Task.Anamorphic == Anamorphic.Custom)
 {
 this.DisplayWidth = preset.Task.DisplayWidth != null ? int.Parse(preset.Task.DisplayWidth.ToString()) : 0;
@@ -661,12 +672,6 @@
 this.ParHeight = preset.Task.PixelAspectY;
 }
 
- // Modulus
- if (preset.Task.Modulus.HasValue)
- {
- this.SelectedModulus = preset.Task.Modulus;
- }
-
 // Cropping
 if (preset.Task.HasCropping)
 {
@@ -682,6 +687,8 @@
 }
 
 this.NotifyOfPropertyChange(() => this.Task);
+
+ this.UpdateVisibileControls();
 }
 
 /// <summary>
@@ -713,6 +720,7 @@
 /// </param>
 public void SetSource(Title title, Preset preset, EncodeTask task)
 {
+ this.currentTitle = title;
 this.Task = task;
 
 if (title != null)
@@ -721,88 +729,268 @@
 this.sourceParValues = title.ParVal;
 this.sourceResolution = title.Resolution;
 
- // Set the Max Width / Height available to the user controls
- if (this.sourceResolution.Width < this.MaxWidth)
+ // Update the cropping values, preffering those in the presets.
+ if (!preset.Task.HasCropping)
 {
- this.MaxWidth = this.sourceResolution.Width;
+ this.Task.Cropping.Top = title.AutoCropDimensions.Top;
+ this.Task.Cropping.Bottom = title.AutoCropDimensions.Bottom;
+ this.Task.Cropping.Left = title.AutoCropDimensions.Left;
+ this.Task.Cropping.Right = title.AutoCropDimensions.Right;
+ this.IsCustomCrop = false;
 }
- else if (this.sourceResolution.Width > this.MaxWidth)
+ else
 {
- this.MaxWidth = preset.Task.MaxWidth ?? this.sourceResolution.Width;
+ this.Task.Cropping.Left = preset.Task.Cropping.Left;
+ this.Task.Cropping.Right = preset.Task.Cropping.Right;
+ this.Task.Cropping.Top = preset.Task.Cropping.Top;
+ this.Task.Cropping.Bottom = preset.Task.Cropping.Bottom;
+ this.IsCustomCrop = true;
 }
 
- if (this.sourceResolution.Height < this.MaxHeight)
+ if (preset.PictureSettingsMode == PresetPictureSettingsMode.None)
 {
- this.MaxHeight = this.sourceResolution.Height;
+ // We have no instructions, so simply set it to the source.
+ this.Task.Width = this.GetModulusValue(this.sourceResolution.Width - this.CropLeft - this.CropRight);
+ this.MaintainAspectRatio = true;
 }
- else if (this.sourceResolution.Height > this.MaxHeight)
+ else
 {
- this.MaxHeight = preset.Task.MaxHeight ?? this.sourceResolution.Height;
+ // Set the Max Width / Height available to the user controls
+ if (this.sourceResolution.Width < this.MaxWidth)
+ {
+ this.MaxWidth = this.sourceResolution.Width;
+ }
+ else if (this.sourceResolution.Width > this.MaxWidth)
+ {
+ this.MaxWidth = preset.Task.MaxWidth ?? this.sourceResolution.Width;
+ }
+
+ if (this.sourceResolution.Height < this.MaxHeight)
+ {
+ this.MaxHeight = this.sourceResolution.Height;
+ }
+ else if (this.sourceResolution.Height > this.MaxHeight)
+ {
+ this.MaxHeight = preset.Task.MaxHeight ?? this.sourceResolution.Height;
+ }
+
+ // Set the Width, and Maintain Aspect ratio. That should calc the Height for us.
+ if (this.SelectedAnamorphicMode == Anamorphic.None)
+ {
+ this.Task.Width = preset.Task.Width ?? (this.MaxWidth - this.CropLeft - this.CropRight);
+ // Note: This will be auto-corrected in the property if it's too large.
+ }
+ else
+ {
+ this.Task.Width = preset.Task.Width ?? this.MaxWidth;
+ }
+
+ // If our height is too large, let it downscale the width for us by setting the height to the lower value.
+ if (!this.MaintainAspectRatio && this.Height > this.MaxHeight)
+ {
+ this.Task.Height = this.MaxHeight;
+ }
 }
 
 // Set Screen Controls
 this.SourceInfo = string.Format(
- "{0}x{1}, Aspect Ratio: {2:0.00}",
+ "{0}x{1}, Aspect Ratio: {2:0.00}, PAR: {3}/{4}",
 title.Resolution.Width,
 title.Resolution.Height,
- title.AspectRatio);
+ title.AspectRatio,
+ title.ParVal.Width,
+ title.ParVal.Height);
 
- if (!preset.Task.HasCropping)
- {
- this.CropTop = title.AutoCropDimensions.Top;
- this.CropBottom = title.AutoCropDimensions.Bottom;
- this.CropLeft = title.AutoCropDimensions.Left;
- this.CropRight = title.AutoCropDimensions.Right;
- this.IsCustomCrop = false;
- }
- else
- {
- this.CropLeft = preset.Task.Cropping.Left;
- this.CropRight = preset.Task.Cropping.Right;
- this.CropTop = preset.Task.Cropping.Top;
- this.CropBottom = preset.Task.Cropping.Bottom;
- this.IsCustomCrop = true;
- }
-
- // Set the Width, and Maintain Aspect ratio. That should calc the Height for us.
- this.Width = this.MaxWidth;
- this.MaintainAspectRatio = true;
-
- // If our height is too large, let it downscale the width for us by setting the height to the lower value.
- if (this.Height > this.MaxHeight)
- {
- this.Height = this.MaxHeight;
- }
- 
- if (this.SelectedAnamorphicMode == Anamorphic.Custom)
- {
- this.AnamorphicAdjust(); // Refresh the values
- }
+ this.RecaulcatePictureSettingsProperties(ChangedPictureField.Width);
 }
 
 this.NotifyOfPropertyChange(() => this.Task);
 }
 
- #endregion
+ /// <summary>
+ /// The preview image.
+ /// Experimental Feature => In-Progress
+ /// </summary>
+ public void PreviewImage()
+ {
+ if (!string.IsNullOrEmpty(this.Task.Source))
+ {
+ this.StaticPreviewViewModel.IsOpen = true;
+ this.StaticPreviewViewModel.UpdatePreviewFrame(this.Task);
+ this.WindowManager.ShowWindow(this.StaticPreviewViewModel);
+ }
+ }
 
 #endregion
 
 #region Methods
 
 /// <summary>
- /// Adjust other values after the user has altered the anamorphic.
+ /// The init.
+ /// </summary>
+ private void Init()
+ {
+ this.Task.Modulus = 16;
+ this.Task.KeepDisplayAspect = true;
+
+ this.NotifyOfPropertyChange(() => this.SelectedModulus);
+ this.NotifyOfPropertyChange(() => this.MaintainAspectRatio);
+
+ // Default the Max Width / Height to 1080p format
+ this.MaxHeight = 1080;
+ this.MaxWidth = 1920;
+ }
+
+ /// <summary>
+ /// The get picture title info.
+ /// </summary>
+ /// <returns>
+ /// The <see cref="PictureSize.PictureSettingsTitle"/>.
+ /// </returns>
+ private PictureSize.PictureSettingsTitle GetPictureTitleInfo()
+ {
+ PictureSize.PictureSettingsTitle title = new PictureSize.PictureSettingsTitle
+ {
+ Width = this.sourceResolution.Width,
+ Height = this.sourceResolution.Height,
+ ParW = this.sourceParValues.Width,
+ ParH = this.sourceParValues.Height,
+ Aspect = 0 // TODO
+ };
+
+ return title;
+ }
+
+ /// <summary>
+ /// The get picture settings.
 /// </summary>
- private void AnamorphicAdjust()
+ /// <returns>
+ /// The <see cref="PictureSize.PictureSettingsJob"/>.
+ /// </returns>
+ private PictureSize.PictureSettingsJob GetPictureSettings()
 {
+ PictureSize.PictureSettingsJob job = new PictureSize.PictureSettingsJob
+ {
+ Width = this.Width,
+ Height = this.Height,
+ ItuPar = false,
+ Modulus = this.SelectedModulus,
+ ParW = this.ParWidth,
+ ParH = this.ParHeight,
+ MaxWidth = this.MaxWidth,
+ MaxHeight = this.MaxHeight,
+ KeepDisplayAspect = this.MaintainAspectRatio,
+ AnamorphicMode = this.SelectedAnamorphicMode,
+ DarWidth = 0,
+ DarHeight = 0,
+ Crop = new Cropping(this.CropTop, this.CropBottom, this.CropLeft, this.CropRight),
+ };
+
+ if (this.SelectedAnamorphicMode == Anamorphic.Loose)
+ {
+ job.ParW = sourceParValues.Width;
+ job.ParH = sourceParValues.Height;
+ }
+
+ return job;
+ }
+
+ /// <summary>
+ /// Recalculate the picture settings when the user changes a particular field defined in the ChangedPictureField enum.
+ /// The properties in this class are dumb. They simply call this method if there is a change.
+ /// It is the job of this method to update all affected private fields and raise change notifications. 
+ /// </summary>
+ /// <param name="changedField">
+ /// The changed field.
+ /// </param>
+ private void RecaulcatePictureSettingsProperties(ChangedPictureField changedField)
+ {
+ // Sanity Check
+ if (this.currentTitle == null)
+ {
+ return;
+ }
+
+ // Step 1, Update what controls are visibile.
+ this.UpdateVisibileControls();
+
+ // Step 2, Set sensible defaults
+ if (changedField == ChangedPictureField.Anamorphic && (this.SelectedAnamorphicMode == Anamorphic.None || this.SelectedAnamorphicMode == Anamorphic.Loose))
+ {
+ this.Task.Width = this.sourceResolution.Width > this.MaxWidth
+ ? this.MaxWidth
+ : this.sourceResolution.Width;
+ this.Task.KeepDisplayAspect = true;
+ }
+
+ // Choose which setting to keep.
+ PictureSize.KeepSetting setting = PictureSize.KeepSetting.HB_KEEP_WIDTH;
+ switch (changedField)
+ {
+ case ChangedPictureField.Width:
+ setting = PictureSize.KeepSetting.HB_KEEP_WIDTH;
+ break;
+ case ChangedPictureField.Height:
+ setting = PictureSize.KeepSetting.HB_KEEP_HEIGHT;
+ break;
+ }
+
+ // Step 2, For the changed field, call hb_set_anamorphic_size and process the results.
+ PictureSize.AnamorphicResult result = PictureSize.hb_set_anamorphic_size2(this.GetPictureSettings(), this.GetPictureTitleInfo(), setting);
+
+ switch (this.SelectedAnamorphicMode)
+ {
+ case Anamorphic.None:
+ this.Task.Width = result.OutputWidth;
+ this.Task.Height = result.OutputHeight;
+ break;
+ case Anamorphic.Strict:
+ this.Task.Width = 0;
+ this.Task.Height = 0;
+ break;
+ case Anamorphic.Loose:
+ this.Task.Width = result.OutputWidth;
+ this.Task.Height = 0;
+ break;
+ case Anamorphic.Custom:
+ this.Task.Width = result.OutputWidth;
+ this.Task.Height = result.OutputHeight;
+ break;
+ }
+
+ // Step 3, Set the display width label to indicate the output.
+ double dispWidth = Math.Round((result.OutputWidth * result.OutputParWidth / result.OutputParHeight), 0);
 this.DisplaySize = this.sourceResolution.IsEmpty
- ? "No Title Selected"
- : string.Format(
- "{0}x{1}",
- this.CalculateAnamorphicSizes().Width,
- this.CalculateAnamorphicSizes().Height);
+ ? string.Empty
+ : string.Format("Storage: {0}x{1}, Display: {2}x{3}", result.OutputWidth, result.OutputHeight, dispWidth, result.OutputHeight);
+
+ // Step 4, Force an update on all the UI elements.
+ this.NotifyOfPropertyChange(() => this.Width);
+ this.NotifyOfPropertyChange(() => this.Height);
+ this.NotifyOfPropertyChange(() => this.ParWidth);
+ this.NotifyOfPropertyChange(() => this.ParHeight);
+ this.NotifyOfPropertyChange(() => this.CropTop);
+ this.NotifyOfPropertyChange(() => this.CropBottom);
+ this.NotifyOfPropertyChange(() => this.CropLeft);
+ this.NotifyOfPropertyChange(() => this.CropRight);
+ this.NotifyOfPropertyChange(() => this.SelectedModulus);
+ this.NotifyOfPropertyChange(() => this.MaintainAspectRatio);
+
+ // Step 5, Update the Preview
+ if (delayedPreviewprocessor != null && this.Task != null && this.StaticPreviewViewModel != null && this.StaticPreviewViewModel.IsOpen)
+ {
+ delayedPreviewprocessor.PerformTask(() => this.StaticPreviewViewModel.UpdatePreviewFrame(this.Task), 800);
+ }
+ }
 
+ /// <summary>
+ /// The update visibile controls.
+ /// </summary>
+ private void UpdateVisibileControls()
+ {
 this.ShowDisplaySize = true;
 this.ShowKeepAR = true;
+
 switch (this.SelectedAnamorphicMode)
 {
 case Anamorphic.None:
@@ -810,23 +998,15 @@
 this.HeightControlEnabled = true;
 this.ShowCustomAnamorphicControls = false;
 this.ShowModulus = true;
- this.ShowDisplaySize = false;
+ this.ShowDisplaySize = true;
 this.ShowKeepAR = true;
- this.SelectedModulus = 16; // Reset
- this.Width = this.sourceResolution.Width;
- this.SetDisplaySize();
 break;
 case Anamorphic.Strict:
 this.WidthControlEnabled = false;
 this.HeightControlEnabled = false;
 this.ShowCustomAnamorphicControls = false;
 this.ShowModulus = false;
- this.SelectedModulus = 16; // Reset
 this.ShowKeepAR = false;
-
- this.Width = 0;
- this.Height = 0;
- this.SetDisplaySize();
 break;
 
 case Anamorphic.Loose:
@@ -834,157 +1014,21 @@
 this.HeightControlEnabled = false;
 this.ShowCustomAnamorphicControls = false;
 this.ShowModulus = true;
- this.Width = this.sourceResolution.Width;
- this.Height = 0;
 this.ShowKeepAR = false;
-
- this.SetDisplaySize();
 break;
 
 case Anamorphic.Custom:
 this.WidthControlEnabled = true;
 this.HeightControlEnabled = true;
 this.ShowCustomAnamorphicControls = true;
- this.MaintainAspectRatio = false; // TODO Fix when implementing custom
 this.ShowModulus = true;
- this.ShowDisplaySize = false; // Disabled for Custom until we implement it properly. TODO
+ this.ShowDisplaySize = false;
 this.ShowKeepAR = false;
-
- // Ignore any of the users current settings and reset to source to make things easier.
- this.Width = this.sourceResolution.Width;
- this.Height = this.sourceResolution.Height - this.CropTop - this.CropBottom;
-
- // Set the Display Width and set the Par X/Y to the source values initially. 
- this.ParWidth = this.sourceParValues.Width;
- this.ParHeight = this.sourceParValues.Height;
- if (this.ParHeight != 0)
- {
- this.DisplayWidth = (this.Width * this.ParWidth / this.ParHeight);
- }
-
- //this.SetDisplaySize();
 break;
 }
 }
 
 /// <summary>
- /// Calculate the Anamorphic Resolution for the selected title.
- /// </summary>
- /// <returns>
- /// A Size With Width/Height for this title.
- /// </returns>
- private Size CalculateAnamorphicSizes()
- {
- if (this.sourceResolution.IsEmpty)
- {
- return new Size(0, 0);
- }
-
- /* Set up some variables to make the math easier to follow. */
- int croppedWidth = this.sourceResolution.Width - this.CropLeft - this.CropRight;
- int croppedHeight = this.sourceResolution.Height - this.CropTop - this.CropBottom;
- double storageAspect = (double)croppedWidth / croppedHeight;
-
- /* Figure out what width the source would display at. */
- double sourceDisplayWidth = (double)croppedWidth * this.sourceParValues.Width / this.sourceParValues.Height;
-
- /*
- 3 different ways of deciding output dimensions:
- - 1: Strict anamorphic, preserve source dimensions
- - 2: Loose anamorphic, round to mod16 and preserve storage aspect ratio
- - 3: Power user anamorphic, specify everything
- */
- double calcHeight;
- switch (this.SelectedAnamorphicMode)
- {
- default:
- case Anamorphic.Strict:
-
- /* Strict anamorphic */
- double dispWidth = ((double)croppedWidth * this.sourceParValues.Width / this.sourceParValues.Height);
- dispWidth = Math.Round(dispWidth, 0);
- Size output = new Size((int)dispWidth, croppedHeight);
- return output;
-
- case Anamorphic.Loose:
-
- /* "Loose" anamorphic.
- - Uses mod16-compliant dimensions,
- - Allows users to set the width
- */
- double calcWidth = this.GetModulusValue(this.Width);
- calcHeight = (calcWidth / storageAspect) + 0.5;
- calcHeight = this.GetModulusValue(calcHeight); /* Time to get picture height that divide cleanly.*/
-
- /* The film AR is the source's display width / cropped source height.
- The output display width is the output height * film AR.
- The output PAR is the output display width / output storage width. */
- double pixelAspectWidth = calcHeight * sourceDisplayWidth / croppedHeight;
- double pixelAspectHeight = calcWidth;
-
- double disWidthLoose = (calcWidth * pixelAspectWidth / pixelAspectHeight);
- if (double.IsNaN(disWidthLoose))
- {
- disWidthLoose = 0;
- }
-
- return new Size((int)disWidthLoose, (int)calcHeight);
-
- case Anamorphic.Custom:
- // Get the User Interface Values
- double uIdisplayWidth;
- double.TryParse(this.DisplayWidth.ToString(CultureInfo.InvariantCulture), NumberStyles.Any, CultureInfo.InvariantCulture, out uIdisplayWidth);
-
- /* Anamorphic 3: Power User Jamboree - Set everything based on specified values */
- calcHeight = this.GetModulusValue(this.Height);
-
- if (this.MaintainAspectRatio)
- {
- return new Size((int)Math.Truncate(uIdisplayWidth), (int)calcHeight);
- }
-
- return new Size((int)Math.Truncate(uIdisplayWidth), (int)calcHeight);
- }
- }
-
- /// <summary>
- /// Correct the new value so that the result of the modulus of that value is 0
- /// </summary>
- /// <param name="oldValue">
- /// The old value.
- /// </param>
- /// <param name="newValue">
- /// The new value.
- /// </param>
- /// <returns>
- /// The Value corrected so that for a given modulus the result is 0
- /// </returns>
- private int CorrectForModulus(int oldValue, int newValue)
- {
- int remainder = newValue % 2;
- if (remainder == 0)
- {
- return newValue;
- }
-
- return newValue > oldValue ? newValue + remainder : newValue - remainder;
- }
-
- /// <summary>
- /// Adjust other values after the user has altered one of the custom anamorphic settings
- /// </summary>
- private void CustomAnamorphicAdjust()
- {
- if (this.MaintainAspectRatio && this.DisplayWidth != 0)
- {
- this.ParWidth = this.DisplayWidth;
- this.ParHeight = this.Width;
- }
-
- this.SetDisplaySize();
- }
-
- /// <summary>
 /// For a given value, correct so that it matches the users currently selected modulus value
 /// </summary>
 /// <param name="value">
@@ -1015,127 +1059,8 @@
 }
 
 /// <summary>
- /// Adjust other values after the user has altered the height
- /// </summary>
- private void HeightAdjust()
- {
- if (this.sourceResolution == new Size(0, 0))
- {
- return;
- }
-
- if (this.Height > this.sourceResolution.Height)
- {
- this.Task.Height = this.sourceResolution.Height;
- this.NotifyOfPropertyChange(() => this.Task.Height);
- }
-
- switch (this.SelectedAnamorphicMode)
- {
- case Anamorphic.None:
- if (this.MaintainAspectRatio)
- {
- double cropWidth = this.sourceResolution.Width - this.CropLeft - this.CropRight;
- double cropHeight = this.sourceResolution.Height - this.CropTop - this.CropBottom;
-
- double newWidth = ((double)this.Height * this.sourceResolution.Height * this.SourceAspect.Width *
- cropWidth) /
- ((double)this.sourceResolution.Width * this.SourceAspect.Height * cropHeight);
-
- this.Task.Width = this.GetModulusValue(newWidth);
- this.NotifyOfPropertyChange(() => this.Task.Width);
- }
-
- break;
- case Anamorphic.Custom:
- this.SetDisplaySize();
- break;
- }
- }
-
- /// <summary>
- /// Adjust other values after the user has altered the modulus
- /// </summary>
- private void ModulusAdjust()
- {
- this.WidthAdjust();
- }
-
- /// <summary>
- /// Set the display size text
- /// </summary>
- private void SetDisplaySize()
- {
- this.DisplaySize = this.sourceResolution.IsEmpty
- ? "No Title Selected"
- : string.Format(
- "{0}x{1}",
- this.CalculateAnamorphicSizes().Width,
- this.CalculateAnamorphicSizes().Height);
- }
-
- /// <summary>
- /// Adjust other values after the user has altered the width
+ /// The get res.
 /// </summary>
- private void WidthAdjust()
- {
- if (this.Width > this.sourceResolution.Width)
- {
- this.Task.Width = this.sourceResolution.Width;
- this.NotifyOfPropertyChange(() => this.Task.Width);
- }
-
- switch (this.SelectedAnamorphicMode)
- {
- case Anamorphic.None:
- if (this.MaintainAspectRatio)
- {
- double cropWidth = this.sourceResolution.Width - this.CropLeft - this.CropRight;
- double cropHeight = this.sourceResolution.Height - this.CropTop - this.CropBottom;
-
- if (this.SourceAspect.Width == 0 && this.SourceAspect.Height == 0)
- {
- break;
- }
-
- double newHeight = ((double)this.Width * this.sourceResolution.Width * this.SourceAspect.Height *
- cropHeight) /
- ((double)this.sourceResolution.Height * this.SourceAspect.Width * cropWidth);
-
- this.Task.Height = this.GetModulusValue(newHeight);
- this.NotifyOfPropertyChange(() => this.Height);
- }
- this.SetDisplaySize();
- break;
- case Anamorphic.Strict:
- this.Task.Width = 0;
- this.Task.Height = 0;
-
- this.NotifyOfPropertyChange(() => this.Width);
- this.NotifyOfPropertyChange(() => this.Height);
- this.SetDisplaySize();
- break;
- case Anamorphic.Loose:
- this.Task.Height = 0;
- this.NotifyOfPropertyChange(() => this.Width);
- this.NotifyOfPropertyChange(() => this.Height);
- this.SetDisplaySize();
- break;
- case Anamorphic.Custom:
- if (this.MaintainAspectRatio)
- {
- this.ParWidth = this.DisplayWidth;
- this.ParHeight = this.Width;
- }
-
- this.SetDisplaySize();
- break;
- }
- }
-
- /// <summary>
- /// Quick function to get the max resolution value
- /// </summary>
 /// <param name="value">
 /// The value.
 /// </param>
@@ -1143,13 +1068,29 @@
 /// The max.
 /// </param>
 /// <returns>
- /// An Int
+ /// The <see cref="int"/>.
 /// </returns>
- private int getRes(int value, int max)
+ private int GetRes(int value, int? max)
 {
- return value > max ? max : value;
+ return max.HasValue ? (value > max.Value ? max.Value : value) : value;
 }
 
 #endregion
 }
+
+ /// <summary>
+ /// The changed picture field.
+ /// </summary>
+ enum ChangedPictureField
+ {
+ Width,
+ Height,
+ ParW,
+ ParH,
+ DisplayWidth,
+ Crop,
+ Anamorphic,
+ MaintainAspectRatio,
+ Modulus
+ }
 }
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs Changed

@@ -17,11 +17,12 @@
 using System.Threading;
 using System.Windows;
 
- using HandBrake.ApplicationServices;
 using HandBrake.ApplicationServices.Model;
 using HandBrake.ApplicationServices.Model.Encoding;
 using HandBrake.ApplicationServices.Services.Interfaces;
 
+ using HandBrakeWPF.Factories;
+ using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services;
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.ViewModels.Interfaces;
@@ -84,7 +85,7 @@
 public PreviewViewModel(IErrorService errorService, IUserSettingService userSettingService)
 {
 // Preview needs a seperate instance rather than the shared singleton. This could maybe do with being refactored at some point
- this.encodeService = new EncodeServiceWrapper(userSettingService); 
+ this.encodeService = new EncodeServiceWrapper(userSettingService);
 
 this.errorService = errorService;
 this.userSettingService = userSettingService;
@@ -172,7 +173,7 @@
 {
 List<int> startPoints = new List<int>();
 for (int i = 1;
- i <= this.UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount);
+ i <= this.UserSettingService.GetUserSetting<int>(UserSettingConstants.PreviewScanCount);
 i++)
 {
 startPoints.Add(i);
@@ -261,13 +262,13 @@
 {
 this.IsEncoding = false;
 this.errorService.ShowMessageBox("Unable to delete previous preview file. You may need to restart the application.",
- "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 }
 
 if (this.Task == null || string.IsNullOrEmpty(Task.Source))
 {
- this.errorService.ShowMessageBox("You must first scan a source and setup your encode before creating a perview.",
- "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ this.errorService.ShowMessageBox("You must first scan a source and setup your encode before creating a preview.",
+ Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 return;
 }
 
@@ -300,11 +301,7 @@
 encodeTask.IsPreviewEncode = true;
 encodeTask.PreviewEncodeStartAt = this.StartAt.ToString(CultureInfo.InvariantCulture);
 encodeTask.PreviewEncodeDuration = this.Duration;
- QueueTask task = new QueueTask
- {
- Task = encodeTask,
- };
-
+ QueueTask task = new QueueTask(encodeTask, HBConfigurationFactory.Create(false));
 ThreadPool.QueueUserWorkItem(this.CreatePreview, task);
 }
 
@@ -329,7 +326,7 @@
 }
 else
 {
- if (!File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path)))
+ if (!File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath)))
 {
 // Attempt to find VLC if it doesn't exist in the default set location.
 string vlcPath;
@@ -346,18 +343,18 @@
 
 if (File.Exists(vlcPath))
 {
- UserSettingService.SetUserSetting(UserSettingConstants.VLC_Path, vlcPath);
+ UserSettingService.SetUserSetting(UserSettingConstants.VLCPath, vlcPath);
 }
 else
 {
 this.errorService.ShowMessageBox("Unable to detect VLC Player. \nPlease make sure VLC is installed and the directory specified in HandBrake's options is correct. (See: \"Tools Menu > Options > Picture Tab\")",
- "Error", MessageBoxButton.OK, MessageBoxImage.Warning);
+ Resources.Error, MessageBoxButton.OK, MessageBoxImage.Warning);
 }
 }
 
- if (File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path)))
+ if (File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath)))
 {
- ProcessStartInfo vlc = new ProcessStartInfo(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path), args);
+ ProcessStartInfo vlc = new ProcessStartInfo(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath), args);
 Process.Start(vlc);
 }
 }
@@ -365,7 +362,7 @@
 else
 {
 this.errorService.ShowMessageBox("Unable to find the preview file. Either the file was deleted or the encode failed. Check the activity log for details.",
- "Error", MessageBoxButton.OK, MessageBoxImage.Warning);
+ Resources.Error, MessageBoxButton.OK, MessageBoxImage.Warning);
 }
 }
 }
@@ -382,14 +379,14 @@
 if (encodeService.IsEncoding)
 {
 this.errorService.ShowMessageBox("Handbrake is already encoding a video! Only one file can be encoded at any one time.",
- "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 return;
 }
 
 this.encodeService.EncodeCompleted += this.encodeService_EncodeCompleted;
 this.encodeService.EncodeStatusChanged += this.encodeService_EncodeStatusChanged;
 
- this.encodeService.Start((QueueTask)state, false);
+ this.encodeService.Start((QueueTask)state);
 this.userSettingService.SetUserSetting(UserSettingConstants.LastPreviewDuration, this.Duration);
 }
 #endregion
@@ -406,7 +403,7 @@
 /// </param>
 private void encodeService_EncodeStatusChanged(object sender, HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs e)
 {
- this.Percentage = string.Format("{0} %", e.PercentComplete.ToString(CultureInfo.InvariantCulture));
+ this.Percentage = string.Format("{0} %", Math.Round(e.PercentComplete, 2).ToString(CultureInfo.InvariantCulture));
 this.PercentageValue = e.PercentComplete;
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs Changed

@@ -41,6 +41,11 @@
 private bool orderedByTitle;
 
 /// <summary>
+ /// The add to queue.
+ /// </summary>
+ private Action<IEnumerable<SelectionTitle>> addToQueue;
+
+ /// <summary>
 /// Initializes a new instance of the <see cref="QueueSelectionViewModel"/> class. 
 /// </summary>
 /// <param name="errorService">
@@ -99,6 +104,17 @@
 }
 
 /// <summary>
+ /// Gets a value indicating whether is auto naming enabled.
+ /// </summary>
+ public bool IsAutoNamingEnabled
+ {
+ get
+ {
+ return this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNaming);
+ }
+ }
+
+ /// <summary>
 /// The order by title.
 /// </summary>
 public void OrderByTitle()
@@ -147,6 +163,7 @@
 /// </summary>
 public void Add()
 {
+ this.addToQueue(this.TitleList.Where(c => c.IsSelected));
 this.Close();
 }
 
@@ -176,23 +193,28 @@
 /// <param name="srcName">
 /// The src Name.
 /// </param>
- public void Setup(Source scannedSource, string srcName)
+ /// <param name="addAction">
+ /// The add Action.
+ /// </param>
+ public void Setup(Source scannedSource, string srcName, Action<IEnumerable<SelectionTitle>> addAction)
 {
 this.TitleList.Clear();
+ this.addToQueue = addAction;
 
 if (scannedSource != null)
 {
-
 IEnumerable<Title> titles = orderedByTitle
 ? scannedSource.Titles
 : scannedSource.Titles.OrderByDescending(o => o.Duration).ToList();
 
 foreach (Title item in titles)
 {
- SelectionTitle title = new SelectionTitle(item, srcName);
+ SelectionTitle title = new SelectionTitle(item, srcName) { IsSelected = true };
 TitleList.Add(title);
 }
 }
+
+ this.NotifyOfPropertyChange(() => this.IsAutoNamingEnabled);
 }
 }
 }

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs Changed

@@ -10,17 +10,16 @@
 namespace HandBrakeWPF.ViewModels
 {
 using System;
- using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Windows;
 
 using Caliburn.Micro;
 
- using HandBrake.ApplicationServices;
 using HandBrake.ApplicationServices.EventArgs;
 using HandBrake.ApplicationServices.Model;
 using HandBrake.ApplicationServices.Services.Interfaces;
 
+ using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.ViewModels.Interfaces;
 
@@ -31,13 +30,6 @@
 /// </summary>
 public class QueueViewModel : ViewModelBase, IQueueViewModel
 {
- /*
- 
- * TODO FIX THE DRAP/DROP ADORNER!
- */
-
-
-
 #region Constants and Fields
 
 /// <summary>
@@ -82,9 +74,6 @@
 /// <summary>
 /// Initializes a new instance of the <see cref="QueueViewModel"/> class.
 /// </summary>
- /// <param name="windowManager">
- /// The window manager.
- /// </param>
 /// <param name="userSettingService">
 /// The user Setting Service.
 /// </param>
@@ -94,7 +83,7 @@
 /// <param name="errorService">
 /// The Error Service 
 /// </param>
- public QueueViewModel(IWindowManager windowManager, IUserSettingService userSettingService, IQueueProcessor queueProcessor, IErrorService errorService)
+ public QueueViewModel(IUserSettingService userSettingService, IQueueProcessor queueProcessor, IErrorService errorService)
 {
 this.userSettingService = userSettingService;
 this.queueProcessor = queueProcessor;
@@ -199,7 +188,7 @@
 public void WhenDone(string action)
 {
 this.WhenDoneAction = action;
- this.userSettingService.SetUserSetting(ASUserSettingConstants.WhenCompleteAction, action);
+ this.userSettingService.SetUserSetting(UserSettingConstants.WhenCompleteAction, action);
 }
 
 /// <summary>
@@ -249,6 +238,13 @@
 public void PauseEncode()
 {
 this.queueProcessor.Pause();
+
+ this.JobStatus = "Queue Paused";
+ this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);
+ this.IsEncoding = false;
+
+ MessageBox.Show("The Queue has been paused. The currently running job will run to completion and no further jobs will start.", "Queue",
+ MessageBoxButton.OK, MessageBoxImage.Information);
 }
 
 /// <summary>
@@ -264,7 +260,7 @@
 MessageBoxResult result =
 this.errorService.ShowMessageBox(
 "This encode is currently in progress. If you delete it, the encode will be stopped. Are you sure you wish to proceed?",
- "Warning",
+ Resources.Warning,
 MessageBoxButton.YesNo,
 MessageBoxImage.Question);
 
@@ -301,11 +297,15 @@
 if (this.queueProcessor.Count == 0)
 {
 this.errorService.ShowMessageBox(
- "There are no pending jobs.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ "There are no pending jobs.", Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 return;
 }
 
- this.queueProcessor.Start();
+ this.JobStatus = "Queue Started";
+ this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);
+ this.IsEncoding = true;
+
+ this.queueProcessor.Start(UserSettingService.GetUserSetting<bool>(UserSettingConstants.ClearCompletedFromQueue));
 }
 
 /// <summary>
@@ -320,9 +320,10 @@
 DefaultExt = ".hbq",
 AddExtension = true
 };
- dialog.ShowDialog();
-
- this.queueProcessor.BackupQueue(dialog.FileName);
+ if (dialog.ShowDialog() == true)
+ {
+ this.queueProcessor.BackupQueue(dialog.FileName);
+ }
 }
 
 /// <summary>
@@ -331,9 +332,10 @@
 public void Import()
 {
 VistaOpenFileDialog dialog = new VistaOpenFileDialog { Filter = "HandBrake Queue Files (*.hbq)|*.hbq", CheckFileExists = true };
- dialog.ShowDialog();
-
- this.queueProcessor.RestoreQueue(dialog.FileName);
+ if (dialog.ShowDialog() == true)
+ {
+ this.queueProcessor.RestoreQueue(dialog.FileName);
+ }
 }
 
 /// <summary>
@@ -374,13 +376,16 @@
 {
 this.Load();
 
- this.WhenDoneAction = this.userSettingService.GetUserSetting<string>(ASUserSettingConstants.WhenCompleteAction);
+ this.WhenDoneAction = this.userSettingService.GetUserSetting<string>(UserSettingConstants.WhenCompleteAction);
 
- this.queueProcessor.JobProcessingStarted += this.queueProcessor_JobProcessingStarted;
 this.queueProcessor.QueueCompleted += this.queueProcessor_QueueCompleted;
- this.queueProcessor.QueuePaused += this.queueProcessor_QueuePaused;
 this.queueProcessor.QueueChanged += this.QueueManager_QueueChanged;
 this.queueProcessor.EncodeService.EncodeStatusChanged += this.EncodeService_EncodeStatusChanged;
+ this.queueProcessor.EncodeService.EncodeCompleted += EncodeService_EncodeCompleted;
+ this.queueProcessor.JobProcessingStarted += this.QueueProcessorJobProcessingStarted;
+
+ this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);
+ this.JobStatus = "Queue Ready";
 
 base.OnActivate();
 }
@@ -393,11 +398,11 @@
 /// </param>
 protected override void OnDeactivate(bool close)
 {
- this.queueProcessor.JobProcessingStarted -= this.queueProcessor_JobProcessingStarted;
 this.queueProcessor.QueueCompleted -= this.queueProcessor_QueueCompleted;
- this.queueProcessor.QueuePaused -= this.queueProcessor_QueuePaused;
 this.queueProcessor.QueueChanged -= this.QueueManager_QueueChanged;
 this.queueProcessor.EncodeService.EncodeStatusChanged -= this.EncodeService_EncodeStatusChanged;
+ this.queueProcessor.EncodeService.EncodeCompleted -= EncodeService_EncodeCompleted;
+ this.queueProcessor.JobProcessingStarted -= this.QueueProcessorJobProcessingStarted;
 
 base.OnDeactivate(close);
 }
@@ -411,25 +416,20 @@
 /// <param name="e">
 /// The EncodeProgressEventArgs.
 /// </param>
- private void EncodeService_EncodeStatusChanged(
- object sender, EncodeProgressEventArgs e)
+ private void EncodeService_EncodeStatusChanged(object sender, EncodeProgressEventArgs e)
 {
 Caliburn.Micro.Execute.OnUIThread(() =>
 {
- if (this.IsEncoding)
- {
- this.JobStatus =
- string.Format(
- "Encoding: Pass {0} of {1}, {2:00.00}%, FPS: {3:000.0}, Avg FPS: {4:000.0}, Time Remaining: {5}, Elapsed: {6:hh\\:mm\\:ss}",
- e.Task,
- e.TaskCount,
- e.PercentComplete,
- e.CurrentFrameRate,
- e.AverageFrameRate,
- e.EstimatedTimeLeft,
- e.ElapsedTime);
- }
-
+ this.JobStatus =
+ string.Format(
+ "Encoding: Pass {0} of {1}, {2:00.00}%, FPS: {3:000.0}, Avg FPS: {4:000.0}, Time Remaining: {5}, Elapsed: {6:hh\\:mm\\:ss}",
+ e.Task,
+ e.TaskCount,
+ e.PercentComplete,
+ e.CurrentFrameRate,
+ e.AverageFrameRate,
+ e.EstimatedTimeLeft,
+ e.ElapsedTime);
 });
 }
 
@@ -445,55 +445,60 @@
 private void QueueManager_QueueChanged(object sender, EventArgs e)
 {
 this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);
+
+ if (!queueProcessor.IsProcessing)
+ {
+ this.JobStatus = "Queue Not Running";
+ }
 }
 
 /// <summary>
- /// Handle teh Job Processing Started Event
+ /// Handle the Queue Completed Event
 /// </summary>
 /// <param name="sender">
 /// The sender.
 /// </param>
 /// <param name="e">
- /// The QueueProgressEventArgs.
+ /// The EventArgs.
 /// </param>
- private void queueProcessor_JobProcessingStarted(
- object sender, QueueProgressEventArgs e)
+ private void queueProcessor_QueueCompleted(object sender, EventArgs e)
 {
- this.JobStatus = "Queue Started";
+ this.JobStatus = "Queue Completed";
 this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);
- this.IsEncoding = true;
+ this.IsEncoding = false;
 }
 
 /// <summary>
- /// Handle the Queue Completed Event
+ /// The encode service_ encode completed.
 /// </summary>
 /// <param name="sender">
 /// The sender.
 /// </param>
 /// <param name="e">
- /// The EventArgs.
+ /// The e.
 /// </param>
- private void queueProcessor_QueueCompleted(object sender, EventArgs e)
+ private void EncodeService_EncodeCompleted(object sender, EncodeCompletedEventArgs e)
 {
- this.JobStatus = "Queue Completed";
- this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);
- this.IsEncoding = false;
+ if (!this.queueProcessor.IsProcessing)
+ {
+ this.JobStatus = "Last Queued Job Finished";
+ }
 }
 
 /// <summary>
- /// Handle the Queue Paused Event
+ /// The queue processor job processing started.
 /// </summary>
 /// <param name="sender">
 /// The sender.
 /// </param>
 /// <param name="e">
- /// The EventArgs.
+ /// The QueueProgressEventArgs.
 /// </param>
- private void queueProcessor_QueuePaused(object sender, EventArgs e)
+ private void QueueProcessorJobProcessingStarted(object sender, QueueProgressEventArgs e)
 {
- this.JobStatus = "Queue Paused";
+ this.JobStatus = "Queue Started";
 this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.Count);
- this.IsEncoding = false;
+ this.IsEncoding = true;
 }
 
 #endregion

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs Changed

@@ -16,6 +16,7 @@
 using HandBrake.ApplicationServices.Services.Interfaces;
 
 using HandBrakeWPF.Model;
+ using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.ViewModels.Interfaces;
 
@@ -41,6 +42,11 @@
 /// </summary>
 private bool showOptions;
 
+ /// <summary>
+ /// The show instant.
+ /// </summary>
+ private bool showInstant;
+
 #endregion
 
 /// <summary>
@@ -52,8 +58,19 @@
 public ShellViewModel(IErrorService errorService)
 {
 this.errorService = errorService;
- this.showMainWindow = true;
- this.showOptions = false;
+
+ if (!AppArguments.IsInstantHandBrake)
+ {
+ this.showMainWindow = true;
+ this.showOptions = false;
+ this.showInstant = false;
+ }
+ else
+ {
+ this.showMainWindow = false;
+ this.showOptions = false;
+ this.showInstant = true;
+ }
 }
 
 /// <summary>
@@ -68,16 +85,25 @@
 {
 this.ShowMainWindow = true;
 this.ShowOptions = false;
+ this.ShowInstant = false;
 }
 else if (window == ShellWindow.OptionsWindow)
 {
 this.ShowOptions = true;
 this.ShowMainWindow = false;
+ this.ShowInstant = false;
+ }
+ else if (window == ShellWindow.InstantMainWindow)
+ {
+ this.ShowInstant = true;
+ this.ShowOptions = false;
+ this.ShowMainWindow = false;
 }
 else
 {
 this.ShowMainWindow = true;
 this.ShowOptions = false;
+ this.ShowInstant = false;
 }
 }
 
@@ -94,6 +120,11 @@
 public IOptionsViewModel OptionsViewModel { get; set; }
 
 /// <summary>
+ /// Gets or sets the instant view model.
+ /// </summary>
+ public IInstantViewModel InstantViewModel { get; set; }
+
+ /// <summary>
 /// Gets or sets a value indicating whether ShowMainWindow.
 /// </summary>
 public bool ShowMainWindow
@@ -126,13 +157,29 @@
 }
 
 /// <summary>
+ /// Gets or sets a value indicating whether ShowInstant.
+ /// </summary>
+ public bool ShowInstant
+ {
+ get
+ {
+ return this.showInstant;
+ }
+ set
+ {
+ this.showInstant = value;
+ this.NotifyOfPropertyChange(() => this.ShowInstant);
+ }
+ }
+
+ /// <summary>
 /// Gets WindowTitle.
 /// </summary>
 public string WindowTitle
 {
 get
 {
- return "HandBrake";
+ return AppArguments.IsInstantHandBrake ? "Instant HandBrake" : "HandBrake";
 }
 }
 
@@ -151,8 +198,8 @@
 {
 MessageBoxResult result =
 errorService.ShowMessageBox(
- "An Encode is currently running. Exiting HandBrake will stop this encode.\nAre you sure you wish to continue?",
- "Warning",
+ "An Encode is currently running. Exiting HandBrake will stop this encode.\nAre you sure you wish to exit HandBrake?",
+ Resources.Warning,
 MessageBoxButton.YesNo,
 MessageBoxImage.Warning);

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs Added

@@ -0,0 +1,240 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="StaticPreviewViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The Static Preview View Model
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels
+{
+ using System;
+ using System.Windows;
+ using System.Windows.Media.Imaging;
+
+ using HandBrake.ApplicationServices.Model;
+ using HandBrake.ApplicationServices.Services.Interfaces;
+
+ using HandBrakeWPF.ViewModels.Interfaces;
+
+ /// <summary>
+ /// The Static Preview View Model
+ /// </summary>
+ public class StaticPreviewViewModel : ViewModelBase, IStaticPreviewViewModel
+ {
+ /*
+ * TODO
+ * - Screen needs to be made DPI Aware
+ * - Integrate Video Preview panel.
+ */
+
+ #region Fields
+
+ /// <summary>
+ /// The scan service.
+ /// </summary>
+ private readonly IScan scanService;
+
+ /// <summary>
+ /// The height.
+ /// </summary>
+ private int height;
+
+ /// <summary>
+ /// The preview image.
+ /// </summary>
+ private BitmapImage previewImage;
+
+ /// <summary>
+ /// The selected preview image.
+ /// </summary>
+ private int selectedPreviewImage;
+
+ /// <summary>
+ /// The width.
+ /// </summary>
+ private int width;
+
+ #endregion
+
+ #region Constructors and Destructors
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="StaticPreviewViewModel"/> class.
+ /// </summary>
+ /// <param name="scanService">
+ /// The scan service.
+ /// </param>
+ public StaticPreviewViewModel(IScan scanService)
+ {
+ this.scanService = scanService;
+ this.selectedPreviewImage = 1;
+ this.Title = Properties.Resources.Preview;
+ }
+
+ #endregion
+
+ #region Public Properties
+
+ /// <summary>
+ /// Gets or sets the height.
+ /// </summary>
+ public int Height
+ {
+ get
+ {
+ return this.height;
+ }
+ set
+ {
+ if (value == this.height)
+ {
+ return;
+ }
+ this.height = value;
+ this.NotifyOfPropertyChange(() => this.Height);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the preview image.
+ /// </summary>
+ public BitmapImage PreviewImage
+ {
+ get
+ {
+ return this.previewImage;
+ }
+ set
+ {
+ if (Equals(value, this.previewImage))
+ {
+ return;
+ }
+
+ this.previewImage = value;
+ this.NotifyOfPropertyChange(() => this.PreviewImage);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the selected preview image.
+ /// </summary>
+ public int SelectedPreviewImage
+ {
+ get
+ {
+ return this.selectedPreviewImage;
+ }
+ set
+ {
+ if (value == this.selectedPreviewImage)
+ {
+ return;
+ }
+ this.selectedPreviewImage = value;
+ this.NotifyOfPropertyChange(() => this.SelectedPreviewImage);
+
+ this.UpdatePreviewFrame();
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the task.
+ /// </summary>
+ public EncodeTask Task { get; set; }
+
+ /// <summary>
+ /// Gets the total previews.
+ /// </summary>
+ public int TotalPreviews
+ {
+ get
+ {
+ return this.UserSettingService.GetUserSetting<int>(UserSettingConstants.PreviewScanCount) - 1;
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the width.
+ /// </summary>
+ public int Width
+ {
+ get
+ {
+ return this.width;
+ }
+ set
+ {
+ if (value == this.width)
+ {
+ return;
+ }
+ this.width = value;
+ this.NotifyOfPropertyChange(() => this.Width);
+ }
+ }
+
+ #endregion
+
+ #region Public Methods and Operators
+
+ /// <summary>
+ /// The update preview frame.
+ /// </summary>
+ /// <param name="task">
+ /// The task.
+ /// </param>
+ public void UpdatePreviewFrame(EncodeTask task)
+ {
+ this.Task = task;
+ this.UpdatePreviewFrame();
+ this.DisplayName = "Picture Preview";
+ this.Title = Properties.Resources.Preview;
+ }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether is open.
+ /// </summary>
+ public bool IsOpen { get; set; }
+
+ /// <summary>
+ /// The update preview frame.
+ /// </summary>
+ public void UpdatePreviewFrame()
+ {
+ BitmapImage image = this.scanService.GetPreview(this.Task, this.SelectedPreviewImage);
+
+ if (image != null)
+ {
+ this.Width = (int)Math.Ceiling(image.Width);
+ this.Height = (int)Math.Ceiling(image.Height);
+ this.PreviewImage = image;
+ }
+ }
+
+ /// <summary>
+ /// The preview size changed.
+ /// </summary>
+ /// <param name="ea">
+ /// The ea.
+ /// </param>
+ public void PreviewSizeChanged(SizeChangedEventArgs ea)
+ {
+ Rect workArea = SystemParameters.WorkArea;
+ if (ea.NewSize.Width > workArea.Width)
+ {
+ this.Width = (int)Math.Round(workArea.Width, 0) - 20;
+ this.Title = Properties.Resources.Preview_Scaled;
+ }
+
+ if (ea.NewSize.Height > workArea.Height)
+ {
+ this.Height = (int)Math.Round(workArea.Height, 0) - 20;
+ this.Title = Properties.Resources.Preview_Scaled;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs Changed

@@ -10,17 +10,16 @@
 namespace HandBrakeWPF.ViewModels
 {
 using System.Collections.Generic;
- using System.Collections.Specialized;
+ using System.ComponentModel;
 using System.IO;
 using System.Linq;
 
 using HandBrake.ApplicationServices.Model;
 using HandBrake.ApplicationServices.Model.Encoding;
+ using HandBrake.ApplicationServices.Model.Subtitle;
 using HandBrake.ApplicationServices.Parsing;
 using HandBrake.ApplicationServices.Utilities;
 
- using HandBrakeWPF.Commands;
- using HandBrakeWPF.Model;
 using HandBrakeWPF.ViewModels.Interfaces;
 
 using Ookii.Dialogs.Wpf;
@@ -33,14 +32,29 @@
 #region Constants and Fields
 
 /// <summary>
+ /// The Foreign Audio Search Track
+ /// </summary>
+ private readonly Subtitle ForeignAudioSearchTrack;
+
+ /// <summary>
 /// Backing field for the source subtitle tracks.
 /// </summary>
 private IList<Subtitle> sourceTracks;
 
 /// <summary>
- /// The Foreign Audio Search Track
+ /// The show defaults panel.
 /// </summary>
- private readonly Subtitle ForeignAudioSearchTrack;
+ private bool showDefaultsPanel;
+
+ /// <summary>
+ /// The audio behaviours.
+ /// </summary>
+ private SubtitleBehaviours subtitleBehaviours;
+
+ /// <summary>
+ /// The available languages.
+ /// </summary>
+ private BindingList<string> availableLanguages;
 
 #endregion
 
@@ -58,6 +72,12 @@
 
 this.ForeignAudioSearchTrack = new Subtitle { SubtitleType = SubtitleType.ForeignAudioSearch, Language = "Foreign Audio Search (Bitmap)" };
 this.SourceTracks = new List<Subtitle> { this.ForeignAudioSearchTrack };
+
+ this.SubtitleBehaviours = new SubtitleBehaviours();
+ this.SelectedAvailableToMove = new BindingList<string>();
+ this.SelectedLangaugesToMove = new BindingList<string>();
+ this.availableLanguages = new BindingList<string>();
+ this.SetupLanguages(null);
 }
 
 #endregion
@@ -96,6 +116,108 @@
 /// </summary>
 public EncodeTask Task { get; set; }
 
+ /// <summary>
+ /// Gets or sets a value indicating whether show defaults panel.
+ /// </summary>
+ public bool ShowDefaultsPanel
+ {
+ get
+ {
+ return this.showDefaultsPanel;
+ }
+ set
+ {
+ if (value.Equals(this.showDefaultsPanel))
+ {
+ return;
+ }
+ this.showDefaultsPanel = value;
+ this.NotifyOfPropertyChange(() => this.ShowDefaultsPanel);
+ this.NotifyOfPropertyChange(() => this.PanelTitle);
+ this.NotifyOfPropertyChange(() => this.SwitchDisplayTitle);
+ }
+ }
+
+ /// <summary>
+ /// Gets the panel title.
+ /// </summary>
+ public string PanelTitle
+ {
+ get
+ {
+ return this.ShowDefaultsPanel ? "Subtitle Defaults" : "Subtitle Tracks";
+ }
+ }
+
+ /// <summary>
+ /// Gets the switch display title.
+ /// </summary>
+ public string SwitchDisplayTitle
+ {
+ get
+ {
+ return this.ShowDefaultsPanel ? "Switch to Tracks" : "Switch to Defaults";
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the subtitle behaviours.
+ /// </summary>
+ public SubtitleBehaviours SubtitleBehaviours
+ {
+ get
+ {
+ return this.subtitleBehaviours;
+ }
+ set
+ {
+ if (Equals(value, this.subtitleBehaviours))
+ {
+ return;
+ }
+ this.subtitleBehaviours = value;
+ this.NotifyOfPropertyChange(() => this.SubtitleBehaviours);
+ }
+ }
+
+ /// <summary>
+ /// Gets the sbutitle behaviour modes.
+ /// </summary>
+ public BindingList<SubtitleBehaviourModes> SubtitleBehaviourModeList
+ {
+ get
+ {
+ return new BindingList<SubtitleBehaviourModes>(EnumHelper<SubtitleBehaviourModes>.GetEnumList().ToList());
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets AvailableLanguages.
+ /// </summary>
+ public BindingList<string> AvailableLanguages
+ {
+ get
+ {
+ return this.availableLanguages;
+ }
+
+ set
+ {
+ this.availableLanguages = value;
+ this.NotifyOfPropertyChange("AvailableLanguages");
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets SelectedLangauges.
+ /// </summary>
+ public BindingList<string> SelectedAvailableToMove { get; set; }
+
+ /// <summary>
+ /// Gets or sets SelectedLangauges.
+ /// </summary>
+ public BindingList<string> SelectedLangaugesToMove { get; set; }
+
 #endregion
 
 #region Public Methods
@@ -113,7 +235,6 @@
 /// </summary>
 public void AddAllClosedCaptions()
 {
-
 foreach (Subtitle subtitle in this.SourceTitlesSubset(null).Where(s => s.SubtitleType == SubtitleType.CC))
 {
 this.Add(subtitle);
@@ -136,13 +257,14 @@
 /// </summary>
 public void AddAllRemainingForSelectedLanguages()
 {
- // Get a list of subtitle tracks that match the users lanaguages
- StringCollection userSelectedLanguages =
- this.UserSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages);
- userSelectedLanguages.Add(
- this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguageForSubtitles));
+ // Translate to Iso Codes
+ List<string> iso6392Codes = this.SubtitleBehaviours.SelectedLangauges.Contains(Constants.Any)
+ ? LanguageUtilities.GetIsoCodes()
+ : LanguageUtilities.GetLanguageCodes(
+ this.SubtitleBehaviours.SelectedLangauges.ToArray());
+ 
 List<Subtitle> availableTracks =
- this.SourceTracks.Where(subtitle => userSelectedLanguages.Contains(subtitle.Language)).ToList();
+ this.SourceTracks.Where(subtitle => iso6392Codes.Contains(subtitle.LanguageCodeClean)).ToList();
 
 foreach (Subtitle subtitle in this.SourceTitlesSubset(availableTracks))
 {
@@ -151,6 +273,40 @@
 }
 
 /// <summary>
+ /// The add first for selected languages.
+ /// </summary>
+ private void AddFirstForSelectedLanguages()
+ {
+ foreach (Subtitle sourceTrack in this.GetSelectedLanguagesTracks())
+ {
+ // Step 2: Check if the track list already contrains this track
+ bool found = this.Task.SubtitleTracks.Any(track => Equals(track.SourceTrack, sourceTrack));
+ if (!found)
+ {
+ // Check if we are already using this language
+ bool foundLanguage = false;
+ Subtitle track = sourceTrack;
+
+ foreach (var item in this.Task.SubtitleTracks)
+ {
+ if (item.SourceTrack != null && item.SourceTrack.LanguageCode != null && track.LanguageCode.Contains(item.SourceTrack.LanguageCode))
+ {
+ foundLanguage = true;
+ } 
+ }
+
+ if (foundLanguage)
+ {
+ continue;
+ }
+
+ // If it doesn't, add it.
+ this.Add(sourceTrack);
+ }
+ }
+ }
+
+ /// <summary>
 /// Import an SRT File.
 /// </summary>
 public void Import()
@@ -224,7 +380,7 @@
 /// <param name="subtitle">
 /// The subtitle.
 /// </param>
- public void SelectBurnedInTrack(SubtitleTrack subtitle)
+ public void SetBurnedToFalseForAllExcept(SubtitleTrack subtitle)
 {
 foreach (SubtitleTrack track in this.Task.SubtitleTracks)
 {
@@ -244,29 +400,25 @@
 {
 this.Task.SubtitleTracks.Clear();
 
- // New DUB Settings
- int mode = this.UserSettingService.GetUserSetting<int>(UserSettingConstants.DubModeSubtitle);
- switch (mode)
+ // Add Foreign Audio Scan
+ if (this.SubtitleBehaviours.AddForeignAudioScanTrack)
 {
- case 1: // Adding all remaining subtitle tracks
- this.AddAllRemaining();
- break;
- case 2: // Adding only the first or preferred first subtitle track.
- this.Add();
+ this.Add(ForeignAudioSearchTrack);
+ }
+
+ // Add Track Behaviours
+ switch (this.SubtitleBehaviours.SelectedBehaviour)
+ {
+ case SubtitleBehaviourModes.FirstMatch: // Adding all remaining tracks
+ this.AddFirstForSelectedLanguages();
 break;
- case 3: // Selected Languages Only
+ case SubtitleBehaviourModes.AllMatching: // Add Langauges tracks for the additional languages selected, in-order.
 this.AddAllRemainingForSelectedLanguages();
 break;
- case 4: // Prefered Only
- this.AddForPreferredLanaguages(true);
- break;
- case 5: // Prefered Only All
- this.AddForPreferredLanaguages(false);
- break;
 }
 
 // Add all closed captions if enabled.
- if (this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.UseClosedCaption))
+ if (this.SubtitleBehaviours.AddClosedCaptions)
 {
 this.AddAllClosedCaptions();
 }
@@ -277,16 +429,71 @@
 /// </summary>
 public void SetDefaultBehaviour()
 {
- OpenOptionsScreenCommand command = new OpenOptionsScreenCommand();
- command.Execute(OptionsTab.AudioAndSubtitles);
+ this.ShowDefaultsPanel = true;
+ }
+
+ /// <summary>
+ /// The show audio defaults.
+ /// </summary>
+ public void ShowSubtitleDefaultsPanel()
+ {
+ this.ShowDefaultsPanel = !this.ShowDefaultsPanel;
+ }
+
+ /// <summary>
+ /// Audio List Move Left
+ /// </summary>
+ public void LanguageMoveRight()
+ {
+ if (this.SelectedAvailableToMove.Count > 0)
+ {
+ List<string> copiedList = SelectedAvailableToMove.ToList();
+ foreach (string item in copiedList)
+ {
+ this.AvailableLanguages.Remove(item);
+ this.SubtitleBehaviours.SelectedLangauges.Add(item);
+ }
+
+ this.AvailableLanguages = new BindingList<string>(this.AvailableLanguages.OrderBy(o => o).ToList());
+ }
+ }
+
+ /// <summary>
+ /// Audio List Move Right
+ /// </summary>
+ public void LanguageMoveLeft()
+ {
+ if (this.SelectedLangaugesToMove.Count > 0)
+ {
+ List<string> copiedList = SelectedLangaugesToMove.ToList();
+ foreach (string item in copiedList)
+ {
+ this.SubtitleBehaviours.SelectedLangauges.Remove(item);
+ this.AvailableLanguages.Add(item);
+ }
+ }
+
+ this.AvailableLanguages = new BindingList<string>(this.AvailableLanguages.OrderBy(o => o).ToList());
+ }
+
+ /// <summary>
+ /// Language List Clear all selected languages
+ /// </summary>
+ public void LanguageClearAll()
+ {
+ foreach (string item in this.SubtitleBehaviours.SelectedLangauges)
+ {
+ this.AvailableLanguages.Add(item);
+ }
+ this.AvailableLanguages = new BindingList<string>(this.AvailableLanguages.OrderBy(o => o).ToList());
+
+ this.SubtitleBehaviours.SelectedLangauges.Clear();
 }
 
 #endregion
 
 #region Implemented Interfaces
 
- #region ITabInterface
-
 /// <summary>
 /// Setup this tab for the specified preset.
 /// </summary>
@@ -301,6 +508,9 @@
 // Note, We don't support Subtitles in presets yet.
 this.Task = task;
 this.NotifyOfPropertyChange(() => this.Task);
+
+ this.SetupLanguages(preset);
+ this.AutomaticSubtitleSelection();
 }
 
 /// <summary>
@@ -345,8 +555,6 @@
 
 #endregion
 
- #endregion
-
 #region Methods
 
 /// <summary>
@@ -362,14 +570,12 @@
 /// </param>
 private void Add(Subtitle subtitle)
 {
- string preferred =
- this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguageForSubtitles);
-
- Subtitle source = subtitle ??
- ((this.SourceTracks != null)
- ? (this.SourceTracks.FirstOrDefault(l => l.Language == preferred) ??
- this.SourceTracks.FirstOrDefault(s => s.SubtitleType != SubtitleType.ForeignAudioSearch))
- : null);
+ Subtitle source = subtitle
+ ?? ((this.SourceTracks != null)
+ ? (this.SourceTracks.FirstOrDefault(l => l.Language == this.GetPreferredSubtitleTrackLanguage())
+ ?? this.SourceTracks.FirstOrDefault(
+ s => s.SubtitleType != SubtitleType.ForeignAudioSearch))
+ : null);
 
 if (source == null)
 {
@@ -377,43 +583,61 @@
 }
 
 SubtitleTrack track = new SubtitleTrack
- {
- SubtitleType = SubtitleType.VobSub,
- SourceTrack = source,
- };
+ {
+ SubtitleType = SubtitleType.VobSub,
+ SourceTrack = source,
+ };
+
+ if ((source.SubtitleType == SubtitleType.PGS || source.SubtitleType == SubtitleType.VobSub || source.SubtitleType == SubtitleType.ForeignAudioSearch)
+ && this.Task != null
+ && this.Task.OutputFormat == OutputFormat.Mp4)
+ {
+ if (track.CanBeBurned)
+ {
+ track.Burned = true;
+ this.SetBurnedToFalseForAllExcept(track);
+ }
+ }
 
- if ((source.SubtitleType == SubtitleType.PGS || source.SubtitleType == SubtitleType.VobSub) &&
- this.Task != null &&
- (this.Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.M4V))
+ var encodeTask = this.Task;
+ if (encodeTask != null)
 {
- this.SelectBurnedInTrack(track);
+ encodeTask.SubtitleTracks.Add(track);
 }
- 
- this.Task.SubtitleTracks.Add(track);
 }
 
 /// <summary>
- /// Add all tracks for the preferred languages settings.
+ /// Gets a list of source tracks for the users selected languages.
 /// </summary>
- /// <param name="firstOnly">
- /// The first only.
- /// </param>
- private void AddForPreferredLanaguages(bool firstOnly)
+ /// <returns>
+ /// A list of source subtitle tracks.
+ /// </returns>
+ private IEnumerable<Subtitle> GetSelectedLanguagesTracks()
 {
- string preferred =
- this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguageForSubtitles);
+ List<Subtitle> trackList = new List<Subtitle>();
 
- foreach (Subtitle subtitle in this.SourceTitlesSubset(null))
+ List<string> isoCodes = this.SubtitleBehaviours.SelectedLangauges.Contains(Constants.Any)
+ ? LanguageUtilities.GetIsoCodes()
+ : LanguageUtilities.GetLanguageCodes(
+ this.SubtitleBehaviours.SelectedLangauges.ToArray());
+
+ foreach (string code in isoCodes)
 {
- if (subtitle.Language == preferred)
- {
- this.Add(subtitle);
- if (firstOnly)
- {
- break;
- }
- }
+ trackList.AddRange(this.SourceTracks.Where(source => source.LanguageCode == code));
 }
+
+ return trackList;
+ }
+
+ /// <summary>
+ /// The get preferred subtitle track, or the first if none available.
+ /// </summary>
+ /// <returns>
+ /// The users preferred language, or the first if none available.
+ /// </returns>
+ private string GetPreferredSubtitleTrackLanguage()
+ {
+ return this.SubtitleBehaviours.SelectedLangauges.FirstOrDefault(w => w != Constants.Any);
 }
 
 /// <summary>
@@ -432,6 +656,45 @@
 : this.SourceTracks.Where(subtitle => !this.Task.SubtitleTracks.Any(track => Equals(track.SourceTrack, subtitle))).ToList();
 }
 
+ /// <summary>
+ /// The setup languages.
+ /// </summary>
+ /// <param name="preset">
+ /// The preset.
+ /// </param>
+ private void SetupLanguages(Preset preset)
+ {
+ // Step 1, Set the behaviour mode
+ this.SubtitleBehaviours.SelectedBehaviour = SubtitleBehaviourModes.None;
+ this.SubtitleBehaviours.AddClosedCaptions = false;
+ this.SubtitleBehaviours.AddForeignAudioScanTrack = false;
+ this.SubtitleBehaviours.SelectedLangauges.Clear();
+
+ // Step 2, Get all the languages
+ IDictionary<string, string> langList = LanguageUtilities.MapLanguages();
+ langList = (from entry in langList orderby entry.Key ascending select entry).ToDictionary(pair => pair.Key, pair => pair.Value);
+
+ // Step 3, Setup Available Languages
+ this.AvailableLanguages.Clear();
+ foreach (string item in langList.Keys)
+ {
+ this.AvailableLanguages.Add(item);
+ }
+
+ // Step 4, Set the Selected Languages 
+ if (preset != null && preset.SubtitleTrackBehaviours != null)
+ {
+ this.SubtitleBehaviours.SelectedBehaviour = preset.SubtitleTrackBehaviours.SelectedBehaviour;
+ this.SubtitleBehaviours.AddClosedCaptions = preset.SubtitleTrackBehaviours.AddClosedCaptions;
+ this.SubtitleBehaviours.AddForeignAudioScanTrack = preset.SubtitleTrackBehaviours.AddForeignAudioScanTrack;
+
+ foreach (string selectedItem in preset.SubtitleTrackBehaviours.SelectedLangauges)
+ {
+ this.AvailableLanguages.Remove(selectedItem);
+ this.SubtitleBehaviours.SelectedLangauges.Add(selectedItem);
+ }
+ }
+ }
 #endregion
 }
 }
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs Changed

@@ -14,21 +14,22 @@
 using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
+ using System.Windows;
 
 using Caliburn.Micro;
 
 using HandBrake.ApplicationServices.Model;
 using HandBrake.ApplicationServices.Model.Encoding;
 using HandBrake.ApplicationServices.Parsing;
- using HandBrake.ApplicationServices.Services.Interfaces;
 using HandBrake.ApplicationServices.Utilities;
 using HandBrake.Interop;
 using HandBrake.Interop.Model.Encoding;
 using HandBrake.Interop.Model.Encoding.x264;
+ using HandBrake.Interop.Model.Encoding.x265;
 
 using HandBrakeWPF.Commands.Interfaces;
- using HandBrakeWPF.Model;
 using HandBrakeWPF.Properties;
+ using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.ViewModels.Interfaces;
 
 /// <summary>
@@ -36,6 +37,12 @@
 /// </summary>
 public class VideoViewModel : ViewModelBase, IVideoViewModel
 {
+ /*
+ * TODO
+ * 1. Refactor the Video Encoder Preset/Tune/Level options to be generic instead of encoder specific.
+ * 2. Model the UI Interactions in a better way.
+ */
+
 #region Constants and Fields
 /// <summary>
 /// Same as source constant.
@@ -45,7 +52,7 @@
 /// <summary>
 /// The possible h264 levels.
 /// </summary>
- private static readonly List<string> Levels = new List<string> { "Auto", "1.0", "1b", "1.1", "1.2", "1.3", "2.0", "2.1", "2.2", "3.0", "3.1", "3.2", "4.0", "4.1", "4.2", "5.0", "5.1", "5.2"};
+ private static readonly List<string> Levels = new List<string> { "Auto", "1.0", "1b", "1.1", "1.2", "1.3", "2.0", "2.1", "2.2", "3.0", "3.1", "3.2", "4.0", "4.1", "4.2", "5.0", "5.1", "5.2" };
 
 /// <summary>
 /// Backing field for the user setting service.
@@ -63,6 +70,21 @@
 private bool displayX264Options;
 
 /// <summary>
+ /// Backing field used to display / hide the x265 options
+ /// </summary>
+ private bool displayX265Options;
+
+ /// <summary>
+ /// The display qsv options.
+ /// </summary>
+ private bool displayQSVOptions;
+
+ /// <summary>
+ /// Backing field used to display / hide the h264 options
+ /// </summary>
+ private bool displayEncoderOptions;
+
+ /// <summary>
 /// The quality max.
 /// </summary>
 private int qualityMax;
@@ -88,9 +110,9 @@
 private int x264PresetValue;
 
 /// <summary>
- /// The extra arguments.
+ /// The qsv preset value.
 /// </summary>
- private string extraArguments;
+ private int qsvPresetValue;
 
 /// <summary>
 /// The can clear tracker.
@@ -102,6 +124,21 @@
 /// </summary>
 private bool useAdvancedTab;
 
+ /// <summary>
+ /// The display framerate controls.
+ /// </summary>
+ private bool displayNonQSVControls;
+
+ /// <summary>
+ /// The x265 preset value.
+ /// </summary>
+ private int x265PresetValue;
+
+ /// <summary>
+ /// The display turbo first pass.
+ /// </summary>
+ private bool displayTurboFirstPass;
+
 #endregion
 
 #region Constructors and Destructors
@@ -126,10 +163,15 @@
 this.VideoEncoders = EnumHelper<VideoEncoder>.GetEnumList();
 
 X264Presets = new BindingList<x264Preset>(EnumHelper<x264Preset>.GetEnumList().ToList());
+ QsvPresets = new BindingList<QsvPreset>(EnumHelper<QsvPreset>.GetEnumList().ToList());
 H264Profiles = EnumHelper<x264Profile>.GetEnumList();
 X264Tunes = EnumHelper<x264Tune>.GetEnumList().Where(t => t != x264Tune.Fastdecode);
 this.H264Levels = Levels;
 
+ X265Presets = new BindingList<x265Preset>(EnumHelper<x265Preset>.GetEnumList().ToList());
+ H265Profiles = EnumHelper<x265Profile>.GetEnumList();
+ X265Tunes = EnumHelper<x265Tune>.GetEnumList();
+
 this.userSettingService.SettingChanged += this.UserSettingServiceSettingChanged;
 }
 
@@ -149,13 +191,17 @@
 {
 get
 {
- bool showAdvTabSetting =
- this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAdvancedTab);
+ bool showAdvTabSetting = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAdvancedTab);
 if (!showAdvTabSetting)
 {
 this.UseAdvancedTab = false;
 }
 
+ if (this.SelectedVideoEncoder == VideoEncoder.QuickSync)
+ {
+ return false;
+ }
+
 return showAdvTabSetting;
 }
 }
@@ -173,6 +219,17 @@
 {
 if (!object.Equals(value, this.useAdvancedTab))
 {
+ // Set the Advanced Tab up with the current settings, if we can.
+ if (value)
+ {
+ this.Task.AdvancedEncoderOptions = this.GetActualx264Query();
+ }
+
+ if (!value)
+ {
+ this.Task.AdvancedEncoderOptions = string.Empty;
+ }
+
 this.useAdvancedTab = value;
 this.Task.ShowAdvancedTab = value;
 this.NotifyOfPropertyChange(() => this.UseAdvancedTab);
@@ -292,7 +349,7 @@
 {
 get
 {
- return 51.Equals(this.RF);
+ return 0.0.Equals(this.DisplayRF) && this.SelectedVideoEncoder == VideoEncoder.X264;
 }
 }
 
@@ -347,20 +404,29 @@
 {
 this.rf = value;
 
- double cqStep = userSettingService.GetUserSetting<double>(UserSettingConstants.X264Step);
 this.SetQualitySliderBounds();
 switch (this.SelectedVideoEncoder)
 {
 case VideoEncoder.FFMpeg:
 case VideoEncoder.FFMpeg2:
 this.Task.Quality = (32 - value);
+ break; 
+ case VideoEncoder.VP8:
+ this.Task.Quality = (63 - value);
 break;
 case VideoEncoder.X264:
+ case VideoEncoder.X265:
+ double cqStep = userSettingService.GetUserSetting<double>(UserSettingConstants.X264Step);
 double rfValue = 51.0 - value * cqStep;
 rfValue = Math.Round(rfValue, 2);
 this.Task.Quality = rfValue;
+ break; 
+ case VideoEncoder.QuickSync:
+ rfValue = 51.0 - value;
+ rfValue = Math.Round(rfValue, 0);
+ this.Task.Quality = rfValue;
 break;
- case VideoEncoder.Theora:
+ case VideoEncoder.Theora: 
 Task.Quality = value;
 break;
 }
@@ -383,13 +449,58 @@
 }
 
 /// <summary>
+ /// Gets or sets a value indicating whether two pass.
+ /// </summary>
+ public bool TwoPass
+ {
+ get
+ {
+ return this.Task.TwoPass;
+ }
+
+ set
+ {
+ this.Task.TwoPass = value;
+ this.NotifyOfPropertyChange(() => this.TwoPass);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether turbo first pass.
+ /// </summary>
+ public bool TurboFirstPass
+ {
+ get
+ {
+ return this.Task.TurboFirstPass;
+ }
+
+ set
+ {
+ this.Task.TurboFirstPass = value;
+ this.NotifyOfPropertyChange(() => this.TurboFirstPass);
+ }
+ }
+
+ /// <summary>
 /// Gets the rfqp.
 /// </summary>
 public string Rfqp
 {
 get
 {
- return this.SelectedVideoEncoder == VideoEncoder.X264 ? "RF" : "QP";
+ return this.SelectedVideoEncoder == VideoEncoder.X264 || this.SelectedVideoEncoder == VideoEncoder.X265 ? "RF" : "QP";
+ }
+ }
+
+ /// <summary>
+ /// Gets the high quality label.
+ /// </summary>
+ public string HighQualityLabel
+ {
+ get
+ {
+ return this.SelectedVideoEncoder == VideoEncoder.X264 ? Resources.Video_PlaceboQuality : Resources.Video_HigherQuality;
 }
 }
 
@@ -458,7 +569,27 @@
 // Hide the x264 controls when not needed.
 this.DisplayX264Options = value == VideoEncoder.X264;
 
+ // Hide the x265 controls when not needed.
+ this.DisplayX265Options = value == VideoEncoder.X265;
+
+ this.DisplayQSVOptions = value == VideoEncoder.QuickSync;
+ this.DisplayH264Options = value == VideoEncoder.X264 || value == VideoEncoder.QuickSync;
+ this.UseAdvancedTab = value != VideoEncoder.QuickSync && this.UseAdvancedTab;
+ this.DisplayNonQSVControls = value != VideoEncoder.QuickSync;
+ this.DisplayTurboFirstPass = value == VideoEncoder.X264; 
+
 this.NotifyOfPropertyChange(() => this.Rfqp);
+ this.NotifyOfPropertyChange(() => this.ShowAdvancedTab);
+
+ this.NotifyOfPropertyChange(() => this.HighQualityLabel);
+ if (value == VideoEncoder.QuickSync)
+ {
+ this.IsConstantFramerate = true;
+ this.TwoPass = false;
+ this.TurboFirstPass = false;
+ this.Task.Framerate = null;
+ this.NotifyOfPropertyChange(() => SelectedFramerate);
+ }
 }
 }
 
@@ -494,7 +625,7 @@
 }
 set
 {
- if (!object.Equals(this.Task.AdvancedEncoderOptions, value))
+ if (!object.Equals(this.Task.ExtraAdvancedArguments, value))
 {
 this.Task.ExtraAdvancedArguments = value;
 this.NotifyOfPropertyChange(() => this.ExtraArguments);
@@ -504,6 +635,22 @@
 }
 
 /// <summary>
+ /// Gets or sets a value indicating whether to display H264
+ /// </summary>
+ public bool DisplayH264Options
+ {
+ get
+ {
+ return this.displayEncoderOptions;
+ }
+ set
+ {
+ this.displayEncoderOptions = value;
+ this.NotifyOfPropertyChange(() => this.DisplayH264Options);
+ }
+ }
+
+ /// <summary>
 /// Gets or sets a value indicating whether display x 264 options.
 /// </summary>
 public bool DisplayX264Options
@@ -521,6 +668,56 @@
 }
 
 /// <summary>
+ /// Gets or sets a value indicating whether display x 264 options.
+ /// </summary>
+ public bool DisplayX265Options
+ {
+ get
+ {
+ return this.displayX265Options;
+ }
+ set
+ {
+ this.displayX265Options = value;
+ this.NotifyOfPropertyChange(() => this.DisplayX265Options);
+ this.NotifyOfPropertyChange(() => FullOptionsTooltip);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether to display qsv options.
+ /// </summary>
+ public bool DisplayQSVOptions
+ {
+ get
+ {
+ return this.displayQSVOptions;
+ }
+ set
+ {
+ this.displayQSVOptions = value;
+ this.NotifyOfPropertyChange(() => this.DisplayQSVOptions);
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether display framerate controls.
+ /// </summary>
+ public bool DisplayNonQSVControls
+ {
+ get
+ {
+ return this.displayNonQSVControls;
+ }
+
+ set
+ {
+ this.displayNonQSVControls = value;
+ this.NotifyOfPropertyChange(() => this.DisplayNonQSVControls);
+ }
+ }
+
+ /// <summary>
 /// Gets or sets the x 264 preset value.
 /// </summary>
 public int X264PresetValue
@@ -563,6 +760,45 @@
 }
 
 /// <summary>
+ /// Gets or sets X264Preset.
+ /// </summary>
+ public QsvPreset QsvPreset
+ {
+ get
+ {
+ return this.Task.QsvPreset;
+ }
+ set
+ {
+ if (!object.Equals(this.QsvPreset, value))
+ {
+ this.Task.QsvPreset = value;
+ this.NotifyOfPropertyChange(() => this.QsvPreset);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the x 264 preset value.
+ /// </summary>
+ public int QsvPresetValue
+ {
+ get
+ {
+ return this.qsvPresetValue;
+ }
+ set
+ {
+ if (!object.Equals(this.QsvPresetValue, value))
+ {
+ this.qsvPresetValue = value;
+ this.QsvPreset = this.QsvPresets[value];
+ this.NotifyOfPropertyChange(() => this.QsvPresetValue);
+ }
+ }
+ }
+
+ /// <summary>
 /// Gets or sets H264Profile.
 /// </summary>
 public x264Profile H264Profile
@@ -653,6 +889,11 @@
 public BindingList<x264Preset> X264Presets { get; set; }
 
 /// <summary>
+ /// Gets or sets QsvPreset.
+ /// </summary>
+ public BindingList<QsvPreset> QsvPresets { get; set; }
+
+ /// <summary>
 /// Gets or sets X264Profiles.
 /// </summary>
 public IEnumerable<x264Profile> H264Profiles { get; set; }
@@ -674,7 +915,138 @@
 {
 get
 {
- return string.Format(Resources.Video_x264ExtraArgs, this.GetActualx264Query()); // "You can provide additional arguments using the standard x264 format"; 
+ return string.Format(Resources.Video_EncoderExtraArgs, this.GetActualx264Query()); // "You can provide additional arguments using the standard x264 format"; 
+ }
+ }
+
+ /// <summary>
+ /// Gets the qsv slider max.
+ /// </summary>
+ public int QsvSliderMax
+ {
+ get
+ {
+ return SystemInfo.IsHswOrNewer ? 2 : 1;
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the x 265 preset value.
+ /// </summary>
+ public int X265PresetValue
+ {
+ get
+ {
+ return this.x265PresetValue;
+ }
+ set
+ {
+ if (!object.Equals(this.X265PresetValue, value))
+ {
+ this.x265PresetValue = value;
+ this.X265Preset = this.X265Presets[value];
+ this.NotifyOfPropertyChange(() => this.x265PresetValue);
+ this.NotifyOfPropertyChange(() => FullOptionsTooltip);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets X265Preset.
+ /// </summary>
+ public x265Preset X265Preset
+ {
+ get
+ {
+ return this.Task.X265Preset;
+ }
+ set
+ {
+ if (!object.Equals(this.X265Preset, value))
+ {
+ this.Task.X265Preset = value;
+ this.NotifyOfPropertyChange(() => this.X265Preset);
+ ResetAdvancedTab();
+ this.NotifyOfPropertyChange(() => FullOptionsTooltip);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets H265Profile.
+ /// </summary>
+ public x265Profile H265Profile
+ {
+ get
+ {
+ return this.Task.H265Profile;
+ }
+
+ set
+ {
+ if (!object.Equals(this.H265Profile, value))
+ {
+ this.Task.H265Profile = value;
+ this.NotifyOfPropertyChange(() => this.H265Profile);
+ ResetAdvancedTab();
+ this.NotifyOfPropertyChange(() => FullOptionsTooltip);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets X265Tune.
+ /// </summary>
+ public x265Tune X265Tune
+ {
+ get
+ {
+ return this.Task.X265Tune;
+ }
+ set
+ {
+ if (!object.Equals(this.X265Tune, value))
+ {
+ this.Task.X265Tune = value;
+ this.NotifyOfPropertyChange(() => this.X265Tune);
+ ResetAdvancedTab();
+ this.NotifyOfPropertyChange(() => FullOptionsTooltip);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets X265Presets.
+ /// </summary>
+ public BindingList<x265Preset> X265Presets { get; set; }
+
+ /// <summary>
+ /// Gets or sets X265Profiles.
+ /// </summary>
+ public IEnumerable<x265Profile> H265Profiles { get; set; }
+
+ /// <summary>
+ /// Gets or sets X265Tunes.
+ /// </summary>
+ public IEnumerable<x265Tune> X265Tunes { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether display turbo first pass.
+ /// </summary>
+ public bool DisplayTurboFirstPass
+ {
+ get
+ {
+ return this.displayTurboFirstPass;
+ }
+ set
+ {
+ if (value.Equals(this.displayTurboFirstPass))
+ {
+ return;
+ }
+ this.displayTurboFirstPass = value;
+ this.NotifyOfPropertyChange(() => this.DisplayTurboFirstPass);
 }
 }
 
@@ -736,42 +1108,10 @@
 break;
 }
 
- double cqStep = userSettingService.GetUserSetting<double>(UserSettingConstants.X264Step);
- double rfValue = 0;
- this.SetQualitySliderBounds();
- switch (this.SelectedVideoEncoder)
- {
- case VideoEncoder.FFMpeg:
- case VideoEncoder.FFMpeg2:
- if (preset.Task.Quality.HasValue)
- {
- int cq;
- int.TryParse(preset.Task.Quality.Value.ToString(CultureInfo.InvariantCulture), out cq);
- this.RF = 32 - cq;
- }
- break;
- case VideoEncoder.X264:
-
- double multiplier = 1.0 / cqStep;
- if (preset.Task.Quality.HasValue)
- {
- rfValue = preset.Task.Quality.Value * multiplier;
- }
-
- this.RF = this.QualityMax - (int)Math.Round(rfValue, 0);
-
- break;
-
- case VideoEncoder.Theora:
- if (preset.Task.Quality.HasValue)
- {
- this.RF = (int)preset.Task.Quality.Value;
- }
- break;
- }
-
- this.Task.TwoPass = preset.Task.TwoPass;
- this.Task.TurboFirstPass = preset.Task.TurboFirstPass;
+ this.SetRF(preset.Task.Quality);
+ 
+ this.TwoPass = preset.Task.TwoPass;
+ this.TurboFirstPass = preset.Task.TurboFirstPass;
 this.Task.VideoBitrate = preset.Task.VideoBitrate;
 
 this.NotifyOfPropertyChange(() => this.Task);
@@ -779,15 +1119,61 @@
 if (preset.Task != null)
 {
 this.SetEncoder(preset.Task.VideoEncoder);
- this.X264PresetValue = preset.Task.VideoEncoder == VideoEncoder.X264
- ? (int)preset.Task.X264Preset
- : (int)x264Preset.Medium;
- this.H264Profile = preset.Task.VideoEncoder == VideoEncoder.X264 ? preset.Task.H264Profile : x264Profile.None;
- this.X264Tune = preset.Task.VideoEncoder == VideoEncoder.X264 ? preset.Task.X264Tune : x264Tune.None;
- this.H264Level = preset.Task.VideoEncoder == VideoEncoder.X264 ? preset.Task.H264Level : "Auto";
- this.FastDecode = preset.Task.VideoEncoder == VideoEncoder.X264 && preset.Task.FastDecode;
- this.ExtraArguments = preset.Task.ExtraAdvancedArguments;
 
+ // applies to both x264 and QSV
+ if (preset.Task.VideoEncoder == VideoEncoder.X264 ||
+ preset.Task.VideoEncoder == VideoEncoder.QuickSync)
+ {
+ this.H264Profile = preset.Task.H264Profile;
+ this.H264Level = preset.Task.H264Level;
+ }
+ else
+ {
+ this.H264Profile = x264Profile.None;
+ this.H264Level = "Auto";
+ }
+
+ // x264 Only
+ if (preset.Task.VideoEncoder == VideoEncoder.X264)
+ {
+ this.X264PresetValue = (int)preset.Task.X264Preset;
+ this.X264Tune = preset.Task.X264Tune;
+ this.FastDecode = preset.Task.FastDecode;
+ }
+ else
+ {
+ this.X264PresetValue = (int)x264Preset.Medium;
+ this.X264Tune = x264Tune.None;
+ this.FastDecode = false;
+ }
+
+ // x265 Only
+ if (preset.Task.VideoEncoder == VideoEncoder.X265)
+ {
+ this.X265PresetValue = (int)preset.Task.X265Preset;
+ this.X265Tune = preset.Task.X265Tune;
+ this.H265Profile = preset.Task.H265Profile;
+ }
+ else
+ {
+ this.X265PresetValue = (int)x265Preset.VeryFast;
+ this.X265Tune = x265Tune.None;
+ this.H265Profile = x265Profile.None;
+ }
+
+ // QSV Only
+ if (preset.Task.VideoEncoder == VideoEncoder.QuickSync)
+ {
+ this.QsvPresetValue = (int)preset.Task.QsvPreset;
+ }
+ else
+ {
+ this.QsvPresetValue = SystemInfo.IsHswOrNewer
+ ? (int)QsvPreset.Quality
+ : (int)QsvPreset.Balanced;
+ }
+
+ this.ExtraArguments = preset.Task.ExtraAdvancedArguments;
 this.UseAdvancedTab = !string.IsNullOrEmpty(preset.Task.AdvancedEncoderOptions) && this.ShowAdvancedTab;
 }
 }
@@ -801,15 +1187,21 @@
 public void UpdateTask(EncodeTask task)
 {
 this.Task = task;
+ this.SetRF(task.Quality);
+
 this.NotifyOfPropertyChange(() => this.IsConstantFramerate);
 this.NotifyOfPropertyChange(() => this.IsConstantQuantity);
 this.NotifyOfPropertyChange(() => this.IsPeakFramerate);
 this.NotifyOfPropertyChange(() => this.IsVariableFramerate);
 this.NotifyOfPropertyChange(() => this.SelectedVideoEncoder);
 this.NotifyOfPropertyChange(() => this.SelectedFramerate);
+ this.NotifyOfPropertyChange(() => this.QualityMax);
+ this.NotifyOfPropertyChange(() => this.QualityMin);
 this.NotifyOfPropertyChange(() => this.RF);
 this.NotifyOfPropertyChange(() => this.DisplayRF);
+ this.NotifyOfPropertyChange(() => this.IsLossless);
 this.NotifyOfPropertyChange(() => this.Task.VideoBitrate);
+ this.NotifyOfPropertyChange(() => this.Task.Quality);
 this.NotifyOfPropertyChange(() => this.Task.TwoPass);
 this.NotifyOfPropertyChange(() => this.Task.TurboFirstPass);
 
@@ -819,6 +1211,11 @@
 this.NotifyOfPropertyChange(() => this.H264Profile);
 this.NotifyOfPropertyChange(() => this.FastDecode);
 this.NotifyOfPropertyChange(() => this.ExtraArguments);
+ this.NotifyOfPropertyChange(() => this.QsvPreset);
+
+ this.NotifyOfPropertyChange(() => this.H265Profile);
+ this.NotifyOfPropertyChange(() => this.X265Preset);
+ this.NotifyOfPropertyChange(() => this.X265Tune);
 }
 
 /// <summary>
@@ -829,7 +1226,16 @@
 /// </param>
 public void SetEncoder(VideoEncoder encoder)
 {
+ this.DisplayH264Options = encoder == VideoEncoder.X264 || encoder == VideoEncoder.QuickSync;
 this.DisplayX264Options = encoder == VideoEncoder.X264;
+ this.DisplayQSVOptions = encoder == VideoEncoder.QuickSync;
+ this.DisplayX265Options = encoder == VideoEncoder.X265;
+ this.DisplayTurboFirstPass = encoder == VideoEncoder.X264;
+
+ if (encoder == VideoEncoder.QuickSync)
+ {
+ this.UseAdvancedTab = false;
+ }
 }
 
 /// <summary>
@@ -839,7 +1245,7 @@
 {
 this.NotifyOfPropertyChange(() => this.Task);
 
- if (Task.OutputFormat == OutputFormat.Mp4 && this.SelectedVideoEncoder == VideoEncoder.Theora)
+ if ((Task.OutputFormat == OutputFormat.Mp4) && this.SelectedVideoEncoder == VideoEncoder.Theora)
 {
 this.SelectedVideoEncoder = VideoEncoder.X264;
 }
@@ -858,6 +1264,18 @@
 this.H264Level = "Auto";
 this.ExtraArguments = string.Empty;
 this.canClear = true;
+
+ this.H265Profile = x265Profile.None;
+ this.x265PresetValue = 1;
+ this.X265Tune = x265Tune.None;
+ }
+
+ /// <summary>
+ /// The copy query.
+ /// </summary>
+ public void CopyQuery()
+ {
+ Clipboard.SetDataObject(this.SelectedVideoEncoder == VideoEncoder.X264 ? this.GetActualx264Query() : this.ExtraArguments);
 }
 
 #endregion
@@ -876,11 +1294,17 @@
 this.QualityMin = 1;
 this.QualityMax = 31;
 break;
+ case VideoEncoder.QuickSync:
+ this.QualityMin = 0;
+ this.QualityMax = 51;
+ break;
 case VideoEncoder.X264:
+ case VideoEncoder.X265:
 this.QualityMin = 0;
 this.QualityMax = (int)(51 / userSettingService.GetUserSetting<double>(UserSettingConstants.X264Step));
 break;
 case VideoEncoder.Theora:
+ case VideoEncoder.VP8:
 this.QualityMin = 0;
 this.QualityMax = 63;
 break;
@@ -906,7 +1330,7 @@
 /// </returns>
 private string GetActualx264Query()
 {
- if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibHbFeatures))
+ if (!GeneralUtilities.IsLibHbPresent)
 {
 return string.Empty; // Feature is disabled.
 }
@@ -938,8 +1362,21 @@
 width = 720;
 }
 
- // TODO figure out what is wrong with this??
- return HandBrakeUtils.CreateX264OptionsString(preset, tunes, this.ExtraArguments, profile, this.H264Level, width, height);
+ try
+ {
+ return HandBrakeUtils.CreateX264OptionsString(
+ preset,
+ tunes,
+ this.ExtraArguments,
+ profile,
+ this.H264Level,
+ width,
+ height);
+ }
+ catch (Exception)
+ {
+ return "Error: Libhb not loaded.";
+ }
 }
 
 /// <summary>
@@ -958,5 +1395,63 @@
 this.NotifyOfPropertyChange(() => this.ShowAdvancedTab);
 }
 }
+
+ /// <summary>
+ /// The set rf.
+ /// </summary>
+ /// <param name="quality">
+ /// The quality.
+ /// </param>
+ private void SetRF(double? quality)
+ {
+ double cqStep = userSettingService.GetUserSetting<double>(UserSettingConstants.X264Step);
+ double rfValue = 0;
+ this.SetQualitySliderBounds();
+ switch (this.SelectedVideoEncoder)
+ {
+ case VideoEncoder.FFMpeg:
+ case VideoEncoder.FFMpeg2:
+ if (quality.HasValue)
+ {
+ int cq;
+ int.TryParse(quality.Value.ToString(CultureInfo.InvariantCulture), out cq);
+ this.RF = 32 - cq;
+ }
+ break;
+ case VideoEncoder.VP8:
+ if (quality.HasValue)
+ {
+ int cq;
+ int.TryParse(quality.Value.ToString(CultureInfo.InvariantCulture), out cq);
+ this.RF = 63 - cq;
+ }
+ break;
+ case VideoEncoder.X265:
+ case VideoEncoder.X264:
+ case VideoEncoder.QuickSync:
+
+ if (this.SelectedVideoEncoder == VideoEncoder.QuickSync)
+ {
+ cqStep = 1;
+ }
+ double multiplier = 1.0 / cqStep;
+ if (quality.HasValue)
+ {
+ rfValue = quality.Value * multiplier;
+ }
+
+ this.RF = this.QualityMax - (int)Math.Round(rfValue, 0);
+
+ break;
+
+ case VideoEncoder.Theora:
+
+ if (quality.HasValue)
+ {
+ this.RF = (int)quality.Value;
+ }
+ break;
+ }
+ }
 }
 }
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/ViewModelBase.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/AddPresetView.xaml -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/AddPresetView.xaml Changed

@@ -5,7 +5,7 @@
 xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
+ xmlns:Properties="clr-namespace:HandBrakeWPF.Properties" xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
 Title="{Binding Title}"
 Width="350"
 ResizeMode="NoResize"
@@ -25,8 +25,7 @@
 </Window.Resources>
 
 <Grid HorizontalAlignment="Stretch"
- VerticalAlignment="Stretch"
- Background="#FFF1F0EF">
+ VerticalAlignment="Stretch">
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
 <RowDefinition Height="Auto" />
@@ -34,12 +33,32 @@
 <RowDefinition Height="Auto" />
 </Grid.RowDefinitions>
 
+ <Grid.Style>
+ <Style TargetType="Grid">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="#FFF1F0EF" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Grid.Style>
+
+
 
 <StackPanel Grid.Row="0"
 Height="30"
 Margin="0,0,0,10"
- Background="White"
 Orientation="Horizontal">
+ <StackPanel.Style>
+ <Style TargetType="StackPanel">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="White" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </StackPanel.Style>
+ 
 <Image Width="24"
 Height="24"
 Margin="10,0,5,0"
@@ -88,7 +107,7 @@
 Grid.Column="0"
 Style="{StaticResource LongToolTipHolder}"
 ToolTip="{x:Static Properties:Resources.AddPreset_PictureSizeMode}"
- Text="Picture Size:" />
+ Text="Max Picture Size:" />
 <ComboBox Grid.Row="2"
 Grid.Column="1"
 Width="125"
@@ -106,11 +125,13 @@
 Orientation="Horizontal"
 Visibility="{Binding ShowCustomInputs,
 Converter={StaticResource boolToVisConverter}}">
- <TextBox Width="50" Text="{Binding CustomWidth}" />
+ <controls:NumberBox Width="60" Number="{Binding CustomWidth, Mode=TwoWay}" HorizontalAlignment="Left" Margin="0,0,0,5" 
+ AllowEmpty="True" />
 <TextBlock Margin="10,0,10,0"
 FontWeight="Bold"
 Text="X" />
- <TextBox Width="50" Text="{Binding CustomHeight}" />
+ <controls:NumberBox Width="60" Number="{Binding CustomHeight, Mode=TwoWay}" HorizontalAlignment="Left" Margin="0,0,0,5" 
+ AllowEmpty="True" />
 </StackPanel>
 
 <CheckBox Grid.Row="4"
@@ -132,8 +153,18 @@
 
 
 <Grid Grid.Row="3"
- Margin="0,20,0,0"
- Background="LightGray">
+ Margin="0,20,0,0">
+
+ <Grid.Style>
+ <Style TargetType="Grid">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="LightGray" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Grid.Style>
+ 
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="*" />
 <ColumnDefinition Width="Auto" />

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/AudioView.xaml -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/AudioView.xaml Changed

@@ -9,10 +9,14 @@
 xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation"
+ xmlns:dropButton="clr-namespace:HandBrakeWPF.Controls.DropButton"
+ xmlns:splitButton="clr-namespace:HandBrakeWPF.Controls.SplitButton"
 xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
+ xmlns:helpers="clr-namespace:HandBrakeWPF.Helpers"
 d:DesignHeight="170"
 d:DesignWidth="616"
- mc:Ignorable="d">
+ mc:Ignorable="d"
+ x:Name="audioTab">
 
 <UserControl.Resources>
 <Conveters:EnumComboConverter x:Key="enumComboConverter" />
@@ -20,8 +24,9 @@
 <Conveters:BooleanToHiddenVisibilityConverter x:Key="boolToHiddenVisConverter" />
 <Audio:AudioBitrateConverter x:Key="audioBitrateConverter" />
 <Audio:AudioEncoderConverter x:Key="audioEncoderConverter" />
+ <Audio:AudioBehaviourConverter x:Key="audioBehaviourConverter" />
 </UserControl.Resources>
- 
+
 <Grid>
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
@@ -29,79 +34,85 @@
 <RowDefinition Height="*" />
 </Grid.RowDefinitions>
 
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+
+ 
 <TextBlock Grid.Row="0"
 Margin="10,5,0,0"
 FontWeight="Bold"
- Text="Audio Tracks" />
+ VerticalAlignment="Top"
+ Text="{Binding PanelTitle}" />
 
- <Grid Grid.Row="1" Margin="10,5,10,0">
+ <Grid Grid.Row="0" Grid.Column="1" Margin="0,5,10,0">
+ <Border cal:Message.Attach="[Event MouseDown] = [Action ShowAudioDefaults]">
+ <StackPanel Orientation="Horizontal">
+ <Image Source="../Views/Images/Advanced.png" Width="20" />
+ <TextBlock Text="{Binding SwitchDisplayTitle}" VerticalAlignment="Center" Margin="5,0,0,0" />
+ </StackPanel>
+ </Border>
+ </Grid>
+
+ 
+
+ <Grid Grid.Row="1" Margin="10,5,10,0" Grid.Column="0"
+ Visibility="{Binding ShowAudioDefaultsPanel, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="Auto" />
 <ColumnDefinition Width="*" />
 <ColumnDefinition Width="Auto" />
 </Grid.ColumnDefinitions>
- <Button Grid.Column="0"
- MaxWidth="95"
+
+ <StackPanel Orientation="Horizontal" Grid.Row="0">
+ <splitButton:SplitMenuButton Content="Add Track" cal:Message.Attach="[Event Click] = [Action Add]" FontWeight="Bold" Margin="0,0,10,0">
+ <splitButton:SplitMenuButton.ItemSource>
+ <MenuItem Header="Add New Track" cal:Message.Attach="[Event Click] = [Action Add]" />
+ <MenuItem Header="Add All Remaining Tracks" cal:Message.Attach="[Event Click] = [Action AddAllRemaining]" />
+ <MenuItem Header="Add All Remaining Selected Languages" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />
+ </splitButton:SplitMenuButton.ItemSource>
+ </splitButton:SplitMenuButton>
+
+ <Button MinWidth="65"
 Margin="0,0,10,0"
- cal:Message.Attach="[Event Click] = [Action Add]"
- Content="Add Track" />
-
- <StackPanel Grid.Column="2"
- Orientation="Horizontal"
- Visibility="{Binding ShowPassthruOptions,
- Converter={StaticResource boolToVisConverter}}">
- <TextBlock Margin="5,0,5,0" Text="Auto Passthru:" VerticalAlignment="Center" />
- <CheckBox Margin="0,0,5,0"
- Content="MP3" VerticalAlignment="Center" 
- IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowMP3Pass}" />
- <CheckBox Margin="0,0,5,0"
- Content="AAC" VerticalAlignment="Center"
- IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowAACPass}" />
- <CheckBox Margin="0,0,5,0"
- Content="AC3" VerticalAlignment="Center"
- IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowAC3Pass}" />
- <CheckBox Margin="0,0,5,0"
- Content="DTS" VerticalAlignment="Center"
- IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowDTSPass}" />
- <CheckBox Margin="0,0,5,0"
- Content="DTSHD" VerticalAlignment="Center"
- IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowDTSHDPass}" />
- <TextBlock Margin="5,0,5,0" Text="Fallback:" />
+ cal:Message.Attach="[Event Click] = [Action Clear]"
+ Content="Clear" />
 
- <ComboBox Grid.Column="3" VerticalAlignment="Center"
- Width="100"
- Height="22"
- Margin="10,0,5,0">
- <ComboBox.SelectedItem>
- <MultiBinding Converter="{StaticResource audioEncoderConverter}">
- <Binding Path="Task.AllowedPassthruOptions.AudioEncoderFallback" />
- </MultiBinding>
- </ComboBox.SelectedItem>
- <ComboBox.ItemsSource>
- <MultiBinding Converter="{StaticResource audioEncoderConverter}" ConverterParameter="True">
- <Binding Path="DataContext.AudioEncoders" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
- <Binding Path="DataContext.Task" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
- </MultiBinding>
- </ComboBox.ItemsSource>
- </ComboBox>
 
 </StackPanel>
-
 </Grid>
 
- <ListBox Grid.Row="2"
+ 
+
+ <ListBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"
+ Visibility="{Binding ShowAudioDefaultsPanel, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"
 Margin="10,10,10,10"
- Background="LightGray"
 dd:DragDrop.DropHandler="{Binding}"
 dd:DragDrop.IsDragSource="True"
 dd:DragDrop.IsDropTarget="True"
 ItemsSource="{Binding Task.AudioTracks}"
 SelectionMode="Extended">
+ <ListBox.Style>
+ <Style TargetType="ListBox">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="LightGray" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </ListBox.Style>
+
 <ListBox.ItemContainerStyle>
 <Style TargetType="ListBoxItem">
 <Setter Property="HorizontalContentAlignment" Value="Stretch" />
- <Setter Property="Background" Value="WhiteSmoke" />
 <Setter Property="Margin" Value="0,0,0,1" />
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding DataContext.UseSystemColours, ElementName=audioTab}" Value="False">
+ <Setter Property="Background" Value="WhiteSmoke" />
+ </DataTrigger>
+ </Style.Triggers>
 </Style>
 </ListBox.ItemContainerStyle>
 
@@ -119,7 +130,7 @@
 
 <ListBox.ItemTemplate>
 <DataTemplate>
- 
+
 <Grid HorizontalAlignment="Stretch">
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
@@ -139,10 +150,10 @@
 Source="Images/Movies.png" />
 
 
- <Grid Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch">
+ <Grid Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch" Margin="0,5,0,5">
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="*" MaxWidth="160" />
+ <ColumnDefinition Width="Auto"/>
 <ColumnDefinition Width="Auto" />
 <ColumnDefinition Width="Auto" />
 <ColumnDefinition Width="Auto" />
@@ -156,33 +167,16 @@
 
 <Grid.RowDefinitions>
 <RowDefinition Height="28" />
- <RowDefinition Height="28" />
 </Grid.RowDefinitions>
 
 
-
- <TextBlock Grid.Column="0"
- VerticalAlignment="Center"
- FontWeight="Bold"
- Text="Source" />
- <ComboBox Grid.Column="1"
- Height="22"
- MaxWidth="150"
- Margin="5,0,5,0"
- HorizontalAlignment="Stretch"
- ItemsSource="{Binding DataContext.SourceTracks,
- RelativeSource={RelativeSource FindAncestor,
- AncestorType={x:Type UserControl}}}"
+ <TextBlock Grid.Column="0" VerticalAlignment="Center" FontWeight="Bold" Text="Source" />
+ <ComboBox Grid.Column="1" Height="22" Width="100" Margin="5,0,5,0" HorizontalAlignment="Stretch"
+ ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
 SelectedItem="{Binding ScannedTrack}" />
 
- <TextBlock Grid.Column="2"
- VerticalAlignment="Center"
- FontWeight="Bold"
- Text="Codec" />
- <ComboBox Grid.Column="3"
- Width="100"
- Height="22"
- Margin="5,0,5,0">
+ <TextBlock Grid.Column="2" VerticalAlignment="Center" FontWeight="Bold" Text="Codec" />
+ <ComboBox Grid.Column="3" Width="100" Height="22" Margin="5,0,5,0">
 <ComboBox.SelectedItem>
 <MultiBinding Converter="{StaticResource audioEncoderConverter}">
 <Binding Path="Encoder" />
@@ -196,136 +190,40 @@
 </ComboBox.ItemsSource>
 </ComboBox>
 
- <TextBlock Grid.Column="4"
- VerticalAlignment="Center"
- FontWeight="Bold"
- Text="Bitrate"
- Visibility="{Binding CannotSetBitrate,
- Converter={StaticResource boolToVisConverter},
- ConverterParameter=true}" />
- <ComboBox Grid.Column="5"
- Width="70"
- Height="22"
- Margin="5,0,5,0"
- ItemsSource="{Binding TrackReference,
- Converter={StaticResource audioBitrateConverter}}"
+ <TextBlock Grid.Column="4" VerticalAlignment="Center" FontWeight="Bold" Text="Bitrate"
+ Visibility="{Binding CannotSetBitrate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <ComboBox Grid.Column="5" Width="55" Height="22" Margin="5,0,5,0" ItemsSource="{Binding TrackReference, Converter={StaticResource audioBitrateConverter}}"
 SelectedItem="{Binding Bitrate}"
- Visibility="{Binding CannotSetBitrate,
- Converter={StaticResource boolToVisConverter},
- ConverterParameter=true}" />
-
- <TextBlock Grid.Column="6"
- VerticalAlignment="Center"
- FontWeight="Bold"
- Text="Samplerate"
- Visibility="{Binding IsPassthru,
- Converter={StaticResource boolToVisConverter},
- ConverterParameter=true}" />
- <ComboBox Grid.Column="7"
- Width="70"
- Height="22"
- Margin="5,0,5,0"
- ItemsSource="{Binding DataContext.SampleRates,
- RelativeSource={RelativeSource FindAncestor,
- AncestorType={x:Type UserControl}}}"
- SelectedItem="{Binding SampleRateDisplayValue}"
- Visibility="{Binding IsPassthru,
- Converter={StaticResource boolToVisConverter},
- ConverterParameter=true}" />
+ Visibility="{Binding CannotSetBitrate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+
 
 
- <TextBlock Grid.Row="1"
- Grid.Column="0"
- VerticalAlignment="Center"
- FontWeight="Bold"
- Text="Mixdown"
- Visibility="{Binding IsPassthru,
- Converter={StaticResource boolToVisConverter},
- ConverterParameter=true}" />
- <ComboBox Grid.Row="1"
- Grid.Column="1"
- Height="22"
- MaxWidth="300"
- Margin="5,0,5,0"
- HorizontalAlignment="Stretch"
- ItemsSource="{Binding DataContext.AudioMixdowns,
- Converter={StaticResource enumComboConverter},
- RelativeSource={RelativeSource FindAncestor,
- AncestorType={x:Type UserControl}}}"
- SelectedItem="{Binding MixDown,
- Converter={StaticResource enumComboConverter}}"
- Visibility="{Binding IsPassthru,
- Converter={StaticResource boolToVisConverter},
- ConverterParameter=true}" />
-
- <TextBlock Grid.Row="1"
- Grid.Column="2"
- VerticalAlignment="Center"
- FontWeight="Bold"
- Text="DRC"
- Visibility="{Binding IsPassthru,
- Converter={StaticResource boolToVisConverter},
- ConverterParameter=true}" />
-
- <NumericUpDown:NumericUpDown Name="drcNumericCtl"
- Grid.Row="1"
- Grid.Column="3"
- Width="45"
- Margin="5,0,5,0"
- HorizontalAlignment="Left"
- DecimalPlace="1"
- LargeChange="0.1"
- Maximum="4"
- Minimum="0"
- SmallChange="0.1"
- Visibility="{Binding IsPassthru,
- Converter={StaticResource boolToHiddenVisConverter},
- ConverterParameter=true}"
- Value="{Binding DRC,
- Mode=TwoWay}" />
-
- <TextBlock Grid.Row="1"
- Grid.Column="4"
- VerticalAlignment="Center"
- FontWeight="Bold"
- Text="Gain"
- Visibility="{Binding IsPassthru,
- Converter={StaticResource boolToVisConverter},
- ConverterParameter=true}" />
- <NumericUpDown:NumericUpDown Name="gainNumericCtl"
- Grid.Row="1"
- Grid.Column="5"
- Width="45"
- Margin="5,0,5,0"
- HorizontalAlignment="Left"
- DecimalPlace="0"
- LargeChange="1"
- Maximum="20"
- Minimum="-20"
- SmallChange="1"
- Visibility="{Binding IsPassthru,
- Converter={StaticResource boolToHiddenVisConverter},
- ConverterParameter=true}"
- Value="{Binding Gain,
- Mode=TwoWay}" />
-
- <ToggleButton Name="advancedOptionsToggle" VerticalAlignment="Center" Grid.Column="6" Grid.Row="1" Grid.ColumnSpan="2"
- FontWeight="Bold" Height="22" Padding="4,0" HorizontalAlignment="Left" >
+ <TextBlock Grid.Row="0" Grid.Column="6" VerticalAlignment="Center" FontWeight="Bold" Text="Mixdown"
+ Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <ComboBox Grid.Row="0" Grid.Column="7" Height="22" Width="120" Margin="5,0,5,0" HorizontalAlignment="Stretch"
+ ItemsSource="{Binding DataContext.AudioMixdowns, Converter={StaticResource enumComboConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
+ SelectedItem="{Binding MixDown, Converter={StaticResource enumComboConverter}}"
+ Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+
+
+
+ <ToggleButton Name="advancedOptionsToggle" VerticalAlignment="Center" Grid.Column="8" Grid.Row="0" Grid.ColumnSpan="2"
+ Padding="3,0" Height="22" HorizontalAlignment="Left" >
 <ToggleButton.Style>
 <Style TargetType="{x:Type ToggleButton}">
- <Setter Property="Content" Value="Show Advanced"/>
+ <Setter Property="Content" Value="Show"/>
 <Style.Triggers>
 <Trigger Property="IsChecked" Value="True">
- <Setter Property="Content" Value="Hide Advanced"/>
+ <Setter Property="Content" Value="Hide"/>
 </Trigger>
 <Trigger Property="IsChecked" Value="False">
- <Setter Property="Content" Value="Show Advanced"/>
+ <Setter Property="Content" Value="Show"/>
 </Trigger>
 </Style.Triggers>
 </Style>
 </ToggleButton.Style>
 </ToggleButton>
- 
+
 </Grid>
 
 
@@ -344,10 +242,32 @@
 
 <Grid Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" Visibility="{Binding IsChecked, ElementName=advancedOptionsToggle, Converter={StaticResource boolToVisConverter}}">
 <StackPanel Orientation="Horizontal" Margin="0,5,0,5" >
- <TextBlock Text="Track Name:" VerticalAlignment="Center" FontWeight="Bold" Margin="0,0,5,0" />
+
+ <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="Samplerate"
+ Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <ComboBox Width="70" Height="22" Margin="5,0,5,0"
+ ItemsSource="{Binding DataContext.SampleRates, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
+ SelectedItem="{Binding SampleRateDisplayValue}"
+ Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+
+ <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="DRC"
+ Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+
+ <controls:NumberBox Name="drcNumericCtl" Width="45" Margin="5,0,5,0" HorizontalAlignment="Left"
+ Minimum="0" Modulus="0.1" Maximum="4" Number="{Binding DRC, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
+ Visibility="{Binding IsPassthru, Converter={StaticResource boolToHiddenVisConverter}, ConverterParameter=true}"/>
+
+ <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="Gain"
+ Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+
+ <controls:NumberBox Name="gainNumericCtl" Width="45" Margin="5,0,5,0" HorizontalAlignment="Left"
+ Minimum="-20" Modulus="1" Maximum="20" Number="{Binding Gain, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
+ Visibility="{Binding IsPassthru, Converter={StaticResource boolToHiddenVisConverter}, ConverterParameter=true}"/>
+
+ <TextBlock Text="Track Name:" VerticalAlignment="Center" FontWeight="Bold" Margin="5,0,5,0" />
 <TextBox Text="{Binding TrackName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="138" Height="22" />
+
 </StackPanel>
- 
 </Grid>
 </Grid>
 
@@ -355,5 +275,114 @@
 </ListBox.ItemTemplate>
 </ListBox>
 
+ <StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="10,10,10,10"
+ Visibility="{Binding ShowAudioDefaultsPanel, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">
+
+ <Grid Margin="5,0,0,0" >
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ 
+ <TextBlock Text="Track Selection Behaviour:" Grid.Column="0" Grid.Row="0" Margin="0,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
+ <ComboBox Name="autoAudioMode" Grid.Column="1" Grid.Row="0" HorizontalAlignment="Left"
+ ItemsSource="{Binding AudioBehaviourModeList, Converter={StaticResource audioBehaviourConverter}}" 
+ SelectedItem="{Binding AudioBehaviours.SelectedBehaviour, Converter={StaticResource audioBehaviourConverter}}" Width="210" Margin="0,0,5,0" />
+ </Grid>
+
+ <TextBlock Text="Choose Languages:" Margin="5,15,0,5" />
+
+ <Grid Margin="20,5,0,0">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <StackPanel Orientation="Horizontal">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <StackPanel Orientation="Vertical" Grid.Column="0">
+ <TextBlock Text="Available Languages:" Margin="0,0,0,5"/>
+ <ListBox Name="availableLanguages" ItemsSource="{Binding AvailableLanguages}" 
+ helpers:ListBoxHelper.SelectedItems="{Binding SelectedAvailableToMove}" 
+ SelectionMode="Extended" Width="140" Height="120" />
+ </StackPanel>
+
+ <DockPanel Grid.Column="1" Margin="10,0,10,0">
+ <StackPanel Orientation="Vertical" VerticalAlignment="Center">
+ <Button Content="Move Right" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" MaxWidth="90" />
+ <Button Content="Move Left" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" MaxWidth="90" />
+ <Button Content="Clear" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageClearAll]" Width="80"/>
+ </StackPanel>
+ </DockPanel>
+
+ <StackPanel Orientation="Vertical" Grid.Column="2">
+ <TextBlock Text="Chosen Languages:" Margin="0,0,0,5"/>
+ <ListBox Name="selectedLangauges" ItemsSource="{Binding AudioBehaviours.SelectedLangauges}" 
+ helpers:ListBoxHelper.SelectedItems="{Binding SelectedLangaugesToMove}" 
+ SelectionMode="Extended" Width="140" Height="120"
+ dd:DragDrop.DropHandler="{Binding}"
+ dd:DragDrop.IsDragSource="True"
+ dd:DragDrop.IsDropTarget="True"/>
+ </StackPanel>
+ </Grid>
+ </StackPanel>
+ </Grid>
+
+ <TextBlock Text="Automatic Passthru Behaviours:" FontWeight="Bold" Margin="0,20,0,5" />
+ <StackPanel Margin="10,5,0,0"
+ Orientation="Horizontal">
+ <TextBlock Margin="5,0,5,0" Text="Allow passthrough of:" VerticalAlignment="Center" />
+ <CheckBox Margin="0,0,5,0"
+ Content="MP3" VerticalAlignment="Center" 
+ IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowMP3Pass}" />
+ <CheckBox Margin="0,0,5,0"
+ Content="AAC" VerticalAlignment="Center"
+ IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowAACPass}" />
+ <CheckBox Margin="0,0,5,0"
+ Content="AC3" VerticalAlignment="Center"
+ IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowAC3Pass}" />
+ <CheckBox Margin="0,0,5,0"
+ Content="DTS" VerticalAlignment="Center"
+ IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowDTSPass}" />
+ <CheckBox Margin="0,0,5,0"
+ Content="DTSHD" VerticalAlignment="Center"
+ IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowDTSHDPass}" />
+ 
+ <TextBlock Margin="15,0,5,0" Text="Fallback Encoder:" />
+
+ <ComboBox VerticalAlignment="Center" Width="100" Height="22" Margin="10,0,5,0">
+ <ComboBox.SelectedItem>
+ <MultiBinding Converter="{StaticResource audioEncoderConverter}">
+ <Binding Path="Task.AllowedPassthruOptions.AudioEncoderFallback" />
+ </MultiBinding>
+ </ComboBox.SelectedItem>
+ <ComboBox.ItemsSource>
+ <MultiBinding Converter="{StaticResource audioEncoderConverter}" ConverterParameter="True">
+ <Binding Path="DataContext.AudioEncoders" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
+ <Binding Path="DataContext.Task" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
+ </MultiBinding>
+ </ComboBox.ItemsSource>
+ </ComboBox>
+
+ </StackPanel>
+
+ </StackPanel>
+
+
 </Grid>
 </UserControl>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/ChaptersView.xaml -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/ChaptersView.xaml Changed

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml Added

@@ -0,0 +1,38 @@
+<Window x:Class="HandBrakeWPF.Views.CountdownAlertView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:cal="http://www.caliburnproject.org"
+ Title="When Done Action" MinHeight="130" MinWidth="400" WindowStartupLocation="CenterScreen" WindowStyle="None"
+ ShowActivated="True" ShowInTaskbar="True" SizeToContent="WidthAndHeight">
+ <Grid>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+ <StackPanel Grid.Row="0"
+ Height="30"
+ Margin="0,0,0,10"
+ Orientation="Horizontal">
+ <Image Width="24"
+ Height="24"
+ Margin="10,0,5,0"
+ VerticalAlignment="Center"
+ Source="../Views/Images/Advanced.png" />
+ <StackPanel VerticalAlignment="Center" Orientation="Vertical">
+ <TextBlock FontWeight="Bold" Text="When Done Action" />
+ </StackPanel>
+ </StackPanel>
+ 
+ <TextBlock Text="{Binding NoticeMessage}" Grid.Row="1" Margin="40,0,10,0"/>
+
+ <StackPanel Orientation="Horizontal" Grid.Row="2" Margin="0,10,10,5" HorizontalAlignment="Right">
+ <Button Content="Proceed" HorizontalAlignment="Right" 
+ cal:Message.Attach="[Event Click] = [Action Proceed]" Padding="8,2" Margin="0,10,10,5"/>
+
+ <Button Content="Cancel Action" HorizontalAlignment="Right" Margin="0,10,10,5"
+ cal:Message.Attach="[Event Click] = [Action Cancel]" Padding="8,2" IsDefault="True" />
+ </StackPanel>
+
+ </Grid>
+</Window>

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml.cs Added

@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="CountdownAlertView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Interaction logic for CountdownAlertView.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Views
+{
+ using System.Windows;
+
+ /// <summary>
+ /// Interaction logic for CountdownAlertView.xaml
+ /// </summary>
+ public partial class CountdownAlertView : Window
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="CountdownAlertView"/> class. 
+ /// </summary>
+ public CountdownAlertView()
+ {
+ this.InitializeComponent();
+ }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/ErrorView.xaml -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/ErrorView.xaml Changed

@@ -7,13 +7,13 @@
 Height="380"
 MinWidth="680"
 MinHeight="380"
- Background="#FFF0F0F0"
+ Style="{StaticResource windowStyle}"
 FontSize="11"
 TextOptions.TextFormattingMode="Display"
- WindowStartupLocation="CenterScreen">
+ WindowStartupLocation="CenterOwner">
 <Grid>
 <Grid.RowDefinitions>
- <RowDefinition Height="70" />
+ <RowDefinition Height="Auto" />
 <RowDefinition Height="*" />
 <RowDefinition Height="Auto" />
 </Grid.RowDefinitions>
@@ -21,13 +21,23 @@
 
 <StackPanel Grid.Row="0"
 Margin="0,0,0,0"
- Background="White"
 Orientation="Horizontal">
+
+ <StackPanel.Style>
+ <Style TargetType="StackPanel">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="White" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </StackPanel.Style>
+
 <Image Width="64"
 Height="64"
- Margin="10,0,0,0"
+ Margin="10,4,0,4"
 Source="Images/ErrorX.png" />
- <Grid Height="64" Margin="10,0,0,0">
+ <Grid Margin="10,0,0,0">
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
 <RowDefinition Height="Auto" />
@@ -39,7 +49,7 @@
 Text="{Binding ErrorMessage}" />
 <TextBlock Grid.Row="1"
 Margin="0,5,0,0"
- Text="{Binding Solution}" />
+ Text="{Binding Solution}" TextWrapping="Wrap" />
 
 <TextBlock Grid.Row="2"
 Margin="0,0,0,2"
@@ -61,13 +71,23 @@
 
 
 
- <Grid Grid.Row="2" Background="LightGray">
+ <Grid Grid.Row="2">
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="*" />
 <ColumnDefinition Width="Auto" />
 <ColumnDefinition Width="Auto" />
 </Grid.ColumnDefinitions>
 
+ <Grid.Style>
+ <Style TargetType="Grid">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="LightGray" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Grid.Style>
+
 <Button Grid.Column="1"
 Margin="5"
 cal:Message.Attach="[Event Click] = [Action Copy]"

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/FiltersView.xaml -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/FiltersView.xaml Changed

@@ -3,21 +3,31 @@
 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:Converters="clr-namespace:HandBrakeWPF.Converters" mc:Ignorable="d" >
+ xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
+ xmlns:filters="clr-namespace:HandBrakeWPF.Converters.Filters"
+ mc:Ignorable="d" >
 <UserControl.Resources>
 <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
 <Converters:EnumComboConverter x:Key="boolComboConverter" />
+ <Converters:InverseBooleanConverter x:Key="inverseBooleanConverter" />
+ <filters:DenoisePresetConverter x:Key="DenoisePresetConverter" />
 </UserControl.Resources>
 
 <Grid>
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
- <RowDefinition Height="*" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
 </Grid.RowDefinitions>
 
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
 <TextBlock Text="Filters" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>
 
- <StackPanel Orientation="Vertical" Grid.Row="1" Margin="10,10,0,0">
+ <StackPanel Orientation="Vertical" Grid.Row="1" Grid.Column="0" Margin="10,10,0,0">
 <Grid>
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
@@ -29,37 +39,74 @@
 </Grid.RowDefinitions>
 
 <Grid.ColumnDefinitions>
- <ColumnDefinition Width="100" />
- <ColumnDefinition Width="130" />
+ <ColumnDefinition MinWidth="75" />
+ <ColumnDefinition MinWidth="160" />
 <ColumnDefinition Width="Auto" />
 </Grid.ColumnDefinitions>
 
 <TextBlock Text="Detelecine:" Grid.Row="0" Grid.Column="0" Margin="0,0,0,10" />
 <ComboBox Width="120" Grid.Row="0" ItemsSource="{Binding DetelecineOptions, Converter={StaticResource boolComboConverter}}" 
- SelectedItem="{Binding SelectedDetelecine, Converter={StaticResource boolComboConverter}}" Grid.Column="1" Margin="0,0,0,10"/>
- <TextBox Width="120" Grid.Row="0" Grid.Column="2" Margin="0,0,0,10" Text="{Binding CustomDetelecine}"
+ SelectedItem="{Binding SelectedDetelecine, Converter={StaticResource boolComboConverter}}" Grid.Column="1" Margin="0,0,0,10"
+ HorizontalAlignment="Left"/>
+ <TextBox Width="120" Grid.Row="0" Grid.Column="2" Margin="0,0,0,10" Text="{Binding CustomDetelecine}" HorizontalAlignment="Left"
 Visibility="{Binding ShowDetelecineCustom, Converter={StaticResource boolToVisConverter}}"/>
 
- <TextBlock Text="Decomb:" Grid.Row="1" Grid.Column="0" Margin="0,0,0,10"/>
- <ComboBox Width="120" Grid.Row="1" ItemsSource="{Binding DecombOptions, Converter={StaticResource boolComboConverter}}" 
- SelectedItem="{Binding SelectedDecomb, Converter={StaticResource boolComboConverter}}" Grid.Column="1" Margin="0,0,0,10"/>
- <TextBox Width="120" Grid.Row="1" Grid.Column="2" Margin="0,0,0,10" Text="{Binding CustomDecomb}"
+ <TextBlock Text="{Binding DeinterlaceControlText}" Grid.Row="1" Grid.Column="0" Margin="0,0,0,10" VerticalAlignment="Top"/>
+ <StackPanel Grid.Row="1" Grid.Column="1" >
+ <StackPanel Orientation="Horizontal">
+ <RadioButton GroupName="Interlace" Content="Deinterlace" IsChecked="{Binding IsDeinterlaceMode}" />
+ <RadioButton GroupName="Interlace" Content="Decomb" Margin="10,0,0,0" IsChecked="{Binding IsDeinterlaceMode, Converter={StaticResource inverseBooleanConverter}}" />
+ </StackPanel>
+
+ <ComboBox Width="120" ItemsSource="{Binding DecombOptions, Converter={StaticResource boolComboConverter}}" HorizontalAlignment="Left"
+ SelectedItem="{Binding SelectedDecomb, Converter={StaticResource boolComboConverter}}" Margin="0,0,0,10"
+ Visibility="{Binding IsDeinterlaceMode, Converter={StaticResource boolToVisConverter}, ConverterParameter=True}" />
+
+ <ComboBox Width="120" ItemsSource="{Binding DeInterlaceOptions, Converter={StaticResource boolComboConverter}}" HorizontalAlignment="Left"
+ SelectedItem="{Binding SelectedDeInterlace, Converter={StaticResource boolComboConverter}}" Margin="0,0,0,10"
+ Visibility="{Binding IsDeinterlaceMode, Converter={StaticResource boolToVisConverter}}" />
+ </StackPanel>
+
+ <TextBox Width="120" Grid.Row="1" Grid.Column="2" Text="{Binding CustomDecomb}" VerticalAlignment="Top" HorizontalAlignment="Left"
 Visibility="{Binding ShowDecombCustom, Converter={StaticResource boolToVisConverter}}" />
 
- <TextBlock Text="Deinterlace:" Grid.Row="2" Grid.Column="0" Margin="0,0,0,10"/>
- <ComboBox Width="120" Grid.Row="2" ItemsSource="{Binding DeInterlaceOptions, Converter={StaticResource boolComboConverter}}"
- SelectedItem="{Binding SelectedDeInterlace, Converter={StaticResource boolComboConverter}}" Grid.Column="1" Margin="0,0,0,10"/>
- <TextBox Width="120" Grid.Row="2" Grid.Column="2" Margin="0,0,0,10" Text="{Binding CustomDeinterlace}"
+ <TextBox Width="120" Grid.Row="1" Grid.Column="2" Text="{Binding CustomDeinterlace}" VerticalAlignment="Top" HorizontalAlignment="Left"
 Visibility="{Binding ShowDeinterlaceCustom, Converter={StaticResource boolToVisConverter}}" />
 
 <TextBlock Text="Denoise:" Grid.Row="3" Grid.Column="0" Margin="0,0,0,10"/>
 <ComboBox Width="120" Grid.Row="3" ItemsSource="{Binding DenoiseOptions, Converter={StaticResource boolComboConverter}}" 
- SelectedItem="{Binding SelectedDenoise, Converter={StaticResource boolComboConverter}}" Grid.Column="1" Margin="0,0,0,10"/>
- <TextBox Width="120" Grid.Row="3" Grid.Column="2" Margin="0,0,0,10" Text="{Binding CustomDenoise}"
- Visibility="{Binding ShowDenoiseCustom, Converter={StaticResource boolToVisConverter}}" />
+ SelectedItem="{Binding SelectedDenoise, Converter={StaticResource boolComboConverter}}" Grid.Column="1"
+ HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,0,0,10" />
+
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Grid.Row="3" Grid.Column="2" Margin="0,0,0,10" 
+ Visibility="{Binding ShowDenoiseOptions, Converter={StaticResource boolToVisConverter}}">
+ <TextBlock Text="Preset: " Margin="5,0,5,0" />
+ <ComboBox SelectedItem="{Binding SelectedDenoisePreset}" 
+ MinWidth="100" HorizontalAlignment="Center" VerticalAlignment="Center">
+ <ComboBox.ItemsSource>
+ <MultiBinding Converter="{StaticResource DenoisePresetConverter}">
+ <Binding Path="DenoisePresets" />
+ <Binding Path="SelectedDenoise" />
+ </MultiBinding>
+ </ComboBox.ItemsSource>
+ </ComboBox>
+
+ <StackPanel Orientation="Horizontal" Visibility="{Binding ShowDenoiseTune, Converter={StaticResource boolToVisConverter}}">
+ <TextBlock Text="Tune: " Margin="5,0,5,0" />
+ <ComboBox ItemsSource="{Binding DenoiseTunes}" SelectedItem="{Binding SelectedDenoiseTune}" MinWidth="100"
+ Visibility="{Binding ShowDenoiseTunes, Converter={StaticResource boolToVisConverter}}" VerticalAlignment="Center" />
+ </StackPanel>
+
+ <StackPanel Orientation="Horizontal" Visibility="{Binding ShowDenoiseCustom, Converter={StaticResource boolToVisConverter}}">
+ <TextBlock Text="Custom: " Margin="5,0,5,0" />
+ <TextBox Width="120" Margin="0" Text="{Binding CustomDenoise}" VerticalAlignment="Center" />
+ </StackPanel>
+
+ </StackPanel>
 
 <TextBlock Text="Deblock:" Grid.Row="4" Grid.Column="0" Margin="0,0,0,10"/>
- <Slider Width="120" Value="{Binding DeblockValue}" TickPlacement="BottomRight" Minimum="4" Maximum="15" Grid.Row="4" Grid.Column="1" Margin="0,0,0,10"/>
+ <Slider Width="120" Value="{Binding DeblockValue}" TickPlacement="BottomRight" Minimum="4" Maximum="15" Grid.Row="4" Grid.Column="1" Margin="0,0,0,10"
+ HorizontalAlignment="Left" />
 <TextBlock Text="{Binding DeblockText}" Grid.Row="4" Grid.Column="2" Margin="0,0,0,10"/>
 
 <CheckBox Content="Grayscale" IsChecked="{Binding Grayscale}" Grid.Row="5" Grid.Column="1" Margin="0,0,0,10"/>

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Advanced.png Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/Images/Disc.png Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/Images/File32.png Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/copy.png -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/Images/copy.png Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/disc_small.png -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/Images/disc_small.png Changed

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/Images/file.png Added

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/folder.png -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/Images/folder.png Changed

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/Images/folder32.png Added

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/InstantView.xaml Added

@@ -0,0 +1,202 @@
+<UserControl x:Class="HandBrakeWPF.Views.InstantView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:cal="http://www.caliburnproject.org"
+ xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
+ xmlns:converters="clr-namespace:HandBrakeWPF.Converters"
+ xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+ mc:Ignorable="d" 
+ cal:Message.Attach="[Event Loaded] = [Action Load]"
+ >
+
+ <i:Interaction.Triggers>
+ <i:EventTrigger EventName="Drop">
+ <cal:ActionMessage MethodName="FilesDroppedOnWindow">
+ <cal:Parameter Value="$eventArgs" />
+ </cal:ActionMessage>
+ </i:EventTrigger>
+ </i:Interaction.Triggers>
+
+ <UserControl.Resources>
+ <converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
+ </UserControl.Resources>
+
+ 
+ <Grid>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+
+ 
+ <StackPanel Orientation="Vertical" Grid.Row="0">
+ 
+ <StackPanel Margin="10,5,5,5"
+ HorizontalAlignment="Stretch"
+ VerticalAlignment="Stretch"
+ >
+ <StackPanel Orientation="Horizontal">
+ <Label Content="Source" FontWeight="Bold" />
+ </StackPanel>
+
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="8,10,0,10">
+
+ <TextBlock Text="Drag and Drop a file - OR - Open a " />
+ <Button cal:Message.Attach="[Event Click] = [Action FileScan]" Padding="8,2">
+ File
+ </Button>
+ <TextBlock Text="- OR -" FontWeight="Bold" Margin="10,0,10,0" />
+ <Button cal:Message.Attach="[Event Click] = [Action FolderScan]" Padding="8,2">
+ Folder
+ </Button>
+
+ </StackPanel>
+
+ <ListBox Grid.Row="2"
+ Margin="10,10,10,10"
+ MinHeight="150" MaxHeight="150"
+ VerticalAlignment="Stretch"
+ Background="LightGray"
+ ItemsSource="{Binding TitleList}"
+ SelectionMode="Single">
+ <ListBox.ItemContainerStyle>
+ <Style TargetType="ListBoxItem">
+ <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+ <Setter Property="Background" Value="WhiteSmoke" />
+ <Setter Property="Margin" Value="0,0,0,1" />
+ </Style>
+ </ListBox.ItemContainerStyle>
+
+ <ListBox.ContextMenu>
+ <ContextMenu>
+ <MenuItem Header="Select All" cal:Message.Attach="[Event Click] = [Action SelectAll]" />
+ <MenuItem Header="Deselect All" cal:Message.Attach="[Event Click] = [Action UnSelectAll]" />
+ <Separator />
+ <MenuItem Header="Order by Title" IsChecked="{Binding OrderedByTitle}" cal:Message.Attach="[Event Click] = [Action OrderByTitle]" />
+ <MenuItem Header="Order by Duration" IsChecked="{Binding OrderedByDuration}" cal:Message.Attach="[Event Click] = [Action OrderByDuration]" />
+ </ContextMenu>
+ </ListBox.ContextMenu>
+
+ <ListBox.ItemTemplate>
+ <DataTemplate>
+ <Grid HorizontalAlignment="Stretch" MinHeight="28">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <CheckBox IsChecked="{Binding IsSelected}" Grid.RowSpan="2" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" />
+
+ <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Margin="10,0,0,0" >
+ <TextBlock Text="Title:" Margin="0,0,5,0" FontWeight="Bold" />
+ <TextBlock Text="{Binding Title}" Margin="5,0,5,0" />
+ </StackPanel>
+
+ <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" Margin="10,0,0,0" >
+ <TextBlock Text="Source:" Margin="0,0,5,0" FontWeight="Bold" />
+ <TextBlock Text="{Binding SourceName}" Margin="5,0,5,0" />
+ </StackPanel>
+ </Grid>
+
+ </DataTemplate>
+ </ListBox.ItemTemplate>
+ </ListBox>
+ </StackPanel>
+ </StackPanel>
+
+
+ 
+ <StackPanel Grid.Row="1"
+ Margin="10,5,5,5"
+ HorizontalAlignment="Stretch"
+ VerticalAlignment="Stretch"
+ >
+ <Label Content="Destination" FontWeight="Bold" />
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+ <Label Margin="8,0,0,0" Content="File" />
+ <TextBox Name="Destination"
+ Grid.Column="1"
+ Margin="8,0,0,0"
+ Text="{Binding OutputDirectory,
+ UpdateSourceTrigger=PropertyChanged}"
+ />
+ <Button Name="DestinationBrowser"
+ Grid.Column="2"
+ Margin="8,0,5,0"
+ Padding="8,2"
+ Content="Browse"
+ cal:Message.Attach="[Event Click] = [Action BrowseDestination]"
+ />
+ </Grid>
+ </StackPanel>
+
+ 
+ <StackPanel Grid.Row="2"
+ Margin="10,5,5,5"
+ HorizontalAlignment="Stretch"
+ VerticalAlignment="Stretch"
+ >
+ <Label Content="Options" FontWeight="Bold" />
+
+ <StackPanel Orientation="Horizontal" Margin="8,0,0,0">
+ <TextBlock Text="Preset:" Margin="0,0,5,0" />
+ <ComboBox ItemsSource="{Binding Presets}" SelectedItem="{Binding SelectedPreset}" MinWidth="150" />
+ </StackPanel>
+
+ </StackPanel>
+
+
+ 
+ <Grid Grid.Row="3" Margin="10,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" >
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+ <Label Content="Start" FontWeight="Bold" Grid.Row="0" />
+ <Button Content="Start Encoding" cal:Message.Attach="[Event Click] = [Action StartEncode]" FontWeight="Bold" Grid.Row="1" Padding="8,2" HorizontalAlignment="Center"
+ Visibility="{Binding IsEncoding, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <Button Content="Stop Encoding" cal:Message.Attach="[Event Click] = [Action StopEncode]" FontWeight="Bold" Grid.Row="1" Padding="8,2" HorizontalAlignment="Center" 
+ Visibility="{Binding IsEncoding, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
+ </Grid>
+
+
+ 
+ <controls:StatusPanel x:Name="loadingPanel"
+ Grid.Row="3"
+ Grid.RowSpan="2"
+ Height="70"
+ VerticalAlignment="Bottom"
+ Panel.ZIndex="10"
+ IsLoading="{Binding ShowStatusWindow}"
+ Message="{Binding StatusLabel}"
+ SubMessage="Please Wait ..."
+ />
+
+ 
+ <StatusBar Grid.Row="4" Grid.ColumnSpan="2" MinHeight="32" >
+
+ <ProgressBar Value="{Binding ProgressPercentage}" Visibility="{Binding IsEncoding, Converter={StaticResource boolToVisConverter}}"
+ Width="100" Height="18" VerticalAlignment="Center"/>
+ <Label VerticalAlignment="Center"
+ Content="{Binding Path=ProgramStatusLabel}" />
+
+ </StatusBar>
+
+ </Grid>
+</UserControl>

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/InstantView.xaml.cs Added

@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="InstantView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Interaction logic for InstantMainView.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Views
+{
+ using System.Windows.Controls;
+
+ /// <summary>
+ /// Interaction logic for InstantMainView.xaml
+ /// </summary>
+ public partial class InstantView : UserControl
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="InstantView"/> class.
+ /// </summary>
+ public InstantView()
+ {
+ InitializeComponent();
+ }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/MainView.xaml -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/MainView.xaml Changed

@@ -5,13 +5,13 @@
 xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
 xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
 xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"
- AllowDrop="True"
- Background="#FFF0F0F0"
+ xmlns:attachedProperties="clr-namespace:HandBrakeWPF.AttachedProperties"
+ AllowDrop="True"
 FontSize="11"
 Micro:Message.Attach="[Event Loaded] = [Action Load]"
 SnapsToDevicePixels="True"
 UseLayoutRounding="True"
- >
+ >
 
 <i:Interaction.Triggers>
 <i:EventTrigger EventName="Drop">
@@ -22,6 +22,8 @@
 </i:Interaction.Triggers>
 
 <UserControl.Resources>
+ <Converters:BooleanConverter x:Key="booleanConverter" />
+ <Converters:EnumComboConverter x:Key="enumComboConverter" />
 
 <Style TargetType="Button">
 <Setter Property="FontWeight" Value="Bold" />
@@ -45,9 +47,16 @@
 <Style TargetType="ListBoxItem">
 <Setter Property="Padding" Value="0,2,0,2" />
 <Style.Triggers>
- <DataTrigger Binding="{Binding IsBuildIn}" Value="True">
+ <MultiDataTrigger>
+ <MultiDataTrigger.Conditions>
+ <Condition Binding="{Binding IsBuildIn}" Value="True" />
+ <Condition Binding="{Binding DataContext.UseSystemColours, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Value="False" />
+ </MultiDataTrigger.Conditions>
 <Setter Property="Foreground" Value="DarkBlue" />
- </DataTrigger>
+ </MultiDataTrigger>
+ 
 <Trigger Property="IsSelected" Value="True">
 <Setter Property="FontWeight" Value="Bold"/>
 <Setter Property="Background" Value="Transparent"/>
@@ -95,46 +104,69 @@
 HorizontalAlignment="Stretch"
 VerticalAlignment="Top"
 >
- <MenuItem Header="File">
- <MenuItem Header="Cancel Scan" Command="{Binding CancelScanCommand}" />
+ <MenuItem Header="_File">
+ <MenuItem Header="_Cancel Scan" Command="{Binding CancelScanCommand}" />
 <Separator />
- <MenuItem Header="Exit" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" />
+ <MenuItem Header="_Exit" Micro:Message.Attach="[Event Click] = [Action ExitApplication]" InputGestureText="Alt + F4" />
 </MenuItem>
 
- <MenuItem Header="Tools">
- <MenuItem Header="Show Queue" Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]">
+ <MenuItem Header="_Tools">
+ <MenuItem Header="_Show Queue" Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]" InputGestureText="Ctrl + Q">
 <MenuItem.Icon>
 <Image Width="16" Source="Images/Queue_Small.png" />
 </MenuItem.Icon>
 </MenuItem>
- <MenuItem Header="Activity Log" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]">
+ <MenuItem Header="_Activity Log" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]" InputGestureText="Ctrl + L">
 <MenuItem.Icon>
 <Image Width="16" Source="Images/Output_Small.png" />
 </MenuItem.Icon>
 </MenuItem>
 <Separator />
- <MenuItem Header="Options" Micro:Message.Attach="[Event Click] = [Action OpenOptionsWindow]">
+ <MenuItem Header="_Options" Micro:Message.Attach="[Event Click] = [Action OpenOptionsWindow]">
 <MenuItem.Icon>
 <Image Width="16" Source="Images/Pref_Small.png" />
 </MenuItem.Icon>
 </MenuItem>
 </MenuItem>
 
- <MenuItem Header="Help">
- <MenuItem Header="HandBrake User Guide (HTTP)" Micro:Message.Attach="[Event Click] = [Action LaunchHelp]">
+
+ <MenuItem Header="_Presets" x:Name="presetMenu">
+ <MenuItem Header="_Presets" ItemsSource="{Binding Presets}">
+ <MenuItem.ItemContainerStyle>
+ <Style TargetType="MenuItem">
+ <Setter Property="Tag" Value="{Binding}" />
+ <Setter Property="Micro:Action.TargetWithoutContext" Value="{Binding DataContext, ElementName=presetMenu}"/>
+ <Setter Property="Micro:Message.Attach" Value="[Event Click] = [Action PresetSelect($this.Tag)]"/>
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding IsDefault}" Value="True">
+ <Setter Property="FontStyle" Value="Italic" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </MenuItem.ItemContainerStyle>
+ </MenuItem>
+ <Separator />
+ <MenuItem Header="_Import" Micro:Message.Attach="[Event Click] = [Action PresetImport]" />
+ <MenuItem Header="_Export" Micro:Message.Attach="[Event Click] = [Action PresetExport]" />
+ <Separator />
+ <MenuItem Header="_Set Current as Default" Micro:Message.Attach="[Event Click] = [Action PresetSetDefault]" />
+ <MenuItem Header="_Reset Built-In Presets" Micro:Message.Attach="[Event Click] = [Action PresetReset]" />
+ <Separator />
+ <MenuItem IsCheckable="True" x:Name="showPresetPanelMenuItem" IsChecked="{Binding IsPresetPanelShowing}"
+ Header="S_how Preset Panel">
+ </MenuItem>
+ </MenuItem>
+
+ <MenuItem Header="_Help">
+ <MenuItem Header="_HandBrake User Guide (HTTP)" Micro:Message.Attach="[Event Click] = [Action LaunchHelp]">
 <MenuItem.Icon>
 <Image Width="16" Height="16" Source="Images/information.png" />
 </MenuItem.Icon>
 </MenuItem>
 <Separator />
- <MenuItem Header="Check for Updates" Micro:Message.Attach="[Event Click] = [Action CheckForUpdates]" />
+ <MenuItem Header="_Check for Updates" Micro:Message.Attach="[Event Click] = [Action CheckForUpdates]" />
 <Separator />
- <MenuItem Header="About..." Micro:Message.Attach="[Event Click] = [Action OpenAboutApplication]" />
- </MenuItem>
-
- <MenuItem Header="Debug" Visibility="{Binding ShowDebugMenu, Converter={StaticResource boolToVisConverter}}" >
- <MenuItem Header="Show CLI Equiv" Micro:Message.Attach="[Event Click] = [Action ShowCliQuery]" />
- <MenuItem Header="Debug Scan Log" Micro:Message.Attach="[Event Click] = [Action DebugScanLog]" />
+ <MenuItem Header="_About..." Micro:Message.Attach="[Event Click] = [Action OpenAboutApplication]" />
 </MenuItem>
 </Menu>
 
@@ -145,36 +177,26 @@
 SnapsToDevicePixels="False"
 ToolBar.OverflowMode="Never"
 ToolBarTray.IsLocked="True"
+ KeyboardNavigation.TabNavigation="Continue"
 >
- <Menu Background="Transparent">
- <MenuItem ItemsSource="{Binding SourceMenu}">
- <MenuItem.Header>
- <StackPanel Orientation="Horizontal">
- <Image Width="32"
- Height="32"
- Source="Images/Movies.png"
- />
- <Label Margin="8,0,0,0"
- VerticalAlignment="Center"
- Content="Source"
- />
- </StackPanel>
- </MenuItem.Header>
- <MenuItem.ItemContainerStyle>
- <Style TargetType="{x:Type MenuItem}">
- <Setter Property="Header" Value="{Binding Text}" />
- <Setter Property="MenuItem.Command" Value="{Binding Command}"/>
- <Setter Property="MenuItem.CommandParameter" Value="123"/>
- <Setter Property="ItemsSource" Value="{Binding Children}" />
- <Setter Property="Icon" Value="{Binding Image}" />
- </Style>
- </MenuItem.ItemContainerStyle>
- </MenuItem>
- </Menu>
+
+ <Button Name="SelectSource" x:Uid="Choose Source" AutomationProperties.Name="Choose Source"
+ Micro:Message.Attach="[Event Click] = [Action SelectSourceWindow]">
+ <StackPanel Orientation="Horizontal">
+ <Image Width="32"
+ Height="32"
+ Source="Images/Movies.png"
+ />
+ <Label Margin="8,0,0,0"
+ VerticalAlignment="Center"
+ Content="Source"
+ />
+ </StackPanel>
+ </Button>
 
 <Separator />
 
- <Button Name="Start"
+ <Button Name="Start" AutomationProperties.Name="Start Encode"
 Micro:Message.Attach="[Event Click] = [Action StartEncode]"
 Visibility="{Binding IsEncoding,
 Converter={StaticResource boolToVisConverter},
@@ -192,7 +214,7 @@
 </StackPanel>
 </Button>
 
- <Button Name="Stop"
+ <Button Name="Stop" AutomationProperties.Name="Stop Encode"
 Micro:Message.Attach="[Event Click] = [Action StopEncode]"
 Visibility="{Binding IsEncoding,
 Converter={StaticResource boolToVisConverter},
@@ -211,11 +233,30 @@
 </StackPanel>
 </Button>
 
+ <Button Name="Pause" AutomationProperties.Name="Pause"
+ Micro:Message.Attach="[Event Click] = [Action PauseEncode]"
+ Visibility="{Binding CanPause,
+ Converter={StaticResource boolToVisConverter},
+ ConverterParameter=false}"
+ >
+ <StackPanel Orientation="Horizontal">
+ <Image Width="32"
+ Height="32"
+ SnapsToDevicePixels="True"
+ Source="Images/Pause.png"
+ />
+ <Label Margin="8,0,0,0"
+ VerticalAlignment="Center"
+ Content="Pause"
+ />
+ </StackPanel>
+ </Button>
+
 <Menu Background="Transparent">
 <MenuItem>
 <MenuItem.Header>
 <StackPanel Orientation="Horizontal">
- <Button Name="QueueDrop"
+ <Button Name="QueueDrop" AutomationProperties.Name="Add to Queue"
 HorizontalAlignment="Stretch"
 VerticalAlignment="Stretch"
 HorizontalContentAlignment="Stretch"
@@ -250,11 +291,6 @@
 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
 />
 </Border>
- <ControlTemplate.Triggers>
- <Trigger Property="IsPressed" Value="True">
- <Setter TargetName="border" Property="Background" Value="#FF98B5E2" />
- </Trigger>
- </ControlTemplate.Triggers>
 </ControlTemplate>
 </Setter.Value>
 </Setter>
@@ -269,12 +305,12 @@
 />
 </StackPanel>
 </MenuItem.Header>
- <MenuItem Header="Add All" Micro:Message.Attach="[Event Click] = [Action AddAllToQueue]" />
- 
+ <MenuItem Header="Add All" Micro:Message.Attach="[Event Click] = [Action AddAllToQueue]" AutomationProperties.Name="Add all to Queue" />
+ <MenuItem Header="Add Selection" Micro:Message.Attach="[Event Click] = [Action AddSelectionToQueue]" AutomationProperties.Name="Add Selection to Queue" />
 </MenuItem>
 </Menu>
 
- <Button Name="ShowQueue" Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]">
+ <Button Name="ShowQueue" AutomationProperties.Name="Show Queue" Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]">
 <StackPanel Orientation="Horizontal">
 <Image Width="32"
 Height="32"
@@ -290,7 +326,7 @@
 
 <Separator />
 
- <Button Name="Preview" Micro:Message.Attach="[Event Click] = [Action OpenPreviewWindow]">
+ <Button Name="Preview" AutomationProperties.Name="Preview Encode" Micro:Message.Attach="[Event Click] = [Action OpenPreviewWindow]" >
 <StackPanel Orientation="Horizontal">
 <Image Width="32"
 Height="32"
@@ -304,7 +340,7 @@
 </StackPanel>
 </Button>
 
- <Button Name="ActivityWindow" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]">
+ <Button Name="ActivityWindow" AutomationProperties.Name="Activity Window" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]">
 <StackPanel Orientation="Horizontal">
 <Image Width="32"
 Height="32"
@@ -320,10 +356,10 @@
 </StackPanel>
 
 
- <Grid Grid.Row="1">
+ <Grid Grid.Row="1" IsEnabled="{Binding ShowSourceSelection, Converter={StaticResource booleanConverter}, ConverterParameter=true}">
 <Grid.ColumnDefinitions>
- <ColumnDefinition Width="*" />
- <ColumnDefinition Width="270" />
+ <ColumnDefinition Width="*" MinWidth="700"/>
+ <ColumnDefinition Width="Auto" />
 </Grid.ColumnDefinitions>
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
@@ -351,6 +387,7 @@
 SelectedItem="{Binding Path=SelectedTitle}"
 />
 <Label Margin="8,0,0,0" Content="Angle" />
+
 <ComboBox Name="Angles"
 MinWidth="60"
 Margin="8,0,0,0"
@@ -378,11 +415,11 @@
 Converter={StaticResource boolToVisConverter},
 ConverterParameter=false}"
 />
- 
- <Label Margin="8,0,0,0" Content="through" />
+
+ <Label Margin="4,0,0,0" Content="through" />
 <ComboBox Name="EndPoint"
 MinWidth="60"
- Margin="8,0,0,0"
+ Margin="4,0,0,0"
 ItemsSource="{Binding StartEndRangeItems}"
 SelectedItem="{Binding SelectedEndPoint}"
 Visibility="{Binding ShowTextEntryForPointToPointMode,
@@ -395,9 +432,10 @@
 Converter={StaticResource boolToVisConverter},
 ConverterParameter=false}"
 />
- 
- <Label Margin="8,0,0,0" Content="Duration" />
- <Label Margin="8,0,0,0" Content="{Binding Duration}" />
+
+ <Label Margin="4,0,0,0" Content="Duration" />
+ <Label Margin="4,0,0,0" Content="{Binding Duration}" />
+
 </StackPanel>
 </StackPanel>
 </StackPanel>
@@ -421,7 +459,13 @@
 Margin="8,0,0,0"
 Text="{Binding Destination,
 UpdateSourceTrigger=PropertyChanged}"
- />
+ >
+ <TextBox.ContextMenu>
+ <ContextMenu>
+ <MenuItem Header="Open this Directory" Micro:Message.Attach="[Event Click] = [Action OpenDestinationDirectory]" />
+ </ContextMenu>
+ </TextBox.ContextMenu>
+ </TextBox>
 <Button Name="DestinationBrowser"
 Grid.Column="2"
 Margin="8,0,0,0"
@@ -443,17 +487,8 @@
 <ComboBox Name="Container"
 MinWidth="100"
 Margin="8,0,0,0"
- ItemsSource="{Binding OutputFormats}"
- SelectedItem="{Binding SelectedOutputFormat}"
- />
- <CheckBox Name="LargeFileMp4"
- Margin="8,0,0,0"
- VerticalAlignment="Center"
- Content="Large File Size"
- IsChecked="{Binding Path=CurrentTask.LargeFile}"
- Visibility="{Binding IsMkv,
- Converter={StaticResource boolToVisConverter},
- ConverterParameter=true}"
+ ItemsSource="{Binding OutputFormats, Converter={StaticResource enumComboConverter}}"
+ SelectedItem="{Binding SelectedOutputFormat, Converter={StaticResource enumComboConverter}}"
 />
 <CheckBox Name="WebOptimized"
 Margin="8,0,0,0"
@@ -482,6 +517,7 @@
 Margin="10,10,5,5"
 HorizontalAlignment="Stretch"
 VerticalAlignment="Stretch"
+ MinHeight="350" MinWidth="720"
 >
 <TabItem Name="pictureTab" Header="Picture">
 <ContentControl x:Name="PictureSettingsViewModel" />
@@ -513,15 +549,15 @@
 VerticalAlignment="Stretch"
 Header="Presets"
 Margin="0,0,0,5"
- Background="White"
- >
+ Visibility="{Binding IsPresetPanelShowing, Converter={StaticResource boolToVisConverter}}">
+
 <Grid>
 <Grid.RowDefinitions>
 <RowDefinition Height="*" />
 <RowDefinition Height="Auto" />
 </Grid.RowDefinitions>
 
- <ListBox HorizontalAlignment="Stretch"
+ <ListBox HorizontalAlignment="Stretch" AutomationProperties.Name="Presets List"
 VerticalAlignment="Stretch" ItemsSource="{Binding Source={StaticResource presetsCvs}}"
 SelectedItem="{Binding SelectedPreset, Mode=TwoWay}" BorderThickness="0,0,0,1"
 BorderBrush="LightGray"
@@ -543,18 +579,19 @@
 Grid.Row="1"
 HorizontalAlignment="Center"
 VerticalAlignment="Stretch"
- Background="Transparent"
 SnapsToDevicePixels="False"
 UseLayoutRounding="False"
 ToolBar.OverflowMode="Never" 
+ Background="Transparent"
 ToolBarTray.IsLocked="True"
 Loaded="ToolBarLoaded"
+ KeyboardNavigation.TabNavigation="Continue"
 >
- <Button Micro:Message.Attach="[Event Click] = [Action PresetAdd]" >
+ <Button Micro:Message.Attach="[Event Click] = [Action PresetAdd]" AutomationProperties.Name="Add Preset">
 <Button.Content>
 <StackPanel Orientation="Horizontal">
- <Image Width="18"
- Height="18"
+ <Image Width="20"
+ Height="20"
 Source="Images/add.png"
 />
 <TextBlock Margin="2,0,0,0"
@@ -565,12 +602,13 @@
 </StackPanel>
 </Button.Content>
 </Button>
- <Button Micro:Message.Attach="[Event Click] = [Action PresetRemove]">
+ <Button Micro:Message.Attach="[Event Click] = [Action PresetRemove]" AutomationProperties.Name="Remove Preset">
 <Button.Content>
 <StackPanel Orientation="Horizontal">
- <Image Width="18"
- Height="18"
+ <Image Width="20"
+ Height="20"
 Source="Images/remove.png"
+ SnapsToDevicePixels="True"
 />
 <TextBlock Margin="2,0,0,0"
 VerticalAlignment="Center"
@@ -580,13 +618,14 @@
 </StackPanel>
 </Button.Content>
 </Button>
- <Menu Background="Transparent">
+ <Menu Background="Transparent" AutomationProperties.Name="Preset Options Dropdown">
 <MenuItem ToolBar.OverflowMode="Never">
 <MenuItem.Header>
 <StackPanel Orientation="Horizontal">
 <Image Width="20"
 Height="20"
- Source="Images/Options24.png"
+ Source="Images/Advanced.png"
+ RenderOptions.BitmapScalingMode="HighQuality"
 />
 <TextBlock Margin="2,0,0,0"
 VerticalAlignment="Center"
@@ -610,6 +649,11 @@
 </GroupBox>
 </Grid>
 
+ 
+ <Controls:SourceSelection Grid.Row="1" MinWidth="300" HorizontalAlignment="Left" VerticalAlignment="Stretch" BorderThickness="1" BorderBrush="DarkGray"
+ Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}}" 
+ />
+
 
 <Controls:StatusPanel x:Name="loadingPanel"
 Grid.Row="1"
@@ -623,18 +667,12 @@
 />
 
 
- <StatusBar Grid.Row="2"
- Grid.ColumnSpan="2"
- Height="32"
- Margin="0"
- VerticalAlignment="Bottom"
- Padding="0"
- >
+ <StatusBar Grid.Row="2" Grid.ColumnSpan="2" MinHeight="32" >
+
+ <ProgressBar Value="{Binding ProgressPercentage}" Visibility="{Binding IsEncoding, Converter={StaticResource boolToVisConverter}}"
+ Width="100" Height="18" VerticalAlignment="Center"/>
 <Label VerticalAlignment="Center"
- Content="{Binding Path=ProgramStatusLabel}"
- FontSize="11"
- Padding="0,0,0,5"
- />
+ Content="{Binding Path=ProgramStatusLabel}" />
 
 </StatusBar>
 </Grid>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/OptionsView.xaml -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/OptionsView.xaml Changed

@@ -1,10 +1,9 @@
 <UserControl x:Class="HandBrakeWPF.Views.OptionsView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org"
- xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers"
 xmlns:Options="clr-namespace:HandBrakeWPF.Converters.Options"
- xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
 xmlns:Converters="clr-namespace:HandBrakeWPF.Converters" xmlns:local="clr-namespace:HandBrakeWPF.Model"
- Background="White">
+ xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
+ Style="{StaticResource whiteUserControlStyle}">
 
 <UserControl.Resources>
 <Style TargetType="Button">
@@ -34,7 +33,8 @@
 
 <Options:OptionsTabConverter x:Key="tabConverter" />
 <Options:OptionsTabNameConverter x:Key="tabNameConverter" />
- 
+ <Converters:EnumComboConverter x:Key="enumComboConverter" />
+
 <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
 
 <ObjectDataProvider MethodName="GetValues"
@@ -97,9 +97,16 @@
 <TextBlock Text="When Done" Grid.Column="0" FontSize="14" Margin="0,0,0,10" />
 
 <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">
- <ComboBox Name="whenDone" ItemsSource="{Binding WhenDoneOptions}" SelectedItem="{Binding WhenDone}" Width="120" HorizontalAlignment="Left"></ComboBox>
+ <StackPanel Orientation="Horizontal">
+ <ComboBox Name="whenDone" ItemsSource="{Binding WhenDoneOptions}" SelectedItem="{Binding WhenDone}" Width="120" HorizontalAlignment="Left" />
+
+ </StackPanel>
 
 <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
+ <CheckBox Content="Reset to 'Do nothing' when the app is re-launched." VerticalAlignment="Center" IsChecked="{Binding ResetWhenDoneAction}" />
+ </StackPanel>
+
+ <StackPanel Orientation="Horizontal" Margin="0,5,0,0" Visibility="Collapsed">
 <CheckBox Content="Growl after Queue Completes" IsChecked="{Binding GrowlAfterEncode}" Margin="0,0,5,0"/>
 <CheckBox Content="Growl after Encode Completes" IsChecked="{Binding GrowlAfterQueue}" />
 </StackPanel>
@@ -133,6 +140,22 @@
 
 </StackPanel>
 </StackPanel>
+
+
+ <StackPanel Orientation="Vertical" Margin="0,0,0,20">
+
+ <TextBlock Text="User Interface" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>
+
+ <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">
+
+ <CheckBox Content="Always use System Colours (Requires Restart)"
+ ToolTip="Note: This option will always be on for systems with a High Contrast Theme selected." IsChecked="{Binding UseSystemColoursForStylesForStyles}" />
+ <CheckBox Content="Minimize to system tray (Requires Restart)" IsChecked="{Binding MinimiseToTray}" />
+ <CheckBox Content="Disable preset update notification on startup" IsChecked="{Binding DisablePresetUpdateCheckNotification}" />
+ <CheckBox Content="Always clear completed queue items after an encode completes" IsChecked="{Binding ClearQueueOnEncodeCompleted}" />
+ <CheckBox Content="Show Advanced Encoder Options Tab" IsChecked="{Binding ShowAdvancedTab}" />
+ </StackPanel>
+ </StackPanel>
 </StackPanel>
 
 <StackPanel Name="Output" Orientation="Vertical" Margin="10,10,0,0"
@@ -149,135 +172,85 @@
 <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">
 <CheckBox Content="Automatically name output files" IsChecked="{Binding AutomaticallyNameFiles}" />
 
- <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
- <TextBlock VerticalAlignment="Center" Text="Default Path: " />
- <TextBox Name="autoNameOutputPath" Text="{Binding AutoNameDefaultPath}" Width="180" />
- <Button Content="Browse" Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action BrowseAutoNamePath]" />
- </StackPanel>
- <TextBlock Text="Available Options: {source_path} or {source_folder_name} (Not Both)" />
-
- <StackPanel Orientation="Horizontal" Margin="0,15,0,0">
- <TextBlock VerticalAlignment="Center" Text="Format:" />
- <TextBox Name="autoNameFormat" Text="{Binding AutonameFormat}" Width="180" ToolTip=" {Source} = Source Name, {Title} = Title Number, {Chapters} = Selected Chapters, {Date} = Todays Date," />
- </StackPanel>
- <TextBlock Text="Available Options: {source} {title} {chapters} {date}" />
+ <Grid Margin="0,5,0,0">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto"/>
+ <RowDefinition Height="Auto"/>
+ </Grid.RowDefinitions>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+ 
+ <TextBlock VerticalAlignment="Center" Text="Default Path: " Grid.Column="0" Grid.Row="0" />
+ <TextBox Name="autoNameOutputPath" Text="{Binding AutoNameDefaultPath}" Width="380" Grid.Column="1" Grid.Row="0" 
+ ToolTip="{x:Static Properties:Resources.Options_DefaultPathAdditionalParams}" Style="{StaticResource LongToolTipHolder}" />
+ <Button Content="Browse" Margin="5,0,0,0" Grid.Column="2" Grid.Row="0" 
+ cal:Message.Attach="[Event Click] = [Action BrowseAutoNamePath]" />
+
+ <TextBlock VerticalAlignment="Center" Text="Format:" Grid.Column="0" Grid.Row="1" Margin="0,5,0,0" />
+ <TextBox Name="autoNameFormat" Text="{Binding AutonameFormat}" Width="380" Grid.Column="1" Grid.Row="1" Margin="0,5,0,0"
+ ToolTip="{x:Static Properties:Resources.Options_AdditionalFormatOptions}" Style="{StaticResource LongToolTipHolder}" />
+ </Grid>
 
- <StackPanel Orientation="Horizontal" Margin="0,15,0,0">
- <CheckBox Content="Remove underscores from name" IsChecked="{Binding RemoveUnderscores}"/>
- <CheckBox Content="Change case to Title Case" IsChecked="{Binding ChangeToTitleCase}" Margin="5,0,0,0" />
+ <StackPanel Orientation="Vertical" Margin="0,15,0,0">
+ <CheckBox Content="Change case to Title Case" IsChecked="{Binding ChangeToTitleCase}" />
+ <CheckBox Content="Replace underscores with a space" IsChecked="{Binding RemoveUnderscores}"/>
+ <CheckBox Content="Remove common punctuation" ToolTip="Dash (-), Period (.) and Comma (,) " IsChecked="{Binding RemovePunctuation}" />
 </StackPanel>
 
 <StackPanel Orientation="Horizontal" Margin="0,15,0,0">
 <TextBlock VerticalAlignment="Center" Text="MP4 File Extension:" />
- <ComboBox Name="mp4FileExtension" Width="120" ItemsSource="{Binding Mp4ExtensionOptions}" SelectedIndex="{Binding SelectedMp4Extension}" HorizontalAlignment="Left"></ComboBox>
+ <ComboBox Name="mp4FileExtension" Width="120" ItemsSource="{Binding Mp4ExtensionOptions}" SelectedIndex="{Binding SelectedMp4Extension}" HorizontalAlignment="Left" />
 </StackPanel>
 </StackPanel>
 </StackPanel>
 </StackPanel>
 
- <StackPanel Name="Audio" Orientation="Vertical" Margin="10,10,0,0"
- Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.AudioAndSubtitles}}">
- 
- 
+ <StackPanel Name="Hardware" Orientation="Vertical" Margin="10,10,0,0"
+ Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Video}}">
+
 <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
- <TextBlock Text="Audio and Subtitle Language Handling" FontSize="16" />
+ <TextBlock Text="Video" FontSize="16" />
 </Border>
- <TextBlock Text="Control the default selection behaviour for audio and subtitle tracks" Margin="0,10,0,10" />
-
- <TextBlock Text="Select your preferred languages" Grid.Column="0" Margin="10,10,0,0" FontSize="14"/>
-
- <Grid Margin="20,10,0,0" >
- <StackPanel Orientation="Horizontal">
- <TextBlock VerticalAlignment="Center" Text="Audio: " />
- <ComboBox Name="primaryAudioLanguage" VerticalAlignment="Center" ItemsSource="{Binding PreferredLanguages}" 
- SelectedItem="{Binding SelectedPreferredLangauge}" Width="120" />
- <TextBlock VerticalAlignment="Center" Text="Subtitles: " Margin="10,0,0,0" />
- <ComboBox Name="primarySubtitleLanguage" VerticalAlignment="Center" ItemsSource="{Binding PreferredLanguages}" 
- SelectedItem="{Binding SelectedPreferredSubtitleLangauge}" Width="120" />
- </StackPanel>
- </Grid>
-
- <TextBlock Text="Automatic language selection behaviour" Grid.Column="0" Margin="10,20,0,0" FontSize="14"/>
 
- <Grid Margin="20,10,0,0" >
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
- 
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="*" />
- </Grid.ColumnDefinitions>
+ <StackPanel Orientation="Vertical" Margin="0,10,0,20">
 
- 
- <TextBlock Text="Audio:" Grid.Column="0" Grid.Row="0" Margin="0,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
- <ComboBox Name="autoAudioMode" Grid.Column="1" Grid.Row="0" HorizontalAlignment="Left"
- ItemsSource="{Binding AddAudioModeOptions}" SelectedIndex="{Binding SelectedAddAudioMode}" Width="120" Margin="0,0,5,0" />
- <CheckBox Content="Add only one audio track per language" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Left"
- IsChecked="{Binding AddOnlyOneAudioTrackPerLanguage}" Margin="0,5,0,0" />
- 
- 
- <TextBlock Text="Subtitle:" Grid.Column="2" Grid.Row="0" Margin="0,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
- <ComboBox Name="autoSubtitleMode" Grid.Column="3" Grid.Row="0" HorizontalAlignment="Left"
- ItemsSource="{Binding AddSubtitleModeOptions}" SelectedIndex="{Binding SelectedAddSubtitleMode}" Width="120" Margin="0,0,5,0" />
- <CheckBox Content="Add Closed Captions when available" Grid.Column="3" Grid.Row="1" Margin="0,5,0,0" 
- HorizontalAlignment="Left" IsChecked="{Binding AddClosedCaptions}"/>
- </Grid>
+ <TextBlock Text="Decoding" FontSize="14" Margin="0,10,0,10" />
 
- <TextBlock Text="Additional languages for possible selection" Grid.Column="0" Margin="10,20,0,0" FontSize="14"/>
+ <StackPanel Orientation="Vertical" Margin="20,0,0,0" >
+ <CheckBox Content="Enable DXVA Hardware Accelerated Decoding (Experimental)" IsChecked="{Binding EnableDxvaDecoding}" />
+ <TextBlock Text="{x:Static Properties:Resources.Video_DxvaDecode}" Margin="17,2,0,0" />
 
- <Grid Margin="20,20,0,0">
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="*" />
- </Grid.ColumnDefinitions>
+ </StackPanel>
 
- <StackPanel Orientation="Horizontal">
- <Grid>
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="*" />
- <ColumnDefinition Width="*" />
- <ColumnDefinition Width="*" />
- </Grid.ColumnDefinitions>
+ <StackPanel Orientation="Vertical" Margin="20,10,0,0">
+ <CheckBox Content="Disable QuickSync Decoding" IsEnabled="{Binding IsQuickSyncAvailable}" IsChecked="{Binding DisableQuickSyncDecoding}" />
+ <TextBlock Text="{x:Static Properties:Resources.Video_QuickSyncNotAvailable}" Margin="17,2,0,0" TextWrapping="Wrap"
+ Visibility="{Binding IsQuickSyncAvailable, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ </StackPanel>
 
- <StackPanel Orientation="Vertical" Grid.Column="0">
- <TextBlock Text="Available Languages" Margin="0,0,0,5"/>
- <ListBox Name="availableLanguages" ItemsSource="{Binding AvailableLanguages}" Helpers:ListBoxHelper.SelectedItems="{Binding SelectedAvailableToMove}" 
- SelectionMode="Extended" Width="140" Height="140"></ListBox>
- </StackPanel>
-
- <DockPanel Grid.Column="1" Margin="10,0,10,0">
- <StackPanel Orientation="Vertical" VerticalAlignment="Center">
- <Button Content="Move Right" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" MaxWidth="90" />
- <Button Content="Move Left" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" MaxWidth="90" /> 
- <Button Content="Clear" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageClearAll]" Width="80"/>
- </StackPanel>
- </DockPanel>
-
- <StackPanel Orientation="Vertical" Grid.Column="2">
- <TextBlock Text="Chosen Selected Languages" Margin="0,0,0,5"/>
- <ListBox Name="selectedLangauges" ItemsSource="{Binding SelectedLangauges}" Helpers:ListBoxHelper.SelectedItems="{Binding SelectedLangaugesToMove}" 
- SelectionMode="Extended" Width="140" Height="140"
- dd:DragDrop.DropHandler="{Binding}"
- dd:DragDrop.IsDragSource="True"
- dd:DragDrop.IsDropTarget="True"/>
- </StackPanel>
- </Grid>
+ <TextBlock Text="Scaling" FontSize="14" Margin="0,20,0,10" />
+ 
+ <StackPanel Orientation="Horizontal" Margin="20,0,0,0">
+ <TextBlock Text="Choose Scaler: " Margin="0,0,5,0" VerticalAlignment="Center" />
+ <ComboBox ItemsSource="{Binding ScalingOptions, Converter={StaticResource enumComboConverter}}" 
+ SelectedItem="{Binding SelectedScalingMode, Converter={StaticResource enumComboConverter}}" 
+ Width="120" VerticalAlignment="Center" />
 </StackPanel>
- </Grid>
 
- <StackPanel Orientation="Vertical" Margin="0,10,0,0">
- <Label Content="Audio Tab Options" FontSize="14"/>
- <CheckBox IsChecked="{Binding ShowAdvancedPassthruOpts}" Content="Show advanced audio passthru options. (Requires Restart)"
- Margin="20,0,0,0" />
+ <StackPanel Orientation="Vertical" Margin="26,2,0,0" >
+ <TextBlock Text="{x:Static Properties:Resources.Video_ScalingModes}" TextWrapping="Wrap"
+ Visibility="{Binding IsClScaling, Converter={StaticResource boolToVisConverter}}" />
+ </StackPanel>
+ 
 </StackPanel>
 
+ 
 </StackPanel>
 
- <StackPanel Name="Advanced" Orientation="Vertical" Margin="10,10,0,0"
+ <StackPanel Name="Advanced" Orientation="Vertical" Margin="10,10,0,0"
 Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Advanced}}">
 
 <Border BorderThickness="0 0 0 1" BorderBrush="LightGray">
@@ -290,11 +263,6 @@
 
 <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">
 <CheckBox Content="Prevent the system from sleeping while encoding" IsChecked="{Binding PreventSleep}" />
- <CheckBox Content="Minimize to system tray (Requires Restart)" IsChecked="{Binding MinimiseToTray}" />
- <CheckBox Content="Disable built-in preset update notification" IsChecked="{Binding DisablePresetUpdateCheckNotification}" />
- <CheckBox Content="Always clear completed queue items after an encode completes" IsChecked="{Binding ClearQueueOnEncodeCompleted}" />
- <CheckBox Content="Show Advanced Tab" IsChecked="{Binding ShowAdvancedTab}" />
- <CheckBox Content="Disable LibHB Features" IsChecked="{Binding DisableLibHbFeatures}" />
 <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
 <TextBlock Text="Number of picture previews to scan:" VerticalAlignment="Center" Width="250" />
 <ComboBox Name="numberOfPreviews" ItemsSource="{Binding PreviewPicturesToScan}" SelectedItem="{Binding SelectedPreviewCount}" Width="120" />
@@ -352,28 +320,26 @@
 <Button Content="Clear Log History" cal:Message.Attach="[Event Click] = [Action ClearLogHistory]" />
 </StackPanel>
 
- <CheckBox Content="Clear Log files older than 30 days " Margin="0,5,0,0" IsChecked="{Binding ClearOldOlgs}" />
+ <CheckBox Content="Clear Log files older than 30 days " Margin="0,10,0,0" IsChecked="{Binding ClearOldOlgs}" />
 </StackPanel>
 
 </StackPanel>
 
 
- <StackPanel Orientation="Vertical" Margin="0,10,0,20">
+ <StackPanel Orientation="Vertical" Margin="0,10,0,20" Visibility="Visible">
 
- <TextBlock Text="Experimental Features" Grid.Column="0" FontSize="14" Margin="0,0,0,10"/>
- 
- <TextBlock Text="These options are for developer testing of features that are currently in progress!!!!" FontWeight="Bold" Margin="0,0,0,10" />
+ <TextBlock Text="Alpha Features" FontSize="14" Margin="0,0,0,10"/>
 
- <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">
- 
- <CheckBox Content="Enable LibHB Scanning and Encoding (uses hb.dll instead of HandBrakeCLI.exe)" Margin="0,5,0,0" IsChecked="{Binding EnableLibHb}" />
- <CheckBox Content="Enable Process Isolation (Run Scans and Encodes via an intermediate service)" Margin="20,10,0,0" IsChecked="{Binding EnableProcessIsolation}" />
- <StackPanel Orientation="Horizontal" Margin="0,10,0,0" Grid.Column="1">
+ <StackPanel Orientation="Vertical" Margin="20,0,0,0">
+ <CheckBox Content="Enable Static Preview" Margin="0,5,0,0" IsChecked="{Binding EnableStaticPreview}" />
+ 
+ <CheckBox Content="Use LibHB for Encoding (uses hb.dll instead of HandBrakeCLI.exe)" Margin="0,5,0,0" IsChecked="{Binding EnableLibHb}" Visibility="Collapsed" />
+ <CheckBox Content="Enable Process Isolation (Run Encodes via an intermediate service)" Margin="20,10,0,0" IsChecked="{Binding EnableProcessIsolation}" Visibility="Collapsed" />
+ <StackPanel Orientation="Horizontal" Margin="0,10,0,0" Visibility="Collapsed">
 <TextBlock Text="Server Port:" VerticalAlignment="Center" />
 <TextBox Width="50" MaxLength="5" Text="{Binding ServerPort}" />
 </StackPanel>
 
- <CheckBox Content="Enable Debug Features" IsChecked="{Binding EnableDebugFeatures}" Margin="0,10,0,0" />
 </StackPanel>
 </StackPanel>
 </StackPanel>
@@ -405,13 +371,15 @@
 <Button Content="Check for Updates" MaxWidth="130" Margin="0,0,5,0" cal:Message.Attach="[Event Click] = [Action PerformUpdateCheck]" />
 <Button Content="Download Update" Width="120" cal:Message.Attach="[Event Click] = [Action DownloadUpdate]" Visibility="{Binding UpdateAvailable, Converter={StaticResource boolToVisConverter}}" />
 </StackPanel>
- 
+
 <StackPanel Margin="20,10,0,0" Orientation="Horizontal">
 <ProgressBar Minimum="0" Maximum="100" Height="20" Width="400" Value="{Binding DownloadProgressPercentage}" 
 Visibility="{Binding UpdateAvailable, Converter={StaticResource boolToVisConverter}}" />
- <TextBlock Text="{Binding UpdateMessage}" Margin="10,0,10,0" VerticalAlignment="Center" />
+ 
 </StackPanel>
 
+ <TextBlock Text="{Binding UpdateMessage}" Margin="20,5,10,0" VerticalAlignment="Center" TextWrapping="Wrap" />
+
 </StackPanel>
 
 <StackPanel Name="About" Orientation="Vertical" Margin="10,10,0,0"
@@ -428,7 +396,17 @@
 </StackPanel>
 </ScrollViewer>
 
- <StackPanel HorizontalAlignment="Stretch" Background="LightGray" Grid.Row="1" Grid.ColumnSpan="2" >
+ <StackPanel HorizontalAlignment="Stretch" Grid.Row="1" Grid.ColumnSpan="2" >
+ <StackPanel.Style>
+ <Style TargetType="StackPanel">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="LightGray" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </StackPanel.Style>
+ 
 <Button Content="Close" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]"
 HorizontalAlignment="Center" Padding="12,2" Margin="0,5,10,5" />
 </StackPanel>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml Changed

@@ -1,8 +1,9 @@
-<UserControl x:Class="HandBrakeWPF.Views.PictureSettingsView"
+ <UserControl x:Class="HandBrakeWPF.Views.PictureSettingsView"
 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
- xmlns:controls="clr-namespace:HandBrakeWPF.Controls">
+ xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
+ xmlns:cal="http://www.caliburnproject.org">
 
 <UserControl.Resources>
 <Converters:BooleanConverter x:Key="boolConverter" />
@@ -13,139 +14,167 @@
 </Style>
 </UserControl.Resources>
 
- <StackPanel Orientation="Horizontal" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-
- 
- <StackPanel Name="SizePanel" Orientation="Vertical" >
- <Label Content="Size" FontWeight="Bold" />
-
- 
- <StackPanel Orientation="Horizontal" Margin="5,0,5,0">
- <Label Content="Source:" Grid.Row="0" Grid.Column="0" />
- <Label Content="{Binding SourceInfo}" Name="sourceResolution" Grid.Row="0" Grid.Column="1" />
- </StackPanel>
-
- 
- <StackPanel Orientation="Horizontal" Margin="5,0,5,0">
- <Label Content="Width:" Grid.Row="1" Grid.Column="0" />
- <controls:NumberBox Number="{Binding Width, Mode=TwoWay}" IsEnabled="{Binding WidthControlEnabled}" Modulus="{Binding SelectedModulus, Mode=OneWay}"
- Minimum="0" Grid.Row="1" Grid.Column="1" Width="60" />
- <Label Content="Height:" Grid.Row="1" Grid.Column="2" />
- <controls:NumberBox Number="{Binding Height, Mode=TwoWay}" IsEnabled="{Binding HeightControlEnabled}" Modulus="{Binding SelectedModulus, Mode=OneWay}" 
- Minimum="0" Grid.Row="1" Grid.Column="3" Width="60" />
- <CheckBox Content="Keep Aspect Ratio" IsChecked="{Binding MaintainAspectRatio}"
+ <Border Background="Transparent">
+ <Border.ContextMenu>
+ <ContextMenu>
+ <MenuItem Header="Show Still Preview (Experimental)" cal:Message.Attach="[Event Click] = [Action PreviewImage]" Visibility="Visible" />
+ </ContextMenu>
+ </Border.ContextMenu >
+
+ <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ </Grid.RowDefinitions>
+
+ 
+ <StackPanel Name="SizePanel" Orientation="Vertical" VerticalAlignment="Top" Grid.Column="0" Grid.Row="0" Grid.RowSpan="1" >
+ <Label Content="Size" FontWeight="Bold" />
+
+ 
+ <StackPanel Orientation="Horizontal" Margin="5,0,5,0">
+ <Label Content="Source:" />
+ <Label Content="{Binding SourceInfo}" Name="sourceResolution"/>
+ </StackPanel>
+
+ 
+ <StackPanel Orientation="Horizontal" Margin="5,0,5,0">
+ <Label Content="Width:" />
+ <controls:NumberBox Number="{Binding Width, Mode=TwoWay}" UpdateBindingOnTextChange="True" IsEnabled="{Binding WidthControlEnabled}" 
+ Modulus="{Binding SelectedModulus, Mode=OneWay}"
+ Minimum="0" Width="60" />
+ <Label Content="Height:" />
+ <controls:NumberBox Number="{Binding Height, Mode=TwoWay}" IsEnabled="{Binding HeightControlEnabled}" UpdateBindingOnTextChange="True" 
+ Modulus="{Binding SelectedModulus, Mode=OneWay}" 
+ Minimum="0" Width="60" />
+ <CheckBox Content="Keep Aspect Ratio" IsChecked="{Binding MaintainAspectRatio}"
 Visibility="{Binding ShowKeepAR, Converter={StaticResource boolToVisHiddenConverter}}" 
 VerticalAlignment="Center" Margin="5,0,0,0" />
- </StackPanel>
-
- 
- <Grid Margin="5,15,5,0">
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
-
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- </Grid.ColumnDefinitions>
-
- <Label Content="Anamorphic:" Grid.Row="0" Grid.Column="0" />
- <Label Content="Modulus:" Grid.Row="1" Grid.Column="0" 
+ </StackPanel>
+
+ 
+ <Grid Margin="5,15,5,0">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <Label Content="Anamorphic:" Grid.Row="0" Grid.Column="0" />
+ <Label Content="Modulus:" Grid.Row="1" Grid.Column="0" 
 Visibility="{Binding ShowModulus, Converter={StaticResource boolToVisConverter}}" />
 
- <ComboBox Width="110" Grid.Row="0" ItemsSource="{Binding AnamorphicModes}" SelectedItem="{Binding SelectedAnamorphicMode}" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
- <ComboBox Width="110" Grid.Row="1" ItemsSource="{Binding ModulusValues}" SelectedItem="{Binding SelectedModulus}" 
+ <ComboBox Width="110" Grid.Row="0" ItemsSource="{Binding AnamorphicModes}" SelectedItem="{Binding SelectedAnamorphicMode}" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
+ <ComboBox Width="110" Grid.Row="1" ItemsSource="{Binding ModulusValues}" SelectedItem="{Binding SelectedModulus}" 
 Visibility="{Binding ShowModulus, Converter={StaticResource boolToVisConverter}}"
 Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" />
- </Grid>
- 
- 
- <Grid Margin="5,15,5,0" Visibility="{Binding ShowCustomAnamorphicControls, Converter={StaticResource boolToVisConverter}}">
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
-
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- </Grid.ColumnDefinitions>
-
- <Label Content="Display Width:" Grid.Row="0" Grid.Column="0" />
- <Label Content="PAR Width:" Grid.Row="1" Grid.Column="0" />
- <Label Content="PAR Height:" Grid.Row="5" Grid.Column="0" />
-
- <controls:NumberBox Width="60" Number="{Binding DisplayWidth, Mode=TwoWay}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" 
+ </Grid>
+
+ 
+ <Grid Margin="5,15,5,0" Visibility="{Binding ShowCustomAnamorphicControls, Converter={StaticResource boolToVisConverter}}">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <Label Content="Display Width:" Grid.Row="0" Grid.Column="0" />
+ <Label Content="PAR Width:" Grid.Row="1" Grid.Column="0" />
+ <Label Content="PAR Height:" Grid.Row="2" Grid.Column="0" />
+
+ <controls:NumberBox Width="60" Number="{Binding DisplayWidth, Mode=TwoWay}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" 
 AllowEmpty="False" />
- <controls:NumberBox Width="60" Number="{Binding ParWidth, Mode=TwoWay}" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" AllowEmpty="False"
+ <controls:NumberBox Width="60" Number="{Binding ParWidth, Mode=TwoWay}" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" AllowEmpty="False"
 IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5" />
- <controls:NumberBox Width="60" Number="{Binding ParHeight, Mode=TwoWay}" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" AllowEmpty="False"
+ <controls:NumberBox Width="60" Number="{Binding ParHeight, Mode=TwoWay}" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" AllowEmpty="False"
 IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5" />
- </Grid>
- 
- 
- <Grid Margin="5,15,5,0">
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
-
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- </Grid.ColumnDefinitions>
-
- <Label Content="Display Size:" Grid.Row="0" Grid.Column="0"
- Visibility="{Binding ShowDisplaySize, Converter={StaticResource boolToVisConverter}}" />
+ </Grid>
 
- <Label Content="{Binding DisplaySize}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5"
- Visibility="{Binding ShowDisplaySize, Converter={StaticResource boolToVisConverter}}" />
- </Grid>
- </StackPanel>
-
- 
- <StackPanel Name="CropPanel" Margin="50,0,0,0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
- <Label Content="Cropping" FontWeight="Bold" />
- <RadioButton Content="Automatic" IsChecked="{Binding IsCustomCrop, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="10,0,0,0"/>
- <RadioButton Content="Custom" IsChecked="{Binding IsCustomCrop}" Margin="10,0,0,0" />
-
- <Grid Margin="0,10,0,0">
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
-
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- </Grid.ColumnDefinitions>
-
- <Label Content="Top" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" />
- <Label Content="Bottom" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" />
- <Label Content="Left" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" />
- <Label Content="Right" Grid.Row="2" Grid.Column="4" HorizontalAlignment="Center" />
-
- <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="1" Grid.Column="2"
+ </StackPanel>
+
+ 
+ <StackPanel Name="CropPanel" Margin="15,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="0" Grid.RowSpan="2" Grid.Column="1">
+ <Label Content="Cropping" FontWeight="Bold" />
+ <RadioButton Content="Automatic" IsChecked="{Binding IsCustomCrop, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="10,0,0,0"/>
+ <RadioButton Content="Custom" IsChecked="{Binding IsCustomCrop}" Margin="10,5,0,0" />
+
+ <Grid Margin="0,10,0,0">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <Label Content="Top" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" />
+ <Label Content="Bottom" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" />
+ <Label Content="Left" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" />
+ <Label Content="Right" Grid.Row="2" Grid.Column="4" HorizontalAlignment="Center" />
+
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="1" Grid.Column="2"
 Minimum="0" Modulus="2" Number="{Binding CropTop, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />
 
- <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="3" Grid.Column="2"
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="3" Grid.Column="2"
 Minimum="0" Modulus="2" Number="{Binding CropBottom, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />
 
- <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="1"
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="1"
 Minimum="0" Modulus="2" Number="{Binding CropLeft, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />
 
- <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="3"
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="3"
 Minimum="0" Modulus="2" Number="{Binding CropRight, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False" />
 
- </Grid>
+ </Grid>
+
+ </StackPanel>
+
+ 
+ <StackPanel Name="PreviewPanel" Margin="0,5,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="1" Grid.Column="0"
+ Visibility="{Binding IsPicturePreviewEnabled, Converter={StaticResource boolToVisConverter}}">
+ <Label Content="Output" FontWeight="Bold" />
 
- </StackPanel>
- </StackPanel>
+ <Grid Margin="5,0,0,0">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <Label Content="{Binding DisplaySize}" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Left" Margin="0,0,0,5"
+ Visibility="{Binding ShowDisplaySize, Converter={StaticResource boolToVisConverter}}" />
+
+ <Button Content="Preview" Grid.Row="1" Margin="5,0,0,0"
+ cal:Message.Attach="[Event Click] = [Action PreviewImage]" HorizontalAlignment="Left" />
+ </Grid>
+ 
+ </StackPanel>
+ </Grid>
+ </Border>
 </UserControl>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/PreviewView.xaml -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/PreviewView.xaml Changed

@@ -5,8 +5,8 @@
 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 Title="{Binding Title}"
- Width="380"
- Background="#FFF1F0EF"
+ Width="390"
+ Style="{StaticResource windowStyle}"
 ResizeMode="NoResize"
 SizeToContent="Height"
 WindowStartupLocation="CenterScreen"
@@ -24,16 +24,25 @@
 
 <StackPanel Orientation="Vertical">
 
- <StackPanel Grid.Row="0"
- Height="30"
+ <StackPanel Height="34"
 Margin="0,0,0,10"
- Background="White"
 Orientation="Horizontal">
- <Image Width="24"
- Height="24"
+
+ <StackPanel.Style>
+ <Style TargetType="StackPanel">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="White" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </StackPanel.Style>
+
+ <Image Width="32"
+ Height="32"
 Margin="10,0,5,0"
 VerticalAlignment="Center"
- Source="Images/window.png" />
+ Source="Images/picture_small.png" />
 <StackPanel VerticalAlignment="Center" Orientation="Vertical">
 <TextBlock FontWeight="Bold" Text="Create a video preview" />
 </StackPanel>
@@ -55,18 +64,16 @@
 SelectedItem="{Binding Duration}" />
 </StackPanel>
 
- <StackPanel Margin="10,10,0,0" Orientation="Horizontal">
- <ProgressBar Width="310"
- Height="22"
- Maximum="100"
- Minimum="0"
- Value="{Binding PercentageValue}" />
- <TextBlock Margin="5,0,0,0" Text="{Binding Percentage}" />
- </StackPanel>
+ <Grid Margin="10,10,10,0">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" MinWidth="50" />
+ </Grid.ColumnDefinitions>
+ <ProgressBar MinHeight="22" Maximum="100" Minimum="0" Value="{Binding PercentageValue}" Grid.Column="0" />
+ <TextBlock Margin="5,0,0,0" Text="{Binding Percentage}" Grid.Column="1" />
+ </Grid>
 
- <StackPanel Width="360"
- Margin="10,10,0,10"
- Orientation="Horizontal">
+ <StackPanel Margin="10,10,0,10" Orientation="Horizontal">
 <CheckBox VerticalAlignment="Center"
 Content="Use system default player"
 IsChecked="{Binding UseSystemDefaultPlayer}" />

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml Changed

@@ -4,6 +4,8 @@
 xmlns:cal="http://www.caliburnproject.org"
 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:Conveters="clr-namespace:HandBrakeWPF.Converters"
+ xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
 Title="{Binding Title}"
 Width="450"
 MaxHeight="450"
@@ -18,6 +20,8 @@
 <Setter Property="ToolTipService.ShowDuration" Value="20000" />
 <Setter Property="Margin" Value="0,2,0,2" />
 </Style>
+ 
+ <Conveters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
 </Window.Resources>
 
 <Grid HorizontalAlignment="Stretch"
@@ -33,17 +37,18 @@
 
 
 <StackPanel Grid.Row="0"
- Height="30"
+ Height="36"
 Margin="0,0,0,10"
 Background="White"
 Orientation="Horizontal">
- <Image Width="24"
- Height="24"
+ <Image Width="32"
+ Height="32"
 Margin="10,0,5,0"
 VerticalAlignment="Center"
 Source="Images/AddToQueue_small.png" />
 <StackPanel VerticalAlignment="Center" Orientation="Vertical">
- <TextBlock FontWeight="Bold" Text="Queue Multiple Items" />
+ <TextBlock FontWeight="Bold" Text="Add to Queue" />
+ <TextBlock Text="Select multiple titles to add to the queue." />
 </StackPanel>
 </StackPanel>
 
@@ -70,7 +75,7 @@
 <ListBox.ContextMenu>
 <ContextMenu>
 <MenuItem Header="Select All" cal:Message.Attach="[Event Click] = [Action SelectAll]" />
- <MenuItem Header="Select All" cal:Message.Attach="[Event Click] = [Action UnSelectAll]" />
+ <MenuItem Header="Deselect All" cal:Message.Attach="[Event Click] = [Action UnSelectAll]" />
 <Separator />
 <MenuItem Header="Order by Title" IsChecked="{Binding OrderedByTitle}" cal:Message.Attach="[Event Click] = [Action OrderByTitle]" />
 <MenuItem Header="Order by Duration" IsChecked="{Binding OrderedByDuration}" cal:Message.Attach="[Event Click] = [Action OrderByDuration]" />
@@ -109,7 +114,8 @@
 
 
 <StackPanel Orientation="Vertical" Grid.Row="3" Margin="10,10,10,0">
- <TextBlock Text="Checklist " />
+ <TextBlock Text="{x:Static Properties:Resources.QueueSelection_AutoNameWarning}"
+ TextWrapping="Wrap" Visibility="{Binding IsAutoNamingEnabled, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>
 </StackPanel>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/QueueView.xaml -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/QueueView.xaml Changed

@@ -7,15 +7,16 @@
 xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
 xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:YourNamespace="clr-namespace:HandBrakeWPF.AttachedProperties"
+ xmlns:AttachedProperties="clr-namespace:HandBrakeWPF.AttachedProperties"
 xmlns:Audio="clr-namespace:HandBrakeWPF.Converters.Audio"
- xmlns:Subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles" Title="{Binding Title}"
- Width="600"
- Height="400"
- MinWidth="600"
- MinHeight="400"
- MaxWidth="600"
- Background="#FFF0F0F0"
+ xmlns:Subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles"
+ xmlns:video="clr-namespace:HandBrakeWPF.Converters.Video"
+ Title="{Binding Title}"
+ Width="700"
+ Height="500"
+ MinWidth="350"
+ MinHeight="250"
+ Style="{StaticResource windowStyle}"
 WindowStartupLocation="CenterScreen"
 TextOptions.TextFormattingMode="Display"
 mc:Ignorable="d">
@@ -27,6 +28,13 @@
 <Converters:QueueStatusToVisibilityConverter x:Key="queueStatusVisConverter" />
 <Audio:AudioQueueDisplayConverter x:Key="audioTrackDisplayConverter" />
 <Subtitles:SubtitlesQueueDisplayConverter x:Key="subtitleTrackDisplayConverter" />
+ <video:EncoderOptionsTooltipConverter x:Key="encoderOptionsTooltipConverter" />
+
+
+ <Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">
+ <Setter Property="ToolTipService.ShowDuration" Value="10000" />
+ </Style>
+
 </Window.Resources>
 
 <Grid>
@@ -36,18 +44,25 @@
 <RowDefinition Height="Auto" />
 <RowDefinition Height="*" />
 </Grid.RowDefinitions>
+
+
 <ToolBar Name="mainToolBar"
 HorizontalAlignment="Stretch"
 VerticalAlignment="Stretch"
- SnapsToDevicePixels="True">
+ SnapsToDevicePixels="True" 
+ AllowDrop="False" Focusable="False" >
+ <ToolBar.Resources>
+ <Style TargetType="{x:Type ToolBarPanel}">
+ <Setter Property="Orientation" Value="Vertical"/>
+ </Style>
+
+ <Style BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" TargetType="{x:Type Button}" />
+ <Style BasedOn="{StaticResource {x:Static ToolBar.MenuStyleKey}}" TargetType="{x:Type Menu}" />
+ </ToolBar.Resources>
 
- <DockPanel Width="{Binding Path=ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ToolBarPanel}}}" Background="Transparent">
- <DockPanel.Resources>
- <Style BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" TargetType="{x:Type Button}" />
- <Style BasedOn="{StaticResource {x:Static ToolBar.MenuStyleKey}}" TargetType="{x:Type Menu}" />
- </DockPanel.Resources>
+ <DockPanel Background="Transparent" HorizontalAlignment="Stretch">
 
- <Button Name="Start"
+ <Button Name="Start" DockPanel.Dock="Left" AutomationProperties.Name="Start Queue"
 cal:Message.Attach="[Event Click] = [Action StartEncode]"
 Visibility="{Binding IsEncoding,
 Converter={StaticResource boolToVisConverter},
@@ -62,7 +77,7 @@
 </StackPanel>
 </Button>
 
- <Button Name="Pause"
+ <Button Name="Pause" DockPanel.Dock="Left" AutomationProperties.Name="Pause Queue"
 cal:Message.Attach="[Event Click] = [Action PauseEncode]"
 Visibility="{Binding IsEncoding,
 Converter={StaticResource boolToVisConverter},
@@ -77,59 +92,88 @@
 </StackPanel>
 </Button>
 
- <Menu HorizontalAlignment="Right" Background="Transparent">
- <MenuItem>
- <MenuItem.Header>
- <StackPanel Height="32" Orientation="Horizontal">
- <TextBlock VerticalAlignment="Center"
+ <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" HorizontalAlignment="Right">
+ <Menu HorizontalAlignment="Right" Background="Transparent">
+ <MenuItem>
+ <MenuItem.Header>
+ <StackPanel Height="32" Orientation="Horizontal">
+ <TextBlock VerticalAlignment="Center"
 FontWeight="Bold"
 Text="When Done: " />
- <Label Margin="8,0,0,0"
+ <Label Margin="8,0,0,0"
 VerticalAlignment="Center"
 Content="{Binding WhenDoneAction}" />
- <Path Height="5"
+ <Path Height="5"
 Margin="2,2,2,0"
 Data="M 0 0 L 4 4 L 8 0 Z"
 Fill="{DynamicResource GlyphBrush}" />
- </StackPanel>
- </MenuItem.Header>
- <MenuItem x:Name="doNothing"
+ </StackPanel>
+ </MenuItem.Header>
+
+ <MenuItem x:Name="doNothing"
 cal:Message.Attach="[Event Click] = [Action WhenDone(doNothing.Header)]"
 Header="Do nothing"
 IsCheckable="True"
- YourNamespace:MenuItemExtensions.GroupName="whenDone" />
- <MenuItem x:Name="shutdown"
+ AttachedProperties:MenuItemExtensions.GroupName="whenDone" />
+ <MenuItem x:Name="shutdown"
 cal:Message.Attach="[Event Click] = [Action WhenDone(shutdown.Header)]"
 Header="Shutdown"
 IsCheckable="True"
- YourNamespace:MenuItemExtensions.GroupName="whenDone" />
- <MenuItem x:Name="suspend"
+ AttachedProperties:MenuItemExtensions.GroupName="whenDone" />
+ <MenuItem x:Name="suspend"
 cal:Message.Attach="[Event Click] = [Action WhenDone(suspend.Header)]"
 Header="Suspend"
 IsCheckable="True"
- YourNamespace:MenuItemExtensions.GroupName="whenDone" />
- <MenuItem x:Name="hibernate"
+ AttachedProperties:MenuItemExtensions.GroupName="whenDone" />
+ <MenuItem x:Name="hibernate"
 cal:Message.Attach="[Event Click] = [Action WhenDone(hibernate.Header)]"
 Header="Hibernate"
 IsCheckable="True"
- YourNamespace:MenuItemExtensions.GroupName="whenDone" />
- <MenuItem x:Name="lock"
+ AttachedProperties:MenuItemExtensions.GroupName="whenDone" />
+ <MenuItem x:Name="lock"
 cal:Message.Attach="[Event Click] = [Action WhenDone(lock.Header)]"
- Header="Lock system"
+ Header="Lock System"
 IsCheckable="True"
- YourNamespace:MenuItemExtensions.GroupName="whenDone" />
- <MenuItem x:Name="logoff"
+ AttachedProperties:MenuItemExtensions.GroupName="whenDone" />
+ <MenuItem x:Name="logoff"
 cal:Message.Attach="[Event Click] = [Action WhenDone(logoff.Header)]"
 Header="Log off"
 IsCheckable="True"
- YourNamespace:MenuItemExtensions.GroupName="whenDone" />
- <MenuItem x:Name="quit"
+ AttachedProperties:MenuItemExtensions.GroupName="whenDone" />
+ <MenuItem x:Name="quit"
 cal:Message.Attach="[Event Click] = [Action WhenDone(quit.Header)]"
 Header="Quit HandBrake"
 IsCheckable="True"
- YourNamespace:MenuItemExtensions.GroupName="whenDone" />
- </MenuItem>
- </Menu>
+ AttachedProperties:MenuItemExtensions.GroupName="whenDone" />
+ </MenuItem>
+ </Menu>
+
+ <Menu HorizontalAlignment="Right" Background="Transparent">
+ <MenuItem>
+ <MenuItem.Header>
+ <StackPanel Height="32" Orientation="Horizontal">
+ <Image Source="Images\Advanced.png" Width="20" Height="20" VerticalAlignment="Center" />
+ <TextBlock VerticalAlignment="Center"
+ Text="Options " Margin="5,0,0,0" />
+ <Path Height="5"
+ Margin="2,2,2,0"
+ Data="M 0 0 L 4 4 L 8 0 Z"
+ Fill="{DynamicResource GlyphBrush}" />
+ </StackPanel>
+ </MenuItem.Header>
+
+ <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="Clear Completed" />
+ <MenuItem cal:Message.Attach="[Event Click] = [Action Clear]" Header="Clear Queue" />
+ <Separator />
+ <MenuItem cal:Message.Attach="[Event Click] = [Action Import]" Header="Import Queue" />
+ <MenuItem cal:Message.Attach="[Event Click] = [Action Export]" Header="Export Queue" />
+
+ </MenuItem>
+ </Menu>
+
+ </StackPanel>
+
+
 </DockPanel>
 </ToolBar>
 
@@ -137,16 +181,25 @@
 <TextBlock Text="{Binding JobsPending}" />
 <TextBlock Text="{Binding JobStatus}" />
 </StackPanel>
- 
+
 <ListBox Grid.Row="2"
 Margin="10,0,10,10"
- Background="LightGray"
 dd:DragDrop.DropHandler="{Binding}"
 dd:DragDrop.IsDragSource="True"
 dd:DragDrop.IsDropTarget="True"
 ItemsSource="{Binding QueueTasks, Mode=OneWay}"
 SelectionMode="Extended">
 
+ <ListBox.Style>
+ <Style TargetType="ListBox">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="LightGray" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </ListBox.Style>
+
 <ListBox.ContextMenu>
 <ContextMenu>
 <MenuItem cal:Message.Attach="[Event Click] = [Action ClearCompleted]" Header="Clear Completed" />
@@ -160,34 +213,61 @@
 <ListBox.ItemContainerStyle>
 <Style TargetType="{x:Type ListBoxItem}">
 <Setter Property="HorizontalContentAlignment" Value="Stretch" />
- <Setter Property="Background" Value="WhiteSmoke" />
 <Setter Property="Margin" Value="0,0,0,1" />
 <Setter Property="ToolTip">
 <Setter.Value>
- <StackPanel Grid.Column="1"
- Margin="0,5,0,5"
- HorizontalAlignment="Stretch">
- <StackPanel Orientation="Horizontal">
- <TextBlock FontWeight="Bold" Text="Video" />
- <TextBlock Text=": " />
- <TextBlock Text="{Binding Task.VideoEncoder, Converter={StaticResource enumComboConverter}}" />
- <TextBlock Margin="10,0,0,0" FontWeight="Bold" Text="Audio: " />
- <TextBlock Text="{Binding Task.AudioTracks, Converter={StaticResource audioTrackDisplayConverter}}" />
- </StackPanel>
+ <Grid MaxWidth="650" Margin="0,5,0,5" Style="{StaticResource LongToolTipHolder}">
+ <Grid.Resources>
+ <Style TargetType="TextBlock">
+ <Setter Property="Margin" Value="0,5,0,5" />
+ </Style>
+ </Grid.Resources>
 
- <StackPanel Orientation="Horizontal">
- <TextBlock FontWeight="Bold" Text="Subtitles: " />
- <TextBlock Text="{Binding Task.SubtitleTracks, Converter={StaticResource subtitleTrackDisplayConverter}}" />
- </StackPanel>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
 
- <StackPanel Orientation="Horizontal">
- <TextBlock FontWeight="Bold" Text="Advanced: " />
- <TextBlock Text="{Binding Task.AdvancedEncoderOptions}" />
- </StackPanel>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="90" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <TextBlock FontWeight="Bold" Text="Source:" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />
+ <TextBlock Text="{Binding Task.Source}" TextWrapping="Wrap" Grid.Row="0" Grid.Column="1" />
+
+ <TextBlock FontWeight="Bold" Text="Destination:" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />
+ <TextBlock Text="{Binding Task.Destination}" TextWrapping="Wrap" Grid.Row="1" Grid.Column="1" />
+
+ <TextBlock FontWeight="Bold" Text="Video:" Grid.Row="2" Grid.Column="0" />
+ <TextBlock Text="{Binding Task.VideoEncoder, Converter={StaticResource enumComboConverter}}"
+ Grid.Row="2" Grid.Column="1" />
+
+ <TextBlock FontWeight="Bold" Text="Audio: " Grid.Row="3" Grid.Column="0"/>
+ <TextBlock Text="{Binding Task.AudioTracks, Converter={StaticResource audioTrackDisplayConverter}}"
+ Grid.Row="3" Grid.Column="1"/>
+
+ <TextBlock FontWeight="Bold" VerticalAlignment="Top" Text="Subtitles: " Grid.Row="4" Grid.Column="0" />
+ <TextBlock Text="{Binding Task.SubtitleTracks, Converter={StaticResource subtitleTrackDisplayConverter}}"
+ Grid.Row="4" Grid.Column="1" />
+
+
+ <TextBlock FontWeight="Bold" VerticalAlignment="Top" Grid.Row="5" Grid.Column="0" Text="Advanced: " />
+ <TextBlock Text="{Binding Task, Converter={StaticResource encoderOptionsTooltipConverter}}" Grid.Row="5" Grid.Column="1" TextWrapping="Wrap" />
+ </Grid>
 
- </StackPanel>
 </Setter.Value>
 </Setter>
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding DataContext.UseSystemColours, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+ <Setter Property="Background" Value="WhiteSmoke" />
+ </DataTrigger>
+ </Style.Triggers>
+
 </Style>
 </ListBox.ItemContainerStyle>
 
@@ -270,48 +350,63 @@
 <ColumnDefinition Width="Auto" />
 </Grid.ColumnDefinitions>
 
- <Image Width="20" Grid.Row="0" Grid.Column="0"
- Height="20" VerticalAlignment="Center" Margin="0,5,0,0"
- Source="Images/Refresh.ico"
- ToolTip="Reset job status to Waiting."
- Visibility="{Binding Status,
- Converter={StaticResource queueStatusVisConverter}}">
+ <Button Visibility="{Binding Status, Converter={StaticResource queueStatusVisConverter}}"
+ Grid.Row="0" Grid.Column="0" Margin="0,5,0,0">
+ <Button.Template>
+ <ControlTemplate>
+ <Image Width="20" 
+ Height="20" VerticalAlignment="Center"
+ Source="Images/Refresh.ico"
+ ToolTip="Reset job status to Waiting.">
+ </Image>
+ </ControlTemplate>
+ </Button.Template>
 <i:Interaction.Triggers>
- <i:EventTrigger EventName="MouseDown">
+ <i:EventTrigger EventName="Click">
 <cal:ActionMessage MethodName="RetryJob">
 <cal:Parameter Value="{Binding}" />
 </cal:ActionMessage>
 </i:EventTrigger>
 </i:Interaction.Triggers>
- </Image>
+ </Button>
 
- <Image Width="20" Grid.Row="0" Grid.Column="1"
- Height="20"
- Margin="10,5,0,0"
- Source="Images/Options24.png"
- ToolTip="Edit this Job">
+ <Button Grid.Row="0" Grid.Column="1" Margin="10,5,0,0">
+ <Button.Template>
+ <ControlTemplate>
+ <Image Width="20" 
+ Height="20" VerticalAlignment="Center"
+ Source="Images/Options24.png"
+ ToolTip="Send the job back to the main window for editing.">
+ </Image>
+ </ControlTemplate>
+ </Button.Template>
 <i:Interaction.Triggers>
- <i:EventTrigger EventName="MouseDown">
+ <i:EventTrigger EventName="Click">
 <cal:ActionMessage MethodName="EditJob">
 <cal:Parameter Value="{Binding}" />
 </cal:ActionMessage>
 </i:EventTrigger>
 </i:Interaction.Triggers>
- </Image>
+ </Button>
 
- <Image Width="20" Grid.Row="0" Grid.Column="2"
- Height="20"
- Margin="10,5,0,0"
- Source="Images/delete.png"
- ToolTip="Remove this Job">
+ <Button Grid.Row="0" Grid.Column="2" Margin="10,5,0,0">
+ <Button.Template>
+ <ControlTemplate>
+ <Image Width="20" 
+ Height="20" VerticalAlignment="Center" 
+ Source="Images/delete.png"
+ ToolTip="Delete the job from the queue.">
+ </Image>
+ </ControlTemplate>
+ </Button.Template>
 <i:Interaction.Triggers>
- <i:EventTrigger EventName="MouseDown">
+ <i:EventTrigger EventName="Click">
 <cal:ActionMessage MethodName="RemoveJob">
 <cal:Parameter Value="{Binding}" />
 </cal:ActionMessage>
 </i:EventTrigger>
 </i:Interaction.Triggers>
- </Image>
+ </Button>
 
 
 </Grid>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/QueueView.xaml.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/QueueView.xaml.cs Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/ShellView.xaml -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/ShellView.xaml Changed

@@ -2,18 +2,20 @@
 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework"
- xmlns:Converters="clr-namespace:HandBrakeWPF.Converters" Title="{Data:Binding Path=WindowTitle}"
+ xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
+ xmlns:views="clr-namespace:HandBrakeWPF.Views"
+ Title="{Data:Binding Path=WindowTitle}"
 Width="1015"
- Height="680"
- MinWidth="1015"
- MinHeight="670"
+ Height="675"
+ MinWidth="750"
+ MinHeight="675"
 AllowDrop="True"
- Background="#FFF0F0F0"
- FontSize="11"
 SnapsToDevicePixels="True"
 UseLayoutRounding="True"
 WindowStartupLocation="CenterScreen"
 TextOptions.TextFormattingMode="Display"
+ Style="{StaticResource windowStyle}"
+ x:Name="shellView"
 >
 <Window.Resources>
 <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
@@ -22,5 +24,8 @@
 <Grid>
 <ContentControl x:Name="MainViewModel" Visibility="{Binding ShowMainWindow, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
 <ContentControl x:Name="OptionsViewModel" Visibility="{Binding ShowOptions, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
+
+ <views:InstantView DataContext="{Binding InstantViewModel}" 
+ Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Path=DataContext.ShowInstant, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
 </Grid>
 </Window>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs Changed

@@ -22,6 +22,7 @@
 using HandBrake.ApplicationServices.Utilities;
 
 using HandBrakeWPF.Commands;
+ using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.ViewModels.Interfaces;
 
 using Application = System.Windows.Application;
@@ -68,6 +69,7 @@
 // Add to Queue (Ctrl+A)
 // Scan a File (Ctrl+F)
 // Scan a Folder (Ctrl+R)
+ // Show CLI Query (Ctrl+Shift+D)
 
 this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.S, ModifierKeys.Control)), new KeyGesture(Key.S, ModifierKeys.Control)));
 this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.K, ModifierKeys.Control)), new KeyGesture(Key.K, ModifierKeys.Control)));
@@ -75,13 +77,23 @@
 this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.Q, ModifierKeys.Control)), new KeyGesture(Key.Q, ModifierKeys.Control)));
 this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.A, ModifierKeys.Control)), new KeyGesture(Key.A, ModifierKeys.Control)));
 this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.F, ModifierKeys.Control)), new KeyGesture(Key.F, ModifierKeys.Control)));
+ this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.O, ModifierKeys.Control)), new KeyGesture(Key.O, ModifierKeys.Control)));
 this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.R, ModifierKeys.Control)), new KeyGesture(Key.R, ModifierKeys.Control)));
+ this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.D, ModifierKeys.Control | ModifierKeys.Shift)), new KeyGesture(Key.D, ModifierKeys.Control | ModifierKeys.Shift)));
 
 // Enable Windows 7 Taskbar progress indication.
 if (this.TaskbarItemInfo == null)
 {
 this.TaskbarItemInfo = Win7.WindowsTaskbar;
 }
+
+ // Window Sizing
+ if (AppArguments.IsInstantHandBrake)
+ {
+ this.SizeToContent = SizeToContent.WidthAndHeight;
+ this.MinHeight = 380;
+ this.MinWidth = 600;
+ }
 }
 
 /// <summary>

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml Added

@@ -0,0 +1,23 @@
+<Window x:Class="HandBrakeWPF.Views.StaticPreviewView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:cal="http://www.caliburnproject.org"
+ mc:Ignorable="d" SizeToContent="WidthAndHeight"
+ TextOptions.TextFormattingMode="Display"
+ WindowStartupLocation="CenterScreen"
+ cal:Message.Attach="[Event SizeChanged] = [Action PreviewSizeChanged($eventArgs)]" 
+ Title="{Binding Title}">
+ <Grid>
+
+ <Image Source="{Binding PreviewImage}" MaxWidth="{Binding Width}" MaxHeight="{Binding Height}" />
+ <Slider Maximum="{Binding TotalPreviews}" Minimum="0" 
+ Value="{Binding SelectedPreviewImage}"
+ VerticalAlignment="Bottom"
+ HorizontalAlignment="Center"
+ Margin="0,0,0,20" Width="150" 
+ Background="Transparent" 
+ />
+ </Grid>
+</Window>

HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml.cs Added

@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="StaticPreviewView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Interaction logic for StaticPreviewView.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Views
+{
+ using System.Windows;
+
+ /// <summary>
+ /// Interaction logic for StaticPreviewView.xaml
+ /// </summary>
+ public partial class StaticPreviewView : Window
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="StaticPreviewView"/> class.
+ /// </summary>
+ public StaticPreviewView()
+ {
+ InitializeComponent();
+ }
+ }
+}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml Changed

@@ -1,13 +1,41 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
+ <Style x:Key="windowStyle" TargetType="Window">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="#FFF0F0F0" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+
+ <Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">
+ <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+ </Style>
+
+ <Style x:Key="whiteUserControlStyle" TargetType="UserControl">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="White" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+
 <Style x:Key="{x:Type StatusBar}" TargetType="{x:Type StatusBar}">
 <Setter Property="SnapsToDevicePixels" Value="True"/>
- <Setter Property="OverridesDefaultStyle" Value="true"/>
 <Setter Property="Template">
 <Setter.Value>
 <ControlTemplate TargetType="{x:Type StatusBar}">
- <Border Background="#FAFAFA" Padding="1">
+ <Border Padding="1">
+ <Border.Style>
+ <Style TargetType="Border">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="#FAFAFA" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Border.Style>
 <ItemsPresenter Margin="0" />
 </Border>
 </ControlTemplate>
@@ -15,6 +43,14 @@
 </Setter>
 </Style>
 
+ <Style TargetType="{x:Type GroupBox}">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="White" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+
 <Style TargetType="{x:Type ComboBox}">
 <Setter Property="MinHeight" Value="22"/>
 <Setter Property="Margin" Value="0,2,0,2" />
@@ -34,4 +70,27 @@
 
 <SolidColorBrush x:Key="GlyphBrush" Color="#444"/>
 
+ <Style x:Key="DropButtonStyle" TargetType="ToggleButton" >
+ <Setter Property="Padding" Value="2,2" />
+ <Setter Property="ContentTemplate">
+ <Setter.Value>
+ <DataTemplate>
+ <Grid VerticalAlignment="Stretch">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <TextBlock Text="{TemplateBinding Content}" Margin="4,0,0,0" Grid.Column="0" />
+
+ 
+
+ <Path Data="M 0,0 L 8,0 L 4,4 Z" Fill="Black" Grid.Column="2" Margin="4,0,4,0" VerticalAlignment="Center"/>
+ </Grid>
+ </DataTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
 </ResourceDictionary>
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml Changed

@@ -7,13 +7,17 @@
 xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
 xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation"
 xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
+ xmlns:splitButton="clr-namespace:HandBrakeWPF.Controls.SplitButton"
+ xmlns:helpers="clr-namespace:HandBrakeWPF.Helpers"
+ xmlns:subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles"
 d:DesignHeight="153"
 d:DesignWidth="319"
- mc:Ignorable="d">
+ mc:Ignorable="d"
+ x:Name="subTab">
 <UserControl.Resources>
 <Converters:BooleanToVisibilityConverter x:Key="booleanToVisConverter" />
+ <subtitles:SubtitleBehaviourConverter x:Key="subtitleBehaviourConverter" />
 </UserControl.Resources>
 
 <Grid>
@@ -23,42 +27,78 @@
 <RowDefinition Height="*" />
 </Grid.RowDefinitions>
 
- <TextBlock Grid.Row="0"
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ 
+ <TextBlock Grid.Row="0" Grid.Column="0"
 Margin="10,5,0,0"
 FontWeight="Bold"
- Text="Subtitles" />
-
- <Grid Grid.Row="1" Margin="10,5,10,0">
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- </Grid.ColumnDefinitions>
- <Button Name="AddTrack"
- Grid.Column="0"
- Width="75"
- Margin="0,0,10,0"
- cal:Message.Attach="[Event Click] = [Action Add]"
- Content="Add" />
- <Button Grid.Column="2"
- MaxWidth="100"
- cal:Message.Attach="[Event Click] = [Action Import]"
- Content="Import SRT" />
+ VerticalAlignment="Top"
+ Text="{Binding PanelTitle}" />
+
+ <Grid Grid.Row="0" Grid.Column="1" Margin="0,5,10,0">
+ <Border cal:Message.Attach="[Event MouseDown] = [Action ShowSubtitleDefaultsPanel]">
+ <StackPanel Orientation="Horizontal">
+ <Image Source="../Views/Images/Advanced.png" Width="20" />
+ <TextBlock Text="{Binding SwitchDisplayTitle}" VerticalAlignment="Center" Margin="5,0,0,0" />
+ </StackPanel>
+ </Border> 
 </Grid>
 
- <ListBox Grid.Row="2"
+ 
+ <StackPanel Grid.Row="1" Margin="10,5,10,0" Orientation="Horizontal"
+ Visibility="{Binding ShowDefaultsPanel, Converter={StaticResource booleanToVisConverter}, ConverterParameter=true}" >
+ <splitButton:SplitMenuButton Content="Add Track" cal:Message.Attach="[Event Click] = [Action Add]" FontWeight="Bold" Margin="0,0,10,0">
+ <splitButton:SplitMenuButton.ItemSource>
+ <MenuItem Header="Add New Track" cal:Message.Attach="[Event Click] = [Action Add]" />
+ <MenuItem Header="Add All Remaining Tracks" cal:Message.Attach="[Event Click] = [Action AddAllRemaining]" />
+ <MenuItem Header="Add All Remaining Closed Captions" cal:Message.Attach="[Event Click] = [Action AddAllClosedCaptions]" />
+ <MenuItem Header="Add All Remaining Selected Languages" cal:Message.Attach="[Event Click] = [Action AddAllRemainingForSelectedLanguages]" />
+ </splitButton:SplitMenuButton.ItemSource>
+ </splitButton:SplitMenuButton>
+
+ <Button MinWidth="75"
+ cal:Message.Attach="[Event Click] = [Action Import]"
+ Content="Import SRT"
+ Margin="0,0,10,0"/>
+ <Button MinWidth="65"
+ Margin="0,0,10,0"
+ cal:Message.Attach="[Event Click] = [Action Clear]"
+ Content="Clear" />
+ </StackPanel>
+
+
+ 
+ <ListBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"
+ Visibility="{Binding ShowDefaultsPanel, Converter={StaticResource booleanToVisConverter}, ConverterParameter=true}"
 Margin="10,10,10,10"
- Background="LightGray"
 dd:DragDrop.DropHandler="{Binding}"
 dd:DragDrop.IsDragSource="True"
 dd:DragDrop.IsDropTarget="True"
 ItemsSource="{Binding Task.SubtitleTracks}"
 SelectionMode="Extended">
+ <ListBox.Style>
+ <Style TargetType="ListBox">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding UseSystemColours}" Value="False">
+ <Setter Property="Background" Value="LightGray" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </ListBox.Style>
+ 
 <ListBox.ItemContainerStyle>
 <Style TargetType="ListBoxItem">
 <Setter Property="HorizontalContentAlignment" Value="Stretch" />
- <Setter Property="Background" Value="WhiteSmoke" />
 <Setter Property="Margin" Value="0,0,0,1" />
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding DataContext.UseSystemColours, ElementName=subTab}" Value="False">
+ <Setter Property="Background" Value="WhiteSmoke" />
+ </DataTrigger>
+ </Style.Triggers>
 </Style>
 </ListBox.ItemContainerStyle>
 
@@ -92,11 +132,12 @@
 Margin="10,0,10,0"
 Source="Images/Movies.png" />
 
- 
- <Grid Grid.Column="1" HorizontalAlignment="Stretch">
+ 
+ <Grid Grid.Column="1" HorizontalAlignment="Stretch" Margin="0,8,0,8"
+ Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=true}">
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="*" MaxWidth="300" />
+ <ColumnDefinition Width="Auto" />
 <ColumnDefinition Width="Auto" />
 <ColumnDefinition Width="Auto" />
 <ColumnDefinition Width="Auto" />
@@ -109,81 +150,31 @@
 </Grid.ColumnDefinitions>
 
 <Grid.RowDefinitions>
- <RowDefinition Height="28" />
- <RowDefinition Height="28" />
+ <RowDefinition Height="Auto" />
 </Grid.RowDefinitions>
 
- 
+ 
+ <TextBlock Grid.Column="0" VerticalAlignment="Center" FontWeight="Bold" Text="Source" />
+ <ComboBox Grid.Column="1" Height="22" Width="200" Margin="5,0,5,0" HorizontalAlignment="Stretch"
+ ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
+ SelectedItem="{Binding SourceTrack}" />
 
- <TextBlock Grid.Column="0"
- VerticalAlignment="Center"
- FontWeight="Bold"
- Text="Source" />
- <ComboBox Grid.Column="1"
- Height="22"
- MaxWidth="300"
- Margin="5,0,5,0"
- HorizontalAlignment="Stretch"
- ItemsSource="{Binding DataContext.SourceTracks,
- RelativeSource={RelativeSource FindAncestor,
- AncestorType={x:Type UserControl}}}"
- SelectedItem="{Binding SourceTrack}"
- Visibility="{Binding IsSrtSubtitle,
- Converter={StaticResource booleanToVisConverter},
- ConverterParameter=true}" />
- <TextBlock Grid.Column="1"
- VerticalAlignment="Center"
- Text="{Binding SrtFileName}"
- Visibility="{Binding IsSrtSubtitle,
- Converter={StaticResource booleanToVisConverter},
- ConverterParameter=false}" />
-
- <TextBlock Grid.Column="2"
- VerticalAlignment="Center"
- FontWeight="Bold"
- Text="Forced Only"
- Visibility="{Binding IsSrtSubtitle,
- Converter={StaticResource booleanToVisConverter},
- ConverterParameter=true}" />
- <CheckBox Grid.Column="3"
- Margin="5,0,5,0"
- VerticalAlignment="Center"
- IsEnabled="{Binding CanBeForced}"
- IsChecked="{Binding Forced}"
- Visibility="{Binding IsSrtSubtitle,
- Converter={StaticResource booleanToVisConverter},
- ConverterParameter=true}" />
- <TextBlock Grid.Column="4"
- VerticalAlignment="Center"
- FontWeight="Bold"
- Text="Burn In"
- Visibility="{Binding IsSrtSubtitle,
- Converter={StaticResource booleanToVisConverter},
- ConverterParameter=true}" />
- <CheckBox Grid.Column="5"
- Margin="5,0,5,0"
- VerticalAlignment="Center"
- IsChecked="{Binding Burned}"
- IsEnabled="{Binding CanBeBurned}"
- Visibility="{Binding IsSrtSubtitle,
- Converter={StaticResource booleanToVisConverter},
- ConverterParameter=true}">
+ <TextBlock Grid.Column="2" VerticalAlignment="Center" FontWeight="Bold" Text="Forced Only" Margin="5,0,0,0" />
+ <CheckBox Grid.Column="3" Margin="5,0,5,0" VerticalAlignment="Center" IsEnabled="{Binding CanBeForced}" IsChecked="{Binding Forced}" />
+ 
+ <TextBlock Grid.Column="4" VerticalAlignment="Center" FontWeight="Bold" Text="Burn In" />
+ <CheckBox Grid.Column="5" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Burned}" IsEnabled="{Binding CanBeBurned}">
 <i:Interaction.Triggers>
 <i:EventTrigger EventName="Click">
- <cal:ActionMessage MethodName="SelectBurnedInTrack">
+ <cal:ActionMessage MethodName="SetBurnedToFalseForAllExcept">
 <cal:Parameter Value="{Binding}" />
 </cal:ActionMessage>
 </i:EventTrigger>
 </i:Interaction.Triggers>
 </CheckBox>
- <TextBlock Grid.Column="6"
- VerticalAlignment="Center"
- FontWeight="Bold"
- Text="Default" />
- <CheckBox Grid.Column="7"
- Margin="5,0,5,0"
- VerticalAlignment="Center"
- IsChecked="{Binding Default}">
+ 
+ <TextBlock Grid.Column="6" VerticalAlignment="Center" FontWeight="Bold" Text="Default" />
+ <CheckBox Grid.Column="7" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Default}">
 <i:Interaction.Triggers>
 <i:EventTrigger EventName="Click">
 <cal:ActionMessage MethodName="SelectDefaultTrack">
@@ -191,57 +182,80 @@
 </cal:ActionMessage>
 </i:EventTrigger>
 </i:Interaction.Triggers>
- </CheckBox>
+ </CheckBox> 
+ </Grid>
 
- 
- <TextBlock Grid.Row="1"
- Grid.Column="0"
- VerticalAlignment="Center"
- FontWeight="Bold"
- Text="Language" />
- <ComboBox Grid.Row="1"
- Grid.Column="1"
- Height="22"
- MaxWidth="300"
- Margin="5,0,5,0"
- HorizontalAlignment="Stretch"
- IsEnabled="{Binding IsSrtSubtitle}"
- ItemsSource="{Binding DataContext.Langauges,
- RelativeSource={RelativeSource FindAncestor,
- AncestorType={x:Type UserControl}}}"
+ 
+ <Grid Grid.Column="1" HorizontalAlignment="Stretch" Margin="0,8,0,8"
+ Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=false}" >
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ 
+ <TextBlock Grid.Column="0" VerticalAlignment="Center" FontWeight="Bold" Text="Source" />
+ <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding SrtFileName}" Margin="5,0,5,0" Width="75" TextWrapping="NoWrap" TextTrimming="WordEllipsis"
+ Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=false}" />
+
+ <TextBlock Grid.Column="2" VerticalAlignment="Center" FontWeight="Bold" Text="Lang" />
+ <ComboBox Grid.Column="3" Height="22" Width="85" Margin="5,0,5,0" HorizontalAlignment="Stretch" IsEnabled="{Binding IsSrtSubtitle}"
+ ItemsSource="{Binding DataContext.Langauges, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
 SelectedItem="{Binding SrtLang}" />
- <TextBlock Grid.Row="1"
- Grid.Column="2"
- VerticalAlignment="Center"
- FontWeight="Bold"
- Text="Char Code" />
- <ComboBox Grid.Row="1"
- Grid.Column="3"
- Width="100"
- Height="22"
- Margin="5,0,5,0"
- IsEnabled="{Binding IsSrtSubtitle}"
- ItemsSource="{Binding DataContext.CharacterCodes,
- RelativeSource={RelativeSource FindAncestor,
- AncestorType={x:Type UserControl}}}"
+ 
+ <TextBlock Grid.Column="4" VerticalAlignment="Center" FontWeight="Bold" Text="Char Code" />
+ <ComboBox Grid.Column="5" Width="70" Height="22" Margin="5,0,5,0" IsEnabled="{Binding IsSrtSubtitle}"
+ ItemsSource="{Binding DataContext.CharacterCodes, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
 SelectedItem="{Binding SrtCharCode}" />
- <TextBlock Grid.Row="1"
- Grid.Column="4"
- VerticalAlignment="Center"
- FontWeight="Bold"
- Text="Offset (ms)" />
-
- <controls:NumberBox Grid.Row="1" Grid.Column="5" Width="65" Height="24" Margin="5,0,5,0"
- Minimum="-900000" Maximum="900000" IsEnabled="{Binding IsSrtSubtitle}"
- Number="{Binding SrtOffset, Mode=TwoWay}" />
 
+ <TextBlock Grid.Column="6" VerticalAlignment="Center" FontWeight="Bold" Text="Offset (ms)" />
+ <controls:NumberBox Grid.Column="7" Width="58" Height="24" Margin="5,0,5,0" Minimum="-9000000" Maximum="900000" 
+ IsEnabled="{Binding IsSrtSubtitle}" Number="{Binding SrtOffset, Mode=TwoWay}" />
+
+ <TextBlock Grid.Column="8" VerticalAlignment="Center" FontWeight="Bold" Text="Default" />
+ <CheckBox Grid.Column="9" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Default}">
+ <i:Interaction.Triggers>
+ <i:EventTrigger EventName="Click">
+ <cal:ActionMessage MethodName="SelectDefaultTrack">
+ <cal:Parameter Value="{Binding}" />
+ </cal:ActionMessage>
+ </i:EventTrigger>
+ </i:Interaction.Triggers>
+ </CheckBox>
+
+ <TextBlock Grid.Column="10" VerticalAlignment="Center" FontWeight="Bold" Text="Burn In" />
+ <CheckBox Grid.Column="11" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Burned}" IsEnabled="{Binding CanBeBurned}">
+ <i:Interaction.Triggers>
+ <i:EventTrigger EventName="Click">
+ <cal:ActionMessage MethodName="SetBurnedToFalseForAllExcept">
+ <cal:Parameter Value="{Binding}" />
+ </cal:ActionMessage>
+ </i:EventTrigger>
+ </i:Interaction.Triggers>
+ </CheckBox>
+
 </Grid>
 
 
 <Image Grid.Column="2"
 Width="16"
 Height="16"
- Margin="10,0,10,0"
+ Margin="5,0,10,0"
 Source="Images/delete.png">
 <i:Interaction.Triggers>
 <i:EventTrigger EventName="MouseDown">
@@ -259,6 +273,80 @@
 </ListBox.ItemTemplate>
 </ListBox>
 
+ <StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="10,10,10,10"
+ Visibility="{Binding ShowDefaultsPanel, Converter={StaticResource booleanToVisConverter}, ConverterParameter=false}">
+
+ <Grid Margin="5,0,0,0" >
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ 
+ <TextBlock Text="Track Selection Behaviour:" Grid.Column="2" Grid.Row="0" Margin="0,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
+ <ComboBox Name="autoSubtitleMode" Grid.Column="3" Grid.Row="0" HorizontalAlignment="Left"
+ ItemsSource="{Binding SubtitleBehaviourModeList, Converter={StaticResource subtitleBehaviourConverter}}" 
+ SelectedItem="{Binding SubtitleBehaviours.SelectedBehaviour, Converter={StaticResource subtitleBehaviourConverter}}" Width="210" Margin="0,0,5,0" />
+ <CheckBox Content="Add Closed Captions when available" Grid.Column="3" Grid.Row="1" Margin="0,5,0,0" 
+ HorizontalAlignment="Left" IsChecked="{Binding SubtitleBehaviours.AddClosedCaptions}"/>
+ <CheckBox Content="Add 'Foreign Audio Scan'" Grid.Column="3" Grid.Row="2" Margin="0,5,0,0" 
+ HorizontalAlignment="Left" IsChecked="{Binding SubtitleBehaviours.AddForeignAudioScanTrack}"/>
+ </Grid>
+
+ <TextBlock Text="Choose Languages:" Margin="5,15,0,0"/>
+
+ <Grid Margin="20,5,0,0">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <StackPanel Orientation="Horizontal">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <StackPanel Orientation="Vertical" Grid.Column="0">
+ <TextBlock Text="Available Languages:" Margin="0,0,0,5"/>
+ <ListBox Name="availableLanguages" ItemsSource="{Binding AvailableLanguages}" 
+ helpers:ListBoxHelper.SelectedItems="{Binding SelectedAvailableToMove}" 
+ SelectionMode="Extended" Width="140" Height="120" />
+ </StackPanel>
+
+ <DockPanel Grid.Column="1" Margin="10,0,10,0">
+ <StackPanel Orientation="Vertical" VerticalAlignment="Center">
+ <Button Content="Move Right" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" MaxWidth="90" />
+ <Button Content="Move Left" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" MaxWidth="90" />
+ <Button Content="Clear" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageClearAll]" Width="80"/>
+ </StackPanel>
+ </DockPanel>
+
+ <StackPanel Orientation="Vertical" Grid.Column="2">
+ <TextBlock Text="Chosen Languages:" Margin="0,0,0,5"/>
+ <ListBox Name="selectedLangauges" ItemsSource="{Binding SubtitleBehaviours.SelectedLangauges}" 
+ helpers:ListBoxHelper.SelectedItems="{Binding SelectedLangaugesToMove}" 
+ SelectionMode="Extended" Width="140" Height="120"
+ dd:DragDrop.DropHandler="{Binding}"
+ dd:DragDrop.IsDragSource="True"
+ dd:DragDrop.IsDropTarget="True"/>
+ </StackPanel>
+ </Grid>
+ </StackPanel>
+ </Grid>
+
+ </StackPanel>
+
 
 </Grid>
 </UserControl>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/VideoView.xaml -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/VideoView.xaml Changed

@@ -5,7 +5,9 @@
 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
 xmlns:Video="clr-namespace:HandBrakeWPF.Converters.Video"
- xmlns:Properties="clr-namespace:HandBrakeWPF.Properties" mc:Ignorable="d" >
+ xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
+ xmlns:cal="http://www.caliburnproject.org"
+ mc:Ignorable="d" >
 
 <UserControl.Resources>
 <Converters:BooleanConverter x:Key="boolConverter" />
@@ -13,22 +15,8 @@
 <Converters:EnumComboConverter x:Key="enumComboConverter" />
 <Converters:InverseBooleanConverter x:Key="inverseConverter" />
 <Video:VideoEncoderConverter x:Key="videoEncoderConverter" />
- 
- <Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">
- <Setter Property="ToolTipService.ShowDuration" Value="20000" />
- </Style>
-
- <Style TargetType="ToolTip">
- <Setter Property="ContentTemplate">
- <Setter.Value>
- <DataTemplate>
- <TextBlock TextWrapping="Wrap" Width="450" Text="{Binding}" />
- </DataTemplate>
- </Setter.Value>
- </Setter>
- </Style>
 </UserControl.Resources>
- 
+
 <Grid Margin="10,5,0,0">
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
@@ -41,7 +29,7 @@
 <ColumnDefinition Width="*" />
 <ColumnDefinition Width="*" />
 </Grid.ColumnDefinitions>
- 
+
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
 <RowDefinition Height="Auto" />
@@ -67,57 +55,71 @@
 </MultiBinding>
 </ComboBox.ItemsSource>
 </ComboBox>
- 
+
 </StackPanel>
 
 <StackPanel Orientation="Horizontal">
 <TextBlock Text="Framerate (FPS):" VerticalAlignment="Top" Margin="0,5,0,0" Width="100"/>
 <StackPanel Orientation="Vertical">
- <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}" />
- <RadioButton Content="Constant Framerate" IsChecked="{Binding IsConstantFramerate}" Margin="0,10,0,0" />
- <RadioButton Content="Variable Framerate" IsChecked="{Binding IsVariableFramerate}" Margin="0,5,0,0" 
+ <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}" 
+ Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
+ <TextBlock Text="Same as source" VerticalAlignment="Center" Margin="0,5,0,0"
+ Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>
+
+ <StackPanel Orientation="Vertical" Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}}">
+ <RadioButton Content="Constant Framerate" IsChecked="{Binding IsConstantFramerate}" Margin="0,10,0,0" />
+ <RadioButton Content="Variable Framerate" IsChecked="{Binding IsVariableFramerate}" Margin="0,5,0,0" 
 Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
- <RadioButton Content="Peak Framerate" IsChecked="{Binding IsPeakFramerate}" Margin="0,5,0,0"
+ <RadioButton Content="Peak Framerate" IsChecked="{Binding IsPeakFramerate}" Margin="0,5,0,0"
 Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
+ </StackPanel>
 </StackPanel>
 </StackPanel>
 </StackPanel>
 
 
- <StackPanel Orientation="Vertical" Grid.Column="1" >
+ <StackPanel Orientation="Vertical" Grid.Column="1" Grid.RowSpan="2">
 <TextBlock Text="Quality" FontWeight="Bold" Margin="0,0,0,10"/>
 
 <StackPanel Orientation="Horizontal" Margin="0,0,0,10" >
- <RadioButton Content="Constant Quality:" IsChecked="{Binding IsConstantQuantity}" Margin="0,0,10,0"/>
- <TextBlock Text="{Binding DisplayRF}" Width="25" />
- <TextBlock Text="{Binding Rfqp}" FontWeight="Bold" />
+ <RadioButton Content="Constant Quality:" IsChecked="{Binding IsConstantQuantity}" Margin="0,0,10,0" />
+ <TextBlock Text="{Binding DisplayRF}" MinWidth="30" />
+ <TextBlock Text="{Binding Rfqp}" FontWeight="Bold" Margin="5,0,0,0" />
 
 <TextBlock Text="{x:Static Properties:Resources.Video_LosslessWarning}" Visibility="{Binding IsLossless, Converter={StaticResource boolToVisConverter}}" 
 Margin="10,0,0,0" ToolTip="{x:Static Properties:Resources.Video_LosslessWarningTooltip}" FontWeight="Bold" />
 </StackPanel>
 
- <Slider Width="280" Value="{Binding RF}" HorizontalAlignment="Left" Maximum="{Binding QualityMax}" Minimum="{Binding QualityMin}"
- IsEnabled="{Binding IsConstantQuantity}" Margin="20,0,0,20"
+ <Slider Width="280" Value="{Binding RF, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left" Maximum="{Binding QualityMax}" Minimum="{Binding QualityMin}"
+ IsEnabled="{Binding IsConstantQuantity}" Margin="20,0,0,10"
 ToolTip="{x:Static Properties:Resources.Video_QualitySlider}" Style="{StaticResource LongToolTipHolder}" 
 IsSnapToTickEnabled="True" TickFrequency="1" TickPlacement="BottomRight" />
 
+ <Grid Margin="20,0,0,20" Width="280" HorizontalAlignment="Left">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+ <TextBlock Text="{x:Static Properties:Resources.Video_LowQuality}" />
+ <TextBlock Text="{Binding HighQualityLabel}" HorizontalAlignment="Right" Grid.Column="1" />
+ </Grid>
+
 <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
 <RadioButton Content="Avg Bitrate (kbps):" IsChecked="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,10,0"/>
- <TextBox Width="75" Text="{Binding Task.VideoBitrate, UpdateSourceTrigger=PropertyChanged}" 
- IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" />
+ <TextBox Width="75" Text="{Binding Task.VideoBitrate, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" />
 </StackPanel>
 
- <StackPanel Orientation="Horizontal" Margin="30,0,0,0">
+ <StackPanel Orientation="Horizontal" Margin="30,0,0,0" Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}}">
 <CheckBox Content="2-Pass Encoding" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"
- IsChecked="{Binding Task.TwoPass}" Margin="0,0,10,0" />
+ IsChecked="{Binding TwoPass}" Margin="0,0,10,0" />
 <CheckBox Content="Turbo first pass" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"
- IsChecked="{Binding Task.TurboFirstPass}" />
+ IsChecked="{Binding TurboFirstPass}" Visibility="{Binding DisplayTurboFirstPass, Converter={StaticResource boolToVisConverter}}" />
 </StackPanel>
 
 </StackPanel>
 
 
- <Grid Grid.Row="1" Grid.ColumnSpan="2" Margin="0,20,0,0" Visibility="{Binding DisplayX264Options, Converter={StaticResource boolToVisConverter}}">
+ <Grid Grid.Row="1" Grid.ColumnSpan="2" Margin="0,20,0,0" Visibility="{Binding DisplayH264Options, Converter={StaticResource boolToVisConverter}}">
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
 <RowDefinition Height="Auto" />
@@ -129,8 +131,7 @@
 <CheckBox Content="Use Advanced Tab instead" Grid.Row="1" IsChecked="{Binding UseAdvancedTab}" 
 Visibility="{Binding ShowAdvancedTab, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
 
- <Grid Grid.Row="2" Margin="0,5,0,0" IsEnabled="{Binding UseAdvancedTab, Converter={StaticResource inverseConverter}}"
- Visibility="{Binding DisplayX264Options, Converter={StaticResource boolToVisConverter}}">
+ <Grid Grid.Row="2" Margin="0,5,0,0" IsEnabled="{Binding UseAdvancedTab, Converter={StaticResource inverseConverter}}">
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
 <RowDefinition Height="Auto" />
@@ -150,22 +151,36 @@
 
 
 
- <TextBlock Text="x264 Preset:" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" />
- <StackPanel Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Orientation="Horizontal">
+ <TextBlock Text="x264 Preset:" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
+ Visibility="{Binding DisplayX264Options, Converter={StaticResource boolToVisConverter}}" />
+ <StackPanel Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Orientation="Horizontal"
+ Visibility="{Binding DisplayX264Options, Converter={StaticResource boolToVisConverter}}" >
 <Slider Minimum="0" Maximum="9" Width="150" Value="{Binding X264PresetValue, Mode=Default, UpdateSourceTrigger=PropertyChanged}" 
- IsSnapToTickEnabled="True" TickFrequency="1" TickPlacement="BottomRight" ToolTip="{x:Static Properties:Resources.Video_x264Preset}" 
+ IsSnapToTickEnabled="True" TickFrequency="1" TickPlacement="BottomRight" ToolTip="{x:Static Properties:Resources.Video_EncoderPreset}" 
 Style="{StaticResource LongToolTipHolder}" />
 <TextBlock Text="{Binding X264Preset, Converter={StaticResource enumComboConverter}}" Margin="5,0,0,0" />
 </StackPanel>
 
- <TextBlock Text="x264 Tune:" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="0,10,0,0" />
+ <TextBlock Text="x264 Tune:" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="0,10,0,0" 
+ Visibility="{Binding DisplayX264Options, Converter={StaticResource boolToVisConverter}}" />
 <ComboBox Width="100" Grid.Row="2" Grid.Column="1" Margin="5,10,5,0" Height="22"
- ItemsSource="{Binding X264Tunes, Converter={StaticResource enumComboConverter}}" 
- SelectedItem="{Binding X264Tune, Converter={StaticResource enumComboConverter}}"
- ToolTip="{x:Static Properties:Resources.Video_x264Tune}"
- Style="{StaticResource LongToolTipHolder}" />
+ ItemsSource="{Binding X264Tunes, Converter={StaticResource enumComboConverter}}" 
+ SelectedItem="{Binding X264Tune, Converter={StaticResource enumComboConverter}}"
+ Visibility="{Binding DisplayX264Options, Converter={StaticResource boolToVisConverter}}"
+ ToolTip="{x:Static Properties:Resources.Video_EncoderTune}"
+ Style="{StaticResource LongToolTipHolder}" />
 <CheckBox IsChecked="{Binding FastDecode}" Content="Fast Decode" Grid.Row="2" Grid.Column="2" Margin="10,10,10,0" VerticalAlignment="Center"
- ToolTip="{x:Static Properties:Resources.Video_x264FastDecode}"/>
+ Visibility="{Binding DisplayX264Options, Converter={StaticResource boolToVisConverter}}"
+ ToolTip="{x:Static Properties:Resources.Video_x264FastDecode}"/>
+
+ <TextBlock Text="QSV Preset:" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
+ Visibility="{Binding DisplayQSVOptions, Converter={StaticResource boolToVisConverter}}" />
+ <StackPanel Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Orientation="Horizontal"
+ Visibility="{Binding DisplayQSVOptions, Converter={StaticResource boolToVisConverter}}" >
+ <Slider Minimum="0" Maximum="{Binding QsvSliderMax}" Width="150" Value="{Binding QsvPresetValue, Mode=Default, UpdateSourceTrigger=PropertyChanged}" 
+ IsSnapToTickEnabled="True" TickFrequency="1" TickPlacement="BottomRight" />
+ <TextBlock Text="{Binding QsvPreset, Converter={StaticResource enumComboConverter}}" Margin="5,0,0,0" />
+ </StackPanel>
 
 
 
@@ -174,26 +189,112 @@
 ItemsSource="{Binding H264Profiles, Converter={StaticResource enumComboConverter}}" 
 SelectedItem="{Binding H264Profile, Converter={StaticResource enumComboConverter}}"
 Style="{StaticResource LongToolTipHolder}"
- ToolTip="{x:Static Properties:Resources.Video_x264Profile}" />
+ ToolTip="{x:Static Properties:Resources.Video_EncoderProfile}" />
 
 <TextBlock Text="H.264 Level:" Grid.Row="3" Grid.Column="2" Margin="10,10,0,0" VerticalAlignment="Center" />
 <ComboBox Width="100" Grid.Row="3" Grid.Column="3" Margin="5,10,5,0" Height="22" VerticalAlignment="Center"
 ItemsSource="{Binding H264Levels}" 
 SelectedItem="{Binding H264Level}"
 Style="{StaticResource LongToolTipHolder}"
- ToolTip="{x:Static Properties:Resources.Video_x264Level}"/>
+ ToolTip="{x:Static Properties:Resources.Video_EncoderLevel}"/>
 
 
- <TextBlock Text="Extra Options:" Grid.Row="4" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Center" HorizontalAlignment="Left" />
+ <TextBlock Text="Extra Options:" Grid.Row="4" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Center" HorizontalAlignment="Left"
+ Visibility="{Binding DisplayX264Options, Converter={StaticResource boolToVisConverter}}" />
 <TextBox Text="{Binding ExtraArguments, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
- Height="30" MaxLines="2" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Margin="5,10,0,0" VerticalAlignment="Center"
- ToolTip="{Binding FullOptionsTooltip}" Style="{StaticResource LongToolTipHolder}" />
+ Height="30" MaxLines="2" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Margin="5,10,0,0" VerticalAlignment="Center"
+ ToolTip="{Binding FullOptionsTooltip}" Style="{StaticResource LongToolTipHolder}"
+ Visibility="{Binding DisplayX264Options, Converter={StaticResource boolToVisConverter}}" >
+ <TextBox.ContextMenu>
+ <ContextMenu>
+ <MenuItem Header="Copy Full Query" cal:Message.Attach="[Event Click] = [Action CopyQuery]" />
+ </ContextMenu>
+ </TextBox.ContextMenu>
+ </TextBox>
+
+
+ </Grid>
+ </Grid>
+
+
+ 
+
+ <Grid Grid.Row="1" Grid.ColumnSpan="2" Margin="0,20,0,0" Visibility="{Binding DisplayX265Options, Converter={StaticResource boolToVisConverter}}">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ </Grid.RowDefinitions>
+
+ <TextBlock Text="Optimise Video:" Margin="0,0,0,8" Grid.Row="0" Grid.ColumnSpan="2" FontWeight="Bold" VerticalAlignment="Center" />
+
+ <CheckBox Content="Use Advanced Tab instead" Grid.Row="1" IsChecked="{Binding UseAdvancedTab}" 
+ Visibility="{Binding DisplayX265Options, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
 
+ <Grid Grid.Row="2" Margin="0,5,0,0" IsEnabled="{Binding UseAdvancedTab, Converter={StaticResource inverseConverter}}">
 
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+
+ 
+
+ <TextBlock Text="x265 Preset:" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
+ Visibility="{Binding DisplayX265Options, Converter={StaticResource boolToVisConverter}}" />
+ <StackPanel Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Orientation="Horizontal"
+ Visibility="{Binding DisplayX265Options, Converter={StaticResource boolToVisConverter}}" >
+ <Slider Minimum="0" Maximum="9" Width="150" Value="{Binding X265PresetValue, Mode=Default, UpdateSourceTrigger=PropertyChanged}" 
+ IsSnapToTickEnabled="True" TickFrequency="1" TickPlacement="BottomRight" ToolTip="{x:Static Properties:Resources.Video_EncoderPreset}" 
+ Style="{StaticResource LongToolTipHolder}" />
+ <TextBlock Text="{Binding X265Preset}" Margin="5,0,0,0" />
+ </StackPanel>
+
+ <TextBlock Text="x265 Tune:" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="0,10,0,0" 
+ Visibility="{Binding DisplayX265Options, Converter={StaticResource boolToVisConverter}}" />
+ <ComboBox Width="100" Grid.Row="2" Grid.Column="1" Margin="5,10,5,0" Height="22"
+ ItemsSource="{Binding X265Tunes}" 
+ SelectedItem="{Binding X265Tune}"
+ Visibility="{Binding DisplayX265Options, Converter={StaticResource boolToVisConverter}}"
+ ToolTip="{x:Static Properties:Resources.Video_EncoderTune}"
+ Style="{StaticResource LongToolTipHolder}" />
+
+ <TextBlock Text="H.265 Profile:" Grid.Row="2" Grid.Column="2" Margin="10,10,0,0" VerticalAlignment="Center" 
+ Visibility="{Binding DisplayX265Options, Converter={StaticResource boolToVisConverter}}" />
+ <ComboBox Width="100" Grid.Row="2" Grid.Column="3" Margin="5,10,5,0" Height="22" VerticalAlignment="Center"
+ Visibility="{Binding DisplayX265Options, Converter={StaticResource boolToVisConverter}}"
+ ItemsSource="{Binding H265Profiles}" 
+ SelectedItem="{Binding H265Profile}"
+ Style="{StaticResource LongToolTipHolder}"
+ ToolTip="{x:Static Properties:Resources.Video_EncoderProfile}" />
+
+ 
+ <TextBlock Text="Extra Options:" Grid.Row="4" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Center" HorizontalAlignment="Left"
+ Visibility="{Binding DisplayX265Options, Converter={StaticResource boolToVisConverter}}" />
+ <TextBox Text="{Binding ExtraArguments, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+ Height="30" MaxLines="2" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Margin="5,10,0,0" VerticalAlignment="Center"
+ ToolTip="{Binding FullOptionsTooltip}" Style="{StaticResource LongToolTipHolder}"
+ Visibility="{Binding DisplayX265Options, Converter={StaticResource boolToVisConverter}}" >
+ <TextBox.ContextMenu>
+ <ContextMenu>
+ <MenuItem Header="Copy Full Query" cal:Message.Attach="[Event Click] = [Action CopyQuery]" />
+ </ContextMenu>
+ </TextBox.ContextMenu>
+ </TextBox>
 </Grid>
 </Grid>
- 
- 
 </Grid>
 
 </Grid>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/X264View.xaml.cs -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/Views/X264View.xaml.cs Changed

@@ -1,23 +1,21 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AdvancedView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="X264View.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
 // <summary>
-// Interaction logic for AdvancedView.xaml
+// Interaction logic for X264View.xaml
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrakeWPF.Views
 {
- using System.Windows.Controls;
-
 /// <summary>
 /// Interaction logic for AdvancedView.xaml
 /// </summary>
- public partial class X264View : UserControl
+ public partial class X264View
 {
 /// <summary>
- /// Initializes a new instance of the <see cref="AdvancedView"/> class.
+ /// Initializes a new instance of the <see cref="X264View"/> class. 
 /// </summary>
 public X264View()
 {

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/app.config -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/app.config Changed

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/defaultsettings.xml -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/defaultsettings.xml Changed

@@ -410,7 +410,7 @@
 </item>
 <item>
 <key>
- <string>EnableDebugFeatures</string>
+ <string>EnableLibHb</string>
 </key>
 <value>
 <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
@@ -418,7 +418,7 @@
 </item>
 <item>
 <key>
- <string>EnableLibHb</string>
+ <string>ShowAdvancedTab</string>
 </key>
 <value>
 <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
@@ -426,7 +426,23 @@
 </item>
 <item>
 <key>
- <string>ShowAdvancedTab</string>
+ <string>LastPreviewDuration</string>
+ </key>
+ <value>
+ <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">30</anyType>
+ </value>
+ </item>
+ <item>
+ <key>
+ <string>RemovePunctuation</string>
+ </key>
+ <value>
+ <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
+ </value>
+ </item>
+ <item>
+ <key>
+ <string>ShowPresetPanel</string>
 </key>
 <value>
 <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
@@ -434,15 +450,48 @@
 </item>
 <item>
 <key>
- <string>LastPreviewDuration</string>
+ <string>UseSystemColours</string>
 </key>
 <value>
- <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">30</anyType>
+ <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
+ </value>
+ </item>
+
+ <item>
+ <key>
+ <string>EnableQuickSync</string>
+ </key>
+ <value>
+ <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">true</anyType>
+ </value>
+ </item>
+ <item>
+ <key>
+ <string>DisableQuickSyncDecoding</string>
+ </key>
+ <value>
+ <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
+ </value>
+ </item>
+ <item>
+ <key>
+ <string>EnableDxva</string>
+ </key>
+ <value>
+ <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
+ </value>
+ </item>
+ <item>
+ <key>
+ <string>ScalingMode</string>
+ </key>
+ <value>
+ <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">0</anyType>
 </value>
 </item>
 <item>
 <key>
- <string>DisableLibHbFeatures</string>
+ <string>AddForeignAudioScanTrack</string>
 </key>
 <value>
 <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/handbrakepineapple.ico -> HandBrake-0.10.0.tar.bz2/win/CS/HandBrakeWPF/handbrakepineapple.ico Changed

HandBrake-0.9.9.tar.bz2/win/CS/Settings.StyleCop -> HandBrake-0.10.0.tar.bz2/win/CS/Settings.StyleCop Changed

HandBrake-0.9.9.tar.bz2/win/CS/doc/CREDITS -> HandBrake-0.10.0.tar.bz2/win/CS/doc/CREDITS Changed

HandBrake-0.9.9.tar.bz2/win/CS/doc/NEWS -> HandBrake-0.10.0.tar.bz2/win/CS/doc/NEWS Changed

HandBrake-0.9.9.tar.bz2/win/CS/doc/THANKS -> HandBrake-0.10.0.tar.bz2/win/CS/doc/THANKS Changed

HandBrake-0.9.9.tar.bz2/win/CS/doc/TRANSLATIONS -> HandBrake-0.10.0.tar.bz2/win/CS/doc/TRANSLATIONS Changed

HandBrake-0.10.0.tar.bz2/win/CS/libraries/CsvReader Added

HandBrake-0.10.0.tar.bz2/win/CS/libraries/CsvReader/LumenWorks.Framework.IO.XML Added

@@ -0,0 +1,1538 @@
+<?xml version="1.0"?>
+<doc>
+ <assembly>
+ <name>LumenWorks.Framework.IO</name>
+ </assembly>
+ <members>
+ <member name="T:LumenWorks.Framework.IO.Csv.CachedCsvReader">
+ <summary>
+ Represents a reader that provides fast, cached, dynamic access to CSV data.
+ </summary>
+ <remarks>The number of records is limited to <see cref="F:System.Int32.MaxValue"/> - 1.</remarks>
+ </member>
+ <member name="T:LumenWorks.Framework.IO.Csv.CsvReader">
+ <summary>
+ Represents a reader that provides fast, non-cached, forward-only access to CSV data. 
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader.DefaultBufferSize">
+ <summary>
+ Defines the default buffer size.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader.DefaultDelimiter">
+ <summary>
+ Defines the default delimiter character separating each field.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader.DefaultQuote">
+ <summary>
+ Defines the default quote character wrapping every field.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader.DefaultEscape">
+ <summary>
+ Defines the default escape character letting insert quotation characters inside a quoted field.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader.DefaultComment">
+ <summary>
+ Defines the default comment character indicating that a line is commented out.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._fieldHeaderComparer">
+ <summary>
+ Contains the field header comparer.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._reader">
+ <summary>
+ Contains the <see cref="T:TextReader"/> pointing to the CSV file.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._bufferSize">
+ <summary>
+ Contains the buffer size.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._comment">
+ <summary>
+ Contains the comment character indicating that a line is commented out.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._escape">
+ <summary>
+ Contains the escape character letting insert quotation characters inside a quoted field.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._delimiter">
+ <summary>
+ Contains the delimiter character separating each field.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._quote">
+ <summary>
+ Contains the quotation character wrapping every field.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._trimmingOptions">
+ <summary>
+ Determines which values should be trimmed.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._hasHeaders">
+ <summary>
+ Indicates if field names are located on the first non commented line.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._defaultParseErrorAction">
+ <summary>
+ Contains the default action to take when a parsing error has occured.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._missingFieldAction">
+ <summary>
+ Contains the action to take when a field is missing.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._supportsMultiline">
+ <summary>
+ Indicates if the reader supports multiline.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._skipEmptyLines">
+ <summary>
+ Indicates if the reader will skip empty lines.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._initialized">
+ <summary>
+ Indicates if the class is initialized.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._fieldHeaders">
+ <summary>
+ Contains the field headers.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._fieldHeaderIndexes">
+ <summary>
+ Contains the dictionary of field indexes by header. The key is the field name and the value is its index.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._currentRecordIndex">
+ <summary>
+ Contains the current record index in the CSV file.
+ A value of <see cref="M:Int32.MinValue"/> means that the reader has not been initialized yet.
+ Otherwise, a negative value means that no record has been read yet.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._nextFieldStart">
+ <summary>
+ Contains the starting position of the next unread field.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._nextFieldIndex">
+ <summary>
+ Contains the index of the next unread field.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._fields">
+ <summary>
+ Contains the array of the field values for the current record.
+ A null value indicates that the field have not been parsed.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._fieldCount">
+ <summary>
+ Contains the maximum number of fields to retrieve for each record.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._buffer">
+ <summary>
+ Contains the read buffer.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._bufferLength">
+ <summary>
+ Contains the current read buffer length.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._eof">
+ <summary>
+ Indicates if the end of the reader has been reached.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._eol">
+ <summary>
+ Indicates if the last read operation reached an EOL character.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._firstRecordInCache">
+ <summary>
+ Indicates if the first record is in cache.
+ This can happen when initializing a reader with no headers
+ because one record must be read to get the field count automatically
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._missingFieldFlag">
+ <summary>
+ Indicates if one or more field are missing for the current record.
+ Resets after each successful record read.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._parseErrorFlag">
+ <summary>
+ Indicates if a parse error occured for the current record.
+ Resets after each successful record read.
+ </summary>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.#ctor(System.IO.TextReader,System.Boolean)">
+ <summary>
+ Initializes a new instance of the CsvReader class.
+ </summary>
+ <param name="reader">A <see cref="T:TextReader"/> pointing to the CSV file.</param>
+ <param name="hasHeaders"><see langword="true"/> if field names are located on the first non commented line, otherwise, <see langword="false"/>.</param>
+ <exception cref="T:ArgumentNullException">
+ 	<paramref name="reader"/> is a <see langword="null"/>.
+ </exception>
+ <exception cref="T:ArgumentException">
+ 	Cannot read from <paramref name="reader"/>.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.#ctor(System.IO.TextReader,System.Boolean,System.Int32)">
+ <summary>
+ Initializes a new instance of the CsvReader class.
+ </summary>
+ <param name="reader">A <see cref="T:TextReader"/> pointing to the CSV file.</param>
+ <param name="hasHeaders"><see langword="true"/> if field names are located on the first non commented line, otherwise, <see langword="false"/>.</param>
+ <param name="bufferSize">The buffer size in bytes.</param>
+ <exception cref="T:ArgumentNullException">
+ 	<paramref name="reader"/> is a <see langword="null"/>.
+ </exception>
+ <exception cref="T:ArgumentException">
+ 	Cannot read from <paramref name="reader"/>.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.#ctor(System.IO.TextReader,System.Boolean,System.Char)">
+ <summary>
+ Initializes a new instance of the CsvReader class.
+ </summary>
+ <param name="reader">A <see cref="T:TextReader"/> pointing to the CSV file.</param>
+ <param name="hasHeaders"><see langword="true"/> if field names are located on the first non commented line, otherwise, <see langword="false"/>.</param>
+ <param name="delimiter">The delimiter character separating each field (default is ',').</param>
+ <exception cref="T:ArgumentNullException">
+ 	<paramref name="reader"/> is a <see langword="null"/>.
+ </exception>
+ <exception cref="T:ArgumentException">
+ 	Cannot read from <paramref name="reader"/>.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.#ctor(System.IO.TextReader,System.Boolean,System.Char,System.Int32)">
+ <summary>
+ Initializes a new instance of the CsvReader class.
+ </summary>
+ <param name="reader">A <see cref="T:TextReader"/> pointing to the CSV file.</param>
+ <param name="hasHeaders"><see langword="true"/> if field names are located on the first non commented line, otherwise, <see langword="false"/>.</param>
+ <param name="delimiter">The delimiter character separating each field (default is ',').</param>
+ <param name="bufferSize">The buffer size in bytes.</param>
+ <exception cref="T:ArgumentNullException">
+ 	<paramref name="reader"/> is a <see langword="null"/>.
+ </exception>
+ <exception cref="T:ArgumentException">
+ 	Cannot read from <paramref name="reader"/>.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.#ctor(System.IO.TextReader,System.Boolean,System.Char,System.Char,System.Char,System.Char,LumenWorks.Framework.IO.Csv.ValueTrimmingOptions)">
+ <summary>
+ Initializes a new instance of the CsvReader class.
+ </summary>
+ <param name="reader">A <see cref="T:TextReader"/> pointing to the CSV file.</param>
+ <param name="hasHeaders"><see langword="true"/> if field names are located on the first non commented line, otherwise, <see langword="false"/>.</param>
+ <param name="delimiter">The delimiter character separating each field (default is ',').</param>
+ <param name="quote">The quotation character wrapping every field (default is ''').</param>
+ <param name="escape">
+ The escape character letting insert quotation characters inside a quoted field (default is '\').
+ If no escape character, set to '\0' to gain some performance.
+ </param>
+ <param name="comment">The comment character indicating that a line is commented out (default is '#').</param>
+ <param name="trimmingOptions">Determines which values should be trimmed.</param>
+ <exception cref="T:ArgumentNullException">
+ 	<paramref name="reader"/> is a <see langword="null"/>.
+ </exception>
+ <exception cref="T:ArgumentException">
+ 	Cannot read from <paramref name="reader"/>.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.#ctor(System.IO.TextReader,System.Boolean,System.Char,System.Char,System.Char,System.Char,LumenWorks.Framework.IO.Csv.ValueTrimmingOptions,System.Int32)">
+ <summary>
+ Initializes a new instance of the CsvReader class.
+ </summary>
+ <param name="reader">A <see cref="T:TextReader"/> pointing to the CSV file.</param>
+ <param name="hasHeaders"><see langword="true"/> if field names are located on the first non commented line, otherwise, <see langword="false"/>.</param>
+ <param name="delimiter">The delimiter character separating each field (default is ',').</param>
+ <param name="quote">The quotation character wrapping every field (default is ''').</param>
+ <param name="escape">
+ The escape character letting insert quotation characters inside a quoted field (default is '\').
+ If no escape character, set to '\0' to gain some performance.
+ </param>
+ <param name="comment">The comment character indicating that a line is commented out (default is '#').</param>
+ <param name="trimmingOptions">Determines which values should be trimmed.</param>
+ <param name="bufferSize">The buffer size in bytes.</param>
+ <exception cref="T:ArgumentNullException">
+ 	<paramref name="reader"/> is a <see langword="null"/>.
+ </exception>
+ <exception cref="T:System.ArgumentOutOfRangeException">
+ 	<paramref name="bufferSize"/> must be 1 or more.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.OnParseError(LumenWorks.Framework.IO.Csv.ParseErrorEventArgs)">
+ <summary>
+ Raises the <see cref="M:ParseError"/> event.
+ </summary>
+ <param name="e">The <see cref="T:LumenWorks.Framework.IO.Csv.ParseErrorEventArgs"/> that contains the event data.</param>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.GetFieldHeaders">
+ <summary>
+ Gets the field headers.
+ </summary>
+ <returns>The field headers or an empty array if headers are not supported.</returns>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.EnsureInitialize">
+ <summary>
+ Ensures that the reader is initialized.
+ </summary>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.GetFieldIndex(System.String)">
+ <summary>
+ Gets the field index for the provided header.
+ </summary>
+ <param name="header">The header to look for.</param>
+ <returns>The field index for the provided header. -1 if not found.</returns>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.CopyCurrentRecordTo(System.String[])">
+ <summary>
+ Copies the field array of the current record to a one-dimensional array, starting at the beginning of the target array.
+ </summary>
+ <param name="array"> The one-dimensional <see cref="T:Array"/> that is the destination of the fields of the current record.</param>
+ <exception cref="T:ArgumentNullException">
+ 	<paramref name="array"/> is <see langword="null"/>.
+ </exception>
+ <exception cref="T:System.ArgumentException">
+ 	The number of fields in the record is greater than the available space from <paramref name="index"/> to the end of <paramref name="array"/>.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.CopyCurrentRecordTo(System.String[],System.Int32)">
+ <summary>
+ Copies the field array of the current record to a one-dimensional array, starting at the beginning of the target array.
+ </summary>
+ <param name="array"> The one-dimensional <see cref="T:Array"/> that is the destination of the fields of the current record.</param>
+ <param name="index">The zero-based index in <paramref name="array"/> at which copying begins.</param>
+ <exception cref="T:ArgumentNullException">
+ 	<paramref name="array"/> is <see langword="null"/>.
+ </exception>
+ <exception cref="T:ArgumentOutOfRangeException">
+ 	<paramref name="index"/> is les than zero or is equal to or greater than the length <paramref name="array"/>. 
+ </exception>
+ <exception cref="T:System.InvalidOperationException">
+ No current record.
+ </exception>
+ <exception cref="T:System.ArgumentException">
+ 	The number of fields in the record is greater than the available space from <paramref name="index"/> to the end of <paramref name="array"/>.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.GetCurrentRawData">
+ <summary>
+ Gets the current raw CSV data.
+ </summary>
+ <remarks>Used for exception handling purpose.</remarks>
+ <returns>The current raw CSV data.</returns>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.IsWhiteSpace(System.Char)">
+ <summary>
+ Indicates whether the specified Unicode character is categorized as white space.
+ </summary>
+ <param name="c">A Unicode character.</param>
+ <returns><see langword="true"/> if <paramref name="c"/> is white space; otherwise, <see langword="false"/>.</returns>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.MoveTo(System.Int64)">
+ <summary>
+ Moves to the specified record index.
+ </summary>
+ <param name="record">The record index.</param>
+ <returns><c>true</c> if the operation was successful; otherwise, <c>false</c>.</returns>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.ParseNewLine(System.Int32@)">
+ <summary>
+ Parses a new line delimiter.
+ </summary>
+ <param name="pos">The starting position of the parsing. Will contain the resulting end position.</param>
+ <returns><see langword="true"/> if a new line delimiter was found; otherwise, <see langword="false"/>.</returns>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.IsNewLine(System.Int32)">
+ <summary>
+ Determines whether the character at the specified position is a new line delimiter.
+ </summary>
+ <param name="pos">The position of the character to verify.</param>
+ <returns>
+ 	<see langword="true"/> if the character at the specified position is a new line delimiter; otherwise, <see langword="false"/>.
+ </returns>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.ReadBuffer">
+ <summary>
+ Fills the buffer with data from the reader.
+ </summary>
+ <returns><see langword="true"/> if data was successfully read; otherwise, <see langword="false"/>.</returns>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.ReadField(System.Int32,System.Boolean,System.Boolean)">
+ <summary>
+ Reads the field at the specified index.
+ Any unread fields with an inferior index will also be read as part of the required parsing.
+ </summary>
+ <param name="field">The field index.</param>
+ <param name="initializing">Indicates if the reader is currently initializing.</param>
+ <param name="discardValue">Indicates if the value(s) are discarded.</param>
+ <returns>
+ The field at the specified index. 
+ A <see langword="null"/> indicates that an error occured or that the last field has been reached during initialization.
+ </returns>
+ <exception cref="T:System.ArgumentOutOfRangeException">
+ 	<paramref name="field"/> is out of range.
+ </exception>
+ <exception cref="T:System.InvalidOperationException">
+ 	There is no current record.
+ </exception>
+ <exception cref="T:LumenWorks.Framework.IO.Csv.MissingFieldCsvException">
+ 	The CSV data appears to be missing a field.
+ </exception>
+ <exception cref="T:LumenWorks.Framework.IO.Csv.MalformedCsvException">
+ 	The CSV data appears to be malformed.
+ </exception>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.ReadNextRecord">
+ <summary>
+ Reads the next record.
+ </summary>
+ <returns><see langword="true"/> if a record has been successfully reads; otherwise, <see langword="false"/>.</returns>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.ReadNextRecord(System.Boolean,System.Boolean)">
+ <summary>
+ Reads the next record.
+ </summary>
+ <param name="onlyReadHeaders">
+ Indicates if the reader will proceed to the next record after having read headers.
+ <see langword="true"/> if it stops after having read headers; otherwise, <see langword="false"/>.
+ </param>
+ <param name="skipToNextLine">
+ Indicates if the reader will skip directly to the next line without parsing the current one. 
+ To be used when an error occurs.
+ </param>
+ <returns><see langword="true"/> if a record has been successfully reads; otherwise, <see langword="false"/>.</returns>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.SkipEmptyAndCommentedLines(System.Int32@)">
+ <summary>
+ Skips empty and commented lines.
+ If the end of the buffer is reached, its content be discarded and filled again from the reader.
+ </summary>
+ <param name="pos">
+ The position in the buffer where to start parsing. 
+ Will contains the resulting position after the operation.
+ </param>
+ <returns><see langword="true"/> if the end of the reader has not been reached; otherwise, <see langword="false"/>.</returns>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.DoSkipEmptyAndCommentedLines(System.Int32@)">
+ <summary>
+ <para>Worker method.</para>
+ <para>Skips empty and commented lines.</para>
+ </summary>
+ <param name="pos">
+ The position in the buffer where to start parsing. 
+ Will contains the resulting position after the operation.
+ </param>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.SkipWhiteSpaces(System.Int32@)">
+ <summary>
+ Skips whitespace characters.
+ </summary>
+ <param name="pos">The starting position of the parsing. Will contain the resulting end position.</param>
+ <returns><see langword="true"/> if the end of the reader has not been reached; otherwise, <see langword="false"/>.</returns>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.SkipToNextLine(System.Int32@)">
+ <summary>
+ Skips ahead to the next NewLine character.
+ If the end of the buffer is reached, its content be discarded and filled again from the reader.
+ </summary>
+ <param name="pos">
+ The position in the buffer where to start parsing. 
+ Will contains the resulting position after the operation.
+ </param>
+ <returns><see langword="true"/> if the end of the reader has not been reached; otherwise, <see langword="false"/>.</returns>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.HandleParseError(LumenWorks.Framework.IO.Csv.MalformedCsvException,System.Int32@)">
+ <summary>
+ Handles a parsing error.
+ </summary>
+ <param name="error">The parsing error that occured.</param>
+ <param name="pos">The current position in the buffer.</param>
+ <exception cref="T:System.ArgumentNullException">
+ <paramref name="error"/> is <see langword="null"/>.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.HandleMissingField(System.String,System.Int32,System.Int32@)">
+ <summary>
+ Handles a missing field error.
+ </summary>
+ <param name="value">The partially parsed value, if available.</param>
+ <param name="fieldIndex">The missing field index.</param>
+ <param name="currentPosition">The current position in the raw data.</param>
+ <returns>
+ The resulting value according to <see cref="M:MissingFieldAction"/>.
+ If the action is set to <see cref="T:MissingFieldAction.TreatAsParseError"/>,
+ then the parse error will be handled according to <see cref="P:LumenWorks.Framework.IO.Csv.CsvReader.DefaultParseErrorAction"/>.
+ </returns>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.ValidateDataReader(LumenWorks.Framework.IO.Csv.CsvReader.DataReaderValidations)">
+ <summary>
+ Validates the state of the data reader.
+ </summary>
+ <param name="validations">The validations to accomplish.</param>
+ <exception cref="T:System.InvalidOperationException">
+ No current record.
+ </exception>
+ <exception cref="T:System.InvalidOperationException">
+ This operation is invalid when the reader is closed.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.CopyFieldToArray(System.Int32,System.Int64,System.Array,System.Int32,System.Int32)">
+ <summary>
+ Copy the value of the specified field to an array.
+ </summary>
+ <param name="field">The index of the field.</param>
+ <param name="fieldOffset">The offset in the field value.</param>
+ <param name="destinationArray">The destination array where the field value will be copied.</param>
+ <param name="destinationOffset">The destination array offset.</param>
+ <param name="length">The number of characters to copy from the field value.</param>
+ <returns></returns>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.GetEnumerator">
+ <summary>
+ Returns an <see cref="T:RecordEnumerator"/> that can iterate through CSV records.
+ </summary>
+ <returns>An <see cref="T:RecordEnumerator"/> that can iterate through CSV records.</returns>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.System#Collections#Generic#IEnumerable{System#String[]}#GetEnumerator">
+ <summary>
+ Returns an <see cref="T:System.Collections.Generics.IEnumerator"/> that can iterate through CSV records.
+ </summary>
+ <returns>An <see cref="T:System.Collections.Generics.IEnumerator"/> that can iterate through CSV records.</returns>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.System#Collections#IEnumerable#GetEnumerator">
+ <summary>
+ Returns an <see cref="T:System.Collections.IEnumerator"/> that can iterate through CSV records.
+ </summary>
+ <returns>An <see cref="T:System.Collections.IEnumerator"/> that can iterate through CSV records.</returns>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._isDisposed">
+ <summary>
+ Contains the disposed status flag.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader._lock">
+ <summary>
+ Contains the locking object for multi-threading purpose.
+ </summary>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.OnDisposed(System.EventArgs)">
+ <summary>
+ Raises the <see cref="M:Disposed"/> event.
+ </summary>
+ <param name="e">A <see cref="T:System.EventArgs"/> that contains the event data.</param>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.CheckDisposed">
+ <summary>
+ Checks if the instance has been disposed of, and if it has, throws an <see cref="T:System.ComponentModel.ObjectDisposedException"/>; otherwise, does nothing.
+ </summary>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ 	The instance has been disposed of.
+ </exception>
+ <remarks>
+ 	Derived classes should call this method at the start of all methods and properties that should not be accessed after a call to <see cref="M:Dispose()"/>.
+ </remarks>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.Dispose">
+ <summary>
+ Releases all resources used by the instance.
+ </summary>
+ <remarks>
+ 	Calls <see cref="M:Dispose(Boolean)"/> with the disposing parameter set to <see langword="true"/> to free unmanaged and managed resources.
+ </remarks>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.Dispose(System.Boolean)">
+ <summary>
+ Releases the unmanaged resources used by this instance and optionally releases the managed resources.
+ </summary>
+ <param name="disposing">
+ 	<see langword="true"/> to release both managed and unmanaged resources; <see langword="false"/> to release only unmanaged resources.
+ </param>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.Finalize">
+ <summary>
+ Releases unmanaged resources and performs other cleanup operations before the instance is reclaimed by garbage collection.
+ </summary>
+ </member>
+ <member name="E:LumenWorks.Framework.IO.Csv.CsvReader.ParseError">
+ <summary>
+ Occurs when there is an error while parsing the CSV stream.
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.Comment">
+ <summary>
+ Gets the comment character indicating that a line is commented out.
+ </summary>
+ <value>The comment character indicating that a line is commented out.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.Escape">
+ <summary>
+ Gets the escape character letting insert quotation characters inside a quoted field.
+ </summary>
+ <value>The escape character letting insert quotation characters inside a quoted field.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.Delimiter">
+ <summary>
+ Gets the delimiter character separating each field.
+ </summary>
+ <value>The delimiter character separating each field.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.Quote">
+ <summary>
+ Gets the quotation character wrapping every field.
+ </summary>
+ <value>The quotation character wrapping every field.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.HasHeaders">
+ <summary>
+ Indicates if field names are located on the first non commented line.
+ </summary>
+ <value><see langword="true"/> if field names are located on the first non commented line, otherwise, <see langword="false"/>.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.TrimmingOption">
+ <summary>
+ Indicates if spaces at the start and end of a field are trimmed.
+ </summary>
+ <value><see langword="true"/> if spaces at the start and end of a field are trimmed, otherwise, <see langword="false"/>.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.BufferSize">
+ <summary>
+ Gets the buffer size.
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.DefaultParseErrorAction">
+ <summary>
+ Gets or sets the default action to take when a parsing error has occured.
+ </summary>
+ <value>The default action to take when a parsing error has occured.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.MissingFieldAction">
+ <summary>
+ Gets or sets the action to take when a field is missing.
+ </summary>
+ <value>The action to take when a field is missing.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.SupportsMultiline">
+ <summary>
+ Gets or sets a value indicating if the reader supports multiline fields.
+ </summary>
+ <value>A value indicating if the reader supports multiline field.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.SkipEmptyLines">
+ <summary>
+ Gets or sets a value indicating if the reader will skip empty lines.
+ </summary>
+ <value>A value indicating if the reader will skip empty lines.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.DefaultHeaderName">
+ <summary>
+ Gets or sets the default header name when it is an empty string or only whitespaces.
+ The header index will be appended to the specified name.
+ </summary>
+ <value>The default header name when it is an empty string or only whitespaces.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.FieldCount">
+ <summary>
+ Gets the maximum number of fields to retrieve for each record.
+ </summary>
+ <value>The maximum number of fields to retrieve for each record.</value>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.EndOfStream">
+ <summary>
+ Gets a value that indicates whether the current stream position is at the end of the stream.
+ </summary>
+ <value><see langword="true"/> if the current stream position is at the end of the stream; otherwise <see langword="false"/>.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.CurrentRecordIndex">
+ <summary>
+ Gets the current record index in the CSV file.
+ </summary>
+ <value>The current record index in the CSV file.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.MissingFieldFlag">
+ <summary>
+ Indicates if one or more field are missing for the current record.
+ Resets after each successful record read.
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.ParseErrorFlag">
+ <summary>
+ Indicates if a parse error occured for the current record.
+ Resets after each successful record read.
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.Item(System.Int32,System.String)">
+ <summary>
+ Gets the field with the specified name and record position. <see cref="M:hasHeaders"/> must be <see langword="true"/>.
+ </summary>
+ <value>
+ The field with the specified name and record position.
+ </value>
+ <exception cref="T:ArgumentNullException">
+ 	<paramref name="field"/> is <see langword="null"/> or an empty string.
+ </exception>
+ <exception cref="T:InvalidOperationException">
+ The CSV does not have headers (<see cref="M:HasHeaders"/> property is <see langword="false"/>).
+ </exception>
+ <exception cref="T:ArgumentException">
+ 	<paramref name="field"/> not found.
+ </exception>
+ <exception cref="T:ArgumentOutOfRangeException">
+ 	Record index must be > 0.
+ </exception>
+ <exception cref="T:InvalidOperationException">
+ 	Cannot move to a previous record in forward-only mode.
+ </exception>
+ <exception cref="T:EndOfStreamException">
+ 	Cannot read record at <paramref name="record"/>.
+ </exception>
+ <exception cref="T:MalformedCsvException">
+ 	The CSV appears to be corrupt at the current position.
+ </exception>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.Item(System.Int32,System.Int32)">
+ <summary>
+ Gets the field at the specified index and record position.
+ </summary>
+ <value>
+ The field at the specified index and record position.
+ A <see langword="null"/> is returned if the field cannot be found for the record.
+ </value>
+ <exception cref="T:ArgumentOutOfRangeException">
+ 	<paramref name="field"/> must be included in [0, <see cref="M:FieldCount"/>[.
+ </exception>
+ <exception cref="T:ArgumentOutOfRangeException">
+ 	Record index must be > 0.
+ </exception>
+ <exception cref="T:InvalidOperationException">
+ 	Cannot move to a previous record in forward-only mode.
+ </exception>
+ <exception cref="T:EndOfStreamException">
+ 	Cannot read record at <paramref name="record"/>.
+ </exception>
+ <exception cref="T:MalformedCsvException">
+ 	The CSV appears to be corrupt at the current position.
+ </exception>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.Item(System.String)">
+ <summary>
+ Gets the field with the specified name. <see cref="M:hasHeaders"/> must be <see langword="true"/>.
+ </summary>
+ <value>
+ The field with the specified name.
+ </value>
+ <exception cref="T:ArgumentNullException">
+ 	<paramref name="field"/> is <see langword="null"/> or an empty string.
+ </exception>
+ <exception cref="T:InvalidOperationException">
+ The CSV does not have headers (<see cref="M:HasHeaders"/> property is <see langword="false"/>).
+ </exception>
+ <exception cref="T:ArgumentException">
+ 	<paramref name="field"/> not found.
+ </exception>
+ <exception cref="T:MalformedCsvException">
+ 	The CSV appears to be corrupt at the current position.
+ </exception>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.Item(System.Int32)">
+ <summary>
+ Gets the field at the specified index.
+ </summary>
+ <value>The field at the specified index.</value>
+ <exception cref="T:ArgumentOutOfRangeException">
+ 	<paramref name="field"/> must be included in [0, <see cref="M:FieldCount"/>[.
+ </exception>
+ <exception cref="T:InvalidOperationException">
+ 	No record read yet. Call ReadLine() first.
+ </exception>
+ <exception cref="T:MalformedCsvException">
+ 	The CSV appears to be corrupt at the current position.
+ </exception>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="E:LumenWorks.Framework.IO.Csv.CsvReader.Disposed">
+ <summary>
+ Occurs when the instance is disposed of.
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.IsDisposed">
+ <summary>
+ Gets a value indicating whether the instance has been disposed of.
+ </summary>
+ <value>
+ 	<see langword="true"/> if the instance has been disposed of; otherwise, <see langword="false"/>.
+ </value>
+ </member>
+ <member name="T:LumenWorks.Framework.IO.Csv.CsvReader.RecordEnumerator">
+ <summary>
+ Supports a simple iteration over the records of a <see cref="T:CsvReader"/>.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader.RecordEnumerator._reader">
+ <summary>
+ Contains the enumerated <see cref="T:CsvReader"/>.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader.RecordEnumerator._current">
+ <summary>
+ Contains the current record.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader.RecordEnumerator._currentRecordIndex">
+ <summary>
+ Contains the current record index.
+ </summary>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.RecordEnumerator.#ctor(LumenWorks.Framework.IO.Csv.CsvReader)">
+ <summary>
+ Initializes a new instance of the <see cref="T:RecordEnumerator"/> class.
+ </summary>
+ <param name="reader">The <see cref="T:CsvReader"/> to iterate over.</param>
+ <exception cref="T:ArgumentNullException">
+ 	<paramref name="reader"/> is a <see langword="null"/>.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.RecordEnumerator.MoveNext">
+ <summary>
+ Advances the enumerator to the next record of the CSV.
+ </summary>
+ <returns><see langword="true"/> if the enumerator was successfully advanced to the next record, <see langword="false"/> if the enumerator has passed the end of the CSV.</returns>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.RecordEnumerator.Reset">
+ <summary>
+ Sets the enumerator to its initial position, which is before the first record in the CSV.
+ </summary>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CsvReader.RecordEnumerator.Dispose">
+ <summary>
+ Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.RecordEnumerator.Current">
+ <summary>
+ Gets the current record.
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CsvReader.RecordEnumerator.System#Collections#IEnumerator#Current">
+ <summary>
+ Gets the current record.
+ </summary>
+ </member>
+ <member name="T:LumenWorks.Framework.IO.Csv.CsvReader.DataReaderValidations">
+ <summary>
+ Defines the data reader validations.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader.DataReaderValidations.None">
+ <summary>
+ No validation.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader.DataReaderValidations.IsInitialized">
+ <summary>
+ Validate that the data reader is initialized.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CsvReader.DataReaderValidations.IsNotClosed">
+ <summary>
+ Validate that the data reader is not closed.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CachedCsvReader._records">
+ <summary>
+ Contains the cached records.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CachedCsvReader._currentRecordIndex">
+ <summary>
+ Contains the current record index (inside the cached records array).
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CachedCsvReader._readingStream">
+ <summary>
+ Indicates if a new record is being read from the CSV stream.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CachedCsvReader._bindingList">
+ <summary>
+ Contains the binding list linked to this reader.
+ </summary>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CachedCsvReader.#ctor(System.IO.TextReader,System.Boolean)">
+ <summary>
+ Initializes a new instance of the CsvReader class.
+ </summary>
+ <param name="reader">A <see cref="T:TextReader"/> pointing to the CSV file.</param>
+ <param name="hasHeaders"><see langword="true"/> if field names are located on the first non commented line, otherwise, <see langword="false"/>.</param>
+ <exception cref="T:ArgumentNullException">
+ 	<paramref name="reader"/> is a <see langword="null"/>.
+ </exception>
+ <exception cref="T:ArgumentException">
+ 	Cannot read from <paramref name="reader"/>.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CachedCsvReader.#ctor(System.IO.TextReader,System.Boolean,System.Int32)">
+ <summary>
+ Initializes a new instance of the CsvReader class.
+ </summary>
+ <param name="reader">A <see cref="T:TextReader"/> pointing to the CSV file.</param>
+ <param name="hasHeaders"><see langword="true"/> if field names are located on the first non commented line, otherwise, <see langword="false"/>.</param>
+ <param name="bufferSize">The buffer size in bytes.</param>
+ <exception cref="T:ArgumentNullException">
+ 	<paramref name="reader"/> is a <see langword="null"/>.
+ </exception>
+ <exception cref="T:ArgumentException">
+ 	Cannot read from <paramref name="reader"/>.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CachedCsvReader.#ctor(System.IO.TextReader,System.Boolean,System.Char)">
+ <summary>
+ Initializes a new instance of the CsvReader class.
+ </summary>
+ <param name="reader">A <see cref="T:TextReader"/> pointing to the CSV file.</param>
+ <param name="hasHeaders"><see langword="true"/> if field names are located on the first non commented line, otherwise, <see langword="false"/>.</param>
+ <param name="delimiter">The delimiter character separating each field (default is ',').</param>
+ <exception cref="T:ArgumentNullException">
+ 	<paramref name="reader"/> is a <see langword="null"/>.
+ </exception>
+ <exception cref="T:ArgumentException">
+ 	Cannot read from <paramref name="reader"/>.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CachedCsvReader.#ctor(System.IO.TextReader,System.Boolean,System.Char,System.Int32)">
+ <summary>
+ Initializes a new instance of the CsvReader class.
+ </summary>
+ <param name="reader">A <see cref="T:TextReader"/> pointing to the CSV file.</param>
+ <param name="hasHeaders"><see langword="true"/> if field names are located on the first non commented line, otherwise, <see langword="false"/>.</param>
+ <param name="delimiter">The delimiter character separating each field (default is ',').</param>
+ <param name="bufferSize">The buffer size in bytes.</param>
+ <exception cref="T:ArgumentNullException">
+ 	<paramref name="reader"/> is a <see langword="null"/>.
+ </exception>
+ <exception cref="T:ArgumentException">
+ 	Cannot read from <paramref name="reader"/>.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CachedCsvReader.#ctor(System.IO.TextReader,System.Boolean,System.Char,System.Char,System.Char,System.Char,LumenWorks.Framework.IO.Csv.ValueTrimmingOptions)">
+ <summary>
+ Initializes a new instance of the CsvReader class.
+ </summary>
+ <param name="reader">A <see cref="T:TextReader"/> pointing to the CSV file.</param>
+ <param name="hasHeaders"><see langword="true"/> if field names are located on the first non commented line, otherwise, <see langword="false"/>.</param>
+ <param name="delimiter">The delimiter character separating each field (default is ',').</param>
+ <param name="quote">The quotation character wrapping every field (default is ''').</param>
+ <param name="escape">
+ The escape character letting insert quotation characters inside a quoted field (default is '\').
+ If no escape character, set to '\0' to gain some performance.
+ </param>
+ <param name="comment">The comment character indicating that a line is commented out (default is '#').</param>
+ <param name="trimmingOptions">Determines how values should be trimmed.</param>
+ <exception cref="T:ArgumentNullException">
+ 	<paramref name="reader"/> is a <see langword="null"/>.
+ </exception>
+ <exception cref="T:ArgumentException">
+ 	Cannot read from <paramref name="reader"/>.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CachedCsvReader.#ctor(System.IO.TextReader,System.Boolean,System.Char,System.Char,System.Char,System.Char,LumenWorks.Framework.IO.Csv.ValueTrimmingOptions,System.Int32)">
+ <summary>
+ Initializes a new instance of the CsvReader class.
+ </summary>
+ <param name="reader">A <see cref="T:TextReader"/> pointing to the CSV file.</param>
+ <param name="hasHeaders"><see langword="true"/> if field names are located on the first non commented line, otherwise, <see langword="false"/>.</param>
+ <param name="delimiter">The delimiter character separating each field (default is ',').</param>
+ <param name="quote">The quotation character wrapping every field (default is ''').</param>
+ <param name="escape">
+ The escape character letting insert quotation characters inside a quoted field (default is '\').
+ If no escape character, set to '\0' to gain some performance.
+ </param>
+ <param name="comment">The comment character indicating that a line is commented out (default is '#').</param>
+ <param name="trimSpaces"><see langword="true"/> if spaces at the start and end of a field are trimmed, otherwise, <see langword="false"/>. Default is <see langword="true"/>.</param>
+ <param name="bufferSize">The buffer size in bytes.</param>
+ <exception cref="T:ArgumentNullException">
+ 	<paramref name="reader"/> is a <see langword="null"/>.
+ </exception>
+ <exception cref="T:System.ArgumentOutOfRangeException">
+ 	<paramref name="bufferSize"/> must be 1 or more.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CachedCsvReader.ReadToEnd">
+ <summary>
+ Reads the CSV stream from the current position to the end of the stream.
+ </summary>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CachedCsvReader.ReadNextRecord(System.Boolean,System.Boolean)">
+ <summary>
+ Reads the next record.
+ </summary>
+ <param name="onlyReadHeaders">
+ Indicates if the reader will proceed to the next record after having read headers.
+ <see langword="true"/> if it stops after having read headers; otherwise, <see langword="false"/>.
+ </param>
+ <param name="skipToNextLine">
+ Indicates if the reader will skip directly to the next line without parsing the current one. 
+ To be used when an error occurs.
+ </param>
+ <returns><see langword="true"/> if a record has been successfully reads; otherwise, <see langword="false"/>.</returns>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CachedCsvReader.MoveToStart">
+ <summary>
+ Moves before the first record.
+ </summary>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CachedCsvReader.MoveToLastCachedRecord">
+ <summary>
+ Moves to the last record read so far.
+ </summary>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CachedCsvReader.MoveTo(System.Int64)">
+ <summary>
+ Moves to the specified record index.
+ </summary>
+ <param name="record">The record index.</param>
+ <returns><c>true</c> if the operation was successful; otherwise, <c>false</c>.</returns>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ 	The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CachedCsvReader.CurrentRecordIndex">
+ <summary>
+ Gets the current record index in the CSV file.
+ </summary>
+ <value>The current record index in the CSV file.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CachedCsvReader.EndOfStream">
+ <summary>
+ Gets a value that indicates whether the current stream position is at the end of the stream.
+ </summary>
+ <value><see langword="true"/> if the current stream position is at the end of the stream; otherwise <see langword="false"/>.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CachedCsvReader.Item(System.Int32)">
+ <summary>
+ Gets the field at the specified index.
+ </summary>
+ <value>The field at the specified index.</value>
+ <exception cref="T:ArgumentOutOfRangeException">
+ 	<paramref name="field"/> must be included in [0, <see cref="M:FieldCount"/>[.
+ </exception>
+ <exception cref="T:InvalidOperationException">
+ 	No record read yet. Call ReadLine() first.
+ </exception>
+ <exception cref="T:LumenWorks.Framework.IO.Csv.MissingFieldCsvException">
+ 	The CSV data appears to be missing a field.
+ </exception>
+ <exception cref="T:MalformedCsvException">
+ 	The CSV appears to be corrupt at the current position.
+ </exception>
+ <exception cref="T:System.ComponentModel.ObjectDisposedException">
+ 	The instance has been disposed of.
+ </exception>
+ </member>
+ <member name="T:LumenWorks.Framework.IO.Csv.CachedCsvReader.CsvBindingList">
+ <summary>
+ Represents a binding list wrapper for a CSV reader.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CachedCsvReader.CsvBindingList._csv">
+ <summary>
+ Contains the linked CSV reader.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CachedCsvReader.CsvBindingList._count">
+ <summary>
+ Contains the cached record count.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CachedCsvReader.CsvBindingList._properties">
+ <summary>
+ Contains the cached property descriptors.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CachedCsvReader.CsvBindingList._sort">
+ <summary>
+ Contains the current sort property.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CachedCsvReader.CsvBindingList._direction">
+ <summary>
+ Contains the current sort direction.
+ </summary>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CachedCsvReader.CsvBindingList.#ctor(LumenWorks.Framework.IO.Csv.CachedCsvReader)">
+ <summary>
+ Initializes a new instance of the CsvBindingList class.
+ </summary>
+ <param name="csv"></param>
+ </member>
+ <member name="T:LumenWorks.Framework.IO.Csv.CachedCsvReader.CsvRecordComparer">
+ <summary>
+ Represents a CSV record comparer.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CachedCsvReader.CsvRecordComparer._field">
+ <summary>
+ Contains the field index of the values to compare.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CachedCsvReader.CsvRecordComparer._direction">
+ <summary>
+ Contains the sort direction.
+ </summary>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CachedCsvReader.CsvRecordComparer.#ctor(System.Int32,System.ComponentModel.ListSortDirection)">
+ <summary>
+ Initializes a new instance of the CsvRecordComparer class.
+ </summary>
+ <param name="field">The field index of the values to compare.</param>
+ <param name="direction">The sort direction.</param>
+ </member>
+ <member name="T:LumenWorks.Framework.IO.Csv.CachedCsvReader.CsvPropertyDescriptor">
+ <summary>
+ Represents a CSV field property descriptor.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.CachedCsvReader.CsvPropertyDescriptor._index">
+ <summary>
+ Contains the field index.
+ </summary>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.CachedCsvReader.CsvPropertyDescriptor.#ctor(System.String,System.Int32)">
+ <summary>
+ Initializes a new instance of the CsvPropertyDescriptor class.
+ </summary>
+ <param name="fieldName">The field name.</param>
+ <param name="index">The field index.</param>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.CachedCsvReader.CsvPropertyDescriptor.Index">
+ <summary>
+ Gets the field index.
+ </summary>
+ <value>The field index.</value>
+ </member>
+ <member name="T:LumenWorks.Framework.IO.Csv.MalformedCsvException">
+ <summary>
+ Represents the exception that is thrown when a CSV file is malformed.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.MalformedCsvException._message">
+ <summary>
+ Contains the message that describes the error.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.MalformedCsvException._rawData">
+ <summary>
+ Contains the raw data when the error occured.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.MalformedCsvException._currentFieldIndex">
+ <summary>
+ Contains the current field index.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.MalformedCsvException._currentRecordIndex">
+ <summary>
+ Contains the current record index.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.MalformedCsvException._currentPosition">
+ <summary>
+ Contains the current position in the raw data.
+ </summary>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.MalformedCsvException.#ctor">
+ <summary>
+ Initializes a new instance of the MalformedCsvException class.
+ </summary>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.MalformedCsvException.#ctor(System.String)">
+ <summary>
+ Initializes a new instance of the MalformedCsvException class.
+ </summary>
+ <param name="message">The message that describes the error.</param>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.MalformedCsvException.#ctor(System.String,System.Exception)">
+ <summary>
+ Initializes a new instance of the MalformedCsvException class.
+ </summary>
+ <param name="message">The message that describes the error.</param>
+ <param name="innerException">The exception that is the cause of the current exception.</param>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.MalformedCsvException.#ctor(System.String,System.Int32,System.Int64,System.Int32)">
+ <summary>
+ Initializes a new instance of the MalformedCsvException class.
+ </summary>
+ <param name="rawData">The raw data when the error occured.</param>
+ <param name="currentPosition">The current position in the raw data.</param>
+ <param name="currentRecordIndex">The current record index.</param>
+ <param name="currentFieldIndex">The current field index.</param>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.MalformedCsvException.#ctor(System.String,System.Int32,System.Int64,System.Int32,System.Exception)">
+ <summary>
+ Initializes a new instance of the MalformedCsvException class.
+ </summary>
+ <param name="rawData">The raw data when the error occured.</param>
+ <param name="currentPosition">The current position in the raw data.</param>
+ <param name="currentRecordIndex">The current record index.</param>
+ <param name="currentFieldIndex">The current field index.</param>
+ <param name="innerException">The exception that is the cause of the current exception.</param>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.MalformedCsvException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+ <summary>
+ Initializes a new instance of the MalformedCsvException class with serialized data.
+ </summary>
+ <param name="info">The <see cref="T:SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+ <param name="context">The <see cref="T:StreamingContext"/> that contains contextual information about the source or destination.</param>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.MalformedCsvException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+ <summary>
+ When overridden in a derived class, sets the <see cref="T:SerializationInfo"/> with information about the exception.
+ </summary>
+ <param name="info">The <see cref="T:SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+ <param name="context">The <see cref="T:StreamingContext"/> that contains contextual information about the source or destination.</param>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.MalformedCsvException.RawData">
+ <summary>
+ Gets the raw data when the error occured.
+ </summary>
+ <value>The raw data when the error occured.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.MalformedCsvException.CurrentPosition">
+ <summary>
+ Gets the current position in the raw data.
+ </summary>
+ <value>The current position in the raw data.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.MalformedCsvException.CurrentRecordIndex">
+ <summary>
+ Gets the current record index.
+ </summary>
+ <value>The current record index.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.MalformedCsvException.CurrentFieldIndex">
+ <summary>
+ Gets the current field index.
+ </summary>
+ <value>The current record index.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.MalformedCsvException.Message">
+ <summary>
+ Gets a message that describes the current exception.
+ </summary>
+ <value>A message that describes the current exception.</value>
+ </member>
+ <member name="T:LumenWorks.Framework.IO.Csv.MissingFieldCsvException">
+ <summary>
+ Represents the exception that is thrown when a there is a missing field in a record of the CSV file.
+ </summary>
+ <remarks>
+ MissingFieldException would have been a better name, but there is already a <see cref="T:System.MissingFieldException"/>.
+ </remarks>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.MissingFieldCsvException.#ctor">
+ <summary>
+ Initializes a new instance of the MissingFieldCsvException class.
+ </summary>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.MissingFieldCsvException.#ctor(System.String)">
+ <summary>
+ Initializes a new instance of the MissingFieldCsvException class.
+ </summary>
+ <param name="message">The message that describes the error.</param>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.MissingFieldCsvException.#ctor(System.String,System.Exception)">
+ <summary>
+ Initializes a new instance of the MissingFieldCsvException class.
+ </summary>
+ <param name="message">The message that describes the error.</param>
+ <param name="innerException">The exception that is the cause of the current exception.</param>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.MissingFieldCsvException.#ctor(System.String,System.Int32,System.Int64,System.Int32)">
+ <summary>
+ Initializes a new instance of the MissingFieldCsvException class.
+ </summary>
+ <param name="rawData">The raw data when the error occured.</param>
+ <param name="currentPosition">The current position in the raw data.</param>
+ <param name="currentRecordIndex">The current record index.</param>
+ <param name="currentFieldIndex">The current field index.</param>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.MissingFieldCsvException.#ctor(System.String,System.Int32,System.Int64,System.Int32,System.Exception)">
+ <summary>
+ Initializes a new instance of the MissingFieldCsvException class.
+ </summary>
+ <param name="rawData">The raw data when the error occured.</param>
+ <param name="currentPosition">The current position in the raw data.</param>
+ <param name="currentRecordIndex">The current record index.</param>
+ <param name="currentFieldIndex">The current field index.</param>
+ <param name="innerException">The exception that is the cause of the current exception.</param>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.MissingFieldCsvException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+ <summary>
+ Initializes a new instance of the MissingFieldCsvException class with serialized data.
+ </summary>
+ <param name="info">The <see cref="T:SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+ <param name="context">The <see cref="T:StreamingContext"/> that contains contextual information about the source or destination.</param>
+ </member>
+ <member name="T:LumenWorks.Framework.IO.Csv.ParseErrorAction">
+ <summary>
+ Specifies the action to take when a parsing error has occured.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.ParseErrorAction.RaiseEvent">
+ <summary>
+ Raises the <see cref="M:CsvReader.ParseError"/> event.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.ParseErrorAction.AdvanceToNextLine">
+ <summary>
+ Tries to advance to next line.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.ParseErrorAction.ThrowException">
+ <summary>
+ Throws an exception.
+ </summary>
+ </member>
+ <member name="T:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage">
+ <summary>
+ A strongly-typed resource class, for looking up localized strings, etc.
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.ResourceManager">
+ <summary>
+ Returns the cached ResourceManager instance used by this class.
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.Culture">
+ <summary>
+ Overrides the current thread's CurrentUICulture property for all
+ resource lookups using this strongly typed resource class.
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.BufferSizeTooSmall">
+ <summary>
+ Looks up a localized string similar to Buffer size must be 1 or more..
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.CannotMovePreviousRecordInForwardOnly">
+ <summary>
+ Looks up a localized string similar to Cannot move to a previous record in forward-only mode..
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.CannotReadRecordAtIndex">
+ <summary>
+ Looks up a localized string similar to Cannot read record at index &apos;{0}&apos;..
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.EnumerationFinishedOrNotStarted">
+ <summary>
+ Looks up a localized string similar to Enumeration has either not started or has already finished..
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.EnumerationVersionCheckFailed">
+ <summary>
+ Looks up a localized string similar to Collection was modified; enumeration operation may not execute..
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.FieldHeaderNotFound">
+ <summary>
+ Looks up a localized string similar to &apos;{0}&apos; field header not found..
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.FieldIndexOutOfRange">
+ <summary>
+ Looks up a localized string similar to Field index must be included in [0, FieldCount[. Specified field index was : &apos;{0}&apos;..
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.MalformedCsvException">
+ <summary>
+ Looks up a localized string similar to The CSV appears to be corrupt near record &apos;{0}&apos; field &apos;{1} at position &apos;{2}&apos;. Current raw data : &apos;{3}&apos;..
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.MissingFieldActionNotSupported">
+ <summary>
+ Looks up a localized string similar to &apos;{0}&apos; is not a supported missing field action..
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.NoCurrentRecord">
+ <summary>
+ Looks up a localized string similar to No current record..
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.NoHeaders">
+ <summary>
+ Looks up a localized string similar to The CSV does not have headers (CsvReader.HasHeaders property is false)..
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.NotEnoughSpaceInArray">
+ <summary>
+ Looks up a localized string similar to The number of fields in the record is greater than the available space from index to the end of the destination array..
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.ParseErrorActionInvalidInsideParseErrorEvent">
+ <summary>
+ Looks up a localized string similar to &apos;{0}&apos; is not a valid ParseErrorAction while inside a ParseError event..
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.ParseErrorActionNotSupported">
+ <summary>
+ Looks up a localized string similar to &apos;{0}&apos; is not a supported ParseErrorAction..
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.ReaderClosed">
+ <summary>
+ Looks up a localized string similar to This operation is invalid when the reader is closed..
+ </summary>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.Resources.ExceptionMessage.RecordIndexLessThanZero">
+ <summary>
+ Looks up a localized string similar to Record index must be 0 or more..
+ </summary>
+ </member>
+ <member name="T:LumenWorks.Framework.IO.Csv.MissingFieldAction">
+ <summary>
+ Specifies the action to take when a field is missing.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.MissingFieldAction.ParseError">
+ <summary>
+ Treat as a parsing error.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.MissingFieldAction.ReplaceByEmpty">
+ <summary>
+ Replaces by an empty value.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.MissingFieldAction.ReplaceByNull">
+ <summary>
+ Replaces by a null value (<see langword="null"/>).
+ </summary>
+ </member>
+ <member name="T:LumenWorks.Framework.IO.Csv.ParseErrorEventArgs">
+ <summary>
+ Provides data for the <see cref="M:CsvReader.ParseError"/> event.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.ParseErrorEventArgs._error">
+ <summary>
+ Contains the error that occured.
+ </summary>
+ </member>
+ <member name="F:LumenWorks.Framework.IO.Csv.ParseErrorEventArgs._action">
+ <summary>
+ Contains the action to take.
+ </summary>
+ </member>
+ <member name="M:LumenWorks.Framework.IO.Csv.ParseErrorEventArgs.#ctor(LumenWorks.Framework.IO.Csv.MalformedCsvException,LumenWorks.Framework.IO.Csv.ParseErrorAction)">
+ <summary>
+ Initializes a new instance of the ParseErrorEventArgs class.
+ </summary>
+ <param name="error">The error that occured.</param>
+ <param name="defaultAction">The default action to take.</param>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.ParseErrorEventArgs.Error">
+ <summary>
+ Gets the error that occured.
+ </summary>
+ <value>The error that occured.</value>
+ </member>
+ <member name="P:LumenWorks.Framework.IO.Csv.ParseErrorEventArgs.Action">
+ <summary>
+ Gets or sets the action to take.
+ </summary>
+ <value>The action to take.</value>
+ </member>
+ </members>
+</doc>

HandBrake-0.10.0.tar.bz2/win/CS/libraries/CsvReader/LumenWorks.Framework.IO.dll Added

HandBrake-0.10.0.tar.bz2/win/CS/libraries/CsvReader/LumenWorks.Framework.IO.pdb Added

HandBrake-0.9.9.tar.bz2/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML -> HandBrake-0.10.0.tar.bz2/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML Changed

@@ -20,9 +20,10 @@
 
 <remarks>
 To allow a drag to be started, the <see cref="P:GongSolutions.Wpf.DragDrop.DragInfo.Effects"/> property on <paramref name="dragInfo"/> 
- should be set to a value other than <see cref="!:DragDropEffects.None"/>. 
+ should be set to a value other than <see cref="F:System.Windows.DragDropEffects.None"/>. 
 </remarks>
 </member>
+ 
 <member name="M:GongSolutions.Wpf.DragDrop.IDragSource.Dropped(GongSolutions.Wpf.DragDrop.IDropInfo)">
 <summary>
 Notifies the drag handler that a drop has occurred.
@@ -32,6 +33,11 @@
 Information about the drop.
 </param>
 </member>
+ <member name="M:GongSolutions.Wpf.DragDrop.IDragSource.DragCancelled">
+ <summary>
+ Notifies the drag handler that a drag has been aborted.
+ </summary>
+ </member>
 <member name="T:GongSolutions.Wpf.DragDrop.IDropTarget">
 <summary>
 Interface implemented by Drop Handlers.
@@ -61,6 +67,38 @@
 Information about the drop.
 </param>
 </member>
+ <member name="F:GongSolutions.Wpf.DragDrop.DragDrop.DragMouseAnchorPointProperty">
+ <summary>
+ DragMouseAnchorPoint defines the horizontal and vertical proportion at which the pointer will anchor on the DragAdorner.
+ </summary>
+ </member>
+ <member name="M:GongSolutions.Wpf.DragDrop.DragDrop.TryGetDragHandler(GongSolutions.Wpf.DragDrop.DragInfo,System.Windows.UIElement)">
+ <summary>
+ Gets the drag handler from the drag info or from the sender, if the drag info is null
+ </summary>
+ <param name="dragInfo">the drag info object</param>
+ <param name="sender">the sender from an event, e.g. mouse down, mouse move</param>
+ <returns></returns>
+ </member>
+ <member name="M:GongSolutions.Wpf.DragDrop.DragDrop.TryGetDropHandler(GongSolutions.Wpf.DragDrop.DropInfo,System.Windows.UIElement)">
+ <summary>
+ Gets the drop handler from the drop info or from the sender, if the drop info is null
+ </summary>
+ <param name="dropInfo">the drop info object</param>
+ <param name="sender">the sender from an event, e.g. drag over</param>
+ <returns></returns>
+ </member>
+ <member name="T:GongSolutions.Wpf.DragDrop.DragInfo">
+ <summary>
+ Holds information about a the source of a drag drop operation.
+ </summary>
+ 
+ <remarks>
+ The <see cref="T:GongSolutions.Wpf.DragDrop.DragInfo"/> class holds all of the framework's information about the source
+ of a drag. It is used by <see cref="M:GongSolutions.Wpf.DragDrop.IDragSource.StartDrag(GongSolutions.Wpf.DragDrop.IDragInfo)"/> to determine whether a drag 
+ can start, and what the dragged data should be.
+ </remarks>
+ </member>
 <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.Data">
 <summary>
 Gets or sets the drag data.
@@ -104,6 +142,11 @@
 If the control that initated the drag is unbound or not an ItemsControl, this will be null.
 </remarks>
 </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.SourceIndex">
+ <summary>
+ Gets the position from where the item was dragged.
+ </summary>
+ </member>
 <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.SourceItem">
 <summary>
 Gets the object that a dragged item is bound to.
@@ -138,22 +181,16 @@
 will hold a ListBoxItem.
 </remarks>
 </member>
- <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.DataObject">
+ <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.VisualSourceFlowDirection">
 <summary>
- Gets the <see cref="T:System.Windows.IDataObject"/> which is used by the drag and drop operation. Set it to
- a custom instance if custom drag and drop behavior is needed.
+ Gets the FlowDirection of the current drag source.
 </summary>
 </member>
- <member name="T:GongSolutions.Wpf.DragDrop.DragInfo">
+ <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.DataObject">
 <summary>
- Holds information about a the source of a drag drop operation.
+ Gets the <see cref="T:System.Windows.IDataObject"/> which is used by the drag and drop operation. Set it to
+ a custom instance if custom drag and drop behavior is needed.
 </summary>
- 
- <remarks>
- The <see cref="T:GongSolutions.Wpf.DragDrop.DragInfo"/> class holds all of the framework's information about the source
- of a drag. It is used by <see cref="M:GongSolutions.Wpf.DragDrop.IDragSource.StartDrag(GongSolutions.Wpf.DragDrop.IDragInfo)"/> to determine whether a drag 
- can start, and what the dragged data should be.
- </remarks>
 </member>
 <member name="M:GongSolutions.Wpf.DragDrop.DragInfo.#ctor(System.Object,System.Windows.Input.MouseButtonEventArgs)">
 <summary>
@@ -211,6 +248,12 @@
 If the control that initated the drag is unbound or not an ItemsControl, this will be null.
 </remarks>
 </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.SourceIndex">
+ <summary>
+ Gets the position from where the item was dragged.
+ </summary>
+ <value>The index of the source.</value>
+ </member>
 <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.SourceItem">
 <summary>
 Gets the object that a dragged item is bound to.
@@ -245,12 +288,28 @@
 will hold a ListBoxItem.
 </remarks>
 </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.VisualSourceFlowDirection">
+ <summary>
+ Gets the FlowDirection of the current drag source.
+ </summary>
+ </member>
 <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.DataObject">
 <summary>
 Gets the <see cref="T:System.Windows.IDataObject"/> which is used by the drag and drop operation. Set it to
 a custom instance if custom drag and drop behavior is needed.
 </summary>
 </member>
+ <member name="T:GongSolutions.Wpf.DragDrop.DropInfo">
+ <summary>
+ Holds information about a the target of a drag drop operation.
+ </summary>
+ 
+ <remarks>
+ The <see cref="T:GongSolutions.Wpf.DragDrop.DropInfo"/> class holds all of the framework's information about the current 
+ target of a drag. It is used by <see cref="M:GongSolutions.Wpf.DragDrop.IDropTarget.DragOver(GongSolutions.Wpf.DragDrop.IDropInfo)"/> method to determine whether 
+ the current drop target is valid, and by <see cref="M:GongSolutions.Wpf.DragDrop.IDropTarget.Drop(GongSolutions.Wpf.DragDrop.IDropInfo)"/> to perform the drop.
+ </remarks>
+ </member>
 <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.Data">
 <summary>
 Gets the drag data.
@@ -366,16 +425,10 @@
 Gets a flag enumeration indicating the current state of the SHIFT, CTRL, and ALT keys, as well as the state of the mouse buttons.
 </summary>
 </member>
- <member name="T:GongSolutions.Wpf.DragDrop.DropInfo">
+ <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.NotHandled">
 <summary>
- Holds information about a the target of a drag drop operation.
+ Indicates if the drop info should be handled by itself (useful for child elements)
 </summary>
- 
- <remarks>
- The <see cref="T:GongSolutions.Wpf.DragDrop.DropInfo"/> class holds all of the framework's information about the current 
- target of a drag. It is used by <see cref="M:GongSolutions.Wpf.DragDrop.IDropTarget.DragOver(GongSolutions.Wpf.DragDrop.IDropInfo)"/> method to determine whether 
- the current drop target is valid, and by <see cref="M:GongSolutions.Wpf.DragDrop.IDropTarget.Drop(GongSolutions.Wpf.DragDrop.IDropInfo)"/> to perform the drop.
- </remarks>
 </member>
 <member name="M:GongSolutions.Wpf.DragDrop.DropInfo.#ctor(System.Object,System.Windows.DragEventArgs,GongSolutions.Wpf.DragDrop.DragInfo)">
 <summary>
@@ -523,5 +576,19 @@
 <param name="size">The size of the icon</param>
 <returns>The image to be displayed</returns>
 </member>
+ <member name="M:GongSolutions.Wpf.DragDrop.Utilities.HitTestUtilities.IsNotPartOfSender(System.Object,System.Windows.Input.MouseButtonEventArgs)">
+ <summary>
+ thx to @osicka from issue #84
+ 
+ e.g. original source is part of a popup (e.g. ComboBox drop down), the hit test needs to be done on the original source.
+ Because the popup is not attached to the visual tree of the sender.
+ This function test this by looping back from the original source to the sender and if it didn't end up at the sender stopped the drag.
+ </summary>
+ </member>
+ <member name="M:GongSolutions.Wpf.DragDrop.Utilities.VisualTreeExtensions.GetVisualAncestor(System.Windows.DependencyObject,System.Type,System.Windows.Controls.ItemsControl)">
+ <summary>
+ find the visual ancestor by type and go through the visual tree until the given itemsControl will be found
+ </summary>
+ </member>
 </members>
 </doc>

HandBrake-0.9.9.tar.bz2/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll -> HandBrake-0.10.0.tar.bz2/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll Changed

HandBrake-0.9.9.tar.bz2/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdb -> HandBrake-0.10.0.tar.bz2/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdb Changed

HandBrake-0.9.9.tar.bz2/win/CS/libraries/WPFDragDrop/notes.txt -> HandBrake-0.10.0.tar.bz2/win/CS/libraries/WPFDragDrop/notes.txt Changed

HandBrake-0.9.9.tar.bz2/win/CS/libraries/caliburn/Caliburn.Micro.dll -> HandBrake-0.10.0.tar.bz2/win/CS/libraries/caliburn/Caliburn.Micro.dll Changed

HandBrake-0.9.9.tar.bz2/win/CS/libraries/caliburn/Caliburn.Micro.pdb -> HandBrake-0.10.0.tar.bz2/win/CS/libraries/caliburn/Caliburn.Micro.pdb Changed

HandBrake-0.9.9.tar.bz2/win/CS/libraries/caliburn/Caliburn.Micro.xml -> HandBrake-0.10.0.tar.bz2/win/CS/libraries/caliburn/Caliburn.Micro.xml Changed

@@ -4,532 +4,543 @@
 <name>Caliburn.Micro</name>
 </assembly>
 <members>
- <member name="T:Caliburn.Micro.View">
+ <member name="T:Caliburn.Micro.Action">
 <summary>
- Hosts attached properties related to view models.
+ A host for action related attached properties.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.View.DefaultContext">
+ <member name="F:Caliburn.Micro.Action.TargetProperty">
 <summary>
- The default view context.
+ A property definition representing the target of an <see cref="T:Caliburn.Micro.ActionMessage"/> . The DataContext of the element will be set to this instance.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.View.IsLoadedProperty">
+ <member name="F:Caliburn.Micro.Action.TargetWithoutContextProperty">
 <summary>
- A dependency property which allows the framework to track whether a certain element has already been loaded in certain scenarios.
+ A property definition representing the target of an <see cref="T:Caliburn.Micro.ActionMessage"/> . The DataContext of the element is not set to this instance.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.View.IsScopeRootProperty">
+ <member name="M:Caliburn.Micro.Action.SetTarget(System.Windows.DependencyObject,System.Object)">
 <summary>
- A dependency property which marks an element as a name scope root.
+ Sets the target of the <see cref="T:Caliburn.Micro.ActionMessage"/> .
 </summary>
+ <param name="d"> The element to attach the target to. </param>
+ <param name="target"> The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> . </param>
 </member>
- <member name="F:Caliburn.Micro.View.ApplyConventionsProperty">
+ <member name="M:Caliburn.Micro.Action.GetTarget(System.Windows.DependencyObject)">
 <summary>
- A dependency property which allows the override of convention application behavior.
+ Gets the target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> .
 </summary>
+ <param name="d"> The element to which the target is attached. </param>
+ <returns> The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> </returns>
 </member>
- <member name="F:Caliburn.Micro.View.ContextProperty">
+ <member name="M:Caliburn.Micro.Action.SetTargetWithoutContext(System.Windows.DependencyObject,System.Object)">
 <summary>
- A dependency property for assigning a context to a particular portion of the UI.
+ Sets the target of the <see cref="T:Caliburn.Micro.ActionMessage"/> .
 </summary>
+ <param name="d"> The element to attach the target to. </param>
+ <param name="target"> The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> . </param>
+ <remarks>
+ The DataContext will not be set.
+ </remarks>
 </member>
- <member name="F:Caliburn.Micro.View.ModelProperty">
+ <member name="M:Caliburn.Micro.Action.GetTargetWithoutContext(System.Windows.DependencyObject)">
 <summary>
- A dependency property for attaching a model to the UI.
+ Gets the target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> .
 </summary>
+ <param name="d"> The element to which the target is attached. </param>
+ <returns> The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> </returns>
 </member>
- <member name="F:Caliburn.Micro.View.IsGeneratedProperty">
+ <member name="M:Caliburn.Micro.Action.HasTargetSet(System.Windows.DependencyObject)">
 <summary>
- Used by the framework to indicate that this element was generated.
+ Checks if the <see cref="T:Caliburn.Micro.ActionMessage"/> -Target was set.
 </summary>
+ <param name="element"> DependencyObject to check </param>
+ <returns> True if Target or TargetWithoutContext was set on <paramref name="element"/> </returns>
 </member>
- <member name="M:Caliburn.Micro.View.ExecuteOnLoad(System.Windows.FrameworkElement,System.Windows.RoutedEventHandler)">
+ <member name="M:Caliburn.Micro.Action.Invoke(System.Object,System.String,System.Windows.DependencyObject,System.Windows.FrameworkElement,System.Object,System.Object[])">
 <summary>
- Executes the handler immediately if the element is loaded, otherwise wires it to the Loaded event.
+ Uses the action pipeline to invoke the method.
 </summary>
- <param name="element">The element.</param>
- <param name="handler">The handler.</param>
- <returns>true if the handler was executed immediately; false otherwise</returns>
+ <param name="target"> The object instance to invoke the method on. </param>
+ <param name="methodName"> The name of the method to invoke. </param>
+ <param name="view"> The view. </param>
+ <param name="source"> The source of the invocation. </param>
+ <param name="eventArgs"> The event args. </param>
+ <param name="parameters"> The method parameters. </param>
 </member>
- <member name="F:Caliburn.Micro.View.GetFirstNonGeneratedView">
+ <member name="T:Caliburn.Micro.ActionExecutionContext">
 <summary>
- Used to retrieve the root, non-framework-created view.
+ The context used during the execution of an Action or its guard.
 </summary>
- <param name="view">The view to search.</param>
- <returns>The root element that was not created by the framework.</returns>
- <remarks>In certain instances the services create UI elements.
- For example, if you ask the window manager to show a UserControl as a dialog, it creates a window to host the UserControl in.
- The WindowManager marks that element as a framework-created element so that it can determine what it created vs. what was intended by the developer.
- Calling GetFirstNonGeneratedView allows the framework to discover what the original element was. 
- </remarks>
 </member>
- <member name="M:Caliburn.Micro.View.GetApplyConventions(System.Windows.DependencyObject)">
+ <member name="F:Caliburn.Micro.ActionExecutionContext.CanExecute">
 <summary>
- Gets the convention application behavior.
+ Determines whether the action can execute.
 </summary>
- <param name="d">The element the property is attached to.</param>
- <returns>Whether or not to apply conventions.</returns>
+ <remarks>Returns true if the action can execute, false otherwise.</remarks>
 </member>
- <member name="M:Caliburn.Micro.View.SetApplyConventions(System.Windows.DependencyObject,System.Nullable{System.Boolean})">
+ <member name="F:Caliburn.Micro.ActionExecutionContext.EventArgs">
 <summary>
- Sets the convention application behavior.
+ Any event arguments associated with the action's invocation.
 </summary>
- <param name="d">The element to attach the property to.</param>
- <param name="value">Whether or not to apply conventions.</param>
 </member>
- <member name="M:Caliburn.Micro.View.SetModel(System.Windows.DependencyObject,System.Object)">
+ <member name="F:Caliburn.Micro.ActionExecutionContext.Method">
 <summary>
- Sets the model.
+ The actual method info to be invoked.
 </summary>
- <param name="d">The element to attach the model to.</param>
- <param name="value">The model.</param>
 </member>
- <member name="M:Caliburn.Micro.View.GetModel(System.Windows.DependencyObject)">
+ <member name="M:Caliburn.Micro.ActionExecutionContext.Dispose">
 <summary>
- Gets the model.
+ Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
 </summary>
- <param name="d">The element the model is attached to.</param>
- <returns>The model.</returns>
 </member>
- <member name="M:Caliburn.Micro.View.GetContext(System.Windows.DependencyObject)">
+ <member name="P:Caliburn.Micro.ActionExecutionContext.Message">
 <summary>
- Gets the context.
+ The message being executed.
 </summary>
- <param name="d">The element the context is attached to.</param>
- <returns>The context.</returns>
 </member>
- <member name="M:Caliburn.Micro.View.SetContext(System.Windows.DependencyObject,System.Object)">
+ <member name="P:Caliburn.Micro.ActionExecutionContext.Source">
 <summary>
- Sets the context.
+ The source from which the message originates.
 </summary>
- <param name="d">The element to attach the context to.</param>
- <param name="value">The context.</param>
 </member>
- <member name="T:Caliburn.Micro.Parser">
+ <member name="P:Caliburn.Micro.ActionExecutionContext.Target">
 <summary>
- Parses text into a fully functional set of <see cref="T:System.Windows.Interactivity.TriggerBase"/> instances with <see cref="T:Caliburn.Micro.ActionMessage"/>.
+ The instance on which the action is invoked.
 </summary>
 </member>
- <member name="M:Caliburn.Micro.Parser.Parse(System.Windows.DependencyObject,System.String)">
+ <member name="P:Caliburn.Micro.ActionExecutionContext.View">
 <summary>
- Parses the specified message text.
+ The view associated with the target.
 </summary>
- <param name="target">The target.</param>
- <param name="text">The message text.</param>
- <returns>The triggers parsed from the text.</returns>
 </member>
- <member name="F:Caliburn.Micro.Parser.CreateTrigger">
+ <member name="P:Caliburn.Micro.ActionExecutionContext.Item(System.String)">
 <summary>
- The function used to generate a trigger.
+ Gets or sets additional data needed to invoke the action.
 </summary>
- <remarks>The parameters passed to the method are the the target of the trigger and string representing the trigger.</remarks>
+ <param name="key">The data key.</param>
+ <returns>Custom data associated with the context.</returns>
 </member>
- <member name="M:Caliburn.Micro.Parser.CreateMessage(System.Windows.DependencyObject,System.String)">
+ <member name="E:Caliburn.Micro.ActionExecutionContext.Disposing">
 <summary>
- Creates an instance of <see cref="T:Caliburn.Micro.ActionMessage"/> by parsing out the textual dsl.
+ Called when the execution context is disposed
 </summary>
- <param name="target">The target of the message.</param>
- <param name="messageText">The textual message dsl.</param>
- <returns>The created message.</returns>
 </member>
- <member name="F:Caliburn.Micro.Parser.InterpretMessageText">
+ <member name="T:Caliburn.Micro.ActionMessage">
 <summary>
- Function used to parse a string identified as a message.
+ Used to send a message from the UI to a presentation model class, indicating that a particular Action should be invoked.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.Parser.CreateParameter">
+ <member name="T:Caliburn.Micro.IHaveParameters">
 <summary>
- Function used to parse a string identified as a message parameter.
+ Indicates that a message is parameterized.
 </summary>
 </member>
- <member name="M:Caliburn.Micro.Parser.BindParameter(System.Windows.FrameworkElement,Caliburn.Micro.Parameter,System.String,System.String,System.Windows.Data.BindingMode)">
+ <member name="P:Caliburn.Micro.IHaveParameters.Parameters">
 <summary>
- Creates a binding on a <see cref="T:Caliburn.Micro.Parameter"/>.
+ Represents the parameters of a message.
 </summary>
- <param name="target">The target to which the message is applied.</param>
- <param name="parameter">The parameter object.</param>
- <param name="elementName">The name of the element to bind to.</param>
- <param name="path">The path of the element to bind to.</param>
- <param name="bindingMode">The binding mode to use.</param>
 </member>
- <member name="T:Caliburn.Micro.Execute">
+ <member name="F:Caliburn.Micro.ActionMessage.EnforceGuardsDuringInvocation">
 <summary>
- Enables easy marshalling of code to the UI thread.
+ Causes the action invocation to "double check" if the action should be invoked by executing the guard immediately before hand.
 </summary>
+ <remarks>This is disabled by default. If multiple actions are attached to the same element, you may want to enable this so that each individaul action checks its guard regardless of how the UI state appears.</remarks>
 </member>
- <member name="M:Caliburn.Micro.Execute.InitializeWithDispatcher">
+ <member name="F:Caliburn.Micro.ActionMessage.ThrowsExceptions">
 <summary>
- Initializes the framework using the current dispatcher.
+ Causes the action to throw if it cannot locate the target or the method at invocation time.
 </summary>
+ <remarks>True by default.</remarks>
 </member>
- <member name="M:Caliburn.Micro.Execute.ResetWithoutDispatcher">
+ <member name="F:Caliburn.Micro.ActionMessage.MethodNameProperty">
 <summary>
- Resets the executor to use a non-dispatcher-based action executor.
+ Represents the method name of an action message.
 </summary>
 </member>
- <member name="M:Caliburn.Micro.Execute.SetUIThreadMarshaller(System.Action{System.Action})">
+ <member name="F:Caliburn.Micro.ActionMessage.ParametersProperty">
 <summary>
- Sets a custom UI thread marshaller.
+ Represents the parameters of an action message.
 </summary>
- <param name="marshaller">The marshaller.</param>
 </member>
- <member name="M:Caliburn.Micro.Execute.OnUIThread(System.Action)">
+ <member name="M:Caliburn.Micro.ActionMessage.#ctor">
 <summary>
- Executes the action on the UI thread.
+ Creates an instance of <see cref="T:Caliburn.Micro.ActionMessage"/>.
 </summary>
- <param name = "action">The action to execute.</param>
 </member>
- <member name="P:Caliburn.Micro.Execute.InDesignMode">
+ <member name="M:Caliburn.Micro.ActionMessage.OnAttached">
 <summary>
- Indicates whether or not the framework is in design-time mode.
+ Called after the action is attached to an AssociatedObject.
 </summary>
 </member>
- <member name="T:Caliburn.Micro.INotifyPropertyChangedEx">
+ <member name="M:Caliburn.Micro.ActionMessage.OnDetaching">
 <summary>
- Extends <see cref="T:System.ComponentModel.INotifyPropertyChanged"/> such that the change event can be raised by external parties.
+ Called when the action is being detached from its AssociatedObject, but before it has actually occurred.
 </summary>
 </member>
- <member name="M:Caliburn.Micro.INotifyPropertyChangedEx.NotifyOfPropertyChange(System.String)">
+ <member name="M:Caliburn.Micro.ActionMessage.Invoke(System.Object)">
 <summary>
- Notifies subscribers of the property change.
+ Invokes the action.
 </summary>
- <param name = "propertyName">Name of the property.</param>
+ <param name="eventArgs">The parameter to the action. If the action does not require a parameter, the parameter may be set to a null reference.</param>
 </member>
- <member name="M:Caliburn.Micro.INotifyPropertyChangedEx.Refresh">
+ <member name="M:Caliburn.Micro.ActionMessage.UpdateAvailability">
 <summary>
- Raises a change notification indicating that all bindings should be refreshed.
+ Forces an update of the UI's Enabled/Disabled state based on the the preconditions associated with the method.
 </summary>
 </member>
- <member name="P:Caliburn.Micro.INotifyPropertyChangedEx.IsNotifying">
+ <member name="M:Caliburn.Micro.ActionMessage.ToString">
 <summary>
- Enables/Disables property change notification.
+ Returns a <see cref="T:System.String"/> that represents the current <see cref="T:System.Object"/>.
 </summary>
+ <returns>
+ A <see cref="T:System.String"/> that represents the current <see cref="T:System.Object"/>.
+ </returns>
 </member>
- <member name="M:Caliburn.Micro.PropertyChangedBase.#ctor">
+ <member name="F:Caliburn.Micro.ActionMessage.InvokeAction">
 <summary>
- Creates an instance of <see cref="T:Caliburn.Micro.PropertyChangedBase"/>.
+ Invokes the action using the specified <see cref="T:Caliburn.Micro.ActionExecutionContext"/>
 </summary>
 </member>
- <member name="M:Caliburn.Micro.PropertyChangedBase.Refresh">
+ <member name="F:Caliburn.Micro.ActionMessage.ApplyAvailabilityEffect">
 <summary>
- Raises a change notification indicating that all bindings should be refreshed.
+ Applies an availability effect, such as IsEnabled, to an element.
 </summary>
+ <remarks>Returns a value indicating whether or not the action is available.</remarks>
 </member>
- <member name="M:Caliburn.Micro.PropertyChangedBase.NotifyOfPropertyChange(System.String)">
+ <member name="F:Caliburn.Micro.ActionMessage.GetTargetMethod">
 <summary>
- Notifies subscribers of the property change.
+ Finds the method on the target matching the specified message.
 </summary>
- <param name = "propertyName">Name of the property.</param>
+ <param name="target">The target.</param>
+ <param name="message">The message.</param>
+ <returns>The matching method, if available.</returns>
 </member>
- <member name="M:Caliburn.Micro.PropertyChangedBase.NotifyOfPropertyChange``1(System.Linq.Expressions.Expression{System.Func{``0}})">
+ <member name="F:Caliburn.Micro.ActionMessage.SetMethodBinding">
 <summary>
- Notifies subscribers of the property change.
+ Sets the target, method and view on the context. Uses a bubbling strategy by default.
 </summary>
- <typeparam name = "TProperty">The type of the property.</typeparam>
- <param name = "property">The property expression.</param>
 </member>
- <member name="M:Caliburn.Micro.PropertyChangedBase.RaisePropertyChangedEventImmediately(System.String)">
+ <member name="F:Caliburn.Micro.ActionMessage.PrepareContext">
 <summary>
- Raises the property changed event immediately.
+ Prepares the action execution context for use.
 </summary>
- <param name = "propertyName">Name of the property.</param>
 </member>
- <member name="M:Caliburn.Micro.PropertyChangedBase.OnDeserialized(System.Runtime.Serialization.StreamingContext)">
+ <member name="M:Caliburn.Micro.ActionMessage.TryFindGuardMethod(Caliburn.Micro.ActionExecutionContext)">
 <summary>
- Called when the object is deserialized.
+ Try to find a candidate for guard function, having:
+ 	- a name in the form "CanXXX"
+ 	- no generic parameters
+ 	- a bool return type
+ 	- no parameters or a set of parameters corresponding to the action method
 </summary>
- <param name="c">The streaming context.</param>
+ <param name="context">The execution context</param>
+ <returns>A MethodInfo, if found; null otherwise</returns>
 </member>
- <member name="M:Caliburn.Micro.PropertyChangedBase.ShouldSerializeIsNotifying">
+ <member name="P:Caliburn.Micro.ActionMessage.MethodName">
 <summary>
- Used to indicate whether or not the IsNotifying property is serialized to Xml.
+ Gets or sets the name of the method to be invoked on the presentation model class.
 </summary>
- <returns>Whether or not to serialize the IsNotifying property. The default is false.</returns>
+ <value>The name of the method.</value>
 </member>
- <member name="P:Caliburn.Micro.PropertyChangedBase.IsNotifying">
+ <member name="P:Caliburn.Micro.ActionMessage.Parameters">
 <summary>
- Enables/Disables property change notification.
+ Gets the parameters to pass as part of the method invocation.
 </summary>
+ <value>The parameters.</value>
 </member>
- <member name="T:Caliburn.Micro.IObservableCollection`1">
+ <member name="E:Caliburn.Micro.ActionMessage.Detaching">
 <summary>
- Represents a collection that is observable.
+ Occurs before the message detaches from the associated object.
 </summary>
- <typeparam name = "T">The type of elements contained in the collection.</typeparam>
 </member>
- <member name="M:Caliburn.Micro.IObservableCollection`1.AddRange(System.Collections.Generic.IEnumerable{`0})">
+ <member name="T:Caliburn.Micro.AssemblySource">
 <summary>
- Adds the range.
+ A source of assemblies that are inspectable by the framework.
 </summary>
- <param name = "items">The items.</param>
 </member>
- <member name="M:Caliburn.Micro.IObservableCollection`1.RemoveRange(System.Collections.Generic.IEnumerable{`0})">
+ <member name="F:Caliburn.Micro.AssemblySource.Instance">
 <summary>
- Removes the range.
+ The singleton instance of the AssemblySource used by the framework.
 </summary>
- <param name = "items">The items.</param>
 </member>
- <member name="T:Caliburn.Micro.BindableCollection`1">
+ <member name="T:Caliburn.Micro.Bind">
 <summary>
- A base collection class that supports automatic UI thread marshalling.
+ Hosts dependency properties for binding.
 </summary>
- <typeparam name="T">The type of elements contained in the collection.</typeparam>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.#ctor">
+ <member name="F:Caliburn.Micro.Bind.ModelProperty">
 <summary>
- Initializes a new instance of the <see cref="T:Caliburn.Micro.BindableCollection`1"/> class.
+ Allows binding on an existing view. Use this on root UserControls, Pages and Windows; not in a DataTemplate.
 </summary>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.#ctor(System.Collections.Generic.IEnumerable{`0})">
+ <member name="F:Caliburn.Micro.Bind.ModelWithoutContextProperty">
 <summary>
- Initializes a new instance of the <see cref="T:Caliburn.Micro.BindableCollection`1"/> class.
+ Allows binding on an existing view without setting the data context. Use this from within a DataTemplate.
 </summary>
- <param name="collection">The collection from which the elements are copied.</param>
- <exception cref="T:System.ArgumentNullException">
- The <paramref name="collection"/> parameter cannot be null.
- </exception>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.NotifyOfPropertyChange(System.String)">
+ <member name="M:Caliburn.Micro.Bind.GetModelWithoutContext(System.Windows.DependencyObject)">
 <summary>
- Notifies subscribers of the property change.
+ Gets the model to bind to.
 </summary>
- <param name = "propertyName">Name of the property.</param>
+ <param name = "dependencyObject">The dependency object to bind to.</param>
+ <returns>The model.</returns>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.Refresh">
+ <member name="M:Caliburn.Micro.Bind.SetModelWithoutContext(System.Windows.DependencyObject,System.Object)">
 <summary>
- Raises a change notification indicating that all bindings should be refreshed.
+ Sets the model to bind to.
 </summary>
+ <param name = "dependencyObject">The dependency object to bind to.</param>
+ <param name = "value">The model.</param>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.InsertItem(System.Int32,`0)">
+ <member name="M:Caliburn.Micro.Bind.GetModel(System.Windows.DependencyObject)">
 <summary>
- Inserts the item to the specified position.
+ Gets the model to bind to.
 </summary>
- <param name = "index">The index to insert at.</param>
- <param name = "item">The item to be inserted.</param>
+ <param name = "dependencyObject">The dependency object to bind to.</param>
+ <returns>The model.</returns>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.InsertItemBase(System.Int32,`0)">
+ <member name="M:Caliburn.Micro.Bind.SetModel(System.Windows.DependencyObject,System.Object)">
 <summary>
- Exposes the base implementation of the <see cref="M:Caliburn.Micro.BindableCollection`1.InsertItem(System.Int32,`0)"/> function.
+ Sets the model to bind to.
 </summary>
- <param name="index">The index.</param>
- <param name="item">The item.</param>
- <remarks>
- Used to avoid compiler warning regarding unverifiable code.
- </remarks>
+ <param name = "dependencyObject">The dependency object to bind to.</param>
+ <param name = "value">The model.</param>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.MoveItem(System.Int32,System.Int32)">
+ <member name="F:Caliburn.Micro.Bind.AtDesignTimeProperty">
 <summary>
- Moves the item within the collection.
+ Allows application of conventions at design-time.
 </summary>
- <param name="oldIndex">The old position of the item.</param>
- <param name="newIndex">The new position of the item.</param>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.MoveItemBase(System.Int32,System.Int32)">
+ <member name="M:Caliburn.Micro.Bind.GetAtDesignTime(System.Windows.DependencyObject)">
 <summary>
- Exposes the base implementation fo the <see cref="M:Caliburn.Micro.BindableCollection`1.MoveItem(System.Int32,System.Int32)"/> function.
+ Gets whether or not conventions are being applied at design-time.
 </summary>
- <param name="oldIndex">The old index.</param>
- <param name="newIndex">The new index.</param>
- <remarks>Used to avoid compiler warning regarding unverificable code.</remarks>
+ <param name="dependencyObject">The ui to apply conventions to.</param>
+ <returns>Whether or not conventions are applied.</returns>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.SetItem(System.Int32,`0)">
+ <member name="M:Caliburn.Micro.Bind.SetAtDesignTime(System.Windows.DependencyObject,System.Boolean)">
 <summary>
- Sets the item at the specified position.
+ Sets whether or not do bind conventions at design-time.
 </summary>
- <param name = "index">The index to set the item at.</param>
- <param name = "item">The item to set.</param>
+ <param name="dependencyObject">The ui to apply conventions to.</param>
+ <param name="value">Whether or not to apply conventions.</param>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.SetItemBase(System.Int32,`0)">
+ <member name="T:Caliburn.Micro.BindingScope">
 <summary>
- Exposes the base implementation of the <see cref="M:Caliburn.Micro.BindableCollection`1.SetItem(System.Int32,`0)"/> function.
+ Provides methods for searching a given scope for named elements.
 </summary>
- <param name="index">The index.</param>
- <param name="item">The item.</param>
- <remarks>
- Used to avoid compiler warning regarding unverifiable code.
- </remarks>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.RemoveItem(System.Int32)">
+ <member name="M:Caliburn.Micro.BindingScope.FindName(System.Collections.Generic.IEnumerable{System.Windows.FrameworkElement},System.String)">
 <summary>
- Removes the item at the specified position.
+ Searches through the list of named elements looking for a case-insensitive match.
 </summary>
- <param name = "index">The position used to identify the item to remove.</param>
+ <param name="elementsToSearch">The named elements to search through.</param>
+ <param name="name">The name to search for.</param>
+ <returns>The named element or null if not found.</returns>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.RemoveItemBase(System.Int32)">
+ <member name="M:Caliburn.Micro.BindingScope.AddChildResolver(System.Func{System.Type,System.Boolean},System.Func{System.Windows.DependencyObject,System.Collections.Generic.IEnumerable{System.Windows.DependencyObject}})">
 <summary>
- Exposes the base implementation of the <see cref="M:Caliburn.Micro.BindableCollection`1.RemoveItem(System.Int32)"/> function.
+ Adds a child resolver.
 </summary>
- <param name="index">The index.</param>
- <remarks>
- Used to avoid compiler warning regarding unverifiable code.
- </remarks>
+ <param name="filter">The type filter.</param>
+ <param name="resolver">The resolver.</param>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.ClearItems">
+ <member name="M:Caliburn.Micro.BindingScope.RemoveChildResolver(System.Func{System.Windows.DependencyObject,System.Collections.Generic.IEnumerable{System.Windows.DependencyObject}})">
 <summary>
- Clears the items contained by the collection.
+ Removes a child resolver.
 </summary>
+ <param name="resolver">The resolver to remove.</param>
+ <returns>true, when the resolver was (found and) removed.</returns>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.ClearItemsBase">
+ <member name="F:Caliburn.Micro.BindingScope.GetNamedElements">
 <summary>
- Exposes the base implementation of the <see cref="M:Caliburn.Micro.BindableCollection`1.ClearItems"/> function.
+ Gets all the <see cref="T:System.Windows.FrameworkElement"/> instances with names in the scope.
+ </summary>
+ <returns>Named <see cref="T:System.Windows.FrameworkElement"/> instances in the provided scope.</returns>
+ <remarks>Pass in a <see cref="T:System.Windows.DependencyObject"/> and receive a list of named <see cref="T:System.Windows.FrameworkElement"/> instances in the same scope.</remarks>
+ </member>
+ <member name="F:Caliburn.Micro.BindingScope.FindNamedDescendants">
+ <summary>
+ Finds a set of named <see cref="T:System.Windows.FrameworkElement"/> instances in each hop in a <see cref="T:Caliburn.Micro.BindingScope.ScopeNamingRoute"/>.
 </summary>
 <remarks>
- Used to avoid compiler warning regarding unverifiable code.
+ Searches all the elements in the <see cref="T:Caliburn.Micro.BindingScope.ScopeNamingRoute"/> parameter as well as the visual children of 
+ each of these elements, the <see cref="P:System.Windows.Controls.ContentControl.Content"/>, the <c>HeaderedContentControl.Header</c>,
+ the <see cref="P:System.Windows.Controls.ItemsControl.Items"/>, or the <c>HeaderedItemsControl.Header</c>, if any are found.
 </remarks>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.OnCollectionChanged(System.Collections.Specialized.NotifyCollectionChangedEventArgs)">
+ <member name="F:Caliburn.Micro.BindingScope.FindScopeNamingRoute">
 <summary>
- Raises the <see cref = "E:System.Collections.ObjectModel.ObservableCollection`1.CollectionChanged" /> event with the provided arguments.
+ Finds a path of dependency objects which traces through visual anscestry until a root which is <see langword="null"/>,
+ a <see cref="T:System.Windows.Controls.UserControl"/>, a <c>Page</c> with a dependency object <c>Page.ContentProperty</c> value, 
+ a dependency object with <see cref="F:Caliburn.Micro.View.IsScopeRootProperty"/> set to <see langword="true"/>. <see cref="T:System.Windows.Controls.ContentPresenter"/>
+ and <see cref="T:System.Windows.Controls.ItemsPresenter"/> are included in the resulting <see cref="T:Caliburn.Micro.BindingScope.ScopeNamingRoute"/> in order to track which item
+ in an items control we are scoped to.
 </summary>
- <param name = "e">Arguments of the event being raised.</param>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.OnPropertyChanged(System.ComponentModel.PropertyChangedEventArgs)">
+ <member name="T:Caliburn.Micro.BindingScope.ScopeNamingRoute">
 <summary>
- Raises the PropertyChanged event with the provided arguments.
+ Maintains a connection in the visual tree of dependency objects in order to record a route through it.
 </summary>
- <param name = "e">The event data to report in the event.</param>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.AddRange(System.Collections.Generic.IEnumerable{`0})">
+ <member name="M:Caliburn.Micro.BindingScope.ScopeNamingRoute.AddHop(System.Windows.DependencyObject,System.Windows.DependencyObject)">
 <summary>
- Adds the range.
+ Adds a segment to the route.
 </summary>
- <param name = "items">The items.</param>
+ <param name="from">The source dependency object.</param>
+ <param name="to">The target dependency object.</param>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.RemoveRange(System.Collections.Generic.IEnumerable{`0})">
+ <member name="M:Caliburn.Micro.BindingScope.ScopeNamingRoute.TryGetHop(System.Windows.DependencyObject,System.Windows.DependencyObject@)">
 <summary>
- Removes the range.
+ Tries to get a target dependency object given a source.
 </summary>
- <param name = "items">The items.</param>
+ <param name="hopSource">The possible beginning of a route segment (hop).</param>
+ <param name="hopTarget">The target of a route segment (hop).</param>
+ <returns><see langword="true"/> if <paramref name="hopSource"/> had a target recorded; <see langword="false"/> otherwise.</returns>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.OnDeserialized(System.Runtime.Serialization.StreamingContext)">
+ <member name="P:Caliburn.Micro.BindingScope.ScopeNamingRoute.Root">
 <summary>
- Called when the object is deserialized.
+ Gets or sets the starting point of the route.
 </summary>
- <param name="c">The streaming context.</param>
 </member>
- <member name="M:Caliburn.Micro.BindableCollection`1.ShouldSerializeIsNotifying">
+ <member name="T:Caliburn.Micro.BootstrapperBase">
 <summary>
- Used to indicate whether or not the IsNotifying property is serialized to Xml.
+ Inherit from this class in order to customize the configuration of the framework.
 </summary>
- <returns>Whether or not to serialize the IsNotifying property. The default is false.</returns>
 </member>
- <member name="P:Caliburn.Micro.BindableCollection`1.IsNotifying">
+ <member name="M:Caliburn.Micro.BootstrapperBase.#ctor(System.Boolean)">
 <summary>
- Enables/Disables property change notification.
+ Creates an instance of the bootstrapper.
 </summary>
+ <param name="useApplication">Set this to false when hosting Caliburn.Micro inside and Office or WinForms application. The default is true.</param>
 </member>
- <member name="T:Caliburn.Micro.RegExHelper">
+ <member name="M:Caliburn.Micro.BootstrapperBase.Start">
 <summary>
- Helper class for encoding strings to regular expression patterns
+ Start the framework.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.RegExHelper.NameRegEx">
+ <member name="M:Caliburn.Micro.BootstrapperBase.StartDesignTime">
 <summary>
- Regular expression pattern for valid name
+ Called by the bootstrapper's constructor at design time to start the framework.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.RegExHelper.SubNamespaceRegEx">
+ <member name="M:Caliburn.Micro.BootstrapperBase.StartRuntime">
 <summary>
- Regular expression pattern for subnamespace (including dot)
+ Called by the bootstrapper's constructor at runtime to start the framework.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.RegExHelper.NamespaceRegEx">
+ <member name="M:Caliburn.Micro.BootstrapperBase.PrepareApplication">
 <summary>
- Regular expression pattern for namespace or namespace fragment
+ Provides an opportunity to hook into the application object.
 </summary>
 </member>
- <member name="M:Caliburn.Micro.RegExHelper.GetCaptureGroup(System.String,System.String)">
+ <member name="M:Caliburn.Micro.BootstrapperBase.Configure">
 <summary>
- Creates a named capture group with the specified regular expression 
+ Override to configure the framework and setup your IoC container.
 </summary>
- <param name="groupName">Name of capture group to create</param>
- <param name="regEx">Regular expression pattern to capture</param>
- <returns>Regular expression capture group with the specified group name</returns>
 </member>
- <member name="M:Caliburn.Micro.RegExHelper.NamespaceToRegEx(System.String)">
+ <member name="M:Caliburn.Micro.BootstrapperBase.SelectAssemblies">
 <summary>
- Converts a namespace (including wildcards) to a regular expression string
+ Override to tell the framework where to find assemblies to inspect for views, etc.
 </summary>
- <param name="srcNamespace">Source namespace to convert to regular expression</param>
- <returns>Namespace converted to a regular expression</returns>
+ <returns>A list of assemblies to inspect.</returns>
 </member>
- <member name="M:Caliburn.Micro.RegExHelper.GetNameCaptureGroup(System.String)">
+ <member name="M:Caliburn.Micro.BootstrapperBase.GetInstance(System.Type,System.String)">
 <summary>
- Creates a capture group for a valid name regular expression pattern
+ Override this to provide an IoC specific implementation.
 </summary>
- <param name="groupName">Name of capture group to create</param>
- <returns>Regular expression capture group with the specified group name</returns>
+ <param name="service">The service to locate.</param>
+ <param name="key">The key to locate.</param>
+ <returns>The located service.</returns>
 </member>
- <member name="M:Caliburn.Micro.RegExHelper.GetNamespaceCaptureGroup(System.String)">
+ <member name="M:Caliburn.Micro.BootstrapperBase.GetAllInstances(System.Type)">
 <summary>
- Creates a capture group for a namespace regular expression pattern
+ Override this to provide an IoC specific implementation
 </summary>
- <param name="groupName">Name of capture group to create</param>
- <returns>Regular expression capture group with the specified group name</returns>
+ <param name="service">The service to locate.</param>
+ <returns>The located services.</returns>
 </member>
- <member name="T:Caliburn.Micro.ILog">
+ <member name="M:Caliburn.Micro.BootstrapperBase.BuildUp(System.Object)">
 <summary>
- A logger.
+ Override this to provide an IoC specific implementation.
 </summary>
+ <param name="instance">The instance to perform injection on.</param>
 </member>
- <member name="M:Caliburn.Micro.ILog.Info(System.String,System.Object[])">
+ <member name="M:Caliburn.Micro.BootstrapperBase.OnStartup(System.Object,System.Windows.StartupEventArgs)">
 <summary>
- Logs the message as info.
+ Override this to add custom behavior to execute after the application starts.
 </summary>
- <param name="format">A formatted message.</param>
- <param name="args">Parameters to be injected into the formatted message.</param>
+ <param name="sender">The sender.</param>
+ <param name="e">The args.</param>
 </member>
- <member name="M:Caliburn.Micro.ILog.Warn(System.String,System.Object[])">
+ <member name="M:Caliburn.Micro.BootstrapperBase.OnExit(System.Object,System.EventArgs)">
 <summary>
- Logs the message as a warning.
+ Override this to add custom behavior on exit.
 </summary>
- <param name="format">A formatted message.</param>
- <param name="args">Parameters to be injected into the formatted message.</param>
+ <param name="sender">The sender.</param>
+ <param name="e">The event args.</param>
 </member>
- <member name="M:Caliburn.Micro.ILog.Error(System.Exception)">
+ <member name="M:Caliburn.Micro.BootstrapperBase.OnUnhandledException(System.Object,System.Windows.Threading.DispatcherUnhandledExceptionEventArgs)">
 <summary>
- Logs the exception.
+ Override this to add custom behavior for unhandled exceptions.
 </summary>
- <param name="exception">The exception.</param>
+ <param name="sender">The sender.</param>
+ <param name="e">The event args.</param>
 </member>
- <member name="T:Caliburn.Micro.LogManager">
+ <member name="M:Caliburn.Micro.BootstrapperBase.DisplayRootViewFor(System.Type,System.Collections.Generic.IDictionary{System.String,System.Object})">
 <summary>
- Used to manage logging.
+ Locates the view model, locates the associate view, binds them and shows it as the root view.
 </summary>
+ <param name="viewModelType">The view model type.</param>
+ <param name="settings">The optional window settings.</param>
 </member>
- <member name="F:Caliburn.Micro.LogManager.GetLog">
+ <member name="M:Caliburn.Micro.BootstrapperBase.DisplayRootViewFor``1(System.Collections.Generic.IDictionary{System.String,System.Object})">
 <summary>
- Creates an <see cref="T:Caliburn.Micro.ILog"/> for the provided type.
+ Locates the view model, locates the associate view, binds them and shows it as the root view.
 </summary>
+ <typeparam name="TViewModel">The view model type.</typeparam>
+ <param name="settings">The optional window settings.</param>
 </member>
- <member name="T:Caliburn.Micro.Parameter">
+ <member name="P:Caliburn.Micro.BootstrapperBase.Application">
 <summary>
- Represents a parameter of an <see cref="T:Caliburn.Micro.ActionMessage"/>.
+ The application.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.Parameter.ValueProperty">
+ <member name="T:Caliburn.Micro.Bootstrapper`1">
 <summary>
- A dependency property representing the parameter's value.
+ A strongly-typed version of <see cref="T:Caliburn.Micro.BootstrapperBase"/> that specifies the type of root model to create for the application.
 </summary>
+ <typeparam name="TRootModel">The type of root model for the application.</typeparam>
 </member>
- <member name="M:Caliburn.Micro.Parameter.CreateInstanceCore">
+ <member name="M:Caliburn.Micro.Bootstrapper`1.#ctor">
 <summary>
- When implemented in a derived class, creates a new instance of the <see cref="T:System.Windows.Freezable"/> derived class.
+ Initializes a new instance of the <see cref="T:Caliburn.Micro.Bootstrapper`1"/> class.
 </summary>
- <returns>The new instance.</returns>
 </member>
- <member name="M:Caliburn.Micro.Parameter.MakeAwareOf(Caliburn.Micro.ActionMessage)">
+ <member name="M:Caliburn.Micro.Bootstrapper`1.OnStartup(System.Object,System.Windows.StartupEventArgs)">
 <summary>
- Makes the parameter aware of the <see cref="T:Caliburn.Micro.ActionMessage"/> that it's attached to.
+ Override this to add custom behavior to execute after the application starts.
 </summary>
- <param name="owner">The action message.</param>
+ <param name="sender">The sender.</param>
+ <param name="e">The args.</param>
 </member>
- <member name="P:Caliburn.Micro.Parameter.Value">
+ <member name="T:Caliburn.Micro.Conductor`1">
 <summary>
- Gets or sets the value of the parameter.
+ An implementation of <see cref="T:Caliburn.Micro.IConductor"/> that holds on to and activates only one item at a time.
 </summary>
- <value>The value.</value>
+ </member>
+ <member name="T:Caliburn.Micro.ConductorBaseWithActiveItem`1">
+ <summary>
+ A base class for various implementations of <see cref="T:Caliburn.Micro.IConductor"/> that maintain an active item.
+ </summary>
+ <typeparam name="T">The type that is being conducted.</typeparam>
+ </member>
+ <member name="T:Caliburn.Micro.ConductorBase`1">
+ <summary>
+ A base class for various implementations of <see cref="T:Caliburn.Micro.IConductor"/>.
+ </summary>
+ <typeparam name="T">The type that is being conducted.</typeparam>
 </member>
 <member name="T:Caliburn.Micro.Screen">
 <summary>
@@ -541,6 +552,83 @@
 A base implementation of <see cref="T:Caliburn.Micro.IViewAware"/> which is capable of caching views by context.
 </summary>
 </member>
+ <member name="T:Caliburn.Micro.PropertyChangedBase">
+ <summary>
+ A base class that implements the infrastructure for property change notification and automatically performs UI thread marshalling.
+ </summary>
+ </member>
+ <member name="T:Caliburn.Micro.INotifyPropertyChangedEx">
+ <summary>
+ Extends <see cref="T:System.ComponentModel.INotifyPropertyChanged"/> such that the change event can be raised by external parties.
+ </summary>
+ </member>
+ <member name="M:Caliburn.Micro.INotifyPropertyChangedEx.NotifyOfPropertyChange(System.String)">
+ <summary>
+ Notifies subscribers of the property change.
+ </summary>
+ <param name = "propertyName">Name of the property.</param>
+ </member>
+ <member name="M:Caliburn.Micro.INotifyPropertyChangedEx.Refresh">
+ <summary>
+ Raises a change notification indicating that all bindings should be refreshed.
+ </summary>
+ </member>
+ <member name="P:Caliburn.Micro.INotifyPropertyChangedEx.IsNotifying">
+ <summary>
+ Enables/Disables property change notification.
+ </summary>
+ </member>
+ <member name="M:Caliburn.Micro.PropertyChangedBase.#ctor">
+ <summary>
+ Creates an instance of <see cref="T:Caliburn.Micro.PropertyChangedBase"/>.
+ </summary>
+ </member>
+ <member name="M:Caliburn.Micro.PropertyChangedBase.Refresh">
+ <summary>
+ Raises a change notification indicating that all bindings should be refreshed.
+ </summary>
+ </member>
+ <member name="M:Caliburn.Micro.PropertyChangedBase.NotifyOfPropertyChange(System.String)">
+ <summary>
+ Notifies subscribers of the property change.
+ </summary>
+ <param name = "propertyName">Name of the property.</param>
+ </member>
+ <member name="M:Caliburn.Micro.PropertyChangedBase.NotifyOfPropertyChange``1(System.Linq.Expressions.Expression{System.Func{``0}})">
+ <summary>
+ Notifies subscribers of the property change.
+ </summary>
+ <typeparam name = "TProperty">The type of the property.</typeparam>
+ <param name = "property">The property expression.</param>
+ </member>
+ <member name="M:Caliburn.Micro.PropertyChangedBase.OnPropertyChanged(System.ComponentModel.PropertyChangedEventArgs)">
+ <summary>
+ Raises the <see cref="E:PropertyChanged"/> event directly.
+ </summary>
+ <param name="e">The <see cref="T:System.ComponentModel.PropertyChangedEventArgs"/> instance containing the event data.</param>
+ </member>
+ <member name="M:Caliburn.Micro.PropertyChangedBase.OnDeserialized(System.Runtime.Serialization.StreamingContext)">
+ <summary>
+ Called when the object is deserialized.
+ </summary>
+ <param name="c">The streaming context.</param>
+ </member>
+ <member name="M:Caliburn.Micro.PropertyChangedBase.ShouldSerializeIsNotifying">
+ <summary>
+ Used to indicate whether or not the IsNotifying property is serialized to Xml.
+ </summary>
+ <returns>Whether or not to serialize the IsNotifying property. The default is false.</returns>
+ </member>
+ <member name="E:Caliburn.Micro.PropertyChangedBase.PropertyChanged">
+ <summary>
+ Occurs when a property value changes.
+ </summary>
+ </member>
+ <member name="P:Caliburn.Micro.PropertyChangedBase.IsNotifying">
+ <summary>
+ Enables/Disables property change notification.
+ </summary>
+ </member>
 <member name="T:Caliburn.Micro.IViewAware">
 <summary>
 Denotes a class which is aware of its view(s).
@@ -777,23 +865,6 @@
 Raised after deactivation.
 </summary>
 </member>
- <member name="T:Caliburn.Micro.Conductor`1">
- <summary>
- An implementation of <see cref="T:Caliburn.Micro.IConductor"/> that holds on to and activates only one item at a time.
- </summary>
- </member>
- <member name="T:Caliburn.Micro.ConductorBaseWithActiveItem`1">
- <summary>
- A base class for various implementations of <see cref="T:Caliburn.Micro.IConductor"/> that maintain an active item.
- </summary>
- <typeparam name="T">The type that is being conducted.</typeparam>
- </member>
- <member name="T:Caliburn.Micro.ConductorBase`1">
- <summary>
- A base class for various implementations of <see cref="T:Caliburn.Micro.IConductor"/>.
- </summary>
- <typeparam name="T">The type that is being conducted.</typeparam>
- </member>
 <member name="T:Caliburn.Micro.IConductor">
 <summary>
 Denotes an instance which conducts other objects by managing an ActiveItem and maintaining a strict lifecycle.
@@ -1102,317 +1173,72 @@
 Gets the items that are currently being conducted.
 </summary>
 </member>
- <member name="T:Caliburn.Micro.ViewModelLocator">
+ <member name="T:Caliburn.Micro.ContainerExtensions">
 <summary>
- A strategy for determining which view model to use for a given view.
+ Extension methods for the <see cref="T:Caliburn.Micro.SimpleContainer"/>.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.ViewModelLocator.NameTransformer">
+ <member name="M:Caliburn.Micro.ContainerExtensions.Singleton``1(Caliburn.Micro.SimpleContainer)">
 <summary>
- Used to transform names.
+ Registers a singleton.
 </summary>
+ <typeparam name="TImplementation">The type of the implementation.</typeparam>
+ <param name="container">The container.</param>
+ <returns>The container.</returns>
 </member>
- <member name="F:Caliburn.Micro.ViewModelLocator.InterfaceCaptureGroupName">
+ <member name="M:Caliburn.Micro.ContainerExtensions.Singleton``2(Caliburn.Micro.SimpleContainer)">
 <summary>
- The name of the capture group used as a marker for rules that return interface types
+ Registers a singleton.
 </summary>
+ <typeparam name="TService">The type of the service.</typeparam>
+ <typeparam name="TImplementation">The type of the implementation.</typeparam>
+ <param name="container">The container.</param>
+ <returns>The container.</returns>
 </member>
- <member name="M:Caliburn.Micro.ViewModelLocator.ConfigureTypeMappings(Caliburn.Micro.TypeMappingConfiguration)">
+ <member name="M:Caliburn.Micro.ContainerExtensions.PerRequest``2(Caliburn.Micro.SimpleContainer)">
 <summary>
- Specifies how type mappings are created, including default type mappings. Calling this method will
- clear all existing name transformation rules and create new default type mappings according to the
- configuration.
+ Registers an service to be created on each request.
 </summary>
- <param name="config">An instance of TypeMappingConfiguration that provides the settings for configuration</param>
+ <typeparam name="TService">The type of the service.</typeparam>
+ <typeparam name="TImplementation">The type of the implementation.</typeparam>
+ <param name="container">The container.</param>
+ <returns>The container.</returns>
 </member>
- <member name="M:Caliburn.Micro.ViewModelLocator.AddDefaultTypeMapping(System.String)">
+ <member name="M:Caliburn.Micro.ContainerExtensions.PerRequest``1(Caliburn.Micro.SimpleContainer)">
 <summary>
- Adds a default type mapping using the standard namespace mapping convention
+ Registers an service to be created on each request.
 </summary>
- <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ <typeparam name="TImplementation">The type of the implementation.</typeparam>
+ <param name="container">The container.</param>
+ <returns>The container.</returns>
 </member>
- <member name="M:Caliburn.Micro.ViewModelLocator.AddTypeMapping(System.String,System.String,System.String[],System.String)">
+ <member name="M:Caliburn.Micro.ContainerExtensions.Instance``1(Caliburn.Micro.SimpleContainer,``0)">
 <summary>
- Adds a standard type mapping based on namespace RegEx replace and filter patterns
+ Registers an instance with the container.
 </summary>
- <param name="nsSourceReplaceRegEx">RegEx replace pattern for source namespace</param>
- <param name="nsSourceFilterRegEx">RegEx filter pattern for source namespace</param>
- <param name="nsTargetsRegEx">Array of RegEx replace values for target namespaces</param>
- <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
- </member>
- <member name="M:Caliburn.Micro.ViewModelLocator.AddTypeMapping(System.String,System.String,System.String,System.String)">
- <summary>
- Adds a standard type mapping based on namespace RegEx replace and filter patterns
- </summary>
- <param name="nsSourceReplaceRegEx">RegEx replace pattern for source namespace</param>
- <param name="nsSourceFilterRegEx">RegEx filter pattern for source namespace</param>
- <param name="nsTargetRegEx">RegEx replace value for target namespace</param>
- <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
- </member>
- <member name="M:Caliburn.Micro.ViewModelLocator.AddNamespaceMapping(System.String,System.String[],System.String)">
- <summary>
- Adds a standard type mapping based on simple namespace mapping
- </summary>
- <param name="nsSource">Namespace of source type</param>
- <param name="nsTargets">Namespaces of target type as an array</param>
- <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
- </member>
- <member name="M:Caliburn.Micro.ViewModelLocator.AddNamespaceMapping(System.String,System.String,System.String)">
- <summary>
- Adds a standard type mapping based on simple namespace mapping
- </summary>
- <param name="nsSource">Namespace of source type</param>
- <param name="nsTarget">Namespace of target type</param>
- <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ <typeparam name="TService">The type of the service.</typeparam>
+ <param name="container">The container.</param>
+ <param name="instance">The instance.</param>
+ <returns>The container.</returns>
 </member>
- <member name="M:Caliburn.Micro.ViewModelLocator.AddSubNamespaceMapping(System.String,System.String[],System.String)">
+ <member name="M:Caliburn.Micro.ContainerExtensions.Handler``1(Caliburn.Micro.SimpleContainer,System.Func{Caliburn.Micro.SimpleContainer,System.Object})">
 <summary>
- Adds a standard type mapping by substituting one subnamespace for another
- </summary>
- <param name="nsSource">Subnamespace of source type</param>
- <param name="nsTargets">Subnamespaces of target type as an array</param>
- <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
- </member>
- <member name="M:Caliburn.Micro.ViewModelLocator.AddSubNamespaceMapping(System.String,System.String,System.String)">
- <summary>
- Adds a standard type mapping by substituting one subnamespace for another
- </summary>
- <param name="nsSource">Subnamespace of source type</param>
- <param name="nsTarget">Subnamespace of target type</param>
- <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
- </member>
- <member name="M:Caliburn.Micro.ViewModelLocator.MakeInterface(System.String)">
- <summary>
- Makes a type name into an interface name.
- </summary>
- <param name = "typeName">The part.</param>
- <returns></returns>
- </member>
- <member name="F:Caliburn.Micro.ViewModelLocator.TransformName">
- <summary>
- Transforms a View type name into all of its possible ViewModel type names. Accepts a flag
- to include or exclude interface types.
- </summary>
- <returns>Enumeration of transformed names</returns>
- <remarks>Arguments:
- typeName = The name of the View type being resolved to its companion ViewModel.
- includeInterfaces = Flag to indicate if interface types are included
- </remarks>
- </member>
- <member name="F:Caliburn.Micro.ViewModelLocator.LocateTypeForViewType">
- <summary>
- Determines the view model type based on the specified view type.
- </summary>
- <returns>The view model type.</returns>
- <remarks>
- Pass the view type and receive a view model type. Pass true for the second parameter to search for interfaces.
- </remarks>
- </member>
- <member name="F:Caliburn.Micro.ViewModelLocator.LocateForViewType">
- <summary>
- Locates the view model for the specified view type.
- </summary>
- <returns>The view model.</returns>
- <remarks>
- Pass the view type as a parameter and receive a view model instance.
- </remarks>
- </member>
- <member name="F:Caliburn.Micro.ViewModelLocator.LocateForView">
- <summary>
- Locates the view model for the specified view instance.
- </summary>
- <returns>The view model.</returns>
- <remarks>
- Pass the view instance as a parameters and receive a view model instance.
- </remarks>
- </member>
- <member name="T:Caliburn.Micro.IoC">
- <summary>
- Used by the framework to pull instances from an IoC container and to inject dependencies into certain existing classes.
- </summary>
- </member>
- <member name="F:Caliburn.Micro.IoC.GetInstance">
- <summary>
- Gets an instance by type and key.
- </summary>
- </member>
- <member name="F:Caliburn.Micro.IoC.GetAllInstances">
- <summary>
- Gets all instances of a particular type.
- </summary>
- </member>
- <member name="F:Caliburn.Micro.IoC.BuildUp">
- <summary>
- Passes an existing instance to the IoC container to enable dependencies to be injected.
- </summary>
- </member>
- <member name="M:Caliburn.Micro.IoC.Get``1">
- <summary>
- Gets an instance by type.
- </summary>
- <typeparam name="T">The type to resolve from the container.</typeparam>
- <returns>The resolved instance.</returns>
- </member>
- <member name="M:Caliburn.Micro.IoC.Get``1(System.String)">
- <summary>
- Gets an instance from the container using type and key.
- </summary>
- <typeparam name="T">The type to resolve.</typeparam>
- <param name="key">The key to look up.</param>
- <returns>The resolved instance.</returns>
- </member>
- <member name="T:Caliburn.Micro.Action">
- <summary>
- A host for action related attached properties.
- </summary>
- </member>
- <member name="F:Caliburn.Micro.Action.TargetProperty">
- <summary>
- A property definition representing the target of an <see cref="T:Caliburn.Micro.ActionMessage"/> . The DataContext of the element will be set to this instance.
- </summary>
- </member>
- <member name="F:Caliburn.Micro.Action.TargetWithoutContextProperty">
- <summary>
- A property definition representing the target of an <see cref="T:Caliburn.Micro.ActionMessage"/> . The DataContext of the element is not set to this instance.
- </summary>
- </member>
- <member name="M:Caliburn.Micro.Action.SetTarget(System.Windows.DependencyObject,System.Object)">
- <summary>
- Sets the target of the <see cref="T:Caliburn.Micro.ActionMessage"/> .
- </summary>
- <param name="d"> The element to attach the target to. </param>
- <param name="target"> The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> . </param>
- </member>
- <member name="M:Caliburn.Micro.Action.GetTarget(System.Windows.DependencyObject)">
- <summary>
- Gets the target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> .
- </summary>
- <param name="d"> The element to which the target is attached. </param>
- <returns> The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> </returns>
- </member>
- <member name="M:Caliburn.Micro.Action.SetTargetWithoutContext(System.Windows.DependencyObject,System.Object)">
- <summary>
- Sets the target of the <see cref="T:Caliburn.Micro.ActionMessage"/> .
- </summary>
- <param name="d"> The element to attach the target to. </param>
- <param name="target"> The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> . </param>
- <remarks>
- The DataContext will not be set.
- </remarks>
- </member>
- <member name="M:Caliburn.Micro.Action.GetTargetWithoutContext(System.Windows.DependencyObject)">
- <summary>
- Gets the target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> .
- </summary>
- <param name="d"> The element to which the target is attached. </param>
- <returns> The target for instances of <see cref="T:Caliburn.Micro.ActionMessage"/> </returns>
- </member>
- <member name="M:Caliburn.Micro.Action.HasTargetSet(System.Windows.DependencyObject)">
- <summary>
- Checks if the <see cref="T:Caliburn.Micro.ActionMessage"/> -Target was set.
- </summary>
- <param name="element"> DependencyObject to check </param>
- <returns> True if Target or TargetWithoutContext was set on <paramref name="element"/> </returns>
- </member>
- <member name="M:Caliburn.Micro.Action.Invoke(System.Object,System.String,System.Windows.DependencyObject,System.Windows.FrameworkElement,System.Object,System.Object[])">
- <summary>
- Uses the action pipeline to invoke the method.
- </summary>
- <param name="target"> The object instance to invoke the method on. </param>
- <param name="methodName"> The name of the method to invoke. </param>
- <param name="view"> The view. </param>
- <param name="source"> The source of the invocation. </param>
- <param name="eventArgs"> The event args. </param>
- <param name="parameters"> The method parameters. </param>
- </member>
- <member name="T:Caliburn.Micro.ScreenExtensions">
- <summary>
- Hosts extension methods for <see cref="T:Caliburn.Micro.IScreen"/> classes.
- </summary>
- </member>
- <member name="M:Caliburn.Micro.ScreenExtensions.TryActivate(System.Object)">
- <summary>
- Activates the item if it implements <see cref="T:Caliburn.Micro.IActivate"/>, otherwise does nothing.
- </summary>
- <param name="potentialActivatable">The potential activatable.</param>
- </member>
- <member name="M:Caliburn.Micro.ScreenExtensions.TryDeactivate(System.Object,System.Boolean)">
- <summary>
- Deactivates the item if it implements <see cref="T:Caliburn.Micro.IDeactivate"/>, otherwise does nothing.
- </summary>
- <param name="potentialDeactivatable">The potential deactivatable.</param>
- <param name="close">Indicates whether or not to close the item after deactivating it.</param>
- </member>
- <member name="M:Caliburn.Micro.ScreenExtensions.CloseItem(Caliburn.Micro.IConductor,System.Object)">
- <summary>
- Closes the specified item.
- </summary>
- <param name="conductor">The conductor.</param>
- <param name="item">The item to close.</param>
- </member>
- <member name="M:Caliburn.Micro.ScreenExtensions.CloseItem``1(Caliburn.Micro.ConductorBase{``0},``0)">
- <summary>
- Closes the specified item.
- </summary>
- <param name="conductor">The conductor.</param>
- <param name="item">The item to close.</param>
- </member>
- <member name="M:Caliburn.Micro.ScreenExtensions.ActivateWith(Caliburn.Micro.IActivate,Caliburn.Micro.IActivate)">
- <summary>
- Activates a child whenever the specified parent is activated.
- </summary>
- <param name="child">The child to activate.</param>
- <param name="parent">The parent whose activation triggers the child's activation.</param>
- </member>
- <member name="M:Caliburn.Micro.ScreenExtensions.DeactivateWith(Caliburn.Micro.IDeactivate,Caliburn.Micro.IDeactivate)">
- <summary>
- Deactivates a child whenever the specified parent is deactivated.
- </summary>
- <param name="child">The child to deactivate.</param>
- <param name="parent">The parent whose deactivation triggers the child's deactivation.</param>
- </member>
- <member name="M:Caliburn.Micro.ScreenExtensions.ConductWith``2(``0,``1)">
- <summary>
- Activates and Deactivates a child whenever the specified parent is Activated or Deactivated.
- </summary>
- <param name="child">The child to activate/deactivate.</param>
- <param name="parent">The parent whose activation/deactivation triggers the child's activation/deactivation.</param>
- </member>
- <member name="T:Caliburn.Micro.ExtensionMethods">
- <summary>
- Generic extension methods used by the framework.
+ Registers a custom service handler with the container.
 </summary>
+ <typeparam name="TService">The type of the service.</typeparam>
+ <param name="container">The container.</param>
+ <param name="handler">The handler.</param>
+ <returns>The container.</returns>
 </member>
- <member name="M:Caliburn.Micro.ExtensionMethods.GetAssemblyName(System.Reflection.Assembly)">
+ <member name="M:Caliburn.Micro.ContainerExtensions.AllTypesOf``1(Caliburn.Micro.SimpleContainer,System.Reflection.Assembly,System.Func{System.Type,System.Boolean})">
 <summary>
- Get's the name of the assembly.
+ Registers all specified types in an assembly as singleton in the container.
 </summary>
+ <typeparam name="TService">The type of the service.</typeparam>
+ <param name="container">The container.</param>
 <param name="assembly">The assembly.</param>
- <returns>The assembly's name.</returns>
- </member>
- <member name="M:Caliburn.Micro.ExtensionMethods.GetAttributes``1(System.Reflection.MemberInfo,System.Boolean)">
- <summary>
- Gets all the attributes of a particular type.
- </summary>
- <typeparam name="T">The type of attributes to get.</typeparam>
- <param name="member">The member to inspect for attributes.</param>
- <param name="inherit">Whether or not to search for inherited attributes.</param>
- <returns>The list of attributes found.</returns>
- </member>
- <member name="M:Caliburn.Micro.ExtensionMethods.Apply``1(System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
- <summary>
- Applies the action to each element in the list.
- </summary>
- <typeparam name="T">The enumerable item's type.</typeparam>
- <param name="enumerable">The elements to enumerate.</param>
- <param name="action">The action to apply to each item in the list.</param>
- </member>
- <member name="M:Caliburn.Micro.ExtensionMethods.GetMemberInfo(System.Linq.Expressions.Expression)">
- <summary>
- Converts an expression into a <see cref="T:System.Reflection.MemberInfo"/>.
- </summary>
- <param name="expression">The expression to convert.</param>
- <returns>The member info.</returns>
+ <param name="filter">The type filter.</param>
+ <returns>The container.</returns>
 </member>
 <member name="T:Caliburn.Micro.ConventionManager">
 <summary>
@@ -1581,63 +1407,87 @@
 <param name="propertyName">The property to search for.</param>
 <returns>The property or null if not found.</returns>
 </member>
- <member name="T:Caliburn.Micro.AssemblySource">
+ <member name="T:Caliburn.Micro.Coroutine">
 <summary>
- A source of assemblies that are inspectable by the framework.
+ Manages coroutine execution.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.AssemblySource.Instance">
+ <member name="F:Caliburn.Micro.Coroutine.CreateParentEnumerator">
 <summary>
- The singleton instance of the AssemblySource used by the framework.
+ Creates the parent enumerator.
 </summary>
 </member>
- <member name="T:Caliburn.Micro.Message">
+ <member name="M:Caliburn.Micro.Coroutine.BeginExecute(System.Collections.Generic.IEnumerator{Caliburn.Micro.IResult},Caliburn.Micro.ActionExecutionContext,System.EventHandler{Caliburn.Micro.ResultCompletionEventArgs})">
 <summary>
- Host's attached properties related to routed UI messaging.
+ Executes a coroutine.
 </summary>
+ <param name="coroutine">The coroutine to execute.</param>
+ <param name="context">The context to execute the coroutine within.</param>
+ /// <param name="callback">The completion callback for the coroutine.</param>
 </member>
- <member name="M:Caliburn.Micro.Message.SetHandler(System.Windows.DependencyObject,System.Object)">
+ <member name="M:Caliburn.Micro.Coroutine.ExecuteAsync(System.Collections.Generic.IEnumerator{Caliburn.Micro.IResult},Caliburn.Micro.ActionExecutionContext)">
 <summary>
- Places a message handler on this element.
+ Executes a coroutine asynchronous.
 </summary>
- <param name="d"> The element. </param>
- <param name="value"> The message handler. </param>
+ <param name="coroutine">The coroutine to execute.</param>
+ <param name="context">The context to execute the coroutine within.</param>
+ <returns>A task that represents the asynchronous coroutine.</returns>
 </member>
- <member name="M:Caliburn.Micro.Message.GetHandler(System.Windows.DependencyObject)">
+ <member name="E:Caliburn.Micro.Coroutine.Completed">
 <summary>
- Gets the message handler for this element.
+ Called upon completion of a coroutine.
 </summary>
- <param name="d"> The element. </param>
- <returns> The message handler. </returns>
 </member>
- <member name="F:Caliburn.Micro.Message.AttachProperty">
+ <member name="T:Caliburn.Micro.IHandleWithCoroutine`1">
 <summary>
- A property definition representing attached triggers and messages.
+ Denotes a class which can handle a particular type of message and uses a Coroutine to do so.
 </summary>
 </member>
- <member name="M:Caliburn.Micro.Message.SetAttach(System.Windows.DependencyObject,System.String)">
+ <member name="T:Caliburn.Micro.IHandle">
 <summary>
- Sets the attached triggers and messages.
+ A marker interface for classes that subscribe to messages.
 </summary>
- <param name="d"> The element to attach to. </param>
- <param name="attachText"> The parsable attachment text. </param>
 </member>
- <member name="M:Caliburn.Micro.Message.GetAttach(System.Windows.DependencyObject)">
+ <member name="M:Caliburn.Micro.IHandleWithCoroutine`1.Handle(`0)">
 <summary>
- Gets the attached triggers and messages.
+ Handle the message with a Coroutine.
 </summary>
- <param name="d"> The element that was attached to. </param>
- <returns> The parsable attachment text. </returns>
+ <param name="message">The message.</param>
+ <returns>The coroutine to execute.</returns>
 </member>
- <member name="T:Caliburn.Micro.IHaveParameters">
+ <member name="T:Caliburn.Micro.ICloseStrategy`1">
 <summary>
- Indicates that a message is parameterized.
+ Used to gather the results from multiple child elements which may or may not prevent closing.
 </summary>
+ <typeparam name="T">The type of child element.</typeparam>
 </member>
- <member name="P:Caliburn.Micro.IHaveParameters.Parameters">
+ <member name="M:Caliburn.Micro.ICloseStrategy`1.Execute(System.Collections.Generic.IEnumerable{`0},System.Action{System.Boolean,System.Collections.Generic.IEnumerable{`0}})">
 <summary>
- Represents the parameters of a message.
+ Executes the strategy.
+ </summary>
+ <param name="toClose">Items that are requesting close.</param>
+ <param name="callback">The action to call when all enumeration is complete and the close results are aggregated.
+ The bool indicates whether close can occur. The enumerable indicates which children should close if the parent cannot.</param>
+ </member>
+ <member name="T:Caliburn.Micro.DefaultCloseStrategy`1">
+ <summary>
+ Used to gather the results from multiple child elements which may or may not prevent closing.
+ </summary>
+ <typeparam name="T">The type of child element.</typeparam>
+ </member>
+ <member name="M:Caliburn.Micro.DefaultCloseStrategy`1.#ctor(System.Boolean)">
+ <summary>
+ Creates an instance of the class.
+ </summary>
+ <param name="closeConductedItemsWhenConductorCannotClose">Indicates that even if all conducted items are not closable, those that are should be closed. The default is FALSE.</param>
+ </member>
+ <member name="M:Caliburn.Micro.DefaultCloseStrategy`1.Execute(System.Collections.Generic.IEnumerable{`0},System.Action{System.Boolean,System.Collections.Generic.IEnumerable{`0}})">
+ <summary>
+ Executes the strategy.
 </summary>
+ <param name="toClose">Items that are requesting close.</param>
+ <param name="callback">The action to call when all enumeration is complete and the close results are aggregated.
+ The bool indicates whether close can occur. The enumerable indicates which children should close if the parent cannot.</param>
 </member>
 <member name="T:Caliburn.Micro.ElementConvention">
 <summary>
@@ -1670,511 +1520,620 @@
 </summary>
 <remarks>Pass the view model type, property path, property instance, framework element and its convention.</remarks>
 </member>
- <member name="T:Caliburn.Micro.Coroutine">
+ <member name="T:Caliburn.Micro.IHandle`1">
 <summary>
- Manages coroutine execution.
+ Denotes a class which can handle a particular type of message.
 </summary>
+ <typeparam name = "TMessage">The type of message to handle.</typeparam>
 </member>
- <member name="F:Caliburn.Micro.Coroutine.CreateParentEnumerator">
+ <member name="M:Caliburn.Micro.IHandle`1.Handle(`0)">
 <summary>
- Creates the parent enumerator.
+ Handles the message.
 </summary>
+ <param name = "message">The message.</param>
 </member>
- <member name="M:Caliburn.Micro.Coroutine.BeginExecute(System.Collections.Generic.IEnumerator{Caliburn.Micro.IResult},Caliburn.Micro.ActionExecutionContext,System.EventHandler{Caliburn.Micro.ResultCompletionEventArgs})">
+ <member name="T:Caliburn.Micro.IEventAggregator">
 <summary>
- Executes a coroutine.
+ Enables loosely-coupled publication of and subscription to events.
 </summary>
- <param name="coroutine">The coroutine to execute.</param>
- <param name="context">The context to execute the coroutine within.</param>
- /// <param name="callback">The completion callback for the coroutine.</param>
 </member>
- <member name="E:Caliburn.Micro.Coroutine.Completed">
+ <member name="M:Caliburn.Micro.IEventAggregator.HandlerExistsFor(System.Type)">
 <summary>
- Called upon completion of a coroutine.
+ Searches the subscribed handlers to check if we have a handler for
+ the message type supplied.
 </summary>
+ <param name="messageType">The message type to check with</param>
+ <returns>True if any handler is found, false if not.</returns>
 </member>
- <member name="T:Caliburn.Micro.ViewLocator">
+ <member name="M:Caliburn.Micro.IEventAggregator.Subscribe(System.Object)">
 <summary>
- A strategy for determining which view to use for a given model.
+ Subscribes an instance to all events declared through implementations of <see cref="T:Caliburn.Micro.IHandle`1"/>
 </summary>
+ <param name="subscriber">The instance to subscribe for event publication.</param>
 </member>
- <member name="F:Caliburn.Micro.ViewLocator.NameTransformer">
+ <member name="M:Caliburn.Micro.IEventAggregator.Unsubscribe(System.Object)">
 <summary>
- Used to transform names.
+ Unsubscribes the instance from all events.
 </summary>
+ <param name = "subscriber">The instance to unsubscribe.</param>
 </member>
- <member name="F:Caliburn.Micro.ViewLocator.ContextSeparator">
+ <member name="M:Caliburn.Micro.IEventAggregator.Publish(System.Object)">
 <summary>
- Separator used when resolving View names for context instances.
+ Publishes a message.
 </summary>
+ <param name = "message">The message instance.</param>
+ <remarks>
+ Uses the default thread marshaller during publication.
+ </remarks>
 </member>
- <member name="M:Caliburn.Micro.ViewLocator.ConfigureTypeMappings(Caliburn.Micro.TypeMappingConfiguration)">
+ <member name="M:Caliburn.Micro.IEventAggregator.Publish(System.Object,System.Action{System.Action})">
 <summary>
- Specifies how type mappings are created, including default type mappings. Calling this method will
- clear all existing name transformation rules and create new default type mappings according to the
- configuration.
+ Publishes a message.
 </summary>
- <param name="config">An instance of TypeMappingConfiguration that provides the settings for configuration</param>
+ <param name = "message">The message instance.</param>
+ <param name = "marshal">Allows the publisher to provide a custom thread marshaller for the message publication.</param>
 </member>
- <member name="M:Caliburn.Micro.ViewLocator.AddDefaultTypeMapping(System.String)">
+ <member name="P:Caliburn.Micro.IEventAggregator.PublicationThreadMarshaller">
 <summary>
- Adds a default type mapping using the standard namespace mapping convention
+ Gets or sets the default publication thread marshaller.
 </summary>
- <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ <value>
+ The default publication thread marshaller.
+ </value>
 </member>
- <member name="M:Caliburn.Micro.ViewLocator.RegisterViewSuffix(System.String)">
+ <member name="T:Caliburn.Micro.EventAggregator">
 <summary>
- This method registers a View suffix or synonym so that View Context resolution works properly.
- It is automatically called internally when calling AddNamespaceMapping(), AddDefaultTypeMapping(),
- or AddTypeMapping(). It should not need to be called explicitly unless a rule that handles synonyms
- is added directly through the NameTransformer.
+ Enables loosely-coupled publication of and subscription to events.
 </summary>
- <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View".</param>
 </member>
- <member name="M:Caliburn.Micro.ViewLocator.AddTypeMapping(System.String,System.String,System.String[],System.String)">
+ <member name="F:Caliburn.Micro.EventAggregator.DefaultPublicationThreadMarshaller">
 <summary>
- Adds a standard type mapping based on namespace RegEx replace and filter patterns
+ The default thread marshaller used for publication;
 </summary>
- <param name="nsSourceReplaceRegEx">RegEx replace pattern for source namespace</param>
- <param name="nsSourceFilterRegEx">RegEx filter pattern for source namespace</param>
- <param name="nsTargetsRegEx">Array of RegEx replace values for target namespaces</param>
- <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
 </member>
- <member name="M:Caliburn.Micro.ViewLocator.AddTypeMapping(System.String,System.String,System.String,System.String)">
+ <member name="F:Caliburn.Micro.EventAggregator.HandlerResultProcessing">
 <summary>
- Adds a standard type mapping based on namespace RegEx replace and filter patterns
+ Processing of handler results on publication thread.
 </summary>
- <param name="nsSourceReplaceRegEx">RegEx replace pattern for source namespace</param>
- <param name="nsSourceFilterRegEx">RegEx filter pattern for source namespace</param>
- <param name="nsTargetRegEx">RegEx replace value for target namespace</param>
- <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
 </member>
- <member name="M:Caliburn.Micro.ViewLocator.AddNamespaceMapping(System.String,System.String[],System.String)">
+ <member name="M:Caliburn.Micro.EventAggregator.#ctor">
 <summary>
- Adds a standard type mapping based on simple namespace mapping
+ Initializes a new instance of the <see cref="T:Caliburn.Micro.EventAggregator"/> class.
 </summary>
- <param name="nsSource">Namespace of source type</param>
- <param name="nsTargets">Namespaces of target type as an array</param>
- <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
 </member>
- <member name="M:Caliburn.Micro.ViewLocator.AddNamespaceMapping(System.String,System.String,System.String)">
+ <member name="M:Caliburn.Micro.EventAggregator.HandlerExistsFor(System.Type)">
 <summary>
- Adds a standard type mapping based on simple namespace mapping
+ Searches the subscribed handlers to check if we have a handler for
+ the message type supplied.
 </summary>
- <param name="nsSource">Namespace of source type</param>
- <param name="nsTarget">Namespace of target type</param>
- <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ <param name="messageType">The message type to check with</param>
+ <returns>True if any handler is found, false if not.</returns>
 </member>
- <member name="M:Caliburn.Micro.ViewLocator.AddSubNamespaceMapping(System.String,System.String[],System.String)">
+ <member name="M:Caliburn.Micro.EventAggregator.Subscribe(System.Object)">
 <summary>
- Adds a standard type mapping by substituting one subnamespace for another
+ Subscribes an instance to all events declared through implementations of <see cref="T:Caliburn.Micro.IHandle`1"/>
 </summary>
- <param name="nsSource">Subnamespace of source type</param>
- <param name="nsTargets">Subnamespaces of target type as an array</param>
- <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ <param name="subscriber">The instance to subscribe for event publication.</param>
 </member>
- <member name="M:Caliburn.Micro.ViewLocator.AddSubNamespaceMapping(System.String,System.String,System.String)">
+ <member name="M:Caliburn.Micro.EventAggregator.Unsubscribe(System.Object)">
 <summary>
- Adds a standard type mapping by substituting one subnamespace for another
+ Unsubscribes the instance from all events.
 </summary>
- <param name="nsSource">Subnamespace of source type</param>
- <param name="nsTarget">Subnamespace of target type</param>
- <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ <param name = "subscriber">The instance to unsubscribe.</param>
 </member>
- <member name="F:Caliburn.Micro.ViewLocator.GetOrCreateViewType">
+ <member name="M:Caliburn.Micro.EventAggregator.Publish(System.Object)">
 <summary>
- Retrieves the view from the IoC container or tries to create it if not found.
+ Publishes a message.
 </summary>
+ <param name = "message">The message instance.</param>
 <remarks>
- Pass the type of view as a parameter and recieve an instance of the view.
+ Does not marshall the the publication to any special thread by default.
 </remarks>
 </member>
- <member name="F:Caliburn.Micro.ViewLocator.ModifyModelTypeAtDesignTime">
+ <member name="M:Caliburn.Micro.EventAggregator.Publish(System.Object,System.Action{System.Action})">
 <summary>
- Modifies the name of the type to be used at design time.
+ Publishes a message.
 </summary>
+ <param name = "message">The message instance.</param>
+ <param name = "marshal">Allows the publisher to provide a custom thread marshaller for the message publication.</param>
 </member>
- <member name="F:Caliburn.Micro.ViewLocator.TransformName">
+ <member name="P:Caliburn.Micro.EventAggregator.PublicationThreadMarshaller">
 <summary>
- Transforms a ViewModel type name into all of its possible View type names. Optionally accepts an instance
- of context object
+ Gets or sets the default publication thread marshaller.
 </summary>
- <returns>Enumeration of transformed names</returns>
- <remarks>Arguments:
- typeName = The name of the ViewModel type being resolved to its companion View.
- context = An instance of the context or null.
- </remarks>
+ <value>
+ The default publication thread marshaller.
+ </value>
 </member>
- <member name="F:Caliburn.Micro.ViewLocator.LocateTypeForModelType">
+ <member name="T:Caliburn.Micro.ExtensionMethods">
 <summary>
- Locates the view type based on the specified model type.
+ Generic extension methods used by the framework.
 </summary>
- <returns>The view.</returns>
- <remarks>
- Pass the model type, display location (or null) and the context instance (or null) as parameters and receive a view type.
- </remarks>
 </member>
- <member name="F:Caliburn.Micro.ViewLocator.LocateForModelType">
+ <member name="M:Caliburn.Micro.ExtensionMethods.GetAssemblyName(System.Reflection.Assembly)">
 <summary>
- Locates the view for the specified model type.
+ Get's the name of the assembly.
 </summary>
- <returns>The view.</returns>
- <remarks>
- Pass the model type, display location (or null) and the context instance (or null) as parameters and receive a view instance.
- </remarks>
+ <param name="assembly">The assembly.</param>
+ <returns>The assembly's name.</returns>
 </member>
- <member name="F:Caliburn.Micro.ViewLocator.LocateForModel">
+ <member name="M:Caliburn.Micro.ExtensionMethods.GetAttributes``1(System.Reflection.MemberInfo,System.Boolean)">
 <summary>
- Locates the view for the specified model instance.
+ Gets all the attributes of a particular type.
 </summary>
- <returns>The view.</returns>
- <remarks>
- Pass the model instance, display location (or null) and the context (or null) as parameters and receive a view instance.
- </remarks>
+ <typeparam name="T">The type of attributes to get.</typeparam>
+ <param name="member">The member to inspect for attributes.</param>
+ <param name="inherit">Whether or not to search for inherited attributes.</param>
+ <returns>The list of attributes found.</returns>
 </member>
- <member name="F:Caliburn.Micro.ViewLocator.DeterminePackUriFromType">
+ <member name="M:Caliburn.Micro.ExtensionMethods.Apply``1(System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
 <summary>
- Transforms a view type into a pack uri.
+ Applies the action to each element in the list.
 </summary>
+ <typeparam name="T">The enumerable item's type.</typeparam>
+ <param name="enumerable">The elements to enumerate.</param>
+ <param name="action">The action to apply to each item in the list.</param>
 </member>
- <member name="M:Caliburn.Micro.ViewLocator.InitializeComponent(System.Object)">
+ <member name="M:Caliburn.Micro.ExtensionMethods.GetMemberInfo(System.Linq.Expressions.Expression)">
 <summary>
- When a view does not contain a code-behind file, we need to automatically call InitializeCompoent.
+ Converts an expression into a <see cref="T:System.Reflection.MemberInfo"/>.
 </summary>
- <param name = "element">The element to initialize</param>
+ <param name="expression">The expression to convert.</param>
+ <returns>The member info.</returns>
 </member>
- <member name="T:Caliburn.Micro.MessageBinder">
+ <member name="T:Caliburn.Micro.IChild`1">
 <summary>
- A service that is capable of properly binding values to a method's parameters and creating instances of <see cref="T:Caliburn.Micro.IResult"/>.
+ Denotes a node within a parent/child hierarchy.
 </summary>
+ <typeparam name="TParent">The type of parent.</typeparam>
 </member>
- <member name="F:Caliburn.Micro.MessageBinder.SpecialValues">
+ <member name="P:Caliburn.Micro.IChild`1.Parent">
 <summary>
- The special parameter values recognized by the message binder along with their resolvers.
+ Gets or Sets the Parent
 </summary>
 </member>
- <member name="F:Caliburn.Micro.MessageBinder.CustomConverters">
+ <member name="T:Caliburn.Micro.Execute">
 <summary>
- Custom converters used by the framework registered by destination type for which they will be selected.
- The converter is passed the existing value to convert and a "context" object.
+ Enables easy marshalling of code to the UI thread.
 </summary>
 </member>
- <member name="M:Caliburn.Micro.MessageBinder.DetermineParameters(Caliburn.Micro.ActionExecutionContext,System.Reflection.ParameterInfo[])">
+ <member name="M:Caliburn.Micro.Execute.InitializeWithDispatcher">
 <summary>
- Determines the parameters that a method should be invoked with.
+ Initializes the framework using the current dispatcher.
 </summary>
- <param name="context">The action execution context.</param>
- <param name="requiredParameters">The parameters required to complete the invocation.</param>
- <returns>The actual parameter values.</returns>
 </member>
- <member name="F:Caliburn.Micro.MessageBinder.EvaluateParameter">
+ <member name="M:Caliburn.Micro.Execute.ResetWithoutDispatcher">
 <summary>
- Transforms the textual parameter into the actual parameter.
+ Resets the executor to use a non-dispatcher-based action executor.
 </summary>
 </member>
- <member name="M:Caliburn.Micro.MessageBinder.CoerceValue(System.Type,System.Object,System.Object)">
+ <member name="M:Caliburn.Micro.Execute.SetUIThreadMarshaller(System.Action{System.Action})">
 <summary>
- Coerces the provided value to the destination type.
+ Sets a custom UI thread marshaller.
 </summary>
- <param name="destinationType">The destination type.</param>
- <param name="providedValue">The provided value.</param>
- <param name="context">An optional context value which can be used during conversion.</param>
- <returns>The coerced value.</returns>
+ <param name="marshaller">The marshaller.</param>
 </member>
- <member name="M:Caliburn.Micro.MessageBinder.GetDefaultValue(System.Type)">
+ <member name="M:Caliburn.Micro.Execute.BeginOnUIThread(System.Action)">
 <summary>
- Gets the default value for a type.
+ Executes the action on the UI thread asynchronously.
 </summary>
- <param name="type">The type.</param>
- <returns>The default value.</returns>
+ <param name="action">The action to execute.</param>
 </member>
- <member name="T:Caliburn.Micro.ICloseStrategy`1">
+ <member name="M:Caliburn.Micro.Execute.OnUIThreadAsync(System.Action)">
 <summary>
- Used to gather the results from multiple child elements which may or may not prevent closing.
+ Executes the action on the UI thread asynchronously.
 </summary>
- <typeparam name="T">The type of child element.</typeparam>
+ <param name = "action">The action to execute.</param>
 </member>
- <member name="M:Caliburn.Micro.ICloseStrategy`1.Execute(System.Collections.Generic.IEnumerable{`0},System.Action{System.Boolean,System.Collections.Generic.IEnumerable{`0}})">
+ <member name="M:Caliburn.Micro.Execute.OnUIThread(System.Action)">
 <summary>
- Executes the strategy.
+ Executes the action on the UI thread.
 </summary>
- <param name="toClose">Items that are requesting close.</param>
- <param name="callback">The action to call when all enumeration is complete and the close results are aggregated.
- The bool indicates whether close can occur. The enumerable indicates which children should close if the parent cannot.</param>
+ <param name = "action">The action to execute.</param>
 </member>
- <member name="T:Caliburn.Micro.DefaultCloseStrategy`1">
+ <member name="P:Caliburn.Micro.Execute.InDesignMode">
 <summary>
- Used to gather the results from multiple child elements which may or may not prevent closing.
+ Indicates whether or not the framework is in design-time mode.
 </summary>
- <typeparam name="T">The type of child element.</typeparam>
 </member>
- <member name="M:Caliburn.Micro.DefaultCloseStrategy`1.#ctor(System.Boolean)">
+ <member name="T:Caliburn.Micro.IObservableCollection`1">
 <summary>
- Creates an instance of the class.
+ Represents a collection that is observable.
 </summary>
- <param name="closeConductedItemsWhenConductorCannotClose">Indicates that even if all conducted items are not closable, those that are should be closed. The default is FALSE.</param>
+ <typeparam name = "T">The type of elements contained in the collection.</typeparam>
 </member>
- <member name="M:Caliburn.Micro.DefaultCloseStrategy`1.Execute(System.Collections.Generic.IEnumerable{`0},System.Action{System.Boolean,System.Collections.Generic.IEnumerable{`0}})">
+ <member name="M:Caliburn.Micro.IObservableCollection`1.AddRange(System.Collections.Generic.IEnumerable{`0})">
 <summary>
- Executes the strategy.
+ Adds the range.
 </summary>
- <param name="toClose">Items that are requesting close.</param>
- <param name="callback">The action to call when all enumeration is complete and the close results are aggregated.
- The bool indicates whether close can occur. The enumerable indicates which children should close if the parent cannot.</param>
+ <param name = "items">The items.</param>
 </member>
- <member name="T:Caliburn.Micro.IHandle">
+ <member name="M:Caliburn.Micro.IObservableCollection`1.RemoveRange(System.Collections.Generic.IEnumerable{`0})">
 <summary>
- A marker interface for classes that subscribe to messages.
+ Removes the range.
 </summary>
+ <param name = "items">The items.</param>
 </member>
- <member name="T:Caliburn.Micro.IHandle`1">
+ <member name="T:Caliburn.Micro.BindableCollection`1">
 <summary>
- Denotes a class which can handle a particular type of message.
+ A base collection class that supports automatic UI thread marshalling.
 </summary>
- <typeparam name = "TMessage">The type of message to handle.</typeparam>
+ <typeparam name="T">The type of elements contained in the collection.</typeparam>
 </member>
- <member name="M:Caliburn.Micro.IHandle`1.Handle(`0)">
+ <member name="M:Caliburn.Micro.BindableCollection`1.#ctor">
 <summary>
- Handles the message.
+ Initializes a new instance of the <see cref="T:Caliburn.Micro.BindableCollection`1"/> class.
 </summary>
- <param name = "message">The message.</param>
 </member>
- <member name="T:Caliburn.Micro.IEventAggregator">
+ <member name="M:Caliburn.Micro.BindableCollection`1.#ctor(System.Collections.Generic.IEnumerable{`0})">
 <summary>
- Enables loosely-coupled publication of and subscription to events.
+ Initializes a new instance of the <see cref="T:Caliburn.Micro.BindableCollection`1"/> class.
 </summary>
+ <param name="collection">The collection from which the elements are copied.</param>
+ <exception cref="T:System.ArgumentNullException">
+ The <paramref name="collection"/> parameter cannot be null.
+ </exception>
 </member>
- <member name="M:Caliburn.Micro.IEventAggregator.Subscribe(System.Object)">
+ <member name="M:Caliburn.Micro.BindableCollection`1.NotifyOfPropertyChange(System.String)">
 <summary>
- Subscribes an instance to all events declared through implementations of <see cref="T:Caliburn.Micro.IHandle`1"/>
+ Notifies subscribers of the property change.
 </summary>
- <param name="instance">The instance to subscribe for event publication.</param>
+ <param name = "propertyName">Name of the property.</param>
 </member>
- <member name="M:Caliburn.Micro.IEventAggregator.Unsubscribe(System.Object)">
+ <member name="M:Caliburn.Micro.BindableCollection`1.Refresh">
 <summary>
- Unsubscribes the instance from all events.
+ Raises a change notification indicating that all bindings should be refreshed.
 </summary>
- <param name = "instance">The instance to unsubscribe.</param>
 </member>
- <member name="M:Caliburn.Micro.IEventAggregator.Publish(System.Object)">
+ <member name="M:Caliburn.Micro.BindableCollection`1.InsertItem(System.Int32,`0)">
 <summary>
- Publishes a message.
+ Inserts the item to the specified position.
 </summary>
- <param name = "message">The message instance.</param>
+ <param name = "index">The index to insert at.</param>
+ <param name = "item">The item to be inserted.</param>
+ </member>
+ <member name="M:Caliburn.Micro.BindableCollection`1.InsertItemBase(System.Int32,`0)">
+ <summary>
+ Exposes the base implementation of the <see cref="M:Caliburn.Micro.BindableCollection`1.InsertItem(System.Int32,`0)"/> function.
+ </summary>
+ <param name="index">The index.</param>
+ <param name="item">The item.</param>
 <remarks>
- Uses the default thread marshaller during publication.
+ Used to avoid compiler warning regarding unverifiable code.
 </remarks>
 </member>
- <member name="M:Caliburn.Micro.IEventAggregator.Publish(System.Object,System.Action{System.Action})">
+ <member name="M:Caliburn.Micro.BindableCollection`1.MoveItem(System.Int32,System.Int32)">
 <summary>
- Publishes a message.
+ Moves the item within the collection.
 </summary>
- <param name = "message">The message instance.</param>
- <param name = "marshal">Allows the publisher to provide a custom thread marshaller for the message publication.</param>
+ <param name="oldIndex">The old position of the item.</param>
+ <param name="newIndex">The new position of the item.</param>
 </member>
- <member name="P:Caliburn.Micro.IEventAggregator.PublicationThreadMarshaller">
+ <member name="M:Caliburn.Micro.BindableCollection`1.MoveItemBase(System.Int32,System.Int32)">
 <summary>
- Gets or sets the default publication thread marshaller.
+ Exposes the base implementation fo the <see cref="M:Caliburn.Micro.BindableCollection`1.MoveItem(System.Int32,System.Int32)"/> function.
 </summary>
- <value>
- The default publication thread marshaller.
- </value>
+ <param name="oldIndex">The old index.</param>
+ <param name="newIndex">The new index.</param>
+ <remarks>Used to avoid compiler warning regarding unverificable code.</remarks>
 </member>
- <member name="T:Caliburn.Micro.EventAggregator">
+ <member name="M:Caliburn.Micro.BindableCollection`1.SetItem(System.Int32,`0)">
 <summary>
- Enables loosely-coupled publication of and subscription to events.
+ Sets the item at the specified position.
 </summary>
+ <param name = "index">The index to set the item at.</param>
+ <param name = "item">The item to set.</param>
 </member>
- <member name="F:Caliburn.Micro.EventAggregator.DefaultPublicationThreadMarshaller">
+ <member name="M:Caliburn.Micro.BindableCollection`1.SetItemBase(System.Int32,`0)">
 <summary>
- The default thread marshaller used for publication;
+ Exposes the base implementation of the <see cref="M:Caliburn.Micro.BindableCollection`1.SetItem(System.Int32,`0)"/> function.
 </summary>
+ <param name="index">The index.</param>
+ <param name="item">The item.</param>
+ <remarks>
+ Used to avoid compiler warning regarding unverifiable code.
+ </remarks>
 </member>
- <member name="M:Caliburn.Micro.EventAggregator.#ctor">
+ <member name="M:Caliburn.Micro.BindableCollection`1.RemoveItem(System.Int32)">
 <summary>
- Initializes a new instance of the <see cref="T:Caliburn.Micro.EventAggregator"/> class.
+ Removes the item at the specified position.
 </summary>
+ <param name = "index">The position used to identify the item to remove.</param>
 </member>
- <member name="M:Caliburn.Micro.EventAggregator.Subscribe(System.Object)">
+ <member name="M:Caliburn.Micro.BindableCollection`1.RemoveItemBase(System.Int32)">
 <summary>
- Subscribes an instance to all events declared through implementations of <see cref="T:Caliburn.Micro.IHandle`1"/>
+ Exposes the base implementation of the <see cref="M:Caliburn.Micro.BindableCollection`1.RemoveItem(System.Int32)"/> function.
 </summary>
- <param name="instance">The instance to subscribe for event publication.</param>
+ <param name="index">The index.</param>
+ <remarks>
+ Used to avoid compiler warning regarding unverifiable code.
+ </remarks>
 </member>
- <member name="M:Caliburn.Micro.EventAggregator.Unsubscribe(System.Object)">
+ <member name="M:Caliburn.Micro.BindableCollection`1.ClearItems">
 <summary>
- Unsubscribes the instance from all events.
+ Clears the items contained by the collection.
 </summary>
- <param name = "instance">The instance to unsubscribe.</param>
 </member>
- <member name="M:Caliburn.Micro.EventAggregator.Publish(System.Object)">
+ <member name="M:Caliburn.Micro.BindableCollection`1.ClearItemsBase">
 <summary>
- Publishes a message.
+ Exposes the base implementation of the <see cref="M:Caliburn.Micro.BindableCollection`1.ClearItems"/> function.
 </summary>
- <param name = "message">The message instance.</param>
 <remarks>
- Does not marshall the the publication to any special thread by default.
+ Used to avoid compiler warning regarding unverifiable code.
 </remarks>
 </member>
- <member name="M:Caliburn.Micro.EventAggregator.Publish(System.Object,System.Action{System.Action})">
+ <member name="M:Caliburn.Micro.BindableCollection`1.OnCollectionChanged(System.Collections.Specialized.NotifyCollectionChangedEventArgs)">
 <summary>
- Publishes a message.
+ Raises the <see cref = "E:System.Collections.ObjectModel.ObservableCollection`1.CollectionChanged" /> event with the provided arguments.
 </summary>
- <param name = "message">The message instance.</param>
- <param name = "marshal">Allows the publisher to provide a custom thread marshaller for the message publication.</param>
+ <param name = "e">Arguments of the event being raised.</param>
 </member>
- <member name="P:Caliburn.Micro.EventAggregator.PublicationThreadMarshaller">
+ <member name="M:Caliburn.Micro.BindableCollection`1.OnPropertyChanged(System.ComponentModel.PropertyChangedEventArgs)">
 <summary>
- Gets or sets the default publication thread marshaller.
+ Raises the PropertyChanged event with the provided arguments.
 </summary>
- <value>
- The default publication thread marshaller.
- </value>
+ <param name = "e">The event data to report in the event.</param>
 </member>
- <member name="T:Caliburn.Micro.ViewAttachedEventArgs">
+ <member name="M:Caliburn.Micro.BindableCollection`1.AddRange(System.Collections.Generic.IEnumerable{`0})">
 <summary>
- The event args for the <see cref="E:Caliburn.Micro.IViewAware.ViewAttached"/> event.
+ Adds the range.
 </summary>
+ <param name = "items">The items.</param>
 </member>
- <member name="F:Caliburn.Micro.ViewAttachedEventArgs.View">
+ <member name="M:Caliburn.Micro.BindableCollection`1.RemoveRange(System.Collections.Generic.IEnumerable{`0})">
 <summary>
- The view.
+ Removes the range.
 </summary>
+ <param name = "items">The items.</param>
 </member>
- <member name="F:Caliburn.Micro.ViewAttachedEventArgs.Context">
+ <member name="M:Caliburn.Micro.BindableCollection`1.OnDeserialized(System.Runtime.Serialization.StreamingContext)">
 <summary>
- The context.
+ Called when the object is deserialized.
 </summary>
+ <param name="c">The streaming context.</param>
 </member>
- <member name="T:Caliburn.Micro.IChild`1">
+ <member name="M:Caliburn.Micro.BindableCollection`1.ShouldSerializeIsNotifying">
 <summary>
- Denotes a node within a parent/child hierarchy.
+ Used to indicate whether or not the IsNotifying property is serialized to Xml.
 </summary>
- <typeparam name="TParent">The type of parent.</typeparam>
+ <returns>Whether or not to serialize the IsNotifying property. The default is false.</returns>
 </member>
- <member name="P:Caliburn.Micro.IChild`1.Parent">
+ <member name="P:Caliburn.Micro.BindableCollection`1.IsNotifying">
 <summary>
- Gets or Sets the Parent
+ Enables/Disables property change notification.
 </summary>
 </member>
- <member name="T:Caliburn.Micro.ActionMessage">
+ <member name="T:Caliburn.Micro.IoC">
 <summary>
- Used to send a message from the UI to a presentation model class, indicating that a particular Action should be invoked.
+ Used by the framework to pull instances from an IoC container and to inject dependencies into certain existing classes.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.ActionMessage.EnforceGuardsDuringInvocation">
+ <member name="F:Caliburn.Micro.IoC.GetInstance">
 <summary>
- Causes the action invocation to "double check" if the action should be invoked by executing the guard immediately before hand.
+ Gets an instance by type and key.
 </summary>
- <remarks>This is disabled by default. If multiple actions are attached to the same element, you may want to enable this so that each individaul action checks its guard regardless of how the UI state appears.</remarks>
 </member>
- <member name="F:Caliburn.Micro.ActionMessage.ThrowsExceptions">
+ <member name="F:Caliburn.Micro.IoC.GetAllInstances">
 <summary>
- Causes the action to throw if it cannot locate the target or the method at invocation time.
+ Gets all instances of a particular type.
 </summary>
- <remarks>True by default.</remarks>
 </member>
- <member name="F:Caliburn.Micro.ActionMessage.MethodNameProperty">
+ <member name="F:Caliburn.Micro.IoC.BuildUp">
 <summary>
- Represents the method name of an action message.
+ Passes an existing instance to the IoC container to enable dependencies to be injected.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.ActionMessage.ParametersProperty">
+ <member name="M:Caliburn.Micro.IoC.Get``1(System.String)">
 <summary>
- Represents the parameters of an action message.
+ Gets an instance from the container.
 </summary>
+ <typeparam name="T">The type to resolve.</typeparam>
+ <param name="key">The key to look up.</param>
+ <returns>The resolved instance.</returns>
 </member>
- <member name="M:Caliburn.Micro.ActionMessage.#ctor">
+ <member name="M:Caliburn.Micro.IoC.GetAll``1">
 <summary>
- Creates an instance of <see cref="T:Caliburn.Micro.ActionMessage"/>.
+ Gets all instances of a particular type.
 </summary>
+ <typeparam name="T">The type to resolve.</typeparam>
+ <returns>The resolved instances.</returns>
 </member>
- <member name="M:Caliburn.Micro.ActionMessage.OnAttached">
+ <member name="T:Caliburn.Micro.IResult">
 <summary>
- Called after the action is attached to an AssociatedObject.
+ Allows custom code to execute after the return of a action.
 </summary>
 </member>
- <member name="M:Caliburn.Micro.ActionMessage.OnDetaching">
+ <member name="M:Caliburn.Micro.IResult.Execute(Caliburn.Micro.ActionExecutionContext)">
 <summary>
- Called when the action is being detached from its AssociatedObject, but before it has actually occurred.
+ Executes the result using the specified context.
 </summary>
+ <param name="context">The context.</param>
 </member>
- <member name="M:Caliburn.Micro.ActionMessage.Invoke(System.Object)">
+ <member name="E:Caliburn.Micro.IResult.Completed">
 <summary>
- Invokes the action.
+ Occurs when execution has completed.
 </summary>
- <param name="eventArgs">The parameter to the action. If the action does not require a parameter, the parameter may be set to a null reference.</param>
 </member>
- <member name="M:Caliburn.Micro.ActionMessage.UpdateAvailability">
+ <member name="T:Caliburn.Micro.IResult`1">
 <summary>
- Forces an update of the UI's Enabled/Disabled state based on the the preconditions associated with the method.
+ Allows custom code to execute after the return of a action.
 </summary>
+ <typeparam name="TResult">The type of the result.</typeparam>
 </member>
- <member name="M:Caliburn.Micro.ActionMessage.ToString">
+ <member name="P:Caliburn.Micro.IResult`1.Result">
 <summary>
- Returns a <see cref="T:System.String"/> that represents the current <see cref="T:System.Object"/>.
+ Gets the result of the asynchronous operation.
 </summary>
- <returns>
- A <see cref="T:System.String"/> that represents the current <see cref="T:System.Object"/>.
- </returns>
 </member>
- <member name="F:Caliburn.Micro.ActionMessage.InvokeAction">
+ <member name="T:Caliburn.Micro.ActivationEventArgs">
 <summary>
- Invokes the action using the specified <see cref="T:Caliburn.Micro.ActionExecutionContext"/>
+ EventArgs sent during activation.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.ActionMessage.ApplyAvailabilityEffect">
+ <member name="F:Caliburn.Micro.ActivationEventArgs.WasInitialized">
 <summary>
- Applies an availability effect, such as IsEnabled, to an element.
+ Indicates whether the sender was initialized in addition to being activated.
 </summary>
- <remarks>Returns a value indicating whether or not the action is available.</remarks>
 </member>
- <member name="F:Caliburn.Micro.ActionMessage.GetTargetMethod">
+ <member name="T:Caliburn.Micro.ActivationProcessedEventArgs">
 <summary>
- Finds the method on the target matching the specified message.
+ Contains details about the success or failure of an item's activation through an <see cref="T:Caliburn.Micro.IConductor"/>.
 </summary>
- <param name="target">The target.</param>
- <param name="message">The message.</param>
- <returns>The matching method, if available.</returns>
 </member>
- <member name="F:Caliburn.Micro.ActionMessage.SetMethodBinding">
+ <member name="F:Caliburn.Micro.ActivationProcessedEventArgs.Item">
 <summary>
- Sets the target, method and view on the context. Uses a bubbling strategy by default.
+ The item whose activation was processed.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.ActionMessage.PrepareContext">
+ <member name="F:Caliburn.Micro.ActivationProcessedEventArgs.Success">
 <summary>
- Prepares the action execution context for use.
+ Gets or sets a value indicating whether the activation was a success.
 </summary>
+ <value><c>true</c> if success; otherwise, <c>false</c>.</value>
 </member>
- <member name="M:Caliburn.Micro.ActionMessage.TryFindGuardMethod(Caliburn.Micro.ActionExecutionContext)">
+ <member name="T:Caliburn.Micro.DeactivationEventArgs">
 <summary>
- Try to find a candidate for guard function, having:
- 	- a name in the form "CanXXX"
- 	- no generic parameters
- 	- a bool return type
- 	- no parameters or a set of parameters corresponding to the action method
+ EventArgs sent during deactivation.
 </summary>
- <param name="context">The execution context</param>
- <returns>A MethodInfo, if found; null otherwise</returns>
 </member>
- <member name="P:Caliburn.Micro.ActionMessage.MethodName">
+ <member name="F:Caliburn.Micro.DeactivationEventArgs.WasClosed">
 <summary>
- Gets or sets the name of the method to be invoked on the presentation model class.
+ Indicates whether the sender was closed in addition to being deactivated.
 </summary>
- <value>The name of the method.</value>
 </member>
- <member name="P:Caliburn.Micro.ActionMessage.Parameters">
+ <member name="T:Caliburn.Micro.ViewAttachedEventArgs">
 <summary>
- Gets the parameters to pass as part of the method invocation.
+ The event args for the <see cref="E:Caliburn.Micro.IViewAware.ViewAttached"/> event.
 </summary>
- <value>The parameters.</value>
 </member>
- <member name="E:Caliburn.Micro.ActionMessage.Detaching">
+ <member name="F:Caliburn.Micro.ViewAttachedEventArgs.View">
 <summary>
- Occurs before the message detaches from the associated object.
+ The view.
+ </summary>
+ </member>
+ <member name="F:Caliburn.Micro.ViewAttachedEventArgs.Context">
+ <summary>
+ The context.
+ </summary>
+ </member>
+ <member name="T:Caliburn.Micro.ILog">
+ <summary>
+ A logger.
+ </summary>
+ </member>
+ <member name="M:Caliburn.Micro.ILog.Info(System.String,System.Object[])">
+ <summary>
+ Logs the message as info.
+ </summary>
+ <param name="format">A formatted message.</param>
+ <param name="args">Parameters to be injected into the formatted message.</param>
+ </member>
+ <member name="M:Caliburn.Micro.ILog.Warn(System.String,System.Object[])">
+ <summary>
+ Logs the message as a warning.
+ </summary>
+ <param name="format">A formatted message.</param>
+ <param name="args">Parameters to be injected into the formatted message.</param>
+ </member>
+ <member name="M:Caliburn.Micro.ILog.Error(System.Exception)">
+ <summary>
+ Logs the exception.
+ </summary>
+ <param name="exception">The exception.</param>
+ </member>
+ <member name="T:Caliburn.Micro.LogManager">
+ <summary>
+ Used to manage logging.
+ </summary>
+ </member>
+ <member name="F:Caliburn.Micro.LogManager.GetLog">
+ <summary>
+ Creates an <see cref="T:Caliburn.Micro.ILog"/> for the provided type.
+ </summary>
+ </member>
+ <member name="T:Caliburn.Micro.Message">
+ <summary>
+ Host's attached properties related to routed UI messaging.
+ </summary>
+ </member>
+ <member name="M:Caliburn.Micro.Message.SetHandler(System.Windows.DependencyObject,System.Object)">
+ <summary>
+ Places a message handler on this element.
+ </summary>
+ <param name="d"> The element. </param>
+ <param name="value"> The message handler. </param>
+ </member>
+ <member name="M:Caliburn.Micro.Message.GetHandler(System.Windows.DependencyObject)">
+ <summary>
+ Gets the message handler for this element.
+ </summary>
+ <param name="d"> The element. </param>
+ <returns> The message handler. </returns>
+ </member>
+ <member name="F:Caliburn.Micro.Message.AttachProperty">
+ <summary>
+ A property definition representing attached triggers and messages.
+ </summary>
+ </member>
+ <member name="M:Caliburn.Micro.Message.SetAttach(System.Windows.DependencyObject,System.String)">
+ <summary>
+ Sets the attached triggers and messages.
+ </summary>
+ <param name="d"> The element to attach to. </param>
+ <param name="attachText"> The parsable attachment text. </param>
+ </member>
+ <member name="M:Caliburn.Micro.Message.GetAttach(System.Windows.DependencyObject)">
+ <summary>
+ Gets the attached triggers and messages.
+ </summary>
+ <param name="d"> The element that was attached to. </param>
+ <returns> The parsable attachment text. </returns>
+ </member>
+ <member name="T:Caliburn.Micro.MessageBinder">
+ <summary>
+ A service that is capable of properly binding values to a method's parameters and creating instances of <see cref="T:Caliburn.Micro.IResult"/>.
+ </summary>
+ </member>
+ <member name="F:Caliburn.Micro.MessageBinder.SpecialValues">
+ <summary>
+ The special parameter values recognized by the message binder along with their resolvers.
+ </summary>
+ </member>
+ <member name="F:Caliburn.Micro.MessageBinder.CustomConverters">
+ <summary>
+ Custom converters used by the framework registered by destination type for which they will be selected.
+ The converter is passed the existing value to convert and a "context" object.
 </summary>
 </member>
+ <member name="M:Caliburn.Micro.MessageBinder.DetermineParameters(Caliburn.Micro.ActionExecutionContext,System.Reflection.ParameterInfo[])">
+ <summary>
+ Determines the parameters that a method should be invoked with.
+ </summary>
+ <param name="context">The action execution context.</param>
+ <param name="requiredParameters">The parameters required to complete the invocation.</param>
+ <returns>The actual parameter values.</returns>
+ </member>
+ <member name="F:Caliburn.Micro.MessageBinder.EvaluateParameter">
+ <summary>
+ Transforms the textual parameter into the actual parameter.
+ </summary>
+ </member>
+ <member name="M:Caliburn.Micro.MessageBinder.CoerceValue(System.Type,System.Object,System.Object)">
+ <summary>
+ Coerces the provided value to the destination type.
+ </summary>
+ <param name="destinationType">The destination type.</param>
+ <param name="providedValue">The provided value.</param>
+ <param name="context">An optional context value which can be used during conversion.</param>
+ <returns>The coerced value.</returns>
+ </member>
+ <member name="M:Caliburn.Micro.MessageBinder.GetDefaultValue(System.Type)">
+ <summary>
+ Gets the default value for a type.
+ </summary>
+ <param name="type">The type.</param>
+ <returns>The default value.</returns>
+ </member>
 <member name="T:Caliburn.Micro.NameTransformer">
 <summary>
 Class for managing the list of rules for doing name transformation.
@@ -2236,99 +2195,101 @@
 The list of replacement values
 </summary>
 </member>
- <member name="T:Caliburn.Micro.ActivationEventArgs">
- <summary>
- EventArgs sent during activation.
- </summary>
- </member>
- <member name="F:Caliburn.Micro.ActivationEventArgs.WasInitialized">
- <summary>
- Indicates whether the sender was initialized in addition to being activated.
- </summary>
- </member>
- <member name="T:Caliburn.Micro.ActivationProcessedEventArgs">
- <summary>
- Contains details about the success or failure of an item's activation through an <see cref="T:Caliburn.Micro.IConductor"/>.
- </summary>
- </member>
- <member name="F:Caliburn.Micro.ActivationProcessedEventArgs.Item">
+ <member name="T:Caliburn.Micro.Parser">
 <summary>
- The item whose activation was processed.
+ Parses text into a fully functional set of <see cref="T:System.Windows.Interactivity.TriggerBase"/> instances with <see cref="T:Caliburn.Micro.ActionMessage"/>.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.ActivationProcessedEventArgs.Success">
+ <member name="M:Caliburn.Micro.Parser.Parse(System.Windows.DependencyObject,System.String)">
 <summary>
- Gets or sets a value indicating whether the activation was a success.
+ Parses the specified message text.
 </summary>
- <value><c>true</c> if success; otherwise, <c>false</c>.</value>
+ <param name="target">The target.</param>
+ <param name="text">The message text.</param>
+ <returns>The triggers parsed from the text.</returns>
 </member>
- <member name="T:Caliburn.Micro.DeactivationEventArgs">
+ <member name="F:Caliburn.Micro.Parser.CreateTrigger">
 <summary>
- EventArgs sent during deactivation.
+ The function used to generate a trigger.
 </summary>
+ <remarks>The parameters passed to the method are the the target of the trigger and string representing the trigger.</remarks>
 </member>
- <member name="F:Caliburn.Micro.DeactivationEventArgs.WasClosed">
+ <member name="M:Caliburn.Micro.Parser.CreateMessage(System.Windows.DependencyObject,System.String)">
 <summary>
- Indicates whether the sender was closed in addition to being deactivated.
+ Creates an instance of <see cref="T:Caliburn.Micro.ActionMessage"/> by parsing out the textual dsl.
 </summary>
+ <param name="target">The target of the message.</param>
+ <param name="messageText">The textual message dsl.</param>
+ <returns>The created message.</returns>
 </member>
- <member name="T:Caliburn.Micro.ActionExecutionContext">
+ <member name="F:Caliburn.Micro.Parser.InterpretMessageText">
 <summary>
- The context used during the execution of an Action or its guard.
+ Function used to parse a string identified as a message.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.ActionExecutionContext.CanExecute">
+ <member name="F:Caliburn.Micro.Parser.CreateParameter">
 <summary>
- Determines whether the action can execute.
+ Function used to parse a string identified as a message parameter.
 </summary>
- <remarks>Returns true if the action can execute, false otherwise.</remarks>
 </member>
- <member name="F:Caliburn.Micro.ActionExecutionContext.EventArgs">
+ <member name="M:Caliburn.Micro.Parser.BindParameter(System.Windows.FrameworkElement,Caliburn.Micro.Parameter,System.String,System.String,System.Windows.Data.BindingMode)">
 <summary>
- Any event arguments associated with the action's invocation.
+ Creates a binding on a <see cref="T:Caliburn.Micro.Parameter"/>.
 </summary>
+ <param name="target">The target to which the message is applied.</param>
+ <param name="parameter">The parameter object.</param>
+ <param name="elementName">The name of the element to bind to.</param>
+ <param name="path">The path of the element to bind to.</param>
+ <param name="bindingMode">The binding mode to use.</param>
 </member>
- <member name="F:Caliburn.Micro.ActionExecutionContext.Method">
+ <member name="T:Caliburn.Micro.RegExHelper">
 <summary>
- The actual method info to be invoked.
+ Helper class for encoding strings to regular expression patterns
 </summary>
 </member>
- <member name="M:Caliburn.Micro.ActionExecutionContext.Dispose">
+ <member name="F:Caliburn.Micro.RegExHelper.NameRegEx">
 <summary>
- Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+ Regular expression pattern for valid name
 </summary>
 </member>
- <member name="P:Caliburn.Micro.ActionExecutionContext.Message">
+ <member name="F:Caliburn.Micro.RegExHelper.SubNamespaceRegEx">
 <summary>
- The message being executed.
+ Regular expression pattern for subnamespace (including dot)
 </summary>
 </member>
- <member name="P:Caliburn.Micro.ActionExecutionContext.Source">
+ <member name="F:Caliburn.Micro.RegExHelper.NamespaceRegEx">
 <summary>
- The source from which the message originates.
+ Regular expression pattern for namespace or namespace fragment
 </summary>
 </member>
- <member name="P:Caliburn.Micro.ActionExecutionContext.Target">
+ <member name="M:Caliburn.Micro.RegExHelper.GetCaptureGroup(System.String,System.String)">
 <summary>
- The instance on which the action is invoked.
+ Creates a named capture group with the specified regular expression 
 </summary>
+ <param name="groupName">Name of capture group to create</param>
+ <param name="regEx">Regular expression pattern to capture</param>
+ <returns>Regular expression capture group with the specified group name</returns>
 </member>
- <member name="P:Caliburn.Micro.ActionExecutionContext.View">
+ <member name="M:Caliburn.Micro.RegExHelper.NamespaceToRegEx(System.String)">
 <summary>
- The view associated with the target.
+ Converts a namespace (including wildcards) to a regular expression string
 </summary>
+ <param name="srcNamespace">Source namespace to convert to regular expression</param>
+ <returns>Namespace converted to a regular expression</returns>
 </member>
- <member name="P:Caliburn.Micro.ActionExecutionContext.Item(System.String)">
+ <member name="M:Caliburn.Micro.RegExHelper.GetNameCaptureGroup(System.String)">
 <summary>
- Gets or sets additional data needed to invoke the action.
+ Creates a capture group for a valid name regular expression pattern
 </summary>
- <param name="key">The data key.</param>
- <returns>Custom data associated with the context.</returns>
+ <param name="groupName">Name of capture group to create</param>
+ <returns>Regular expression capture group with the specified group name</returns>
 </member>
- <member name="E:Caliburn.Micro.ActionExecutionContext.Disposing">
+ <member name="M:Caliburn.Micro.RegExHelper.GetNamespaceCaptureGroup(System.String)">
 <summary>
- Called when the execution context is disposed
+ Creates a capture group for a namespace regular expression pattern
 </summary>
+ <param name="groupName">Name of capture group to create</param>
+ <returns>Regular expression capture group with the specified group name</returns>
 </member>
 <member name="T:Caliburn.Micro.ResultCompletionEventArgs">
 <summary>
@@ -2347,277 +2308,284 @@
 </summary>
 <value><c>true</c> if cancelled; otherwise, <c>false</c>.</value>
 </member>
- <member name="T:Caliburn.Micro.BindingScope">
+ <member name="T:Caliburn.Micro.ScreenExtensions">
 <summary>
- Provides methods for searching a given scope for named elements.
+ Hosts extension methods for <see cref="T:Caliburn.Micro.IScreen"/> classes.
 </summary>
 </member>
- <member name="M:Caliburn.Micro.BindingScope.FindName(System.Collections.Generic.IEnumerable{System.Windows.FrameworkElement},System.String)">
+ <member name="M:Caliburn.Micro.ScreenExtensions.TryActivate(System.Object)">
 <summary>
- Searches through the list of named elements looking for a case-insensitive match.
+ Activates the item if it implements <see cref="T:Caliburn.Micro.IActivate"/>, otherwise does nothing.
 </summary>
- <param name="elementsToSearch">The named elements to search through.</param>
- <param name="name">The name to search for.</param>
- <returns>The named element or null if not found.</returns>
+ <param name="potentialActivatable">The potential activatable.</param>
 </member>
- <member name="F:Caliburn.Micro.BindingScope.GetNamedElements">
+ <member name="M:Caliburn.Micro.ScreenExtensions.TryDeactivate(System.Object,System.Boolean)">
 <summary>
- Gets all the <see cref="T:System.Windows.FrameworkElement"/> instances with names in the scope.
+ Deactivates the item if it implements <see cref="T:Caliburn.Micro.IDeactivate"/>, otherwise does nothing.
 </summary>
- <returns>Named <see cref="T:System.Windows.FrameworkElement"/> instances in the provided scope.</returns>
- <remarks>Pass in a <see cref="T:System.Windows.DependencyObject"/> and receive a list of named <see cref="T:System.Windows.FrameworkElement"/> instances in the same scope.</remarks>
+ <param name="potentialDeactivatable">The potential deactivatable.</param>
+ <param name="close">Indicates whether or not to close the item after deactivating it.</param>
 </member>
- <member name="T:Caliburn.Micro.IWindowManager">
+ <member name="M:Caliburn.Micro.ScreenExtensions.CloseItem(Caliburn.Micro.IConductor,System.Object)">
 <summary>
- A service that manages windows.
+ Closes the specified item.
 </summary>
+ <param name="conductor">The conductor.</param>
+ <param name="item">The item to close.</param>
 </member>
- <member name="M:Caliburn.Micro.IWindowManager.ShowDialog(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <member name="M:Caliburn.Micro.ScreenExtensions.CloseItem``1(Caliburn.Micro.ConductorBase{``0},``0)">
 <summary>
- Shows a modal dialog for the specified model.
+ Closes the specified item.
 </summary>
- <param name="rootModel">The root model.</param>
- <param name="context">The context.</param>
- <param name="settings">The optional dialog settings.</param>
- <returns>The dialog result.</returns>
+ <param name="conductor">The conductor.</param>
+ <param name="item">The item to close.</param>
 </member>
- <member name="M:Caliburn.Micro.IWindowManager.ShowWindow(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <member name="M:Caliburn.Micro.ScreenExtensions.ActivateWith(Caliburn.Micro.IActivate,Caliburn.Micro.IActivate)">
 <summary>
- Shows a non-modal window for the specified model.
+ Activates a child whenever the specified parent is activated.
 </summary>
- <param name="rootModel">The root model.</param>
- <param name="context">The context.</param>
- <param name="settings">The optional window settings.</param>
+ <param name="child">The child to activate.</param>
+ <param name="parent">The parent whose activation triggers the child's activation.</param>
 </member>
- <member name="M:Caliburn.Micro.IWindowManager.ShowPopup(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <member name="M:Caliburn.Micro.ScreenExtensions.DeactivateWith(Caliburn.Micro.IDeactivate,Caliburn.Micro.IDeactivate)">
 <summary>
- Shows a popup at the current mouse position.
+ Deactivates a child whenever the specified parent is deactivated.
 </summary>
- <param name="rootModel">The root model.</param>
- <param name="context">The view context.</param>
- <param name="settings">The optional popup settings.</param>
+ <param name="child">The child to deactivate.</param>
+ <param name="parent">The parent whose deactivation triggers the child's deactivation.</param>
 </member>
- <member name="T:Caliburn.Micro.WindowManager">
+ <member name="M:Caliburn.Micro.ScreenExtensions.ConductWith``2(``0,``1)">
 <summary>
- A service that manages windows.
+ Activates and Deactivates a child whenever the specified parent is Activated or Deactivated.
 </summary>
+ <param name="child">The child to activate/deactivate.</param>
+ <param name="parent">The parent whose activation/deactivation triggers the child's activation/deactivation.</param>
 </member>
- <member name="M:Caliburn.Micro.WindowManager.ShowDialog(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <member name="T:Caliburn.Micro.SequentialResult">
 <summary>
- Shows a modal dialog for the specified model.
+ An implementation of <see cref="T:Caliburn.Micro.IResult"/> that enables sequential execution of multiple results.
 </summary>
- <param name="rootModel">The root model.</param>
- <param name="context">The context.</param>
- <param name="settings">The dialog popup settings.</param>
- <returns>The dialog result.</returns>
 </member>
- <member name="M:Caliburn.Micro.WindowManager.ShowWindow(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <member name="M:Caliburn.Micro.SequentialResult.#ctor(System.Collections.Generic.IEnumerator{Caliburn.Micro.IResult})">
 <summary>
- Shows a window for the specified model.
+ Initializes a new instance of the <see cref="T:Caliburn.Micro.SequentialResult"/> class.
 </summary>
- <param name="rootModel">The root model.</param>
- <param name="context">The context.</param>
- <param name="settings">The optional window settings.</param>
+ <param name="enumerator">The enumerator.</param>
 </member>
- <member name="M:Caliburn.Micro.WindowManager.ShowPopup(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <member name="M:Caliburn.Micro.SequentialResult.Execute(Caliburn.Micro.ActionExecutionContext)">
 <summary>
- Shows a popup at the current mouse position.
+ Executes the result using the specified context.
 </summary>
- <param name="rootModel">The root model.</param>
- <param name="context">The view context.</param>
- <param name="settings">The optional popup settings.</param>
+ <param name = "context">The context.</param>
 </member>
- <member name="M:Caliburn.Micro.WindowManager.CreatePopup(System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <member name="E:Caliburn.Micro.SequentialResult.Completed">
 <summary>
- Creates a popup for hosting a popup window.
+ Occurs when execution has completed.
 </summary>
- <param name="rootModel">The model.</param>
- <param name="settings">The optional popup settings.</param>
- <returns>The popup.</returns>
 </member>
- <member name="M:Caliburn.Micro.WindowManager.CreateWindow(System.Object,System.Boolean,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <member name="T:Caliburn.Micro.SimpleContainer">
 <summary>
- Creates a window.
+ A simple IoC container.
 </summary>
- <param name="rootModel">The view model.</param>
- <param name="isDialog">Whethor or not the window is being shown as a dialog.</param>
- <param name="context">The view context.</param>
- <param name="settings">The optional popup settings.</param>
- <returns>The window.</returns>
 </member>
- <member name="M:Caliburn.Micro.WindowManager.EnsureWindow(System.Object,System.Object,System.Boolean)">
+ <member name="M:Caliburn.Micro.SimpleContainer.#ctor">
 <summary>
- Makes sure the view is a window is is wrapped by one.
+ Initializes a new instance of the <see cref="T:Caliburn.Micro.SimpleContainer"/> class.
 </summary>
- <param name="model">The view model.</param>
- <param name="view">The view.</param>
- <param name="isDialog">Whethor or not the window is being shown as a dialog.</param>
- <returns>The window.</returns>
 </member>
- <member name="M:Caliburn.Micro.WindowManager.InferOwnerOf(System.Windows.Window)">
+ <member name="M:Caliburn.Micro.SimpleContainer.RegisterInstance(System.Type,System.String,System.Object)">
 <summary>
- Infers the owner of the window.
+ Registers the instance.
 </summary>
- <param name="window">The window to whose owner needs to be determined.</param>
- <returns>The owner.</returns>
+ <param name = "service">The service.</param>
+ <param name = "key">The key.</param>
+ <param name = "implementation">The implementation.</param>
 </member>
- <member name="M:Caliburn.Micro.WindowManager.CreatePage(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <member name="M:Caliburn.Micro.SimpleContainer.RegisterPerRequest(System.Type,System.String,System.Type)">
 <summary>
- Creates the page.
+ Registers the class so that a new instance is created on every request.
 </summary>
- <param name="rootModel">The root model.</param>
- <param name="context">The context.</param>
- <param name="settings">The optional popup settings.</param>
- <returns>The page.</returns>
+ <param name = "service">The service.</param>
+ <param name = "key">The key.</param>
+ <param name = "implementation">The implementation.</param>
 </member>
- <member name="M:Caliburn.Micro.WindowManager.EnsurePage(System.Object,System.Object)">
+ <member name="M:Caliburn.Micro.SimpleContainer.RegisterSingleton(System.Type,System.String,System.Type)">
 <summary>
- Ensures the view is a page or provides one.
+ Registers the class so that it is created once, on first request, and the same instance is returned to all requestors thereafter.
 </summary>
- <param name="model">The model.</param>
- <param name="view">The view.</param>
- <returns>The page.</returns>
+ <param name = "service">The service.</param>
+ <param name = "key">The key.</param>
+ <param name = "implementation">The implementation.</param>
 </member>
- <member name="T:Caliburn.Micro.SequentialResult">
+ <member name="M:Caliburn.Micro.SimpleContainer.RegisterHandler(System.Type,System.String,System.Func{Caliburn.Micro.SimpleContainer,System.Object})">
 <summary>
- An implementation of <see cref="T:Caliburn.Micro.IResult"/> that enables sequential execution of multiple results.
+ Registers a custom handler for serving requests from the container.
 </summary>
+ <param name = "service">The service.</param>
+ <param name = "key">The key.</param>
+ <param name = "handler">The handler.</param>
 </member>
- <member name="T:Caliburn.Micro.IResult">
+ <member name="M:Caliburn.Micro.SimpleContainer.UnregisterHandler(System.Type,System.String)">
 <summary>
- Allows custom code to execute after the return of a action.
+ Unregisters any handlers for the service/key that have previously been registered.
 </summary>
+ <param name = "service">The service.</param>
+ <param name = "key">The key.</param>
 </member>
- <member name="M:Caliburn.Micro.IResult.Execute(Caliburn.Micro.ActionExecutionContext)">
+ <member name="M:Caliburn.Micro.SimpleContainer.GetInstance(System.Type,System.String)">
 <summary>
- Executes the result using the specified context.
+ Requests an instance.
 </summary>
- <param name="context">The context.</param>
+ <param name = "service">The service.</param>
+ <param name = "key">The key.</param>
+ <returns>The instance, or null if a handler is not found.</returns>
 </member>
- <member name="E:Caliburn.Micro.IResult.Completed">
+ <member name="M:Caliburn.Micro.SimpleContainer.HasHandler(System.Type,System.String)">
 <summary>
- Occurs when execution has completed.
+ Determines if a handler for the service/key has previously been registered.
 </summary>
+ <param name="service">The service.</param>
+ <param name="key">The key.</param>
+ <returns>True if a handler is registere; false otherwise.</returns>
 </member>
- <member name="M:Caliburn.Micro.SequentialResult.#ctor(System.Collections.Generic.IEnumerator{Caliburn.Micro.IResult})">
+ <member name="M:Caliburn.Micro.SimpleContainer.GetAllInstances(System.Type)">
 <summary>
- Initializes a new instance of the <see cref="T:Caliburn.Micro.SequentialResult"/> class.
+ Requests all instances of a given type.
 </summary>
- <param name="enumerator">The enumerator.</param>
+ <param name = "service">The service.</param>
+ <returns>All the instances or an empty enumerable if none are found.</returns>
 </member>
- <member name="M:Caliburn.Micro.SequentialResult.Execute(Caliburn.Micro.ActionExecutionContext)">
+ <member name="M:Caliburn.Micro.SimpleContainer.BuildUp(System.Object)">
 <summary>
- Executes the result using the specified context.
+ Pushes dependencies into an existing instance based on interface properties with setters.
 </summary>
- <param name = "context">The context.</param>
+ <param name = "instance">The instance.</param>
 </member>
- <member name="E:Caliburn.Micro.SequentialResult.Completed">
+ <member name="M:Caliburn.Micro.SimpleContainer.CreateChildContainer">
 <summary>
- Occurs when execution has completed.
+ Creates a child container.
 </summary>
+ <returns>A new container.</returns>
 </member>
- <member name="T:Caliburn.Micro.Bootstrapper">
+ <member name="M:Caliburn.Micro.SimpleContainer.BuildInstance(System.Type)">
 <summary>
- Instantiate this class in order to configure the framework.
+ Actually does the work of creating the instance and satisfying it's constructor dependencies.
 </summary>
+ <param name = "type">The type.</param>
+ <returns></returns>
 </member>
- <member name="M:Caliburn.Micro.Bootstrapper.#ctor(System.Boolean)">
+ <member name="M:Caliburn.Micro.SimpleContainer.ActivateInstance(System.Type,System.Object[])">
 <summary>
- Creates an instance of the bootstrapper.
+ Creates an instance of the type with the specified constructor arguments.
 </summary>
- <param name="useApplication">Set this to false when hosting Caliburn.Micro inside and Office or WinForms application. The default is true.</param>
+ <param name = "type">The type.</param>
+ <param name = "args">The constructor args.</param>
+ <returns>The created instance.</returns>
 </member>
- <member name="M:Caliburn.Micro.Bootstrapper.StartDesignTime">
+ <member name="E:Caliburn.Micro.SimpleContainer.Activated">
 <summary>
- Called by the bootstrapper's constructor at design time to start the framework.
+ Occurs when a new instance is created.
 </summary>
 </member>
- <member name="M:Caliburn.Micro.Bootstrapper.StartRuntime">
+ <member name="T:Caliburn.Micro.TaskExtensions">
 <summary>
- Called by the bootstrapper's constructor at runtime to start the framework.
+ Extension methods to bring <see cref="T:System.Threading.Tasks.Task"/> and <see cref="T:Caliburn.Micro.IResult"/> together.
 </summary>
 </member>
- <member name="M:Caliburn.Micro.Bootstrapper.PrepareApplication">
+ <member name="M:Caliburn.Micro.TaskExtensions.ExecuteAsync(Caliburn.Micro.IResult,Caliburn.Micro.ActionExecutionContext)">
 <summary>
- Provides an opportunity to hook into the application object.
+ Executes an <see cref="T:Caliburn.Micro.IResult"/> asynchronous.
 </summary>
+ <param name="result">The coroutine to execute.</param>
+ <param name="context">The context to execute the coroutine within.</param>
+ <returns>A task that represents the asynchronous coroutine.</returns>
 </member>
- <member name="M:Caliburn.Micro.Bootstrapper.Configure">
+ <member name="M:Caliburn.Micro.TaskExtensions.ExecuteAsync``1(Caliburn.Micro.IResult{``0},Caliburn.Micro.ActionExecutionContext)">
 <summary>
- Override to configure the framework and setup your IoC container.
+ Executes an <see cref="T:Caliburn.Micro.IResult`1"/> asynchronous.
 </summary>
+ <typeparam name="TResult">The type of the result.</typeparam>
+ <param name="result">The coroutine to execute.</param>
+ <param name="context">The context to execute the coroutine within.</param>
+ <returns>A task that represents the asynchronous coroutine.</returns>
 </member>
- <member name="M:Caliburn.Micro.Bootstrapper.SelectAssemblies">
+ <member name="M:Caliburn.Micro.TaskExtensions.AsResult(System.Threading.Tasks.Task)">
 <summary>
- Override to tell the framework where to find assemblies to inspect for views, etc.
+ Encapsulates a task inside a couroutine.
 </summary>
- <returns>A list of assemblies to inspect.</returns>
+ <param name="task">The task.</param>
+ <returns>The coroutine that encapsulates the task.</returns>
 </member>
- <member name="M:Caliburn.Micro.Bootstrapper.GetInstance(System.Type,System.String)">
+ <member name="M:Caliburn.Micro.TaskExtensions.AsResult``1(System.Threading.Tasks.Task{``0})">
 <summary>
- Override this to provide an IoC specific implementation.
+ Encapsulates a task inside a couroutine.
 </summary>
- <param name="service">The service to locate.</param>
- <param name="key">The key to locate.</param>
- <returns>The located service.</returns>
+ <typeparam name="TResult">The type of the result.</typeparam>
+ <param name="task">The task.</param>
+ <returns>The coroutine that encapsulates the task.</returns>
 </member>
- <member name="M:Caliburn.Micro.Bootstrapper.GetAllInstances(System.Type)">
+ <member name="T:Caliburn.Micro.TaskResult">
 <summary>
- Override this to provide an IoC specific implementation
+ A couroutine that encapsulates an <see cref="T:System.Threading.Tasks.Task"/>.
 </summary>
- <param name="service">The service to locate.</param>
- <returns>The located services.</returns>
 </member>
- <member name="M:Caliburn.Micro.Bootstrapper.BuildUp(System.Object)">
+ <member name="M:Caliburn.Micro.TaskResult.#ctor(System.Threading.Tasks.Task)">
 <summary>
- Override this to provide an IoC specific implementation.
+ Initializes a new instance of the <see cref="T:Caliburn.Micro.TaskResult"/> class.
 </summary>
- <param name="instance">The instance to perform injection on.</param>
+ <param name="task">The task.</param>
 </member>
- <member name="M:Caliburn.Micro.Bootstrapper.OnStartup(System.Object,System.Windows.StartupEventArgs)">
+ <member name="M:Caliburn.Micro.TaskResult.Execute(Caliburn.Micro.ActionExecutionContext)">
 <summary>
- Override this to add custom behavior to execute after the application starts.
+ Executes the result using the specified context.
 </summary>
- <param name="sender">The sender.</param>
- <param name="e">The args.</param>
+ <param name="context">The context.</param>
 </member>
- <member name="M:Caliburn.Micro.Bootstrapper.OnExit(System.Object,System.EventArgs)">
+ <member name="M:Caliburn.Micro.TaskResult.OnCompleted(System.Threading.Tasks.Task)">
 <summary>
- Override this to add custom behavior on exit.
+ Called when the asynchronous task has completed.
 </summary>
- <param name="sender">The sender.</param>
- <param name="e">The event args.</param>
+ <param name="task">The completed task.</param>
 </member>
- <member name="M:Caliburn.Micro.Bootstrapper.OnUnhandledException(System.Object,System.Windows.Threading.DispatcherUnhandledExceptionEventArgs)">
+ <member name="E:Caliburn.Micro.TaskResult.Completed">
 <summary>
- Override this to add custom behavior for unhandled exceptions.
+ Occurs when execution has completed.
 </summary>
- <param name="sender">The sender.</param>
- <param name="e">The event args.</param>
 </member>
- <member name="M:Caliburn.Micro.Bootstrapper.DisplayRootViewFor(System.Type)">
+ <member name="T:Caliburn.Micro.TaskResult`1">
 <summary>
- Locates the view model, locates the associate view, binds them and shows it as the root view.
+ A couroutine that encapsulates an <see cref="T:System.Threading.Tasks.Task`1"/>.
 </summary>
- <param name="viewModelType">The view model type.</param>
+ <typeparam name="TResult">The type of the result.</typeparam>
 </member>
- <member name="P:Caliburn.Micro.Bootstrapper.Application">
+ <member name="M:Caliburn.Micro.TaskResult`1.#ctor(System.Threading.Tasks.Task{`0})">
 <summary>
- The application.
+ Initializes a new instance of the <see cref="T:Caliburn.Micro.TaskResult`1"/> class.
 </summary>
+ <param name="task">The task.</param>
 </member>
- <member name="T:Caliburn.Micro.Bootstrapper`1">
+ <member name="M:Caliburn.Micro.TaskResult`1.OnCompleted(System.Threading.Tasks.Task)">
 <summary>
- A strongly-typed version of <see cref="T:Caliburn.Micro.Bootstrapper"/> that specifies the type of root model to create for the application.
+ Called when the asynchronous task has completed.
 </summary>
- <typeparam name="TRootModel">The type of root model for the application.</typeparam>
+ <param name="task">The completed task.</param>
 </member>
- <member name="M:Caliburn.Micro.Bootstrapper`1.OnStartup(System.Object,System.Windows.StartupEventArgs)">
+ <member name="P:Caliburn.Micro.TaskResult`1.Result">
 <summary>
- Override this to add custom behavior to execute after the application starts.
+ Gets the result of the asynchronous operation.
+ </summary>
+ </member>
+ <member name="T:Caliburn.Micro.IHandleWithTask`1">
+ <summary>
+ Denotes a class which can handle a particular type of message and uses a Task to do so.
 </summary>
- <param name="sender">The sender.</param>
- <param name="e">The args.</param>
+ </member>
+ <member name="M:Caliburn.Micro.IHandleWithTask`1.Handle(`0)">
+ <summary>
+ Handle the message with a Task.
+ </summary>
+ <param name="message">The message.</param>
+ <returns>The Task that represents the operation.</returns>
 </member>
 <member name="T:Caliburn.Micro.TypeMappingConfiguration">
 <summary>
@@ -2660,94 +2628,264 @@
 The name suffix for ViewModels. Applies only when UseNameSuffixesInMappings = true. The default is "ViewModel".
 </summary>
 </member>
- <member name="T:Caliburn.Micro.Bind">
+ <member name="T:Caliburn.Micro.View">
 <summary>
- Hosts dependency properties for binding.
+ Hosts attached properties related to view models.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.Bind.ModelProperty">
+ <member name="F:Caliburn.Micro.View.DefaultContext">
 <summary>
- Allows binding on an existing view. Use this on root UserControls, Pages and Windows; not in a DataTemplate.
+ The default view context.
 </summary>
 </member>
- <member name="F:Caliburn.Micro.Bind.ModelWithoutContextProperty">
+ <member name="F:Caliburn.Micro.View.IsLoadedProperty">
 <summary>
- Allows binding on an existing view without setting the data context. Use this from within a DataTemplate.
+ A dependency property which allows the framework to track whether a certain element has already been loaded in certain scenarios.
 </summary>
 </member>
- <member name="M:Caliburn.Micro.Bind.GetModelWithoutContext(System.Windows.DependencyObject)">
+ <member name="F:Caliburn.Micro.View.IsScopeRootProperty">
 <summary>
- Gets the model to bind to.
+ A dependency property which marks an element as a name scope root.
 </summary>
- <param name = "dependencyObject">The dependency object to bind to.</param>
- <returns>The model.</returns>
 </member>
- <member name="M:Caliburn.Micro.Bind.SetModelWithoutContext(System.Windows.DependencyObject,System.Object)">
+ <member name="F:Caliburn.Micro.View.ApplyConventionsProperty">
 <summary>
- Sets the model to bind to.
+ A dependency property which allows the override of convention application behavior.
 </summary>
- <param name = "dependencyObject">The dependency object to bind to.</param>
- <param name = "value">The model.</param>
 </member>
- <member name="M:Caliburn.Micro.Bind.GetModel(System.Windows.DependencyObject)">
+ <member name="F:Caliburn.Micro.View.ContextProperty">
 <summary>
- Gets the model to bind to.
+ A dependency property for assigning a context to a particular portion of the UI.
 </summary>
- <param name = "dependencyObject">The dependency object to bind to.</param>
- <returns>The model.</returns>
 </member>
- <member name="M:Caliburn.Micro.Bind.SetModel(System.Windows.DependencyObject,System.Object)">
+ <member name="F:Caliburn.Micro.View.ModelProperty">
 <summary>
- Sets the model to bind to.
+ A dependency property for attaching a model to the UI.
 </summary>
- <param name = "dependencyObject">The dependency object to bind to.</param>
- <param name = "value">The model.</param>
 </member>
- <member name="F:Caliburn.Micro.Bind.AtDesignTimeProperty">
+ <member name="F:Caliburn.Micro.View.IsGeneratedProperty">
 <summary>
- Allows application of conventions at design-time.
+ Used by the framework to indicate that this element was generated.
 </summary>
 </member>
- <member name="M:Caliburn.Micro.Bind.SetAtDesignTime(System.Windows.DependencyObject,System.Boolean)">
+ <member name="M:Caliburn.Micro.View.ExecuteOnLoad(System.Windows.FrameworkElement,System.Windows.RoutedEventHandler)">
 <summary>
- Sets whether or not do bind conventions at design-time.
+ Executes the handler immediately if the element is loaded, otherwise wires it to the Loaded event.
 </summary>
- <param name="dependencyObject">The ui to apply conventions to.</param>
+ <param name="element">The element.</param>
+ <param name="handler">The handler.</param>
+ <returns>true if the handler was executed immediately; false otherwise</returns>
+ </member>
+ <member name="M:Caliburn.Micro.View.ExecuteOnLayoutUpdated(System.Windows.FrameworkElement,System.EventHandler)">
+ <summary>
+ Executes the handler the first time the elements's LayoutUpdated event fires.
+ </summary>
+ <param name="element">The element.</param>
+ <param name="handler">The handler.</param>
+ </member>
+ <member name="F:Caliburn.Micro.View.GetFirstNonGeneratedView">
+ <summary>
+ Used to retrieve the root, non-framework-created view.
+ </summary>
+ <param name="view">The view to search.</param>
+ <returns>The root element that was not created by the framework.</returns>
+ <remarks>In certain instances the services create UI elements.
+ For example, if you ask the window manager to show a UserControl as a dialog, it creates a window to host the UserControl in.
+ The WindowManager marks that element as a framework-created element so that it can determine what it created vs. what was intended by the developer.
+ Calling GetFirstNonGeneratedView allows the framework to discover what the original element was. 
+ </remarks>
+ </member>
+ <member name="M:Caliburn.Micro.View.GetApplyConventions(System.Windows.DependencyObject)">
+ <summary>
+ Gets the convention application behavior.
+ </summary>
+ <param name="d">The element the property is attached to.</param>
+ <returns>Whether or not to apply conventions.</returns>
+ </member>
+ <member name="M:Caliburn.Micro.View.SetApplyConventions(System.Windows.DependencyObject,System.Nullable{System.Boolean})">
+ <summary>
+ Sets the convention application behavior.
+ </summary>
+ <param name="d">The element to attach the property to.</param>
 <param name="value">Whether or not to apply conventions.</param>
 </member>
- <member name="T:Caliburn.Micro.AttachedCollection`1">
+ <member name="M:Caliburn.Micro.View.SetModel(System.Windows.DependencyObject,System.Object)">
 <summary>
- A collection that can exist as part of a behavior.
+ Sets the model.
 </summary>
- <typeparam name="T">The type of item in the attached collection.</typeparam>
+ <param name="d">The element to attach the model to.</param>
+ <param name="value">The model.</param>
 </member>
- <member name="M:Caliburn.Micro.AttachedCollection`1.#ctor">
+ <member name="M:Caliburn.Micro.View.GetModel(System.Windows.DependencyObject)">
 <summary>
- Creates an instance of <see cref="T:Caliburn.Micro.AttachedCollection`1"/>
+ Gets the model.
 </summary>
+ <param name="d">The element the model is attached to.</param>
+ <returns>The model.</returns>
 </member>
- <member name="M:Caliburn.Micro.AttachedCollection`1.Attach(System.Windows.DependencyObject)">
+ <member name="M:Caliburn.Micro.View.GetContext(System.Windows.DependencyObject)">
 <summary>
- Attached the collection.
+ Gets the context.
 </summary>
- <param name="dependencyObject">The dependency object to attach the collection to.</param>
+ <param name="d">The element the context is attached to.</param>
+ <returns>The context.</returns>
 </member>
- <member name="M:Caliburn.Micro.AttachedCollection`1.Detach">
+ <member name="M:Caliburn.Micro.View.SetContext(System.Windows.DependencyObject,System.Object)">
 <summary>
- Detaches the collection.
+ Sets the context.
 </summary>
+ <param name="d">The element to attach the context to.</param>
+ <param name="value">The context.</param>
 </member>
- <member name="M:Caliburn.Micro.AttachedCollection`1.OnItemAdded(`0)">
+ <member name="T:Caliburn.Micro.ViewLocator">
 <summary>
- Called when an item is added from the collection.
+ A strategy for determining which view to use for a given model.
 </summary>
- <param name="item">The item that was added.</param>
 </member>
- <member name="M:Caliburn.Micro.AttachedCollection`1.OnItemRemoved(`0)">
+ <member name="F:Caliburn.Micro.ViewLocator.NameTransformer">
 <summary>
- Called when an item is removed from the collection.
+ Used to transform names.
 </summary>
- <param name="item">The item that was removed.</param>
+ </member>
+ <member name="F:Caliburn.Micro.ViewLocator.ContextSeparator">
+ <summary>
+ Separator used when resolving View names for context instances.
+ </summary>
+ </member>
+ <member name="M:Caliburn.Micro.ViewLocator.ConfigureTypeMappings(Caliburn.Micro.TypeMappingConfiguration)">
+ <summary>
+ Specifies how type mappings are created, including default type mappings. Calling this method will
+ clear all existing name transformation rules and create new default type mappings according to the
+ configuration.
+ </summary>
+ <param name="config">An instance of TypeMappingConfiguration that provides the settings for configuration</param>
+ </member>
+ <member name="M:Caliburn.Micro.ViewLocator.AddDefaultTypeMapping(System.String)">
+ <summary>
+ Adds a default type mapping using the standard namespace mapping convention
+ </summary>
+ <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ </member>
+ <member name="M:Caliburn.Micro.ViewLocator.RegisterViewSuffix(System.String)">
+ <summary>
+ This method registers a View suffix or synonym so that View Context resolution works properly.
+ It is automatically called internally when calling AddNamespaceMapping(), AddDefaultTypeMapping(),
+ or AddTypeMapping(). It should not need to be called explicitly unless a rule that handles synonyms
+ is added directly through the NameTransformer.
+ </summary>
+ <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View".</param>
+ </member>
+ <member name="M:Caliburn.Micro.ViewLocator.AddTypeMapping(System.String,System.String,System.String[],System.String)">
+ <summary>
+ Adds a standard type mapping based on namespace RegEx replace and filter patterns
+ </summary>
+ <param name="nsSourceReplaceRegEx">RegEx replace pattern for source namespace</param>
+ <param name="nsSourceFilterRegEx">RegEx filter pattern for source namespace</param>
+ <param name="nsTargetsRegEx">Array of RegEx replace values for target namespaces</param>
+ <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ </member>
+ <member name="M:Caliburn.Micro.ViewLocator.AddTypeMapping(System.String,System.String,System.String,System.String)">
+ <summary>
+ Adds a standard type mapping based on namespace RegEx replace and filter patterns
+ </summary>
+ <param name="nsSourceReplaceRegEx">RegEx replace pattern for source namespace</param>
+ <param name="nsSourceFilterRegEx">RegEx filter pattern for source namespace</param>
+ <param name="nsTargetRegEx">RegEx replace value for target namespace</param>
+ <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ </member>
+ <member name="M:Caliburn.Micro.ViewLocator.AddNamespaceMapping(System.String,System.String[],System.String)">
+ <summary>
+ Adds a standard type mapping based on simple namespace mapping
+ </summary>
+ <param name="nsSource">Namespace of source type</param>
+ <param name="nsTargets">Namespaces of target type as an array</param>
+ <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ </member>
+ <member name="M:Caliburn.Micro.ViewLocator.AddNamespaceMapping(System.String,System.String,System.String)">
+ <summary>
+ Adds a standard type mapping based on simple namespace mapping
+ </summary>
+ <param name="nsSource">Namespace of source type</param>
+ <param name="nsTarget">Namespace of target type</param>
+ <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ </member>
+ <member name="M:Caliburn.Micro.ViewLocator.AddSubNamespaceMapping(System.String,System.String[],System.String)">
+ <summary>
+ Adds a standard type mapping by substituting one subnamespace for another
+ </summary>
+ <param name="nsSource">Subnamespace of source type</param>
+ <param name="nsTargets">Subnamespaces of target type as an array</param>
+ <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ </member>
+ <member name="M:Caliburn.Micro.ViewLocator.AddSubNamespaceMapping(System.String,System.String,System.String)">
+ <summary>
+ Adds a standard type mapping by substituting one subnamespace for another
+ </summary>
+ <param name="nsSource">Subnamespace of source type</param>
+ <param name="nsTarget">Subnamespace of target type</param>
+ <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ </member>
+ <member name="F:Caliburn.Micro.ViewLocator.GetOrCreateViewType">
+ <summary>
+ Retrieves the view from the IoC container or tries to create it if not found.
+ </summary>
+ <remarks>
+ Pass the type of view as a parameter and recieve an instance of the view.
+ </remarks>
+ </member>
+ <member name="F:Caliburn.Micro.ViewLocator.ModifyModelTypeAtDesignTime">
+ <summary>
+ Modifies the name of the type to be used at design time.
+ </summary>
+ </member>
+ <member name="F:Caliburn.Micro.ViewLocator.TransformName">
+ <summary>
+ Transforms a ViewModel type name into all of its possible View type names. Optionally accepts an instance
+ of context object
+ </summary>
+ <returns>Enumeration of transformed names</returns>
+ <remarks>Arguments:
+ typeName = The name of the ViewModel type being resolved to its companion View.
+ context = An instance of the context or null.
+ </remarks>
+ </member>
+ <member name="F:Caliburn.Micro.ViewLocator.LocateTypeForModelType">
+ <summary>
+ Locates the view type based on the specified model type.
+ </summary>
+ <returns>The view.</returns>
+ <remarks>
+ Pass the model type, display location (or null) and the context instance (or null) as parameters and receive a view type.
+ </remarks>
+ </member>
+ <member name="F:Caliburn.Micro.ViewLocator.LocateForModelType">
+ <summary>
+ Locates the view for the specified model type.
+ </summary>
+ <returns>The view.</returns>
+ <remarks>
+ Pass the model type, display location (or null) and the context instance (or null) as parameters and receive a view instance.
+ </remarks>
+ </member>
+ <member name="F:Caliburn.Micro.ViewLocator.LocateForModel">
+ <summary>
+ Locates the view for the specified model instance.
+ </summary>
+ <returns>The view.</returns>
+ <remarks>
+ Pass the model instance, display location (or null) and the context (or null) as parameters and receive a view instance.
+ </remarks>
+ </member>
+ <member name="F:Caliburn.Micro.ViewLocator.DeterminePackUriFromType">
+ <summary>
+ Transforms a view type into a pack uri.
+ </summary>
+ </member>
+ <member name="M:Caliburn.Micro.ViewLocator.InitializeComponent(System.Object)">
+ <summary>
+ When a view does not contain a code-behind file, we need to automatically call InitializeCompoent.
+ </summary>
+ <param name = "element">The element to initialize</param>
 </member>
 <member name="T:Caliburn.Micro.ViewModelBinder">
 <summary>
@@ -2797,5 +2935,302 @@
 </summary>
 <remarks>Passes the the view model, view and creation context (or null for default) to use in applying binding.</remarks>
 </member>
+ <member name="T:Caliburn.Micro.ViewModelLocator">
+ <summary>
+ A strategy for determining which view model to use for a given view.
+ </summary>
+ </member>
+ <member name="F:Caliburn.Micro.ViewModelLocator.NameTransformer">
+ <summary>
+ Used to transform names.
+ </summary>
+ </member>
+ <member name="F:Caliburn.Micro.ViewModelLocator.InterfaceCaptureGroupName">
+ <summary>
+ The name of the capture group used as a marker for rules that return interface types
+ </summary>
+ </member>
+ <member name="M:Caliburn.Micro.ViewModelLocator.ConfigureTypeMappings(Caliburn.Micro.TypeMappingConfiguration)">
+ <summary>
+ Specifies how type mappings are created, including default type mappings. Calling this method will
+ clear all existing name transformation rules and create new default type mappings according to the
+ configuration.
+ </summary>
+ <param name="config">An instance of TypeMappingConfiguration that provides the settings for configuration</param>
+ </member>
+ <member name="M:Caliburn.Micro.ViewModelLocator.AddDefaultTypeMapping(System.String)">
+ <summary>
+ Adds a default type mapping using the standard namespace mapping convention
+ </summary>
+ <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ </member>
+ <member name="M:Caliburn.Micro.ViewModelLocator.AddTypeMapping(System.String,System.String,System.String[],System.String)">
+ <summary>
+ Adds a standard type mapping based on namespace RegEx replace and filter patterns
+ </summary>
+ <param name="nsSourceReplaceRegEx">RegEx replace pattern for source namespace</param>
+ <param name="nsSourceFilterRegEx">RegEx filter pattern for source namespace</param>
+ <param name="nsTargetsRegEx">Array of RegEx replace values for target namespaces</param>
+ <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ </member>
+ <member name="M:Caliburn.Micro.ViewModelLocator.AddTypeMapping(System.String,System.String,System.String,System.String)">
+ <summary>
+ Adds a standard type mapping based on namespace RegEx replace and filter patterns
+ </summary>
+ <param name="nsSourceReplaceRegEx">RegEx replace pattern for source namespace</param>
+ <param name="nsSourceFilterRegEx">RegEx filter pattern for source namespace</param>
+ <param name="nsTargetRegEx">RegEx replace value for target namespace</param>
+ <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ </member>
+ <member name="M:Caliburn.Micro.ViewModelLocator.AddNamespaceMapping(System.String,System.String[],System.String)">
+ <summary>
+ Adds a standard type mapping based on simple namespace mapping
+ </summary>
+ <param name="nsSource">Namespace of source type</param>
+ <param name="nsTargets">Namespaces of target type as an array</param>
+ <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ </member>
+ <member name="M:Caliburn.Micro.ViewModelLocator.AddNamespaceMapping(System.String,System.String,System.String)">
+ <summary>
+ Adds a standard type mapping based on simple namespace mapping
+ </summary>
+ <param name="nsSource">Namespace of source type</param>
+ <param name="nsTarget">Namespace of target type</param>
+ <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ </member>
+ <member name="M:Caliburn.Micro.ViewModelLocator.AddSubNamespaceMapping(System.String,System.String[],System.String)">
+ <summary>
+ Adds a standard type mapping by substituting one subnamespace for another
+ </summary>
+ <param name="nsSource">Subnamespace of source type</param>
+ <param name="nsTargets">Subnamespaces of target type as an array</param>
+ <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ </member>
+ <member name="M:Caliburn.Micro.ViewModelLocator.AddSubNamespaceMapping(System.String,System.String,System.String)">
+ <summary>
+ Adds a standard type mapping by substituting one subnamespace for another
+ </summary>
+ <param name="nsSource">Subnamespace of source type</param>
+ <param name="nsTarget">Subnamespace of target type</param>
+ <param name="viewSuffix">Suffix for type name. Should be "View" or synonym of "View". (Optional)</param>
+ </member>
+ <member name="M:Caliburn.Micro.ViewModelLocator.MakeInterface(System.String)">
+ <summary>
+ Makes a type name into an interface name.
+ </summary>
+ <param name = "typeName">The part.</param>
+ <returns></returns>
+ </member>
+ <member name="F:Caliburn.Micro.ViewModelLocator.TransformName">
+ <summary>
+ Transforms a View type name into all of its possible ViewModel type names. Accepts a flag
+ to include or exclude interface types.
+ </summary>
+ <returns>Enumeration of transformed names</returns>
+ <remarks>Arguments:
+ typeName = The name of the View type being resolved to its companion ViewModel.
+ includeInterfaces = Flag to indicate if interface types are included
+ </remarks>
+ </member>
+ <member name="F:Caliburn.Micro.ViewModelLocator.LocateTypeForViewType">
+ <summary>
+ Determines the view model type based on the specified view type.
+ </summary>
+ <returns>The view model type.</returns>
+ <remarks>
+ Pass the view type and receive a view model type. Pass true for the second parameter to search for interfaces.
+ </remarks>
+ </member>
+ <member name="F:Caliburn.Micro.ViewModelLocator.LocateForViewType">
+ <summary>
+ Locates the view model for the specified view type.
+ </summary>
+ <returns>The view model.</returns>
+ <remarks>
+ Pass the view type as a parameter and receive a view model instance.
+ </remarks>
+ </member>
+ <member name="F:Caliburn.Micro.ViewModelLocator.LocateForView">
+ <summary>
+ Locates the view model for the specified view instance.
+ </summary>
+ <returns>The view model.</returns>
+ <remarks>
+ Pass the view instance as a parameters and receive a view model instance.
+ </remarks>
+ </member>
+ <member name="T:Caliburn.Micro.AttachedCollection`1">
+ <summary>
+ A collection that can exist as part of a behavior.
+ </summary>
+ <typeparam name="T">The type of item in the attached collection.</typeparam>
+ </member>
+ <member name="M:Caliburn.Micro.AttachedCollection`1.#ctor">
+ <summary>
+ Creates an instance of <see cref="T:Caliburn.Micro.AttachedCollection`1"/>
+ </summary>
+ </member>
+ <member name="M:Caliburn.Micro.AttachedCollection`1.Attach(System.Windows.DependencyObject)">
+ <summary>
+ Attached the collection.
+ </summary>
+ <param name="dependencyObject">The dependency object to attach the collection to.</param>
+ </member>
+ <member name="M:Caliburn.Micro.AttachedCollection`1.Detach">
+ <summary>
+ Detaches the collection.
+ </summary>
+ </member>
+ <member name="M:Caliburn.Micro.AttachedCollection`1.OnItemAdded(`0)">
+ <summary>
+ Called when an item is added from the collection.
+ </summary>
+ <param name="item">The item that was added.</param>
+ </member>
+ <member name="M:Caliburn.Micro.AttachedCollection`1.OnItemRemoved(`0)">
+ <summary>
+ Called when an item is removed from the collection.
+ </summary>
+ <param name="item">The item that was removed.</param>
+ </member>
+ <member name="T:Caliburn.Micro.Parameter">
+ <summary>
+ Represents a parameter of an <see cref="T:Caliburn.Micro.ActionMessage"/>.
+ </summary>
+ </member>
+ <member name="F:Caliburn.Micro.Parameter.ValueProperty">
+ <summary>
+ A dependency property representing the parameter's value.
+ </summary>
+ </member>
+ <member name="M:Caliburn.Micro.Parameter.CreateInstanceCore">
+ <summary>
+ When implemented in a derived class, creates a new instance of the <see cref="T:System.Windows.Freezable"/> derived class.
+ </summary>
+ <returns>The new instance.</returns>
+ </member>
+ <member name="M:Caliburn.Micro.Parameter.MakeAwareOf(Caliburn.Micro.ActionMessage)">
+ <summary>
+ Makes the parameter aware of the <see cref="T:Caliburn.Micro.ActionMessage"/> that it's attached to.
+ </summary>
+ <param name="owner">The action message.</param>
+ </member>
+ <member name="P:Caliburn.Micro.Parameter.Value">
+ <summary>
+ Gets or sets the value of the parameter.
+ </summary>
+ <value>The value.</value>
+ </member>
+ <member name="T:Caliburn.Micro.IWindowManager">
+ <summary>
+ A service that manages windows.
+ </summary>
+ </member>
+ <member name="M:Caliburn.Micro.IWindowManager.ShowDialog(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <summary>
+ Shows a modal dialog for the specified model.
+ </summary>
+ <param name="rootModel">The root model.</param>
+ <param name="context">The context.</param>
+ <param name="settings">The optional dialog settings.</param>
+ <returns>The dialog result.</returns>
+ </member>
+ <member name="M:Caliburn.Micro.IWindowManager.ShowWindow(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <summary>
+ Shows a non-modal window for the specified model.
+ </summary>
+ <param name="rootModel">The root model.</param>
+ <param name="context">The context.</param>
+ <param name="settings">The optional window settings.</param>
+ </member>
+ <member name="M:Caliburn.Micro.IWindowManager.ShowPopup(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <summary>
+ Shows a popup at the current mouse position.
+ </summary>
+ <param name="rootModel">The root model.</param>
+ <param name="context">The view context.</param>
+ <param name="settings">The optional popup settings.</param>
+ </member>
+ <member name="T:Caliburn.Micro.WindowManager">
+ <summary>
+ A service that manages windows.
+ </summary>
+ </member>
+ <member name="M:Caliburn.Micro.WindowManager.ShowDialog(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <summary>
+ Shows a modal dialog for the specified model.
+ </summary>
+ <param name="rootModel">The root model.</param>
+ <param name="context">The context.</param>
+ <param name="settings">The dialog popup settings.</param>
+ <returns>The dialog result.</returns>
+ </member>
+ <member name="M:Caliburn.Micro.WindowManager.ShowWindow(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <summary>
+ Shows a window for the specified model.
+ </summary>
+ <param name="rootModel">The root model.</param>
+ <param name="context">The context.</param>
+ <param name="settings">The optional window settings.</param>
+ </member>
+ <member name="M:Caliburn.Micro.WindowManager.ShowPopup(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <summary>
+ Shows a popup at the current mouse position.
+ </summary>
+ <param name="rootModel">The root model.</param>
+ <param name="context">The view context.</param>
+ <param name="settings">The optional popup settings.</param>
+ </member>
+ <member name="M:Caliburn.Micro.WindowManager.CreatePopup(System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <summary>
+ Creates a popup for hosting a popup window.
+ </summary>
+ <param name="rootModel">The model.</param>
+ <param name="settings">The optional popup settings.</param>
+ <returns>The popup.</returns>
+ </member>
+ <member name="M:Caliburn.Micro.WindowManager.CreateWindow(System.Object,System.Boolean,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <summary>
+ Creates a window.
+ </summary>
+ <param name="rootModel">The view model.</param>
+ <param name="isDialog">Whethor or not the window is being shown as a dialog.</param>
+ <param name="context">The view context.</param>
+ <param name="settings">The optional popup settings.</param>
+ <returns>The window.</returns>
+ </member>
+ <member name="M:Caliburn.Micro.WindowManager.EnsureWindow(System.Object,System.Object,System.Boolean)">
+ <summary>
+ Makes sure the view is a window is is wrapped by one.
+ </summary>
+ <param name="model">The view model.</param>
+ <param name="view">The view.</param>
+ <param name="isDialog">Whethor or not the window is being shown as a dialog.</param>
+ <returns>The window.</returns>
+ </member>
+ <member name="M:Caliburn.Micro.WindowManager.InferOwnerOf(System.Windows.Window)">
+ <summary>
+ Infers the owner of the window.
+ </summary>
+ <param name="window">The window to whose owner needs to be determined.</param>
+ <returns>The owner.</returns>
+ </member>
+ <member name="M:Caliburn.Micro.WindowManager.CreatePage(System.Object,System.Object,System.Collections.Generic.IDictionary{System.String,System.Object})">
+ <summary>
+ Creates the page.
+ </summary>
+ <param name="rootModel">The root model.</param>
+ <param name="context">The context.</param>
+ <param name="settings">The optional popup settings.</param>
+ <returns>The page.</returns>
+ </member>
+ <member name="M:Caliburn.Micro.WindowManager.EnsurePage(System.Object,System.Object)">
+ <summary>
+ Ensures the view is a page or provides one.
+ </summary>
+ <param name="model">The model.</param>
+ <param name="view">The view.</param>
+ <returns>The page.</returns>
+ </member>
 </members>
 </doc>

HandBrake-0.9.9.tar.bz2/win/CS/libraries/caliburn/System.Windows.Interactivity.dll -> HandBrake-0.10.0.tar.bz2/win/CS/libraries/caliburn/System.Windows.Interactivity.dll Changed

HandBrake-0.9.9.tar.bz2/contrib/a52dec Deleted

HandBrake-0.9.9.tar.bz2/contrib/a52dec/A00-a52-state-t-public.patch Deleted

@@ -1,152 +0,0 @@
-diff -Naur a52dec.old/include/a52.h a52dec.new/include/a52.h
---- a52dec.old/include/a52.h	2002-01-28 06:37:54.000000000 +0100
-+++ a52dec.new/include/a52.h	2012-07-16 14:13:35.000000000 +0200
-@@ -30,7 +30,71 @@
- typedef double sample_t;
- #endif
- 
--typedef struct a52_state_s a52_state_t;
-+typedef struct {
-+    uint8_t bai;              /* fine SNR offset, fast gain */
-+    uint8_t deltbae;          /* delta bit allocation exists */
-+    int8_t deltba[50];        /* per-band delta bit allocation */
-+} ba_t;
-+
-+typedef struct {
-+    uint8_t exp[256];         /* decoded channel exponents */
-+    int8_t bap[256];          /* derived channel bit allocation */
-+} expbap_t;
-+
-+typedef struct {
-+    uint8_t fscod;            /* sample rate */
-+    uint8_t halfrate;         /* halfrate factor */
-+    uint8_t acmod;            /* coded channels */
-+    uint8_t lfeon;            /* coded lfe channel */
-+    sample_t clev;            /* centre channel mix level */
-+    sample_t slev;            /* surround channels mix level */
-+
-+    int output;               /* type of output */
-+    sample_t level;           /* output level */
-+    sample_t bias;            /* output bias */
-+
-+    int dynrnge;              /* apply dynamic range */
-+    sample_t dynrng;          /* dynamic range */
-+    void * dynrngdata;        /* dynamic range callback funtion and data */
-+    sample_t (* dynrngcall) (sample_t range, void * dynrngdata);
-+
-+    uint8_t chincpl;          /* channel coupled */
-+    uint8_t phsflginu;        /* phase flags in use (stereo only) */
-+    uint8_t cplstrtmant;      /* coupling channel start mantissa */
-+    uint8_t cplendmant;       /* coupling channel end mantissa */
-+    uint32_t cplbndstrc;      /* coupling band structure */
-+    sample_t cplco[5][18];    /* coupling coordinates */
-+
-+    /* derived information */
-+    uint8_t cplstrtbnd;       /* coupling start band (for bit allocation) */
-+    uint8_t ncplbnd;          /* number of coupling bands */
-+
-+    uint8_t rematflg;         /* stereo rematrixing */
-+
-+    uint8_t endmant[5];       /* channel end mantissa */
-+
-+    uint16_t bai;             /* bit allocation information */
-+
-+    uint32_t * buffer_start;
-+    uint16_t lfsr_state;      /* dither state */
-+    uint32_t bits_left;
-+    uint32_t current_word;
-+
-+    uint8_t csnroffst;        /* coarse SNR offset */
-+    ba_t cplba;               /* coupling bit allocation parameters */
-+    ba_t ba[5];               /* channel bit allocation parameters */
-+    ba_t lfeba;               /* lfe bit allocation parameters */
-+
-+    uint8_t cplfleak;         /* coupling fast leak init */
-+    uint8_t cplsleak;         /* coupling slow leak init */
-+
-+    expbap_t cpl_expbap;
-+    expbap_t fbw_expbap[5];
-+    expbap_t lfe_expbap;
-+
-+    sample_t * samples;
-+    int downmixed;
-+} a52_state_t;
- 
- #define A52_CHANNEL 0
- #define A52_MONO 1
-diff -Naur a52dec.old/liba52/a52_internal.h a52dec.new/liba52/a52_internal.h
---- a52dec.old/liba52/a52_internal.h	2002-07-28 03:52:06.000000000 +0200
-+++ a52dec.new/liba52/a52_internal.h	2012-07-16 14:11:47.000000000 +0200
-@@ -21,72 +21,6 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
--typedef struct {
--    uint8_t bai;		/* fine SNR offset, fast gain */
--    uint8_t deltbae;		/* delta bit allocation exists */
--    int8_t deltba[50];		/* per-band delta bit allocation */
--} ba_t;
--
--typedef struct {
--    uint8_t exp[256];		/* decoded channel exponents */
--    int8_t bap[256];		/* derived channel bit allocation */
--} expbap_t;
--
--struct a52_state_s {
--    uint8_t fscod;		/* sample rate */
--    uint8_t halfrate;		/* halfrate factor */
--    uint8_t acmod;		/* coded channels */
--    uint8_t lfeon;		/* coded lfe channel */
--    sample_t clev;		/* centre channel mix level */
--    sample_t slev;		/* surround channels mix level */
--
--    int output;			/* type of output */
--    sample_t level;		/* output level */
--    sample_t bias;		/* output bias */
--
--    int dynrnge;		/* apply dynamic range */
--    sample_t dynrng;		/* dynamic range */
--    void * dynrngdata;		/* dynamic range callback funtion and data */
--    sample_t (* dynrngcall) (sample_t range, void * dynrngdata);
--
--    uint8_t chincpl;		/* channel coupled */
--    uint8_t phsflginu;		/* phase flags in use (stereo only) */
--    uint8_t cplstrtmant;	/* coupling channel start mantissa */
--    uint8_t cplendmant;		/* coupling channel end mantissa */
--    uint32_t cplbndstrc;	/* coupling band structure */
--    sample_t cplco[5][18];	/* coupling coordinates */
--
--    /* derived information */
--    uint8_t cplstrtbnd;		/* coupling start band (for bit allocation) */
--    uint8_t ncplbnd;		/* number of coupling bands */
--
--    uint8_t rematflg;		/* stereo rematrixing */
--
--    uint8_t endmant[5];		/* channel end mantissa */
--
--    uint16_t bai;		/* bit allocation information */
--
--    uint32_t * buffer_start;
--    uint16_t lfsr_state;	/* dither state */
--    uint32_t bits_left;
--    uint32_t current_word;
--
--    uint8_t csnroffst;		/* coarse SNR offset */
--    ba_t cplba;			/* coupling bit allocation parameters */
--    ba_t ba[5];			/* channel bit allocation parameters */
--    ba_t lfeba;			/* lfe bit allocation parameters */
--
--    uint8_t cplfleak;		/* coupling fast leak init */
--    uint8_t cplsleak;		/* coupling slow leak init */
--
--    expbap_t cpl_expbap;
--    expbap_t fbw_expbap[5];
--    expbap_t lfe_expbap;
--
--    sample_t * samples;
--    int downmixed;
--};
--
- #define LEVEL_PLUS6DB 2.0
- #define LEVEL_PLUS3DB 1.4142135623730951
- #define LEVEL_3DB 0.7071067811865476

HandBrake-0.9.9.tar.bz2/contrib/a52dec/A01-thread-safe.patch Deleted

@@ -1,462 +0,0 @@
-diff -Naur a52dec.old/include/a52.h a52dec.new/include/a52.h
---- a52dec.old/include/a52.h	2012-07-16 14:24:14.000000000 +0200
-+++ a52dec.new/include/a52.h	2012-07-16 14:31:37.000000000 +0200
-@@ -42,6 +42,11 @@
- } expbap_t;
- 
- typedef struct {
-+ sample_t real;
-+ sample_t imag;
-+} complex_t;
-+
-+typedef struct {
- uint8_t fscod; /* sample rate */
- uint8_t halfrate; /* halfrate factor */
- uint8_t acmod; /* coded channels */
-@@ -94,6 +99,20 @@
- 
- sample_t * samples;
- int downmixed;
-+
-+ /* Root values for IFFT */
-+ sample_t * roots16; // size 3
-+ sample_t * roots32; // size 7
-+ sample_t * roots64; // size 15
-+ sample_t * roots128; // size 31
-+
-+ /* Twiddle factors for IMDCT */
-+ complex_t * pre1; // size 128
-+ complex_t * post1; // size 64
-+ complex_t * pre2; // size 64
-+ complex_t * post2; // size 32
-+
-+ sample_t * a52_imdct_window; // size 256
- } a52_state_t;
- 
- #define A52_CHANNEL 0
-diff -Naur a52dec.old/liba52/a52_internal.h a52dec.new/liba52/a52_internal.h
---- a52dec.old/liba52/a52_internal.h	2012-07-16 14:24:14.000000000 +0200
-+++ a52dec.new/liba52/a52_internal.h	2012-07-16 14:28:33.000000000 +0200
-@@ -49,6 +49,6 @@
- 		 sample_t clev, sample_t slev);
- void a52_upmix (sample_t * samples, int acmod, int output);
- 
--void a52_imdct_init (uint32_t mm_accel);
--void a52_imdct_256 (sample_t * data, sample_t * delay, sample_t bias);
--void a52_imdct_512 (sample_t * data, sample_t * delay, sample_t bias);
-+void a52_imdct_init (a52_state_t * state, uint32_t mm_accel);
-+void a52_imdct_256 (a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias);
-+void a52_imdct_512 (a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias);
-diff -Naur a52dec.old/liba52/imdct.c a52dec.new/liba52/imdct.c
---- a52dec.old/liba52/imdct.c	2012-07-16 14:24:14.000000000 +0200
-+++ a52dec.new/liba52/imdct.c	2012-07-16 14:33:00.000000000 +0200
-@@ -40,11 +40,6 @@
- #include "a52_internal.h"
- #include "mm_accel.h"
- 
--typedef struct complex_s {
-- sample_t real;
-- sample_t imag;
--} complex_t;
--
- static uint8_t fftorder[] = {
- 0,128, 64,192, 32,160,224, 96, 16,144, 80,208,240,112, 48,176,
- 8,136, 72,200, 40,168,232,104,248,120, 56,184, 24,152,216, 88,
-@@ -56,22 +51,8 @@
- 6,134, 70,198, 38,166,230,102,246,118, 54,182, 22,150,214, 86
- };
- 
--/* Root values for IFFT */
--static sample_t roots16[3];
--static sample_t roots32[7];
--static sample_t roots64[15];
--static sample_t roots128[31];
--
--/* Twiddle factors for IMDCT */
--static complex_t pre1[128];
--static complex_t post1[64];
--static complex_t pre2[64];
--static complex_t post2[32];
--
--static sample_t a52_imdct_window[256];
--
--static void (* ifft128) (complex_t * buf);
--static void (* ifft64) (complex_t * buf);
-+static void (* ifft128) (a52_state_t * state, complex_t * buf);
-+static void (* ifft64) (a52_state_t * state, complex_t * buf);
- 
- static inline void ifft2 (complex_t * buf)
- {
-@@ -167,7 +148,7 @@
- a1.imag += tmp4;				\
- } while (0)
- 
--static inline void ifft8 (complex_t * buf)
-+static inline void ifft8 (a52_state_t * state, complex_t * buf)
- {
- double tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8;
- 
-@@ -175,7 +156,7 @@
- ifft2 (buf + 4);
- ifft2 (buf + 6);
- BUTTERFLY_ZERO (buf[0], buf[2], buf[4], buf[6]);
-- BUTTERFLY_HALF (buf[1], buf[3], buf[5], buf[7], roots16[1]);
-+ BUTTERFLY_HALF (buf[1], buf[3], buf[5], buf[7], state->roots16[1]);
- }
- 
- static void ifft_pass (complex_t * buf, sample_t * weight, int n)
-@@ -205,66 +186,66 @@
- } while (--i);
- }
- 
--static void ifft16 (complex_t * buf)
-+static void ifft16 (a52_state_t * state, complex_t * buf)
- {
-- ifft8 (buf);
-+ ifft8 (state, buf);
- ifft4 (buf + 8);
- ifft4 (buf + 12);
-- ifft_pass (buf, roots16 - 4, 4);
-+ ifft_pass (buf, state->roots16 - 4, 4);
- }
- 
--static void ifft32 (complex_t * buf)
-+static void ifft32 (a52_state_t * state, complex_t * buf)
- {
-- ifft16 (buf);
-- ifft8 (buf + 16);
-- ifft8 (buf + 24);
-- ifft_pass (buf, roots32 - 8, 8);
-+ ifft16 (state, buf);
-+ ifft8 (state, buf + 16);
-+ ifft8 (state, buf + 24);
-+ ifft_pass (buf, state->roots32 - 8, 8);
- }
- 
--static void ifft64_c (complex_t * buf)
-+static void ifft64_c (a52_state_t * state, complex_t * buf)
- {
-- ifft32 (buf);
-- ifft16 (buf + 32);
-- ifft16 (buf + 48);
-- ifft_pass (buf, roots64 - 16, 16);
-+ ifft32 (state, buf);
-+ ifft16 (state, buf + 32);
-+ ifft16 (state, buf + 48);
-+ ifft_pass (buf, state->roots64 - 16, 16);
- }
- 
--static void ifft128_c (complex_t * buf)
-+static void ifft128_c (a52_state_t * state, complex_t * buf)
- {
-- ifft32 (buf);
-- ifft16 (buf + 32);
-- ifft16 (buf + 48);
-- ifft_pass (buf, roots64 - 16, 16);
-+ ifft32 (state, buf);
-+ ifft16 (state, buf + 32);
-+ ifft16 (state, buf + 48);
-+ ifft_pass (buf, state->roots64 - 16, 16);
- 
-- ifft32 (buf + 64);
-- ifft32 (buf + 96);
-- ifft_pass (buf, roots128 - 32, 32);
-+ ifft32 (state, buf + 64);
-+ ifft32 (state, buf + 96);
-+ ifft_pass (buf, state->roots128 - 32, 32);
- }
- 
--void a52_imdct_512 (sample_t * data, sample_t * delay, sample_t bias)
-+void a52_imdct_512 (a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias)
- {
- int i, k;
- sample_t t_r, t_i, a_r, a_i, b_r, b_i, w_1, w_2;
-- const sample_t * window = a52_imdct_window;
-+ const sample_t * window = state->a52_imdct_window;
- complex_t buf[128];
- 	
- for (i = 0; i < 128; i++) {
- 	k = fftorder[i];
--	t_r = pre1[i].real;
--	t_i = pre1[i].imag;
-+	t_r = state->pre1[i].real;
-+	t_i = state->pre1[i].imag;
- 
- 	buf[i].real = t_i * data[255-k] + t_r * data[k];
- 	buf[i].imag = t_r * data[255-k] - t_i * data[k];
- }
- 
-- ifft128 (buf);
-+ ifft128 (state, buf);
- 
- /* Post IFFT complex multiply plus IFFT complex conjugate*/
- /* Window and convert to real valued signal */
- for (i = 0; i < 64; i++) {
- 	/* y[n] = z[n] * (xcos1[n] + j * xsin1[n]) ; */
--	t_r = post1[i].real;
--	t_i = post1[i].imag;
-+	t_r = state->post1[i].real;
-+	t_i = state->post1[i].imag;
- 
- 	a_r = t_r * buf[i].real + t_i * buf[i].imag;
- 	a_i = t_i * buf[i].real - t_r * buf[i].imag;
-@@ -285,18 +266,18 @@
- }
- }
- 
--void a52_imdct_256(sample_t * data, sample_t * delay, sample_t bias)
-+void a52_imdct_256(a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias)
- {
- int i, k;
- sample_t t_r, t_i, a_r, a_i, b_r, b_i, c_r, c_i, d_r, d_i, w_1, w_2;
-- const sample_t * window = a52_imdct_window;
-+ const sample_t * window = state->a52_imdct_window;
- complex_t buf1[64], buf2[64];
- 
- /* Pre IFFT complex multiply plus IFFT cmplx conjugate */
- for (i = 0; i < 64; i++) {
- 	k = fftorder[i];
--	t_r = pre2[i].real;
--	t_i = pre2[i].imag;
-+	t_r = state->pre2[i].real;
-+	t_i = state->pre2[i].imag;
- 
- 	buf1[i].real = t_i * data[254-k] + t_r * data[k];
- 	buf1[i].imag = t_r * data[254-k] - t_i * data[k];
-@@ -305,15 +286,15 @@
- 	buf2[i].imag = t_r * data[255-k] - t_i * data[k+1];
- }
- 
-- ifft64 (buf1);
-- ifft64 (buf2);
-+ ifft64 (state, buf1);
-+ ifft64 (state, buf2);
- 
- /* Post IFFT complex multiply */
- /* Window and convert to real valued signal */
- for (i = 0; i < 32; i++) {
- 	/* y1[n] = z1[n] * (xcos2[n] + j * xs in2[n]) ; */ 
--	t_r = post2[i].real;
--	t_i = post2[i].imag;
-+	t_r = state->post2[i].real;
-+	t_i = state->post2[i].imag;
- 
- 	a_r = t_r * buf1[i].real + t_i * buf1[i].imag;
- 	a_i = t_i * buf1[i].real - t_r * buf1[i].imag;
-@@ -362,7 +343,7 @@
- return bessel;
- }
- 
--void a52_imdct_init (uint32_t mm_accel)
-+void a52_imdct_init (a52_state_t * state, uint32_t mm_accel)
- {
- int i, k;
- double sum;
-@@ -371,50 +352,50 @@
- sum = 0;
- for (i = 0; i < 256; i++) {
- 	sum += besselI0 (i * (256 - i) * (5 * M_PI / 256) * (5 * M_PI / 256));
--	a52_imdct_window[i] = sum;
-+	state->a52_imdct_window[i] = sum;
- }
- sum++;
- for (i = 0; i < 256; i++)
--	a52_imdct_window[i] = sqrt (a52_imdct_window[i] / sum);
-+	state->a52_imdct_window[i] = sqrt (state->a52_imdct_window[i] / sum);
- 
- for (i = 0; i < 3; i++)
--	roots16[i] = cos ((M_PI / 8) * (i + 1));
-+	state->roots16[i] = cos ((M_PI / 8) * (i + 1));
- 
- for (i = 0; i < 7; i++)
--	roots32[i] = cos ((M_PI / 16) * (i + 1));
-+	state->roots32[i] = cos ((M_PI / 16) * (i + 1));
- 
- for (i = 0; i < 15; i++)
--	roots64[i] = cos ((M_PI / 32) * (i + 1));
-+	state->roots64[i] = cos ((M_PI / 32) * (i + 1));
- 
- for (i = 0; i < 31; i++)
--	roots128[i] = cos ((M_PI / 64) * (i + 1));
-+	state->roots128[i] = cos ((M_PI / 64) * (i + 1));
- 
- for (i = 0; i < 64; i++) {
- 	k = fftorder[i] / 2 + 64;
--	pre1[i].real = cos ((M_PI / 256) * (k - 0.25));
--	pre1[i].imag = sin ((M_PI / 256) * (k - 0.25));
-+	state->pre1[i].real = cos ((M_PI / 256) * (k - 0.25));
-+	state->pre1[i].imag = sin ((M_PI / 256) * (k - 0.25));
- }
- 
- for (i = 64; i < 128; i++) {
- 	k = fftorder[i] / 2 + 64;
--	pre1[i].real = -cos ((M_PI / 256) * (k - 0.25));
--	pre1[i].imag = -sin ((M_PI / 256) * (k - 0.25));
-+	state->pre1[i].real = -cos ((M_PI / 256) * (k - 0.25));
-+	state->pre1[i].imag = -sin ((M_PI / 256) * (k - 0.25));
- }
- 
- for (i = 0; i < 64; i++) {
--	post1[i].real = cos ((M_PI / 256) * (i + 0.5));
--	post1[i].imag = sin ((M_PI / 256) * (i + 0.5));
-+	state->post1[i].real = cos ((M_PI / 256) * (i + 0.5));
-+	state->post1[i].imag = sin ((M_PI / 256) * (i + 0.5));
- }
- 
- for (i = 0; i < 64; i++) {
- 	k = fftorder[i] / 4;
--	pre2[i].real = cos ((M_PI / 128) * (k - 0.25));
--	pre2[i].imag = sin ((M_PI / 128) * (k - 0.25));
-+	state->pre2[i].real = cos ((M_PI / 128) * (k - 0.25));
-+	state->pre2[i].imag = sin ((M_PI / 128) * (k - 0.25));
- }
- 
- for (i = 0; i < 32; i++) {
--	post2[i].real = cos ((M_PI / 128) * (i + 0.5));
--	post2[i].imag = sin ((M_PI / 128) * (i + 0.5));
-+	state->post2[i].real = cos ((M_PI / 128) * (i + 0.5));
-+	state->post2[i].imag = sin ((M_PI / 128) * (i + 0.5));
- }
- 
- #ifdef LIBA52_DJBFFT
-diff -Naur a52dec.old/liba52/parse.c a52dec.new/liba52/parse.c
---- a52dec.old/liba52/parse.c	2012-07-16 14:24:14.000000000 +0200
-+++ a52dec.new/liba52/parse.c	2012-07-16 14:33:00.000000000 +0200
-@@ -56,16 +56,53 @@
- a52_state_t * state;
- int i;
- 
-- state = malloc (sizeof (a52_state_t));
-+ state = calloc (1, sizeof (a52_state_t));
- if (state == NULL)
- 	return NULL;
- 
- state->samples = memalign (16, 256 * 12 * sizeof (sample_t));
- if (state->samples == NULL) {
--	free (state);
--	return NULL;
-+ goto fail;
- }
- 
-+ /* Root values for IFFT */
-+ state->roots16 = memalign (16, 3 * sizeof (sample_t));
-+ if (state->roots16 == NULL)
-+ goto fail;
-+
-+ state->roots32 = memalign (16, 7 * sizeof (sample_t));
-+ if (state->roots32 == NULL)
-+ goto fail;
-+
-+ state->roots64 = memalign (16, 15 * sizeof (sample_t));
-+ if (state->roots64 == NULL)
-+ goto fail;
-+
-+ state->roots128 = memalign (16, 31 * sizeof (sample_t));
-+ if (state->roots128 == NULL)
-+ goto fail;
-+
-+ /* Twiddle factors for IMDCT */
-+ state->pre1 = memalign (16, 128 * sizeof (complex_t));
-+ if (state->pre1 == NULL)
-+ goto fail;
-+
-+ state->post1 = memalign (16, 64 * sizeof (complex_t));
-+ if (state->post1 == NULL)
-+ goto fail;
-+
-+ state->pre2 = memalign (16, 64 * sizeof (complex_t));
-+ if (state->pre2 == NULL)
-+ goto fail;
-+
-+ state->post2 = memalign (16, 32 * sizeof (complex_t));
-+ if (state->post2 == NULL)
-+ goto fail;
-+
-+ state->a52_imdct_window = memalign (16, 256 * sizeof (sample_t));
-+ if (state->a52_imdct_window == NULL)
-+ goto fail;
-+
- for (i = 0; i < 256 * 12; i++)
- 	state->samples[i] = 0;
- 
-@@ -73,9 +110,27 @@
- 
- state->lfsr_state = 1;
- 
-- a52_imdct_init (mm_accel);
-+ a52_imdct_init (state, mm_accel);
- 
- return state;
-+
-+fail:
-+ if ( state )
-+ {
-+ free (state->a52_imdct_window);
-+ free (state->post2);
-+ free (state->pre2);
-+ free (state->post1);
-+ free (state->pre1);
-+ free (state->roots128);
-+ free (state->roots64);
-+ free (state->roots32);
-+ free (state->roots16);
-+ free (state->samples);
-+ free (state);
-+ }
-+ return NULL;
-+
- }
- 
- sample_t * a52_samples (a52_state_t * state)
-@@ -825,7 +880,7 @@
- 		 state->dynrng, 0, 7);
- 	 for (i = 7; i < 256; i++)
- 		(samples-256)[i] = 0;
--	 a52_imdct_512 (samples - 256, samples + 1536 - 256, state->bias);
-+	 a52_imdct_512 (state, samples - 256, samples + 1536 - 256, state->bias);
- 	} else {
- 	 /* just skip the LFE coefficients */
- 	 coeff_get (state, samples + 1280, &state->lfe_expbap, &quantizer,
-@@ -854,10 +909,10 @@
- 
- 	 if (coeff[i]) {
- 		if (blksw[i])
--		 a52_imdct_256 (samples + 256 * i, samples + 1536 + 256 * i,
-+		 a52_imdct_256 (state, samples + 256 * i, samples + 1536 + 256 * i,
- 				 bias);
- 		else 
--		 a52_imdct_512 (samples + 256 * i, samples + 1536 + 256 * i,
-+		 a52_imdct_512 (state, samples + 256 * i, samples + 1536 + 256 * i,
- 				 bias);
- 	 } else {
- 		int j;
-@@ -883,11 +938,11 @@
- 
- 	if (blksw[0])
- 	 for (i = 0; i < nfchans; i++)
--		a52_imdct_256 (samples + 256 * i, samples + 1536 + 256 * i,
-+		a52_imdct_256 (state, samples + 256 * i, samples + 1536 + 256 * i,
- 			 state->bias);
- 	else 
- 	 for (i = 0; i < nfchans; i++)
--		a52_imdct_512 (samples + 256 * i, samples + 1536 + 256 * i,
-+		a52_imdct_512 (state, samples + 256 * i, samples + 1536 + 256 * i,
- 			 state->bias);
- }
- 
-@@ -896,6 +951,15 @@
- 
- void a52_free (a52_state_t * state)
- {
-+ free (state->a52_imdct_window);
-+ free (state->post2);
-+ free (state->pre2);
-+ free (state->post1);
-+ free (state->pre1);
-+ free (state->roots128);
-+ free (state->roots64);
-+ free (state->roots32);
-+ free (state->roots16);
- free (state->samples);
- free (state);
- }

HandBrake-0.9.9.tar.bz2/contrib/a52dec/A02-imdct-shutup.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/a52dec/A03-automake.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/a52dec/module.defs Deleted

HandBrake-0.9.9.tar.bz2/contrib/a52dec/module.rules Deleted

HandBrake-0.9.9.tar.bz2/contrib/faac Deleted

HandBrake-0.9.9.tar.bz2/contrib/faac/A00-bitrates.patch Deleted

@@ -1,60 +0,0 @@
-diff -Naur faac-1.28.old/libfaac/frame.c faac-1.28.new/libfaac/frame.c
---- faac-1.28.old/libfaac/frame.c	2004-11-17 06:26:06.000000000 -0800
-+++ faac-1.28.new/libfaac/frame.c	2010-04-10 12:26:28.200614437 -0700
-@@ -196,6 +196,8 @@
- 			{47000, 10000},
- 			{64000, 16000},
- 			{76000, 20000},
-+			{128000, 22000},
-+			{160000, 22000},
- #endif
- 			{0, 0}
- 		};
-@@ -242,8 +244,6 @@
- 		config->bitRate = tmpbitRate * hEncoder->sampleRate / 44100;
- #endif
- 
--		if (config->bandWidth > bwbase)
--		 config->bandWidth = bwbase;
- 	}
- 
- hEncoder->config.bitRate = config->bitRate;
-@@ -251,6 +251,7 @@
- if (!config->bandWidth)
- {
- config->bandWidth = (config->quantqual - 100) * bwmult + bwbase;
-+ config->bandWidth *= (double)hEncoder->sampleRate / 44100;
- }
- 
- hEncoder->config.bandWidth = config->bandWidth;
-@@ -261,8 +262,8 @@
- if (hEncoder->config.bandWidth > (hEncoder->sampleRate / 2))
- 		hEncoder->config.bandWidth = hEncoder->sampleRate / 2;
- 
-- if (config->quantqual > 500)
--		config->quantqual = 500;
-+ if (config->quantqual > 700)
-+		config->quantqual = 700;
- if (config->quantqual < 10)
- 		config->quantqual = 10;
- 
-@@ -328,8 +329,6 @@
- hEncoder->config.useTns = 0;
- hEncoder->config.bitRate = 0; /* default bitrate / channel */
- hEncoder->config.bandWidth = bwfac * hEncoder->sampleRate;
-- if (hEncoder->config.bandWidth > bwbase)
--		hEncoder->config.bandWidth = bwbase;
- hEncoder->config.quantqual = 100;
- hEncoder->config.psymodellist = (psymodellist_t *)psymodellist;
- hEncoder->config.psymodelidx = 0;
-@@ -888,8 +887,8 @@
- 		if (((diff > 0) && (fix > 0.0)) || ((diff < 0) && (fix < 0.0)))
- 		{
- 			hEncoder->aacquantCfg.quality *= (1.0 - fix);
--			if (hEncoder->aacquantCfg.quality > 300)
--				hEncoder->aacquantCfg.quality = 300;
-+			if (hEncoder->aacquantCfg.quality > 700)
-+				hEncoder->aacquantCfg.quality = 700;
- if (hEncoder->aacquantCfg.quality < 50)
- hEncoder->aacquantCfg.quality = 50;
- 		}

HandBrake-0.9.9.tar.bz2/contrib/faac/A01-multichannel-improvements.patch Deleted

@@ -1,752 +0,0 @@
-diff -Naur faac-1.28.old/frontend/main.c faac-1.28.new/frontend/main.c
---- faac-1.28.old/frontend/main.c	2009-01-24 02:10:20.000000000 +0100
-+++ faac-1.28.new/frontend/main.c	2012-08-06 21:15:34.000000000 +0200
-@@ -858,7 +858,7 @@
- break;
- }
- if (infile->channels >= 6)
-- myFormat->useLfe = 1;
-+ myFormat->numLFEChannels = 1;
- myFormat->allowMidside = useMidSide;
- if (bitRate)
- myFormat->bitRate = bitRate / infile->channels;
-diff -Naur faac-1.28.old/include/faaccfg.h faac-1.28.new/include/faaccfg.h
---- faac-1.28.old/include/faaccfg.h	2004-07-04 14:12:05.000000000 +0200
-+++ faac-1.28.new/include/faaccfg.h	2012-08-06 21:15:34.000000000 +0200
-@@ -66,8 +66,14 @@
- /* Allow mid/side coding */
- unsigned int allowMidside;
- 
-- /* Use one of the channels as LFE channel */
-- unsigned int useLfe;
-+ /* Channel configuration */
-+ unsigned int channelConfiguration;
-+
-+ /* Number of front, side, back & LFE channels */
-+ unsigned int numFrontChannels;
-+ unsigned int numSideChannels;
-+ unsigned int numBackChannels;
-+ unsigned int numLFEChannels;
- 
- /* Use Temporal Noise Shaping */
- unsigned int useTns;
-diff -Naur faac-1.28.old/libfaac/bitstream.c faac-1.28.new/libfaac/bitstream.c
---- faac-1.28.old/libfaac/bitstream.c	2007-06-05 20:59:47.000000000 +0200
-+++ faac-1.28.new/libfaac/bitstream.c	2012-08-06 21:15:34.000000000 +0200
-@@ -1032,6 +1032,219 @@
- return j;
- }
- 
-+/* write a program_config_element() */
-+int WritePCE(faacEncHandle hEncoder,
-+ BitStream *bitStream,
-+ int byte_alignment,
-+ int instance_tag,
-+ int writeFlag)
-+{
-+ int i;
-+ int bits = 0;
-+
-+ /* we can have up to 29 full-bandwidth channels of each type:
-+ * 4 bits -> 0 - 15 elements, 14 CPEs (28 channels) and 1 SCE (1 channel)
-+ * we can have up to 3 LFE channels:
-+ * 2 bits -> 0 - 3 elements, 3 LFEs (1 channel) */
-+ if (hEncoder->config.numFrontChannels > 29) {
-+ fprintf(stderr, "WritePCE: too many front channels (%u)\n",
-+ hEncoder->config.numFrontChannels);
-+ return 0;
-+ }
-+ if (hEncoder->config.numSideChannels > 29) {
-+ fprintf(stderr, "WritePCE: too many side channels (%u)\n",
-+ hEncoder->config.numSideChannels);
-+ return 0;
-+ }
-+ if (hEncoder->config.numBackChannels > 29) {
-+ fprintf(stderr, "WritePCE: too many back channels (%u)\n",
-+ hEncoder->config.numBackChannels);
-+ return 0;
-+ }
-+ if (hEncoder->config.numLFEChannels > 3) {
-+ fprintf(stderr, "WritePCE: too many LFE channels (%u)\n",
-+ hEncoder->config.numLFEChannels);
-+ return 0;
-+ }
-+ /* program_config_element() shall be used only for the audio object types:
-+ * AAC main, AAC SSR, AAC LC and AAC LTP */
-+ if (hEncoder->config.aacObjectType > 4) {
-+ fprintf(stderr, "WritePCE: unsupported AudioObjectType %u",
-+ hEncoder->config.aacObjectType);
-+ return 0;
-+ }
-+
-+ /* Determine the channel configuration (see GetChannelInfo) */
-+ int sceTag = 0;
-+ int cpeTag = 0;
-+ int lfeTag = 0;
-+ int num_front_channel_elements = 0;
-+ int front_element_is_cpe[15] = { 0 };
-+ int front_element_tag_select[15] = { 0 };
-+ int num_side_channel_elements = 0;
-+ int side_element_is_cpe[15] = { 0 };
-+ int side_element_tag_select[15] = { 0 };
-+ int num_back_channel_elements = 0;
-+ int back_element_is_cpe[15] = { 0 };
-+ int back_element_tag_select[15] = { 0 };
-+ int num_lfe_channel_elements = 0;
-+ int lfe_element_tag_select[3] = { 0 };
-+ // Front channels
-+ i = hEncoder->config.numFrontChannels;
-+ if (i % 2) {
-+ front_element_is_cpe[num_front_channel_elements] = 0;
-+ front_element_tag_select[num_front_channel_elements] = sceTag;
-+ num_front_channel_elements++;
-+ sceTag++;
-+ i--;
-+ }
-+ while (i) {
-+ front_element_is_cpe[num_front_channel_elements] = 1;
-+ front_element_tag_select[num_front_channel_elements] = cpeTag;
-+ num_front_channel_elements++;
-+ cpeTag++;
-+ i -= 2;
-+ }
-+ // Side channels
-+ i = hEncoder->config.numSideChannels;
-+ while (i > 1) {
-+ side_element_is_cpe[num_side_channel_elements] = 1;
-+ side_element_tag_select[num_side_channel_elements] = cpeTag;
-+ num_side_channel_elements++;
-+ cpeTag++;
-+ i -= 2;
-+ }
-+ if (i) {
-+ side_element_is_cpe[num_side_channel_elements] = 0;
-+ side_element_tag_select[num_side_channel_elements] = sceTag;
-+ num_side_channel_elements++;
-+ sceTag++;
-+ i--;
-+ }
-+ // Back channels
-+ i = hEncoder->config.numBackChannels;
-+ while (i > 1) {
-+ back_element_is_cpe[num_back_channel_elements] = 1;
-+ back_element_tag_select[num_back_channel_elements] = cpeTag;
-+ num_back_channel_elements++;
-+ cpeTag++;
-+ i -= 2;
-+ }
-+ if (i) {
-+ back_element_is_cpe[num_back_channel_elements] = 0;
-+ back_element_tag_select[num_back_channel_elements] = sceTag;
-+ num_back_channel_elements++;
-+ sceTag++;
-+ i--;
-+ }
-+ // LFE channels
-+ i = hEncoder->config.numLFEChannels;
-+ while (i) {
-+ lfe_element_tag_select[num_lfe_channel_elements] = lfeTag;
-+ num_lfe_channel_elements++;
-+ lfeTag++;
-+ i--;
-+ }
-+
-+ /* element_instance_tag */
-+ if (writeFlag)
-+ PutBit(bitStream, instance_tag, 4);
-+ bits =+ 4;
-+
-+ /* object_type */
-+ if (writeFlag)
-+ PutBit(bitStream, hEncoder->config.aacObjectType - 1, 2);
-+ bits += 2;
-+
-+ /* sampling_frequency_index */
-+ if (writeFlag)
-+ PutBit(bitStream, hEncoder->sampleRateIdx, 4);
-+ bits += 4;
-+
-+ /* num_front_channel_elements */
-+ if (writeFlag)
-+ PutBit(bitStream, num_front_channel_elements, 4);
-+ bits += 4;
-+
-+ /* num_side_channel_elements */
-+ if (writeFlag)
-+ PutBit(bitStream, num_side_channel_elements, 4);
-+ bits += 4;
-+
-+ /* num_back_channel_elements */
-+ if (writeFlag)
-+ PutBit(bitStream, num_back_channel_elements, 4);
-+ bits += 4;
-+
-+ /* num_lfe_channel_elements */
-+ if (writeFlag)
-+ PutBit(bitStream, num_lfe_channel_elements, 2);
-+ bits += 2;
-+
-+ /* num_assoc_data_elements */
-+ if (writeFlag)
-+ PutBit(bitStream, 0, 3);
-+ bits += 3;
-+
-+ /* num_valid_cc_elements */
-+ if (writeFlag)
-+ PutBit(bitStream, 0, 4);
-+ bits += 4;
-+
-+ /* mono_mixdown_present */
-+ if (writeFlag)
-+ PutBit(bitStream, 0, 1);
-+ bits++;
-+
-+ /* stereo_mixdown_present */
-+ if (writeFlag)
-+ PutBit(bitStream, 0, 1);
-+ bits++;
-+
-+ /* matrix_mixdown_idx_present */
-+ if (writeFlag)
-+ PutBit(bitStream, 0, 1);
-+ bits++;
-+
-+ /* describe the channel configuration */
-+ for (i = 0; i < num_front_channel_elements; i++) {
-+ if (writeFlag) {
-+ PutBit(bitStream, front_element_is_cpe[i], 1);
-+ PutBit(bitStream, front_element_tag_select[i], 4);
-+ }
-+ bits += 5;
-+ }
-+ for (i = 0; i < num_side_channel_elements; i++) {
-+ if (writeFlag) {
-+ PutBit(bitStream, side_element_is_cpe[i], 1);
-+ PutBit(bitStream, side_element_tag_select[i], 4);
-+ }
-+ bits += 5;
-+ }
-+ for (i = 0; i < num_back_channel_elements; i++) {
-+ if (writeFlag) {
-+ PutBit(bitStream, back_element_is_cpe[i], 1);
-+ PutBit(bitStream, back_element_tag_select[i], 4);
-+ }
-+ bits += 5;
-+ }
-+ for (i = 0; i < num_lfe_channel_elements; i++) {
-+ if (writeFlag)
-+ PutBit(bitStream, lfe_element_tag_select[i], 4);
-+ bits += 4;
-+ }
-+
-+ /* byte_alignment() */
-+ bits += ByteAlign(bitStream, writeFlag, bits + byte_alignment);
-+
-+ /* comment_field_bytes */
-+ if (writeFlag)
-+ PutBit(bitStream, 0, 8);
-+ bits += 8;
-+
-+ return bits;
-+}
-+
- #ifdef DRM
- /*
- ****************************************************************************
-diff -Naur faac-1.28.old/libfaac/bitstream.h faac-1.28.new/libfaac/bitstream.h
---- faac-1.28.old/libfaac/bitstream.h	2004-07-04 14:10:52.000000000 +0200
-+++ faac-1.28.new/libfaac/bitstream.h	2012-08-06 21:15:34.000000000 +0200
-@@ -164,6 +164,13 @@
- unsigned long data,
- int numBit);
- 
-+/* write a program_config_element() */
-+int WritePCE(faacEncHandle hEncoder,
-+ BitStream *bitStream,
-+ int byte_alignment,
-+ int instance_tag,
-+ int writeFlag);
-+
- #ifdef __cplusplus
- }
- #endif /* __cplusplus */
-diff -Naur faac-1.28.old/libfaac/channels.c faac-1.28.new/libfaac/channels.c
---- faac-1.28.old/libfaac/channels.c	2001-09-04 20:39:35.000000000 +0200
-+++ faac-1.28.new/libfaac/channels.c	2012-08-06 21:15:34.000000000 +0200
-@@ -28,83 +28,112 @@
- #include "coder.h"
- #include "util.h"
- 
--/* If LFE present */
--/* Num channels # of SCE's # of CPE's #of LFE's */
--/* ============ ========== ========== ========= */
--/* 1 1 0 0 */
--/* 2 0 1 0 */
--/* 3 1 1 0 */
--/* 4 1 1 1 */
--/* 5 1 2 0 */
--/* For more than 5 channels, use the following elements: */
--/* 2*N 1 2*(N-1) 1 */
--/* 2*N+1 1 2*N 0 */
--/* */
--/* Else: */
--/* */
--/* Num channels # of SCE's # of CPE's #of LFE's */
--/* ============ ========== ========== ========= */
--/* 1 1 0 0 */
--/* 2 0 1 0 */
--/* 3 1 1 0 */
--/* 4 2 1 0 */
--/* 5 1 2 0 */
--/* For more than 5 channels, use the following elements: */
--/* 2*N 2 2*(N-1) 0 */
--/* 2*N+1 1 2*N 0 */
--
--void GetChannelInfo(ChannelInfo *channelInfo, int numChannels, int useLfe)
--{
-- int sceTag = 0;
-- int lfeTag = 0;
-- int cpeTag = 0;
-- int numChannelsLeft = numChannels;
-+static void addSCE(ChannelInfo *channelInfo, int numChannels, int numChannelsLeft, int tag);
-+static void addCPE(ChannelInfo *channelInfo, int numChannels, int numChannelsLeft, int tag);
-+static void addLFE(ChannelInfo *channelInfo, int numChannels, int numChannelsLeft, int tag);
- 
- 
-- /* First element is sce, except for 2 channel case */
-- if (numChannelsLeft != 2) {
-- channelInfo[numChannels-numChannelsLeft].present = 1;
-- channelInfo[numChannels-numChannelsLeft].tag = sceTag++;
-- channelInfo[numChannels-numChannelsLeft].cpe = 0;
-- channelInfo[numChannels-numChannelsLeft].lfe = 0;
-+void GetChannelInfo(ChannelInfo *channelInfo, int numFrontChannels, int numSideChannels, int numBackChannels, int numLFEChannels)
-+{
-+ int i;
-+ int sceTag = 0;
-+ int cpeTag = 0;
-+ int lfeTag = 0;
-+ int numChannels = (numFrontChannels +
-+ numSideChannels +
-+ numBackChannels +
-+ numLFEChannels);
-+ int numChannelsLeft = numChannels;
-+
-+ /* Front channels */
-+ i = numFrontChannels;
-+ if (i % 2) {
-+ // Front Center
-+ addSCE(channelInfo, numChannels, numChannelsLeft, sceTag);
- numChannelsLeft--;
-+ sceTag++;
-+ i--;
-+ }
-+ while (i) {
-+ // Front Left/Right, Front Left/Right of Center, ???
-+ addCPE(channelInfo, numChannels, numChannelsLeft, cpeTag);
-+ numChannelsLeft -= 2;
-+ cpeTag++;
-+ i -= 2;
- }
- 
-- /* Next elements are cpe's */
-- while (numChannelsLeft > 1) {
-- /* Left channel info */
-- channelInfo[numChannels-numChannelsLeft].present = 1;
-- channelInfo[numChannels-numChannelsLeft].tag = cpeTag++;
-- channelInfo[numChannels-numChannelsLeft].cpe = 1;
-- channelInfo[numChannels-numChannelsLeft].common_window = 0;
-- channelInfo[numChannels-numChannelsLeft].ch_is_left = 1;
-- channelInfo[numChannels-numChannelsLeft].paired_ch = numChannels-numChannelsLeft+1;
-- channelInfo[numChannels-numChannelsLeft].lfe = 0;
-+ /* Side channels */
-+ i = numSideChannels;
-+ while (i > 1) {
-+ // Surround Left/Right (if rear surrounds present), ???
-+ addCPE(channelInfo, numChannels, numChannelsLeft, cpeTag);
-+ numChannelsLeft -= 2;
-+ cpeTag++;
-+ i -= 2;
-+ }
-+ if (i) {
-+ // ???
-+ addSCE(channelInfo, numChannels, numChannelsLeft, sceTag);
- numChannelsLeft--;
-+ sceTag++;
-+ i--;
-+ }
- 
-- /* Right channel info */
-- channelInfo[numChannels-numChannelsLeft].present = 1;
-- channelInfo[numChannels-numChannelsLeft].cpe = 1;
-- channelInfo[numChannels-numChannelsLeft].common_window = 0;
-- channelInfo[numChannels-numChannelsLeft].ch_is_left = 0;
-- channelInfo[numChannels-numChannelsLeft].paired_ch = numChannels-numChannelsLeft-1;
-- channelInfo[numChannels-numChannelsLeft].lfe = 0;
-+ /* Back channels */
-+ i = numBackChannels;
-+ while (i > 1) {
-+ // Surround Left/Right (if rear surrounds absent), Rear Surround Left/Right, ???
-+ addCPE(channelInfo, numChannels, numChannelsLeft, cpeTag);
-+ numChannelsLeft -= 2;
-+ cpeTag++;
-+ i -= 2;
-+ }
-+ if (i) {
-+ // Surround Center
-+ addSCE(channelInfo, numChannels, numChannelsLeft, sceTag);
- numChannelsLeft--;
-+ sceTag++;
-+ i--;
- }
- 
-- /* Is there another channel left ? */
-- if (numChannelsLeft) {
-- if (useLfe) {
-- channelInfo[numChannels-numChannelsLeft].present = 1;
-- channelInfo[numChannels-numChannelsLeft].tag = lfeTag++;
-- channelInfo[numChannels-numChannelsLeft].cpe = 0;
-- channelInfo[numChannels-numChannelsLeft].lfe = 1;
-- } else {
-- channelInfo[numChannels-numChannelsLeft].present = 1;
-- channelInfo[numChannels-numChannelsLeft].tag = sceTag++;
-- channelInfo[numChannels-numChannelsLeft].cpe = 0;
-- channelInfo[numChannels-numChannelsLeft].lfe = 0;
-- }
-+ /* LFE channel */
-+ i = numLFEChannels;
-+ while (i) {
-+ addLFE(channelInfo, numChannels, numChannelsLeft, lfeTag);
- numChannelsLeft--;
-+ lfeTag++;
-+ i--;
- }
- }
-+
-+static void addSCE(ChannelInfo *channelInfo, int numChannels, int numChannelsLeft, int tag) {
-+ channelInfo[numChannels-numChannelsLeft].present = 1;
-+ channelInfo[numChannels-numChannelsLeft].cpe = 0;
-+ channelInfo[numChannels-numChannelsLeft].lfe = 0;
-+ channelInfo[numChannels-numChannelsLeft].tag = tag;
-+}
-+
-+static void addCPE(ChannelInfo *channelInfo, int numChannels, int numChannelsLeft, int tag) {
-+ /* Left channel info */
-+ channelInfo[numChannels-numChannelsLeft].present = 1;
-+ channelInfo[numChannels-numChannelsLeft].cpe = 1;
-+ channelInfo[numChannels-numChannelsLeft].lfe = 0;
-+ channelInfo[numChannels-numChannelsLeft].tag = tag;
-+ channelInfo[numChannels-numChannelsLeft].ch_is_left = 1;
-+ channelInfo[numChannels-numChannelsLeft].common_window = 0;
-+ channelInfo[numChannels-numChannelsLeft].paired_ch = numChannels-numChannelsLeft+1;
-+ /* Right channel info */
-+ channelInfo[numChannels-numChannelsLeft+1].present = 1;
-+ channelInfo[numChannels-numChannelsLeft+1].cpe = 1;
-+ channelInfo[numChannels-numChannelsLeft+1].lfe = 0;
-+ channelInfo[numChannels-numChannelsLeft+1].ch_is_left = 0;
-+ channelInfo[numChannels-numChannelsLeft+1].common_window = 0;
-+ channelInfo[numChannels-numChannelsLeft+1].paired_ch = numChannels-numChannelsLeft;
-+}
-+
-+static void addLFE(ChannelInfo *channelInfo, int numChannels, int numChannelsLeft, int tag) {
-+ channelInfo[numChannels-numChannelsLeft].present = 1;
-+ channelInfo[numChannels-numChannelsLeft].cpe = 0;
-+ channelInfo[numChannels-numChannelsLeft].lfe = 1;
-+ channelInfo[numChannels-numChannelsLeft].tag = tag;
-+}
-diff -Naur faac-1.28.old/libfaac/channels.h faac-1.28.new/libfaac/channels.h
---- faac-1.28.old/libfaac/channels.h	2003-06-26 21:19:41.000000000 +0200
-+++ faac-1.28.new/libfaac/channels.h	2012-08-06 21:15:34.000000000 +0200
-@@ -45,7 +45,7 @@
- MSInfo msInfo;
- } ChannelInfo;
- 
--void GetChannelInfo(ChannelInfo *channelInfo, int numChannels, int useLfe);
-+void GetChannelInfo(ChannelInfo *channelInfo, int numFrontChannels, int numSideChannels, int numBackChannels, int numLFEChannels);
- 
- #ifdef __cplusplus
- }
-diff -Naur faac-1.28.old/libfaac/frame.c faac-1.28.new/libfaac/frame.c
---- faac-1.28.old/libfaac/frame.c	2004-11-17 15:26:06.000000000 +0100
-+++ faac-1.28.new/libfaac/frame.c	2012-08-06 21:15:34.000000000 +0200
-@@ -99,21 +99,47 @@
- return -2; /* not supported */
- }
- 
-- *pSizeOfDecoderSpecificInfo = 2;
-- *ppBuffer = malloc(2);
-+ if (hEncoder->config.channelConfiguration > 7) {
-+ fprintf(stderr, "faacEncGetDecoderSpecificInfo: "
-+ "invalid channel configuration %u\n",
-+ hEncoder->config.channelConfiguration);
-+ return -2;
-+ } else if (hEncoder->config.channelConfiguration) {
-+ // 16 bits
-+ *pSizeOfDecoderSpecificInfo = 2;
-+ } else {
-+ // 16 bits + size of the program_config_element()
-+ *pSizeOfDecoderSpecificInfo = 2 + (WritePCE(hEncoder, NULL, 0, 0, 0) / 8);
-+ }
- 
-- if(*ppBuffer != NULL){
-+ *ppBuffer = malloc(*pSizeOfDecoderSpecificInfo);
- 
-+ if (*ppBuffer != NULL) {
- memset(*ppBuffer,0,*pSizeOfDecoderSpecificInfo);
- pBitStream = OpenBitStream(*pSizeOfDecoderSpecificInfo, *ppBuffer);
- PutBit(pBitStream, hEncoder->config.aacObjectType, 5);
- PutBit(pBitStream, hEncoder->sampleRateIdx, 4);
-- PutBit(pBitStream, hEncoder->numChannels, 4);
-+ PutBit(pBitStream, hEncoder->config.channelConfiguration, 4);
-+ PutBit(pBitStream, 0, 1); // frameLengthFlag
-+ PutBit(pBitStream, 0, 1); // dependsOnCoreCoder
-+ PutBit(pBitStream, 0, 1); // extensionFlag
-+ if (!hEncoder->config.channelConfiguration) {
-+ /* a program_config_element() must be written */
-+ if (WritePCE(hEncoder, pBitStream, 0, 0, 1) <= 0) {
-+ fprintf(stderr,
-+ "faacEncGetDecoderSpecificInfo: WritePCE() failed!\n");
-+ *pSizeOfDecoderSpecificInfo = 0;
-+ CloseBitStream(pBitStream);
-+ free(*ppBuffer);
-+ *ppBuffer = NULL;
-+ return -3;
-+ }
-+ }
- CloseBitStream(pBitStream);
--
- return 0;
- } else {
-- return -3;
-+ *pSizeOfDecoderSpecificInfo = 0;
-+ return -4;
- }
- }
- 
-@@ -131,7 +157,6 @@
- 	int i;
- 
- hEncoder->config.allowMidside = config->allowMidside;
-- hEncoder->config.useLfe = config->useLfe;
- hEncoder->config.useTns = config->useTns;
- hEncoder->config.aacObjectType = config->aacObjectType;
- hEncoder->config.mpegVersion = config->mpegVersion;
-@@ -139,6 +164,77 @@
- hEncoder->config.inputFormat = config->inputFormat;
- hEncoder->config.shortctl = config->shortctl;
- 
-+ if (!config->channelConfiguration) {
-+ if (hEncoder->numChannels != (config->numFrontChannels +
-+ config->numSideChannels +
-+ config->numBackChannels +
-+ config->numLFEChannels)) {
-+ fprintf(stderr, "faacEncSetConfiguration: "
-+ "numChannels doesn't match the custom channel configuration\n");
-+ return 0;
-+ }
-+ hEncoder->config.numFrontChannels = config->numFrontChannels;
-+ hEncoder->config.numSideChannels = config->numSideChannels;
-+ hEncoder->config.numBackChannels = config->numBackChannels;
-+ hEncoder->config.numLFEChannels = config->numLFEChannels;
-+ } else if (config->channelConfiguration > 7) {
-+ fprintf(stderr, "faacEncSetConfiguration: "
-+ "invalid channel configuration %u\n",
-+ config->channelConfiguration);
-+ return 0;
-+ } else {
-+ if ((config->channelConfiguration == 7 && hEncoder->numChannels != 8) ||
-+ (config->channelConfiguration != 7 && hEncoder->numChannels != config->channelConfiguration)) {
-+ fprintf(stderr, "faacEncSetConfiguration: "
-+ "numChannels doesn't match the channel configuration\n");
-+ return 0;
-+ }
-+ switch (config->channelConfiguration) {
-+ case 7:
-+ hEncoder->config.numFrontChannels = 5;
-+ hEncoder->config.numSideChannels = 0;
-+ hEncoder->config.numBackChannels = 2;
-+ hEncoder->config.numLFEChannels = 1;
-+ break;
-+ case 6:
-+ hEncoder->config.numFrontChannels = 3;
-+ hEncoder->config.numSideChannels = 0;
-+ hEncoder->config.numBackChannels = 2;
-+ hEncoder->config.numLFEChannels = 1;
-+ break;
-+ case 5:
-+ hEncoder->config.numFrontChannels = 3;
-+ hEncoder->config.numSideChannels = 0;
-+ hEncoder->config.numBackChannels = 2;
-+ hEncoder->config.numLFEChannels = 0;
-+ break;
-+ case 4:
-+ hEncoder->config.numFrontChannels = 3;
-+ hEncoder->config.numSideChannels = 0;
-+ hEncoder->config.numBackChannels = 1;
-+ hEncoder->config.numLFEChannels = 0;
-+ break;
-+ case 3:
-+ hEncoder->config.numFrontChannels = 3;
-+ hEncoder->config.numSideChannels = 0;
-+ hEncoder->config.numBackChannels = 0;
-+ hEncoder->config.numLFEChannels = 0;
-+ break;
-+ case 2:
-+ hEncoder->config.numFrontChannels = 2;
-+ hEncoder->config.numSideChannels = 0;
-+ hEncoder->config.numBackChannels = 0;
-+ hEncoder->config.numLFEChannels = 0;
-+ break;
-+ case 1:
-+ hEncoder->config.numFrontChannels = 1;
-+ hEncoder->config.numSideChannels = 0;
-+ hEncoder->config.numBackChannels = 0;
-+ hEncoder->config.numLFEChannels = 0;
-+ break;
-+ }
-+ }
-+
- assert((hEncoder->config.outputFormat == 0) || (hEncoder->config.outputFormat == 1));
- 
- switch( hEncoder->config.inputFormat )
-@@ -306,6 +402,12 @@
- *maxOutputBytes += 1; /* for CRC */
- #endif
- 
-+ if (!numChannels || numChannels > 64) {
-+ fprintf(stderr, "faacEncOpen: invalid number of channels %u\n",
-+ numChannels);
-+ return NULL;
-+ }
-+
- hEncoder = (faacEncStruct*)AllocMemory(sizeof(faacEncStruct));
- SetMemory(hEncoder, 0, sizeof(faacEncStruct));
- 
-@@ -324,7 +426,6 @@
- hEncoder->config.mpegVersion = MPEG4;
- hEncoder->config.aacObjectType = LTP;
- hEncoder->config.allowMidside = 1;
-- hEncoder->config.useLfe = 1;
- hEncoder->config.useTns = 0;
- hEncoder->config.bitRate = 0; /* default bitrate / channel */
- hEncoder->config.bandWidth = bwfac * hEncoder->sampleRate;
-@@ -340,6 +441,91 @@
- 	/* default channel map is straight-through */
- 	for( channel = 0; channel < 64; channel++ )
- 		hEncoder->config.channel_map[channel] = channel;
-+
-+ /* Define a sensible default channel configuration */
-+ if (numChannels <= 6 || numChannels == 8) {
-+ switch (numChannels) {
-+ case 8:
-+ hEncoder->config.channelConfiguration = 7;
-+ hEncoder->config.numFrontChannels = 5;
-+ hEncoder->config.numSideChannels = 0;
-+ hEncoder->config.numBackChannels = 2;
-+ hEncoder->config.numLFEChannels = 1;
-+ break;
-+ case 6:
-+ hEncoder->config.channelConfiguration = 6;
-+ hEncoder->config.numFrontChannels = 3;
-+ hEncoder->config.numSideChannels = 0;
-+ hEncoder->config.numBackChannels = 2;
-+ hEncoder->config.numLFEChannels = 1;
-+ break;
-+ case 5:
-+ hEncoder->config.channelConfiguration = 5;
-+ hEncoder->config.numFrontChannels = 3;
-+ hEncoder->config.numSideChannels = 0;
-+ hEncoder->config.numBackChannels = 2;
-+ hEncoder->config.numLFEChannels = 0;
-+ break;
-+ case 4:
-+ hEncoder->config.channelConfiguration = 4;
-+ hEncoder->config.numFrontChannels = 3;
-+ hEncoder->config.numSideChannels = 0;
-+ hEncoder->config.numBackChannels = 1;
-+ hEncoder->config.numLFEChannels = 0;
-+ break;
-+ case 3:
-+ hEncoder->config.channelConfiguration = 3;
-+ hEncoder->config.numFrontChannels = 3;
-+ hEncoder->config.numSideChannels = 0;
-+ hEncoder->config.numBackChannels = 0;
-+ hEncoder->config.numLFEChannels = 0;
-+ break;
-+ case 2:
-+ hEncoder->config.channelConfiguration = 2;
-+ hEncoder->config.numFrontChannels = 2;
-+ hEncoder->config.numSideChannels = 0;
-+ hEncoder->config.numBackChannels = 0;
-+ hEncoder->config.numLFEChannels = 0;
-+ break;
-+ case 1:
-+ hEncoder->config.channelConfiguration = 1;
-+ hEncoder->config.numFrontChannels = 1;
-+ hEncoder->config.numSideChannels = 0;
-+ hEncoder->config.numBackChannels = 0;
-+ hEncoder->config.numLFEChannels = 0;
-+ break;
-+ }
-+ } else {
-+ hEncoder->config.channelConfiguration = 0;
-+ hEncoder->config.numFrontChannels = 0;
-+ hEncoder->config.numSideChannels = 0;
-+ hEncoder->config.numBackChannels = 0;
-+ hEncoder->config.numLFEChannels = 0;
-+ for (channel = numChannels; channel > 0; channel--) {
-+ // 7 channels: 7.0 (C L R Ls Rs Rls Rrs)
-+ // 9 channels: 9.0 (Lc Rc L R Ls Rs Rls Rrs Cs)
-+ // 10 channels: 10.0 (C Lc Rc L R Ls Rs Rls Rrs Cs)
-+ // for more than 10 channels, use faacEncSetConfiguration()
-+ if (hEncoder->config.numFrontChannels < 3) {
-+ // C, L, R
-+ hEncoder->config.numFrontChannels++;
-+ } else if (hEncoder->config.numBackChannels < 2) {
-+ // Ls or Rls, Rs or Rrs
-+ hEncoder->config.numBackChannels++;
-+ } else if (hEncoder->config.numSideChannels < 2) {
-+ // Ls, Rs
-+ hEncoder->config.numSideChannels++;
-+ } else if (hEncoder->config.numBackChannels < 3) {
-+ // Cs
-+ hEncoder->config.numBackChannels++;
-+ } else if (hEncoder->config.numFrontChannels < 5) {
-+ // Lc, Rc
-+ hEncoder->config.numFrontChannels++;
-+ } else {
-+ break;
-+ }
-+ }
-+ }
- 	
- /*
- by default we have to be compatible with all previous software
-@@ -459,14 +645,13 @@
- double fix;
- #endif
- 
-- /* local copy's of parameters */
-+ /* local copies of parameters */
- ChannelInfo *channelInfo = hEncoder->channelInfo;
- CoderInfo *coderInfo = hEncoder->coderInfo;
- unsigned int numChannels = hEncoder->numChannels;
- unsigned int sampleRate = hEncoder->sampleRate;
- unsigned int aacObjectType = hEncoder->config.aacObjectType;
- unsigned int mpegVersion = hEncoder->config.mpegVersion;
-- unsigned int useLfe = hEncoder->config.useLfe;
- unsigned int useTns = hEncoder->config.useTns;
- unsigned int allowMidside = hEncoder->config.allowMidside;
- unsigned int bandWidth = hEncoder->config.bandWidth;
-@@ -484,7 +669,11 @@
- return 0;
- 
- /* Determine the channel configuration */
-- GetChannelInfo(channelInfo, numChannels, useLfe);
-+ GetChannelInfo(channelInfo,
-+ hEncoder->config.numFrontChannels,
-+ hEncoder->config.numSideChannels,
-+ hEncoder->config.numBackChannels,
-+ hEncoder->config.numLFEChannels);
- 
- /* Update current sample buffers */
- for (channel = 0; channel < numChannels; channel++)

HandBrake-0.9.9.tar.bz2/contrib/faac/P00-cygwin.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/faac/module.defs Deleted

HandBrake-0.9.9.tar.bz2/contrib/faac/module.rules Deleted

HandBrake-0.9.9.tar.bz2/contrib/faad2 Deleted

HandBrake-0.9.9.tar.bz2/contrib/faad2/P00-mingw-types.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/faad2/P00-solaris.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/faad2/module.defs Deleted

HandBrake-0.9.9.tar.bz2/contrib/faad2/module.rules Deleted

HandBrake-0.9.9.tar.bz2/contrib/ffmpeg/A01-h264-recovery-point.patch Deleted

@@ -1,63 +0,0 @@
-diff --git a/libavcodec/h264.c b/libavcodec/h264.c
-index 8625b0f..e862701 100644
---- a/libavcodec/h264.c
-+++ b/libavcodec/h264.c
-@@ -2164,6 +2164,7 @@ static void flush_dpb(AVCodecContext *avctx)
- 
- flush_change(h);
- ff_mpeg_flush(avctx);
-+ h->recovery_frame= -1;
- }
- 
- static int init_poc(H264Context *h)
-@@ -4001,9 +4002,18 @@ again:
- if ((err = decode_slice_header(hx, h)))
- break;
- 
-+ if (h->sei_recovery_frame_cnt >= 0 && h->recovery_frame < 0) {
-+ h->recovery_frame = (h->frame_num + h->sei_recovery_frame_cnt) %
-+ (1 << h->sps.log2_max_frame_num);
-+ }
-+
- s->current_picture_ptr->f.key_frame |=
-- (hx->nal_unit_type == NAL_IDR_SLICE) ||
-- (h->sei_recovery_frame_cnt >= 0);
-+ (hx->nal_unit_type == NAL_IDR_SLICE);
-+
-+ if (h->recovery_frame == h->frame_num) {
-+ s->current_picture_ptr->f.key_frame |= 1;
-+ h->recovery_frame = -1;
-+ }
- 
- if (h->current_slice == 1) {
- if (!(s->flags2 & CODEC_FLAG2_CHUNKS))
-diff --git a/libavcodec/h264.h b/libavcodec/h264.h
-index 898ebf7..42aaa6f 100644
---- a/libavcodec/h264.h
-+++ b/libavcodec/h264.h
-@@ -568,6 +568,13 @@ typedef struct H264Context {
- * frames.
- */
- int sei_recovery_frame_cnt;
-+ /**
-+ * recovery_frame is the frame_num at which the next frame should
-+ * be fully constructed.
-+ *
-+ * Set to -1 when not expecting a recovery point.
-+ */
-+ int recovery_frame;
- 
- 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
-diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c
-index 2e5fb65..ea33a18 100644
---- a/libavcodec/h264_sei.c
-+++ b/libavcodec/h264_sei.c
-@@ -38,6 +38,7 @@ static const uint8_t sei_num_clock_ts_table[9]={
- };
- 
- void ff_h264_reset_sei(H264Context *h) {
-+ h->recovery_frame = -1;
- h->sei_recovery_frame_cnt = -1;
- h->sei_dpb_output_delay = 0;
- h->sei_cpb_removal_delay = -1;

HandBrake-0.9.9.tar.bz2/contrib/ffmpeg/A02-dca-resync.patch Deleted

@@ -1,73 +0,0 @@
-From 9922584ba3b5b02d913e629ea74d72e994870873 Mon Sep 17 00:00:00 2001
-From: John Stebbins <jstebbins.hb@gmail.com>
-Date: Thu, 17 Jan 2013 19:57:26 +0100
-Subject: [PATCH] dca_parser: Handle changes in dca frame size
-
-A change in framesize caused a perpetual loss of synchronization.
-So read (and use) the frame size from the frame header instead of
-setting it only once.
----
- libavcodec/dca_parser.c | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/libavcodec/dca_parser.c b/libavcodec/dca_parser.c
-index ab235cf..12180f3 100644
---- a/libavcodec/dca_parser.c
-+++ b/libavcodec/dca_parser.c
-@@ -62,10 +62,12 @@ static int dca_find_frame_end(DCAParseContext * pc1, const uint8_t * buf,
- if (IS_MARKER(state, i, buf, buf_size)) {
- if (pc1->lastmarker && state == pc1->lastmarker) {
- start_found = 1;
-+ i++;
- break;
- } else if (!pc1->lastmarker) {
- start_found = 1;
- pc1->lastmarker = state;
-+ i++;
- break;
- }
- }
-@@ -80,9 +82,6 @@ static int dca_find_frame_end(DCAParseContext * pc1, const uint8_t * buf,
- if (state == pc1->lastmarker && IS_MARKER(state, i, buf, buf_size)) {
- if(pc1->framesize > pc1->size)
- continue;
-- if(!pc1->framesize){
-- pc1->framesize = pc1->hd_pos ? pc1->hd_pos : pc1->size;
-- }
- pc->frame_start_found = 0;
- pc->state = -1;
- pc1->size = 0;
-@@ -139,7 +138,7 @@ int ff_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
- }
- 
- static int dca_parse_params(const uint8_t *buf, int buf_size, int *duration,
-- int *sample_rate)
-+ int *sample_rate, int *framesize)
- {
- GetBitContext gb;
- uint8_t hdr[12 + FF_INPUT_BUFFER_PADDING_SIZE] = { 0 };
-@@ -159,7 +158,11 @@ static int dca_parse_params(const uint8_t *buf, int buf_size, int *duration,
- return AVERROR_INVALIDDATA;
- *duration = 256 * (sample_blocks / 8);
- 
-- skip_bits(&gb, 20);
-+ *framesize = get_bits(&gb, 14) + 1;
-+ if (*framesize < 95)
-+ return AVERROR_INVALIDDATA;
-+
-+ skip_bits(&gb, 6);
- sr_code = get_bits(&gb, 4);
- *sample_rate = avpriv_dca_sample_rates[sr_code];
- if (*sample_rate == 0)
-@@ -190,7 +193,7 @@ static int dca_parse(AVCodecParserContext * s,
- }
- 
- /* read the duration and sample rate from the frame header */
-- if (!dca_parse_params(buf, buf_size, &duration, &sample_rate)) {
-+ if (!dca_parse_params(buf, buf_size, &duration, &sample_rate, &pc1->framesize)) {
- s->duration = duration;
- avctx->sample_rate = sample_rate;
- } else
--- 
-1.7.10.4
-

HandBrake-0.9.9.tar.bz2/contrib/ffmpeg/A03-truehd-downmix.patch Deleted

@@ -1,33 +0,0 @@
-diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
-index 0eaf2e3..ef1812d 100644
---- a/libavcodec/mlpdec.c
-+++ b/libavcodec/mlpdec.c
-@@ -445,14 +445,24 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
- return AVERROR_INVALIDDATA;
- }
- 
-- if (m->avctx->request_channels > 0
-- && s->max_channel + 1 >= m->avctx->request_channels
-- && substr < m->max_decoded_substream) {
-+#if FF_API_REQUEST_CHANNELS
-+ if (m->avctx->request_channels > 0 &&
-+ m->avctx->request_channels <= s->max_channel + 1 &&
-+ m->max_decoded_substream > substr) {
- av_log(m->avctx, AV_LOG_DEBUG,
-- "Extracting %d channel downmix from substream %d. "
-+ "Extracting %d-channel downmix from substream %d. "
- "Further substreams will be skipped.\n",
- s->max_channel + 1, substr);
- m->max_decoded_substream = substr;
-+ } else
-+#endif
-+ if (m->avctx->request_channel_layout == s->ch_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",
-+ s->max_channel + 1, s->ch_layout, substr);
-+ m->max_decoded_substream = substr;
- }
- 
- s->noise_shift = get_bits(gbp, 4);

HandBrake-0.9.9.tar.bz2/contrib/libbluray/A00-automake.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/libdvdnav/A00-log-stderr.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/libdvdnav/A01-program-info.patch Deleted

@@ -1,214 +0,0 @@
-diff -Naur libdvdnav.orig/src/dvdnav/dvdnav.h libdvdnav/src/dvdnav/dvdnav.h
---- libdvdnav.orig/src/dvdnav/dvdnav.h	2009-03-13 18:28:22.000000000 -0700
-+++ libdvdnav/src/dvdnav/dvdnav.h	2009-04-30 10:56:29.000000000 -0700
-@@ -279,6 +279,11 @@
- dvdnav_status_t dvdnav_part_play(dvdnav_t *self, int32_t title, int32_t part);
- 
- /*
-+ * Plays the specified title, starting from the specified program
-+ */
-+dvdnav_status_t dvdnav_program_play(dvdnav_t *this, int32_t title, int32_t pgcn, int32_t pgn);
-+
-+/*
- * Stores in *times an array (that the application *must* free) of
- * dvdtimes corresponding to the chapter times for the chosen title.
- * *duration will have the duration of the title
-@@ -320,6 +325,13 @@
- 					 int32_t *part);
- 
- /*
-+ * Return the title number, pgcn and pgn currently being played.
-+ * A title of 0 indicates, we are in a menu.
-+ */
-+dvdnav_status_t dvdnav_current_title_program(dvdnav_t *self, int32_t *title,
-+					 int32_t *pgcn, int32_t *pgn);
-+
-+/*
- * Return the current position (in blocks) within the current
- * title and the length (in blocks) of said title.
- *
-diff -Naur libdvdnav.orig/src/navigation.c libdvdnav/src/navigation.c
---- libdvdnav.orig/src/navigation.c	2009-01-08 14:57:11.000000000 -0800
-+++ libdvdnav/src/navigation.c	2009-04-30 10:55:47.000000000 -0700
-@@ -122,10 +122,90 @@
- return DVDNAV_STATUS_ERR;
- }
- 
-+dvdnav_status_t dvdnav_current_title_program(dvdnav_t *this, int32_t *title, int32_t *pgcn, int32_t *pgn) {
-+ int32_t retval;
-+ int32_t part;
-+
-+ pthread_mutex_lock(&this->vm_lock);
-+ if (!this->vm->vtsi || !this->vm->vmgi) {
-+ printerr("Bad VM state.");
-+ pthread_mutex_unlock(&this->vm_lock);
-+ return DVDNAV_STATUS_ERR;
-+ }
-+ if (!this->started) {
-+ printerr("Virtual DVD machine not started.");
-+ pthread_mutex_unlock(&this->vm_lock);
-+ return DVDNAV_STATUS_ERR;
-+ }
-+ if (!this->vm->state.pgc) {
-+ printerr("No current PGC.");
-+ pthread_mutex_unlock(&this->vm_lock);
-+ return DVDNAV_STATUS_ERR;
-+ }
-+ if ( (this->vm->state.domain == VTSM_DOMAIN)
-+ || (this->vm->state.domain == VMGM_DOMAIN) ) {
-+ /* Get current Menu ID: into *part. */
-+ if(! vm_get_current_menu(this->vm, &part)) {
-+ pthread_mutex_unlock(&this->vm_lock);
-+ return DVDNAV_STATUS_ERR;
-+ }
-+ if (part > -1) {
-+ *title = 0;
-+ *pgcn = this->vm->state.pgcN;
-+ *pgn = this->vm->state.pgN;
-+ pthread_mutex_unlock(&this->vm_lock);
-+ return DVDNAV_STATUS_OK;
-+ }
-+ }
-+ if (this->vm->state.domain == VTS_DOMAIN) {
-+ retval = vm_get_current_title_part(this->vm, title, &part);
-+ *pgcn = this->vm->state.pgcN;
-+ *pgn = this->vm->state.pgN;
-+ pthread_mutex_unlock(&this->vm_lock);
-+ return retval ? DVDNAV_STATUS_OK : DVDNAV_STATUS_ERR;
-+ }
-+ printerr("Not in a title or menu.");
-+ pthread_mutex_unlock(&this->vm_lock);
-+ return DVDNAV_STATUS_ERR;
-+}
-+
- dvdnav_status_t dvdnav_title_play(dvdnav_t *this, int32_t title) {
- return dvdnav_part_play(this, title, 1);
- }
- 
-+dvdnav_status_t dvdnav_program_play(dvdnav_t *this, int32_t title, int32_t pgcn, int32_t pgn) {
-+ int32_t retval;
-+
-+ pthread_mutex_lock(&this->vm_lock);
-+ if (!this->vm->vmgi) {
-+ printerr("Bad VM state.");
-+ pthread_mutex_unlock(&this->vm_lock);
-+ return DVDNAV_STATUS_ERR;
-+ }
-+ if (!this->started) {
-+ /* don't report an error but be nice */
-+ vm_start(this->vm);
-+ this->started = 1;
-+ }
-+ if (!this->vm->state.pgc) {
-+ printerr("No current PGC.");
-+ pthread_mutex_unlock(&this->vm_lock);
-+ return DVDNAV_STATUS_ERR;
-+ }
-+ if((title < 1) || (title > this->vm->vmgi->tt_srpt->nr_of_srpts)) {
-+ printerr("Title out of range.");
-+ pthread_mutex_unlock(&this->vm_lock);
-+ return DVDNAV_STATUS_ERR;
-+ }
-+
-+ retval = vm_jump_title_program(this->vm, title, pgcn, pgn);
-+ if (retval)
-+ this->vm->hop_channel++;
-+ pthread_mutex_unlock(&this->vm_lock);
-+
-+ return retval ? DVDNAV_STATUS_OK : DVDNAV_STATUS_ERR;
-+}
-+
- dvdnav_status_t dvdnav_part_play(dvdnav_t *this, int32_t title, int32_t part) {
- int32_t retval;
- 
-diff -Naur libdvdnav.orig/src/vm/vm.c libdvdnav/src/vm/vm.c
---- libdvdnav.orig/src/vm/vm.c	2009-03-13 18:28:22.000000000 -0700
-+++ libdvdnav/src/vm/vm.c	2009-04-30 11:07:35.000000000 -0700
-@@ -83,6 +83,8 @@
- static int set_PTT(vm_t *vm, int tt, int ptt);
- static int set_VTS_TT(vm_t *vm, int vtsN, int vts_ttn);
- static int set_VTS_PTT(vm_t *vm, int vtsN, int vts_ttn, int part);
-+static int set_PROG(vm_t *vm, int tt, int pgcn, int pgn);
-+static int set_VTS_PROG(vm_t *vm, int vtsN, int vts_ttn, int pgcn, int pgn);
- static int set_FP_PGC(vm_t *vm);
- static int set_MENU(vm_t *vm, int menu);
- static int set_PGCN(vm_t *vm, int pgcN);
-@@ -516,6 +518,24 @@
- return 1;
- }
- 
-+int vm_jump_title_program(vm_t *vm, int title, int pgcn, int pgn) {
-+ link_t link;
-+
-+ if(!set_PROG(vm, title, pgcn, pgn))
-+ return 0;
-+ /* Some DVDs do not want us to jump directly into a title and have
-+ * PGC pre commands taking us back to some menu. Since we do not like that,
-+ * we do not execute PGC pre commands that would do a jump. */
-+ /* process_command(vm, play_PGC_PG(vm, (vm->state).pgN)); */
-+ link = play_PGC_PG(vm, (vm->state).pgN);
-+ if (link.command != PlayThis)
-+ /* jump occured -> ignore it and play the PG anyway */
-+ process_command(vm, play_PG(vm));
-+ else
-+ process_command(vm, link);
-+ return 1;
-+}
-+
- int vm_jump_title_part(vm_t *vm, int title, int part) {
- link_t link;
- 
-@@ -1644,6 +1664,42 @@
- return res;
- }
- 
-+static int set_PROG(vm_t *vm, int tt, int pgcn, int pgn) {
-+ assert(tt <= vm->vmgi->tt_srpt->nr_of_srpts);
-+ return set_VTS_PROG(vm, vm->vmgi->tt_srpt->title[tt - 1].title_set_nr,
-+		 vm->vmgi->tt_srpt->title[tt - 1].vts_ttn, pgcn, pgn);
-+}
-+
-+static int set_VTS_PROG(vm_t *vm, int vtsN, int vts_ttn, int pgcn, int pgn) {
-+ int pgcN, pgN, res, title, part;
-+
-+ (vm->state).domain = VTS_DOMAIN;
-+
-+ if (vtsN != (vm->state).vtsN)
-+ if (!ifoOpenNewVTSI(vm, vm->dvd, vtsN)) /* Also sets (vm->state).vtsN */
-+ return 0;
-+
-+ if ((vts_ttn < 1) || (vts_ttn > vm->vtsi->vts_ptt_srpt->nr_of_srpts)) {
-+ return 0;
-+ }
-+
-+ pgcN = pgcn;
-+ pgN = pgn;
-+
-+ (vm->state).TT_PGCN_REG = pgcN;
-+ (vm->state).TTN_REG = get_TT(vm, vtsN, vts_ttn);
-+ assert( (vm->state.TTN_REG) != 0 );
-+ (vm->state).VTS_TTN_REG = vts_ttn;
-+ (vm->state).vtsN = vtsN; /* Not sure about this one. We can get to it easily from TTN_REG */
-+ /* Any other registers? */
-+
-+ res = set_PGCN(vm, pgcN); /* This clobber's state.pgN (sets it to 1), but we don't want clobbering here. */
-+ (vm->state).pgN = pgN;
-+ vm_get_current_title_part(vm, &title, &part);
-+ (vm->state).PTTN_REG = part;
-+ return res;
-+}
-+
- static int set_FP_PGC(vm_t *vm) {
- (vm->state).domain = FP_DOMAIN;
- if (!vm->vmgi->first_play_pgc) {
-diff -Naur libdvdnav.orig/src/vm/vm.h libdvdnav/src/vm/vm.h
---- libdvdnav.orig/src/vm/vm.h	2009-03-13 18:28:22.000000000 -0700
-+++ libdvdnav/src/vm/vm.h	2009-04-30 10:57:02.000000000 -0700
-@@ -139,6 +139,7 @@
- int vm_jump_pg(vm_t *vm, int pg);
- int vm_jump_cell_block(vm_t *vm, int cell, int block);
- int vm_jump_title_part(vm_t *vm, int title, int part);
-+int vm_jump_title_program(vm_t *vm, int title, int pgcn, int pgn);
- int vm_jump_top_pg(vm_t *vm);
- int vm_jump_next_pg(vm_t *vm);
- int vm_jump_prev_pg(vm_t *vm);

HandBrake-0.9.9.tar.bz2/contrib/libdvdnav/A02-mult-pgc.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/libdvdnav/A03-quiet.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/libdvdnav/A04-m4-uid0.patch Deleted

@@ -1,28 +0,0 @@
-diff -Naur libdvdnav.orig/configure.ac libdvdnav/configure.ac
---- libdvdnav.orig/configure.ac	2009-01-08 14:57:11.000000000 -0800
-+++ libdvdnav/configure.ac	2009-08-24 10:20:16.560743586 -0700
-@@ -206,24 +206,6 @@
- 
- AC_SUBST(DEBUG_CFLAGS)
- 
--dnl ---------------------------------------------
--dnl Get where .m4 should be installed.
--dnl ---------------------------------------------
--case "`id`" in
-- uid=0\(* )
-- AC_MSG_CHECKING(for aclocal directory)
-- if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-- ACLOCAL_DIR="`eval $ACLOCAL --print-ac-dir`"
-- AC_MSG_RESULT($ACLOCAL_DIR)
-- else
-- ACLOCAL_DIR="/usr/local/share/aclocal"
-- AC_MSG_RESULT(none - will be installed in $ACLOCAL_DIR)
-- fi
-- escapedprefix="`echo $prefix | sed -e 's/\\//\\\\\//g'`"
-- ACLOCAL_DIR="`echo $ACLOCAL_DIR|sed -e 's/^'$escapedprefix/'\${prefix}'/`"
-- AC_SUBST(ACLOCAL_DIR)
-- ;;
--esac
- AM_CONDITIONAL(INSTALL_M4, test x"$ACLOCAL_DIR" != "x")
- 
- dnl ---------------------------------------------

HandBrake-0.9.9.tar.bz2/contrib/libdvdnav/A05-forward-seek.patch Deleted

@@ -1,100 +0,0 @@
-diff -Naur libdvdnav.orig/src/searching.c libdvdnav/src/searching.c
---- libdvdnav.orig/src/searching.c	2009-01-08 14:57:11.000000000 -0800
-+++ libdvdnav/src/searching.c	2009-09-12 15:36:14.403299590 -0700
-@@ -47,7 +47,7 @@
- /* Return placed in vobu. */
- /* Returns error status */
- /* FIXME: Maybe need to handle seeking outside current cell. */
--static dvdnav_status_t dvdnav_scan_admap(dvdnav_t *this, int32_t domain, uint32_t seekto_block, uint32_t *vobu) {
-+static dvdnav_status_t dvdnav_scan_admap(dvdnav_t *this, int32_t domain, uint32_t seekto_block, int next, uint32_t *vobu) {
- vobu_admap_t *admap = NULL;
- 
- #ifdef LOG_DEBUG
-@@ -89,7 +89,7 @@
- vobu_start = next_vobu;
- address++;
- }
-- *vobu = vobu_start;
-+ *vobu = next ? next_vobu : vobu_start;
- return DVDNAV_STATUS_OK;
- }
- fprintf(MSG_OUT, "libdvdnav: admap not located\n");
-@@ -160,7 +160,7 @@
- fprintf(MSG_OUT, "libdvdnav: Seeking to cell %i from choice of %i to %i\n",
- 	 cell_nr, first_cell_nr, last_cell_nr);
- #endif
-- if (dvdnav_scan_admap(this, state->domain, target, &vobu) == DVDNAV_STATUS_OK) {
-+ if (dvdnav_scan_admap(this, state->domain, target, 0, &vobu) == DVDNAV_STATUS_OK) {
- uint32_t start = state->pgc->cell_playback[cell_nr-1].first_sector;
- 
- if (vm_jump_cell_block(this->vm, cell_nr, vobu - start)) {
-@@ -184,9 +184,13 @@
- dvdnav_status_t dvdnav_sector_search(dvdnav_t *this,
- 				 uint64_t offset, int32_t origin) {
- uint32_t target = 0;
-+ uint32_t current_pos;
-+ uint32_t cur_sector;
-+ uint32_t cur_cell_nr;
- uint32_t length = 0;
- uint32_t first_cell_nr, last_cell_nr, cell_nr;
- int32_t found;
-+ int forward = 0;
- cell_playback_t *cell;
- dvd_state_t *state;
- dvdnav_status_t result;
-@@ -213,6 +217,10 @@
- fprintf(MSG_OUT, "libdvdnav: Before cellN=%u blockN=%u\n", state->cellN, state->blockN);
- #endif
- 
-+ current_pos = target;
-+ cur_sector = this->vobu.vobu_start + this->vobu.blockN;
-+ cur_cell_nr = state->cellN;
-+
- switch(origin) {
- case SEEK_SET:
- if(offset >= length) {
-@@ -244,6 +252,7 @@
- pthread_mutex_unlock(&this->vm_lock);
- return DVDNAV_STATUS_ERR;
- }
-+ forward = target > current_pos;
- 
- this->cur_cell_time = 0;
- if (this->pgc_based) {
-@@ -270,6 +279,27 @@
- } else {
- /* convert the target sector from Cell-relative to absolute physical sector */
- target += cell->first_sector;
-+ if (forward && (cell_nr == cur_cell_nr)) {
-+ uint32_t vobu;
-+ /* if we are seeking forward from the current position, make sure
-+ * we move to a new position that is after our current position.
-+ * simply truncating to the vobu will go backwards */
-+ if (dvdnav_scan_admap(this, state->domain, target, 0, &vobu) != DVDNAV_STATUS_OK)
-+ break;
-+ if (vobu <= cur_sector) {
-+ if (dvdnav_scan_admap(this, state->domain, target, 1, &vobu) != DVDNAV_STATUS_OK)
-+ break;
-+ if (vobu > cell->last_sector) {
-+ if (cell_nr == last_cell_nr)
-+ break;
-+ cell_nr++;
-+ cell = &(state->pgc->cell_playback[cell_nr-1]);
-+ target = cell->first_sector;
-+ } else {
-+ target = vobu;
-+ }
-+ }
-+ }
- found = 1;
- break;
- }
-@@ -281,7 +311,7 @@
- fprintf(MSG_OUT, "libdvdnav: Seeking to cell %i from choice of %i to %i\n",
- 	 cell_nr, first_cell_nr, last_cell_nr);
- #endif
-- if (dvdnav_scan_admap(this, state->domain, target, &vobu) == DVDNAV_STATUS_OK) {
-+ if (dvdnav_scan_admap(this, state->domain, target, 0, &vobu) == DVDNAV_STATUS_OK) {
- int32_t start = state->pgc->cell_playback[cell_nr-1].first_sector;
- 
- if (vm_jump_cell_block(this->vm, cell_nr, vobu - start)) {

HandBrake-0.9.9.tar.bz2/contrib/libdvdnav/A06-reset-mutex.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/libdvdnav/A07-missing-menu.patch Deleted

@@ -1,157 +0,0 @@
-diff -Naur libdvdnav.orig/src/vm/vm.c libdvdnav/src/vm/vm.c
---- libdvdnav.orig/src/vm/vm.c	2009-10-29 09:10:44.836643320 -0700
-+++ libdvdnav/src/vm/vm.c	2009-11-27 11:32:47.475322754 -0800
-@@ -585,6 +585,9 @@
- switch(menuid) {
- case DVD_MENU_Title:
- case DVD_MENU_Escape:
-+ if(vm->vmgi == NULL || vm->vmgi->pgci_ut == NULL) {
-+ goto fail;
-+ }
- (vm->state).domain = VMGM_DOMAIN;
- break;
- case DVD_MENU_Root:
-@@ -592,6 +595,9 @@
- case DVD_MENU_Audio:
- case DVD_MENU_Angle:
- case DVD_MENU_Part:
-+ if(vm->vtsi == NULL || vm->vtsi->pgci_ut == NULL) {
-+ goto fail;
-+ }
- (vm->state).domain = VTSM_DOMAIN;
- break;
- }
-@@ -606,6 +612,7 @@
- break;
- }
- 
-+fail:
- return 0;
- }
- 
-@@ -1412,8 +1419,9 @@
- if(link_values.data2 != 0)
- 	(vm->state).HL_BTNN_REG = link_values.data2 << 10;
- if(!set_VTS_PTT(vm, (vm->state).vtsN, (vm->state).VTS_TTN_REG, link_values.data1))
--	assert(0);
-- link_values = play_PG(vm);
-+ link_values.command = Exit;
-+ else
-+ link_values = play_PG(vm);
- break;
- case LinkPGN:
- /* Link to Program Number:data1 */
-@@ -1458,8 +1466,9 @@
- /* Set SPRM1 and SPRM2 */
- assert((vm->state).domain == VTSM_DOMAIN || (vm->state).domain == VTS_DOMAIN); /* ?? */
- if(!set_VTS_TT(vm, (vm->state).vtsN, link_values.data1))
--	assert(0);
-- link_values = play_PGC(vm);
-+ link_values.command = Exit;
-+ else
-+ link_values = play_PGC(vm);
- break;
- case JumpVTS_PTT:
- /* Jump to Part:data2 of Title:data1 in same VTS Title Domain */
-@@ -1469,8 +1478,9 @@
- /* Set SPRM1 and SPRM2 */
- assert((vm->state).domain == VTSM_DOMAIN || (vm->state).domain == VTS_DOMAIN); /* ?? */
- if(!set_VTS_PTT(vm, (vm->state).vtsN, link_values.data1, link_values.data2))
--	assert(0);
-- link_values = play_PGC_PG(vm, (vm->state).pgN);
-+ link_values.command = Exit;
-+ else
-+ link_values = play_PGC_PG(vm, (vm->state).pgN);
- break;
- 
- case JumpSS_FP:
-@@ -1488,6 +1498,10 @@
- /* Allowed from anywhere except the VTS Title domain */
- /* Stop SPRM9 Timer and any GPRM counters */
- assert((vm->state).domain != VTS_DOMAIN); /* ?? */
-+ if(vm->vmgi == NULL || vm->vmgi->pgci_ut == NULL) {
-+ link_values.command = Exit;
-+ break;
-+ }
- (vm->state).domain = VMGM_DOMAIN;
- if(!set_MENU(vm, link_values.data1))
- 	assert(0);
-@@ -1504,14 +1518,22 @@
- 	if (link_values.data1 != (vm->state).vtsN) {
- 	 /* the normal case */
- 	 assert((vm->state).domain == VMGM_DOMAIN || (vm->state).domain == FP_DOMAIN); /* ?? */
--	 (vm->state).domain = VTSM_DOMAIN;
- 	 if (!ifoOpenNewVTSI(vm, vm->dvd, link_values.data1)) /* Also sets (vm->state).vtsN */
- 	 assert(0);
-+ if(vm->vtsi == NULL || vm->vtsi->pgci_ut == NULL) {
-+ link_values.command = Exit;
-+ break;
-+ }
-+	 (vm->state).domain = VTSM_DOMAIN;
- 	} else {
- 	 /* This happens on some discs like "Captain Scarlet & the Mysterons" or
- 	 * the German RC2 of "Anatomie" in VTSM. */
- 	 assert((vm->state).domain == VTSM_DOMAIN ||
- 	 (vm->state).domain == VMGM_DOMAIN || (vm->state).domain == FP_DOMAIN); /* ?? */
-+ if(vm->vtsi == NULL || vm->vtsi->pgci_ut == NULL) {
-+ link_values.command = Exit;
-+ break;
-+ }
- 	 (vm->state).domain = VTSM_DOMAIN;
- 	}
- } else {
-@@ -1533,6 +1555,10 @@
- /* set_PGCN:data1 */
- /* Stop SPRM9 Timer and any GPRM counters */
- assert((vm->state).domain != VTS_DOMAIN); /* ?? */
-+ if(vm->vmgi == NULL || vm->vmgi->pgci_ut == NULL) {
-+ link_values.command = Exit;
-+ break;
-+ }
- (vm->state).domain = VMGM_DOMAIN;
- if(!set_PGCN(vm, link_values.data1))
- 	assert(0);
-@@ -1552,6 +1578,10 @@
- /* set_RSMinfo:data2 */
- assert((vm->state).domain == VTS_DOMAIN); /* ?? */
- /* Must be called before domain is changed */
-+ if(vm->vmgi == NULL || vm->vmgi->pgci_ut == NULL) {
-+ link_values.command = Exit;
-+ break;
-+ }
- set_RSMinfo(vm, link_values.data2, /* We dont have block info */ 0);
- (vm->state).domain = VMGM_DOMAIN;
- if(!set_MENU(vm, link_values.data1))
-@@ -1563,6 +1593,10 @@
- /* set_RSMinfo:data2 */
- assert((vm->state).domain == VTS_DOMAIN); /* ?? */
- /* Must be called before domain is changed */
-+ if(vm->vtsi == NULL || vm->vtsi->pgci_ut == NULL) {
-+ link_values.command = Exit;
-+ break;
-+ }
- set_RSMinfo(vm, link_values.data2, /* We dont have block info */ 0);
- (vm->state).domain = VTSM_DOMAIN;
- if(!set_MENU(vm, link_values.data1))
-@@ -1574,6 +1608,10 @@
- /* set_RSMinfo:data2 */
- assert((vm->state).domain == VTS_DOMAIN); /* ?? */
- /* Must be called before domain is changed */
-+ if(vm->vmgi == NULL || vm->vmgi->pgci_ut == NULL) {
-+ link_values.command = Exit;
-+ break;
-+ }
- set_RSMinfo(vm, link_values.data2, /* We dont have block info */ 0);
- (vm->state).domain = VMGM_DOMAIN;
- if(!set_PGCN(vm, link_values.data1))
-@@ -1634,7 +1672,9 @@
- (vm->state).TT_PGCN_REG = pgcN;
- (vm->state).PTTN_REG = part;
- (vm->state).TTN_REG = get_TT(vm, vtsN, vts_ttn);
-- assert( (vm->state.TTN_REG) != 0 );
-+ if( (vm->state.TTN_REG) == 0 )
-+ return 0;
-+
- (vm->state).VTS_TTN_REG = vts_ttn;
- (vm->state).vtsN = vtsN; /* Not sure about this one. We can get to it easily from TTN_REG */
- /* Any other registers? */

HandBrake-0.9.9.tar.bz2/contrib/libdvdnav/A08-dvdnav-dup.patch Deleted

@@ -1,137 +0,0 @@
-Index: src/dvdnav.c
-===================================================================
---- libdvdnav.orig/src/dvdnav.c	(revision 1168)
-+++ libdvdnav/src/dvdnav.c	(working copy)
-@@ -71,6 +71,67 @@
-   return DVDNAV_STATUS_OK;
- }
- 
-+dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src) {
-+  dvdnav_t *this;
-+
-+  (*dest) = NULL;
-+  this = (dvdnav_t*)malloc(sizeof(dvdnav_t));
-+  if(!this)
-+    return DVDNAV_STATUS_ERR;
-+
-+  memcpy(this, src, sizeof(dvdnav_t));
-+  this->file = NULL;
-+
-+  pthread_mutex_init(&this->vm_lock, NULL);
-+
-+  this->vm = vm_new_copy(src->vm);
-+  if(!this->vm) {
-+    printerr("Error initialising the DVD VM.");
-+    pthread_mutex_destroy(&this->vm_lock);
-+    free(this);
-+    return DVDNAV_STATUS_ERR;
-+  }
-+
-+  /* Start the read-ahead cache. */
-+  this->cache = dvdnav_read_cache_new(this);
-+
-+  (*dest) = this;
-+  return DVDNAV_STATUS_OK;
-+}
-+
-+dvdnav_status_t dvdnav_free_dup(dvdnav_t *this) {
-+
-+#ifdef LOG_DEBUG
-+  fprintf(MSG_OUT, "libdvdnav: free_dup:called\n");
-+#endif
-+
-+  if (this->file) {
-+    pthread_mutex_lock(&this->vm_lock);
-+    DVDCloseFile(this->file);
-+#ifdef LOG_DEBUG
-+    fprintf(MSG_OUT, "libdvdnav: close:file closing\n");
-+#endif
-+    this->file = NULL;
-+    pthread_mutex_unlock(&this->vm_lock);
-+  }
-+
-+  /* Free the VM */
-+  if(this->vm)
-+    vm_free_copy(this->vm);
-+
-+  pthread_mutex_destroy(&this->vm_lock);
-+
-+  /* We leave the final freeing of the entire structure to the cache,
-+   * because we don't know, if there are still buffers out in the wild,
-+   * that must return first. */
-+  if(this->cache)
-+    dvdnav_read_cache_free(this->cache);
-+  else
-+    free(this);
-+
-+  return DVDNAV_STATUS_OK;
-+}
-+
- dvdnav_status_t dvdnav_open(dvdnav_t** dest, const char *path) {
-   dvdnav_t *this;
-   struct timeval time;
-Index: src/dvdnav/dvdnav.h
-===================================================================
---- libdvdnav.orig/src/dvdnav/dvdnav.h	(revision 1168)
-+++ libdvdnav/src/dvdnav/dvdnav.h	(working copy)
-@@ -89,6 +89,9 @@
-  */
- dvdnav_status_t dvdnav_open(dvdnav_t **dest, const char *path);
- 
-+dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src);
-+dvdnav_status_t dvdnav_free_dup(dvdnav_t *this);
-+
- /*
-  * Closes a dvdnav_t previously opened with dvdnav_open(), freeing any
-  * memory associated with it.
-Index: src/vm/vm.c
-===================================================================
---- libdvdnav.orig/src/vm/vm.c	(revision 1168)
-+++ libdvdnav/src/vm/vm.c	(working copy)
-@@ -96,6 +98,7 @@
- 
- static pgcit_t* get_MENU_PGCIT(vm_t *vm, ifo_handle_t *h, uint16_t lang);
- static pgcit_t* get_PGCIT(vm_t *vm);
-+static void vm_close(vm_t *vm);
- 
- 
- /* Helper functions */
-@@ -262,7 +265,7 @@
- }
- 
- void vm_free_vm(vm_t *vm) {
--  vm_stop(vm);
-+  vm_close(vm);
-   free(vm);
- }
- 
-@@ -289,12 +292,20 @@
- 
- int vm_start(vm_t *vm) {
-   /* Set pgc to FP (First Play) pgc */
-+  if (vm->stopped) {
-+    vm_reset(vm, NULL);
-+    vm->stopped = 0;
-+  }
-   set_FP_PGC(vm);
-   process_command(vm, play_PGC(vm));
-   return !vm->stopped;
- }
- 
- void vm_stop(vm_t *vm) {
-+  vm->stopped = 1;
-+}
-+
-+static void vm_close(vm_t *vm) {
-   if(vm->vmgi) {
-     ifoClose(vm->vmgi);
-     vm->vmgi=NULL;
-@@ -346,7 +357,7 @@
- 
-   if (vm->dvd && dvdroot) {
-     /* a new dvd device has been requested */
--    vm_stop(vm);
-+    vm_close(vm);
-   }
-   if (!vm->dvd) {
-     vm->dvd = DVDOpen(dvdroot);

HandBrake-0.9.9.tar.bz2/contrib/libdvdnav/P00-mingw-no-examples.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/libdvdread/A00-volume-name.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/libdvdread/A01-bogus-udf-filename.patch Deleted

@@ -1,37 +0,0 @@
-Index: dvd_udf.c
-===================================================================
---- libdvdread/src/dvd_udf.c	(revision 1233)
-+++ libdvdread/src/dvd_udf.c	(working copy)
-@@ -329,16 +329,17 @@
- static int Unicodedecode( uint8_t *data, int len, char *target )
- {
- int p = 1, i = 0;
-+ int err = 0;
- 
- if( ( data[ 0 ] == 8 ) || ( data[ 0 ] == 16 ) ) do {
-- if( data[ 0 ] == 16 ) p++; /* Ignore MSB of unicode16 */
-+ if( data[ 0 ] == 16 ) err |= data[p++]; /* character cannot be converted to 8bit, return error */
- if( p < len ) {
- target[ i++ ] = data[ p++ ];
- }
- } while( p < len );
- 
- target[ i ] = '\0';
-- return 0;
-+ return !err;
- }
- 
- static int UDFDescriptor( uint8_t *data, uint16_t *TagID )
-@@ -490,8 +491,9 @@
- L_FI = GETN1(19);
- UDFLongAD(&data[20], FileICB);
- L_IU = GETN2(36);
-- if (L_FI) Unicodedecode(&data[38 + L_IU], L_FI, FileName);
-- else FileName[0] = '\0';
-+ if (L_FI) {
-+ if (!Unicodedecode(&data[38 + L_IU], L_FI, FileName)) FileName[0] = 0;
-+ } else FileName[0] = '\0';
- return 4 * ((38 + L_FI + L_IU + 3) / 4);
- }
- 
-

HandBrake-0.9.9.tar.bz2/contrib/libdvdread/A02-msc_ver-defs.patch Deleted

@@ -1,85 +0,0 @@
-diff -Naur libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
---- libdvdread.orig/src/dvd_reader.c	2009-03-13 18:28:21.000000000 -0700
-+++ libdvdread/src/dvd_reader.c	2009-09-15 10:15:25.201548319 -0700
-@@ -36,6 +36,7 @@
- 
- /* misc win32 helpers */
- #ifdef WIN32
-+#include <windows.h>
- #ifndef HAVE_GETTIMEOFDAY
- /* replacement gettimeofday implementation */
- #include <sys/timeb.h>
-@@ -335,7 +336,7 @@
- char *dev_name = NULL;
- char *path;
- 
--#ifdef _MSC_VER
-+#ifdef _WIN32
- int len;
- #endif
- 
-@@ -349,7 +350,7 @@
- /* Try to open libdvdcss or fall back to standard functions */
- have_css = dvdinput_setup();
- 
--#ifdef _MSC_VER
-+#ifdef _WIN32
- /* Strip off the trailing \ if it is not a drive */
- len = strlen(path);
- if ((len > 1) &&
-@@ -447,6 +448,14 @@
- }
- }
- 
-+#ifdef _WIN32
-+ if( strlen( path_copy ) > TITLES_MAX ) {
-+ if( !strcasecmp( &(path_copy[ strlen( path_copy ) - TITLES_MAX ]),
-+ "\\video_ts" ) ) {
-+ path_copy[ strlen( path_copy ) - (TITLES_MAX-1) ] = '\0';
-+ }
-+ }
-+#else
- if( strlen( path_copy ) > TITLES_MAX ) {
- if( !strcasecmp( &(path_copy[ strlen( path_copy ) - TITLES_MAX ]),
- "/video_ts" ) ) {
-@@ -458,6 +467,7 @@
- path_copy[0] = '/';
- path_copy[1] = '\0';
- }
-+#endif
- 
- #if defined(SYS_BSD)
- if( ( fe = getfsfile( path_copy ) ) ) {
-@@ -508,11 +518,14 @@
- }
- fclose( mntfile );
- }
--#elif defined(_MSC_VER) || defined(__OS2__)
-- auth_drive = DVDOpenImageFile( path, have_css );
-+#elif defined(_WIN32) || defined(__OS2__)
-+ if( GetDriveType( path_copy ) == DRIVE_CDROM ) {
-+ path_copy[2] = '\0';
-+ auth_drive = DVDOpenImageFile( path_copy, have_css );
-+ }
- #endif
- 
--#if !defined(_MSC_VER) && !defined(__OS2__)
-+#if !defined(_WIN32) && !defined(__OS2__)
- if( !dev_name ) {
- fprintf( stderr, "libdvdread: Couldn't find device name.\n" );
- } else if( !auth_drive ) {
-diff -Naur libdvdread.orig/src/dvdread_internal.h libdvdread/src/dvdread_internal.h
---- libdvdread.orig/src/dvdread_internal.h	2008-10-03 13:11:30.000000000 -0700
-+++ libdvdread/src/dvdread_internal.h	2009-09-15 09:44:01.788301485 -0700
-@@ -19,9 +19,9 @@
- #ifndef LIBDVDREAD_DVDREAD_INTERNAL_H
- #define LIBDVDREAD_DVDREAD_INTERNAL_H
- 
--#ifdef _MSC_VER
-+#ifdef _WIN32
- #include <unistd.h>
--#endif /* _MSC_VER */
-+#endif /* _WIN32 */
- 
- #define CHECK_VALUE(arg) \
- if(!(arg)) { \

HandBrake-0.9.9.tar.bz2/contrib/libdvdread/A03-m4-uid0.patch Deleted

@@ -1,28 +0,0 @@
-diff -Naur libdvdread.orig/configure.ac libdvdread/configure.ac
---- libdvdread.orig/configure.ac	2009-01-08 14:57:10.000000000 -0800
-+++ libdvdread/configure.ac	2009-08-24 10:17:47.036747814 -0700
-@@ -167,24 +167,6 @@
- 
- AC_SUBST(DEBUG_CFLAGS)
- 
--dnl ---------------------------------------------
--dnl Get where .m4 should be installed.
--dnl ---------------------------------------------
--case "`id`" in
-- uid=0\(* )
-- AC_MSG_CHECKING(for aclocal directory)
-- if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-- ACLOCAL_DIR="`eval $ACLOCAL --print-ac-dir`"
-- AC_MSG_RESULT($ACLOCAL_DIR)
-- else
-- ACLOCAL_DIR="/usr/local/share/aclocal"
-- AC_MSG_RESULT(none - will be installed in $ACLOCAL_DIR)
-- fi
-- escapedprefix="`echo $prefix | sed -e 's/\\//\\\\\//g'`"
-- ACLOCAL_DIR="`echo $ACLOCAL_DIR|sed -e 's/^'$escapedprefix/'\${prefix}'/`"
-- AC_SUBST(ACLOCAL_DIR)
-- ;;
--esac
- AM_CONDITIONAL(INSTALL_M4, test x"$ACLOCAL_DIR" != "x")
- 
- dnl ---------------------------------------------

HandBrake-0.9.9.tar.bz2/contrib/libdvdread/A04-dup-lut-pgc.patch Deleted

@@ -1,324 +0,0 @@
---- libdvdread.orig/src/ifo_read.c	2009-10-29 09:11:32.066743831 -0700
-+++ libdvdread/src/ifo_read.c	2009-11-13 10:27:49.293174360 -0800
-@@ -87,9 +87,9 @@
- static int ifoRead_PGCIT_internal(ifo_handle_t *ifofile, pgcit_t *pgcit,
- unsigned int offset);
- 
--static void ifoFree_PGC(pgc_t *pgc);
-+static void ifoFree_PGC(pgc_t **pgc);
- static void ifoFree_PGC_COMMAND_TBL(pgc_command_tbl_t *cmd_tbl);
--static void ifoFree_PGCIT_internal(pgcit_t *pgcit);
-+static void ifoFree_PGCIT_internal(pgcit_t **pgcit);
- 
- static inline int DVDFileSeekForce_( dvd_file_t *dvd_file, uint32_t offset, int force_size ) {
- return (DVDFileSeekForce(dvd_file, (int)offset, force_size) == (int)offset);
-@@ -870,7 +870,6 @@
- 
- if(!ifoRead_PGC_COMMAND_TBL(ifofile, pgc->command_tbl,
- offset + pgc->command_tbl_offset)) {
-- free(pgc->command_tbl);
- return 0;
- }
- } else {
-@@ -880,13 +879,10 @@
- if(pgc->program_map_offset != 0 && pgc->nr_of_programs>0) {
- pgc->program_map = malloc(pgc->nr_of_programs * sizeof(pgc_program_map_t));
- if(!pgc->program_map) {
-- ifoFree_PGC_COMMAND_TBL(pgc->command_tbl);
- return 0;
- }
- if(!ifoRead_PGC_PROGRAM_MAP(ifofile, pgc->program_map,pgc->nr_of_programs,
- offset + pgc->program_map_offset)) {
-- ifoFree_PGC_COMMAND_TBL(pgc->command_tbl);
-- free(pgc->program_map);
- return 0;
- }
- } else {
-@@ -896,18 +892,11 @@
- if(pgc->cell_playback_offset != 0 && pgc->nr_of_cells>0) {
- pgc->cell_playback = malloc(pgc->nr_of_cells * sizeof(cell_playback_t));
- if(!pgc->cell_playback) {
-- ifoFree_PGC_COMMAND_TBL(pgc->command_tbl);
-- if(pgc->program_map)
-- free(pgc->program_map);
- return 0;
- }
- if(!ifoRead_CELL_PLAYBACK_TBL(ifofile, pgc->cell_playback,
- pgc->nr_of_cells,
- offset + pgc->cell_playback_offset)) {
-- ifoFree_PGC_COMMAND_TBL(pgc->command_tbl);
-- if(pgc->program_map)
-- free(pgc->program_map);
-- free(pgc->cell_playback);
- return 0;
- }
- } else {
-@@ -917,13 +906,11 @@
- if(pgc->cell_position_offset != 0 && pgc->nr_of_cells>0) {
- pgc->cell_position = malloc(pgc->nr_of_cells * sizeof(cell_position_t));
- if(!pgc->cell_position) {
-- ifoFree_PGC(pgc);
- return 0;
- }
- if(!ifoRead_CELL_POSITION_TBL(ifofile, pgc->cell_position,
- pgc->nr_of_cells,
- offset + pgc->cell_position_offset)) {
-- ifoFree_PGC(pgc);
- return 0;
- }
- } else {
-@@ -946,29 +933,33 @@
- if(ifofile->vmgi_mat->first_play_pgc == 0)
- return 1;
- 
-- ifofile->first_play_pgc = (pgc_t *)malloc(sizeof(pgc_t));
-+ ifofile->first_play_pgc = (pgc_t *)calloc(1, sizeof(pgc_t));
- if(!ifofile->first_play_pgc)
- return 0;
- 
-+ ifofile->first_play_pgc->ref_count = 1;
- if(!ifoRead_PGC(ifofile, ifofile->first_play_pgc,
- ifofile->vmgi_mat->first_play_pgc)) {
-- free(ifofile->first_play_pgc);
-- ifofile->first_play_pgc = 0;
-+ ifoFree_PGC(&ifofile->first_play_pgc);
- return 0;
- }
- 
- return 1;
- }
- 
--static void ifoFree_PGC(pgc_t *pgc) {
-- if(pgc) {
-- ifoFree_PGC_COMMAND_TBL(pgc->command_tbl);
-- if(pgc->program_map)
-- free(pgc->program_map);
-- if(pgc->cell_playback)
-- free(pgc->cell_playback);
-- if(pgc->cell_position)
-- free(pgc->cell_position);
-+static void ifoFree_PGC(pgc_t **pgc) {
-+ if(pgc && *pgc && (--(*pgc)->ref_count) <= 0) {
-+ ifoFree_PGC_COMMAND_TBL((*pgc)->command_tbl);
-+ if((*pgc)->program_map)
-+ free((*pgc)->program_map);
-+ if((*pgc)->cell_playback)
-+ free((*pgc)->cell_playback);
-+ if((*pgc)->cell_position)
-+ free((*pgc)->cell_position);
-+ free(*pgc);
-+ }
-+ if (pgc) {
-+ *pgc = NULL;
- }
- }
- 
-@@ -977,9 +968,7 @@
- return;
- 
- if(ifofile->first_play_pgc) {
-- ifoFree_PGC(ifofile->first_play_pgc);
-- free(ifofile->first_play_pgc);
-- ifofile->first_play_pgc = 0;
-+ ifoFree_PGC(&ifofile->first_play_pgc);
- }
- }
- 
-@@ -1202,6 +1191,13 @@
- CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgcn < 1000); /* ?? */
- CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgn != 0);
- CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgn < 100); /* ?? */
-+ if (vts_ptt_srpt->title[i].ptt[j].pgcn == 0 ||
-+ vts_ptt_srpt->title[i].ptt[j].pgcn >= 1000 ||
-+ vts_ptt_srpt->title[i].ptt[j].pgn == 0 ||
-+ vts_ptt_srpt->title[i].ptt[j].pgn >= 100) {
-+ return 0;
-+ }
-+
- }
- }
- 
-@@ -1372,7 +1368,6 @@
- 
- if(ifofile->vtsi_mat->vts_tmapt == 0) { /* optional(?) */
- ifofile->vts_tmapt = NULL;
-- fprintf(stderr,"Please send bug report - no VTS_TMAPT ?? \n");
- return 1;
- }
- 
-@@ -1756,10 +1751,11 @@
- if(ifofile->vtsi_mat->vts_pgcit == 0) /* mandatory */
- return 0;
- 
-- ifofile->vts_pgcit = (pgcit_t *)malloc(sizeof(pgcit_t));
-+ ifofile->vts_pgcit = (pgcit_t *)calloc(1, sizeof(pgcit_t));
- if(!ifofile->vts_pgcit)
- return 0;
- 
-+ ifofile->vts_pgcit->ref_count = 1;
- if(!ifoRead_PGCIT_internal(ifofile, ifofile->vts_pgcit,
- ifofile->vtsi_mat->vts_pgcit * DVD_BLOCK_LEN)) {
- free(ifofile->vts_pgcit);
-@@ -1770,6 +1766,17 @@
- return 1;
- }
- 
-+static int find_dup_pgc(pgci_srp_t *pgci_srp, uint32_t start_byte, int count) {
-+ int i;
-+
-+ for(i = 0; i < count; i++) {
-+ if(pgci_srp[i].pgc_start_byte == start_byte) {
-+ return i;
-+ }
-+ }
-+ return -1;
-+}
-+
- static int ifoRead_PGCIT_internal(ifo_handle_t *ifofile, pgcit_t *pgcit,
- unsigned int offset) {
- int i, info_length;
-@@ -1818,21 +1825,26 @@
- CHECK_VALUE(pgcit->pgci_srp[i].pgc_start_byte + PGC_SIZE <= pgcit->last_byte+1);
- 
- for(i = 0; i < pgcit->nr_of_pgci_srp; i++) {
-- pgcit->pgci_srp[i].pgc = malloc(sizeof(pgc_t));
-+ int dup;
-+ if((dup = find_dup_pgc(pgcit->pgci_srp, pgcit->pgci_srp[i].pgc_start_byte, i)) >= 0) {
-+ pgcit->pgci_srp[i].pgc = pgcit->pgci_srp[dup].pgc;
-+ pgcit->pgci_srp[i].pgc->ref_count++;
-+ continue;
-+ }
-+ pgcit->pgci_srp[i].pgc = calloc(1, sizeof(pgc_t));
- if(!pgcit->pgci_srp[i].pgc) {
- int j;
- for(j = 0; j < i; j++) {
-- ifoFree_PGC(pgcit->pgci_srp[j].pgc);
-- free(pgcit->pgci_srp[j].pgc);
-+ ifoFree_PGC(&pgcit->pgci_srp[j].pgc);
- }
- goto fail;
- }
-+ pgcit->pgci_srp[i].pgc->ref_count = 1;
- if(!ifoRead_PGC(ifofile, pgcit->pgci_srp[i].pgc,
- offset + pgcit->pgci_srp[i].pgc_start_byte)) {
- int j;
-- for(j = 0; j < i; j++) {
-- ifoFree_PGC(pgcit->pgci_srp[j].pgc);
-- free(pgcit->pgci_srp[j].pgc);
-+ for(j = 0; j <= i; j++) {
-+ ifoFree_PGC(&pgcit->pgci_srp[j].pgc);
- }
- goto fail;
- }
-@@ -1845,12 +1857,16 @@
- return 0;
- }
- 
--static void ifoFree_PGCIT_internal(pgcit_t *pgcit) {
-- if(pgcit) {
-+static void ifoFree_PGCIT_internal(pgcit_t **pgcit) {
-+ if(pgcit && *pgcit && (--(*pgcit)->ref_count <= 0)) {
- int i;
-- for(i = 0; i < pgcit->nr_of_pgci_srp; i++)
-- ifoFree_PGC(pgcit->pgci_srp[i].pgc);
-- free(pgcit->pgci_srp);
-+ for(i = 0; i < (*pgcit)->nr_of_pgci_srp; i++)
-+ ifoFree_PGC(&(*pgcit)->pgci_srp[i].pgc);
-+ free((*pgcit)->pgci_srp);
-+ free(*pgcit);
-+ }
-+ if (pgcit) {
-+ *pgcit = NULL;
- }
- }
- 
-@@ -1859,12 +1875,20 @@
- return;
- 
- if(ifofile->vts_pgcit) {
-- ifoFree_PGCIT_internal(ifofile->vts_pgcit);
-- free(ifofile->vts_pgcit);
-- ifofile->vts_pgcit = 0;
-+ ifoFree_PGCIT_internal(&ifofile->vts_pgcit);
- }
- }
- 
-+static int find_dup_lut(pgci_lu_t *lu, uint32_t start_byte, int count) {
-+ int i;
-+
-+ for(i = 0; i < count; i++) {
-+ if(lu[i].lang_start_byte == start_byte) {
-+ return i;
-+ }
-+ }
-+ return -1;
-+}
- 
- int ifoRead_PGCI_UT(ifo_handle_t *ifofile) {
- pgci_ut_t *pgci_ut;
-@@ -1958,27 +1982,31 @@
- }
- 
- for(i = 0; i < pgci_ut->nr_of_lus; i++) {
-+ int dup;
-+ if((dup = find_dup_lut(pgci_ut->lu, pgci_ut->lu[i].lang_start_byte, i)) >= 0) {
-+ pgci_ut->lu[i].pgcit = pgci_ut->lu[dup].pgcit;
-+ pgci_ut->lu[i].pgcit->ref_count++;
-+ continue;
-+ }
- pgci_ut->lu[i].pgcit = malloc(sizeof(pgcit_t));
- if(!pgci_ut->lu[i].pgcit) {
- unsigned int j;
- for(j = 0; j < i; j++) {
-- ifoFree_PGCIT_internal(pgci_ut->lu[j].pgcit);
-- free(pgci_ut->lu[j].pgcit);
-+ ifoFree_PGCIT_internal(&pgci_ut->lu[j].pgcit);
- }
- free(pgci_ut->lu);
- free(pgci_ut);
- ifofile->pgci_ut = 0;
- return 0;
- }
-+ pgci_ut->lu[i].pgcit->ref_count = 1;
- if(!ifoRead_PGCIT_internal(ifofile, pgci_ut->lu[i].pgcit,
- sector * DVD_BLOCK_LEN
- + pgci_ut->lu[i].lang_start_byte)) {
- unsigned int j;
-- for(j = 0; j < i; j++) {
-- ifoFree_PGCIT_internal(pgci_ut->lu[j].pgcit);
-- free(pgci_ut->lu[j].pgcit);
-+ for(j = 0; j <= i; j++) {
-+ ifoFree_PGCIT_internal(&pgci_ut->lu[j].pgcit);
- }
-- free(pgci_ut->lu[i].pgcit);
- free(pgci_ut->lu);
- free(pgci_ut);
- ifofile->pgci_ut = 0;
-@@ -2000,8 +2028,7 @@
- 
- if(ifofile->pgci_ut) {
- for(i = 0; i < ifofile->pgci_ut->nr_of_lus; i++) {
-- ifoFree_PGCIT_internal(ifofile->pgci_ut->lu[i].pgcit);
-- free(ifofile->pgci_ut->lu[i].pgcit);
-+ ifoFree_PGCIT_internal(&ifofile->pgci_ut->lu[i].pgcit);
- }
- free(ifofile->pgci_ut->lu);
- free(ifofile->pgci_ut);
---- libdvdread.orig/src/dvdread/ifo_types.h	2009-10-29 09:11:32.161557143 -0700
-+++ libdvdread/src/dvdread/ifo_types.h	2009-11-13 09:13:10.255237710 -0800
-@@ -301,6 +301,7 @@
- pgc_program_map_t *program_map;
- cell_playback_t *cell_playback;
- cell_position_t *cell_position;
-+ int ref_count;
- } ATTRIBUTE_PACKED pgc_t;
- #define PGC_SIZE 236U
- 
-@@ -326,6 +327,7 @@
- uint16_t zero_1;
- uint32_t last_byte;
- pgci_srp_t *pgci_srp;
-+ int ref_count;
- } ATTRIBUTE_PACKED pgcit_t;
- #define PGCIT_SIZE 8U
-

HandBrake-0.9.9.tar.bz2/contrib/libdvdread/A05-short-ptt-table.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/libdvdread/A06-short-ptt-table2.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/libdvdread/P00-mingw-dlfcn.patch Deleted

@@ -1,34 +0,0 @@
-Index: configure.ac
-===================================================================
---- libdvdread/configure.ac	(revision 1168)
-+++ libdvdread/configure.ac	(working copy)
-@@ -158,6 +158,16 @@
- ;;
- esac
- 
-+AC_ARG_ENABLE([local-dlfcn],
-+ [AS_HELP_STRING([--enable-local-dlfcn],
-+ [use local dlfcn for mingw (default is auto)])],
-+ [use_local_dlfcn=$enableval],
-+ [use_local_dlfcn=no])
-+
-+if [[ $use_local_dlfcn = "yes" ]]; then
-+	AC_DEFINE([USING_LOCAL_DLFCN], [1], ["Define to 1 to use local dlfcn"])
-+fi
-+
- dnl ---------------------------------------------
- dnl cflags
- dnl ---------------------------------------------
-Index: src/dvd_input.c
-===================================================================
---- libdvdread/src/dvd_input.c	(revision 1168)
-+++ libdvdread/src/dvd_input.c	(working copy)
-@@ -50,7 +50,7 @@
- #else
- 
- /* dlopening libdvdcss */
--#ifdef HAVE_DLFCN_H
-+#if defined(HAVE_DLFCN_H) && !defined(USING_LOCAL_DLFCN)
- #include <dlfcn.h>
- #else
- /* Only needed on MINGW at the moment */

HandBrake-0.9.9.tar.bz2/contrib/libdvdread/P01-mingw-bitfields.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/libdvdread/P05-mingw-large-file.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/libdvdread/P06-darwin.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/libmkv Deleted

HandBrake-0.9.9.tar.bz2/contrib/libmkv/A00-private-data-offset.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/libmkv/A01-hbmv-pgs.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/libmkv/A02-audio-out-sampling-freq.patch Deleted

@@ -1,28 +0,0 @@
-diff --git a/include/libmkv.h b/include/libmkv.h
-index 146a91f..f03d608 100644
---- a/include/libmkv.h
-+++ b/include/libmkv.h
-@@ -203,6 +204,7 @@ struct mk_TrackConfig_s {
- 		} video;
- 		struct {
- 			float samplingFreq;	/* Sampling Frequency in Hz */
-+			float outputSamplingFreq;	/* Playback Sampling Frequency in Hz (e.g. for AAC w/SBR) */
- 			unsigned channels;	/* Number of channels for this track */
- 			unsigned bitDepth;	/* Bits per sample (PCM) */
- 		} audio;
-diff --git a/src/tracks.c b/src/tracks.c
-index f9c7e48..a2a60ca 100644
---- a/src/tracks.c
-+++ b/src/tracks.c
-@@ -174,6 +174,11 @@ mk_Track *mk_createTrack(mk_Writer *w, mk_TrackConfig *tc)
- 			/* SamplingFrequency */
- 			if (mk_writeFloat(v, MATROSKA_ID_AUDIOSAMPLINGFREQ, tc->extra.audio.samplingFreq) < 0)
- 				return NULL;
-+			if (tc->extra.audio.outputSamplingFreq) {
-+				/* Output SamplingFrequency */
-+				if (mk_writeFloat(v, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, tc->extra.audio.outputSamplingFreq) < 0)
-+					return NULL;
-+			}
- 			/* Channels */
- 			if (mk_writeUInt(v, MATROSKA_ID_AUDIOCHANNELS, tc->extra.audio.channels) < 0)
- 				return NULL;

HandBrake-0.9.9.tar.bz2/contrib/libmkv/P00-mingw-large-file.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/libmkv/module.defs Deleted

HandBrake-0.9.9.tar.bz2/contrib/libmkv/module.rules Deleted

HandBrake-0.9.9.tar.bz2/contrib/mp4v2 Deleted

HandBrake-0.9.9.tar.bz2/contrib/mp4v2/A00-nero-vobsub.patch Deleted

@@ -1,142 +0,0 @@
-diff -Naur mp4v2-trunk-r355/include/mp4v2/general.h mp4v2-trunk-r355/include/mp4v2/general.h
---- mp4v2-trunk-r355/include/mp4v2/general.h	2009-05-23 06:09:58.000000000 -0700
-+++ mp4v2-trunk-r355/include/mp4v2/general.h	2010-05-23 14:22:21.949288657 -0700
-@@ -75,6 +75,7 @@
- #define MP4_CNTL_TRACK_TYPE "cntl" /**< Constant: control track. */
- #define MP4_TEXT_TRACK_TYPE "text" /**< Constant: text track. */
- #define MP4_SUBTITLE_TRACK_TYPE "sbtl" /**< Constant: subtitle track. */
-+#define MP4_SUBPIC_TRACK_TYPE "subp" /**< Constant: subtitle track. */
- /*
- * This second set of track types should be created
- * via MP4AddSystemsTrack(type)
-diff -Naur mp4v2-trunk-r355/include/mp4v2/track.h mp4v2-trunk-r355/include/mp4v2/track.h
---- mp4v2-trunk-r355/include/mp4v2/track.h	2009-05-23 06:21:49.000000000 -0700
-+++ mp4v2-trunk-r355/include/mp4v2/track.h	2010-05-23 15:43:47.249286008 -0700
-@@ -310,6 +310,13 @@
- uint16_t height );
- 
- MP4V2_EXPORT
-+MP4TrackId MP4AddSubpicTrack(
-+ MP4FileHandle hFile,
-+ uint32_t timescale,
-+ uint16_t width,
-+ uint16_t height );
-+
-+MP4V2_EXPORT
- MP4TrackId MP4AddPixelAspectRatio(
- MP4FileHandle hFile,
- MP4TrackId refTrackId,
-diff -Naur mp4v2-trunk-r355/src/descriptors.h mp4v2-trunk-r355/src/descriptors.h
---- mp4v2-trunk-r355/src/descriptors.h	2009-05-20 19:52:32.000000000 -0700
-+++ mp4v2-trunk-r355/src/descriptors.h	2010-05-23 16:29:34.800935677 -0700
-@@ -119,6 +119,7 @@
- // ES objectTypeId
- const uint8_t MP4SystemsV1ObjectType = 0x01;
- const uint8_t MP4SystemsV2ObjectType = 0x02;
-+const uint8_t MP4SubpicObjectType = 0xe0;
- 
- // ES streamType
- const uint8_t MP4ObjectDescriptionStreamType = 0x01;
-@@ -131,6 +132,7 @@
- const uint8_t MP4OCIStreamType = 0x08;
- const uint8_t MP4MPEGJStreamType = 0x09;
- const uint8_t MP4UserPrivateStreamType = 0x20;
-+const uint8_t MP4NeroSubpicStreamType = 0x38;
- 
- ///////////////////////////////////////////////////////////////////////////////
- 
-diff -Naur mp4v2-trunk-r355/src/mp4.cpp mp4v2-trunk-r355/src/mp4.cpp
---- mp4v2-trunk-r355/src/mp4.cpp	2009-05-23 06:29:37.000000000 -0700
-+++ mp4v2-trunk-r355/src/mp4.cpp	2010-05-23 15:45:28.852222074 -0700
-@@ -1174,6 +1174,23 @@
- return MP4_INVALID_TRACK_ID;
- }
- 
-+ MP4TrackId MP4AddSubpicTrack(MP4FileHandle hFile,
-+ uint32_t timescale,
-+ uint16_t width,
-+ uint16_t height)
-+ {
-+ if (MP4_IS_VALID_FILE_HANDLE(hFile)) {
-+ try {
-+ return ((MP4File*)hFile)->AddSubpicTrack(timescale, width, height);
-+ }
-+ catch (MP4Error* e) {
-+ PRINT_ERROR(e);
-+ delete e;
-+ }
-+ }
-+ return MP4_INVALID_TRACK_ID;
-+ }
-+
- MP4TrackId MP4AddChapterTextTrack(
- MP4FileHandle hFile, MP4TrackId refTrackId, uint32_t timescale)
- {
-diff -Naur mp4v2-trunk-r355/src/mp4file.cpp mp4v2-trunk-r355/src/mp4file.cpp
---- mp4v2-trunk-r355/src/mp4file.cpp	2009-05-26 19:34:56.000000000 -0700
-+++ mp4v2-trunk-r355/src/mp4file.cpp	2010-05-23 16:32:52.654220633 -0700
-@@ -2095,6 +2095,50 @@
- return trackId;
- }
- 
-+MP4TrackId MP4File::AddSubpicTrack(uint32_t timescale,
-+ uint16_t width,
-+ uint16_t height)
-+{
-+ MP4TrackId trackId =
-+ AddTrack(MP4_SUBPIC_TRACK_TYPE, timescale);
-+
-+ InsertChildAtom(MakeTrackName(trackId, "mdia.minf"), "nmhd", 0);
-+
-+ (void)AddChildAtom(MakeTrackName(trackId, "mdia.minf.stbl.stsd"), "mp4s");
-+
-+ SetTrackFloatProperty(trackId, "tkhd.width", width);
-+ SetTrackFloatProperty(trackId, "tkhd.height", height);
-+ SetTrackIntegerProperty(trackId, "tkhd.layer", 0);
-+
-+ // stsd is a unique beast in that it has a count of the number
-+ // of child atoms that needs to be incremented after we add the mp4s atom
-+ MP4Integer32Property* pStsdCountProperty;
-+ FindIntegerProperty(
-+ MakeTrackName(trackId, "mdia.minf.stbl.stsd.entryCount"),
-+ (MP4Property**)&pStsdCountProperty);
-+ pStsdCountProperty->IncrementValue();
-+
-+ SetTrackIntegerProperty(trackId,
-+ "mdia.minf.stbl.stsd.mp4s.esds.ESID",
-+#if 0
-+ // note - for a file, these values need to
-+ // be 0 - wmay - 04/16/2003
-+ trackId
-+#else
-+ 0
-+#endif
-+ );
-+
-+ SetTrackIntegerProperty(trackId,
-+ "mdia.minf.stbl.stsd.mp4s.esds.decConfigDescr.objectTypeId",
-+ MP4SubpicObjectType);
-+
-+ SetTrackIntegerProperty(trackId,
-+ "mdia.minf.stbl.stsd.mp4s.esds.decConfigDescr.streamType",
-+ MP4NeroSubpicStreamType);
-+ return trackId;
-+}
-+
- MP4TrackId MP4File::AddChapterTextTrack(MP4TrackId refTrackId, uint32_t timescale)
- {
- // validate reference track id
-diff -Naur mp4v2-trunk-r355/src/mp4file.h mp4v2-trunk-r355/src/mp4file.h
---- mp4v2-trunk-r355/src/mp4file.h	2009-05-23 06:29:37.000000000 -0700
-+++ mp4v2-trunk-r355/src/mp4file.h	2010-05-23 15:44:57.568026299 -0700
-@@ -388,6 +388,10 @@
- uint16_t width,
- uint16_t height);
- 
-+ MP4TrackId AddSubpicTrack(uint32_t timescale,
-+ uint16_t width,
-+ uint16_t height);
-+
- MP4TrackId AddPixelAspectRatio(MP4TrackId trackId, uint32_t hSpacing, uint32_t vSpacing);
- MP4TrackId AddColr(MP4TrackId trackId, uint16_t pri, uint16_t tran, uint16_t mat);
-

HandBrake-0.9.9.tar.bz2/contrib/mp4v2/A01-divide-zero.patch Deleted

@@ -1,22 +0,0 @@
---- mp4v2-r355/src/mp4track.cpp	2012-01-05 15:44:29.000000000 +0100
-+++ mp4v2-r355/src/mp4track.cpp	2012-01-05 15:47:34.000000000 +0100
-@@ -819,13 +819,14 @@
-                 (thisSecStart + timeScale) - lastSampleTime;
-             // calculate the duration of the last sample
-             MP4Duration lastSampleDur = sampleTime - lastSampleTime;
--            uint32_t overflow_bytes;
-             // now, calculate the number of bytes we overflowed.  Round up.
--            overflow_bytes =
--                ((lastSampleSize * overflow_dur) + (lastSampleDur - 1)) / lastSampleDur;
-+            if( lastSampleDur > 0 ) {
-+                uint32_t overflow_bytes = 0;
-+                overflow_bytes = ((lastSampleSize * overflow_dur) + (lastSampleDur - 1)) / lastSampleDur;
- 
--            if (bytesThisSec - overflow_bytes > maxBytesPerSec) {
--                maxBytesPerSec = bytesThisSec - overflow_bytes;
-+                if (bytesThisSec - overflow_bytes > maxBytesPerSec) {
-+                    maxBytesPerSec = bytesThisSec - overflow_bytes;
-+                }
-             }
- 
-             // now adjust the values for this sample.  Remove the bytes

HandBrake-0.9.9.tar.bz2/contrib/mp4v2/A02-meaningful-4gb-warning.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/mp4v2/P00-mingw-dllimport.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/mp4v2/module.defs Deleted

HandBrake-0.9.9.tar.bz2/contrib/mp4v2/module.rules Deleted

HandBrake-0.9.9.tar.bz2/contrib/mpeg2dec Deleted

HandBrake-0.9.9.tar.bz2/contrib/mpeg2dec/A00-tags.patch Deleted

@@ -1,27 +0,0 @@
-diff -ru mpeg2dec.orig/libmpeg2/decode.c mpeg2dec/libmpeg2/decode.c
---- mpeg2dec.orig/libmpeg2/decode.c	2008-07-09 12:16:05.000000000 -0700
-+++ mpeg2dec/libmpeg2/decode.c	2009-07-03 16:29:48.000000000 -0700
-@@ -212,7 +212,7 @@
- 
- mpeg2_state_t mpeg2_parse_header (mpeg2dec_t * mpeg2dec)
- {
--    static int (* process_header[]) (mpeg2dec_t * mpeg2dec) = {
-+    static int (* process_header[]) (mpeg2dec_t *) = {
- 	mpeg2_header_picture, mpeg2_header_extension, mpeg2_header_user_data,
- 	mpeg2_header_sequence, NULL, NULL, NULL, NULL, mpeg2_header_gop
-     };
-@@ -368,6 +368,14 @@
- 
- void mpeg2_tag_picture (mpeg2dec_t * mpeg2dec, uint32_t tag, uint32_t tag2)
- {
-+    if (mpeg2dec->num_tags == 0 && mpeg2dec->state == STATE_PICTURE && mpeg2dec->picture) {
-+        // since tags got processed when we entered this state we
-+        // have to set them directly or they'll end up on the next frame.
-+        mpeg2dec->picture->tag = tag;
-+        mpeg2dec->picture->tag2 = tag2;
-+        mpeg2dec->picture->flags |= PIC_FLAG_TAGS;
-+        return;
-+    }
-     mpeg2dec->tag_previous = mpeg2dec->tag_current;
-     mpeg2dec->tag2_previous = mpeg2dec->tag2_current;
-     mpeg2dec->tag_current = tag;

HandBrake-0.9.9.tar.bz2/contrib/mpeg2dec/A01-gcc4.6.patch Deleted

@@ -1,122 +0,0 @@
-Index: libmpeg2/idct_mmx.c
-===================================================================
---- mpeg2dec.orig/libmpeg2/idct_mmx.c	(revision 1205)
-+++ mpeg2dec/libmpeg2/idct_mmx.c	(working copy)
-@@ -464,10 +464,10 @@
- /* Almost identical to mmxext version: */
- /* just do both 4x8 columns in paraller */
- 
-- static const short t1_vector[] ATTR_ALIGN(16) = {T1,T1,T1,T1,T1,T1,T1,T1};
-- static const short t2_vector[] ATTR_ALIGN(16) = {T2,T2,T2,T2,T2,T2,T2,T2};
-- static const short t3_vector[] ATTR_ALIGN(16) = {T3,T3,T3,T3,T3,T3,T3,T3};
-- static const short c4_vector[] ATTR_ALIGN(16) = {C4,C4,C4,C4,C4,C4,C4,C4};
-+ static short t1_vector[] ATTR_ALIGN(16) = {T1,T1,T1,T1,T1,T1,T1,T1};
-+ static short t2_vector[] ATTR_ALIGN(16) = {T2,T2,T2,T2,T2,T2,T2,T2};
-+ static short t3_vector[] ATTR_ALIGN(16) = {T3,T3,T3,T3,T3,T3,T3,T3};
-+ static short c4_vector[] ATTR_ALIGN(16) = {C4,C4,C4,C4,C4,C4,C4,C4};
- 
- #if defined(__x86_64__)
- 
-@@ -710,10 +710,10 @@
- /* MMX column IDCT */
- static inline void idct_col (int16_t * const col, const int offset)
- {
-- static const short t1_vector[] ATTR_ALIGN(8) = {T1,T1,T1,T1};
-- static const short t2_vector[] ATTR_ALIGN(8) = {T2,T2,T2,T2};
-- static const short t3_vector[] ATTR_ALIGN(8) = {T3,T3,T3,T3};
-- static const short c4_vector[] ATTR_ALIGN(8) = {C4,C4,C4,C4};
-+ static short t1_vector[] ATTR_ALIGN(8) = {T1,T1,T1,T1};
-+ static short t2_vector[] ATTR_ALIGN(8) = {T2,T2,T2,T2};
-+ static short t3_vector[] ATTR_ALIGN(8) = {T3,T3,T3,T3};
-+ static short c4_vector[] ATTR_ALIGN(8) = {C4,C4,C4,C4};
- 
- /* column code adapted from peter gubanov */
- /* http://www.elecard.com/peter/idct.shtml */
-@@ -847,33 +847,33 @@
- }
- 
- 
--static const int32_t rounder0[] ATTR_ALIGN(8) =
-+static int32_t rounder0[] ATTR_ALIGN(8) =
- rounder ((1 << (COL_SHIFT - 1)) - 0.5);
--static const int32_t rounder4[] ATTR_ALIGN(8) = rounder (0);
--static const int32_t rounder1[] ATTR_ALIGN(8) =
-+static int32_t rounder4[] ATTR_ALIGN(8) = rounder (0);
-+static int32_t rounder1[] ATTR_ALIGN(8) =
- rounder (1.25683487303);	/* C1*(C1/C4+C1+C7)/2 */
--static const int32_t rounder7[] ATTR_ALIGN(8) =
-+static int32_t rounder7[] ATTR_ALIGN(8) =
- rounder (-0.25);		/* C1*(C7/C4+C7-C1)/2 */
--static const int32_t rounder2[] ATTR_ALIGN(8) =
-+static int32_t rounder2[] ATTR_ALIGN(8) =
- rounder (0.60355339059);	/* C2 * (C6+C2)/2 */
--static const int32_t rounder6[] ATTR_ALIGN(8) =
-+static int32_t rounder6[] ATTR_ALIGN(8) =
- rounder (-0.25);		/* C2 * (C6-C2)/2 */
--static const int32_t rounder3[] ATTR_ALIGN(8) =
-+static int32_t rounder3[] ATTR_ALIGN(8) =
- rounder (0.087788325588);	/* C3*(-C3/C4+C3+C5)/2 */
--static const int32_t rounder5[] ATTR_ALIGN(8) =
-+static int32_t rounder5[] ATTR_ALIGN(8) =
- rounder (-0.441341716183);	/* C3*(-C5/C4+C5-C3)/2 */
- 
- 
- #define declare_idct(idct,table,idct_row_head,idct_row,idct_row_tail,idct_row_mid)	\
- static inline void idct (int16_t * const block)				\
- {									\
-- static const int16_t table04[] ATTR_ALIGN(16) =			\
-+ static int16_t table04[] ATTR_ALIGN(16) =			\
- 	table (22725, 21407, 19266, 16384, 12873, 8867, 4520);		\
-- static const int16_t table17[] ATTR_ALIGN(16) =			\
-+ static int16_t table17[] ATTR_ALIGN(16) =			\
- 	table (31521, 29692, 26722, 22725, 17855, 12299, 6270);		\
-- static const int16_t table26[] ATTR_ALIGN(16) =			\
-+ static int16_t table26[] ATTR_ALIGN(16) =			\
- 	table (29692, 27969, 25172, 21407, 16819, 11585, 5906);		\
-- static const int16_t table35[] ATTR_ALIGN(16) =			\
-+ static int16_t table35[] ATTR_ALIGN(16) =			\
- 	table (26722, 25172, 22654, 19266, 15137, 10426, 5315);		\
- 									\
- idct_row_head (block, 0*8, table04);				\
-@@ -900,29 +900,29 @@
- 
- static inline void sse2_idct (int16_t * const block)
- {
-- static const int16_t table04[] ATTR_ALIGN(16) =
-+ static int16_t table04[] ATTR_ALIGN(16) =
- 	sse2_table (22725, 21407, 19266, 16384, 12873, 8867, 4520);
-- static const int16_t table17[] ATTR_ALIGN(16) =
-+ static int16_t table17[] ATTR_ALIGN(16) =
- 	sse2_table (31521, 29692, 26722, 22725, 17855, 12299, 6270);
-- static const int16_t table26[] ATTR_ALIGN(16) =
-+ static int16_t table26[] ATTR_ALIGN(16) =
- 	sse2_table (29692, 27969, 25172, 21407, 16819, 11585, 5906);
-- static const int16_t table35[] ATTR_ALIGN(16) =
-+ static int16_t table35[] ATTR_ALIGN(16) =
- 	sse2_table (26722, 25172, 22654, 19266, 15137, 10426, 5315);
- 
-- static const int32_t rounder0_128[] ATTR_ALIGN(16) =
-+ static int32_t rounder0_128[] ATTR_ALIGN(16) =
- 	rounder_sse2 ((1 << (COL_SHIFT - 1)) - 0.5);
-- static const int32_t rounder4_128[] ATTR_ALIGN(16) = rounder_sse2 (0);
-- static const int32_t rounder1_128[] ATTR_ALIGN(16) =
-+ static int32_t rounder4_128[] ATTR_ALIGN(16) = rounder_sse2 (0);
-+ static int32_t rounder1_128[] ATTR_ALIGN(16) =
- 	rounder_sse2 (1.25683487303);	/* C1*(C1/C4+C1+C7)/2 */
-- static const int32_t rounder7_128[] ATTR_ALIGN(16) =
-+ static int32_t rounder7_128[] ATTR_ALIGN(16) =
- 	rounder_sse2 (-0.25);		/* C1*(C7/C4+C7-C1)/2 */
-- static const int32_t rounder2_128[] ATTR_ALIGN(16) =
-+ static int32_t rounder2_128[] ATTR_ALIGN(16) =
- 	rounder_sse2 (0.60355339059);	/* C2 * (C6+C2)/2 */
-- static const int32_t rounder6_128[] ATTR_ALIGN(16) =
-+ static int32_t rounder6_128[] ATTR_ALIGN(16) =
- 	rounder_sse2 (-0.25);		/* C2 * (C6-C2)/2 */
-- static const int32_t rounder3_128[] ATTR_ALIGN(16) =
-+ static int32_t rounder3_128[] ATTR_ALIGN(16) =
- 	rounder_sse2 (0.087788325588);	/* C3*(-C3/C4+C3+C5)/2 */
-- static const int32_t rounder5_128[] ATTR_ALIGN(16) =
-+ static int32_t rounder5_128[] ATTR_ALIGN(16) =
- 	rounder_sse2 (-0.441341716183);	/* C3*(-C5/C4+C5-C3)/2 */
- 
- #if defined(__x86_64__)

HandBrake-0.9.9.tar.bz2/contrib/mpeg2dec/A02-gwluserdata.patch Deleted

@@ -1,39 +0,0 @@
-diff -ru mpeg2dec.orig/libvo/video_out_dx.c mpeg2dec/libvo/video_out_dx.c
---- mpeg2dec.orig/libvo/video_out_dx.c	2008-07-09 11:28:24.000000000 -0700
-+++ mpeg2dec/libvo/video_out_dx.c	2012-09-08 05:31:39.304849824 -0700
-@@ -92,9 +92,9 @@
-     switch (message) {
- 
-     case WM_WINDOWPOSCHANGED:
--	instance = (dx_instance_t *) GetWindowLong (hwnd, GWL_USERDATA);
-+	/*instance = (dx_instance_t *) GetWindowLong (hwnd, GWL_USERDATA);
- 
--	/* update the window position and size */
-+	// update the window position and size
- 	point_window.x = 0;
- 	point_window.y = 0;
- 	ClientToScreen (hwnd, &point_window);
-@@ -104,9 +104,9 @@
- 	instance->window_coords.right = rect_window.right + point_window.x;
- 	instance->window_coords.bottom = rect_window.bottom + point_window.y;
- 
--	/* update the overlay */
-+	// update the overlay 
- 	if (instance->overlay && instance->display)
--	    update_overlay (instance);
-+	    update_overlay (instance);*/
- 
- 	return 0;
- 
-@@ -173,7 +173,10 @@
-     /* store a directx_instance pointer into the window local storage
-      * (for later use in event_handler).
-      * We need to use SetWindowLongPtr when it is available in mingw */
--    SetWindowLong (instance->window, GWL_USERDATA, (LONG) instance);
-+
-+    // Current version of MINGW-W64 does not have this!
-+    // Since we are not outputting to a display, this is not a problem.
-+    //SetWindowLong (instance->window, GWL_USERDATA, (LONG) instance);
- 
-     ShowWindow (instance->window, SW_SHOW);
- 
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/contrib/mpeg2dec/P00-mingw-disable-sse.patch Deleted

HandBrake-0.9.9.tar.bz2/contrib/mpeg2dec/module.defs Deleted

HandBrake-0.9.9.tar.bz2/contrib/mpeg2dec/module.rules Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-activity.32.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-activity.64.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-add-queue.32.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-add-queue.64.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-canceled.16.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-complete.16.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-edit.32.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.1024.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.128.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.16.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.22.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.24.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.256.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.32.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.48.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.512.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-icon.64.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-pause.32.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-pause.64.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-picture.32.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-picture.64.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-pref.32.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-queue-job.16.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-queue-pass1.16.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-queue-pass2.16.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-queue-subtitle.16.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-queue.32.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-remove.24.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-remove.48.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-showqueue.32.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-showqueue.64.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-source.32.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-source.64.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-start.32.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-start.64.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-status-empty.32.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-status.32.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-stop.32.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-stop.64.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-working0.16.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-working1.16.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-working2.16.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-working3.16.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-working4.16.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/hb-working5.16.png Deleted

HandBrake-0.9.9.tar.bz2/gtk/src/icon_tools.c Deleted

@@ -1,102 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
-/*
- * icon_tools.c
- * Copyright (C) John Stebbins 2008-2013 <stebbins@stebbins>
- * 
- * icon_tools.c is free software.
- * 
- * You may 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.
- * 
- */
-#include <glib.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gdk-pixdata.h>
-#include "icon_tools.h"
-
-GdkPixbuf*
-icon_deserialize(const guint8 *sd, guint len)
-{
- GdkPixdata pd;
- GdkPixbuf *pb;
- GError *err = NULL;
-
- gdk_pixdata_deserialize(&pd, len, sd, &err);
- pb = gdk_pixbuf_from_pixdata(&pd, TRUE, &err);
- return pb;
-}
-
-guint8*
-icon_serialize(const GdkPixbuf *pixbuf, guint *len)
-{
- GdkPixdata pd;
- guint8 *sd;
-
- gdk_pixdata_from_pixbuf(&pd, pixbuf, FALSE);
- sd = gdk_pixdata_serialize(&pd, len);
- return sd;
-}
-
-guint8*
-icon_file_serialize(const gchar *filename, guint *len)
-{
- GdkPixbuf *pb;
- GError *err = NULL;
-
- pb = gdk_pixbuf_new_from_file(filename, &err);
- if (pb == NULL)
- {
- g_warning("Failed to open icon file %s: %s", filename, err->message);
- return NULL;
- }
- return icon_serialize(pb, len);
-}
-
-GdkPixbuf*
-base64_to_icon(const gchar *bd)
-{
- guchar *sd;
- gsize len;
- GdkPixdata pd;
- GdkPixbuf *pb;
- GError *err = NULL;
-
- sd = g_base64_decode(bd, &len);
- gdk_pixdata_deserialize(&pd, len, sd, &err);
- pb = gdk_pixbuf_from_pixdata(&pd, TRUE, &err);
- g_free(sd);
- return pb;
-}
-
-gchar*
-icon_to_base64(const GdkPixbuf *pixbuf)
-{
- GdkPixdata pd;
- guint len;
- guint8 *sd;
- gchar *bd;
-
- gdk_pixdata_from_pixbuf(&pd, pixbuf, FALSE);
- sd = gdk_pixdata_serialize(&pd, &len);
- bd = g_base64_encode(sd, len);
- g_free(sd);
- return bd;
-}
-
-gchar*
-icon_file_to_base64(const gchar *filename)
-{
- GdkPixbuf *pb;
- GError *err = NULL;
-
- pb = gdk_pixbuf_new_from_file(filename, &err);
- if (pb == NULL)
- {
- g_warning("Failed to open icon file %s: %s", filename, err->message);
- return NULL;
- }
- return icon_to_base64(pb);
-}
-

HandBrake-0.9.9.tar.bz2/gtk/src/icon_tools.h Deleted

@@ -1,30 +0,0 @@
-/*
- * This program 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.
- * 
- * This program 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 Library General Public License for more details.
- * 
- * 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., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
- */
-#if !defined(_ICON_TOOLS_H_)
-#define _ICON_TOOLS_H_
-
-#include <glib.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gdk-pixdata.h>
-
-GdkPixbuf* icon_deserialize(const guint8 *sd, guint len);
-guint8* icon_serialize(const GdkPixbuf *pixbuf, guint *len);
-guint8* icon_file_serialize(const gchar *filename, guint *len);
-GdkPixbuf* base64_to_icon(const gchar *bd);
-gchar* icon_to_base64(const GdkPixbuf *pixbuf);
-gchar* icon_file_to_base64(const gchar *filename);
-
-#endif // _ICON_TOOLS_H_

HandBrake-0.9.9.tar.bz2/gtk/src/preset_xlat.c Deleted

@@ -1,627 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <glib.h>
-#include <glib/gstdio.h>
-#include "plist.h"
-#include "values.h"
-
-static GValue *defaults;
-
-typedef struct
-{
- gchar *mac_val;
- gchar *lin_val;
-} value_map_t;
-
-#if 0
-static value_map_t subtitle_xlat[] =
-{ 
- { "None", "none" },
- { "Auto", "auto" },
- { "Any", "und" },
- { "Afar", "aar" },
- { "Abkhazian", "abk" },
- { "Afrikaans", "afr" },
- { "Akan", "aka" },
- { "Albanian", "sqi" },
- { "Amharic", "amh" },
- { "Arabic", "ara" },
- { "Aragonese", "arg" },
- { "Armenian", "hye" },
- { "Assamese", "asm" },
- { "Avaric", "ava" },
- { "Avestan", "ave" },
- { "Aymara", "aym" },
- { "Azerbaijani", "aze" },
- { "Bashkir", "bak" },
- { "Bambara", "bam" },
- { "Basque", "eus" },
- { "Belarusian", "bel" },
- { "Bengali", "ben" },
- { "Bihari", "bih" },
- { "Bislama", "bis" },
- { "Bosnian", "bos" },
- { "Breton", "bre" },
- { "Bulgarian", "bul" },
- { "Burmese", "mya" },
- { "Catalan", "cat" },
- { "Chamorro", "cha" },
- { "Chechen", "che" },
- { "Chinese", "zho" },
- { "Church Slavic", "chu" },
- { "Chuvash", "chv" },
- { "Cornish", "cor" },
- { "Corsican", "cos" },
- { "Cree", "cre" },
- { "Czech", "ces" },
- { "Danish", "dan" },
- { "Divehi", "div" },
- { "Dutch", "nld" },
- { "Dzongkha", "dzo" },
- { "English", "eng" },
- { "Esperanto", "epo" },
- { "Estonian", "est" },
- { "Ewe", "ewe" },
- { "Faroese", "fao" },
- { "Fijian", "fij" },
- { "Finnish", "fin" },
- { "French", "fra" },
- { "Western Frisian", "fry" },
- { "Fulah", "ful" },
- { "Georgian", "kat" },
- { "German", "deu" },
- { "Gaelic (Scots)", "gla" },
- { "Irish", "gle" },
- { "Galician", "glg" },
- { "Manx", "glv" },
- { "Greek, Modern", "ell" },
- { "Guarani", "grn" },
- { "Gujarati", "guj" },
- { "Haitian", "hat" },
- { "Hausa", "hau" },
- { "Hebrew", "heb" },
- { "Herero", "her" },
- { "Hindi", "hin" },
- { "Hiri Motu", "hmo" },
- { "Hungarian", "hun" },
- { "Igbo", "ibo" },
- { "Icelandic", "isl" },
- { "Ido", "ido" },
- { "Sichuan Yi", "iii" },
- { "Inuktitut", "iku" },
- { "Interlingue", "ile" },
- { "Interlingua", "ina" },
- { "Indonesian", "ind" },
- { "Inupiaq", "ipk" },
- { "Italian", "ita" },
- { "Javanese", "jav" },
- { "Japanese", "jpn" },
- { "Kalaallisut", "kal" },
- { "Kannada", "kan" },
- { "Kashmiri", "kas" },
- { "Kanuri", "kau" },
- { "Kazakh", "kaz" },
- { "Central Khmer", "khm" },
- { "Kikuyu", "kik" },
- { "Kinyarwanda", "kin" },
- { "Kirghiz", "kir" },
- { "Komi", "kom" },
- { "Kongo", "kon" },
- { "Korean", "kor" },
- { "Kuanyama", "kua" },
- { "Kurdish", "kur" },
- { "Lao", "lao" },
- { "Latin", "lat" },
- { "Latvian", "lav" },
- { "Limburgan", "lim" },
- { "Lingala", "lin" },
- { "Lithuanian", "lit" },
- { "Luxembourgish", "ltz" },
- { "Luba-Katanga", "lub" },
- { "Ganda", "lug" },
- { "Macedonian", "mkd" },
- { "Marshallese", "mah" },
- { "Malayalam", "mal" },
- { "Maori", "mri" },
- { "Marathi", "mar" },
- { "Malay", "msa" },
- { "Malagasy", "mlg" },
- { "Maltese", "mlt" },
- { "Moldavian", "mol" },
- { "Mongolian", "mon" },
- { "Nauru", "nau" },
- { "Navajo", "nav" },
- { "Ndebele, South", "nbl" },
- { "Ndebele, North", "nde" },
- { "Ndonga", "ndo" },
- { "Nepali", "nep" },
- { "Norwegian Nynorsk", "nno" },
- { "Norwegian Bokmål", "nob" },
- { "Norwegian", "nor" },
- { "Chichewa; Nyanja", "nya" },
- { "Occitan", "oci" },
- { "Ojibwa", "oji" },
- { "Oriya", "ori" },
- { "Oromo", "orm" },
- { "Ossetian", "oss" },
- { "Panjabi", "pan" },
- { "Persian", "fas" },
- { "Pali", "pli" },
- { "Polish", "pol" },
- { "Portuguese", "por" },
- { "Pushto", "pus" },
- { "Quechua", "que" },
- { "Romansh", "roh" },
- { "Romanian", "ron" },
- { "Rundi", "run" },
- { "Russian", "rus" },
- { "Sango", "sag" },
- { "Sanskrit", "san" },
- { "Serbian", "srp" },
- { "Croatian", "hrv" },
- { "Sinhala", "sin" },
- { "Slovak", "slk" },
- { "Slovenian", "slv" },
- { "Northern Sami", "sme" },
- { "Samoan", "smo" },
- { "Shona", "sna" },
- { "Sindhi", "snd" },
- { "Somali", "som" },
- { "Sotho, Southern", "sot" },
- { "Spanish", "spa" },
- { "Sardinian", "srd" },
- { "Swati", "ssw" },
- { "Sundanese", "sun" },
- { "Swahili", "swa" },
- { "Swedish", "swe" },
- { "Tahitian", "tah" },
- { "Tamil", "tam" },
- { "Tatar", "tat" },
- { "Telugu", "tel" },
- { "Tajik", "tgk" },
- { "Tagalog", "tgl" },
- { "Thai", "tha" },
- { "Tibetan", "bod" },
- { "Tigrinya", "tir" },
- { "Tonga", "ton" },
- { "Tswana", "tsn" },
- { "Tsonga", "tso" },
- { "Turkmen", "tuk" },
- { "Turkish", "tur" },
- { "Twi", "twi" },
- { "Uighur", "uig" },
- { "Ukrainian", "ukr" },
- { "Urdu", "urd" },
- { "Uzbek", "uzb" },
- { "Venda", "ven" },
- { "Vietnamese", "vie" },
- { "Volapük", "vol" },
- { "Welsh", "cym" },
- { "Walloon", "wln" },
- { "Wolof", "wol" },
- { "Xhosa", "xho" },
- { "Yiddish", "yid" },
- { "Yoruba", "yor" },
- { "Zhuang", "zha" },
- { "Zulu", "zul" },
- {NULL, NULL}
-};
-
-static value_map_t vcodec_xlat[] =
-{
- {"MPEG-4 (FFmpeg)", "ffmpeg"},
- {"MPEG-4 (XviD)", "ffmpeg"},
- {"H.264 (x264)", "x264"},
- {"VP3 (Theora)", "theora"},
- {NULL,NULL}
-};
-
-value_map_t container_xlat[] =
-{
- {"MP4 file", "mp4"},
- {"M4V file", "m4v"},
- {"MKV file", "mkv"},
- {"AVI file", "avi"},
- {"OGM file", "ogm"},
- {NULL, NULL}
-};
-
-value_map_t framerate_xlat[] =
-{
- {"Same as source", "source"},
- {"5", "5"},
- {"10", "10"},
- {"12", "12"},
- {"15", "15"},
- {"23.976", "23.976"},
- {"24", "24"},
- {"25", "25"},
- {"29.97", "29.97"},
- {NULL, NULL}
-};
-
-value_map_t deint_xlat[] =
-{
- {"0", "none"},
- {"1", "fast"},
- {"2", "slow"},
- {"3", "slower"},
- {NULL, NULL}
-};
-
-value_map_t denoise_xlat[] =
-{
- {"0", "none"},
- {"1", "weak"},
- {"2", "medium"},
- {"3", "strong"},
- {NULL, NULL}
-};
-
-static value_map_t acodec_xlat[] =
-{
- {"AAC (faac)", "faac"},
- {"AC3 Passthru", "ac3"},
- {"MP3 (lame)", "lame"},
- {"Vorbis (vorbis)", "vorbis"},
- {NULL,NULL}
-};
-
-value_map_t samplerate_xlat[] =
-{
- {"Auto", "source"},
- {"22.05", "22.05"},
- {"24", "24"},
- {"32", "32"},
- {"44.1", "44.1"},
- {"48", "48"},
- {NULL, NULL}
-};
-
-value_map_t mix_xlat[] =
-{
- {"Mono", "mono"},
- {"Stereo", "stereo"},
- {"Dolby Surround", "dpl1"},
- {"Dolby Pro Logic II", "dpl2"},
- {"6-channel discrete", "6ch"},
- {"AC3 Passthru", "none"},
- {NULL, NULL}
-};
-#endif
-
-typedef struct
-{
- gchar *mac_key;
- gchar *lin_key;
- value_map_t *value_map;
- gboolean same;
- gboolean ignore;
-} key_map_t;
-
-key_map_t key_map[] = 
-{
- {"Audio1Bitrate", NULL, NULL, FALSE, FALSE},
- {"Audio1Encoder", NULL, NULL, FALSE, FALSE},
- {"Audio1Mixdown", NULL, NULL, FALSE, FALSE},
- {"Audio1Samplerate", NULL, NULL, FALSE, FALSE},
- {"Audio1Track", NULL, NULL, FALSE, FALSE},
- {"Audio1TrackDescription", NULL, NULL, FALSE, FALSE},
- {"Audio1TrackDRCSlider", NULL, NULL, FALSE, FALSE},
- {"Audio2Bitrate", NULL, NULL, FALSE, FALSE},
- {"Audio2Encoder", NULL, NULL, FALSE, FALSE},
- {"Audio2Mixdown", NULL, NULL, FALSE, FALSE},
- {"Audio2Samplerate", NULL, NULL, FALSE, FALSE},
- {"Audio2Track", NULL, NULL, FALSE, FALSE},
- {"Audio2TrackDescription", NULL, NULL, FALSE, FALSE},
- {"Audio2TrackDRCSlider", NULL, NULL, FALSE, FALSE},
- {"ChapterMarkers", NULL, NULL, TRUE, FALSE},
- {"Default", NULL, NULL, TRUE, FALSE},
- {"FileFormat", NULL, NULL, TRUE, FALSE},
- {"Folder", NULL, NULL, TRUE, FALSE},
- {"Mp4HttpOptimize", NULL, NULL, TRUE, FALSE},
- {"Mp4iPodCompatible", NULL, NULL, TRUE, FALSE},
- {"Mp4LargeFile", NULL, NULL, TRUE, FALSE},
- {"PictureAutoCrop", NULL, NULL, TRUE, FALSE},
- {"PictureBottomCrop", NULL, NULL, TRUE, FALSE},
- {"PictureDeblock", NULL, NULL, TRUE, FALSE},
- {"PictureDecomb", NULL, NULL, TRUE, FALSE},
- {"PictureDeinterlace", NULL, NULL, TRUE, FALSE},
- {"PictureDenoise", NULL, NULL, TRUE, FALSE},
- {"PictureDetelecine", NULL, NULL, TRUE, FALSE},
- {"PictureHeight", NULL, NULL, TRUE, FALSE},
- {"PictureKeepRatio", NULL, NULL, TRUE, FALSE},
- {"PictureLeftCrop", NULL, NULL, TRUE, FALSE},
- {"PicturePAR", NULL, NULL, TRUE, FALSE},
- {"PictureRightCrop", NULL, NULL, TRUE, FALSE},
- {"PictureTopCrop", NULL, NULL, TRUE, FALSE},
- {"PictureWidth", NULL, NULL, TRUE, FALSE},
- {"PresetDescription", NULL, NULL, TRUE, FALSE},
- {"PresetName", NULL, NULL, TRUE, FALSE},
- {"Subtitles", NULL, NULL, TRUE, FALSE},
- {"SubtitlesForced", NULL, NULL, TRUE, FALSE},
- {"Type", NULL, NULL, TRUE, FALSE},
- {"UsesMaxPictureSettings", NULL, NULL, TRUE, FALSE},
- {"UsesPictureFilters", NULL, NULL, TRUE, FALSE},
- {"UsesPictureSettings", NULL, NULL, TRUE, FALSE},
- {"VFR", NULL, NULL, FALSE, TRUE},
- {"VideoAvgBitrate", NULL, NULL, TRUE, FALSE},
- {"VideoEncoder", NULL, NULL, TRUE, FALSE},
- {"VideoFramerate", NULL, NULL, TRUE, FALSE},
- {"VideoGrayScale", NULL, NULL, TRUE, FALSE},
- {"VideoQualitySlider", NULL, NULL, TRUE, FALSE},
- {"VideoQualityType", NULL, NULL, TRUE, FALSE},
- {"VideoTargetSize", NULL, NULL, TRUE, FALSE},
- {"VideoTwoPass", NULL, NULL, TRUE, FALSE},
- {"VideoTurboTwoPass", NULL, NULL, TRUE, FALSE},
- {"x264Option", NULL, NULL, TRUE, FALSE},
- {NULL, NULL}
-};
-
-const gint
-key_xlat(key_map_t *key_map, const gchar *mac_key)
-{
- gint ii;
-
- for (ii = 0; key_map[ii].mac_key; ii++)
- {
- if (strcmp(mac_key, key_map[ii].mac_key) == 0)
- {
- if (key_map[ii].ignore)
- return -1;
- return ii;
- }
- }
- g_warning("Unrecognized key: (%s)", mac_key);
- return -1;
-}
-
-static GValue*
-value_xlat(
- GValue *defaults, 
- key_map_t *key_map, 
- gint key_index, 
- GValue *mac_val)
-{
- GValue *gval, *def_val;
- const gchar *lin_key;
- if (key_map[key_index].same)
- lin_key = key_map[key_index].mac_key;
- else
- lin_key = key_map[key_index].lin_key;
- value_map_t *value_map = key_map[key_index].value_map;
-
- def_val = ghb_dict_lookup(defaults, lin_key);
- if (def_val)
- {
- if (value_map)
- {
- gint ii;
- gchar *str;
- GValue *sval;
-
- str = ghb_value_string(mac_val);
- for (ii = 0; value_map[ii].mac_val; ii++)
- {
- if (strcmp(str, value_map[ii].mac_val) == 0)
- {
- sval = ghb_string_value_new(value_map[ii].lin_val);
- g_free(str);
- gval = ghb_value_new(G_VALUE_TYPE(def_val));
- if (!g_value_transform(sval, gval))
- {
- g_warning("1 can't transform");
- ghb_value_free(gval);
- ghb_value_free(sval);
- return NULL;
- }
- ghb_value_free(sval);
- return gval;
- }
- }
- g_warning("Can't map value: (%s)", str);
- g_free(str);
- }
- else
- {
- gval = ghb_value_new(G_VALUE_TYPE(def_val));
- if (!g_value_transform(mac_val, gval))
- {
- g_warning("2 can't transform");
- ghb_value_free(gval);
- return NULL;
- }
- return gval;
- }
- }
- else
- {
- g_warning("Bad key: (%s)", lin_key);
- return NULL;
- }
- return NULL;
-}
-
-key_map_t audio_key_map[] =
-{
- {"Audio1Bitrate", "AudioBitrate", NULL, FALSE, FALSE},
- {"Audio1Encoder", "AudioEncoder", NULL, FALSE, FALSE},
- {"Audio1Mixdown", "AudioMixdown", NULL, FALSE},
- {"Audio1Samplerate", "AudioSamplerate", NULL, FALSE, FALSE},
- {"Audio1Track", "AudioTrack", NULL, FALSE, FALSE},
- {"Audio1TrackDescription", "AudioTrackDescription", NULL, FALSE, FALSE},
- {"Audio1TrackDRCSlider", "AudioTrackDRCSlider", NULL, FALSE, FALSE},
- {"Audio2Bitrate", "AudioBitrate", NULL, FALSE, FALSE},
- {"Audio2Encoder", "AudioEncoder", NULL, FALSE, FALSE},
- {"Audio2Mixdown", "AudioMixdown", NULL, FALSE, FALSE},
- {"Audio2Samplerate", "AudioSamplerate", NULL, FALSE, FALSE},
- {"Audio2Track", "AudioTrack", NULL, FALSE, FALSE},
- {"Audio2TrackDescription", "AudioTrackDescription", NULL, FALSE, FALSE},
- {"Audio2TrackDRCSlider", "AudioTrackDRCSlider", NULL, FALSE, FALSE},
- {NULL, NULL}
-};
-
-static void
-hard_value_xlat(GValue *lin_dict, const gchar *mac_key, GValue *mac_val)
-{
- {
- gint key_index;
- GValue *audio_defaults;
-
- audio_defaults = ghb_array_get_nth(
- ghb_dict_lookup(defaults, "AudioList"), 0);
- key_index = key_xlat(audio_key_map, mac_key);
- if (key_index >= 0)
- {
- gint audio_index, count, ii;
- GValue *alist, *adict, *val;
- const gchar *lin_key;
-
- if (audio_key_map[key_index].same)
- lin_key = audio_key_map[key_index].mac_key;
- else
- lin_key = audio_key_map[key_index].lin_key;
- audio_index = mac_key[5] - '1';
- alist = ghb_dict_lookup(lin_dict, "AudioList");
- if (alist == NULL)
- {
- alist = ghb_array_value_new(8);
- ghb_dict_insert(lin_dict, "AudioList", alist);
- }
- count = ghb_array_len(alist);
- for (ii = count; ii <= audio_index; ii++)
- {
- adict = ghb_value_dup(audio_defaults);
- ghb_array_append(alist, adict);
- }
- adict = ghb_array_get_nth(alist, audio_index);
- val = value_xlat(audio_defaults, audio_key_map, key_index, mac_val);
- if (val)
- {
- ghb_dict_insert(adict, g_strdup(lin_key), val);
- }
- }
- }
-}
-
-static void
-parse_preset_dict(GValue *mac_dict, GValue *lin_dict)
-{
- GHashTableIter iter;
- gchar *key;
- GValue *mac_val, *val;
-
- ghb_dict_iter_init(&iter, mac_dict);
- // middle (void*) cast prevents gcc warning "defreferencing type-punned
- // pointer will break strict-aliasing rules"
- while (g_hash_table_iter_next(
- &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&mac_val))
- {
- gint key_index;
-
- key_index = key_xlat(key_map, key);
- if (key_index >= 0)
- { // The simple translations
- const gchar *lin_key;
-
- if (key_map[key_index].same)
- lin_key = key_map[key_index].mac_key;
- else
- lin_key = key_map[key_index].lin_key;
- if (lin_key)
- {
- val = value_xlat(defaults, key_map, key_index, mac_val);
- if (val)
- {
- ghb_dict_insert(lin_dict, g_strdup(lin_key), val);
- }
- }
- else
- {
- hard_value_xlat(lin_dict, key, mac_val);
- }
- }
- }
-}
-
-static void
-parse_preset_array(GValue *mac_array, GValue *lin_array)
-{
- gint count, ii;
- GValue *mac_dict, *lin_dict, *gval;
-
- count = ghb_array_len(mac_array);
- for (ii = 0; ii < count; ii++)
- {
- mac_dict = ghb_array_get_nth(mac_array, ii);
- 
- // Only process builtin types
- if (ghb_value_int(ghb_dict_lookup(mac_dict, "Type")) != 0)
- continue;
-
- lin_dict = ghb_dict_value_new();
- ghb_array_append(lin_array, lin_dict);
- gval = ghb_dict_lookup(mac_dict, "PresetName");
- if (gval)
- {
- ghb_dict_insert(lin_dict, g_strdup("PresetName"), 
- ghb_value_dup(gval));
- }
- gval = ghb_dict_lookup(mac_dict, "PresetDescription");
- if (gval)
- {
- ghb_dict_insert(lin_dict, g_strdup("PresetDescription"), 
- ghb_value_dup(gval));
- }
- gval = ghb_dict_lookup(mac_dict, "Folder");
- if (gval && ghb_value_boolean(gval))
- { // Folder
- GValue *mval, *lval;
-
- mval = ghb_dict_lookup(mac_dict, "ChildrenArray");
- lval = ghb_array_value_new(32);
- ghb_dict_insert(lin_dict, g_strdup("ChildrenArray"), lval);
- ghb_dict_insert(lin_dict, g_strdup("Folder"), 
- ghb_boolean_value_new(TRUE));
- ghb_dict_insert(lin_dict, g_strdup("Type"), 
- ghb_int_value_new(0));
- parse_preset_array(mval, lval);
- }
- else
- { // Normal preset
- ghb_dict_insert(lin_dict, g_strdup("Type"), 
- ghb_int_value_new(0));
- parse_preset_dict(mac_dict, lin_dict);
- }
- }
-}
-
-static void
-xlat(GValue *mac, GValue *lin)
-{
- return parse_preset_array(mac, lin);
-}
-
-gint
-main(gint argc, gchar *argv[])
-{
- GValue *mac_plist, *lin_plist;
- GValue *internal;
-
- if (argc < 3)
- {
- fprintf(stderr, "Usage: <mac plist> <lin plist>\n");
- return 1;
- }
- g_type_init();
-
- ghb_register_transforms();
- internal = ghb_plist_parse_file("internal_defaults.xml");
- defaults = ghb_dict_lookup(internal, "Presets");
- mac_plist = ghb_plist_parse_file(argv[1]);
- lin_plist = ghb_array_value_new(32);
- xlat(mac_plist, lin_plist);
- ghb_plist_write_file(argv[2], lin_plist);
- return 0;
-}
-

HandBrake-0.9.9.tar.bz2/gtk/src/widgetdeps.c Deleted

@@ -1,142 +0,0 @@
-#include <glib.h>
-#include <glib-object.h>
-#include <glib/gstdio.h>
-#include <string.h>
-#include "values.h"
-#include "plist.h"
-
-typedef struct
-{
- const gchar *widget_name;
- const gchar *dep_name;
- const gchar *enable_value;
- const gboolean disable_if_equal;
- const gboolean hide;
-} dependency_t;
-
-static dependency_t dep_map[] =
-{
- {"title", "queue_add", "none", TRUE, FALSE},
- {"title", "queue_add_menu", "none", TRUE, FALSE},
- {"title", "preview_frame", "none", TRUE, FALSE},
- {"title", "picture_label", "none", TRUE, FALSE},
- {"title", "picture_tab", "none", TRUE, FALSE},
- {"title", "chapters_label", "none", TRUE, FALSE},
- {"title", "chapters_tab", "none", TRUE, FALSE},
- {"title", "start_point", "none", TRUE, FALSE},
- {"title", "end_point", "none", TRUE, FALSE},
- {"title", "angle", "none", TRUE, FALSE},
- {"title", "angle_label", "1", TRUE, FALSE},
- {"use_dvdnav", "angle", "FALSE", TRUE, TRUE},
- {"use_dvdnav", "angle_label", "FALSE", TRUE, TRUE},
- {"angle_count", "angle", "1", TRUE, TRUE},
- {"angle_count", "angle_label", "1", TRUE, TRUE},
- {"vquality_type_bitrate", "VideoAvgBitrate", "TRUE", FALSE, FALSE},
- {"vquality_type_target", "VideoTargetSize", "TRUE", FALSE, FALSE},
- {"vquality_type_constant", "VideoQualitySlider", "TRUE", FALSE, FALSE},
- {"vquality_type_constant", "VideoTwoPass", "TRUE", TRUE, FALSE},
- {"vquality_type_constant", "VideoTurboTwoPass", "TRUE", TRUE, FALSE},
- {"VideoTwoPass", "VideoTurboTwoPass", "TRUE", FALSE, FALSE},
- {"FileFormat", "Mp4LargeFile", "mp4", FALSE, TRUE},
- {"FileFormat", "Mp4HttpOptimize", "mp4", FALSE, TRUE},
- {"FileFormat", "Mp4iPodCompatible", "mp4", FALSE, TRUE},
- {"PictureDecombDeinterlace", "PictureDeinterlace", "TRUE", TRUE, TRUE},
- {"PictureDecombDeinterlace", "PictureDeinterlaceCustom", "TRUE", TRUE, TRUE},
- {"PictureDecombDeinterlace", "PictureDeinterlaceLabel", "TRUE", TRUE, TRUE},
- {"PictureDecombDeinterlace", "PictureDecomb", "FALSE", TRUE, TRUE},
- {"PictureDecombDeinterlace", "PictureDecombCustom", "FALSE", TRUE, TRUE},
- {"PictureDecombDeinterlace", "PictureDecombLabel", "FALSE", TRUE, TRUE},
- {"PictureDeinterlace", "PictureDeinterlaceCustom", "custom", FALSE, TRUE},
- {"PictureDenoise", "PictureDenoiseCustom", "custom", FALSE, TRUE},
- {"PictureDecomb", "PictureDecombCustom", "custom", FALSE, TRUE},
- {"PictureDetelecine", "PictureDetelecineCustom", "custom", FALSE, TRUE},
- {"PictureAutoCrop", "PictureTopCrop", "FALSE", FALSE, FALSE},
- {"PictureAutoCrop", "PictureBottomCrop", "FALSE", FALSE, FALSE},
- {"PictureAutoCrop", "PictureLeftCrop", "FALSE", FALSE, FALSE},
- {"PictureAutoCrop", "PictureRightCrop", "FALSE", FALSE, FALSE},
- {"VideoEncoder", "x264_tab", "x264", FALSE, FALSE},
- {"VideoEncoder", "x264_tab_label", "x264", FALSE, FALSE},
- {"VideoEncoder", "Mp4iPodCompatible", "x264", FALSE, FALSE},
- {"AudioEncoderActual", "AudioBitrate", "ac3|dts", TRUE, FALSE},
- {"AudioEncoderActual", "AudioSamplerate", "ac3|dts", TRUE, FALSE},
- {"AudioEncoderActual", "AudioMixdown", "ac3|dts", TRUE, FALSE},
- {"AudioEncoderActual", "AudioTrackDRCSlider", "ac3|dts", TRUE, FALSE},
- {"AudioEncoderActual", "drc_label", "ac3|dts", TRUE, FALSE},
- {"x264_bframes", "x264_bpyramid", "<2", TRUE, FALSE},
- {"x264_bframes", "x264_direct", "0", TRUE, FALSE},
- {"x264_bframes", "x264_b_adapt", "0", TRUE, FALSE},
- {"x264_cabac", "x264_trellis", "TRUE", FALSE, FALSE},
- {"x264_subme", "x264_psy_rd", "<6", TRUE, FALSE},
- {"x264_subme", "x264_psy_trell", "<6", TRUE, FALSE},
- {"x264_cabac", "x264_psy_trell", "TRUE", FALSE, FALSE},
- {"x264_trellis", "x264_psy_trell", "0", TRUE, FALSE},
- {"ChapterMarkers", "chapters_list", "TRUE", FALSE, FALSE},
- {"use_source_name", "chapters_in_destination", "TRUE", FALSE, FALSE},
- {"use_source_name", "title_no_in_destination", "TRUE", FALSE, FALSE},
-};
-
-int
-main(gint argc, gchar *argv[])
-{
- gint ii, jj;
- GValue *top;
- gint count = sizeof(dep_map) / sizeof(dependency_t);
-
- g_type_init();
-
- top = ghb_dict_value_new();
- for (ii = 0; ii < count; ii++)
- {
- const gchar *name;
- GValue *array;
-
- name = dep_map[ii].widget_name;
- if (ghb_dict_lookup(top, name))
- continue;
- array = ghb_array_value_new(8);
- for (jj = 0; jj < count; jj++)
- {
- if (strcmp(name, dep_map[jj].widget_name) == 0)
- {
- ghb_array_append(array,
- ghb_value_dup(ghb_string_value(dep_map[jj].dep_name)));
- }
- }
- ghb_dict_insert(top, g_strdup(name), array);
- }
- ghb_plist_write_file("widget.deps", top);
-
- // reverse map
- top = ghb_dict_value_new();
- for (ii = 0; ii < count; ii++)
- {
- const gchar *name;
- GValue *array;
-
- name = dep_map[ii].dep_name;
- if (ghb_dict_lookup(top, name))
- continue;
- array = ghb_array_value_new(8);
- for (jj = 0; jj < count; jj++)
- {
- if (strcmp(name, dep_map[jj].dep_name) == 0)
- {
- GValue *data;
- data = ghb_array_value_new(3);
- ghb_array_append(data, ghb_value_dup(
- ghb_string_value(dep_map[jj].widget_name)));
- ghb_array_append(data, ghb_value_dup(
- ghb_string_value(dep_map[jj].enable_value)));
- ghb_array_append(data, ghb_value_dup(
- ghb_boolean_value(dep_map[jj].disable_if_equal)));
- ghb_array_append(data, ghb_value_dup(
- ghb_boolean_value(dep_map[jj].hide)));
- ghb_array_append(array, data);
- }
- }
- ghb_dict_insert(top, g_strdup(name), array);
- }
- ghb_plist_write_file("widget_reverse.deps", top);
- return 0;
-}
-

HandBrake-0.9.9.tar.bz2/libhb/deca52.c Deleted

@@ -1,546 +0,0 @@
-/* deca52.c
-
- Copyright (c) 2003-2013 HandBrake Team
- This file is part of the HandBrake source code
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License v2.
- For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
- */
-
-#include "hb.h"
-#include "audio_remap.h"
-#include "audio_resample.h"
-
-#include "a52dec/a52.h"
-#include "libavutil/crc.h"
-
-struct hb_work_private_s
-{
- hb_job_t * job;
-
- /* liba52 handle */
- a52_state_t * state;
-
- int flags;
- int rate;
- int bitrate;
- int error;
- int frames; // number of good frames decoded
- int crc_errors; // number of frames with crc errors
- int bytes_dropped; // total bytes dropped while resyncing
- float level;
- float dynamic_range_compression;
- double next_expected_pts;
- int64_t last_buf_pts;
- hb_list_t *list;
- const AVCRC *crc_table;
- uint8_t frame[3840];
- uint8_t buf[6][6][256 * sizeof(float)]; // decoded frame (up to 6 channels, 6 blocks * 256 samples)
- uint8_t *samples[6]; // pointers to the start of each plane (1 per channel)
-
- int nchannels;
- int use_mix_levels;
- uint64_t channel_layout;
- hb_audio_remap_t *remap;
- hb_audio_resample_t *resample;
-};
-
-static int deca52Init( hb_work_object_t *, hb_job_t * );
-static int deca52Work( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** );
-static void deca52Close( hb_work_object_t * );
-static int deca52BSInfo( hb_work_object_t * , const hb_buffer_t *,
- hb_work_info_t * );
-
-hb_work_object_t hb_deca52 =
-{
- WORK_DECA52,
- "AC3 decoder",
- deca52Init,
- deca52Work,
- deca52Close,
- 0,
- deca52BSInfo
-};
-
-/* Translate acmod and lfeon on AV_CH_LAYOUT */
-static const uint64_t acmod2layout[] =
-{
- AV_CH_LAYOUT_STEREO, // A52_CHANNEL (0)
- AV_CH_LAYOUT_MONO, // A52_MONO (1)
- AV_CH_LAYOUT_STEREO, // A52_STEREO (2)
- AV_CH_LAYOUT_SURROUND, // A52_3F (3)
- AV_CH_LAYOUT_2_1, // A52_2F1R (4)
- AV_CH_LAYOUT_4POINT0, // A52_3F1R (5)
- AV_CH_LAYOUT_2_2, // A52_2F2R (6)
- AV_CH_LAYOUT_5POINT0, // A52_3F2R (7)
- AV_CH_LAYOUT_MONO, // A52_CHANNEL1 (8)
- AV_CH_LAYOUT_MONO, // A52_CHANNEL2 (9)
- AV_CH_LAYOUT_STEREO_DOWNMIX, // A52_DOLBY (10)
- AV_CH_LAYOUT_STEREO,
- AV_CH_LAYOUT_STEREO,
- AV_CH_LAYOUT_STEREO,
- AV_CH_LAYOUT_STEREO,
- AV_CH_LAYOUT_STEREO, // A52_CHANNEL_MASK (15)
-};
-
-static const uint64_t lfeon2layout[] =
-{
- 0,
- AV_CH_LOW_FREQUENCY,
-};
-
-/***********************************************************************
- * Local prototypes
- **********************************************************************/
-static hb_buffer_t * Decode( hb_work_object_t * w );
-
-/***********************************************************************
- * dynrng_call
- ***********************************************************************
- * Boosts soft audio -- taken from gbooker's work in A52Decoder, comment and all..
- * Two cases
- * 1) The user requested a compression of 1 or less, return the typical power rule
- * 2) The user requested a compression of more than 1 (decompression):
- * If the stream's requested compression is less than 1.0 (loud sound), return the normal compression
- * If the stream's requested compression is more than 1.0 (soft sound), use power rule (which will make
- * it louder in this case).
- *
- **********************************************************************/
-static sample_t dynrng_call (sample_t c, void *data)
-{
- float *level = (float *)data;
- float levelToUse = (float)*level;
- if(c > 1.0 || levelToUse <= 1.0)
- {
- return powf(c, levelToUse);
- }
- else
- return c;
-}
-
-/***********************************************************************
- * hb_work_deca52_init
- ***********************************************************************
- * Allocate the work object, initialize liba52
- **********************************************************************/
-static int deca52Init(hb_work_object_t *w, hb_job_t *job)
-{
- hb_work_private_t *pv = calloc(1, sizeof(hb_work_private_t));
- hb_audio_t *audio = w->audio;
- w->private_data = pv;
-
- pv->job = job;
- pv->state = a52_init(0);
- pv->list = hb_list_init();
- pv->crc_table = av_crc_get_table(AV_CRC_16_ANSI);
-
- /*
- * Decoding, remapping, downmixing
- */
- if (audio->config.out.codec != HB_ACODEC_AC3_PASS)
- {
- /*
- * Output AV_SAMPLE_FMT_FLT samples
- */
- pv->resample =
- hb_audio_resample_init(AV_SAMPLE_FMT_FLT,
- audio->config.out.mixdown,
- audio->config.out.normalize_mix_level);
- if (pv->resample == NULL)
- {
- hb_error("deca52Init: hb_audio_resample_init() failed");
- return 1;
- }
-
- /*
- * Decode to AV_SAMPLE_FMT_FLTP
- */
- pv->level = 1.0;
- pv->dynamic_range_compression =
- audio->config.out.dynamic_range_compression;
- hb_audio_resample_set_sample_fmt(pv->resample, AV_SAMPLE_FMT_FLTP);
-
- /*
- * liba52 doesn't provide Lt/Rt mix levels, only Lo/Ro.
- *
- * When doing an Lt/Rt downmix, ignore mix levels
- * (this matches what liba52's own downmix code does).
- */
- pv->use_mix_levels =
- !(audio->config.out.mixdown == HB_AMIXDOWN_DOLBY ||
- audio->config.out.mixdown == HB_AMIXDOWN_DOLBYPLII);
-
- /*
- * Remap from liba52 to Libav channel order
- */
- pv->remap = hb_audio_remap_init(AV_SAMPLE_FMT_FLTP, &hb_libav_chan_map,
- &hb_liba52_chan_map);
- if (pv->remap == NULL)
- {
- hb_error("deca52Init: hb_audio_remap_init() failed");
- return 1;
- }
- }
- else
- {
- pv->remap = NULL;
- pv->resample = NULL;
- }
-
- return 0;
-}
-
-/***********************************************************************
- * Close
- ***********************************************************************
- * Free memory
- **********************************************************************/
-static void deca52Close(hb_work_object_t *w)
-{
- hb_work_private_t *pv = w->private_data;
- w->private_data = NULL;
-
- if (pv->crc_errors)
- {
- hb_log("deca52: %d frames decoded, %d crc errors, %d bytes dropped",
- pv->frames, pv->crc_errors, pv->bytes_dropped);
- }
-
- hb_audio_resample_free(pv->resample);
- hb_audio_remap_free(pv->remap);
- hb_list_empty(&pv->list);
- a52_free(pv->state);
- free(pv);
-}
-
-/***********************************************************************
- * Work
- ***********************************************************************
- * Add the given buffer to the data we already have, and decode as much
- * as we can
- **********************************************************************/
-static int deca52Work( hb_work_object_t * w, hb_buffer_t ** buf_in,
- hb_buffer_t ** buf_out )
-{
- hb_work_private_t * pv = w->private_data;
- hb_buffer_t * buf;
-
- if ( (*buf_in)->size <= 0 )
- {
- /* EOF on input stream - send it downstream & say that we're done */
- *buf_out = *buf_in;
- *buf_in = NULL;
- return HB_WORK_DONE;
- }
-
- if ( (*buf_in)->s.start < -1 && pv->next_expected_pts == 0 )
- {
- // discard buffers that start before video time 0
- *buf_out = NULL;
- return HB_WORK_OK;
- }
-
- hb_list_add( pv->list, *buf_in );
- *buf_in = NULL;
-
- /* If we got more than a frame, chain raw buffers */
- *buf_out = buf = Decode( w );
- while( buf )
- {
- buf->next = Decode( w );
- buf = buf->next;
- }
-
- return HB_WORK_OK;
-}
-
-/***********************************************************************
- * Decode
- ***********************************************************************
- *
- **********************************************************************/
-static hb_buffer_t* Decode(hb_work_object_t *w)
-{
- hb_work_private_t *pv = w->private_data;
- hb_audio_t *audio = w->audio;
- hb_buffer_t *out;
- int size = 0;
-
- // check that we're at the start of a valid frame and align to the
- // start of a valid frame if we're not.
- // we have to check the header & crc so we need at least
- // 7 (the header size) + 128 (the minimum frame size) bytes
- while( hb_list_bytes( pv->list ) >= 7+128 )
- {
- /* check if this is a valid header */
- hb_list_seebytes( pv->list, pv->frame, 7 );
- size = a52_syncinfo(pv->frame, &pv->flags, &pv->rate, &pv->bitrate);
- if ( size > 0 )
- {
- // header looks valid - check the crc1
- if( size > hb_list_bytes( pv->list ) )
- {
- // don't have all the frame's data yet
- return NULL;
- }
- int crc1size = (size >> 1) + (size >> 3);
- hb_list_seebytes( pv->list, pv->frame, crc1size );
- if ( av_crc( pv->crc_table, 0, pv->frame + 2, crc1size - 2 ) == 0 )
- {
- // crc1 is ok - say we have valid frame sync
- if( pv->error )
- {
- hb_log( "output track %d: ac3 in sync after skipping %d bytes",
- audio->config.out.track, pv->error );
- pv->bytes_dropped += pv->error;
- pv->error = 0;
- }
- break;
- }
- }
- // no sync - discard one byte then try again
- hb_list_getbytes( pv->list, pv->frame, 1, NULL, NULL );
- ++pv->error;
- }
-
- // we exit the above loop either in error state (we didn't find sync
- // or don't have enough data yet to validate sync) or in sync. If we're
- // not in sync we need more data so just return.
- if( pv->error || size <= 0 || hb_list_bytes( pv->list ) < size )
- {
- /* Need more data */
- return NULL;
- }
-
- // Get the whole frame and check its CRC. If the CRC is wrong
- // discard the frame - we'll resync on the next call.
-
- uint64_t ipts;
- hb_list_getbytes( pv->list, pv->frame, size, &ipts, NULL );
- if ( av_crc( pv->crc_table, 0, pv->frame + 2, size - 2 ) != 0 )
- {
- ++pv->crc_errors;
- return NULL;
- }
- ++pv->frames;
- if ( ipts != pv->last_buf_pts )
- {
- pv->last_buf_pts = ipts;
- }
- else
- {
- // spec says that the PTS is the start time of the first frame
- // that starts in the PES frame so we only use the PTS once then
- // get the following frames' PTS from the frame length.
- ipts = -1;
- }
-
- double frame_dur = (6. * 256. * 90000.) / pv->rate;
- double pts = (ipts != -1) ? (double)ipts : pv->next_expected_pts;
-
- /* AC3 passthrough: don't decode the AC3 frame */
- if (audio->config.out.codec == HB_ACODEC_AC3_PASS)
- {
- out = hb_buffer_init(size);
- memcpy(out->data, pv->frame, size);
- }
- else
- {
- int i, j;
- float *block_samples;
-
- /*
- * Feed liba52
- */
- a52_frame(pv->state, pv->frame, &pv->flags, &pv->level, 0);
-
- /*
- * If the user requested strong DRC (>1), adjust it.
- * If the user requested default DRC (1), leave it alone.
- * If the user requested no DRC (0), call a null function.
- *
- * a52_frame() resets the callback so it must be called for each frame.
- */
- if (pv->dynamic_range_compression > 1.0)
- {
- a52_dynrng(pv->state, dynrng_call, &pv->dynamic_range_compression);
- }
- else if (!pv->dynamic_range_compression)
- {
- a52_dynrng(pv->state, NULL, NULL);
- }
-
- /*
- * Update input channel layout, prepare remapping and downmixing
- */
- uint64_t new_layout = (acmod2layout[(pv->flags & A52_CHANNEL_MASK)] |
- lfeon2layout[(pv->flags & A52_LFE) != 0]);
-
- if (new_layout != pv->channel_layout)
- {
- pv->channel_layout = new_layout;
- pv->nchannels = av_get_channel_layout_nb_channels(new_layout);
- hb_audio_remap_set_channel_layout(pv->remap,
- pv->channel_layout,
- pv->nchannels);
- hb_audio_resample_set_channel_layout(pv->resample,
- pv->channel_layout,
- pv->nchannels);
- }
- if (pv->use_mix_levels)
- {
- hb_audio_resample_set_mix_levels(pv->resample,
- (double)pv->state->slev,
- (double)pv->state->clev);
- }
- if (hb_audio_resample_update(pv->resample))
- {
- hb_log("deca52: hb_audio_resample_update() failed");
- return NULL;
- }
-
- /*
- * decode all blocks before downmixing
- */
- for (i = 0; i < 6; i++)
- {
- a52_block(pv->state);
- block_samples = (float*)a52_samples(pv->state);
-
- /*
- * reset pv->samples (may have been modified by hb_audio_remap)
- *
- * copy samples to our internal buffer
- */
- for (j = 0; j < pv->nchannels; j++)
- {
- pv->samples[j] = (uint8_t*)pv->buf[j];
- memcpy(pv->buf[j][i], block_samples, 256 * sizeof(float));
- block_samples += 256;
- }
- }
-
- hb_audio_remap(pv->remap, pv->samples, 1536);
- out = hb_audio_resample(pv->resample, pv->samples, 1536);
- }
-
- if (out != NULL)
- {
- out->s.start = pts;
- out->s.duration = frame_dur;
- pts += frame_dur;
- out->s.stop = pts;
- pv->next_expected_pts = pts;
- }
- return out;
-}
-
-static int find_sync( const uint8_t *buf, int len )
-{
- int i;
-
- // since AC3 frames don't line up with MPEG ES frames scan the
- // frame for an AC3 sync pattern.
- for ( i = 0; i < len - 16; ++i )
- {
- int rate, bitrate, flags;
- int size = a52_syncinfo( (uint8_t *)buf + i, &flags, &rate, &bitrate );
- if( size > 0 )
- {
- // we have a plausible sync header - see if crc1 checks
- int crc1size = (size >> 1) + (size >> 3); 
- if ( i + crc1size > len )
- {
- // don't have enough data to check crc1
- break;
- }
- if ( av_crc( av_crc_get_table( AV_CRC_16_ANSI ), 0,
- buf + i + 2, crc1size - 2 ) == 0 )
- {
- // crc checks - we've got sync
- return i;
- }
- }
- }
- return -1;
-}
-
-static int deca52BSInfo( hb_work_object_t *w, const hb_buffer_t *b,
- hb_work_info_t *info )
-{
- memset( info, 0, sizeof(*info) );
-
- // We don't know if the way that AC3 frames are fragmented into whatever
- // packetization the container uses will give us enough bytes per fragment
- // to check the CRC (we need at least 5/8 of the the frame). So we
- // copy the fragment we got into an accumulation buffer in the audio object
- // then look for sync over all the frags we've accumulated so far.
- uint8_t *buf = w->audio->priv.config.a52.buf;
- int len = w->audio->priv.config.a52.len, blen = b->size;
- if ( len + blen > sizeof(w->audio->priv.config.a52.buf) )
- {
- // we don't have enough empty space in the accumulation buffer to
- // hold the new frag - make room for it by discarding the oldest data.
- if ( blen >= sizeof(w->audio->priv.config.a52.buf) )
- {
- // the frag is bigger than our accumulation buffer - copy all
- // that will fit (the excess doesn't matter since the buffer
- // is many times the size of a max length ac3 frame).
- blen = sizeof(w->audio->priv.config.a52.buf);
- len = 0;
- }
- else
- {
- // discard enough bytes from the front of the buffer to make
- // room for the new stuff
- int newlen = sizeof(w->audio->priv.config.a52.buf) - blen;
- memmove( buf, buf + len - newlen, newlen );
- len = newlen;
- }
- }
- // add the new frag to the buffer
- memcpy( buf+len, b->data, blen );
- len += blen;
-
- int i;
- if ( ( i = find_sync( buf, len ) ) < 0 )
- {
- // didn't find sync - wait for more data
- w->audio->priv.config.a52.len = len;
- return 0;
- }
-
- // got sync - extract and canoncalize the bitstream parameters
- int rate = 0, bitrate = 0, flags = 0;
- uint8_t raw = buf[i + 5];
- a52_syncinfo( buf + i, &flags, &rate, &bitrate );
-
- if ( rate == 0 || bitrate == 0 )
- {
- // invalid AC-3 parameters - toss what we have so we'll start over
- // with the next buf otherwise we'll keep syncing on this junk.
- w->audio->priv.config.a52.len = 0;
- return 0;
- }
-
- // bsid | bsmod | acmod | cmixlv | surmixlv | dsurmod | lfeon | dialnorm | compre
- // 5 3 3 2 2 2 1 5 1
- // byte1 | byte2 | byte3 
-
- info->name = "AC-3";
- info->rate = rate;
- info->rate_base = 1;
- info->bitrate = bitrate;
- info->flags = flags;
- info->version = raw >> 3; /* bsid is the first 5 bits */
- info->mode = raw & 0x7; /* bsmod is the following 3 bits */
- info->samples_per_frame = 1536;
-
- info->channel_layout = (acmod2layout[(flags & A52_CHANNEL_MASK)] |
- lfeon2layout[(flags & A52_LFE) != 0]);
-
- // we remap to Libav order in Decode()
- info->channel_map = &hb_libav_chan_map;
-
- return 1;
-}

HandBrake-0.9.9.tar.bz2/libhb/decmetadata.c Deleted

@@ -1,201 +0,0 @@
-/* decmetadata.c
-
- Copyright (c) 2003-2013 HandBrake Team
- This file is part of the HandBrake source code
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License v2.
- For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
- */
-
-#include <mp4v2/mp4v2.h>
-
-#include "common.h"
-
-static int decmp4metadata( hb_title_t *title )
-{
- MP4FileHandle input_file;
- int result = 0;
- hb_deep_log( 2, "Got an MP4 input, read the metadata");
-
- input_file = MP4Read( title->path, 0 );
-
- if( input_file != MP4_INVALID_FILE_HANDLE )
- { 
- /*
- * Store iTunes MetaData
- */
- const MP4Tags* tags;
-
- /* alloc,fetch tags */
- tags = MP4TagsAlloc();
- MP4TagsFetch( tags, input_file );
-
- if( tags->name ) {
- hb_deep_log( 2, "Metadata Name in input file is '%s'", tags->name );
- hb_metadata_set_name(title->metadata, tags->name);
- result = 1;
- }
-
- if( tags->artist )
- {
- hb_metadata_set_artist(title->metadata, tags->artist);
- result = 1;
- }
-
- if( tags->composer )
- {
- hb_metadata_set_composer(title->metadata, tags->composer);
- result = 1;
- }
-
- if( tags->comments )
- {
- hb_metadata_set_comment(title->metadata, tags->comments);
- result = 1;
- }
-
- if( tags->releaseDate )
- {
- hb_metadata_set_release_date(title->metadata, tags->releaseDate);
- result = 1;
- }
-
- if( tags->album )
- {
- hb_metadata_set_album(title->metadata, tags->album);
- result = 1;
- }
-
- if( tags->albumArtist )
- {
- hb_metadata_set_album_artist(title->metadata, tags->albumArtist);
- result = 1;
- }
-
- if( tags->genre )
- {
- hb_metadata_set_genre(title->metadata, tags->genre);
- result = 1;
- }
-
- if( tags->description )
- {
- hb_metadata_set_description(title->metadata, tags->description);
- result = 1;
- }
-
- if( tags->longDescription )
- {
- hb_metadata_set_long_description(title->metadata, tags->longDescription);
- result = 1;
- }
-
- int ii;
- for ( ii = 0; ii < tags->artworkCount; ii++ )
- {
- const MP4TagArtwork* art = tags->artwork + ii;
- int type;
- switch ( art->type )
- {
- case MP4_ART_BMP:
- type = HB_ART_BMP;
- break;
- case MP4_ART_GIF:
- type = HB_ART_GIF;
- break;
- case MP4_ART_JPEG:
- type = HB_ART_JPEG;
- break;
- case MP4_ART_PNG:
- type = HB_ART_PNG;
- break;
- default:
- type = HB_ART_UNDEFINED;
- break;
- }
- hb_metadata_add_coverart(
- title->metadata, art->data, art->size, type);
- hb_deep_log( 2, "Got some cover art of type %d, size %d", 
- art->type,
- art->size );
- result = 1;
- }
-
- /* store,free tags */
- MP4TagsStore( tags, input_file );
- MP4TagsFree( tags );
- 
- /*
- * Handle the chapters. 
- */
- MP4Chapter_t *chapter_list = NULL;
- uint32_t chapter_count;
- 
- MP4GetChapters( input_file, &chapter_list, &chapter_count, 
- MP4ChapterTypeQt );
-
- if( chapter_list && ( hb_list_count( title->list_chapter ) == 0 ) ) {
- uint32_t i = 1;
- while( i <= chapter_count )
- {
- hb_chapter_t * chapter;
- chapter = calloc( sizeof( hb_chapter_t ), 1 );
- chapter->index = i;
- chapter->duration = chapter_list[i-1].duration * 90;
-
- int seconds = ( chapter->duration + 45000 ) / 90000;
- chapter->hours = ( seconds / 3600 );
- chapter->minutes = ( seconds % 3600 ) / 60;
- chapter->seconds = ( seconds % 60 );
-
- if( chapter_list[i-1].title )
- {
- hb_chapter_set_title( chapter, chapter_list[i-1].title );
- }
- else
- {
- char chapter_title[80];
- sprintf( chapter_title, "Chapter %d", chapter->index );
- hb_chapter_set_title( chapter, chapter_title );
- }
-
- hb_deep_log( 2, "Added chapter %i, name='%s', dur=%"PRId64", (%02i:%02i:%02i)",
- chapter->index, chapter->title, chapter->duration,
- chapter->hours, chapter->minutes, chapter->seconds);
-
- hb_list_add( title->list_chapter, chapter );
- i++;
- }
- }
-
- MP4Close( input_file );
- }
- return result;
-}
-
-/*
- * decmetadata()
- *
- * Look at the title and extract whatever metadata we can from that title.
- */
-int decmetadata( hb_title_t *title )
-{
- if( !title ) 
- {
- return 0;
- }
- 
- if( !title->metadata )
- {
- return 0;
- }
-
- /*
- * Hacky way of figuring out if this is an MP4, in which case read the data using libmp4v2
- */
- if( title->container_name && strcmp(title->container_name, "mov,mp4,m4a,3gp,3g2,mj2") == 0 ) 
- {
- return decmp4metadata( title );
- }
- return 0;
-}

HandBrake-0.9.9.tar.bz2/libhb/decmpeg2.c Deleted

@@ -1,1012 +0,0 @@
-/* decmpeg2.c
-
- Copyright (c) 2003-2013 HandBrake Team
- This file is part of the HandBrake source code
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License v2.
- For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
- */
-
-#include "hb.h"
-#include "hbffmpeg.h"
-#include "mpeg2dec/mpeg2.h"
-
-/* Cadence tracking */
-#ifndef PIC_FLAG_REPEAT_FIRST_FIELD
-#define PIC_FLAG_REPEAT_FIRST_FIELD 256
-#endif
-#define TOP_FIRST PIC_FLAG_TOP_FIELD_FIRST
-#define PROGRESSIVE PIC_FLAG_PROGRESSIVE_FRAME
-#define COMPOSITE PIC_FLAG_COMPOSITE_DISPLAY
-#define SKIP PIC_FLAG_SKIP
-#define TAGS PIC_FLAG_TAGS
-#define REPEAT_FIRST PIC_FLAG_REPEAT_FIRST_FIELD
-#define COMPOSITE_MASK PIC_MASK_COMPOSITE_DISPLAY
-#define TB 8
-#define BT 16
-#define BT_PROG 32
-#define BTB_PROG 64
-#define TB_PROG 128
-#define TBT_PROG 256
-
-#define NTAGS 8
-
-/**********************************************************************
- * hb_libmpeg2_t
- *********************************************************************/
-typedef struct hb_libmpeg2_s
-{
- mpeg2dec_t * libmpeg2;
- const mpeg2_info_t * info;
- hb_job_t * job;
- hb_title_t * title;
- int width;
- int height;
- int rate;
- double aspect_ratio;
- enum AVPixelFormat pixfmt;
- int got_iframe; /* set when we get our first iframe */
- int look_for_iframe; /* need an iframe to add chap break */
- int look_for_break; /* need gop start to add chap break */
- int cur_tag; /* index of current tag */
- uint32_t nframes; /* number of frames we've decoded */
- int64_t last_pts;
- int64_t first_pts;
- int cadence[12];
- int flag;
- hb_list_t * list_subtitle;
- hb_buffer_t * last_cc1_buf;
- struct {
- int64_t start; // start time of this frame
- hb_buffer_t * cc_buf; // captions for this frame
- } tags[NTAGS];
- uint8_t cc_tag_pending;
-
- struct SwsContext *sws_context; // if we have to rescale or convert color space
- int sws_width;
- int sws_height;
- int sws_pix_fmt;
-} hb_libmpeg2_t;
-
-/**********************************************************************
- * hb_libmpeg2_init
- **********************************************************************
- *
- *********************************************************************/
-static hb_libmpeg2_t * hb_libmpeg2_init()
-{
- hb_libmpeg2_t * m = calloc( sizeof( hb_libmpeg2_t ), 1 );
-
- m->libmpeg2 = mpeg2_init();
- m->info = mpeg2_info( m->libmpeg2 );
- m->last_pts = -1;
- m->first_pts = -1;
-
- int i;
- for ( i = 0; i < NTAGS; ++i )
- {
- m->tags[i].start = -2;
- }
-
- return m;
-}
-
-// send cc_buf to the CC decoder(s)
-static void cc_send_to_decoder( hb_libmpeg2_t *m, hb_buffer_t *cc_buf )
-{
- hb_subtitle_t *subtitle;
-
- // if there's more than one decoder for the captions send a copy
- // of the buffer to all but the last. Then send the buffer to
- // the last one (usually there's just one decoder so the 'while' is skipped).
- int i = 0, n = hb_list_count( m->list_subtitle );
- while ( --n > 0 )
- {
- // make a copy of the buf then forward it to the decoder
- hb_buffer_t *cpy = hb_buffer_init( cc_buf->size );
- cpy->s = cc_buf->s;
- memcpy( cpy->data, cc_buf->data, cc_buf->size );
-
- subtitle = hb_list_item( m->list_subtitle, i++ );
- hb_fifo_push( subtitle->fifo_in, cpy );
- }
- subtitle = hb_list_item( m->list_subtitle, i );
- hb_fifo_push( subtitle->fifo_in, cc_buf );
-}
-
-static void hb_mpeg2_cc( hb_libmpeg2_t *m, const uint8_t *cc_block )
-{
- uint8_t cc_hdr = *cc_block;
- 
- if ( ( cc_hdr & 0x4 ) == 0 )
- // not valid - ignore
- return;
-
- switch (cc_hdr & 3)
- {
- case 0:
- // CC1 stream
- if ( ( cc_block[1] & 0x7f ) == 0 && ( cc_block[2] & 0x7f ) == 0 )
- // just padding - ignore
- return;
-
- if ( m->last_cc1_buf )
- {
- // new data from the same time as last call - add to buffer
- int len = m->last_cc1_buf->size;
- hb_buffer_realloc( m->last_cc1_buf, len + 2 );
- memcpy( m->last_cc1_buf->data + len, cc_block+1, 2 );
- m->last_cc1_buf->size = len + 2;
- return;
- }
-
- // allocate a new buffer and copy the caption data into it.
- // (we don't send it yet because we don't know what timestamp to use).
- hb_buffer_t *cc_buf = hb_buffer_init( 2 );
- if( !cc_buf )
- return;
-
- memcpy( cc_buf->data, cc_block+1, 2 );
- m->last_cc1_buf = cc_buf;
- break;
-#ifdef notyet
- case 1:
- // CC2 stream
- //process608( cc_block+1, 2, &m->cc608 );
- break;
- case 2: //EIA-708
- // DTVCC packet data
- // Fall through
- case 3: //EIA-708
- {
- uint8_t temp[4];
- temp[0]=cc_valid;
- temp[1]=cc_type;
- temp[2]=cc_block[1];
- temp[3]=cc_block[2];
- do_708 ((const unsigned char *) temp, 4);
- }
- break;
-#endif
- default:
- break;
- } 
-} 
-
-static inline int have_captions( const uint8_t *user_data, uint32_t len )
-{
- return len >= 6 && 
- ( ( user_data[0] == 0x43 && user_data[1] == 0x43 ) ||
- ( user_data[0] == 0x47 && user_data[1] == 0x41 &&
- user_data[2] == 0x39 && user_data[3] == 0x34 &&
- user_data[4] == 3 && (user_data[5] & 0x40) ) );
-}
-
-static void do_one_dvd_cc( hb_libmpeg2_t *m, const uint8_t *header, int field1 )
-{
- uint8_t data[3];
-
- data[0] = ( header[0] == 0xff && 0 == field1 )? 0x04 : 0x05;
- data[1] = header[1];
- data[2] = header[2];
- hb_mpeg2_cc( m, data );
-
- data[0] = ( header[3] == 0xff && 1 == field1 )? 0x04 : 0x05;
- data[1] = header[4];
- data[2] = header[5];
- hb_mpeg2_cc( m, data );
-}
-
-// extract all the captions in the current frame and send them downstream
-// to the decoder.
-//
-// (this routine should only be called if there are captions in the current
-// frame. I.e., only if a call to 'have_captions' returns true.)
-static void extract_mpeg2_captions( hb_libmpeg2_t *m )
-{
- const uint8_t *user_data = m->info->user_data;
- int dvd_captions = user_data[0] == 0x43;
- int capcount, field1packet = 0;
- const uint8_t *header = &user_data[4];
- if ( !dvd_captions )
- {
- // ATSC encapsulated captions - header starts one byte later
- // and has an extra unused byte following it.
- capcount = header[1] & 0x1f;
- header += 3;
- }
- else
- {
- // DVD captions
- if ( ( header[0] & 0x80 ) == 0x00 ) 
- field1packet=1; /* expect Field 1 second */
- capcount=(header[0] & 0x1e) / 2;
- header++;
- }
-
- int i;
- for( i=0; i<capcount; i++ )
- {
- if ( !dvd_captions )
- {
- hb_mpeg2_cc( m, header );
- header += 3;
- }
- else
- {
- do_one_dvd_cc( m, header, field1packet );
- header += 6;
- }
- }
- if ( dvd_captions )
- {
- // Deal with extra closed captions some DVDs have.
- while( header[0]==0xfe || header[0]==0xff )
- {
- do_one_dvd_cc( m, header, field1packet );
- header += 6;
- } 
- } 
-}
-
-static void next_tag( hb_libmpeg2_t *m, hb_buffer_t *buf_es )
-{
- if( m->tags[m->cur_tag].cc_buf == m->last_cc1_buf )
- m->last_cc1_buf = NULL;
-
- m->cur_tag = ( m->cur_tag + 1 ) & (NTAGS-1);
- if ( m->tags[m->cur_tag].start >= 0 || m->tags[m->cur_tag].cc_buf )
- {
- if ( m->tags[m->cur_tag].start < 0 ||
- ( m->got_iframe && m->tags[m->cur_tag].start >= m->first_pts ) )
- hb_log("mpeg2 tag botch: pts %"PRId64", tag pts %"PRId64" buf %p",
- buf_es->s.start, m->tags[m->cur_tag].start, m->tags[m->cur_tag].cc_buf);
- if ( m->tags[m->cur_tag].cc_buf )
- hb_buffer_close( &m->tags[m->cur_tag].cc_buf );
- }
- m->tags[m->cur_tag].start = buf_es->s.start;
- mpeg2_tag_picture( m->libmpeg2, m->cur_tag, 0 );
-}
-
-static hb_buffer_t *hb_copy_frame( hb_libmpeg2_t *m )
-{
- hb_job_t * job = m->job;
- int width = m->info->sequence->width;
- int height = m->info->sequence->height;
- enum AVPixelFormat pixfmt = m->pixfmt;
- uint8_t *y = m->info->display_fbuf->buf[0];
- uint8_t *u = m->info->display_fbuf->buf[1];
- uint8_t *v = m->info->display_fbuf->buf[2];
- int crop[4] = {0};
-
- int dst_w, dst_h;
- int src_w, src_h;
-
- if ( m->info->sequence->picture_width < m->info->sequence->width )
- {
- crop[3] = m->info->sequence->width - m->info->sequence->picture_width;
- }
- if ( m->info->sequence->picture_height < m->info->sequence->height )
- {
- crop[1] = m->info->sequence->height - m->info->sequence->picture_height;
- }
-
- src_w = width - (crop[2] + crop[3]);
- src_h = height - (crop[0] + crop[1]);
- if ( job )
- {
- dst_w = job->title->width;
- dst_h = job->title->height;
- }
- else
- {
- dst_w = src_w;
- dst_h = src_h;
- }
-
- hb_buffer_t *buf = hb_video_buffer_init( dst_w, dst_h );
- buf->s.start = -1;
-
- AVPicture in, out, pic_crop;
-
- in.data[0] = y;
- in.data[1] = u;
- in.data[2] = v;
- in.linesize[0] = width;
- in.linesize[1] = width>>1;
- in.linesize[2] = width>>1;
- hb_avpicture_fill( &out, buf );
-
- av_picture_crop( &pic_crop, &in, pixfmt, crop[0], crop[2] );
-
- if ( !m->sws_context ||
- m->sws_width != src_w ||
- m->sws_height != src_h ||
- m->sws_pix_fmt != pixfmt )
- {
- // Source and Dest dimensions may be the same. There is no speed
- // cost to using sws_scale to simply copy the data.
- m->sws_context = hb_sws_get_context( src_w, src_h, pixfmt,
- dst_w, dst_h, buf->f.fmt,
- SWS_LANCZOS|SWS_ACCURATE_RND);
- m->sws_width = src_w;
- m->sws_height = src_h;
- m->sws_pix_fmt = pixfmt;
-
- if ( m->sws_context == NULL )
- {
- hb_buffer_close( &buf );
- return NULL;
- }
-
- }
-
- sws_scale( m->sws_context, (const uint8_t* const *)pic_crop.data, 
- pic_crop.linesize, 0, src_h, out.data, out.linesize );
-
- return buf;
-}
-
-/**********************************************************************
- * hb_libmpeg2_decode
- **********************************************************************
- *
- *********************************************************************/
-static int hb_libmpeg2_decode( hb_libmpeg2_t * m, hb_buffer_t * buf_es,
- hb_list_t * list_raw )
-{
- mpeg2_state_t state;
- hb_buffer_t * buf;
-
- if ( buf_es->size )
- {
- /* Feed libmpeg2 */
- if( buf_es->s.start >= 0 )
- {
- next_tag( m, buf_es );
- m->cc_tag_pending = 1;
- }
- mpeg2_buffer( m->libmpeg2, buf_es->data, buf_es->data + buf_es->size );
- }
-
- for( ;; )
- {
- state = mpeg2_parse( m->libmpeg2 );
- if( state == STATE_BUFFER )
- {
- /* Require some more data */
- break;
- }
-
- // if the user requested captions, process
- // any captions found in the current frame.
- if ( m->list_subtitle && m->last_pts >= 0 &&
- have_captions( m->info->user_data, m->info->user_data_len ) )
- {
- extract_mpeg2_captions( m );
- // if we don't have a tag for the captions, make one
- if ( m->last_cc1_buf && m->tags[m->cur_tag].cc_buf != m->last_cc1_buf )
- {
- // If we have not set a CC tag for the picture and
- // we have a new CC buffer, make a new tag.
- if (!m->cc_tag_pending && m->tags[m->cur_tag].cc_buf != NULL)
- {
- next_tag( m, buf_es );
- }
- else if (m->tags[m->cur_tag].cc_buf)
- {
- hb_log("mpeg2 tag botch2: pts %"PRId64", tag pts %"PRId64" buf %p",
- buf_es->s.start, m->tags[m->cur_tag].start, m->tags[m->cur_tag].cc_buf);
- hb_buffer_close( &m->tags[m->cur_tag].cc_buf );
- }
- // see if we already made a tag for the timestamp. If so we
- // can just use it, otherwise make a new tag.
- if (m->tags[m->cur_tag].start == -2)
- {
- next_tag( m, buf_es );
- }
- m->tags[m->cur_tag].cc_buf = m->last_cc1_buf;
- }
- }
- if( state == STATE_PICTURE )
- {
- m->cc_tag_pending = 0;
- }
- else if( state == STATE_SEQUENCE )
- {
- if( !( m->width && m->height && m->rate ) )
- {
- m->width = m->info->sequence->picture_width;
- m->height = m->info->sequence->picture_height;
- m->rate = m->info->sequence->frame_period;
- if ( m->aspect_ratio <= 0 && m->height &&
- m->info->sequence->pixel_height )
- {
- /* mpeg2_parse doesn't store the aspect ratio. Instead
- * it keeps the pixel width & height that would cause
- * the storage width & height to come out in the correct
- * aspect ratio. Convert these back to aspect ratio.
- */
- double ar_numer = m->width * m->info->sequence->pixel_width;
- double ar_denom = m->height * m->info->sequence->pixel_height;
- m->aspect_ratio = ar_numer / ar_denom;
- }
- }
- if ( m->info->sequence->width >> 1 == m->info->sequence->chroma_width &&
- m->info->sequence->height >> 1 == m->info->sequence->chroma_height )
- {
- m->pixfmt = AV_PIX_FMT_YUV420P;
- }
- else
- {
- m->pixfmt = AV_PIX_FMT_YUV422P;
- }
- }
- else if( state == STATE_GOP && m->look_for_break)
- {
- // we were looking for a gop to add a chapter break - we found it
- // so now start looking for an iframe.
- m->look_for_iframe = m->look_for_break;
- m->look_for_break = 0;
- }
- else if( ( state == STATE_SLICE || state == STATE_END ) &&
- m->info->display_fbuf )
- {
- m->last_cc1_buf = NULL;
-
- if( !m->got_iframe && ( m->info->display_picture->flags &
- PIC_MASK_CODING_TYPE ) == PIC_FLAG_CODING_TYPE_I )
- {
- // we got an iframe so we can start decoding video now
- m->got_iframe = 1;
- }
-
- if( m->got_iframe )
- {
- buf = hb_copy_frame( m );
- if ( buf == NULL )
- continue;
-
- buf->sequence = buf_es->sequence;
-
- hb_buffer_t *cc_buf = NULL;
- if( m->info->display_picture->flags & PIC_FLAG_TAGS )
- {
- int t = m->info->display_picture->tag;
- buf->s.start = m->tags[t].start;
- cc_buf = m->tags[t].cc_buf;
- m->tags[t].start = -2;
- m->tags[t].cc_buf = NULL;
- }
- if( buf->s.start < 0 && m->last_pts >= 0 )
- {
- /* For some reason nb_fields is sometimes 1 while it
- should be 2 */
- buf->s.start = m->last_pts +
- MAX( 2, m->info->display_picture->nb_fields ) *
- m->info->sequence->frame_period / 600;
- }
- if ( buf->s.start >= 0 )
- {
- m->last_pts = buf->s.start;
- }
-
- // if we were accumulating captions we now know the timestamp
- // so ship them to the decoder.
- if ( cc_buf )
- {
- cc_buf->s.start = m->last_pts;
- cc_send_to_decoder( m, cc_buf );
- }
-
- if( m->look_for_iframe && ( m->info->display_picture->flags &
- PIC_MASK_CODING_TYPE ) == PIC_FLAG_CODING_TYPE_I )
- {
- // we were waiting for an iframe to insert a chapter mark
- // and we have one.
- int new_chap = m->look_for_iframe;
- buf->s.new_chap = new_chap;
-
- m->look_for_iframe = 0;
- const char *chap_name = "";
- if ( m->job && new_chap > 0 &&
- hb_list_item( m->job->list_chapter,
- new_chap - 1 ) )
- {
- hb_chapter_t * c = hb_list_item( 
- m->job->list_chapter,
- new_chap - 1 );
- chap_name = c->title;
- }
- hb_log( "mpeg2: \"%s\" (%d) at frame %u time %"PRId64,
- chap_name, new_chap, 
- m->nframes, buf->s.start );
- }
- else if ( m->nframes == 0 )
- {
- // this is the first frame returned by the decoder
- m->first_pts = buf->s.start;
- if ( m->job && hb_list_item( m->job->list_chapter,
- m->job->chapter_start - 1 ) )
- {
- hb_chapter_t * c = hb_list_item( m->job->list_chapter,
- m->job->chapter_start - 1 );
- hb_log( "mpeg2: \"%s\" (%d) at frame %u time %"PRId64,
- c->title, m->job->chapter_start, m->nframes, buf->s.start );
- }
- }
- ++m->nframes;
-
- m->flag = m->info->display_picture->flags;
-
-/* Uncomment this block to see frame-by-frame picture flags, as the video encodes.
- hb_log("***** MPEG 2 Picture Info for PTS %"PRId64" *****", buf->s.start);
- if( m->flag & TOP_FIRST )
- hb_log("MPEG2 Flag: Top field first");
- if( m->flag & PROGRESSIVE )
- hb_log("MPEG2 Flag: Progressive");
- if( m->flag & COMPOSITE )
- hb_log("MPEG2 Flag: Composite");
- if( m->flag & SKIP )
- hb_log("MPEG2 Flag: Skip!");
- if( m->flag & TAGS )
- hb_log("MPEG2 Flag: TAGS");
- if(fm->lag & REPEAT_FIRST )
- hb_log("MPEG2 Flag: Repeat first field");
- if( m->flag & COMPOSITE_MASK )
- hb_log("MPEG2 Flag: Composite mask");
- hb_log("fields: %d", m->info->display_picture->nb_fields);
-*/
- /* Rotate the cadence tracking. */
- int i = 0;
- for(i=11; i > 0; i--)
- {
- m->cadence[i] = m->cadence[i-1];
- }
-
- if ( !(m->flag & PROGRESSIVE) && !(m->flag & TOP_FIRST) )
- {
- /* Not progressive, not top first...
- That means it's probably bottom
- first, 2 fields displayed.
- */
- //hb_log("MPEG2 Flag: Bottom field first, 2 fields displayed.");
- m->cadence[0] = BT;
- }
- else if ( !(m->flag & PROGRESSIVE) && (m->flag & TOP_FIRST) )
- {
- /* Not progressive, top is first,
- Two fields displayed.
- */
- //hb_log("MPEG2 Flag: Top field first, 2 fields displayed.");
- m->cadence[0] = TB;
- }
- else if ( (m->flag & PROGRESSIVE) && !(m->flag & TOP_FIRST) && !( m->flag & REPEAT_FIRST ) )
- {
- /* Progressive, but noting else.
- That means Bottom first,
- 2 fields displayed.
- */
- //hb_log("MPEG2 Flag: Progressive. Bottom field first, 2 fields displayed.");
- m->cadence[0] = BT_PROG;
- }
- else if ( (m->flag & PROGRESSIVE) && !(m->flag & TOP_FIRST) && ( m->flag & REPEAT_FIRST ) )
- {
- /* Progressive, and repeat. .
- That means Bottom first,
- 3 fields displayed.
- */
- //hb_log("MPEG2 Flag: Progressive repeat. Bottom field first, 3 fields displayed.");
- m->cadence[0] = BTB_PROG;
- }
- else if ( (m->flag & PROGRESSIVE) && (m->flag & TOP_FIRST) && !( m->flag & REPEAT_FIRST ) )
- {
- /* Progressive, top first.
- That means top first,
- 2 fields displayed.
- */
- //hb_log("MPEG2 Flag: Progressive. Top field first, 2 fields displayed.");
- m->cadence[0] = TB_PROG;
- }
- else if ( (m->flag & PROGRESSIVE) && (m->flag & TOP_FIRST) && ( m->flag & REPEAT_FIRST ) )
- {
- /* Progressive, top, repeat.
- That means top first,
- 3 fields displayed.
- */
- //hb_log("MPEG2 Flag: Progressive repeat. Top field first, 3 fields displayed.");
- m->cadence[0] = TBT_PROG;
- }
-
- if ( (m->cadence[2] <= TB) && (m->cadence[1] <= TB) && (m->cadence[0] > TB) && (m->cadence[11]) )
- hb_log("%fs: Video -> Film", (float)buf->s.start / 90000);
- if ( (m->cadence[2] > TB) && (m->cadence[1] <= TB) && (m->cadence[0] <= TB) && (m->cadence[11]) )
- hb_log("%fs: Film -> Video", (float)buf->s.start / 90000);
-
- buf->s.flags = m->info->display_picture->flags;
-
- hb_list_add( list_raw, buf );
- }
- }
- else if( state == STATE_INVALID )
- {
- mpeg2_reset( m->libmpeg2, 0 );
- }
-
- /*
- * Add closed captions to the title if we are scanning (no job).
- *
- * Just because we don't add this doesn't mean that there aren't any when 
- * we scan, just that noone said anything. So you should be able to add
- * closed captions some other way (See decmpeg2Init() for alternative
- * approach of assuming that there are always CC, which is probably
- * safer - however I want to leave the autodetect in here for now to
- * see how it goes).
- */
- if( !m->job && m->title &&
- have_captions( m->info->user_data, m->info->user_data_len ) )
- {
- hb_subtitle_t *subtitle;
- int i = 0;
- 
- while ( ( subtitle = hb_list_item( m->title->list_subtitle, i++ ) ) )
- {
- /*
- * Let's call them 608 subs for now even if they aren't,
- * since they are the only types we grok.
- */
- if( subtitle->source == CC608SUB ) 
- {
- break;
- }
- }
- 
- if( ! subtitle )
- {
- subtitle = calloc( sizeof( hb_subtitle_t ), 1 );
- subtitle->track = 0;
- subtitle->id = 0;
- subtitle->format = TEXTSUB;
- subtitle->source = CC608SUB;
- subtitle->config.dest = PASSTHRUSUB;
- subtitle->codec = WORK_DECCC608;
- subtitle->type = 5; 
- snprintf( subtitle->lang, sizeof( subtitle->lang ), "Closed Captions");
- /*
- * The language of the subtitles will be the same as the first audio
- * track, i.e. the same as the video.
- */
- hb_audio_t *audio = hb_list_item( m->title->list_audio, 0 );
- if( audio )
- {
- snprintf( subtitle->iso639_2, sizeof( subtitle->iso639_2 ), 
- "%s", audio->config.lang.iso639_2);
- } else {
- snprintf( subtitle->iso639_2, sizeof( subtitle->iso639_2 ), "und");
- }
- hb_list_add( m->title->list_subtitle, subtitle );
- }
- }
- }
- return 1;
-}
-
-/**********************************************************************
- * hb_libmpeg2_close
- **********************************************************************
- *
- *********************************************************************/
-static void hb_libmpeg2_close( hb_libmpeg2_t ** _m )
-{
- hb_libmpeg2_t * m = *_m;
-
- mpeg2_close( m->libmpeg2 );
-
- if ( m->sws_context )
- {
- sws_freeContext( m->sws_context );
- }
-
- int i;
- for ( i = 0; i < NTAGS; ++i )
- {
- if ( m->tags[i].cc_buf )
- {
- if ( m->tags[i].cc_buf == m->last_cc1_buf )
- m->last_cc1_buf = NULL;
- hb_buffer_close( &m->tags[i].cc_buf );
- }
- }
- if ( m->last_cc1_buf )
- {
- hb_buffer_close( &m->last_cc1_buf );
- }
-
- free( m );
- *_m = NULL;
-}
-
-/**********************************************************************
- * The decmpeg2 work object
- **********************************************************************
- *
- *********************************************************************/
-struct hb_work_private_s
-{
- hb_libmpeg2_t * libmpeg2;
- hb_list_t * list;
-};
-
-/**********************************************************************
- * hb_work_decmpeg2_init
- **********************************************************************
- *
- *********************************************************************/
-static int decmpeg2Init( hb_work_object_t * w, hb_job_t * job )
-{
- hb_work_private_t * pv;
-
- pv = calloc( 1, sizeof( hb_work_private_t ) );
- w->private_data = pv;
-
- pv->libmpeg2 = hb_libmpeg2_init();
- pv->list = hb_list_init();
-
- pv->libmpeg2->job = job;
-
- if( job && job->title ) {
- pv->libmpeg2->title = job->title;
- }
-
- /*
- * If not scanning, then are we supposed to extract Closed Captions
- * and send them to the decoder? 
- */
- if( job && hb_list_count( job->list_subtitle ) > 0 )
- {
- hb_subtitle_t *subtitle;
- int i = 0;
- 
- for( i = 0; i < hb_list_count( job->list_subtitle ); i++ )
- while ( ( subtitle = hb_list_item( job->list_subtitle, i++ ) ) != NULL )
- {
- if( subtitle->source == CC608SUB ) 
- {
- if ( ! pv->libmpeg2->list_subtitle )
- {
- pv->libmpeg2->list_subtitle = hb_list_init();
- }
- hb_list_add(pv->libmpeg2->list_subtitle, subtitle);
- }
- }
- }
-
- return 0;
-}
-
-/**********************************************************************
- * Work
- **********************************************************************
- *
- *********************************************************************/
-static int decmpeg2Work( hb_work_object_t * w, hb_buffer_t ** buf_in,
- hb_buffer_t ** buf_out )
-{
- hb_work_private_t * pv = w->private_data;
- hb_buffer_t * buf, * last = NULL;
- hb_buffer_t * in = *buf_in;
- int status = HB_WORK_OK;
-
- if( w->title && pv && pv->libmpeg2 && !pv->libmpeg2->title ) {
- pv->libmpeg2->title = w->title;
- }
-
- // The reader found a chapter break. Remove it from the input 
- // stream. If we're reading (as opposed to scanning) start looking
- // for the next GOP start since that's where the chapter begins.
- if( in->s.new_chap )
- {
- if ( pv->libmpeg2->job )
- {
- pv->libmpeg2->look_for_break = in->s.new_chap;
- }
- in->s.new_chap = 0;
- }
-
- hb_libmpeg2_decode( pv->libmpeg2, in, pv->list );
-
- /* if we got an empty buffer signaling end-of-stream send it downstream */
- if ( in->size == 0 )
- {
- hb_list_add( pv->list, in );
- *buf_in = NULL;
- status = HB_WORK_DONE;
-
- /*
- * Purge any pending caption buffer then let the Closed Captions decoder
- * know that it is the end of the data.
- */
- if ( pv->libmpeg2->list_subtitle )
- {
- if ( pv->libmpeg2->last_cc1_buf )
- {
- cc_send_to_decoder( pv->libmpeg2, pv->libmpeg2->last_cc1_buf );
- if ( pv->libmpeg2->tags[pv->libmpeg2->cur_tag].cc_buf == 
- pv->libmpeg2->last_cc1_buf )
- {
- pv->libmpeg2->tags[pv->libmpeg2->cur_tag].cc_buf = NULL;
- }
- pv->libmpeg2->last_cc1_buf = NULL;
- }
- cc_send_to_decoder( pv->libmpeg2, hb_buffer_init( 0 ) );
- }
- }
-
- *buf_out = NULL;
- while( ( buf = hb_list_item( pv->list, 0 ) ) )
- {
- hb_list_rem( pv->list, buf );
- if( last )
- {
- last->next = buf;
- last = buf;
- }
- else
- {
- *buf_out = buf;
- last = buf;
- }
- }
-
- return status;
-}
-
-/**********************************************************************
- * Close
- **********************************************************************
- *
- *********************************************************************/
-static void decmpeg2Close( hb_work_object_t * w )
-{
- hb_work_private_t * pv = w->private_data;
-
- // don't log during scan
- if ( pv->libmpeg2->job )
- {
- hb_log( "mpeg2 done: %d frames", pv->libmpeg2->nframes );
- }
- hb_list_empty( &pv->list );
- if ( pv->libmpeg2->list_subtitle )
- {
- hb_list_close( &pv->libmpeg2->list_subtitle );
- }
- hb_libmpeg2_close( &pv->libmpeg2 );
- free( pv );
-}
-
-static int decmpeg2Info( hb_work_object_t *w, hb_work_info_t *info )
-{
- hb_work_private_t *pv = w->private_data;
-
- memset( info, 0, sizeof(*info) );
-
- if ( pv && pv->libmpeg2 && pv->libmpeg2->info && pv->libmpeg2->info->sequence )
- {
- hb_libmpeg2_t *m = pv->libmpeg2;
-
- info->width = m->width;
- info->height = m->height;
- info->pixel_aspect_width = m->info->sequence->pixel_width;
- info->pixel_aspect_height = m->info->sequence->pixel_height;
-
- // if the frame is progressive & NTSC DVD height report it as 23.976 FPS
- // so that scan can autodetect NTSC film
- info->rate = 27000000;
- info->rate_base = ( m->info->display_fbuf && m->info->display_picture &&
- (m->info->display_picture->flags & PROGRESSIVE) &&
- (m->height == 480 ) ) ? 1126125 : m->rate;
-
- info->bitrate = m->info->sequence->byte_rate * 8;
- info->profile = m->info->sequence->profile_level_id >> 4;
- info->level = m->info->sequence->profile_level_id & 0xf;
- info->name = "mpeg2";
-
- if( pv->libmpeg2->info->sequence->flags & SEQ_FLAG_COLOUR_DESCRIPTION )
- {
- switch( pv->libmpeg2->info->sequence->colour_primaries )
- {
- case 1: // ITU-R Recommendation 709
- info->color_prim = HB_COLR_PRI_BT709;
- break;
- case 5: // ITU-R Recommendation 624-4 System B, G
- info->color_prim = HB_COLR_PRI_EBUTECH;
- break;
- case 4: // ITU-R Recommendation 624-4 System M
- case 6: // SMPTE 170M
- case 7: // SMPTE 240M
- info->color_prim = HB_COLR_PRI_SMPTEC;
- break;
- default:
- info->color_prim = HB_COLR_PRI_UNDEF;
- break;
- }
- switch( pv->libmpeg2->info->sequence->transfer_characteristics )
- {
- case 1: // ITU-R Recommendation 709
- case 4: // ITU-R Recommendation 624-4 System M
- case 5: // ITU-R Recommendation 624-4 System B, G
- case 6: // SMPTE 170M
- info->color_transfer = HB_COLR_TRA_BT709;
- break;
- case 7: // SMPTE 240M
- info->color_transfer = HB_COLR_TRA_SMPTE240M;
- break;
- default:
- info->color_transfer = HB_COLR_TRA_UNDEF;
- break;
- }
- switch( pv->libmpeg2->info->sequence->matrix_coefficients )
- {
- case 1: // ITU-R Recommendation 709
- info->color_matrix = HB_COLR_MAT_BT709;
- break;
- case 4: // FCC
- case 5: // ITU-R Recommendation 624-4 System B, G
- case 6: // SMPTE 170M
- info->color_matrix = HB_COLR_MAT_SMPTE170M;
- break;
- case 7: // SMPTE 240M
- info->color_matrix = HB_COLR_MAT_SMPTE240M;
- break;
- default:
- info->color_matrix = HB_COLR_MAT_UNDEF;
- break;
- }
- }
- else if( ( info->width >= 1280 || info->height >= 720 ) ||
- ( info->width > 720 && info->height > 576 ) )
- {
- // ITU BT.709 HD content
- info->color_prim = HB_COLR_PRI_BT709;
- info->color_transfer = HB_COLR_TRA_BT709;
- info->color_matrix = HB_COLR_MAT_BT709;
- }
- else if( info->rate_base == 1080000 )
- {
- // ITU BT.601 DVD or SD TV content (PAL)
- info->color_prim = HB_COLR_PRI_EBUTECH;
- info->color_transfer = HB_COLR_TRA_BT709;
- info->color_matrix = HB_COLR_MAT_SMPTE170M;
- }
- else
- {
- // ITU BT.601 DVD or SD TV content (NTSC)
- info->color_prim = HB_COLR_PRI_SMPTEC;
- info->color_transfer = HB_COLR_TRA_BT709;
- info->color_matrix = HB_COLR_MAT_SMPTE170M;
- }
-
- return 1;
- }
- return 0;
-}
-
-static void decmpeg2Flush( hb_work_object_t *w )
-{
- hb_work_private_t * pv = w->private_data;
-
- mpeg2_reset( pv->libmpeg2->libmpeg2, 0 );
- pv->libmpeg2->got_iframe = 0;
-}
-
-hb_work_object_t hb_decmpeg2 =
-{
- .id = WORK_DECMPEG2,
- .name = "MPEG-2 decoder (libmpeg2)",
- .init = decmpeg2Init,
- .work = decmpeg2Work,
- .close = decmpeg2Close,
- .flush = decmpeg2Flush,
- .info = decmpeg2Info
-};
-

HandBrake-0.9.9.tar.bz2/libhb/encfaac.c Deleted

@@ -1,289 +0,0 @@
-/* encfaac.c
-
- Copyright (c) 2003-2013 HandBrake Team
- This file is part of the HandBrake source code
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License v2.
- For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
- */
-
-#include "hb.h"
-#include "audio_remap.h"
-
-#include "faac.h"
-
-struct hb_work_private_s
-{
- hb_job_t * job;
-
- faacEncHandle * faac;
- unsigned long input_samples;
- unsigned long output_bytes;
- uint8_t * buf;
- uint8_t * obuf;
- hb_list_t * list;
- double pts;
- double framedur;
-	int out_discrete_channels;
-};
-
-int encfaacInit( hb_work_object_t *, hb_job_t * );
-int encfaacWork( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** );
-void encfaacClose( hb_work_object_t * );
-
-hb_work_object_t hb_encfaac =
-{
- WORK_ENCFAAC,
- "AAC encoder (libfaac)",
- encfaacInit,
- encfaacWork,
- encfaacClose
-};
-
-/***********************************************************************
- * hb_work_encfaac_init
- ***********************************************************************
- *
- **********************************************************************/
-int encfaacInit( hb_work_object_t * w, hb_job_t * job )
-{
- hb_work_private_t * pv = calloc( 1, sizeof( hb_work_private_t ) );
- hb_audio_t * audio = w->audio;
- faacEncConfigurationPtr cfg;
- uint8_t * bytes;
- unsigned long length;
-
- w->private_data = pv;
-
- pv->job = job;
-
-	/* pass the number of channels used into the private work data */
- pv->out_discrete_channels = hb_mixdown_get_discrete_channel_count(audio->config.out.mixdown);
-
- pv->faac = faacEncOpen( audio->config.out.samplerate, pv->out_discrete_channels,
- &pv->input_samples, &pv->output_bytes );
- pv->buf = malloc( pv->input_samples * sizeof( float ) );
- pv->obuf = malloc( pv->output_bytes );
- pv->framedur = 90000.0 * pv->input_samples /
- ( audio->config.out.samplerate * pv->out_discrete_channels );
- audio->config.out.samples_per_frame = pv->input_samples / pv->out_discrete_channels;
-
- cfg = faacEncGetCurrentConfiguration( pv->faac );
- cfg->mpegVersion = MPEG4;
- cfg->aacObjectType = LOW;
- cfg->allowMidside = 1;
-
- /* channel configuration & remapping */
- uint64_t layout = hb_ff_mixdown_xlat(audio->config.out.mixdown, NULL);
- hb_audio_remap_build_table(&hb_aac_chan_map, audio->config.in.channel_map,
- layout, cfg->channel_map);
-
- switch (audio->config.out.mixdown)
- {
- case HB_AMIXDOWN_7POINT1:
- cfg->channelConfiguration = 0;
- cfg->numFrontChannels = 3;
- cfg->numSideChannels = 2;
- cfg->numBackChannels = 2;
- cfg->numLFEChannels = 1;
- break;
-
- case HB_AMIXDOWN_6POINT1:
- cfg->channelConfiguration = 0;
- cfg->numFrontChannels = 3;
- cfg->numSideChannels = 0;
- cfg->numBackChannels = 3;
- cfg->numLFEChannels = 1;
- break;
-
- case HB_AMIXDOWN_5_2_LFE:
- cfg->channelConfiguration = 7;
- break;
-
- default:
- cfg->channelConfiguration =
- hb_mixdown_get_discrete_channel_count(audio->config.out.mixdown);
- break;
- }
-
- cfg->useTns = 0;
- cfg->bitRate = audio->config.out.bitrate * 1000 / pv->out_discrete_channels; /* Per channel */
- cfg->bandWidth = 0;
- cfg->outputFormat = 0;
- cfg->inputFormat = FAAC_INPUT_FLOAT;
-
- if( !faacEncSetConfiguration( pv->faac, cfg ) )
- {
- hb_log( "faacEncSetConfiguration failed" );
- *job->die = 1;
- return 0;
- }
-
- if( faacEncGetDecoderSpecificInfo( pv->faac, &bytes, &length ) < 0 )
- {
- hb_log( "faacEncGetDecoderSpecificInfo failed" );
- *job->die = 1;
- return 0;
- }
- memcpy( w->config->extradata.bytes, bytes, length );
- w->config->extradata.length = length;
- free( bytes );
-
- pv->list = hb_list_init();
-
- return 0;
-}
-
-/***********************************************************************
- * Close
- ***********************************************************************
- *
- **********************************************************************/
-void encfaacClose( hb_work_object_t * w )
-{
- hb_work_private_t * pv = w->private_data;
- if ( pv )
- {
- if ( pv->faac )
- {
- faacEncClose( pv->faac );
- pv->faac = NULL;
- }
- if ( pv->buf )
- {
- free( pv->buf );
- pv->buf = NULL;
- }
- if ( pv->obuf )
- {
- free( pv->obuf );
- pv->obuf = NULL;
- }
- if ( pv->list )
- hb_list_empty( &pv->list );
-
- free( pv );
- w->private_data = NULL;
- }
-}
-
-/***********************************************************************
- * Encode
- ***********************************************************************
- *
- **********************************************************************/
-static hb_buffer_t * Encode( hb_work_object_t * w )
-{
- hb_work_private_t * pv = w->private_data;
-
- if( hb_list_bytes( pv->list ) < pv->input_samples * sizeof( float ) )
- {
- /* Need more data */
- return NULL;
- }
-
- uint64_t pts, pos;
- hb_list_getbytes( pv->list, pv->buf, pv->input_samples * sizeof( float ),
- &pts, &pos );
-
- int i;
- float *fltBuf = (float*)pv->buf;
- for ( i = 0; i < pv->input_samples; i++ )
- fltBuf[i] *= 32768.0;
- 
- int size = faacEncEncode( pv->faac, (int32_t *)pv->buf, pv->input_samples,
- pv->obuf, pv->output_bytes );
-
- // AAC needs four frames before it can start encoding so we'll get nothing
- // on the first three calls to the encoder.
- if ( size > 0 )
- {
- hb_buffer_t * buf = hb_buffer_init( size );
- memcpy( buf->data, pv->obuf, size );
- buf->size = size;
- buf->s.start = pv->pts;
- pv->pts += pv->framedur;
- buf->s.stop = pv->pts;
- buf->s.type = AUDIO_BUF;
- buf->s.frametype = HB_FRAME_AUDIO;
- return buf;
- }
- return NULL;
-}
-
-static hb_buffer_t *Flush( hb_work_object_t *w, hb_buffer_t *bufin )
-{
- hb_work_private_t *pv = w->private_data;
-
- // pad whatever data we have out to four input frames.
- int nbytes = hb_list_bytes( pv->list );
- int pad = pv->input_samples * sizeof(float) * 4 - nbytes;
- if ( pad > 0 )
- {
- hb_buffer_t *tmp = hb_buffer_init( pad );
- memset( tmp->data, 0, pad );
- hb_list_add( pv->list, tmp );
- }
-
- // There are up to three frames buffered in the encoder plus one
- // in our list buffer so four calls to Encode should get them all.
- hb_buffer_t *bufout = NULL, *buf = NULL;
- while ( hb_list_bytes( pv->list ) >= pv->input_samples * sizeof(float) )
- {
- hb_buffer_t *b = Encode( w );
- if ( b )
- {
- if ( bufout == NULL )
- {
- bufout = b;
- }
- else
- {
- buf->next = b;
- }
- buf = b;
- }
- }
- // add the eof marker to the end of our buf chain
- if ( buf )
- buf->next = bufin;
- else
- bufout = bufin;
- return bufout;
-}
-
-/***********************************************************************
- * Work
- ***********************************************************************
- *
- **********************************************************************/
-int encfaacWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
- hb_buffer_t ** buf_out )
-{
- hb_work_private_t * pv = w->private_data;
- hb_buffer_t * buf;
-
- if ( (*buf_in)->size <= 0 )
- {
- // EOF on input. Finish encoding what we have buffered then send
- // it & the eof downstream.
-
- *buf_out = Flush( w, *buf_in );
- *buf_in = NULL;
- return HB_WORK_DONE;
- }
-
- hb_list_add( pv->list, *buf_in );
- *buf_in = NULL;
-
- *buf_out = buf = Encode( w );
-
- while( buf )
- {
- buf->next = Encode( w );
- buf = buf->next;
- }
-
- return HB_WORK_OK;
-}
-

HandBrake-0.9.9.tar.bz2/libhb/mcdeint.c Deleted

@@ -1,221 +0,0 @@
-/*
- Copyright (C) 2006 Michael Niedermayer <michaelni@gmx.at>
-
- This program 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.
-
- This program 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.
-
- 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-#include "hb.h"
-#include "hbffmpeg.h"
-#include "mpeg2dec/mpeg2.h"
-#include "mcdeint.h"
-
-#define SUPPRESS_AV_LOG
-
-#define ABS(a) ((a) > 0 ? (a) : (-(a)))
-
-void mcdeint_init( mcdeint_private_t * pv,
- int mode,
- int qp,
- int pix_fmt,
- int width,
- int height )
-{
- pv->mcdeint_mode = mode;
- pv->mcdeint_qp = qp;
- 
- /* Allocate mcdeint specific buffers */
- if( pv->mcdeint_mode >= 0 )
- {
- avcodec_register_all();
-
- AVCodec * enc = avcodec_find_encoder( AV_CODEC_ID_SNOW );
-
- // Snow ME_ITER will crash if width & height are not 16 pixel
- // aligned (or 8 pixel if CODEC_FLAG_4MV is set).
- // Fortunately, our input buffers have padding
- width = (width + 15) & ~0xf;
- height = (height + 15) & ~0xf;
-
- AVCodecContext * avctx_enc;
-
- avctx_enc = pv->mcdeint_avctx_enc = avcodec_alloc_context3( enc );
-
- avctx_enc->width = width;
- avctx_enc->height = height;
- avctx_enc->time_base = (AVRational){1,25}; // meaningless
- avctx_enc->gop_size = 300;
- avctx_enc->max_b_frames = 0;
- avctx_enc->pix_fmt = pix_fmt;
- avctx_enc->flags = CODEC_FLAG_QSCALE | CODEC_FLAG_LOW_DELAY;
- avctx_enc->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
- avctx_enc->global_quality = 1;
- avctx_enc->me_cmp = FF_CMP_SAD; //SSE;
- avctx_enc->me_sub_cmp = FF_CMP_SAD; //SSE;
- avctx_enc->mb_cmp = FF_CMP_SSE;
-
- switch( pv->mcdeint_mode )
- {
- case 3:
- avctx_enc->refs = 3;
- case 2:
- avctx_enc->me_method = ME_ITER;
- case 1:
- avctx_enc->flags |= CODEC_FLAG_4MV;
- avctx_enc->dia_size =2;
- case 0:
- avctx_enc->flags |= CODEC_FLAG_QPEL;
- }
-
- hb_avcodec_open(avctx_enc, enc, NULL, 0);
-
- pv->mcdeint_frame = avcodec_alloc_frame();
- av_new_packet( &pv->mcdeint_pkt, width * height * 10 );
- }
-}
-
-void mcdeint_close( mcdeint_private_t * pv )
-{
- /* Cleanup mcdeint specific buffers */
- if( pv->mcdeint_mode >= 0 )
- {
- if( pv->mcdeint_avctx_enc )
- {
- hb_avcodec_close( pv->mcdeint_avctx_enc );
- av_freep( &pv->mcdeint_avctx_enc );
- }
- av_free_packet( &pv->mcdeint_pkt );
- }
-}
-
-void mcdeint_filter( hb_buffer_t * dst_buf,
- hb_buffer_t * src_buf,
- int parity,
- mcdeint_private_t * pv )
-{
- int x, y, i;
-
-#ifdef SUPPRESS_AV_LOG
- /* TODO: temporarily change log level to suppress obnoxious debug output */
- int loglevel = av_log_get_level();
- av_log_set_level( AV_LOG_QUIET );
-#endif
-
- for( i=0; i<3; i++ )
- {
- pv->mcdeint_frame->data[i] = src_buf->plane[i].data;
- pv->mcdeint_frame->linesize[i] = src_buf->plane[i].stride;
- }
- pv->mcdeint_avctx_enc->me_cmp = FF_CMP_SAD;
- pv->mcdeint_avctx_enc->me_sub_cmp = FF_CMP_SAD;
- pv->mcdeint_frame->quality = pv->mcdeint_qp * FF_QP2LAMBDA;
-
- int got_packet;
-
- avcodec_encode_video2( pv->mcdeint_avctx_enc,
- &pv->mcdeint_pkt, pv->mcdeint_frame, &got_packet );
-
- pv->mcdeint_frame_dec = pv->mcdeint_avctx_enc->coded_frame;
-
- for( i = 0; i < 3; i++ )
- {
- uint8_t * dst = dst_buf->plane[i].data;
- uint8_t * src = src_buf->plane[i].data;
- int w = src_buf->plane[i].stride;
- int h = src_buf->plane[i].height;
- int fils = pv->mcdeint_frame_dec->linesize[i];
- int srcs = src_buf->plane[i].stride;
-
- for (y = parity; y < h; y += 2)
- {
- for( x = 0; x < w; x++ )
- {
- if( (x-1)+(y-1)*w >= 0 && (x+1)+(y+1)*w < w*h )
- {
- uint8_t * filp =
- &pv->mcdeint_frame_dec->data[i][x + y * fils];
- uint8_t * srcp = &src[x + y * srcs];
-
- int diff0 = filp[-fils] - srcp[-srcs];
- int diff1 = filp[+fils] - srcp[+srcs];
- int spatial_score;
- 
- spatial_score =
- ABS(srcp[-srcs-1] - srcp[+srcs-1]) +
- ABS(srcp[-srcs ] - srcp[+srcs ]) +
- ABS(srcp[-srcs+1] - srcp[+srcs+1]) - 1;
-
- int temp = filp[0];
-
-#define MCDEINT_CHECK(j)\
- { int score = ABS(srcp[-srcs-1+j] - srcp[+srcs-1-j])\
- + ABS(srcp[-srcs +j] - srcp[+srcs -j])\
- + ABS(srcp[-srcs+1+j] - srcp[+srcs+1-j]);\
- if( score < spatial_score ) {\
- spatial_score = score;\
- diff0 = filp[-fils+j] - srcp[-srcs+j];\
- diff1 = filp[+fils-j] - srcp[+srcs-j];
-
- if( x >= 2 && x <= w - 3 )
- {
- MCDEINT_CHECK(-1)
- if( x >= 3 && x <= w - 4 )
- {
- MCDEINT_CHECK(-2) }} }}
- }
- }
- if( x >= 2 && x <= w - 3 )
- {
- MCDEINT_CHECK(1)
- if( x >= 3 && x <= w - 4 )
- {
- MCDEINT_CHECK(2) }} }}
- }
- }
-
- if(diff0 + diff1 > 0)
- {
- temp -= (diff0 + diff1 -
- ABS( ABS(diff0) - ABS(diff1) ) / 2) / 2;
- }
- else
- {
- temp -= (diff0 + diff1 +
- ABS( ABS(diff0) - ABS(diff1) ) / 2) / 2;
- }
-
- filp[0] = dst[x + y*w] =
- temp > 255U ? ~(temp>>31) : temp;
- }
- else
- {
- dst[x + y*w] =
- pv->mcdeint_frame_dec->data[i][x + y*fils];
- }
- }
- }
-
- for( y = !parity; y < h; y += 2 )
- {
- memcpy(&pv->mcdeint_frame_dec->data[i][y * fils],
- &src[y * srcs], w);
- memcpy(&dst[y * w], &src[y * srcs], w);
- }
- }
-
-#ifdef SUPPRESS_AV_LOG
- /* TODO: restore previous log level */
- av_log_set_level(loglevel);
-#endif
-}

HandBrake-0.9.9.tar.bz2/libhb/mcdeint.h Deleted

@@ -1,35 +0,0 @@
-/* mcdeint.h
-
- Copyright (c) 2003-2013 HandBrake Team
- This file is part of the HandBrake source code
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License v2.
- For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
- */
- 
-struct mcdeint_private_s
-{
- int mcdeint_mode;
- int mcdeint_qp;
-
- AVPacket mcdeint_pkt;
- AVCodecContext * mcdeint_avctx_enc;
- AVFrame * mcdeint_frame;
- AVFrame * mcdeint_frame_dec;
-};
-
-typedef struct mcdeint_private_s mcdeint_private_t;
-
-void mcdeint_init( mcdeint_private_t * pv,
- int mode,
- int qp,
- int pix_fmt,
- int width,
- int height );
-
-void mcdeint_close( mcdeint_private_t * pv );
-
-void mcdeint_filter( hb_buffer_t * dst,
- hb_buffer_t * src,
- int parity,
- mcdeint_private_t * pv );

HandBrake-0.9.9.tar.bz2/libhb/muxmkv.c Deleted

@@ -1,692 +0,0 @@
-/* muxmkv.c
-
- Copyright (c) 2003-2013 HandBrake Team
- This file is part of the HandBrake source code
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License v2.
- For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
- */
-
-/* libmkv header */
-#include "libmkv.h"
-
-#include <ogg/ogg.h>
-
-#include "hb.h"
-#include "lang.h"
-
-/* Scale factor to apply to timecodes to convert from HandBrake's
- * 1/90000s to nanoseconds as expected by libmkv */
-#define TIMECODE_SCALE 1000000000 / 90000
-
-struct hb_mux_object_s
-{
- HB_MUX_COMMON;
-
- hb_job_t * job;
-
- mk_Writer * file;
-};
-
-struct hb_mux_data_s
-{
- mk_Track * track;
- uint64_t prev_chapter_tc;
- uint16_t current_chapter;
- int codec;
- int subtitle;
- int sub_format;
-};
-
-static uint8_t * create_flac_header( uint8_t *data, int size )
-{
- uint8_t * out;
- uint8_t header[8] = {
- 0x66, 0x4C, 0x61, 0x43, 0x80, 0x00, 0x00, 0x22
- };
-
- out = malloc( size + 8 );
- memcpy( out, header, 8 );
- memcpy( out + 8, data, size );
- return out;
-}
-
-/**********************************************************************
- * MKVInit
- **********************************************************************
- * Allocates hb_mux_data_t structures, create file and write headers
- *********************************************************************/
-static int MKVInit( hb_mux_object_t * m )
-{
- hb_job_t * job = m->job;
- hb_audio_t * audio;
- hb_mux_data_t * mux_data;
-
- uint8_t *avcC = NULL;
- uint8_t default_track_flag = 1;
- uint8_t need_fonts = 0;
- int avcC_len, i, j;
- ogg_packet *ogg_headers[3];
- mk_TrackConfig *track;
- iso639_lang_t *lang;
-
- track = calloc(1, sizeof(mk_TrackConfig));
-
- m->file = mk_createWriter(job->file, 1000000, 1);
-
- if( !m->file )
- {
- hb_error( "Could not create output file, Disk Full?" );
- job->mux_data = NULL;
- *job->die = 1;
- free(track);
- return 0;
- }
-
- /* Video track */
- mux_data = calloc(1, sizeof( hb_mux_data_t ) );
- job->mux_data = mux_data;
-
- track->trackType = MK_TRACK_VIDEO;
- track->flagDefault = 1;
- track->flagEnabled = 1;
- switch (job->vcodec)
- {
- case HB_VCODEC_X264:
- track->codecID = MK_VCODEC_MP4AVC;
- /* Taken from x264 muxers.c */
- avcC_len = 5 + 1 + 2 + job->config.h264.sps_length + 1 + 2 + job->config.h264.pps_length;
- avcC = malloc(avcC_len);
- if (avcC == NULL) {
- free(track);
- return -1;
- }
-
- avcC[0] = 1;
- avcC[1] = job->config.h264.sps[1]; /* AVCProfileIndication */
- avcC[2] = job->config.h264.sps[2]; /* profile_compat */
- avcC[3] = job->config.h264.sps[3]; /* AVCLevelIndication */
- avcC[4] = 0xff; // nalu size length is four bytes
- avcC[5] = 0xe1; // one sps
-
- avcC[6] = job->config.h264.sps_length >> 8;
- avcC[7] = job->config.h264.sps_length;
-
- memcpy(avcC+8, job->config.h264.sps, job->config.h264.sps_length);
-
- avcC[8+job->config.h264.sps_length] = 1; // one pps
- avcC[9+job->config.h264.sps_length] = job->config.h264.pps_length >> 8;
- avcC[10+job->config.h264.sps_length] = job->config.h264.pps_length;
-
- memcpy( avcC+11+job->config.h264.sps_length, job->config.h264.pps, job->config.h264.pps_length );
- track->codecPrivate = avcC;
- track->codecPrivateSize = avcC_len;
- if (job->areBframes)
- track->minCache = 1;
- break;
- case HB_VCODEC_FFMPEG_MPEG4:
- track->codecID = MK_VCODEC_MP4ASP;
- track->codecPrivate = job->config.mpeg4.bytes;
- track->codecPrivateSize = job->config.mpeg4.length;
- if (job->areBframes)
- track->minCache = 1;
- break;
- case HB_VCODEC_FFMPEG_MPEG2:
- track->codecID = MK_VCODEC_MPEG2;
- track->codecPrivate = job->config.mpeg4.bytes;
- track->codecPrivateSize = job->config.mpeg4.length;
- if (job->areBframes)
- track->minCache = 1;
- break;
- case HB_VCODEC_THEORA:
- {
- int i;
- uint64_t cp_size = 0;
- track->codecID = MK_VCODEC_THEORA;
- uint64_t header_sizes[3];
- for (i = 0; i < 3; ++i)
- {
- ogg_headers[i] = (ogg_packet *)job->config.theora.headers[i];
- ogg_headers[i]->packet = (unsigned char *)&job->config.theora.headers[i] + sizeof( ogg_packet );
- header_sizes[i] = ogg_headers[i]->bytes;
- }
- track->codecPrivate = mk_laceXiph(header_sizes, 2, &cp_size);
- track->codecPrivate = realloc(track->codecPrivate, cp_size + ogg_headers[0]->bytes + ogg_headers[1]->bytes + ogg_headers[2]->bytes);
- for(i = 0; i < 3; ++i)
- {
- memcpy(track->codecPrivate + cp_size, ogg_headers[i]->packet, ogg_headers[i]->bytes);
- cp_size += ogg_headers[i]->bytes;
- }
- track->codecPrivateSize = cp_size;
- }
- break;
- default:
- *job->die = 1;
- hb_error("muxmkv: Unknown video codec: %x", job->vcodec);
- free(track);
- return 0;
- }
-
- track->extra.video.pixelWidth = job->width;
- track->extra.video.pixelHeight = job->height;
- track->extra.video.displayHeight = job->height;
- if( job->anamorphic.mode )
- {
- track->extra.video.displayWidth = job->width * ((double)job->anamorphic.par_width / (double)job->anamorphic.par_height);
- }
- else
- {
- track->extra.video.displayWidth = job->width;
- }
-
- int vrate_base, vrate;
- if( job->pass == 2 )
- {
- hb_interjob_t * interjob = hb_interjob_get( job->h );
- vrate_base = interjob->vrate_base;
- vrate = interjob->vrate;
- }
- else
- {
- vrate_base = job->vrate_base;
- vrate = job->vrate;
- }
- track->defaultDuration = (int64_t)(((float)vrate_base / (float)vrate) * 1000000000);
-
- mux_data->track = mk_createTrack(m->file, track);
-
- /* add the audio tracks */
- for( i = 0; i < hb_list_count( job->list_audio ); i++ )
- {
- audio = hb_list_item( job->list_audio, i );
- mux_data = calloc(1, sizeof( hb_mux_data_t ) );
- audio->priv.mux_data = mux_data;
-
- mux_data->codec = audio->config.out.codec;
-
- memset(track, 0, sizeof(mk_TrackConfig));
- switch (audio->config.out.codec & HB_ACODEC_MASK)
- {
- case HB_ACODEC_DCA:
- case HB_ACODEC_DCA_HD:
- track->codecPrivate = NULL;
- track->codecPrivateSize = 0;
- track->codecID = MK_ACODEC_DTS;
- break;
- case HB_ACODEC_AC3:
- track->codecPrivate = NULL;
- track->codecPrivateSize = 0;
- track->codecID = MK_ACODEC_AC3;
- break;
- case HB_ACODEC_LAME:
- case HB_ACODEC_MP3:
- track->codecPrivate = NULL;
- track->codecPrivateSize = 0;
- track->codecID = MK_ACODEC_MP3;
- break;
- case HB_ACODEC_VORBIS:
- {
- int i;
- uint64_t cp_size = 0;
- track->codecID = MK_ACODEC_VORBIS;
- uint64_t header_sizes[3];
- for (i = 0; i < 3; ++i)
- {
- ogg_headers[i] = (ogg_packet *)audio->priv.config.vorbis.headers[i];
- ogg_headers[i]->packet = (unsigned char *)&audio->priv.config.vorbis.headers[i] + sizeof( ogg_packet );
- header_sizes[i] = ogg_headers[i]->bytes;
- }
- track->codecPrivate = mk_laceXiph(header_sizes, 2, &cp_size);
- track->codecPrivate = realloc(track->codecPrivate, cp_size + ogg_headers[0]->bytes + ogg_headers[1]->bytes + ogg_headers[2]->bytes);
- for(i = 0; i < 3; ++i)
- {
- memcpy(track->codecPrivate + cp_size, ogg_headers[i]->packet, ogg_headers[i]->bytes);
- cp_size += ogg_headers[i]->bytes;
- }
- track->codecPrivateSize = cp_size;
- }
- break;
- case HB_ACODEC_FFFLAC:
- case HB_ACODEC_FFFLAC24:
- if (audio->priv.config.extradata.bytes)
- {
- track->codecPrivate = create_flac_header(audio->priv.config.extradata.bytes,
- audio->priv.config.extradata.length);
- track->codecPrivateSize = audio->priv.config.extradata.length + 8;
- }
- track->codecID = MK_ACODEC_FLAC;
- break;
- case HB_ACODEC_FAAC:
- case HB_ACODEC_FFAAC:
- case HB_ACODEC_CA_AAC:
- case HB_ACODEC_CA_HAAC:
- case HB_ACODEC_FDK_AAC:
- case HB_ACODEC_FDK_HAAC:
- track->codecPrivate = audio->priv.config.extradata.bytes;
- track->codecPrivateSize = audio->priv.config.extradata.length;
- track->codecID = MK_ACODEC_AAC;
- break;
- default:
- *job->die = 1;
- hb_error("muxmkv: Unknown audio codec: %x", audio->config.out.codec);
- return 0;
- }
-
- if( default_track_flag )
- {
- track->flagDefault = 1;
- default_track_flag = 0;
- }
- else
- {
- track->flagDefault = 0;
- }
- track->flagEnabled = 1;
- track->trackType = MK_TRACK_AUDIO;
- // MKV lang codes should be ISO-639-2/B
- lang = lang_for_code2( audio->config.lang.iso639_2 );
- track->language = lang->iso639_2b ? lang->iso639_2b : lang->iso639_2;
- // sample rate
- if ((audio->config.out.codec == HB_ACODEC_CA_HAAC) ||
- (audio->config.out.codec == HB_ACODEC_FDK_HAAC) ||
- (audio->config.out.codec == HB_ACODEC_AAC_PASS &&
- audio->config.in.samples_per_frame > 1024))
- {
- // For HE-AAC, write outputSamplingFreq too
- // samplingFreq is half of outputSamplingFreq
- track->extra.audio.outputSamplingFreq = (float)audio->config.out.samplerate;
- track->extra.audio.samplingFreq = track->extra.audio.outputSamplingFreq / 2.;
- }
- else
- {
- track->extra.audio.samplingFreq = (float)audio->config.out.samplerate;
- }
- if (audio->config.out.codec & HB_ACODEC_PASS_FLAG)
- {
- track->extra.audio.channels = av_get_channel_layout_nb_channels(audio->config.in.channel_layout);
- }
- else
- {
- track->extra.audio.channels = hb_mixdown_get_discrete_channel_count(audio->config.out.mixdown);
- }
- mux_data->track = mk_createTrack(m->file, track);
- if (audio->config.out.codec == HB_ACODEC_VORBIS ||
- audio->config.out.codec == HB_ACODEC_FFFLAC ||
- audio->config.out.codec == HB_ACODEC_FFFLAC24)
- free(track->codecPrivate);
- }
-
- char * subidx_fmt =
- "size: %dx%d\n"
- "org: %d, %d\n"
- "scale: 100%%, 100%%\n"
- "alpha: 100%%\n"
- "smooth: OFF\n"
- "fadein/out: 50, 50\n"
- "align: OFF at LEFT TOP\n"
- "time offset: 0\n"
- "forced subs: %s\n"
- "palette: %06x, %06x, %06x, %06x, %06x, %06x, "
- "%06x, %06x, %06x, %06x, %06x, %06x, %06x, %06x, %06x, %06x\n"
- "custom colors: OFF, tridx: 0000, "
- "colors: 000000, 000000, 000000, 000000\n";
-
- for( i = 0; i < hb_list_count( job->list_subtitle ); i++ )
- {
- hb_subtitle_t * subtitle;
- uint32_t rgb[16];
- char subidx[2048];
- int len;
-
- subtitle = hb_list_item( job->list_subtitle, i );
- if (subtitle->config.dest != PASSTHRUSUB)
- continue;
-
- memset(track, 0, sizeof(mk_TrackConfig));
- switch (subtitle->source)
- {
- case VOBSUB:
- track->codecID = MK_SUBTITLE_VOBSUB;
- for (j = 0; j < 16; j++)
- rgb[j] = hb_yuv2rgb(subtitle->palette[j]);
- len = snprintf(subidx, 2048, subidx_fmt, 
- subtitle->width, subtitle->height,
- 0, 0, "OFF",
- rgb[0], rgb[1], rgb[2], rgb[3],
- rgb[4], rgb[5], rgb[6], rgb[7],
- rgb[8], rgb[9], rgb[10], rgb[11],
- rgb[12], rgb[13], rgb[14], rgb[15]);
- track->codecPrivate = subidx;
- track->codecPrivateSize = len + 1;
- break;
- case PGSSUB:
- track->codecPrivate = NULL;
- track->codecPrivateSize = 0;
- track->codecID = MK_SUBTITLE_PGS;
- break;
- case SSASUB:
- track->codecID = MK_SUBTITLE_SSA;
- need_fonts = 1;
- track->codecPrivate = subtitle->extradata;
- track->codecPrivateSize = subtitle->extradata_size;
- break;
- case CC608SUB:
- case CC708SUB:
- case UTF8SUB:
- case TX3GSUB:
- case SRTSUB:
- track->codecPrivate = NULL;
- track->codecPrivateSize = 0;
- track->codecID = MK_SUBTITLE_UTF8;
- break;
- default:
- continue;
- }
- if ( subtitle->config.default_track )
- {
- track->flagDefault = 1;
- }
-
- mux_data = calloc(1, sizeof( hb_mux_data_t ) );
- subtitle->mux_data = mux_data;
- mux_data->subtitle = 1;
- mux_data->sub_format = subtitle->format;
-
- track->flagEnabled = 1;
- track->trackType = MK_TRACK_SUBTITLE;
- // MKV lang codes should be ISO-639-2/B
- lang = lang_for_code2( subtitle->iso639_2 );
- track->language = lang->iso639_2b ? lang->iso639_2b : lang->iso639_2;
-
- mux_data->track = mk_createTrack(m->file, track);
- }
-
- if (need_fonts)
- {
- hb_list_t * list_attachment = job->list_attachment;
- int i;
- for ( i = 0; i < hb_list_count(list_attachment); i++ )
- {
- hb_attachment_t * attachment = hb_list_item( list_attachment, i );
-
- if ( attachment->type == FONT_TTF_ATTACH )
- {
- mk_createAttachment(
- m->file,
- attachment->name,
- NULL,
- "application/x-truetype-font",
- attachment->data,
- attachment->size);
- }
- }
- }
-
- if( mk_writeHeader( m->file, "HandBrake " HB_PROJECT_VERSION) < 0 )
- {
- hb_error( "Failed to write to output file, disk full?");
- *job->die = 1;
- }
- if (track != NULL)
- free(track);
- if (avcC != NULL)
- free(avcC);
-
- return 0;
-}
-
-static int MKVMux(hb_mux_object_t *m, hb_mux_data_t *mux_data, hb_buffer_t *buf)
-{
- char chapter_name[1024];
- hb_chapter_t *chapter_data;
- uint64_t timecode = 0;
- ogg_packet *op = NULL;
- hb_job_t *job = m->job;
-
- if (mux_data == job->mux_data)
- {
- /* Video */
- timecode = buf->s.start * TIMECODE_SCALE;
-
- if (job->chapter_markers && buf->s.new_chap)
- {
- // reached chapter N, write marker for chapter N-1
- mux_data->current_chapter = buf->s.new_chap - 1;
-
- // chapter numbers start at 1, but the list starts at 0
- chapter_data = hb_list_item(job->list_chapter,
- mux_data->current_chapter - 1);
-
- // make sure we're not writing a chapter that has 0 length
- if (chapter_data != NULL && mux_data->prev_chapter_tc < timecode)
- {
- if (chapter_data->title != NULL)
- {
- snprintf(chapter_name, 1023, "%s", chapter_data->title);
- }
- else
- {
- snprintf(chapter_name, 1023, "Chapter %d",
- mux_data->current_chapter);
- }
- mk_createChapterSimple(m->file,
- mux_data->prev_chapter_tc,
- mux_data->prev_chapter_tc, chapter_name);
- }
- mux_data->prev_chapter_tc = timecode;
- }
-
- if (job->vcodec == HB_VCODEC_THEORA)
- {
- /* ughhh, theora is a pain :( */
- op = (ogg_packet *)buf->data;
- op->packet = buf->data + sizeof( ogg_packet );
- if (mk_startFrame(m->file, mux_data->track) < 0)
- {
- hb_error( "Failed to write frame to output file, Disk Full?" );
- *job->die = 1;
- }
- mk_addFrameData(m->file, mux_data->track, op->packet, op->bytes);
- mk_setFrameFlags(m->file, mux_data->track, timecode, 1, 0);
- hb_buffer_close( &buf );
- return 0;
- }
- }
- else if (mux_data->subtitle)
- {
- if( mk_startFrame(m->file, mux_data->track) < 0)
- {
- hb_error("Failed to write frame to output file, Disk Full?");
- *job->die = 1;
- }
- uint64_t duration;
- timecode = buf->s.start * TIMECODE_SCALE;
- if (buf->s.stop <= buf->s.start)
- {
- duration = 0;
- }
- else
- {
- duration = buf->s.stop * TIMECODE_SCALE - timecode;
- }
- mk_addFrameData(m->file, mux_data->track, buf->data, buf->size);
- mk_setFrameFlags(m->file, mux_data->track, timecode, 1, duration);
- mk_flushFrame(m->file, mux_data->track);
- hb_buffer_close(&buf);
- return 0;
- }
- else
- {
- /* Audio */
- timecode = buf->s.start * TIMECODE_SCALE;
- if (mux_data->codec == HB_ACODEC_VORBIS)
- {
- /* ughhh, vorbis is a pain :( */
- op = (ogg_packet *)buf->data;
- op->packet = buf->data + sizeof( ogg_packet );
- if (mk_startFrame(m->file, mux_data->track))
- {
- hb_error( "Failed to write frame to output file, Disk Full?" );
- *job->die = 1;
- }
- mk_addFrameData(m->file, mux_data->track, op->packet, op->bytes);
- mk_setFrameFlags(m->file, mux_data->track, timecode, 1, 0);
- hb_buffer_close( &buf );
- return 0;
- }
- }
-
- if( mk_startFrame(m->file, mux_data->track) < 0)
- {
- hb_error( "Failed to write frame to output file, Disk Full?" );
- *job->die = 1;
- }
- mk_addFrameData(m->file, mux_data->track, buf->data, buf->size);
- mk_setFrameFlags(m->file, mux_data->track, timecode,
- (((job->vcodec == HB_VCODEC_X264 || 
- (job->vcodec & HB_VCODEC_FFMPEG_MASK)) && 
- mux_data == job->mux_data) ? 
- (buf->s.frametype == HB_FRAME_IDR) : 
- ((buf->s.frametype & HB_FRAME_KEY) != 0)), 0 );
- hb_buffer_close( &buf );
- return 0;
-}
-
-static int MKVEnd(hb_mux_object_t *m)
-{
- char chapter_name[1024];
- hb_chapter_t *chapter_data;
- hb_job_t *job = m->job;
- hb_mux_data_t *mux_data = job->mux_data;
-
- if( !job->mux_data )
- {
- /*
- * We must have failed to create the file in the first place.
- */
- return 0;
- }
-
- if (job->chapter_markers)
- {
- // get the last chapter
- chapter_data = hb_list_item(job->list_chapter,
- mux_data->current_chapter++);
-
- // only write the last chapter marker if it lasts at least 1.5 second
- if (chapter_data != NULL && chapter_data->duration > 135000LL)
- {
- if (chapter_data->title != NULL)
- {
- snprintf(chapter_name, 1023, "%s", chapter_data->title);
- }
- else
- {
- snprintf(chapter_name, 1023, "Chapter %d",
- mux_data->current_chapter);
- }
- mk_createChapterSimple(m->file,
- mux_data->prev_chapter_tc,
- mux_data->prev_chapter_tc, chapter_name);
- }
- }
-
- if( job->metadata )
- {
- hb_metadata_t *md = job->metadata;
-
- hb_deep_log( 2, "Writing Metadata to output file...");
- if ( md->name )
- {
- mk_createTagSimple( m->file, MK_TAG_TITLE, md->name );
- }
- if ( md->artist )
- {
- mk_createTagSimple( m->file, "ARTIST", md->artist );
- }
- if ( md->album_artist )
- {
- mk_createTagSimple( m->file, "DIRECTOR", md->album_artist );
- }
- if ( md->composer )
- {
- mk_createTagSimple( m->file, "COMPOSER", md->composer );
- }
- if ( md->release_date )
- {
- mk_createTagSimple( m->file, "DATE_RELEASED", md->release_date );
- }
- if ( md->comment )
- {
- mk_createTagSimple( m->file, "SUMMARY", md->comment );
- }
- if ( !md->name && md->album )
- {
- mk_createTagSimple( m->file, MK_TAG_TITLE, md->album );
- }
- if ( md->genre )
- {
- mk_createTagSimple( m->file, MK_TAG_GENRE, md->genre );
- }
- if ( md->description )
- {
- mk_createTagSimple( m->file, "DESCRIPTION", md->description );
- }
- if ( md->long_description )
- {
- mk_createTagSimple( m->file, "SYNOPSIS", md->long_description );
- }
- }
-
- // Update and track private data that can change during
- // encode.
- int i;
- for( i = 0; i < hb_list_count( job->list_audio ); i++ )
- {
- mk_Track * track;
- hb_audio_t * audio;
-
- audio = hb_list_item( job->list_audio, i );
- track = audio->priv.mux_data->track;
-
- switch (audio->config.out.codec & HB_ACODEC_MASK)
- {
- case HB_ACODEC_FFFLAC:
- case HB_ACODEC_FFFLAC24:
- if( audio->priv.config.extradata.bytes )
- {
- uint8_t *header;
- header = create_flac_header( 
- audio->priv.config.extradata.bytes,
- audio->priv.config.extradata.length );
- mk_updateTrackPrivateData( m->file, track,
- header,
- audio->priv.config.extradata.length + 8 );
- free( header );
- }
- break;
- default:
- break;
- }
- }
-
- if( mk_close(m->file) < 0 )
- {
- hb_error( "Failed to flush the last frame and close the output file, Disk Full?" );
- *job->die = 1;
- }
-
- // TODO: Free what we alloc'd
-
- return 0;
-}
-
-hb_mux_object_t * hb_mux_mkv_init( hb_job_t * job )
-{
- hb_mux_object_t * m = calloc( sizeof( hb_mux_object_t ), 1 );
- m->init = MKVInit;
- m->mux = MKVMux;
- m->end = MKVEnd;
- m->job = job;
- return m;
-}

HandBrake-0.9.9.tar.bz2/libhb/muxmp4.c Deleted

@@ -1,1415 +0,0 @@
-/* muxmp4.c
-
- Copyright (c) 2003-2013 HandBrake Team
- This file is part of the HandBrake source code
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License v2.
- For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
- */
-
-#include "mp4v2/mp4v2.h"
-#include "a52dec/a52.h"
-
-#include "hb.h"
-
-struct hb_mux_object_s
-{
- HB_MUX_COMMON;
-
- hb_job_t * job;
-
- /* libmp4v2 handle */
- MP4FileHandle file;
-
- int64_t sum_dur; // sum of video frame durations so far
-
- hb_buffer_t *delay_buf;
-
- /* Chapter state information for muxing */
- MP4TrackId chapter_track;
- int current_chapter;
- uint64_t chapter_duration;
-};
-
-struct hb_mux_data_s
-{
- MP4TrackId track;
- uint8_t subtitle;
- int sub_format;
-
- uint64_t sum_dur; // sum of the frame durations so far
-
- // audio frame duration info
- int sample_rate;
- int samples_per_frame;
-};
-
-/* Tune video track chunk duration.
- * libmp4v2 default duration == dusamplerate == 1 second.
- * Per van's suggestion we desire duration == 4 frames.
- * Should be invoked immediately after track creation.
- *
- * return true on fail, false on success.
- */
-static int MP4TuneTrackDurationPerChunk( hb_mux_object_t* m, MP4TrackId trackId )
-{
- uint32_t tscale;
- MP4Duration dur;
-
- tscale = MP4GetTrackTimeScale( m->file, trackId );
- dur = (MP4Duration)ceil( (double)tscale * (double)m->job->vrate_base / (double)m->job->vrate * 4.0 );
-
- if( !MP4SetTrackDurationPerChunk( m->file, trackId, dur ))
- {
- hb_error( "muxmp4.c: MP4SetTrackDurationPerChunk failed!" );
- *m->job->die = 1;
- return 0;
- }
-
- hb_deep_log( 2, "muxmp4: track %u, chunk duration %"PRIu64, MP4FindTrackIndex( m->file, trackId ), dur );
- return 1;
-}
-
-static const uint16_t ac3_sample_rate_tab[3] = { 48000, 44100, 32000 };
-/* possible bitrates */
-static const uint16_t ac3_bitrate_tab[19] = {
- 32, 40, 48, 56, 64, 80, 96, 112, 128,
- 160, 192, 224, 256, 320, 384, 448, 512, 576, 640
-}; 
-
-
-/**********************************************************************
- * MP4Init
- **********************************************************************
- * Allocates hb_mux_data_t structures, create file and write headers
- *********************************************************************/
-static int MP4Init( hb_mux_object_t * m )
-{
- hb_job_t * job = m->job;
- hb_title_t * title = job->title;
-
- hb_audio_t * audio;
- hb_mux_data_t * mux_data;
- int i;
- int subtitle_default;
-
- /* Flags for enabling/disabling tracks in an MP4. */
- typedef enum { TRACK_DISABLED = 0x0, TRACK_ENABLED = 0x1, TRACK_IN_MOVIE = 0x2, TRACK_IN_PREVIEW = 0x4, TRACK_IN_POSTER = 0x8} track_header_flags;
-
- /* Create an empty mp4 file */
- if (job->largeFileSize)
- /* Use 64-bit MP4 file */
- {
- m->file = MP4Create( job->file, MP4_DETAILS_ERROR, MP4_CREATE_64BIT_DATA );
- hb_deep_log( 2, "muxmp4: using 64-bit MP4 formatting.");
- }
- else
- /* Limit MP4s to less than 4 GB */
- {
- m->file = MP4Create( job->file, MP4_DETAILS_ERROR, 0 );
- }
-
- if (m->file == MP4_INVALID_FILE_HANDLE)
- {
- hb_error("muxmp4.c: MP4Create failed!");
- *job->die = 1;
- return 0;
- }
-
- /* Video track */
- mux_data = calloc(1, sizeof( hb_mux_data_t ) );
- job->mux_data = mux_data;
-
- if (!(MP4SetTimeScale( m->file, 90000 )))
- {
- hb_error("muxmp4.c: MP4SetTimeScale failed!");
- *job->die = 1;
- return 0;
- }
-
- if( job->vcodec == HB_VCODEC_X264 )
- {
- /* Stolen from mp4creator */
- MP4SetVideoProfileLevel( m->file, 0x7F );
-		mux_data->track = MP4AddH264VideoTrack( m->file, 90000,
-		 MP4_INVALID_DURATION, job->width, job->height,
-		 job->config.h264.sps[1], /* AVCProfileIndication */
-		 job->config.h264.sps[2], /* profile_compat */
-		 job->config.h264.sps[3], /* AVCLevelIndication */
-		 3 ); /* 4 bytes length before each NAL unit */
- if ( mux_data->track == MP4_INVALID_TRACK_ID )
- {
- hb_error( "muxmp4.c: MP4AddH264VideoTrack failed!" );
- *job->die = 1;
- return 0;
- }
-
- /* Tune track chunk duration */
- if( !MP4TuneTrackDurationPerChunk( m, mux_data->track ))
- {
- return 0;
- }
-
- MP4AddH264SequenceParameterSet( m->file, mux_data->track,
- job->config.h264.sps, job->config.h264.sps_length );
- MP4AddH264PictureParameterSet( m->file, mux_data->track,
- job->config.h264.pps, job->config.h264.pps_length );
-
-		if( job->ipod_atom )
-		{
-			hb_deep_log( 2, "muxmp4: adding iPod atom");
-			MP4AddIPodUUID(m->file, mux_data->track);
-		}
- }
- else if ( job->vcodec == HB_VCODEC_FFMPEG_MPEG4 ) /* FFmpeg MPEG-4 */
- {
- MP4SetVideoProfileLevel( m->file, MPEG4_SP_L3 );
- mux_data->track = MP4AddVideoTrack( m->file, 90000,
- MP4_INVALID_DURATION, job->width, job->height,
- MP4_MPEG4_VIDEO_TYPE );
- if (mux_data->track == MP4_INVALID_TRACK_ID)
- {
- hb_error("muxmp4.c: MP4AddVideoTrack failed!");
- *job->die = 1;
- return 0;
- }
-
- /* Tune track chunk duration */
- if( !MP4TuneTrackDurationPerChunk( m, mux_data->track ))
- {
- return 0;
- }
-
- /* VOL from FFmpeg or XviD */
- if (!(MP4SetTrackESConfiguration( m->file, mux_data->track,
- job->config.mpeg4.bytes, job->config.mpeg4.length )))
- {
- hb_error("muxmp4.c: MP4SetTrackESConfiguration failed!");
- *job->die = 1;
- return 0;
- }
- }
- else if ( job->vcodec == HB_VCODEC_FFMPEG_MPEG2 ) /* FFmpeg MPEG-2 */
- {
- mux_data->track = MP4AddVideoTrack( m->file, 90000,
- MP4_INVALID_DURATION, job->width, job->height,
- MP4_MPEG2_VIDEO_TYPE );
- if (mux_data->track == MP4_INVALID_TRACK_ID)
- {
- hb_error("muxmp4.c: MP4AddVideoTrack failed!");
- *job->die = 1;
- return 0;
- }
-
- /* Tune track chunk duration */
- if( !MP4TuneTrackDurationPerChunk( m, mux_data->track ))
- {
- return 0;
- }
-
- /* VOL from FFmpeg */
- if (!(MP4SetTrackESConfiguration( m->file, mux_data->track,
- job->config.mpeg4.bytes, job->config.mpeg4.length )))
- {
- hb_error("muxmp4.c: MP4SetTrackESConfiguration failed!");
- *job->die = 1;
- return 0;
- }
- }
- else
- {
- hb_error("muxmp4.c: Unsupported video encoder!");
- }
-
- /* COLR atom for color and gamma correction. Per the notes at:
- * http://developer.apple.com/quicktime/icefloe/dispatch019.html#colr
- * http://forum.doom9.org/showthread.php?t=133982#post1090068
- * The user can set it from job->color_matrix_code. */
- if( job->color_matrix_code == 4 )
- {
- // Custom
- MP4AddColr(m->file, mux_data->track, job->color_prim, job->color_transfer, job->color_matrix); 
- }
- else if( job->color_matrix_code == 3 )
- {
- // ITU BT.709 HD content
- MP4AddColr(m->file, mux_data->track, HB_COLR_PRI_BT709, HB_COLR_TRA_BT709, HB_COLR_MAT_BT709);
- }
- else if( job->color_matrix_code == 2 )
- {
- // ITU BT.601 DVD or SD TV content (PAL)
- MP4AddColr(m->file, mux_data->track, HB_COLR_PRI_EBUTECH, HB_COLR_TRA_BT709, HB_COLR_MAT_SMPTE170M);
- }
- else if( job->color_matrix_code == 1 )
- {
- // ITU BT.601 DVD or SD TV content (NTSC)
- MP4AddColr(m->file, mux_data->track, HB_COLR_PRI_SMPTEC, HB_COLR_TRA_BT709, HB_COLR_MAT_SMPTE170M);
- }
- else
- {
- // detected during scan
- MP4AddColr(m->file, mux_data->track, title->color_prim, title->color_transfer, title->color_matrix); 
- }
-
- if( job->anamorphic.mode )
- {
- /* PASP atom for anamorphic video */
- float width, height;
-
- width = job->anamorphic.par_width;
-
- height = job->anamorphic.par_height;
-
- MP4AddPixelAspectRatio(m->file, mux_data->track, (uint32_t)width, (uint32_t)height);
-
- MP4SetTrackFloatProperty(m->file, mux_data->track, "tkhd.width", job->width * (width / height));
- }
-
- /* add the audio tracks */
- for( i = 0; i < hb_list_count( job->list_audio ); i++ )
- {
- audio = hb_list_item( job->list_audio, i );
- mux_data = calloc(1, sizeof( hb_mux_data_t ) );
- audio->priv.mux_data = mux_data;
-
- switch ( audio->config.out.codec & HB_ACODEC_MASK )
- {
- case HB_ACODEC_AC3:
- {
- int ii, jj;
- int bitrate;
- int sr_shift, sr_code;
- uint8_t bsid;
- uint8_t bsmod;
- uint8_t acmod;
- uint8_t lfeon;
- uint8_t br_code = 0;
-
- if ( audio->config.out.codec & HB_ACODEC_PASS_FLAG )
- {
- bsmod = audio->config.in.mode;
- acmod = audio->config.in.flags & 0x7;
- lfeon = !!(audio->config.in.flags & A52_LFE);
- bitrate = audio->config.in.bitrate;
- mux_data->sample_rate = audio->config.in.samplerate;
- mux_data->samples_per_frame = audio->config.in.samples_per_frame;
- }
- else
- {
- bsmod = 0;
- bitrate = audio->config.out.bitrate * 1000;
- mux_data->sample_rate = audio->config.out.samplerate;
- mux_data->samples_per_frame = audio->config.out.samples_per_frame;
- switch (audio->config.out.mixdown)
- {
- case HB_AMIXDOWN_MONO:
- acmod = 1;
- lfeon = 0;
- break;
-
- case HB_AMIXDOWN_STEREO:
- case HB_AMIXDOWN_DOLBY:
- case HB_AMIXDOWN_DOLBYPLII:
- acmod = 2;
- lfeon = 0;
- break;
-
- case HB_AMIXDOWN_5POINT1:
- acmod = 7;
- lfeon = 1;
- break;
-
- default:
- hb_log("MP4Init: bad mixdown");
- acmod = 2;
- lfeon = 0;
- break;
- }
- }
-
- for (ii = 0; ii < 3; ii++)
- {
- for (jj = 0; jj < 3; jj++)
- {
- if ((ac3_sample_rate_tab[jj] >> ii) == mux_data->sample_rate)
- {
- goto rate_found1;
- }
- }
- }
- hb_error("Unknown AC3 samplerate");
- ii = jj = 0;
- rate_found1:
- sr_shift = ii;
- sr_code = jj;
- bsid = 8 + ii;
- for (ii = 0; ii < 19; ii++)
- {
- if ((ac3_bitrate_tab[ii] >> sr_shift)*1000 == bitrate)
- break;
- }
- if ( ii >= 19 )
- {
- hb_error("Unknown AC3 bitrate");
- ii = 0;
- }
- br_code = ii;
-
- mux_data->track = MP4AddAC3AudioTrack(m->file,
- mux_data->sample_rate,
- sr_code, bsid, bsmod,
- acmod, lfeon, br_code);
-
- /* Tune track chunk duration */
- MP4TuneTrackDurationPerChunk( m, mux_data->track );
-
- if (audio->config.out.name == NULL) {
- MP4SetTrackBytesProperty(
- m->file, mux_data->track,
- "udta.name.value",
- (const uint8_t*)"Surround", strlen("Surround"));
- }
- else {
- MP4SetTrackBytesProperty(
- m->file, mux_data->track,
- "udta.name.value",
- (const uint8_t*)(audio->config.out.name),
- strlen(audio->config.out.name));
- }
- } break;
-
- case HB_ACODEC_FAAC:
- case HB_ACODEC_FFAAC:
- case HB_ACODEC_CA_AAC:
- case HB_ACODEC_CA_HAAC:
- case HB_ACODEC_FDK_AAC:
- case HB_ACODEC_FDK_HAAC:
- case HB_ACODEC_LAME:
- case HB_ACODEC_MP3:
- case HB_ACODEC_DCA_HD:
- case HB_ACODEC_DCA:
- {
- uint8_t audio_type = MP4_MPEG4_AUDIO_TYPE;
- int channels, config_len = 0;
- uint8_t *config_bytes = NULL;
-
- switch ( audio->config.out.codec & HB_ACODEC_MASK )
- {
- case HB_ACODEC_FAAC:
- case HB_ACODEC_FFAAC:
- case HB_ACODEC_CA_AAC:
- case HB_ACODEC_CA_HAAC:
- case HB_ACODEC_FDK_AAC:
- case HB_ACODEC_FDK_HAAC:
- {
- audio_type = MP4_MPEG4_AUDIO_TYPE;
- config_bytes = audio->priv.config.extradata.bytes;
- config_len = audio->priv.config.extradata.length;
- } break;
- case HB_ACODEC_LAME:
- case HB_ACODEC_MP3:
- {
- audio_type = MP4_MPEG2_AUDIO_TYPE;
- } break;
- case HB_ACODEC_DCA:
- case HB_ACODEC_DCA_HD:
- {
- audio_type = 0xA9;
- } break;
- }
- if (audio->config.out.codec & HB_ACODEC_PASS_FLAG)
- {
- mux_data->sample_rate = audio->config.in.samplerate;
- mux_data->samples_per_frame = audio->config.in.samples_per_frame;
- channels = av_get_channel_layout_nb_channels(audio->config.in.channel_layout);
- }
- else
- {
- mux_data->sample_rate = audio->config.out.samplerate;
- mux_data->samples_per_frame = audio->config.out.samples_per_frame;
- channels = hb_mixdown_get_discrete_channel_count(audio->config.out.mixdown);
- }
- mux_data->track = MP4AddAudioTrack(m->file,
- mux_data->sample_rate,
- // fixed frame duration, if applicable
- mux_data->samples_per_frame > 0 ?
- mux_data->samples_per_frame : MP4_INVALID_DURATION,
- audio_type);
-
- /* Tune track chunk duration */
- MP4TuneTrackDurationPerChunk( m, mux_data->track );
-
- if (audio->config.out.name == NULL) {
- MP4SetTrackBytesProperty(
- m->file, mux_data->track,
- "udta.name.value",
- (const uint8_t*)"Stereo", strlen("Stereo"));
- }
- else {
- MP4SetTrackBytesProperty(
- m->file, mux_data->track,
- "udta.name.value",
- (const uint8_t*)(audio->config.out.name),
- strlen(audio->config.out.name));
- }
-
- MP4SetAudioProfileLevel( m->file, 0x0F );
- if ( config_bytes )
- {
- MP4SetTrackESConfiguration( m->file, mux_data->track,
- config_bytes, config_len );
- }
- /* Set the correct number of channels for this track */
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "mdia.minf.stbl.stsd.*.channels", channels);
- } break;
-
- default:
- {
- hb_log("MP4Mux: Unsupported audio codec %x", audio->config.out.codec);
- } break;
- }
-
- /* Set the language for this track */
- MP4SetTrackLanguage(m->file, mux_data->track, audio->config.lang.iso639_2);
-
- if( hb_list_count( job->list_audio ) > 1 )
- {
- /* Set the audio track alternate group */
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "tkhd.alternate_group", 1);
- }
-
- if (i == 0) {
- /* Enable the first audio track */
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "tkhd.flags", (TRACK_ENABLED | TRACK_IN_MOVIE));
- }
- else
- /* Disable the other audio tracks so QuickTime doesn't play
- them all at once. */
- {
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "tkhd.flags", (TRACK_DISABLED | TRACK_IN_MOVIE));
- hb_deep_log( 2, "muxmp4: disabled extra audio track %u", MP4FindTrackIndex( m->file, mux_data->track ));
- }
-
- }
-
- // Quicktime requires that at least one subtitle is enabled,
- // else it doesn't show any of the subtitles.
- // So check to see if any of the subtitles are flagged to be
- // the defualt. The default will the the enabled track, else
- // enable the first track.
- subtitle_default = 0;
- for( i = 0; i < hb_list_count( job->list_subtitle ); i++ )
- {
- hb_subtitle_t *subtitle = hb_list_item( job->list_subtitle, i );
-
- if( subtitle && subtitle->format == TEXTSUB && 
- subtitle->config.dest == PASSTHRUSUB )
- {
- if ( subtitle->config.default_track )
- subtitle_default = 1;
- }
- }
- for( i = 0; i < hb_list_count( job->list_subtitle ); i++ )
- {
- hb_subtitle_t *subtitle = hb_list_item( job->list_subtitle, i );
-
- if( subtitle && subtitle->format == TEXTSUB && 
- subtitle->config.dest == PASSTHRUSUB )
- {
- uint64_t width, height = 60;
- if( job->anamorphic.mode )
- width = job->width * ( (float) job->anamorphic.par_width / job->anamorphic.par_height );
- else
- width = job->width;
-
- mux_data = calloc(1, sizeof( hb_mux_data_t ) );
- subtitle->mux_data = mux_data;
- mux_data->subtitle = 1;
- mux_data->sub_format = subtitle->format;
- mux_data->track = MP4AddSubtitleTrack( m->file, 90000, width, height );
-
- MP4SetTrackLanguage(m->file, mux_data->track, subtitle->iso639_2);
-
- /* Tune track chunk duration */
- MP4TuneTrackDurationPerChunk( m, mux_data->track );
-
- const uint8_t textColor[4] = { 255,255,255,255 };
-
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "tkhd.alternate_group", 2);
-
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "mdia.minf.stbl.stsd.tx3g.dataReferenceIndex", 1);
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "mdia.minf.stbl.stsd.tx3g.horizontalJustification", 1);
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "mdia.minf.stbl.stsd.tx3g.verticalJustification", 255);
-
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "mdia.minf.stbl.stsd.tx3g.bgColorAlpha", 255);
-
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "mdia.minf.stbl.stsd.tx3g.defTextBoxBottom", height);
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "mdia.minf.stbl.stsd.tx3g.defTextBoxRight", width);
-
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "mdia.minf.stbl.stsd.tx3g.fontID", 1);
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "mdia.minf.stbl.stsd.tx3g.fontSize", 24);
-
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "mdia.minf.stbl.stsd.tx3g.fontColorRed", textColor[0]);
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "mdia.minf.stbl.stsd.tx3g.fontColorGreen", textColor[1]);
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "mdia.minf.stbl.stsd.tx3g.fontColorBlue", textColor[2]);
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "mdia.minf.stbl.stsd.tx3g.fontColorAlpha", textColor[3]);
- 
- /* translate the track */
- uint8_t* val;
- uint8_t nval[36];
- uint32_t *ptr32 = (uint32_t*) nval;
- uint32_t size;
-
- MP4GetTrackBytesProperty(m->file, mux_data->track, "tkhd.matrix", &val, &size);
- memcpy(nval, val, size);
-
- const uint32_t ytranslation = (job->height - height) * 0x10000;
- 
-#ifdef WORDS_BIGENDIAN
- ptr32[7] = ytranslation;
-#else
- /* we need to switch the endianness, as the file format expects big endian */
- ptr32[7] = ((ytranslation & 0x000000FF) << 24) + ((ytranslation & 0x0000FF00) << 8) + 
- ((ytranslation & 0x00FF0000) >> 8) + ((ytranslation & 0xFF000000) >> 24);
-#endif
-
- MP4SetTrackBytesProperty(m->file, mux_data->track, "tkhd.matrix", nval, size); 
- if ( !subtitle_default || subtitle->config.default_track ) {
- /* Enable the default subtitle track */
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "tkhd.flags", (TRACK_ENABLED | TRACK_IN_MOVIE));
- subtitle_default = 1;
- }
- else
- {
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "tkhd.flags", (TRACK_DISABLED | TRACK_IN_MOVIE));
- }
- }
- else if( subtitle && subtitle->format == PICTURESUB && 
- subtitle->config.dest == PASSTHRUSUB )
- {
- mux_data = calloc(1, sizeof( hb_mux_data_t ) );
- subtitle->mux_data = mux_data;
- mux_data->subtitle = 1;
- mux_data->sub_format = subtitle->format;
-
- mux_data->track = MP4AddSubpicTrack( m->file, 90000, subtitle->width, subtitle->height );
-
- MP4SetTrackLanguage(m->file, mux_data->track, subtitle->iso639_2);
-
- /* Tune track chunk duration */
- MP4TuneTrackDurationPerChunk( m, mux_data->track );
- uint8_t palette[16][4];
- int ii;
- for ( ii = 0; ii < 16; ii++ )
- {
- palette[ii][0] = 0;
- palette[ii][1] = (subtitle->palette[ii] >> 16) & 0xff;
- palette[ii][2] = (subtitle->palette[ii] >> 8) & 0xff;
- palette[ii][3] = (subtitle->palette[ii]) & 0xff;
- }
- if (!(MP4SetTrackESConfiguration( m->file, mux_data->track,
- (uint8_t*)palette, 16 * 4 )))
- {
- hb_error("muxmp4.c: MP4SetTrackESConfiguration failed!");
- *job->die = 1;
- return 0;
- }
- if ( !subtitle_default || subtitle->config.default_track ) {
- /* Enable the default subtitle track */
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "tkhd.flags", (TRACK_ENABLED | TRACK_IN_MOVIE));
- subtitle_default = 1;
- }
- else
- {
- MP4SetTrackIntegerProperty(m->file, mux_data->track, "tkhd.flags", (TRACK_DISABLED | TRACK_IN_MOVIE));
- }
- }
- }
-
- if (job->chapter_markers)
- {
- /* add a text track for the chapters. We add the 'chap' atom to track
- one which is usually the video track & should never be disabled.
- The Quicktime spec says it doesn't matter which media track the
- chap atom is on but it has to be an enabled track. */
- MP4TrackId textTrack;
- textTrack = MP4AddChapterTextTrack(m->file, 1, 0);
-
- m->chapter_track = textTrack;
- m->chapter_duration = 0;
- m->current_chapter = job->chapter_start;
- }
-
- /* Add encoded-by metadata listing version and build date */
- char *tool_string;
- tool_string = (char *)malloc(80);
- snprintf( tool_string, 80, "HandBrake %s %i", HB_PROJECT_VERSION, HB_PROJECT_BUILD);
-
- /* allocate,fetch,populate,store,free tags structure */
- const MP4Tags* tags;
- tags = MP4TagsAlloc();
- MP4TagsFetch( tags, m->file );
- MP4TagsSetEncodingTool( tags, tool_string );
- MP4TagsStore( tags, m->file );
- MP4TagsFree( tags );
-
- free(tool_string);
-
- return 0;
-}
-
-typedef struct stylerecord_s {
- enum style_s {ITALIC, BOLD, UNDERLINE} style;
- uint16_t start;
- uint16_t stop;
- struct stylerecord_s *next;
-} stylerecord;
-
-static void hb_makestylerecord( stylerecord **stack, 
- enum style_s style, int start )
-{
- stylerecord *record = calloc( sizeof( stylerecord ), 1 );
-
- if( record ) 
- {
- record->style = style;
- record->start = start;
- record->next = *stack;
- *stack = record;
- }
-}
-
-static void hb_makestyleatom( stylerecord *record, uint8_t *style)
-{
- uint8_t face = 1;
- hb_deep_log(3, "Made style '%s' from %d to %d", 
- record->style == ITALIC ? "Italic" : record->style == BOLD ? "Bold" : "Underline", record->start, record->stop);
- 
- switch( record->style )
- {
- case ITALIC:
- face = 2;
- break;
- case BOLD:
- face = 1;
- break;
- case UNDERLINE:
- face = 4;
- break;
- default:
- face = 2;
- break;
- }
-
- style[0] = (record->start >> 8) & 0xff; // startChar
- style[1] = record->start & 0xff;
- style[2] = (record->stop >> 8) & 0xff; // endChar
- style[3] = record->stop & 0xff;
- style[4] = (1 >> 8) & 0xff; // font-ID
- style[5] = 1 & 0xff;
- style[6] = face; // face-style-flags: 1 bold; 2 italic; 4 underline
- style[7] = 24; // font-size
- style[8] = 255; // r
- style[9] = 255; // g
- style[10] = 255; // b
- style[11] = 255; // a
- 
-}
-
-/*
- * Copy the input to output removing markup and adding markup to the style
- * atom where appropriate.
- */
-static void hb_muxmp4_process_subtitle_style( uint8_t *input,
- uint8_t *output,
- uint8_t *style, uint16_t *stylesize )
-{
- uint8_t *reader = input;
- uint8_t *writer = output;
- uint8_t stylecount = 0;
- uint16_t utf8_count = 0; // utf8 count from start of subtitle
- stylerecord *stylestack = NULL;
- stylerecord *oldrecord = NULL;
- 
- while(*reader != '\0') {
- if( ( *reader & 0xc0 ) == 0x80 ) 
- {
- /*
- * Track the utf8_count when doing markup so that we get the tx3g stops
- * based on UTF8 chr counts rather than bytes.
- */
- utf8_count++;
- hb_deep_log( 3, "MuxMP4: Counted %d UTF-8 chrs within subtitle so far", 
- utf8_count);
- }
- if (*reader == '<') {
- /*
- * possible markup, peek at the next chr
- */
- switch(*(reader+1)) {
- case 'i':
- if (*(reader+2) == '>') {
- reader += 3;
- hb_makestylerecord(&stylestack, ITALIC, (writer - output - utf8_count));
- } else {
- *writer++ = *reader++;
- }
- break;
- case 'b':
- if (*(reader+2) == '>') {
- reader += 3; 
- hb_makestylerecord(&stylestack, BOLD, (writer - output - utf8_count));
- } else {
- *writer++ = *reader++; 
- }
- break;
- case 'u': 
- if (*(reader+2) == '>') {
- reader += 3;
- hb_makestylerecord(&stylestack, UNDERLINE, (writer - output - utf8_count));
- } else {
- *writer++ = *reader++;
- }
- break;
- case '/':
- switch(*(reader+2)) {
- case 'i':
- if (*(reader+3) == '>') {
- /*
- * Check whether we then immediately start more markup of the same type, if so then
- * lets not close it now and instead continue this markup.
- */
- if ((*(reader+4) && *(reader+4) == '<') &&
- (*(reader+5) && *(reader+5) == 'i') &&
- (*(reader+6) && *(reader+6) == '>')) {
- /*
- * Opening italics right after, so don't close off these italics.
- */
- hb_deep_log(3, "Joining two sets of italics");
- reader += (4 + 3);
- continue;
- }
-
-
- if ((*(reader+4) && *(reader+4) == ' ') && 
- (*(reader+5) && *(reader+5) == '<') &&
- (*(reader+6) && *(reader+6) == 'i') &&
- (*(reader+7) && *(reader+7) == '>')) {
- /*
- * Opening italics right after, so don't close off these italics.
- */
- hb_deep_log(3, "Joining two sets of italics (plus space)");
- reader += (4 + 4);
- *writer++ = ' ';
- continue;
- }
- if (stylestack && stylestack->style == ITALIC) {
- uint8_t style_record[12];
- stylestack->stop = writer - output - utf8_count;
- hb_makestyleatom(stylestack, style_record);
-
- memcpy(style + 10 + (12 * stylecount), style_record, 12);
- stylecount++;
-
- oldrecord = stylestack;
- stylestack = stylestack->next;
- free(oldrecord);
- } else {
- hb_error("Mismatched Subtitle markup '%s'", input);
- }
- reader += 4;
- } else {
- *writer++ = *reader++;
- }
- break;
- case 'b':
- if (*(reader+3) == '>') {
- if (stylestack && stylestack->style == BOLD) {
- uint8_t style_record[12];
- stylestack->stop = writer - output - utf8_count;
- hb_makestyleatom(stylestack, style_record);
-
- memcpy(style + 10 + (12 * stylecount), style_record, 12);
- stylecount++;
- oldrecord = stylestack;
- stylestack = stylestack->next;
- free(oldrecord);
- } else {
- hb_error("Mismatched Subtitle markup '%s'", input);
- }
-
- reader += 4;
- } else {
- *writer++ = *reader++;
- }
- break;
- case 'u': 
- if (*(reader+3) == '>') {
- if (stylestack && stylestack->style == UNDERLINE) {
- uint8_t style_record[12];
- stylestack->stop = writer - output - utf8_count;
- hb_makestyleatom(stylestack, style_record);
-
- memcpy(style + 10 + (12 * stylecount), style_record, 12);
- stylecount++;
-
- oldrecord = stylestack;
- stylestack = stylestack->next;
- free(oldrecord);
- } else {
- hb_error("Mismatched Subtitle markup '%s'", input);
- }
- reader += 4;
- } else {
- *writer++ = *reader++;
- }
- break;
- default:
- *writer++ = *reader++;
- break;
- }
- break;
- default:
- *writer++ = *reader++;
- break;
- }
- } else if (*reader == '\r') {
- // skip '\r' and replace with '\n' if necessary
- if (*(++reader) != '\n') {
- *writer++ = '\n';
- }
- } else {
- *writer++ = *reader++;
- }
- }
- *writer = '\0';
-
- if( stylecount )
- {
- *stylesize = 10 + ( stylecount * 12 );
-
- memcpy( style + 4, "styl", 4);
-
- style[0] = 0;
- style[1] = 0;
- style[2] = (*stylesize >> 8) & 0xff;
- style[3] = *stylesize & 0xff;
- style[8] = (stylecount >> 8) & 0xff;
- style[9] = stylecount & 0xff;
-
- }
-
-}
-
-static int MP4Mux( hb_mux_object_t * m, hb_mux_data_t * mux_data,
- hb_buffer_t * buf )
-{
- hb_job_t * job = m->job;
- int64_t duration;
- int64_t offset = 0;
- hb_buffer_t *tmp;
-
- if( mux_data == job->mux_data )
- {
- /* Video */
- if( job->vcodec == HB_VCODEC_X264 ||
- ( job->vcodec & HB_VCODEC_FFMPEG_MASK ) )
- {
- if ( buf && buf->s.start < buf->s.renderOffset )
- {
- hb_log("MP4Mux: PTS %"PRId64" < DTS %"PRId64,
- buf->s.start, buf->s.renderOffset );
- buf->s.renderOffset = buf->s.start;
- }
- }
-
- // We delay muxing video by one frame so that we can calculate
- // the dts to dts duration of the frames.
- tmp = buf;
- buf = m->delay_buf;
- m->delay_buf = tmp;
-
- if ( !buf )
- return 0;
-
- if( job->vcodec == HB_VCODEC_X264 ||
- ( job->vcodec & HB_VCODEC_FFMPEG_MASK ) )
- {
- // x264 supplies us with DTS, so offset is PTS - DTS
- offset = buf->s.start - buf->s.renderOffset;
- }
-
- /* Add the sample before the new frame.
- It is important that this be calculated prior to the duration
- of the new video sample, as we want to sync to right after it.
- (This is because of how durations for text tracks work in QT) */
- if( job->chapter_markers && buf->s.new_chap )
- { 
- hb_chapter_t *chapter = NULL;
-
- // this chapter is postioned by writing out the previous chapter.
- // the duration of the previous chapter is the duration up to but
- // not including the current frame minus the duration of all
- // chapters up to the previous.
- // The initial and final chapters can be very short (a second or
- // less) since they're not really chapters but just a placeholder to
- // insert a cell command. We don't write chapters shorter than 1.5 sec.
- duration = m->sum_dur - m->chapter_duration + offset;
- if ( duration >= (90000*3)/2 )
- {
- chapter = hb_list_item( m->job->list_chapter,
- buf->s.new_chap - 2 );
-
- MP4AddChapter( m->file,
- m->chapter_track,
- duration,
- (chapter != NULL) ? chapter->title : NULL);
-
- m->current_chapter = buf->s.new_chap;
- m->chapter_duration += duration;
- }
- }
-
- if( job->vcodec == HB_VCODEC_X264 ||
- ( job->vcodec & HB_VCODEC_FFMPEG_MASK ) )
- {
- // x264 supplies us with DTS
- if ( m->delay_buf )
- {
- duration = m->delay_buf->s.renderOffset - buf->s.renderOffset;
- }
- else
- {
- duration = buf->s.stop - m->sum_dur;
- // Due to how libx264 generates DTS, it's possible for the
- // above calculation to be negative. 
- //
- // x264 generates DTS by rearranging PTS in this sequence:
- // pts0 - delay, pts1 - delay, pts2 - delay, pts1, pts2, pts3...
- //
- // where delay == pts2. This guarantees that DTS <= PTS for
- // any frame, but also generates this sequence of durations:
- // d0 + d1 + d0 + d1 + d2 + d3 ... + d(N-2)
- // 
- // so the sum up to the last frame is:
- // sum_dur = d0 + d1 + d0 + d1 + d2 + d3 ... + d(N-3)
- //
- // while the original total duration of the video was:
- // duration = d0 + d1 + d2 + d3 ... + d(N)
- //
- // Note that if d0 + d1 != d(N-1) + d(N), the total
- // length of the video changes since d(N-1) and d(N) are
- // replaced by d0 and d1 in the final duration sum.
- //
- // To keep the total length of the video the same as the source
- // we try to make 
- // d(N-2) = duration - sum_dur
- //
- // But if d0 + d1 >= d(N-1) + d(N), the above calculation
- // results in a nagative value and we need to fix it.
- if ( duration <= 0 )
- duration = 90000. / ((double)job->vrate / (double)job->vrate_base);
- }
- }
- else
- {
- // We're getting the frames in decode order but the timestamps are
- // for presentation so we have to use durations and effectively
- // compute a DTS.
- duration = buf->s.stop - buf->s.start;
- }
-
- if ( duration <= 0 )
- {
- /* We got an illegal mp4/h264 duration. This shouldn't
- be possible and usually indicates a bug in the upstream code.
- Complain in the hope that someone will go find the bug but
- try to fix the error so that the file will still be playable. */
- hb_log("MP4Mux: illegal duration %"PRId64", start %"PRId64","
- "stop %"PRId64", sum_dur %"PRId64,
- duration, buf->s.start, buf->s.stop, m->sum_dur );
- /* we don't know when the next frame starts so we can't pick a
- valid duration for this one. we pick something "short"
- (roughly 1/3 of an NTSC frame time) to take time from
- the next frame. */
- duration = 1000;
- }
- m->sum_dur += duration;
- }
- else
- {
- /* Audio */
- if (mux_data->samples_per_frame > 0)
- // frame size is fixed and known
- duration = MP4_INVALID_DURATION;
- else
- // frame size has to be computed
- duration = buf->s.duration * mux_data->sample_rate / 90000;
- }
-
- /* Here's where the sample actually gets muxed. */
- if( ( job->vcodec == HB_VCODEC_X264 ||
- ( job->vcodec & HB_VCODEC_FFMPEG_MASK ) )
- && mux_data == job->mux_data )
- {
- /* Compute dependency flags.
- *
- * This mechanism is (optionally) used by media players such as QuickTime
- * to offer better scrubbing performance. The most influential bits are
- * MP4_SDT_HAS_NO_DEPENDENTS and MP4_SDT_EARLIER_DISPLAY_TIMES_ALLOWED.
- *
- * Other bits are possible but no example media using such bits have been
- * found.
- *
- * It is acceptable to supply 0-bits for any samples which characteristics
- * cannot be positively guaranteed.
- */
- int sync = 0;
- uint32_t dflags = 0;
-
- /* encoding layer signals if frame is referenced by other frames */
- if( buf->s.flags & HB_FRAME_REF )
- dflags |= MP4_SDT_HAS_DEPENDENTS;
- else
- dflags |= MP4_SDT_HAS_NO_DEPENDENTS; /* disposable */
-
- switch( buf->s.frametype )
- {
- case HB_FRAME_IDR:
- sync = 1;
- break;
- case HB_FRAME_I:
- dflags |= MP4_SDT_EARLIER_DISPLAY_TIMES_ALLOWED;
- break;
- case HB_FRAME_P:
- dflags |= MP4_SDT_EARLIER_DISPLAY_TIMES_ALLOWED;
- break;
- case HB_FRAME_BREF:
- case HB_FRAME_B:
- default:
- break; /* nothing to mark */
- }
-
- if( !MP4WriteSampleDependency( m->file,
- mux_data->track,
- buf->data,
- buf->size,
- duration,
- offset,
- sync,
- dflags ))
- {
- hb_error("Failed to write to output file, disk full?");
- *job->die = 1;
- }
- }
- else if (mux_data->subtitle)
- {
- if( mux_data->sub_format == TEXTSUB )
- {
- /* MPEG4 timed text does not allow overlapping samples; upstream
- code should coalesce overlapping subtitle lines. */
- if( buf->s.start < mux_data->sum_dur )
- {
- if ( buf->s.stop - mux_data->sum_dur > 90*500 )
- {
- hb_log("MP4Mux: shortening overlapping subtitle, "
- "start %"PRId64", stop %"PRId64", sum_dur %"PRId64,
- buf->s.start, buf->s.stop, m->sum_dur);
- buf->s.start = mux_data->sum_dur;
- }
- }
- if( buf->s.start < mux_data->sum_dur )
- {
- hb_log("MP4Mux: skipping overlapping subtitle, "
- "start %"PRId64", stop %"PRId64", sum_dur %"PRId64,
- buf->s.start, buf->s.stop, m->sum_dur);
- }
- else
- {
- int64_t duration;
-
- if( buf->s.start < 0 )
- buf->s.start = mux_data->sum_dur;
-
- if( buf->s.stop < 0 )
- duration = 90000L * 10;
- else
- duration = buf->s.stop - buf->s.start;
-
- /* Write an empty sample */
- if ( mux_data->sum_dur < buf->s.start )
- {
- uint8_t empty[2] = {0,0};
- if( !MP4WriteSample( m->file,
- mux_data->track,
- empty,
- 2,
- buf->s.start - mux_data->sum_dur,
- 0,
- 1 ))
- {
- hb_error("Failed to write to output file, disk full?");
- *job->die = 1;
- }
- mux_data->sum_dur += buf->s.start - mux_data->sum_dur;
- }
- uint8_t styleatom[2048];;
- uint16_t stylesize = 0;
- uint8_t buffer[2048];
- uint16_t buffersize = 0;
- uint8_t output[2048];
-
- *buffer = '\0';
-
- /*
- * Copy the subtitle into buffer stripping markup and creating
- * style atoms for them.
- */
- hb_muxmp4_process_subtitle_style( buf->data,
- buffer,
- styleatom, &stylesize );
-
- buffersize = strlen((char*)buffer);
-
- hb_deep_log(3, "MuxMP4:Sub:%fs:%"PRId64":%"PRId64":%"PRId64": %s",
- (float)buf->s.start / 90000, buf->s.start, buf->s.stop,
- duration, buffer);
-
- /* Write the subtitle sample */
- memcpy( output + 2, buffer, buffersize );
- memcpy( output + 2 + buffersize, styleatom, stylesize);
- output[0] = ( buffersize >> 8 ) & 0xff;
- output[1] = buffersize & 0xff;
-
- if( !MP4WriteSample( m->file,
- mux_data->track,
- output,
- buffersize + stylesize + 2,
- duration,
- 0,
- 1 ))
- {
- hb_error("Failed to write to output file, disk full?");
- *job->die = 1;
- }
-
- mux_data->sum_dur += duration;
- }
- }
- else if( mux_data->sub_format == PICTURESUB )
- {
- int64_t duration;
-
- if( buf->s.start < 0 )
- buf->s.start = mux_data->sum_dur;
-
- if( buf->s.stop < 0 )
- duration = 90000L * 10;
- else
- duration = buf->s.stop - buf->s.start;
-
- /* Write an empty sample */
- if ( mux_data->sum_dur < buf->s.start )
- {
- uint8_t empty[2] = {0,0};
- if( !MP4WriteSample( m->file,
- mux_data->track,
- empty,
- 2,
- buf->s.start - mux_data->sum_dur,
- 0,
- 1 ))
- {
- hb_error("Failed to write to output file, disk full?");
- *job->die = 1;
- } 
- mux_data->sum_dur += buf->s.start - mux_data->sum_dur;
- }
- if( !MP4WriteSample( m->file,
- mux_data->track,
- buf->data,
- buf->size,
- duration,
- 0,
- 1 ))
- {
- hb_error("Failed to write to output file, disk full?");
- *job->die = 1;
- }
-
- mux_data->sum_dur += duration;
- }
- }
- else
- {
- /*
- * Audio
- */
- if( !MP4WriteSample( m->file,
- mux_data->track,
- buf->data,
- buf->size,
- duration,
- offset,
- ( buf->s.frametype & HB_FRAME_KEY ) != 0 ))
- {
- hb_error("Failed to write to output file, disk full?");
- *job->die = 1;
- }
- }
- hb_buffer_close( &buf );
-
- return 0;
-}
-
-static int MP4End( hb_mux_object_t * m )
-{
- hb_job_t * job = m->job;
-
- if (m->file != MP4_INVALID_FILE_HANDLE)
- {
- // Flush the delayed frame
- if ( m->delay_buf )
- MP4Mux( m, job->mux_data, NULL );
-
- /* Write our final chapter marker */
- if( m->job->chapter_markers )
- {
- hb_chapter_t *chapter = NULL;
- int64_t duration = m->sum_dur - m->chapter_duration;
- /* The final chapter can have a very short duration - if it's less
- * than 1.5 seconds just skip it. */
- if ( duration >= (90000*3)/2 )
- {
-
- chapter = hb_list_item( m->job->list_chapter,
- m->current_chapter - 1 );
-
- MP4AddChapter( m->file,
- m->chapter_track,
- duration,
- (chapter != NULL) ? chapter->title : NULL);
- }
- }
-
- if ( job->config.h264.init_delay )
- {
- // Insert track edit to get A/V back in sync. The edit amount is
- // the init_delay.
- int64_t edit_amt = job->config.h264.init_delay;
- MP4AddTrackEdit(m->file, 1, MP4_INVALID_EDIT_ID, edit_amt,
- MP4GetTrackDuration(m->file, 1), 0);
- if ( m->job->chapter_markers )
- {
- // apply same edit to chapter track to keep it in sync with video
- MP4AddTrackEdit(m->file, m->chapter_track, MP4_INVALID_EDIT_ID,
- edit_amt,
- MP4GetTrackDuration(m->file, m->chapter_track), 0);
- }
- }
-
- /*
- * Write the MP4 iTunes metadata if we have any metadata
- */
- if( job->metadata )
- {
- hb_metadata_t *md = job->metadata;
- const MP4Tags* tags;
-
- hb_deep_log( 2, "Writing Metadata to output file...");
-
- /* allocate tags structure */
- tags = MP4TagsAlloc();
- /* fetch data from MP4 file (in case it already has some data) */
- MP4TagsFetch( tags, m->file );
-
- /* populate */
- if( md->name )
- MP4TagsSetName( tags, md->name );
- if( md->artist )
- MP4TagsSetArtist( tags, md->artist );
- if( md->composer )
- MP4TagsSetComposer( tags, md->composer );
- if( md->comment )
- MP4TagsSetComments( tags, md->comment );
- if( md->release_date )
- MP4TagsSetReleaseDate( tags, md->release_date );
- if( md->album )
- MP4TagsSetAlbum( tags, md->album );
- if( md->album_artist )
- MP4TagsSetAlbumArtist( tags, md->album_artist );
- if( md->genre )
- MP4TagsSetGenre( tags, md->genre );
- if( md->description )
- MP4TagsSetDescription( tags, md->description );
- if( md->long_description )
- MP4TagsSetLongDescription( tags, md->long_description );
-
- if( md->list_coverart )
- {
- hb_coverart_t * coverart;
- int ii;
-
- for ( ii = 0; ii < hb_list_count( md->list_coverart ); ii++ )
- {
- coverart = hb_list_item( md->list_coverart, ii );
- MP4TagArtwork art;
- int type;
- switch ( coverart->type )
- {
- case HB_ART_BMP:
- type = MP4_ART_BMP;
- break;
- case HB_ART_GIF:
- type = MP4_ART_GIF;
- break;
- case HB_ART_JPEG:
- type = MP4_ART_JPEG;
- break;
- case HB_ART_PNG:
- type = MP4_ART_PNG;
- break;
- default:
- type = MP4_ART_UNDEFINED;
- break;
- }
- art.data = coverart->data;
- art.size = coverart->size;
- art.type = type;
- MP4TagsAddArtwork( tags, &art );
- }
- }
-
- /* push data to MP4 file */
- MP4TagsStore( tags, m->file );
- /* free memory associated with structure */
- MP4TagsFree( tags );
- }
-
- MP4Close( m->file );
-
- if ( job->mp4_optimize )
- {
- hb_log( "muxmp4: optimizing file" );
- char filename[1024]; memset( filename, 0, 1024 );
- snprintf( filename, 1024, "%s.tmp", job->file );
- MP4Optimize( job->file, filename, MP4_DETAILS_ERROR );
- remove( job->file );
- rename( filename, job->file );
- }
- }
-
- return 0;
-}
-
-hb_mux_object_t * hb_mux_mp4_init( hb_job_t * job )
-{
- hb_mux_object_t * m = calloc( sizeof( hb_mux_object_t ), 1 );
- m->init = MP4Init;
- m->mux = MP4Mux;
- m->end = MP4End;
- m->job = job;
- return m;
-}
-

HandBrake-0.9.9.tar.bz2/macosx/ChapterTitles.h Deleted

HandBrake-0.9.9.tar.bz2/macosx/ChapterTitles.m Deleted

@@ -1,137 +0,0 @@
-/* ChapterTitles.m $
-
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License. */
- 
-#include "ChapterTitles.h"
-#include "hb.h"
-
-@implementation ChapterTitles
-- (id)init 
-{
- self = [super init];
- if (self != nil)
- {
- fTitle = NULL;
- fChapterTitlesArray = [[[NSMutableArray alloc] init] retain];
- }
- return self;
-}
-
-- (void)dealloc
-{
- [fChapterTitlesArray release];
- [super dealloc];
-}
-
-- (void)resetWithTitle:(hb_title_t *)title
-{
- fTitle = title;
- [fChapterTitlesArray removeAllObjects];
-
- if (fTitle == NULL)
- return;
-
- for (int i = 0; i < hb_list_count(fTitle->job->list_chapter); i++)
- {
- hb_chapter_t *chapter = hb_list_item(fTitle->job->list_chapter, i);
- if (chapter != NULL)
- {
- if (chapter->title != NULL)
- {
- [fChapterTitlesArray addObject:[NSString
- stringWithUTF8String:chapter->title]];
- }
- else
- {
- [fChapterTitlesArray addObject:[NSString
- stringWithFormat:@"Chapter %d",
- i + 1]];
- }
- }
- }
-}
-
-- (NSArray*)chapterTitlesArray
-{
- return [NSArray arrayWithArray:fChapterTitlesArray];
-}
-
-- (int)numberOfRowsInTableView:(NSTableView *)aTableView
-{
- if (fTitle == NULL)
- {
- return 0;
- }
- else
- {
- return [fChapterTitlesArray count];
- }
-}
-
-- (void)tableView:(NSTableView *)aTableView
- setObjectValue:(id)anObject
- forTableColumn:(NSTableColumn *)aTableColumn
- row:(NSInteger)rowIndex
-{
- if (aTableColumn != nil && [[aTableColumn identifier] intValue] == 2 &&
- fTitle != NULL)
- {
- [fChapterTitlesArray replaceObjectAtIndex:rowIndex
- withObject:[NSString
- stringWithString:anObject]];
- }
-}
-
-- (id)tableView:(NSTableView *)aTableView
- objectValueForTableColumn:(NSTableColumn *)aTableColumn
- row:(NSInteger)rowIndex
-{
- if ([[aTableColumn identifier] intValue] == 1)
- {
- return [NSString stringWithFormat:@"%d", rowIndex + 1];
- }
- else if (fTitle != NULL)
- {
- return [NSString stringWithString:[fChapterTitlesArray
- objectAtIndex:rowIndex]];
- }
- return @"__DATA ERROR__";
-}
-
-/* Method to edit the next chapter when the user presses Return. We have to use
-a timer to avoid interfering with the chain of events that handles the edit. */
-- (void)controlTextDidEndEditing: (NSNotification *) notification
-{
- NSTableView *chapterTable = [notification object];
- NSInteger column = [chapterTable editedColumn];
- NSInteger row = [chapterTable editedRow];
- NSInteger textMovement;
-
- // Edit the cell in the next row, same column
- row++;
- textMovement = [[[notification userInfo] objectForKey:@"NSTextMovement"] integerValue];
- if( textMovement == NSReturnTextMovement && row < [chapterTable numberOfRows] )
- {
- NSArray *info = [NSArray arrayWithObjects:chapterTable,
- [NSNumber numberWithInteger:column], [NSNumber numberWithInteger:row], nil];
- /* The delay is unimportant; editNextRow: won't be called until the responder
- chain finishes because the event loop containing the timer is on this thread */
- [self performSelector:@selector(editNextRow:) withObject:info afterDelay:0.0];
- }
-}
-
-- (void)editNextRow: (id) objects
-{
- NSTableView *chapterTable = [objects objectAtIndex:0];
- NSInteger column = [[objects objectAtIndex:1] integerValue];
- NSInteger row = [[objects objectAtIndex:2] integerValue];
-
- if( row >= 0 && row < [chapterTable numberOfRows] )
- {
- [chapterTable selectRow:row byExtendingSelection:NO];
- [chapterTable editColumn:column row:row withEvent:nil select:YES];
- }
-}
-@end

HandBrake-0.9.9.tar.bz2/macosx/HBPresets.h Deleted

@@ -1,33 +0,0 @@
-/* HBPresets.h $
-
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License. */
-
-#import <Cocoa/Cocoa.h>
-
-@interface HBPresets : NSObject {}
-
-/* Called by -addFactoryPresets in Controller.m */
-- (NSMutableArray *)generateBuiltinPresets:(NSMutableArray *)UserPresets;
-
-/* Dictionaries for preset folders ("Devices, "Regular") */
-- (NSDictionary *)createDevicesPresetFolder;
-- (NSDictionary *)createRegularPresetFolder;
-
-/* Dictionaries for individual presets ("Devices" folder) */
-- (NSDictionary *)createUniversalPreset;
-- (NSDictionary *)createiPodPreset;
-- (NSDictionary *)createiPhoneiPodtouchPreset;
-- (NSDictionary *)createiPadPreset;
-- (NSDictionary *)createAppleTVPreset;
-- (NSDictionary *)createAppleTV2Preset;
-- (NSDictionary *)createAppleTV3Preset;
-- (NSDictionary *)createAndroidPreset;
-- (NSDictionary *)createAndroidTabletPreset;
-
-/* Dictionaries for individual presets ("Regular" folder) */
-- (NSDictionary *)createNormalPreset;
-- (NSDictionary *)createHighProfilePreset;
-
-@end

HandBrake-0.9.9.tar.bz2/macosx/HBPresets.m Deleted

@@ -1,1303 +0,0 @@
-/* HBPresets.m $
-
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License. */
-
-#import "HBPresets.h"
-
-@implementation HBPresets
-
-- (id)init 
-{
- self = [super init];
- return self;
-}
-
-/* Called by -addFactoryPresets in Controller.m */
-- (NSMutableArray *)generateBuiltinPresets:(NSMutableArray *)UserPresets
-{
- /*
- * We receive the user presets array of dictionaries from Controller.m
- *
- * Re-create new built-in presets programmatically and add them to the array
- *
- * Note: the built-in presets will *not* sort themselves alphabetically,
- * so they will appear in the order you create them.
- */
- 
- /* Built-in preset folders at the root of the hierarchy */
- [UserPresets addObject:[self createDevicesPresetFolder]];
- [UserPresets addObject:[self createRegularPresetFolder]];
- 
- /* Independent presets at the root hierarchy level would go here */
- 
- /* Return the newly-regenerated preset array back to Controller.m */
- return UserPresets;
-}
-
-#pragma mark -
-#pragma mark Preset Folder Definitions
-
-- (NSDictionary *)createDevicesPresetFolder
-{
- NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
- 
- /* Preset properties (name, type: factory/user, default, folder, tooltip) */
- [preset setObject:@"Devices" forKey:@"PresetName"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"]; //factory
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
- [preset setObject:[NSNumber numberWithBool:YES] forKey:@"Folder"];
- 
- /* Initialize a child array, and add the individual presets to it */
- NSMutableArray *childrenArray = [[NSMutableArray alloc] init];
- [childrenArray addObject:[self createUniversalPreset]];
- [childrenArray addObject:[self createiPodPreset]];
- [childrenArray addObject:[self createiPhoneiPodtouchPreset]];
- [childrenArray addObject:[self createiPadPreset]];
- [childrenArray addObject:[self createAppleTVPreset]];
- [childrenArray addObject:[self createAppleTV2Preset]];
- [childrenArray addObject:[self createAppleTV3Preset]];
- [childrenArray addObject:[self createAndroidPreset]];
- [childrenArray addObject:[self createAndroidTabletPreset]];
- 
- /* Add the individual presets to the folder */
- [preset setObject:[NSMutableArray arrayWithArray:childrenArray]
- forKey:@"ChildrenArray"];
- 
- /* Clean up and return the folder */
- [childrenArray autorelease];
- [preset autorelease];
- return preset;
-}
-
-- (NSDictionary *)createRegularPresetFolder
-{
- NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
- 
- /* Preset properties (name, type: factory/user, default, folder, tooltip) */
- [preset setObject:@"Regular" forKey:@"PresetName"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"]; //factory
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
- [preset setObject:[NSNumber numberWithBool:YES] forKey:@"Folder"];
- 
- /* Initialize a child array, and add the individual presets to it */
- NSMutableArray *childrenArray = [[NSMutableArray alloc] init];
- [childrenArray addObject:[self createNormalPreset]];
- [childrenArray addObject:[self createHighProfilePreset]];
- 
- /* Add the individual presets to the folder */
- [preset setObject:[NSMutableArray arrayWithArray:childrenArray]
- forKey:@"ChildrenArray"];
- 
- /* Clean up and return the folder */
- [childrenArray autorelease];
- [preset autorelease];
- return preset;
-}
-
-#pragma mark -
-#pragma mark Individual Preset Definitions
-/* These NSDictionary definitions contain settings for one built-in preset */
-
-- (NSDictionary *)createUniversalPreset
-{
- NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
- 
- /* Preset properties (name, type: factory/user, default, folder, tooltip) */
- [preset setObject:@"Universal" forKey:@"PresetName"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"]; //factory
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
- [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
- [preset setObject:@"HandBrake's settings for compatibility with all Apple devices (including the iPod 6G and later). Includes Dolby Digital audio for surround sound."
- forKey:@"PresetDescription"];
- 
- /* Container format and related settings */
- [preset setObject:@"MP4 file" forKey:@"FileFormat"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4LargeFile"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
- 
- /* Chapter markers */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
- 
- /* Video encoder and advanced options */
- [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
- [preset setObject:@"" forKey:@"lavcOption"];
- [preset setObject:@"" forKey:@"x264Option"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
- [preset setObject:@"fast" forKey:@"x264Preset"];
- [preset setObject:@"" forKey:@"x264Tune"];
- [preset setObject:@"" forKey:@"x264OptionExtra"];
- [preset setObject:@"baseline" forKey:@"h264Profile"];
- [preset setObject:@"3.0" forKey:@"h264Level"];
- 
- /* Video rate control */
- [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTurboTwoPass"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"]; //cq
- [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
- 
- /* Video frame rate */
- [preset setObject:@"30" forKey:@"VideoFramerate"];
- [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
- 
- /* Picture size */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
- [preset setObject:[NSNumber numberWithInt:720] forKey:@"PictureWidth"];
- [preset setObject:[NSNumber numberWithInt:576] forKey:@"PictureHeight"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"]; //loose
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureModulus"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
- 
- /* Picture filters */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
- [preset setObject:@"" forKey:@"PictureDecombCustom"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
- [preset setObject:@"" forKey:@"PictureDeinterlaceCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
- [preset setObject:@"" forKey:@"PictureDetelecineCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
- [preset setObject:@"" forKey:@"PictureDenoiseCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
- 
- /* Picture crop */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
- 
- /* Auto Passthru */
- [preset setObject:@"AC3 (ffmpeg)" forKey:@"AudioEncoderFallback"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
- 
- /* Audio track list - no need to add "None" at the end */
- NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
- /* Track 1 */
- NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
- [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
- [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
- [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"];
- [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
- [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
- [audioTrack1Array autorelease];
- [audioListArray addObject:audioTrack1Array];
- /* Track 2 */
- NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
- [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
- [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioEncoder"];
- [audioTrack2Array setObject:@"None" forKey:@"AudioMixdown"];
- [audioTrack2Array setObject:@"Auto" forKey:@"AudioSamplerate"];
- [audioTrack2Array setObject:@"160" forKey:@"AudioBitrate"];
- [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
- [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
- [audioTrack2Array autorelease];
- [audioListArray addObject:audioTrack2Array];
- /* Add the audio track(s) to the preset's audio list */
- [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
- 
- /* Subtitles (note: currently ignored) */
- [preset setObject:@"None" forKey:@"Subtitles"];
- 
- /* Clean up and return the preset */
- [preset autorelease];
- return preset;
-}
-
-- (NSDictionary *)createiPodPreset
-{
- NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
- 
- /* Preset properties (name, type: factory/user, default, folder, tooltip) */
- [preset setObject:@"iPod" forKey:@"PresetName"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"]; //factory
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
- [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
- [preset setObject:@"HandBrake's settings for playback on the iPod with Video (all generations)."
- forKey:@"PresetDescription"];
- 
- /* Container format and related settings */
- [preset setObject:@"MP4 file" forKey:@"FileFormat"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4LargeFile"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4iPodCompatible"];
- 
- /* Chapter markers */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
- 
- /* Video encoder and advanced options */
- [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
- [preset setObject:@"" forKey:@"lavcOption"];
- [preset setObject:@"" forKey:@"x264Option"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
- [preset setObject:@"medium" forKey:@"x264Preset"];
- [preset setObject:@"" forKey:@"x264Tune"];
- [preset setObject:@"" forKey:@"x264OptionExtra"];
- [preset setObject:@"baseline" forKey:@"h264Profile"];
- [preset setObject:@"1.3" forKey:@"h264Level"];
- 
- /* Video rate control */
- [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTurboTwoPass"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"]; //cq
- [preset setObject:[NSNumber numberWithFloat:22.0] forKey:@"VideoQualitySlider"];
- 
- /* Video frame rate */
- [preset setObject:@"30" forKey:@"VideoFramerate"];
- [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
- 
- /* Picture size */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
- [preset setObject:[NSNumber numberWithInt:320] forKey:@"PictureWidth"];
- [preset setObject:[NSNumber numberWithInt:240] forKey:@"PictureHeight"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PicturePAR"]; //none
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureModulus"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureKeepRatio"];
- 
- /* Picture filters */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
- [preset setObject:@"" forKey:@"PictureDecombCustom"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
- [preset setObject:@"" forKey:@"PictureDeinterlaceCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
- [preset setObject:@"" forKey:@"PictureDetelecineCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
- [preset setObject:@"" forKey:@"PictureDenoiseCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
- 
- /* Picture crop */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
- 
- /* Auto Passthru */
- [preset setObject:@"AC3 (ffmpeg)" forKey:@"AudioEncoderFallback"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
- 
- /* Audio track list - no need to add "None" at the end */
- NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
- /* Track 1 */
- NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
- [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
- [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
- [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"];
- [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
- [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
- [audioTrack1Array autorelease];
- [audioListArray addObject:audioTrack1Array];
- /* Add the audio track(s) to the preset's audio list */
- [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
- 
- /* Subtitles (note: currently ignored) */
- [preset setObject:@"None" forKey:@"Subtitles"];
- 
- /* Clean up and return the preset */
- [preset autorelease];
- return preset;
-}
-
-- (NSDictionary *)createiPhoneiPodtouchPreset
-{
- NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
- 
- /* Preset properties (name, type: factory/user, default, folder, tooltip) */
- [preset setObject:@"iPhone & iPod touch" forKey:@"PresetName"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"]; //factory
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
- [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
- [preset setObject:@"HandBrake's settings for handheld iOS devices (iPhone 4, iPod touch 3G and later)."
- forKey:@"PresetDescription"];
- 
- /* Container format and related settings */
- [preset setObject:@"MP4 file" forKey:@"FileFormat"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
- 
- /* Chapter markers */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
- 
- /* Video encoder and advanced options */
- [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
- [preset setObject:@"" forKey:@"lavcOption"];
- [preset setObject:@"" forKey:@"x264Option"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
- [preset setObject:@"medium" forKey:@"x264Preset"];
- [preset setObject:@"" forKey:@"x264Tune"];
- [preset setObject:@"" forKey:@"x264OptionExtra"];
- [preset setObject:@"high" forKey:@"h264Profile"];
- [preset setObject:@"3.1" forKey:@"h264Level"];
- 
- /* Video rate control */
- [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTurboTwoPass"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"]; //cq
- [preset setObject:[NSNumber numberWithFloat:22.0] forKey:@"VideoQualitySlider"];
- 
- /* Video frame rate */
- [preset setObject:@"30" forKey:@"VideoFramerate"];
- [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
- 
- /* Picture size */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
- [preset setObject:[NSNumber numberWithInt:960] forKey:@"PictureWidth"];
- [preset setObject:[NSNumber numberWithInt:640] forKey:@"PictureHeight"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"]; //loose
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureModulus"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
- 
- /* Picture filters */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
- [preset setObject:@"" forKey:@"PictureDecombCustom"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
- [preset setObject:@"" forKey:@"PictureDeinterlaceCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
- [preset setObject:@"" forKey:@"PictureDetelecineCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
- [preset setObject:@"" forKey:@"PictureDenoiseCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
- 
- /* Picture crop */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
- 
- /* Auto Passthru */
- [preset setObject:@"AC3 (ffmpeg)" forKey:@"AudioEncoderFallback"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
- 
- /* Audio track list - no need to add "None" at the end */
- NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
- /* Track 1 */
- NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
- [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
- [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
- [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"];
- [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
- [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
- [audioTrack1Array autorelease];
- [audioListArray addObject:audioTrack1Array];
- /* Add the audio track(s) to the preset's audio list */
- [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
- 
- /* Subtitles (note: currently ignored) */
- [preset setObject:@"None" forKey:@"Subtitles"];
- 
- /* Clean up and return the preset */
- [preset autorelease];
- return preset;
-}
-
-- (NSDictionary *)createiPadPreset
-{
- NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
- 
- /* Preset properties (name, type: factory/user, default, folder, tooltip) */
- [preset setObject:@"iPad" forKey:@"PresetName"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"]; //factory
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
- [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
- [preset setObject:@"HandBrake's settings for playback on the iPad (all generations)."
- forKey:@"PresetDescription"];
- 
- /* Container format and related settings */
- [preset setObject:@"MP4 file" forKey:@"FileFormat"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
- 
- /* Chapter markers */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
- 
- /* Video encoder and advanced options */
- [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
- [preset setObject:@"" forKey:@"lavcOption"];
- [preset setObject:@"" forKey:@"x264Option"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
- [preset setObject:@"medium" forKey:@"x264Preset"];
- [preset setObject:@"" forKey:@"x264Tune"];
- [preset setObject:@"" forKey:@"x264OptionExtra"];
- [preset setObject:@"high" forKey:@"h264Profile"];
- [preset setObject:@"3.1" forKey:@"h264Level"];
- 
- /* Video rate control */
- [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTurboTwoPass"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"]; //cq
- [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
- 
- /* Video frame rate */
- [preset setObject:@"30" forKey:@"VideoFramerate"];
- [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
- 
- /* Picture size */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
- [preset setObject:[NSNumber numberWithInt:1280] forKey:@"PictureWidth"];
- [preset setObject:[NSNumber numberWithInt:720] forKey:@"PictureHeight"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"]; //loose
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureModulus"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
- 
- /* Picture filters */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
- [preset setObject:@"" forKey:@"PictureDecombCustom"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
- [preset setObject:@"" forKey:@"PictureDeinterlaceCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
- [preset setObject:@"" forKey:@"PictureDetelecineCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
- [preset setObject:@"" forKey:@"PictureDenoiseCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
- 
- /* Picture crop */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
- 
- /* Auto Passthru */
- [preset setObject:@"AC3 (ffmpeg)" forKey:@"AudioEncoderFallback"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
- 
- /* Audio track list - no need to add "None" at the end */
- NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
- /* Track 1 */
- NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
- [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
- [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
- [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"];
- [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
- [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
- [audioTrack1Array autorelease];
- [audioListArray addObject:audioTrack1Array];
- /* Add the audio track(s) to the preset's audio list */
- [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
- 
- /* Subtitles (note: currently ignored) */
- [preset setObject:@"None" forKey:@"Subtitles"];
- 
- /* Clean up and return the preset */
- [preset autorelease];
- return preset;
-}
-
-- (NSDictionary *)createAppleTVPreset
-{
- NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
- 
- /* Preset properties (name, type: factory/user, default, folder, tooltip) */
- [preset setObject:@"AppleTV" forKey:@"PresetName"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"]; //factory
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
- [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
- [preset setObject:@"HandBrake's settings for the original AppleTV. Includes Dolby Digital audio for surround sound. Also compatible with iOS devices released since 2009."
- forKey:@"PresetDescription"];
- 
- /* Container format and related settings */
- [preset setObject:@"MP4 file" forKey:@"FileFormat"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
- 
- /* Chapter markers */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
- 
- /* Video encoder and advanced options */
- [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
- [preset setObject:@"" forKey:@"lavcOption"];
- [preset setObject:@"" forKey:@"x264Option"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
- [preset setObject:@"medium" forKey:@"x264Preset"];
- [preset setObject:@"" forKey:@"x264Tune"];
- [preset setObject:@"qpmin=4:cabac=0:ref=2:b-pyramid=none:weightb=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500"
- forKey:@"x264OptionExtra"];
- [preset setObject:@"high" forKey:@"h264Profile"];
- [preset setObject:@"3.1" forKey:@"h264Level"];
- 
- /* Video rate control */
- [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTurboTwoPass"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"]; //cq
- [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
- 
- /* Video frame rate */
- [preset setObject:@"30" forKey:@"VideoFramerate"];
- [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
- 
- /* Picture size */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
- [preset setObject:[NSNumber numberWithInt:960] forKey:@"PictureWidth"];
- [preset setObject:[NSNumber numberWithInt:720] forKey:@"PictureHeight"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"]; //loose
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureModulus"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
- 
- /* Picture filters */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
- [preset setObject:@"" forKey:@"PictureDecombCustom"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
- [preset setObject:@"" forKey:@"PictureDeinterlaceCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
- [preset setObject:@"" forKey:@"PictureDetelecineCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
- [preset setObject:@"" forKey:@"PictureDenoiseCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
- 
- /* Picture crop */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
- 
- /* Auto Passthru */
- [preset setObject:@"AC3 (ffmpeg)" forKey:@"AudioEncoderFallback"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
- 
- /* Audio track list - no need to add "None" at the end */
- NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
- /* Track 1 */
- NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
- [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
- [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
- [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"];
- [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
- [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
- [audioTrack1Array autorelease];
- [audioListArray addObject:audioTrack1Array];
- /* Track 2 */
- NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
- [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
- [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioEncoder"];
- [audioTrack2Array setObject:@"None" forKey:@"AudioMixdown"];
- [audioTrack2Array setObject:@"Auto" forKey:@"AudioSamplerate"];
- [audioTrack2Array setObject:@"160" forKey:@"AudioBitrate"];
- [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
- [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
- [audioTrack2Array autorelease];
- [audioListArray addObject:audioTrack2Array];
- /* Add the audio track(s) to the preset's audio list */
- [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
- 
- /* Subtitles (note: currently ignored) */
- [preset setObject:@"None" forKey:@"Subtitles"];
- 
- /* Clean up and return the preset */
- [preset autorelease];
- return preset;
-}
-
-- (NSDictionary *)createAppleTV2Preset
-{
- NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
- 
- /* Preset properties (name, type: factory/user, default, folder, tooltip) */
- [preset setObject:@"AppleTV 2" forKey:@"PresetName"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"]; //factory
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
- [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
- [preset setObject:@"HandBrake's settings for the second-generation AppleTV. Includes Dolby Digital audio for surround sound. NOT compatible with the original AppleTV."
- forKey:@"PresetDescription"];
- 
- /* Container format and related settings */
- [preset setObject:@"MP4 file" forKey:@"FileFormat"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
- 
- /* Chapter markers */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
- 
- /* Video encoder and advanced options */
- [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
- [preset setObject:@"" forKey:@"lavcOption"];
- [preset setObject:@"" forKey:@"x264Option"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
- [preset setObject:@"medium" forKey:@"x264Preset"];
- [preset setObject:@"" forKey:@"x264Tune"];
- [preset setObject:@"" forKey:@"x264OptionExtra"];
- [preset setObject:@"high" forKey:@"h264Profile"];
- [preset setObject:@"3.1" forKey:@"h264Level"];
- 
- /* Video rate control */
- [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTurboTwoPass"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"]; //cq
- [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
- 
- /* Video frame rate */
- [preset setObject:@"30" forKey:@"VideoFramerate"];
- [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
- 
- /* Picture size */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
- [preset setObject:[NSNumber numberWithInt:1280] forKey:@"PictureWidth"];
- [preset setObject:[NSNumber numberWithInt:720] forKey:@"PictureHeight"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"]; //loose
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureModulus"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
- 
- /* Picture filters */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
- [preset setObject:@"" forKey:@"PictureDecombCustom"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
- [preset setObject:@"" forKey:@"PictureDeinterlaceCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
- [preset setObject:@"" forKey:@"PictureDetelecineCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
- [preset setObject:@"" forKey:@"PictureDenoiseCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
- 
- /* Picture crop */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
- 
- /* Auto Passthru */
- [preset setObject:@"AC3 (ffmpeg)" forKey:@"AudioEncoderFallback"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
- 
- /* Audio track list - no need to add "None" at the end */
- NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
- /* Track 1 */
- NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
- [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
- [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
- [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"];
- [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
- [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
- [audioTrack1Array autorelease];
- [audioListArray addObject:audioTrack1Array];
- /* Track 2 */
- NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
- [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
- [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioEncoder"];
- [audioTrack2Array setObject:@"None" forKey:@"AudioMixdown"];
- [audioTrack2Array setObject:@"Auto" forKey:@"AudioSamplerate"];
- [audioTrack2Array setObject:@"160" forKey:@"AudioBitrate"];
- [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
- [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
- [audioTrack2Array autorelease];
- [audioListArray addObject:audioTrack2Array];
- /* Add the audio track(s) to the preset's audio list */
- [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
- 
- /* Subtitles (note: currently ignored) */
- [preset setObject:@"None" forKey:@"Subtitles"];
- 
- /* Clean up and return the preset */
- [preset autorelease];
- return preset;
-}
-
-- (NSDictionary *)createAppleTV3Preset
-{
- NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
- 
- /* Preset properties (name, type: factory/user, default, folder, tooltip) */
- [preset setObject:@"AppleTV 3" forKey:@"PresetName"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"]; //factory
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
- [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
- [preset setObject:@"HandBrake's settings for the third-generation AppleTV. Includes Dolby Digital audio for surround sound. NOT compatible with the original AppleTV. May stutter on the second-generation AppleTV."
- forKey:@"PresetDescription"];
- 
- /* Container format and related settings */
- [preset setObject:@"MP4 file" forKey:@"FileFormat"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
- 
- /* Chapter markers */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
- 
- /* Video encoder and advanced options */
- [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
- [preset setObject:@"" forKey:@"lavcOption"];
- [preset setObject:@"" forKey:@"x264Option"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
- [preset setObject:@"medium" forKey:@"x264Preset"];
- [preset setObject:@"" forKey:@"x264Tune"];
- [preset setObject:@"" forKey:@"x264OptionExtra"];
- [preset setObject:@"high" forKey:@"h264Profile"];
- [preset setObject:@"4.0" forKey:@"h264Level"];
- 
- /* Video rate control */
- [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTurboTwoPass"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"]; //cq
- [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
- 
- /* Video frame rate */
- [preset setObject:@"30" forKey:@"VideoFramerate"];
- [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
- 
- /* Picture size */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
- [preset setObject:[NSNumber numberWithInt:1920] forKey:@"PictureWidth"];
- [preset setObject:[NSNumber numberWithInt:1080] forKey:@"PictureHeight"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"]; //loose
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureModulus"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
- 
- /* Picture filters */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
- [preset setObject:[NSNumber numberWithInt:3] forKey:@"PictureDecomb"]; //fast
- [preset setObject:@"" forKey:@"PictureDecombCustom"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
- [preset setObject:@"" forKey:@"PictureDeinterlaceCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
- [preset setObject:@"" forKey:@"PictureDetelecineCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
- [preset setObject:@"" forKey:@"PictureDenoiseCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
- 
- /* Picture crop */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
- 
- /* Auto Passthru */
- [preset setObject:@"AC3 (ffmpeg)" forKey:@"AudioEncoderFallback"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
- 
- /* Audio track list - no need to add "None" at the end */
- NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
- /* Track 1 */
- NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
- [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
- [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
- [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"];
- [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
- [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
- [audioTrack1Array autorelease];
- [audioListArray addObject:audioTrack1Array];
- /* Track 2 */
- NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
- [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
- [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioEncoder"];
- [audioTrack2Array setObject:@"None" forKey:@"AudioMixdown"];
- [audioTrack2Array setObject:@"Auto" forKey:@"AudioSamplerate"];
- [audioTrack2Array setObject:@"160" forKey:@"AudioBitrate"];
- [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
- [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
- [audioTrack2Array autorelease];
- [audioListArray addObject:audioTrack2Array];
- /* Add the audio track(s) to the preset's audio list */
- [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
- 
- /* Subtitles (note: currently ignored) */
- [preset setObject:@"None" forKey:@"Subtitles"];
- 
- /* Clean up and return the preset */
- [preset autorelease];
- return preset;
-}
-
-- (NSDictionary *)createAndroidPreset
-{
- NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
- 
- /* Preset properties (name, type: factory/user, default, folder, tooltip) */
- [preset setObject:@"Android" forKey:@"PresetName"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"]; //factory
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
- [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
- [preset setObject:@"HandBrake's settings for midrange devices running Android 2.3 or later."
- forKey:@"PresetDescription"];
- 
- /* Container format and related settings */
- [preset setObject:@"MP4 file" forKey:@"FileFormat"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4LargeFile"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
- 
- /* Chapter markers */
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"ChapterMarkers"];
- 
- /* Video encoder and advanced options */
- [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
- [preset setObject:@"" forKey:@"lavcOption"];
- [preset setObject:@"" forKey:@"x264Option"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
- [preset setObject:@"medium" forKey:@"x264Preset"];
- [preset setObject:@"" forKey:@"x264Tune"];
- [preset setObject:@"" forKey:@"x264OptionExtra"];
- [preset setObject:@"main" forKey:@"h264Profile"];
- [preset setObject:@"3.0" forKey:@"h264Level"];
- 
- /* Video rate control */
- [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTurboTwoPass"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"]; //cq
- [preset setObject:[NSNumber numberWithFloat:22.0] forKey:@"VideoQualitySlider"];
- 
- /* Video frame rate */
- [preset setObject:@"30" forKey:@"VideoFramerate"];
- [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
- 
- /* Picture size */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
- [preset setObject:[NSNumber numberWithInt:720] forKey:@"PictureWidth"];
- [preset setObject:[NSNumber numberWithInt:576] forKey:@"PictureHeight"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"]; //loose
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureModulus"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
- 
- /* Picture filters */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
- [preset setObject:@"" forKey:@"PictureDecombCustom"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
- [preset setObject:@"" forKey:@"PictureDeinterlaceCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
- [preset setObject:@"" forKey:@"PictureDetelecineCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
- [preset setObject:@"" forKey:@"PictureDenoiseCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
- 
- /* Picture crop */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
- 
- /* Auto Passthru */
- [preset setObject:@"AC3 (ffmpeg)" forKey:@"AudioEncoderFallback"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
- 
- /* Audio track list - no need to add "None" at the end */
- NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
- /* Track 1 */
- NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
- [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
- [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
- [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"];
- [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
- [audioTrack1Array setObject:@"128" forKey:@"AudioBitrate"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
- [audioTrack1Array autorelease];
- [audioListArray addObject:audioTrack1Array];
- /* Add the audio track(s) to the preset's audio list */
- [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
- 
- /* Subtitles (note: currently ignored) */
- [preset setObject:@"None" forKey:@"Subtitles"];
- 
- /* Clean up and return the preset */
- [preset autorelease];
- return preset;
-}
-
-- (NSDictionary *)createAndroidTabletPreset
-{
- NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
- 
- /* Preset properties (name, type: factory/user, default, folder, tooltip) */
- [preset setObject:@"Android Tablet" forKey:@"PresetName"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"]; //factory
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
- [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
- [preset setObject:@"HandBrake's preset for tablets running Android 2.3 or later."
- forKey:@"PresetDescription"];
- 
- /* Container format and related settings */
- [preset setObject:@"MP4 file" forKey:@"FileFormat"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4LargeFile"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
- 
- /* Chapter markers */
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"ChapterMarkers"];
- 
- /* Video encoder and advanced options */
- [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
- [preset setObject:@"" forKey:@"lavcOption"];
- [preset setObject:@"" forKey:@"x264Option"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
- [preset setObject:@"medium" forKey:@"x264Preset"];
- [preset setObject:@"" forKey:@"x264Tune"];
- [preset setObject:@"" forKey:@"x264OptionExtra"];
- [preset setObject:@"main" forKey:@"h264Profile"];
- [preset setObject:@"3.1" forKey:@"h264Level"];
- 
- /* Video rate control */
- [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTurboTwoPass"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"]; //cq
- [preset setObject:[NSNumber numberWithFloat:22.0] forKey:@"VideoQualitySlider"];
- 
- /* Video frame rate */
- [preset setObject:@"30" forKey:@"VideoFramerate"];
- [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
- 
- /* Picture size */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
- [preset setObject:[NSNumber numberWithInt:1280] forKey:@"PictureWidth"];
- [preset setObject:[NSNumber numberWithInt:720] forKey:@"PictureHeight"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"]; //loose
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureModulus"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
- 
- /* Picture filters */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
- [preset setObject:@"" forKey:@"PictureDecombCustom"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
- [preset setObject:@"" forKey:@"PictureDeinterlaceCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
- [preset setObject:@"" forKey:@"PictureDetelecineCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
- [preset setObject:@"" forKey:@"PictureDenoiseCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
- 
- /* Picture crop */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
- 
- /* Auto Passthru */
- [preset setObject:@"AC3 (ffmpeg)" forKey:@"AudioEncoderFallback"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
- 
- /* Audio track list - no need to add "None" at the end */
- NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
- /* Track 1 */
- NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
- [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
- [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
- [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"];
- [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
- [audioTrack1Array setObject:@"128" forKey:@"AudioBitrate"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
- [audioTrack1Array autorelease];
- [audioListArray addObject:audioTrack1Array];
- /* Add the audio track(s) to the preset's audio list */
- [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
- 
- /* Subtitles (note: currently ignored) */
- [preset setObject:@"None" forKey:@"Subtitles"];
- 
- /* Clean up and return the preset */
- [preset autorelease];
- return preset;
-}
-
-- (NSDictionary *)createNormalPreset
-{
- NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
- 
- /* Preset properties (name, type: factory/user, default, folder, tooltip) */
- [preset setObject:@"Normal" forKey:@"PresetName"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"]; //factory
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"Default"]; //default
- [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
- [preset setObject:@"HandBrake's normal, default settings."
- forKey:@"PresetDescription"];
- 
- /* Container format and related settings */
- [preset setObject:@"MP4 file" forKey:@"FileFormat"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4LargeFile"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
- 
- /* Chapter markers */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
- 
- /* Video encoder and advanced options */
- [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
- [preset setObject:@"" forKey:@"lavcOption"];
- [preset setObject:@"" forKey:@"x264Option"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
- [preset setObject:@"veryfast" forKey:@"x264Preset"];
- [preset setObject:@"" forKey:@"x264Tune"];
- [preset setObject:@"" forKey:@"x264OptionExtra"];
- [preset setObject:@"main" forKey:@"h264Profile"];
- [preset setObject:@"4.0" forKey:@"h264Level"];
- 
- /* Video rate control */
- [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTurboTwoPass"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"]; //cq
- [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
- 
- /* Video frame rate */
- [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
- [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
- 
- /* Picture size */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureWidth"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"]; //loose
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureModulus"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
- 
- /* Picture filters */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDecomb"]; //off
- [preset setObject:@"" forKey:@"PictureDecombCustom"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
- [preset setObject:@"" forKey:@"PictureDeinterlaceCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
- [preset setObject:@"" forKey:@"PictureDetelecineCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
- [preset setObject:@"" forKey:@"PictureDenoiseCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
- 
- /* Picture crop */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
- 
- /* Auto Passthru */
- [preset setObject:@"AC3 (ffmpeg)" forKey:@"AudioEncoderFallback"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
- 
- /* Audio track list - no need to add "None" at the end */
- NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
- /* Track 1 */
- NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
- [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
- [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
- [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"];
- [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
- [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
- [audioTrack1Array autorelease];
- [audioListArray addObject:audioTrack1Array];
- /* Add the audio track(s) to the preset's audio list */
- [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
- 
- /* Subtitles (note: currently ignored) */
- [preset setObject:@"None" forKey:@"Subtitles"];
- 
- /* Clean up and return the preset */
- [preset autorelease];
- return preset;
-}
-
-- (NSDictionary *)createHighProfilePreset
-{
- NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
- 
- /* Preset properties (name, type: factory/user, default, folder, tooltip) */
- [preset setObject:@"High Profile" forKey:@"PresetName"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"]; //factory
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
- [preset setObject:[NSNumber numberWithBool:NO] forKey:@"Folder"];
- [preset setObject:@"HandBrake's general-purpose preset for High Profile H.264 video."
- forKey:@"PresetDescription"];
- 
- /* Container format and related settings */
- [preset setObject:@"MP4 file" forKey:@"FileFormat"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4HttpOptimize"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
- 
- /* Chapter markers */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
- 
- /* Video encoder and advanced options */
- [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
- [preset setObject:@"" forKey:@"lavcOption"];
- [preset setObject:@"" forKey:@"x264Option"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"x264UseAdvancedOptions"];
- [preset setObject:@"medium" forKey:@"x264Preset"];
- [preset setObject:@"" forKey:@"x264Tune"];
- [preset setObject:@"" forKey:@"x264OptionExtra"];
- [preset setObject:@"high" forKey:@"h264Profile"];
- [preset setObject:@"4.1" forKey:@"h264Level"];
- 
- /* Video rate control */
- [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTurboTwoPass"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"]; //cq
- [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
- 
- /* Video frame rate */
- [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
- [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
- 
- /* Picture size */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureWidth"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"]; //loose
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureModulus"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"]; //set to 0 for Loose (FIXME: why?)
- 
- /* Picture filters */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
- [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureDecomb"]; //default
- [preset setObject:@"" forKey:@"PictureDecombCustom"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"]; //decomb
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
- [preset setObject:@"" forKey:@"PictureDeinterlaceCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
- [preset setObject:@"" forKey:@"PictureDetelecineCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
- [preset setObject:@"" forKey:@"PictureDenoiseCustom"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
- 
- /* Picture crop */
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
- [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
- 
- /* Auto Passthru */
- [preset setObject:@"AC3 (ffmpeg)" forKey:@"AudioEncoderFallback"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAACPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowAC3Pass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSHDPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowDTSPass"];
- [preset setObject:[NSNumber numberWithInt:1] forKey:@"AudioAllowMP3Pass"];
- 
- /* Audio track list - no need to add "None" at the end */
- NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
- /* Track 1 */
- NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
- [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
- [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
- [audioTrack1Array setObject:@"Dolby Pro Logic II" forKey:@"AudioMixdown"];
- [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
- [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
- [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
- [audioTrack1Array autorelease];
- [audioListArray addObject:audioTrack1Array];
- /* Track 2 */
- NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
- [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
- [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioEncoder"];
- [audioTrack2Array setObject:@"None" forKey:@"AudioMixdown"];
- [audioTrack2Array setObject:@"Auto" forKey:@"AudioSamplerate"];
- [audioTrack2Array setObject:@"160" forKey:@"AudioBitrate"];
- [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"];
- [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
- [audioTrack2Array autorelease];
- [audioListArray addObject:audioTrack2Array];
- /* Add the audio track(s) to the preset's audio list */
- [preset setObject:[NSMutableArray arrayWithArray:audioListArray] forKey:@"AudioList"];
- 
- /* Subtitles (note: currently ignored) */
- [preset setObject:@"None" forKey:@"Subtitles"];
- 
- /* Clean up and return the preset */
- [preset autorelease];
- return preset;
-}
-
-@end

HandBrake-0.9.9.tar.bz2/macosx/HBSubtitles.h Deleted

@@ -1,58 +0,0 @@
-/* $Id: HBSubtitles.h,v 1.35 2005/08/01 14:29:50 titer Exp $
-
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License. */
-
-#import <Cocoa/Cocoa.h>
-#include "hb.h"
-
-
-
-
-@interface HBSubtitles : NSObject {
-hb_title_t *fTitle;
-
-NSMutableArray *subtitleArray; // contains the output subtitle track info
-NSMutableArray *subtitleSourceArray;// contains the source subtitle track info
-NSString *foreignAudioSearchTrackName;
-NSMutableArray *languagesArray; // array of languages taken from lang.c
-int languagesArrayDefIndex;
-NSMutableArray *charCodeArray; // array of character codes
-int charCodeArrayDefIndex;
-int container;
-
-}
-
-// Trigger a refresh of data
-- (void)resetWithTitle:(hb_title_t *)title;
-
-// Create new subtitle track
-- (void)addSubtitleTrack;
-- (NSDictionary *)createSubtitleTrack;
-- (NSMutableArray*) getSubtitleArray;
-// Add an srt file
-- (void)createSubtitleSrtTrack:(NSString *)filePath;
-
-- (void)containerChanged:(int) newContainer;
-
-- (void)setNewSubtitles:(NSMutableArray*) newSubtitleArray;
-
-// Table View Delegates
-- (int)numberOfRowsInTableView:(NSTableView *)aTableView;
-
-- (id)tableView:(NSTableView *)aTableView
- objectValueForTableColumn:(NSTableColumn *)aTableColumn
- row:(NSInteger)rowIndex;
- 
-- (void)tableView:(NSTableView *)aTableView
- setObjectValue:(id)anObject
- forTableColumn:(NSTableColumn *)aTableColumn
- row:(NSInteger)rowIndex;
-
-- (void)tableView:(NSTableView *)aTableView
- willDisplayCell:(id)aCell
- forTableColumn:(NSTableColumn *)aTableColumn
- row:(NSInteger)rowIndex;
-
-@end

HandBrake-0.9.9.tar.bz2/macosx/HBSubtitles.m Deleted

@@ -1,1065 +0,0 @@
-/* $Id: HBSubtitles.m,v 1.35 2005/08/01 14:29:50 titer Exp $
-
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License. */
-
-#import "HBSubtitles.h"
-#include "hb.h"
-
-@implementation HBSubtitles
-- (id)init 
-{
- self = [super init];
- if( self != nil )
- {
- fTitle = NULL;
- }
- 
- /* setup our array of languages */
- languagesArray = [[NSMutableArray alloc] init];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Any",@"und",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Afar",@"aar",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Abkhazian",@"abk",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Afrikaans",@"afr",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Akan",@"ak",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Albanian",@"sqi",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Amharic",@"amh",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Arabic",@"ara",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Aragonese",@"arg",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Armenian",@"hye",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Assamese",@"asm",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Avaric",@"ava",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Avestan",@"ave",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Aymara",@"aym",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Azerbaijani",@"aze",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Bashkir",@"bak",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Bambara",@"bam",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Basque",@"eus",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Belarusian",@"bel",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Bengali",@"ben",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Bihari",@"bih",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Bislama",@"bis",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Bosnian",@"bos",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Breton",@"bre",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Bulgarian",@"bul",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Burmese",@"mya",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Catalan",@"cat",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Chamorro",@"cha",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Chechen",@"che",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Chinese",@"zho",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Church Slavic",@"chu",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Chuvash",@"chv",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Cornish",@"cor",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Corsican",@"cos",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Cree",@"cre",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Czech",@"ces",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Danish",@"dan",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Divehi",@"div",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Dutch",@"nld",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Dzongkha",@"dzo",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"English",@"eng",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Esperanto",@"epo",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Estonian",@"est",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Ewe",@"ewe",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Faroese",@"fao",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Fijian",@"fij",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Finnish",@"fin",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"French",@"fra",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Western Frisian",@"fry",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Fulah",@"ful",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Georgian",@"kat",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"German",@"deu",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Gaelic (Scots)",@"gla",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Irish",@"gle",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Galician",@"glg",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Manx",@"glv",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Greek, Modern",@"ell",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Guarani",@"grn",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Gujarati",@"guj",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Haitian",@"hat",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Hausa",@"hau",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Hebrew",@"heb",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Herero",@"her",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Hindi",@"hin",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Hiri Motu",@"hmo",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Hungarian",@"hun",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Igbo",@"ibo",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Icelandic",@"isl",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Ido",@"ido",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Sichuan Yi",@"iii",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Inuktitut",@"iku",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Interlingue",@"ile",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Interlingua",@"ina",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Indonesian",@"ind",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Inupiaq",@"ipk",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Italian",@"ita",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Javanese",@"jav",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Japanese",@"jpn",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Kalaallisut (Greenlandic)",@"kal",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Kannada",@"kan",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Kashmiri",@"kas",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Kanuri",@"kau",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Kazakh",@"kaz",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Central Khmer",@"khm",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Kikuyu",@"kik",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Kinyarwanda",@"kin",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Kirghiz",@"kir",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Komi",@"kom",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Kongo",@"kon",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Korean",@"kor",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Kuanyama",@"kua",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Kurdish",@"kur",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Lao",@"lao",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Latin",@"lat",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Latvian",@"lav",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Limburgan",@"lim",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Lingala",@"lin",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Lithuanian",@"lit",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Luxembourgish",@"ltz",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Luba-Katanga",@"lub",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Ganda",@"lug",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Macedonian",@"mkd",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Marshallese",@"mah",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Malayalam",@"mal",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Maori",@"mri",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Marathi",@"mar",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Malay",@"msa",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Malagasy",@"mlg",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Maltese",@"mlt",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Moldavian",@"mol",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Mongolian",@"mon",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Nauru",@"nau",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Navajo",@"nav",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Ndebele, South",@"nbl",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Ndebele, North",@"nde",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Ndonga",@"ndo",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Nepali",@"nep",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Norwegian Nynorsk",@"nno",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Norwegian Bokmål",@"nob",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Norwegian",@"nor",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Chichewa; Nyanja",@"nya",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Occitan (post 1500); Provençal",@"oci",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Ojibwa",@"oji",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Oriya",@"ori",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Oromo",@"orm",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Ossetian; Ossetic",@"und",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Panjabi",@"pan",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Persian",@"fas",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Pali",@"pli",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Portuguese",@"por",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Pushto",@"pus",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Quechua",@"que",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Romansh",@"roh",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Romanian",@"ron",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Rundi",@"run",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Russian",@"rus",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Sango",@"sag",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Sanskrit",@"san",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Serbian",@"srp",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Croatian",@"hrv",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Sinhala",@"sin",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Slovak",@"slk",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Slovenian",@"slv",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Northern Sami",@"sme",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Samoan",@"smo",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Shona",@"sna",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Sindhi",@"snd",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Somali",@"som",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Sotho, Southern",@"sot",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Spanish",@"spa",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Sardinian",@"srd",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Swati",@"ssw",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Sundanese",@"sun",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Swahili",@"swa",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Swedish",@"swe",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Tahitian",@"tah",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Tamil",@"tam",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Tatar",@"tat",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Telugu",@"tel",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Tajik",@"tgk",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Tagalog",@"tgl",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Thai",@"tha",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Tibetan",@"bod",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Tigrinya",@"tir",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Tonga (Tonga Islands)",@"ton",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Tswana",@"tsn",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Tsonga",@"tso",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Turkmen",@"tuk",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Turkish",@"tur",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Twi",@"twi",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Uighur",@"uig",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Ukrainian",@"ukr",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Urdu",@"urd",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Uzbek",@"uzb",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Venda",@"ven",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Vietnamese",@"vie",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Volapük",@"vol",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Welsh",@"cym",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Walloon",@"wln",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Wolof",@"wol",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Xhosa",@"xho",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Yiddish",@"yid",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Yoruba",@"yor",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"ZhuangZhuang",@"zha",nil]];
- [languagesArray addObject:[NSArray arrayWithObjects:@"Zulu",@"zul",nil]];
- 
- languagesArrayDefIndex = 40;
- 
- /* populate the charCodeArray */
- charCodeArray = [[NSMutableArray alloc] init];
- [charCodeArray addObject:@"ANSI_X3.4-1968"];
- [charCodeArray addObject:@"ANSI_X3.4-1986"];
- [charCodeArray addObject:@"ANSI_X3.4"];
- [charCodeArray addObject:@"ANSI_X3.110-1983"];
- [charCodeArray addObject:@"ANSI_X3.110"];
- [charCodeArray addObject:@"ASCII"];
- [charCodeArray addObject:@"ECMA-114"];
- [charCodeArray addObject:@"ECMA-118"];
- [charCodeArray addObject:@"ECMA-128"];
- [charCodeArray addObject:@"ECMA-CYRILLIC"];
- [charCodeArray addObject:@"IEC_P27-1"];
- [charCodeArray addObject:@"ISO-8859-1"];
- [charCodeArray addObject:@"ISO-8859-2"];
- [charCodeArray addObject:@"ISO-8859-3"];
- [charCodeArray addObject:@"ISO-8859-4"];
- [charCodeArray addObject:@"ISO-8859-5"];
- [charCodeArray addObject:@"ISO-8859-6"];
- [charCodeArray addObject:@"ISO-8859-7"];
- [charCodeArray addObject:@"ISO-8859-8"];
- [charCodeArray addObject:@"ISO-8859-9"];
- [charCodeArray addObject:@"ISO-8859-9E"];
- [charCodeArray addObject:@"ISO-8859-10"];
- [charCodeArray addObject:@"ISO-8859-11"];
- [charCodeArray addObject:@"ISO-8859-13"];
- [charCodeArray addObject:@"ISO-8859-14"];
- [charCodeArray addObject:@"ISO-8859-15"];
- [charCodeArray addObject:@"ISO-8859-16"];
- [charCodeArray addObject:@"UTF-7"];
- [charCodeArray addObject:@"UTF-8"];
- [charCodeArray addObject:@"UTF-16"];
- [charCodeArray addObject:@"UTF-16LE"];
- [charCodeArray addObject:@"UTF-16BE"];
- [charCodeArray addObject:@"UTF-32"];
- [charCodeArray addObject:@"UTF-32LE"];
- [charCodeArray addObject:@"UTF-32BE"];
- 
- charCodeArrayDefIndex = 11;
- 
- return self;
-}
-
-
-- (void)resetWithTitle:(hb_title_t *)title
-{
- if (!title)
- {
- return;
- }
- fTitle = title;
- 
- /* reset the subtitle source array */
- if (subtitleSourceArray)
- {
- [subtitleSourceArray release];
- }
- subtitleSourceArray = [[NSMutableArray alloc] init];
- 
- /* now populate the array with the source subtitle track info */
- int i;
- hb_subtitle_t *subtitle;
- NSMutableArray *forcedSourceNamesArray = [[NSMutableArray alloc] init];
- for (i = 0; i < hb_list_count(fTitle->list_subtitle); i++)
- {
- subtitle = (hb_subtitle_t*)hb_list_item(fTitle->list_subtitle, i);
- 
- /* Subtitle source features */
- int canBeBurnedIn = hb_subtitle_can_burn(subtitle->source);
- int supportsForcedFlags = hb_subtitle_can_force(subtitle->source);
- /* Human-readable representation of subtitle->source */
- NSString *bitmapOrText = subtitle->format == PICTURESUB ? @"Bitmap" : @"Text";
- NSString *subSourceName = [NSString stringWithUTF8String:hb_subsource_name(subtitle->source)];
- /* if the subtitle track can be forced, add its source name to the array */
- if (supportsForcedFlags &&
- [forcedSourceNamesArray containsObject:subSourceName] == NO)
- {
- [forcedSourceNamesArray addObject:subSourceName];
- }
- 
- /* create a dictionary of source subtitle information to store in our array */
- NSMutableDictionary *newSubtitleSourceTrack = [[NSMutableDictionary alloc] init];
- /* Subtitle Source track name */
- [newSubtitleSourceTrack setObject:[NSString stringWithFormat:@"%d - %@ - (%@) (%@)",
- i, [NSString stringWithUTF8String:subtitle->lang],
- bitmapOrText,subSourceName]
- forKey:@"sourceTrackName"];
- /* Subtitle Source track number, type and features */
- [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:i] forKey:@"sourceTrackNum"];
- [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:subtitle->source] forKey:@"sourceTrackType"];
- [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:canBeBurnedIn] forKey:@"sourceTrackCanBeBurnedIn"];
- [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:supportsForcedFlags] forKey:@"sourceTrackSupportsForcedFlags"];
- [subtitleSourceArray addObject:newSubtitleSourceTrack];
- [newSubtitleSourceTrack autorelease];
- }
- 
- /* now set the name of the Foreign Audio Search track */
- if ([forcedSourceNamesArray count])
- {
- [forcedSourceNamesArray sortUsingComparator:^(id obj1, id obj2)
- {
- return [((NSString*)obj1) compare:((NSString*)obj2)];
- }];
- NSString *tempString;
- NSString *tempList = @"";
- NSEnumerator *enumerator = [forcedSourceNamesArray objectEnumerator];
- while (tempString = (NSString*)[enumerator nextObject])
- {
- if ([tempList length])
- {
- tempList = [tempList stringByAppendingString:@", "];
- }
- tempList = [tempList stringByAppendingString:tempString];
- }
- [foreignAudioSearchTrackName release];
- foreignAudioSearchTrackName = [[NSString stringWithFormat:@"Foreign Audio Search - (Bitmap) (%@)", tempList]
- retain];
- }
- else
- {
- [foreignAudioSearchTrackName release];
- foreignAudioSearchTrackName = [[NSString stringWithString:@"Foreign Audio Search - (Bitmap)"]
- retain];
- }
- [forcedSourceNamesArray release];
- 
- /* reset the subtitle output array */
- if (subtitleArray)
- {
- [subtitleArray release];
- }
- subtitleArray = [[NSMutableArray alloc] init];
- [self addSubtitleTrack];
-}
-
-#pragma mark -
-#pragma mark Create new Subtitles
-
-- (void)addSubtitleTrack
-{
- [subtitleArray addObject:[self createSubtitleTrack]];
-}
-
-/* Creates a new subtitle track and stores it in an NSMutableDictionary */
-- (NSDictionary *)createSubtitleTrack
-{
- NSMutableDictionary *newSubtitleTrack = [[NSMutableDictionary alloc] init];
- /* Subtitle Source track popup index */
- [newSubtitleTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleSourceTrackNum"];
- /* Subtitle Source track popup language */
- [newSubtitleTrack setObject:@"None" forKey:@"subtitleSourceTrackName"];
- /* Subtitle track forced state */
- [newSubtitleTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackForced"];
- /* Subtitle track burned state */
- [newSubtitleTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackBurned"];
- /* Subtitle track default state */
- [newSubtitleTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackDefault"];
- /* Subtitle Source track canBeBurnedIn */
- [newSubtitleTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleSourceTrackCanBeBurnedIn"];
- /* Subtitle Source track supportsForcedFlags */
- [newSubtitleTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleSourceTrackSupportsForcedFlags"];
-
- [newSubtitleTrack autorelease];
- return newSubtitleTrack;
-}
-
-- (void)createSubtitleSrtTrack:(NSString *)filePath
-{
- /* Create a new entry for the subtitle source array so it shows up in our subtitle source list */
- NSString *displayname = [filePath lastPathComponent];// grok an appropriate display name from the srt subtitle */
- /* create a dictionary of source subtitle information to store in our array */
- NSMutableDictionary *newSubtitleSourceTrack = [[NSMutableDictionary alloc] init];
- /* Subtitle Source track popup index */
- [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:[subtitleSourceArray count]+1] forKey:@"sourceTrackNum"];
- /* Subtitle Source track name */
- [newSubtitleSourceTrack setObject:displayname forKey:@"sourceTrackName"];
- /* Subtitle Source track type (VobSub, Srt, etc.) */
- [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:SRTSUB] forKey:@"sourceTrackType"];
- [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:SRTSUB] forKey:@"subtitleSourceTrackType"];
- /* Subtitle Source file path */
- [newSubtitleSourceTrack setObject:filePath forKey:@"sourceSrtFilePath"];
- /* Subtitle Source track canBeBurnedIn */
- [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:0] forKey:@"sourceTrackCanBeBurnedIn"];
- /* Subtitle Source track supportsForcedFlags */
- [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:0] forKey:@"sourceTrackSupportsForcedFlags"];
- 
- [subtitleSourceArray addObject:newSubtitleSourceTrack];
- [newSubtitleSourceTrack autorelease];
- 
- /* Now create a new srt subtitle dictionary assuming the user wants to add it to their list 
- * Note: the subtitle array always has last entry for "None", so we need to replace its
- * position in the array and tack a "None" track back on the end of the list */
- [subtitleArray removeObjectAtIndex:[subtitleArray count] - 1];
- 
- 
- NSMutableDictionary *newSubtitleSrtTrack = [[NSMutableDictionary alloc] init];
- /* Subtitle Source track popup index */
- if ([subtitleArray count] == 0) // we now have an empty array so this will be our first track
- {
- [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:[subtitleSourceArray count] + 1] forKey:@"subtitleSourceTrackNum"];
- }
- else
- {
- [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:[subtitleSourceArray count]] forKey:@"subtitleSourceTrackNum"];
- }
- 
- [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:SRTSUB] forKey:@"sourceTrackType"];
- [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:SRTSUB] forKey:@"subtitleSourceTrackType"];
- /* Subtitle Source track popup language */
- [newSubtitleSrtTrack setObject:displayname forKey:@"subtitleSourceTrackName"];
- /* Subtitle track forced state */
- [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackForced"];
- /* Subtitle track burned state */
- [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackBurned"];
- /* Subtitle track default state */
- [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackDefault"];
- /* Subtitle Source track canBeBurnedIn */
- [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleSourceTrackCanBeBurnedIn"];
- /* Subtitle Source track supportsForcedFlags */
- [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleSourceTrackSupportsForcedFlags"];
- 
- /* now the srt only info, Language, Chart Code and offset */
- [newSubtitleSrtTrack setObject:filePath forKey:@"subtitleSourceSrtFilePath"];
- [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:languagesArrayDefIndex] forKey:@"subtitleTrackSrtLanguageIndex"];
- [newSubtitleSrtTrack setObject:[[languagesArray objectAtIndex:languagesArrayDefIndex] objectAtIndex:0] forKey:@"subtitleTrackSrtLanguageLong"];
- [newSubtitleSrtTrack setObject:[[languagesArray objectAtIndex:languagesArrayDefIndex] objectAtIndex:1] forKey:@"subtitleTrackSrtLanguageIso3"];
- 
- [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:charCodeArrayDefIndex] forKey:@"subtitleTrackSrtCharCodeIndex"];
- [newSubtitleSrtTrack setObject:[charCodeArray objectAtIndex:charCodeArrayDefIndex] forKey:@"subtitleTrackSrtCharCode"];
- 
- [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackSrtOffset"];
- 
- 
- [subtitleArray addObject:newSubtitleSrtTrack];
- [newSubtitleSrtTrack release];
- 
- /* now add back the none track to the end of the array */
- [self addSubtitleTrack];
- 
- 
-}
-
-/* used to return the current subtitleArray to controller.m */
-- (NSMutableArray*) getSubtitleArray
-{
- return subtitleArray;
-}
-
-- (void)containerChanged:(int) newContainer
-{
- container = newContainer;
-}
-
-- (void)setNewSubtitles:(NSMutableArray*) newSubtitleArray
-{
- /* Note: we need to look for external subtitles so it can be added to the source array track.
- * Remember the source container subs are already loaded with resetTitle which is already called
- * so any external sub sources need to be added to our source subs here
- */
- 
- int i = 0;
- NSEnumerator *enumerator = [newSubtitleArray objectEnumerator];
- id tempObject;
- while ( tempObject = [enumerator nextObject] ) 
- {
- /* We have an srt track */
- if ([[tempObject objectForKey:@"subtitleSourceTrackType"] intValue] == SRTSUB)
- {
- NSString *filePath = [tempObject objectForKey:@"subtitleSourceSrtFilePath"];
- /* Start replicate the add new srt code above */
- /* Create a new entry for the subtitle source array so it shows up in our subtitle source list */
- NSString *displayname = [filePath lastPathComponent];// grok an appropriate display name from the srt subtitle */
- /* create a dictionary of source subtitle information to store in our array */
- NSMutableDictionary *newSubtitleSourceTrack = [[NSMutableDictionary alloc] init];
- /* Subtitle Source track popup index */
- [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:[subtitleSourceArray count]+1] forKey:@"sourceTrackNum"];
- /* Subtitle Source track name */
- [newSubtitleSourceTrack setObject:displayname forKey:@"sourceTrackName"];
- /* Subtitle Source track type (VobSub, Srt, etc.) */
- [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:SRTSUB] forKey:@"sourceTrackType"];
- [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:SRTSUB] forKey:@"subtitleSourceTrackType"];
- /* Subtitle Source file path */
- [newSubtitleSourceTrack setObject:filePath forKey:@"sourceSrtFilePath"];
- /* Subtitle Source track canBeBurnedIn */
- [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:0] forKey:@"sourceTrackCanBeBurnedIn"];
- /* Subtitle Source track supportsForcedFlags */
- [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:0] forKey:@"sourceTrackSupportsForcedFlags"];
- 
- [subtitleSourceArray addObject:newSubtitleSourceTrack];
- [newSubtitleSourceTrack autorelease];
- /* END replicate the add new srt code above */
- }
- i++;
- }
- 
- 
- /*Set the subtitleArray to the newSubtitleArray */
- [subtitleArray setArray:newSubtitleArray];
-}
- 
-#pragma mark -
-#pragma mark Subtitle Table Delegate Methods
-/* Table View delegate methods */
-/* Returns the number of tracks displayed
- * NOTE: we return one more than the actual number of tracks
- * specified as we always keep one track set to "None" which is ignored
- * for setting up tracks, but is used to add tracks.
- */
-- (int)numberOfRowsInTableView:(NSTableView *)aTableView
-{
- if( fTitle == NULL || ![subtitleArray count])
- {
- return 0;
- }
- else
- {
- return [subtitleArray count];
- }
-}
-
-/* Used to tell the Table view which information is to be displayed per item */
-- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
-{
- NSString *cellEntry = @"__DATA ERROR__";
- 
- /* we setup whats displayed given the column identifier */
- if ([[aTableColumn identifier] isEqualToString:@"track"])
- {
- /* 'track' is a popup of all available source subtitle tracks for the given title */
- NSPopUpButtonCell *cellTrackPopup = [[NSPopUpButtonCell alloc] init];
- [cellTrackPopup autorelease];
- /* Set the Popups properties */
- [cellTrackPopup setControlSize:NSSmallControlSize];
- [cellTrackPopup setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]]];
- 
- 
- /* Add our initial "None" track which we use to add source tracks or remove tracks.
- * "None" is always index 0.
- */
- [[cellTrackPopup menu] addItemWithTitle: @"None" action: NULL keyEquivalent: @""];
- 
- /* Foreign Audio Search (index 1 in the popup) is only available for the first track */
- if (rowIndex == 0)
- {
- // TODO: hide the track when no force-able subtitles are present in the source
- [[cellTrackPopup menu] addItemWithTitle:foreignAudioSearchTrackName
- action:NULL
- keyEquivalent:@""];
- }
- 
- int i;
- for(i = 0; i < [subtitleSourceArray count]; i++ )
- {
- [[cellTrackPopup menu] addItemWithTitle: [[subtitleSourceArray objectAtIndex:i] objectForKey: @"sourceTrackName"] action: NULL keyEquivalent: @""]; 
- }
- 
- 
- [aTableColumn setDataCell:cellTrackPopup];
- 
- }
- else if ([[aTableColumn identifier] isEqualToString:@"forced"])
- {
- /* 'forced' is a checkbox to determine if a given source track is only to be forced */
- NSButtonCell *cellForcedCheckBox = [[NSButtonCell alloc] init];
- [cellForcedCheckBox autorelease];
- [cellForcedCheckBox setButtonType:NSSwitchButton];
- [cellForcedCheckBox setImagePosition:NSImageOnly];
- [cellForcedCheckBox setAllowsMixedState:NO];
- [aTableColumn setDataCell:cellForcedCheckBox];
- 
- }
- else if ([[aTableColumn identifier] isEqualToString:@"burned"])
- {
- /* 'burned' is a checkbox to determine if a given source track is only to be burned */
- NSButtonCell *cellBurnedCheckBox = [[NSButtonCell alloc] init];
- [cellBurnedCheckBox autorelease];
- [cellBurnedCheckBox setButtonType:NSSwitchButton];
- [cellBurnedCheckBox setImagePosition:NSImageOnly];
- [cellBurnedCheckBox setAllowsMixedState:NO];
- [aTableColumn setDataCell:cellBurnedCheckBox];
- }
- else if ([[aTableColumn identifier] isEqualToString:@"default"])
- {
- NSButtonCell *cellDefaultCheckBox = [[NSButtonCell alloc] init];
- [cellDefaultCheckBox autorelease];
- [cellDefaultCheckBox setButtonType:NSSwitchButton];
- [cellDefaultCheckBox setImagePosition:NSImageOnly];
- [cellDefaultCheckBox setAllowsMixedState:NO];
- [aTableColumn setDataCell:cellDefaultCheckBox];
- }
- /* These next three columns only apply to srt's. they are disabled for source subs */
- else if ([[aTableColumn identifier] isEqualToString:@"srt_lang"])
- {
- /* 'srt_lang' is a popup of commonly used languages to be matched to the source srt file */
- NSPopUpButtonCell *cellSrtLangPopup = [[NSPopUpButtonCell alloc] init];
- [cellSrtLangPopup autorelease];
- /* Set the Popups properties */
- [cellSrtLangPopup setControlSize:NSSmallControlSize];
- [cellSrtLangPopup setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]]];
- /* list our languages as per the languagesArray */
- int i;
- for(i = 0; i < [languagesArray count]; i++ )
- {
- [[cellSrtLangPopup menu] addItemWithTitle: [[languagesArray objectAtIndex:i] objectAtIndex:0] action: NULL keyEquivalent: @""]; 
- }
- [aTableColumn setDataCell:cellSrtLangPopup]; 
- }
- else if ([[aTableColumn identifier] isEqualToString:@"srt_charcode"])
- {
- /* 'srt_charcode' is a popup of commonly used character codes to be matched to the source srt file */
- NSPopUpButtonCell *cellSrtCharCodePopup = [[NSPopUpButtonCell alloc] init];
- [cellSrtCharCodePopup autorelease];
- /* Set the Popups properties */
- [cellSrtCharCodePopup setControlSize:NSSmallControlSize];
- [cellSrtCharCodePopup setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]]];
- /* list our character codes, as per charCodeArray */
- 
- int i;
- for(i = 0; i < [charCodeArray count]; i++ )
- {
- [[cellSrtCharCodePopup menu] addItemWithTitle: [charCodeArray objectAtIndex:i] action: NULL keyEquivalent: @""]; 
- }
- [aTableColumn setDataCell:cellSrtCharCodePopup];
- 
- }
- else if ([[aTableColumn identifier] isEqualToString:@"srt_offset"])
- {
- if ([[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackSrtOffset"])
- {
- cellEntry = [NSString stringWithFormat:@"%d",[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackSrtOffset"] intValue]];
- }
- else
- {
- cellEntry = [NSString stringWithFormat:@"%d",0];
- }
- }
- else
- {
- cellEntry = nil; 
- }
- 
- return cellEntry;
-}
-
-/* Called whenever a widget in the table is edited or changed, we use it to record the change in the controlling array 
- * including removing and adding new tracks via the "None" ("track" index of 0) */
-- (void)tableView:(NSTableView *)aTableView setObjectValue:(id)anObject forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
-{
- 
- if ([[aTableColumn identifier] isEqualToString:@"track"])
- {
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:[anObject intValue]] forKey:@"subtitleSourceTrackNum"];
- /* Set the array to track if we are vobsub (picture sub) */
- if ([anObject intValue] != 0)
- {
- /* The first row has an additional track (Foreign Audio Search) */
- int sourceSubtitleIndex = [anObject intValue] - 1 - (rowIndex == 0);
- 
- if(rowIndex == 0 && [anObject intValue] == 1)
- {
- /*
- * we are foreign lang search, which is inherently bitmap
- *
- * since it can be either VOBSUB or PGS and the latter can't be
- * passed through to MP4, we need to know whether there are any
- * PGS tracks in the source - otherwise we can just set the
- * source track type to VOBSUB
- */
- int subtitleTrackType = VOBSUB;
- if ([foreignAudioSearchTrackName rangeOfString:
- [NSString stringWithUTF8String:
- hb_subsource_name(PGSSUB)]].location != NSNotFound)
- {
- subtitleTrackType = PGSSUB;
- }
- // now set the track type
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:subtitleTrackType] forKey:@"subtitleSourceTrackType"];
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:1] forKey:@"subtitleSourceTrackCanBeBurnedIn"];
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:1] forKey:@"subtitleSourceTrackSupportsForcedFlags"];
- // foreign lang search is most useful when combined w/Forced Only - make it default
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:1] forKey:@"subtitleTrackForced"];
- }
- /* check to see if we are an srt, in which case set our file path and source track type kvp's*/
- else if ([[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceTrackType"] intValue] == SRTSUB)
- {
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:SRTSUB]
- forKey:@"subtitleSourceTrackType"];
- [[subtitleArray objectAtIndex:rowIndex] setObject:[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceSrtFilePath"]
- forKey:@"subtitleSourceSrtFilePath"];
- }
- else
- {
- [[subtitleArray objectAtIndex:rowIndex] setObject:[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceTrackType"]
- forKey:@"subtitleSourceTrackType"];
- [[subtitleArray objectAtIndex:rowIndex] setObject:[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceTrackCanBeBurnedIn"]
- forKey:@"subtitleSourceTrackCanBeBurnedIn"];
- [[subtitleArray objectAtIndex:rowIndex] setObject:[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceTrackSupportsForcedFlags"]
- forKey:@"subtitleSourceTrackSupportsForcedFlags"];
- } 
- 
- if([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackCanBeBurnedIn"] intValue] == 0)
- {
- /* the source track cannot be burned in, so uncheck the widget */
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackBurned"];
- }
- 
- if([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackSupportsForcedFlags"] intValue] == 0)
- {
- /* the source track does not support forced flags, so uncheck the widget */
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackForced"];
- }
- }
- }
- else if ([[aTableColumn identifier] isEqualToString:@"forced"])
- {
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:[anObject intValue]] forKey:@"subtitleTrackForced"]; 
- }
- else if ([[aTableColumn identifier] isEqualToString:@"burned"])
- {
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:[anObject intValue]] forKey:@"subtitleTrackBurned"];
- if([anObject intValue] == 1)
- {
- /* Burned In and Default are mutually exclusive */
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackDefault"];
- }
- /* now we need to make sure no other tracks are set to burned if we have set burned */
- if ([anObject intValue] == 1)
- {
- int i = 0;
- NSEnumerator *enumerator = [subtitleArray objectEnumerator];
- id tempObject;
- while ( tempObject = [enumerator nextObject] ) 
- {
- if (i != rowIndex )
- {
- [tempObject setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackBurned"];
- }
- i++;
- }
- }
- }
- else if ([[aTableColumn identifier] isEqualToString:@"default"])
- {
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:[anObject intValue]] forKey:@"subtitleTrackDefault"];
- if([anObject intValue] == 1)
- {
- /* Burned In and Default are mutually exclusive */
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackBurned"];
- } 
- /* now we need to make sure no other tracks are set to default */
- if ([anObject intValue] == 1)
- {
- int i = 0;
- NSEnumerator *enumerator = [subtitleArray objectEnumerator];
- id tempObject;
- while ( tempObject = [enumerator nextObject] ) 
- {
- if (i != rowIndex)
- {
- [tempObject setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackDefault"];
- }
- i++;
- }
- }
- 
- }
- /* These next three columns only apply to srt's. they are disabled for source subs */
- else if ([[aTableColumn identifier] isEqualToString:@"srt_lang"])
- {
- 
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:[anObject intValue]] forKey:@"subtitleTrackSrtLanguageIndex"];
- [[subtitleArray objectAtIndex:rowIndex] setObject:[[languagesArray objectAtIndex:[anObject intValue]] objectAtIndex:0] forKey:@"subtitleTrackSrtLanguageLong"];
- [[subtitleArray objectAtIndex:rowIndex] setObject:[[languagesArray objectAtIndex:[anObject intValue]] objectAtIndex:1] forKey:@"subtitleTrackSrtLanguageIso3"];
- 
- }
- else if ([[aTableColumn identifier] isEqualToString:@"srt_charcode"])
- {
- /* charCodeArray */
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:[anObject intValue]] forKey:@"subtitleTrackSrtCharCodeIndex"];
- [[subtitleArray objectAtIndex:rowIndex] setObject:[charCodeArray objectAtIndex:[anObject intValue]] forKey:@"subtitleTrackSrtCharCode"];
- }
- else if ([[aTableColumn identifier] isEqualToString:@"srt_offset"])
- {
- [[subtitleArray objectAtIndex:rowIndex] setObject:anObject forKey:@"subtitleTrackSrtOffset"]; 
- } 
- 
- 
- /* now lets do a bit of logic to add / remove tracks as necessary via the "None" track (index 0) */
- if ([[aTableColumn identifier] isEqualToString:@"track"])
- {
- 
- /* Since currently no quicktime based playback devices support soft vobsubs in mp4, we make sure "burned in" is specified
- * by default to avoid massive confusion and anarchy. However we also want to guard against multiple burned in subtitle tracks
- * as libhb would ignore all but the first one anyway. Plus it would probably be stupid. 
- */
- if (container == HB_MUX_MP4 && [anObject intValue] != 0)
- {
- if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] intValue] == VOBSUB)
- {
- /* lets see if there are currently any burned in subs specified */
- NSEnumerator *enumerator = [subtitleArray objectEnumerator];
- id tempObject;
- BOOL subtrackBurnedInFound = NO;
- while ( tempObject = [enumerator nextObject] ) 
- {
- if ([[tempObject objectForKey:@"subtitleTrackBurned"] intValue] == 1)
- {
- subtrackBurnedInFound = YES;
- }
- }
- /* if we have no current vobsub set to burn it in ... burn it in by default */
- if (!subtrackBurnedInFound)
- {
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:1] forKey:@"subtitleTrackBurned"];
- /* Burned In and Default are mutually exclusive */
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackDefault"];
- }
- }
- }
- 
- /* We use the track popup index number (presumes index 0 is "None" which is ignored and only used to remove tracks if need be)
- * to determine whether to 1 modify an existing track, 2. add a new empty "None" track or 3. remove an existing track.
- */
- 
- if ([anObject intValue] != 0 && rowIndex == [subtitleArray count] - 1) // if we have a last track which != "None"
- {
- /* add a new empty None track */
- [self addSubtitleTrack];
- 
- }
- else if ([anObject intValue] == 0 && rowIndex != ([subtitleArray count] -1))// if this track is set to "None" and not the last track displayed
- {
- /* we know the user chose to remove this track by setting it to None, so remove it from the array */
- /* However,if this is the first track we have to reset the selected index of the next track by + 1, since it will now become
- * the first track, which has to account for the extra "Foreign Language Search" index. */
- if (rowIndex == 0 && [[[subtitleArray objectAtIndex: 1] objectForKey: @"subtitleSourceTrackNum"] intValue] != 0)
- {
- /* get the index of the selection in row one (which is track two) */
- int trackOneSelectedIndex = [[[subtitleArray objectAtIndex: 1] objectForKey: @"subtitleSourceTrackNum"] intValue];
- /* increment the index of the subtitle menu item by one, to account for Foreign Language Search which is unique to the first track */
- [[subtitleArray objectAtIndex: 1] setObject:[NSNumber numberWithInt:trackOneSelectedIndex + 1] forKey:@"subtitleSourceTrackNum"];
- }
- /* now that we have made the adjustment for track one (index 0) go ahead and delete the track */
- [subtitleArray removeObjectAtIndex: rowIndex]; 
- }
- 
- 
- 
- }
- 
- [aTableView reloadData];
-}
-
-
-/* Gives fine grained control over the final drawing of the widget, including widget status via the controlling array */
-- (void)tableView:(NSTableView *)aTableView willDisplayCell:(id)aCell forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
-{
- /* we setup whats displayed given the column identifier */
- if ([[aTableColumn identifier] isEqualToString:@"track"])
- {
- /* Set the index of the recorded source track here */
- [aCell selectItemAtIndex:[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackNum"] intValue]];
- /* now that we have actually selected our track, we can grok the titleOfSelectedItem for that track */
- [[subtitleArray objectAtIndex:rowIndex] setObject:[[aTableColumn dataCellForRow:rowIndex] titleOfSelectedItem] forKey:@"subtitleSourceTrackName"];
- 
- }
- else
- {
- 
- [aCell setAlignment:NSCenterTextAlignment];
- /* If the Track is None, we disable the other cells as None is an empty track */
- if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackNum"] intValue] == 0)
- {
- [aCell setState:0];
- [aCell setEnabled:NO];
- }
- else
- {
- /* Since we have a valid track, we go ahead and enable the rest of the widgets and set them according to the controlling array */
- [aCell setEnabled:YES];
- }
- 
- if ([[aTableColumn identifier] isEqualToString:@"forced"])
- {
- [aCell setState:[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackForced"] intValue]];
- /* Disable the "Forced Only" checkbox if a) the track is "None" or b) the subtitle track doesn't support forced flags */
- if (![[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackNum"] intValue] ||
- ![[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackSupportsForcedFlags"] intValue])
- {
- [aCell setEnabled:NO];
- }
- else
- {
- [aCell setEnabled:YES];
- }
- }
- else if ([[aTableColumn identifier] isEqualToString:@"burned"])
- {
- [aCell setState:[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackBurned"] intValue]];
- /*
- * Disable the "Burned In" checkbox if:
- * a) the track is "None" OR
- * b) the subtitle track can't be burned in OR
- * c) the subtitle track can't be passed through (e.g. PGS w/MP4)
- */
- if (![[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackNum"] intValue] ||
- ![[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackCanBeBurnedIn"] intValue] ||
- !hb_subtitle_can_pass([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] intValue], container))
- {
- [aCell setEnabled:NO];
- }
- else
- {
- [aCell setEnabled:YES];
- }
- }
- else if ([[aTableColumn identifier] isEqualToString:@"default"])
- {
- /*
- * Disable the "Default" checkbox if:
- * a) the track is "None" OR
- * b) the subtitle track can't be passed through (e.g. PGS w/MP4)
- */
- if (![[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackNum"] intValue] ||
- !hb_subtitle_can_pass([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] intValue], container))
- {
- [aCell setState:NSOffState];
- [aCell setEnabled:NO];
- }
- else
- {
- [aCell setState:[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackDefault"] intValue]];
- [aCell setEnabled:YES];
- }
- }
- /* These next three columns only apply to srt's. they are disabled for source subs */
- else if ([[aTableColumn identifier] isEqualToString:@"srt_lang"])
- {
- /* We have an srt file so set the track type (Source or SRT, and the srt file path ) kvp's*/
- if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] intValue] == SRTSUB)
- {
- [aCell setEnabled:YES];
- if([[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackSrtLanguageIndex"])
- {
- [aCell selectItemAtIndex:[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackSrtLanguageIndex"] intValue]];
- }
- else
- {
- [aCell selectItemAtIndex:languagesArrayDefIndex]; // English
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:languagesArrayDefIndex] forKey:@"subtitleTrackSrtLanguageIndex"];
- [[subtitleArray objectAtIndex:rowIndex] setObject:[[languagesArray objectAtIndex:languagesArrayDefIndex] objectAtIndex:0] forKey:@"subtitleTrackSrtLanguageLong"];
- [[subtitleArray objectAtIndex:rowIndex] setObject:[[languagesArray objectAtIndex:languagesArrayDefIndex] objectAtIndex:1] forKey:@"subtitleTrackSrtLanguageIso3"];
- 
- }
- }
- else
- {
- [aCell setEnabled:NO];
- } 
- }
- else if ([[aTableColumn identifier] isEqualToString:@"srt_charcode"])
- {
- /* We have an srt file so set the track type (Source or SRT, and the srt file path ) kvp's*/
- if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] intValue] == SRTSUB)
- {
- [aCell setEnabled:YES];
- if ([[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackSrtCharCodeIndex"])
- {
- [aCell selectItemAtIndex:[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackSrtCharCodeIndex"] intValue]];
- }
- else
- {
- [aCell selectItemAtIndex:charCodeArrayDefIndex]; // ISO-8859-1
- [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:charCodeArrayDefIndex] forKey:@"subtitleTrackSrtCharCodeIndex"];
- [[subtitleArray objectAtIndex:rowIndex] setObject:[charCodeArray objectAtIndex:charCodeArrayDefIndex] forKey:@"subtitleTrackSrtCharCode"];
- }
- }
- else
- {
- [aCell setEnabled:NO];
- } 
- }
- else if ([[aTableColumn identifier] isEqualToString:@"srt_offset"])
- {
- if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackType"] intValue] == SRTSUB)
- {
- [aCell setEnabled:YES];
- }
- else
- {
- [aCell setEnabled:NO];
- }
- }
- 
- /*
- * Let's check whether any subtitles in the list cannot be passed through.
- * Set the first of any such subtitles to burned-in, remove the others.
- */
- id tempObject;
- int subtitleTrackType;
- BOOL convertToBurnInUsed = NO;
- NSMutableArray *tracksToDelete = [[NSMutableArray alloc] init];
- NSEnumerator *enumerator = [subtitleArray objectEnumerator];
- /* convert any non-None incompatible tracks to burn-in or remove them */
- while ((tempObject = [enumerator nextObject]) &&
- [tempObject objectForKey:@"subtitleSourceTrackType"])
- {
- subtitleTrackType = [[tempObject objectForKey:@"subtitleSourceTrackType"] intValue];
- if (!hb_subtitle_can_pass(subtitleTrackType, container))
- {
- if (convertToBurnInUsed == NO)
- {
- /* we haven't set any track to burned-in yet, so we can */
- [tempObject setObject:[NSNumber numberWithInt:1] forKey:@"subtitleTrackBurned"];
- convertToBurnInUsed = YES; //remove any additional tracks
- }
- else
- {
- /* we already have a burned-in track, we must remove others */
- [tracksToDelete addObject:tempObject];
- }
- }
- }
- /* if we converted a track to burned-in, unset it for tracks that support passthru */
- if (convertToBurnInUsed == YES)
- {
- enumerator = [subtitleArray objectEnumerator];
- while ((tempObject = [enumerator nextObject]) &&
- [tempObject objectForKey:@"subtitleSourceTrackType"])
- {
- subtitleTrackType = [[tempObject objectForKey:@"subtitleSourceTrackType"] intValue];
- if (hb_subtitle_can_pass(subtitleTrackType, container))
- {
- [tempObject setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackBurned"];
- }
- }
- }
- /* this is where the actual removal takes place */
- if ([tracksToDelete count] > 0)
- {
- [subtitleArray removeObjectsInArray:tracksToDelete];
- [aTableView reloadData];
- /* this must be called after reloadData so as to not block the UI */
- [[NSAlert alertWithMessageText:@"Subtitle tack(s) removed"
- defaultButton:@"OK"
- alternateButton:nil
- otherButton:nil
- informativeTextWithFormat:@"%d subtitle %@ could neither be converted to burn-in nor passed through",
- [tracksToDelete count],
- [tracksToDelete count] > 1 ? @"tracks" : @"track"] runModal];
- }
- [tracksToDelete release];
- }
-}
-
-
-@end

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/ASUserSettingConstants.cs Deleted

@@ -1,92 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ASUserSettingConstants.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The User Setting Constants
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices
-{
- /// <summary>
- /// Constants for the User Settings Service
- /// </summary>
- public class ASUserSettingConstants
- {
- /// <summary>
- /// The Verbosity
- /// </summary>
- public const string Verbosity = "Verbosity";
-
- /// <summary>
- /// When Complete Action
- /// </summary>
- public const string WhenCompleteAction = "WhenCompleteAction";
-
- /// <summary>
- /// Process Priority
- /// </summary>
- public const string ProcessPriority = "ProcessPriority";
-
- /// <summary>
- /// Prevent Sleep
- /// </summary>
- public const string PreventSleep = "PreventSleep";
-
- /// <summary>
- /// Save Log Directory
- /// </summary>
- public const string SaveLogToCopyDirectory = "SaveLogToCopyDirectory";
-
- /// <summary>
- /// Save log with video
- /// </summary>
- public const string SaveLogWithVideo = "SaveLogWithVideo";
-
- /// <summary>
- /// Save copy of the log to a directory
- /// </summary>
- public const string SaveLogCopyDirectory = "SaveLogCopyDirectory";
-
- /// <summary>
- /// HandBrakes build
- /// </summary>
- public const string HandBrakeBuild = "HandBrakeBuild";
-
- /// <summary>
- /// Disable Libdvdnav
- /// </summary>
- public const string DisableLibDvdNav = "DisableLibDvdNav";
-
- /// <summary>
- /// Send file enabled.
- /// </summary>
- public const string SendFile = "SendFile";
-
- /// <summary>
- /// Send file to application path
- /// </summary>
- public const string SendFileTo = "SendFileTo";
-
- /// <summary>
- /// Send file to arguments
- /// </summary>
- public const string SendFileToArgs = "SendFileToArgs";
-
- /// <summary>
- /// Min Title Scan Duration
- /// </summary>
- public const string MinScanDuration = "MinTitleScanDuration";
-
- /// <summary>
- /// Preview Scan Count
- /// </summary>
- public const string PreviewScanCount = "previewScanCount";
-
- /// <summary>
- /// Clear completed items from the queue automatically.
- /// </summary>
- public const string ClearCompletedFromQueue = "ClearCompletedFromQueue";
- }
-}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Isolation/IsolatedScanService.cs Deleted

@@ -1,216 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IsolatedScanService.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Isolated Scan Service
-// This is an implementation of the IScan implementation that runs scans on a seperate process
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Isolation
-{
- using System;
- using System.Threading;
-
- using HandBrake.ApplicationServices.EventArgs;
- using HandBrake.ApplicationServices.Exceptions;
- using HandBrake.ApplicationServices.Parsing;
- using HandBrake.ApplicationServices.Services.Interfaces;
-
- /// <summary>
- /// Isolated Scan Service. 
- /// This is an implementation of the IScan implementation that runs scans on a seperate process
- /// </summary>
- public class IsolatedScanService : BackgroundServiceConnector, IScan
- {
- #region Constants and Fields
-
- /// <summary>
- /// The post action.
- /// </summary>
- private Action<bool> postScanAction;
-
- #endregion
-
- #region Events
-
- /// <summary>
- /// The scan completed.
- /// </summary>
- public event ScanCompletedStatus ScanCompleted;
-
- /// <summary>
- /// The scan stared.
- /// </summary>
- public event EventHandler ScanStared;
-
- /// <summary>
- /// The scan status changed.
- /// </summary>
- public event ScanProgessStatus ScanStatusChanged;
-
- #endregion
-
- /// <summary>
- /// Initializes a new instance of the <see cref="IsolatedScanService"/> class.
- /// </summary>
- /// <param name="port">
- /// The port.
- /// </param>
- public IsolatedScanService(string port)
- {
- try
- {
- if (this.CanConnect())
- {
- this.Connect(port);
- }
- }
- catch (Exception exception)
- {
- throw new GeneralApplicationException("Unable to connect to scan worker process.", "Try restarting HandBrake", exception);
- }
- }
-
- #region Properties
-
- /// <summary>
- /// Gets ActivityLog.
- /// </summary>
- public string ActivityLog
- {
- get
- {
- return this.Service.ScanActivityLog;
- }
- }
-
- /// <summary>
- /// Gets a value indicating whether IsScanning.
- /// </summary>
- public bool IsScanning
- {
- get
- {
- return this.Service.IsScanning;
- }
- }
-
- /// <summary>
- /// Gets the Souce Data.
- /// </summary>
- public Source SouceData
- {
- get
- {
- return this.Service.SouceData;
- }
- }
-
- #endregion
-
- #region Public Methods
-
- /// <summary>
- /// The scan completed callback.
- /// </summary>
- /// <param name="eventArgs">
- /// The event args.
- /// </param>
- public override void ScanCompletedCallback(ScanCompletedEventArgs eventArgs)
- {
- if (this.postScanAction != null)
- {
- this.postScanAction(true);
- }
-
- if (this.ScanCompleted != null)
- {
- ThreadPool.QueueUserWorkItem(delegate { this.ScanCompleted(this, eventArgs); }); 
- }
-
- base.ScanCompletedCallback(eventArgs);
- }
-
- /// <summary>
- /// The scan progress callback.
- /// </summary>
- /// <param name="eventArgs">
- /// The event args.
- /// </param>
- public override void ScanProgressCallback(ScanProgressEventArgs eventArgs)
- {
- if (this.ScanStatusChanged != null)
- {
- ThreadPool.QueueUserWorkItem(delegate { this.ScanStatusChanged(this, eventArgs); }); 
- }
-
- base.ScanProgressCallback(eventArgs);
- }
-
- /// <summary>
- /// The scan started callback.
- /// </summary>
- public override void ScanStartedCallback()
- {
- if (this.ScanStared != null)
- {
- ThreadPool.QueueUserWorkItem(delegate { this.ScanStared(this, EventArgs.Empty); });
- }
-
- base.ScanStartedCallback();
- }
-
- #endregion
-
- #region Implemented Interfaces
-
- #region IScan
-
- /// <summary>
- /// Take a Scan Log file, and process it as if it were from the CLI.
- /// </summary>
- /// <param name="path">
- /// The path to the log file.
- /// </param>
- public void DebugScanLog(string path)
- {
- throw new NotImplementedException("Not available in process isolation mode!");
- }
-
- /// <summary>
- /// Scan a Source Path.
- /// Title 0: scan all
- /// </summary>
- /// <param name="sourcePath">
- /// Path to the file to scan
- /// </param>
- /// <param name="title">
- /// int title number. 0 for scan all
- /// </param>
- /// <param name="previewCount">
- /// The preview Count.
- /// </param>
- /// <param name="postAction">
- /// The post Action.
- /// </param>
- public void Scan(string sourcePath, int title, int previewCount, Action<bool> postAction)
- {
- this.postScanAction = postAction;
- this.Service.ScanSource(sourcePath, title, previewCount);
- }
-
- /// <summary>
- /// Kill the scan
- /// </summary>
- public void Stop()
- {
- this.Service.StopScan();
- }
-
- #endregion
-
- #endregion
- }
-}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/AudioHelper.cs Deleted

@@ -1,95 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AudioHelper.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// An Audio Helper Class
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Parsing
-{
- using System.Collections.Generic;
- using System.IO;
- using System.Text.RegularExpressions;
-
- /// <summary>
- /// An Audio Helper Class
- /// </summary>
- public class AudioHelper
- {
- /// <summary>
- /// Gets A Dummy Not Found Track
- /// </summary>
- public static Audio NoneFound
- {
- get
- {
- return new Audio { Description = "None Found" };
- }
- }
-
- /// <summary>
- /// Parse the CLI input to an Audio Track object
- /// </summary>
- /// <param name="output">
- /// The output.
- /// </param>
- /// <returns>
- /// An Audio Track obkect
- /// </returns>
- public static Audio Parse(StringReader output)
- {
- string audioTrack = output.ReadLine();
- Match m = Regex.Match(audioTrack, @"^ \+ ([0-9]*), ([A-Za-z0-9,\s]*) $(.*)$ $(.*)$");
- Match track = Regex.Match(audioTrack, @"^ \+ ([0-9]*), ([A-Za-z0-9,\s]*) $(.*)$"); // ID and Language
- Match iso639_2 = Regex.Match(audioTrack, @"iso639-2: ([a-zA-Z]*)\)");
- Match samplerate = Regex.Match(audioTrack, @"([0-9]*)Hz");
- Match bitrate = Regex.Match(audioTrack, @"([0-9]*)bps");
-
- string subformat = m.Groups[4].Value.Trim().Contains("iso639") ? null : m.Groups[4].Value;
- string samplerateVal = samplerate.Success ? samplerate.Groups[0].Value.Replace("Hz", string.Empty).Trim() : "0";
- string bitrateVal = bitrate.Success ? bitrate.Groups[0].Value.Replace("bps", string.Empty).Trim() : "0";
-
- if (track.Success)
- {
- Audio thisTrack = new Audio
- {
- TrackNumber = int.Parse(track.Groups[1].Value.Trim()),
- Language = track.Groups[2].Value,
- Format = m.Groups[3].Value,
- Description = subformat,
- SampleRate = int.Parse(samplerateVal),
- Bitrate = int.Parse(bitrateVal),
- LanguageCode = iso639_2.Value.Replace("iso639-2: ", string.Empty).Replace(")", string.Empty)
- };
- return thisTrack;
- }
-
- return null;
- }
-
- /// <summary>
- /// Pase a list of audio tracks
- /// </summary>
- /// <param name="output">
- /// The output.
- /// </param>
- /// <returns>
- /// An array of audio tracks
- /// </returns>
- public static Audio[] ParseList(StringReader output)
- {
- var tracks = new List<Audio>();
- while (true)
- {
- Audio thisTrack = Parse(output);
- if (thisTrack != null)
- tracks.Add(thisTrack);
- else
- break;
- }
- return tracks.ToArray();
- }
- }
-}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Parser.cs Deleted

@@ -1,134 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Parser.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// A delegate to handle custom events regarding data being parsed from the buffer
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Parsing
-{
- using System;
- using System.Globalization;
- using System.IO;
- using System.Text;
- using System.Text.RegularExpressions;
-
- /// <summary>
- /// A delegate to handle custom events regarding data being parsed from the buffer
- /// </summary>
- /// <param name="sender">The object which raised this delegate</param>
- /// <param name="data">The data parsed from the stream</param>
- public delegate void DataReadEventHandler(object sender, string data);
-
- /// <summary>
- /// A delegate to handle events regarding progress during DVD scanning
- /// </summary>
- /// <param name="sender">The object who's raising the event</param>
- /// <param name="currentTitle">The title number currently being processed</param>
- /// <param name="titleCount">The total number of titiles to be processed</param>
- /// <param name="percentage">Percentage complete.</param>
- public delegate void ScanProgressEventHandler(object sender, int currentTitle, int titleCount, decimal percentage);
-
- /// <summary>
- /// A delegate to handle encode progress updates // EXPERIMENTAL
- /// </summary>
- /// <param name="sender">The object which raised the event</param>
- /// <param name="currentTask">The current task being processed from the queue</param>
- /// <param name="taskCount">The total number of tasks in queue</param>
- /// <param name="percentComplete">The percentage this task is complete</param>
- /// <param name="currentFps">The current encoding fps</param>
- /// <param name="averageFps">The average encoding fps for this task</param>
- /// <param name="timeRemaining">The estimated time remaining for this task to complete</param>
- public delegate void EncodeProgressEventHandler(object sender, int currentTask, int taskCount, float percentComplete, float currentFps, float averageFps, string timeRemaining);
-
- /// <summary>
- /// A simple wrapper around a StreamReader to keep track of the entire output from a cli process
- /// </summary>
- public class Parser : StreamReader
- {
- /// <summary>
- /// The Buffer StringBuilder
- /// </summary>
- private readonly StringBuilder buffer = new StringBuilder(string.Empty);
-
- /// <summary>
- /// Initializes a new instance of the <see cref="Parser"/> class. 
- /// Default constructor for this object
- /// </summary>
- /// <param name="baseStream">
- /// The stream to parse from
- /// </param>
- public Parser(Stream baseStream) : base(baseStream, Encoding.Default)
- {
- }
-
- /// <summary>
- /// Raised upon a new line being read from stdout/stderr
- /// </summary>
- public event DataReadEventHandler OnReadLine;
-
- /// <summary>
- /// Raised upon the entire stdout/stderr stream being read in a single call
- /// </summary>
- public event DataReadEventHandler OnReadToEnd;
-
- /// <summary>
- /// Raised upon the catching of a "Scanning title # of #..." in the stream
- /// </summary>
- public event ScanProgressEventHandler OnScanProgress;
-
-
- /// <summary>
- /// Gets the buffer of data that came from the CLI standard input/error
- /// </summary>
- public StringBuilder Buffer
- {
- get { return buffer; }
- }
-
- /// <summary>
- /// Read a line from standard in/err
- /// </summary>
- /// <returns>
- /// The read line
- /// </returns>
- public override string ReadLine()
- {
- string tmp = base.ReadLine();
-
- Match m = null;
- if (tmp != null && tmp.Contains("Scanning title"))
- m = Regex.Match(tmp, "^Scanning title ([0-9]*) of ([0-9]*)([a-z0-9 ,]*), ([0-9.]*)");
- else if (!string.IsNullOrEmpty(tmp))
- buffer.Append(tmp + Environment.NewLine);
-
- if (OnReadLine != null)
- OnReadLine(this, tmp);
-
- if (m != null)
- if (m.Success && OnScanProgress != null)
- OnScanProgress(this, int.Parse(m.Groups[1].Value), int.Parse(m.Groups[2].Value), decimal.Parse(m.Groups[4].Value, CultureInfo.InvariantCulture));
-
- return tmp;
- }
-
- /// <summary>
- /// Read to the end of the input stream
- /// </summary>
- /// <returns>
- /// A string of the input data
- /// </returns>
- public override string ReadToEnd()
- {
- string tmp = base.ReadToEnd();
-
- buffer.Append(tmp + Environment.NewLine);
- if (OnReadToEnd != null)
- OnReadToEnd(this, tmp);
-
- return tmp;
- }
- }
-}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IScanServiceWrapper.cs Deleted

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IUserSettingService.cs Deleted

@@ -1,71 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IUserSettingService.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The User Setting Service Interace.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Services.Interfaces
-{
- using HandBrake.ApplicationServices.EventArgs;
-
- /// <summary>
- /// The setting event handler.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
- public delegate void SettingEventHandler(object sender, SettingChangedEventArgs e);
-
- /// <summary>
- /// The User Setting Service Interace.
- /// </summary>
- public interface IUserSettingService
- {
- /// <summary>
- /// The setting changed.
- /// </summary>
- event SettingEventHandler SettingChanged;
-
- /// <summary>
- /// Set the specified user setting.
- /// </summary>
- /// <param name="name">
- /// Name of the property
- /// </param>
- /// <param name="value">
- /// The value to store.
- /// </param>
- void SetUserSetting(string name, object value);
-
- /// <summary>
- /// Get user setting for a given key.
- /// </summary>
- /// <param name="name">
- /// The name.
- /// </param>
- /// <typeparam name="T">
- /// The Type of the setting
- /// </typeparam>
- /// <returns>
- /// The user setting
- /// </returns>
- T GetUserSetting<T>(string name);
-
- /// <summary>
- /// Get an StringCollection type user setting
- /// </summary>
- /// <param name="name">
- /// The setting name
- /// </param>
- /// <returns>
- /// The settings value
- /// </returns>
- System.Collections.Specialized.StringCollection GetUserSettingStringCollection(string name);
- }
-}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/ScanService.cs Deleted

@@ -1,389 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ScanService.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Scan a Source
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Services
-{
- using System;
- using System.Diagnostics;
- using System.IO;
- using System.Text;
- using System.Threading;
- using System.Windows.Forms;
-
- using HandBrake.ApplicationServices.EventArgs;
- using HandBrake.ApplicationServices.Exceptions;
- using HandBrake.ApplicationServices.Parsing;
- using HandBrake.ApplicationServices.Services.Interfaces;
- using HandBrake.ApplicationServices.Utilities;
-
- using Parser = HandBrake.ApplicationServices.Parsing.Parser;
-
- /// <summary>
- /// Scan a Source
- /// </summary>
- public class ScanService : IScan
- {
- #region Private Variables
-
- /// <summary>
- /// The User Setting Service
- /// </summary>
- private readonly IUserSettingService userSettingService;
-
- /// <summary>
- /// The Log File Header
- /// </summary>
- private readonly StringBuilder header;
-
- /// <summary>
- /// The CLI data parser
- /// </summary>
- private Parser readData;
-
- /// <summary>
- /// The Log Buffer
- /// </summary>
- private StringBuilder logBuffer;
-
- /// <summary>
- /// The Process belonging to the CLI
- /// </summary>
- private Process hbProc;
-
- /// <summary>
- /// The stop scan.
- /// </summary>
- private bool cancelScan;
-
- #endregion
-
- /// <summary>
- /// Initializes a new instance of the <see cref="ScanService"/> class.
- /// </summary>
- /// <param name="userSettingService">
- /// The user Setting Service.
- /// </param>
- public ScanService(IUserSettingService userSettingService)
- {
- this.userSettingService = userSettingService;
- this.logBuffer = new StringBuilder();
-
- header = GeneralUtilities.CreateCliLogHeader();
- }
-
- #region Events
-
- /// <summary>
- /// Scan has Started
- /// </summary>
- public event EventHandler ScanStared;
-
- /// <summary>
- /// Scan has completed
- /// </summary>
- public event ScanCompletedStatus ScanCompleted;
-
- /// <summary>
- /// Encode process has progressed
- /// </summary>
- public event ScanProgessStatus ScanStatusChanged;
-
- #endregion
-
- #region Public Properties
-
- /// <summary>
- /// Gets a value indicating whether IsScanning.
- /// </summary>
- public bool IsScanning { get; private set; }
-
- /// <summary>
- /// Gets the Souce Data.
- /// </summary>
- public Source SouceData { get; private set; }
-
- /// <summary>
- /// Gets ActivityLog.
- /// </summary>
- public string ActivityLog
- {
- get
- {
- string noLog = "No log data available... Log data will show here after you scan a source. \n\nOpen the log file directory to get previous log files.";
- return string.IsNullOrEmpty(this.logBuffer.ToString()) ? this.header + noLog : this.header + this.logBuffer.ToString();
- }
- }
-
- #endregion
-
- #region Public Methods
-
- /// <summary>
- /// Scan a Source Path.
- /// Title 0: scan all
- /// </summary>
- /// <param name="sourcePath">
- /// Path to the file to scan
- /// </param>
- /// <param name="title">
- /// int title number. 0 for scan all
- /// </param>
- /// <param name="previewCount">
- /// The preview Count.
- /// </param>
- /// <param name="postScanAction">
- /// The post Scan Action.
- /// </param>
- public void Scan(string sourcePath, int title, int previewCount, Action<bool> postScanAction)
- {
- Thread t = new Thread(unused => this.ScanSource(sourcePath, title, previewCount, postScanAction));
- t.Start();
- }
-
- /// <summary>
- /// Kill the scan
- /// </summary>
- public void Stop()
- {
- try
- {
- // Try to clean things up as best as possible.
- if (this.readData != null)
- {
- this.readData.OnScanProgress -= this.OnScanProgress;
- }
-
- cancelScan = true;
-
- if (this.hbProc != null && !this.hbProc.HasExited)
- {
- this.hbProc.Kill();
- }
- }
- catch
- {
- // We don't really need to notify the user of any errors here.
- }
- }
-
- /// <summary>
- /// Take a Scan Log file, and process it as if it were from the CLI.
- /// </summary>
- /// <param name="path">
- /// The path to the log file.
- /// </param>
- public void DebugScanLog(string path)
- {
- try
- {
- StreamReader parseLog = new StreamReader(path);
- this.readData = new Parser(parseLog.BaseStream);
- this.SouceData = Source.Parse(this.readData, this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav));
- this.SouceData.ScanPath = path;
-
- if (this.ScanCompleted != null)
- {
- this.ScanCompleted(this, new ScanCompletedEventArgs(false, null, string.Empty));
- }
- }
- catch (Exception e)
- {
- throw new GeneralApplicationException("Debug Run Failed", string.Empty, e);
- }
- }
-
- /// <summary>
- /// Shutdown the service.
- /// </summary>
- public void Shutdown()
- {
- // Nothing to do for this implementation.
- }
-
- #endregion
-
- #region Private Methods
-
- /// <summary>
- /// Start a scan for a given source path and title
- /// </summary>
- /// <param name="sourcePath">
- /// Path to the source file
- /// </param>
- /// <param name="title">
- /// the title number to look at
- /// </param>
- /// <param name="previewCount">
- /// The preview Count.
- /// </param>
- /// <param name="postScanAction">
- /// The post Scan Action. Disables the Scan Completed Event
- /// </param>
- private void ScanSource(object sourcePath, int title, int previewCount, Action<bool> postScanAction)
- {
- try
- {
- this.IsScanning = true;
- this.cancelScan = false;
-
- if (this.ScanStared != null)
- {
- this.ScanStared(this, new EventArgs());
- }
-
- this.logBuffer = new StringBuilder();
-
- string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe");
- string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) +
- "\\HandBrake\\logs";
- string dvdInfoPath = Path.Combine(
- logDir,
- string.Format("last_scan_log{0}.txt", GeneralUtilities.ProcessId));
-
- if (!Directory.Exists(logDir))
- {
- Directory.CreateDirectory(logDir);
- }
-
- // Make we don't pick up a stale last_encode_log.txt (and that we have rights to the file)
- if (File.Exists(dvdInfoPath))
- {
- File.Delete(dvdInfoPath);
- }
-
- string extraArguments = string.Empty;
-
- if (previewCount != 10)
- {
- extraArguments += " --previews " + previewCount;
- }
-
- if (this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav))
- {
- extraArguments += " --no-dvdnav";
- }
-
- extraArguments += string.Format(" --min-duration={0}", this.userSettingService.GetUserSetting<int>(ASUserSettingConstants.MinScanDuration));
-
- if (title > 0)
- {
- extraArguments += " --scan ";
- }
-
- // Quick fix for "F:\\" style paths. We need \\\\ (Escaped \ twice)
- string source = sourcePath.ToString().EndsWith("\\") ? string.Format("\"{0}\\\\\"", sourcePath.ToString().TrimEnd('\\'))
- : "\"" + sourcePath + "\"";
- string query = string.Format(@" -i {0} -t{1} {2} -v ", source, title, extraArguments);
-
- this.hbProc = new Process
- {
- StartInfo =
- {
- FileName = handbrakeCLIPath,
- Arguments = string.Format(@" -i {0} -t{1} {2} -v ", source, title, extraArguments),
- RedirectStandardOutput = true,
- RedirectStandardError = true,
- UseShellExecute = false,
- CreateNoWindow = true
- }
- };
-
- // Start the Scan
- this.hbProc.Start();
-
- this.readData = new Parser(this.hbProc.StandardError.BaseStream);
- this.readData.OnScanProgress += this.OnScanProgress;
- this.SouceData = Source.Parse(this.readData, this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav));
- this.SouceData.ScanPath = (string)sourcePath;
-
- // Write the Buffer out to file.
- using (StreamWriter scanLog = new StreamWriter(dvdInfoPath))
- {
- // Only write the log file to disk if it's less than 50MB.
- if (this.readData.Buffer.Length < 50000000)
- {
- scanLog.WriteLine(header);
- scanLog.WriteLine(query);
- scanLog.Write(this.readData.Buffer);
-
- this.logBuffer.AppendLine(query);
- this.logBuffer.AppendLine(this.readData.Buffer.ToString());
- }
- else
- {
- throw new GeneralApplicationException(
- "The Log file has not been written to disk as it has grown above the 50MB limit", " This indicates there was a problem during the scan process.", null);
- }
- }
-
- this.IsScanning = false;
-
-
- if (postScanAction != null)
- {
- postScanAction(true);
- }
- else
- {
- if (this.ScanCompleted != null)
- {
- if (logBuffer.ToString().Contains("scan: unrecognized file type"))
- this.ScanCompleted(this, new ScanCompletedEventArgs(false, null, "Unrecognized file type."));
- else
- this.ScanCompleted(this, new ScanCompletedEventArgs(this.cancelScan, null, string.Empty));
- }
- }
- }
- catch (GeneralApplicationException)
- {
- throw;
- }
- catch (Exception exc)
- {
- this.Stop();
-
- if (postScanAction != null)
- {
- postScanAction(false);
- }
- else
- {
- if (this.ScanCompleted != null)
- {
- this.ScanCompleted(this, new ScanCompletedEventArgs(false, exc, "An Error has occured in ScanService.ScanSource()"));
- }
- }
- }
- }
-
- /// <summary>
- /// Fire an event when the scan process progresses
- /// </summary>
- /// <param name="sender">the sender</param>
- /// <param name="currentTitle">the current title being scanned</param>
- /// <param name="titleCount">the total number of titles</param>
- /// <param name="percentage">The Percentage</param>
- private void OnScanProgress(object sender, int currentTitle, int titleCount, decimal percentage)
- {
- ScanProgressEventArgs eventArgs = new ScanProgressEventArgs
- {
- CurrentTitle = currentTitle,
- Titles = titleCount,
- Percentage = percentage
- };
-
- if (this.ScanStatusChanged != null)
- {
- this.ScanStatusChanged(this, eventArgs);
- }
- }
-
- #endregion
- }
-}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs Deleted

@@ -1,218 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="UserSettingService.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The User Setting Serivce
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Services
-{
- using System;
- using System.Collections.Specialized;
- using System.IO;
- using System.Linq;
- using System.Xml.Serialization;
-
- using HandBrake.ApplicationServices.Collections;
- using HandBrake.ApplicationServices.EventArgs;
- using HandBrake.ApplicationServices.Exceptions;
- using HandBrake.ApplicationServices.Services.Interfaces;
-
- /// <summary>
- /// The User Setting Serivce
- /// </summary>
- public class UserSettingService : IUserSettingService
- {
- /// <summary>
- /// The Settings File
- /// </summary>
- private readonly string settingsFile = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\settings.xml";
-
- /// <summary>
- /// The XML Serializer 
- /// </summary>
- readonly XmlSerializer serializer = new XmlSerializer(typeof(SerializableDictionary<string, object>));
-
- /// <summary>
- /// The User Settings
- /// </summary>
- private SerializableDictionary<string, object> userSettings;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="UserSettingService"/> class.
- /// </summary>
- public UserSettingService()
- {
- this.Load();
- }
-
- /// <summary>
- /// The setting changed.
- /// </summary>
- public event SettingEventHandler SettingChanged;
-
- /// <summary>
- /// Set the specified user setting.
- /// </summary>
- /// <param name="name">
- /// Name of the property
- /// </param>
- /// <param name="value">
- /// The value to store.
- /// </param>
- public void SetUserSetting(string name, object value)
- {
- this.userSettings[name] = value;
- this.Save();
-
- this.OnSettingChanged(new SettingChangedEventArgs {Key = name, Value = value});
- }
-
- /// <summary>
- /// Get user setting for a given key.
- /// </summary>
- /// <param name="name">
- /// The name.
- /// </param>
- /// <typeparam name="T">
- /// The Type of the setting
- /// </typeparam>
- /// <returns>
- /// The user setting
- /// </returns>
- public T GetUserSetting<T>(string name)
- {
- if (this.userSettings.ContainsKey(name))
- {
- return (T)this.userSettings[name];
- }
-
- return default(T);
- }
-
- /// <summary>
- /// Get an StringCollection type user setting
- /// </summary>
- /// <param name="name">
- /// The setting name
- /// </param>
- /// <returns>
- /// The settings value
- /// </returns>
- public StringCollection GetUserSettingStringCollection(string name)
- {
- return (StringCollection)this.userSettings[name];
- }
-
- /// <summary>
- /// The on setting changed.
- /// </summary>
- /// <param name="e">
- /// The e.
- /// </param>
- protected virtual void OnSettingChanged(SettingChangedEventArgs e)
- {
- SettingEventHandler handler = this.SettingChanged;
- if (handler != null)
- {
- handler(this, e);
- }
- }
-
- /// <summary>
- /// Save the User Settings
- /// </summary>
- private void Save()
- {
- try
- {
- string directory = Path.GetDirectoryName(this.settingsFile);
- if (!string.IsNullOrEmpty(directory) && !Directory.Exists(directory))
- {
- Directory.CreateDirectory(directory);
- }
-
- using (FileStream strm = new FileStream(this.settingsFile, FileMode.Create, FileAccess.Write))
- {
- serializer.Serialize(strm, this.userSettings);
- }
- }
- catch (Exception exc)
- {
- throw new GeneralApplicationException(
- "A problem occured when trying to save your preferences.",
- "Any settings you changed may need to be reset the next time HandBrake launches.",
- exc);
- }
- }
-
- /// <summary>
- /// Load the User Settings
- /// </summary>
- private void Load()
- {
- try
- {
- // Load up the users current settings file.
- if (File.Exists(this.settingsFile))
- {
- using (StreamReader reader = new StreamReader(this.settingsFile))
- {
- SerializableDictionary<string, object> data = (SerializableDictionary<string, object>)serializer.Deserialize(reader);
- this.userSettings = data;
- }
- } 
- else
- {
- this.userSettings = new SerializableDictionary<string, object>();
- }
-
- // Add any missing / new settings
- SerializableDictionary<string, object> defaults = this.GetDefaults();
- foreach (var item in defaults.Where(item => !this.userSettings.Keys.Contains(item.Key)))
- {
- this.userSettings.Add(item.Key, item.Value);
- this.Save();
- }
- }
- catch (Exception exc)
- {
- try
- {
- this.userSettings = this.GetDefaults();
- if (File.Exists(this.settingsFile))
- {
- File.Delete(this.settingsFile);
- }
- this.Save();
-
- throw new GeneralApplicationException("Warning, your settings have been reset!", "Your user settings file was corrupted or inaccessible. Settings have been reset to defaults.", exc);
- }
- catch (Exception)
- {
- throw new GeneralApplicationException("Unable to load user settings.", "Your user settings file appears to be inaccessible or corrupted. You may have to delete the file and let HandBrake generate a new one.", exc);
- }
- }
- }
-
- /// <summary>
- /// Load Default Settings
- /// </summary>
- /// <returns>
- /// The get defaults.
- /// </returns>
- private SerializableDictionary<string, object> GetDefaults()
- {
- if (File.Exists("defaultsettings.xml"))
- {
- using (StreamReader reader = new StreamReader("defaultsettings.xml"))
- {
- return (SerializableDictionary<string, object>)serializer.Deserialize(reader);
- }
- }
- return new SerializableDictionary<string, object>();
- }
- }
-}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Converters.cs Deleted

@@ -1,234 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Converters.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the Converters type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop
-{
-	using System;
-	using System.Collections.Generic;
-
-	using HandBrake.Interop.HbLib;
-	using HandBrake.Interop.Model.Encoding;
-	using HandBrake.Interop.SourceData;
-	using HandBrake.Interop.Model;
-
-	/// <summary>
-	/// Converters for various encoding values.
-	/// </summary>
-	public static class Converters
-	{
-		/// <summary>
-		/// Video Frame Rates
-		/// </summary>
-		private static readonly Dictionary<double, int> VideoRates = new Dictionary<double, int>
-		{
-			{5, 5400000},
-			{10, 2700000},
-			{12, 2250000},
-			{15, 1800000},
-			{23.976, 1126125},
-			{24, 1125000},
-			{25, 1080000},
-			{29.97, 900900},
-			{30, 900000},
-			{50, 540000},
-			{59.94, 450450},
-			{60, 450000}
-		};
-
-		/// <summary>
-		/// Convert Framerate to Video Rates
-		/// </summary>
-		/// <param name="framerate">
-		/// The framerate.
-		/// </param>
-		/// <returns>
-		/// The vrate if a valid framerate is passed in.
-		/// </returns>
-		/// <exception cref="ArgumentException">
-		/// Thrown when framerate is invalid.
-		/// </exception>
-		public static int FramerateToVrate(double framerate)
-		{
-			if (!VideoRates.ContainsKey(framerate))
-			{
-				throw new ArgumentException("Framerate not recognized.", "framerate");
-			}
-
-			return VideoRates[framerate];
-		}
-
-		/// <summary>
-		/// Gets the native code for the given encoder.
-		/// </summary>
-		/// <param name="encoder">The audio encoder to convert.</param>
-		/// <returns>The native code for the encoder.</returns>
-		public static uint AudioEncoderToNative(AudioEncoder encoder)
-		{
-			switch (encoder)
-			{
-				case AudioEncoder.Passthrough:
-					return NativeConstants.HB_ACODEC_AUTO_PASS;
-				case AudioEncoder.Ac3Passthrough:
-					return NativeConstants.HB_ACODEC_AC3_PASS;
-				case AudioEncoder.Ac3:
-					return NativeConstants.HB_ACODEC_AC3;
-				case AudioEncoder.Faac:
-					return NativeConstants.HB_ACODEC_FAAC;
-				case AudioEncoder.ffaac:
-					return NativeConstants.HB_ACODEC_FFAAC;
-				case AudioEncoder.AacPassthru:
-					return NativeConstants.HB_ACODEC_AAC_PASS;
-				case AudioEncoder.Lame:
-					return NativeConstants.HB_ACODEC_LAME;
-				case AudioEncoder.Mp3Passthru:
-					return NativeConstants.HB_ACODEC_MP3_PASS;
-				case AudioEncoder.DtsPassthrough:
-					return NativeConstants.HB_ACODEC_DCA_PASS;
-				case AudioEncoder.DtsHDPassthrough:
-					return NativeConstants.HB_ACODEC_DCA_HD_PASS;
-				case AudioEncoder.Vorbis:
-					return NativeConstants.HB_ACODEC_VORBIS;
-				case AudioEncoder.ffflac:
-					return NativeConstants.HB_ACODEC_FFFLAC;
-			}
-
-			return 0;
-		}
-
-		/// <summary>
-		/// Convert Native HB Internal Audio int to a AudioCodec model.
-		/// </summary>
-		/// <param name="codec">
-		/// The codec.
-		/// </param>
-		/// <returns>
-		/// An AudioCodec object.
-		/// </returns>
-		public static AudioCodec NativeToAudioCodec(uint codec)
-		{
-			switch (codec)
-			{
-				case NativeConstants.HB_ACODEC_AC3:
-					return AudioCodec.Ac3;
-				case NativeConstants.HB_ACODEC_DCA:
-					return AudioCodec.Dts;
-				case NativeConstants.HB_ACODEC_DCA_HD:
-					return AudioCodec.DtsHD;
-				case NativeConstants.HB_ACODEC_LAME:
-				case NativeConstants.HB_ACODEC_MP3:
-					return AudioCodec.Mp3;
-				case NativeConstants.HB_ACODEC_FAAC:
-				case NativeConstants.HB_ACODEC_FFAAC:
-				case NativeConstants.HB_ACODEC_CA_AAC:
-				case NativeConstants.HB_ACODEC_CA_HAAC:
-					return AudioCodec.Aac;
-				case NativeConstants.HB_ACODEC_FFFLAC:
-					return AudioCodec.Flac;
-				default:
-					return AudioCodec.Other;
-			}
-		}
-
-		/// <summary>
-		/// Converts a native HB encoder structure to an Encoder model.
-		/// </summary>
-		/// <param name="encoder">The structure to convert.</param>
-		/// <returns>The converted model.</returns>
-		public static HBVideoEncoder NativeToVideoEncoder(hb_encoder_s encoder)
-		{
-			var result = new HBVideoEncoder
-			{
-				Id = encoder.encoder,
-				ShortName = encoder.short_name,
-				DisplayName = encoder.human_readable_name,
-				CompatibleContainers = Container.None
-			};
-
-			if ((encoder.muxers & NativeConstants.HB_MUX_MKV) > 0)
-			{
-				result.CompatibleContainers = result.CompatibleContainers | Container.Mkv;
-			}
-
-			if ((encoder.muxers & NativeConstants.HB_MUX_MP4) > 0)
-			{
-				result.CompatibleContainers = result.CompatibleContainers | Container.Mp4;
-			}
-
-			return result;
-		}
-
-		/// <summary>
-		/// Converts a native HB encoder structure to an Encoder model.
-		/// </summary>
-		/// <param name="encoder">The structure to convert.</param>
-		/// <returns>The converted model.</returns>
-		public static HBAudioEncoder NativeToAudioEncoder(hb_encoder_s encoder)
-		{
-			var result = new HBAudioEncoder
-				{
-					Id = encoder.encoder,
-					ShortName = encoder.short_name,
-					DisplayName = encoder.human_readable_name,
-					CompatibleContainers = Container.None
-				};
-
-			if ((encoder.muxers & NativeConstants.HB_MUX_MKV) > 0)
-			{
-				result.CompatibleContainers = result.CompatibleContainers | Container.Mkv;
-			}
-
-			if ((encoder.muxers & NativeConstants.HB_MUX_MP4) > 0)
-			{
-				result.CompatibleContainers = result.CompatibleContainers | Container.Mp4;
-			}
-
-			result.QualityLimits = Encoders.GetAudioQualityLimits(encoder.encoder);
-			result.DefaultQuality = HBFunctions.hb_get_default_audio_quality((uint)encoder.encoder);
-			result.CompressionLimits = Encoders.GetAudioCompressionLimits(encoder.encoder);
-			result.DefaultCompression = HBFunctions.hb_get_default_audio_compression((uint) encoder.encoder);
-
-			return result;
-		}
-
-		/// <summary>
-		/// Converts a native HB mixdown structure to a Mixdown model.
-		/// </summary>
-		/// <param name="mixdown">The structure to convert.</param>
-		/// <returns>The converted model.</returns>
-		public static HBMixdown NativeToMixdown(hb_mixdown_s mixdown)
-		{
-			return new HBMixdown
-				{
-					Id = mixdown.amixdown,
-					ShortName = mixdown.short_name,
-					DisplayName = mixdown.human_readable_name
-				};
-		}
-
-		/// <summary>
-		/// Converts the PTS amount to a TimeSpan. There may be some accuracy loss here.
-		/// </summary>
-		/// <param name="pts">The PTS to convert.</param>
-		/// <returns>The timespan for it.</returns>
-		public static TimeSpan PtsToTimeSpan(ulong pts)
-		{
-			return TimeSpan.FromTicks((long)((pts * 10000000) / 90000));
-		}
-
-		/// <summary>
-		/// Converts the PTS amount to seconds.
-		/// </summary>
-		/// <param name="pts">The PTS to convert.</param>
-		/// <returns>The corresponding number of seconds.</returns>
-		public static double PtsToSeconds(ulong pts)
-		{
-			return (double)pts / 90000;
-		}
-	}
-}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/Misc.cs Deleted

@@ -1,418 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Misc.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the hb_anamorphic_substruct type.
-// </summary>
-// <auto-generated> Disable Stylecop Warnings for this file </auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.HbLib
-{
-	using System;
-	using System.Runtime.InteropServices;
-
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_anamorphic_substruct
-	{
-		/// int
-		public int mode;
-
-		/// int
-		public int itu_par;
-
-		/// int
-		public int par_width;
-
-		/// int
-		public int par_height;
-
-		/// int
-		public int dar_width;
-
-		/// int
-		public int dar_height;
-
-		/// int
-		public int keep_display_aspect;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_list_s
-	{
-		/// void**
-		public IntPtr items;
-
-		/// int
-		public int items_alloc;
-
-		/// int
-		public int items_count;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_rate_s
-	{
-		/// char*
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string @string;
-
-		/// int
-		public int rate;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_mixdown_s
-	{
-		/// char*
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string human_readable_name;
-
-		/// char*
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string internal_name;
-
-		/// char*
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string short_name;
-
-		/// int
-		public int amixdown;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_encoder_s
-	{
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string human_readable_name;
-
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string short_name;
-
-		public int encoder;
-
-		public int muxers;
-	}
-
-	[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-	public struct hb_metadata_s
-	{
-		/// char *
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string name;
-
-		/// char *
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string artist;
-
-		/// char *
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string composer;
-
-		/// char *
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string release_date;
-
-		/// char *
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string comment;
-
-		/// char *
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string album;
-
-		/// char *
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string album_artist;
-
-		/// char *
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string genre;
-
-		/// char *
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string description;
-
-		/// char *
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string long_description;
-
-		/// uint8_t*
-		public IntPtr list_coverart;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_state_scanning_anon
-	{
-		public float progress;
-
-		public int preview_cur;
-
-		public int preview_count;
-
-		/// int
-		public int title_cur;
-
-		/// int
-		public int title_count;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_state_working_anon
-	{
-		/// float
-		public float progress;
-
-		/// int
-		public int job_cur;
-
-		/// int
-		public int job_count;
-
-		/// float
-		public float rate_cur;
-
-		/// float
-		public float rate_avg;
-
-		/// int
-		public int hours;
-
-		/// int
-		public int minutes;
-
-		/// int
-		public int seconds;
-
-		/// int
-		public int sequence_id;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_state_workdone_anon
-	{
-		/// int
-		public int error;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_state_muxing_anon
-	{
-		/// float
-		public float progress;
-	}
-
-	[StructLayout(LayoutKind.Explicit)]
-	public struct hb_state_param_u
-	{
-		[FieldOffset(0)]
-		public hb_state_scanning_anon scanning;
-
-		[FieldOffset(0)]
-		public hb_state_working_anon working;
-
-		[FieldOffset(0)]
-		public hb_state_workdone_anon workdone;
-
-		[FieldOffset(0)]
-		public hb_state_muxing_anon muxing;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_state_s
-	{
-		/// int
-		public int state;
-		public hb_state_param_u param;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_fifo_s
-	{
-		/// hb_lock_t*
-		public IntPtr @lock;
-
-		/// uint32_t->unsigned int
-		public uint capacity;
-
-		/// uint32_t->unsigned int
-		public uint size;
-
-		/// uint32_t->unsigned int
-		public uint buffer_size;
-
-		/// hb_buffer_t*
-		public IntPtr first;
-
-		/// hb_buffer_t*
-		public IntPtr last;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_lock_s
-	{
-	}
-
-	// Only called by detect_comb at the moment
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_buffer_s
-	{
-		/// int
-		public int size;
-
-		/// int
-		public int alloc;
-
-		/// uint8_t*
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string data;
-
-		/// int
-		public int cur;
-
-		/// int64_t->int
-		public long sequence;
-
-		public hb_buffer_type_anon type;
-
-		/// int
-		public int id;
-
-		/// int64_t->int
-		public long start;
-
-		/// int64_t->int
-		public long stop;
-
-		public long pcr;
-
-		public byte discontinuity;
-
-		/// int
-		public int new_chap;
-
-		/// uint8_t->unsigned char
-		public byte frametype;
-
-		// Given uint by default, probably should be ushort?
-		/// uint16_t->unsigned int
-		public uint flags;
-
-		/// int64_t->int
-		public long renderOffset;
-
-		/// int
-		public int x;
-
-		/// int
-		public int y;
-
-		/// int
-		public int width;
-
-		/// int
-		public int height;
-
-		/// hb_buffer_t*
-		public IntPtr sub;
-
-		/// hb_buffer_t*
-		public IntPtr next;
-	}
-
-	public enum hb_buffer_type_anon
-	{
-		AUDIO_BUF,
-
-		VIDEO_BUF,
-
-		SUBTITLE_BUF,
-
-		OTHER_BUF
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_mux_data_s
-	{
-		/// MP4TrackId->uint32_t->unsigned int
-		public uint track;
-
-		/// uint8_t->unsigned char
-		public byte subtitle;
-
-		/// int
-		public int sub_format;
-
-		/// uint64_t->unsigned int
-		public ulong sum_dur;
-	}
-
-	// Not referred to anywhere
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_interjob_s
-	{
-		/// int
-		public int last_job;
-
-		/// int
-		public int frame_count;
-
-		public int out_frame_count;
-
-		/// uint64_t->unsigned int
-		public ulong total_time;
-
-		/// int
-		public int vrate;
-
-		/// int
-		public int vrate_base;
-
-		/// hb_subtitle_t*
-		public IntPtr select_subtitle;
-	}
-
-	/// Return Type: void
-	///param0: void*
-	public delegate void hb_thread_s_function(IntPtr param0);
-
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_thread_s
-	{
-		/// char*
-		[MarshalAs(UnmanagedType.LPStr)]
-		public string name;
-
-		/// int
-		public int priority;
-
-		/// hb_thread_s_function
-		public hb_thread_s_function AnonymousMember1;
-
-		/// void*
-		public IntPtr arg;
-
-		/// hb_lock_t*
-		public IntPtr @lock;
-
-		/// int
-		public int exited;
-
-		/// pthread_t->ptw32_handle_t->Anonymous_55c509b5_bbf2_4788_a684_ac1bd0056655
-		public ptw32_handle_t thread;
-	}
-
-	[StructLayout(LayoutKind.Sequential)]
-	public struct ptw32_handle_t
-	{
-		/// void*
-		public IntPtr p;
-
-		/// unsigned int
-		public uint x;
-	}
-
-	[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-	public delegate void LoggingCallback(string message);
-}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_filter.cs Deleted

@@ -1,53 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="hb_filter.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <auto-generated> Disable Stylecop Warnings for this file </auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.HbLib
-{
-	using System;
-	using System.Runtime.InteropServices;
-
-	[StructLayout(LayoutKind.Sequential)]
-	public struct hb_filter_object_s
-	{
-		public int id;
-		public int enforce_order;
-		public IntPtr name;
-		public IntPtr settings;
-
-		// Internal stuff we need to marshal
-		public IntPtr init;
-		public IntPtr work;
-		public IntPtr close;
-		public IntPtr info;
-		public IntPtr fifo_in;
-		public IntPtr fifo_out;
-		public IntPtr subtitle;
-		public IntPtr private_data;
-		public IntPtr thread;
-		public IntPtr done;
-		public int status;
-		public int chapter_val;
-		public long chapter_time;
-	}
-
-	public enum hb_filter_ids
-	{
-		// First, filters that may change the framerate (drop or dup frames)
-		HB_FILTER_DETELECINE = 1,
-		HB_FILTER_DECOMB,
-		HB_FILTER_DEINTERLACE,
-		HB_FILTER_VFR,
-		// Filters that must operate on the original source image are next
-		HB_FILTER_DEBLOCK,
-		HB_FILTER_DENOISE,
-		HB_FILTER_RENDER_SUB,
-		HB_FILTER_CROP_SCALE,
-		// Finally filters that don't care what order they are in,
-		// except that they must be after the above filters
-		HB_FILTER_ROTATE,
-	}
-}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/InteropUtilities.cs Deleted

@@ -1,214 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="InteropUtilities.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Helper utilities for native interop.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop
-{
-	using System;
-	using System.Collections.Generic;
-	using System.Runtime.InteropServices;
-
-	using HandBrake.Interop.HbLib;
-
-	/// <summary>
-	/// Helper utilities for native interop.
-	/// </summary>
-	public static class InteropUtilities
-	{
-		/// <summary>
-		/// Reads the given native structure pointer.
-		/// </summary>
-		/// <typeparam name="T">The type to convert the structure to.</typeparam>
-		/// <param name="structPtr">The pointer to the native structure.</param>
-		/// <returns>The converted structure.</returns>
-		public static T ReadStructure<T>(IntPtr structPtr)
-		{
-			return (T)Marshal.PtrToStructure(structPtr, typeof(T));
-		}
-
-		/// <summary>
-		/// Converts the given native HandBrake list to a managed list.
-		/// </summary>
-		/// <typeparam name="T">The type of structure in the list.</typeparam>
-		/// <param name="listPtr">The pointer to the native list.</param>
-		/// <returns>The converted managed list.</returns>
-		public static List<T> ToList<T>(this IntPtr listPtr)
-		{
-			List<T> returnList = new List<T>();
-			hb_list_s itemList = ReadStructure<hb_list_s>(listPtr);
-
-			for (int i = 0; i < itemList.items_count; i++)
-			{
-				IntPtr itemPtr = Marshal.ReadIntPtr(itemList.items, i * Marshal.SizeOf(typeof(IntPtr)));
-				returnList.Add(ReadStructure<T>(itemPtr));
-			}
-
-			return returnList;
-		}
-
-		/// <summary>
-		/// Converts the HB list to a managed list of pointers.
-		/// </summary>
-		/// <param name="listPtr">The list to convert.</param>
-		/// <returns>The managed list of pointers.</returns>
-		public static List<IntPtr> ToIntPtrList(this IntPtr listPtr)
-		{
-			var returnList = new List<IntPtr>();
-			hb_list_s itemList = ReadStructure<hb_list_s>(listPtr);
-
-			for (int i = 0; i < itemList.items_count; i++)
-			{
-				IntPtr itemPtr = Marshal.ReadIntPtr(itemList.items, i * Marshal.SizeOf(typeof(IntPtr)));
-				returnList.Add(itemPtr);
-			}
-
-			return returnList;
-		}
-
-		/// <summary>
-		/// Converts the given native array to a managed collection.
-		/// </summary>
-		/// <typeparam name="T">The type of item in the list.</typeparam>
-		/// <param name="arrayPtr">The pointer to the array.</param>
-		/// <param name="count">The number of items in the array.</param>
-		/// <returns>The converted collection.</returns>
-		public static IEnumerable<T> ConvertArray<T>(IntPtr arrayPtr, int count)
-		{
-			IntPtr currentItem = arrayPtr;
-
-			var result = new List<T>();
-			for (int i = 0; i < count; i++)
-			{
-				T nativeEncoder = ReadStructure<T>(currentItem);
-				result.Add(nativeEncoder);
-
-				currentItem = IntPtr.Add(currentItem, Marshal.SizeOf(typeof(T)));
-			}
-
-			return result;
-		} 
-
-		/// <summary>
-		/// Creats a new, empty native HandBrake list.
-		/// </summary>
-		/// <param name="capacity">The capacity of the new list.</param>
-		/// <returns>The new native list.</returns>
-		public static NativeList CreateNativeList(int capacity)
-		{
-			NativeList returnList = new NativeList();
-			int intSize = Marshal.SizeOf(typeof(IntPtr));
-
-			IntPtr nativeListInternal = Marshal.AllocHGlobal(capacity * intSize);
-			returnList.AllocatedMemory.Add(nativeListInternal);
-
-			hb_list_s nativeListStruct = new hb_list_s { items = nativeListInternal, items_alloc = capacity, items_count = 0 };
-
-		 IntPtr nativeListStructPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_list_s)));
-			Marshal.StructureToPtr(nativeListStruct, nativeListStructPtr, false);
-
-			returnList.ListPtr = nativeListStructPtr;
-			return returnList;
-		}
-
-		/// <summary>
-		/// Creates a native HandBrake list from the given managed list of pointers.
-		/// </summary>
-		/// <param name="list">The managed list to convert.</param>
-		/// <returns>The converted native list.</returns>
-		public static NativeList CreateIntPtrList(List<IntPtr> list)
-		{
-			NativeList returnList = new NativeList();
-			int intSize = Marshal.SizeOf(typeof(IntPtr));
-
-			IntPtr nativeListInternal = Marshal.AllocHGlobal(list.Count * intSize);
-			returnList.AllocatedMemory.Add(nativeListInternal);
-			for (int i = 0; i < list.Count; i++)
-			{
-				Marshal.WriteIntPtr(nativeListInternal, i * intSize, list[i]);
-			}
-
-			hb_list_s nativeListStruct = new hb_list_s
-			 {
-			 items = nativeListInternal,
-			 items_alloc = list.Count,
-			 items_count = list.Count
-			 };
-
-		 IntPtr nativeListStructPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_list_s)));
-			Marshal.StructureToPtr(nativeListStruct, nativeListStructPtr, false);
-
-			returnList.ListPtr = nativeListStructPtr;
-			return returnList;
-		}
-
-		/// <summary>
-		/// Creates a native HandBrake list from the given managed list of structures.
-		/// </summary>
-		/// <typeparam name="T">The type of structures in the list.</typeparam>
-		/// <param name="list">The managed list to convert.</param>
-		/// <returns>The converted native list.</returns>
-		public static NativeList ConvertListBack<T>(List<T> list)
-		{
-			NativeList returnList = new NativeList();
-			int intSize = Marshal.SizeOf(typeof(IntPtr));
-
-			IntPtr nativeListInternal = Marshal.AllocHGlobal(list.Count * intSize);
-			returnList.AllocatedMemory.Add(nativeListInternal);
-			for (int i = 0; i < list.Count; i++)
-			{
-				IntPtr itemPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(T)));
-				returnList.AllocatedMemory.Add(itemPtr);
-				Marshal.StructureToPtr(list[i], itemPtr, false);
-
-				Marshal.WriteIntPtr(nativeListInternal, i * intSize, itemPtr);
-			}
-
-			hb_list_s nativeListStruct = new hb_list_s
-			 {
-			 items = nativeListInternal,
-			 items_alloc = list.Count,
-			 items_count = list.Count
-			 };
-
-		 IntPtr nativeListStructPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(hb_list_s)));
-			Marshal.StructureToPtr(nativeListStruct, nativeListStructPtr, false);
-
-			returnList.ListPtr = nativeListStructPtr;
-			return returnList;
-		}
-
-		/// <summary>
-		/// Closes the given job.
-		/// </summary>
-		/// <param name="nativeJobPtr">The pointer to the job.</param>
-		public static void CloseJob(IntPtr nativeJobPtr)
-		{
-			// Create a point to the job pointer first.
-			IntPtr nativeJobPtrPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)));
-
-			// Assign the new pointer to the job pointer and tell HB to clean the job up.
-			Marshal.WriteIntPtr(nativeJobPtrPtr, nativeJobPtr);
-			HBFunctions.hb_job_close(nativeJobPtrPtr);
-
-			// Free the pointer we used.
-			Marshal.FreeHGlobal(nativeJobPtrPtr);
-		}
-
-		/// <summary>
-		/// Frees all the memory locations in the given list.
-		/// </summary>
-		/// <param name="memoryList">The list of memory locations to free.</param>
-		public static void FreeMemory(List<IntPtr> memoryList)
-		{
-			foreach (IntPtr memoryLocation in memoryList)
-			{
-				Marshal.FreeHGlobal(memoryLocation);
-			}
-		}
-	}
-}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Language.cs Deleted

@@ -1,42 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Language.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Represents a language.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop
-{
- /// <summary>
-	/// Represents a language.
-	/// </summary>
-	public class Language
-	{
-		/// <summary>
-		/// Initializes a new instance of the Language class.
-		/// </summary>
-		/// <param name="code">The code for the langauge.</param>
-		public Language(string code)
-		{
-			this.Code = code;
-		}
-
-		/// <summary>
-		/// Gets the friendly name of the language.
-		/// </summary>
-		public string Name
-		{
-			get
-			{
-				return LanguageCodes.Decode(this.Code);
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the language code.
-		/// </summary>
-		public string Code { get; set; }
-	}
-}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/LanguageCodes.cs Deleted

@@ -1,255 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="LanguageCodes.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Contains utilities for converting language codes.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop
-{
- using System.Collections.Generic;
- using System.Linq;
-
- /// <summary>
-	/// Contains utilities for converting language codes.
-	/// </summary>
-	public static class LanguageCodes
-	{
-		/// <summary>
-		/// The map of language codes to friendly names.
-		/// </summary>
-		private static Dictionary<string, string> languageMap;
-
-		/// <summary>
-		/// Gets the map of language codes to friendly names.
-		/// </summary>
-		private static Dictionary<string, string> LanguageMap
-		{
-			get
-			{
-				if (languageMap == null)
-				{
-					languageMap = new Dictionary<string, string>
-					{
-						{"und", "Unspecified"},
-						{"eng", "English"},
-						{"deu", "Deutsch"},
-						{"fra", "Français"},
-						{"spa", "Español"},
-						{"rus", "Russian"},
-						{"aar", "Afar"},
-						{"abk", "Abkhazian"},
-						{"afr", "Afrikaans"},
-						{"aka", "Akan"},
-						{"sqi", "Albanian"},
-						{"amh", "Amharic"},
-						{"ara", "Arabic"},
-						{"arg", "Aragonese"},
-						{"hye", "Armenian"},
-						{"asm", "Assamese"},
-						{"ava", "Avaric"},
-						{"ave", "Avestan"},
-						{"aym", "Aymara"},
-						{"aze", "Azerbaijani"},
-						{"bak", "Bashkir"},
-						{"bam", "Bambara"},
-						{"eus", "Basque"},
-						{"bel", "Belarusian"},
-						{"ben", "Bengali"},
-						{"bih", "Bihari"},
-						{"bis", "Bislama"},
-						{"bos", "Bosnian"},
-						{"bre", "Breton"},
-						{"bul", "Bulgarian"},
-						{"mya", "Burmese"},
-						{"cat", "Catalan"},
-						{"cha", "Chamorro"},
-						{"che", "Chechen"},
-						{"zho", "Chinese"},
-						{"chu", "Church Slavic"},
-						{"chv", "Chuvash"},
-						{"cor", "Cornish"},
-						{"cos", "Corsican"},
-						{"cre", "Cree"},
-						{"ces", "Czech"},
-						{"dan", "Dansk"},
-						{"div", "Divehi"},
-						{"nld", "Nederlands"},
-						{"dzo", "Dzongkha"},
-						{"epo", "Esperanto"},
-						{"est", "Estonian"},
-						{"ewe", "Ewe"},
-						{"fao", "Faroese"},
-						{"fij", "Fijian"},
-						{"fin", "Suomi"},
-						{"fry", "Western Frisian"},
-						{"ful", "Fulah"},
-						{"kat", "Georgian"},
-						{"gla", "Gaelic (Scots)"},
-						{"gle", "Irish"},
-						{"glg", "Galician"},
-						{"glv", "Manx"},
-						{"ell", "Greek Modern"},
-						{"grn", "Guarani"},
-						{"guj", "Gujarati"},
-						{"hat", "Haitian"},
-						{"hau", "Hausa"},
-						{"heb", "Hebrew"},
-						{"her", "Herero"},
-						{"hin", "Hindi"},
-						{"hmo", "Hiri Motu"},
-						{"hun", "Magyar"},
-						{"ibo", "Igbo"},
-						{"isl", "Islenska"},
-						{"ido", "Ido"},
-						{"iii", "Sichuan Yi"},
-						{"iku", "Inuktitut"},
-						{"ile", "Interlingue"},
-						{"ina", "Interlingua"},
-						{"ind", "Indonesian"},
-						{"ipk", "Inupiaq"},
-						{"ita", "Italiano"},
-						{"jav", "Javanese"},
-						{"jpn", "Japanese"},
-						{"kal", "Kalaallisut"},
-						{"kan", "Kannada"},
-						{"kas", "Kashmiri"},
-						{"kau", "Kanuri"},
-						{"kaz", "Kazakh"},
-						{"khm", "Central Khmer"},
-						{"kik", "Kikuyu"},
-						{"kin", "Kinyarwanda"},
-						{"kir", "Kirghiz"},
-						{"kom", "Komi"},
-						{"kon", "Kongo"},
-						{"kor", "Korean"},
-						{"kua", "Kuanyama"},
-						{"kur", "Kurdish"},
-						{"lao", "Lao"},
-						{"lat", "Latin"},
-						{"lav", "Latvian"},
-						{"lim", "Limburgan"},
-						{"lin", "Lingala"},
-						{"lit", "Lithuanian"},
-						{"ltz", "Luxembourgish"},
-						{"lub", "Luba-Katanga"},
-						{"lug", "Ganda"},
-						{"mkd", "Macedonian"},
-						{"mah", "Marshallese"},
-						{"mal", "Malayalam"},
-						{"mri", "Maori"},
-						{"mar", "Marathi"},
-						{"msa", "Malay"},
-						{"mlg", "Malagasy"},
-						{"mlt", "Maltese"},
-						{"mol", "Moldavian"},
-						{"mon", "Mongolian"},
-						{"nau", "Nauru"},
-						{"nav", "Navajo"},
-						{"nbl", "Ndebele, South"},
-						{"nde", "Ndebele, North"},
-						{"ndo", "Ndonga"},
-						{"nep", "Nepali"},
-						{"nno", "Norwegian Nynorsk"},
-						{"nob", "Norwegian Bokmål"},
-						{"nor", "Norsk"},
-						{"nya", "Chichewa; Nyanja"},
-						{"oci", "Occitan"},
-						{"oji", "Ojibwa"},
-						{"ori", "Oriya"},
-						{"orm", "Oromo"},
-						{"oss", "Ossetian"},
-						{"pan", "Panjabi"},
-						{"fas", "Persian"},
-						{"pli", "Pali"},
-						{"pol", "Polish"},
-						{"por", "Portugues"},
-						{"pus", "Pushto"},
-						{"que", "Quechua"},
-						{"roh", "Romansh"},
-						{"ron", "Romanian"},
-						{"run", "Rundi"},
-						{"sag", "Sango"},
-						{"san", "Sanskrit"},
-						{"srp", "Serbian"},
-						{"hrv", "Hrvatski"},
-						{"sin", "Sinhala"},
-						{"slk", "Slovak"},
-						{"slv", "Slovenian"},
-						{"sme", "Northern Sami"},
-						{"smo", "Samoan"},
-						{"sna", "Shona"},
-						{"snd", "Sindhi"},
-						{"som", "Somali"},
-						{"sot", "Sotho Southern"},
-						{"srd", "Sardinian"},
-						{"ssw", "Swati"},
-						{"sun", "Sundanese"},
-						{"swa", "Swahili"},
-						{"swe", "Svenska"},
-						{"tah", "Tahitian"},
-						{"tam", "Tamil"},
-						{"tat", "Tatar"},
-						{"tel", "Telugu"},
-						{"tgk", "Tajik"},
-						{"tgl", "Tagalog"},
-						{"tha", "Thai"},
-						{"bod", "Tibetan"},
-						{"tir", "Tigrinya"},
-						{"ton", "Tonga"},
-						{"tsn", "Tswana"},
-						{"tso", "Tsonga"},
-						{"tuk", "Turkmen"},
-						{"tur", "Turkish"},
-						{"twi", "Twi"},
-						{"uig", "Uighur"},
-						{"ukr", "Ukrainian"},
-						{"urd", "Urdu"},
-						{"uzb", "Uzbek"},
-						{"ven", "Venda"},
-						{"vie", "Vietnamese"},
-						{"vol", "Volapük"},
-						{"cym", "Welsh"},
-						{"wln", "Walloon"},
-						{"wol", "Wolof"},
-						{"xho", "Xhosa"},
-						{"yid", "Yiddish"},
-						{"yor", "Yoruba"},
-						{"zha", "Zhuang"},
-						{"zul", "Zulu"}
-					};
-				}
-
-				return languageMap;
-			}
-		}
-
-		/// <summary>
-		/// Gets a list of all languages.
-		/// </summary>
-		public static IList<Language> Languages
-		{
-			get
-			{
-			 return LanguageMap.Keys.Select(languageCode => new Language(languageCode)).ToList();
-			}
-		}
-
-		/// <summary>
-		/// Gives the friendly name of the language with the given code.
-		/// </summary>
-		/// <param name="languageCode">The language code.</param>
-		/// <returns>The friendly name of the language.</returns>
-		public static string Decode(string languageCode)
-		{
-			if (LanguageMap.ContainsKey(languageCode))
-			{
-				return LanguageMap[languageCode];
-			}
-
-			return "Unknown";
-		}
-	}
-}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/MarshalingConstants.cs Deleted

@@ -1,32 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="MarshalingConstants.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the MarshalingConstants type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop
-{
- /// <summary>
- /// The marshaling constants.
- /// </summary>
- public static class MarshalingConstants
-	{
-#if X64
-		public const int JobPaddingBytes = 49264;
-		public const int AudioPaddingBytes = 49208;
-#else
-	 /// <summary>
-	 /// Job Padding Bytes
-	 /// </summary>
-	 public const int JobPaddingBytes = 49216;
-
-	 /// <summary>
-	 /// Audio Padding Bytes
-	 /// </summary>
-	 public const int AudioPaddingBytes = 49180;
-#endif
-	}
-}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/NativeList.cs Deleted

@@ -1,41 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="NativeList.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Represents a HandBrake style native list.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop
-{
-	using System;
-	using System.Collections.Generic;
-
-	/// <summary>
-	/// Represents a HandBrake style native list.
-	/// </summary>
-	public class NativeList
-	{
-		/// <summary>
-		/// The list of native memory locations allocated for this list.
-		/// </summary>
-		private List<IntPtr> allocatedMemory = new List<IntPtr>();
-
-		/// <summary>
-		/// Gets or sets the pointer to the native list.
-		/// </summary>
-		public IntPtr ListPtr { get; set; }
-
-		/// <summary>
-		/// Gets the list of native memory locations allocated for this list.
-		/// </summary>
-		public List<IntPtr> AllocatedMemory
-		{
-			get
-			{
-				return allocatedMemory;
-			}
-		}
-	}
-}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Utilities.cs Deleted

@@ -1,66 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Utilities.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the Utilities type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop
-{
- using HandBrake.Interop.Model.Encoding;
-
- /// <summary>
- /// The utilities.
- /// </summary>
- public static class Utilities
-	{
- /// <summary>
- /// Get the Greatest Common Factor
- /// </summary>
- /// <param name="a">
- /// The a.
- /// </param>
- /// <param name="b">
- /// The b.
- /// </param>
- /// <returns>
- /// The greatest common factor
- /// </returns>
- public static int GreatestCommonFactor(int a, int b)
-		{
-			if (a == 0)
-			{
-				return b;
-			}
-
-			if (b == 0)
-			{
-				return a;
-			}
-
-			if (a > b)
-			{
-				return GreatestCommonFactor(a % b, b);
-			}
- 
- return GreatestCommonFactor(a, b % a);
-		}
-
-		/// <summary>
-		/// Determines if the given audio encoder is a passthrough encoder choice.
-		/// </summary>
-		/// <param name="encoder">The audio encoder to examine.</param>
-		/// <returns>True if the encoder is passthrough.</returns>
-		public static bool IsPassthrough(AudioEncoder encoder)
-		{
-			return encoder == AudioEncoder.Ac3Passthrough ||
- encoder == AudioEncoder.DtsHDPassthrough ||
- encoder == AudioEncoder.DtsPassthrough ||
- encoder == AudioEncoder.Mp3Passthru || 
- encoder == AudioEncoder.AacPassthru ||
- encoder == AudioEncoder.Passthrough;
-		}
-	}
-}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Helpers/GrowlCommunicator.cs Deleted

@@ -1,124 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="GrowlCommunicator.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Provides all functionality for communicating with Growl for Windows.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Helpers
-{
- using System;
-
- using Growl.Connector;
-
- /// <summary>
- /// Provides all functionality for communicating with Growl for Windows.
- /// </summary>
- /// <remarks>
- /// This class is implemented as a static class because:
- /// 1. It allows nearly all of the Growl-related code to be in one place
- /// 2. It prevents the main form, queue handler, and any other part of Handbrake from having to declare
- /// or track any new instance variables
- /// </remarks>
- public static class GrowlCommunicator
- {
- /// <summary>
- /// The <see cref="GrowlConnector"/> that actually talks to Growl
- /// </summary>
- private static GrowlConnector growl;
-
- /// <summary>
- /// The Handbrake application instance that is registered with Growl
- /// </summary>
- private static Application application;
-
- /// <summary>
- /// Notification shown upon completion of encoding
- /// </summary>
- private static NotificationType encodeOrQueueCompleted = new NotificationType("EncodeOrQueue", "HandBrake Status");
-
- /// <summary>
- /// Checks to see if Growl is currently running on the local machine.
- /// </summary>
- /// <returns>
- /// <c>true</c> if Growl is running;
- /// <c>false</c> otherwise
- /// </returns>
- public static bool IsRunning()
- {
- Initialize();
-
- return GrowlConnector.IsGrowlRunningLocally();
- }
-
- /// <summary>
- /// Registers Handbrake with the local Growl instance
- /// </summary>
- /// <remarks>
- /// This should usually be called at application start-up
- /// </remarks>
- public static void Register()
- {
- Initialize();
- growl.Register(application, new[] {encodeOrQueueCompleted});
- }
-
- /// <summary>
- /// Sends a notification to Growl. (Since Handbrake currently only supports one type of notification with
- /// static text, this is a shortcut method).
- /// </summary>
- /// <param name="title">
- /// The title.
- /// </param>
- /// <param name="text">
- /// The text to display.
- /// </param>
- public static void Notify(string title, string text)
- {
- Notification notification = new Notification(application.Name, encodeOrQueueCompleted.Name, String.Empty, 
- title, text);
- growl.Notify(notification);
- }
-
- /// <summary>
- /// Sends a notification to Growl. (This is the more generic version that could be used in the future if 
- /// more notification types are implemented)
- /// </summary>
- /// <param name="notificationType">The <see cref="NotificationType">type</see> of notification to send</param>
- /// <param name="title">The notification title</param>
- /// <param name="text">The notification text</param>
- /// <param name="imageUrl">The notification image as a url</param>
- public static void Notify(NotificationType notificationType, string title, string text, string imageUrl)
- {
- Notification notification = new Notification(application.Name, notificationType.Name, String.Empty, title, 
- text)
- {
- Icon = imageUrl
- };
-
- growl.Notify(notification);
- }
-
- /// <summary>
- /// Initializes the GrowlCommunicator
- /// </summary>
- private static void Initialize()
- {
- if (growl == null)
- {
- growl = new GrowlConnector
- {
- EncryptionAlgorithm = Cryptography.SymmetricAlgorithmType.PlainText,
- KeyHashAlgorithm = Cryptography.HashAlgorithmType.SHA1
- };
-
- application = new Application("Handbrake")
- {
- Icon = Properties.Resources.logo64
- };
- }
- }
- }
-}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Services/DriveDetectService.cs Deleted

@@ -1,97 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="DriveDetectService.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Drive Detection Helper.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Services
-{
- using System;
- using System.Management;
- using System.Threading;
-
- using HandBrakeWPF.Services.Interfaces;
-
- /// <summary>
- /// Drive Detection Helper.
- /// </summary>
- public class DriveDetectService : IDriveDetectService
- {
- /// <summary>
- /// The watcher.
- /// </summary>
- private ManagementEventWatcher watcher;
-
- /// <summary>
- /// The detection action.
- /// </summary>
- private Action detectionAction;
-
- /// <summary>
- /// The start detection.
- /// </summary>
- /// <param name="action">
- /// The detection Action.
- /// </param>
- public void StartDetection(Action action)
- {
- ThreadPool.QueueUserWorkItem(
- delegate
- {
- this.detectionAction = action;
-
- var options = new ConnectionOptions { EnablePrivileges = true };
- var scope = new ManagementScope(@"root\CIMV2", options);
-
- try
- {
- var query = new WqlEventQuery
- {
- EventClassName = "__InstanceModificationEvent",
- WithinInterval = TimeSpan.FromSeconds(1),
- Condition = @"TargetInstance ISA 'Win32_LogicalDisk' and TargetInstance.DriveType = 5" // DriveType - 5: CDROM
- };
-
- this.watcher = new ManagementEventWatcher(scope, query);
- this.watcher.EventArrived += this.WatcherEventArrived;
- this.watcher.Start();
- }
- catch (Exception e)
- {
- Console.WriteLine(e.Message);
- }
- });
- }
-
- /// <summary>
- /// The close.
- /// </summary>
- public void Close()
- {
- if (watcher != null)
- {
- this.watcher.Stop();
- }
- }
-
- /// <summary>
- /// The watcher_ event arrived.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The EventArrivedEventArgs.
- /// </param>
- private void WatcherEventArrived(object sender, EventArrivedEventArgs e)
- {
- if (this.detectionAction != null)
- {
- this.detectionAction();
- }
- }
- }
-}

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Services/Interfaces/IDriveDetectService.cs Deleted

@@ -1,32 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IDriveDetectService.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the IDriveDetectService type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Services.Interfaces
-{
- using System;
-
- /// <summary>
- /// The DriveDetectService interface.
- /// </summary>
- public interface IDriveDetectService
- {
- /// <summary>
- /// The start detection.
- /// </summary>
- /// <param name="action">
- /// The detection Action.
- /// </param>
- void StartDetection(Action action);
-
- /// <summary>
- /// Stop the watcher. Must be done before the app shuts down.
- /// </summary>
- void Close();
- }
-}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Services/ScanServiceWrapper.cs Deleted

@@ -1,247 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ScanServiceWrapper.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// We have multiple implementations of IScan. This is a wrapper class for the GUI so that the 
-// implementation used is controllable via user settings.
-// Over time, this class will go away when the LibHB and process isolation code matures.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Services
-{
- using System;
-
- using HandBrake.ApplicationServices.Exceptions;
- using HandBrake.ApplicationServices.Isolation;
- using HandBrake.ApplicationServices.Parsing;
- using HandBrake.ApplicationServices.Services;
- using HandBrake.ApplicationServices.Services.Interfaces;
- using HandBrake.Interop;
- using HandBrake.Interop.Interfaces;
-
- /// <summary>
- /// We have multiple implementations of IScan. This is a wrapper class for the GUI so that the 
- /// implementation used is controllable via user settings.
- /// Over time, this class will go away when the LibHB and process isolation code matures.
- /// </summary>
- public class ScanServiceWrapper : IScanServiceWrapper
- {
- #region Constants and Fields
-
- /// <summary>
- /// The handbrake instance.
- /// </summary>
- public static IHandBrakeInstance HandbrakeInstance;
-
- /// <summary>
- /// The scan service.
- /// </summary>
- private readonly IScan scanService;
-
- #endregion
-
- #region Constructors and Destructors
-
- /// <summary>
- /// Initializes a new instance of the <see cref="ScanServiceWrapper"/> class.
- /// </summary>
- /// <param name="userSettingService">
- /// The user setting service.
- /// </param>
- public ScanServiceWrapper(IUserSettingService userSettingService)
- {
- var useLibHb = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableLibHb);
- var useProcessIsolation =
- userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableProcessIsolation);
- string port = userSettingService.GetUserSetting<string>(UserSettingConstants.ServerPort);
-
- if (useLibHb)
- {
- try
- {
- if (useProcessIsolation)
- {
- this.scanService = new IsolatedScanService(port);
- }
- else
- {
- HandbrakeInstance = new HandBrakeInstance();
- this.scanService = new LibScan(HandbrakeInstance);
- }
- } 
- catch(Exception exc)
- {
- // Try to recover from errors.
- userSettingService.SetUserSetting(UserSettingConstants.EnableLibHb, false);
- throw new GeneralApplicationException("Unable to initialise LibHB or Background worker service", "Falling back to using HandBrakeCLI.exe. Setting has been reset", exc);
- }
- }
- else
- {
- this.scanService = new ScanService(userSettingService);
- }
-
- this.scanService.ScanCompleted += this.ScanServiceScanCompleted;
- this.scanService.ScanStared += this.ScanServiceScanStared;
- this.scanService.ScanStatusChanged += this.ScanServiceScanStatusChanged;
- }
-
- /// <summary>
- /// The scan service scan status changed event
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The ScanProgressEventArgs.
- /// </param>
- private void ScanServiceScanStatusChanged(object sender, HandBrake.ApplicationServices.EventArgs.ScanProgressEventArgs e)
- {
- this.ScanStatusChanged(sender, e);
- }
-
- /// <summary>
- /// The scan service scan stared event
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The EventArgs
- /// </param>
- private void ScanServiceScanStared(object sender, EventArgs e)
- {
- this.ScanStared(sender, e);
- }
-
- /// <summary>
- /// The scan service scan completed event
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The ScanCompletedEventArgs
- /// </param>
- private void ScanServiceScanCompleted(object sender, HandBrake.ApplicationServices.EventArgs.ScanCompletedEventArgs e)
- {
- this.ScanCompleted(sender, e);
- }
-
- #endregion
-
- #region Events
-
- /// <summary>
- /// The scan completed.
- /// </summary>
- public event ScanCompletedStatus ScanCompleted;
-
- /// <summary>
- /// The scan stared.
- /// </summary>
- public event EventHandler ScanStared;
-
- /// <summary>
- /// The scan status changed.
- /// </summary>
- public event ScanProgessStatus ScanStatusChanged;
-
- #endregion
-
- #region Properties
-
- /// <summary>
- /// Gets ActivityLog.
- /// </summary>
- public string ActivityLog
- {
- get
- {
- return this.scanService.ActivityLog;
- }
- }
-
- /// <summary>
- /// Gets a value indicating whether IsScanning.
- /// </summary>
- public bool IsScanning
- {
- get
- {
- return this.scanService.IsScanning;
- }
- }
-
- /// <summary>
- /// Gets the Souce Data.
- /// </summary>
- public Source SouceData
- {
- get
- {
- return this.scanService.SouceData;
- }
- }
-
- #endregion
-
- #region Implemented Interfaces
-
- #region IScan
-
- /// <summary>
- /// Take a Scan Log file, and process it as if it were from the CLI.
- /// </summary>
- /// <param name="path">
- /// The path to the log file.
- /// </param>
- public void DebugScanLog(string path)
- {
- this.scanService.DebugScanLog(path);
- }
-
- /// <summary>
- /// Shutdown the service.
- /// </summary>
- public void Shutdown()
- {
- this.scanService.Shutdown();
- }
-
- /// <summary>
- /// Scan a Source Path.
- /// Title 0: scan all
- /// </summary>
- /// <param name="sourcePath">
- /// Path to the file to scan
- /// </param>
- /// <param name="title">
- /// int title number. 0 for scan all
- /// </param>
- /// <param name="previewCount">
- /// The preview Count.
- /// </param>
- /// <param name="postAction">
- /// The post Action.
- /// </param>
- public void Scan(string sourcePath, int title, int previewCount, Action<bool> postAction)
- {
- this.scanService.Scan(sourcePath, title, previewCount, postAction);
- }
-
- /// <summary>
- /// Kill the scan
- /// </summary>
- public void Stop()
- {
- this.scanService.Stop();
- }
-
- #endregion
-
- #endregion
- }
-}
\ No newline at end of file

HandBrake-0.9.9.tar.bz2/win/CS/HandBrakeWPF/Views/Images/window.png Deleted

HandBrake-0.9.9.tar.bz2/win/CS/libraries/Growl license.txt Deleted

@@ -1,25 +0,0 @@
-Growl.NET GNTP Connector Library
------------------------------------------------
-Copyright (c) 2008 - Growl for Windows
-All rights reserved
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
-SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR 
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
-DAMAGE.
-

HandBrake-0.9.9.tar.bz2/win/CS/libraries/Growl.Connector.dll Deleted

HandBrake-0.9.9.tar.bz2/win/CS/libraries/Growl.CoreLibrary.dll Deleted

a52dec-0.7.4.tar.gz Deleted

cmake-3.0.1.tar.gz Added

faac-1.28.tar.gz Deleted

faad2-2.7.tar.gz Deleted

fdk-aac-v0.1.1-6-gbae4553.tar.bz2 Added

ffmpeg-v0.7-1696-gcae4f4b.tar.bz2 Deleted

fribidi-0.19.2.tar.gz Deleted

lame-3.98.tar.gz Deleted

libav-v9.6.tar.bz2/.gitignore -> libav-v10.1.tar.bz2/.gitignore Changed

libav-v9.6.tar.bz2/Changelog -> libav-v10.1.tar.bz2/Changelog Changed

@@ -1,148 +1,99 @@
 Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
-version 9.6:
-- aac: check the maximum number of channels to avoid invalid writes
-- indeo3: fix off by one in MV validity check
-- id3v2: check for end of file while unescaping tags to avoid invalid
-  writes, reported by Google Security Team
-- afifo: fix request_samples on the last frame in certain cases
-- hls, segment: fix splitting for audio-only streams
-- wav: Always seek to an even offset, Bug #500, LP: #1174737
-- swscale: Use alpha from the right row in yuva2rgba_c, Bug #504
-- indeo3: use unaligned reads on reference blocks, Bug #503
-- oma: properly forward errors in oma_read_packet
-- af_asyncts: fix offset calculation
-- proresdec: support mixed interlaced/non-interlaced content
-
-version 9.5:
-
-Most of the following fixes resulted from test samples that the Google
-Security Team has kindly made available to us:
-
-- af_channelmap: sanity check input channel indices in all cases
-- avfiltergraph: check for sws opts being non-NULL before using them
-- bmv: check for len being valid in bmv_decode_frame()
-- configure: Enable hwaccels without external dependencies by default
-- dfa: check for invalid access in decode_wdlt()
-- id3v2: pad the APIC packets as required by lavc
-- indeo3: check motion vectors
-- indeo3: fix data size check
-- indeo3: switch parsing the header to bytestream2
-- lavf: make sure stream probe data gets freed
-- matroska: Update the available size after lace parsing
-- matroska: fix a corner case in ebml-lace parsing
-- matroska: pass the lace size to the matroska_parse_rm_audio
-- mp3dec: fallback to generic seeking when a TOC is not present
-- oggdec: fix faulty cleanup prototype
-- oma: Validate sample rates
-- qdm2: check that the FFT size is a power of 2
-- riff: check for eof if chunk size and code are 0 to prevent an infinite loop
-- rv10: check that extradata is large enough
-- svq1dec: check that the reference frame has the same dimensions as the current one
-- svq1dec: clip motion vectors to the frame size
-- xmv: check audio track parameters validity
-- xmv: do not leak memory in the error paths in xmv_read_header()
-
-
-version 9.4:
-- atrac3: avoid oversized shifting in decode_bytes()
-- eamad: allocate a dummy reference frame when the real one is missing
-- ffv1: fix calculating slice dimensions for version 2
-- flacdec: simplify bounds checking in flac_probe()
-- h264: check for luma and chroma bit dept being equal (CVE-2013-2277)
-- hqdn3d: Fix out of array read in LOWPASS
-- iff: validate CMAP palette size (CVE-2013-2495)
-- ivi_common: do not call MC for intra frames when dc_transform is unset
-- libmp3lame: use the correct remaining buffer size when flushing
-- lzo: fix overflow checking in copy_backptr()
-- mp3dec: Fix VBR bit rate parsing
-- png: use av_mallocz_array() for the zlib zalloc function
-- roqvideodec: fix a potential infinite loop in roqvideo_decode_frame()
-- shorten: fix various programming mistakes
-- vf_gradfun: fix uninitialized variable use
-- vf_hqdn3d: fix uninitialized variable use
-- vmdaudio: fix invalid reads when packet size is not a multiple of chunk size
-- wmadec: require block_align to be set
-- wmaprodec: require block_align to be set
-- wmaprodec: return an error, not 0, when the input is too small
-- xxan: fix invalid memory access in xan_decode_frame_type0()
-
-version 9.3:
-- h264: fix deadlocks with broken/fuzzed files
-- flvdec: make decoder more robust
-- vorbisdec: fix buffer overflow (CVE-2013-0894)
-- ac3dec: validate channel output mode against channel count
-- doc: minor improvements
-
-version 9.2:
-- loco: check that there is data left after decoding a plane.
-- mov: use the format context for logging.
-- lagarith: avoid infinite loop in lag_rac_refill() with corrupted files
-- flicvideo: avoid an infinite loop in byte run compression
-- av_memcpy_backptr: avoid an infinite loop for back = 0
-- mlpdec: do not try to allocate a zero-sized output buffer.
-- qtrle: add more checks against pixel_ptr being negative.
-- 4xm: check the return value of read_huffman_tables().
-- cavs: initialize various context tables, avoids crashes with corrupted files
-- x86/H.264: Don't use redzone in AVX h264_deblock on Win64
-- VQA video: check chunk sizes before reading chunks
-- RoQ video decoder: check dimensions validity
-- QDM2: check array index before use, fix out of array accesses
-- mpegvideo: Do REBASE_PICTURE with byte pointers
-- SVQ3: unbreak decoding
-- libopencore-amrwb: Make AMR-WB ifdeffery more precise
-- libopencore-amr: Conditionally compile decoder and encoder bits
-- arm: Fall back to runtime cpu feature detection via /proc/cpuinfo
-- xxan: properly handle odd heights
-- msrledec: check bounds before constructing a possibly invalid pointer (CVE-2496)
-- qtrle: fix the topmost line for 1bit
-- aasc: fix output for msrle compression
-- yop: check for input overreads
-- yop: check that extradata is large enough
-- fraps: fix off-by one bug for version 1
-- vf_delogo: fix copying the input frame
-- vf_delogo: fix an uninitialized read
-- dnxhdenc: fix invalid reads in dnxhd_mb_var_thread()
-- ATRAC3: use correct loop variable in add_tonal_components()
-- MLP: store the channel layout for each substream
-- MLP decoder: TrueHD: use Libav channel order
-- x86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly
-- arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht
-- lavr: call mix_function_init() in ff_audio_mix_set_matrix()
-- rtpenc_chain: Use the original AVFormatContext for getting payload type
-- rtp: Make sure the output format pointer is set
-- rtp: Make sure priv_data is set before reading it
-- videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
-- get_bits: change the failure condition in init_get_bits
-- mpegvideo: fix loop condition in draw_line()
-- fate: update ref after rv30_loop_filter fix
-- RV30: fix masking in rv30_loop_filter()
-- libcdio: support recent cdio-paranoia
-- Theora: Skip zero-sized headers
-- H.264: add 3 pixels below for subpixel filter wait position
-- H.264: fix ff_generate_sliding_window_mmcos() prototype
-- H.264: don't clobber mmco opcode tables for non-first slice headers
-- libx264: use the library specific default rc_initial_buffer_occupancy
-- lavc: set the default rc_initial_buffer_occupancy
-- lavc: introduce the convenience function init_get_bits8
-- lavc: check for overflow in init_get_bits
-- configure: enable pic for shared libs on AArch64
-- zmbv: Reset the decoder on keyframe errors
-- VC1 decoder: prevent a crash due missing pred_flag parameter
-- matroska: Fix use after free
-- VP3: Fix double free in vp3_decode_end()
-
-
-version 9.1:
-- Fix a crash on windows platforms related to automatic stack alignment
-  in libavresample
-- Fix memleaks in the Ogg demuxer. Related to CVE-2012-2882
+version 10.1:
+- pcm-dvd: Fix 20bit decoding (bug/592)
+- avi: Improve non-interleaved detection (bug/666)
+- arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
+- arm: hpeldsp: prevent overreads in armv6 asm (bug/646)
+- avfilter: Add missing emms_c when needed
+- rtmpproto: Check the buffer sizes when copying app/playpath strings
+- swscale: Fix an undefined behaviour
+- vp9: Read the frame size as unsigned
+- dcadec: Use correct channel count in stereo downmix check
+- dcadec: Do not decode the XCh extension when downmixing to stereo
+- matroska: add the Opus mapping
+- matroskadec: read the CodecDelay element
+- rtmpproto: Make sure to pass on the error code if read_connect failed
+- lavr: allocate the resampling buffer with a positive size
+- mp3enc: Properly write bitrate value in XING header (debian/736088)
+- golomb: Fix the implementation of get_se_golomb_long
+
+version 10:
+- af_channelmap: fix ONE_STR mapping mode
+- matroskaenc: HEVC fixeswrite private data in hvcC format for HEVC.
+- doc: Point to the correct, actually maintained gas-preprocessor repo
+- http: Add support reading ICY metadata
+- configure: Support older version of openjpeg1
+
+version 10~beta2:
+- compand audio filter
+- and many various smaller fixes, for a full changelog, please refer to:
+  cf. https://git.libav.org/?p=libav.git;a=shortlog;h=refs/tags/v10_beta2
+
+version 10~beta1:
+- av_strnstr
+- support ID3v2 tags in ASF files
+- reference-counting for AVFrame and AVPacket data
+- avconv now fails when input options are used for output file
+  or vice versa
+- avconv options -filter_script and -filter_complex_script, which allow a
+  filtergraph description to be read from a file
+- uniform options syntax across all filters
+- interlace filter
+- JPEG 2000 decoder
+- asetpts filter (same as setpts, but for audio)
+- trim and atrim filters
+- avconv -t and -ss (output-only) options are now sample-accurate when
+  transcoding audio
+- Matroska muxer can now put the index at the beginning of the file.
+- avconv -deinterlace option removed, the yadif filter should be used instead
+- Apple Intermediate Codec decoder
+- Escape 130 video decoder
+- support for slice multithreading in libavfilter
+- VC-1 interlaced B-frame support
+- support for WavPack muxing (raw and in Matroska)
+- Go2Webinar decoder
+- WavPack encoding through libwavpack
+- Added the -n parameter to avconv
+- RTMP seek support
+- when transcoding with avconv (i.e. not streamcopying), -ss is now accurate
+  even when used as an input option. Previous behavior can be restored with
+  the -noaccurate_seek option.
+- avconv -t option can now be used for inputs, to limit the duration of
+  data read from an input file
+- Voxware MetaSound decoder
+- WebP decoder
+- Error Resilient AAC syntax (ER AAC LC) decoding
+- Low Delay AAC (ER AAC LD) decoding
+- mux chapters in ASF files
+- Opus in Ogg demuxing
+- Enhanced Low Delay AAC (ER AAC ELD) decoding (no LD SBR support)
+- F4V muxer
+- HNM version 4 demuxer and video decoder
+- HEVC decoder
+- raw HEVC, HEVC in MOV/MP4, HEVC in Matroska, HEVC in MPEG-TS demuxing
+- remove avplay -vismv option, which has not worked for a long time
+- Live HDS muxer
+- setsar/setdar filters now support variables in ratio expressions
+- dar variable in the scale filter now returns the actual DAR (i.e. a * sar)
+- VP9 decoder
+- support for decoding through VDPAU in avconv (the -hwaccel option)
+- remove mp3_header_(de)compress bitstream filters
+- stereoscopic 3d metadata handling
+- png standalone parser
+- WebP encoding via libwebp
+- ATRAC3+ decoder
+- framepack filter
+- Mirillis FIC video decoder
+- Support DNx444
 
 
 version 9:
 - av_basename and av_dirname
 - adobe and limelight publisher authentication in RTMP
+- VDPAU hardware acceleration through normal hwaccel
+- SRTP support
 
 
 version 9_beta3:
@@ -490,7 +441,7 @@
 - LPCM support in MPEG-TS (HDMV RID as found on Blu-ray disks)
 - WMA Pro decoder
 - Core Audio Format demuxer
-- Atrac1 decoder
+- ATRAC1 decoder
 - MD STUDIO audio demuxer
 - RF64 support in WAV demuxer
 - MPEG-4 Audio Lossless Coding (ALS) decoder
@@ -590,7 +541,7 @@
 - MXF demuxer
 - VC-1/WMV3/WMV9 video decoder
 - MacIntel support
-- AVISynth support
+- AviSynth support
 - VMware video decoder
 - VP5 video decoder
 - VP6 video decoder
@@ -618,7 +569,7 @@
 - Interplay C93 demuxer and video decoder
 - Bethsoft VID demuxer and video decoder
 - CRYO APC demuxer
-- Atrac3 decoder
+- ATRAC3 decoder
 - V.Flash PTX decoder
 - RoQ muxer, RoQ audio encoder
 - Renderware TXD demuxer and decoder

libav-v9.6.tar.bz2/LICENSE -> libav-v10.1.tar.bz2/LICENSE Changed

libav-v9.6.tar.bz2/Makefile -> libav-v10.1.tar.bz2/Makefile Changed

@@ -11,7 +11,7 @@
 Q = @
 ECHO = printf "$(1)\t%s\n" $(2)
 BRIEF = CC HOSTCC HOSTLD AS YASM AR LD
-SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM
+SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM STRIP
 MSG = $@
 M = @$(call ECHO,$(TAG),$@);
 $(foreach VAR,$(BRIEF), \
@@ -28,7 +28,7 @@
 CCFLAGS = $(CPPFLAGS) $(CFLAGS)
 ASFLAGS := $(CPPFLAGS) $(ASFLAGS)
 YASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm
-HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS)
+HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS)
 LDFLAGS := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS)
 
 define COMPILE
@@ -38,6 +38,7 @@
 
 COMPILE_C = $(call COMPILE,CC)
 COMPILE_S = $(call COMPILE,AS)
+COMPILE_HOSTC = $(call COMPILE,HOSTCC)
 
 %.o: %.c
 	$(COMPILE_C)
@@ -45,6 +46,9 @@
 %.o: %.S
 	$(COMPILE_S)
 
+%_host.o: %.c
+	$(COMPILE_HOSTC)
+
 %.i: %.c
 	$(CC) $(CCFLAGS) $(CC_E) $<
 
@@ -56,23 +60,27 @@
 
 %.c %.h: TAG = GEN
 
-PROGS-$(CONFIG_AVCONV) += avconv
-PROGS-$(CONFIG_AVPLAY) += avplay
-PROGS-$(CONFIG_AVPROBE) += avprobe
-PROGS-$(CONFIG_AVSERVER) += avserver
+AVPROGS-$(CONFIG_AVCONV) += avconv
+AVPROGS-$(CONFIG_AVPLAY) += avplay
+AVPROGS-$(CONFIG_AVPROBE) += avprobe
+AVPROGS-$(CONFIG_AVSERVER) += avserver
+
+AVPROGS := $(AVPROGS-yes:%=%$(EXESUF))
+PROGS += $(AVPROGS)
+
+AVBASENAMES = avconv avplay avprobe avserver
+ALLAVPROGS = $(AVBASENAMES:%=%$(EXESUF))
+
+$(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o))
+
+OBJS-avconv += avconv_opt.o avconv_filter.o
+OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o
 
-PROGS := $(PROGS-yes:%=%$(EXESUF))
-OBJS = cmdutils.o $(EXEOBJS)
-OBJS-avconv = avconv_opt.o avconv_filter.o
 TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64
 HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options
 TOOLS = qt-faststart trasher
 TOOLS-$(CONFIG_ZLIB) += cws2fws
 
-BASENAMES = avconv avplay avprobe avserver
-ALLPROGS = $(BASENAMES:%=%$(EXESUF))
-ALLMANPAGES = $(BASENAMES:%=%.1)
-
 FFLIBS-$(CONFIG_AVDEVICE) += avdevice
 FFLIBS-$(CONFIG_AVFILTER) += avfilter
 FFLIBS-$(CONFIG_AVFORMAT) += avformat
@@ -84,14 +92,14 @@
 
 DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.avpreset)
 
-SKIPHEADERS = cmdutils_common_opts.h
+SKIPHEADERS = cmdutils_common_opts.h compat/w32pthreads.h
 
 include $(SRC_PATH)/common.mak
 
 FF_EXTRALIBS := $(FFEXTRALIBS)
 FF_DEP_LIBS := $(DEP_LIBS)
 
-all: $(PROGS)
+all: $(AVPROGS)
 
 $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
 	$(LD) $(LDFLAGS) $(LD_O) $^ $(ELIBS)
@@ -126,8 +134,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)$(EXESUF): $$(OBJS-$(1))
 $$(OBJS-$(1)): CFLAGS += $(CFLAGS-$(1))
 $(1)$(EXESUF): LDFLAGS += $(LDFLAGS-$(1))
@@ -135,7 +145,7 @@
 -include $$(OBJS-$(1):.o=.d)
 endef
 
-$(foreach P,$(PROGS-yes),$(eval $(call DOPROG,$(P))))
+$(foreach P,$(PROGS),$(eval $(call DOPROG,$(P:$(EXESUF)=))))
 
 $(PROGS): %$(EXESUF): %.o $(FF_DEP_LIBS)
 	$(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
@@ -157,7 +167,7 @@
 # force version.sh to run whenever version might have changed
 -include .version
 
-ifdef PROGS
+ifdef AVPROGS
 install: install-progs install-data
 endif
 
@@ -168,9 +178,9 @@
 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 $(PROGS) "$(BINDIR)"
+	$(INSTALL) -c -m 755 $(AVPROGS) "$(BINDIR)"
 
 install-data: $(DATA_FILES)
 	$(Q)mkdir -p "$(DATADIR)"
@@ -179,26 +189,26 @@
 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)
+	$(RM) $(ALLAVPROGS)
 	$(RM) $(CLEANSUFFIXES)
 	$(RM) $(CLEANSUFFIXES:%=tools/%)
+	$(RM) -rf coverage.info lcov
 
 distclean::
 	$(RM) $(DISTCLEANSUFFIXES)
-	$(RM) config.* .version version.h libavutil/avconfig.h
+	$(RM) config.* .config libavutil/avconfig.h .version version.h
 
 config:
 	$(SRC_PATH)/configure $(value LIBAV_CONFIGURATION)
 
 check: all alltools checkheaders examples testprogs fate
 
-include $(SRC_PATH)/doc/Makefile
 include $(SRC_PATH)/tests/Makefile
 
 $(sort $(OBJDIRS)):

libav-v9.6.tar.bz2/RELEASE -> libav-v10.1.tar.bz2/RELEASE Changed

libav-v9.6.tar.bz2/avconv.c -> libav-v10.1.tar.bz2/avconv.c Changed

@@ -27,6 +27,8 @@
 #include <errno.h>
 #include <signal.h>
 #include <limits.h>
+#include <stdint.h>
+
 #include "libavformat/avformat.h"
 #include "libavdevice/avdevice.h"
 #include "libswscale/swscale.h"
@@ -35,7 +37,6 @@
 #include "libavutil/channel_layout.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/samplefmt.h"
-#include "libavutil/colorspace.h"
 #include "libavutil/fifo.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/dict.h"
@@ -48,7 +49,6 @@
 #include "libavformat/os_support.h"
 
 # include "libavfilter/avfilter.h"
-# include "libavfilter/avfiltergraph.h"
 # include "libavfilter/buffersrc.h"
 # include "libavfilter/buffersink.h"
 
@@ -144,7 +144,7 @@
 
 const AVIOInterruptCB int_cb = { decode_interrupt_cb, NULL };
 
-static void exit_program(void)
+static void avconv_cleanup(int ret)
 {
 int i, j;
 
@@ -160,6 +160,7 @@
 av_freep(&filtergraphs[i]->outputs[j]);
 }
 av_freep(&filtergraphs[i]->outputs);
+ av_freep(&filtergraphs[i]->graph_desc);
 av_freep(&filtergraphs[i]);
 }
 av_freep(&filtergraphs);
@@ -167,7 +168,7 @@
 /* close files */
 for (i = 0; i < nb_output_files; i++) {
 AVFormatContext *s = output_files[i]->ctx;
- if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb)
+ if (s && s->oformat && !(s->oformat->flags & AVFMT_NOFILE) && s->pb)
 avio_close(s->pb);
 avformat_free_context(s);
 av_dict_free(&output_files[i]->opts);
@@ -181,7 +182,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_freep(&output_streams[i]->avfilter);
@@ -193,10 +196,11 @@
 av_freep(&input_files[i]);
 }
 for (i = 0; i < nb_input_streams; i++) {
- avcodec_free_frame(&input_streams[i]->decoded_frame);
+ av_frame_free(&input_streams[i]->decoded_frame);
+ av_frame_free(&input_streams[i]->filter_frame);
 av_dict_free(&input_streams[i]->opts);
- free_buffer_pool(&input_streams[i]->buffer_pool);
 av_freep(&input_streams[i]->filters);
+ av_freep(&input_streams[i]->hwaccel_device);
 av_freep(&input_streams[i]);
 }
 
@@ -211,7 +215,6 @@
 
 uninit_opts();
 
- avfilter_uninit();
 avformat_network_deinit();
 
 if (received_sigterm) {
@@ -226,7 +229,7 @@
 AVDictionaryEntry *t;
 if ((t = av_dict_get(m, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
 av_log(NULL, AV_LOG_FATAL, "Option %s not found.\n", t->key);
- exit(1);
+ exit_program(1);
 }
 }
 
@@ -241,7 +244,7 @@
 if (!(codec->capabilities & CODEC_CAP_EXPERIMENTAL))
 av_log(NULL, AV_LOG_FATAL, "Or use the non experimental %s '%s'.\n",
 codec_string, codec->name);
- exit(1);
+ exit_program(1);
 }
 
 /*
@@ -332,25 +335,47 @@
 pkt->flags & AV_PKT_FLAG_KEY);
 if (a > 0) {
 av_free_packet(pkt);
- new_pkt.destruct = av_destruct_packet;
+ new_pkt.buf = av_buffer_create(new_pkt.data, new_pkt.size,
+ av_buffer_default_free, NULL, 0);
+ if (!new_pkt.buf)
+ exit_program(1);
 } else if (a < 0) {
 av_log(NULL, AV_LOG_ERROR, "%s failed for stream %d, codec %s",
 bsfc->filter->name, pkt->stream_index,
 avctx->codec ? avctx->codec->name : "copy");
 print_error("", a);
 if (exit_on_error)
- exit(1);
+ exit_program(1);
 }
 *pkt = new_pkt;
 
 bsfc = bsfc->next;
 }
 
+ if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS) &&
+ ost->last_mux_dts != AV_NOPTS_VALUE &&
+ pkt->dts < ost->last_mux_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT)) {
+ av_log(NULL, AV_LOG_WARNING, "Non-monotonous DTS in output stream "
+ "%d:%d; previous: %"PRId64", current: %"PRId64"; ",
+ ost->file_index, ost->st->index, ost->last_mux_dts, pkt->dts);
+ if (exit_on_error) {
+ av_log(NULL, AV_LOG_FATAL, "aborting.\n");
+ exit_program(1);
+ }
+ av_log(NULL, AV_LOG_WARNING, "changing to %"PRId64". This may result "
+ "in incorrect timestamps in the output file.\n",
+ ost->last_mux_dts + 1);
+ pkt->dts = ost->last_mux_dts + 1;
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts = FFMAX(pkt->pts, pkt->dts);
+ }
+ ost->last_mux_dts = pkt->dts;
+
 pkt->stream_index = ost->index;
 ret = av_interleaved_write_frame(s, pkt);
 if (ret < 0) {
 print_error("av_interleaved_write_frame()", ret);
- exit(1);
+ exit_program(1);
 }
 }
 
@@ -378,16 +403,13 @@
 pkt.data = NULL;
 pkt.size = 0;
 
- if (!check_recording_time(ost))
- return;
-
 if (frame->pts == AV_NOPTS_VALUE || audio_sync_method < 0)
 frame->pts = ost->sync_opts;
 ost->sync_opts = frame->pts + frame->nb_samples;
 
 if (avcodec_encode_audio2(enc, &pkt, frame, &got_packet) < 0) {
 av_log(NULL, AV_LOG_FATAL, "Audio encoding failed\n");
- exit(1);
+ exit_program(1);
 }
 
 if (got_packet) {
@@ -404,45 +426,6 @@
 }
 }
 
-static void pre_process_video_frame(InputStream *ist, AVPicture *picture, void **bufp)
-{
- AVCodecContext *dec;
- AVPicture *picture2;
- AVPicture picture_tmp;
- uint8_t *buf = 0;
-
- dec = ist->st->codec;
-
- /* deinterlace : must be done before any resize */
- if (do_deinterlace) {
- int size;
-
- /* create temporary picture */
- size = avpicture_get_size(dec->pix_fmt, dec->width, dec->height);
- buf = av_malloc(size);
- if (!buf)
- return;
-
- picture2 = &picture_tmp;
- avpicture_fill(picture2, buf, dec->pix_fmt, dec->width, dec->height);
-
- if (avpicture_deinterlace(picture2, picture,
- dec->pix_fmt, dec->width, dec->height) < 0) {
- /* if error, do not deinterlace */
- av_log(NULL, AV_LOG_WARNING, "Deinterlacing failed\n");
- av_free(buf);
- buf = NULL;
- picture2 = picture;
- }
- } else {
- picture2 = picture;
- }
-
- if (picture != picture2)
- *picture = *picture2;
- *bufp = buf;
-}
-
 static void do_subtitle_out(AVFormatContext *s,
 OutputStream *ost,
 InputStream *ist,
@@ -458,7 +441,7 @@
 if (pts == AV_NOPTS_VALUE) {
 av_log(NULL, AV_LOG_ERROR, "Subtitle packets must have a pts\n");
 if (exit_on_error)
- exit(1);
+ exit_program(1);
 return;
 }
 
@@ -490,7 +473,7 @@
 subtitle_out_max_size, sub);
 if (subtitle_out_size < 0) {
 av_log(NULL, AV_LOG_FATAL, "Subtitle encoding failed\n");
- exit(1);
+ exit_program(1);
 }
 
 av_init_packet(&pkt);
@@ -545,8 +528,7 @@
 pkt.data = NULL;
 pkt.size = 0;
 
- if (!check_recording_time(ost) ||
- ost->frame_number >= ost->max_frames)
+ if (ost->frame_number >= ost->max_frames)
 return;
 
 if (s->oformat->flags & AVFMT_RAWPICTURE &&
@@ -564,31 +546,23 @@
 write_frame(s, &pkt, ost);
 } else {
 int got_packet;
- AVFrame big_picture;
-
- big_picture = *in_picture;
- /* better than nothing: use input picture interlaced
- settings */
- big_picture.interlaced_frame = in_picture->interlaced_frame;
- if (ost->st->codec->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME)) {
- if (ost->top_field_first == -1)
- big_picture.top_field_first = in_picture->top_field_first;
- else
- big_picture.top_field_first = !!ost->top_field_first;
- }
 
- big_picture.quality = ost->st->codec->global_quality;
+ if (ost->st->codec->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME) &&
+ ost->top_field_first >= 0)
+ in_picture->top_field_first = !!ost->top_field_first;
+
+ in_picture->quality = ost->st->codec->global_quality;
 if (!enc->me_threshold)
- big_picture.pict_type = 0;
+ in_picture->pict_type = 0;
 if (ost->forced_kf_index < ost->forced_kf_count &&
- big_picture.pts >= ost->forced_kf_pts[ost->forced_kf_index]) {
- big_picture.pict_type = AV_PICTURE_TYPE_I;
+ in_picture->pts >= ost->forced_kf_pts[ost->forced_kf_index]) {
+ in_picture->pict_type = AV_PICTURE_TYPE_I;
 ost->forced_kf_index++;
 }
- ret = avcodec_encode_video2(enc, &pkt, &big_picture, &got_packet);
+ ret = avcodec_encode_video2(enc, &pkt, in_picture, &got_packet);
 if (ret < 0) {
 av_log(NULL, AV_LOG_FATAL, "Video encoding failed\n");
- exit(1);
+ exit_program(1);
 }
 
 if (got_packet) {
@@ -632,7 +606,7 @@
 vstats_file = fopen(vstats_filename, "w");
 if (!vstats_file) {
 perror("fopen");
- exit(1);
+ exit_program(1);
 }
 }
 
@@ -663,45 +637,38 @@
 static int poll_filter(OutputStream *ost)
 {
 OutputFile *of = output_files[ost->file_index];
- AVFilterBufferRef *picref;
 AVFrame *filtered_frame = NULL;
 int frame_size, ret;
 
- 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;
 
 if (ost->enc->type == AVMEDIA_TYPE_AUDIO &&
 !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE))
- ret = av_buffersink_read_samples(ost->filter->filter, &picref,
+ ret = av_buffersink_get_samples(ost->filter->filter, filtered_frame,
 ost->st->codec->frame_size);
 else
- ret = av_buffersink_read(ost->filter->filter, &picref);
+ ret = av_buffersink_get_frame(ost->filter->filter, filtered_frame);
 
 if (ret < 0)
 return ret;
 
- avfilter_copy_buf_props(filtered_frame, picref);
- if (picref->pts != AV_NOPTS_VALUE) {
- filtered_frame->pts = av_rescale_q(picref->pts,
+ if (filtered_frame->pts != AV_NOPTS_VALUE) {
+ int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time;
+ filtered_frame->pts = av_rescale_q(filtered_frame->pts,
 ost->filter->filter->inputs[0]->time_base,
 ost->st->codec->time_base) -
- av_rescale_q(of->start_time,
+ av_rescale_q(start_time,
 AV_TIME_BASE_Q,
 ost->st->codec->time_base);
-
- if (of->start_time && filtered_frame->pts < 0) {
- avfilter_unref_buffer(picref);
- return 0;
- }
 }
 
 switch (ost->filter->filter->inputs[0]->type) {
 case AVMEDIA_TYPE_VIDEO:
 if (!ost->frame_aspect_ratio)
- ost->st->codec->sample_aspect_ratio = picref->video->pixel_aspect;
+ ost->st->codec->sample_aspect_ratio = filtered_frame->sample_aspect_ratio;
 
 do_video_out(of->ctx, ost, filtered_frame, &frame_size);
 if (vstats_filename && frame_size)
@@ -715,7 +682,7 @@
 av_assert0(0);
 }
 
- avfilter_unref_buffer(picref);
+ av_frame_unref(filtered_frame);
 
 return 0;
 }
@@ -891,14 +858,18 @@
 fflush(stderr);
 
 if (is_last_report) {
- int64_t raw= audio_size + video_size + extra_size;
+ int64_t raw = audio_size + video_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 global headers:%1.0fkB muxing overhead %f%%\n",
 video_size / 1024.0,
 audio_size / 1024.0,
 extra_size / 1024.0,
- 100.0 * (total_size - raw) / raw
- );
+ percent);
 }
 }
 
@@ -950,7 +921,7 @@
 ret = encode(enc, &pkt, NULL, &got_packet);
 if (ret < 0) {
 av_log(NULL, AV_LOG_FATAL, "%s encoding failed\n", desc);
- exit(1);
+ exit_program(1);
 }
 *size += ret;
 if (ost->logfile && enc->stats_out) {
@@ -986,7 +957,7 @@
 if (ost->source_index != ist_index)
 return 0;
 
- if (of->start_time && ist->last_dts < of->start_time)
+ if (of->start_time != AV_NOPTS_VALUE && ist->last_dts < of->start_time)
 return 0;
 
 return 1;
@@ -995,7 +966,9 @@
 static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *pkt)
 {
 OutputFile *of = output_files[ost->file_index];
- int64_t ost_tb_start_time = av_rescale_q(of->start_time, AV_TIME_BASE_Q, ost->st->time_base);
+ InputFile *f = input_files [ist->file_index];
+ int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time;
+ int64_t ost_tb_start_time = av_rescale_q(start_time, AV_TIME_BASE_Q, ost->st->time_base);
 AVPacket opkt;
 
 av_init_packet(&opkt);
@@ -1005,11 +978,21 @@
 return;
 
 if (of->recording_time != INT64_MAX &&
- ist->last_dts >= of->recording_time + of->start_time) {
+ ist->last_dts >= of->recording_time + start_time) {
 ost->finished = 1;
 return;
 }
 
+ if (f->recording_time != INT64_MAX) {
+ start_time = f->ctx->start_time;
+ if (f->start_time != AV_NOPTS_VALUE)
+ start_time += f->start_time;
+ if (ist->last_dts >= f->recording_time + start_time) {
+ ost->finished = 1;
+ return;
+ }
+ }
+
 /* force the input stream PTS */
 if (ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
 audio_size += pkt->size;
@@ -1038,8 +1021,14 @@
 && 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))
- opkt.destruct = av_destruct_packet;
+ 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);
+ }
 } else {
 opkt.data = pkt->data;
 opkt.size = pkt->size;
@@ -1049,16 +1038,6 @@
 ost->st->codec->frame_number++;
 }
 
-static void rate_emu_sleep(InputStream *ist)
-{
- if (input_files[ist->file_index]->rate_emu) {
- int64_t pts = av_rescale(ist->last_dts, 1000000, AV_TIME_BASE);
- int64_t now = av_gettime() - ist->start;
- if (pts > now)
- av_usleep(pts - now);
- }
-}
-
 int guess_input_channel_layout(InputStream *ist)
 {
 AVCodecContext *dec = ist->st->codec;
@@ -1079,11 +1058,13 @@
 
 static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
 {
- AVFrame *decoded_frame;
+ AVFrame *decoded_frame, *f;
 AVCodecContext *avctx = ist->st->codec;
- int i, ret, resample_changed;
+ int i, ret, err = 0, resample_changed;
 
- 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);
 decoded_frame = ist->decoded_frame;
 
@@ -1091,7 +1072,7 @@
 if (!*got_output || ret < 0) {
 if (!pkt->size) {
 for (i = 0; i < ist->nb_filters; i++)
- av_buffersrc_buffer(ist->filters[i]->filter, NULL);
+ av_buffersrc_add_frame(ist->filters[i]->filter, NULL);
 }
 return ret;
 }
@@ -1105,8 +1086,6 @@
 pkt->pts = AV_NOPTS_VALUE;
 }
 
- rate_emu_sleep(ist);
-
 resample_changed = ist->resample_sample_fmt != decoded_frame->format ||
 ist->resample_channels != avctx->channels ||
 ist->resample_channel_layout != decoded_frame->channel_layout ||
@@ -1118,7 +1097,7 @@
 av_log(NULL, AV_LOG_FATAL, "Unable to find default channel "
 "layout for Input Stream #%d.%d\n", ist->file_index,
 ist->st->index);
- exit(1);
+ exit_program(1);
 }
 decoded_frame->channel_layout = avctx->channel_layout;
 
@@ -1144,7 +1123,7 @@
 if (ist_in_filtergraph(filtergraphs[i], ist) &&
 configure_filtergraph(filtergraphs[i]) < 0) {
 av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n");
- exit(1);
+ exit_program(1);
 }
 }
 
@@ -1152,19 +1131,33 @@
 decoded_frame->pts = av_rescale_q(decoded_frame->pts,
 ist->st->time_base,
 (AVRational){1, ist->st->codec->sample_rate});
- for (i = 0; i < ist->nb_filters; i++)
- av_buffersrc_write_frame(ist->filters[i]->filter, decoded_frame);
+ for (i = 0; i < ist->nb_filters; i++) {
+ if (i < ist->nb_filters - 1) {
+ f = ist->filter_frame;
+ err = av_frame_ref(f, decoded_frame);
+ if (err < 0)
+ break;
+ } else
+ f = decoded_frame;
 
- return ret;
+ err = av_buffersrc_add_frame(ist->filters[i]->filter, f);
+ if (err < 0)
+ break;
+ }
+
+ av_frame_unref(ist->filter_frame);
+ av_frame_unref(decoded_frame);
+ return err < 0 ? err : ret;
 }
 
 static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
 {
- AVFrame *decoded_frame;
- void *buffer_to_free = NULL;
- int i, ret = 0, resample_changed;
+ AVFrame *decoded_frame, *f;
+ int i, ret = 0, err = 0, resample_changed;
 
- 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);
 decoded_frame = ist->decoded_frame;
 
@@ -1173,17 +1166,21 @@
 if (!*got_output || ret < 0) {
 if (!pkt->size) {
 for (i = 0; i < ist->nb_filters; i++)
- av_buffersrc_buffer(ist->filters[i]->filter, NULL);
+ av_buffersrc_add_frame(ist->filters[i]->filter, NULL);
 }
 return ret;
 }
 
+ 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;
+
 decoded_frame->pts = guess_correct_pts(&ist->pts_ctx, decoded_frame->pkt_pts,
 decoded_frame->pkt_dts);
 pkt->size = 0;
- pre_process_video_frame(ist, (AVPicture *)decoded_frame, &buffer_to_free);
-
- rate_emu_sleep(ist);
 
 if (ist->st->sample_aspect_ratio.num)
 decoded_frame->sample_aspect_ratio = ist->st->sample_aspect_ratio;
@@ -1210,31 +1207,28 @@
 if (ist_in_filtergraph(filtergraphs[i], ist) &&
 configure_filtergraph(filtergraphs[i]) < 0) {
 av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n");
- exit(1);
+ exit_program(1);
 }
 }
 
 for (i = 0; i < ist->nb_filters; i++) {
- if (ist->st->codec->codec->capabilities & CODEC_CAP_DR1) {
- FrameBuffer *buf = decoded_frame->opaque;
- AVFilterBufferRef *fb = avfilter_get_video_buffer_ref_from_arrays(
- decoded_frame->data, decoded_frame->linesize,
- AV_PERM_READ | AV_PERM_PRESERVE,
- ist->st->codec->width, ist->st->codec->height,
- ist->st->codec->pix_fmt);
-
- avfilter_copy_frame_props(fb, decoded_frame);
- fb->buf->priv = buf;
- fb->buf->free = filter_release_buffer;
-
- buf->refcount++;
- av_buffersrc_buffer(ist->filters[i]->filter, fb);
+ if (i < ist->nb_filters - 1) {
+ f = ist->filter_frame;
+ err = av_frame_ref(f, decoded_frame);
+ if (err < 0)
+ break;
 } else
- av_buffersrc_write_frame(ist->filters[i]->filter, decoded_frame);
+ f = decoded_frame;
+
+ err = av_buffersrc_add_frame(ist->filters[i]->filter, f);
+ if (err < 0)
+ break;
 }
 
- av_free(buffer_to_free);
- return ret;
+fail:
+ av_frame_unref(ist->filter_frame);
+ av_frame_unref(decoded_frame);
+ return err < 0 ? err : ret;
 }
 
 static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output)
@@ -1247,8 +1241,6 @@
 if (!*got_output)
 return ret;
 
- rate_emu_sleep(ist);
-
 for (i = 0; i < nb_output_streams; i++) {
 OutputStream *ost = output_streams[i];
 
@@ -1336,7 +1328,6 @@
 
 /* handle stream copy */
 if (!ist->decoding_needed) {
- rate_emu_sleep(ist);
 ist->last_dts = ist->next_dts;
 switch (ist->st->codec->codec_type) {
 case AVMEDIA_TYPE_AUDIO:
@@ -1367,12 +1358,12 @@
 
 static void print_sdp(void)
 {
- char sdp[2048];
+ char sdp[16384];
 int i;
 AVFormatContext **avc = av_malloc(sizeof(*avc) * nb_output_files);
 
 if (!avc)
- exit(1);
+ exit_program(1);
 for (i = 0; i < nb_output_files; i++)
 avc[i] = output_files[i]->ctx;
 
@@ -1382,6 +1373,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 i, ret;
@@ -1404,19 +1452,26 @@
 }
 }
 
- if (codec->type == AVMEDIA_TYPE_VIDEO && codec->capabilities & CODEC_CAP_DR1) {
- ist->st->codec->get_buffer = codec_get_buffer;
- ist->st->codec->release_buffer = codec_release_buffer;
- ist->st->codec->opaque = &ist->buffer_pool;
- }
+ 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);
- snprintf(error, error_len, "Error while opening decoder for input stream #%d:%d",
- ist->file_index, ist->st->index);
+
+ 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);
 return ret;
 }
 assert_avoptions(ist->opts);
@@ -1461,7 +1516,7 @@
 ost->forced_kf_pts = av_malloc(sizeof(*ost->forced_kf_pts) * n);
 if (!ost->forced_kf_pts) {
 av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n");
- exit(1);
+ exit_program(1);
 }
 
 p = kf;
@@ -1532,6 +1587,7 @@
 }
 
 if (ost->stream_copy) {
+ AVRational sar;
 uint64_t extra_size;
 
 av_assert0(ist && !ost->filter);
@@ -1571,11 +1627,13 @@
 } else
 codec->time_base = ist->st->time_base;
 
+ ost->parser = av_parser_init(codec->codec_id);
+
 switch (codec->codec_type) {
 case AVMEDIA_TYPE_AUDIO:
 if (audio_volume != 256) {
 av_log(NULL, AV_LOG_FATAL, "-acodec copy and -vol are incompatible (frames are not decoded)\n");
- exit(1);
+ exit_program(1);
 }
 codec->channel_layout = icodec->channel_layout;
 codec->sample_rate = icodec->sample_rate;
@@ -1589,13 +1647,13 @@
 codec->width = icodec->width;
 codec->height = icodec->height;
 codec->has_b_frames = icodec->has_b_frames;
- if (!codec->sample_aspect_ratio.num) {
- codec->sample_aspect_ratio =
- ost->st->sample_aspect_ratio =
- ist->st->sample_aspect_ratio.num ? ist->st->sample_aspect_ratio :
- ist->st->codec->sample_aspect_ratio.num ?
- ist->st->codec->sample_aspect_ratio : (AVRational){0, 1};
- }
+ if (ost->frame_aspect_ratio)
+ sar = av_d2q(ost->frame_aspect_ratio * codec->height / codec->width, 255);
+ else if (ist->st->sample_aspect_ratio.num)
+ sar = ist->st->sample_aspect_ratio;
+ else
+ sar = icodec->sample_aspect_ratio;
+ ost->st->sample_aspect_ratio = codec->sample_aspect_ratio = sar;
 break;
 case AVMEDIA_TYPE_SUBTITLE:
 codec->width = icodec->width;
@@ -1637,10 +1695,19 @@
 (video_sync_method == VSYNC_CFR ||
 (video_sync_method == VSYNC_AUTO &&
 !(oc->oformat->flags & (AVFMT_NOTIMESTAMPS | AVFMT_VARIABLE_FPS))))) {
- ost->frame_rate = ist->framerate.num ? ist->framerate :
- ist->st->avg_frame_rate.num ?
- ist->st->avg_frame_rate :
- (AVRational){25, 1};
+ if (ist->framerate.num)
+ ost->frame_rate = ist->framerate;
+ else if (ist->st->avg_frame_rate.num)
+ ost->frame_rate = ist->st->avg_frame_rate;
+ else {
+ av_log(NULL, AV_LOG_WARNING, "Constant framerate requested "
+ "for the output stream #%d:%d, but no information "
+ "about the input framerate is available. Falling "
+ "back to a default value of 25fps. Use the -r option "
+ "if you want a different framerate.\n",
+ ost->file_index, ost->index);
+ ost->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);
@@ -1655,7 +1722,7 @@
 fg = init_simple_filtergraph(ist, ost);
 if (configure_filtergraph(fg)) {
 av_log(NULL, AV_LOG_FATAL, "Error opening filters!\n");
- exit(1);
+ exit_program(1);
 }
 }
 
@@ -1713,7 +1780,7 @@
 if (!f) {
 av_log(NULL, AV_LOG_FATAL, "Cannot write log file '%s' for pass-1 encoding: %s\n",
 logfilename, strerror(errno));
- exit(1);
+ exit_program(1);
 }
 ost->logfile = f;
 } else {
@@ -1722,7 +1789,7 @@
 if (cmdutils_read_file(logfilename, &logbuffer, &logbuffer_size) < 0) {
 av_log(NULL, AV_LOG_FATAL, "Error reading log file '%s' for pass-2 encoding\n",
 logfilename);
- exit(1);
+ exit_program(1);
 }
 codec->stats_in = logbuffer;
 }
@@ -1763,9 +1830,8 @@
 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);
 }
 }
 
@@ -1796,10 +1862,11 @@
 oc->interrupt_callback = int_cb;
 if ((ret = avformat_write_header(oc, &output_files[i]->opts)) < 0) {
 char errbuf[128];
- const char *errbuf_ptr = errbuf;
- if (av_strerror(ret, errbuf, sizeof(errbuf)) < 0)
- errbuf_ptr = strerror(AVUNERROR(ret));
- snprintf(error, sizeof(error), "Could not write header for output file #%d (incorrect codec parameters ?): %s", i, errbuf_ptr);
+ av_strerror(ret, errbuf, sizeof(errbuf));
+ snprintf(error, sizeof(error),
+ "Could not write header for output file #%d "
+ "(incorrect codec parameters ?): %s",
+ i, errbuf);
 ret = AVERROR(EINVAL);
 goto dump_format;
 }
@@ -2045,6 +2112,17 @@
 
 static int get_input_packet(InputFile *f, AVPacket *pkt)
 {
+ if (f->rate_emu) {
+ int i;
+ for (i = 0; i < f->nb_streams; i++) {
+ InputStream *ist = input_streams[f->ist_index + i];
+ int64_t pts = av_rescale(ist->last_dts, 1000000, AV_TIME_BASE);
+ int64_t now = av_gettime() - ist->start;
+ if (pts > now)
+ return AVERROR(EAGAIN);
+ }
+ }
+
 #if HAVE_PTHREADS
 if (nb_input_files > 1)
 return get_input_packet_mt(f, pkt);
@@ -2112,7 +2190,7 @@
 if (ret != AVERROR_EOF) {
 print_error(is->filename, ret);
 if (exit_on_error)
- exit(1);
+ exit_program(1);
 }
 ifile->eof_reached = 1;
 
@@ -2180,7 +2258,7 @@
 av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d\n",
 ist->file_index, ist->st->index);
 if (exit_on_error)
- exit(1);
+ exit_program(1);
 }
 
 discard_packet:
@@ -2279,6 +2357,8 @@
 ist = input_streams[i];
 if (ist->decoding_needed) {
 avcodec_close(ist->st->codec);
+ if (ist->hwaccel_uninit)
+ ist->hwaccel_uninit(ist->st->codec);
 }
 }
 
@@ -2303,6 +2383,7 @@
 av_freep(&ost->st->codec->subtitle_header);
 av_free(ost->forced_kf_pts);
 av_dict_free(&ost->opts);
+ av_dict_free(&ost->resample_opts);
 }
 }
 }
@@ -2350,7 +2431,7 @@
 int ret;
 int64_t ti;
 
- atexit(exit_program);
+ register_exit(avconv_cleanup);
 
 av_log_set_flags(AV_LOG_SKIP_REPEATED);
 parse_loglevel(argc, argv, options);
@@ -2368,29 +2449,29 @@
 /* parse options and open all input/output files */
 ret = avconv_parse_options(argc, argv);
 if (ret < 0)
- exit(1);
+ exit_program(1);
 
 if (nb_output_files <= 0 && nb_input_files == 0) {
 show_usage();
 av_log(NULL, AV_LOG_WARNING, "Use -h to get full help or, even better, run 'man %s'\n", program_name);
- exit(1);
+ exit_program(1);
 }
 
 /* file converter / grab */
 if (nb_output_files <= 0) {
 fprintf(stderr, "At least one output file must be specified\n");
- exit(1);
+ exit_program(1);
 }
 
 ti = getutime();
 if (transcode() < 0)
- exit(1);
+ exit_program(1);
 ti = getutime() - ti;
 if (do_benchmark) {
 int maxrss = getmaxrss() / 1024;
 printf("bench: utime=%0.3fs maxrss=%ikB\n", ti / 1000000.0, maxrss);
 }
 
- exit(0);
+ exit_program(0);
 return 0;
 }

libav-v9.6.tar.bz2/avconv.h -> libav-v10.1.tar.bz2/avconv.h Changed

@@ -36,7 +36,6 @@
 #include "libavcodec/avcodec.h"
 
 #include "libavfilter/avfilter.h"
-#include "libavfilter/avfiltergraph.h"
 
 #include "libavutil/avutil.h"
 #include "libavutil/dict.h"
@@ -49,6 +48,19 @@
 #define VSYNC_CFR         1
 #define VSYNC_VFR         2
 
+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 */
@@ -89,11 +101,16 @@
     /* input options */
     int64_t input_ts_offset;
     int rate_emu;
+    int accurate_seek;
 
     SpecifierOpt *ts_scale;
     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;
@@ -158,6 +175,8 @@
     int        nb_copy_initial_nonkeyframes;
     SpecifierOpt *filters;
     int        nb_filters;
+    SpecifierOpt *filter_scripts;
+    int        nb_filter_scripts;
     SpecifierOpt *pass;
     int        nb_pass;
     SpecifierOpt *passlogfiles;
@@ -200,6 +219,7 @@
     int decoding_needed;     /* true if the packets must be decoded in 'raw_fifo' */
     AVCodec *dec;
     AVFrame *decoded_frame;
+    AVFrame *filter_frame; /* a ref of decoded_frame, to be sent to filters */
 
     int64_t       start;     /* time when read started */
     /* predicted dts of the next packet read for this stream or (when there are
@@ -223,13 +243,23 @@
     int      resample_channels;
     uint64_t resample_channel_layout;
 
-    /* a pool of free buffers for decoded data */
-    FrameBuffer *buffer_pool;
-
     /* decoded data from this stream goes into all those filters
      * currently video and audio only */
     InputFilter **filters;
     int        nb_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 {
@@ -238,9 +268,12 @@
     int eagain;           /* true if last read attempt returned EAGAIN */
     int ist_index;        /* index of first stream in ist_table */
     int64_t ts_offset;
+    int64_t start_time;   /* user-specified start time in AV_TIME_BASE or AV_NOPTS_VALUE */
+    int64_t recording_time;
     int nb_streams;       /* number of stream that avconv is aware of; may be different
                              from ctx.nb_streams if new streams appear during av_read_frame() */
     int rate_emu;
+    int accurate_seek;
 
 #if HAVE_PTHREADS
     pthread_t thread;           /* thread reading from this file */
@@ -267,6 +300,8 @@
     /* pts of the first frame encoded for this stream, used for limiting
      * recording time */
     int64_t first_pts;
+    /* dts of the last packet sent to the muxer */
+    int64_t last_mux_dts;
     AVBitStreamFilterContext *bitstream_filters;
     AVCodec *enc;
     int64_t max_frames;
@@ -293,12 +328,15 @@
 
     int64_t sws_flags;
     AVDictionary *opts;
+    AVDictionary *resample_opts;
     int finished;        /* no more packets should be written for this stream */
     int stream_copy;
     const char *attachment_filename;
     int copy_initial_nonkeyframes;
 
     enum AVPixelFormat pix_fmts[2];
+
+    AVCodecParserContext *parser;
 } OutputStream;
 
 typedef struct OutputFile {
@@ -347,11 +385,11 @@
 
 extern const OptionDef options[];
 
+extern const HWAccel hwaccels[];
+
 void reset_options(OptionsContext *o);
 void show_usage(void);
 
-int opt_cpuflags(void *optctx, const char *opt, const char *arg);
-
 void opt_output_file(void *optctx, const char *filename);
 
 void assert_avoptions(AVDictionary *m);
@@ -365,4 +403,6 @@
 
 int avconv_parse_options(int argc, char **argv);
 
+int vdpau_init(AVCodecContext *s);
+
 #endif /* AVCONV_H */

libav-v9.6.tar.bz2/avconv_filter.c -> libav-v10.1.tar.bz2/avconv_filter.c Changed

@@ -18,26 +18,31 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include <stdint.h>
+
 #include "avconv.h"
 
 #include "libavfilter/avfilter.h"
-#include "libavfilter/avfiltergraph.h"
+
+#include "libavresample/avresample.h"
 
 #include "libavutil/avassert.h"
+#include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
+#include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/pixfmt.h"
 #include "libavutil/samplefmt.h"
 
 /* Define a function for building a string containing a list of
 * allowed formats. */
-#define DEF_CHOOSE_FORMAT(type, var, supported_list, none, get_name, separator)\
+#define DEF_CHOOSE_FORMAT(type, var, supported_list, none, get_name) \
 static char *choose_ ## var ## s(OutputStream *ost) \
 { \
 if (ost->st->codec->var != none) { \
 get_name(ost->st->codec->var); \
 return av_strdup(name); \
- } else if (ost->enc->supported_list) { \
+ } else if (ost->enc && ost->enc->supported_list) { \
 const type *p; \
 AVIOContext *s = NULL; \
 uint8_t *ret; \
@@ -48,7 +53,7 @@
 \
 for (p = ost->enc->supported_list; *p != none; p++) { \
 get_name(*p); \
- avio_printf(s, "%s" separator, name); \
+ avio_printf(s, "%s|", name); \
 } \
 len = avio_close_dyn_buf(s, &ret); \
 ret[len - 1] = 0; \
@@ -58,16 +63,16 @@
 }
 
 DEF_CHOOSE_FORMAT(enum AVPixelFormat, pix_fmt, pix_fmts, AV_PIX_FMT_NONE,
- GET_PIX_FMT_NAME, ":")
+ GET_PIX_FMT_NAME)
 
 DEF_CHOOSE_FORMAT(enum AVSampleFormat, sample_fmt, sample_fmts,
- AV_SAMPLE_FMT_NONE, GET_SAMPLE_FMT_NAME, ",")
+ AV_SAMPLE_FMT_NONE, GET_SAMPLE_FMT_NAME)
 
 DEF_CHOOSE_FORMAT(int, sample_rate, supported_samplerates, 0,
- GET_SAMPLE_RATE_NAME, ",")
+ GET_SAMPLE_RATE_NAME)
 
 DEF_CHOOSE_FORMAT(uint64_t, channel_layout, channel_layouts, 0,
- GET_CH_LAYOUT_NAME, ",")
+ GET_CH_LAYOUT_NAME)
 
 FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost)
 {
@@ -149,7 +154,7 @@
 }
 if (i == nb_input_streams) {
 av_log(NULL, AV_LOG_FATAL, "Cannot find a matching stream for "
- "unlabeled input pad %d on filter %s", in->pad_idx,
+ "unlabeled input pad %d on filter %s\n", in->pad_idx,
 in->filter_ctx->name);
 exit(1);
 }
@@ -170,10 +175,62 @@
 ist->filters[ist->nb_filters - 1] = fg->inputs[fg->nb_inputs - 1];
 }
 
+static int insert_trim(int64_t start_time, int64_t duration,
+ AVFilterContext **last_filter, int *pad_idx,
+ const char *filter_name)
+{
+ AVFilterGraph *graph = (*last_filter)->graph;
+ AVFilterContext *ctx;
+ const AVFilter *trim;
+ enum AVMediaType type = avfilter_pad_get_type((*last_filter)->output_pads, *pad_idx);
+ const char *name = (type == AVMEDIA_TYPE_VIDEO) ? "trim" : "atrim";
+ int ret = 0;
+
+ if (duration == INT64_MAX && start_time == AV_NOPTS_VALUE)
+ return 0;
+
+ trim = avfilter_get_by_name(name);
+ if (!trim) {
+ av_log(NULL, AV_LOG_ERROR, "%s filter not present, cannot limit "
+ "recording time.\n", name);
+ return AVERROR_FILTER_NOT_FOUND;
+ }
+
+ ctx = avfilter_graph_alloc_filter(graph, trim, filter_name);
+ if (!ctx)
+ return AVERROR(ENOMEM);
+
+ if (duration != INT64_MAX) {
+ ret = av_opt_set_double(ctx, "duration", (double)duration / 1e6,
+ AV_OPT_SEARCH_CHILDREN);
+ }
+ if (ret >= 0 && start_time != AV_NOPTS_VALUE) {
+ ret = av_opt_set_double(ctx, "start", (double)start_time / 1e6,
+ AV_OPT_SEARCH_CHILDREN);
+ }
+ if (ret < 0) {
+ av_log(ctx, AV_LOG_ERROR, "Error configuring the %s filter", name);
+ return ret;
+ }
+
+ ret = avfilter_init_str(ctx, NULL);
+ if (ret < 0)
+ return ret;
+
+ ret = avfilter_link(*last_filter, *pad_idx, ctx, 0);
+ if (ret < 0)
+ return ret;
+
+ *last_filter = ctx;
+ *pad_idx = 0;
+ return 0;
+}
+
 static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out)
 {
 char *pix_fmts;
 OutputStream *ost = ofilter->ost;
+ OutputFile *of = output_files[ost->file_index];
 AVCodecContext *codec = ost->st->codec;
 AVFilterContext *last_filter = out->filter_ctx;
 int pad_idx = out->pad_idx;
@@ -191,7 +248,7 @@
 char args[255];
 AVFilterContext *filter;
 
- snprintf(args, sizeof(args), "%d:%d:flags=0x%X",
+ snprintf(args, sizeof(args), "%d:%d:0x%X",
 codec->width,
 codec->height,
 (unsigned)ost->sws_flags);
@@ -244,6 +301,14 @@
 pad_idx = 0;
 }
 
+ snprintf(name, sizeof(name), "trim for output stream %d:%d",
+ ost->file_index, ost->index);
+ ret = insert_trim(of->start_time, of->recording_time,
+ &last_filter, &pad_idx, name);
+ if (ret < 0)
+ return ret;
+
+
 if ((ret = avfilter_link(last_filter, pad_idx, ofilter->filter, 0)) < 0)
 return ret;
 
@@ -253,6 +318,7 @@
 static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out)
 {
 OutputStream *ost = ofilter->ost;
+ OutputFile *of = output_files[ost->file_index];
 AVCodecContext *codec = ost->st->codec;
 AVFilterContext *last_filter = out->filter_ctx;
 int pad_idx = out->pad_idx;
@@ -310,6 +376,13 @@
 pad_idx = 0;
 }
 
+ snprintf(name, sizeof(name), "trim for output stream %d:%d",
+ ost->file_index, ost->index);
+ ret = insert_trim(of->start_time, of->recording_time,
+ &last_filter, &pad_idx, name);
+ if (ret < 0)
+ return ret;
+
 if ((ret = avfilter_link(last_filter, pad_idx, ofilter->filter, 0)) < 0)
 return ret;
 
@@ -320,7 +393,7 @@
 { \
 AVFilterContext *ctx = inout->filter_ctx; \
 AVFilterPad *pads = in ? ctx->input_pads : ctx->output_pads; \
- int nb_pads = in ? ctx->input_count : ctx->output_count; \
+ int nb_pads = in ? ctx->nb_inputs : ctx->nb_outputs; \
 AVIOContext *pb; \
 \
 if (avio_open_dyn_buf(&pb) < 0) \
@@ -348,28 +421,30 @@
 static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
 AVFilterInOut *in)
 {
- AVFilterContext *first_filter = in->filter_ctx;
- AVFilter *filter = avfilter_get_by_name("buffer");
+ AVFilterContext *last_filter;
+ const AVFilter *buffer_filt = avfilter_get_by_name("buffer");
 InputStream *ist = ifilter->ist;
+ InputFile *f = input_files[ist->file_index];
 AVRational tb = ist->framerate.num ? av_inv_q(ist->framerate) :
 ist->st->time_base;
 AVRational sar;
 char args[255], name[255];
- int pad_idx = in->pad_idx;
- int ret;
+ int ret, pad_idx = 0;
 
 sar = ist->st->sample_aspect_ratio.num ?
 ist->st->sample_aspect_ratio :
 ist->st->codec->sample_aspect_ratio;
 snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d", ist->st->codec->width,
- ist->st->codec->height, ist->st->codec->pix_fmt,
+ ist->st->codec->height,
+ ist->hwaccel_retrieve_data ? ist->hwaccel_retrieved_pix_fmt : ist->st->codec->pix_fmt,
 tb.num, tb.den, sar.num, sar.den);
 snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index,
 ist->file_index, ist->st->index);
 
- if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter, name,
+ if ((ret = avfilter_graph_create_filter(&ifilter->filter, buffer_filt, name,
 args, NULL, fg->graph)) < 0)
 return ret;
+ last_filter = ifilter->filter;
 
 if (ist->framerate.num) {
 AVFilterContext *setpts;
@@ -382,14 +457,20 @@
 fg->graph)) < 0)
 return ret;
 
- if ((ret = avfilter_link(setpts, 0, first_filter, pad_idx)) < 0)
+ if ((ret = avfilter_link(last_filter, 0, setpts, 0)) < 0)
 return ret;
 
- first_filter = setpts;
- pad_idx = 0;
+ last_filter = setpts;
 }
 
- if ((ret = avfilter_link(ifilter->filter, 0, first_filter, pad_idx)) < 0)
+ snprintf(name, sizeof(name), "trim for input stream %d:%d",
+ ist->file_index, ist->st->index);
+ ret = insert_trim(((f->start_time == AV_NOPTS_VALUE) || !f->accurate_seek) ?
+ AV_NOPTS_VALUE : 0, f->recording_time, &last_filter, &pad_idx, name);
+ if (ret < 0)
+ return ret;
+
+ if ((ret = avfilter_link(last_filter, 0, in->filter_ctx, in->pad_idx)) < 0)
 return ret;
 return 0;
 }
@@ -397,12 +478,12 @@
 static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter,
 AVFilterInOut *in)
 {
- AVFilterContext *first_filter = in->filter_ctx;
- AVFilter *filter = avfilter_get_by_name("abuffer");
+ AVFilterContext *last_filter;
+ const AVFilter *abuffer_filt = avfilter_get_by_name("abuffer");
 InputStream *ist = ifilter->ist;
- int pad_idx = in->pad_idx;
+ InputFile *f = input_files[ist->file_index];
 char args[255], name[255];
- int ret;
+ int ret, pad_idx = 0;
 
 snprintf(args, sizeof(args), "time_base=%d/%d:sample_rate=%d:sample_fmt=%s"
 ":channel_layout=0x%"PRIx64,
@@ -413,10 +494,11 @@
 snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index,
 ist->file_index, ist->st->index);
 
- if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter,
+ if ((ret = avfilter_graph_create_filter(&ifilter->filter, abuffer_filt,
 name, args, NULL,
 fg->graph)) < 0)
 return ret;
+ last_filter = ifilter->filter;
 
 if (audio_sync_method > 0) {
 AVFilterContext *async;
@@ -439,12 +521,11 @@
 if (ret < 0)
 return ret;
 
- ret = avfilter_link(async, 0, first_filter, pad_idx);
+ ret = avfilter_link(last_filter, 0, async, 0);
 if (ret < 0)
 return ret;
 
- first_filter = async;
- pad_idx = 0;
+ last_filter = async;
 }
 if (audio_volume != 256) {
 AVFilterContext *volume;
@@ -462,14 +543,21 @@
 if (ret < 0)
 return ret;
 
- ret = avfilter_link(volume, 0, first_filter, pad_idx);
+ ret = avfilter_link(last_filter, 0, volume, 0);
 if (ret < 0)
 return ret;
 
- first_filter = volume;
- pad_idx = 0;
+ last_filter = volume;
 }
- if ((ret = avfilter_link(ifilter->filter, 0, first_filter, pad_idx)) < 0)
+
+ snprintf(name, sizeof(name), "trim for input stream %d:%d",
+ ist->file_index, ist->st->index);
+ ret = insert_trim(((f->start_time == AV_NOPTS_VALUE) || !f->accurate_seek) ?
+ AV_NOPTS_VALUE : 0, f->recording_time, &last_filter, &pad_idx, name);
+ if (ret < 0)
+ return ret;
+
+ if ((ret = avfilter_link(last_filter, 0, in->filter_ctx, in->pad_idx)) < 0)
 return ret;
 
 return 0;
@@ -501,9 +589,20 @@
 
 if (simple) {
 OutputStream *ost = fg->outputs[0]->ost;
- char args[255];
+ char args[512];
+ AVDictionaryEntry *e = NULL;
+
 snprintf(args, sizeof(args), "flags=0x%X", (unsigned)ost->sws_flags);
 fg->graph->scale_sws_opts = av_strdup(args);
+
+ args[0] = '\0';
+ while ((e = av_dict_get(fg->outputs[0]->ost->resample_opts, "", e,
+ AV_DICT_IGNORE_SUFFIX))) {
+ av_strlcatf(args, sizeof(args), "%s=%s:", e->key, e->value);
+ }
+ if (strlen(args))
+ args[strlen(args) - 1] = '\0';
+ fg->graph->resample_lavr_opts = av_strdup(args);
 }
 
 if ((ret = avfilter_graph_parse2(fg->graph, graph_desc, &inputs, &outputs)) < 0)

libav-v9.6.tar.bz2/avconv_opt.c -> libav-v10.1.tar.bz2/avconv_opt.c Changed

@@ -28,7 +28,6 @@
 #include "libavcodec/avcodec.h"
 
 #include "libavfilter/avfilter.h"
-#include "libavfilter/avfiltergraph.h"
 
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
@@ -50,10 +49,17 @@
 if ((ret = check_stream_specifier(fmtctx, st, spec)) > 0)\
 outvar = o->name[i].u.type;\
 else if (ret < 0)\
- exit(1);\
+ exit_program(1);\
 }\
 }
 
+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;
@@ -62,7 +68,6 @@
 int audio_volume = 256;
 int audio_sync_method = 0;
 int video_sync_method = VSYNC_AUTO;
-int do_deinterlace = 0;
 int do_benchmark = 0;
 int do_hex_dump = 0;
 int do_pkt_dump = 0;
@@ -73,6 +78,7 @@
 int qp_hist = 0;
 
 static int file_overwrite = 0;
+static int file_skip = 0;
 static int video_discard = 0;
 static int intra_dc_precision = 8;
 static int using_stdin = 0;
@@ -114,9 +120,29 @@
 memset(o, 0, sizeof(*o));
 
 o->mux_max_delay = 0.7;
+ o->start_time = AV_NOPTS_VALUE;
 o->recording_time = INT64_MAX;
 o->limit_filesize = UINT64_MAX;
 o->chapters_input_file = INT_MAX;
+ o->accurate_seek = 1;
+}
+
+/* return a copy of the input with the stream specifiers removed from the keys */
+static AVDictionary *strip_specifiers(AVDictionary *dict)
+{
+ AVDictionaryEntry *e = NULL;
+ AVDictionary *ret = NULL;
+
+ while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) {
+ char *p = strchr(e->key, ':');
+
+ if (p)
+ *p = 0;
+ av_dict_set(&ret, e->key, e->value, 0);
+ if (p)
+ *p = ':';
+ }
+ return ret;
 }
 
 static double parse_frame_aspect_ratio(const char *arg)
@@ -138,7 +164,7 @@
 
 if (!ar) {
 av_log(NULL, AV_LOG_FATAL, "Incorrect aspect ratio specification.\n");
- exit(1);
+ exit_program(1);
 }
 return ar;
 }
@@ -188,7 +214,7 @@
 sync_file_idx = strtol(sync + 1, &sync, 0);
 if (sync_file_idx >= nb_input_files || sync_file_idx < 0) {
 av_log(NULL, AV_LOG_FATAL, "Invalid sync file index: %d.\n", sync_file_idx);
- exit(1);
+ exit_program(1);
 }
 if (*sync)
 sync++;
@@ -201,7 +227,7 @@
 if (i == input_files[sync_file_idx]->nb_streams) {
 av_log(NULL, AV_LOG_FATAL, "Sync stream specification in map %s does not "
 "match any streams.\n", arg);
- exit(1);
+ exit_program(1);
 }
 }
 
@@ -214,13 +240,13 @@
 m->linklabel = av_get_token(&c, "]");
 if (!m->linklabel) {
 av_log(NULL, AV_LOG_ERROR, "Invalid output link label: %s.\n", map);
- exit(1);
+ exit_program(1);
 }
 } else {
 file_idx = strtol(map, &p, 0);
 if (file_idx >= nb_input_files || file_idx < 0) {
 av_log(NULL, AV_LOG_FATAL, "Invalid input file index: %d.\n", file_idx);
- exit(1);
+ exit_program(1);
 }
 if (negative)
 /* disable some already defined maps */
@@ -255,7 +281,7 @@
 
 if (!m) {
 av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches no streams.\n", arg);
- exit(1);
+ exit_program(1);
 }
 
 av_freep(&map);
@@ -287,7 +313,7 @@
 case 's':
 if (*(++arg) && *arg != ':') {
 av_log(NULL, AV_LOG_FATAL, "Invalid metadata specifier %s.\n", arg);
- exit(1);
+ exit_program(1);
 }
 *stream_spec = *arg == ':' ? arg + 1 : "";
 break;
@@ -298,7 +324,7 @@
 break;
 default:
 av_log(NULL, AV_LOG_FATAL, "Invalid metadata type %c.\n", *arg);
- exit(1);
+ exit_program(1);
 }
 } else
 *type = 'g';
@@ -331,7 +357,7 @@
 if ((index) < 0 || (index) >= (nb_elems)) {\
 av_log(NULL, AV_LOG_FATAL, "Invalid %s index %d while processing metadata maps.\n",\
 (desc), (index));\
- exit(1);\
+ exit_program(1);\
 }
 
 #define SET_DICT(type, meta, context, index)\
@@ -362,11 +388,11 @@
 meta_in = &ic->streams[i]->metadata;
 break;
 } else if (ret < 0)
- exit(1);
+ exit_program(1);
 }
 if (!meta_in) {
 av_log(NULL, AV_LOG_FATAL, "Stream specifier %s does not match any streams.\n", istream_spec);
- exit(1);
+ exit_program(1);
 }
 }
 
@@ -376,7 +402,7 @@
 meta_out = &oc->streams[i]->metadata;
 av_dict_copy(meta_out, *meta_in, AV_DICT_DONT_OVERWRITE);
 } else if (ret < 0)
- exit(1);
+ exit_program(1);
 }
 } else
 av_dict_copy(meta_out, *meta_in, AV_DICT_DONT_OVERWRITE);
@@ -404,11 +430,11 @@
 
 if (!codec) {
 av_log(NULL, AV_LOG_FATAL, "Unknown %s '%s'\n", codec_string, name);
- exit(1);
+ exit_program(1);
 }
 if (codec->type != type) {
 av_log(NULL, AV_LOG_FATAL, "Invalid %s type '%s'\n", codec_string, name);
- exit(1);
+ exit_program(1);
 }
 return codec;
 }
@@ -436,10 +462,10 @@
 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;
 
 if (!ist)
- exit(1);
+ exit_program(1);
 
 GROW_ARRAY(input_streams, nb_input_streams);
 input_streams[nb_input_streams - 1] = ist;
@@ -466,9 +492,44 @@
 framerate) < 0) {
 av_log(NULL, AV_LOG_ERROR, "Error parsing framerate %s.\n",
 framerate);
- exit(1);
+ exit_program(1);
 }
 
+ 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:
 guess_input_channel_layout(ist);
@@ -492,21 +553,26 @@
 
 static void assert_file_overwrite(const char *filename)
 {
+ if (file_overwrite && file_skip) {
+ fprintf(stderr, "Error, both -y and -n supplied. Exiting.\n");
+ exit_program(1);
+ }
+
 if (!file_overwrite &&
 (strchr(filename, ':') == NULL || filename[1] == ':' ||
 av_strstart(filename, "file:", NULL))) {
 if (avio_check(filename, 0) == 0) {
- if (!using_stdin) {
+ if (!using_stdin && !file_skip) {
 fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename);
 fflush(stderr);
 if (!read_yesno()) {
 fprintf(stderr, "Not overwriting - exiting\n");
- exit(1);
+ exit_program(1);
 }
 }
 else {
 fprintf(stderr,"File '%s' already exists. Exiting.\n", filename);
- exit(1);
+ exit_program(1);
 }
 }
 }
@@ -528,7 +594,7 @@
 if (!*filename) {
 av_log(NULL, AV_LOG_FATAL, "No filename specified and no 'filename' tag"
 "in stream #%d:%d.\n", nb_input_files - 1, st->index);
- exit(1);
+ exit_program(1);
 }
 
 assert_file_overwrite(filename);
@@ -536,7 +602,7 @@
 if ((ret = avio_open2(&out, filename, AVIO_FLAG_WRITE, &int_cb, NULL)) < 0) {
 av_log(NULL, AV_LOG_FATAL, "Could not open file %s for writing.\n",
 filename);
- exit(1);
+ exit_program(1);
 }
 
 avio_write(out, st->codec->extradata, st->codec->extradata_size);
@@ -546,18 +612,21 @@
 
 static int open_input_file(OptionsContext *o, const char *filename)
 {
+ InputFile *f;
 AVFormatContext *ic;
 AVInputFormat *file_iformat = NULL;
 int err, i, ret;
 int64_t timestamp;
 uint8_t buf[128];
 AVDictionary **opts;
+ AVDictionary *unused_opts = NULL;
+ AVDictionaryEntry *e = NULL;
 int orig_nb_streams; // number of streams before avformat_find_stream_info
 
 if (o->format) {
 if (!(file_iformat = av_find_input_format(o->format))) {
 av_log(NULL, AV_LOG_FATAL, "Unknown input format: '%s'\n", o->format);
- exit(1);
+ exit_program(1);
 }
 }
 
@@ -571,7 +640,7 @@
 ic = avformat_alloc_context();
 if (!ic) {
 print_error(filename, AVERROR(ENOMEM));
- exit(1);
+ exit_program(1);
 }
 if (o->nb_audio_sample_rate) {
 snprintf(buf, sizeof(buf), "%d", o->audio_sample_rate[o->nb_audio_sample_rate - 1].u.i);
@@ -612,7 +681,7 @@
 err = avformat_open_input(&ic, filename, file_iformat, &o->g->format_opts);
 if (err < 0) {
 print_error(filename, err);
- exit(1);
+ exit_program(1);
 }
 assert_avoptions(o->g->format_opts);
 
@@ -630,16 +699,16 @@
 if (ret < 0) {
 av_log(NULL, AV_LOG_FATAL, "%s: could not find codec parameters\n", filename);
 avformat_close_input(&ic);
- exit(1);
+ exit_program(1);
 }
 
- timestamp = o->start_time;
+ timestamp = (o->start_time == AV_NOPTS_VALUE) ? 0 : o->start_time;
 /* add the stream start time */
 if (ic->start_time != AV_NOPTS_VALUE)
 timestamp += ic->start_time;
 
 /* if seeking requested, we execute it */
- if (o->start_time != 0) {
+ if (o->start_time != AV_NOPTS_VALUE) {
 ret = av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD);
 if (ret < 0) {
 av_log(NULL, AV_LOG_WARNING, "%s: could not seek to position %0.3f\n",
@@ -654,14 +723,52 @@
 av_dump_format(ic, nb_input_files, filename, 0);
 
 GROW_ARRAY(input_files, nb_input_files);
- if (!(input_files[nb_input_files - 1] = av_mallocz(sizeof(*input_files[0]))))
- exit(1);
+ f = av_mallocz(sizeof(*f));
+ if (!f)
+ exit_program(1);
+ input_files[nb_input_files - 1] = f;
+
+ f->ctx = ic;
+ f->ist_index = nb_input_streams - ic->nb_streams;
+ f->start_time = o->start_time;
+ f->recording_time = o->recording_time;
+ f->ts_offset = o->input_ts_offset - (copy_ts ? 0 : timestamp);
+ f->nb_streams = ic->nb_streams;
+ f->rate_emu = o->rate_emu;
+ f->accurate_seek = o->accurate_seek;
+
+ /* check if all codec options have been used */
+ unused_opts = strip_specifiers(o->g->codec_opts);
+ for (i = f->ist_index; i < nb_input_streams; i++) {
+ e = NULL;
+ while ((e = av_dict_get(input_streams[i]->opts, "", e,
+ AV_DICT_IGNORE_SUFFIX)))
+ av_dict_set(&unused_opts, e->key, NULL, 0);
+ }
+
+ e = NULL;
+ while ((e = av_dict_get(unused_opts, "", e, AV_DICT_IGNORE_SUFFIX))) {
+ 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)
+ 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,
+ option->help ? option->help : "", nb_input_files - 1,
+ filename);
+ exit_program(1);
+ }
 
- input_files[nb_input_files - 1]->ctx = ic;
- input_files[nb_input_files - 1]->ist_index = nb_input_streams - ic->nb_streams;
- input_files[nb_input_files - 1]->ts_offset = o->input_ts_offset - (copy_ts ? 0 : timestamp);
- input_files[nb_input_files - 1]->nb_streams = ic->nb_streams;
- input_files[nb_input_files - 1]->rate_emu = o->rate_emu;
+ av_log(NULL, AV_LOG_WARNING, "Codec AVOption %s (%s) specified for "
+ "input file #%d (%s) has not been used for any stream. The most "
+ "likely reason is either wrong type (e.g. a video option with "
+ "no video streams) or that it is a private option of some decoder "
+ "which was not actually used for any stream.\n", e->key,
+ option->help ? option->help : "", nb_input_files - 1, filename);
+ }
+ av_dict_free(&unused_opts);
 
 for (i = 0; i < o->nb_dump_attachment; i++) {
 int j;
@@ -689,7 +796,7 @@
 
 if (avio_open_dyn_buf(&line) < 0) {
 av_log(NULL, AV_LOG_FATAL, "Could not alloc buffer for reading preset.\n");
- exit(1);
+ exit_program(1);
 }
 
 while ((c = avio_r8(s)) && c != '\n')
@@ -754,7 +861,7 @@
 
 if (!st) {
 av_log(NULL, AV_LOG_FATAL, "Could not alloc stream.\n");
- exit(1);
+ exit_program(1);
 }
 
 if (oc->nb_streams - 1 < o->nb_streamid_map)
@@ -762,10 +869,10 @@
 
 GROW_ARRAY(output_streams, nb_output_streams);
 if (!(ost = av_mallocz(sizeof(*ost))))
- exit(1);
+ exit_program(1);
 output_streams[nb_output_streams - 1] = ost;
 
- ost->file_index = nb_output_files;
+ ost->file_index = nb_output_files - 1;
 ost->index = idx;
 ost->st = st;
 st->codec->codec_type = type;
@@ -786,7 +893,7 @@
 }
 if (!(arg = strchr(buf, '='))) {
 av_log(NULL, AV_LOG_FATAL, "Invalid line found in the preset file.\n");
- exit(1);
+ exit_program(1);
 }
 *arg++ = 0;
 av_dict_set(&ost->opts, buf, arg, AV_DICT_DONT_OVERWRITE);
@@ -798,8 +905,10 @@
 av_log(NULL, AV_LOG_FATAL,
 "Preset %s specified for stream %d:%d, but could not be opened.\n",
 preset, ost->file_index, ost->index);
- exit(1);
+ exit_program(1);
 }
+ } else {
+ ost->opts = filter_codec_opts(o->g->codec_opts, AV_CODEC_ID_NONE, oc, st, NULL);
 }
 
 avcodec_get_context_defaults3(st->codec, ost->enc);
@@ -814,7 +923,7 @@
 *next++ = 0;
 if (!(bsfc = av_bitstream_filter_init(bsf))) {
 av_log(NULL, AV_LOG_FATAL, "Unknown bitstream filter %s\n", bsf);
- exit(1);
+ exit_program(1);
 }
 if (bsfc_prev)
 bsfc_prev->next = bsfc;
@@ -844,7 +953,10 @@
 
 av_opt_get_int(o->g->sws_opts, "sws_flags", 0, &ost->sws_flags);
 
+ av_dict_copy(&ost->resample_opts, o->g->resample_opts, 0);
+
 ost->pix_fmts[0] = ost->pix_fmts[1] = AV_PIX_FMT_NONE;
+ ost->last_mux_dts = AV_NOPTS_VALUE;
 
 return ost;
 }
@@ -860,51 +972,104 @@
 p = strchr(p, ',');
 if (!p) {
 av_log(NULL, AV_LOG_FATAL, "Syntax error in matrix \"%s\" at coeff %d\n", str, i);
- exit(1);
+ exit_program(1);
 }
 p++;
 }
 }
 
+/* read file contents into a string */
+static uint8_t *read_file(const char *filename)
+{
+ AVIOContext *pb = NULL;
+ AVIOContext *dyn_buf = NULL;
+ int ret = avio_open(&pb, filename, AVIO_FLAG_READ);
+ uint8_t buf[1024], *str;
+
+ if (ret < 0) {
+ av_log(NULL, AV_LOG_ERROR, "Error opening file %s.\n", filename);
+ return NULL;
+ }
+
+ ret = avio_open_dyn_buf(&dyn_buf);
+ if (ret < 0) {
+ avio_closep(&pb);
+ return NULL;
+ }
+ while ((ret = avio_read(pb, buf, sizeof(buf))) > 0)
+ avio_write(dyn_buf, buf, ret);
+ avio_w8(dyn_buf, 0);
+ avio_closep(&pb);
+
+ ret = avio_close_dyn_buf(dyn_buf, &str);
+ if (ret < 0)
+ return NULL;
+ return str;
+}
+
+static char *get_ost_filters(OptionsContext *o, AVFormatContext *oc,
+ 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) {
+ 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);
+
+ return av_strdup(st->codec->codec_type == AVMEDIA_TYPE_VIDEO ?
+ "null" : "anull");
+}
+
 static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
 {
 AVStream *st;
 OutputStream *ost;
 AVCodecContext *video_enc;
+ char *frame_aspect_ratio = NULL;
 
 ost = new_output_stream(o, oc, AVMEDIA_TYPE_VIDEO);
 st = ost->st;
 video_enc = st->codec;
 
+ MATCH_PER_STREAM_OPT(frame_aspect_ratios, str, frame_aspect_ratio, oc, st);
+ if (frame_aspect_ratio)
+ ost->frame_aspect_ratio = parse_frame_aspect_ratio(frame_aspect_ratio);
+
 if (!ost->stream_copy) {
 const char *p = NULL;
 char *frame_rate = NULL, *frame_size = NULL;
- char *frame_aspect_ratio = NULL, *frame_pix_fmt = NULL;
+ char *frame_pix_fmt = NULL;
 char *intra_matrix = NULL, *inter_matrix = NULL;
- const char *filters = "null";
 int do_pass = 0;
 int i;
 
 MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st);
 if (frame_rate && av_parse_video_rate(&ost->frame_rate, frame_rate) < 0) {
 av_log(NULL, AV_LOG_FATAL, "Invalid framerate value: %s\n", frame_rate);
- exit(1);
+ exit_program(1);
 }
 
 MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, oc, st);
 if (frame_size && av_parse_video_size(&video_enc->width, &video_enc->height, frame_size) < 0) {
 av_log(NULL, AV_LOG_FATAL, "Invalid frame size: %s.\n", frame_size);
- exit(1);
+ exit_program(1);
 }
 
- MATCH_PER_STREAM_OPT(frame_aspect_ratios, str, frame_aspect_ratio, oc, st);
- if (frame_aspect_ratio)
- ost->frame_aspect_ratio = parse_frame_aspect_ratio(frame_aspect_ratio);
-
 MATCH_PER_STREAM_OPT(frame_pix_fmts, str, frame_pix_fmt, oc, st);
 if (frame_pix_fmt && (video_enc->pix_fmt = av_get_pix_fmt(frame_pix_fmt)) == AV_PIX_FMT_NONE) {
 av_log(NULL, AV_LOG_FATAL, "Unknown pixel format requested: %s.\n", frame_pix_fmt);
- exit(1);
+ exit_program(1);
 }
 st->sample_aspect_ratio = video_enc->sample_aspect_ratio;
 
@@ -912,7 +1077,7 @@
 if (intra_matrix) {
 if (!(video_enc->intra_matrix = av_mallocz(sizeof(*video_enc->intra_matrix) * 64))) {
 av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for intra matrix.\n");
- exit(1);
+ exit_program(1);
 }
 parse_matrix_coeffs(video_enc->intra_matrix, intra_matrix);
 }
@@ -920,7 +1085,7 @@
 if (inter_matrix) {
 if (!(video_enc->inter_matrix = av_mallocz(sizeof(*video_enc->inter_matrix) * 64))) {
 av_log(NULL, AV_LOG_FATAL, "Could not allocate memory for inter matrix.\n");
- exit(1);
+ exit_program(1);
 }
 parse_matrix_coeffs(video_enc->inter_matrix, inter_matrix);
 }
@@ -931,7 +1096,7 @@
 int e = sscanf(p, "%d,%d,%d", &start, &end, &q);
 if (e != 3) {
 av_log(NULL, AV_LOG_FATAL, "error parsing rc_override\n");
- exit(1);
+ exit_program(1);
 }
 video_enc->rc_override =
 av_realloc(video_enc->rc_override,
@@ -965,7 +1130,7 @@
 MATCH_PER_STREAM_OPT(passlogfiles, str, ost->logfile_prefix, oc, st);
 if (ost->logfile_prefix &&
 !(ost->logfile_prefix = av_strdup(ost->logfile_prefix)))
- exit(1);
+ exit_program(1);
 
 MATCH_PER_STREAM_OPT(forced_key_frames, str, ost->forced_keyframes, oc, st);
 if (ost->forced_keyframes)
@@ -976,8 +1141,10 @@
 ost->top_field_first = -1;
 MATCH_PER_STREAM_OPT(top_field_first, i, ost->top_field_first, oc, st);
 
- MATCH_PER_STREAM_OPT(filters, str, filters, oc, st);
- ost->avfilter = av_strdup(filters);
+
+ ost->avfilter = get_ost_filters(o, oc, ost);
+ if (!ost->avfilter)
+ exit_program(1);
 } else {
 MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc ,st);
 }
@@ -999,7 +1166,6 @@
 
 if (!ost->stream_copy) {
 char *sample_fmt = NULL;
- const char *filters = "anull";
 
 MATCH_PER_STREAM_OPT(audio_channels, i, audio_enc->channels, oc, st);
 
@@ -1007,13 +1173,14 @@
 if (sample_fmt &&
 (audio_enc->sample_fmt = av_get_sample_fmt(sample_fmt)) == AV_SAMPLE_FMT_NONE) {
 av_log(NULL, AV_LOG_FATAL, "Invalid sample format '%s'\n", sample_fmt);
- exit(1);
+ exit_program(1);
 }
 
 MATCH_PER_STREAM_OPT(audio_sample_rate, i, audio_enc->sample_rate, oc, st);
 
- MATCH_PER_STREAM_OPT(filters, str, filters, oc, st);
- ost->avfilter = av_strdup(filters);
+ ost->avfilter = get_ost_filters(o, oc, ost);
+ if (!ost->avfilter)
+ exit_program(1);
 }
 
 return ost;
@@ -1026,7 +1193,7 @@
 ost = new_output_stream(o, oc, AVMEDIA_TYPE_DATA);
 if (!ost->stream_copy) {
 av_log(NULL, AV_LOG_FATAL, "Data stream encoding not supported yet (only streamcopy)\n");
- exit(1);
+ exit_program(1);
 }
 
 return ost;
@@ -1036,6 +1203,7 @@
 {
 OutputStream *ost = new_output_stream(o, oc, AVMEDIA_TYPE_ATTACHMENT);
 ost->stream_copy = 1;
+ ost->finished = 1;
 return ost;
 }
 
@@ -1068,7 +1236,7 @@
 av_log(NULL, AV_LOG_FATAL,
 "Invalid value '%s' for option '%s', required syntax is 'index:value'\n",
 arg, opt);
- exit(1);
+ exit_program(1);
 }
 *p++ = '\0';
 idx = parse_number_or_die(opt, idx_str, OPT_INT, 0, INT_MAX);
@@ -1091,7 +1259,8 @@
 
 for (i = 0; i < is->nb_chapters; i++) {
 AVChapter *in_ch = is->chapters[i], *out_ch;
- int64_t ts_off = av_rescale_q(ofile->start_time - ifile->ts_offset,
+ int64_t start_time = (ofile->start_time == AV_NOPTS_VALUE) ? 0 : ofile->start_time;
+ int64_t ts_off = av_rescale_q(start_time - ifile->ts_offset,
 AV_TIME_BASE_Q, in_ch->time_base);
 int64_t rt = (ofile->recording_time == INT64_MAX) ? INT64_MAX :
 av_rescale_q(ofile->recording_time, AV_TIME_BASE_Q, in_ch->time_base);
@@ -1131,7 +1300,7 @@
 default:
 av_log(NULL, AV_LOG_FATAL, "Only video and audio filters are supported "
 "currently.\n");
- exit(1);
+ exit_program(1);
 }
 
 ost->source_index = -1;
@@ -1143,12 +1312,12 @@
 av_log(NULL, AV_LOG_ERROR, "Streamcopy requested for output stream %d:%d, "
 "which is fed from a complex filtergraph. Filtering and streamcopy "
 "cannot be used together.\n", ost->file_index, ost->index);
- exit(1);
+ 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(1);
+ exit_program(1);
 }
 avfilter_inout_free(&ofilter->out_tmp);
 }
@@ -1169,35 +1338,54 @@
 AVFormatContext *oc;
 int i, j, err;
 AVOutputFormat *file_oformat;
+ OutputFile *of;
 OutputStream *ost;
 InputStream *ist;
+ AVDictionary *unused_opts = NULL;
+ AVDictionaryEntry *e = NULL;
 
 if (configure_complex_filters() < 0) {
 av_log(NULL, AV_LOG_FATAL, "Error configuring filters.\n");
- exit(1);
+ exit_program(1);
 }
 
+ GROW_ARRAY(output_files, nb_output_files);
+ of = av_mallocz(sizeof(*of));
+ if (!of)
+ exit_program(1);
+ output_files[nb_output_files - 1] = of;
+
+ of->ost_index = nb_output_streams;
+ of->recording_time = o->recording_time;
+ of->start_time = o->start_time;
+ of->limit_filesize = o->limit_filesize;
+ of->shortest = o->shortest;
+ av_dict_copy(&of->opts, o->g->format_opts, 0);
+
 if (!strcmp(filename, "-"))
 filename = "pipe:";
 
 oc = avformat_alloc_context();
 if (!oc) {
 print_error(filename, AVERROR(ENOMEM));
- exit(1);
+ exit_program(1);
 }
+ of->ctx = oc;
+ if (o->recording_time != INT64_MAX)
+ oc->duration = o->recording_time;
 
 if (o->format) {
 file_oformat = av_guess_format(o->format, NULL, NULL);
 if (!file_oformat) {
 av_log(NULL, AV_LOG_FATAL, "Requested output format '%s' is not a suitable output format\n", o->format);
- exit(1);
+ exit_program(1);
 }
 } else {
 file_oformat = av_guess_format(NULL, filename, NULL);
 if (!file_oformat) {
 av_log(NULL, AV_LOG_FATAL, "Unable to find a suitable output format for '%s'\n",
 filename);
- exit(1);
+ exit_program(1);
 }
 }
 
@@ -1298,7 +1486,7 @@
 if (!ofilter) {
 av_log(NULL, AV_LOG_FATAL, "Output with label '%s' does not exist "
 "in any defined filter graph.\n", map->linklabel);
- exit(1);
+ exit_program(1);
 }
 init_output_filter(ofilter, o, oc);
 } else {
@@ -1312,7 +1500,7 @@
 default:
 av_log(NULL, AV_LOG_FATAL, "Cannot map stream #%d:%d - unsupported type.\n",
 map->file_index, map->stream_index);
- exit(1);
+ exit_program(1);
 }
 
 ost->source_index = input_files[map->file_index]->ist_index + map->stream_index;
@@ -1334,17 +1522,17 @@
 if ((err = avio_open2(&pb, o->attachments[i], AVIO_FLAG_READ, &int_cb, NULL)) < 0) {
 av_log(NULL, AV_LOG_FATAL, "Could not open attachment file %s.\n",
 o->attachments[i]);
- exit(1);
+ exit_program(1);
 }
 if ((len = avio_size(pb)) <= 0) {
 av_log(NULL, AV_LOG_FATAL, "Could not get size of the attachment %s.\n",
 o->attachments[i]);
- exit(1);
+ exit_program(1);
 }
 if (!(attachment = av_malloc(len))) {
 av_log(NULL, AV_LOG_FATAL, "Attachment %s too large to fit into memory.\n",
 o->attachments[i]);
- exit(1);
+ exit_program(1);
 }
 avio_read(pb, attachment, len);
 
@@ -1360,25 +1548,44 @@
 avio_close(pb);
 }
 
- GROW_ARRAY(output_files, nb_output_files);
- if (!(output_files[nb_output_files - 1] = av_mallocz(sizeof(*output_files[0]))))
- exit(1);
+ /* check if all codec options have been used */
+ unused_opts = strip_specifiers(o->g->codec_opts);
+ for (i = of->ost_index; i < nb_output_streams; i++) {
+ e = NULL;
+ while ((e = av_dict_get(output_streams[i]->opts, "", e,
+ AV_DICT_IGNORE_SUFFIX)))
+ av_dict_set(&unused_opts, e->key, NULL, 0);
+ }
 
- output_files[nb_output_files - 1]->ctx = oc;
- output_files[nb_output_files - 1]->ost_index = nb_output_streams - oc->nb_streams;
- output_files[nb_output_files - 1]->recording_time = o->recording_time;
- if (o->recording_time != INT64_MAX)
- oc->duration = o->recording_time;
- output_files[nb_output_files - 1]->start_time = o->start_time;
- output_files[nb_output_files - 1]->limit_filesize = o->limit_filesize;
- output_files[nb_output_files - 1]->shortest = o->shortest;
- av_dict_copy(&output_files[nb_output_files - 1]->opts, o->g->format_opts, 0);
+ e = NULL;
+ while ((e = av_dict_get(unused_opts, "", e, AV_DICT_IGNORE_SUFFIX))) {
+ 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)
+ continue;
+ if (!(option->flags & AV_OPT_FLAG_ENCODING_PARAM)) {
+ av_log(NULL, AV_LOG_ERROR, "Codec AVOption %s (%s) specified for "
+ "output file #%d (%s) is not an encoding option.\n", e->key,
+ option->help ? option->help : "", nb_output_files - 1,
+ filename);
+ exit_program(1);
+ }
+
+ av_log(NULL, AV_LOG_WARNING, "Codec AVOption %s (%s) specified for "
+ "output file #%d (%s) has not been used for any stream. The most "
+ "likely reason is either wrong type (e.g. a video option with "
+ "no video streams) or that it is a private option of some encoder "
+ "which was not actually used for any stream.\n", e->key,
+ option->help ? option->help : "", nb_output_files - 1, filename);
+ }
+ av_dict_free(&unused_opts);
 
 /* check filename in case of an image number is expected */
 if (oc->oformat->flags & AVFMT_NEEDNUMBER) {
 if (!av_filename_number_test(oc->filename)) {
 print_error(oc->filename, AVERROR(EINVAL));
- exit(1);
+ exit_program(1);
 }
 }
 
@@ -1389,16 +1596,16 @@
 /* open the file */
 if ((err = avio_open2(&oc->pb, filename, AVIO_FLAG_WRITE,
 &oc->interrupt_callback,
- &output_files[nb_output_files - 1]->opts)) < 0) {
+ &of->opts)) < 0) {
 print_error(filename, err);
- exit(1);
+ exit_program(1);
 }
 }
 
 if (o->mux_preload) {
 uint8_t buf[64];
 snprintf(buf, sizeof(buf), "%d", (int)(o->mux_preload*AV_TIME_BASE));
- av_dict_set(&output_files[nb_output_files - 1]->opts, "preload", buf, 0);
+ av_dict_set(&of->opts, "preload", buf, 0);
 }
 oc->max_delay = (int)(o->mux_max_delay * AV_TIME_BASE);
 oc->flags |= AVFMT_FLAG_NONBLOCK;
@@ -1410,7 +1617,7 @@
 
 if (in_file_index >= nb_input_files) {
 av_log(NULL, AV_LOG_FATAL, "Invalid input file index %d while processing metadata maps\n", in_file_index);
- exit(1);
+ exit_program(1);
 }
 copy_metadata(o->metadata_map[i].specifier, *p ? p + 1 : p, oc,
 in_file_index >= 0 ?
@@ -1430,11 +1637,11 @@
 } else {
 av_log(NULL, AV_LOG_FATAL, "Invalid input file index %d in chapter mapping.\n",
 o->chapters_input_file);
- exit(1);
+ exit_program(1);
 }
 }
 if (o->chapters_input_file >= 0)
- copy_chapters(input_files[o->chapters_input_file], output_files[nb_output_files - 1],
+ copy_chapters(input_files[o->chapters_input_file], of,
 !o->metadata_chapters_manual);
 
 /* copy global metadata by default */
@@ -1442,7 +1649,7 @@
 av_dict_copy(&oc->metadata, input_files[0]->ctx->metadata,
 AV_DICT_DONT_OVERWRITE);
 if (!o->metadata_streams_manual)
- for (i = output_files[nb_output_files - 1]->ost_index; i < nb_output_streams; i++) {
+ for (i = of->ost_index; i < nb_output_streams; i++) {
 InputStream *ist;
 if (output_streams[i]->source_index < 0) /* this is true e.g. for attached files */
 continue;
@@ -1461,7 +1668,7 @@
 if (!val) {
 av_log(NULL, AV_LOG_FATAL, "No '=' character in metadata string %s.\n",
 o->metadata[i].u.str);
- exit(1);
+ exit_program(1);
 }
 *val++ = 0;
 
@@ -1471,7 +1678,7 @@
 if ((ret = check_stream_specifier(oc, oc->streams[j], stream_spec)) > 0) {
 av_dict_set(&oc->streams[j]->metadata, o->metadata[i].u.str, *val ? val : NULL, 0);
 } else if (ret < 0)
- exit(1);
+ exit_program(1);
 }
 }
 else {
@@ -1482,13 +1689,13 @@
 case 'c':
 if (index < 0 || index >= oc->nb_chapters) {
 av_log(NULL, AV_LOG_FATAL, "Invalid chapter index %d in metadata specifier.\n", index);
- exit(1);
+ exit_program(1);
 }
 m = &oc->chapters[index]->metadata;
 break;
 default:
 av_log(NULL, AV_LOG_FATAL, "Invalid metadata specifier %s.\n", o->metadata[i].specifier);
- exit(1);
+ exit_program(1);
 }
 av_dict_set(m, o->metadata[i].u.str, *val ? val : NULL, 0);
 }
@@ -1542,7 +1749,7 @@
 av_log(NULL, AV_LOG_FATAL, "Could not determine norm (PAL/NTSC/NTSC-Film) for target.\n");
 av_log(NULL, AV_LOG_FATAL, "Please prefix target with \"pal-\", \"ntsc-\" or \"film-\",\n");
 av_log(NULL, AV_LOG_FATAL, "or set a framerate with \"-r xxx\".\n");
- exit(1);
+ exit_program(1);
 }
 
 if (!strcmp(arg, "vcd")) {
@@ -1711,24 +1918,6 @@
 return 0;
 }
 
-static int opt_deinterlace(void *optctx, const char *opt, const char *arg)
-{
- av_log(NULL, AV_LOG_WARNING, "-%s is deprecated, use -filter:v yadif instead\n", opt);
- do_deinterlace = 1;
- return 0;
-}
-
-int opt_cpuflags(void *optctx, const char *opt, const char *arg)
-{
- int flags = av_parse_cpu_flags(arg);
-
- if (flags < 0)
- return flags;
-
- av_set_cpu_flags_mask(flags);
- return 0;
-}
-
 static int opt_channel_layout(void *optctx, const char *opt, const char *arg)
 {
 OptionsContext *o = optctx;
@@ -1776,8 +1965,24 @@
 GROW_ARRAY(filtergraphs, nb_filtergraphs);
 if (!(filtergraphs[nb_filtergraphs - 1] = av_mallocz(sizeof(*filtergraphs[0]))))
 return AVERROR(ENOMEM);
- filtergraphs[nb_filtergraphs - 1]->index = nb_filtergraphs - 1;
- filtergraphs[nb_filtergraphs - 1]->graph_desc = arg;
+ filtergraphs[nb_filtergraphs - 1]->index = nb_filtergraphs - 1;
+ filtergraphs[nb_filtergraphs - 1]->graph_desc = av_strdup(arg);
+ if (!filtergraphs[nb_filtergraphs - 1]->graph_desc)
+ return AVERROR(ENOMEM);
+ return 0;
+}
+
+static int opt_filter_complex_script(void *optctx, const char *opt, const char *arg)
+{
+ uint8_t *graph_desc = read_file(arg);
+ if (!graph_desc)
+ return AVERROR(EINVAL);
+
+ GROW_ARRAY(filtergraphs, nb_filtergraphs);
+ if (!(filtergraphs[nb_filtergraphs - 1] = av_mallocz(sizeof(*filtergraphs[0]))))
+ return AVERROR(ENOMEM);
+ filtergraphs[nb_filtergraphs - 1]->index = nb_filtergraphs - 1;
+ filtergraphs[nb_filtergraphs - 1]->graph_desc = graph_desc;
 return 0;
 }
 
@@ -1842,6 +2047,7 @@
 show_help_children(avcodec_get_class(), flags);
 show_help_children(avformat_get_class(), flags);
 show_help_children(sws_get_class(), flags);
+ show_help_children(avfilter_get_class(), AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_AUDIO_PARAM);
 }
 }
 
@@ -1858,8 +2064,8 @@
 };
 
 static const OptionGroupDef groups[] = {
- [GROUP_OUTFILE] = { "output file", NULL },
- [GROUP_INFILE] = { "input file", "i" },
+ [GROUP_OUTFILE] = { "output file", NULL, OPT_OUTPUT },
+ [GROUP_INFILE] = { "input file", "i", OPT_INPUT },
 };
 
 static int open_files(OptionGroupList *l, const char *inout,
@@ -1889,7 +2095,7 @@
 inout, g->arg);
 return ret;
 }
- av_log(NULL, AV_LOG_DEBUG, "Successfully openened the file.\n");
+ av_log(NULL, AV_LOG_DEBUG, "Successfully opened the file.\n");
 }
 
 return 0;
@@ -1945,38 +2151,55 @@
 const OptionDef options[] = {
 /* main options */
 #include "cmdutils_common_opts.h"
- { "f", HAS_ARG | OPT_STRING | OPT_OFFSET, { .off = OFFSET(format) },
+ { "f", HAS_ARG | OPT_STRING | OPT_OFFSET |
+ OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(format) },
 "force format", "fmt" },
 { "y", OPT_BOOL, { &file_overwrite },
 "overwrite output files" },
- { "c", HAS_ARG | OPT_STRING | OPT_SPEC, { .off = OFFSET(codec_names) },
+ { "n", OPT_BOOL, { &file_skip },
+ "never overwrite output files" },
+ { "c", HAS_ARG | OPT_STRING | OPT_SPEC |
+ OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(codec_names) },
 "codec name", "codec" },
- { "codec", HAS_ARG | OPT_STRING | OPT_SPEC, { .off = OFFSET(codec_names) },
+ { "codec", HAS_ARG | OPT_STRING | OPT_SPEC |
+ OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(codec_names) },
 "codec name", "codec" },
- { "pre", HAS_ARG | OPT_STRING | OPT_SPEC, { .off = OFFSET(presets) },
+ { "pre", HAS_ARG | OPT_STRING | OPT_SPEC |
+ OPT_OUTPUT, { .off = OFFSET(presets) },
 "preset name", "preset" },
- { "map", HAS_ARG | OPT_EXPERT | OPT_PERFILE, { .func_arg = opt_map },
+ { "map", HAS_ARG | OPT_EXPERT | OPT_PERFILE |
+ OPT_OUTPUT, { .func_arg = opt_map },
 "set input stream mapping",
 "[-]input_file_id[:stream_specifier][,sync_file_id[:stream_specifier]]" },
- { "map_metadata", HAS_ARG | OPT_STRING | OPT_SPEC, { .off = OFFSET(metadata_map) },
+ { "map_metadata", HAS_ARG | OPT_STRING | OPT_SPEC |
+ OPT_OUTPUT, { .off = OFFSET(metadata_map) },
 "set metadata information of outfile from infile",
 "outfile[,metadata]:infile[,metadata]" },
- { "map_chapters", HAS_ARG | OPT_INT | OPT_EXPERT | OPT_OFFSET, { .off = OFFSET(chapters_input_file) },
+ { "map_chapters", HAS_ARG | OPT_INT | OPT_EXPERT | OPT_OFFSET |
+ OPT_OUTPUT, { .off = OFFSET(chapters_input_file) },
 "set chapters mapping", "input_file_index" },
- { "t", HAS_ARG | OPT_TIME | OPT_OFFSET, { .off = OFFSET(recording_time) },
+ { "t", HAS_ARG | OPT_TIME | OPT_OFFSET |
+ OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(recording_time) },
 "record or transcode \"duration\" seconds of audio/video",
 "duration" },
- { "fs", HAS_ARG | OPT_INT64 | OPT_OFFSET, { .off = OFFSET(limit_filesize) },
+ { "fs", HAS_ARG | OPT_INT64 | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(limit_filesize) },
 "set the limit file size in bytes", "limit_size" },
- { "ss", HAS_ARG | OPT_TIME | OPT_OFFSET, { .off = OFFSET(start_time) },
+ { "ss", HAS_ARG | OPT_TIME | OPT_OFFSET |
+ OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(start_time) },
 "set the start time offset", "time_off" },
- { "itsoffset", HAS_ARG | OPT_TIME | OPT_OFFSET | OPT_EXPERT,{ .off = OFFSET(input_ts_offset) },
+ { "accurate_seek", OPT_BOOL | OPT_OFFSET | OPT_EXPERT |
+ OPT_INPUT, { .off = OFFSET(accurate_seek) },
+ "enable/disable accurate seeking with -ss" },
+ { "itsoffset", HAS_ARG | OPT_TIME | OPT_OFFSET |
+ OPT_EXPERT | OPT_INPUT, { .off = OFFSET(input_ts_offset) },
 "set the input ts offset", "time_off" },
- { "itsscale", HAS_ARG | OPT_DOUBLE | OPT_SPEC | OPT_EXPERT,{ .off = OFFSET(ts_scale) },
+ { "itsscale", HAS_ARG | OPT_DOUBLE | OPT_SPEC |
+ OPT_EXPERT | OPT_INPUT, { .off = OFFSET(ts_scale) },
 "set the input ts scale", "scale" },
- { "metadata", HAS_ARG | OPT_STRING | OPT_SPEC, { .off = OFFSET(metadata) },
+ { "metadata", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(metadata) },
 "add metadata", "string=string" },
- { "dframes", HAS_ARG | OPT_PERFILE | OPT_EXPERT, { .func_arg = opt_data_frames },
+ { "dframes", HAS_ARG | OPT_PERFILE | OPT_EXPERT |
+ OPT_OUTPUT, { .func_arg = opt_data_frames },
 "set the number of data frames to record", "number" },
 { "benchmark", OPT_BOOL | OPT_EXPERT, { &do_benchmark },
 "add timings for benchmarking" },
@@ -1986,9 +2209,10 @@
 "dump each input packet" },
 { "hex", OPT_BOOL | OPT_EXPERT, { &do_hex_dump },
 "when dumping packets, also dump the payload" },
- { "re", OPT_BOOL | OPT_EXPERT | OPT_OFFSET, { .off = OFFSET(rate_emu) },
+ { "re", OPT_BOOL | OPT_EXPERT | OPT_OFFSET |
+ OPT_INPUT, { .off = OFFSET(rate_emu) },
 "read input at native frame rate", "" },
- { "target", HAS_ARG | OPT_PERFILE, { .func_arg = opt_target },
+ { "target", HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_target },
 "specify target file type (\"vcd\", \"svcd\", \"dvd\","
 " \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" },
 { "vsync", HAS_ARG | OPT_EXPERT, { opt_vsync },
@@ -2001,131 +2225,164 @@
 "copy timestamps" },
 { "copytb", OPT_BOOL | OPT_EXPERT, { &copy_tb },
 "copy input stream time base when stream copying" },
- { "shortest", OPT_BOOL | OPT_EXPERT | OPT_OFFSET, { .off = OFFSET(shortest) },
+ { "shortest", OPT_BOOL | OPT_EXPERT | OPT_OFFSET |
+ OPT_OUTPUT, { .off = OFFSET(shortest) },
 "finish encoding within shortest input" },
 { "dts_delta_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, { &dts_delta_threshold },
 "timestamp discontinuity delta threshold", "threshold" },
 { "xerror", OPT_BOOL | OPT_EXPERT, { &exit_on_error },
 "exit on error", "error" },
- { "copyinkf", OPT_BOOL | OPT_EXPERT | OPT_SPEC, { .off = OFFSET(copy_initial_nonkeyframes) },
+ { "copyinkf", OPT_BOOL | OPT_EXPERT | OPT_SPEC |
+ OPT_OUTPUT, { .off = OFFSET(copy_initial_nonkeyframes) },
 "copy initial non-keyframes" },
- { "frames", OPT_INT64 | HAS_ARG | OPT_SPEC, { .off = OFFSET(max_frames) },
+ { "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,{ .off = OFFSET(codec_tags) },
+ { "tag", OPT_STRING | HAS_ARG | OPT_SPEC |
+ OPT_EXPERT | OPT_OUTPUT, { .off = OFFSET(codec_tags) },
 "force codec tag/fourcc", "fourcc/tag" },
- { "q", HAS_ARG | OPT_EXPERT | OPT_DOUBLE | OPT_SPEC,{ .off = OFFSET(qscale) },
+ { "q", HAS_ARG | OPT_EXPERT | OPT_DOUBLE |
+ OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(qscale) },
 "use fixed quality scale (VBR)", "q" },
- { "qscale", HAS_ARG | OPT_EXPERT | OPT_DOUBLE | OPT_SPEC,{ .off = OFFSET(qscale) },
+ { "qscale", HAS_ARG | OPT_EXPERT | OPT_DOUBLE |
+ OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(qscale) },
 "use fixed quality scale (VBR)", "q" },
- { "filter", HAS_ARG | OPT_STRING | OPT_SPEC, { .off = OFFSET(filters) },
+ { "filter", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(filters) },
 "set stream filterchain", "filter_list" },
+ { "filter_script", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(filter_scripts) },
+ "read stream filtergraph description from a file", "filename" },
 { "filter_complex", HAS_ARG | OPT_EXPERT, { .func_arg = opt_filter_complex },
 "create a complex filtergraph", "graph_description" },
+ { "filter_complex_script", HAS_ARG | OPT_EXPERT, { .func_arg = opt_filter_complex_script },
+ "read complex filtergraph description from a file", "filename" },
 { "stats", OPT_BOOL, { &print_stats },
 "print progress report during encoding", },
- { "attach", HAS_ARG | OPT_PERFILE | OPT_EXPERT, { .func_arg = opt_attach },
+ { "attach", HAS_ARG | OPT_PERFILE | OPT_EXPERT |
+ OPT_OUTPUT, { .func_arg = opt_attach },
 "add an attachment to the output file", "filename" },
- { "dump_attachment", HAS_ARG | OPT_STRING | OPT_SPEC |OPT_EXPERT,{ .off = OFFSET(dump_attachment) },
+ { "dump_attachment", HAS_ARG | OPT_STRING | OPT_SPEC |
+ OPT_EXPERT | OPT_INPUT, { .off = OFFSET(dump_attachment) },
 "extract an attachment into a file", "filename" },
- { "cpuflags", HAS_ARG | OPT_EXPERT, { .func_arg = opt_cpuflags },
- "set CPU flags mask", "mask" },
 
 /* video options */
- { "vframes", OPT_VIDEO | HAS_ARG | OPT_PERFILE, { .func_arg = opt_video_frames },
+ { "vframes", OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_video_frames },
 "set the number of video frames to record", "number" },
- { "r", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_SPEC, { .off = OFFSET(frame_rates) },
+ { "r", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_SPEC |
+ OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(frame_rates) },
 "set frame rate (Hz value, fraction or abbreviation)", "rate" },
- { "s", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_SPEC, { .off = OFFSET(frame_sizes) },
+ { "s", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_SPEC |
+ OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(frame_sizes) },
 "set frame size (WxH or abbreviation)", "size" },
- { "aspect", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_SPEC, { .off = OFFSET(frame_aspect_ratios) },
+ { "aspect", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_SPEC |
+ OPT_OUTPUT, { .off = OFFSET(frame_aspect_ratios) },
 "set aspect ratio (4:3, 16:9 or 1.3333, 1.7777)", "aspect" },
- { "pix_fmt", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_STRING | OPT_SPEC, { .off = OFFSET(frame_pix_fmts) },
+ { "pix_fmt", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_STRING | OPT_SPEC |
+ OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(frame_pix_fmts) },
 "set pixel format", "format" },
- { "vn", OPT_VIDEO | OPT_BOOL | OPT_OFFSET, { .off = OFFSET(video_disable) },
+ { "vn", OPT_VIDEO | OPT_BOOL | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(video_disable) },
 "disable video" },
 { "vdt", OPT_VIDEO | OPT_INT | HAS_ARG | OPT_EXPERT , { &video_discard },
 "discard threshold", "n" },
- { "rc_override", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_STRING | OPT_SPEC, { .off = OFFSET(rc_overrides) },
+ { "rc_override", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_STRING | OPT_SPEC |
+ OPT_OUTPUT, { .off = OFFSET(rc_overrides) },
 "rate control override for specific intervals", "override" },
- { "vcodec", OPT_VIDEO | HAS_ARG | OPT_PERFILE, { .func_arg = opt_video_codec },
+ { "vcodec", OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_INPUT |
+ OPT_OUTPUT, { .func_arg = opt_video_codec },
 "force video codec ('copy' to copy stream)", "codec" },
- { "pass", OPT_VIDEO | HAS_ARG | OPT_SPEC | OPT_INT, { .off = OFFSET(pass) },
+ { "pass", OPT_VIDEO | HAS_ARG | OPT_SPEC | OPT_INT | OPT_OUTPUT, { .off = OFFSET(pass) },
 "select the pass number (1 or 2)", "n" },
- { "passlogfile", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_EXPERT | OPT_SPEC, { .off = OFFSET(passlogfiles) },
+ { "passlogfile", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_EXPERT | OPT_SPEC |
+ OPT_OUTPUT, { .off = OFFSET(passlogfiles) },
 "select two pass log file name prefix", "prefix" },
- { "deinterlace", OPT_VIDEO | OPT_EXPERT , { .func_arg = opt_deinterlace },
- "this option is deprecated, use the yadif filter instead" },
 { "vstats", OPT_VIDEO | OPT_EXPERT , { &opt_vstats },
 "dump video coding statistics to file" },
 { "vstats_file", OPT_VIDEO | HAS_ARG | OPT_EXPERT , { opt_vstats_file },
 "dump video coding statistics to file", "file" },
- { "vf", OPT_VIDEO | HAS_ARG | OPT_PERFILE, { .func_arg = opt_video_filters },
+ { "vf", OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_video_filters },
 "video filters", "filter list" },
- { "intra_matrix", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_STRING | OPT_SPEC, { .off = OFFSET(intra_matrices) },
+ { "intra_matrix", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_STRING | OPT_SPEC |
+ OPT_OUTPUT, { .off = OFFSET(intra_matrices) },
 "specify intra matrix coeffs", "matrix" },
- { "inter_matrix", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_STRING | OPT_SPEC, { .off = OFFSET(inter_matrices) },
+ { "inter_matrix", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_STRING | OPT_SPEC |
+ OPT_OUTPUT, { .off = OFFSET(inter_matrices) },
 "specify inter matrix coeffs", "matrix" },
- { "top", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_INT| OPT_SPEC, { .off = OFFSET(top_field_first) },
+ { "top", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_INT| OPT_SPEC |
+ OPT_OUTPUT, { .off = OFFSET(top_field_first) },
 "top=1/bottom=0/auto=-1 field first", "" },
 { "dc", OPT_VIDEO | OPT_INT | HAS_ARG | OPT_EXPERT , { &intra_dc_precision },
 "intra_dc_precision", "precision" },
- { "vtag", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_PERFILE, { .func_arg = opt_video_tag },
+ { "vtag", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_PERFILE |
+ OPT_OUTPUT, { .func_arg = opt_video_tag },
 "force video tag/fourcc", "fourcc/tag" },
 { "qphist", OPT_VIDEO | OPT_BOOL | OPT_EXPERT , { &qp_hist },
 "show QP histogram" },
- { "force_fps", OPT_VIDEO | OPT_BOOL | OPT_EXPERT | OPT_SPEC, { .off = OFFSET(force_fps) },
+ { "force_fps", OPT_VIDEO | OPT_BOOL | OPT_EXPERT | OPT_SPEC |
+ OPT_OUTPUT, { .off = OFFSET(force_fps) },
 "force the selected framerate, disable the best supported framerate selection" },
- { "streamid", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_PERFILE, { .func_arg = opt_streamid },
+ { "streamid", OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_PERFILE |
+ OPT_OUTPUT, { .func_arg = opt_streamid },
 "set the value of an outfile streamid", "streamIndex:value" },
- { "force_key_frames", OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT | OPT_SPEC,
- { .off = OFFSET(forced_key_frames) }, "force key frames at specified timestamps", "timestamps" },
+ { "force_key_frames", OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT |
+ OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(forced_key_frames) },
+ "force key frames at specified timestamps", "timestamps" },
+ { "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, { .func_arg = opt_audio_frames },
+ { "aframes", OPT_AUDIO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_audio_frames },
 "set the number of audio frames to record", "number" },
- { "aq", OPT_AUDIO | HAS_ARG | OPT_PERFILE, { .func_arg = opt_audio_qscale },
+ { "aq", OPT_AUDIO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_audio_qscale },
 "set audio quality (codec-specific)", "quality", },
- { "ar", OPT_AUDIO | HAS_ARG | OPT_INT | OPT_SPEC, { .off = OFFSET(audio_sample_rate) },
+ { "ar", OPT_AUDIO | HAS_ARG | OPT_INT | OPT_SPEC |
+ OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(audio_sample_rate) },
 "set audio sampling rate (in Hz)", "rate" },
- { "ac", OPT_AUDIO | HAS_ARG | OPT_INT | OPT_SPEC, { .off = OFFSET(audio_channels) },
+ { "ac", OPT_AUDIO | HAS_ARG | OPT_INT | OPT_SPEC |
+ OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(audio_channels) },
 "set number of audio channels", "channels" },
- { "an", OPT_AUDIO | OPT_BOOL | OPT_OFFSET, { .off = OFFSET(audio_disable) },
+ { "an", OPT_AUDIO | OPT_BOOL | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(audio_disable) },
 "disable audio" },
- { "acodec", OPT_AUDIO | HAS_ARG | OPT_PERFILE, { .func_arg = opt_audio_codec },
+ { "acodec", OPT_AUDIO | HAS_ARG | OPT_PERFILE |
+ OPT_INPUT | OPT_OUTPUT, { .func_arg = opt_audio_codec },
 "force audio codec ('copy' to copy stream)", "codec" },
- { "atag", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_PERFILE, { .func_arg = opt_audio_tag },
+ { "atag", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_PERFILE |
+ OPT_OUTPUT, { .func_arg = opt_audio_tag },
 "force audio tag/fourcc", "fourcc/tag" },
 { "vol", OPT_AUDIO | HAS_ARG | OPT_INT, { &audio_volume },
 "change audio volume (256=normal)" , "volume" },
- { "sample_fmt", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_SPEC | OPT_STRING, { .off = OFFSET(sample_fmts) },
+ { "sample_fmt", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_SPEC |
+ OPT_STRING | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(sample_fmts) },
 "set sample format", "format" },
- { "channel_layout", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_PERFILE, { .func_arg = opt_channel_layout },
+ { "channel_layout", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_PERFILE |
+ OPT_INPUT | OPT_OUTPUT, { .func_arg = opt_channel_layout },
 "set channel layout", "layout" },
- { "af", OPT_AUDIO | HAS_ARG | OPT_PERFILE, { .func_arg = opt_audio_filters },
+ { "af", OPT_AUDIO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_audio_filters },
 "audio filters", "filter list" },
 
 /* subtitle options */
- { "sn", OPT_SUBTITLE | OPT_BOOL | OPT_OFFSET, { .off = OFFSET(subtitle_disable) },
+ { "sn", OPT_SUBTITLE | OPT_BOOL | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(subtitle_disable) },
 "disable subtitle" },
- { "scodec", OPT_SUBTITLE | HAS_ARG | OPT_PERFILE, { .func_arg = opt_subtitle_codec },
+ { "scodec", OPT_SUBTITLE | HAS_ARG | OPT_PERFILE | OPT_INPUT | OPT_OUTPUT, { .func_arg = opt_subtitle_codec },
 "force subtitle codec ('copy' to copy stream)", "codec" },
- { "stag", OPT_SUBTITLE | HAS_ARG | OPT_EXPERT | OPT_PERFILE, { .func_arg = opt_subtitle_tag }
+ { "stag", OPT_SUBTITLE | HAS_ARG | OPT_EXPERT | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_subtitle_tag }
 , "force subtitle tag/fourcc", "fourcc/tag" },
 
 /* grab options */
 { "isync", OPT_BOOL | OPT_EXPERT, { &input_sync }, "this option is deprecated and does nothing", "" },
 
 /* muxer options */
- { "muxdelay", OPT_FLOAT | HAS_ARG | OPT_EXPERT | OPT_OFFSET, { .off = OFFSET(mux_max_delay) },
+ { "muxdelay", OPT_FLOAT | HAS_ARG | OPT_EXPERT | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(mux_max_delay) },
 "set the maximum demux-decode delay", "seconds" },
- { "muxpreload", OPT_FLOAT | HAS_ARG | OPT_EXPERT | OPT_OFFSET, { .off = OFFSET(mux_preload) },
+ { "muxpreload", OPT_FLOAT | HAS_ARG | OPT_EXPERT | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(mux_preload) },
 "set the initial demux-decode delay", "seconds" },
 
- { "bsf", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_EXPERT, { .off = OFFSET(bitstream_filters) },
+ { "bsf", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_EXPERT | OPT_OUTPUT, { .off = OFFSET(bitstream_filters) },
 "A comma-separated list of bitstream filters", "bitstream_filters" },
 
 /* data codec support */
- { "dcodec", HAS_ARG | OPT_DATA | OPT_PERFILE | OPT_EXPERT, { .func_arg = opt_data_codec },
+ { "dcodec", HAS_ARG | OPT_DATA | OPT_PERFILE | OPT_EXPERT | OPT_INPUT | OPT_OUTPUT, { .func_arg = opt_data_codec },
 "force data codec ('copy' to copy stream)", "codec" },
 
 { NULL, },

libav-v10.1.tar.bz2/avconv_vdpau.c Added

@@ -0,0 +1,335 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 "avconv.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;
+}

libav-v9.6.tar.bz2/avplay.c -> libav-v10.1.tar.bz2/avplay.c Changed

@@ -23,6 +23,8 @@
 #include <inttypes.h>
 #include <math.h>
 #include <limits.h>
+#include <stdint.h>
+
 #include "libavutil/avstring.h"
 #include "libavutil/colorspace.h"
 #include "libavutil/mathematics.h"
@@ -41,7 +43,6 @@
 
 #if CONFIG_AVFILTER
 # include "libavfilter/avfilter.h"
-# include "libavfilter/avfiltergraph.h"
 # include "libavfilter/buffersink.h"
 # include "libavfilter/buffersrc.h"
 #endif
@@ -108,9 +109,7 @@
 int reallocate;
 enum AVPixelFormat pix_fmt;
 
-#if CONFIG_AVFILTER
- AVFilterBufferRef *picref;
-#endif
+ AVRational sar;
 } VideoPicture;
 
 typedef struct SubPicture {
@@ -217,8 +216,6 @@
 #if CONFIG_AVFILTER
 AVFilterContext *in_video_filter; // the first filter in the video chain
 AVFilterContext *out_video_filter; // the last filter in the video chain
- int use_dr1;
- FrameBuffer *buffer_pool;
 #endif
 
 float skip_frames;
@@ -247,8 +244,6 @@
 static int av_sync_type = AV_SYNC_AUDIO_MASTER;
 static int64_t start_time = AV_NOPTS_VALUE;
 static int64_t duration = AV_NOPTS_VALUE;
-static int debug = 0;
-static int debug_mv = 0;
 static int step = 0;
 static int workaround_bugs = 1;
 static int fast = 0;
@@ -656,10 +651,10 @@
 vp = &is->pictq[is->pictq_rindex];
 if (vp->bmp) {
 #if CONFIG_AVFILTER
- if (vp->picref->video->pixel_aspect.num == 0)
+ if (!vp->sar.num)
 aspect_ratio = 0;
 else
- aspect_ratio = av_q2d(vp->picref->video->pixel_aspect);
+ aspect_ratio = av_q2d(vp->sar);
 #else
 
 /* XXX: use variable in the frame */
@@ -853,7 +848,8 @@
 }
 av_rdft_calc(s->rdft, data[ch]);
 }
- // least efficient way to do this, we should of course directly access it but its more than fast enough
+ /* Least efficient way to do this, we should of course
+ * directly access it but it is more than fast enough. */
 for (y = 0; y < s->height; y++) {
 double w = 1 / sqrt(nb_freq);
 int a = sqrt(w * sqrt(data[0][2 * y + 0] * data[0][2 * y + 0] + data[0][2 * y + 1] * data[0][2 * y + 1]));
@@ -1229,9 +1225,6 @@
 /* free all pictures */
 for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
 vp = &is->pictq[i];
-#if CONFIG_AVFILTER
- avfilter_unref_bufferp(&vp->picref);
-#endif
 if (vp->bmp) {
 SDL_FreeYUVOverlay(vp->bmp);
 vp->bmp = NULL;
@@ -1255,9 +1248,6 @@
 cur_stream = NULL;
 }
 uninit_opts();
-#if CONFIG_AVFILTER
- avfilter_uninit();
-#endif
 avformat_network_deinit();
 if (show_status)
 printf("\n");
@@ -1279,8 +1269,6 @@
 SDL_FreeYUVOverlay(vp->bmp);
 
 #if CONFIG_AVFILTER
- avfilter_unref_bufferp(&vp->picref);
-
 vp->width = is->out_video_filter->inputs[0]->w;
 vp->height = is->out_video_filter->inputs[0]->h;
 vp->pix_fmt = is->out_video_filter->inputs[0]->format;
@@ -1369,10 +1357,6 @@
 /* if the frame is not skipped, then display it */
 if (vp->bmp) {
 AVPicture pict = { { 0 } };
-#if CONFIG_AVFILTER
- avfilter_unref_bufferp(&vp->picref);
- vp->picref = src_frame->opaque;
-#endif
 
 /* get a pointer on the bitmap */
 SDL_LockYUVOverlay (vp->bmp);
@@ -1432,6 +1416,7 @@
 static int output_picture2(VideoState *is, AVFrame *src_frame, double pts1, int64_t pos)
 {
 double frame_delay, pts;
+ int ret;
 
 pts = pts1;
 
@@ -1448,7 +1433,9 @@
 frame_delay += src_frame->repeat_pict * (frame_delay * 0.5);
 is->video_clock += frame_delay;
 
- return queue_picture(is, src_frame, pts, pos);
+ ret = queue_picture(is, src_frame, pts, pos);
+ av_frame_unref(src_frame);
+ return ret;
 }
 
 static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacket *pkt)
@@ -1495,13 +1482,16 @@
 if (*pts == AV_NOPTS_VALUE) {
 *pts = 0;
 }
+ if (is->video_st->sample_aspect_ratio.num) {
+ frame->sample_aspect_ratio = is->video_st->sample_aspect_ratio;
+ }
 
 is->skip_frames_index += 1;
 if (is->skip_frames_index >= is->skip_frames) {
 is->skip_frames_index -= FFMAX(is->skip_frames, 1.0);
 return 1;
 }
-
+ av_frame_unref(frame);
 }
 return 0;
 }
@@ -1569,13 +1559,6 @@
 is->in_video_filter = filt_src;
 is->out_video_filter = filt_out;
 
- if (codec->codec->capabilities & CODEC_CAP_DR1) {
- is->use_dr1 = 1;
- codec->get_buffer = codec_get_buffer;
- codec->release_buffer = codec_release_buffer;
- codec->opaque = &is->buffer_pool;
- }
-
 return ret;
 }
 
@@ -1585,7 +1568,7 @@
 {
 AVPacket pkt = { 0 };
 VideoState *is = arg;
- AVFrame *frame = avcodec_alloc_frame();
+ AVFrame *frame = av_frame_alloc();
 int64_t pts_int;
 double pts;
 int ret;
@@ -1593,7 +1576,6 @@
 #if CONFIG_AVFILTER
 AVFilterGraph *graph = avfilter_graph_alloc();
 AVFilterContext *filt_out = NULL, *filt_in = NULL;
- int64_t pos;
 int last_w = is->video_st->codec->width;
 int last_h = is->video_st->codec->height;
 
@@ -1605,7 +1587,6 @@
 
 for (;;) {
 #if CONFIG_AVFILTER
- AVFilterBufferRef *picref;
 AVRational tb;
 #endif
 while (is->paused && !is->videoq.abort_request)
@@ -1636,38 +1617,19 @@
 }
 
 frame->pts = pts_int;
- if (is->use_dr1) {
- FrameBuffer *buf = frame->opaque;
- AVFilterBufferRef *fb = avfilter_get_video_buffer_ref_from_arrays(
- frame->data, frame->linesize,
- AV_PERM_READ | AV_PERM_PRESERVE,
- frame->width, frame->height,
- frame->format);
-
- avfilter_copy_frame_props(fb, frame);
- fb->buf->priv = buf;
- fb->buf->free = filter_release_buffer;
-
- buf->refcount++;
- av_buffersrc_buffer(filt_in, fb);
-
- } else
- av_buffersrc_write_frame(filt_in, frame);
+ ret = av_buffersrc_add_frame(filt_in, frame);
+ if (ret < 0)
+ goto the_end;
 
 while (ret >= 0) {
- ret = av_buffersink_read(filt_out, &picref);
+ ret = av_buffersink_get_frame(filt_out, frame);
 if (ret < 0) {
 ret = 0;
 break;
 }
 
- avfilter_copy_buf_props(frame, picref);
-
- pts_int = picref->pts;
+ pts_int = frame->pts;
 tb = filt_out->inputs[0]->time_base;
- pos = picref->pos;
- frame->opaque = picref;
-
 if (av_cmp_q(tb, is->video_st->time_base)) {
 av_unused int64_t pts1 = pts_int;
 pts_int = av_rescale_q(pts_int, tb, is->video_st->time_base);
@@ -1677,7 +1639,7 @@
 is->video_st->time_base.num, is->video_st->time_base.den, pts_int);
 }
 pts = pts_int * av_q2d(is->video_st->time_base);
- ret = output_picture2(is, frame, pts, pos);
+ ret = output_picture2(is, frame, pts, 0);
 }
 #else
 pts = pts_int * av_q2d(is->video_st->time_base);
@@ -1687,6 +1649,7 @@
 if (ret < 0)
 goto the_end;
 
+
 if (step)
 if (cur_stream)
 stream_pause(cur_stream);
@@ -1697,7 +1660,7 @@
 avfilter_graph_free(&graph);
 #endif
 av_free_packet(&pkt);
- avcodec_free_frame(&frame);
+ av_frame_free(&frame);
 return 0;
 }
 
@@ -1881,10 +1844,9 @@
 int resample_changed, audio_resample;
 
 if (!is->frame) {
- if (!(is->frame = avcodec_alloc_frame()))
+ if (!(is->frame = av_frame_alloc()))
 return AVERROR(ENOMEM);
- } else
- avcodec_get_frame_defaults(is->frame);
+ }
 
 if (flush_complete)
 break;
@@ -2074,8 +2036,6 @@
 opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index], NULL);
 
 codec = avcodec_find_decoder(avctx->codec_id);
- avctx->debug_mv = debug_mv;
- avctx->debug = debug;
 avctx->workaround_bugs = workaround_bugs;
 avctx->idct_algo = idct;
 avctx->skip_frame = skip_frame;
@@ -2087,6 +2047,8 @@
 
 if (!av_dict_get(opts, "threads", NULL, 0))
 av_dict_set(&opts, "threads", "auto", 0);
+ if (avctx->codec_type == AVMEDIA_TYPE_VIDEO)
+ av_dict_set(&opts, "refcounted_frames", "1", 0);
 if (!codec ||
 avcodec_open2(avctx, codec, &opts) < 0)
 return -1;
@@ -2189,7 +2151,7 @@
 avresample_free(&is->avr);
 av_freep(&is->audio_buf1);
 is->audio_buf = NULL;
- avcodec_free_frame(&is->frame);
+ av_frame_free(&is->frame);
 
 if (is->rdft) {
 av_rdft_end(is->rdft);
@@ -2232,9 +2194,6 @@
 
 ic->streams[stream_index]->discard = AVDISCARD_ALL;
 avcodec_close(avctx);
-#if CONFIG_AVFILTER
- free_buffer_pool(&is->buffer_pool);
-#endif
 switch (avctx->codec_type) {
 case AVMEDIA_TYPE_AUDIO:
 is->audio_st = NULL;
@@ -2642,6 +2601,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(void)
 {
@@ -2687,6 +2673,12 @@
 case SDLK_w:
 toggle_audio_display();
 break;
+ case SDLK_PAGEUP:
+ seek_chapter(cur_stream, 1);
+ break;
+ case SDLK_PAGEDOWN:
+ seek_chapter(cur_stream, -1);
+ break;
 case SDLK_LEFT:
 incr = -10.0;
 goto do_seek;
@@ -2852,19 +2844,6 @@
 return 0;
 }
 
-static int opt_debug(void *optctx, const char *opt, const char *arg)
-{
- av_log_set_level(99);
- debug = parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX);
- return 0;
-}
-
-static int opt_vismv(void *optctx, const char *opt, const char *arg)
-{
- debug_mv = parse_number_or_die(opt, arg, OPT_INT64, INT_MIN, INT_MAX);
- return 0;
-}
-
 static const OptionDef options[] = {
 #include "cmdutils_common_opts.h"
 { "x", HAS_ARG, { .func_arg = opt_width }, "force displayed width", "width" },
@@ -2883,9 +2862,7 @@
 { "f", HAS_ARG, { .func_arg = opt_format }, "force format", "fmt" },
 { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, { .func_arg = opt_frame_pix_fmt }, "set pixel format", "format" },
 { "stats", OPT_BOOL | OPT_EXPERT, { &show_status }, "show status", "" },
- { "debug", HAS_ARG | OPT_EXPERT, { .func_arg = opt_debug }, "print specific debug info", "" },
 { "bug", OPT_INT | HAS_ARG | OPT_EXPERT, { &workaround_bugs }, "workaround bugs", "" },
- { "vismv", HAS_ARG | OPT_EXPERT, { .func_arg = opt_vismv }, "visualize motion vectors", "" },
 { "fast", OPT_BOOL | OPT_EXPERT, { &fast }, "non spec compliant optimizations", "" },
 { "genpts", OPT_BOOL | OPT_EXPERT, { &genpts }, "generate pts", "" },
 { "drp", OPT_INT | HAS_ARG | OPT_EXPERT, { &decoder_reorder_pts }, "let decoder reorder pts 0=off 1=on -1=auto", ""},
@@ -3002,11 +2979,9 @@
 }
 
 if (!display_disable) {
-#if HAVE_SDL_VIDEO_SIZE
 const SDL_VideoInfo *vi = SDL_GetVideoInfo();
 fs_screen_width = vi->current_w;
 fs_screen_height = vi->current_h;
-#endif
 }
 
 SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE);
@@ -3014,7 +2989,7 @@
 SDL_EventState(SDL_USEREVENT, SDL_IGNORE);
 
 av_init_packet(&flush_pkt);
- flush_pkt.data = "FLUSH";
+ flush_pkt.data = (uint8_t *)&flush_pkt;
 
 cur_stream = stream_open(input_filename, file_iformat);

libav-v9.6.tar.bz2/avprobe.c -> libav-v10.1.tar.bz2/avprobe.c Changed

@@ -23,6 +23,7 @@
 
 #include "libavformat/avformat.h"
 #include "libavcodec/avcodec.h"
+#include "libavutil/avstring.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/dict.h"
@@ -59,7 +60,7 @@
 static const char unit_byte_str[]           = "byte" ;
 static const char unit_bit_per_second_str[] = "bit/s";
 
-static void exit_program(void)
+static void avprobe_cleanup(int ret)
 {
     av_dict_free(&fmt_entries_to_show);
 }
@@ -81,17 +82,17 @@
 typedef enum {
     ARRAY,
     OBJECT
-} ProbeElementType;
+} PrintElementType;
 
 typedef struct {
     const char *name;
-    ProbeElementType type;
+    PrintElementType type;
     int64_t index;
     int64_t nb_elems;
-} ProbeElement;
+} PrintElement;
 
 typedef struct {
-    ProbeElement *prefix;
+    PrintElement *prefix;
     int level;
     void (*print_header)(void);
     void (*print_footer)(void);
@@ -103,10 +104,10 @@
 
     void (*print_integer) (const char *key, int64_t value);
     void (*print_string)  (const char *key, const char *value);
-} OutputContext;
+} PrintContext;
 
 static AVIOContext *probe_out = NULL;
-static OutputContext octx;
+static PrintContext octx;
 #define AVP_INDENT() avio_printf(probe_out, "%*c", octx.level * 2, ' ')
 
 /*
@@ -165,7 +166,7 @@
 static void ini_print_object_header(const char *name)
 {
     int i;
-    ProbeElement *el = octx.prefix + octx.level -1;
+    PrintElement *el = octx.prefix + octx.level -1;
 
     if (el->nb_elems)
         avio_printf(probe_out, "\n");
@@ -302,7 +303,7 @@
 
     str = p = av_strdup(name);
     while (*p) {
-        *p = toupper(*p);
+        *p = av_toupper(*p);
         p++;
     }
 
@@ -319,7 +320,7 @@
 
     str = p = av_strdup(name);
     while (*p) {
-        *p = toupper(*p);
+        *p = av_toupper(*p);
         p++;
     }
 
@@ -361,21 +362,21 @@
     int64_t count = -1;
 
     octx.prefix =
-        av_realloc(octx.prefix, sizeof(ProbeElement) * (octx.level + 1));
+        av_realloc(octx.prefix, sizeof(PrintElement) * (octx.level + 1));
 
     if (!octx.prefix || !name) {
         fprintf(stderr, "Out of memory\n");
-        exit(1);
+        exit_program(1);
     }
 
     if (octx.level) {
-        ProbeElement *parent = octx.prefix + octx.level -1;
+        PrintElement *parent = octx.prefix + octx.level -1;
         if (parent->type == ARRAY)
             count = parent->nb_elems;
         parent->nb_elems++;
     }
 
-    octx.prefix[octx.level++] = (ProbeElement){name, type, count, 0};
+    octx.prefix[octx.level++] = (PrintElement){name, type, count, 0};
 }
 
 static void probe_group_leave(void)
@@ -525,20 +526,6 @@
     return buf;
 }
 
-
-
-static const char *media_type_string(enum AVMediaType media_type)
-{
-    switch (media_type) {
-    case AVMEDIA_TYPE_VIDEO:      return "video";
-    case AVMEDIA_TYPE_AUDIO:      return "audio";
-    case AVMEDIA_TYPE_DATA:       return "data";
-    case AVMEDIA_TYPE_SUBTITLE:   return "subtitle";
-    case AVMEDIA_TYPE_ATTACHMENT: return "attachment";
-    default:                      return "unknown";
-    }
-}
-
 static void show_packet(AVFormatContext *fmt_ctx, AVPacket *pkt)
 {
     char val_str[128];
@@ -867,7 +854,7 @@
         fprintf(stderr,
                 "Argument '%s' provided as input filename, but '%s' was already specified.\n",
                 arg, input_filename);
-        exit(1);
+        exit_program(1);
     }
     if (!strcmp(arg, "-"))
         arg = "pipe:";
@@ -932,7 +919,7 @@
     if (!buffer)
         exit(1);
 
-    atexit(exit_program);
+    register_exit(avprobe_cleanup);
 
     options = real_options;
     parse_loglevel(argc, argv, options);
@@ -962,13 +949,13 @@
         fprintf(stderr,
                 "Use -h to get full help or, even better, run 'man %s'.\n",
                 program_name);
-        exit(1);
+        exit_program(1);
     }
 
     probe_out = avio_alloc_context(buffer, AVP_BUFFSIZE, 1, NULL, NULL,
                                  probe_buf_write, NULL);
     if (!probe_out)
-        exit(1);
+        exit_program(1);
 
     probe_header();
     ret = probe_file(input_filename);

libav-v9.6.tar.bz2/avserver.c -> libav-v10.1.tar.bz2/avserver.c Changed

@@ -32,6 +32,7 @@
 #include "libavformat/network.h"
 #include "libavformat/os_support.h"
 #include "libavformat/rtpdec.h"
+#include "libavformat/rtpproto.h"
 #include "libavformat/rtsp.h"
 #include "libavformat/avio_internal.h"
 #include "libavformat/internal.h"
@@ -58,9 +59,6 @@
 #include <time.h>
 #include <sys/wait.h>
 #include <signal.h>
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
 
 #include "cmdutils.h"
 
@@ -303,7 +301,7 @@
 
 static const char *my_program_name;
 
-static const char *config_filename = "/etc/avserver.conf";
+static const char *config_filename;
 
 static int avserver_debug;
 static int no_launch;
@@ -1113,7 +1111,7 @@
 if (av_strncasecmp(p, "Pragma:", 7) == 0) {
 const char *q = p + 7;
 
- while (*q && *q != '\n' && isspace(*q))
+ while (*q && *q != '\n' && av_isspace(*q))
 q++;
 
 if (av_strncasecmp(q, "stream-switch-entry=", 20) == 0) {
@@ -1135,7 +1133,7 @@
 if (stream_no < ratelen && stream_no >= 0)
 rates[stream_no] = rate_no;
 
- while (*q && *q != '\n' && !isspace(*q))
+ while (*q && *q != '\n' && !av_isspace(*q))
 q++;
 }
 
@@ -1246,7 +1244,7 @@
 p = *pp;
 skip_spaces(&p);
 q = buf;
- while (!isspace(*p) && *p != '\0') {
+ while (!av_isspace(*p) && *p != '\0') {
 if ((q - buf) < buf_size - 1)
 *q++ = *p;
 p++;
@@ -1263,7 +1261,7 @@
 int quote;
 
 p = *pp;
- while (isspace(*p)) p++;
+ while (av_isspace(*p)) p++;
 q = buf;
 quote = 0;
 if (*p == '\"' || *p == '\'')
@@ -1273,7 +1271,7 @@
 if (*p == quote)
 break;
 } else {
- if (isspace(*p))
+ if (av_isspace(*p))
 break;
 }
 if (*p == '\0')
@@ -1377,7 +1375,7 @@
 break;
 line_num++;
 p = line;
- while (isspace(*p))
+ while (av_isspace(*p))
 p++;
 if (*p == '\0' || *p == '#')
 continue;
@@ -1528,7 +1526,7 @@
 for (p = c->buffer; *p && *p != '\r' && *p != '\n'; ) {
 if (av_strncasecmp(p, "User-Agent:", 11) == 0) {
 useragent = p + 11;
- if (*useragent && *useragent != '\n' && isspace(*useragent))
+ if (*useragent && *useragent != '\n' && av_isspace(*useragent))
 useragent++;
 break;
 }
@@ -1654,7 +1652,7 @@
 char *eoh;
 char hostbuf[260];
 
- while (isspace(*hostinfo))
+ while (av_isspace(*hostinfo))
 hostinfo++;
 
 eoh = strchr(hostinfo, '\n');
@@ -3914,32 +3912,6 @@
 return p->id;
 }
 
-/* simplistic plugin support */
-
-#if HAVE_DLOPEN
-static void load_module(const char *filename)
-{
- void *dll;
- void (*init_func)(void);
- dll = dlopen(filename, RTLD_NOW);
- if (!dll) {
- fprintf(stderr, "Could not load module '%s' - %s\n",
- filename, dlerror());
- return;
- }
-
- init_func = dlsym(dll, "avserver_module_init");
- if (!init_func) {
- fprintf(stderr,
- "%s: init function 'avserver_module_init()' not found\n",
- filename);
- dlclose(dll);
- }
-
- init_func();
-}
-#endif
-
 static int avserver_opt_default(const char *opt, const char *arg,
 AVCodecContext *avctx, int type)
 {
@@ -4060,7 +4032,7 @@
 break;
 line_num++;
 p = line;
- while (isspace(*p))
+ while (av_isspace(*p))
 p++;
 if (*p == '\0' || *p == '#')
 continue;
@@ -4198,7 +4170,7 @@
 get_arg(arg, sizeof(arg), &p);
 p1 = arg;
 fsize = strtod(p1, &p1);
- switch(toupper(*p1)) {
+ switch(av_toupper(*p1)) {
 case 'K':
 fsize *= 1024;
 break;
@@ -4505,14 +4477,6 @@
 ERROR("VideoQMin out of range\n");
 }
 }
- } else if (!av_strcasecmp(cmd, "LumaElim")) {
- get_arg(arg, sizeof(arg), &p);
- if (stream)
- video_enc.luma_elim_threshold = atoi(arg);
- } else if (!av_strcasecmp(cmd, "ChromaElim")) {
- get_arg(arg, sizeof(arg), &p);
- if (stream)
- video_enc.chroma_elim_threshold = atoi(arg);
 } else if (!av_strcasecmp(cmd, "LumiMask")) {
 get_arg(arg, sizeof(arg), &p);
 if (stream)
@@ -4604,12 +4568,7 @@
 redirect = NULL;
 }
 } else if (!av_strcasecmp(cmd, "LoadModule")) {
- get_arg(arg, sizeof(arg), &p);
-#if HAVE_DLOPEN
- load_module(arg);
-#else
- ERROR("Module support not compiled into this version: '%s'\n", arg);
-#endif
+ ERROR("Loadable modules no longer supported\n");
 } else {
 ERROR("Incorrect keyword: '%s'\n", cmd);
 }
@@ -4674,6 +4633,8 @@
 {
 struct sigaction sigact = { { 0 } };
 
+ config_filename = av_strdup("/etc/avserver.conf");
+
 parse_loglevel(argc, argv, options);
 av_register_all();
 avformat_network_init();

libav-v9.6.tar.bz2/cmdutils.c -> libav-v10.1.tar.bz2/cmdutils.c Changed

@@ -20,6 +20,7 @@
 */
 
 #include <string.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <math.h>
@@ -43,6 +44,7 @@
 #include "libavutil/eval.h"
 #include "libavutil/dict.h"
 #include "libavutil/opt.h"
+#include "libavutil/cpu.h"
 #include "cmdutils.h"
 #include "version.h"
 #if CONFIG_NETWORK
@@ -54,9 +56,9 @@
 #endif
 
 struct SwsContext *sws_opts;
-AVDictionary *format_opts, *codec_opts;
+AVDictionary *format_opts, *codec_opts, *resample_opts;
 
-static const int this_year = 2013;
+static const int this_year = 2014;
 
 void init_opts(void)
 {
@@ -74,6 +76,7 @@
 #endif
 av_dict_free(&format_opts);
 av_dict_free(&codec_opts);
+ av_dict_free(&resample_opts);
 }
 
 void log_callback_help(void *ptr, int level, const char *fmt, va_list vl)
@@ -81,6 +84,21 @@
 vfprintf(stdout, fmt, vl);
 }
 
+static void (*program_exit)(int ret);
+
+void register_exit(void (*cb)(int ret))
+{
+ program_exit = cb;
+}
+
+void exit_program(int ret)
+{
+ if (program_exit)
+ program_exit(ret);
+
+ exit(ret);
+}
+
 double parse_number_or_die(const char *context, const char *numstr, int type,
 double min, double max)
 {
@@ -98,7 +116,7 @@
 else
 return d;
 av_log(NULL, AV_LOG_FATAL, error, context, numstr, min, max);
- exit(1);
+ exit_program(1);
 return 0;
 }
 
@@ -109,7 +127,7 @@
 if (av_parse_time(&us, timestr, is_duration) < 0) {
 av_log(NULL, AV_LOG_FATAL, "Invalid %s specification for %s: %s\n",
 is_duration ? "duration" : "date", context, timestr);
- exit(1);
+ exit_program(1);
 }
 return us;
 }
@@ -166,7 +184,10 @@
 return po;
 }
 
-#if HAVE_COMMANDLINETOARGVW
+/* _WIN32 means using the windows libc - cygwin doesn't define that
+ * by default. HAVE_COMMANDLINETOARGVW is true on cygwin, while
+ * it doesn't provide the actual command line via GetCommandLineW(). */
+#if HAVE_COMMANDLINETOARGVW && defined(_WIN32)
 #include <windows.h>
 #include <shellapi.h>
 /* Will be leaked on exit */
@@ -271,7 +292,7 @@
 }
 }
 if (po->flags & OPT_EXIT)
- exit(0);
+ exit_program(0);
 
 return 0;
 }
@@ -331,7 +352,7 @@
 opt++;
 
 if ((ret = parse_option(optctx, opt, argv[optindex], options)) < 0)
- exit(1);
+ exit_program(1);
 optindex += ret;
 } else {
 if (parse_arg_function)
@@ -350,6 +371,16 @@
 for (i = 0; i < g->nb_opts; i++) {
 Option *o = &g->opts[i];
 
+ if (g->group_def->flags &&
+ !(g->group_def->flags & o->opt->flags)) {
+ av_log(NULL, AV_LOG_ERROR, "Option %s (%s) cannot be applied to "
+ "%s %s -- you are trying to apply an input option to an "
+ "output file or vice versa. Move this option before the "
+ "file it belongs to.\n", o->key, o->opt->help,
+ g->group_def->name, g->arg);
+ return AVERROR(EINVAL);
+ }
+
 av_log(NULL, AV_LOG_DEBUG, "Applying option %s (%s) with argument %s.\n",
 o->key, o->opt->help, o->val);
 
@@ -405,6 +436,9 @@
 char opt_stripped[128];
 const char *p;
 const AVClass *cc = avcodec_get_class(), *fc = avformat_get_class();
+#if CONFIG_AVRESAMPLE
+ const AVClass *rc = avresample_get_class();
+#endif
 #if CONFIG_SWSCALE
 const AVClass *sc = sws_get_class();
 #endif
@@ -421,6 +455,11 @@
 else if ((o = av_opt_find(&fc, opt, NULL, 0,
 AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)))
 av_dict_set(&format_opts, opt, arg, FLAGS);
+#if CONFIG_AVRESAMPLE
+ else if ((o = av_opt_find(&rc, opt, NULL, 0,
+ AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)))
+ av_dict_set(&resample_opts, opt, arg, FLAGS);
+#endif
 #if CONFIG_SWSCALE
 else if ((o = av_opt_find(&sc, opt, NULL, 0,
 AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ))) {
@@ -480,9 +519,11 @@
 #endif
 g->codec_opts = codec_opts;
 g->format_opts = format_opts;
+ g->resample_opts = resample_opts;
 
 codec_opts = NULL;
 format_opts = NULL;
+ resample_opts = NULL;
 #if CONFIG_SWSCALE
 sws_opts = NULL;
 #endif
@@ -517,7 +558,7 @@
 octx->nb_groups = nb_groups;
 octx->groups = av_mallocz(sizeof(*octx->groups) * octx->nb_groups);
 if (!octx->groups)
- exit(1);
+ exit_program(1);
 
 for (i = 0; i < octx->nb_groups; i++)
 octx->groups[i].group_def = &groups[i];
@@ -539,6 +580,7 @@
 av_freep(&l->groups[j].opts);
 av_dict_free(&l->groups[j].codec_opts);
 av_dict_free(&l->groups[j].format_opts);
+ av_dict_free(&l->groups[j].resample_opts);
 #if CONFIG_SWSCALE
 sws_freeContext(l->groups[j].sws_opts);
 #endif
@@ -645,7 +687,7 @@
 return AVERROR_OPTION_NOT_FOUND;
 }
 
- if (octx->cur_group.nb_opts || codec_opts || format_opts)
+ if (octx->cur_group.nb_opts || codec_opts || format_opts || resample_opts)
 av_log(NULL, AV_LOG_WARNING, "Trailing options were found on the "
 "commandline.\n");
 
@@ -654,6 +696,17 @@
 return 0;
 }
 
+int opt_cpuflags(void *optctx, const char *opt, const char *arg)
+{
+ int flags = av_parse_cpu_flags(arg);
+
+ if (flags < 0)
+ return flags;
+
+ av_set_cpu_flags_mask(flags);
+ return 0;
+}
+
 int opt_loglevel(void *optctx, const char *opt, const char *arg)
 {
 const struct { const char *name; int level; } log_levels[] = {
@@ -683,7 +736,7 @@
 "Possible levels are numbers or:\n", arg);
 for (i = 0; i < FF_ARRAY_ELEMS(log_levels); i++)
 av_log(NULL, AV_LOG_FATAL, "\"%s\"\n", log_levels[i].name);
- exit(1);
+ exit_program(1);
 }
 av_log_set_level(level);
 return 0;
@@ -1108,12 +1161,12 @@
 
 int show_filters(void *optctx, const char *opt, const char *arg)
 {
- AVFilter av_unused(**filter) = NULL;
+ const AVFilter av_unused(*filter) = NULL;
 
 printf("Filters:\n");
 #if CONFIG_AVFILTER
- while ((filter = av_filter_next(filter)) && *filter)
- printf("%-16s %s\n", (*filter)->name, (*filter)->description);
+ while ((filter = avfilter_next(filter)))
+ printf("%-16s %s\n", filter->name, filter->description);
 #endif
 return 0;
 }
@@ -1139,11 +1192,11 @@
 while ((pix_desc = av_pix_fmt_desc_next(pix_desc))) {
 enum AVPixelFormat pix_fmt = av_pix_fmt_desc_get_id(pix_desc);
 printf("%c%c%c%c%c %-16s %d %2d\n",
- sws_isSupportedInput (pix_fmt) ? 'I' : '.',
- sws_isSupportedOutput(pix_fmt) ? 'O' : '.',
- pix_desc->flags & PIX_FMT_HWACCEL ? 'H' : '.',
- pix_desc->flags & PIX_FMT_PAL ? 'P' : '.',
- pix_desc->flags & PIX_FMT_BITSTREAM ? 'B' : '.',
+ sws_isSupportedInput (pix_fmt) ? 'I' : '.',
+ sws_isSupportedOutput(pix_fmt) ? 'O' : '.',
+ pix_desc->flags & AV_PIX_FMT_FLAG_HWACCEL ? 'H' : '.',
+ pix_desc->flags & AV_PIX_FMT_FLAG_PAL ? 'P' : '.',
+ pix_desc->flags & AV_PIX_FMT_FLAG_BITSTREAM ? 'B' : '.',
 pix_desc->name,
 pix_desc->nb_components,
 av_get_bits_per_pixel(pix_desc));
@@ -1246,6 +1299,49 @@
 show_help_children(fmt->priv_class, AV_OPT_FLAG_ENCODING_PARAM);
 }
 
+#if CONFIG_AVFILTER
+static void show_help_filter(const char *name)
+{
+ const AVFilter *f = avfilter_get_by_name(name);
+ int i, count;
+
+ if (!name) {
+ av_log(NULL, AV_LOG_ERROR, "No filter name specified.\n");
+ return;
+ } else if (!f) {
+ av_log(NULL, AV_LOG_ERROR, "Unknown filter '%s'.\n", name);
+ return;
+ }
+
+ printf("Filter %s [%s]:\n", f->name, f->description);
+
+ if (f->flags & AVFILTER_FLAG_SLICE_THREADS)
+ printf(" slice threading supported\n");
+
+ printf(" Inputs:\n");
+ count = avfilter_pad_count(f->inputs);
+ for (i = 0; i < count; i++) {
+ printf(" %d %s (%s)\n", i, avfilter_pad_get_name(f->inputs, i),
+ media_type_string(avfilter_pad_get_type(f->inputs, i)));
+ }
+ if (f->flags & AVFILTER_FLAG_DYNAMIC_INPUTS)
+ printf(" dynamic (depending on the options)\n");
+
+ printf(" Outputs:\n");
+ count = avfilter_pad_count(f->outputs);
+ for (i = 0; i < count; i++) {
+ printf(" %d %s (%s)\n", i, avfilter_pad_get_name(f->outputs, i),
+ media_type_string(avfilter_pad_get_type(f->outputs, i)));
+ }
+ if (f->flags & AVFILTER_FLAG_DYNAMIC_OUTPUTS)
+ printf(" dynamic (depending on the options)\n");
+
+ if (f->priv_class)
+ show_help_children(f->priv_class, AV_OPT_FLAG_VIDEO_PARAM |
+ AV_OPT_FLAG_AUDIO_PARAM);
+}
+#endif
+
 int show_help(void *optctx, const char *opt, const char *arg)
 {
 char *topic, *par;
@@ -1266,6 +1362,10 @@
 show_help_demuxer(par);
 } else if (!strcmp(topic, "muxer")) {
 show_help_muxer(par);
+#if CONFIG_AVFILTER
+ } else if (!strcmp(topic, "filter")) {
+ show_help_filter(par);
+#endif
 } else {
 show_help_default(topic, par);
 }
@@ -1277,7 +1377,7 @@
 int read_yesno(void)
 {
 int c = getchar();
- int yesno = (toupper(c) == 'Y');
+ int yesno = (av_toupper(c) == 'Y');
 
 while (c != '\n' && c != EOF)
 c = getchar();
@@ -1450,10 +1550,8 @@
 if (!codec)
 codec = s->oformat ? avcodec_find_encoder(codec_id)
 : avcodec_find_decoder(codec_id);
- if (!codec)
- return NULL;
 
- switch (codec->type) {
+ switch (st->codec->codec_type) {
 case AVMEDIA_TYPE_VIDEO:
 prefix = 'v';
 flags |= AV_OPT_FLAG_VIDEO_PARAM;
@@ -1519,13 +1617,13 @@
 {
 if (new_size >= INT_MAX / elem_size) {
 av_log(NULL, AV_LOG_ERROR, "Array too big.\n");
- exit(1);
+ exit_program(1);
 }
 if (*size < new_size) {
 uint8_t *tmp = av_realloc(array, new_size*elem_size);
 if (!tmp) {
 av_log(NULL, AV_LOG_ERROR, "Could not alloc buffer.\n");
- exit(1);
+ exit_program(1);
 }
 memset(tmp + *size*elem_size, 0, (new_size-*size) * elem_size);
 *size = new_size;
@@ -1534,134 +1632,14 @@
 return array;
 }
 
-static int alloc_buffer(FrameBuffer **pool, AVCodecContext *s, FrameBuffer **pbuf)
-{
- const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(s->pix_fmt);
- FrameBuffer *buf;
- int i, ret;
- int pixel_size;
- int h_chroma_shift, v_chroma_shift;
- int edge = 32; // XXX should be avcodec_get_edge_width(), but that fails on svq1
- int w = s->width, h = s->height;
-
- if (!desc)
- return AVERROR(EINVAL);
- pixel_size = desc->comp[0].step_minus1 + 1;
-
- buf = av_mallocz(sizeof(*buf));
- if (!buf)
- return AVERROR(ENOMEM);
-
- if (!(s->flags & CODEC_FLAG_EMU_EDGE)) {
- w += 2*edge;
- h += 2*edge;
- }
-
- avcodec_align_dimensions(s, &w, &h);
- if ((ret = av_image_alloc(buf->base, buf->linesize, w, h,
- s->pix_fmt, 32)) < 0) {
- av_freep(&buf);
- return ret;
- }
- /* XXX this shouldn't be needed, but some tests break without this line
- * those decoders are buggy and need to be fixed.
- * the following tests fail:
- * cdgraphics, ansi
- */
- memset(buf->base[0], 128, ret);
-
- av_pix_fmt_get_chroma_sub_sample(s->pix_fmt,
- &h_chroma_shift, &v_chroma_shift);
-
- for (i = 0; i < FF_ARRAY_ELEMS(buf->data); i++) {
- const int h_shift = i==0 ? 0 : h_chroma_shift;
- const int v_shift = i==0 ? 0 : v_chroma_shift;
- if (s->flags & CODEC_FLAG_EMU_EDGE)
- buf->data[i] = buf->base[i];
- else if (buf->base[i])
- buf->data[i] = buf->base[i] +
- FFALIGN((buf->linesize[i]*edge >> v_shift) +
- (pixel_size*edge >> h_shift), 32);
- }
- buf->w = s->width;
- buf->h = s->height;
- buf->pix_fmt = s->pix_fmt;
- buf->pool = pool;
-
- *pbuf = buf;
- return 0;
-}
-
-int codec_get_buffer(AVCodecContext *s, AVFrame *frame)
-{
- FrameBuffer **pool = s->opaque;
- FrameBuffer *buf;
- int ret, i;
-
- if (!*pool && (ret = alloc_buffer(pool, s, pool)) < 0)
- return ret;
-
- buf = *pool;
- *pool = buf->next;
- buf->next = NULL;
- if (buf->w != s->width || buf->h != s->height || buf->pix_fmt != s->pix_fmt) {
- av_freep(&buf->base[0]);
- av_free(buf);
- if ((ret = alloc_buffer(pool, s, &buf)) < 0)
- return ret;
- }
- buf->refcount++;
-
- frame->opaque = buf;
- frame->type = FF_BUFFER_TYPE_USER;
- frame->extended_data = frame->data;
-
- for (i = 0; i < FF_ARRAY_ELEMS(buf->data); i++) {
- frame->base[i] = buf->base[i]; // XXX h264.c uses base though it shouldn't
- frame->data[i] = buf->data[i];
- frame->linesize[i] = buf->linesize[i];
- }
-
- return 0;
-}
-
-static void unref_buffer(FrameBuffer *buf)
-{
- FrameBuffer **pool = buf->pool;
-
- av_assert0(buf->refcount);
- buf->refcount--;
- if (!buf->refcount) {
- buf->next = *pool;
- *pool = buf;
- }
-}
-
-void codec_release_buffer(AVCodecContext *s, AVFrame *frame)
-{
- FrameBuffer *buf = frame->opaque;
- int i;
-
- for (i = 0; i < FF_ARRAY_ELEMS(frame->data); i++)
- frame->data[i] = NULL;
-
- unref_buffer(buf);
-}
-
-void filter_release_buffer(AVFilterBuffer *fb)
-{
- FrameBuffer *buf = fb->priv;
- av_free(fb);
- unref_buffer(buf);
-}
-
-void free_buffer_pool(FrameBuffer **pool)
+const char *media_type_string(enum AVMediaType media_type)
 {
- FrameBuffer *buf = *pool;
- while (buf) {
- *pool = buf->next;
- av_freep(&buf->base[0]);
- av_free(buf);
- buf = *pool;
+ switch (media_type) {
+ case AVMEDIA_TYPE_VIDEO: return "video";
+ case AVMEDIA_TYPE_AUDIO: return "audio";
+ case AVMEDIA_TYPE_DATA: return "data";
+ case AVMEDIA_TYPE_SUBTITLE: return "subtitle";
+ case AVMEDIA_TYPE_ATTACHMENT: return "attachment";
+ default: return "unknown";
 }
 }

libav-v9.6.tar.bz2/cmdutils.h -> libav-v10.1.tar.bz2/cmdutils.h Changed

@@ -42,7 +42,17 @@
 extern AVCodecContext *avcodec_opts[AVMEDIA_TYPE_NB];
 extern AVFormatContext *avformat_opts;
 extern struct SwsContext *sws_opts;
-extern AVDictionary *format_opts, *codec_opts;
+extern AVDictionary *format_opts, *codec_opts, *resample_opts;
+
+/**
+ * Register a program-specific cleanup routine.
+ */
+void register_exit(void (*cb)(int ret));
+
+/**
+ * Wraps exit with a program-specific cleanup routine.
+ */
+void exit_program(int ret);
 
 /**
 * Initialize the cmdutils option system, in particular
@@ -62,6 +72,11 @@
 void log_callback_help(void* ptr, int level, const char* fmt, va_list vl);
 
 /**
+ * Override the cpuflags mask.
+ */
+int opt_cpuflags(void *optctx, const char *opt, const char *arg);
+
+/**
 * Fallback for options that are not explicitly handled, these will be
 * parsed through AVOptions.
 */
@@ -144,6 +159,8 @@
 an int containing element count in the array. */
 #define OPT_TIME 0x10000
 #define OPT_DOUBLE 0x20000
+#define OPT_INPUT 0x40000
+#define OPT_OUTPUT 0x80000
 union {
 void *dst_ptr;
 int (*func_arg)(void *, const char *, const char *);
@@ -224,6 +241,11 @@
 * are terminated by a non-option argument (e.g. avconv output files)
 */
 const char *sep;
+ /**
+ * Option flags that must be set on each option that is
+ * applied to this group
+ */
+ int flags;
 } OptionGroupDef;
 
 typedef struct OptionGroup {
@@ -235,6 +257,7 @@
 
 AVDictionary *codec_opts;
 AVDictionary *format_opts;
+ AVDictionary *resample_opts;
 struct SwsContext *sws_opts;
 } OptionGroup;
 
@@ -506,51 +529,13 @@
 */
 void *grow_array(void *array, int elem_size, int *size, int new_size);
 
-#define GROW_ARRAY(array, nb_elems)\
- array = grow_array(array, sizeof(*array), &nb_elems, nb_elems + 1)
-
-typedef struct FrameBuffer {
- uint8_t *base[4];
- uint8_t *data[4];
- int linesize[4];
-
- int h, w;
- enum AVPixelFormat pix_fmt;
-
- int refcount;
- struct FrameBuffer **pool; ///< head of the buffer pool
- struct FrameBuffer *next;
-} FrameBuffer;
-
-/**
- * Get a frame from the pool. This is intended to be used as a callback for
- * AVCodecContext.get_buffer.
- *
- * @param s codec context. s->opaque must be a pointer to the head of the
- * buffer pool.
- * @param frame frame->opaque will be set to point to the FrameBuffer
- * containing the frame data.
- */
-int codec_get_buffer(AVCodecContext *s, AVFrame *frame);
-
 /**
- * A callback to be used for AVCodecContext.release_buffer along with
- * codec_get_buffer().
+ * Get a string describing a media type.
 */
-void codec_release_buffer(AVCodecContext *s, AVFrame *frame);
+const char *media_type_string(enum AVMediaType media_type);
 
-/**
- * A callback to be used for AVFilterBuffer.free.
- * @param fb buffer to free. fb->priv must be a pointer to the FrameBuffer
- * containing the buffer data.
- */
-void filter_release_buffer(AVFilterBuffer *fb);
-
-/**
- * Free all the buffers in the pool. This must be called after all the
- * buffers have been released.
- */
-void free_buffer_pool(FrameBuffer **pool);
+#define GROW_ARRAY(array, nb_elems)\
+ array = grow_array(array, sizeof(*array), &nb_elems, nb_elems + 1)
 
 #define GET_PIX_FMT_NAME(pix_fmt)\
 const char *name = av_get_pix_fmt_name(pix_fmt);

libav-v9.6.tar.bz2/cmdutils_common_opts.h -> libav-v10.1.tar.bz2/cmdutils_common_opts.h Changed

libav-v9.6.tar.bz2/common.mak -> libav-v10.1.tar.bz2/common.mak Changed

@@ -14,7 +14,6 @@
 LDLIBS = $(FFLIBS:%=%$(BUILDSUF))
 FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(EXTRALIBS)
 
-EXAMPLES := $(EXAMPLES:%=$(SUBDIR)%-example$(EXESUF))
 OBJS := $(sort $(OBJS:%=$(SUBDIR)%))
 TESTOBJS := $(TESTOBJS:%=$(SUBDIR)%) $(TESTPROGS:%=$(SUBDIR)%-test.o)
 TESTPROGS := $(TESTPROGS:%=$(SUBDIR)%-test$(EXESUF))
@@ -25,8 +24,10 @@
 TOOLS := $(TOOLS:%=tools/%$(EXESUF))
 HEADERS += $(HEADERS-yes)
 
-DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME))
+PATH_LIBNAME = $(foreach NAME,$(1),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME))
+DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib)))
 
+SRC_DIR := $(SRC_PATH)/lib$(NAME)
 ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
 SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-)
 SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%)
@@ -37,19 +38,20 @@
 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)))
 $(TESTOBJS): | $(sort $(dir $(TESTOBJS)))
 $(TOOLOBJS): | tools
 
-OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOSTOBJS) $(TESTOBJS))
+OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(TESTOBJS))
 
-CLEANSUFFIXES = *.d *.o *~ *.h.c *.map *.ver
+CLEANSUFFIXES = *.d *.o *~ *.h.c *.map *.ver *.gcno *.gcda
 DISTCLEANSUFFIXES = *.pc
 LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a

libav-v10.1.tar.bz2/compat/aix Added

libav-v10.1.tar.bz2/compat/aix/math.h Added

@@ -0,0 +1,31 @@
+/*
+ * Work around the class() function in AIX math.h clashing with
+ * identifiers named "class".
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef LIBAV_COMPAT_AIX_MATH_H
+#define LIBAV_COMPAT_AIX_MATH_H
+
+#define class class_in_math_h_causes_problems
+
+#include_next <math.h>
+
+#undef class
+
+#endif /* LIBAV_COMPAT_AIX_MATH_H */

libav-v9.6.tar.bz2/compat/getopt.c -> libav-v10.1.tar.bz2/compat/getopt.c Changed

libav-v9.6.tar.bz2/compat/strtod.c -> libav-v10.1.tar.bz2/compat/strtod.c Changed

libav-v9.6.tar.bz2/compat/tms470/math.h -> libav-v10.1.tar.bz2/compat/tms470/math.h Changed

@@ -1,3 +1,24 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef LIBAV_COMPAT_TMS470_MATH_H
+#define LIBAV_COMPAT_TMS470_MATH_H
+
 #include_next <math.h>
 
 #undef INFINITY
@@ -5,3 +26,5 @@
 
 #define INFINITY (*(const float*)((const unsigned []){ 0x7f800000 }))
 #define NAN (*(const float*)((const unsigned []){ 0x7fc00000 }))
+
+#endif /* LIBAV_COMPAT_TMS470_MATH_H */

libav-v10.1.tar.bz2/compat/w32pthreads.h Added

@@ -0,0 +1,281 @@
+/*
+ * Copyright (C) 2010-2011 x264 project
+ *
+ * Authors: Steven Walters <kemuri9@gmail.com>
+ * Pegasys Inc. <http://www.pegasys-inc.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * w32threads to pthreads wrapper
+ */
+
+#ifndef LIBAV_COMPAT_W32PTHREADS_H
+#define LIBAV_COMPAT_W32PTHREADS_H
+
+/* Build up a pthread-like API using underlying Windows API. Have only static
+ * methods so as to not conflict with a potentially linked in pthread-win32
+ * library.
+ * As most functions here are used without checking return values,
+ * only implement return values as necessary. */
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <process.h>
+
+#include "libavutil/internal.h"
+#include "libavutil/mem.h"
+
+typedef struct pthread_t {
+ void *handle;
+ void *(*func)(void* arg);
+ void *arg;
+ void *ret;
+} pthread_t;
+
+/* the conditional variable api for windows 6.0+ uses critical sections and
+ * not mutexes */
+typedef CRITICAL_SECTION pthread_mutex_t;
+
+/* This is the CONDITIONAL_VARIABLE typedef for using Window's native
+ * conditional variables on kernels 6.0+.
+ * MinGW does not currently have this typedef. */
+typedef struct pthread_cond_t {
+ void *ptr;
+} pthread_cond_t;
+
+/* function pointers to conditional variable API on windows 6.0+ kernels */
+#if _WIN32_WINNT < 0x0600
+static void (WINAPI *cond_broadcast)(pthread_cond_t *cond);
+static void (WINAPI *cond_init)(pthread_cond_t *cond);
+static void (WINAPI *cond_signal)(pthread_cond_t *cond);
+static BOOL (WINAPI *cond_wait)(pthread_cond_t *cond, pthread_mutex_t *mutex,
+ DWORD milliseconds);
+#else
+#define cond_init InitializeConditionVariable
+#define cond_broadcast WakeAllConditionVariable
+#define cond_signal WakeConditionVariable
+#define cond_wait SleepConditionVariableCS
+#endif
+
+static unsigned __stdcall attribute_align_arg win32thread_worker(void *arg)
+{
+ pthread_t *h = arg;
+ h->ret = h->func(h->arg);
+ return 0;
+}
+
+static int pthread_create(pthread_t *thread, const void *unused_attr,
+ void *(*start_routine)(void*), void *arg)
+{
+ thread->func = start_routine;
+ thread->arg = arg;
+ thread->handle = (void*)_beginthreadex(NULL, 0, win32thread_worker, thread,
+ 0, NULL);
+ return !thread->handle;
+}
+
+static void pthread_join(pthread_t thread, void **value_ptr)
+{
+ DWORD ret = WaitForSingleObject(thread.handle, INFINITE);
+ if (ret != WAIT_OBJECT_0)
+ return;
+ if (value_ptr)
+ *value_ptr = thread.ret;
+ CloseHandle(thread.handle);
+}
+
+static inline int pthread_mutex_init(pthread_mutex_t *m, void* attr)
+{
+ InitializeCriticalSection(m);
+ return 0;
+}
+static inline int pthread_mutex_destroy(pthread_mutex_t *m)
+{
+ DeleteCriticalSection(m);
+ return 0;
+}
+static inline int pthread_mutex_lock(pthread_mutex_t *m)
+{
+ EnterCriticalSection(m);
+ return 0;
+}
+static inline int pthread_mutex_unlock(pthread_mutex_t *m)
+{
+ LeaveCriticalSection(m);
+ return 0;
+}
+
+/* for pre-Windows 6.0 platforms we need to define and use our own condition
+ * variable and api */
+typedef struct win32_cond_t {
+ pthread_mutex_t mtx_broadcast;
+ pthread_mutex_t mtx_waiter_count;
+ volatile int waiter_count;
+ HANDLE semaphore;
+ HANDLE waiters_done;
+ volatile int is_broadcast;
+} win32_cond_t;
+
+static void pthread_cond_init(pthread_cond_t *cond, const void *unused_attr)
+{
+ win32_cond_t *win32_cond = NULL;
+ if (cond_init) {
+ cond_init(cond);
+ return;
+ }
+
+ /* non native condition variables */
+ win32_cond = av_mallocz(sizeof(win32_cond_t));
+ if (!win32_cond)
+ return;
+ cond->ptr = win32_cond;
+ win32_cond->semaphore = CreateSemaphore(NULL, 0, 0x7fffffff, NULL);
+ if (!win32_cond->semaphore)
+ return;
+ win32_cond->waiters_done = CreateEvent(NULL, TRUE, FALSE, NULL);
+ if (!win32_cond->waiters_done)
+ return;
+
+ pthread_mutex_init(&win32_cond->mtx_waiter_count, NULL);
+ pthread_mutex_init(&win32_cond->mtx_broadcast, NULL);
+}
+
+static void pthread_cond_destroy(pthread_cond_t *cond)
+{
+ win32_cond_t *win32_cond = cond->ptr;
+ /* native condition variables do not destroy */
+ if (cond_init)
+ return;
+
+ /* non native condition variables */
+ CloseHandle(win32_cond->semaphore);
+ CloseHandle(win32_cond->waiters_done);
+ pthread_mutex_destroy(&win32_cond->mtx_waiter_count);
+ pthread_mutex_destroy(&win32_cond->mtx_broadcast);
+ av_freep(&win32_cond);
+ cond->ptr = NULL;
+}
+
+static void pthread_cond_broadcast(pthread_cond_t *cond)
+{
+ win32_cond_t *win32_cond = cond->ptr;
+ int have_waiter;
+
+ if (cond_broadcast) {
+ cond_broadcast(cond);
+ return;
+ }
+
+ /* non native condition variables */
+ pthread_mutex_lock(&win32_cond->mtx_broadcast);
+ pthread_mutex_lock(&win32_cond->mtx_waiter_count);
+ have_waiter = 0;
+
+ if (win32_cond->waiter_count) {
+ win32_cond->is_broadcast = 1;
+ have_waiter = 1;
+ }
+
+ if (have_waiter) {
+ ReleaseSemaphore(win32_cond->semaphore, win32_cond->waiter_count, NULL);
+ pthread_mutex_unlock(&win32_cond->mtx_waiter_count);
+ WaitForSingleObject(win32_cond->waiters_done, INFINITE);
+ ResetEvent(win32_cond->waiters_done);
+ win32_cond->is_broadcast = 0;
+ } else
+ pthread_mutex_unlock(&win32_cond->mtx_waiter_count);
+ pthread_mutex_unlock(&win32_cond->mtx_broadcast);
+}
+
+static int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
+{
+ win32_cond_t *win32_cond = cond->ptr;
+ int last_waiter;
+ if (cond_wait) {
+ cond_wait(cond, mutex, INFINITE);
+ return 0;
+ }
+
+ /* non native condition variables */
+ pthread_mutex_lock(&win32_cond->mtx_broadcast);
+ pthread_mutex_lock(&win32_cond->mtx_waiter_count);
+ win32_cond->waiter_count++;
+ pthread_mutex_unlock(&win32_cond->mtx_waiter_count);
+ pthread_mutex_unlock(&win32_cond->mtx_broadcast);
+
+ // unlock the external mutex
+ pthread_mutex_unlock(mutex);
+ WaitForSingleObject(win32_cond->semaphore, INFINITE);
+
+ pthread_mutex_lock(&win32_cond->mtx_waiter_count);
+ win32_cond->waiter_count--;
+ last_waiter = !win32_cond->waiter_count || !win32_cond->is_broadcast;
+ pthread_mutex_unlock(&win32_cond->mtx_waiter_count);
+
+ if (last_waiter)
+ SetEvent(win32_cond->waiters_done);
+
+ // lock the external mutex
+ return pthread_mutex_lock(mutex);
+}
+
+static void pthread_cond_signal(pthread_cond_t *cond)
+{
+ win32_cond_t *win32_cond = cond->ptr;
+ int have_waiter;
+ if (cond_signal) {
+ cond_signal(cond);
+ return;
+ }
+
+ pthread_mutex_lock(&win32_cond->mtx_broadcast);
+
+ /* non-native condition variables */
+ pthread_mutex_lock(&win32_cond->mtx_waiter_count);
+ have_waiter = win32_cond->waiter_count;
+ pthread_mutex_unlock(&win32_cond->mtx_waiter_count);
+
+ if (have_waiter) {
+ ReleaseSemaphore(win32_cond->semaphore, 1, NULL);
+ WaitForSingleObject(win32_cond->waiters_done, INFINITE);
+ ResetEvent(win32_cond->waiters_done);
+ }
+
+ pthread_mutex_unlock(&win32_cond->mtx_broadcast);
+}
+
+static void w32thread_init(void)
+{
+#if _WIN32_WINNT < 0x0600
+ HANDLE kernel_dll = GetModuleHandle(TEXT("kernel32.dll"));
+ /* if one is available, then they should all be available */
+ cond_init =
+ (void*)GetProcAddress(kernel_dll, "InitializeConditionVariable");
+ cond_broadcast =
+ (void*)GetProcAddress(kernel_dll, "WakeAllConditionVariable");
+ cond_signal =
+ (void*)GetProcAddress(kernel_dll, "WakeConditionVariable");
+ cond_wait =
+ (void*)GetProcAddress(kernel_dll, "SleepConditionVariableCS");
+#endif
+
+}
+
+#endif /* LIBAV_COMPAT_W32PTHREADS_H */

libav-v10.1.tar.bz2/compat/windows Added

libav-v10.1.tar.bz2/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

libav-v9.6.tar.bz2/configure -> libav-v10.1.tar.bz2/configure Changed

@@ -81,6 +81,7 @@
 --prefix=PREFIX install in PREFIX [$prefix]
 --bindir=DIR install binaries in DIR [PREFIX/bin]
 --datadir=DIR install data files in DIR [PREFIX/share/avconv]
+ --docdir=DIR install documentation in DIR [PREFIX/share/doc/libav]
 --libdir=DIR install libs in DIR [PREFIX/lib]
 --shlibdir=DIR install shared libs in DIR [PREFIX/lib]
 --incdir=DIR install includes in DIR [PREFIX/include]
@@ -120,15 +121,16 @@
 --disable-avresample disable libavresample build [no]
 --disable-pthreads disable pthreads [auto]
 --disable-w32threads disable Win32 threads [auto]
- --enable-x11grab enable X11 grabbing [no]
 --disable-network disable network support [no]
 --disable-dct disable DCT code
- --disable-dwt disable DWT code
+ --disable-error-resilience disable error resilience code
 --disable-lsp disable LSP code
 --disable-lzo disable LZO decoder code
 --disable-mdct disable MDCT code
 --disable-rdft disable RDFT code
 --disable-fft disable FFT code
+
+Hardware accelerators:
 --enable-dxva2 enable DXVA2 code
 --enable-vaapi enable VAAPI code
 --enable-vda enable VDA code
@@ -172,7 +174,7 @@
 --disable-filters disable all filters
 
 External library support:
- --enable-avisynth enable reading of AVISynth script files [no]
+ --enable-avisynth enable reading of AviSynth script files [no]
 --enable-bzlib enable bzlib [autodetect]
 --enable-frei0r enable frei0r video filtering
 --enable-gnutls enable gnutls [no]
@@ -180,7 +182,7 @@
 --enable-libdc1394 enable IIDC-1394 grabbing using libdc1394
 and libraw1394 [no]
 --enable-libfaac enable AAC encoding via libfaac [no]
- --enable-libfdk-aac enable AAC encoding via libfdk-aac [no]
+ --enable-libfdk-aac enable AAC de/encoding via libfdk-aac [no]
 --enable-libfreetype enable libfreetype [no]
 --enable-libgsm enable GSM de/encoding via libgsm [no]
 --enable-libilbc enable iLBC de/encoding via libilbc [no]
@@ -198,12 +200,15 @@
 --enable-libvo-aacenc enable AAC encoding via libvo-aacenc [no]
 --enable-libvo-amrwbenc enable AMR-WB encoding via libvo-amrwbenc [no]
 --enable-libvorbis enable Vorbis encoding via libvorbis [no]
- --enable-libvpx enable VP8 de/encoding via libvpx [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-libxavs enable AVS encoding via xavs [no]
 --enable-libxvid enable Xvid encoding via xvidcore,
 native MPEG-4/Xvid encoder exists [no]
 --enable-openssl enable openssl [no]
+ --enable-x11grab enable X11 grabbing [no]
 --enable-zlib enable zlib [autodetect]
 
 Advanced options (experts only):
@@ -214,6 +219,7 @@
 --target-os=OS compiler targets OS [$target_os]
 --target-exec=CMD command to run executables on target
 --target-path=DIR path to view of build directory on target
+ --target-samples=DIR path to samples directory on target
 --toolchain=NAME set tool defaults according to NAME
 --nm=NM use nm tool
 --ar=AR use archive tool AR [$ar_default]
@@ -223,6 +229,7 @@
 --ld=LD use linker LD
 --host-cc=HOSTCC use host C compiler HOSTCC
 --host-cflags=HCFLAGS use HCFLAGS when compiling for host
+ --host-cppflags=HCPPFLAGS use HCPPFLAGS when compiling for host
 --host-ld=HOSTLD use host linker HOSTLD
 --host-ldflags=HLDFLAGS use HLDFLAGS when linking for host
 --host-libs=HLIBS use libs HLIBS when linking for host
@@ -263,6 +270,7 @@
 --disable-sse42 disable SSE4.2 optimizations
 --disable-avx disable AVX optimizations
 --disable-fma4 disable FMA4 optimizations
+ --disable-avx2 disable AVX2 optimizations
 --disable-armv5te disable armv5te optimizations
 --disable-armv6 disable armv6 optimizations
 --disable-armv6t2 disable armv6t2 optimizations
@@ -279,6 +287,8 @@
 --enable-extra-warnings enable more compiler warnings
 --samples=PATH location of test samples for FATE, if not set use
 \$LIBAV_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
@@ -323,7 +333,7 @@
 
 If you think configure made a mistake, make sure you are using the latest
 version from Git. If the latest version fails, report the problem to the
-libav-user@libav.org mailing list or IRC #libav on irc.freenode.net.
+libav-tools@libav.org mailing list or IRC #libav on irc.freenode.net.
 EOF
 if disabled logging; then
 cat <<EOF
@@ -406,32 +416,36 @@
 done
 }
 
+sanitize_var_name(){
+ echo $@ | sed 's/[^A-Za-z0-9_]/_/g'
+}
+
 set_safe(){
 var=$1
 shift
- eval $(echo "$var" | sed 's/[^A-Za-z0-9_]/_/g')='$*'
+ eval $(sanitize_var_name "$var")='$*'
 }
 
 get_safe(){
- eval echo \$$(echo "$1" | sed 's/[^A-Za-z0-9_]/_/g')
+ eval echo \$$(sanitize_var_name "$1")
 }
 
 pushvar(){
- for var in $*; do
- eval level=\${${var}_level:=0}
- eval ${var}_${level}="\$$var"
- eval ${var}_level=$(($level+1))
+ for pvar in $*; do
+ eval level=\${${pvar}_level:=0}
+ eval ${pvar}_${level}="\$$pvar"
+ eval ${pvar}_level=$(($level+1))
 done
 }
 
 popvar(){
- for var in $*; do
- eval level=\${${var}_level:-0}
+ for pvar in $*; do
+ eval level=\${${pvar}_level:-0}
 test $level = 0 && continue
 eval level=$(($level-1))
- eval $var="\${${var}_${level}}"
- eval ${var}_level=$level
- eval unset ${var}_${level}
+ eval $pvar="\${${pvar}_${level}}"
+ eval ${pvar}_level=$level
+ eval unset ${pvar}_${level}
 done
 }
 
@@ -482,8 +496,13 @@
 }
 
 enable_deep_weak(){
- do_enable_deep $*
- enable_weak $*
+ for var; do
+ disabled $var && continue
+ pushvar var
+ do_enable_deep $var
+ popvar var
+ enable_weak $var
+ done
 }
 
 enabled(){
@@ -643,10 +662,18 @@
 append LDFLAGS $($ldflags_filter "$@")
 }
 
+add_stripflags(){
+ append STRIPFLAGS "$@"
+}
+
 add_extralibs(){
 prepend extralibs $($ldflags_filter "$@")
 }
 
+add_host_cppflags(){
+ append host_cppflags "$@"
+}
+
 add_host_cflags(){
 append host_cflags $($host_cflags_filter "$@")
 }
@@ -738,6 +765,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
@@ -746,7 +780,7 @@
 shift 3
 {
 for hdr in $headers; do
- echo "#include <$hdr>"
+ print_include $hdr
 done
 echo "int main(void) { $code; return 0; }"
 } | check_$check "$@"
@@ -759,14 +793,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 "$@"
+}
+
 test_ldflags(){
 log test_ldflags "$@"
 check_ld "$@" <<EOF
@@ -779,6 +818,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 $STRIPFLAGS "$@" $TMPO
+}
+
+check_stripflags(){
+ log check_stripflags "$@"
+ test_stripflags "$@" && add_stripflags "$@"
+}
+
 check_header(){
 log check_header "$@"
 header=$1
@@ -822,7 +875,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; }"
@@ -866,7 +919,7 @@
 headers="$2"
 funcs="$3"
 shift 3
- $pkg_config --exists $pkg || return
+ check_cmd $pkg_config --exists --print-errors $pkg || return
 pkg_cflags=$($pkg_config --cflags $pkg)
 pkg_libs=$($pkg_config --libs $pkg)
 check_func_headers "$headers" "$funcs" $pkg_cflags $pkg_libs "$@" &&
@@ -895,6 +948,7 @@
 int foo(void){
 $code
 }
+int (*func_ptr)(void) = foo;
 int main(void){
 signal(SIGILL, sighandler);
 signal(SIGFPE, sighandler);
@@ -902,7 +956,7 @@
 #ifdef SIGBUS
 signal(SIGBUS, sighandler);
 #endif
- foo();
+ return func_ptr();
 }
 EOF
 }
@@ -917,7 +971,7 @@
 }
 
 check_struct(){
- log check_type "$@"
+ log check_struct "$@"
 headers=$1
 struct=$2
 member=$3
@@ -927,6 +981,16 @@
 enable_safe "${struct}_${member}"
 }
 
+check_builtin(){
+ log check_builtin "$@"
+ name=$1
+ headers=$2
+ builtin=$3
+ shift 3
+ disable "$name"
+ check_code ld "$headers" "$builtin" "$@" && enable "$name"
+}
+
 require(){
 name="$1"
 header="$2"
@@ -950,6 +1014,10 @@
 add_extralibs $(get_safe ${pkg}_libs)
 }
 
+hostcc_e(){
+ eval printf '%s\\n' $HOSTCC_E
+}
+
 hostcc_o(){
 eval printf '%s\\n' $HOSTCC_O
 }
@@ -961,6 +1029,20 @@
 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 "$@"
+int x;
+EOF
+}
+
 check_host_cflags(){
 log check_host_cflags "$@"
 set -- $($host_cflags_filter "$@")
@@ -969,6 +1051,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
@@ -998,39 +1093,18 @@
 protocols
 "
 
-LIBRARY_LIST="
- avcodec
- avdevice
- avfilter
- avformat
- avresample
- avutil
- swscale
+EXAMPLE_LIST="
+ avcodec_example
+ metadata_example
+ output_example
+ transcode_aac_example
 "
 
-PROGRAM_LIST="
- avconv
- avplay
- avprobe
- avserver
-"
-
-CONFIG_LIST="
- $COMPONENT_LIST
- $LIBRARY_LIST
- $PROGRAM_LIST
+EXTERNAL_LIBRARY_LIST="
 avisynth
 bzlib
- dct
- doc
- dwt
- dxva2
- fft
 frei0r
 gnutls
- gpl
- gray
- hardcoded_tables
 libcdio
 libdc1394
 libfaac
@@ -1053,16 +1127,61 @@
 libvo_amrwbenc
 libvorbis
 libvpx
+ libwavpack
+ libwebp
 libx264
 libxavs
 libxvid
+ openssl
+ x11grab
+ zlib
+"
+
+HWACCEL_LIST="
+ dxva2
+ vaapi
+ vda
+ vdpau
+"
+LIBRARY_LIST="
+ avcodec
+ avdevice
+ avfilter
+ avformat
+ avresample
+ avutil
+ swscale
+"
+
+PROGRAM_LIST="
+ avconv
+ avplay
+ avprobe
+ avserver
+"
+
+CONFIG_LIST="
+ $COMPONENT_LIST
+ $EXAMPLE_LIST
+ $EXTERNAL_LIBRARY_LIST
+ $HWACCEL_LIST
+ $LIBRARY_LIST
+ $PROGRAM_LIST
+ dct
+ doc
+ error_resilience
+ fft
+ gpl
+ gray
+ hardcoded_tables
 lsp
 lzo
 mdct
 memalign_hack
+ neon_clobber_test
 network
 nonfree
- openssl
+ pod2man
 pic
 rdft
 runtime_cpudetect
@@ -1072,14 +1191,10 @@
 sram
 static
 swscale_alpha
+ texi2html
 thumb
- vaapi
- vda
- vdpau
 version3
 xmm_clobber_test
- x11grab
- zlib
 "
 
 THREADS_LIST='
@@ -1087,6 +1202,12 @@
 w32threads
 '
 
+ATOMICS_LIST='
+ atomics_gcc
+ atomics_suncc
+ atomics_win32
+'
+
 ARCH_LIST='
 aarch64
 alpha
@@ -1127,7 +1248,9 @@
 amd3dnow
 amd3dnowext
 avx
+ avx2
 fma4
+ i686
 mmx
 mmxext
 sse
@@ -1191,6 +1314,7 @@
 $HAVE_LIST_CMDLINE
 $HAVE_LIST_PUB
 $THREADS_LIST
+ $ATOMICS_LIST
 $MATH_FUNCS
 aligned_malloc
 aligned_stack
@@ -1199,12 +1323,13 @@
 arpa_inet_h
 asm_mod_q
 asm_mod_y
+ atomic_cas_ptr
+ atomics_native
 attribute_may_alias
 attribute_packed
 cdio_paranoia_h
 cdio_paranoia_paranoia_h
 closesocket
- cmov
 CommandLineToArgvW
 cpunop
 CryptGenRandom
@@ -1237,12 +1362,15 @@
 getservbyport
 gettimeofday
 gnu_as
+ gsm_h
 ibm_asm
 inet_aton
 io_h
+ inline_asm_labels
 isatty
 jack_port_get_latency_range
 ldbrx
+ libc_msvcrt
 libdc1394_1
 libdc1394_2
 local_aligned_16
@@ -1251,21 +1379,22 @@
 loongson
 machine_ioctl_bt848_h
 machine_ioctl_meteor_h
+ machine_rw_barrier
 malloc_h
 MapViewOfFile
 memalign
+ MemoryBarrier
 mkstemp
 mm_empty
 mmap
 mprotect
- msvcrt
 nanosleep
 poll_h
 posix_memalign
+ pragma_deprecated
 rdtsc
 sched_getaffinity
 sdl
- sdl_video_size
 SetConsoleTextAttribute
 setmode
 setrlimit
@@ -1275,7 +1404,6 @@
 soundcard_h
 strerror_r
 strptime
- strtok_r
 struct_addrinfo
 struct_group_source_req
 struct_ip_mreq_source
@@ -1288,6 +1416,7 @@
 struct_v4l2_frmivalenum_discrete
 symver_asm_label
 symver_gnu_asm
+ sync_val_compare_and_swap
 sysconf
 sysctl
 sys_mman_h
@@ -1296,15 +1425,18 @@
 sys_select_h
 sys_soundcard_h
 sys_time_h
+ sys_un_h
 sys_videoio_h
 threads
 unistd_h
 usleep
+ vdpau_x11
 vfp_args
 VirtualAlloc
 windows_h
 winsock2_h
 xform_asm
+ xlib
 xmm_clobbers
 "
 
@@ -1313,15 +1445,18 @@
 aandcttables
 ac3dsp
 audio_frame_queue
- error_resilience
+ dsputil
 gcrypt
 golomb
 gplv3
+ h263dsp
 h264chroma
 h264dsp
 h264pred
 h264qpel
+ hpeldsp
 huffman
+ intrax8
 lgplv3
 lpc
 mpegaudio
@@ -1330,6 +1465,8 @@
 mpegvideoenc
 nettle
 rangecoder
+ riffdec
+ riffenc
 rtpdec
 rtpenc_chain
 sinewin
@@ -1354,6 +1491,7 @@
 PATHS_LIST='
 bindir
 datadir
+ docdir
 incdir
 libdir
 mandir
@@ -1391,11 +1529,13 @@
 target_exec
 target_os
 target_path
+ target_samples
 toolchain
 "
 
 CMDLINE_APPEND="
 extra_cflags
+ host_cppflags
 "
 
 # code dependency declarations
@@ -1405,8 +1545,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
@@ -1416,10 +1556,13 @@
 
 vis_deps="sparc"
 
-x86_64_suggest="cmov fast_cmov"
+cpunop_deps="i686"
+x86_64_select="i686"
+x86_64_suggest="fast_cmov"
 
 amd3dnow_deps="mmx"
 amd3dnowext_deps="amd3dnow"
+i686_deps="x86"
 mmx_deps="x86"
 mmxext_deps="mmx"
 sse_deps="mmxext"
@@ -1430,6 +1573,7 @@
 sse42_deps="sse4"
 avx_deps="sse42"
 fma4_deps="avx"
+avx2_deps="avx"
 
 mmx_external_deps="yasm"
 mmx_inline_deps="inline_asm"
@@ -1442,82 +1586,122 @@
 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"
+threads_if_any="$THREADS_LIST"
 
 # subsystems
 dct_select="rdft"
+error_resilience_select="dsputil"
+lpc_select="dsputil"
 mdct_select="fft"
 rdft_select="fft"
 mpegaudio_select="mpegaudiodsp"
 mpegaudiodsp_select="dct"
-mpegvideo_select="videodsp"
+mpegvideo_select="dsputil hpeldsp videodsp"
 mpegvideoenc_select="mpegvideo"
 
 # decoders / encoders
 aac_decoder_select="mdct sinewin"
 aac_encoder_select="audio_frame_queue mdct sinewin"
 aac_latm_decoder_select="aac_decoder aac_latm_parser"
-ac3_decoder_select="mdct ac3dsp ac3_parser"
-ac3_encoder_select="mdct ac3dsp"
-ac3_fixed_encoder_select="mdct ac3dsp"
+ac3_decoder_select="mdct ac3dsp ac3_parser dsputil"
+ac3_encoder_select="mdct ac3dsp dsputil"
+ac3_fixed_encoder_select="mdct ac3dsp dsputil"
+aic_decoder_select="dsputil golomb"
 alac_encoder_select="lpc"
+als_decoder_select="dsputil"
 amrnb_decoder_select="lsp"
 amrwb_decoder_select="lsp"
+amv_decoder_select="dsputil hpeldsp"
+ape_decoder_select="dsputil"
+asv1_decoder_select="dsputil"
+asv1_encoder_select="dsputil"
+asv2_decoder_select="dsputil"
+asv2_encoder_select="dsputil"
 atrac1_decoder_select="mdct sinewin"
 atrac3_decoder_select="mdct"
+atrac3p_decoder_select="mdct sinewin"
+bink_decoder_select="dsputil hpeldsp"
 binkaudio_dct_decoder_select="mdct rdft dct sinewin"
 binkaudio_rdft_decoder_select="mdct rdft sinewin"
-cavs_decoder_select="golomb mpegvideo"
+cavs_decoder_select="dsputil golomb h264chroma videodsp"
+cllc_decoder_select="dsputil"
 comfortnoise_encoder_select="lpc"
-cook_decoder_select="mdct sinewin"
+cook_decoder_select="dsputil mdct sinewin"
 cscd_decoder_select="lzo"
 cscd_decoder_suggest="zlib"
 dca_decoder_select="mdct"
-dnxhd_encoder_select="aandcttables mpegvideoenc"
-dxa_decoder_select="zlib"
+dnxhd_decoder_select="dsputil"
+dnxhd_encoder_select="aandcttables dsputil mpegvideoenc"
+dvvideo_decoder_select="dsputil"
+dvvideo_encoder_select="dsputil"
+dxa_decoder_deps="zlib"
 eac3_decoder_select="ac3_decoder"
 eac3_encoder_select="ac3_encoder"
-eamad_decoder_select="aandcttables error_resilience mpegvideo"
-eatgq_decoder_select="aandcttables"
+eamad_decoder_select="aandcttables dsputil mpegvideo"
+eatgq_decoder_select="aandcttables dsputil"
 eatqi_decoder_select="aandcttables error_resilience mpegvideo"
-ffv1_decoder_select="golomb rangecoder"
-ffv1_encoder_select="rangecoder"
-ffvhuff_encoder_select="huffman"
+ffv1_decoder_select="dsputil golomb rangecoder"
+ffv1_encoder_select="dsputil rangecoder"
+ffvhuff_decoder_select="dsputil"
+ffvhuff_encoder_select="dsputil huffman"
+fic_decoder_select="dsputil golomb"
 flac_decoder_select="golomb"
-flac_encoder_select="golomb lpc"
-flashsv_decoder_select="zlib"
-flashsv_encoder_select="zlib"
-flashsv2_decoder_select="zlib"
+flac_encoder_select="dsputil golomb lpc"
+flashsv_decoder_deps="zlib"
+flashsv_encoder_deps="zlib"
+flashsv2_decoder_deps="zlib"
 flv_decoder_select="h263_decoder"
 flv_encoder_select="h263_encoder"
-fraps_decoder_select="huffman"
+fourxm_decoder_select="dsputil"
+fraps_decoder_select="dsputil huffman"
+g2m_decoder_deps="zlib"
+g2m_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 error_resilience 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="error_resilience golomb h264chroma h264dsp h264pred h264qpel mpegvideo"
-huffyuv_encoder_select="huffman"
-iac_decoder_select="fft mdct sinewin"
-imc_decoder_select="fft mdct sinewin"
-jpegls_decoder_select="golomb"
+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"
+iac_decoder_select="dsputil fft mdct sinewin"
+imc_decoder_select="dsputil fft mdct sinewin"
+indeo3_decoder_select="hpeldsp"
+interplay_video_decoder_select="hpeldsp"
+jpegls_decoder_select="dsputil golomb hpeldsp"
 jpegls_encoder_select="golomb"
+jv_decoder_select="dsputil"
+lagarith_decoder_select="dsputil"
 ljpeg_encoder_select="aandcttables mpegvideoenc"
 loco_decoder_select="golomb"
-mdec_decoder_select="error_resilience mpegvideo"
-mjpeg_encoder_select="aandcttables mpegvideoenc"
-mlp_decoder_select="mlp_parser"
+mdec_decoder_select="dsputil error_resilience mpegvideo"
+metasound_decoder_select="lsp mdct sinewin"
+mimic_decoder_select="dsputil hpeldsp"
+mjpeg_decoder_select="dsputil hpeldsp"
+mjpegb_decoder_select="dsputil hpeldsp"
+mjpeg_encoder_select="aandcttables dsputil mpegvideoenc"
+mlp_decoder_select="dsputil mlp_parser"
+motionpixels_decoder_select="dsputil"
 mp1_decoder_select="mpegaudio"
 mp1float_decoder_select="mpegaudio"
 mp2_decoder_select="mpegaudio"
@@ -1528,63 +1712,74 @@
 mp3float_decoder_select="mpegaudio"
 mp3on4_decoder_select="mpegaudio"
 mp3on4float_decoder_select="mpegaudio"
-mpc7_decoder_select="mpegaudiodsp"
-mpc8_decoder_select="mpegaudiodsp"
+mpc7_decoder_select="dsputil mpegaudiodsp"
+mpc8_decoder_select="dsputil mpegaudiodsp"
 mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
-mpeg_xvmc_decoder_select="mpegvideo_decoder"
+mpeg_xvmc_decoder_select="mpeg2video_decoder"
 mpeg1video_decoder_select="error_resilience mpegvideo"
-mpeg1video_encoder_select="aandcttables error_resilience mpegvideoenc"
+mpeg1video_encoder_select="aandcttables mpegvideoenc"
 mpeg2video_decoder_select="error_resilience mpegvideo"
-mpeg2video_encoder_select="aandcttables error_resilience mpegvideoenc"
+mpeg2video_encoder_select="aandcttables mpegvideoenc"
 mpeg4_decoder_select="h263_decoder mpeg4video_parser"
 mpeg4_encoder_select="h263_encoder"
 msmpeg4v1_decoder_select="h263_decoder"
-msmpeg4v1_encoder_select="h263_encoder"
 msmpeg4v2_decoder_select="h263_decoder"
 msmpeg4v2_encoder_select="h263_encoder"
 msmpeg4v3_decoder_select="h263_decoder"
 msmpeg4v3_encoder_select="h263_encoder"
-mss2_decoder_select="vc1_decoder"
+mss2_decoder_select="error_resilience vc1_decoder"
+mxpeg_decoder_select="dsputil hpeldsp"
 nellymoser_decoder_select="mdct sinewin"
 nellymoser_encoder_select="audio_frame_queue mdct sinewin"
-nuv_decoder_select="lzo"
-png_decoder_select="zlib"
-png_encoder_select="zlib"
+nuv_decoder_select="dsputil lzo"
+png_decoder_deps="zlib"
+png_decoder_select="dsputil"
+png_encoder_deps="zlib"
+png_encoder_select="dsputil"
+prores_decoder_select="dsputil"
+prores_encoder_select="dsputil"
 qcelp_decoder_select="lsp"
 qdm2_decoder_select="mdct rdft mpegaudiodsp"
 ra_144_encoder_select="audio_frame_queue lpc"
 ralf_decoder_select="golomb"
-rv10_decoder_select="h263_decoder"
+rv10_decoder_select="error_resilience h263_decoder h263dsp"
 rv10_encoder_select="h263_encoder"
-rv20_decoder_select="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"
-rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo"
+rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo videodsp"
+rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo videodsp"
 shorten_decoder_select="golomb"
 sipr_decoder_select="lsp"
-snow_decoder_select="dwt rangecoder"
-snow_encoder_select="aandcttables dwt error_resilience mpegvideoenc rangecoder"
-svq1_decoder_select="error_resilience mpegvideo"
-svq1_encoder_select="aandcttables error_resilience mpegvideoenc"
-svq3_decoder_select="error_resilience golomb h264chroma h264dsp h264pred h264qpel mpegvideo"
-svq3_decoder_suggest="zlib"
+sp5x_decoder_select="dsputil hpeldsp"
+svq1_decoder_select="hpeldsp"
+svq1_encoder_select="aandcttables dsputil hpeldsp mpegvideoenc"
+svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel hpeldsp mpegvideo videodsp"
+svq3_decoder_suggest="error_resilience zlib"
+tak_decoder_select="dsputil"
 theora_decoder_select="vp3_decoder"
 tiff_decoder_suggest="zlib"
 tiff_encoder_suggest="zlib"
+thp_decoder_select="dsputil hpeldsp"
 truehd_decoder_select="mlp_decoder"
-tscc_decoder_select="zlib"
+truemotion2_decoder_select="dsputil"
+truespeech_decoder_select="dsputil"
+tscc_decoder_deps="zlib"
 twinvq_decoder_select="mdct lsp sinewin"
-utvideo_encoder_select="huffman"
-vc1_decoder_select="h263_decoder h264chroma h264qpel"
+utvideo_decoder_select="dsputil"
+utvideo_encoder_select="dsputil huffman"
+vble_decoder_select="dsputil"
+vc1_decoder_select="error_resilience h263_decoder h264chroma h264qpel intrax8"
 vc1image_decoder_select="vc1_decoder"
 vorbis_decoder_select="mdct"
 vorbis_encoder_select="mdct"
-vp3_decoder_select="vp3dsp videodsp"
-vp5_decoder_select="vp3dsp videodsp"
-vp6_decoder_select="huffman vp3dsp videodsp"
+vp3_decoder_select="hpeldsp vp3dsp videodsp"
+vp5_decoder_select="h264chroma hpeldsp videodsp vp3dsp"
+vp6_decoder_select="h264chroma hpeldsp huffman videodsp vp3dsp"
 vp6a_decoder_select="vp6_decoder"
 vp6f_decoder_select="vp6_decoder"
 vp8_decoder_select="h264pred videodsp"
+vp9_decoder_select="videodsp"
+webp_decoder_select="vp8_decoder"
 wmapro_decoder_select="mdct sinewin"
 wmav1_decoder_select="mdct sinewin"
 wmav1_encoder_select="mdct sinewin"
@@ -1593,52 +1788,67 @@
 wmavoice_decoder_select="lsp rdft dct mdct sinewin"
 wmv1_decoder_select="h263_decoder"
 wmv1_encoder_select="h263_encoder"
-wmv2_decoder_select="h263_decoder"
+wmv2_decoder_select="h263_decoder intrax8 videodsp"
 wmv2_encoder_select="h263_encoder"
 wmv3_decoder_select="vc1_decoder"
 wmv3image_decoder_select="wmv3_decoder"
-zerocodec_decoder_select="zlib"
-zlib_decoder_select="zlib"
-zlib_encoder_select="zlib"
-zmbv_decoder_select="zlib"
-zmbv_encoder_select="zlib"
+zerocodec_decoder_deps="zlib"
+zlib_decoder_deps="zlib"
+zlib_encoder_deps="zlib"
+zmbv_decoder_deps="zlib"
+zmbv_encoder_deps="zlib"
 
 # hardware accelerators
 dxva2_deps="dxva2api_h"
 vaapi_deps="va_va_h"
 vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
+vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
 vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
 
-h263_vaapi_hwaccel_select="vaapi h263_decoder"
+h263_vaapi_hwaccel_deps="vaapi"
+h263_vaapi_hwaccel_select="h263_decoder"
+h263_vdpau_hwaccel_deps="vdpau"
+h263_vdpau_hwaccel_select="h263_decoder"
 h264_dxva2_hwaccel_deps="dxva2"
 h264_dxva2_hwaccel_select="h264_decoder"
-h264_vaapi_hwaccel_select="vaapi h264_decoder"
-h264_vda_hwaccel_select="vda h264_decoder"
-h264_vdpau_decoder_select="vdpau h264_decoder"
-mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder"
-mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder"
+h264_vaapi_hwaccel_deps="vaapi"
+h264_vaapi_hwaccel_select="h264_decoder"
+h264_vda_hwaccel_deps="vda"
+h264_vda_hwaccel_select="h264_decoder"
+h264_vdpau_hwaccel_deps="vdpau"
+h264_vdpau_hwaccel_select="h264_decoder"
+mpeg1_vdpau_hwaccel_deps="vdpau"
+mpeg1_vdpau_hwaccel_select="mpeg1video_decoder"
 mpeg2_dxva2_hwaccel_deps="dxva2"
 mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
-mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder"
-mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder"
-mpeg4_vdpau_decoder_select="vdpau mpeg4_decoder"
+mpeg2_vaapi_hwaccel_deps="vaapi"
+mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"
+mpeg2_vdpau_hwaccel_deps="vdpau"
+mpeg2_vdpau_hwaccel_select="mpeg2video_decoder"
+mpeg4_vaapi_hwaccel_deps="vaapi"
+mpeg4_vaapi_hwaccel_select="mpeg4_decoder"
+mpeg4_vdpau_hwaccel_deps="vdpau"
+mpeg4_vdpau_hwaccel_select="mpeg4_decoder"
 vc1_dxva2_hwaccel_deps="dxva2"
 vc1_dxva2_hwaccel_select="vc1_decoder"
-vc1_vaapi_hwaccel_select="vaapi vc1_decoder"
-vc1_vdpau_decoder_select="vdpau vc1_decoder"
+vc1_vaapi_hwaccel_deps="vaapi"
+vc1_vaapi_hwaccel_select="vc1_decoder"
+vc1_vdpau_hwaccel_deps="vdpau"
+vc1_vdpau_hwaccel_select="vc1_decoder"
 wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel"
 wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
-wmv3_vdpau_decoder_select="vc1_vdpau_decoder"
+wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
 
 # parsers
-h264_parser_select="error_resilience golomb h264dsp h264pred mpegvideo"
-mpeg4video_parser_select="error_resilience mpegvideo"
+h264_parser_select="golomb h264chroma h264dsp h264pred h264qpel videodsp"
+mpeg4video_parser_select="error_resilience h263dsp mpegvideo"
 mpegvideo_parser_select="error_resilience mpegvideo"
-vc1_parser_select="error_resilience mpegvideo"
+vc1_parser_select="mpegvideo"
 
 # external libraries
 libfaac_encoder_deps="libfaac"
 libfaac_encoder_select="audio_frame_queue"
+libfdk_aac_decoder_deps="libfdk_aac"
 libfdk_aac_encoder_deps="libfdk_aac"
 libfdk_aac_encoder_select="audio_frame_queue"
 libgsm_decoder_deps="libgsm"
@@ -1669,34 +1879,53 @@
 libvo_amrwbenc_encoder_deps="libvo_amrwbenc"
 libvorbis_encoder_deps="libvorbis"
 libvorbis_encoder_select="audio_frame_queue"
-libvpx_decoder_deps="libvpx"
-libvpx_encoder_deps="libvpx"
+libvpx_vp8_decoder_deps="libvpx"
+libvpx_vp8_encoder_deps="libvpx"
+libvpx_vp9_decoder_deps="libvpx"
+libvpx_vp9_encoder_deps="libvpx"
+libwavpack_encoder_deps="libwavpack"
+libwebp_encoder_deps="libwebp"
 libx264_encoder_deps="libx264"
 libxavs_encoder_deps="libxavs"
 libxvid_encoder_deps="libxvid"
 
 # demuxers / muxers
 ac3_demuxer_select="ac3_parser"
+asf_demuxer_select="riffdec"
+asf_muxer_select="riffenc"
 asf_stream_muxer_select="asf_muxer"
+avi_demuxer_select="riffdec"
+avi_muxer_select="riffenc"
 avisynth_demuxer_deps="avisynth"
+avisynth_demuxer_select="riffdec"
+caf_demuxer_select="riffdec"
 dirac_demuxer_select="dirac_parser"
+dxa_demuxer_select="riffdec"
 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"
 matroska_audio_muxer_select="matroska_muxer"
+matroska_demuxer_select="riffdec"
 matroska_demuxer_suggest="bzlib lzo zlib"
+matroska_muxer_select="riffenc"
+mmf_muxer_select="riffenc"
+mov_demuxer_select="riffdec"
 mov_demuxer_suggest="zlib"
-mov_muxer_select="rtpenc_chain"
+mov_muxer_select="riffenc rtpenc_chain"
 mp3_demuxer_select="mpegaudio_parser"
 mp4_muxer_select="mov_muxer"
-mpegts_muxer_select="adts_muxer latm_muxer mpegvideo"
+mpegts_muxer_select="adts_muxer latm_muxer"
 mpegtsraw_demuxer_select="mpegts_demuxer"
 mxf_d10_muxer_select="mxf_muxer"
+nut_muxer_select="riffenc"
+nuv_demuxer_select="riffdec"
 ogg_demuxer_select="golomb"
 psp_muxer_select="mov_muxer"
 rtp_demuxer_select="sdp_demuxer"
-rtp_muxer_select="mpegvideo"
 rtpdec_select="asf_demuxer rm_demuxer rtp_protocol mpegts_demuxer mov_demuxer"
 rtsp_demuxer_select="http_protocol rtpdec"
 rtsp_muxer_select="rtp_muxer http_protocol rtp_protocol rtpenc_chain"
@@ -1708,15 +1937,22 @@
 tak_demuxer_select="tak_parser"
 tg2_muxer_select="mov_muxer"
 tgp_muxer_select="mov_muxer"
-w64_demuxer_deps="wav_demuxer"
+w64_demuxer_select="wav_demuxer"
+wav_demuxer_select="riffdec"
+wav_muxer_select="riffenc"
+webm_muxer_select="riffenc"
+wtv_demuxer_select="riffdec"
+xmv_demuxer_select="riffdec"
+xwma_demuxer_select="riffdec"
 
 # indevs / outdevs
 alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp"
 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"
-dv1394_indev_deps="dv1394 dv_demuxer"
+dv1394_indev_deps="dv1394"
+dv1394_indev_select="dv_demuxer"
 fbdev_indev_deps="linux_fb_h"
-jack_indev_deps="jack_jack_h"
+jack_indev_deps="jack_jack_h pthreads"
 libcdio_indev_deps="libcdio"
 libdc1394_indev_deps="libdc1394"
 oss_indev_deps_any="soundcard_h sys_soundcard_h"
@@ -1757,10 +1993,13 @@
 rtp_protocol_select="udp_protocol"
 sctp_protocol_deps="struct_sctp_event_subscribe"
 sctp_protocol_select="network"
+srtp_protocol_select="rtp_protocol"
 tcp_protocol_select="network"
 tls_protocol_deps_any="openssl gnutls"
 tls_protocol_select="tcp_protocol"
 udp_protocol_select="network"
+unix_protocol_deps="sys_un_h"
+unix_protocol_select="network"
 
 # filters
 blackframe_filter_deps="gpl"
@@ -1768,15 +2007,21 @@
 cropdetect_filter_deps="gpl"
 delogo_filter_deps="gpl"
 drawtext_filter_deps="libfreetype"
-frei0r_filter_deps="frei0r dlopen strtok_r"
+frei0r_filter_deps="frei0r dlopen"
 frei0r_filter_extralibs='$ldl'
-frei0r_src_filter_deps="frei0r dlopen strtok_r"
+frei0r_src_filter_deps="frei0r dlopen"
 frei0r_src_filter_extralibs='$ldl'
 hqdn3d_filter_deps="gpl"
+interlace_filter_deps="gpl"
 resample_filter_deps="avresample"
 ocv_filter_deps="libopencv"
 scale_filter_deps="swscale"
-yadif_filter_deps="gpl"
+
+# examples
+avcodec_example_deps="avcodec avutil"
+metadata_example_deps="avformat avutil"
+output_example_deps="avcodec avformat avutil swscale"
+transcode_aac_example_deps="avcodec avformat avresample"
 
 # libraries
 avcodec_deps="avutil"
@@ -1788,16 +2033,19 @@
 
 # programs
 avconv_deps="avcodec avfilter avformat avresample swscale"
-avconv_select="aformat_filter anull_filter asyncts_filter format_filter
+avconv_select="aformat_filter anull_filter asyncts_filter atrim_filter format_filter
 fps_filter null_filter resample_filter scale_filter
- setpts_filter"
+ setpts_filter trim_filter"
 avplay_deps="avcodec avformat avresample swscale sdl"
+avplay_libs='$sdl_libs'
 avplay_select="rdft"
 avprobe_deps="avcodec avformat"
-avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer !shared"
-avserver_extralibs='$ldl'
+avserver_deps="avformat fork !shared"
+avserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
 
-doc_deps="texi2html"
+# documentation
+pod2man_deps="doc"
+texi2html_deps="doc"
 
 # default parameters
 
@@ -1807,6 +2055,7 @@
 prefix_default="/usr/local"
 bindir_default='${prefix}/bin'
 datadir_default='${prefix}/share/avconv'
+docdir_default='${prefix}/share/doc/libav'
 incdir_default='${prefix}/include'
 libdir_default='${prefix}/lib'
 mandir_default='${prefix}/share/man'
@@ -1817,11 +2066,12 @@
 cc_default="gcc"
 host_cc_default="gcc"
 cp_f="cp -f"
-ln_s="ln -sf"
+ln_s="ln -s -f"
 nm_default="nm -g"
 objformat="elf"
 pkg_config_default=pkg-config
 ranlib="ranlib"
+strip="strip"
 yasmexe="yasm"
 
 nogas=":"
@@ -1835,7 +2085,7 @@
 host_os=$target_os_default
 
 # configurable options
-enable $LIBRARY_LIST $PROGRAM_LIST
+enable $EXAMPLE_LIST $LIBRARY_LIST $PROGRAM_LIST
 
 enable asm
 enable debug
@@ -1850,7 +2100,6 @@
 
 # build settings
 SHFLAGS='-shared -Wl,-soname,$$(@F)'
-AVSERVERLDFLAGS=-Wl,-E
 LIBPREF="lib"
 LIBSUF=".a"
 FULLNAME='$(NAME)$(BUILDSUF)'
@@ -1877,10 +2126,10 @@
 LD_LIB='-l%'
 LD_PATH='-L'
 HOSTCC_C='-c'
+HOSTCC_E='-E -o $@'
 HOSTCC_O='-o $@'
 HOSTLD_O='-o $@'
 
-host_cflags='-D_ISOC99_SOURCE -D_XOPEN_SOURCE=600 -O3 -g'
 host_libs='-lm'
 host_cflags_filter=echo
 host_ldflags_filter=echo
@@ -1949,8 +2198,6 @@
 eval ${n}_if_any="\$$v"
 done
 
-disable snow_decoder snow_encoder
-
 enable $ARCH_EXT_LIST
 
 die_unknown(){
@@ -1959,10 +2206,14 @@
 exit 1
 }
 
+print_3_columns() {
+ cat | tr ' ' '\n' | sort | pr -r -3 -t
+}
+
 show_list() {
 suffix=_$1
 shift
- echo $* | sed s/$suffix//g | tr ' ' '\n' | sort | pr -3 -t
+ echo $* | sed s/$suffix//g | print_3_columns
 exit 0
 }
 
@@ -2078,33 +2329,84 @@
 nm_default="${cross_prefix}${nm_default}"
 pkg_config_default="${cross_prefix}${pkg_config_default}"
 ranlib="${cross_prefix}${ranlib}"
+strip="${cross_prefix}${strip}"
 
 sysinclude_default="${sysroot}/usr/include"
 
 case "$toolchain" in
 clang-asan)
 cc_default="clang"
- add_cflags -faddress-sanitizer
- add_ldflags -faddress-sanitizer
+ add_cflags -fsanitize=address
+ add_ldflags -fsanitize=address
 ;;
 clang-tsan)
 cc_default="clang"
- add_cflags -fthread-sanitizer
- add_ldflags -fthread-sanitizer
+ add_cflags -fsanitize=thread -pie
+ add_ldflags -fsanitize=thread -pie
+ ;;
+ gcc-asan)
+ cc_default="gcc"
+ add_cflags -fsanitize=address
+ add_ldflags -fsanitize=address
+ ;;
+ gcc-tsan)
+ cc_default="gcc"
+ add_cflags -fsanitize=thread -pie -fPIC
+ add_ldflags -fsanitize=thread -pie -fPIC
+ ;;
+ valgrind-massif)
+ target_exec_default="valgrind"
+ target_exec_args="--alloc-fn=av_malloc --alloc-fn=av_mallocz"
+ ;;
+ valgrind-memcheck)
+ target_exec_default="valgrind"
+ target_exec_args="--track-origins=yes --leak-check=full"
 ;;
 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 libav. 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="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"
 ;;
 esac
 
-set_default arch cc pkg_config sysinclude target_os
+set_default arch cc pkg_config sysinclude target_exec target_os
 enabled cross_compile || host_cc_default=$cc
 set_default host_cc
 
@@ -2189,20 +2491,35 @@
 done
 }
 
-msvc_flags(){
+cparser_flags(){
 for flag; do
 case $flag in
- -fomit-frame-pointer) echo -Oy ;;
- -g) echo -Z7 ;;
- -Wall) echo -W4 -wd4244 -wd4127 -wd4018 -wd4389 \
- -wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \
- -wd4152 -wd4324 -we4013 -wd4100 -wd4214 \
- -wd4996 -wd4273 ;;
+ -Wno-switch) echo -Wno-switch-enum ;;
+ -Wno-format-zero-length) ;;
+ -Wdisabled-optimization) ;;
+ -Wno-pointer-sign) echo -Wno-other ;;
+ *) echo $flag ;;
+ esac
+ done
+}
+
+msvc_common_flags(){
+ for flag; do
+ case $flag in
+ # In addition to specifying certain flags under the compiler
+ # specific filters, they must be specified here as well or else the
+ # generic catch all at the bottom will print the original flag.
+ -Wall) ;;
 -std=c99) ;;
+ # Common flags
+ -fomit-frame-pointer) ;;
+ -g) echo -Z7 ;;
 -fno-math-errno) ;;
 -fno-common) ;;
 -fno-signed-zeros) ;;
 -fPIC) ;;
+ -mthumb) ;;
+ -march=*) ;;
 -lz) echo zlib.lib ;;
 -lavifil32) echo vfw32.lib ;;
 -lavicap32) echo vfw32.lib user32.lib ;;
@@ -2212,6 +2529,30 @@
 done
 }
 
+msvc_flags(){
+ msvc_common_flags "$@"
+ for flag; do
+ case $flag in
+ -Wall) echo -W4 -wd4244 -wd4127 -wd4018 -wd4389 \
+ -wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \
+ -wd4152 -wd4324 -we4013 -wd4100 -wd4214 \
+ -wd4273 ;;
+ esac
+ done
+}
+
+icl_flags(){
+ msvc_common_flags "$@"
+ for flag; do
+ case $flag in
+ # Despite what Intel's documentation says -Wall, which is supported
+ # on Windows, does enable remarks so disable them here.
+ -Wall) echo $flag -Qdiag-disable:remark ;;
+ -std=c99) echo -Qstd=c99 ;;
+ esac
+ done
+}
+
 pgi_flags(){
 for flag; do
 case $flag in
@@ -2243,17 +2584,18 @@
 corei7) echo -xarch=sse4_2 -xchip=nehalem ;;
 corei7-avx) echo -xarch=avx -xchip=sandybridge ;;
 amdfam10|barcelona|bdver*) echo -xarch=sse4_1 ;;
- athlon-4|athlon-[mx]p) echo -xarch=ssea ;;
+ athlon-4|athlon-[mx]p) echo -xarch=ssea ;;
 k8|opteron|athlon64|athlon-fx)
- echo -xarch=sse2a ;;
- athlon*) echo -xarch=pentium_proa ;;
+ echo -xarch=sse2a ;;
+ athlon*) echo -xarch=pentium_proa ;;
 esac
 ;;
 -std=c99) echo -xc99 ;;
 -fomit-frame-pointer) echo -xregs=frameptr ;;
 -fPIC) echo -KPIC -xcode=pic32 ;;
 -W*,*) echo $flag ;;
- -f*-*|-W*) ;;
+ -f*-*|-W*|-mimpure-text) ;;
+ -shared) echo -G ;;
 *) echo $flag ;;
 esac
 done
@@ -2316,7 +2658,7 @@
 fi
 _cflags_speed='-O3'
 _cflags_size='-Os'
- elif $_cc --version 2>/dev/null | grep -q Intel; then
+ elif $_cc --version 2>/dev/null | grep -q ^icc; then
 _type=icc
 _ident=$($_cc --version | head -n1)
 _depflags='-MMD'
@@ -2364,7 +2706,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
@@ -2405,22 +2747,54 @@
 _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:'
 _flags='-nologo'
- _cflags='-D_USE_MATH_DEFINES -Dinline=__inline -FIstdlib.h -Dstrtoll=_strtoi64'
+ _cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -Dinline=__inline -FIstdlib.h -Dstrtoll=_strtoi64'
+ if [ $pfx = hostcc ]; then
+ append _cflags -Dsnprintf=_snprintf
+ fi
+ elif $_cc 2>&1 | grep -q Intel; then
+ _type=icl
+ _ident=$($cc 2>&1 | head -n1)
+ _depflags='-QMMD -QMF$(@:.o=.d) -QMT$@'
+ # Not only is O3 broken on 13.x+ but it is slower on all previous
+ # versions (tested) as well.
+ _cflags_speed="-O2"
+ _cflags_size="-O1 -Oi" # -O1 without -Oi miscompiles stuff
+ if $_cc 2>&1 | grep -q Linker; then
+ _ld_o='-out:$@'
+ else
+ _ld_o='-Fe$@'
+ fi
+ _cc_o='-Fo$@'
+ _cc_e='-P'
+ _flags_filter=icl_flags
+ _ld_lib='lib%.a'
+ _ld_path='-libpath:'
+ # -Qdiag-error to make icl error when seeing certain unknown arguments
+ _flags='-nologo -Qdiag-error:4044,10157'
+ # -Qvec- -Qsimd- to prevent miscompilation, -GS for consistency
+ # with MSVC which enables it by default.
+ _cflags='-D_USE_MATH_DEFINES -FIstdlib.h -Dstrtoll=_strtoi64 -Qms0 -Qvec- -Qsimd- -GS'
 if [ $pfx = hostcc ]; then
 append _cflags -Dsnprintf=_snprintf
 fi
+ elif $_cc --version 2>/dev/null | grep -q ^cparser; then
+ _type=cparser
+ _ident=$($_cc --version | head -n1)
+ _depflags='-MMD'
+ _cflags_speed='-O4'
+ _cflags_size='-O2'
+ _flags_filter=cparser_flags
 fi
 
 eval ${pfx}_type=\$_type
@@ -2495,6 +2869,9 @@
 elif $ar 2>&1 | grep -q 'Texas Instruments'; then
 arflags="rq"
 ar_o='$@'
+elif $ar 2>&1 | grep -q 'Usage: ar.*-X.*any'; then
+ arflags='-Xany -r -c'
+ ar_o='$@'
 else
 arflags="rc"
 ar_o='$@'
@@ -2517,7 +2894,8 @@
 fi
 
 if test "$cpu" = host; then
- enabled cross_compile && die "--cpu=host makes no sense when cross-compiling."
+ enabled cross_compile &&
+ die "--cpu=host makes no sense when cross-compiling."
 
 case "$cc_type" in
 gcc|llvm_gcc)
@@ -2533,7 +2911,8 @@
 ;;
 esac
 
- test "${cpu:-host}" = host && die "--cpu=host not supported with compiler $cc"
+ test "${cpu:-host}" = host &&
+ die "--cpu=host not supported with compiler $cc"
 fi
 
 # Deal with common $arch aliases
@@ -2743,21 +3122,21 @@
 cpuflags="-march=$cpu"
 disable mmx
 ;;
- # targets that do NOT support conditional mov (cmov)
+ # targets that do NOT support nopl and conditional mov (cmov)
 pentium-mmx|k6|k6-[23]|winchip-c6|winchip2|c3)
 cpuflags="-march=$cpu"
- disable cmov
+ disable i686
 ;;
- # targets that do support conditional mov (cmov)
+ # targets that do support nopl and conditional mov (cmov)
 i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|corei7*|amdfam10|barcelona|atom|bdver*)
 cpuflags="-march=$cpu"
- enable cmov
+ enable i686
 enable fast_cmov
 ;;
 # targets that do support conditional mov but on which it's slow
 pentium4|pentium4m|prescott|nocona)
 cpuflags="-march=$cpu"
- enable cmov
+ enable i686
 disable fast_cmov
 ;;
 esac
@@ -2791,8 +3170,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
@@ -2818,6 +3199,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
@@ -2831,27 +3216,32 @@
 esac
 
 enable $subarch
-enabled spic && enable pic
+enabled spic && enable_weak pic
 
 # OS specific
 case $target_os in
+ aix)
+ SHFLAGS=-shared
+ add_cppflags '-I\$(SRC_PATH)/compat/aix'
+ enabled shared && add_ldflags -Wl,-brtl
+ ;;
 haiku)
 prefix_default="/boot/common"
 network_extralibs="-lnetwork"
 host_libs=
 ;;
 sunos)
- AVSERVERLDFLAGS=""
 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
 # guards for processor-specific code, instead suppress
 # generation of the HWCAPS ELF section on Solaris x86 only.
- enabled_all suncc x86 && echo "hwcap_1 = OVERRIDE;" > mapfile && add_ldflags -Wl,-M,mapfile
+ enabled_all suncc x86 &&
+ echo "hwcap_1 = OVERRIDE;" > mapfile &&
+ add_ldflags -Wl,-M,mapfile
 nm_default='nm -P -g'
 ;;
 netbsd)
@@ -2860,15 +3250,9 @@
 oss_outdev_extralibs="-lossaudio"
 ;;
 openbsd|bitrig)
- # On OpenBSD 4.5. the compiler does not use PIC unless
- # explicitly using -fPIC. Libav builds fine without PIC,
- # however the generated executable will not do anything
- # (simply quits with exit-code 1, no crash, no output).
- # Thus explicitly enable PIC here.
- enable pic
 disable symver
 SHFLAGS='-shared'
- SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBVERSION)'
+ SLIB_INSTALL_NAME='$(SLIBNAME).$(LIBMAJOR).$(LIBMINOR)'
 SLIB_INSTALL_LINKS=
 oss_indev_extralibs="-lossaudio"
 oss_outdev_extralibs="-lossaudio"
@@ -2890,7 +3274,6 @@
 SLIBSUF=".dylib"
 SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
 SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)'
- AVSERVERLDFLAGS=-Wl,-bind_at_load
 objformat="macho"
 enabled x86_64 && objformat="macho64"
 enabled_any pic shared ||
@@ -2908,6 +3291,8 @@
 elif enabled arm; then
 LIBTARGET=arm-wince
 fi
+ check_ldflags -Wl,--nxcompat
+ check_ldflags -Wl,--dynamicbase
 shlibdir_default="$bindir_default"
 SLIBPREF=""
 SLIBSUF=".dll"
@@ -2923,15 +3308,14 @@
 dlltool="${cross_prefix}dlltool"
 ranlib=:
 enable dos_paths
- add_cppflags -U__STRICT_ANSI__
 ;;
 win32|win64)
+ disable symver
 if enabled shared; then
 # Link to the import library instead of the normal static library
 # for shared libs.
 LD_LIB='%.lib'
- # Cannot build shared and static libraries at the same time with
- # MSVC.
+ # Cannot build both shared and static libs with MSVC or icl.
 disable static
 fi
 shlibdir_default="$bindir_default"
@@ -2939,7 +3323,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)'
@@ -2982,7 +3366,6 @@
 add_cppflags -D_GNU_SOURCE
 add_ldflags -Zomf -Zbin-files -Zargs-wild -Zmap
 SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf'
- AVSERVERLDFLAGS=""
 LIBSUF="_s.a"
 SLIBPREF=""
 SLIBSUF=".dll"
@@ -3022,7 +3405,6 @@
 ;;
 osf1)
 add_cppflags -D_OSF_SOURCE -D_POSIX_PII -D_REENTRANT
- AVSERVERLDFLAGS=
 ;;
 minix)
 ;;
@@ -3036,7 +3418,6 @@
 network_extralibs='-lbsd'
 exeobjs=compat/plan9/main.o
 disable avserver
- ln_s='ln -s -f'
 cp_f='cp'
 ;;
 none)
@@ -3048,36 +3429,75 @@
 
 # determine libc flavour
 
-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
-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
+ 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."
-elif check_cpp_condition newlib.h "defined _NEWLIB_VERSION"; then
- libc_type=newlib
- add_cppflags -U__STRICT_ANSI__
-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
-elif check_cpp_condition stddef.h "defined __KLIBC__"; then
- libc_type=klibc
-fi
+ 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
+}
+
+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
@@ -3085,7 +3505,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
 
@@ -3095,7 +3515,7 @@
 
 echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $LIBAV_CONFIGURATION)" >config.fate
 
-check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic
+check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic
 
 set_default $PATHS_LIST
 set_default nm
@@ -3134,14 +3554,21 @@
 
 disabled optimizations || check_cflags -fomit-frame-pointer
 
-enable_pic() {
+enable_weak_pic() {
+ disabled pic && return
 enable pic
 add_cppflags -DPIC
- add_cflags -fPIC
+ case "$target_os" in
+ mingw*|cygwin*)
+ ;;
+ *)
+ add_cflags -fPIC
+ ;;
+ esac
 add_asflags -fPIC
 }
 
-enabled pic && enable_pic
+enabled pic && enable_weak_pic
 
 check_cc <<EOF || die "Symbol mangling check failed."
 int ff_extern;
@@ -3160,6 +3587,10 @@
 EOF
 done
 
+check_cc <<EOF && enable pragma_deprecated
+void foo(void) { _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") }
+EOF
+
 check_cc <<EOF && enable attribute_packed
 struct { int x; } __attribute__((packed)) x;
 EOF
@@ -3173,7 +3604,16 @@
 EOF
 od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
 
-if enabled alpha; then
+check_inline_asm inline_asm_labels '"1:\n"'
+
+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
 
@@ -3210,7 +3650,7 @@
 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)'
 
- enabled_all armv6t2 shared !pic && enable_pic
+ [ $target_os != win32 ] && enabled_all armv6t2 shared !pic && enable_weak_pic
 
 elif enabled mips; then
 
@@ -3260,9 +3700,8 @@
 
 elif enabled x86; then
 
- check_code ld intrin.h "__rdtsc()" && enable rdtsc
-
- check_code ld mmintrin.h "_mm_empty()" && enable mm_empty
+ check_builtin rdtsc intrin.h "__rdtsc()"
+ check_builtin mm_empty mmintrin.h "_mm_empty()"
 
 enable local_aligned_8 local_aligned_16
 
@@ -3304,8 +3743,8 @@
 elf*) enabled debug && append YASMFLAGS $yasm_debug ;;
 esac
 
- check_yasm "vextractf128 xmm0, ymm0, 0" && enable yasm ||
- die "yasm not found, use --disable-yasm for a crippled build"
+ check_yasm "movbe ecx, [5]" && enable yasm ||
+ die "yasm/nasm not found or too old. Use --disable-yasm for a crippled build."
 check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
 check_yasm "CPU amdnop" && enable cpunop
 fi
@@ -3357,7 +3796,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"
@@ -3378,6 +3817,7 @@
 
 check_func fcntl
 check_func fork
+check_func_headers stdlib.h getenv
 check_func gethrtime
 check_func getopt
 check_func getrusage
@@ -3395,8 +3835,11 @@
 check_func setrlimit
 check_func strerror_r
 check_func strptime
-check_func strtok_r
 check_func sched_getaffinity
+check_builtin sync_val_compare_and_swap "" "int *ptr; int oldval, newval; __sync_val_compare_and_swap(ptr, oldval, newval)"
+check_builtin machine_rw_barrier mbarrier.h "__machine_rw_barrier()"
+check_builtin atomic_cas_ptr atomic.h "void **ptr; void *oldval, *newval; atomic_cas_ptr(ptr, oldval, newval)"
+check_builtin MemoryBarrier windows.h "MemoryBarrier()"
 check_func sysconf
 check_func sysctl
 check_func usleep
@@ -3424,34 +3867,34 @@
 check_header sys/resource.h
 check_header sys/select.h
 check_header sys/time.h
+check_header sys/un.h
 check_header unistd.h
 check_header vdpau/vdpau.h
 check_header vdpau/vdpau_x11.h
+check_header VideoDecodeAcceleration/VDADecoder.h
 check_header windows.h
 check_header X11/extensions/XvMClib.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; then
 enable pthreads
- if check_func pthread_create; then
- :
- elif check_func pthread_create -pthread; then
+ if check_func pthread_join -pthread; then
 add_cflags -pthread
 add_extralibs -pthread
- elif check_func pthread_create -pthreads; then
+ elif check_func pthread_join -pthreads; then
 add_cflags -pthreads
 add_extralibs -pthreads
- elif check_func pthread_create -lpthreadGC2; then
+ elif check_func pthread_join -lpthreadGC2; then
 add_extralibs -lpthreadGC2
- elif ! check_lib pthread.h pthread_create -lpthread; then
+ elif check_lib pthread.h pthread_join -lpthread; then
+ :
+ elif ! check_func pthread_join; then
 disable pthreads
 fi
 fi
@@ -3464,6 +3907,9 @@
 fi
 done
 
+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"
 enabled vaapi && require vaapi va/va.h vaInitialize -lva
 
@@ -3476,42 +3922,51 @@
 done
 
 # these are off by default, so fail if requested and not available
-enabled avisynth && require2 vfw32 "windows.h vfw.h" AVIFileInit -lavifil32
-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
-enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
-enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
-enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
-enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm
-enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
-enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
-enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
-enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
-enabled libopencv && require_pkg_config opencv opencv/cv.h cvCreateImageHeader
-enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg
-enabled libopus && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
-enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new
-enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
-enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init
-enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex
-enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
-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
-enabled libvpx && {
- enabled libvpx_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx ||
- die "ERROR: libvpx decoder version must be >=0.9.1"; }
- enabled libvpx_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VPX_CQ" -lvpx ||
- die "ERROR: libvpx encoder version must be >=0.9.6"; } }
-enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 &&
- { check_cpp_condition x264.h "X264_BUILD >= 118" ||
- die "ERROR: libx264 version must be >= 0.118."; }
-enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs
-enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
-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 ||
- die "ERROR: openssl not found"; }
+enabled avisynth && { { check_header "avisynth/avisynth_c.h" && check_lib2 "windows.h" LoadLibrary; } ||
+ { check_header "avxsynth/avxsynth_c.h" && check_lib2 "dlfcn.h" dlopen -ldl; } ||
+ die "ERROR: LoadLibrary/dlopen not found, or avisynth header not found"; }
+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
+enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
+enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
+enabled libfreetype && require_pkg_config freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
+enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
+ check_lib "${gsm_hdr}" gsm_create -lgsm && break;
+ done || die "ERROR: libgsm not found"; }
+enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
+enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
+enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
+enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
+enabled libopencv && require_pkg_config opencv opencv/cv.h cvCreateImageHeader
+enabled libopenjpeg && { { check_header openjpeg.h && check_lib2 openjpeg.h opj_version -lopenjpeg; } ||
+ { require_pkg_config libopenjpeg1 openjpeg.h opj_version; } }
+enabled libopus && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
+enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new
+enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
+enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init
+enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex
+enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
+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
+enabled libvpx && {
+ enabled libvpx_vp8_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx ||
+ die "ERROR: libvpx decoder version must be >=0.9.1"; }
+ enabled libvpx_vp8_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VPX_CQ" -lvpx ||
+ die "ERROR: libvpx encoder version must be >=0.9.6"; }
+ 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 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 version must be >= 0.118."; }
+enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs
+enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
+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 ||
+ die "ERROR: openssl not found"; }
 
 if enabled gnutls; then
 { check_lib nettle/bignum.h nettle_mpz_get_str_256 -lnettle -lhogweed -lgmp && enable nettle; } ||
@@ -3529,10 +3984,11 @@
 
 if check_pkg_config sdl SDL_events.h SDL_PollEvent; then
 check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
- enable sdl &&
- check_struct SDL.h SDL_VideoInfo current_w $sdl_cflags && enable sdl_video_size
+ check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x010300" $sdl_cflags &&
+ enable sdl
 fi
 
+pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
 texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
 
 check_header linux/fb.h
@@ -3559,7 +4015,8 @@
 check_header sys/soundcard.h
 check_header soundcard.h
 
-enabled_any alsa_indev alsa_outdev && check_lib2 alsa/asoundlib.h snd_pcm_htimestamp -lasound
+enabled_any alsa_indev alsa_outdev &&
+ check_lib2 alsa/asoundlib.h snd_pcm_htimestamp -lasound
 
 enabled jack_indev && check_lib2 jack/jack.h jack_client_open -ljack &&
 check_func jack_port_get_latency_range -ljack
@@ -3567,36 +4024,34 @@
 enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio
 
 if enabled libcdio; then
- check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio || check_lib2 "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio
+ check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio ||
+ check_lib2 "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio
 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
-
-# check for VDA header
-if ! disabled vda && check_header VideoDecodeAcceleration/VDADecoder.h; then
- enable vda && add_extralibs -framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore
-fi
+require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage -lXfixes &&
+{ enabled xlib || die "ERROR: Xlib not found"; }
 
-if ! disabled vdpau && enabled vdpau_vdpau_h; then
+enabled vdpau &&
 check_cpp_condition vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" ||
- { echolog "Please upgrade to libvdpau >= 0.2 if you would like vdpau support." && disable vdpau; }
-fi
+ disable vdpau
+
+enabled vdpau && enabled xlib &&
+ check_func_headers "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau &&
+ prepend avconv_libs $($ldflags_filter "-lvdpau") &&
+ enable vdpau_x11
 
 enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
 
 # 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 -Wcast-qual
 check_cflags -Wwrite-strings
 check_cflags -Wtype-limits
@@ -3605,19 +4060,45 @@
 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=libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
 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 || strip='true'
+
+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,avresample_convert ||
+ disable neon_clobber_test
+
 enabled xmm_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_video \
+ -Wl,--wrap,avcodec_encode_video2 \
 -Wl,--wrap,avcodec_encode_subtitle \
+ -Wl,--wrap,avresample_convert \
 -Wl,--wrap,sws_scale ||
 disable xmm_clobber_test
 
@@ -3674,8 +4155,6 @@
 # 11030: Warning unknown option --as-needed
 # 10156: ignoring option '-export'; no argument required
 check_ldflags -wd10156,11030
- # Allow to compile with optimizations
- check_ldflags -march=$cpu
 # icc 11.0 and 11.1 work with ebp_available, but don't pass the test
 enable ebp_available
 if enabled x86_32; then
@@ -3694,8 +4173,10 @@
 check_optflags -fno-tree-vectorize
 check_cflags -Werror=implicit-function-declaration
 check_cflags -Werror=missing-prototypes
+ check_cflags -Werror=return-type
 check_cflags -Werror=declaration-after-statement
 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
@@ -3703,6 +4184,10 @@
 check_cflags -Qunused-arguments
 check_cflags -Werror=implicit-function-declaration
 check_cflags -Werror=missing-prototypes
+ check_cflags -Werror=return-type
+elif enabled cparser; then
+ add_cflags -Wno-missing-variable-declarations
+ add_cflags -Wno-empty-statement
 elif enabled armcc; then
 # 2523: use of inline assembler is deprecated
 add_cflags -W${armcc_opt},--diag_suppress=2523
@@ -3713,12 +4198,37 @@
 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 msvc; then
+elif enabled_any msvc icl; then
 enabled x86_32 && disable aligned_stack
+ enabled_all x86_32 debug && add_cflags -Oy-
+ enabled debug && add_ldflags -debug
+ enable pragma_deprecated
+ if enabled icl; then
+ # -Qansi-alias is basically -fstrict-aliasing, but does not work
+ # (correctly) on icl 13.x.
+ check_cpp_condition "windows.h" "__ICL < 1300 || __ICL >= 1400" &&
+ add_cflags -Qansi-alias
+ # icl will pass the inline asm tests but inline asm is currently
+ # not supported (build will fail)
+ disable inline_asm
+ 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,*'
@@ -3728,8 +4238,6 @@
 ;;
 esac
 
-enabled_any $THREADS_LIST && enable threads
-
 enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
 
 check_deps $CONFIG_LIST \
@@ -3743,6 +4251,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"
@@ -3762,11 +4275,15 @@
 echo "SSSE3 enabled ${ssse3-no}"
 echo "AVX enabled ${avx-no}"
 echo "FMA4 enabled ${fma4-no}"
- echo "CMOV enabled ${cmov-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}"
@@ -3792,47 +4309,18 @@
 echo "threading support ${thread_type-no}"
 echo "safe bitstream reader ${safe_bitstream_reader-no}"
 echo "SDL support ${sdl-no}"
-echo "libdxva2 enabled ${dxva2-no}"
-echo "libva enabled ${vaapi-no}"
-echo "libvdpau enabled ${vdpau-no}"
-echo "AVISynth enabled ${avisynth-no}"
-echo "frei0r enabled ${frei0r-no}"
-echo "gnutls enabled ${gnutls-no}"
-echo "libcdio support ${libcdio-no}"
-echo "libdc1394 support ${libdc1394-no}"
-echo "libfaac enabled ${libfaac-no}"
-echo "libfdk-aac enabled ${libfdk_aac-no}"
-echo "libgsm enabled ${libgsm-no}"
-echo "libilbc enabled ${libilbc-no}"
-echo "libmp3lame enabled ${libmp3lame-no}"
-echo "libopencore-amrnb support ${libopencore_amrnb-no}"
-echo "libopencore-amrwb support ${libopencore_amrwb-no}"
-echo "libopencv support ${libopencv-no}"
-echo "libopenjpeg enabled ${libopenjpeg-no}"
-echo "libopus enabled ${libopus-no}"
-echo "libpulse enabled ${libpulse-no}"
-echo "librtmp enabled ${librtmp-no}"
-echo "libschroedinger enabled ${libschroedinger-no}"
-echo "libspeex enabled ${libspeex-no}"
-echo "libtheora enabled ${libtheora-no}"
-echo "libvo-aacenc support ${libvo_aacenc-no}"
-echo "libvo-amrwbenc support ${libvo_amrwbenc-no}"
-echo "libvorbis enabled ${libvorbis-no}"
-echo "libvpx enabled ${libvpx-no}"
-echo "libx264 enabled ${libx264-no}"
-echo "libxavs enabled ${libxavs-no}"
-echo "libxvid enabled ${libxvid-no}"
-echo "openssl enabled ${openssl-no}"
-echo "zlib enabled ${zlib-no}"
-echo "bzlib enabled ${bzlib-no}"
 test -n "$random_seed" &&
 echo "random seed ${random_seed}"
 echo
 
+echo "External libraries:"
+print_enabled '' $EXTERNAL_LIBRARY_LIST | print_3_columns
+echo
+
 for type in decoder encoder hwaccel parser demuxer muxer protocol filter bsf indev outdev; do
 echo "Enabled ${type}s:"
 eval list=\$$(toupper $type)_LIST
- print_enabled '_*' $list | sort | pr -r -3 -t
+ print_enabled '_*' $list | print_3_columns
 echo
 done
 
@@ -3851,7 +4339,7 @@
 
 echo "Creating config.mak and config.h..."
 
-test -e Makefile || $ln_s "$source_path/Makefile" .
+test -e Makefile || echo "include $source_path/Makefile" > Makefile
 
 config_files="$TMPH config.mak"
 
@@ -3864,6 +4352,7 @@
 INCDIR=\$(DESTDIR)$incdir
 BINDIR=\$(DESTDIR)$bindir
 DATADIR=\$(DESTDIR)$datadir
+DOCDIR=\$(DESTDIR)$docdir
 MANDIR=\$(DESTDIR)$mandir
 SRC_PATH=$source_path
 CC_IDENT=$cc_ident
@@ -3881,6 +4370,7 @@
 ARFLAGS=$arflags
 AR_O=$ar_o
 RANLIB=$ranlib
+STRIP=$strip
 LN_S=$ln_s
 CPPFLAGS=$CPPFLAGS
 CFLAGS=$CFLAGS
@@ -3895,8 +4385,8 @@
 LD_PATH=$LD_PATH
 DLLTOOL=$dlltool
 LDFLAGS=$LDFLAGS
-LDFLAGS-avserver=$AVSERVERLDFLAGS
-SHFLAGS=$SHFLAGS
+SHFLAGS=$(echo $($ldflags_filter $SHFLAGS))
+STRIPFLAGS=$STRIPFLAGS
 YASMFLAGS=$YASMFLAGS
 BUILDSUF=$build_suffix
 FULLNAME=$FULLNAME
@@ -3916,6 +4406,7 @@
 HOSTCC=$host_cc
 HOSTLD=$host_ld
 HOSTCFLAGS=$host_cflags
+HOSTCPPFLAGS=$host_cppflags
 HOSTEXESUF=$HOSTEXESUF
 HOSTLDFLAGS=$host_ldflags
 HOSTLIBS=$host_libs
@@ -3927,9 +4418,9 @@
 HOSTCC_C=$HOSTCC_C
 HOSTCC_O=$HOSTCC_O
 HOSTLD_O=$HOSTLD_O
-TARGET_EXEC=$target_exec
+TARGET_EXEC=$target_exec $target_exec_args
 TARGET_PATH=$target_path
-LIBS-avplay=$sdl_libs
+TARGET_SAMPLES=${target_samples:-\$(SAMPLES)}
 CFLAGS-avplay=$sdl_cflags
 ZLIB=$($ldflags_filter -lz)
 LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
@@ -3958,10 +4449,18 @@
 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
+ eval echo "${lcname}_VERSION_MINOR=\$${name}_VERSION_MINOR" >> config.mak
 }
 
 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 LIBAV_CONFIG_H
@@ -3984,6 +4483,8 @@
 printf '' >$TMPASM
 fi
 
+enabled getenv || echo "#define getenv(x) NULL" >> $TMPH
+
 print_config ARCH_ "$config_files" $ARCH_LIST
 print_config HAVE_ "$config_files" $HAVE_LIST
 print_config CONFIG_ "$config_files" $CONFIG_LIST \
@@ -4055,10 +4556,15 @@
 EOF
 }
 
-pkgconfig_generate libavutil "Libav utility library" "$LIBAVUTIL_VERSION" "$LIBM"
-pkgconfig_generate libavcodec "Libav codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
-pkgconfig_generate libavformat "Libav container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION"
-pkgconfig_generate libavdevice "Libav device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION"
-pkgconfig_generate libavfilter "Libav video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
+lavfi_libs="libavutil = $LIBAVUTIL_VERSION"
+enabled movie_filter && prepend lavfi_libs "libavformat >= $LIBAVFORMAT_VERSION, libavcodec >= $LIBAVCODEC_VERSION,"
+enabled resample_filter && prepend lavfi_libs "libavresample >= $LIBAVRESAMPLE_VERSION,"
+enabled scale_filter && prepend lavfi_libs "libswscale >= $LIBSWSCALE_VERSION,"
+
+pkgconfig_generate libavutil "Libav utility library" "$LIBAVUTIL_VERSION" "$LIBM"
+pkgconfig_generate libavcodec "Libav codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
+pkgconfig_generate libavformat "Libav container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION"
+pkgconfig_generate libavdevice "Libav device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION"
+pkgconfig_generate libavfilter "Libav video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$lavfi_libs"
 pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
-pkgconfig_generate libswscale "Libav image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
+pkgconfig_generate libswscale "Libav image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"

libav-v9.6.tar.bz2/doc/APIchanges -> libav-v10.1.tar.bz2/doc/APIchanges Changed

@@ -2,17 +2,220 @@
 since the last major version increase.
 
 The last version increases were:
-libavcodec: 2012-01-27
-libavdevice: 2011-04-18
-libavfilter: 2012-06-22
-libavformat: 2012-01-27
+libavcodec: 2013-03-xx
+libavdevice: 2013-03-xx
+libavfilter: 2013-12-xx
+libavformat: 2013-03-xx
 libavresample: 2012-10-05
 libswscale: 2011-06-20
-libavutil: 2012-10-22
+libavutil: 2013-12-xx
 
 
 API changes, most recent first:
 
+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-04 - d9ae103 - lavf 55.11.0 - avformat.h
+ Add AVFormatContext.max_interleave_delta for controlling amount of buffering
+ when interleaving.
+
+2014-01-20 - 93c553c - lavc 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-05 - 5b4797a - lavu 53.2.0 - frame.h
+ Add AV_FRAME_DATA_MATRIXENCODING value to the AVFrameSideDataType enum, which
+ identifies AVMatrixEncoding data.
+
+2014-01-05 - 5c437fb - lavu 53.1.0 - channel_layout.h
+ Add values for various Dolby flags to the AVMatrixEncoding enum.
+
+2013-12-20 - 2a41826 - lavc 55.30.0 - avcodec.h
+ Add HEVC profiles
+
+2013-12-11 - b9fb59d,9431356,d7b3ee9 - lavc 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 - 7e244c6- - lavu 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 - 1eaac1d- - lavu 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-14 - cce3e0a - lavu 52.18.0 - mem.h
+ Move av_fast_malloc() and av_fast_realloc() for libavcodec to libavutil.
+
+2013-11-14 - 8941971 - lavc 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 - 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 - cd8f772 - lavc 55.25.0 - avcodec.h
+ Add ITU-R BT.2020 and other not yet included values to color primaries,
+ transfer characteristics and colorspaces.
+
+2013-10-31 - 28096e0 - lavu 52.17.0 - frame.h
+ Add AVFrame.flags and AV_FRAME_FLAG_CORRUPT.
+
+2013-09-28 - 0767bfd - lavfi 3.11.0 - avfilter.h
+ Add AVFilterGraph.execute and AVFilterGraph.opaque for custom slice threading
+ implementations.
+
+2013-09-21 - e208e6d - lavu 52.16.0 - pixfmt.h
+ Add interleaved 4:2:2 8/10-bit formats AV_PIX_FMT_NV16 and
+ AV_PIX_FMT_NV20.
+
+2013-09-16 - 3feb3d6 - lavu 52.15.0 - mem.h
+ Add av_reallocp.
+
+2013-08-10 - 5a9a9d4 - lavc 55.16.0 - avcodec.h
+ Extend AVPacket API with av_packet_unref, av_packet_ref,
+ av_packet_move_ref, av_packet_copy_props, av_packet_free_side_data.
+
+2013-08-05 - f824535 - lavc 55.13.0 - avcodec.h
+ Deprecate the bitstream-related members from struct AVVDPAUContext.
+ The bistream buffers no longer need to be explicitly freed.
+
+2013-08-05 - 549294f - lavc 55.12.0 - avcodec.h
+ Deprecate the CODEC_CAP_HWACCEL_VDPAU codec capability. Use CODEC_CAP_HWACCEL
+ and select the AV_PIX_FMT_VDPAU format with get_format() instead.
+
+2013-08-05 - a0ad5d0 - lavu 52.14.0 - pixfmt.h
+ Deprecate AV_PIX_FMT_VDPAU_*. Use AV_PIX_FMT_VDPAU instead.
+
+2013-08-02 - a8b1927 - lavc 55.11.0 - avcodec.h
+ Add output_picture_number to AVCodecParserContext.
+
+2013-06-24 - 95d5246 - lavc 55.10.0 - avcodec.h
+ Add MPEG-2 AAC profiles
+
+2013-06-04 - fc962d4 - lavu 52.13.0 - mem.h
+ Add av_realloc_array and av_reallocp_array
+
+2013-05-24 - 129bb23 - lavfi 3.10.0 - avfilter.h
+ Add support for slice multithreading to lavfi. Filters supporting threading
+ are marked with AVFILTER_FLAG_SLICE_THREADS.
+ New fields AVFilterContext.thread_type, AVFilterGraph.thread_type and
+ AVFilterGraph.nb_threads (accessible directly or through AVOptions) may be
+ used to configure multithreading.
+
+2013-05-24 - 2a6eaea - lavu 52.12.0 - cpu.h
+ Add av_cpu_count() function for getting the number of logical CPUs.
+
+2013-05-24 - b493847 - lavc 55.7.0 - avcodec.h
+ Add picture_structure to AVCodecParserContext.
+
+2013-05-15 - e6c4ac7 - lavu 52.11.0 - pixdesc.h
+ Replace PIX_FMT_* flags with AV_PIX_FMT_FLAG_*.
+
+2013-04-03 - 507b1e4 - lavc 55.4.0 - avcodec.h
+ Add field_order to AVCodecParserContext.
+
+2013-04-19 - 5e83d9a - lavc 55.2.0 - avcodec.h
+ Add CODEC_FLAG_UNALIGNED to allow decoders to produce unaligned output.
+
+2013-04-11 - lavfi 3.8.0
+ 38f0c07 - Move all content from avfiltergraph.h to avfilter.h. Deprecate
+ avfilterhraph.h, user applications should include just avfilter.h
+ bc1a985 - Add avfilter_graph_alloc_filter(), deprecate avfilter_open() and
+ avfilter_graph_add_filter().
+ 1113672 - Add AVFilterContext.graph pointing to the AVFilterGraph that contains the
+ filter.
+ 48a5ada - Add avfilter_init_str(), deprecate avfilter_init_filter().
+ 1ba95a9 - Add avfilter_init_dict().
+ 7cdd737 - Add AVFilter.flags field and AVFILTER_FLAG_DYNAMIC_{INPUTS,OUTPUTS} flags.
+ 7e8fe4b - Add avfilter_pad_count() for counting filter inputs/outputs.
+ fa2a34c - Add avfilter_next(), deprecate av_filter_next().
+ Deprecate avfilter_uninit().
+
+2013-04-09 - lavfi 3.7.0 - avfilter.h
+ b439c99 - Add AVFilter.priv_class for exporting filter options through the
+ AVOptions API in the similar way private options work in lavc and lavf.
+ 8114c10 - Add avfilter_get_class().
+ Switch all filters to use AVOptions.
+
+2013-03-19 - 2c328a9 - lavu 52.9.0 - pixdesc.h
+ Add av_pix_fmt_count_planes() function for counting planes in a pixel format.
+
+2013-03-16 - 42c7c61 - lavfi 3.6.0
+ Add AVFilterGraph.nb_filters, deprecate AVFilterGraph.filter_count.
+
+2013-03-08 - Reference counted buffers - lavu 52.8.0, lavc 55.0.0, lavf 55.0.0,
+lavd 54.0.0, lavfi 3.5.0
+ 8e401db, 1cec062 - add a new API for reference counted buffers and buffer
+ pools (new header libavutil/buffer.h).
+ 1afddbe - add AVPacket.buf to allow reference counting for the AVPacket data.
+ Add av_packet_from_data() function for constructing packets from
+ av_malloc()ed data.
+ 7ecc2d4 - move AVFrame from lavc to lavu (new header libavutil/frame.h), add
+ AVFrame.buf/extended_buf to allow reference counting for the AVFrame
+ data. Add new API for working with reference-counted AVFrames.
+ 759001c - add the refcounted_frames field to AVCodecContext to make audio and
+ video decoders return reference-counted frames. Add get_buffer2()
+ callback to AVCodecContext which allocates reference-counted frames.
+ Add avcodec_default_get_buffer2() as the default get_buffer2()
+ implementation.
+ Deprecate AVCodecContext.get_buffer() / release_buffer() /
+ reget_buffer(), avcodec_default_get_buffer(),
+ avcodec_default_reget_buffer(), avcodec_default_release_buffer().
+ Remove avcodec_default_free_buffers(), which should not have ever
+ been called from outside of lavc.
+ Deprecate the following AVFrame fields:
+ * base -- is now stored in AVBufferRef
+ * reference, type, buffer_hints -- are unnecessary in the new API
+ * hwaccel_picture_private, owner, thread_opaque -- should not
+ have been acessed from outside of lavc
+ * qscale_table, qstride, qscale_type, mbskip_table, motion_val,
+ mb_type, dct_coeff, ref_index -- mpegvideo-specific tables,
+ which are not exported anymore.
+ 7e35037 - switch libavfilter to use AVFrame instead of AVFilterBufferRef. Add
+ av_buffersrc_add_frame(), deprecate av_buffersrc_buffer().
+ Add av_buffersink_get_frame() and av_buffersink_get_samples(),
+ deprecate av_buffersink_read() and av_buffersink_read_samples().
+ Deprecate AVFilterBufferRef and all functions for working with it.
+
+2013-03-17 - 12c5c1d - lavu 52.8.0 - avstring.h
+ Add av_isdigit, av_isgraph, av_isspace, av_isxdigit.
+
+2013-02-23 - 9f12235 - lavfi 3.4.0 - avfiltergraph.h
+ Add resample_lavr_opts to AVFilterGraph for setting libavresample options
+ for auto-inserted resample filters.
+
+2013-01-25 - 38c1466 - lavu 52.7.0 - dict.h
+ Add av_dict_parse_string() to set multiple key/value pairs at once from a
+ string.
+
+2013-01-25 - b85a5e8 - lavu 52.6.0 - avstring.h
+ Add av_strnstr()
+
+2013-01-15 - 8ee288d - lavu 52.5.0 - hmac.h
+ Add AVHMAC.
+
+2013-01-13 - 44e065d - lavc 54.36.0 - vdpau.h
+ Add AVVDPAUContext struct for VDPAU hardware-accelerated decoding.
+
+2013-01-12 - 169fb94 - lavu 52.4.0 - pixdesc.h
+ Add AV_PIX_FMT_VDPAU flag.
+
+2013-01-07 - 074a00d - lavr 1.1.0
+ Add avresample_set_channel_mapping() for input channel reordering,
+ duplication, and silencing.
+
+------------------------------8<-------------------------------------
+ 9 branch was cut here
+----------------------------->8--------------------------------------
+
 2012-12-29 - d8fd06c - lavu 52.3.0 - avstring.h
 Add av_basename() and av_dirname().

libav-v9.6.tar.bz2/doc/Doxyfile -> libav-v10.1.tar.bz2/doc/Doxyfile Changed

@@ -277,7 +277,7 @@
 # be useful for C code in case the coding convention dictates that all compound
 # types are typedef'ed and only the typedef is referenced, never the tag name.
 
-TYPEDEF_HIDES_STRUCT   = NO
+TYPEDEF_HIDES_STRUCT   = YES
 
 # The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
 # determine which symbols to keep in memory and which to flush to disk.
@@ -409,7 +409,7 @@
 # alphabetically by member name. If set to NO the members will appear in
 # declaration order.
 
-SORT_MEMBER_DOCS       = YES
+SORT_MEMBER_DOCS       = NO
 
 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
 # brief documentation of file, namespace and class members alphabetically
@@ -639,8 +639,7 @@
 # directories that contain example code fragments that are included (see
 # the \include command).
 
-EXAMPLE_PATH           = libavcodec/ \
-                         libavformat/
+EXAMPLE_PATH           =
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
@@ -794,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
@@ -809,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

libav-v9.6.tar.bz2/doc/Makefile -> libav-v10.1.tar.bz2/doc/Makefile Changed

@@ -1,6 +1,7 @@
-MANPAGES = $(PROGS-yes:%=doc/%.1)
-PODPAGES = $(PROGS-yes:%=doc/%.pod)
-HTMLPAGES = $(PROGS-yes:%=doc/%.html) \
+ALLMANPAGES = $(AVBASENAMES:%=%.1)
+MANPAGES = $(AVPROGS-yes:%=doc/%.1)
+PODPAGES = $(AVPROGS-yes:%=doc/%.pod)
+HTMLPAGES = $(AVPROGS-yes:%=doc/%.html) \
 doc/developer.html \
 doc/faq.html \
 doc/fate.html \
@@ -10,20 +11,34 @@
 doc/nut.html \
 doc/platform.html \
 
-DOCS = $(HTMLPAGES) $(MANPAGES) $(PODPAGES)
+DOCS-$(CONFIG_POD2MAN) += $(MANPAGES) $(PODPAGES)
+DOCS-$(CONFIG_TEXI2HTML) += $(HTMLPAGES)
+DOCS = $(DOCS-yes)
 
-all-$(CONFIG_DOC): documentation
+DOC_EXAMPLES-$(CONFIG_AVCODEC_EXAMPLE) += avcodec
+DOC_EXAMPLES-$(CONFIG_METADATA_EXAMPLE) += metadata
+DOC_EXAMPLES-$(CONFIG_OUTPUT_EXAMPLE) += output
+DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE) += transcode_aac
+ALL_DOC_EXAMPLES = avcodec metadata output transcode_aac
+
+DOC_EXAMPLES := $(DOC_EXAMPLES-yes:%=doc/examples/%$(EXESUF))
+ALL_DOC_EXAMPLES := $(ALL_DOC_EXAMPLES:%=doc/examples/%$(EXESUF))
+PROGS += $(DOC_EXAMPLES)
+
+all: $(DOCS)
 
 apidoc: doc/doxy/html
 documentation: $(DOCS)
 
+examples: $(DOC_EXAMPLES)
+
 TEXIDEP = awk '/^@include/ { printf "$@: $(@D)/%s\n", $$2 }' <$< >$(@:%=%.d)
 
 GENTEXI = format codec
 GENTEXI := $(GENTEXI:%=doc/avoptions_%.texi)
 
 $(GENTEXI): TAG = GENTEXI
-$(GENTEXI): doc/avoptions_%.texi: doc/print_options
+$(GENTEXI): doc/avoptions_%.texi: doc/print_options$(HOSTEXESUF)
 	$(M)doc/print_options $* > $@
 
 doc/%.html: TAG = HTML
@@ -32,7 +47,7 @@
 	$(M)texi2html -I doc -monolithic --init-file $(SRC_PATH)/doc/t2h.init --output $@ $<
 
 doc/%.pod: TAG = POD
-doc/%.pod: doc/%.texi $(GENTEXI)
+doc/%.pod: doc/%.texi $(SRC_PATH)/doc/texi2pod.pl $(GENTEXI)
 	$(Q)$(TEXIDEP)
 	$(M)$(SRC_PATH)/doc/texi2pod.pl -Idoc $< $@
 
@@ -41,23 +56,39 @@
 	$(M)pod2man --section=1 --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))
+DOXY_TEMPLATES = doxy_stylesheet.css footer.html header.html
+DOXY_TEMPLATES := $(addprefix $(SRC_PATH)/doc/doxy/, $(DOXY_TEMPLATES))
 
-install-progs-$(CONFIG_DOC): install-man
+doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(DOXY_INPUT) $(DOXY_TEMPLATES)
+	$(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $< $(DOXY_INPUT)
+
+install-progs-$(CONFIG_POD2MAN): install-man
+install-progs-$(CONFIG_TEXI2HTML): install-doc
+
+install-doc: $(HTMLPAGES)
+	$(Q)mkdir -p "$(DOCDIR)"
+	$(INSTALL) -m 644 $(HTMLPAGES) "$(DOCDIR)"
 
 install-man: $(MANPAGES)
 	$(Q)mkdir -p "$(MANDIR)/man1"
 	$(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1"
 
-uninstall: uninstall-man
+uninstall: uninstall-doc uninstall-man
+
+uninstall-doc:
+	$(RM) -r "$(DOCDIR)"
 
 uninstall-man:
 	$(RM) $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))
 
 clean::
-	$(RM) doc/*.html doc/*.pod doc/*.1 $(CLEANSUFFIXES:%=doc/%) doc/avoptions_*.texi
+	$(RM) $(ALL_DOC_EXAMPLES)
+	$(RM) $(CLEANSUFFIXES:%=doc/%) $(CLEANSUFFIXES:%=doc/examples/%)
+	$(RM) doc/*.html doc/*.pod doc/*.1 doc/avoptions_*.texi
 	$(RM) -r doc/doxy/html
 
 -include $(wildcard $(DOCS:%=%.d))

libav-v9.6.tar.bz2/doc/RELEASE_NOTES -> libav-v10.1.tar.bz2/doc/RELEASE_NOTES Changed

@@ -1,61 +1,43 @@
 Release Notes
 =============
 
-* 9 "Plain Nine"
+* 10 "Eks"
 
 General notes
 -------------
 
-From this release onwards, we have decided to drop the leading zero from our
-release numbers. There were no plans of ever changing it, so it carried no
-information. Thus this release is just a plain 9, the next will be 10 etc.
-
-A new library arrived in Libav during this development cycle -- its name is
-libavresample and it handles audio conversion and mixing. All users are
-encouraged to use it instead of the old, now deprecated, audio conversion
-API in libavcodec.
-
-The libpostproc library now resides in a separate tree. It was fully independent
-of the other Libav libraries, not used by any of the tools and saw very little
-development. For these reasons we decided that it has no place in Libav. A
-standalone Git tree is available at http://git.videolan.org/?p=libpostproc.git
-for people wishing to use libpostproc.
-
-The major versions of the libavcodec, libavformat and libavfilter libraries have
-been bumped, so they are not API or ABI compatible with the 0.8 release. The
-ffmpeg transcoding tool, kept for compatibility in 0.8, has also been dropped.
-
-This release brings a number of significant changes in the libavfilter library.
-Firstly, all the API dealing with filter internals is no longer public. The
-result is that creating user-side filters will not be supported until
-libavfilter is more mature.
-Secondly, full audio filtering support is now available along with a set of
-basic audio filters. We hope that their number will soon grow significantly.
-The avconv transcoding tool has of course been extended to handle audio
-filtering as well.
-There were a number of other API changes, most importantly the addition of
-the buffer sink public API.
-
-In the libavcodec library, one of the most notable changes is added support for
-planar audio (i.e. not interleaved). Many decoders and encoders, that previously
-did inefficient (de)interleaving internally, now only work with planar audio
-formats. Libavresample can be used for optimized conversion between interleaved
-and planar formats.
-
-Of big interest to our Windows users, Libav now supports building with the MSVC
-compiler. Since MSVC does not support C99 features used extensively by Libav,
-this has been accomplished using a converter that turns C99 code to C89. See the
-platform-specific documentation for more detailed documentation on building
-Libav with MSVC.
-
-As usual, this release also contains support for some new formats, many smaller
-new features and countless bug fixes. We can highlight Opus decoding / encoding
-through libopus, encoders for Apple ProRes and Ut Video, WMA Lossless and
-RealAudio Lossless decoders, fragmented MOV/MP4 and ISMV (Smooth Streaming)
-muxers, 24-bit FLAC encoding, a large number of RTMP improvements and support
-for cover art in ID3v2, WMA, MP4 and FLAC.
-
-See the Changelog file for a list of significant changes.
+One of the main features of this release is the addition of reference-counted
+data buffers to Libav and their use in various structures. Specifically, the
+data buffers used by AVPacket and AVFrame can now be reference counted, which
+should allow to significantly simplify many use cases. In addition,
+reference-counted AVFrames can now be used in libavfilter, avoiding the need
+for a separate libavfilter-specific frame structure. Frames can now be passed
+straight from the decoders into filters or from filters to encoders.
+
+These additions made it necessary to bump the major versions of libavcodec,
+libavformat, libavdevice, libavfilter, and libavutil, which was accompanied by
+dropping some old deprecated APIs. These libraries are thus not ABI- or API-
+compatible with the previous release. All the other libraries (libavresample
+and libswscale) should be both ABI- and API-compatible.
+
+Another major point is the inclusion of the HEVC (AKA H.265, the successor of
+H.264) decoder in the main codebase. It was started in 2012 as a Libav Google
+Summer of Code project by Guillaume Martres and subsequently completed with
+the assistance of the OpenHEVC project and several Libav developers.
+
+As usual, this release also contains support for other new formats, many smaller
+new features and countless bug fixes. We can highlight a native VP9 decoder,
+with encoding provided through libvpx, native decoders for WebP, JPEG 2000, and
+AIC, as well as improved WavPack support with encoding through libwavpack,
+support for more AAC flavors (LD - low delay, ELD - enhanced low delay), slice
+multithreading in libavfilter, or muxing chapters in ASF. Furthermore a few new
+filters have been introduced, namely compand, to change audio dynamics, framepack,
+to create stereoscopic videos, asetpts, to set audio pts, and interlace, to convert
+progressive video to interlaced. Finally there is more fine-grained detection of
+host and target libc, which should allow better portability to various cross
+compilation scenarios.
+
+See the Changelog file for a fuller list of significant changes.
 
 Please note that our policy on bug reports has not changed. We still only accept
 bug reports against HEAD of the Libav trunk repository. If you are experiencing
@@ -72,30 +54,31 @@
 have been deprecated and are scheduled for removal in the next release.
 Significant API changes include:
 
-[libavcodec]:
-* New video encoding API, similar to the previously introduced audio  encoding
-  API, which encodes from an AVFrame to an AVPacket, thus allowing it to
-  properly output timing information and side data.
-
-* All CODEC_ID_* symbols now carry AV_ prefixes. Non-prefixed codec IDs are
-  deprecated.
-
-* New codec descriptor API, which allows getting the properties of a given codec
-  (identified by its ID), without referring to a specific decoder or encoder.
-
-* An AVFrame must now be freed with a dedicated function, avcodec_free_frame().
-
-[libavutil]:
-* New audio FIFO API, which simplifies managing/merging/splitting audio buffers.
-
-* new int/float type punning API
-
-[libavfilter]:
-* All filter internals were hidden.
-
-* audio filtering.
-
-* new buffer sink API for getting frames out of libavfilter.
+[libavutil]
++ added the reference-counted buffers API (buffers.h)
++ moved the AVFrame struct to libavutil and added a new API for working with
+  reference-counted AVFrames (frame.h)
+
+[libavcodec]
++ added an API for working with reference-counted AVPackets (av_packet_*)
++- converted VDPAU to the hwaccel framework; the old way of using VDPAU is no
+   longer supported
+- old audio encoding and decoding APIs removed
+- old video encoding API removed
+- deprecated enum CodecID removed (enum AVCodecID should be used instead)
+- deprecated audio resampling API removed (libavresample should be used
+  instead)
+
+[libavfilter]
++- replaced AVFilterBufferRef with AVFrame; AVFilterBufferRef and everything
+   related to it still exists, but is deprecated
++ converted all filters to use the AVOptions system for configuration, it is
+  now possible to query the supported options, their values and set them
+  directly with av_opt_*
++ added a slice multithreading framework
++- merged avfiltergraph.h to avfilter.h, using AVFilterGraph is now explicitly
+   mandatory (it was implicitly required even before); added new API for
+   allocating and initializing filters
 
 Please see the file doc/APIchanges for details along with similar
 programmer-centric information.

libav-v9.6.tar.bz2/doc/avconv.texi -> libav-v10.1.tar.bz2/doc/avconv.texi Changed

@@ -233,6 +233,9 @@
 @item -y (@emph{global})
 Overwrite output files without asking.
 
+@item -n (@emph{global})
+Immediately exit when output files already exist.
+
 @item -c[:@var{stream_specifier}] @var{codec} (@emph{input/output,per-stream})
 @itemx -codec[:@var{stream_specifier}] @var{codec} (@emph{input/output,per-stream})
 Select an encoder (when used before an output file) or a decoder (when used
@@ -262,9 +265,15 @@
 
 @item -ss @var{position} (@emph{input/output})
 When used as an input option (before @code{-i}), seeks in this input file to
-@var{position}. When used as an output option (before an output filename),
-decodes but discards input until the timestamps reach @var{position}. This is
-slower, but more accurate.
+@var{position}. Note the in most formats it is not possible to seek exactly, so
+@command{avconv} will seek to the closest seek point before @var{position}.
+When transcoding and @option{-accurate_seek} is enabled (the default), this
+extra segment between the seek point and @var{position} will be decoded and
+discarded. When doing stream copy or when @option{-noaccurate_seek} is used, it
+will be preserved.
+
+When used as an output option (before an output filename), decodes but discards
+input until the timestamps reach @var{position}.
 
 @var{position} may be either in seconds or in @code{hh:mm:ss[.xxx]} form.
 
@@ -330,6 +339,12 @@
 
 See also the @option{-filter_complex} option if you want to create filter graphs
 with multiple inputs and/or outputs.
+
+@item -filter_script[:@var{stream_specifier}] @var{filename} (@emph{output,per-stream})
+This option is similar to @option{-filter}, the only difference is that its
+argument is the name of the file from which a filtergraph description is to be
+read.
+
 @item -pre[:@var{stream_specifier}] @var{preset_name} (@emph{output,per-stream})
 Specify the preset for matching stream(s).
 
@@ -515,10 +530,6 @@
 @item -rc_override[:@var{stream_specifier}] @var{override} (@emph{output,per-stream})
 rate control override for specific intervals
 
-@item -deinterlace
-Deinterlace pictures.
-This option is deprecated since the deinterlacing is very low quality.
-Use the yadif filter with @code{-filter:v yadif}.
 @item -vstats
 Dump video coding statistics to @file{vstats_HHMMSS.log}.
 @item -vstats_file @var{file}
@@ -541,6 +552,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{avconv}
+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
@@ -708,7 +755,10 @@
 @item -hex (@emph{global})
 When dumping packets, also dump the payload.
 @item -re (@emph{input})
-Read input at native frame rate. Mainly used to simulate a grab device.
+Read input at native frame rate. Mainly used to simulate a grab device
+or live input stream (e.g. when reading from a file). Should not be used
+with actual grab devices or live input streams (where it can cause packet
+loss).
 @item -vsync @var{parameter}
 Video sync method.
 
@@ -774,10 +824,6 @@
 @item -tag[:@var{stream_specifier}] @var{codec_tag} (@emph{output,per-stream})
 Force a tag/fourcc for matching streams.
 
-@item -cpuflags mask (@emph{global})
-Set a mask that's applied to autodetected CPU flags.  This option is intended
-for testing. Do not use it unless you know what you're doing.
-
 @item -filter_complex @var{filtergraph} (@emph{global})
 Define a complex filter graph, i.e. one with arbitrary number of inputs and/or
 outputs. For simple graphs -- those with one input and one output of the same
@@ -823,6 +869,18 @@
 @example
 avconv -filter_complex 'color=red' -t 5 out.mkv
 @end example
+
+@item -filter_complex_script @var{filename} (@emph{global})
+This option is similar to @option{-filter_complex}, the only difference is that
+its argument is the name of the file from which a complex filtergraph
+description is to be read.
+
+@item -accurate_seek (@emph{input})
+This option enables or disables accurate seeking in input files with the
+@option{-ss} option. It is enabled by default, so seeking is accurate when
+transcoding. Use @option{-noaccurate_seek} to disable it, which may be useful
+e.g. when copying some streams and transcoding the others.
+
 @end table
 @c man end OPTIONS
 
@@ -1062,6 +1120,7 @@
 @c man end EXAMPLES
 
 @include eval.texi
+@include decoders.texi
 @include encoders.texi
 @include demuxers.texi
 @include muxers.texi

libav-v9.6.tar.bz2/doc/avplay.texi -> libav-v10.1.tar.bz2/doc/avplay.texi Changed

libav-v9.6.tar.bz2/doc/avtools-common-opts.texi -> libav-v10.1.tar.bz2/doc/avtools-common-opts.texi Changed

libav-v10.1.tar.bz2/doc/decoders.texi Added

@@ -0,0 +1,56 @@
+@chapter Decoders
+@c man begin DECODERS
+
+Decoders are configured elements in Libav which allow the decoding of
+multimedia streams.
+
+When you configure your Libav build, all the supported native decoders
+are enabled by default. Decoders requiring an external library must be enabled
+manually via the corresponding @code{--enable-lib} option. You can list all
+available decoders using the configure option @code{--list-decoders}.
+
+You can disable all the decoders with the configure option
+@code{--disable-decoders} and selectively enable / disable single decoders
+with the options @code{--enable-decoder=@var{DECODER}} /
+@code{--disable-decoder=@var{DECODER}}.
+
+The option @code{-decoders} of the av* tools will display the list of
+enabled decoders.
+
+@c man end DECODERS
+
+@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
+
+@c man end AUDIO DECODERS

libav-v9.6.tar.bz2/doc/demuxers.texi -> libav-v10.1.tar.bz2/doc/demuxers.texi Changed

libav-v9.6.tar.bz2/doc/developer.texi -> libav-v10.1.tar.bz2/doc/developer.texi Changed

@@ -12,6 +12,7 @@
 @chapter Developers Guide
 
 @section API
+
 @itemize @bullet
 @item libavcodec is the library containing the codecs (both encoding and
 decoding). Look at @file{libavcodec/apiexample.c} to see how to use it.
@@ -20,14 +21,13 @@
 demux code for several formats). Look at @file{avplay.c} to use it in a
 player. See @file{libavformat/output-example.c} to use it to generate
 audio or video streams.
-
 @end itemize
 
 @section Integrating libav in your program
 
 Shared libraries should be used whenever is possible in order to reduce
 the effort distributors have to pour to support programs and to ensure
-only the public api is used.
+only the public API is used.
 
 You can use Libav in your commercial program, but you must abide to the
 license, LGPL or GPL depending on the specific features used, please refer
@@ -47,6 +47,7 @@
 
 @subsection Code formatting conventions
 The code is written in K&R C style. That means the following:
+
 @itemize @bullet
 @item
 The control statements are formatted by putting space between the statement
@@ -54,6 +55,7 @@
 @example
 for (i = 0; i < filter->input_count; i++) @{
 @end example
+
 @item
 The case statement is always located at the same level as the switch itself:
 @example
@@ -64,6 +66,7 @@
 av_log(filter, AV_LOG_INFO, "circular filter chain detected");
 return 0;
 @end example
+
 @item
 Braces in function declarations are written on the new line:
 @example
@@ -72,29 +75,35 @@
 return LIBAV_CONFIGURATION;
 @}
 @end example
+
 @item
 Do not check for NULL values by comparison, @samp{if (p)} and
 @samp{if (!p)} are correct; @samp{if (p == NULL)} and @samp{if (p != NULL)}
 are not.
+
 @item
 In case of a single-statement if, no curly braces are required:
 @example
 if (!pic || !picref)
 goto fail;
 @end example
+
 @item
 Do not put spaces immediately inside parentheses. @samp{if (ret)} is
 a valid style; @samp{if ( ret )} is not.
 @end itemize
 
 There are the following guidelines regarding the indentation in files:
+
 @itemize @bullet
 @item
 Indent size is 4.
+
 @item
 The TAB character is forbidden outside of Makefiles as is any
 form of trailing whitespace. Commits containing either will be
 rejected by the git repository.
+
 @item
 You should try to limit your code lines to 80 characters; however, do so if
 and only if this improves readability.
@@ -126,7 +135,7 @@
 * more text ...
 * ...
 */
-typedef struct Foobar@{
+typedef struct Foobar @{
 int var1; /**< var1 description */
 int var2; ///< var2 description
 /** var3 description */
@@ -148,13 +157,17 @@
 
 Libav is programmed in the ISO C90 language with a few additional
 features from ISO C99, namely:
+
 @itemize @bullet
 @item
 the @samp{inline} keyword;
+
 @item
 @samp{//} comments;
+
 @item
 designated struct initializers (@samp{struct s x = @{ .i = 17 @};})
+
 @item
 compound literals (@samp{x = (struct s) @{ 17, 23 @};})
 @end itemize
@@ -166,46 +179,67 @@
 All code must compile with recent versions of GCC and a number of other
 currently supported compilers. To ensure compatibility, please do not use
 additional C99 features or GCC extensions. Especially watch out for:
+
 @itemize @bullet
 @item
 mixing statements and declarations;
+
 @item
 @samp{long long} (use @samp{int64_t} instead);
+
 @item
 @samp{__attribute__} not protected by @samp{#ifdef __GNUC__} or similar;
+
 @item
 GCC statement expressions (@samp{(x = (@{ int y = 4; y; @})}).
 @end itemize
 
 @subsection Naming conventions
-All names are using underscores (_), not CamelCase. For example,
-@samp{avfilter_get_video_buffer} is a valid function name and
-@samp{AVFilterGetVideo} is not. The only exception from this are structure
-names; they should always be in the CamelCase
+All names should be composed with underscores (_), not CamelCase. For example,
+@samp{avfilter_get_video_buffer} is an acceptable function name and
+@samp{AVFilterGetVideo} is not. The only exception are structure
+names; they should always be CamelCase.
+
+There are the following conventions for naming variables and functions:
 
-There are following conventions for naming variables and functions:
 @itemize @bullet
 @item
 For local variables no prefix is required.
+
 @item
-For variables and functions declared as @code{static} no prefixes are required.
+For file-scope variables and functions declared as @code{static}, no prefix
+is required.
+
 @item
-For variables and functions used internally by the library, @code{ff_} prefix
-should be used.
-For example, @samp{ff_w64_demuxer}.
+For variables and functions visible outside of file scope, but only used
+internally by a library, an @code{ff_} prefix should be used,
+e.g. @samp{ff_w64_demuxer}.
+
 @item
-For variables and functions used internally across multiple libraries, use
-@code{avpriv_}. For example, @samp{avpriv_aac_parse_header}.
+For variables and functions visible outside of file scope, used internally
+across multiple libraries, use @code{avpriv_} as prefix, for example,
+@samp{avpriv_aac_parse_header}.
+
 @item
-For exported names, each library has its own prefixes. Just check the existing
-code and name accordingly.
+For externally visible symbols, each library has its own prefix. Check
+the existing code and choose names accordingly.
 @end itemize
 
+Furthermore, name space reserved for the system should not be invaded.
+Identifiers ending in @code{_t} are reserved by
+@url{http://pubs.opengroup.org/onlinepubs/007904975/functions/xsh_chap02_02.html#tag_02_02_02, POSIX}.
+Also avoid names starting with @code{__} or @code{_} followed by an uppercase
+letter as they are reserved by the C standard. Names starting with @code{_}
+are reserved at the file level and may not be used for externally visible
+symbols. If in doubt, just avoid names starting with @code{_} altogether.
+
 @subsection Miscellaneous conventions
+
 @itemize @bullet
 @item
 fprintf and printf are forbidden in libavformat and libavcodec,
 please use av_log() instead.
+
 @item
 Casts should be used only when necessary. Unneeded parentheses
 should also be avoided if they don't make the code easier to understand.
@@ -215,7 +249,7 @@
 In order to configure Vim to follow Libav formatting conventions, paste
 the following snippet into your @file{.vimrc}:
 @example
-" indentation rules for libav: 4 spaces, no tabs
+" Indentation rules for Libav: 4 spaces, no tabs.
 set expandtab
 set shiftwidth=4
 set softtabstop=4
@@ -248,101 +282,126 @@
 
 @enumerate
 @item
- Contributions should be licensed under the LGPL 2.1, including an
- "or any later version" clause, or the MIT license. GPL 2 including
- an "or any later version" clause is also acceptable, but LGPL is
- preferred.
-@item
- All the patches MUST be reviewed in the mailing list before they are
- committed.
-@item
- The Libav coding style should remain consistent. Changes to
- conform will be suggested during the review or implemented on commit.
-@item
- Patches should be generated using @code{git format-patch} or directly sent
- using @code{git send-email}.
- Please make sure you give the proper credit by setting the correct author
- in the commit.
-@item
- The commit message should have a short first line in the form of
- @samp{topic: short description} as header, separated by a newline
- from the body consting in few lines explaining the reason of the patch.
- Referring to the issue on the bug tracker does not exempt to report an
- excerpt of the bug.
-@item
- Work in progress patches should be sent to the mailing list with the [WIP]
- or the [RFC] tag.
-@item
- Branches in public personal repos are advised as way to
- work on issues collaboratively.
-@item
- You do not have to over-test things. If it works for you and you think it
- should work for others, send it to the mailing list for review.
- If you have doubt about portability please state it in the submission so
- people with specific hardware could test it.
-@item
- Do not commit unrelated changes together, split them into self-contained
- pieces. Also do not forget that if part B depends on part A, but A does not
- depend on B, then A can and should be committed first and separate from B.
- Keeping changes well split into self-contained parts makes reviewing and
- understanding them on the commit log mailing list easier. This also helps
- in case of debugging later on.
-@item
- Patches that change behavior of the programs (renaming options etc) or
- public API or ABI should be discussed in depth and possible few days should
- pass between discussion and commit.
- Changes to the build system (Makefiles, configure script) which alter
- the expected behavior should be considered in the same regard.
-@item
- When applying patches that have been discussed (at length) on the mailing
- list, reference the thread in the log message.
-@item
- Subscribe to the
- @uref{https://lists.libav.org/mailman/listinfo/libav-devel, libav-devel} and
- @uref{https://lists.libav.org/mailman/listinfo/libav-commits, libav-commits}
- mailing lists.
- Bugs and possible improvements or general questions regarding commits
- are discussed on libav-devel. We expect you to react if problems with
- your code are uncovered.
-@item
- Update the documentation if you change behavior or add features. If you are
- unsure how best to do this, send an [RFC] patch to libav-devel.
-@item
- All discussions and decisions should be reported on the public developer
- mailing list, so that there is a reference to them.
- Other media (e.g. IRC) should be used for coordination and immediate
- collaboration.
-@item
- Never write to unallocated memory, never write over the end of arrays,
- always check values read from some untrusted source before using them
- as array index or other risky things. Always use valgrind to doublecheck.
-@item
- Remember to check if you need to bump versions for the specific libav
- parts (libavutil, libavcodec, libavformat) you are changing. You need
- to change the version integer.
- Incrementing the first component means no backward compatibility to
- previous versions (e.g. removal of a function from the public API).
- Incrementing the second component means backward compatible change
- (e.g. addition of a function to the public API or extension of an
- existing data structure).
- Incrementing the third component means a noteworthy binary compatible
- change (e.g. encoder bug fix that matters for the decoder).
-@item
- Compiler warnings indicate potential bugs or code with bad style.
- If it is a bug, the bug has to be fixed. If it is not, the code should
- be changed to not generate a warning unless that causes a slowdown
- or obfuscates the code.
- If a type of warning leads to too many false positives, that warning
- should be disabled, not the code changed.
-@item
- If you add a new file, give it a proper license header. Do not copy and
- paste it from a random place, use an existing file as template.
+Contributions should be licensed under the
+@uref{http://www.gnu.org/licenses/lgpl-2.1.html, LGPL 2.1},
+including an "or any later version" clause, or, if you prefer
+a gift-style license, the
+@uref{http://opensource.org/licenses/isc-license.txt, ISC} or
+@uref{http://mit-license.org/, MIT} license.
+@uref{http://www.gnu.org/licenses/gpl-2.0.html, GPL 2} including
+an "or any later version" clause is also acceptable, but LGPL is
+preferred.
+
+@item
+All the patches MUST be reviewed in the mailing list before they are
+committed.
+
+@item
+The Libav coding style should remain consistent. Changes to
+conform will be suggested during the review or implemented on commit.
+
+@item
+Patches should be generated using @code{git format-patch} or directly sent
+using @code{git send-email}.
+Please make sure you give the proper credit by setting the correct author
+in the commit.
+
+@item
+The commit message should have a short first line in the form of
+a @samp{topic: short description} as a header, separated by a newline
+from the body consisting of an explanation of why the change is necessary.
+If the commit fixes a known bug on the bug tracker, the commit message
+should include its bug ID. Referring to the issue on the bug tracker does
+not exempt you from writing an excerpt of the bug in the commit message.
+If the patch is a bug fix which should be backported to stable releases,
+i.e. a non-API/ABI-breaking bug fix, add @code{CC: libav-stable@@libav.org}
+to the bottom of your commit message, and make sure to CC your patch to
+this address, too. Some git setups will do this automatically.
+
+@item
+Work in progress patches should be sent to the mailing list with the [WIP]
+or the [RFC] tag.
+
+@item
+Branches in public personal repos are advised as way to
+work on issues collaboratively.
+
+@item
+You do not have to over-test things. If it works for you and you think it
+should work for others, send it to the mailing list for review.
+If you have doubt about portability please state it in the submission so
+people with specific hardware could test it.
+
+@item
+Do not commit unrelated changes together, split them into self-contained
+pieces. Also do not forget that if part B depends on part A, but A does not
+depend on B, then A can and should be committed first and separate from B.
+Keeping changes well split into self-contained parts makes reviewing and
+understanding them on the commit log mailing list easier. This also helps
+in case of debugging later on.
+
+@item
+Patches that change behavior of the programs (renaming options etc) or
+public API or ABI should be discussed in depth and possible few days should
+pass between discussion and commit.
+Changes to the build system (Makefiles, configure script) which alter
+the expected behavior should be considered in the same regard.
+
+@item
+When applying patches that have been discussed (at length) on the mailing
+list, reference the thread in the log message.
+
+@item
+Subscribe to the
+@uref{https://lists.libav.org/mailman/listinfo/libav-devel, libav-devel} and
+@uref{https://lists.libav.org/mailman/listinfo/libav-commits, libav-commits}
+mailing lists.
+Bugs and possible improvements or general questions regarding commits
+are discussed on libav-devel. We expect you to react if problems with
+your code are uncovered.
+
+@item
+Update the documentation if you change behavior or add features. If you are
+unsure how best to do this, send an [RFC] patch to libav-devel.
+
+@item
+All discussions and decisions should be reported on the public developer
+mailing list, so that there is a reference to them.
+Other media (e.g. IRC) should be used for coordination and immediate
+collaboration.
+
+@item
+Never write to unallocated memory, never write over the end of arrays,
+always check values read from some untrusted source before using them
+as array index or other risky things. Always use valgrind to double-check.
+
+@item
+Remember to check if you need to bump versions for the specific libav
+parts (libavutil, libavcodec, libavformat) you are changing. You need
+to change the version integer.
+Incrementing the first component means no backward compatibility to
+previous versions (e.g. removal of a function from the public API).
+Incrementing the second component means backward compatible change
+(e.g. addition of a function to the public API or extension of an
+existing data structure).
+Incrementing the third component means a noteworthy binary compatible
+change (e.g. encoder bug fix that matters for the decoder).
+
+@item
+Compiler warnings indicate potential bugs or code with bad style.
+If it is a bug, the bug has to be fixed. If it is not, the code should
+be changed to not generate a warning unless that causes a slowdown
+or obfuscates the code.
+If a type of warning leads to too many false positives, that warning
+should be disabled, not the code changed.
+
+@item
+If you add a new file, give it a proper license header. Do not copy and
+paste it from a random place, use an existing file as template.
 @end enumerate
 
 We think our rules are not too hard. If you have comments, contact us.
 
-Note, some rules were borrowed from the MPlayer project.
-
 @section Submitting patches
 
 First, read the @ref{Coding Rules} above if you did not yet, in particular
@@ -362,12 +421,6 @@
 Run the @ref{Regression Tests} before submitting a patch in order to verify
 it does not cause unexpected problems.
 
-Patches should be posted as base64 encoded attachments (or any other
-encoding which ensures that the patch will not be trashed during
-transmission) to the
-@uref{https://lists.libav.org/mailman/listinfo/libav-devel, libav-devel}
-mailing list.
-
 It also helps quite a bit if you tell us what the patch does (for example
 'replaces lrint by lrintf'), and why (for example '*BSD isn't C99 compliant
 and has no lrint()'). This kind of explanation should be the body of the
@@ -376,8 +429,12 @@
 Also please if you send several patches, send each patch as a separate mail,
 do not attach several unrelated patches to the same mail.
 
-Use @code{git send-email} when possible since it will properly send patches
-without requiring extra care.
+Patches should be posted to the
+@uref{https://lists.libav.org/mailman/listinfo/libav-devel, libav-devel}
+mailing list. Use @code{git send-email} when possible since it will properly
+send patches without requiring extra care. If you cannot, then send patches
+as base64-encoded attachments, so your patch is not trashed during
+transmission.
 
 Your patch will be reviewed on the mailing list. You will likely be asked
 to make some changes and are expected to send in an improved version that
@@ -393,40 +450,51 @@
 
 @enumerate
 @item
- Did you use av_cold for codec initialization and close functions?
+Did you use av_cold for codec initialization and close functions?
+
 @item
- Did you add a long_name under NULL_IF_CONFIG_SMALL to the AVCodec or
- AVInputFormat/AVOutputFormat struct?
+Did you add a long_name under NULL_IF_CONFIG_SMALL to the AVCodec or
+AVInputFormat/AVOutputFormat struct?
+
 @item
- Did you bump the minor version number (and reset the micro version
- number) in @file{libavcodec/version.h} or @file{libavformat/version.h}?
+Did you bump the minor version number (and reset the micro version
+number) in @file{libavcodec/version.h} or @file{libavformat/version.h}?
+
 @item
- Did you register it in @file{allcodecs.c} or @file{allformats.c}?
+Did you register it in @file{allcodecs.c} or @file{allformats.c}?
+
 @item
- Did you add the AVCodecID to @file{avcodec.h}?
- When adding new codec IDs, also add an entry to the codec descriptor
- list in @file{libavcodec/codec_desc.c}.
+Did you add the AVCodecID to @file{avcodec.h}?
+When adding new codec IDs, also add an entry to the codec descriptor
+list in @file{libavcodec/codec_desc.c}.
+
 @item
- If it has a fourcc, did you add it to @file{libavformat/riff.c},
- even if it is only a decoder?
+If it has a FourCC, did you add it to @file{libavformat/riff.c},
+even if it is only a decoder?
+
 @item
- Did you add a rule to compile the appropriate files in the Makefile?
- Remember to do this even if you are just adding a format to a file that
- is already being compiled by some other rule, like a raw demuxer.
+Did you add a rule to compile the appropriate files in the Makefile?
+Remember to do this even if you are just adding a format to a file that
+is already being compiled by some other rule, like a raw demuxer.
+
 @item
- Did you add an entry to the table of supported formats or codecs in
- @file{doc/general.texi}?
+Did you add an entry to the table of supported formats or codecs in
+@file{doc/general.texi}?
+
 @item
- Did you add an entry in the Changelog?
+Did you add an entry in the Changelog?
+
 @item
- If it depends on a parser or a library, did you add that dependency in
- configure?
+If it depends on a parser or a library, did you add that dependency in
+configure?
+
 @item
- Did you @code{git add} the appropriate files before committing?
+Did you @code{git add} the appropriate files before committing?
+
 @item
- Did you make sure it compiles standalone, i.e. with
- @code{configure --disable-everything --enable-decoder=foo}
- (or @code{--enable-demuxer} or whatever your component is)?
+Did you make sure it compiles standalone, i.e. with
+@code{configure --disable-everything --enable-decoder=foo}
+(or @code{--enable-demuxer} or whatever your component is)?
 @end enumerate
 
 
@@ -434,66 +502,89 @@
 
 @enumerate
 @item
- Does @code{make check} pass with the patch applied?
+Does @code{make check} pass with the patch applied?
+
 @item
- Is the patch against latest Libav git master branch?
+Is the patch against latest Libav git master branch?
+
 @item
- Are you subscribed to the
- @uref{https://lists.libav.org/mailman/listinfo/libav-devel, libav-devel}
- mailing list? (Only list subscribers are allowed to post.)
+Are you subscribed to the
+@uref{https://lists.libav.org/mailman/listinfo/libav-devel, libav-devel}
+mailing list? (Only list subscribers are allowed to post.)
+
 @item
- Have you checked that the changes are minimal, so that the same cannot be
- achieved with a smaller patch and/or simpler final code?
+Have you checked that the changes are minimal, so that the same cannot be
+achieved with a smaller patch and/or simpler final code?
+
 @item
- If the change is to speed critical code, did you benchmark it?
+If the change is to speed critical code, did you benchmark it?
+
 @item
- If you did any benchmarks, did you provide them in the mail?
+If you did any benchmarks, did you provide them in the mail?
+
 @item
- Have you checked that the patch does not introduce buffer overflows or
- other security issues?
+Have you checked that the patch does not introduce buffer overflows or
+other security issues?
+
 @item
- Did you test your decoder or demuxer against damaged data? If no, see
- tools/trasher and the noise bitstream filter. Your decoder or demuxer
- should not crash or end in a (near) infinite loop when fed damaged data.
+Did you test your decoder or demuxer against damaged data? If no, see
+tools/trasher, the noise bitstream filter, and
+@uref{http://caca.zoy.org/wiki/zzuf, zzuf}. Your decoder or demuxer
+should not crash, end in a (near) infinite loop, or allocate ridiculous
+amounts of memory when fed damaged data.
+
 @item
- Does the patch not mix functional and cosmetic changes?
+Does the patch not mix functional and cosmetic changes?
+
 @item
- Did you add tabs or trailing whitespace to the code? Both are forbidden.
+Did you add tabs or trailing whitespace to the code? Both are forbidden.
+
 @item
- Is the patch attached to the email you send?
+Is the patch attached to the email you send?
+
 @item
- Is the mime type of the patch correct? It should be text/x-diff or
- text/x-patch or at least text/plain and not application/octet-stream.
+Is the mime type of the patch correct? It should be text/x-diff or
+text/x-patch or at least text/plain and not application/octet-stream.
+
 @item
- If the patch fixes a bug, did you provide a verbose analysis of the bug?
+If the patch fixes a bug, did you provide a verbose analysis of the bug?
+
 @item
- If the patch fixes a bug, did you provide enough information, including
- a sample, so the bug can be reproduced and the fix can be verified?
- Note please do not attach samples >100k to mails but rather provide a
- URL, you can upload to ftp://upload.libav.org
+If the patch fixes a bug, did you provide enough information, including
+a sample, so the bug can be reproduced and the fix can be verified?
+Note please do not attach samples >100k to mails but rather provide a
+URL, you can upload to ftp://upload.libav.org
+
 @item
- Did you provide a verbose summary about what the patch does change?
+Did you provide a verbose summary about what the patch does change?
+
 @item
- Did you provide a verbose explanation why it changes things like it does?
+Did you provide a verbose explanation why it changes things like it does?
+
 @item
- Did you provide a verbose summary of the user visible advantages and
- disadvantages if the patch is applied?
+Did you provide a verbose summary of the user visible advantages and
+disadvantages if the patch is applied?
+
 @item
- Did you provide an example so we can verify the new feature added by the
- patch easily?
+Did you provide an example so we can verify the new feature added by the
+patch easily?
+
 @item
- If you added a new file, did you insert a license header? It should be
- taken from Libav, not randomly copied and pasted from somewhere else.
+If you added a new file, did you insert a license header? It should be
+taken from Libav, not randomly copied and pasted from somewhere else.
+
 @item
- You should maintain alphabetical order in alphabetically ordered lists as
- long as doing so does not break API/ABI compatibility.
+You should maintain alphabetical order in alphabetically ordered lists as
+long as doing so does not break API/ABI compatibility.
+
 @item
- Lines with similar content should be aligned vertically when doing so
- improves readability.
+Lines with similar content should be aligned vertically when doing so
+improves readability.
+
 @item
- Make sure you check the return values of function and return appropriate
- error codes. Especially memory allocation functions like @code{malloc()}
- are notoriously left unchecked, which is a serious problem.
+Make sure you check the return values of function and return appropriate
+error codes. Especially memory allocation functions like @code{malloc()}
+are notoriously left unchecked, which is a serious problem.
 @end enumerate
 
 @section Patch review process
@@ -532,4 +623,162 @@
 
 Please refer to @url{fate.html}.
 
+@subsection Visualizing Test Coverage
+
+The Libav build system allows visualizing the test coverage in an easy
+manner with the coverage tools @code{gcov}/@code{lcov}. This involves
+the following steps:
+
+@enumerate
+@item
+ Configure to compile with instrumentation enabled:
+ @code{configure --toolchain=gcov}.
+
+@item
+ Run your test case, either manually or via FATE. This can be either
+ the full FATE regression suite, or any arbitrary invocation of any
+ front-end tool provided by Libav, in any combination.
+
+@item
+ Run @code{make lcov} to generate coverage data in HTML format.
+
+@item
+ View @code{lcov/index.html} in your preferred HTML viewer.
+@end enumerate
+
+You can use the command @code{make lcov-reset} to reset the coverage
+measurements. You will need to rerun @code{make lcov} after running a
+new test.
+
+@subsection Using Valgrind
+
+The configure script provides a shortcut for using valgrind to spot bugs
+related to memory handling. Just add the option
+@code{--toolchain=valgrind-memcheck} or @code{--toolchain=valgrind-massif}
+to your configure line, and reasonable defaults will be set for running
+FATE under the supervision of either the @strong{memcheck} or the
+@strong{massif} tool of the valgrind suite.
+
+In case you need finer control over how valgrind is invoked, use the
+@code{--target-exec='valgrind <your_custom_valgrind_options>} option in
+your configure line instead.
+
+@anchor{Release process}
+@section Release process
+
+Libav maintains a set of @strong{release branches}, which are the
+recommended deliverable for system integrators and distributors (such as
+Linux distributions, etc.). At irregular times, a @strong{release
+manager} prepares, tests and publishes tarballs on the
+@url{http://libav.org} website.
+
+There are two kinds of releases:
+
+@enumerate
+@item
+@strong{Major releases} always include the latest and greatest
+features and functionality.
+
+@item
+@strong{Point releases} are cut from @strong{release} branches,
+which are named @code{release/X}, with @code{X} being the release
+version number.
+@end enumerate
+
+Note that we promise to our users that shared libraries from any Libav
+release never break programs that have been @strong{compiled} against
+previous versions of @strong{the same release series} in any case!
+
+However, from time to time, we do make API changes that require adaptations
+in applications. Such changes are only allowed in (new) major releases and
+require further steps such as bumping library version numbers and/or
+adjustments to the symbol versioning file. Please discuss such changes
+on the @strong{libav-devel} mailing list in time to allow forward planning.
+
+@anchor{Criteria for Point Releases}
+@subsection Criteria for Point Releases
+
+Changes that match the following criteria are valid candidates for
+inclusion into a point release:
+
+@enumerate
+@item
+Fixes a security issue, preferably identified by a @strong{CVE
+number} issued by @url{http://cve.mitre.org/}.
+
+@item
+Fixes a documented bug in @url{http://bugzilla.libav.org}.
+
+@item
+Improves the included documentation.
+
+@item
+Retains both source code and binary compatibility with previous
+point releases of the same release branch.
+@end enumerate
+
+The order for checking the rules is (1 OR 2 OR 3) AND 4.
+
+All Libav developers are welcome to nominate commits that they push to
+@code{master} by mailing the @strong{libav-stable} mailing list. The
+easiest way to do so is to include @code{CC: libav-stable@@libav.org} in
+the commit message.
+
+
+@subsection Release Checklist
+
+The release process involves the following steps:
+
+@enumerate
+@item
+Ensure that the @file{RELEASE} file contains the version number for
+the upcoming release.
+
+@item
+File a release tracking bug in @url{http://bugzilla.libav.org}. Make
+sure that the bug has an alias named @code{ReleaseX.Y} for the
+@code{X.Y} release.
+
+@item
+Announce the intent to do a release to the mailing list.
+
+@item
+Reassign unresolved blocking bugs from previous release
+tracking bugs to the new bug.
+
+@item
+Review patch nominations that reach the @strong{libav-stable}
+mailing list, and push patches that fulfill the stable release
+criteria to the release branch.
+
+@item
+Ensure that the FATE regression suite still passes in the release
+branch on at least @strong{i386} and @strong{amd64}
+(cf. @ref{Regression Tests}).
+
+@item
+Prepare the release tarballs in @code{xz} and @code{gz} formats, and
+supplementing files that contain @code{md5} and @code{sha1}
+checksums.
+
+@item
+Publish the tarballs at @url{http://libav.org/releases}. Create and
+push an annotated tag in the form @code{vX}, with @code{X}
+containing the version number.
+
+@item
+Build the tarballs with the Windows binaries, and publish them at
+@url{http://win32.libav.org/releases}.
+
+@item
+Propose and send a patch to the @strong{libav-devel} mailing list
+with a news entry for the website.
+
+@item
+Publish the news entry.
+
+@item
+Send announcement to the mailing list.
+@end enumerate
+
 @bye

libav-v9.6.tar.bz2/doc/doxy-wrapper.sh -> libav-v10.1.tar.bz2/doc/doxy-wrapper.sh Changed

libav-v9.6.tar.bz2/doc/doxy/doxy_stylesheet.css -> libav-v10.1.tar.bz2/doc/doxy/doxy_stylesheet.css Changed

@@ -214,6 +214,10 @@
   background-color: #f7f7f9;
   border: 1px solid #e1e1e8;
 }
+.fragment .line {
+  padding-left: 2em;
+  white-space: pre;
+}
 pre {
   display: block;
   padding: 9.5px;
@@ -222,7 +226,6 @@
   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;
@@ -260,6 +263,10 @@
   -moz-border-radius: 9px;
   border-radius: 9px;
 }
+
+.label a {
+  color:#ffffff;
+}
 a.label:hover,
 a.badge:hover {
   color: #ffffff;
@@ -1514,7 +1521,6 @@
         -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;
 
@@ -1745,7 +1751,6 @@
 }
 
 .fieldtable th {
-        background-image:url('nav_f.png');
         background-repeat:repeat-x;
         background-color: #E2F2E2;
         font-size: 90%;
@@ -1767,7 +1772,6 @@
     top: 0px;
     left: 10px;
     height: 36px;
-    background-image: url('tab_b.png');
     z-index: 101;
     overflow: hidden;
     font-size: 13px;
@@ -1776,7 +1780,6 @@
 .tablistpath ul
 {
     font-size: 11px;
-    background-image:url('tab_b.png');
     background-repeat:repeat-x;
     height:30px;
     line-height:30px;
@@ -1793,7 +1796,6 @@
     float:left;
     padding-left:10px;
     padding-right:15px;
-    background-image:url('bc_s.png');
     background-repeat:no-repeat;
     background-position:right;
     color:#367C36;

libav-v9.6.tar.bz2/doc/encoders.texi -> libav-v10.1.tar.bz2/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 av* tools will display the list of
+The option @code{-encoders} of the av* tools will display the list of
 enabled encoders.
 
 @c man end ENCODERS
@@ -412,4 +412,343 @@
 
 @end table
 
+@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:
+
+@table @option
+
+@item 0
+Fast mode - corresponding to the wavpack @option{-f} option.
+
+@item 1
+Normal (default) settings.
+
+@item 2
+High quality - corresponding to the wavpack @option{-h} option.
+
+@item 3
+Very high quality - corresponding to the wavpack @option{-hh} option.
+
+@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}.
+
+@end table
+
 @c man end AUDIO ENCODERS
+
+@chapter Video Encoders
+@c man begin VIDEO ENCODERS
+
+@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
+
+x264 H.264/MPEG-4 AVC encoder wrapper
+
+x264 supports an impressive number of features, including 8x8 and 4x4 adaptive
+spatial transform, adaptive B-frame placement, CAVLC/CABAC entropy coding,
+interlacing (MBAFF), lossless mode, psy optimizations for detail retention
+(adaptive quantization, psy-RD, psy-trellis).
+
+The Libav wrapper provides a mapping for most of them using global options
+that match those of the encoders and provides private options for the unique
+encoder options. Additionally an expert override is provided to directly pass
+a list of key=value tuples as accepted by x264_param_parse.
+
+@subsection Option Mapping
+
+The following options are supported by the x264 wrapper, the x264-equivalent
+options follow the Libav ones.
+
+@multitable @columnfractions .2 .2
+@item b @tab bitrate
+Libav @code{b} option is expressed in bits/s, x264 @code{bitrate} in kilobits/s.
+@item bf @tab bframes
+Maximum number of B-frames.
+@item g @tab keyint
+Maximum GOP size.
+@item qmin @tab qpmin
+@item qmax @tab qpmax
+@item qdiff @tab qpstep
+@item qblur @tab qblur
+@item qcomp @tab qcomp
+@item refs @tab ref
+@item sc_threshold @tab scenecut
+@item trellis @tab trellis
+@item nr @tab nr
+Noise reduction.
+@item me_range @tab merange
+@item me_method @tab me
+@item subq @tab subme
+@item b_strategy @tab b-adapt
+@item keyint_min @tab keyint-min
+@item coder @tab cabac
+Set coder to @code{ac} to use CABAC.
+@item cmp @tab chroma-me
+Set to @code{chroma} to use chroma motion estimation.
+@item threads @tab threads
+@item thread_type @tab sliced_threads
+Set to @code{slice} to use sliced threading instead of frame threading.
+@item flags -cgop @tab open-gop
+Set @code{-cgop} to use recovery points to close GOPs.
+@item rc_init_occupancy @tab vbv-init
+Initial buffer occupancy.
+@end multitable
+
+@subsection Private Options
+@table @option
+@item -preset @var{string}
+Set the encoding preset (cf. x264 --fullhelp).
+@item -tune @var{string}
+Tune the encoding params (cf. x264 --fullhelp).
+@item -profile @var{string}
+Set profile restrictions (cf. x264 --fullhelp).
+@item -fastfirstpass @var{integer}
+Use fast settings when encoding first pass.
+@item -crf @var{float}
+Select the quality for constant quality mode.
+@item -crf_max @var{float}
+In CRF mode, prevents VBV from lowering quality beyond this point.
+@item -qp @var{integer}
+Constant quantization parameter rate control method.
+@item -aq-mode @var{integer}
+AQ method
+
+Possible values:
+@table @samp
+@item none
+
+@item variance
+Variance AQ (complexity mask).
+@item autovariance
+Auto-variance AQ (experimental).
+@end table
+@item -aq-strength @var{float}
+AQ strength, reduces blocking and blurring in flat and textured areas.
+@item -psy @var{integer}
+Use psychovisual optimizations.
+@item -psy-rd @var{string}
+Strength of psychovisual optimization, in <psy-rd>:<psy-trellis> format.
+@item -rc-lookahead @var{integer}
+Number of frames to look ahead for frametype and ratecontrol.
+@item -weightb @var{integer}
+Weighted prediction for B-frames.
+@item -weightp @var{integer}
+Weighted prediction analysis method.
+
+Possible values:
+@table @samp
+@item none
+
+@item simple
+
+@item smart
+
+@end table
+@item -ssim @var{integer}
+Calculate and print SSIM stats.
+@item -intra-refresh @var{integer}
+Use Periodic Intra Refresh instead of IDR frames.
+@item -bluray-compat @var{integer}
+Configure the encoder to be compatible with the bluray standard.
+It is a shorthand for setting "bluray-compat=1 force-cfr=1".
+@item -b-bias @var{integer}
+Influences how often B-frames are used.
+@item -b-pyramid @var{integer}
+Keep some B-frames as references.
+
+Possible values:
+@table @samp
+@item none
+
+@item strict
+Strictly hierarchical pyramid.
+@item normal
+Non-strict (not Blu-ray compatible).
+@end table
+@item -mixed-refs @var{integer}
+One reference per partition, as opposed to one reference per macroblock.
+@item -8x8dct @var{integer}
+High profile 8x8 transform.
+@item -fast-pskip @var{integer}
+@item -aud @var{integer}
+Use access unit delimiters.
+@item -mbtree @var{integer}
+Use macroblock tree ratecontrol.
+@item -deblock @var{string}
+Loop filter parameters, in <alpha:beta> form.
+@item -cplxblur @var{float}
+Reduce fluctuations in QP (before curve compression).
+@item -partitions @var{string}
+A comma-separated list of partitions to consider, possible values: p8x8, p4x4, b8x8, i8x8, i4x4, none, all.
+@item -direct-pred @var{integer}
+Direct MV prediction mode
+
+Possible values:
+@table @samp
+@item none
+
+@item spatial
+
+@item temporal
+
+@item auto
+
+@end table
+@item -slice-max-size @var{integer}
+Limit the size of each slice in bytes.
+@item -stats @var{string}
+Filename for 2 pass stats.
+@item -nal-hrd @var{integer}
+Signal HRD information (requires vbv-bufsize; cbr not allowed in .mp4).
+
+Possible values:
+@table @samp
+@item none
+
+@item vbr
+
+@item cbr
+
+@end table
+@item -x264-params @var{string}
+Override the x264 configuration using a :-separated list of key=value parameters.
+@example
+-x264-params level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subq=6:8x8dct=0:trellis=0
+@end example
+@end table
+
+Encoding avpresets for common usages are provided so they can be used with the
+general presets system (e.g. passing the @code{-pre} option).
+
+@section ProRes
+
+Apple ProRes encoder.
+
+@subsection Private Options
+
+@table @option
+@item profile @var{integer}
+Select the ProRes profile to encode
+@table @samp
+@item proxy
+@item lt
+@item standard
+@item hq
+@item 4444
+@end table
+
+@item quant_mat @var{integer}
+Select quantization matrix.
+@table @samp
+@item auto
+@item default
+@item proxy
+@item lt
+@item standard
+@item hq
+@end table
+If set to @var{auto}, the matrix matching the profile will be picked.
+If not set, the matrix providing the highest quality, @var{default}, will be
+picked.
+
+@item bits_per_mb @var{integer}
+How many bits to allot for coding one macroblock. Different profiles use
+between 200 and 2400 bits per macroblock, the maximum is 8000.
+
+@item mbs_per_slice @var{integer}
+Number of macroblocks in each slice (1-8); the default value (8)
+should be good in almost all situations.
+
+@item vendor @var{string}
+Override the 4-byte vendor ID.
+A custom vendor ID like @var{apl0} would claim the stream was produced by
+the Apple encoder.
+
+@item alpha_bits @var{integer}
+Specify number of bits for alpha component.
+Possible values are @var{0}, @var{8} and @var{16}.
+Use @var{0} to disable alpha plane coding.
+
+@end table
+
+@subsection Speed considerations
+
+In the default mode of operation the encoder has to honor frame constraints
+(i.e. not produc frames with size bigger than requested) while still making
+output picture as good as possible.
+A frame containing a lot of small details is harder to compress and the encoder
+would spend more time searching for appropriate quantizers for each slice.
+
+Setting a higher @option{bits_per_mb} limit will improve the speed.
+
+For the fastest encoding speed set the @option{qscale} parameter (4 is the
+recommended value) and do not set a size constraint.
+
+@c man end VIDEO ENCODERS

libav-v10.1.tar.bz2/doc/examples Added

libav-v10.1.tar.bz2/doc/examples/avcodec.c Added

@@ -0,0 +1,595 @@
+/*
+ * copyright (c) 2001 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * libavcodec API use example.
+ *
+ * @example avcodec.c
+ * Note that this library only handles codecs (mpeg, mpeg4, etc...),
+ * not file formats (avi, vob, etc...). See library 'libavformat' for the
+ * format handling
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#ifdef HAVE_AV_CONFIG_H
+#undef HAVE_AV_CONFIG_H
+#endif
+
+#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("Audio encoding\n");
+
+ /* 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);
+
+ /* 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 %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);
+ 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);
+ }
+ }
+ 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("Audio decoding\n");
+
+ /* 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);
+
+ /* 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, "out of memory\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);
+ fwrite(decoded_frame->data[0], 1, data_size, outfile);
+ }
+ avpkt.size -= len;
+ avpkt.data += len;
+ 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)
+{
+ AVCodec *codec;
+ AVCodecContext *c= NULL;
+ int i, ret, x, y, got_output;
+ FILE *f;
+ AVFrame *picture;
+ AVPacket pkt;
+ uint8_t endcode[] = { 0, 0, 1, 0xb7 };
+
+ printf("Video encoding\n");
+
+ /* find the mpeg1 video encoder */
+ codec = avcodec_find_encoder(AV_CODEC_ID_MPEG1VIDEO);
+ if (!codec) {
+ fprintf(stderr, "codec not found\n");
+ exit(1);
+ }
+
+ c = avcodec_alloc_context3(codec);
+ picture = av_frame_alloc();
+
+ /* 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;
+
+ /* 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);
+ }
+
+ ret = av_image_alloc(picture->data, picture->linesize, c->width, c->height,
+ c->pix_fmt, 32);
+ if (ret < 0) {
+ fprintf(stderr, "could not alloc raw picture buffer\n");
+ exit(1);
+ }
+ picture->format = c->pix_fmt;
+ picture->width = c->width;
+ picture->height = c->height;
+
+ /* 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++) {
+ picture->data[0][y * picture->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++) {
+ picture->data[1][y * picture->linesize[1] + x] = 128 + y + i * 2;
+ picture->data[2][y * picture->linesize[2] + x] = 64 + x + i * 5;
+ }
+ }
+
+ picture->pts = i;
+
+ /* encode the image */
+ ret = avcodec_encode_video2(c, &pkt, picture, &got_output);
+ if (ret < 0) {
+ fprintf(stderr, "error encoding frame\n");
+ exit(1);
+ }
+
+ if (got_output) {
+ printf("encoding 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("encoding 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(&picture->data[0]);
+ av_frame_free(&picture);
+ 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 void video_decode_example(const char *outfilename, const char *filename)
+{
+ AVCodec *codec;
+ AVCodecContext *c= NULL;
+ int frame, got_picture, len;
+ FILE *f;
+ AVFrame *picture;
+ uint8_t inbuf[INBUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE];
+ char buf[1024];
+ 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("Video decoding\n");
+
+ /* 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);
+ picture = av_frame_alloc();
+
+ 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);
+ }
+
+ /* the codec gives us the frame size, in samples */
+
+ f = fopen(filename, "rb");
+ if (!f) {
+ fprintf(stderr, "could not open %s\n", filename);
+ exit(1);
+ }
+
+ frame = 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) {
+ len = avcodec_decode_video2(c, picture, &got_picture, &avpkt);
+ if (len < 0) {
+ fprintf(stderr, "Error while decoding frame %d\n", frame);
+ exit(1);
+ }
+ if (got_picture) {
+ printf("saving frame %3d\n", frame);
+ fflush(stdout);
+
+ /* the picture is allocated by the decoder. no need to
+ free it */
+ snprintf(buf, sizeof(buf), outfilename, frame);
+ pgm_save(picture->data[0], picture->linesize[0],
+ c->width, c->height, buf);
+ frame++;
+ }
+ avpkt.size -= len;
+ avpkt.data += len;
+ }
+ }
+
+ /* 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;
+ len = avcodec_decode_video2(c, picture, &got_picture, &avpkt);
+ if (got_picture) {
+ printf("saving last frame %3d\n", frame);
+ fflush(stdout);
+
+ /* the picture is allocated by the decoder. no need to
+ free it */
+ snprintf(buf, sizeof(buf), outfilename, frame);
+ pgm_save(picture->data[0], picture->linesize[0],
+ c->width, c->height, buf);
+ frame++;
+ }
+
+ fclose(f);
+
+ avcodec_close(c);
+ av_free(c);
+ av_frame_free(&picture);
+ printf("\n");
+}
+
+int main(int argc, char **argv)
+{
+ const char *filename;
+
+ /* register all the codecs */
+ avcodec_register_all();
+
+ if (argc <= 1) {
+ audio_encode_example("/tmp/test.mp2");
+ audio_decode_example("/tmp/test.sw", "/tmp/test.mp2");
+
+ video_encode_example("/tmp/test.mpg");
+ filename = "/tmp/test.mpg";
+ } else {
+ filename = argv[1];
+ }
+
+ // audio_decode_example("/tmp/test.sw", filename);
+ video_decode_example("/tmp/test%d.pgm", filename);
+
+ return 0;
+}

libav-v10.1.tar.bz2/doc/examples/metadata.c Added

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2011 Reinhard Tartler
+ *
+ * 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
+ * @example metadata.c
+ * Shows how the metadata API can be used in application programs.
+ */
+
+#include <stdio.h>
+
+#include <libavformat/avformat.h>
+#include <libavutil/dict.h>
+
+int main (int argc, char **argv)
+{
+ AVFormatContext *fmt_ctx = NULL;
+ AVDictionaryEntry *tag = NULL;
+ int ret;
+
+ if (argc != 2) {
+ printf("usage: %s <input_file>\n"
+ "example program to demonstrate the use of the libavformat metadata API.\n"
+ "\n", argv[0]);
+ return 1;
+ }
+
+ av_register_all();
+ if ((ret = avformat_open_input(&fmt_ctx, argv[1], NULL, NULL)))
+ return ret;
+
+ while ((tag = av_dict_get(fmt_ctx->metadata, "", tag, AV_DICT_IGNORE_SUFFIX)))
+ printf("%s=%s\n", tag->key, tag->value);
+
+ avformat_free_context(fmt_ctx);
+ return 0;
+}

libav-v10.1.tar.bz2/doc/examples/output.c Added

@@ -0,0 +1,527 @@
+/*
+ * Copyright (c) 2003 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
+ * libavformat API example.
+ *
+ * @example output.c
+ * Output a media file in any supported libavformat format. The default
+ * codecs are used.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+
+#include "libavutil/mathematics.h"
+#include "libavformat/avformat.h"
+#include "libswscale/swscale.h"
+
+/* 5 seconds stream duration */
+#define STREAM_DURATION 5.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;
+
+/**************************************************************/
+/* audio output */
+
+static float t, tincr, tincr2;
+static int16_t *samples;
+static int audio_input_frame_size;
+
+/*
+ * add an audio output stream
+ */
+static AVStream *add_audio_stream(AVFormatContext *oc, enum AVCodecID codec_id)
+{
+ AVCodecContext *c;
+ AVStream *st;
+ AVCodec *codec;
+
+ /* find the audio encoder */
+ codec = avcodec_find_encoder(codec_id);
+ if (!codec) {
+ fprintf(stderr, "codec not found\n");
+ exit(1);
+ }
+
+ st = avformat_new_stream(oc, codec);
+ if (!st) {
+ fprintf(stderr, "Could not alloc stream\n");
+ exit(1);
+ }
+
+ c = st->codec;
+
+ /* put sample parameters */
+ c->sample_fmt = AV_SAMPLE_FMT_S16;
+ c->bit_rate = 64000;
+ c->sample_rate = 44100;
+ c->channels = 2;
+
+ // some formats want stream headers to be separate
+ if (oc->oformat->flags & AVFMT_GLOBALHEADER)
+ c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+
+ return st;
+}
+
+static void open_audio(AVFormatContext *oc, AVStream *st)
+{
+ AVCodecContext *c;
+
+ c = st->codec;
+
+ /* open it */
+ if (avcodec_open2(c, NULL, NULL) < 0) {
+ fprintf(stderr, "could not open codec\n");
+ exit(1);
+ }
+
+ /* init signal generator */
+ t = 0;
+ tincr = 2 * M_PI * 110.0 / c->sample_rate;
+ /* increment frequency by 110 Hz per second */
+ tincr2 = 2 * M_PI * 110.0 / c->sample_rate / c->sample_rate;
+
+ if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)
+ audio_input_frame_size = 10000;
+ else
+ audio_input_frame_size = c->frame_size;
+ samples = av_malloc(audio_input_frame_size *
+ av_get_bytes_per_sample(c->sample_fmt) *
+ c->channels);
+}
+
+/* Prepare a 16 bit dummy audio frame of 'frame_size' samples and
+ * 'nb_channels' channels. */
+static void get_audio_frame(int16_t *samples, int frame_size, int nb_channels)
+{
+ int j, i, v;
+ int16_t *q;
+
+ q = samples;
+ for (j = 0; j < frame_size; j++) {
+ v = (int)(sin(t) * 10000);
+ for (i = 0; i < nb_channels; i++)
+ *q++ = v;
+ t += tincr;
+ tincr += tincr2;
+ }
+}
+
+static void write_audio_frame(AVFormatContext *oc, AVStream *st)
+{
+ AVCodecContext *c;
+ AVPacket pkt = { 0 }; // data and size must be 0;
+ AVFrame *frame = av_frame_alloc();
+ int got_packet;
+
+ av_init_packet(&pkt);
+ c = st->codec;
+
+ get_audio_frame(samples, audio_input_frame_size, c->channels);
+ frame->nb_samples = audio_input_frame_size;
+ avcodec_fill_audio_frame(frame, c->channels, c->sample_fmt,
+ (uint8_t *)samples,
+ audio_input_frame_size *
+ av_get_bytes_per_sample(c->sample_fmt) *
+ c->channels, 1);
+
+ avcodec_encode_audio2(c, &pkt, frame, &got_packet);
+ if (!got_packet)
+ return;
+
+ pkt.stream_index = st->index;
+
+ /* Write the compressed frame to the media file. */
+ if (av_interleaved_write_frame(oc, &pkt) != 0) {
+ fprintf(stderr, "Error while writing audio frame\n");
+ exit(1);
+ }
+ av_frame_free(&frame);
+}
+
+static void close_audio(AVFormatContext *oc, AVStream *st)
+{
+ avcodec_close(st->codec);
+
+ av_free(samples);
+}
+
+/**************************************************************/
+/* video output */
+
+static AVFrame *picture, *tmp_picture;
+static int frame_count;
+
+/* Add a video output stream. */
+static AVStream *add_video_stream(AVFormatContext *oc, enum AVCodecID codec_id)
+{
+ AVCodecContext *c;
+ AVStream *st;
+ AVCodec *codec;
+
+ /* find the video encoder */
+ codec = avcodec_find_encoder(codec_id);
+ if (!codec) {
+ fprintf(stderr, "codec not found\n");
+ exit(1);
+ }
+
+ st = avformat_new_stream(oc, codec);
+ if (!st) {
+ fprintf(stderr, "Could not alloc stream\n");
+ exit(1);
+ }
+
+ c = st->codec;
+
+ /* Put sample parameters. */
+ c->bit_rate = 400000;
+ /* Resolution must be a multiple of two. */
+ c->width = 352;
+ c->height = 288;
+ /* timebase: This is the fundamental unit of time (in seconds) in terms
+ * of which frame timestamps are represented. For fixed-fps content,
+ * timebase should be 1/framerate and timestamp increments should be
+ * identical to 1. */
+ c->time_base.den = STREAM_FRAME_RATE;
+ c->time_base.num = 1;
+ c->gop_size = 12; /* emit one intra frame every twelve frames at most */
+ c->pix_fmt = STREAM_PIX_FMT;
+ if (c->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
+ /* just for testing, we also add B frames */
+ c->max_b_frames = 2;
+ }
+ if (c->codec_id == AV_CODEC_ID_MPEG1VIDEO) {
+ /* Needed to avoid using macroblocks in which some coeffs overflow.
+ * This does not happen with normal video, it just happens here as
+ * the motion of the chroma plane does not match the luma plane. */
+ c->mb_decision = 2;
+ }
+ /* Some formats want stream headers to be separate. */
+ if (oc->oformat->flags & AVFMT_GLOBALHEADER)
+ c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+
+ return st;
+}
+
+static AVFrame *alloc_picture(enum AVPixelFormat pix_fmt, int width, int height)
+{
+ AVFrame *picture;
+ uint8_t *picture_buf;
+ int size;
+
+ picture = av_frame_alloc();
+ if (!picture)
+ return NULL;
+ size = avpicture_get_size(pix_fmt, width, height);
+ picture_buf = av_malloc(size);
+ if (!picture_buf) {
+ av_free(picture);
+ return NULL;
+ }
+ avpicture_fill((AVPicture *)picture, picture_buf,
+ pix_fmt, width, height);
+ return picture;
+}
+
+static void open_video(AVFormatContext *oc, AVStream *st)
+{
+ AVCodecContext *c;
+
+ c = st->codec;
+
+ /* open the codec */
+ if (avcodec_open2(c, NULL, NULL) < 0) {
+ fprintf(stderr, "could not open codec\n");
+ exit(1);
+ }
+
+ /* Allocate the encoded raw picture. */
+ picture = alloc_picture(c->pix_fmt, c->width, c->height);
+ if (!picture) {
+ fprintf(stderr, "Could not allocate picture\n");
+ exit(1);
+ }
+
+ /* If the output format is not YUV420P, then a temporary YUV420P
+ * picture is needed too. It is then converted to the required
+ * output format. */
+ tmp_picture = NULL;
+ if (c->pix_fmt != AV_PIX_FMT_YUV420P) {
+ tmp_picture = alloc_picture(AV_PIX_FMT_YUV420P, c->width, c->height);
+ if (!tmp_picture) {
+ fprintf(stderr, "Could not allocate temporary picture\n");
+ exit(1);
+ }
+ }
+}
+
+/* Prepare a dummy image. */
+static void fill_yuv_image(AVFrame *pict, int frame_index,
+ int width, int height)
+{
+ int x, y, i;
+
+ i = frame_index;
+
+ /* Y */
+ for (y = 0; y < height; y++)
+ for (x = 0; x < width; x++)
+ pict->data[0][y * pict->linesize[0] + x] = x + y + i * 3;
+
+ /* Cb and Cr */
+ for (y = 0; y < height / 2; y++) {
+ for (x = 0; x < width / 2; x++) {
+ pict->data[1][y * pict->linesize[1] + x] = 128 + y + i * 2;
+ pict->data[2][y * pict->linesize[2] + x] = 64 + x + i * 5;
+ }
+ }
+}
+
+static void write_video_frame(AVFormatContext *oc, AVStream *st)
+{
+ int ret;
+ AVCodecContext *c;
+ static struct SwsContext *img_convert_ctx;
+
+ 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 (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 */
+ if (img_convert_ctx == NULL) {
+ img_convert_ctx = sws_getContext(c->width, c->height,
+ AV_PIX_FMT_YUV420P,
+ c->width, c->height,
+ c->pix_fmt,
+ sws_flags, NULL, NULL, NULL);
+ if (img_convert_ctx == NULL) {
+ fprintf(stderr,
+ "Cannot initialize the conversion context\n");
+ exit(1);
+ }
+ }
+ fill_yuv_image(tmp_picture, frame_count, c->width, c->height);
+ sws_scale(img_convert_ctx, tmp_picture->data, tmp_picture->linesize,
+ 0, c->height, picture->data, picture->linesize);
+ } else {
+ fill_yuv_image(picture, frame_count, c->width, c->height);
+ }
+ }
+
+ if (oc->oformat->flags & AVFMT_RAWPICTURE) {
+ /* Raw video case - the API will change slightly in the near
+ * future for that. */
+ AVPacket pkt;
+ av_init_packet(&pkt);
+
+ pkt.flags |= AV_PKT_FLAG_KEY;
+ pkt.stream_index = st->index;
+ pkt.data = (uint8_t *)picture;
+ pkt.size = sizeof(AVPicture);
+
+ ret = av_interleaved_write_frame(oc, &pkt);
+ } else {
+ AVPacket pkt = { 0 };
+ int got_packet;
+ av_init_packet(&pkt);
+
+ /* encode the image */
+ ret = avcodec_encode_video2(c, &pkt, picture, &got_packet);
+ /* If size is zero, it means the image was buffered. */
+ if (!ret && got_packet && pkt.size) {
+ if (pkt.pts != AV_NOPTS_VALUE) {
+ pkt.pts = av_rescale_q(pkt.pts,
+ c->time_base, st->time_base);
+ }
+ if (pkt.dts != AV_NOPTS_VALUE) {
+ pkt.dts = av_rescale_q(pkt.dts,
+ c->time_base, st->time_base);
+ }
+ pkt.stream_index = st->index;
+
+ /* Write the compressed frame to the media file. */
+ ret = av_interleaved_write_frame(oc, &pkt);
+ } else {
+ ret = 0;
+ }
+ }
+ if (ret != 0) {
+ fprintf(stderr, "Error while writing video frame\n");
+ exit(1);
+ }
+ frame_count++;
+}
+
+static void close_video(AVFormatContext *oc, AVStream *st)
+{
+ avcodec_close(st->codec);
+ av_free(picture->data[0]);
+ av_free(picture);
+ if (tmp_picture) {
+ av_free(tmp_picture->data[0]);
+ av_free(tmp_picture);
+ }
+}
+
+/**************************************************************/
+/* media file output */
+
+int main(int argc, char **argv)
+{
+ const char *filename;
+ AVOutputFormat *fmt;
+ AVFormatContext *oc;
+ AVStream *audio_st, *video_st;
+ double audio_pts, video_pts;
+ int i;
+
+ /* Initialize libavcodec, and register all codecs and formats. */
+ av_register_all();
+
+ if (argc != 2) {
+ printf("usage: %s output_file\n"
+ "API example program to output a media file with libavformat.\n"
+ "The output format is automatically guessed according to the file extension.\n"
+ "Raw images can also be output by using '%%d' in the filename\n"
+ "\n", argv[0]);
+ return 1;
+ }
+
+ filename = argv[1];
+
+ /* Autodetect the output format from the name. default is MPEG. */
+ fmt = av_guess_format(NULL, filename, NULL);
+ if (!fmt) {
+ printf("Could not deduce output format from file extension: using MPEG.\n");
+ fmt = av_guess_format("mpeg", NULL, NULL);
+ }
+ if (!fmt) {
+ fprintf(stderr, "Could not find suitable output format\n");
+ return 1;
+ }
+
+ /* Allocate the output media context. */
+ oc = avformat_alloc_context();
+ if (!oc) {
+ fprintf(stderr, "Memory error\n");
+ return 1;
+ }
+ oc->oformat = fmt;
+ snprintf(oc->filename, sizeof(oc->filename), "%s", filename);
+
+ /* Add the audio and video streams using the default format codecs
+ * and initialize the codecs. */
+ video_st = NULL;
+ audio_st = NULL;
+ if (fmt->video_codec != AV_CODEC_ID_NONE) {
+ video_st = add_video_stream(oc, fmt->video_codec);
+ }
+ if (fmt->audio_codec != AV_CODEC_ID_NONE) {
+ audio_st = add_audio_stream(oc, fmt->audio_codec);
+ }
+
+ /* Now that all the parameters are set, we can open the audio and
+ * video codecs and allocate the necessary encode buffers. */
+ if (video_st)
+ open_video(oc, video_st);
+ if (audio_st)
+ open_audio(oc, audio_st);
+
+ av_dump_format(oc, 0, filename, 1);
+
+ /* open the output file, if needed */
+ if (!(fmt->flags & AVFMT_NOFILE)) {
+ if (avio_open(&oc->pb, filename, AVIO_FLAG_WRITE) < 0) {
+ fprintf(stderr, "Could not open '%s'\n", filename);
+ return 1;
+ }
+ }
+
+ /* Write the stream header, if any. */
+ avformat_write_header(oc, NULL);
+
+ for (;;) {
+ /* Compute current audio and video time. */
+ if (audio_st)
+ audio_pts = (double)audio_st->pts.val * audio_st->time_base.num / audio_st->time_base.den;
+ else
+ audio_pts = 0.0;
+
+ if (video_st)
+ video_pts = (double)video_st->pts.val * video_st->time_base.num /
+ video_st->time_base.den;
+ else
+ video_pts = 0.0;
+
+ if ((!audio_st || audio_pts >= STREAM_DURATION) &&
+ (!video_st || video_pts >= STREAM_DURATION))
+ break;
+
+ /* write interleaved audio and video frames */
+ if (!video_st || (video_st && audio_st && audio_pts < video_pts)) {
+ write_audio_frame(oc, audio_st);
+ } else {
+ write_video_frame(oc, video_st);
+ }
+ }
+
+ /* Write the trailer, if any. The trailer must be written before you
+ * close the CodecContexts open when you wrote the header; otherwise
+ * av_write_trailer() may try to use memory that was freed on
+ * av_codec_close(). */
+ av_write_trailer(oc);
+
+ /* Close each codec. */
+ if (video_st)
+ close_video(oc, video_st);
+ if (audio_st)
+ close_audio(oc, audio_st);
+
+ /* Free the streams. */
+ for (i = 0; i < oc->nb_streams; i++) {
+ av_freep(&oc->streams[i]->codec);
+ av_freep(&oc->streams[i]);
+ }
+
+ if (!(fmt->flags & AVFMT_NOFILE))
+ /* Close the output file. */
+ avio_close(oc->pb);
+
+ /* free the stream */
+ av_free(oc);
+
+ return 0;
+}

libav-v10.1.tar.bz2/doc/examples/transcode_aac.c Added

@@ -0,0 +1,772 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 Libav.
+ * @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/avstring.h"
+#include "libavutil/frame.h"
+#include "libavutil/opt.h"
+
+#include "libavresample/avresample.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
+ * libavresample takes care of this, but requires initialization.
+ */
+static int init_resampler(AVCodecContext *input_codec_context,
+ AVCodecContext *output_codec_context,
+ AVAudioResampleContext **resample_context)
+{
+ /**
+ * Only initialize the resampler if it is necessary, i.e.,
+ * if and only if the sample formats differ.
+ */
+ if (input_codec_context->sample_fmt != output_codec_context->sample_fmt ||
+ input_codec_context->channels != output_codec_context->channels) {
+ int error;
+
+ /** Create a resampler context for the conversion. */
+ if (!(*resample_context = avresample_alloc_context())) {
+ fprintf(stderr, "Could not allocate resample context\n");
+ return AVERROR(ENOMEM);
+ }
+
+ /**
+ * 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).
+ */
+ av_opt_set_int(*resample_context, "in_channel_layout",
+ av_get_default_channel_layout(input_codec_context->channels), 0);
+ av_opt_set_int(*resample_context, "out_channel_layout",
+ av_get_default_channel_layout(output_codec_context->channels), 0);
+ av_opt_set_int(*resample_context, "in_sample_rate",
+ input_codec_context->sample_rate, 0);
+ av_opt_set_int(*resample_context, "out_sample_rate",
+ output_codec_context->sample_rate, 0);
+ av_opt_set_int(*resample_context, "in_sample_fmt",
+ input_codec_context->sample_fmt, 0);
+ av_opt_set_int(*resample_context, "out_sample_fmt",
+ output_codec_context->sample_fmt, 0);
+
+ /** Open the resampler with the specified parameters. */
+ if ((error = avresample_open(*resample_context)) < 0) {
+ fprintf(stderr, "Could not open resample context\n");
+ avresample_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(uint8_t **input_data,
+ uint8_t **converted_data, const int frame_size,
+ AVAudioResampleContext *resample_context)
+{
+ int error;
+
+ /** Convert the samples using the resampler. */
+ if ((error = avresample_convert(resample_context, converted_data, 0,
+ frame_size, input_data, 0, frame_size)) < 0) {
+ fprintf(stderr, "Could not convert input samples (error '%s')\n",
+ get_error_text(error));
+ return error;
+ }
+
+ /**
+ * 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
+ */
+ if (avresample_available(resample_context)) {
+ fprintf(stderr, "Converted samples left over\n");
+ return AVERROR_EXIT;
+ }
+
+ 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,
+ AVAudioResampleContext *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(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;
+ AVAudioResampleContext *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);
+ if (resample_context) {
+ avresample_close(resample_context);
+ avresample_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;
+}

libav-v9.6.tar.bz2/doc/faq.texi -> libav-v10.1.tar.bz2/doc/faq.texi Changed

libav-v9.6.tar.bz2/doc/fate.texi -> libav-v10.1.tar.bz2/doc/fate.texi Changed

@@ -51,11 +51,14 @@
 
 @anchor{Makefile target}
 @section FATE Makefile targets
+
 @table @option
 @item fate-list
 List all fate/regression test targets.
+
 @item fate-rsync
 Shortcut to download the fate test samples to the specified testsuite location.
+
 @item fate
 Run the FATE test suite (requires the fate-suite dataset).
 @end table
@@ -64,27 +67,38 @@
 @table @option
 @item V
 Verbosity level, can be set to 0, 1 or 2.
+
 @table @option
-    @item 0
-    show just the test arguments
-    @item 1
-    show just the command used in the test
-    @item 2
-    show everything
+@item 0
+show just the test arguments
+
+@item 1
+show just the command used in the test
+
+@item 2
+show everything
 @end table
+
 @item SAMPLES
 Specify or override the path to the FATE samples at make time, it has a
 meaning only while running the regression tests.
+
 @item THREADS
 Specify how many threads to use while running regression tests, it is
 quite useful to detect thread-related regressions.
+
 @item THREAD_TYPE
 Specify which threading strategy test, either @var{slice} or @var{frame},
 by default @var{slice+frame}
+
 @item CPUFLAGS
 Specify a mask to be applied to autodetected CPU flags.
+
 @item TARGET_EXEC
 Specify or override the wrapper used to run the tests.
+
+@item GEN
+Set to @var{1} to generate the missing or mismatched references.
 @end table
 
 @example
@@ -118,16 +132,20 @@
 workdir=                                # directory in which to do all the work
 fate_recv="ssh -T fate@@fate.libav.org"  # command to submit report
 comment=                                # optional description
+build_only=     # set to "yes" for a compile-only instance that skips tests
 
 # the following are optional and map to configure options
 arch=
 cpu=
 cross_prefix=
+as=
 cc=
+ld=
 target_os=
 sysroot=
 target_exec=
 target_path=
+target_samples=
 extra_cflags=
 extra_ldflags=
 extra_libs=

libav-v9.6.tar.bz2/doc/filters.texi -> libav-v10.1.tar.bz2/doc/filters.texi Changed

@@ -21,7 +21,7 @@
 recognized by the @option{-filter}/@option{-vf} and @option{-filter_complex}
 options in @command{avconv} and @option{-vf} in @command{avplay}, and by the
 @code{avfilter_graph_parse()}/@code{avfilter_graph_parse2()} function defined in
-@file{libavfilter/avfiltergraph.h}.
+@file{libavfilter/avfilter.h}.
 
 A filterchain consists of a sequence of connected filters, each one
 connected to the previous one in the sequence. A filterchain is
@@ -41,8 +41,25 @@
 "=@var{arguments}".
 
 @var{arguments} is a string which contains the parameters used to
-initialize the filter instance, and are described in the filter
-descriptions below.
+initialize the filter instance. It may have one of the two allowed forms:
+@itemize
+
+@item
+A ':'-separated list of @var{key=value} pairs.
+
+@item
+A ':'-separated list of @var{value}. In this case, the keys are assumed to be
+the option names in the order they are declared. E.g. the @code{fade} filter
+declares three options in this order -- @option{type}, @option{start_frame} and
+@option{nb_frames}. Then the parameter list @var{in:0:30} means that the value
+@var{in} is assigned to the option @option{type}, @var{0} to
+@option{start_frame} and @var{30} to @option{nb_frames}.
+
+@end itemize
+
+If the option value itself is a list of items (e.g. the @code{format} filter
+takes a list of pixel formats), the items in the list are usually separated by
+'|'.
 
 The list of arguments can be quoted using the character "'" as initial
 and ending mark, and the character '\' for escaping the characters
@@ -78,7 +95,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};}
@@ -116,13 +133,13 @@
 @table @option
 
 @item sample_fmts
-A comma-separated list of requested sample formats.
+A '|'-separated list of requested sample formats.
 
 @item sample_rates
-A comma-separated list of requested sample rates.
+A '|'-separated list of requested sample rates.
 
 @item channel_layouts
-A comma-separated list of requested channel layouts.
+A '|'-separated list of requested channel layouts.
 
 @end table
 
@@ -130,7 +147,7 @@
 
 For example to force the output to either unsigned 8-bit or signed 16-bit stereo:
 @example
-aformat=sample_fmts\=u8\,s16:channel_layouts\=stereo
+aformat=sample_fmts=u8|s16:channel_layouts=stereo
 @end example
 
 @section amix
@@ -175,6 +192,75 @@
 
 Pass the audio source unchanged to the output.
 
+@section asetpts
+
+Change the PTS (presentation timestamp) of the input audio frames.
+
+This filter accepts the following options:
+
+@table @option
+
+@item expr
+The expression which is evaluated for each frame to construct its timestamp.
+
+@end table
+
+The expression is evaluated through the eval API and can contain the following
+constants:
+
+@table @option
+@item PTS
+the presentation timestamp in input
+
+@item PI
+Greek PI
+
+@item PHI
+golden ratio
+
+@item E
+Euler number
+
+@item N
+Number of the audio samples pass through the filter so far, starting at 0.
+
+@item S
+Number of the audio samples in the current frame.
+
+@item SR
+Audio sample rate.
+
+@item STARTPTS
+the PTS of the first frame
+
+@item PREV_INPTS
+previous input PTS
+
+@item PREV_OUTPTS
+previous output PTS
+
+@item RTCTIME
+wallclock (RTC) time in microseconds
+
+@item RTCSTART
+wallclock (RTC) time at the start of the movie in microseconds
+
+@end table
+
+Some examples follow:
+
+@example
+# start counting PTS from zero
+asetpts=expr=PTS-STARTPTS
+
+#generate timestamps by counting samples
+asetpts=expr=N/SR/TB
+
+# generate timestamps from a "live source" and rebase onto the current timebase
+asetpts='(RTCTIME - RTCSTART) / (TB * 1000000)"
+@end example
+
+
 @section ashowinfo
 
 Show a line containing various information for each input audio frame.
@@ -259,6 +345,70 @@
 
 @end table
 
+@section atrim
+Trim the input so that the output contains one continuous subpart of the input.
+
+This filter accepts the following options:
+@table @option
+@item start
+Timestamp (in seconds) of the start of the kept section. I.e. the audio sample
+with the timestamp @var{start} will be the first sample in the output.
+
+@item end
+Timestamp (in seconds) of the first audio sample that will be dropped. I.e. the
+audio sample immediately preceding the one with the timestamp @var{end} will be
+the last sample in the output.
+
+@item start_pts
+Same as @var{start}, except this option sets the start timestamp in samples
+instead of seconds.
+
+@item end_pts
+Same as @var{end}, except this option sets the end timestamp in samples instead
+of seconds.
+
+@item duration
+Maximum duration of the output in seconds.
+
+@item start_sample
+Number of the first sample that should be passed to output.
+
+@item end_sample
+Number of the first sample that should be dropped.
+@end table
+
+Note that the first two sets of the start/end options and the @option{duration}
+option look at the frame timestamp, while the _sample options simply count the
+samples that pass through the filter. So start/end_pts and start/end_sample will
+give different results when the timestamps are wrong, inexact or do not start at
+zero. Also note that this filter does not modify the timestamps. If you wish
+that the output timestamps start at zero, insert the asetpts filter after the
+atrim filter.
+
+If multiple start or end options are set, this filter tries to be greedy and
+keep all samples that match at least one of the specified constraints. To keep
+only the part that matches all the constraints at once, chain multiple atrim
+filters.
+
+The defaults are such that all the input is kept. So it is possible to set e.g.
+just the end values to keep everything before the specified time.
+
+Examples:
+@itemize
+@item
+drop everything except the second minute of input
+@example
+avconv -i INPUT -af atrim=60:120
+@end example
+
+@item
+keep only the first 1000 samples
+@example
+avconv -i INPUT -af atrim=end_sample=1000
+@end example
+
+@end itemize
+
 @section channelsplit
 Split each channel in input audio stream into a separate output stream.
 
@@ -293,7 +443,7 @@
 Channel layout of the output stream.
 
 @item map
-Map channels from input to output. The argument is a comma-separated list of
+Map channels from input to output. The argument is a '|'-separated list of
 mappings, each in the @code{@var{in_channel}-@var{out_channel}} or
 @var{in_channel} form. @var{in_channel} can be either the name of the input
 channel (e.g. FL for front left) or its index in the input channel layout.
@@ -307,16 +457,89 @@
 
 For example, assuming a 5.1+downmix input MOV file
 @example
-avconv -i in.mov -filter 'channelmap=map=DL-FL\,DR-FR' out.wav
+avconv -i in.mov -filter 'channelmap=map=DL-FL|DR-FR' out.wav
 @end example
 will create an output WAV file tagged as stereo from the downmix channels of
 the input.
 
 To fix a 5.1 WAV improperly encoded in AAC's native channel order
 @example
-avconv -i in.wav -filter 'channelmap=1\,2\,0\,5\,3\,4:channel_layout=5.1' out.wav
+avconv -i in.wav -filter 'channelmap=1|2|0|5|3|4:channel_layout=5.1' out.wav
 @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. @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 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|....}
+
+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 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.
+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. Defaults to 0.
+
+@item delay
+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:
+@example
+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:
+@example
+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
+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
+@end example
+@end itemize
+
 @section join
 Join multiple input streams into one multi-channel stream.
 
@@ -330,7 +553,7 @@
 Desired output channel layout. Defaults to stereo.
 
 @item map
-Map channels from inputs to output. The argument is a comma-separated list of
+Map channels from inputs to output. The argument is a '|'-separated list of
 mappings, each in the @code{@var{input_idx}.@var{in_channel}-@var{out_channel}}
 form. @var{input_idx} is the 0-based index of the input stream. @var{in_channel}
 can be either the name of the input channel (e.g. FL for front left) or its
@@ -350,7 +573,7 @@
 To build a 5.1 output from 6 single-channel streams:
 @example
 avconv -i fl -i fr -i fc -i sl -i sr -i lfe -filter_complex
-'join=inputs=6:channel_layout=5.1:map=0.0-FL\,1.0-FR\,2.0-FC\,3.0-SL\,4.0-SR\,5.0-LFE'
+'join=inputs=6:channel_layout=5.1:map=0.0-FL|1.0-FR|2.0-FC|3.0-SL|4.0-SR|5.0-LFE'
 out
 @end example
 
@@ -516,23 +739,35 @@
 In order to display the output lines, you need to set the loglevel at
 least to the AV_LOG_INFO value.
 
-The filter accepts the syntax:
-@example
-blackframe[=@var{amount}:[@var{threshold}]]
-@end example
+The filter accepts the following options:
 
-@var{amount} is the percentage of the pixels that have to be below the
-threshold, and defaults to 98.
+@table @option
+
+@item amount
+The percentage of the pixels that have to be below the threshold, defaults to
+98.
 
-@var{threshold} is the threshold below which a pixel value is
-considered black, and defaults to 32.
+@item threshold
+Threshold below which a pixel value is considered black, defaults to 32.
+
+@end table
 
 @section boxblur
 
 Apply boxblur algorithm to the input video.
 
-This filter accepts the parameters:
-@var{luma_power}:@var{luma_radius}:@var{chroma_radius}:@var{chroma_power}:@var{alpha_radius}:@var{alpha_power}
+This filter accepts the following options:
+
+@table @option
+
+@item luma_radius
+@item luma_power
+@item chroma_radius
+@item chroma_power
+@item alpha_radius
+@item alpha_power
+
+@end table
 
 Chroma and alpha parameters are optional, if not specified they default
 to the corresponding values set for @var{luma_radius} and
@@ -570,7 +805,7 @@
 Apply a boxblur filter with luma, chroma, and alpha radius
 set to 2:
 @example
-boxblur=2:1
+boxblur=luma_radius=2:luma_power=1
 @end example
 
 @item
@@ -582,7 +817,7 @@
 @item
 Set luma and chroma radius to a fraction of the video dimension
 @example
-boxblur=min(h\,w)/10:1:min(cw\,ch)/10:1
+boxblur=luma_radius=min(h\,w)/10:luma_power=1:chroma_radius=min(cw\,ch)/10:chroma_power=1
 @end example
 
 @end itemize
@@ -594,7 +829,25 @@
 
 @section crop
 
-Crop the input video to @var{out_w}:@var{out_h}:@var{x}:@var{y}.
+Crop the input video to given dimensions.
+
+This filter accepts the following options:
+
+@table @option
+
+@item out_w
+Width of the output video.
+
+@item out_h
+Height of the output video.
+
+@item x
+Horizontal position, in the input video, of the left edge of the output video.
+
+@item y
+Vertical position, in the input video, of the top edge of the output video.
+
+@end table
 
 The parameters are expressions containing the following constants:
 
@@ -622,9 +875,6 @@
 @item n
 the number of input frame, starting from 0
 
-@item pos
-the position in the file of the input frame, NAN if unknown
-
 @item t
 timestamp expressed in seconds, NAN if the input timestamp is unknown
 
@@ -657,34 +907,34 @@
 Follow some examples:
 @example
 # crop the central input area with size 100x100
-crop=100:100
+crop=out_w=100:out_h=100
 
 # crop the central input area with size 2/3 of the input video
-"crop=2/3*in_w:2/3*in_h"
+"crop=out_w=2/3*in_w:out_h=2/3*in_h"
 
 # crop the input video central square
-crop=in_h
+crop=out_w=in_h
 
 # delimit the rectangle with the top-left corner placed at position
 # 100:100 and the right-bottom corner corresponding to the right-bottom
 # corner of the input image.
-crop=in_w-100:in_h-100:100:100
+crop=out_w=in_w-100:out_h=in_h-100:x=100:y=100
 
 # crop 10 pixels from the left and right borders, and 20 pixels from
 # the top and bottom borders
-"crop=in_w-2*10:in_h-2*20"
+"crop=out_w=in_w-2*10:out_h=in_h-2*20"
 
 # keep only the bottom right quarter of the input image
-"crop=in_w/2:in_h/2:in_w/2:in_h/2"
+"crop=out_w=in_w/2:out_h=in_h/2:x=in_w/2:y=in_h/2"
 
 # crop height for getting Greek harmony
-"crop=in_w:1/PHI*in_w"
+"crop=out_w=in_w:out_h=1/PHI*in_w"
 
 # trembling effect
 "crop=in_w/2:in_h/2:(in_w-out_w)/2+((in_w-out_w)/2)*sin(n/10):(in_h-out_h)/2 +((in_h-out_h)/2)*sin(n/7)"
 
 # erratic camera effect depending on timestamp
-"crop=in_w/2:in_h/2:(in_w-out_w)/2+((in_w-out_w)/2)*sin(t*10):(in_h-out_h)/2 +((in_h-out_h)/2)*sin(t*13)"
+"crop=out_w=in_w/2:out_h=in_h/2:x=(in_w-out_w)/2+((in_w-out_w)/2)*sin(t*10):y=(in_h-out_h)/2 +((in_h-out_h)/2)*sin(t*13)"
 
 # set x depending on the value of y
 "crop=in_w/2:in_h/2:y:10+10*sin(n/10)"
@@ -698,10 +948,7 @@
 parameters through the logging system. The detected dimensions
 correspond to the non-black area of the input video.
 
-It accepts the syntax:
-@example
-cropdetect[=@var{limit}[:@var{round}[:@var{reset}]]]
-@end example
+This filter accepts the following options:
 
 @table @option
 
@@ -731,12 +978,7 @@
 pixels. Just set a rectangle covering the logo and watch it disappear
 (and sometimes something even uglier appear - your mileage may vary).
 
-The filter accepts parameters as a string of the form
-"@var{x}:@var{y}:@var{w}:@var{h}:@var{band}", or as a list of
-@var{key}=@var{value} pairs, separated by ":".
-
-The description of the accepted parameters follows.
-
+This filter accepts the following options:
 @table @option
 
 @item x, y
@@ -766,12 +1008,6 @@
 Set a rectangle covering the area with top left corner coordinates 0,0
 and size 100x77, setting a band of size 10:
 @example
-delogo=0:0:100:77:10
-@end example
-
-@item
-As the previous example, but use named options:
-@example
 delogo=x=0:y=0:w=100:h=77:band=10
 @end example
 
@@ -781,10 +1017,7 @@
 
 Draw a colored box on the input image.
 
-It accepts the syntax:
-@example
-drawbox=@var{x}:@var{y}:@var{width}:@var{height}:@var{color}
-@end example
+This filter accepts the following options:
 
 @table @option
 
@@ -806,7 +1039,7 @@
 drawbox
 
 # draw a box with color red and an opacity of 50%
-drawbox=10:20:200:60:red@@0.5"
+drawbox=x=10:y=20:width=200:height=60:color=red@@0.5"
 @end example
 
 @section drawtext
@@ -820,9 +1053,6 @@
 The filter also recognizes strftime() sequences in the provided text
 and expands them accordingly. Check the documentation of strftime().
 
-The filter accepts parameters as a list of @var{key}=@var{value} pairs,
-separated by ":".
-
 The description of the accepted parameters follows.
 
 @table @option
@@ -976,48 +1206,50 @@
 
 Apply fade-in/out effect to input video.
 
-It accepts the parameters:
-@var{type}:@var{start_frame}:@var{nb_frames}
+This filter accepts the following options:
 
-@var{type} specifies if the effect type, can be either "in" for
-fade-in, or "out" for a fade-out effect.
+@table @option
+
+@item type
+The effect type -- can be either "in" for fade-in, or "out" for a fade-out
+effect.
 
-@var{start_frame} specifies the number of the start frame for starting
-to apply the fade effect.
+@item start_frame
+The number of the start frame for starting to apply the fade effect.
 
-@var{nb_frames} specifies 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.
+@item nb_frames
+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.
+
+@end table
 
 A few usage examples follow, usable too as test scenarios.
 @example
 # fade in first 30 frames of video
-fade=in:0:30
+fade=type=in:nb_frames=30
 
 # fade out last 45 frames of a 200-frame video
-fade=out:155:45
+fade=type=out:start_frame=155:nb_frames=45
 
 # fade in first 25 frames and fade out last 25 frames of a 1000-frame video
-fade=in:0:25, fade=out:975:25
+fade=type=in:start_frame=0:nb_frames=25, fade=type=out:start_frame=975:nb_frames=25
 
 # make first 5 frames black, then fade in from frame 5-24
-fade=in:5:20
+fade=type=in:start_frame=5:nb_frames=20
 @end example
 
 @section fieldorder
 
 Transform the field order of the input video.
 
-It accepts one parameter which specifies the required field order that
-the input interlaced video will be transformed to. The parameter can
-assume one of the following values:
+This filter accepts the following options:
 
 @table @option
-@item 0 or bff
-output bottom field first
-@item 1 or tff
-output top field first
+
+@item order
+Output field order. Valid values are @var{tff} for top field first or @var{bff}
+for bottom field first.
 @end table
 
 Default value is "tff".
@@ -1035,7 +1267,7 @@
 
 For example:
 @example
-./avconv -i in.vob -vf "fieldorder=bff" out.dv
+./avconv -i in.vob -vf "fieldorder=order=bff" out.dv
 @end example
 
 @section fifo
@@ -1053,18 +1285,25 @@
 Libavfilter will try to pick one that is supported for the input to
 the next filter.
 
-The filter accepts a list of pixel format names, separated by ":",
-for example "yuv420p:monow:rgb24".
+This filter accepts the following parameters:
+@table @option
+
+@item pix_fmts
+A '|'-separated list of pixel format names, for example
+"pix_fmts=yuv420p|monow|rgb24".
+
+@end table
 
 Some examples follow:
 @example
 # convert the input video to the format "yuv420p"
-format=yuv420p
+format=pix_fmts=yuv420p
 
 # convert the input video to any of the formats in the list
-format=yuv420p:yuv444p:yuv410p
+format=pix_fmts=yuv420p|yuv444p|yuv410p
 @end example
 
+@anchor{fps}
 @section fps
 
 Convert the video to specified constant framerate by duplicating or dropping
@@ -1076,8 +1315,61 @@
 @item fps
 Desired output framerate.
 
+@item start_time
+Assume the first PTS should be the given value, in seconds. This allows for
+padding/trimming at the start of stream. By default, no assumption is made
+about the first frame's expected PTS, so no padding or trimming is done.
+For example, this could be set to 0 to pad the beginning with duplicates of
+the first frame if a video stream starts after the audio stream or to trim any
+frames with a negative PTS.
+
+@end table
+
+@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.
+avconv -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.
+avconv -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
+
 @anchor{frei0r}
 @section frei0r
 
@@ -1086,20 +1378,22 @@
 To enable compilation of this filter you need to install the frei0r
 header and configure Libav with --enable-frei0r.
 
-The filter supports the syntax:
-@example
-@var{filter_name}[@{:|=@}@var{param1}:@var{param2}:...:@var{paramN}]
-@end example
+This filter accepts the following options:
+
+@table @option
 
-@var{filter_name} is the name to the frei0r effect to load. If the
-environment variable @env{FREI0R_PATH} is defined, the frei0r effect
-is searched in each one of the directories specified by the colon
-separated list in @env{FREIOR_PATH}, otherwise in the standard frei0r
-paths, which are in this order: @file{HOME/.frei0r-1/lib/},
-@file{/usr/local/lib/frei0r-1/}, @file{/usr/lib/frei0r-1/}.
+@item filter_name
+The name to the frei0r effect to load. If the environment variable
+@env{FREI0R_PATH} is defined, the frei0r effect is searched in each one of the
+directories specified by the colon separated list in @env{FREIOR_PATH},
+otherwise in the standard frei0r paths, which are in this order:
+@file{HOME/.frei0r-1/lib/}, @file{/usr/local/lib/frei0r-1/},
+@file{/usr/lib/frei0r-1/}.
 
-@var{param1}, @var{param2}, ... , @var{paramN} specify the parameters
-for the frei0r effect.
+@item filter_params
+A '|'-separated list of parameters to pass to the frei0r effect.
+
+@end table
 
 A frei0r effect parameter can be a boolean (whose values are specified
 with "y" and "n"), a double, a color (specified by the syntax
@@ -1114,7 +1408,7 @@
 Some examples follow:
 @example
 # apply the distort0r effect, set the first two double parameters
-frei0r=distort0r:0.5:0.01
+frei0r=filter_name=distort0r:filter_params=0.5|0.01
 
 # apply the colordistance effect, takes a color as first parameter
 frei0r=colordistance:0.2/0.3/0.4
@@ -1123,7 +1417,7 @@
 
 # apply the perspective effect, specify the top left and top right
 # image positions
-frei0r=perspective:0.2/0.2:0.8/0.2
+frei0r=perspective:0.2/0.2|0.8/0.2
 @end example
 
 For more information see:
@@ -1140,23 +1434,27 @@
 lossy compression, because compression tends to lose the dither and
 bring back the bands.
 
-The filter takes two optional parameters, separated by ':':
-@var{strength}:@var{radius}
+This filter accepts the following options:
+
+@table @option
+
+@item strength
+The maximum amount by which the filter will change any one pixel. Also the
+threshold for detecting nearly flat regions. Acceptable values range from .51 to
+64, default value is 1.2, out-of-range values will be clipped to the valid
+range.
 
-@var{strength} is the maximum amount by which the filter will change
-any one pixel. Also the threshold for detecting nearly flat
-regions. Acceptable values range from .51 to 255, default value is
-1.2, out-of-range values will be clipped to the valid range.
+@item radius
+The neighborhood to fit the gradient to. A larger radius makes for smoother
+gradients, but also prevents the filter from modifying the pixels near detailed
+regions. Acceptable values are 8-32, default value is 16, out-of-range values
+will be clipped to the valid range.
 
-@var{radius} is the neighborhood to fit the gradient to. A larger
-radius makes for smoother gradients, but also prevents the filter from
-modifying the pixels near detailed regions. Acceptable values are
-8-32, default value is 16, out-of-range values will be clipped to the
-valid range.
+@end table
 
 @example
 # default parameters
-gradfun=1.2:16
+gradfun=strength=1.2:radius=16
 
 # omitting radius
 gradfun=1.2
@@ -1178,7 +1476,6 @@
 still. It should enhance compressibility.
 
 It accepts the following optional parameters:
-@var{luma_spatial}:@var{chroma_spatial}:@var{luma_tmp}:@var{chroma_tmp}
 
 @table @option
 @item luma_spatial
@@ -1198,6 +1495,36 @@
 @var{luma_tmp}*@var{chroma_spatial}/@var{luma_spatial}
 @end table
 
+@section interlace
+
+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.
+
+@example
+   Original        Original             New Frame
+   Frame 'j'      Frame 'j+1'             (tff)
+  ==========      ===========       ==================
+    Line 0  -------------------->    Frame 'j' Line 0
+    Line 1          Line 1  ---->   Frame 'j+1' Line 1
+    Line 2 --------------------->    Frame 'j' Line 2
+    Line 3          Line 3  ---->   Frame 'j+1' Line 3
+     ...             ...                   ...
+New Frame + 1 will be generated by Frame 'j+2' and Frame 'j+3' and so on
+@end example
+
+It accepts the following optional parameters:
+
+@table @option
+@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 lut, lutrgb, lutyuv
 
 Compute a look-up table for binding each pixel component input value
@@ -1206,40 +1533,32 @@
 @var{lutyuv} applies a lookup table to a YUV input video, @var{lutrgb}
 to an RGB input video.
 
-These filters accept in input a ":"-separated list of options, which
-specify the expressions used for computing the lookup table for the
-corresponding pixel component values.
-
-The @var{lut} filter requires either YUV or RGB pixel formats in
-input, and accepts the options:
+These filters accept the following options:
 @table @option
 @item @var{c0} (first  pixel component)
 @item @var{c1} (second pixel component)
 @item @var{c2} (third  pixel component)
 @item @var{c3} (fourth pixel component, corresponds to the alpha component)
-@end table
-
-The exact component associated to each option depends on the format in
-input.
 
-The @var{lutrgb} filter requires RGB pixel formats in input, and
-accepts the options:
-@table @option
 @item @var{r} (red component)
 @item @var{g} (green component)
 @item @var{b} (blue component)
 @item @var{a} (alpha component)
-@end table
 
-The @var{lutyuv} filter requires YUV pixel formats in input, and
-accepts the options:
-@table @option
 @item @var{y} (Y/luminance component)
 @item @var{u} (U/Cb component)
 @item @var{v} (V/Cr component)
-@item @var{a} (alpha component)
 @end table
 
+Each of them specifies the expression to use for computing the lookup table for
+the corresponding pixel component values.
+
+The exact component associated to each of the @var{c*} options depends on the
+format in input.
+
+The @var{lut} filter requires either YUV or RGB pixel formats in input,
+@var{lutrgb} requires RGB pixel formats in input, and @var{lutyuv} requires YUV.
+
 The expressions can contain the following constants and functions:
 
 @table @option
@@ -1317,20 +1636,28 @@
 This filter accepts an integer in input, if non-zero it negates the
 alpha component (if available). The default value in input is 0.
 
+@section noformat
+
 Force libavfilter not to use any of the specified pixel formats for the
 input to the next filter.
 
-The filter accepts a list of pixel format names, separated by ":",
-for example "yuv420p:monow:rgb24".
+This filter accepts the following parameters:
+@table @option
+
+@item pix_fmts
+A '|'-separated list of pixel format names, for example
+"pix_fmts=yuv420p|monow|rgb24".
+
+@end table
 
 Some examples follow:
 @example
 # force libavfilter to use a format different from "yuv420p" for the
 # input to the vflip filter
-noformat=yuv420p,vflip
+noformat=pix_fmts=yuv420p,vflip
 
 # convert the input video to any of the formats not contained in the list
-noformat=yuv420p:yuv444p:yuv410p
+noformat=yuv420p|yuv444p|yuv410p
 @end example
 
 @section null
@@ -1344,12 +1671,18 @@
 To enable this filter install libopencv library and headers and
 configure Libav with --enable-libopencv.
 
-The filter takes the parameters: @var{filter_name}@{:=@}@var{filter_params}.
+This filter accepts the following parameters:
 
-@var{filter_name} is the name of the libopencv filter to apply.
+@table @option
+
+@item filter_name
+The name of the libopencv filter to apply.
 
-@var{filter_params} specifies the parameters to pass to the libopencv
-filter. If not specified the default values are assumed.
+@item filter_params
+The parameters to pass to the libopencv filter. If not specified the default
+values are assumed.
+
+@end table
 
 Refer to the official libopencv documentation for more precise
 information:
@@ -1363,7 +1696,7 @@
 Dilate an image by using a specific structuring element.
 This filter corresponds to the libopencv function @code{cvDilate}.
 
-It accepts the parameters: @var{struct_el}:@var{nb_iterations}.
+It accepts the parameters: @var{struct_el}|@var{nb_iterations}.
 
 @var{struct_el} represents a structuring element, and has the syntax:
 @var{cols}x@var{rows}+@var{anchor_x}x@var{anchor_y}/@var{shape}
@@ -1391,7 +1724,7 @@
 ocv=dilate
 
 # dilate using a structuring element with a 5x5 cross, iterate two times
-ocv=dilate=5x5+2x2/cross:2
+ocv=filter_name=dilate:filter_params=5x5+2x2/cross|2
 
 # read the shape from the file diamond.shape, iterate two times
 # the file diamond.shape may contain a pattern of characters like this:
@@ -1401,7 +1734,7 @@
 #  ***
 #   *
 # the specified cols and rows are ignored (but not the anchor point coordinates)
-ocv=0x0+2x2/custom=diamond.shape:2
+ocv=dilate:0x0+2x2/custom=diamond.shape|2
 @end example
 
 @subsection erode
@@ -1417,7 +1750,7 @@
 Smooth the input video.
 
 The filter takes the following parameters:
-@var{type}:@var{param1}:@var{param2}:@var{param3}:@var{param4}.
+@var{type}|@var{param1}|@var{param2}|@var{param3}|@var{param4}.
 
 @var{type} is the type of smooth filter to apply, and can be one of
 the following values: "blur", "blur_no_scale", "median", "gaussian",
@@ -1442,11 +1775,19 @@
 It takes two inputs and one output, the first input is the "main"
 video on which the second input is overlayed.
 
-It accepts the parameters: @var{x}:@var{y}.
+This filter accepts the following parameters:
+
+@table @option
+
+@item x
+The horizontal position of the left edge of the overlaid video on the main video.
 
-@var{x} is the x coordinate of the overlayed video on the main video,
-@var{y} is the y coordinate. The parameters are expressions containing
-the following parameters:
+@item y
+The vertical position of the top edge of the overlaid video on the main video.
+
+@end table
+
+The parameters are expressions containing the following parameters:
 
 @table @option
 @item main_w, main_h
@@ -1460,6 +1801,20 @@
 
 @item w, h
 same as @var{overlay_w} and @var{overlay_h}
+
+@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
+
 @end table
 
 Be aware that frames are taken from each input video in timestamp
@@ -1472,19 +1827,24 @@
 @example
 # draw the overlay at 10 pixels from the bottom right
 # corner of the main video.
-overlay=main_w-overlay_w-10:main_h-overlay_h-10
+overlay=x=main_w-overlay_w-10:y=main_h-overlay_h-10
 
 # insert a transparent PNG logo in the bottom left corner of the input
-avconv -i input -i logo -filter_complex 'overlay=10:main_h-overlay_h-10' output
+avconv -i input -i logo -filter_complex 'overlay=x=10:y=main_h-overlay_h-10' output
 
 # insert 2 different transparent PNG logos (second logo on bottom
 # right corner):
 avconv -i input -i logo1 -i logo2 -filter_complex
-'overlay=10:H-h-10,overlay=W-w-10:H-h-10' output
+'overlay=x=10:y=H-h-10,overlay=x=W-w-10:y=H-h-10' output
 
 # add a transparent color layer on top of the main video,
 # WxH specifies the size of the main input to the overlay filter
 color=red@.3:WxH [over]; [in][over] overlay [out]
+
+# mask 10-20 seconds of a video by applying the delogo filter to a section
+avconv -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
 
 You can chain together more overlays but the efficiency of such
@@ -1495,8 +1855,38 @@
 Add paddings to the input image, and places the original input at the
 given coordinates @var{x}, @var{y}.
 
-It accepts the following parameters:
-@var{width}:@var{height}:@var{x}:@var{y}:@var{color}.
+This filter accepts the following parameters:
+
+@table @option
+@item width, height
+
+Specify the size of the output image with the paddings added. If the
+value for @var{width} or @var{height} is 0, the corresponding input size
+is used for the output.
+
+The @var{width} expression can reference the value set by the
+@var{height} expression, and vice versa.
+
+The default value of @var{width} and @var{height} is 0.
+
+@item x, y
+
+Specify the offsets where to place the input image in the padded area
+with respect to the top/left border of the output image.
+
+The @var{x} expression can reference the value set by the @var{y}
+expression, and vice versa.
+
+The default value of @var{x} and @var{y} is 0.
+
+@item color
+
+Specify the color of the padded area, it can be the name of a color
+(case insensitive match) or a 0xRRGGBB[AA] sequence.
+
+The default value of @var{color} is "black".
+
+@end table
 
 The parameters @var{width}, @var{height}, @var{x}, and @var{y} are
 expressions containing the following constants:
@@ -1531,46 +1921,13 @@
 pixel format "yuv422p" @var{hsub} is 2 and @var{vsub} is 1.
 @end table
 
-Follows the description of the accepted parameters.
-
-@table @option
-@item width, height
-
-Specify the size of the output image with the paddings added. If the
-value for @var{width} or @var{height} is 0, the corresponding input size
-is used for the output.
-
-The @var{width} expression can reference the value set by the
-@var{height} expression, and vice versa.
-
-The default value of @var{width} and @var{height} is 0.
-
-@item x, y
-
-Specify the offsets where to place the input image in the padded area
-with respect to the top/left border of the output image.
-
-The @var{x} expression can reference the value set by the @var{y}
-expression, and vice versa.
-
-The default value of @var{x} and @var{y} is 0.
-
-@item color
-
-Specify the color of the padded area, it can be the name of a color
-(case insensitive match) or a 0xRRGGBB[AA] sequence.
-
-The default value of @var{color} is "black".
-
-@end table
-
 Some examples follow:
 
 @example
 # Add paddings with color "violet" to the input video. Output video
 # size is 640x480, the top-left corner of the input video is placed at
 # column 0, row 40.
-pad=640:480:0:40:violet
+pad=width=640:height=480:x=0:y=40:color=violet
 
 # pad the input to get an output with dimensions increased bt 3/2,
 # and put the input video at the center of the padded area
@@ -1601,11 +1958,24 @@
 
 can be used to test the monowhite pixel format descriptor definition.
 
+@anchor{scale}
 @section scale
 
-Scale the input video to @var{width}:@var{height} and/or convert the image format.
+Scale the input video and/or convert the image format.
+
+This filter accepts the following options:
+
+@table @option
+
+@item w
+Output video width.
+
+@item h
+Output video height.
 
-The parameters @var{width} and @var{height} are expressions containing
+@end table
+
+The parameters @var{w} and @var{h} are expressions containing
 the following constants:
 
 @table @option
@@ -1625,12 +1995,15 @@
 @item ow, oh
 same as @var{out_w} and @var{out_h}
 
-@item dar, a
-input display aspect ratio, same as @var{iw} / @var{ih}
+@item a
+same as @var{iw} / @var{ih}
 
 @item sar
 input sample aspect ratio
 
+@item dar
+input display aspect ratio, it is the same as (@var{iw} / @var{ih}) * @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.
@@ -1640,27 +2013,27 @@
 the next filter, the scale filter will convert the input to the
 requested format.
 
-If the value for @var{width} or @var{height} is 0, the respective input
+If the value for @var{w} or @var{h} is 0, the respective input
 size is used for the output.
 
-If the value for @var{width} or @var{height} is -1, the scale filter will
-use, for the respective output size, a value that maintains the aspect
-ratio of the input image.
+If the value for @var{w} or @var{h} is -1, the scale filter will use, for the
+respective output size, a value that maintains the aspect ratio of the input
+image.
 
-The default value of @var{width} and @var{height} is 0.
+The default value of @var{w} and @var{h} is 0.
 
 Some examples follow:
 @example
 # scale the input video to a size of 200x100.
-scale=200:100
+scale=w=200:h=100
 
 # scale the input to 2x
-scale=2*iw:2*ih
+scale=w=2*iw:h=2*ih
 # the above is the same as
 scale=2*in_w:2*in_h
 
 # scale the input to half size
-scale=iw/2:ih/2
+scale=w=iw/2:h=ih/2
 
 # increase the width, and set the height to the same size
 scale=3/2*iw:ow
@@ -1670,21 +2043,28 @@
 scale=ih*PHI:ih
 
 # increase the height, and set the width to 3/2 of the height
-scale=3/2*oh:3/5*ih
+scale=w=3/2*oh:h=3/5*ih
 
 # increase the size, but make the size a multiple of the chroma
 scale="trunc(3/2*iw/hsub)*hsub:trunc(3/2*ih/vsub)*vsub"
 
 # increase the width to a maximum of 500 pixels, keep the same input aspect ratio
-scale='min(500\, iw*3/2):-1'
+scale=w='min(500\, iw*3/2):h=-1'
 @end example
 
 @section select
 Select frames to pass in output.
 
-It accepts in input an expression, which is evaluated for each input
-frame. If the expression is evaluated to a non-zero value, the frame
-is selected and passed to the output, otherwise it is discarded.
+This filter accepts the following options:
+
+@table @option
+
+@item expr
+An expression, which is evaluated for each input frame. If the expression is
+evaluated to a non-zero value, the frame is selected and passed to the output,
+otherwise it is discarded.
+
+@end table
 
 The expression can contain the following constants:
 
@@ -1760,9 +2140,6 @@
 @item key
 1 if the filtered frame is a key-frame, 0 otherwise
 
-@item pos
-the position in the file of the filtered frame, -1 if the information
-is not available (e.g. for synthetic video)
 @end table
 
 The default value of the select expression is "1".
@@ -1774,13 +2151,13 @@
 select
 
 # the above is the same as:
-select=1
+select=expr=1
 
 # skip all frames:
-select=0
+select=expr=0
 
 # select only I-frames
-select='eq(pict_type\,I)'
+select='expr=eq(pict_type\,I)'
 
 # select one frame every 100
 select='not(mod(n\,100))'
@@ -1809,18 +2186,45 @@
 be changed by later filters in the filterchain, e.g. in case of
 scaling or if another "setdar" or a "setsar" filter is applied.
 
-The filter accepts a parameter string which represents the wanted
-display aspect ratio.
-The parameter can be a floating point number string, or an expression
-of the form @var{num}:@var{den}, where @var{num} and @var{den} are the
-numerator and denominator of the aspect ratio.
-If the parameter is not specified, it is assumed the value "0:1".
+This filter accepts the following options:
+
+@table @option
+
+@item dar
+Output display aspect ratio.
+
+@end table
+
+The parameter @var{dar} 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
 
 For example to change the display aspect ratio to 16:9, specify:
 @example
-setdar=16:9
+setdar=dar=16/9
 # the above is equivalent to
-setdar=1.77777
+setdar=dar=1.77777
 @end example
 
 See also the @ref{setsar} filter documentation.
@@ -1829,8 +2233,17 @@
 
 Change the PTS (presentation timestamp) of the input video frames.
 
-Accept in input an expression evaluated through the eval API, which
-can contain the following constants:
+This filter accepts the following options:
+
+@table @option
+
+@item expr
+The expression which is evaluated for each frame to construct its timestamp.
+
+@end table
+
+The expression is evaluated through the eval API and can contain the following
+constants:
 
 @table @option
 @item PTS
@@ -1854,26 +2267,31 @@
 @item INTERLACED
 tell if the current frame is interlaced
 
-@item POS
-original position in the file of the frame, or undefined if undefined
-for the current frame
-
 @item PREV_INPTS
 previous input PTS
 
 @item PREV_OUTPTS
 previous output PTS
 
+@item RTCTIME
+wallclock (RTC) time in microseconds
+
+@item RTCSTART
+wallclock (RTC) time at the start of the movie in microseconds
+
+@item TB
+timebase of the input timestamps
+
 @end table
 
 Some examples follow:
 
 @example
 # start counting PTS from zero
-setpts=PTS-STARTPTS
+setpts=expr=PTS-STARTPTS
 
 # fast motion
-setpts=0.5*PTS
+setpts=expr=0.5*PTS
 
 # slow motion
 setpts=2.0*PTS
@@ -1883,6 +2301,9 @@
 
 # fixed rate 25 fps with some jitter
 setpts='1/(25*TB) * (N + 0.05 * sin(N*2*PI/25))'
+
+# generate timestamps from a "live source" and rebase onto the current timebase
+setpts='(RTCTIME - RTCSTART) / (TB * 1000000)"
 @end example
 
 @anchor{setsar}
@@ -1899,16 +2320,43 @@
 changed by later filters in the filterchain, e.g. if another "setsar"
 or a "setdar" filter is applied.
 
-The filter accepts a parameter string which represents the wanted
-sample aspect ratio.
-The parameter can be a floating point number string, or an expression
-of the form @var{num}:@var{den}, where @var{num} and @var{den} are the
-numerator and denominator of the aspect ratio.
-If the parameter is not specified, it is assumed the value "0:1".
+This filter accepts the following options:
+
+@table @option
+
+@item sar
+Output sample aspect ratio.
+
+@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
 
 For example to change the sample aspect ratio to 10:11, specify:
 @example
-setsar=10:11
+setsar=sar=10/11
 @end example
 
 @section settb
@@ -1916,7 +2364,15 @@
 Set the timebase to use for the output frames timestamps.
 It is mainly useful for testing timebase configuration.
 
-It accepts in input an arithmetic expression representing a rational.
+This filter accepts the following options:
+
+@table @option
+
+@item expr
+The expression which is evaluated into the output timebase.
+
+@end table
+
 The expression can contain the constants "PI", "E", "PHI", "AVTB" (the
 default timebase), and "intb" (the input timebase).
 
@@ -1926,10 +2382,10 @@
 
 @example
 # set the timebase to 1/25
-settb=1/25
+settb=expr=1/25
 
 # set the timebase to 1/10
-settb=0.1
+settb=expr=0.1
 
 #set the timebase to 1001/1000
 settb=1+0.001
@@ -2017,11 +2473,19 @@
 
 Transpose rows with columns in the input video and optionally flip it.
 
-It accepts a parameter representing an integer, which can assume the
-values:
+This filter accepts the following options:
+
+@table @option
+
+@item dir
+The direction of the transpose.
+
+@end table
+
+The direction can assume the following values:
 
 @table @samp
-@item 0
+@item cclock_flip
 Rotate by 90 degrees counterclockwise and vertically flip (default), that is:
 @example
 L.R     L.l
@@ -2029,7 +2493,7 @@
 l.r     R.r
 @end example
 
-@item 1
+@item clock
 Rotate by 90 degrees clockwise, that is:
 @example
 L.R     l.L
@@ -2037,7 +2501,7 @@
 l.r     r.R
 @end example
 
-@item 2
+@item cclock
 Rotate by 90 degrees counterclockwise, that is:
 @example
 L.R     R.r
@@ -2045,7 +2509,7 @@
 l.r     L.l
 @end example
 
-@item 3
+@item clock_flip
 Rotate by 90 degrees clockwise and vertically flip, that is:
 @example
 L.R     r.R
@@ -2054,16 +2518,72 @@
 @end example
 @end table
 
+@section trim
+Trim the input so that the output contains one continuous subpart of the input.
+
+This filter accepts the following options:
+@table @option
+@item start
+Timestamp (in seconds) of the start of the kept section. I.e. the frame with the
+timestamp @var{start} will be the first frame in the output.
+
+@item end
+Timestamp (in seconds) of the first frame that will be dropped. I.e. the frame
+immediately preceding the one with the timestamp @var{end} will be the last
+frame in the output.
+
+@item start_pts
+Same as @var{start}, except this option sets the start timestamp in timebase
+units instead of seconds.
+
+@item end_pts
+Same as @var{end}, except this option sets the end timestamp in timebase units
+instead of seconds.
+
+@item duration
+Maximum duration of the output in seconds.
+
+@item start_frame
+Number of the first frame that should be passed to output.
+
+@item end_frame
+Number of the first frame that should be dropped.
+@end table
+
+Note that the first two sets of the start/end options and the @option{duration}
+option look at the frame timestamp, while the _frame variants simply count the
+frames that pass through the filter. Also note that this filter does not modify
+the timestamps. If you wish that the output timestamps start at zero, insert a
+setpts filter after the trim filter.
+
+If multiple start or end options are set, this filter tries to be greedy and
+keep all the frames that match at least one of the specified constraints. To keep
+only the part that matches all the constraints at once, chain multiple trim
+filters.
+
+The defaults are such that all the input is kept. So it is possible to set e.g.
+just the end values to keep everything before the specified time.
+
+Examples:
+@itemize
+@item
+drop everything except the second minute of input
+@example
+avconv -i INPUT -vf trim=60:120
+@end example
+
+@item
+keep only the first second
+@example
+avconv -i INPUT -vf trim=duration=1
+@end example
+
+@end itemize
 @section unsharp
 
 Sharpen or blur the input video.
 
 It accepts the following parameters:
-@var{luma_msize_x}:@var{luma_msize_y}:@var{luma_amount}:@var{chroma_msize_x}:@var{chroma_msize_y}:@var{chroma_amount}
-
-Negative values for the amount will blur the input video, while positive
-values will sharpen. All parameters are optional and default to the
-equivalent of the string '5:5:1.0:5:5:0.0'.
 
 @table @option
 
@@ -2087,15 +2607,19 @@
 Set the chroma matrix vertical size. It can be an integer between 3
 and 13, default value is 5.
 
-@item luma_amount
+@item chroma_amount
 Set the chroma effect strength. It can be a float number between -2.0
 and 5.0, default value is 0.0.
 
 @end table
 
+Negative values for the amount will blur the input video, while positive
+values will sharpen. All parameters are optional and default to the
+equivalent of the string '5:5:1.0:5:5:0.0'.
+
 @example
 # Strong luma sharpen effect parameters
-unsharp=7:7:2.5
+unsharp=luma_msize_x=7:luma_msize_y=7:luma_amount=2.5
 
 # Strong blur of both luma and chroma parameters
 unsharp=7:7:-2:7:7:-2
@@ -2117,10 +2641,12 @@
 Deinterlace the input video ("yadif" means "yet another deinterlacing
 filter").
 
-It accepts the optional parameters: @var{mode}:@var{parity}:@var{auto}.
+This filter accepts the following options:
 
-@var{mode} specifies the interlacing mode to adopt, accepts one of the
-following values:
+@table @option
+
+@item mode
+The interlacing mode to adopt, accepts one of the following values:
 
 @table @option
 @item 0
@@ -2135,8 +2661,9 @@
 
 Default value is 0.
 
-@var{parity} specifies the picture field parity assumed for the input
-interlaced video, accepts one of the following values:
+@item parity
+The picture field parity assumed for the input interlaced video, accepts one of
+the following values:
 
 @table @option
 @item 0
@@ -2151,8 +2678,9 @@
 If interlacing is unknown or decoder does not export this information,
 top field first will be assumed.
 
-@var{auto} specifies if deinterlacer should trust the interlaced flag
-and only deinterlace frames marked as interlaced
+@item auto
+Whether deinterlacer should trust the interlaced flag and only deinterlace
+frames marked as interlaced
 
 @table @option
 @item 0
@@ -2163,6 +2691,8 @@
 
 Default value is 0.
 
+@end table
+
 @c man end VIDEO FILTERS
 
 @chapter Video Sources
@@ -2177,55 +2707,41 @@
 This source is mainly intended for a programmatic use, in particular
 through the interface defined in @file{libavfilter/vsrc_buffer.h}.
 
-It accepts the following parameters:
-@var{width}:@var{height}:@var{pix_fmt_string}:@var{timebase_num}:@var{timebase_den}:@var{sample_aspect_ratio_num}:@var{sample_aspect_ratio.den}
+This filter accepts the following parameters:
 
-All the parameters need to be explicitly defined.
+@table @option
 
-Follows the list of the accepted parameters.
+@item width
+Input video width.
 
-@table @option
+@item height
+Input video height.
 
-@item width, height
-Specify the width and height of the buffered video frames.
+@item pix_fmt
+Name of the input video pixel format.
 
-@item pix_fmt_string
-A string representing the pixel format of the buffered video frames.
-It may be a number corresponding to a pixel format, or a pixel format
-name.
+@item time_base
+The time base used for input timestamps.
 
-@item timebase_num, timebase_den
-Specify numerator and denomitor of the timebase assumed by the
-timestamps of the buffered frames.
+@item sar
+Sample (pixel) aspect ratio of the input video.
 
-@item sample_aspect_ratio.num, sample_aspect_ratio.den
-Specify numerator and denominator of the sample aspect ratio assumed
-by the video frames.
 @end table
 
 For example:
 @example
-buffer=320:240:yuv410p:1:24:1:1
+buffer=width=320:height=240:pix_fmt=yuv410p:time_base=1/24:sar=1
 @end example
 
 will instruct the source to accept video frames with size 320x240 and
 with format "yuv410p", assuming 1/24 as the timestamps timebase and
 square pixels (1:1 sample aspect ratio).
-Since the pixel format with name "yuv410p" corresponds to the number 6
-(check the enum AVPixelFormat definition in @file{libavutil/pixfmt.h}),
-this example corresponds to:
-@example
-buffer=320:240:6:1:24
-@end example
 
 @section color
 
 Provide an uniformly colored input.
 
 It accepts the following parameters:
-@var{color}:@var{frame_size}:@var{frame_rate}
-
-Follows the description of the accepted parameters.
 
 @table @option
 
@@ -2234,12 +2750,12 @@
 insensitive match) or a 0xRRGGBB[AA] sequence, possibly followed by an
 alpha specifier. The default value is "black".
 
-@item frame_size
+@item size
 Specify the size of the sourced video, it may be a string of the form
 @var{width}x@var{height}, or the name of a size abbreviation. The
 default value is "320x240".
 
-@item frame_rate
+@item framerate
 Specify the frame rate of the sourced video, as the number of frames
 generated per second. It has to be a string in the format
 @var{frame_rate_num}/@var{frame_rate_den}, an integer number, a float
@@ -2266,16 +2782,14 @@
 is discouraged in those that do. Specifically in @command{avconv} this filter
 should never be used, the @option{-filter_complex} option fully replaces it.
 
-It accepts the syntax: @var{movie_name}[:@var{options}] where
-@var{movie_name} is the name of the resource to read (not necessarily
-a file but also a device or a stream accessed through some protocol),
-and @var{options} is an optional sequence of @var{key}=@var{value}
-pairs, separated by ":".
-
-The description of the accepted options follows.
+This filter accepts the following options:
 
 @table @option
 
+@item filename
+The name of the resource to read (not necessarily a file but also a device or a
+stream accessed through some protocol).
+
 @item format_name, f
 Specifies the format assumed for the movie to read, and can be either
 the name of a container or an input device. If not specified the
@@ -2340,24 +2854,33 @@
 To enable compilation of this filter you need to install the frei0r
 header and configure Libav with --enable-frei0r.
 
-The source supports the syntax:
-@example
-@var{size}:@var{rate}:@var{src_name}[@{=|:@}@var{param1}:@var{param2}:...:@var{paramN}]
-@end example
+This source accepts the following options:
 
-@var{size} is the size of the video to generate, may be a string of the
-form @var{width}x@var{height} or a frame size abbreviation.
-@var{rate} is the rate of the video to generate, may be a string of
-the form @var{num}/@var{den} or a frame rate abbreviation.
-@var{src_name} is the name to the frei0r source to load. For more
-information regarding frei0r and how to set the parameters read the
-section @ref{frei0r} in the description of the video filters.
+@table @option
+
+@item size
+The size of the video to generate, may be a string of the form
+@var{width}x@var{height} or a frame size abbreviation.
+
+@item framerate
+Framerate of the generated video, may be a string of the form
+@var{num}/@var{den} or a frame rate abbreviation.
+
+@item filter_name
+The name to the frei0r source to load. For more information regarding frei0r and
+how to set the parameters read the section @ref{frei0r} in the description of
+the video filters.
+
+@item filter_params
+A '|'-separated list of parameters to pass to the frei0r source.
+
+@end table
 
 Some examples follow:
 @example
 # generate a frei0r partik0l source with size 200x200 and framerate 10
 # which is overlayed on the overlay filter main input
-frei0r_src=200x200:10:partik0l=1234 [overlay]; [in][overlay] overlay
+frei0r_src=size=200x200:framerate=10:filter_name=partik0l:filter_params=1234 [overlay]; [in][overlay] overlay
 @end example
 
 @section rgbtestsrc, testsrc
@@ -2370,8 +2893,7 @@
 color pattern, a scrolling gradient and a timestamp. This is mainly
 intended for testing purposes.
 
-Both sources accept an optional sequence of @var{key}=@var{value} pairs,
-separated by ":". The description of the accepted options follows.
+The sources accept the following options:
 
 @table @option

libav-v9.6.tar.bz2/doc/general.texi -> libav-v10.1.tar.bz2/doc/general.texi Changed

@@ -79,6 +79,14 @@
 installing the library. Then pass @code{--enable-libvpx} to configure to
 enable it.
 
+@section libwavpack
+
+Libav can make use of the libwavpack library for WavPack encoding.
+
+Go to @url{http://www.wavpack.com/} and follow the instructions for
+installing the library. Then pass @code{--enable-libwavpack} to configure to
+enable it.
+
 @section x264
 
 Libav can make use of the x264 library for H.264 encoding.
@@ -104,7 +112,39 @@
 installing the library. Then pass @code{--enable-libilbc} to configure to
 enable it.
 
+@section AviSynth
+
+Libav can read AviSynth scripts as input. To enable support you need a
+suitable @file{avisynth_c.h} header to compile against. The header in
+classic AviSynth's CVS repository is not compatible as it has not been
+updated to support AviSynth 2.6. AviSynth 2.5 is not supported by Libav.
+Once you have the appropriate header, pass @code{--enable-avisynth} to
+configure to enable AviSynth support.
+
+For Windows, supported AviSynth variants are
+@url{http://avisynth.nl, AviSynth 2.6} for 32-bit builds and
+@url{http://avs-plus.net, AviSynth+ 0.1} for 32-bit and 64-bit builds.
+The necessary @file{avisynth_c.h} header is the variant in the @file{extras/}
+directory of the @url{https://www.videolan.org/developers/x264.html, x264}
+source tree. For convenience, this header is also available from a
+@url{https://github.com/qyot27/avisynth_headers, temporary repository}
+along with an installation routine.
+
+For Linux and OS X, the supported AviSynth variant is
+@url{https://github.com/avxsynth/avxsynth, AvxSynth}.
+@file{avxsynth_c.h} is installed as part of the normal
+build routine, as illustrated on
+@url{https://github.com/avxsynth/avxsynth/wiki/System-Setup, AvxSynth's wiki}.
+(the instructions for compiling its prerequisites are outdated, as FFMS 2.18
+or higher is now needed; the list of dependencies to be downloaded from the
+repositories is still the same, though).
 
+@float NOTE
+AviSynth and AvxSynth are loaded dynamically.  Distributors can build Libav
+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 and Codecs
 
@@ -128,7 +168,7 @@
 @item Apple HTTP Live Streaming @tab   @tab X
 @item ASF                       @tab X @tab X
 @item AVI                       @tab X @tab X
-@item AVISynth                  @tab   @tab X
+@item AviSynth                  @tab   @tab X
 @item AVS                       @tab   @tab X
     @tab Multimedia format used by the Creature Shock game.
 @item Beam Software SIFF        @tab   @tab X
@@ -186,6 +226,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 id Quake II CIN video     @tab   @tab X
 @item id RoQ                    @tab X @tab X
     @tab Used in Quake III, Jedi Knight 2, other computer games.
@@ -226,6 +268,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.
@@ -262,6 +306,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   @tab X
 @item raw Ingenient MJPEG       @tab   @tab X
 @item raw MJPEG                 @tab X @tab X
 @item raw MLP                   @tab   @tab X
@@ -373,8 +418,8 @@
     @tab Digital Picture Exchange
 @item JPEG         @tab X @tab X
     @tab Progressive JPEG is not supported.
-@item JPEG 2000    @tab E @tab E
-    @tab decoding supported through external library libopenjpeg
+@item JPEG 2000    @tab E @tab X
+    @tab encoding supported through external library libopenjpeg
 @item JPEG-LS      @tab X @tab X
 @item LJPEG        @tab X @tab
     @tab Lossless JPEG
@@ -404,6 +449,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 E @tab X
+    @tab WebP image format, encoding supported through external library libwebp
 @item XBM  @tab X @tab
     @tab X BitMap image format
 @item XWD  @tab X @tab X
@@ -430,6 +477,7 @@
 @item AMV Video              @tab     @tab  X
     @tab Used in Chinese MP3 players.
 @item ANSI/ASCII art         @tab     @tab  X
+@item Apple Intermediate Codec @tab     @tab  X
 @item Apple MJPEG-B          @tab     @tab  X
 @item Apple ProRes           @tab  X  @tab  X
 @item Apple QuickDraw        @tab     @tab  X
@@ -496,6 +544,7 @@
 @item Electronic Arts TGQ video  @tab     @tab  X
 @item Electronic Arts TQI video  @tab     @tab  X
 @item Escape 124             @tab     @tab  X
+@item Escape 130             @tab     @tab  X
 @item FFmpeg video codec #1  @tab  X  @tab  X
     @tab experimental lossless codec (fourcc: FFV1)
 @item Flash Screen Video v1  @tab  X  @tab  X
@@ -505,12 +554,15 @@
     @tab Sorenson H.263 used in Flash
 @item Forward Uncompressed   @tab     @tab  X
 @item Fraps                  @tab     @tab  X
+@item Go2Webinar             @tab     @tab  X
+    @tab fourcc: G2M4
 @item H.261                  @tab  X  @tab  X
 @item H.263 / H.263-1996     @tab  X  @tab  X
 @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 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)  @tab  E  @tab  X
+@item HEVC                   @tab     @tab  X
+@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
@@ -559,8 +611,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-1/2 video (VDPAU acceleration)  @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.
@@ -578,6 +628,8 @@
     @tab fourcc: VP60,VP61,VP62
 @item VP8                    @tab  E  @tab  X
     @tab fourcc: VP80, encoding supported through external library libvpx
+@item VP9                    @tab  E  @tab  X
+    @tab Encoding supported through external library libvpx
 @item planar RGB             @tab     @tab  X
     @tab fourcc: 8BPS
 @item Q-team QPEG            @tab     @tab  X
@@ -606,8 +658,6 @@
 @item Smacker video          @tab     @tab  X
     @tab Video encoding used in Smacker.
 @item SMPTE VC-1             @tab     @tab  X
-@item Snow                   @tab  X  @tab  X
-    @tab experimental wavelet codec (fourcc: SNOW)
 @item Sony PlayStation MDEC (Motion DECoder)  @tab     @tab  X
 @item Sorenson Vector Quantizer 1  @tab  X  @tab  X
     @tab fourcc: SVQ1
@@ -711,8 +761,9 @@
     @tab encoding supported through external library libvo-amrwbenc
 @item Apple lossless audio   @tab  X  @tab  X
     @tab QuickTime fourcc 'alac'
-@item Atrac 1                @tab     @tab  X
-@item Atrac 3                @tab     @tab  X
+@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 Delphine Software International CIN audio  @tab     @tab  X
@@ -761,7 +812,9 @@
     @tab supported through external library libopus
 @item PCM A-law              @tab  X  @tab  X
 @item PCM mu-law             @tab  X  @tab  X
-@item PCM 16-bit little-endian planar  @tab     @tab  X
+@item PCM signed 16-bit little-endian planar  @tab     @tab  X
+@item PCM signed 24-bit little-endian planar  @tab     @tab  X
+@item PCM signed 32-bit little-endian planar  @tab     @tab  X
 @item PCM 32-bit floating point big-endian  @tab  X  @tab  X
 @item PCM 32-bit floating point little-endian  @tab  X  @tab  X
 @item PCM 64-bit floating point big-endian  @tab  X  @tab  X
@@ -808,7 +861,9 @@
 @item TwinVQ (VQF flavor)    @tab     @tab  X
 @item Vorbis                 @tab  E  @tab  X
     @tab A native but very primitive encoder exists.
-@item WavPack                @tab     @tab  X
+@item Voxware MetaSound      @tab     @tab  X
+@item WavPack                @tab  E  @tab  X
+    @tab supported through external library libwavpack
 @item Westwood Audio (SND1)  @tab     @tab  X
 @item Windows Media Audio 1  @tab  X  @tab  X
 @item Windows Media Audio 2  @tab  X  @tab  X

libav-v9.6.tar.bz2/doc/multithreading.txt -> libav-v10.1.tar.bz2/doc/multithreading.txt Changed

libav-v9.6.tar.bz2/doc/muxers.texi -> libav-v10.1.tar.bz2/doc/muxers.texi Changed

@@ -171,9 +171,99 @@
 @table @option
 @item -start_number @var{number}
 Start the sequence from @var{number}.
+
+@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.
+
 @end table
 
-@section MOV/MP4/ISMV
+@section matroska
+
+Matroska container muxer.
+
+This muxer implements the matroska and webm container specs.
+
+The recognized metadata settings in this muxer are:
+
+@table @option
+
+@item title=@var{title name}
+Name provided to a single track
+@end table
+
+@table @option
+
+@item language=@var{language name}
+Specifies the language of the track in the Matroska languages form
+@end table
+
+@table @option
+
+@item STEREO_MODE=@var{mode}
+Stereo 3D video layout of two views in a single video track
+@table @option
+@item mono
+video is not stereo
+@item left_right
+Both views are arranged side by side, Left-eye view is on the left
+@item bottom_top
+Both views are arranged in top-bottom orientation, Left-eye view is at bottom
+@item top_bottom
+Both views are arranged in top-bottom orientation, Left-eye view is on top
+@item checkerboard_rl
+Each view is arranged in a checkerboard interleaved pattern, Left-eye view being first
+@item checkerboard_lr
+Each view is arranged in a checkerboard interleaved pattern, Right-eye view being first
+@item row_interleaved_rl
+Each view is constituted by a row based interleaving, Right-eye view is first row
+@item row_interleaved_lr
+Each view is constituted by a row based interleaving, Left-eye view is first row
+@item col_interleaved_rl
+Both views are arranged in a column based interleaving manner, Right-eye view is first column
+@item col_interleaved_lr
+Both views are arranged in a column based interleaving manner, Left-eye view is first column
+@item anaglyph_cyan_red
+All frames are in anaglyph format viewable through red-cyan filters
+@item right_left
+Both views are arranged side by side, Right-eye view is on the left
+@item anaglyph_green_magenta
+All frames are in anaglyph format viewable through green-magenta filters
+@item block_lr
+Both eyes laced in one Block, Left-eye view is first
+@item block_rl
+Both eyes laced in one Block, Right-eye view is first
+@end table
+@end table
+
+For example a 3D WebM clip can be created using the following command line:
+@example
+avconv -i sample_left_right_clip.mpg -an -c:v libvpx -metadata STEREO_MODE=left_right -y stereo_clip.webm
+@end example
+
+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
+to leave for the index at the beginning of the file. However for some use cases
+-- e.g. streaming where seeking is possible but slow -- it is useful to put the
+index at the beginning of the file.
+
+If this option is set to a non-zero value, the muxer will reserve a given amount
+of space in the file header and then try to write the cues there when the muxing
+finishes. If the available space does not suffice, muxing will fail. A safe size
+for most use cases should be about 50kB per hour of video.
+
+Note that cues are only written if the output is seekable and this option will
+have no effect if it is not.
+
+@end table
+
+@section mov, mp4, ismv
 
 The mov/mp4/ismv muxer supports fragmentation. Normally, a MOV/MP4
 file has all the metadata about all packets stored in one location
@@ -233,6 +323,10 @@
 pair for each track, making it easier to separate tracks.
 
 This option is implicitly set when writing ismv (Smooth Streaming) files.
+@item -movflags faststart
+Run a second pass moving the index (moov atom) to the beginning of the file.
+This operation can take a while, and will not work in various situations such
+as fragmented output, thus it is not enabled by default.
 @end table
 
 Smooth Streaming content can be pushed in real time to a publishing
@@ -241,6 +335,49 @@
 avconv -re @var{<normal input/transcoding options>} -movflags isml+frag_keyframe -f ismv http://server/publishingpoint.isml/Streams(Encoder1)
 @end example
 
+@section mp3
+
+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. 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.
+
+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
+can be any number of those streams, each will correspond to a single APIC frame.
+The stream metadata tags @var{title} and @var{comment} map to APIC
+@var{description} and @var{picture type} respectively. See
+@url{http://id3.org/id3v2.4.0-frames} for allowed picture types.
+
+Note that the APIC frames must be written at the beginning, so the muxer will
+buffer the audio frames until it gets all the pictures. It is therefore advised
+to provide the pictures as soon as possible to avoid excessive buffering.
+
+Examples:
+
+Write an mp3 with an ID3v2.3 header and an ID3v1 footer:
+@example
+avconv -i INPUT -id3v2_version 3 -write_id3v1 1 out.mp3
+@end example
+
+Attach a picture to an mp3:
+@example
+avconv -i input.mp3 -i cover.png -c copy -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
+avconv -i input.wav -write_xing 0 -id3v2_version 0 out.mp3
+@end example
+
 @section mpegts
 
 MPEG transport stream muxer.
@@ -304,69 +441,21 @@
 avconv -benchmark -i INPUT -f null -
 @end example
 
-@section matroska
-
-Matroska container muxer.
+@section ogg
 
-This muxer implements the matroska and webm container specs.
-
-The recognized metadata settings in this muxer are:
-
-@table @option
-
-@item title=@var{title name}
-Name provided to a single track
-@end table
+Ogg container muxer.
 
 @table @option
-
-@item language=@var{language name}
-Specifies the language of the track in the Matroska languages form
+@item -page_duration @var{duration}
+Preferred page duration, in microseconds. The muxer will attempt to create
+pages that are approximately @var{duration} microseconds long. This allows the
+user to compromise between seek granularity and container overhead. The default
+is 1 second. A value of 0 will fill all segments, making pages as large as
+possible. A value of 1 will effectively use 1 packet-per-page in most
+situations, giving a small seek granularity at the cost of additional container
+overhead.
 @end table
 
-@table @option
-
-@item STEREO_MODE=@var{mode}
-Stereo 3D video layout of two views in a single video track
-@table @option
-@item mono
-video is not stereo
-@item left_right
-Both views are arranged side by side, Left-eye view is on the left
-@item bottom_top
-Both views are arranged in top-bottom orientation, Left-eye view is at bottom
-@item top_bottom
-Both views are arranged in top-bottom orientation, Left-eye view is on top
-@item checkerboard_rl
-Each view is arranged in a checkerboard interleaved pattern, Left-eye view being first
-@item checkerboard_lr
-Each view is arranged in a checkerboard interleaved pattern, Right-eye view being first
-@item row_interleaved_rl
-Each view is constituted by a row based interleaving, Right-eye view is first row
-@item row_interleaved_lr
-Each view is constituted by a row based interleaving, Left-eye view is first row
-@item col_interleaved_rl
-Both views are arranged in a column based interleaving manner, Right-eye view is first column
-@item col_interleaved_lr
-Both views are arranged in a column based interleaving manner, Left-eye view is first column
-@item anaglyph_cyan_red
-All frames are in anaglyph format viewable through red-cyan filters
-@item right_left
-Both views are arranged side by side, Right-eye view is on the left
-@item anaglyph_green_magenta
-All frames are in anaglyph format viewable through green-magenta filters
-@item block_lr
-Both eyes laced in one Block, Left-eye view is first
-@item block_rl
-Both eyes laced in one Block, Right-eye view is first
-@end table
-@end table
-
-For example a 3D WebM clip can be created using the following command line:
-@example
-avconv -i sample_left_right_clip.mpg -an -c:v libvpx -metadata STEREO_MODE=left_right -y stereo_clip.webm
-@end example
-
 @section segment
 
 Basic stream segmenter.
@@ -399,39 +488,4 @@
 avconv -i in.mkv -c copy -map 0 -f segment -list out.list out%03d.nut
 @end example
 
-@section mp3
-
-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.
-
-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 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
-can be any number of those streams, each will correspond to a single APIC frame.
-The stream metadata tags @var{title} and @var{comment} map to APIC
-@var{description} and @var{picture type} respectively. See
-@url{http://id3.org/id3v2.4.0-frames} for allowed picture types.
-
-Note that the APIC frames must be written at the beginning, so the muxer will
-buffer the audio frames until it gets all the pictures. It is therefore advised
-to provide the pictures as soon as possible to avoid excessive buffering.
-
-Examples:
-
-Write an mp3 with an ID3v2.3 header and an ID3v1 footer:
-@example
-avconv -i INPUT -id3v2_version 3 -write_id3v1 1 out.mp3
-@end example
-
-Attach a picture to an mp3:
-@example
-avconv -i input.mp3 -i cover.png -c copy -metadata:s:v title="Album cover"
--metadata:s:v comment="Cover (Front)" out.mp3
-@end example
-
 @c man end MUXERS

libav-v9.6.tar.bz2/doc/nut.texi -> libav-v10.1.tar.bz2/doc/nut.texi Changed

libav-v9.6.tar.bz2/doc/optimization.txt -> libav-v10.1.tar.bz2/doc/optimization.txt Changed

libav-v9.6.tar.bz2/doc/platform.texi -> libav-v10.1.tar.bz2/doc/platform.texi Changed

@@ -51,8 +51,8 @@
 unacelerated code.
 
 OS X on PowerPC or ARM (iPhone) requires a preprocessor from
-@url{http://github.com/yuvi/gas-preprocessor} to build the optimized
-assembler functions. Just download the Perl script and put it somewhere
+@url{git://git.libav.org/gas-preprocessor.git} to build the optimized
+assembler functions. Put the Perl script somewhere
 in your PATH, Libav's configure will pick it up automatically.
 
 OS X on AMD64 and x86 requires @command{yasm} to build most of the
@@ -101,44 +101,53 @@
 
 @end itemize
 
-@section Microsoft Visual C++
+@section Microsoft Visual C++ or Intel C++ Compiler for Windows
 
-Libav can be built with MSVC using a C99-to-C89 conversion utility and
-wrapper.
+Libav 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{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
 you want to run @uref{fate.html, FATE}.
 @end itemize
 
-To set up a proper MSVC environment in MSYS, you simply need to run
-@code{msys.bat} from the Visual Studio command prompt.
+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 MSVC 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:
 
 @example
+For MSVC:
 ./configure --toolchain=msvc
+
+For ICL:
+./configure --toolchain=icl
+
 make
 make install
 @end example
 
 If you wish to compile shared libraries, add @code{--enable-shared} to your
-configure options. Note that due to the way MSVC handles DLL imports and
+configure options. Note that due to the way MSVC and ICL handle DLL imports and
 exports, you cannot compile static and shared libraries at the same time, and
 enabling shared libraries will automatically disable the static ones.
 
@@ -168,7 +177,14 @@
 can see.
 @end enumerate
 
-@item Libav has been tested with Visual Studio 2010 and 2012, Pro and Express.
+@item Libav has been tested with the following on i686 and x86_64:
+@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.
 
 @end itemize
@@ -179,16 +195,7 @@
 to make sure you have @code{Runtime Library} set to
 @code{Multi-threaded (/MT)} in your project's settings.
 
-Libav headers do not declare global data for Windows DLLs through the usual
-dllexport/dllimport interface. Such data will be exported properly while
-building, but to use them in your MSVC code you will have to edit the
-appropriate headers and mark the data as dllimport. For example, in
-libavutil/pixdesc.h you should have:
-@example
-extern __declspec(dllimport) const AVPixFmtDescriptor av_pix_fmt_descriptors[];
-@end example
-
-You will also need to define @code{inline} to something MSVC understands:
+You will need to define @code{inline} to something MSVC understands:
 @example
 #define inline __inline
 @end example

libav-v9.6.tar.bz2/doc/print_options.c -> libav-v10.1.tar.bz2/doc/print_options.c Changed

@@ -27,7 +27,9 @@
 #include <float.h>
 
 #include "libavformat/avformat.h"
+#include "libavformat/options_table.h"
 #include "libavcodec/avcodec.h"
+#include "libavcodec/options_table.h"
 #include "libavutil/opt.h"
 
 static void print_usage(void)
@@ -39,6 +41,9 @@
 
 static void print_option(const AVOption *opts, const AVOption *o, int per_stream)
 {
+ if (!(o->flags & (AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_ENCODING_PARAM)))
+ return;
+
 printf("@item -%s%s @var{", o->name, per_stream ? "[:stream_specifier]" : "");
 switch (o->type) {
 case AV_OPT_TYPE_BINARY: printf("hexadecimal string"); break;
@@ -93,18 +98,14 @@
 
 static void show_format_opts(void)
 {
-#include "libavformat/options_table.h"
-
 printf("@section Format AVOptions\n");
- show_opts(options, 0);
+ show_opts(avformat_options, 0);
 }
 
 static void show_codec_opts(void)
 {
-#include "libavcodec/options_table.h"
-
 printf("@section Codec AVOptions\n");
- show_opts(options, 1);
+ show_opts(avcodec_options, 1);
 }
 
 int main(int argc, char **argv)

libav-v9.6.tar.bz2/doc/protocols.texi -> libav-v10.1.tar.bz2/doc/protocols.texi Changed

@@ -89,6 +89,55 @@
 
 HTTP (Hyper Text Transfer Protocol).
 
+This protocol accepts the following options:
+
+@table @option
+@item chunked_post
+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 multiple_requests
+Use persistent connections if set to 1, default is 0.
+
+@item post_data
+Set custom HTTP post data.
+
+@item user_agent
+Override the User-Agent header. If not specified a string of the form
+"Lavf/<version>" will be used.
+
+@item mime_type
+Export the MIME type.
+
+@item icy
+If set to 1 request ICY (SHOUTcast) metadata from the server. If the server
+supports this, the metadata has to be retrieved by the application by reading
+the @option{icy_metadata_headers} and @option{icy_metadata_packet} options.
+The default is 0.
+
+@item icy_metadata_headers
+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. It should be
+polled in regular intervals by applications interested in mid-stream metadata
+updates.
+
+@item offset
+Set initial byte offset.
+
+@item end_offset
+Try to limit the request to bytes preceding this offset.
+@end table
+
 @section mmst
 
 MMS (Microsoft Media Server) protocol over TCP.
@@ -164,12 +213,18 @@
 
 The required syntax is:
 @example
-rtmp://@var{server}[:@var{port}][/@var{app}][/@var{instance}][/@var{playpath}]
+rtmp://[@var{username}:@var{password}@@]@var{server}[:@var{port}][/@var{app}][/@var{instance}][/@var{playpath}]
 @end example
 
 The accepted parameters are:
 @table @option
 
+@item username
+An optional username (mostly for publishing).
+
+@item password
+An optional password (mostly for publishing).
+
 @item server
 The address of the RTMP server.
 
@@ -220,7 +275,8 @@
 
 @item rtmp_flashver
 Version of the Flash plugin used to run the SWF player. The default
-is LNX 9,0,124,2.
+is LNX 9,0,124,2. (When publishing, the default is FMLE/3.0 (compatible;
+<libavformat version>).)
 
 @item rtmp_flush_interval
 Number of packets flushed in the same request (RTMPT only). The default
@@ -270,6 +326,12 @@
 avplay rtmp://myserver/vod/sample
 @end example
 
+To publish to a password protected server, passing the playpath and
+app names separately:
+@example
+avconv -re -i <input> -f flv -rtmp_playpath some/long/path -rtmp_app long/app/name rtmp://username:password@@myserver/
+@end example
+
 @section rtmpe
 
 Encrypted Real-Time Messaging Protocol.
@@ -310,7 +372,7 @@
 for streaming multimedia content within HTTPS requests to traverse
 firewalls.
 
-@section rtmp, rtmpe, rtmps, rtmpt, rtmpte
+@section librtmp rtmp, rtmpe, rtmps, rtmpt, rtmpte
 
 Real-Time Messaging Protocol and its variants supported through
 librtmp.
@@ -555,6 +617,52 @@
 
 @end table
 
+@section tls
+
+Transport Layer Security (TLS) / Secure Sockets Layer (SSL)
+
+The required syntax for a TLS url is:
+@example
+tls://@var{hostname}:@var{port}
+@end example
+
+The following parameters can be set via command line options
+(or in code via @code{AVOption}s):
+
+@table @option
+
+@item ca_file
+A file containing certificate authority (CA) root certificates to treat
+as trusted. If the linked TLS library contains a default this might not
+need to be specified for verification to work, but not all libraries and
+setups have defaults built in.
+
+@item tls_verify=@var{1|0}
+If enabled, try to verify the peer that we are communicating with.
+Note, if using OpenSSL, this currently only makes sure that the
+peer certificate is signed by one of the root certificates in the CA
+database, but it does not validate that the certificate actually
+matches the host name we are trying to connect to. (With GnuTLS,
+the host name is validated as well.)
+
+This is disabled by default since it requires a CA database to be
+provided by the caller in many cases.
+
+@item cert_file
+A file containing a certificate to use in the handshake with the peer.
+(When operating as server, in listen mode, this is more often required
+by the peer, while client certificates only are mandated in certain
+setups.)
+
+@item key_file
+A file containing the private key for the certificate.
+
+@item listen=@var{1|0}
+If enabled, listen for connections on the provided port, and assume
+the server role in the handshake instead of the client role.
+
+@end table
+
 @section udp
 
 User Datagram Protocol.
@@ -564,7 +672,7 @@
 udp://@var{hostname}:@var{port}[?@var{options}]
 @end example
 
-@var{options} contains a list of &-seperated options of the form @var{key}=@var{val}.
+@var{options} contains a list of &-separated options of the form @var{key}=@var{val}.
 Follow the list of supported options.
 
 @table @option
@@ -626,4 +734,24 @@
 avconv -i udp://[@var{multicast-address}]:@var{port}
 @end example
 
+@section unix
+
+Unix local socket
+
+The required syntax for a Unix socket URL is:
+
+@example
+unix://@var{filepath}
+@end example
+
+The following parameters can be set via command line options
+(or in code via @code{AVOption}s):
+
+@table @option
+@item timeout
+Timeout in ms.
+@item listen
+Create the Unix socket in listening mode.
+@end table
+
 @c man end PROTOCOLS

libav-v9.6.tar.bz2/doc/t2h.init -> libav-v10.1.tar.bz2/doc/t2h.init Changed

libav-v9.6.tar.bz2/doc/texi2pod.pl -> libav-v10.1.tar.bz2/doc/texi2pod.pl Changed

@@ -1,4 +1,4 @@
-#! /usr/bin/perl -w
+#!/usr/bin/env perl
 
 # Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
 
@@ -23,6 +23,8 @@
 # markup to Perl POD format. It's intended to be used to extract
 # something suitable for a manpage from a Texinfo document.
 
+use warnings;
+
 $output = 0;
 $skipping = 0;
 %sects = ();
@@ -161,7 +163,7 @@
 } elsif ($ended =~ /^(?:example|smallexample|display)$/) {
 $shift = "";
 $_ = ""; # need a paragraph break
- } elsif ($ended =~ /^(?:itemize|enumerate|[fv]?table)$/) {
+ } elsif ($ended =~ /^(?:itemize|enumerate|(?:multi|[fv])?table)$/) {
 $_ = "\n=back\n";
 $ic = pop @icstack;
 } else {
@@ -262,7 +264,7 @@
 $endw = "enumerate";
 };
 
- /^\@([fv]?table)\s+(\@[a-z]+)/ and do {
+ /^\@((?:multi|[fv])?table)\s+(\@[a-z]+)/ and do {
 push @endwstack, $endw;
 push @icstack, $ic;
 $endw = $1;
@@ -271,6 +273,7 @@
 $ic =~ s/\@(?:code|kbd)/C/;
 $ic =~ s/\@(?:dfn|var|emph|cite|i)/I/;
 $ic =~ s/\@(?:file)/F/;
+ $ic =~ s/\@(?:columnfractions)//;
 $_ = "\n=over 4\n";
 };
 
@@ -281,6 +284,21 @@
 $_ = ""; # need a paragraph break
 };
 
+ /^\@item\s+(.*\S)\s*$/ and $endw eq "multitable" and do {
+ my $columns = $1;
+ $columns =~ s/\@tab/ : /;
+
+ $_ = "\n=item B&LT;". $columns ."&GT;\n";
+ };
+
+ /^\@tab\s+(.*\S)\s*$/ and $endw eq "multitable" and do {
+ my $columns = $1;
+ $columns =~ s/\@tab/ : /;
+
+ $_ = " : ". $columns;
+ $section =~ s/\n+\s+$//;
+ };
+
 /^\@itemx?\s*(.+)?$/ and do {
 if (defined $1) {
 # Entity escapes prevent munging by the <> processing below.

libav-v9.6.tar.bz2/libavcodec/4xm.c -> libav-v10.1.tar.bz2/libavcodec/4xm.c Changed

@@ -24,6 +24,8 @@
 * 4XM codec.
 */
 
+#include "libavutil/frame.h"
+#include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "bytestream.h"
@@ -31,9 +33,6 @@
 #include "get_bits.h"
 #include "internal.h"
 
-//#undef NDEBUG
-//#include <assert.h>
-
 #define BLOCK_TYPE_VLC_BITS 5
 #define ACDC_VLC_BITS 9
 
@@ -131,7 +130,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;
@@ -139,7 +139,7 @@
 int mv[256];
 VLC pre_vlc;
 int last_dc;
- DECLARE_ALIGNED(16, DCTELEM, block)[6][64];
+ DECLARE_ALIGNED(16, int16_t, block)[6][64];
 void *bitstream_buffer;
 unsigned int bitstream_buffer_size;
 int version;
@@ -154,7 +154,7 @@
 
 #define MULTIPLY(var, const) (((var) * (const)) >> 16)
 
-static void idct(DCTELEM block[64])
+static void idct(int16_t block[64])
 {
 int tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
 int tmp10, tmp11, tmp12, tmp13;
@@ -256,15 +256,15 @@
 }
 }
 
-static void init_mv(FourXContext *f)
+static void init_mv(FourXContext *f, int linesize)
 {
 int i;
 
 for (i = 0; i < 256; i++) {
 if (f->version > 1)
- f->mv[i] = mv[i][0] + mv[i][1] * f->current_picture.linesize[0] / 2;
+ f->mv[i] = mv[i][0] + mv[i][1] * linesize / 2;
 else
- f->mv[i] = (i & 15) - 8 + ((i >> 4) - 8) * f->current_picture.linesize[0] / 2;
+ f->mv[i] = (i & 15) - 8 + ((i >> 4) - 8) * linesize / 2;
 }
 }
 
@@ -329,51 +329,41 @@
 }
 break;
 default:
- assert(0);
+ break;
 }
 }
 
-static void decode_p_block(FourXContext *f, uint16_t *dst, uint16_t *src,
- int log2w, int log2h, int stride)
+static int decode_p_block(FourXContext *f, uint16_t *dst, uint16_t *src,
+ int log2w, int log2h, int stride)
 {
 const int index = size2index[log2h][log2w];
 const int h = 1 << log2h;
 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;
+ unsigned dc = 0;
 
- assert(code >= 0 && code <= 6);
+ if (code < 0 || code > 6 || log2w < 0)
+ return AVERROR_INVALIDDATA;
 
- if (code == 0) {
- src += f->mv[bytestream2_get_byte(&f->g)];
- if (start > src || src > end) {
- av_log(f->avctx, AV_LOG_ERROR, "mv out of pic\n");
- return;
- }
- mcdc(dst, src, log2w, h, stride, 1, 0);
- } else if (code == 1) {
+ if (code == 1) {
 log2h--;
- decode_p_block(f, dst, src, log2w, log2h, stride);
- decode_p_block(f, dst + (stride << log2h),
- src + (stride << log2h), log2w, log2h, stride);
+ if ((ret = decode_p_block(f, dst, src, log2w, log2h, stride)) < 0)
+ return ret;
+ return decode_p_block(f, dst + (stride << log2h),
+ src + (stride << log2h),
+ log2w, log2h, stride);
 } else if (code == 2) {
 log2w--;
- decode_p_block(f, dst , src, log2w, log2h, stride);
- decode_p_block(f, dst + (1 << log2w),
- src + (1 << log2w), log2w, log2h, stride);
- } else if (code == 3 && f->version < 2) {
- mcdc(dst, src, log2w, h, stride, 1, 0);
- } else if (code == 4) {
- src += f->mv[bytestream2_get_byte(&f->g)];
- if (start > src || src > end) {
- av_log(f->avctx, AV_LOG_ERROR, "mv out of pic\n");
- return;
- }
- mcdc(dst, src, log2w, h, stride, 1, bytestream2_get_le16(&f->g2));
- } else if (code == 5) {
- mcdc(dst, src, log2w, h, stride, 0, bytestream2_get_le16(&f->g2));
+ if ((ret = decode_p_block(f, dst , src, log2w, log2h, stride)) < 0)
+ return ret;
+ return decode_p_block(f, dst + (1 << log2w),
+ src + (1 << log2w),
+ log2w, log2h, stride);
 } else if (code == 6) {
 if (log2w) {
 dst[0] = bytestream2_get_le16(&f->g2);
@@ -382,7 +372,29 @@
 dst[0] = bytestream2_get_le16(&f->g2);
 dst[stride] = bytestream2_get_le16(&f->g2);
 }
+ return 0;
+ }
+
+ if (code == 0) {
+ src += f->mv[bytestream2_get_byte(&f->g)];
+ } else if (code == 3 && f->version >= 2) {
+ return 0;
+ } else if (code == 4) {
+ src += f->mv[bytestream2_get_byte(&f->g)];
+ dc = bytestream2_get_le16(&f->g2);
+ } else if (code == 5) {
+ scale = 0;
+ dc = bytestream2_get_le16(&f->g2);
+ }
+
+ if (start > src || src > end) {
+ av_log(f->avctx, AV_LOG_ERROR, "mv out of pic\n");
+ return AVERROR_INVALIDDATA;
 }
+
+ mcdc(dst, src, log2w, h, stride, scale, dc);
+
+ return 0;
 }
 
 static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length)
@@ -390,13 +402,17 @@
 int x, y;
 const int width = f->avctx->width;
 const int height = f->avctx->height;
- uint16_t *src = (uint16_t *)f->last_picture.data[0];
- uint16_t *dst = (uint16_t *)f->current_picture.data[0];
- const int stride = f->current_picture.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;
+
+ src = f->last_frame_buffer;
 
 if (f->version > 1) {
+ if (length < 20)
+ return AVERROR_INVALIDDATA;
 extra = 20;
 bitstream_size = AV_RL32(buf + 8);
 wordstream_size = AV_RL32(buf + 12);
@@ -415,7 +431,7 @@
 av_log(f->avctx, AV_LOG_ERROR, "lengths %d %d %d %d\n",
 bitstream_size, bytestream_size, wordstream_size,
 bitstream_size + bytestream_size + wordstream_size - length);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 av_fast_malloc(&f->bitstream_buffer, &f->bitstream_buffer_size,
@@ -435,13 +451,14 @@
 bytestream2_init(&f->g, buf + bytestream_offset,
 length - bytestream_offset);
 
- init_mv(f);
+ init_mv(f, width * 2);
 
 for (y = 0; y < height; y += 8) {
 for (x = 0; x < width; x += 8)
- decode_p_block(f, dst + x, src + x, 3, 3, stride);
- src += 8 * stride;
- dst += 8 * stride;
+ if ((ret = decode_p_block(f, dst + x, src + x, 3, 3, width)) < 0)
+ return ret;
+ src += 8 * width;
+ dst += 8 * width;
 }
 
 return 0;
@@ -451,7 +468,7 @@
 * decode block and dequantize.
 * Note this is almost identical to MJPEG.
 */
-static int decode_i_block(FourXContext *f, DCTELEM *block)
+static int decode_i_block(FourXContext *f, int16_t *block)
 {
 int code, i, j, level, val;
 
@@ -496,10 +513,10 @@
 
 static inline void idct_put(FourXContext *f, int x, int y)
 {
- DCTELEM (*block)[64] = f->block;
- int stride = f->current_picture.linesize[0] >> 1;
+ int16_t (*block)[64] = f->block;
+ int stride = f->avctx->width;
 int i;
- uint16_t *dst = ((uint16_t*)f->current_picture.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;
@@ -517,7 +534,7 @@
 * cr = (-1b - 4g + 5r) / 14 */
 for (y = 0; y < 8; y++) {
 for (x = 0; x < 8; x++) {
- DCTELEM *temp = block[(x >> 2) + 2 * (y >> 2)] +
+ int16_t *temp = block[(x >> 2) + 2 * (y >> 2)] +
 2 * (x & 3) + 2 * 8 * (y & 3); // FIXME optimize
 int cb = block[4][x + 8 * y];
 int cr = block[5][x + 8 * y];
@@ -542,19 +559,21 @@
 
 static int decode_i_mb(FourXContext *f)
 {
+ int ret;
 int i;
 
 f->dsp.clear_blocks(f->block[0]);
 
 for (i = 0; i < 6; i++)
- if (decode_i_block(f, f->block[i]) < 0)
- return -1;
+ if ((ret = decode_i_block(f, f->block[i])) < 0)
+ return ret;
 
 return 0;
 }
 
 static const uint8_t *read_huffman_tables(FourXContext *f,
- const uint8_t * const buf)
+ const uint8_t * const buf,
+ int len)
 {
 int frequency[512] = { 0 };
 uint8_t flag[512];
@@ -572,12 +591,20 @@
 for (;;) {
 int i;
 
+ len -= end - start + 1;
+
+ if (end < start || len < 0)
+ return NULL;
+
 for (i = start; i <= end; i++)
 frequency[i] = *ptr++;
 start = *ptr++;
 if (start == 0)
 break;
 
+ if (--len < 0)
+ return NULL;
+
 end = *ptr++;
 }
 frequency[256] = 1;
@@ -652,8 +679,7 @@
 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*)f->current_picture.data[0];
- const int stride = f->current_picture.linesize[0]>>1;
+ uint16_t *dst = f->frame_buffer;
 GetByteContext g3;
 
 if (length < mbs * 8) {
@@ -670,9 +696,9 @@
 color[1] = bytestream2_get_le16u(&g3);
 
 if (color[0] & 0x8000)
- av_log(NULL, AV_LOG_ERROR, "unk bit 1\n");
+ av_log(f->avctx, AV_LOG_ERROR, "unk bit 1\n");
 if (color[1] & 0x8000)
- av_log(NULL, AV_LOG_ERROR, "unk bit 2\n");
+ av_log(f->avctx, AV_LOG_ERROR, "unk bit 2\n");
 
 color[2] = mix(color[0], color[1]);
 color[3] = mix(color[1], color[0]);
@@ -681,12 +707,12 @@
 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;
@@ -694,7 +720,7 @@
 
 static int decode_i_frame(FourXContext *f, const uint8_t *buf, int length)
 {
- int x, y;
+ int x, y, ret;
 const int width = f->avctx->width;
 const int height = f->avctx->height;
 const unsigned int bitstream_size = AV_RL32(buf);
@@ -702,6 +728,9 @@
 unsigned int prestream_size;
 const uint8_t *prestream;
 
+ if (bitstream_size > (1 << 26))
+ return AVERROR_INVALIDDATA;
+
 if (length < bitstream_size + 12) {
 av_log(f->avctx, AV_LOG_ERROR, "packet size too small\n");
 return AVERROR_INVALIDDATA;
@@ -712,14 +741,13 @@
 prestream = buf + bitstream_size + 12;
 
 if (prestream_size + bitstream_size + 12 != length
- || bitstream_size > (1 << 26)
 || prestream_size > (1 << 26)) {
 av_log(f->avctx, AV_LOG_ERROR, "size mismatch %d %d %d\n",
 prestream_size, bitstream_size, length);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- prestream = read_huffman_tables(f, prestream);
+ prestream = read_huffman_tables(f, prestream, prestream_size);
 if (!prestream) {
 av_log(f->avctx, AV_LOG_ERROR, "Error reading Huffman tables.\n");
 return AVERROR_INVALIDDATA;
@@ -743,8 +771,8 @@
 
 for (y = 0; y < height; y += 16) {
 for (x = 0; x < width; x += 16) {
- if (decode_i_mb(f) < 0)
- return -1;
+ if ((ret = decode_i_mb(f)) < 0)
+ return ret;
 
 idct_put(f, x, y);
 }
@@ -763,21 +791,37 @@
 int buf_size = avpkt->size;
 FourXContext *const f = avctx->priv_data;
 AVFrame *picture = data;
- AVFrame *p, temp;
- int i, frame_4cc, frame_size;
+ int i, frame_4cc, frame_size, ret;
 
- frame_4cc = AV_RL32(buf);
- if (buf_size != AV_RL32(buf + 4) + 8 || buf_size < 20)
+ if (buf_size < 20)
+ return AVERROR_INVALIDDATA;
+
+ if (avctx->width % 16 || avctx->height % 16) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Dimensions non-multiple of 16 are invalid.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (buf_size < AV_RL32(buf + 4) + 8) {
 av_log(f->avctx, AV_LOG_ERROR, "size mismatch %d %d\n",
 buf_size, AV_RL32(buf + 4));
+ return AVERROR_INVALIDDATA;
+ }
+
+ frame_4cc = AV_RL32(buf);
 
 if (frame_4cc == AV_RL32("cfrm")) {
 int free_index = -1;
+ int id, whole_size;
 const int data_size = buf_size - 20;
- const int id = AV_RL32(buf + 12);
- const int whole_size = AV_RL32(buf + 16);
 CFrameBuffer *cfrm;
 
+ if (data_size < 0)
+ return AVERROR_INVALIDDATA;
+
+ id = AV_RL32(buf + 12);
+ whole_size = AV_RL32(buf + 16);
+
 for (i = 0; i < CFRAME_BUFFER_COUNT; i++)
 if (f->cfrm[i].id && f->cfrm[i].id < avctx->frame_number)
 av_log(f->avctx, AV_LOG_ERROR, "lost c frame %d\n",
@@ -801,7 +845,7 @@
 // explicit check needed as memcpy below might not catch a NULL
 if (!cfrm->data) {
 av_log(f->avctx, AV_LOG_ERROR, "realloc failure");
- return -1;
+ return AVERROR(ENOMEM);
 }
 
 memcpy(cfrm->data + cfrm->size, buf + 20, data_size);
@@ -815,6 +859,9 @@
 av_log(f->avctx, AV_LOG_ERROR, "cframe id mismatch %d %d\n",
 id, avctx->frame_number);
 
+ if (f->version <= 1)
+ return AVERROR_INVALIDDATA;
+
 cfrm->size = cfrm->id = 0;
 frame_4cc = AV_RL32("pfrm");
 } else
@@ -824,46 +871,24 @@
 frame_size = buf_size - 12;
 }
 
- temp = f->current_picture;
- f->current_picture = f->last_picture;
- f->last_picture = temp;
-
- p = &f->current_picture;
- avctx->coded_frame = p;
-
- // alternatively we would have to use our own buffer management
- avctx->flags |= CODEC_FLAG_EMU_EDGE;
-
- if (p->data[0])
- avctx->release_buffer(avctx, p);
 
- p->reference = 1;
- if (ff_get_buffer(avctx, p) < 0) {
+ if ((ret = ff_get_buffer(avctx, picture, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 if (frame_4cc == AV_RL32("ifr2")) {
- p->pict_type = AV_PICTURE_TYPE_I;
- if (decode_i2_frame(f, buf - 4, frame_size + 4) < 0)
- return -1;
+ picture->pict_type = AV_PICTURE_TYPE_I;
+ if ((ret = decode_i2_frame(f, buf - 4, frame_size + 4)) < 0)
+ return ret;
 } else if (frame_4cc == AV_RL32("ifrm")) {
- p->pict_type = AV_PICTURE_TYPE_I;
- if (decode_i_frame(f, buf, frame_size) < 0)
- return -1;
+ picture->pict_type = AV_PICTURE_TYPE_I;
+ if ((ret = decode_i_frame(f, buf, frame_size)) < 0)
+ return ret;
 } else if (frame_4cc == AV_RL32("pfrm") || frame_4cc == AV_RL32("pfr2")) {
- if (!f->last_picture.data[0]) {
- f->last_picture.reference = 1;
- if (ff_get_buffer(avctx, &f->last_picture) < 0) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
- }
- memset(f->last_picture.data[0], 0, avctx->height * FFABS(f->last_picture.linesize[0]));
- }
-
- p->pict_type = AV_PICTURE_TYPE_P;
- if (decode_p_frame(f, buf, frame_size) < 0)
- return -1;
+ picture->pict_type = AV_PICTURE_TYPE_P;
+ if ((ret = decode_p_frame(f, buf, frame_size)) < 0)
+ return ret;
 } else if (frame_4cc == AV_RL32("snd_")) {
 av_log(avctx, AV_LOG_ERROR, "ignoring snd_ chunk length:%d\n",
 buf_size);
@@ -872,9 +897,13 @@
 buf_size);
 }
 
- p->key_frame = p->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);
 
- *picture = *p;
 *got_frame = 1;
 
 emms_c();
@@ -882,27 +911,48 @@
 return buf_size;
 }
 
-
-static av_cold void common_init(AVCodecContext *avctx)
+static av_cold int decode_end(AVCodecContext *avctx)
 {
 FourXContext * const f = avctx->priv_data;
+ int i;
 
- ff_dsputil_init(&f->dsp, avctx);
+ 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);
 
- f->avctx = avctx;
+ 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");
- return 1;
+ 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;
- common_init(avctx);
+ ff_dsputil_init(&f->dsp, avctx);
+ f->avctx = avctx;
 init_vlcs(f);
 
 if (f->version > 2)
@@ -913,29 +963,9 @@
 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);
- if (f->current_picture.data[0])
- avctx->release_buffer(avctx, &f->current_picture);
- if (f->last_picture.data[0])
- avctx->release_buffer(avctx, &f->last_picture);
-
- return 0;
-}
-
 AVCodec ff_fourxm_decoder = {
 .name = "4xm",
+ .long_name = NULL_IF_CONFIG_SMALL("4X Movie"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_4XM,
 .priv_data_size = sizeof(FourXContext),
@@ -943,5 +973,4 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("4X Movie"),
 };

libav-v9.6.tar.bz2/libavcodec/8bps.c -> libav-v10.1.tar.bz2/libavcodec/8bps.c Changed

@@ -46,7 +46,6 @@
 
 typedef struct EightBpsContext {
 AVCodecContext *avctx;
- AVFrame pic;
 
 unsigned char planes;
 unsigned char planemap[4];
@@ -57,6 +56,7 @@
 static int 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;
 EightBpsContext * const c = avctx->priv_data;
@@ -64,22 +64,20 @@
 unsigned char *pixptr, *pixptr_end;
 unsigned int height = avctx->height; // Real image height
 unsigned int dlen, p, row;
- const unsigned char *lp, *dp;
+ const unsigned char *lp, *dp, *ep;
 unsigned char count;
 unsigned int px_inc;
 unsigned int planes = c->planes;
 unsigned char *planemap = c->planemap;
+ int ret;
 
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
-
- c->pic.reference = 0;
- c->pic.buffer_hints = FF_BUFFER_HINTS_VALID;
- if (ff_get_buffer(avctx, &c->pic) < 0){
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
+ ep = encoded + buf_size;
+
 /* Set data pointer after line lengths */
 dp = encoded + planes * (height << 1);
 
@@ -95,27 +93,29 @@
 
 /* Decode a plane */
 for (row = 0; row < height; row++) {
- pixptr = c->pic.data[0] + row * c->pic.linesize[0] + planemap[p];
- pixptr_end = pixptr + c->pic.linesize[0];
+ pixptr = frame->data[0] + row * frame->linesize[0] + planemap[p];
+ pixptr_end = pixptr + frame->linesize[0];
+ if (ep - lp < row * 2 + 2)
+ return AVERROR_INVALIDDATA;
 dlen = av_be2ne16(*(const unsigned short *)(lp + row * 2));
 /* Decode a row of this plane */
 while (dlen > 0) {
- if (dp + 1 >= buf + buf_size)
- return -1;
+ if (ep - dp <= 1)
+ return AVERROR_INVALIDDATA;
 if ((count = *dp++) <= 127) {
 count++;
 dlen -= count + 1;
- if (pixptr + count * px_inc > pixptr_end)
+ if (pixptr_end - pixptr < count * px_inc)
 break;
- if (dp + count > buf + buf_size)
- return -1;
+ if (ep - dp < count)
+ return AVERROR_INVALIDDATA;
 while (count--) {
 *pixptr = *dp++;
 pixptr += px_inc;
 }
 } else {
 count = 257 - count;
- if (pixptr + count * px_inc > pixptr_end)
+ if (pixptr_end - pixptr < count * px_inc)
 break;
 while (count--) {
 *pixptr = *dp;
@@ -133,15 +133,14 @@
 AV_PKT_DATA_PALETTE,
 NULL);
 if (pal) {
- c->pic.palette_has_changed = 1;
+ frame->palette_has_changed = 1;
 memcpy(c->pal, pal, AVPALETTE_SIZE);
 }
 
- memcpy (c->pic.data[1], c->pal, AVPALETTE_SIZE);
+ memcpy (frame->data[1], c->pal, AVPALETTE_SIZE);
 }
 
 *got_frame = 1;
- *(AVFrame*)data = c->pic;
 
 /* always report that the buffer was completely consumed */
 return buf_size;
@@ -152,7 +151,6 @@
 EightBpsContext * const c = avctx->priv_data;
 
 c->avctx = avctx;
- c->pic.data[0] = NULL;
 
 switch (avctx->bits_per_coded_sample) {
 case 8:
@@ -170,45 +168,30 @@
 case 32:
 avctx->pix_fmt = AV_PIX_FMT_RGB32;
 c->planes = 4;
-#if HAVE_BIGENDIAN
- c->planemap[0] = 1; // 1st plane is red
- c->planemap[1] = 2; // 2nd plane is green
- c->planemap[2] = 3; // 3rd plane is blue
- c->planemap[3] = 0; // 4th plane is alpha???
-#else
- c->planemap[0] = 2; // 1st plane is red
- c->planemap[1] = 1; // 2nd plane is green
- c->planemap[2] = 0; // 3rd plane is blue
- c->planemap[3] = 3; // 4th plane is alpha???
-#endif
+ /* handle planemap setup later for decoding rgb24 data as rbg32 */
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "Error: Unsupported color depth: %u.\n",
 avctx->bits_per_coded_sample);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- return 0;
-}
-
-static av_cold int decode_end(AVCodecContext *avctx)
-{
- EightBpsContext * const c = avctx->priv_data;
-
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
-
+ if (avctx->pix_fmt == AV_PIX_FMT_RGB32) {
+ c->planemap[0] = HAVE_BIGENDIAN ? 1 : 2; // 1st plane is red
+ c->planemap[1] = HAVE_BIGENDIAN ? 2 : 1; // 2nd plane is green
+ c->planemap[2] = HAVE_BIGENDIAN ? 3 : 0; // 3rd plane is blue
+ c->planemap[3] = HAVE_BIGENDIAN ? 0 : 3; // 4th plane is alpha???
+ }
 return 0;
 }
 
 AVCodec ff_eightbps_decoder = {
 .name = "8bps",
+ .long_name = NULL_IF_CONFIG_SMALL("QuickTime 8BPS video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_8BPS,
 .priv_data_size = sizeof(EightBpsContext),
 .init = decode_init,
- .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("QuickTime 8BPS video"),
 };

libav-v9.6.tar.bz2/libavcodec/8svx.c -> libav-v10.1.tar.bz2/libavcodec/8svx.c Changed

@@ -34,7 +34,6 @@
 
 /** decoder context */
 typedef struct EightSvxContext {
- AVFrame frame;
 uint8_t fib_acc[2];
 const int8_t *table;
 
@@ -85,6 +84,7 @@
 int *got_frame_ptr, AVPacket *avpkt)
 {
 EightSvxContext *esc = avctx->priv_data;
+ AVFrame *frame = data;
 int buf_size;
 int ch, ret;
 int is_compr = (avctx->codec_id != AV_CODEC_ID_PCM_S8_PLANAR);
@@ -136,26 +136,25 @@
 }
 
 /* get output buffer */
- esc->frame.nb_samples = buf_size * (is_compr + 1);
- if ((ret = ff_get_buffer(avctx, &esc->frame)) < 0) {
+ frame->nb_samples = buf_size * (is_compr + 1);
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
 
 for (ch = 0; ch < avctx->channels; ch++) {
 if (is_compr) {
- delta_decode(esc->frame.data[ch], &esc->data[ch][esc->data_idx],
+ delta_decode(frame->data[ch], &esc->data[ch][esc->data_idx],
 buf_size, &esc->fib_acc[ch], esc->table);
 } else {
- raw_decode(esc->frame.data[ch], &esc->data[ch][esc->data_idx],
+ raw_decode(frame->data[ch], &esc->data[ch][esc->data_idx],
 buf_size);
 }
 }
 
 esc->data_idx += buf_size;
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = esc->frame;
+ *got_frame_ptr = 1;
 
 return avpkt->size;
 }
@@ -184,9 +183,6 @@
 }
 avctx->sample_fmt = AV_SAMPLE_FMT_U8P;
 
- avcodec_get_frame_defaults(&esc->frame);
- avctx->coded_frame = &esc->frame;
-
 return 0;
 }
 
@@ -202,6 +198,7 @@
 
 AVCodec ff_eightsvx_fib_decoder = {
 .name = "8svx_fib",
+ .long_name = NULL_IF_CONFIG_SMALL("8SVX fibonacci"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_8SVX_FIB,
 .priv_data_size = sizeof (EightSvxContext),
@@ -209,13 +206,13 @@
 .close = eightsvx_decode_close,
 .decode = eightsvx_decode_frame,
 .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("8SVX fibonacci"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P,
 AV_SAMPLE_FMT_NONE },
 };
 
 AVCodec ff_eightsvx_exp_decoder = {
 .name = "8svx_exp",
+ .long_name = NULL_IF_CONFIG_SMALL("8SVX exponential"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_8SVX_EXP,
 .priv_data_size = sizeof (EightSvxContext),
@@ -223,13 +220,13 @@
 .close = eightsvx_decode_close,
 .decode = eightsvx_decode_frame,
 .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("8SVX exponential"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P,
 AV_SAMPLE_FMT_NONE },
 };
 
 AVCodec ff_pcm_s8_planar_decoder = {
 .name = "pcm_s8_planar",
+ .long_name = NULL_IF_CONFIG_SMALL("PCM signed 8-bit planar"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_PCM_S8_PLANAR,
 .priv_data_size = sizeof(EightSvxContext),
@@ -237,7 +234,6 @@
 .close = eightsvx_decode_close,
 .decode = eightsvx_decode_frame,
 .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("PCM signed 8-bit planar"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P,
 AV_SAMPLE_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/Makefile -> libav-v10.1.tar.bz2/libavcodec/Makefile Changed

@@ -4,7 +4,6 @@
 HEADERS = avcodec.h                                                     \
           avfft.h                                                       \
           dxva2.h                                                       \
-          old_codec_ids.h                                               \
           vaapi.h                                                       \
           vda.h                                                         \
           vdpau.h                                                       \
@@ -12,25 +11,18 @@
           xvmc.h                                                        \
 
 OBJS = allcodecs.o                                                      \
-       audioconvert.o                                                   \
        avpacket.o                                                       \
        avpicture.o                                                      \
        bitstream.o                                                      \
        bitstream_filter.o                                               \
        codec_desc.o                                                     \
-       dsputil.o                                                        \
-       faanidct.o                                                       \
        fmtconvert.o                                                     \
        imgconvert.o                                                     \
-       jrevdct.o                                                        \
        log2_tab.o                                                       \
        mathtables.o                                                     \
        options.o                                                        \
        parser.o                                                         \
        raw.o                                                            \
-       resample.o                                                       \
-       resample2.o                                                      \
-       simple_idct.o                                                    \
        utils.o                                                          \
 
 # parts needed for many different codecs
@@ -38,17 +30,23 @@
 OBJS-$(CONFIG_AC3DSP)                  += ac3dsp.o
 OBJS-$(CONFIG_AUDIO_FRAME_QUEUE)       += audio_frame_queue.o
 OBJS-$(CONFIG_DCT)                     += dct.o dct32_fixed.o dct32_float.o
-OBJS-$(CONFIG_DWT)                     += dwt.o
 OBJS-$(CONFIG_DXVA2)                   += dxva2.o
+OBJS-$(CONFIG_DSPUTIL)                 += dsputil.o faanidct.o          \
+                                          simple_idct.o jrevdct.o
 OBJS-$(CONFIG_ENCODERS)                += faandct.o jfdctfst.o jfdctint.o
 OBJS-$(CONFIG_ERROR_RESILIENCE)        += error_resilience.o
 FFT-OBJS-$(CONFIG_HARDCODED_TABLES)    += cos_tables.o cos_fixed_tables.o
 OBJS-$(CONFIG_FFT)                     += avfft.o fft_fixed.o fft_float.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_LPC)                     += lpc.o
 OBJS-$(CONFIG_LSP)                     += lsp.o
@@ -71,7 +69,7 @@
 OBJS-$(CONFIG_VIDEODSP)                += videodsp.o
 OBJS-$(CONFIG_VP3DSP)                  += vp3dsp.o
 
-# decoders/encoders/hardware accelerators
+# decoders/encoders
 OBJS-$(CONFIG_A64MULTI_ENCODER)        += a64multienc.o elbg.o
 OBJS-$(CONFIG_A64MULTI5_ENCODER)       += a64multienc.o elbg.o
 OBJS-$(CONFIG_AAC_DECODER)             += aacdec.o aactab.o aacsbr.o aacps.o \
@@ -86,6 +84,7 @@
 OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc_float.o ac3enc.o ac3tab.o \
                                           ac3.o kbdwin.o
 OBJS-$(CONFIG_AC3_FIXED_ENCODER)       += ac3enc_fixed.o ac3enc.o ac3tab.o ac3.o
+OBJS-$(CONFIG_AIC_DECODER)             += aic.o
 OBJS-$(CONFIG_ALAC_DECODER)            += alac.o alac_data.o
 OBJS-$(CONFIG_ALAC_ENCODER)            += alacenc.o alac_data.o
 OBJS-$(CONFIG_ALS_DECODER)             += alsdec.o bgmc.o mpeg4audio.o
@@ -109,6 +108,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_AVS_DECODER)             += avs.o
@@ -136,7 +137,7 @@
 OBJS-$(CONFIG_CSCD_DECODER)            += cscd.o
 OBJS-$(CONFIG_CYUV_DECODER)            += cyuv.o
 OBJS-$(CONFIG_DCA_DECODER)             += dcadec.o dca.o dcadsp.o      \
-                                          dca_parser.o synth_filter.o
+                                          synth_filter.o
 OBJS-$(CONFIG_DFA_DECODER)             += dfa.o
 OBJS-$(CONFIG_DNXHD_DECODER)           += dnxhddec.o dnxhddata.o
 OBJS-$(CONFIG_DNXHD_ENCODER)           += dnxhdenc.o dnxhddata.o
@@ -149,7 +150,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
@@ -159,16 +160,18 @@
                                           mpeg12data.o
 OBJS-$(CONFIG_EATGQ_DECODER)           += eatgq.o eaidct.o
 OBJS-$(CONFIG_EATGV_DECODER)           += eatgv.o
-OBJS-$(CONFIG_EATQI_DECODER)           += eatqi.o eaidct.o mpeg12.o \
-                                          mpeg12data.o
+OBJS-$(CONFIG_EATQI_DECODER)           += eatqi.o eaidct.o mpeg12dec.o  \
+                                          mpeg12.o mpeg12data.o
 OBJS-$(CONFIG_EIGHTBPS_DECODER)        += 8bps.o
 OBJS-$(CONFIG_EIGHTSVX_EXP_DECODER)    += 8svx.o
 OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER)    += 8svx.o
 OBJS-$(CONFIG_ESCAPE124_DECODER)       += escape124.o
+OBJS-$(CONFIG_ESCAPE130_DECODER)       += escape130.o
 OBJS-$(CONFIG_FFV1_DECODER)            += ffv1dec.o ffv1.o
 OBJS-$(CONFIG_FFV1_ENCODER)            += ffv1enc.o ffv1.o
 OBJS-$(CONFIG_FFVHUFF_DECODER)         += huffyuv.o huffyuvdec.o
 OBJS-$(CONFIG_FFVHUFF_ENCODER)         += huffyuv.o huffyuvenc.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
 OBJS-$(CONFIG_FLASHSV_DECODER)         += flashsv.o
@@ -178,27 +181,28 @@
 OBJS-$(CONFIG_FOURXM_DECODER)          += 4xm.o
 OBJS-$(CONFIG_FRAPS_DECODER)           += fraps.o
 OBJS-$(CONFIG_FRWU_DECODER)            += frwu.o
+OBJS-$(CONFIG_G2M_DECODER)             += g2meet.o mjpeg.o
 OBJS-$(CONFIG_G723_1_DECODER)          += g723_1.o acelp_vectors.o \
                                           celp_filters.o
 OBJS-$(CONFIG_GIF_DECODER)             += gifdec.o lzw.o
 OBJS-$(CONFIG_GIF_ENCODER)             += gif.o lzwenc.o
 OBJS-$(CONFIG_GSM_DECODER)             += gsmdec.o gsmdec_data.o msgsmdec.o
 OBJS-$(CONFIG_GSM_MS_DECODER)          += gsmdec.o gsmdec_data.o msgsmdec.o
-OBJS-$(CONFIG_H261_DECODER)            += h261dec.o h261.o
-OBJS-$(CONFIG_H261_ENCODER)            += h261enc.o h261.o
+OBJS-$(CONFIG_H261_DECODER)            += h261dec.o h261data.o h261.o
+OBJS-$(CONFIG_H261_ENCODER)            += h261enc.o h261data.o h261.o
 OBJS-$(CONFIG_H263_DECODER)            += h263dec.o h263.o ituh263dec.o        \
                                           mpeg4video.o mpeg4videodec.o flvdec.o\
                                           intelh263dec.o
-OBJS-$(CONFIG_H263_VAAPI_HWACCEL)      += vaapi_mpeg4.o
 OBJS-$(CONFIG_H263_ENCODER)            += mpeg4videoenc.o mpeg4video.o  \
                                           h263.o ituh263enc.o flvenc.o
 OBJS-$(CONFIG_H264_DECODER)            += h264.o                               \
                                           h264_loopfilter.o h264_direct.o      \
                                           cabac.o h264_sei.o h264_ps.o         \
                                           h264_refs.o h264_cavlc.o h264_cabac.o
-OBJS-$(CONFIG_H264_DXVA2_HWACCEL)      += dxva2_h264.o
-OBJS-$(CONFIG_H264_VAAPI_HWACCEL)      += vaapi_h264.o
-OBJS-$(CONFIG_H264_VDA_HWACCEL)        += vda_h264.o
+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
@@ -212,6 +216,8 @@
 OBJS-$(CONFIG_INDEO5_DECODER)          += indeo5.o ivi_common.o ivi_dsp.o
 OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER)  += dpcm.o
 OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o
+OBJS-$(CONFIG_JPEG2000_DECODER)        += jpeg2000dec.o jpeg2000.o      \
+                                          jpeg2000dwt.o mqcdec.o mqc.o
 OBJS-$(CONFIG_JPEGLS_DECODER)          += jpeglsdec.o jpegls.o \
                                           mjpegdec.o mjpeg.o
 OBJS-$(CONFIG_JPEGLS_ENCODER)          += jpeglsenc.o jpegls.o
@@ -224,6 +230,8 @@
 OBJS-$(CONFIG_MACE3_DECODER)           += mace.o
 OBJS-$(CONFIG_MACE6_DECODER)           += mace.o
 OBJS-$(CONFIG_MDEC_DECODER)            += mdec.o mpeg12.o mpeg12data.o
+OBJS-$(CONFIG_METASOUND_DECODER)       += metasound.o metasound_data.o \
+                                          twinvq.o
 OBJS-$(CONFIG_MIMIC_DECODER)           += mimic.o
 OBJS-$(CONFIG_MJPEG_DECODER)           += mjpegdec.o mjpeg.o
 OBJS-$(CONFIG_MJPEG_ENCODER)           += mjpegenc.o mjpeg.o
@@ -231,39 +239,36 @@
 OBJS-$(CONFIG_MLP_DECODER)             += mlpdec.o mlpdsp.o
 OBJS-$(CONFIG_MMVIDEO_DECODER)         += mmvideo.o
 OBJS-$(CONFIG_MOTIONPIXELS_DECODER)    += motionpixels.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_DECODER)             += mpegaudiodec_fixed.o
 OBJS-$(CONFIG_MP2_ENCODER)             += mpegaudioenc.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_MPEG_XVMC_DECODER)       += mpegvideo_xvmc.o
-OBJS-$(CONFIG_MPEG1VIDEO_DECODER)      += mpeg12.o mpeg12data.o
+OBJS-$(CONFIG_MPEG1VIDEO_DECODER)      += mpeg12dec.o mpeg12.o mpeg12data.o
 OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o
-OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL)     += dxva2_mpeg2.o
-OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL)     += vaapi_mpeg2.o
-OBJS-$(CONFIG_MPEG2VIDEO_DECODER)      += mpeg12.o mpeg12data.o
+OBJS-$(CONFIG_MPEG2VIDEO_DECODER)      += mpeg12dec.o mpeg12.o mpeg12data.o
 OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o
-OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL)     += vaapi_mpeg4.o
-OBJS-$(CONFIG_MSMPEG4V1_DECODER)       += msmpeg4.o msmpeg4data.o
-OBJS-$(CONFIG_MSMPEG4V2_DECODER)       += msmpeg4.o msmpeg4data.o h263dec.o \
-                                          h263.o ituh263dec.o mpeg4videodec.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 \
-                                          h263dec.o h263.o ituh263dec.o        \
+                                          h263.o
+OBJS-$(CONFIG_MSMPEG4V3_DECODER)       += msmpeg4dec.o msmpeg4.o msmpeg4data.o \
+                                          h263dec.o h263.o ituh263dec.o \
                                           mpeg4videodec.o
-OBJS-$(CONFIG_MSMPEG4V3_DECODER)       += msmpeg4.o msmpeg4data.o h263dec.o \
-                                          h263.o ituh263dec.o mpeg4videodec.o
 OBJS-$(CONFIG_MSMPEG4V3_ENCODER)       += msmpeg4.o msmpeg4enc.o msmpeg4data.o \
-                                          h263dec.o h263.o ituh263dec.o        \
-                                          mpeg4videodec.o
+                                          h263.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
@@ -276,21 +281,21 @@
 OBJS-$(CONFIG_NELLYMOSER_ENCODER)      += nellymoserenc.o nellymoser.o
 OBJS-$(CONFIG_NUV_DECODER)             += nuv.o rtjpeg.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_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)          += proresdec.o proresdata.o proresdsp.o
 OBJS-$(CONFIG_PRORES_ENCODER)          += proresenc.o proresdata.o proresdsp.o
 OBJS-$(CONFIG_PTX_DECODER)             += ptx.o
@@ -333,9 +338,6 @@
 OBJS-$(CONFIG_SMACKAUD_DECODER)        += smacker.o
 OBJS-$(CONFIG_SMACKER_DECODER)         += smacker.o
 OBJS-$(CONFIG_SMC_DECODER)             += smc.o
-OBJS-$(CONFIG_SNOW_DECODER)            += snowdec.o snow.o
-OBJS-$(CONFIG_SNOW_ENCODER)            += snowenc.o snow.o              \
-                                          h263.o ituh263enc.o
 OBJS-$(CONFIG_SOL_DPCM_DECODER)        += dpcm.o
 OBJS-$(CONFIG_SP5X_DECODER)            += sp5xdec.o mjpegdec.o mjpeg.o
 OBJS-$(CONFIG_SRT_DECODER)             += srtdec.o ass.o
@@ -363,7 +365,7 @@
 OBJS-$(CONFIG_TSCC_DECODER)            += tscc.o msrledec.o
 OBJS-$(CONFIG_TSCC2_DECODER)           += tscc2.o
 OBJS-$(CONFIG_TTA_DECODER)             += tta.o
-OBJS-$(CONFIG_TWINVQ_DECODER)          += twinvq.o
+OBJS-$(CONFIG_TWINVQ_DECODER)          += twinvqdec.o twinvq.o
 OBJS-$(CONFIG_TXD_DECODER)             += txd.o s3tc.o
 OBJS-$(CONFIG_ULTI_DECODER)            += ulti.o
 OBJS-$(CONFIG_UTVIDEO_DECODER)         += utvideodec.o utvideo.o
@@ -376,16 +378,12 @@
 OBJS-$(CONFIG_VB_DECODER)              += vb.o
 OBJS-$(CONFIG_VBLE_DECODER)            += vble.o
 OBJS-$(CONFIG_VC1_DECODER)             += vc1dec.o vc1.o vc1data.o vc1dsp.o \
-                                          msmpeg4.o msmpeg4data.o           \
-                                          intrax8.o intrax8dsp.o
-OBJS-$(CONFIG_VC1_DXVA2_HWACCEL)       += dxva2_vc1.o
-OBJS-$(CONFIG_VC1_VAAPI_HWACCEL)       += vaapi_vc1.o
+                                          msmpeg4dec.o msmpeg4.o msmpeg4data.o
 OBJS-$(CONFIG_VCR1_DECODER)            += vcr1.o
-OBJS-$(CONFIG_VCR1_ENCODER)            += vcr1.o
 OBJS-$(CONFIG_VMDAUDIO_DECODER)        += vmdav.o
 OBJS-$(CONFIG_VMDVIDEO_DECODER)        += vmdav.o
 OBJS-$(CONFIG_VMNC_DECODER)            += vmnc.o
-OBJS-$(CONFIG_VORBIS_DECODER)          += vorbisdec.o vorbis.o \
+OBJS-$(CONFIG_VORBIS_DECODER)          += vorbisdec.o vorbisdsp.o vorbis.o \
                                           vorbis_data.o xiph.o
 OBJS-$(CONFIG_VORBIS_ENCODER)          += vorbisenc.o vorbis.o \
                                           vorbis_data.o
@@ -395,8 +393,11 @@
 OBJS-$(CONFIG_VP6_DECODER)             += vp6.o vp56.o vp56data.o vp56dsp.o \
                                           vp6dsp.o vp56rac.o
 OBJS-$(CONFIG_VP8_DECODER)             += vp8.o vp8dsp.o vp56rac.o
+OBJS-$(CONFIG_VP9_DECODER)             += vp9.o vp9data.o vp9dsp.o \
+                                          vp9block.o vp9prob.o vp9mvs.o vp56rac.o
 OBJS-$(CONFIG_VQA_DECODER)             += vqavideo.o
 OBJS-$(CONFIG_WAVPACK_DECODER)         += wavpack.o
+OBJS-$(CONFIG_WEBP_DECODER)            += webp.o
 OBJS-$(CONFIG_WMALOSSLESS_DECODER)     += wmalosslessdec.o wma_common.o
 OBJS-$(CONFIG_WMAPRO_DECODER)          += wmaprodec.o wma.o wma_common.o
 OBJS-$(CONFIG_WMAV1_DECODER)           += wmadec.o wma.o wma_common.o aactab.o
@@ -406,13 +407,11 @@
 OBJS-$(CONFIG_WMAVOICE_DECODER)        += wmavoice.o \
                                           celp_filters.o \
                                           acelp_vectors.o acelp_filters.o
-OBJS-$(CONFIG_WMV1_DECODER)            += msmpeg4.o msmpeg4data.o
-OBJS-$(CONFIG_WMV2_DECODER)            += wmv2dec.o wmv2.o        \
-                                          msmpeg4.o msmpeg4data.o \
-                                          intrax8.o intrax8dsp.o
-OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.o wmv2.o \
-                                          msmpeg4.o msmpeg4enc.o msmpeg4data.o \
-                                          mpeg4videodec.o ituh263dec.o h263dec.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
+OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.o wmv2.o wmv2dsp.o \
+                                          msmpeg4.o msmpeg4enc.o msmpeg4data.o
 OBJS-$(CONFIG_WNV1_DECODER)            += wnv1.o
 OBJS-$(CONFIG_WS_SND1_DECODER)         += ws-snd1.o
 OBJS-$(CONFIG_XAN_DPCM_DECODER)        += dpcm.o
@@ -434,8 +433,8 @@
 # (AD)PCM decoders/encoders
 OBJS-$(CONFIG_PCM_ALAW_DECODER)           += pcm.o
 OBJS-$(CONFIG_PCM_ALAW_ENCODER)           += pcm.o
-OBJS-$(CONFIG_PCM_BLURAY_DECODER)         += pcm-mpeg.o
-OBJS-$(CONFIG_PCM_DVD_DECODER)            += pcm.o
+OBJS-$(CONFIG_PCM_BLURAY_DECODER)         += pcm-bluray.o
+OBJS-$(CONFIG_PCM_DVD_DECODER)            += pcm-dvd.o
 OBJS-$(CONFIG_PCM_F32BE_DECODER)          += pcm.o
 OBJS-$(CONFIG_PCM_F32BE_ENCODER)          += pcm.o
 OBJS-$(CONFIG_PCM_F32LE_DECODER)          += pcm.o
@@ -461,10 +460,12 @@
 OBJS-$(CONFIG_PCM_S24DAUD_ENCODER)        += pcm.o
 OBJS-$(CONFIG_PCM_S24LE_DECODER)          += pcm.o
 OBJS-$(CONFIG_PCM_S24LE_ENCODER)          += pcm.o
+OBJS-$(CONFIG_PCM_S24LE_PLANAR_DECODER)   += pcm.o
 OBJS-$(CONFIG_PCM_S32BE_DECODER)          += pcm.o
 OBJS-$(CONFIG_PCM_S32BE_ENCODER)          += pcm.o
 OBJS-$(CONFIG_PCM_S32LE_DECODER)          += pcm.o
 OBJS-$(CONFIG_PCM_S32LE_ENCODER)          += pcm.o
+OBJS-$(CONFIG_PCM_S32LE_PLANAR_DECODER)   += pcm.o
 OBJS-$(CONFIG_PCM_U8_DECODER)             += pcm.o
 OBJS-$(CONFIG_PCM_U8_ENCODER)             += pcm.o
 OBJS-$(CONFIG_PCM_U16BE_DECODER)          += pcm.o
@@ -520,6 +521,23 @@
 OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER)       += adpcm.o adpcm_data.o
 OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER)       += adpcmenc.o adpcm_data.o
 
+# hardware accelerators
+OBJS-$(CONFIG_H263_VAAPI_HWACCEL)         += vaapi_mpeg4.o
+OBJS-$(CONFIG_H263_VDPAU_HWACCEL)         += vdpau_mpeg4.o
+OBJS-$(CONFIG_H264_DXVA2_HWACCEL)         += dxva2_h264.o
+OBJS-$(CONFIG_H264_VAAPI_HWACCEL)         += vaapi_h264.o
+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_MPEG2_DXVA2_HWACCEL)        += dxva2_mpeg2.o
+OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL)        += vaapi_mpeg2.o
+OBJS-$(CONFIG_MPEG2_VDPAU_HWACCEL)        += vdpau_mpeg12.o
+OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL)        += vaapi_mpeg4.o
+OBJS-$(CONFIG_MPEG4_VDPAU_HWACCEL)        += vdpau_mpeg4.o
+OBJS-$(CONFIG_VC1_DXVA2_HWACCEL)          += dxva2_vc1.o
+OBJS-$(CONFIG_VC1_VAAPI_HWACCEL)          += vaapi_vc1.o
+OBJS-$(CONFIG_VC1_VDPAU_HWACCEL)          += vdpau_vc1.o
+
 # libavformat dependencies
 OBJS-$(CONFIG_ADTS_MUXER)              += mpeg4audio.o
 OBJS-$(CONFIG_ADX_DEMUXER)             += adx.o
@@ -562,6 +580,7 @@
 
 # external codec libraries
 OBJS-$(CONFIG_LIBFAAC_ENCODER)            += libfaac.o
+OBJS-$(CONFIG_LIBFDK_AAC_DECODER)         += libfdk-aacdec.o
 OBJS-$(CONFIG_LIBFDK_AAC_ENCODER)         += libfdk-aacenc.o
 OBJS-$(CONFIG_LIBGSM_DECODER)             += libgsm.o
 OBJS-$(CONFIG_LIBGSM_ENCODER)             += libgsm.o
@@ -590,8 +609,12 @@
 OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER)     += libvo-amrwbenc.o
 OBJS-$(CONFIG_LIBVORBIS_ENCODER)          += libvorbis.o \
                                              vorbis_data.o vorbis_parser.o
-OBJS-$(CONFIG_LIBVPX_DECODER)             += libvpxdec.o
-OBJS-$(CONFIG_LIBVPX_ENCODER)             += libvpxenc.o
+OBJS-$(CONFIG_LIBVPX_VP8_DECODER)         += libvpxdec.o
+OBJS-$(CONFIG_LIBVPX_VP8_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_LIBXAVS_ENCODER)            += libxavs.o
 OBJS-$(CONFIG_LIBXVID_ENCODER)            += libxvid.o
@@ -619,6 +642,7 @@
                                           h264_refs.o h264_sei.o h264_direct.o \
                                           h264_loopfilter.o h264_cabac.o \
                                           h264_cavlc.o h264_ps.o
+OBJS-$(CONFIG_HEVC_PARSER)             += hevc_parser.o
 OBJS-$(CONFIG_MJPEG_PARSER)            += mjpeg_parser.o
 OBJS-$(CONFIG_MLP_PARSER)              += mlp_parser.o mlp.o
 OBJS-$(CONFIG_MPEG4VIDEO_PARSER)       += mpeg4video_parser.o h263.o \
@@ -628,6 +652,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
@@ -649,22 +674,18 @@
 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
 OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF)       += remove_extradata_bsf.o
 OBJS-$(CONFIG_TEXT2MOVSUB_BSF)            += movsub_bsf.o
 
 # thread libraries
-OBJS-$(HAVE_PTHREADS)                  += pthread.o
-OBJS-$(HAVE_W32THREADS)                += pthread.o
+OBJS-$(HAVE_LIBC_MSVCRT)               += file_open.o
+OBJS-$(HAVE_THREADS)                   += pthread.o pthread_slice.o pthread_frame.o
 
 SKIPHEADERS                            += %_tablegen.h                  \
                                           %_tables.h                    \
                                           aac_tablegen_decl.h           \
                                           fft-internal.h                \
-                                          old_codec_ids.h               \
                                           tableprint.h                  \
                                           $(ARCH)/vp56_arith.h          \
 
@@ -673,10 +694,7 @@
 SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
 SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_internal.h
 SKIPHEADERS-$(CONFIG_VDA)              += vda.h
-SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h
-SKIPHEADERS-$(HAVE_W32THREADS)         += w32pthreads.h
-
-EXAMPLES = api
+SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h vdpau_internal.h
 
 TESTPROGS = dct                                                         \
             fft                                                         \
@@ -701,6 +719,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)
@@ -726,9 +745,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

libav-v9.6.tar.bz2/libavcodec/a64enc.h -> libav-v10.1.tar.bz2/libavcodec/a64enc.h Changed

libav-v9.6.tar.bz2/libavcodec/a64multienc.c -> libav-v10.1.tar.bz2/libavcodec/a64multienc.c Changed

@@ -165,6 +165,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);
@@ -216,8 +217,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)
@@ -247,7 +252,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;
@@ -373,6 +378,7 @@
 
 AVCodec ff_a64multi_encoder = {
     .name           = "a64multi",
+    .long_name      = NULL_IF_CONFIG_SMALL("Multicolor charset for Commodore 64"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_A64_MULTI,
     .priv_data_size = sizeof(A64Context),
@@ -380,12 +386,12 @@
     .encode2        = a64multi_encode_frame,
     .close          = a64multi_close_encoder,
     .pix_fmts       = (const enum AVPixelFormat[]) {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE},
-    .long_name      = NULL_IF_CONFIG_SMALL("Multicolor charset for Commodore 64"),
     .capabilities   = CODEC_CAP_DELAY,
 };
 
 AVCodec ff_a64multi5_encoder = {
     .name           = "a64multi5",
+    .long_name      = NULL_IF_CONFIG_SMALL("Multicolor charset for Commodore 64, extended with 5th color (colram)"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_A64_MULTI5,
     .priv_data_size = sizeof(A64Context),
@@ -393,6 +399,5 @@
     .encode2        = a64multi_encode_frame,
     .close          = a64multi_close_encoder,
     .pix_fmts       = (const enum AVPixelFormat[]) {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE},
-    .long_name      = NULL_IF_CONFIG_SMALL("Multicolor charset for Commodore 64, extended with 5th color (colram)"),
     .capabilities   = CODEC_CAP_DELAY,
 };

libav-v9.6.tar.bz2/libavcodec/aac.h -> libav-v10.1.tar.bz2/libavcodec/aac.h Changed

@@ -32,7 +32,6 @@
 
 #include "libavutil/float_dsp.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "fft.h"
 #include "mpeg4audio.h"
 #include "sbr.h"
@@ -158,7 +157,7 @@
 typedef struct IndividualChannelStream {
 uint8_t max_sfb; ///< number of scalefactor bands per group
 enum WindowSequence window_sequence[2];
- uint8_t use_kb_window[2]; ///< If set, use Kaiser-Bessel window, otherwise use a sinus window.
+ uint8_t use_kb_window[2]; ///< If set, use Kaiser-Bessel window, otherwise use a sine window.
 int num_window_groups;
 uint8_t group_len[8];
 LongTermPrediction ltp;
@@ -235,7 +234,7 @@
 int sf_idx[128]; ///< scalefactor indices (used by encoder)
 uint8_t zeroes[128]; ///< band is not coded (used by encoder)
 DECLARE_ALIGNED(32, float, coeffs)[1024]; ///< coefficients for IMDCT
- DECLARE_ALIGNED(32, float, saved)[1024]; ///< overlap
+ DECLARE_ALIGNED(32, float, saved)[1536]; ///< overlap
 DECLARE_ALIGNED(32, float, ret_buf)[2048]; ///< PCM output buffer
 DECLARE_ALIGNED(16, float, ltp_state)[3072]; ///< time signal for LTP
 PredictorState predictor_state[MAX_PREDICTORS];
@@ -262,7 +261,7 @@
 */
 typedef struct AACContext {
 AVCodecContext *avctx;
- AVFrame frame;
+ AVFrame *frame;
 
 int is_saved; ///< Set if elements have stored overlap from previous frame.
 DynamicRangeControl che_drc;
@@ -290,8 +289,8 @@
 */
 FFTContext mdct;
 FFTContext mdct_small;
+ FFTContext mdct_ld;
 FFTContext mdct_ltp;
- DSPContext dsp;
 FmtConvertContext fmt_conv;
 AVFloatDSPContext fdsp;
 int random_state;

libav-v9.6.tar.bz2/libavcodec/aac_ac3_parser.c -> libav-v10.1.tar.bz2/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;

libav-v9.6.tar.bz2/libavcodec/aac_ac3_parser.h -> libav-v10.1.tar.bz2/libavcodec/aac_ac3_parser.h Changed

libav-v9.6.tar.bz2/libavcodec/aac_adtstoasc_bsf.c -> libav-v10.1.tar.bz2/libavcodec/aac_adtstoasc_bsf.c Changed

libav-v9.6.tar.bz2/libavcodec/aac_tablegen.h -> libav-v10.1.tar.bz2/libavcodec/aac_tablegen.h Changed

libav-v9.6.tar.bz2/libavcodec/aaccoder.c -> libav-v10.1.tar.bz2/libavcodec/aaccoder.c Changed

libav-v9.6.tar.bz2/libavcodec/aacdec.c -> libav-v10.1.tar.bz2/libavcodec/aacdec.c Changed

@@ -2,6 +2,7 @@
 * AAC decoder
 * Copyright (c) 2005-2006 Oded Shimon ( ods15 ods15 dyndns org )
 * Copyright (c) 2006-2007 Maxim Gavrilov ( maxim.gavrilov gmail com )
+ * Copyright (c) 2008-2013 Alex Converse <alex.converse@gmail.com>
 *
 * AAC LATM decoder
 * Copyright (c) 2008-2010 Paul Kendall <paul@kcbbs.gen.nz>
@@ -83,7 +84,6 @@
 #include "avcodec.h"
 #include "internal.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "fft.h"
 #include "fmtconvert.h"
 #include "lpc.h"
@@ -103,6 +103,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <math.h>
+#include <stdint.h>
 #include <string.h>
 
 #if ARCH_ARM
@@ -182,8 +183,9 @@
 }
 
 /* get output buffer */
- ac->frame.nb_samples = 2048;
- if ((ret = ff_get_buffer(avctx, &ac->frame)) < 0) {
+ av_frame_unref(ac->frame);
+ ac->frame->nb_samples = 2048;
+ if ((ret = ff_get_buffer(avctx, ac->frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -191,7 +193,7 @@
 /* map output channel pointers to AVFrame data */
 for (ch = 0; ch < avctx->channels; ch++) {
 if (ac->output_element[ch])
- ac->output_element[ch]->ret = (float *)ac->frame.extended_data[ch];
+ ac->output_element[ch]->ret = (float *)ac->frame->extended_data[ch];
 }
 
 return 0;
@@ -206,28 +208,39 @@
 
 static int assign_pair(struct elem_to_channel e2c_vec[MAX_ELEM_ID],
 uint8_t (*layout_map)[3], int offset, uint64_t left,
- uint64_t right, int pos)
+ uint64_t right, int pos)
 {
 if (layout_map[offset][0] == TYPE_CPE) {
 e2c_vec[offset] = (struct elem_to_channel) {
- .av_position = left | right, .syn_ele = TYPE_CPE,
- .elem_id = layout_map[offset ][1], .aac_position = pos };
+ .av_position = left | right,
+ .syn_ele = TYPE_CPE,
+ .elem_id = layout_map[offset][1],
+ .aac_position = pos
+ };
 return 1;
 } else {
- e2c_vec[offset] = (struct elem_to_channel) {
- .av_position = left, .syn_ele = TYPE_SCE,
- .elem_id = layout_map[offset ][1], .aac_position = pos };
+ e2c_vec[offset] = (struct elem_to_channel) {
+ .av_position = left,
+ .syn_ele = TYPE_SCE,
+ .elem_id = layout_map[offset][1],
+ .aac_position = pos
+ };
 e2c_vec[offset + 1] = (struct elem_to_channel) {
- .av_position = right, .syn_ele = TYPE_SCE,
- .elem_id = layout_map[offset + 1][1], .aac_position = pos };
+ .av_position = right,
+ .syn_ele = TYPE_SCE,
+ .elem_id = layout_map[offset + 1][1],
+ .aac_position = pos
+ };
 return 2;
 }
 }
 
-static int count_paired_channels(uint8_t (*layout_map)[3], int tags, int pos, int *current) {
+static int count_paired_channels(uint8_t (*layout_map)[3], int tags, int pos,
+ int *current)
+{
 int num_pos_channels = 0;
- int first_cpe = 0;
- int sce_parity = 0;
+ int first_cpe = 0;
+ int sce_parity = 0;
 int i;
 for (i = *current; i < tags; i++) {
 if (layout_map[i][2] != pos)
@@ -241,7 +254,7 @@
 }
 }
 num_pos_channels += 2;
- first_cpe = 1;
+ first_cpe = 1;
 } else {
 num_pos_channels++;
 sce_parity ^= 1;
@@ -249,7 +262,7 @@
 }
 if (sce_parity &&
 ((pos == AAC_CHANNEL_FRONT && first_cpe) || pos == AAC_CHANNEL_SIDE))
- return -1;
+ return -1;
 *current = i;
 return num_pos_channels;
 }
@@ -257,7 +270,7 @@
 static uint64_t sniff_channel_order(uint8_t (*layout_map)[3], int tags)
 {
 int i, n, total_non_cc_elements;
- struct elem_to_channel e2c_vec[4*MAX_ELEM_ID] = {{ 0 }};
+ struct elem_to_channel e2c_vec[4 * MAX_ELEM_ID] = { { 0 } };
 int num_front_channels, num_side_channels, num_back_channels;
 uint64_t layout;
 
@@ -281,8 +294,11 @@
 i = 0;
 if (num_front_channels & 1) {
 e2c_vec[i] = (struct elem_to_channel) {
- .av_position = AV_CH_FRONT_CENTER, .syn_ele = TYPE_SCE,
- .elem_id = layout_map[i][1], .aac_position = AAC_CHANNEL_FRONT };
+ .av_position = AV_CH_FRONT_CENTER,
+ .syn_ele = TYPE_SCE,
+ .elem_id = layout_map[i][1],
+ .aac_position = AAC_CHANNEL_FRONT
+ };
 i++;
 num_front_channels--;
 }
@@ -339,22 +355,31 @@
 }
 if (num_back_channels) {
 e2c_vec[i] = (struct elem_to_channel) {
- .av_position = AV_CH_BACK_CENTER, .syn_ele = TYPE_SCE,
- .elem_id = layout_map[i][1], .aac_position = AAC_CHANNEL_BACK };
+ .av_position = AV_CH_BACK_CENTER,
+ .syn_ele = TYPE_SCE,
+ .elem_id = layout_map[i][1],
+ .aac_position = AAC_CHANNEL_BACK
+ };
 i++;
 num_back_channels--;
 }
 
 if (i < tags && layout_map[i][2] == AAC_CHANNEL_LFE) {
 e2c_vec[i] = (struct elem_to_channel) {
- .av_position = AV_CH_LOW_FREQUENCY, .syn_ele = TYPE_LFE,
- .elem_id = layout_map[i][1], .aac_position = AAC_CHANNEL_LFE };
+ .av_position = AV_CH_LOW_FREQUENCY,
+ .syn_ele = TYPE_LFE,
+ .elem_id = layout_map[i][1],
+ .aac_position = AAC_CHANNEL_LFE
+ };
 i++;
 }
 while (i < tags && layout_map[i][2] == AAC_CHANNEL_LFE) {
 e2c_vec[i] = (struct elem_to_channel) {
- .av_position = UINT64_MAX, .syn_ele = TYPE_LFE,
- .elem_id = layout_map[i][1], .aac_position = AAC_CHANNEL_LFE };
+ .av_position = UINT64_MAX,
+ .syn_ele = TYPE_LFE,
+ .elem_id = layout_map[i][1],
+ .aac_position = AAC_CHANNEL_LFE
+ };
 i++;
 }
 
@@ -362,12 +387,11 @@
 total_non_cc_elements = n = i;
 do {
 int next_n = 0;
- for (i = 1; i < n; i++) {
- if (e2c_vec[i-1].av_position > e2c_vec[i].av_position) {
- FFSWAP(struct elem_to_channel, e2c_vec[i-1], e2c_vec[i]);
+ for (i = 1; i < n; i++)
+ if (e2c_vec[i - 1].av_position > e2c_vec[i].av_position) {
+ FFSWAP(struct elem_to_channel, e2c_vec[i - 1], e2c_vec[i]);
 next_n = i;
 }
- }
 n = next_n;
 } while (n > 0);
 
@@ -407,12 +431,13 @@
 }
 
 /**
- * Configure output channel order based on the current program configuration element.
+ * Configure output channel order based on the current program
+ * configuration element.
 *
 * @return Returns error status. 0 - OK, !0 - error
 */
 static int output_configure(AACContext *ac,
- uint8_t layout_map[MAX_ELEM_ID*4][3], int tags,
+ uint8_t layout_map[MAX_ELEM_ID * 4][3], int tags,
 enum OCStatus oc_type, int get_new_frame)
 {
 AVCodecContext *avctx = ac->avctx;
@@ -448,7 +473,7 @@
 
 memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0]));
 avctx->channel_layout = ac->oc[1].channel_layout = layout;
- avctx->channels = ac->oc[1].channels = channels;
+ avctx->channels = ac->oc[1].channels = channels;
 ac->oc[1].status = oc_type;
 
 if (get_new_frame) {
@@ -466,34 +491,38 @@
 * @return Returns error status. 0 - OK, !0 - error
 */
 static int set_default_channel_config(AVCodecContext *avctx,
- uint8_t (*layout_map)[3],
- int *tags,
- int channel_config)
+ uint8_t (*layout_map)[3],
+ int *tags,
+ int channel_config)
 {
 if (channel_config < 1 || channel_config > 7) {
- av_log(avctx, AV_LOG_ERROR, "invalid default channel configuration (%d)\n",
+ av_log(avctx, AV_LOG_ERROR,
+ "invalid default channel configuration (%d)\n",
 channel_config);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 *tags = tags_per_config[channel_config];
- memcpy(layout_map, aac_channel_layout_map[channel_config-1], *tags * sizeof(*layout_map));
+ memcpy(layout_map, aac_channel_layout_map[channel_config - 1],
+ *tags * sizeof(*layout_map));
 return 0;
 }
 
 static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
 {
- // For PCE based channel configurations map the channels solely based on tags.
+ /* For PCE based channel configurations map the channels solely based
+ * on tags. */
 if (!ac->oc[1].m4ac.chan_config) {
 return ac->tag_che_map[type][elem_id];
 }
 // Allow single CPE stereo files to be signalled with mono configuration.
- if (!ac->tags_mapped && type == TYPE_CPE && ac->oc[1].m4ac.chan_config == 1) {
+ if (!ac->tags_mapped && type == TYPE_CPE &&
+ ac->oc[1].m4ac.chan_config == 1) {
 uint8_t layout_map[MAX_ELEM_ID*4][3];
 int layout_map_tags;
 push_output_configuration(ac);
 
- if (set_default_channel_config(ac->avctx, layout_map, &layout_map_tags,
- 2) < 0)
+ if (set_default_channel_config(ac->avctx, layout_map,
+ &layout_map_tags, 2) < 0)
 return NULL;
 if (output_configure(ac, layout_map, layout_map_tags,
 OC_TRIAL_FRAME, 1) < 0)
@@ -503,13 +532,14 @@
 ac->oc[1].m4ac.ps = 0;
 }
 // And vice-versa
- if (!ac->tags_mapped && type == TYPE_SCE && ac->oc[1].m4ac.chan_config == 2) {
- uint8_t layout_map[MAX_ELEM_ID*4][3];
+ if (!ac->tags_mapped && type == TYPE_SCE &&
+ ac->oc[1].m4ac.chan_config == 2) {
+ uint8_t layout_map[MAX_ELEM_ID * 4][3];
 int layout_map_tags;
 push_output_configuration(ac);
 
- if (set_default_channel_config(ac->avctx, layout_map, &layout_map_tags,
- 1) < 0)
+ if (set_default_channel_config(ac->avctx, layout_map,
+ &layout_map_tags, 1) < 0)
 return NULL;
 if (output_configure(ac, layout_map, layout_map_tags,
 OC_TRIAL_FRAME, 1) < 0)
@@ -519,7 +549,8 @@
 if (ac->oc[1].m4ac.sbr)
 ac->oc[1].m4ac.ps = -1;
 }
- // For indexed channel configurations map the channels solely based on position.
+ /* For indexed channel configurations map the channels solely based
+ * on position. */
 switch (ac->oc[1].m4ac.chan_config) {
 case 7:
 if (ac->tags_mapped == 3 && type == TYPE_CPE) {
@@ -527,9 +558,12 @@
 return ac->tag_che_map[TYPE_CPE][elem_id] = ac->che[TYPE_CPE][2];
 }
 case 6:
- /* Some streams incorrectly code 5.1 audio as SCE[0] CPE[0] CPE[1] SCE[1]
- instead of SCE[0] CPE[0] CPE[1] LFE[0]. If we seem to have
- encountered such a stream, transfer the LFE[0] element to the SCE[1]'s mapping */
+ /* Some streams incorrectly code 5.1 audio as
+ * SCE[0] CPE[0] CPE[1] SCE[1]
+ * instead of
+ * SCE[0] CPE[0] CPE[1] LFE[0].
+ * If we seem to have encountered such a stream, transfer
+ * the LFE[0] element to the SCE[1]'s mapping */
 if (ac->tags_mapped == tags_per_config[ac->oc[1].m4ac.chan_config] - 1 && (type == TYPE_LFE || type == TYPE_SCE)) {
 ac->tags_mapped++;
 return ac->tag_che_map[type][elem_id] = ac->che[TYPE_LFE][0];
@@ -540,13 +574,16 @@
 return ac->tag_che_map[TYPE_CPE][elem_id] = ac->che[TYPE_CPE][1];
 }
 case 4:
- if (ac->tags_mapped == 2 && ac->oc[1].m4ac.chan_config == 4 && type == TYPE_SCE) {
+ if (ac->tags_mapped == 2 &&
+ ac->oc[1].m4ac.chan_config == 4 &&
+ type == TYPE_SCE) {
 ac->tags_mapped++;
 return ac->tag_che_map[TYPE_SCE][elem_id] = ac->che[TYPE_SCE][1];
 }
 case 3:
 case 2:
- if (ac->tags_mapped == (ac->oc[1].m4ac.chan_config != 2) && type == TYPE_CPE) {
+ if (ac->tags_mapped == (ac->oc[1].m4ac.chan_config != 2) &&
+ type == TYPE_CPE) {
 ac->tags_mapped++;
 return ac->tag_che_map[TYPE_CPE][elem_id] = ac->che[TYPE_CPE][0];
 } else if (ac->oc[1].m4ac.chan_config == 2) {
@@ -563,7 +600,8 @@
 }
 
 /**
- * Decode an array of 4 bit element IDs, optionally interleaved with a stereo/mono switching bit.
+ * Decode an array of 4 bit element IDs, optionally interleaved with a
+ * stereo/mono switching bit.
 *
 * @param type speaker type/position for these channels
 */
@@ -603,7 +641,8 @@
 uint8_t (*layout_map)[3],
 GetBitContext *gb)
 {
- int num_front, num_side, num_back, num_lfe, num_assoc_data, num_cc, sampling_index;
+ int num_front, num_side, num_back, num_lfe, num_assoc_data, num_cc;
+ int sampling_index;
 int comment_len;
 int tags;
 
@@ -611,7 +650,9 @@
 
 sampling_index = get_bits(gb, 4);
 if (m4ac->sampling_index != sampling_index)
- av_log(avctx, AV_LOG_WARNING, "Sample rate index in program config element does not match the sample rate index configured by the container.\n");
+ av_log(avctx, AV_LOG_WARNING,
+ "Sample rate index in program config element does not "
+ "match the sample rate index configured by the container.\n");
 
 num_front = get_bits(gb, 4);
 num_side = get_bits(gb, 4);
@@ -648,7 +689,7 @@
 comment_len = get_bits(gb, 8) * 8;
 if (get_bits_left(gb) < comment_len) {
 av_log(avctx, AV_LOG_ERROR, overread_err);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 skip_bits_long(gb, comment_len);
 return tags;
@@ -667,12 +708,12 @@
 MPEG4AudioConfig *m4ac,
 int channel_config)
 {
- int extension_flag, ret;
+ int extension_flag, ret, ep_config, res_flags;
 uint8_t layout_map[MAX_ELEM_ID*4][3];
 int tags = 0;
 
 if (get_bits1(gb)) { // frameLengthFlag
- av_log_missing_feature(avctx, "960/120 MDCT window", 1);
+ avpriv_request_sample(avctx, "960/120 MDCT window");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -690,7 +731,8 @@
 if (tags < 0)
 return tags;
 } else {
- if ((ret = set_default_channel_config(avctx, layout_map, &tags, channel_config)))
+ if ((ret = set_default_channel_config(avctx, layout_map,
+ &tags, channel_config)))
 return ret;
 }
 
@@ -712,14 +754,90 @@
 case AOT_ER_AAC_LTP:
 case AOT_ER_AAC_SCALABLE:
 case AOT_ER_AAC_LD:
- skip_bits(gb, 3); /* aacSectionDataResilienceFlag
- * aacScalefactorDataResilienceFlag
- * aacSpectralDataResilienceFlag
- */
+ res_flags = get_bits(gb, 3);
+ if (res_flags) {
+ avpriv_report_missing_feature(avctx,
+ "AAC data resilience (flags %x)",
+ res_flags);
+ return AVERROR_PATCHWELCOME;
+ }
 break;
 }
 skip_bits1(gb); // extensionFlag3 (TBD in version 3)
 }
+ switch (m4ac->object_type) {
+ case AOT_ER_AAC_LC:
+ case AOT_ER_AAC_LTP:
+ case AOT_ER_AAC_SCALABLE:
+ case AOT_ER_AAC_LD:
+ ep_config = get_bits(gb, 2);
+ if (ep_config) {
+ avpriv_report_missing_feature(avctx,
+ "epConfig %d", ep_config);
+ return AVERROR_PATCHWELCOME;
+ }
+ }
+ return 0;
+}
+
+static int decode_eld_specific_config(AACContext *ac, AVCodecContext *avctx,
+ GetBitContext *gb,
+ MPEG4AudioConfig *m4ac,
+ int channel_config)
+{
+ int ret, ep_config, res_flags;
+ uint8_t layout_map[MAX_ELEM_ID*4][3];
+ int tags = 0;
+ const int ELDEXT_TERM = 0;
+
+ m4ac->ps = 0;
+ m4ac->sbr = 0;
+
+ if (get_bits1(gb)) { // frameLengthFlag
+ avpriv_request_sample(avctx, "960/120 MDCT window");
+ return AVERROR_PATCHWELCOME;
+ }
+
+ res_flags = get_bits(gb, 3);
+ if (res_flags) {
+ avpriv_report_missing_feature(avctx,
+ "AAC data resilience (flags %x)",
+ res_flags);
+ return AVERROR_PATCHWELCOME;
+ }
+
+ if (get_bits1(gb)) { // ldSbrPresentFlag
+ avpriv_report_missing_feature(avctx,
+ "Low Delay SBR");
+ return AVERROR_PATCHWELCOME;
+ }
+
+ while (get_bits(gb, 4) != ELDEXT_TERM) {
+ int len = get_bits(gb, 4);
+ if (len == 15)
+ len += get_bits(gb, 8);
+ if (len == 15 + 255)
+ len += get_bits(gb, 16);
+ if (get_bits_left(gb) < len * 8 + 4) {
+ av_log(ac->avctx, AV_LOG_ERROR, overread_err);
+ return AVERROR_INVALIDDATA;
+ }
+ skip_bits_long(gb, 8 * len);
+ }
+
+ if ((ret = set_default_channel_config(avctx, layout_map,
+ &tags, channel_config)))
+ return ret;
+
+ if (ac && (ret = output_configure(ac, layout_map, tags, OC_GLOBAL_HDR, 0)))
+ return ret;
+
+ ep_config = get_bits(gb, 2);
+ if (ep_config) {
+ avpriv_report_missing_feature(avctx,
+ "epConfig %d", ep_config);
+ return AVERROR_PATCHWELCOME;
+ }
 return 0;
 }
 
@@ -742,20 +860,31 @@
 int sync_extension)
 {
 GetBitContext gb;
- int i;
+ int i, ret;
 
 av_dlog(avctx, "extradata size %d\n", avctx->extradata_size);
 for (i = 0; i < avctx->extradata_size; i++)
- av_dlog(avctx, "%02x ", avctx->extradata[i]);
+ av_dlog(avctx, "%02x ", avctx->extradata[i]);
 av_dlog(avctx, "\n");
 
- init_get_bits(&gb, data, bit_size);
+ if ((ret = init_get_bits(&gb, data, bit_size)) < 0)
+ return ret;
 
- if ((i = avpriv_mpeg4audio_get_config(m4ac, data, bit_size, sync_extension)) < 0)
- return -1;
+ if ((i = avpriv_mpeg4audio_get_config(m4ac, data, bit_size,
+ sync_extension)) < 0)
+ return AVERROR_INVALIDDATA;
 if (m4ac->sampling_index > 12) {
- av_log(avctx, AV_LOG_ERROR, "invalid sampling rate index %d\n", m4ac->sampling_index);
- return -1;
+ av_log(avctx, AV_LOG_ERROR,
+ "invalid sampling rate index %d\n",
+ m4ac->sampling_index);
+ return AVERROR_INVALIDDATA;
+ }
+ if (m4ac->object_type == AOT_ER_AAC_LD &&
+ (m4ac->sampling_index < 3 || m4ac->sampling_index > 7)) {
+ av_log(avctx, AV_LOG_ERROR,
+ "invalid low delay sampling rate index %d\n",
+ m4ac->sampling_index);
+ return AVERROR_INVALIDDATA;
 }
 
 skip_bits_long(&gb, i);
@@ -764,18 +893,30 @@
 case AOT_AAC_MAIN:
 case AOT_AAC_LC:
 case AOT_AAC_LTP:
- if (decode_ga_specific_config(ac, avctx, &gb, m4ac, m4ac->chan_config))
- return -1;
+ case AOT_ER_AAC_LC:
+ case AOT_ER_AAC_LD:
+ if ((ret = decode_ga_specific_config(ac, avctx, &gb,
+ m4ac, m4ac->chan_config)) < 0)
+ return ret;
+ break;
+ case AOT_ER_AAC_ELD:
+ if ((ret = decode_eld_specific_config(ac, avctx, &gb,
+ m4ac, m4ac->chan_config)) < 0)
+ return ret;
 break;
 default:
- av_log(avctx, AV_LOG_ERROR, "Audio object type %s%d is not supported.\n",
- m4ac->sbr == 1? "SBR+" : "", m4ac->object_type);
- return -1;
+ avpriv_report_missing_feature(avctx,
+ "Audio object type %s%d",
+ m4ac->sbr == 1 ? "SBR+" : "",
+ m4ac->object_type);
+ return AVERROR(ENOSYS);
 }
 
- av_dlog(avctx, "AOT %d chan config %d sampling index %d (%d) SBR %d PS %d\n",
+ av_dlog(avctx,
+ "AOT %d chan config %d sampling index %d (%d) SBR %d PS %d\n",
 m4ac->object_type, m4ac->chan_config, m4ac->sampling_index,
- m4ac->sample_rate, m4ac->sbr, m4ac->ps);
+ m4ac->sample_rate, m4ac->sbr,
+ m4ac->ps);
 
 return get_bits_count(&gb);
 }
@@ -833,15 +974,18 @@
 reset_predict_state(&ps[i]);
 }
 
-#define AAC_INIT_VLC_STATIC(num, size) \
- INIT_VLC_STATIC(&vlc_spectral[num], 8, ff_aac_spectral_sizes[num], \
- ff_aac_spectral_bits[num], sizeof( ff_aac_spectral_bits[num][0]), sizeof( ff_aac_spectral_bits[num][0]), \
- ff_aac_spectral_codes[num], sizeof(ff_aac_spectral_codes[num][0]), sizeof(ff_aac_spectral_codes[num][0]), \
+#define AAC_INIT_VLC_STATIC(num, size) \
+ INIT_VLC_STATIC(&vlc_spectral[num], 8, ff_aac_spectral_sizes[num], \
+ ff_aac_spectral_bits[num], sizeof(ff_aac_spectral_bits[num][0]), \
+ sizeof(ff_aac_spectral_bits[num][0]), \
+ ff_aac_spectral_codes[num], sizeof(ff_aac_spectral_codes[num][0]), \
+ sizeof(ff_aac_spectral_codes[num][0]), \
 size);
 
 static av_cold int aac_decode_init(AVCodecContext *avctx)
 {
 AACContext *ac = avctx->priv_data;
+ int ret;
 
 ac->avctx = avctx;
 ac->oc[1].m4ac.sample_rate = avctx->sample_rate;
@@ -849,10 +993,11 @@
 avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
 
 if (avctx->extradata_size > 0) {
- if (decode_audio_specific_config(ac, ac->avctx, &ac->oc[1].m4ac,
- avctx->extradata,
- avctx->extradata_size*8, 1) < 0)
- return -1;
+ if ((ret = decode_audio_specific_config(ac, ac->avctx, &ac->oc[1].m4ac,
+ avctx->extradata,
+ avctx->extradata_size * 8,
+ 1)) < 0)
+ return ret;
 } else {
 int sr, i;
 uint8_t layout_map[MAX_ELEM_ID*4][3];
@@ -897,7 +1042,6 @@
 
 ff_aac_sbr_init();
 
- ff_dsputil_init(&ac->dsp, avctx);
 ff_fmt_convert_init(&ac->fmt_conv, avctx);
 avpriv_float_dsp_init(&ac->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
 
@@ -905,25 +1049,29 @@
 
 ff_aac_tableinit();
 
- INIT_VLC_STATIC(&vlc_scalefactors,7,FF_ARRAY_ELEMS(ff_aac_scalefactor_code),
- ff_aac_scalefactor_bits, sizeof(ff_aac_scalefactor_bits[0]), sizeof(ff_aac_scalefactor_bits[0]),
- ff_aac_scalefactor_code, sizeof(ff_aac_scalefactor_code[0]), sizeof(ff_aac_scalefactor_code[0]),
+ INIT_VLC_STATIC(&vlc_scalefactors, 7,
+ FF_ARRAY_ELEMS(ff_aac_scalefactor_code),
+ ff_aac_scalefactor_bits,
+ sizeof(ff_aac_scalefactor_bits[0]),
+ sizeof(ff_aac_scalefactor_bits[0]),
+ ff_aac_scalefactor_code,
+ sizeof(ff_aac_scalefactor_code[0]),
+ sizeof(ff_aac_scalefactor_code[0]),
 352);
 
 ff_mdct_init(&ac->mdct, 11, 1, 1.0 / (32768.0 * 1024.0));
+ ff_mdct_init(&ac->mdct_ld, 10, 1, 1.0 / (32768.0 * 512.0));
 ff_mdct_init(&ac->mdct_small, 8, 1, 1.0 / (32768.0 * 128.0));
 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_short_128, 6.0, 128);
 ff_init_ff_sine_windows(10);
+ ff_init_ff_sine_windows( 9);
 ff_init_ff_sine_windows( 7);
 
 cbrt_tableinit();
 
- avcodec_get_frame_defaults(&ac->frame);
- avctx->coded_frame = &ac->frame;
-
 return 0;
 }
 
@@ -941,7 +1089,7 @@
 
 if (get_bits_left(gb) < 8 * count) {
 av_log(ac->avctx, AV_LOG_ERROR, overread_err);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 skip_bits_long(gb, 8 * count);
 return 0;
@@ -953,9 +1101,11 @@
 int sfb;
 if (get_bits1(gb)) {
 ics->predictor_reset_group = get_bits(gb, 5);
- if (ics->predictor_reset_group == 0 || ics->predictor_reset_group > 30) {
- av_log(ac->avctx, AV_LOG_ERROR, "Invalid Predictor Reset Group.\n");
- return -1;
+ if (ics->predictor_reset_group == 0 ||
+ ics->predictor_reset_group > 30) {
+ av_log(ac->avctx, AV_LOG_ERROR,
+ "Invalid Predictor Reset Group.\n");
+ return AVERROR_INVALIDDATA;
 }
 }
 for (sfb = 0; sfb < FFMIN(ics->max_sfb, ff_aac_pred_sfb_max[ac->oc[1].m4ac.sampling_index]); sfb++) {
@@ -984,14 +1134,25 @@
 static int decode_ics_info(AACContext *ac, IndividualChannelStream *ics,
 GetBitContext *gb)
 {
- if (get_bits1(gb)) {
- av_log(ac->avctx, AV_LOG_ERROR, "Reserved bit set.\n");
- return AVERROR_INVALIDDATA;
+ int aot = ac->oc[1].m4ac.object_type;
+ if (aot != AOT_ER_AAC_ELD) {
+ if (get_bits1(gb)) {
+ av_log(ac->avctx, AV_LOG_ERROR, "Reserved bit set.\n");
+ return AVERROR_INVALIDDATA;
+ }
+ ics->window_sequence[1] = ics->window_sequence[0];
+ ics->window_sequence[0] = get_bits(gb, 2);
+ if (aot == AOT_ER_AAC_LD &&
+ ics->window_sequence[0] != ONLY_LONG_SEQUENCE) {
+ av_log(ac->avctx, AV_LOG_ERROR,
+ "AAC LD is only defined for ONLY_LONG_SEQUENCE but "
+ "window sequence %d found.\n", ics->window_sequence[0]);
+ ics->window_sequence[0] = ONLY_LONG_SEQUENCE;
+ return AVERROR_INVALIDDATA;
+ }
+ ics->use_kb_window[1] = ics->use_kb_window[0];
+ ics->use_kb_window[0] = get_bits1(gb);
 }
- ics->window_sequence[1] = ics->window_sequence[0];
- ics->window_sequence[0] = get_bits(gb, 2);
- ics->use_kb_window[1] = ics->use_kb_window[0];
- ics->use_kb_window[0] = get_bits1(gb);
 ics->num_window_groups = 1;
 ics->group_len[0] = 1;
 if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) {
@@ -1013,20 +1174,37 @@
 } else {
 ics->max_sfb = get_bits(gb, 6);
 ics->num_windows = 1;
- 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->predictor_present = get_bits1(gb);
- ics->predictor_reset_group = 0;
+ 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];
+ }
+ if (aot != AOT_ER_AAC_ELD) {
+ ics->predictor_present = get_bits1(gb);
+ ics->predictor_reset_group = 0;
+ }
 if (ics->predictor_present) {
- if (ac->oc[1].m4ac.object_type == AOT_AAC_MAIN) {
+ if (aot == AOT_AAC_MAIN) {
 if (decode_prediction(ac, ics, gb)) {
 return AVERROR_INVALIDDATA;
 }
- } else if (ac->oc[1].m4ac.object_type == AOT_AAC_LC) {
- av_log(ac->avctx, AV_LOG_ERROR, "Prediction is not allowed in AAC-LC.\n");
+ } else if (aot == AOT_AAC_LC ||
+ aot == AOT_ER_AAC_LC) {
+ av_log(ac->avctx, AV_LOG_ERROR,
+ "Prediction is not allowed in AAC-LC.\n");
 return AVERROR_INVALIDDATA;
 } else {
+ if (aot == AOT_ER_AAC_LD) {
+ av_log(ac->avctx, AV_LOG_ERROR,
+ "LTP in ER AAC LD not yet implemented.\n");
+ return AVERROR_PATCHWELCOME;
+ }
 if ((ics->ltp.present = get_bits(gb, 1)))
 decode_ltp(&ics->ltp, gb, ics->max_sfb);
 }
@@ -1035,7 +1213,8 @@
 
 if (ics->max_sfb > ics->num_swb) {
 av_log(ac->avctx, AV_LOG_ERROR,
- "Number of scalefactor bands in group (%d) exceeds limit (%d).\n",
+ "Number of scalefactor bands in group (%d) "
+ "exceeds limit (%d).\n",
 ics->max_sfb, ics->num_swb);
 return AVERROR_INVALIDDATA;
 }
@@ -1065,20 +1244,20 @@
 int sect_band_type = get_bits(gb, 4);
 if (sect_band_type == 12) {
 av_log(ac->avctx, AV_LOG_ERROR, "invalid band type\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 do {
 sect_len_incr = get_bits(gb, bits);
 sect_end += sect_len_incr;
 if (get_bits_left(gb) < 0) {
 av_log(ac->avctx, AV_LOG_ERROR, overread_err);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (sect_end > ics->max_sfb) {
 av_log(ac->avctx, AV_LOG_ERROR,
 "Number of bands (%d) exceeds limit (%d).\n",
 sect_end, ics->max_sfb);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 } while (sect_len_incr == (1 << bits) - 1);
 for (; k < sect_end; k++) {
@@ -1115,16 +1294,17 @@
 int run_end = band_type_run_end[idx];
 if (band_type[idx] == ZERO_BT) {
 for (; i < run_end; i++, idx++)
- sf[idx] = 0.;
- } else if ((band_type[idx] == INTENSITY_BT) || (band_type[idx] == INTENSITY_BT2)) {
+ sf[idx] = 0.0;
+ } else if ((band_type[idx] == INTENSITY_BT) ||
+ (band_type[idx] == INTENSITY_BT2)) {
 for (; i < run_end; i++, idx++) {
 offset[2] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60;
 clipped_offset = av_clip(offset[2], -155, 100);
 if (offset[2] != clipped_offset) {
- av_log_ask_for_sample(ac->avctx, "Intensity stereo "
- "position clipped (%d -> %d).\nIf you heard an "
- "audible artifact, there may be a bug in the "
- "decoder. ", offset[2], clipped_offset);
+ avpriv_request_sample(ac->avctx,
+ "If you heard an audible artifact, there may be a bug in the decoder. "
+ "Clipped intensity stereo position (%d -> %d)",
+ offset[2], clipped_offset);
 }
 sf[idx] = ff_aac_pow2sf_tab[-clipped_offset + POW_SF2_ZERO];
 }
@@ -1136,10 +1316,10 @@
 offset[1] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60;
 clipped_offset = av_clip(offset[1], -100, 155);
 if (offset[1] != clipped_offset) {
- av_log_ask_for_sample(ac->avctx, "Noise gain clipped "
- "(%d -> %d).\nIf you heard an audible "
- "artifact, there may be a bug in the decoder. ",
- offset[1], clipped_offset);
+ avpriv_request_sample(ac->avctx,
+ "If you heard an audible artifact, there may be a bug in the decoder. "
+ "Clipped noise gain (%d -> %d)",
+ offset[1], clipped_offset);
 }
 sf[idx] = -ff_aac_pow2sf_tab[clipped_offset + POW_SF2_ZERO];
 }
@@ -1149,7 +1329,7 @@
 if (offset[0] > 255U) {
 av_log(ac->avctx, AV_LOG_ERROR,
 "Scalefactor (%d) out of range.\n", offset[0]);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 sf[idx] = -ff_aac_pow2sf_tab[offset[0] - 100 + POW_SF2_ZERO];
 }
@@ -1204,10 +1384,11 @@
 tns->length[w][filt] = get_bits(gb, 6 - 2 * is8);
 
 if ((tns->order[w][filt] = get_bits(gb, 5 - 2 * is8)) > tns_max_order) {
- av_log(ac->avctx, AV_LOG_ERROR, "TNS filter order %d is greater than maximum %d.\n",
+ av_log(ac->avctx, AV_LOG_ERROR,
+ "TNS filter order %d is greater than maximum %d.\n",
 tns->order[w][filt], tns_max_order);
 tns->order[w][filt] = 0;
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (tns->order[w][filt]) {
 tns->direction[w][filt] = get_bits1(gb);
@@ -1236,7 +1417,9 @@
 {
 int idx;
 if (ms_present == 1) {
- for (idx = 0; idx < cpe->ch[0].ics.num_window_groups * cpe->ch[0].ics.max_sfb; idx++)
+ for (idx = 0;
+ idx < cpe->ch[0].ics.num_window_groups * cpe->ch[0].ics.max_sfb;
+ idx++)
 cpe->ms_mask[idx] = get_bits1(gb);
 } else if (ms_present == 2) {
 memset(cpe->ms_mask, 1, cpe->ch[0].ics.num_window_groups * cpe->ch[0].ics.max_sfb * sizeof(cpe->ms_mask[0]));
@@ -1335,7 +1518,8 @@
 float *coef_base = coef;
 
 for (g = 0; g < ics->num_windows; g++)
- memset(coef + g * 128 + offsets[ics->max_sfb], 0, sizeof(float) * (c - offsets[ics->max_sfb]));
+ memset(coef + g * 128 + offsets[ics->max_sfb], 0,
+ sizeof(float) * (c - offsets[ics->max_sfb]));
 
 for (g = 0; g < ics->num_window_groups; g++) {
 unsigned g_len = ics->group_len[g];
@@ -1360,7 +1544,7 @@
 cfo[k] = ac->random_state;
 }
 
- band_energy = ac->dsp.scalarproduct_float(cfo, cfo, off_len);
+ band_energy = ac->fdsp.scalarproduct_float(cfo, cfo, off_len);
 scale = sf[idx] / sqrtf(band_energy);
 ac->fdsp.vector_fmul_scalar(cfo, cfo, scale, off_len);
 }
@@ -1490,7 +1674,7 @@
 
 if (b > 8) {
 av_log(ac->avctx, AV_LOG_ERROR, "error in spectral data, ESC overflow\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 SKIP_BITS(re, gb, b + 1);
@@ -1605,14 +1789,20 @@
 }
 
 if (sce->ics.window_sequence[0] != EIGHT_SHORT_SEQUENCE) {
- for (sfb = 0; sfb < ff_aac_pred_sfb_max[ac->oc[1].m4ac.sampling_index]; sfb++) {
- for (k = sce->ics.swb_offset[sfb]; k < sce->ics.swb_offset[sfb + 1]; k++) {
+ for (sfb = 0;
+ sfb < ff_aac_pred_sfb_max[ac->oc[1].m4ac.sampling_index];
+ sfb++) {
+ for (k = sce->ics.swb_offset[sfb];
+ k < sce->ics.swb_offset[sfb + 1];
+ k++) {
 predict(&sce->predictor_state[k], &sce->coeffs[k],
- sce->ics.predictor_present && sce->ics.prediction_used[sfb]);
+ sce->ics.predictor_present &&
+ sce->ics.prediction_used[sfb]);
 }
 }
 if (sce->ics.predictor_reset_group)
- reset_predictor_group(sce->predictor_state, sce->ics.predictor_reset_group);
+ reset_predictor_group(sce->predictor_state,
+ sce->ics.predictor_reset_group);
 } else
 reset_all_predictors(sce->predictor_state);
 }
@@ -1632,7 +1822,14 @@
 TemporalNoiseShaping *tns = &sce->tns;
 IndividualChannelStream *ics = &sce->ics;
 float *out = sce->coeffs;
- int global_gain, pulse_present = 0;
+ int global_gain, eld_syntax, er_syntax, pulse_present = 0;
+ int ret;
+
+ eld_syntax = ac->oc[1].m4ac.object_type == AOT_ER_AAC_ELD;
+ er_syntax = ac->oc[1].m4ac.object_type == AOT_ER_AAC_LC ||
+ ac->oc[1].m4ac.object_type == AOT_ER_AAC_LTP ||
+ ac->oc[1].m4ac.object_type == AOT_ER_AAC_LD ||
+ ac->oc[1].m4ac.object_type == AOT_ER_AAC_ELD;
 
 /* This assignment is to silence a GCC warning about the variable being used
 * uninitialized when in fact it always is.
@@ -1646,33 +1843,45 @@
 return AVERROR_INVALIDDATA;
 }
 
- if (decode_band_types(ac, sce->band_type, sce->band_type_run_end, gb, ics) < 0)
- return -1;
- if (decode_scalefactors(ac, sce->sf, gb, global_gain, ics, sce->band_type, sce->band_type_run_end) < 0)
- return -1;
+ if ((ret = decode_band_types(ac, sce->band_type,
+ sce->band_type_run_end, gb, ics)) < 0)
+ return ret;
+ if ((ret = decode_scalefactors(ac, sce->sf, gb, global_gain, ics,
+ sce->band_type, sce->band_type_run_end)) < 0)
+ return ret;
 
 pulse_present = 0;
 if (!scale_flag) {
- if ((pulse_present = get_bits1(gb))) {
+ if (!eld_syntax && (pulse_present = get_bits1(gb))) {
 if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) {
- av_log(ac->avctx, AV_LOG_ERROR, "Pulse tool not allowed in eight short sequence.\n");
- return -1;
+ av_log(ac->avctx, AV_LOG_ERROR,
+ "Pulse tool not allowed in eight short sequence.\n");
+ return AVERROR_INVALIDDATA;
 }
 if (decode_pulses(&pulse, gb, ics->swb_offset, ics->num_swb)) {
- av_log(ac->avctx, AV_LOG_ERROR, "Pulse data corrupt or invalid.\n");
- return -1;
+ av_log(ac->avctx, AV_LOG_ERROR,
+ "Pulse data corrupt or invalid.\n");
+ return AVERROR_INVALIDDATA;
 }
 }
- if ((tns->present = get_bits1(gb)) && decode_tns(ac, tns, gb, ics))
- return -1;
- if (get_bits1(gb)) {
- av_log_missing_feature(ac->avctx, "SSR", 1);
+ tns->present = get_bits1(gb);
+ if (tns->present && !er_syntax)
+ if (decode_tns(ac, tns, gb, ics) < 0)
+ return AVERROR_INVALIDDATA;
+ if (!eld_syntax && get_bits1(gb)) {
+ avpriv_request_sample(ac->avctx, "SSR");
 return AVERROR_PATCHWELCOME;
 }
+ // I see no textual basis in the spec for this occuring after SSR gain
+ // control, but this is what both reference and real implmentations do
+ if (tns->present && er_syntax)
+ if (decode_tns(ac, tns, gb, ics) < 0)
+ return AVERROR_INVALIDDATA;
 }
 
- if (decode_spectrum_and_dequant(ac, out, gb, sce->sf, pulse_present, &pulse, ics, sce->band_type) < 0)
- return -1;
+ if (decode_spectrum_and_dequant(ac, out, gb, sce->sf, pulse_present,
+ &pulse, ics, sce->band_type) < 0)
+ return AVERROR_INVALIDDATA;
 
 if (ac->oc[1].m4ac.object_type == AOT_AAC_MAIN && !common_window)
 apply_prediction(ac, sce);
@@ -1693,11 +1902,12 @@
 for (g = 0; g < ics->num_window_groups; g++) {
 for (i = 0; i < ics->max_sfb; i++, idx++) {
 if (cpe->ms_mask[idx] &&
- cpe->ch[0].band_type[idx] < NOISE_BT && cpe->ch[1].band_type[idx] < NOISE_BT) {
+ cpe->ch[0].band_type[idx] < NOISE_BT &&
+ cpe->ch[1].band_type[idx] < NOISE_BT) {
 for (group = 0; group < ics->group_len[g]; group++) {
- ac->dsp.butterflies_float(ch0 + group * 128 + offsets[i],
- ch1 + group * 128 + offsets[i],
- offsets[i+1] - offsets[i]);
+ ac->fdsp.butterflies_float(ch0 + group * 128 + offsets[i],
+ ch1 + group * 128 + offsets[i],
+ offsets[i+1] - offsets[i]);
 }
 }
 }
@@ -1713,7 +1923,8 @@
 * [1] mask is decoded from bitstream; [2] mask is all 1s;
 * [3] reserved for scalable AAC
 */
-static void apply_intensity_stereo(AACContext *ac, ChannelElement *cpe, int ms_present)
+static void apply_intensity_stereo(AACContext *ac,
+ ChannelElement *cpe, int ms_present)
 {
 const IndividualChannelStream *ics = &cpe->ch[1].ics;
 SingleChannelElement *sce1 = &cpe->ch[1];
@@ -1724,7 +1935,8 @@
 float scale;
 for (g = 0; g < ics->num_window_groups; g++) {
 for (i = 0; i < ics->max_sfb;) {
- if (sce1->band_type[idx] == INTENSITY_BT || sce1->band_type[idx] == INTENSITY_BT2) {
+ if (sce1->band_type[idx] == INTENSITY_BT ||
+ sce1->band_type[idx] == INTENSITY_BT2) {
 const int bt_run_end = sce1->band_type_run_end[idx];
 for (; i < bt_run_end; i++, idx++) {
 c = -1 + 2 * (sce1->band_type[idx] - 14);
@@ -1756,21 +1968,23 @@
 static int decode_cpe(AACContext *ac, GetBitContext *gb, ChannelElement *cpe)
 {
 int i, ret, common_window, ms_present = 0;
+ int eld_syntax = ac->oc[1].m4ac.object_type == AOT_ER_AAC_ELD;
 
- common_window = get_bits1(gb);
+ common_window = eld_syntax || get_bits1(gb);
 if (common_window) {
 if (decode_ics_info(ac, &cpe->ch[0].ics, gb))
 return AVERROR_INVALIDDATA;
 i = cpe->ch[1].ics.use_kb_window[0];
 cpe->ch[1].ics = cpe->ch[0].ics;
 cpe->ch[1].ics.use_kb_window[1] = i;
- if (cpe->ch[1].ics.predictor_present && (ac->oc[1].m4ac.object_type != AOT_AAC_MAIN))
+ if (cpe->ch[1].ics.predictor_present &&
+ (ac->oc[1].m4ac.object_type != AOT_AAC_MAIN))
 if ((cpe->ch[1].ics.ltp.present = get_bits(gb, 1)))
 decode_ltp(&cpe->ch[1].ics.ltp, gb, cpe->ch[1].ics.max_sfb);
 ms_present = get_bits(gb, 2);
 if (ms_present == 3) {
 av_log(ac->avctx, AV_LOG_ERROR, "ms_present = 3 is reserved.\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 } else if (ms_present)
 decode_mid_side_stereo(cpe, gb, ms_present);
 }
@@ -1838,7 +2052,7 @@
 int idx = 0;
 int cge = 1;
 int gain = 0;
- float gain_cache = 1.;
+ float gain_cache = 1.0;
 if (c) {
 cge = coup->coupling_point == AFTER_IMDCT ? 1 : get_bits1(gb);
 gain = cge ? get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60: 0;
@@ -1972,10 +2186,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;
@@ -2069,9 +2285,9 @@
 ac->fdsp.vector_fmul(in + 448, in + 448, swindow_prev, 128);
 }
 if (ics->window_sequence[0] != LONG_START_SEQUENCE) {
- ac->dsp.vector_fmul_reverse(in + 1024, in + 1024, lwindow, 1024);
+ ac->fdsp.vector_fmul_reverse(in + 1024, in + 1024, lwindow, 1024);
 } else {
- ac->dsp.vector_fmul_reverse(in + 1024 + 448, in + 1024 + 448, swindow, 128);
+ ac->fdsp.vector_fmul_reverse(in + 1024 + 448, in + 1024 + 448, swindow, 128);
 memset(in + 1024 + 576, 0, 448 * sizeof(float));
 }
 ac->mdct_ltp.mdct_calc(&ac->mdct_ltp, out, in);
@@ -2124,17 +2340,17 @@
 if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) {
 memcpy(saved_ltp, saved, 512 * sizeof(float));
 memset(saved_ltp + 576, 0, 448 * sizeof(float));
- ac->dsp.vector_fmul_reverse(saved_ltp + 448, ac->buf_mdct + 960, &swindow[64], 64);
+ ac->fdsp.vector_fmul_reverse(saved_ltp + 448, ac->buf_mdct + 960, &swindow[64], 64);
 for (i = 0; i < 64; i++)
 saved_ltp[i + 512] = ac->buf_mdct[1023 - i] * swindow[63 - i];
 } else if (ics->window_sequence[0] == LONG_START_SEQUENCE) {
 memcpy(saved_ltp, ac->buf_mdct + 512, 448 * sizeof(float));
 memset(saved_ltp + 576, 0, 448 * sizeof(float));
- ac->dsp.vector_fmul_reverse(saved_ltp + 448, ac->buf_mdct + 960, &swindow[64], 64);
+ ac->fdsp.vector_fmul_reverse(saved_ltp + 448, ac->buf_mdct + 960, &swindow[64], 64);
 for (i = 0; i < 64; i++)
 saved_ltp[i + 512] = ac->buf_mdct[1023 - i] * swindow[63 - i];
 } else { // LONG_STOP or ONLY_LONG
- ac->dsp.vector_fmul_reverse(saved_ltp, ac->buf_mdct + 512, &lwindow[512], 512);
+ ac->fdsp.vector_fmul_reverse(saved_ltp, ac->buf_mdct + 512, &lwindow[512], 512);
 for (i = 0; i < 512; i++)
 saved_ltp[i + 512] = ac->buf_mdct[1023 - i] * lwindow[511 - i];
 }
@@ -2175,36 +2391,117 @@
 */
 if ((ics->window_sequence[1] == ONLY_LONG_SEQUENCE || ics->window_sequence[1] == LONG_STOP_SEQUENCE) &&
 (ics->window_sequence[0] == ONLY_LONG_SEQUENCE || ics->window_sequence[0] == LONG_START_SEQUENCE)) {
- ac->dsp.vector_fmul_window( out, saved, buf, lwindow_prev, 512);
+ ac->fdsp.vector_fmul_window( out, saved, buf, lwindow_prev, 512);
 } else {
- memcpy( out, saved, 448 * sizeof(float));
+ memcpy( out, saved, 448 * sizeof(float));
 
 if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) {
- ac->dsp.vector_fmul_window(out + 448 + 0*128, saved + 448, buf + 0*128, swindow_prev, 64);
- ac->dsp.vector_fmul_window(out + 448 + 1*128, buf + 0*128 + 64, buf + 1*128, swindow, 64);
- ac->dsp.vector_fmul_window(out + 448 + 2*128, buf + 1*128 + 64, buf + 2*128, swindow, 64);
- ac->dsp.vector_fmul_window(out + 448 + 3*128, buf + 2*128 + 64, buf + 3*128, swindow, 64);
- ac->dsp.vector_fmul_window(temp, buf + 3*128 + 64, buf + 4*128, swindow, 64);
- memcpy( out + 448 + 4*128, temp, 64 * sizeof(float));
+ ac->fdsp.vector_fmul_window(out + 448 + 0*128, saved + 448, buf + 0*128, swindow_prev, 64);
+ ac->fdsp.vector_fmul_window(out + 448 + 1*128, buf + 0*128 + 64, buf + 1*128, swindow, 64);
+ ac->fdsp.vector_fmul_window(out + 448 + 2*128, buf + 1*128 + 64, buf + 2*128, swindow, 64);
+ ac->fdsp.vector_fmul_window(out + 448 + 3*128, buf + 2*128 + 64, buf + 3*128, swindow, 64);
+ ac->fdsp.vector_fmul_window(temp, buf + 3*128 + 64, buf + 4*128, swindow, 64);
+ memcpy( out + 448 + 4*128, temp, 64 * sizeof(float));
 } else {
- ac->dsp.vector_fmul_window(out + 448, saved + 448, buf, swindow_prev, 64);
- memcpy( out + 576, buf + 64, 448 * sizeof(float));
+ ac->fdsp.vector_fmul_window(out + 448, saved + 448, buf, swindow_prev, 64);
+ memcpy( out + 576, buf + 64, 448 * sizeof(float));
 }
 }
 
 // buffer update
 if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) {
- memcpy( saved, temp + 64, 64 * sizeof(float));
- ac->dsp.vector_fmul_window(saved + 64, buf + 4*128 + 64, buf + 5*128, swindow, 64);
- ac->dsp.vector_fmul_window(saved + 192, buf + 5*128 + 64, buf + 6*128, swindow, 64);
- ac->dsp.vector_fmul_window(saved + 320, buf + 6*128 + 64, buf + 7*128, swindow, 64);
- memcpy( saved + 448, buf + 7*128 + 64, 64 * sizeof(float));
+ memcpy( saved, temp + 64, 64 * sizeof(float));
+ ac->fdsp.vector_fmul_window(saved + 64, buf + 4*128 + 64, buf + 5*128, swindow, 64);
+ ac->fdsp.vector_fmul_window(saved + 192, buf + 5*128 + 64, buf + 6*128, swindow, 64);
+ ac->fdsp.vector_fmul_window(saved + 320, buf + 6*128 + 64, buf + 7*128, swindow, 64);
+ memcpy( saved + 448, buf + 7*128 + 64, 64 * sizeof(float));
 } else if (ics->window_sequence[0] == LONG_START_SEQUENCE) {
- memcpy( saved, buf + 512, 448 * sizeof(float));
- memcpy( saved + 448, buf + 7*128 + 64, 64 * sizeof(float));
+ memcpy( saved, buf + 512, 448 * sizeof(float));
+ memcpy( saved + 448, buf + 7*128 + 64, 64 * sizeof(float));
 } else { // LONG_STOP or ONLY_LONG
- memcpy( saved, buf + 512, 512 * sizeof(float));
+ memcpy( saved, buf + 512, 512 * sizeof(float));
+ }
+}
+
+static void imdct_and_windowing_ld(AACContext *ac, SingleChannelElement *sce)
+{
+ IndividualChannelStream *ics = &sce->ics;
+ float *in = sce->coeffs;
+ float *out = sce->ret;
+ float *saved = sce->saved;
+ float *buf = ac->buf_mdct;
+
+ // imdct
+ ac->mdct.imdct_half(&ac->mdct_ld, buf, in);
+
+ // window overlapping
+ 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));
+}
+
+static void imdct_and_windowing_eld(AACContext *ac, SingleChannelElement *sce)
+{
+ float *in = sce->coeffs;
+ float *out = sce->ret;
+ float *saved = sce->saved;
+ const float *const window = ff_aac_eld_window;
+ float *buf = ac->buf_mdct;
+ int i;
+ const int n = 512;
+ const int n2 = n >> 1;
+ const int n4 = n >> 2;
+
+ // 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
+ // URL: http://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=4590245&isnumber=4589950
+ for (i = 0; i < n2; i+=2) {
+ float temp;
+ temp = in[i ]; in[i ] = -in[n - 1 - i]; in[n - 1 - i] = temp;
+ temp = -in[i + 1]; in[i + 1] = in[n - 2 - i]; in[n - 2 - i] = temp;
+ }
+ ac->mdct.imdct_half(&ac->mdct_ld, buf, in);
+ for (i = 0; i < n; i+=2) {
+ buf[i] = -buf[i];
+ }
+ // Like with the regular IMDCT at this point we still have the middle half
+ // of a transform but with even symmetry on the left and odd symmetry on
+ // the right
+
+ // window overlapping
+ // The spec says to use samples [0..511] but the reference decoder uses
+ // samples [128..639].
+ for (i = n4; i < n2; i ++) {
+ out[i - n4] = buf[n2 - 1 - i] * window[i - n4] +
+ saved[ i + n2] * window[i + n - n4] +
+ -saved[ n + n2 - 1 - i] * window[i + 2*n - n4] +
+ -saved[2*n + n2 + i] * window[i + 3*n - n4];
+ }
+ for (i = 0; i < n2; i ++) {
+ out[n4 + i] = buf[i] * window[i + n2 - n4] +
+ -saved[ n - 1 - i] * window[i + n2 + n - n4] +
+ -saved[ n + i] * window[i + n2 + 2*n - n4] +
+ saved[2*n + n - 1 - i] * window[i + n2 + 3*n - n4];
+ }
+ for (i = 0; i < n4; i ++) {
+ out[n2 + n4 + i] = buf[ i + n2] * window[i + n - n4] +
+ -saved[ n2 - 1 - i] * window[i + 2*n - n4] +
+ -saved[ n + n2 + i] * window[i + 3*n - n4];
+ }
+
+ // buffer update
+ memmove(saved + n, saved, 2 * n * sizeof(float));
+ memcpy( saved, buf, n * sizeof(float));
 }
 
 /**
@@ -2303,6 +2600,17 @@
 static void spectral_to_sample(AACContext *ac)
 {
 int i, type;
+ void (*imdct_and_window)(AACContext *ac, SingleChannelElement *sce);
+ switch (ac->oc[1].m4ac.object_type) {
+ case AOT_ER_AAC_LD:
+ imdct_and_window = imdct_and_windowing_ld;
+ break;
+ case AOT_ER_AAC_ELD:
+ imdct_and_window = imdct_and_windowing_eld;
+ break;
+ default:
+ imdct_and_window = imdct_and_windowing;
+ }
 for (type = 3; type >= 0; type--) {
 for (i = 0; i < MAX_ELEM_ID; i++) {
 ChannelElement *che = ac->che[type][i];
@@ -2324,11 +2632,11 @@
 if (type <= TYPE_CPE)
 apply_channel_coupling(ac, che, type, i, BETWEEN_TNS_AND_IMDCT, apply_dependent_coupling);
 if (type != TYPE_CCE || che->coup.coupling_point == AFTER_IMDCT) {
- imdct_and_windowing(ac, &che->ch[0]);
+ imdct_and_window(ac, &che->ch[0]);
 if (ac->oc[1].m4ac.object_type == AOT_AAC_LTP)
 update_ltp(ac, &che->ch[0]);
 if (type == TYPE_CPE) {
- imdct_and_windowing(ac, &che->ch[1]);
+ imdct_and_window(ac, &che->ch[1]);
 if (ac->oc[1].m4ac.object_type == AOT_AAC_LTP)
 update_ltp(ac, &che->ch[1]);
 }
@@ -2348,23 +2656,27 @@
 int size;
 AACADTSHeaderInfo hdr_info;
 uint8_t layout_map[MAX_ELEM_ID*4][3];
- int layout_map_tags;
+ int layout_map_tags, ret;
 
 size = avpriv_aac_parse_header(gb, &hdr_info);
 if (size > 0) {
 if (hdr_info.num_aac_frames != 1) {
- av_log_missing_feature(ac->avctx, "More than one AAC RDB per ADTS frame", 0);
+ avpriv_report_missing_feature(ac->avctx,
+ "More than one AAC RDB per ADTS frame");
 return AVERROR_PATCHWELCOME;
 }
 push_output_configuration(ac);
 if (hdr_info.chan_config) {
 ac->oc[1].m4ac.chan_config = hdr_info.chan_config;
- if (set_default_channel_config(ac->avctx, layout_map,
- &layout_map_tags, hdr_info.chan_config))
- return -7;
- if (output_configure(ac, layout_map, layout_map_tags,
- FFMAX(ac->oc[1].status, OC_TRIAL_FRAME), 0))
- return -7;
+ if ((ret = set_default_channel_config(ac->avctx,
+ layout_map,
+ &layout_map_tags,
+ hdr_info.chan_config)) < 0)
+ return ret;
+ if ((ret = output_configure(ac, layout_map, layout_map_tags,
+ FFMAX(ac->oc[1].status,
+ OC_TRIAL_FRAME), 0)) < 0)
+ return ret;
 } else {
 ac->oc[1].m4ac.chan_config = 0;
 }
@@ -2383,6 +2695,71 @@
 return size;
 }
 
+static int aac_decode_er_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, GetBitContext *gb)
+{
+ AACContext *ac = avctx->priv_data;
+ ChannelElement *che;
+ int err, i;
+ int samples = 1024;
+ int chan_config = ac->oc[1].m4ac.chan_config;
+ int aot = ac->oc[1].m4ac.object_type;
+
+ if (aot == AOT_ER_AAC_LD || aot == AOT_ER_AAC_ELD)
+ samples >>= 1;
+
+ ac->frame = data;
+
+ 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) {
+ avpriv_request_sample(avctx, "Unknown ER channel configuration %d",
+ ac->oc[1].m4ac.chan_config);
+ return AVERROR_INVALIDDATA;
+ }
+ for (i = 0; i < tags_per_config[chan_config]; i++) {
+ const int elem_type = aac_channel_layout_map[chan_config-1][i][0];
+ const int elem_id = aac_channel_layout_map[chan_config-1][i][1];
+ if (!(che=get_che(ac, elem_type, elem_id))) {
+ av_log(ac->avctx, AV_LOG_ERROR,
+ "channel element %d.%d is not allocated\n",
+ elem_type, elem_id);
+ return AVERROR_INVALIDDATA;
+ }
+ if (aot != AOT_ER_AAC_ELD)
+ skip_bits(gb, 4);
+ switch (elem_type) {
+ case TYPE_SCE:
+ err = decode_ics(ac, &che->ch[0], gb, 0, 0);
+ break;
+ case TYPE_CPE:
+ err = decode_cpe(ac, gb, che);
+ break;
+ case TYPE_LFE:
+ err = decode_ics(ac, &che->ch[0], gb, 0, 0);
+ break;
+ }
+ if (err < 0)
+ return err;
+ }
+
+ 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));
+ return 0;
+}
+
 static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, GetBitContext *gb)
 {
@@ -2392,23 +2769,26 @@
 int err, elem_id;
 int samples = 0, multiplier, audio_found = 0, pce_found = 0;
 
+ ac->frame = data;
+
 if (show_bits(gb, 12) == 0xfff) {
- if (parse_adts_frame_header(ac, gb) < 0) {
+ if ((err = parse_adts_frame_header(ac, gb)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "Error decoding AAC frame header.\n");
- err = -1;
 goto fail;
 }
 if (ac->oc[1].m4ac.sampling_index > 12) {
 av_log(ac->avctx, AV_LOG_ERROR, "invalid sampling rate index %d\n", ac->oc[1].m4ac.sampling_index);
- err = -1;
+ err = AVERROR_INVALIDDATA;
 goto fail;
 }
 }
 
- if (frame_configure_elements(avctx) < 0) {
- err = -1;
+ 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
@@ -2419,7 +2799,7 @@
 if (!(che=get_che(ac, elem_type, elem_id))) {
 av_log(ac->avctx, AV_LOG_ERROR, "channel element %d.%d is not allocated\n",
 elem_type, elem_id);
- err = -1;
+ err = AVERROR_INVALIDDATA;
 goto fail;
 }
 samples = 1024;
@@ -2475,7 +2855,7 @@
 elem_id += get_bits(gb, 8) - 1;
 if (get_bits_left(gb) < 8 * elem_id) {
 av_log(avctx, AV_LOG_ERROR, overread_err);
- err = -1;
+ err = AVERROR_INVALIDDATA;
 goto fail;
 }
 while (elem_id > 0)
@@ -2484,7 +2864,7 @@
 break;
 
 default:
- err = -1; /* should not happen, but keeps compiler happy */
+ err = AVERROR_BUG; /* should not happen, but keeps compiler happy */
 break;
 }
 
@@ -2496,7 +2876,7 @@
 
 if (get_bits_left(gb) < 3) {
 av_log(avctx, AV_LOG_ERROR, overread_err);
- err = -1;
+ err = AVERROR_INVALIDDATA;
 goto fail;
 }
 }
@@ -2506,18 +2886,18 @@
 multiplier = (ac->oc[1].m4ac.sbr == 1) ? ac->oc[1].m4ac.ext_sample_rate > ac->oc[1].m4ac.sample_rate : 0;
 samples <<= multiplier;
 
- if (samples) {
- ac->frame.nb_samples = samples;
- *(AVFrame *)data = ac->frame;
- }
- *got_frame_ptr = !!samples;
-
 if (ac->oc[1].status && audio_found) {
 avctx->sample_rate = ac->oc[1].m4ac.sample_rate << multiplier;
 avctx->frame_size = samples;
 ac->oc[1].status = OC_LOCKED;
 }
 
+ if (samples) {
+ ac->frame->nb_samples = samples;
+ ac->frame->sample_rate = avctx->sample_rate;
+ }
+ *got_frame_ptr = !!samples;
+
 return 0;
 fail:
 pop_output_configuration(ac);
@@ -2556,9 +2936,20 @@
 }
 }
 
- init_get_bits(&gb, buf, buf_size * 8);
+ if ((err = init_get_bits(&gb, buf, buf_size * 8)) < 0)
+ return err;
 
- if ((err = aac_decode_frame_int(avctx, data, got_frame_ptr, &gb)) < 0)
+ switch (ac->oc[1].m4ac.object_type) {
+ case AOT_ER_AAC_LC:
+ case AOT_ER_AAC_LTP:
+ case AOT_ER_AAC_LD:
+ case AOT_ER_AAC_ELD:
+ err = aac_decode_er_frame(avctx, data, got_frame_ptr, &gb);
+ break;
+ default:
+ err = aac_decode_frame_int(avctx, data, got_frame_ptr, &gb);
+ }
+ if (err < 0)
 return err;
 
 buf_consumed = (get_bits_count(&gb) + 7) >> 3;
@@ -2584,6 +2975,7 @@
 
 ff_mdct_end(&ac->mdct);
 ff_mdct_end(&ac->mdct_small);
+ ff_mdct_end(&ac->mdct_ld);
 ff_mdct_end(&ac->mdct_ltp);
 return 0;
 }
@@ -2592,13 +2984,13 @@
 #define LOAS_SYNC_WORD 0x2b7 ///< 11 bits LOAS sync word
 
 struct LATMContext {
- AACContext aac_ctx; ///< containing AACContext
- int initialized; ///< initilized after a valid extradata was seen
+ AACContext aac_ctx; ///< containing AACContext
+ int initialized; ///< initilized after a valid extradata was seen
 
 // parser data
- int audio_mux_version_A; ///< LATM syntax version
- int frame_length_type; ///< 0/1 variable/fixed frame length
- int frame_length; ///< frame length for fixed frame length
+ int audio_mux_version_A; ///< LATM syntax version
+ int frame_length_type; ///< 0/1 variable/fixed frame length
+ int frame_length; ///< frame length for fixed frame length
 };
 
 static inline uint32_t latm_get_value(GetBitContext *b)
@@ -2625,8 +3017,8 @@
 asclen = get_bits_left(gb);
 
 if (config_start_bit % 8) {
- av_log_missing_feature(latmctx->aac_ctx.avctx,
- "Non-byte-aligned audio-specific config", 1);
+ avpriv_request_sample(latmctx->aac_ctx.avctx,
+ "Non-byte-aligned audio-specific config");
 return AVERROR_PATCHWELCOME;
 }
 if (asclen <= 0)
@@ -2638,7 +3030,8 @@
 if (bits_consumed < 0)
 return AVERROR_INVALIDDATA;
 
- if (ac->oc[1].m4ac.sample_rate != m4ac.sample_rate ||
+ if (!latmctx->initialized ||
+ ac->oc[1].m4ac.sample_rate != m4ac.sample_rate ||
 ac->oc[1].m4ac.chan_config != m4ac.chan_config) {
 
 av_log(avctx, AV_LOG_INFO, "audio config changed\n");
@@ -2680,8 +3073,7 @@
 skip_bits(gb, 6); // numSubFrames
 // numPrograms
 if (get_bits(gb, 4)) { // numPrograms
- av_log_missing_feature(latmctx->aac_ctx.avctx,
- "Multiple programs", 1);
+ avpriv_request_sample(latmctx->aac_ctx.avctx, "Multiple programs");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -2689,8 +3081,7 @@
 
 // for each layer (which there is only on in DVB)
 if (get_bits(gb, 3)) { // numLayer
- av_log_missing_feature(latmctx->aac_ctx.avctx,
- "Multiple layers", 1);
+ avpriv_request_sample(latmctx->aac_ctx.avctx, "Multiple layers");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -2801,7 +3192,8 @@
 int muxlength, err;
 GetBitContext gb;
 
- init_get_bits(&gb, avpkt->data, avpkt->size * 8);
+ if ((err = init_get_bits(&gb, avpkt->data, avpkt->size * 8)) < 0)
+ return err;
 
 // check for LOAS sync word
 if (get_bits(&gb, 11) != LOAS_SYNC_WORD)
@@ -2858,13 +3250,13 @@
 
 AVCodec ff_aac_decoder = {
 .name = "aac",
+ .long_name = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_AAC,
 .priv_data_size = sizeof(AACContext),
 .init = aac_decode_init,
 .close = aac_decode_close,
 .decode = aac_decode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"),
 .sample_fmts = (const enum AVSampleFormat[]) {
 AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE
 },
@@ -2879,13 +3271,13 @@
 */
 AVCodec ff_aac_latm_decoder = {
 .name = "aac_latm",
+ .long_name = NULL_IF_CONFIG_SMALL("AAC LATM (Advanced Audio Coding LATM syntax)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_AAC_LATM,
 .priv_data_size = sizeof(struct LATMContext),
 .init = latm_decode_init,
 .close = aac_decode_close,
 .decode = latm_decode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("AAC LATM (Advanced Audio Coding LATM syntax)"),
 .sample_fmts = (const enum AVSampleFormat[]) {
 AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE
 },

libav-v9.6.tar.bz2/libavcodec/aacenc.c -> libav-v10.1.tar.bz2/libavcodec/aacenc.c Changed

@@ -34,7 +34,6 @@
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "put_bits.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "mpeg4audio.h"
 #include "kbdwin.h"
@@ -183,7 +182,7 @@
 }
 
 #define WINDOW_FUNC(type) \
-static void apply_ ##type ##_window(DSPContext *dsp, AVFloatDSPContext *fdsp, \
+static void apply_ ##type ##_window(AVFloatDSPContext *fdsp, \
 SingleChannelElement *sce, \
 const float *audio)
 
@@ -193,8 +192,8 @@
 const float *pwindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_long_1024 : ff_sine_1024;
 float *out = sce->ret_buf;
 
- fdsp->vector_fmul (out, audio, lwindow, 1024);
- dsp->vector_fmul_reverse(out + 1024, audio + 1024, pwindow, 1024);
+ fdsp->vector_fmul (out, audio, lwindow, 1024);
+ fdsp->vector_fmul_reverse(out + 1024, audio + 1024, pwindow, 1024);
 }
 
 WINDOW_FUNC(long_start)
@@ -205,7 +204,7 @@
 
 fdsp->vector_fmul(out, audio, lwindow, 1024);
 memcpy(out + 1024, audio + 1024, sizeof(out[0]) * 448);
- dsp->vector_fmul_reverse(out + 1024 + 448, audio + 1024 + 448, swindow, 128);
+ fdsp->vector_fmul_reverse(out + 1024 + 448, audio + 1024 + 448, swindow, 128);
 memset(out + 1024 + 576, 0, sizeof(out[0]) * 448);
 }
 
@@ -218,7 +217,7 @@
 memset(out, 0, sizeof(out[0]) * 448);
 fdsp->vector_fmul(out + 448, audio + 448, swindow, 128);
 memcpy(out + 576, audio + 576, sizeof(out[0]) * 448);
- dsp->vector_fmul_reverse(out + 1024, audio + 1024, lwindow, 1024);
+ fdsp->vector_fmul_reverse(out + 1024, audio + 1024, lwindow, 1024);
 }
 
 WINDOW_FUNC(eight_short)
@@ -230,15 +229,15 @@
 int w;
 
 for (w = 0; w < 8; w++) {
- fdsp->vector_fmul (out, in, w ? pwindow : swindow, 128);
+ fdsp->vector_fmul (out, in, w ? pwindow : swindow, 128);
 out += 128;
 in += 128;
- dsp->vector_fmul_reverse(out, in, swindow, 128);
+ fdsp->vector_fmul_reverse(out, in, swindow, 128);
 out += 128;
 }
 }
 
-static void (*const apply_window[4])(DSPContext *dsp, AVFloatDSPContext *fdsp,
+static void (*const apply_window[4])(AVFloatDSPContext *fdsp,
 SingleChannelElement *sce,
 const float *audio) = {
 [ONLY_LONG_SEQUENCE] = apply_only_long_window,
@@ -253,7 +252,7 @@
 int i;
 float *output = sce->ret_buf;
 
- apply_window[sce->ics.window_sequence[0]](&s->dsp, &s->fdsp, sce, audio);
+ apply_window[sce->ics.window_sequence[0]](&s->fdsp, sce, audio);
 
 if (sce->ics.window_sequence[0] != EIGHT_SHORT_SEQUENCE)
 s->mdct1024.mdct_calc(&s->mdct1024, sce->coeffs, output);
@@ -598,7 +597,7 @@
 coeffs[ch] = cpe->ch[ch].coeffs;
 s->psy.model->analyze(&s->psy, start_ch, coeffs, wi);
 for (ch = 0; ch < chans; ch++) {
- s->cur_channel = start_ch * 2 + ch;
+ s->cur_channel = start_ch + ch;
 s->coder->search_for_quantizers(avctx, s, &cpe->ch[ch], s->lambda);
 }
 cpe->common_window = 0;
@@ -614,7 +613,7 @@
 }
 }
 }
- s->cur_channel = start_ch * 2;
+ s->cur_channel = start_ch;
 if (s->options.stereo_mode && cpe->common_window) {
 if (s->options.stereo_mode > 0) {
 IndividualChannelStream *ics = &cpe->ch[0].ics;
@@ -684,9 +683,6 @@
 av_freep(&s->buffer.samples);
 av_freep(&s->cpe);
 ff_af_queue_close(&s->afq);
-#if FF_API_OLD_ENCODE_AUDIO
- av_freep(&avctx->coded_frame);
-#endif
 return 0;
 }
 
@@ -694,7 +690,6 @@
 {
 int ret = 0;
 
- ff_dsputil_init(&s->dsp, avctx);
 avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
 
 // window init
@@ -721,11 +716,6 @@
 for(ch = 0; ch < s->channels; ch++)
 s->planar_samples[ch] = s->buffer.samples + 3 * 1024 * ch;
 
-#if FF_API_OLD_ENCODE_AUDIO
- if (!(avctx->coded_frame = avcodec_alloc_frame()))
- goto alloc_fail;
-#endif
-
 return 0;
 alloc_fail:
 return AVERROR(ENOMEM);
@@ -814,6 +804,7 @@
 
 AVCodec ff_aac_encoder = {
 .name = "aac",
+ .long_name = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_AAC,
 .priv_data_size = sizeof(AACEncContext),
@@ -824,6 +815,5 @@
 CODEC_CAP_EXPERIMENTAL,
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"),
 .priv_class = &aacenc_class,
 };

libav-v9.6.tar.bz2/libavcodec/aacenc.h -> libav-v10.1.tar.bz2/libavcodec/aacenc.h Changed

libav-v9.6.tar.bz2/libavcodec/aacps.c -> libav-v10.1.tar.bz2/libavcodec/aacps.c Changed

@@ -21,13 +21,13 @@
 
 #include <stdint.h>
 #include "libavutil/common.h"
+#include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "aacps.h"
 #include "aacps_tablegen.h"
 #include "aacpsdata.c"
-#include "dsputil.h"
 
 #define PS_BASELINE 0 ///< Operate in Baseline PS mode
 ///< Baseline implies 10 or 20 stereo bands,
@@ -305,14 +305,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];
@@ -328,12 +329,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);
 }
 }
 
@@ -669,7 +672,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++) {
@@ -747,7 +751,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) {
@@ -897,7 +901,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);

libav-v9.6.tar.bz2/libavcodec/aacps_tablegen.c -> libav-v10.1.tar.bz2/libavcodec/aacps_tablegen.c Changed

libav-v9.6.tar.bz2/libavcodec/aacps_tablegen.h -> libav-v10.1.tar.bz2/libavcodec/aacps_tablegen.h Changed

@@ -28,6 +28,7 @@
 
 #if CONFIG_HARDCODED_TABLES
 #define ps_tableinit()
+#define TABLE_CONST const
 #include "libavcodec/aacps_tables.h"
 #else
 #include "libavutil/common.h"
@@ -37,6 +38,7 @@
 #define NR_ALLPASS_BANDS20 30
 #define NR_ALLPASS_BANDS34 50
 #define PS_AP_LINKS 3
+#define TABLE_CONST
 static float pd_re_smooth[8*8*8];
 static float pd_im_smooth[8*8*8];
 static float HA[46][8][4];
@@ -45,7 +47,7 @@
 static DECLARE_ALIGNED(16, float, f34_0_12)[12][8][2];
 static DECLARE_ALIGNED(16, float, f34_1_8) [ 8][8][2];
 static DECLARE_ALIGNED(16, float, f34_2_4) [ 4][8][2];
-static DECLARE_ALIGNED(16, float, Q_fract_allpass)[2][50][3][2];
+static TABLE_CONST DECLARE_ALIGNED(16, float, Q_fract_allpass)[2][50][3][2];
 static DECLARE_ALIGNED(16, float, phi_fract)[2][50][2];
 
 static const float g0_Q8[] = {
@@ -192,7 +194,7 @@
 for (k = 0; k < NR_ALLPASS_BANDS34; k++) {
 double f_center, theta;
 if (k < FF_ARRAY_ELEMS(f_center_34))
- f_center = f_center_34[k] / 24.;
+ f_center = f_center_34[k] / 24.0;
 else
 f_center = k - 26.5f;
 for (m = 0; m < PS_AP_LINKS; m++) {

libav-v9.6.tar.bz2/libavcodec/aacpsdsp.c -> libav-v10.1.tar.bz2/libavcodec/aacpsdsp.c Changed

libav-v9.6.tar.bz2/libavcodec/aacpsdsp.h -> libav-v10.1.tar.bz2/libavcodec/aacpsdsp.h Changed

libav-v9.6.tar.bz2/libavcodec/aacpsy.c -> libav-v10.1.tar.bz2/libavcodec/aacpsy.c Changed

@@ -24,6 +24,7 @@
 * AAC encoder psychoacoustic model
 */
 
+#include "libavutil/attributes.h"
 #include "avcodec.h"
 #include "aactab.h"
 #include "psymodel.h"
@@ -248,7 +249,8 @@
 /**
 * LAME psy model specific initialization
 */
-static void lame_window_init(AacPsyContext *ctx, AVCodecContext *avctx) {
+static av_cold void lame_window_init(AacPsyContext *ctx, AVCodecContext *avctx)
+{
 int i, j;
 
 for (i = 0; i < avctx->channels; i++) {
@@ -310,7 +312,7 @@
 AacPsyCoeffs *coeffs = pctx->psy_coef[j];
 const uint8_t *band_sizes = ctx->bands[j];
 float line_to_frequency = ctx->avctx->sample_rate / (j ? 256.f : 2048.0f);
- float avg_chan_bits = chan_bitrate / ctx->avctx->sample_rate * (j ? 128.0f : 1024.0f);
+ float avg_chan_bits = chan_bitrate * (j ? 128.0f : 1024.0f) / ctx->avctx->sample_rate;
 /* reference encoder uses 2.4% here instead of 60% like the spec says */
 float bark_pe = 0.024f * PSY_3GPP_BITS_TO_PE(avg_chan_bits) / num_bark;
 float en_spread_low = j ? PSY_3GPP_EN_SPREAD_LOW_S : PSY_3GPP_EN_SPREAD_LOW_L;
@@ -804,7 +806,8 @@
 sum1 += psy_fir_coeffs[j] * (firbuf[i + j] + firbuf[i + PSY_LAME_FIR_LEN - j]);
 sum2 += psy_fir_coeffs[j + 1] * (firbuf[i + j + 1] + firbuf[i + PSY_LAME_FIR_LEN - j - 1]);
 }
- /* NOTE: The LAME psymodel expects it's input in the range -32768 to 32768. Tuning this for normalized floats would be difficult. */
+ /* NOTE: The LAME psymodel expects its input in the range -32768 to
+ * 32768. Tuning this for normalized floats would be difficult. */
 hpfsmpl[i] = (sum1 + sum2) * 32768.0f;
 }

libav-v9.6.tar.bz2/libavcodec/aacsbr.c -> libav-v10.1.tar.bz2/libavcodec/aacsbr.c Changed

@@ -33,6 +33,7 @@
 #include "fft.h"
 #include "aacps.h"
 #include "sbrdsp.h"
+#include "libavutil/internal.h"
 #include "libavutil/libm.h"
 
 #include <stdint.h>
@@ -918,15 +919,16 @@
 } 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
- av_log_missing_feature(ac->avctx, "Parametric Stereo", 0);
+ avpriv_report_missing_feature(ac->avctx, "Parametric Stereo");
 skip_bits_long(gb, *num_bits_left); // bs_fill_bits
 *num_bits_left = 0;
 #endif
 }
 break;
 default:
- av_log_missing_feature(ac->avctx, "Reserved SBR extensions", 1);
+ avpriv_request_sample(ac->avctx, "Reserved SBR extensions");
 skip_bits_long(gb, *num_bits_left); // bs_fill_bits
 *num_bits_left = 0;
 break;
@@ -1150,7 +1152,7 @@
 * @param x pointer to the beginning of the first sample window
 * @param W array of complex-valued samples split into subbands
 */
-static void sbr_qmf_analysis(DSPContext *dsp, FFTContext *mdct,
+static void sbr_qmf_analysis(AVFloatDSPContext *dsp, FFTContext *mdct,
 SBRDSPContext *sbrdsp, const float *in, float *x,
 float z[320], float W[2][32][32][2], int buf_idx)
 {
@@ -1172,8 +1174,8 @@
 * Synthesis QMF Bank (14496-3 sp04 p206) and Downsampled Synthesis QMF Bank
 * (14496-3 sp04 p206)
 */
-static void sbr_qmf_synthesis(DSPContext *dsp, FFTContext *mdct,
- SBRDSPContext *sbrdsp, AVFloatDSPContext *fdsp,
+static void sbr_qmf_synthesis(FFTContext *mdct,
+ SBRDSPContext *sbrdsp, AVFloatDSPContext *dsp,
 float *out, float X[2][38][64],
 float mdct_buf[2][64],
 float *v0, int *v_off, const unsigned int div)
@@ -1204,7 +1206,7 @@
 mdct->imdct_half(mdct, mdct_buf[1], X[1][i]);
 sbrdsp->qmf_deint_bfly(v, mdct_buf[1], mdct_buf[0]);
 }
- fdsp->vector_fmul (out, v , sbr_qmf_window , 64 >> div);
+ dsp->vector_fmul (out, v , sbr_qmf_window , 64 >> div);
 dsp->vector_fmul_add(out, v + ( 192 >> div), sbr_qmf_window + ( 64 >> div), out , 64 >> div);
 dsp->vector_fmul_add(out, v + ( 256 >> div), sbr_qmf_window + (128 >> div), out , 64 >> div);
 dsp->vector_fmul_add(out, v + ( 448 >> div), sbr_qmf_window + (192 >> div), out , 64 >> div);
@@ -1663,15 +1665,21 @@
 }
 for (ch = 0; ch < nch; ch++) {
 /* decode channel */
- sbr_qmf_analysis(&ac->dsp, &sbr->mdct_ana, &sbr->dsp, ch ? R : L, sbr->data[ch].analysis_filterbank_samples,
+ 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_lf_gen(ac, sbr, sbr->X_low, sbr->data[ch].W, sbr->data[ch].Ypos);
+ 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_hf_inverse_filter(&sbr->dsp, sbr->alpha0, sbr->alpha1, sbr->X_low, sbr->k[0]);
+ 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);
 
@@ -1681,16 +1689,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_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_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) {
@@ -1702,13 +1711,13 @@
 nch = 2;
 }
 
- sbr_qmf_synthesis(&ac->dsp, &sbr->mdct, &sbr->dsp, &ac->fdsp,
+ sbr_qmf_synthesis(&sbr->mdct, &sbr->dsp, &ac->fdsp,
 L, sbr->X[0], sbr->qmf_filter_scratch,
 sbr->data[0].synthesis_filterbank_samples,
 &sbr->data[0].synthesis_filterbank_samples_offset,
 downsampled);
 if (nch == 2)
- sbr_qmf_synthesis(&ac->dsp, &sbr->mdct, &sbr->dsp, &ac->fdsp,
+ sbr_qmf_synthesis(&sbr->mdct, &sbr->dsp, &ac->fdsp,
 R, sbr->X[1], sbr->qmf_filter_scratch,
 sbr->data[1].synthesis_filterbank_samples,
 &sbr->data[1].synthesis_filterbank_samples_offset,

libav-v9.6.tar.bz2/libavcodec/aacsbr.h -> libav-v10.1.tar.bz2/libavcodec/aacsbr.h Changed

libav-v9.6.tar.bz2/libavcodec/aactab.c -> libav-v10.1.tar.bz2/libavcodec/aactab.c Changed

@@ -40,6 +40,10 @@
     41, 41, 47, 49, 49, 51, 47, 47, 43, 43, 43, 40, 40
 };
 
+const uint8_t ff_aac_num_swb_512[] = {
+     0,  0,  0, 36, 36, 37, 31, 31,  0,  0,  0,  0,  0
+};
+
 const uint8_t ff_aac_num_swb_128[] = {
     12, 12, 12, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15
 };
@@ -1114,6 +1118,14 @@
     928, 1024
 };
 
+static const uint16_t swb_offset_512_48[] = {
+      0,   4,   8,  12,  16,  20,  24,  28,
+     32,  36,  40,  44,  48,  52,  56,  60,
+     68,  76,  84,  92, 100, 112, 124, 136,
+    148, 164, 184, 208, 236, 268, 300, 332,
+    364, 396, 428, 460, 512
+};
+
 static const uint16_t swb_offset_128_48[] = {
      0,   4,   8,  12,  16,  20,  28,  36,
     44,  56,  68,  80,  96, 112, 128
@@ -1129,6 +1141,14 @@
     928, 960, 992, 1024
 };
 
+static const uint16_t swb_offset_512_32[] = {
+      0,   4,   8,  12,  16,  20,  24,  28,
+     32,  36,  40,  44,  48,  52,  56,  64,
+     72,  80,  88,  96, 108, 120, 132, 144,
+    160, 176, 192, 212, 236, 260, 288, 320,
+    352, 384, 416, 448, 480, 512
+};
+
 static const uint16_t swb_offset_1024_24[] = {
       0,   4,   8,  12,  16,  20,  24,  28,
      32,  36,  40,  44,  52,  60,  68,  76,
@@ -1138,6 +1158,13 @@
     600, 652, 704, 768, 832, 896, 960, 1024
 };
 
+static const uint16_t swb_offset_512_24[] = {
+      0,   4,   8,  12,  16,  20,  24,  28,
+     32,  36,  40,  44,  52,  60,  68,  80,
+     92, 104, 120, 140, 164, 192, 224, 256,
+    288, 320, 352, 384, 416, 448, 480, 512,
+};
+
 static const uint16_t swb_offset_128_24[] = {
      0,   4,   8,  12,  16,  20,  24,  28,
     36,  44,  52,  64,  76,  92, 108, 128
@@ -1179,6 +1206,14 @@
     swb_offset_1024_8
 };
 
+const uint16_t * const ff_swb_offset_512[] = {
+    NULL,               NULL,               NULL,
+    swb_offset_512_48,  swb_offset_512_48,  swb_offset_512_32,
+    swb_offset_512_24,  swb_offset_512_24,  NULL,
+    NULL,               NULL,               NULL,
+    NULL
+};
+
 const uint16_t * const ff_swb_offset_128[] = {
     /* The last entry on the following row is swb_offset_128_64 but is a
        duplicate of swb_offset_128_96. */
@@ -1201,7 +1236,494 @@
     31, 31, 34, 40, 42, 51, 46, 46, 42, 42, 42, 39, 39
 };
 
+const uint8_t ff_tns_max_bands_512[] = {
+    0, 0, 0, 31, 32, 37, 31, 31, 0, 0, 0, 0, 0
+};
+
 const uint8_t ff_tns_max_bands_128[] = {
     9, 9, 10, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14
 };
 // @}
+
+const DECLARE_ALIGNED(32, float, ff_aac_eld_window)[1920] = {
+     0.00338834,  0.00567745,  0.00847677,  0.01172641,
+     0.01532555,  0.01917664,  0.02318809,  0.02729259,
+     0.03144503,  0.03560261,  0.03972499,  0.04379783,
+     0.04783094,  0.05183357,  0.05581342,  0.05977723,
+     0.06373173,  0.06768364,  0.07163937,  0.07559976,
+     0.07956096,  0.08352024,  0.08747623,  0.09143035,
+     0.09538618,  0.09934771,  0.10331917,  0.10730456,
+     0.11130697,  0.11532867,  0.11937133,  0.12343922,
+     0.12753911,  0.13167705,  0.13585812,  0.14008529,
+     0.14435986,  0.14868291,  0.15305531,  0.15747594,
+     0.16194193,  0.16645070,  0.17099991,  0.17558633,
+     0.18020600,  0.18485548,  0.18953191,  0.19423322,
+     0.19895800,  0.20370512,  0.20847374,  0.21326312,
+     0.21807244,  0.22290083,  0.22774742,  0.23261210,
+     0.23749542,  0.24239767,  0.24731889,  0.25225887,
+     0.25721719,  0.26219330,  0.26718648,  0.27219630,
+     0.27722262,  0.28226514,  0.28732336,  0.29239628,
+     0.29748247,  0.30258055,  0.30768914,  0.31280508,
+     0.31792385,  0.32304172,  0.32815579,  0.33326397,
+     0.33836470,  0.34345661,  0.34853868,  0.35361188,
+     0.35867865,  0.36374072,  0.36879900,  0.37385347,
+     0.37890349,  0.38394836,  0.38898730,  0.39401912,
+     0.39904236,  0.40405575,  0.40905820,  0.41404819,
+     0.41902398,  0.42398423,  0.42892805,  0.43385441,
+     0.43876210,  0.44365014,  0.44851786,  0.45336632,
+     0.45819759,  0.46301302,  0.46781309,  0.47259722,
+     0.47736435,  0.48211365,  0.48684450,  0.49155594,
+     0.49624679,  0.50091636,  0.50556440,  0.51019132,
+     0.51479771,  0.51938391,  0.52394998,  0.52849587,
+     0.53302151,  0.53752680,  0.54201160,  0.54647575,
+     0.55091916,  0.55534181,  0.55974376,  0.56412513,
+     0.56848615,  0.57282710,  0.57714834,  0.58145030,
+     0.58492489,  0.58918511,  0.59342326,  0.59763936,
+     0.60183347,  0.60600561,  0.61015581,  0.61428412,
+     0.61839056,  0.62247517,  0.62653799,  0.63057912,
+     0.63459872,  0.63859697,  0.64257403,  0.64653001,
+     0.65046495,  0.65437887,  0.65827181,  0.66214383,
+     0.66599499,  0.66982535,  0.67363499,  0.67742394,
+     0.68119219,  0.68493972,  0.68866653,  0.69237258,
+     0.69605778,  0.69972207,  0.70336537,  0.70698758,
+     0.71058862,  0.71416837,  0.71772674,  0.72126361,
+     0.72477889,  0.72827246,  0.73174419,  0.73519392,
+     0.73862141,  0.74202643,  0.74540874,  0.74876817,
+     0.75210458,  0.75541785,  0.75870785,  0.76197437,
+     0.76521709,  0.76843570,  0.77162988,  0.77479939,
+     0.77794403,  0.78106359,  0.78415789,  0.78722670,
+     0.79026979,  0.79328694,  0.79627791,  0.79924244,
+     0.80218027,  0.80509112,  0.80797472,  0.81083081,
+     0.81365915,  0.81645949,  0.81923160,  0.82197528,
+     0.82469037,  0.82737673,  0.83003419,  0.83266262,
+     0.83526186,  0.83783176,  0.84037217,  0.84288297,
+     0.84536401,  0.84781517,  0.85023632,  0.85262739,
+     0.85498836,  0.85731921,  0.85961993,  0.86189052,
+     0.86413101,  0.86634140,  0.86852173,  0.87067211,
+     0.87279275,  0.87488384,  0.87694559,  0.87897824,
+     0.88098206,  0.88295729,  0.88490423,  0.88682332,
+     0.88871519,  0.89058048,  0.89241983,  0.89423391,
+     0.89602338,  0.89778893,  0.89953126,  0.90125142,
+     0.90295086,  0.90463104,  0.90629341,  0.90793946,
+     0.90957067,  0.91118856,  0.91279464,  0.91439073,
+     0.91597898,  0.91756153,  0.91914049,  0.92071690,
+     0.92229070,  0.92386182,  0.92542993,  0.92698946,
+     0.92852960,  0.93003929,  0.93150727,  0.93291739,
+     0.93424863,  0.93547974,  0.93658982,  0.93756587,
+     0.93894072,  0.93922780,  0.93955477,  0.93991290,
+     0.94029104,  0.94067794,  0.94106258,  0.94144084,
+     0.94181549,  0.94218963,  0.94256628,  0.94294662,
+     0.94332998,  0.94371562,  0.94410280,  0.94449122,
+     0.94488106,  0.94527249,  0.94566568,  0.94606074,
+     0.94645772,  0.94685665,  0.94725759,  0.94766054,
+     0.94806547,  0.94847234,  0.94888115,  0.94929190,
+     0.94970469,  0.95011960,  0.95053672,  0.95095604,
+     0.95137751,  0.95180105,  0.95222658,  0.95265413,
+     0.95308380,  0.95351571,  0.95394994,  0.95438653,
+     0.95482538,  0.95526643,  0.95570958,  0.95615486,
+     0.95660234,  0.95705214,  0.95750433,  0.95795892,
+     0.95841582,  0.95887493,  0.95933616,  0.95979949,
+     0.96026500,  0.96073277,  0.96120286,  0.96167526,
+     0.96214986,  0.96262655,  0.96310522,  0.96358586,
+     0.96406853,  0.96455330,  0.96504026,  0.96552936,
+     0.96602051,  0.96651360,  0.96700850,  0.96750520,
+     0.96800376,  0.96850424,  0.96900670,  0.96951112,
+     0.97001738,  0.97052533,  0.97103488,  0.97154597,
+     0.97205867,  0.97257304,  0.97308915,  0.97360694,
+     0.97412631,  0.97464711,  0.97516923,  0.97569262,
+     0.97621735,  0.97674350,  0.97727111,  0.97780016,
+     0.97833051,  0.97886205,  0.97939463,  0.97992823,
+     0.98046291,  0.98099875,  0.98153580,  0.98207405,
+     0.98261337,  0.98315364,  0.98369474,  0.98423664,
+     0.98477941,  0.98532311,  0.98586780,  0.98641348,
+     0.98696003,  0.98750734,  0.98805530,  0.98860389,
+     0.98915320,  0.98970328,  0.99025423,  0.99080602,
+     0.99135855,  0.99191171,  0.99246541,  0.99301962,
+     0.99357443,  0.99412992,  0.99468617,  0.99524320,
+     0.99580092,  0.99635926,  0.99691814,  0.99747748,
+     0.99803721,  0.99859725,  0.99915752,  0.99971793,
+     1.00028215,  1.00084319,  1.00140472,  1.00196665,
+     1.00252889,  1.00309139,  1.00365404,  1.00421679,
+     1.00477954,  1.00534221,  1.00590474,  1.00646713,
+     1.00702945,  1.00759179,  1.00815424,  1.00871678,
+     1.00927930,  1.00984169,  1.01040384,  1.01096575,
+     1.01152747,  1.01208910,  1.01265070,  1.01321226,
+     1.01377365,  1.01433478,  1.01489551,  1.01545584,
+     1.01601582,  1.01657553,  1.01713502,  1.01769427,
+     1.01825316,  1.01881154,  1.01936929,  1.01992639,
+     1.02048289,  1.02103888,  1.02159441,  1.02214945,
+     1.02270387,  1.02325751,  1.02381025,  1.02436204,
+     1.02491295,  1.02546304,  1.02601238,  1.02656092,
+     1.02710853,  1.02765508,  1.02820041,  1.02874449,
+     1.02928737,  1.02982913,  1.03036981,  1.03090937,
+     1.03144768,  1.03198460,  1.03252000,  1.03305384,
+     1.03358617,  1.03411707,  1.03464659,  1.03517470,
+     1.03570128,  1.03622620,  1.03674934,  1.03727066,
+     1.03779024,  1.03830815,  1.03882446,  1.03933914,
+     1.03985206,  1.04036312,  1.04087217,  1.04137920,
+     1.04188428,  1.04238748,  1.04288888,  1.04338845,
+     1.04388610,  1.04438170,  1.04487515,  1.04536645,
+     1.04585569,  1.04634297,  1.04682838,  1.04731192,
+     1.04779350,  1.04827303,  1.04875042,  1.04922568,
+     1.04969891,  1.05017022,  1.05063974,  1.05110746,
+     1.05157332,  1.05203721,  1.05249907,  1.05295889,
+     1.05341676,  1.05387277,  1.05432700,  1.05477948,
+     1.05523018,  1.05567906,  1.05612608,  1.05657124,
+     1.05701459,  1.05745616,  1.05789601,  1.05833426,
+     1.05877109,  1.05920669,  1.05964125,  1.06007444,
+     1.06050542,  1.06093335,  1.06135746,  1.06177909,
+     1.06220164,  1.06262858,  1.06306309,  1.06350050,
+     1.06392837,  1.06433391,  1.06470443,  1.06502996,
+     1.06481076,  1.06469765,  1.06445004,  1.06408002,
+     1.06361382,  1.06307719,  1.06249453,  1.06188365,
+     1.06125612,  1.06062291,  1.05999418,  1.05937132,
+     1.05874726,  1.05811486,  1.05746728,  1.05680000,
+     1.05611070,  1.05539715,  1.05465735,  1.05389329,
+     1.05311083,  1.05231578,  1.05151372,  1.05070811,
+     1.04990044,  1.04909210,  1.04828434,  1.04747647,
+     1.04666590,  1.04585003,  1.04502628,  1.04419009,
+     1.04333499,  1.04245452,  1.04154244,  1.04059452,
+     1.03960846,  1.03858207,  1.03751326,  1.03640189,
+     1.03524976,  1.03405868,  1.03283047,  1.03156812,
+     1.03027574,  1.02895743,  1.02761717,  1.02625804,
+     1.02488222,  1.02349184,  1.02208892,  1.02067450,
+     1.01924861,  1.01781123,  1.01636229,  1.01490045,
+     1.01342315,  1.01192778,  1.01041175,  1.00887284,
+     1.00730915,  1.00571882,  1.00409996,  1.00245032,
+     1.00076734,  0.99904842,  0.99729101,  0.99549380,
+     0.99365664,  0.99177946,  0.98986234,  0.98791024,
+     0.98593294,  0.98394037,  0.98194226,  0.97994532,
+     0.97795324,  0.97596955,  0.97399748,  0.97203326,
+     0.97006624,  0.96808546,  0.96608018,  0.96404416,
+     0.96197556,  0.95987276,  0.95773420,  0.95556018,
+     0.95335291,  0.95111462,  0.94884764,  0.94655663,
+     0.94424858,  0.94193055,  0.93960953,  0.93729154,
+     0.93498157,  0.93268456,  0.93040503,  0.92813771,
+     0.92586755,  0.92357910,  0.92125731,  0.91889642,
+     0.91649998,  0.91407191,  0.91161623,  0.90913975,
+     0.90665202,  0.90416271,  0.90168115,  0.89920934,
+     0.89674189,  0.89427312,  0.89179743,  0.88931147,
+     0.88681415,  0.88430445,  0.88178141,  0.87924528,
+     0.87669753,  0.87413966,  0.87157318,  0.86899958,
+     0.86642037,  0.86383703,  0.86125106,  0.85866393,
+     0.85604236,  0.85344385,  0.85083093,  0.84820550,
+     0.84556943,  0.84292458,  0.84027278,  0.83761586,
+     0.83495565,  0.83229393,  0.82963243,  0.82697135,
+     0.82430933,  0.82164496,  0.81897669,  0.81630017,
+     0.81360822,  0.81089355,  0.80814924,  0.80537741,
+     0.80258920,  0.79979611,  0.79700954,  0.79423813,
+     0.79148780,  0.78876432,  0.78607290,  0.78340590,
+     0.78074288,  0.77806279,  0.77534514,  0.77258187,
+     0.76977737,  0.76693654,  0.76406441,  0.76116851,
+     0.75825892,  0.75534582,  0.75243924,  0.74954634,
+     0.74667135,  0.74381840,  0.74099145,  0.73819147,
+     0.73541641,  0.73266408,  0.72993193,  0.72720913,
+     0.72447661,  0.72171494,  0.71890515,  0.71603932,
+     0.71312056,  0.71015250,  0.70713900,  0.70409084,
+     0.70102565,  0.69796137,  0.69491556,  0.69189772,
+     0.68890931,  0.68595141,  0.68302498,  0.68012852,
+     0.67725801,  0.67440936,  0.67157841,  0.66876081,
+     0.66595195,  0.66314722,  0.66034194,  0.65753027,
+     0.65470525,  0.65185984,  0.64898709,  0.64608214,
+     0.64314221,  0.64016460,  0.63714680,  0.63409034,
+     0.63100082,  0.62788400,  0.62474577,  0.62159473,
+     0.61844225,  0.61529977,  0.61217866,  0.60908811,
+     0.60603510,  0.60302654,  0.60006916,  0.59716588,
+     0.59431580,  0.59151787,  0.58877068,  0.58606495,
+     0.58338353,  0.58070891,  0.57802356,  0.57530864,
+     0.57254404,  0.56970958,  0.56678577,  0.56376860,
+     0.56066951,  0.55750064,  0.55427451,  0.55101301,
+     0.54774732,  0.54450907,  0.54132936,  0.53822744,
+     0.53521072,  0.53228613,  0.52945979,  0.52671997,
+     0.52403708,  0.52138072,  0.51872085,  0.51603570,
+     0.51331170,  0.51053560,  0.50769466,  0.50478931,
+     0.50183308,  0.49884001,  0.49582406,  0.49279905,
+     0.48985748,  0.48679641,  0.48379429,  0.48085363,
+     0.47796576,  0.47512151,  0.47231151,  0.46952402,
+     0.46674486,  0.46395978,  0.46115496,  0.45832607,
+     0.45547830,  0.45261727,  0.44974866,  0.44688011,
+     0.44402125,  0.44118178,  0.43837094,  0.43558772,
+     0.43282082,  0.43005847,  0.42728913,  0.42450572,
+     0.42170567,  0.41888658,  0.41604633,  0.41318897,
+     0.41032472,  0.40746405,  0.40461724,  0.40178943,
+     0.39898066,  0.39619073,  0.39341940,  0.39066519,
+     0.38792536,  0.38519713,  0.38247773,  0.37976476,
+     0.37705620,  0.37435006,  0.37164438,  0.36893869,
+     0.36623396,  0.36353124,  0.36083153,  0.35813533,
+     0.35544262,  0.35275338,  0.35006755,  0.34738530,
+     0.34470699,  0.34203296,  0.33936359,  0.33669922,
+     0.33404027,  0.33138711,  0.32874013,  0.32609944,
+     0.32346493,  0.32083645,  0.31821388,  0.31559703,
+     0.31298573,  0.31037987,  0.30777941,  0.30518446,
+     0.30259525,  0.30001202,  0.29743499,  0.29486428,
+     0.29229989,  0.28974179,  0.28718997,  0.28464452,
+     0.28210562,  0.27957346,  0.27704820,  0.27452992,
+     0.27201854,  0.26951399,  0.26701622,  0.26452533,
+     0.26204158,  0.25956526,  0.25709662,  0.25463583,
+     0.25218294,  0.24973798,  0.24730100,  0.24487207,
+     0.24245133,  0.24003893,  0.23763500,  0.23523959,
+     0.23285262,  0.23047401,  0.22810369,  0.22574170,
+     0.22338818,  0.22104329,  0.21870719,  0.21637986,
+     0.21406117,  0.21175095,  0.20944904,  0.20715535,
+     0.20486987,  0.20259261,  0.20032356,  0.19806259,
+     0.19580944,  0.19356385,  0.19132556,  0.18909442,
+     0.18687040,  0.18465350,  0.18244372,  0.18024164,
+     0.17804841,  0.17586521,  0.17369322,  0.17153360,
+     0.16938755,  0.16725622,  0.16514081,  0.16304247,
+     0.16098974,  0.15896561,  0.15696026,  0.15497259,
+     0.15300151,  0.15104590,  0.14910466,  0.14717666,
+     0.14526081,  0.14335599,  0.14146111,  0.13957570,
+     0.13769993,  0.13583399,  0.13397806,  0.13213229,
+     0.13029682,  0.12847178,  0.12665729,  0.12485353,
+     0.12306074,  0.12127916,  0.11950900,  0.11775043,
+     0.11600347,  0.11426820,  0.11254464,  0.11083292,
+     0.10913318,  0.10744559,  0.10577028,  0.10410733,
+     0.10245672,  0.10081842,  0.09919240,  0.09757872,
+     0.09597750,  0.09438884,  0.09281288,  0.09124964,
+     0.08969907,  0.08816111,  0.08663570,  0.08512288,
+     0.08362274,  0.08213540,  0.08066096,  0.07919944,
+     0.07775076,  0.07631484,  0.07489161,  0.07348108,
+     0.07208335,  0.07069851,  0.06932666,  0.06796781,
+     0.06662187,  0.06528874,  0.06396833,  0.06266065,
+     0.06136578,  0.06008380,  0.05881480,  0.05755876,
+     0.05631557,  0.05508511,  0.05386728,  0.05266206,
+     0.05146951,  0.05028971,  0.04912272,  0.04796855,
+     0.04682709,  0.04569825,  0.04458194,  0.04347817,
+     0.04238704,  0.04130868,  0.04024318,  0.03919056,
+     0.03815071,  0.03712352,  0.03610890,  0.03510679,
+     0.03411720,  0.03314013,  0.03217560,  0.03122343,
+     0.03028332,  0.02935494,  0.02843799,  0.02753230,
+     0.02663788,  0.02575472,  0.02488283,  0.02402232,
+     0.02317341,  0.02233631,  0.02151124,  0.02069866,
+     0.01989922,  0.01911359,  0.01834241,  0.01758563,
+     0.01684248,  0.01611219,  0.01539397,  0.01468726,
+     0.01399167,  0.01330687,  0.01263250,  0.01196871,
+     0.01131609,  0.01067527,  0.01004684,  0.00943077,
+     0.00882641,  0.00823307,  0.00765011,  0.00707735,
+     0.00651513,  0.00596377,  0.00542364,  0.00489514,
+     0.00437884,  0.00387530,  0.00338509,  0.00290795,
+     0.00244282,  0.00198860,  0.00154417,  0.00110825,
+     0.00067934,  0.00025589, -0.00016357, -0.00057897,
+    -0.00098865, -0.00139089, -0.00178397, -0.00216547,
+    -0.00253230, -0.00288133, -0.00320955, -0.00351626,
+    -0.00380315, -0.00407198, -0.00432457, -0.00456373,
+    -0.00479326, -0.00501699, -0.00523871, -0.00546066,
+    -0.00568360, -0.00590821, -0.00613508, -0.00636311,
+    -0.00658944, -0.00681117, -0.00702540, -0.00722982,
+    -0.00742268, -0.00760226, -0.00776687, -0.00791580,
+    -0.00804933, -0.00816774, -0.00827139, -0.00836122,
+    -0.00843882, -0.00850583, -0.00856383, -0.00861430,
+    -0.00865853, -0.00869781, -0.00873344, -0.00876633,
+    -0.00879707, -0.00882622, -0.00885433, -0.00888132,
+    -0.00890652, -0.00892925, -0.00894881, -0.00896446,
+    -0.00897541, -0.00898088, -0.00898010, -0.00897234,
+    -0.00895696, -0.00893330, -0.00890076, -0.00885914,
+    -0.00880875, -0.00874987, -0.00868282, -0.00860825,
+    -0.00852716, -0.00844055, -0.00834941, -0.00825485,
+    -0.00815807, -0.00806025, -0.00796253, -0.00786519,
+    -0.00776767, -0.00766937, -0.00756971, -0.00746790,
+    -0.00736305, -0.00725422, -0.00714055, -0.00702161,
+    -0.00689746, -0.00676816, -0.00663381, -0.00649489,
+    -0.00635230, -0.00620694, -0.00605969, -0.00591116,
+    -0.00576167, -0.00561155, -0.00546110, -0.00531037,
+    -0.00515917, -0.00500732, -0.00485462, -0.00470075,
+    -0.00454530, -0.00438786, -0.00422805, -0.00406594,
+    -0.00390204, -0.00373686, -0.00357091, -0.00340448,
+    -0.00323770, -0.00307066, -0.00290344, -0.00273610,
+    -0.00256867, -0.00240117, -0.00223365, -0.00206614,
+    -0.00189866, -0.00173123, -0.00156390, -0.00139674,
+    -0.00122989, -0.00106351, -0.00089772, -0.00073267,
+    -0.00056849, -0.00040530, -0.00024324, -0.00008241,
+     0.00008214,  0.00024102,  0.00039922,  0.00055660,
+     0.00071299,  0.00086826,  0.00102224,  0.00117480,
+     0.00132579,  0.00147507,  0.00162252,  0.00176804,
+     0.00191161,  0.00205319,  0.00219277,  0.00233029,
+     0.00246567,  0.00259886,  0.00272975,  0.00285832,
+     0.00298453,  0.00310839,  0.00322990,  0.00334886,
+     0.00346494,  0.00357778,  0.00368706,  0.00379273,
+     0.00389501,  0.00399411,  0.00409020,  0.00418350,
+     0.00427419,  0.00436249,  0.00444858,  0.00453250,
+     0.00461411,  0.00469328,  0.00476988,  0.00484356,
+     0.00491375,  0.00497987,  0.00504139,  0.00509806,
+     0.00514990,  0.00519693,  0.00523920,  0.00527700,
+     0.00531083,  0.00534122,  0.00536864,  0.00539357,
+     0.00541649,  0.00543785,  0.00545809,  0.00547713,
+     0.00549441,  0.00550936,  0.00552146,  0.00553017,
+     0.00553494,  0.00553524,  0.00553058,  0.00552065,
+     0.00550536,  0.00548459,  0.00545828,  0.00542662,
+     0.00539007,  0.00534910,  0.00530415,  0.00525568,
+     0.00520417,  0.00515009,  0.00509387,  0.00503595,
+     0.00497674,  0.00491665,  0.00485605,  0.00479503,
+     0.00473336,  0.00467082,  0.00460721,  0.00454216,
+     0.00447517,  0.00440575,  0.00433344,  0.00425768,
+     0.00417786,  0.00409336,  0.00400363,  0.00390837,
+     0.00380759,  0.00370130,  0.00358952,  0.00347268,
+     0.00335157,  0.00322699,  0.00309975,  0.00297088,
+     0.00284164,  0.00271328,  0.00258700,  0.00246328,
+     0.00234195,  0.00222281,  0.00210562,  0.00198958,
+     0.00187331,  0.00175546,  0.00163474,  0.00151020,
+     0.00138130,  0.00124750,  0.00110831,  0.00096411,
+     0.00081611,  0.00066554,  0.00051363,  0.00036134,
+     0.00020940,  0.00005853, -0.00009058, -0.00023783,
+    -0.00038368, -0.00052861, -0.00067310, -0.00081757,
+    -0.00096237, -0.00110786, -0.00125442, -0.00140210,
+    -0.00155065, -0.00169984, -0.00184940, -0.00199910,
+    -0.00214872, -0.00229798, -0.00244664, -0.00259462,
+    -0.00274205, -0.00288912, -0.00303596, -0.00318259,
+    -0.00332890, -0.00347480, -0.00362024, -0.00376519,
+    -0.00390962, -0.00405345, -0.00419658, -0.00433902,
+    -0.00448085, -0.00462219, -0.00476309, -0.00490357,
+    -0.00504361, -0.00518321, -0.00532243, -0.00546132,
+    -0.00559988, -0.00573811, -0.00587602, -0.00601363,
+    -0.00615094, -0.00628795, -0.00642466, -0.00656111,
+    -0.00669737, -0.00683352, -0.00696963, -0.00710578,
+    -0.00724208, -0.00737862, -0.00751554, -0.00765295,
+    -0.00779098, -0.00792976, -0.00806941, -0.00821006,
+    -0.00835183, -0.00849485, -0.00863926, -0.00878522,
+    -0.00893293, -0.00908260, -0.00923444, -0.00938864,
+    -0.00954537, -0.00970482, -0.00986715, -0.01003173,
+    -0.01019711, -0.01036164, -0.01052357, -0.01068184,
+    -0.01083622, -0.01098652, -0.01113252, -0.01127409,
+    -0.01141114, -0.01154358, -0.01167135, -0.01179439,
+    -0.01191268, -0.01202619, -0.01213493, -0.01223891,
+    -0.01233817, -0.01243275, -0.01252272, -0.01260815,
+    -0.01268915, -0.01276583, -0.01283832, -0.01290685,
+    -0.01297171, -0.01303320, -0.01309168, -0.01314722,
+    -0.01319969, -0.01324889, -0.01329466, -0.01333693,
+    -0.01337577, -0.01341125, -0.01344345, -0.01347243,
+    -0.01349823, -0.01352089, -0.01354045, -0.01355700,
+    -0.01357068, -0.01358164, -0.01359003, -0.01359587,
+    -0.01359901, -0.01359931, -0.01359661, -0.01359087,
+    -0.01358219, -0.01357065, -0.01355637, -0.01353935,
+    -0.01351949, -0.01349670, -0.01347088, -0.01344214,
+    -0.01341078, -0.01337715, -0.01334158, -0.01330442,
+    -0.01326601, -0.01322671, -0.01318689, -0.01314692,
+    -0.01310123, -0.01306470, -0.01302556, -0.01298381,
+    -0.01293948, -0.01289255, -0.01284305, -0.01279095,
+    -0.01273625, -0.01267893, -0.01261897, -0.01255632,
+    -0.01249096, -0.01242283, -0.01235190, -0.01227827,
+    -0.01220213, -0.01212366, -0.01204304, -0.01196032,
+    -0.01187543, -0.01178829, -0.01169884, -0.01160718,
+    -0.01151352, -0.01141809, -0.01132111, -0.01122272,
+    -0.01112304, -0.01102217, -0.01092022, -0.01081730,
+    -0.01071355, -0.01060912, -0.01050411, -0.01039854,
+    -0.01029227, -0.01018521, -0.01007727, -0.00996859,
+    -0.00985959, -0.00975063, -0.00964208, -0.00953420,
+    -0.00942723, -0.00932135, -0.00921677, -0.00911364,
+    -0.00901208, -0.00891220, -0.00881412, -0.00871792,
+    -0.00862369, -0.00853153, -0.00844149, -0.00835360,
+    -0.00826785, -0.00818422, -0.00810267, -0.00802312,
+    -0.00794547, -0.00786959, -0.00779533, -0.00772165,
+    -0.00764673, -0.00756886, -0.00748649, -0.00739905,
+    -0.00730681, -0.00721006, -0.00710910, -0.00700419,
+    -0.00689559, -0.00678354, -0.00666829, -0.00655007,
+    -0.00642916, -0.00630579, -0.00618022, -0.00605267,
+    -0.00592333, -0.00579240, -0.00566006, -0.00552651,
+    -0.00539194, -0.00525653, -0.00512047, -0.00498390,
+    -0.00484693, -0.00470969, -0.00457228, -0.00443482,
+    -0.00429746, -0.00416034, -0.00402359, -0.00388738,
+    -0.00375185, -0.00361718, -0.00348350, -0.00335100,
+    -0.00321991, -0.00309043, -0.00296276, -0.00283698,
+    -0.00271307, -0.00259098, -0.00247066, -0.00235210,
+    -0.00223531, -0.00212030, -0.00200709, -0.00189576,
+    -0.00178647, -0.00167936, -0.00157457, -0.00147216,
+    -0.00137205, -0.00127418, -0.00117849, -0.00108498,
+    -0.00099375, -0.00090486, -0.00081840, -0.00073444,
+    -0.00065309, -0.00057445, -0.00049860, -0.00042551,
+    -0.00035503, -0.00028700, -0.00022125, -0.00015761,
+    -0.00009588, -0.00003583,  0.00002272,  0.00007975,
+     0.00013501,  0.00018828,  0.00023933,  0.00028784,
+     0.00033342,  0.00037572,  0.00041438,  0.00044939,
+     0.00048103,  0.00050958,  0.00053533,  0.00055869,
+     0.00058015,  0.00060022,  0.00061935,  0.00063781,
+     0.00065568,  0.00067303,  0.00068991,  0.00070619,
+     0.00072155,  0.00073567,  0.00074826,  0.00075912,
+     0.00076811,  0.00077509,  0.00077997,  0.00078275,
+     0.00078351,  0.00078237,  0.00077943,  0.00077484,
+     0.00076884,  0.00076160,  0.00075335,  0.00074423,
+     0.00073442,  0.00072404,  0.00071323,  0.00070209,
+     0.00069068,  0.00067906,  0.00066728,  0.00065534,
+     0.00064321,  0.00063086,  0.00061824,  0.00060534,
+     0.00059211,  0.00057855,  0.00056462,  0.00055033,
+     0.00053566,  0.00052063,  0.00050522,  0.00048949,
+     0.00047349,  0.00045728,  0.00044092,  0.00042447,
+     0.00040803,  0.00039166,  0.00037544,  0.00035943,
+     0.00034371,  0.00032833,  0.00031333,  0.00029874,
+     0.00028452,  0.00027067,  0.00025715,  0.00024395,
+     0.00023104,  0.00021842,  0.00020606,  0.00019398,
+     0.00018218,  0.00017069,  0.00015953,  0.00014871,
+     0.00013827,  0.00012823,  0.00011861,  0.00010942,
+     0.00010067,  0.00009236,  0.00008448,  0.00007703,
+     0.00006999,  0.00006337,  0.00005714,  0.00005129,
+     0.00004583,  0.00004072,  0.00003597,  0.00003157,
+     0.00002752,  0.00002380,  0.00002042,  0.00001736,
+     0.00001461,  0.00001215,  0.00000998,  0.00000807,
+     0.00000641,  0.00000499,  0.00000378,  0.00000278,
+     0.00000196,  0.00000132,  0.00000082,  0.00000046,
+     0.00000020,  0.00000005, -0.00000003, -0.00000006,
+    -0.00000004, -0.00000001,  0.00000001,  0.00000001,
+     0.00000001,  0.00000001, -0.00000001, -0.00000004,
+    -0.00000005, -0.00000003,  0.00000005,  0.00000020,
+     0.00000043,  0.00000077,  0.00000123,  0.00000183,
+     0.00000257,  0.00000348,  0.00000455,  0.00000581,
+     0.00000727,  0.00000893,  0.00001080,  0.00001290,
+     0.00001522,  0.00001778,  0.00002057,  0.00002362,
+     0.00002691,  0.00003044,  0.00003422,  0.00003824,
+     0.00004250,  0.00004701,  0.00005176,  0.00005676,
+     0.00006200,  0.00006749,  0.00007322,  0.00007920,
+     0.00008541,  0.00009186,  0.00009854,  0.00010543,
+     0.00011251,  0.00011975,  0.00012714,  0.00013465,
+     0.00014227,  0.00014997,  0.00015775,  0.00016558,
+     0.00017348,  0.00018144,  0.00018947,  0.00019756,
+     0.00020573,  0.00021399,  0.00022233,  0.00023076,
+     0.00023924,  0.00024773,  0.00025621,  0.00026462,
+     0.00027293,  0.00028108,  0.00028904,  0.00029675,
+     0.00030419,  0.00031132,  0.00031810,  0.00032453,
+     0.00033061,  0.00033632,  0.00034169,  0.00034672,
+     0.00035142,  0.00035580,  0.00035988,  0.00036369,
+     0.00036723,  0.00037053,  0.00037361,  0.00037647,
+     0.00037909,  0.00038145,  0.00038352,  0.00038527,
+     0.00038663,  0.00038757,  0.00038801,  0.00038790,
+     0.00038717,  0.00038572,  0.00038350,  0.00038044,
+     0.00037651,  0.00037170,  0.00036597,  0.00035936,
+     0.00035191,  0.00034370,  0.00033480,  0.00032531,
+     0.00031537,  0.00030512,  0.00029470,  0.00028417,
+     0.00027354,  0.00026279,  0.00025191,  0.00024081,
+     0.00022933,  0.00021731,  0.00020458,  0.00019101,
+     0.00017654,  0.00016106,  0.00014452,  0.00012694,
+     0.00010848,  0.00008929,  0.00006953,  0.00004935,
+     0.00002884,  0.00000813, -0.00001268, -0.00003357,
+    -0.00005457, -0.00007574, -0.00009714, -0.00011882,
+    -0.00014082, -0.00016318, -0.00018595, -0.00020912,
+    -0.00023265, -0.00025650, -0.00028060, -0.00030492,
+    -0.00032941, -0.00035400, -0.00037865, -0.00040333,
+    -0.00042804, -0.00045279, -0.00047759, -0.00050243,
+    -0.00052728, -0.00055209, -0.00057685, -0.00060153,
+    -0.00062611, -0.00065056, -0.00067485, -0.00069895,
+    -0.00072287, -0.00074660, -0.00077013, -0.00079345,
+    -0.00081653, -0.00083936, -0.00086192, -0.00088421,
+    -0.00090619, -0.00092786, -0.00094919, -0.00097017,
+    -0.00099077, -0.00101098, -0.00103077, -0.00105012,
+    -0.00106904, -0.00108750, -0.00110549, -0.00112301,
+    -0.00114005, -0.00115660, -0.00117265, -0.00118821,
+    -0.00120325, -0.00121779, -0.00123180, -0.00124528,
+    -0.00125822, -0.00127061, -0.00128243, -0.00129368,
+    -0.00130435, -0.00131445, -0.00132395, -0.00133285,
+    -0.00134113, -0.00134878, -0.00135577, -0.00136215,
+    -0.00136797, -0.00137333, -0.00137834, -0.00138305,
+    -0.00138748, -0.00139163, -0.00139551, -0.00139913,
+    -0.00140249, -0.00140559, -0.00140844, -0.00141102,
+    -0.00141334, -0.00141538, -0.00141714, -0.00141861,
+    -0.00141978, -0.00142064, -0.00142117, -0.00142138,
+    -0.00142125, -0.00142077, -0.00141992, -0.00141870,
+    -0.00141710, -0.00141510, -0.00141268, -0.00140986,
+    -0.00140663, -0.00140301, -0.00139900, -0.00139460,
+    -0.00138981, -0.00138464, -0.00137908, -0.00137313,
+    -0.00136680, -0.00136010, -0.00135301, -0.00134555,
+    -0.00133772, -0.00132952, -0.00132095, -0.00131201,
+    -0.00130272, -0.00129307, -0.00128309, -0.00127277,
+    -0.00126211, -0.00125113, -0.00123981, -0.00122817,
+    -0.00121622, -0.00120397, -0.00119141, -0.00117859,
+    -0.00116552, -0.00115223, -0.00113877, -0.00112517,
+    -0.00111144, -0.00109764, -0.00108377, -0.00106989,
+};

libav-v9.6.tar.bz2/libavcodec/aactab.h -> libav-v10.1.tar.bz2/libavcodec/aactab.h Changed

libav-v10.1.tar.bz2/libavcodec/aarch64 Added

libav-v10.1.tar.bz2/libavcodec/aarch64/Makefile Added

libav-v10.1.tar.bz2/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 Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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;
+ }
+}

libav-v10.1.tar.bz2/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 Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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

libav-v10.1.tar.bz2/libavcodec/aarch64/h264dsp_init_aarch64.c Added

@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2010 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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;
+ }
+}

libav-v10.1.tar.bz2/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 Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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

libav-v10.1.tar.bz2/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 Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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, ff_h264_idct_dc_add_neon
+ movrel x14, 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, ff_h264_idct_dc_add_neon
+ movrel x14, 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, ff_h264_idct_dc_add_neon
+ movrel x14, 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, ff_h264_idct8_dc_add_neon
+ movrel x14, 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

libav-v10.1.tar.bz2/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 Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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;
+ }
+}

libav-v10.1.tar.bz2/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 Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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

libav-v10.1.tar.bz2/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 Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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;
+ }
+}

libav-v10.1.tar.bz2/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 Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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

libav-v10.1.tar.bz2/libavcodec/aarch64/neon.S Added

@@ -0,0 +1,149 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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

libav-v10.1.tar.bz2/libavcodec/aarch64/neontest.c Added

@@ -0,0 +1,79 @@
+/*
+ * check NEON registers for clobbers
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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);
+}

libav-v10.1.tar.bz2/libavcodec/aarch64/rv40dsp_init_aarch64.c Added

@@ -0,0 +1,48 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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;
+ }
+}

libav-v10.1.tar.bz2/libavcodec/aarch64/vc1dsp_init_aarch64.c Added

@@ -0,0 +1,47 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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;
+ }
+}

libav-v9.6.tar.bz2/libavcodec/aasc.c -> libav-v10.1.tar.bz2/libavcodec/aasc.c Changed

@@ -29,13 +29,13 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
+#include "internal.h"
 #include "msrledec.h"
 
 typedef struct AascContext {
 AVCodecContext *avctx;
 GetByteContext gb;
- AVFrame frame;
+ AVFrame *frame;
 } AascContext;
 
 static av_cold int aasc_decode_init(AVCodecContext *avctx)
@@ -46,6 +46,10 @@
 
 avctx->pix_fmt = AV_PIX_FMT_BGR24;
 
+ s->frame = av_frame_alloc();
+ if (!s->frame)
+ return AVERROR(ENOMEM);
+
 return 0;
 }
 
@@ -56,13 +60,14 @@
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 AascContext *s = avctx->priv_data;
- int compr, i, stride;
+ int compr, i, stride, ret;
+
+ if (buf_size < 4)
+ return AVERROR_INVALIDDATA;
 
- s->frame.reference = 1;
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, &s->frame)) {
+ if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 compr = AV_RL32(buf);
@@ -71,22 +76,25 @@
 switch (compr) {
 case 0:
 stride = (avctx->width * 3 + 3) & ~3;
+ if (buf_size < stride * avctx->height)
+ return AVERROR_INVALIDDATA;
 for (i = avctx->height - 1; i >= 0; i--) {
- memcpy(s->frame.data[0] + i * s->frame.linesize[0], buf, avctx->width * 3);
+ memcpy(s->frame->data[0] + i * s->frame->linesize[0], buf, avctx->width * 3);
 buf += stride;
 }
 break;
 case 1:
 bytestream2_init(&s->gb, buf, buf_size);
- ff_msrle_decode(avctx, (AVPicture*)&s->frame, 8, &s->gb);
+ ff_msrle_decode(avctx, (AVPicture*)s->frame, 8, &s->gb);
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
+ if ((ret = av_frame_ref(data, s->frame)) < 0)
+ return ret;
 
 /* report that the buffer was completely consumed */
 return buf_size;
@@ -96,15 +104,14 @@
 {
 AascContext *s = avctx->priv_data;
 
- /* release the last frame */
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ av_frame_free(&s->frame);
 
 return 0;
 }
 
 AVCodec ff_aasc_decoder = {
 .name = "aasc",
+ .long_name = NULL_IF_CONFIG_SMALL("Autodesk RLE"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_AASC,
 .priv_data_size = sizeof(AascContext),
@@ -112,5 +119,4 @@
 .close = aasc_decode_end,
 .decode = aasc_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Autodesk RLE"),
 };

libav-v9.6.tar.bz2/libavcodec/ac3.h -> libav-v10.1.tar.bz2/libavcodec/ac3.h Changed

@@ -80,6 +80,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;
@@ -108,6 +140,7 @@
 int surround_mix_level; ///< Surround mix level index
 uint16_t channel_map;
 int num_blocks; ///< number of audio blocks
+ int dolby_surround_mode;
 /** @} */
 
 /** @name Derived values

libav-v9.6.tar.bz2/libavcodec/ac3_parser.c -> libav-v10.1.tar.bz2/libavcodec/ac3_parser.c Changed

libav-v9.6.tar.bz2/libavcodec/ac3dec.c -> libav-v10.1.tar.bz2/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
@@ -170,6 +181,7 @@
 ff_mdct_init(&s->imdct_512, 9, 1, 1.0);
 ff_kbd_window_init(s->window, 5.0, 256);
 ff_dsputil_init(&s->dsp, avctx);
+ avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
 ff_ac3dsp_init(&s->ac3dsp, avctx->flags & CODEC_FLAG_BITEXACT);
 ff_fmt_convert_init(&s->fmt_conv, avctx);
 av_lfg_init(&s->dith_state, 0);
@@ -177,16 +189,22 @@
 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;
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 for (i = 0; i < AC3_MAX_CHANNELS; i++) {
 s->xcfptr[i] = s->transform_coeffs[i];
 s->dlyptr[i] = s->delay[i];
@@ -219,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)) {
@@ -251,9 +283,9 @@
 
 /* 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;
@@ -262,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;
@@ -275,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;
@@ -292,7 +331,7 @@
 return ff_eac3_parse_header(s);
 } else {
 av_log(s->avctx, AV_LOG_ERROR, "E-AC-3 support not compiled in\n");
- return -1;
+ return AVERROR(ENOSYS);
 }
 }
 
@@ -431,7 +470,7 @@
 int end_freq = s->end_freq[ch_index];
 uint8_t *baps = s->bap[ch_index];
 int8_t *exps = s->dexps[ch_index];
- int *coeffs = s->fixed_coeffs[ch_index];
+ int32_t *coeffs = s->fixed_coeffs[ch_index];
 int dither = (ch_index == CPL_CH) || s->dither_flag[ch_index];
 GetBitContext *gbc = &s->gbc;
 int freq;
@@ -441,8 +480,9 @@
 int mantissa;
 switch (bap) {
 case 0:
+ /* random noise with approximate range of -0.707 to 0.707 */
 if (dither)
- mantissa = (av_lfg_get(&s->dith_state) & 0x7FFFFF) - 0x400000;
+ mantissa = (av_lfg_get(&s->dith_state) / 362) - 5932275;
 else
 mantissa = 0;
 break;
@@ -606,15 +646,15 @@
 for (i = 0; i < 128; i++)
 x[i] = s->transform_coeffs[ch][2 * i];
 s->imdct_256.imdct_half(&s->imdct_256, s->tmp_output, x);
- s->dsp.vector_fmul_window(s->outptr[ch - 1], s->delay[ch - 1],
- s->tmp_output, s->window, 128);
+ s->fdsp.vector_fmul_window(s->outptr[ch - 1], s->delay[ch - 1],
+ s->tmp_output, s->window, 128);
 for (i = 0; i < 128; i++)
 x[i] = s->transform_coeffs[ch][2 * i + 1];
 s->imdct_256.imdct_half(&s->imdct_256, s->delay[ch - 1], x);
 } else {
 s->imdct_512.imdct_half(&s->imdct_512, s->tmp_output, s->transform_coeffs[ch]);
- s->dsp.vector_fmul_window(s->outptr[ch - 1], s->delay[ch - 1],
- s->tmp_output, s->window, 128);
+ s->fdsp.vector_fmul_window(s->outptr[ch - 1], s->delay[ch - 1],
+ s->tmp_output, s->window, 128);
 memcpy(s->delay[ch - 1], s->tmp_output + 128, 128 * sizeof(float));
 }
 }
@@ -748,8 +788,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;
 }
@@ -787,12 +832,12 @@
 if (start_subband >= end_subband) {
 av_log(s->avctx, AV_LOG_ERROR, "invalid spectral extension "
 "range (%d >= %d)\n", start_subband, end_subband);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (dst_start_freq >= src_start_freq) {
 av_log(s->avctx, AV_LOG_ERROR, "invalid spectral extension "
 "copy start bin (%d >= %d)\n", dst_start_freq, src_start_freq);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 s->spx_dst_start_freq = dst_start_freq;
@@ -869,13 +914,13 @@
 
 if (channel_mode < AC3_CHMODE_STEREO) {
 av_log(s->avctx, AV_LOG_ERROR, "coupling not allowed in mono or dual-mono\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 /* check for enhanced coupling */
 if (s->eac3 && get_bits1(gbc)) {
 /* TODO: parse enhanced coupling strategy info */
- av_log_missing_feature(s->avctx, "Enhanced coupling", 1);
+ avpriv_request_sample(s->avctx, "Enhanced coupling");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -899,7 +944,7 @@
 if (cpl_start_subband >= cpl_end_subband) {
 av_log(s->avctx, AV_LOG_ERROR, "invalid coupling range (%d >= %d)\n",
 cpl_start_subband, cpl_end_subband);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 s->start_freq[CPL_CH] = cpl_start_subband * 12 + 37;
 s->end_freq[CPL_CH] = cpl_end_subband * 12 + 37;
@@ -921,7 +966,7 @@
 if (!blk) {
 av_log(s->avctx, AV_LOG_ERROR, "new coupling strategy must "
 "be present in block 0\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 } else {
 s->cpl_in_use[blk] = s->cpl_in_use[blk-1];
 }
@@ -951,7 +996,7 @@
 } else if (!blk) {
 av_log(s->avctx, AV_LOG_ERROR, "new coupling coordinates must "
 "be present in block 0\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 } else {
 /* channel not in coupling */
@@ -1006,7 +1051,7 @@
 int bandwidth_code = get_bits(gbc, 6);
 if (bandwidth_code > 60) {
 av_log(s->avctx, AV_LOG_ERROR, "bandwidth code = %d > 60\n", bandwidth_code);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 s->end_freq[ch] = bandwidth_code * 3 + 73;
 }
@@ -1029,7 +1074,7 @@
 s->num_exp_groups[ch], s->dexps[ch][0],
 &s->dexps[ch][s->start_freq[ch]+!!ch])) {
 av_log(s->avctx, AV_LOG_ERROR, "exponent out-of-range\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (ch != CPL_CH && ch != s->lfe_ch)
 skip_bits(gbc, 2); /* skip gainrng */
@@ -1049,7 +1094,7 @@
 } else if (!blk) {
 av_log(s->avctx, AV_LOG_ERROR, "new bit allocation info must "
 "be present in block 0\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 
@@ -1080,7 +1125,7 @@
 }
 } else if (!s->eac3 && !blk) {
 av_log(s->avctx, AV_LOG_ERROR, "new snr offsets must be present in block 0\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 
@@ -1119,7 +1164,7 @@
 } else if (!s->eac3 && !blk) {
 av_log(s->avctx, AV_LOG_ERROR, "new coupling leak info must "
 "be present in block 0\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 s->first_cpl_leak = 0;
 }
@@ -1131,7 +1176,7 @@
 s->dba_mode[ch] = get_bits(gbc, 2);
 if (s->dba_mode[ch] == DBA_RESERVED) {
 av_log(s->avctx, AV_LOG_ERROR, "delta bit allocation strategy reserved\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2);
 }
@@ -1172,7 +1217,7 @@
 s->dba_offsets[ch], s->dba_lengths[ch],
 s->dba_values[ch], s->mask[ch])) {
 av_log(s->avctx, AV_LOG_ERROR, "error in bit allocation\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 if (bit_alloc_stages[ch] > 0) {
@@ -1265,12 +1310,15 @@
 static int ac3_decode_frame(AVCodecContext * avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 AC3DecodeContext *s = avctx->priv_data;
 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. */
@@ -1291,7 +1339,7 @@
 switch (err) {
 case AAC_AC3_PARSE_ERROR_SYNC:
 av_log(avctx, AV_LOG_ERROR, "frame sync error\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 case AAC_AC3_PARSE_ERROR_BSID:
 av_log(avctx, AV_LOG_ERROR, "invalid bitstream id\n");
 break;
@@ -1305,17 +1353,20 @@
 /* skip frame if CRC is ok. otherwise use error concealment. */
 /* TODO: add support for substreams and dependent frames */
 if (s->frame_type == EAC3_FRAME_TYPE_DEPENDENT || s->substreamid) {
- av_log(avctx, AV_LOG_ERROR, "unsupported frame type : "
+ av_log(avctx, AV_LOG_WARNING, "unsupported frame type : "
 "skipping frame\n");
 *got_frame_ptr = 0;
- return s->frame_size;
+ return buf_size;
 } else {
 av_log(avctx, AV_LOG_ERROR, "invalid frame type\n");
 }
 break;
- default:
- av_log(avctx, AV_LOG_ERROR, "invalid header\n");
+ case AAC_AC3_PARSE_ERROR_CRC:
+ case AAC_AC3_PARSE_ERROR_CHANNEL_CFG:
 break;
+ default: // Normal AVERROR do not try to recover.
+ *got_frame_ptr = 0;
+ return err;
 }
 } else {
 /* check that reported frame size fits in input buffer */
@@ -1327,6 +1378,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;
 }
 }
@@ -1344,14 +1397,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;
 
 /* set downmixing coefficients if needed */
 if (s->channels != s->out_channels && !((s->output_mode & AC3_OUTPUT_LFEON) &&
@@ -1363,6 +1417,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;
@@ -1370,8 +1427,8 @@
 avctx->audio_service_type = AV_AUDIO_SERVICE_TYPE_KARAOKE;
 
 /* get output buffer */
- s->frame.nb_samples = s->num_blocks * 256;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = s->num_blocks * AC3_BLOCK_SIZE;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -1380,7 +1437,7 @@
 channel_map = ff_ac3_dec_channel_map[s->output_mode & ~AC3_OUTPUT_LFEON][s->lfe_on];
 for (ch = 0; ch < s->channels; ch++) {
 if (ch < s->out_channels)
- s->outptr[channel_map[ch]] = (float *)s->frame.data[ch];
+ s->outptr[channel_map[ch]] = (float *)frame->data[ch];
 else
 s->outptr[ch] = s->output[ch];
 output[ch] = s->output[ch];
@@ -1392,19 +1449,74 @@
 }
 if (err)
 for (ch = 0; ch < s->out_channels; ch++)
- memcpy(s->outptr[channel_map[ch]], output[ch], 1024);
- for (ch = 0; ch < s->out_channels; ch++) {
+ memcpy(s->outptr[channel_map[ch]], output[ch], sizeof(**output) * AC3_BLOCK_SIZE);
+ for (ch = 0; ch < s->out_channels; ch++)
 output[ch] = s->outptr[channel_map[ch]];
- s->outptr[channel_map[ch]] += AC3_BLOCK_SIZE;
- }
+ for (ch = 0; ch < s->out_channels; ch++)
+ s->outptr[ch] += AC3_BLOCK_SIZE;
 }
 
 /* keep last block for error concealment in next frame */
 for (ch = 0; ch < s->out_channels; ch++)
- memcpy(s->output[ch], output[ch], 1024);
+ 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;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
 return FFMIN(buf_size, s->frame_size);
 }
@@ -1424,7 +1536,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 },
 { NULL},
 };
 
@@ -1437,6 +1549,7 @@
 
 AVCodec ff_ac3_decoder = {
 .name = "ac3",
+ .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_AC3,
 .priv_data_size = sizeof (AC3DecodeContext),
@@ -1444,7 +1557,6 @@
 .close = ac3_decode_end,
 .decode = ac3_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_NONE },
 .priv_class = &ac3_decoder_class,
@@ -1460,6 +1572,7 @@
 
 AVCodec ff_eac3_decoder = {
 .name = "eac3",
+ .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52B (AC-3, E-AC-3)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_EAC3,
 .priv_data_size = sizeof (AC3DecodeContext),
@@ -1467,7 +1580,6 @@
 .close = ac3_decode_end,
 .decode = ac3_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52B (AC-3, E-AC-3)"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_NONE },
 .priv_class = &eac3_decoder_class,

libav-v9.6.tar.bz2/libavcodec/ac3dec.h -> libav-v10.1.tar.bz2/libavcodec/ac3dec.h Changed

@@ -50,6 +50,7 @@
 #ifndef AVCODEC_AC3DEC_H
 #define AVCODEC_AC3DEC_H
 
+#include "libavutil/float_dsp.h"
 #include "libavutil/lfg.h"
 #include "ac3.h"
 #include "ac3dsp.h"
@@ -68,7 +69,6 @@
 typedef struct AC3DecodeContext {
 AVClass *class; ///< class for AVOptions
 AVCodecContext *avctx; ///< parent context
- AVFrame frame; ///< AVFrame for decoded output
 GetBitContext gbc; ///< bitstream reader
 
 ///@name Bit stream information
@@ -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)
 ///@}
 
 ///@name Frame syntax parameters
@@ -193,6 +201,7 @@
 
 ///@name Optimization
 DSPContext dsp; ///< for optimization
+ AVFloatDSPContext fdsp;
 AC3DSPContext ac3dsp;
 FmtConvertContext fmt_conv; ///< optimized conversion functions
 ///@}
@@ -202,7 +211,7 @@
 float *dlyptr[AC3_MAX_CHANNELS];
 
 ///@name Aligned arrays
- DECLARE_ALIGNED(16, int, fixed_coeffs)[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< fixed-point transform coefficients
+ DECLARE_ALIGNED(16, int32_t, fixed_coeffs)[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< fixed-point transform coefficients
 DECLARE_ALIGNED(32, float, transform_coeffs)[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< transform coefficients
 DECLARE_ALIGNED(32, float, delay)[AC3_MAX_CHANNELS][AC3_BLOCK_SIZE]; ///< delay - added to the next block
 DECLARE_ALIGNED(32, float, window)[AC3_BLOCK_SIZE]; ///< window coefficients

libav-v9.6.tar.bz2/libavcodec/ac3dsp.c -> libav-v10.1.tar.bz2/libavcodec/ac3dsp.c Changed

@@ -23,6 +23,7 @@
 #include "avcodec.h"
 #include "ac3.h"
 #include "ac3dsp.h"
+#include "mathops.h"
 
 static void ac3_exponent_min_c(uint8_t *exp, int num_reuse_blocks, int nb_coefs)
 {
@@ -196,6 +197,19 @@
 }
 }
 
+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;
+ }
+}
+
 av_cold void ff_ac3dsp_init(AC3DSPContext *c, int bit_exact)
 {
 c->ac3_exponent_min = ac3_exponent_min_c;
@@ -208,6 +222,7 @@
 c->compute_mantissa_size = ac3_compute_mantissa_size_c;
 c->extract_exponents = ac3_extract_exponents_c;
 c->downmix = ac3_downmix_c;
+ c->apply_window_int16 = apply_window_int16_c;
 
 if (ARCH_ARM)
 ff_ac3dsp_init_arm(c, bit_exact);

libav-v9.6.tar.bz2/libavcodec/ac3dsp.h -> libav-v10.1.tar.bz2/libavcodec/ac3dsp.h Changed

libav-v9.6.tar.bz2/libavcodec/ac3enc.c -> libav-v10.1.tar.bz2/libavcodec/ac3enc.c Changed

@@ -26,18 +26,17 @@
 * The simplest AC-3 encoder.
 */
 
-//#define ASSERT_LEVEL 2
-
 #include <stdint.h>
 
+#include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/crc.h"
+#include "libavutil/internal.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "put_bits.h"
-#include "dsputil.h"
 #include "ac3dsp.h"
 #include "ac3.h"
 #include "fft.h"
@@ -754,7 +753,7 @@
 * Initialize bit allocation.
 * Set default parameter codes and calculate parameter values.
 */
-static void bit_alloc_init(AC3EncodeContext *s)
+static av_cold void bit_alloc_init(AC3EncodeContext *s)
 {
 int ch;
 
@@ -2052,9 +2051,6 @@
 
 s->mdct_end(s);
 
-#if FF_API_OLD_ENCODE_AUDIO
- av_freep(&avctx->coded_frame);
-#endif
 return 0;
 }
 
@@ -2484,14 +2480,6 @@
 if (ret)
 goto init_fail;
 
-#if FF_API_OLD_ENCODE_AUDIO
- avctx->coded_frame= avcodec_alloc_frame();
- if (!avctx->coded_frame) {
- ret = AVERROR(ENOMEM);
- goto init_fail;
- }
-#endif
-
 ff_dsputil_init(&s->dsp, avctx);
 avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
 ff_ac3dsp_init(&s->ac3dsp, avctx->flags & CODEC_FLAG_BITEXACT);

libav-v9.6.tar.bz2/libavcodec/ac3enc_fixed.c -> libav-v10.1.tar.bz2/libavcodec/ac3enc_fixed.c Changed

@@ -26,7 +26,7 @@
  * fixed-point AC-3 encoder.
  */
 
-#define CONFIG_FFT_FLOAT 0
+#define FFT_FLOAT 0
 #undef CONFIG_AC3ENC_FLOAT
 #include "internal.h"
 #include "ac3enc.h"
@@ -66,17 +66,6 @@
 
 
 /*
- * Apply KBD window to input samples prior to MDCT.
- */
-static void apply_window(void *dsp, int16_t *output, const int16_t *input,
-                         const int16_t *window, unsigned int len)
-{
-    DSPContext *dsp0 = dsp;
-    dsp0->apply_window_int16(output, input, window, len);
-}
-
-
-/*
  * Normalize the input samples to use the maximum available precision.
  * This assumes signed 16-bit input samples.
  */
@@ -143,6 +132,7 @@
 
 AVCodec ff_ac3_fixed_encoder = {
     .name            = "ac3_fixed",
+    .long_name       = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"),
     .type            = AVMEDIA_TYPE_AUDIO,
     .id              = AV_CODEC_ID_AC3,
     .priv_data_size  = sizeof(AC3EncodeContext),
@@ -151,7 +141,6 @@
     .close           = ff_ac3_encode_close,
     .sample_fmts     = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16P,
                                                       AV_SAMPLE_FMT_NONE },
-    .long_name       = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"),
     .priv_class      = &ac3enc_class,
     .channel_layouts = ff_ac3_channel_layouts,
     .defaults        = ac3_defaults,

libav-v9.6.tar.bz2/libavcodec/ac3enc_float.c -> libav-v10.1.tar.bz2/libavcodec/ac3enc_float.c Changed

@@ -84,18 +84,6 @@
 
 
 /*
- * Apply KBD window to input samples prior to MDCT.
- */
-static void apply_window(void *dsp, float *output,
-                         const float *input, const float *window,
-                         unsigned int len)
-{
-    AVFloatDSPContext *fdsp = dsp;
-    fdsp->vector_fmul(output, input, window, len);
-}
-
-
-/*
  * Normalize the input samples.
  * Not needed for the floating-point encoder.
  */
@@ -142,6 +130,7 @@
 #if CONFIG_AC3_ENCODER
 AVCodec ff_ac3_encoder = {
     .name            = "ac3",
+    .long_name       = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"),
     .type            = AVMEDIA_TYPE_AUDIO,
     .id              = AV_CODEC_ID_AC3,
     .priv_data_size  = sizeof(AC3EncodeContext),
@@ -150,7 +139,6 @@
     .close           = ff_ac3_encode_close,
     .sample_fmts     = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP,
                                                       AV_SAMPLE_FMT_NONE },
-    .long_name       = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"),
     .priv_class      = &ac3enc_class,
     .channel_layouts = ff_ac3_channel_layouts,
     .defaults        = ac3_defaults,

libav-v9.6.tar.bz2/libavcodec/ac3enc_template.c -> libav-v10.1.tar.bz2/libavcodec/ac3enc_template.c Changed

@@ -28,15 +28,12 @@
 
 #include <stdint.h>
 
+#include "libavutil/internal.h"
 
 /* prototypes for static functions in ac3enc_fixed.c and ac3enc_float.c */
 
 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);
@@ -101,11 +98,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)

libav-v9.6.tar.bz2/libavcodec/ac3tab.h -> libav-v10.1.tar.bz2/libavcodec/ac3tab.h Changed

libav-v9.6.tar.bz2/libavcodec/acelp_pitch_delay.c -> libav-v10.1.tar.bz2/libavcodec/acelp_pitch_delay.c Changed

libav-v9.6.tar.bz2/libavcodec/acelp_vectors.c -> libav-v10.1.tar.bz2/libavcodec/acelp_vectors.c Changed

@@ -23,8 +23,8 @@
 #include <inttypes.h>
 
 #include "libavutil/common.h"
+#include "libavutil/float_dsp.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "acelp_vectors.h"
 
 const uint8_t ff_fc_2pulses_9bits_track1[16] =
@@ -94,10 +94,10 @@
 0.898529 , 0.865051 , 0.769257 , 0.624054 , 0.448639 , 0.265289 ,
 0.0959167 , -0.0412598 , -0.134338 , -0.178986 , -0.178528 , -0.142609 ,
 -0.0849304 , -0.0205078 , 0.0369568 , 0.0773926 , 0.0955200 , 0.0912781 ,
- 0.0689392 , 0.0357056 , 0. , -0.0305481 , -0.0504150 , -0.0570068 ,
+ 0.0689392 , 0.0357056 , 0.0 , -0.0305481 , -0.0504150 , -0.0570068 ,
 -0.0508423 , -0.0350037 , -0.0141602 , 0.00665283, 0.0230713 , 0.0323486 ,
 0.0335388 , 0.0275879 , 0.0167847 , 0.00411987, -0.00747681, -0.0156860 ,
--0.0193481 , -0.0183716 , -0.0137634 , -0.00704956, 0. , 0.00582886 ,
+-0.0193481 , -0.0183716 , -0.0137634 , -0.00704956, 0.0 , 0.00582886 ,
 0.00939941, 0.0103760 , 0.00903320, 0.00604248, 0.00238037, -0.00109863 ,
 -0.00366211, -0.00497437, -0.00503540, -0.00402832, -0.00241089, -0.000579834,
 0.00103760, 0.00222778, 0.00277710, 0.00271606, 0.00213623, 0.00115967 ,
@@ -183,7 +183,7 @@
 int size, float alpha, float *gain_mem)
 {
 int i;
- float postfilter_energ = ff_scalarproduct_float_c(in, in, size);
+ float postfilter_energ = avpriv_scalarproduct_float_c(in, in, size);
 float gain_scale_factor = 1.0;
 float mem = *gain_mem;
 
@@ -204,7 +204,7 @@
 float sum_of_squares, const int n)
 {
 int i;
- float scalefactor = ff_scalarproduct_float_c(in, in, n);
+ float scalefactor = avpriv_scalarproduct_float_c(in, in, n);
 if (scalefactor)
 scalefactor = sqrt(sum_of_squares / scalefactor);
 for (i = 0; i < n; i++)

libav-v9.6.tar.bz2/libavcodec/adpcm.c -> libav-v10.1.tar.bz2/libavcodec/adpcm.c Changed

@@ -1,6 +1,18 @@
 /*
 * Copyright (c) 2001-2003 The ffmpeg Project
 *
+ * first version by Francois Revol (revol@free.fr)
+ * fringe ADPCM codecs (e.g., DK3, DK4, Westwood)
+ * by Mike Melanson (melanson@pcisys.net)
+ * CD-ROM XA ADPCM codec by BERO
+ * EA ADPCM decoder by Robin Kay (komadori@myrealbox.com)
+ * EA ADPCM R1/R2/R3 decoder by Peter Ross (pross@xvid.org)
+ * EA IMA EACS decoder by Peter Ross (pross@xvid.org)
+ * EA IMA SEAD decoder by Peter Ross (pross@xvid.org)
+ * EA ADPCM XAS decoder by Peter Ross (pross@xvid.org)
+ * MAXIS EA ADPCM decoder by Robert Marston (rmarston@gmail.com)
+ * THP ADPCM decoder by Marco Gerards (mgerards@xs4all.nl)
+ *
 * This file is part of Libav.
 *
 * Libav is free software; you can redistribute it and/or
@@ -28,18 +40,6 @@
 /**
 * @file
 * ADPCM decoders
- * First version by Francois Revol (revol@free.fr)
- * Fringe ADPCM codecs (e.g., DK3, DK4, Westwood)
- * by Mike Melanson (melanson@pcisys.net)
- * CD-ROM XA ADPCM codec by BERO
- * EA ADPCM decoder by Robin Kay (komadori@myrealbox.com)
- * EA ADPCM R1/R2/R3 decoder by Peter Ross (pross@xvid.org)
- * EA IMA EACS decoder by Peter Ross (pross@xvid.org)
- * EA IMA SEAD decoder by Peter Ross (pross@xvid.org)
- * EA ADPCM XAS decoder by Peter Ross (pross@xvid.org)
- * MAXIS EA ADPCM decoder by Robert Marston (rmarston@gmail.com)
- * THP ADPCM decoder by Marco Gerards (mgerards@xs4all.nl)
- *
 * Features and limitations:
 *
 * Reference documents:
@@ -85,7 +85,6 @@
 /* end of tables */
 
 typedef struct ADPCMDecodeContext {
- AVFrame frame;
 ADPCMChannelStatus status[6];
 int vqa_version; /**< VQA version. Used for ADPCM_IMA_WS */
 } ADPCMDecodeContext;
@@ -156,9 +155,6 @@
 avctx->sample_fmt = AV_SAMPLE_FMT_S16;
 }
 
- avcodec_get_frame_defaults(&c->frame);
- avctx->coded_frame = &c->frame;
-
 return 0;
 }
 
@@ -591,6 +587,7 @@
 static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 ADPCMDecodeContext *c = avctx->priv_data;
@@ -611,20 +608,20 @@
 }
 
 /* get output buffer */
- c->frame.nb_samples = nb_samples;
- if ((ret = ff_get_buffer(avctx, &c->frame)) < 0) {
+ frame->nb_samples = nb_samples;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- samples = (short *)c->frame.data[0];
- samples_p = (int16_t **)c->frame.extended_data;
+ samples = (short *)frame->data[0];
+ samples_p = (int16_t **)frame->extended_data;
 
 /* 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)
 av_log(avctx, AV_LOG_WARNING, "mismatch in coded sample count\n");
- c->frame.nb_samples = nb_samples = coded_samples;
+ frame->nb_samples = nb_samples = coded_samples;
 }
 
 st = avctx->channels == 2 ? 1 : 0;
@@ -710,7 +707,7 @@
 }
 
 for (i = 0; i < avctx->channels; i++) {
- samples = (int16_t *)c->frame.data[i];
+ samples = (int16_t *)frame->data[i];
 cs = &c->status[i];
 for (n = nb_samples >> 1; n > 0; n--) {
 int v = bytestream2_get_byteu(&gb);
@@ -773,7 +770,7 @@
 return AVERROR_INVALIDDATA;
 }
 }
- for (n = nb_samples >> (1 - st); n > 0; n--) {
+ for (n = (nb_samples >> (1 - st)) - 1; n > 0; n--) {
 int v = bytestream2_get_byteu(&gb);
 *samples++ = adpcm_ima_expand_nibble(&c->status[0 ], v >> 4 , 3);
 *samples++ = adpcm_ima_expand_nibble(&c->status[st], v & 0x0F, 3);
@@ -1097,7 +1094,7 @@
 }
 }
 
- c->frame.nb_samples = count * 28;
+ frame->nb_samples = count * 28;
 bytestream2_seek(&gb, 0, SEEK_END);
 break;
 }
@@ -1278,8 +1275,7 @@
 return -1;
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = c->frame;
+ *got_frame_ptr = 1;
 
 return bytestream2_tell(&gb);
 }
@@ -1296,13 +1292,13 @@
 #define ADPCM_DECODER(id_, sample_fmts_, name_, long_name_) \
 AVCodec ff_ ## name_ ## _decoder = { \
 .name = #name_, \
+ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
 .type = AVMEDIA_TYPE_AUDIO, \
 .id = id_, \
 .priv_data_size = sizeof(ADPCMDecodeContext), \
 .init = adpcm_decode_init, \
 .decode = adpcm_decode_frame, \
 .capabilities = CODEC_CAP_DR1, \
- .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
 .sample_fmts = sample_fmts_, \
 }

libav-v9.6.tar.bz2/libavcodec/adpcmenc.c -> libav-v10.1.tar.bz2/libavcodec/adpcmenc.c Changed

@@ -1,6 +1,10 @@
 /*
  * Copyright (c) 2001-2003 The ffmpeg Project
  *
+ * first version by Francois Revol (revol@free.fr)
+ * fringe ADPCM codecs (e.g., DK3, DK4, Westwood)
+ *   by Mike Melanson (melanson@pcisys.net)
+ *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
@@ -29,10 +33,6 @@
 /**
  * @file
  * ADPCM encoders
- * First version by Francois Revol (revol@free.fr)
- * Fringe ADPCM codecs (e.g., DK3, DK4, Westwood)
- *   by Mike Melanson (melanson@pcisys.net)
- *
  * See ADPCM decoder reference documents for codec information.
  */
 
@@ -142,11 +142,6 @@
         goto error;
     }
 
-#if FF_API_OLD_ENCODE_AUDIO
-    if (!(avctx->coded_frame = avcodec_alloc_frame()))
-        goto error;
-#endif
-
     return 0;
 error:
     av_freep(&s->paths);
@@ -159,9 +154,6 @@
 static av_cold int adpcm_encode_close(AVCodecContext *avctx)
 {
     ADPCMEncodeContext *s = avctx->priv_data;
-#if FF_API_OLD_ENCODE_AUDIO
-    av_freep(&avctx->coded_frame);
-#endif
     av_freep(&s->paths);
     av_freep(&s->node_buf);
     av_freep(&s->nodep_buf);
@@ -716,6 +708,7 @@
 #define ADPCM_ENCODER(id_, name_, sample_fmts_, long_name_) \
 AVCodec ff_ ## name_ ## _encoder = {                        \
     .name           = #name_,                               \
+    .long_name      = NULL_IF_CONFIG_SMALL(long_name_),     \
     .type           = AVMEDIA_TYPE_AUDIO,                   \
     .id             = id_,                                  \
     .priv_data_size = sizeof(ADPCMEncodeContext),           \
@@ -723,7 +716,6 @@
     .encode2        = adpcm_encode_frame,                   \
     .close          = adpcm_encode_close,                   \
     .sample_fmts    = sample_fmts_,                         \
-    .long_name      = NULL_IF_CONFIG_SMALL(long_name_),     \
 }
 
 ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_QT,  adpcm_ima_qt,  sample_fmts_p, "ADPCM IMA QuickTime");

libav-v9.6.tar.bz2/libavcodec/adx.c -> libav-v10.1.tar.bz2/libavcodec/adx.c Changed

libav-v9.6.tar.bz2/libavcodec/adx.h -> libav-v10.1.tar.bz2/libavcodec/adx.h Changed

libav-v9.6.tar.bz2/libavcodec/adxdec.c -> libav-v10.1.tar.bz2/libavcodec/adxdec.c Changed

@@ -52,9 +52,6 @@
 
 avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
 
- avcodec_get_frame_defaults(&c->frame);
- avctx->coded_frame = &c->frame;
-
 return 0;
 }
 
@@ -98,6 +95,7 @@
 static int adx_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 int buf_size = avpkt->size;
 ADXContext *c = avctx->priv_data;
 int16_t **samples;
@@ -142,12 +140,12 @@
 }
 
 /* get output buffer */
- c->frame.nb_samples = num_blocks * BLOCK_SAMPLES;
- if ((ret = ff_get_buffer(avctx, &c->frame)) < 0) {
+ frame->nb_samples = num_blocks * BLOCK_SAMPLES;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- samples = (int16_t **)c->frame.extended_data;
+ samples = (int16_t **)frame->extended_data;
 samples_offset = 0;
 
 while (num_blocks--) {
@@ -163,8 +161,7 @@
 samples_offset += BLOCK_SAMPLES;
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = c->frame;
+ *got_frame_ptr = 1;
 
 return buf - avpkt->data;
 }
@@ -178,6 +175,7 @@
 
 AVCodec ff_adpcm_adx_decoder = {
 .name = "adpcm_adx",
+ .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX ADPCM"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_ADPCM_ADX,
 .priv_data_size = sizeof(ADXContext),
@@ -185,7 +183,6 @@
 .decode = adx_decode_frame,
 .flush = adx_decode_flush,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX ADPCM"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
 AV_SAMPLE_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/adxenc.c -> libav-v10.1.tar.bz2/libavcodec/adxenc.c Changed

libav-v10.1.tar.bz2/libavcodec/aic.c Added

@@ -0,0 +1,480 @@
+/*
+ * Apple Intermediate Codec decoder
+ *
+ * Copyright (c) 2013 Konstantin Shishkov
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avcodec.h"
+#include "bytestream.h"
+#include "dsputil.h"
+#include "internal.h"
+#include "get_bits.h"
+#include "golomb.h"
+#include "unary.h"
+
+#define AIC_HDR_SIZE 24
+#define AIC_BAND_COEFFS (64 + 32 + 192 + 96)
+
+enum AICBands {
+ COEFF_LUMA = 0,
+ COEFF_CHROMA,
+ COEFF_LUMA_EXT,
+ COEFF_CHROMA_EXT,
+ NUM_BANDS
+};
+
+static const int aic_num_band_coeffs[NUM_BANDS] = { 64, 32, 192, 96 };
+
+static const int aic_band_off[NUM_BANDS] = { 0, 64, 96, 288 };
+
+static const uint8_t aic_quant_matrix[64] = {
+ 8, 16, 19, 22, 22, 26, 26, 27,
+ 16, 16, 22, 22, 26, 27, 27, 29,
+ 19, 22, 26, 26, 27, 29, 29, 35,
+ 22, 24, 27, 27, 29, 32, 34, 38,
+ 26, 27, 29, 29, 32, 35, 38, 46,
+ 27, 29, 34, 34, 35, 40, 46, 56,
+ 29, 34, 34, 37, 40, 48, 56, 69,
+ 34, 37, 38, 40, 48, 58, 69, 83,
+};
+
+static const uint8_t aic_y_scan[64] = {
+ 0, 4, 1, 2, 5, 8, 12, 9,
+ 6, 3, 7, 10, 13, 14, 11, 15,
+ 47, 43, 46, 45, 42, 39, 35, 38,
+ 41, 44, 40, 37, 34, 33, 36, 32,
+ 16, 20, 17, 18, 21, 24, 28, 25,
+ 22, 19, 23, 26, 29, 30, 27, 31,
+ 63, 59, 62, 61, 58, 55, 51, 54,
+ 57, 60, 56, 53, 50, 49, 52, 48,
+};
+
+static const uint8_t aic_y_ext_scan[192] = {
+ 64, 72, 65, 66, 73, 80, 88, 81,
+ 74, 67, 75, 82, 89, 90, 83, 91,
+ 0, 4, 1, 2, 5, 8, 12, 9,
+ 6, 3, 7, 10, 13, 14, 11, 15,
+ 16, 20, 17, 18, 21, 24, 28, 25,
+ 22, 19, 23, 26, 29, 30, 27, 31,
+ 155, 147, 154, 153, 146, 139, 131, 138,
+ 145, 152, 144, 137, 130, 129, 136, 128,
+ 47, 43, 46, 45, 42, 39, 35, 38,
+ 41, 44, 40, 37, 34, 33, 36, 32,
+ 63, 59, 62, 61, 58, 55, 51, 54,
+ 57, 60, 56, 53, 50, 49, 52, 48,
+ 96, 104, 97, 98, 105, 112, 120, 113,
+ 106, 99, 107, 114, 121, 122, 115, 123,
+ 68, 76, 69, 70, 77, 84, 92, 85,
+ 78, 71, 79, 86, 93, 94, 87, 95,
+ 100, 108, 101, 102, 109, 116, 124, 117,
+ 110, 103, 111, 118, 125, 126, 119, 127,
+ 187, 179, 186, 185, 178, 171, 163, 170,
+ 177, 184, 176, 169, 162, 161, 168, 160,
+ 159, 151, 158, 157, 150, 143, 135, 142,
+ 149, 156, 148, 141, 134, 133, 140, 132,
+ 191, 183, 190, 189, 182, 175, 167, 174,
+ 181, 188, 180, 173, 166, 165, 172, 164,
+};
+
+static const uint8_t aic_c_scan[64] = {
+ 0, 4, 1, 2, 5, 8, 12, 9,
+ 6, 3, 7, 10, 13, 14, 11, 15,
+ 31, 27, 30, 29, 26, 23, 19, 22,
+ 25, 28, 24, 21, 18, 17, 20, 16,
+ 32, 36, 33, 34, 37, 40, 44, 41,
+ 38, 35, 39, 42, 45, 46, 43, 47,
+ 63, 59, 62, 61, 58, 55, 51, 54,
+ 57, 60, 56, 53, 50, 49, 52, 48,
+};
+
+static const uint8_t aic_c_ext_scan[192] = {
+ 16, 24, 17, 18, 25, 32, 40, 33,
+ 26, 19, 27, 34, 41, 42, 35, 43,
+ 0, 4, 1, 2, 5, 8, 12, 9,
+ 6, 3, 7, 10, 13, 14, 11, 15,
+ 20, 28, 21, 22, 29, 36, 44, 37,
+ 30, 23, 31, 38, 45, 46, 39, 47,
+ 95, 87, 94, 93, 86, 79, 71, 78,
+ 85, 92, 84, 77, 70, 69, 76, 68,
+ 63, 59, 62, 61, 58, 55, 51, 54,
+ 57, 60, 56, 53, 50, 49, 52, 48,
+ 91, 83, 90, 89, 82, 75, 67, 74,
+ 81, 88, 80, 73, 66, 65, 72, 64,
+ 112, 120, 113, 114, 121, 128, 136, 129,
+ 122, 115, 123, 130, 137, 138, 131, 139,
+ 96, 100, 97, 98, 101, 104, 108, 105,
+ 102, 99, 103, 106, 109, 110, 107, 111,
+ 116, 124, 117, 118, 125, 132, 140, 133,
+ 126, 119, 127, 134, 141, 142, 135, 143,
+ 191, 183, 190, 189, 182, 175, 167, 174,
+ 181, 188, 180, 173, 166, 165, 172, 164,
+ 159, 155, 158, 157, 154, 151, 147, 150,
+ 153, 156, 152, 149, 146, 145, 148, 144,
+ 187, 179, 186, 185, 178, 171, 163, 170,
+ 177, 184, 176, 169, 162, 161, 168, 160,
+};
+
+static const uint8_t *aic_scan[NUM_BANDS] = {
+ aic_y_scan, aic_c_scan, aic_y_ext_scan, aic_c_ext_scan
+};
+
+typedef struct AICContext {
+ AVCodecContext *avctx;
+ AVFrame *frame;
+ DSPContext dsp;
+ ScanTable scantable;
+
+ int num_x_slices;
+ int slice_width;
+ int mb_width, mb_height;
+ int quant;
+ int interlaced;
+
+ int16_t *slice_data;
+ int16_t *data_ptr[NUM_BANDS];
+
+ DECLARE_ALIGNED(16, int16_t, block)[64];
+} AICContext;
+
+static int aic_decode_header(AICContext *ctx, const uint8_t *src, int size)
+{
+ uint32_t frame_size;
+ int width, height;
+
+ if (src[0] != 1) {
+ av_log(ctx->avctx, AV_LOG_ERROR, "Invalid version %d\n", src[0]);
+ return AVERROR_INVALIDDATA;
+ }
+ if (src[1] != AIC_HDR_SIZE - 2) {
+ av_log(ctx->avctx, AV_LOG_ERROR, "Invalid header size %d\n", src[1]);
+ return AVERROR_INVALIDDATA;
+ }
+ frame_size = AV_RB32(src + 2);
+ width = AV_RB16(src + 6);
+ height = AV_RB16(src + 8);
+ if (frame_size > size) {
+ av_log(ctx->avctx, AV_LOG_ERROR, "Frame size should be %d got %d\n",
+ frame_size, size);
+ return AVERROR_INVALIDDATA;
+ }
+ if (width != ctx->avctx->width || height != ctx->avctx->height) {
+ av_log(ctx->avctx, AV_LOG_ERROR,
+ "Picture dimension changed: old: %d x %d, new: %d x %d\n",
+ ctx->avctx->width, ctx->avctx->height, width, height);
+ return AVERROR_INVALIDDATA;
+ }
+ ctx->quant = src[15];
+ ctx->interlaced = ((src[16] >> 4) == 3);
+
+ return 0;
+}
+
+#define GET_CODE(val, type, add_bits) \
+ do { \
+ if (type) \
+ val = get_ue_golomb(gb); \
+ else \
+ val = get_unary(gb, 1, 31); \
+ if (add_bits) \
+ val = (val << add_bits) + get_bits(gb, add_bits); \
+ } while (0)
+
+static int aic_decode_coeffs(GetBitContext *gb, int16_t *dst,
+ int band, int slice_width, int force_chroma)
+{
+ int has_skips, coeff_type, coeff_bits, skip_type, skip_bits;
+ const int num_coeffs = aic_num_band_coeffs[band];
+ const uint8_t *scan = aic_scan[band | force_chroma];
+ int mb, idx, val;
+
+ has_skips = get_bits1(gb);
+ coeff_type = get_bits1(gb);
+ coeff_bits = get_bits(gb, 3);
+
+ if (has_skips) {
+ skip_type = get_bits1(gb);
+ skip_bits = get_bits(gb, 3);
+
+ for (mb = 0; mb < slice_width; mb++) {
+ idx = -1;
+ do {
+ GET_CODE(val, skip_type, skip_bits);
+ if (val < 0)
+ return AVERROR_INVALIDDATA;
+ idx += val + 1;
+ if (idx >= num_coeffs)
+ break;
+ GET_CODE(val, coeff_type, coeff_bits);
+ val++;
+ if (val >= 0x10000 || val < 0)
+ return AVERROR_INVALIDDATA;
+ dst[scan[idx]] = val;
+ } while (idx < num_coeffs - 1);
+ dst += num_coeffs;
+ }
+ } else {
+ for (mb = 0; mb < slice_width; mb++) {
+ for (idx = 0; idx < num_coeffs; idx++) {
+ GET_CODE(val, coeff_type, coeff_bits);
+ if (val >= 0x10000 || val < 0)
+ return AVERROR_INVALIDDATA;
+ dst[scan[idx]] = val;
+ }
+ dst += num_coeffs;
+ }
+ }
+ return 0;
+}
+
+static void recombine_block(int16_t *dst, const uint8_t *scan,
+ int16_t **base, int16_t **ext)
+{
+ int i, j;
+
+ for (i = 0; i < 4; i++) {
+ for (j = 0; j < 4; j++)
+ dst[scan[i * 8 + j]] = (*base)[j];
+ for (j = 0; j < 4; j++)
+ dst[scan[i * 8 + j + 4]] = (*ext)[j];
+ *base += 4;
+ *ext += 4;
+ }
+ for (; i < 8; i++) {
+ for (j = 0; j < 8; j++)
+ dst[scan[i * 8 + j]] = (*ext)[j];
+ *ext += 8;
+ }
+}
+
+static void recombine_block_il(int16_t *dst, const uint8_t *scan,
+ int16_t **base, int16_t **ext,
+ int block_no)
+{
+ int i, j;
+
+ if (block_no < 2) {
+ for (i = 0; i < 8; i++) {
+ for (j = 0; j < 4; j++)
+ dst[scan[i * 8 + j]] = (*base)[j];
+ for (j = 0; j < 4; j++)
+ dst[scan[i * 8 + j + 4]] = (*ext)[j];
+ *base += 4;
+ *ext += 4;
+ }
+ } else {
+ for (i = 0; i < 64; i++)
+ dst[scan[i]] = (*ext)[i];
+ *ext += 64;
+ }
+}
+
+static void unquant_block(int16_t *block, int q)
+{
+ int i;
+
+ for (i = 0; i < 64; i++) {
+ int val = (uint16_t)block[i];
+ int sign = val & 1;
+
+ block[i] = (((val >> 1) ^ -sign) * q * aic_quant_matrix[i] >> 4)
+ + sign;
+ }
+}
+
+static int aic_decode_slice(AICContext *ctx, int mb_x, int mb_y,
+ const uint8_t *src, int src_size)
+{
+ GetBitContext gb;
+ int ret, i, mb, blk;
+ int slice_width = FFMIN(ctx->slice_width, ctx->mb_width - mb_x);
+ uint8_t *Y, *C[2];
+ uint8_t *dst;
+ int16_t *base_y = ctx->data_ptr[COEFF_LUMA];
+ int16_t *base_c = ctx->data_ptr[COEFF_CHROMA];
+ int16_t *ext_y = ctx->data_ptr[COEFF_LUMA_EXT];
+ int16_t *ext_c = ctx->data_ptr[COEFF_CHROMA_EXT];
+ const int ystride = ctx->frame->linesize[0];
+
+ Y = ctx->frame->data[0] + mb_x * 16 + mb_y * 16 * ystride;
+ for (i = 0; i < 2; i++)
+ C[i] = ctx->frame->data[i + 1] + mb_x * 8
+ + mb_y * 8 * ctx->frame->linesize[i + 1];
+ init_get_bits(&gb, src, src_size * 8);
+
+ memset(ctx->slice_data, 0,
+ sizeof(*ctx->slice_data) * slice_width * AIC_BAND_COEFFS);
+ for (i = 0; i < NUM_BANDS; i++)
+ if ((ret = aic_decode_coeffs(&gb, ctx->data_ptr[i],
+ i, slice_width,
+ !ctx->interlaced)) < 0)
+ return ret;
+
+ for (mb = 0; mb < slice_width; mb++) {
+ for (blk = 0; blk < 4; blk++) {
+ if (!ctx->interlaced)
+ recombine_block(ctx->block, ctx->scantable.permutated,
+ &base_y, &ext_y);
+ else
+ recombine_block_il(ctx->block, ctx->scantable.permutated,
+ &base_y, &ext_y, blk);
+ unquant_block(ctx->block, ctx->quant);
+ ctx->dsp.idct(ctx->block);
+
+ if (!ctx->interlaced) {
+ dst = Y + (blk >> 1) * 8 * ystride + (blk & 1) * 8;
+ ctx->dsp.put_signed_pixels_clamped(ctx->block, dst,
+ ystride);
+ } else {
+ dst = Y + (blk & 1) * 8 + (blk >> 1) * ystride;
+ ctx->dsp.put_signed_pixels_clamped(ctx->block, dst,
+ ystride * 2);
+ }
+ }
+ Y += 16;
+
+ for (blk = 0; blk < 2; blk++) {
+ recombine_block(ctx->block, ctx->scantable.permutated,
+ &base_c, &ext_c);
+ unquant_block(ctx->block, ctx->quant);
+ ctx->dsp.idct(ctx->block);
+ ctx->dsp.put_signed_pixels_clamped(ctx->block, C[blk],
+ ctx->frame->linesize[blk + 1]);
+ C[blk] += 8;
+ }
+ }
+
+ return 0;
+}
+
+static int aic_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
+ AVPacket *avpkt)
+{
+ AICContext *ctx = avctx->priv_data;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ GetByteContext gb;
+ uint32_t off;
+ int x, y, ret;
+ int slice_size;
+
+ ctx->frame = data;
+ ctx->frame->pict_type = AV_PICTURE_TYPE_I;
+ ctx->frame->key_frame = 1;
+
+ off = FFALIGN(AIC_HDR_SIZE + ctx->num_x_slices * ctx->mb_height * 2, 4);
+
+ if (buf_size < off) {
+ av_log(avctx, AV_LOG_ERROR, "Too small frame\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if ((ret = aic_decode_header(ctx, buf, buf_size)) < 0)
+ return ret;
+
+ if ((ret = ff_get_buffer(avctx, ctx->frame, 0)) < 0)
+ return ret;
+
+ bytestream2_init(&gb, buf + AIC_HDR_SIZE,
+ ctx->num_x_slices * ctx->mb_height * 2);
+
+ for (y = 0; y < ctx->mb_height; y++) {
+ for (x = 0; x < ctx->mb_width; x += ctx->slice_width) {
+ slice_size = bytestream2_get_le16(&gb) * 4;
+ if (slice_size + off > buf_size || !slice_size) {
+ av_log(avctx, AV_LOG_ERROR, "Incorrect slice size\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if ((ret = aic_decode_slice(ctx, x, y,
+ buf + off, slice_size)) < 0)
+ return ret;
+
+ off += slice_size;
+ }
+ }
+
+ *got_frame = 1;
+
+ return avpkt->size;
+}
+
+static av_cold int aic_decode_init(AVCodecContext *avctx)
+{
+ AICContext *ctx = avctx->priv_data;
+ int i;
+ uint8_t scan[64];
+
+ ctx->avctx = avctx;
+
+ avctx->pix_fmt = AV_PIX_FMT_YUV420P;
+
+ ff_dsputil_init(&ctx->dsp, avctx);
+
+ for (i = 0; i < 64; i++)
+ scan[i] = i;
+ ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable, scan);
+
+ ctx->mb_width = FFALIGN(avctx->width, 16) >> 4;
+ ctx->mb_height = FFALIGN(avctx->height, 16) >> 4;
+
+ ctx->num_x_slices = 16;
+ ctx->slice_width = ctx->mb_width / 16;
+ for (i = 1; i < 32; i++) {
+ if (!(ctx->mb_width % i) && (ctx->mb_width / i < 32)) {
+ ctx->slice_width = ctx->mb_width / i;
+ ctx->num_x_slices = i;
+ break;
+ }
+ }
+
+ ctx->slice_data = av_malloc(ctx->slice_width * AIC_BAND_COEFFS
+ * sizeof(*ctx->slice_data));
+ if (!ctx->slice_data) {
+ av_log(avctx, AV_LOG_ERROR, "Error allocating slice buffer\n");
+
+ return AVERROR(ENOMEM);
+ }
+
+ for (i = 0; i < NUM_BANDS; i++)
+ ctx->data_ptr[i] = ctx->slice_data + ctx->slice_width
+ * aic_band_off[i];
+
+ return 0;
+}
+
+static av_cold int aic_decode_close(AVCodecContext *avctx)
+{
+ AICContext *ctx = avctx->priv_data;
+
+ av_freep(&ctx->slice_data);
+
+ return 0;
+}
+
+AVCodec ff_aic_decoder = {
+ .name = "aic",
+ .long_name = NULL_IF_CONFIG_SMALL("Apple Intermediate Codec"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_AIC,
+ .priv_data_size = sizeof(AICContext),
+ .init = aic_decode_init,
+ .close = aic_decode_close,
+ .decode = aic_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+};

libav-v9.6.tar.bz2/libavcodec/alac.c -> libav-v10.1.tar.bz2/libavcodec/alac.c Changed

@@ -58,7 +58,6 @@
 
 typedef struct {
 AVCodecContext *avctx;
- AVFrame frame;
 GetBitContext gb;
 int channels;
 
@@ -248,7 +247,7 @@
 buffer[ch][i] = (buffer[ch][i] << extra_bits) | extra_bits_buffer[ch][i];
 }
 
-static int decode_element(AVCodecContext *avctx, void *data, int ch_index,
+static int decode_element(AVCodecContext *avctx, AVFrame *frame, int ch_index,
 int channels)
 {
 ALACContext *alac = avctx->priv_data;
@@ -283,8 +282,8 @@
 }
 if (!alac->nb_samples) {
 /* get output buffer */
- alac->frame.nb_samples = output_samples;
- if ((ret = ff_get_buffer(avctx, &alac->frame)) < 0) {
+ frame->nb_samples = output_samples;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -296,7 +295,7 @@
 alac->nb_samples = output_samples;
 if (alac->sample_size > 16) {
 for (ch = 0; ch < channels; ch++)
- alac->output_samples_buffer[ch] = (int32_t *)alac->frame.extended_data[ch_index + ch];
+ alac->output_samples_buffer[ch] = (int32_t *)frame->extended_data[ch_index + ch];
 }
 
 if (is_compressed) {
@@ -315,6 +314,9 @@
 rice_history_mult[ch] = get_bits(&alac->gb, 3);
 lpc_order[ch] = get_bits(&alac->gb, 5);
 
+ if (lpc_order[ch] >= alac->max_samples_per_frame)
+ return AVERROR_INVALIDDATA;
+
 /* read the predictor table */
 for (i = lpc_order[ch] - 1; i >= 0; i--)
 lpc_coefs[ch][i] = get_sbits(&alac->gb, 16);
@@ -377,7 +379,7 @@
 switch(alac->sample_size) {
 case 16: {
 for (ch = 0; ch < channels; ch++) {
- int16_t *outbuffer = (int16_t *)alac->frame.extended_data[ch_index + ch];
+ int16_t *outbuffer = (int16_t *)frame->extended_data[ch_index + ch];
 for (i = 0; i < alac->nb_samples; i++)
 *outbuffer++ = alac->output_samples_buffer[ch][i];
 }}
@@ -397,6 +399,7 @@
 int *got_frame_ptr, AVPacket *avpkt)
 {
 ALACContext *alac = avctx->priv_data;
+ AVFrame *frame = data;
 enum AlacRawDataBlockType element;
 int channels;
 int ch, ret, got_end;
@@ -418,12 +421,13 @@
 }
 
 channels = (element == TYPE_CPE) ? 2 : 1;
- if (ch + channels > alac->channels) {
+ if (ch + channels > alac->channels ||
+ ff_alac_channel_layout_offsets[alac->channels - 1][ch] + channels > alac->channels) {
 av_log(avctx, AV_LOG_ERROR, "invalid element channel count\n");
 return AVERROR_INVALIDDATA;
 }
 
- ret = decode_element(avctx, data,
+ ret = decode_element(avctx, frame,
 ff_alac_channel_layout_offsets[alac->channels - 1][ch],
 channels);
 if (ret < 0 && get_bits_left(&alac->gb))
@@ -441,8 +445,7 @@
 avpkt->size * 8 - get_bits_count(&alac->gb));
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = alac->frame;
+ *got_frame_ptr = 1;
 
 return avpkt->size;
 }
@@ -495,7 +498,8 @@
 bytestream2_skipu(&gb, 12); // size:4, alac:4, version:4
 
 alac->max_samples_per_frame = bytestream2_get_be32u(&gb);
- if (!alac->max_samples_per_frame || alac->max_samples_per_frame > INT_MAX) {
+ if (!alac->max_samples_per_frame ||
+ alac->max_samples_per_frame > INT_MAX / sizeof(int32_t)) {
 av_log(alac->avctx, AV_LOG_ERROR, "max samples per frame invalid: %u\n",
 alac->max_samples_per_frame);
 return AVERROR_INVALIDDATA;
@@ -536,8 +540,7 @@
 case 24:
 case 32: avctx->sample_fmt = AV_SAMPLE_FMT_S32P;
 break;
- default: av_log_ask_for_sample(avctx, "Sample depth %d is not supported.\n",
- alac->sample_size);
+ default: avpriv_request_sample(avctx, "Sample depth %d", alac->sample_size);
 return AVERROR_PATCHWELCOME;
 }
 avctx->bits_per_raw_sample = alac->sample_size;
@@ -563,14 +566,12 @@
 return ret;
 }
 
- avcodec_get_frame_defaults(&alac->frame);
- avctx->coded_frame = &alac->frame;
-
 return 0;
 }
 
 AVCodec ff_alac_decoder = {
 .name = "alac",
+ .long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_ALAC,
 .priv_data_size = sizeof(ALACContext),
@@ -578,5 +579,4 @@
 .close = alac_decode_close,
 .decode = alac_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"),
 };

libav-v9.6.tar.bz2/libavcodec/alacenc.c -> libav-v10.1.tar.bz2/libavcodec/alacenc.c Changed

@@ -21,7 +21,6 @@
 
 #include "avcodec.h"
 #include "put_bits.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "lpc.h"
 #include "mathops.h"
@@ -580,7 +579,7 @@
         goto error;
     }
 
-    avctx->coded_frame = avcodec_alloc_frame();
+    avctx->coded_frame = av_frame_alloc();
     if (!avctx->coded_frame) {
         ret = AVERROR(ENOMEM);
         goto error;
@@ -644,6 +643,7 @@
 
 AVCodec ff_alac_encoder = {
     .name           = "alac",
+    .long_name      = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"),
     .type           = AVMEDIA_TYPE_AUDIO,
     .id             = AV_CODEC_ID_ALAC,
     .priv_data_size = sizeof(AlacEncodeContext),
@@ -655,5 +655,4 @@
     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S32P,
                                                      AV_SAMPLE_FMT_S16P,
                                                      AV_SAMPLE_FMT_NONE },
-    .long_name      = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"),
 };

libav-v9.6.tar.bz2/libavcodec/allcodecs.c -> libav-v10.1.tar.bz2/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)                                          \
     {                                                                   \
@@ -74,21 +75,29 @@
 
     /* hardware accelerators */
     REGISTER_HWACCEL(H263_VAAPI,        h263_vaapi);
+    REGISTER_HWACCEL(H263_VDPAU,        h263_vdpau);
     REGISTER_HWACCEL(H264_DXVA2,        h264_dxva2);
     REGISTER_HWACCEL(H264_VAAPI,        h264_vaapi);
     REGISTER_HWACCEL(H264_VDA,          h264_vda);
+    REGISTER_HWACCEL(H264_VDPAU,        h264_vdpau);
+    REGISTER_HWACCEL(MPEG1_VDPAU,       mpeg1_vdpau);
     REGISTER_HWACCEL(MPEG2_DXVA2,       mpeg2_dxva2);
     REGISTER_HWACCEL(MPEG2_VAAPI,       mpeg2_vaapi);
+    REGISTER_HWACCEL(MPEG2_VDPAU,       mpeg2_vdpau);
     REGISTER_HWACCEL(MPEG4_VAAPI,       mpeg4_vaapi);
+    REGISTER_HWACCEL(MPEG4_VDPAU,       mpeg4_vdpau);
     REGISTER_HWACCEL(VC1_DXVA2,         vc1_dxva2);
     REGISTER_HWACCEL(VC1_VAAPI,         vc1_vaapi);
+    REGISTER_HWACCEL(VC1_VDPAU,         vc1_vdpau);
     REGISTER_HWACCEL(WMV3_DXVA2,        wmv3_dxva2);
     REGISTER_HWACCEL(WMV3_VAAPI,        wmv3_vaapi);
+    REGISTER_HWACCEL(WMV3_VDPAU,        wmv3_vdpau);
 
     /* video codecs */
     REGISTER_ENCODER(A64MULTI,          a64multi);
     REGISTER_ENCODER(A64MULTI5,         a64multi5);
     REGISTER_DECODER(AASC,              aasc);
+    REGISTER_DECODER(AIC,               aic);
     REGISTER_DECODER(AMV,               amv);
     REGISTER_DECODER(ANM,               anm);
     REGISTER_DECODER(ANSI,              ansi);
@@ -128,8 +137,10 @@
     REGISTER_DECODER(EIGHTSVX_EXP,      eightsvx_exp);
     REGISTER_DECODER(EIGHTSVX_FIB,      eightsvx_fib);
     REGISTER_DECODER(ESCAPE124,         escape124);
+    REGISTER_DECODER(ESCAPE130,         escape130);
     REGISTER_ENCDEC (FFV1,              ffv1);
     REGISTER_ENCDEC (FFVHUFF,           ffvhuff);
+    REGISTER_DECODER(FIC,               fic);
     REGISTER_ENCDEC (FLASHSV,           flashsv);
     REGISTER_DECODER(FLASHSV2,          flashsv2);
     REGISTER_DECODER(FLIC,              flic);
@@ -137,13 +148,15 @@
     REGISTER_DECODER(FOURXM,            fourxm);
     REGISTER_DECODER(FRAPS,             fraps);
     REGISTER_DECODER(FRWU,              frwu);
+    REGISTER_DECODER(G2M,               g2m);
     REGISTER_ENCDEC (GIF,               gif);
     REGISTER_ENCDEC (H261,              h261);
     REGISTER_ENCDEC (H263,              h263);
     REGISTER_DECODER(H263I,             h263i);
     REGISTER_ENCODER(H263P,             h263p);
     REGISTER_DECODER(H264,              h264);
-    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);
@@ -153,6 +166,7 @@
     REGISTER_DECODER(INDEO4,            indeo4);
     REGISTER_DECODER(INDEO5,            indeo5);
     REGISTER_DECODER(INTERPLAY_VIDEO,   interplay_video);
+    REGISTER_DECODER(JPEG2000,          jpeg2000);
     REGISTER_ENCDEC (JPEGLS,            jpegls);
     REGISTER_DECODER(JV,                jv);
     REGISTER_DECODER(KGV1,              kgv1);
@@ -166,13 +180,12 @@
     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);
-    REGISTER_DECODER(MPEG4_VDPAU,       mpeg4_vdpau);
-    REGISTER_DECODER(MPEG_VDPAU,        mpeg_vdpau);
-    REGISTER_DECODER(MPEG1_VDPAU,       mpeg1_vdpau);
     REGISTER_DECODER(MSA1,              msa1);
     REGISTER_DECODER(MSMPEG4V1,         msmpeg4v1);
     REGISTER_ENCDEC (MSMPEG4V2,         msmpeg4v2);
@@ -212,7 +225,6 @@
     REGISTER_ENCDEC (SGI,               sgi);
     REGISTER_DECODER(SMACKER,           smacker);
     REGISTER_DECODER(SMC,               smc);
-    REGISTER_ENCDEC (SNOW,              snow);
     REGISTER_DECODER(SP5X,              sp5x);
     REGISTER_ENCDEC (SUNRAST,           sunrast);
     REGISTER_ENCDEC (SVQ1,              svq1);
@@ -236,7 +248,6 @@
     REGISTER_DECODER(VB,                vb);
     REGISTER_DECODER(VBLE,              vble);
     REGISTER_DECODER(VC1,               vc1);
-    REGISTER_DECODER(VC1_VDPAU,         vc1_vdpau);
     REGISTER_DECODER(VC1IMAGE,          vc1image);
     REGISTER_DECODER(VCR1,              vcr1);
     REGISTER_DECODER(VMDVIDEO,          vmdvideo);
@@ -247,11 +258,12 @@
     REGISTER_DECODER(VP6A,              vp6a);
     REGISTER_DECODER(VP6F,              vp6f);
     REGISTER_DECODER(VP8,               vp8);
+    REGISTER_DECODER(VP9,               vp9);
     REGISTER_DECODER(VQA,               vqa);
+    REGISTER_DECODER(WEBP,              webp);
     REGISTER_ENCDEC (WMV1,              wmv1);
     REGISTER_ENCDEC (WMV2,              wmv2);
     REGISTER_DECODER(WMV3,              wmv3);
-    REGISTER_DECODER(WMV3_VDPAU,        wmv3_vdpau);
     REGISTER_DECODER(WMV3IMAGE,         wmv3image);
     REGISTER_DECODER(WNV1,              wnv1);
     REGISTER_DECODER(XAN_WC3,           xan_wc3);
@@ -276,6 +288,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);
@@ -291,6 +304,7 @@
     REGISTER_DECODER(IMC,               imc);
     REGISTER_DECODER(MACE3,             mace3);
     REGISTER_DECODER(MACE6,             mace6);
+    REGISTER_DECODER(METASOUND,         metasound);
     REGISTER_DECODER(MLP,               mlp);
     REGISTER_DECODER(MP1,               mp1);
     REGISTER_DECODER(MP1FLOAT,          mp1float);
@@ -346,8 +360,10 @@
     REGISTER_ENCDEC (PCM_S24BE,         pcm_s24be);
     REGISTER_ENCDEC (PCM_S24DAUD,       pcm_s24daud);
     REGISTER_ENCDEC (PCM_S24LE,         pcm_s24le);
+    REGISTER_DECODER(PCM_S24LE_PLANAR,  pcm_s24le_planar);
     REGISTER_ENCDEC (PCM_S32BE,         pcm_s32be);
     REGISTER_ENCDEC (PCM_S32LE,         pcm_s32le);
+    REGISTER_DECODER(PCM_S32LE_PLANAR,  pcm_s32le_planar);
     REGISTER_ENCDEC (PCM_U8,            pcm_u8);
     REGISTER_ENCDEC (PCM_U16BE,         pcm_u16be);
     REGISTER_ENCDEC (PCM_U16LE,         pcm_u16le);
@@ -405,7 +421,7 @@
 
     /* external libraries */
     REGISTER_ENCODER(LIBFAAC,           libfaac);
-    REGISTER_ENCODER(LIBFDK_AAC,        libfdk_aac);
+    REGISTER_ENCDEC (LIBFDK_AAC,        libfdk_aac);
     REGISTER_ENCDEC (LIBGSM,            libgsm);
     REGISTER_ENCDEC (LIBGSM_MS,         libgsm_ms);
     REGISTER_ENCDEC (LIBILBC,           libilbc);
@@ -420,7 +436,10 @@
     REGISTER_ENCODER(LIBVO_AACENC,      libvo_aacenc);
     REGISTER_ENCODER(LIBVO_AMRWBENC,    libvo_amrwbenc);
     REGISTER_ENCODER(LIBVORBIS,         libvorbis);
-    REGISTER_ENCDEC (LIBVPX,            libvpx);
+    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(LIBXAVS,           libxavs);
     REGISTER_ENCODER(LIBXVID,           libxvid);
@@ -442,11 +461,13 @@
     REGISTER_PARSER(H261,               h261);
     REGISTER_PARSER(H263,               h263);
     REGISTER_PARSER(H264,               h264);
+    REGISTER_PARSER(HEVC,               hevc);
     REGISTER_PARSER(MJPEG,              mjpeg);
     REGISTER_PARSER(MLP,                mlp);
     REGISTER_PARSER(MPEG4VIDEO,         mpeg4video);
     REGISTER_PARSER(MPEGAUDIO,          mpegaudio);
     REGISTER_PARSER(MPEGVIDEO,          mpegvideo);
+    REGISTER_PARSER(PNG,                png);
     REGISTER_PARSER(PNM,                pnm);
     REGISTER_PARSER(RV30,               rv30);
     REGISTER_PARSER(RV40,               rv40);
@@ -464,8 +485,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);
     REGISTER_BSF(REMOVE_EXTRADATA,      remove_extradata);

libav-v9.6.tar.bz2/libavcodec/alsdec.c -> libav-v10.1.tar.bz2/libavcodec/alsdec.c Changed

@@ -25,10 +25,6 @@
 * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
 */
 
-
-//#define DEBUG
-
-
 #include "avcodec.h"
 #include "get_bits.h"
 #include "unary.h"
@@ -192,7 +188,6 @@
 
 typedef struct {
 AVCodecContext *avctx;
- AVFrame frame;
 ALSSpecificConfig sconf;
 GetBitContext gb;
 DSPContext dsp;
@@ -295,12 +290,12 @@
 avctx->extradata_size * 8, 1);
 
 if (config_offset < 0)
- return -1;
+ return AVERROR_INVALIDDATA;
 
 skip_bits_long(&gb, config_offset);
 
 if (get_bits_left(&gb) < (30 << 3))
- return -1;
+ return AVERROR_INVALIDDATA;
 
 // read the fixed items
 als_id = get_bits_long(&gb, 32);
@@ -335,7 +330,7 @@
 
 // check for ALSSpecificConfig struct
 if (als_id != MKBETAG('A','L','S','\0'))
- return -1;
+ return AVERROR_INVALIDDATA;
 
 ctx->cur_frame_length = sconf->frame_length;
 
@@ -350,7 +345,7 @@
 int chan_pos_bits = av_ceil_log2(avctx->channels);
 int bits_needed = avctx->channels * chan_pos_bits + 7;
 if (get_bits_left(&gb) < bits_needed)
- return -1;
+ return AVERROR_INVALIDDATA;
 
 if (!(sconf->chan_pos = av_malloc(avctx->channels * sizeof(*sconf->chan_pos))))
 return AVERROR(ENOMEM);
@@ -368,7 +363,7 @@
 // read fixed header and trailer sizes,
 // if size = 0xFFFFFFFF then there is no data field!
 if (get_bits_left(&gb) < 64)
- return -1;
+ return AVERROR_INVALIDDATA;
 
 header_size = get_bits_long(&gb, 32);
 trailer_size = get_bits_long(&gb, 32);
@@ -382,10 +377,10 @@
 
 // skip the header and trailer data
 if (get_bits_left(&gb) < ht_size)
- return -1;
+ return AVERROR_INVALIDDATA;
 
 if (ht_size > INT32_MAX)
- return -1;
+ return AVERROR_PATCHWELCOME;
 
 skip_bits_long(&gb, ht_size);
 
@@ -393,7 +388,7 @@
 // initialize CRC calculation
 if (sconf->crc_enabled) {
 if (get_bits_left(&gb) < 32)
- return -1;
+ return AVERROR_INVALIDDATA;
 
 if (avctx->err_recognition & AV_EF_CRCCHECK) {
 ctx->crc_table = av_crc_get_table(AV_CRC_32_IEEE_LE);
@@ -423,7 +418,8 @@
 #define MISSING_ERR(cond, str, errval) \
 { \
 if (cond) { \
- av_log_missing_feature(ctx->avctx, str, 0); \
+ avpriv_report_missing_feature(ctx->avctx, \
+ str); \
 error = errval; \
 } \
 }
@@ -633,7 +629,7 @@
 if (bd->block_length & (sub_blocks - 1)) {
 av_log(avctx, AV_LOG_WARNING,
 "Block length is not evenly divisible by the number of subblocks.\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 sb_length = bd->block_length >> log2_sub_blocks;
@@ -964,18 +960,18 @@
 */
 static int read_block(ALSDecContext *ctx, ALSBlockData *bd)
 {
+ int ret = 0;
 GetBitContext *gb = &ctx->gb;
 
 *bd->shift_lsbs = 0;
 // read block type flag and read the samples accordingly
 if (get_bits1(gb)) {
- if (read_var_block_data(ctx, bd))
- return -1;
+ ret = read_var_block_data(ctx, bd);
 } else {
 read_const_block_data(ctx, bd);
 }
 
- return 0;
+ return ret;
 }
 
 
@@ -984,12 +980,16 @@
 static int decode_block(ALSDecContext *ctx, ALSBlockData *bd)
 {
 unsigned int smp;
+ int ret = 0;
 
 // read block type flag and read the samples accordingly
 if (*bd->const_block)
 decode_const_block_data(ctx, bd);
- else if (decode_var_block_data(ctx, bd))
- return -1;
+ else
+ ret = decode_var_block_data(ctx, bd); // always return 0
+
+ if (ret < 0)
+ return ret;
 
 // TODO: read RLSLMS extension data
 
@@ -1007,14 +1007,10 @@
 {
 int ret;
 
- ret = read_block(ctx, bd);
-
- if (ret)
+ if ((ret = read_block(ctx, bd)) < 0)
 return ret;
 
- ret = decode_block(ctx, bd);
-
- return ret;
+ return decode_block(ctx, bd);
 }
 
 
@@ -1040,6 +1036,7 @@
 unsigned int c, const unsigned int *div_blocks,
 unsigned int *js_blocks)
 {
+ int ret;
 unsigned int b;
 ALSBlockData bd = { 0 };
 
@@ -1060,10 +1057,10 @@
 for (b = 0; b < ctx->num_blocks; b++) {
 bd.block_length = div_blocks[b];
 
- if (read_decode_block(ctx, &bd)) {
+ if ((ret = read_decode_block(ctx, &bd)) < 0) {
 // damaged block, write zero for the rest of the frame
 zero_remaining(b, ctx->num_blocks, div_blocks, bd.raw_samples);
- return -1;
+ return ret;
 }
 bd.raw_samples += div_blocks[b];
 bd.ra_block = 0;
@@ -1082,6 +1079,7 @@
 ALSSpecificConfig *sconf = &ctx->sconf;
 unsigned int offset = 0;
 unsigned int b;
+ int ret;
 ALSBlockData bd[2] = { { 0 } };
 
 bd[0].ra_block = ra_frame;
@@ -1123,12 +1121,9 @@
 bd[0].raw_other = bd[1].raw_samples;
 bd[1].raw_other = bd[0].raw_samples;
 
- if(read_decode_block(ctx, &bd[0]) || read_decode_block(ctx, &bd[1])) {
- // damaged block, write zero for the rest of the frame
- zero_remaining(b, ctx->num_blocks, div_blocks, bd[0].raw_samples);
- zero_remaining(b, ctx->num_blocks, div_blocks, bd[1].raw_samples);
- return -1;
- }
+ if ((ret = read_decode_block(ctx, &bd[0])) < 0 ||
+ (ret = read_decode_block(ctx, &bd[1])) < 0)
+ goto fail;
 
 // reconstruct joint-stereo blocks
 if (bd[0].js_blocks) {
@@ -1154,8 +1149,19 @@
 sizeof(*ctx->raw_samples[c]) * sconf->max_order);
 
 return 0;
+fail:
+ // damaged block, write zero for the rest of the frame
+ zero_remaining(b, ctx->num_blocks, div_blocks, bd[0].raw_samples);
+ zero_remaining(b, ctx->num_blocks, div_blocks, bd[1].raw_samples);
+ return ret;
 }
 
+static inline int als_weighting(GetBitContext *gb, int k, int off)
+{
+ int idx = av_clip(decode_rice(gb, k) + off,
+ 0, FF_ARRAY_ELEMS(mcc_weightings) - 1);
+ return mcc_weightings[idx];
+}
 
 /** Read the channel data.
 */
@@ -1171,19 +1177,19 @@
 
 if (current->master_channel >= channels) {
 av_log(ctx->avctx, AV_LOG_ERROR, "Invalid master channel!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 if (current->master_channel != c) {
 current->time_diff_flag = get_bits1(gb);
- current->weighting[0] = mcc_weightings[av_clip(decode_rice(gb, 1) + 16, 0, 32)];
- current->weighting[1] = mcc_weightings[av_clip(decode_rice(gb, 2) + 14, 0, 32)];
- current->weighting[2] = mcc_weightings[av_clip(decode_rice(gb, 1) + 16, 0, 32)];
+ current->weighting[0] = als_weighting(gb, 1, 16);
+ current->weighting[1] = als_weighting(gb, 2, 14);
+ current->weighting[2] = als_weighting(gb, 1, 16);
 
 if (current->time_diff_flag) {
- current->weighting[3] = mcc_weightings[av_clip(decode_rice(gb, 1) + 16, 0, 32)];
- current->weighting[4] = mcc_weightings[av_clip(decode_rice(gb, 1) + 16, 0, 32)];
- current->weighting[5] = mcc_weightings[av_clip(decode_rice(gb, 1) + 16, 0, 32)];
+ current->weighting[3] = als_weighting(gb, 1, 16);
+ current->weighting[4] = als_weighting(gb, 1, 16);
+ current->weighting[5] = als_weighting(gb, 1, 16);
 
 current->time_diff_sign = get_bits1(gb);
 current->time_diff_index = get_bits(gb, ctx->ltp_lag_length - 3) + 3;
@@ -1196,7 +1202,7 @@
 
 if (entries == channels) {
 av_log(ctx->avctx, AV_LOG_ERROR, "Damaged channel data!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 align_get_bits(gb);
@@ -1228,7 +1234,7 @@
 
 if (dep == channels) {
 av_log(ctx->avctx, AV_LOG_WARNING, "Invalid channel correlation!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 bd->const_block = ctx->const_block + c;
@@ -1299,8 +1305,8 @@
 unsigned int div_blocks[32]; ///< block sizes.
 unsigned int c;
 unsigned int js_blocks[2];
-
 uint32_t bs_info = 0;
+ int ret;
 
 // skip the size of the ra unit if present in the frame
 if (sconf->ra_flag == RA_FLAG_FRAMES && ra_frame)
@@ -1331,13 +1337,15 @@
 independent_bs = 1;
 
 if (independent_bs) {
- if (decode_blocks_ind(ctx, ra_frame, c, div_blocks, js_blocks))
- return -1;
-
+ ret = decode_blocks_ind(ctx, ra_frame, c,
+ div_blocks, js_blocks);
+ if (ret < 0)
+ return ret;
 independent_bs--;
 } else {
- if (decode_blocks(ctx, ra_frame, c, div_blocks, js_blocks))
- return -1;
+ ret = decode_blocks(ctx, ra_frame, c, div_blocks, js_blocks);
+ if (ret < 0)
+ return ret;
 
 c++;
 }
@@ -1356,7 +1364,7 @@
 for (c = 0; c < avctx->channels; c++)
 if (ctx->chan_data[c] < ctx->chan_data_buffer) {
 av_log(ctx->avctx, AV_LOG_ERROR, "Invalid channel data!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 memset(reverted_channels, 0, sizeof(*reverted_channels) * avctx->channels);
@@ -1368,6 +1376,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;
@@ -1388,11 +1401,12 @@
 return ret;
 }
 
- for (c = 0; c < avctx->channels; c++)
- if (revert_channel_correlation(ctx, &bd, ctx->chan_data,
- reverted_channels, offset, c))
- return -1;
-
+ for (c = 0; c < avctx->channels; c++) {
+ ret = revert_channel_correlation(ctx, &bd, ctx->chan_data,
+ reverted_channels, offset, c);
+ if (ret < 0)
+ return ret;
+ }
 for (c = 0; c < avctx->channels; c++) {
 bd.const_block = ctx->const_block + c;
 bd.shift_lsbs = ctx->shift_lsbs + c;
@@ -1432,6 +1446,7 @@
 AVPacket *avpkt)
 {
 ALSDecContext *ctx = avctx->priv_data;
+ AVFrame *frame = data;
 ALSSpecificConfig *sconf = &ctx->sconf;
 const uint8_t *buffer = avpkt->data;
 int buffer_size = avpkt->size;
@@ -1461,8 +1476,8 @@
 ctx->frame_id++;
 
 /* get output buffer */
- ctx->frame.nb_samples = ctx->cur_frame_length;
- if ((ret = ff_get_buffer(avctx, &ctx->frame)) < 0) {
+ frame->nb_samples = ctx->cur_frame_length;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -1470,7 +1485,7 @@
 // transform decoded frame into output format
 #define INTERLEAVE_OUTPUT(bps) \
 { \
- int##bps##_t *dest = (int##bps##_t*)ctx->frame.data[0]; \
+ int##bps##_t *dest = (int##bps##_t*)frame->data[0]; \
 shift = bps - ctx->avctx->bits_per_raw_sample; \
 for (sample = 0; sample < ctx->cur_frame_length; sample++) \
 for (c = 0; c < avctx->channels; c++) \
@@ -1488,7 +1503,7 @@
 int swap = HAVE_BIGENDIAN != sconf->msb_first;
 
 if (ctx->avctx->bits_per_raw_sample == 24) {
- int32_t *src = (int32_t *)ctx->frame.data[0];
+ int32_t *src = (int32_t *)frame->data[0];
 
 for (sample = 0;
 sample < ctx->cur_frame_length * avctx->channels;
@@ -1509,7 +1524,7 @@
 
 if (swap) {
 if (ctx->avctx->bits_per_raw_sample <= 16) {
- int16_t *src = (int16_t*) ctx->frame.data[0];
+ int16_t *src = (int16_t*) frame->data[0];
 int16_t *dest = (int16_t*) ctx->crc_buffer;
 for (sample = 0;
 sample < ctx->cur_frame_length * avctx->channels;
@@ -1517,12 +1532,12 @@
 *dest++ = av_bswap16(src[sample]);
 } else {
 ctx->dsp.bswap_buf((uint32_t*)ctx->crc_buffer,
- (uint32_t *)ctx->frame.data[0],
+ (uint32_t *)frame->data[0],
 ctx->cur_frame_length * avctx->channels);
 }
 crc_source = ctx->crc_buffer;
 } else {
- crc_source = ctx->frame.data[0];
+ crc_source = frame->data[0];
 }
 
 ctx->crc = av_crc(ctx->crc_table, ctx->crc, crc_source,
@@ -1535,12 +1550,12 @@
 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;
 }
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = ctx->frame;
-
+ *got_frame_ptr = 1;
 
 bytes_read = invalid_frame ? buffer_size :
 (get_bits_count(&ctx->gb) + 7) >> 3;
@@ -1590,30 +1605,30 @@
 {
 unsigned int c;
 unsigned int channel_size;
- int num_buffers;
+ int num_buffers, ret;
 ALSDecContext *ctx = avctx->priv_data;
 ALSSpecificConfig *sconf = &ctx->sconf;
 ctx->avctx = avctx;
 
 if (!avctx->extradata) {
 av_log(avctx, AV_LOG_ERROR, "Missing required ALS extradata.\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- if (read_specific_config(ctx)) {
+ if ((ret = read_specific_config(ctx)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "Reading ALSSpecificConfig failed.\n");
- decode_end(avctx);
- return -1;
+ goto fail;
 }
 
- if (check_specific_config(ctx)) {
- decode_end(avctx);
- return -1;
+ if ((ret = check_specific_config(ctx)) < 0) {
+ goto fail;
 }
 
- if (sconf->bgmc)
- ff_bgmc_init(avctx, &ctx->bgmc_lut, &ctx->bgmc_lut_status);
-
+ if (sconf->bgmc) {
+ ret = ff_bgmc_init(avctx, &ctx->bgmc_lut, &ctx->bgmc_lut_status);
+ if (ret < 0)
+ goto fail;
+ }
 if (sconf->floating) {
 avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
 avctx->bits_per_raw_sample = 32;
@@ -1648,7 +1663,8 @@
 !ctx->quant_cof_buffer || !ctx->lpc_cof_buffer ||
 !ctx->lpc_cof_reversed_buffer) {
 av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
- return AVERROR(ENOMEM);
+ ret = AVERROR(ENOMEM);
+ goto fail;
 }
 
 // assign quantized parcor coefficient buffers
@@ -1673,8 +1689,8 @@
 !ctx->use_ltp || !ctx->ltp_lag ||
 !ctx->ltp_gain || !ctx->ltp_gain_buffer) {
 av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
- decode_end(avctx);
- return AVERROR(ENOMEM);
+ ret = AVERROR(ENOMEM);
+ goto fail;
 }
 
 for (c = 0; c < num_buffers; c++)
@@ -1691,8 +1707,8 @@
 
 if (!ctx->chan_data_buffer || !ctx->chan_data || !ctx->reverted_channels) {
 av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
- decode_end(avctx);
- return AVERROR(ENOMEM);
+ ret = AVERROR(ENOMEM);
+ goto fail;
 }
 
 for (c = 0; c < num_buffers; c++)
@@ -1712,8 +1728,8 @@
 // allocate previous raw sample buffer
 if (!ctx->prev_raw_samples || !ctx->raw_buffer|| !ctx->raw_samples) {
 av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
- decode_end(avctx);
- return AVERROR(ENOMEM);
+ ret = AVERROR(ENOMEM);
+ goto fail;
 }
 
 // assign raw samples buffers
@@ -1730,17 +1746,18 @@
 av_get_bytes_per_sample(avctx->sample_fmt));
 if (!ctx->crc_buffer) {
 av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
- decode_end(avctx);
- return AVERROR(ENOMEM);
+ ret = AVERROR(ENOMEM);
+ goto fail;
 }
 }
 
 ff_dsputil_init(&ctx->dsp, avctx);
 
- avcodec_get_frame_defaults(&ctx->frame);
- avctx->coded_frame = &ctx->frame;
-
 return 0;
+
+fail:
+ decode_end(avctx);
+ return ret;
 }
 
 
@@ -1756,6 +1773,7 @@
 
 AVCodec ff_als_decoder = {
 .name = "als",
+ .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Audio Lossless Coding (ALS)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_MP4ALS,
 .priv_data_size = sizeof(ALSDecContext),
@@ -1764,5 +1782,4 @@
 .decode = decode_frame,
 .flush = flush,
 .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Audio Lossless Coding (ALS)"),
 };

libav-v9.6.tar.bz2/libavcodec/amrnbdec.c -> libav-v10.1.tar.bz2/libavcodec/amrnbdec.c Changed

@@ -44,8 +44,8 @@
 #include <math.h>
 
 #include "libavutil/channel_layout.h"
+#include "libavutil/float_dsp.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "libavutil/common.h"
 #include "celp_filters.h"
 #include "acelp_filters.h"
@@ -96,7 +96,6 @@
 #define AMR_AGC_ALPHA 0.9
 
 typedef struct AMRContext {
- AVFrame avframe; ///< AVFrame for decoded samples
 AMRNBFrame frame; ///< decoded AMR parameters (lsf coefficients, codebook indexes, etc)
 uint8_t bad_frame_indicator; ///< bad frame ? 1 : 0
 enum Mode cur_frame_mode;
@@ -157,7 +156,7 @@
 int i;
 
 if (avctx->channels > 1) {
- av_log_missing_feature(avctx, "multi-channel AMR", 0);
+ avpriv_report_missing_feature(avctx, "multi-channel AMR");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -177,9 +176,6 @@
 for (i = 0; i < 4; i++)
 p->prediction_error[i] = MIN_ENERGY;
 
- avcodec_get_frame_defaults(&p->avframe);
- avctx->coded_frame = &p->avframe;
-
 return 0;
 }
 
@@ -794,8 +790,8 @@
 
 // emphasize pitch vector contribution
 if (p->pitch_gain[4] > 0.5 && !overflow) {
- float energy = ff_scalarproduct_float_c(excitation, excitation,
- AMR_SUBFRAME_SIZE);
+ float energy = avpriv_scalarproduct_float_c(excitation, excitation,
+ AMR_SUBFRAME_SIZE);
 float pitch_factor =
 p->pitch_gain[4] *
 (p->cur_frame_mode == MODE_12k2 ?
@@ -871,8 +867,8 @@
 ff_celp_lp_synthesis_filterf(hf, lpc_d, hf, AMR_TILT_RESPONSE,
 LP_FILTER_ORDER);
 
- rh0 = ff_scalarproduct_float_c(hf, hf, AMR_TILT_RESPONSE);
- rh1 = ff_scalarproduct_float_c(hf, hf + 1, AMR_TILT_RESPONSE - 1);
+ rh0 = avpriv_scalarproduct_float_c(hf, hf, AMR_TILT_RESPONSE);
+ rh1 = avpriv_scalarproduct_float_c(hf, hf + 1, AMR_TILT_RESPONSE - 1);
 
 // The spec only specifies this check for 12.2 and 10.2 kbit/s
 // modes. But in the ref source the tilt is always non-negative.
@@ -892,8 +888,8 @@
 int i;
 float *samples = p->samples_in + LP_FILTER_ORDER; // Start of input
 
- float speech_gain = ff_scalarproduct_float_c(samples, samples,
- AMR_SUBFRAME_SIZE);
+ float speech_gain = avpriv_scalarproduct_float_c(samples, samples,
+ AMR_SUBFRAME_SIZE);
 
 float pole_out[AMR_SUBFRAME_SIZE + LP_FILTER_ORDER]; // Output of pole filter
 const float *gamma_n, *gamma_d; // Formant filter factor table
@@ -936,6 +932,7 @@
 {
 
 AMRContext *p = avctx->priv_data; // pointer to private data
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 float *buf_out; // pointer to the output data buffer
@@ -947,12 +944,12 @@
 const float *synth_fixed_vector; // pointer to the fixed vector that synthesis should use
 
 /* get output buffer */
- p->avframe.nb_samples = AMR_BLOCK_SIZE;
- if ((ret = ff_get_buffer(avctx, &p->avframe)) < 0) {
+ frame->nb_samples = AMR_BLOCK_SIZE;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- buf_out = (float *)p->avframe.data[0];
+ buf_out = (float *)frame->data[0];
 
 p->cur_frame_mode = unpack_bitstream(p, buf, buf_size);
 if (p->cur_frame_mode == NO_DATA) {
@@ -960,7 +957,7 @@
 return AVERROR_INVALIDDATA;
 }
 if (p->cur_frame_mode == MODE_DTX) {
- av_log_missing_feature(avctx, "dtx mode", 1);
+ avpriv_request_sample(avctx, "dtx mode");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -998,9 +995,9 @@
 
 p->fixed_gain[4] =
 ff_amr_set_fixed_gain(fixed_gain_factor,
- ff_scalarproduct_float_c(p->fixed_vector,
- p->fixed_vector,
- AMR_SUBFRAME_SIZE) /
+ avpriv_scalarproduct_float_c(p->fixed_vector,
+ p->fixed_vector,
+ AMR_SUBFRAME_SIZE) /
 AMR_SUBFRAME_SIZE,
 p->prediction_error,
 energy_mean[p->cur_frame_mode], energy_pred_fac);
@@ -1058,8 +1055,7 @@
 ff_weighted_vector_sumf(p->lsf_avg, p->lsf_avg, p->lsf_q[3],
 0.84, 0.16, LP_FILTER_ORDER);
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = p->avframe;
+ *got_frame_ptr = 1;
 
 /* return the amount of bytes consumed if everything was OK */
 return frame_sizes_nb[p->cur_frame_mode] + 1; // +7 for rounding and +8 for TOC
@@ -1068,13 +1064,13 @@
 
 AVCodec ff_amrnb_decoder = {
 .name = "amrnb",
+ .long_name = NULL_IF_CONFIG_SMALL("AMR-NB (Adaptive Multi-Rate NarrowBand)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_AMR_NB,
 .priv_data_size = sizeof(AMRContext),
 .init = amrnb_decode_init,
 .decode = amrnb_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("AMR-NB (Adaptive Multi-Rate NarrowBand)"),
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,
 AV_SAMPLE_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/amrwbdec.c -> libav-v10.1.tar.bz2/libavcodec/amrwbdec.c Changed

@@ -26,10 +26,10 @@
 
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
+#include "libavutil/float_dsp.h"
 #include "libavutil/lfg.h"
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "lsp.h"
 #include "celp_filters.h"
 #include "acelp_filters.h"
@@ -43,7 +43,6 @@
 #include "amrwbdata.h"
 
 typedef struct {
- AVFrame avframe; ///< AVFrame for decoded samples
 AMRWBFrame frame; ///< AMRWB parameters decoded from bitstream
 enum Mode fr_cur_mode; ///< mode index of current frame
 uint8_t fr_quality; ///< frame quality index (FQI)
@@ -93,7 +92,7 @@
 int i;
 
 if (avctx->channels > 1) {
- av_log_missing_feature(avctx, "multi-channel AMR", 0);
+ avpriv_report_missing_feature(avctx, "multi-channel AMR");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -113,9 +112,6 @@
 for (i = 0; i < 4; i++)
 ctx->prediction_error[i] = MIN_ENERGY;
 
- avcodec_get_frame_defaults(&ctx->avframe);
- avctx->coded_frame = &ctx->avframe;
-
 return 0;
 }
 
@@ -595,11 +591,11 @@
 static float voice_factor(float *p_vector, float p_gain,
 float *f_vector, float f_gain)
 {
- double p_ener = (double) ff_scalarproduct_float_c(p_vector, p_vector,
- AMRWB_SFR_SIZE) *
+ double p_ener = (double) avpriv_scalarproduct_float_c(p_vector, p_vector,
+ AMRWB_SFR_SIZE) *
 p_gain * p_gain;
- double f_ener = (double) ff_scalarproduct_float_c(f_vector, f_vector,
- AMRWB_SFR_SIZE) *
+ double f_ener = (double) avpriv_scalarproduct_float_c(f_vector, f_vector,
+ AMRWB_SFR_SIZE) *
 f_gain * f_gain;
 
 return (p_ener - f_ener) / (p_ener + f_ener);
@@ -768,8 +764,8 @@
 /* emphasize pitch vector contribution in low bitrate modes */
 if (ctx->pitch_gain[0] > 0.5 && ctx->fr_cur_mode <= MODE_8k85) {
 int i;
- float energy = ff_scalarproduct_float_c(excitation, excitation,
- AMRWB_SFR_SIZE);
+ float energy = avpriv_scalarproduct_float_c(excitation, excitation,
+ AMRWB_SFR_SIZE);
 
 // XXX: Weird part in both ref code and spec. A unknown parameter
 // {beta} seems to be identical to the current pitch gain
@@ -828,9 +824,9 @@
 i++;
 
 for (k = 1; k < 5; k++) {
- out[i] = ff_scalarproduct_float_c(in0 + int_part,
- upsample_fir[4 - frac_part],
- UPS_MEM_SIZE);
+ out[i] = avpriv_scalarproduct_float_c(in0 + int_part,
+ upsample_fir[4 - frac_part],
+ UPS_MEM_SIZE);
 int_part++;
 frac_part--;
 i++;
@@ -856,8 +852,8 @@
 if (ctx->fr_cur_mode == MODE_23k85)
 return qua_hb_gain[hb_idx] * (1.0f / (1 << 14));
 
- tilt = ff_scalarproduct_float_c(synth, synth + 1, AMRWB_SFR_SIZE - 1) /
- ff_scalarproduct_float_c(synth, synth, AMRWB_SFR_SIZE);
+ tilt = avpriv_scalarproduct_float_c(synth, synth + 1, AMRWB_SFR_SIZE - 1) /
+ avpriv_scalarproduct_float_c(synth, synth, AMRWB_SFR_SIZE);
 
 /* return gain bounded by [0.1, 1.0] */
 return av_clipf((1.0 - FFMAX(0.0, tilt)) * (1.25 - 0.25 * wsp), 0.1, 1.0);
@@ -876,7 +872,8 @@
 const float *synth_exc, float hb_gain)
 {
 int i;
- float energy = ff_scalarproduct_float_c(synth_exc, synth_exc, AMRWB_SFR_SIZE);
+ float energy = avpriv_scalarproduct_float_c(synth_exc, synth_exc,
+ AMRWB_SFR_SIZE);
 
 /* Generate a white-noise excitation */
 for (i = 0; i < AMRWB_SFR_SIZE_16k; i++)
@@ -1076,6 +1073,7 @@
 int *got_frame_ptr, AVPacket *avpkt)
 {
 AMRWBContext *ctx = avctx->priv_data;
+ AVFrame *frame = data;
 AMRWBFrame *cf = &ctx->frame;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
@@ -1093,12 +1091,12 @@
 int sub, i, ret;
 
 /* get output buffer */
- ctx->avframe.nb_samples = 4 * AMRWB_SFR_SIZE_16k;
- if ((ret = ff_get_buffer(avctx, &ctx->avframe)) < 0) {
+ frame->nb_samples = 4 * AMRWB_SFR_SIZE_16k;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- buf_out = (float *)ctx->avframe.data[0];
+ buf_out = (float *)frame->data[0];
 
 header_size = decode_mime_header(ctx, buf);
 if (ctx->fr_cur_mode > MODE_SID) {
@@ -1119,7 +1117,7 @@
 av_log(avctx, AV_LOG_ERROR, "Encountered a bad or corrupted frame\n");
 
 if (ctx->fr_cur_mode == MODE_SID) { /* Comfort noise frame */
- av_log_missing_feature(avctx, "SID mode", 1);
+ avpriv_request_sample(avctx, "SID mode");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -1168,9 +1166,9 @@
 
 ctx->fixed_gain[0] =
 ff_amr_set_fixed_gain(fixed_gain_factor,
- ff_scalarproduct_float_c(ctx->fixed_vector,
- ctx->fixed_vector,
- AMRWB_SFR_SIZE) /
+ avpriv_scalarproduct_float_c(ctx->fixed_vector,
+ ctx->fixed_vector,
+ AMRWB_SFR_SIZE) /
 AMRWB_SFR_SIZE,
 ctx->prediction_error,
 ENERGY_MEAN, energy_pred_fac);
@@ -1243,21 +1241,20 @@
 memcpy(ctx->isp_sub4_past, ctx->isp[3], LP_ORDER * sizeof(ctx->isp[3][0]));
 memcpy(ctx->isf_past_final, ctx->isf_cur, LP_ORDER * sizeof(float));
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = ctx->avframe;
+ *got_frame_ptr = 1;
 
 return expected_fr_size;
 }
 
 AVCodec ff_amrwb_decoder = {
 .name = "amrwb",
+ .long_name = NULL_IF_CONFIG_SMALL("AMR-WB (Adaptive Multi-Rate WideBand)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_AMR_WB,
 .priv_data_size = sizeof(AMRWBContext),
 .init = amrwb_decode_init,
 .decode = amrwb_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("AMR-WB (Adaptive Multi-Rate WideBand)"),
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,
 AV_SAMPLE_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/anm.c -> libav-v10.1.tar.bz2/libavcodec/anm.c Changed

@@ -26,9 +26,10 @@
 
 #include "avcodec.h"
 #include "bytestream.h"
+#include "internal.h"
 
 typedef struct AnmContext {
- AVFrame frame;
+ AVFrame *frame;
 int palette[AVPALETTE_COUNT];
 GetByteContext gb;
 int x; ///< x coordinate position
@@ -41,10 +42,13 @@
 
 avctx->pix_fmt = AV_PIX_FMT_PAL8;
 
- s->frame.reference = 1;
+ s->frame = av_frame_alloc();
+ if (!s->frame)
+ return AVERROR(ENOMEM);
+
 bytestream2_init(&s->gb, avctx->extradata, avctx->extradata_size);
 if (bytestream2_get_bytes_left(&s->gb) < 16 * 8 + 4 * 256)
- return -1;
+ return AVERROR_INVALIDDATA;
 
 bytestream2_skipu(&s->gb, 16 * 8);
 for (i = 0; i < 256; i++)
@@ -111,23 +115,23 @@
 AnmContext *s = avctx->priv_data;
 const int buf_size = avpkt->size;
 uint8_t *dst, *dst_end;
- int count;
+ int count, ret;
 
- if(avctx->reget_buffer(avctx, &s->frame) < 0){
+ if ((ret = ff_reget_buffer(avctx, s->frame)) < 0){
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
- dst = s->frame.data[0];
- dst_end = s->frame.data[0] + s->frame.linesize[0]*avctx->height;
+ dst = s->frame->data[0];
+ dst_end = s->frame->data[0] + s->frame->linesize[0]*avctx->height;
 
 bytestream2_init(&s->gb, avpkt->data, buf_size);
 
 if (bytestream2_get_byte(&s->gb) != 0x42) {
- av_log_ask_for_sample(avctx, "unknown record type\n");
+ avpriv_request_sample(avctx, "Unknown record type");
 return buf_size;
 }
 if (bytestream2_get_byte(&s->gb)) {
- av_log_ask_for_sample(avctx, "padding bytes not supported\n");
+ avpriv_request_sample(avctx, "Padding bytes");
 return buf_size;
 }
 bytestream2_skip(&s->gb, 2);
@@ -136,7 +140,7 @@
 do {
 /* if statements are ordered by probability */
 #define OP(gb, pixel, count) \
- op(&dst, dst_end, (gb), (pixel), (count), &s->x, avctx->width, s->frame.linesize[0])
+ op(&dst, dst_end, (gb), (pixel), (count), &s->x, avctx->width, s->frame->linesize[0])
 
 int type = bytestream2_get_byte(&s->gb);
 count = type & 0x7F;
@@ -157,7 +161,7 @@
 if (type == 0)
 break; // stop
 if (type == 2) {
- av_log_ask_for_sample(avctx, "unknown opcode");
+ avpriv_request_sample(avctx, "Unknown opcode");
 return AVERROR_PATCHWELCOME;
 }
 continue;
@@ -168,23 +172,26 @@
 }
 } while (bytestream2_get_bytes_left(&s->gb) > 0);
 
- memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
+ memcpy(s->frame->data[1], s->palette, AVPALETTE_SIZE);
 
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
+ if ((ret = av_frame_ref(data, s->frame)) < 0)
+ return ret;
+
 return buf_size;
 }
 
 static av_cold int decode_end(AVCodecContext *avctx)
 {
 AnmContext *s = avctx->priv_data;
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+
+ av_frame_free(&s->frame);
 return 0;
 }
 
 AVCodec ff_anm_decoder = {
 .name = "anm",
+ .long_name = NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_ANM,
 .priv_data_size = sizeof(AnmContext),
@@ -192,5 +199,4 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"),
 };

libav-v9.6.tar.bz2/libavcodec/ansi.c -> libav-v10.1.tar.bz2/libavcodec/ansi.c Changed

@@ -25,6 +25,7 @@
 */
 
 #include "libavutil/common.h"
+#include "libavutil/frame.h"
 #include "libavutil/lfg.h"
 #include "avcodec.h"
 #include "cga_data.h"
@@ -49,7 +50,7 @@
 };
 
 typedef struct {
- AVFrame frame;
+ AVFrame *frame;
 int x; /**< x cursor position (pixels) */
 int y; /**< y cursor position (pixels) */
 int sx; /**< saved x cursor position (pixels) */
@@ -77,6 +78,10 @@
 AnsiContext *s = avctx->priv_data;
 avctx->pix_fmt = AV_PIX_FMT_PAL8;
 
+ s->frame = av_frame_alloc();
+ if (!s->frame)
+ return AVERROR(ENOMEM);
+
 /* defaults */
 s->font = ff_vga16_font;
 s->font_height = 16;
@@ -84,7 +89,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;
 }
@@ -101,11 +106,11 @@
 
 i = 0;
 for (; i < avctx->height - s->font_height; i++)
- memcpy(s->frame.data[0] + i * s->frame.linesize[0],
- s->frame.data[0] + (i + s->font_height) * s->frame.linesize[0],
+ memcpy(s->frame->data[0] + i * s->frame->linesize[0],
+ s->frame->data[0] + (i + s->font_height) * s->frame->linesize[0],
 avctx->width);
 for (; i < avctx->height; i++)
- memset(s->frame.data[0] + i * s->frame.linesize[0],
+ memset(s->frame->data[0] + i * s->frame->linesize[0],
 DEFAULT_BG_COLOR, avctx->width);
 }
 
@@ -114,7 +119,7 @@
 AnsiContext *s = avctx->priv_data;
 int i;
 for (i = 0; i < s->font_height; i++)
- memset(s->frame.data[0] + (s->y + i)*s->frame.linesize[0] + xoffset,
+ memset(s->frame->data[0] + (s->y + i)*s->frame->linesize[0] + xoffset,
 DEFAULT_BG_COLOR, xlength);
 }
 
@@ -123,7 +128,7 @@
 AnsiContext *s = avctx->priv_data;
 int i;
 for (i = 0; i < avctx->height; i++)
- memset(s->frame.data[0] + i * s->frame.linesize[0], DEFAULT_BG_COLOR, avctx->width);
+ memset(s->frame->data[0] + i * s->frame->linesize[0], DEFAULT_BG_COLOR, avctx->width);
 s->x = s->y = 0;
 }
 
@@ -144,8 +149,8 @@
 FFSWAP(int, fg, bg);
 if ((s->attributes & ATTR_CONCEALED))
 fg = bg;
- ff_draw_pc_font(s->frame.data[0] + s->y * s->frame.linesize[0] + s->x,
- s->frame.linesize[0], s->font, s->font_height, c, fg, bg);
+ ff_draw_pc_font(s->frame->data[0] + s->y * s->frame->linesize[0] + s->x,
+ s->frame->linesize[0], s->font, s->font_height, c, fg, bg);
 s->x += FONT_WIDTH;
 if (s->x >= avctx->width) {
 s->x = 0;
@@ -160,7 +165,10 @@
 static int execute_code(AVCodecContext * avctx, int c)
 {
 AnsiContext *s = avctx->priv_data;
- int ret, i, width, height;
+ int ret, i;
+ int width = 0;
+ int height = 0;
+
 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);
@@ -217,20 +225,22 @@
 height = 60<<4;
 break;
 default:
- av_log_ask_for_sample(avctx, "unsupported screen mode\n");
+ avpriv_request_sample(avctx, "Unsupported screen mode");
 }
- if (width != avctx->width || height != avctx->height) {
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
- avcodec_set_dimensions(avctx, width, height);
- ret = ff_get_buffer(avctx, &s->frame);
+ if (width != 0 && height != 0 &&
+ (width != avctx->width || height != avctx->height)) {
+ av_frame_unref(s->frame);
+ ret = ff_set_dimensions(avctx, width, height);
+ if (ret < 0)
+ return ret;
+ ret = ff_get_buffer(avctx, s->frame, AV_GET_BUFFER_FLAG_REF);
 if (ret < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- s->frame.pict_type = AV_PICTURE_TYPE_I;
- s->frame.palette_has_changed = 1;
- memcpy(s->frame.data[1], ff_cga_palette, 16 * 4);
+ s->frame->pict_type = AV_PICTURE_TYPE_I;
+ s->frame->palette_has_changed = 1;
+ memcpy(s->frame->data[1], ff_cga_palette, 16 * 4);
 erase_screen(avctx);
 } else if (c == 'l') {
 erase_screen(avctx);
@@ -241,13 +251,13 @@
 case 0:
 erase_line(avctx, s->x, avctx->width - s->x);
 if (s->y < avctx->height - s->font_height)
- memset(s->frame.data[0] + (s->y + s->font_height)*s->frame.linesize[0],
- DEFAULT_BG_COLOR, (avctx->height - s->y - s->font_height)*s->frame.linesize[0]);
+ memset(s->frame->data[0] + (s->y + s->font_height)*s->frame->linesize[0],
+ DEFAULT_BG_COLOR, (avctx->height - s->y - s->font_height)*s->frame->linesize[0]);
 break;
 case 1:
 erase_line(avctx, 0, s->x);
 if (s->y > 0)
- memset(s->frame.data[0], DEFAULT_BG_COLOR, s->y * s->frame.linesize[0]);
+ memset(s->frame->data[0], DEFAULT_BG_COLOR, s->y * s->frame->linesize[0]);
 break;
 case 2:
 erase_screen(avctx);
@@ -287,7 +297,7 @@
 } else if (m == 49) {
 s->fg = ansi_to_cga[DEFAULT_BG_COLOR];
 } else {
- av_log_ask_for_sample(avctx, "unsupported rendition parameter\n");
+ avpriv_request_sample(avctx, "Unsupported rendition parameter");
 }
 }
 break;
@@ -304,7 +314,7 @@
 s->y = av_clip(s->sy, 0, avctx->height - s->font_height);
 break;
 default:
- av_log_ask_for_sample(avctx, "unsupported escape code\n");
+ avpriv_request_sample(avctx, "Unknown escape code");
 break;
 }
 return 0;
@@ -320,19 +330,19 @@
 const uint8_t *buf_end = buf+buf_size;
 int ret, i, count;
 
- ret = avctx->reget_buffer(avctx, &s->frame);
+ ret = ff_reget_buffer(avctx, s->frame);
 if (ret < 0){
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
 if (!avctx->frame_number) {
- memset(s->frame.data[0], 0, avctx->height * FFABS(s->frame.linesize[0]));
- memset(s->frame.data[1], 0, AVPALETTE_SIZE);
+ memset(s->frame->data[0], 0, avctx->height * FFABS(s->frame->linesize[0]));
+ memset(s->frame->data[1], 0, AVPALETTE_SIZE);
 }
 
- s->frame.pict_type = AV_PICTURE_TYPE_I;
- s->frame.palette_has_changed = 1;
- memcpy(s->frame.data[1], ff_cga_palette, 16 * 4);
+ s->frame->pict_type = AV_PICTURE_TYPE_I;
+ s->frame->palette_has_changed = 1;
+ memcpy(s->frame->data[1], ff_cga_palette, 16 * 4);
 
 while(buf < buf_end) {
 switch(s->state) {
@@ -401,8 +411,8 @@
 av_log(avctx, AV_LOG_WARNING, "args overflow (%i)\n", s->nb_args);
 if (s->nb_args < MAX_NB_ARGS && s->args[s->nb_args])
 s->nb_args++;
- if (execute_code(avctx, buf[0]) < 0)
- return -1;
+ if ((ret = execute_code(avctx, buf[0])) < 0)
+ return ret;
 s->state = STATE_NORMAL;
 }
 break;
@@ -416,20 +426,22 @@
 }
 
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
+ if ((ret = av_frame_ref(data, s->frame)) < 0)
+ return ret;
 return buf_size;
 }
 
 static av_cold int decode_close(AVCodecContext *avctx)
 {
 AnsiContext *s = avctx->priv_data;
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+
+ av_frame_free(&s->frame);
 return 0;
 }
 
 AVCodec ff_ansi_decoder = {
 .name = "ansi",
+ .long_name = NULL_IF_CONFIG_SMALL("ASCII/ANSI art"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_ANSI,
 .priv_data_size = sizeof(AnsiContext),
@@ -437,5 +449,4 @@
 .close = decode_close,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("ASCII/ANSI art"),
 };

libav-v9.6.tar.bz2/libavcodec/apedec.c -> libav-v10.1.tar.bz2/libavcodec/apedec.c Changed

@@ -27,6 +27,8 @@
 #include "dsputil.h"
 #include "bytestream.h"
 #include "internal.h"
+#include "get_bits.h"
+#include "unary.h"
 
 /**
 * @file
@@ -123,13 +125,14 @@
 int32_t coeffsA[2][4]; ///< adaption coefficients
 int32_t coeffsB[2][5]; ///< adaption coefficients
 int32_t historybuffer[HISTORY_SIZE + PREDICTOR_SIZE];
+
+ unsigned int sample_pos;
 } APEPredictor;
 
 /** Decoder context */
 typedef struct APEContext {
 AVClass *class; ///< class for AVOptions
 AVCodecContext *avctx;
- AVFrame frame;
 DSPContext dsp;
 int channels;
 int samples; ///< samples left to decode in current frame
@@ -155,6 +158,7 @@
 APERice riceX; ///< rice code parameters for the second channel
 APERice riceY; ///< rice code parameters for the first channel
 APEFilter filters[APE_FILTER_LEVELS][2]; ///< filters used for reconstruction
+ GetBitContext gb;
 
 uint8_t *data; ///< current frame data
 uint8_t *data_end; ///< frame data end
@@ -162,8 +166,33 @@
 const uint8_t *ptr; ///< current position in frame data
 
 int error;
+
+ void (*entropy_decode_mono)(struct APEContext *ctx, int blockstodecode);
+ void (*entropy_decode_stereo)(struct APEContext *ctx, int blockstodecode);
+ void (*predictor_decode_mono)(struct APEContext *ctx, int count);
+ void (*predictor_decode_stereo)(struct APEContext *ctx, int count);
 } APEContext;
 
+static void ape_apply_filters(APEContext *ctx, int32_t *decoded0,
+ int32_t *decoded1, int count);
+
+static void entropy_decode_mono_0000(APEContext *ctx, int blockstodecode);
+static void entropy_decode_stereo_0000(APEContext *ctx, int blockstodecode);
+static void entropy_decode_mono_3860(APEContext *ctx, int blockstodecode);
+static void entropy_decode_stereo_3860(APEContext *ctx, int blockstodecode);
+static void entropy_decode_mono_3900(APEContext *ctx, int blockstodecode);
+static void entropy_decode_stereo_3900(APEContext *ctx, int blockstodecode);
+static void entropy_decode_stereo_3930(APEContext *ctx, int blockstodecode);
+static void entropy_decode_mono_3990(APEContext *ctx, int blockstodecode);
+static void entropy_decode_stereo_3990(APEContext *ctx, int blockstodecode);
+
+static void predictor_decode_mono_3800(APEContext *ctx, int count);
+static void predictor_decode_stereo_3800(APEContext *ctx, int count);
+static void predictor_decode_mono_3930(APEContext *ctx, int count);
+static void predictor_decode_stereo_3930(APEContext *ctx, int count);
+static void predictor_decode_mono_3950(APEContext *ctx, int count);
+static void predictor_decode_stereo_3950(APEContext *ctx, int count);
+
 // TODO: dsputilize
 
 static av_cold int ape_decode_close(AVCodecContext *avctx)
@@ -206,8 +235,8 @@
 avctx->sample_fmt = AV_SAMPLE_FMT_S32P;
 break;
 default:
- av_log_ask_for_sample(avctx, "Unsupported bits per coded sample %d\n",
- s->bps);
+ avpriv_request_sample(avctx,
+ "%d bits per coded sample", s->bps);
 return AVERROR_PATCHWELCOME;
 }
 s->avctx = avctx;
@@ -218,7 +247,8 @@
 
 av_log(avctx, AV_LOG_DEBUG, "Compression Level: %d - Flags: %d\n",
 s->compression_level, s->flags);
- if (s->compression_level % 1000 || s->compression_level > COMPRESSION_LEVEL_INSANE) {
+ if (s->compression_level % 1000 || s->compression_level > COMPRESSION_LEVEL_INSANE ||
+ (s->fileversion < 3930 && s->compression_level == COMPRESSION_LEVEL_INSANE)) {
 av_log(avctx, AV_LOG_ERROR, "Incorrect compression level %d\n",
 s->compression_level);
 return AVERROR_INVALIDDATA;
@@ -232,12 +262,37 @@
 filter_alloc_fail);
 }
 
+ if (s->fileversion < 3860) {
+ s->entropy_decode_mono = entropy_decode_mono_0000;
+ s->entropy_decode_stereo = entropy_decode_stereo_0000;
+ } else if (s->fileversion < 3900) {
+ s->entropy_decode_mono = entropy_decode_mono_3860;
+ s->entropy_decode_stereo = entropy_decode_stereo_3860;
+ } else if (s->fileversion < 3930) {
+ s->entropy_decode_mono = entropy_decode_mono_3900;
+ s->entropy_decode_stereo = entropy_decode_stereo_3900;
+ } else if (s->fileversion < 3990) {
+ s->entropy_decode_mono = entropy_decode_mono_3900;
+ s->entropy_decode_stereo = entropy_decode_stereo_3930;
+ } else {
+ s->entropy_decode_mono = entropy_decode_mono_3990;
+ s->entropy_decode_stereo = entropy_decode_stereo_3990;
+ }
+
+ if (s->fileversion < 3930) {
+ s->predictor_decode_mono = predictor_decode_mono_3800;
+ s->predictor_decode_stereo = predictor_decode_stereo_3800;
+ } else if (s->fileversion < 3950) {
+ s->predictor_decode_mono = predictor_decode_mono_3930;
+ s->predictor_decode_stereo = predictor_decode_stereo_3930;
+ } else {
+ s->predictor_decode_mono = predictor_decode_mono_3950;
+ s->predictor_decode_stereo = predictor_decode_stereo_3950;
+ }
+
 ff_dsputil_init(&s->dsp, avctx);
 avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO;
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 filter_alloc_fail:
 ape_decode_close(avctx);
@@ -405,67 +460,120 @@
 rice->k++;
 }
 
-static inline int ape_decode_value(APEContext *ctx, APERice *rice)
+static inline int get_rice_ook(GetBitContext *gb, int k)
 {
- unsigned int x, overflow;
+ unsigned int x;
 
- if (ctx->fileversion < 3990) {
- int tmpk;
+ x = get_unary(gb, 1, get_bits_left(gb));
 
- overflow = range_get_symbol(ctx, counts_3970, counts_diff_3970);
+ if (k)
+ x = (x << k) | get_bits(gb, k);
 
- if (overflow == (MODEL_ELEMENTS - 1)) {
- tmpk = range_decode_bits(ctx, 5);
- overflow = 0;
- } else
- tmpk = (rice->k < 1) ? 0 : rice->k - 1;
+ return x;
+}
 
- if (tmpk <= 16)
- x = range_decode_bits(ctx, tmpk);
- else if (tmpk <= 32) {
- x = range_decode_bits(ctx, 16);
- x |= (range_decode_bits(ctx, tmpk - 16) << 16);
- } else {
- av_log(ctx->avctx, AV_LOG_ERROR, "Too many bits: %d\n", tmpk);
- return AVERROR_INVALIDDATA;
+static inline int ape_decode_value_3860(APEContext *ctx, GetBitContext *gb,
+ APERice *rice)
+{
+ unsigned int x, overflow;
+
+ overflow = get_unary(gb, 1, get_bits_left(gb));
+
+ if (ctx->fileversion > 3880) {
+ while (overflow >= 16) {
+ overflow -= 16;
+ rice->k += 4;
 }
- x += overflow << tmpk;
+ }
+
+ if (!rice->k)
+ x = overflow;
+ else
+ x = (overflow << rice->k) + get_bits(gb, rice->k);
+
+ rice->ksum += x - (rice->ksum + 8 >> 4);
+ if (rice->ksum < (rice->k ? 1 << (rice->k + 4) : 0))
+ rice->k--;
+ else if (rice->ksum >= (1 << (rice->k + 5)) && rice->k < 24)
+ rice->k++;
+
+ /* Convert to signed */
+ if (x & 1)
+ return (x >> 1) + 1;
+ else
+ return -(x >> 1);
+}
+
+static inline int ape_decode_value_3900(APEContext *ctx, APERice *rice)
+{
+ unsigned int x, overflow;
+ int tmpk;
+
+ overflow = range_get_symbol(ctx, counts_3970, counts_diff_3970);
+
+ if (overflow == (MODEL_ELEMENTS - 1)) {
+ tmpk = range_decode_bits(ctx, 5);
+ overflow = 0;
+ } else
+ tmpk = (rice->k < 1) ? 0 : rice->k - 1;
+
+ if (tmpk <= 16 || ctx->fileversion < 3910)
+ x = range_decode_bits(ctx, tmpk);
+ else if (tmpk <= 32) {
+ x = range_decode_bits(ctx, 16);
+ x |= (range_decode_bits(ctx, tmpk - 16) << 16);
 } else {
- int base, pivot;
+ av_log(ctx->avctx, AV_LOG_ERROR, "Too many bits: %d\n", tmpk);
+ return AVERROR_INVALIDDATA;
+ }
+ x += overflow << tmpk;
 
- pivot = rice->ksum >> 5;
- if (pivot == 0)
- pivot = 1;
+ update_rice(rice, x);
 
- overflow = range_get_symbol(ctx, counts_3980, counts_diff_3980);
+ /* Convert to signed */
+ if (x & 1)
+ return (x >> 1) + 1;
+ else
+ return -(x >> 1);
+}
 
- if (overflow == (MODEL_ELEMENTS - 1)) {
- overflow = range_decode_bits(ctx, 16) << 16;
- overflow |= range_decode_bits(ctx, 16);
- }
+static inline int ape_decode_value_3990(APEContext *ctx, APERice *rice)
+{
+ unsigned int x, overflow;
+ int base, pivot;
 
- if (pivot < 0x10000) {
- base = range_decode_culfreq(ctx, pivot);
- range_decode_update(ctx, 1, base);
- } else {
- int base_hi = pivot, base_lo;
- int bbits = 0;
+ pivot = rice->ksum >> 5;
+ if (pivot == 0)
+ pivot = 1;
 
- while (base_hi & ~0xFFFF) {
- base_hi >>= 1;
- bbits++;
- }
- base_hi = range_decode_culfreq(ctx, base_hi + 1);
- range_decode_update(ctx, 1, base_hi);
- base_lo = range_decode_culfreq(ctx, 1 << bbits);
- range_decode_update(ctx, 1, base_lo);
+ overflow = range_get_symbol(ctx, counts_3980, counts_diff_3980);
 
- base = (base_hi << bbits) + base_lo;
+ if (overflow == (MODEL_ELEMENTS - 1)) {
+ overflow = range_decode_bits(ctx, 16) << 16;
+ overflow |= range_decode_bits(ctx, 16);
+ }
+
+ if (pivot < 0x10000) {
+ base = range_decode_culfreq(ctx, pivot);
+ range_decode_update(ctx, 1, base);
+ } else {
+ int base_hi = pivot, base_lo;
+ int bbits = 0;
+
+ while (base_hi & ~0xFFFF) {
+ base_hi >>= 1;
+ bbits++;
 }
+ base_hi = range_decode_culfreq(ctx, base_hi + 1);
+ range_decode_update(ctx, 1, base_hi);
+ base_lo = range_decode_culfreq(ctx, 1 << bbits);
+ range_decode_update(ctx, 1, base_lo);
 
- x = base + overflow * pivot;
+ base = (base_hi << bbits) + base_lo;
 }
 
+ x = base + overflow * pivot;
+
 update_rice(rice, x);
 
 /* Convert to signed */
@@ -475,24 +583,148 @@
 return -(x >> 1);
 }
 
-static void entropy_decode(APEContext *ctx, int blockstodecode, int stereo)
+static void decode_array_0000(APEContext *ctx, GetBitContext *gb,
+ int32_t *out, APERice *rice, int blockstodecode)
+{
+ int i;
+ int ksummax, ksummin;
+
+ rice->ksum = 0;
+ for (i = 0; i < 5; i++) {
+ out[i] = get_rice_ook(&ctx->gb, 10);
+ rice->ksum += out[i];
+ }
+ rice->k = av_log2(rice->ksum / 10) + 1;
+ 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;
+ }
+ ksummax = 1 << rice->k + 7;
+ ksummin = rice->k ? (1 << rice->k + 6) : 0;
+ for (; i < blockstodecode; i++) {
+ out[i] = get_rice_ook(&ctx->gb, rice->k);
+ rice->ksum += out[i] - out[i - 64];
+ while (rice->ksum < ksummin) {
+ rice->k--;
+ ksummin = rice->k ? ksummin >> 1 : 0;
+ ksummax >>= 1;
+ }
+ while (rice->ksum >= ksummax) {
+ rice->k++;
+ if (rice->k > 24)
+ return;
+ ksummax <<= 1;
+ ksummin = ksummin ? ksummin << 1 : 128;
+ }
+ }
+
+ for (i = 0; i < blockstodecode; i++) {
+ if (out[i] & 1)
+ out[i] = (out[i] >> 1) + 1;
+ else
+ out[i] = -(out[i] >> 1);
+ }
+}
+
+static void entropy_decode_mono_0000(APEContext *ctx, int blockstodecode)
+{
+ decode_array_0000(ctx, &ctx->gb, ctx->decoded[0], &ctx->riceY,
+ blockstodecode);
+}
+
+static void entropy_decode_stereo_0000(APEContext *ctx, int blockstodecode)
+{
+ decode_array_0000(ctx, &ctx->gb, ctx->decoded[0], &ctx->riceY,
+ blockstodecode);
+ decode_array_0000(ctx, &ctx->gb, ctx->decoded[1], &ctx->riceX,
+ blockstodecode);
+}
+
+static void entropy_decode_mono_3860(APEContext *ctx, int blockstodecode)
+{
+ int32_t *decoded0 = ctx->decoded[0];
+
+ while (blockstodecode--)
+ *decoded0++ = ape_decode_value_3860(ctx, &ctx->gb, &ctx->riceY);
+}
+
+static void entropy_decode_stereo_3860(APEContext *ctx, int blockstodecode)
+{
+ int32_t *decoded0 = ctx->decoded[0];
+ int32_t *decoded1 = ctx->decoded[1];
+ int blocks = blockstodecode;
+
+ while (blockstodecode--)
+ *decoded0++ = ape_decode_value_3860(ctx, &ctx->gb, &ctx->riceY);
+ while (blocks--)
+ *decoded1++ = ape_decode_value_3860(ctx, &ctx->gb, &ctx->riceX);
+}
+
+static void entropy_decode_mono_3900(APEContext *ctx, int blockstodecode)
+{
+ int32_t *decoded0 = ctx->decoded[0];
+
+ while (blockstodecode--)
+ *decoded0++ = ape_decode_value_3900(ctx, &ctx->riceY);
+}
+
+static void entropy_decode_stereo_3900(APEContext *ctx, int blockstodecode)
+{
+ int32_t *decoded0 = ctx->decoded[0];
+ int32_t *decoded1 = ctx->decoded[1];
+ int blocks = blockstodecode;
+
+ while (blockstodecode--)
+ *decoded0++ = ape_decode_value_3900(ctx, &ctx->riceY);
+ range_dec_normalize(ctx);
+ // because of some implementation peculiarities we need to backpedal here
+ ctx->ptr -= 1;
+ range_start_decoding(ctx);
+ while (blocks--)
+ *decoded1++ = ape_decode_value_3900(ctx, &ctx->riceX);
+}
+
+static void entropy_decode_stereo_3930(APEContext *ctx, int blockstodecode)
+{
+ int32_t *decoded0 = ctx->decoded[0];
+ int32_t *decoded1 = ctx->decoded[1];
+
+ while (blockstodecode--) {
+ *decoded0++ = ape_decode_value_3900(ctx, &ctx->riceY);
+ *decoded1++ = ape_decode_value_3900(ctx, &ctx->riceX);
+ }
+}
+
+static void entropy_decode_mono_3990(APEContext *ctx, int blockstodecode)
+{
+ int32_t *decoded0 = ctx->decoded[0];
+
+ while (blockstodecode--)
+ *decoded0++ = ape_decode_value_3990(ctx, &ctx->riceY);
+}
+
+static void entropy_decode_stereo_3990(APEContext *ctx, int blockstodecode)
 {
 int32_t *decoded0 = ctx->decoded[0];
 int32_t *decoded1 = ctx->decoded[1];
 
 while (blockstodecode--) {
- *decoded0++ = ape_decode_value(ctx, &ctx->riceY);
- if (stereo)
- *decoded1++ = ape_decode_value(ctx, &ctx->riceX);
+ *decoded0++ = ape_decode_value_3990(ctx, &ctx->riceY);
+ *decoded1++ = ape_decode_value_3990(ctx, &ctx->riceX);
 }
 }
 
 static int init_entropy_decoder(APEContext *ctx)
 {
 /* Read the CRC */
- if (ctx->data_end - ctx->ptr < 6)
- return AVERROR_INVALIDDATA;
- ctx->CRC = bytestream_get_be32(&ctx->ptr);
+ if (ctx->fileversion >= 3900) {
+ if (ctx->data_end - ctx->ptr < 6)
+ return AVERROR_INVALIDDATA;
+ ctx->CRC = bytestream_get_be32(&ctx->ptr);
+ } else {
+ ctx->CRC = get_bits_long(&ctx->gb, 32);
+ }
 
 /* Read the frame flags if they exist */
 ctx->frameflags = 0;
@@ -510,15 +742,29 @@
 ctx->riceY.k = 10;
 ctx->riceY.ksum = (1 << ctx->riceY.k) * 16;
 
- /* The first 8 bits of input are ignored. */
- ctx->ptr++;
+ if (ctx->fileversion >= 3900) {
+ /* The first 8 bits of input are ignored. */
+ ctx->ptr++;
 
- range_start_decoding(ctx);
+ range_start_decoding(ctx);
+ }
 
 return 0;
 }
 
-static const int32_t initial_coeffs[4] = {
+static const int32_t initial_coeffs_fast_3320[1] = {
+ 375,
+};
+
+static const int32_t initial_coeffs_a_3800[3] = {
+ 64, 115, 64,
+};
+
+static const int32_t initial_coeffs_b_3800[2] = {
+ 740, 0
+};
+
+static const int32_t initial_coeffs_3930[4] = {
 360, 317, -109, 98
 };
 
@@ -531,13 +777,35 @@
 p->buf = p->historybuffer;
 
 /* Initialize and zero the coefficients */
- memcpy(p->coeffsA[0], initial_coeffs, sizeof(initial_coeffs));
- memcpy(p->coeffsA[1], initial_coeffs, sizeof(initial_coeffs));
+ if (ctx->fileversion < 3930) {
+ if (ctx->compression_level == COMPRESSION_LEVEL_FAST) {
+ memcpy(p->coeffsA[0], initial_coeffs_fast_3320,
+ sizeof(initial_coeffs_fast_3320));
+ memcpy(p->coeffsA[1], initial_coeffs_fast_3320,
+ sizeof(initial_coeffs_fast_3320));
+ } else {
+ memcpy(p->coeffsA[0], initial_coeffs_a_3800,
+ sizeof(initial_coeffs_a_3800));
+ memcpy(p->coeffsA[1], initial_coeffs_a_3800,
+ sizeof(initial_coeffs_a_3800));
+ }
+ } else {
+ memcpy(p->coeffsA[0], initial_coeffs_3930, sizeof(initial_coeffs_3930));
+ memcpy(p->coeffsA[1], initial_coeffs_3930, sizeof(initial_coeffs_3930));
+ }
 memset(p->coeffsB, 0, sizeof(p->coeffsB));
+ if (ctx->fileversion < 3930) {
+ memcpy(p->coeffsB[0], initial_coeffs_b_3800,
+ sizeof(initial_coeffs_b_3800));
+ memcpy(p->coeffsB[1], initial_coeffs_b_3800,
+ sizeof(initial_coeffs_b_3800));
+ }
 
 p->filterA[0] = p->filterA[1] = 0;
 p->filterB[0] = p->filterB[1] = 0;
 p->lastA[0] = p->lastA[1] = 0;
+
+ p->sample_pos = 0;
 }
 
 /** Get inverse sign of integer (-1 for positive, 1 for negative and 0 for zero) */
@@ -545,6 +813,304 @@
 return (x < 0) - (x > 0);
 }
 
+static av_always_inline int filter_fast_3320(APEPredictor *p,
+ const int decoded, const int filter,
+ const int delayA)
+{
+ int32_t predictionA;
+
+ p->buf[delayA] = p->lastA[filter];
+ if (p->sample_pos < 3) {
+ p->lastA[filter] = decoded;
+ p->filterA[filter] = decoded;
+ return decoded;
+ }
+
+ predictionA = p->buf[delayA] * 2 - p->buf[delayA - 1];
+ p->lastA[filter] = decoded + (predictionA * p->coeffsA[filter][0] >> 9);
+
+ if ((decoded ^ predictionA) > 0)
+ p->coeffsA[filter][0]++;
+ else
+ p->coeffsA[filter][0]--;
+
+ p->filterA[filter] += p->lastA[filter];
+
+ return p->filterA[filter];
+}
+
+static av_always_inline int filter_3800(APEPredictor *p,
+ const int decoded, const int filter,
+ const int delayA, const int delayB,
+ const int start, const int shift)
+{
+ int32_t predictionA, predictionB, sign;
+ int32_t d0, d1, d2, d3, d4;
+
+ p->buf[delayA] = p->lastA[filter];
+ p->buf[delayB] = p->filterB[filter];
+ if (p->sample_pos < start) {
+ predictionA = decoded + p->filterA[filter];
+ p->lastA[filter] = decoded;
+ p->filterB[filter] = decoded;
+ p->filterA[filter] = predictionA;
+ return predictionA;
+ }
+ d2 = p->buf[delayA];
+ d1 = (p->buf[delayA] - p->buf[delayA - 1]) << 1;
+ d0 = p->buf[delayA] + ((p->buf[delayA - 2] - p->buf[delayA - 1]) << 3);
+ d3 = p->buf[delayB] * 2 - p->buf[delayB - 1];
+ d4 = p->buf[delayB];
+
+ predictionA = d0 * p->coeffsA[filter][0] +
+ d1 * p->coeffsA[filter][1] +
+ d2 * p->coeffsA[filter][2];
+
+ sign = APESIGN(decoded);
+ p->coeffsA[filter][0] += (((d0 >> 30) & 2) - 1) * sign;
+ p->coeffsA[filter][1] += (((d1 >> 28) & 8) - 4) * sign;
+ p->coeffsA[filter][2] += (((d2 >> 28) & 8) - 4) * sign;
+
+ predictionB = d3 * p->coeffsB[filter][0] -
+ d4 * p->coeffsB[filter][1];
+ p->lastA[filter] = decoded + (predictionA >> 11);
+ sign = APESIGN(p->lastA[filter]);
+ p->coeffsB[filter][0] += (((d3 >> 29) & 4) - 2) * sign;
+ p->coeffsB[filter][1] -= (((d4 >> 30) & 2) - 1) * sign;
+
+ p->filterB[filter] = p->lastA[filter] + (predictionB >> shift);
+ p->filterA[filter] = p->filterB[filter] + ((p->filterA[filter] * 31) >> 5);
+
+ return p->filterA[filter];
+}
+
+static void long_filter_high_3800(int32_t *buffer, int order, int shift,
+ int32_t *coeffs, int32_t *delay, int length)
+{
+ int i, j;
+ int32_t dotprod, sign;
+
+ memset(coeffs, 0, order * sizeof(*coeffs));
+ for (i = 0; i < order; i++)
+ delay[i] = buffer[i];
+ for (i = order; i < length; i++) {
+ dotprod = 0;
+ sign = APESIGN(buffer[i]);
+ for (j = 0; j < order; j++) {
+ dotprod += delay[j] * coeffs[j];
+ coeffs[j] -= (((delay[j] >> 30) & 2) - 1) * sign;
+ }
+ buffer[i] -= dotprod >> shift;
+ for (j = 0; j < order - 1; j++)
+ delay[j] = delay[j + 1];
+ delay[order - 1] = buffer[i];
+ }
+}
+
+static void long_filter_ehigh_3830(int32_t *buffer, int length)
+{
+ int i, j;
+ int32_t dotprod, sign;
+ int32_t coeffs[8], delay[8];
+
+ memset(coeffs, 0, sizeof(coeffs));
+ memset(delay, 0, sizeof(delay));
+ for (i = 0; i < length; i++) {
+ dotprod = 0;
+ sign = APESIGN(buffer[i]);
+ for (j = 7; j >= 0; j--) {
+ dotprod += delay[j] * coeffs[j];
+ coeffs[j] -= (((delay[j] >> 30) & 2) - 1) * sign;
+ }
+ for (j = 7; j > 0; j--)
+ delay[j] = delay[j - 1];
+ delay[0] = buffer[i];
+ buffer[i] -= dotprod >> 9;
+ }
+}
+
+static void predictor_decode_stereo_3800(APEContext *ctx, int count)
+{
+ APEPredictor *p = &ctx->predictor;
+ int32_t *decoded0 = ctx->decoded[0];
+ int32_t *decoded1 = ctx->decoded[1];
+ int32_t coeffs[256], delay[256];
+ int start = 4, shift = 10;
+
+ if (ctx->compression_level == COMPRESSION_LEVEL_HIGH) {
+ start = 16;
+ long_filter_high_3800(decoded0, 16, 9, coeffs, delay, count);
+ long_filter_high_3800(decoded1, 16, 9, coeffs, delay, count);
+ } else if (ctx->compression_level == COMPRESSION_LEVEL_EXTRA_HIGH) {
+ int order = 128, shift2 = 11;
+
+ if (ctx->fileversion >= 3830) {
+ order <<= 1;
+ shift++;
+ shift2++;
+ long_filter_ehigh_3830(decoded0 + order, count - order);
+ long_filter_ehigh_3830(decoded1 + order, count - order);
+ }
+ start = order;
+ long_filter_high_3800(decoded0, order, shift2, coeffs, delay, count);
+ long_filter_high_3800(decoded1, order, shift2, coeffs, delay, count);
+ }
+
+ while (count--) {
+ int X = *decoded0, Y = *decoded1;
+ if (ctx->compression_level == COMPRESSION_LEVEL_FAST) {
+ *decoded0 = filter_fast_3320(p, Y, 0, YDELAYA);
+ decoded0++;
+ *decoded1 = filter_fast_3320(p, X, 1, XDELAYA);
+ decoded1++;
+ } else {
+ *decoded0 = filter_3800(p, Y, 0, YDELAYA, YDELAYB,
+ start, shift);
+ decoded0++;
+ *decoded1 = filter_3800(p, X, 1, XDELAYA, XDELAYB,
+ start, shift);
+ decoded1++;
+ }
+
+ /* Combined */
+ p->buf++;
+ p->sample_pos++;
+
+ /* Have we filled the history buffer? */
+ if (p->buf == p->historybuffer + HISTORY_SIZE) {
+ memmove(p->historybuffer, p->buf,
+ PREDICTOR_SIZE * sizeof(*p->historybuffer));
+ p->buf = p->historybuffer;
+ }
+ }
+}
+
+static void predictor_decode_mono_3800(APEContext *ctx, int count)
+{
+ APEPredictor *p = &ctx->predictor;
+ int32_t *decoded0 = ctx->decoded[0];
+ int32_t coeffs[256], delay[256];
+ int start = 4, shift = 10;
+
+ if (ctx->compression_level == COMPRESSION_LEVEL_HIGH) {
+ start = 16;
+ long_filter_high_3800(decoded0, 16, 9, coeffs, delay, count);
+ } else if (ctx->compression_level == COMPRESSION_LEVEL_EXTRA_HIGH) {
+ int order = 128, shift2 = 11;
+
+ if (ctx->fileversion >= 3830) {
+ order <<= 1;
+ shift++;
+ shift2++;
+ long_filter_ehigh_3830(decoded0 + order, count - order);
+ }
+ start = order;
+ long_filter_high_3800(decoded0, order, shift2, coeffs, delay, count);
+ }
+
+ while (count--) {
+ if (ctx->compression_level == COMPRESSION_LEVEL_FAST) {
+ *decoded0 = filter_fast_3320(p, *decoded0, 0, YDELAYA);
+ decoded0++;
+ } else {
+ *decoded0 = filter_3800(p, *decoded0, 0, YDELAYA, YDELAYB,
+ start, shift);
+ decoded0++;
+ }
+
+ /* Combined */
+ p->buf++;
+ p->sample_pos++;
+
+ /* Have we filled the history buffer? */
+ if (p->buf == p->historybuffer + HISTORY_SIZE) {
+ memmove(p->historybuffer, p->buf,
+ PREDICTOR_SIZE * sizeof(*p->historybuffer));
+ p->buf = p->historybuffer;
+ }
+ }
+}
+
+static av_always_inline int predictor_update_3930(APEPredictor *p,
+ const int decoded, const int filter,
+ const int delayA)
+{
+ int32_t predictionA, sign;
+ int32_t d0, d1, d2, d3;
+
+ p->buf[delayA] = p->lastA[filter];
+ d0 = p->buf[delayA ];
+ d1 = p->buf[delayA ] - p->buf[delayA - 1];
+ d2 = p->buf[delayA - 1] - p->buf[delayA - 2];
+ d3 = p->buf[delayA - 2] - p->buf[delayA - 3];
+
+ predictionA = d0 * p->coeffsA[filter][0] +
+ d1 * p->coeffsA[filter][1] +
+ d2 * p->coeffsA[filter][2] +
+ d3 * p->coeffsA[filter][3];
+
+ p->lastA[filter] = decoded + (predictionA >> 9);
+ p->filterA[filter] = p->lastA[filter] + ((p->filterA[filter] * 31) >> 5);
+
+ sign = APESIGN(decoded);
+ p->coeffsA[filter][0] += ((d0 < 0) * 2 - 1) * sign;
+ p->coeffsA[filter][1] += ((d1 < 0) * 2 - 1) * sign;
+ p->coeffsA[filter][2] += ((d2 < 0) * 2 - 1) * sign;
+ p->coeffsA[filter][3] += ((d3 < 0) * 2 - 1) * sign;
+
+ return p->filterA[filter];
+}
+
+static void predictor_decode_stereo_3930(APEContext *ctx, int count)
+{
+ APEPredictor *p = &ctx->predictor;
+ int32_t *decoded0 = ctx->decoded[0];
+ int32_t *decoded1 = ctx->decoded[1];
+
+ ape_apply_filters(ctx, ctx->decoded[0], ctx->decoded[1], count);
+
+ while (count--) {
+ /* Predictor Y */
+ int Y = *decoded1, X = *decoded0;
+ *decoded0 = predictor_update_3930(p, Y, 0, YDELAYA);
+ decoded0++;
+ *decoded1 = predictor_update_3930(p, X, 1, XDELAYA);
+ decoded1++;
+
+ /* Combined */
+ p->buf++;
+
+ /* Have we filled the history buffer? */
+ if (p->buf == p->historybuffer + HISTORY_SIZE) {
+ memmove(p->historybuffer, p->buf,
+ PREDICTOR_SIZE * sizeof(*p->historybuffer));
+ p->buf = p->historybuffer;
+ }
+ }
+}
+
+static void predictor_decode_mono_3930(APEContext *ctx, int count)
+{
+ APEPredictor *p = &ctx->predictor;
+ int32_t *decoded0 = ctx->decoded[0];
+
+ ape_apply_filters(ctx, ctx->decoded[0], NULL, count);
+
+ while (count--) {
+ *decoded0 = predictor_update_3930(p, *decoded0, 0, YDELAYA);
+ decoded0++;
+
+ p->buf++;
+
+ /* Have we filled the history buffer? */
+ if (p->buf == p->historybuffer + HISTORY_SIZE) {
+ memmove(p->historybuffer, p->buf,
+ PREDICTOR_SIZE * sizeof(*p->historybuffer));
+ p->buf = p->historybuffer;
+ }
+ }
+}
+
 static av_always_inline int predictor_update_filter(APEPredictor *p,
 const int decoded, const int filter,
 const int delayA, const int delayB,
@@ -592,12 +1158,14 @@
 return p->filterA[filter];
 }
 
-static void predictor_decode_stereo(APEContext *ctx, int count)
+static void predictor_decode_stereo_3950(APEContext *ctx, int count)
 {
 APEPredictor *p = &ctx->predictor;
 int32_t *decoded0 = ctx->decoded[0];
 int32_t *decoded1 = ctx->decoded[1];
 
+ ape_apply_filters(ctx, ctx->decoded[0], ctx->decoded[1], count);
+
 while (count--) {
 /* Predictor Y */
 *decoded0 = predictor_update_filter(p, *decoded0, 0, YDELAYA, YDELAYB,
@@ -619,12 +1187,14 @@
 }
 }
 
-static void predictor_decode_mono(APEContext *ctx, int count)
+static void predictor_decode_mono_3950(APEContext *ctx, int count)
 {
 APEPredictor *p = &ctx->predictor;
 int32_t *decoded0 = ctx->decoded[0];
 int32_t predictionA, currentA, A, sign;
 
+ ape_apply_filters(ctx, ctx->decoded[0], NULL, count);
+
 currentA = p->lastA[0];
 
 while (count--) {
@@ -783,11 +1353,10 @@
 return;
 }
 
- entropy_decode(ctx, count, 0);
- ape_apply_filters(ctx, ctx->decoded[0], NULL, count);
+ ctx->entropy_decode_mono(ctx, count);
 
 /* Now apply the predictor decoding */
- predictor_decode_mono(ctx, count);
+ ctx->predictor_decode_mono(ctx, count);
 
 /* Pseudo-stereo - just copy left channel to right channel */
 if (ctx->channels == 2) {
@@ -807,11 +1376,10 @@
 return;
 }
 
- entropy_decode(ctx, count, 1);
- ape_apply_filters(ctx, decoded0, decoded1, count);
+ ctx->entropy_decode_stereo(ctx, count);
 
 /* Now apply the predictor decoding */
- predictor_decode_stereo(ctx, count);
+ ctx->predictor_decode_stereo(ctx, count);
 
 /* Decorrelate and scale to output depth */
 while (count--) {
@@ -826,6 +1394,7 @@
 static int ape_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 APEContext *s = avctx->priv_data;
 uint8_t *sample8;
@@ -833,7 +1402,6 @@
 int32_t *sample24;
 int i, ch, ret;
 int blockstodecode;
- int bytes_used = 0;
 
 /* this should never be negative, but bad things will happen if it is, so
 check it just to make sure. */
@@ -856,26 +1424,36 @@
 av_log(avctx, AV_LOG_WARNING, "packet size is not a multiple of 4. "
 "extra bytes at the end will be skipped.\n");
 }
-
+ if (s->fileversion < 3950) // previous versions overread two bytes
+ buf_size += 2;
 av_fast_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);
+ memset(s->data + (buf_size & ~3), 0, buf_size & 3);
 s->ptr = s->data;
 s->data_end = s->data + buf_size;
 
 nblocks = bytestream_get_be32(&s->ptr);
 offset = bytestream_get_be32(&s->ptr);
- if (offset > 3) {
- av_log(avctx, AV_LOG_ERROR, "Incorrect offset passed\n");
- s->data = NULL;
- return AVERROR_INVALIDDATA;
- }
- if (s->data_end - s->ptr < offset) {
- av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");
- return AVERROR_INVALIDDATA;
+ if (s->fileversion >= 3900) {
+ if (offset > 3) {
+ av_log(avctx, AV_LOG_ERROR, "Incorrect offset passed\n");
+ s->data = NULL;
+ return AVERROR_INVALIDDATA;
+ }
+ if (s->data_end - s->ptr < offset) {
+ av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");
+ return AVERROR_INVALIDDATA;
+ }
+ s->ptr += offset;
+ } else {
+ init_get_bits(&s->gb, s->ptr, (s->data_end - s->ptr) * 8);
+ if (s->fileversion > 3800)
+ skip_bits_long(&s->gb, offset * 8);
+ else
+ skip_bits_long(&s->gb, offset);
 }
- s->ptr += offset;
 
 if (!nblocks || nblocks > INT_MAX) {
 av_log(avctx, AV_LOG_ERROR, "Invalid sample count: %u.\n", nblocks);
@@ -889,7 +1467,6 @@
 return AVERROR_INVALIDDATA;
 }
 
- bytes_used = avpkt->size;
 }
 
 if (!s->data) {
@@ -898,6 +1475,10 @@
 }
 
 blockstodecode = FFMIN(s->blocks_per_loop, s->samples);
+ // for old files coefficients were not interleaved,
+ // so we need to decode all of them at once
+ if (s->fileversion < 3930)
+ blockstodecode = s->samples;
 
 /* reallocate decoded sample buffer if needed */
 av_fast_malloc(&s->decoded_buffer, &s->decoded_size,
@@ -909,8 +1490,8 @@
 s->decoded[1] = s->decoded_buffer + FFALIGN(blockstodecode, 8);
 
 /* get output buffer */
- s->frame.nb_samples = blockstodecode;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = blockstodecode;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -932,21 +1513,21 @@
 switch (s->bps) {
 case 8:
 for (ch = 0; ch < s->channels; ch++) {
- sample8 = (uint8_t *)s->frame.data[ch];
+ sample8 = (uint8_t *)frame->data[ch];
 for (i = 0; i < blockstodecode; i++)
 *sample8++ = (s->decoded[ch][i] + 0x80) & 0xff;
 }
 break;
 case 16:
 for (ch = 0; ch < s->channels; ch++) {
- sample16 = (int16_t *)s->frame.data[ch];
+ sample16 = (int16_t *)frame->data[ch];
 for (i = 0; i < blockstodecode; i++)
 *sample16++ = s->decoded[ch][i];
 }
 break;
 case 24:
 for (ch = 0; ch < s->channels; ch++) {
- sample24 = (int32_t *)s->frame.data[ch];
+ sample24 = (int32_t *)frame->data[ch];
 for (i = 0; i < blockstodecode; i++)
 *sample24++ = s->decoded[ch][i] << 8;
 }
@@ -955,10 +1536,9 @@
 
 s->samples -= blockstodecode;
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
- return bytes_used;
+ return (s->samples == 0) ? avpkt->size : 0;
 }
 
 static void ape_flush(AVCodecContext *avctx)
@@ -984,6 +1564,7 @@
 
 AVCodec ff_ape_decoder = {
 .name = "ape",
+ .long_name = NULL_IF_CONFIG_SMALL("Monkey's Audio"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_APE,
 .priv_data_size = sizeof(APEContext),
@@ -992,7 +1573,6 @@
 .decode = ape_decode_frame,
 .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DELAY | CODEC_CAP_DR1,
 .flush = ape_flush,
- .long_name = NULL_IF_CONFIG_SMALL("Monkey's Audio"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P,
 AV_SAMPLE_FMT_S16P,
 AV_SAMPLE_FMT_S32P,

libav-v9.6.tar.bz2/libavcodec/arm/Makefile -> libav-v10.1.tar.bz2/libavcodec/arm/Makefile Changed

@@ -1,102 +1,99 @@
-OBJS-$(CONFIG_AC3DSP)                  += arm/ac3dsp_init_arm.o         \
-                                          arm/ac3dsp_arm.o
+ARCH_HEADERS = mathops.h
 
-OBJS-$(CONFIG_AAC_DECODER)             += arm/sbrdsp_init_arm.o         \
-                                          arm/aacpsdsp_init_arm.o
-
-OBJS-$(CONFIG_DCA_DECODER)             += arm/dcadsp_init_arm.o         \
-
-ARMV6-OBJS-$(CONFIG_AC3DSP)            += arm/ac3dsp_armv6.o
+OBJS                                   += arm/fmtconvert_init_arm.o
 
+OBJS-$(CONFIG_AAC_DECODER)             += arm/aacpsdsp_init_arm.o       \
+                                          arm/sbrdsp_init_arm.o
+OBJS-$(CONFIG_AC3DSP)                  += arm/ac3dsp_init_arm.o         \
+                                          arm/ac3dsp_arm.o
+OBJS-$(CONFIG_DCA_DECODER)             += arm/dcadsp_init_arm.o
+OBJS-$(CONFIG_DSPUTIL)                 += arm/dsputil_init_arm.o        \
+                                          arm/dsputil_arm.o             \
+                                          arm/jrevdct_arm.o             \
+                                          arm/simple_idct_arm.o
+OBJS-$(CONFIG_FFT)                     += arm/fft_init_arm.o            \
+                                          arm/fft_fixed_init_arm.o
 OBJS-$(CONFIG_FLAC_DECODER)            += arm/flacdsp_init_arm.o        \
-                                          arm/flacdsp_arm.o             \
-
+                                          arm/flacdsp_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
+OBJS-$(CONFIG_H264QPEL)                += arm/h264qpel_init_arm.o
+OBJS-$(CONFIG_HPELDSP)                 += arm/hpeldsp_init_arm.o        \
+                                          arm/hpeldsp_arm.o
 OBJS-$(CONFIG_MPEGAUDIODSP)            += arm/mpegaudiodsp_init_arm.o
-ARMV6-OBJS-$(CONFIG_MPEGAUDIODSP)      += arm/mpegaudiodsp_fixed_armv6.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_VP5_DECODER)             += arm/vp56dsp_init_arm.o
-OBJS-$(CONFIG_VP6_DECODER)             += arm/vp56dsp_init_arm.o
+OBJS-$(CONFIG_VP6_DECODER)             += arm/vp6dsp_init_arm.o
 OBJS-$(CONFIG_VP8_DECODER)             += arm/vp8dsp_init_arm.o
-ARMV6-OBJS-$(CONFIG_VP8_DECODER)       += arm/vp8_armv6.o               \
-                                          arm/vp8dsp_init_armv6.o       \
-                                          arm/vp8dsp_armv6.o
-
-OBJS-$(CONFIG_H264DSP)                 += arm/h264dsp_init_arm.o
-OBJS-$(CONFIG_H264PRED)                += arm/h264pred_init_arm.o
-
 OBJS-$(CONFIG_RV30_DECODER)            += arm/rv34dsp_init_arm.o
 OBJS-$(CONFIG_RV40_DECODER)            += arm/rv34dsp_init_arm.o        \
-                                          arm/rv40dsp_init_arm.o        \
-
+                                          arm/rv40dsp_init_arm.o
 OBJS-$(CONFIG_VIDEODSP)                += arm/videodsp_init_arm.o       \
 
-OBJS                                   += arm/dsputil_init_arm.o        \
-                                          arm/dsputil_arm.o             \
-                                          arm/fft_init_arm.o            \
-                                          arm/fft_fixed_init_arm.o      \
-                                          arm/fmtconvert_init_arm.o     \
-                                          arm/jrevdct_arm.o             \
-                                          arm/simple_idct_arm.o         \
-
+ARMV5TE-OBJS-$(CONFIG_DSPUTIL)         += arm/dsputil_init_armv5te.o    \
+                                          arm/simple_idct_armv5te.o
 ARMV5TE-OBJS-$(CONFIG_MPEGVIDEO)       += arm/mpegvideo_armv5te.o       \
-                                          arm/mpegvideo_armv5te_s.o     \
-
+                                          arm/mpegvideo_armv5te_s.o
 ARMV5TE-OBJS-$(CONFIG_VIDEODSP)        += arm/videodsp_init_armv5te.o   \
-                                          arm/videodsp_armv5te.o        \
-
-ARMV5TE-OBJS                           += arm/dsputil_init_armv5te.o    \
-                                          arm/simple_idct_armv5te.o     \
+                                          arm/videodsp_armv5te.o
 
-ARMV6-OBJS                             += arm/dsputil_init_armv6.o      \
+ARMV6-OBJS-$(CONFIG_DSPUTIL)           += arm/dsputil_init_armv6.o      \
                                           arm/dsputil_armv6.o           \
                                           arm/simple_idct_armv6.o       \
 
-VFP-OBJS-$(HAVE_ARMV6)                 += arm/fmtconvert_vfp.o
-
-VFP-OBJS                               += arm/dsputil_vfp.o             \
-                                          arm/dsputil_init_vfp.o        \
-
-NEON-OBJS-$(CONFIG_FFT)                += arm/fft_neon.o                \
-                                          arm/fft_fixed_neon.o          \
-
-NEON-OBJS-$(CONFIG_MDCT)               += arm/mdct_neon.o               \
-                                          arm/mdct_fixed_neon.o         \
+ARMV6-OBJS-$(CONFIG_AC3DSP)            += arm/ac3dsp_armv6.o
+ARMV6-OBJS-$(CONFIG_H264DSP)           += arm/h264dsp_armv6.o
+ARMV6-OBJS-$(CONFIG_HPELDSP)           += arm/hpeldsp_init_armv6.o      \
+                                          arm/hpeldsp_armv6.o
+ARMV6-OBJS-$(CONFIG_MPEGAUDIODSP)      += arm/mpegaudiodsp_fixed_armv6.o
+ARMV6-OBJS-$(CONFIG_VP8_DECODER)       += arm/vp8_armv6.o               \
+                                          arm/vp8dsp_init_armv6.o       \
+                                          arm/vp8dsp_armv6.o
 
-NEON-OBJS-$(CONFIG_RDFT)               += arm/rdft_neon.o               \
+VFP-OBJS                               += arm/fmtconvert_vfp.o
 
-NEON-OBJS-$(CONFIG_H264DSP)            += arm/h264dsp_neon.o            \
-                                          arm/h264idct_neon.o           \
-                                          arm/h264cmc_neon.o            \
+VFP-OBJS-$(CONFIG_DCA_DECODER)         += arm/dcadsp_vfp.o              \
+                                          arm/synth_filter_vfp.o
+VFP-OBJS-$(CONFIG_FFT)                 += arm/fft_vfp.o
+VFP-OBJS-$(CONFIG_MDCT)                += arm/mdct_vfp.o
+VFP-OBJS-$(HAVE_ARMV6)                 += arm/fmtconvert_vfp_armv6.o
 
-NEON-OBJS-$(CONFIG_H264PRED)           += arm/h264pred_neon.o           \
+NEON-OBJS                              += arm/fmtconvert_neon.o
 
 NEON-OBJS-$(CONFIG_AC3DSP)             += arm/ac3dsp_neon.o
-
-NEON-OBJS-$(CONFIG_AAC_DECODER)        += arm/sbrdsp_neon.o             \
-                                          arm/aacpsdsp_neon.o
-
+NEON-OBJS-$(CONFIG_AAC_DECODER)        += arm/aacpsdsp_neon.o           \
+                                          arm/sbrdsp_neon.o
 NEON-OBJS-$(CONFIG_DCA_DECODER)        += arm/dcadsp_neon.o             \
-                                          arm/synth_filter_neon.o       \
-
+                                          arm/synth_filter_neon.o
+NEON-OBJS-$(CONFIG_DSPUTIL)            += arm/dsputil_init_neon.o       \
+                                          arm/dsputil_neon.o            \
+                                          arm/int_neon.o                \
+                                          arm/simple_idct_neon.o
+NEON-OBJS-$(CONFIG_FFT)                += arm/fft_neon.o                \
+                                          arm/fft_fixed_neon.o
+NEON-OBJS-$(CONFIG_H264CHROMA)         += arm/h264cmc_neon.o
+NEON-OBJS-$(CONFIG_H264DSP)            += arm/h264dsp_neon.o            \
+                                          arm/h264idct_neon.o
+NEON-OBJS-$(CONFIG_H264PRED)           += arm/h264pred_neon.o
+NEON-OBJS-$(CONFIG_H264QPEL)           += arm/h264qpel_neon.o           \
+                                          arm/hpeldsp_neon.o
+NEON-OBJS-$(CONFIG_HPELDSP)            += arm/hpeldsp_init_neon.o       \
+                                          arm/hpeldsp_neon.o
+NEON-OBJS-$(CONFIG_MDCT)               += arm/mdct_neon.o               \
+                                          arm/mdct_fixed_neon.o
 NEON-OBJS-$(CONFIG_MPEGVIDEO)          += arm/mpegvideo_neon.o
+NEON-OBJS-$(CONFIG_RDFT)               += arm/rdft_neon.o
 NEON-OBJS-$(CONFIG_RV30_DECODER)       += arm/rv34dsp_neon.o
 NEON-OBJS-$(CONFIG_RV40_DECODER)       += arm/rv34dsp_neon.o            \
-                                          arm/rv40dsp_neon.o            \
-                                          arm/h264cmc_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_VP5_DECODER)        += arm/vp56dsp_neon.o            \
-
-NEON-OBJS-$(CONFIG_VP6_DECODER)        += arm/vp56dsp_neon.o            \
-
+NEON-OBJS-$(CONFIG_VP6_DECODER)        += arm/vp6dsp_neon.o
 NEON-OBJS-$(CONFIG_VP8_DECODER)        += arm/vp8dsp_init_neon.o        \
                                           arm/vp8dsp_neon.o
-
-NEON-OBJS                              += arm/dsputil_init_neon.o       \
-                                          arm/dsputil_neon.o            \
-                                          arm/fmtconvert_neon.o         \
-                                          arm/int_neon.o                \
-                                          arm/simple_idct_neon.o        \

libav-v9.6.tar.bz2/libavcodec/arm/ac3dsp_init_arm.c -> libav-v10.1.tar.bz2/libavcodec/arm/ac3dsp_init_arm.c Changed

libav-v9.6.tar.bz2/libavcodec/arm/ac3dsp_neon.S -> libav-v10.1.tar.bz2/libavcodec/arm/ac3dsp_neon.S Changed

libav-v9.6.tar.bz2/libavcodec/arm/dca.h -> libav-v10.1.tar.bz2/libavcodec/arm/dca.h Changed

@@ -22,16 +22,18 @@
 #define AVCODEC_ARM_DCA_H
 
 #include <stdint.h>
+
 #include "config.h"
-#include "libavutil/intmath.h"
+#include "libavcodec/dcadsp.h"
+#include "libavcodec/mathops.h"
 
 #if HAVE_ARMV6_INLINE && AV_GCC_VERSION_AT_LEAST(4,4)
 
 #define decode_blockcodes decode_blockcodes
 static inline int decode_blockcodes(int code1, int code2, int levels,
- int *values)
+ int32_t *values)
 {
- int v0, v1, v2, v3, v4, v5;
+ int32_t v0, v1, v2, v3, v4, v5;
 
 __asm__ ("smmul %8, %14, %18 \n"
 "smmul %11, %15, %18 \n"
@@ -82,7 +84,8 @@
 #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)
+static inline void int8x8_fmul_int32(av_unused DCADSPContext *dsp,
+ float *dst, const int8_t *src, int scale)
 {
 __asm__ ("vcvt.f32.s32 %2, %2, #4 \n"
 "vld1.8 {d0}, [%1,:64] \n"

libav-v9.6.tar.bz2/libavcodec/arm/dcadsp_init_arm.c -> libav-v10.1.tar.bz2/libavcodec/arm/dcadsp_init_arm.c Changed

@@ -24,13 +24,56 @@
 #include "libavutil/attributes.h"
 #include "libavcodec/dcadsp.h"
 
-void ff_dca_lfe_fir_neon(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,
+                          float scale);
+void ff_dca_lfe_fir1_neon(float *out, const float *in, const float *coefs,
+                          float scale);
+
+void ff_dca_lfe_fir32_vfp(float *out, const float *in, const float *coefs,
+                          float scale);
+void ff_dca_lfe_fir64_vfp(float *out, const float *in, const float *coefs,
+                          float scale);
+
+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_synth_filter_float_vfp(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);
+
+void ff_synth_filter_float_neon(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);
 
 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[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[0] = ff_dca_lfe_fir0_neon;
+        s->lfe_fir[1] = ff_dca_lfe_fir1_neon;
+    }
+}
+
+av_cold void ff_synth_filter_init_arm(SynthFilterContext *s)
+{
+    int cpu_flags = av_get_cpu_flags();
+
+    if (have_vfp(cpu_flags) && !have_vfpv3(cpu_flags))
+        s->synth_filter_float = ff_synth_filter_float_vfp;
     if (have_neon(cpu_flags))
-        s->lfe_fir = ff_dca_lfe_fir_neon;
+        s->synth_filter_float = ff_synth_filter_float_neon;
 }

libav-v9.6.tar.bz2/libavcodec/arm/dcadsp_neon.S -> libav-v10.1.tar.bz2/libavcodec/arm/dcadsp_neon.S Changed

@@ -20,17 +20,23 @@
 
 #include "libavutil/arm/asm.S"
 
-function ff_dca_lfe_fir_neon, export=1
+function ff_dca_lfe_fir0_neon, export=1
         push            {r4-r6,lr}
+NOVFP   vmov            s0,  r3                 @ scale
+        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}
+NOVFP   vmov            s0,  r3                 @ scale
+        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

libav-v10.1.tar.bz2/libavcodec/arm/dcadsp_vfp.S Added

@@ -0,0 +1,485 @@
+/*
+ * Copyright (c) 2013 RISC OS Open Ltd
+ * Author: Ben Avison <bavison@riscosopen.org>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/arm/asm.S"
+
+POUT .req a1
+PIN .req a2
+PCOEF .req a3
+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
+IN3 .req s7
+IN4 .req s0
+IN5 .req s1
+IN6 .req s2
+IN7 .req s3
+COEF0 .req s8 @ coefficient elements
+COEF1 .req s9
+COEF2 .req s10
+COEF3 .req s11
+COEF4 .req s12
+COEF5 .req s13
+COEF6 .req s14
+COEF7 .req s15
+ACCUM0 .req s16 @ double-buffered multiply-accumulate results
+ACCUM4 .req s20
+POST0 .req s24 @ do long-latency post-multiply in this vector in parallel
+POST1 .req s25
+POST2 .req s26
+POST3 .req s27
+
+
+.macro inner_loop decifactor, dir, tail, head
+ .ifc "\dir","up"
+ .set X, 0
+ .set Y, 4
+ .else
+ .set X, 4*JMAX*4 - 4
+ .set Y, -4
+ .endif
+ .ifnc "\head",""
+ vldr COEF0, [PCOEF, #X + (0*JMAX + 0) * Y]
+ vldr COEF1, [PCOEF, #X + (1*JMAX + 0) * Y]
+ vldr COEF2, [PCOEF, #X + (2*JMAX + 0) * Y]
+ vldr COEF3, [PCOEF, #X + (3*JMAX + 0) * Y]
+ .endif
+ .ifnc "\tail",""
+ vadd.f POST0, ACCUM0, ACCUM4 @ vector operation
+ .endif
+ .ifnc "\head",""
+ vmul.f ACCUM0, COEF0, IN0 @ vector = vector * scalar
+ vldr COEF4, [PCOEF, #X + (0*JMAX + 1) * Y]
+ 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",""
+ vmul.f ACCUM4, COEF4, IN1 @ vector operation
+ .endif
+ vldr COEF0, [PCOEF, #X + (0*JMAX + 2) * Y]
+ vldr COEF1, [PCOEF, #X + (1*JMAX + 2) * Y]
+ .ifnc "\tail",""
+ vmul.f ACCUM4, COEF4, IN1 @ vector operation
+ .endif
+ vldr COEF2, [PCOEF, #X + (2*JMAX + 2) * Y]
+ vldr COEF3, [PCOEF, #X + (3*JMAX + 2) * Y]
+ .endif
+ .ifnc "\tail",""
+ vstmia POUT!, {POST0-POST3}
+ .endif
+ .ifnc "\head",""
+ vmla.f ACCUM0, COEF0, IN2 @ vector = vector * scalar
+ vldr COEF4, [PCOEF, #X + (0*JMAX + 3) * Y]
+ vldr COEF5, [PCOEF, #X + (1*JMAX + 3) * Y]
+ vldr COEF6, [PCOEF, #X + (2*JMAX + 3) * Y]
+ vldr COEF7, [PCOEF, #X + (3*JMAX + 3) * Y]
+ vmla.f ACCUM4, COEF4, IN3 @ vector = vector * scalar
+ .if \decifactor == 32
+ vldr COEF0, [PCOEF, #X + (0*JMAX + 4) * Y]
+ vldr COEF1, [PCOEF, #X + (1*JMAX + 4) * Y]
+ vldr COEF2, [PCOEF, #X + (2*JMAX + 4) * Y]
+ vldr COEF3, [PCOEF, #X + (3*JMAX + 4) * Y]
+ vmla.f ACCUM0, COEF0, IN4 @ vector = vector * scalar
+ vldr COEF4, [PCOEF, #X + (0*JMAX + 5) * Y]
+ vldr COEF5, [PCOEF, #X + (1*JMAX + 5) * Y]
+ vldr COEF6, [PCOEF, #X + (2*JMAX + 5) * Y]
+ vldr COEF7, [PCOEF, #X + (3*JMAX + 5) * Y]
+ vmla.f ACCUM4, COEF4, IN5 @ vector = vector * scalar
+ vldr COEF0, [PCOEF, #X + (0*JMAX + 6) * Y]
+ vldr COEF1, [PCOEF, #X + (1*JMAX + 6) * Y]
+ vldr COEF2, [PCOEF, #X + (2*JMAX + 6) * Y]
+ vldr COEF3, [PCOEF, #X + (3*JMAX + 6) * Y]
+ vmla.f ACCUM0, COEF0, IN6 @ vector = vector * scalar
+ vldr COEF4, [PCOEF, #X + (0*JMAX + 7) * Y]
+ vldr COEF5, [PCOEF, #X + (1*JMAX + 7) * Y]
+ vldr COEF6, [PCOEF, #X + (2*JMAX + 7) * Y]
+ vldr COEF7, [PCOEF, #X + (3*JMAX + 7) * Y]
+ vmla.f ACCUM4, COEF4, IN7 @ vector = vector * scalar
+ .endif
+ .endif
+.endm
+
+.macro dca_lfe_fir decifactor
+function ff_dca_lfe_fir\decifactor\()_vfp, export=1
+NOVFP vmov s0, r3
+ 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]
+ vldr IN7, [PIN, #-7*4]
+ .else
+ .set JMAX, 4
+ vpush {s16-s27}
+ .endif
+
+ mov COUNTER, #\decifactor/4 - 1
+ inner_loop \decifactor, up,, head
+1: add PCOEF, PCOEF, #4*JMAX*4
+ subs COUNTER, COUNTER, #1
+ inner_loop \decifactor, up, tail, head
+ bne 1b
+ inner_loop \decifactor, up, tail
+
+ mov COUNTER, #\decifactor/4 - 1
+ inner_loop \decifactor, down,, head
+1: sub PCOEF, PCOEF, #4*JMAX*4
+ subs COUNTER, COUNTER, #1
+ inner_loop \decifactor, down, tail, head
+ bne 1b
+ inner_loop \decifactor, down, tail
+
+ .if \decifactor == 32
+ vpop {s16-s31}
+ .else
+ vpop {s16-s27}
+ .endif
+ fmxr FPSCR, OLDFPSCR
+ bx lr
+endfunc
+.endm
+
+ dca_lfe_fir 64
+ .ltorg
+ dca_lfe_fir 32
+
+ .unreq POUT
+ .unreq PIN
+ .unreq PCOEF
+ .unreq OLDFPSCR
+ .unreq COUNTER
+
+ .unreq SCALE32
+ .unreq SCALE64
+ .unreq IN0
+ .unreq IN1
+ .unreq IN2
+ .unreq IN3
+ .unreq IN4
+ .unreq IN5
+ .unreq IN6
+ .unreq IN7
+ .unreq COEF0
+ .unreq COEF1
+ .unreq COEF2
+ .unreq COEF3
+ .unreq COEF4
+ .unreq COEF5
+ .unreq COEF6
+ .unreq COEF7
+ .unreq ACCUM0
+ .unreq ACCUM4
+ .unreq POST0
+ .unreq POST1
+ .unreq POST2
+ .unreq POST3
+
+
+IN .req a1
+SBACT .req a2
+OLDFPSCR .req a3
+IMDCT .req a4
+WINDOW .req v1
+OUT .req v2
+BUF .req v3
+SCALEINT .req v4 @ only used in softfp case
+COUNT .req v5
+
+SCALE .req s0
+
+/* Stack layout differs in softfp and hardfp cases:
+ *
+ * hardfp
+ * fp -> 6 arg words saved by caller
+ * a3,a4,v1-v3,v5,fp,lr on entry (a3 just to pad to 8 bytes)
+ * s16-s23 on entry
+ * align 16
+ * buf -> 8*32*4 bytes buffer
+ * s0 on entry
+ * sp -> 3 arg words for callee
+ *
+ * softfp
+ * fp -> 7 arg words saved by caller
+ * a4,v1-v5,fp,lr on entry
+ * s16-s23 on entry
+ * align 16
+ * buf -> 8*32*4 bytes buffer
+ * sp -> 4 arg words for callee
+ */
+
+/* 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);
+ */
+function ff_dca_qmf_32_subbands_vfp, export=1
+VFP push {a3-a4,v1-v3,v5,fp,lr}
+NOVFP push {a4,v1-v5,fp,lr}
+ add fp, sp, #8*4
+ vpush {s16-s23}
+ @ The buffer pointed at by raXin isn't big enough for us to do a
+ @ complete matrix transposition as we want to, so allocate an
+ @ alternative buffer from the stack. Align to 4 words for speed.
+ sub BUF, sp, #8*32*4
+ bic BUF, BUF, #15
+ mov sp, BUF
+ ldr lr, =0x03330000 @ RunFast mode, short vectors of length 4, stride 2
+ fmrx OLDFPSCR, FPSCR
+ fmxr FPSCR, lr
+ @ COUNT is used to count down 2 things at once:
+ @ bits 0-4 are the number of word pairs remaining in the output row
+ @ bits 5-31 are the number of words to copy (with possible negation)
+ @ from the source matrix before we start zeroing the remainder
+ mov COUNT, #(-4 << 5) + 16
+ adds COUNT, COUNT, SBACT, lsl #5
+ bmi 2f
+1:
+ vldr s8, [IN, #(0*8+0)*4]
+ vldr s10, [IN, #(0*8+1)*4]
+ vldr s12, [IN, #(0*8+2)*4]
+ vldr s14, [IN, #(0*8+3)*4]
+ vldr s16, [IN, #(0*8+4)*4]
+ vldr s18, [IN, #(0*8+5)*4]
+ vldr s20, [IN, #(0*8+6)*4]
+ vldr s22, [IN, #(0*8+7)*4]
+ vneg.f s8, s8
+ vldr s9, [IN, #(1*8+0)*4]
+ vldr s11, [IN, #(1*8+1)*4]
+ vldr s13, [IN, #(1*8+2)*4]
+ vldr s15, [IN, #(1*8+3)*4]
+ vneg.f s16, s16
+ vldr s17, [IN, #(1*8+4)*4]
+ vldr s19, [IN, #(1*8+5)*4]
+ vldr s21, [IN, #(1*8+6)*4]
+ vldr s23, [IN, #(1*8+7)*4]
+ vstr d4, [BUF, #(0*32+0)*4]
+ vstr d5, [BUF, #(1*32+0)*4]
+ vstr d6, [BUF, #(2*32+0)*4]
+ vstr d7, [BUF, #(3*32+0)*4]
+ vstr d8, [BUF, #(4*32+0)*4]
+ vstr d9, [BUF, #(5*32+0)*4]
+ vstr d10, [BUF, #(6*32+0)*4]
+ vstr d11, [BUF, #(7*32+0)*4]
+ vldr s9, [IN, #(3*8+0)*4]
+ vldr s11, [IN, #(3*8+1)*4]
+ vldr s13, [IN, #(3*8+2)*4]
+ vldr s15, [IN, #(3*8+3)*4]
+ vldr s17, [IN, #(3*8+4)*4]
+ vldr s19, [IN, #(3*8+5)*4]
+ vldr s21, [IN, #(3*8+6)*4]
+ vldr s23, [IN, #(3*8+7)*4]
+ vneg.f s9, s9
+ vldr s8, [IN, #(2*8+0)*4]
+ vldr s10, [IN, #(2*8+1)*4]
+ vldr s12, [IN, #(2*8+2)*4]
+ vldr s14, [IN, #(2*8+3)*4]
+ vneg.f s17, s17
+ vldr s16, [IN, #(2*8+4)*4]
+ vldr s18, [IN, #(2*8+5)*4]
+ vldr s20, [IN, #(2*8+6)*4]
+ vldr s22, [IN, #(2*8+7)*4]
+ vstr d4, [BUF, #(0*32+2)*4]
+ vstr d5, [BUF, #(1*32+2)*4]
+ vstr d6, [BUF, #(2*32+2)*4]
+ vstr d7, [BUF, #(3*32+2)*4]
+ vstr d8, [BUF, #(4*32+2)*4]
+ vstr d9, [BUF, #(5*32+2)*4]
+ vstr d10, [BUF, #(6*32+2)*4]
+ vstr d11, [BUF, #(7*32+2)*4]
+ add IN, IN, #4*8*4
+ add BUF, BUF, #4*4
+ subs COUNT, COUNT, #(4 << 5) + 2
+ bpl 1b
+2: @ Now deal with trailing < 4 samples
+ adds COUNT, COUNT, #3 << 5
+ bmi 4f @ sb_act was a multiple of 4
+ bics lr, COUNT, #0x1F
+ bne 3f
+ @ sb_act was n*4+1
+ vldr s8, [IN, #(0*8+0)*4]
+ vldr s10, [IN, #(0*8+1)*4]
+ vldr s12, [IN, #(0*8+2)*4]
+ vldr s14, [IN, #(0*8+3)*4]
+ vldr s16, [IN, #(0*8+4)*4]
+ vldr s18, [IN, #(0*8+5)*4]
+ vldr s20, [IN, #(0*8+6)*4]
+ vldr s22, [IN, #(0*8+7)*4]
+ vneg.f s8, s8
+ vldr s9, zero
+ vldr s11, zero
+ vldr s13, zero
+ vldr s15, zero
+ vneg.f s16, s16
+ vldr s17, zero
+ vldr s19, zero
+ vldr s21, zero
+ vldr s23, zero
+ vstr d4, [BUF, #(0*32+0)*4]
+ vstr d5, [BUF, #(1*32+0)*4]
+ vstr d6, [BUF, #(2*32+0)*4]
+ vstr d7, [BUF, #(3*32+0)*4]
+ vstr d8, [BUF, #(4*32+0)*4]
+ vstr d9, [BUF, #(5*32+0)*4]
+ vstr d10, [BUF, #(6*32+0)*4]
+ vstr d11, [BUF, #(7*32+0)*4]
+ add BUF, BUF, #2*4
+ sub COUNT, COUNT, #1
+ b 4f
+3: @ sb_act was n*4+2 or n*4+3, so do the first 2
+ vldr s8, [IN, #(0*8+0)*4]
+ vldr s10, [IN, #(0*8+1)*4]
+ vldr s12, [IN, #(0*8+2)*4]
+ vldr s14, [IN, #(0*8+3)*4]
+ vldr s16, [IN, #(0*8+4)*4]
+ vldr s18, [IN, #(0*8+5)*4]
+ vldr s20, [IN, #(0*8+6)*4]
+ vldr s22, [IN, #(0*8+7)*4]
+ vneg.f s8, s8
+ vldr s9, [IN, #(1*8+0)*4]
+ vldr s11, [IN, #(1*8+1)*4]
+ vldr s13, [IN, #(1*8+2)*4]
+ vldr s15, [IN, #(1*8+3)*4]
+ vneg.f s16, s16
+ vldr s17, [IN, #(1*8+4)*4]
+ vldr s19, [IN, #(1*8+5)*4]
+ vldr s21, [IN, #(1*8+6)*4]
+ vldr s23, [IN, #(1*8+7)*4]
+ vstr d4, [BUF, #(0*32+0)*4]
+ vstr d5, [BUF, #(1*32+0)*4]
+ vstr d6, [BUF, #(2*32+0)*4]
+ vstr d7, [BUF, #(3*32+0)*4]
+ vstr d8, [BUF, #(4*32+0)*4]
+ vstr d9, [BUF, #(5*32+0)*4]
+ vstr d10, [BUF, #(6*32+0)*4]
+ vstr d11, [BUF, #(7*32+0)*4]
+ add BUF, BUF, #2*4
+ sub COUNT, COUNT, #(2 << 5) + 1
+ bics lr, COUNT, #0x1F
+ bne 4f
+ @ sb_act was n*4+3
+ vldr s8, [IN, #(2*8+0)*4]
+ vldr s10, [IN, #(2*8+1)*4]
+ vldr s12, [IN, #(2*8+2)*4]
+ vldr s14, [IN, #(2*8+3)*4]
+ vldr s16, [IN, #(2*8+4)*4]
+ vldr s18, [IN, #(2*8+5)*4]
+ vldr s20, [IN, #(2*8+6)*4]
+ vldr s22, [IN, #(2*8+7)*4]
+ vldr s9, zero
+ vldr s11, zero
+ vldr s13, zero
+ vldr s15, zero
+ vldr s17, zero
+ vldr s19, zero
+ vldr s21, zero
+ vldr s23, zero
+ vstr d4, [BUF, #(0*32+0)*4]
+ vstr d5, [BUF, #(1*32+0)*4]
+ vstr d6, [BUF, #(2*32+0)*4]
+ vstr d7, [BUF, #(3*32+0)*4]
+ vstr d8, [BUF, #(4*32+0)*4]
+ vstr d9, [BUF, #(5*32+0)*4]
+ vstr d10, [BUF, #(6*32+0)*4]
+ vstr d11, [BUF, #(7*32+0)*4]
+ add BUF, BUF, #2*4
+ sub COUNT, COUNT, #1
+4: @ Now fill the remainder with 0
+ vldr s8, zero
+ vldr s9, zero
+ ands COUNT, COUNT, #0x1F
+ beq 6f
+5: vstr d4, [BUF, #(0*32+0)*4]
+ vstr d4, [BUF, #(1*32+0)*4]
+ vstr d4, [BUF, #(2*32+0)*4]
+ vstr d4, [BUF, #(3*32+0)*4]
+ vstr d4, [BUF, #(4*32+0)*4]
+ vstr d4, [BUF, #(5*32+0)*4]
+ vstr d4, [BUF, #(6*32+0)*4]
+ vstr d4, [BUF, #(7*32+0)*4]
+ add BUF, BUF, #2*4
+ subs COUNT, COUNT, #1
+ bne 5b
+6:
+ fmxr FPSCR, OLDFPSCR
+ ldr WINDOW, [fp, #3*4]
+ ldr OUT, [fp, #4*4]
+ sub BUF, BUF, #32*4
+NOVFP ldr SCALEINT, [fp, #6*4]
+ mov COUNT, #8
+VFP vpush {SCALE}
+VFP sub sp, sp, #3*4
+NOVFP sub sp, sp, #4*4
+7:
+VFP ldr a1, [fp, #-7*4] @ imdct
+NOVFP ldr a1, [fp, #-8*4]
+ ldmia fp, {a2-a4}
+VFP stmia sp, {WINDOW, OUT, BUF}
+NOVFP stmia sp, {WINDOW, OUT, BUF, SCALEINT}
+VFP vldr SCALE, [sp, #3*4]
+ bl X(ff_synth_filter_float_vfp)
+ add OUT, OUT, #32*4
+ add BUF, BUF, #32*4
+ subs COUNT, COUNT, #1
+ bne 7b
+
+A sub sp, fp, #(8+8)*4
+T sub fp, fp, #(8+8)*4
+T mov sp, fp
+ vpop {s16-s23}
+VFP pop {a3-a4,v1-v3,v5,fp,pc}
+NOVFP pop {a4,v1-v5,fp,pc}
+endfunc
+
+ .unreq IN
+ .unreq SBACT
+ .unreq OLDFPSCR
+ .unreq IMDCT
+ .unreq WINDOW
+ .unreq OUT
+ .unreq BUF
+ .unreq SCALEINT
+ .unreq COUNT
+
+ .unreq SCALE
+
+ .align 2
+zero: .word 0

libav-v9.6.tar.bz2/libavcodec/arm/dsputil_arm.S -> libav-v10.1.tar.bz2/libavcodec/arm/dsputil_arm.S Changed

@@ -22,597 +22,8 @@
 #include "config.h"
 #include "libavutil/arm/asm.S"
 
-#if !HAVE_ARMV5TE_EXTERNAL
-#define pld @
-#endif
-
-.macro  ALIGN_QWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4
-        mov             \Rd0, \Rn0, lsr #(\shift * 8)
-        mov             \Rd1, \Rn1, lsr #(\shift * 8)
-        mov             \Rd2, \Rn2, lsr #(\shift * 8)
-        mov             \Rd3, \Rn3, lsr #(\shift * 8)
-        orr             \Rd0, \Rd0, \Rn1, lsl #(32 - \shift * 8)
-        orr             \Rd1, \Rd1, \Rn2, lsl #(32 - \shift * 8)
-        orr             \Rd2, \Rd2, \Rn3, lsl #(32 - \shift * 8)
-        orr             \Rd3, \Rd3, \Rn4, lsl #(32 - \shift * 8)
-.endm
-.macro  ALIGN_DWORD shift, R0, R1, R2
-        mov             \R0, \R0, lsr #(\shift * 8)
-        orr             \R0, \R0, \R1, lsl #(32 - \shift * 8)
-        mov             \R1, \R1, lsr #(\shift * 8)
-        orr             \R1, \R1, \R2, lsl #(32 - \shift * 8)
-.endm
-.macro  ALIGN_DWORD_D shift, Rdst0, Rdst1, Rsrc0, Rsrc1, Rsrc2
-        mov             \Rdst0, \Rsrc0, lsr #(\shift * 8)
-        mov             \Rdst1, \Rsrc1, lsr #(\shift * 8)
-        orr             \Rdst0, \Rdst0, \Rsrc1, lsl #(32 - (\shift * 8))
-        orr             \Rdst1, \Rdst1, \Rsrc2, lsl #(32 - (\shift * 8))
-.endm
-
-.macro  RND_AVG32 Rd0, Rd1, Rn0, Rn1, Rm0, Rm1, Rmask
-        @ Rd = (Rn | Rm) - (((Rn ^ Rm) & ~0x01010101) >> 1)
-        @ Rmask = 0xFEFEFEFE
-        @ Rn = destroy
-        eor             \Rd0, \Rn0, \Rm0
-        eor             \Rd1, \Rn1, \Rm1
-        orr             \Rn0, \Rn0, \Rm0
-        orr             \Rn1, \Rn1, \Rm1
-        and             \Rd0, \Rd0, \Rmask
-        and             \Rd1, \Rd1, \Rmask
-        sub             \Rd0, \Rn0, \Rd0, lsr #1
-        sub             \Rd1, \Rn1, \Rd1, lsr #1
-.endm
-
-.macro  NO_RND_AVG32 Rd0, Rd1, Rn0, Rn1, Rm0, Rm1, Rmask
-        @ Rd = (Rn & Rm) - (((Rn ^ Rm) & ~0x01010101) >> 1)
-        @ Rmask = 0xFEFEFEFE
-        @ Rn = destroy
-        eor             \Rd0, \Rn0, \Rm0
-        eor             \Rd1, \Rn1, \Rm1
-        and             \Rn0, \Rn0, \Rm0
-        and             \Rn1, \Rn1, \Rm1
-        and             \Rd0, \Rd0, \Rmask
-        and             \Rd1, \Rd1, \Rmask
-        add             \Rd0, \Rn0, \Rd0, lsr #1
-        add             \Rd1, \Rn1, \Rd1, lsr #1
-.endm
-
-.macro  JMP_ALIGN tmp, reg
-        ands            \tmp, \reg, #3
-        bic             \reg, \reg, #3
-        beq             1f
-        subs            \tmp, \tmp, #1
-        beq             2f
-        subs            \tmp, \tmp, #1
-        beq             3f
-        b    4f
-.endm
-
-@ ----------------------------------------------------------------
-        .align 5
-function ff_put_pixels16_arm, export=1
-        @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-        @ block = word aligned, pixles = unaligned
-        pld             [r1]
-        push            {r4-r11, lr}
-        JMP_ALIGN       r5,  r1
-1:
-        ldm             r1,  {r4-r7}
-        add             r1,  r1,  r2
-        stm             r0,  {r4-r7}
-        pld             [r1]
-        subs            r3,  r3,  #1
-        add             r0,  r0,  r2
-        bne             1b
-        pop             {r4-r11, pc}
-        .align 5
-2:
-        ldm             r1,  {r4-r8}
-        add             r1,  r1,  r2
-        ALIGN_QWORD_D   1,   r9,  r10, r11, r12, r4,  r5,  r6,  r7,  r8
-        pld             [r1]
-        subs            r3,  r3,  #1
-        stm             r0,  {r9-r12}
-        add             r0,  r0,  r2
-        bne             2b
-        pop             {r4-r11, pc}
-        .align 5
-3:
-        ldm             r1,  {r4-r8}
-        add             r1,  r1,  r2
-        ALIGN_QWORD_D   2,   r9,  r10, r11, r12, r4,  r5,  r6,  r7,  r8
-        pld             [r1]
-        subs            r3,  r3,  #1
-        stm             r0,  {r9-r12}
-        add             r0,  r0,  r2
-        bne             3b
-        pop             {r4-r11, pc}
-        .align 5
-4:
-        ldm             r1,  {r4-r8}
-        add             r1,  r1,  r2
-        ALIGN_QWORD_D   3,   r9,  r10, r11, r12, r4,  r5,  r6,  r7,  r8
-        pld             [r1]
-        subs            r3,  r3,  #1
-        stm             r0,  {r9-r12}
-        add             r0,  r0,  r2
-        bne             4b
-        pop             {r4-r11,pc}
-endfunc
-
-@ ----------------------------------------------------------------
-        .align 5
-function ff_put_pixels8_arm, export=1
-        @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-        @ block = word aligned, pixles = unaligned
-        pld             [r1]
-        push            {r4-r5,lr}
-        JMP_ALIGN       r5,  r1
-1:
-        ldm             r1,  {r4-r5}
-        add             r1,  r1,  r2
-        subs            r3,  r3,  #1
-        pld             [r1]
-        stm             r0,  {r4-r5}
-        add             r0,  r0,  r2
-        bne             1b
-        pop             {r4-r5,pc}
-        .align 5
-2:
-        ldm             r1,  {r4-r5, r12}
-        add             r1,  r1,  r2
-        ALIGN_DWORD     1,   r4,  r5,  r12
-        pld             [r1]
-        subs            r3,  r3,  #1
-        stm             r0,  {r4-r5}
-        add             r0,  r0,  r2
-        bne             2b
-        pop             {r4-r5,pc}
-        .align 5
-3:
-        ldm             r1,  {r4-r5, r12}
-        add             r1,  r1,  r2
-        ALIGN_DWORD     2,   r4,  r5,  r12
-        pld             [r1]
-        subs            r3,  r3,  #1
-        stm             r0,  {r4-r5}
-        add             r0,  r0,  r2
-        bne             3b
-        pop             {r4-r5,pc}
-        .align 5
-4:
-        ldm             r1,  {r4-r5, r12}
-        add             r1,  r1,  r2
-        ALIGN_DWORD     3,   r4,  r5,  r12
-        pld             [r1]
-        subs            r3,  r3,  #1
-        stm             r0,  {r4-r5}
-        add             r0,  r0,  r2
-        bne             4b
-        pop             {r4-r5,pc}
-endfunc
-
-@ ----------------------------------------------------------------
-        .align 5
-function ff_put_pixels8_x2_arm, export=1
-        @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-        @ block = word aligned, pixles = unaligned
-        pld             [r1]
-        push            {r4-r10,lr}
-        ldr             r12, =0xfefefefe
-        JMP_ALIGN       r5,  r1
-1:
-        ldm             r1,  {r4-r5, r10}
-        add             r1,  r1,  r2
-        ALIGN_DWORD_D   1,   r6,  r7,  r4,  r5,  r10
-        pld             [r1]
-        RND_AVG32       r8,  r9,  r4,  r5,  r6,  r7,  r12
-        subs            r3,  r3,  #1
-        stm             r0,  {r8-r9}
-        add             r0,  r0,  r2
-        bne             1b
-        pop             {r4-r10,pc}
-        .align 5
-2:
-        ldm             r1,  {r4-r5, r10}
-        add             r1,  r1,  r2
-        ALIGN_DWORD_D   1,   r6,  r7,  r4,  r5,  r10
-        ALIGN_DWORD_D   2,   r8,  r9,  r4,  r5,  r10
-        pld             [r1]
-        RND_AVG32       r4,  r5,  r6,  r7,  r8,  r9,  r12
-        subs            r3,  r3,  #1
-        stm             r0,  {r4-r5}
-        add             r0,  r0,  r2
-        bne             2b
-        pop             {r4-r10,pc}
-        .align 5
-3:
-        ldm             r1,  {r4-r5, r10}
-        add             r1,  r1,  r2
-        ALIGN_DWORD_D   2,   r6,  r7,  r4,  r5,  r10
-        ALIGN_DWORD_D   3,   r8,  r9,  r4,  r5,  r10
-        pld             [r1]
-        RND_AVG32       r4,  r5,  r6,  r7,  r8,  r9,  r12
-        subs            r3,  r3,  #1
-        stm             r0,  {r4-r5}
-        add             r0,  r0,  r2
-        bne             3b
-        pop             {r4-r10,pc}
-        .align 5
-4:
-        ldm             r1,  {r4-r5, r10}
-        add             r1,  r1,  r2
-        ALIGN_DWORD_D   3,   r6,  r7,  r4,  r5,  r10
-        pld             [r1]
-        RND_AVG32       r8,  r9,  r6,  r7,  r5,  r10, r12
-        subs            r3,  r3,  #1
-        stm             r0,  {r8-r9}
-        add             r0,  r0,  r2
-        bne             4b
-        pop             {r4-r10,pc}
-endfunc
-
-        .align 5
-function ff_put_no_rnd_pixels8_x2_arm, export=1
-        @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-        @ block = word aligned, pixles = unaligned
-        pld             [r1]
-        push            {r4-r10,lr}
-        ldr             r12, =0xfefefefe
-        JMP_ALIGN       r5,  r1
-1:
-        ldm             r1,  {r4-r5, r10}
-        add             r1,  r1,  r2
-        ALIGN_DWORD_D   1,   r6,  r7,  r4,  r5,  r10
-        pld             [r1]
-        NO_RND_AVG32    r8,  r9,  r4,  r5,  r6,  r7,  r12
-        subs            r3,  r3,  #1
-        stm             r0,  {r8-r9}
-        add             r0,  r0,  r2
-        bne             1b
-        pop             {r4-r10,pc}
-        .align 5
-2:
-        ldm             r1,  {r4-r5, r10}
-        add             r1,  r1,  r2
-        ALIGN_DWORD_D   1,   r6,  r7,  r4,  r5,  r10
-        ALIGN_DWORD_D   2,   r8,  r9,  r4,  r5,  r10
-        pld             [r1]
-        NO_RND_AVG32    r4,  r5,  r6,  r7,  r8,  r9,  r12
-        subs            r3,  r3,  #1
-        stm             r0,  {r4-r5}
-        add             r0,  r0,  r2
-        bne             2b
-        pop             {r4-r10,pc}
-        .align 5
-3:
-        ldm             r1,  {r4-r5, r10}
-        add             r1,  r1,  r2
-        ALIGN_DWORD_D   2,   r6,  r7,  r4,  r5,  r10
-        ALIGN_DWORD_D   3,   r8,  r9,  r4,  r5,  r10
-        pld             [r1]
-        NO_RND_AVG32    r4,  r5,  r6,  r7,  r8,  r9,  r12
-        subs            r3,  r3,  #1
-        stm             r0,  {r4-r5}
-        add             r0,  r0,  r2
-        bne             3b
-        pop             {r4-r10,pc}
-        .align 5
-4:
-        ldm             r1,  {r4-r5, r10}
-        add             r1,  r1,  r2
-        ALIGN_DWORD_D   3,   r6,  r7,  r4,  r5,  r10
-        pld             [r1]
-        NO_RND_AVG32    r8,  r9,  r6,  r7,  r5,  r10, r12
-        subs            r3,  r3,  #1
-        stm             r0,  {r8-r9}
-        add             r0,  r0,  r2
-        bne             4b
-        pop             {r4-r10,pc}
-endfunc
-
-
-@ ----------------------------------------------------------------
-        .align 5
-function ff_put_pixels8_y2_arm, export=1
-        @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-        @ block = word aligned, pixles = unaligned
-        pld             [r1]
-        push            {r4-r11,lr}
-        mov             r3,  r3,  lsr #1
-        ldr             r12, =0xfefefefe
-        JMP_ALIGN       r5,  r1
-1:
-        ldm             r1,  {r4-r5}
-        add             r1,  r1,  r2
-6:      ldm             r1,  {r6-r7}
-        add             r1,  r1,  r2
-        pld             [r1]
-        RND_AVG32       r8,  r9,  r4,  r5,  r6,  r7,  r12
-        ldm             r1,  {r4-r5}
-        add             r1,  r1,  r2
-        stm             r0,  {r8-r9}
-        add             r0,  r0,  r2
-        pld             [r1]
-        RND_AVG32       r8,  r9,  r6,  r7,  r4,  r5,  r12
-        subs            r3,  r3,  #1
-        stm             r0,  {r8-r9}
-        add             r0,  r0,  r2
-        bne             6b
-        pop             {r4-r11,pc}
-        .align 5
-2:
-        ldm             r1,  {r4-r6}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     1,   r4,  r5,  r6
-6:      ldm             r1,  {r7-r9}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     1,   r7,  r8,  r9
-        RND_AVG32       r10, r11, r4,  r5,  r7,  r8,  r12
-        stm             r0,  {r10-r11}
-        add             r0,  r0,  r2
-        ldm             r1,  {r4-r6}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     1,   r4,  r5,  r6
-        subs            r3,  r3,  #1
-        RND_AVG32       r10, r11, r7,  r8,  r4,  r5,  r12
-        stm             r0,  {r10-r11}
-        add             r0,  r0,  r2
-        bne             6b
-        pop             {r4-r11,pc}
-        .align 5
-3:
-        ldm             r1,  {r4-r6}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     2,   r4,  r5,  r6
-6:      ldm             r1,  {r7-r9}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     2,   r7,  r8,  r9
-        RND_AVG32       r10, r11, r4,  r5,  r7,  r8,  r12
-        stm             r0,  {r10-r11}
-        add             r0,  r0,  r2
-        ldm             r1,  {r4-r6}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     2,   r4,  r5,  r6
-        subs            r3,  r3,  #1
-        RND_AVG32       r10, r11, r7,  r8,  r4,  r5,  r12
-        stm             r0,  {r10-r11}
-        add             r0,  r0,  r2
-        bne             6b
-        pop             {r4-r11,pc}
-        .align 5
-4:
-        ldm             r1,  {r4-r6}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     3,   r4,  r5,  r6
-6:      ldm             r1,  {r7-r9}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     3,   r7,  r8,  r9
-        RND_AVG32       r10, r11, r4,  r5,  r7,  r8,  r12
-        stm             r0,  {r10-r11}
-        add             r0,  r0,  r2
-        ldm             r1,  {r4-r6}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     3,   r4,  r5,  r6
-        subs            r3,  r3,  #1
-        RND_AVG32       r10, r11, r7,  r8,  r4,  r5,  r12
-        stm             r0,  {r10-r11}
-        add             r0,  r0,  r2
-        bne             6b
-        pop             {r4-r11,pc}
-endfunc
-
-        .align 5
-function ff_put_no_rnd_pixels8_y2_arm, export=1
-        @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-        @ block = word aligned, pixles = unaligned
-        pld             [r1]
-        push            {r4-r11,lr}
-        mov             r3,  r3,  lsr #1
-        ldr             r12, =0xfefefefe
-        JMP_ALIGN       r5,  r1
-1:
-        ldm             r1,  {r4-r5}
-        add             r1,  r1,  r2
-6:      ldm             r1,  {r6-r7}
-        add             r1,  r1,  r2
-        pld             [r1]
-        NO_RND_AVG32    r8,  r9,  r4,  r5,  r6,  r7,  r12
-        ldm             r1,  {r4-r5}
-        add             r1,  r1,  r2
-        stm             r0,  {r8-r9}
-        add             r0,  r0,  r2
-        pld             [r1]
-        NO_RND_AVG32    r8,  r9,  r6,  r7,  r4,  r5,  r12
-        subs            r3,  r3,  #1
-        stm             r0,  {r8-r9}
-        add             r0,  r0,  r2
-        bne             6b
-        pop             {r4-r11,pc}
-        .align 5
-2:
-        ldm             r1,  {r4-r6}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     1,   r4,  r5,  r6
-6:      ldm             r1,  {r7-r9}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     1,   r7,  r8,  r9
-        NO_RND_AVG32    r10, r11, r4,  r5,  r7,  r8,  r12
-        stm             r0,  {r10-r11}
-        add             r0,  r0,  r2
-        ldm             r1,  {r4-r6}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     1,   r4,  r5,  r6
-        subs            r3,  r3,  #1
-        NO_RND_AVG32    r10, r11, r7,  r8,  r4,  r5,  r12
-        stm             r0,  {r10-r11}
-        add             r0,  r0,  r2
-        bne             6b
-        pop             {r4-r11,pc}
-        .align 5
-3:
-        ldm             r1,  {r4-r6}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     2,   r4,  r5,  r6
-6:      ldm             r1,  {r7-r9}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     2,   r7,  r8,  r9
-        NO_RND_AVG32    r10, r11, r4,  r5,  r7,  r8,  r12
-        stm             r0,  {r10-r11}
-        add             r0,  r0,  r2
-        ldm             r1,  {r4-r6}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     2,   r4,  r5,  r6
-        subs            r3,  r3,  #1
-        NO_RND_AVG32    r10, r11, r7,  r8,  r4,  r5,  r12
-        stm             r0,  {r10-r11}
-        add             r0,  r0,  r2
-        bne             6b
-        pop             {r4-r11,pc}
-        .align 5
-4:
-        ldm             r1,  {r4-r6}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     3,   r4,  r5,  r6
-6:      ldm             r1,  {r7-r9}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     3,   r7,  r8,  r9
-        NO_RND_AVG32    r10, r11, r4,  r5,  r7,  r8,  r12
-        stm             r0,  {r10-r11}
-        add             r0,  r0,  r2
-        ldm             r1,  {r4-r6}
-        add             r1,  r1,  r2
-        pld             [r1]
-        ALIGN_DWORD     3,   r4,  r5,  r6
-        subs            r3,  r3,  #1
-        NO_RND_AVG32    r10, r11, r7,  r8,  r4,  r5,  r12
-        stm             r0,  {r10-r11}
-        add             r0,  r0,  r2
-        bne             6b
-        pop             {r4-r11,pc}
-endfunc
-
-        .ltorg
-
-@ ----------------------------------------------------------------
-.macro  RND_XY2_IT align, rnd
-        @ l1=  (a & 0x03030303) + (b & 0x03030303) ?(+ 0x02020202)
-        @ h1= ((a & 0xFCFCFCFCUL) >> 2) + ((b & 0xFCFCFCFCUL) >> 2)
-.if \align == 0
-        ldm             r1,  {r6-r8}
-.elseif \align == 3
-        ldm             r1,  {r5-r7}
-.else
-        ldm             r1,  {r8-r10}
-.endif
-        add             r1,  r1,  r2
-        pld             [r1]
-.if \align == 0
-        ALIGN_DWORD_D   1,   r4,  r5,  r6,  r7,  r8
-.elseif \align == 1
-        ALIGN_DWORD_D   1,   r4,  r5,  r8,  r9,  r10
-        ALIGN_DWORD_D   2,   r6,  r7,  r8,  r9,  r10
-.elseif \align == 2
-        ALIGN_DWORD_D   2,   r4,  r5,  r8,  r9,  r10
-        ALIGN_DWORD_D   3,   r6,  r7,  r8,  r9,  r10
-.elseif \align == 3
-        ALIGN_DWORD_D   3,   r4,  r5,  r5,  r6,  r7
-.endif
-        ldr             r14, =0x03030303
-        tst             r3,  #1
-        and             r8,  r4,  r14
-        and             r9,  r5,  r14
-        and             r10, r6,  r14
-        and             r11, r7,  r14
-        it              eq
-        andeq           r14, r14, r14, \rnd #1
-        add             r8,  r8,  r10
-        add             r9,  r9,  r11
-        ldr             r12, =0xfcfcfcfc >> 2
-        itt             eq
-        addeq           r8,  r8,  r14
-        addeq           r9,  r9,  r14
-        and             r4,  r12, r4,  lsr #2
-        and             r5,  r12, r5,  lsr #2
-        and             r6,  r12, r6,  lsr #2
-        and             r7,  r12, r7,  lsr #2
-        add             r10, r4,  r6
-        add             r11, r5,  r7
-        subs            r3,  r3,  #1
-.endm
-
-.macro RND_XY2_EXPAND align, rnd
-        RND_XY2_IT      \align, \rnd
-6:      push            {r8-r11}
-        RND_XY2_IT      \align, \rnd
-        pop             {r4-r7}
-        add             r4,  r4,  r8
-        add             r5,  r5,  r9
-        ldr             r14, =0x0f0f0f0f
-        add             r6,  r6,  r10
-        add             r7,  r7,  r11
-        and             r4,  r14, r4,  lsr #2
-        and             r5,  r14, r5,  lsr #2
-        add             r4,  r4,  r6
-        add             r5,  r5,  r7
-        stm             r0,  {r4-r5}
-        add             r0,  r0,  r2
-        bge             6b
-        pop             {r4-r11,pc}
-.endm
-
-        .align 5
-function ff_put_pixels8_xy2_arm, export=1
-        @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-        @ block = word aligned, pixles = unaligned
-        pld             [r1]
-        push            {r4-r11,lr} @ R14 is also called LR
-        JMP_ALIGN       r5,  r1
-1:      RND_XY2_EXPAND  0, lsl
-        .align 5
-2:      RND_XY2_EXPAND  1, lsl
-        .align 5
-3:      RND_XY2_EXPAND  2, lsl
-        .align 5
-4:      RND_XY2_EXPAND  3, lsl
-endfunc
-
-        .align 5
-function ff_put_no_rnd_pixels8_xy2_arm, export=1
-        @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-        @ block = word aligned, pixles = unaligned
-        pld             [r1]
-        push            {r4-r11,lr}
-        JMP_ALIGN       r5,  r1
-1:      RND_XY2_EXPAND  0, lsr
-        .align 5
-2:      RND_XY2_EXPAND  1, lsr
-        .align 5
-3:      RND_XY2_EXPAND  2, lsr
-        .align 5
-4:      RND_XY2_EXPAND  3, lsr
-endfunc
-
-        .align 5
 @ void ff_add_pixels_clamped_arm(int16_t *block, uint8_t *dest, int stride)
-function ff_add_pixels_clamped_arm, export=1
+function ff_add_pixels_clamped_arm, export=1, align=5
         push            {r4-r10}
         mov             r10, #8
 1:

libav-v9.6.tar.bz2/libavcodec/arm/dsputil_arm.h -> libav-v10.1.tar.bz2/libavcodec/arm/dsputil_arm.h Changed

libav-v9.6.tar.bz2/libavcodec/arm/dsputil_armv6.S -> libav-v10.1.tar.bz2/libavcodec/arm/dsputil_armv6.S Changed

@@ -20,244 +20,6 @@
 
 #include "libavutil/arm/asm.S"
 
-.macro  call_2x_pixels  type, subp
-function ff_\type\()_pixels16\subp\()_armv6, export=1
-        push            {r0-r3, lr}
-        bl              ff_\type\()_pixels8\subp\()_armv6
-        pop             {r0-r3, lr}
-        add             r0,  r0,  #8
-        add             r1,  r1,  #8
-        b               ff_\type\()_pixels8\subp\()_armv6
-endfunc
-.endm
-
-call_2x_pixels          avg
-call_2x_pixels          put, _x2
-call_2x_pixels          put, _y2
-call_2x_pixels          put, _x2_no_rnd
-call_2x_pixels          put, _y2_no_rnd
-
-function ff_put_pixels16_armv6, export=1
-        push            {r4-r11}
-1:
-        ldr             r5,  [r1, #4]
-        ldr             r6,  [r1, #8]
-        ldr             r7,  [r1, #12]
-        ldr_post        r4,  r1,  r2
-        strd            r6,  r7,  [r0, #8]
-        ldr             r9,  [r1, #4]
-        strd_post       r4,  r5,  r0,  r2
-        ldr             r10, [r1, #8]
-        ldr             r11, [r1, #12]
-        ldr_post        r8,  r1,  r2
-        strd            r10, r11, [r0, #8]
-        subs            r3,  r3,  #2
-        strd_post       r8,  r9,  r0,  r2
-        bne             1b
-
-        pop             {r4-r11}
-        bx              lr
-endfunc
-
-function ff_put_pixels8_armv6, export=1
-        push            {r4-r7}
-1:
-        ldr             r5,  [r1, #4]
-        ldr_post        r4,  r1,  r2
-        ldr             r7,  [r1, #4]
-        strd_post       r4,  r5,  r0,  r2
-        ldr_post        r6,  r1,  r2
-        subs            r3,  r3,  #2
-        strd_post       r6,  r7,  r0,  r2
-        bne             1b
-
-        pop             {r4-r7}
-        bx              lr
-endfunc
-
-function ff_put_pixels8_x2_armv6, export=1
-        push            {r4-r11, lr}
-        mov             r12, #1
-        orr             r12, r12, r12, lsl #8
-        orr             r12, r12, r12, lsl #16
-1:
-        ldr             r4,  [r1]
-        subs            r3,  r3,  #2
-        ldr             r5,  [r1, #4]
-        ldr             r7,  [r1, #5]
-        lsr             r6,  r4,  #8
-        ldr_pre         r8,  r1,  r2
-        orr             r6,  r6,  r5,  lsl #24
-        ldr             r9,  [r1, #4]
-        ldr             r11, [r1, #5]
-        lsr             r10, r8,  #8
-        add             r1,  r1,  r2
-        orr             r10, r10, r9,  lsl #24
-        eor             r14, r4,  r6
-        uhadd8          r4,  r4,  r6
-        eor             r6,  r5,  r7
-        uhadd8          r5,  r5,  r7
-        and             r14, r14, r12
-        and             r6,  r6,  r12
-        uadd8           r4,  r4,  r14
-        eor             r14, r8,  r10
-        uadd8           r5,  r5,  r6
-        eor             r6,  r9,  r11
-        uhadd8          r8,  r8,  r10
-        and             r14, r14, r12
-        uhadd8          r9,  r9,  r11
-        and             r6,  r6,  r12
-        uadd8           r8,  r8,  r14
-        strd_post       r4,  r5,  r0,  r2
-        uadd8           r9,  r9,  r6
-        strd_post       r8,  r9,  r0,  r2
-        bne             1b
-
-        pop             {r4-r11, pc}
-endfunc
-
-function ff_put_pixels8_y2_armv6, export=1
-        push            {r4-r11}
-        mov             r12, #1
-        orr             r12, r12, r12, lsl #8
-        orr             r12, r12, r12, lsl #16
-        ldr             r4,  [r1]
-        ldr             r5,  [r1, #4]
-        ldr_pre         r6,  r1,  r2
-        ldr             r7,  [r1, #4]
-1:
-        subs            r3,  r3,  #2
-        uhadd8          r8,  r4,  r6
-        eor             r10, r4,  r6
-        uhadd8          r9,  r5,  r7
-        eor             r11, r5,  r7
-        and             r10, r10, r12
-        ldr_pre         r4,  r1,  r2
-        uadd8           r8,  r8,  r10
-        and             r11, r11, r12
-        uadd8           r9,  r9,  r11
-        ldr             r5,  [r1, #4]
-        uhadd8          r10, r4,  r6
-        eor             r6,  r4,  r6
-        uhadd8          r11, r5,  r7
-        and             r6,  r6,  r12
-        eor             r7,  r5,  r7
-        uadd8           r10, r10, r6
-        and             r7,  r7,  r12
-        ldr_pre         r6,  r1,  r2
-        uadd8           r11, r11, r7
-        strd_post       r8,  r9,  r0,  r2
-        ldr             r7,  [r1, #4]
-        strd_post       r10, r11, r0,  r2
-        bne             1b
-
-        pop             {r4-r11}
-        bx              lr
-endfunc
-
-function ff_put_pixels8_x2_no_rnd_armv6, export=1
-        push            {r4-r9, lr}
-1:
-        subs            r3,  r3,  #2
-        ldr             r4,  [r1]
-        ldr             r5,  [r1, #4]
-        ldr             r7,  [r1, #5]
-        ldr_pre         r8,  r1,  r2
-        ldr             r9,  [r1, #4]
-        ldr             r14, [r1, #5]
-        add             r1,  r1,  r2
-        lsr             r6,  r4,  #8
-        orr             r6,  r6,  r5,  lsl #24
-        lsr             r12, r8,  #8
-        orr             r12, r12, r9,  lsl #24
-        uhadd8          r4,  r4,  r6
-        uhadd8          r5,  r5,  r7
-        uhadd8          r8,  r8,  r12
-        uhadd8          r9,  r9,  r14
-        stm             r0,  {r4,r5}
-        add             r0,  r0,  r2
-        stm             r0,  {r8,r9}
-        add             r0,  r0,  r2
-        bne             1b
-
-        pop             {r4-r9, pc}
-endfunc
-
-function ff_put_pixels8_y2_no_rnd_armv6, export=1
-        push            {r4-r9, lr}
-        ldr             r4,  [r1]
-        ldr             r5,  [r1, #4]
-        ldr_pre         r6,  r1,  r2
-        ldr             r7,  [r1, #4]
-1:
-        subs            r3,  r3,  #2
-        uhadd8          r8,  r4,  r6
-        ldr_pre         r4,  r1,  r2
-        uhadd8          r9,  r5,  r7
-        ldr             r5,  [r1, #4]
-        uhadd8          r12, r4,  r6
-        ldr_pre         r6,  r1,  r2
-        uhadd8          r14, r5,  r7
-        ldr             r7,  [r1, #4]
-        stm             r0,  {r8,r9}
-        add             r0,  r0,  r2
-        stm             r0,  {r12,r14}
-        add             r0,  r0,  r2
-        bne             1b
-
-        pop             {r4-r9, pc}
-endfunc
-
-function ff_avg_pixels8_armv6, export=1
-        pld             [r1, r2]
-        push            {r4-r10, lr}
-        mov             lr,  #1
-        orr             lr,  lr,  lr,  lsl #8
-        orr             lr,  lr,  lr,  lsl #16
-        ldrd            r4,  r5,  [r0]
-        ldr             r10, [r1, #4]
-        ldr_post        r9,  r1,  r2
-        subs            r3,  r3,  #2
-1:
-        pld             [r1, r2]
-        eor             r8,  r4,  r9
-        uhadd8          r4,  r4,  r9
-        eor             r12, r5,  r10
-        ldrd_reg        r6,  r7,  r0,  r2
-        uhadd8          r5,  r5,  r10
-        and             r8,  r8,  lr
-        ldr             r10, [r1, #4]
-        and             r12, r12, lr
-        uadd8           r4,  r4,  r8
-        ldr_post        r9,  r1,  r2
-        eor             r8,  r6,  r9
-        uadd8           r5,  r5,  r12
-        pld             [r1, r2,  lsl #1]
-        eor             r12, r7,  r10
-        uhadd8          r6,  r6,  r9
-        strd_post       r4,  r5,  r0,  r2
-        uhadd8          r7,  r7,  r10
-        beq             2f
-        and             r8,  r8,  lr
-        ldrd_reg        r4,  r5,  r0,  r2
-        uadd8           r6,  r6,  r8
-        ldr             r10, [r1, #4]
-        and             r12, r12, lr
-        subs            r3,  r3,  #2
-        uadd8           r7,  r7,  r12
-        ldr_post        r9,  r1,  r2
-        strd_post       r6,  r7,  r0,  r2
-        b               1b
-2:
-        and             r8,  r8,  lr
-        and             r12, r12, lr
-        uadd8           r6,  r6,  r8
-        uadd8           r7,  r7,  r12
-        strd_post       r6,  r7,  r0,  r2
-
-        pop             {r4-r10, pc}
-endfunc
-
 function ff_add_pixels_clamped_armv6, export=1
         push            {r4-r8,lr}
         mov             r3,  #8

libav-v9.6.tar.bz2/libavcodec/arm/dsputil_init_arm.c -> libav-v10.1.tar.bz2/libavcodec/arm/dsputil_init_arm.c Changed

@@ -19,64 +19,45 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/attributes.h"
 #include "libavutil/arm/cpu.h"
-#include "libavcodec/dsputil.h"
 #include "dsputil_arm.h"
 
-void ff_j_rev_dct_arm(DCTELEM *data);
-void ff_simple_idct_arm(DCTELEM *data);
+void ff_j_rev_dct_arm(int16_t *data);
+void ff_simple_idct_arm(int16_t *data);
 
 /* XXX: local hack */
-static void (*ff_put_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size);
-static void (*ff_add_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size);
+static void (*ff_put_pixels_clamped)(const int16_t *block, uint8_t *pixels, int line_size);
+static void (*ff_add_pixels_clamped)(const int16_t *block, uint8_t *pixels, int line_size);
 
-void ff_put_pixels8_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h);
-void ff_put_pixels8_x2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h);
-void ff_put_pixels8_y2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h);
-void ff_put_pixels8_xy2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h);
-
-void ff_put_no_rnd_pixels8_x2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h);
-void ff_put_no_rnd_pixels8_y2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h);
-void ff_put_no_rnd_pixels8_xy2_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h);
-
-void ff_put_pixels16_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h);
-
-CALL_2X_PIXELS(ff_put_pixels16_x2_arm,         ff_put_pixels8_x2_arm,        8)
-CALL_2X_PIXELS(ff_put_pixels16_y2_arm,         ff_put_pixels8_y2_arm,        8)
-CALL_2X_PIXELS(ff_put_pixels16_xy2_arm,        ff_put_pixels8_xy2_arm,       8)
-CALL_2X_PIXELS(ff_put_no_rnd_pixels16_x2_arm,  ff_put_no_rnd_pixels8_x2_arm, 8)
-CALL_2X_PIXELS(ff_put_no_rnd_pixels16_y2_arm,  ff_put_no_rnd_pixels8_y2_arm, 8)
-CALL_2X_PIXELS(ff_put_no_rnd_pixels16_xy2_arm, ff_put_no_rnd_pixels8_xy2_arm,8)
-
-void ff_add_pixels_clamped_arm(const DCTELEM *block, uint8_t *dest,
+void ff_add_pixels_clamped_arm(const int16_t *block, uint8_t *dest,
                                int line_size);
 
 /* XXX: those functions should be suppressed ASAP when all IDCTs are
    converted */
-static void j_rev_dct_arm_put(uint8_t *dest, int line_size, DCTELEM *block)
+static void j_rev_dct_arm_put(uint8_t *dest, int line_size, int16_t *block)
 {
     ff_j_rev_dct_arm (block);
     ff_put_pixels_clamped(block, dest, line_size);
 }
-static void j_rev_dct_arm_add(uint8_t *dest, int line_size, DCTELEM *block)
+static void j_rev_dct_arm_add(uint8_t *dest, int line_size, int16_t *block)
 {
     ff_j_rev_dct_arm (block);
     ff_add_pixels_clamped(block, dest, line_size);
 }
-static void simple_idct_arm_put(uint8_t *dest, int line_size, DCTELEM *block)
+static void simple_idct_arm_put(uint8_t *dest, int line_size, int16_t *block)
 {
     ff_simple_idct_arm (block);
     ff_put_pixels_clamped(block, dest, line_size);
 }
-static void simple_idct_arm_add(uint8_t *dest, int line_size, DCTELEM *block)
+static void simple_idct_arm_add(uint8_t *dest, int line_size, int16_t *block)
 {
     ff_simple_idct_arm (block);
     ff_add_pixels_clamped(block, dest, line_size);
 }
 
-void ff_dsputil_init_arm(DSPContext* c, AVCodecContext *avctx)
+av_cold void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx)
 {
-    const int high_bit_depth = avctx->bits_per_raw_sample > 8;
     int cpu_flags = av_get_cpu_flags();
 
     ff_put_pixels_clamped = c->put_pixels_clamped;
@@ -99,28 +80,7 @@
 
     c->add_pixels_clamped = ff_add_pixels_clamped_arm;
 
-    if (!high_bit_depth) {
-    c->put_pixels_tab[0][0] = ff_put_pixels16_arm;
-    c->put_pixels_tab[0][1] = ff_put_pixels16_x2_arm;
-    c->put_pixels_tab[0][2] = ff_put_pixels16_y2_arm;
-    c->put_pixels_tab[0][3] = ff_put_pixels16_xy2_arm;
-    c->put_pixels_tab[1][0] = ff_put_pixels8_arm;
-    c->put_pixels_tab[1][1] = ff_put_pixels8_x2_arm;
-    c->put_pixels_tab[1][2] = ff_put_pixels8_y2_arm;
-    c->put_pixels_tab[1][3] = ff_put_pixels8_xy2_arm;
-
-    c->put_no_rnd_pixels_tab[0][0] = ff_put_pixels16_arm;
-    c->put_no_rnd_pixels_tab[0][1] = ff_put_no_rnd_pixels16_x2_arm;
-    c->put_no_rnd_pixels_tab[0][2] = ff_put_no_rnd_pixels16_y2_arm;
-    c->put_no_rnd_pixels_tab[0][3] = ff_put_no_rnd_pixels16_xy2_arm;
-    c->put_no_rnd_pixels_tab[1][0] = ff_put_pixels8_arm;
-    c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_arm;
-    c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_arm;
-    c->put_no_rnd_pixels_tab[1][3] = ff_put_no_rnd_pixels8_xy2_arm;
-    }
-
     if (have_armv5te(cpu_flags)) ff_dsputil_init_armv5te(c, avctx);
     if (have_armv6(cpu_flags))   ff_dsputil_init_armv6(c, avctx);
-    if (have_vfp(cpu_flags))     ff_dsputil_init_vfp(c, avctx);
     if (have_neon(cpu_flags))    ff_dsputil_init_neon(c, avctx);
 }

libav-v9.6.tar.bz2/libavcodec/arm/dsputil_init_armv5te.c -> libav-v10.1.tar.bz2/libavcodec/arm/dsputil_init_armv5te.c Changed

libav-v9.6.tar.bz2/libavcodec/arm/dsputil_init_armv6.c -> libav-v10.1.tar.bz2/libavcodec/arm/dsputil_init_armv6.c Changed

@@ -21,37 +21,18 @@
 #include <stdint.h>
 
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
 #include "dsputil_arm.h"
 
-void ff_simple_idct_armv6(DCTELEM *data);
-void ff_simple_idct_put_armv6(uint8_t *dest, int line_size, DCTELEM *data);
-void ff_simple_idct_add_armv6(uint8_t *dest, int line_size, DCTELEM *data);
+void ff_simple_idct_armv6(int16_t *data);
+void ff_simple_idct_put_armv6(uint8_t *dest, int line_size, int16_t *data);
+void ff_simple_idct_add_armv6(uint8_t *dest, int line_size, int16_t *data);
 
-void ff_put_pixels16_armv6(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels16_x2_armv6(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels16_y2_armv6(uint8_t *, const uint8_t *, int, int);
-
-void ff_put_pixels16_x2_no_rnd_armv6(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels16_y2_no_rnd_armv6(uint8_t *, const uint8_t *, int, int);
-
-void ff_avg_pixels16_armv6(uint8_t *, const uint8_t *, int, int);
-
-void ff_put_pixels8_armv6(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels8_x2_armv6(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels8_y2_armv6(uint8_t *, const uint8_t *, int, int);
-
-void ff_put_pixels8_x2_no_rnd_armv6(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels8_y2_no_rnd_armv6(uint8_t *, const uint8_t *, int, int);
-
-void ff_avg_pixels8_armv6(uint8_t *, const uint8_t *, int, int);
-
-void ff_add_pixels_clamped_armv6(const DCTELEM *block,
+void ff_add_pixels_clamped_armv6(const int16_t *block,
 uint8_t *restrict pixels,
 int line_size);
 
-void ff_get_pixels_armv6(DCTELEM *block, const uint8_t *pixels, int stride);
-void ff_diff_pixels_armv6(DCTELEM *block, const uint8_t *s1,
+void ff_get_pixels_armv6(int16_t *block, const uint8_t *pixels, int stride);
+void ff_diff_pixels_armv6(int16_t *block, const uint8_t *s1,
 const uint8_t *s2, int stride);
 
 int ff_pix_abs16_armv6(void *s, uint8_t *blk1, uint8_t *blk2,
@@ -83,29 +64,6 @@
 c->idct_permutation_type = FF_LIBMPEG2_IDCT_PERM;
 }
 
- if (!high_bit_depth) {
- c->put_pixels_tab[0][0] = ff_put_pixels16_armv6;
- c->put_pixels_tab[0][1] = ff_put_pixels16_x2_armv6;
- c->put_pixels_tab[0][2] = ff_put_pixels16_y2_armv6;
-/* c->put_pixels_tab[0][3] = ff_put_pixels16_xy2_armv6; */
- c->put_pixels_tab[1][0] = ff_put_pixels8_armv6;
- c->put_pixels_tab[1][1] = ff_put_pixels8_x2_armv6;
- c->put_pixels_tab[1][2] = ff_put_pixels8_y2_armv6;
-/* c->put_pixels_tab[1][3] = ff_put_pixels8_xy2_armv6; */
-
- c->put_no_rnd_pixels_tab[0][0] = ff_put_pixels16_armv6;
- c->put_no_rnd_pixels_tab[0][1] = ff_put_pixels16_x2_no_rnd_armv6;
- c->put_no_rnd_pixels_tab[0][2] = ff_put_pixels16_y2_no_rnd_armv6;
-/* c->put_no_rnd_pixels_tab[0][3] = ff_put_pixels16_xy2_no_rnd_armv6; */
- c->put_no_rnd_pixels_tab[1][0] = ff_put_pixels8_armv6;
- c->put_no_rnd_pixels_tab[1][1] = ff_put_pixels8_x2_no_rnd_armv6;
- c->put_no_rnd_pixels_tab[1][2] = ff_put_pixels8_y2_no_rnd_armv6;
-/* c->put_no_rnd_pixels_tab[1][3] = ff_put_pixels8_xy2_no_rnd_armv6; */
-
- c->avg_pixels_tab[0][0] = ff_avg_pixels16_armv6;
- c->avg_pixels_tab[1][0] = ff_avg_pixels8_armv6;
- }
-
 if (!high_bit_depth)
 c->get_pixels = ff_get_pixels_armv6;
 c->add_pixels_clamped = ff_add_pixels_clamped_armv6;

libav-v9.6.tar.bz2/libavcodec/arm/dsputil_init_neon.c -> libav-v10.1.tar.bz2/libavcodec/arm/dsputil_init_neon.c Changed

@@ -21,151 +21,31 @@
 
 #include <stdint.h>
 
+#include "libavutil/attributes.h"
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
 #include "dsputil_arm.h"
 
-void ff_simple_idct_neon(DCTELEM *data);
-void ff_simple_idct_put_neon(uint8_t *dest, int line_size, DCTELEM *data);
-void ff_simple_idct_add_neon(uint8_t *dest, int line_size, DCTELEM *data);
+void ff_simple_idct_neon(int16_t *data);
+void ff_simple_idct_put_neon(uint8_t *dest, int line_size, int16_t *data);
+void ff_simple_idct_add_neon(uint8_t *dest, int line_size, int16_t *data);
 
-void ff_clear_block_neon(DCTELEM *block);
-void ff_clear_blocks_neon(DCTELEM *blocks);
+void ff_clear_block_neon(int16_t *block);
+void ff_clear_blocks_neon(int16_t *blocks);
 
-void ff_put_pixels16_neon(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels16_x2_neon(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels16_y2_neon(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels16_xy2_neon(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels8_neon(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels8_x2_neon(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels8_y2_neon(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels8_xy2_neon(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels16_x2_no_rnd_neon(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels16_y2_no_rnd_neon(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels16_xy2_no_rnd_neon(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels8_x2_no_rnd_neon(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels8_y2_no_rnd_neon(uint8_t *, const uint8_t *, int, int);
-void ff_put_pixels8_xy2_no_rnd_neon(uint8_t *, const uint8_t *, int, int);
-
-void ff_avg_pixels16_neon(uint8_t *, const uint8_t *, int, int);
-void ff_avg_pixels16_x2_neon(uint8_t *, const uint8_t *, int, int);
-void ff_avg_pixels16_y2_neon(uint8_t *, const uint8_t *, int, int);
-void ff_avg_pixels16_xy2_neon(uint8_t *, const uint8_t *, int, int);
-void ff_avg_pixels8_neon(uint8_t *, const uint8_t *, int, int);
-void ff_avg_pixels8_x2_neon(uint8_t *, const uint8_t *, int, int);
-void ff_avg_pixels8_y2_neon(uint8_t *, const uint8_t *, int, int);
-void ff_avg_pixels8_xy2_neon(uint8_t *, const uint8_t *, int, int);
-void ff_avg_pixels16_x2_no_rnd_neon(uint8_t *, const uint8_t *, int, int);
-void ff_avg_pixels16_y2_no_rnd_neon(uint8_t *, const uint8_t *, int, int);
-void ff_avg_pixels16_xy2_no_rnd_neon(uint8_t *, const uint8_t *, int, int);
-void ff_avg_pixels8_x2_no_rnd_neon(uint8_t *, const uint8_t *, int, int);
-void ff_avg_pixels8_y2_no_rnd_neon(uint8_t *, const uint8_t *, int, int);
-void ff_avg_pixels8_xy2_no_rnd_neon(uint8_t *, const uint8_t *, int, int);
-
-void ff_add_pixels_clamped_neon(const DCTELEM *, uint8_t *, int);
-void ff_put_pixels_clamped_neon(const DCTELEM *, uint8_t *, int);
-void ff_put_signed_pixels_clamped_neon(const DCTELEM *, uint8_t *, int);
-
-void ff_put_h264_qpel16_mc00_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel16_mc10_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel16_mc20_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel16_mc30_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel16_mc01_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel16_mc11_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel16_mc21_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel16_mc31_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel16_mc02_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel16_mc12_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel16_mc22_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel16_mc32_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel16_mc03_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel16_mc13_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel16_mc23_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel16_mc33_neon(uint8_t *, uint8_t *, int);
-
-void ff_put_h264_qpel8_mc00_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel8_mc10_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel8_mc20_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel8_mc30_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel8_mc01_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel8_mc11_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel8_mc21_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel8_mc31_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel8_mc02_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel8_mc12_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel8_mc22_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel8_mc32_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel8_mc03_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel8_mc13_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel8_mc23_neon(uint8_t *, uint8_t *, int);
-void ff_put_h264_qpel8_mc33_neon(uint8_t *, uint8_t *, int);
-
-void ff_avg_h264_qpel16_mc00_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel16_mc10_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel16_mc20_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel16_mc30_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel16_mc01_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel16_mc11_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel16_mc21_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel16_mc31_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel16_mc02_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel16_mc12_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel16_mc22_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel16_mc32_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel16_mc03_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel16_mc13_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel16_mc23_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel16_mc33_neon(uint8_t *, uint8_t *, int);
-
-void ff_avg_h264_qpel8_mc00_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel8_mc10_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel8_mc20_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel8_mc30_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel8_mc01_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel8_mc11_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel8_mc21_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel8_mc31_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel8_mc02_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel8_mc12_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel8_mc22_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel8_mc32_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel8_mc03_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel8_mc13_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel8_mc23_neon(uint8_t *, uint8_t *, int);
-void ff_avg_h264_qpel8_mc33_neon(uint8_t *, uint8_t *, int);
-
-void ff_put_h264_chroma_mc8_neon(uint8_t *, uint8_t *, int, int, int, int);
-void ff_put_h264_chroma_mc4_neon(uint8_t *, uint8_t *, int, int, int, int);
-void ff_put_h264_chroma_mc2_neon(uint8_t *, uint8_t *, int, int, int, int);
-
-void ff_avg_h264_chroma_mc8_neon(uint8_t *, uint8_t *, int, int, int, int);
-void ff_avg_h264_chroma_mc4_neon(uint8_t *, uint8_t *, int, int, int, int);
-void ff_avg_h264_chroma_mc2_neon(uint8_t *, uint8_t *, int, int, int, int);
-
-void ff_vector_fmul_window_neon(float *dst, const float *src0,
- const float *src1, const float *win, int len);
-void ff_butterflies_float_neon(float *v1, float *v2, int len);
-float ff_scalarproduct_float_neon(const float *v1, const float *v2, int len);
-void ff_vector_fmul_reverse_neon(float *dst, const float *src0,
- const float *src1, int len);
-void ff_vector_fmul_add_neon(float *dst, const float *src0, const float *src1,
- const float *src2, int len);
+void ff_add_pixels_clamped_neon(const int16_t *, uint8_t *, int);
+void ff_put_pixels_clamped_neon(const int16_t *, uint8_t *, int);
+void ff_put_signed_pixels_clamped_neon(const int16_t *, uint8_t *, int);
 
 void ff_vector_clipf_neon(float *dst, const float *src, float min, float max,
 int len);
 void ff_vector_clip_int32_neon(int32_t *dst, const int32_t *src, int32_t min,
 int32_t max, unsigned int len);
 
-void ff_vorbis_inverse_coupling_neon(float *mag, float *ang, int blocksize);
-
 int32_t ff_scalarproduct_int16_neon(const int16_t *v1, const int16_t *v2, int len);
 int32_t ff_scalarproduct_and_madd_int16_neon(int16_t *v1, const int16_t *v2,
 const int16_t *v3, int len, int mul);
 
-void ff_apply_window_int16_neon(int16_t *dst, const int16_t *src,
- const int16_t *window, unsigned n);
-
-void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx)
+av_cold void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx)
 {
 const int high_bit_depth = avctx->bits_per_raw_sample > 8;
 
@@ -182,139 +62,15 @@
 if (!high_bit_depth) {
 c->clear_block = ff_clear_block_neon;
 c->clear_blocks = ff_clear_blocks_neon;
-
- 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][0] = ff_avg_pixels16_neon;
- c->avg_no_rnd_pixels_tab[0][1] = ff_avg_pixels16_x2_no_rnd_neon;
- c->avg_no_rnd_pixels_tab[0][2] = ff_avg_pixels16_y2_no_rnd_neon;
- c->avg_no_rnd_pixels_tab[0][3] = ff_avg_pixels16_xy2_no_rnd_neon;
- c->avg_no_rnd_pixels_tab[1][0] = ff_avg_pixels8_neon;
- c->avg_no_rnd_pixels_tab[1][1] = ff_avg_pixels8_x2_no_rnd_neon;
- c->avg_no_rnd_pixels_tab[1][2] = ff_avg_pixels8_y2_no_rnd_neon;
- c->avg_no_rnd_pixels_tab[1][3] = ff_avg_pixels8_xy2_no_rnd_neon;
 }
 
 c->add_pixels_clamped = ff_add_pixels_clamped_neon;
 c->put_pixels_clamped = ff_put_pixels_clamped_neon;
 c->put_signed_pixels_clamped = ff_put_signed_pixels_clamped_neon;
 
- if (CONFIG_H264_DECODER && !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;
-
- 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;
- }
-
- c->vector_fmul_window = ff_vector_fmul_window_neon;
- c->butterflies_float = ff_butterflies_float_neon;
- c->scalarproduct_float = ff_scalarproduct_float_neon;
- c->vector_fmul_reverse = ff_vector_fmul_reverse_neon;
- c->vector_fmul_add = ff_vector_fmul_add_neon;
 c->vector_clipf = ff_vector_clipf_neon;
 c->vector_clip_int32 = ff_vector_clip_int32_neon;
 
- if (CONFIG_VORBIS_DECODER)
- c->vorbis_inverse_coupling = ff_vorbis_inverse_coupling_neon;
-
 c->scalarproduct_int16 = ff_scalarproduct_int16_neon;
 c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_neon;
-
- c->apply_window_int16 = ff_apply_window_int16_neon;
 }

libav-v9.6.tar.bz2/libavcodec/arm/dsputil_neon.S -> libav-v10.1.tar.bz2/libavcodec/arm/dsputil_neon.S Changed

@@ -19,7 +19,6 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include "config.h"
 #include "libavutil/arm/asm.S"
 
 function ff_clear_block_neon, export=1
@@ -38,394 +37,6 @@
 bx lr
 endfunc
 
-.macro pixels16 rnd=1, avg=0
- .if \avg
- mov r12, r0
- .endif
-1: vld1.8 {q0}, [r1], r2
- vld1.8 {q1}, [r1], r2
- vld1.8 {q2}, [r1], r2
- pld [r1, r2, lsl #2]
- vld1.8 {q3}, [r1], r2
- pld [r1]
- pld [r1, r2]
- pld [r1, r2, lsl #1]
- .if \avg
- vld1.8 {q8}, [r12,:128], r2
- vrhadd.u8 q0, q0, q8
- vld1.8 {q9}, [r12,:128], r2
- vrhadd.u8 q1, q1, q9
- vld1.8 {q10}, [r12,:128], r2
- vrhadd.u8 q2, q2, q10
- vld1.8 {q11}, [r12,:128], r2
- vrhadd.u8 q3, q3, q11
- .endif
- subs r3, r3, #4
- vst1.64 {q0}, [r0,:128], r2
- vst1.64 {q1}, [r0,:128], r2
- vst1.64 {q2}, [r0,:128], r2
- vst1.64 {q3}, [r0,:128], r2
- bne 1b
- bx lr
-.endm
-
-.macro pixels16_x2 rnd=1, avg=0
-1: vld1.8 {d0-d2}, [r1], r2
- vld1.8 {d4-d6}, [r1], r2
- pld [r1]
- pld [r1, r2]
- subs r3, r3, #2
- vext.8 q1, q0, q1, #1
- avg q0, q0, q1
- vext.8 q3, q2, q3, #1
- avg q2, q2, q3
- .if \avg
- vld1.8 {q1}, [r0,:128], r2
- vld1.8 {q3}, [r0,:128]
- vrhadd.u8 q0, q0, q1
- vrhadd.u8 q2, q2, q3
- sub r0, r0, r2
- .endif
- vst1.8 {q0}, [r0,:128], r2
- vst1.8 {q2}, [r0,:128], r2
- bne 1b
- bx lr
-.endm
-
-.macro pixels16_y2 rnd=1, avg=0
- sub r3, r3, #2
- vld1.8 {q0}, [r1], r2
- vld1.8 {q1}, [r1], r2
-1: subs r3, r3, #2
- avg q2, q0, q1
- vld1.8 {q0}, [r1], r2
- avg q3, q0, q1
- vld1.8 {q1}, [r1], r2
- pld [r1]
- pld [r1, r2]
- .if \avg
- vld1.8 {q8}, [r0,:128], r2
- vld1.8 {q9}, [r0,:128]
- vrhadd.u8 q2, q2, q8
- vrhadd.u8 q3, q3, q9
- sub r0, r0, r2
- .endif
- vst1.8 {q2}, [r0,:128], r2
- vst1.8 {q3}, [r0,:128], r2
- bne 1b
-
- avg q2, q0, q1
- vld1.8 {q0}, [r1], r2
- avg q3, q0, q1
- .if \avg
- vld1.8 {q8}, [r0,:128], r2
- vld1.8 {q9}, [r0,:128]
- vrhadd.u8 q2, q2, q8
- vrhadd.u8 q3, q3, q9
- sub r0, r0, r2
- .endif
- vst1.8 {q2}, [r0,:128], r2
- vst1.8 {q3}, [r0,:128], r2
-
- bx lr
-.endm
-
-.macro pixels16_xy2 rnd=1, avg=0
- sub r3, r3, #2
- vld1.8 {d0-d2}, [r1], r2
- vld1.8 {d4-d6}, [r1], r2
-NRND vmov.i16 q13, #1
- pld [r1]
- pld [r1, r2]
- vext.8 q1, q0, q1, #1
- vext.8 q3, q2, q3, #1
- vaddl.u8 q8, d0, d2
- vaddl.u8 q10, d1, d3
- vaddl.u8 q9, d4, d6
- vaddl.u8 q11, d5, d7
-1: subs r3, r3, #2
- vld1.8 {d0-d2}, [r1], r2
- vadd.u16 q12, q8, q9
- pld [r1]
-NRND vadd.u16 q12, q12, q13
- vext.8 q15, q0, q1, #1
- vadd.u16 q1 , q10, q11
- shrn d28, q12, #2
-NRND vadd.u16 q1, q1, q13
- shrn d29, q1, #2
- .if \avg
- vld1.8 {q8}, [r0,:128]
- vrhadd.u8 q14, q14, q8
- .endif
- vaddl.u8 q8, d0, d30
- vld1.8 {d2-d4}, [r1], r2
- vaddl.u8 q10, d1, d31
- vst1.8 {q14}, [r0,:128], r2
- vadd.u16 q12, q8, q9
- pld [r1, r2]
-NRND vadd.u16 q12, q12, q13
- vext.8 q2, q1, q2, #1
- vadd.u16 q0, q10, q11
- shrn d30, q12, #2
-NRND vadd.u16 q0, q0, q13
- shrn d31, q0, #2
- .if \avg
- vld1.8 {q9}, [r0,:128]
- vrhadd.u8 q15, q15, q9
- .endif
- vaddl.u8 q9, d2, d4
- vaddl.u8 q11, d3, d5
- vst1.8 {q15}, [r0,:128], r2
- bgt 1b
-
- vld1.8 {d0-d2}, [r1], r2
- vadd.u16 q12, q8, q9
-NRND vadd.u16 q12, q12, q13
- vext.8 q15, q0, q1, #1
- vadd.u16 q1 , q10, q11
- shrn d28, q12, #2
-NRND vadd.u16 q1, q1, q13
- shrn d29, q1, #2
- .if \avg
- vld1.8 {q8}, [r0,:128]
- vrhadd.u8 q14, q14, q8
- .endif
- vaddl.u8 q8, d0, d30
- vaddl.u8 q10, d1, d31
- vst1.8 {q14}, [r0,:128], r2
- vadd.u16 q12, q8, q9
-NRND vadd.u16 q12, q12, q13
- vadd.u16 q0, q10, q11
- shrn d30, q12, #2
-NRND vadd.u16 q0, q0, q13
- shrn d31, q0, #2
- .if \avg
- vld1.8 {q9}, [r0,:128]
- vrhadd.u8 q15, q15, q9
- .endif
- vst1.8 {q15}, [r0,:128], r2
-
- bx lr
-.endm
-
-.macro pixels8 rnd=1, avg=0
-1: vld1.8 {d0}, [r1], r2
- vld1.8 {d1}, [r1], r2
- vld1.8 {d2}, [r1], r2
- pld [r1, r2, lsl #2]
- vld1.8 {d3}, [r1], r2
- pld [r1]
- pld [r1, r2]
- pld [r1, r2, lsl #1]
- .if \avg
- vld1.8 {d4}, [r0,:64], r2
- vrhadd.u8 d0, d0, d4
- vld1.8 {d5}, [r0,:64], r2
- vrhadd.u8 d1, d1, d5
- vld1.8 {d6}, [r0,:64], r2
- vrhadd.u8 d2, d2, d6
- vld1.8 {d7}, [r0,:64], r2
- vrhadd.u8 d3, d3, d7
- sub r0, r0, r2, lsl #2
- .endif
- subs r3, r3, #4
- vst1.8 {d0}, [r0,:64], r2
- vst1.8 {d1}, [r0,:64], r2
- vst1.8 {d2}, [r0,:64], r2
- vst1.8 {d3}, [r0,:64], r2
- bne 1b
- bx lr
-.endm
-
-.macro pixels8_x2 rnd=1, avg=0
-1: vld1.8 {q0}, [r1], r2
- vext.8 d1, d0, d1, #1
- vld1.8 {q1}, [r1], r2
- vext.8 d3, d2, d3, #1
- pld [r1]
- pld [r1, r2]
- subs r3, r3, #2
- vswp d1, d2
- avg q0, q0, q1
- .if \avg
- vld1.8 {d4}, [r0,:64], r2
- vld1.8 {d5}, [r0,:64]
- vrhadd.u8 q0, q0, q2
- sub r0, r0, r2
- .endif
- vst1.8 {d0}, [r0,:64], r2
- vst1.8 {d1}, [r0,:64], r2
- bne 1b
- bx lr
-.endm
-
-.macro pixels8_y2 rnd=1, avg=0
- sub r3, r3, #2
- vld1.8 {d0}, [r1], r2
- vld1.8 {d1}, [r1], r2
-1: subs r3, r3, #2
- avg d4, d0, d1
- vld1.8 {d0}, [r1], r2
- avg d5, d0, d1
- vld1.8 {d1}, [r1], r2
- pld [r1]
- pld [r1, r2]
- .if \avg
- vld1.8 {d2}, [r0,:64], r2
- vld1.8 {d3}, [r0,:64]
- vrhadd.u8 q2, q2, q1
- sub r0, r0, r2
- .endif
- vst1.8 {d4}, [r0,:64], r2
- vst1.8 {d5}, [r0,:64], r2
- bne 1b
-
- avg d4, d0, d1
- vld1.8 {d0}, [r1], r2
- avg d5, d0, d1
- .if \avg
- vld1.8 {d2}, [r0,:64], r2
- vld1.8 {d3}, [r0,:64]
- vrhadd.u8 q2, q2, q1
- sub r0, r0, r2
- .endif
- vst1.8 {d4}, [r0,:64], r2
- vst1.8 {d5}, [r0,:64], r2
-
- bx lr
-.endm
-
-.macro pixels8_xy2 rnd=1, avg=0
- sub r3, r3, #2
- vld1.8 {q0}, [r1], r2
- vld1.8 {q1}, [r1], r2
-NRND vmov.i16 q11, #1
- pld [r1]
- pld [r1, r2]
- vext.8 d4, d0, d1, #1
- vext.8 d6, d2, d3, #1
- vaddl.u8 q8, d0, d4
- vaddl.u8 q9, d2, d6
-1: subs r3, r3, #2
- vld1.8 {q0}, [r1], r2
- pld [r1]
- vadd.u16 q10, q8, q9
- vext.8 d4, d0, d1, #1
-NRND vadd.u16 q10, q10, q11
- vaddl.u8 q8, d0, d4
- shrn d5, q10, #2
- vld1.8 {q1}, [r1], r2
- vadd.u16 q10, q8, q9
- pld [r1, r2]
- .if \avg
- vld1.8 {d7}, [r0,:64]
- vrhadd.u8 d5, d5, d7
- .endif
-NRND vadd.u16 q10, q10, q11
- vst1.8 {d5}, [r0,:64], r2
- shrn d7, q10, #2
- .if \avg
- vld1.8 {d5}, [r0,:64]
- vrhadd.u8 d7, d7, d5
- .endif
- vext.8 d6, d2, d3, #1
- vaddl.u8 q9, d2, d6
- vst1.8 {d7}, [r0,:64], r2
- bgt 1b
-
- vld1.8 {q0}, [r1], r2
- vadd.u16 q10, q8, q9
- vext.8 d4, d0, d1, #1
-NRND vadd.u16 q10, q10, q11
- vaddl.u8 q8, d0, d4
- shrn d5, q10, #2
- vadd.u16 q10, q8, q9
- .if \avg
- vld1.8 {d7}, [r0,:64]
- vrhadd.u8 d5, d5, d7
- .endif
-NRND vadd.u16 q10, q10, q11
- vst1.8 {d5}, [r0,:64], r2
- shrn d7, q10, #2
- .if \avg
- vld1.8 {d5}, [r0,:64]
- vrhadd.u8 d7, d7, d5
- .endif
- vst1.8 {d7}, [r0,:64], r2
-
- bx lr
-.endm
-
-.macro pixfunc pfx, name, suf, rnd=1, avg=0
- .if \rnd
- .macro avg rd, rn, rm
- vrhadd.u8 \rd, \rn, \rm
- .endm
- .macro shrn rd, rn, rm
- vrshrn.u16 \rd, \rn, \rm
- .endm
- .macro NRND insn:vararg
- .endm
- .else
- .macro avg rd, rn, rm
- vhadd.u8 \rd, \rn, \rm
- .endm
- .macro shrn rd, rn, rm
- vshrn.u16 \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 shrn
- .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 r3, #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 r3, #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 r3, #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 r3, #8
-endfunc
-
- pixfunc avg_, pixels8, avg=1
- pixfunc2 avg_, pixels8_x2, avg=1
- pixfunc2 avg_, pixels8_y2, avg=1
- pixfunc2 avg_, pixels8_xy2, avg=1
-
 function ff_put_pixels_clamped_neon, export=1
 vld1.16 {d16-d19}, [r0,:128]!
 vqmovun.s16 d0, q8
@@ -532,192 +143,6 @@
 bx lr
 endfunc
 
-function ff_vector_fmul_window_neon, export=1
- push {r4,r5,lr}
- ldr lr, [sp, #12]
- sub r2, r2, #8
- sub r5, lr, #2
- add r2, r2, r5, lsl #2
- add r4, r3, r5, lsl #3
- add ip, r0, r5, lsl #3
- mov r5, #-16
- vld1.32 {d0,d1}, [r1,:128]!
- vld1.32 {d2,d3}, [r2,:128], r5
- vld1.32 {d4,d5}, [r3,:128]!
- vld1.32 {d6,d7}, [r4,:128], r5
-1: subs lr, lr, #4
- vmul.f32 d22, d0, d4
- vrev64.32 q3, q3
- vmul.f32 d23, d1, d5
- vrev64.32 q1, q1
- vmul.f32 d20, d0, d7
- vmul.f32 d21, d1, d6
- beq 2f
- vmla.f32 d22, d3, d7
- vld1.32 {d0,d1}, [r1,:128]!
- vmla.f32 d23, d2, d6
- vld1.32 {d18,d19},[r2,:128], r5
- vmls.f32 d20, d3, d4
- vld1.32 {d24,d25},[r3,:128]!
- vmls.f32 d21, d2, d5
- vld1.32 {d6,d7}, [r4,:128], r5
- vmov q1, q9
- vrev64.32 q11, q11
- vmov q2, q12
- vswp d22, d23
- vst1.32 {d20,d21},[r0,:128]!
- vst1.32 {d22,d23},[ip,:128], r5
- b 1b
-2: vmla.f32 d22, d3, d7
- vmla.f32 d23, d2, d6
- vmls.f32 d20, d3, d4
- vmls.f32 d21, d2, d5
- vrev64.32 q11, q11
- vswp d22, d23
- vst1.32 {d20,d21},[r0,:128]!
- vst1.32 {d22,d23},[ip,:128], r5
- pop {r4,r5,pc}
-endfunc
-
-#if CONFIG_VORBIS_DECODER
-function ff_vorbis_inverse_coupling_neon, export=1
- vmov.i32 q10, #1<<31
- subs r2, r2, #4
- mov r3, r0
- mov r12, r1
- beq 3f
-
- vld1.32 {d24-d25},[r1,:128]!
- vld1.32 {d22-d23},[r0,:128]!
- vcle.s32 q8, q12, #0
- vand q9, q11, q10
- veor q12, q12, q9
- vand q2, q12, q8
- vbic q3, q12, q8
- vadd.f32 q12, q11, q2
- vsub.f32 q11, q11, q3
-1: vld1.32 {d2-d3}, [r1,:128]!
- vld1.32 {d0-d1}, [r0,:128]!
- vcle.s32 q8, q1, #0
- vand q9, q0, q10
- veor q1, q1, q9
- vst1.32 {d24-d25},[r3, :128]!
- vst1.32 {d22-d23},[r12,:128]!
- vand q2, q1, q8
- vbic q3, q1, q8
- vadd.f32 q1, q0, q2
- vsub.f32 q0, q0, q3
- subs r2, r2, #8
- ble 2f
- vld1.32 {d24-d25},[r1,:128]!
- vld1.32 {d22-d23},[r0,:128]!
- vcle.s32 q8, q12, #0
- vand q9, q11, q10
- veor q12, q12, q9
- vst1.32 {d2-d3}, [r3, :128]!
- vst1.32 {d0-d1}, [r12,:128]!
- vand q2, q12, q8
- vbic q3, q12, q8
- vadd.f32 q12, q11, q2
- vsub.f32 q11, q11, q3
- b 1b
-
-2: vst1.32 {d2-d3}, [r3, :128]!
- vst1.32 {d0-d1}, [r12,:128]!
- it lt
- bxlt lr
-
-3: vld1.32 {d2-d3}, [r1,:128]
- vld1.32 {d0-d1}, [r0,:128]
- vcle.s32 q8, q1, #0
- vand q9, q0, q10
- veor q1, q1, q9
- vand q2, q1, q8
- vbic q3, q1, q8
- vadd.f32 q1, q0, q2
- vsub.f32 q0, q0, q3
- vst1.32 {d2-d3}, [r0,:128]!
- vst1.32 {d0-d1}, [r1,:128]!
- bx lr
-endfunc
-#endif
-
-function ff_butterflies_float_neon, export=1
-1: vld1.32 {q0},[r0,:128]
- vld1.32 {q1},[r1,:128]
- vsub.f32 q2, q0, q1
- vadd.f32 q1, q0, q1
- vst1.32 {q2},[r1,:128]!
- vst1.32 {q1},[r0,:128]!
- subs r2, r2, #4
- bgt 1b
- bx lr
-endfunc
-
-function ff_scalarproduct_float_neon, export=1
- vmov.f32 q2, #0.0
-1: vld1.32 {q0},[r0,:128]!
- vld1.32 {q1},[r1,:128]!
- vmla.f32 q2, q0, q1
- subs r2, r2, #4
- bgt 1b
- vadd.f32 d0, d4, d5
- vpadd.f32 d0, d0, d0
-NOVFP vmov.32 r0, d0[0]
- bx lr
-endfunc
-
-function ff_vector_fmul_reverse_neon, export=1
- add r2, r2, r3, lsl #2
- sub r2, r2, #32
- mov r12, #-32
- vld1.32 {q0-q1}, [r1,:128]!
- vld1.32 {q2-q3}, [r2,:128], r12
-1: pld [r1, #32]
- vrev64.32 q3, q3
- vmul.f32 d16, d0, d7
- vmul.f32 d17, d1, d6
- pld [r2, #-32]
- vrev64.32 q2, q2
- vmul.f32 d18, d2, d5
- vmul.f32 d19, d3, d4
- subs r3, r3, #8
- beq 2f
- vld1.32 {q0-q1}, [r1,:128]!
- vld1.32 {q2-q3}, [r2,:128], r12
- vst1.32 {q8-q9}, [r0,:128]!
- b 1b
-2: vst1.32 {q8-q9}, [r0,:128]!
- bx lr
-endfunc
-
-function ff_vector_fmul_add_neon, export=1
- ldr r12, [sp]
- vld1.32 {q0-q1}, [r1,:128]!
- vld1.32 {q8-q9}, [r2,:128]!
- vld1.32 {q2-q3}, [r3,:128]!
- vmul.f32 q10, q0, q8
- vmul.f32 q11, q1, q9
-1: vadd.f32 q12, q2, q10
- vadd.f32 q13, q3, q11
- pld [r1, #16]
- pld [r2, #16]
- pld [r3, #16]
- subs r12, r12, #8
- beq 2f
- vld1.32 {q0}, [r1,:128]!
- vld1.32 {q8}, [r2,:128]!
- vmul.f32 q10, q0, q8
- vld1.32 {q1}, [r1,:128]!
- vld1.32 {q9}, [r2,:128]!
- vmul.f32 q11, q1, q9
- vld1.32 {q2-q3}, [r3,:128]!
- vst1.32 {q12-q13},[r0,:128]!
- b 1b
-2: vst1.32 {q12-q13},[r0,:128]!
- bx lr
-endfunc
-
 function ff_vector_clipf_neon, export=1
 VFP vdup.32 q1, d0[1]
 VFP vdup.32 q0, d0[0]
@@ -744,29 +169,6 @@
 bx lr
 endfunc
 
-function ff_apply_window_int16_neon, export=1
- push {r4,lr}
- add r4, r1, r3, lsl #1
- add lr, r0, r3, lsl #1
- sub r4, r4, #16
- sub lr, lr, #16
- mov r12, #-16
-1:
- vld1.16 {q0}, [r1,:128]!
- vld1.16 {q2}, [r2,:128]!
- vld1.16 {q1}, [r4,:128], r12
- vrev64.16 q3, q2
- vqrdmulh.s16 q0, q0, q2
- vqrdmulh.s16 d2, d2, d7
- vqrdmulh.s16 d3, d3, d6
- vst1.16 {q0}, [r0,:128]!
- vst1.16 {q1}, [lr,:128], r12
- subs r3, r3, #16
- bgt 1b
-
- pop {r4,pc}
-endfunc
-
 function ff_vector_clip_int32_neon, export=1
 vdup.32 q0, r2
 vdup.32 q1, r3

libav-v9.6.tar.bz2/libavcodec/arm/fft_fixed_init_arm.c -> libav-v10.1.tar.bz2/libavcodec/arm/fft_fixed_init_arm.c Changed

libav-v9.6.tar.bz2/libavcodec/arm/fft_init_arm.c -> libav-v10.1.tar.bz2/libavcodec/arm/fft_init_arm.c Changed

@@ -26,22 +26,25 @@
 void ff_fft_permute_neon(FFTContext *s, FFTComplex *z);
 void ff_fft_calc_neon(FFTContext *s, FFTComplex *z);
 
+void ff_imdct_half_vfp(FFTContext *s, FFTSample *output, const FFTSample *input);
+
 void ff_imdct_calc_neon(FFTContext *s, FFTSample *output, const FFTSample *input);
 void ff_imdct_half_neon(FFTContext *s, FFTSample *output, const FFTSample *input);
 void ff_mdct_calc_neon(FFTContext *s, FFTSample *output, const FFTSample *input);
 
 void ff_rdft_calc_neon(struct RDFTContext *s, FFTSample *z);
 
-void ff_synth_filter_float_neon(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);
-
 av_cold void ff_fft_init_arm(FFTContext *s)
 {
     int cpu_flags = av_get_cpu_flags();
 
+    if (have_vfp(cpu_flags)) {
+#if CONFIG_MDCT
+        if (!have_vfpv3(cpu_flags))
+            s->imdct_half   = ff_imdct_half_vfp;
+#endif
+    }
+
     if (have_neon(cpu_flags)) {
         s->fft_permute  = ff_fft_permute_neon;
         s->fft_calc     = ff_fft_calc_neon;
@@ -63,13 +66,3 @@
         s->rdft_calc    = ff_rdft_calc_neon;
 }
 #endif
-
-#if CONFIG_DCA_DECODER
-av_cold void ff_synth_filter_init_arm(SynthFilterContext *s)
-{
-    int cpu_flags = av_get_cpu_flags();
-
-    if (have_neon(cpu_flags))
-        s->synth_filter_float = ff_synth_filter_float_neon;
-}
-#endif

libav-v10.1.tar.bz2/libavcodec/arm/fft_vfp.S Added

@@ -0,0 +1,298 @@
+/*
+ * Copyright (c) 2013 RISC OS Open Ltd
+ * Author: Ben Avison <bavison@riscosopen.org>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/arm/asm.S"
+
+@ TODO: * FFTs wider than 16
+@ * dispatch code
+
+function fft4_vfp
+ vldr d0, [a1, #0*2*4] @ s0,s1 = z[0]
+ vldr d4, [a1, #1*2*4] @ s8,s9 = z[1]
+ vldr d1, [a1, #2*2*4] @ s2,s3 = z[2]
+ vldr d5, [a1, #3*2*4] @ s10,s11 = z[3]
+ @ stall
+ vadd.f s12, s0, s8 @ i0
+ vadd.f s13, s1, s9 @ i1
+ vadd.f s14, s2, s10 @ i2
+ vadd.f s15, s3, s11 @ i3
+ vsub.f s8, s0, s8 @ i4
+ vsub.f s9, s1, s9 @ i5
+ vsub.f s10, s2, s10 @ i6
+ vsub.f s11, s3, s11 @ i7
+ @ stall
+ @ stall
+ vadd.f s0, s12, s14 @ z[0].re
+ vsub.f s4, s12, s14 @ z[2].re
+ vadd.f s1, s13, s15 @ z[0].im
+ vsub.f s5, s13, s15 @ z[2].im
+ vadd.f s7, s9, s10 @ z[3].im
+ vsub.f s3, s9, s10 @ z[1].im
+ vadd.f s2, s8, s11 @ z[1].re
+ vsub.f s6, s8, s11 @ z[3].re
+ @ stall
+ @ stall
+ vstr d0, [a1, #0*2*4]
+ vstr d2, [a1, #2*2*4]
+ @ stall
+ @ stall
+ vstr d1, [a1, #1*2*4]
+ vstr d3, [a1, #3*2*4]
+
+ bx lr
+endfunc
+
+.macro macro_fft8_head
+ @ FFT4
+ vldr d4, [a1, #0 * 2*4]
+ vldr d6, [a1, #1 * 2*4]
+ vldr d5, [a1, #2 * 2*4]
+ vldr d7, [a1, #3 * 2*4]
+ @ BF
+ vldr d12, [a1, #4 * 2*4]
+ vadd.f s16, s8, s12 @ vector op
+ vldr d14, [a1, #5 * 2*4]
+ vldr d13, [a1, #6 * 2*4]
+ vldr d15, [a1, #7 * 2*4]
+ vsub.f s20, s8, s12 @ vector op
+ vadd.f s0, s16, s18
+ vsub.f s2, s16, s18
+ vadd.f s1, s17, s19
+ vsub.f s3, s17, s19
+ vadd.f s7, s21, s22
+ vsub.f s5, s21, s22
+ vadd.f s4, s20, s23
+ vsub.f s6, s20, s23
+ vsub.f s20, s24, s28 @ vector op
+ vstr d0, [a1, #0 * 2*4] @ transfer s0-s7 to s24-s31 via memory
+ vstr d1, [a1, #1 * 2*4]
+ vldr s0, cos1pi4
+ vadd.f s16, s24, s28 @ vector op
+ vstr d2, [a1, #2 * 2*4]
+ vstr d3, [a1, #3 * 2*4]
+ vldr d12, [a1, #0 * 2*4]
+ @ TRANSFORM
+ vmul.f s20, s20, s0 @ vector x scalar op
+ vldr d13, [a1, #1 * 2*4]
+ vldr d14, [a1, #2 * 2*4]
+ vldr d15, [a1, #3 * 2*4]
+ @ BUTTERFLIES
+ vadd.f s0, s18, s16
+ vadd.f s1, s17, s19
+ vsub.f s2, s17, s19
+ vsub.f s3, s18, s16
+ vadd.f s4, s21, s20
+ vsub.f s5, s21, s20
+ vadd.f s6, s22, s23
+ vsub.f s7, s22, s23
+ vadd.f s8, s0, s24 @ vector op
+ vstr d0, [a1, #0 * 2*4] @ transfer s0-s3 to s12-s15 via memory
+ vstr d1, [a1, #1 * 2*4]
+ vldr d6, [a1, #0 * 2*4]
+ vldr d7, [a1, #1 * 2*4]
+ vadd.f s1, s5, s6
+ vadd.f s0, s7, s4
+ vsub.f s2, s5, s6
+ vsub.f s3, s7, s4
+ vsub.f s12, s24, s12 @ vector op
+ vsub.f s5, s29, s1
+ vsub.f s4, s28, s0
+ vsub.f s6, s30, s2
+ vsub.f s7, s31, s3
+ vadd.f s16, s0, s28 @ vector op
+ vstr d6, [a1, #4 * 2*4]
+ vstr d7, [a1, #6 * 2*4]
+ vstr d4, [a1, #0 * 2*4]
+ vstr d5, [a1, #2 * 2*4]
+ vstr d2, [a1, #5 * 2*4]
+ vstr d3, [a1, #7 * 2*4]
+.endm
+
+.macro macro_fft8_tail
+ vstr d8, [a1, #1 * 2*4]
+ vstr d9, [a1, #3 * 2*4]
+.endm
+
+function fft8_vfp
+ ldr a3, =0x03030000 @ RunFast mode, vector length 4, stride 1
+ fmrx a2, FPSCR
+ fmxr FPSCR, a3
+ vpush {s16-s31}
+
+ macro_fft8_head
+ macro_fft8_tail
+
+ vpop {s16-s31}
+ fmxr FPSCR, a2
+ bx lr
+endfunc
+
+.align 3
+cos1pi4: @ cos(1*pi/4) = sqrt(2)
+ .float 0.707106769084930419921875
+cos1pi8: @ cos(1*pi/8) = sqrt(2+sqrt(2))/2
+ .float 0.92387950420379638671875
+cos3pi8: @ cos(2*pi/8) = sqrt(2-sqrt(2))/2
+ .float 0.3826834261417388916015625
+
+function ff_fft16_vfp, export=1
+ ldr a3, =0x03030000 @ RunFast mode, vector length 4, stride 1
+ fmrx a2, FPSCR
+ fmxr FPSCR, a3
+ vpush {s16-s31}
+
+ macro_fft8_head
+ @ FFT4(z+8)
+ vldr d10, [a1, #8 * 2*4]
+ vldr d12, [a1, #9 * 2*4]
+ vldr d11, [a1, #10 * 2*4]
+ vldr d13, [a1, #11 * 2*4]
+ macro_fft8_tail
+ vadd.f s16, s20, s24 @ vector op
+ @ FFT4(z+12)
+ vldr d4, [a1, #12 * 2*4]
+ vldr d6, [a1, #13 * 2*4]
+ vldr d5, [a1, #14 * 2*4]
+ vsub.f s20, s20, s24 @ vector op
+ vldr d7, [a1, #15 * 2*4]
+ vadd.f s0, s16, s18
+ vsub.f s4, s16, s18
+ vadd.f s1, s17, s19
+ vsub.f s5, s17, s19
+ vadd.f s7, s21, s22
+ vsub.f s3, s21, s22
+ vadd.f s2, s20, s23
+ vsub.f s6, s20, s23
+ vadd.f s16, s8, s12 @ vector op
+ vstr d0, [a1, #8 * 2*4]
+ vstr d2, [a1, #10 * 2*4]
+ vstr d1, [a1, #9 * 2*4]
+ vsub.f s20, s8, s12
+ vstr d3, [a1, #11 * 2*4]
+ @ TRANSFORM(z[2],z[6],z[10],z[14],cos1pi4,cos1pi4)
+ vldr d12, [a1, #10 * 2*4]
+ vadd.f s0, s16, s18
+ vadd.f s1, s17, s19
+ vsub.f s6, s16, s18
+ vsub.f s7, s17, s19
+ vsub.f s3, s21, s22
+ vadd.f s2, s20, s23
+ vadd.f s5, s21, s22
+ vsub.f s4, s20, s23
+ vstr d0, [a1, #12 * 2*4]
+ vmov s0, s6
+ @ TRANSFORM(z[1],z[5],z[9],z[13],cos1pi8,cos3pi8)
+ vldr d6, [a1, #9 * 2*4]
+ vstr d1, [a1, #13 * 2*4]
+ vldr d1, cos1pi4 @ s2 = cos1pi4, s3 = cos1pi8
+ vstr d2, [a1, #15 * 2*4]
+ vldr d7, [a1, #13 * 2*4]
+ vadd.f s4, s25, s24
+ vsub.f s5, s25, s24
+ vsub.f s6, s0, s7
+ vadd.f s7, s0, s7
+ vmul.f s20, s12, s3 @ vector op
+ @ TRANSFORM(z[3],z[7],z[11],z[15],cos3pi8,cos1pi8)
+ vldr d4, [a1, #11 * 2*4]
+ vldr d5, [a1, #15 * 2*4]
+ vldr s1, cos3pi8
+ vmul.f s24, s4, s2 @ vector * scalar op
+ vmul.f s28, s12, s1 @ vector * scalar op
+ vmul.f s12, s8, s1 @ vector * scalar op
+ vadd.f s4, s20, s29
+ vsub.f s5, s21, s28
+ vsub.f s6, s22, s31
+ vadd.f s7, s23, s30
+ vmul.f s8, s8, s3 @ vector * scalar op
+ vldr d8, [a1, #1 * 2*4]
+ vldr d9, [a1, #5 * 2*4]
+ vldr d10, [a1, #3 * 2*4]
+ vldr d11, [a1, #7 * 2*4]
+ vldr d14, [a1, #2 * 2*4]
+ vadd.f s0, s6, s4
+ vadd.f s1, s5, s7
+ vsub.f s2, s5, s7
+ vsub.f s3, s6, s4
+ vadd.f s4, s12, s9
+ vsub.f s5, s13, s8
+ vsub.f s6, s14, s11
+ vadd.f s7, s15, s10
+ vadd.f s12, s0, s16 @ vector op
+ vstr d0, [a1, #1 * 2*4]
+ vstr d1, [a1, #5 * 2*4]
+ vldr d4, [a1, #1 * 2*4]
+ vldr d5, [a1, #5 * 2*4]
+ vadd.f s0, s6, s4
+ vadd.f s1, s5, s7
+ vsub.f s2, s5, s7
+ vsub.f s3, s6, s4
+ vsub.f s8, s16, s8 @ vector op
+ vstr d6, [a1, #1 * 2*4]
+ vstr d7, [a1, #5 * 2*4]
+ vldr d15, [a1, #6 * 2*4]
+ vsub.f s4, s20, s0
+ vsub.f s5, s21, s1
+ vsub.f s6, s22, s2
+ vsub.f s7, s23, s3
+ vadd.f s20, s0, s20 @ vector op
+ vstr d4, [a1, #9 * 2*4]
+ @ TRANSFORM_ZERO(z[0],z[4],z[8],z[12])
+ vldr d6, [a1, #8 * 2*4]
+ vstr d5, [a1, #13 * 2*4]
+ vldr d7, [a1, #12 * 2*4]
+ vstr d2, [a1, #11 * 2*4]
+ vldr d8, [a1, #0 * 2*4]
+ vstr d3, [a1, #15 * 2*4]
+ vldr d9, [a1, #4 * 2*4]
+ vadd.f s0, s26, s24
+ vadd.f s1, s25, s27
+ vsub.f s2, s25, s27
+ vsub.f s3, s26, s24
+ vadd.f s4, s14, s12
+ vadd.f s5, s13, s15
+ vsub.f s6, s13, s15
+ vsub.f s7, s14, s12
+ vadd.f s8, s0, s28 @ vector op
+ vstr d0, [a1, #3 * 2*4]
+ vstr d1, [a1, #7 * 2*4]
+ vldr d6, [a1, #3 * 2*4]
+ vldr d7, [a1, #7 * 2*4]
+ vsub.f s0, s16, s4
+ vsub.f s1, s17, s5
+ vsub.f s2, s18, s6
+ vsub.f s3, s19, s7
+ vsub.f s12, s28, s12 @ vector op
+ vadd.f s16, s4, s16 @ vector op
+ vstr d10, [a1, #3 * 2*4]
+ vstr d11, [a1, #7 * 2*4]
+ vstr d4, [a1, #2 * 2*4]
+ vstr d5, [a1, #6 * 2*4]
+ vstr d0, [a1, #8 * 2*4]
+ vstr d1, [a1, #12 * 2*4]
+ vstr d6, [a1, #10 * 2*4]
+ vstr d7, [a1, #14 * 2*4]
+ vstr d8, [a1, #0 * 2*4]
+ vstr d9, [a1, #4 * 2*4]
+
+ vpop {s16-s31}
+ fmxr FPSCR, a2
+ bx lr
+endfunc

libav-v9.6.tar.bz2/libavcodec/arm/fmtconvert_init_arm.c -> libav-v10.1.tar.bz2/libavcodec/arm/fmtconvert_init_arm.c Changed

@@ -20,24 +20,38 @@
 
 #include <stdint.h>
 
+#include "libavutil/attributes.h"
 #include "libavutil/arm/cpu.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/fmtconvert.h"
 
-void ff_int32_to_float_fmul_scalar_neon(float *dst, const int *src,
+void ff_int32_to_float_fmul_scalar_neon(float *dst, const int32_t *src,
 float mul, int len);
 
+void ff_int32_to_float_fmul_scalar_vfp(float *dst, const int32_t *src,
+ float mul, int len);
+void ff_int32_to_float_fmul_array8_vfp(FmtConvertContext *c, float *dst,
+ const int32_t *src, const float *mul,
+ int len);
+
 void ff_float_to_int16_neon(int16_t *dst, const float *src, long len);
 void ff_float_to_int16_interleave_neon(int16_t *, const float **, long, int);
 
 void ff_float_to_int16_vfp(int16_t *dst, const float *src, long len);
 
-void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx)
+av_cold void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx)
 {
 int cpu_flags = av_get_cpu_flags();
 
- if (have_vfp(cpu_flags) && have_armv6(cpu_flags)) {
- c->float_to_int16 = ff_float_to_int16_vfp;
+ if (have_vfp(cpu_flags)) {
+ if (!have_vfpv3(cpu_flags)) {
+ c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_vfp;
+ c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_vfp;
+ }
+
+ if (have_armv6(cpu_flags)) {
+ c->float_to_int16 = ff_float_to_int16_vfp;
+ }
 }
 
 if (have_neon(cpu_flags)) {

libav-v9.6.tar.bz2/libavcodec/arm/fmtconvert_neon.S -> libav-v10.1.tar.bz2/libavcodec/arm/fmtconvert_neon.S Changed

libav-v9.6.tar.bz2/libavcodec/arm/fmtconvert_vfp.S -> libav-v10.1.tar.bz2/libavcodec/arm/fmtconvert_vfp.S Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008 Siarhei Siamashka <ssvb@users.sourceforge.net>
+ * Copyright (c) 2013 RISC OS Open Ltd <bavison@riscosopen.org>
 *
 * This file is part of Libav.
 *
@@ -22,57 +22,200 @@
 #include "libavutil/arm/asm.S"
 
 /**
- * ARM VFP optimized float to int16 conversion.
- * Assume that len is a positive number and is multiple of 8, destination
- * buffer is at least 4 bytes aligned (8 bytes alignment is better for
- * performance), little-endian byte sex.
+ * ARM VFP optimised int32 to float conversion.
+ * Assume len is a multiple of 8, destination buffer is at least 4 bytes aligned
+ * (16 bytes alignment is best for BCM2835), little-endian.
 */
-@ void ff_float_to_int16_vfp(int16_t *dst, const float *src, int len)
-function ff_float_to_int16_vfp, export=1
- push {r4-r8,lr}
- vpush {d8-d11}
- vldmia r1!, {s16-s23}
- vcvt.s32.f32 s0, s16
- vcvt.s32.f32 s1, s17
- vcvt.s32.f32 s2, s18
- vcvt.s32.f32 s3, s19
- vcvt.s32.f32 s4, s20
- vcvt.s32.f32 s5, s21
- vcvt.s32.f32 s6, s22
- vcvt.s32.f32 s7, s23
+@ void ff_int32_to_float_fmul_array8_vfp(FmtConvertContext *c, float *dst, const int32_t *src, const float *mul, int len)
+function ff_int32_to_float_fmul_array8_vfp, export=1
+ push {lr}
+ ldr a1, [sp, #4]
+ subs lr, a1, #3*8
+ bcc 50f @ too short to pipeline
+ @ Now need to find (len / 8) % 3. The approximation
+ @ x / 24 = (x * 0xAB) >> 12
+ @ is good for x < 4096, which is true for both AC3 and DCA.
+ mov a1, #0xAB
+ ldr ip, =0x03070000 @ RunFast mode, short vectors of length 8, stride 1
+ mul a1, lr, a1
+ vpush {s16-s31}
+ mov a1, a1, lsr #12
+ add a1, a1, a1, lsl #1
+ rsb a1, a1, lr, lsr #3
+ cmp a1, #1
+ fmrx a1, FPSCR
+ fmxr FPSCR, ip
+ beq 11f
+ blo 10f
+ @ Array is (2 + multiple of 3) x 8 floats long
+ @ drop through...
+ vldmia a3!, {s16-s23}
+ vldmia a4!, {s2,s3}
+ vldmia a3!, {s24-s31}
+ vcvt.f32.s32 s16, s16
+ vcvt.f32.s32 s17, s17
+ vcvt.f32.s32 s18, s18
+ vcvt.f32.s32 s19, s19
+ vcvt.f32.s32 s20, s20
+ vcvt.f32.s32 s21, s21
+ vcvt.f32.s32 s22, s22
+ vcvt.f32.s32 s23, s23
+ vmul.f32 s16, s16, s2
+ @ drop through...
+3:
+ vldmia a3!, {s8-s15}
+ vldmia a4!, {s1}
+ vcvt.f32.s32 s24, s24
+ vcvt.f32.s32 s25, s25
+ vcvt.f32.s32 s26, s26
+ vcvt.f32.s32 s27, s27
+ vcvt.f32.s32 s28, s28
+ vcvt.f32.s32 s29, s29
+ vcvt.f32.s32 s30, s30
+ vcvt.f32.s32 s31, s31
+ vmul.f32 s24, s24, s3
+ vstmia a2!, {s16-s19}
+ vstmia a2!, {s20-s23}
+2:
+ vldmia a3!, {s16-s23}
+ vldmia a4!, {s2}
+ vcvt.f32.s32 s8, s8
+ vcvt.f32.s32 s9, s9
+ vcvt.f32.s32 s10, s10
+ vcvt.f32.s32 s11, s11
+ vcvt.f32.s32 s12, s12
+ vcvt.f32.s32 s13, s13
+ vcvt.f32.s32 s14, s14
+ vcvt.f32.s32 s15, s15
+ vmul.f32 s8, s8, s1
+ vstmia a2!, {s24-s27}
+ vstmia a2!, {s28-s31}
 1:
- subs r2, r2, #8
- vmov r3, r4, s0, s1
- vmov r5, r6, s2, s3
- vmov r7, r8, s4, s5
- vmov ip, lr, s6, s7
- it gt
- vldmiagt r1!, {s16-s23}
- ssat r4, #16, r4
- ssat r3, #16, r3
- ssat r6, #16, r6
- ssat r5, #16, r5
- pkhbt r3, r3, r4, lsl #16
- pkhbt r4, r5, r6, lsl #16
- itttt gt
- vcvtgt.s32.f32 s0, s16
- vcvtgt.s32.f32 s1, s17
- vcvtgt.s32.f32 s2, s18
- vcvtgt.s32.f32 s3, s19
- itttt gt
- vcvtgt.s32.f32 s4, s20
- vcvtgt.s32.f32 s5, s21
- vcvtgt.s32.f32 s6, s22
- vcvtgt.s32.f32 s7, s23
- ssat r8, #16, r8
- ssat r7, #16, r7
- ssat lr, #16, lr
- ssat ip, #16, ip
- pkhbt r5, r7, r8, lsl #16
- pkhbt r6, ip, lr, lsl #16
- stmia r0!, {r3-r6}
- bgt 1b
+ vldmia a3!, {s24-s31}
+ vldmia a4!, {s3}
+ vcvt.f32.s32 s16, s16
+ vcvt.f32.s32 s17, s17
+ vcvt.f32.s32 s18, s18
+ vcvt.f32.s32 s19, s19
+ vcvt.f32.s32 s20, s20
+ vcvt.f32.s32 s21, s21
+ vcvt.f32.s32 s22, s22
+ vcvt.f32.s32 s23, s23
+ vmul.f32 s16, s16, s2
+ vstmia a2!, {s8-s11}
+ vstmia a2!, {s12-s15}
 
- vpop {d8-d11}
- pop {r4-r8,pc}
+ subs lr, lr, #8*3
+ bpl 3b
+
+ vcvt.f32.s32 s24, s24
+ vcvt.f32.s32 s25, s25
+ vcvt.f32.s32 s26, s26
+ vcvt.f32.s32 s27, s27
+ vcvt.f32.s32 s28, s28
+ vcvt.f32.s32 s29, s29
+ vcvt.f32.s32 s30, s30
+ vcvt.f32.s32 s31, s31
+ vmul.f32 s24, s24, s3
+ vstmia a2!, {s16-s19}
+ vstmia a2!, {s20-s23}
+ vstmia a2!, {s24-s27}
+ vstmia a2!, {s28-s31}
+
+ fmxr FPSCR, a1
+ vpop {s16-s31}
+ pop {pc}
+
+10: @ Array is (multiple of 3) x 8 floats long
+ vldmia a3!, {s8-s15}
+ vldmia a4!, {s1,s2}
+ vldmia a3!, {s16-s23}
+ vcvt.f32.s32 s8, s8
+ vcvt.f32.s32 s9, s9
+ vcvt.f32.s32 s10, s10
+ vcvt.f32.s32 s11, s11
+ vcvt.f32.s32 s12, s12
+ vcvt.f32.s32 s13, s13
+ vcvt.f32.s32 s14, s14
+ vcvt.f32.s32 s15, s15
+ vmul.f32 s8, s8, s1
+ b 1b
+
+11: @ Array is (1 + multiple of 3) x 8 floats long
+ vldmia a3!, {s24-s31}
+ vldmia a4!, {s3}
+ vldmia a3!, {s8-s15}
+ vldmia a4!, {s1}
+ vcvt.f32.s32 s24, s24
+ vcvt.f32.s32 s25, s25
+ vcvt.f32.s32 s26, s26
+ vcvt.f32.s32 s27, s27
+ vcvt.f32.s32 s28, s28
+ vcvt.f32.s32 s29, s29
+ vcvt.f32.s32 s30, s30
+ vcvt.f32.s32 s31, s31
+ vmul.f32 s24, s24, s3
+ b 2b
+
+50:
+ ldr lr, =0x03070000 @ RunFast mode, short vectors of length 8, stride 1
+ fmrx ip, FPSCR
+ fmxr FPSCR, lr
+51:
+ vldmia a3!, {s8-s15}
+ vldmia a4!, {s0}
+ vcvt.f32.s32 s8, s8
+ vcvt.f32.s32 s9, s9
+ vcvt.f32.s32 s10, s10
+ vcvt.f32.s32 s11, s11
+ vcvt.f32.s32 s12, s12
+ vcvt.f32.s32 s13, s13
+ vcvt.f32.s32 s14, s14
+ vcvt.f32.s32 s15, s15
+ vmul.f32 s8, s8, s0
+ subs a1, a1, #8
+ vstmia a2!, {s8-s11}
+ vstmia a2!, {s12-s15}
+ bne 51b
+
+ fmxr FPSCR, ip
+ pop {pc}
+endfunc
+
+/**
+ * ARM VFP optimised int32 to float conversion.
+ * Assume len is a multiple of 8, destination buffer is at least 4 bytes aligned
+ * (16 bytes alignment is best for BCM2835), little-endian.
+ * TODO: could be further optimised by unrolling and interleaving, as above
+ */
+@ void ff_int32_to_float_fmul_scalar_vfp(float *dst, const int32_t *src, float mul, int len)
+function ff_int32_to_float_fmul_scalar_vfp, export=1
+VFP tmp .req a4
+VFP len .req a3
+NOVFP tmp .req a3
+NOVFP len .req a4
+NOVFP vmov s0, a3
+ ldr tmp, =0x03070000 @ RunFast mode, short vectors of length 8, stride 1
+ fmrx ip, FPSCR
+ fmxr FPSCR, tmp
+1:
+ vldmia a2!, {s8-s15}
+ vcvt.f32.s32 s8, s8
+ vcvt.f32.s32 s9, s9
+ vcvt.f32.s32 s10, s10
+ vcvt.f32.s32 s11, s11
+ vcvt.f32.s32 s12, s12
+ vcvt.f32.s32 s13, s13
+ vcvt.f32.s32 s14, s14
+ vcvt.f32.s32 s15, s15
+ vmul.f32 s8, s8, s0
+ subs len, len, #8
+ vstmia a1!, {s8-s11}
+ vstmia a1!, {s12-s15}
+ bne 1b
+
+ fmxr FPSCR, ip
+ bx lr
 endfunc
+ .unreq tmp
+ .unreq len

libav-v10.1.tar.bz2/libavcodec/arm/fmtconvert_vfp_armv6.S Added

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2008 Siarhei Siamashka <ssvb@users.sourceforge.net>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "libavutil/arm/asm.S"
+
+/**
+ * ARM VFP optimized float to int16 conversion.
+ * Assume that len is a positive number and is multiple of 8, destination
+ * buffer is at least 4 bytes aligned (8 bytes alignment is better for
+ * performance), little-endian byte sex.
+ */
+@ void ff_float_to_int16_vfp(int16_t *dst, const float *src, int len)
+function ff_float_to_int16_vfp, export=1
+ push {r4-r8,lr}
+ vpush {d8-d11}
+ vldmia r1!, {s16-s23}
+ vcvt.s32.f32 s0, s16
+ vcvt.s32.f32 s1, s17
+ vcvt.s32.f32 s2, s18
+ vcvt.s32.f32 s3, s19
+ vcvt.s32.f32 s4, s20
+ vcvt.s32.f32 s5, s21
+ vcvt.s32.f32 s6, s22
+ vcvt.s32.f32 s7, s23
+1:
+ subs r2, r2, #8
+ vmov r3, r4, s0, s1
+ vmov r5, r6, s2, s3
+ vmov r7, r8, s4, s5
+ vmov ip, lr, s6, s7
+ it gt
+ vldmiagt r1!, {s16-s23}
+ ssat r4, #16, r4
+ ssat r3, #16, r3
+ ssat r6, #16, r6
+ ssat r5, #16, r5
+ pkhbt r3, r3, r4, lsl #16
+ pkhbt r4, r5, r6, lsl #16
+ itttt gt
+ vcvtgt.s32.f32 s0, s16
+ vcvtgt.s32.f32 s1, s17
+ vcvtgt.s32.f32 s2, s18
+ vcvtgt.s32.f32 s3, s19
+ itttt gt
+ vcvtgt.s32.f32 s4, s20
+ vcvtgt.s32.f32 s5, s21
+ vcvtgt.s32.f32 s6, s22
+ vcvtgt.s32.f32 s7, s23
+ ssat r8, #16, r8
+ ssat r7, #16, r7
+ ssat lr, #16, lr
+ ssat ip, #16, ip
+ pkhbt r5, r7, r8, lsl #16
+ pkhbt r6, ip, lr, lsl #16
+ stmia r0!, {r3-r6}
+ bgt 1b
+
+ vpop {d8-d11}
+ pop {r4-r8,pc}
+endfunc

libav-v10.1.tar.bz2/libavcodec/arm/h264chroma_init_arm.c Added

@@ -0,0 +1,51 @@
+/*
+ * ARM NEON optimised H.264 chroma functions
+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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/arm/cpu.h"
+#include "libavcodec/h264chroma.h"
+
+void ff_put_h264_chroma_mc8_neon(uint8_t *, uint8_t *, int, int, int, int);
+void ff_put_h264_chroma_mc4_neon(uint8_t *, uint8_t *, int, int, int, int);
+void ff_put_h264_chroma_mc2_neon(uint8_t *, uint8_t *, int, int, int, int);
+
+void ff_avg_h264_chroma_mc8_neon(uint8_t *, uint8_t *, int, int, int, int);
+void ff_avg_h264_chroma_mc4_neon(uint8_t *, uint8_t *, int, int, int, int);
+void ff_avg_h264_chroma_mc2_neon(uint8_t *, uint8_t *, int, int, int, int);
+
+av_cold void ff_h264chroma_init_arm(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;
+ }
+}

libav-v9.6.tar.bz2/libavcodec/arm/h264cmc_neon.S -> libav-v10.1.tar.bz2/libavcodec/arm/h264cmc_neon.S Changed

@@ -39,6 +39,9 @@
         add             r6,  r6,  r7,  lsl #1
         vld1.16         {d22[],d23[]}, [r6,:16]
   .endif
+  .ifc \codec,vc1
+        vmov.u16        q11, #28
+  .endif
 
 A       muls            r7,  r4,  r5
 T       mul             r7,  r4,  r5
@@ -183,6 +186,9 @@
         add             r6,  r6,  r7,  lsl #1
         vld1.16         {d22[],d23[]}, [r6,:16]
   .endif
+  .ifc \codec,vc1
+        vmov.u16        q11, #28
+  .endif
 
 A       muls            r7,  r4,  r5
 T       mul             r7,  r4,  r5
@@ -376,14 +382,12 @@
 endfunc
 .endm
 
-#if CONFIG_H264_DECODER
         h264_chroma_mc8 put
         h264_chroma_mc8 avg
         h264_chroma_mc4 put
         h264_chroma_mc4 avg
         h264_chroma_mc2 put
         h264_chroma_mc2 avg
-#endif
 
 #if CONFIG_RV40_DECODER
 const   rv40bias
@@ -398,3 +402,10 @@
         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

libav-v10.1.tar.bz2/libavcodec/arm/h264dsp_armv6.S Added

@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 2013 RISC OS Open Ltd
+ * Author: Ben Avison <bavison@riscosopen.org>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/arm/asm.S"
+
+RESULT .req a1
+BUF .req a1
+SIZE .req a2
+PATTERN .req a3
+PTR .req a4
+DAT0 .req v1
+DAT1 .req v2
+DAT2 .req v3
+DAT3 .req v4
+TMP0 .req v5
+TMP1 .req v6
+TMP2 .req ip
+TMP3 .req lr
+
+#define PRELOAD_DISTANCE 4
+
+.macro innerloop4
+ ldr DAT0, [PTR], #4
+ subs SIZE, SIZE, #4 @ C flag survives rest of macro
+ sub TMP0, DAT0, PATTERN, lsr #14
+ bic TMP0, TMP0, DAT0
+ ands TMP0, TMP0, PATTERN
+.endm
+
+.macro innerloop16 decrement, do_preload
+ ldmia PTR!, {DAT0,DAT1,DAT2,DAT3}
+ .ifnc "\do_preload",""
+ pld [PTR, #PRELOAD_DISTANCE*32]
+ .endif
+ .ifnc "\decrement",""
+ subs SIZE, SIZE, #\decrement @ C flag survives rest of macro
+ .endif
+ sub TMP0, DAT0, PATTERN, lsr #14
+ sub TMP1, DAT1, PATTERN, lsr #14
+ bic TMP0, TMP0, DAT0
+ bic TMP1, TMP1, DAT1
+ sub TMP2, DAT2, PATTERN, lsr #14
+ sub TMP3, DAT3, PATTERN, lsr #14
+ ands TMP0, TMP0, PATTERN
+ bic TMP2, TMP2, DAT2
+ it eq
+ andseq TMP1, TMP1, PATTERN
+ bic TMP3, TMP3, DAT3
+ itt eq
+ andseq TMP2, TMP2, PATTERN
+ andseq TMP3, TMP3, PATTERN
+.endm
+
+/* int ff_h264_find_start_code_candidate_armv6(const uint8_t *buf, int size) */
+function ff_h264_find_start_code_candidate_armv6, export=1
+ push {v1-v6,lr}
+ mov PTR, BUF
+ @ Ensure there are at least (PRELOAD_DISTANCE+2) complete cachelines to go
+ @ before using code that does preloads
+ cmp SIZE, #(PRELOAD_DISTANCE+3)*32 - 1
+ blo 60f
+
+ @ Get to word-alignment, 1 byte at a time
+ tst PTR, #3
+ beq 2f
+1: ldrb DAT0, [PTR], #1
+ sub SIZE, SIZE, #1
+ teq DAT0, #0
+ beq 90f
+ tst PTR, #3
+ bne 1b
+2: @ Get to 4-word alignment, 1 word at a time
+ ldr PATTERN, =0x80008000
+ setend be
+ tst PTR, #12
+ beq 4f
+3: innerloop4
+ bne 91f
+ tst PTR, #12
+ bne 3b
+4: @ Get to cacheline (8-word) alignment
+ tst PTR, #16
+ beq 5f
+ innerloop16 16
+ bne 93f
+5: @ Check complete cachelines, with preloading
+ @ We need to stop when there are still (PRELOAD_DISTANCE+1)
+ @ complete cachelines to go
+ sub SIZE, SIZE, #(PRELOAD_DISTANCE+2)*32
+6: innerloop16 , do_preload
+ bne 93f
+ innerloop16 32
+ bne 93f
+ bcs 6b
+ @ Preload trailing part-cacheline, if any
+ tst SIZE, #31
+ beq 7f
+ pld [PTR, #(PRELOAD_DISTANCE+1)*32]
+ @ Check remaining data without doing any more preloads. First
+ @ do in chunks of 4 words:
+7: adds SIZE, SIZE, #(PRELOAD_DISTANCE+2)*32 - 16
+ bmi 9f
+8: innerloop16 16
+ bne 93f
+ bcs 8b
+ @ Then in words:
+9: adds SIZE, SIZE, #16 - 4
+ bmi 11f
+10: innerloop4
+ bne 91f
+ bcs 10b
+11: setend le
+ @ Check second byte of final halfword
+ ldrb DAT0, [PTR, #-1]
+ teq DAT0, #0
+ beq 90f
+ @ Check any remaining bytes
+ tst SIZE, #3
+ beq 13f
+12: ldrb DAT0, [PTR], #1
+ sub SIZE, SIZE, #1
+ teq DAT0, #0
+ beq 90f
+ tst SIZE, #3
+ bne 12b
+ @ No candidate found
+13: sub RESULT, PTR, BUF
+ b 99f
+
+60: @ Small buffer - simply check by looping over bytes
+ subs SIZE, SIZE, #1
+ bcc 99f
+61: ldrb DAT0, [PTR], #1
+ subs SIZE, SIZE, #1
+ teq DAT0, #0
+ beq 90f
+ bcs 61b
+ @ No candidate found
+ sub RESULT, PTR, BUF
+ b 99f
+
+90: @ Found a candidate at the preceding byte
+ sub RESULT, PTR, BUF
+ sub RESULT, RESULT, #1
+ b 99f
+
+91: @ Found a candidate somewhere in the preceding 4 bytes
+ sub RESULT, PTR, BUF
+ sub RESULT, RESULT, #4
+ sub TMP0, DAT0, #0x20000
+ bics TMP0, TMP0, DAT0
+ itt pl
+ ldrbpl DAT0, [PTR, #-3]
+ addpl RESULT, RESULT, #2
+ bpl 92f
+ teq RESULT, #0
+ beq 98f @ don't look back a byte if found at first byte in buffer
+ ldrb DAT0, [PTR, #-5]
+92: teq DAT0, #0
+ it eq
+ subeq RESULT, RESULT, #1
+ b 98f
+
+93: @ Found a candidate somewhere in the preceding 16 bytes
+ sub RESULT, PTR, BUF
+ sub RESULT, RESULT, #16
+ teq TMP0, #0
+ beq 95f @ not in first 4 bytes
+ sub TMP0, DAT0, #0x20000
+ bics TMP0, TMP0, DAT0
+ itt pl
+ ldrbpl DAT0, [PTR, #-15]
+ addpl RESULT, RESULT, #2
+ bpl 94f
+ teq RESULT, #0
+ beq 98f @ don't look back a byte if found at first byte in buffer
+ ldrb DAT0, [PTR, #-17]
+94: teq DAT0, #0
+ it eq
+ subeq RESULT, RESULT, #1
+ b 98f
+95: add RESULT, RESULT, #4
+ teq TMP1, #0
+ beq 96f @ not in next 4 bytes
+ sub TMP1, DAT1, #0x20000
+ bics TMP1, TMP1, DAT1
+ itee mi
+ ldrbmi DAT0, [PTR, #-13]
+ ldrbpl DAT0, [PTR, #-11]
+ addpl RESULT, RESULT, #2
+ teq DAT0, #0
+ it eq
+ subeq RESULT, RESULT, #1
+ b 98f
+96: add RESULT, RESULT, #4
+ teq TMP2, #0
+ beq 97f @ not in next 4 bytes
+ sub TMP2, DAT2, #0x20000
+ bics TMP2, TMP2, DAT2
+ itee mi
+ ldrbmi DAT0, [PTR, #-9]
+ ldrbpl DAT0, [PTR, #-7]
+ addpl RESULT, RESULT, #2
+ teq DAT0, #0
+ it eq
+ subeq RESULT, RESULT, #1
+ b 98f
+97: add RESULT, RESULT, #4
+ sub TMP3, DAT3, #0x20000
+ bics TMP3, TMP3, DAT3
+ itee mi
+ ldrbmi DAT0, [PTR, #-5]
+ ldrbpl DAT0, [PTR, #-3]
+ addpl RESULT, RESULT, #2
+ teq DAT0, #0
+ it eq
+ subeq RESULT, RESULT, #1
+ @ drop through to 98f
+98: setend le
+99: pop {v1-v6,pc}
+endfunc
+
+ .unreq RESULT
+ .unreq BUF
+ .unreq SIZE
+ .unreq PATTERN
+ .unreq PTR
+ .unreq DAT0
+ .unreq DAT1
+ .unreq DAT2
+ .unreq DAT3
+ .unreq TMP0
+ .unreq TMP1
+ .unreq TMP2
+ .unreq TMP3

libav-v9.6.tar.bz2/libavcodec/arm/h264dsp_init_arm.c -> libav-v10.1.tar.bz2/libavcodec/arm/h264dsp_init_arm.c Changed

@@ -20,10 +20,12 @@
 
 #include <stdint.h>
 
+#include "libavutil/attributes.h"
 #include "libavutil/arm/cpu.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/h264dsp.h"
 
+int ff_h264_find_start_code_candidate_armv6(const uint8_t *buf, int size);
+
 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,
@@ -50,56 +52,60 @@
 int height, int log2_den, int weightd,
 int weights, int offset);
 
-void ff_h264_idct_add_neon(uint8_t *dst, DCTELEM *block, int stride);
-void ff_h264_idct_dc_add_neon(uint8_t *dst, DCTELEM *block, int stride);
+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,
- DCTELEM *block, int stride,
+ int16_t *block, int stride,
 const uint8_t nnzc[6*8]);
 void ff_h264_idct_add16intra_neon(uint8_t *dst, const int *block_offset,
- DCTELEM *block, int stride,
+ int16_t *block, int stride,
 const uint8_t nnzc[6*8]);
 void ff_h264_idct_add8_neon(uint8_t **dest, const int *block_offset,
- DCTELEM *block, int stride,
+ int16_t *block, int stride,
 const uint8_t nnzc[6*8]);
 
-void ff_h264_idct8_add_neon(uint8_t *dst, DCTELEM *block, int stride);
-void ff_h264_idct8_dc_add_neon(uint8_t *dst, DCTELEM *block, int stride);
+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,
- DCTELEM *block, int stride,
+ int16_t *block, int stride,
 const uint8_t nnzc[6*8]);
 
-static void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
+static av_cold void h264dsp_init_neon(H264DSPContext *c, const int bit_depth,
+ const int chroma_format_idc)
 {
 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;
- 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;
+ 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;
 }
 }
 
-void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
+av_cold void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth,
+ const int chroma_format_idc)
 {
 int cpu_flags = av_get_cpu_flags();
 
+ if (have_armv6(cpu_flags))
+ c->h264_find_start_code_candidate = ff_h264_find_start_code_candidate_armv6;
 if (have_neon(cpu_flags))
- ff_h264dsp_init_neon(c, bit_depth, chroma_format_idc);
+ h264dsp_init_neon(c, bit_depth, chroma_format_idc);
 }

libav-v9.6.tar.bz2/libavcodec/arm/h264dsp_neon.S -> libav-v10.1.tar.bz2/libavcodec/arm/h264dsp_neon.S Changed

@@ -271,939 +271,6 @@
         bx              lr
 endfunc
 
-        /* H.264 qpel MC */
-
-.macro  lowpass_const   r
-        movw            \r,  #5
-        movt            \r,  #20
-        vmov.32         d6[0], \r
-.endm
-
-.macro  lowpass_8       r0,  r1,  r2,  r3,  d0,  d1,  narrow=1
-  .if \narrow
-        t0 .req q0
-        t1 .req q8
-  .else
-        t0 .req \d0
-        t1 .req \d1
-  .endif
-        vext.8          d2,  \r0, \r1, #2
-        vext.8          d3,  \r0, \r1, #3
-        vaddl.u8        q1,  d2,  d3
-        vext.8          d4,  \r0, \r1, #1
-        vext.8          d5,  \r0, \r1, #4
-        vaddl.u8        q2,  d4,  d5
-        vext.8          d30, \r0, \r1, #5
-        vaddl.u8        t0,  \r0, d30
-        vext.8          d18, \r2, \r3, #2
-        vmla.i16        t0,  q1,  d6[1]
-        vext.8          d19, \r2, \r3, #3
-        vaddl.u8        q9,  d18, d19
-        vext.8          d20, \r2, \r3, #1
-        vmls.i16        t0,  q2,  d6[0]
-        vext.8          d21, \r2, \r3, #4
-        vaddl.u8        q10, d20, d21
-        vext.8          d31, \r2, \r3, #5
-        vaddl.u8        t1,  \r2, d31
-        vmla.i16        t1,  q9,  d6[1]
-        vmls.i16        t1,  q10, d6[0]
-  .if \narrow
-        vqrshrun.s16    \d0, t0,  #5
-        vqrshrun.s16    \d1, t1,  #5
-  .endif
-        .unreq  t0
-        .unreq  t1
-.endm
-
-.macro  lowpass_8_1     r0,  r1,  d0,  narrow=1
-  .if \narrow
-        t0 .req q0
-  .else
-        t0 .req \d0
-  .endif
-        vext.8          d2,  \r0, \r1, #2
-        vext.8          d3,  \r0, \r1, #3
-        vaddl.u8        q1,  d2,  d3
-        vext.8          d4,  \r0, \r1, #1
-        vext.8          d5,  \r0, \r1, #4
-        vaddl.u8        q2,  d4,  d5
-        vext.8          d30, \r0, \r1, #5
-        vaddl.u8        t0,  \r0, d30
-        vmla.i16        t0,  q1,  d6[1]
-        vmls.i16        t0,  q2,  d6[0]
-  .if \narrow
-        vqrshrun.s16    \d0, t0,  #5
-  .endif
-        .unreq  t0
-.endm
-
-.macro  lowpass_8.16    r0,  r1,  l0,  h0,  l1,  h1,  d
-        vext.16         q1,  \r0, \r1, #2
-        vext.16         q0,  \r0, \r1, #3
-        vaddl.s16       q9,  d2,  d0
-        vext.16         q2,  \r0, \r1, #1
-        vaddl.s16       q1,  d3,  d1
-        vext.16         q3,  \r0, \r1, #4
-        vaddl.s16       q10, d4,  d6
-        vext.16         \r1, \r0, \r1, #5
-        vaddl.s16       q2,  d5,  d7
-        vaddl.s16       q0,  \h0, \h1
-        vaddl.s16       q8,  \l0, \l1
-
-        vshl.i32        q3,  q9,  #4
-        vshl.i32        q9,  q9,  #2
-        vshl.i32        q15, q10, #2
-        vadd.i32        q9,  q9,  q3
-        vadd.i32        q10, q10, q15
-
-        vshl.i32        q3,  q1,  #4
-        vshl.i32        q1,  q1,  #2
-        vshl.i32        q15, q2,  #2
-        vadd.i32        q1,  q1,  q3
-        vadd.i32        q2,  q2,  q15
-
-        vadd.i32        q9,  q9,  q8
-        vsub.i32        q9,  q9,  q10
-
-        vadd.i32        q1,  q1,  q0
-        vsub.i32        q1,  q1,  q2
-
-        vrshrn.s32      d18, q9,  #10
-        vrshrn.s32      d19, q1,  #10
-
-        vqmovun.s16     \d,  q9
-.endm
-
-function put_h264_qpel16_h_lowpass_neon_packed
-        mov             r4,  lr
-        mov             r12, #16
-        mov             r3,  #8
-        bl              put_h264_qpel8_h_lowpass_neon
-        sub             r1,  r1,  r2, lsl #4
-        add             r1,  r1,  #8
-        mov             r12, #16
-        mov             lr,  r4
-        b               put_h264_qpel8_h_lowpass_neon
-endfunc
-
-.macro  h264_qpel_h_lowpass type
-function \type\()_h264_qpel16_h_lowpass_neon
-        push            {lr}
-        mov             r12, #16
-        bl              \type\()_h264_qpel8_h_lowpass_neon
-        sub             r0,  r0,  r3, lsl #4
-        sub             r1,  r1,  r2, lsl #4
-        add             r0,  r0,  #8
-        add             r1,  r1,  #8
-        mov             r12, #16
-        pop             {lr}
-endfunc
-
-function \type\()_h264_qpel8_h_lowpass_neon
-1:      vld1.8          {d0, d1},  [r1], r2
-        vld1.8          {d16,d17}, [r1], r2
-        subs            r12, r12, #2
-        lowpass_8       d0,  d1,  d16, d17, d0,  d16
-  .ifc \type,avg
-        vld1.8          {d2},     [r0,:64], r3
-        vrhadd.u8       d0,  d0,  d2
-        vld1.8          {d3},     [r0,:64]
-        vrhadd.u8       d16, d16, d3
-        sub             r0,  r0,  r3
-  .endif
-        vst1.8          {d0},     [r0,:64], r3
-        vst1.8          {d16},    [r0,:64], r3
-        bne             1b
-        bx              lr
-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
-        push            {lr}
-        mov             r12, #16
-        bl              \type\()_h264_qpel8_h_lowpass_l2_neon
-        sub             r0,  r0,  r2, lsl #4
-        sub             r1,  r1,  r2, lsl #4
-        sub             r3,  r3,  r2, lsl #4
-        add             r0,  r0,  #8
-        add             r1,  r1,  #8
-        add             r3,  r3,  #8
-        mov             r12, #16
-        pop             {lr}
-endfunc
-
-function \type\()_h264_qpel8_h_lowpass_l2_neon
-1:      vld1.8          {d0, d1},  [r1], r2
-        vld1.8          {d16,d17}, [r1], r2
-        vld1.8          {d28},     [r3], r2
-        vld1.8          {d29},     [r3], r2
-        subs            r12, r12, #2
-        lowpass_8       d0,  d1,  d16, d17, d0,  d1
-        vrhadd.u8       q0,  q0,  q14
-  .ifc \type,avg
-        vld1.8          {d2},      [r0,:64], r2
-        vrhadd.u8       d0,  d0,  d2
-        vld1.8          {d3},      [r0,:64]
-        vrhadd.u8       d1,  d1,  d3
-        sub             r0,  r0,  r2
-  .endif
-        vst1.8          {d0},      [r0,:64], r2
-        vst1.8          {d1},      [r0,:64], r2
-        bne             1b
-        bx              lr
-endfunc
-.endm
-
-        h264_qpel_h_lowpass_l2 put
-        h264_qpel_h_lowpass_l2 avg
-
-function put_h264_qpel16_v_lowpass_neon_packed
-        mov             r4,  lr
-        mov             r2,  #8
-        bl              put_h264_qpel8_v_lowpass_neon
-        sub             r1,  r1,  r3, lsl #2
-        bl              put_h264_qpel8_v_lowpass_neon
-        sub             r1,  r1,  r3, lsl #4
-        sub             r1,  r1,  r3, lsl #2
-        add             r1,  r1,  #8
-        bl              put_h264_qpel8_v_lowpass_neon
-        sub             r1,  r1,  r3, lsl #2
-        mov             lr,  r4
-        b               put_h264_qpel8_v_lowpass_neon
-endfunc
-
-.macro  h264_qpel_v_lowpass type
-function \type\()_h264_qpel16_v_lowpass_neon
-        mov             r4,  lr
-        bl              \type\()_h264_qpel8_v_lowpass_neon
-        sub             r1,  r1,  r3, lsl #2
-        bl              \type\()_h264_qpel8_v_lowpass_neon
-        sub             r0,  r0,  r2, lsl #4
-        add             r0,  r0,  #8
-        sub             r1,  r1,  r3, lsl #4
-        sub             r1,  r1,  r3, lsl #2
-        add             r1,  r1,  #8
-        bl              \type\()_h264_qpel8_v_lowpass_neon
-        sub             r1,  r1,  r3, lsl #2
-        mov             lr,  r4
-endfunc
-
-function \type\()_h264_qpel8_v_lowpass_neon
-        vld1.8          {d8},  [r1], r3
-        vld1.8          {d10}, [r1], r3
-        vld1.8          {d12}, [r1], r3
-        vld1.8          {d14}, [r1], r3
-        vld1.8          {d22}, [r1], r3
-        vld1.8          {d24}, [r1], r3
-        vld1.8          {d26}, [r1], r3
-        vld1.8          {d28}, [r1], r3
-        vld1.8          {d9},  [r1], r3
-        vld1.8          {d11}, [r1], r3
-        vld1.8          {d13}, [r1], r3
-        vld1.8          {d15}, [r1], r3
-        vld1.8          {d23}, [r1]
-
-        transpose_8x8   q4,  q5,  q6,  q7,  q11, q12, q13, q14
-        lowpass_8       d8,  d9,  d10, d11, d8,  d10
-        lowpass_8       d12, d13, d14, d15, d12, d14
-        lowpass_8       d22, d23, d24, d25, d22, d24
-        lowpass_8       d26, d27, d28, d29, d26, d28
-        transpose_8x8   d8,  d10, d12, d14, d22, d24, d26, d28
-
-  .ifc \type,avg
-        vld1.8          {d9},  [r0,:64], r2
-        vrhadd.u8       d8,  d8,  d9
-        vld1.8          {d11}, [r0,:64], r2
-        vrhadd.u8       d10, d10, d11
-        vld1.8          {d13}, [r0,:64], r2
-        vrhadd.u8       d12, d12, d13
-        vld1.8          {d15}, [r0,:64], r2
-        vrhadd.u8       d14, d14, d15
-        vld1.8          {d23}, [r0,:64], r2
-        vrhadd.u8       d22, d22, d23
-        vld1.8          {d25}, [r0,:64], r2
-        vrhadd.u8       d24, d24, d25
-        vld1.8          {d27}, [r0,:64], r2
-        vrhadd.u8       d26, d26, d27
-        vld1.8          {d29}, [r0,:64], r2
-        vrhadd.u8       d28, d28, d29
-        sub             r0,  r0,  r2,  lsl #3
-  .endif
-
-        vst1.8          {d8},  [r0,:64], r2
-        vst1.8          {d10}, [r0,:64], r2
-        vst1.8          {d12}, [r0,:64], r2
-        vst1.8          {d14}, [r0,:64], r2
-        vst1.8          {d22}, [r0,:64], r2
-        vst1.8          {d24}, [r0,:64], r2
-        vst1.8          {d26}, [r0,:64], r2
-        vst1.8          {d28}, [r0,:64], r2
-
-        bx              lr
-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             r4,  lr
-        bl              \type\()_h264_qpel8_v_lowpass_l2_neon
-        sub             r1,  r1,  r3, lsl #2
-        bl              \type\()_h264_qpel8_v_lowpass_l2_neon
-        sub             r0,  r0,  r3, lsl #4
-        sub             r12, r12, r2, lsl #4
-        add             r0,  r0,  #8
-        add             r12, r12, #8
-        sub             r1,  r1,  r3, lsl #4
-        sub             r1,  r1,  r3, lsl #2
-        add             r1,  r1,  #8
-        bl              \type\()_h264_qpel8_v_lowpass_l2_neon
-        sub             r1,  r1,  r3, lsl #2
-        mov             lr,  r4
-endfunc
-
-function \type\()_h264_qpel8_v_lowpass_l2_neon
-        vld1.8          {d8},  [r1], r3
-        vld1.8          {d10}, [r1], r3
-        vld1.8          {d12}, [r1], r3
-        vld1.8          {d14}, [r1], r3
-        vld1.8          {d22}, [r1], r3
-        vld1.8          {d24}, [r1], r3
-        vld1.8          {d26}, [r1], r3
-        vld1.8          {d28}, [r1], r3
-        vld1.8          {d9},  [r1], r3
-        vld1.8          {d11}, [r1], r3
-        vld1.8          {d13}, [r1], r3
-        vld1.8          {d15}, [r1], r3
-        vld1.8          {d23}, [r1]
-
-        transpose_8x8   q4,  q5,  q6,  q7,  q11, q12, q13, q14
-        lowpass_8       d8,  d9,  d10, d11, d8,  d9
-        lowpass_8       d12, d13, d14, d15, d12, d13
-        lowpass_8       d22, d23, d24, d25, d22, d23
-        lowpass_8       d26, d27, d28, d29, d26, d27
-        transpose_8x8   d8,  d9,  d12, d13, d22, d23, d26, d27
-
-        vld1.8          {d0},  [r12], r2
-        vld1.8          {d1},  [r12], r2
-        vld1.8          {d2},  [r12], r2
-        vld1.8          {d3},  [r12], r2
-        vld1.8          {d4},  [r12], r2
-        vrhadd.u8       q0,  q0,  q4
-        vld1.8          {d5},  [r12], r2
-        vrhadd.u8       q1,  q1,  q6
-        vld1.8          {d10}, [r12], r2
-        vrhadd.u8       q2,  q2,  q11
-        vld1.8          {d11}, [r12], r2
-        vrhadd.u8       q5,  q5,  q13
-
-  .ifc \type,avg
-        vld1.8          {d16}, [r0,:64], r3
-        vrhadd.u8       d0,  d0,  d16
-        vld1.8          {d17}, [r0,:64], r3
-        vrhadd.u8       d1,  d1,  d17
-        vld1.8          {d16}, [r0,:64], r3
-        vrhadd.u8       d2,  d2,  d16
-        vld1.8          {d17}, [r0,:64], r3
-        vrhadd.u8       d3,  d3,  d17
-        vld1.8          {d16}, [r0,:64], r3
-        vrhadd.u8       d4,  d4,  d16
-        vld1.8          {d17}, [r0,:64], r3
-        vrhadd.u8       d5,  d5,  d17
-        vld1.8          {d16}, [r0,:64], r3
-        vrhadd.u8       d10, d10, d16
-        vld1.8          {d17}, [r0,:64], r3
-        vrhadd.u8       d11, d11, d17
-        sub             r0,  r0,  r3,  lsl #3
-  .endif
-
-        vst1.8          {d0},  [r0,:64], r3
-        vst1.8          {d1},  [r0,:64], r3
-        vst1.8          {d2},  [r0,:64], r3
-        vst1.8          {d3},  [r0,:64], r3
-        vst1.8          {d4},  [r0,:64], r3
-        vst1.8          {d5},  [r0,:64], r3
-        vst1.8          {d10}, [r0,:64], r3
-        vst1.8          {d11}, [r0,:64], r3
-
-        bx              lr
-endfunc
-.endm
-
-        h264_qpel_v_lowpass_l2 put
-        h264_qpel_v_lowpass_l2 avg
-
-function put_h264_qpel8_hv_lowpass_neon_top
-        lowpass_const   r12
-        mov             r12, #12
-1:      vld1.8          {d0, d1},  [r1], r3
-        vld1.8          {d16,d17}, [r1], r3
-        subs            r12, r12, #2
-        lowpass_8       d0,  d1,  d16, d17, q11, q12, narrow=0
-        vst1.8          {d22-d25}, [r4,:128]!
-        bne             1b
-
-        vld1.8          {d0, d1},  [r1]
-        lowpass_8_1     d0,  d1,  q12, narrow=0
-
-        mov             r12, #-16
-        add             r4,  r4,  r12
-        vld1.8          {d30,d31}, [r4,:128], r12
-        vld1.8          {d20,d21}, [r4,:128], r12
-        vld1.8          {d18,d19}, [r4,:128], r12
-        vld1.8          {d16,d17}, [r4,:128], r12
-        vld1.8          {d14,d15}, [r4,:128], r12
-        vld1.8          {d12,d13}, [r4,:128], r12
-        vld1.8          {d10,d11}, [r4,:128], r12
-        vld1.8          {d8, d9},  [r4,:128], r12
-        vld1.8          {d6, d7},  [r4,:128], r12
-        vld1.8          {d4, d5},  [r4,:128], r12
-        vld1.8          {d2, d3},  [r4,:128], r12
-        vld1.8          {d0, d1},  [r4,:128]
-
-        swap4           d1,  d3,  d5,  d7,  d8,  d10, d12, d14
-        transpose16_4x4 q0,  q1,  q2,  q3,  q4,  q5,  q6,  q7
-
-        swap4           d17, d19, d21, d31, d24, d26, d28, d22
-        transpose16_4x4 q8,  q9,  q10, q15, q12, q13, q14, q11
-
-        vst1.8          {d30,d31}, [r4,:128]!
-        vst1.8          {d6, d7},  [r4,:128]!
-        vst1.8          {d20,d21}, [r4,:128]!
-        vst1.8          {d4, d5},  [r4,:128]!
-        vst1.8          {d18,d19}, [r4,:128]!
-        vst1.8          {d2, d3},  [r4,:128]!
-        vst1.8          {d16,d17}, [r4,:128]!
-        vst1.8          {d0, d1},  [r4,:128]
-
-        lowpass_8.16    q4,  q12, d8,  d9,  d24, d25, d8
-        lowpass_8.16    q5,  q13, d10, d11, d26, d27, d9
-        lowpass_8.16    q6,  q14, d12, d13, d28, d29, d10
-        lowpass_8.16    q7,  q11, d14, d15, d22, d23, d11
-
-        vld1.8          {d16,d17}, [r4,:128], r12
-        vld1.8          {d30,d31}, [r4,:128], r12
-        lowpass_8.16    q8,  q15, d16, d17, d30, d31, d12
-        vld1.8          {d16,d17}, [r4,:128], r12
-        vld1.8          {d30,d31}, [r4,:128], r12
-        lowpass_8.16    q8,  q15, d16, d17, d30, d31, d13
-        vld1.8          {d16,d17}, [r4,:128], r12
-        vld1.8          {d30,d31}, [r4,:128], r12
-        lowpass_8.16    q8,  q15, d16, d17, d30, d31, d14
-        vld1.8          {d16,d17}, [r4,:128], r12
-        vld1.8          {d30,d31}, [r4,:128]
-        lowpass_8.16    q8,  q15, d16, d17, d30, d31, d15
-
-        transpose_8x8   d12, d13, d14, d15, d8,  d9,  d10, d11
-
-        bx              lr
-endfunc
-
-.macro  h264_qpel8_hv_lowpass type
-function \type\()_h264_qpel8_hv_lowpass_neon
-        mov             r10, lr
-        bl              put_h264_qpel8_hv_lowpass_neon_top
-  .ifc \type,avg
-        vld1.8          {d0},      [r0,:64], r2
-        vrhadd.u8       d12, d12, d0
-        vld1.8          {d1},      [r0,:64], r2
-        vrhadd.u8       d13, d13, d1
-        vld1.8          {d2},      [r0,:64], r2
-        vrhadd.u8       d14, d14, d2
-        vld1.8          {d3},      [r0,:64], r2
-        vrhadd.u8       d15, d15, d3
-        vld1.8          {d4},      [r0,:64], r2
-        vrhadd.u8       d8,  d8,  d4
-        vld1.8          {d5},      [r0,:64], r2
-        vrhadd.u8       d9,  d9,  d5
-        vld1.8          {d6},      [r0,:64], r2
-        vrhadd.u8       d10, d10, d6
-        vld1.8          {d7},      [r0,:64], r2
-        vrhadd.u8       d11, d11, d7
-        sub             r0,  r0,  r2,  lsl #3
-  .endif
-
-        vst1.8          {d12},     [r0,:64], r2
-        vst1.8          {d13},     [r0,:64], r2
-        vst1.8          {d14},     [r0,:64], r2
-        vst1.8          {d15},     [r0,:64], r2
-        vst1.8          {d8},      [r0,:64], r2
-        vst1.8          {d9},      [r0,:64], r2
-        vst1.8          {d10},     [r0,:64], r2
-        vst1.8          {d11},     [r0,:64], r2
-
-        mov             lr,  r10
-        bx              lr
-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             r10, lr
-        bl              put_h264_qpel8_hv_lowpass_neon_top
-
-        vld1.8          {d0, d1},  [r2,:128]!
-        vld1.8          {d2, d3},  [r2,:128]!
-        vrhadd.u8       q0,  q0,  q6
-        vld1.8          {d4, d5},  [r2,:128]!
-        vrhadd.u8       q1,  q1,  q7
-        vld1.8          {d6, d7},  [r2,:128]!
-        vrhadd.u8       q2,  q2,  q4
-        vrhadd.u8       q3,  q3,  q5
-  .ifc \type,avg
-        vld1.8          {d16},     [r0,:64], r3
-        vrhadd.u8       d0,  d0,  d16
-        vld1.8          {d17},     [r0,:64], r3
-        vrhadd.u8       d1,  d1,  d17
-        vld1.8          {d18},     [r0,:64], r3
-        vrhadd.u8       d2,  d2,  d18
-        vld1.8          {d19},     [r0,:64], r3
-        vrhadd.u8       d3,  d3,  d19
-        vld1.8          {d20},     [r0,:64], r3
-        vrhadd.u8       d4,  d4,  d20
-        vld1.8          {d21},     [r0,:64], r3
-        vrhadd.u8       d5,  d5,  d21
-        vld1.8          {d22},     [r0,:64], r3
-        vrhadd.u8       d6,  d6,  d22
-        vld1.8          {d23},     [r0,:64], r3
-        vrhadd.u8       d7,  d7,  d23
-        sub             r0,  r0,  r3,  lsl #3
-  .endif
-        vst1.8          {d0},      [r0,:64], r3
-        vst1.8          {d1},      [r0,:64], r3
-        vst1.8          {d2},      [r0,:64], r3
-        vst1.8          {d3},      [r0,:64], r3
-        vst1.8          {d4},      [r0,:64], r3
-        vst1.8          {d5},      [r0,:64], r3
-        vst1.8          {d6},      [r0,:64], r3
-        vst1.8          {d7},      [r0,:64], r3
-
-        mov             lr,  r10
-        bx              lr
-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             r9,  lr
-        bl              \type\()_h264_qpel8_hv_lowpass_neon
-        sub             r1,  r1,  r3, lsl #2
-        bl              \type\()_h264_qpel8_hv_lowpass_neon
-        sub             r1,  r1,  r3, lsl #4
-        sub             r1,  r1,  r3, lsl #2
-        add             r1,  r1,  #8
-        sub             r0,  r0,  r2, lsl #4
-        add             r0,  r0,  #8
-        bl              \type\()_h264_qpel8_hv_lowpass_neon
-        sub             r1,  r1,  r3, lsl #2
-        mov             lr,  r9
-        b               \type\()_h264_qpel8_hv_lowpass_neon
-endfunc
-
-function \type\()_h264_qpel16_hv_lowpass_l2_neon
-        mov             r9,  lr
-        sub             r2,  r4,  #256
-        bl              \type\()_h264_qpel8_hv_lowpass_l2_neon
-        sub             r1,  r1,  r3, lsl #2
-        bl              \type\()_h264_qpel8_hv_lowpass_l2_neon
-        sub             r1,  r1,  r3, lsl #4
-        sub             r1,  r1,  r3, lsl #2
-        add             r1,  r1,  #8
-        sub             r0,  r0,  r3, lsl #4
-        add             r0,  r0,  #8
-        bl              \type\()_h264_qpel8_hv_lowpass_l2_neon
-        sub             r1,  r1,  r3, lsl #2
-        mov             lr,  r9
-        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   r3
-        mov             r3,  r1
-        sub             r1,  r1,  #2
-        mov             r12, #8
-        b               \type\()_h264_qpel8_h_lowpass_l2_neon
-endfunc
-
-function ff_\type\()_h264_qpel8_mc20_neon, export=1
-        lowpass_const   r3
-        sub             r1,  r1,  #2
-        mov             r3,  r2
-        mov             r12, #8
-        b               \type\()_h264_qpel8_h_lowpass_neon
-endfunc
-
-function ff_\type\()_h264_qpel8_mc30_neon, export=1
-        lowpass_const   r3
-        add             r3,  r1,  #1
-        sub             r1,  r1,  #2
-        mov             r12, #8
-        b               \type\()_h264_qpel8_h_lowpass_l2_neon
-endfunc
-
-function ff_\type\()_h264_qpel8_mc01_neon, export=1
-        push            {lr}
-        mov             r12, r1
-\type\()_h264_qpel8_mc01:
-        lowpass_const   r3
-        mov             r3,  r2
-        sub             r1,  r1,  r2, lsl #1
-        vpush           {d8-d15}
-        bl              \type\()_h264_qpel8_v_lowpass_l2_neon
-        vpop            {d8-d15}
-        pop             {pc}
-endfunc
-
-function ff_\type\()_h264_qpel8_mc11_neon, export=1
-        push            {r0, r1, r11, lr}
-\type\()_h264_qpel8_mc11:
-        lowpass_const   r3
-        mov             r11, sp
-A       bic             sp,  sp,  #15
-T       bic             r0,  r11, #15
-T       mov             sp,  r0
-        sub             sp,  sp,  #64
-        mov             r0,  sp
-        sub             r1,  r1,  #2
-        mov             r3,  #8
-        mov             r12, #8
-        vpush           {d8-d15}
-        bl              put_h264_qpel8_h_lowpass_neon
-        ldrd            r0,  r1,  [r11], #8
-        mov             r3,  r2
-        add             r12, sp,  #64
-        sub             r1,  r1,  r2, lsl #1
-        mov             r2,  #8
-        bl              \type\()_h264_qpel8_v_lowpass_l2_neon
-        vpop            {d8-d15}
-        mov             sp,  r11
-        pop             {r11, pc}
-endfunc
-
-function ff_\type\()_h264_qpel8_mc21_neon, export=1
-        push            {r0, r1, r4, r10, r11, lr}
-\type\()_h264_qpel8_mc21:
-        lowpass_const   r3
-        mov             r11, sp
-A       bic             sp,  sp,  #15
-T       bic             r0,  r11, #15
-T       mov             sp,  r0
-        sub             sp,  sp,  #(8*8+16*12)
-        sub             r1,  r1,  #2
-        mov             r3,  #8
-        mov             r0,  sp
-        mov             r12, #8
-        vpush           {d8-d15}
-        bl              put_h264_qpel8_h_lowpass_neon
-        mov             r4,  r0
-        ldrd            r0,  r1,  [r11], #8
-        sub             r1,  r1,  r2, lsl #1
-        sub             r1,  r1,  #2
-        mov             r3,  r2
-        sub             r2,  r4,  #64
-        bl              \type\()_h264_qpel8_hv_lowpass_l2_neon
-        vpop            {d8-d15}
-        mov             sp,  r11
-        pop             {r4, r10, r11, pc}
-endfunc
-
-function ff_\type\()_h264_qpel8_mc31_neon, export=1
-        add             r1,  r1,  #1
-        push            {r0, r1, r11, lr}
-        sub             r1,  r1,  #1
-        b               \type\()_h264_qpel8_mc11
-endfunc
-
-function ff_\type\()_h264_qpel8_mc02_neon, export=1
-        push            {lr}
-        lowpass_const   r3
-        sub             r1,  r1,  r2, lsl #1
-        mov             r3,  r2
-        vpush           {d8-d15}
-        bl              \type\()_h264_qpel8_v_lowpass_neon
-        vpop            {d8-d15}
-        pop             {pc}
-endfunc
-
-function ff_\type\()_h264_qpel8_mc12_neon, export=1
-        push            {r0, r1, r4, r10, r11, lr}
-\type\()_h264_qpel8_mc12:
-        lowpass_const   r3
-        mov             r11, sp
-A       bic             sp,  sp,  #15
-T       bic             r0,  r11, #15
-T       mov             sp,  r0
-        sub             sp,  sp,  #(8*8+16*12)
-        sub             r1,  r1,  r2, lsl #1
-        mov             r3,  r2
-        mov             r2,  #8
-        mov             r0,  sp
-        vpush           {d8-d15}
-        bl              put_h264_qpel8_v_lowpass_neon
-        mov             r4,  r0
-        ldrd            r0,  r1,  [r11], #8
-        sub             r1,  r1,  r3, lsl #1
-        sub             r1,  r1,  #2
-        sub             r2,  r4,  #64
-        bl              \type\()_h264_qpel8_hv_lowpass_l2_neon
-        vpop            {d8-d15}
-        mov             sp,  r11
-        pop             {r4, r10, r11, pc}
-endfunc
-
-function ff_\type\()_h264_qpel8_mc22_neon, export=1
-        push            {r4, r10, r11, lr}
-        mov             r11, sp
-A       bic             sp,  sp,  #15
-T       bic             r4,  r11, #15
-T       mov             sp,  r4
-        sub             r1,  r1,  r2, lsl #1
-        sub             r1,  r1,  #2
-        mov             r3,  r2
-        sub             sp,  sp,  #(16*12)
-        mov             r4,  sp
-        vpush           {d8-d15}
-        bl              \type\()_h264_qpel8_hv_lowpass_neon
-        vpop            {d8-d15}
-        mov             sp,  r11
-        pop             {r4, r10, r11, pc}
-endfunc
-
-function ff_\type\()_h264_qpel8_mc32_neon, export=1
-        push            {r0, r1, r4, r10, r11, lr}
-        add             r1,  r1,  #1
-        b               \type\()_h264_qpel8_mc12
-endfunc
-
-function ff_\type\()_h264_qpel8_mc03_neon, export=1
-        push            {lr}
-        add             r12, r1,  r2
-        b               \type\()_h264_qpel8_mc01
-endfunc
-
-function ff_\type\()_h264_qpel8_mc13_neon, export=1
-        push            {r0, r1, r11, lr}
-        add             r1,  r1,  r2
-        b               \type\()_h264_qpel8_mc11
-endfunc
-
-function ff_\type\()_h264_qpel8_mc23_neon, export=1
-        push            {r0, r1, r4, r10, r11, lr}
-        add             r1,  r1,  r2
-        b               \type\()_h264_qpel8_mc21
-endfunc
-
-function ff_\type\()_h264_qpel8_mc33_neon, export=1
-        add             r1,  r1,  #1
-        push            {r0, r1, r11, lr}
-        add             r1,  r1,  r2
-        sub             r1,  r1,  #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   r3
-        mov             r3,  r1
-        sub             r1,  r1,  #2
-        b               \type\()_h264_qpel16_h_lowpass_l2_neon
-endfunc
-
-function ff_\type\()_h264_qpel16_mc20_neon, export=1
-        lowpass_const   r3
-        sub             r1,  r1,  #2
-        mov             r3,  r2
-        b               \type\()_h264_qpel16_h_lowpass_neon
-endfunc
-
-function ff_\type\()_h264_qpel16_mc30_neon, export=1
-        lowpass_const   r3
-        add             r3,  r1,  #1
-        sub             r1,  r1,  #2
-        b               \type\()_h264_qpel16_h_lowpass_l2_neon
-endfunc
-
-function ff_\type\()_h264_qpel16_mc01_neon, export=1
-        push            {r4, lr}
-        mov             r12, r1
-\type\()_h264_qpel16_mc01:
-        lowpass_const   r3
-        mov             r3,  r2
-        sub             r1,  r1,  r2, lsl #1
-        vpush           {d8-d15}
-        bl              \type\()_h264_qpel16_v_lowpass_l2_neon
-        vpop            {d8-d15}
-        pop             {r4, pc}
-endfunc
-
-function ff_\type\()_h264_qpel16_mc11_neon, export=1
-        push            {r0, r1, r4, r11, lr}
-\type\()_h264_qpel16_mc11:
-        lowpass_const   r3
-        mov             r11, sp
-A       bic             sp,  sp,  #15
-T       bic             r0,  r11, #15
-T       mov             sp,  r0
-        sub             sp,  sp,  #256
-        mov             r0,  sp
-        sub             r1,  r1,  #2
-        mov             r3,  #16
-        vpush           {d8-d15}
-        bl              put_h264_qpel16_h_lowpass_neon
-        ldrd            r0,  r1,  [r11], #8
-        mov             r3,  r2
-        add             r12, sp,  #64
-        sub             r1,  r1,  r2, lsl #1
-        mov             r2,  #16
-        bl              \type\()_h264_qpel16_v_lowpass_l2_neon
-        vpop            {d8-d15}
-        mov             sp,  r11
-        pop             {r4, r11, pc}
-endfunc
-
-function ff_\type\()_h264_qpel16_mc21_neon, export=1
-        push            {r0, r1, r4-r5, r9-r11, lr}
-\type\()_h264_qpel16_mc21:
-        lowpass_const   r3
-        mov             r11, sp
-A       bic             sp,  sp,  #15
-T       bic             r0,  r11, #15
-T       mov             sp,  r0
-        sub             sp,  sp,  #(16*16+16*12)
-        sub             r1,  r1,  #2
-        mov             r0,  sp
-        vpush           {d8-d15}
-        bl              put_h264_qpel16_h_lowpass_neon_packed
-        mov             r4,  r0
-        ldrd            r0,  r1,  [r11], #8
-        sub             r1,  r1,  r2, lsl #1
-        sub             r1,  r1,  #2
-        mov             r3,  r2
-        bl              \type\()_h264_qpel16_hv_lowpass_l2_neon
-        vpop            {d8-d15}
-        mov             sp,  r11
-        pop             {r4-r5, r9-r11, pc}
-endfunc
-
-function ff_\type\()_h264_qpel16_mc31_neon, export=1
-        add             r1,  r1,  #1
-        push            {r0, r1, r4, r11, lr}
-        sub             r1,  r1,  #1
-        b               \type\()_h264_qpel16_mc11
-endfunc
-
-function ff_\type\()_h264_qpel16_mc02_neon, export=1
-        push            {r4, lr}
-        lowpass_const   r3
-        sub             r1,  r1,  r2, lsl #1
-        mov             r3,  r2
-        vpush           {d8-d15}
-        bl              \type\()_h264_qpel16_v_lowpass_neon
-        vpop            {d8-d15}
-        pop             {r4, pc}
-endfunc
-
-function ff_\type\()_h264_qpel16_mc12_neon, export=1
-        push            {r0, r1, r4-r5, r9-r11, lr}
-\type\()_h264_qpel16_mc12:
-        lowpass_const   r3
-        mov             r11, sp
-A       bic             sp,  sp,  #15
-T       bic             r0,  r11, #15
-T       mov             sp,  r0
-        sub             sp,  sp,  #(16*16+16*12)
-        sub             r1,  r1,  r2, lsl #1
-        mov             r0,  sp
-        mov             r3,  r2
-        vpush           {d8-d15}
-        bl              put_h264_qpel16_v_lowpass_neon_packed
-        mov             r4,  r0
-        ldrd            r0,  r1,  [r11], #8
-        sub             r1,  r1,  r3, lsl #1
-        sub             r1,  r1,  #2
-        mov             r2,  r3
-        bl              \type\()_h264_qpel16_hv_lowpass_l2_neon
-        vpop            {d8-d15}
-        mov             sp,  r11
-        pop             {r4-r5, r9-r11, pc}
-endfunc
-
-function ff_\type\()_h264_qpel16_mc22_neon, export=1
-        push            {r4, r9-r11, lr}
-        lowpass_const   r3
-        mov             r11, sp
-A       bic             sp,  sp,  #15
-T       bic             r4,  r11, #15
-T       mov             sp,  r4
-        sub             r1,  r1,  r2, lsl #1
-        sub             r1,  r1,  #2
-        mov             r3,  r2
-        sub             sp,  sp,  #(16*12)
-        mov             r4,  sp
-        vpush           {d8-d15}
-        bl              \type\()_h264_qpel16_hv_lowpass_neon
-        vpop            {d8-d15}
-        mov             sp,  r11
-        pop             {r4, r9-r11, pc}
-endfunc
-
-function ff_\type\()_h264_qpel16_mc32_neon, export=1
-        push            {r0, r1, r4-r5, r9-r11, lr}
-        add             r1,  r1,  #1
-        b               \type\()_h264_qpel16_mc12
-endfunc
-
-function ff_\type\()_h264_qpel16_mc03_neon, export=1
-        push            {r4, lr}
-        add             r12, r1,  r2
-        b               \type\()_h264_qpel16_mc01
-endfunc
-
-function ff_\type\()_h264_qpel16_mc13_neon, export=1
-        push            {r0, r1, r4, r11, lr}
-        add             r1,  r1,  r2
-        b               \type\()_h264_qpel16_mc11
-endfunc
-
-function ff_\type\()_h264_qpel16_mc23_neon, export=1
-        push            {r0, r1, r4-r5, r9-r11, lr}
-        add             r1,  r1,  r2
-        b               \type\()_h264_qpel16_mc21
-endfunc
-
-function ff_\type\()_h264_qpel16_mc33_neon, export=1
-        add             r1,  r1,  #1
-        push            {r0, r1, r4, r11, lr}
-        add             r1,  r1,  r2
-        sub             r1,  r1,  #1
-        b               \type\()_h264_qpel16_mc11
-endfunc
-.endm
-
-        h264_qpel16 put
-        h264_qpel16 avg
-
 @ Biweighted prediction
 
 .macro  biweight_16     macs, macd

libav-v9.6.tar.bz2/libavcodec/arm/h264idct_neon.S -> libav-v10.1.tar.bz2/libavcodec/arm/h264idct_neon.S Changed

@@ -22,9 +22,12 @@
 
 function ff_h264_idct_add_neon, export=1
         vld1.64         {d0-d3},  [r1,:128]
+        vmov.i16        q15, #0
 
         vswp            d1,  d2
+        vst1.16         {q15},    [r1,:128]!
         vadd.i16        d4,  d0,  d1
+        vst1.16         {q15},    [r1,:128]!
         vshr.s16        q8,  q1,  #1
         vsub.i16        d5,  d0,  d1
         vadd.i16        d6,  d2,  d17
@@ -65,11 +68,14 @@
         vst1.32         {d0[1]},  [r0,:32], r2
         vst1.32         {d1[0]},  [r0,:32], r2
 
+        sub             r1,  r1,  #32
         bx              lr
 endfunc
 
 function ff_h264_idct_dc_add_neon, export=1
+        mov             r3,       #0
         vld1.16         {d2[],d3[]}, [r1,:16]
+        strh            r3,       [r1]
         vrshr.s16       q1,  q1,  #6
         vld1.32         {d0[0]},  [r0,:32], r2
         vld1.32         {d0[1]},  [r0,:32], r2
@@ -107,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
@@ -132,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
@@ -148,7 +154,7 @@
         add             r5,  r1,  #16*4
         add             r1,  r2,  #16*32
         mov             r2,  r3
-        mov             r3,  r1
+        mov             r10, r1
         ldr             r6,  [sp, #32]
         movrel          r7,  scan8+16
         mov             r12, #0
@@ -156,12 +162,12 @@
         ldr             r0,  [r5, r12, lsl #2]
         ldrb            r8,  [r6, r8]
         add             r0,  r0,  r4
-        add             r1,  r3,  r12, lsl #5
+        add             r1,  r10, r12, lsl #5
         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
@@ -180,7 +186,9 @@
         qb      .req    q14
         vshr.s16        q2,  q10, #1
         vadd.i16        q0,  q8,  q12
-        vld1.16         {q14-q15},[r1,:128]!
+        vld1.16         {q14-q15},[r1,:128]
+        vst1.16         {q3},     [r1,:128]!
+        vst1.16         {q3},     [r1,:128]!
         vsub.i16        q1,  q8,  q12
         vshr.s16        q3,  q14, #1
         vsub.i16        q2,  q2,  q14
@@ -259,9 +267,16 @@
 .endm
 
 function ff_h264_idct8_add_neon, export=1
-        vld1.16         {q8-q9},  [r1,:128]!
-        vld1.16         {q10-q11},[r1,:128]!
-        vld1.16         {q12-q13},[r1,:128]!
+        vmov.i16        q3,       #0
+        vld1.16         {q8-q9},  [r1,:128]
+        vst1.16         {q3},     [r1,:128]!
+        vst1.16         {q3},     [r1,:128]!
+        vld1.16         {q10-q11},[r1,:128]
+        vst1.16         {q3},     [r1,:128]!
+        vst1.16         {q3},     [r1,:128]!
+        vld1.16         {q12-q13},[r1,:128]
+        vst1.16         {q3},     [r1,:128]!
+        vst1.16         {q3},     [r1,:128]!
 
         idct8x8_cols    0
         idct8x8_cols    1
@@ -313,7 +328,9 @@
 endfunc
 
 function ff_h264_idct8_dc_add_neon, export=1
+        mov             r3,       #0
         vld1.16         {d30[],d31[]},[r1,:16]
+        strh            r3,       [r1]
         vld1.32         {d0},     [r0,:64], r2
         vrshr.s16       q15, q15, #6
         vld1.32         {d1},     [r0,:64], r2
@@ -371,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

libav-v9.6.tar.bz2/libavcodec/arm/h264pred_init_arm.c -> libav-v10.1.tar.bz2/libavcodec/arm/h264pred_init_arm.c Changed

@@ -20,7 +20,9 @@
 
 #include <stdint.h>
 
+#include "libavutil/attributes.h"
 #include "libavutil/arm/cpu.h"
+#include "libavcodec/avcodec.h"
 #include "libavcodec/h264pred.h"
 
 void ff_pred16x16_vert_neon(uint8_t *src, ptrdiff_t stride);
@@ -43,7 +45,9 @@
 void ff_pred8x8_l00_dc_neon(uint8_t *src, ptrdiff_t stride);
 void ff_pred8x8_0l0_dc_neon(uint8_t *src, ptrdiff_t stride);
 
-static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc)
+static av_cold void h264_pred_init_neon(H264PredContext *h, int codec_id,
+ const int bit_depth,
+ const int chroma_format_idc)
 {
 const int high_depth = bit_depth > 8;
 
@@ -75,10 +79,11 @@
 h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_plane_neon;
 }
 
-void ff_h264_pred_init_arm(H264PredContext *h, int codec_id, int bit_depth, const int chroma_format_idc)
+av_cold void ff_h264_pred_init_arm(H264PredContext *h, int codec_id,
+ int bit_depth, const int chroma_format_idc)
 {
 int cpu_flags = av_get_cpu_flags();
 
 if (have_neon(cpu_flags))
- ff_h264_pred_init_neon(h, codec_id, bit_depth, chroma_format_idc);
+ h264_pred_init_neon(h, codec_id, bit_depth, chroma_format_idc);
 }

libav-v10.1.tar.bz2/libavcodec/arm/h264qpel_init_arm.c Added

@@ -0,0 +1,171 @@
+/*
+ * ARM NEON optimised DSP functions
+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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/arm/cpu.h"
+#include "libavcodec/h264qpel.h"
+
+void ff_put_h264_qpel16_mc00_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel16_mc10_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel16_mc20_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel16_mc30_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel16_mc01_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel16_mc11_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel16_mc21_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel16_mc31_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel16_mc02_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel16_mc12_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel16_mc22_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel16_mc32_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel16_mc03_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel16_mc13_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel16_mc23_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel16_mc33_neon(uint8_t *, uint8_t *, ptrdiff_t);
+
+void ff_put_h264_qpel8_mc00_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel8_mc10_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel8_mc20_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel8_mc30_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel8_mc01_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel8_mc11_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel8_mc21_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel8_mc31_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel8_mc02_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel8_mc12_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel8_mc22_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel8_mc32_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel8_mc03_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel8_mc13_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel8_mc23_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_put_h264_qpel8_mc33_neon(uint8_t *, uint8_t *, ptrdiff_t);
+
+void ff_avg_h264_qpel16_mc00_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel16_mc10_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel16_mc20_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel16_mc30_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel16_mc01_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel16_mc11_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel16_mc21_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel16_mc31_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel16_mc02_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel16_mc12_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel16_mc22_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel16_mc32_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel16_mc03_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel16_mc13_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel16_mc23_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel16_mc33_neon(uint8_t *, uint8_t *, ptrdiff_t);
+
+void ff_avg_h264_qpel8_mc00_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel8_mc10_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel8_mc20_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel8_mc30_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel8_mc01_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel8_mc11_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel8_mc21_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel8_mc31_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel8_mc02_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel8_mc12_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel8_mc22_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel8_mc32_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel8_mc03_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel8_mc13_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel8_mc23_neon(uint8_t *, uint8_t *, ptrdiff_t);
+void ff_avg_h264_qpel8_mc33_neon(uint8_t *, uint8_t *, ptrdiff_t);
+
+av_cold void ff_h264qpel_init_arm(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;
+ }
+}

libav-v10.1.tar.bz2/libavcodec/arm/h264qpel_neon.S Added

@@ -0,0 +1,955 @@
+/*
+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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"
+
+ /* H.264 qpel MC */
+
+.macro lowpass_const r
+ movw \r, #5
+ movt \r, #20
+ vmov.32 d6[0], \r
+.endm
+
+.macro lowpass_8 r0, r1, r2, r3, d0, d1, narrow=1
+ .if \narrow
+ t0 .req q0
+ t1 .req q8
+ .else
+ t0 .req \d0
+ t1 .req \d1
+ .endif
+ vext.8 d2, \r0, \r1, #2
+ vext.8 d3, \r0, \r1, #3
+ vaddl.u8 q1, d2, d3
+ vext.8 d4, \r0, \r1, #1
+ vext.8 d5, \r0, \r1, #4
+ vaddl.u8 q2, d4, d5
+ vext.8 d30, \r0, \r1, #5
+ vaddl.u8 t0, \r0, d30
+ vext.8 d18, \r2, \r3, #2
+ vmla.i16 t0, q1, d6[1]
+ vext.8 d19, \r2, \r3, #3
+ vaddl.u8 q9, d18, d19
+ vext.8 d20, \r2, \r3, #1
+ vmls.i16 t0, q2, d6[0]
+ vext.8 d21, \r2, \r3, #4
+ vaddl.u8 q10, d20, d21
+ vext.8 d31, \r2, \r3, #5
+ vaddl.u8 t1, \r2, d31
+ vmla.i16 t1, q9, d6[1]
+ vmls.i16 t1, q10, d6[0]
+ .if \narrow
+ vqrshrun.s16 \d0, t0, #5
+ vqrshrun.s16 \d1, t1, #5
+ .endif
+ .unreq t0
+ .unreq t1
+.endm
+
+.macro lowpass_8_1 r0, r1, d0, narrow=1
+ .if \narrow
+ t0 .req q0
+ .else
+ t0 .req \d0
+ .endif
+ vext.8 d2, \r0, \r1, #2
+ vext.8 d3, \r0, \r1, #3
+ vaddl.u8 q1, d2, d3
+ vext.8 d4, \r0, \r1, #1
+ vext.8 d5, \r0, \r1, #4
+ vaddl.u8 q2, d4, d5
+ vext.8 d30, \r0, \r1, #5
+ vaddl.u8 t0, \r0, d30
+ vmla.i16 t0, q1, d6[1]
+ vmls.i16 t0, q2, d6[0]
+ .if \narrow
+ vqrshrun.s16 \d0, t0, #5
+ .endif
+ .unreq t0
+.endm
+
+.macro lowpass_8.16 r0, r1, l0, h0, l1, h1, d
+ vext.16 q1, \r0, \r1, #2
+ vext.16 q0, \r0, \r1, #3
+ vaddl.s16 q9, d2, d0
+ vext.16 q2, \r0, \r1, #1
+ vaddl.s16 q1, d3, d1
+ vext.16 q3, \r0, \r1, #4
+ vaddl.s16 q10, d4, d6
+ vext.16 \r1, \r0, \r1, #5
+ vaddl.s16 q2, d5, d7
+ vaddl.s16 q0, \h0, \h1
+ vaddl.s16 q8, \l0, \l1
+
+ vshl.i32 q3, q9, #4
+ vshl.i32 q9, q9, #2
+ vshl.i32 q15, q10, #2
+ vadd.i32 q9, q9, q3
+ vadd.i32 q10, q10, q15
+
+ vshl.i32 q3, q1, #4
+ vshl.i32 q1, q1, #2
+ vshl.i32 q15, q2, #2
+ vadd.i32 q1, q1, q3
+ vadd.i32 q2, q2, q15
+
+ vadd.i32 q9, q9, q8
+ vsub.i32 q9, q9, q10
+
+ vadd.i32 q1, q1, q0
+ vsub.i32 q1, q1, q2
+
+ vrshrn.s32 d18, q9, #10
+ vrshrn.s32 d19, q1, #10
+
+ vqmovun.s16 \d, q9
+.endm
+
+function put_h264_qpel16_h_lowpass_neon_packed
+ mov r4, lr
+ mov r12, #16
+ mov r3, #8
+ bl put_h264_qpel8_h_lowpass_neon
+ sub r1, r1, r2, lsl #4
+ add r1, r1, #8
+ mov r12, #16
+ mov lr, r4
+ b put_h264_qpel8_h_lowpass_neon
+endfunc
+
+.macro h264_qpel_h_lowpass type
+function \type\()_h264_qpel16_h_lowpass_neon
+ push {lr}
+ mov r12, #16
+ bl \type\()_h264_qpel8_h_lowpass_neon
+ sub r0, r0, r3, lsl #4
+ sub r1, r1, r2, lsl #4
+ add r0, r0, #8
+ add r1, r1, #8
+ mov r12, #16
+ pop {lr}
+endfunc
+
+function \type\()_h264_qpel8_h_lowpass_neon
+1: vld1.8 {d0, d1}, [r1], r2
+ vld1.8 {d16,d17}, [r1], r2
+ subs r12, r12, #2
+ lowpass_8 d0, d1, d16, d17, d0, d16
+ .ifc \type,avg
+ vld1.8 {d2}, [r0,:64], r3
+ vrhadd.u8 d0, d0, d2
+ vld1.8 {d3}, [r0,:64]
+ vrhadd.u8 d16, d16, d3
+ sub r0, r0, r3
+ .endif
+ vst1.8 {d0}, [r0,:64], r3
+ vst1.8 {d16}, [r0,:64], r3
+ bne 1b
+ bx lr
+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
+ push {lr}
+ mov r12, #16
+ bl \type\()_h264_qpel8_h_lowpass_l2_neon
+ sub r0, r0, r2, lsl #4
+ sub r1, r1, r2, lsl #4
+ sub r3, r3, r2, lsl #4
+ add r0, r0, #8
+ add r1, r1, #8
+ add r3, r3, #8
+ mov r12, #16
+ pop {lr}
+endfunc
+
+function \type\()_h264_qpel8_h_lowpass_l2_neon
+1: vld1.8 {d0, d1}, [r1], r2
+ vld1.8 {d16,d17}, [r1], r2
+ vld1.8 {d28}, [r3], r2
+ vld1.8 {d29}, [r3], r2
+ subs r12, r12, #2
+ lowpass_8 d0, d1, d16, d17, d0, d1
+ vrhadd.u8 q0, q0, q14
+ .ifc \type,avg
+ vld1.8 {d2}, [r0,:64], r2
+ vrhadd.u8 d0, d0, d2
+ vld1.8 {d3}, [r0,:64]
+ vrhadd.u8 d1, d1, d3
+ sub r0, r0, r2
+ .endif
+ vst1.8 {d0}, [r0,:64], r2
+ vst1.8 {d1}, [r0,:64], r2
+ bne 1b
+ bx lr
+endfunc
+.endm
+
+ h264_qpel_h_lowpass_l2 put
+ h264_qpel_h_lowpass_l2 avg
+
+function put_h264_qpel16_v_lowpass_neon_packed
+ mov r4, lr
+ mov r2, #8
+ bl put_h264_qpel8_v_lowpass_neon
+ sub r1, r1, r3, lsl #2
+ bl put_h264_qpel8_v_lowpass_neon
+ sub r1, r1, r3, lsl #4
+ sub r1, r1, r3, lsl #2
+ add r1, r1, #8
+ bl put_h264_qpel8_v_lowpass_neon
+ sub r1, r1, r3, lsl #2
+ mov lr, r4
+ b put_h264_qpel8_v_lowpass_neon
+endfunc
+
+.macro h264_qpel_v_lowpass type
+function \type\()_h264_qpel16_v_lowpass_neon
+ mov r4, lr
+ bl \type\()_h264_qpel8_v_lowpass_neon
+ sub r1, r1, r3, lsl #2
+ bl \type\()_h264_qpel8_v_lowpass_neon
+ sub r0, r0, r2, lsl #4
+ add r0, r0, #8
+ sub r1, r1, r3, lsl #4
+ sub r1, r1, r3, lsl #2
+ add r1, r1, #8
+ bl \type\()_h264_qpel8_v_lowpass_neon
+ sub r1, r1, r3, lsl #2
+ mov lr, r4
+endfunc
+
+function \type\()_h264_qpel8_v_lowpass_neon
+ vld1.8 {d8}, [r1], r3
+ vld1.8 {d10}, [r1], r3
+ vld1.8 {d12}, [r1], r3
+ vld1.8 {d14}, [r1], r3
+ vld1.8 {d22}, [r1], r3
+ vld1.8 {d24}, [r1], r3
+ vld1.8 {d26}, [r1], r3
+ vld1.8 {d28}, [r1], r3
+ vld1.8 {d9}, [r1], r3
+ vld1.8 {d11}, [r1], r3
+ vld1.8 {d13}, [r1], r3
+ vld1.8 {d15}, [r1], r3
+ vld1.8 {d23}, [r1]
+
+ transpose_8x8 q4, q5, q6, q7, q11, q12, q13, q14
+ lowpass_8 d8, d9, d10, d11, d8, d10
+ lowpass_8 d12, d13, d14, d15, d12, d14
+ lowpass_8 d22, d23, d24, d25, d22, d24
+ lowpass_8 d26, d27, d28, d29, d26, d28
+ transpose_8x8 d8, d10, d12, d14, d22, d24, d26, d28
+
+ .ifc \type,avg
+ vld1.8 {d9}, [r0,:64], r2
+ vrhadd.u8 d8, d8, d9
+ vld1.8 {d11}, [r0,:64], r2
+ vrhadd.u8 d10, d10, d11
+ vld1.8 {d13}, [r0,:64], r2
+ vrhadd.u8 d12, d12, d13
+ vld1.8 {d15}, [r0,:64], r2
+ vrhadd.u8 d14, d14, d15
+ vld1.8 {d23}, [r0,:64], r2
+ vrhadd.u8 d22, d22, d23
+ vld1.8 {d25}, [r0,:64], r2
+ vrhadd.u8 d24, d24, d25
+ vld1.8 {d27}, [r0,:64], r2
+ vrhadd.u8 d26, d26, d27
+ vld1.8 {d29}, [r0,:64], r2
+ vrhadd.u8 d28, d28, d29
+ sub r0, r0, r2, lsl #3
+ .endif
+
+ vst1.8 {d8}, [r0,:64], r2
+ vst1.8 {d10}, [r0,:64], r2
+ vst1.8 {d12}, [r0,:64], r2
+ vst1.8 {d14}, [r0,:64], r2
+ vst1.8 {d22}, [r0,:64], r2
+ vst1.8 {d24}, [r0,:64], r2
+ vst1.8 {d26}, [r0,:64], r2
+ vst1.8 {d28}, [r0,:64], r2
+
+ bx lr
+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 r4, lr
+ bl \type\()_h264_qpel8_v_lowpass_l2_neon
+ sub r1, r1, r3, lsl #2
+ bl \type\()_h264_qpel8_v_lowpass_l2_neon
+ sub r0, r0, r3, lsl #4
+ sub r12, r12, r2, lsl #4
+ add r0, r0, #8
+ add r12, r12, #8
+ sub r1, r1, r3, lsl #4
+ sub r1, r1, r3, lsl #2
+ add r1, r1, #8
+ bl \type\()_h264_qpel8_v_lowpass_l2_neon
+ sub r1, r1, r3, lsl #2
+ mov lr, r4
+endfunc
+
+function \type\()_h264_qpel8_v_lowpass_l2_neon
+ vld1.8 {d8}, [r1], r3
+ vld1.8 {d10}, [r1], r3
+ vld1.8 {d12}, [r1], r3
+ vld1.8 {d14}, [r1], r3
+ vld1.8 {d22}, [r1], r3
+ vld1.8 {d24}, [r1], r3
+ vld1.8 {d26}, [r1], r3
+ vld1.8 {d28}, [r1], r3
+ vld1.8 {d9}, [r1], r3
+ vld1.8 {d11}, [r1], r3
+ vld1.8 {d13}, [r1], r3
+ vld1.8 {d15}, [r1], r3
+ vld1.8 {d23}, [r1]
+
+ transpose_8x8 q4, q5, q6, q7, q11, q12, q13, q14
+ lowpass_8 d8, d9, d10, d11, d8, d9
+ lowpass_8 d12, d13, d14, d15, d12, d13
+ lowpass_8 d22, d23, d24, d25, d22, d23
+ lowpass_8 d26, d27, d28, d29, d26, d27
+ transpose_8x8 d8, d9, d12, d13, d22, d23, d26, d27
+
+ vld1.8 {d0}, [r12], r2
+ vld1.8 {d1}, [r12], r2
+ vld1.8 {d2}, [r12], r2
+ vld1.8 {d3}, [r12], r2
+ vld1.8 {d4}, [r12], r2
+ vrhadd.u8 q0, q0, q4
+ vld1.8 {d5}, [r12], r2
+ vrhadd.u8 q1, q1, q6
+ vld1.8 {d10}, [r12], r2
+ vrhadd.u8 q2, q2, q11
+ vld1.8 {d11}, [r12], r2
+ vrhadd.u8 q5, q5, q13
+
+ .ifc \type,avg
+ vld1.8 {d16}, [r0,:64], r3
+ vrhadd.u8 d0, d0, d16
+ vld1.8 {d17}, [r0,:64], r3
+ vrhadd.u8 d1, d1, d17
+ vld1.8 {d16}, [r0,:64], r3
+ vrhadd.u8 d2, d2, d16
+ vld1.8 {d17}, [r0,:64], r3
+ vrhadd.u8 d3, d3, d17
+ vld1.8 {d16}, [r0,:64], r3
+ vrhadd.u8 d4, d4, d16
+ vld1.8 {d17}, [r0,:64], r3
+ vrhadd.u8 d5, d5, d17
+ vld1.8 {d16}, [r0,:64], r3
+ vrhadd.u8 d10, d10, d16
+ vld1.8 {d17}, [r0,:64], r3
+ vrhadd.u8 d11, d11, d17
+ sub r0, r0, r3, lsl #3
+ .endif
+
+ vst1.8 {d0}, [r0,:64], r3
+ vst1.8 {d1}, [r0,:64], r3
+ vst1.8 {d2}, [r0,:64], r3
+ vst1.8 {d3}, [r0,:64], r3
+ vst1.8 {d4}, [r0,:64], r3
+ vst1.8 {d5}, [r0,:64], r3
+ vst1.8 {d10}, [r0,:64], r3
+ vst1.8 {d11}, [r0,:64], r3
+
+ bx lr
+endfunc
+.endm
+
+ h264_qpel_v_lowpass_l2 put
+ h264_qpel_v_lowpass_l2 avg
+
+function put_h264_qpel8_hv_lowpass_neon_top
+ lowpass_const r12
+ mov r12, #12
+1: vld1.8 {d0, d1}, [r1], r3
+ vld1.8 {d16,d17}, [r1], r3
+ subs r12, r12, #2
+ lowpass_8 d0, d1, d16, d17, q11, q12, narrow=0
+ vst1.8 {d22-d25}, [r4,:128]!
+ bne 1b
+
+ vld1.8 {d0, d1}, [r1]
+ lowpass_8_1 d0, d1, q12, narrow=0
+
+ mov r12, #-16
+ add r4, r4, r12
+ vld1.8 {d30,d31}, [r4,:128], r12
+ vld1.8 {d20,d21}, [r4,:128], r12
+ vld1.8 {d18,d19}, [r4,:128], r12
+ vld1.8 {d16,d17}, [r4,:128], r12
+ vld1.8 {d14,d15}, [r4,:128], r12
+ vld1.8 {d12,d13}, [r4,:128], r12
+ vld1.8 {d10,d11}, [r4,:128], r12
+ vld1.8 {d8, d9}, [r4,:128], r12
+ vld1.8 {d6, d7}, [r4,:128], r12
+ vld1.8 {d4, d5}, [r4,:128], r12
+ vld1.8 {d2, d3}, [r4,:128], r12
+ vld1.8 {d0, d1}, [r4,:128]
+
+ swap4 d1, d3, d5, d7, d8, d10, d12, d14
+ transpose16_4x4 q0, q1, q2, q3, q4, q5, q6, q7
+
+ swap4 d17, d19, d21, d31, d24, d26, d28, d22
+ transpose16_4x4 q8, q9, q10, q15, q12, q13, q14, q11
+
+ vst1.8 {d30,d31}, [r4,:128]!
+ vst1.8 {d6, d7}, [r4,:128]!
+ vst1.8 {d20,d21}, [r4,:128]!
+ vst1.8 {d4, d5}, [r4,:128]!
+ vst1.8 {d18,d19}, [r4,:128]!
+ vst1.8 {d2, d3}, [r4,:128]!
+ vst1.8 {d16,d17}, [r4,:128]!
+ vst1.8 {d0, d1}, [r4,:128]
+
+ lowpass_8.16 q4, q12, d8, d9, d24, d25, d8
+ lowpass_8.16 q5, q13, d10, d11, d26, d27, d9
+ lowpass_8.16 q6, q14, d12, d13, d28, d29, d10
+ lowpass_8.16 q7, q11, d14, d15, d22, d23, d11
+
+ vld1.8 {d16,d17}, [r4,:128], r12
+ vld1.8 {d30,d31}, [r4,:128], r12
+ lowpass_8.16 q8, q15, d16, d17, d30, d31, d12
+ vld1.8 {d16,d17}, [r4,:128], r12
+ vld1.8 {d30,d31}, [r4,:128], r12
+ lowpass_8.16 q8, q15, d16, d17, d30, d31, d13
+ vld1.8 {d16,d17}, [r4,:128], r12
+ vld1.8 {d30,d31}, [r4,:128], r12
+ lowpass_8.16 q8, q15, d16, d17, d30, d31, d14
+ vld1.8 {d16,d17}, [r4,:128], r12
+ vld1.8 {d30,d31}, [r4,:128]
+ lowpass_8.16 q8, q15, d16, d17, d30, d31, d15
+
+ transpose_8x8 d12, d13, d14, d15, d8, d9, d10, d11
+
+ bx lr
+endfunc
+
+.macro h264_qpel8_hv_lowpass type
+function \type\()_h264_qpel8_hv_lowpass_neon
+ mov r10, lr
+ bl put_h264_qpel8_hv_lowpass_neon_top
+ .ifc \type,avg
+ vld1.8 {d0}, [r0,:64], r2
+ vrhadd.u8 d12, d12, d0
+ vld1.8 {d1}, [r0,:64], r2
+ vrhadd.u8 d13, d13, d1
+ vld1.8 {d2}, [r0,:64], r2
+ vrhadd.u8 d14, d14, d2
+ vld1.8 {d3}, [r0,:64], r2
+ vrhadd.u8 d15, d15, d3
+ vld1.8 {d4}, [r0,:64], r2
+ vrhadd.u8 d8, d8, d4
+ vld1.8 {d5}, [r0,:64], r2
+ vrhadd.u8 d9, d9, d5
+ vld1.8 {d6}, [r0,:64], r2
+ vrhadd.u8 d10, d10, d6
+ vld1.8 {d7}, [r0,:64], r2
+ vrhadd.u8 d11, d11, d7
+ sub r0, r0, r2, lsl #3
+ .endif
+
+ vst1.8 {d12}, [r0,:64], r2
+ vst1.8 {d13}, [r0,:64], r2
+ vst1.8 {d14}, [r0,:64], r2
+ vst1.8 {d15}, [r0,:64], r2
+ vst1.8 {d8}, [r0,:64], r2
+ vst1.8 {d9}, [r0,:64], r2
+ vst1.8 {d10}, [r0,:64], r2
+ vst1.8 {d11}, [r0,:64], r2
+
+ mov lr, r10
+ bx lr
+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 r10, lr
+ bl put_h264_qpel8_hv_lowpass_neon_top
+
+ vld1.8 {d0, d1}, [r2,:128]!
+ vld1.8 {d2, d3}, [r2,:128]!
+ vrhadd.u8 q0, q0, q6
+ vld1.8 {d4, d5}, [r2,:128]!
+ vrhadd.u8 q1, q1, q7
+ vld1.8 {d6, d7}, [r2,:128]!
+ vrhadd.u8 q2, q2, q4
+ vrhadd.u8 q3, q3, q5
+ .ifc \type,avg
+ vld1.8 {d16}, [r0,:64], r3
+ vrhadd.u8 d0, d0, d16
+ vld1.8 {d17}, [r0,:64], r3
+ vrhadd.u8 d1, d1, d17
+ vld1.8 {d18}, [r0,:64], r3
+ vrhadd.u8 d2, d2, d18
+ vld1.8 {d19}, [r0,:64], r3
+ vrhadd.u8 d3, d3, d19
+ vld1.8 {d20}, [r0,:64], r3
+ vrhadd.u8 d4, d4, d20
+ vld1.8 {d21}, [r0,:64], r3
+ vrhadd.u8 d5, d5, d21
+ vld1.8 {d22}, [r0,:64], r3
+ vrhadd.u8 d6, d6, d22
+ vld1.8 {d23}, [r0,:64], r3
+ vrhadd.u8 d7, d7, d23
+ sub r0, r0, r3, lsl #3
+ .endif
+ vst1.8 {d0}, [r0,:64], r3
+ vst1.8 {d1}, [r0,:64], r3
+ vst1.8 {d2}, [r0,:64], r3
+ vst1.8 {d3}, [r0,:64], r3
+ vst1.8 {d4}, [r0,:64], r3
+ vst1.8 {d5}, [r0,:64], r3
+ vst1.8 {d6}, [r0,:64], r3
+ vst1.8 {d7}, [r0,:64], r3
+
+ mov lr, r10
+ bx lr
+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 r9, lr
+ bl \type\()_h264_qpel8_hv_lowpass_neon
+ sub r1, r1, r3, lsl #2
+ bl \type\()_h264_qpel8_hv_lowpass_neon
+ sub r1, r1, r3, lsl #4
+ sub r1, r1, r3, lsl #2
+ add r1, r1, #8
+ sub r0, r0, r2, lsl #4
+ add r0, r0, #8
+ bl \type\()_h264_qpel8_hv_lowpass_neon
+ sub r1, r1, r3, lsl #2
+ mov lr, r9
+ b \type\()_h264_qpel8_hv_lowpass_neon
+endfunc
+
+function \type\()_h264_qpel16_hv_lowpass_l2_neon
+ mov r9, lr
+ sub r2, r4, #256
+ bl \type\()_h264_qpel8_hv_lowpass_l2_neon
+ sub r1, r1, r3, lsl #2
+ bl \type\()_h264_qpel8_hv_lowpass_l2_neon
+ sub r1, r1, r3, lsl #4
+ sub r1, r1, r3, lsl #2
+ add r1, r1, #8
+ sub r0, r0, r3, lsl #4
+ add r0, r0, #8
+ bl \type\()_h264_qpel8_hv_lowpass_l2_neon
+ sub r1, r1, r3, lsl #2
+ mov lr, r9
+ 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 r3
+ mov r3, r1
+ sub r1, r1, #2
+ mov r12, #8
+ b \type\()_h264_qpel8_h_lowpass_l2_neon
+endfunc
+
+function ff_\type\()_h264_qpel8_mc20_neon, export=1
+ lowpass_const r3
+ sub r1, r1, #2
+ mov r3, r2
+ mov r12, #8
+ b \type\()_h264_qpel8_h_lowpass_neon
+endfunc
+
+function ff_\type\()_h264_qpel8_mc30_neon, export=1
+ lowpass_const r3
+ add r3, r1, #1
+ sub r1, r1, #2
+ mov r12, #8
+ b \type\()_h264_qpel8_h_lowpass_l2_neon
+endfunc
+
+function ff_\type\()_h264_qpel8_mc01_neon, export=1
+ push {lr}
+ mov r12, r1
+\type\()_h264_qpel8_mc01:
+ lowpass_const r3
+ mov r3, r2
+ sub r1, r1, r2, lsl #1
+ vpush {d8-d15}
+ bl \type\()_h264_qpel8_v_lowpass_l2_neon
+ vpop {d8-d15}
+ pop {pc}
+endfunc
+
+function ff_\type\()_h264_qpel8_mc11_neon, export=1
+ push {r0, r1, r11, lr}
+\type\()_h264_qpel8_mc11:
+ lowpass_const r3
+ mov r11, sp
+A bic sp, sp, #15
+T bic r0, r11, #15
+T mov sp, r0
+ sub sp, sp, #64
+ mov r0, sp
+ sub r1, r1, #2
+ mov r3, #8
+ mov r12, #8
+ vpush {d8-d15}
+ bl put_h264_qpel8_h_lowpass_neon
+ ldrd r0, r1, [r11], #8
+ mov r3, r2
+ add r12, sp, #64
+ sub r1, r1, r2, lsl #1
+ mov r2, #8
+ bl \type\()_h264_qpel8_v_lowpass_l2_neon
+ vpop {d8-d15}
+ mov sp, r11
+ pop {r11, pc}
+endfunc
+
+function ff_\type\()_h264_qpel8_mc21_neon, export=1
+ push {r0, r1, r4, r10, r11, lr}
+\type\()_h264_qpel8_mc21:
+ lowpass_const r3
+ mov r11, sp
+A bic sp, sp, #15
+T bic r0, r11, #15
+T mov sp, r0
+ sub sp, sp, #(8*8+16*12)
+ sub r1, r1, #2
+ mov r3, #8
+ mov r0, sp
+ mov r12, #8
+ vpush {d8-d15}
+ bl put_h264_qpel8_h_lowpass_neon
+ mov r4, r0
+ ldrd r0, r1, [r11], #8
+ sub r1, r1, r2, lsl #1
+ sub r1, r1, #2
+ mov r3, r2
+ sub r2, r4, #64
+ bl \type\()_h264_qpel8_hv_lowpass_l2_neon
+ vpop {d8-d15}
+ mov sp, r11
+ pop {r4, r10, r11, pc}
+endfunc
+
+function ff_\type\()_h264_qpel8_mc31_neon, export=1
+ add r1, r1, #1
+ push {r0, r1, r11, lr}
+ sub r1, r1, #1
+ b \type\()_h264_qpel8_mc11
+endfunc
+
+function ff_\type\()_h264_qpel8_mc02_neon, export=1
+ push {lr}
+ lowpass_const r3
+ sub r1, r1, r2, lsl #1
+ mov r3, r2
+ vpush {d8-d15}
+ bl \type\()_h264_qpel8_v_lowpass_neon
+ vpop {d8-d15}
+ pop {pc}
+endfunc
+
+function ff_\type\()_h264_qpel8_mc12_neon, export=1
+ push {r0, r1, r4, r10, r11, lr}
+\type\()_h264_qpel8_mc12:
+ lowpass_const r3
+ mov r11, sp
+A bic sp, sp, #15
+T bic r0, r11, #15
+T mov sp, r0
+ sub sp, sp, #(8*8+16*12)
+ sub r1, r1, r2, lsl #1
+ mov r3, r2
+ mov r2, #8
+ mov r0, sp
+ vpush {d8-d15}
+ bl put_h264_qpel8_v_lowpass_neon
+ mov r4, r0
+ ldrd r0, r1, [r11], #8
+ sub r1, r1, r3, lsl #1
+ sub r1, r1, #2
+ sub r2, r4, #64
+ bl \type\()_h264_qpel8_hv_lowpass_l2_neon
+ vpop {d8-d15}
+ mov sp, r11
+ pop {r4, r10, r11, pc}
+endfunc
+
+function ff_\type\()_h264_qpel8_mc22_neon, export=1
+ push {r4, r10, r11, lr}
+ mov r11, sp
+A bic sp, sp, #15
+T bic r4, r11, #15
+T mov sp, r4
+ sub r1, r1, r2, lsl #1
+ sub r1, r1, #2
+ mov r3, r2
+ sub sp, sp, #(16*12)
+ mov r4, sp
+ vpush {d8-d15}
+ bl \type\()_h264_qpel8_hv_lowpass_neon
+ vpop {d8-d15}
+ mov sp, r11
+ pop {r4, r10, r11, pc}
+endfunc
+
+function ff_\type\()_h264_qpel8_mc32_neon, export=1
+ push {r0, r1, r4, r10, r11, lr}
+ add r1, r1, #1
+ b \type\()_h264_qpel8_mc12
+endfunc
+
+function ff_\type\()_h264_qpel8_mc03_neon, export=1
+ push {lr}
+ add r12, r1, r2
+ b \type\()_h264_qpel8_mc01
+endfunc
+
+function ff_\type\()_h264_qpel8_mc13_neon, export=1
+ push {r0, r1, r11, lr}
+ add r1, r1, r2
+ b \type\()_h264_qpel8_mc11
+endfunc
+
+function ff_\type\()_h264_qpel8_mc23_neon, export=1
+ push {r0, r1, r4, r10, r11, lr}
+ add r1, r1, r2
+ b \type\()_h264_qpel8_mc21
+endfunc
+
+function ff_\type\()_h264_qpel8_mc33_neon, export=1
+ add r1, r1, #1
+ push {r0, r1, r11, lr}
+ add r1, r1, r2
+ sub r1, r1, #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 r3
+ mov r3, r1
+ sub r1, r1, #2
+ b \type\()_h264_qpel16_h_lowpass_l2_neon
+endfunc
+
+function ff_\type\()_h264_qpel16_mc20_neon, export=1
+ lowpass_const r3
+ sub r1, r1, #2
+ mov r3, r2
+ b \type\()_h264_qpel16_h_lowpass_neon
+endfunc
+
+function ff_\type\()_h264_qpel16_mc30_neon, export=1
+ lowpass_const r3
+ add r3, r1, #1
+ sub r1, r1, #2
+ b \type\()_h264_qpel16_h_lowpass_l2_neon
+endfunc
+
+function ff_\type\()_h264_qpel16_mc01_neon, export=1
+ push {r4, lr}
+ mov r12, r1
+\type\()_h264_qpel16_mc01:
+ lowpass_const r3
+ mov r3, r2
+ sub r1, r1, r2, lsl #1
+ vpush {d8-d15}
+ bl \type\()_h264_qpel16_v_lowpass_l2_neon
+ vpop {d8-d15}
+ pop {r4, pc}
+endfunc
+
+function ff_\type\()_h264_qpel16_mc11_neon, export=1
+ push {r0, r1, r4, r11, lr}
+\type\()_h264_qpel16_mc11:
+ lowpass_const r3
+ mov r11, sp
+A bic sp, sp, #15
+T bic r0, r11, #15
+T mov sp, r0
+ sub sp, sp, #256
+ mov r0, sp
+ sub r1, r1, #2
+ mov r3, #16
+ vpush {d8-d15}
+ bl put_h264_qpel16_h_lowpass_neon
+ ldrd r0, r1, [r11], #8
+ mov r3, r2
+ add r12, sp, #64
+ sub r1, r1, r2, lsl #1
+ mov r2, #16
+ bl \type\()_h264_qpel16_v_lowpass_l2_neon
+ vpop {d8-d15}
+ mov sp, r11
+ pop {r4, r11, pc}
+endfunc
+
+function ff_\type\()_h264_qpel16_mc21_neon, export=1
+ push {r0, r1, r4-r5, r9-r11, lr}
+\type\()_h264_qpel16_mc21:
+ lowpass_const r3
+ mov r11, sp
+A bic sp, sp, #15
+T bic r0, r11, #15
+T mov sp, r0
+ sub sp, sp, #(16*16+16*12)
+ sub r1, r1, #2
+ mov r0, sp
+ vpush {d8-d15}
+ bl put_h264_qpel16_h_lowpass_neon_packed
+ mov r4, r0
+ ldrd r0, r1, [r11], #8
+ sub r1, r1, r2, lsl #1
+ sub r1, r1, #2
+ mov r3, r2
+ bl \type\()_h264_qpel16_hv_lowpass_l2_neon
+ vpop {d8-d15}
+ mov sp, r11
+ pop {r4-r5, r9-r11, pc}
+endfunc
+
+function ff_\type\()_h264_qpel16_mc31_neon, export=1
+ add r1, r1, #1
+ push {r0, r1, r4, r11, lr}
+ sub r1, r1, #1
+ b \type\()_h264_qpel16_mc11
+endfunc
+
+function ff_\type\()_h264_qpel16_mc02_neon, export=1
+ push {r4, lr}
+ lowpass_const r3
+ sub r1, r1, r2, lsl #1
+ mov r3, r2
+ vpush {d8-d15}
+ bl \type\()_h264_qpel16_v_lowpass_neon
+ vpop {d8-d15}
+ pop {r4, pc}
+endfunc
+
+function ff_\type\()_h264_qpel16_mc12_neon, export=1
+ push {r0, r1, r4-r5, r9-r11, lr}
+\type\()_h264_qpel16_mc12:
+ lowpass_const r3
+ mov r11, sp
+A bic sp, sp, #15
+T bic r0, r11, #15
+T mov sp, r0
+ sub sp, sp, #(16*16+16*12)
+ sub r1, r1, r2, lsl #1
+ mov r0, sp
+ mov r3, r2
+ vpush {d8-d15}
+ bl put_h264_qpel16_v_lowpass_neon_packed
+ mov r4, r0
+ ldrd r0, r1, [r11], #8
+ sub r1, r1, r3, lsl #1
+ sub r1, r1, #2
+ mov r2, r3
+ bl \type\()_h264_qpel16_hv_lowpass_l2_neon
+ vpop {d8-d15}
+ mov sp, r11
+ pop {r4-r5, r9-r11, pc}
+endfunc
+
+function ff_\type\()_h264_qpel16_mc22_neon, export=1
+ push {r4, r9-r11, lr}
+ lowpass_const r3
+ mov r11, sp
+A bic sp, sp, #15
+T bic r4, r11, #15
+T mov sp, r4
+ sub r1, r1, r2, lsl #1
+ sub r1, r1, #2
+ mov r3, r2
+ sub sp, sp, #(16*12)
+ mov r4, sp
+ vpush {d8-d15}
+ bl \type\()_h264_qpel16_hv_lowpass_neon
+ vpop {d8-d15}
+ mov sp, r11
+ pop {r4, r9-r11, pc}
+endfunc
+
+function ff_\type\()_h264_qpel16_mc32_neon, export=1
+ push {r0, r1, r4-r5, r9-r11, lr}
+ add r1, r1, #1
+ b \type\()_h264_qpel16_mc12
+endfunc
+
+function ff_\type\()_h264_qpel16_mc03_neon, export=1
+ push {r4, lr}
+ add r12, r1, r2
+ b \type\()_h264_qpel16_mc01
+endfunc
+
+function ff_\type\()_h264_qpel16_mc13_neon, export=1
+ push {r0, r1, r4, r11, lr}
+ add r1, r1, r2
+ b \type\()_h264_qpel16_mc11
+endfunc
+
+function ff_\type\()_h264_qpel16_mc23_neon, export=1
+ push {r0, r1, r4-r5, r9-r11, lr}
+ add r1, r1, r2
+ b \type\()_h264_qpel16_mc21
+endfunc
+
+function ff_\type\()_h264_qpel16_mc33_neon, export=1
+ add r1, r1, #1
+ push {r0, r1, r4, r11, lr}
+ add r1, r1, r2
+ sub r1, r1, #1
+ b \type\()_h264_qpel16_mc11
+endfunc
+.endm
+
+ h264_qpel16 put
+ h264_qpel16 avg

libav-v10.1.tar.bz2/libavcodec/arm/hpeldsp_arm.S Added

@@ -0,0 +1,603 @@
+@
+@ ARMv4 optimized DSP utils
+@ Copyright (c) 2004 AGAWA Koji 
+@
+@ This file is part of Libav.
+@
+@ Libav 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.
+@
+@ Libav 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 Libav; if not, write to the Free Software
+@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+@
+
+#include "config.h"
+#include "libavutil/arm/asm.S"
+
+#if !HAVE_ARMV5TE_EXTERNAL
+#define pld @
+#endif
+
+.macro ALIGN_QWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4
+ mov \Rd0, \Rn0, lsr #(\shift * 8)
+ mov \Rd1, \Rn1, lsr #(\shift * 8)
+ mov \Rd2, \Rn2, lsr #(\shift * 8)
+ mov \Rd3, \Rn3, lsr #(\shift * 8)
+ orr \Rd0, \Rd0, \Rn1, lsl #(32 - \shift * 8)
+ orr \Rd1, \Rd1, \Rn2, lsl #(32 - \shift * 8)
+ orr \Rd2, \Rd2, \Rn3, lsl #(32 - \shift * 8)
+ orr \Rd3, \Rd3, \Rn4, lsl #(32 - \shift * 8)
+.endm
+.macro ALIGN_DWORD shift, R0, R1, R2
+ mov \R0, \R0, lsr #(\shift * 8)
+ orr \R0, \R0, \R1, lsl #(32 - \shift * 8)
+ mov \R1, \R1, lsr #(\shift * 8)
+ orr \R1, \R1, \R2, lsl #(32 - \shift * 8)
+.endm
+.macro ALIGN_DWORD_D shift, Rdst0, Rdst1, Rsrc0, Rsrc1, Rsrc2
+ mov \Rdst0, \Rsrc0, lsr #(\shift * 8)
+ mov \Rdst1, \Rsrc1, lsr #(\shift * 8)
+ orr \Rdst0, \Rdst0, \Rsrc1, lsl #(32 - (\shift * 8))
+ orr \Rdst1, \Rdst1, \Rsrc2, lsl #(32 - (\shift * 8))
+.endm
+
+.macro RND_AVG32 Rd0, Rd1, Rn0, Rn1, Rm0, Rm1, Rmask
+ @ Rd = (Rn | Rm) - (((Rn ^ Rm) & ~0x01010101) >> 1)
+ @ Rmask = 0xFEFEFEFE
+ @ Rn = destroy
+ eor \Rd0, \Rn0, \Rm0
+ eor \Rd1, \Rn1, \Rm1
+ orr \Rn0, \Rn0, \Rm0
+ orr \Rn1, \Rn1, \Rm1
+ and \Rd0, \Rd0, \Rmask
+ and \Rd1, \Rd1, \Rmask
+ sub \Rd0, \Rn0, \Rd0, lsr #1
+ sub \Rd1, \Rn1, \Rd1, lsr #1
+.endm
+
+.macro NO_RND_AVG32 Rd0, Rd1, Rn0, Rn1, Rm0, Rm1, Rmask
+ @ Rd = (Rn & Rm) - (((Rn ^ Rm) & ~0x01010101) >> 1)
+ @ Rmask = 0xFEFEFEFE
+ @ Rn = destroy
+ eor \Rd0, \Rn0, \Rm0
+ eor \Rd1, \Rn1, \Rm1
+ and \Rn0, \Rn0, \Rm0
+ and \Rn1, \Rn1, \Rm1
+ and \Rd0, \Rd0, \Rmask
+ and \Rd1, \Rd1, \Rmask
+ add \Rd0, \Rn0, \Rd0, lsr #1
+ add \Rd1, \Rn1, \Rd1, lsr #1
+.endm
+
+.macro JMP_ALIGN tmp, reg
+ ands \tmp, \reg, #3
+ bic \reg, \reg, #3
+ beq 1f
+ subs \tmp, \tmp, #1
+ beq 2f
+ subs \tmp, \tmp, #1
+ beq 3f
+ b 4f
+.endm
+
+@ ----------------------------------------------------------------
+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]
+ push {r4-r11, lr}
+ JMP_ALIGN r5, r1
+1:
+ ldm r1, {r4-r7}
+ add r1, r1, r2
+ stm r0, {r4-r7}
+ pld [r1]
+ subs r3, r3, #1
+ add r0, r0, r2
+ bne 1b
+ pop {r4-r11, pc}
+ .align 5
+2:
+ ldm r1, {r4-r8}
+ add r1, r1, r2
+ ALIGN_QWORD_D 1, r9, r10, r11, r12, r4, r5, r6, r7, r8
+ pld [r1]
+ subs r3, r3, #1
+ stm r0, {r9-r12}
+ add r0, r0, r2
+ bne 2b
+ pop {r4-r11, pc}
+ .align 5
+3:
+ ldm r1, {r4-r8}
+ add r1, r1, r2
+ ALIGN_QWORD_D 2, r9, r10, r11, r12, r4, r5, r6, r7, r8
+ pld [r1]
+ subs r3, r3, #1
+ stm r0, {r9-r12}
+ add r0, r0, r2
+ bne 3b
+ pop {r4-r11, pc}
+ .align 5
+4:
+ ldm r1, {r4-r8}
+ add r1, r1, r2
+ ALIGN_QWORD_D 3, r9, r10, r11, r12, r4, r5, r6, r7, r8
+ pld [r1]
+ subs r3, r3, #1
+ stm r0, {r9-r12}
+ add r0, r0, r2
+ bne 4b
+ pop {r4-r11,pc}
+endfunc
+
+@ ----------------------------------------------------------------
+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]
+ push {r4-r5,lr}
+ JMP_ALIGN r5, r1
+1:
+ ldm r1, {r4-r5}
+ add r1, r1, r2
+ subs r3, r3, #1
+ pld [r1]
+ stm r0, {r4-r5}
+ add r0, r0, r2
+ bne 1b
+ pop {r4-r5,pc}
+ .align 5
+2:
+ ldm r1, {r4-r5, r12}
+ add r1, r1, r2
+ ALIGN_DWORD 1, r4, r5, r12
+ pld [r1]
+ subs r3, r3, #1
+ stm r0, {r4-r5}
+ add r0, r0, r2
+ bne 2b
+ pop {r4-r5,pc}
+ .align 5
+3:
+ ldm r1, {r4-r5, r12}
+ add r1, r1, r2
+ ALIGN_DWORD 2, r4, r5, r12
+ pld [r1]
+ subs r3, r3, #1
+ stm r0, {r4-r5}
+ add r0, r0, r2
+ bne 3b
+ pop {r4-r5,pc}
+ .align 5
+4:
+ ldm r1, {r4-r5, r12}
+ add r1, r1, r2
+ ALIGN_DWORD 3, r4, r5, r12
+ pld [r1]
+ subs r3, r3, #1
+ stm r0, {r4-r5}
+ add r0, r0, r2
+ bne 4b
+ pop {r4-r5,pc}
+endfunc
+
+@ ----------------------------------------------------------------
+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]
+ push {r4-r10,lr}
+ ldr r12, =0xfefefefe
+ JMP_ALIGN r5, r1
+1:
+ ldm r1, {r4-r5, r10}
+ add r1, r1, r2
+ ALIGN_DWORD_D 1, r6, r7, r4, r5, r10
+ pld [r1]
+ RND_AVG32 r8, r9, r4, r5, r6, r7, r12
+ subs r3, r3, #1
+ stm r0, {r8-r9}
+ add r0, r0, r2
+ bne 1b
+ pop {r4-r10,pc}
+ .align 5
+2:
+ ldm r1, {r4-r5, r10}
+ add r1, r1, r2
+ ALIGN_DWORD_D 1, r6, r7, r4, r5, r10
+ ALIGN_DWORD_D 2, r8, r9, r4, r5, r10
+ pld [r1]
+ RND_AVG32 r4, r5, r6, r7, r8, r9, r12
+ subs r3, r3, #1
+ stm r0, {r4-r5}
+ add r0, r0, r2
+ bne 2b
+ pop {r4-r10,pc}
+ .align 5
+3:
+ ldm r1, {r4-r5, r10}
+ add r1, r1, r2
+ ALIGN_DWORD_D 2, r6, r7, r4, r5, r10
+ ALIGN_DWORD_D 3, r8, r9, r4, r5, r10
+ pld [r1]
+ RND_AVG32 r4, r5, r6, r7, r8, r9, r12
+ subs r3, r3, #1
+ stm r0, {r4-r5}
+ add r0, r0, r2
+ bne 3b
+ pop {r4-r10,pc}
+ .align 5
+4:
+ ldm r1, {r4-r5, r10}
+ add r1, r1, r2
+ ALIGN_DWORD_D 3, r6, r7, r4, r5, r10
+ pld [r1]
+ RND_AVG32 r8, r9, r6, r7, r5, r10, r12
+ subs r3, r3, #1
+ stm r0, {r8-r9}
+ add r0, r0, r2
+ bne 4b
+ pop {r4-r10,pc}
+endfunc
+
+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]
+ push {r4-r10,lr}
+ ldr r12, =0xfefefefe
+ JMP_ALIGN r5, r1
+1:
+ ldm r1, {r4-r5, r10}
+ add r1, r1, r2
+ ALIGN_DWORD_D 1, r6, r7, r4, r5, r10
+ pld [r1]
+ NO_RND_AVG32 r8, r9, r4, r5, r6, r7, r12
+ subs r3, r3, #1
+ stm r0, {r8-r9}
+ add r0, r0, r2
+ bne 1b
+ pop {r4-r10,pc}
+ .align 5
+2:
+ ldm r1, {r4-r5, r10}
+ add r1, r1, r2
+ ALIGN_DWORD_D 1, r6, r7, r4, r5, r10
+ ALIGN_DWORD_D 2, r8, r9, r4, r5, r10
+ pld [r1]
+ NO_RND_AVG32 r4, r5, r6, r7, r8, r9, r12
+ subs r3, r3, #1
+ stm r0, {r4-r5}
+ add r0, r0, r2
+ bne 2b
+ pop {r4-r10,pc}
+ .align 5
+3:
+ ldm r1, {r4-r5, r10}
+ add r1, r1, r2
+ ALIGN_DWORD_D 2, r6, r7, r4, r5, r10
+ ALIGN_DWORD_D 3, r8, r9, r4, r5, r10
+ pld [r1]
+ NO_RND_AVG32 r4, r5, r6, r7, r8, r9, r12
+ subs r3, r3, #1
+ stm r0, {r4-r5}
+ add r0, r0, r2
+ bne 3b
+ pop {r4-r10,pc}
+ .align 5
+4:
+ ldm r1, {r4-r5, r10}
+ add r1, r1, r2
+ ALIGN_DWORD_D 3, r6, r7, r4, r5, r10
+ pld [r1]
+ NO_RND_AVG32 r8, r9, r6, r7, r5, r10, r12
+ subs r3, r3, #1
+ stm r0, {r8-r9}
+ add r0, r0, r2
+ bne 4b
+ pop {r4-r10,pc}
+endfunc
+
+
+@ ----------------------------------------------------------------
+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]
+ push {r4-r11,lr}
+ mov r3, r3, lsr #1
+ ldr r12, =0xfefefefe
+ JMP_ALIGN r5, r1
+1:
+ ldm r1, {r4-r5}
+ add r1, r1, r2
+6: ldm r1, {r6-r7}
+ add r1, r1, r2
+ pld [r1]
+ RND_AVG32 r8, r9, r4, r5, r6, r7, r12
+ ldm r1, {r4-r5}
+ add r1, r1, r2
+ stm r0, {r8-r9}
+ add r0, r0, r2
+ pld [r1]
+ RND_AVG32 r8, r9, r6, r7, r4, r5, r12
+ subs r3, r3, #1
+ stm r0, {r8-r9}
+ add r0, r0, r2
+ bne 6b
+ pop {r4-r11,pc}
+ .align 5
+2:
+ ldm r1, {r4-r6}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 1, r4, r5, r6
+6: ldm r1, {r7-r9}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 1, r7, r8, r9
+ RND_AVG32 r10, r11, r4, r5, r7, r8, r12
+ stm r0, {r10-r11}
+ add r0, r0, r2
+ ldm r1, {r4-r6}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 1, r4, r5, r6
+ subs r3, r3, #1
+ RND_AVG32 r10, r11, r7, r8, r4, r5, r12
+ stm r0, {r10-r11}
+ add r0, r0, r2
+ bne 6b
+ pop {r4-r11,pc}
+ .align 5
+3:
+ ldm r1, {r4-r6}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 2, r4, r5, r6
+6: ldm r1, {r7-r9}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 2, r7, r8, r9
+ RND_AVG32 r10, r11, r4, r5, r7, r8, r12
+ stm r0, {r10-r11}
+ add r0, r0, r2
+ ldm r1, {r4-r6}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 2, r4, r5, r6
+ subs r3, r3, #1
+ RND_AVG32 r10, r11, r7, r8, r4, r5, r12
+ stm r0, {r10-r11}
+ add r0, r0, r2
+ bne 6b
+ pop {r4-r11,pc}
+ .align 5
+4:
+ ldm r1, {r4-r6}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 3, r4, r5, r6
+6: ldm r1, {r7-r9}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 3, r7, r8, r9
+ RND_AVG32 r10, r11, r4, r5, r7, r8, r12
+ stm r0, {r10-r11}
+ add r0, r0, r2
+ ldm r1, {r4-r6}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 3, r4, r5, r6
+ subs r3, r3, #1
+ RND_AVG32 r10, r11, r7, r8, r4, r5, r12
+ stm r0, {r10-r11}
+ add r0, r0, r2
+ bne 6b
+ pop {r4-r11,pc}
+endfunc
+
+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]
+ push {r4-r11,lr}
+ mov r3, r3, lsr #1
+ ldr r12, =0xfefefefe
+ JMP_ALIGN r5, r1
+1:
+ ldm r1, {r4-r5}
+ add r1, r1, r2
+6: ldm r1, {r6-r7}
+ add r1, r1, r2
+ pld [r1]
+ NO_RND_AVG32 r8, r9, r4, r5, r6, r7, r12
+ ldm r1, {r4-r5}
+ add r1, r1, r2
+ stm r0, {r8-r9}
+ add r0, r0, r2
+ pld [r1]
+ NO_RND_AVG32 r8, r9, r6, r7, r4, r5, r12
+ subs r3, r3, #1
+ stm r0, {r8-r9}
+ add r0, r0, r2
+ bne 6b
+ pop {r4-r11,pc}
+ .align 5
+2:
+ ldm r1, {r4-r6}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 1, r4, r5, r6
+6: ldm r1, {r7-r9}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 1, r7, r8, r9
+ NO_RND_AVG32 r10, r11, r4, r5, r7, r8, r12
+ stm r0, {r10-r11}
+ add r0, r0, r2
+ ldm r1, {r4-r6}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 1, r4, r5, r6
+ subs r3, r3, #1
+ NO_RND_AVG32 r10, r11, r7, r8, r4, r5, r12
+ stm r0, {r10-r11}
+ add r0, r0, r2
+ bne 6b
+ pop {r4-r11,pc}
+ .align 5
+3:
+ ldm r1, {r4-r6}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 2, r4, r5, r6
+6: ldm r1, {r7-r9}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 2, r7, r8, r9
+ NO_RND_AVG32 r10, r11, r4, r5, r7, r8, r12
+ stm r0, {r10-r11}
+ add r0, r0, r2
+ ldm r1, {r4-r6}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 2, r4, r5, r6
+ subs r3, r3, #1
+ NO_RND_AVG32 r10, r11, r7, r8, r4, r5, r12
+ stm r0, {r10-r11}
+ add r0, r0, r2
+ bne 6b
+ pop {r4-r11,pc}
+ .align 5
+4:
+ ldm r1, {r4-r6}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 3, r4, r5, r6
+6: ldm r1, {r7-r9}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 3, r7, r8, r9
+ NO_RND_AVG32 r10, r11, r4, r5, r7, r8, r12
+ stm r0, {r10-r11}
+ add r0, r0, r2
+ ldm r1, {r4-r6}
+ add r1, r1, r2
+ pld [r1]
+ ALIGN_DWORD 3, r4, r5, r6
+ subs r3, r3, #1
+ NO_RND_AVG32 r10, r11, r7, r8, r4, r5, r12
+ stm r0, {r10-r11}
+ add r0, r0, r2
+ bne 6b
+ pop {r4-r11,pc}
+endfunc
+
+ .ltorg
+
+@ ----------------------------------------------------------------
+.macro RND_XY2_IT align, rnd
+ @ l1= (a & 0x03030303) + (b & 0x03030303) ?(+ 0x02020202)
+ @ h1= ((a & 0xFCFCFCFCUL) >> 2) + ((b & 0xFCFCFCFCUL) >> 2)
+.if \align == 0
+ ldm r1, {r6-r8}
+.elseif \align == 3
+ ldm r1, {r5-r7}
+.else
+ ldm r1, {r8-r10}
+.endif
+ add r1, r1, r2
+ pld [r1]
+.if \align == 0
+ ALIGN_DWORD_D 1, r4, r5, r6, r7, r8
+.elseif \align == 1
+ ALIGN_DWORD_D 1, r4, r5, r8, r9, r10
+ ALIGN_DWORD_D 2, r6, r7, r8, r9, r10
+.elseif \align == 2
+ ALIGN_DWORD_D 2, r4, r5, r8, r9, r10
+ ALIGN_DWORD_D 3, r6, r7, r8, r9, r10
+.elseif \align == 3
+ ALIGN_DWORD_D 3, r4, r5, r5, r6, r7
+.endif
+ ldr r14, =0x03030303
+ tst r3, #1
+ and r8, r4, r14
+ and r9, r5, r14
+ and r10, r6, r14
+ and r11, r7, r14
+ it eq
+ andeq r14, r14, r14, \rnd #1
+ add r8, r8, r10
+ add r9, r9, r11
+ ldr r12, =0xfcfcfcfc >> 2
+ itt eq
+ addeq r8, r8, r14
+ addeq r9, r9, r14
+ and r4, r12, r4, lsr #2
+ and r5, r12, r5, lsr #2
+ and r6, r12, r6, lsr #2
+ and r7, r12, r7, lsr #2
+ add r10, r4, r6
+ add r11, r5, r7
+ subs r3, r3, #1
+.endm
+
+.macro RND_XY2_EXPAND align, rnd
+ RND_XY2_IT \align, \rnd
+6: push {r8-r11}
+ RND_XY2_IT \align, \rnd
+ pop {r4-r7}
+ add r4, r4, r8
+ add r5, r5, r9
+ ldr r14, =0x0f0f0f0f
+ add r6, r6, r10
+ add r7, r7, r11
+ and r4, r14, r4, lsr #2
+ and r5, r14, r5, lsr #2
+ add r4, r4, r6
+ add r5, r5, r7
+ stm r0, {r4-r5}
+ add r0, r0, r2
+ bge 6b
+ pop {r4-r11,pc}
+.endm
+
+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]
+ push {r4-r11,lr} @ R14 is also called LR
+ JMP_ALIGN r5, r1
+1: RND_XY2_EXPAND 0, lsl
+ .align 5
+2: RND_XY2_EXPAND 1, lsl
+ .align 5
+3: RND_XY2_EXPAND 2, lsl
+ .align 5
+4: RND_XY2_EXPAND 3, lsl
+endfunc
+
+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]
+ push {r4-r11,lr}
+ JMP_ALIGN r5, r1
+1: RND_XY2_EXPAND 0, lsr
+ .align 5
+2: RND_XY2_EXPAND 1, lsr
+ .align 5
+3: RND_XY2_EXPAND 2, lsr
+ .align 5
+4: RND_XY2_EXPAND 3, lsr
+endfunc

libav-v10.1.tar.bz2/libavcodec/arm/hpeldsp_arm.h Added

@@ -0,0 +1,27 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_ARM_HPELDSP_ARM_H
+#define AVCODEC_ARM_HPELDSP_ARM_H
+
+#include "libavcodec/hpeldsp.h"
+
+void ff_hpeldsp_init_armv6(HpelDSPContext *c, int flags);
+void ff_hpeldsp_init_neon(HpelDSPContext *c, int flags);
+
+#endif /* AVCODEC_ARM_HPELDSP_ARM_H */

libav-v10.1.tar.bz2/libavcodec/arm/hpeldsp_armv6.S Added

@@ -0,0 +1,261 @@
+/*
+ * Copyright (c) 2009 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 call_2x_pixels type, subp
+function ff_\type\()_pixels16\subp\()_armv6, export=1
+ push {r0-r3, lr}
+ bl X(ff_\type\()_pixels8\subp\()_armv6)
+ pop {r0-r3, lr}
+ add r0, r0, #8
+ add r1, r1, #8
+ b X(ff_\type\()_pixels8\subp\()_armv6)
+endfunc
+.endm
+
+call_2x_pixels avg
+call_2x_pixels put, _x2
+call_2x_pixels put, _y2
+call_2x_pixels put, _x2_no_rnd
+call_2x_pixels put, _y2_no_rnd
+
+function ff_put_pixels16_armv6, export=1
+ push {r4-r11}
+1:
+ ldr r5, [r1, #4]
+ ldr r6, [r1, #8]
+ ldr r7, [r1, #12]
+ ldr_post r4, r1, r2
+ strd r6, r7, [r0, #8]
+ ldr r9, [r1, #4]
+ strd_post r4, r5, r0, r2
+ ldr r10, [r1, #8]
+ ldr r11, [r1, #12]
+ ldr_post r8, r1, r2
+ strd r10, r11, [r0, #8]
+ subs r3, r3, #2
+ strd_post r8, r9, r0, r2
+ bne 1b
+
+ pop {r4-r11}
+ bx lr
+endfunc
+
+function ff_put_pixels8_armv6, export=1
+ push {r4-r7}
+1:
+ ldr r5, [r1, #4]
+ ldr_post r4, r1, r2
+ ldr r7, [r1, #4]
+ strd_post r4, r5, r0, r2
+ ldr_post r6, r1, r2
+ subs r3, r3, #2
+ strd_post r6, r7, r0, r2
+ bne 1b
+
+ pop {r4-r7}
+ bx lr
+endfunc
+
+function ff_put_pixels8_x2_armv6, export=1
+ push {r4-r11, lr}
+ mov r12, #1
+ orr r12, r12, r12, lsl #8
+ orr r12, r12, r12, lsl #16
+1:
+ ldr r4, [r1]
+ subs r3, r3, #2
+ ldr r5, [r1, #4]
+ ldr r7, [r1, #5]
+ lsr r6, r4, #8
+ ldr_pre r8, r1, r2
+ orr r6, r6, r5, lsl #24
+ ldr r9, [r1, #4]
+ ldr r11, [r1, #5]
+ lsr r10, r8, #8
+ add r1, r1, r2
+ orr r10, r10, r9, lsl #24
+ eor r14, r4, r6
+ uhadd8 r4, r4, r6
+ eor r6, r5, r7
+ uhadd8 r5, r5, r7
+ and r14, r14, r12
+ and r6, r6, r12
+ uadd8 r4, r4, r14
+ eor r14, r8, r10
+ uadd8 r5, r5, r6
+ eor r6, r9, r11
+ uhadd8 r8, r8, r10
+ and r14, r14, r12
+ uhadd8 r9, r9, r11
+ and r6, r6, r12
+ uadd8 r8, r8, r14
+ strd_post r4, r5, r0, r2
+ uadd8 r9, r9, r6
+ strd_post r8, r9, r0, r2
+ bne 1b
+
+ pop {r4-r11, pc}
+endfunc
+
+function ff_put_pixels8_y2_armv6, export=1
+ push {r4-r11}
+ mov r12, #1
+ orr r12, r12, r12, lsl #8
+ orr r12, r12, r12, lsl #16
+ ldr r4, [r1]
+ ldr r5, [r1, #4]
+ ldr_pre r6, r1, r2
+ ldr r7, [r1, #4]
+1:
+ subs r3, r3, #2
+ uhadd8 r8, r4, r6
+ eor r10, r4, r6
+ uhadd8 r9, r5, r7
+ eor r11, r5, r7
+ and r10, r10, r12
+ ldr_pre r4, r1, r2
+ uadd8 r8, r8, r10
+ and r11, r11, r12
+ uadd8 r9, r9, r11
+ ldr r5, [r1, #4]
+ uhadd8 r10, r4, r6
+ eor r6, r4, r6
+ uhadd8 r11, r5, r7
+ and r6, r6, r12
+ eor r7, r5, r7
+ uadd8 r10, r10, r6
+ and r7, r7, r12
+ ldrc_pre ne, r6, r1, r2
+ uadd8 r11, r11, r7
+ strd_post r8, r9, r0, r2
+ it ne
+ ldrne r7, [r1, #4]
+ strd_post r10, r11, r0, r2
+ bne 1b
+
+ pop {r4-r11}
+ bx lr
+endfunc
+
+function ff_put_pixels8_x2_no_rnd_armv6, export=1
+ push {r4-r9, lr}
+1:
+ subs r3, r3, #2
+ ldr r4, [r1]
+ ldr r5, [r1, #4]
+ ldr r7, [r1, #5]
+ ldr_pre r8, r1, r2
+ ldr r9, [r1, #4]
+ ldr r14, [r1, #5]
+ add r1, r1, r2
+ lsr r6, r4, #8
+ orr r6, r6, r5, lsl #24
+ lsr r12, r8, #8
+ orr r12, r12, r9, lsl #24
+ uhadd8 r4, r4, r6
+ uhadd8 r5, r5, r7
+ uhadd8 r8, r8, r12
+ uhadd8 r9, r9, r14
+ stm r0, {r4,r5}
+ add r0, r0, r2
+ stm r0, {r8,r9}
+ add r0, r0, r2
+ bne 1b
+
+ pop {r4-r9, pc}
+endfunc
+
+function ff_put_pixels8_y2_no_rnd_armv6, export=1
+ push {r4-r9, lr}
+ ldr r4, [r1]
+ ldr r5, [r1, #4]
+ ldr_pre r6, r1, r2
+ ldr r7, [r1, #4]
+1:
+ subs r3, r3, #2
+ uhadd8 r8, r4, r6
+ ldr_pre r4, r1, r2
+ uhadd8 r9, r5, r7
+ ldr r5, [r1, #4]
+ uhadd8 r12, r4, r6
+ ldrc_pre ne, r6, r1, r2
+ uhadd8 r14, r5, r7
+ it ne
+ ldrne r7, [r1, #4]
+ stm r0, {r8,r9}
+ add r0, r0, r2
+ stm r0, {r12,r14}
+ add r0, r0, r2
+ bne 1b
+
+ pop {r4-r9, pc}
+endfunc
+
+function ff_avg_pixels8_armv6, export=1
+ pld [r1, r2]
+ push {r4-r10, lr}
+ mov lr, #1
+ orr lr, lr, lr, lsl #8
+ orr lr, lr, lr, lsl #16
+ ldrd r4, r5, [r0]
+ ldr r10, [r1, #4]
+ ldr_post r9, r1, r2
+ subs r3, r3, #2
+1:
+ pld [r1, r2]
+ eor r8, r4, r9
+ uhadd8 r4, r4, r9
+ eor r12, r5, r10
+ ldrd_reg r6, r7, r0, r2
+ uhadd8 r5, r5, r10
+ and r8, r8, lr
+ ldr r10, [r1, #4]
+ and r12, r12, lr
+ uadd8 r4, r4, r8
+ ldr_post r9, r1, r2
+ eor r8, r6, r9
+ uadd8 r5, r5, r12
+ pld [r1, r2, lsl #1]
+ eor r12, r7, r10
+ uhadd8 r6, r6, r9
+ strd_post r4, r5, r0, r2
+ uhadd8 r7, r7, r10
+ beq 2f
+ and r8, r8, lr
+ ldrd_reg r4, r5, r0, r2
+ uadd8 r6, r6, r8
+ ldr r10, [r1, #4]
+ and r12, r12, lr
+ subs r3, r3, #2
+ uadd8 r7, r7, r12
+ ldr_post r9, r1, r2
+ strd_post r6, r7, r0, r2
+ b 1b
+2:
+ and r8, r8, lr
+ and r12, r12, lr
+ uadd8 r6, r6, r8
+ uadd8 r7, r7, r12
+ strd_post r6, r7, r0, r2
+
+ pop {r4-r10, pc}
+endfunc

libav-v10.1.tar.bz2/libavcodec/arm/hpeldsp_init_arm.c Added

@@ -0,0 +1,71 @@
+/*
+ * ARM optimized DSP utils
+ * Copyright (c) 2001 Lionel Ulmer
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/arm/cpu.h"
+#include "libavutil/attributes.h"
+#include "libavcodec/rnd_avg.h"
+#include "hpeldsp_arm.h"
+
+void ff_put_pixels8_arm(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h);
+void ff_put_pixels8_x2_arm(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h);
+void ff_put_pixels8_y2_arm(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h);
+void ff_put_pixels8_xy2_arm(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h);
+
+void ff_put_no_rnd_pixels8_x2_arm(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h);
+void ff_put_no_rnd_pixels8_y2_arm(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h);
+void ff_put_no_rnd_pixels8_xy2_arm(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h);
+
+void ff_put_pixels16_arm(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h);
+
+CALL_2X_PIXELS(ff_put_pixels16_x2_arm,         ff_put_pixels8_x2_arm,        8)
+CALL_2X_PIXELS(ff_put_pixels16_y2_arm,         ff_put_pixels8_y2_arm,        8)
+CALL_2X_PIXELS(ff_put_pixels16_xy2_arm,        ff_put_pixels8_xy2_arm,       8)
+CALL_2X_PIXELS(ff_put_no_rnd_pixels16_x2_arm,  ff_put_no_rnd_pixels8_x2_arm, 8)
+CALL_2X_PIXELS(ff_put_no_rnd_pixels16_y2_arm,  ff_put_no_rnd_pixels8_y2_arm, 8)
+CALL_2X_PIXELS(ff_put_no_rnd_pixels16_xy2_arm, ff_put_no_rnd_pixels8_xy2_arm,8)
+
+av_cold void ff_hpeldsp_init_arm(HpelDSPContext *c, int flags)
+{
+    int cpu_flags = av_get_cpu_flags();
+
+    c->put_pixels_tab[0][0] = ff_put_pixels16_arm;
+    c->put_pixels_tab[0][1] = ff_put_pixels16_x2_arm;
+    c->put_pixels_tab[0][2] = ff_put_pixels16_y2_arm;
+    c->put_pixels_tab[0][3] = ff_put_pixels16_xy2_arm;
+    c->put_pixels_tab[1][0] = ff_put_pixels8_arm;
+    c->put_pixels_tab[1][1] = ff_put_pixels8_x2_arm;
+    c->put_pixels_tab[1][2] = ff_put_pixels8_y2_arm;
+    c->put_pixels_tab[1][3] = ff_put_pixels8_xy2_arm;
+
+    c->put_no_rnd_pixels_tab[0][0] = ff_put_pixels16_arm;
+    c->put_no_rnd_pixels_tab[0][1] = ff_put_no_rnd_pixels16_x2_arm;
+    c->put_no_rnd_pixels_tab[0][2] = ff_put_no_rnd_pixels16_y2_arm;
+    c->put_no_rnd_pixels_tab[0][3] = ff_put_no_rnd_pixels16_xy2_arm;
+    c->put_no_rnd_pixels_tab[1][0] = ff_put_pixels8_arm;
+    c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_arm;
+    c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_arm;
+    c->put_no_rnd_pixels_tab[1][3] = ff_put_no_rnd_pixels8_xy2_arm;
+
+    if (have_armv6(cpu_flags))
+        ff_hpeldsp_init_armv6(c, flags);
+    if (have_neon(cpu_flags))
+        ff_hpeldsp_init_neon(c, flags);
+}

libav-v10.1.tar.bz2/libavcodec/arm/hpeldsp_init_armv6.c Added

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2009 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 "libavutil/attributes.h"
+#include "hpeldsp_arm.h"
+
+void ff_put_pixels16_armv6(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels16_x2_armv6(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels16_y2_armv6(uint8_t *, const uint8_t *, ptrdiff_t, int);
+
+void ff_put_pixels16_x2_no_rnd_armv6(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels16_y2_no_rnd_armv6(uint8_t *, const uint8_t *, ptrdiff_t, int);
+
+void ff_avg_pixels16_armv6(uint8_t *, const uint8_t *, ptrdiff_t, int);
+
+void ff_put_pixels8_armv6(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels8_x2_armv6(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels8_y2_armv6(uint8_t *, const uint8_t *, ptrdiff_t, int);
+
+void ff_put_pixels8_x2_no_rnd_armv6(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels8_y2_no_rnd_armv6(uint8_t *, const uint8_t *, ptrdiff_t, int);
+
+void ff_avg_pixels8_armv6(uint8_t *, const uint8_t *, ptrdiff_t, int);
+
+av_cold void ff_hpeldsp_init_armv6(HpelDSPContext *c, int flags)
+{
+ c->put_pixels_tab[0][0] = ff_put_pixels16_armv6;
+ c->put_pixels_tab[0][1] = ff_put_pixels16_x2_armv6;
+ c->put_pixels_tab[0][2] = ff_put_pixels16_y2_armv6;
+/* c->put_pixels_tab[0][3] = ff_put_pixels16_xy2_armv6; */
+ c->put_pixels_tab[1][0] = ff_put_pixels8_armv6;
+ c->put_pixels_tab[1][1] = ff_put_pixels8_x2_armv6;
+ c->put_pixels_tab[1][2] = ff_put_pixels8_y2_armv6;
+/* c->put_pixels_tab[1][3] = ff_put_pixels8_xy2_armv6; */
+
+ c->put_no_rnd_pixels_tab[0][0] = ff_put_pixels16_armv6;
+ c->put_no_rnd_pixels_tab[0][1] = ff_put_pixels16_x2_no_rnd_armv6;
+ c->put_no_rnd_pixels_tab[0][2] = ff_put_pixels16_y2_no_rnd_armv6;
+/* c->put_no_rnd_pixels_tab[0][3] = ff_put_pixels16_xy2_no_rnd_armv6; */
+ c->put_no_rnd_pixels_tab[1][0] = ff_put_pixels8_armv6;
+ c->put_no_rnd_pixels_tab[1][1] = ff_put_pixels8_x2_no_rnd_armv6;
+ c->put_no_rnd_pixels_tab[1][2] = ff_put_pixels8_y2_no_rnd_armv6;
+/* c->put_no_rnd_pixels_tab[1][3] = ff_put_pixels8_xy2_no_rnd_armv6; */
+
+ c->avg_pixels_tab[0][0] = ff_avg_pixels16_armv6;
+ c->avg_pixels_tab[1][0] = ff_avg_pixels8_armv6;
+}

libav-v10.1.tar.bz2/libavcodec/arm/hpeldsp_init_neon.c Added

@@ -0,0 +1,88 @@
+/*
+ * ARM NEON optimised DSP functions
+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 "libavutil/attributes.h"
+#include "hpeldsp_arm.h"
+
+void ff_put_pixels16_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels16_x2_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels16_y2_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels16_xy2_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels8_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels8_x2_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels8_y2_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels8_xy2_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels16_x2_no_rnd_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels16_y2_no_rnd_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels16_xy2_no_rnd_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels8_x2_no_rnd_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels8_y2_no_rnd_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_put_pixels8_xy2_no_rnd_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+
+void ff_avg_pixels16_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_avg_pixels16_x2_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_avg_pixels16_y2_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_avg_pixels16_xy2_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_avg_pixels8_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_avg_pixels8_x2_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_avg_pixels8_y2_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_avg_pixels8_xy2_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_avg_pixels16_x2_no_rnd_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_avg_pixels16_y2_no_rnd_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+void ff_avg_pixels16_xy2_no_rnd_neon(uint8_t *, const uint8_t *, ptrdiff_t, int);
+
+av_cold void ff_hpeldsp_init_neon(HpelDSPContext *c, int 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;
+}

libav-v10.1.tar.bz2/libavcodec/arm/hpeldsp_neon.S Added

@@ -0,0 +1,410 @@
+/*
+ * ARM NEON optimised DSP functions
+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 pixels16 rnd=1, avg=0
+ .if \avg
+ mov r12, r0
+ .endif
+1: vld1.8 {q0}, [r1], r2
+ vld1.8 {q1}, [r1], r2
+ vld1.8 {q2}, [r1], r2
+ pld [r1, r2, lsl #2]
+ vld1.8 {q3}, [r1], r2
+ pld [r1]
+ pld [r1, r2]
+ pld [r1, r2, lsl #1]
+ .if \avg
+ vld1.8 {q8}, [r12,:128], r2
+ vrhadd.u8 q0, q0, q8
+ vld1.8 {q9}, [r12,:128], r2
+ vrhadd.u8 q1, q1, q9
+ vld1.8 {q10}, [r12,:128], r2
+ vrhadd.u8 q2, q2, q10
+ vld1.8 {q11}, [r12,:128], r2
+ vrhadd.u8 q3, q3, q11
+ .endif
+ subs r3, r3, #4
+ vst1.64 {q0}, [r0,:128], r2
+ vst1.64 {q1}, [r0,:128], r2
+ vst1.64 {q2}, [r0,:128], r2
+ vst1.64 {q3}, [r0,:128], r2
+ bne 1b
+ bx lr
+.endm
+
+.macro pixels16_x2 rnd=1, avg=0
+1: vld1.8 {d0-d2}, [r1], r2
+ vld1.8 {d4-d6}, [r1], r2
+ pld [r1]
+ pld [r1, r2]
+ subs r3, r3, #2
+ vext.8 q1, q0, q1, #1
+ avg q0, q0, q1
+ vext.8 q3, q2, q3, #1
+ avg q2, q2, q3
+ .if \avg
+ vld1.8 {q1}, [r0,:128], r2
+ vld1.8 {q3}, [r0,:128]
+ vrhadd.u8 q0, q0, q1
+ vrhadd.u8 q2, q2, q3
+ sub r0, r0, r2
+ .endif
+ vst1.8 {q0}, [r0,:128], r2
+ vst1.8 {q2}, [r0,:128], r2
+ bne 1b
+ bx lr
+.endm
+
+.macro pixels16_y2 rnd=1, avg=0
+ sub r3, r3, #2
+ vld1.8 {q0}, [r1], r2
+ vld1.8 {q1}, [r1], r2
+1: subs r3, r3, #2
+ avg q2, q0, q1
+ vld1.8 {q0}, [r1], r2
+ avg q3, q0, q1
+ vld1.8 {q1}, [r1], r2
+ pld [r1]
+ pld [r1, r2]
+ .if \avg
+ vld1.8 {q8}, [r0,:128], r2
+ vld1.8 {q9}, [r0,:128]
+ vrhadd.u8 q2, q2, q8
+ vrhadd.u8 q3, q3, q9
+ sub r0, r0, r2
+ .endif
+ vst1.8 {q2}, [r0,:128], r2
+ vst1.8 {q3}, [r0,:128], r2
+ bne 1b
+
+ avg q2, q0, q1
+ vld1.8 {q0}, [r1], r2
+ avg q3, q0, q1
+ .if \avg
+ vld1.8 {q8}, [r0,:128], r2
+ vld1.8 {q9}, [r0,:128]
+ vrhadd.u8 q2, q2, q8
+ vrhadd.u8 q3, q3, q9
+ sub r0, r0, r2
+ .endif
+ vst1.8 {q2}, [r0,:128], r2
+ vst1.8 {q3}, [r0,:128], r2
+
+ bx lr
+.endm
+
+.macro pixels16_xy2 rnd=1, avg=0
+ sub r3, r3, #2
+ vld1.8 {d0-d2}, [r1], r2
+ vld1.8 {d4-d6}, [r1], r2
+NRND vmov.i16 q13, #1
+ pld [r1]
+ pld [r1, r2]
+ vext.8 q1, q0, q1, #1
+ vext.8 q3, q2, q3, #1
+ vaddl.u8 q8, d0, d2
+ vaddl.u8 q10, d1, d3
+ vaddl.u8 q9, d4, d6
+ vaddl.u8 q11, d5, d7
+1: subs r3, r3, #2
+ vld1.8 {d0-d2}, [r1], r2
+ vadd.u16 q12, q8, q9
+ pld [r1]
+NRND vadd.u16 q12, q12, q13
+ vext.8 q15, q0, q1, #1
+ vadd.u16 q1 , q10, q11
+ shrn d28, q12, #2
+NRND vadd.u16 q1, q1, q13
+ shrn d29, q1, #2
+ .if \avg
+ vld1.8 {q8}, [r0,:128]
+ vrhadd.u8 q14, q14, q8
+ .endif
+ vaddl.u8 q8, d0, d30
+ vld1.8 {d2-d4}, [r1], r2
+ vaddl.u8 q10, d1, d31
+ vst1.8 {q14}, [r0,:128], r2
+ vadd.u16 q12, q8, q9
+ pld [r1, r2]
+NRND vadd.u16 q12, q12, q13
+ vext.8 q2, q1, q2, #1
+ vadd.u16 q0, q10, q11
+ shrn d30, q12, #2
+NRND vadd.u16 q0, q0, q13
+ shrn d31, q0, #2
+ .if \avg
+ vld1.8 {q9}, [r0,:128]
+ vrhadd.u8 q15, q15, q9
+ .endif
+ vaddl.u8 q9, d2, d4
+ vaddl.u8 q11, d3, d5
+ vst1.8 {q15}, [r0,:128], r2
+ bgt 1b
+
+ vld1.8 {d0-d2}, [r1], r2
+ vadd.u16 q12, q8, q9
+NRND vadd.u16 q12, q12, q13
+ vext.8 q15, q0, q1, #1
+ vadd.u16 q1 , q10, q11
+ shrn d28, q12, #2
+NRND vadd.u16 q1, q1, q13
+ shrn d29, q1, #2
+ .if \avg
+ vld1.8 {q8}, [r0,:128]
+ vrhadd.u8 q14, q14, q8
+ .endif
+ vaddl.u8 q8, d0, d30
+ vaddl.u8 q10, d1, d31
+ vst1.8 {q14}, [r0,:128], r2
+ vadd.u16 q12, q8, q9
+NRND vadd.u16 q12, q12, q13
+ vadd.u16 q0, q10, q11
+ shrn d30, q12, #2
+NRND vadd.u16 q0, q0, q13
+ shrn d31, q0, #2
+ .if \avg
+ vld1.8 {q9}, [r0,:128]
+ vrhadd.u8 q15, q15, q9
+ .endif
+ vst1.8 {q15}, [r0,:128], r2
+
+ bx lr
+.endm
+
+.macro pixels8 rnd=1, avg=0
+1: vld1.8 {d0}, [r1], r2
+ vld1.8 {d1}, [r1], r2
+ vld1.8 {d2}, [r1], r2
+ pld [r1, r2, lsl #2]
+ vld1.8 {d3}, [r1], r2
+ pld [r1]
+ pld [r1, r2]
+ pld [r1, r2, lsl #1]
+ .if \avg
+ vld1.8 {d4}, [r0,:64], r2
+ vrhadd.u8 d0, d0, d4
+ vld1.8 {d5}, [r0,:64], r2
+ vrhadd.u8 d1, d1, d5
+ vld1.8 {d6}, [r0,:64], r2
+ vrhadd.u8 d2, d2, d6
+ vld1.8 {d7}, [r0,:64], r2
+ vrhadd.u8 d3, d3, d7
+ sub r0, r0, r2, lsl #2
+ .endif
+ subs r3, r3, #4
+ vst1.8 {d0}, [r0,:64], r2
+ vst1.8 {d1}, [r0,:64], r2
+ vst1.8 {d2}, [r0,:64], r2
+ vst1.8 {d3}, [r0,:64], r2
+ bne 1b
+ bx lr
+.endm
+
+.macro pixels8_x2 rnd=1, avg=0
+1: vld1.8 {q0}, [r1], r2
+ vext.8 d1, d0, d1, #1
+ vld1.8 {q1}, [r1], r2
+ vext.8 d3, d2, d3, #1
+ pld [r1]
+ pld [r1, r2]
+ subs r3, r3, #2
+ vswp d1, d2
+ avg q0, q0, q1
+ .if \avg
+ vld1.8 {d4}, [r0,:64], r2
+ vld1.8 {d5}, [r0,:64]
+ vrhadd.u8 q0, q0, q2
+ sub r0, r0, r2
+ .endif
+ vst1.8 {d0}, [r0,:64], r2
+ vst1.8 {d1}, [r0,:64], r2
+ bne 1b
+ bx lr
+.endm
+
+.macro pixels8_y2 rnd=1, avg=0
+ sub r3, r3, #2
+ vld1.8 {d0}, [r1], r2
+ vld1.8 {d1}, [r1], r2
+1: subs r3, r3, #2
+ avg d4, d0, d1
+ vld1.8 {d0}, [r1], r2
+ avg d5, d0, d1
+ vld1.8 {d1}, [r1], r2
+ pld [r1]
+ pld [r1, r2]
+ .if \avg
+ vld1.8 {d2}, [r0,:64], r2
+ vld1.8 {d3}, [r0,:64]
+ vrhadd.u8 q2, q2, q1
+ sub r0, r0, r2
+ .endif
+ vst1.8 {d4}, [r0,:64], r2
+ vst1.8 {d5}, [r0,:64], r2
+ bne 1b
+
+ avg d4, d0, d1
+ vld1.8 {d0}, [r1], r2
+ avg d5, d0, d1
+ .if \avg
+ vld1.8 {d2}, [r0,:64], r2
+ vld1.8 {d3}, [r0,:64]
+ vrhadd.u8 q2, q2, q1
+ sub r0, r0, r2
+ .endif
+ vst1.8 {d4}, [r0,:64], r2
+ vst1.8 {d5}, [r0,:64], r2
+
+ bx lr
+.endm
+
+.macro pixels8_xy2 rnd=1, avg=0
+ sub r3, r3, #2
+ vld1.8 {q0}, [r1], r2
+ vld1.8 {q1}, [r1], r2
+NRND vmov.i16 q11, #1
+ pld [r1]
+ pld [r1, r2]
+ vext.8 d4, d0, d1, #1
+ vext.8 d6, d2, d3, #1
+ vaddl.u8 q8, d0, d4
+ vaddl.u8 q9, d2, d6
+1: subs r3, r3, #2
+ vld1.8 {q0}, [r1], r2
+ pld [r1]
+ vadd.u16 q10, q8, q9
+ vext.8 d4, d0, d1, #1
+NRND vadd.u16 q10, q10, q11
+ vaddl.u8 q8, d0, d4
+ shrn d5, q10, #2
+ vld1.8 {q1}, [r1], r2
+ vadd.u16 q10, q8, q9
+ pld [r1, r2]
+ .if \avg
+ vld1.8 {d7}, [r0,:64]
+ vrhadd.u8 d5, d5, d7
+ .endif
+NRND vadd.u16 q10, q10, q11
+ vst1.8 {d5}, [r0,:64], r2
+ shrn d7, q10, #2
+ .if \avg
+ vld1.8 {d5}, [r0,:64]
+ vrhadd.u8 d7, d7, d5
+ .endif
+ vext.8 d6, d2, d3, #1
+ vaddl.u8 q9, d2, d6
+ vst1.8 {d7}, [r0,:64], r2
+ bgt 1b
+
+ vld1.8 {q0}, [r1], r2
+ vadd.u16 q10, q8, q9
+ vext.8 d4, d0, d1, #1
+NRND vadd.u16 q10, q10, q11
+ vaddl.u8 q8, d0, d4
+ shrn d5, q10, #2
+ vadd.u16 q10, q8, q9
+ .if \avg
+ vld1.8 {d7}, [r0,:64]
+ vrhadd.u8 d5, d5, d7
+ .endif
+NRND vadd.u16 q10, q10, q11
+ vst1.8 {d5}, [r0,:64], r2
+ shrn d7, q10, #2
+ .if \avg
+ vld1.8 {d5}, [r0,:64]
+ vrhadd.u8 d7, d7, d5
+ .endif
+ vst1.8 {d7}, [r0,:64], r2
+
+ bx lr
+.endm
+
+.macro pixfunc pfx, name, suf, rnd=1, avg=0
+ .if \rnd
+ .macro avg rd, rn, rm
+ vrhadd.u8 \rd, \rn, \rm
+ .endm
+ .macro shrn rd, rn, rm
+ vrshrn.u16 \rd, \rn, \rm
+ .endm
+ .macro NRND insn:vararg
+ .endm
+ .else
+ .macro avg rd, rn, rm
+ vhadd.u8 \rd, \rn, \rm
+ .endm
+ .macro shrn rd, rn, rm
+ vshrn.u16 \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 shrn
+ .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 r3, #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 r3, #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 r3, #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 r3, #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

libav-v9.6.tar.bz2/libavcodec/arm/int_neon.S -> libav-v10.1.tar.bz2/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
@@ -41,10 +39,10 @@
 
         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]
@@ -81,10 +79,10 @@
 
         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]

libav-v9.6.tar.bz2/libavcodec/arm/jrevdct_arm.S -> libav-v10.1.tar.bz2/libavcodec/arm/jrevdct_arm.S Changed

libav-v9.6.tar.bz2/libavcodec/arm/mdct_neon.S -> libav-v10.1.tar.bz2/libavcodec/arm/mdct_neon.S Changed

libav-v10.1.tar.bz2/libavcodec/arm/mdct_vfp.S Added

@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2013 RISC OS Open Ltd
+ * Author: Ben Avison <bavison@riscosopen.org>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/arm/asm.S"
+
+CONTEXT .req a1
+ORIGOUT .req a2
+IN .req a3
+OUT .req v1
+REVTAB .req v2
+TCOS .req v3
+TSIN .req v4
+OLDFPSCR .req v5
+J0 .req a2
+J1 .req a4
+J2 .req ip
+J3 .req lr
+
+.macro prerotation_innerloop
+ .set trig_lo, k
+ .set trig_hi, n4 - k - 2
+ .set in_lo, trig_lo * 2
+ .set in_hi, trig_hi * 2
+ vldr d8, [TCOS, #trig_lo*4] @ s16,s17
+ vldr d9, [TCOS, #trig_hi*4] @ s18,s19
+ vldr s0, [IN, #in_hi*4 + 12]
+ vldr s1, [IN, #in_hi*4 + 4]
+ vldr s2, [IN, #in_lo*4 + 12]
+ vldr s3, [IN, #in_lo*4 + 4]
+ vmul.f s8, s0, s16 @ vector operation
+ vldr d10, [TSIN, #trig_lo*4] @ s20,s21
+ vldr d11, [TSIN, #trig_hi*4] @ s22,s23
+ vldr s4, [IN, #in_lo*4]
+ vldr s5, [IN, #in_lo*4 + 8]
+ vldr s6, [IN, #in_hi*4]
+ vldr s7, [IN, #in_hi*4 + 8]
+ ldr J0, [REVTAB, #trig_lo*2]
+ vmul.f s12, s0, s20 @ vector operation
+ ldr J2, [REVTAB, #trig_hi*2]
+ mov J1, J0, lsr #16
+ and J0, J0, #255 @ halfword value will be < n4
+ vmls.f s8, s4, s20 @ vector operation
+ mov J3, J2, lsr #16
+ and J2, J2, #255 @ halfword value will be < n4
+ add J0, OUT, J0, lsl #3
+ vmla.f s12, s4, s16 @ vector operation
+ add J1, OUT, J1, lsl #3
+ add J2, OUT, J2, lsl #3
+ add J3, OUT, J3, lsl #3
+ vstr s8, [J0]
+ vstr s9, [J1]
+ vstr s10, [J2]
+ vstr s11, [J3]
+ vstr s12, [J0, #4]
+ vstr s13, [J1, #4]
+ vstr s14, [J2, #4]
+ vstr s15, [J3, #4]
+ .set k, k + 2
+.endm
+
+.macro postrotation_innerloop tail, head
+ .set trig_lo_head, n8 - k - 2
+ .set trig_hi_head, n8 + k
+ .set out_lo_head, trig_lo_head * 2
+ .set out_hi_head, trig_hi_head * 2
+ .set trig_lo_tail, n8 - (k - 2) - 2
+ .set trig_hi_tail, n8 + (k - 2)
+ .set out_lo_tail, trig_lo_tail * 2
+ .set out_hi_tail, trig_hi_tail * 2
+ .if (k & 2) == 0
+ TCOS_D0_HEAD .req d10 @ s20,s21
+ TCOS_D1_HEAD .req d11 @ s22,s23
+ TCOS_S0_TAIL .req s24
+ .else
+ TCOS_D0_HEAD .req d12 @ s24,s25
+ TCOS_D1_HEAD .req d13 @ s26,s27
+ TCOS_S0_TAIL .req s20
+ .endif
+ .ifnc "\tail",""
+ vmls.f s8, s0, TCOS_S0_TAIL @ vector operation
+ .endif
+ .ifnc "\head",""
+ vldr d8, [TSIN, #trig_lo_head*4] @ s16,s17
+ vldr d9, [TSIN, #trig_hi_head*4] @ s18,s19
+ vldr TCOS_D0_HEAD, [TCOS, #trig_lo_head*4]
+ .endif
+ .ifnc "\tail",""
+ vmla.f s12, s4, TCOS_S0_TAIL @ vector operation
+ .endif
+ .ifnc "\head",""
+ vldr s0, [OUT, #out_lo_head*4]
+ vldr s1, [OUT, #out_lo_head*4 + 8]
+ vldr s2, [OUT, #out_hi_head*4]
+ vldr s3, [OUT, #out_hi_head*4 + 8]
+ vldr s4, [OUT, #out_lo_head*4 + 4]
+ vldr s5, [OUT, #out_lo_head*4 + 12]
+ vldr s6, [OUT, #out_hi_head*4 + 4]
+ vldr s7, [OUT, #out_hi_head*4 + 12]
+ .endif
+ .ifnc "\tail",""
+ vstr s8, [OUT, #out_lo_tail*4]
+ vstr s9, [OUT, #out_lo_tail*4 + 8]
+ vstr s10, [OUT, #out_hi_tail*4]
+ vstr s11, [OUT, #out_hi_tail*4 + 8]
+ .endif
+ .ifnc "\head",""
+ vmul.f s8, s4, s16 @ vector operation
+ .endif
+ .ifnc "\tail",""
+ vstr s12, [OUT, #out_hi_tail*4 + 12]
+ vstr s13, [OUT, #out_hi_tail*4 + 4]
+ vstr s14, [OUT, #out_lo_tail*4 + 12]
+ vstr s15, [OUT, #out_lo_tail*4 + 4]
+ .endif
+ .ifnc "\head",""
+ vmul.f s12, s0, s16 @ vector operation
+ vldr TCOS_D1_HEAD, [TCOS, #trig_hi_head*4]
+ .endif
+ .unreq TCOS_D0_HEAD
+ .unreq TCOS_D1_HEAD
+ .unreq TCOS_S0_TAIL
+ .ifnc "\head",""
+ .set k, k + 2
+ .endif
+.endm
+
+
+/* void ff_imdct_half_vfp(FFTContext *s,
+ * FFTSample *output,
+ * const FFTSample *input)
+ */
+function ff_imdct_half_vfp, export=1
+ ldr ip, [CONTEXT, #5*4] @ mdct_bits
+ teq ip, #6
+ it ne
+ bne X(ff_imdct_half_c) @ only case currently accelerated is the one used by DCA
+
+ .set n, 1<<6
+ .set n2, n/2
+ .set n4, n/4
+ .set n8, n/8
+
+ push {v1-v5,lr}
+ vpush {s16-s27}
+ fmrx OLDFPSCR, FPSCR
+ ldr lr, =0x03030000 @ RunFast mode, short vectors of length 4, stride 1
+ fmxr FPSCR, lr
+ mov OUT, ORIGOUT
+ ldr REVTAB, [CONTEXT, #2*4]
+ ldr TCOS, [CONTEXT, #6*4]
+ ldr TSIN, [CONTEXT, #7*4]
+
+ .set k, 0
+ .rept n8/2
+ prerotation_innerloop
+ .endr
+
+ fmxr FPSCR, OLDFPSCR
+ mov a1, OUT
+ bl X(ff_fft16_vfp)
+ ldr lr, =0x03030000 @ RunFast mode, short vectors of length 4, stride 1
+ fmxr FPSCR, lr
+
+ .set k, 0
+ postrotation_innerloop , head
+ .rept n8/2 - 1
+ postrotation_innerloop tail, head
+ .endr
+ postrotation_innerloop tail
+
+ fmxr FPSCR, OLDFPSCR
+ vpop {s16-s27}
+ pop {v1-v5,pc}
+endfunc
+
+ .unreq CONTEXT
+ .unreq ORIGOUT
+ .unreq IN
+ .unreq OUT
+ .unreq REVTAB
+ .unreq TCOS
+ .unreq TSIN
+ .unreq OLDFPSCR
+ .unreq J0
+ .unreq J1
+ .unreq J2
+ .unreq J3

libav-v9.6.tar.bz2/libavcodec/arm/mpegaudiodsp_init_arm.c -> libav-v10.1.tar.bz2/libavcodec/arm/mpegaudiodsp_init_arm.c Changed

libav-v9.6.tar.bz2/libavcodec/arm/mpegvideo_arm.c -> libav-v10.1.tar.bz2/libavcodec/arm/mpegvideo_arm.c Changed

libav-v9.6.tar.bz2/libavcodec/arm/mpegvideo_arm.h -> libav-v10.1.tar.bz2/libavcodec/arm/mpegvideo_arm.h Changed

libav-v9.6.tar.bz2/libavcodec/arm/mpegvideo_armv5te.c -> libav-v10.1.tar.bz2/libavcodec/arm/mpegvideo_armv5te.c Changed

@@ -19,12 +19,12 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "libavutil/attributes.h"
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/mpegvideo.h"
 #include "mpegvideo_arm.h"
 
-void ff_dct_unquantize_h263_armv5te(DCTELEM *block, int qmul, int qadd, int count);
+void ff_dct_unquantize_h263_armv5te(int16_t *block, int qmul, int qadd, int count);
 
 #ifdef ENABLE_ARM_TESTS
 /**
@@ -32,7 +32,7 @@
 * have optimized implementations for each architecture. Is also used as a reference
 * implementation in regression tests
 */
-static inline void dct_unquantize_h263_helper_c(DCTELEM *block, int qmul, int qadd, int count)
+static inline void dct_unquantize_h263_helper_c(int16_t *block, int qmul, int qadd, int count)
 {
 int i, level;
 for (i = 0; i < count; i++) {
@@ -50,7 +50,7 @@
 #endif
 
 static void dct_unquantize_h263_intra_armv5te(MpegEncContext *s,
- DCTELEM *block, int n, int qscale)
+ int16_t *block, int n, int qscale)
 {
 int level, qmul, qadd;
 int nCoeffs;
@@ -79,7 +79,7 @@
 }
 
 static void dct_unquantize_h263_inter_armv5te(MpegEncContext *s,
- DCTELEM *block, int n, int qscale)
+ int16_t *block, int n, int qscale)
 {
 int qmul, qadd;
 int nCoeffs;
@@ -94,7 +94,7 @@
 ff_dct_unquantize_h263_armv5te(block, qmul, qadd, nCoeffs + 1);
 }
 
-void ff_MPV_common_init_armv5te(MpegEncContext *s)
+av_cold void ff_MPV_common_init_armv5te(MpegEncContext *s)
 {
 s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_armv5te;
 s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_armv5te;

libav-v9.6.tar.bz2/libavcodec/arm/mpegvideo_neon.S -> libav-v10.1.tar.bz2/libavcodec/arm/mpegvideo_neon.S Changed

libav-v10.1.tar.bz2/libavcodec/arm/neontest.c Added

@@ -0,0 +1,79 @@
+/*
+ * check NEON registers for clobbers
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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);
+}

libav-v9.6.tar.bz2/libavcodec/arm/rv34dsp_init_arm.c -> libav-v10.1.tar.bz2/libavcodec/arm/rv34dsp_init_arm.c Changed

libav-v9.6.tar.bz2/libavcodec/arm/rv34dsp_neon.S -> libav-v10.1.tar.bz2/libavcodec/arm/rv34dsp_neon.S Changed

libav-v9.6.tar.bz2/libavcodec/arm/rv40dsp_init_arm.c -> libav-v10.1.tar.bz2/libavcodec/arm/rv40dsp_init_arm.c Changed

@@ -20,13 +20,14 @@
 
 #include <stdint.h>
 
+#include "libavutil/attributes.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/rv34dsp.h"
 #include "libavutil/arm/cpu.h"
 
 #define DECL_QPEL3(type, w, pos) \
 void ff_##type##_rv40_qpel##w##_mc##pos##_neon(uint8_t *dst, uint8_t *src,\
- int stride)
+ ptrdiff_t stride)
 #define DECL_QPEL2(w, pos) \
 DECL_QPEL3(put, w, pos); \
 DECL_QPEL3(avg, w, pos)
@@ -69,7 +70,7 @@
 int filter_q1, int alpha, int beta,
 int lim_p0q0, int lim_q1, int lim_p1);
 
-static void ff_rv40dsp_init_neon(RV34DSPContext *c)
+static av_cold void rv40dsp_init_neon(RV34DSPContext *c)
 {
 c->put_pixels_tab[0][ 1] = ff_put_rv40_qpel16_mc10_neon;
 c->put_pixels_tab[0][ 3] = ff_put_rv40_qpel16_mc30_neon;
@@ -138,10 +139,10 @@
 c->rv40_weak_loop_filter[1] = ff_rv40_v_weak_loop_filter_neon;
 }
 
-void ff_rv40dsp_init_arm(RV34DSPContext *c, DSPContext* dsp)
+av_cold void ff_rv40dsp_init_arm(RV34DSPContext *c)
 {
 int cpu_flags = av_get_cpu_flags();
 
 if (have_neon(cpu_flags))
- ff_rv40dsp_init_neon(c);
+ rv40dsp_init_neon(c);
 }

libav-v9.6.tar.bz2/libavcodec/arm/simple_idct_arm.S -> libav-v10.1.tar.bz2/libavcodec/arm/simple_idct_arm.S Changed

@@ -83,7 +83,7 @@
 orrs r5, r5, r7 @ R5=R4 | R3 | R2 | R7
 beq __almost_empty_row
 
-__b_evaluation:
+@@ __b_evaluation:
 @@ at this point, R0=block (temp), R1(free), R2=ROWr32[1], R3=ROWr32[2], R4=ROWr32[3],
 @@ R5=(temp), R6=ROWr16[0], R7=ROWr16[1], R8-R11 free,
 @@ R12=__const_ptr_, R14=&block[n]
@@ -159,7 +159,7 @@
 @@ R5=b2, R6=ROWr16[0], R7=b3, R8 (free), R9 (free), R10 (free), R11 (free),
 @@ R12=__const_ptr_, R14=&block[n]
 
-__a_evaluation:
+@@ __a_evaluation:
 @@ a0 = (W4 * row[0]) + (1 << (ROW_SHIFT - 1));
 @@ a1 = a0 + W6 * row[2];
 @@ a2 = a0 - W6 * row[2];
@@ -295,7 +295,7 @@
 add r14, r0, #14 @ R14=&block[7], better start from the last col, and decrease the value until col=0, i.e. R14=block.
 __col_loop:
 
-__b_evaluation2:
+@@ __b_evaluation2:
 @@ at this point, R0=block (temp), R1-R11 (free)
 @@ R12=__const_ptr_, R14=&block[n]
 @@ proceed with b0-b3 first, followed by a0-a3
@@ -357,12 +357,12 @@
 it ne
 mlane r1, r10, r4, r1 @ R1-=W5*ROWr16[7x8]=b1
 @@ R4 is free now
-__end_b_evaluation2:
+@@ __end_b_evaluation2:
 @@ at this point, R0=b0, R1=b1, R2 (free), R3 (free), R4 (free),
 @@ R5=b2, R6 (free), R7=b3, R8 (free), R9 (free), R10 (free), R11 (free),
 @@ R12=__const_ptr_, R14=&block[n]
 
-__a_evaluation2:
+@@ __a_evaluation2:
 @@ a0 = (W4 * col[8x0]) + (1 << (COL_SHIFT - 1));
 @@ a1 = a0 + W6 * row[2];
 @@ a2 = a0 - W6 * row[2];
@@ -414,7 +414,7 @@
 itt ne
 subne r2, r2, r10 @ R2-=W2*ROWr16[6] (a1)
 addne r3, r3, r10 @ R3+=W2*ROWr16[6] (a2)
-__end_a_evaluation2:
+@@ __end_a_evaluation2:
 @@ at this point, R0=b0, R1=b1, R2=a1, R3=a2, R4=a3,
 @@ R5=b2, R6=a0, R7=b3, R8 (free), R9 (free), R10 (free), R11 (free),
 @@ R12=__const_ptr_, R14=&block[n]
@@ -452,7 +452,7 @@
 strh r8, [r14, #96]
 strh r9, [r14, #112]
 
-__end_col_loop:
+@@ __end_col_loop:
 @@ at this point, R0-R11 (free)
 @@ R12=__const_ptr_, R14=&block[n]
 ldr r0, [sp, #0] @ R0=block
@@ -463,7 +463,7 @@
 
 
 
-__end_simple_idct_arm:
+@@ __end_simple_idct_arm:
 @@ restore registers to previous status!
 add sp, sp, #8 @@ the local variables!
 ldmfd sp!, {r4-r11, r15} @@ update PC with LR content.
@@ -477,3 +477,4 @@
 sub r4, r6, r11 @ R4=a0-W2*ROWr16[2] (a3)
 add r6, r6, r11 @ R6=a0+W2*ROWr16[2] (a0)
 bal __end_a_evaluation
+endfunc

libav-v9.6.tar.bz2/libavcodec/arm/simple_idct_armv6.S -> libav-v10.1.tar.bz2/libavcodec/arm/simple_idct_armv6.S Changed

libav-v9.6.tar.bz2/libavcodec/arm/simple_idct_neon.S -> libav-v10.1.tar.bz2/libavcodec/arm/simple_idct_neon.S Changed

libav-v10.1.tar.bz2/libavcodec/arm/synth_filter_vfp.S Added

@@ -0,0 +1,243 @@
+/*
+ * Copyright (c) 2013 RISC OS Open Ltd
+ * Author: Ben Avison <bavison@riscosopen.org>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/arm/asm.S"
+
+IMDCT .req r0
+ORIG_P_SB .req r1
+P_SB_OFF .req r2
+I .req r0
+P_SB2_UP .req r1
+OLDFPSCR .req r2
+P_SB2_DN .req r3
+P_WIN_DN .req r4
+P_OUT_DN .req r5
+P_SB .req r6
+J_WRAP .req r7
+P_WIN_UP .req r12
+P_OUT_UP .req r14
+
+SCALE .req s0
+SBUF_DAT_REV0 .req s4
+SBUF_DAT_REV1 .req s5
+SBUF_DAT_REV2 .req s6
+SBUF_DAT_REV3 .req s7
+VA0 .req s8
+VA3 .req s11
+VB0 .req s12
+VB3 .req s15
+VC0 .req s8
+VC3 .req s11
+VD0 .req s12
+VD3 .req s15
+SBUF_DAT0 .req s16
+SBUF_DAT1 .req s17
+SBUF_DAT2 .req s18
+SBUF_DAT3 .req s19
+SBUF_DAT_ALT0 .req s20
+SBUF_DAT_ALT1 .req s21
+SBUF_DAT_ALT2 .req s22
+SBUF_DAT_ALT3 .req s23
+WIN_DN_DAT0 .req s24
+WIN_UP_DAT0 .req s28
+
+
+.macro inner_loop half, tail, head
+ .if (OFFSET & (64*4)) == 0 @ even numbered call
+ SBUF_DAT_THIS0 .req SBUF_DAT0
+ SBUF_DAT_THIS1 .req SBUF_DAT1
+ SBUF_DAT_THIS2 .req SBUF_DAT2
+ SBUF_DAT_THIS3 .req SBUF_DAT3
+ .ifnc "\head",""
+ vldr d8, [P_SB, #OFFSET] @ d8 = SBUF_DAT
+ vldr d9, [P_SB, #OFFSET+8]
+ .endif
+ .else
+ SBUF_DAT_THIS0 .req SBUF_DAT_ALT0
+ SBUF_DAT_THIS1 .req SBUF_DAT_ALT1
+ SBUF_DAT_THIS2 .req SBUF_DAT_ALT2
+ SBUF_DAT_THIS3 .req SBUF_DAT_ALT3
+ .ifnc "\head",""
+ vldr d10, [P_SB, #OFFSET] @ d10 = SBUF_DAT_ALT
+ vldr d11, [P_SB, #OFFSET+8]
+ .endif
+ .endif
+ .ifnc "\tail",""
+ .ifc "\half","ab"
+ vmls.f VA0, SBUF_DAT_REV0, WIN_DN_DAT0 @ all operands treated as vectors
+ .else
+ vmla.f VD0, SBUF_DAT_REV0, WIN_DN_DAT0 @ all operands treated as vectors
+ .endif
+ .endif
+ .ifnc "\head",""
+ vldr d14, [P_WIN_UP, #OFFSET] @ d14 = WIN_UP_DAT
+ vldr d15, [P_WIN_UP, #OFFSET+8]
+ vldr d12, [P_WIN_DN, #OFFSET] @ d12 = WIN_DN_DAT
+ vldr d13, [P_WIN_DN, #OFFSET+8]
+ vmov SBUF_DAT_REV3, SBUF_DAT_THIS0
+ vmov SBUF_DAT_REV2, SBUF_DAT_THIS1
+ vmov SBUF_DAT_REV1, SBUF_DAT_THIS2
+ vmov SBUF_DAT_REV0, SBUF_DAT_THIS3
+ .ifc "\half","ab"
+ vmla.f VB0, SBUF_DAT_THIS0, WIN_UP_DAT0
+ .else
+ vmla.f VC0, SBUF_DAT_THIS0, WIN_UP_DAT0
+ .endif
+ teq J_WRAP, #J
+ bne 2f @ strongly predictable, so better than cond exec in this case
+ sub P_SB, P_SB, #512*4
+2:
+ .set J, J - 64
+ .set OFFSET, OFFSET + 64*4
+ .endif
+ .unreq SBUF_DAT_THIS0
+ .unreq SBUF_DAT_THIS1
+ .unreq SBUF_DAT_THIS2
+ .unreq SBUF_DAT_THIS3
+.endm
+
+
+/* void ff_synth_filter_float_vfp(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)
+ */
+function ff_synth_filter_float_vfp, export=1
+ push {r3-r7,lr}
+ vpush {s16-s31}
+ ldr lr, [P_SB_OFF]
+ add a2, ORIG_P_SB, lr, LSL #2 @ calculate synth_buf to pass to imdct_half
+ mov P_SB, a2 @ and keep a copy for ourselves
+ bic J_WRAP, lr, #63 @ mangled to make testing for wrap easier in inner loop
+ sub lr, lr, #32
+ and lr, lr, #512-32
+ str lr, [P_SB_OFF] @ rotate offset, modulo buffer size, ready for next call
+ ldr a3, [sp, #(16+6+2)*4] @ fetch in from stack, to pass to imdct_half
+VFP vmov s16, SCALE @ imdct_half is free to corrupt s0, but it contains one of our arguments in hardfp case
+ bl X(ff_imdct_half_vfp)
+VFP vmov SCALE, s16
+
+ fmrx OLDFPSCR, FPSCR
+ ldr lr, =0x03030000 @ RunFast mode, short vectors of length 4, stride 1
+ fmxr FPSCR, lr
+ ldr P_SB2_DN, [sp, #16*4]
+ ldr P_WIN_DN, [sp, #(16+6+0)*4]
+ ldr P_OUT_DN, [sp, #(16+6+1)*4]
+NOVFP vldr SCALE, [sp, #(16+6+3)*4]
+
+#define IMM_OFF_SKEW 956 /* also valid immediate constant when you add 16*4 */
+ add P_SB, P_SB, #IMM_OFF_SKEW @ so we can use -ve offsets to use full immediate offset range
+ add P_SB2_UP, P_SB2_DN, #16*4
+ add P_WIN_UP, P_WIN_DN, #16*4+IMM_OFF_SKEW
+ add P_OUT_UP, P_OUT_DN, #16*4
+ add P_SB2_DN, P_SB2_DN, #16*4
+ add P_WIN_DN, P_WIN_DN, #12*4+IMM_OFF_SKEW
+ add P_OUT_DN, P_OUT_DN, #16*4
+ mov I, #4
+1:
+ vldmia P_SB2_UP!, {VB0-VB3}
+ vldmdb P_SB2_DN!, {VA0-VA3}
+ .set J, 512 - 64
+ .set OFFSET, -IMM_OFF_SKEW
+ inner_loop ab,, head
+ .rept 7
+ inner_loop ab, tail, head
+ .endr
+ inner_loop ab, tail
+ add P_WIN_UP, P_WIN_UP, #4*4
+ sub P_WIN_DN, P_WIN_DN, #4*4
+ vmul.f VB0, VB0, SCALE @ SCALE treated as scalar
+ add P_SB, P_SB, #(512+4)*4
+ subs I, I, #1
+ vmul.f VA0, VA0, SCALE
+ vstmia P_OUT_UP!, {VB0-VB3}
+ vstmdb P_OUT_DN!, {VA0-VA3}
+ bne 1b
+
+ add P_SB2_DN, P_SB2_DN, #(16+28-12)*4
+ sub P_SB2_UP, P_SB2_UP, #(16+16)*4
+ add P_WIN_DN, P_WIN_DN, #(32+16+28-12)*4
+ mov I, #4
+1:
+ vldr.d d4, zero @ d4 = VC0
+ vldr.d d5, zero
+ vldr.d d6, zero @ d6 = VD0
+ vldr.d d7, zero
+ .set J, 512 - 64
+ .set OFFSET, -IMM_OFF_SKEW
+ inner_loop cd,, head
+ .rept 7
+ inner_loop cd, tail, head
+ .endr
+ inner_loop cd, tail
+ add P_WIN_UP, P_WIN_UP, #4*4
+ sub P_WIN_DN, P_WIN_DN, #4*4
+ add P_SB, P_SB, #(512+4)*4
+ subs I, I, #1
+ vstmia P_SB2_UP!, {VC0-VC3}
+ vstmdb P_SB2_DN!, {VD0-VD3}
+ bne 1b
+
+ fmxr FPSCR, OLDFPSCR
+ vpop {s16-s31}
+ pop {r3-r7,pc}
+endfunc
+
+ .unreq IMDCT
+ .unreq ORIG_P_SB
+ .unreq P_SB_OFF
+ .unreq I
+ .unreq P_SB2_UP
+ .unreq OLDFPSCR
+ .unreq P_SB2_DN
+ .unreq P_WIN_DN
+ .unreq P_OUT_DN
+ .unreq P_SB
+ .unreq J_WRAP
+ .unreq P_WIN_UP
+ .unreq P_OUT_UP
+
+ .unreq SCALE
+ .unreq SBUF_DAT_REV0
+ .unreq SBUF_DAT_REV1
+ .unreq SBUF_DAT_REV2
+ .unreq SBUF_DAT_REV3
+ .unreq VA0
+ .unreq VA3
+ .unreq VB0
+ .unreq VB3
+ .unreq VC0
+ .unreq VC3
+ .unreq VD0
+ .unreq VD3
+ .unreq SBUF_DAT0
+ .unreq SBUF_DAT1
+ .unreq SBUF_DAT2
+ .unreq SBUF_DAT3
+ .unreq SBUF_DAT_ALT0
+ .unreq SBUF_DAT_ALT1
+ .unreq SBUF_DAT_ALT2
+ .unreq SBUF_DAT_ALT3
+ .unreq WIN_DN_DAT0
+ .unreq WIN_UP_DAT0
+
+ .align 3
+zero: .word 0, 0

libav-v10.1.tar.bz2/libavcodec/arm/vc1dsp.h Added

libav-v10.1.tar.bz2/libavcodec/arm/vc1dsp_init_arm.c Added

@@ -0,0 +1,32 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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);
+}

libav-v10.1.tar.bz2/libavcodec/arm/vc1dsp_init_neon.c Added

@@ -0,0 +1,114 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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;
+}

libav-v10.1.tar.bz2/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 Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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

libav-v9.6.tar.bz2/libavcodec/arm/videodsp_armv5te.S -> libav-v10.1.tar.bz2/libavcodec/arm/videodsp_armv5te.S Changed

libav-v9.6.tar.bz2/libavcodec/arm/videodsp_init_arm.c -> libav-v10.1.tar.bz2/libavcodec/arm/videodsp_init_arm.c Changed

libav-v9.6.tar.bz2/libavcodec/arm/videodsp_init_armv5te.c -> libav-v10.1.tar.bz2/libavcodec/arm/videodsp_init_armv5te.c Changed

libav-v10.1.tar.bz2/libavcodec/arm/vorbisdsp_init_arm.c Added

@@ -0,0 +1,37 @@
+/*
+ * ARM NEON optimised DSP functions
+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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/arm/cpu.h"
+#include "libavcodec/vorbisdsp.h"
+
+void ff_vorbis_inverse_coupling_neon(float *mag, float *ang,
+ intptr_t blocksize);
+
+av_cold void ff_vorbisdsp_init_arm(VorbisDSPContext *c)
+{
+ int cpu_flags = av_get_cpu_flags();
+
+ if (have_neon(cpu_flags)) {
+ c->vorbis_inverse_coupling = ff_vorbis_inverse_coupling_neon;
+ }
+}

libav-v10.1.tar.bz2/libavcodec/arm/vorbisdsp_neon.S Added

@@ -0,0 +1,83 @@
+/*
+ * ARM NEON optimised DSP functions
+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/arm/asm.S"
+
+function ff_vorbis_inverse_coupling_neon, export=1
+ vmov.i32 q10, #1<<31
+ subs r2, r2, #4
+ mov r3, r0
+ mov r12, r1
+ beq 3f
+
+ vld1.32 {d24-d25},[r1,:128]!
+ vld1.32 {d22-d23},[r0,:128]!
+ vcle.s32 q8, q12, #0
+ vand q9, q11, q10
+ veor q12, q12, q9
+ vand q2, q12, q8
+ vbic q3, q12, q8
+ vadd.f32 q12, q11, q2
+ vsub.f32 q11, q11, q3
+1: vld1.32 {d2-d3}, [r1,:128]!
+ vld1.32 {d0-d1}, [r0,:128]!
+ vcle.s32 q8, q1, #0
+ vand q9, q0, q10
+ veor q1, q1, q9
+ vst1.32 {d24-d25},[r3, :128]!
+ vst1.32 {d22-d23},[r12,:128]!
+ vand q2, q1, q8
+ vbic q3, q1, q8
+ vadd.f32 q1, q0, q2
+ vsub.f32 q0, q0, q3
+ subs r2, r2, #8
+ ble 2f
+ vld1.32 {d24-d25},[r1,:128]!
+ vld1.32 {d22-d23},[r0,:128]!
+ vcle.s32 q8, q12, #0
+ vand q9, q11, q10
+ veor q12, q12, q9
+ vst1.32 {d2-d3}, [r3, :128]!
+ vst1.32 {d0-d1}, [r12,:128]!
+ vand q2, q12, q8
+ vbic q3, q12, q8
+ vadd.f32 q12, q11, q2
+ vsub.f32 q11, q11, q3
+ b 1b
+
+2: vst1.32 {d2-d3}, [r3, :128]!
+ vst1.32 {d0-d1}, [r12,:128]!
+ it lt
+ bxlt lr
+
+3: vld1.32 {d2-d3}, [r1,:128]
+ vld1.32 {d0-d1}, [r0,:128]
+ vcle.s32 q8, q1, #0
+ vand q9, q0, q10
+ veor q1, q1, q9
+ vand q2, q1, q8
+ vbic q3, q1, q8
+ vadd.f32 q1, q0, q2
+ vsub.f32 q0, q0, q3
+ vst1.32 {d2-d3}, [r0,:128]!
+ vst1.32 {d0-d1}, [r1,:128]!
+ bx lr
+endfunc

libav-v9.6.tar.bz2/libavcodec/arm/vp3dsp_init_arm.c -> libav-v10.1.tar.bz2/libavcodec/arm/vp3dsp_init_arm.c Changed

libav-v9.6.tar.bz2/libavcodec/arm/vp3dsp_neon.S -> libav-v10.1.tar.bz2/libavcodec/arm/vp3dsp_neon.S Changed

@@ -108,14 +108,20 @@
 
 function vp3_idct_start_neon
 vpush {d8-d15}
+ vmov.i16 q4, #0
+ vmov.i16 q5, #0
 movrel r3, vp3_idct_constants
 vld1.64 {d0-d1}, [r3,:128]
- vld1.64 {d16-d19}, [r2,:128]!
- vld1.64 {d20-d23}, [r2,:128]!
- vld1.64 {d24-d27}, [r2,:128]!
+ vld1.64 {d16-d19}, [r2,:128]
+ vst1.64 {q4-q5}, [r2,:128]!
+ vld1.64 {d20-d23}, [r2,:128]
+ vst1.64 {q4-q5}, [r2,:128]!
+ vld1.64 {d24-d27}, [r2,:128]
+ vst1.64 {q4-q5}, [r2,:128]!
 vadd.s16 q1, q8, q12
 vsub.s16 q8, q8, q12
- vld1.64 {d28-d31}, [r2,:128]!
+ vld1.64 {d28-d31}, [r2,:128]
+ vst1.64 {q4-q5}, [r2,:128]!
 
 vp3_idct_core_neon:
 vmull.s16 q2, d18, xC1S7 // (ip[1] * C1) << 16
@@ -345,10 +351,12 @@
 endfunc
 
 function ff_vp3_idct_dc_add_neon, export=1
- ldrsh r2, [r2]
+ ldrsh r12, [r2]
 mov r3, r0
- add r2, r2, #15
- vdup.16 q15, r2
+ add r12, r12, #15
+ vdup.16 q15, r12
+ mov r12, #0
+ strh r12, [r2]
 vshr.s16 q15, q15, #5
 
 vld1.8 {d0}, [r0,:64], r1

libav-v10.1.tar.bz2/libavcodec/arm/vp6dsp_init_arm.c Added

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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/avcodec.h"
+#include "libavcodec/vp56dsp.h"
+
+void ff_vp6_edge_filter_hor_neon(uint8_t *yuv, int stride, int t);
+void ff_vp6_edge_filter_ver_neon(uint8_t *yuv, int stride, int t);
+
+av_cold void ff_vp6dsp_init_arm(VP56DSPContext *s, enum AVCodecID codec)
+{
+ int cpu_flags = av_get_cpu_flags();
+
+ if (have_neon(cpu_flags)) {
+ s->edge_filter_hor = ff_vp6_edge_filter_hor_neon;
+ s->edge_filter_ver = ff_vp6_edge_filter_ver_neon;
+ }
+}

libav-v10.1.tar.bz2/libavcodec/arm/vp6dsp_neon.S Changed

libav-v9.6.tar.bz2/libavcodec/arm/vp8.h -> libav-v10.1.tar.bz2/libavcodec/arm/vp8.h Changed

libav-v9.6.tar.bz2/libavcodec/arm/vp8dsp_armv6.S -> libav-v10.1.tar.bz2/libavcodec/arm/vp8dsp_armv6.S Changed

@@ -56,7 +56,7 @@
 
 @ idct
 
-@ void vp8_luma_dc_wht(DCTELEM block[4][4][16], DCTELEM dc[16])
+@ void vp8_luma_dc_wht(int16_t block[4][4][16], int16_t dc[16])
 function ff_vp8_luma_dc_wht_armv6, export=1
         push            {r4-r10, lr}
 
@@ -179,7 +179,7 @@
         pop             {r4-r10, pc}
 endfunc
 
-@ void vp8_luma_dc_wht_dc(DCTELEM block[4][4][16], DCTELEM dc[16])
+@ void vp8_luma_dc_wht_dc(int16_t block[4][4][16], int16_t dc[16])
 function ff_vp8_luma_dc_wht_dc_armv6, export=1
         ldrsh           r2,  [r1]
         mov             r3,  #0
@@ -192,7 +192,7 @@
         bx              lr
 endfunc
 
-@ void vp8_idct_add(uint8_t *dst, DCTELEM block[16], int stride)
+@ void vp8_idct_add(uint8_t *dst, int16_t block[16], int stride)
 function ff_vp8_idct_add_armv6, export=1
         push            {r4-r12, lr}
         sub             sp,  sp,  #32
@@ -314,7 +314,7 @@
         pop             {r4-r12, pc}
 endfunc
 
-@ void vp8_idct_dc_add(uint8_t *dst, DCTELEM block[16], int stride)
+@ void vp8_idct_dc_add(uint8_t *dst, int16_t block[16], int stride)
 function ff_vp8_idct_dc_add_armv6, export=1
         push            {r4-r6, lr}
         add             r6,  r0,  r2,  lsl #1
@@ -355,33 +355,33 @@
         pop             {r4-r6, pc}
 endfunc
 
-@ void vp8_idct_dc_add4uv(uint8_t *dst, DCTELEM block[4][16], int stride)
+@ void vp8_idct_dc_add4uv(uint8_t *dst, int16_t block[4][16], int stride)
 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
 
-@ void vp8_idct_dc_add4y(uint8_t *dst, DCTELEM block[4][16], int stride)
+@ void vp8_idct_dc_add4y(uint8_t *dst, int16_t block[4][16], int stride)
 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

libav-v9.6.tar.bz2/libavcodec/arm/vp8dsp_init_arm.c -> libav-v10.1.tar.bz2/libavcodec/arm/vp8dsp_init_arm.c Changed

libav-v9.6.tar.bz2/libavcodec/arm/vp8dsp_init_armv6.c -> libav-v10.1.tar.bz2/libavcodec/arm/vp8dsp_init_armv6.c Changed

@@ -17,16 +17,18 @@
 */
 
 #include <stdint.h>
+
+#include "libavutil/attributes.h"
 #include "libavcodec/vp8dsp.h"
 #include "vp8dsp.h"
 
-void ff_vp8_luma_dc_wht_armv6(DCTELEM block[4][4][16], DCTELEM dc[16]);
-void ff_vp8_luma_dc_wht_dc_armv6(DCTELEM block[4][4][16], DCTELEM dc[16]);
+void ff_vp8_luma_dc_wht_armv6(int16_t block[4][4][16], int16_t dc[16]);
+void ff_vp8_luma_dc_wht_dc_armv6(int16_t block[4][4][16], int16_t dc[16]);
 
-void ff_vp8_idct_add_armv6(uint8_t *dst, DCTELEM block[16], ptrdiff_t stride);
-void ff_vp8_idct_dc_add_armv6(uint8_t *dst, DCTELEM block[16], ptrdiff_t stride);
-void ff_vp8_idct_dc_add4y_armv6(uint8_t *dst, DCTELEM block[4][16], ptrdiff_t stride);
-void ff_vp8_idct_dc_add4uv_armv6(uint8_t *dst, DCTELEM block[4][16], ptrdiff_t stride);
+void ff_vp8_idct_add_armv6(uint8_t *dst, int16_t block[16], ptrdiff_t stride);
+void ff_vp8_idct_dc_add_armv6(uint8_t *dst, int16_t block[16], ptrdiff_t stride);
+void ff_vp8_idct_dc_add4y_armv6(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride);
+void ff_vp8_idct_dc_add4uv_armv6(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride);
 
 VP8_LF(armv6);

libav-v9.6.tar.bz2/libavcodec/arm/vp8dsp_init_neon.c -> libav-v10.1.tar.bz2/libavcodec/arm/vp8dsp_init_neon.c Changed

libav-v9.6.tar.bz2/libavcodec/arm/vp8dsp_neon.S -> libav-v10.1.tar.bz2/libavcodec/arm/vp8dsp_neon.S Changed

@@ -1576,18 +1576,18 @@
 /* Bilinear MC */
 
 function ff_put_vp8_bilin16_h_neon, export=1
-        ldr             r3,  [sp, #4]           @ mx
-        rsb             r12, r3,  #8
-        vdup.8          d0,  r3
+        ldr             r12, [sp, #4]           @ mx
+        vdup.8          d0,  r12
+        rsb             r12, r12, #8
         vdup.8          d1,  r12
         ldr             r12, [sp]               @ h
 1:
         subs            r12, r12, #2
-        vld1.8          {d2-d4},  [r2], r1
+        vld1.8          {d2-d4},  [r2], r3
         vext.8          q2,  q1,  q2,  #1
         vmull.u8        q8,  d2,  d1
         vmlal.u8        q8,  d4,  d0
-        vld1.8          {d18-d20},[r2], r1
+        vld1.8          {d18-d20},[r2], r3
         vmull.u8        q3,  d3,  d1
         vmlal.u8        q3,  d5,  d0
         vext.8          q10, q9,  q10, #1
@@ -1607,20 +1607,20 @@
 endfunc
 
 function ff_put_vp8_bilin16_v_neon, export=1
-        ldr             r3,  [sp, #8]           @ my
-        rsb             r12, r3,  #8
-        vdup.8          d0,  r3
+        ldr             r12, [sp, #8]           @ my
+        vdup.8          d0,  r12
+        rsb             r12, r12, #8
         vdup.8          d1,  r12
         ldr             r12, [sp]               @ h
-        vld1.8          {q1},     [r2], r1
+        vld1.8          {q1},     [r2], r3
 1:
         subs            r12, r12, #2
-        vld1.8          {q2},     [r2], r1
+        vld1.8          {q2},     [r2], r3
         vmull.u8        q3,  d2,  d1
         vmlal.u8        q3,  d4,  d0
         vmull.u8        q8,  d3,  d1
         vmlal.u8        q8,  d5,  d0
-        vld1.8          {q1},     [r2], r1
+        vld1.8          {q1},     [r2], r3
         vmull.u8        q9,  d4,  d1
         vmlal.u8        q9,  d2,  d0
         vmull.u8        q10, d5,  d1
@@ -1637,17 +1637,17 @@
 endfunc
 
 function ff_put_vp8_bilin16_hv_neon, export=1
-        ldr             r3,  [sp, #4]           @ mx
-        rsb             r12, r3,  #8
-        vdup.8          d0,  r3
+        ldr             r12, [sp, #4]           @ mx
+        vdup.8          d0,  r12
+        rsb             r12, r12, #8
         vdup.8          d1,  r12
-        ldr             r3,  [sp, #8]           @ my
-        rsb             r12, r3,  #8
-        vdup.8          d2,  r3
+        ldr             r12, [sp, #8]           @ my
+        vdup.8          d2,  r12
+        rsb             r12, r12, #8
         vdup.8          d3,  r12
         ldr             r12, [sp]               @ h
 
-        vld1.8          {d4-d6},  [r2], r1
+        vld1.8          {d4-d6},  [r2], r3
         vext.8          q3,  q2,  q3,  #1
         vmull.u8        q8,  d4,  d1
         vmlal.u8        q8,  d6,  d0
@@ -1657,11 +1657,11 @@
         vrshrn.u16      d5,  q9,  #3
 1:
         subs            r12, r12, #2
-        vld1.8          {d18-d20},[r2], r1
+        vld1.8          {d18-d20},[r2], r3
         vext.8          q10, q9,  q10, #1
         vmull.u8        q11, d18, d1
         vmlal.u8        q11, d20, d0
-        vld1.8          {d26-d28},[r2], r1
+        vld1.8          {d26-d28},[r2], r3
         vmull.u8        q12, d19, d1
         vmlal.u8        q12, d21, d0
         vext.8          q14, q13, q14, #1
@@ -1693,18 +1693,18 @@
 endfunc
 
 function ff_put_vp8_bilin8_h_neon, export=1
-        ldr             r3,  [sp, #4]           @ mx
-        rsb             r12, r3,  #8
-        vdup.8          d0,  r3
+        ldr             r12, [sp, #4]           @ mx
+        vdup.8          d0,  r12
+        rsb             r12, r12, #8
         vdup.8          d1,  r12
         ldr             r12, [sp]               @ h
 1:
         subs            r12, r12, #2
-        vld1.8          {q1},     [r2], r1
+        vld1.8          {q1},     [r2], r3
         vext.8          d3,  d2,  d3,  #1
         vmull.u8        q2,  d2,  d1
         vmlal.u8        q2,  d3,  d0
-        vld1.8          {q3},     [r2], r1
+        vld1.8          {q3},     [r2], r3
         vext.8          d7,  d6,  d7,  #1
         vmull.u8        q8,  d6,  d1
         vmlal.u8        q8,  d7,  d0
@@ -1718,18 +1718,18 @@
 endfunc
 
 function ff_put_vp8_bilin8_v_neon, export=1
-        ldr             r3,  [sp, #8]           @ my
-        rsb             r12, r3,  #8
-        vdup.8          d0,  r3
+        ldr             r12, [sp, #8]           @ my
+        vdup.8          d0,  r12
+        rsb             r12, r12,  #8
         vdup.8          d1,  r12
         ldr             r12, [sp]               @ h
-        vld1.8          {d2},     [r2], r1
+        vld1.8          {d2},     [r2], r3
 1:
         subs            r12, r12, #2
-        vld1.8          {d3},     [r2], r1
+        vld1.8          {d3},     [r2], r3
         vmull.u8        q2,  d2,  d1
         vmlal.u8        q2,  d3,  d0
-        vld1.8          {d2},     [r2], r1
+        vld1.8          {d2},     [r2], r3
         vmull.u8        q3,  d3,  d1
         vmlal.u8        q3,  d2,  d0
         vrshrn.u16      d4,  q2,  #3
@@ -1742,28 +1742,28 @@
 endfunc
 
 function ff_put_vp8_bilin8_hv_neon, export=1
-        ldr             r3,  [sp, #4]           @ mx
-        rsb             r12, r3,  #8
-        vdup.8          d0,  r3
+        ldr             r12, [sp, #4]           @ mx
+        vdup.8          d0,  r12
+        rsb             r12, r12, #8
         vdup.8          d1,  r12
-        ldr             r3,  [sp, #8]           @ my
-        rsb             r12, r3,  #8
-        vdup.8          d2,  r3
+        ldr             r12, [sp, #8]           @ my
+        vdup.8          d2,  r12
+        rsb             r12, r12, #8
         vdup.8          d3,  r12
         ldr             r12, [sp]               @ h
 
-        vld1.8          {q2},     [r2], r1
+        vld1.8          {q2},     [r2], r3
         vext.8          d5,  d4,  d5,  #1
         vmull.u8        q9,  d4,  d1
         vmlal.u8        q9,  d5,  d0
         vrshrn.u16      d22, q9,  #3
 1:
         subs            r12, r12, #2
-        vld1.8          {q3},     [r2], r1
+        vld1.8          {q3},     [r2], r3
         vext.8          d7,  d6,  d7,  #1
         vmull.u8        q8,  d6,  d1
         vmlal.u8        q8,  d7,  d0
-        vld1.8          {q2},     [r2], r1
+        vld1.8          {q2},     [r2], r3
         vext.8          d5,  d4,  d5,  #1
         vmull.u8        q9,  d4,  d1
         vmlal.u8        q9,  d5,  d0
@@ -1783,16 +1783,16 @@
 endfunc
 
 function ff_put_vp8_bilin4_h_neon, export=1
-        ldr             r3,  [sp, #4]           @ mx
-        rsb             r12, r3,  #8
-        vdup.8          d0,  r3
+        ldr             r12, [sp, #4]           @ mx
+        vdup.8          d0,  r12
+        rsb             r12, r12, #8
         vdup.8          d1,  r12
         ldr             r12, [sp]               @ h
 1:
         subs            r12, r12, #2
-        vld1.8          {d2},     [r2], r1
+        vld1.8          {d2},     [r2], r3
         vext.8          d3,  d2,  d3,  #1
-        vld1.8          {d6},     [r2], r1
+        vld1.8          {d6},     [r2], r3
         vext.8          d7,  d6,  d7,  #1
         vtrn.32         q1,  q3
         vmull.u8        q2,  d2,  d1
@@ -1806,16 +1806,16 @@
 endfunc
 
 function ff_put_vp8_bilin4_v_neon, export=1
-        ldr             r3,  [sp, #8]           @ my
-        rsb             r12, r3,  #8
-        vdup.8          d0,  r3
+        ldr             r12, [sp, #8]           @ my
+        vdup.8          d0,  r12
+        rsb             r12, r12, #8
         vdup.8          d1,  r12
         ldr             r12, [sp]               @ h
-        vld1.32         {d2[]},   [r2], r1
+        vld1.32         {d2[]},   [r2], r3
 1:
         vld1.32         {d3[]},   [r2]
-        vld1.32         {d2[1]},  [r2], r1
-        vld1.32         {d3[1]},  [r2], r1
+        vld1.32         {d2[1]},  [r2], r3
+        vld1.32         {d3[1]},  [r2], r3
         vmull.u8        q2,  d2,  d1
         vmlal.u8        q2,  d3,  d0
         vtrn.32         d3,  d2
@@ -1829,26 +1829,26 @@
 endfunc
 
 function ff_put_vp8_bilin4_hv_neon, export=1
-        ldr             r3,  [sp, #4]           @ mx
-        rsb             r12, r3,  #8
-        vdup.8          d0,  r3
+        ldr             r12, [sp, #4]           @ mx
+        vdup.8          d0,  r12
+        rsb             r12, r12, #8
         vdup.8          d1,  r12
-        ldr             r3,  [sp, #8]           @ my
-        rsb             r12, r3,  #8
-        vdup.8          d2,  r3
+        ldr             r12, [sp, #8]           @ my
+        vdup.8          d2,  r12
+        rsb             r12, r12, #8
         vdup.8          d3,  r12
         ldr             r12, [sp]               @ h
 
-        vld1.8          {d4},     [r2], r1
+        vld1.8          {d4},     [r2], r3
         vext.8          d5,  d4,  d4,  #1
         vmull.u8        q9,  d4,  d1
         vmlal.u8        q9,  d5,  d0
         vrshrn.u16      d22, q9,  #3
 1:
         subs            r12, r12, #2
-        vld1.8          {d6},     [r2], r1
+        vld1.8          {d6},     [r2], r3
         vext.8          d7,  d6,  d6,  #1
-        vld1.8          {d4},     [r2], r1
+        vld1.8          {d4},     [r2], r3
         vext.8          d5,  d4,  d4,  #1
         vtrn.32         q3,  q2
         vmull.u8        q8,  d6,  d1

libav-v9.6.tar.bz2/libavcodec/ass.c -> libav-v10.1.tar.bz2/libavcodec/ass.c Changed

@@ -39,11 +39,11 @@
 * the layout of the numpad (1-3 sub, 4-6 mid, 7-9 top)
 * @return >= 0 on success otherwise an error code <0
 */
-static int ff_ass_subtitle_header(AVCodecContext *avctx,
- const char *font, int font_size,
- int color, int back_color,
- int bold, int italic, int underline,
- int alignment)
+static int ass_subtitle_header(AVCodecContext *avctx,
+ const char *font, int font_size,
+ int color, int back_color,
+ int bold, int italic, int underline,
+ int alignment)
 {
 char header[512];
 
@@ -69,14 +69,14 @@
 
 int ff_ass_subtitle_header_default(AVCodecContext *avctx)
 {
- return ff_ass_subtitle_header(avctx, ASS_DEFAULT_FONT,
- ASS_DEFAULT_FONT_SIZE,
- ASS_DEFAULT_COLOR,
- ASS_DEFAULT_BACK_COLOR,
- ASS_DEFAULT_BOLD,
- ASS_DEFAULT_ITALIC,
- ASS_DEFAULT_UNDERLINE,
- ASS_DEFAULT_ALIGNMENT);
+ return ass_subtitle_header(avctx, ASS_DEFAULT_FONT,
+ ASS_DEFAULT_FONT_SIZE,
+ ASS_DEFAULT_COLOR,
+ ASS_DEFAULT_BACK_COLOR,
+ ASS_DEFAULT_BOLD,
+ ASS_DEFAULT_ITALIC,
+ ASS_DEFAULT_UNDERLINE,
+ ASS_DEFAULT_ALIGNMENT);
 }
 
 void ff_ass_init(AVSubtitle *sub)

libav-v9.6.tar.bz2/libavcodec/asv.c -> libav-v10.1.tar.bz2/libavcodec/asv.c Changed

libav-v9.6.tar.bz2/libavcodec/asv.h -> libav-v10.1.tar.bz2/libavcodec/asv.h Changed

libav-v9.6.tar.bz2/libavcodec/asvdec.c -> libav-v10.1.tar.bz2/libavcodec/asvdec.c Changed

@@ -29,14 +29,10 @@
 #include "asv.h"
 #include "avcodec.h"
 #include "put_bits.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "mathops.h"
 #include "mpeg12data.h"
 
-//#undef NDEBUG
-//#include <assert.h>
-
 #define VLC_BITS 6
 #define ASV2_LEVEL_VLC_BITS 10
 
@@ -97,7 +93,7 @@
 return code - 31;
 }
 
-static inline int asv1_decode_block(ASV1Context *a, DCTELEM block[64])
+static inline int asv1_decode_block(ASV1Context *a, int16_t block[64])
 {
 int i;
 
@@ -111,7 +107,7 @@
 break;
 if (ccp < 0 || i >= 10) {
 av_log(a->avctx, AV_LOG_ERROR, "coded coeff pattern damaged\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 if (ccp & 8)
@@ -128,7 +124,7 @@
 return 0;
 }
 
-static inline int asv2_decode_block(ASV1Context *a, DCTELEM block[64])
+static inline int asv2_decode_block(ASV1Context *a, int16_t block[64])
 {
 int i, count, ccp;
 
@@ -164,7 +160,7 @@
 return 0;
 }
 
-static inline int decode_mb(ASV1Context *a, DCTELEM block[6][64])
+static inline int decode_mb(ASV1Context *a, int16_t block[6][64])
 {
 int i;
 
@@ -184,14 +180,14 @@
 return 0;
 }
 
-static inline void idct_put(ASV1Context *a, int mb_x, int mb_y)
+static inline void idct_put(ASV1Context *a, AVFrame *frame, int mb_x, int mb_y)
 {
- DCTELEM (*block)[64] = a->block;
- int linesize = a->picture.linesize[0];
+ int16_t (*block)[64] = a->block;
+ int linesize = frame->linesize[0];
 
- uint8_t *dest_y = a->picture.data[0] + (mb_y * 16* linesize ) + mb_x * 16;
- uint8_t *dest_cb = a->picture.data[1] + (mb_y * 8 * a->picture.linesize[1]) + mb_x * 8;
- uint8_t *dest_cr = a->picture.data[2] + (mb_y * 8 * a->picture.linesize[2]) + mb_x * 8;
+ uint8_t *dest_y = frame->data[0] + (mb_y * 16* linesize ) + mb_x * 16;
+ uint8_t *dest_cb = frame->data[1] + (mb_y * 8 * frame->linesize[1]) + mb_x * 8;
+ uint8_t *dest_cr = frame->data[2] + (mb_y * 8 * frame->linesize[2]) + mb_x * 8;
 
 a->dsp.idct_put(dest_y , linesize, block[0]);
 a->dsp.idct_put(dest_y + 8, linesize, block[1]);
@@ -199,8 +195,8 @@
 a->dsp.idct_put(dest_y + 8*linesize + 8, linesize, block[3]);
 
 if (!(a->avctx->flags&CODEC_FLAG_GRAY)) {
- a->dsp.idct_put(dest_cb, a->picture.linesize[1], block[4]);
- a->dsp.idct_put(dest_cr, a->picture.linesize[2], block[5]);
+ a->dsp.idct_put(dest_cb, frame->linesize[1], block[4]);
+ a->dsp.idct_put(dest_cr, frame->linesize[2], block[5]);
 }
 }
 
@@ -211,17 +207,12 @@
 ASV1Context * const a = avctx->priv_data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
- AVFrame *picture = data;
- AVFrame * const p = &a->picture;
- int mb_x, mb_y;
+ AVFrame * const p = data;
+ int mb_x, mb_y, ret;
 
- if (p->data[0])
- avctx->release_buffer(avctx, p);
-
- p->reference = 0;
- if (ff_get_buffer(avctx, p) < 0) {
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 p->pict_type = AV_PICTURE_TYPE_I;
 p->key_frame = 1;
@@ -243,34 +234,33 @@
 
 for (mb_y = 0; mb_y < a->mb_height2; mb_y++) {
 for (mb_x = 0; mb_x < a->mb_width2; mb_x++) {
- if (decode_mb(a, a->block) < 0)
- return -1;
+ if ((ret = decode_mb(a, a->block)) < 0)
+ return ret;
 
- idct_put(a, mb_x, mb_y);
+ idct_put(a, p, mb_x, mb_y);
 }
 }
 
 if (a->mb_width2 != a->mb_width) {
 mb_x = a->mb_width2;
 for (mb_y = 0; mb_y < a->mb_height2; mb_y++) {
- if (decode_mb(a, a->block) < 0)
- return -1;
+ if ((ret = decode_mb(a, a->block)) < 0)
+ return ret;
 
- idct_put(a, mb_x, mb_y);
+ idct_put(a, p, mb_x, mb_y);
 }
 }
 
 if (a->mb_height2 != a->mb_height) {
 mb_y = a->mb_height2;
 for (mb_x = 0; mb_x < a->mb_width; mb_x++) {
- if (decode_mb(a, a->block) < 0)
- return -1;
+ if ((ret = decode_mb(a, a->block)) < 0)
+ return ret;
 
- idct_put(a, mb_x, mb_y);
+ idct_put(a, p, mb_x, mb_y);
 }
 }
 
- *picture = a->picture;
 *got_frame = 1;
 
 emms_c();
@@ -281,10 +271,14 @@
 static av_cold int decode_init(AVCodecContext *avctx)
 {
 ASV1Context * const a = avctx->priv_data;
- AVFrame *p = &a->picture;
 const int scale = avctx->codec_id == AV_CODEC_ID_ASV1 ? 1 : 2;
 int i;
 
+ if (avctx->extradata_size < 1) {
+ av_log(avctx, AV_LOG_ERROR, "No extradata provided\n");
+ return AVERROR_INVALIDDATA;
+ }
+
 ff_asv_common_init(avctx);
 init_vlcs(a);
 ff_init_scantable(a->dsp.idct_permutation, &a->scantable, ff_asv_scantab);
@@ -305,11 +299,6 @@
 a->intra_matrix[i] = 64 * scale * ff_mpeg1_default_intra_matrix[index] / a->inv_qscale;
 }
 
- p->qstride = a->mb_width;
- p->qscale_table = av_malloc(p->qstride * a->mb_height);
- p->quality = (32 * scale + a->inv_qscale / 2) / a->inv_qscale;
- memset(p->qscale_table, p->quality, p->qstride * a->mb_height);
-
 return 0;
 }
 
@@ -318,17 +307,14 @@
 ASV1Context * const a = avctx->priv_data;
 
 av_freep(&a->bitstream_buffer);
- av_freep(&a->picture.qscale_table);
 a->bitstream_buffer_size = 0;
 
- if (a->picture.data[0])
- avctx->release_buffer(avctx, &a->picture);
-
 return 0;
 }
 
 AVCodec ff_asv1_decoder = {
 .name = "asv1",
+ .long_name = NULL_IF_CONFIG_SMALL("ASUS V1"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_ASV1,
 .priv_data_size = sizeof(ASV1Context),
@@ -336,11 +322,11 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("ASUS V1"),
 };
 
 AVCodec ff_asv2_decoder = {
 .name = "asv2",
+ .long_name = NULL_IF_CONFIG_SMALL("ASUS V2"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_ASV2,
 .priv_data_size = sizeof(ASV1Context),
@@ -348,6 +334,5 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("ASUS V2"),
 };

libav-v9.6.tar.bz2/libavcodec/asvenc.c -> libav-v10.1.tar.bz2/libavcodec/asvenc.c Changed

@@ -55,7 +55,7 @@
 }
 }
 
-static inline void asv1_encode_block(ASV1Context *a, DCTELEM block[64]){
+static inline void asv1_encode_block(ASV1Context *a, int16_t block[64]){
 int i;
 int nc_count=0;
 
@@ -88,7 +88,7 @@
 put_bits(&a->pb, ff_asv_ccp_tab[16][1], ff_asv_ccp_tab[16][0]);
 }
 
-static inline void asv2_encode_block(ASV1Context *a, DCTELEM block[64]){
+static inline void asv2_encode_block(ASV1Context *a, int16_t block[64]){
 int i;
 int count=0;
 
@@ -129,7 +129,7 @@
 
 #define MAX_MB_SIZE (30*16*16*3/2/8)
 
-static inline int encode_mb(ASV1Context *a, DCTELEM block[6][64]){
+static inline int encode_mb(ASV1Context *a, int16_t block[6][64]){
 int i;
 
 if (a->pb.buf_end - a->pb.buf - (put_bits_count(&a->pb)>>3) < MAX_MB_SIZE) {
@@ -147,14 +147,16 @@
 return 0;
 }
 
-static inline void dct_get(ASV1Context *a, int mb_x, int mb_y){
- DCTELEM (*block)[64]= a->block;
- int linesize= a->picture.linesize[0];
+static inline void dct_get(ASV1Context *a, const AVFrame *frame,
+ int mb_x, int mb_y)
+{
+ int16_t (*block)[64]= a->block;
+ 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);
@@ -164,8 +166,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]);
 }
@@ -175,7 +177,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;
 
@@ -188,13 +189,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);
 }
 }
@@ -202,7 +199,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);
 }
 }
@@ -210,7 +207,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);
 }
 }
@@ -242,6 +239,12 @@
 int i;
 const int scale= avctx->codec_id == AV_CODEC_ID_ASV1 ? 1 : 2;
 
+ 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_asv_common_init(avctx);
 
 if(avctx->global_quality == 0) avctx->global_quality= 4*FF_QUALITY_SCALE;
@@ -260,31 +263,39 @@
 
 return 0;
 }
+static av_cold int asv_encode_close(AVCodecContext *avctx)
+{
+ av_frame_free(&avctx->coded_frame);
+
+ return 0;
+}
 
 #if CONFIG_ASV1_ENCODER
 AVCodec ff_asv1_encoder = {
 .name = "asv1",
+ .long_name = NULL_IF_CONFIG_SMALL("ASUS V1"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_ASV1,
 .priv_data_size = sizeof(ASV1Context),
 .init = encode_init,
 .encode2 = encode_frame,
+ .close = asv_encode_close,
 .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P,
 AV_PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("ASUS V1"),
 };
 #endif
 
 #if CONFIG_ASV2_ENCODER
 AVCodec ff_asv2_encoder = {
 .name = "asv2",
+ .long_name = NULL_IF_CONFIG_SMALL("ASUS V2"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_ASV2,
 .priv_data_size = sizeof(ASV1Context),
 .init = encode_init,
 .encode2 = encode_frame,
+ .close = asv_encode_close,
 .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P,
 AV_PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("ASUS V2"),
 };
 #endif

libav-v9.6.tar.bz2/libavcodec/atrac.c -> libav-v10.1.tar.bz2/libavcodec/atrac.c Changed

@@ -1,6 +1,7 @@
 /*
- * Atrac common functions
- * Copyright (c) 2006-2008 Maxim Poliakovski
+ * common functions for the ATRAC family of decoders
+ *
+ * Copyright (c) 2006-2013 Maxim Poliakovski
 * Copyright (c) 2006-2008 Benjamin Larsson
 *
 * This file is part of Libav.
@@ -30,7 +31,6 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "atrac.h"
 
 float ff_atrac_sf_table[64];
@@ -45,11 +45,7 @@
 -0.043596379, -0.099384367, 0.13207909, 0.46424159
 };
 
-/**
- * Generate common tables
- */
-
-void ff_atrac_generate_tables(void)
+av_cold void ff_atrac_generate_tables(void)
 {
 int i;
 float s;
@@ -67,18 +63,66 @@
 }
 }
 
+av_cold void ff_atrac_init_gain_compensation(AtracGCContext *gctx, int id2exp_offset,
+ int loc_scale)
+{
+ int i;
 
-/**
- * Quadrature mirror synthesis filter.
- *
- * @param inlo lower part of spectrum
- * @param inhi higher part of spectrum
- * @param nIn size of spectrum buffer
- * @param pOut out buffer
- * @param delayBuf delayBuf buffer
- * @param temp temp buffer
- */
+ gctx->loc_scale = loc_scale;
+ gctx->loc_size = 1 << loc_scale;
+ gctx->id2exp_offset = id2exp_offset;
 
+ /* Generate gain level table. */
+ for (i = 0; i < 16; i++)
+ gctx->gain_tab1[i] = powf(2.0, id2exp_offset - i);
+
+ /* Generate gain interpolation table. */
+ for (i = -15; i < 16; i++)
+ gctx->gain_tab2[i + 15] = powf(2.0, -1.0f / gctx->loc_size * i);
+}
+
+void ff_atrac_gain_compensation(AtracGCContext *gctx, float *in, float *prev,
+ AtracGainInfo *gc_now, AtracGainInfo *gc_next,
+ int num_samples, float *out)
+{
+ float lev, gc_scale, gain_inc;
+ int i, pos, lastpos;
+
+ gc_scale = gc_next->num_points ? gctx->gain_tab1[gc_next->lev_code[0]]
+ : 1.0f;
+
+ if (!gc_now->num_points) {
+ for (pos = 0; pos < num_samples; pos++)
+ out[pos] = in[pos] * gc_scale + prev[pos];
+ } else {
+ pos = 0;
+
+ for (i = 0; i < gc_now->num_points; i++) {
+ lastpos = gc_now->loc_code[i] << gctx->loc_scale;
+
+ lev = gctx->gain_tab1[gc_now->lev_code[i]];
+ gain_inc = gctx->gain_tab2[(i + 1 < gc_now->num_points ? gc_now->lev_code[i + 1]
+ : gctx->id2exp_offset) -
+ gc_now->lev_code[i] + 15];
+
+ /* apply constant gain level and overlap */
+ for (; pos < lastpos; pos++)
+ out[pos] = (in[pos] * gc_scale + prev[pos]) * lev;
+
+ /* interpolate between two different gain levels */
+ for (; pos < lastpos + gctx->loc_size; pos++) {
+ out[pos] = (in[pos] * gc_scale + prev[pos]) * lev;
+ lev *= gain_inc;
+ }
+ }
+
+ for (; pos < num_samples; pos++)
+ out[pos] = in[pos] * gc_scale + prev[pos];
+ }
+
+ /* copy the overlapping part into the delay buffer */
+ memcpy(prev, &in[num_samples], num_samples * sizeof(float));
+}
 
 void ff_atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp)
 {

libav-v9.6.tar.bz2/libavcodec/atrac.h -> libav-v10.1.tar.bz2/libavcodec/atrac.h Changed

@@ -1,6 +1,7 @@
 /*
- * Atrac common data
- * Copyright (c) 2009 Maxim Poliakovski
+ * common functions for the ATRAC family of decoders
+ *
+ * Copyright (c) 2009-2013 Maxim Poliakovski
 * Copyright (c) 2009 Benjamin Larsson
 *
 * This file is part of Libav.
@@ -22,15 +23,74 @@
 
 /**
 * @file
- * Atrac common header
+ * ATRAC common header
 */
 
 #ifndef AVCODEC_ATRAC_H
 #define AVCODEC_ATRAC_H
 
+/**
+ * Gain control parameters for one subband.
+ */
+typedef struct AtracGainInfo {
+ int num_points; ///< number of gain control points
+ int lev_code[7]; ///< level at corresponding control point
+ int loc_code[7]; ///< location of gain control points
+} AtracGainInfo;
+
+/**
+ * Gain compensation context structure.
+ */
+typedef struct AtracGCContext {
+ float gain_tab1[16]; ///< gain compensation level table
+ float gain_tab2[31]; ///< gain compensation interpolation table
+ int id2exp_offset; ///< offset for converting level index into level exponent
+ int loc_scale; ///< scale of location code = 2^loc_scale samples
+ int loc_size; ///< size of location code in samples
+} AtracGCContext;
+
 extern float ff_atrac_sf_table[64];
 
+/**
+ * Generate common tables.
+ */
 void ff_atrac_generate_tables(void);
+
+/**
+ * Initialize gain compensation context.
+ *
+ * @param gctx pointer to gain compensation context to initialize
+ * @param id2exp_offset offset for converting level index into level exponent
+ * @param loc_scale location size factor
+ */
+void ff_atrac_init_gain_compensation(AtracGCContext *gctx, int id2exp_offset,
+ int loc_scale);
+
+/**
+ * Apply gain compensation and perform the MDCT overlapping part.
+ *
+ * @param gctx pointer to gain compensation context
+ * @param in input buffer
+ * @param prev previous buffer to perform overlap against
+ * @param gc_now gain control information for current frame
+ * @param gc_next gain control information for next frame
+ * @param num_samples number of samples to process
+ * @param out output data goes here
+ */
+void ff_atrac_gain_compensation(AtracGCContext *gctx, float *in, float *prev,
+ AtracGainInfo *gc_now, AtracGainInfo *gc_next,
+ int num_samples, float *out);
+
+/**
+ * Quadrature mirror synthesis filter.
+ *
+ * @param inlo lower part of spectrum
+ * @param inhi higher part of spectrum
+ * @param nIn size of spectrum buffer
+ * @param pOut out buffer
+ * @param delayBuf delayBuf buffer
+ * @param temp temp buffer
+ */
 void ff_atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp);
 
 #endif /* AVCODEC_ATRAC_H */

libav-v9.6.tar.bz2/libavcodec/atrac1.c -> libav-v10.1.tar.bz2/libavcodec/atrac1.c Changed

@@ -1,5 +1,5 @@
 /*
- * Atrac 1 compatible decoder
+ * ATRAC1 compatible decoder
 * Copyright (c) 2009 Maxim Poliakovski
 * Copyright (c) 2009 Benjamin Larsson
 *
@@ -22,7 +22,7 @@
 
 /**
 * @file
- * Atrac 1 compatible decoder.
+ * ATRAC1 compatible decoder.
 * This decoder handles raw ATRAC1 data and probably SDDS data.
 */
 
@@ -32,9 +32,9 @@
 #include <stddef.h>
 #include <stdio.h>
 
+#include "libavutil/float_dsp.h"
 #include "avcodec.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "fft.h"
 #include "internal.h"
 #include "sinewin.h"
@@ -72,7 +72,6 @@
 * The atrac1 context, holds all needed parameters for decoding
 */
 typedef struct {
- AVFrame frame;
 AT1SUCtx SUs[AT1_MAX_CHANNELS]; ///< channel sound unit
 DECLARE_ALIGNED(32, float, spec)[AT1_SU_SAMPLES]; ///< the mdct spectrum buffer
 
@@ -81,7 +80,7 @@
 DECLARE_ALIGNED(32, float, high)[512];
 float* bands[3];
 FFTContext mdct_ctx[3];
- DSPContext dsp;
+ AVFloatDSPContext fdsp;
 } AT1Ctx;
 
 /** size of the transform in samples in the long mode for each QMF band */
@@ -141,8 +140,8 @@
 at1_imdct(q, &q->spec[pos], &su->spectrum[0][ref_pos + start_pos], nbits, band_num);
 
 /* overlap and window */
- q->dsp.vector_fmul_window(&q->bands[band_num][start_pos], prev_buf,
- &su->spectrum[0][ref_pos + start_pos], ff_sine_32, 16);
+ q->fdsp.vector_fmul_window(&q->bands[band_num][start_pos], prev_buf,
+ &su->spectrum[0][ref_pos + start_pos], ff_sine_32, 16);
 
 prev_buf = &su->spectrum[0][ref_pos+start_pos + 16];
 start_pos += block_size;
@@ -273,6 +272,7 @@
 static int atrac1_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 AT1Ctx *q = avctx->priv_data;
@@ -286,8 +286,8 @@
 }
 
 /* get output buffer */
- q->frame.nb_samples = AT1_SU_SAMPLES;
- if ((ret = ff_get_buffer(avctx, &q->frame)) < 0) {
+ frame->nb_samples = AT1_SU_SAMPLES;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -309,11 +309,10 @@
 ret = at1_imdct_block(su, q);
 if (ret < 0)
 return ret;
- at1_subband_synthesis(q, su, (float *)q->frame.extended_data[ch]);
+ at1_subband_synthesis(q, su, (float *)frame->extended_data[ch]);
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = q->frame;
+ *got_frame_ptr = 1;
 
 return avctx->block_align;
 }
@@ -357,7 +356,7 @@
 
 ff_atrac_generate_tables();
 
- ff_dsputil_init(&q->dsp, avctx);
+ avpriv_float_dsp_init(&q->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
 
 q->bands[0] = q->low;
 q->bands[1] = q->mid;
@@ -369,15 +368,13 @@
 q->SUs[1].spectrum[0] = q->SUs[1].spec1;
 q->SUs[1].spectrum[1] = q->SUs[1].spec2;
 
- avcodec_get_frame_defaults(&q->frame);
- avctx->coded_frame = &q->frame;
-
 return 0;
 }
 
 
 AVCodec ff_atrac1_decoder = {
 .name = "atrac1",
+ .long_name = NULL_IF_CONFIG_SMALL("ATRAC1 (Adaptive TRansform Acoustic Coding)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_ATRAC1,
 .priv_data_size = sizeof(AT1Ctx),
@@ -385,7 +382,6 @@
 .close = atrac1_decode_end,
 .decode = atrac1_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Atrac 1 (Adaptive TRansform Acoustic Coding)"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/atrac1data.h -> libav-v10.1.tar.bz2/libavcodec/atrac1data.h Changed

libav-v9.6.tar.bz2/libavcodec/atrac3.c -> libav-v10.1.tar.bz2/libavcodec/atrac3.c Changed

@@ -1,5 +1,5 @@
 /*
- * Atrac 3 compatible decoder
+ * ATRAC3 compatible decoder
 * Copyright (c) 2006-2008 Maxim Poliakovski
 * Copyright (c) 2006-2008 Benjamin Larsson
 *
@@ -22,10 +22,10 @@
 
 /**
 * @file
- * Atrac 3 compatible decoder.
+ * ATRAC3 compatible decoder.
 * This decoder handles Sony's ATRAC3 data.
 *
- * Container formats used to store atrac 3 data:
+ * Container formats used to store ATRAC3 data:
 * RealMedia (.rm), RIFF WAV (.wav, .at3), Sony OpenMG (.oma, .aa3).
 *
 * To use this decoder, a calling application must supply the extradata
@@ -36,6 +36,7 @@
 #include <stddef.h>
 #include <stdio.h>
 
+#include "libavutil/attributes.h"
 #include "libavutil/float_dsp.h"
 #include "avcodec.h"
 #include "bytestream.h"
@@ -53,14 +54,8 @@
 #define SAMPLES_PER_FRAME 1024
 #define MDCT_SIZE 512
 
-typedef struct GainInfo {
- int num_gain_data;
- int lev_code[8];
- int loc_code[8];
-} GainInfo;
-
 typedef struct GainBlock {
- GainInfo g_block[4];
+ AtracGainInfo g_block[4];
 } GainBlock;
 
 typedef struct TonalComponent {
@@ -86,7 +81,6 @@
 } ChannelUnit;
 
 typedef struct ATRAC3Context {
- AVFrame frame;
 GetBitContext gb;
 //@{
 /** stream data */
@@ -111,6 +105,7 @@
 int scrambled_stream;
 //@}
 
+ AtracGCContext gainc_ctx;
 FFTContext mdct_ctx;
 FmtConvertContext fmt_conv;
 AVFloatDSPContext fdsp;
@@ -119,11 +114,8 @@
 static DECLARE_ALIGNED(32, float, mdct_window)[MDCT_SIZE];
 static VLC_TYPE atrac3_vlc_table[4096][2];
 static VLC spectral_coeff_tab[7];
-static float gain_tab1[16];
-static float gain_tab2[31];
-
 
-/*
+/**
 * Regular 512 points IMDCT without overlapping, with the exception of the
 * swapping of odd bands caused by the reverse spectra of the QMF.
 *
@@ -173,12 +165,12 @@
 output[i] = c ^ buf[i];
 
 if (off)
- av_log_ask_for_sample(NULL, "Offset of %d not handled.\n", off);
+ avpriv_request_sample(NULL, "Offset of %d", off);
 
 return off;
 }
 
-static av_cold void init_atrac3_window(void)
+static av_cold void init_imdct_window(void)
 {
 int i, j;
 
@@ -205,7 +197,7 @@
 return 0;
 }
 
-/*
+/**
 * Mantissa decoding
 *
 * @param selector which table the output values are coded with
@@ -267,7 +259,7 @@
 }
 }
 
-/*
+/**
 * Restore the quantized band spectrum coefficients
 *
 * @return subband count, fix for broken specification/files
@@ -324,7 +316,7 @@
 return num_subbands;
 }
 
-/*
+/**
 * Restore the quantized tonal components
 *
 * @param components tonal components
@@ -408,7 +400,7 @@
 return component_count;
 }
 
-/*
+/**
 * Decode gain parameters for the coded bands
 *
 * @param block the gainblock for the current band
@@ -417,90 +409,32 @@
 static int decode_gain_control(GetBitContext *gb, GainBlock *block,
 int num_bands)
 {
- int i, cf, num_data;
+ int i, j;
 int *level, *loc;
 
- GainInfo *gain = block->g_block;
+ AtracGainInfo *gain = block->g_block;
 
 for (i = 0; i <= num_bands; i++) {
- num_data = get_bits(gb, 3);
- gain[i].num_gain_data = num_data;
+ gain[i].num_points = get_bits(gb, 3);
 level = gain[i].lev_code;
 loc = gain[i].loc_code;
 
- for (cf = 0; cf < gain[i].num_gain_data; cf++) {
- level[cf] = get_bits(gb, 4);
- loc [cf] = get_bits(gb, 5);
- if (cf && loc[cf] <= loc[cf - 1])
+ for (j = 0; j < gain[i].num_points; j++) {
+ level[j] = get_bits(gb, 4);
+ loc[j] = get_bits(gb, 5);
+ if (j && loc[j] <= loc[j - 1])
 return AVERROR_INVALIDDATA;
 }
 }
 
 /* Clear the unused blocks. */
 for (; i < 4 ; i++)
- gain[i].num_gain_data = 0;
+ gain[i].num_points = 0;
 
 return 0;
 }
 
-/*
- * Apply gain parameters and perform the MDCT overlapping part
- *
- * @param input input buffer
- * @param prev previous buffer to perform overlap against
- * @param output output buffer
- * @param gain1 current band gain info
- * @param gain2 next band gain info
- */
-static void gain_compensate_and_overlap(float *input, float *prev,
- float *output, GainInfo *gain1,
- GainInfo *gain2)
-{
- float g1, g2, gain_inc;
- int i, j, num_data, start_loc, end_loc;
-
-
- if (gain2->num_gain_data == 0)
- g1 = 1.0;
- else
- g1 = gain_tab1[gain2->lev_code[0]];
-
- if (gain1->num_gain_data == 0) {
- for (i = 0; i < 256; i++)
- output[i] = input[i] * g1 + prev[i];
- } else {
- num_data = gain1->num_gain_data;
- gain1->loc_code[num_data] = 32;
- gain1->lev_code[num_data] = 4;
-
- for (i = 0, j = 0; i < num_data; i++) {
- start_loc = gain1->loc_code[i] * 8;
- end_loc = start_loc + 8;
-
- g2 = gain_tab1[gain1->lev_code[i]];
- gain_inc = gain_tab2[gain1->lev_code[i + 1] -
- gain1->lev_code[i ] + 15];
-
- /* interpolate */
- for (; j < start_loc; j++)
- output[j] = (input[j] * g1 + prev[j]) * g2;
-
- /* interpolation is done over eight samples */
- for (; j < end_loc; j++) {
- output[j] = (input[j] * g1 + prev[j]) * g2;
- g2 *= gain_inc;
- }
- }
-
- for (; j < 256; j++)
- output[j] = input[j] * g1 + prev[j];
- }
-
- /* Delay for the overlapping part. */
- memcpy(prev, &input[256], 256 * sizeof(*prev));
-}
-
-/*
+/**
 * Combine the tonal band spectrum and regular band spectrum
 *
 * @param spectrum output spectrum buffer
@@ -627,7 +561,7 @@
 }
 }
 
-/*
+/**
 * Decode a Sound Unit
 *
 * @param snd the channel unit to be used
@@ -664,8 +598,8 @@
 
 snd->num_components = decode_tonal_components(gb, snd->components,
 snd->bands_coded);
- if (snd->num_components == -1)
- return -1;
+ if (snd->num_components < 0)
+ return snd->num_components;
 
 num_subbands = decode_spectrum(gb, snd->spectrum);
 
@@ -690,11 +624,10 @@
 memset(snd->imdct_buf, 0, 512 * sizeof(*snd->imdct_buf));
 
 /* gain compensation and overlapping */
- gain_compensate_and_overlap(snd->imdct_buf,
- &snd->prev_frame[band * 256],
- &output[band * 256],
- &gain1->g_block[band],
- &gain2->g_block[band]);
+ ff_atrac_gain_compensation(&q->gainc_ctx, snd->imdct_buf,
+ &snd->prev_frame[band * 256],
+ &gain1->g_block[band], &gain2->g_block[band],
+ 256, &output[band * 256]);
 }
 
 /* Swap the gain control buffers for the next frame. */
@@ -742,7 +675,7 @@
 
 
 /* set the bitstream reader at the start of the second Sound Unit*/
- init_get_bits(&q->gb, ptr1, avctx->block_align * 8);
+ init_get_bits(&q->gb, ptr1, (avctx->block_align - i) * 8);
 
 /* Fill the Weighting coeffs delay buffer */
 memmove(q->weighting_delay, &q->weighting_delay[2],
@@ -801,6 +734,7 @@
 static int atrac3_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 ATRAC3Context *q = avctx->priv_data;
@@ -814,8 +748,8 @@
 }
 
 /* get output buffer */
- q->frame.nb_samples = SAMPLES_PER_FRAME;
- if ((ret = ff_get_buffer(avctx, &q->frame)) < 0) {
+ frame->nb_samples = SAMPLES_PER_FRAME;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -828,23 +762,22 @@
 databuf = buf;
 }
 
- ret = decode_frame(avctx, databuf, (float **)q->frame.extended_data);
+ ret = decode_frame(avctx, databuf, (float **)frame->extended_data);
 if (ret) {
 av_log(NULL, AV_LOG_ERROR, "Frame decoding error!\n");
 return ret;
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = q->frame;
+ *got_frame_ptr = 1;
 
 return avctx->block_align;
 }
 
-static void atrac3_init_static_data(AVCodec *codec)
+static av_cold void atrac3_init_static_data(AVCodec *codec)
 {
 int i;
 
- init_atrac3_window();
+ init_imdct_window();
 ff_atrac_generate_tables();
 
 /* Initialize the VLC tables. */
@@ -856,13 +789,6 @@
 huff_bits[i], 1, 1,
 huff_codes[i], 1, 1, INIT_VLC_USE_NEW_STATIC);
 }
-
- /* Generate gain tables */
- for (i = 0; i < 16; i++)
- gain_tab1[i] = powf(2.0, (4 - i));
-
- for (i = -15; i < 16; i++)
- gain_tab2[i + 15] = powf(2.0, i * -0.125);
 }
 
 static av_cold int atrac3_decode_init(AVCodecContext *avctx)
@@ -941,9 +867,11 @@
 
 if (q->coding_mode == STEREO)
 av_log(avctx, AV_LOG_DEBUG, "Normal stereo detected.\n");
- else if (q->coding_mode == JOINT_STEREO)
+ else if (q->coding_mode == JOINT_STEREO) {
+ if (avctx->channels != 2)
+ return AVERROR_INVALIDDATA;
 av_log(avctx, AV_LOG_DEBUG, "Joint stereo detected.\n");
- else {
+ } else {
 av_log(avctx, AV_LOG_ERROR, "Unknown channel coding mode %x!\n",
 q->coding_mode);
 return AVERROR_INVALIDDATA;
@@ -980,6 +908,7 @@
 q->matrix_coeff_index_next[i] = 3;
 }
 
+ ff_atrac_init_gain_compensation(&q->gainc_ctx, 4, 3);
 avpriv_float_dsp_init(&q->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
 ff_fmt_convert_init(&q->fmt_conv, avctx);
 
@@ -989,14 +918,12 @@
 return AVERROR(ENOMEM);
 }
 
- avcodec_get_frame_defaults(&q->frame);
- avctx->coded_frame = &q->frame;
-
 return 0;
 }
 
 AVCodec ff_atrac3_decoder = {
 .name = "atrac3",
+ .long_name = NULL_IF_CONFIG_SMALL("ATRAC3 (Adaptive TRansform Acoustic Coding 3)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_ATRAC3,
 .priv_data_size = sizeof(ATRAC3Context),
@@ -1005,7 +932,6 @@
 .close = atrac3_decode_close,
 .decode = atrac3_decode_frame,
 .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Atrac 3 (Adaptive TRansform Acoustic Coding 3)"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/atrac3data.h -> libav-v10.1.tar.bz2/libavcodec/atrac3data.h Changed

libav-v10.1.tar.bz2/libavcodec/atrac3plus.c Added

@@ -0,0 +1,1818 @@
+/*
+ * ATRAC3+ compatible decoder
+ *
+ * Copyright (c) 2010-2013 Maxim Poliakovski
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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(AVCodec *codec)
+{
+ 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;
+}

libav-v10.1.tar.bz2/libavcodec/atrac3plus.h Added

@@ -0,0 +1,242 @@
+/*
+ * ATRAC3+ compatible decoder
+ *
+ * Copyright (c) 2010-2013 Maxim Poliakovski
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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.
+ *
+ * @param[in] codec ptr to the AVCodec
+ */
+void ff_atrac3p_init_vlcs(AVCodec *codec);
+
+/**
+ * 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 */

libav-v10.1.tar.bz2/libavcodec/atrac3plus_data.h Added

@@ -0,0 +1,1914 @@
+/*
+ * ATRAC3+ compatible decoder
+ *
+ * Copyright (c) 2010-2013 Maxim Poliakovski
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 */

libav-v10.1.tar.bz2/libavcodec/atrac3plusdec.c Added

@@ -0,0 +1,395 @@
+/*
+ * ATRAC3+ compatible decoder
+ *
+ * Copyright (c) 2010-2013 Maxim Poliakovski
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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);
+ }
+
+ 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,
+ .init_static_data = ff_atrac3p_init_vlcs,
+ .close = atrac3p_decode_close,
+ .decode = atrac3p_decode_frame,
+};

libav-v10.1.tar.bz2/libavcodec/atrac3plusdsp.c Added

@@ -0,0 +1,638 @@
+/*
+ * ATRAC3+ compatible decoder
+ *
+ * Copyright (c) 2010-2013 Maxim Poliakovski
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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;
+ }
+}

libav-v9.6.tar.bz2/libavcodec/audio_frame_queue.c -> libav-v10.1.tar.bz2/libavcodec/audio_frame_queue.c Changed

libav-v9.6.tar.bz2/libavcodec/aura.c -> libav-v10.1.tar.bz2/libavcodec/aura.c Changed

@@ -27,19 +27,11 @@
 #include "internal.h"
 #include "libavutil/internal.h"
 
-typedef struct AuraDecodeContext {
- AVCodecContext *avctx;
- AVFrame frame;
-} AuraDecodeContext;
-
 static av_cold int aura_decode_init(AVCodecContext *avctx)
 {
- AuraDecodeContext *s = avctx->priv_data;
-
- s->avctx = avctx;
 /* width needs to be divisible by 4 for this codec to work */
 if (avctx->width & 0x3)
- return -1;
+ return AVERROR(EINVAL);
 avctx->pix_fmt = AV_PIX_FMT_YUV422P;
 
 return 0;
@@ -49,10 +41,10 @@
 void *data, int *got_frame,
 AVPacket *pkt)
 {
- AuraDecodeContext *s = avctx->priv_data;
+ AVFrame *frame = data;
 uint8_t *Y, *U, *V;
 uint8_t val;
- int x, y;
+ int x, y, ret;
 const uint8_t *buf = pkt->data;
 
 /* prediction error tables (make it clear that they are signed values) */
@@ -61,25 +53,20 @@
 if (pkt->size != 48 + avctx->height * avctx->width) {
 av_log(avctx, AV_LOG_ERROR, "got a buffer with %d bytes when %d were expected\n",
 pkt->size, 48 + avctx->height * avctx->width);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 /* pixel data starts 48 bytes in, after 3x16-byte tables */
 buf += 48;
 
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
-
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID;
- s->frame.reference = 0;
- if (ff_get_buffer(avctx, &s->frame) < 0) {
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
- Y = s->frame.data[0];
- U = s->frame.data[1];
- V = s->frame.data[2];
+ Y = frame->data[0];
+ U = frame->data[1];
+ V = frame->data[2];
 
 /* iterate through each line in the height */
 for (y = 0; y < avctx->height; y++) {
@@ -102,35 +89,22 @@
 Y[1] = Y[ 0] + delta_table[val & 0xF];
 Y += 2; U++; V++;
 }
- Y += s->frame.linesize[0] - avctx->width;
- U += s->frame.linesize[1] - (avctx->width >> 1);
- V += s->frame.linesize[2] - (avctx->width >> 1);
+ Y += frame->linesize[0] - avctx->width;
+ U += frame->linesize[1] - (avctx->width >> 1);
+ V += frame->linesize[2] - (avctx->width >> 1);
 }
 
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
 return pkt->size;
 }
 
-static av_cold int aura_decode_end(AVCodecContext *avctx)
-{
- AuraDecodeContext *s = avctx->priv_data;
-
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
-
- return 0;
-}
-
 AVCodec ff_aura2_decoder = {
 .name = "aura2",
+ .long_name = NULL_IF_CONFIG_SMALL("Auravision Aura 2"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_AURA2,
- .priv_data_size = sizeof(AuraDecodeContext),
 .init = aura_decode_init,
- .close = aura_decode_end,
 .decode = aura_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Auravision Aura 2"),
 };

libav-v9.6.tar.bz2/libavcodec/avcodec.h -> libav-v10.1.tar.bz2/libavcodec/avcodec.h Changed

@@ -23,19 +23,29 @@
 
 /**
 * @file
- * external API header
+ * @ingroup libavc
+ * Libavcodec external API header
 */
 
 #include <errno.h>
 #include "libavutil/samplefmt.h"
+#include "libavutil/attributes.h"
 #include "libavutil/avutil.h"
+#include "libavutil/buffer.h"
 #include "libavutil/cpu.h"
 #include "libavutil/dict.h"
+#include "libavutil/frame.h"
 #include "libavutil/log.h"
 #include "libavutil/pixfmt.h"
 #include "libavutil/rational.h"
 
-#include "libavcodec/version.h"
+#include "version.h"
+
+#if FF_API_FAST_MALLOC
+// to provide fast_*alloc
+#include "libavutil/mem.h"
+#endif
+
 /**
 * @defgroup libavc Encoding/Decoding Library
 * @{
@@ -98,7 +108,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,
@@ -152,7 +164,6 @@
 AV_CODEC_ID_MSZH,
 AV_CODEC_ID_ZLIB,
 AV_CODEC_ID_QTRLE,
- AV_CODEC_ID_SNOW,
 AV_CODEC_ID_TSCC,
 AV_CODEC_ID_ULTI,
 AV_CODEC_ID_QDRAW,
@@ -265,6 +276,14 @@
 AV_CODEC_ID_MTS2,
 AV_CODEC_ID_CLLC,
 AV_CODEC_ID_MSS2,
+ AV_CODEC_ID_VP9,
+ AV_CODEC_ID_AIC,
+ AV_CODEC_ID_ESCAPE130,
+ AV_CODEC_ID_G2M,
+ AV_CODEC_ID_WEBP,
+ AV_CODEC_ID_HNM4_VIDEO,
+ AV_CODEC_ID_HEVC,
+ AV_CODEC_ID_FIC,
 
 /* various PCM "codecs" */
 AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
@@ -296,6 +315,8 @@
 AV_CODEC_ID_PCM_LXF,
 AV_CODEC_ID_S302M,
 AV_CODEC_ID_PCM_S8_PLANAR,
+ AV_CODEC_ID_PCM_S24LE_PLANAR,
+ AV_CODEC_ID_PCM_S32LE_PLANAR,
 
 /* various ADPCM codecs */
 AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
@@ -376,7 +397,9 @@
 AV_CODEC_ID_MLP,
 AV_CODEC_ID_GSM_MS, /* as found in WAV */
 AV_CODEC_ID_ATRAC3,
+#if FF_API_VOXWARE
 AV_CODEC_ID_VOXWARE,
+#endif
 AV_CODEC_ID_APE,
 AV_CODEC_ID_NELLYMOSER,
 AV_CODEC_ID_MUSEPACK8,
@@ -408,6 +431,7 @@
 AV_CODEC_ID_OPUS,
 AV_CODEC_ID_COMFORT_NOISE,
 AV_CODEC_ID_TAK,
+ AV_CODEC_ID_METASOUND,
 
 /* subtitle codecs */
 AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
@@ -432,16 +456,8 @@
 AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
 * stream (only used by libavformat) */
 AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information.
-
-#if FF_API_CODEC_ID
-#include "old_codec_ids.h"
-#endif
 };
 
-#if FF_API_CODEC_ID
-#define CodecID AVCodecID
-#endif
-
 /**
 * This struct describes the properties of a single codec described by an
 * AVCodecID.
@@ -482,11 +498,6 @@
 */
 #define AV_CODEC_PROP_LOSSLESS (1 << 2)
 
-#if FF_API_OLD_DECODE_AUDIO
-/* in bytes */
-#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-#endif
-
 /**
 * @ingroup lavc_decoding
 * Required number of additionally allocated bytes at the end of the input bitstream for decoding.
@@ -518,7 +529,6 @@
 ME_X1, ///< reserved for experiments
 ME_HEX, ///< hexagon based search
 ME_UMH, ///< uneven multi-hexagon search
- ME_ITER, ///< iterative search
 ME_TESA, ///< transformed exhaustive search algorithm
 };
 
@@ -544,28 +554,40 @@
 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
 };
 
 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
 };
 
 enum AVColorRange{
@@ -614,15 +636,26 @@
 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.
 Note: Not everything is supported yet.
 */
 
+/**
+ * Allow decoders to produce frames with data planes that are not aligned
+ * to CPU requirements (e.g. due to cropping).
+ */
+#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>.
@@ -635,7 +668,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. */
@@ -652,12 +691,8 @@
 #define CODEC_FLAG2_FAST 0x00000001 ///< Allow non spec compliant speedup tricks.
 #define CODEC_FLAG2_NO_OUTPUT 0x00000004 ///< Skip bitstream encoding.
 #define CODEC_FLAG2_LOCAL_HEADER 0x00000008 ///< Place global headers at every keyframe instead of in extradata.
-#if FF_API_MPV_GLOBAL_OPTS
-#define CODEC_FLAG_CBP_RD 0x04000000 ///< Use rate distortion optimization for cbp.
-#define CODEC_FLAG_QP_RD 0x08000000 ///< Use rate distortion optimization for qp selectioon.
-#define CODEC_FLAG2_STRICT_GOP 0x00000002 ///< Strictly enforce GOP size.
-#define CODEC_FLAG2_SKIP_RD 0x00004000 ///< RD optimal MB level residual skipping
-#endif
+#define CODEC_FLAG2_IGNORE_CROP 0x00010000 ///< Discard cropping information from SPS.
+
 #define CODEC_FLAG2_CHUNKS 0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
 
 /* Unsupported options :
@@ -675,8 +710,10 @@
 */
 #define CODEC_CAP_DR1 0x0002
 #define CODEC_CAP_TRUNCATED 0x0008
+#if FF_API_XVMC
 /* Codec can export data for HW decoding (XvMC). */
 #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.
@@ -706,10 +743,12 @@
 * This can be used to prevent truncation of the last audio samples.
 */
 #define CODEC_CAP_SMALL_LAST_FRAME 0x0040
+#if FF_API_CAP_VDPAU
 /**
 * Codec can export data for HW decoding (VDPAU).
 */
 #define CODEC_CAP_HWACCEL_VDPAU 0x0080
+#endif
 /**
 * Codec can output multiple frames per AVPacket
 * Normally demuxers return one frame at a time, demuxers which do not do
@@ -731,10 +770,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.
 */
@@ -756,6 +797,7 @@
 */
 #define CODEC_CAP_VARIABLE_FRAME_SIZE 0x10000
 
+#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
@@ -779,6 +821,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.
@@ -809,11 +852,14 @@
 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
 #define FF_BUFFER_TYPE_USER 2 ///< direct rendering buffers (image is (de)allocated by user)
 #define FF_BUFFER_TYPE_SHARED 4 ///< Buffer from somewhere else; don't deallocate image (data/base), all other tables are not shared.
@@ -823,6 +869,12 @@
 #define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer.
 #define FF_BUFFER_HINTS_PRESERVE 0x04 // User must not alter buffer content.
 #define FF_BUFFER_HINTS_REUSABLE 0x08 // Codec will reuse the buffer (update).
+#endif
+
+/**
+ * The decoder will keep a reference to the frame and may reuse it later.
+ */
+#define AV_GET_BUFFER_FLAG_REF (1 << 0)
 
 /**
 * @defgroup lavc_packet AVPacket
@@ -885,18 +937,24 @@
 * ABI. Thus it may be allocated on stack and no new fields can be added to it
 * without libavcodec and libavformat major bump.
 *
- * The semantics of data ownership depends on the destruct field.
- * If it is set, the packet data is dynamically allocated and is valid
- * indefinitely until av_free_packet() is called (which in turn calls the
- * destruct callback to free the data). If destruct is not set, the packet data
- * is typically backed by some static buffer somewhere and is only valid for a
- * limited time (e.g. until the next read call when demuxing).
+ * The semantics of data ownership depends on the buf or destruct (deprecated)
+ * fields. If either is set, the packet data is dynamically allocated and is
+ * valid indefinitely until av_free_packet() is called (which in turn calls
+ * av_buffer_unref()/the destruct callback to free the data). If neither is set,
+ * the packet data is typically backed by some static buffer somewhere and is
+ * only valid for a limited time (e.g. until the next read call when demuxing).
 *
 * The side data is always allocated with av_malloc() and is freed in
 * av_free_packet().
 */
 typedef struct AVPacket {
 /**
+ * A reference to the reference-counted buffer where the packet data is
+ * stored.
+ * May be NULL, then the packet data is not reference-counted.
+ */
+ AVBufferRef *buf;
+ /**
 * Presentation timestamp in AVStream->time_base units; the time at which
 * the decompressed packet will be presented to the user.
 * Can be AV_NOPTS_VALUE if it is not stored in the file.
@@ -935,8 +993,12 @@
 * Equals next_pts - this_pts in presentation order.
 */
 int duration;
+#if FF_API_DESTRUCT_PACKET
+ attribute_deprecated
 void (*destruct)(struct AVPacket *);
+ attribute_deprecated
 void *priv;
+#endif
 int64_t pos; ///< byte position in stream, -1 if unknown
 
 /**
@@ -971,353 +1033,6 @@
 * @}
 */
 
-/**
- * This structure describes decoded (raw) audio or video data.
- *
- * AVFrame must be allocated using avcodec_alloc_frame() and freed with
- * avcodec_free_frame(). Note that this allocates only the AVFrame itself. The
- * buffers for the data must be managed through other means.
- *
- * AVFrame is typically allocated once and then reused multiple times to hold
- * different data (e.g. a single AVFrame to hold frames received from a
- * decoder). In such a case, avcodec_get_frame_defaults() should be used to
- * reset the frame to its original clean state before it is reused again.
- *
- * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added
- * to the end with a minor bump.
- */
-typedef struct AVFrame {
-#define AV_NUM_DATA_POINTERS 8
- /**
- * pointer to the picture/channel planes.
- * This might be different from the first allocated byte
- * - encoding: Set by user
- * - decoding: set by AVCodecContext.get_buffer()
- */
- uint8_t *data[AV_NUM_DATA_POINTERS];
-
- /**
- * Size, in bytes, of the data for each picture/channel plane.
- *
- * For audio, only linesize[0] may be set. For planar audio, each channel
- * plane must be the same size.
- *
- * - encoding: Set by user
- * - decoding: set by AVCodecContext.get_buffer()
- */
- int linesize[AV_NUM_DATA_POINTERS];
-
- /**
- * pointers to the data planes/channels.
- *
- * For video, this should simply point to data[].
- *
- * For planar audio, each channel has a separate data pointer, and
- * linesize[0] contains the size of each channel buffer.
- * For packed audio, there is just one data pointer, and linesize[0]
- * contains the total size of the buffer for all channels.
- *
- * Note: Both data and extended_data will always be set by get_buffer(),
- * but for planar audio with more channels that can fit in data,
- * extended_data must be used by the decoder in order to access all
- * channels.
- *
- * encoding: set by user
- * decoding: set by AVCodecContext.get_buffer()
- */
- uint8_t **extended_data;
-
- /**
- * width and height of the video frame
- * - encoding: unused
- * - decoding: Read by user.
- */
- int width, height;
-
- /**
- * number of audio samples (per channel) described by this frame
- * - encoding: Set by user
- * - decoding: Set by libavcodec
- */
- int nb_samples;
-
- /**
- * format of the frame, -1 if unknown or unset
- * Values correspond to enum AVPixelFormat for video frames,
- * enum AVSampleFormat for audio)
- * - encoding: unused
- * - decoding: Read by user.
- */
- int format;
-
- /**
- * 1 -> keyframe, 0-> not
- * - encoding: Set by libavcodec.
- * - decoding: Set by libavcodec.
- */
- int key_frame;
-
- /**
- * Picture type of the frame, see ?_TYPE below.
- * - encoding: Set by libavcodec. for coded_picture (and set by user for input).
- * - decoding: Set by libavcodec.
- */
- enum AVPictureType pict_type;
-
- /**
- * pointer to the first allocated byte of the picture. Can be used in get_buffer/release_buffer.
- * This isn't used by libavcodec unless the default get/release_buffer() is used.
- * - encoding:
- * - decoding:
- */
- uint8_t *base[AV_NUM_DATA_POINTERS];
-
- /**
- * sample aspect ratio for the video frame, 0/1 if unknown/unspecified
- * - encoding: unused
- * - decoding: Read by user.
- */
- AVRational sample_aspect_ratio;
-
- /**
- * presentation timestamp in time_base units (time when frame should be shown to user)
- * If AV_NOPTS_VALUE then frame_rate = 1/time_base will be assumed.
- * - encoding: MUST be set by user.
- * - decoding: Set by libavcodec.
- */
- int64_t pts;
-
- /**
- * pts copied from the AVPacket that was decoded to produce this frame
- * - encoding: unused
- * - decoding: Read by user.
- */
- int64_t pkt_pts;
-
- /**
- * dts copied from the AVPacket that triggered returning this frame
- * - encoding: unused
- * - decoding: Read by user.
- */
- int64_t pkt_dts;
-
- /**
- * picture number in bitstream order
- * - encoding: set by
- * - decoding: Set by libavcodec.
- */
- int coded_picture_number;
- /**
- * picture number in display order
- * - encoding: set by
- * - decoding: Set by libavcodec.
- */
- int display_picture_number;
-
- /**
- * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
- * - encoding: Set by libavcodec. for coded_picture (and set by user for input).
- * - decoding: Set by libavcodec.
- */
- int quality;
-
- /**
- * is this picture used as reference
- * The values for this are the same as the MpegEncContext.picture_structure
- * variable, that is 1->top field, 2->bottom field, 3->frame/both fields.
- * Set to 4 for delayed, non-reference frames.
- * - encoding: unused
- * - decoding: Set by libavcodec. (before get_buffer() call)).
- */
- int reference;
-
- /**
- * QP table
- * - encoding: unused
- * - decoding: Set by libavcodec.
- */
- int8_t *qscale_table;
- /**
- * QP store stride
- * - encoding: unused
- * - decoding: Set by libavcodec.
- */
- int qstride;
-
- /**
- *
- */
- int qscale_type;
-
- /**
- * mbskip_table[mb]>=1 if MB didn't change
- * stride= mb_width = (width+15)>>4
- * - encoding: unused
- * - decoding: Set by libavcodec.
- */
- uint8_t *mbskip_table;
-
- /**
- * motion vector table
- * @code
- * example:
- * int mv_sample_log2= 4 - motion_subsample_log2;
- * int mb_width= (width+15)>>4;
- * int mv_stride= (mb_width << mv_sample_log2) + 1;
- * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];
- * @endcode
- * - encoding: Set by user.
- * - decoding: Set by libavcodec.
- */
- int16_t (*motion_val[2])[2];
-
- /**
- * macroblock type table
- * mb_type_base + mb_width + 2
- * - encoding: Set by user.
- * - decoding: Set by libavcodec.
- */
- uint32_t *mb_type;
-
- /**
- * DCT coefficients
- * - encoding: unused
- * - decoding: Set by libavcodec.
- */
- short *dct_coeff;
-
- /**
- * motion reference frame index
- * the order in which these are stored can depend on the codec.
- * - encoding: Set by user.
- * - decoding: Set by libavcodec.
- */
- int8_t *ref_index[2];
-
- /**
- * for some private data of the user
- * - encoding: unused
- * - decoding: Set by user.
- */
- void *opaque;
-
- /**
- * error
- * - encoding: Set by libavcodec. if flags&CODEC_FLAG_PSNR.
- * - decoding: unused
- */
- uint64_t error[AV_NUM_DATA_POINTERS];
-
- /**
- * type of the buffer (to keep track of who has to deallocate data[*])
- * - encoding: Set by the one who allocates it.
- * - decoding: Set by the one who allocates it.
- * Note: User allocated (direct rendering) & internal buffers cannot coexist currently.
- */
- int type;
-
- /**
- * When decoding, this signals how much the picture must be delayed.
- * extra_delay = repeat_pict / (2*fps)
- * - encoding: unused
- * - decoding: Set by libavcodec.
- */
- int repeat_pict;
-
- /**
- * The content of the picture is interlaced.
- * - encoding: Set by user.
- * - decoding: Set by libavcodec. (default 0)
- */
- int interlaced_frame;
-
- /**
- * If the content is interlaced, is top field displayed first.
- * - encoding: Set by user.
- * - decoding: Set by libavcodec.
- */
- int top_field_first;
-
- /**
- * Tell user application that palette has changed from previous frame.
- * - encoding: ??? (no palette-enabled encoder yet)
- * - decoding: Set by libavcodec. (default 0).
- */
- int palette_has_changed;
-
- /**
- * codec suggestion on buffer type if != 0
- * - encoding: unused
- * - decoding: Set by libavcodec. (before get_buffer() call)).
- */
- int buffer_hints;
-
- /**
- * Pan scan.
- * - encoding: Set by user.
- * - decoding: Set by libavcodec.
- */
- AVPanScan *pan_scan;
-
- /**
- * reordered opaque 64bit (generally an integer or a double precision float
- * PTS but can be anything).
- * The user sets AVCodecContext.reordered_opaque to represent the input at
- * that time,
- * the decoder reorders values as needed and sets AVFrame.reordered_opaque
- * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque
- * @deprecated in favor of pkt_pts
- * - encoding: unused
- * - decoding: Read by user.
- */
- int64_t reordered_opaque;
-
- /**
- * hardware accelerator private data (Libav-allocated)
- * - encoding: unused
- * - decoding: Set by libavcodec
- */
- void *hwaccel_picture_private;
-
- /**
- * the AVCodecContext which ff_thread_get_buffer() was last called on
- * - encoding: Set by libavcodec.
- * - decoding: Set by libavcodec.
- */
- struct AVCodecContext *owner;
-
- /**
- * used by multithreading to store frame-specific info
- * - encoding: Set by libavcodec.
- * - decoding: Set by libavcodec.
- */
- void *thread_opaque;
-
- /**
- * log2 of the size of the block which a single vector in motion_val represents:
- * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)
- * - encoding: unused
- * - decoding: Set by libavcodec.
- */
- uint8_t motion_subsample_log2;
-
- /**
- * Sample rate of the audio data.
- *
- * - encoding: unused
- * - decoding: set by get_buffer()
- */
- int sample_rate;
-
- /**
- * Channel layout of the audio data.
- *
- * - encoding: unused
- * - decoding: set by get_buffer()
- */
- uint64_t channel_layout;
-} AVFrame;
-
 struct AVCodecInternal;
 
 enum AVFieldOrder {
@@ -1372,13 +1087,6 @@
 */
 unsigned int stream_codec_tag;
 
-#if FF_API_SUB_ID
- /**
- * @deprecated this field is unused
- */
- attribute_deprecated int sub_id;
-#endif
-
 void *priv_data;
 
 /**
@@ -1501,20 +1209,26 @@
 /**
 * picture width / height.
 * - encoding: MUST be set by user.
- * - decoding: Set by libavcodec.
- * Note: For compatibility it is possible to set this instead of
- * coded_width/height before decoding.
+ * - decoding: May be set by the user before opening the decoder if known e.g.
+ * from the container. Some decoders will require the dimensions
+ * to be set by the caller. During decoding, the decoder may
+ * overwrite those values as required.
 */
 int width, height;
 
 /**
- * Bitstream width / height, may be different from width/height.
+ * Bitstream width / height, may be different from width/height e.g. when
+ * the decoded frame is cropped before being output.
 * - encoding: unused
- * - decoding: Set by user before init if known. Codec should override / dynamically change if needed.
+ * - decoding: May be set by the user before opening the decoder if known
+ * e.g. from the container. During decoding, the decoder may
+ * overwrite those values as required.
 */
 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
@@ -1535,7 +1249,7 @@
 /**
 * Motion estimation algorithm used for video coding.
 * 1 (zero), 2 (full), 3 (log), 4 (phods), 5 (epzs), 6 (x1), 7 (hex),
- * 8 (umh), 9 (iter), 10 (tesa) [7, 8, 10 are x264 specific, 9 is snow specific]
+ * 8 (umh), 10 (tesa) [7, 8, 10 are x264 specific]
 * - encoding: MUST be set by user.
 * - decoding: unused
 */
@@ -1602,22 +1316,6 @@
 
 int b_frame_strategy;
 
-#if FF_API_MPV_GLOBAL_OPTS
- /**
- * luma single coefficient elimination threshold
- * - encoding: Set by user.
- * - decoding: unused
- */
- attribute_deprecated int luma_elim_threshold;
-
- /**
- * chroma single coeff elimination threshold
- * - encoding: Set by user.
- * - decoding: unused
- */
- attribute_deprecated int chroma_elim_threshold;
-#endif
-
 /**
 * qscale offset between IP and B-frames
 * - encoding: Set by user.
@@ -1758,8 +1456,6 @@
 #define FF_CMP_VSAD 8
 #define FF_CMP_VSSE 9
 #define FF_CMP_NSSE 10
-#define FF_CMP_W53 11
-#define FF_CMP_W97 12
 #define FF_CMP_DCTMAX 13
 #define FF_CMP_DCT264 14
 #define FF_CMP_CHROMA 256
@@ -1847,16 +1543,6 @@
 */
 int inter_quant_bias;
 
-#if FF_API_COLOR_TABLE_ID
- /**
- * color table ID
- * - encoding: unused
- * - decoding: Which clrtable should be used for 8bit RGB images.
- * Tables have to be stored somewhere. FIXME
- */
- attribute_deprecated int color_table_id;
-#endif
-
 /**
 * slice flags
 * - encoding: unused
@@ -1867,12 +1553,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 support is slated for removal.
 */
- int xvmc_acceleration;
+ attribute_deprecated int xvmc_acceleration;
+#endif /* FF_API_XVMC */
 
 /**
 * macroblock decision mode
@@ -1913,20 +1602,6 @@
 */
 int noise_reduction;
 
-#if FF_API_INTER_THRESHOLD
- /**
- * @deprecated this field is unused
- */
- attribute_deprecated int inter_threshold;
-#endif
-
-#if FF_API_MPV_GLOBAL_OPTS
- /**
- * @deprecated use mpegvideo private options instead
- */
- attribute_deprecated int quantizer_noise_shaping;
-#endif
-
 /**
 * Motion estimation threshold below which no motion estimation is
 * performed, but instead the user specified motion vectors are used.
@@ -2154,7 +1829,7 @@
 * - decoding: Set by user.
 * @deprecated Deprecated in favor of request_channel_layout.
 */
- int request_channels;
+ attribute_deprecated int request_channels;
 #endif
 
 /**
@@ -2185,6 +1860,7 @@
 */
 enum AVSampleFormat request_sample_fmt;
 
+#if FF_API_GET_BUFFER
 /**
 * Called at the beginning of each frame to get a buffer for it.
 *
@@ -2244,7 +1920,10 @@
 *
 * - encoding: unused
 * - decoding: Set by libavcodec, user can override.
+ *
+ * @deprecated use get_buffer2()
 */
+ attribute_deprecated
 int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);
 
 /**
@@ -2255,7 +1934,10 @@
 * but not by more than one thread at once, so does not need to be reentrant.
 * - encoding: unused
 * - decoding: Set by libavcodec, user can override.
+ *
+ * @deprecated custom freeing callbacks should be set from get_buffer2()
 */
+ attribute_deprecated
 void (*release_buffer)(struct AVCodecContext *c, AVFrame *pic);
 
 /**
@@ -2270,8 +1952,102 @@
 * - encoding: unused
 * - decoding: Set by libavcodec, user can override.
 */
+ attribute_deprecated
 int (*reget_buffer)(struct AVCodecContext *c, AVFrame *pic);
+#endif
+
+ /**
+ * This callback is called at the beginning of each frame to get data
+ * buffer(s) for it. There may be one contiguous buffer for all the data or
+ * there may be a buffer per each data plane or anything in between. What
+ * this means is, you may set however many entries in buf[] you feel necessary.
+ * Each buffer must be reference-counted using the AVBuffer API (see description
+ * of buf[] below).
+ *
+ * The following fields will be set in the frame before this callback is
+ * called:
+ * - format
+ * - width, height (video only)
+ * - sample_rate, channel_layout, nb_samples (audio only)
+ * Their values may differ from the corresponding values in
+ * AVCodecContext. This callback must use the frame values, not the codec
+ * context values, to calculate the required buffer size.
+ *
+ * This callback must fill the following fields in the frame:
+ * - data[]
+ * - linesize[]
+ * - extended_data:
+ * * if the data is planar audio with more than 8 channels, then this
+ * callback must allocate and fill extended_data to contain all pointers
+ * to all data planes. data[] must hold as many pointers as it can.
+ * extended_data must be allocated with av_malloc() and will be freed in
+ * av_frame_unref().
+ * * otherwise exended_data must point to data
+ * - buf[] must contain one or more pointers to AVBufferRef structures. Each of
+ * the frame's data and extended_data pointers must be contained in these. That
+ * is, one AVBufferRef for each allocated chunk of memory, not necessarily one
+ * AVBufferRef per data[] entry. See: av_buffer_create(), av_buffer_alloc(),
+ * and av_buffer_ref().
+ * - extended_buf and nb_extended_buf must be allocated with av_malloc() by
+ * this callback and filled with the extra buffers if there are more
+ * buffers than buf[] can hold. extended_buf will be freed in
+ * av_frame_unref().
+ *
+ * If CODEC_CAP_DR1 is not set then get_buffer2() must call
+ * avcodec_default_get_buffer2() instead of providing buffers allocated by
+ * some other means.
+ *
+ * Each data plane must be aligned to the maximum required by the target
+ * CPU.
+ *
+ * @see avcodec_default_get_buffer2()
+ *
+ * Video:
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * @see avcodec_align_dimensions2()
+ *
+ * Audio:
+ *
+ * Decoders request a buffer of a particular size by setting
+ * AVFrame.nb_samples prior to calling get_buffer2(). The decoder may,
+ * however, utilize only part of the buffer by setting AVFrame.nb_samples
+ * to a smaller value in the output frame.
+ *
+ * As a convenience, av_samples_get_buffer_size() and
+ * av_samples_fill_arrays() in libavutil may be used by custom get_buffer2()
+ * functions to find the required data size and to fill data pointers and
+ * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
+ * since all planes must be the same size.
+ *
+ * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec, user can override.
+ */
+ int (*get_buffer2)(struct AVCodecContext *s, AVFrame *frame, int flags);
 
+ /**
+ * If non-zero, the decoded audio and video frames returned from
+ * avcodec_decode_video2() and avcodec_decode_audio4() are reference-counted
+ * and are valid indefinitely. The caller must free them with
+ * av_frame_unref() when they are not needed anymore.
+ * Otherwise, the decoded frames must not be freed by the caller and are
+ * only valid until the next decode call.
+ *
+ * - encoding: unused
+ * - decoding: set by the caller before avcodec_open2().
+ */
+ int refcounted_frames;
 
 /* - encoding parameters */
 float qcompress; ///< amount of qscale change between easy & hard scenes (0.0-1.0)
@@ -2516,12 +2292,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
@@ -2571,7 +2351,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
@@ -2579,20 +2364,23 @@
 #define FF_DEBUG_ER 0x00000400
 #define FF_DEBUG_MMCO 0x00000800
 #define FF_DEBUG_BUGS 0x00001000
+#if FF_API_DEBUG_MV
 #define FF_DEBUG_VIS_QP 0x00002000
 #define FF_DEBUG_VIS_MB_TYPE 0x00004000
+#endif
 #define FF_DEBUG_BUFFERS 0x00008000
 #define FF_DEBUG_THREADS 0x00010000
 
+#if FF_API_DEBUG_MV
 /**
- * debug
- * - encoding: Set by user.
- * - decoding: Set by user.
+ * @deprecated this option does not have any effect
 */
+ attribute_deprecated
 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
 
 /**
 * Error recognition; may misdetect some more or less valid parts as errors.
@@ -2600,6 +2388,13 @@
 * - decoding: Set by user.
 */
 int err_recognition;
+
+/**
+ * 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)
 #define AV_EF_BUFFER (1<<2)
@@ -2663,37 +2458,19 @@
 #define FF_IDCT_INT 1
 #define FF_IDCT_SIMPLE 2
 #define FF_IDCT_SIMPLEMMX 3
-#if FF_API_LIBMPEG2
-#define FF_IDCT_LIBMPEG2MMX 4
-#endif
-#if FF_API_MMI
-#define FF_IDCT_MMI 5
-#endif
 #define FF_IDCT_ARM 7
 #define FF_IDCT_ALTIVEC 8
 #define FF_IDCT_SH4 9
 #define FF_IDCT_SIMPLEARM 10
-#define FF_IDCT_H264 11
-#define FF_IDCT_VP3 12
 #define FF_IDCT_IPP 13
 #define FF_IDCT_XVIDMMX 14
-#define FF_IDCT_CAVS 15
 #define FF_IDCT_SIMPLEARMV5TE 16
 #define FF_IDCT_SIMPLEARMV6 17
 #define FF_IDCT_SIMPLEVIS 18
-#define FF_IDCT_WMV2 19
 #define FF_IDCT_FAAN 20
-#define FF_IDCT_EA 21
 #define FF_IDCT_SIMPLENEON 22
+#if FF_API_ARCH_ALPHA
 #define FF_IDCT_SIMPLEALPHA 23
-#define FF_IDCT_BINK 24
-
-#if FF_API_DSP_MASK
- /**
- * Unused.
- * @deprecated use av_set_cpu_flags_mask() instead.
- */
- attribute_deprecated unsigned dsp_mask;
 #endif
 
 /**
@@ -2710,17 +2487,21 @@
 */
 int bits_per_raw_sample;
 
+#if FF_API_LOWRES
 /**
 * low resolution decoding, 1-> 1/2 size, 2->1/4 size
 * - encoding: unused
 * - decoding: Set by user.
+ *
+ * @deprecated use decoder private options instead
 */
 attribute_deprecated int lowres;
+#endif
 
 /**
 * the picture in the bitstream
 * - encoding: Set by libavcodec.
- * - decoding: Set by libavcodec.
+ * - decoding: unused
 */
 AVFrame *coded_frame;
 
@@ -2792,13 +2573,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
@@ -2824,6 +2605,8 @@
 #define FF_PROFILE_AAC_HE_V2 28
 #define FF_PROFILE_AAC_LD 22
 #define FF_PROFILE_AAC_ELD 38
+#define FF_PROFILE_MPEG2_AAC_LOW 128
+#define FF_PROFILE_MPEG2_AAC_HE 131
 
 #define FF_PROFILE_DTS 20
 #define FF_PROFILE_DTS_ES 30
@@ -2877,6 +2660,17 @@
 #define FF_PROFILE_MPEG4_SIMPLE_STUDIO 14
 #define FF_PROFILE_MPEG4_ADVANCED_SIMPLE 15
 
+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0 0
+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1 1
+#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION 2
+#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.
@@ -2917,21 +2711,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).
@@ -2982,7 +2777,9 @@
 const int *supported_samplerates; ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
 const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
 const uint64_t *channel_layouts; ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
+#if FF_API_LOWRES
 attribute_deprecated uint8_t max_lowres; ///< maximum value for lowres supported by the decoder
+#endif
 const AVClass *priv_class; ///< AVClass for the private context
 const AVProfile *profiles; ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN}
 
@@ -3309,20 +3106,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);
 
 /**
@@ -3334,8 +3132,12 @@
 * @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()).
+ *
+ * @deprecated use av_frame_free()
 */
+attribute_deprecated
 void avcodec_free_frame(AVFrame **frame);
+#endif
 
 /**
 * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
@@ -3402,10 +3204,14 @@
 * @{
 */
 
+#if FF_API_DESTRUCT_PACKET
 /**
 * Default packet destructor.
+ * @deprecated use the AVBuffer API instead
 */
+attribute_deprecated
 void av_destruct_packet(AVPacket *pkt);
+#endif
 
 /**
 * Initialize optional fields of a packet with default values.
@@ -3444,6 +3250,21 @@
 int av_grow_packet(AVPacket *pkt, int grow_by);
 
 /**
+ * Initialize a reference-counted packet from av_malloc()ed data.
+ *
+ * @param pkt packet to be initialized. This function will set the data, size,
+ * buf and destruct fields, all others are left untouched.
+ * @param data Data allocated by av_malloc() to be used as packet data. If this
+ * function returns successfully, the data is owned by the underlying AVBuffer.
+ * The caller may not access the data through other means.
+ * @param size size of data in bytes, without the padding. I.e. the full buffer
+ * size is assumed to be size + FF_INPUT_BUFFER_PADDING_SIZE.
+ *
+ * @return 0 on success, a negative AVERROR on error
+ */
+int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size);
+
+/**
 * @warning This is a hack - the packet memory allocation stuff is broken. The
 * packet is allocated if it was not really allocated.
 */
@@ -3490,6 +3311,66 @@
 int *size);
 
 /**
+ * Convenience function to free all the side data stored.
+ * All the other fields stay untouched.
+ *
+ * @param pkt packet
+ */
+void av_packet_free_side_data(AVPacket *pkt);
+
+/**
+ * Setup a new reference to the data described by a given packet
+ *
+ * If src is reference-counted, setup dst as a new reference to the
+ * buffer in src. Otherwise allocate a new buffer in dst and copy the
+ * data from src into it.
+ *
+ * All the other fields are copied from src.
+ *
+ * @see av_packet_unref
+ *
+ * @param dst Destination packet
+ * @param src Source packet
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ */
+int av_packet_ref(AVPacket *dst, AVPacket *src);
+
+/**
+ * Wipe the packet.
+ *
+ * Unreference the buffer referenced by the packet and reset the
+ * remaining packet fields to their default values.
+ *
+ * @param pkt The packet to be unreferenced.
+ */
+void av_packet_unref(AVPacket *pkt);
+
+/**
+ * Move every field in src to dst and reset src.
+ *
+ * @see av_packet_unref
+ *
+ * @param src Source packet, will be reset
+ * @param dst Destination packet
+ */
+void av_packet_move_ref(AVPacket *dst, AVPacket *src);
+
+/**
+ * Copy only "properties" fields from src to dst.
+ *
+ * Properties for the purpose of this function are all the fields
+ * beside those related to the packet data (buf, data, size)
+ *
+ * @param dst Destination packet
+ * @param src Source packet
+ *
+ * @return 0 on success AVERROR on failure.
+ *
+ */
+int av_packet_copy_props(AVPacket *dst, const AVPacket *src);
+
+/**
 * @}
 */
 
@@ -3514,18 +3395,33 @@
 */
 AVCodec *avcodec_find_decoder_by_name(const char *name);
 
-int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
-void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
-int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic);
+#if FF_API_GET_BUFFER
+attribute_deprecated int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
+attribute_deprecated void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
+attribute_deprecated int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic);
+#endif
+
+/**
+ * The default callback for AVCodecContext.get_buffer2(). It is made public so
+ * it can be called by custom get_buffer2() implementations for decoders without
+ * CODEC_CAP_DR1 set.
+ */
+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
@@ -3533,8 +3429,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);
 
@@ -3544,98 +3438,51 @@
 * 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]);
 
-#if FF_API_OLD_DECODE_AUDIO
-/**
- * Wrapper function which calls avcodec_decode_audio4.
- *
- * @deprecated Use avcodec_decode_audio4 instead.
- *
- * Decode the audio frame of size avpkt->size from avpkt->data into samples.
- * Some decoders may support multiple frames in a single AVPacket, such
- * decoders would then just decode the first frame. In this case,
- * avcodec_decode_audio3 has to be called again with an AVPacket that contains
- * the remaining data in order to decode the second frame etc.
- * If no frame
- * could be outputted, frame_size_ptr is zero. Otherwise, it is the
- * decompressed frame size in bytes.
- *
- * @warning You must set frame_size_ptr to the allocated size of the
- * output buffer before calling avcodec_decode_audio3().
- *
- * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
- * the actual read bytes because some optimized bitstream readers read 32 or 64
- * bits at once and could read over the end.
- *
- * @warning The end of the input buffer avpkt->data should be set to 0 to ensure that
- * no overreading happens for damaged MPEG streams.
- *
- * @warning You must not provide a custom get_buffer() when using
- * avcodec_decode_audio3(). Doing so will override it with
- * avcodec_default_get_buffer. Use avcodec_decode_audio4() instead,
- * which does allow the application to provide a custom get_buffer().
- *
- * @note You might have to align the input buffer avpkt->data and output buffer
- * samples. The alignment requirements depend on the CPU: On some CPUs it isn't
- * necessary at all, on others it won't work at all if not aligned and on others
- * it will work but it will have an impact on performance.
- *
- * In practice, avpkt->data should have 4 byte alignment at minimum and
- * samples should be 16 byte aligned unless the CPU doesn't need it
- * (AltiVec and SSE do).
- *
- * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
- * between input and output, these need to be fed with avpkt->data=NULL,
- * avpkt->size=0 at the end to return the remaining frames.
- *
- * @param avctx the codec context
- * @param[out] samples the output buffer, sample type in avctx->sample_fmt
- * If the sample format is planar, each channel plane will
- * be the same size, with no padding between channels.
- * @param[in,out] frame_size_ptr the output buffer size in bytes
- * @param[in] avpkt The input AVPacket containing the input buffer.
- * You can create such packet with av_init_packet() and by then setting
- * data and size, some decoders might in addition need other fields.
- * All decoders are designed to use the least fields possible though.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame data was decompressed (used) from the input AVPacket.
- */
-attribute_deprecated int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
- int *frame_size_ptr,
- AVPacket *avpkt);
-#endif
-
 /**
 * Decode the audio frame of size avpkt->size from avpkt->data into frame.
 *
 * Some decoders may support multiple frames in a single AVPacket. Such
- * decoders would then just decode the first frame. In this case,
- * avcodec_decode_audio4 has to be called again with an AVPacket containing
- * the remaining data in order to decode the second frame, etc...
- * Even if no frames are returned, the packet needs to be fed to the decoder
- * with remaining data until it is completely consumed or an error occurs.
+ * decoders would then just decode the first frame and the return value would be
+ * less than the packet size. In this case, avcodec_decode_audio4 has to be
+ * called again with an AVPacket containing the remaining data in order to
+ * decode the second frame, etc... Even if no frames are returned, the packet
+ * needs to be fed to the decoder with remaining data until it is completely
+ * consumed or an error occurs.
+ *
+ * Some decoders (those marked with CODEC_CAP_DELAY) have a delay between input
+ * and output. This means that for some packets they will not immediately
+ * produce decoded output and need to be flushed at the end of decoding to get
+ * all the decoded data. Flushing is done by calling this function with packets
+ * with avpkt->data set to NULL and avpkt->size set to 0 until it stops
+ * returning samples. It is safe to flush even those decoders that are not
+ * marked with CODEC_CAP_DELAY, then no samples will be returned.
 *
 * @warning The input buffer, avpkt->data must be FF_INPUT_BUFFER_PADDING_SIZE
 * larger than the actual read bytes because some optimized bitstream
 * readers read 32 or 64 bits at once and could read over the end.
 *
- * @note You might have to align the input buffer. The alignment requirements
- * depend on the CPU and the decoder.
- *
 * @param avctx the codec context
 * @param[out] frame The AVFrame in which to store decoded audio samples.
- * Decoders request a buffer of a particular size by setting
- * AVFrame.nb_samples prior to calling get_buffer(). The
- * decoder may, however, only utilize part of the buffer by
- * setting AVFrame.nb_samples to a smaller value in the
- * output frame.
+ * The decoder will allocate a buffer for the decoded frame by
+ * calling the AVCodecContext.get_buffer2() callback.
+ * When AVCodecContext.refcounted_frames is set to 1, the frame is
+ * reference counted and the returned reference belongs to the
+ * caller. The caller must release the frame using av_frame_unref()
+ * when the frame is no longer needed. The caller may safely write
+ * to the frame if av_frame_is_writable() returns 1.
+ * When AVCodecContext.refcounted_frames is set to 0, the returned
+ * reference belongs to the decoder and is valid only until the
+ * next call to this function or until closing or flushing the
+ * decoder. The caller may not write to it.
 * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is
- * non-zero.
+ * non-zero. Note that this field being set to zero
+ * does not mean that an error has occurred. For
+ * decoders with CODEC_CAP_DELAY set, no given decode
+ * call is guaranteed to produce a frame.
 * @param[in] avpkt The input AVPacket containing the input buffer.
 * At least avpkt->data and avpkt->size should be set. Some
 * decoders might also require additional fields to be set.
@@ -3658,25 +3505,24 @@
 * @warning The end of the input buffer buf should be set to 0 to ensure that
 * no overreading happens for damaged MPEG streams.
 *
- * @note You might have to align the input buffer avpkt->data.
- * The alignment requirements depend on the CPU: on some CPUs it isn't
- * necessary at all, on others it won't work at all if not aligned and on others
- * it will work but it will have an impact on performance.
- *
- * In practice, avpkt->data should have 4 byte alignment at minimum.
- *
 * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
 * between input and output, these need to be fed with avpkt->data=NULL,
 * avpkt->size=0 at the end to return the remaining frames.
 *
 * @param avctx the codec context
 * @param[out] picture The AVFrame in which the decoded video frame will be stored.
- * Use avcodec_alloc_frame to get an AVFrame, the codec will
- * allocate memory for the actual bitmap.
- * with default get/release_buffer(), the decoder frees/reuses the bitmap as it sees fit.
- * with overridden get/release_buffer() (needs CODEC_CAP_DR1) the user decides into what buffer the decoder
- * decodes and the decoder tells the user once it does not need the data anymore,
- * the user app can at this point free/reuse/keep the memory as it sees fit.
+ * Use av_frame_alloc() to get an AVFrame. The codec will
+ * allocate memory for the actual bitmap by calling the
+ * AVCodecContext.get_buffer2() callback.
+ * When AVCodecContext.refcounted_frames is set to 1, the frame is
+ * reference counted and the returned reference belongs to the
+ * caller. The caller must release the frame using av_frame_unref()
+ * when the frame is no longer needed. The caller may safely write
+ * to the frame if av_frame_is_writable() returns 1.
+ * When AVCodecContext.refcounted_frames is set to 0, the returned
+ * reference belongs to the decoder and is valid only until the
+ * next call to this function or until closing or flushing the
+ * decoder. The caller may not write to it.
 *
 * @param[in] avpkt The input AVpacket containing the input buffer.
 * You can create such packet with av_init_packet() and by then setting
@@ -3716,6 +3562,13 @@
 * @{
 */
 
+enum AVPictureStructure {
+ AV_PICTURE_STRUCTURE_UNKNOWN, //< unknown
+ AV_PICTURE_STRUCTURE_TOP_FIELD, //< coded as top field
+ AV_PICTURE_STRUCTURE_BOTTOM_FIELD, //< coded as bottom field
+ AV_PICTURE_STRUCTURE_FRAME, //< coded as frame
+};
+
 typedef struct AVCodecParserContext {
 void *priv_data;
 struct AVCodecParser *parser;
@@ -3849,6 +3702,26 @@
 * For all other types, this is in units of AVCodecContext.time_base.
 */
 int duration;
+
+ enum AVFieldOrder field_order;
+
+ /**
+ * Indicate whether a picture is coded as a frame, top field or bottom field.
+ *
+ * For example, H.264 field_pic_flag equal to 0 corresponds to
+ * AV_PICTURE_STRUCTURE_FRAME. An H.264 picture with field_pic_flag
+ * equal to 1 and bottom_field_flag equal to 0 corresponds to
+ * AV_PICTURE_STRUCTURE_TOP_FIELD.
+ */
+ enum AVPictureStructure picture_structure;
+
+ /**
+ * Picture number incremented in presentation or output order.
+ * This field may be reinitialized at the first picture of a new sequence.
+ *
+ * For example, this corresponds to H.264 PicOrderCnt.
+ */
+ int output_picture_number;
 } AVCodecParserContext;
 
 typedef struct AVCodecParser {
@@ -3940,36 +3813,6 @@
 */
 AVCodec *avcodec_find_encoder_by_name(const char *name);
 
-#if FF_API_OLD_ENCODE_AUDIO
-/**
- * Encode an audio frame from samples into buf.
- *
- * @deprecated Use avcodec_encode_audio2 instead.
- *
- * @note The output buffer should be at least FF_MIN_BUFFER_SIZE bytes large.
- * However, for codecs with avctx->frame_size equal to 0 (e.g. PCM) the user
- * will know how much space is needed because it depends on the value passed
- * in buf_size as described below. In that case a lower value can be used.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer
- * @param[in] buf_size the output buffer size
- * @param[in] samples the input buffer containing the samples
- * The number of samples read from this buffer is frame_size*channels,
- * both of which are defined in avctx.
- * For codecs which have avctx->frame_size equal to 0 (e.g. PCM) the number of
- * samples read from samples is equal to:
- * buf_size * 8 / (avctx->channels * av_get_bits_per_sample(avctx->codec_id))
- * This also implies that av_get_bits_per_sample() must not return 0 for these
- * codecs.
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used to encode the data read from the input buffer.
- */
-int attribute_deprecated avcodec_encode_audio(AVCodecContext *avctx,
- uint8_t *buf, int buf_size,
- const short *samples);
-#endif
-
 /**
 * Encode a frame of audio.
 *
@@ -4011,26 +3854,6 @@
 int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
 const AVFrame *frame, int *got_packet_ptr);
 
-#if FF_API_OLD_ENCODE_VIDEO
-/**
- * @deprecated use avcodec_encode_video2() instead.
- *
- * Encode a video frame from pict into buf.
- * The input picture should be
- * stored using a specific format, namely avctx.pix_fmt.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer for the bitstream of encoded frame
- * @param[in] buf_size the size of the output buffer in bytes
- * @param[in] pict the input picture to encode
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used from the output buffer.
- */
-attribute_deprecated
-int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
- const AVFrame *pict);
-#endif
-
 /**
 * Encode a frame of video.
 *
@@ -4076,103 +3899,6 @@
 * @}
 */
 
-#if FF_API_AVCODEC_RESAMPLE
-/**
- * @defgroup lavc_resample Audio resampling
- * @ingroup libavc
- * @deprecated use libavresample instead
- *
- * @{
- */
-struct ReSampleContext;
-struct AVResampleContext;
-
-typedef struct ReSampleContext ReSampleContext;
-
-/**
- * Initialize audio resampling context.
- *
- * @param output_channels number of output channels
- * @param input_channels number of input channels
- * @param output_rate output sample rate
- * @param input_rate input sample rate
- * @param sample_fmt_out requested output sample format
- * @param sample_fmt_in input sample format
- * @param filter_length length of each FIR filter in the filterbank relative to the cutoff frequency
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear if 1 then the used FIR filter will be linearly interpolated
- between the 2 closest, if 0 the closest will be used
- * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
- * @return allocated ReSampleContext, NULL if error occurred
- */
-attribute_deprecated
-ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
- int output_rate, int input_rate,
- enum AVSampleFormat sample_fmt_out,
- enum AVSampleFormat sample_fmt_in,
- int filter_length, int log2_phase_count,
- int linear, double cutoff);
-
-attribute_deprecated
-int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples);
-
-/**
- * Free resample context.
- *
- * @param s a non-NULL pointer to a resample context previously
- * created with av_audio_resample_init()
- */
-attribute_deprecated
-void audio_resample_close(ReSampleContext *s);
-
-
-/**
- * Initialize an audio resampler.
- * Note, if either rate is not an integer then simply scale both rates up so they are.
- * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq
- * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
- * @param linear If 1 then the used FIR filter will be linearly interpolated
- between the 2 closest, if 0 the closest will be used
- * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
- */
-attribute_deprecated
-struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff);
-
-/**
- * Resample an array of samples using a previously configured context.
- * @param src an array of unconsumed samples
- * @param consumed the number of samples of src which have been consumed are returned here
- * @param src_size the number of unconsumed samples available
- * @param dst_size the amount of space in samples available in dst
- * @param update_ctx If this is 0 then the context will not be modified, that way several channels can be resampled with the same context.
- * @return the number of samples written in dst or -1 if an error occurred
- */
-attribute_deprecated
-int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx);
-
-
-/**
- * Compensate samplerate/timestamp drift. The compensation is done by changing
- * the resampler parameters, so no audible clicks or similar distortions occur
- * @param compensation_distance distance in output samples over which the compensation should be performed
- * @param sample_delta number of output samples which should be output less
- *
- * example: av_resample_compensate(c, 10, 500)
- * here instead of 510 samples only 500 samples would be output
- *
- * note, due to rounding the actual compensation might be slightly different,
- * especially if the compensation_distance is large and the in_rate used during init is small
- */
-attribute_deprecated
-void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance);
-attribute_deprecated
-void av_resample_close(struct AVResampleContext *c);
-
-/**
- * @}
- */
-#endif
-
 /**
 * @addtogroup lavc_picture
 * @{
@@ -4256,11 +3982,16 @@
 */
 int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height);
 
+#if FF_API_DEINTERLACE
 /**
 * deinterlace - if not supported return -1
+ *
+ * @deprecated - use yadif (in libavfilter) instead
 */
+attribute_deprecated
 int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
 enum AVPixelFormat pix_fmt, int width, int height);
+#endif
 /**
 * Copy image src to dst. Wraps av_picture_data_copy() above.
 */
@@ -4339,36 +4070,6 @@
 int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt,
 int has_alpha);
 
-#if FF_API_FIND_BEST_PIX_FMT
-/**
- * @deprecated use avcodec_find_best_pix_fmt2() instead.
- *
- * Find the best pixel format to convert to given a certain source pixel
- * format. When converting from one pixel format to another, information loss
- * may occur. For example, when converting from RGB24 to GRAY, the color
- * information will be lost. Similarly, other losses occur when converting from
- * some formats to other formats. avcodec_find_best_pix_fmt() searches which of
- * the given pixel formats should be used to suffer the least amount of loss.
- * The pixel formats from which it chooses one, are determined by the
- * pix_fmt_mask parameter.
- *
- * @code
- * src_pix_fmt = AV_PIX_FMT_YUV420P;
- * pix_fmt_mask = (1 << AV_PIX_FMT_YUV422P) || (1 << AV_PIX_FMT_RGB24);
- * dst_pix_fmt = avcodec_find_best_pix_fmt(pix_fmt_mask, src_pix_fmt, alpha, &loss);
- * @endcode
- *
- * @param[in] pix_fmt_mask bitmask determining which pixel format to choose from
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
- * @return The best pixel format to convert to or -1 if none was found.
- */
-attribute_deprecated
-enum AVPixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum AVPixelFormat src_pix_fmt,
- int has_alpha, int *loss_ptr);
-#endif /* FF_API_FIND_BEST_PIX_FMT */
-
 /**
 * Find the best pixel format to convert to given a certain source pixel
 * format. When converting from one pixel format to another, information loss
@@ -4396,12 +4097,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
 */
@@ -4443,12 +4152,16 @@
 int buf_size, int align);
 
 /**
- * Flush buffers, should be called when seeking or when switching to a different stream.
+ * Reset the internal decoder state / flush internal buffers. Should be called
+ * e.g. when seeking or when switching to a different stream.
+ *
+ * @note when refcounted frames are not used (i.e. avctx->refcounted_frames is 0),
+ * this invalidates the frames previously returned from the decoder. When
+ * refcounted frames are used, the decoder just releases any references it might
+ * keep internally, but the caller's reference remains valid.
 */
 void avcodec_flush_buffers(AVCodecContext *avctx);
 
-void avcodec_default_free_buffers(AVCodecContext *s);
-
 /**
 * Return codec bits per sample.
 *
@@ -4510,27 +4223,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);
-
-/**
 * Allocate a buffer with padding, reusing the given one if large enough.
 *
 * Same behaviour av_fast_malloc but the buffer has additional
@@ -4548,6 +4240,7 @@
 */
 unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
 
+#if FF_API_MISSING_SAMPLE
 /**
 * Log a generic warning message about a missing feature. This function is
 * intended to be used internally by Libav (libavcodec, libavformat, etc.)
@@ -4559,7 +4252,9 @@
 * If want_sample is non-zero, additional verbage will be added to the log
 * message which tells the user how to report samples to the development
 * mailing list.
+ * @deprecated Use avpriv_report_missing_feature() instead.
 */
+attribute_deprecated
 void av_log_missing_feature(void *avc, const char *feature, int want_sample);
 
 /**
@@ -4569,8 +4264,11 @@
 * @param[in] avc a pointer to an arbitrary struct of which the first field is
 * a pointer to an AVClass struct
 * @param[in] msg string containing an optional message, or NULL if no message
+ * @deprecated Use avpriv_request_sample() instead.
 */
+attribute_deprecated
 void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3);
+#endif /* FF_API_MISSING_SAMPLE */
 
 /**
 * Register the hardware accelerator hwaccel.

libav-v9.6.tar.bz2/libavcodec/avfft.c -> libav-v10.1.tar.bz2/libavcodec/avfft.c Changed

libav-v9.6.tar.bz2/libavcodec/avfft.h -> libav-v10.1.tar.bz2/libavcodec/avfft.h Changed

libav-v9.6.tar.bz2/libavcodec/avpacket.c -> libav-v10.1.tar.bz2/libavcodec/avpacket.c Changed

@@ -22,22 +22,26 @@
 #include <string.h>
 
 #include "libavutil/avassert.h"
+#include "libavutil/common.h"
+#include "libavutil/internal.h"
 #include "libavutil/mem.h"
 #include "avcodec.h"
+#if FF_API_DESTRUCT_PACKET
 
 void av_destruct_packet(AVPacket *pkt)
 {
- int i;
-
 av_free(pkt->data);
 pkt->data = NULL;
 pkt->size = 0;
+}
 
- for (i = 0; i < pkt->side_data_elems; i++)
- av_free(pkt->side_data[i].data);
- av_freep(&pkt->side_data);
- pkt->side_data_elems = 0;
+/* a dummy destruct callback for the callers that assume AVPacket.destruct ==
+ * NULL => static data */
+static void dummy_destruct_packet(AVPacket *pkt)
+{
+ av_assert0(0);
 }
+#endif
 
 void av_init_packet(AVPacket *pkt)
 {
@@ -48,27 +52,48 @@
 pkt->convergence_duration = 0;
 pkt->flags = 0;
 pkt->stream_index = 0;
+#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
 pkt->destruct = NULL;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+ pkt->buf = NULL;
 pkt->side_data = NULL;
 pkt->side_data_elems = 0;
 }
 
+static int packet_alloc(AVBufferRef **buf, int size)
+{
+ int ret;
+ if ((unsigned)size >= (unsigned)size + FF_INPUT_BUFFER_PADDING_SIZE)
+ return AVERROR(EINVAL);
+
+ ret = av_buffer_realloc(buf, size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (ret < 0)
+ return ret;
+
+ memset((*buf)->data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+
+ return 0;
+}
+
 int av_new_packet(AVPacket *pkt, int size)
 {
- uint8_t *data = NULL;
- if ((unsigned)size < (unsigned)size + FF_INPUT_BUFFER_PADDING_SIZE)
- data = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
- if (data) {
- memset(data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
- } else
- size = 0;
+ AVBufferRef *buf = NULL;
+ int ret = packet_alloc(&buf, size);
+ if (ret < 0)
+ return ret;
 
 av_init_packet(pkt);
- pkt->data = data;
+ pkt->buf = buf;
+ pkt->data = buf->data;
 pkt->size = size;
- pkt->destruct = av_destruct_packet;
- if (!data)
- return AVERROR(ENOMEM);
+#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
+ pkt->destruct = dummy_destruct_packet;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
 return 0;
 }
 
@@ -82,33 +107,75 @@
 
 int av_grow_packet(AVPacket *pkt, int grow_by)
 {
- void *new_ptr;
+ int new_size;
 av_assert0((unsigned)pkt->size <= INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE);
 if (!pkt->size)
 return av_new_packet(pkt, grow_by);
 if ((unsigned)grow_by >
 INT_MAX - (pkt->size + FF_INPUT_BUFFER_PADDING_SIZE))
 return -1;
- new_ptr = av_realloc(pkt->data,
- pkt->size + grow_by + FF_INPUT_BUFFER_PADDING_SIZE);
- if (!new_ptr)
- return AVERROR(ENOMEM);
- pkt->data = new_ptr;
+
+ new_size = pkt->size + grow_by + FF_INPUT_BUFFER_PADDING_SIZE;
+ if (pkt->buf) {
+ int ret = av_buffer_realloc(&pkt->buf, new_size);
+ if (ret < 0)
+ return ret;
+ } else {
+ pkt->buf = av_buffer_alloc(new_size);
+ if (!pkt->buf)
+ return AVERROR(ENOMEM);
+ memcpy(pkt->buf->data, pkt->data, FFMIN(pkt->size, pkt->size + grow_by));
+#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
+ pkt->destruct = dummy_destruct_packet;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+ }
+ pkt->data = pkt->buf->data;
 pkt->size += grow_by;
 memset(pkt->data + pkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+
 return 0;
 }
 
-#define DUP_DATA(dst, src, size, padding) \
+int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size)
+{
+ if (size >= INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE)
+ return AVERROR(EINVAL);
+
+ pkt->buf = av_buffer_create(data, size + FF_INPUT_BUFFER_PADDING_SIZE,
+ av_buffer_default_free, NULL, 0);
+ if (!pkt->buf)
+ return AVERROR(ENOMEM);
+
+ pkt->data = data;
+ pkt->size = size;
+#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
+ pkt->destruct = dummy_destruct_packet;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
+ return 0;
+}
+
+#define ALLOC_MALLOC(data, size) data = av_malloc(size)
+#define ALLOC_BUF(data, size) \
+do { \
+ av_buffer_realloc(&pkt->buf, size); \
+ data = pkt->buf ? pkt->buf->data : NULL; \
+} while (0)
+
+#define DUP_DATA(dst, src, size, padding, ALLOC) \
 do { \
 void *data; \
 if (padding) { \
 if ((unsigned)(size) > \
 (unsigned)(size) + FF_INPUT_BUFFER_PADDING_SIZE) \
 goto failed_alloc; \
- data = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); \
+ ALLOC(data, size + FF_INPUT_BUFFER_PADDING_SIZE); \
 } else { \
- data = av_malloc(size); \
+ ALLOC(data, size); \
 } \
 if (!data) \
 goto failed_alloc; \
@@ -123,42 +190,71 @@
 {
 AVPacket tmp_pkt;
 
- if (pkt->destruct == NULL && pkt->data) {
+FF_DISABLE_DEPRECATION_WARNINGS
+ if (!pkt->buf && pkt->data
+#if FF_API_DESTRUCT_PACKET
+ && !pkt->destruct
+#endif
+ ) {
+FF_ENABLE_DEPRECATION_WARNINGS
 tmp_pkt = *pkt;
 
 pkt->data = NULL;
 pkt->side_data = NULL;
- DUP_DATA(pkt->data, tmp_pkt.data, pkt->size, 1);
- pkt->destruct = av_destruct_packet;
+ DUP_DATA(pkt->data, tmp_pkt.data, pkt->size, 1, ALLOC_BUF);
+#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
+ pkt->destruct = dummy_destruct_packet;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
 
 if (pkt->side_data_elems) {
 int i;
 
 DUP_DATA(pkt->side_data, tmp_pkt.side_data,
- pkt->side_data_elems * sizeof(*pkt->side_data), 0);
+ pkt->side_data_elems * sizeof(*pkt->side_data), 0, ALLOC_MALLOC);
 memset(pkt->side_data, 0,
 pkt->side_data_elems * sizeof(*pkt->side_data));
- for (i = 0; i < pkt->side_data_elems; i++)
+ for (i = 0; i < pkt->side_data_elems; i++) {
 DUP_DATA(pkt->side_data[i].data, tmp_pkt.side_data[i].data,
- tmp_pkt.side_data[i].size, 1);
+ tmp_pkt.side_data[i].size, 1, ALLOC_MALLOC);
+ pkt->side_data[i].size = tmp_pkt.side_data[i].size;
+ pkt->side_data[i].type = tmp_pkt.side_data[i].type;
+ }
 }
 }
 return 0;
 
 failed_alloc:
- av_destruct_packet(pkt);
+ av_free_packet(pkt);
 return AVERROR(ENOMEM);
 }
 
+void av_packet_free_side_data(AVPacket *pkt)
+{
+ int i;
+ for (i = 0; i < pkt->side_data_elems; i++)
+ av_free(pkt->side_data[i].data);
+ av_freep(&pkt->side_data);
+ pkt->side_data_elems = 0;
+}
+
 void av_free_packet(AVPacket *pkt)
 {
 if (pkt) {
- if (pkt->destruct)
+FF_DISABLE_DEPRECATION_WARNINGS
+ if (pkt->buf)
+ av_buffer_unref(&pkt->buf);
+#if FF_API_DESTRUCT_PACKET
+ else if (pkt->destruct)
 pkt->destruct(pkt);
+ pkt->destruct = NULL;
+#endif
+FF_ENABLE_DEPRECATION_WARNINGS
 pkt->data = NULL;
 pkt->size = 0;
- pkt->side_data = NULL;
- pkt->side_data_elems = 0;
+
+ av_packet_free_side_data(pkt);
 }
 }
 
@@ -217,3 +313,71 @@
 }
 return AVERROR(ENOENT);
 }
+
+int av_packet_copy_props(AVPacket *dst, const AVPacket *src)
+{
+ int i;
+
+ dst->pts = src->pts;
+ dst->dts = src->dts;
+ dst->pos = src->pos;
+ dst->duration = src->duration;
+ dst->convergence_duration = src->convergence_duration;
+ dst->flags = src->flags;
+ dst->stream_index = src->stream_index;
+ dst->side_data_elems = src->side_data_elems;
+
+ for (i = 0; i < src->side_data_elems; i++) {
+ enum AVPacketSideDataType type = src->side_data[i].type;
+ int size = src->side_data[i].size;
+ uint8_t *src_data = src->side_data[i].data;
+ uint8_t *dst_data = av_packet_new_side_data(dst, type, size);
+
+ if (!dst_data) {
+ av_packet_free_side_data(dst);
+ return AVERROR(ENOMEM);
+ }
+ memcpy(dst_data, src_data, size);
+ }
+
+ return 0;
+}
+
+void av_packet_unref(AVPacket *pkt)
+{
+ av_packet_free_side_data(pkt);
+ av_buffer_unref(&pkt->buf);
+ av_init_packet(pkt);
+ pkt->data = NULL;
+ pkt->size = 0;
+}
+
+int av_packet_ref(AVPacket *dst, AVPacket *src)
+{
+ int ret;
+
+ ret = av_packet_copy_props(dst, src);
+ if (ret < 0)
+ return ret;
+
+ if (!src->buf) {
+ ret = packet_alloc(&dst->buf, src->size);
+ if (ret < 0)
+ goto fail;
+ memcpy(dst->buf->data, src->data, src->size);
+ } else
+ dst->buf = av_buffer_ref(src->buf);
+
+ dst->size = src->size;
+ dst->data = dst->buf->data;
+ return 0;
+fail:
+ av_packet_free_side_data(dst);
+ return ret;
+}
+
+void av_packet_move_ref(AVPacket *dst, AVPacket *src)
+{
+ *dst = *src;
+ av_init_packet(src);
+}

libav-v9.6.tar.bz2/libavcodec/avpicture.c -> libav-v10.1.tar.bz2/libavcodec/avpicture.c Changed

libav-v9.6.tar.bz2/libavcodec/avs.c -> libav-v10.1.tar.bz2/libavcodec/avs.c Changed

@@ -21,10 +21,11 @@
 
 #include "avcodec.h"
 #include "get_bits.h"
+#include "internal.h"
 
 
 typedef struct {
- AVFrame picture;
+ AVFrame *frame;
 } AvsContext;
 
 typedef enum {
@@ -51,24 +52,23 @@
 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, vect_w = 3, vect_h = 3;
+ int i, j, x, y, stride, ret, vect_w = 3, vect_h = 3;
 AvsVideoSubType sub_type;
 AvsBlockType type;
 GetBitContext change_map;
 
- if (avctx->reget_buffer(avctx, p)) {
+ if ((ret = ff_reget_buffer(avctx, p)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
 }
- p->reference = 1;
 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;
@@ -78,7 +78,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);
@@ -94,7 +94,7 @@
 }
 
 if (type != AVS_VIDEO)
- return -1;
+ return AVERROR_INVALIDDATA;
 
 switch (sub_type) {
 case AVS_I_FRAME:
@@ -116,7 +116,7 @@
 break;
 
 default:
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 if (buf_end - buf < 256 * vect_w * vect_h)
@@ -149,7 +149,8 @@
 align_get_bits(&change_map);
 }
 
- *picture = avs->picture;
+ if ((ret = av_frame_ref(picture, p)) < 0)
+ return ret;
 *got_frame = 1;
 
 return buf_size;
@@ -157,22 +158,29 @@
 
 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);
+ ff_set_dimensions(avctx, 318, 198);
+
 return 0;
 }
 
 static av_cold int avs_decode_end(AVCodecContext *avctx)
 {
 AvsContext *s = avctx->priv_data;
- if (s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
+ av_frame_free(&s->frame);
 return 0;
 }
 
 
 AVCodec ff_avs_decoder = {
 .name = "avs",
+ .long_name = NULL_IF_CONFIG_SMALL("AVS (Audio Video Standard) video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_AVS,
 .priv_data_size = sizeof(AvsContext),
@@ -180,5 +188,4 @@
 .decode = avs_decode_frame,
 .close = avs_decode_end,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("AVS (Audio Video Standard) video"),
 };

libav-v9.6.tar.bz2/libavcodec/bethsoftvideo.c -> libav-v10.1.tar.bz2/libavcodec/bethsoftvideo.c Changed

@@ -28,28 +28,31 @@
 */
 
 #include "libavutil/common.h"
-#include "dsputil.h"
+#include "avcodec.h"
 #include "bethsoftvideo.h"
 #include "bytestream.h"
+#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;
- vid->frame.reference = 1;
- vid->frame.buffer_hints = FF_BUFFER_HINTS_VALID |
- FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
 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 +61,7 @@
 for(a = 0; a < 256; a++){
 palette[a] = bytestream2_get_be24u(&ctx->g) * 4;
 }
- ctx->frame.palette_has_changed = 1;
+ ctx->frame->palette_has_changed = 1;
 return 0;
 }
 
@@ -75,11 +78,11 @@
 int code, ret;
 int yoffset;
 
- if (avctx->reget_buffer(avctx, &vid->frame)) {
+ if ((ret = ff_reget_buffer(avctx, vid->frame)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ 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) {
@@ -90,8 +93,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: {
@@ -105,8 +108,8 @@
 case VIDEO_YOFF_P_FRAME:
 yoffset = bytestream2_get_le16(&vid->g);
 if(yoffset >= avctx->height)
- return -1;
- dst += vid->frame.linesize[0] * yoffset;
+ return AVERROR_INVALIDDATA;
+ dst += vid->frame->linesize[0] * yoffset;
 }
 
 // main code
@@ -136,8 +139,10 @@
 }
 end:
 
+ if ((ret = av_frame_ref(data, vid->frame)) < 0)
+ return ret;
+
 *got_frame = 1;
- *(AVFrame*)data = vid->frame;
 
 return avpkt->size;
 }
@@ -145,13 +150,13 @@
 static av_cold int bethsoftvid_decode_end(AVCodecContext *avctx)
 {
 BethsoftvidContext * vid = avctx->priv_data;
- if(vid->frame.data[0])
- avctx->release_buffer(avctx, &vid->frame);
+ av_frame_free(&vid->frame);
 return 0;
 }
 
 AVCodec ff_bethsoftvid_decoder = {
 .name = "bethsoftvid",
+ .long_name = NULL_IF_CONFIG_SMALL("Bethesda VID video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_BETHSOFTVID,
 .priv_data_size = sizeof(BethsoftvidContext),
@@ -159,5 +164,4 @@
 .close = bethsoftvid_decode_end,
 .decode = bethsoftvid_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Bethesda VID video"),
 };

libav-v9.6.tar.bz2/libavcodec/bfi.c -> libav-v10.1.tar.bz2/libavcodec/bfi.c Changed

@@ -33,7 +33,6 @@
 
 typedef struct BFIContext {
 AVCodecContext *avctx;
- AVFrame frame;
 uint8_t *dst;
 } BFIContext;
 
@@ -48,6 +47,7 @@
 static int bfi_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 GetByteContext g;
 int buf_size = avpkt->size;
 BFIContext *bfi = avctx->priv_data;
@@ -55,30 +55,25 @@
 uint8_t *src, *dst_offset, colour1, colour2;
 uint8_t *frame_end = bfi->dst + avctx->width * avctx->height;
 uint32_t *pal;
- int i, j, height = avctx->height;
+ int i, j, ret, height = avctx->height;
 
- if (bfi->frame.data[0])
- avctx->release_buffer(avctx, &bfi->frame);
-
- bfi->frame.reference = 1;
-
- if (ff_get_buffer(avctx, &bfi->frame) < 0) {
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 bytestream2_init(&g, avpkt->data, buf_size);
 
 /* Set frame parameters and palette, if necessary */
 if (!avctx->frame_number) {
- bfi->frame.pict_type = AV_PICTURE_TYPE_I;
- bfi->frame.key_frame = 1;
+ frame->pict_type = AV_PICTURE_TYPE_I;
+ frame->key_frame = 1;
 /* Setting the palette */
 if (avctx->extradata_size > 768) {
 av_log(NULL, AV_LOG_ERROR, "Palette is too large.\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- pal = (uint32_t *)bfi->frame.data[1];
+ pal = (uint32_t *)frame->data[1];
 for (i = 0; i < avctx->extradata_size / 3; i++) {
 int shift = 16;
 *pal = 0;
@@ -87,10 +82,10 @@
 (avctx->extradata[i * 3 + j] >> 4)) << shift;
 pal++;
 }
- bfi->frame.palette_has_changed = 1;
+ frame->palette_has_changed = 1;
 } else {
- bfi->frame.pict_type = AV_PICTURE_TYPE_P;
- bfi->frame.key_frame = 0;
+ frame->pict_type = AV_PICTURE_TYPE_P;
+ frame->key_frame = 0;
 }
 
 bytestream2_skip(&g, 4); // Unpacked size, not required.
@@ -104,7 +99,7 @@
 if (!bytestream2_get_bytes_left(&g)) {
 av_log(avctx, AV_LOG_ERROR,
 "Input resolution larger than actual frame.\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 /* Get length and offset (if required) */
@@ -130,7 +125,7 @@
 case 0: // normal chain
 if (length >= bytestream2_get_bytes_left(&g)) {
 av_log(avctx, AV_LOG_ERROR, "Frame larger than buffer.\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 bytestream2_get_buffer(&g, dst, length);
 dst += length;
@@ -158,28 +153,27 @@
 }
 
 src = bfi->dst;
- dst = bfi->frame.data[0];
+ dst = frame->data[0];
 while (height--) {
 memcpy(dst, src, avctx->width);
 src += avctx->width;
- dst += bfi->frame.linesize[0];
+ dst += frame->linesize[0];
 }
 *got_frame = 1;
- *(AVFrame *)data = bfi->frame;
+
 return buf_size;
 }
 
 static av_cold int bfi_decode_close(AVCodecContext *avctx)
 {
 BFIContext *bfi = avctx->priv_data;
- if (bfi->frame.data[0])
- avctx->release_buffer(avctx, &bfi->frame);
 av_free(bfi->dst);
 return 0;
 }
 
 AVCodec ff_bfi_decoder = {
 .name = "bfi",
+ .long_name = NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_BFI,
 .priv_data_size = sizeof(BFIContext),
@@ -187,5 +181,4 @@
 .close = bfi_decode_close,
 .decode = bfi_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"),
 };

libav-v9.6.tar.bz2/libavcodec/bfin/Makefile -> libav-v10.1.tar.bz2/libavcodec/bfin/Makefile Changed

libav-v9.6.tar.bz2/libavcodec/bfin/config_bfin.h -> libav-v10.1.tar.bz2/libavcodec/bfin/config_bfin.h Changed

libav-v9.6.tar.bz2/libavcodec/bfin/dsputil_bfin.c -> libav-v10.1.tar.bz2/libavcodec/bfin/dsputil_bfin.c Changed

@@ -21,26 +21,27 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "libavutil/attributes.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/dsputil.h"
 #include "dsputil_bfin.h"
 
 int off;
 
-static void bfin_idct_add (uint8_t *dest, int line_size, DCTELEM *block)
+static void bfin_idct_add (uint8_t *dest, int line_size, int16_t *block)
 {
 ff_bfin_idct (block);
 ff_bfin_add_pixels_clamped (block, dest, line_size);
 }
 
-static void bfin_idct_put (uint8_t *dest, int line_size, DCTELEM *block)
+static void bfin_idct_put (uint8_t *dest, int line_size, int16_t *block)
 {
 ff_bfin_idct (block);
 ff_bfin_put_pixels_clamped (block, dest, line_size);
 }
 
 
-static void bfin_clear_blocks (DCTELEM *blocks)
+static void bfin_clear_blocks (int16_t *blocks)
 {
 // This is just a simple memset.
 //
@@ -53,79 +54,6 @@
 ::"a" (blocks):"P0","I0","R0");
 }
 
-
-
-static void bfin_put_pixels8 (uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- ff_bfin_put_pixels8uc (block, pixels, pixels, line_size, line_size, h);
-}
-
-static void bfin_put_pixels8_x2(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- ff_bfin_put_pixels8uc (block, pixels, pixels+1, line_size, line_size, h);
-}
-
-static void bfin_put_pixels8_y2 (uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- ff_bfin_put_pixels8uc (block, pixels, pixels+line_size, line_size, line_size, h);
-}
-
-static void bfin_put_pixels8_xy2 (uint8_t *block, const uint8_t *s0, int line_size, int h)
-{
- ff_bfin_z_put_pixels8_xy2 (block,s0,line_size, line_size, h);
-}
-
-static void bfin_put_pixels16 (uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- ff_bfin_put_pixels16uc (block, pixels, pixels, line_size, line_size, h);
-}
-
-static void bfin_put_pixels16_x2 (uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- ff_bfin_put_pixels16uc (block, pixels, pixels+1, line_size, line_size, h);
-}
-
-static void bfin_put_pixels16_y2 (uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- ff_bfin_put_pixels16uc (block, pixels, pixels+line_size, line_size, line_size, h);
-}
-
-static void bfin_put_pixels16_xy2 (uint8_t *block, const uint8_t *s0, int line_size, int h)
-{
- ff_bfin_z_put_pixels16_xy2 (block,s0,line_size, line_size, h);
-}
-
-static void bfin_put_pixels8_nornd (uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- ff_bfin_put_pixels8uc_nornd (block, pixels, pixels, line_size, h);
-}
-
-static void bfin_put_pixels8_x2_nornd (uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- ff_bfin_put_pixels8uc_nornd (block, pixels, pixels+1, line_size, h);
-}
-
-static void bfin_put_pixels8_y2_nornd (uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- ff_bfin_put_pixels8uc_nornd (block, pixels, pixels+line_size, line_size, h);
-}
-
-
-static void bfin_put_pixels16_nornd (uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- ff_bfin_put_pixels16uc_nornd (block, pixels, pixels, line_size, h);
-}
-
-static void bfin_put_pixels16_x2_nornd (uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- ff_bfin_put_pixels16uc_nornd (block, pixels, pixels+1, line_size, h);
-}
-
-static void bfin_put_pixels16_y2_nornd (uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- ff_bfin_put_pixels16uc_nornd (block, pixels, pixels+line_size, line_size, h);
-}
-
 static int bfin_pix_abs16 (void *c, uint8_t *blk1, uint8_t *blk2, int line_size, int h)
 {
 return ff_bfin_z_sad16x16 (blk1,blk2,line_size,line_size,h);
@@ -195,7 +123,7 @@
 
 */
 
-void ff_dsputil_init_bfin( DSPContext* c, AVCodecContext *avctx )
+av_cold void ff_dsputil_init_bfin(DSPContext *c, AVCodecContext *avctx)
 {
 const int high_bit_depth = avctx->bits_per_raw_sample > 8;
 
@@ -204,7 +132,7 @@
 c->add_pixels_clamped = ff_bfin_add_pixels_clamped;
 
 if (!high_bit_depth)
- c->get_pixels = ff_bfin_get_pixels;
+ c->get_pixels = ff_bfin_get_pixels;
 c->clear_blocks = bfin_clear_blocks;
 c->pix_sum = ff_bfin_pix_sum;
 c->pix_norm1 = ff_bfin_pix_norm1;
@@ -231,38 +159,11 @@
 c->sse[1] = ff_bfin_sse8;
 c->sse[2] = ff_bfin_sse4;
 
- if (!high_bit_depth) {
- c->put_pixels_tab[0][0] = bfin_put_pixels16;
- c->put_pixels_tab[0][1] = bfin_put_pixels16_x2;
- c->put_pixels_tab[0][2] = bfin_put_pixels16_y2;
- c->put_pixels_tab[0][3] = bfin_put_pixels16_xy2;
-
- c->put_pixels_tab[1][0] = bfin_put_pixels8;
- c->put_pixels_tab[1][1] = bfin_put_pixels8_x2;
- c->put_pixels_tab[1][2] = bfin_put_pixels8_y2;
- c->put_pixels_tab[1][3] = bfin_put_pixels8_xy2;
-
- c->put_no_rnd_pixels_tab[1][0] = bfin_put_pixels8_nornd;
- c->put_no_rnd_pixels_tab[1][1] = bfin_put_pixels8_x2_nornd;
- c->put_no_rnd_pixels_tab[1][2] = bfin_put_pixels8_y2_nornd;
-/* c->put_no_rnd_pixels_tab[1][3] = ff_bfin_put_pixels8_xy2_nornd; */
-
- c->put_no_rnd_pixels_tab[0][0] = bfin_put_pixels16_nornd;
- c->put_no_rnd_pixels_tab[0][1] = bfin_put_pixels16_x2_nornd;
- c->put_no_rnd_pixels_tab[0][2] = bfin_put_pixels16_y2_nornd;
-/* c->put_no_rnd_pixels_tab[0][3] = ff_bfin_put_pixels16_xy2_nornd; */
- }
-
 if (avctx->bits_per_raw_sample <= 8) {
 if (avctx->dct_algo == FF_DCT_AUTO)
 c->fdct = ff_bfin_fdct;
 
- if (avctx->idct_algo == FF_IDCT_VP3) {
- c->idct_permutation_type = FF_NO_IDCT_PERM;
- c->idct = ff_bfin_vp3_idct;
- c->idct_add = ff_bfin_vp3_idct_add;
- c->idct_put = ff_bfin_vp3_idct_put;
- } else if (avctx->idct_algo == FF_IDCT_AUTO) {
+ if (avctx->idct_algo == FF_IDCT_AUTO) {
 c->idct_permutation_type = FF_NO_IDCT_PERM;
 c->idct = ff_bfin_idct;
 c->idct_add = bfin_idct_add;

libav-v9.6.tar.bz2/libavcodec/bfin/dsputil_bfin.h -> libav-v10.1.tar.bz2/libavcodec/bfin/dsputil_bfin.h Changed

@@ -24,8 +24,9 @@
 #ifndef AVCODEC_BFIN_DSPUTIL_BFIN_H
 #define AVCODEC_BFIN_DSPUTIL_BFIN_H
 
+#include <stdint.h>
+
 #include "config.h"
-#include "libavcodec/dsputil.h"
 
 #if defined(__FDPIC__) && CONFIG_SRAM
 #define attribute_l1_text __attribute__ ((l1_text))
@@ -35,32 +36,18 @@
 #define attribute_l1_data_b
 #endif
 
-void ff_bfin_idct (DCTELEM *block) attribute_l1_text;
-void ff_bfin_fdct (DCTELEM *block) attribute_l1_text;
-void ff_bfin_vp3_idct (DCTELEM *block);
-void ff_bfin_vp3_idct_put (uint8_t *dest, int line_size, DCTELEM *block);
-void ff_bfin_vp3_idct_add (uint8_t *dest, int line_size, DCTELEM *block);
-void ff_bfin_add_pixels_clamped (const DCTELEM *block, uint8_t *dest, int line_size) attribute_l1_text;
-void ff_bfin_put_pixels_clamped (const DCTELEM *block, uint8_t *dest, int line_size) attribute_l1_text;
-void ff_bfin_diff_pixels (DCTELEM *block, const uint8_t *s1, const uint8_t *s2, int stride) attribute_l1_text;
-void ff_bfin_get_pixels (DCTELEM *restrict block, const uint8_t *pixels, int line_size) attribute_l1_text;
+void ff_bfin_idct (int16_t *block) attribute_l1_text;
+void ff_bfin_fdct (int16_t *block) attribute_l1_text;
+void ff_bfin_add_pixels_clamped (const int16_t *block, uint8_t *dest, int line_size) attribute_l1_text;
+void ff_bfin_put_pixels_clamped (const int16_t *block, uint8_t *dest, int line_size) attribute_l1_text;
+void ff_bfin_diff_pixels (int16_t *block, const uint8_t *s1, const uint8_t *s2, int stride) attribute_l1_text;
+void ff_bfin_get_pixels (int16_t *restrict block, const uint8_t *pixels, int line_size) attribute_l1_text;
 int ff_bfin_pix_norm1 (uint8_t * pix, int line_size) attribute_l1_text;
 int ff_bfin_z_sad8x8 (uint8_t *blk1, uint8_t *blk2, int dsz, int line_size, int h) attribute_l1_text;
 int ff_bfin_z_sad16x16 (uint8_t *blk1, uint8_t *blk2, int dsz, int line_size, int h) attribute_l1_text;
 
-void ff_bfin_z_put_pixels16_xy2 (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text;
-void ff_bfin_z_put_pixels8_xy2 (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text;
-void ff_bfin_put_pixels16_xy2_nornd (uint8_t *block, const uint8_t *s0, int line_size, int h) attribute_l1_text;
-void ff_bfin_put_pixels8_xy2_nornd (uint8_t *block, const uint8_t *s0, int line_size, int h) attribute_l1_text;
-
-
 int ff_bfin_pix_sum (uint8_t *p, int stride) attribute_l1_text;
 
-void ff_bfin_put_pixels8uc (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int dest_size, int line_size, int h) attribute_l1_text;
-void ff_bfin_put_pixels16uc (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int dest_size, int line_size, int h) attribute_l1_text;
-void ff_bfin_put_pixels8uc_nornd (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int line_size, int h) attribute_l1_text;
-void ff_bfin_put_pixels16uc_nornd (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int line_size, int h) attribute_l1_text;
-
 int ff_bfin_sse4 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) attribute_l1_text;
 int ff_bfin_sse8 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) attribute_l1_text;
 int ff_bfin_sse16 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) attribute_l1_text;

libav-v9.6.tar.bz2/libavcodec/bfin/fdct_bfin.S -> libav-v10.1.tar.bz2/libavcodec/bfin/fdct_bfin.S Changed

libav-v10.1.tar.bz2/libavcodec/bfin/hpel_pixels_bfin.S Added

@@ -0,0 +1,380 @@
+/*
+ * Blackfin Pixel Operations
+ * Copyright (C) 2007 Marc Hoffman <marc.hoffman@analog.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config_bfin.h"
+
+/*
+ motion compensation
+ primitives
+
+ * Halfpel motion compensation with rounding (a+b+1)>>1.
+ * This is an array[4][4] of motion compensation funcions for 4
+ * horizontal blocksizes (8,16) and the 4 halfpel positions 
+ * *pixels_tab[ 0->16xH 1->8xH ][ xhalfpel + 2*yhalfpel ]
+ * @param block destination where the result is stored
+ * @param pixels source
+ * @param line_size number of bytes in a horizontal line of block
+ * @param h height
+
+*/
+
+DEFUN(put_pixels8uc,mL1,
+ (uint8_t *block, const uint8_t *s0, const uint8_t *s1,
+ int dest_size, int line_size, int h)):
+ i3=r0; // dest
+ i0=r1; // src0
+ i1=r2; // src1
+ r0=[sp+12]; // dest_size
+ r2=[sp+16]; // line_size
+ p0=[sp+20]; // h
+ [--sp] = (r7:6);
+ r0+=-4;
+ m3=r0;
+ r2+=-8;
+ m0=r2;
+ LSETUP(pp8$0,pp8$1) LC0=P0;
+ DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
+
+pp8$0: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
+ R6 = BYTEOP1P(R1:0,R3:2) || R0 = [I0++M0]|| R2 =[I1++M0];
+ R7 = BYTEOP1P(R1:0,R3:2)(R) || R0 = [I0++] || [I3++] = R6 ;
+pp8$1: DISALGNEXCPT || R2 = [I1++] || [I3++M3] = R7;
+
+ (r7:6) = [sp++];
+ RTS;
+DEFUN_END(put_pixels8uc)
+
+DEFUN(put_pixels16uc,mL1,
+ (uint8_t *block, const uint8_t *s0, const uint8_t *s1,
+ int dest_size, int line_size, int h)):
+ link 0;
+ [--sp] = (r7:6);
+ i3=r0; // dest
+ i0=r1; // src0
+ i1=r2; // src1
+ r0=[fp+20]; // dest_size
+ r2=[fp+24]; // line_size
+ p0=[fp+28]; // h
+
+
+ r0+=-12;
+ m3=r0; // line_size
+ r2+=-16;
+ m0=r2;
+
+ LSETUP(pp16$0,pp16$1) LC0=P0;
+ DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
+
+pp16$0: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
+ R6 = BYTEOP1P(R1:0,R3:2) || R0 = [I0++] || R2 =[I1++];
+ R7 = BYTEOP1P(R1:0,R3:2)(R) || R1 = [I0++] || R3 =[I1++];
+ [I3++] = R6;
+ R6 = BYTEOP1P(R1:0,R3:2) || R0 = [I0++M0] || R2 =[I1++M0];
+ R7 = BYTEOP1P(R1:0,R3:2)(R) || R0 = [I0++] || [I3++] = R7 ;
+ [I3++] = R6;
+pp16$1: DISALGNEXCPT || R2 = [I1++] || [I3++M3] = R7;
+
+ (r7:6) = [sp++];
+ unlink;
+ RTS;
+DEFUN_END(put_pixels16uc)
+
+
+
+
+
+
+DEFUN(put_pixels8uc_nornd,mL1,
+ (uint8_t *block, const uint8_t *s0, const uint8_t *s1,
+ int line_size, int h)):
+ i3=r0; // dest
+ i0=r1; // src0
+ i1=r2; // src1
+ r2=[sp+12]; // line_size
+ p0=[sp+16]; // h
+ [--sp] = (r7:6);
+ r2+=-4;
+ m3=r2;
+ r2+=-4;
+ m0=r2;
+ LSETUP(pp8$2,pp8$3) LC0=P0;
+ DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
+
+pp8$2: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
+ R6 = BYTEOP1P(R1:0,R3:2)(T) || R0 = [I0++M0]|| R2 =[I1++M0];
+ R7 = BYTEOP1P(R1:0,R3:2)(T,R) || R0 = [I0++] || [I3++] = R6 ;
+pp8$3: DISALGNEXCPT || R2 = [I1++] || [I3++M3] = R7;
+
+ (r7:6) = [sp++];
+ RTS;
+DEFUN_END(put_pixels8uc_nornd)
+
+DEFUN(put_pixels16uc_nornd,mL1,
+ (uint8_t *block, const uint8_t *s0, const uint8_t *s1,
+ int line_size, int h)):
+ i3=r0; // dest
+ i0=r1; // src0
+ i1=r2; // src1
+ r2=[sp+12]; // line_size
+ p0=[sp+16]; // h
+
+ [--sp] = (r7:6);
+ r2+=-12;
+ m3=r2; // line_size
+ r2+=-4;
+ m0=r2;
+
+ LSETUP(pp16$2,pp16$3) LC0=P0;
+ DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
+
+pp16$2:
+ DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
+ R6 = BYTEOP1P(R1:0,R3:2)(T) || R0 = [I0++] || R2 =[I1++];
+ R7 = BYTEOP1P(R1:0,R3:2)(T,R) || R1 = [I0++] || R3 =[I1++];
+ [I3++] = R6;
+
+ R6 = BYTEOP1P(R1:0,R3:2)(T) || R0 = [I0++M0] || R2 =[I1++M0];
+ R7 = BYTEOP1P(R1:0,R3:2)(T,R) || R0 = [I0++] || [I3++] = R7 ;
+ [I3++] = R6;
+pp16$3: DISALGNEXCPT || R2 = [I1++] || [I3++M3] = R7;
+
+ (r7:6) = [sp++];
+
+ RTS;
+DEFUN_END(put_pixels16uc_nornd)
+
+DEFUN(z_put_pixels16_xy2,mL1,
+ (uint8_t *block, const uint8_t *s0,
+ int dest_size, int line_size, int h)):
+ link 0;
+ [--sp] = (r7:4);
+ i3=r0; // dest
+ i0=r1; // src0--> pixels
+ i1=r1; // src1--> pixels + line_size
+ r2+=-12;
+ m2=r2; // m2=dest_width-4
+ r2=[fp+20];
+ m3=r2; // line_size
+ p0=[fp+24]; // h
+ r2+=-16;
+ i1+=m3; /* src1 + line_size */
+ m0=r2; /* line-size - 20 */
+
+ B0 = I0;
+ B1 = I1;
+ B3 = I3;
+
+ DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
+
+ LSETUP(LS$16E,LE$16E) LC0=P0;
+LS$16E: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
+ R4 = BYTEOP2P (R3:2,R1:0) (RNDL) || R0 = [I0++] || R2 =[I1++];
+ R5 = BYTEOP2P (R3:2,R1:0) (RNDL,R) || R1 = [I0++] || [I3++] = R4 ;
+ DISALGNEXCPT || R3 = [I1++] || [I3++] = R5;
+ R4 = BYTEOP2P (R3:2,R1:0) (RNDL) || R0 = [I0++M0]|| R2 = [I1++M0];
+ R5 = BYTEOP2P (R3:2,R1:0) (RNDL,R) || R0 = [I0++] || [I3++] = R4 ;
+LE$16E: DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5;
+
+ M1 = 1;
+ I3 = B3;
+ I1 = B1;
+ I0 = B0;
+
+ I0 += M1;
+ I1 += M1;
+
+ DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
+ LSETUP(LS$16O,LE$16O) LC0=P0;
+LS$16O: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
+ R4 = BYTEOP2P (R3:2,R1:0) (RNDH) || R0 = [I0++] || R2 =[I1++];
+ R5 = BYTEOP2P (R3:2,R1:0) (RNDH,R) || R1 = [I0++] || R6 =[I3++];
+ R4 = R4 +|+ R6 || R7 = [I3--];
+ R5 = R5 +|+ R7 || [I3++] = R4;
+ DISALGNEXCPT || R3 =[I1++] || [I3++] = R5;
+ R4 = BYTEOP2P (R3:2,R1:0) (RNDH) || R0 = [I0++M0]|| R2 = [I1++M0];
+ R5 = BYTEOP2P (R3:2,R1:0) (RNDH,R) || R0 = [I0++] || R6 = [I3++];
+ R4 = R4 +|+ R6 || R7 = [I3--];
+ R5 = R5 +|+ R7 || [I3++] = R4;
+LE$16O: DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5;
+
+ (r7:4) = [sp++];
+ unlink;
+ rts;
+DEFUN_END(z_put_pixels16_xy2)
+
+DEFUN(put_pixels16_xy2_nornd,mL1,
+ (uint8_t *block, const uint8_t *s0,
+ int line_size, int h)):
+ link 0;
+ [--sp] = (r7:4);
+ i3=r0; // dest
+ i0=r1; // src0--> pixels
+ i1=r1; // src1--> pixels + line_size
+ m3=r2;
+ r2+=-12;
+ m2=r2;
+ r2+=-4;
+ i1+=m3; /* src1 + line_size */
+ m0=r2; /* line-size - 20 */
+ p0=[fp+20]; // h
+
+ B0=I0;
+ B1=I1;
+ B3=I3;
+
+ DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
+
+ LSETUP(LS$16ET,LE$16ET) LC0=P0;
+LS$16ET:DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
+ R4 = BYTEOP2P (R3:2,R1:0) (TL) || R0 = [I0++] || R2 =[I1++];
+ R5 = BYTEOP2P (R3:2,R1:0) (TL,R) || R1 = [I0++] || [I3++] = R4 ;
+ DISALGNEXCPT || R3 = [I1++] || [I3++] = R5;
+ R4 = BYTEOP2P (R3:2,R1:0) (TL) || R0 = [I0++M0]|| R2 = [I1++M0];
+ R5 = BYTEOP2P (R3:2,R1:0) (TL,R) || R0 = [I0++] || [I3++] = R4 ;
+LE$16ET:DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5;
+
+ M1 = 1;
+ I3=B3;
+ I1=B1;
+ I0=B0;
+
+ I0 += M1;
+ I1 += M1;
+
+ DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
+ LSETUP(LS$16OT,LE$16OT) LC0=P0;
+LS$16OT:DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
+ R4 = BYTEOP2P (R3:2,R1:0) (TH) || R0 = [I0++] || R2 =[I1++];
+ R5 = BYTEOP2P (R3:2,R1:0) (TH,R) || R1 = [I0++] || R6 =[I3++];
+ R4 = R4 +|+ R6 || R7 = [I3--];
+ R5 = R5 +|+ R7 || [I3++] = R4;
+ DISALGNEXCPT || R3 =[I1++] || [I3++] = R5;
+ R4 = BYTEOP2P (R3:2,R1:0) (TH) || R0 = [I0++M0]|| R2 = [I1++M0];
+ R5 = BYTEOP2P (R3:2,R1:0) (TH,R) || R0 = [I0++] || R6 = [I3++];
+ R4 = R4 +|+ R6 || R7 = [I3--];
+ R5 = R5 +|+ R7 || [I3++] = R4;
+LE$16OT:DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5;
+
+ (r7:4) = [sp++];
+ unlink;
+ rts;
+DEFUN_END(put_pixels16_xy2_nornd)
+
+DEFUN(z_put_pixels8_xy2,mL1,
+ (uint8_t *block, const uint8_t *s0,
+ int dest_size, int line_size, int h)):
+ link 0;
+ [--sp] = (r7:4);
+ i3=r0; // dest
+ i0=r1; // src0--> pixels
+ i1=r1; // src1--> pixels + line_size
+ r2+=-4;
+ m2=r2; // m2=dest_width-4
+ r2=[fp+20];
+ m3=r2; // line_size
+ p0=[fp+24]; // h
+ r2+=-8;
+ i1+=m3; /* src1 + line_size */
+ m0=r2; /* line-size - 20 */
+
+ b0 = I0;
+ b1 = I1;
+ b3 = I3;
+
+ LSETUP(LS$8E,LE$8E) LC0=P0;
+ DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
+LS$8E: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
+ R4 = BYTEOP2P (R3:2,R1:0) (RNDL) || R0 = [I0++M0] || R2 =[I1++M0];
+ R5 = BYTEOP2P (R3:2,R1:0) (RNDL,R) || R0 = [I0++] || [I3++] = R4 ;
+LE$8E: DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5;
+
+ M1 = 1;
+ I3 = b3;
+ I1 = b1;
+ I0 = b0;
+
+ I0 += M1;
+ I1 += M1;
+
+ LSETUP(LS$8O,LE$8O) LC0=P0;
+ DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
+LS$8O: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
+ R4 = BYTEOP2P (R3:2,R1:0) (RNDH) || R0 = [I0++M0] || R2 =[I1++M0];
+ R5 = BYTEOP2P (R3:2,R1:0) (RNDH,R) || R0 = [I0++] || R6 =[I3++];
+ R4 = R4 +|+ R6 || R7 = [I3--];
+ R5 = R5 +|+ R7 || [I3++] = R4;
+LE$8O: DISALGNEXCPT || R2 =[I1++] || [I3++M2] = R5;
+
+ (r7:4) = [sp++];
+ unlink;
+ rts;
+DEFUN_END(z_put_pixels8_xy2)
+
+DEFUN(put_pixels8_xy2_nornd,mL1,
+ (uint8_t *block, const uint8_t *s0, int line_size, int h)):
+ link 0;
+ [--sp] = (r7:4);
+ i3=r0; // dest
+ i0=r1; // src0--> pixels
+ i1=r1; // src1--> pixels + line_size
+ m3=r2;
+ r2+=-4;
+ m2=r2;
+ r2+=-4;
+ i1+=m3; /* src1 + line_size */
+ m0=r2; /* line-size - 20 */
+ p0=[fp+20]; // h
+
+
+ b0 = I0;
+ b1 = I1;
+ b3 = I3;
+
+ LSETUP(LS$8ET,LE$8ET) LC0=P0;
+ DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
+
+LS$8ET: DISALGNEXCPT || R1 = [I0++] || R3 = [I1++];
+ R4 = BYTEOP2P (R3:2,R1:0) (TL) || R0 = [I0++M0] || R2 = [I1++M0];
+ R5 = BYTEOP2P (R3:2,R1:0) (TL,R) || R0 = [I0++] || [I3++] = R4 ;
+LE$8ET: DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5;
+
+ M1 = 1;
+ I3 = b3;
+ I1 = b1;
+ I0 = b0;
+
+ I0 += M1;
+ I1 += M1;
+
+ LSETUP(LS$8OT,LE$8OT) LC0=P0;
+ DISALGNEXCPT || R0 = [I0++] || R2 = [I1++];
+
+LS$8OT: DISALGNEXCPT || R1 = [I0++] || R3 = [I1++];
+ R4 = BYTEOP2P (R3:2,R1:0) (TH) || R0 = [I0++M0] || R2 = [I1++M0];
+ R5 = BYTEOP2P (R3:2,R1:0) (TH,R) || R0 = [I0++] || R6 = [I3++];
+ R4 = R4 +|+ R6 || R7 = [I3--];
+ R5 = R5 +|+ R7 || [I3++] = R4;
+LE$8OT: DISALGNEXCPT || R2 =[I1++] || [I3++M2] = R5;
+
+ (r7:4) = [sp++];
+ unlink;
+ rts;
+DEFUN_END(put_pixels8_xy2_nornd)

libav-v10.1.tar.bz2/libavcodec/bfin/hpeldsp_bfin.c Added

@@ -0,0 +1,123 @@
+/*
+ * BlackFin DSPUTILS
+ *
+ * Copyright (C) 2007 Marc Hoffman <marc.hoffman@analog.com>
+ * Copyright (c) 2006 Michael Benjamin <michael.benjamin@analog.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 "libavutil/attributes.h"
+#include "libavcodec/hpeldsp.h"
+#include "hpeldsp_bfin.h"
+
+static void bfin_put_pixels8 (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels8uc (block, pixels, pixels, line_size, line_size, h);
+}
+
+static void bfin_put_pixels8_x2(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels8uc (block, pixels, pixels+1, line_size, line_size, h);
+}
+
+static void bfin_put_pixels8_y2 (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels8uc (block, pixels, pixels+line_size, line_size, line_size, h);
+}
+
+static void bfin_put_pixels8_xy2 (uint8_t *block, const uint8_t *s0, ptrdiff_t line_size, int h)
+{
+ ff_bfin_z_put_pixels8_xy2 (block,s0,line_size, line_size, h);
+}
+
+static void bfin_put_pixels16 (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels16uc (block, pixels, pixels, line_size, line_size, h);
+}
+
+static void bfin_put_pixels16_x2 (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels16uc (block, pixels, pixels+1, line_size, line_size, h);
+}
+
+static void bfin_put_pixels16_y2 (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels16uc (block, pixels, pixels+line_size, line_size, line_size, h);
+}
+
+static void bfin_put_pixels16_xy2 (uint8_t *block, const uint8_t *s0, ptrdiff_t line_size, int h)
+{
+ ff_bfin_z_put_pixels16_xy2 (block,s0,line_size, line_size, h);
+}
+
+static void bfin_put_pixels8_nornd (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels8uc_nornd (block, pixels, pixels, line_size, h);
+}
+
+static void bfin_put_pixels8_x2_nornd (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels8uc_nornd (block, pixels, pixels+1, line_size, h);
+}
+
+static void bfin_put_pixels8_y2_nornd (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels8uc_nornd (block, pixels, pixels+line_size, line_size, h);
+}
+
+
+static void bfin_put_pixels16_nornd (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels16uc_nornd (block, pixels, pixels, line_size, h);
+}
+
+static void bfin_put_pixels16_x2_nornd (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels16uc_nornd (block, pixels, pixels+1, line_size, h);
+}
+
+static void bfin_put_pixels16_y2_nornd (uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ ff_bfin_put_pixels16uc_nornd (block, pixels, pixels+line_size, line_size, h);
+}
+
+av_cold void ff_hpeldsp_init_bfin(HpelDSPContext *c, int flags)
+{
+ c->put_pixels_tab[0][0] = bfin_put_pixels16;
+ c->put_pixels_tab[0][1] = bfin_put_pixels16_x2;
+ c->put_pixels_tab[0][2] = bfin_put_pixels16_y2;
+ c->put_pixels_tab[0][3] = bfin_put_pixels16_xy2;
+
+ c->put_pixels_tab[1][0] = bfin_put_pixels8;
+ c->put_pixels_tab[1][1] = bfin_put_pixels8_x2;
+ c->put_pixels_tab[1][2] = bfin_put_pixels8_y2;
+ c->put_pixels_tab[1][3] = bfin_put_pixels8_xy2;
+
+ c->put_no_rnd_pixels_tab[1][0] = bfin_put_pixels8_nornd;
+ c->put_no_rnd_pixels_tab[1][1] = bfin_put_pixels8_x2_nornd;
+ c->put_no_rnd_pixels_tab[1][2] = bfin_put_pixels8_y2_nornd;
+/* c->put_no_rnd_pixels_tab[1][3] = ff_bfin_put_pixels8_xy2_nornd; */
+
+ c->put_no_rnd_pixels_tab[0][0] = bfin_put_pixels16_nornd;
+ c->put_no_rnd_pixels_tab[0][1] = bfin_put_pixels16_x2_nornd;
+ c->put_no_rnd_pixels_tab[0][2] = bfin_put_pixels16_y2_nornd;
+/* c->put_no_rnd_pixels_tab[0][3] = ff_bfin_put_pixels16_xy2_nornd; */
+}

libav-v10.1.tar.bz2/libavcodec/bfin/hpeldsp_bfin.h Added

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2007 Marc Hoffman <mmh@pleasantst.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_BFIN_HPELDSP_BFIN_H
+#define AVCODEC_BFIN_HPELDSP_BFIN_H
+
+#include <stdint.h>
+
+#include "config.h"
+
+#if defined(__FDPIC__) && CONFIG_SRAM
+#define attribute_l1_text __attribute__ ((l1_text))
+#define attribute_l1_data_b __attribute__((l1_data_B))
+#else
+#define attribute_l1_text
+#define attribute_l1_data_b
+#endif
+
+void ff_bfin_z_put_pixels16_xy2 (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text;
+void ff_bfin_z_put_pixels8_xy2 (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text;
+void ff_bfin_put_pixels16_xy2_nornd (uint8_t *block, const uint8_t *s0, int line_size, int h) attribute_l1_text;
+void ff_bfin_put_pixels8_xy2_nornd (uint8_t *block, const uint8_t *s0, int line_size, int h) attribute_l1_text;
+
+
+void ff_bfin_put_pixels8uc (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int dest_size, int line_size, int h) attribute_l1_text;
+void ff_bfin_put_pixels16uc (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int dest_size, int line_size, int h) attribute_l1_text;
+void ff_bfin_put_pixels8uc_nornd (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int line_size, int h) attribute_l1_text;
+void ff_bfin_put_pixels16uc_nornd (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int line_size, int h) attribute_l1_text;
+
+#endif /* AVCODEC_BFIN_HPELDSP_BFIN_H */

libav-v9.6.tar.bz2/libavcodec/bfin/idct_bfin.S -> libav-v10.1.tar.bz2/libavcodec/bfin/idct_bfin.S Changed

libav-v9.6.tar.bz2/libavcodec/bfin/pixels_bfin.S -> libav-v10.1.tar.bz2/libavcodec/bfin/pixels_bfin.S Changed

@@ -21,7 +21,7 @@
 #include "config_bfin.h"
 
 DEFUN(put_pixels_clamped,mL1,
- (DCTELEM *block, uint8_t *dest, int line_size)):
+ (int16_t *block, uint8_t *dest, int line_size)):
 [--SP] = (R7:4);
 R4 = 0;
 R5.l = 0x00ff;
@@ -51,7 +51,7 @@
 DEFUN_END(put_pixels_clamped)
 
 DEFUN(add_pixels_clamped,mL1,
- (DCTELEM *block, uint8_t *dest, int line_size)):
+ (int16_t *block, uint8_t *dest, int line_size)):
 [-- SP] = (R7:4);
 R4 = 0;
 I0 = 0;
@@ -83,366 +83,8 @@
 RTS;
 DEFUN_END(add_pixels_clamped)
 
-
-/*
- motion compensation
- primitives
-
- * Halfpel motion compensation with rounding (a+b+1)>>1.
- * This is an array[4][4] of motion compensation funcions for 4
- * horizontal blocksizes (8,16) and the 4 halfpel positions 
- * *pixels_tab[ 0->16xH 1->8xH ][ xhalfpel + 2*yhalfpel ]
- * @param block destination where the result is stored
- * @param pixels source
- * @param line_size number of bytes in a horizontal line of block
- * @param h height
-
-*/
-
-DEFUN(put_pixels8uc,mL1,
- (uint8_t *block, const uint8_t *s0, const uint8_t *s1,
- int dest_size, int line_size, int h)):
- i3=r0; // dest
- i0=r1; // src0
- i1=r2; // src1
- r0=[sp+12]; // dest_size
- r2=[sp+16]; // line_size
- p0=[sp+20]; // h
- [--sp] = (r7:6);
- r0+=-4;
- m3=r0;
- r2+=-8;
- m0=r2;
- LSETUP(pp8$0,pp8$1) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-
-pp8$0: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R6 = BYTEOP1P(R1:0,R3:2) || R0 = [I0++M0]|| R2 =[I1++M0];
- R7 = BYTEOP1P(R1:0,R3:2)(R) || R0 = [I0++] || [I3++] = R6 ;
-pp8$1: DISALGNEXCPT || R2 = [I1++] || [I3++M3] = R7;
-
- (r7:6) = [sp++];
- RTS;
-DEFUN_END(put_pixels8uc)
-
-DEFUN(put_pixels16uc,mL1,
- (uint8_t *block, const uint8_t *s0, const uint8_t *s1,
- int dest_size, int line_size, int h)):
- link 0;
- [--sp] = (r7:6);
- i3=r0; // dest
- i0=r1; // src0
- i1=r2; // src1
- r0=[fp+20]; // dest_size
- r2=[fp+24]; // line_size
- p0=[fp+28]; // h
-
-
- r0+=-12;
- m3=r0; // line_size
- r2+=-16;
- m0=r2;
-
- LSETUP(pp16$0,pp16$1) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-
-pp16$0: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R6 = BYTEOP1P(R1:0,R3:2) || R0 = [I0++] || R2 =[I1++];
- R7 = BYTEOP1P(R1:0,R3:2)(R) || R1 = [I0++] || R3 =[I1++];
- [I3++] = R6;
- R6 = BYTEOP1P(R1:0,R3:2) || R0 = [I0++M0] || R2 =[I1++M0];
- R7 = BYTEOP1P(R1:0,R3:2)(R) || R0 = [I0++] || [I3++] = R7 ;
- [I3++] = R6;
-pp16$1: DISALGNEXCPT || R2 = [I1++] || [I3++M3] = R7;
-
- (r7:6) = [sp++];
- unlink;
- RTS;
-DEFUN_END(put_pixels16uc)
-
-
-
-
-
-
-DEFUN(put_pixels8uc_nornd,mL1,
- (uint8_t *block, const uint8_t *s0, const uint8_t *s1,
- int line_size, int h)):
- i3=r0; // dest
- i0=r1; // src0
- i1=r2; // src1
- r2=[sp+12]; // line_size
- p0=[sp+16]; // h
- [--sp] = (r7:6);
- r2+=-4;
- m3=r2;
- r2+=-4;
- m0=r2;
- LSETUP(pp8$2,pp8$3) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-
-pp8$2: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R6 = BYTEOP1P(R1:0,R3:2)(T) || R0 = [I0++M0]|| R2 =[I1++M0];
- R7 = BYTEOP1P(R1:0,R3:2)(T,R) || R0 = [I0++] || [I3++] = R6 ;
-pp8$3: DISALGNEXCPT || R2 = [I1++] || [I3++M3] = R7;
-
- (r7:6) = [sp++];
- RTS;
-DEFUN_END(put_pixels8uc_nornd)
-
-DEFUN(put_pixels16uc_nornd,mL1,
- (uint8_t *block, const uint8_t *s0, const uint8_t *s1,
- int line_size, int h)):
- i3=r0; // dest
- i0=r1; // src0
- i1=r2; // src1
- r2=[sp+12]; // line_size
- p0=[sp+16]; // h
-
- [--sp] = (r7:6);
- r2+=-12;
- m3=r2; // line_size
- r2+=-4;
- m0=r2;
-
- LSETUP(pp16$2,pp16$3) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-
-pp16$2:
- DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R6 = BYTEOP1P(R1:0,R3:2)(T) || R0 = [I0++] || R2 =[I1++];
- R7 = BYTEOP1P(R1:0,R3:2)(T,R) || R1 = [I0++] || R3 =[I1++];
- [I3++] = R6;
-
- R6 = BYTEOP1P(R1:0,R3:2)(T) || R0 = [I0++M0] || R2 =[I1++M0];
- R7 = BYTEOP1P(R1:0,R3:2)(T,R) || R0 = [I0++] || [I3++] = R7 ;
- [I3++] = R6;
-pp16$3: DISALGNEXCPT || R2 = [I1++] || [I3++M3] = R7;
-
- (r7:6) = [sp++];
-
- RTS;
-DEFUN_END(put_pixels16uc_nornd)
-
-DEFUN(z_put_pixels16_xy2,mL1,
- (uint8_t *block, const uint8_t *s0,
- int dest_size, int line_size, int h)):
- link 0;
- [--sp] = (r7:4);
- i3=r0; // dest
- i0=r1; // src0--> pixels
- i1=r1; // src1--> pixels + line_size
- r2+=-12;
- m2=r2; // m2=dest_width-4
- r2=[fp+20];
- m3=r2; // line_size
- p0=[fp+24]; // h
- r2+=-16;
- i1+=m3; /* src1 + line_size */
- m0=r2; /* line-size - 20 */
-
- B0 = I0;
- B1 = I1;
- B3 = I3;
-
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-
- LSETUP(LS$16E,LE$16E) LC0=P0;
-LS$16E: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R4 = BYTEOP2P (R3:2,R1:0) (RNDL) || R0 = [I0++] || R2 =[I1++];
- R5 = BYTEOP2P (R3:2,R1:0) (RNDL,R) || R1 = [I0++] || [I3++] = R4 ;
- DISALGNEXCPT || R3 = [I1++] || [I3++] = R5;
- R4 = BYTEOP2P (R3:2,R1:0) (RNDL) || R0 = [I0++M0]|| R2 = [I1++M0];
- R5 = BYTEOP2P (R3:2,R1:0) (RNDL,R) || R0 = [I0++] || [I3++] = R4 ;
-LE$16E: DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5;
-
- M1 = 1;
- I3 = B3;
- I1 = B1;
- I0 = B0;
-
- I0 += M1;
- I1 += M1;
-
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
- LSETUP(LS$16O,LE$16O) LC0=P0;
-LS$16O: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R4 = BYTEOP2P (R3:2,R1:0) (RNDH) || R0 = [I0++] || R2 =[I1++];
- R5 = BYTEOP2P (R3:2,R1:0) (RNDH,R) || R1 = [I0++] || R6 =[I3++];
- R4 = R4 +|+ R6 || R7 = [I3--];
- R5 = R5 +|+ R7 || [I3++] = R4;
- DISALGNEXCPT || R3 =[I1++] || [I3++] = R5;
- R4 = BYTEOP2P (R3:2,R1:0) (RNDH) || R0 = [I0++M0]|| R2 = [I1++M0];
- R5 = BYTEOP2P (R3:2,R1:0) (RNDH,R) || R0 = [I0++] || R6 = [I3++];
- R4 = R4 +|+ R6 || R7 = [I3--];
- R5 = R5 +|+ R7 || [I3++] = R4;
-LE$16O: DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5;
-
- (r7:4) = [sp++];
- unlink;
- rts;
-DEFUN_END(z_put_pixels16_xy2)
-
-DEFUN(put_pixels16_xy2_nornd,mL1,
- (uint8_t *block, const uint8_t *s0,
- int line_size, int h)):
- link 0;
- [--sp] = (r7:4);
- i3=r0; // dest
- i0=r1; // src0--> pixels
- i1=r1; // src1--> pixels + line_size
- m3=r2;
- r2+=-12;
- m2=r2;
- r2+=-4;
- i1+=m3; /* src1 + line_size */
- m0=r2; /* line-size - 20 */
- p0=[fp+20]; // h
-
- B0=I0;
- B1=I1;
- B3=I3;
-
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-
- LSETUP(LS$16ET,LE$16ET) LC0=P0;
-LS$16ET:DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R4 = BYTEOP2P (R3:2,R1:0) (TL) || R0 = [I0++] || R2 =[I1++];
- R5 = BYTEOP2P (R3:2,R1:0) (TL,R) || R1 = [I0++] || [I3++] = R4 ;
- DISALGNEXCPT || R3 = [I1++] || [I3++] = R5;
- R4 = BYTEOP2P (R3:2,R1:0) (TL) || R0 = [I0++M0]|| R2 = [I1++M0];
- R5 = BYTEOP2P (R3:2,R1:0) (TL,R) || R0 = [I0++] || [I3++] = R4 ;
-LE$16ET:DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5;
-
- M1 = 1;
- I3=B3;
- I1=B1;
- I0=B0;
-
- I0 += M1;
- I1 += M1;
-
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
- LSETUP(LS$16OT,LE$16OT) LC0=P0;
-LS$16OT:DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R4 = BYTEOP2P (R3:2,R1:0) (TH) || R0 = [I0++] || R2 =[I1++];
- R5 = BYTEOP2P (R3:2,R1:0) (TH,R) || R1 = [I0++] || R6 =[I3++];
- R4 = R4 +|+ R6 || R7 = [I3--];
- R5 = R5 +|+ R7 || [I3++] = R4;
- DISALGNEXCPT || R3 =[I1++] || [I3++] = R5;
- R4 = BYTEOP2P (R3:2,R1:0) (TH) || R0 = [I0++M0]|| R2 = [I1++M0];
- R5 = BYTEOP2P (R3:2,R1:0) (TH,R) || R0 = [I0++] || R6 = [I3++];
- R4 = R4 +|+ R6 || R7 = [I3--];
- R5 = R5 +|+ R7 || [I3++] = R4;
-LE$16OT:DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5;
-
- (r7:4) = [sp++];
- unlink;
- rts;
-DEFUN_END(put_pixels16_xy2_nornd)
-
-DEFUN(z_put_pixels8_xy2,mL1,
- (uint8_t *block, const uint8_t *s0,
- int dest_size, int line_size, int h)):
- link 0;
- [--sp] = (r7:4);
- i3=r0; // dest
- i0=r1; // src0--> pixels
- i1=r1; // src1--> pixels + line_size
- r2+=-4;
- m2=r2; // m2=dest_width-4
- r2=[fp+20];
- m3=r2; // line_size
- p0=[fp+24]; // h
- r2+=-8;
- i1+=m3; /* src1 + line_size */
- m0=r2; /* line-size - 20 */
-
- b0 = I0;
- b1 = I1;
- b3 = I3;
-
- LSETUP(LS$8E,LE$8E) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-LS$8E: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R4 = BYTEOP2P (R3:2,R1:0) (RNDL) || R0 = [I0++M0] || R2 =[I1++M0];
- R5 = BYTEOP2P (R3:2,R1:0) (RNDL,R) || R0 = [I0++] || [I3++] = R4 ;
-LE$8E: DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5;
-
- M1 = 1;
- I3 = b3;
- I1 = b1;
- I0 = b0;
-
- I0 += M1;
- I1 += M1;
-
- LSETUP(LS$8O,LE$8O) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-LS$8O: DISALGNEXCPT || R1 = [I0++] || R3 =[I1++];
- R4 = BYTEOP2P (R3:2,R1:0) (RNDH) || R0 = [I0++M0] || R2 =[I1++M0];
- R5 = BYTEOP2P (R3:2,R1:0) (RNDH,R) || R0 = [I0++] || R6 =[I3++];
- R4 = R4 +|+ R6 || R7 = [I3--];
- R5 = R5 +|+ R7 || [I3++] = R4;
-LE$8O: DISALGNEXCPT || R2 =[I1++] || [I3++M2] = R5;
-
- (r7:4) = [sp++];
- unlink;
- rts;
-DEFUN_END(z_put_pixels8_xy2)
-
-DEFUN(put_pixels8_xy2_nornd,mL1,
- (uint8_t *block, const uint8_t *s0, int line_size, int h)):
- link 0;
- [--sp] = (r7:4);
- i3=r0; // dest
- i0=r1; // src0--> pixels
- i1=r1; // src1--> pixels + line_size
- m3=r2;
- r2+=-4;
- m2=r2;
- r2+=-4;
- i1+=m3; /* src1 + line_size */
- m0=r2; /* line-size - 20 */
- p0=[fp+20]; // h
-
-
- b0 = I0;
- b1 = I1;
- b3 = I3;
-
- LSETUP(LS$8ET,LE$8ET) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 =[I1++];
-
-LS$8ET: DISALGNEXCPT || R1 = [I0++] || R3 = [I1++];
- R4 = BYTEOP2P (R3:2,R1:0) (TL) || R0 = [I0++M0] || R2 = [I1++M0];
- R5 = BYTEOP2P (R3:2,R1:0) (TL,R) || R0 = [I0++] || [I3++] = R4 ;
-LE$8ET: DISALGNEXCPT || R2 = [I1++] || [I3++M2] = R5;
-
- M1 = 1;
- I3 = b3;
- I1 = b1;
- I0 = b0;
-
- I0 += M1;
- I1 += M1;
-
- LSETUP(LS$8OT,LE$8OT) LC0=P0;
- DISALGNEXCPT || R0 = [I0++] || R2 = [I1++];
-
-LS$8OT: DISALGNEXCPT || R1 = [I0++] || R3 = [I1++];
- R4 = BYTEOP2P (R3:2,R1:0) (TH) || R0 = [I0++M0] || R2 = [I1++M0];
- R5 = BYTEOP2P (R3:2,R1:0) (TH,R) || R0 = [I0++] || R6 = [I3++];
- R4 = R4 +|+ R6 || R7 = [I3--];
- R5 = R5 +|+ R7 || [I3++] = R4;
-LE$8OT: DISALGNEXCPT || R2 =[I1++] || [I3++M2] = R5;
-
- (r7:4) = [sp++];
- unlink;
- rts;
-
 DEFUN(diff_pixels,mL1,
- (DCTELEM *block, uint8_t *s1, uint8_t *s2, int stride)):
+ (int16_t *block, uint8_t *s1, uint8_t *s2, int stride)):
 link 0;
 [--sp] = (r7:4);
 p0=8;
@@ -467,7 +109,7 @@
 (r7:4) = [sp++];
 unlink;
 rts;
-DEFUN_END(put_pixels8_xy2_nornd)
+DEFUN_END(diff_pixels)
 
 /*
 for (i = 0; i < 16; i++) {
@@ -518,7 +160,7 @@
 
 
 DEFUN(get_pixels,mL1,
- (DCTELEM *restrict block, const uint8_t *pixels, int line_size)):
+ (int16_t *restrict block, const uint8_t *pixels, int line_size)):
 [--sp] = (r7:4);
 i3=r0; // dest
 i0=r1; // src0

libav-v9.6.tar.bz2/libavcodec/bfin/vp3_bfin.c -> libav-v10.1.tar.bz2/libavcodec/bfin/vp3_bfin.c Changed

@@ -18,26 +18,48 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include <string.h>
+
+#include "libavutil/attributes.h"
 #include "libavcodec/avcodec.h"
+#include "libavcodec/vp3dsp.h"
 #include "libavcodec/dsputil.h"
 #include "dsputil_bfin.h"
+#include "vp3_bfin.h"
 
 /* Intra iDCT offset 128 */
-void ff_bfin_vp3_idct_put (uint8_t *dest, int line_size, DCTELEM *block)
+static void bfin_vp3_idct_put(uint8_t *dest, int line_size, int16_t *block)
 {
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP + 128;
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP + 128;
 int i,j;
 
 ff_bfin_vp3_idct (block);
 
 for (i=0;i<8;i++)
 for (j=0;j<8;j++)
- dest[line_size*i+j]=cm[block[i*8+j]];
+ dest[line_size*i + j] = cm[block[j*8 + i]];
+
+ memset(block, 0, 128);
 }
 
 /* Inter iDCT */
-void ff_bfin_vp3_idct_add (uint8_t *dest, int line_size, DCTELEM *block)
+static void bfin_vp3_idct_add(uint8_t *dest, int line_size, int16_t *block)
 {
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ int i, j;
+
 ff_bfin_vp3_idct (block);
- ff_bfin_add_pixels_clamped (block, dest, line_size);
+ for (i = 0; i < 8; i++)
+ for (j = 0; j < 8; j++)
+ dest[line_size*i + j] = cm[dest[line_size*i + j] + block[j*8 + i]];
+
+ memset(block, 0, 128);
+}
+
+av_cold void ff_vp3dsp_init_bfin(VP3DSPContext *c, int flags)
+{
+ if (!(flags & CODEC_FLAG_BITEXACT)) {
+ c->idct_add = bfin_vp3_idct_add;
+ c->idct_put = bfin_vp3_idct_put;
+ }
 }

libav-v10.1.tar.bz2/libavcodec/bfin/vp3_bfin.h Added

libav-v9.6.tar.bz2/libavcodec/bfin/vp3_idct_bfin.S -> libav-v10.1.tar.bz2/libavcodec/bfin/vp3_idct_bfin.S Changed

libav-v9.6.tar.bz2/libavcodec/bgmc.c -> libav-v10.1.tar.bz2/libavcodec/bgmc.c Changed

@@ -25,6 +25,7 @@
 * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
 */
 
+#include "libavutil/attributes.h"
 #include "bgmc.h"
 
 #define FREQ_BITS 14 // bits used by frequency counters
@@ -456,7 +457,8 @@
 
 
 /** Initialize the lookup table arrays */
-int ff_bgmc_init(AVCodecContext *avctx, uint8_t **cf_lut, int **cf_lut_status)
+av_cold int ff_bgmc_init(AVCodecContext *avctx,
+ uint8_t **cf_lut, int **cf_lut_status)
 {
 *cf_lut = av_malloc(sizeof(*cf_lut) * LUT_BUFF * 16 * LUT_SIZE);
 *cf_lut_status = av_malloc(sizeof(*cf_lut_status) * LUT_BUFF);
@@ -475,7 +477,7 @@
 
 
 /** Release the lookup table arrays */
-void ff_bgmc_end(uint8_t **cf_lut, int **cf_lut_status)
+av_cold void ff_bgmc_end(uint8_t **cf_lut, int **cf_lut_status)
 {
 av_freep(cf_lut);
 av_freep(cf_lut_status);
@@ -483,8 +485,8 @@
 
 
 /** Initialize decoding and reads the first value */
-void ff_bgmc_decode_init(GetBitContext *gb, unsigned int *h, unsigned int *l,
- unsigned int *v)
+void ff_bgmc_decode_init(GetBitContext *gb, unsigned int *h,
+ unsigned int *l, unsigned int *v)
 {
 *h = TOP_VALUE;
 *l = 0;

libav-v9.6.tar.bz2/libavcodec/bink.c -> libav-v10.1.tar.bz2/libavcodec/bink.c Changed

@@ -20,11 +20,14 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "libavutil/attributes.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/internal.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "binkdata.h"
 #include "binkdsp.h"
+#include "hpeldsp.h"
 #include "internal.h"
 #include "mathops.h"
 
@@ -111,8 +114,9 @@
 typedef struct BinkContext {
 AVCodecContext *avctx;
 DSPContext dsp;
+ HpelDSPContext hdsp;
 BinkDSPContext bdsp;
- AVFrame pic, last;
+ AVFrame *last;
 int version; ///< internal Bink file version
 int has_alpha;
 int swap_planes;
@@ -313,7 +317,7 @@
 dec_end = b->cur_dec + t;
 if (dec_end > b->data_end) {
 av_log(avctx, AV_LOG_ERROR, "Run value went out of bounds\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (get_bits1(gb)) {
 v = get_bits(gb, 4);
@@ -335,7 +339,7 @@
 dec_end = b->cur_dec + t;
 if (dec_end > b->data_end) {
 av_log(avctx, AV_LOG_ERROR, "Too many motion values\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (get_bits1(gb)) {
 v = get_bits(gb, 4);
@@ -370,7 +374,7 @@
 dec_end = b->cur_dec + t;
 if (dec_end > b->data_end) {
 av_log(avctx, AV_LOG_ERROR, "Too many block type values\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (get_bits1(gb)) {
 v = get_bits(gb, 4);
@@ -386,7 +390,7 @@
 int run = bink_rlelens[v - 12];
 
 if (dec_end - b->cur_dec < run)
- return -1;
+ return AVERROR_INVALIDDATA;
 memset(b->cur_dec, last, run);
 b->cur_dec += run;
 }
@@ -404,7 +408,7 @@
 dec_end = b->cur_dec + t;
 if (dec_end > b->data_end) {
 av_log(avctx, AV_LOG_ERROR, "Too many pattern values\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 while (b->cur_dec < dec_end) {
 v = GET_HUFF(gb, b->tree);
@@ -424,7 +428,7 @@
 dec_end = b->cur_dec + t;
 if (dec_end > b->data_end) {
 av_log(c->avctx, AV_LOG_ERROR, "Too many color values\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (get_bits1(gb)) {
 c->col_lastval = GET_HUFF(gb, c->col_high[c->col_lastval]);
@@ -470,13 +474,13 @@
 v = (v ^ sign) - sign;
 }
 if (dst_end - dst < 1)
- return -1;
+ return AVERROR_INVALIDDATA;
 *dst++ = v;
 len--;
 for (i = 0; i < len; i += 8) {
 len2 = FFMIN(len - i, 8);
 if (dst_end - dst < len2)
- return -1;
+ return AVERROR_INVALIDDATA;
 bsize = get_bits(gb, 4);
 if (bsize) {
 for (j = 0; j < len2; j++) {
@@ -489,7 +493,7 @@
 *dst++ = v;
 if (v < -32768 || v > 32767) {
 av_log(avctx, AV_LOG_ERROR, "DC value went out of bounds: %d\n", v);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 } else {
@@ -521,14 +525,14 @@
 return ret;
 }
 
-static void binkb_init_bundle(BinkContext *c, int bundle_num)
+static av_cold void binkb_init_bundle(BinkContext *c, int bundle_num)
 {
 c->bundle[bundle_num].cur_dec =
 c->bundle[bundle_num].cur_ptr = c->bundle[bundle_num].data;
 c->bundle[bundle_num].len = 13;
 }
 
-static void binkb_init_bundles(BinkContext *c)
+static av_cold void binkb_init_bundles(BinkContext *c)
 {
 int i;
 for (i = 0; i < BINKB_NB_SRC; i++)
@@ -545,7 +549,7 @@
 
 CHECK_READ_VAL(gb, b, len);
 if (b->data_end - b->cur_dec < len * (1 + (bits > 8)))
- return -1;
+ return AVERROR_INVALIDDATA;
 if (bits <= 8) {
 if (!issigned) {
 for (i = 0; i < len; i++)
@@ -677,6 +681,9 @@
 quant_idx = q;
 }
 
+ if (quant_idx >= 16)
+ return AVERROR_INVALIDDATA;
+
 quant = quant_matrices[quant_idx];
 
 block[0] = (block[0] * quant[0]) >> 11;
@@ -696,7 +703,7 @@
 * @param masks_count number of masks to decode
 * @return 0 on success, negative value in other cases
 */
-static int read_residue(GetBitContext *gb, DCTELEM block[64], int masks_count)
+static int read_residue(GetBitContext *gb, int16_t block[64], int masks_count)
 {
 int coef_list[128];
 int mode_list[128];
@@ -791,39 +798,39 @@
 memcpy(dst + i*stride, tmp + i*8, 8);
 }
 
-static int binkb_decode_plane(BinkContext *c, GetBitContext *gb, int plane_idx,
- int is_key, int is_chroma)
+static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb,
+ int plane_idx, int is_key, int is_chroma)
 {
- int blk;
+ int blk, ret;
 int i, j, bx, by;
 uint8_t *dst, *ref, *ref_start, *ref_end;
 int v, col[2];
 const uint8_t *scan;
 int xoff, yoff;
- LOCAL_ALIGNED_16(DCTELEM, block, [64]);
+ LOCAL_ALIGNED_16(int16_t, block, [64]);
 LOCAL_ALIGNED_16(int32_t, dctblock, [64]);
 int coordmap[64];
 int ybias = is_key ? -15 : 0;
 int qp;
 
- const int stride = c->pic.linesize[plane_idx];
+ const int stride = frame->linesize[plane_idx];
 int bw = is_chroma ? (c->avctx->width + 15) >> 4 : (c->avctx->width + 7) >> 3;
 int bh = is_chroma ? (c->avctx->height + 15) >> 4 : (c->avctx->height + 7) >> 3;
 
 binkb_init_bundles(c);
- ref_start = c->pic.data[plane_idx];
- ref_end = c->pic.data[plane_idx] + (bh * c->pic.linesize[plane_idx] + bw) * 8;
+ ref_start = frame->data[plane_idx];
+ ref_end = frame->data[plane_idx] + (bh * frame->linesize[plane_idx] + bw) * 8;
 
 for (i = 0; i < 64; i++)
 coordmap[i] = (i & 7) + (i >> 3) * stride;
 
 for (by = 0; by < bh; by++) {
 for (i = 0; i < BINKB_NB_SRC; i++) {
- if (binkb_read_bundle(c, gb, i) < 0)
- return -1;
+ if ((ret = binkb_read_bundle(c, gb, i)) < 0)
+ return ret;
 }
 
- dst = c->pic.data[plane_idx] + 8*by*stride;
+ dst = frame->data[plane_idx] + 8*by*stride;
 for (bx = 0; bx < bw; bx++, dst += 8) {
 blk = binkb_get_value(c, BINKB_SRC_BLOCK_TYPES);
 switch (blk) {
@@ -841,7 +848,7 @@
 i += run;
 if (i > 64) {
 av_log(c->avctx, AV_LOG_ERROR, "Run went out of bounds\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (mode) {
 v = binkb_get_value(c, BINKB_SRC_COLORS);
@@ -869,7 +876,7 @@
 if (ref < ref_start || ref + 8*stride > ref_end) {
 av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n");
 } else if (ref + 8*stride < dst || ref >= dst + 8*stride) {
- c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8);
+ c->hdsp.put_pixels_tab[1][0](dst, ref, stride, 8);
 } else {
 put_pixels8x8_overlapped(dst, ref, stride);
 }
@@ -885,7 +892,7 @@
 if (ref < ref_start || ref + 8 * stride > ref_end) {
 av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n");
 } else if (ref + 8*stride < dst || ref >= dst + 8*stride) {
- c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8);
+ c->hdsp.put_pixels_tab[1][0](dst, ref, stride, 8);
 } else {
 put_pixels8x8_overlapped(dst, ref, stride);
 }
@@ -915,7 +922,7 @@
 if (ref < ref_start || ref + 8 * stride > ref_end) {
 av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n");
 } else if (ref + 8*stride < dst || ref >= dst + 8*stride) {
- c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8);
+ c->hdsp.put_pixels_tab[1][0](dst, ref, stride, 8);
 } else {
 put_pixels8x8_overlapped(dst, ref, stride);
 }
@@ -927,7 +934,7 @@
 break;
 default:
 av_log(c->avctx, AV_LOG_ERROR, "Unknown block type %d\n", blk);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 }
@@ -937,21 +944,21 @@
 return 0;
 }
 
-static int bink_decode_plane(BinkContext *c, GetBitContext *gb, int plane_idx,
- int is_chroma)
+static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb,
+ int plane_idx, int is_chroma)
 {
- int blk;
+ int blk, ret;
 int i, j, bx, by;
 uint8_t *dst, *prev, *ref, *ref_start, *ref_end;
 int v, col[2];
 const uint8_t *scan;
 int xoff, yoff;
- LOCAL_ALIGNED_16(DCTELEM, block, [64]);
+ LOCAL_ALIGNED_16(int16_t, block, [64]);
 LOCAL_ALIGNED_16(uint8_t, ublock, [64]);
 LOCAL_ALIGNED_16(int32_t, dctblock, [64]);
 int coordmap[64];
 
- const int stride = c->pic.linesize[plane_idx];
+ const int stride = frame->linesize[plane_idx];
 int bw = is_chroma ? (c->avctx->width + 15) >> 4 : (c->avctx->width + 7) >> 3;
 int bh = is_chroma ? (c->avctx->height + 15) >> 4 : (c->avctx->height + 7) >> 3;
 int width = c->avctx->width >> is_chroma;
@@ -960,39 +967,39 @@
 for (i = 0; i < BINK_NB_SRC; i++)
 read_bundle(gb, c, i);
 
- ref_start = c->last.data[plane_idx] ? c->last.data[plane_idx]
- : c->pic.data[plane_idx];
+ ref_start = c->last->data[plane_idx] ? c->last->data[plane_idx]
+ : frame->data[plane_idx];
 ref_end = ref_start
- + (bw - 1 + c->last.linesize[plane_idx] * (bh - 1)) * 8;
+ + (bw - 1 + c->last->linesize[plane_idx] * (bh - 1)) * 8;
 
 for (i = 0; i < 64; i++)
 coordmap[i] = (i & 7) + (i >> 3) * stride;
 
 for (by = 0; by < bh; by++) {
- if (read_block_types(c->avctx, gb, &c->bundle[BINK_SRC_BLOCK_TYPES]) < 0)
- return -1;
- if (read_block_types(c->avctx, gb, &c->bundle[BINK_SRC_SUB_BLOCK_TYPES]) < 0)
- return -1;
- if (read_colors(gb, &c->bundle[BINK_SRC_COLORS], c) < 0)
- return -1;
- if (read_patterns(c->avctx, gb, &c->bundle[BINK_SRC_PATTERN]) < 0)
- return -1;
- if (read_motion_values(c->avctx, gb, &c->bundle[BINK_SRC_X_OFF]) < 0)
- return -1;
- if (read_motion_values(c->avctx, gb, &c->bundle[BINK_SRC_Y_OFF]) < 0)
- return -1;
- if (read_dcs(c->avctx, gb, &c->bundle[BINK_SRC_INTRA_DC], DC_START_BITS, 0) < 0)
- return -1;
- if (read_dcs(c->avctx, gb, &c->bundle[BINK_SRC_INTER_DC], DC_START_BITS, 1) < 0)
- return -1;
- if (read_runs(c->avctx, gb, &c->bundle[BINK_SRC_RUN]) < 0)
- return -1;
+ if ((ret = read_block_types(c->avctx, gb, &c->bundle[BINK_SRC_BLOCK_TYPES])) < 0)
+ return ret;
+ if ((ret = read_block_types(c->avctx, gb, &c->bundle[BINK_SRC_SUB_BLOCK_TYPES])) < 0)
+ return ret;
+ if ((ret = read_colors(gb, &c->bundle[BINK_SRC_COLORS], c)) < 0)
+ return ret;
+ if ((ret = read_patterns(c->avctx, gb, &c->bundle[BINK_SRC_PATTERN])) < 0)
+ return ret;
+ if ((ret = read_motion_values(c->avctx, gb, &c->bundle[BINK_SRC_X_OFF])) < 0)
+ return ret;
+ if ((ret = read_motion_values(c->avctx, gb, &c->bundle[BINK_SRC_Y_OFF])) < 0)
+ return ret;
+ if ((ret = read_dcs(c->avctx, gb, &c->bundle[BINK_SRC_INTRA_DC], DC_START_BITS, 0)) < 0)
+ return ret;
+ if ((ret = read_dcs(c->avctx, gb, &c->bundle[BINK_SRC_INTER_DC], DC_START_BITS, 1)) < 0)
+ return ret;
+ if ((ret = read_runs(c->avctx, gb, &c->bundle[BINK_SRC_RUN])) < 0)
+ return ret;
 
 if (by == bh)
 break;
- dst = c->pic.data[plane_idx] + 8*by*stride;
- prev = (c->last.data[plane_idx] ? c->last.data[plane_idx]
- : c->pic.data[plane_idx]) + 8*by*stride;
+ dst = frame->data[plane_idx] + 8*by*stride;
+ prev = (c->last->data[plane_idx] ? c->last->data[plane_idx]
+ : frame->data[plane_idx]) + 8*by*stride;
 for (bx = 0; bx < bw; bx++, dst += 8, prev += 8) {
 blk = get_value(c, BINK_SRC_BLOCK_TYPES);
 // 16x16 block type on odd line means part of the already decoded block, so skip it
@@ -1004,7 +1011,7 @@
 }
 switch (blk) {
 case SKIP_BLOCK:
- c->dsp.put_pixels_tab[1][0](dst, prev, stride, 8);
+ c->hdsp.put_pixels_tab[1][0](dst, prev, stride, 8);
 break;
 case SCALED_BLOCK:
 blk = get_value(c, BINK_SRC_SUB_BLOCK_TYPES);
@@ -1018,7 +1025,7 @@
 i += run;
 if (i > 64) {
 av_log(c->avctx, AV_LOG_ERROR, "Run went out of bounds\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (get_bits1(gb)) {
 v = get_value(c, BINK_SRC_COLORS);
@@ -1058,7 +1065,7 @@
 break;
 default:
 av_log(c->avctx, AV_LOG_ERROR, "Incorrect 16x16 block type %d\n", blk);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (blk != FILL_BLOCK)
 c->bdsp.scale_block(ublock, dst, stride);
@@ -1073,9 +1080,9 @@
 if (ref < ref_start || ref > ref_end) {
 av_log(c->avctx, AV_LOG_ERROR, "Copy out of bounds @%d, %d\n",
 bx*8 + xoff, by*8 + yoff);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8);
+ c->hdsp.put_pixels_tab[1][0](dst, ref, stride, 8);
 break;
 case RUN_BLOCK:
 scan = bink_patterns[get_bits(gb, 4)];
@@ -1086,7 +1093,7 @@
 i += run;
 if (i > 64) {
 av_log(c->avctx, AV_LOG_ERROR, "Run went out of bounds\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (get_bits1(gb)) {
 v = get_value(c, BINK_SRC_COLORS);
@@ -1107,9 +1114,9 @@
 if (ref < ref_start || ref > ref_end) {
 av_log(c->avctx, AV_LOG_ERROR, "Copy out of bounds @%d, %d\n",
 bx*8 + xoff, by*8 + yoff);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8);
+ c->hdsp.put_pixels_tab[1][0](dst, ref, stride, 8);
 c->dsp.clear_block(block);
 v = get_bits(gb, 7);
 read_residue(gb, block, v);
@@ -1129,7 +1136,7 @@
 xoff = get_value(c, BINK_SRC_X_OFF);
 yoff = get_value(c, BINK_SRC_Y_OFF);
 ref = prev + xoff + yoff * stride;
- c->dsp.put_pixels_tab[1][0](dst, ref, stride, 8);
+ c->hdsp.put_pixels_tab[1][0](dst, ref, stride, 8);
 memset(dctblock, 0, sizeof(*dctblock) * 64);
 dctblock[0] = get_value(c, BINK_SRC_INTER_DC);
 read_dct_coeffs(gb, dctblock, bink_scan, bink_inter_quant, -1);
@@ -1151,7 +1158,7 @@
 break;
 default:
 av_log(c->avctx, AV_LOG_ERROR, "Unknown block type %d\n", blk);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 }
@@ -1164,31 +1171,31 @@
 static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *pkt)
 {
 BinkContext * const c = avctx->priv_data;
+ AVFrame *frame = data;
 GetBitContext gb;
- int plane, plane_idx;
+ int plane, plane_idx, ret;
 int bits_count = pkt->size << 3;
 
 if (c->version > 'b') {
- if(c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
-
- if(ff_get_buffer(avctx, &c->pic) < 0){
+ if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 } else {
- if(avctx->reget_buffer(avctx, &c->pic) < 0){
+ if ((ret = ff_reget_buffer(avctx, c->last)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
 }
+ if ((ret = av_frame_ref(frame, c->last)) < 0)
+ return ret;
 }
 
 init_get_bits(&gb, pkt->data, bits_count);
 if (c->has_alpha) {
 if (c->version >= 'i')
 skip_bits_long(&gb, 32);
- if (bink_decode_plane(c, &gb, 3, 0) < 0)
- return -1;
+ if ((ret = bink_decode_plane(c, frame, &gb, 3, 0)) < 0)
+ return ret;
 }
 if (c->version >= 'i')
 skip_bits_long(&gb, 32);
@@ -1197,22 +1204,25 @@
 plane_idx = (!plane || !c->swap_planes) ? plane : (plane ^ 3);
 
 if (c->version > 'b') {
- if (bink_decode_plane(c, &gb, plane_idx, !!plane) < 0)
- return -1;
+ if ((ret = bink_decode_plane(c, frame, &gb, plane_idx, !!plane)) < 0)
+ return ret;
 } else {
- if (binkb_decode_plane(c, &gb, plane_idx, !pkt->pts, !!plane) < 0)
- return -1;
+ if ((ret = binkb_decode_plane(c, frame, &gb, plane_idx,
+ !avctx->frame_number, !!plane)) < 0)
+ return ret;
 }
 if (get_bits_count(&gb) >= bits_count)
 break;
 }
 emms_c();
 
- *got_frame = 1;
- *(AVFrame*)data = c->pic;
+ if (c->version > 'b') {
+ av_frame_unref(c->last);
+ if ((ret = av_frame_ref(c->last, frame)) < 0)
+ return ret;
+ }
 
- if (c->version > 'b')
- FFSWAP(AVFrame, c->pic, c->last);
+ *got_frame = 1;
 
 /* always report that the buffer was completely consumed */
 return pkt->size;
@@ -1268,13 +1278,13 @@
 BinkContext * const c = avctx->priv_data;
 static VLC_TYPE table[16 * 128][2];
 static int binkb_initialised = 0;
- int i;
+ int i, ret;
 int flags;
 
 c->version = avctx->codec_tag >> 24;
 if (avctx->extradata_size < 4) {
 av_log(avctx, AV_LOG_ERROR, "Extradata missing or too short\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 flags = AV_RL32(avctx->extradata);
 c->has_alpha = flags & BINK_FLAG_ALPHA;
@@ -1291,16 +1301,17 @@
 }
 c->avctx = avctx;
 
- c->pic.data[0] = NULL;
+ c->last = av_frame_alloc();
+ if (!c->last)
+ return AVERROR(ENOMEM);
 
- if (av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0) {
- return 1;
- }
+ if ((ret = av_image_check_size(avctx->width, avctx->height, 0, avctx)) < 0)
+ return ret;
 
 avctx->pix_fmt = c->has_alpha ? AV_PIX_FMT_YUVA420P : AV_PIX_FMT_YUV420P;
 
- avctx->idct_algo = FF_IDCT_BINK;
 ff_dsputil_init(&c->dsp, avctx);
+ ff_hpeldsp_init(&c->hdsp, avctx->flags);
 ff_binkdsp_init(&c->bdsp);
 
 init_bundles(c);
@@ -1319,10 +1330,7 @@
 {
 BinkContext * const c = avctx->priv_data;
 
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
- if (c->last.data[0])
- avctx->release_buffer(avctx, &c->last);
+ av_frame_free(&c->last);
 
 free_bundles(c);
 return 0;
@@ -1330,12 +1338,12 @@
 
 AVCodec ff_bink_decoder = {
 .name = "binkvideo",
+ .long_name = NULL_IF_CONFIG_SMALL("Bink video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_BINKVIDEO,
 .priv_data_size = sizeof(BinkContext),
 .init = decode_init,
 .close = decode_end,
 .decode = decode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("Bink video"),
 .capabilities = CODEC_CAP_DR1,
 };

libav-v9.6.tar.bz2/libavcodec/binkaudio.c -> libav-v10.1.tar.bz2/libavcodec/binkaudio.c Changed

@@ -32,22 +32,19 @@
 #include "avcodec.h"
 #define BITSTREAM_READER_LE
 #include "get_bits.h"
-#include "dsputil.h"
 #include "dct.h"
 #include "rdft.h"
 #include "fmtconvert.h"
 #include "internal.h"
+#include "wma.h"
 #include "libavutil/intfloat.h"
 
-extern const uint16_t ff_wma_critical_freqs[25];
-
 static float quant_table[96];
 
 #define MAX_CHANNELS 2
 #define BINK_BLOCK_MAX_SIZE (MAX_CHANNELS << 11)
 
 typedef struct {
- AVFrame frame;
 GetBitContext gb;
 int version_b; ///< Bink version 'b'
 int first;
@@ -143,9 +140,6 @@
 else
 return -1;
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
@@ -294,6 +288,7 @@
 int *got_frame_ptr, AVPacket *avpkt)
 {
 BinkAudioContext *s = avctx->priv_data;
+ AVFrame *frame = data;
 GetBitContext *gb = &s->gb;
 int ret, consumed = 0;
 
@@ -321,28 +316,28 @@
 }
 
 /* get output buffer */
- s->frame.nb_samples = s->frame_len;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = s->frame_len;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
 
- if (decode_block(s, (float **)s->frame.extended_data,
+ if (decode_block(s, (float **)frame->extended_data,
 avctx->codec->id == AV_CODEC_ID_BINKAUDIO_DCT)) {
 av_log(avctx, AV_LOG_ERROR, "Incomplete packet\n");
 return AVERROR_INVALIDDATA;
 }
 get_bits_align32(gb);
 
- s->frame.nb_samples = s->block_size / avctx->channels;
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ frame->nb_samples = s->block_size / avctx->channels;
+ *got_frame_ptr = 1;
 
 return consumed;
 }
 
 AVCodec ff_binkaudio_rdft_decoder = {
 .name = "binkaudio_rdft",
+ .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (RDFT)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_BINKAUDIO_RDFT,
 .priv_data_size = sizeof(BinkAudioContext),
@@ -350,11 +345,11 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (RDFT)")
 };
 
 AVCodec ff_binkaudio_dct_decoder = {
 .name = "binkaudio_dct",
+ .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (DCT)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_BINKAUDIO_DCT,
 .priv_data_size = sizeof(BinkAudioContext),
@@ -362,5 +357,4 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (DCT)")
 };

libav-v9.6.tar.bz2/libavcodec/binkdata.h -> libav-v10.1.tar.bz2/libavcodec/binkdata.h Changed

libav-v9.6.tar.bz2/libavcodec/binkdsp.c -> libav-v10.1.tar.bz2/libavcodec/binkdsp.c Changed

libav-v9.6.tar.bz2/libavcodec/binkdsp.h -> libav-v10.1.tar.bz2/libavcodec/binkdsp.h Changed

libav-v9.6.tar.bz2/libavcodec/bit_depth_template.c -> libav-v10.1.tar.bz2/libavcodec/bit_depth_template.c Changed

libav-v9.6.tar.bz2/libavcodec/bitstream.c -> libav-v10.1.tar.bz2/libavcodec/bitstream.c Changed

@@ -44,81 +44,89 @@
 
 void avpriv_align_put_bits(PutBitContext *s)
 {
- put_bits(s,s->bit_left & 7,0);
+ put_bits(s, s->bit_left & 7, 0);
 }
 
-void avpriv_put_string(PutBitContext *pb, const char *string, int terminate_string)
+void avpriv_put_string(PutBitContext *pb, const char *string,
+ int terminate_string)
 {
- while(*string){
+ while (*string) {
 put_bits(pb, 8, *string);
 string++;
 }
- if(terminate_string)
+ if (terminate_string)
 put_bits(pb, 8, 0);
 }
 
 void avpriv_copy_bits(PutBitContext *pb, const uint8_t *src, int length)
 {
- int words= length>>4;
- int bits= length&15;
+ int words = length >> 4;
+ int bits = length & 15;
 int i;
 
- if(length==0) return;
+ if (length == 0)
+ return;
 
- if(CONFIG_SMALL || words < 16 || put_bits_count(pb)&7){
- for(i=0; i<words; i++) put_bits(pb, 16, AV_RB16(src + 2*i));
- }else{
- for(i=0; put_bits_count(pb)&31; i++)
+ if (CONFIG_SMALL || words < 16 || put_bits_count(pb) & 7) {
+ for (i = 0; i < words; i++)
+ put_bits(pb, 16, AV_RB16(src + 2 * i));
+ } else {
+ for (i = 0; put_bits_count(pb) & 31; i++)
 put_bits(pb, 8, src[i]);
 flush_put_bits(pb);
- memcpy(put_bits_ptr(pb), src+i, 2*words-i);
- skip_put_bytes(pb, 2*words-i);
+ memcpy(put_bits_ptr(pb), src + i, 2 * words - i);
+ skip_put_bytes(pb, 2 * words - i);
 }
 
- put_bits(pb, bits, AV_RB16(src + 2*words)>>(16-bits));
+ put_bits(pb, bits, AV_RB16(src + 2 * words) >> (16 - bits));
 }
 
 /* VLC decoding */
 
-#define GET_DATA(v, table, i, wrap, size) \
-{\
- const uint8_t *ptr = (const uint8_t *)table + i * wrap;\
- switch(size) {\
- case 1:\
- v = *(const uint8_t *)ptr;\
- break;\
- case 2:\
- v = *(const uint16_t *)ptr;\
- break;\
- default:\
- v = *(const uint32_t *)ptr;\
- break;\
- }\
+#define GET_DATA(v, table, i, wrap, size) \
+{ \
+ const uint8_t *ptr = (const uint8_t *)table + i * wrap; \
+ switch(size) { \
+ case 1: \
+ v = *(const uint8_t *)ptr; \
+ break; \
+ case 2: \
+ v = *(const uint16_t *)ptr; \
+ break; \
+ default: \
+ v = *(const uint32_t *)ptr; \
+ break; \
+ } \
 }
 
 
 static int alloc_table(VLC *vlc, int size, int use_static)
 {
- int index;
- index = vlc->table_size;
+ int index = vlc->table_size;
+
 vlc->table_size += size;
 if (vlc->table_size > vlc->table_allocated) {
- if(use_static)
- abort(); // cannot do anything, init_vlc() is used with too little memory
+ int err;
+ if (use_static)
+ return AVERROR_BUG;
 vlc->table_allocated += (1 << vlc->bits);
- vlc->table = av_realloc(vlc->table,
- sizeof(VLC_TYPE) * 2 * vlc->table_allocated);
- if (!vlc->table)
- return -1;
+ if ((err = av_reallocp(&vlc->table,
+ sizeof(VLC_TYPE) * 2 *
+ vlc->table_allocated)) < 0) {
+ vlc->table_allocated = 0;
+ vlc->table_size = 0;
+ return err;
+ }
 }
 return index;
 }
 
-static av_always_inline uint32_t bitswap_32(uint32_t x) {
- return (uint32_t)ff_reverse[x&0xFF]<<24
- | (uint32_t)ff_reverse[(x>>8)&0xFF]<<16
- | (uint32_t)ff_reverse[(x>>16)&0xFF]<<8
- | (uint32_t)ff_reverse[x>>24];
+static av_always_inline uint32_t bitswap_32(uint32_t x)
+{
+ return (uint32_t)ff_reverse[ x & 0xFF] << 24 |
+ (uint32_t)ff_reverse[(x >> 8) & 0xFF] << 16 |
+ (uint32_t)ff_reverse[(x >> 16) & 0xFF] << 8 |
+ (uint32_t)ff_reverse[ x >> 24];
 }
 
 typedef struct {
@@ -131,10 +139,9 @@
 
 static int compare_vlcspec(const void *a, const void *b)
 {
- const VLCcode *sa=a, *sb=b;
+ const VLCcode *sa = a, *sb = b;
 return (sa->code >> 1) - (sb->code >> 1);
 }
-
 /**
 * Build VLC decoding tables suitable for use with get_vlc().
 *
@@ -161,7 +168,7 @@
 table_index = alloc_table(vlc, table_size, flags & INIT_VLC_USE_NEW_STATIC);
 av_dlog(NULL, "new table index=%d size=%d\n", table_index, table_size);
 if (table_index < 0)
- return -1;
+ return table_index;
 table = &vlc->table[table_index];
 
 for (i = 0; i < table_size; i++) {
@@ -171,8 +178,8 @@
 
 /* first pass: map codes and compute auxiliary table sizes */
 for (i = 0; i < nb_codes; i++) {
- n = codes[i].bits;
- code = codes[i].code;
+ n = codes[i].bits;
+ code = codes[i].code;
 symbol = codes[i].symbol;
 av_dlog(NULL, "i=%d n=%d code=0x%x\n", i, n, code);
 if (n <= table_nb_bits) {
@@ -188,7 +195,7 @@
 av_dlog(NULL, "%4x: code=%d n=%d\n", j, i, n);
 if (table[j][1] /*bits*/ != 0) {
 av_log(NULL, AV_LOG_ERROR, "incorrect codes\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 table[j][1] = n; //bits
 table[j][0] = symbol;
@@ -219,7 +226,7 @@
 j, codes[i].bits + table_nb_bits);
 index = build_table(vlc, subtable_bits, k-i, codes+i, flags);
 if (index < 0)
- return -1;
+ return index;
 /* note: realloc has been done, so reload tables */
 table = &vlc->table[table_index];
 table[j][0] = index; //code
@@ -257,48 +264,50 @@
 with av_free_static(), 0 if ff_free_vlc() will be used.
 */
 int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
- const void *bits, int bits_wrap, int bits_size,
- const void *codes, int codes_wrap, int codes_size,
- const void *symbols, int symbols_wrap, int symbols_size,
- int flags)
+ const void *bits, int bits_wrap, int bits_size,
+ const void *codes, int codes_wrap, int codes_size,
+ const void *symbols, int symbols_wrap, int symbols_size,
+ int flags)
 {
 VLCcode *buf;
 int i, j, ret;
 
 vlc->bits = nb_bits;
- if(flags & INIT_VLC_USE_NEW_STATIC){
- if(vlc->table_size && vlc->table_size == vlc->table_allocated){
+ if (flags & INIT_VLC_USE_NEW_STATIC) {
+ if (vlc->table_size && vlc->table_size == vlc->table_allocated) {
 return 0;
- }else if(vlc->table_size){
- abort(); // fatal error, we are called on a partially initialized table
+ } else if (vlc->table_size) {
+ return AVERROR_BUG;
 }
- }else {
- vlc->table = NULL;
+ } else {
+ vlc->table = NULL;
 vlc->table_allocated = 0;
- vlc->table_size = 0;
+ vlc->table_size = 0;
 }
 
 av_dlog(NULL, "build table nb_codes=%d\n", nb_codes);
 
- buf = av_malloc((nb_codes+1)*sizeof(VLCcode));
+ buf = av_malloc((nb_codes + 1) * sizeof(VLCcode));
+ if (!buf)
+ return AVERROR(ENOMEM);
 
 assert(symbols_size <= 2 || !symbols);
 j = 0;
-#define COPY(condition)\
- for (i = 0; i < nb_codes; i++) {\
- GET_DATA(buf[j].bits, bits, i, bits_wrap, bits_size);\
- if (!(condition))\
- continue;\
- GET_DATA(buf[j].code, codes, i, codes_wrap, codes_size);\
- if (flags & INIT_VLC_LE)\
- buf[j].code = bitswap_32(buf[j].code);\
- else\
- buf[j].code <<= 32 - buf[j].bits;\
- if (symbols)\
- GET_DATA(buf[j].symbol, symbols, i, symbols_wrap, symbols_size)\
- else\
- buf[j].symbol = i;\
- j++;\
+#define COPY(condition) \
+ for (i = 0; i < nb_codes; i++) { \
+ GET_DATA(buf[j].bits, bits, i, bits_wrap, bits_size); \
+ if (!(condition)) \
+ continue; \
+ GET_DATA(buf[j].code, codes, i, codes_wrap, codes_size); \
+ if (flags & INIT_VLC_LE) \
+ buf[j].code = bitswap_32(buf[j].code); \
+ else \
+ buf[j].code <<= 32 - buf[j].bits; \
+ if (symbols) \
+ GET_DATA(buf[j].symbol, symbols, i, symbols_wrap, symbols_size) \
+ else \
+ buf[j].symbol = i; \
+ j++; \
 }
 COPY(buf[j].bits > nb_bits);
 // qsort is the slowest part of init_vlc, and could probably be improved or avoided
@@ -311,10 +320,12 @@
 av_free(buf);
 if (ret < 0) {
 av_freep(&vlc->table);
- return -1;
+ return ret;
 }
- if((flags & INIT_VLC_USE_NEW_STATIC) && vlc->table_size != vlc->table_allocated)
- av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated);
+ if ((flags & INIT_VLC_USE_NEW_STATIC) &&
+ vlc->table_size != vlc->table_allocated)
+ av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n",
+ vlc->table_size, vlc->table_allocated);
 return 0;
 }

libav-v9.6.tar.bz2/libavcodec/bitstream_filter.c -> libav-v10.1.tar.bz2/libavcodec/bitstream_filter.c Changed

@@ -23,35 +23,43 @@
 #include "avcodec.h"
 #include "libavutil/mem.h"
 
-static AVBitStreamFilter *first_bitstream_filter= NULL;
+static AVBitStreamFilter *first_bitstream_filter = NULL;
 
-AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f){
-    if(f) return f->next;
-    else  return first_bitstream_filter;
+AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f)
+{
+    if (f)
+        return f->next;
+    else
+        return first_bitstream_filter;
 }
 
-void av_register_bitstream_filter(AVBitStreamFilter *bsf){
-    bsf->next = first_bitstream_filter;
-    first_bitstream_filter= bsf;
+void av_register_bitstream_filter(AVBitStreamFilter *bsf)
+{
+    bsf->next              = first_bitstream_filter;
+    first_bitstream_filter = bsf;
 }
 
-AVBitStreamFilterContext *av_bitstream_filter_init(const char *name){
-    AVBitStreamFilter *bsf= first_bitstream_filter;
+AVBitStreamFilterContext *av_bitstream_filter_init(const char *name)
+{
+    AVBitStreamFilter *bsf = first_bitstream_filter;
 
-    while(bsf){
-        if(!strcmp(name, bsf->name)){
-            AVBitStreamFilterContext *bsfc= av_mallocz(sizeof(AVBitStreamFilterContext));
-            bsfc->filter= bsf;
-            bsfc->priv_data = bsf->priv_data_size ? av_mallocz(bsf->priv_data_size) : NULL;
+    while (bsf) {
+        if (!strcmp(name, bsf->name)) {
+            AVBitStreamFilterContext *bsfc =
+                av_mallocz(sizeof(AVBitStreamFilterContext));
+            bsfc->filter    = bsf;
+            bsfc->priv_data =
+                bsf->priv_data_size ? av_mallocz(bsf->priv_data_size) : NULL;
             return bsfc;
         }
-        bsf= bsf->next;
+        bsf = bsf->next;
     }
     return NULL;
 }
 
-void av_bitstream_filter_close(AVBitStreamFilterContext *bsfc){
-    if(bsfc->filter->close)
+void av_bitstream_filter_close(AVBitStreamFilterContext *bsfc)
+{
+    if (bsfc->filter->close)
         bsfc->filter->close(bsfc);
     av_freep(&bsfc->priv_data);
     av_parser_close(bsfc->parser);
@@ -60,9 +68,11 @@
 
 int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
                                AVCodecContext *avctx, const char *args,
-                     uint8_t **poutbuf, int *poutbuf_size,
-                     const uint8_t *buf, int buf_size, int keyframe){
-    *poutbuf= (uint8_t *) buf;
-    *poutbuf_size= buf_size;
-    return bsfc->filter->filter(bsfc, avctx, args, poutbuf, poutbuf_size, buf, buf_size, keyframe);
+                               uint8_t **poutbuf, int *poutbuf_size,
+                               const uint8_t *buf, int buf_size, int keyframe)
+{
+    *poutbuf      = (uint8_t *)buf;
+    *poutbuf_size = buf_size;
+    return bsfc->filter->filter(bsfc, avctx, args, poutbuf, poutbuf_size,
+                                buf, buf_size, keyframe);
 }

libav-v9.6.tar.bz2/libavcodec/bmp.c -> libav-v10.1.tar.bz2/libavcodec/bmp.c Changed

@@ -25,31 +25,19 @@
 #include "internal.h"
 #include "msrledec.h"
 
-static av_cold int bmp_decode_init(AVCodecContext *avctx)
-{
- BMPContext *s = avctx->priv_data;
-
- avcodec_get_frame_defaults(&s->picture);
- avctx->coded_frame = &s->picture;
-
- return 0;
-}
-
 static int bmp_decode_frame(AVCodecContext *avctx,
 void *data, int *got_frame,
 AVPacket *avpkt)
 {
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
- BMPContext *s = avctx->priv_data;
- AVFrame *picture = data;
- AVFrame *p = &s->picture;
+ AVFrame *p = data;
 unsigned int fsize, hsize;
 int width, height;
 unsigned int depth;
 BiCompression comp;
 unsigned int ihsize;
- int i, j, n, linesize;
+ int i, j, n, linesize, ret;
 uint32_t rgb[3];
 uint8_t *ptr;
 int dsize;
@@ -58,13 +46,13 @@
 
 if (buf_size < 14) {
 av_log(avctx, AV_LOG_ERROR, "buf size too small (%d)\n", buf_size);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 if (bytestream_get_byte(&buf) != 'B' ||
 bytestream_get_byte(&buf) != 'M') {
 av_log(avctx, AV_LOG_ERROR, "bad magic number\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 fsize = bytestream_get_le32(&buf);
@@ -81,7 +69,7 @@
 ihsize = bytestream_get_le32(&buf); /* more header size */
 if (ihsize + 14 > hsize) {
 av_log(avctx, AV_LOG_ERROR, "invalid header size %d\n", hsize);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 /* sometimes file size is set to some headers size, set a real size in that case */
@@ -91,7 +79,7 @@
 if (fsize <= hsize) {
 av_log(avctx, AV_LOG_ERROR, "declared file size is less than header size (%d < %d)\n",
 fsize, hsize);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 switch (ihsize) {
@@ -108,13 +96,13 @@
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "unsupported BMP file, patch welcome\n");
- return -1;
+ return AVERROR_PATCHWELCOME;
 }
 
 /* planes */
 if (bytestream_get_le16(&buf) != 1) {
 av_log(avctx, AV_LOG_ERROR, "invalid BMP header\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 depth = bytestream_get_le16(&buf);
@@ -127,7 +115,7 @@
 if (comp != BMP_RGB && comp != BMP_BITFIELDS && comp != BMP_RLE4 &&
 comp != BMP_RLE8) {
 av_log(avctx, AV_LOG_ERROR, "BMP coding %d not supported\n", comp);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 if (comp == BMP_BITFIELDS) {
@@ -192,26 +180,22 @@
 avctx->pix_fmt = AV_PIX_FMT_PAL8;
 } else {
 av_log(avctx, AV_LOG_ERROR, "Unknown palette for %d-colour BMP\n", 1<<depth);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "depth %d not supported\n", depth);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 if (avctx->pix_fmt == AV_PIX_FMT_NONE) {
 av_log(avctx, AV_LOG_ERROR, "unsupported pixel format\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- if (p->data[0])
- avctx->release_buffer(avctx, p);
-
- p->reference = 0;
- if (ff_get_buffer(avctx, p) < 0) {
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 p->pict_type = AV_PICTURE_TYPE_I;
 p->key_frame = 1;
@@ -225,7 +209,7 @@
 if (n * avctx->height > dsize && comp != BMP_RLE4 && comp != BMP_RLE8) {
 av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n",
 dsize, n * avctx->height);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 // RLE may skip decoding some picture areas, so blank picture before decoding
@@ -346,34 +330,20 @@
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "BMP decoder is broken\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 
- *picture = s->picture;
 *got_frame = 1;
 
 return buf_size;
 }
 
-static av_cold int bmp_decode_end(AVCodecContext *avctx)
-{
- BMPContext* c = avctx->priv_data;
-
- if (c->picture.data[0])
- avctx->release_buffer(avctx, &c->picture);
-
- return 0;
-}
-
 AVCodec ff_bmp_decoder = {
 .name = "bmp",
+ .long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_BMP,
- .priv_data_size = sizeof(BMPContext),
- .init = bmp_decode_init,
- .close = bmp_decode_end,
 .decode = bmp_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"),
 };

libav-v9.6.tar.bz2/libavcodec/bmp.h -> libav-v10.1.tar.bz2/libavcodec/bmp.h Changed

libav-v9.6.tar.bz2/libavcodec/bmpenc.c -> libav-v10.1.tar.bz2/libavcodec/bmpenc.c Changed

@@ -31,11 +31,6 @@
 static const uint32_t rgb444_masks[]  = { 0x0F00, 0x00F0, 0x000F };
 
 static av_cold int bmp_encode_init(AVCodecContext *avctx){
-    BMPContext *s = avctx->priv_data;
-
-    avcodec_get_frame_defaults(&s->picture);
-    avctx->coded_frame = &s->picture;
-
     switch (avctx->pix_fmt) {
     case AV_PIX_FMT_BGR24:
         avctx->bits_per_coded_sample = 24;
@@ -61,22 +56,25 @@
         return -1;
     }
 
+    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)
 {
-    BMPContext *s = avctx->priv_data;
-    AVFrame * const p = &s->picture;
+    const AVFrame * const p = pict;
     int n_bytes_image, n_bytes_per_row, n_bytes, i, n, hsize, ret;
     const uint32_t *pal = NULL;
     int pad_bytes_per_row, pal_entries = 0, compression = BMP_RGB;
     int bit_count = avctx->bits_per_coded_sample;
     uint8_t *ptr, *buf;
-    *p = *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,13 +157,20 @@
     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)"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_BMP,
-    .priv_data_size = sizeof(BMPContext),
     .init           = bmp_encode_init,
     .encode2        = bmp_encode_frame,
+    .close          = bmp_encode_close,
     .pix_fmts       = (const enum AVPixelFormat[]){
         AV_PIX_FMT_BGR24,
         AV_PIX_FMT_RGB555, AV_PIX_FMT_RGB444, AV_PIX_FMT_RGB565,
@@ -173,5 +178,4 @@
         AV_PIX_FMT_MONOBLACK,
         AV_PIX_FMT_NONE
     },
-    .long_name      = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"),
 };

libav-v9.6.tar.bz2/libavcodec/bmv.c -> libav-v10.1.tar.bz2/libavcodec/bmv.c Changed

@@ -43,7 +43,6 @@
 
 typedef struct BMVDecContext {
 AVCodecContext *avctx;
- AVFrame pic;
 
 uint8_t *frame, frame_base[SCREEN_WIDE * (SCREEN_HIGH + 1)];
 uint32_t pal[256];
@@ -67,7 +66,7 @@
 int i;
 
 if (src_len <= 0)
- return -1;
+ return AVERROR_INVALIDDATA;
 
 if (forward) {
 src = source;
@@ -91,7 +90,7 @@
 */
 if (!mode || (tmplen == 4)) {
 if (src < source || src >= source_end)
- return -1;
+ return AVERROR_INVALIDDATA;
 val = *src;
 read_two_nibbles = 1;
 } else {
@@ -102,7 +101,7 @@
 for (;;) {
 if (!read_two_nibbles) {
 if (src < source || src >= source_end)
- return -1;
+ return AVERROR_INVALIDDATA;
 shift += 2;
 val |= *src << shift;
 if (*src & 0xC)
@@ -137,7 +136,7 @@
 if (mode >= 4)
 mode -= 3;
 if (len <= 0 || FFABS(dst_end - dst) < len)
- return -1;
+ return AVERROR_INVALIDDATA;
 switch (mode) {
 case 1:
 if (forward) {
@@ -145,7 +144,7 @@
 dst - frame + SCREEN_WIDE + frame_off < 0 ||
 frame_end - dst < frame_off + len ||
 frame_end - dst < len)
- return -1;
+ return AVERROR_INVALIDDATA;
 for (i = 0; i < len; i++)
 dst[i] = dst[frame_off + i];
 dst += len;
@@ -155,7 +154,7 @@
 dst - frame + SCREEN_WIDE + frame_off < 0 ||
 frame_end - dst < frame_off + len ||
 frame_end - dst < len)
- return -1;
+ return AVERROR_INVALIDDATA;
 for (i = len - 1; i >= 0; i--)
 dst[i] = dst[frame_off + i];
 }
@@ -163,13 +162,13 @@
 case 2:
 if (forward) {
 if (source + src_len - src < len)
- return -1;
+ return AVERROR_INVALIDDATA;
 memcpy(dst, src, len);
 dst += len;
 src += len;
 } else {
 if (src - source < len)
- return -1;
+ return AVERROR_INVALIDDATA;
 dst -= len;
 src -= len;
 memcpy(dst, src, len);
@@ -198,6 +197,7 @@
 AVPacket *pkt)
 {
 BMVDecContext * const c = avctx->priv_data;
+ AVFrame *frame = data;
 int type, scr_off;
 int i, ret;
 uint8_t *srcptr, *outptr;
@@ -240,11 +240,7 @@
 scr_off = 0;
 }
 
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
-
- c->pic.reference = 3;
- if ((ret = ff_get_buffer(avctx, &c->pic)) < 0) {
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -254,20 +250,19 @@
 return AVERROR_INVALIDDATA;
 }
 
- memcpy(c->pic.data[1], c->pal, AVPALETTE_SIZE);
- c->pic.palette_has_changed = type & BMV_PALETTE;
+ memcpy(frame->data[1], c->pal, AVPALETTE_SIZE);
+ frame->palette_has_changed = type & BMV_PALETTE;
 
- outptr = c->pic.data[0];
+ outptr = frame->data[0];
 srcptr = c->frame;
 
 for (i = 0; i < avctx->height; i++) {
 memcpy(outptr, srcptr, avctx->width);
 srcptr += avctx->width;
- outptr += c->pic.linesize[0];
+ outptr += frame->linesize[0];
 }
 
 *got_frame = 1;
- *(AVFrame*)data = c->pic;
 
 /* always report that the buffer was completely consumed */
 return pkt->size;
@@ -285,42 +280,23 @@
 return 0;
 }
 
-static av_cold int decode_end(AVCodecContext *avctx)
-{
- BMVDecContext *c = avctx->priv_data;
-
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
-
- return 0;
-}
-
-typedef struct BMVAudioDecContext {
- AVFrame frame;
-} BMVAudioDecContext;
-
 static const int bmv_aud_mults[16] = {
 16512, 8256, 4128, 2064, 1032, 516, 258, 192, 129, 88, 64, 56, 48, 40, 36, 32
 };
 
 static av_cold int bmv_aud_decode_init(AVCodecContext *avctx)
 {
- BMVAudioDecContext *c = avctx->priv_data;
-
 avctx->channels = 2;
 avctx->channel_layout = AV_CH_LAYOUT_STEREO;
 avctx->sample_fmt = AV_SAMPLE_FMT_S16;
 
- avcodec_get_frame_defaults(&c->frame);
- avctx->coded_frame = &c->frame;
-
 return 0;
 }
 
 static int bmv_aud_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
- BMVAudioDecContext *c = avctx->priv_data;
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 int blocks = 0, total_blocks, i;
@@ -336,12 +312,12 @@
 }
 
 /* get output buffer */
- c->frame.nb_samples = total_blocks * 32;
- if ((ret = ff_get_buffer(avctx, &c->frame)) < 0) {
+ frame->nb_samples = total_blocks * 32;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- output_samples = (int16_t *)c->frame.data[0];
+ output_samples = (int16_t *)frame->data[0];
 
 for (blocks = 0; blocks < total_blocks; blocks++) {
 uint8_t code = *buf++;
@@ -354,31 +330,28 @@
 }
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = c->frame;
+ *got_frame_ptr = 1;
 
 return buf_size;
 }
 
 AVCodec ff_bmv_video_decoder = {
 .name = "bmv_video",
+ .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_BMV_VIDEO,
 .priv_data_size = sizeof(BMVDecContext),
 .init = decode_init,
- .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV video"),
 };
 
 AVCodec ff_bmv_audio_decoder = {
 .name = "bmv_audio",
+ .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV audio"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_BMV_AUDIO,
- .priv_data_size = sizeof(BMVAudioDecContext),
 .init = bmv_aud_decode_init,
 .decode = bmv_aud_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV audio"),
 };

libav-v9.6.tar.bz2/libavcodec/c93.c -> libav-v10.1.tar.bz2/libavcodec/c93.c Changed

@@ -21,9 +21,10 @@
 
 #include "avcodec.h"
 #include "bytestream.h"
+#include "internal.h"
 
 typedef struct {
- AVFrame pictures[2];
+ AVFrame *pictures[2];
 int currentpic;
 } C93DecoderContext;
 
@@ -45,20 +46,28 @@
 #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)
 {
- avctx->pix_fmt = AV_PIX_FMT_PAL8;
+ 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;
+
+ 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);
+ }
 
- if (c93->pictures[0].data[0])
- avctx->release_buffer(avctx, &c93->pictures[0]);
- if (c93->pictures[1].data[0])
- avctx->release_buffer(avctx, &c93->pictures[1]);
 return 0;
 }
 
@@ -79,7 +88,7 @@
 if (from_y + height > HEIGHT) {
 av_log(avctx, AV_LOG_ERROR, "invalid offset %d during C93 decoding\n",
 offset);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 if (overflow > 0) {
@@ -118,21 +127,17 @@
 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 *picture = data;
+ AVFrame * const newpic = c93->pictures[c93->currentpic];
+ AVFrame * const oldpic = c93->pictures[c93->currentpic^1];
 GetByteContext gb;
 uint8_t *out;
- int stride, i, x, y, b, bt = 0;
+ int stride, ret, i, x, y, b, bt = 0;
 
 c93->currentpic ^= 1;
 
- newpic->reference = 1;
- newpic->buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE |
- FF_BUFFER_HINTS_REUSABLE | FF_BUFFER_HINTS_READABLE;
- if (avctx->reget_buffer(avctx, newpic)) {
+ if ((ret = ff_reget_buffer(avctx, newpic)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 stride = newpic->linesize[0];
@@ -162,8 +167,8 @@
 switch (block_type) {
 case C93_8X8_FROM_PREV:
 offset = bytestream2_get_le16(&gb);
- if (copy_block(avctx, out, copy_from, offset, 8, stride))
- return -1;
+ if ((ret = copy_block(avctx, out, copy_from, offset, 8, stride)) < 0)
+ return ret;
 break;
 
 case C93_4X4_FROM_CURR:
@@ -172,9 +177,9 @@
 for (j = 0; j < 8; j += 4) {
 for (i = 0; i < 8; i += 4) {
 offset = bytestream2_get_le16(&gb);
- if (copy_block(avctx, &out[j*stride+i],
- copy_from, offset, 4, stride))
- return -1;
+ if ((ret = copy_block(avctx, &out[j*stride+i],
+ copy_from, offset, 4, stride)) < 0)
+ return ret;
 }
 }
 break;
@@ -221,7 +226,7 @@
 default:
 av_log(avctx, AV_LOG_ERROR, "unexpected type %x at %dx%d\n",
 block_type, x, y);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 bt >>= 4;
 out += 8;
@@ -239,7 +244,8 @@
 memcpy(newpic->data[1], oldpic->data[1], 256 * 4);
 }
 
- *picture = *newpic;
+ if ((ret = av_frame_ref(data, newpic)) < 0)
+ return ret;
 *got_frame = 1;
 
 return buf_size;
@@ -247,6 +253,7 @@
 
 AVCodec ff_c93_decoder = {
 .name = "c93",
+ .long_name = NULL_IF_CONFIG_SMALL("Interplay C93"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_C93,
 .priv_data_size = sizeof(C93DecoderContext),
@@ -254,5 +261,4 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Interplay C93"),
 };

libav-v9.6.tar.bz2/libavcodec/cabac.c -> libav-v10.1.tar.bz2/libavcodec/cabac.c Changed

@@ -73,8 +73,6 @@
 { 6, 8, 9, 11}, { 6, 7, 9, 10}, { 6, 7, 8, 9}, { 2, 2, 2, 2},
 };
 
-static uint8_t h264_mps_state[2 * 64];
-
 static const uint8_t mps_state[64]= {
 1, 2, 3, 4, 5, 6, 7, 8,
 9,10,11,12,13,14,15,16,
@@ -108,19 +106,6 @@
 *
 * @param buf_size size of buf in bits
 */
-void ff_init_cabac_encoder(CABACContext *c, uint8_t *buf, int buf_size){
- init_put_bits(&c->pb, buf, buf_size);
-
- c->low= 0;
- c->range= 0x1FE;
- c->outstanding_count= 0;
- c->pb.bit_left++; //avoids firstBitFlag
-}
-
-/**
- *
- * @param buf_size size of buf in bits
- */
 void ff_init_cabac_decoder(CABACContext *c, const uint8_t *buf, int buf_size){
 c->bytestream_start=
 c->bytestream= buf;
@@ -136,8 +121,13 @@
 c->range= 0x1FE;
 }
 
-void ff_init_cabac_states(CABACContext *c){
+void ff_init_cabac_states(void)
+{
 int i, j;
+ static int initialized = 0;
+
+ if (initialized)
+ return;
 
 for(i=0; i<64; i++){
 for(j=0; j<4; j++){ //FIXME check if this is worth the 1 shift we save
@@ -145,10 +135,8 @@
 ff_h264_lps_range[j*2*64+2*i+1]= lps_range[i][j];
 }
 
- ff_h264_mlps_state[128+2*i+0]=
- h264_mps_state[2 * i + 0] = 2 * mps_state[i] + 0;
- ff_h264_mlps_state[128+2*i+1]=
- h264_mps_state[2 * i + 1] = 2 * mps_state[i] + 1;
+ ff_h264_mlps_state[128 + 2 * i + 0] = 2 * mps_state[i] + 0;
+ ff_h264_mlps_state[128 + 2 * i + 1] = 2 * mps_state[i] + 1;
 
 if( i ){
 ff_h264_mlps_state[128-2*i-1]= 2*lps_state[i]+0;
@@ -161,4 +149,6 @@
 for(i=0; i< 63; i++){
 ff_h264_last_coeff_flag_offset_8x8[i] = last_coeff_flag_offset_8x8[i];
 }
+
+ initialized = 1;
 }

libav-v9.6.tar.bz2/libavcodec/cabac.h -> libav-v10.1.tar.bz2/libavcodec/cabac.h Changed

libav-v9.6.tar.bz2/libavcodec/cabac_functions.h -> libav-v10.1.tar.bz2/libavcodec/cabac_functions.h Changed

libav-v9.6.tar.bz2/libavcodec/cavs.c -> libav-v10.1.tar.bz2/libavcodec/cavs.c Changed

@@ -28,32 +28,33 @@
 #include "avcodec.h"
 #include "get_bits.h"
 #include "golomb.h"
+#include "h264chroma.h"
 #include "mathops.h"
 #include "cavs.h"
 
 static const uint8_t alpha_tab[64] = {
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 3, 3,
- 4, 4, 5, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 18, 20,
- 22, 24, 26, 28, 30, 33, 33, 35, 35, 36, 37, 37, 39, 39, 42, 44,
- 46, 48, 50, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64
+ 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 3, 3,
+ 4, 4, 5, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 18, 20,
+ 22, 24, 26, 28, 30, 33, 33, 35, 35, 36, 37, 37, 39, 39, 42, 44,
+ 46, 48, 50, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64
 };
 
 static const uint8_t beta_tab[64] = {
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2,
- 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6,
- 6, 7, 7, 7, 8, 8, 8, 9, 9, 10, 10, 11, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 23, 24, 24, 25, 25, 26, 27
+ 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2,
+ 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6,
+ 6, 7, 7, 7, 8, 8, 8, 9, 9, 10, 10, 11, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 23, 24, 24, 25, 25, 26, 27
 };
 
 static const uint8_t tc_tab[64] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2,
- 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4,
- 5, 5, 5, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2,
+ 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4,
+ 5, 5, 5, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9
 };
 
 /** mark block as unavailable, i.e. out of picture
- or not yet decoded */
+ * or not yet decoded */
 static const cavs_vector un_mv = { 0, 0, 1, NOT_AVAIL };
 
 static const int8_t left_modifier_l[8] = { 0, -1, 6, -1, -1, 7, 6, 7 };
@@ -76,7 +77,7 @@
 if (b) {
 mvP += MV_BWD_OFFS;
 mvQ += MV_BWD_OFFS;
- if ((abs(mvP->x - mvQ->x) >= 4) || (abs(mvP->y - mvQ->y) >= 4))
+ if ((abs(mvP->x - mvQ->x) >= 4) || (abs(mvP->y - mvQ->y) >= 4))
 return 1;
 } else {
 if (mvP->ref != mvQ->ref)
@@ -125,7 +126,7 @@
 /* determine bs */
 if (mb_type == I_8X8)
 memset(bs, 2, 8);
- else{
+ else {
 memset(bs, 0, 8);
 if (ff_cavs_partition_flags[mb_type] & SPLITV) {
 bs[2] = get_bs(&h->mv[MV_FWD_X0], &h->mv[MV_FWD_X1], mb_type > P_8X8);
@@ -228,31 +229,30 @@
 void ff_cavs_load_intra_pred_chroma(AVSContext *h)
 {
 /* extend borders by one pixel */
- h->left_border_u[9] = h->left_border_u[8];
- h->left_border_v[9] = h->left_border_v[8];
+ h->left_border_u[9] = h->left_border_u[8];
+ h->left_border_v[9] = h->left_border_v[8];
 h->top_border_u[h->mbx * 10 + 9] = h->top_border_u[h->mbx * 10 + 8];
 h->top_border_v[h->mbx * 10 + 9] = h->top_border_v[h->mbx * 10 + 8];
 if (h->mbx && h->mby) {
 h->top_border_u[h->mbx * 10] = h->left_border_u[0] = h->topleft_border_u;
 h->top_border_v[h->mbx * 10] = h->left_border_v[0] = h->topleft_border_v;
 } else {
- h->left_border_u[0] = h->left_border_u[1];
- h->left_border_v[0] = h->left_border_v[1];
+ h->left_border_u[0] = h->left_border_u[1];
+ h->left_border_v[0] = h->left_border_v[1];
 h->top_border_u[h->mbx * 10] = h->top_border_u[h->mbx * 10 + 1];
 h->top_border_v[h->mbx * 10] = h->top_border_v[h->mbx * 10 + 1];
 }
 }
 
-static void intra_pred_vert(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
+static void intra_pred_vert(uint8_t *d, uint8_t *top, uint8_t *left, int stride)
 {
 int y;
 uint64_t a = AV_RN64(&top[1]);
- for (y = 0; y < 8; y++) {
+ for (y = 0; y < 8; y++)
 *((uint64_t *)(d + y * stride)) = a;
- }
 }
 
-static void intra_pred_horiz(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
+static void intra_pred_horiz(uint8_t *d, uint8_t *top, uint8_t *left, int stride)
 {
 int y;
 uint64_t a;
@@ -262,7 +262,7 @@
 }
 }
 
-static void intra_pred_dc_128(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
+static void intra_pred_dc_128(uint8_t *d, uint8_t *top, uint8_t *left, int stride)
 {
 int y;
 uint64_t a = 0x8080808080808080ULL;
@@ -270,15 +270,15 @@
 *((uint64_t *)(d + y * stride)) = a;
 }
 
-static void intra_pred_plane(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
+static void intra_pred_plane(uint8_t *d, uint8_t *top, uint8_t *left, int stride)
 {
 int x, y, ia;
 int ih = 0;
 int iv = 0;
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
 
 for (x = 0; x < 4; x++) {
- ih += (x + 1) * (top [5 + x] - top [3 - x]);
+ ih += (x + 1) * (top[5 + x] - top[3 - x]);
 iv += (x + 1) * (left[5 + x] - left[3 - x]);
 }
 ia = (top[8] + left[8]) << 4;
@@ -289,10 +289,10 @@
 d[y * stride + x] = cm[(ia + (x - 3) * ih + (y - 3) * iv + 16) >> 5];
 }
 
-#define LOWPASS(ARRAY,INDEX) \
+#define LOWPASS(ARRAY, INDEX) \
 ((ARRAY[(INDEX) - 1] + 2 * ARRAY[(INDEX)] + ARRAY[(INDEX) + 1] + 2) >> 2)
 
-static void intra_pred_lp(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
+static void intra_pred_lp(uint8_t *d, uint8_t *top, uint8_t *left, int stride)
 {
 int x, y;
 for (y = 0; y < 8; y++)
@@ -300,7 +300,7 @@
 d[y * stride + x] = (LOWPASS(top, x + 1) + LOWPASS(left, y + 1)) >> 1;
 }
 
-static void intra_pred_down_left(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
+static void intra_pred_down_left(uint8_t *d, uint8_t *top, uint8_t *left, int stride)
 {
 int x, y;
 for (y = 0; y < 8; y++)
@@ -308,7 +308,7 @@
 d[y * stride + x] = (LOWPASS(top, x + y + 2) + LOWPASS(left, x + y + 2)) >> 1;
 }
 
-static void intra_pred_down_right(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
+static void intra_pred_down_right(uint8_t *d, uint8_t *top, uint8_t *left, int stride)
 {
 int x, y;
 for (y = 0; y < 8; y++)
@@ -321,7 +321,7 @@
 d[y * stride + x] = LOWPASS(left, y - x);
 }
 
-static void intra_pred_lp_left(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
+static void intra_pred_lp_left(uint8_t *d, uint8_t *top, uint8_t *left, int stride)
 {
 int x, y;
 for (y = 0; y < 8; y++)
@@ -329,7 +329,7 @@
 d[y * stride + x] = LOWPASS(left, y + 1);
 }
 
-static void intra_pred_lp_top(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
+static void intra_pred_lp_top(uint8_t *d, uint8_t *top, uint8_t *left, int stride)
 {
 int x, y;
 for (y = 0; y < 8; y++)
@@ -351,8 +351,8 @@
 void ff_cavs_modify_mb_i(AVSContext *h, int *pred_mode_uv)
 {
 /* save pred modes before they get modified */
- h->pred_mode_Y[3] = h->pred_mode_Y[5];
- h->pred_mode_Y[6] = h->pred_mode_Y[8];
+ h->pred_mode_Y[3] = h->pred_mode_Y[5];
+ h->pred_mode_Y[6] = h->pred_mode_Y[8];
 h->top_pred_Y[h->mbx * 2 + 0] = h->pred_mode_Y[7];
 h->top_pred_Y[h->mbx * 2 + 1] = h->pred_mode_Y[8];
 
@@ -375,119 +375,144 @@
 *
 ****************************************************************************/
 
-static inline void mc_dir_part(AVSContext *h, AVFrame *pic,
- int chroma_height,int delta,int list,uint8_t *dest_y,
- uint8_t *dest_cb,uint8_t *dest_cr,int src_x_offset,
- int src_y_offset,qpel_mc_func *qpix_op,
- h264_chroma_mc_func chroma_op,cavs_vector *mv)
+static inline void mc_dir_part(AVSContext *h, AVFrame *pic, int chroma_height,
+ int delta, int list, uint8_t *dest_y,
+ uint8_t *dest_cb, uint8_t *dest_cr,
+ int src_x_offset, int src_y_offset,
+ qpel_mc_func *qpix_op,
+ h264_chroma_mc_func chroma_op, cavs_vector *mv)
 {
- const int mx= mv->x + src_x_offset*8;
- const int my= mv->y + src_y_offset*8;
- const int luma_xy= (mx&3) + ((my&3)<<2);
- uint8_t * src_y = pic->data[0] + (mx >> 2) + (my >> 2) * h->l_stride;
- uint8_t * src_cb = pic->data[1] + (mx >> 3) + (my >> 3) * h->c_stride;
- uint8_t * src_cr = pic->data[2] + (mx >> 3) + (my >> 3) * h->c_stride;
- int extra_width = 0;
- int extra_height= extra_width;
- int emu=0;
- const int full_mx= mx>>2;
- const int full_my= my>>2;
- const int pic_width = 16*h->mb_width;
- const int pic_height = 16*h->mb_height;
+ const int mx = mv->x + src_x_offset * 8;
+ const int my = mv->y + src_y_offset * 8;
+ const int luma_xy = (mx & 3) + ((my & 3) << 2);
+ uint8_t *src_y = pic->data[0] + (mx >> 2) + (my >> 2) * h->l_stride;
+ uint8_t *src_cb = pic->data[1] + (mx >> 3) + (my >> 3) * h->c_stride;
+ uint8_t *src_cr = pic->data[2] + (mx >> 3) + (my >> 3) * h->c_stride;
+ int extra_width = 0;
+ int extra_height = extra_width;
+ const int full_mx = mx >> 2;
+ const int full_my = my >> 2;
+ const int pic_width = 16 * h->mb_width;
+ const int pic_height = 16 * h->mb_height;
+ int emu = 0;
 
 if (!pic->data[0])
 return;
- if(mx&7) extra_width -= 3;
- if(my&7) extra_height -= 3;
-
- if( full_mx < 0-extra_width
- || 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, src_y - 2 - 2*h->l_stride, h->l_stride,
- 16+5, 16+5/*FIXME*/, full_mx-2, full_my-2, pic_width, pic_height);
- src_y= h->edge_emu_buffer + 2 + 2*h->l_stride;
- emu=1;
+ if (mx & 7)
+ extra_width -= 3;
+ if (my & 7)
+ extra_height -= 3;
+
+ if (full_mx < 0 - extra_width ||
+ 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,
+ 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);
+ src_y = h->edge_emu_buffer + 2 + 2 * h->l_stride;
+ emu = 1;
 }
 
- qpix_op[luma_xy](dest_y, src_y, h->l_stride); //FIXME try variable height perhaps?
+ // FIXME try variable height perhaps?
+ qpix_op[luma_xy](dest_y, src_y, h->l_stride);
 
- if(emu){
- h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src_cb, h->c_stride,
- 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1);
- src_cb= h->edge_emu_buffer;
+ if (emu) {
+ 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);
+ src_cb = h->edge_emu_buffer;
 }
- 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, src_cr, h->c_stride,
- 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1);
- src_cr= h->edge_emu_buffer;
+ 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, src_cr,
+ h->c_stride, h->c_stride,
+ 9, 9 /* FIXME */,
+ mx >> 3, my >> 3,
+ pic_width >> 1, pic_height >> 1);
+ src_cr = h->edge_emu_buffer;
 }
- chroma_op(dest_cr, src_cr, h->c_stride, chroma_height, mx&7, my&7);
+ chroma_op(dest_cr, src_cr, h->c_stride, chroma_height, mx & 7, my & 7);
 }
 
-static inline void mc_part_std(AVSContext *h,int chroma_height,int delta,
- uint8_t *dest_y,uint8_t *dest_cb,uint8_t *dest_cr,
- int x_offset, int y_offset,qpel_mc_func *qpix_put,
- h264_chroma_mc_func chroma_put,qpel_mc_func *qpix_avg,
- h264_chroma_mc_func chroma_avg, cavs_vector *mv)
+static inline void mc_part_std(AVSContext *h, int chroma_height, int delta,
+ uint8_t *dest_y,
+ uint8_t *dest_cb,
+ uint8_t *dest_cr,
+ int x_offset, int y_offset,
+ qpel_mc_func *qpix_put,
+ h264_chroma_mc_func chroma_put,
+ qpel_mc_func *qpix_avg,
+ h264_chroma_mc_func chroma_avg,
+ cavs_vector *mv)
 {
- qpel_mc_func *qpix_op= qpix_put;
- h264_chroma_mc_func chroma_op= chroma_put;
+ qpel_mc_func *qpix_op = qpix_put;
+ h264_chroma_mc_func chroma_op = chroma_put;
 
- dest_y += 2*x_offset + 2*y_offset*h->l_stride;
- dest_cb += x_offset + y_offset*h->c_stride;
- dest_cr += x_offset + y_offset*h->c_stride;
- x_offset += 8*h->mbx;
- y_offset += 8*h->mby;
+ dest_y += x_offset * 2 + y_offset * h->l_stride * 2;
+ dest_cb += x_offset + y_offset * h->c_stride;
+ dest_cr += x_offset + y_offset * h->c_stride;
+ x_offset += 8 * h->mbx;
+ y_offset += 8 * h->mby;
 
- if(mv->ref >= 0){
+ if (mv->ref >= 0) {
 AVFrame *ref = h->DPB[mv->ref].f;
 mc_dir_part(h, ref, chroma_height, delta, 0,
 dest_y, dest_cb, dest_cr, x_offset, y_offset,
 qpix_op, chroma_op, mv);
 
- qpix_op= qpix_avg;
- chroma_op= chroma_avg;
+ qpix_op = qpix_avg;
+ chroma_op = chroma_avg;
 }
 
- if((mv+MV_BWD_OFFS)->ref >= 0){
+ if ((mv + MV_BWD_OFFS)->ref >= 0) {
 AVFrame *ref = h->DPB[0].f;
 mc_dir_part(h, ref, chroma_height, delta, 1,
 dest_y, dest_cb, dest_cr, x_offset, y_offset,
- qpix_op, chroma_op, mv+MV_BWD_OFFS);
+ qpix_op, chroma_op, mv + MV_BWD_OFFS);
 }
 }
 
-void ff_cavs_inter(AVSContext *h, enum cavs_mb mb_type) {
- if(ff_cavs_partition_flags[mb_type] == 0){ // 16x16
+void ff_cavs_inter(AVSContext *h, enum cavs_mb mb_type)
+{
+ if (ff_cavs_partition_flags[mb_type] == 0) { // 16x16
 mc_part_std(h, 8, 0, h->cy, h->cu, h->cv, 0, 0,
- h->cdsp.put_cavs_qpel_pixels_tab[0],
- h->dsp.put_h264_chroma_pixels_tab[0],
- h->cdsp.avg_cavs_qpel_pixels_tab[0],
- h->dsp.avg_h264_chroma_pixels_tab[0],&h->mv[MV_FWD_X0]);
- }else{
+ h->cdsp.put_cavs_qpel_pixels_tab[0],
+ h->h264chroma.put_h264_chroma_pixels_tab[0],
+ h->cdsp.avg_cavs_qpel_pixels_tab[0],
+ h->h264chroma.avg_h264_chroma_pixels_tab[0],
+ &h->mv[MV_FWD_X0]);
+ } else {
 mc_part_std(h, 4, 0, h->cy, h->cu, h->cv, 0, 0,
- h->cdsp.put_cavs_qpel_pixels_tab[1],
- h->dsp.put_h264_chroma_pixels_tab[1],
- h->cdsp.avg_cavs_qpel_pixels_tab[1],
- h->dsp.avg_h264_chroma_pixels_tab[1],&h->mv[MV_FWD_X0]);
+ h->cdsp.put_cavs_qpel_pixels_tab[1],
+ h->h264chroma.put_h264_chroma_pixels_tab[1],
+ h->cdsp.avg_cavs_qpel_pixels_tab[1],
+ h->h264chroma.avg_h264_chroma_pixels_tab[1],
+ &h->mv[MV_FWD_X0]);
 mc_part_std(h, 4, 0, h->cy, h->cu, h->cv, 4, 0,
- h->cdsp.put_cavs_qpel_pixels_tab[1],
- h->dsp.put_h264_chroma_pixels_tab[1],
- h->cdsp.avg_cavs_qpel_pixels_tab[1],
- h->dsp.avg_h264_chroma_pixels_tab[1],&h->mv[MV_FWD_X1]);
+ h->cdsp.put_cavs_qpel_pixels_tab[1],
+ h->h264chroma.put_h264_chroma_pixels_tab[1],
+ h->cdsp.avg_cavs_qpel_pixels_tab[1],
+ h->h264chroma.avg_h264_chroma_pixels_tab[1],
+ &h->mv[MV_FWD_X1]);
 mc_part_std(h, 4, 0, h->cy, h->cu, h->cv, 0, 4,
- h->cdsp.put_cavs_qpel_pixels_tab[1],
- h->dsp.put_h264_chroma_pixels_tab[1],
- h->cdsp.avg_cavs_qpel_pixels_tab[1],
- h->dsp.avg_h264_chroma_pixels_tab[1],&h->mv[MV_FWD_X2]);
+ h->cdsp.put_cavs_qpel_pixels_tab[1],
+ h->h264chroma.put_h264_chroma_pixels_tab[1],
+ h->cdsp.avg_cavs_qpel_pixels_tab[1],
+ h->h264chroma.avg_h264_chroma_pixels_tab[1],
+ &h->mv[MV_FWD_X2]);
 mc_part_std(h, 4, 0, h->cy, h->cu, h->cv, 4, 4,
- h->cdsp.put_cavs_qpel_pixels_tab[1],
- h->dsp.put_h264_chroma_pixels_tab[1],
- h->cdsp.avg_cavs_qpel_pixels_tab[1],
- h->dsp.avg_h264_chroma_pixels_tab[1],&h->mv[MV_FWD_X3]);
+ h->cdsp.put_cavs_qpel_pixels_tab[1],
+ h->h264chroma.put_h264_chroma_pixels_tab[1],
+ h->cdsp.avg_cavs_qpel_pixels_tab[1],
+ h->h264chroma.avg_h264_chroma_pixels_tab[1],
+ &h->mv[MV_FWD_X3]);
 }
 }
 
@@ -497,15 +522,21 @@
 *
 ****************************************************************************/
 
-static inline void scale_mv(AVSContext *h, int *d_x, int *d_y, cavs_vector *src, int distp) {
+static inline void scale_mv(AVSContext *h, int *d_x, int *d_y,
+ cavs_vector *src, int distp)
+{
 int den = h->scale_den[src->ref];
 
- *d_x = (src->x*distp*den + 256 + (src->x>>31)) >> 9;
- *d_y = (src->y*distp*den + 256 + (src->y>>31)) >> 9;
+ *d_x = (src->x * distp * den + 256 + (src->x >> 31)) >> 9;
+ *d_y = (src->y * distp * den + 256 + (src->y >> 31)) >> 9;
 }
 
-static inline void mv_pred_median(AVSContext *h, cavs_vector *mvP,
- cavs_vector *mvA, cavs_vector *mvB, cavs_vector *mvC) {
+static inline void mv_pred_median(AVSContext *h,
+ cavs_vector *mvP,
+ cavs_vector *mvA,
+ cavs_vector *mvB,
+ cavs_vector *mvC)
+{
 int ax, ay, bx, by, cx, cy;
 int len_ab, len_bc, len_ca, len_mid;
 
@@ -514,14 +545,14 @@
 scale_mv(h, &bx, &by, mvB, mvP->dist);
 scale_mv(h, &cx, &cy, mvC, mvP->dist);
 /* find the geometrical median of the three candidates */
- len_ab = abs(ax - bx) + abs(ay - by);
- len_bc = abs(bx - cx) + abs(by - cy);
- len_ca = abs(cx - ax) + abs(cy - ay);
+ len_ab = abs(ax - bx) + abs(ay - by);
+ len_bc = abs(bx - cx) + abs(by - cy);
+ len_ca = abs(cx - ax) + abs(cy - ay);
 len_mid = mid_pred(len_ab, len_bc, len_ca);
- if(len_mid == len_ab) {
+ if (len_mid == len_ab) {
 mvP->x = cx;
 mvP->y = cy;
- } else if(len_mid == len_bc) {
+ } else if (len_mid == len_bc) {
 mvP->x = ax;
 mvP->y = ay;
 } else {
@@ -531,47 +562,49 @@
 }
 
 void ff_cavs_mv(AVSContext *h, enum cavs_mv_loc nP, enum cavs_mv_loc nC,
- enum cavs_mv_pred mode, enum cavs_block size, int ref) {
+ enum cavs_mv_pred mode, enum cavs_block size, int ref)
+{
 cavs_vector *mvP = &h->mv[nP];
 cavs_vector *mvA = &h->mv[nP-1];
 cavs_vector *mvB = &h->mv[nP-4];
 cavs_vector *mvC = &h->mv[nC];
 const cavs_vector *mvP2 = NULL;
 
- mvP->ref = ref;
+ mvP->ref = ref;
 mvP->dist = h->dist[mvP->ref];
- if(mvC->ref == NOT_AVAIL)
- mvC = &h->mv[nP-5]; // set to top-left (mvD)
- if((mode == MV_PRED_PSKIP) &&
- ((mvA->ref == NOT_AVAIL) || (mvB->ref == NOT_AVAIL) ||
- ((mvA->x | mvA->y | mvA->ref) == 0) ||
- ((mvB->x | mvB->y | mvB->ref) == 0) )) {
+ if (mvC->ref == NOT_AVAIL)
+ mvC = &h->mv[nP - 5]; // set to top-left (mvD)
+ if (mode == MV_PRED_PSKIP &&
+ (mvA->ref == NOT_AVAIL ||
+ mvB->ref == NOT_AVAIL ||
+ (mvA->x | mvA->y | mvA->ref) == 0 ||
+ (mvB->x | mvB->y | mvB->ref) == 0)) {
 mvP2 = &un_mv;
 /* if there is only one suitable candidate, take it */
- } else if((mvA->ref >= 0) && (mvB->ref < 0) && (mvC->ref < 0)) {
- mvP2= mvA;
- } else if((mvA->ref < 0) && (mvB->ref >= 0) && (mvC->ref < 0)) {
- mvP2= mvB;
- } else if((mvA->ref < 0) && (mvB->ref < 0) && (mvC->ref >= 0)) {
- mvP2= mvC;
- } else if(mode == MV_PRED_LEFT && mvA->ref == ref){
- mvP2= mvA;
- } else if(mode == MV_PRED_TOP && mvB->ref == ref){
- mvP2= mvB;
- } else if(mode == MV_PRED_TOPRIGHT && mvC->ref == ref){
- mvP2= mvC;
+ } else if (mvA->ref >= 0 && mvB->ref < 0 && mvC->ref < 0) {
+ mvP2 = mvA;
+ } else if (mvA->ref < 0 && mvB->ref >= 0 && mvC->ref < 0) {
+ mvP2 = mvB;
+ } else if (mvA->ref < 0 && mvB->ref < 0 && mvC->ref >= 0) {
+ mvP2 = mvC;
+ } else if (mode == MV_PRED_LEFT && mvA->ref == ref) {
+ mvP2 = mvA;
+ } else if (mode == MV_PRED_TOP && mvB->ref == ref) {
+ mvP2 = mvB;
+ } else if (mode == MV_PRED_TOPRIGHT && mvC->ref == ref) {
+ mvP2 = mvC;
 }
- if(mvP2){
+ if (mvP2) {
 mvP->x = mvP2->x;
 mvP->y = mvP2->y;
- }else
+ } else
 mv_pred_median(h, mvP, mvA, mvB, mvC);
 
- if(mode < MV_PRED_PSKIP) {
+ if (mode < MV_PRED_PSKIP) {
 mvP->x += get_se_golomb(&h->gb);
 mvP->y += get_se_golomb(&h->gb);
 }
- set_mvs(mvP,size);
+ set_mvs(mvP, size);
 }
 
 /*****************************************************************************
@@ -583,36 +616,37 @@
 /**
 * initialise predictors for motion vectors and intra prediction
 */
-void ff_cavs_init_mb(AVSContext *h) {
+void ff_cavs_init_mb(AVSContext *h)
+{
 int i;
 
 /* copy predictors from top line (MB B and C) into cache */
- for(i=0;i<3;i++) {
- h->mv[MV_FWD_B2+i] = h->top_mv[0][h->mbx*2+i];
- h->mv[MV_BWD_B2+i] = h->top_mv[1][h->mbx*2+i];
+ for (i = 0; i < 3; i++) {
+ h->mv[MV_FWD_B2 + i] = h->top_mv[0][h->mbx * 2 + i];
+ h->mv[MV_BWD_B2 + i] = h->top_mv[1][h->mbx * 2 + i];
 }
- h->pred_mode_Y[1] = h->top_pred_Y[h->mbx*2+0];
- h->pred_mode_Y[2] = h->top_pred_Y[h->mbx*2+1];
+ h->pred_mode_Y[1] = h->top_pred_Y[h->mbx * 2 + 0];
+ h->pred_mode_Y[2] = h->top_pred_Y[h->mbx * 2 + 1];
 /* clear top predictors if MB B is not available */
- if(!(h->flags & B_AVAIL)) {
- h->mv[MV_FWD_B2] = un_mv;
- h->mv[MV_FWD_B3] = un_mv;
- h->mv[MV_BWD_B2] = un_mv;
- h->mv[MV_BWD_B3] = un_mv;
+ if (!(h->flags & B_AVAIL)) {
+ h->mv[MV_FWD_B2] = un_mv;
+ h->mv[MV_FWD_B3] = un_mv;
+ h->mv[MV_BWD_B2] = un_mv;
+ h->mv[MV_BWD_B3] = un_mv;
 h->pred_mode_Y[1] = h->pred_mode_Y[2] = NOT_AVAIL;
- h->flags &= ~(C_AVAIL|D_AVAIL);
- } else if(h->mbx) {
+ h->flags &= ~(C_AVAIL | D_AVAIL);
+ } else if (h->mbx) {
 h->flags |= D_AVAIL;
 }
- if(h->mbx == h->mb_width-1) //MB C not available
+ if (h->mbx == h->mb_width - 1) // MB C not available
 h->flags &= ~C_AVAIL;
 /* clear top-right predictors if MB C is not available */
- if(!(h->flags & C_AVAIL)) {
+ if (!(h->flags & C_AVAIL)) {
 h->mv[MV_FWD_C2] = un_mv;
 h->mv[MV_BWD_C2] = un_mv;
 }
 /* clear top-left predictors if MB D is not available */
- if(!(h->flags & D_AVAIL)) {
+ if (!(h->flags & D_AVAIL)) {
 h->mv[MV_FWD_D3] = un_mv;
 h->mv[MV_BWD_D3] = un_mv;
 }
@@ -623,38 +657,39 @@
 * macroblock address
 * @return 0 if end of frame is reached, 1 otherwise
 */
-int ff_cavs_next_mb(AVSContext *h) {
+int ff_cavs_next_mb(AVSContext *h)
+{
 int i;
 
 h->flags |= A_AVAIL;
- h->cy += 16;
- h->cu += 8;
- h->cv += 8;
+ h->cy += 16;
+ h->cu += 8;
+ h->cv += 8;
 /* copy mvs as predictors to the left */
- for(i=0;i<=20;i+=4)
- h->mv[i] = h->mv[i+2];
+ for (i = 0; i <= 20; i += 4)
+ h->mv[i] = h->mv[i + 2];
 /* copy bottom mvs from cache to top line */
- h->top_mv[0][h->mbx*2+0] = h->mv[MV_FWD_X2];
- h->top_mv[0][h->mbx*2+1] = h->mv[MV_FWD_X3];
- h->top_mv[1][h->mbx*2+0] = h->mv[MV_BWD_X2];
- h->top_mv[1][h->mbx*2+1] = h->mv[MV_BWD_X3];
+ h->top_mv[0][h->mbx * 2 + 0] = h->mv[MV_FWD_X2];
+ h->top_mv[0][h->mbx * 2 + 1] = h->mv[MV_FWD_X3];
+ h->top_mv[1][h->mbx * 2 + 0] = h->mv[MV_BWD_X2];
+ h->top_mv[1][h->mbx * 2 + 1] = h->mv[MV_BWD_X3];
 /* next MB address */
 h->mbidx++;
 h->mbx++;
- if(h->mbx == h->mb_width) { //new mb line
- h->flags = B_AVAIL|C_AVAIL;
+ if (h->mbx == h->mb_width) { // New mb line
+ h->flags = B_AVAIL | C_AVAIL;
 /* clear left pred_modes */
 h->pred_mode_Y[3] = h->pred_mode_Y[6] = NOT_AVAIL;
 /* clear left mv predictors */
- for(i=0;i<=20;i+=4)
+ for (i = 0; i <= 20; i += 4)
 h->mv[i] = un_mv;
 h->mbx = 0;
 h->mby++;
 /* re-calculate sample pointers */
 h->cy = h->cur.f->data[0] + h->mby * 16 * h->l_stride;
- h->cu = h->cur.f->data[1] + h->mby * 8 * h->c_stride;
- h->cv = h->cur.f->data[2] + h->mby * 8 * h->c_stride;
- if(h->mby == h->mb_height) { //frame end
+ h->cu = h->cur.f->data[1] + h->mby * 8 * h->c_stride;
+ h->cv = h->cur.f->data[2] + h->mby * 8 * h->c_stride;
+ if (h->mby == h->mb_height) { // Frame end
 return 0;
 }
 }
@@ -667,26 +702,27 @@
 *
 ****************************************************************************/
 
-void ff_cavs_init_pic(AVSContext *h) {
+void ff_cavs_init_pic(AVSContext *h)
+{
 int i;
 
 /* clear some predictors */
- for(i=0;i<=20;i+=4)
+ for (i = 0; i <= 20; i += 4)
 h->mv[i] = un_mv;
 h->mv[MV_BWD_X0] = ff_cavs_dir_mv;
 set_mvs(&h->mv[MV_BWD_X0], BLK_16X16);
 h->mv[MV_FWD_X0] = ff_cavs_dir_mv;
 set_mvs(&h->mv[MV_FWD_X0], BLK_16X16);
 h->pred_mode_Y[3] = h->pred_mode_Y[6] = NOT_AVAIL;
- h->cy = h->cur.f->data[0];
- h->cu = h->cur.f->data[1];
- h->cv = h->cur.f->data[2];
- h->l_stride = h->cur.f->linesize[0];
- h->c_stride = h->cur.f->linesize[1];
- h->luma_scan[2] = 8*h->l_stride;
- h->luma_scan[3] = 8*h->l_stride+8;
- h->mbx = h->mby = h->mbidx = 0;
- h->flags = 0;
+ h->cy = h->cur.f->data[0];
+ h->cu = h->cur.f->data[1];
+ h->cv = h->cur.f->data[2];
+ h->l_stride = h->cur.f->linesize[0];
+ h->c_stride = h->cur.f->linesize[1];
+ h->luma_scan[2] = 8 * h->l_stride;
+ h->luma_scan[3] = 8 * h->l_stride + 8;
+ h->mbx = h->mby = h->mbidx = 0;
+ h->flags = 0;
 }
 
 /*****************************************************************************
@@ -700,77 +736,76 @@
 * this data has to be stored for one complete row of macroblocks
 * and this storage space is allocated here
 */
-void ff_cavs_init_top_lines(AVSContext *h) {
+void ff_cavs_init_top_lines(AVSContext *h)
+{
 /* alloc top line of predictors */
- h->top_qp = av_mallocz( h->mb_width);
- h->top_mv[0] = av_mallocz((h->mb_width*2+1)*sizeof(cavs_vector));
- h->top_mv[1] = av_mallocz((h->mb_width*2+1)*sizeof(cavs_vector));
- h->top_pred_Y = av_mallocz( h->mb_width*2*sizeof(*h->top_pred_Y));
- h->top_border_y = av_mallocz((h->mb_width+1)*16);
- h->top_border_u = av_mallocz( h->mb_width * 10);
- h->top_border_v = av_mallocz( h->mb_width * 10);
+ h->top_qp = av_mallocz(h->mb_width);
+ h->top_mv[0] = av_mallocz((h->mb_width * 2 + 1) * sizeof(cavs_vector));
+ h->top_mv[1] = av_mallocz((h->mb_width * 2 + 1) * sizeof(cavs_vector));
+ h->top_pred_Y = av_mallocz(h->mb_width * 2 * sizeof(*h->top_pred_Y));
+ h->top_border_y = av_mallocz((h->mb_width + 1) * 16);
+ h->top_border_u = av_mallocz(h->mb_width * 10);
+ h->top_border_v = av_mallocz(h->mb_width * 10);
 
 /* alloc space for co-located MVs and types */
- h->col_mv = av_mallocz( h->mb_width*h->mb_height*4*sizeof(cavs_vector));
- h->col_type_base = av_mallocz(h->mb_width*h->mb_height);
- h->block = av_mallocz(64*sizeof(DCTELEM));
+ h->col_mv = av_mallocz(h->mb_width * h->mb_height * 4 *
+ sizeof(cavs_vector));
+ h->col_type_base = av_mallocz(h->mb_width * h->mb_height);
+ h->block = av_mallocz(64 * sizeof(int16_t));
 }
 
-av_cold int ff_cavs_init(AVCodecContext *avctx) {
+av_cold int ff_cavs_init(AVCodecContext *avctx)
+{
 AVSContext *h = avctx->priv_data;
 
 ff_dsputil_init(&h->dsp, avctx);
+ ff_h264chroma_init(&h->h264chroma, 8);
 ff_videodsp_init(&h->vdsp, 8);
 ff_cavsdsp_init(&h->cdsp, avctx);
 ff_init_scantable_permutation(h->dsp.idct_permutation,
 h->cdsp.idct_perm);
 ff_init_scantable(h->dsp.idct_permutation, &h->scantable, ff_zigzag_direct);
 
- h->avctx = avctx;
- avctx->pix_fmt= AV_PIX_FMT_YUV420P;
+ h->avctx = avctx;
+ avctx->pix_fmt = AV_PIX_FMT_YUV420P;
 
- h->cur.f = avcodec_alloc_frame();
- h->DPB[0].f = avcodec_alloc_frame();
- h->DPB[1].f = avcodec_alloc_frame();
+ h->cur.f = av_frame_alloc();
+ h->DPB[0].f = av_frame_alloc();
+ h->DPB[1].f = av_frame_alloc();
 if (!h->cur.f || !h->DPB[0].f || !h->DPB[1].f) {
 ff_cavs_end(avctx);
 return AVERROR(ENOMEM);
 }
 
- h->luma_scan[0] = 0;
- h->luma_scan[1] = 8;
- h->intra_pred_l[ INTRA_L_VERT] = intra_pred_vert;
- h->intra_pred_l[ INTRA_L_HORIZ] = intra_pred_horiz;
- h->intra_pred_l[ INTRA_L_LP] = intra_pred_lp;
- h->intra_pred_l[ INTRA_L_DOWN_LEFT] = intra_pred_down_left;
+ h->luma_scan[0] = 0;
+ h->luma_scan[1] = 8;
+ h->intra_pred_l[INTRA_L_VERT] = intra_pred_vert;
+ h->intra_pred_l[INTRA_L_HORIZ] = intra_pred_horiz;
+ h->intra_pred_l[INTRA_L_LP] = intra_pred_lp;
+ h->intra_pred_l[INTRA_L_DOWN_LEFT] = intra_pred_down_left;
 h->intra_pred_l[INTRA_L_DOWN_RIGHT] = intra_pred_down_right;
- h->intra_pred_l[ INTRA_L_LP_LEFT] = intra_pred_lp_left;
- h->intra_pred_l[ INTRA_L_LP_TOP] = intra_pred_lp_top;
- h->intra_pred_l[ INTRA_L_DC_128] = intra_pred_dc_128;
- h->intra_pred_c[ INTRA_C_LP] = intra_pred_lp;
- h->intra_pred_c[ INTRA_C_HORIZ] = intra_pred_horiz;
- h->intra_pred_c[ INTRA_C_VERT] = intra_pred_vert;
- h->intra_pred_c[ INTRA_C_PLANE] = intra_pred_plane;
- h->intra_pred_c[ INTRA_C_LP_LEFT] = intra_pred_lp_left;
- h->intra_pred_c[ INTRA_C_LP_TOP] = intra_pred_lp_top;
- h->intra_pred_c[ INTRA_C_DC_128] = intra_pred_dc_128;
- h->mv[ 7] = un_mv;
- h->mv[19] = un_mv;
+ h->intra_pred_l[INTRA_L_LP_LEFT] = intra_pred_lp_left;
+ h->intra_pred_l[INTRA_L_LP_TOP] = intra_pred_lp_top;
+ h->intra_pred_l[INTRA_L_DC_128] = intra_pred_dc_128;
+ h->intra_pred_c[INTRA_C_LP] = intra_pred_lp;
+ h->intra_pred_c[INTRA_C_HORIZ] = intra_pred_horiz;
+ h->intra_pred_c[INTRA_C_VERT] = intra_pred_vert;
+ h->intra_pred_c[INTRA_C_PLANE] = intra_pred_plane;
+ h->intra_pred_c[INTRA_C_LP_LEFT] = intra_pred_lp_left;
+ h->intra_pred_c[INTRA_C_LP_TOP] = intra_pred_lp_top;
+ h->intra_pred_c[INTRA_C_DC_128] = intra_pred_dc_128;
+ h->mv[7] = un_mv;
+ h->mv[19] = un_mv;
 return 0;
 }
 
-av_cold int ff_cavs_end(AVCodecContext *avctx) {
+av_cold int ff_cavs_end(AVCodecContext *avctx)
+{
 AVSContext *h = avctx->priv_data;
 
- if (h->cur.f->data[0])
- avctx->release_buffer(avctx, h->cur.f);
- if (h->DPB[0].f->data[0])
- avctx->release_buffer(avctx, h->DPB[0].f);
- if (h->DPB[1].f->data[0])
- avctx->release_buffer(avctx, h->DPB[1].f);
- avcodec_free_frame(&h->cur.f);
- avcodec_free_frame(&h->DPB[0].f);
- avcodec_free_frame(&h->DPB[1].f);
+ av_frame_free(&h->cur.f);
+ av_frame_free(&h->DPB[0].f);
+ av_frame_free(&h->DPB[1].f);
 
 av_free(h->top_qp);
 av_free(h->top_mv[0]);

libav-v9.6.tar.bz2/libavcodec/cavs.h -> libav-v10.1.tar.bz2/libavcodec/cavs.h Changed

libav-v9.6.tar.bz2/libavcodec/cavsdec.c -> libav-v10.1.tar.bz2/libavcodec/cavsdec.c Changed

@@ -516,8 +516,8 @@
 return get_ue_golomb(gb);
 }
 
-static inline int dequant(AVSContext *h, DCTELEM *level_buf, uint8_t *run_buf,
- DCTELEM *dst, int mul, int shift, int coeff_num)
+static inline int dequant(AVSContext *h, int16_t *level_buf, uint8_t *run_buf,
+ int16_t *dst, int mul, int shift, int coeff_num)
 {
 int round = 1 << (shift - 1);
 int pos = -1;
@@ -530,7 +530,7 @@
 av_log(h->avctx, AV_LOG_ERROR,
 "position out of block bounds at pic %d MB(%d,%d)\n",
 h->cur.poc, h->mbx, h->mby);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 dst[scantab[pos]] = (level_buf[coeff_num] * mul + round) >> shift;
 }
@@ -550,10 +550,10 @@
 const struct dec_2dvlc *r, int esc_golomb_order,
 int qp, uint8_t *dst, int stride)
 {
- int i, level_code, esc_code, level, run, mask;
- DCTELEM level_buf[65];
+ int i, level_code, esc_code, level, run, mask, ret;
+ int16_t level_buf[65];
 uint8_t run_buf[65];
- DCTELEM *block = h->block;
+ int16_t *block = h->block;
 
 for (i = 0;i < 65; i++) {
 level_code = get_ue_code(gb, r->golomb_order);
@@ -577,9 +577,9 @@
 level_buf[i] = level;
 run_buf[i] = run;
 }
- if (dequant(h, level_buf, run_buf, block, dequant_mul[qp],
- dequant_shift[qp], i))
- return -1;
+ if ((ret = dequant(h, level_buf, run_buf, block, dequant_mul[qp],
+ dequant_shift[qp], i)) < 0)
+ return ret;
 h->cdsp.cavs_idct8_add(dst, block, stride);
 h->dsp.clear_block(block);
 return 0;
@@ -602,9 +602,9 @@
 
 /* get coded block pattern */
 int cbp = get_ue_golomb(&h->gb);
- if (cbp > 63) {
- av_log(h->avctx, AV_LOG_ERROR, "illegal inter cbp\n");
- return -1;
+ if (cbp > 63 || cbp < 0) {
+ av_log(h->avctx, AV_LOG_ERROR, "illegal inter cbp %d\n", cbp);
+ return AVERROR_INVALIDDATA;
 }
 h->cbp = cbp_tab[cbp][1];
 
@@ -666,16 +666,16 @@
 pred_mode_uv = get_ue_golomb(gb);
 if (pred_mode_uv > 6) {
 av_log(h->avctx, AV_LOG_ERROR, "illegal intra chroma pred mode\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 ff_cavs_modify_mb_i(h, &pred_mode_uv);
 
 /* get coded block pattern */
 if (h->cur.f->pict_type == AV_PICTURE_TYPE_I)
 cbp_code = get_ue_golomb(gb);
- if (cbp_code > 63) {
+ if (cbp_code > 63 || cbp_code < 0) {
 av_log(h->avctx, AV_LOG_ERROR, "illegal intra cbp\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 h->cbp = cbp_tab[cbp_code][0];
 if (h->cbp && !h->qp_fixed)
@@ -928,20 +928,28 @@
 
 static int decode_pic(AVSContext *h)
 {
+ int ret;
 int skip_count = -1;
 enum cavs_mb mb_type;
 
+ if (!h->top_qp) {
+ av_log(h->avctx, AV_LOG_ERROR, "No sequence header decoded yet\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ av_frame_unref(h->cur.f);
+
 skip_bits(&h->gb, 16);//bbv_dwlay
 if (h->stc == PIC_PB_START_CODE) {
 h->cur.f->pict_type = get_bits(&h->gb, 2) + AV_PICTURE_TYPE_I;
 if (h->cur.f->pict_type > AV_PICTURE_TYPE_B) {
 av_log(h->avctx, AV_LOG_ERROR, "illegal picture type\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 /* make sure we have the reference frames we need */
 if (!h->DPB[0].f->data[0] ||
 (!h->DPB[1].f->data[0] && h->cur.f->pict_type == AV_PICTURE_TYPE_B))
- return -1;
+ return AVERROR_INVALIDDATA;
 } else {
 h->cur.f->pict_type = AV_PICTURE_TYPE_I;
 if (get_bits1(&h->gb))
@@ -956,11 +964,11 @@
 if (h->stream_revision > 0)
 skip_bits(&h->gb, 1); //marker_bit
 }
- /* release last B frame */
- if (h->cur.f->data[0])
- h->avctx->release_buffer(h->avctx, h->cur.f);
 
- ff_get_buffer(h->avctx, h->cur.f);
+ 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) {
 int alloc_size = FFALIGN(FFABS(h->cur.f->linesize[0]) + 32, 32);
@@ -1056,8 +1064,7 @@
 } while (ff_cavs_next_mb(h));
 }
 if (h->cur.f->pict_type != AV_PICTURE_TYPE_B) {
- if (h->DPB[1].f->data[0])
- h->avctx->release_buffer(h->avctx, h->DPB[1].f);
+ av_frame_unref(h->DPB[1].f);
 FFSWAP(AVSFrame, h->cur, h->DPB[1]);
 FFSWAP(AVSFrame, h->DPB[0], h->DPB[1]);
 }
@@ -1082,7 +1089,8 @@
 width = get_bits(&h->gb, 14);
 height = get_bits(&h->gb, 14);
 if ((h->width || h->height) && (h->width != width || h->height != height)) {
- av_log_missing_feature(h->avctx, "Width/height changing in CAVS", 0);
+ avpriv_report_missing_feature(h->avctx,
+ "Width/height changing in CAVS");
 return AVERROR_PATCHWELCOME;
 }
 h->width = width;
@@ -1119,19 +1127,15 @@
 AVSContext *h = avctx->priv_data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
- AVFrame *picture = data;
 uint32_t stc = -1;
- int input_size;
+ int input_size, ret;
 const uint8_t *buf_end;
 const uint8_t *buf_ptr;
 
 if (buf_size == 0) {
 if (!h->low_delay && h->DPB[0].f->data[0]) {
 *got_frame = 1;
- *picture = *h->DPB[0].f;
- if (h->cur.f->data[0])
- avctx->release_buffer(avctx, h->cur.f);
- FFSWAP(AVSFrame, h->cur, h->DPB[0]);
+ av_frame_move_ref(data, h->DPB[0].f);
 }
 return 0;
 }
@@ -1139,7 +1143,7 @@
 buf_ptr = buf;
 buf_end = buf + buf_size;
 for(;;) {
- buf_ptr = avpriv_mpv_find_start_code(buf_ptr, buf_end, &stc);
+ buf_ptr = avpriv_find_start_code(buf_ptr, buf_end, &stc);
 if ((stc & 0xFFFFFE00) || buf_ptr == buf_end)
 return FFMAX(0, buf_ptr - buf);
 input_size = (buf_end - buf_ptr) * 8;
@@ -1150,10 +1154,8 @@
 break;
 case PIC_I_START_CODE:
 if (!h->got_keyframe) {
- if(h->DPB[0].f->data[0])
- avctx->release_buffer(avctx, h->DPB[0].f);
- if(h->DPB[1].f->data[0])
- avctx->release_buffer(avctx, h->DPB[1].f);
+ av_frame_unref(h->DPB[0].f);
+ av_frame_unref(h->DPB[1].f);
 h->got_keyframe = 1;
 }
 case PIC_PB_START_CODE:
@@ -1167,12 +1169,14 @@
 *got_frame = 1;
 if (h->cur.f->pict_type != AV_PICTURE_TYPE_B) {
 if (h->DPB[1].f->data[0]) {
- *picture = *h->DPB[1].f;
+ if ((ret = av_frame_ref(data, h->DPB[1].f)) < 0)
+ return ret;
 } else {
 *got_frame = 0;
 }
- } else
- *picture = *h->cur.f;
+ } else {
+ av_frame_move_ref(data, h->cur.f);
+ }
 break;
 case EXT_START_CODE:
 //mpeg_decode_extension(avctx, buf_ptr, input_size);
@@ -1192,6 +1196,7 @@
 
 AVCodec ff_cavs_decoder = {
 .name = "cavs",
+ .long_name = NULL_IF_CONFIG_SMALL("Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile)"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_CAVS,
 .priv_data_size = sizeof(AVSContext),
@@ -1200,5 +1205,4 @@
 .decode = cavs_decode_frame,
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
 .flush = cavs_flush,
- .long_name = NULL_IF_CONFIG_SMALL("Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile)"),
 };

libav-v9.6.tar.bz2/libavcodec/cavsdsp.c -> libav-v10.1.tar.bz2/libavcodec/cavsdsp.c Changed

@@ -183,10 +183,10 @@
 *
 ****************************************************************************/
 
-static void cavs_idct8_add_c(uint8_t *dst, DCTELEM *block, int stride) {
+static void cavs_idct8_add_c(uint8_t *dst, int16_t *block, int stride) {
 int i;
- DCTELEM (*src)[8] = (DCTELEM(*)[8])block;
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ int16_t (*src)[8] = (int16_t(*)[8])block;
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
 
 src[0][0] += 8;
 
@@ -261,7 +261,7 @@
 #define CAVS_SUBPIX(OPNAME, OP, NAME, A, B, C, D, E, F) \
 static void OPNAME ## cavs_filt8_h_ ## NAME(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
 const int h=8;\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
 int i;\
 for(i=0; i<h; i++)\
 {\
@@ -280,7 +280,7 @@
 \
 static void OPNAME ## cavs_filt8_v_ ## NAME(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
 const int w=8;\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
 int i;\
 for(i=0; i<w; i++)\
 {\
@@ -334,7 +334,7 @@
 int16_t *tmp = temp;\
 const int h=8;\
 const int w=8;\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
 int i;\
 src1 -= 2*srcStride;\
 for(i=0; i<h+5; i++)\
@@ -421,63 +421,78 @@
 }\
 
 #define CAVS_MC(OPNAME, SIZE) \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc10_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc10_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## cavs_filt ## SIZE ## _h_qpel_l(dst, src, stride, stride);\
 }\
 \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc20_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc20_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## cavs_filt ## SIZE ## _h_hpel(dst, src, stride, stride);\
 }\
 \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc30_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc30_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## cavs_filt ## SIZE ## _h_qpel_r(dst, src, stride, stride);\
 }\
 \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc01_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc01_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## cavs_filt ## SIZE ## _v_qpel_l(dst, src, stride, stride);\
 }\
 \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc02_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc02_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## cavs_filt ## SIZE ## _v_hpel(dst, src, stride, stride);\
 }\
 \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc03_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc03_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## cavs_filt ## SIZE ## _v_qpel_r(dst, src, stride, stride);\
 }\
 \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc22_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc22_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## cavs_filt ## SIZE ## _hv_jj(dst, src, NULL, stride, stride); \
 }\
 \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc11_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc11_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## cavs_filt ## SIZE ## _hv_egpr(dst, src, src, stride, stride); \
 }\
 \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc13_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc13_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## cavs_filt ## SIZE ## _hv_egpr(dst, src, src+stride, stride, stride); \
 }\
 \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc31_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc31_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## cavs_filt ## SIZE ## _hv_egpr(dst, src, src+1, stride, stride); \
 }\
 \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc33_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## cavs_filt ## SIZE ## _hv_egpr(dst, src, src+stride+1,stride, stride); \
 }\
 \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc21_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc21_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## cavs_filt ## SIZE ## _hv_ff(dst, src, src+stride+1,stride, stride); \
 }\
 \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc12_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc12_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## cavs_filt ## SIZE ## _hv_ii(dst, src, src+stride+1,stride, stride); \
 }\
 \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc32_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc32_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## cavs_filt ## SIZE ## _hv_kk(dst, src, src+stride+1,stride, stride); \
 }\
 \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc23_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc23_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## cavs_filt ## SIZE ## _hv_qq(dst, src, src+stride+1,stride, stride); \
 }\
 
@@ -512,29 +527,29 @@
 CAVS_MC(avg_, 8)
 CAVS_MC(avg_, 16)
 
-#define ff_put_cavs_qpel8_mc00_c ff_put_pixels8x8_c
-#define ff_avg_cavs_qpel8_mc00_c ff_avg_pixels8x8_c
-#define ff_put_cavs_qpel16_mc00_c ff_put_pixels16x16_c
-#define ff_avg_cavs_qpel16_mc00_c ff_avg_pixels16x16_c
+#define put_cavs_qpel8_mc00_c ff_put_pixels8x8_c
+#define avg_cavs_qpel8_mc00_c ff_avg_pixels8x8_c
+#define put_cavs_qpel16_mc00_c ff_put_pixels16x16_c
+#define avg_cavs_qpel16_mc00_c ff_avg_pixels16x16_c
 
 av_cold void ff_cavsdsp_init(CAVSDSPContext* c, AVCodecContext *avctx) {
 #define dspfunc(PFX, IDX, NUM) \
- c->PFX ## _pixels_tab[IDX][ 0] = ff_ ## PFX ## NUM ## _mc00_c; \
- c->PFX ## _pixels_tab[IDX][ 1] = ff_ ## PFX ## NUM ## _mc10_c; \
- c->PFX ## _pixels_tab[IDX][ 2] = ff_ ## PFX ## NUM ## _mc20_c; \
- c->PFX ## _pixels_tab[IDX][ 3] = ff_ ## PFX ## NUM ## _mc30_c; \
- c->PFX ## _pixels_tab[IDX][ 4] = ff_ ## PFX ## NUM ## _mc01_c; \
- c->PFX ## _pixels_tab[IDX][ 5] = ff_ ## PFX ## NUM ## _mc11_c; \
- c->PFX ## _pixels_tab[IDX][ 6] = ff_ ## PFX ## NUM ## _mc21_c; \
- c->PFX ## _pixels_tab[IDX][ 7] = ff_ ## PFX ## NUM ## _mc31_c; \
- c->PFX ## _pixels_tab[IDX][ 8] = ff_ ## PFX ## NUM ## _mc02_c; \
- c->PFX ## _pixels_tab[IDX][ 9] = ff_ ## PFX ## NUM ## _mc12_c; \
- c->PFX ## _pixels_tab[IDX][10] = ff_ ## PFX ## NUM ## _mc22_c; \
- c->PFX ## _pixels_tab[IDX][11] = ff_ ## PFX ## NUM ## _mc32_c; \
- c->PFX ## _pixels_tab[IDX][12] = ff_ ## PFX ## NUM ## _mc03_c; \
- c->PFX ## _pixels_tab[IDX][13] = ff_ ## PFX ## NUM ## _mc13_c; \
- c->PFX ## _pixels_tab[IDX][14] = ff_ ## PFX ## NUM ## _mc23_c; \
- c->PFX ## _pixels_tab[IDX][15] = ff_ ## PFX ## NUM ## _mc33_c
+ c->PFX ## _pixels_tab[IDX][ 0] = PFX ## NUM ## _mc00_c; \
+ c->PFX ## _pixels_tab[IDX][ 1] = PFX ## NUM ## _mc10_c; \
+ c->PFX ## _pixels_tab[IDX][ 2] = PFX ## NUM ## _mc20_c; \
+ c->PFX ## _pixels_tab[IDX][ 3] = PFX ## NUM ## _mc30_c; \
+ c->PFX ## _pixels_tab[IDX][ 4] = PFX ## NUM ## _mc01_c; \
+ c->PFX ## _pixels_tab[IDX][ 5] = PFX ## NUM ## _mc11_c; \
+ c->PFX ## _pixels_tab[IDX][ 6] = PFX ## NUM ## _mc21_c; \
+ c->PFX ## _pixels_tab[IDX][ 7] = PFX ## NUM ## _mc31_c; \
+ c->PFX ## _pixels_tab[IDX][ 8] = PFX ## NUM ## _mc02_c; \
+ c->PFX ## _pixels_tab[IDX][ 9] = PFX ## NUM ## _mc12_c; \
+ c->PFX ## _pixels_tab[IDX][10] = PFX ## NUM ## _mc22_c; \
+ c->PFX ## _pixels_tab[IDX][11] = PFX ## NUM ## _mc32_c; \
+ c->PFX ## _pixels_tab[IDX][12] = PFX ## NUM ## _mc03_c; \
+ c->PFX ## _pixels_tab[IDX][13] = PFX ## NUM ## _mc13_c; \
+ c->PFX ## _pixels_tab[IDX][14] = PFX ## NUM ## _mc23_c; \
+ c->PFX ## _pixels_tab[IDX][15] = PFX ## NUM ## _mc33_c
 dspfunc(put_cavs_qpel, 0, 16);
 dspfunc(put_cavs_qpel, 1, 8);
 dspfunc(avg_cavs_qpel, 0, 16);

libav-v9.6.tar.bz2/libavcodec/cavsdsp.h -> libav-v10.1.tar.bz2/libavcodec/cavsdsp.h Changed

libav-v9.6.tar.bz2/libavcodec/cbrt_tablegen.h -> libav-v10.1.tar.bz2/libavcodec/cbrt_tablegen.h Changed

libav-v9.6.tar.bz2/libavcodec/cdgraphics.c -> libav-v10.1.tar.bz2/libavcodec/cdgraphics.c Changed

@@ -64,26 +64,18 @@
 #define CDG_PALETTE_SIZE 16
 
 typedef struct CDGraphicsContext {
- AVFrame frame;
+ AVFrame *frame;
 int hscroll;
 int vscroll;
 } CDGraphicsContext;
 
-static void cdg_init_frame(AVFrame *frame)
-{
- avcodec_get_frame_defaults(frame);
- frame->reference = 3;
- frame->buffer_hints = FF_BUFFER_HINTS_VALID |
- FF_BUFFER_HINTS_READABLE |
- FF_BUFFER_HINTS_PRESERVE |
- FF_BUFFER_HINTS_REUSABLE;
-}
-
 static av_cold int cdg_decode_init(AVCodecContext *avctx)
 {
 CDGraphicsContext *cc = avctx->priv_data;
 
- cdg_init_frame(&cc->frame);
+ cc->frame = av_frame_alloc();
+ if (!cc->frame)
+ return AVERROR(ENOMEM);
 
 avctx->width = CDG_FULL_WIDTH;
 avctx->height = CDG_FULL_HEIGHT;
@@ -95,8 +87,8 @@
 static void cdg_border_preset(CDGraphicsContext *cc, uint8_t *data)
 {
 int y;
- int lsize = cc->frame.linesize[0];
- uint8_t *buf = cc->frame.data[0];
+ int lsize = cc->frame->linesize[0];
+ uint8_t *buf = cc->frame->data[0];
 int color = data[0] & 0x0F;
 
 if (!(data[1] & 0x0F)) {
@@ -120,7 +112,7 @@
 uint16_t color;
 int i;
 int array_offset = low ? 0 : 8;
- uint32_t *palette = (uint32_t *) cc->frame.data[1];
+ uint32_t *palette = (uint32_t *) cc->frame->data[1];
 
 for (i = 0; i < 8; i++) {
 color = (data[2 * i] << 6) + (data[2 * i + 1] & 0x3F);
@@ -129,7 +121,7 @@
 b = ((color ) & 0x000F) * 17;
 palette[i + array_offset] = r << 16 | g << 8 | b;
 }
- cc->frame.palette_has_changed = 1;
+ cc->frame->palette_has_changed = 1;
 }
 
 static int cdg_tile_block(CDGraphicsContext *cc, uint8_t *data, int b)
@@ -138,8 +130,8 @@
 int color;
 int x, y;
 int ai;
- int stride = cc->frame.linesize[0];
- uint8_t *buf = cc->frame.data[0];
+ int stride = cc->frame->linesize[0];
+ uint8_t *buf = cc->frame->data[0];
 
 ri = (data[2] & 0x1F) * CDG_TILE_HEIGHT + cc->vscroll;
 ci = (data[3] & 0x3F) * CDG_TILE_WIDTH + cc->hscroll;
@@ -210,8 +202,8 @@
 int color;
 int hscmd, h_off, hinc, vscmd, v_off, vinc;
 int y;
- int stride = cc->frame.linesize[0];
- uint8_t *in = cc->frame.data[0];
+ int stride = cc->frame->linesize[0];
+ uint8_t *in = cc->frame->data[0];
 uint8_t *out = new_frame->data[0];
 
 color = data[0] & 0x0F;
@@ -239,7 +231,7 @@
 if (!hinc && !vinc)
 return;
 
- memcpy(new_frame->data[1], cc->frame.data[1], CDG_PALETTE_SIZE * 4);
+ memcpy(new_frame->data[1], cc->frame->data[1], CDG_PALETTE_SIZE * 4);
 
 for (y = FFMAX(0, vinc); y < FFMIN(CDG_FULL_HEIGHT + vinc, CDG_FULL_HEIGHT); y++)
 memcpy(out + FFMAX(0, hinc) + stride * y,
@@ -274,7 +266,7 @@
 int ret;
 uint8_t command, inst;
 uint8_t cdg_data[CDG_DATA_SIZE];
- AVFrame new_frame;
+ AVFrame *frame = data;
 CDGraphicsContext *cc = avctx->priv_data;
 
 if (buf_size < CDG_MINIMUM_PKT_SIZE) {
@@ -282,11 +274,13 @@
 return AVERROR(EINVAL);
 }
 
- ret = avctx->reget_buffer(avctx, &cc->frame);
+ ret = ff_reget_buffer(avctx, cc->frame);
 if (ret) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
 return ret;
 }
+ if (!avctx->frame_number)
+ memset(cc->frame->data[0], 0, cc->frame->linesize[0] * avctx->height);
 
 command = bytestream_get_byte(&buf);
 inst = bytestream_get_byte(&buf);
@@ -298,8 +292,8 @@
 switch (inst) {
 case CDG_INST_MEMORY_PRESET:
 if (!(cdg_data[1] & 0x0F))
- memset(cc->frame.data[0], cdg_data[0] & 0x0F,
- cc->frame.linesize[0] * CDG_FULL_HEIGHT);
+ memset(cc->frame->data[0], cdg_data[0] & 0x0F,
+ cc->frame->linesize[0] * CDG_FULL_HEIGHT);
 break;
 case CDG_INST_LOAD_PAL_LO:
 case CDG_INST_LOAD_PAL_HIGH:
@@ -333,28 +327,33 @@
 return AVERROR(EINVAL);
 }
 
- cdg_init_frame(&new_frame);
- ret = ff_get_buffer(avctx, &new_frame);
+ ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF);
 if (ret) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
 
- cdg_scroll(cc, cdg_data, &new_frame, inst == CDG_INST_SCROLL_COPY);
- avctx->release_buffer(avctx, &cc->frame);
- cc->frame = new_frame;
+ cdg_scroll(cc, cdg_data, frame, inst == CDG_INST_SCROLL_COPY);
+ av_frame_unref(cc->frame);
+ ret = av_frame_ref(cc->frame, frame);
+ if (ret < 0)
+ return ret;
 break;
 default:
 break;
 }
 
+ if (!frame->data[0]) {
+ ret = av_frame_ref(frame, cc->frame);
+ if (ret < 0)
+ return ret;
+ }
 *got_frame = 1;
 } else {
 *got_frame = 0;
 buf_size = 0;
 }
 
- *(AVFrame *) data = cc->frame;
 return buf_size;
 }
 
@@ -362,14 +361,14 @@
 {
 CDGraphicsContext *cc = avctx->priv_data;
 
- if (cc->frame.data[0])
- avctx->release_buffer(avctx, &cc->frame);
+ av_frame_free(&cc->frame);
 
 return 0;
 }
 
 AVCodec ff_cdgraphics_decoder = {
 .name = "cdgraphics",
+ .long_name = NULL_IF_CONFIG_SMALL("CD Graphics video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_CDGRAPHICS,
 .priv_data_size = sizeof(CDGraphicsContext),
@@ -377,5 +376,4 @@
 .close = cdg_decode_end,
 .decode = cdg_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("CD Graphics video"),
 };

libav-v9.6.tar.bz2/libavcodec/cdxl.c -> libav-v10.1.tar.bz2/libavcodec/cdxl.c Changed

@@ -33,7 +33,6 @@
 
 typedef struct {
 AVCodecContext *avctx;
- AVFrame frame;
 int bpp;
 int format;
 int padded_bits;
@@ -49,7 +48,6 @@
 {
 CDXLVideoContext *c = avctx->priv_data;
 
- avcodec_get_frame_defaults(&c->frame);
 c->new_video_size = 0;
 c->avctx = avctx;
 
@@ -113,15 +111,15 @@
 }
 }
 
-static void cdxl_decode_rgb(CDXLVideoContext *c)
+static void cdxl_decode_rgb(CDXLVideoContext *c, AVFrame *frame)
 {
- uint32_t *new_palette = (uint32_t *)c->frame.data[1];
+ uint32_t *new_palette = (uint32_t *)frame->data[1];
 
 import_palette(c, new_palette);
- import_format(c, c->frame.linesize[0], c->frame.data[0]);
+ import_format(c, frame->linesize[0], frame->data[0]);
 }
 
-static void cdxl_decode_ham6(CDXLVideoContext *c)
+static void cdxl_decode_ham6(CDXLVideoContext *c, AVFrame *frame)
 {
 AVCodecContext *avctx = c->avctx;
 uint32_t new_palette[16], r, g, b;
@@ -129,7 +127,7 @@
 int x, y;
 
 ptr = c->new_video;
- out = c->frame.data[0];
+ out = frame->data[0];
 
 import_palette(c, new_palette);
 import_format(c, avctx->width, c->new_video);
@@ -160,11 +158,11 @@
 }
 AV_WL24(out + x * 3, r | g | b);
 }
- out += c->frame.linesize[0];
+ out += frame->linesize[0];
 }
 }
 
-static void cdxl_decode_ham8(CDXLVideoContext *c)
+static void cdxl_decode_ham8(CDXLVideoContext *c, AVFrame *frame)
 {
 AVCodecContext *avctx = c->avctx;
 uint32_t new_palette[64], r, g, b;
@@ -172,7 +170,7 @@
 int x, y;
 
 ptr = c->new_video;
- out = c->frame.data[0];
+ out = frame->data[0];
 
 import_palette(c, new_palette);
 import_format(c, avctx->width, c->new_video);
@@ -203,7 +201,7 @@
 }
 AV_WL24(out + x * 3, r | g | b);
 }
- out += c->frame.linesize[0];
+ out += frame->linesize[0];
 }
 }
 
@@ -211,7 +209,7 @@
 int *got_frame, AVPacket *pkt)
 {
 CDXLVideoContext *c = avctx->priv_data;
- AVFrame * const p = &c->frame;
+ AVFrame * const p = data;
 int ret, w, h, encoding, aligned_width, buf_size = pkt->size;
 const uint8_t *buf = pkt->data;
 
@@ -234,14 +232,12 @@
 if (c->bpp < 1)
 return AVERROR_INVALIDDATA;
 if (c->format != BIT_PLANAR && c->format != BIT_LINE) {
- av_log_ask_for_sample(avctx, "unsupported pixel format: 0x%0x\n", c->format);
+ avpriv_request_sample(avctx, "Pixel format 0x%0x", c->format);
 return AVERROR_PATCHWELCOME;
 }
 
- if ((ret = av_image_check_size(w, h, 0, avctx)) < 0)
+ if ((ret = ff_set_dimensions(avctx, w, h)) < 0)
 return ret;
- if (w != avctx->width || h != avctx->height)
- avcodec_set_dimensions(avctx, w, h);
 
 aligned_width = FFALIGN(c->avctx->width, 16);
 c->padded_bits = aligned_width - c->avctx->width;
@@ -254,16 +250,12 @@
 return AVERROR_INVALIDDATA;
 avctx->pix_fmt = AV_PIX_FMT_BGR24;
 } else {
- av_log_ask_for_sample(avctx, "unsupported encoding %d and bpp %d\n",
+ avpriv_request_sample(avctx, "Encoding %d and bpp %d",
 encoding, c->bpp);
 return AVERROR_PATCHWELCOME;
 }
 
- if (p->data[0])
- avctx->release_buffer(avctx, p);
-
- p->reference = 0;
- if ((ret = ff_get_buffer(avctx, p)) < 0) {
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -275,14 +267,13 @@
 if (!c->new_video)
 return AVERROR(ENOMEM);
 if (c->bpp == 8)
- cdxl_decode_ham8(c);
+ cdxl_decode_ham8(c, p);
 else
- cdxl_decode_ham6(c);
+ cdxl_decode_ham6(c, p);
 } else {
- cdxl_decode_rgb(c);
+ cdxl_decode_rgb(c, p);
 }
 *got_frame = 1;
- *(AVFrame*)data = c->frame;
 
 return buf_size;
 }
@@ -292,14 +283,13 @@
 CDXLVideoContext *c = avctx->priv_data;
 
 av_free(c->new_video);
- if (c->frame.data[0])
- avctx->release_buffer(avctx, &c->frame);
 
 return 0;
 }
 
 AVCodec ff_cdxl_decoder = {
 .name = "cdxl",
+ .long_name = NULL_IF_CONFIG_SMALL("Commodore CDXL video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_CDXL,
 .priv_data_size = sizeof(CDXLVideoContext),
@@ -307,5 +297,4 @@
 .close = cdxl_decode_end,
 .decode = cdxl_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Commodore CDXL video"),
 };

libav-v9.6.tar.bz2/libavcodec/cinepak.c -> libav-v10.1.tar.bz2/libavcodec/cinepak.c Changed

@@ -37,6 +37,7 @@
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
+#include "internal.h"
 
 
 typedef struct {
@@ -57,7 +58,7 @@
 typedef struct CinepakContext {
 
 AVCodecContext *avctx;
- AVFrame frame;
+ AVFrame *frame;
 
 const unsigned char *data;
 int size;
@@ -137,14 +138,14 @@
 
 for (y=strip->y1; y < strip->y2; y+=4) {
 
- iy[0] = strip->x1 + (y * s->frame.linesize[0]);
- iy[1] = iy[0] + s->frame.linesize[0];
- iy[2] = iy[1] + s->frame.linesize[0];
- iy[3] = iy[2] + s->frame.linesize[0];
- iu[0] = (strip->x1/2) + ((y/2) * s->frame.linesize[1]);
- iu[1] = iu[0] + s->frame.linesize[1];
- iv[0] = (strip->x1/2) + ((y/2) * s->frame.linesize[2]);
- iv[1] = iv[0] + s->frame.linesize[2];
+ iy[0] = strip->x1 + (y * s->frame->linesize[0]);
+ iy[1] = iy[0] + s->frame->linesize[0];
+ iy[2] = iy[1] + s->frame->linesize[0];
+ iy[3] = iy[2] + s->frame->linesize[0];
+ iu[0] = (strip->x1/2) + ((y/2) * s->frame->linesize[1]);
+ iu[1] = iu[0] + s->frame->linesize[1];
+ iv[0] = (strip->x1/2) + ((y/2) * s->frame->linesize[2]);
+ iv[1] = iv[0] + s->frame->linesize[2];
 
 for (x=strip->x1; x < strip->x2; x+=4) {
 if ((chunk_id & 0x01) && !(mask >>= 1)) {
@@ -171,40 +172,40 @@
 return AVERROR_INVALIDDATA;
 
 codebook = &strip->v1_codebook[*data++];
- s->frame.data[0][iy[0] + 0] = codebook->y0;
- s->frame.data[0][iy[0] + 1] = codebook->y0;
- s->frame.data[0][iy[1] + 0] = codebook->y0;
- s->frame.data[0][iy[1] + 1] = codebook->y0;
+ s->frame->data[0][iy[0] + 0] = codebook->y0;
+ s->frame->data[0][iy[0] + 1] = codebook->y0;
+ s->frame->data[0][iy[1] + 0] = codebook->y0;
+ s->frame->data[0][iy[1] + 1] = codebook->y0;
 if (!s->palette_video) {
- s->frame.data[1][iu[0]] = codebook->u;
- s->frame.data[2][iv[0]] = codebook->v;
+ s->frame->data[1][iu[0]] = codebook->u;
+ s->frame->data[2][iv[0]] = codebook->v;
 }
 
- s->frame.data[0][iy[0] + 2] = codebook->y1;
- s->frame.data[0][iy[0] + 3] = codebook->y1;
- s->frame.data[0][iy[1] + 2] = codebook->y1;
- s->frame.data[0][iy[1] + 3] = codebook->y1;
+ s->frame->data[0][iy[0] + 2] = codebook->y1;
+ s->frame->data[0][iy[0] + 3] = codebook->y1;
+ s->frame->data[0][iy[1] + 2] = codebook->y1;
+ s->frame->data[0][iy[1] + 3] = codebook->y1;
 if (!s->palette_video) {
- s->frame.data[1][iu[0] + 1] = codebook->u;
- s->frame.data[2][iv[0] + 1] = codebook->v;
+ s->frame->data[1][iu[0] + 1] = codebook->u;
+ s->frame->data[2][iv[0] + 1] = codebook->v;
 }
 
- s->frame.data[0][iy[2] + 0] = codebook->y2;
- s->frame.data[0][iy[2] + 1] = codebook->y2;
- s->frame.data[0][iy[3] + 0] = codebook->y2;
- s->frame.data[0][iy[3] + 1] = codebook->y2;
+ s->frame->data[0][iy[2] + 0] = codebook->y2;
+ s->frame->data[0][iy[2] + 1] = codebook->y2;
+ s->frame->data[0][iy[3] + 0] = codebook->y2;
+ s->frame->data[0][iy[3] + 1] = codebook->y2;
 if (!s->palette_video) {
- s->frame.data[1][iu[1]] = codebook->u;
- s->frame.data[2][iv[1]] = codebook->v;
+ s->frame->data[1][iu[1]] = codebook->u;
+ s->frame->data[2][iv[1]] = codebook->v;
 }
 
- s->frame.data[0][iy[2] + 2] = codebook->y3;
- s->frame.data[0][iy[2] + 3] = codebook->y3;
- s->frame.data[0][iy[3] + 2] = codebook->y3;
- s->frame.data[0][iy[3] + 3] = codebook->y3;
+ s->frame->data[0][iy[2] + 2] = codebook->y3;
+ s->frame->data[0][iy[2] + 3] = codebook->y3;
+ s->frame->data[0][iy[3] + 2] = codebook->y3;
+ s->frame->data[0][iy[3] + 3] = codebook->y3;
 if (!s->palette_video) {
- s->frame.data[1][iu[1] + 1] = codebook->u;
- s->frame.data[2][iv[1] + 1] = codebook->v;
+ s->frame->data[1][iu[1] + 1] = codebook->u;
+ s->frame->data[2][iv[1] + 1] = codebook->v;
 }
 
 } else if (flag & mask) {
@@ -212,43 +213,43 @@
 return AVERROR_INVALIDDATA;
 
 codebook = &strip->v4_codebook[*data++];
- s->frame.data[0][iy[0] + 0] = codebook->y0;
- s->frame.data[0][iy[0] + 1] = codebook->y1;
- s->frame.data[0][iy[1] + 0] = codebook->y2;
- s->frame.data[0][iy[1] + 1] = codebook->y3;
+ s->frame->data[0][iy[0] + 0] = codebook->y0;
+ s->frame->data[0][iy[0] + 1] = codebook->y1;
+ s->frame->data[0][iy[1] + 0] = codebook->y2;
+ s->frame->data[0][iy[1] + 1] = codebook->y3;
 if (!s->palette_video) {
- s->frame.data[1][iu[0]] = codebook->u;
- s->frame.data[2][iv[0]] = codebook->v;
+ s->frame->data[1][iu[0]] = codebook->u;
+ s->frame->data[2][iv[0]] = codebook->v;
 }
 
 codebook = &strip->v4_codebook[*data++];
- s->frame.data[0][iy[0] + 2] = codebook->y0;
- s->frame.data[0][iy[0] + 3] = codebook->y1;
- s->frame.data[0][iy[1] + 2] = codebook->y2;
- s->frame.data[0][iy[1] + 3] = codebook->y3;
+ s->frame->data[0][iy[0] + 2] = codebook->y0;
+ s->frame->data[0][iy[0] + 3] = codebook->y1;
+ s->frame->data[0][iy[1] + 2] = codebook->y2;
+ s->frame->data[0][iy[1] + 3] = codebook->y3;
 if (!s->palette_video) {
- s->frame.data[1][iu[0] + 1] = codebook->u;
- s->frame.data[2][iv[0] + 1] = codebook->v;
+ s->frame->data[1][iu[0] + 1] = codebook->u;
+ s->frame->data[2][iv[0] + 1] = codebook->v;
 }
 
 codebook = &strip->v4_codebook[*data++];
- s->frame.data[0][iy[2] + 0] = codebook->y0;
- s->frame.data[0][iy[2] + 1] = codebook->y1;
- s->frame.data[0][iy[3] + 0] = codebook->y2;
- s->frame.data[0][iy[3] + 1] = codebook->y3;
+ s->frame->data[0][iy[2] + 0] = codebook->y0;
+ s->frame->data[0][iy[2] + 1] = codebook->y1;
+ s->frame->data[0][iy[3] + 0] = codebook->y2;
+ s->frame->data[0][iy[3] + 1] = codebook->y3;
 if (!s->palette_video) {
- s->frame.data[1][iu[1]] = codebook->u;
- s->frame.data[2][iv[1]] = codebook->v;
+ s->frame->data[1][iu[1]] = codebook->u;
+ s->frame->data[2][iv[1]] = codebook->v;
 }
 
 codebook = &strip->v4_codebook[*data++];
- s->frame.data[0][iy[2] + 2] = codebook->y0;
- s->frame.data[0][iy[2] + 3] = codebook->y1;
- s->frame.data[0][iy[3] + 2] = codebook->y2;
- s->frame.data[0][iy[3] + 3] = codebook->y3;
+ s->frame->data[0][iy[2] + 2] = codebook->y0;
+ s->frame->data[0][iy[2] + 3] = codebook->y1;
+ s->frame->data[0][iy[3] + 2] = codebook->y2;
+ s->frame->data[0][iy[3] + 3] = codebook->y3;
 if (!s->palette_video) {
- s->frame.data[1][iu[1] + 1] = codebook->u;
- s->frame.data[2][iv[1] + 1] = codebook->v;
+ s->frame->data[1][iu[1] + 1] = codebook->u;
+ s->frame->data[2][iv[1] + 1] = codebook->v;
 }
 
 }
@@ -333,7 +334,7 @@
 /* if this is the first frame, check for deviant Sega FILM data */
 if (s->sega_film_skip_bytes == -1) {
 if (!encoded_buf_size) {
- av_log_ask_for_sample(s->avctx, "encoded_buf_size is 0");
+ avpriv_request_sample(s->avctx, "encoded_buf_size 0");
 return AVERROR_PATCHWELCOME;
 }
 if (encoded_buf_size != s->size && (s->size % encoded_buf_size) != 0) {
@@ -413,7 +414,9 @@
 avctx->pix_fmt = AV_PIX_FMT_PAL8;
 }
 
- s->frame.data[0] = NULL;
+ s->frame = av_frame_alloc();
+ if (!s->frame)
+ return AVERROR(ENOMEM);
 
 return 0;
 }
@@ -429,10 +432,7 @@
 s->data = buf;
 s->size = buf_size;
 
- s->frame.reference = 1;
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE |
- FF_BUFFER_HINTS_REUSABLE;
- if ((ret = avctx->reget_buffer(avctx, &s->frame))) {
+ if ((ret = ff_reget_buffer(avctx, s->frame))) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
 return ret;
 }
@@ -440,7 +440,7 @@
 if (s->palette_video) {
 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);
 }
 }
@@ -448,10 +448,12 @@
 cinepak_decode(s);
 
 if (s->palette_video)
- memcpy (s->frame.data[1], s->pal, AVPALETTE_SIZE);
+ memcpy (s->frame->data[1], s->pal, AVPALETTE_SIZE);
+
+ if ((ret = av_frame_ref(data, s->frame)) < 0)
+ return ret;
 
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
 /* report that the buffer was completely consumed */
 return buf_size;
@@ -461,14 +463,14 @@
 {
 CinepakContext *s = avctx->priv_data;
 
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ av_frame_free(&s->frame);
 
 return 0;
 }
 
 AVCodec ff_cinepak_decoder = {
 .name = "cinepak",
+ .long_name = NULL_IF_CONFIG_SMALL("Cinepak"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_CINEPAK,
 .priv_data_size = sizeof(CinepakContext),
@@ -476,5 +478,4 @@
 .close = cinepak_decode_end,
 .decode = cinepak_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Cinepak"),
 };

libav-v9.6.tar.bz2/libavcodec/cljr.c -> libav-v10.1.tar.bz2/libavcodec/cljr.c Changed

@@ -29,19 +29,6 @@
 #include "internal.h"
 #include "put_bits.h"
 
-typedef struct CLJRContext {
- AVFrame picture;
-} CLJRContext;
-
-static av_cold int common_init(AVCodecContext *avctx)
-{
- CLJRContext * const a = avctx->priv_data;
-
- avctx->coded_frame = &a->picture;
-
- return 0;
-}
-
 #if CONFIG_CLJR_DECODER
 static int decode_frame(AVCodecContext *avctx,
 void *data, int *got_frame,
@@ -49,14 +36,9 @@
 {
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
- CLJRContext * const a = avctx->priv_data;
 GetBitContext gb;
- AVFrame *picture = data;
- AVFrame * const p = &a->picture;
- int x, y;
-
- if (p->data[0])
- avctx->release_buffer(avctx, p);
+ AVFrame * const p = data;
+ int x, y, ret;
 
 if (avctx->height <= 0 || avctx->width <= 0) {
 av_log(avctx, AV_LOG_ERROR, "Invalid width or height\n");
@@ -69,10 +51,9 @@
 return AVERROR_INVALIDDATA;
 }
 
- p->reference = 0;
- if (ff_get_buffer(avctx, p) < 0) {
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 p->pict_type = AV_PICTURE_TYPE_I;
 p->key_frame = 1;
@@ -80,9 +61,9 @@
 init_get_bits(&gb, buf, buf_size * 8);
 
 for (y = 0; y < avctx->height; y++) {
- uint8_t *luma = &a->picture.data[0][y * a->picture.linesize[0]];
- uint8_t *cb = &a->picture.data[1][y * a->picture.linesize[1]];
- uint8_t *cr = &a->picture.data[2][y * a->picture.linesize[2]];
+ uint8_t *luma = &p->data[0][y * p->linesize[0]];
+ uint8_t *cb = &p->data[1][y * p->linesize[1]];
+ uint8_t *cr = &p->data[2][y * p->linesize[2]];
 for (x = 0; x < avctx->width; x += 4) {
 luma[3] = get_bits(&gb, 5) << 3;
 luma[2] = get_bits(&gb, 5) << 3;
@@ -94,7 +75,6 @@
 }
 }
 
- *picture = a->picture;
 *got_frame = 1;
 
 return buf_size;
@@ -103,32 +83,36 @@
 static av_cold int decode_init(AVCodecContext *avctx)
 {
 avctx->pix_fmt = AV_PIX_FMT_YUV411P;
- return common_init(avctx);
-}
-
-static av_cold int decode_end(AVCodecContext *avctx)
-{
- CLJRContext *a = avctx->priv_data;
-
- if (a->picture.data[0])
- avctx->release_buffer(avctx, &a->picture);
 return 0;
 }
 
 AVCodec ff_cljr_decoder = {
 .name = "cljr",
+ .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_CLJR,
- .priv_data_size = sizeof(CLJRContext),
 .init = decode_init,
- .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 };
 #endif
 
 #if CONFIG_CLJR_ENCODER
+static av_cold int encode_init(AVCodecContext *avctx)
+{
+ avctx->coded_frame = av_frame_alloc();
+ if (!avctx->coded_frame)
+ return AVERROR(ENOMEM);
+
+ return 0;
+}
+
+static av_cold int encode_close(AVCodecContext *avctx)
+{
+ av_frame_free(&avctx->coded_frame);
+ return 0;
+}
+
 static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 const AVFrame *p, int *got_packet)
 {
@@ -170,13 +154,13 @@
 
 AVCodec ff_cljr_encoder = {
 .name = "cljr",
+ .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_CLJR,
- .priv_data_size = sizeof(CLJRContext),
- .init = common_init,
+ .init = encode_init,
 .encode2 = encode_frame,
+ .close = encode_close,
 .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV411P,
 AV_PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 };
 #endif

libav-v9.6.tar.bz2/libavcodec/cllc.c -> libav-v10.1.tar.bz2/libavcodec/cllc.c Changed

@@ -1,7 +1,7 @@
 /*
 * Canopus Lossless Codec decoder
 *
- * Copyright (c) 2012 Derek Buitenhuis
+ * Copyright (c) 2012-2013 Derek Buitenhuis
 *
 * This file is part of Libav.
 *
@@ -136,14 +136,13 @@
 
 CLOSE_READER(bits, gb);
 
- dst -= 4 * ctx->avctx->width;
- top_left[0] = dst[0];
+ top_left[0] = outbuf[0];
 
 /* Only stash components if they are not transparent */
 if (top_left[0]) {
- top_left[1] = dst[1];
- top_left[2] = dst[2];
- top_left[3] = dst[3];
+ top_left[1] = outbuf[1];
+ top_left[2] = outbuf[2];
+ top_left[3] = outbuf[3];
 }
 
 return 0;
@@ -174,7 +173,35 @@
 CLOSE_READER(bits, gb);
 
 /* Stash the first pixel */
- *top_left = dst[-3 * ctx->avctx->width];
+ *top_left = outbuf[0];
+
+ return 0;
+}
+
+static int read_yuv_component_line(CLLCContext *ctx, GetBitContext *gb,
+ int *top_left, VLC *vlc, uint8_t *outbuf,
+ int is_chroma)
+{
+ int pred, code;
+ int i;
+
+ OPEN_READER(bits, gb);
+
+ pred = *top_left;
+
+ /* Simultaneously read and restore the line */
+ for (i = 0; i < ctx->avctx->width >> is_chroma; i++) {
+ UPDATE_CACHE(bits, gb);
+ GET_VLC(code, bits, gb, vlc->table, 7, 2);
+
+ pred += code;
+ outbuf[i] = pred;
+ }
+
+ CLOSE_READER(bits, gb);
+
+ /* Stash the first pixel */
+ *top_left = outbuf[0];
 
 return 0;
 }
@@ -267,22 +294,72 @@
 return 0;
 }
 
+static int decode_yuv_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic)
+{
+ AVCodecContext *avctx = ctx->avctx;
+ uint8_t block;
+ uint8_t *dst[3];
+ int pred[3];
+ int ret;
+ int i, j;
+ VLC vlc[2];
+
+ pred[0] = 0x80;
+ pred[1] = 0x80;
+ pred[2] = 0x80;
+
+ dst[0] = pic->data[0];
+ dst[1] = pic->data[1];
+ dst[2] = pic->data[2];
+
+ skip_bits(gb, 8);
+
+ block = get_bits(gb, 8);
+ if (block) {
+ avpriv_request_sample(ctx->avctx, "Blocked YUV");
+ return AVERROR_PATCHWELCOME;
+ }
+
+ /* Read in code table for luma and chroma */
+ for (i = 0; i < 2; i++) {
+ ret = read_code_table(ctx, gb, &vlc[i]);
+ if (ret < 0) {
+ for (j = 0; j <= i; j++)
+ ff_free_vlc(&vlc[j]);
+
+ av_log(ctx->avctx, AV_LOG_ERROR,
+ "Could not read code table %d.\n", i);
+ return ret;
+ }
+ }
+
+ /* Read in and restore every line */
+ for (i = 0; i < avctx->height; i++) {
+ read_yuv_component_line(ctx, gb, &pred[0], &vlc[0], dst[0], 0); /* Y */
+ read_yuv_component_line(ctx, gb, &pred[1], &vlc[1], dst[1], 1); /* U */
+ read_yuv_component_line(ctx, gb, &pred[2], &vlc[1], dst[2], 1); /* V */
+
+ for (j = 0; j < 3; j++)
+ dst[j] += pic->linesize[j];
+ }
+
+ for (i = 0; i < 2; i++)
+ ff_free_vlc(&vlc[i]);
+
+ return 0;
+}
+
 static int cllc_decode_frame(AVCodecContext *avctx, void *data,
 int *got_picture_ptr, AVPacket *avpkt)
 {
 CLLCContext *ctx = avctx->priv_data;
- AVFrame *pic = avctx->coded_frame;
+ AVFrame *pic = data;
 uint8_t *src = avpkt->data;
 uint32_t info_tag, info_offset;
 int data_size;
 GetBitContext gb;
 int coding_type, ret;
 
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
-
- pic->reference = 0;
-
 /* Skip the INFO header if present */
 info_offset = 0;
 info_tag = AV_RL32(src);
@@ -329,12 +406,27 @@
 av_log(avctx, AV_LOG_DEBUG, "Frame coding type: %d\n", coding_type);
 
 switch (coding_type) {
+ case 0:
+ avctx->pix_fmt = AV_PIX_FMT_YUV422P;
+ avctx->bits_per_raw_sample = 8;
+
+ ret = ff_get_buffer(avctx, pic, 0);
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
+ return ret;
+ }
+
+ ret = decode_yuv_frame(ctx, &gb, pic);
+ if (ret < 0)
+ return ret;
+
+ break;
 case 1:
 case 2:
 avctx->pix_fmt = AV_PIX_FMT_RGB24;
 avctx->bits_per_raw_sample = 8;
 
- ret = ff_get_buffer(avctx, pic);
+ ret = ff_get_buffer(avctx, pic, 0);
 if (ret < 0) {
 av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
 return ret;
@@ -349,7 +441,7 @@
 avctx->pix_fmt = AV_PIX_FMT_ARGB;
 avctx->bits_per_raw_sample = 8;
 
- ret = ff_get_buffer(avctx, pic);
+ ret = ff_get_buffer(avctx, pic, 0);
 if (ret < 0) {
 av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
 return ret;
@@ -369,7 +461,6 @@
 pic->pict_type = AV_PICTURE_TYPE_I;
 
 *got_picture_ptr = 1;
- *(AVFrame *)data = *pic;
 
 return avpkt->size;
 }
@@ -378,10 +469,6 @@
 {
 CLLCContext *ctx = avctx->priv_data;
 
- if (avctx->coded_frame->data[0])
- avctx->release_buffer(avctx, avctx->coded_frame);
-
- av_freep(&avctx->coded_frame);
 av_freep(&ctx->swapped_buf);
 
 return 0;
@@ -398,17 +485,12 @@
 
 ff_dsputil_init(&ctx->dsp, avctx);
 
- avctx->coded_frame = avcodec_alloc_frame();
- if (!avctx->coded_frame) {
- av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n");
- return AVERROR(ENOMEM);
- }
-
 return 0;
 }
 
 AVCodec ff_cllc_decoder = {
 .name = "cllc",
+ .long_name = NULL_IF_CONFIG_SMALL("Canopus Lossless Codec"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_CLLC,
 .priv_data_size = sizeof(CLLCContext),
@@ -416,5 +498,4 @@
 .decode = cllc_decode_frame,
 .close = cllc_decode_close,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Canopus Lossless Codec"),
 };

libav-v9.6.tar.bz2/libavcodec/cngdec.c -> libav-v10.1.tar.bz2/libavcodec/cngdec.c Changed

@@ -28,7 +28,6 @@
 #include "libavutil/lfg.h"
 
 typedef struct CNGContext {
- AVFrame avframe;
 float *refl_coef, *target_refl_coef;
 float *lpc_coef;
 int order;
@@ -58,8 +57,6 @@
 avctx->channels = 1;
 avctx->sample_rate = 8000;
 
- avcodec_get_frame_defaults(&p->avframe);
- avctx->coded_frame = &p->avframe;
 p->order = 12;
 avctx->frame_size = 640;
 p->refl_coef = av_mallocz(p->order * sizeof(*p->refl_coef));
@@ -105,7 +102,7 @@
 static int cng_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
-
+ AVFrame *frame = data;
 CNGContext *p = avctx->priv_data;
 int buf_size = avpkt->size;
 int ret, i;
@@ -144,25 +141,25 @@
 ff_celp_lp_synthesis_filterf(p->filter_out + p->order, p->lpc_coef,
 p->excitation, avctx->frame_size, p->order);
 
- p->avframe.nb_samples = avctx->frame_size;
- if ((ret = ff_get_buffer(avctx, &p->avframe)) < 0) {
+ frame->nb_samples = avctx->frame_size;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- buf_out = (int16_t *)p->avframe.data[0];
+ buf_out = (int16_t *)frame->data[0];
 for (i = 0; i < avctx->frame_size; i++)
 buf_out[i] = p->filter_out[i + p->order];
 memcpy(p->filter_out, p->filter_out + avctx->frame_size,
 p->order * sizeof(*p->filter_out));
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = p->avframe;
+ *got_frame_ptr = 1;
 
 return buf_size;
 }
 
 AVCodec ff_comfortnoise_decoder = {
 .name = "comfortnoise",
+ .long_name = NULL_IF_CONFIG_SMALL("RFC 3389 comfort noise generator"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_COMFORT_NOISE,
 .priv_data_size = sizeof(CNGContext),
@@ -170,7 +167,6 @@
 .decode = cng_decode_frame,
 .flush = cng_decode_flush,
 .close = cng_decode_close,
- .long_name = NULL_IF_CONFIG_SMALL("RFC 3389 comfort noise generator"),
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
 AV_SAMPLE_FMT_NONE },
 .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,

libav-v9.6.tar.bz2/libavcodec/cngenc.c -> libav-v10.1.tar.bz2/libavcodec/cngenc.c Changed

libav-v9.6.tar.bz2/libavcodec/codec_desc.c -> libav-v10.1.tar.bz2/libavcodec/codec_desc.c Changed

@@ -18,10 +18,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 */
@@ -39,6 +39,7 @@
 .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"),
 .props = AV_CODEC_PROP_LOSSY,
 },
+#if FF_API_XVMC
 {
 .id = AV_CODEC_ID_MPEG2VIDEO_XVMC,
 .type = AVMEDIA_TYPE_VIDEO,
@@ -46,6 +47,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,
@@ -419,13 +421,6 @@
 .props = AV_CODEC_PROP_LOSSLESS,
 },
 {
- .id = AV_CODEC_ID_SNOW,
- .type = AVMEDIA_TYPE_VIDEO,
- .name = "snow",
- .long_name = NULL_IF_CONFIG_SMALL("Snow"),
- .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS,
- },
- {
 .id = AV_CODEC_ID_TSCC,
 .type = AVMEDIA_TYPE_VIDEO,
 .name = "tscc",
@@ -1020,6 +1015,13 @@
 .props = AV_CODEC_PROP_LOSSY,
 },
 {
+ .id = AV_CODEC_ID_VP9,
+ .type = AVMEDIA_TYPE_VIDEO,
+ .name = "vp9",
+ .long_name = NULL_IF_CONFIG_SMALL("Google VP9"),
+ .props = AV_CODEC_PROP_LOSSY,
+ },
+ {
 .id = AV_CODEC_ID_PICTOR,
 .type = AVMEDIA_TYPE_VIDEO,
 .name = "pictor",
@@ -1207,6 +1209,56 @@
 .long_name = NULL_IF_CONFIG_SMALL("MS Windows Media Video V9 Screen"),
 .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
 },
+ {
+ .id = AV_CODEC_ID_AIC,
+ .type = AVMEDIA_TYPE_VIDEO,
+ .name = "aic",
+ .long_name = NULL_IF_CONFIG_SMALL("Apple Intermediate Codec"),
+ .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
+ },
+ {
+ .id = AV_CODEC_ID_ESCAPE130,
+ .type = AVMEDIA_TYPE_VIDEO,
+ .name = "escape130",
+ .long_name = NULL_IF_CONFIG_SMALL("Escape 130"),
+ .props = AV_CODEC_PROP_LOSSY,
+ },
+ {
+ .id = AV_CODEC_ID_G2M,
+ .type = AVMEDIA_TYPE_VIDEO,
+ .name = "g2m",
+ .long_name = NULL_IF_CONFIG_SMALL("Go2Meeting"),
+ .props = AV_CODEC_PROP_LOSSY,
+ },
+ {
+ .id = AV_CODEC_ID_WEBP,
+ .type = AVMEDIA_TYPE_VIDEO,
+ .name = "webp",
+ .long_name = NULL_IF_CONFIG_SMALL("WebP"),
+ .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("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" */
 {
@@ -1341,6 +1393,20 @@
 .props = AV_CODEC_PROP_LOSSLESS,
 },
 {
+ .id = AV_CODEC_ID_PCM_S24LE_PLANAR,
+ .type = AVMEDIA_TYPE_AUDIO,
+ .name = "pcm_s24le_planar",
+ .long_name = NULL_IF_CONFIG_SMALL("PCM signed 24-bit little-endian planar"),
+ .props = AV_CODEC_PROP_LOSSLESS,
+ },
+ {
+ .id = AV_CODEC_ID_PCM_S32LE_PLANAR,
+ .type = AVMEDIA_TYPE_AUDIO,
+ .name = "pcm_s32le_planar",
+ .long_name = NULL_IF_CONFIG_SMALL("PCM signed 32-bit little-endian planar"),
+ .props = AV_CODEC_PROP_LOSSLESS,
+ },
+ {
 .id = AV_CODEC_ID_PCM_DVD,
 .type = AVMEDIA_TYPE_AUDIO,
 .name = "pcm_dvd",
@@ -1899,9 +1965,10 @@
 .id = AV_CODEC_ID_ATRAC3,
 .type = AVMEDIA_TYPE_AUDIO,
 .name = "atrac3",
- .long_name = NULL_IF_CONFIG_SMALL("Atrac 3 (Adaptive TRansform Acoustic Coding 3)"),
+ .long_name = NULL_IF_CONFIG_SMALL("ATRAC3 (Adaptive TRansform Acoustic Coding 3)"),
 .props = AV_CODEC_PROP_LOSSY,
 },
+#if FF_API_VOXWARE
 {
 .id = AV_CODEC_ID_VOXWARE,
 .type = AVMEDIA_TYPE_AUDIO,
@@ -1909,6 +1976,7 @@
 .long_name = NULL_IF_CONFIG_SMALL("Voxware RT29 Metasound"),
 .props = AV_CODEC_PROP_LOSSY,
 },
+#endif
 {
 .id = AV_CODEC_ID_APE,
 .type = AVMEDIA_TYPE_AUDIO,
@@ -1962,7 +2030,7 @@
 .id = AV_CODEC_ID_ATRAC3P,
 .type = AVMEDIA_TYPE_AUDIO,
 .name = "atrac3p",
- .long_name = NULL_IF_CONFIG_SMALL("Sony ATRAC3+"),
+ .long_name = NULL_IF_CONFIG_SMALL("ATRAC3+ (Adaptive TRansform Acoustic Coding 3+)"),
 .props = AV_CODEC_PROP_LOSSY,
 },
 {
@@ -2011,7 +2079,7 @@
 .id = AV_CODEC_ID_ATRAC1,
 .type = AVMEDIA_TYPE_AUDIO,
 .name = "atrac1",
- .long_name = NULL_IF_CONFIG_SMALL("Atrac 1 (Adaptive TRansform Acoustic Coding)"),
+ .long_name = NULL_IF_CONFIG_SMALL("ATRAC1 (Adaptive TRansform Acoustic Coding)"),
 .props = AV_CODEC_PROP_LOSSY,
 },
 {
@@ -2126,6 +2194,13 @@
 .long_name = NULL_IF_CONFIG_SMALL("TAK (Tom's lossless Audio Kompressor)"),
 .props = AV_CODEC_PROP_LOSSLESS,
 },
+ {
+ .id = AV_CODEC_ID_METASOUND,
+ .type = AVMEDIA_TYPE_AUDIO,
+ .name = "metasound",
+ .long_name = NULL_IF_CONFIG_SMALL("Voxware MetaSound"),
+ .props = AV_CODEC_PROP_LOSSY,
+ },
 
 /* subtitle codecs */
 {

libav-v9.6.tar.bz2/libavcodec/cook.c -> libav-v10.1.tar.bz2/libavcodec/cook.c Changed

@@ -123,7 +123,6 @@
 
 AVCodecContext* avctx;
 DSPContext dsp;
- AVFrame frame;
 GetBitContext gb;
 /* stream data */
 int num_vectors;
@@ -944,6 +943,7 @@
 static int cook_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 COOKContext *q = avctx->priv_data;
@@ -957,12 +957,12 @@
 
 /* get output buffer */
 if (q->discarded_packets >= 2) {
- q->frame.nb_samples = q->samples_per_channel;
- if ((ret = ff_get_buffer(avctx, &q->frame)) < 0) {
+ frame->nb_samples = q->samples_per_channel;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- samples = (float **)q->frame.extended_data;
+ samples = (float **)frame->extended_data;
 }
 
 /* estimate subpacket sizes */
@@ -1003,8 +1003,7 @@
 return avctx->block_align;
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *) data = q->frame;
+ *got_frame_ptr = 1;
 
 return avctx->block_align;
 }
@@ -1101,7 +1100,7 @@
 switch (q->subpacket[s].cookversion) {
 case MONO:
 if (avctx->channels != 1) {
- av_log_ask_for_sample(avctx, "Container channels != 1.\n");
+ avpriv_request_sample(avctx, "Container channels != 1");
 return AVERROR_PATCHWELCOME;
 }
 av_log(avctx, AV_LOG_DEBUG, "MONO\n");
@@ -1115,7 +1114,7 @@
 break;
 case JOINT_STEREO:
 if (avctx->channels != 2) {
- av_log_ask_for_sample(avctx, "Container channels != 2.\n");
+ avpriv_request_sample(avctx, "Container channels != 2");
 return AVERROR_PATCHWELCOME;
 }
 av_log(avctx, AV_LOG_DEBUG, "JOINT_STEREO\n");
@@ -1155,7 +1154,8 @@
 
 break;
 default:
- av_log_ask_for_sample(avctx, "Unknown Cook version.\n");
+ avpriv_request_sample(avctx, "Cook version %d",
+ q->subpacket[s].cookversion);
 return AVERROR_PATCHWELCOME;
 }
 
@@ -1171,7 +1171,7 @@
 
 /* Try to catch some obviously faulty streams, othervise it might be exploitable */
 if (q->subpacket[s].total_subbands > 53) {
- av_log_ask_for_sample(avctx, "total_subbands > 53\n");
+ avpriv_request_sample(avctx, "total_subbands > 53");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -1183,7 +1183,7 @@
 }
 
 if (q->subpacket[s].subbands > 50) {
- av_log_ask_for_sample(avctx, "subbands > 50\n");
+ avpriv_request_sample(avctx, "subbands > 50");
 return AVERROR_PATCHWELCOME;
 }
 q->subpacket[s].gains1.now = q->subpacket[s].gain_1;
@@ -1194,7 +1194,7 @@
 q->num_subpackets++;
 s++;
 if (s > MAX_SUBPACKETS) {
- av_log_ask_for_sample(avctx, "Too many subpackets > 5\n");
+ avpriv_request_sample(avctx, "subpackets > %d", MAX_SUBPACKETS);
 return AVERROR_PATCHWELCOME;
 }
 }
@@ -1236,8 +1236,7 @@
 /* Try to catch some obviously faulty streams, othervise it might be exploitable */
 if (q->samples_per_channel != 256 && q->samples_per_channel != 512 &&
 q->samples_per_channel != 1024) {
- av_log_ask_for_sample(avctx,
- "unknown amount of samples_per_channel = %d\n",
+ avpriv_request_sample(avctx, "samples_per_channel = %d",
 q->samples_per_channel);
 return AVERROR_PATCHWELCOME;
 }
@@ -1248,9 +1247,6 @@
 else
 avctx->channel_layout = (avctx->channels == 2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO;
 
- avcodec_get_frame_defaults(&q->frame);
- avctx->coded_frame = &q->frame;
-
 #ifdef DEBUG
 dump_cook_context(q);
 #endif
@@ -1259,6 +1255,7 @@
 
 AVCodec ff_cook_decoder = {
 .name = "cook",
+ .long_name = NULL_IF_CONFIG_SMALL("Cook / Cooker / Gecko (RealAudio G2)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_COOK,
 .priv_data_size = sizeof(COOKContext),
@@ -1266,7 +1263,6 @@
 .close = cook_decode_close,
 .decode = cook_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Cook / Cooker / Gecko (RealAudio G2)"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_NONE },
 };

libav-v10.1.tar.bz2/libavcodec/copy_block.h Added

@@ -0,0 +1,61 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_COPY_BLOCK_H
+#define AVCODEC_COPY_BLOCK_H
+
+#include <stdint.h>
+
+#include "libavutil/intreadwrite.h"
+
+static inline void copy_block8(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
+{
+ int i;
+ for(i=0; i<h; i++)
+ {
+ AV_COPY64U(dst, src);
+ dst+=dstStride;
+ src+=srcStride;
+ }
+}
+
+static inline void copy_block9(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
+{
+ int i;
+ for(i=0; i<h; i++)
+ {
+ AV_COPY64U(dst, src);
+ dst[8]= src[8];
+ dst+=dstStride;
+ src+=srcStride;
+ }
+}
+
+static inline void copy_block17(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
+{
+ int i;
+ for(i=0; i<h; i++)
+ {
+ AV_COPY128U(dst, src);
+ dst[16]= src[16];
+ dst+=dstStride;
+ src+=srcStride;
+ }
+}
+
+#endif /* AVCODEC_COPY_BLOCK_H */

libav-v9.6.tar.bz2/libavcodec/cos_tablegen.c -> libav-v10.1.tar.bz2/libavcodec/cos_tablegen.c Changed

libav-v9.6.tar.bz2/libavcodec/cscd.c -> libav-v10.1.tar.bz2/libavcodec/cscd.c Changed

@@ -31,7 +31,6 @@
 #include "libavutil/lzo.h"
 
 typedef struct {
- AVFrame pic;
 int linelen, height, bpp;
 unsigned int decomp_size;
 unsigned char* decomp_buf;
@@ -143,20 +142,16 @@
 int buf_size = avpkt->size;
 CamStudioContext *c = avctx->priv_data;
 AVFrame *picture = data;
+ int ret;
 
 if (buf_size < 2) {
 av_log(avctx, AV_LOG_ERROR, "coded frame too small\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
- c->pic.reference = 1;
- c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_READABLE |
- FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if (ff_get_buffer(avctx, &c->pic) < 0) {
+ if ((ret = ff_get_buffer(avctx, picture, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 // decompress data
@@ -175,46 +170,45 @@
 break;
 #else
 av_log(avctx, AV_LOG_ERROR, "compiled without zlib support\n");
- return -1;
+ return AVERROR(ENOSYS);
 #endif
 }
 default:
 av_log(avctx, AV_LOG_ERROR, "unknown compression\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 // flip upside down, add difference frame
 if (buf[0] & 1) { // keyframe
- c->pic.pict_type = AV_PICTURE_TYPE_I;
- c->pic.key_frame = 1;
+ picture->pict_type = AV_PICTURE_TYPE_I;
+ picture->key_frame = 1;
 switch (c->bpp) {
 case 16:
- copy_frame_16(&c->pic, c->decomp_buf, c->linelen, c->height);
+ copy_frame_16(picture, c->decomp_buf, c->linelen, c->height);
 break;
 case 32:
- copy_frame_32(&c->pic, c->decomp_buf, c->linelen, c->height);
+ copy_frame_32(picture, c->decomp_buf, c->linelen, c->height);
 break;
 default:
- copy_frame_default(&c->pic, c->decomp_buf, FFALIGN(c->linelen, 4),
+ copy_frame_default(picture, c->decomp_buf, FFALIGN(c->linelen, 4),
 c->linelen, c->height);
 }
 } else {
- c->pic.pict_type = AV_PICTURE_TYPE_P;
- c->pic.key_frame = 0;
+ picture->pict_type = AV_PICTURE_TYPE_P;
+ picture->key_frame = 0;
 switch (c->bpp) {
 case 16:
- add_frame_16(&c->pic, c->decomp_buf, c->linelen, c->height);
+ add_frame_16(picture, c->decomp_buf, c->linelen, c->height);
 break;
 case 32:
- add_frame_32(&c->pic, c->decomp_buf, c->linelen, c->height);
+ add_frame_32(picture, c->decomp_buf, c->linelen, c->height);
 break;
 default:
- add_frame_default(&c->pic, c->decomp_buf, FFALIGN(c->linelen, 4),
+ add_frame_default(picture, c->decomp_buf, FFALIGN(c->linelen, 4),
 c->linelen, c->height);
 }
 }
 
- *picture = c->pic;
 *got_frame = 1;
 return buf_size;
 }
@@ -233,7 +227,6 @@
 return AVERROR_INVALIDDATA;
 }
 c->bpp = avctx->bits_per_coded_sample;
- c->pic.data[0] = NULL;
 c->linelen = avctx->width * avctx->bits_per_coded_sample / 8;
 c->height = avctx->height;
 stride = c->linelen;
@@ -251,13 +244,12 @@
 static av_cold int decode_end(AVCodecContext *avctx) {
 CamStudioContext *c = avctx->priv_data;
 av_freep(&c->decomp_buf);
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
 return 0;
 }
 
 AVCodec ff_cscd_decoder = {
 .name = "camstudio",
+ .long_name = NULL_IF_CONFIG_SMALL("CamStudio"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_CSCD,
 .priv_data_size = sizeof(CamStudioContext),
@@ -265,5 +257,4 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("CamStudio"),
 };

libav-v9.6.tar.bz2/libavcodec/cyuv.c -> libav-v10.1.tar.bz2/libavcodec/cyuv.c Changed

@@ -33,7 +33,6 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "libavutil/internal.h"
 
@@ -41,7 +40,6 @@
 typedef struct CyuvDecodeContext {
 AVCodecContext *avctx;
 int width, height;
- AVFrame frame;
 } CyuvDecodeContext;
 
 static av_cold int cyuv_decode_init(AVCodecContext *avctx)
@@ -52,7 +50,7 @@
 s->width = avctx->width;
 /* width needs to be divisible by 4 for this codec to work */
 if (s->width & 0x3)
- return -1;
+ return AVERROR_INVALIDDATA;
 s->height = avctx->height;
 avctx->pix_fmt = AV_PIX_FMT_YUV411P;
 
@@ -66,6 +64,7 @@
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 CyuvDecodeContext *s=avctx->priv_data;
+ AVFrame *frame = data;
 
 unsigned char *y_plane;
 unsigned char *u_plane;
@@ -83,6 +82,7 @@
 int stream_ptr;
 unsigned char cur_byte;
 int pixel_groups;
+ int ret;
 
 if (avctx->codec_id == AV_CODEC_ID_AURA) {
 y_table = u_table;
@@ -95,32 +95,27 @@
 if (buf_size != 48 + s->height * (s->width * 3 / 4)) {
 av_log(avctx, AV_LOG_ERROR, "got a buffer with %d bytes when %d were expected\n",
 buf_size, 48 + s->height * (s->width * 3 / 4));
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 /* pixel data starts 48 bytes in, after 3x16-byte tables */
 stream_ptr = 48;
 
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
-
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID;
- s->frame.reference = 0;
- if (ff_get_buffer(avctx, &s->frame) < 0) {
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
- y_plane = s->frame.data[0];
- u_plane = s->frame.data[1];
- v_plane = s->frame.data[2];
+ y_plane = frame->data[0];
+ u_plane = frame->data[1];
+ v_plane = frame->data[2];
 
 /* iterate through each line in the height */
 for (y_ptr = 0, u_ptr = 0, v_ptr = 0;
- y_ptr < (s->height * s->frame.linesize[0]);
- y_ptr += s->frame.linesize[0] - s->width,
- u_ptr += s->frame.linesize[1] - s->width / 4,
- v_ptr += s->frame.linesize[2] - s->width / 4) {
+ y_ptr < (s->height * frame->linesize[0]);
+ y_ptr += frame->linesize[0] - s->width,
+ u_ptr += frame->linesize[1] - s->width / 4,
+ v_ptr += frame->linesize[2] - s->width / 4) {
 
 /* reset predictors */
 cur_byte = buf[stream_ptr++];
@@ -164,45 +159,32 @@
 }
 
 *got_frame = 1;
- *(AVFrame*)data= s->frame;
 
 return buf_size;
 }
 
-static av_cold int cyuv_decode_end(AVCodecContext *avctx)
-{
- CyuvDecodeContext *s = avctx->priv_data;
-
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
-
- return 0;
-}
-
 #if CONFIG_AURA_DECODER
 AVCodec ff_aura_decoder = {
 .name = "aura",
+ .long_name = NULL_IF_CONFIG_SMALL("Auravision AURA"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_AURA,
 .priv_data_size = sizeof(CyuvDecodeContext),
 .init = cyuv_decode_init,
- .close = cyuv_decode_end,
 .decode = cyuv_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Auravision AURA"),
 };
 #endif
 
 #if CONFIG_CYUV_DECODER
 AVCodec ff_cyuv_decoder = {
 .name = "cyuv",
+ .long_name = NULL_IF_CONFIG_SMALL("Creative YUV (CYUV)"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_CYUV,
 .priv_data_size = sizeof(CyuvDecodeContext),
 .init = cyuv_decode_init,
- .close = cyuv_decode_end,
 .decode = cyuv_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Creative YUV (CYUV)"),
 };
 #endif

libav-v9.6.tar.bz2/libavcodec/dca.c -> libav-v10.1.tar.bz2/libavcodec/dca.c Changed

@@ -19,7 +19,9 @@
 */
 
 #include <stdint.h>
+#include <string.h>
 
+#include "put_bits.h"
 #include "dca.h"
 
 const uint32_t avpriv_dca_sample_rates[16] =
@@ -27,3 +29,38 @@
 0, 8000, 16000, 32000, 0, 0, 11025, 22050, 44100, 0, 0,
 12000, 24000, 48000, 96000, 192000
 };
+
+int ff_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
+ int max_size)
+{
+ uint32_t mrk;
+ int i, tmp;
+ const uint16_t *ssrc = (const uint16_t *) src;
+ uint16_t *sdst = (uint16_t *) dst;
+ PutBitContext pb;
+
+ if ((unsigned) src_size > (unsigned) max_size)
+ src_size = max_size;
+
+ mrk = AV_RB32(src);
+ switch (mrk) {
+ case DCA_MARKER_RAW_BE:
+ memcpy(dst, src, src_size);
+ return src_size;
+ case DCA_MARKER_RAW_LE:
+ for (i = 0; i < (src_size + 1) >> 1; i++)
+ *sdst++ = av_bswap16(*ssrc++);
+ return src_size;
+ case DCA_MARKER_14B_BE:
+ case DCA_MARKER_14B_LE:
+ init_put_bits(&pb, dst, max_size);
+ for (i = 0; i < (src_size + 1) >> 1; i++, src += 2) {
+ tmp = ((mrk == DCA_MARKER_14B_BE) ? AV_RB16(src) : AV_RL16(src)) & 0x3FFF;
+ put_bits(&pb, 14, tmp);
+ }
+ flush_put_bits(&pb);
+ return (put_bits_count(&pb) + 7) >> 3;
+ default:
+ return AVERROR_INVALIDDATA;
+ }
+}

libav-v9.6.tar.bz2/libavcodec/dca.h -> libav-v10.1.tar.bz2/libavcodec/dca.h Changed

libav-v9.6.tar.bz2/libavcodec/dca_parser.c -> libav-v10.1.tar.bz2/libavcodec/dca_parser.c Changed

@@ -24,9 +24,7 @@
 
 #include "parser.h"
 #include "dca.h"
-#include "dca_parser.h"
 #include "get_bits.h"
-#include "put_bits.h"
 
 typedef struct DCAParseContext {
 ParseContext pc;
@@ -62,10 +60,12 @@
 if (IS_MARKER(state, i, buf, buf_size)) {
 if (pc1->lastmarker && state == pc1->lastmarker) {
 start_found = 1;
+ i++;
 break;
 } else if (!pc1->lastmarker) {
 start_found = 1;
 pc1->lastmarker = state;
+ i++;
 break;
 }
 }
@@ -80,9 +80,6 @@
 if (state == pc1->lastmarker && IS_MARKER(state, i, buf, buf_size)) {
 if(pc1->framesize > pc1->size)
 continue;
- if(!pc1->framesize){
- pc1->framesize = pc1->hd_pos ? pc1->hd_pos : pc1->size;
- }
 pc->frame_start_found = 0;
 pc->state = -1;
 pc1->size = 0;
@@ -103,43 +100,8 @@
 return 0;
 }
 
-int ff_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
- int max_size)
-{
- uint32_t mrk;
- int i, tmp;
- const uint16_t *ssrc = (const uint16_t *) src;
- uint16_t *sdst = (uint16_t *) dst;
- PutBitContext pb;
-
- if ((unsigned) src_size > (unsigned) max_size)
- src_size = max_size;
-
- mrk = AV_RB32(src);
- switch (mrk) {
- case DCA_MARKER_RAW_BE:
- memcpy(dst, src, src_size);
- return src_size;
- case DCA_MARKER_RAW_LE:
- for (i = 0; i < (src_size + 1) >> 1; i++)
- *sdst++ = av_bswap16(*ssrc++);
- return src_size;
- case DCA_MARKER_14B_BE:
- case DCA_MARKER_14B_LE:
- init_put_bits(&pb, dst, max_size);
- for (i = 0; i < (src_size + 1) >> 1; i++, src += 2) {
- tmp = ((mrk == DCA_MARKER_14B_BE) ? AV_RB16(src) : AV_RL16(src)) & 0x3FFF;
- put_bits(&pb, 14, tmp);
- }
- flush_put_bits(&pb);
- return (put_bits_count(&pb) + 7) >> 3;
- default:
- return AVERROR_INVALIDDATA;
- }
-}
-
 static int dca_parse_params(const uint8_t *buf, int buf_size, int *duration,
- int *sample_rate)
+ int *sample_rate, int *framesize)
 {
 GetBitContext gb;
 uint8_t hdr[12 + FF_INPUT_BUFFER_PADDING_SIZE] = { 0 };
@@ -159,7 +121,11 @@
 return AVERROR_INVALIDDATA;
 *duration = 256 * (sample_blocks / 8);
 
- skip_bits(&gb, 20);
+ *framesize = get_bits(&gb, 14) + 1;
+ if (*framesize < 95)
+ return AVERROR_INVALIDDATA;
+
+ skip_bits(&gb, 6);
 sr_code = get_bits(&gb, 4);
 *sample_rate = avpriv_dca_sample_rates[sr_code];
 if (*sample_rate == 0)
@@ -190,7 +156,7 @@
 }
 
 /* read the duration and sample rate from the frame header */
- if (!dca_parse_params(buf, buf_size, &duration, &sample_rate)) {
+ if (!dca_parse_params(buf, buf_size, &duration, &sample_rate, &pc1->framesize)) {
 s->duration = duration;
 avctx->sample_rate = sample_rate;
 } else

libav-v9.6.tar.bz2/libavcodec/dcadata.h -> libav-v10.1.tar.bz2/libavcodec/dcadata.h Changed

@@ -7505,34 +7505,63 @@
     0.01724460535, 0.47964480519, 0.48503074050, 0.01805862412,
 };
 
-/* 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,
+/*
+ * 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,
+    0.003981, 0.004217, 0.004467, 0.004732, 0.005012, 0.005309, 0.005623, 0.005957,
+    0.006310, 0.006683, 0.007079, 0.007499, 0.007943, 0.008414, 0.008913, 0.009441,
+    0.010000, 0.010593, 0.011220, 0.011885, 0.012589, 0.013335, 0.014125, 0.014962,
+    0.015849, 0.016788, 0.017783, 0.018836, 0.019953, 0.021135, 0.022387, 0.023714,
+    0.025119, 0.026607, 0.028184, 0.029854, 0.031623, 0.032546, 0.033497, 0.034475,
+    0.035481, 0.036517, 0.037584, 0.038681, 0.039811, 0.040973, 0.042170, 0.043401,
+    0.044668, 0.045973, 0.047315, 0.048697, 0.050119, 0.051582, 0.053088, 0.054639,
+    0.056234, 0.057876, 0.059566, 0.061306, 0.063096, 0.064938, 0.066834, 0.068786,
+    0.070795, 0.072862, 0.074989, 0.077179, 0.079433, 0.081752, 0.084140, 0.086596,
+    0.089125, 0.091728, 0.094406, 0.097163, 0.100000, 0.102920, 0.105925, 0.109018,
+    0.112202, 0.115478, 0.118850, 0.122321, 0.125893, 0.129569, 0.133352, 0.137246,
+    0.141254, 0.145378, 0.149624, 0.153993, 0.158489, 0.163117, 0.167880, 0.172783,
+    0.177828, 0.180406, 0.183021, 0.185674, 0.188365, 0.191095, 0.193865, 0.196675,
+    0.199526, 0.202418, 0.205353, 0.208329, 0.211349, 0.214412, 0.217520, 0.220673,
+    0.223872, 0.227117, 0.230409, 0.233749, 0.237137, 0.240575, 0.244062, 0.247600,
+    0.251189, 0.254830, 0.258523, 0.262271, 0.266073, 0.269929, 0.273842, 0.277811,
+    0.281838, 0.285924, 0.290068, 0.294273, 0.298538, 0.302866, 0.307256, 0.311709,
+    0.316228, 0.320812, 0.325462, 0.330179, 0.334965, 0.339821, 0.344747, 0.349744,
+    0.354813, 0.359956, 0.365174, 0.370467, 0.375837, 0.381285, 0.386812, 0.392419,
+    0.398107, 0.403878, 0.409732, 0.415671, 0.421697, 0.427809, 0.434010, 0.440301,
+    0.446684, 0.453158, 0.459727, 0.466391, 0.473151, 0.480010, 0.486968, 0.494026,
+    0.501187, 0.508452, 0.515822, 0.523299, 0.530884, 0.538580, 0.546387, 0.554307,
+    0.562341, 0.570493, 0.578762, 0.587151, 0.595662, 0.604296, 0.613056, 0.621942,
+    0.630957, 0.640103, 0.649382, 0.658795, 0.668344, 0.678032, 0.687860, 0.697831,
+    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,
 };
 
-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

libav-v9.6.tar.bz2/libavcodec/dcadec.c -> libav-v10.1.tar.bz2/libavcodec/dcadec.c Changed

@@ -29,19 +29,19 @@
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/float_dsp.h"
-#include "libavutil/intmath.h"
+#include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
 #include "libavutil/samplefmt.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "fft.h"
 #include "get_bits.h"
 #include "put_bits.h"
 #include "dcadata.h"
 #include "dcahuff.h"
 #include "dca.h"
-#include "dca_parser.h"
+#include "mathops.h"
 #include "synth_filter.h"
 #include "dcadsp.h"
 #include "fmtconvert.h"
@@ -50,6 +50,9 @@
 #if ARCH_ARM
 # include "arm/dca.h"
 #endif
+#if ARCH_X86
+# include "x86/dca.h"
+#endif
 
 //#define TRACE
 
@@ -263,6 +266,8 @@
 
 #define DCA_BUFFER_PADDING_SIZE 1024
 
+#define DCA_NSYNCAUX 0x9A1105A0
+
 /** Bit allocation */
 typedef struct {
 int offset; ///< code values offset
@@ -284,8 +289,8 @@
 }
 
 typedef struct {
+ AVClass *class; ///< class for AVOptions
 AVCodecContext *avctx;
- AVFrame frame;
 /* Frame header */
 int frame_type; ///< type of the current frame
 int samples_deficit; ///< deficit sample count
@@ -297,7 +302,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
@@ -339,9 +343,16 @@
 int 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
 
+ /* 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)
+
 int 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
@@ -376,6 +387,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
 
 /* ExSS header parser */
 int static_fields; ///< static fields present
@@ -571,7 +583,7 @@
 if (!s->bit_rate)
 return AVERROR_INVALIDDATA;
 
- s->downmix = get_bits(&s->gb, 1);
+ 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);
@@ -582,6 +594,11 @@
 s->lfe = get_bits(&s->gb, 2);
 s->predictor_history = get_bits(&s->gb, 1);
 
+ if (s->lfe > 2) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid LFE value: %d\n", s->lfe);
+ return AVERROR_INVALIDDATA;
+ }
+
 /* TODO: check CRC */
 if (s->crc_present)
 s->header_crc = get_bits(&s->gb, 16);
@@ -612,7 +629,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);
@@ -795,27 +811,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;
- }
- 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);
@@ -910,16 +905,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]);
@@ -942,10 +927,8 @@
 float scale)
 {
 const float *prCoeff;
- int i;
 
 int sb_act = s->subband_activity[chans];
- int subindex;
 
 scale *= sqrt(1 / 8.0);
 
@@ -955,25 +938,11 @@
 else /* Perfect reconstruction */
 prCoeff = fir_32bands_perfect;
 
- for (i = sb_act; i < 32; i++)
- s->raXin[i] = 0.0;
-
- /* Reconstructed channel sample index */
- for (subindex = 0; subindex < 8; subindex++) {
- /* Load in one sample from each subband and clear inactive subbands */
- for (i = 0; i < sb_act; i++) {
- unsigned sign = (i - 1) & 2;
- uint32_t v = AV_RN32A(&samples_in[i][subindex]) ^ sign << 30;
- AV_WN32A(&s->raXin[i], v);
- }
-
- s->synth.synth_filter_float(&s->imdct,
- s->subband_fir_hist[chans],
- &s->hist_index[chans],
- s->subband_fir_noidea[chans], prCoeff,
- samples_out, s->raXin, scale);
- samples_out += 32;
- }
+ s->dcadsp.qmf_32_subbands(samples_in, sb_act, &s->synth, &s->imdct,
+ s->subband_fir_hist[chans],
+ &s->hist_index[chans],
+ s->subband_fir_noidea[chans], prCoeff,
+ samples_out, s->raXin, scale);
 }
 
 static void lfe_interpolation_fir(DCAContext *s, int decimation_select,
@@ -988,23 +957,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, scale);
 samples_in++;
- samples_out += 2 * decifactor;
+ samples_out += 2 * 32 * (1 + idx);
 }
 }
 
@@ -1030,29 +999,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, 0, "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];
@@ -1087,13 +1050,21 @@
 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];
+ }
+ }
 }
 
 
 #ifndef decode_blockcodes
 /* Very compact version of the block code decoder that does not use table
 * look-up but is slightly slower */
-static int decode_blockcode(int code, int levels, int *values)
+static int decode_blockcode(int code, int levels, int32_t *values)
 {
 int i;
 int offset = (levels - 1) >> 1;
@@ -1107,7 +1078,7 @@
 return code;
 }
 
-static int decode_blockcodes(int code1, int code2, int levels, int *values)
+static int decode_blockcodes(int code1, int code2, int levels, int32_t *values)
 {
 return decode_blockcode(code1, levels, values) |
 decode_blockcode(code2, levels, values + 4);
@@ -1118,12 +1089,10 @@
 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)
+static inline void int8x8_fmul_int32(DCADSPContext *dsp, 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;
+ dsp->int8x8_fmul_int32(dst, src, scale);
 }
 #endif
 
@@ -1136,7 +1105,7 @@
 
 /* FIXME */
 float (*subband_samples)[DCA_SUBBANDS][8] = s->subband_samples[block_index];
- LOCAL_ALIGNED_16(int, block, [8]);
+ LOCAL_ALIGNED_16(int32_t, block, [8 * DCA_SUBBANDS]);
 
 /*
 * Audio data
@@ -1149,6 +1118,8 @@
 quant_step_table = lossy_quant_d;
 
 for (k = base_channel; k < s->prim_channels; k++) {
+ float rscale[DCA_SUBBANDS];
+
 if (get_bits_left(&s->gb) < 0)
 return AVERROR_INVALIDDATA;
 
@@ -1171,11 +1142,12 @@
 * Extract bits from the bit stream
 */
 if (!abits) {
- memset(subband_samples[k][l], 0, 8 * sizeof(subband_samples[0][0][0]));
+ rscale[l] = 0;
+ memset(block + 8 * l, 0, 8 * sizeof(block[0]));
 } else {
 /* Deal with transients */
 int sfi = s->transition_mode[k][l] && subsubframe >= s->transition_mode[k][l];
- float rscale = quant_step_size * s->scale_factor[k][l][sfi] *
+ rscale[l] = quant_step_size * s->scale_factor[k][l][sfi] *
 s->scalefactor_adj[k][sel];
 
 if (abits >= 11 || !dca_smpl_bitalloc[abits].vlc[sel].table) {
@@ -1189,7 +1161,7 @@
 block_code1 = get_bits(&s->gb, size);
 block_code2 = get_bits(&s->gb, size);
 err = decode_blockcodes(block_code1, block_code2,
- levels, block);
+ levels, block + 8 * l);
 if (err) {
 av_log(s->avctx, AV_LOG_ERROR,
 "ERROR: block code look-up failed\n");
@@ -1198,19 +1170,23 @@
 } else {
 /* no coding */
 for (m = 0; m < 8; m++)
- block[m] = get_sbits(&s->gb, abits - 3);
+ block[8 * l + m] = get_sbits(&s->gb, abits - 3);
 }
 } else {
 /* Huffman coded */
 for (m = 0; m < 8; m++)
- block[m] = get_bitalloc(&s->gb,
+ block[8 * l + m] = get_bitalloc(&s->gb,
 &dca_smpl_bitalloc[abits], sel);
 }
 
- s->fmt_conv.int32_to_float_fmul_scalar(subband_samples[k][l],
- block, rscale, 8);
 }
+ }
+
+ s->fmt_conv.int32_to_float_fmul_array8(&s->fmt_conv, subband_samples[k][0],
+ block, rscale, 8 * s->vq_start_subband[k]);
 
+ for (l = 0; l < s->vq_start_subband[k]; l++) {
+ int m;
 /*
 * Inverse ADPCM if in prediction mode
 */
@@ -1244,7 +1220,7 @@
 s->debug_flag |= 0x01;
 }
 
- int8x8_fmul_int32(subband_samples[k][l],
+ int8x8_fmul_int32(&s->dcadsp, subband_samples[k][l],
 &high_freq_vq[hfvq][subsubframe * 8],
 s->scale_factor[k][l][0]);
 }
@@ -1258,15 +1234,14 @@
 #endif
 } else {
 av_log(s->avctx, AV_LOG_ERROR, "Didn't get subframe DSYNC\n");
+ return AVERROR_INVALIDDATA;
 }
 }
 
 /* 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;
 }
@@ -1286,13 +1261,8 @@
 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[dca_lfe_index[s->amode]],
@@ -1300,13 +1270,21 @@
 /* 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
@@ -1317,13 +1295,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->crc_present && (s->downmix || s->dynrange))
+ 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->dynrange)
 get_bits(&s->gb, 16);
 }
 
@@ -1599,14 +1653,15 @@
 
 num_audiop = get_bits(&s->gb, 3) + 1;
 if (num_audiop > 1) {
- av_log_ask_for_sample(s->avctx, "Multiple DTS-HD audio presentations.");
+ avpriv_request_sample(s->avctx,
+ "Multiple DTS-HD audio presentations");
 /* ignore such streams for now */
 return;
 }
 
 num_assets = get_bits(&s->gb, 3) + 1;
 if (num_assets > 1) {
- av_log_ask_for_sample(s->avctx, "Multiple DTS-HD audio assets.");
+ avpriv_request_sample(s->avctx, "Multiple DTS-HD audio assets");
 /* ignore such streams for now */
 return;
 }
@@ -1653,6 +1708,7 @@
 static int dca_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 
@@ -1800,8 +1856,25 @@
 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 (s->prim_channels + !!s->lfe > 2 &&
+ avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) {
+ /*
+ * Neither the core's auxiliary data nor our default tables contain
+ * downmix coefficients for the additional channel coded in the XCh
+ * extension, so when we're doing a Stereo downmix, don't decode it.
+ */
+ s->xch_disable = 1;
+ }
+
+#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;
@@ -1823,10 +1896,57 @@
 s->channel_order_tab[channels - 1 - !!s->lfe] < 0)
 return AVERROR_INVALIDDATA;
 
- if (avctx->request_channels == 2 && s->prim_channels > 2) {
+ if (num_core_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;
+
+ /* 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 < num_core_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 (num_core_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 < num_core_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 < num_core_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");
 }
 } else {
 av_log(avctx, AV_LOG_ERROR, "Non standard configuration %d !\n", s->amode);
@@ -1835,17 +1955,17 @@
 avctx->channels = channels;
 
 /* get output buffer */
- s->frame.nb_samples = 256 * (s->sample_blocks / 8);
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = 256 * (s->sample_blocks / 8);
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- samples_flt = (float **) s->frame.extended_data;
+ samples_flt = (float **)frame->extended_data;
 
 /* allocate buffer for extra channels if downmixing */
 if (avctx->channels < full_channels) {
 ret = av_samples_get_buffer_size(NULL, full_channels - channels,
- s->frame.nb_samples,
+ frame->nb_samples,
 avctx->sample_fmt, 0);
 if (ret < 0)
 return ret;
@@ -1858,7 +1978,7 @@
 ret = av_samples_fill_arrays((uint8_t **)s->extra_channels, NULL,
 s->extra_channels_buffer,
 full_channels - channels,
- s->frame.nb_samples, avctx->sample_fmt, 0);
+ frame->nb_samples, avctx->sample_fmt, 0);
 if (ret < 0)
 return ret;
 }
@@ -1890,8 +2010,16 @@
 for (i = 0; i < 2 * s->lfe * 4; i++)
 s->lfe_data[i] = s->lfe_data[i + lfe_samples];
 
- *got_frame_ptr = 1;
- *(AVFrame *) data = s->frame;
+ /* 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;
 }
@@ -1920,13 +2048,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;
- }
-
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
+#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;
 }
@@ -1948,17 +2078,30 @@
 { 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,
+};
+
 AVCodec ff_dca_decoder = {
 .name = "dca",
+ .long_name = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_DTS,
 .priv_data_size = sizeof(DCAContext),
 .init = dca_decode_init,
 .decode = dca_decode_frame,
 .close = dca_decode_end,
- .long_name = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"),
 .capabilities = CODEC_CAP_CHANNEL_CONF | CODEC_CAP_DR1,
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_NONE },
 .profiles = NULL_IF_CONFIG_SMALL(profiles),
+ .priv_class = &dca_decoder_class,
 };

libav-v9.6.tar.bz2/libavcodec/dcadsp.c -> libav-v10.1.tar.bz2/libavcodec/dcadsp.c Changed

@@ -20,10 +20,21 @@
 */
 
 #include "config.h"
+#include "libavutil/attributes.h"
+#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 int8x8_fmul_int32_c(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;
+}
+
+static inline void
+dca_lfe_fir(float *out, const float *in, const float *coefs,
+ int decifactor, float scale)
 {
 float *out2 = out + decifactor;
 const float *cf0 = coefs;
@@ -44,8 +55,52 @@
 }
 }
 
-void ff_dcadsp_init(DCADSPContext *s)
+static void dca_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)
+{
+ int i;
+ int subindex;
+
+ for (i = sb_act; i < 32; i++)
+ raXin[i] = 0.0;
+
+ /* Reconstructed channel sample index */
+ for (subindex = 0; subindex < 8; subindex++) {
+ /* Load in one sample from each subband and clear inactive subbands */
+ for (i = 0; i < sb_act; i++) {
+ unsigned sign = (i - 1) & 2;
+ uint32_t v = AV_RN32A(&samples_in[i][subindex]) ^ sign << 30;
+ AV_WN32A(&raXin[i], v);
+ }
+
+ synth->synth_filter_float(imdct, synth_buf_ptr, synth_buf_offset,
+ synth_buf2, window, samples_out, raXin, scale);
+ samples_out += 32;
+ }
+}
+
+static void dca_lfe_fir0_c(float *out, const float *in, const float *coefs,
+ float scale)
+{
+ dca_lfe_fir(out, in, coefs, 32, scale);
+}
+
+static void dca_lfe_fir1_c(float *out, const float *in, const float *coefs,
+ float scale)
+{
+ dca_lfe_fir(out, in, coefs, 64, scale);
+}
+
+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->int8x8_fmul_int32 = int8x8_fmul_int32_c;
 if (ARCH_ARM) ff_dcadsp_init_arm(s);
+ if (ARCH_X86) ff_dcadsp_init_x86(s);
 }

libav-v9.6.tar.bz2/libavcodec/dcadsp.h -> libav-v10.1.tar.bz2/libavcodec/dcadsp.h Changed

@@ -19,12 +19,23 @@
 #ifndef AVCODEC_DCADSP_H
 #define AVCODEC_DCADSP_H
 
+#include "avfft.h"
+#include "synth_filter.h"
+
 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,
+                       float scale);
+    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 (*int8x8_fmul_int32)(float *dst, const int8_t *src, int scale);
 } 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 */

libav-v9.6.tar.bz2/libavcodec/dct-test.c -> libav-v10.1.tar.bz2/libavcodec/dct-test.c Changed

@@ -39,6 +39,7 @@
 #include "libavutil/lfg.h"
 #include "libavutil/time.h"
 
+#include "dct.h"
 #include "simple_idct.h"
 #include "aandcttab.h"
 #include "faandct.h"
@@ -46,27 +47,23 @@
 #include "x86/idct_xvid.h"
 #include "dctref.h"
 
-#undef printf
-
 // BFIN
-void ff_bfin_idct(DCTELEM *block);
-void ff_bfin_fdct(DCTELEM *block);
+void ff_bfin_idct(int16_t *block);
+void ff_bfin_fdct(int16_t *block);
 
 // ALTIVEC
-void ff_fdct_altivec(DCTELEM *block);
+void ff_fdct_altivec(int16_t *block);
 
 // ARM
-void ff_j_rev_dct_arm(DCTELEM *data);
-void ff_simple_idct_arm(DCTELEM *data);
-void ff_simple_idct_armv5te(DCTELEM *data);
-void ff_simple_idct_armv6(DCTELEM *data);
-void ff_simple_idct_neon(DCTELEM *data);
-
-void ff_simple_idct_axp(DCTELEM *data);
+void ff_j_rev_dct_arm(int16_t *data);
+void ff_simple_idct_arm(int16_t *data);
+void ff_simple_idct_armv5te(int16_t *data);
+void ff_simple_idct_armv6(int16_t *data);
+void ff_simple_idct_neon(int16_t *data);
 
 struct algo {
     const char *name;
-    void (*func)(DCTELEM *block);
+    void (*func)(int16_t *block);
     enum formattag { NO_PERM, MMX_PERM, MMX_SIMPLE_PERM, SCALE_PERM,
                      SSE2_PERM, PARTTRANS_PERM } format;
     int mm_support;
@@ -83,7 +80,11 @@
 
 #if HAVE_MMX_INLINE
     { "MMX",            ff_fdct_mmx,           NO_PERM,   AV_CPU_FLAG_MMX     },
+#endif
+#if HAVE_MMXEXT_INLINE
     { "MMXEXT",         ff_fdct_mmxext,        NO_PERM,   AV_CPU_FLAG_MMXEXT  },
+#endif
+#if HAVE_SSE2_INLINE
     { "SSE2",           ff_fdct_sse2,          NO_PERM,   AV_CPU_FLAG_SSE2    },
 #endif
 
@@ -107,7 +108,11 @@
 #if HAVE_MMX_INLINE
     { "SIMPLE-MMX",     ff_simple_idct_mmx,  MMX_SIMPLE_PERM, AV_CPU_FLAG_MMX },
     { "XVID-MMX",       ff_idct_xvid_mmx,      NO_PERM,   AV_CPU_FLAG_MMX,  1 },
+#endif
+#if HAVE_MMXEXT_INLINE
     { "XVID-MMXEXT",    ff_idct_xvid_mmxext,   NO_PERM,   AV_CPU_FLAG_MMXEXT, 1 },
+#endif
+#if HAVE_SSE2_INLINE
     { "XVID-SSE2",      ff_idct_xvid_sse2,     SSE2_PERM, AV_CPU_FLAG_SSE2, 1 },
 #endif
 
@@ -125,14 +130,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 }
 };
 
@@ -166,10 +167,10 @@
     }
 }
 
-DECLARE_ALIGNED(16, static DCTELEM, block)[64];
-DECLARE_ALIGNED(8,  static DCTELEM, block1)[64];
+DECLARE_ALIGNED(16, static int16_t, block)[64];
+DECLARE_ALIGNED(8,  static int16_t, block1)[64];
 
-static void init_block(DCTELEM block[64], int test, int is_idct, AVLFG *prng)
+static void init_block(int16_t block[64], int test, int is_idct, AVLFG *prng)
 {
     int i, j;
 
@@ -197,7 +198,7 @@
     }
 }
 
-static void permute(DCTELEM dst[64], const DCTELEM src[64], int perm)
+static void permute(int16_t dst[64], const int16_t src[64], int perm)
 {
     int i;
 
@@ -221,7 +222,7 @@
 
 static int dct_error(const struct algo *dct, int test, int is_idct, int speed)
 {
-    void (*ref)(DCTELEM *block) = is_idct ? ff_ref_idct : ff_ref_fdct;
+    void (*ref)(int16_t *block) = is_idct ? ff_ref_idct : ff_ref_fdct;
     int it, i, scale;
     int err_inf, v;
     int64_t err2, ti, ti1, it1, err_sum = 0;
@@ -522,5 +523,8 @@
             }
     }
 
-    return err;
+    if (err)
+        printf("Error: %d.\n", err);
+
+    return !!err;
 }

libav-v9.6.tar.bz2/libavcodec/dct.c -> libav-v10.1.tar.bz2/libavcodec/dct.c Changed

@@ -40,7 +40,7 @@
 /* cos((M_PI * x / (2 * n)) */
 #define COS(s, n, x) (s->costab[x])
 
-static void ff_dst_calc_I_c(DCTContext *ctx, FFTSample *data)
+static void dst_calc_I_c(DCTContext *ctx, FFTSample *data)
 {
 int n = 1 << ctx->nbits;
 int i;
@@ -70,7 +70,7 @@
 data[n - 1] = 0;
 }
 
-static void ff_dct_calc_I_c(DCTContext *ctx, FFTSample *data)
+static void dct_calc_I_c(DCTContext *ctx, FFTSample *data)
 {
 int n = 1 << ctx->nbits;
 int i;
@@ -100,7 +100,7 @@
 data[i] = data[i - 2] - data[i];
 }
 
-static void ff_dct_calc_III_c(DCTContext *ctx, FFTSample *data)
+static void dct_calc_III_c(DCTContext *ctx, FFTSample *data)
 {
 int n = 1 << ctx->nbits;
 int i;
@@ -133,7 +133,7 @@
 }
 }
 
-static void ff_dct_calc_II_c(DCTContext *ctx, FFTSample *data)
+static void dct_calc_II_c(DCTContext *ctx, FFTSample *data)
 {
 int n = 1 << ctx->nbits;
 int i;
@@ -201,10 +201,10 @@
 s->csc2[i] = 0.5 / sin((M_PI / (2 * n) * (2 * i + 1)));
 
 switch (inverse) {
- case DCT_I : s->dct_calc = ff_dct_calc_I_c; break;
- case DCT_II : s->dct_calc = ff_dct_calc_II_c; break;
- case DCT_III: s->dct_calc = ff_dct_calc_III_c; break;
- case DST_I : s->dct_calc = ff_dst_calc_I_c; break;
+ case DCT_I : s->dct_calc = dct_calc_I_c; break;
+ case DCT_II : s->dct_calc = dct_calc_II_c; break;
+ case DCT_III: s->dct_calc = dct_calc_III_c; break;
+ case DST_I : s->dct_calc = dst_calc_I_c; break;
 }
 }

libav-v9.6.tar.bz2/libavcodec/dct.h -> libav-v10.1.tar.bz2/libavcodec/dct.h Changed

libav-v9.6.tar.bz2/libavcodec/dct32_fixed.c -> libav-v10.1.tar.bz2/libavcodec/dct32_fixed.c Changed

libav-v9.6.tar.bz2/libavcodec/dct32_float.c -> libav-v10.1.tar.bz2/libavcodec/dct32_float.c Changed

libav-v10.1.tar.bz2/libavcodec/dct32_template.c Changed

libav-v9.6.tar.bz2/libavcodec/dfa.c -> libav-v10.1.tar.bz2/libavcodec/dfa.c Changed

@@ -28,8 +28,6 @@
 #include "libavutil/mem.h"
 
 typedef struct DfaContext {
- AVFrame pic;
-
 uint32_t pal[256];
 uint8_t *frame_buf;
 } DfaContext;
@@ -286,9 +284,26 @@
 return 0;
 }
 
-static int decode_unk6(GetByteContext *gb, uint8_t *frame, int width, int height)
+static int decode_tdlt(GetByteContext *gb, uint8_t *frame, int width, int height)
 {
- return AVERROR_PATCHWELCOME;
+ const uint8_t *frame_end = frame + width * height;
+ int segments = bytestream2_get_le32(gb);
+ int skip, copy;
+
+ while (segments--) {
+ if (bytestream2_get_bytes_left(gb) < 2)
+ return AVERROR_INVALIDDATA;
+ copy = bytestream2_get_byteu(gb) * 2;
+ skip = bytestream2_get_byteu(gb) * 2;
+ if (frame_end - frame < copy + skip ||
+ bytestream2_get_bytes_left(gb) < copy)
+ return AVERROR_INVALIDDATA;
+ frame += skip;
+ bytestream2_get_buffer(gb, frame, copy);
+ frame += copy;
+ }
+
+ return 0;
 }
 
 static int decode_blck(GetByteContext *gb, uint8_t *frame, int width, int height)
@@ -302,17 +317,18 @@
 
 static const chunk_decoder decoder[8] = {
 decode_copy, decode_tsw1, decode_bdlt, decode_wdlt,
- decode_unk6, decode_dsw1, decode_blck, decode_dds1,
+ decode_tdlt, decode_dsw1, decode_blck, decode_dds1,
 };
 
 static const char* chunk_name[8] = {
- "COPY", "TSW1", "BDLT", "WDLT", "????", "DSW1", "BLCK", "DDS1"
+ "COPY", "TSW1", "BDLT", "WDLT", "TDLT", "DSW1", "BLCK", "DDS1"
 };
 
 static int dfa_decode_frame(AVCodecContext *avctx,
 void *data, int *got_frame,
 AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 DfaContext *s = avctx->priv_data;
 GetByteContext gb;
 const uint8_t *buf = avpkt->data;
@@ -321,10 +337,7 @@
 int ret;
 int i, pal_elems;
 
- if (s->pic.data[0])
- avctx->release_buffer(avctx, &s->pic);
-
- if ((ret = ff_get_buffer(avctx, &s->pic))) {
+ if ((ret = ff_get_buffer(avctx, frame, 0))) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -342,7 +355,7 @@
 s->pal[i] = bytestream2_get_be24(&gb) << 2;
 s->pal[i] |= (s->pal[i] >> 6) & 0x333;
 }
- s->pic.palette_has_changed = 1;
+ frame->palette_has_changed = 1;
 } else if (chunk_type <= 9) {
 if (decoder[chunk_type - 2](&gb, s->frame_buf, avctx->width, avctx->height)) {
 av_log(avctx, AV_LOG_ERROR, "Error decoding %s chunk\n",
@@ -357,16 +370,15 @@
 }
 
 buf = s->frame_buf;
- dst = s->pic.data[0];
+ dst = frame->data[0];
 for (i = 0; i < avctx->height; i++) {
 memcpy(dst, buf, avctx->width);
- dst += s->pic.linesize[0];
+ dst += frame->linesize[0];
 buf += avctx->width;
 }
- memcpy(s->pic.data[1], s->pal, sizeof(s->pal));
+ memcpy(frame->data[1], s->pal, sizeof(s->pal));
 
 *got_frame = 1;
- *(AVFrame*)data = s->pic;
 
 return avpkt->size;
 }
@@ -375,9 +387,6 @@
 {
 DfaContext *s = avctx->priv_data;
 
- if (s->pic.data[0])
- avctx->release_buffer(avctx, &s->pic);
-
 av_freep(&s->frame_buf);
 
 return 0;
@@ -385,6 +394,7 @@
 
 AVCodec ff_dfa_decoder = {
 .name = "dfa",
+ .long_name = NULL_IF_CONFIG_SMALL("Chronomaster DFA"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_DFA,
 .priv_data_size = sizeof(DfaContext),
@@ -392,5 +402,4 @@
 .close = dfa_decode_end,
 .decode = dfa_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Chronomaster DFA"),
 };

libav-v9.6.tar.bz2/libavcodec/dirac.c -> libav-v10.1.tar.bz2/libavcodec/dirac.c Changed

libav-v9.6.tar.bz2/libavcodec/dnxhddata.c -> libav-v10.1.tar.bz2/libavcodec/dnxhddata.c Changed

@@ -220,6 +220,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,
 };
@@ -1133,6 +1144,13 @@
       dnxhd_1237_ac_run_flag, dnxhd_1237_ac_index_flag,
       dnxhd_1237_run_codes, dnxhd_1237_run_bits, dnxhd_1237_run,
       { 36, 45, 75, 90 } },
+    { 1256, 1920, 1080, 0, 1835008, 1835008, 6, 10,
+      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_run_flag, dnxhd_1235_1241_ac_index_flag,
+      dnxhd_1235_1238_1241_run_codes, dnxhd_1235_1238_1241_run_bits, dnxhd_1235_1241_run,
+      { 350, 390, 440, 730, 880 } },
 };
 
 int ff_dnxhd_get_cid_table(int cid)

libav-v9.6.tar.bz2/libavcodec/dnxhddec.c -> libav-v10.1.tar.bz2/libavcodec/dnxhddec.c Changed

@@ -22,10 +22,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-//#define TRACE
-//#define DEBUG
-
 #include "libavutil/imgutils.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dnxhddata.h"
@@ -34,7 +32,6 @@
 
 typedef struct DNXHDContext {
 AVCodecContext *avctx;
- AVFrame picture;
 GetBitContext gb;
 int cid; ///< compression id
 unsigned int width, height;
@@ -44,28 +41,27 @@
 VLC ac_vlc, dc_vlc, run_vlc;
 int last_dc[3];
 DSPContext dsp;
- DECLARE_ALIGNED(16, DCTELEM, 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.
- void (*decode_dct_block)(struct DNXHDContext *ctx, DCTELEM *block,
+ int is_444;
+ void (*decode_dct_block)(struct DNXHDContext *ctx, int16_t *block,
 int n, int qscale);
 } DNXHDContext;
 
 #define DNXHD_VLC_BITS 9
 #define DNXHD_DC_VLC_BITS 7
 
-static void dnxhd_decode_dct_block_8(DNXHDContext *ctx, DCTELEM *block, int n, int qscale);
-static void dnxhd_decode_dct_block_10(DNXHDContext *ctx, DCTELEM *block, int n, int qscale);
+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)
 {
 DNXHDContext *ctx = avctx->priv_data;
 
 ctx->avctx = avctx;
- avctx->coded_frame = &ctx->picture;
- ctx->picture.type = AV_PICTURE_TYPE_I;
- ctx->picture.key_frame = 1;
 return 0;
 }
 
@@ -76,7 +72,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);
 }
 ctx->cid_table = &ff_dnxhd_cid_table[index];
 
@@ -100,22 +96,24 @@
 return 0;
 }
 
-static int dnxhd_decode_header(DNXHDContext *ctx, const uint8_t *buf, int buf_size, int first_field)
+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;
- ctx->picture.interlaced_frame = 1;
- ctx->picture.top_field_first = first_field ^ ctx->cur_field;
+ frame->interlaced_frame = 1;
+ frame->top_field_first = first_field ^ ctx->cur_field;
 av_log(ctx->avctx, AV_LOG_DEBUG, "interlaced %d, cur field %d\n", buf[5] & 3, ctx->cur_field);
 }
 
@@ -124,7 +122,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) {
@@ -145,12 +153,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;
@@ -158,13 +166,13 @@
 
 av_dlog(ctx->avctx, "mb width %d, mb height %d\n", ctx->mb_width, ctx->mb_height);
 
- if ((ctx->height+15)>>4 == ctx->mb_height && ctx->picture.interlaced_frame)
+ if ((ctx->height+15)>>4 == ctx->mb_height && frame->interlaced_frame)
 ctx->height <<= 1;
 
 if (ctx->mb_height > 68 ||
- (ctx->mb_height<<ctx->picture.interlaced_frame) > (ctx->height+15)>>4) {
+ (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++) {
@@ -172,7 +180,7 @@
 av_dlog(ctx->avctx, "mb scan index %d\n", ctx->mb_scan_index[i]);
 if (buf_size < ctx->mb_scan_index[i] + 0x280) {
 av_log(ctx->avctx, AV_LOG_ERROR, "invalid mb scan index\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 
@@ -180,7 +188,7 @@
 }
 
 static av_always_inline void dnxhd_decode_dct_block(DNXHDContext *ctx,
- DCTELEM *block, int n,
+ int16_t *block, int n,
 int qscale,
 int index_bits,
 int level_bias,
@@ -191,12 +199,21 @@
 const uint8_t *weight_matrix;
 OPEN_READER(bs, &ctx->gb);
 
- if (n&2) {
- component = 1 + (n&1);
- weight_matrix = ctx->cid_table->chroma_weight;
+ if (!ctx->is_444) {
+ if (n&2) {
+ component = 1 + (n&1);
+ weight_matrix = ctx->cid_table->chroma_weight;
+ } else {
+ component = 0;
+ weight_matrix = ctx->cid_table->luma_weight;
+ }
 } else {
- component = 0;
- weight_matrix = ctx->cid_table->luma_weight;
+ component = (n >> 1) % 3;
+ if (component) {
+ weight_matrix = ctx->cid_table->chroma_weight;
+ } else {
+ weight_matrix = ctx->cid_table->luma_weight;
+ }
 }
 
 UPDATE_CACHE(bs, &ctx->gb);
@@ -250,23 +267,29 @@
 CLOSE_READER(bs, &ctx->gb);
 }
 
-static void dnxhd_decode_dct_block_8(DNXHDContext *ctx, DCTELEM *block,
+static void dnxhd_decode_dct_block_8(DNXHDContext *ctx, int16_t *block,
 int n, int qscale)
 {
 dnxhd_decode_dct_block(ctx, block, n, qscale, 4, 32, 6);
 }
 
-static void dnxhd_decode_dct_block_10(DNXHDContext *ctx, DCTELEM *block,
+static void dnxhd_decode_dct_block_10(DNXHDContext *ctx, int16_t *block,
 int n, int qscale)
 {
 dnxhd_decode_dct_block(ctx, block, n, qscale, 6, 8, 4);
 }
 
-static int dnxhd_decode_macroblock(DNXHDContext *ctx, int x, int y)
+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;
- int dct_linesize_luma = ctx->picture.linesize[0];
- int dct_linesize_chroma = ctx->picture.linesize[1];
+ int dct_linesize_luma = frame->linesize[0];
+ int dct_linesize_chroma = frame->linesize[1];
 uint8_t *dest_y, *dest_u, *dest_v;
 int dct_y_offset, dct_x_offset;
 int qscale, i;
@@ -278,41 +301,67 @@
 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 (ctx->picture.interlaced_frame) {
+ if (frame->interlaced_frame) {
 dct_linesize_luma <<= 1;
 dct_linesize_chroma <<= 1;
 }
 
- dest_y = ctx->picture.data[0] + ((y * dct_linesize_luma) << 4) + (x << (4 + shift1));
- dest_u = ctx->picture.data[1] + ((y * dct_linesize_chroma) << 4) + (x << (3 + shift1));
- dest_v = ctx->picture.data[2] + ((y * dct_linesize_chroma) << 4) + (x << (3 + shift1));
+ 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 + 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 += ctx->picture.linesize[0];
- dest_u += ctx->picture.linesize[1];
- dest_v += ctx->picture.linesize[2];
+ dest_y += frame->linesize[0];
+ dest_u += frame->linesize[1];
+ dest_v += frame->linesize[2];
 }
 
 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;
 }
 
-static int dnxhd_decode_macroblocks(DNXHDContext *ctx, const uint8_t *buf, int buf_size)
+static int dnxhd_decode_macroblocks(DNXHDContext *ctx, AVFrame *frame,
+ const uint8_t *buf, int buf_size)
 {
 int x, y;
 for (y = 0; y < ctx->mb_height; y++) {
@@ -322,7 +371,7 @@
 init_get_bits(&ctx->gb, buf + ctx->mb_scan_index[y], (buf_size - ctx->mb_scan_index[y]) << 3);
 for (x = 0; x < ctx->mb_width; x++) {
 //START_TIMER;
- dnxhd_decode_macroblock(ctx, x, y);
+ dnxhd_decode_macroblock(ctx, frame, x, y);
 //STOP_TIMER("decode macroblock");
 }
 }
@@ -337,12 +386,13 @@
 DNXHDContext *ctx = avctx->priv_data;
 AVFrame *picture = data;
 int first_field = 1;
+ int ret;
 
 av_dlog(avctx, "frame size %d\n", buf_size);
 
 decode_coding_unit:
- if (dnxhd_decode_header(ctx, 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)) {
@@ -351,29 +401,28 @@
 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 (ctx->picture.data[0])
- avctx->release_buffer(avctx, &ctx->picture);
- if (ff_get_buffer(avctx, &ctx->picture) < 0) {
+ if ((ret = ff_get_buffer(avctx, picture, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
+ picture->pict_type = AV_PICTURE_TYPE_I;
+ picture->key_frame = 1;
 }
 
- dnxhd_decode_macroblocks(ctx, buf + 0x280, buf_size - 0x280);
+ dnxhd_decode_macroblocks(ctx, picture, buf + 0x280, buf_size - 0x280);
 
- if (first_field && ctx->picture.interlaced_frame) {
+ if (first_field && picture->interlaced_frame) {
 buf += ctx->cid_table->coding_unit_size;
 buf_size -= ctx->cid_table->coding_unit_size;
 first_field = 0;
 goto decode_coding_unit;
 }
 
- *picture = ctx->picture;
 *got_frame = 1;
 return buf_size;
 }
@@ -382,8 +431,6 @@
 {
 DNXHDContext *ctx = avctx->priv_data;
 
- if (ctx->picture.data[0])
- avctx->release_buffer(avctx, &ctx->picture);
 ff_free_vlc(&ctx->ac_vlc);
 ff_free_vlc(&ctx->dc_vlc);
 ff_free_vlc(&ctx->run_vlc);
@@ -392,6 +439,7 @@
 
 AVCodec ff_dnxhd_decoder = {
 .name = "dnxhd",
+ .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_DNXHD,
 .priv_data_size = sizeof(DNXHDContext),
@@ -399,5 +447,4 @@
 .close = dnxhd_decode_close,
 .decode = dnxhd_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"),
 };

libav-v9.6.tar.bz2/libavcodec/dnxhdenc.c -> libav-v10.1.tar.bz2/libavcodec/dnxhdenc.c Changed

@@ -23,10 +23,12 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-//#define DEBUG
 #define RC_VARIANCE 1 // use variance or ssd for fast rc
 
+#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"
@@ -44,7 +46,7 @@
 
 #define LAMBDA_FRAC_BITS 10
 
-static void dnxhd_8bit_get_pixels_8x4_sym(DCTELEM *restrict block, const uint8_t *pixels, int line_size)
+static void dnxhd_8bit_get_pixels_8x4_sym(int16_t *restrict block, const uint8_t *pixels, int line_size)
 {
 int i;
 for (i = 0; i < 4; i++) {
@@ -61,7 +63,7 @@
 memcpy(block + 24, block - 32, sizeof(*block) * 8);
 }
 
-static av_always_inline void dnxhd_10bit_get_pixels_8x4_sym(DCTELEM *restrict block, const uint8_t *pixels, int line_size)
+static av_always_inline void dnxhd_10bit_get_pixels_8x4_sym(int16_t *restrict block, const uint8_t *pixels, int line_size)
 {
 int i;
 
@@ -73,7 +75,7 @@
 }
 }
 
-static int dnxhd_10bit_dct_quantize(MpegEncContext *ctx, DCTELEM *block,
+static int dnxhd_10bit_dct_quantize(MpegEncContext *ctx, int16_t *block,
 int n, int qscale, int *overflow)
 {
 const uint8_t *scantable= ctx->intra_scantable.scantable;
@@ -99,7 +101,7 @@
 return last_non_zero;
 }
 
-static int dnxhd_init_vlc(DNXHDEncContext *ctx)
+static av_cold int dnxhd_init_vlc(DNXHDEncContext *ctx)
 {
 int i, j, level, run;
 int max_level = 1<<(ctx->cid_table->bit_depth+2);
@@ -154,7 +156,7 @@
 return -1;
 }
 
-static int dnxhd_init_qmat(DNXHDEncContext *ctx, int lbias, int cbias)
+static av_cold int dnxhd_init_qmat(DNXHDEncContext *ctx, int lbias, int cbias)
 {
 // init first elem to 1 to avoid div by 0 in convert_matrix
 uint16_t weight_matrix[64] = {1,}; // convert_matrix needs uint16_t*
@@ -213,7 +215,7 @@
 return -1;
 }
 
-static int dnxhd_init_rc(DNXHDEncContext *ctx)
+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);
 if (ctx->m.avctx->mb_decision != FF_MB_DECISION_RD)
@@ -227,7 +229,7 @@
 return -1;
 }
 
-static int dnxhd_encode_init(AVCodecContext *avctx)
+static av_cold int dnxhd_encode_init(AVCodecContext *avctx)
 {
 DNXHDEncContext *ctx = avctx->priv_data;
 int i, index, bit_depth;
@@ -306,9 +308,12 @@
 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");
@@ -370,7 +375,7 @@
 (ctx->cid_table->dc_codes[nbits]<<nbits) + (diff & ((1 << nbits) - 1)));
 }
 
-static av_always_inline void dnxhd_encode_block(DNXHDEncContext *ctx, DCTELEM *block, int last_index, int n)
+static av_always_inline void dnxhd_encode_block(DNXHDEncContext *ctx, int16_t *block, int last_index, int n)
 {
 int last_non_zero = 0;
 int slevel, i, j;
@@ -393,7 +398,7 @@
 put_bits(&ctx->m.pb, ctx->vlc_bits[0], ctx->vlc_codes[0]); // EOB
 }
 
-static av_always_inline void dnxhd_unquantize_c(DNXHDEncContext *ctx, DCTELEM *block, int n, int qscale, int last_index)
+static av_always_inline void dnxhd_unquantize_c(DNXHDEncContext *ctx, int16_t *block, int n, int qscale, int last_index)
 {
 const uint8_t *weight_matrix;
 int level;
@@ -434,7 +439,7 @@
 }
 }
 
-static av_always_inline int dnxhd_ssd_block(DCTELEM *qblock, DCTELEM *block)
+static av_always_inline int dnxhd_ssd_block(int16_t *qblock, int16_t *block)
 {
 int score = 0;
 int i;
@@ -443,7 +448,7 @@
 return score;
 }
 
-static av_always_inline int dnxhd_calc_ac_bits(DNXHDEncContext *ctx, DCTELEM *block, int last_index)
+static av_always_inline int dnxhd_calc_ac_bits(DNXHDEncContext *ctx, int16_t *block, int last_index)
 {
 int last_non_zero = 0;
 int bits = 0;
@@ -512,7 +517,7 @@
 DNXHDEncContext *ctx = avctx->priv_data;
 int mb_y = jobnr, mb_x;
 int qscale = ctx->qscale;
- LOCAL_ALIGNED_16(DCTELEM, block, [64]);
+ LOCAL_ALIGNED_16(int16_t, block, [64]);
 ctx = ctx->thread[threadnr];
 
 ctx->m.last_dc[0] =
@@ -529,7 +534,7 @@
 dnxhd_get_blocks(ctx, mb_x, mb_y);
 
 for (i = 0; i < 8; i++) {
- DCTELEM *src_block = ctx->blocks[i];
+ int16_t *src_block = ctx->blocks[i];
 int overflow, nbits, diff, last_index;
 int n = dnxhd_switch_matrix(ctx, i);
 
@@ -578,7 +583,7 @@
 dnxhd_get_blocks(ctx, mb_x, mb_y);
 
 for (i = 0; i < 8; i++) {
- DCTELEM *block = ctx->blocks[i];
+ int16_t *block = ctx->blocks[i];
 int overflow, n = dnxhd_switch_matrix(ctx, i);
 int last_index = ctx->m.dct_quantize(&ctx->m, block, i,
 qscale, &overflow);
@@ -907,19 +912,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;
 }
 
@@ -941,9 +941,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);
@@ -981,14 +981,14 @@
 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;
 return 0;
 }
 
-static int dnxhd_encode_end(AVCodecContext *avctx)
+static av_cold int dnxhd_encode_end(AVCodecContext *avctx)
 {
 DNXHDEncContext *ctx = avctx->priv_data;
 int max_level = 1<<(ctx->cid_table->bit_depth+2);
@@ -1014,11 +1014,14 @@
 for (i = 1; i < avctx->thread_count; i++)
 av_freep(&ctx->thread[i]);
 
+ av_frame_free(&avctx->coded_frame);
+
 return 0;
 }
 
 AVCodec ff_dnxhd_encoder = {
 .name = "dnxhd",
+ .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_DNXHD,
 .priv_data_size = sizeof(DNXHDEncContext),
@@ -1029,6 +1032,5 @@
 .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV422P,
 AV_PIX_FMT_YUV422P10,
 AV_PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"),
 .priv_class = &class,
 };

libav-v9.6.tar.bz2/libavcodec/dnxhdenc.h -> libav-v10.1.tar.bz2/libavcodec/dnxhdenc.h Changed

libav-v9.6.tar.bz2/libavcodec/dpcm.c -> libav-v10.1.tar.bz2/libavcodec/dpcm.c Changed

@@ -44,7 +44,6 @@
 #include "mathops.h"
 
 typedef struct DPCMContext {
- AVFrame frame;
 int16_t roq_square_array[256];
 int sample[2]; ///< previous sample (for SOL_DPCM)
 const int8_t *sol_table; ///< delta table for SOL_DPCM
@@ -163,9 +162,6 @@
 else
 avctx->sample_fmt = AV_SAMPLE_FMT_S16;
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
@@ -175,6 +171,7 @@
 {
 int buf_size = avpkt->size;
 DPCMContext *s = avctx->priv_data;
+ AVFrame *frame = data;
 int out = 0, ret;
 int predictor[2];
 int ch = 0;
@@ -210,12 +207,12 @@
 }
 
 /* get output buffer */
- s->frame.nb_samples = out / avctx->channels;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = out / avctx->channels;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- output_samples = (int16_t *)s->frame.data[0];
+ output_samples = (int16_t *)frame->data[0];
 samples_end = output_samples + out;
 
 switch(avctx->codec->id) {
@@ -295,7 +292,7 @@
 }
 case AV_CODEC_ID_SOL_DPCM:
 if (avctx->codec_tag != 3) {
- uint8_t *output_samples_u8 = s->frame.data[0],
+ uint8_t *output_samples_u8 = frame->data[0],
 *samples_end_u8 = output_samples_u8 + out;
 while (output_samples_u8 < samples_end_u8) {
 int n = bytestream2_get_byteu(&gb);
@@ -322,8 +319,7 @@
 break;
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
 return avpkt->size;
 }
@@ -331,13 +327,13 @@
 #define DPCM_DECODER(id_, name_, long_name_) \
 AVCodec ff_ ## name_ ## _decoder = { \
 .name = #name_, \
+ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
 .type = AVMEDIA_TYPE_AUDIO, \
 .id = id_, \
 .priv_data_size = sizeof(DPCMContext), \
 .init = dpcm_decode_init, \
 .decode = dpcm_decode_frame, \
 .capabilities = CODEC_CAP_DR1, \
- .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
 }
 
 DPCM_DECODER(AV_CODEC_ID_INTERPLAY_DPCM, interplay_dpcm, "DPCM Interplay");

libav-v9.6.tar.bz2/libavcodec/dpx.c -> libav-v10.1.tar.bz2/libavcodec/dpx.c Changed

@@ -25,11 +25,6 @@
 #include "avcodec.h"
 #include "internal.h"
 
-typedef struct DPXContext {
- AVFrame picture;
-} DPXContext;
-
-
 static unsigned int read32(const uint8_t **ptr, int is_big)
 {
 unsigned int temp;
@@ -58,14 +53,12 @@
 const uint8_t *buf = avpkt->data;
 const uint8_t *buf_end = avpkt->data + avpkt->size;
 int buf_size = avpkt->size;
- DPXContext *const s = avctx->priv_data;
- AVFrame *picture = data;
- AVFrame *const p = &s->picture;
+ AVFrame *const p = data;
 uint8_t *ptr;
 
 unsigned int offset;
 int magic_num, endian;
- int x, y;
+ int x, y, ret;
 int w, h, stride, bits_per_color, descriptor, elements, target_packet_size, source_packet_size;
 
 unsigned int rgbBuffer;
@@ -86,7 +79,7 @@
 endian = 1;
 } else {
 av_log(avctx, AV_LOG_ERROR, "DPX marker not found\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 offset = read32(&buf, endian);
@@ -121,7 +114,7 @@
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "Unsupported descriptor %d\n", descriptor);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 switch (bits_per_color) {
@@ -151,18 +144,15 @@
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "Unsupported color depth : %d\n", bits_per_color);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- if (s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
- if (av_image_check_size(w, h, 0, avctx))
- return -1;
- if (w != avctx->width || h != avctx->height)
- avcodec_set_dimensions(avctx, w, h);
- if (ff_get_buffer(avctx, p) < 0) {
+ if ((ret = ff_set_dimensions(avctx, w, h)) < 0)
+ return ret;
+
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 // Move pointer to offset from start of file
@@ -173,7 +163,7 @@
 
 if (source_packet_size*avctx->width*avctx->height > buf_end - buf) {
 av_log(avctx, AV_LOG_ERROR, "Overread buffer. Invalid header?\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 switch (bits_per_color) {
 case 10:
@@ -212,37 +202,16 @@
 break;
 }
 
- *picture = s->picture;
 *got_frame = 1;
 
 return buf_size;
 }
 
-static av_cold int decode_init(AVCodecContext *avctx)
-{
- DPXContext *s = avctx->priv_data;
- avcodec_get_frame_defaults(&s->picture);
- avctx->coded_frame = &s->picture;
- return 0;
-}
-
-static av_cold int decode_end(AVCodecContext *avctx)
-{
- DPXContext *s = avctx->priv_data;
- if (s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
-
- return 0;
-}
-
 AVCodec ff_dpx_decoder = {
 .name = "dpx",
+ .long_name = NULL_IF_CONFIG_SMALL("DPX image"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_DPX,
- .priv_data_size = sizeof(DPXContext),
- .init = decode_init,
- .close = decode_end,
 .decode = decode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("DPX image"),
 .capabilities = CODEC_CAP_DR1,
 };

libav-v9.6.tar.bz2/libavcodec/dpxenc.c -> libav-v10.1.tar.bz2/libavcodec/dpxenc.c Changed

@@ -26,7 +26,6 @@
 #include "internal.h"
 
 typedef struct DPXContext {
-    AVFrame picture;
     int big_endian;
     int bits_per_component;
     int descriptor;
@@ -36,7 +35,10 @@
 {
     DPXContext *s = avctx->priv_data;
 
-    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;
 
@@ -173,18 +175,25 @@
     return 0;
 }
 
+static av_cold int encode_close(AVCodecContext *avctx)
+{
+    av_frame_free(&avctx->coded_frame);
+    return 0;
+}
+
 AVCodec ff_dpx_encoder = {
     .name = "dpx",
+    .long_name = NULL_IF_CONFIG_SMALL("DPX image"),
     .type = AVMEDIA_TYPE_VIDEO,
     .id   = AV_CODEC_ID_DPX,
     .priv_data_size = sizeof(DPXContext),
     .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,
         AV_PIX_FMT_NONE},
-    .long_name = NULL_IF_CONFIG_SMALL("DPX image"),
 };

libav-v9.6.tar.bz2/libavcodec/dsicinav.c -> libav-v10.1.tar.bz2/libavcodec/dsicinav.c Changed

@@ -39,14 +39,13 @@
 
 typedef struct CinVideoContext {
 AVCodecContext *avctx;
- AVFrame frame;
+ AVFrame *frame;
 unsigned int bitmap_size;
 uint32_t palette[256];
 uint8_t *bitmap_table[3];
 } CinVideoContext;
 
 typedef struct CinAudioContext {
- AVFrame frame;
 int initial_decode_frame;
 int delta;
 } CinAudioContext;
@@ -97,7 +96,9 @@
 cin->avctx = avctx;
 avctx->pix_fmt = AV_PIX_FMT_PAL8;
 
- cin->frame.data[0] = NULL;
+ cin->frame = av_frame_alloc();
+ if (!cin->frame)
+ return AVERROR(ENOMEM);
 
 cin->bitmap_size = avctx->width * avctx->height;
 for (i = 0; i < 3; ++i) {
@@ -109,27 +110,30 @@
 return 0;
 }
 
-static void cin_apply_delta_data(const unsigned char *src, unsigned char *dst, int size)
+static void cin_apply_delta_data(const unsigned char *src, unsigned char *dst,
+ int size)
 {
 while (size--)
 *dst++ += *src++;
 }
 
-static int cin_decode_huffman(const unsigned char *src, int src_size, unsigned char *dst, int dst_size)
+static int cin_decode_huffman(const unsigned char *src, int src_size,
+ unsigned char *dst, int dst_size)
 {
 int b, huff_code = 0;
 unsigned char huff_code_table[15];
- unsigned char *dst_cur = dst;
- unsigned char *dst_end = dst + dst_size;
+ unsigned char *dst_cur = dst;
+ unsigned char *dst_end = dst + dst_size;
 const unsigned char *src_end = src + src_size;
 
- memcpy(huff_code_table, src, 15); src += 15;
+ memcpy(huff_code_table, src, 15);
+ src += 15;
 
 while (src < src_end) {
 huff_code = *src++;
 if ((huff_code >> 4) == 15) {
- b = huff_code << 4;
- huff_code = *src++;
+ b = huff_code << 4;
+ huff_code = *src++;
 *dst_cur++ = b | (huff_code >> 4);
 } else
 *dst_cur++ = huff_code_table[huff_code >> 4];
@@ -148,11 +152,12 @@
 return dst_cur - dst;
 }
 
-static int cin_decode_lzss(const unsigned char *src, int src_size, unsigned char *dst, int dst_size)
+static int cin_decode_lzss(const unsigned char *src, int src_size,
+ unsigned char *dst, int dst_size)
 {
 uint16_t cmd;
 int i, sz, offset, code;
- unsigned char *dst_end = dst + dst_size, *dst_start = dst;
+ unsigned char *dst_end = dst + dst_size, *dst_start = dst;
 const unsigned char *src_end = src + src_size;
 
 while (src < src_end && dst < dst_end) {
@@ -161,13 +166,15 @@
 if (code & (1 << i)) {
 *dst++ = *src++;
 } else {
- cmd = AV_RL16(src); src += 2;
+ cmd = AV_RL16(src);
+ src += 2;
 offset = cmd >> 4;
- if ((int) (dst - dst_start) < offset + 1)
+ if ((int)(dst - dst_start) < offset + 1)
 return AVERROR_INVALIDDATA;
 sz = (cmd & 0xF) + 2;
- /* don't use memcpy/memmove here as the decoding routine (ab)uses */
- /* buffer overlappings to repeat bytes in the destination */
+ /* don't use memcpy/memmove here as the decoding routine
+ * (ab)uses buffer overlappings to repeat bytes in the
+ * destination */
 sz = FFMIN(sz, dst_end - dst);
 while (sz--) {
 *dst = *(dst - offset - 1);
@@ -180,20 +187,23 @@
 return 0;
 }
 
-static void cin_decode_rle(const unsigned char *src, int src_size, unsigned char *dst, int dst_size)
+static void cin_decode_rle(const unsigned char *src, int src_size,
+ unsigned char *dst, int dst_size)
 {
 int len, code;
- unsigned char *dst_end = dst + dst_size;
+ unsigned char *dst_end = dst + dst_size;
 const unsigned char *src_end = src + src_size;
 
 while (src < src_end && dst < dst_end) {
 code = *src++;
 if (code & 0x80) {
+ if (src >= src_end)
+ break;
 len = code - 0x7F;
 memset(dst, *src++, FFMIN(len, dst_end - dst));
 } else {
 len = code + 1;
- memcpy(dst, src, FFMIN(len, dst_end - dst));
+ memcpy(dst, src, FFMIN3(len, dst_end - dst, src_end - src));
 src += len;
 }
 dst += len;
@@ -204,15 +214,16 @@
 void *data, int *got_frame,
 AVPacket *avpkt)
 {
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
 CinVideoContext *cin = avctx->priv_data;
- int i, y, palette_type, palette_colors_count, bitmap_frame_type, bitmap_frame_size, res = 0;
+ int i, y, palette_type, palette_colors_count,
+ bitmap_frame_type, bitmap_frame_size, res = 0;
 
- palette_type = buf[0];
- palette_colors_count = AV_RL16(buf+1);
- bitmap_frame_type = buf[3];
- buf += 4;
+ palette_type = buf[0];
+ palette_colors_count = AV_RL16(buf + 1);
+ bitmap_frame_type = buf[3];
+ buf += 4;
 
 bitmap_frame_size = buf_size - 4;
 
@@ -223,46 +234,50 @@
 if (palette_colors_count > 256)
 return AVERROR_INVALIDDATA;
 for (i = 0; i < palette_colors_count; ++i) {
- cin->palette[i] = bytestream_get_le24(&buf);
+ cin->palette[i] = bytestream_get_le24(&buf);
 bitmap_frame_size -= 3;
 }
 } else {
 for (i = 0; i < palette_colors_count; ++i) {
- cin->palette[buf[0]] = AV_RL24(buf+1);
- buf += 4;
- bitmap_frame_size -= 4;
+ cin->palette[buf[0]] = AV_RL24(buf + 1);
+ buf += 4;
+ bitmap_frame_size -= 4;
 }
 }
 
- /* note: the decoding routines below assumes that surface.width = surface.pitch */
+ bitmap_frame_size = FFMIN(cin->bitmap_size, bitmap_frame_size);
+
+ /* note: the decoding routines below assumes that
+ * surface.width = surface.pitch */
 switch (bitmap_frame_type) {
 case 9:
 cin_decode_rle(buf, bitmap_frame_size,
- cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+ cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
 break;
 case 34:
 cin_decode_rle(buf, bitmap_frame_size,
- cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+ cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
 cin_apply_delta_data(cin->bitmap_table[CIN_PRE_BMP],
- cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+ cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
 break;
 case 35:
 cin_decode_huffman(buf, bitmap_frame_size,
- cin->bitmap_table[CIN_INT_BMP], cin->bitmap_size);
+ cin->bitmap_table[CIN_INT_BMP], cin->bitmap_size);
 cin_decode_rle(cin->bitmap_table[CIN_INT_BMP], bitmap_frame_size,
- cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+ cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
 break;
 case 36:
 bitmap_frame_size = cin_decode_huffman(buf, bitmap_frame_size,
- cin->bitmap_table[CIN_INT_BMP], cin->bitmap_size);
+ cin->bitmap_table[CIN_INT_BMP],
+ cin->bitmap_size);
 cin_decode_rle(cin->bitmap_table[CIN_INT_BMP], bitmap_frame_size,
- cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+ cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
 cin_apply_delta_data(cin->bitmap_table[CIN_PRE_BMP],
- cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+ cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
 break;
 case 37:
 cin_decode_huffman(buf, bitmap_frame_size,
- cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+ cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
 break;
 case 38:
 res = cin_decode_lzss(buf, bitmap_frame_size,
@@ -278,27 +293,30 @@
 if (res < 0)
 return res;
 cin_apply_delta_data(cin->bitmap_table[CIN_PRE_BMP],
- cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+ cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
 break;
 }
 
- cin->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, &cin->frame)) {
- av_log(cin->avctx, AV_LOG_ERROR, "delphinecinvideo: reget_buffer() failed to allocate a frame\n");
- return -1;
+ if ((res = ff_reget_buffer(avctx, cin->frame)) < 0) {
+ av_log(cin->avctx, AV_LOG_ERROR,
+ "delphinecinvideo: reget_buffer() failed to allocate a frame\n");
+ 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],
- cin->bitmap_table[CIN_CUR_BMP] + y * cin->avctx->width,
- cin->avctx->width);
+ 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]);
 
- FFSWAP(uint8_t *, cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_table[CIN_PRE_BMP]);
+ if ((res = av_frame_ref(data, cin->frame)) < 0)
+ return res;
 
 *got_frame = 1;
- *(AVFrame *)data = cin->frame;
 
 return buf_size;
 }
@@ -308,8 +326,7 @@
 CinVideoContext *cin = avctx->priv_data;
 int i;
 
- if (cin->frame.data[0])
- avctx->release_buffer(avctx, &cin->frame);
+ av_frame_free(&cin->frame);
 
 for (i = 0; i < 3; ++i)
 av_free(cin->bitmap_table[i]);
@@ -327,52 +344,49 @@
 avctx->channels = 1;
 avctx->channel_layout = AV_CH_LAYOUT_MONO;
 
- avcodec_get_frame_defaults(&cin->frame);
- avctx->coded_frame = &cin->frame;
-
 return 0;
 }
 
 static int cinaudio_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
- const uint8_t *buf = avpkt->data;
- CinAudioContext *cin = avctx->priv_data;
+ AVFrame *frame = data;
+ const uint8_t *buf = avpkt->data;
+ CinAudioContext *cin = avctx->priv_data;
 const uint8_t *buf_end = buf + avpkt->size;
 int16_t *samples;
 int delta, ret;
 
 /* get output buffer */
- cin->frame.nb_samples = avpkt->size - cin->initial_decode_frame;
- if ((ret = ff_get_buffer(avctx, &cin->frame)) < 0) {
+ frame->nb_samples = avpkt->size - cin->initial_decode_frame;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- samples = (int16_t *)cin->frame.data[0];
+ samples = (int16_t *)frame->data[0];
 
 delta = cin->delta;
 if (cin->initial_decode_frame) {
 cin->initial_decode_frame = 0;
- delta = sign_extend(AV_RL16(buf), 16);
- buf += 2;
- *samples++ = delta;
+ delta = sign_extend(AV_RL16(buf), 16);
+ buf += 2;
+ *samples++ = delta;
 }
 while (buf < buf_end) {
- delta += cinaudio_delta16_table[*buf++];
- delta = av_clip_int16(delta);
+ delta += cinaudio_delta16_table[*buf++];
+ delta = av_clip_int16(delta);
 *samples++ = delta;
 }
 cin->delta = delta;
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = cin->frame;
+ *got_frame_ptr = 1;
 
 return avpkt->size;
 }
 
-
 AVCodec ff_dsicinvideo_decoder = {
 .name = "dsicinvideo",
+ .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_DSICINVIDEO,
 .priv_data_size = sizeof(CinVideoContext),
@@ -380,16 +394,15 @@
 .close = cinvideo_decode_end,
 .decode = cinvideo_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN video"),
 };
 
 AVCodec ff_dsicinaudio_decoder = {
 .name = "dsicinaudio",
+ .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN audio"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_DSICINAUDIO,
 .priv_data_size = sizeof(CinAudioContext),
 .init = cinaudio_decode_init,
 .decode = cinaudio_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN audio"),
 };

libav-v9.6.tar.bz2/libavcodec/dsputil.c -> libav-v10.1.tar.bz2/libavcodec/dsputil.c Changed

@@ -27,25 +27,24 @@
 * DSP utils
 */
 
+#include "libavutil/attributes.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/internal.h"
 #include "avcodec.h"
+#include "copy_block.h"
+#include "dct.h"
 #include "dsputil.h"
 #include "simple_idct.h"
 #include "faandct.h"
 #include "faanidct.h"
+#include "imgconvert.h"
 #include "mathops.h"
 #include "mpegvideo.h"
 #include "config.h"
-#include "vorbis.h"
 
-uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP] = {0, };
 uint32_t ff_squareTbl[512] = {0, };
 
-#define BIT_DEPTH 9
-#include "dsputil_template.c"
-#undef BIT_DEPTH
-
-#define BIT_DEPTH 10
+#define BIT_DEPTH 16
 #include "dsputil_template.c"
 #undef BIT_DEPTH
 
@@ -56,17 +55,6 @@
 #define pb_7f (~0UL/255 * 0x7f)
 #define pb_80 (~0UL/255 * 0x80)
 
-const uint8_t ff_zigzag_direct[64] = {
- 0, 1, 8, 16, 9, 2, 3, 10,
- 17, 24, 32, 25, 18, 11, 4, 5,
- 12, 19, 26, 33, 40, 48, 41, 34,
- 27, 20, 13, 6, 7, 14, 21, 28,
- 35, 42, 49, 56, 57, 50, 43, 36,
- 29, 22, 15, 23, 30, 37, 44, 51,
- 58, 59, 52, 45, 38, 31, 39, 46,
- 53, 60, 61, 54, 47, 55, 62, 63
-};
-
 /* Specific zigzag scan for 248 idct. NOTE that unlike the
 specification, we interleave the fields */
 const uint8_t ff_zigzag248_direct[64] = {
@@ -80,9 +68,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,
@@ -119,7 +104,9 @@
 
 static const uint8_t idct_sse2_row_perm[8] = {0, 4, 1, 5, 2, 6, 3, 7};
 
-void ff_init_scantable(uint8_t *permutation, ScanTable *st, const uint8_t *src_scantable){
+av_cold void ff_init_scantable(uint8_t *permutation, ScanTable *st,
+ const uint8_t *src_scantable)
+{
 int i;
 int end;
 
@@ -140,8 +127,8 @@
 }
 }
 
-void ff_init_scantable_permutation(uint8_t *idct_permutation,
- int idct_permutation_type)
+av_cold void ff_init_scantable_permutation(uint8_t *idct_permutation,
+ int idct_permutation_type)
 {
 int i;
 
@@ -337,7 +324,7 @@
 return s;
 }
 
-static void diff_pixels_c(DCTELEM *restrict block, const uint8_t *s1,
+static void diff_pixels_c(int16_t *restrict block, const uint8_t *s1,
 const uint8_t *s2, int stride){
 int i;
 
@@ -358,7 +345,7 @@
 }
 
 
-static void put_pixels_clamped_c(const DCTELEM *block, uint8_t *restrict pixels,
+static void put_pixels_clamped_c(const int16_t *block, uint8_t *restrict pixels,
 int line_size)
 {
 int i;
@@ -379,7 +366,7 @@
 }
 }
 
-static void put_signed_pixels_clamped_c(const DCTELEM *block,
+static void put_signed_pixels_clamped_c(const int16_t *block,
 uint8_t *restrict pixels,
 int line_size)
 {
@@ -400,7 +387,27 @@
 }
 }
 
-static void add_pixels_clamped_c(const DCTELEM *block, uint8_t *restrict pixels,
+static void add_pixels8_c(uint8_t *restrict pixels,
+ int16_t *block,
+ int line_size)
+{
+ int i;
+
+ for(i=0;i<8;i++) {
+ pixels[0] += block[0];
+ pixels[1] += block[1];
+ pixels[2] += block[2];
+ pixels[3] += block[3];
+ pixels[4] += block[4];
+ pixels[5] += block[5];
+ pixels[6] += block[6];
+ pixels[7] += block[7];
+ pixels += line_size;
+ block += 8;
+ }
+}
+
+static void add_pixels_clamped_c(const int16_t *block, uint8_t *restrict pixels,
 int line_size)
 {
 int i;
@@ -420,7 +427,7 @@
 }
 }
 
-static int sum_abs_dctelem_c(DCTELEM *block)
+static int sum_abs_dctelem_c(int16_t *block)
 {
 int sum=0, i;
 for(i=0; i<64; i++)
@@ -728,7 +735,7 @@
 
 #define QPEL_MC(r, OPNAME, RND, OP) \
 static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
 int i;\
 for(i=0; i<h; i++)\
 {\
@@ -747,7 +754,7 @@
 \
 static void OPNAME ## mpeg4_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
 const int w=8;\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
 int i;\
 for(i=0; i<w; i++)\
 {\
@@ -774,7 +781,7 @@
 }\
 \
 static void OPNAME ## mpeg4_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
 int i;\
 \
 for(i=0; i<h; i++)\
@@ -801,7 +808,7 @@
 }\
 \
 static void OPNAME ## mpeg4_qpel16_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
 int i;\
 const int w=16;\
 for(i=0; i<w; i++)\
@@ -844,23 +851,27 @@
 }\
 }\
 \
-static void OPNAME ## qpel8_mc10_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel8_mc10_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t half[64];\
 put ## RND ## mpeg4_qpel8_h_lowpass(half, src, 8, stride, 8);\
 OPNAME ## pixels8_l2_8(dst, src, half, stride, stride, 8, 8);\
 }\
 \
-static void OPNAME ## qpel8_mc20_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel8_mc20_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## mpeg4_qpel8_h_lowpass(dst, src, stride, stride, 8);\
 }\
 \
-static void OPNAME ## qpel8_mc30_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel8_mc30_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t half[64];\
 put ## RND ## mpeg4_qpel8_h_lowpass(half, src, 8, stride, 8);\
 OPNAME ## pixels8_l2_8(dst, src+1, half, stride, stride, 8, 8);\
 }\
 \
-static void OPNAME ## qpel8_mc01_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel8_mc01_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[16*9];\
 uint8_t half[64];\
 copy_block9(full, src, 16, stride, 9);\
@@ -868,20 +879,23 @@
 OPNAME ## pixels8_l2_8(dst, full, half, stride, 16, 8, 8);\
 }\
 \
-static void OPNAME ## qpel8_mc02_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel8_mc02_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[16*9];\
 copy_block9(full, src, 16, stride, 9);\
 OPNAME ## mpeg4_qpel8_v_lowpass(dst, full, stride, 16);\
 }\
 \
-static void OPNAME ## qpel8_mc03_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel8_mc03_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[16*9];\
 uint8_t half[64];\
 copy_block9(full, src, 16, stride, 9);\
 put ## RND ## mpeg4_qpel8_v_lowpass(half, full, 8, 16);\
 OPNAME ## pixels8_l2_8(dst, full+16, half, stride, 16, 8, 8);\
 }\
-void ff_ ## OPNAME ## qpel8_mc11_old_c(uint8_t *dst, uint8_t *src, int stride){\
+void ff_ ## OPNAME ## qpel8_mc11_old_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[16*9];\
 uint8_t halfH[72];\
 uint8_t halfV[64];\
@@ -892,7 +906,8 @@
 put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
 OPNAME ## pixels8_l4_8(dst, full, halfH, halfV, halfHV, stride, 16, 8, 8, 8, 8);\
 }\
-static void OPNAME ## qpel8_mc11_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel8_mc11_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[16*9];\
 uint8_t halfH[72];\
 uint8_t halfHV[64];\
@@ -902,7 +917,8 @@
 put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
 OPNAME ## pixels8_l2_8(dst, halfH, halfHV, stride, 8, 8, 8);\
 }\
-void ff_ ## OPNAME ## qpel8_mc31_old_c(uint8_t *dst, uint8_t *src, int stride){\
+void ff_ ## OPNAME ## qpel8_mc31_old_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[16*9];\
 uint8_t halfH[72];\
 uint8_t halfV[64];\
@@ -913,7 +929,8 @@
 put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
 OPNAME ## pixels8_l4_8(dst, full+1, halfH, halfV, halfHV, stride, 16, 8, 8, 8, 8);\
 }\
-static void OPNAME ## qpel8_mc31_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel8_mc31_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[16*9];\
 uint8_t halfH[72];\
 uint8_t halfHV[64];\
@@ -923,7 +940,8 @@
 put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
 OPNAME ## pixels8_l2_8(dst, halfH, halfHV, stride, 8, 8, 8);\
 }\
-void ff_ ## OPNAME ## qpel8_mc13_old_c(uint8_t *dst, uint8_t *src, int stride){\
+void ff_ ## OPNAME ## qpel8_mc13_old_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[16*9];\
 uint8_t halfH[72];\
 uint8_t halfV[64];\
@@ -934,7 +952,8 @@
 put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
 OPNAME ## pixels8_l4_8(dst, full+16, halfH+8, halfV, halfHV, stride, 16, 8, 8, 8, 8);\
 }\
-static void OPNAME ## qpel8_mc13_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel8_mc13_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[16*9];\
 uint8_t halfH[72];\
 uint8_t halfHV[64];\
@@ -944,7 +963,8 @@
 put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
 OPNAME ## pixels8_l2_8(dst, halfH+8, halfHV, stride, 8, 8, 8);\
 }\
-void ff_ ## OPNAME ## qpel8_mc33_old_c(uint8_t *dst, uint8_t *src, int stride){\
+void ff_ ## OPNAME ## qpel8_mc33_old_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[16*9];\
 uint8_t halfH[72];\
 uint8_t halfV[64];\
@@ -955,7 +975,8 @@
 put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
 OPNAME ## pixels8_l4_8(dst, full+17, halfH+8, halfV, halfHV, stride, 16, 8, 8, 8, 8);\
 }\
-static void OPNAME ## qpel8_mc33_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel8_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[16*9];\
 uint8_t halfH[72];\
 uint8_t halfHV[64];\
@@ -965,21 +986,24 @@
 put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
 OPNAME ## pixels8_l2_8(dst, halfH+8, halfHV, stride, 8, 8, 8);\
 }\
-static void OPNAME ## qpel8_mc21_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel8_mc21_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t halfH[72];\
 uint8_t halfHV[64];\
 put ## RND ## mpeg4_qpel8_h_lowpass(halfH, src, 8, stride, 9);\
 put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
 OPNAME ## pixels8_l2_8(dst, halfH, halfHV, stride, 8, 8, 8);\
 }\
-static void OPNAME ## qpel8_mc23_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel8_mc23_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t halfH[72];\
 uint8_t halfHV[64];\
 put ## RND ## mpeg4_qpel8_h_lowpass(halfH, src, 8, stride, 9);\
 put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
 OPNAME ## pixels8_l2_8(dst, halfH+8, halfHV, stride, 8, 8, 8);\
 }\
-void ff_ ## OPNAME ## qpel8_mc12_old_c(uint8_t *dst, uint8_t *src, int stride){\
+void ff_ ## OPNAME ## qpel8_mc12_old_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[16*9];\
 uint8_t halfH[72];\
 uint8_t halfV[64];\
@@ -990,7 +1014,8 @@
 put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
 OPNAME ## pixels8_l2_8(dst, halfV, halfHV, stride, 8, 8, 8);\
 }\
-static void OPNAME ## qpel8_mc12_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel8_mc12_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[16*9];\
 uint8_t halfH[72];\
 copy_block9(full, src, 16, stride, 9);\
@@ -998,7 +1023,8 @@
 put ## RND ## pixels8_l2_8(halfH, halfH, full, 8, 8, 16, 9);\
 OPNAME ## mpeg4_qpel8_v_lowpass(dst, halfH, stride, 8);\
 }\
-void ff_ ## OPNAME ## qpel8_mc32_old_c(uint8_t *dst, uint8_t *src, int stride){\
+void ff_ ## OPNAME ## qpel8_mc32_old_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[16*9];\
 uint8_t halfH[72];\
 uint8_t halfV[64];\
@@ -1009,7 +1035,8 @@
 put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
 OPNAME ## pixels8_l2_8(dst, halfV, halfHV, stride, 8, 8, 8);\
 }\
-static void OPNAME ## qpel8_mc32_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel8_mc32_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[16*9];\
 uint8_t halfH[72];\
 copy_block9(full, src, 16, stride, 9);\
@@ -1017,29 +1044,34 @@
 put ## RND ## pixels8_l2_8(halfH, halfH, full+1, 8, 8, 16, 9);\
 OPNAME ## mpeg4_qpel8_v_lowpass(dst, halfH, stride, 8);\
 }\
-static void OPNAME ## qpel8_mc22_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel8_mc22_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t halfH[72];\
 put ## RND ## mpeg4_qpel8_h_lowpass(halfH, src, 8, stride, 9);\
 OPNAME ## mpeg4_qpel8_v_lowpass(dst, halfH, stride, 8);\
 }\
 \
-static void OPNAME ## qpel16_mc10_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel16_mc10_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t half[256];\
 put ## RND ## mpeg4_qpel16_h_lowpass(half, src, 16, stride, 16);\
 OPNAME ## pixels16_l2_8(dst, src, half, stride, stride, 16, 16);\
 }\
 \
-static void OPNAME ## qpel16_mc20_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel16_mc20_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## mpeg4_qpel16_h_lowpass(dst, src, stride, stride, 16);\
 }\
 \
-static void OPNAME ## qpel16_mc30_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel16_mc30_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t half[256];\
 put ## RND ## mpeg4_qpel16_h_lowpass(half, src, 16, stride, 16);\
 OPNAME ## pixels16_l2_8(dst, src+1, half, stride, stride, 16, 16);\
 }\
 \
-static void OPNAME ## qpel16_mc01_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel16_mc01_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[24*17];\
 uint8_t half[256];\
 copy_block17(full, src, 24, stride, 17);\
@@ -1047,20 +1079,23 @@
 OPNAME ## pixels16_l2_8(dst, full, half, stride, 24, 16, 16);\
 }\
 \
-static void OPNAME ## qpel16_mc02_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel16_mc02_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[24*17];\
 copy_block17(full, src, 24, stride, 17);\
 OPNAME ## mpeg4_qpel16_v_lowpass(dst, full, stride, 24);\
 }\
 \
-static void OPNAME ## qpel16_mc03_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel16_mc03_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[24*17];\
 uint8_t half[256];\
 copy_block17(full, src, 24, stride, 17);\
 put ## RND ## mpeg4_qpel16_v_lowpass(half, full, 16, 24);\
 OPNAME ## pixels16_l2_8(dst, full+24, half, stride, 24, 16, 16);\
 }\
-void ff_ ## OPNAME ## qpel16_mc11_old_c(uint8_t *dst, uint8_t *src, int stride){\
+void ff_ ## OPNAME ## qpel16_mc11_old_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[24*17];\
 uint8_t halfH[272];\
 uint8_t halfV[256];\
@@ -1071,7 +1106,8 @@
 put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
 OPNAME ## pixels16_l4_8(dst, full, halfH, halfV, halfHV, stride, 24, 16, 16, 16, 16);\
 }\
-static void OPNAME ## qpel16_mc11_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel16_mc11_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[24*17];\
 uint8_t halfH[272];\
 uint8_t halfHV[256];\
@@ -1081,7 +1117,8 @@
 put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
 OPNAME ## pixels16_l2_8(dst, halfH, halfHV, stride, 16, 16, 16);\
 }\
-void ff_ ## OPNAME ## qpel16_mc31_old_c(uint8_t *dst, uint8_t *src, int stride){\
+void ff_ ## OPNAME ## qpel16_mc31_old_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[24*17];\
 uint8_t halfH[272];\
 uint8_t halfV[256];\
@@ -1092,7 +1129,8 @@
 put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
 OPNAME ## pixels16_l4_8(dst, full+1, halfH, halfV, halfHV, stride, 24, 16, 16, 16, 16);\
 }\
-static void OPNAME ## qpel16_mc31_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel16_mc31_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[24*17];\
 uint8_t halfH[272];\
 uint8_t halfHV[256];\
@@ -1102,7 +1140,8 @@
 put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
 OPNAME ## pixels16_l2_8(dst, halfH, halfHV, stride, 16, 16, 16);\
 }\
-void ff_ ## OPNAME ## qpel16_mc13_old_c(uint8_t *dst, uint8_t *src, int stride){\
+void ff_ ## OPNAME ## qpel16_mc13_old_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[24*17];\
 uint8_t halfH[272];\
 uint8_t halfV[256];\
@@ -1113,7 +1152,8 @@
 put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
 OPNAME ## pixels16_l4_8(dst, full+24, halfH+16, halfV, halfHV, stride, 24, 16, 16, 16, 16);\
 }\
-static void OPNAME ## qpel16_mc13_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel16_mc13_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[24*17];\
 uint8_t halfH[272];\
 uint8_t halfHV[256];\
@@ -1123,7 +1163,8 @@
 put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
 OPNAME ## pixels16_l2_8(dst, halfH+16, halfHV, stride, 16, 16, 16);\
 }\
-void ff_ ## OPNAME ## qpel16_mc33_old_c(uint8_t *dst, uint8_t *src, int stride){\
+void ff_ ## OPNAME ## qpel16_mc33_old_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[24*17];\
 uint8_t halfH[272];\
 uint8_t halfV[256];\
@@ -1134,7 +1175,8 @@
 put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
 OPNAME ## pixels16_l4_8(dst, full+25, halfH+16, halfV, halfHV, stride, 24, 16, 16, 16, 16);\
 }\
-static void OPNAME ## qpel16_mc33_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel16_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[24*17];\
 uint8_t halfH[272];\
 uint8_t halfHV[256];\
@@ -1144,21 +1186,24 @@
 put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
 OPNAME ## pixels16_l2_8(dst, halfH+16, halfHV, stride, 16, 16, 16);\
 }\
-static void OPNAME ## qpel16_mc21_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel16_mc21_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t halfH[272];\
 uint8_t halfHV[256];\
 put ## RND ## mpeg4_qpel16_h_lowpass(halfH, src, 16, stride, 17);\
 put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
 OPNAME ## pixels16_l2_8(dst, halfH, halfHV, stride, 16, 16, 16);\
 }\
-static void OPNAME ## qpel16_mc23_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel16_mc23_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t halfH[272];\
 uint8_t halfHV[256];\
 put ## RND ## mpeg4_qpel16_h_lowpass(halfH, src, 16, stride, 17);\
 put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
 OPNAME ## pixels16_l2_8(dst, halfH+16, halfHV, stride, 16, 16, 16);\
 }\
-void ff_ ## OPNAME ## qpel16_mc12_old_c(uint8_t *dst, uint8_t *src, int stride){\
+void ff_ ## OPNAME ## qpel16_mc12_old_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[24*17];\
 uint8_t halfH[272];\
 uint8_t halfV[256];\
@@ -1169,7 +1214,8 @@
 put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
 OPNAME ## pixels16_l2_8(dst, halfV, halfHV, stride, 16, 16, 16);\
 }\
-static void OPNAME ## qpel16_mc12_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel16_mc12_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[24*17];\
 uint8_t halfH[272];\
 copy_block17(full, src, 24, stride, 17);\
@@ -1177,7 +1223,8 @@
 put ## RND ## pixels16_l2_8(halfH, halfH, full, 16, 16, 24, 17);\
 OPNAME ## mpeg4_qpel16_v_lowpass(dst, halfH, stride, 16);\
 }\
-void ff_ ## OPNAME ## qpel16_mc32_old_c(uint8_t *dst, uint8_t *src, int stride){\
+void ff_ ## OPNAME ## qpel16_mc32_old_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[24*17];\
 uint8_t halfH[272];\
 uint8_t halfV[256];\
@@ -1188,7 +1235,8 @@
 put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
 OPNAME ## pixels16_l2_8(dst, halfV, halfHV, stride, 16, 16, 16);\
 }\
-static void OPNAME ## qpel16_mc32_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel16_mc32_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[24*17];\
 uint8_t halfH[272];\
 copy_block17(full, src, 24, stride, 17);\
@@ -1196,7 +1244,8 @@
 put ## RND ## pixels16_l2_8(halfH, halfH, full+1, 16, 16, 24, 17);\
 OPNAME ## mpeg4_qpel16_v_lowpass(dst, halfH, stride, 16);\
 }\
-static void OPNAME ## qpel16_mc22_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## qpel16_mc22_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t halfH[272];\
 put ## RND ## mpeg4_qpel16_h_lowpass(halfH, src, 16, stride, 17);\
 OPNAME ## mpeg4_qpel16_v_lowpass(dst, halfH, stride, 16);\
@@ -1216,15 +1265,32 @@
 #undef op_put
 #undef op_put_no_rnd
 
+void ff_put_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)
+{
+ put_pixels8_8_c(dst, src, stride, 8);
+}
+void ff_avg_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)
+{
+ avg_pixels8_8_c(dst, src, stride, 8);
+}
+void ff_put_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)
+{
+ put_pixels16_8_c(dst, src, stride, 16);
+}
+void ff_avg_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)
+{
+ avg_pixels16_8_c(dst, src, stride, 16);
+}
+
 #define put_qpel8_mc00_c ff_put_pixels8x8_c
 #define avg_qpel8_mc00_c ff_avg_pixels8x8_c
 #define put_qpel16_mc00_c ff_put_pixels16x16_c
 #define avg_qpel16_mc00_c ff_avg_pixels16x16_c
 #define put_no_rnd_qpel8_mc00_c ff_put_pixels8x8_c
-#define put_no_rnd_qpel16_mc00_c ff_put_pixels16x16_8_c
+#define put_no_rnd_qpel16_mc00_c ff_put_pixels16x16_c
 
 static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
 int i;
 
 for(i=0; i<h; i++){
@@ -1242,22 +1308,26 @@
 }
 
 #if CONFIG_RV40_DECODER
-void ff_put_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, int stride){
+void ff_put_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)
+{
 put_pixels16_xy2_8_c(dst, src, stride, 16);
 }
-void ff_avg_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, int stride){
+void ff_avg_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)
+{
 avg_pixels16_xy2_8_c(dst, src, stride, 16);
 }
-void ff_put_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, int stride){
+void ff_put_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)
+{
 put_pixels8_xy2_8_c(dst, src, stride, 8);
 }
-void ff_avg_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, int stride){
+void ff_avg_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)
+{
 avg_pixels8_xy2_8_c(dst, src, stride, 8);
 }
 #endif /* CONFIG_RV40_DECODER */
 
 static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int w){
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
 int i;
 
 for(i=0; i<w; i++){
@@ -1285,27 +1355,32 @@
 }
 }
 
-static void put_mspel8_mc10_c(uint8_t *dst, uint8_t *src, int stride){
+static void put_mspel8_mc10_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)
+{
 uint8_t half[64];
 wmv2_mspel8_h_lowpass(half, src, 8, stride, 8);
 put_pixels8_l2_8(dst, src, half, stride, stride, 8, 8);
 }
 
-static void put_mspel8_mc20_c(uint8_t *dst, uint8_t *src, int stride){
+static void put_mspel8_mc20_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)
+{
 wmv2_mspel8_h_lowpass(dst, src, stride, stride, 8);
 }
 
-static void put_mspel8_mc30_c(uint8_t *dst, uint8_t *src, int stride){
+static void put_mspel8_mc30_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)
+{
 uint8_t half[64];
 wmv2_mspel8_h_lowpass(half, src, 8, stride, 8);
 put_pixels8_l2_8(dst, src+1, half, stride, stride, 8, 8);
 }
 
-static void put_mspel8_mc02_c(uint8_t *dst, uint8_t *src, int stride){
+static void put_mspel8_mc02_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)
+{
 wmv2_mspel8_v_lowpass(dst, src, stride, stride, 8);
 }
 
-static void put_mspel8_mc12_c(uint8_t *dst, uint8_t *src, int stride){
+static void put_mspel8_mc12_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)
+{
 uint8_t halfH[88];
 uint8_t halfV[64];
 uint8_t halfHV[64];
@@ -1314,7 +1389,8 @@
 wmv2_mspel8_v_lowpass(halfHV, halfH+8, 8, 8, 8);
 put_pixels8_l2_8(dst, halfV, halfHV, stride, 8, 8, 8);
 }
-static void put_mspel8_mc32_c(uint8_t *dst, uint8_t *src, int stride){
+static void put_mspel8_mc32_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)
+{
 uint8_t halfH[88];
 uint8_t halfV[64];
 uint8_t halfHV[64];
@@ -1323,113 +1399,13 @@
 wmv2_mspel8_v_lowpass(halfHV, halfH+8, 8, 8, 8);
 put_pixels8_l2_8(dst, halfV, halfHV, stride, 8, 8, 8);
 }
-static void put_mspel8_mc22_c(uint8_t *dst, uint8_t *src, int stride){
+static void put_mspel8_mc22_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)
+{
 uint8_t halfH[88];
 wmv2_mspel8_h_lowpass(halfH, src-stride, 8, stride, 11);
 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 void h261_loop_filter_c(uint8_t *src, int stride){
- int x,y,xy,yz;
- int temp[64];
-
- for(x=0; x<8; x++){
- temp[x ] = 4*src[x ];
- temp[x + 7*8] = 4*src[x + 7*stride];
- }
- for(y=1; y<7; y++){
- for(x=0; x<8; x++){
- xy = y * stride + x;
- yz = y * 8 + x;
- temp[yz] = src[xy - stride] + 2*src[xy] + src[xy + stride];
- }
- }
-
- for(y=0; y<8; y++){
- src[ y*stride] = (temp[ y*8] + 2)>>2;
- src[7+y*stride] = (temp[7+y*8] + 2)>>2;
- for(x=1; x<7; x++){
- xy = y * stride + x;
- yz = y * 8 + x;
- src[xy] = (temp[yz-1] + 2*temp[yz] + temp[yz+1] + 8)>>4;
- }
- }
-}
-
 static inline int pix_abs16_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
 {
 int s, i;
@@ -1705,35 +1681,6 @@
 }
 }
 
-/**
- * Permute an 8x8 block.
- * @param block the block which will be permuted according to the given permutation vector
- * @param permutation the permutation vector
- * @param last the last non zero coefficient in scantable order, used to speed the permutation up
- * @param scantable the used scantable, this is only used to speed the permutation up, the block is not
- * (inverse) permutated to scantable order!
- */
-void ff_block_permute(DCTELEM *block, uint8_t *permutation, const uint8_t *scantable, int last)
-{
- int i;
- DCTELEM temp[64];
-
- if(last<=0) return;
- //if(permutation[1]==1) return; //FIXME it is ok but not clean and might fail for some permutations
-
- for(i=0; i<=last; i++){
- const int j= scantable[i];
- temp[j]= block[j];
- block[j]=0;
- }
-
- for(i=0; i<=last; i++){
- const int j= scantable[i];
- const int perm_j= permutation[j];
- block[perm_j]= temp[j];
- }
-}
-
 static int zero_cmp(void *s, uint8_t *a, uint8_t *b, int stride, int h){
 return 0;
 }
@@ -1784,14 +1731,6 @@
 case FF_CMP_NSSE:
 cmp[i]= c->nsse[i];
 break;
-#if CONFIG_DWT
- case FF_CMP_W53:
- cmp[i]= c->w53[i];
- break;
- case FF_CMP_W97:
- cmp[i]= c->w97[i];
- break;
-#endif
 default:
 av_log(NULL, AV_LOG_ERROR,"internal error in cmp function selection\n");
 }
@@ -1800,7 +1739,7 @@
 
 static void add_bytes_c(uint8_t *dst, uint8_t *src, int w){
 long i;
- for(i=0; i<=w-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);
@@ -1825,7 +1764,7 @@
 }
 }else
 #endif
- for(i=0; i<=w-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);
@@ -2039,7 +1978,7 @@
 
 static int dct_sad8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
 MpegEncContext * const s= (MpegEncContext *)c;
- LOCAL_ALIGNED_16(DCTELEM, temp, [64]);
+ LOCAL_ALIGNED_16(int16_t, temp, [64]);
 
 assert(h==8);
 
@@ -2078,7 +2017,7 @@
 
 static int dct264_sad8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
 MpegEncContext * const s= (MpegEncContext *)c;
- DCTELEM dct[8][8];
+ int16_t dct[8][8];
 int i;
 int sum=0;
 
@@ -2103,7 +2042,7 @@
 
 static int dct_max8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
 MpegEncContext * const s= (MpegEncContext *)c;
- LOCAL_ALIGNED_16(DCTELEM, temp, [64]);
+ LOCAL_ALIGNED_16(int16_t, temp, [64]);
 int sum=0, i;
 
 assert(h==8);
@@ -2119,8 +2058,8 @@
 
 static int quant_psnr8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
 MpegEncContext * const s= (MpegEncContext *)c;
- LOCAL_ALIGNED_16(DCTELEM, temp, [64*2]);
- DCTELEM * const bak = temp+64;
+ LOCAL_ALIGNED_16(int16_t, temp, [64*2]);
+ int16_t * const bak = temp+64;
 int sum=0, i;
 
 assert(h==8);
@@ -2128,7 +2067,7 @@
 
 s->dsp.diff_pixels(temp, src1, src2, stride);
 
- memcpy(bak, temp, 64*sizeof(DCTELEM));
+ memcpy(bak, temp, 64*sizeof(int16_t));
 
 s->block_last_index[0/*FIXME*/]= s->fast_dct_quantize(s, temp, 0/*FIXME*/, s->qscale, &i);
 s->dct_unquantize_inter(s, temp, 0, s->qscale);
@@ -2143,7 +2082,7 @@
 static int rd8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
 MpegEncContext * const s= (MpegEncContext *)c;
 const uint8_t *scantable= s->intra_scantable.permutated;
- LOCAL_ALIGNED_16(DCTELEM, temp, [64]);
+ LOCAL_ALIGNED_16(int16_t, temp, [64]);
 LOCAL_ALIGNED_16(uint8_t, lsrc1, [64]);
 LOCAL_ALIGNED_16(uint8_t, lsrc2, [64]);
 int i, last, run, bits, level, distortion, start_i;
@@ -2219,7 +2158,7 @@
 static int bit8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){
 MpegEncContext * const s= (MpegEncContext *)c;
 const uint8_t *scantable= s->intra_scantable.permutated;
- LOCAL_ALIGNED_16(DCTELEM, temp, [64]);
+ LOCAL_ALIGNED_16(int16_t, temp, [64]);
 int i, last, run, bits, level, start_i;
 const int esc_length= s->ac_esc_length;
 uint8_t * length;
@@ -2351,6 +2290,20 @@
 return score;
 }
 
+#define WRAPPER8_16_SQ(name8, name16)\
+static int name16(void /*MpegEncContext*/ *s, uint8_t *dst, uint8_t *src, int stride, int h){\
+ int score=0;\
+ score +=name8(s, dst , src , stride, 8);\
+ score +=name8(s, dst+8 , src+8 , stride, 8);\
+ if(h==16){\
+ dst += 8*stride;\
+ src += 8*stride;\
+ score +=name8(s, dst , src , stride, 8);\
+ score +=name8(s, dst+8 , src+8 , stride, 8);\
+ }\
+ return score;\
+}
+
 WRAPPER8_16_SQ(hadamard8_diff8x8_c, hadamard8_diff16_c)
 WRAPPER8_16_SQ(hadamard8_intra8x8_c, hadamard8_intra16_c)
 WRAPPER8_16_SQ(dct_sad8x8_c, dct_sad16_c)
@@ -2362,70 +2315,6 @@
 WRAPPER8_16_SQ(rd8x8_c, rd16_c)
 WRAPPER8_16_SQ(bit8x8_c, bit16_c)
 
-static void vector_fmul_reverse_c(float *dst, const float *src0, const float *src1, int len){
- int i;
- src1 += len-1;
- for(i=0; i<len; i++)
- dst[i] = src0[i] * src1[-i];
-}
-
-static void vector_fmul_add_c(float *dst, const float *src0, const float *src1, const float *src2, int len){
- int i;
- for(i=0; i<len; i++)
- dst[i] = src0[i] * src1[i] + src2[i];
-}
-
-static void vector_fmul_window_c(float *dst, const float *src0,
- const float *src1, const float *win, int len)
-{
- int i,j;
- dst += len;
- win += len;
- src0+= len;
- for(i=-len, j=len-1; i<0; i++, j--) {
- float s0 = src0[i];
- float s1 = src1[j];
- float wi = win[i];
- float wj = win[j];
- dst[i] = s0*wj - s1*wi;
- dst[j] = s0*wi + s1*wj;
- }
-}
-
-static void butterflies_float_c(float *restrict v1, float *restrict v2,
- int len)
-{
- int i;
- for (i = 0; i < len; i++) {
- float t = v1[i] - v2[i];
- v1[i] += v2[i];
- v2[i] = t;
- }
-}
-
-static void butterflies_float_interleave_c(float *dst, const float *src0,
- const float *src1, int len)
-{
- int i;
- for (i = 0; i < len; i++) {
- float f1 = src0[i];
- float f2 = src1[i];
- dst[2*i ] = f1 + f2;
- dst[2*i + 1] = f1 - f2;
- }
-}
-
-float ff_scalarproduct_float_c(const float *v1, const float *v2, int len)
-{
- float p = 0.0;
- int i;
-
- for (i = 0; i < len; i++)
- p += v1[i] * v2[i];
-
- return p;
-}
-
 static inline uint32_t clipf_c_one(uint32_t a, uint32_t mini,
 uint32_t maxi, uint32_t maxisign)
 {
@@ -2491,19 +2380,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)
 {
@@ -2520,96 +2396,12 @@
 } while (len > 0);
 }
 
-#define W0 2048
-#define W1 2841 /* 2048*sqrt (2)*cos (1*pi/16) */
-#define W2 2676 /* 2048*sqrt (2)*cos (2*pi/16) */
-#define W3 2408 /* 2048*sqrt (2)*cos (3*pi/16) */
-#define W4 2048 /* 2048*sqrt (2)*cos (4*pi/16) */
-#define W5 1609 /* 2048*sqrt (2)*cos (5*pi/16) */
-#define W6 1108 /* 2048*sqrt (2)*cos (6*pi/16) */
-#define W7 565 /* 2048*sqrt (2)*cos (7*pi/16) */
-
-static void wmv2_idct_row(short * b)
-{
- int s1,s2;
- int a0,a1,a2,a3,a4,a5,a6,a7;
- /*step 1*/
- a1 = W1*b[1]+W7*b[7];
- a7 = W7*b[1]-W1*b[7];
- a5 = W5*b[5]+W3*b[3];
- a3 = W3*b[5]-W5*b[3];
- a2 = W2*b[2]+W6*b[6];
- a6 = W6*b[2]-W2*b[6];
- a0 = W0*b[0]+W0*b[4];
- a4 = W0*b[0]-W0*b[4];
- /*step 2*/
- s1 = (181*(a1-a5+a7-a3)+128)>>8;//1,3,5,7,
- s2 = (181*(a1-a5-a7+a3)+128)>>8;
- /*step 3*/
- b[0] = (a0+a2+a1+a5 + (1<<7))>>8;
- b[1] = (a4+a6 +s1 + (1<<7))>>8;
- b[2] = (a4-a6 +s2 + (1<<7))>>8;
- b[3] = (a0-a2+a7+a3 + (1<<7))>>8;
- b[4] = (a0-a2-a7-a3 + (1<<7))>>8;
- b[5] = (a4-a6 -s2 + (1<<7))>>8;
- b[6] = (a4+a6 -s1 + (1<<7))>>8;
- b[7] = (a0+a2-a1-a5 + (1<<7))>>8;
-}
-static void wmv2_idct_col(short * b)
-{
- int s1,s2;
- int a0,a1,a2,a3,a4,a5,a6,a7;
- /*step 1, with extended precision*/
- a1 = (W1*b[8*1]+W7*b[8*7] + 4)>>3;
- a7 = (W7*b[8*1]-W1*b[8*7] + 4)>>3;
- a5 = (W5*b[8*5]+W3*b[8*3] + 4)>>3;
- a3 = (W3*b[8*5]-W5*b[8*3] + 4)>>3;
- a2 = (W2*b[8*2]+W6*b[8*6] + 4)>>3;
- a6 = (W6*b[8*2]-W2*b[8*6] + 4)>>3;
- a0 = (W0*b[8*0]+W0*b[8*4] )>>3;
- a4 = (W0*b[8*0]-W0*b[8*4] )>>3;
- /*step 2*/
- s1 = (181*(a1-a5+a7-a3)+128)>>8;
- s2 = (181*(a1-a5-a7+a3)+128)>>8;
- /*step 3*/
- b[8*0] = (a0+a2+a1+a5 + (1<<13))>>14;
- b[8*1] = (a4+a6 +s1 + (1<<13))>>14;
- b[8*2] = (a4-a6 +s2 + (1<<13))>>14;
- b[8*3] = (a0-a2+a7+a3 + (1<<13))>>14;
-
- b[8*4] = (a0-a2-a7-a3 + (1<<13))>>14;
- b[8*5] = (a4-a6 -s2 + (1<<13))>>14;
- b[8*6] = (a4+a6 -s1 + (1<<13))>>14;
- b[8*7] = (a0+a2-a1-a5 + (1<<13))>>14;
-}
-void ff_wmv2_idct_c(short * block){
- int i;
-
- for(i=0;i<64;i+=8){
- wmv2_idct_row(block+i);
- }
- for(i=0;i<8;i++){
- wmv2_idct_col(block+i);
- }
-}
-/* XXX: those functions should be suppressed ASAP when all IDCTs are
- converted */
-static void ff_wmv2_idct_put_c(uint8_t *dest, int line_size, DCTELEM *block)
-{
- ff_wmv2_idct_c(block);
- put_pixels_clamped_c(block, dest, line_size);
-}
-static void ff_wmv2_idct_add_c(uint8_t *dest, int line_size, DCTELEM *block)
-{
- ff_wmv2_idct_c(block);
- add_pixels_clamped_c(block, dest, line_size);
-}
-static void ff_jref_idct_put(uint8_t *dest, int line_size, DCTELEM *block)
+static void jref_idct_put(uint8_t *dest, int line_size, int16_t *block)
 {
 ff_j_rev_dct (block);
 put_pixels_clamped_c(block, dest, line_size);
 }
-static void ff_jref_idct_add(uint8_t *dest, int line_size, DCTELEM *block)
+static void jref_idct_add(uint8_t *dest, int line_size, int16_t *block)
 {
 ff_j_rev_dct (block);
 add_pixels_clamped_c(block, dest, line_size);
@@ -2620,17 +2412,9 @@
 {
 int i;
 
- for(i=0;i<256;i++) ff_cropTbl[i + MAX_NEG_CROP] = i;
- for(i=0;i<MAX_NEG_CROP;i++) {
- ff_cropTbl[i] = 0;
- ff_cropTbl[i + MAX_NEG_CROP + 256] = 255;
- }
-
 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){
@@ -2655,8 +2439,6 @@
 
 av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx)
 {
- int i, j;
-
 ff_check_alignment();
 
 #if CONFIG_ENCODERS
@@ -2686,15 +2468,10 @@
 c->idct_permutation_type = FF_NO_IDCT_PERM;
 } else {
 if(avctx->idct_algo==FF_IDCT_INT){
- c->idct_put= ff_jref_idct_put;
- c->idct_add= ff_jref_idct_add;
+ c->idct_put= jref_idct_put;
+ c->idct_add= jref_idct_add;
 c->idct = ff_j_rev_dct;
 c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
- }else if(avctx->idct_algo==FF_IDCT_WMV2){
- c->idct_put= ff_wmv2_idct_put_c;
- c->idct_add= ff_wmv2_idct_add_c;
- c->idct = ff_wmv2_idct_c;
- c->idct_permutation_type= FF_NO_IDCT_PERM;
 }else if(avctx->idct_algo==FF_IDCT_FAAN){
 c->idct_put= ff_faanidct_put;
 c->idct_add= ff_faanidct_add;
@@ -2820,9 +2597,6 @@
 c->vsse[5]= vsse_intra8_c;
 c->nsse[0]= nsse16_c;
 c->nsse[1]= nsse8_c;
-#if CONFIG_DWT
- ff_dsputil_init_dwt(c);
-#endif
 
 c->ssd_int8_vs_int16 = ssd_int8_vs_int16_c;
 
@@ -2835,146 +2609,56 @@
 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->h261_loop_filter= h261_loop_filter_c;
-
 c->try_8x8basis= try_8x8basis_c;
 c->add_8x8basis= add_8x8basis_c;
 
-#if CONFIG_VORBIS_DECODER
- c->vorbis_inverse_coupling = ff_vorbis_inverse_coupling;
-#endif
- c->vector_fmul_reverse = vector_fmul_reverse_c;
- c->vector_fmul_add = vector_fmul_add_c;
- c->vector_fmul_window = vector_fmul_window_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->scalarproduct_float = ff_scalarproduct_float_c;
- c->butterflies_float = butterflies_float_c;
- c->butterflies_float_interleave = butterflies_float_interleave_c;
 
 c->shrink[0]= av_image_copy_plane;
 c->shrink[1]= ff_shrink22;
 c->shrink[2]= ff_shrink44;
 c->shrink[3]= ff_shrink88;
 
- memset(c->put_2tap_qpel_pixels_tab, 0, sizeof(c->put_2tap_qpel_pixels_tab));
- memset(c->avg_2tap_qpel_pixels_tab, 0, sizeof(c->avg_2tap_qpel_pixels_tab));
+ c->add_pixels8 = add_pixels8_c;
 
 #undef FUNC
 #undef FUNCC
 #define FUNC(f, depth) f ## _ ## depth
 #define FUNCC(f, depth) f ## _ ## depth ## _c
 
-#define dspfunc1(PFX, IDX, NUM, depth)\
- c->PFX ## _pixels_tab[IDX][0] = FUNCC(PFX ## _pixels ## NUM , depth);\
- c->PFX ## _pixels_tab[IDX][1] = FUNCC(PFX ## _pixels ## NUM ## _x2 , depth);\
- c->PFX ## _pixels_tab[IDX][2] = FUNCC(PFX ## _pixels ## NUM ## _y2 , depth);\
- c->PFX ## _pixels_tab[IDX][3] = FUNCC(PFX ## _pixels ## NUM ## _xy2, depth)
-
-#define dspfunc2(PFX, IDX, NUM, depth)\
- c->PFX ## _pixels_tab[IDX][ 0] = FUNCC(PFX ## NUM ## _mc00, depth);\
- c->PFX ## _pixels_tab[IDX][ 1] = FUNCC(PFX ## NUM ## _mc10, depth);\
- c->PFX ## _pixels_tab[IDX][ 2] = FUNCC(PFX ## NUM ## _mc20, depth);\
- c->PFX ## _pixels_tab[IDX][ 3] = FUNCC(PFX ## NUM ## _mc30, depth);\
- c->PFX ## _pixels_tab[IDX][ 4] = FUNCC(PFX ## NUM ## _mc01, depth);\
- c->PFX ## _pixels_tab[IDX][ 5] = FUNCC(PFX ## NUM ## _mc11, depth);\
- c->PFX ## _pixels_tab[IDX][ 6] = FUNCC(PFX ## NUM ## _mc21, depth);\
- c->PFX ## _pixels_tab[IDX][ 7] = FUNCC(PFX ## NUM ## _mc31, depth);\
- c->PFX ## _pixels_tab[IDX][ 8] = FUNCC(PFX ## NUM ## _mc02, depth);\
- c->PFX ## _pixels_tab[IDX][ 9] = FUNCC(PFX ## NUM ## _mc12, depth);\
- c->PFX ## _pixels_tab[IDX][10] = FUNCC(PFX ## NUM ## _mc22, depth);\
- c->PFX ## _pixels_tab[IDX][11] = FUNCC(PFX ## NUM ## _mc32, depth);\
- c->PFX ## _pixels_tab[IDX][12] = FUNCC(PFX ## NUM ## _mc03, depth);\
- c->PFX ## _pixels_tab[IDX][13] = FUNCC(PFX ## NUM ## _mc13, depth);\
- c->PFX ## _pixels_tab[IDX][14] = FUNCC(PFX ## NUM ## _mc23, depth);\
- c->PFX ## _pixels_tab[IDX][15] = FUNCC(PFX ## NUM ## _mc33, depth)
-
-
-#define BIT_DEPTH_FUNCS(depth, dct)\
- c->get_pixels = FUNCC(get_pixels ## dct , depth);\
- c->draw_edges = FUNCC(draw_edges , depth);\
- c->clear_block = FUNCC(clear_block ## dct , depth);\
- c->clear_blocks = FUNCC(clear_blocks ## dct , depth);\
- c->add_pixels8 = FUNCC(add_pixels8 ## dct , depth);\
- c->add_pixels4 = FUNCC(add_pixels4 ## dct , depth);\
- c->put_no_rnd_pixels_l2[0] = FUNCC(put_no_rnd_pixels16_l2, depth);\
- c->put_no_rnd_pixels_l2[1] = FUNCC(put_no_rnd_pixels8_l2 , depth);\
-\
- c->put_h264_chroma_pixels_tab[0] = FUNCC(put_h264_chroma_mc8 , depth);\
- c->put_h264_chroma_pixels_tab[1] = FUNCC(put_h264_chroma_mc4 , depth);\
- c->put_h264_chroma_pixels_tab[2] = FUNCC(put_h264_chroma_mc2 , depth);\
- c->avg_h264_chroma_pixels_tab[0] = FUNCC(avg_h264_chroma_mc8 , depth);\
- c->avg_h264_chroma_pixels_tab[1] = FUNCC(avg_h264_chroma_mc4 , depth);\
- c->avg_h264_chroma_pixels_tab[2] = FUNCC(avg_h264_chroma_mc2 , depth);\
-\
- dspfunc1(put , 0, 16, depth);\
- dspfunc1(put , 1, 8, depth);\
- dspfunc1(put , 2, 4, depth);\
- dspfunc1(put , 3, 2, depth);\
- dspfunc1(put_no_rnd, 0, 16, depth);\
- dspfunc1(put_no_rnd, 1, 8, depth);\
- dspfunc1(avg , 0, 16, depth);\
- dspfunc1(avg , 1, 8, depth);\
- dspfunc1(avg , 2, 4, depth);\
- dspfunc1(avg , 3, 2, depth);\
- dspfunc1(avg_no_rnd, 0, 16, depth);\
- dspfunc1(avg_no_rnd, 1, 8, depth);\
-\
- dspfunc2(put_h264_qpel, 0, 16, depth);\
- dspfunc2(put_h264_qpel, 1, 8, depth);\
- dspfunc2(put_h264_qpel, 2, 4, depth);\
- dspfunc2(put_h264_qpel, 3, 2, depth);\
- dspfunc2(avg_h264_qpel, 0, 16, depth);\
- dspfunc2(avg_h264_qpel, 1, 8, depth);\
- dspfunc2(avg_h264_qpel, 2, 4, depth);
+ c->draw_edges = FUNCC(draw_edges, 8);
+ c->clear_block = FUNCC(clear_block, 8);
+ c->clear_blocks = FUNCC(clear_blocks, 8);
+
+#define BIT_DEPTH_FUNCS(depth) \
+ c->get_pixels = FUNCC(get_pixels, depth);
 
 switch (avctx->bits_per_raw_sample) {
 case 9:
- if (c->dct_bits == 32) {
- BIT_DEPTH_FUNCS(9, _32);
- } else {
- BIT_DEPTH_FUNCS(9, _16);
- }
- break;
 case 10:
- if (c->dct_bits == 32) {
- BIT_DEPTH_FUNCS(10, _32);
- } else {
- BIT_DEPTH_FUNCS(10, _16);
- }
+ BIT_DEPTH_FUNCS(16);
 break;
 default:
- BIT_DEPTH_FUNCS(8, _16);
+ BIT_DEPTH_FUNCS(8);
 break;
 }
 
 
- if (HAVE_MMX) ff_dsputil_init_mmx (c, avctx);
- if (ARCH_ARM) ff_dsputil_init_arm (c, avctx);
- if (HAVE_VIS) ff_dsputil_init_vis (c, avctx);
- if (ARCH_ALPHA) ff_dsputil_init_alpha (c, avctx);
- if (ARCH_PPC) ff_dsputil_init_ppc (c, avctx);
- if (ARCH_SH4) ff_dsputil_init_sh4 (c, avctx);
- if (ARCH_BFIN) ff_dsputil_init_bfin (c, avctx);
-
- for (i = 0; i < 4; i++) {
- for (j = 0; j < 16; j++) {
- if(!c->put_2tap_qpel_pixels_tab[i][j])
- c->put_2tap_qpel_pixels_tab[i][j] =
- c->put_h264_qpel_pixels_tab[i][j];
- if(!c->avg_2tap_qpel_pixels_tab[i][j])
- c->avg_2tap_qpel_pixels_tab[i][j] =
- c->avg_h264_qpel_pixels_tab[i][j];
- }
- }
+ if (ARCH_ARM)
+ ff_dsputil_init_arm(c, avctx);
+ if (ARCH_BFIN)
+ ff_dsputil_init_bfin(c, avctx);
+ if (ARCH_PPC)
+ ff_dsputil_init_ppc(c, avctx);
+ if (ARCH_SH4)
+ ff_dsputil_init_sh4(c, avctx);
+ if (HAVE_VIS)
+ ff_dsputil_init_vis(c, avctx);
+ if (ARCH_X86)
+ ff_dsputil_init_x86(c, avctx);
 
 ff_init_scantable_permutation(c->idct_permutation,
 c->idct_permutation_type);

libav-v9.6.tar.bz2/libavcodec/dsputil.h -> libav-v10.1.tar.bz2/libavcodec/dsputil.h Changed

@@ -32,46 +32,7 @@
 
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
-
-
-//#define DEBUG
-/* dct code */
-typedef short DCTELEM;
-
-void ff_fdct_ifast (DCTELEM *data);
-void ff_fdct_ifast248 (DCTELEM *data);
-void ff_jpeg_fdct_islow_8(DCTELEM *data);
-void ff_jpeg_fdct_islow_10(DCTELEM *data);
-void ff_fdct248_islow_8(DCTELEM *data);
-void ff_fdct248_islow_10(DCTELEM *data);
-
-void ff_j_rev_dct (DCTELEM *data);
-void ff_wmv2_idct_c(DCTELEM *data);
-
-void ff_fdct_mmx(DCTELEM *block);
-void ff_fdct_mmxext(DCTELEM *block);
-void ff_fdct_sse2(DCTELEM *block);
-
-#define H264_IDCT(depth) \
-void ff_h264_idct8_add_ ## depth ## _c(uint8_t *dst, DCTELEM *block, int stride);\
-void ff_h264_idct_add_ ## depth ## _c(uint8_t *dst, DCTELEM *block, int stride);\
-void ff_h264_idct8_dc_add_ ## depth ## _c(uint8_t *dst, DCTELEM *block, int stride);\
-void ff_h264_idct_dc_add_ ## depth ## _c(uint8_t *dst, DCTELEM *block, int stride);\
-void ff_h264_idct_add16_ ## depth ## _c(uint8_t *dst, const int *blockoffset, DCTELEM *block, int stride, const uint8_t nnzc[6*8]);\
-void ff_h264_idct_add16intra_ ## depth ## _c(uint8_t *dst, const int *blockoffset, DCTELEM *block, int stride, const uint8_t nnzc[6*8]);\
-void ff_h264_idct8_add4_ ## depth ## _c(uint8_t *dst, const int *blockoffset, DCTELEM *block, int stride, const uint8_t nnzc[6*8]);\
-void ff_h264_idct_add8_422_ ## depth ## _c(uint8_t **dest, const int *blockoffset, DCTELEM *block, int stride, const uint8_t nnzc[6*8]);\
-void ff_h264_idct_add8_ ## depth ## _c(uint8_t **dest, const int *blockoffset, DCTELEM *block, int stride, const uint8_t nnzc[6*8]);\
-void ff_h264_luma_dc_dequant_idct_ ## depth ## _c(DCTELEM *output, DCTELEM *input, int qmul);\
-void ff_h264_chroma422_dc_dequant_idct_ ## depth ## _c(DCTELEM *block, int qmul);\
-void ff_h264_chroma_dc_dequant_idct_ ## depth ## _c(DCTELEM *block, int qmul);
-
-H264_IDCT( 8)
-H264_IDCT( 9)
-H264_IDCT(10)
-
-void ff_svq3_luma_dc_dequant_idct_c(DCTELEM *output, DCTELEM *input, int qp);
-void ff_svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc);
+#include "rnd_avg.h"
 
 /* encoding scans */
 extern const uint8_t ff_alternate_horizontal_scan[64];
@@ -84,33 +45,18 @@
 
 /* temporary */
 extern uint32_t ff_squareTbl[512];
-extern uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP];
-
-#define PUTAVG_PIXELS(depth)\
-void ff_put_pixels8x8_ ## depth ## _c(uint8_t *dst, uint8_t *src, int stride);\
-void ff_avg_pixels8x8_ ## depth ## _c(uint8_t *dst, uint8_t *src, int stride);\
-void ff_put_pixels16x16_ ## depth ## _c(uint8_t *dst, uint8_t *src, int stride);\
-void ff_avg_pixels16x16_ ## depth ## _c(uint8_t *dst, uint8_t *src, int stride);
+extern const uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP];
 
-PUTAVG_PIXELS( 8)
-PUTAVG_PIXELS( 9)
-PUTAVG_PIXELS(10)
-
-#define ff_put_pixels8x8_c ff_put_pixels8x8_8_c
-#define ff_avg_pixels8x8_c ff_avg_pixels8x8_8_c
-#define ff_put_pixels16x16_c ff_put_pixels16x16_8_c
-#define ff_avg_pixels16x16_c ff_avg_pixels16x16_8_c
+void ff_put_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
 
 /* RV40 functions */
-void ff_put_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, int stride);
-void ff_avg_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, int stride);
-void ff_put_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, int stride);
-void ff_avg_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, int stride);
-
-/* 1/2^n downscaling functions from imgconvert.c */
-void ff_shrink22(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
-void ff_shrink44(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
-void ff_shrink88(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
+void ff_put_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_avg_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
 
 void ff_gmc_c(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy,
 int dxx, int dxy, int dyx, int dyy, int shift, int r, int width, int height);
@@ -128,28 +74,18 @@
 !future video codecs might need functions with less strict alignment
 */
 
-/*
-void get_pixels_c(DCTELEM *block, const uint8_t *pixels, int line_size);
-void diff_pixels_c(DCTELEM *block, const uint8_t *s1, const uint8_t *s2, int stride);
-void put_pixels_clamped_c(const DCTELEM *block, uint8_t *pixels, int line_size);
-void add_pixels_clamped_c(const DCTELEM *block, uint8_t *pixels, int line_size);
-void clear_blocks_c(DCTELEM *blocks);
-*/
-
 /* add and put pixel (decoding) */
 // blocksizes for op_pixels_func are 8x4,8x8 16x8 16x16
 //h for op_pixels_func is limited to {width/2, width} but never larger than 16 and never smaller than 4
-typedef void (*op_pixels_func)(uint8_t *block/*align width (8 or 16)*/, const uint8_t *pixels/*align 1*/, int line_size, int h);
 typedef void (*tpel_mc_func)(uint8_t *block/*align width (8 or 16)*/, const uint8_t *pixels/*align 1*/, int line_size, int w, int h);
-typedef void (*qpel_mc_func)(uint8_t *dst/*align width (8 or 16)*/, uint8_t *src/*align 1*/, int stride);
-typedef void (*h264_chroma_mc_func)(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int srcStride, int h, int x, int y);
+typedef void (*qpel_mc_func)(uint8_t *dst/*align width (8 or 16)*/, uint8_t *src/*align 1*/, ptrdiff_t stride);
 
 typedef void (*op_fill_func)(uint8_t *block/*align width (8 or 16)*/, uint8_t value, int line_size, int h);
 
 #define DEF_OLD_QPEL(name)\
-void ff_put_ ## name (uint8_t *dst/*align width (8 or 16)*/, uint8_t *src/*align 1*/, int stride);\
-void ff_put_no_rnd_ ## name (uint8_t *dst/*align width (8 or 16)*/, uint8_t *src/*align 1*/, int stride);\
-void ff_avg_ ## name (uint8_t *dst/*align width (8 or 16)*/, uint8_t *src/*align 1*/, int stride);
+void ff_put_ ## name (uint8_t *dst/*align width (8 or 16)*/, uint8_t *src/*align 1*/, ptrdiff_t stride);\
+void ff_put_no_rnd_ ## name (uint8_t *dst/*align width (8 or 16)*/, uint8_t *src/*align 1*/, ptrdiff_t stride);\
+void ff_avg_ ## name (uint8_t *dst/*align width (8 or 16)*/, uint8_t *src/*align 1*/, ptrdiff_t stride);
 
 DEF_OLD_QPEL(qpel16_mc11_old_c)
 DEF_OLD_QPEL(qpel16_mc31_old_c)
@@ -164,12 +100,6 @@
 DEF_OLD_QPEL(qpel8_mc13_old_c)
 DEF_OLD_QPEL(qpel8_mc33_old_c)
 
-#define CALL_2X_PIXELS(a, b, n)\
-static void a(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
- b(block , pixels , line_size, h);\
- b(block+n, pixels+n, line_size, h);\
-}
-
 /* motion estimation */
 // h is limited to {width/2, width, 2*width} but never larger than 16 and never smaller than 2
 // although currently h<4 is not used as functions with width <8 are neither used nor implemented
@@ -192,20 +122,14 @@
 * DSPContext.
 */
 typedef struct DSPContext {
- /**
- * Size of DCT coefficients.
- */
- int dct_bits;
-
 /* pixel ops : interface with DCT */
- void (*get_pixels)(DCTELEM *block/*align 16*/, const uint8_t *pixels/*align 8*/, int line_size);
- void (*diff_pixels)(DCTELEM *block/*align 16*/, const uint8_t *s1/*align 8*/, const uint8_t *s2/*align 8*/, int stride);
- void (*put_pixels_clamped)(const DCTELEM *block/*align 16*/, uint8_t *pixels/*align 8*/, int line_size);
- void (*put_signed_pixels_clamped)(const DCTELEM *block/*align 16*/, uint8_t *pixels/*align 8*/, int line_size);
- void (*add_pixels_clamped)(const DCTELEM *block/*align 16*/, uint8_t *pixels/*align 8*/, int line_size);
- void (*add_pixels8)(uint8_t *pixels, DCTELEM *block, int line_size);
- void (*add_pixels4)(uint8_t *pixels, DCTELEM *block, int line_size);
- int (*sum_abs_dctelem)(DCTELEM *block/*align 16*/);
+ void (*get_pixels)(int16_t *block/*align 16*/, const uint8_t *pixels/*align 8*/, int line_size);
+ void (*diff_pixels)(int16_t *block/*align 16*/, const uint8_t *s1/*align 8*/, const uint8_t *s2/*align 8*/, int stride);
+ void (*put_pixels_clamped)(const int16_t *block/*align 16*/, uint8_t *pixels/*align 8*/, int line_size);
+ void (*put_signed_pixels_clamped)(const int16_t *block/*align 16*/, uint8_t *pixels/*align 8*/, int line_size);
+ void (*add_pixels_clamped)(const int16_t *block/*align 16*/, uint8_t *pixels/*align 8*/, int line_size);
+ void (*add_pixels8)(uint8_t *pixels, int16_t *block, int line_size);
+ int (*sum_abs_dctelem)(int16_t *block/*align 16*/);
 /**
 * translational global motion compensation.
 */
@@ -215,8 +139,8 @@
 */
 void (*gmc )(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int stride, int h, int ox, int oy,
 int dxx, int dxy, int dyx, int dyy, int shift, int r, int width, int height);
- void (*clear_block)(DCTELEM *block/*align 16*/);
- void (*clear_blocks)(DCTELEM *blocks/*align 16*/);
+ void (*clear_block)(int16_t *block/*align 16*/);
+ void (*clear_blocks)(int16_t *blocks/*align 16*/);
 int (*pix_sum)(uint8_t * pix, int line_size);
 int (*pix_norm1)(uint8_t * pix, int line_size);
 // 16x16 8x8 4x4 2x2 16x8 8x4 4x2 8x16 4x8 2x4
@@ -231,8 +155,6 @@
 me_cmp_func vsad[6];
 me_cmp_func vsse[6];
 me_cmp_func nsse[6];
- me_cmp_func w53[6];
- me_cmp_func w97[6];
 me_cmp_func dct_max[6];
 me_cmp_func dct264_sad[6];
 
@@ -247,56 +169,6 @@
 int size);
 
 /**
- * Halfpel motion compensation with rounding (a+b+1)>>1.
- * this is an array[4][4] of motion compensation functions for 4
- * horizontal blocksizes (8,16) and the 4 halfpel positions 
- * *pixels_tab[ 0->16xH 1->8xH ][ xhalfpel + 2*yhalfpel ]
- * @param block destination where the result is stored
- * @param pixels source
- * @param line_size number of bytes in a horizontal line of block
- * @param h height
- */
- op_pixels_func put_pixels_tab[4][4];
-
- /**
- * Halfpel motion compensation with rounding (a+b+1)>>1.
- * This is an array[4][4] of motion compensation functions for 4
- * horizontal blocksizes (8,16) and the 4 halfpel positions 
- * *pixels_tab[ 0->16xH 1->8xH ][ xhalfpel + 2*yhalfpel ]
- * @param block destination into which the result is averaged (a+b+1)>>1
- * @param pixels source
- * @param line_size number of bytes in a horizontal line of block
- * @param h height
- */
- op_pixels_func avg_pixels_tab[4][4];
-
- /**
- * Halfpel motion compensation with no rounding (a+b)>>1.
- * this is an array[2][4] of motion compensation functions for 2
- * horizontal blocksizes (8,16) and the 4 halfpel positions 
- * *pixels_tab[ 0->16xH 1->8xH ][ xhalfpel + 2*yhalfpel ]
- * @param block destination where the result is stored
- * @param pixels source
- * @param line_size number of bytes in a horizontal line of block
- * @param h height
- */
- op_pixels_func put_no_rnd_pixels_tab[4][4];
-
- /**
- * Halfpel motion compensation with no rounding (a+b)>>1.
- * this is an array[2][4] of motion compensation functions for 2
- * horizontal blocksizes (8,16) and the 4 halfpel positions 
- * *pixels_tab[ 0->16xH 1->8xH ][ xhalfpel + 2*yhalfpel ]
- * @param block destination into which the result is averaged (a+b)>>1
- * @param pixels source
- * @param line_size number of bytes in a horizontal line of block
- * @param h height
- */
- op_pixels_func avg_no_rnd_pixels_tab[4][4];
-
- void (*put_no_rnd_pixels_l2[2])(uint8_t *block/*align width (8 or 16)*/, const uint8_t *a/*align 1*/, const uint8_t *b/*align 1*/, int line_size, int h);
-
- /**
 * Thirdpel motion compensation with rounding (a+b+1)>>1.
 * this is an array[12] of motion compensation functions for the 9 thirdpe
 * positions 
@@ -312,21 +184,8 @@
 qpel_mc_func put_qpel_pixels_tab[2][16];
 qpel_mc_func avg_qpel_pixels_tab[2][16];
 qpel_mc_func put_no_rnd_qpel_pixels_tab[2][16];
- qpel_mc_func avg_no_rnd_qpel_pixels_tab[2][16];
 qpel_mc_func put_mspel_pixels_tab[8];
 
- /**
- * h264 Chroma MC
- */
- h264_chroma_mc_func put_h264_chroma_pixels_tab[3];
- h264_chroma_mc_func avg_h264_chroma_pixels_tab[3];
-
- qpel_mc_func put_h264_qpel_pixels_tab[4][16];
- qpel_mc_func avg_h264_qpel_pixels_tab[4][16];
-
- qpel_mc_func put_2tap_qpel_pixels_tab[4][16];
- qpel_mc_func avg_2tap_qpel_pixels_tab[4][16];
-
 me_cmp_func pix_abs[2][4];
 
 /* huffyuv specific */
@@ -343,72 +202,28 @@
 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);
-
- void (*h261_loop_filter)(uint8_t *src, int stride);
-
- /* assume len is a multiple of 4, and arrays are 16-byte aligned */
- void (*vorbis_inverse_coupling)(float *mag, float *ang, int blocksize);
- /* assume len is a multiple of 16, and arrays are 32-byte aligned */
- void (*vector_fmul_reverse)(float *dst, const float *src0, const float *src1, int len);
- /* assume len is a multiple of 8, and src arrays are 16-byte aligned */
- void (*vector_fmul_add)(float *dst, const float *src0, const float *src1, const float *src2, int len);
- /* assume len is a multiple of 4, and arrays are 16-byte aligned */
- void (*vector_fmul_window)(float *dst, const float *src0, const float *src1, const float *win, int len);
 /* 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 */);
- /**
- * Calculate the scalar product of two vectors of floats.
- * @param v1 first vector, 16-byte aligned
- * @param v2 second vector, 16-byte aligned
- * @param len length of vectors, multiple of 4
- */
- float (*scalarproduct_float)(const float *v1, const float *v2, int len);
- /**
- * Calculate the sum and difference of two vectors of floats.
- * @param v1 first input vector, sum output, 16-byte aligned
- * @param v2 second input vector, difference output, 16-byte aligned
- * @param len length of vectors, multiple of 4
- */
- void (*butterflies_float)(float *restrict v1, float *restrict v2, int len);
-
- /**
- * Calculate the sum and difference of two vectors of floats and interleave
- * results into a separate output vector of floats, with each sum
- * positioned before the corresponding difference.
- *
- * @param dst output vector
- * constraints: 16-byte aligned
- * @param src0 first input vector
- * constraints: 32-byte aligned
- * @param src1 second input vector
- * constraints: 32-byte aligned
- * @param len number of elements in the input
- * constraints: multiple of 8
- */
- void (*butterflies_float_interleave)(float *dst, const float *src0,
- const float *src1, int len);
 
 /* (I)DCT */
- void (*fdct)(DCTELEM *block/* align 16*/);
- void (*fdct248)(DCTELEM *block/* align 16*/);
+ void (*fdct)(int16_t *block/* align 16*/);
+ void (*fdct248)(int16_t *block/* align 16*/);
 
 /* IDCT really*/
- void (*idct)(DCTELEM *block/* align 16*/);
+ void (*idct)(int16_t *block/* align 16*/);
 
 /**
 * block -> idct -> clip to unsigned 8 bit -> dest.
 * (-1392, 0, 0, ...) -> idct -> (-174, -174, ...) -> put -> (0, 0, ...)
 * @param line_size size in bytes of a horizontal line of dest
 */
- void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/);
+ void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, int16_t *block/*align 16*/);
 
 /**
 * block -> idct -> add dest -> clip to unsigned 8 bit -> dest.
 * @param line_size size in bytes of a horizontal line of dest
 */
- void (*idct_add)(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/);
+ void (*idct_add)(uint8_t *dest/*align 8*/, int line_size, int16_t *block/*align 16*/);
 
 /**
 * idct input permutation.
@@ -457,20 +272,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
@@ -494,195 +295,13 @@
 
 int ff_check_alignment(void);
 
-/**
- * Return the scalar product of two vectors.
- *
- * @param v1 first input vector
- * @param v2 first input vector
- * @param len number of elements
- *
- * @return sum of elementwise products
- */
-float ff_scalarproduct_float_c(const float *v1, const float *v2, int len);
-
-/**
- * permute block according to permuatation.
- * @param last last non zero element in scantable order
- */
-void ff_block_permute(DCTELEM *block, uint8_t *permutation, const uint8_t *scantable, int last);
-
 void ff_set_cmp(DSPContext* c, me_cmp_func *cmp, int type);
 
-#define BYTE_VEC32(c) ((c)*0x01010101UL)
-#define BYTE_VEC64(c) ((c)*0x0001000100010001UL)
-
-static inline uint32_t rnd_avg32(uint32_t a, uint32_t b)
-{
- return (a | b) - (((a ^ b) & ~BYTE_VEC32(0x01)) >> 1);
-}
-
-static inline uint32_t no_rnd_avg32(uint32_t a, uint32_t b)
-{
- return (a & b) + (((a ^ b) & ~BYTE_VEC32(0x01)) >> 1);
-}
-
-static inline uint64_t rnd_avg64(uint64_t a, uint64_t b)
-{
- return (a | b) - (((a ^ b) & ~BYTE_VEC64(0x01)) >> 1);
-}
-
-static inline uint64_t no_rnd_avg64(uint64_t a, uint64_t b)
-{
- return (a & b) + (((a ^ b) & ~BYTE_VEC64(0x01)) >> 1);
-}
-
-static inline int get_penalty_factor(int lambda, int lambda2, int type){
- switch(type&0xFF){
- default:
- case FF_CMP_SAD:
- return lambda>>FF_LAMBDA_SHIFT;
- case FF_CMP_DCT:
- return (3*lambda)>>(FF_LAMBDA_SHIFT+1);
- case FF_CMP_W53:
- return (4*lambda)>>(FF_LAMBDA_SHIFT);
- case FF_CMP_W97:
- return (2*lambda)>>(FF_LAMBDA_SHIFT);
- case FF_CMP_SATD:
- case FF_CMP_DCT264:
- return (2*lambda)>>FF_LAMBDA_SHIFT;
- case FF_CMP_RD:
- case FF_CMP_PSNR:
- case FF_CMP_SSE:
- case FF_CMP_NSSE:
- return lambda2>>FF_LAMBDA_SHIFT;
- case FF_CMP_BIT:
- return 1;
- }
-}
-
-void ff_dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx);
 void ff_dsputil_init_arm(DSPContext* c, AVCodecContext *avctx);
 void ff_dsputil_init_bfin(DSPContext* c, AVCodecContext *avctx);
-void ff_dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx);
 void ff_dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx);
 void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx);
 void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx);
-
-void ff_dsputil_init_dwt(DSPContext *c);
-
-#if (ARCH_ARM && HAVE_NEON) || ARCH_PPC || HAVE_MMX
-# define STRIDE_ALIGN 16
-#else
-# define STRIDE_ALIGN 8
-#endif
-
-// Some broken preprocessors need a second expansion
-// to be forced to tokenize __VA_ARGS__
-#define E(x) x
-
-#define LOCAL_ALIGNED_A(a, t, v, s, o, ...) \
- uint8_t la_##v[sizeof(t s o) + (a)]; \
- t (*v) o = (void *)FFALIGN((uintptr_t)la_##v, a)
-
-#define LOCAL_ALIGNED_D(a, t, v, s, o, ...) \
- DECLARE_ALIGNED(a, t, la_##v) s o; \
- t (*v) o = la_##v
-
-#define LOCAL_ALIGNED(a, t, v, ...) E(LOCAL_ALIGNED_A(a, t, v, __VA_ARGS__,,))
-
-#if HAVE_LOCAL_ALIGNED_8
-# define LOCAL_ALIGNED_8(t, v, ...) E(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,))
-#else
-# define LOCAL_ALIGNED_8(t, v, ...) LOCAL_ALIGNED(8, t, v, __VA_ARGS__)
-#endif
-
-#if HAVE_LOCAL_ALIGNED_16
-# define LOCAL_ALIGNED_16(t, v, ...) E(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,))
-#else
-# define LOCAL_ALIGNED_16(t, v, ...) LOCAL_ALIGNED(16, t, v, __VA_ARGS__)
-#endif
-
-#define WRAPPER8_16_SQ(name8, name16)\
-static int name16(void /*MpegEncContext*/ *s, uint8_t *dst, uint8_t *src, int stride, int h){\
- int score=0;\
- score +=name8(s, dst , src , stride, 8);\
- score +=name8(s, dst+8 , src+8 , stride, 8);\
- if(h==16){\
- dst += 8*stride;\
- src += 8*stride;\
- score +=name8(s, dst , src , stride, 8);\
- score +=name8(s, dst+8 , src+8 , stride, 8);\
- }\
- return score;\
-}
-
-
-static inline void copy_block2(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
-{
- int i;
- for(i=0; i<h; i++)
- {
- AV_COPY16U(dst, src);
- dst+=dstStride;
- src+=srcStride;
- }
-}
-
-static inline void copy_block4(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
-{
- int i;
- for(i=0; i<h; i++)
- {
- AV_COPY32U(dst, src);
- dst+=dstStride;
- src+=srcStride;
- }
-}
-
-static inline void copy_block8(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
-{
- int i;
- for(i=0; i<h; i++)
- {
- AV_COPY64U(dst, src);
- dst+=dstStride;
- src+=srcStride;
- }
-}
-
-static inline void copy_block9(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
-{
- int i;
- for(i=0; i<h; i++)
- {
- AV_COPY64U(dst, src);
- dst[8]= src[8];
- dst+=dstStride;
- src+=srcStride;
- }
-}
-
-static inline void copy_block16(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
-{
- int i;
- for(i=0; i<h; i++)
- {
- AV_COPY128U(dst, src);
- dst+=dstStride;
- src+=srcStride;
- }
-}
-
-static inline void copy_block17(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
-{
- int i;
- for(i=0; i<h; i++)
- {
- AV_COPY128U(dst, src);
- dst[16]= src[16];
- dst+=dstStride;
- src+=srcStride;
- }
-}
+void ff_dsputil_init_x86(DSPContext* c, AVCodecContext *avctx);
 
 #endif /* AVCODEC_DSPUTIL_H */

libav-v9.6.tar.bz2/libavcodec/dsputil_template.c -> libav-v10.1.tar.bz2/libavcodec/dsputil_template.c Changed

@@ -29,54 +29,7 @@
 
 #include "bit_depth_template.c"
 
-static inline void FUNC(copy_block2)(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
-{
- int i;
- for(i=0; i<h; i++)
- {
- AV_WN2P(dst , AV_RN2P(src ));
- dst+=dstStride;
- src+=srcStride;
- }
-}
-
-static inline void FUNC(copy_block4)(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
-{
- int i;
- for(i=0; i<h; i++)
- {
- AV_WN4P(dst , AV_RN4P(src ));
- dst+=dstStride;
- src+=srcStride;
- }
-}
-
-static inline void FUNC(copy_block8)(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
-{
- int i;
- for(i=0; i<h; i++)
- {
- AV_WN4P(dst , AV_RN4P(src ));
- AV_WN4P(dst+4*sizeof(pixel), AV_RN4P(src+4*sizeof(pixel)));
- dst+=dstStride;
- src+=srcStride;
- }
-}
-
-static inline void FUNC(copy_block16)(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
-{
- int i;
- for(i=0; i<h; i++)
- {
- AV_WN4P(dst , AV_RN4P(src ));
- AV_WN4P(dst+ 4*sizeof(pixel), AV_RN4P(src+ 4*sizeof(pixel)));
- AV_WN4P(dst+ 8*sizeof(pixel), AV_RN4P(src+ 8*sizeof(pixel)));
- AV_WN4P(dst+12*sizeof(pixel), AV_RN4P(src+12*sizeof(pixel)));
- dst+=dstStride;
- src+=srcStride;
- }
-}
-
+#if BIT_DEPTH == 8
 /* draw the edges of width 'w' of an image of size width, height */
 //FIXME check that this is ok for mpeg4 interlaced
 static void FUNCC(draw_edges)(uint8_t *_buf, int _wrap, int width, int height, int w, int h, int sides)
@@ -89,16 +42,8 @@
 /* left and right */
 ptr = buf;
 for(i=0;i<height;i++) {
-#if BIT_DEPTH > 8
- int j;
- for (j = 0; j < w; j++) {
- ptr[j-w] = ptr[0];
- ptr[j+width] = ptr[width-1];
- }
-#else
 memset(ptr - w, ptr[0], w);
 memset(ptr + width, ptr[width-1], w);
-#endif
 ptr += wrap;
 }
 
@@ -112,121 +57,47 @@
 for (i = 0; i < h; i++)
 memcpy(last_line + (i + 1) * wrap, last_line, (width + w + w) * sizeof(pixel)); // bottom
 }
+#endif
+
+static void FUNCC(get_pixels)(int16_t *restrict block,
+ const uint8_t *_pixels,
+ int line_size)
+{
+ const pixel *pixels = (const pixel *) _pixels;
+ int i;
 
-#define DCTELEM_FUNCS(dctcoef, suffix) \
-static void FUNCC(get_pixels ## suffix)(DCTELEM *restrict _block, \
- const uint8_t *_pixels, \
- int line_size) \
-{ \
- const pixel *pixels = (const pixel *) _pixels; \
- dctcoef *restrict block = (dctcoef *) _block; \
- int i; \
- \
- /* read the pixels */ \
- for(i=0;i<8;i++) { \
- block[0] = pixels[0]; \
- block[1] = pixels[1]; \
- block[2] = pixels[2]; \
- block[3] = pixels[3]; \
- block[4] = pixels[4]; \
- block[5] = pixels[5]; \
- block[6] = pixels[6]; \
- block[7] = pixels[7]; \
- pixels += line_size / sizeof(pixel); \
- block += 8; \
- } \
-} \
- \
-static void FUNCC(add_pixels8 ## suffix)(uint8_t *restrict _pixels, \
- DCTELEM *_block, \
- int line_size) \
-{ \
- int i; \
- pixel *restrict pixels = (pixel *restrict)_pixels; \
- dctcoef *block = (dctcoef*)_block; \
- line_size /= sizeof(pixel); \
- \
- for(i=0;i<8;i++) { \
- pixels[0] += block[0]; \
- pixels[1] += block[1]; \
- pixels[2] += block[2]; \
- pixels[3] += block[3]; \
- pixels[4] += block[4]; \
- pixels[5] += block[5]; \
- pixels[6] += block[6]; \
- pixels[7] += block[7]; \
- pixels += line_size; \
- block += 8; \
- } \
-} \
- \
-static void FUNCC(add_pixels4 ## suffix)(uint8_t *restrict _pixels, \
- DCTELEM *_block, \
- int line_size) \
-{ \
- int i; \
- pixel *restrict pixels = (pixel *restrict)_pixels; \
- dctcoef *block = (dctcoef*)_block; \
- line_size /= sizeof(pixel); \
- \
- for(i=0;i<4;i++) { \
- pixels[0] += block[0]; \
- pixels[1] += block[1]; \
- pixels[2] += block[2]; \
- pixels[3] += block[3]; \
- pixels += line_size; \
- block += 4; \
- } \
-} \
- \
-static void FUNCC(clear_block ## suffix)(DCTELEM *block) \
-{ \
- memset(block, 0, sizeof(dctcoef)*64); \
-} \
- \
-/** \
- * memset(blocks, 0, sizeof(DCTELEM)*6*64) \
- */ \
-static void FUNCC(clear_blocks ## suffix)(DCTELEM *blocks) \
-{ \
- memset(blocks, 0, sizeof(dctcoef)*6*64); \
+ /* read the pixels */
+ for(i=0;i<8;i++) {
+ block[0] = pixels[0];
+ block[1] = pixels[1];
+ block[2] = pixels[2];
+ block[3] = pixels[3];
+ block[4] = pixels[4];
+ block[5] = pixels[5];
+ block[6] = pixels[6];
+ block[7] = pixels[7];
+ pixels += line_size / sizeof(pixel);
+ block += 8;
+ }
 }
 
-DCTELEM_FUNCS(DCTELEM, _16)
-#if BIT_DEPTH > 8
-DCTELEM_FUNCS(dctcoef, _32)
+#if BIT_DEPTH == 8
+static void FUNCC(clear_block)(int16_t *block)
+{
+ memset(block, 0, sizeof(int16_t)*64);
+}
+
+static void FUNCC(clear_blocks)(int16_t *blocks)
+{
+ memset(blocks, 0, sizeof(int16_t)*6*64);
+}
+#endif
+
+#if BIT_DEPTH == 8
+#include "hpel_template.c"
 #endif
 
 #define PIXOP2(OPNAME, OP) \
-static void FUNCC(OPNAME ## _pixels2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
- int i;\
- for(i=0; i<h; i++){\
- OP(*((pixel2*)(block )), AV_RN2P(pixels ));\
- pixels+=line_size;\
- block +=line_size;\
- }\
-}\
-static void FUNCC(OPNAME ## _pixels4)(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
- int i;\
- for(i=0; i<h; i++){\
- OP(*((pixel4*)(block )), AV_RN4P(pixels ));\
- pixels+=line_size;\
- block +=line_size;\
- }\
-}\
-static void FUNCC(OPNAME ## _pixels8)(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
- int i;\
- for(i=0; i<h; i++){\
- OP(*((pixel4*)(block )), AV_RN4P(pixels ));\
- OP(*((pixel4*)(block+4*sizeof(pixel))), AV_RN4P(pixels+4*sizeof(pixel)));\
- pixels+=line_size;\
- block +=line_size;\
- }\
-}\
-static inline void FUNCC(OPNAME ## _no_rnd_pixels8)(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
- FUNCC(OPNAME ## _pixels8)(block, pixels, line_size, h);\
-}\
-\
 static inline void FUNC(OPNAME ## _no_rnd_pixels8_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \
 int src_stride1, int src_stride2, int h){\
 int i;\
@@ -241,70 +112,12 @@
 }\
 }\
 \
-static inline void FUNC(OPNAME ## _pixels8_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \
- int src_stride1, int src_stride2, int h){\
- int i;\
- for(i=0; i<h; i++){\
- pixel4 a,b;\
- a= AV_RN4P(&src1[i*src_stride1 ]);\
- b= AV_RN4P(&src2[i*src_stride2 ]);\
- OP(*((pixel4*)&dst[i*dst_stride ]), rnd_avg_pixel4(a, b));\
- a= AV_RN4P(&src1[i*src_stride1+4*sizeof(pixel)]);\
- b= AV_RN4P(&src2[i*src_stride2+4*sizeof(pixel)]);\
- OP(*((pixel4*)&dst[i*dst_stride+4*sizeof(pixel)]), rnd_avg_pixel4(a, b));\
- }\
-}\
-\
-static inline void FUNC(OPNAME ## _pixels4_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \
- int src_stride1, int src_stride2, int h){\
- int i;\
- for(i=0; i<h; i++){\
- pixel4 a,b;\
- a= AV_RN4P(&src1[i*src_stride1 ]);\
- b= AV_RN4P(&src2[i*src_stride2 ]);\
- OP(*((pixel4*)&dst[i*dst_stride ]), rnd_avg_pixel4(a, b));\
- }\
-}\
-\
-static inline void FUNC(OPNAME ## _pixels2_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \
- int src_stride1, int src_stride2, int h){\
- int i;\
- for(i=0; i<h; i++){\
- pixel4 a,b;\
- a= AV_RN2P(&src1[i*src_stride1 ]);\
- b= AV_RN2P(&src2[i*src_stride2 ]);\
- OP(*((pixel2*)&dst[i*dst_stride ]), rnd_avg_pixel4(a, b));\
- }\
-}\
-\
-static inline void FUNC(OPNAME ## _pixels16_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \
- int src_stride1, int src_stride2, int h){\
- FUNC(OPNAME ## _pixels8_l2)(dst , src1 , src2 , dst_stride, src_stride1, src_stride2, h);\
- FUNC(OPNAME ## _pixels8_l2)(dst+8*sizeof(pixel), src1+8*sizeof(pixel), src2+8*sizeof(pixel), dst_stride, src_stride1, src_stride2, h);\
-}\
-\
 static inline void FUNC(OPNAME ## _no_rnd_pixels16_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \
 int src_stride1, int src_stride2, int h){\
 FUNC(OPNAME ## _no_rnd_pixels8_l2)(dst , src1 , src2 , dst_stride, src_stride1, src_stride2, h);\
 FUNC(OPNAME ## _no_rnd_pixels8_l2)(dst+8*sizeof(pixel), src1+8*sizeof(pixel), src2+8*sizeof(pixel), dst_stride, src_stride1, src_stride2, h);\
 }\
 \
-static inline void FUNCC(OPNAME ## _no_rnd_pixels8_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
- FUNC(OPNAME ## _no_rnd_pixels8_l2)(block, pixels, pixels+sizeof(pixel), line_size, line_size, line_size, h);\
-}\
-\
-static inline void FUNCC(OPNAME ## _pixels8_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
- FUNC(OPNAME ## _pixels8_l2)(block, pixels, pixels+sizeof(pixel), line_size, line_size, line_size, h);\
-}\
-\
-static inline void FUNCC(OPNAME ## _no_rnd_pixels8_y2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
- FUNC(OPNAME ## _no_rnd_pixels8_l2)(block, pixels, pixels+line_size, line_size, line_size, line_size, h);\
-}\
-\
-static inline void FUNCC(OPNAME ## _pixels8_y2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
- FUNC(OPNAME ## _pixels8_l2)(block, pixels, pixels+line_size, line_size, line_size, line_size, h);\
-}\
-\
 static inline void FUNC(OPNAME ## _pixels8_l4)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, const uint8_t *src3, const uint8_t *src4,\
 int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
 /* FIXME HIGH BIT DEPTH */\
@@ -342,22 +155,6 @@
 }\
 }\
 \
-static inline void FUNCC(OPNAME ## _pixels4_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
- FUNC(OPNAME ## _pixels4_l2)(block, pixels, pixels+sizeof(pixel), line_size, line_size, line_size, h);\
-}\
-\
-static inline void FUNCC(OPNAME ## _pixels4_y2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
- FUNC(OPNAME ## _pixels4_l2)(block, pixels, pixels+line_size, line_size, line_size, line_size, h);\
-}\
-\
-static inline void FUNCC(OPNAME ## _pixels2_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
- FUNC(OPNAME ## _pixels2_l2)(block, pixels, pixels+sizeof(pixel), line_size, line_size, line_size, h);\
-}\
-\
-static inline void FUNCC(OPNAME ## _pixels2_y2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){\
- FUNC(OPNAME ## _pixels2_l2)(block, pixels, pixels+line_size, line_size, line_size, line_size, h);\
-}\
-\
 static inline void FUNC(OPNAME ## _no_rnd_pixels8_l4)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, const uint8_t *src3, const uint8_t *src4,\
 int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
 /* FIXME HIGH BIT DEPTH*/\
@@ -405,80 +202,7 @@
 FUNC(OPNAME ## _no_rnd_pixels8_l4)(dst+8*sizeof(pixel), src1+8*sizeof(pixel), src2+8*sizeof(pixel), src3+8*sizeof(pixel), src4+8*sizeof(pixel), dst_stride, src_stride1, src_stride2, src_stride3, src_stride4, h);\
 }\
 \
-static inline void FUNCC(OPNAME ## _pixels2_xy2)(uint8_t *_block, const uint8_t *_pixels, int line_size, int h)\
-{\
- int i, a0, b0, a1, b1;\
- pixel *block = (pixel*)_block;\
- const pixel *pixels = (const pixel*)_pixels;\
- line_size /= sizeof(pixel);\
- a0= pixels[0];\
- b0= pixels[1] + 2;\
- a0 += b0;\
- b0 += pixels[2];\
-\
- pixels+=line_size;\
- for(i=0; i<h; i+=2){\
- a1= pixels[0];\
- b1= pixels[1];\
- a1 += b1;\
- b1 += pixels[2];\
-\
- block[0]= (a1+a0)>>2; /* FIXME non put */\
- block[1]= (b1+b0)>>2;\
-\
- pixels+=line_size;\
- block +=line_size;\
-\
- a0= pixels[0];\
- b0= pixels[1] + 2;\
- a0 += b0;\
- b0 += pixels[2];\
-\
- block[0]= (a1+a0)>>2;\
- block[1]= (b1+b0)>>2;\
- pixels+=line_size;\
- block +=line_size;\
- }\
-}\
-\
-static inline void FUNCC(OPNAME ## _pixels4_xy2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)\
-{\
- /* FIXME HIGH BIT DEPTH */\
- int i;\
- const uint32_t a= AV_RN32(pixels );\
- const uint32_t b= AV_RN32(pixels+1);\
- uint32_t l0= (a&0x03030303UL)\
- + (b&0x03030303UL)\
- + 0x02020202UL;\
- uint32_t h0= ((a&0xFCFCFCFCUL)>>2)\
- + ((b&0xFCFCFCFCUL)>>2);\
- uint32_t l1,h1;\
-\
- pixels+=line_size;\
- for(i=0; i<h; i+=2){\
- uint32_t a= AV_RN32(pixels );\
- uint32_t b= AV_RN32(pixels+1);\
- l1= (a&0x03030303UL)\
- + (b&0x03030303UL);\
- h1= ((a&0xFCFCFCFCUL)>>2)\
- + ((b&0xFCFCFCFCUL)>>2);\
- OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\
- pixels+=line_size;\
- block +=line_size;\
- a= AV_RN32(pixels );\
- b= AV_RN32(pixels+1);\
- l0= (a&0x03030303UL)\
- + (b&0x03030303UL)\
- + 0x02020202UL;\
- h0= ((a&0xFCFCFCFCUL)>>2)\
- + ((b&0xFCFCFCFCUL)>>2);\
- OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\
- pixels+=line_size;\
- block +=line_size;\
- }\
-}\
-\
-static inline void FUNCC(OPNAME ## _pixels8_xy2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)\
+static inline void FUNCC(OPNAME ## _pixels8_xy2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)\
 {\
 /* FIXME HIGH BIT DEPTH */\
 int j;\
@@ -520,681 +244,14 @@
 }\
 }\
 \
-static inline void FUNCC(OPNAME ## _no_rnd_pixels8_xy2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)\
-{\
- /* FIXME HIGH BIT DEPTH */\
- int j;\
- for(j=0; j<2; j++){\
- int i;\
- const uint32_t a= AV_RN32(pixels );\
- const uint32_t b= AV_RN32(pixels+1);\
- uint32_t l0= (a&0x03030303UL)\
- + (b&0x03030303UL)\
- + 0x01010101UL;\
- uint32_t h0= ((a&0xFCFCFCFCUL)>>2)\
- + ((b&0xFCFCFCFCUL)>>2);\
- uint32_t l1,h1;\
-\
- pixels+=line_size;\
- for(i=0; i<h; i+=2){\
- uint32_t a= AV_RN32(pixels );\
- uint32_t b= AV_RN32(pixels+1);\
- l1= (a&0x03030303UL)\
- + (b&0x03030303UL);\
- h1= ((a&0xFCFCFCFCUL)>>2)\
- + ((b&0xFCFCFCFCUL)>>2);\
- OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\
- pixels+=line_size;\
- block +=line_size;\
- a= AV_RN32(pixels );\
- b= AV_RN32(pixels+1);\
- l0= (a&0x03030303UL)\
- + (b&0x03030303UL)\
- + 0x01010101UL;\
- h0= ((a&0xFCFCFCFCUL)>>2)\
- + ((b&0xFCFCFCFCUL)>>2);\
- OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\
- pixels+=line_size;\
- block +=line_size;\
- }\
- pixels+=4-line_size*(h+1);\
- block +=4-line_size*h;\
- }\
-}\
-\
-CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16) , FUNCC(OPNAME ## _pixels8) , 8*sizeof(pixel))\
-CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_x2) , FUNCC(OPNAME ## _pixels8_x2) , 8*sizeof(pixel))\
-CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_y2) , FUNCC(OPNAME ## _pixels8_y2) , 8*sizeof(pixel))\
 CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_xy2), FUNCC(OPNAME ## _pixels8_xy2), 8*sizeof(pixel))\
-av_unused CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16) , FUNCC(OPNAME ## _pixels8) , 8*sizeof(pixel))\
-CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16_x2) , FUNCC(OPNAME ## _no_rnd_pixels8_x2) , 8*sizeof(pixel))\
-CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16_y2) , FUNCC(OPNAME ## _no_rnd_pixels8_y2) , 8*sizeof(pixel))\
-CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16_xy2), FUNCC(OPNAME ## _no_rnd_pixels8_xy2), 8*sizeof(pixel))\
 
 #define op_avg(a, b) a = rnd_avg_pixel4(a, b)
 #define op_put(a, b) a = b
-
+#if BIT_DEPTH == 8
+#define put_no_rnd_pixels8_8_c put_pixels8_8_c
 PIXOP2(avg, op_avg)
 PIXOP2(put, op_put)
+#endif
 #undef op_avg
 #undef op_put
-
-#define put_no_rnd_pixels8_c put_pixels8_c
-#define put_no_rnd_pixels16_c put_pixels16_c
-
-static void FUNCC(put_no_rnd_pixels16_l2)(uint8_t *dst, const uint8_t *a, const uint8_t *b, int stride, int h){
- FUNC(put_no_rnd_pixels16_l2)(dst, a, b, stride, stride, stride, h);
-}
-
-static void FUNCC(put_no_rnd_pixels8_l2)(uint8_t *dst, const uint8_t *a, const uint8_t *b, int stride, int h){
- FUNC(put_no_rnd_pixels8_l2)(dst, a, b, stride, stride, stride, h);
-}
-
-#define H264_CHROMA_MC(OPNAME, OP)\
-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){\
- pixel *dst = (pixel*)_dst;\
- pixel *src = (pixel*)_src;\
- 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;\
- stride /= sizeof(pixel);\
- \
- assert(x<8 && y<8 && x>=0 && y>=0);\
-\
- if(D){\
- for(i=0; i<h; i++){\
- OP(dst[0], (A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1]));\
- OP(dst[1], (A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2]));\
- dst+= stride;\
- src+= stride;\
- }\
- }else{\
- const int E= B+C;\
- const int step= C ? stride : 1;\
- for(i=0; i<h; i++){\
- OP(dst[0], (A*src[0] + E*src[step+0]));\
- OP(dst[1], (A*src[1] + E*src[step+1]));\
- dst+= stride;\
- src+= stride;\
- }\
- }\
-}\
-\
-static void FUNCC(OPNAME ## h264_chroma_mc4)(uint8_t *_dst/*align 8*/, uint8_t *_src/*align 1*/, int stride, int h, int x, int y){\
- pixel *dst = (pixel*)_dst;\
- pixel *src = (pixel*)_src;\
- 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;\
- stride /= sizeof(pixel);\
- \
- assert(x<8 && y<8 && x>=0 && y>=0);\
-\
- if(D){\
- for(i=0; i<h; i++){\
- OP(dst[0], (A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1]));\
- OP(dst[1], (A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2]));\
- OP(dst[2], (A*src[2] + B*src[3] + C*src[stride+2] + D*src[stride+3]));\
- OP(dst[3], (A*src[3] + B*src[4] + C*src[stride+3] + D*src[stride+4]));\
- dst+= stride;\
- src+= stride;\
- }\
- }else{\
- const int E= B+C;\
- const int step= C ? stride : 1;\
- for(i=0; i<h; i++){\
- OP(dst[0], (A*src[0] + E*src[step+0]));\
- OP(dst[1], (A*src[1] + E*src[step+1]));\
- OP(dst[2], (A*src[2] + E*src[step+2]));\
- OP(dst[3], (A*src[3] + E*src[step+3]));\
- dst+= stride;\
- src+= stride;\
- }\
- }\
-}\
-\
-static void FUNCC(OPNAME ## h264_chroma_mc8)(uint8_t *_dst/*align 8*/, uint8_t *_src/*align 1*/, int stride, int h, int x, int y){\
- pixel *dst = (pixel*)_dst;\
- pixel *src = (pixel*)_src;\
- 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;\
- stride /= sizeof(pixel);\
- \
- assert(x<8 && y<8 && x>=0 && y>=0);\
-\
- if(D){\
- for(i=0; i<h; i++){\
- OP(dst[0], (A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1]));\
- OP(dst[1], (A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2]));\
- OP(dst[2], (A*src[2] + B*src[3] + C*src[stride+2] + D*src[stride+3]));\
- OP(dst[3], (A*src[3] + B*src[4] + C*src[stride+3] + D*src[stride+4]));\
- OP(dst[4], (A*src[4] + B*src[5] + C*src[stride+4] + D*src[stride+5]));\
- OP(dst[5], (A*src[5] + B*src[6] + C*src[stride+5] + D*src[stride+6]));\
- OP(dst[6], (A*src[6] + B*src[7] + C*src[stride+6] + D*src[stride+7]));\
- OP(dst[7], (A*src[7] + B*src[8] + C*src[stride+7] + D*src[stride+8]));\
- dst+= stride;\
- src+= stride;\
- }\
- }else{\
- const int E= B+C;\
- const int step= C ? stride : 1;\
- for(i=0; i<h; i++){\
- OP(dst[0], (A*src[0] + E*src[step+0]));\
- OP(dst[1], (A*src[1] + E*src[step+1]));\
- OP(dst[2], (A*src[2] + E*src[step+2]));\
- OP(dst[3], (A*src[3] + E*src[step+3]));\
- OP(dst[4], (A*src[4] + E*src[step+4]));\
- OP(dst[5], (A*src[5] + E*src[step+5]));\
- OP(dst[6], (A*src[6] + E*src[step+6]));\
- OP(dst[7], (A*src[7] + E*src[step+7]));\
- dst+= stride;\
- src+= stride;\
- }\
- }\
-}
-
-#define op_avg(a, b) a = (((a)+(((b) + 32)>>6)+1)>>1)
-#define op_put(a, b) a = (((b) + 32)>>6)
-
-H264_CHROMA_MC(put_ , op_put)
-H264_CHROMA_MC(avg_ , op_avg)
-#undef op_avg
-#undef op_put
-
-#define H264_LOWPASS(OPNAME, OP, OP2) \
-static av_unused void FUNC(OPNAME ## h264_qpel2_h_lowpass)(uint8_t *_dst, uint8_t *_src, int dstStride, int srcStride){\
- const int h=2;\
- INIT_CLIP\
- int i;\
- pixel *dst = (pixel*)_dst;\
- pixel *src = (pixel*)_src;\
- dstStride /= sizeof(pixel);\
- srcStride /= sizeof(pixel);\
- for(i=0; i<h; i++)\
- {\
- OP(dst[0], (src[0]+src[1])*20 - (src[-1]+src[2])*5 + (src[-2]+src[3]));\
- OP(dst[1], (src[1]+src[2])*20 - (src[0 ]+src[3])*5 + (src[-1]+src[4]));\
- dst+=dstStride;\
- src+=srcStride;\
- }\
-}\
-\
-static av_unused void FUNC(OPNAME ## h264_qpel2_v_lowpass)(uint8_t *_dst, uint8_t *_src, int dstStride, int srcStride){\
- const int w=2;\
- INIT_CLIP\
- int i;\
- pixel *dst = (pixel*)_dst;\
- pixel *src = (pixel*)_src;\
- dstStride /= sizeof(pixel);\
- srcStride /= sizeof(pixel);\
- for(i=0; i<w; i++)\
- {\
- const int srcB= src[-2*srcStride];\
- const int srcA= src[-1*srcStride];\
- const int src0= src[0 *srcStride];\
- const int src1= src[1 *srcStride];\
- const int src2= src[2 *srcStride];\
- const int src3= src[3 *srcStride];\
- const int src4= src[4 *srcStride];\
- OP(dst[0*dstStride], (src0+src1)*20 - (srcA+src2)*5 + (srcB+src3));\
- OP(dst[1*dstStride], (src1+src2)*20 - (src0+src3)*5 + (srcA+src4));\
- dst++;\
- src++;\
- }\
-}\
-\
-static av_unused void FUNC(OPNAME ## h264_qpel2_hv_lowpass)(uint8_t *_dst, int16_t *tmp, uint8_t *_src, int dstStride, int tmpStride, int srcStride){\
- const int h=2;\
- const int w=2;\
- const int pad = (BIT_DEPTH > 9) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\
- INIT_CLIP\
- int i;\
- pixel *dst = (pixel*)_dst;\
- pixel *src = (pixel*)_src;\
- dstStride /= sizeof(pixel);\
- srcStride /= sizeof(pixel);\
- src -= 2*srcStride;\
- for(i=0; i<h+5; i++)\
- {\
- tmp[0]= (src[0]+src[1])*20 - (src[-1]+src[2])*5 + (src[-2]+src[3]) + pad;\
- tmp[1]= (src[1]+src[2])*20 - (src[0 ]+src[3])*5 + (src[-1]+src[4]) + pad;\
- tmp+=tmpStride;\
- src+=srcStride;\
- }\
- tmp -= tmpStride*(h+5-2);\
- for(i=0; i<w; i++)\
- {\
- const int tmpB= tmp[-2*tmpStride] - pad;\
- const int tmpA= tmp[-1*tmpStride] - pad;\
- const int tmp0= tmp[0 *tmpStride] - pad;\
- const int tmp1= tmp[1 *tmpStride] - pad;\
- const int tmp2= tmp[2 *tmpStride] - pad;\
- const int tmp3= tmp[3 *tmpStride] - pad;\
- const int tmp4= tmp[4 *tmpStride] - pad;\
- OP2(dst[0*dstStride], (tmp0+tmp1)*20 - (tmpA+tmp2)*5 + (tmpB+tmp3));\
- OP2(dst[1*dstStride], (tmp1+tmp2)*20 - (tmp0+tmp3)*5 + (tmpA+tmp4));\
- dst++;\
- tmp++;\
- }\
-}\
-static void FUNC(OPNAME ## h264_qpel4_h_lowpass)(uint8_t *_dst, uint8_t *_src, int dstStride, int srcStride){\
- const int h=4;\
- INIT_CLIP\
- int i;\
- pixel *dst = (pixel*)_dst;\
- pixel *src = (pixel*)_src;\
- dstStride /= sizeof(pixel);\
- srcStride /= sizeof(pixel);\
- for(i=0; i<h; i++)\
- {\
- OP(dst[0], (src[0]+src[1])*20 - (src[-1]+src[2])*5 + (src[-2]+src[3]));\
- OP(dst[1], (src[1]+src[2])*20 - (src[0 ]+src[3])*5 + (src[-1]+src[4]));\
- OP(dst[2], (src[2]+src[3])*20 - (src[1 ]+src[4])*5 + (src[0 ]+src[5]));\
- OP(dst[3], (src[3]+src[4])*20 - (src[2 ]+src[5])*5 + (src[1 ]+src[6]));\
- dst+=dstStride;\
- src+=srcStride;\
- }\
-}\
-\
-static void FUNC(OPNAME ## h264_qpel4_v_lowpass)(uint8_t *_dst, uint8_t *_src, int dstStride, int srcStride){\
- const int w=4;\
- INIT_CLIP\
- int i;\
- pixel *dst = (pixel*)_dst;\
- pixel *src = (pixel*)_src;\
- dstStride /= sizeof(pixel);\
- srcStride /= sizeof(pixel);\
- for(i=0; i<w; i++)\
- {\
- const int srcB= src[-2*srcStride];\
- const int srcA= src[-1*srcStride];\
- const int src0= src[0 *srcStride];\
- const int src1= src[1 *srcStride];\
- const int src2= src[2 *srcStride];\
- const int src3= src[3 *srcStride];\
- const int src4= src[4 *srcStride];\
- const int src5= src[5 *srcStride];\
- const int src6= src[6 *srcStride];\
- OP(dst[0*dstStride], (src0+src1)*20 - (srcA+src2)*5 + (srcB+src3));\
- OP(dst[1*dstStride], (src1+src2)*20 - (src0+src3)*5 + (srcA+src4));\
- OP(dst[2*dstStride], (src2+src3)*20 - (src1+src4)*5 + (src0+src5));\
- OP(dst[3*dstStride], (src3+src4)*20 - (src2+src5)*5 + (src1+src6));\
- dst++;\
- src++;\
- }\
-}\
-\
-static void FUNC(OPNAME ## h264_qpel4_hv_lowpass)(uint8_t *_dst, int16_t *tmp, uint8_t *_src, int dstStride, int tmpStride, int srcStride){\
- const int h=4;\
- const int w=4;\
- const int pad = (BIT_DEPTH > 9) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\
- INIT_CLIP\
- int i;\
- pixel *dst = (pixel*)_dst;\
- pixel *src = (pixel*)_src;\
- dstStride /= sizeof(pixel);\
- srcStride /= sizeof(pixel);\
- src -= 2*srcStride;\
- for(i=0; i<h+5; i++)\
- {\
- tmp[0]= (src[0]+src[1])*20 - (src[-1]+src[2])*5 + (src[-2]+src[3]) + pad;\
- tmp[1]= (src[1]+src[2])*20 - (src[0 ]+src[3])*5 + (src[-1]+src[4]) + pad;\
- tmp[2]= (src[2]+src[3])*20 - (src[1 ]+src[4])*5 + (src[0 ]+src[5]) + pad;\
- tmp[3]= (src[3]+src[4])*20 - (src[2 ]+src[5])*5 + (src[1 ]+src[6]) + pad;\
- tmp+=tmpStride;\
- src+=srcStride;\
- }\
- tmp -= tmpStride*(h+5-2);\
- for(i=0; i<w; i++)\
- {\
- const int tmpB= tmp[-2*tmpStride] - pad;\
- const int tmpA= tmp[-1*tmpStride] - pad;\
- const int tmp0= tmp[0 *tmpStride] - pad;\
- const int tmp1= tmp[1 *tmpStride] - pad;\
- const int tmp2= tmp[2 *tmpStride] - pad;\
- const int tmp3= tmp[3 *tmpStride] - pad;\
- const int tmp4= tmp[4 *tmpStride] - pad;\
- const int tmp5= tmp[5 *tmpStride] - pad;\
- const int tmp6= tmp[6 *tmpStride] - pad;\
- OP2(dst[0*dstStride], (tmp0+tmp1)*20 - (tmpA+tmp2)*5 + (tmpB+tmp3));\
- OP2(dst[1*dstStride], (tmp1+tmp2)*20 - (tmp0+tmp3)*5 + (tmpA+tmp4));\
- OP2(dst[2*dstStride], (tmp2+tmp3)*20 - (tmp1+tmp4)*5 + (tmp0+tmp5));\
- OP2(dst[3*dstStride], (tmp3+tmp4)*20 - (tmp2+tmp5)*5 + (tmp1+tmp6));\
- dst++;\
- tmp++;\
- }\
-}\
-\
-static void FUNC(OPNAME ## h264_qpel8_h_lowpass)(uint8_t *_dst, uint8_t *_src, int dstStride, int srcStride){\
- const int h=8;\
- INIT_CLIP\
- int i;\
- pixel *dst = (pixel*)_dst;\
- pixel *src = (pixel*)_src;\
- dstStride /= sizeof(pixel);\
- srcStride /= sizeof(pixel);\
- for(i=0; i<h; i++)\
- {\
- OP(dst[0], (src[0]+src[1])*20 - (src[-1]+src[2])*5 + (src[-2]+src[3 ]));\
- OP(dst[1], (src[1]+src[2])*20 - (src[0 ]+src[3])*5 + (src[-1]+src[4 ]));\
- OP(dst[2], (src[2]+src[3])*20 - (src[1 ]+src[4])*5 + (src[0 ]+src[5 ]));\
- OP(dst[3], (src[3]+src[4])*20 - (src[2 ]+src[5])*5 + (src[1 ]+src[6 ]));\
- OP(dst[4], (src[4]+src[5])*20 - (src[3 ]+src[6])*5 + (src[2 ]+src[7 ]));\
- OP(dst[5], (src[5]+src[6])*20 - (src[4 ]+src[7])*5 + (src[3 ]+src[8 ]));\
- OP(dst[6], (src[6]+src[7])*20 - (src[5 ]+src[8])*5 + (src[4 ]+src[9 ]));\
- OP(dst[7], (src[7]+src[8])*20 - (src[6 ]+src[9])*5 + (src[5 ]+src[10]));\
- dst+=dstStride;\
- src+=srcStride;\
- }\
-}\
-\
-static void FUNC(OPNAME ## h264_qpel8_v_lowpass)(uint8_t *_dst, uint8_t *_src, int dstStride, int srcStride){\
- const int w=8;\
- INIT_CLIP\
- int i;\
- pixel *dst = (pixel*)_dst;\
- pixel *src = (pixel*)_src;\
- dstStride /= sizeof(pixel);\
- srcStride /= sizeof(pixel);\
- for(i=0; i<w; i++)\
- {\
- const int srcB= src[-2*srcStride];\
- const int srcA= src[-1*srcStride];\
- const int src0= src[0 *srcStride];\
- const int src1= src[1 *srcStride];\
- const int src2= src[2 *srcStride];\
- const int src3= src[3 *srcStride];\
- const int src4= src[4 *srcStride];\
- const int src5= src[5 *srcStride];\
- const int src6= src[6 *srcStride];\
- const int src7= src[7 *srcStride];\
- const int src8= src[8 *srcStride];\
- const int src9= src[9 *srcStride];\
- const int src10=src[10*srcStride];\
- OP(dst[0*dstStride], (src0+src1)*20 - (srcA+src2)*5 + (srcB+src3));\
- OP(dst[1*dstStride], (src1+src2)*20 - (src0+src3)*5 + (srcA+src4));\
- OP(dst[2*dstStride], (src2+src3)*20 - (src1+src4)*5 + (src0+src5));\
- OP(dst[3*dstStride], (src3+src4)*20 - (src2+src5)*5 + (src1+src6));\
- OP(dst[4*dstStride], (src4+src5)*20 - (src3+src6)*5 + (src2+src7));\
- OP(dst[5*dstStride], (src5+src6)*20 - (src4+src7)*5 + (src3+src8));\
- OP(dst[6*dstStride], (src6+src7)*20 - (src5+src8)*5 + (src4+src9));\
- OP(dst[7*dstStride], (src7+src8)*20 - (src6+src9)*5 + (src5+src10));\
- dst++;\
- src++;\
- }\
-}\
-\
-static void FUNC(OPNAME ## h264_qpel8_hv_lowpass)(uint8_t *_dst, int16_t *tmp, uint8_t *_src, int dstStride, int tmpStride, int srcStride){\
- const int h=8;\
- const int w=8;\
- const int pad = (BIT_DEPTH > 9) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\
- INIT_CLIP\
- int i;\
- pixel *dst = (pixel*)_dst;\
- pixel *src = (pixel*)_src;\
- dstStride /= sizeof(pixel);\
- srcStride /= sizeof(pixel);\
- src -= 2*srcStride;\
- for(i=0; i<h+5; i++)\
- {\
- tmp[0]= (src[0]+src[1])*20 - (src[-1]+src[2])*5 + (src[-2]+src[3 ]) + pad;\
- tmp[1]= (src[1]+src[2])*20 - (src[0 ]+src[3])*5 + (src[-1]+src[4 ]) + pad;\
- tmp[2]= (src[2]+src[3])*20 - (src[1 ]+src[4])*5 + (src[0 ]+src[5 ]) + pad;\
- tmp[3]= (src[3]+src[4])*20 - (src[2 ]+src[5])*5 + (src[1 ]+src[6 ]) + pad;\
- tmp[4]= (src[4]+src[5])*20 - (src[3 ]+src[6])*5 + (src[2 ]+src[7 ]) + pad;\
- tmp[5]= (src[5]+src[6])*20 - (src[4 ]+src[7])*5 + (src[3 ]+src[8 ]) + pad;\
- tmp[6]= (src[6]+src[7])*20 - (src[5 ]+src[8])*5 + (src[4 ]+src[9 ]) + pad;\
- tmp[7]= (src[7]+src[8])*20 - (src[6 ]+src[9])*5 + (src[5 ]+src[10]) + pad;\
- tmp+=tmpStride;\
- src+=srcStride;\
- }\
- tmp -= tmpStride*(h+5-2);\
- for(i=0; i<w; i++)\
- {\
- const int tmpB= tmp[-2*tmpStride] - pad;\
- const int tmpA= tmp[-1*tmpStride] - pad;\
- const int tmp0= tmp[0 *tmpStride] - pad;\
- const int tmp1= tmp[1 *tmpStride] - pad;\
- const int tmp2= tmp[2 *tmpStride] - pad;\
- const int tmp3= tmp[3 *tmpStride] - pad;\
- const int tmp4= tmp[4 *tmpStride] - pad;\
- const int tmp5= tmp[5 *tmpStride] - pad;\
- const int tmp6= tmp[6 *tmpStride] - pad;\
- const int tmp7= tmp[7 *tmpStride] - pad;\
- const int tmp8= tmp[8 *tmpStride] - pad;\
- const int tmp9= tmp[9 *tmpStride] - pad;\
- const int tmp10=tmp[10*tmpStride] - pad;\
- OP2(dst[0*dstStride], (tmp0+tmp1)*20 - (tmpA+tmp2)*5 + (tmpB+tmp3));\
- OP2(dst[1*dstStride], (tmp1+tmp2)*20 - (tmp0+tmp3)*5 + (tmpA+tmp4));\
- OP2(dst[2*dstStride], (tmp2+tmp3)*20 - (tmp1+tmp4)*5 + (tmp0+tmp5));\
- OP2(dst[3*dstStride], (tmp3+tmp4)*20 - (tmp2+tmp5)*5 + (tmp1+tmp6));\
- OP2(dst[4*dstStride], (tmp4+tmp5)*20 - (tmp3+tmp6)*5 + (tmp2+tmp7));\
- OP2(dst[5*dstStride], (tmp5+tmp6)*20 - (tmp4+tmp7)*5 + (tmp3+tmp8));\
- OP2(dst[6*dstStride], (tmp6+tmp7)*20 - (tmp5+tmp8)*5 + (tmp4+tmp9));\
- OP2(dst[7*dstStride], (tmp7+tmp8)*20 - (tmp6+tmp9)*5 + (tmp5+tmp10));\
- dst++;\
- tmp++;\
- }\
-}\
-\
-static void FUNC(OPNAME ## h264_qpel16_v_lowpass)(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
- FUNC(OPNAME ## h264_qpel8_v_lowpass)(dst , src , dstStride, srcStride);\
- FUNC(OPNAME ## h264_qpel8_v_lowpass)(dst+8*sizeof(pixel), src+8*sizeof(pixel), dstStride, srcStride);\
- src += 8*srcStride;\
- dst += 8*dstStride;\
- FUNC(OPNAME ## h264_qpel8_v_lowpass)(dst , src , dstStride, srcStride);\
- FUNC(OPNAME ## h264_qpel8_v_lowpass)(dst+8*sizeof(pixel), src+8*sizeof(pixel), dstStride, srcStride);\
-}\
-\
-static void FUNC(OPNAME ## h264_qpel16_h_lowpass)(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
- FUNC(OPNAME ## h264_qpel8_h_lowpass)(dst , src , dstStride, srcStride);\
- FUNC(OPNAME ## h264_qpel8_h_lowpass)(dst+8*sizeof(pixel), src+8*sizeof(pixel), dstStride, srcStride);\
- src += 8*srcStride;\
- dst += 8*dstStride;\
- FUNC(OPNAME ## h264_qpel8_h_lowpass)(dst , src , dstStride, srcStride);\
- FUNC(OPNAME ## h264_qpel8_h_lowpass)(dst+8*sizeof(pixel), src+8*sizeof(pixel), dstStride, srcStride);\
-}\
-\
-static void FUNC(OPNAME ## h264_qpel16_hv_lowpass)(uint8_t *dst, int16_t *tmp, uint8_t *src, int dstStride, int tmpStride, int srcStride){\
- FUNC(OPNAME ## h264_qpel8_hv_lowpass)(dst , tmp , src , dstStride, tmpStride, srcStride);\
- FUNC(OPNAME ## h264_qpel8_hv_lowpass)(dst+8*sizeof(pixel), tmp+8, src+8*sizeof(pixel), dstStride, tmpStride, srcStride);\
- src += 8*srcStride;\
- dst += 8*dstStride;\
- FUNC(OPNAME ## h264_qpel8_hv_lowpass)(dst , tmp , src , dstStride, tmpStride, srcStride);\
- FUNC(OPNAME ## h264_qpel8_hv_lowpass)(dst+8*sizeof(pixel), tmp+8, src+8*sizeof(pixel), dstStride, tmpStride, srcStride);\
-}\
-
-#define H264_MC(OPNAME, SIZE) \
-static av_unused void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc00)(uint8_t *dst, uint8_t *src, int stride){\
- FUNCC(OPNAME ## pixels ## SIZE)(dst, src, stride, SIZE);\
-}\
-\
-static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc10)(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t half[SIZE*SIZE*sizeof(pixel)];\
- FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(half, src, SIZE*sizeof(pixel), stride);\
- FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, src, half, stride, stride, SIZE*sizeof(pixel), SIZE);\
-}\
-\
-static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc20)(uint8_t *dst, uint8_t *src, int stride){\
- FUNC(OPNAME ## h264_qpel ## SIZE ## _h_lowpass)(dst, src, stride, stride);\
-}\
-\
-static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc30)(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t half[SIZE*SIZE*sizeof(pixel)];\
- FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(half, src, SIZE*sizeof(pixel), stride);\
- FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, src+sizeof(pixel), half, stride, stride, SIZE*sizeof(pixel), SIZE);\
-}\
-\
-static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc01)(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
- uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
- uint8_t half[SIZE*SIZE*sizeof(pixel)];\
- FUNC(copy_block ## SIZE )(full, src - stride*2, SIZE*sizeof(pixel), stride, SIZE + 5);\
- FUNC(put_h264_qpel ## SIZE ## _v_lowpass)(half, full_mid, SIZE*sizeof(pixel), SIZE*sizeof(pixel));\
- FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, full_mid, half, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
-}\
-\
-static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc02)(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
- uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
- FUNC(copy_block ## SIZE )(full, src - stride*2, SIZE*sizeof(pixel), stride, SIZE + 5);\
- FUNC(OPNAME ## h264_qpel ## SIZE ## _v_lowpass)(dst, full_mid, stride, SIZE*sizeof(pixel));\
-}\
-\
-static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc03)(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
- uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
- uint8_t half[SIZE*SIZE*sizeof(pixel)];\
- FUNC(copy_block ## SIZE )(full, src - stride*2, SIZE*sizeof(pixel), stride, SIZE + 5);\
- FUNC(put_h264_qpel ## SIZE ## _v_lowpass)(half, full_mid, SIZE*sizeof(pixel), SIZE*sizeof(pixel));\
- FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, full_mid+SIZE*sizeof(pixel), half, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
-}\
-\
-static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc11)(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
- uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
- uint8_t halfH[SIZE*SIZE*sizeof(pixel)];\
- uint8_t halfV[SIZE*SIZE*sizeof(pixel)];\
- FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(halfH, src, SIZE*sizeof(pixel), stride);\
- FUNC(copy_block ## SIZE )(full, src - stride*2, SIZE*sizeof(pixel), stride, SIZE + 5);\
- FUNC(put_h264_qpel ## SIZE ## _v_lowpass)(halfV, full_mid, SIZE*sizeof(pixel), SIZE*sizeof(pixel));\
- FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
-}\
-\
-static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc31)(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
- uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
- uint8_t halfH[SIZE*SIZE*sizeof(pixel)];\
- uint8_t halfV[SIZE*SIZE*sizeof(pixel)];\
- FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(halfH, src, SIZE*sizeof(pixel), stride);\
- FUNC(copy_block ## SIZE )(full, src - stride*2 + sizeof(pixel), SIZE*sizeof(pixel), stride, SIZE + 5);\
- FUNC(put_h264_qpel ## SIZE ## _v_lowpass)(halfV, full_mid, SIZE*sizeof(pixel), SIZE*sizeof(pixel));\
- FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
-}\
-\
-static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc13)(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
- uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
- uint8_t halfH[SIZE*SIZE*sizeof(pixel)];\
- uint8_t halfV[SIZE*SIZE*sizeof(pixel)];\
- FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(halfH, src + stride, SIZE*sizeof(pixel), stride);\
- FUNC(copy_block ## SIZE )(full, src - stride*2, SIZE*sizeof(pixel), stride, SIZE + 5);\
- FUNC(put_h264_qpel ## SIZE ## _v_lowpass)(halfV, full_mid, SIZE*sizeof(pixel), SIZE*sizeof(pixel));\
- FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
-}\
-\
-static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc33)(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
- uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
- uint8_t halfH[SIZE*SIZE*sizeof(pixel)];\
- uint8_t halfV[SIZE*SIZE*sizeof(pixel)];\
- FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(halfH, src + stride, SIZE*sizeof(pixel), stride);\
- FUNC(copy_block ## SIZE )(full, src - stride*2 + sizeof(pixel), SIZE*sizeof(pixel), stride, SIZE + 5);\
- FUNC(put_h264_qpel ## SIZE ## _v_lowpass)(halfV, full_mid, SIZE*sizeof(pixel), SIZE*sizeof(pixel));\
- FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
-}\
-\
-static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc22)(uint8_t *dst, uint8_t *src, int stride){\
- int16_t tmp[SIZE*(SIZE+5)*sizeof(pixel)];\
- FUNC(OPNAME ## h264_qpel ## SIZE ## _hv_lowpass)(dst, tmp, src, stride, SIZE*sizeof(pixel), stride);\
-}\
-\
-static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc21)(uint8_t *dst, uint8_t *src, int stride){\
- int16_t tmp[SIZE*(SIZE+5)*sizeof(pixel)];\
- uint8_t halfH[SIZE*SIZE*sizeof(pixel)];\
- uint8_t halfHV[SIZE*SIZE*sizeof(pixel)];\
- FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(halfH, src, SIZE*sizeof(pixel), stride);\
- FUNC(put_h264_qpel ## SIZE ## _hv_lowpass)(halfHV, tmp, src, SIZE*sizeof(pixel), SIZE*sizeof(pixel), stride);\
- FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfHV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
-}\
-\
-static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc23)(uint8_t *dst, uint8_t *src, int stride){\
- int16_t tmp[SIZE*(SIZE+5)*sizeof(pixel)];\
- uint8_t halfH[SIZE*SIZE*sizeof(pixel)];\
- uint8_t halfHV[SIZE*SIZE*sizeof(pixel)];\
- FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(halfH, src + stride, SIZE*sizeof(pixel), stride);\
- FUNC(put_h264_qpel ## SIZE ## _hv_lowpass)(halfHV, tmp, src, SIZE*sizeof(pixel), SIZE*sizeof(pixel), stride);\
- FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfHV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
-}\
-\
-static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc12)(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
- uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
- int16_t tmp[SIZE*(SIZE+5)*sizeof(pixel)];\
- uint8_t halfV[SIZE*SIZE*sizeof(pixel)];\
- uint8_t halfHV[SIZE*SIZE*sizeof(pixel)];\
- FUNC(copy_block ## SIZE )(full, src - stride*2, SIZE*sizeof(pixel), stride, SIZE + 5);\
- FUNC(put_h264_qpel ## SIZE ## _v_lowpass)(halfV, full_mid, SIZE*sizeof(pixel), SIZE*sizeof(pixel));\
- FUNC(put_h264_qpel ## SIZE ## _hv_lowpass)(halfHV, tmp, src, SIZE*sizeof(pixel), SIZE*sizeof(pixel), stride);\
- FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfV, halfHV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
-}\
-\
-static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc32)(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
- uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
- int16_t tmp[SIZE*(SIZE+5)*sizeof(pixel)];\
- uint8_t halfV[SIZE*SIZE*sizeof(pixel)];\
- uint8_t halfHV[SIZE*SIZE*sizeof(pixel)];\
- FUNC(copy_block ## SIZE )(full, src - stride*2 + sizeof(pixel), SIZE*sizeof(pixel), stride, SIZE + 5);\
- FUNC(put_h264_qpel ## SIZE ## _v_lowpass)(halfV, full_mid, SIZE*sizeof(pixel), SIZE*sizeof(pixel));\
- FUNC(put_h264_qpel ## SIZE ## _hv_lowpass)(halfHV, tmp, src, SIZE*sizeof(pixel), SIZE*sizeof(pixel), stride);\
- FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfV, halfHV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
-}\
-
-#define op_avg(a, b) a = (((a)+CLIP(((b) + 16)>>5)+1)>>1)
-//#define op_avg2(a, b) a = (((a)*w1+cm[((b) + 16)>>5]*w2 + o + 64)>>7)
-#define op_put(a, b) a = CLIP(((b) + 16)>>5)
-#define op2_avg(a, b) a = (((a)+CLIP(((b) + 512)>>10)+1)>>1)
-#define op2_put(a, b) a = CLIP(((b) + 512)>>10)
-
-H264_LOWPASS(put_ , op_put, op2_put)
-H264_LOWPASS(avg_ , op_avg, op2_avg)
-H264_MC(put_, 2)
-H264_MC(put_, 4)
-H264_MC(put_, 8)
-H264_MC(put_, 16)
-H264_MC(avg_, 4)
-H264_MC(avg_, 8)
-H264_MC(avg_, 16)
-
-#undef op_avg
-#undef op_put
-#undef op2_avg
-#undef op2_put
-
-#if BIT_DEPTH == 8
-# define put_h264_qpel8_mc00_8_c ff_put_pixels8x8_8_c
-# define avg_h264_qpel8_mc00_8_c ff_avg_pixels8x8_8_c
-# define put_h264_qpel16_mc00_8_c ff_put_pixels16x16_8_c
-# define avg_h264_qpel16_mc00_8_c ff_avg_pixels16x16_8_c
-#elif BIT_DEPTH == 9
-# define put_h264_qpel8_mc00_9_c ff_put_pixels8x8_9_c
-# define avg_h264_qpel8_mc00_9_c ff_avg_pixels8x8_9_c
-# define put_h264_qpel16_mc00_9_c ff_put_pixels16x16_9_c
-# define avg_h264_qpel16_mc00_9_c ff_avg_pixels16x16_9_c
-#elif BIT_DEPTH == 10
-# define put_h264_qpel8_mc00_10_c ff_put_pixels8x8_10_c
-# define avg_h264_qpel8_mc00_10_c ff_avg_pixels8x8_10_c
-# define put_h264_qpel16_mc00_10_c ff_put_pixels16x16_10_c
-# define avg_h264_qpel16_mc00_10_c ff_avg_pixels16x16_10_c
-#endif
-
-void FUNCC(ff_put_pixels8x8)(uint8_t *dst, uint8_t *src, int stride) {
- FUNCC(put_pixels8)(dst, src, stride, 8);
-}
-void FUNCC(ff_avg_pixels8x8)(uint8_t *dst, uint8_t *src, int stride) {
- FUNCC(avg_pixels8)(dst, src, stride, 8);
-}
-void FUNCC(ff_put_pixels16x16)(uint8_t *dst, uint8_t *src, int stride) {
- FUNCC(put_pixels16)(dst, src, stride, 16);
-}
-void FUNCC(ff_avg_pixels16x16)(uint8_t *dst, uint8_t *src, int stride) {
- FUNCC(avg_pixels16)(dst, src, stride, 16);
-}

libav-v9.6.tar.bz2/libavcodec/dv.c -> libav-v10.1.tar.bz2/libavcodec/dv.c Changed

@@ -38,15 +38,15 @@
 * DV codec.
 */
 
+#include "libavutil/internal.h"
 #include "libavutil/pixdesc.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "get_bits.h"
 #include "internal.h"
 #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];
 }
 }
 
@@ -313,680 +313,8 @@
 s->idct_put[1] = ff_simple_idct248_put; // FIXME: need to add it to DSP
 memcpy(s->dv_zigzag[1], ff_zigzag248_direct, 64);
 
- 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);
- }
-
- 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 };
-
-static inline int put_bits_left(PutBitContext* s)
-{
- return (s->buf_end - s->buf) * 8 - put_bits_count(s);
-}
-
-#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;
- DCTELEM 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(DCTELEM, 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. Libav'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 Libav method */
- static const int classes[] = {-1, -1, 255, 0xffff};
-#endif
- int max = classes[0];
- int prev = 0;
-
- assert((((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 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];
- assert(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;
- assert(a2 < 4);
- assert(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]]);
- assert(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);
-
- 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 */
- (1 << 6) | /* 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_packet(pkt, s->sys->frame_size)) < 0) {
- av_log(c, AV_LOG_ERROR, "Error getting output packet.\n");
- 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",
- .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
- },
- .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
-};
-#endif // CONFIG_DVVIDEO_ENCODER

libav-v10.1.tar.bz2/libavcodec/dv.h Added

@@ -0,0 +1,118 @@
+/*
+ * Constants for DV codec
+ * Copyright (c) 2002 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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))
+
+/* minimum number of bytes to read from a DV stream in order to
+   determine the profile */
+#define DV_PROFILE_BYTES (6*80) /* 6 DIF blocks */
+
+/**
+ * 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 */

libav-v9.6.tar.bz2/libavcodec/dv_tablegen.c -> libav-v10.1.tar.bz2/libavcodec/dv_tablegen.c Changed

libav-v9.6.tar.bz2/libavcodec/dv_tablegen.h -> libav-v10.1.tar.bz2/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

libav-v9.6.tar.bz2/libavcodec/dvbsub.c -> libav-v10.1.tar.bz2/libavcodec/dvbsub.c Changed

libav-v9.6.tar.bz2/libavcodec/dvbsub_parser.c -> libav-v10.1.tar.bz2/libavcodec/dvbsub_parser.c Changed

libav-v9.6.tar.bz2/libavcodec/dvbsubdec.c -> libav-v10.1.tar.bz2/libavcodec/dvbsubdec.c Changed

libav-v9.6.tar.bz2/libavcodec/dvdata.c -> libav-v10.1.tar.bz2/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,
+};

libav-v9.6.tar.bz2/libavcodec/dvdata.h -> libav-v10.1.tar.bz2/libavcodec/dvdata.h Changed

@@ -1,7 +1,4 @@
 /*
- * Constants for DV codec
- * Copyright (c) 2002 Fabrice Bellard
- *
 * This file is part of Libav.
 *
 * Libav 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)(DCTELEM *block, const uint8_t *pixels, int line_size);
- void (*fdct[2])(DCTELEM *block);
- void (*idct_put[2])(uint8_t *dest, int line_size, DCTELEM *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,50 +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))
-
-/* minimum number of bytes to read from a DV stream in order to
- determine the profile */
-#define DV_PROFILE_BYTES (6*80) /* 6 DIF blocks */
-
-/**
- * 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 */

libav-v9.6.tar.bz2/libavcodec/dvdec.c -> libav-v10.1.tar.bz2/libavcodec/dvdec.c Changed

@@ -35,20 +35,21 @@
 * DV decoder
 */
 
+#include "libavutil/internal.h"
 #include "libavutil/pixdesc.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "get_bits.h"
 #include "put_bits.h"
 #include "simple_idct.h"
 #include "dvdata.h"
+#include "dv.h"
 
 typedef struct BlockInfo {
 const uint32_t *factor_table;
 const uint8_t *scan_table;
 uint8_t pos; /* position in block */
- void (*idct_put)(uint8_t *dest, int line_size, DCTELEM *block);
+ void (*idct_put)(uint8_t *dest, int line_size, int16_t *block);
 uint8_t partial_bit_count;
 uint32_t partial_bit_buffer;
 int shift_offset;
@@ -57,7 +58,7 @@
 static const int dv_iweight_bits = 14;
 
 /* decode AC coefficients */
-static void dv_decode_ac(GetBitContext *gb, BlockInfo *mb, DCTELEM *block)
+static void dv_decode_ac(GetBitContext *gb, BlockInfo *mb, int16_t *block)
 {
 int last_index = gb->size_in_bits;
 const uint8_t *scan_table = mb->scan_table;
@@ -135,14 +136,14 @@
 int quant, dc, dct_mode, class1, j;
 int mb_index, mb_x, mb_y, last_index;
 int y_stride, linesize;
- DCTELEM *block, *block1;
+ int16_t *block, *block1;
 int c_offset;
 uint8_t *y_ptr;
 const uint8_t *buf_ptr;
 PutBitContext pb, vs_pb;
 GetBitContext gb;
 BlockInfo mb_data[5 * DV_MAX_BPM], *mb, *mb1;
- LOCAL_ALIGNED_16(DCTELEM, sblock, [5*DV_MAX_BPM], [64]);
+ LOCAL_ALIGNED_16(int16_t, sblock, [5*DV_MAX_BPM], [64]);
 LOCAL_ALIGNED_16(uint8_t, mb_bit_buffer, [ 80 + FF_INPUT_BUFFER_PADDING_SIZE]); /* allow some slack */
 LOCAL_ALIGNED_16(uint8_t, vs_bit_buffer, [5*80 + FF_INPUT_BUFFER_PADDING_SIZE]); /* allow some slack */
 const int log2_blocksize = 3;
@@ -257,12 +258,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);
@@ -275,19 +276,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 << (log2_blocksize - 1)); x++) {
 c_ptr[x] = pixels[x];
 c_ptr1[x] = ptr1[x];
@@ -296,8 +297,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;
@@ -318,7 +319,7 @@
 int buf_size = avpkt->size;
 DVVideoContext *s = avctx->priv_data;
 const uint8_t* vsc_pack;
- int apt, is16_9;
+ int apt, is16_9, ret;
 
 s->sys = avpriv_dv_frame_profile(s->sys, buf, buf_size);
 if (!s->sys || buf_size < s->sys->frame_size || ff_dv_init_dynamic_tables(s->sys)) {
@@ -326,21 +327,22 @@
 return -1; /* NOTE: we only accept several full frames */
 }
 
- if (s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
-
- s->picture.reference = 0;
- 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 (ff_get_buffer(avctx, &s->picture) < 0) {
+
+ ret = ff_set_dimensions(avctx, s->sys->width, s->sys->height);
+ if (ret < 0)
+ return ret;
+
+ if (ff_get_buffer(avctx, s->frame, 0) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return -1;
 }
- s->picture.interlaced_frame = 1;
- s->picture.top_field_first = 0;
+ s->frame->interlaced_frame = 1;
+ s->frame->top_field_first = 0;
 
 s->buf = buf;
 avctx->execute(avctx, dv_decode_video_segment, s->sys->work_chunks, NULL,
@@ -350,7 +352,6 @@
 
 /* return image */
 *got_frame = 1;
- *(AVFrame*)data = s->picture;
 
 /* Determine the codec's sample_aspect ratio from the packet */
 vsc_pack = buf + 80*5 + 48 + 5;
@@ -363,24 +364,13 @@
 return s->sys->frame_size;
 }
 
-static int dvvideo_close(AVCodecContext *c)
-{
- DVVideoContext *s = c->priv_data;
-
- if (s->picture.data[0])
- c->release_buffer(c, &s->picture);
-
- return 0;
-}
-
 AVCodec ff_dvvideo_decoder = {
 .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 = ff_dvvideo_init,
- .close = dvvideo_close,
 .decode = dvvideo_decode_frame,
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS,
- .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
 };

libav-v9.6.tar.bz2/libavcodec/dvdsubdec.c -> libav-v10.1.tar.bz2/libavcodec/dvdsubdec.c Changed

@@ -21,13 +21,21 @@
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dsputil.h"
+#include "internal.h"
+
+#include "libavutil/attributes.h"
 #include "libavutil/colorspace.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/avstring.h"
 
-//#define DEBUG
+typedef struct DVDSubContext {
+ uint32_t palette[16];
+ int has_palette;
+} DVDSubContext;
 
 static void yuv_a_to_rgba(const uint8_t *ycbcr, const uint8_t *alpha, uint32_t *rgba, int num_values)
 {
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
 uint8_t r, g, b;
 int i, y, cb, cr;
 int r_add, g_add, b_add;
@@ -115,7 +123,8 @@
 return 0;
 }
 
-static void guess_palette(uint32_t *rgba_palette,
+static void guess_palette(DVDSubContext* ctx,
+ uint32_t *rgba_palette,
 uint8_t *colormap,
 uint8_t *alpha,
 uint32_t subtitle_color)
@@ -123,6 +132,13 @@
 uint8_t color_used[16] = { 0 };
 int nb_opaque_colors, i, level, j, r, g, b;
 
+ if (ctx->has_palette) {
+ for (i = 0; i < 4; i++)
+ rgba_palette[i] = (ctx->palette[colormap[i]] & 0x00ffffff)
+ | ((alpha[i] * 17) << 24);
+ return;
+ }
+
 for(i = 0; i < 4; i++)
 rgba_palette[i] = 0;
 
@@ -159,13 +175,13 @@
 
 #define READ_OFFSET(a) (big_offsets ? AV_RB32(a) : AV_RB16(a))
 
-static int decode_dvd_subtitles(AVSubtitle *sub_header,
+static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header,
 const uint8_t *buf, int buf_size)
 {
 int cmd_pos, pos, cmd, x1, y1, x2, y2, offset1, offset2, next_cmd_pos;
 int big_offsets, offset_size, is_8bit = 0;
 const uint8_t *yuv_palette = 0;
- uint8_t colormap[4], alpha[256];
+ uint8_t colormap[4] = { 0 }, alpha[256] = { 0 };
 int date;
 int i;
 int is_menu = 0;
@@ -325,7 +341,8 @@
 yuv_a_to_rgba(yuv_palette, alpha, (uint32_t*)sub_header->rects[0]->pict.data[1], 256);
 } else {
 sub_header->rects[0]->nb_colors = 4;
- guess_palette((uint32_t*)sub_header->rects[0]->pict.data[1],
+ guess_palette(ctx,
+ (uint32_t*)sub_header->rects[0]->pict.data[1],
 colormap, alpha, 0xffff00);
 }
 sub_header->rects[0]->x = x1;
@@ -422,9 +439,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)
 {
@@ -456,12 +470,13 @@
 void *data, int *data_size,
 AVPacket *avpkt)
 {
+ DVDSubContext *ctx = avctx->priv_data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 AVSubtitle *sub = data;
 int is_menu;
 
- is_menu = decode_dvd_subtitles(sub, buf, buf_size);
+ is_menu = decode_dvd_subtitles(ctx, sub, buf, buf_size);
 
 if (is_menu < 0) {
 no_subtitle:
@@ -484,10 +499,52 @@
 return buf_size;
 }
 
+static av_cold int dvdsub_init(AVCodecContext *avctx)
+{
+ DVDSubContext *ctx = avctx->priv_data;
+ char *data, *cur;
+
+ if (!avctx->extradata || !avctx->extradata_size)
+ return 0;
+
+ data = av_malloc(avctx->extradata_size + 1);
+ if (!data)
+ return AVERROR(ENOMEM);
+ memcpy(data, avctx->extradata, avctx->extradata_size);
+ data[avctx->extradata_size] = '\0';
+ cur = data;
+
+ while (*cur) {
+ if (strncmp("palette:", cur, 8) == 0) {
+ int i;
+ char *p = cur + 8;
+ ctx->has_palette = 1;
+ for (i = 0; i < 16; i++) {
+ ctx->palette[i] = strtoul(p, &p, 16);
+ while (*p == ',' || av_isspace(*p))
+ p++;
+ }
+ } else if (!strncmp("size:", cur, 5)) {
+ int w, h;
+ if (sscanf(cur + 5, "%dx%d", &w, &h) == 2) {
+ int ret = ff_set_dimensions(avctx, w, h);
+ if (ret < 0)
+ return ret;
+ }
+ }
+ cur += strcspn(cur, "\n\r");
+ cur += strspn(cur, "\n\r");
+ }
+ av_free(data);
+ return 0;
+}
+
 AVCodec ff_dvdsub_decoder = {
 .name = "dvdsub",
+ .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"),
 .type = AVMEDIA_TYPE_SUBTITLE,
 .id = AV_CODEC_ID_DVD_SUBTITLE,
+ .priv_data_size = sizeof(DVDSubContext),
+ .init = dvdsub_init,
 .decode = dvdsub_decode,
- .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"),
 };

libav-v9.6.tar.bz2/libavcodec/dvdsubenc.c -> libav-v10.1.tar.bz2/libavcodec/dvdsubenc.c Changed

libav-v10.1.tar.bz2/libavcodec/dvenc.c Added

@@ -0,0 +1,709 @@
+/*
+ * DV encoder
+ * Copyright (c) 2003 Roman Shaposhnik
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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_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);
+ }
+
+ 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. Libav'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 Libav method */
+ static const int classes[] = {-1, -1, 255, 0xffff};
+#endif
+ int max = classes[0];
+ int prev = 0;
+
+ assert((((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 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];
+ assert(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;
+ assert(a2 < 4);
+ assert(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]]);
+ assert(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);
+
+ 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 */
+ (1 << 6) | /* 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_packet(pkt, s->sys->frame_size)) < 0) {
+ av_log(c, AV_LOG_ERROR, "Error getting output packet.\n");
+ 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_init_encoder,
+ .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
+ },
+};

libav-v9.6.tar.bz2/libavcodec/dxa.c -> libav-v10.1.tar.bz2/libavcodec/dxa.c Changed

@@ -38,7 +38,7 @@
 * Decoder context
 */
 typedef struct DxaDecContext {
- AVFrame pic, prev;
+ AVFrame *prev;
 
 int dsize;
 uint8_t *decomp_buf;
@@ -48,12 +48,12 @@
 static const int shift1[6] = { 0, 8, 8, 8, 4, 4 };
 static const int shift2[6] = { 0, 0, 8, 4, 0, 4 };
 
-static int decode_13(AVCodecContext *avctx, DxaDecContext *c, uint8_t* dst, uint8_t *src, uint8_t *ref)
+static int decode_13(AVCodecContext *avctx, DxaDecContext *c, uint8_t* dst,
+ int stride, uint8_t *src, uint8_t *ref)
 {
 uint8_t *code, *data, *mv, *msk, *tmp, *tmp2;
 int i, j, k;
 int type, x, y, d, d2;
- int stride = c->pic.linesize[0];
 uint32_t mask;
 
 code = src + 12;
@@ -180,7 +180,7 @@
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "Unknown opcode %d\n", type);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 dst += stride * 4;
@@ -191,12 +191,13 @@
 
 static int 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;
 DxaDecContext * const c = avctx->priv_data;
 uint8_t *outptr, *srcptr, *tmpptr;
 unsigned long dsize;
- int i, j, compr;
+ int i, j, compr, ret;
 int stride;
 int orig_buf_size = buf_size;
 int pc = 0;
@@ -216,17 +217,17 @@
 buf_size -= 768+4;
 }
 
- if(ff_get_buffer(avctx, &c->pic) < 0){
+ if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
- memcpy(c->pic.data[1], c->pal, AVPALETTE_SIZE);
- c->pic.palette_has_changed = pc;
+ memcpy(frame->data[1], c->pal, AVPALETTE_SIZE);
+ frame->palette_has_changed = pc;
 
- outptr = c->pic.data[0];
+ outptr = frame->data[0];
 srcptr = c->decomp_buf;
- tmpptr = c->prev.data[0];
- stride = c->pic.linesize[0];
+ tmpptr = c->prev->data[0];
+ stride = frame->linesize[0];
 
 if(buf[0]=='N' && buf[1]=='U' && buf[2]=='L' && buf[3]=='L')
 compr = -1;
@@ -236,54 +237,62 @@
 dsize = c->dsize;
 if((compr != 4 && compr != -1) && uncompress(c->decomp_buf, &dsize, buf + 9, buf_size - 9) != Z_OK){
 av_log(avctx, AV_LOG_ERROR, "Uncompress failed!\n");
- return -1;
+ return AVERROR_UNKNOWN;
 }
 switch(compr){
 case -1:
- c->pic.key_frame = 0;
- c->pic.pict_type = AV_PICTURE_TYPE_P;
- if(c->prev.data[0])
- memcpy(c->pic.data[0], c->prev.data[0], c->pic.linesize[0] * avctx->height);
+ frame->key_frame = 0;
+ frame->pict_type = AV_PICTURE_TYPE_P;
+ if (c->prev->data[0])
+ memcpy(frame->data[0], c->prev->data[0], frame->linesize[0] * avctx->height);
 else{ // Should happen only when first frame is 'NULL'
- memset(c->pic.data[0], 0, c->pic.linesize[0] * avctx->height);
- c->pic.key_frame = 1;
- c->pic.pict_type = AV_PICTURE_TYPE_I;
+ memset(frame->data[0], 0, frame->linesize[0] * avctx->height);
+ frame->key_frame = 1;
+ frame->pict_type = AV_PICTURE_TYPE_I;
 }
 break;
 case 2:
- case 3:
 case 4:
- case 5:
- c->pic.key_frame = !(compr & 1);
- c->pic.pict_type = (compr & 1) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
- for(j = 0; j < avctx->height; j++){
- if(compr & 1){
- for(i = 0; i < avctx->width; i++)
- outptr[i] = srcptr[i] ^ tmpptr[i];
- tmpptr += stride;
- }else
+ frame->key_frame = 1;
+ frame->pict_type = AV_PICTURE_TYPE_I;
+ for (j = 0; j < avctx->height; j++) {
 memcpy(outptr, srcptr, avctx->width);
 outptr += stride;
 srcptr += avctx->width;
 }
 break;
+ case 3:
+ case 5:
+ if (!tmpptr) {
+ av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n");
+ return AVERROR_INVALIDDATA;
+ }
+ frame->key_frame = 0;
+ frame->pict_type = AV_PICTURE_TYPE_P;
+ for (j = 0; j < avctx->height; j++) {
+ for (i = 0; i < avctx->width; i++)
+ outptr[i] = srcptr[i] ^ tmpptr[i];
+ tmpptr += stride;
+ outptr += stride;
+ srcptr += avctx->width;
+ }
+ break;
 case 12: // ScummVM coding
 case 13:
- c->pic.key_frame = 0;
- c->pic.pict_type = AV_PICTURE_TYPE_P;
- decode_13(avctx, c, c->pic.data[0], srcptr, c->prev.data[0]);
+ frame->key_frame = 0;
+ frame->pict_type = AV_PICTURE_TYPE_P;
+ decode_13(avctx, c, frame->data[0], frame->linesize[0], srcptr, c->prev->data[0]);
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "Unknown/unsupported compression type %d\n", buf[4]);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- FFSWAP(AVFrame, c->pic, c->prev);
- if(c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
+ av_frame_unref(c->prev);
+ if ((ret = av_frame_ref(c->prev, frame)) < 0)
+ return ret;
 
 *got_frame = 1;
- *(AVFrame*)data = c->prev;
 
 /* always report that the buffer was completely consumed */
 return orig_buf_size;
@@ -293,12 +302,16 @@
 {
 DxaDecContext * const c = avctx->priv_data;
 
+ 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;
 if((c->decomp_buf = av_malloc(c->dsize)) == NULL) {
 av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n");
- return -1;
+ return AVERROR(ENOMEM);
 }
 
 return 0;
@@ -309,16 +322,14 @@
 DxaDecContext * const c = avctx->priv_data;
 
 av_freep(&c->decomp_buf);
- if(c->prev.data[0])
- avctx->release_buffer(avctx, &c->prev);
- if(c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
+ av_frame_free(&c->prev);
 
 return 0;
 }
 
 AVCodec ff_dxa_decoder = {
 .name = "dxa",
+ .long_name = NULL_IF_CONFIG_SMALL("Feeble Files/ScummVM DXA"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_DXA,
 .priv_data_size = sizeof(DxaDecContext),
@@ -326,5 +337,4 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Feeble Files/ScummVM DXA"),
 };

libav-v9.6.tar.bz2/libavcodec/dxtory.c -> libav-v10.1.tar.bz2/libavcodec/dxtory.c Changed

@@ -20,50 +20,100 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
+#include "bytestream.h"
+#include "get_bits.h"
 #include "internal.h"
+#include "unary.h"
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 
-static av_cold int decode_init(AVCodecContext *avctx)
+static int dxtory_decode_v1_rgb(AVCodecContext *avctx, AVFrame *pic,
+ const uint8_t *src, int src_size,
+ int id, int bpp)
 {
- avctx->pix_fmt = AV_PIX_FMT_YUV420P;
- avctx->coded_frame = avcodec_alloc_frame();
- if (!avctx->coded_frame)
- return AVERROR(ENOMEM);
+ int h;
+ uint8_t *dst;
+ int ret;
+
+ if (src_size < avctx->width * avctx->height * 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 decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
- AVPacket *avpkt)
+static int dxtory_decode_v1_410(AVCodecContext *avctx, AVFrame *pic,
+ const uint8_t *src, int src_size)
 {
 int h, w;
- AVFrame *pic = avctx->coded_frame;
- const uint8_t *src = avpkt->data;
- uint8_t *Y1, *Y2, *U, *V;
+ uint8_t *Y1, *Y2, *Y3, *Y4, *U, *V;
 int ret;
 
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
-
- if (avpkt->size < avctx->width * avctx->height * 3 / 2 + 16) {
+ if (src_size < avctx->width * avctx->height * 18 / 16) {
 av_log(avctx, AV_LOG_ERROR, "packet too small\n");
 return AVERROR_INVALIDDATA;
 }
 
- pic->reference = 0;
- if ((ret = ff_get_buffer(avctx, pic)) < 0)
+ avctx->pix_fmt = AV_PIX_FMT_YUV410P;
+ if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
 return ret;
 
- pic->pict_type = AV_PICTURE_TYPE_I;
- pic->key_frame = 1;
+ 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];
+ }
 
- if (AV_RL32(src) != 0x01000002) {
- av_log_ask_for_sample(avctx, "Unknown frame header %X\n", AV_RL32(src));
- return AVERROR_PATCHWELCOME;
+ 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) {
+ av_log(avctx, AV_LOG_ERROR, "packet too small\n");
+ return AVERROR_INVALIDDATA;
 }
- src += 16;
+
+ avctx->pix_fmt = AV_PIX_FMT_YUV420P;
+ if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
+ return ret;
 
 Y1 = pic->data[0];
 Y2 = pic->data[0] + pic->linesize[0];
@@ -83,29 +133,620 @@
 V += pic->linesize[2];
 }
 
- *got_frame = 1;
- *(AVFrame*)data = *pic;
+ return 0;
+}
 
- return avpkt->size;
+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 * 3) {
+ 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;
+}
+
+const uint8_t def_lru[8] = { 0x00, 0x20, 0x40, 0x60, 0x80, 0xA0, 0xC0, 0xFF };
+const uint8_t def_lru_555[8] = { 0x00, 0x08, 0x10, 0x18, 0x1F };
+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])
+{
+ uint8_t c, val;
+
+ c = get_unary(gb, 0, 8);
+ if (!c) {
+ val = get_bits(gb, 8);
+ memmove(lru + 1, lru, sizeof(*lru) * (8 - 1));
+ } else {
+ val = lru[c - 1];
+ memmove(lru + 1, lru, sizeof(*lru) * (c - 1));
+ }
+ lru[0] = val;
+
+ return val;
+}
+
+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];
+
+ for (i = 0; i < 3; i++)
+ memcpy(lru[i], def_lru, 8 * sizeof(*def_lru));
+
+ for (y = 0; y < height; y+=2) {
+ for (x = 0; x < width; x += 2) {
+ Y[x + 0 + 0 * ystride] = decode_sym(gb, lru[0]);
+ Y[x + 1 + 0 * ystride] = decode_sym(gb, lru[0]);
+ Y[x + 0 + 1 * ystride] = decode_sym(gb, lru[0]);
+ Y[x + 1 + 1 * ystride] = decode_sym(gb, lru[0]);
+ U[x >> 1] = decode_sym(gb, lru[1]) ^ 0x80;
+ V[x >> 1] = decode_sym(gb, lru[2]) ^ 0x80;
+ }
+
+ Y += ystride << 1;
+ U += ustride;
+ V += vstride;
+ }
+
+ return 0;
+}
+
+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, 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 & 1) || (avctx->height & 1)) {
+ avpriv_request_sample(avctx, "Frame dimensions %dx%d",
+ avctx->width, avctx->height);
+ }
+
+ avctx->pix_fmt = AV_PIX_FMT_YUV420P;
+ 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 & ~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",
+ 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_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 av_cold int decode_close(AVCodecContext *avctx)
+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)
 {
- AVFrame *pic = avctx->coded_frame;
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
- av_freep(&avctx->coded_frame);
+ 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;
 }
 
+static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
+ AVPacket *avpkt)
+{
+ AVFrame *pic = data;
+ const uint8_t *src = avpkt->data;
+ int ret;
+
+ if (avpkt->size < 16) {
+ av_log(avctx, AV_LOG_ERROR, "packet too small\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ 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_420(avctx, pic, src + 16, avpkt->size - 16);
+ break;
+ case 0x02000009:
+ 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));
+ return AVERROR_PATCHWELCOME;
+ }
+
+ if (ret)
+ return ret;
+
+ pic->pict_type = AV_PICTURE_TYPE_I;
+ pic->key_frame = 1;
+ *got_frame = 1;
+
+ return avpkt->size;
+}
+
 AVCodec ff_dxtory_decoder = {
 .name = "dxtory",
 .long_name = NULL_IF_CONFIG_SMALL("Dxtory"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_DXTORY,
- .init = decode_init,
- .close = decode_close,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
 };

libav-v9.6.tar.bz2/libavcodec/dxva2.c -> libav-v10.1.tar.bz2/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,17 +77,21 @@
 
 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;
 }
 
-int ff_dxva2_common_end_frame(AVCodecContext *avctx, MpegEncContext *s,
+int ff_dxva2_common_end_frame(AVCodecContext *avctx, Picture *pic,
 const void *pp, unsigned pp_size,
 const void *qm, unsigned qm_size,
 int (*commit_bs_si)(AVCodecContext *,
@@ -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(s->current_picture_ptr),
- 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,18 +157,18 @@
 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;
 }
 
- if (!result)
- ff_draw_horiz_band(s, 0, s->avctx->height);
 return result;
 }

libav-v9.6.tar.bz2/libavcodec/dxva2.h -> libav-v10.1.tar.bz2/libavcodec/dxva2.h Changed

libav-v9.6.tar.bz2/libavcodec/dxva2_h264.c -> libav-v10.1.tar.bz2/libavcodec/dxva2_h264.c Changed

@@ -44,15 +44,14 @@
 static void fill_picture_parameters(struct dxva_context *ctx, const H264Context *h,
 DXVA_PicParams_H264 *pp)
 {
- const MpegEncContext *s = &h->s;
- const Picture *current_picture = s->current_picture_ptr;
+ const Picture *current_picture = h->cur_pic_ptr;
 int i, j;
 
 memset(pp, 0, sizeof(*pp));
 /* Configure current picture */
 fill_picture_entry(&pp->CurrPic,
 ff_dxva2_get_surface_index(ctx, current_picture),
- s->picture_structure == PICT_BOTTOM_FIELD);
+ h->picture_structure == PICT_BOTTOM_FIELD);
 /* Configure the set of references */
 pp->UsedForReferenceFlags = 0;
 pp->NonExistingFrameFlags = 0;
@@ -70,15 +69,15 @@
 ff_dxva2_get_surface_index(ctx, r),
 r->long_ref != 0);
 
- if ((r->f.reference & PICT_TOP_FIELD) && r->field_poc[0] != INT_MAX)
+ if ((r->reference & PICT_TOP_FIELD) && r->field_poc[0] != INT_MAX)
 pp->FieldOrderCntList[i][0] = r->field_poc[0];
- if ((r->f.reference & PICT_BOTTOM_FIELD) && r->field_poc[1] != INT_MAX)
+ if ((r->reference & PICT_BOTTOM_FIELD) && r->field_poc[1] != INT_MAX)
 pp->FieldOrderCntList[i][1] = r->field_poc[1];
 
 pp->FrameNumList[i] = r->long_ref ? r->pic_id : r->frame_num;
- if (r->f.reference & PICT_TOP_FIELD)
+ if (r->reference & PICT_TOP_FIELD)
 pp->UsedForReferenceFlags |= 1 << (2*i + 0);
- if (r->f.reference & PICT_BOTTOM_FIELD)
+ if (r->reference & PICT_BOTTOM_FIELD)
 pp->UsedForReferenceFlags |= 1 << (2*i + 1);
 } else {
 pp->RefFrameList[i].bPicEntry = 0xff;
@@ -88,13 +87,13 @@
 }
 }
 
- pp->wFrameWidthInMbsMinus1 = s->mb_width - 1;
- pp->wFrameHeightInMbsMinus1 = s->mb_height - 1;
+ pp->wFrameWidthInMbsMinus1 = h->mb_width - 1;
+ pp->wFrameHeightInMbsMinus1 = h->mb_height - 1;
 pp->num_ref_frames = h->sps.ref_frame_count;
 
- pp->wBitFields = ((s->picture_structure != PICT_FRAME) << 0) |
+ pp->wBitFields = ((h->picture_structure != PICT_FRAME) << 0) |
 ((h->sps.mb_aff &&
- (s->picture_structure == PICT_FRAME)) << 1) |
+ (h->picture_structure == PICT_FRAME)) << 1) |
 (h->sps.residual_color_transform_flag << 2) |
 /* sp_for_switch_flag (not implemented by Libav) */
 (0 << 3) |
@@ -109,7 +108,7 @@
 (h->pps.transform_8x8_mode << 13) |
 ((h->sps.level_idc >= 31) << 14) |
 /* IntraPicFlag (Modified if we detect a non
- * intra slice in decode_slice) */
+ * intra slice in dxva2_h264_decode_slice) */
 (1 << 15);
 
 pp->bit_depth_luma_minus8 = h->sps.bit_depth_luma - 8;
@@ -120,11 +119,11 @@
 pp->Reserved16Bits = 3; /* FIXME is there a way to detect the right mode ? */
 pp->StatusReportFeedbackNumber = 1 + ctx->report_id++;
 pp->CurrFieldOrderCnt[0] = 0;
- if ((s->picture_structure & PICT_TOP_FIELD) &&
+ if ((h->picture_structure & PICT_TOP_FIELD) &&
 current_picture->field_poc[0] != INT_MAX)
 pp->CurrFieldOrderCnt[0] = current_picture->field_poc[0];
 pp->CurrFieldOrderCnt[1] = 0;
- if ((s->picture_structure & PICT_BOTTOM_FIELD) &&
+ if ((h->picture_structure & PICT_BOTTOM_FIELD) &&
 current_picture->field_poc[1] != INT_MAX)
 pp->CurrFieldOrderCnt[1] = current_picture->field_poc[1];
 pp->pic_init_qs_minus26 = h->pps.init_qs - 26;
@@ -200,7 +199,6 @@
 {
 const H264Context *h = avctx->priv_data;
 struct dxva_context *ctx = avctx->hwaccel_context;
- const MpegEncContext *s = &h->s;
 unsigned list;
 
 memset(slice, 0, sizeof(*slice));
@@ -208,9 +206,9 @@
 slice->SliceBytesInBuffer = size;
 slice->wBadSliceChopping = 0;
 
- slice->first_mb_in_slice = (s->mb_y >> FIELD_OR_MBAFF_PICTURE) * s->mb_width + s->mb_x;
+ slice->first_mb_in_slice = (h->mb_y >> FIELD_OR_MBAFF_PICTURE(h)) * h->mb_width + h->mb_x;
 slice->NumMbsForSlice = 0; /* XXX it is set once we have all slices */
- slice->BitOffsetToSliceData = get_bits_count(&s->gb);
+ slice->BitOffsetToSliceData = get_bits_count(&h->gb);
 slice->slice_type = ff_h264_get_slice_type(h);
 if (h->slice_type_fixed)
 slice->slice_type += 5;
@@ -232,7 +230,7 @@
 unsigned plane;
 fill_picture_entry(&slice->RefPicList[list][i],
 ff_dxva2_get_surface_index(ctx, r),
- r->f.reference == PICT_BOTTOM_FIELD);
+ r->reference == PICT_BOTTOM_FIELD);
 for (plane = 0; plane < 3; plane++) {
 int w, o;
 if (plane == 0 && h->luma_weight_flag[list]) {
@@ -260,7 +258,7 @@
 }
 }
 slice->slice_qs_delta = 0; /* XXX not implemented by Libav */
- slice->slice_qp_delta = s->qscale - h->pps.init_qp;
+ slice->slice_qp_delta = h->qscale - h->pps.init_qp;
 slice->redundant_pic_cnt = h->redundant_pic_count;
 if (h->slice_type == AV_PICTURE_TYPE_B)
 slice->direct_spatial_mv_pred_flag = h->direct_spatial_mv_pred;
@@ -277,11 +275,10 @@
 DXVA2_DecodeBufferDesc *sc)
 {
 const H264Context *h = avctx->priv_data;
- const MpegEncContext *s = &h->s;
- const unsigned mb_count = s->mb_width * s->mb_height;
+ const unsigned mb_count = h->mb_width * h->mb_height;
 struct dxva_context *ctx = avctx->hwaccel_context;
- const Picture *current_picture = h->s.current_picture_ptr;
- struct dxva2_picture_context *ctx_pic = current_picture->f.hwaccel_picture_private;
+ const Picture *current_picture = h->cur_pic_ptr;
+ struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private;
 DXVA_Slice_H264_Short *slice = NULL;
 uint8_t *dxva_data, *current, *end;
 unsigned dxva_size;
@@ -370,13 +367,13 @@
 }
 
 
-static int start_frame(AVCodecContext *avctx,
- av_unused const uint8_t *buffer,
- av_unused uint32_t size)
+static int dxva2_h264_start_frame(AVCodecContext *avctx,
+ av_unused const uint8_t *buffer,
+ av_unused uint32_t size)
 {
 const H264Context *h = avctx->priv_data;
 struct dxva_context *ctx = avctx->hwaccel_context;
- struct dxva2_picture_context *ctx_pic = h->s.current_picture_ptr->f.hwaccel_picture_private;
+ struct dxva2_picture_context *ctx_pic = h->cur_pic_ptr->hwaccel_picture_private;
 
 if (!ctx->decoder || !ctx->cfg || ctx->surface_count <= 0)
 return -1;
@@ -394,13 +391,14 @@
 return 0;
 }
 
-static int decode_slice(AVCodecContext *avctx,
- const uint8_t *buffer, uint32_t size)
+static int dxva2_h264_decode_slice(AVCodecContext *avctx,
+ const uint8_t *buffer,
+ uint32_t size)
 {
 const H264Context *h = avctx->priv_data;
 struct dxva_context *ctx = avctx->hwaccel_context;
- const Picture *current_picture = h->s.current_picture_ptr;
- struct dxva2_picture_context *ctx_pic = current_picture->f.hwaccel_picture_private;
+ const Picture *current_picture = h->cur_pic_ptr;
+ struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private;
 unsigned position;
 
 if (ctx_pic->slice_count >= MAX_SLICES)
@@ -424,19 +422,22 @@
 return 0;
 }
 
-static int end_frame(AVCodecContext *avctx)
+static int dxva2_h264_end_frame(AVCodecContext *avctx)
 {
 H264Context *h = avctx->priv_data;
- MpegEncContext *s = &h->s;
 struct dxva2_picture_context *ctx_pic =
- h->s.current_picture_ptr->f.hwaccel_picture_private;
+ h->cur_pic_ptr->hwaccel_picture_private;
+ int ret;
 
 if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0)
 return -1;
- return ff_dxva2_common_end_frame(avctx, s,
- &ctx_pic->pp, sizeof(ctx_pic->pp),
- &ctx_pic->qm, sizeof(ctx_pic->qm),
- commit_bitstream_and_slice_buffer);
+ ret = ff_dxva2_common_end_frame(avctx, h->cur_pic_ptr,
+ &ctx_pic->pp, sizeof(ctx_pic->pp),
+ &ctx_pic->qm, sizeof(ctx_pic->qm),
+ commit_bitstream_and_slice_buffer);
+ if (!ret)
+ ff_h264_draw_horiz_band(h, 0, h->avctx->height);
+ return ret;
 }
 
 AVHWAccel ff_h264_dxva2_hwaccel = {
@@ -444,8 +445,8 @@
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_H264,
 .pix_fmt = AV_PIX_FMT_DXVA2_VLD,
- .start_frame = start_frame,
- .decode_slice = decode_slice,
- .end_frame = end_frame,
+ .start_frame = dxva2_h264_start_frame,
+ .decode_slice = dxva2_h264_decode_slice,
+ .end_frame = dxva2_h264_end_frame,
 .priv_data_size = sizeof(struct dxva2_picture_context),
 };

libav-v9.6.tar.bz2/libavcodec/dxva2_internal.h -> libav-v10.1.tar.bz2/libavcodec/dxva2_internal.h Changed

libav-v9.6.tar.bz2/libavcodec/dxva2_mpeg2.c -> libav-v10.1.tar.bz2/libavcodec/dxva2_mpeg2.c Changed

@@ -151,7 +151,7 @@
 const struct MpegEncContext *s = avctx->priv_data;
 struct dxva_context *ctx = avctx->hwaccel_context;
 struct dxva2_picture_context *ctx_pic =
- s->current_picture_ptr->f.hwaccel_picture_private;
+ s->current_picture_ptr->hwaccel_picture_private;
 const int is_field = s->picture_structure != PICT_FRAME;
 const unsigned mb_count = s->mb_width * (s->mb_height >> is_field);
 uint8_t *dxva_data, *current, *end;
@@ -203,14 +203,14 @@
 mb_count);
 }
 
-static int start_frame(AVCodecContext *avctx,
- av_unused const uint8_t *buffer,
- av_unused uint32_t size)
+static int dxva2_mpeg2_start_frame(AVCodecContext *avctx,
+ av_unused const uint8_t *buffer,
+ av_unused uint32_t size)
 {
 const struct MpegEncContext *s = avctx->priv_data;
 struct dxva_context *ctx = avctx->hwaccel_context;
 struct dxva2_picture_context *ctx_pic =
- s->current_picture_ptr->f.hwaccel_picture_private;
+ s->current_picture_ptr->hwaccel_picture_private;
 
 if (!ctx->decoder || !ctx->cfg || ctx->surface_count <= 0)
 return -1;
@@ -225,12 +225,12 @@
 return 0;
 }
 
-static int decode_slice(AVCodecContext *avctx,
- const uint8_t *buffer, uint32_t size)
+static int dxva2_mpeg2_decode_slice(AVCodecContext *avctx,
+ const uint8_t *buffer, uint32_t size)
 {
 const struct MpegEncContext *s = avctx->priv_data;
 struct dxva2_picture_context *ctx_pic =
- s->current_picture_ptr->f.hwaccel_picture_private;
+ s->current_picture_ptr->hwaccel_picture_private;
 unsigned position;
 
 if (ctx_pic->slice_count >= MAX_SLICES)
@@ -246,18 +246,22 @@
 return 0;
 }
 
-static int end_frame(AVCodecContext *avctx)
+static int dxva2_mpeg2_end_frame(AVCodecContext *avctx)
 {
 struct MpegEncContext *s = avctx->priv_data;
 struct dxva2_picture_context *ctx_pic =
- s->current_picture_ptr->f.hwaccel_picture_private;
+ s->current_picture_ptr->hwaccel_picture_private;
+ int ret;
 
 if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0)
 return -1;
- return ff_dxva2_common_end_frame(avctx, s,
- &ctx_pic->pp, sizeof(ctx_pic->pp),
- &ctx_pic->qm, sizeof(ctx_pic->qm),
- commit_bitstream_and_slice_buffer);
+ ret = ff_dxva2_common_end_frame(avctx, s->current_picture_ptr,
+ &ctx_pic->pp, sizeof(ctx_pic->pp),
+ &ctx_pic->qm, sizeof(ctx_pic->qm),
+ commit_bitstream_and_slice_buffer);
+ if (!ret)
+ ff_mpeg_draw_horiz_band(s, 0, avctx->height);
+ return ret;
 }
 
 AVHWAccel ff_mpeg2_dxva2_hwaccel = {
@@ -265,8 +269,8 @@
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MPEG2VIDEO,
 .pix_fmt = AV_PIX_FMT_DXVA2_VLD,
- .start_frame = start_frame,
- .decode_slice = decode_slice,
- .end_frame = end_frame,
+ .start_frame = dxva2_mpeg2_start_frame,
+ .decode_slice = dxva2_mpeg2_decode_slice,
+ .end_frame = dxva2_mpeg2_end_frame,
 .priv_data_size = sizeof(struct dxva2_picture_context),
 };

libav-v9.6.tar.bz2/libavcodec/dxva2_vc1.c -> libav-v10.1.tar.bz2/libavcodec/dxva2_vc1.c Changed

@@ -97,7 +97,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;
@@ -162,7 +162,7 @@
 const VC1Context *v = avctx->priv_data;
 struct dxva_context *ctx = avctx->hwaccel_context;
 const MpegEncContext *s = &v->s;
- struct dxva2_picture_context *ctx_pic = s->current_picture_ptr->f.hwaccel_picture_private;
+ struct dxva2_picture_context *ctx_pic = s->current_picture_ptr->hwaccel_picture_private;
 
 DXVA_SliceInfo *slice = &ctx_pic->si;
 
@@ -208,13 +208,13 @@
 slice, sizeof(*slice), bs->NumMBsInBuffer);
 }
 
-static int start_frame(AVCodecContext *avctx,
- av_unused const uint8_t *buffer,
- av_unused uint32_t size)
+static int dxva2_vc1_start_frame(AVCodecContext *avctx,
+ av_unused const uint8_t *buffer,
+ av_unused uint32_t size)
 {
 const VC1Context *v = avctx->priv_data;
 struct dxva_context *ctx = avctx->hwaccel_context;
- struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->f.hwaccel_picture_private;
+ struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->hwaccel_picture_private;
 
 if (!ctx->decoder || !ctx->cfg || ctx->surface_count <= 0)
 return -1;
@@ -227,12 +227,13 @@
 return 0;
 }
 
-static int decode_slice(AVCodecContext *avctx,
- const uint8_t *buffer, uint32_t size)
+static int dxva2_vc1_decode_slice(AVCodecContext *avctx,
+ const uint8_t *buffer,
+ uint32_t size)
 {
 const VC1Context *v = avctx->priv_data;
 const Picture *current_picture = v->s.current_picture_ptr;
- struct dxva2_picture_context *ctx_pic = current_picture->f.hwaccel_picture_private;
+ struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private;
 
 if (ctx_pic->bitstream_size > 0)
 return -1;
@@ -250,18 +251,22 @@
 return 0;
 }
 
-static int end_frame(AVCodecContext *avctx)
+static int dxva2_vc1_end_frame(AVCodecContext *avctx)
 {
 VC1Context *v = avctx->priv_data;
- struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->f.hwaccel_picture_private;
+ struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->hwaccel_picture_private;
+ int ret;
 
 if (ctx_pic->bitstream_size <= 0)
 return -1;
 
- return ff_dxva2_common_end_frame(avctx, &v->s,
- &ctx_pic->pp, sizeof(ctx_pic->pp),
- NULL, 0,
- commit_bitstream_and_slice_buffer);
+ ret = ff_dxva2_common_end_frame(avctx, v->s.current_picture_ptr,
+ &ctx_pic->pp, sizeof(ctx_pic->pp),
+ NULL, 0,
+ commit_bitstream_and_slice_buffer);
+ if (!ret)
+ ff_mpeg_draw_horiz_band(&v->s, 0, avctx->height);
+ return ret;
 }
 
 #if CONFIG_WMV3_DXVA2_HWACCEL
@@ -270,9 +275,9 @@
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_WMV3,
 .pix_fmt = AV_PIX_FMT_DXVA2_VLD,
- .start_frame = start_frame,
- .decode_slice = decode_slice,
- .end_frame = end_frame,
+ .start_frame = dxva2_vc1_start_frame,
+ .decode_slice = dxva2_vc1_decode_slice,
+ .end_frame = dxva2_vc1_end_frame,
 .priv_data_size = sizeof(struct dxva2_picture_context),
 };
 #endif
@@ -282,8 +287,8 @@
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_VC1,
 .pix_fmt = AV_PIX_FMT_DXVA2_VLD,
- .start_frame = start_frame,
- .decode_slice = decode_slice,
- .end_frame = end_frame,
+ .start_frame = dxva2_vc1_start_frame,
+ .decode_slice = dxva2_vc1_decode_slice,
+ .end_frame = dxva2_vc1_end_frame,
 .priv_data_size = sizeof(struct dxva2_picture_context),
 };

libav-v9.6.tar.bz2/libavcodec/eac3dec.c -> libav-v10.1.tar.bz2/libavcodec/eac3dec.c Changed

@@ -300,7 +300,7 @@
 application can select from. each independent stream can also contain
 dependent streams which are used to add or replace channels. */
 if (s->frame_type == EAC3_FRAME_TYPE_DEPENDENT) {
- av_log_missing_feature(s->avctx, "Dependent substream decoding", 1);
+ avpriv_request_sample(s->avctx, "Dependent substream decoding");
 return AAC_AC3_PARSE_ERROR_FRAME_TYPE;
 } else if (s->frame_type == EAC3_FRAME_TYPE_RESERVED) {
 av_log(s->avctx, AV_LOG_ERROR, "Reserved frame type\n");
@@ -312,7 +312,7 @@
 associated to an independent stream have matching substream id's. */
 if (s->substreamid) {
 /* only decode substream with id=0. skip any additional substreams. */
- av_log_missing_feature(s->avctx, "Additional substreams", 1);
+ avpriv_request_sample(s->avctx, "Additional substreams");
 return AAC_AC3_PARSE_ERROR_FRAME_TYPE;
 }
 
@@ -321,7 +321,7 @@
 rates in bit allocation. The best assumption would be that it is
 handled like AC-3 DolbyNet, but we cannot be sure until we have a
 sample which utilizes this feature. */
- av_log_missing_feature(s->avctx, "Reduced sampling rate", 1);
+ avpriv_request_sample(s->avctx, "Reduced sampling rate");
 return AVERROR_PATCHWELCOME;
 }
 skip_bits(gbc, 5); // skip bitstream id
@@ -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)) {
@@ -593,7 +593,7 @@
 It is likely the offset of each block within the frame. */
 int block_start_bits = (s->num_blocks-1) * (4 + av_log2(s->frame_size-2));
 skip_bits_long(gbc, block_start_bits);
- av_log_missing_feature(s->avctx, "Block start info", 1);
+ avpriv_request_sample(s->avctx, "Block start info");
 }
 
 /* syntax state initialization */

libav-v9.6.tar.bz2/libavcodec/eac3enc.c -> libav-v10.1.tar.bz2/libavcodec/eac3enc.c Changed

@@ -25,6 +25,8 @@
  */
 
 #define CONFIG_AC3ENC_FLOAT 1
+
+#include "libavutil/attributes.h"
 #include "ac3enc.h"
 #include "eac3enc.h"
 #include "eac3_data.h"
@@ -43,7 +45,7 @@
 static int8_t eac3_frame_expstr_index_tab[3][4][4][4][4][4];
 
 
-void ff_eac3_exponent_init(void)
+av_cold void ff_eac3_exponent_init(void)
 {
     int i;
 
@@ -248,6 +250,7 @@
 #if CONFIG_EAC3_ENCODER
 AVCodec ff_eac3_encoder = {
     .name            = "eac3",
+    .long_name       = NULL_IF_CONFIG_SMALL("ATSC A/52 E-AC-3"),
     .type            = AVMEDIA_TYPE_AUDIO,
     .id              = AV_CODEC_ID_EAC3,
     .priv_data_size  = sizeof(AC3EncodeContext),
@@ -256,7 +259,6 @@
     .close           = ff_ac3_encode_close,
     .sample_fmts     = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP,
                                                       AV_SAMPLE_FMT_NONE },
-    .long_name       = NULL_IF_CONFIG_SMALL("ATSC A/52 E-AC-3"),
     .priv_class      = &eac3enc_class,
     .channel_layouts = ff_ac3_channel_layouts,
     .defaults        = ac3_defaults,

libav-v9.6.tar.bz2/libavcodec/eacmv.c -> libav-v10.1.tar.bz2/libavcodec/eacmv.c Changed

@@ -36,9 +36,8 @@
 
 typedef struct CmvContext {
 AVCodecContext *avctx;
- AVFrame frame; ///< current
- AVFrame last_frame; ///< last
- AVFrame last2_frame; ///< second-last
+ AVFrame *last_frame; ///< last
+ AVFrame *last2_frame; ///< second-last
 int width, height;
 unsigned int palette[AVPALETTE_COUNT];
 } CmvContext;
@@ -47,16 +46,27 @@
 CmvContext *s = avctx->priv_data;
 s->avctx = avctx;
 avctx->pix_fmt = AV_PIX_FMT_PAL8;
+
+ s->last_frame = av_frame_alloc();
+ s->last2_frame = av_frame_alloc();
+ if (!s->last_frame || !s->last2_frame) {
+ av_frame_free(&s->last_frame);
+ av_frame_free(&s->last2_frame);
+ return AVERROR(ENOMEM);
+ }
+
 return 0;
 }
 
-static void cmv_decode_intra(CmvContext * s, const uint8_t *buf, const uint8_t *buf_end){
- unsigned char *dst = s->frame.data[0];
+static void cmv_decode_intra(CmvContext * s, AVFrame *frame,
+ const uint8_t *buf, const uint8_t *buf_end)
+{
+ unsigned char *dst = frame->data[0];
 int i;
 
 for (i=0; i < s->avctx->height && buf_end - buf >= s->avctx->width; i++) {
 memcpy(dst, buf, s->avctx->width);
- dst += s->frame.linesize[0];
+ dst += frame->linesize[0];
 buf += s->avctx->width;
 }
 }
@@ -80,7 +90,9 @@
 }
 }
 
-static void cmv_decode_inter(CmvContext * s, const uint8_t *buf, const uint8_t *buf_end){
+static void cmv_decode_inter(CmvContext *s, AVFrame *frame, const uint8_t *buf,
+ const uint8_t *buf_end)
+{
 const uint8_t *raw = buf + (s->avctx->width*s->avctx->height/16);
 int x,y,i;
 
@@ -88,50 +100,60 @@
 for(y=0; y<s->avctx->height/4; y++)
 for(x=0; x<s->avctx->width/4 && buf_end - buf > i; x++) {
 if (buf[i]==0xFF) {
- unsigned char *dst = s->frame.data[0] + (y*4)*s->frame.linesize[0] + x*4;
+ unsigned char *dst = frame->data[0] + (y*4)*frame->linesize[0] + x*4;
 if (raw+16<buf_end && *raw==0xFF) { /* intra */
 raw++;
 memcpy(dst, raw, 4);
- memcpy(dst+s->frame.linesize[0], raw+4, 4);
- memcpy(dst+2*s->frame.linesize[0], raw+8, 4);
- memcpy(dst+3*s->frame.linesize[0], raw+12, 4);
+ memcpy(dst + frame->linesize[0], raw+4, 4);
+ memcpy(dst + 2 * frame->linesize[0], raw+8, 4);
+ memcpy(dst + 3 * frame->linesize[0], raw+12, 4);
 raw+=16;
 }else if(raw<buf_end) { /* inter using second-last frame as reference */
 int xoffset = (*raw & 0xF) - 7;
 int yoffset = ((*raw >> 4)) - 7;
- if (s->last2_frame.data[0])
- cmv_motcomp(s->frame.data[0], s->frame.linesize[0],
- s->last2_frame.data[0], s->last2_frame.linesize[0],
+ if (s->last2_frame->data[0])
+ cmv_motcomp(frame->data[0], frame->linesize[0],
+ s->last2_frame->data[0], s->last2_frame->linesize[0],
 x*4, y*4, xoffset, yoffset, s->avctx->width, s->avctx->height);
 raw++;
 }
 }else{ /* inter using last frame as reference */
 int xoffset = (buf[i] & 0xF) - 7;
 int yoffset = ((buf[i] >> 4)) - 7;
- cmv_motcomp(s->frame.data[0], s->frame.linesize[0],
- s->last_frame.data[0], s->last_frame.linesize[0],
- x*4, y*4, xoffset, yoffset, s->avctx->width, s->avctx->height);
+ if (s->last_frame->data[0])
+ cmv_motcomp(frame->data[0], frame->linesize[0],
+ s->last_frame->data[0], s->last_frame->linesize[0],
+ x*4, y*4, xoffset, yoffset, s->avctx->width, s->avctx->height);
 }
 i++;
 }
 }
 
-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);
 
- s->avctx->time_base.num = 1;
- s->avctx->time_base.den = AV_RL16(&buf[10]);
+ if (s->width != s->avctx->width ||
+ s->height != s->avctx->height) {
+ av_frame_unref(s->last_frame);
+ av_frame_unref(s->last2_frame);
+ }
+
+ 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]);
@@ -141,6 +163,8 @@
 s->palette[i] = AV_RB24(buf);
 buf += 3;
 }
+
+ return 0;
 }
 
 #define EA_PREAMBLE_SIZE 8
@@ -154,64 +178,62 @@
 int buf_size = avpkt->size;
 CmvContext *s = avctx->priv_data;
 const uint8_t *buf_end = buf + buf_size;
+ AVFrame *frame = data;
+ int ret;
 
 if (buf_end - buf < EA_PREAMBLE_SIZE)
 return AVERROR_INVALIDDATA;
 
 if (AV_RL32(buf)==MVIh_TAG||AV_RB32(buf)==MVIh_TAG) {
- 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;
 return buf_size;
 }
 
 if (av_image_check_size(s->width, s->height, 0, s->avctx))
 return -1;
 
- /* shuffle */
- if (s->last2_frame.data[0])
- avctx->release_buffer(avctx, &s->last2_frame);
- FFSWAP(AVFrame, s->last_frame, s->last2_frame);
- FFSWAP(AVFrame, s->frame, s->last_frame);
-
- s->frame.reference = 1;
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID;
- if (ff_get_buffer(avctx, &s->frame)<0) {
+ if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
- memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
+ memcpy(frame->data[1], s->palette, AVPALETTE_SIZE);
 
 buf += EA_PREAMBLE_SIZE;
 if ((buf[0]&1)) { // subtype
- cmv_decode_inter(s, buf+2, buf_end);
- s->frame.key_frame = 0;
- s->frame.pict_type = AV_PICTURE_TYPE_P;
+ cmv_decode_inter(s, frame, buf+2, buf_end);
+ frame->key_frame = 0;
+ frame->pict_type = AV_PICTURE_TYPE_P;
 }else{
- s->frame.key_frame = 1;
- s->frame.pict_type = AV_PICTURE_TYPE_I;
- cmv_decode_intra(s, buf+2, buf_end);
+ frame->key_frame = 1;
+ frame->pict_type = AV_PICTURE_TYPE_I;
+ cmv_decode_intra(s, frame, buf+2, buf_end);
 }
 
+ av_frame_unref(s->last2_frame);
+ av_frame_move_ref(s->last2_frame, s->last_frame);
+ if ((ret = av_frame_ref(s->last_frame, frame)) < 0)
+ return ret;
+
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
 return buf_size;
 }
 
 static av_cold int cmv_decode_end(AVCodecContext *avctx){
 CmvContext *s = avctx->priv_data;
- if (s->frame.data[0])
- s->avctx->release_buffer(avctx, &s->frame);
- if (s->last_frame.data[0])
- s->avctx->release_buffer(avctx, &s->last_frame);
- if (s->last2_frame.data[0])
- s->avctx->release_buffer(avctx, &s->last2_frame);
+
+ av_frame_free(&s->last_frame);
+ av_frame_free(&s->last2_frame);
 
 return 0;
 }
 
 AVCodec ff_eacmv_decoder = {
 .name = "eacmv",
+ .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts CMV video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_CMV,
 .priv_data_size = sizeof(CmvContext),
@@ -219,5 +241,4 @@
 .close = cmv_decode_end,
 .decode = cmv_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts CMV video"),
 };

libav-v9.6.tar.bz2/libavcodec/eaidct.c -> libav-v10.1.tar.bz2/libavcodec/eaidct.c Changed

libav-v9.6.tar.bz2/libavcodec/eaidct.h -> libav-v10.1.tar.bz2/libavcodec/eaidct.h Changed

libav-v9.6.tar.bz2/libavcodec/eamad.c -> libav-v10.1.tar.bz2/libavcodec/eamad.c Changed

@@ -30,7 +30,6 @@
 
 #include "avcodec.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "aandcttab.h"
 #include "eaidct.h"
 #include "internal.h"
@@ -46,12 +45,11 @@
 typedef struct MadContext {
 AVCodecContext *avctx;
 DSPContext dsp;
- AVFrame frame;
- AVFrame last_frame;
+ AVFrame *last_frame;
 GetBitContext gb;
 void *bitstream_buf;
 unsigned int bitstream_buf_size;
- DECLARE_ALIGNED(16, DCTELEM, block)[64];
+ DECLARE_ALIGNED(16, int16_t, block)[64];
 ScanTable scantable;
 uint16_t quant_matrix[64];
 int mb_x;
@@ -67,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;
 }
 
@@ -79,38 +82,40 @@
 dst[j*dst_stride + i] = av_clip_uint8(src[j*src_stride + i] + add);
 }
 
-static inline void comp_block(MadContext *t, int mb_x, int mb_y,
+static inline void comp_block(MadContext *t, AVFrame *frame,
+ int mb_x, int mb_y,
 int j, int mv_x, int mv_y, int add)
 {
 if (j < 4) {
- comp(t->frame.data[0] + (mb_y*16 + ((j&2)<<2))*t->frame.linesize[0] + mb_x*16 + ((j&1)<<3),
- t->frame.linesize[0],
- t->last_frame.data[0] + (mb_y*16 + ((j&2)<<2) + mv_y)*t->last_frame.linesize[0] + mb_x*16 + ((j&1)<<3) + mv_x,
- t->last_frame.linesize[0], add);
+ 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] + (mb_y*16 + ((j&2)<<2) + mv_y)*t->last_frame->linesize[0] + mb_x*16 + ((j&1)<<3) + mv_x,
+ t->last_frame->linesize[0], add);
 } else if (!(t->avctx->flags & CODEC_FLAG_GRAY)) {
 int index = j - 3;
- comp(t->frame.data[index] + (mb_y*8)*t->frame.linesize[index] + mb_x * 8,
- t->frame.linesize[index],
- t->last_frame.data[index] + (mb_y * 8 + (mv_y/2))*t->last_frame.linesize[index] + mb_x * 8 + (mv_x/2),
- t->last_frame.linesize[index], add);
+ comp(frame->data[index] + (mb_y*8)*frame->linesize[index] + mb_x * 8,
+ frame->linesize[index],
+ t->last_frame->data[index] + (mb_y * 8 + (mv_y/2))*t->last_frame->linesize[index] + mb_x * 8 + (mv_x/2),
+ t->last_frame->linesize[index], add);
 }
 }
 
-static inline void idct_put(MadContext *t, DCTELEM *block, int mb_x, int mb_y, int j)
+static inline void idct_put(MadContext *t, AVFrame *frame, int16_t *block,
+ int mb_x, int mb_y, int j)
 {
 if (j < 4) {
 ff_ea_idct_put_c(
- t->frame.data[0] + (mb_y*16 + ((j&2)<<2))*t->frame.linesize[0] + mb_x*16 + ((j&1)<<3),
- t->frame.linesize[0], block);
+ frame->data[0] + (mb_y*16 + ((j&2)<<2))*frame->linesize[0] + mb_x*16 + ((j&1)<<3),
+ frame->linesize[0], block);
 } else if (!(t->avctx->flags & CODEC_FLAG_GRAY)) {
 int index = j - 3;
 ff_ea_idct_put_c(
- t->frame.data[index] + (mb_y*8)*t->frame.linesize[index] + mb_x*8,
- t->frame.linesize[index], block);
+ frame->data[index] + (mb_y*8)*frame->linesize[index] + mb_x*8,
+ frame->linesize[index], block);
 }
 }
 
-static inline void decode_block_intra(MadContext *s, DCTELEM * block)
+static inline void decode_block_intra(MadContext *s, int16_t * block)
 {
 int level, i, j, run;
 RLTable *rl = &ff_rl_mpeg1;
@@ -180,7 +185,7 @@
 return value;
 }
 
-static void decode_mb(MadContext *s, int inter)
+static void decode_mb(MadContext *s, AVFrame *frame, int inter)
 {
 int mv_map = 0;
 int mv_x, mv_y;
@@ -200,11 +205,11 @@
 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);
- comp_block(s, s->mb_x, s->mb_y, j, mv_x, mv_y, add);
+ comp_block(s, frame, s->mb_x, s->mb_y, j, mv_x, mv_y, add);
 } else {
 s->dsp.clear_block(s->block);
 decode_block_intra(s, s->block);
- idct_put(s, s->block, s->mb_x, s->mb_y, j);
+ idct_put(s, frame, s->block, s->mb_x, s->mb_y, j);
 }
 }
 }
@@ -226,9 +231,10 @@
 int buf_size = avpkt->size;
 const uint8_t *buf_end = buf+buf_size;
 MadContext *s = avctx->priv_data;
+ AVFrame *frame = data;
 int width, height;
 int chunk_type;
- int inter;
+ int inter, ret;
 
 if (buf_size < 17) {
 av_log(avctx, AV_LOG_ERROR, "Input buffer too small\n");
@@ -249,34 +255,27 @@
 buf += 16;
 
 if (avctx->width != width || avctx->height != height) {
- if (av_image_check_size(width, height, 0, avctx) < 0)
- return -1;
- avcodec_set_dimensions(avctx, width, height);
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ av_frame_unref(s->last_frame);
+ if ((ret = ff_set_dimensions(avctx, width, height)) < 0)
+ return ret;
 }
 
- s->frame.reference = 1;
- if (!s->frame.data[0]) {
- if (ff_get_buffer(avctx, &s->frame) < 0) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
- }
+ if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
 }
 
- if (inter && !s->last_frame.data[0]) {
- int ret;
+ if (inter && !s->last_frame->data[0]) {
 av_log(avctx, AV_LOG_WARNING, "Missing reference frame.\n");
- s->last_frame.reference = 1;
- ret = ff_get_buffer(avctx, &s->last_frame);
+ 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,
@@ -288,13 +287,15 @@
 
 for (s->mb_y=0; s->mb_y < (avctx->height+15)/16; s->mb_y++)
 for (s->mb_x=0; s->mb_x < (avctx->width +15)/16; s->mb_x++)
- decode_mb(s, inter);
+ decode_mb(s, frame, inter);
 
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
- if (chunk_type != MADe_TAG)
- FFSWAP(AVFrame, s->frame, s->last_frame);
+ if (chunk_type != MADe_TAG) {
+ av_frame_unref(s->last_frame);
+ if ((ret = av_frame_ref(s->last_frame, frame)) < 0)
+ return ret;
+ }
 
 return buf_size;
 }
@@ -302,16 +303,14 @@
 static av_cold int decode_end(AVCodecContext *avctx)
 {
 MadContext *t = avctx->priv_data;
- if (t->frame.data[0])
- avctx->release_buffer(avctx, &t->frame);
- if (t->last_frame.data[0])
- avctx->release_buffer(avctx, &t->last_frame);
+ av_frame_free(&t->last_frame);
 av_free(t->bitstream_buf);
 return 0;
 }
 
 AVCodec ff_eamad_decoder = {
 .name = "eamad",
+ .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts Madcow Video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MAD,
 .priv_data_size = sizeof(MadContext),
@@ -319,5 +318,4 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts Madcow Video")
 };

libav-v9.6.tar.bz2/libavcodec/eatgq.c -> libav-v10.1.tar.bz2/libavcodec/eatgq.c Changed

@@ -39,162 +39,173 @@
 
 typedef struct TgqContext {
 AVCodecContext *avctx;
- AVFrame frame;
- int width,height;
+ int width, height;
 ScanTable scantable;
 int qtable[64];
- DECLARE_ALIGNED(16, DCTELEM, block)[6][64];
+ DECLARE_ALIGNED(16, int16_t, block)[6][64];
 GetByteContext gb;
 } TgqContext;
 
-static av_cold int tgq_decode_init(AVCodecContext *avctx){
+static av_cold int tgq_decode_init(AVCodecContext *avctx)
+{
 TgqContext *s = avctx->priv_data;
 uint8_t idct_permutation[64];
 s->avctx = avctx;
 ff_init_scantable_permutation(idct_permutation, FF_NO_IDCT_PERM);
 ff_init_scantable(idct_permutation, &s->scantable, ff_zigzag_direct);
 avctx->time_base = (AVRational){1, 15};
- avctx->pix_fmt = AV_PIX_FMT_YUV420P;
+ avctx->pix_fmt = AV_PIX_FMT_YUV420P;
 return 0;
 }
 
-static void tgq_decode_block(TgqContext *s, DCTELEM block[64], GetBitContext *gb){
+static void tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb)
+{
 uint8_t *perm = s->scantable.permutated;
- int i,j,value;
- block[0] = get_sbits(gb,8) * s->qtable[0];
- for(i=1; i<64; ) {
- switch(show_bits(gb,3)) {
+ int i, j, value;
+ block[0] = get_sbits(gb, 8) * s->qtable[0];
+ for (i = 1; i < 64;) {
+ switch (show_bits(gb, 3)) {
 case 4:
 block[perm[i++]] = 0;
 case 0:
 block[perm[i++]] = 0;
- skip_bits(gb,3);
+ skip_bits(gb, 3);
 break;
 case 5:
 case 1:
- skip_bits(gb,2);
- value = get_bits(gb,6);
- for(j=0; j<value; j++)
+ skip_bits(gb, 2);
+ value = get_bits(gb, 6);
+ for (j = 0; j < value; j++)
 block[perm[i++]] = 0;
 break;
 case 6:
- skip_bits(gb,3);
+ skip_bits(gb, 3);
 block[perm[i]] = -s->qtable[perm[i]];
 i++;
 break;
 case 2:
- skip_bits(gb,3);
+ skip_bits(gb, 3);
 block[perm[i]] = s->qtable[perm[i]];
 i++;
 break;
 case 7: // 111b
 case 3: // 011b
- skip_bits(gb,2);
- if (show_bits(gb,6)==0x3F) {
+ skip_bits(gb, 2);
+ if (show_bits(gb, 6) == 0x3F) {
 skip_bits(gb, 6);
- block[perm[i]] = get_sbits(gb,8)*s->qtable[perm[i]];
- }else{
- block[perm[i]] = get_sbits(gb,6)*s->qtable[perm[i]];
+ block[perm[i]] = get_sbits(gb, 8) * s->qtable[perm[i]];
+ } else {
+ block[perm[i]] = get_sbits(gb, 6) * s->qtable[perm[i]];
 }
 i++;
 break;
 }
 }
- block[0] += 128<<4;
+ block[0] += 128 << 4;
 }
 
-static void tgq_idct_put_mb(TgqContext *s, DCTELEM (*block)[64], int mb_x, int mb_y){
- int linesize= s->frame.linesize[0];
- uint8_t *dest_y = s->frame.data[0] + (mb_y * 16* linesize ) + mb_x * 16;
- uint8_t *dest_cb = s->frame.data[1] + (mb_y * 8 * s->frame.linesize[1]) + mb_x * 8;
- uint8_t *dest_cr = s->frame.data[2] + (mb_y * 8 * s->frame.linesize[2]) + mb_x * 8;
-
- ff_ea_idct_put_c(dest_y , linesize, block[0]);
- ff_ea_idct_put_c(dest_y + 8, linesize, block[1]);
- ff_ea_idct_put_c(dest_y + 8*linesize , linesize, block[2]);
- ff_ea_idct_put_c(dest_y + 8*linesize + 8, linesize, block[3]);
- if(!(s->avctx->flags&CODEC_FLAG_GRAY)){
- ff_ea_idct_put_c(dest_cb, s->frame.linesize[1], block[4]);
- ff_ea_idct_put_c(dest_cr, s->frame.linesize[2], block[5]);
+static void tgq_idct_put_mb(TgqContext *s, int16_t (*block)[64], AVFrame *frame,
+ int mb_x, int mb_y)
+{
+ int linesize = frame->linesize[0];
+ uint8_t *dest_y = frame->data[0] + (mb_y * 16 * linesize) + mb_x * 16;
+ uint8_t *dest_cb = frame->data[1] + (mb_y * 8 * frame->linesize[1]) + mb_x * 8;
+ uint8_t *dest_cr = frame->data[2] + (mb_y * 8 * frame->linesize[2]) + mb_x * 8;
+
+ ff_ea_idct_put_c(dest_y , linesize, block[0]);
+ ff_ea_idct_put_c(dest_y + 8, linesize, block[1]);
+ ff_ea_idct_put_c(dest_y + 8 * linesize , linesize, block[2]);
+ ff_ea_idct_put_c(dest_y + 8 * linesize + 8, linesize, block[3]);
+ if (!(s->avctx->flags & CODEC_FLAG_GRAY)) {
+ ff_ea_idct_put_c(dest_cb, frame->linesize[1], block[4]);
+ ff_ea_idct_put_c(dest_cr, frame->linesize[2], block[5]);
 }
 }
 
-static inline void tgq_dconly(TgqContext *s, unsigned char *dst, int dst_stride, int dc){
- int level = av_clip_uint8((dc*s->qtable[0] + 2056)>>4);
+static inline void tgq_dconly(TgqContext *s, unsigned char *dst,
+ int dst_stride, int dc)
+{
+ int level = av_clip_uint8((dc*s->qtable[0] + 2056) >> 4);
 int j;
- for(j=0;j<8;j++)
- memset(dst+j*dst_stride, level, 8);
+ for (j = 0; j < 8; j++)
+ memset(dst + j * dst_stride, level, 8);
 }
 
-static void tgq_idct_put_mb_dconly(TgqContext *s, int mb_x, int mb_y, const int8_t *dc)
+static void tgq_idct_put_mb_dconly(TgqContext *s, AVFrame *frame,
+ int mb_x, int mb_y, const int8_t *dc)
 {
- int linesize= s->frame.linesize[0];
- uint8_t *dest_y = s->frame.data[0] + (mb_y * 16* linesize ) + mb_x * 16;
- uint8_t *dest_cb = s->frame.data[1] + (mb_y * 8 * s->frame.linesize[1]) + mb_x * 8;
- uint8_t *dest_cr = s->frame.data[2] + (mb_y * 8 * s->frame.linesize[2]) + mb_x * 8;
- tgq_dconly(s,dest_y , linesize, dc[0]);
- tgq_dconly(s,dest_y + 8, linesize, dc[1]);
- tgq_dconly(s,dest_y + 8*linesize , linesize, dc[2]);
- tgq_dconly(s,dest_y + 8*linesize + 8, linesize, dc[3]);
- if(!(s->avctx->flags&CODEC_FLAG_GRAY)) {
- tgq_dconly(s,dest_cb, s->frame.linesize[1], dc[4]);
- tgq_dconly(s,dest_cr, s->frame.linesize[2], dc[5]);
+ int linesize = frame->linesize[0];
+ uint8_t *dest_y = frame->data[0] + (mb_y * 16 * linesize) + mb_x * 16;
+ uint8_t *dest_cb = frame->data[1] + (mb_y * 8 * frame->linesize[1]) + mb_x * 8;
+ uint8_t *dest_cr = frame->data[2] + (mb_y * 8 * frame->linesize[2]) + mb_x * 8;
+ tgq_dconly(s, dest_y, linesize, dc[0]);
+ tgq_dconly(s, dest_y + 8, linesize, dc[1]);
+ tgq_dconly(s, dest_y + 8 * linesize, linesize, dc[2]);
+ tgq_dconly(s, dest_y + 8 * linesize + 8, linesize, dc[3]);
+ if (!(s->avctx->flags & CODEC_FLAG_GRAY)) {
+ tgq_dconly(s, dest_cb, frame->linesize[1], dc[4]);
+ tgq_dconly(s, dest_cr, frame->linesize[2], dc[5]);
 }
 }
 
-static void tgq_decode_mb(TgqContext *s, int mb_y, int mb_x){
+static void tgq_decode_mb(TgqContext *s, AVFrame *frame, int mb_y, int mb_x)
+{
 int mode;
 int i;
 int8_t dc[6];
 
 mode = bytestream2_get_byte(&s->gb);
- if (mode>12) {
+ if (mode > 12) {
 GetBitContext gb;
 init_get_bits(&gb, s->gb.buffer, FFMIN(s->gb.buffer_end - s->gb.buffer, mode) * 8);
- for(i=0; i<6; i++)
+ for (i = 0; i < 6; i++)
 tgq_decode_block(s, s->block[i], &gb);
- tgq_idct_put_mb(s, s->block, mb_x, mb_y);
+ tgq_idct_put_mb(s, s->block, frame, mb_x, mb_y);
 bytestream2_skip(&s->gb, mode);
- }else{
- if (mode==3) {
+ } else {
+ if (mode == 3) {
 memset(dc, bytestream2_get_byte(&s->gb), 4);
 dc[4] = bytestream2_get_byte(&s->gb);
 dc[5] = bytestream2_get_byte(&s->gb);
- }else if (mode==6) {
+ } else if (mode == 6) {
 bytestream2_get_buffer(&s->gb, dc, 6);
- }else if (mode==12) {
+ } else if (mode == 12) {
 for (i = 0; i < 6; i++) {
 dc[i] = bytestream2_get_byte(&s->gb);
 bytestream2_skip(&s->gb, 1);
 }
- }else{
+ } else {
 av_log(s->avctx, AV_LOG_ERROR, "unsupported mb mode %i\n", mode);
 }
- tgq_idct_put_mb_dconly(s, mb_x, mb_y, dc);
+ tgq_idct_put_mb_dconly(s, frame, mb_x, mb_y, dc);
 }
 }
 
-static void tgq_calculate_qtable(TgqContext *s, int quant){
- int i,j;
- const int a = (14*(100-quant))/100 + 1;
- const int b = (11*(100-quant))/100 + 4;
- for(j=0;j<8;j++)
- for(i=0;i<8;i++)
- s->qtable[j*8+i] = ((a*(j+i)/(7+7) + b)*ff_inv_aanscales[j*8+i])>>(14-4);
+static void tgq_calculate_qtable(TgqContext *s, int quant)
+{
+ int i, j;
+ const int a = (14 * (100 - quant)) / 100 + 1;
+ const int b = (11 * (100 - quant)) / 100 + 4;
+ for (j = 0; j < 8; j++)
+ for (i = 0; i < 8; i++)
+ s->qtable[j * 8 + i] = ((a * (j + i) / (7 + 7) + b) *
+ ff_inv_aanscales[j * 8 + i]) >> (14 - 4);
 }
 
 static int tgq_decode_frame(AVCodecContext *avctx,
 void *data, int *got_frame,
- AVPacket *avpkt){
+ AVPacket *avpkt)
+{
 const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- TgqContext *s = avctx->priv_data;
- int x,y;
+ int buf_size = avpkt->size;
+ TgqContext *s = avctx->priv_data;
+ AVFrame *frame = data;
+ int x, y, ret;
 int big_endian = AV_RL32(&buf[4]) > 0x000FFFFF;
 
 if (buf_size < 16) {
 av_log(avctx, AV_LOG_WARNING, "truncated header\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 bytestream2_init(&s->gb, buf + 8, buf_size - 8);
 if (big_endian) {
@@ -205,49 +216,36 @@
 s->height = bytestream2_get_le16u(&s->gb);
 }
 
- if (s->avctx->width!=s->width || s->avctx->height!=s->height) {
- avcodec_set_dimensions(s->avctx, s->width, s->height);
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
- }
+ ret = ff_set_dimensions(s->avctx, s->width, s->height);
+ if (ret < 0)
+ return ret;
+
 tgq_calculate_qtable(s, bytestream2_get_byteu(&s->gb));
 bytestream2_skip(&s->gb, 3);
 
- if (!s->frame.data[0]) {
- s->frame.key_frame = 1;
- s->frame.pict_type = AV_PICTURE_TYPE_I;
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID;
- if (ff_get_buffer(avctx, &s->frame)) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
- }
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
 }
+ frame->key_frame = 1;
+ frame->pict_type = AV_PICTURE_TYPE_I;
 
 for (y = 0; y < FFALIGN(avctx->height, 16) >> 4; y++)
 for (x = 0; x < FFALIGN(avctx->width, 16) >> 4; x++)
- tgq_decode_mb(s, y, x);
+ tgq_decode_mb(s, frame, y, x);
 
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
 return avpkt->size;
 }
 
-static av_cold int tgq_decode_end(AVCodecContext *avctx){
- TgqContext *s = avctx->priv_data;
- if (s->frame.data[0])
- s->avctx->release_buffer(avctx, &s->frame);
- return 0;
-}
-
 AVCodec ff_eatgq_decoder = {
 .name = "eatgq",
+ .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGQ video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_TGQ,
 .priv_data_size = sizeof(TgqContext),
 .init = tgq_decode_init,
- .close = tgq_decode_end,
 .decode = tgq_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGQ video"),
 };

libav-v9.6.tar.bz2/libavcodec/eatgv.c -> libav-v10.1.tar.bz2/libavcodec/eatgv.c Changed

@@ -31,6 +31,7 @@
 #include "avcodec.h"
 #define BITSTREAM_READER_LE
 #include "get_bits.h"
+#include "internal.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/mem.h"
 
@@ -39,22 +40,28 @@
 
 typedef struct TgvContext {
 AVCodecContext *avctx;
- AVFrame frame;
- AVFrame last_frame;
+ AVFrame *last_frame;
+ uint8_t *frame_buffer;
 int width,height;
- unsigned int palette[AVPALETTE_COUNT];
+ uint32_t palette[AVPALETTE_COUNT];
 
 int (*mv_codebook)[2];
- unsigned char (*block_codebook)[16];
+ uint8_t (*block_codebook)[16];
 int num_mvs; ///< current length of mv_codebook
 int num_blocks_packed; ///< current length of block_codebook
 } TgvContext;
 
-static av_cold int tgv_decode_init(AVCodecContext *avctx){
+static av_cold int tgv_decode_init(AVCodecContext *avctx)
+{
 TgvContext *s = avctx->priv_data;
- s->avctx = avctx;
+ s->avctx = avctx;
 avctx->time_base = (AVRational){1, 15};
- avctx->pix_fmt = AV_PIX_FMT_PAL8;
+ avctx->pix_fmt = AV_PIX_FMT_PAL8;
+
+ s->last_frame = av_frame_alloc();
+ if (!s->last_frame)
+ return AVERROR(ENOMEM);
+
 return 0;
 }
 
@@ -62,67 +69,69 @@
 * Unpack buffer
 * @return 0 on success, -1 on critical buffer underflow
 */
-static int unpack(const uint8_t *src, const uint8_t *src_end, unsigned char *dst, int width, int height) {
- unsigned char *dst_end = dst + width*height;
+static int unpack(const uint8_t *src, const uint8_t *src_end,
+ uint8_t *dst, int width, int height)
+{
+ uint8_t *dst_end = dst + width*height;
 int size, size1, size2, offset, run;
- unsigned char *dst_start = dst;
+ uint8_t *dst_start = dst;
 
 if (src[0] & 0x01)
 src += 5;
 else
 src += 2;
 
- if (src+3>src_end)
- return -1;
+ if (src + 3 > src_end)
+ return AVERROR_INVALIDDATA;
 size = AV_RB24(src);
 src += 3;
 
- while(size>0 && src<src_end) {
+ while (size > 0 && src < src_end) {
 
 /* determine size1 and size2 */
 size1 = (src[0] & 3);
- if ( src[0] & 0x80 ) { // 1
+ if (src[0] & 0x80) { // 1
 if (src[0] & 0x40 ) { // 11
- if ( src[0] & 0x20 ) { // 111
- if ( src[0] < 0xFC ) // !(111111)
+ if (src[0] & 0x20) { // 111
+ if (src[0] < 0xFC) // !(111111)
 size1 = (((src[0] & 31) + 1) << 2);
 src++;
 size2 = 0;
 } else { // 110
 offset = ((src[0] & 0x10) << 12) + AV_RB16(&src[1]) + 1;
- size2 = ((src[0] & 0xC) << 6) + src[3] + 5;
- src += 4;
+ size2 = ((src[0] & 0xC) << 6) + src[3] + 5;
+ src += 4;
 }
 } else { // 10
- size1 = ( ( src[1] & 0xC0) >> 6 );
+ size1 = ((src[1] & 0xC0) >> 6);
 offset = (AV_RB16(&src[1]) & 0x3FFF) + 1;
- size2 = (src[0] & 0x3F) + 4;
- src += 3;
+ size2 = (src[0] & 0x3F) + 4;
+ src += 3;
 }
 } else { // 0
 offset = ((src[0] & 0x60) << 3) + src[1] + 1;
- size2 = ((src[0] & 0x1C) >> 2) + 3;
- src += 2;
+ size2 = ((src[0] & 0x1C) >> 2) + 3;
+ src += 2;
 }
 
 
 /* fetch strip from src */
- if (size1>src_end-src)
+ if (size1 > src_end - src)
 break;
 
- if (size1>0) {
+ if (size1 > 0) {
 size -= size1;
- run = FFMIN(size1, dst_end-dst);
+ run = FFMIN(size1, dst_end - dst);
 memcpy(dst, src, run);
 dst += run;
 src += run;
 }
 
- if (size2>0) {
- if (dst-dst_start<offset)
+ if (size2 > 0) {
+ if (dst - dst_start < offset)
 return 0;
 size -= size2;
- run = FFMIN(size2, dst_end-dst);
+ run = FFMIN(size2, dst_end - dst);
 av_memcpy_backptr(dst, offset, run);
 dst += run;
 }
@@ -135,7 +144,9 @@
 * Decode inter-frame
 * @return 0 on success, -1 on critical buffer underflow
 */
-static int tgv_decode_inter(TgvContext * s, const uint8_t *buf, const uint8_t *buf_end){
+static int tgv_decode_inter(TgvContext *s, AVFrame *frame,
+ const uint8_t *buf, const uint8_t *buf_end)
+{
 int num_mvs;
 int num_blocks_raw;
 int num_blocks_packed;
@@ -143,10 +154,10 @@
 int i,j,x,y;
 GetBitContext gb;
 int mvbits;
- const unsigned char *blocks_raw;
+ const uint8_t *blocks_raw;
 
- if(buf+12>buf_end)
- return -1;
+ if (buf + 12 > buf_end)
+ return AVERROR_INVALIDDATA;
 
 num_mvs = AV_RL16(&buf[0]);
 num_blocks_raw = AV_RL16(&buf[2]);
@@ -167,166 +178,160 @@
 }
 
 if (num_blocks_packed > s->num_blocks_packed) {
- s->block_codebook = av_realloc(s->block_codebook, num_blocks_packed*16*sizeof(unsigned char));
+ int err;
+ if ((err = av_reallocp(&s->block_codebook, num_blocks_packed * 16)) < 0) {
+ s->num_blocks_packed = 0;
+ return err;
+ }
 s->num_blocks_packed = num_blocks_packed;
 }
 
 /* read motion vectors */
- mvbits = (num_mvs*2*10+31) & ~31;
+ mvbits = (num_mvs * 2 * 10 + 31) & ~31;
 
- if (buf+(mvbits>>3)+16*num_blocks_raw+8*num_blocks_packed>buf_end)
- return -1;
+ if (buf + (mvbits >> 3) + 16 * num_blocks_raw + 8 * num_blocks_packed > buf_end)
+ return AVERROR_INVALIDDATA;
 
 init_get_bits(&gb, buf, mvbits);
- for (i=0; i<num_mvs; i++) {
+ for (i = 0; i < num_mvs; i++) {
 s->mv_codebook[i][0] = get_sbits(&gb, 10);
 s->mv_codebook[i][1] = get_sbits(&gb, 10);
 }
- buf += mvbits>>3;
+ buf += mvbits >> 3;
 
 /* note ptr to uncompressed blocks */
 blocks_raw = buf;
- buf += num_blocks_raw*16;
+ buf += num_blocks_raw * 16;
 
 /* read compressed blocks */
- init_get_bits(&gb, buf, (buf_end-buf)<<3);
- for (i=0; i<num_blocks_packed; i++) {
+ init_get_bits(&gb, buf, (buf_end - buf) << 3);
+ for (i = 0; i < num_blocks_packed; i++) {
 int tmp[4];
- for(j=0; j<4; j++)
+ for (j = 0; j < 4; j++)
 tmp[j] = get_bits(&gb, 8);
- for(j=0; j<16; j++)
+ for (j = 0; j < 16; j++)
 s->block_codebook[i][15-j] = tmp[get_bits(&gb, 2)];
 }
 
 if (get_bits_left(&gb) < vector_bits *
- (s->avctx->height/4) * (s->avctx->width/4))
- return -1;
+ (s->avctx->height / 4) * (s->avctx->width / 4))
+ return AVERROR_INVALIDDATA;
 
 /* read vectors and build frame */
- for(y=0; y<s->avctx->height/4; y++)
- for(x=0; x<s->avctx->width/4; x++) {
- unsigned int vector = get_bits(&gb, vector_bits);
- const unsigned char *src;
- int src_stride;
-
- if (vector < num_mvs) {
- int mx = x * 4 + s->mv_codebook[vector][0];
- int my = y * 4 + s->mv_codebook[vector][1];
-
- if ( mx < 0 || mx + 4 > s->avctx->width
- || my < 0 || my + 4 > s->avctx->height)
- continue;
-
- 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)
- src = blocks_raw + 16*offset;
- else if (offset-num_blocks_raw<num_blocks_packed)
- src = s->block_codebook[offset-num_blocks_raw];
- else
- continue;
- src_stride = 4;
- }
+ for (y = 0; y < s->avctx->height / 4; y++)
+ for (x = 0; x < s->avctx->width / 4; x++) {
+ unsigned int vector = get_bits(&gb, vector_bits);
+ const uint8_t *src;
+ int src_stride;
+
+ if (vector < num_mvs) {
+ int mx = x * 4 + s->mv_codebook[vector][0];
+ int my = y * 4 + s->mv_codebook[vector][1];
+
+ if (mx < 0 || mx + 4 > s->avctx->width ||
+ my < 0 || my + 4 > s->avctx->height)
+ continue;
+
+ 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)
+ src = blocks_raw + 16*offset;
+ else if (offset - num_blocks_raw < num_blocks_packed)
+ src = s->block_codebook[offset - num_blocks_raw];
+ else
+ continue;
+ src_stride = 4;
+ }
 
- for(j=0; j<4; j++)
- for(i=0; i<4; i++)
- s->frame.data[0][ (y*4+j)*s->frame.linesize[0] + (x*4+i) ] =
- src[j*src_stride + i];
+ for (j = 0; j < 4; j++)
+ for (i = 0; i < 4; i++)
+ frame->data[0][(y * 4 + j) * frame->linesize[0] + (x * 4 + i)] =
+ src[j * src_stride + i];
 }
 
 return 0;
 }
 
-/** release AVFrame buffers if allocated */
-static void cond_release_buffer(AVFrame *pic)
-{
- if (pic->data[0]) {
- av_freep(&pic->data[0]);
- av_free(pic->data[1]);
- }
-}
-
 static int tgv_decode_frame(AVCodecContext *avctx,
 void *data, int *got_frame,
 AVPacket *avpkt)
 {
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- TgvContext *s = avctx->priv_data;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ TgvContext *s = avctx->priv_data;
 const uint8_t *buf_end = buf + buf_size;
- int chunk_type;
+ AVFrame *frame = data;
+ int chunk_type, ret;
 
 chunk_type = AV_RL32(&buf[0]);
- buf += EA_PREAMBLE_SIZE;
+ buf += EA_PREAMBLE_SIZE;
 
- if (chunk_type==kVGT_TAG) {
+ if (chunk_type == kVGT_TAG) {
 int pal_count, i;
- if(buf+12>buf_end) {
+ if (buf + 12 > buf_end) {
 av_log(avctx, AV_LOG_WARNING, "truncated header\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 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);
- cond_release_buffer(&s->frame);
- cond_release_buffer(&s->last_frame);
+ if (s->avctx->width != s->width || s->avctx->height != s->height) {
+ av_freep(&s->frame_buffer);
+ 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]);
 buf += 12;
- for(i=0; i<pal_count && i<AVPALETTE_COUNT && buf+2<buf_end; i++) {
+ for (i = 0; i < pal_count && i < AVPALETTE_COUNT && buf + 2 < buf_end; i++) {
 s->palette[i] = AV_RB24(buf);
 buf += 3;
 }
 }
 
- if (av_image_check_size(s->width, s->height, 0, avctx))
- return -1;
+ if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
+ return ret;
 
- /* shuffle */
- FFSWAP(AVFrame, s->frame, s->last_frame);
- if (!s->frame.data[0]) {
- s->frame.reference = 1;
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID;
- s->frame.linesize[0] = s->width;
+ memcpy(frame->data[1], s->palette, AVPALETTE_SIZE);
 
- s->frame.data[0] = av_malloc(s->width * s->height);
- if (!s->frame.data[0])
- return AVERROR(ENOMEM);
- s->frame.data[1] = av_malloc(AVPALETTE_SIZE);
- if (!s->frame.data[1]) {
- av_freep(&s->frame.data[0]);
+ if (chunk_type == kVGT_TAG) {
+ int y;
+ frame->key_frame = 1;
+ frame->pict_type = AV_PICTURE_TYPE_I;
+
+ if (!s->frame_buffer &&
+ !(s->frame_buffer = av_malloc(s->width * s->height)))
 return AVERROR(ENOMEM);
- }
- }
- memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
 
- if(chunk_type==kVGT_TAG) {
- s->frame.key_frame = 1;
- s->frame.pict_type = AV_PICTURE_TYPE_I;
- if (unpack(buf, buf_end, s->frame.data[0], s->avctx->width, s->avctx->height)<0) {
+ if (unpack(buf, buf_end, s->frame_buffer, s->avctx->width, s->avctx->height) < 0) {
 av_log(avctx, AV_LOG_WARNING, "truncated intra frame\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- }else{
- if (!s->last_frame.data[0]) {
+ for (y = 0; y < s->height; y++)
+ memcpy(frame->data[0] + y * frame->linesize[0],
+ s->frame_buffer + y * s->width,
+ s->width);
+ } else {
+ if (!s->last_frame->data[0]) {
 av_log(avctx, AV_LOG_WARNING, "inter frame without corresponding intra frame\n");
 return buf_size;
 }
- s->frame.key_frame = 0;
- s->frame.pict_type = AV_PICTURE_TYPE_P;
- if (tgv_decode_inter(s, buf, buf_end)<0) {
+ frame->key_frame = 0;
+ frame->pict_type = AV_PICTURE_TYPE_P;
+ if (tgv_decode_inter(s, frame, buf, buf_end) < 0) {
 av_log(avctx, AV_LOG_WARNING, "truncated inter frame\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 
+ av_frame_unref(s->last_frame);
+ if ((ret = av_frame_ref(s->last_frame, frame)) < 0)
+ return ret;
+
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
 return buf_size;
 }
@@ -334,8 +339,8 @@
 static av_cold int tgv_decode_end(AVCodecContext *avctx)
 {
 TgvContext *s = avctx->priv_data;
- cond_release_buffer(&s->frame);
- cond_release_buffer(&s->last_frame);
+ av_frame_free(&s->last_frame);
+ av_freep(&s->frame_buffer);
 av_free(s->mv_codebook);
 av_free(s->block_codebook);
 return 0;
@@ -343,11 +348,12 @@
 
 AVCodec ff_eatgv_decoder = {
 .name = "eatgv",
+ .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGV video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_TGV,
 .priv_data_size = sizeof(TgvContext),
 .init = tgv_decode_init,
 .close = tgv_decode_end,
 .decode = tgv_decode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGV video"),
+ .capabilities = CODEC_CAP_DR1,
 };

libav-v9.6.tar.bz2/libavcodec/eatqi.c -> libav-v10.1.tar.bz2/libavcodec/eatqi.c Changed

@@ -28,7 +28,6 @@
 
 #include "avcodec.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "aandcttab.h"
 #include "eaidct.h"
 #include "internal.h"
@@ -37,10 +36,9 @@
 
 typedef struct TqiContext {
 MpegEncContext s;
- AVFrame frame;
 void *bitstream_buf;
 unsigned int bitstream_buf_size;
- DECLARE_ALIGNED(16, DCTELEM, block)[6][64];
+ DECLARE_ALIGNED(16, int16_t, block)[6][64];
 } TqiContext;
 
 static av_cold int tqi_decode_init(AVCodecContext *avctx)
@@ -58,7 +56,7 @@
 return 0;
 }
 
-static int tqi_decode_mb(MpegEncContext *s, DCTELEM (*block)[64])
+static int tqi_decode_mb(MpegEncContext *s, int16_t (*block)[64])
 {
 int n;
 s->dsp.clear_blocks(block[0]);
@@ -69,21 +67,21 @@
 return 0;
 }
 
-static inline void tqi_idct_put(TqiContext *t, DCTELEM (*block)[64])
+static inline void tqi_idct_put(TqiContext *t, AVFrame *frame, int16_t (*block)[64])
 {
 MpegEncContext *s = &t->s;
- int linesize= t->frame.linesize[0];
- uint8_t *dest_y = t->frame.data[0] + (s->mb_y * 16* linesize ) + s->mb_x * 16;
- uint8_t *dest_cb = t->frame.data[1] + (s->mb_y * 8 * t->frame.linesize[1]) + s->mb_x * 8;
- uint8_t *dest_cr = t->frame.data[2] + (s->mb_y * 8 * t->frame.linesize[2]) + s->mb_x * 8;
+ int linesize = frame->linesize[0];
+ uint8_t *dest_y = frame->data[0] + (s->mb_y * 16* linesize ) + s->mb_x * 16;
+ uint8_t *dest_cb = frame->data[1] + (s->mb_y * 8 * frame->linesize[1]) + s->mb_x * 8;
+ uint8_t *dest_cr = frame->data[2] + (s->mb_y * 8 * frame->linesize[2]) + s->mb_x * 8;
 
 ff_ea_idct_put_c(dest_y , linesize, block[0]);
 ff_ea_idct_put_c(dest_y + 8, linesize, block[1]);
 ff_ea_idct_put_c(dest_y + 8*linesize , linesize, block[2]);
 ff_ea_idct_put_c(dest_y + 8*linesize + 8, linesize, block[3]);
 if(!(s->avctx->flags&CODEC_FLAG_GRAY)) {
- ff_ea_idct_put_c(dest_cb, t->frame.linesize[1], block[4]);
- ff_ea_idct_put_c(dest_cr, t->frame.linesize[2], block[5]);
+ ff_ea_idct_put_c(dest_cb, frame->linesize[1], block[4]);
+ ff_ea_idct_put_c(dest_cr, frame->linesize[2], block[5]);
 }
 }
 
@@ -105,21 +103,21 @@
 const uint8_t *buf_end = buf+buf_size;
 TqiContext *t = avctx->priv_data;
 MpegEncContext *s = &t->s;
+ AVFrame *frame = data;
+ int ret;
 
 s->width = AV_RL16(&buf[0]);
 s->height = AV_RL16(&buf[2]);
 tqi_calculate_qtable(s, buf[4]);
 buf += 8;
 
- if (t->frame.data[0])
- avctx->release_buffer(avctx, &t->frame);
+ ret = ff_set_dimensions(s->avctx, s->width, s->height);
+ if (ret < 0)
+ return ret;
 
- if (s->avctx->width!=s->width || s->avctx->height!=s->height)
- avcodec_set_dimensions(s->avctx, s->width, s->height);
-
- if(ff_get_buffer(avctx, &t->frame) < 0) {
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 av_fast_padded_malloc(&t->bitstream_buf, &t->bitstream_buf_size,
@@ -135,25 +133,23 @@
 {
 if (tqi_decode_mb(s, t->block) < 0)
 break;
- tqi_idct_put(t, t->block);
+ tqi_idct_put(t, frame, t->block);
 }
 
 *got_frame = 1;
- *(AVFrame*)data = t->frame;
 return buf_size;
 }
 
 static av_cold int tqi_decode_end(AVCodecContext *avctx)
 {
 TqiContext *t = avctx->priv_data;
- if(t->frame.data[0])
- avctx->release_buffer(avctx, &t->frame);
 av_free(t->bitstream_buf);
 return 0;
 }
 
 AVCodec ff_eatqi_decoder = {
 .name = "eatqi",
+ .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TQI Video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_TQI,
 .priv_data_size = sizeof(TqiContext),
@@ -161,5 +157,4 @@
 .close = tqi_decode_end,
 .decode = tqi_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TQI Video"),
 };

libav-v9.6.tar.bz2/libavcodec/error_resilience.c -> libav-v10.1.tar.bz2/libavcodec/error_resilience.c Changed

@@ -27,60 +27,24 @@
 
 #include <limits.h>
 
+#include "libavutil/internal.h"
 #include "avcodec.h"
-#include "dsputil.h"
+#include "error_resilience.h"
 #include "mpegvideo.h"
-#include "h264.h"
 #include "rectangle.h"
 #include "thread.h"
-
-/*
- * H264 redefines mb_intra so it is not mistakely used (its uninitialized in h264)
- * but error concealment must support both h264 and h263 thus we must undo this
- */
-#undef mb_intra
-
-static void decode_mb(MpegEncContext *s, int ref)
-{
- s->dest[0] = s->current_picture.f.data[0] + (s->mb_y * 16 * s->linesize) + s->mb_x * 16;
- s->dest[1] = s->current_picture.f.data[1] + (s->mb_y * (16 >> s->chroma_y_shift) * s->uvlinesize) + s->mb_x * (16 >> s->chroma_x_shift);
- s->dest[2] = s->current_picture.f.data[2] + (s->mb_y * (16 >> s->chroma_y_shift) * s->uvlinesize) + s->mb_x * (16 >> s->chroma_x_shift);
-
- if (CONFIG_H264_DECODER && s->codec_id == AV_CODEC_ID_H264) {
- H264Context *h = (void*)s;
- h->mb_xy = s->mb_x + s->mb_y * s->mb_stride;
- memset(h->non_zero_count_cache, 0, sizeof(h->non_zero_count_cache));
- assert(ref >= 0);
- /* FIXME: It is possible albeit uncommon that slice references
- * differ between slices. We take the easy approach and ignore
- * it for now. If this turns out to have any relevance in
- * practice then correct remapping should be added. */
- if (ref >= h->ref_count[0])
- ref = 0;
- fill_rectangle(&s->current_picture.f.ref_index[0][4 * h->mb_xy],
- 2, 2, 2, ref, 1);
- fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref, 1);
- fill_rectangle(h->mv_cache[0][scan8[0]], 4, 4, 8,
- pack16to32(s->mv[0][0][0], s->mv[0][0][1]), 4);
- assert(!FRAME_MBAFF);
- ff_h264_hl_decode_mb(h);
- } else {
- assert(ref == 0);
- ff_MPV_decode_mb(s, s->block);
- }
-}
+#include "version.h"
 
 /**
 * @param stride the number of MVs to get to the next row
 * @param mv_step the number of MVs per row or column in a macroblock
 */
-static void set_mv_strides(MpegEncContext *s, int *mv_step, int *stride)
+static void set_mv_strides(ERContext *s, int *mv_step, int *stride)
 {
- if (s->codec_id == AV_CODEC_ID_H264) {
- H264Context *h = (void*)s;
+ if (s->avctx->codec_id == AV_CODEC_ID_H264) {
 assert(s->quarter_sample);
 *mv_step = 4;
- *stride = h->b_stride;
+ *stride = s->mb_width * 4;
 } else {
 *mv_step = 2;
 *stride = s->b8_stride;
@@ -90,9 +54,10 @@
 /**
 * Replace the current MB with a flat dc-only version.
 */
-static void put_dc(MpegEncContext *s, uint8_t *dest_y, uint8_t *dest_cb,
+static void put_dc(ERContext *s, uint8_t *dest_y, uint8_t *dest_cb,
 uint8_t *dest_cr, int mb_x, int mb_y)
 {
+ int *linesize = s->cur_pic->f.linesize;
 int dc, dcu, dcv, y, i;
 for (i = 0; i < 4; i++) {
 dc = s->dc_val[0][mb_x * 2 + (i & 1) + (mb_y * 2 + (i >> 1)) * s->b8_stride];
@@ -103,7 +68,7 @@
 for (y = 0; y < 8; y++) {
 int x;
 for (x = 0; x < 8; x++)
- dest_y[x + (i & 1) * 8 + (y + (i >> 1) * 8) * s->linesize] = dc / 8;
+ dest_y[x + (i & 1) * 8 + (y + (i >> 1) * 8) * linesize[0]] = dc / 8;
 }
 }
 dcu = s->dc_val[1][mb_x + mb_y * s->mb_stride];
@@ -119,8 +84,8 @@
 for (y = 0; y < 8; y++) {
 int x;
 for (x = 0; x < 8; x++) {
- dest_cb[x + y * s->uvlinesize] = dcu / 8;
- dest_cr[x + y * s->uvlinesize] = dcv / 8;
+ dest_cb[x + y * linesize[1]] = dcu / 8;
+ dest_cr[x + y * linesize[2]] = dcv / 8;
 }
 }
 }
@@ -166,7 +131,7 @@
 * @param w width in 8 pixel blocks
 * @param h height in 8 pixel blocks
 */
-static void guess_dc(MpegEncContext *s, int16_t *dc, int w,
+static void guess_dc(ERContext *s, int16_t *dc, int w,
 int h, int stride, int is_luma)
 {
 int b_x, b_y;
@@ -180,7 +145,7 @@
 mb_index = (b_x >> is_luma) + (b_y >> is_luma) * s->mb_stride;
 error = s->error_status_table[mb_index];
 
- if (IS_INTER(s->current_picture.f.mb_type[mb_index]))
+ if (IS_INTER(s->cur_pic->mb_type[mb_index]))
 continue; // inter
 if (!(error & ER_DC_ERROR))
 continue; // dc-ok
@@ -189,7 +154,7 @@
 for (j = b_x + 1; j < w; j++) {
 int mb_index_j = (j >> is_luma) + (b_y >> is_luma) * s->mb_stride;
 int error_j = s->error_status_table[mb_index_j];
- int intra_j = IS_INTRA(s->current_picture.f.mb_type[mb_index_j]);
+ int intra_j = IS_INTRA(s->cur_pic->mb_type[mb_index_j]);
 if (intra_j == 0 || !(error_j & ER_DC_ERROR)) {
 color[0] = dc[j + b_y * stride];
 distance[0] = j - b_x;
@@ -201,7 +166,7 @@
 for (j = b_x - 1; j >= 0; j--) {
 int mb_index_j = (j >> is_luma) + (b_y >> is_luma) * s->mb_stride;
 int error_j = s->error_status_table[mb_index_j];
- int intra_j = IS_INTRA(s->current_picture.f.mb_type[mb_index_j]);
+ int intra_j = IS_INTRA(s->cur_pic->mb_type[mb_index_j]);
 if (intra_j == 0 || !(error_j & ER_DC_ERROR)) {
 color[1] = dc[j + b_y * stride];
 distance[1] = b_x - j;
@@ -213,7 +178,7 @@
 for (j = b_y + 1; j < h; j++) {
 int mb_index_j = (b_x >> is_luma) + (j >> is_luma) * s->mb_stride;
 int error_j = s->error_status_table[mb_index_j];
- int intra_j = IS_INTRA(s->current_picture.f.mb_type[mb_index_j]);
+ int intra_j = IS_INTRA(s->cur_pic->mb_type[mb_index_j]);
 
 if (intra_j == 0 || !(error_j & ER_DC_ERROR)) {
 color[2] = dc[b_x + j * stride];
@@ -226,7 +191,7 @@
 for (j = b_y - 1; j >= 0; j--) {
 int mb_index_j = (b_x >> is_luma) + (j >> is_luma) * s->mb_stride;
 int error_j = s->error_status_table[mb_index_j];
- int intra_j = IS_INTRA(s->current_picture.f.mb_type[mb_index_j]);
+ int intra_j = IS_INTRA(s->cur_pic->mb_type[mb_index_j]);
 if (intra_j == 0 || !(error_j & ER_DC_ERROR)) {
 color[3] = dc[b_x + j * stride];
 distance[3] = b_y - j;
@@ -252,11 +217,11 @@
 * @param w width in 8 pixel blocks
 * @param h height in 8 pixel blocks
 */
-static void h_block_filter(MpegEncContext *s, uint8_t *dst, int w,
+static void h_block_filter(ERContext *s, uint8_t *dst, int w,
 int h, int stride, int is_luma)
 {
 int b_x, b_y, mvx_stride, mvy_stride;
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
 set_mv_strides(s, &mvx_stride, &mvy_stride);
 mvx_stride >>= is_luma;
 mvy_stride *= mvx_stride;
@@ -266,13 +231,13 @@
 int y;
 int left_status = s->error_status_table[( b_x >> is_luma) + (b_y >> is_luma) * s->mb_stride];
 int right_status = s->error_status_table[((b_x + 1) >> is_luma) + (b_y >> is_luma) * s->mb_stride];
- int left_intra = IS_INTRA(s->current_picture.f.mb_type[( b_x >> is_luma) + (b_y >> is_luma) * s->mb_stride]);
- int right_intra = IS_INTRA(s->current_picture.f.mb_type[((b_x + 1) >> is_luma) + (b_y >> is_luma) * s->mb_stride]);
+ int left_intra = IS_INTRA(s->cur_pic->mb_type[( b_x >> is_luma) + (b_y >> is_luma) * s->mb_stride]);
+ int right_intra = IS_INTRA(s->cur_pic->mb_type[((b_x + 1) >> is_luma) + (b_y >> is_luma) * s->mb_stride]);
 int left_damage = left_status & ER_MB_ERROR;
 int right_damage = right_status & ER_MB_ERROR;
 int offset = b_x * 8 + b_y * stride * 8;
- int16_t *left_mv = s->current_picture.f.motion_val[0][mvy_stride * b_y + mvx_stride * b_x];
- int16_t *right_mv = s->current_picture.f.motion_val[0][mvy_stride * b_y + mvx_stride * (b_x + 1)];
+ int16_t *left_mv = s->cur_pic->motion_val[0][mvy_stride * b_y + mvx_stride * b_x];
+ int16_t *right_mv = s->cur_pic->motion_val[0][mvy_stride * b_y + mvx_stride * (b_x + 1)];
 if (!(left_damage || right_damage))
 continue; // both undamaged
 if ((!left_intra) && (!right_intra) &&
@@ -320,11 +285,11 @@
 * @param w width in 8 pixel blocks
 * @param h height in 8 pixel blocks
 */
-static void v_block_filter(MpegEncContext *s, uint8_t *dst, int w, int h,
+static void v_block_filter(ERContext *s, uint8_t *dst, int w, int h,
 int stride, int is_luma)
 {
 int b_x, b_y, mvx_stride, mvy_stride;
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
 set_mv_strides(s, &mvx_stride, &mvy_stride);
 mvx_stride >>= is_luma;
 mvy_stride *= mvx_stride;
@@ -334,14 +299,14 @@
 int x;
 int top_status = s->error_status_table[(b_x >> is_luma) + (b_y >> is_luma) * s->mb_stride];
 int bottom_status = s->error_status_table[(b_x >> is_luma) + ((b_y + 1) >> is_luma) * s->mb_stride];
- int top_intra = IS_INTRA(s->current_picture.f.mb_type[(b_x >> is_luma) + ( b_y >> is_luma) * s->mb_stride]);
- int bottom_intra = IS_INTRA(s->current_picture.f.mb_type[(b_x >> is_luma) + ((b_y + 1) >> is_luma) * s->mb_stride]);
+ int top_intra = IS_INTRA(s->cur_pic->mb_type[(b_x >> is_luma) + ( b_y >> is_luma) * s->mb_stride]);
+ int bottom_intra = IS_INTRA(s->cur_pic->mb_type[(b_x >> is_luma) + ((b_y + 1) >> is_luma) * s->mb_stride]);
 int top_damage = top_status & ER_MB_ERROR;
 int bottom_damage = bottom_status & ER_MB_ERROR;
 int offset = b_x * 8 + b_y * stride * 8;
 
- int16_t *top_mv = s->current_picture.f.motion_val[0][mvy_stride * b_y + mvx_stride * b_x];
- int16_t *bottom_mv = s->current_picture.f.motion_val[0][mvy_stride * (b_y + 1) + mvx_stride * b_x];
+ int16_t *top_mv = s->cur_pic->motion_val[0][mvy_stride * b_y + mvx_stride * b_x];
+ int16_t *bottom_mv = s->cur_pic->motion_val[0][mvy_stride * (b_y + 1) + mvx_stride * b_x];
 
 if (!(top_damage || bottom_damage))
 continue; // both undamaged
@@ -386,7 +351,7 @@
 }
 }
 
-static void guess_mv(MpegEncContext *s)
+static void guess_mv(ERContext *s)
 {
 uint8_t *fixed = s->er_temp_buffer;
 #define MV_FROZEN 3
@@ -406,7 +371,7 @@
 int f = 0;
 int error = s->error_status_table[mb_xy];
 
- if (IS_INTRA(s->current_picture.f.mb_type[mb_xy]))
+ if (IS_INTRA(s->cur_pic->mb_type[mb_xy]))
 f = MV_FROZEN; // intra // FIXME check
 if (!(error & ER_MV_ERROR))
 f = MV_FROZEN; // inter with undamaged MV
@@ -419,32 +384,19 @@
 if ((!(s->avctx->error_concealment&FF_EC_GUESS_MVS)) ||
 num_avail <= mb_width / 2) {
 for (mb_y = 0; mb_y < s->mb_height; mb_y++) {
- s->mb_x = 0;
- s->mb_y = mb_y;
- ff_init_block_index(s);
 for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
 const int mb_xy = mb_x + mb_y * s->mb_stride;
+ int mv_dir = (s->last_pic && s->last_pic->f.data[0]) ? MV_DIR_FORWARD : MV_DIR_BACKWARD;
 
- ff_update_block_index(s);
-
- if (IS_INTRA(s->current_picture.f.mb_type[mb_xy]))
+ if (IS_INTRA(s->cur_pic->mb_type[mb_xy]))
 continue;
 if (!(s->error_status_table[mb_xy] & ER_MV_ERROR))
 continue;
 
- s->mv_dir = s->last_picture.f.data[0] ? MV_DIR_FORWARD
- : MV_DIR_BACKWARD;
- s->mb_intra = 0;
- s->mv_type = MV_TYPE_16X16;
- s->mb_skipped = 0;
-
- s->dsp.clear_blocks(s->block[0]);
-
- s->mb_x = mb_x;
- s->mb_y = mb_y;
 s->mv[0][0][0] = 0;
 s->mv[0][0][1] = 0;
- decode_mb(s, 0);
+ s->decode_mb(s->opaque, 0, mv_dir, MV_TYPE_16X16, &s->mv,
+ mb_x, mb_y, 0, 0);
 }
 }
 return;
@@ -461,9 +413,6 @@
 
 changed = 0;
 for (mb_y = 0; mb_y < s->mb_height; mb_y++) {
- s->mb_x = 0;
- s->mb_y = mb_y;
- ff_init_block_index(s);
 for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
 const int mb_xy = mb_x + mb_y * s->mb_stride;
 int mv_predictor[8][2] = { { 0 } };
@@ -475,15 +424,13 @@
 const int mot_index = (mb_x + mb_y * mot_stride) * mot_step;
 int prev_x, prev_y, prev_ref;
 
- ff_update_block_index(s);
-
 if ((mb_x ^ mb_y ^ pass) & 1)
 continue;
 
 if (fixed[mb_xy] == MV_FROZEN)
 continue;
- assert(!IS_INTRA(s->current_picture.f.mb_type[mb_xy]));
- assert(s->last_picture_ptr && s->last_picture_ptr->f.data[0]);
+ assert(!IS_INTRA(s->cur_pic->mb_type[mb_xy]));
+ assert(s->last_pic && s->last_pic->f.data[0]);
 
 j = 0;
 if (mb_x > 0 && fixed[mb_xy - 1] == MV_FROZEN)
@@ -513,38 +460,38 @@
 
 if (mb_x > 0 && fixed[mb_xy - 1]) {
 mv_predictor[pred_count][0] =
- s->current_picture.f.motion_val[0][mot_index - mot_step][0];
+ s->cur_pic->motion_val[0][mot_index - mot_step][0];
 mv_predictor[pred_count][1] =
- s->current_picture.f.motion_val[0][mot_index - mot_step][1];
+ s->cur_pic->motion_val[0][mot_index - mot_step][1];
 ref[pred_count] =
- s->current_picture.f.ref_index[0][4 * (mb_xy - 1)];
+ s->cur_pic->ref_index[0][4 * (mb_xy - 1)];
 pred_count++;
 }
 if (mb_x + 1 < mb_width && fixed[mb_xy + 1]) {
 mv_predictor[pred_count][0] =
- s->current_picture.f.motion_val[0][mot_index + mot_step][0];
+ s->cur_pic->motion_val[0][mot_index + mot_step][0];
 mv_predictor[pred_count][1] =
- s->current_picture.f.motion_val[0][mot_index + mot_step][1];
+ s->cur_pic->motion_val[0][mot_index + mot_step][1];
 ref[pred_count] =
- s->current_picture.f.ref_index[0][4 * (mb_xy + 1)];
+ s->cur_pic->ref_index[0][4 * (mb_xy + 1)];
 pred_count++;
 }
 if (mb_y > 0 && fixed[mb_xy - mb_stride]) {
 mv_predictor[pred_count][0] =
- s->current_picture.f.motion_val[0][mot_index - mot_stride * mot_step][0];
+ s->cur_pic->motion_val[0][mot_index - mot_stride * mot_step][0];
 mv_predictor[pred_count][1] =
- s->current_picture.f.motion_val[0][mot_index - mot_stride * mot_step][1];
+ s->cur_pic->motion_val[0][mot_index - mot_stride * mot_step][1];
 ref[pred_count] =
- s->current_picture.f.ref_index[0][4 * (mb_xy - s->mb_stride)];
+ s->cur_pic->ref_index[0][4 * (mb_xy - s->mb_stride)];
 pred_count++;
 }
 if (mb_y + 1<mb_height && fixed[mb_xy + mb_stride]) {
 mv_predictor[pred_count][0] =
- s->current_picture.f.motion_val[0][mot_index + mot_stride * mot_step][0];
+ s->cur_pic->motion_val[0][mot_index + mot_stride * mot_step][0];
 mv_predictor[pred_count][1] =
- s->current_picture.f.motion_val[0][mot_index + mot_stride * mot_step][1];
+ s->cur_pic->motion_val[0][mot_index + mot_stride * mot_step][1];
 ref[pred_count] =
- s->current_picture.f.ref_index[0][4 * (mb_xy + s->mb_stride)];
+ s->cur_pic->ref_index[0][4 * (mb_xy + s->mb_stride)];
 pred_count++;
 }
 if (pred_count == 0)
@@ -602,19 +549,19 @@
 if (s->avctx->codec_id == AV_CODEC_ID_H264) {
 // FIXME
 } else {
- ff_thread_await_progress(&s->last_picture_ptr->f,
+ ff_thread_await_progress(&s->last_pic->tf,
 mb_y, 0);
 }
- if (!s->last_picture.f.motion_val[0] ||
- !s->last_picture.f.ref_index[0])
+ if (!s->last_pic->motion_val[0] ||
+ !s->last_pic->ref_index[0])
 goto skip_last_mv;
- prev_x = s->last_picture.f.motion_val[0][mot_index][0];
- prev_y = s->last_picture.f.motion_val[0][mot_index][1];
- prev_ref = s->last_picture.f.ref_index[0][4 * mb_xy];
+ prev_x = s->last_pic->motion_val[0][mot_index][0];
+ prev_y = s->last_pic->motion_val[0][mot_index][1];
+ prev_ref = s->last_pic->ref_index[0][4 * mb_xy];
 } else {
- prev_x = s->current_picture.f.motion_val[0][mot_index][0];
- prev_y = s->current_picture.f.motion_val[0][mot_index][1];
- prev_ref = s->current_picture.f.ref_index[0][4 * mb_xy];
+ prev_x = s->cur_pic->motion_val[0][mot_index][0];
+ prev_y = s->cur_pic->motion_val[0][mot_index][1];
+ prev_ref = s->cur_pic->ref_index[0][4 * mb_xy];
 }
 
 /* last MV */
@@ -624,54 +571,47 @@
 pred_count++;
 
 skip_last_mv:
- s->mv_dir = MV_DIR_FORWARD;
- s->mb_intra = 0;
- s->mv_type = MV_TYPE_16X16;
- s->mb_skipped = 0;
-
- s->dsp.clear_blocks(s->block[0]);
-
- s->mb_x = mb_x;
- s->mb_y = mb_y;
 
 for (j = 0; j < pred_count; j++) {
+ int *linesize = s->cur_pic->f.linesize;
 int score = 0;
- uint8_t *src = s->current_picture.f.data[0] +
- mb_x * 16 + mb_y * 16 * s->linesize;
+ uint8_t *src = s->cur_pic->f.data[0] +
+ mb_x * 16 + mb_y * 16 * linesize[0];
 
- s->current_picture.f.motion_val[0][mot_index][0] =
+ s->cur_pic->motion_val[0][mot_index][0] =
 s->mv[0][0][0] = mv_predictor[j][0];
- s->current_picture.f.motion_val[0][mot_index][1] =
+ s->cur_pic->motion_val[0][mot_index][1] =
 s->mv[0][0][1] = mv_predictor[j][1];
 
 // predictor intra or otherwise not available
 if (ref[j] < 0)
 continue;
 
- decode_mb(s, ref[j]);
+ s->decode_mb(s->opaque, ref[j], MV_DIR_FORWARD,
+ MV_TYPE_16X16, &s->mv, mb_x, mb_y, 0, 0);
 
 if (mb_x > 0 && fixed[mb_xy - 1]) {
 int k;
 for (k = 0; k < 16; k++)
- score += FFABS(src[k * s->linesize - 1] -
- src[k * s->linesize]);
+ score += FFABS(src[k * linesize[0] - 1] -
+ src[k * linesize[0]]);
 }
 if (mb_x + 1 < mb_width && fixed[mb_xy + 1]) {
 int k;
 for (k = 0; k < 16; k++)
- score += FFABS(src[k * s->linesize + 15] -
- src[k * s->linesize + 16]);
+ score += FFABS(src[k * linesize[0] + 15] -
+ src[k * linesize[0] + 16]);
 }
 if (mb_y > 0 && fixed[mb_xy - mb_stride]) {
 int k;
 for (k = 0; k < 16; k++)
- score += FFABS(src[k - s->linesize] - src[k]);
+ score += FFABS(src[k - linesize[0]] - src[k]);
 }
 if (mb_y + 1 < mb_height && fixed[mb_xy + mb_stride]) {
 int k;
 for (k = 0; k < 16; k++)
- score += FFABS(src[k + s->linesize * 15] -
- src[k + s->linesize * 16]);
+ score += FFABS(src[k + linesize[0] * 15] -
+ src[k + linesize[0] * 16]);
 }
 
 if (score <= best_score) { // <= will favor the last MV
@@ -685,11 +625,12 @@
 
 for (i = 0; i < mot_step; i++)
 for (j = 0; j < mot_step; j++) {
- s->current_picture.f.motion_val[0][mot_index + i + j * mot_stride][0] = s->mv[0][0][0];
- s->current_picture.f.motion_val[0][mot_index + i + j * mot_stride][1] = s->mv[0][0][1];
+ s->cur_pic->motion_val[0][mot_index + i + j * mot_stride][0] = s->mv[0][0][0];
+ s->cur_pic->motion_val[0][mot_index + i + j * mot_stride][1] = s->mv[0][0][1];
 }
 
- decode_mb(s, ref[best_pred]);
+ s->decode_mb(s->opaque, ref[best_pred], MV_DIR_FORWARD,
+ MV_TYPE_16X16, &s->mv, mb_x, mb_y, 0, 0);
 
 
 if (s->mv[0][0][0] != prev_x || s->mv[0][0][1] != prev_y) {
@@ -712,11 +653,11 @@
 }
 }
 
-static int is_intra_more_likely(MpegEncContext *s)
+static int is_intra_more_likely(ERContext *s)
 {
 int is_intra_likely, i, j, undamaged_count, skip_amount, mb_x, mb_y;
 
- if (!s->last_picture_ptr || !s->last_picture_ptr->f.data[0])
+ if (!s->last_pic || !s->last_pic->f.data[0])
 return 1; // no previous frame available -> use spatial prediction
 
 undamaged_count = 0;
@@ -727,21 +668,21 @@
 undamaged_count++;
 }
 
- if (s->codec_id == AV_CODEC_ID_H264) {
- H264Context *h = (void*) s;
- if (h->list_count <= 0 || h->ref_count[0] <= 0 ||
- !h->ref_list[0][0].f.data[0])
- return 1;
- }
+ if (s->avctx->codec_id == AV_CODEC_ID_H264 && s->ref_count <= 0)
+ return 1;
 
 if (undamaged_count < 5)
 return 0; // almost all MBs damaged -> use temporal prediction
 
+#if FF_API_XVMC
+FF_DISABLE_DEPRECATION_WARNINGS
 // prevent dsp.sad() check, that requires access to the image
 if (CONFIG_MPEG_XVMC_DECODER &&
 s->avctx->xvmc_acceleration &&
- s->pict_type == AV_PICTURE_TYPE_I)
+ s->cur_pic->f.pict_type == AV_PICTURE_TYPE_I)
 return 1;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif /* FF_API_XVMC */
 
 skip_amount = FFMAX(undamaged_count / 50, 1); // check only up to 50 MBs
 is_intra_likely = 0;
@@ -761,25 +702,25 @@
 if ((j % skip_amount) != 0)
 continue;
 
- if (s->pict_type == AV_PICTURE_TYPE_I) {
- uint8_t *mb_ptr = s->current_picture.f.data[0] +
- mb_x * 16 + mb_y * 16 * s->linesize;
- uint8_t *last_mb_ptr = s->last_picture.f.data[0] +
- mb_x * 16 + mb_y * 16 * s->linesize;
+ if (s->cur_pic->f.pict_type == AV_PICTURE_TYPE_I) {
+ int *linesize = s->cur_pic->f.linesize;
+ uint8_t *mb_ptr = s->cur_pic->f.data[0] +
+ mb_x * 16 + mb_y * 16 * linesize[0];
+ uint8_t *last_mb_ptr = s->last_pic->f.data[0] +
+ mb_x * 16 + mb_y * 16 * linesize[0];
 
 if (s->avctx->codec_id == AV_CODEC_ID_H264) {
 // FIXME
 } else {
- ff_thread_await_progress(&s->last_picture_ptr->f,
- mb_y, 0);
+ ff_thread_await_progress(&s->last_pic->tf, mb_y, 0);
 }
- is_intra_likely += s->dsp.sad[0](NULL, last_mb_ptr, mb_ptr,
- s->linesize, 16);
- is_intra_likely -= s->dsp.sad[0](NULL, last_mb_ptr,
- last_mb_ptr + s->linesize * 16,
- s->linesize, 16);
+ is_intra_likely += s->dsp->sad[0](NULL, last_mb_ptr, mb_ptr,
+ linesize[0], 16);
+ is_intra_likely -= s->dsp->sad[0](NULL, last_mb_ptr,
+ last_mb_ptr + linesize[0] * 16,
+ linesize[0], 16);
 } else {
- if (IS_INTRA(s->current_picture.f.mb_type[mb_xy]))
+ if (IS_INTRA(s->cur_pic->mb_type[mb_xy]))
 is_intra_likely++;
 else
 is_intra_likely--;
@@ -789,9 +730,9 @@
 return is_intra_likely > 0;
 }
 
-void ff_er_frame_start(MpegEncContext *s)
+void ff_er_frame_start(ERContext *s)
 {
- if (!s->err_recognition)
+ if (!s->avctx->error_concealment)
 return;
 
 memset(s->error_status_table, ER_MB_ERROR | VP_START | ER_MB_END,
@@ -807,7 +748,7 @@
 * @param status the status at the end (ER_MV_END, ER_AC_ERROR, ...), it is
 * assumed that no earlier end or error of the same type occurred
 */
-void ff_er_add_slice(MpegEncContext *s, int startx, int starty,
+void ff_er_add_slice(ERContext *s, int startx, int starty,
 int endx, int endy, int status)
 {
 const int start_i = av_clip(startx + starty * s->mb_width, 0, s->mb_num - 1);
@@ -825,7 +766,7 @@
 return;
 }
 
- if (!s->err_recognition)
+ if (!s->avctx->error_concealment)
 return;
 
 mask &= ~VP_START;
@@ -875,37 +816,46 @@
 }
 }
 
-void ff_er_frame_end(MpegEncContext *s)
+void ff_er_frame_end(ERContext *s)
 {
+ int *linesize = s->cur_pic->f.linesize;
 int i, mb_x, mb_y, error, error_type, dc_error, mv_error, ac_error;
 int distance;
 int threshold_part[4] = { 100, 100, 100 };
 int threshold = 50;
 int is_intra_likely;
 int size = s->b8_stride * 2 * s->mb_height;
- Picture *pic = s->current_picture_ptr;
 
 /* We do not support ER of field pictures yet,
 * though it should not crash if enabled. */
- if (!s->err_recognition || s->error_count == 0 ||
+ if (!s->avctx->error_concealment || s->error_count == 0 ||
 s->avctx->hwaccel ||
- s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU ||
- s->picture_structure != PICT_FRAME ||
+ !s->cur_pic || s->cur_pic->field_picture ||
 s->error_count == 3 * s->mb_width *
 (s->avctx->skip_top + s->avctx->skip_bottom)) {
 return;
 };
 
- if (s->current_picture.f.motion_val[0] == NULL) {
+ if (s->cur_pic->motion_val[0] == NULL) {
 av_log(s->avctx, AV_LOG_ERROR, "Warning MVs not available\n");
 
 for (i = 0; i < 2; i++) {
- pic->f.ref_index[i] = av_mallocz(s->mb_stride * s->mb_height * 4 * sizeof(uint8_t));
- pic->motion_val_base[i] = av_mallocz((size + 4) * 2 * sizeof(uint16_t));
- pic->f.motion_val[i] = pic->motion_val_base[i] + 4;
+ s->cur_pic->ref_index_buf[i] = av_buffer_allocz(s->mb_stride * s->mb_height * 4 * sizeof(uint8_t));
+ s->cur_pic->motion_val_buf[i] = av_buffer_allocz((size + 4) * 2 * sizeof(uint16_t));
+ if (!s->cur_pic->ref_index_buf[i] || !s->cur_pic->motion_val_buf[i])
+ break;
+ s->cur_pic->ref_index[i] = s->cur_pic->ref_index_buf[i]->data;
+ s->cur_pic->motion_val[i] = (int16_t (*)[2])s->cur_pic->motion_val_buf[i]->data + 4;
+ }
+ if (i < 2) {
+ for (i = 0; i < 2; i++) {
+ av_buffer_unref(&s->cur_pic->ref_index_buf[i]);
+ av_buffer_unref(&s->cur_pic->motion_val_buf[i]);
+ s->cur_pic->ref_index[i] = NULL;
+ s->cur_pic->motion_val[i] = NULL;
+ }
+ return;
 }
- pic->f.motion_subsample_log2 = 3;
- s->current_picture = *s->current_picture_ptr;
 }
 
 if (s->avctx->debug & FF_DEBUG_ER) {
@@ -964,7 +914,7 @@
 }
 
 /* handle missing slices */
- if (s->err_recognition & AV_EF_EXPLODE) {
+ if (s->avctx->err_recognition & AV_EF_EXPLODE) {
 int end_ok = 1;
 
 // FIXME + 100 hack
@@ -1063,30 +1013,28 @@
 continue;
 
 if (is_intra_likely)
- s->current_picture.f.mb_type[mb_xy] = MB_TYPE_INTRA4x4;
+ s->cur_pic->mb_type[mb_xy] = MB_TYPE_INTRA4x4;
 else
- s->current_picture.f.mb_type[mb_xy] = MB_TYPE_16x16 | MB_TYPE_L0;
+ s->cur_pic->mb_type[mb_xy] = MB_TYPE_16x16 | MB_TYPE_L0;
 }
 
 // change inter to intra blocks if no reference frames are available
- if (!s->last_picture.f.data[0] && !s->next_picture.f.data[0])
+ if (!(s->last_pic && s->last_pic->f.data[0]) &&
+ !(s->next_pic && s->next_pic->f.data[0]))
 for (i = 0; i < s->mb_num; i++) {
 const int mb_xy = s->mb_index2xy[i];
- if (!IS_INTRA(s->current_picture.f.mb_type[mb_xy]))
- s->current_picture.f.mb_type[mb_xy] = MB_TYPE_INTRA4x4;
+ if (!IS_INTRA(s->cur_pic->mb_type[mb_xy]))
+ s->cur_pic->mb_type[mb_xy] = MB_TYPE_INTRA4x4;
 }
 
 /* handle inter blocks with damaged AC */
 for (mb_y = 0; mb_y < s->mb_height; mb_y++) {
- s->mb_x = 0;
- s->mb_y = mb_y;
- ff_init_block_index(s);
 for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
 const int mb_xy = mb_x + mb_y * s->mb_stride;
- const int mb_type = s->current_picture.f.mb_type[mb_xy];
- int dir = !s->last_picture.f.data[0];
-
- ff_update_block_index(s);
+ const int mb_type = s->cur_pic->mb_type[mb_xy];
+ const int dir = !(s->last_pic && s->last_pic->f.data[0]);
+ const int mv_dir = dir ? MV_DIR_BACKWARD : MV_DIR_FORWARD;
+ int mv_type;
 
 error = s->error_status_table[mb_xy];
 
@@ -1097,43 +1045,33 @@
 if (!(error & ER_AC_ERROR))
 continue; // undamaged inter
 
- s->mv_dir = dir ? MV_DIR_BACKWARD : MV_DIR_FORWARD;
- s->mb_intra = 0;
- s->mb_skipped = 0;
 if (IS_8X8(mb_type)) {
 int mb_index = mb_x * 2 + mb_y * 2 * s->b8_stride;
 int j;
- s->mv_type = MV_TYPE_8X8;
+ mv_type = MV_TYPE_8X8;
 for (j = 0; j < 4; j++) {
- s->mv[0][j][0] = s->current_picture.f.motion_val[dir][mb_index + (j & 1) + (j >> 1) * s->b8_stride][0];
- s->mv[0][j][1] = s->current_picture.f.motion_val[dir][mb_index + (j & 1) + (j >> 1) * s->b8_stride][1];
+ s->mv[0][j][0] = s->cur_pic->motion_val[dir][mb_index + (j & 1) + (j >> 1) * s->b8_stride][0];
+ s->mv[0][j][1] = s->cur_pic->motion_val[dir][mb_index + (j & 1) + (j >> 1) * s->b8_stride][1];
 }
 } else {
- s->mv_type = MV_TYPE_16X16;
- s->mv[0][0][0] = s->current_picture.f.motion_val[dir][mb_x * 2 + mb_y * 2 * s->b8_stride][0];
- s->mv[0][0][1] = s->current_picture.f.motion_val[dir][mb_x * 2 + mb_y * 2 * s->b8_stride][1];
+ mv_type = MV_TYPE_16X16;
+ s->mv[0][0][0] = s->cur_pic->motion_val[dir][mb_x * 2 + mb_y * 2 * s->b8_stride][0];
+ s->mv[0][0][1] = s->cur_pic->motion_val[dir][mb_x * 2 + mb_y * 2 * s->b8_stride][1];
 }
 
- s->dsp.clear_blocks(s->block[0]);
-
- s->mb_x = mb_x;
- s->mb_y = mb_y;
- decode_mb(s, 0 /* FIXME h264 partitioned slices need this set */);
+ s->decode_mb(s->opaque, 0 /* FIXME h264 partitioned slices need this set */,
+ mv_dir, mv_type, &s->mv, mb_x, mb_y, 0, 0);
 }
 }
 
 /* guess MVs */
- if (s->pict_type == AV_PICTURE_TYPE_B) {
+ if (s->cur_pic->f.pict_type == AV_PICTURE_TYPE_B) {
 for (mb_y = 0; mb_y < s->mb_height; mb_y++) {
- s->mb_x = 0;
- s->mb_y = mb_y;
- ff_init_block_index(s);
 for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
 int xy = mb_x * 2 + mb_y * 2 * s->b8_stride;
 const int mb_xy = mb_x + mb_y * s->mb_stride;
- const int mb_type = s->current_picture.f.mb_type[mb_xy];
-
- ff_update_block_index(s);
+ const int mb_type = s->cur_pic->mb_type[mb_xy];
+ int mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD;
 
 error = s->error_status_table[mb_xy];
 
@@ -1144,28 +1082,21 @@
 if (!(error & ER_AC_ERROR))
 continue; // undamaged inter
 
- s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD;
- if (!s->last_picture.f.data[0])
- s->mv_dir &= ~MV_DIR_FORWARD;
- if (!s->next_picture.f.data[0])
- s->mv_dir &= ~MV_DIR_BACKWARD;
- s->mb_intra = 0;
- s->mv_type = MV_TYPE_16X16;
- s->mb_skipped = 0;
+ if (!(s->last_pic && s->last_pic->f.data[0]))
+ mv_dir &= ~MV_DIR_FORWARD;
+ if (!(s->next_pic && s->next_pic->f.data[0]))
+ mv_dir &= ~MV_DIR_BACKWARD;
 
 if (s->pp_time) {
 int time_pp = s->pp_time;
 int time_pb = s->pb_time;
 
- if (s->avctx->codec_id == AV_CODEC_ID_H264) {
- // FIXME
- } else {
- ff_thread_await_progress(&s->next_picture_ptr->f, mb_y, 0);
- }
- s->mv[0][0][0] = s->next_picture.f.motion_val[0][xy][0] * time_pb / time_pp;
- s->mv[0][0][1] = s->next_picture.f.motion_val[0][xy][1] * time_pb / time_pp;
- s->mv[1][0][0] = s->next_picture.f.motion_val[0][xy][0] * (time_pb - time_pp) / time_pp;
- s->mv[1][0][1] = s->next_picture.f.motion_val[0][xy][1] * (time_pb - time_pp) / time_pp;
+ ff_thread_await_progress(&s->next_pic->tf, mb_y, 0);
+
+ s->mv[0][0][0] = s->next_pic->motion_val[0][xy][0] * time_pb / time_pp;
+ s->mv[0][0][1] = s->next_pic->motion_val[0][xy][1] * time_pb / time_pp;
+ s->mv[1][0][0] = s->next_pic->motion_val[0][xy][0] * (time_pb - time_pp) / time_pp;
+ s->mv[1][0][1] = s->next_pic->motion_val[0][xy][1] * (time_pb - time_pp) / time_pp;
 } else {
 s->mv[0][0][0] = 0;
 s->mv[0][0][1] = 0;
@@ -1173,18 +1104,20 @@
 s->mv[1][0][1] = 0;
 }
 
- s->dsp.clear_blocks(s->block[0]);
- s->mb_x = mb_x;
- s->mb_y = mb_y;
- decode_mb(s, 0);
+ s->decode_mb(s->opaque, 0, mv_dir, MV_TYPE_16X16, &s->mv,
+ mb_x, mb_y, 0, 0);
 }
 }
 } else
 guess_mv(s);
 
+#if FF_API_XVMC
+FF_DISABLE_DEPRECATION_WARNINGS
 /* the filters below are not XvMC compatible, skip them */
 if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration)
 goto ec_clean;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif /* FF_API_XVMC */
 /* fill DC for inter blocks */
 for (mb_y = 0; mb_y < s->mb_height; mb_y++) {
 for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
@@ -1192,7 +1125,7 @@
 int16_t *dc_ptr;
 uint8_t *dest_y, *dest_cb, *dest_cr;
 const int mb_xy = mb_x + mb_y * s->mb_stride;
- const int mb_type = s->current_picture.f.mb_type[mb_xy];
+ const int mb_type = s->cur_pic->mb_type[mb_xy];
 
 error = s->error_status_table[mb_xy];
 
@@ -1201,9 +1134,9 @@
 // if (error & ER_MV_ERROR)
 // continue; // inter data damaged FIXME is this good?
 
- dest_y = s->current_picture.f.data[0] + mb_x * 16 + mb_y * 16 * s->linesize;
- dest_cb = s->current_picture.f.data[1] + mb_x * 8 + mb_y * 8 * s->uvlinesize;
- dest_cr = s->current_picture.f.data[2] + mb_x * 8 + mb_y * 8 * s->uvlinesize;
+ dest_y = s->cur_pic->f.data[0] + mb_x * 16 + mb_y * 16 * linesize[0];
+ dest_cb = s->cur_pic->f.data[1] + mb_x * 8 + mb_y * 8 * linesize[1];
+ dest_cr = s->cur_pic->f.data[2] + mb_x * 8 + mb_y * 8 * linesize[2];
 
 dc_ptr = &s->dc_val[0][mb_x * 2 + mb_y * 2 * s->b8_stride];
 for (n = 0; n < 4; n++) {
@@ -1212,7 +1145,7 @@
 int x;
 for (x = 0; x < 8; x++)
 dc += dest_y[x + (n & 1) * 8 +
- (y + (n >> 1) * 8) * s->linesize];
+ (y + (n >> 1) * 8) * linesize[0]];
 }
 dc_ptr[(n & 1) + (n >> 1) * s->b8_stride] = (dc + 4) >> 3;
 }
@@ -1221,8 +1154,8 @@
 for (y = 0; y < 8; y++) {
 int x;
 for (x = 0; x < 8; x++) {
- dcu += dest_cb[x + y * s->uvlinesize];
- dcv += dest_cr[x + y * s->uvlinesize];
+ dcu += dest_cb[x + y * linesize[1]];
+ dcv += dest_cr[x + y * linesize[2]];
 }
 }
 s->dc_val[1][mb_x + mb_y * s->mb_stride] = (dcu + 4) >> 3;
@@ -1243,7 +1176,7 @@
 for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
 uint8_t *dest_y, *dest_cb, *dest_cr;
 const int mb_xy = mb_x + mb_y * s->mb_stride;
- const int mb_type = s->current_picture.f.mb_type[mb_xy];
+ const int mb_type = s->cur_pic->mb_type[mb_xy];
 
 error = s->error_status_table[mb_xy];
 
@@ -1252,9 +1185,9 @@
 if (!(error & ER_AC_ERROR))
 continue; // undamaged
 
- dest_y = s->current_picture.f.data[0] + mb_x * 16 + mb_y * 16 * s->linesize;
- dest_cb = s->current_picture.f.data[1] + mb_x * 8 + mb_y * 8 * s->uvlinesize;
- dest_cr = s->current_picture.f.data[2] + mb_x * 8 + mb_y * 8 * s->uvlinesize;
+ dest_y = s->cur_pic->f.data[0] + mb_x * 16 + mb_y * 16 * linesize[0];
+ dest_cb = s->cur_pic->f.data[1] + mb_x * 8 + mb_y * 8 * linesize[1];
+ dest_cr = s->cur_pic->f.data[2] + mb_x * 8 + mb_y * 8 * linesize[2];
 
 put_dc(s, dest_y, dest_cb, dest_cr, mb_x, mb_y);
 }
@@ -1262,20 +1195,20 @@
 
 if (s->avctx->error_concealment & FF_EC_DEBLOCK) {
 /* filter horizontal block boundaries */
- h_block_filter(s, s->current_picture.f.data[0], s->mb_width * 2,
- s->mb_height * 2, s->linesize, 1);
- h_block_filter(s, s->current_picture.f.data[1], s->mb_width,
- s->mb_height , s->uvlinesize, 0);
- h_block_filter(s, s->current_picture.f.data[2], s->mb_width,
- s->mb_height , s->uvlinesize, 0);
+ h_block_filter(s, s->cur_pic->f.data[0], s->mb_width * 2,
+ s->mb_height * 2, linesize[0], 1);
+ h_block_filter(s, s->cur_pic->f.data[1], s->mb_width,
+ s->mb_height, linesize[1], 0);
+ h_block_filter(s, s->cur_pic->f.data[2], s->mb_width,
+ s->mb_height, linesize[2], 0);
 
 /* filter vertical block boundaries */
- v_block_filter(s, s->current_picture.f.data[0], s->mb_width * 2,
- s->mb_height * 2, s->linesize, 1);
- v_block_filter(s, s->current_picture.f.data[1], s->mb_width,
- s->mb_height , s->uvlinesize, 0);
- v_block_filter(s, s->current_picture.f.data[2], s->mb_width,
- s->mb_height , s->uvlinesize, 0);
+ v_block_filter(s, s->cur_pic->f.data[0], s->mb_width * 2,
+ s->mb_height * 2, linesize[0], 1);
+ v_block_filter(s, s->cur_pic->f.data[1], s->mb_width,
+ s->mb_height, linesize[1], 0);
+ v_block_filter(s, s->cur_pic->f.data[2], s->mb_width,
+ s->mb_height, linesize[2], 0);
 }
 
 ec_clean:
@@ -1284,10 +1217,13 @@
 const int mb_xy = s->mb_index2xy[i];
 int error = s->error_status_table[mb_xy];
 
- if (s->pict_type != AV_PICTURE_TYPE_B &&
+ if (s->cur_pic->f.pict_type != AV_PICTURE_TYPE_B &&
 (error & (ER_DC_ERROR | ER_MV_ERROR | ER_AC_ERROR))) {
 s->mbskip_table[mb_xy] = 0;
 }
 s->mbintra_table[mb_xy] = 1;
 }
+ s->cur_pic = NULL;
+ s->next_pic = NULL;
+ s->last_pic = NULL;
 }

libav-v10.1.tar.bz2/libavcodec/error_resilience.h Added

@@ -0,0 +1,79 @@
+/*
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_ERROR_RESILIENCE_H
+#define AVCODEC_ERROR_RESILIENCE_H
+
+#include <stdint.h>
+
+#include "avcodec.h"
+#include "dsputil.h"
+
+///< current MB is the first after a resync marker
+#define VP_START 1
+#define ER_AC_ERROR 2
+#define ER_DC_ERROR 4
+#define ER_MV_ERROR 8
+#define ER_AC_END 16
+#define ER_DC_END 32
+#define ER_MV_END 64
+
+#define ER_MB_ERROR (ER_AC_ERROR|ER_DC_ERROR|ER_MV_ERROR)
+#define ER_MB_END (ER_AC_END|ER_DC_END|ER_MV_END)
+
+typedef struct ERContext {
+ AVCodecContext *avctx;
+ DSPContext *dsp;
+
+ int *mb_index2xy;
+ int mb_num;
+ int mb_width, mb_height;
+ int mb_stride;
+ int b8_stride;
+
+ int error_count, error_occurred;
+ uint8_t *error_status_table;
+ uint8_t *er_temp_buffer;
+ int16_t *dc_val[3];
+ uint8_t *mbskip_table;
+ uint8_t *mbintra_table;
+ int mv[2][4][2];
+
+ struct Picture *cur_pic;
+ struct Picture *last_pic;
+ struct Picture *next_pic;
+
+ uint16_t pp_time;
+ uint16_t pb_time;
+ int quarter_sample;
+ int partitioned_frame;
+ int ref_count;
+
+ void (*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);
+ void *opaque;
+} ERContext;
+
+void ff_er_frame_start(ERContext *s);
+void ff_er_frame_end(ERContext *s);
+void ff_er_add_slice(ERContext *s, int startx, int starty, int endx, int endy,
+ int status);
+
+#endif /* AVCODEC_ERROR_RESILIENCE_H */

libav-v9.6.tar.bz2/libavcodec/escape124.c -> libav-v10.1.tar.bz2/libavcodec/escape124.c Changed

@@ -42,7 +42,7 @@
 } CodeBook;
 
 typedef struct Escape124Context {
- AVFrame frame;
+ AVFrame *frame;
 
 unsigned num_superblocks;
 
@@ -67,6 +67,10 @@
 s->num_superblocks = ((unsigned)avctx->width / 8) *
 ((unsigned)avctx->height / 8);
 
+ s->frame = av_frame_alloc();
+ if (!s->frame)
+ return AVERROR(ENOMEM);
+
 return 0;
 }
 
@@ -78,8 +82,7 @@
 for (i = 0; i < 3; i++)
 av_free(s->codebooks[i].blocks);
 
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ av_frame_free(&s->frame);
 
 return 0;
 }
@@ -203,6 +206,7 @@
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 Escape124Context *s = avctx->priv_data;
+ AVFrame *frame = data;
 
 GetBitContext gb;
 unsigned frame_flags, frame_size;
@@ -214,8 +218,7 @@
 
 uint16_t* old_frame_data, *new_frame_data;
 unsigned old_stride, new_stride;
-
- AVFrame new_frame = { { 0 } };
+ int ret;
 
 init_get_bits(&gb, buf, buf_size * 8);
 
@@ -230,10 +233,14 @@
 // 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])
+ return AVERROR_INVALIDDATA;
+
 av_log(NULL, AV_LOG_DEBUG, "Skipping frame\n");
 
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
+ if ((ret = av_frame_ref(frame, s->frame)) < 0)
+ return ret;
 
 return frame_size;
 }
@@ -266,16 +273,15 @@
 }
 }
 
- new_frame.reference = 3;
- if (ff_get_buffer(avctx, &new_frame)) {
+ if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
- new_frame_data = (uint16_t*)new_frame.data[0];
- new_stride = new_frame.linesize[0] / 2;
- old_frame_data = (uint16_t*)s->frame.data[0];
- old_stride = s->frame.linesize[0] / 2;
+ 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;
 
 for (superblock_index = 0; superblock_index < s->num_superblocks;
 superblock_index++) {
@@ -354,10 +360,10 @@
 "Escape sizes: %i, %i, %i\n",
 frame_size, buf_size, get_bits_count(&gb) / 8);
 
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ av_frame_unref(s->frame);
+ if ((ret = av_frame_ref(s->frame, frame)) < 0)
+ return ret;
 
- *(AVFrame*)data = s->frame = new_frame;
 *got_frame = 1;
 
 return frame_size;
@@ -366,6 +372,7 @@
 
 AVCodec ff_escape124_decoder = {
 .name = "escape124",
+ .long_name = NULL_IF_CONFIG_SMALL("Escape 124"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_ESCAPE124,
 .priv_data_size = sizeof(Escape124Context),
@@ -373,5 +380,4 @@
 .close = escape124_decode_close,
 .decode = escape124_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Escape 124"),
 };

libav-v10.1.tar.bz2/libavcodec/escape130.c Added

@@ -0,0 +1,356 @@
+/*
+ * Escape 130 video decoder
+ * Copyright (C) 2008 Eli Friedman (eli.friedman <at> gmail.com)
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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/mem.h"
+#include "avcodec.h"
+#define BITSTREAM_READER_LE
+#include "get_bits.h"
+#include "internal.h"
+
+typedef struct Escape130Context {
+ uint8_t *old_y_avg;
+
+ uint8_t *new_y, *old_y;
+ uint8_t *new_u, *old_u;
+ uint8_t *new_v, *old_v;
+
+ uint8_t *buf1, *buf2;
+ int linesize[3];
+} Escape130Context;
+
+static const uint8_t offset_table[] = { 2, 4, 10, 20 };
+static const int8_t sign_table[64][4] = {
+ { 0, 0, 0, 0 },
+ { -1, 1, 0, 0 },
+ { 1, -1, 0, 0 },
+ { -1, 0, 1, 0 },
+ { -1, 1, 1, 0 },
+ { 0, -1, 1, 0 },
+ { 1, -1, 1, 0 },
+ { -1, -1, 1, 0 },
+ { 1, 0, -1, 0 },
+ { 0, 1, -1, 0 },
+ { 1, 1, -1, 0 },
+ { -1, 1, -1, 0 },
+ { 1, -1, -1, 0 },
+ { -1, 0, 0, 1 },
+ { -1, 1, 0, 1 },
+ { 0, -1, 0, 1 },
+
+ { 0, 0, 0, 0 },
+ { 1, -1, 0, 1 },
+ { -1, -1, 0, 1 },
+ { -1, 0, 1, 1 },
+ { -1, 1, 1, 1 },
+ { 0, -1, 1, 1 },
+ { 1, -1, 1, 1 },
+ { -1, -1, 1, 1 },
+ { 0, 0, -1, 1 },
+ { 1, 0, -1, 1 },
+ { -1, 0, -1, 1 },
+ { 0, 1, -1, 1 },
+ { 1, 1, -1, 1 },
+ { -1, 1, -1, 1 },
+ { 0, -1, -1, 1 },
+ { 1, -1, -1, 1 },
+
+ { 0, 0, 0, 0 },
+ { -1, -1, -1, 1 },
+ { 1, 0, 0, -1 },
+ { 0, 1, 0, -1 },
+ { 1, 1, 0, -1 },
+ { -1, 1, 0, -1 },
+ { 1, -1, 0, -1 },
+ { 0, 0, 1, -1 },
+ { 1, 0, 1, -1 },
+ { -1, 0, 1, -1 },
+ { 0, 1, 1, -1 },
+ { 1, 1, 1, -1 },
+ { -1, 1, 1, -1 },
+ { 0, -1, 1, -1 },
+ { 1, -1, 1, -1 },
+ { -1, -1, 1, -1 },
+
+ { 0, 0, 0, 0 },
+ { 1, 0, -1, -1 },
+ { 0, 1, -1, -1 },
+ { 1, 1, -1, -1 },
+ { -1, 1, -1, -1 },
+ { 1, -1, -1, -1 }
+};
+
+static const int8_t luma_adjust[] = { -4, -3, -2, -1, 1, 2, 3, 4 };
+
+static const int8_t chroma_adjust[2][8] = {
+ { 1, 1, 0, -1, -1, -1, 0, 1 },
+ { 0, 1, 1, 1, 0, -1, -1, -1 }
+};
+
+const uint8_t chroma_vals[] = {
+ 20, 28, 36, 44, 52, 60, 68, 76,
+ 84, 92, 100, 106, 112, 116, 120, 124,
+ 128, 132, 136, 140, 144, 150, 156, 164,
+ 172, 180, 188, 196, 204, 212, 220, 228
+};
+
+static av_cold int escape130_decode_init(AVCodecContext *avctx)
+{
+ Escape130Context *s = avctx->priv_data;
+ avctx->pix_fmt = AV_PIX_FMT_YUV420P;
+
+ if ((avctx->width & 1) || (avctx->height & 1)) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Dimensions should be a multiple of two.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ s->old_y_avg = av_malloc(avctx->width * avctx->height / 4);
+ s->buf1 = av_malloc(avctx->width * avctx->height * 3 / 2);
+ s->buf2 = av_malloc(avctx->width * avctx->height * 3 / 2);
+ if (!s->old_y_avg || !s->buf1 || !s->buf2) {
+ av_freep(&s->old_y_avg);
+ av_freep(&s->buf1);
+ av_freep(&s->buf2);
+ av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
+ return AVERROR(ENOMEM);
+ }
+
+ s->linesize[0] = avctx->width;
+ s->linesize[1] =
+ s->linesize[2] = avctx->width / 2;
+
+ s->new_y = s->buf1;
+ s->new_u = s->new_y + avctx->width * avctx->height;
+ s->new_v = s->new_u + avctx->width * avctx->height / 4;
+ s->old_y = s->buf2;
+ s->old_u = s->old_y + avctx->width * avctx->height;
+ s->old_v = s->old_u + avctx->width * avctx->height / 4;
+ memset(s->old_y, 0, avctx->width * avctx->height);
+ memset(s->old_u, 0x10, avctx->width * avctx->height / 4);
+ memset(s->old_v, 0x10, avctx->width * avctx->height / 4);
+
+ return 0;
+}
+
+static av_cold int escape130_decode_close(AVCodecContext *avctx)
+{
+ Escape130Context *s = avctx->priv_data;
+
+ av_freep(&s->old_y_avg);
+ av_freep(&s->buf1);
+ av_freep(&s->buf2);
+
+ return 0;
+}
+
+static int decode_skip_count(GetBitContext* gb)
+{
+ int value;
+
+ value = get_bits1(gb);
+ if (value)
+ return 0;
+
+ value = get_bits(gb, 3);
+ if (value)
+ return value;
+
+ value = get_bits(gb, 8);
+ if (value)
+ return value + 7;
+
+ value = get_bits(gb, 15);
+ if (value)
+ return value + 262;
+
+ return -1;
+}
+
+static int escape130_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame, AVPacket *avpkt)
+{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ Escape130Context *s = avctx->priv_data;
+ AVFrame *pic = data;
+ GetBitContext gb;
+ int ret;
+
+ uint8_t *old_y, *old_cb, *old_cr,
+ *new_y, *new_cb, *new_cr;
+ uint8_t *dstY, *dstU, *dstV;
+ unsigned old_y_stride, old_cb_stride, old_cr_stride,
+ new_y_stride, new_cb_stride, new_cr_stride;
+ unsigned total_blocks = avctx->width * avctx->height / 4,
+ block_index, block_x = 0;
+ unsigned y[4] = { 0 }, cb = 0x10, cr = 0x10;
+ int skip = -1, y_avg = 0, i, j;
+ uint8_t *ya = s->old_y_avg;
+
+ // first 16 bytes are header; no useful information in here
+ if (buf_size <= 16) {
+ av_log(avctx, AV_LOG_ERROR, "Insufficient frame data\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
+ return ret;
+
+ init_get_bits(&gb, buf + 16, (buf_size - 16) * 8);
+
+ new_y = s->new_y;
+ new_cb = s->new_u;
+ new_cr = s->new_v;
+ new_y_stride = s->linesize[0];
+ new_cb_stride = s->linesize[1];
+ new_cr_stride = s->linesize[2];
+ old_y = s->old_y;
+ old_cb = s->old_u;
+ old_cr = s->old_v;
+ old_y_stride = s->linesize[0];
+ old_cb_stride = s->linesize[1];
+ old_cr_stride = s->linesize[2];
+
+ for (block_index = 0; block_index < total_blocks; block_index++) {
+ // Note that this call will make us skip the rest of the blocks
+ // if the frame ends prematurely.
+ if (skip == -1)
+ skip = decode_skip_count(&gb);
+ if (skip == -1) {
+ av_log(avctx, AV_LOG_ERROR, "Error decoding skip value\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (skip) {
+ y[0] = old_y[0];
+ y[1] = old_y[1];
+ y[2] = old_y[old_y_stride];
+ y[3] = old_y[old_y_stride + 1];
+ y_avg = ya[0];
+ cb = old_cb[0];
+ cr = old_cr[0];
+ } else {
+ if (get_bits1(&gb)) {
+ unsigned sign_selector = get_bits(&gb, 6);
+ unsigned difference_selector = get_bits(&gb, 2);
+ y_avg = 2 * get_bits(&gb, 5);
+ for (i = 0; i < 4; i++) {
+ y[i] = av_clip(y_avg + offset_table[difference_selector] *
+ sign_table[sign_selector][i], 0, 63);
+ }
+ } else if (get_bits1(&gb)) {
+ if (get_bits1(&gb)) {
+ y_avg = get_bits(&gb, 6);
+ } else {
+ unsigned adjust_index = get_bits(&gb, 3);
+ y_avg = (y_avg + luma_adjust[adjust_index]) & 63;
+ }
+ for (i = 0; i < 4; i++)
+ y[i] = y_avg;
+ }
+
+ if (get_bits1(&gb)) {
+ if (get_bits1(&gb)) {
+ cb = get_bits(&gb, 5);
+ cr = get_bits(&gb, 5);
+ } else {
+ unsigned adjust_index = get_bits(&gb, 3);
+ cb = (cb + chroma_adjust[0][adjust_index]) & 31;
+ cr = (cr + chroma_adjust[1][adjust_index]) & 31;
+ }
+ }
+ }
+ *ya++ = y_avg;
+
+ new_y[0] = y[0];
+ new_y[1] = y[1];
+ new_y[new_y_stride] = y[2];
+ new_y[new_y_stride + 1] = y[3];
+ *new_cb = cb;
+ *new_cr = cr;
+
+ old_y += 2;
+ old_cb++;
+ old_cr++;
+ new_y += 2;
+ new_cb++;
+ new_cr++;
+ block_x++;
+ if (block_x * 2 == avctx->width) {
+ block_x = 0;
+ old_y += old_y_stride * 2 - avctx->width;
+ old_cb += old_cb_stride - avctx->width / 2;
+ old_cr += old_cr_stride - avctx->width / 2;
+ new_y += new_y_stride * 2 - avctx->width;
+ new_cb += new_cb_stride - avctx->width / 2;
+ new_cr += new_cr_stride - avctx->width / 2;
+ }
+
+ skip--;
+ }
+
+ new_y = s->new_y;
+ new_cb = s->new_u;
+ new_cr = s->new_v;
+ dstY = pic->data[0];
+ dstU = pic->data[1];
+ dstV = pic->data[2];
+ for (j = 0; j < avctx->height; j++) {
+ for (i = 0; i < avctx->width; i++)
+ dstY[i] = new_y[i] << 2;
+ dstY += pic->linesize[0];
+ new_y += new_y_stride;
+ }
+ for (j = 0; j < avctx->height / 2; j++) {
+ for (i = 0; i < avctx->width / 2; i++) {
+ dstU[i] = chroma_vals[new_cb[i]];
+ dstV[i] = chroma_vals[new_cr[i]];
+ }
+ dstU += pic->linesize[1];
+ dstV += pic->linesize[2];
+ new_cb += new_cb_stride;
+ new_cr += new_cr_stride;
+ }
+
+ av_dlog(avctx, "Frame data: provided %d bytes, used %d bytes\n",
+ buf_size, get_bits_count(&gb) >> 3);
+
+ FFSWAP(uint8_t*, s->old_y, s->new_y);
+ FFSWAP(uint8_t*, s->old_u, s->new_u);
+ FFSWAP(uint8_t*, s->old_v, s->new_v);
+
+ *got_frame = 1;
+
+ return buf_size;
+}
+
+AVCodec ff_escape130_decoder = {
+ .name = "escape130",
+ .long_name = NULL_IF_CONFIG_SMALL("Escape 130"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_ESCAPE130,
+ .priv_data_size = sizeof(Escape130Context),
+ .init = escape130_decode_init,
+ .close = escape130_decode_close,
+ .decode = escape130_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+};

libav-v9.6.tar.bz2/libavcodec/faandct.c -> libav-v10.1.tar.bz2/libavcodec/faandct.c Changed

libav-v9.6.tar.bz2/libavcodec/faandct.h -> libav-v10.1.tar.bz2/libavcodec/faandct.h Changed

libav-v9.6.tar.bz2/libavcodec/faanidct.c -> libav-v10.1.tar.bz2/libavcodec/faanidct.c Changed

@@ -47,7 +47,7 @@
 B7*B0/8, B7*B1/8, B7*B2/8, B7*B3/8, B7*B4/8, B7*B5/8, B7*B6/8, B7*B7/8,
 };
 
-static inline void p8idct(DCTELEM data[64], FLOAT temp[64], uint8_t *dest, int stride, int x, int y, int type){
+static inline void p8idct(int16_t data[64], FLOAT temp[64], uint8_t *dest, int stride, int x, int y, int type){
     int i;
     FLOAT av_unused tmp0;
     FLOAT s04, d04, s17, d17, s26, d26, s53, d53;
@@ -129,7 +129,7 @@
     }
 }
 
-void ff_faanidct(DCTELEM block[64]){
+void ff_faanidct(int16_t block[64]){
     FLOAT temp[64];
     int i;
 
@@ -142,7 +142,7 @@
     p8idct(block, temp, NULL, 0, 8, 1, 1);
 }
 
-void ff_faanidct_add(uint8_t *dest, int line_size, DCTELEM block[64]){
+void ff_faanidct_add(uint8_t *dest, int line_size, int16_t block[64]){
     FLOAT temp[64];
     int i;
 
@@ -155,7 +155,7 @@
     p8idct(NULL , temp, dest, line_size, 8, 1, 2);
 }
 
-void ff_faanidct_put(uint8_t *dest, int line_size, DCTELEM block[64]){
+void ff_faanidct_put(uint8_t *dest, int line_size, int16_t block[64]){
     FLOAT temp[64];
     int i;

libav-v9.6.tar.bz2/libavcodec/faanidct.h -> libav-v10.1.tar.bz2/libavcodec/faanidct.h Changed

libav-v9.6.tar.bz2/libavcodec/faxcompr.c -> libav-v10.1.tar.bz2/libavcodec/faxcompr.c Changed

@@ -103,13 +103,13 @@
 int i;
 static int initialized = 0;
 
- if(initialized)
+ if (initialized)
 return;
 ccitt_vlc[0].table = code_table1;
 ccitt_vlc[0].table_allocated = 528;
 ccitt_vlc[1].table = code_table2;
 ccitt_vlc[1].table_allocated = 648;
- for(i = 0; i < 2; i++){
+ for (i = 0; i < 2; i++) {
 ff_init_vlc_sparse(&ccitt_vlc[i], 9, CCITT_SYMS,
 ccitt_codes_lens[i], 1, 1,
 ccitt_codes_bits[i], 1, 1,
@@ -124,32 +124,33 @@
 
 
 static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb,
- unsigned int pix_left, int *runs, const int *runend)
+ unsigned int pix_left, int *runs,
+ const int *runend)
 {
- int mode = 0;
- unsigned int run=0;
+ int mode = 0;
+ unsigned int run = 0;
 unsigned int t;
- for(;;){
- t = get_vlc2(gb, ccitt_vlc[mode].table, 9, 2);
+ for (;;) {
+ t = get_vlc2(gb, ccitt_vlc[mode].table, 9, 2);
 run += t;
- if(t < 64){
+ if (t < 64) {
 *runs++ = run;
- if(runs >= runend){
+ if (runs >= runend) {
 av_log(avctx, AV_LOG_ERROR, "Run overrun\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- if(pix_left <= run){
- if(pix_left == run)
+ if (pix_left <= run) {
+ if (pix_left == run)
 break;
 av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 pix_left -= run;
- run = 0;
- mode = !mode;
- }else if((int)t == -1){
+ run = 0;
+ mode = !mode;
+ } else if ((int)t == -1) {
 av_log(avctx, AV_LOG_ERROR, "Incorrect code\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 *runs++ = 0;
@@ -157,78 +158,79 @@
 }
 
 static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
- unsigned int width, int *runs, const int *runend, const int *ref)
+ unsigned int width, int *runs,
+ const int *runend, const int *ref)
 {
- int mode = 0, saved_run = 0, t;
- int run_off = *ref++;
- unsigned int offs=0, run= 0;
+ int mode = 0, saved_run = 0, t;
+ int run_off = *ref++;
+ unsigned int offs = 0, run = 0;
 
 runend--; // for the last written 0
 
- while(offs < width){
+ while (offs < width) {
 int cmode = get_vlc2(gb, ccitt_group3_2d_vlc.table, 9, 1);
- if(cmode == -1){
+ if (cmode == -1) {
 av_log(avctx, AV_LOG_ERROR, "Incorrect mode VLC\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- if(!cmode){//pass mode
+ if (!cmode) { //pass mode
 run_off += *ref++;
- run = run_off - offs;
- offs= run_off;
+ run = run_off - offs;
+ offs = run_off;
 run_off += *ref++;
- if(offs > width){
+ if (offs > width) {
 av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 saved_run += run;
- }else if(cmode == 1){//horizontal mode
+ } else if (cmode == 1) { //horizontal mode
 int k;
- for(k = 0; k < 2; k++){
+ for (k = 0; k < 2; k++) {
 run = 0;
- for(;;){
+ for (;;) {
 t = get_vlc2(gb, ccitt_vlc[mode].table, 9, 2);
- if(t == -1){
+ if (t == -1) {
 av_log(avctx, AV_LOG_ERROR, "Incorrect code\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 run += t;
- if(t < 64)
+ if (t < 64)
 break;
 }
 *runs++ = run + saved_run;
- if(runs >= runend){
+ if (runs >= runend) {
 av_log(avctx, AV_LOG_ERROR, "Run overrun\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 saved_run = 0;
- offs += run;
- if(offs > width || run > width){
+ offs += run;
+ if (offs > width || run > width) {
 av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 mode = !mode;
 }
- }else if(cmode == 9 || cmode == 10){
- av_log(avctx, AV_LOG_ERROR, "Special modes are not supported (yet)\n");
- return -1;
- }else{//vertical mode
- run = run_off - offs + (cmode - 5);
+ } else if (cmode == 9 || cmode == 10) {
+ avpriv_report_missing_feature(avctx, "Special modes support");
+ return AVERROR_PATCHWELCOME;
+ } else { //vertical mode
+ run = run_off - offs + (cmode - 5);
 run_off -= *--ref;
- offs += run;
- if(offs > width || run > width){
+ offs += run;
+ if (offs > width || run > width) {
 av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 *runs++ = run + saved_run;
- if(runs >= runend){
+ if (runs >= runend) {
 av_log(avctx, AV_LOG_ERROR, "Run overrun\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 saved_run = 0;
- mode = !mode;
+ mode = !mode;
 }
 //sync line pointers
- while(run_off <= offs){
+ while (run_off <= offs) {
 run_off += *ref++;
 run_off += *ref++;
 }
@@ -243,14 +245,14 @@
 PutBitContext pb;
 int run, mode = ~0, pix_left = width, run_idx = 0;
 
- init_put_bits(&pb, dst, size*8);
- while(pix_left > 0){
- run = runs[run_idx++];
- mode = ~mode;
+ init_put_bits(&pb, dst, size * 8);
+ while (pix_left > 0) {
+ run = runs[run_idx++];
+ mode = ~mode;
 pix_left -= run;
- for(; run > 16; run -= 16)
+ for (; run > 16; run -= 16)
 put_sbits(&pb, 16, mode);
- if(run)
+ if (run)
 put_sbits(&pb, run, mode);
 }
 flush_put_bits(&pb);
@@ -260,16 +262,15 @@
 {
 unsigned int state = -1;
 srcsize -= get_bits_count(gb);
- while(srcsize-- > 0){
- state+= state + get_bits1(gb);
- if((state & 0xFFF) == 1)
+ while (srcsize-- > 0) {
+ state += state + get_bits1(gb);
+ if ((state & 0xFFF) == 1)
 return 0;
 }
 return -1;
 }
 
-int ff_ccitt_unpack(AVCodecContext *avctx,
- const uint8_t *src, int srcsize,
+int ff_ccitt_unpack(AVCodecContext *avctx, const uint8_t *src, int srcsize,
 uint8_t *dst, int height, int stride,
 enum TiffCompr compr, int opts)
 {
@@ -277,48 +278,53 @@
 GetBitContext gb;
 int *runs, *ref = NULL, *runend;
 int ret;
- int runsize= avctx->width + 2;
- int err = 0;
+ int runsize = avctx->width + 2;
 
 runs = av_malloc(runsize * sizeof(runs[0]));
 ref = av_malloc(runsize * sizeof(ref[0]));
- if (!runs || ! ref) {
- err = AVERROR(ENOMEM);
+ if (!runs || !ref) {
+ ret = AVERROR(ENOMEM);
 goto fail;
 }
 ref[0] = avctx->width;
 ref[1] = 0;
 ref[2] = 0;
- init_get_bits(&gb, src, srcsize*8);
- for(j = 0; j < height; j++){
+ init_get_bits(&gb, src, srcsize * 8);
+ for (j = 0; j < height; j++) {
 runend = runs + runsize;
- if(compr == TIFF_G4){
- ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ref);
- if(ret < 0){
- err = -1;
+ if (compr == TIFF_G4) {
+ ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend,
+ ref);
+ if (ret < 0)
 goto fail;
- }
- }else{
+ } else {
 int g3d1 = (compr == TIFF_G3) && !(opts & 1);
- if(compr!=TIFF_CCITT_RLE && find_group3_syncmarker(&gb, srcsize*8) < 0)
+ if (compr != TIFF_CCITT_RLE &&
+ find_group3_syncmarker(&gb, srcsize * 8) < 0)
 break;
- if(compr==TIFF_CCITT_RLE || g3d1 || get_bits1(&gb))
- ret = decode_group3_1d_line(avctx, &gb, avctx->width, runs, runend);
+ if (compr == TIFF_CCITT_RLE || g3d1 || get_bits1(&gb))
+ ret = decode_group3_1d_line(avctx, &gb, avctx->width, runs,
+ runend);
 else
- ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ref);
- if(compr==TIFF_CCITT_RLE)
+ ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs,
+ runend, ref);
+ if (compr == TIFF_CCITT_RLE)
 align_get_bits(&gb);
 }
- if(ret < 0){
+ if (avctx->err_recognition & AV_EF_EXPLODE && ret < 0)
+ goto fail;
+
+ if (ret < 0) {
 put_line(dst, stride, avctx->width, ref);
- }else{
+ } else {
 put_line(dst, stride, avctx->width, runs);
- FFSWAP(int*, runs, ref);
+ FFSWAP(int *, runs, ref);
 }
 dst += stride;
 }
+ ret = 0;
 fail:
 av_free(runs);
 av_free(ref);
- return err;
+ return ret;
 }

libav-v9.6.tar.bz2/libavcodec/fft-fixed-test.c -> libav-v10.1.tar.bz2/libavcodec/fft-fixed-test.c Changed

libav-v9.6.tar.bz2/libavcodec/fft-internal.h -> libav-v10.1.tar.bz2/libavcodec/fft-internal.h Changed

libav-v9.6.tar.bz2/libavcodec/fft-test.c -> libav-v10.1.tar.bz2/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
@@ -37,6 +37,7 @@
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -50,7 +51,7 @@
 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"
@@ -147,7 +148,7 @@
 }
 }
 
-#if CONFIG_FFT_FLOAT
+#if FFT_FLOAT
 static void idct_ref(float *output, float *input, int nbits)
 {
 int n = 1<<nbits;
@@ -247,7 +248,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;
@@ -319,7 +320,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");
@@ -374,7 +375,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) {
@@ -443,7 +444,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);
@@ -473,7 +474,7 @@
 case TRANSFORM_FFT:
 ff_fft_end(s);
 break;
-#if CONFIG_FFT_FLOAT
+#if FFT_FLOAT
 case TRANSFORM_RDFT:
 ff_rdft_end(r);
 break;
@@ -489,5 +490,8 @@
 av_free(tab_ref);
 av_free(exptab);
 
- return err;
+ if (err)
+ printf("Error: %d.\n", err);
+
+ return !!err;
 }

libav-v9.6.tar.bz2/libavcodec/fft.h -> libav-v10.1.tar.bz2/libavcodec/fft.h Changed

libav-v9.6.tar.bz2/libavcodec/fft_fixed.c -> libav-v10.1.tar.bz2/libavcodec/fft_fixed.c Changed

libav-v9.6.tar.bz2/libavcodec/fft_float.c -> libav-v10.1.tar.bz2/libavcodec/fft_float.c Changed

libav-v10.1.tar.bz2/libavcodec/fft_template.c Added

@@ -0,0 +1,352 @@
+/*
+ * 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 Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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"
+
+/* 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),
+};
+
+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
+ 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_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;
+#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);
+ }
+
+ if (s->fft_permutation == FF_FFT_PERM_AVX) {
+ fft_perm_avx(s);
+ } else {
+ for(i=0; i<n; i++) {
+ int 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);
+}
+
+#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);
+}

libav-v9.6.tar.bz2/libavcodec/ffv1.c -> libav-v10.1.tar.bz2/libavcodec/ffv1.c Changed

@@ -25,11 +25,11 @@
 * FF Video Codec 1 (a lossless codec)
 */
 
+#include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "put_bits.h"
-#include "dsputil.h"
 #include "rangecoder.h"
 #include "golomb.h"
 #include "mathops.h"
@@ -131,7 +131,7 @@
 };
 
 
-int ffv1_common_init(AVCodecContext *avctx)
+av_cold int ffv1_common_init(AVCodecContext *avctx)
 {
 FFV1Context *s = avctx->priv_data;
 
@@ -141,8 +141,6 @@
 if (!avctx->width || !avctx->height)
 return AVERROR_INVALIDDATA;
 
- avcodec_get_frame_defaults(&s->picture);
-
 ff_dsputil_init(&s->dsp, avctx);
 
 s->width = avctx->width;
@@ -194,6 +192,10 @@
 int i;
 
 f->slice_count = f->num_h_slices * f->num_v_slices;
+ if (f->slice_count <= 0) {
+ av_log(f->avctx, AV_LOG_ERROR, "Invalid number of slices\n");
+ return AVERROR(EINVAL);
+ }
 
 for (i = 0; i < f->slice_count; i++) {
 FFV1Context *fs = av_mallocz(sizeof(*fs));
@@ -267,11 +269,6 @@
 FFV1Context *s = avctx->priv_data;
 int i, j;
 
- if (avctx->codec->decode && s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
- if (avctx->codec->decode && s->last_picture.data[0])
- avctx->release_buffer(avctx, &s->last_picture);
-
 for (j = 0; j < s->slice_count; j++) {
 FFV1Context *fs = s->slice_context[j];
 for (i = 0; i < s->plane_count; i++) {

libav-v9.6.tar.bz2/libavcodec/ffv1.h -> libav-v10.1.tar.bz2/libavcodec/ffv1.h Changed

libav-v9.6.tar.bz2/libavcodec/ffv1dec.c -> libav-v10.1.tar.bz2/libavcodec/ffv1dec.c Changed

@@ -30,11 +30,11 @@
 #include "libavutil/crc.h"
 #include "libavutil/opt.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "internal.h"
 #include "get_bits.h"
 #include "put_bits.h"
-#include "dsputil.h"
 #include "rangecoder.h"
 #include "golomb.h"
 #include "mathops.h"
@@ -317,16 +317,16 @@
 
 ps = get_symbol(c, state, 0);
 if (ps == 1) {
- f->picture.interlaced_frame = 1;
- f->picture.top_field_first = 1;
+ f->cur->interlaced_frame = 1;
+ f->cur->top_field_first = 1;
 } else if (ps == 2) {
- f->picture.interlaced_frame = 1;
- f->picture.top_field_first = 0;
+ f->cur->interlaced_frame = 1;
+ f->cur->top_field_first = 0;
 } else if (ps == 3) {
- f->picture.interlaced_frame = 0;
+ f->cur->interlaced_frame = 0;
 }
- f->picture.sample_aspect_ratio.num = get_symbol(c, state, 0);
- f->picture.sample_aspect_ratio.den = get_symbol(c, state, 0);
+ f->cur->sample_aspect_ratio.num = get_symbol(c, state, 0);
+ f->cur->sample_aspect_ratio.den = get_symbol(c, state, 0);
 
 return 0;
 }
@@ -336,10 +336,10 @@
 FFV1Context *fs = *(void **)arg;
 FFV1Context *f = fs->avctx->priv_data;
 int width, height, x, y, ret;
- const int ps = (av_pix_fmt_desc_get(c->pix_fmt)->flags & PIX_FMT_PLANAR)
+ const int ps = (av_pix_fmt_desc_get(c->pix_fmt)->flags & AV_PIX_FMT_FLAG_PLANAR)
 ? (c->bits_per_raw_sample > 8) + 1
 : 4;
- AVFrame *const p = &f->picture;
+ AVFrame *const p = f->cur;
 
 if (f->version > 2) {
 if (decode_slice_header(f, fs) < 0) {
@@ -349,7 +349,7 @@
 }
 if ((ret = ffv1_init_slice_state(f, fs)) < 0)
 return ret;
- if (f->picture.key_frame)
+ if (f->cur->key_frame)
 ffv1_clear_slice_state(f, fs);
 width = fs->slice_width;
 height = fs->slice_height;
@@ -670,6 +670,7 @@
 return AVERROR(ENOSYS);
 }
 switch (f->avctx->bits_per_raw_sample) {
+ case 0:
 case 8:
 f->avctx->pix_fmt = AV_PIX_FMT_RGB32;
 break;
@@ -784,6 +785,10 @@
 
 ffv1_common_init(avctx);
 
+ f->last_picture = av_frame_alloc();
+ if (!f->last_picture)
+ return AVERROR(ENOMEM);
+
 if (avctx->extradata && (ret = read_extra_header(f)) < 0)
 return ret;
 
@@ -800,16 +805,12 @@
 int buf_size = avpkt->size;
 FFV1Context *f = avctx->priv_data;
 RangeCoder *const c = &f->slice_context[0]->c;
- AVFrame *const p = &f->picture;
 int i, ret;
 uint8_t keystate = 128;
 const uint8_t *buf_p;
+ AVFrame *const p = data;
 
- AVFrame *picture = data;
-
- /* release previously stored data */
- if (p->data[0])
- avctx->release_buffer(avctx, p);
+ f->cur = p;
 
 ff_init_range_decoder(c, buf, buf_size);
 ff_build_rac_states(c, 0.05 * (1LL << 32), 256 - 8);
@@ -830,8 +831,7 @@
 p->key_frame = 0;
 }
 
- p->reference = 3; //for error concealment
- if ((ret = ff_get_buffer(avctx, p)) < 0) {
+ if ((ret = ff_get_buffer(avctx, p, AV_GET_BUFFER_FLAG_REF)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -870,6 +870,8 @@
 ff_init_range_decoder(&fs->c, buf_p, v);
 } else
 fs->c.bytestream_end = (uint8_t *)(buf_p + v);
+
+ fs->cur = p;
 }
 
 avctx->execute(avctx, decode_slice, &f->slice_context[0], NULL,
@@ -879,20 +881,20 @@
 for (i = f->slice_count - 1; i >= 0; i--) {
 FFV1Context *fs = f->slice_context[i];
 int j;
- if (fs->slice_damaged && f->last_picture.data[0]) {
+ if (fs->slice_damaged && f->last_picture->data[0]) {
 const uint8_t *src[4];
 uint8_t *dst[4];
 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] = f->picture.data[j] + f->picture.linesize[j] *
+ dst[j] = p->data[j] + p->linesize[j] *
 (fs->slice_y >> sv) + (fs->slice_x >> sh);
- src[j] = f->last_picture.data[j] +
- f->last_picture.linesize[j] *
+ src[j] = f->last_picture->data[j] +
+ f->last_picture->linesize[j] *
 (fs->slice_y >> sv) + (fs->slice_x >> sh);
 }
- av_image_copy(dst, f->picture.linesize, (const uint8_t **)src,
- f->last_picture.linesize,
+ av_image_copy(dst, p->linesize, (const uint8_t **)src,
+ f->last_picture->linesize,
 avctx->pix_fmt, fs->slice_width,
 fs->slice_height);
 }
@@ -900,23 +902,36 @@
 
 f->picture_number++;
 
- *picture = *p;
- *got_frame = 1;
+ av_frame_unref(f->last_picture);
+ if ((ret = av_frame_ref(f->last_picture, p)) < 0)
+ return ret;
+ f->cur = NULL;
 
- FFSWAP(AVFrame, f->picture, f->last_picture);
+ *got_frame = 1;
 
 return buf_size;
 }
 
+static av_cold int ffv1_decode_close(AVCodecContext *avctx)
+{
+ FFV1Context *s = avctx->priv_data;;
+
+ av_frame_free(&s->last_picture);
+
+ ffv1_close(avctx);
+
+ return 0;
+}
+
 AVCodec ff_ffv1_decoder = {
 .name = "ffv1",
+ .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_FFV1,
 .priv_data_size = sizeof(FFV1Context),
 .init = ffv1_decode_init,
- .close = ffv1_close,
+ .close = ffv1_decode_close,
 .decode = ffv1_decode_frame,
 .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/ |
 CODEC_CAP_SLICE_THREADS,
- .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"),
 };

libav-v9.6.tar.bz2/libavcodec/ffv1enc.c -> libav-v10.1.tar.bz2/libavcodec/ffv1enc.c Changed

@@ -25,6 +25,7 @@
 * FF Video Codec 1 (a lossless codec) encoder
 */
 
+#include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/crc.h"
@@ -34,7 +35,6 @@
 #include "internal.h"
 #include "get_bits.h"
 #include "put_bits.h"
-#include "dsputil.h"
 #include "rangecoder.h"
 #include "golomb.h"
 #include "mathops.h"
@@ -545,7 +545,7 @@
 return print;
 }
 
-static int init_slices_state(FFV1Context *f)
+static av_cold int init_slices_state(FFV1Context *f)
 {
 int i, ret;
 for (i = 0; i < f->slice_count; i++) {
@@ -721,7 +721,12 @@
 if ((ret = ffv1_allocate_initial_states(s)) < 0)
 return ret;
 
- 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;
+
 if (!s->transparency)
 s->plane_count = 2;
 
@@ -858,12 +863,12 @@
 put_symbol(c, state, f->plane[j].quant_table_index, 0);
 av_assert0(f->plane[j].quant_table_index == f->avctx->context_model);
 }
- if (!f->picture.interlaced_frame)
+ if (!f->avctx->coded_frame->interlaced_frame)
 put_symbol(c, state, 3, 0);
 else
- put_symbol(c, state, 1 + !f->picture.top_field_first, 0);
- put_symbol(c, state, f->picture.sample_aspect_ratio.num, 0);
- put_symbol(c, state, f->picture.sample_aspect_ratio.den, 0);
+ put_symbol(c, state, 1 + !f->avctx->coded_frame->top_field_first, 0);
+ put_symbol(c, state, f->avctx->coded_frame->sample_aspect_ratio.num, 0);
+ put_symbol(c, state, f->avctx->coded_frame->sample_aspect_ratio.den, 0);
 }
 
 static int encode_slice(AVCodecContext *c, void *arg)
@@ -874,12 +879,12 @@
 int height = fs->slice_height;
 int x = fs->slice_x;
 int y = fs->slice_y;
- AVFrame *const p = &f->picture;
- const int ps = (av_pix_fmt_desc_get(c->pix_fmt)->flags & PIX_FMT_PLANAR)
+ const AVFrame *const p = f->frame;
+ const int ps = (av_pix_fmt_desc_get(c->pix_fmt)->flags & AV_PIX_FMT_FLAG_PLANAR)
 ? (f->bits_per_raw_sample > 8) + 1
 : 4;
 
- 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);
@@ -926,12 +931,14 @@
 {
 FFV1Context *f = avctx->priv_data;
 RangeCoder *const c = &f->slice_context[0]->c;
- AVFrame *const p = &f->picture;
+ AVFrame *const p = avctx->coded_frame;
 int used_count = 0;
 uint8_t keystate = 128;
 uint8_t *buf_p;
 int i, ret;
 
+ f->frame = pict;
+
 if ((ret = ff_alloc_packet(pkt, avctx->width * avctx->height *
 ((8 * 2 + 1 + 1) * 4) / 8 +
 FF_MIN_BUFFER_SIZE)) < 0) {
@@ -942,9 +949,6 @@
 ff_init_range_encoder(c, pkt->data, pkt->size);
 ff_build_rac_states(c, 0.05 * (1LL << 32), 256 - 8);
 
- *p = *pict;
- p->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;
@@ -1054,6 +1058,13 @@
 return 0;
 }
 
+static av_cold int ffv1_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[] = {
@@ -1076,12 +1087,13 @@
 
 AVCodec ff_ffv1_encoder = {
 .name = "ffv1",
+ .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_FFV1,
 .priv_data_size = sizeof(FFV1Context),
 .init = ffv1_encode_init,
 .encode2 = ffv1_encode_frame,
- .close = ffv1_close,
+ .close = ffv1_encode_close,
 .capabilities = CODEC_CAP_SLICE_THREADS,
 .pix_fmts = (const enum AVPixelFormat[]) {
 AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P,
@@ -1096,7 +1108,6 @@
 AV_PIX_FMT_NONE
 
 },
- .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"),
 .defaults = ffv1_defaults,
 .priv_class = &class,
 };

libav-v10.1.tar.bz2/libavcodec/fic.c Added

@@ -0,0 +1,303 @@
+/*
+ * Mirillis FIC decoder
+ *
+ * Copyright (c) 2014 Konstantin Shishkov
+ * Copyright (c) 2014 Derek Buitenhuis
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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);
+ }
+
+ for (slice = 0; slice < nslices; slice++) {
+ int slice_off = AV_RB32(src + tsize + FIC_HEADER_SIZE + slice * 4);
+ int 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);
+ }
+
+ slice_size -= slice_off;
+
+ if (slice_off > msize || slice_off + slice_size > msize)
+ continue;
+
+ 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,
+};

libav-v10.1.tar.bz2/libavcodec/file_open.c Added

libav-v9.6.tar.bz2/libavcodec/flac.c -> libav-v10.1.tar.bz2/libavcodec/flac.c Changed

@@ -29,13 +29,15 @@
 
 static const int8_t sample_size_table[] = { 0, 8, 12, 0, 16, 20, 24, 0 };
 
-static const int64_t flac_channel_layouts[6] = {
+static const uint64_t flac_channel_layouts[8] = {
 AV_CH_LAYOUT_MONO,
 AV_CH_LAYOUT_STEREO,
 AV_CH_LAYOUT_SURROUND,
 AV_CH_LAYOUT_QUAD,
 AV_CH_LAYOUT_5POINT0,
- AV_CH_LAYOUT_5POINT1
+ AV_CH_LAYOUT_5POINT1,
+ AV_CH_LAYOUT_6POINT1,
+ AV_CH_LAYOUT_7POINT1
 };
 
 static int64_t get_utf8(GetBitContext *gb)
@@ -53,7 +55,7 @@
 /* frame sync code */
 if ((get_bits(gb, 15) & 0x7FFF) != 0x7FFC) {
 av_log(avctx, AV_LOG_ERROR + log_level_offset, "invalid sync code\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 /* variable block size stream code */
@@ -74,7 +76,7 @@
 } else {
 av_log(avctx, AV_LOG_ERROR + log_level_offset,
 "invalid channel mode: %d\n", fi->ch_mode);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 /* bits per sample */
@@ -83,7 +85,7 @@
 av_log(avctx, AV_LOG_ERROR + log_level_offset,
 "invalid sample size code (%d)\n",
 bps_code);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 fi->bps = sample_size_table[bps_code];
 
@@ -91,7 +93,7 @@
 if (get_bits1(gb)) {
 av_log(avctx, AV_LOG_ERROR + log_level_offset,
 "broken stream, invalid padding\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 /* sample or frame count */
@@ -99,14 +101,14 @@
 if (fi->frame_or_sample_num < 0) {
 av_log(avctx, AV_LOG_ERROR + log_level_offset,
 "sample/frame number invalid; utf8 fscked\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 /* blocksize */
 if (bs_code == 0) {
 av_log(avctx, AV_LOG_ERROR + log_level_offset,
 "reserved blocksize code: 0\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 } else if (bs_code == 6) {
 fi->blocksize = get_bits(gb, 8) + 1;
 } else if (bs_code == 7) {
@@ -128,7 +130,7 @@
 av_log(avctx, AV_LOG_ERROR + log_level_offset,
 "illegal sample rate code %d\n",
 sr_code);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 /* header CRC-8 check */
@@ -137,7 +139,7 @@
 get_bits_count(gb)/8)) {
 av_log(avctx, AV_LOG_ERROR + log_level_offset,
 "header crc mismatch\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 return 0;

libav-v9.6.tar.bz2/libavcodec/flac_parser.c -> libav-v10.1.tar.bz2/libavcodec/flac_parser.c Changed

@@ -27,11 +27,12 @@
 * Each time it finds and verifies a CRC-8 header it sees which of the
 * FLAC_MAX_SEQUENTIAL_HEADERS that came before it have a valid CRC-16 footer
 * that ends at the newly found header.
- * Headers are scored by FLAC_HEADER_BASE_SCORE plus the max of it's crc-verified
+ * Headers are scored by FLAC_HEADER_BASE_SCORE plus the max of its crc-verified
 * children, penalized by changes in sample rate, frame number, etc.
 * The parser returns the frame with the highest score.
 **/
 
+#include "libavutil/attributes.h"
 #include "libavutil/crc.h"
 #include "libavutil/fifo.h"
 #include "bytestream.h"
@@ -458,7 +459,7 @@
 }
 
 if (header->fi.channels != fpc->avctx->channels ||
- (!fpc->avctx->channel_layout && header->fi.channels <= 6)) {
+ !fpc->avctx->channel_layout) {
 fpc->avctx->channels = header->fi.channels;
 ff_flac_set_channel_layout(fpc->avctx);
 }
@@ -653,7 +654,7 @@
 return read_end - buf;
 }
 
-static int flac_parse_init(AVCodecParserContext *c)
+static av_cold int flac_parse_init(AVCodecParserContext *c)
 {
 FLACParseContext *fpc = c->priv_data;
 fpc->pc = c;

libav-v9.6.tar.bz2/libavcodec/flacdec.c -> libav-v10.1.tar.bz2/libavcodec/flacdec.c Changed

@@ -44,14 +44,10 @@
 #include "flacdata.h"
 #include "flacdsp.h"
 
-#undef NDEBUG
-#include <assert.h>
-
 typedef struct FLACContext {
 FLACSTREAMINFO
 
 AVCodecContext *avctx; ///< parent AVCodecContext
- AVFrame frame;
 GetBitContext gb; ///< GetBitContext initialized to start at the current frame
 
 int blocksize; ///< number of samples in the current frame
@@ -104,7 +100,7 @@
 return 0;
 
 if (!avpriv_flac_is_extradata_valid(avctx, &format, &streaminfo))
- return -1;
+ return AVERROR_INVALIDDATA;
 
 /* initialize based on the demuxer-supplied streamdata header */
 avpriv_flac_parse_streaminfo(avctx, (FLACStreaminfo *)s, streaminfo);
@@ -115,9 +111,6 @@
 ff_flacdsp_init(&s->dsp, avctx->sample_fmt, s->bps);
 s->got_streaminfo = 1;
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
@@ -134,8 +127,6 @@
 {
 int buf_size;
 
- assert(s->max_blocksize);
-
 buf_size = av_samples_get_buffer_size(NULL, s->channels, s->max_blocksize,
 AV_SAMPLE_FMT_S32P, 0);
 if (buf_size < 0)
@@ -218,7 +209,7 @@
 if (method_type > 1) {
 av_log(s->avctx, AV_LOG_ERROR, "illegal residual coding method %d\n",
 method_type);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 rice_order = get_bits(&s->gb, 4);
@@ -227,7 +218,7 @@
 if (pred_order > samples) {
 av_log(s->avctx, AV_LOG_ERROR, "invalid predictor order: %i > %i\n",
 pred_order, samples);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 rice_bits = 4 + method_type;
@@ -256,15 +247,15 @@
 int pred_order, int bps)
 {
 const int blocksize = s->blocksize;
- int a, b, c, d, i;
+ int a, b, c, d, i, ret;
 
 /* warm up samples */
 for (i = 0; i < pred_order; i++) {
 decoded[i] = get_sbits_long(&s->gb, bps);
 }
 
- if (decode_residuals(s, decoded, pred_order) < 0)
- return -1;
+ if ((ret = decode_residuals(s, decoded, pred_order)) < 0)
+ return ret;
 
 if (pred_order > 0)
 a = decoded[pred_order-1];
@@ -296,7 +287,7 @@
 break;
 default:
 av_log(s->avctx, AV_LOG_ERROR, "illegal pred order %d\n", pred_order);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 return 0;
@@ -305,7 +296,7 @@
 static int decode_subframe_lpc(FLACContext *s, int32_t *decoded, int pred_order,
 int bps)
 {
- int i;
+ int i, ret;
 int coeff_prec, qlevel;
 int coeffs[32];
 
@@ -317,21 +308,21 @@
 coeff_prec = get_bits(&s->gb, 4) + 1;
 if (coeff_prec == 16) {
 av_log(s->avctx, AV_LOG_ERROR, "invalid coeff precision\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 qlevel = get_sbits(&s->gb, 5);
 if (qlevel < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "qlevel %d not supported, maybe buggy stream\n",
 qlevel);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 for (i = 0; i < pred_order; i++) {
 coeffs[pred_order - i - 1] = get_sbits(&s->gb, coeff_prec);
 }
 
- if (decode_residuals(s, decoded, pred_order) < 0)
- return -1;
+ if ((ret = decode_residuals(s, decoded, pred_order)) < 0)
+ return ret;
 
 s->dsp.lpc(decoded, coeffs, pred_order, qlevel, s->blocksize);
 
@@ -343,7 +334,7 @@
 int32_t *decoded = s->decoded[channel];
 int type, wasted = 0;
 int bps = s->bps;
- int i, tmp;
+ int i, tmp, ret;
 
 if (channel == 0) {
 if (s->ch_mode == FLAC_CHMODE_RIGHT_SIDE)
@@ -355,7 +346,7 @@
 
 if (get_bits1(&s->gb)) {
 av_log(s->avctx, AV_LOG_ERROR, "invalid subframe padding\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 type = get_bits(&s->gb, 6);
 
@@ -375,7 +366,7 @@
 bps -= wasted;
 }
 if (bps > 32) {
- av_log_missing_feature(s->avctx, "Decorrelated bit depth > 32", 0);
+ avpriv_report_missing_feature(s->avctx, "Decorrelated bit depth > 32");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -388,14 +379,14 @@
 for (i = 0; i < s->blocksize; i++)
 decoded[i] = get_sbits_long(&s->gb, bps);
 } else if ((type >= 8) && (type <= 12)) {
- if (decode_subframe_fixed(s, decoded, type & ~0x8, bps) < 0)
- return -1;
+ if ((ret = decode_subframe_fixed(s, decoded, type & ~0x8, bps)) < 0)
+ return ret;
 } else if (type >= 32) {
- if (decode_subframe_lpc(s, decoded, (type & ~0x20)+1, bps) < 0)
- return -1;
+ if ((ret = decode_subframe_lpc(s, decoded, (type & ~0x20)+1, bps)) < 0)
+ return ret;
 } else {
 av_log(s->avctx, AV_LOG_ERROR, "invalid coding type\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 if (wasted) {
@@ -413,9 +404,9 @@
 GetBitContext *gb = &s->gb;
 FLACFrameInfo fi;
 
- if (ff_flac_decode_frame_header(s->avctx, gb, &fi, 0)) {
+ if ((ret = ff_flac_decode_frame_header(s->avctx, gb, &fi, 0)) < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "invalid frame header\n");
- return -1;
+ return ret;
 }
 
 if (s->channels && fi.channels != s->channels && s->got_streaminfo) {
@@ -426,20 +417,20 @@
 return ret;
 }
 s->channels = s->avctx->channels = fi.channels;
- if (!s->avctx->channel_layout && s->channels <= 6)
+ if (!s->avctx->channel_layout)
 ff_flac_set_channel_layout(s->avctx);
 s->ch_mode = fi.ch_mode;
 
 if (!s->bps && !fi.bps) {
 av_log(s->avctx, AV_LOG_ERROR, "bps not found in STREAMINFO or frame header\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (!fi.bps) {
 fi.bps = s->bps;
 } else if (s->bps && fi.bps != s->bps) {
 av_log(s->avctx, AV_LOG_ERROR, "switching bps mid-stream is not "
 "supported\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 if (!s->bps) {
@@ -452,14 +443,14 @@
 if (fi.blocksize > s->max_blocksize) {
 av_log(s->avctx, AV_LOG_ERROR, "blocksize %d > %d\n", fi.blocksize,
 s->max_blocksize);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 s->blocksize = fi.blocksize;
 
 if (!s->samplerate && !fi.samplerate) {
 av_log(s->avctx, AV_LOG_ERROR, "sample rate not found in STREAMINFO"
 " or frame header\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (fi.samplerate == 0)
 fi.samplerate = s->samplerate;
@@ -478,8 +469,8 @@
 
 /* subframes */
 for (i = 0; i < s->channels; i++) {
- if (decode_subframe(s, i) < 0)
- return -1;
+ if ((ret = decode_subframe(s, i)) < 0)
+ return ret;
 }
 
 align_get_bits(gb);
@@ -493,6 +484,7 @@
 static int flac_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 FLACContext *s = avctx->priv_data;
@@ -515,42 +507,41 @@
 
 /* check for inline header */
 if (AV_RB32(buf) == MKBETAG('f','L','a','C')) {
- if (!s->got_streaminfo && parse_streaminfo(s, buf, buf_size)) {
+ if (!s->got_streaminfo && (ret = parse_streaminfo(s, buf, buf_size))) {
 av_log(s->avctx, AV_LOG_ERROR, "invalid header\n");
- return -1;
+ return ret;
 }
 return get_metadata_size(buf, buf_size);
 }
 
 /* decode frame */
 init_get_bits(&s->gb, buf, buf_size*8);
- if (decode_frame(s) < 0) {
+ if ((ret = decode_frame(s)) < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "decode_frame() failed\n");
- return -1;
+ return ret;
 }
 bytes_read = (get_bits_count(&s->gb)+7)/8;
 
 /* get output buffer */
- s->frame.nb_samples = s->blocksize;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = s->blocksize;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
 
- s->dsp.decorrelate[s->ch_mode](s->frame.data, s->decoded, s->channels,
+ s->dsp.decorrelate[s->ch_mode](frame->data, s->decoded, s->channels,
 s->blocksize, s->sample_shift);
 
 if (bytes_read > buf_size) {
 av_log(s->avctx, AV_LOG_ERROR, "overread: %d\n", bytes_read - buf_size);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (bytes_read < buf_size) {
 av_log(s->avctx, AV_LOG_DEBUG, "underread: %d orig size: %d\n",
 buf_size - bytes_read, buf_size);
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
 return bytes_read;
 }
@@ -566,6 +557,7 @@
 
 AVCodec ff_flac_decoder = {
 .name = "flac",
+ .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_FLAC,
 .priv_data_size = sizeof(FLACContext),
@@ -573,7 +565,6 @@
 .close = flac_decode_close,
 .decode = flac_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16,
 AV_SAMPLE_FMT_S16P,
 AV_SAMPLE_FMT_S32,

libav-v9.6.tar.bz2/libavcodec/flacenc.c -> libav-v10.1.tar.bz2/libavcodec/flacenc.c Changed

@@ -394,12 +394,6 @@
 s->frame_count = 0;
 s->min_framesize = s->max_framesize;
 
-#if FF_API_OLD_ENCODE_AUDIO
- avctx->coded_frame = avcodec_alloc_frame();
- if (!avctx->coded_frame)
- return AVERROR(ENOMEM);
-#endif
-
 ret = ff_lpc_init(&s->lpc_ctx, avctx->frame_size,
 s->options.max_prediction_order, FF_LPC_TYPE_LEVINSON);
 
@@ -1238,7 +1232,7 @@
 
 frame_bytes = encode_frame(s);
 
- /* fallback to verbatim mode if the compressed frame is larger than it
+ /* Fall back on verbatim mode if the compressed frame is larger than it
 would be if encoded uncompressed. */
 if (frame_bytes < 0 || frame_bytes > s->max_framesize) {
 s->frame.verbatim_only = 1;
@@ -1285,9 +1279,6 @@
 }
 av_freep(&avctx->extradata);
 avctx->extradata_size = 0;
-#if FF_API_OLD_ENCODE_AUDIO
- av_freep(&avctx->coded_frame);
-#endif
 return 0;
 }
 
@@ -1327,6 +1318,7 @@
 
 AVCodec ff_flac_encoder = {
 .name = "flac",
+ .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_FLAC,
 .priv_data_size = sizeof(FlacEncodeContext),
@@ -1337,6 +1329,5 @@
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
 AV_SAMPLE_FMT_S32,
 AV_SAMPLE_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"),
 .priv_class = &flac_encoder_class,
 };

libav-v9.6.tar.bz2/libavcodec/flashsv.c -> libav-v10.1.tar.bz2/libavcodec/flashsv.c Changed

@@ -41,6 +41,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "get_bits.h"
+#include "internal.h"
 
 typedef struct BlockInfo {
 uint8_t *pos;
@@ -49,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;
@@ -68,14 +69,13 @@
 int diff_start, diff_height;
 } FlashSVContext;
 
-
 static int decode_hybrid(const uint8_t *sptr, 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 & 0x80) {
@@ -99,6 +99,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_free(s->tmpblock);
+
+ return 0;
+}
+
 static av_cold int flashsv_decode_init(AVCodecContext *avctx)
 {
 FlashSVContext *s = avctx->priv_data;
@@ -114,12 +127,16 @@
 return 1;
 }
 avctx->pix_fmt = AV_PIX_FMT_BGR24;
- s->frame.data[0] = NULL;
+
+ 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;
@@ -193,25 +210,28 @@
 }
 
 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),
+ decode_hybrid(s->tmpblock, 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);
 }
 skip_bits_long(gb, 8 * block_size); /* skip the consumed bits */
 return 0;
@@ -236,9 +256,9 @@
 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 h_blocks, v_blocks, h_part, v_part, i, j;
+ int buf_size = avpkt->size;
+ FlashSVContext *s = avctx->priv_data;
+ int h_blocks, v_blocks, h_part, v_part, i, j, ret;
 GetBitContext gb;
 
 /* no supplementary picture */
@@ -250,19 +270,19 @@
 init_get_bits(&gb, avpkt->data, buf_size * 8);
 
 /* 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 (s->ver == 2) {
 skip_bits(&gb, 6);
 if (get_bits1(&gb)) {
- av_log_missing_feature(avctx, "iframe", 1);
+ avpriv_request_sample(avctx, "iframe");
 return AVERROR_PATCHWELCOME;
 }
 if (get_bits1(&gb)) {
- av_log_missing_feature(avctx, "Custom palette", 1);
+ avpriv_request_sample(avctx, "Custom palette");
 return AVERROR_PATCHWELCOME;
 }
 }
@@ -276,23 +296,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;
 }
 }
 }
@@ -316,24 +338,22 @@
 /* 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);
- s->blocks = av_realloc(s->blocks,
- (v_blocks + !!v_part) * (h_blocks + !!h_part)
- * sizeof(s->blocks[0]));
+ if ((err = av_reallocp(&s->blocks, (v_blocks + !!v_part) *
+ (h_blocks + !!h_part) * sizeof(s->blocks[0]))) < 0)
+ return err;
 }
 
 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);
 
- s->frame.reference = 3;
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID |
- FF_BUFFER_HINTS_PRESERVE |
- FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, &s->frame) < 0) {
+ if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 /* loop over all block columns */
@@ -358,8 +378,7 @@
 s->diff_height = cur_blk_height;
 
 if (8 * size > get_bits_left(&gb)) {
- avctx->release_buffer(avctx, &s->frame);
- s->frame.data[0] = NULL;
+ av_frame_unref(s->frame);
 return AVERROR_INVALIDDATA;
 }
 
@@ -372,18 +391,25 @@
 
 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: %d + %d > %d\n",
+ s->diff_start, s->diff_height, cur_blk_height);
+ return AVERROR_INVALIDDATA;
+ }
 av_log(avctx, AV_LOG_DEBUG,
 "%dx%d diff start %d height %d\n",
 i, j, s->diff_start, s->diff_height);
@@ -396,14 +422,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;
- av_log_missing_feature(avctx, "zlibprime_curr", 1);
+ 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
@@ -411,12 +438,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 */
@@ -432,17 +460,20 @@
 }
 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)
+ return ret;
+
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
 if ((get_bits_count(&gb) / 8) != buf_size)
 av_log(avctx, AV_LOG_ERROR, "buffer not fully consumed (%d != %d)\n",
@@ -452,25 +483,10 @@
 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 */
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
-
- /* free the tmpblock */
- av_free(s->tmpblock);
-
- return 0;
-}
-
-
 #if CONFIG_FLASHSV_DECODER
 AVCodec ff_flashsv_decoder = {
 .name = "flashsv",
+ .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v1"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_FLASHSV,
 .priv_data_size = sizeof(FlashSVContext),
@@ -478,8 +494,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 },
- .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v1"),
+ .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE },
 };
 #endif /* CONFIG_FLASHSV_DECODER */
 
@@ -534,6 +549,7 @@
 
 AVCodec ff_flashsv2_decoder = {
 .name = "flashsv2",
+ .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v2"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_FLASHSV2,
 .priv_data_size = sizeof(FlashSVContext),
@@ -541,7 +557,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 },
- .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v2"),
+ .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE },
 };
 #endif /* CONFIG_FLASHSV2_DECODER */

libav-v9.6.tar.bz2/libavcodec/flashsvenc.c -> libav-v10.1.tar.bz2/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);
@@ -248,39 +266,25 @@
 
     //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"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_FLASHSV,
     .priv_data_size = sizeof(FlashSVContext),
@@ -288,5 +292,4 @@
     .encode2        = flashsv_encode_frame,
     .close          = flashsv_encode_end,
     .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE },
-    .long_name      = NULL_IF_CONFIG_SMALL("Flash Screen Video"),
 };

libav-v9.6.tar.bz2/libavcodec/flicvideo.c -> libav-v10.1.tar.bz2/libavcodec/flicvideo.c Changed

@@ -42,6 +42,7 @@
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "bytestream.h"
+#include "internal.h"
 #include "mathops.h"
 
 #define FLI_256_COLOR 4
@@ -65,12 +66,12 @@
 if (pixel_ptr + n > pixel_limit) { \
 av_log (s->avctx, AV_LOG_INFO, "Problem: pixel_ptr >= pixel_limit (%d >= %d)\n", \
 pixel_ptr + n, pixel_limit); \
- return -1; \
+ return AVERROR_INVALIDDATA; \
 } \
 
 typedef struct FlicDecodeContext {
 AVCodecContext *avctx;
- AVFrame frame;
+ AVFrame *frame;
 
 unsigned int palette[256];
 int new_palette;
@@ -116,13 +117,16 @@
 case 16 : avctx->pix_fmt = AV_PIX_FMT_RGB565; break;
 case 24 : avctx->pix_fmt = AV_PIX_FMT_BGR24; /* Supposedly BGR, but havent any files to test with */
 av_log(avctx, AV_LOG_ERROR, "24Bpp FLC/FLX is unsupported due to no test files.\n");
- return -1;
+ return AVERROR_PATCHWELCOME;
 default :
 av_log(avctx, AV_LOG_ERROR, "Unknown FLC/FLX depth of %d Bpp is unsupported.\n",depth);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- s->frame.data[0] = NULL;
+ s->frame = av_frame_alloc();
+ if (!s->frame)
+ return AVERROR(ENOMEM);
+
 s->new_palette = 0;
 
 return 0;
@@ -147,7 +151,7 @@
 unsigned int chunk_size;
 int chunk_type;
 
- int i, j;
+ int i, j, ret;
 
 int color_packets;
 int color_changes;
@@ -167,15 +171,13 @@
 
 bytestream2_init(&g2, buf, buf_size);
 
- s->frame.reference = 1;
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, &s->frame) < 0) {
+ if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ 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 */
 num_chunks = bytestream2_get_le16(&g2);
@@ -249,12 +251,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 {
@@ -285,7 +287,7 @@
 }
 }
 
- y_ptr += s->frame.linesize[0];
+ y_ptr += s->frame->linesize[0];
 }
 }
 break;
@@ -294,7 +296,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) {
@@ -325,7 +327,7 @@
 }
 }
 
- y_ptr += s->frame.linesize[0];
+ y_ptr += s->frame->linesize[0];
 compressed_lines--;
 }
 break;
@@ -333,7 +335,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:
@@ -376,7 +378,7 @@
 }
 }
 
- y_ptr += s->frame.linesize[0];
+ y_ptr += s->frame->linesize[0];
 }
 break;
 
@@ -387,8 +389,8 @@
 "bigger than image, 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);
 }
@@ -418,14 +420,16 @@
 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)
+ return ret;
+
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
 return buf_size;
 }
@@ -448,7 +452,7 @@
 unsigned int chunk_size;
 int chunk_type;
 
- int i, j;
+ int i, j, ret;
 
 int lines;
 int compressed_lines;
@@ -463,15 +467,13 @@
 
 bytestream2_init(&g2, buf, buf_size);
 
- s->frame.reference = 1;
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, &s->frame) < 0) {
+ if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ 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 */
@@ -505,7 +507,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;
@@ -534,20 +536,20 @@
 }
 }
 
- y_ptr += s->frame.linesize[0];
+ y_ptr += s->frame->linesize[0];
 }
 }
 break;
 
 case FLI_LC:
- av_log(avctx, AV_LOG_ERROR, "Unexpected FLI_LC chunk in non-paletised FLC\n");
+ av_log(avctx, AV_LOG_ERROR, "Unexpected FLI_LC chunk in non-palettized FLC\n");
 bytestream2_skip(&g2, chunk_size - 6);
 break;
 
 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:
@@ -598,7 +600,7 @@
 pixel_ptr += 2;
 }
 #endif
- y_ptr += s->frame.linesize[0];
+ y_ptr += s->frame->linesize[0];
 }
 break;
 
@@ -638,7 +640,7 @@
 }
 }
 
- y_ptr += s->frame.linesize[0];
+ y_ptr += s->frame->linesize[0];
 }
 break;
 
@@ -651,8 +653,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;
@@ -685,9 +687,10 @@
 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)
+ return ret;
 
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
 return buf_size;
 }
@@ -697,7 +700,7 @@
 const uint8_t *buf, int buf_size)
 {
 av_log(avctx, AV_LOG_ERROR, "24Bpp FLC Unsupported due to lack of test files.\n");
- return -1;
+ return AVERROR_PATCHWELCOME;
 }
 
 static int flic_decode_frame(AVCodecContext *avctx,
@@ -725,7 +728,7 @@
 /* the finite set of possibilites allowable by here. */
 /* But in case we do, just error out. */
 av_log(avctx, AV_LOG_ERROR, "Unknown FLC format, my science cannot explain how this happened.\n");
- return -1;
+ return AVERROR_BUG;
 }
 
 
@@ -733,14 +736,14 @@
 {
 FlicDecodeContext *s = avctx->priv_data;
 
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ av_frame_free(&s->frame);
 
 return 0;
 }
 
 AVCodec ff_flic_decoder = {
 .name = "flic",
+ .long_name = NULL_IF_CONFIG_SMALL("Autodesk Animator Flic video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_FLIC,
 .priv_data_size = sizeof(FlicDecodeContext),
@@ -748,5 +751,4 @@
 .close = flic_decode_end,
 .decode = flic_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Autodesk Animator Flic video"),
 };

libav-v9.6.tar.bz2/libavcodec/flvdec.c -> libav-v10.1.tar.bz2/libavcodec/flvdec.c Changed

libav-v9.6.tar.bz2/libavcodec/flvenc.c -> libav-v10.1.tar.bz2/libavcodec/flvenc.c Changed

libav-v9.6.tar.bz2/libavcodec/fmtconvert.c -> libav-v10.1.tar.bz2/libavcodec/fmtconvert.c Changed

@@ -24,12 +24,23 @@
 #include "fmtconvert.h"
 #include "libavutil/common.h"
 
-static void int32_to_float_fmul_scalar_c(float *dst, const int *src, float mul, int len){
+static void int32_to_float_fmul_scalar_c(float *dst, const int32_t *src,
+ float mul, int len)
+{
 int i;
 for(i=0; i<len; i++)
 dst[i] = src[i] * mul;
 }
 
+static void int32_to_float_fmul_array8_c(FmtConvertContext *c, float *dst,
+ const int32_t *src, const float *mul,
+ int len)
+{
+ int i;
+ for (i = 0; i < len; i += 8)
+ c->int32_to_float_fmul_scalar(&dst[i], &src[i], *mul++, 8);
+}
+
 static av_always_inline int float_to_int16_one(const float *src){
 return av_clip_int16(lrintf(*src));
 }
@@ -79,11 +90,12 @@
 av_cold void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx)
 {
 c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_c;
+ c->int32_to_float_fmul_array8 = int32_to_float_fmul_array8_c;
 c->float_to_int16 = float_to_int16_c;
 c->float_to_int16_interleave = float_to_int16_interleave_c;
 c->float_interleave = ff_float_interleave_c;
 
 if (ARCH_ARM) ff_fmt_convert_init_arm(c, avctx);
- if (HAVE_ALTIVEC) ff_fmt_convert_init_altivec(c, avctx);
+ if (ARCH_PPC) ff_fmt_convert_init_ppc(c, avctx);
 if (ARCH_X86) ff_fmt_convert_init_x86(c, avctx);
 }

libav-v9.6.tar.bz2/libavcodec/fmtconvert.h -> libav-v10.1.tar.bz2/libavcodec/fmtconvert.h Changed

@@ -35,7 +35,24 @@
      * @param len number of elements to convert.
      *            constraints: multiple of 8
      */
-    void (*int32_to_float_fmul_scalar)(float *dst, const int *src, float mul, int len);
+    void (*int32_to_float_fmul_scalar)(float *dst, const int32_t *src,
+                                       float mul, int len);
+
+    /**
+     * Convert an array of int32_t to float and multiply by a float value from another array,
+     * stepping along the float array once for each 8 integers.
+     * @param c   pointer to FmtConvertContext.
+     * @param dst destination array of float.
+     *            constraints: 16-byte aligned
+     * @param src source array of int32_t.
+     *            constraints: 16-byte aligned
+     * @param mul source array of float multipliers.
+     * @param len number of elements to convert.
+     *            constraints: multiple of 8
+     */
+    void (*int32_to_float_fmul_array8)(struct FmtConvertContext *c,
+                                       float *dst, const int32_t *src,
+                                       const float *mul, int len);
 
     /**
      * Convert an array of float to an array of int16_t.
@@ -87,10 +104,10 @@
 void ff_float_interleave_c(float *dst, const float **src, unsigned int len,
                            int channels);
 
-av_cold void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx);
+void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx);
 
 void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx);
-void ff_fmt_convert_init_altivec(FmtConvertContext *c, AVCodecContext *avctx);
+void ff_fmt_convert_init_ppc(FmtConvertContext *c, AVCodecContext *avctx);
 void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx);
 
 #endif /* AVCODEC_FMTCONVERT_H */

libav-v9.6.tar.bz2/libavcodec/fraps.c -> libav-v10.1.tar.bz2/libavcodec/fraps.c Changed

@@ -36,15 +36,16 @@
 #include "huffman.h"
 #include "bytestream.h"
 #include "dsputil.h"
+#include "internal.h"
 
 #define FPS_TAG MKTAG('F', 'P', 'S', 'x')
 
 /**
 * local variable storage
 */
-typedef struct FrapsContext{
+typedef struct FrapsContext {
 AVCodecContext *avctx;
- AVFrame frame;
+ AVFrame *frame;
 uint8_t *tmpbuf;
 int tmpbuf_size;
 DSPContext dsp;
@@ -60,12 +61,15 @@
 {
 FrapsContext * const s = avctx->priv_data;
 
- avctx->coded_frame = &s->frame;
- avctx->pix_fmt= AV_PIX_FMT_NONE; /* set in decode_frame */
+ avctx->pix_fmt = AV_PIX_FMT_NONE; /* set in decode_frame */
 
- s->avctx = avctx;
+ s->avctx = avctx;
 s->tmpbuf = NULL;
 
+ s->frame = av_frame_alloc();
+ if (!s->frame)
+ return AVERROR(ENOMEM);
+
 ff_dsputil_init(&s->dsp, avctx);
 
 return 0;
@@ -75,7 +79,8 @@
 * Comparator - our nodes should ascend by count
 * but with preserved symbol order
 */
-static int huff_cmp(const void *va, const void *vb){
+static int huff_cmp(const void *va, const void *vb)
+{
 const Node *a = va, *b = vb;
 return (a->count - b->count)*256 + a->sym - b->sym;
 }
@@ -87,31 +92,33 @@
 int h, const uint8_t *src, int size, int Uoff,
 const int step)
 {
- int i, j;
+ int i, j, ret;
 GetBitContext gb;
 VLC vlc;
 Node nodes[512];
 
- for(i = 0; i < 256; i++)
+ for (i = 0; i < 256; i++)
 nodes[i].count = bytestream_get_le32(&src);
 size -= 1024;
- if (ff_huff_build_tree(s->avctx, &vlc, 256, nodes, huff_cmp,
- FF_HUFFMAN_FLAG_ZERO_COUNT) < 0)
- return -1;
+ if ((ret = ff_huff_build_tree(s->avctx, &vlc, 256, nodes, huff_cmp,
+ FF_HUFFMAN_FLAG_ZERO_COUNT)) < 0)
+ return ret;
 /* we have built Huffman table and are ready to decode plane */
 
 /* convert bits so they may be used by standard bitreader */
 s->dsp.bswap_buf((uint32_t *)s->tmpbuf, (const uint32_t *)src, size >> 2);
 
 init_get_bits(&gb, s->tmpbuf, size * 8);
- for(j = 0; j < h; j++){
- for(i = 0; i < w*step; i += step){
+ for (j = 0; j < h; j++) {
+ for (i = 0; i < w*step; i += step) {
 dst[i] = get_vlc2(&gb, vlc.table, 9, 3);
 /* lines are stored as deltas between previous lines
 * and we need to add 0x80 to the first lines of chroma planes
 */
- if(j) dst[i] += dst[i - stride];
- else if(Uoff) dst[i] += 0x80;
+ if (j)
+ dst[i] += dst[i - stride];
+ else if (Uoff)
+ dst[i] += 0x80;
 if (get_bits_left(&gb) < 0) {
 ff_free_vlc(&vlc);
 return AVERROR_INVALIDDATA;
@@ -127,79 +134,84 @@
 void *data, int *got_frame,
 AVPacket *avpkt)
 {
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
 FrapsContext * const s = avctx->priv_data;
- AVFrame *frame = data;
- AVFrame * const f = &s->frame;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ AVFrame *frame = data;
+ AVFrame * const f = s->frame;
 uint32_t header;
 unsigned int version,header_size;
 unsigned int x, y;
 const uint32_t *buf32;
 uint32_t *luma1,*luma2,*cb,*cr;
 uint32_t offs[4];
- int i, j, is_chroma, planes;
+ int i, j, ret, is_chroma, planes;
 enum AVPixelFormat pix_fmt;
+ int prev_pic_bit, expected_size;
 
- header = AV_RL32(buf);
- version = header & 0xff;
+ if (buf_size < 4) {
+ av_log(avctx, AV_LOG_ERROR, "Packet is too short\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ header = AV_RL32(buf);
+ version = header & 0xff;
 header_size = (header & (1<<30))? 8 : 4; /* bit 30 means pad to 8 bytes */
+ prev_pic_bit = header & (1U << 31); /* bit 31 means same as previous pic */
 
 if (version > 5) {
 av_log(avctx, AV_LOG_ERROR,
 "This file is encoded with Fraps version %d. " \
 "This codec can only decode versions <= 5.\n", version);
- return -1;
+ return AVERROR_PATCHWELCOME;
 }
 
- buf+=4;
+ buf += 4;
 if (header_size == 8)
- buf+=4;
+ buf += 4;
 
 pix_fmt = version & 1 ? AV_PIX_FMT_BGR24 : AV_PIX_FMT_YUVJ420P;
 if (avctx->pix_fmt != pix_fmt && f->data[0]) {
- avctx->release_buffer(avctx, f);
+ av_frame_unref(f);
 }
 avctx->pix_fmt = pix_fmt;
 
- switch(version) {
+ expected_size = header_size;
+
+ switch (version) {
 case 0:
 default:
 /* Fraps v0 is a reordered YUV420 */
- if ( (buf_size != avctx->width*avctx->height*3/2+header_size) &&
- (buf_size != header_size) ) {
+ if (!prev_pic_bit)
+ expected_size += avctx->width * avctx->height * 3 / 2;
+ if (buf_size != expected_size) {
 av_log(avctx, AV_LOG_ERROR,
 "Invalid frame length %d (should be %d)\n",
- buf_size, avctx->width*avctx->height*3/2+header_size);
- return -1;
+ buf_size, expected_size);
+ return AVERROR_INVALIDDATA;
 }
 
- if (( (avctx->width % 8) != 0) || ( (avctx->height % 2) != 0 )) {
+ if (((avctx->width % 8) != 0) || ((avctx->height % 2) != 0)) {
 av_log(avctx, AV_LOG_ERROR, "Invalid frame size %dx%d\n",
 avctx->width, avctx->height);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- f->reference = 1;
- f->buffer_hints = FF_BUFFER_HINTS_VALID |
- FF_BUFFER_HINTS_PRESERVE |
- FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, f)) {
+ if ((ret = ff_reget_buffer(avctx, f)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
 }
- /* bit 31 means same as previous pic */
- f->pict_type = (header & (1U<<31))? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
+ f->pict_type = prev_pic_bit ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
 f->key_frame = f->pict_type == AV_PICTURE_TYPE_I;
 
 if (f->pict_type == AV_PICTURE_TYPE_I) {
- buf32=(const uint32_t*)buf;
- for(y=0; y<avctx->height/2; y++){
- luma1=(uint32_t*)&f->data[0][ y*2*f->linesize[0] ];
- luma2=(uint32_t*)&f->data[0][ (y*2+1)*f->linesize[0] ];
- cr=(uint32_t*)&f->data[1][ y*f->linesize[1] ];
- cb=(uint32_t*)&f->data[2][ y*f->linesize[2] ];
- for(x=0; x<avctx->width; x+=8){
+ buf32 = (const uint32_t*)buf;
+ for (y = 0; y < avctx->height / 2; y++) {
+ luma1 = (uint32_t*)&f->data[0][ y * 2 * f->linesize[0]];
+ luma2 = (uint32_t*)&f->data[0][(y * 2 + 1) * f->linesize[0]];
+ cr = (uint32_t*)&f->data[1][ y * f->linesize[1]];
+ cb = (uint32_t*)&f->data[2][ y * f->linesize[2]];
+ for (x = 0; x < avctx->width; x += 8) {
 *(luma1++) = *(buf32++);
 *(luma1++) = *(buf32++);
 *(luma2++) = *(buf32++);
@@ -213,31 +225,27 @@
 
 case 1:
 /* Fraps v1 is an upside-down BGR24 */
- if ( (buf_size != avctx->width*avctx->height*3+header_size) &&
- (buf_size != header_size) ) {
+ if (!prev_pic_bit)
+ expected_size += avctx->width * avctx->height * 3;
+ if (buf_size != expected_size) {
 av_log(avctx, AV_LOG_ERROR,
 "Invalid frame length %d (should be %d)\n",
- buf_size, avctx->width*avctx->height*3+header_size);
- return -1;
+ buf_size, expected_size);
+ return AVERROR_INVALIDDATA;
 }
 
- f->reference = 1;
- f->buffer_hints = FF_BUFFER_HINTS_VALID |
- FF_BUFFER_HINTS_PRESERVE |
- FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, f)) {
+ if ((ret = ff_reget_buffer(avctx, f)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
 }
- /* bit 31 means same as previous pic */
- f->pict_type = (header & (1U<<31))? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
+ f->pict_type = prev_pic_bit ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
 f->key_frame = f->pict_type == AV_PICTURE_TYPE_I;
 
 if (f->pict_type == AV_PICTURE_TYPE_I) {
- for(y=0; y<avctx->height; y++)
- memcpy(&f->data[0][ (avctx->height - y -1) * f->linesize[0]],
- &buf[y*avctx->width*3],
- 3*avctx->width);
+ for (y = 0; y<avctx->height; y++)
+ memcpy(&f->data[0][(avctx->height - y - 1) * f->linesize[0]],
+ &buf[y * avctx->width * 3],
+ 3 * avctx->width);
 }
 break;
 
@@ -248,44 +256,43 @@
 * Fraps v4 is virtually the same
 */
 planes = 3;
- f->reference = 1;
- f->buffer_hints = FF_BUFFER_HINTS_VALID |
- FF_BUFFER_HINTS_PRESERVE |
- FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, f)) {
+ if ((ret = ff_reget_buffer(avctx, f)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
 }
 /* skip frame */
- if(buf_size == 8) {
+ if (buf_size == 8) {
 f->pict_type = AV_PICTURE_TYPE_P;
 f->key_frame = 0;
 break;
 }
 f->pict_type = AV_PICTURE_TYPE_I;
 f->key_frame = 1;
- if ((AV_RL32(buf) != FPS_TAG)||(buf_size < (planes*1024 + 24))) {
+ if ((AV_RL32(buf) != FPS_TAG) || (buf_size < (planes * 1024 + 24))) {
 av_log(avctx, AV_LOG_ERROR, "Fraps: error in data stream\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- for(i = 0; i < planes; i++) {
+ for (i = 0; i < planes; i++) {
 offs[i] = AV_RL32(buf + 4 + i * 4);
- if(offs[i] >= buf_size || (i && offs[i] <= offs[i - 1] + 1024)) {
+ if (offs[i] >= buf_size || (i && offs[i] <= offs[i - 1] + 1024)) {
 av_log(avctx, AV_LOG_ERROR, "Fraps: plane %i offset is out of bounds\n", i);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 offs[planes] = buf_size;
- for(i = 0; i < planes; i++){
+ for (i = 0; i < planes; i++) {
 is_chroma = !!i;
 av_fast_padded_malloc(&s->tmpbuf, &s->tmpbuf_size,
 offs[i + 1] - offs[i] - 1024);
 if (!s->tmpbuf)
 return AVERROR(ENOMEM);
- if(fraps2_decode_plane(s, f->data[i], f->linesize[i], avctx->width >> is_chroma,
- avctx->height >> is_chroma, buf + offs[i], offs[i + 1] - offs[i], is_chroma, 1) < 0) {
+ if ((ret = fraps2_decode_plane(s, f->data[i], f->linesize[i],
+ avctx->width >> is_chroma,
+ avctx->height >> is_chroma,
+ buf + offs[i], offs[i + 1] - offs[i],
+ is_chroma, 1)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "Error decoding plane %i\n", i);
- return -1;
+ return ret;
 }
 }
 break;
@@ -293,16 +300,12 @@
 case 5:
 /* Virtually the same as version 4, but is for RGB24 */
 planes = 3;
- f->reference = 1;
- f->buffer_hints = FF_BUFFER_HINTS_VALID |
- FF_BUFFER_HINTS_PRESERVE |
- FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, f)) {
+ if ((ret = ff_reget_buffer(avctx, f)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
 }
 /* skip frame */
- if(buf_size == 8) {
+ if (buf_size == 8) {
 f->pict_type = AV_PICTURE_TYPE_P;
 f->key_frame = 0;
 break;
@@ -311,30 +314,31 @@
 f->key_frame = 1;
 if ((AV_RL32(buf) != FPS_TAG)||(buf_size < (planes*1024 + 24))) {
 av_log(avctx, AV_LOG_ERROR, "Fraps: error in data stream\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- for(i = 0; i < planes; i++) {
+ for (i = 0; i < planes; i++) {
 offs[i] = AV_RL32(buf + 4 + i * 4);
- if(offs[i] >= buf_size || (i && offs[i] <= offs[i - 1] + 1024)) {
+ if (offs[i] >= buf_size || (i && offs[i] <= offs[i - 1] + 1024)) {
 av_log(avctx, AV_LOG_ERROR, "Fraps: plane %i offset is out of bounds\n", i);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 offs[planes] = buf_size;
- for(i = 0; i < planes; i++){
+ for (i = 0; i < planes; i++) {
 av_fast_padded_malloc(&s->tmpbuf, &s->tmpbuf_size,
 offs[i + 1] - offs[i] - 1024);
 if (!s->tmpbuf)
 return AVERROR(ENOMEM);
- if(fraps2_decode_plane(s, f->data[0] + i + (f->linesize[0] * (avctx->height - 1)), -f->linesize[0],
- avctx->width, avctx->height, buf + offs[i], offs[i + 1] - offs[i], 0, 3) < 0) {
+ if ((ret = fraps2_decode_plane(s, f->data[0] + i + (f->linesize[0] * (avctx->height - 1)),
+ -f->linesize[0], avctx->width, avctx->height,
+ buf + offs[i], offs[i + 1] - offs[i], 0, 3)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "Error decoding plane %i\n", i);
- return -1;
+ return ret;
 }
 }
 // convert pseudo-YUV into real RGB
- for(j = 0; j < avctx->height; j++){
- for(i = 0; i < avctx->width; i++){
+ for (j = 0; j < avctx->height; j++) {
+ for (i = 0; i < avctx->width; i++) {
 f->data[0][0 + i*3 + j*f->linesize[0]] += f->data[0][1 + i*3 + j*f->linesize[0]];
 f->data[0][2 + i*3 + j*f->linesize[0]] += f->data[0][1 + i*3 + j*f->linesize[0]];
 }
@@ -342,7 +346,8 @@
 break;
 }
 
- *frame = *f;
+ if ((ret = av_frame_ref(frame, f)) < 0)
+ return ret;
 *got_frame = 1;
 
 return buf_size;
@@ -358,8 +363,7 @@
 {
 FrapsContext *s = (FrapsContext*)avctx->priv_data;
 
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ av_frame_free(&s->frame);
 
 av_freep(&s->tmpbuf);
 return 0;
@@ -368,6 +372,7 @@
 
 AVCodec ff_fraps_decoder = {
 .name = "fraps",
+ .long_name = NULL_IF_CONFIG_SMALL("Fraps"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_FRAPS,
 .priv_data_size = sizeof(FrapsContext),
@@ -375,5 +380,4 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Fraps"),
 };

libav-v9.6.tar.bz2/libavcodec/frwu.c -> libav-v10.1.tar.bz2/libavcodec/frwu.c Changed

@@ -32,10 +32,6 @@
 }
 avctx->pix_fmt = AV_PIX_FMT_UYVY422;
 
- avctx->coded_frame = avcodec_alloc_frame();
- if (!avctx->coded_frame)
- return AVERROR(ENOMEM);
-
 return 0;
 }
 
@@ -43,13 +39,10 @@
 AVPacket *avpkt)
 {
 int field, ret;
- AVFrame *pic = avctx->coded_frame;
+ AVFrame *pic = data;
 const uint8_t *buf = avpkt->data;
 const uint8_t *buf_end = buf + avpkt->size;
 
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
-
 if (avpkt->size < avctx->width * 2 * avctx->height + 4 + 2*8) {
 av_log(avctx, AV_LOG_ERROR, "Packet is too small.\n");
 return AVERROR_INVALIDDATA;
@@ -59,8 +52,7 @@
 return AVERROR_INVALIDDATA;
 }
 
- pic->reference = 0;
- if ((ret = ff_get_buffer(avctx, pic)) < 0) {
+ if ((ret = ff_get_buffer(avctx, pic, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -98,28 +90,16 @@
 }
 
 *got_frame = 1;
- *(AVFrame*)data = *pic;
 
 return avpkt->size;
 }
 
-static av_cold int decode_close(AVCodecContext *avctx)
-{
- AVFrame *pic = avctx->coded_frame;
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
- av_freep(&avctx->coded_frame);
-
- return 0;
-}
-
 AVCodec ff_frwu_decoder = {
 .name = "frwu",
+ .long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_FRWU,
 .init = decode_init,
- .close = decode_close,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"),
 };

libav-v10.1.tar.bz2/libavcodec/g2meet.c Added

@@ -0,0 +1,892 @@
+/*
+ * Go2Webinar decoder
+ * Copyright (c) 2012 Konstantin Shishkov
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Go2Webinar decoder
+ */
+
+#include <zlib.h>
+
+#include "libavutil/intreadwrite.h"
+#include "avcodec.h"
+#include "bytestream.h"
+#include "dsputil.h"
+#include "get_bits.h"
+#include "internal.h"
+#include "mjpeg.h"
+
+enum ChunkType {
+ DISPLAY_INFO = 0xC8,
+ TILE_DATA,
+ CURSOR_POS,
+ CURSOR_SHAPE,
+ CHUNK_CC,
+ CHUNK_CD
+};
+
+enum Compression {
+ COMPR_EPIC_J_B = 2,
+ COMPR_KEMPF_J_B,
+};
+
+static const uint8_t luma_quant[64] = {
+ 8, 6, 5, 8, 12, 20, 26, 31,
+ 6, 6, 7, 10, 13, 29, 30, 28,
+ 7, 7, 8, 12, 20, 29, 35, 28,
+ 7, 9, 11, 15, 26, 44, 40, 31,
+ 9, 11, 19, 28, 34, 55, 52, 39,
+ 12, 18, 28, 32, 41, 52, 57, 46,
+ 25, 32, 39, 44, 52, 61, 60, 51,
+ 36, 46, 48, 49, 56, 50, 52, 50
+};
+
+static const uint8_t chroma_quant[64] = {
+ 9, 9, 12, 24, 50, 50, 50, 50,
+ 9, 11, 13, 33, 50, 50, 50, 50,
+ 12, 13, 28, 50, 50, 50, 50, 50,
+ 24, 33, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50,
+};
+
+typedef struct JPGContext {
+ DSPContext dsp;
+ ScanTable scantable;
+
+ VLC dc_vlc[2], ac_vlc[2];
+ int prev_dc[3];
+ DECLARE_ALIGNED(16, int16_t, block)[6][64];
+
+ uint8_t *buf;
+} JPGContext;
+
+typedef struct G2MContext {
+ JPGContext jc;
+ int version;
+
+ int compression;
+ int width, height, bpp;
+ int tile_width, tile_height;
+ int tiles_x, tiles_y, tile_x, tile_y;
+
+ int got_header;
+
+ uint8_t *framebuf;
+ int framebuf_stride, old_width, old_height;
+
+ uint8_t *synth_tile, *jpeg_tile;
+ int tile_stride, old_tile_w, old_tile_h;
+
+ uint8_t *kempf_buf, *kempf_flags;
+
+ uint8_t *cursor;
+ int cursor_stride;
+ int cursor_fmt;
+ int cursor_w, cursor_h, cursor_x, cursor_y;
+ int cursor_hot_x, cursor_hot_y;
+} G2MContext;
+
+static av_cold int build_vlc(VLC *vlc, const uint8_t *bits_table,
+ const uint8_t *val_table, int nb_codes,
+ int is_ac)
+{
+ uint8_t huff_size[256] = { 0 };
+ uint16_t huff_code[256];
+ uint16_t huff_sym[256];
+ int i;
+
+ ff_mjpeg_build_huffman_codes(huff_size, huff_code, bits_table, val_table);
+
+ for (i = 0; i < 256; i++)
+ huff_sym[i] = i + 16 * is_ac;
+
+ if (is_ac)
+ huff_sym[0] = 16 * 256;
+
+ return ff_init_vlc_sparse(vlc, 9, nb_codes, huff_size, 1, 1,
+ huff_code, 2, 2, huff_sym, 2, 2, 0);
+}
+
+static av_cold int jpg_init(AVCodecContext *avctx, JPGContext *c)
+{
+ int ret;
+
+ ret = build_vlc(&c->dc_vlc[0], avpriv_mjpeg_bits_dc_luminance,
+ avpriv_mjpeg_val_dc, 12, 0);
+ if (ret)
+ return ret;
+ ret = build_vlc(&c->dc_vlc[1], avpriv_mjpeg_bits_dc_chrominance,
+ avpriv_mjpeg_val_dc, 12, 0);
+ if (ret)
+ return ret;
+ ret = build_vlc(&c->ac_vlc[0], avpriv_mjpeg_bits_ac_luminance,
+ avpriv_mjpeg_val_ac_luminance, 251, 1);
+ if (ret)
+ return ret;
+ ret = build_vlc(&c->ac_vlc[1], avpriv_mjpeg_bits_ac_chrominance,
+ avpriv_mjpeg_val_ac_chrominance, 251, 1);
+ if (ret)
+ return ret;
+
+ ff_dsputil_init(&c->dsp, avctx);
+ ff_init_scantable(c->dsp.idct_permutation, &c->scantable,
+ ff_zigzag_direct);
+
+ return 0;
+}
+
+static av_cold void jpg_free_context(JPGContext *ctx)
+{
+ int i;
+
+ for (i = 0; i < 2; i++) {
+ ff_free_vlc(&ctx->dc_vlc[i]);
+ ff_free_vlc(&ctx->ac_vlc[i]);
+ }
+
+ av_freep(&ctx->buf);
+}
+
+static void jpg_unescape(const uint8_t *src, int src_size,
+ uint8_t *dst, int *dst_size)
+{
+ const uint8_t *src_end = src + src_size;
+ uint8_t *dst_start = dst;
+
+ while (src < src_end) {
+ uint8_t x = *src++;
+
+ *dst++ = x;
+
+ if (x == 0xFF && !*src)
+ src++;
+ }
+ *dst_size = dst - dst_start;
+}
+
+static int jpg_decode_block(JPGContext *c, GetBitContext *gb,
+ int plane, int16_t *block)
+{
+ int dc, val, pos;
+ const int is_chroma = !!plane;
+ const uint8_t *qmat = is_chroma ? chroma_quant : luma_quant;
+
+ c->dsp.clear_block(block);
+ dc = get_vlc2(gb, c->dc_vlc[is_chroma].table, 9, 3);
+ if (dc < 0)
+ return AVERROR_INVALIDDATA;
+ if (dc)
+ dc = get_xbits(gb, dc);
+ dc = dc * qmat[0] + c->prev_dc[plane];
+ block[0] = dc;
+ c->prev_dc[plane] = dc;
+
+ pos = 0;
+ while (pos < 63) {
+ val = get_vlc2(gb, c->ac_vlc[is_chroma].table, 9, 3);
+ if (val < 0)
+ return AVERROR_INVALIDDATA;
+ pos += val >> 4;
+ val &= 0xF;
+ if (pos > 63)
+ return val ? AVERROR_INVALIDDATA : 0;
+ if (val) {
+ int nbits = val;
+
+ val = get_xbits(gb, nbits);
+ val *= qmat[ff_zigzag_direct[pos]];
+ block[c->scantable.permutated[pos]] = val;
+ }
+ }
+ return 0;
+}
+
+static inline void yuv2rgb(uint8_t *out, int Y, int U, int V)
+{
+ out[0] = av_clip_uint8(Y + ( 91881 * V + 32768 >> 16));
+ out[1] = av_clip_uint8(Y + (-22554 * U - 46802 * V + 32768 >> 16));
+ out[2] = av_clip_uint8(Y + (116130 * U + 32768 >> 16));
+}
+
+static int jpg_decode_data(JPGContext *c, int width, int height,
+ const uint8_t *src, int src_size,
+ uint8_t *dst, int dst_stride,
+ const uint8_t *mask, int mask_stride, int num_mbs,
+ int swapuv)
+{
+ GetBitContext gb;
+ int mb_w, mb_h, mb_x, mb_y, i, j;
+ int bx, by;
+ int unesc_size;
+ int ret;
+
+ 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);
+
+ width = FFALIGN(width, 16);
+ mb_w = width >> 4;
+ mb_h = (height + 15) >> 4;
+
+ if (!num_mbs)
+ 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 * 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;
+ c->dsp.idct(c->block[i + j * 2]);
+ }
+ }
+ for (i = 1; i < 3; i++) {
+ if ((ret = jpg_decode_block(c, &gb, i, c->block[i + 3])) != 0)
+ return ret;
+ c->dsp.idct(c->block[i + 3]);
+ }
+
+ for (j = 0; j < 16; j++) {
+ uint8_t *out = dst + bx * 3 + (by + j) * dst_stride;
+ for (i = 0; i < 16; i++) {
+ int Y, U, V;
+
+ Y = c->block[(j >> 3) * 2 + (i >> 3)][(i & 7) + (j & 7) * 8];
+ U = c->block[4 ^ swapuv][(i >> 1) + (j >> 1) * 8] - 128;
+ V = c->block[5 ^ swapuv][(i >> 1) + (j >> 1) * 8] - 128;
+ yuv2rgb(out + i * 3, Y, U, V);
+ }
+ }
+
+ if (!num_mbs)
+ return 0;
+ bx += 16;
+ }
+ bx = 0;
+ by += 16;
+ if (mask)
+ mask += mask_stride * 2;
+ }
+
+ return 0;
+}
+
+static void kempf_restore_buf(const uint8_t *src, int len,
+ uint8_t *dst, int stride,
+ const uint8_t *jpeg_tile, int tile_stride,
+ int width, int height,
+ const uint8_t *pal, int npal, int tidx)
+{
+ GetBitContext gb;
+ int i, j, nb, col;
+
+ init_get_bits(&gb, src, len * 8);
+
+ if (npal <= 2) nb = 1;
+ else if (npal <= 4) nb = 2;
+ else if (npal <= 16) nb = 4;
+ else nb = 8;
+
+ for (j = 0; j < height; j++, dst += stride, jpeg_tile += tile_stride) {
+ if (get_bits(&gb, 8))
+ continue;
+ for (i = 0; i < width; i++) {
+ col = get_bits(&gb, nb);
+ if (col != tidx)
+ memcpy(dst + i * 3, pal + col * 3, 3);
+ else
+ memcpy(dst + i * 3, jpeg_tile + i * 3, 3);
+ }
+ }
+}
+
+static int kempf_decode_tile(G2MContext *c, int tile_x, int tile_y,
+ const uint8_t *src, int src_size)
+{
+ int width, height;
+ int hdr, zsize, npal, tidx = -1, ret;
+ int i, j;
+ const uint8_t *src_end = src + src_size;
+ uint8_t pal[768], transp[3];
+ uLongf dlen = (c->tile_width + 1) * c->tile_height;
+ int sub_type;
+ int nblocks, cblocks, bstride;
+ int bits, bitbuf, coded;
+ uint8_t *dst = c->framebuf + tile_x * c->tile_width * 3 +
+ tile_y * c->tile_height * c->framebuf_stride;
+
+ if (src_size < 2)
+ return AVERROR_INVALIDDATA;
+
+ width = FFMIN(c->width - tile_x * c->tile_width, c->tile_width);
+ height = FFMIN(c->height - tile_y * c->tile_height, c->tile_height);
+
+ hdr = *src++;
+ sub_type = hdr >> 5;
+ if (sub_type == 0) {
+ int j;
+ memcpy(transp, src, 3);
+ src += 3;
+ for (j = 0; j < height; j++, dst += c->framebuf_stride)
+ for (i = 0; i < width; i++)
+ memcpy(dst + i * 3, transp, 3);
+ return 0;
+ } else if (sub_type == 1) {
+ return jpg_decode_data(&c->jc, width, height, src, src_end - src,
+ dst, c->framebuf_stride, NULL, 0, 0, 0);
+ }
+
+ if (sub_type != 2) {
+ memcpy(transp, src, 3);
+ src += 3;
+ }
+ npal = *src++ + 1;
+ memcpy(pal, src, npal * 3); src += npal * 3;
+ if (sub_type != 2) {
+ for (i = 0; i < npal; i++) {
+ if (!memcmp(pal + i * 3, transp, 3)) {
+ tidx = i;
+ break;
+ }
+ }
+ }
+
+ if (src_end - src < 2)
+ return 0;
+ zsize = (src[0] << 8) | src[1]; src += 2;
+
+ if (src_end - src < zsize)
+ return AVERROR_INVALIDDATA;
+
+ ret = uncompress(c->kempf_buf, &dlen, src, zsize);
+ if (ret)
+ return AVERROR_INVALIDDATA;
+ src += zsize;
+
+ if (sub_type == 2) {
+ kempf_restore_buf(c->kempf_buf, dlen, dst, c->framebuf_stride,
+ NULL, 0, width, height, pal, npal, tidx);
+ return 0;
+ }
+
+ nblocks = *src++ + 1;
+ cblocks = 0;
+ 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++) {
+ for (j = 0; j < (FFALIGN(width, 16) >> 4); j++) {
+ if (!bits) {
+ bitbuf = *src++;
+ bits = 8;
+ }
+ coded = bitbuf & 1;
+ bits--;
+ bitbuf >>= 1;
+ cblocks += coded;
+ if (cblocks > nblocks)
+ return AVERROR_INVALIDDATA;
+ 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 * 4, 0);
+
+ kempf_restore_buf(c->kempf_buf, dlen, dst, c->framebuf_stride,
+ c->jpeg_tile, c->tile_stride,
+ width, height, pal, npal, tidx);
+
+ return 0;
+}
+
+static int g2m_init_buffers(G2MContext *c)
+{
+ int aligned_height;
+
+ if (!c->framebuf || c->old_width < c->width || c->old_height < c->height) {
+ c->framebuf_stride = FFALIGN(c->width * 3, 16);
+ aligned_height = FFALIGN(c->height, 16);
+ av_free(c->framebuf);
+ c->framebuf = av_mallocz(c->framebuf_stride * aligned_height);
+ if (!c->framebuf)
+ return AVERROR(ENOMEM);
+ }
+ if (!c->synth_tile || !c->jpeg_tile ||
+ c->old_tile_w < c->tile_width ||
+ c->old_tile_h < c->tile_height) {
+ c->tile_stride = FFALIGN(c->tile_width * 3, 16);
+ aligned_height = FFALIGN(c->tile_height, 16);
+ av_free(c->synth_tile);
+ av_free(c->jpeg_tile);
+ av_free(c->kempf_buf);
+ av_free(c->kempf_flags);
+ c->synth_tile = av_mallocz(c->tile_stride * aligned_height);
+ c->jpeg_tile = av_mallocz(c->tile_stride * aligned_height);
+ c->kempf_buf = av_mallocz((c->tile_width + 1) * aligned_height
+ + FF_INPUT_BUFFER_PADDING_SIZE);
+ c->kempf_flags = av_mallocz( c->tile_width * aligned_height);
+ if (!c->synth_tile || !c->jpeg_tile ||
+ !c->kempf_buf || !c->kempf_flags)
+ return AVERROR(ENOMEM);
+ }
+
+ return 0;
+}
+
+static int g2m_load_cursor(AVCodecContext *avctx, G2MContext *c,
+ GetByteContext *gb)
+{
+ int i, j, k;
+ uint8_t *dst;
+ uint32_t bits;
+ uint32_t cur_size, cursor_w, cursor_h, cursor_stride;
+ uint32_t cursor_hot_x, cursor_hot_y;
+ int cursor_fmt, err;
+
+ cur_size = bytestream2_get_be32(gb);
+ cursor_w = bytestream2_get_byte(gb);
+ cursor_h = bytestream2_get_byte(gb);
+ cursor_hot_x = bytestream2_get_byte(gb);
+ cursor_hot_y = bytestream2_get_byte(gb);
+ cursor_fmt = bytestream2_get_byte(gb);
+
+ cursor_stride = FFALIGN(cursor_w, 32) * 4;
+
+ if (cursor_w < 1 || cursor_w > 256 ||
+ cursor_h < 1 || cursor_h > 256) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid cursor dimensions %dx%d\n",
+ cursor_w, cursor_h);
+ return AVERROR_INVALIDDATA;
+ }
+ if (cursor_hot_x > cursor_w || cursor_hot_y > cursor_h) {
+ av_log(avctx, AV_LOG_WARNING, "Invalid hotspot position %d,%d\n",
+ cursor_hot_x, cursor_hot_y);
+ cursor_hot_x = FFMIN(cursor_hot_x, cursor_w - 1);
+ cursor_hot_y = FFMIN(cursor_hot_y, cursor_h - 1);
+ }
+ if (cur_size - 9 > bytestream2_get_bytes_left(gb) ||
+ c->cursor_w * c->cursor_h / 4 > cur_size) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid cursor data size %d/%d\n",
+ cur_size, bytestream2_get_bytes_left(gb));
+ return AVERROR_INVALIDDATA;
+ }
+ if (cursor_fmt != 1 && cursor_fmt != 32) {
+ avpriv_report_missing_feature(avctx, "Cursor format %d",
+ cursor_fmt);
+ return AVERROR_PATCHWELCOME;
+ }
+
+ if ((err = av_reallocp(&c->cursor, cursor_stride * cursor_h)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Cannot allocate cursor buffer\n");
+ return err;
+ }
+
+ c->cursor_w = cursor_w;
+ c->cursor_h = cursor_h;
+ c->cursor_hot_x = cursor_hot_x;
+ c->cursor_hot_y = cursor_hot_y;
+ c->cursor_fmt = cursor_fmt;
+ c->cursor_stride = cursor_stride;
+
+ dst = c->cursor;
+ switch (c->cursor_fmt) {
+ case 1: // old monochrome
+ for (j = 0; j < c->cursor_h; j++) {
+ for (i = 0; i < c->cursor_w; i += 32) {
+ bits = bytestream2_get_be32(gb);
+ for (k = 0; k < 32; k++) {
+ dst[0] = !!(bits & 0x80000000);
+ dst += 4;
+ bits <<= 1;
+ }
+ }
+ dst += c->cursor_stride - c->cursor_w * 4;
+ }
+
+ dst = c->cursor;
+ for (j = 0; j < c->cursor_h; j++) {
+ for (i = 0; i < c->cursor_w; i += 32) {
+ bits = bytestream2_get_be32(gb);
+ for (k = 0; k < 32; k++) {
+ int mask_bit = !!(bits & 0x80000000);
+ switch (dst[0] * 2 + mask_bit) {
+ case 0:
+ dst[0] = 0xFF; dst[1] = 0x00;
+ dst[2] = 0x00; dst[3] = 0x00;
+ break;
+ case 1:
+ dst[0] = 0xFF; dst[1] = 0xFF;
+ dst[2] = 0xFF; dst[3] = 0xFF;
+ break;
+ default:
+ dst[0] = 0x00; dst[1] = 0x00;
+ dst[2] = 0x00; dst[3] = 0x00;
+ }
+ dst += 4;
+ bits <<= 1;
+ }
+ }
+ dst += c->cursor_stride - c->cursor_w * 4;
+ }
+ break;
+ case 32: // full colour
+ /* skip monochrome version of the cursor and decode RGBA instead */
+ bytestream2_skip(gb, c->cursor_h * (FFALIGN(c->cursor_w, 32) >> 3));
+ for (j = 0; j < c->cursor_h; j++) {
+ for (i = 0; i < c->cursor_w; i++) {
+ int val = bytestream2_get_be32(gb);
+ *dst++ = val >> 0;
+ *dst++ = val >> 8;
+ *dst++ = val >> 16;
+ *dst++ = val >> 24;
+ }
+ dst += c->cursor_stride - c->cursor_w * 4;
+ }
+ break;
+ default:
+ return AVERROR_PATCHWELCOME;
+ }
+ return 0;
+}
+
+#define APPLY_ALPHA(src, new, alpha) \
+ src = (src * (256 - alpha) + new * alpha) >> 8
+
+static void g2m_paint_cursor(G2MContext *c, uint8_t *dst, int stride)
+{
+ int i, j;
+ int x, y, w, h;
+ const uint8_t *cursor;
+
+ if (!c->cursor)
+ return;
+
+ x = c->cursor_x - c->cursor_hot_x;
+ y = c->cursor_y - c->cursor_hot_y;
+
+ cursor = c->cursor;
+ w = c->cursor_w;
+ h = c->cursor_h;
+
+ if (x + w > c->width)
+ w = c->width - x;
+ if (y + h > c->height)
+ h = c->height - y;
+ if (x < 0) {
+ w += x;
+ cursor += -x * 4;
+ } else {
+ dst += x * 3;
+ }
+ if (y < 0) {
+ h += y;
+ cursor += -y * c->cursor_stride;
+ } else {
+ dst += y * stride;
+ }
+ if (w < 0 || h < 0)
+ return;
+
+ for (j = 0; j < h; j++) {
+ for (i = 0; i < w; i++) {
+ uint8_t alpha = cursor[i * 4];
+ APPLY_ALPHA(dst[i * 3 + 0], cursor[i * 4 + 1], alpha);
+ APPLY_ALPHA(dst[i * 3 + 1], cursor[i * 4 + 2], alpha);
+ APPLY_ALPHA(dst[i * 3 + 2], cursor[i * 4 + 3], alpha);
+ }
+ dst += stride;
+ cursor += c->cursor_stride;
+ }
+}
+
+static int g2m_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_picture_ptr, AVPacket *avpkt)
+{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ G2MContext *c = avctx->priv_data;
+ AVFrame *pic = data;
+ GetByteContext bc, tbc;
+ int magic;
+ int got_header = 0;
+ uint32_t chunk_size, r_mask, g_mask, b_mask;
+ int chunk_type, chunk_start;
+ int i;
+ int ret;
+
+ if (buf_size < 12) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Frame should have at least 12 bytes, got %d instead\n",
+ buf_size);
+ return AVERROR_INVALIDDATA;
+ }
+
+ bytestream2_init(&bc, buf, buf_size);
+
+ magic = bytestream2_get_be32(&bc);
+ if ((magic & ~0xF) != MKBETAG('G', '2', 'M', '0') ||
+ (magic & 0xF) < 2 || (magic & 0xF) > 4) {
+ av_log(avctx, AV_LOG_ERROR, "Wrong magic %08X\n", magic);
+ return AVERROR_INVALIDDATA;
+ }
+
+ if ((magic & 0xF) != 4) {
+ av_log(avctx, AV_LOG_ERROR, "G2M2 and G2M3 are not yet supported\n");
+ return AVERROR(ENOSYS);
+ }
+
+ while (bytestream2_get_bytes_left(&bc) > 5) {
+ 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 DISPLAY_INFO:
+ c->got_header = 0;
+ if (chunk_size < 21) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid display info size %d\n",
+ chunk_size);
+ break;
+ }
+ c->width = bytestream2_get_be32(&bc);
+ c->height = bytestream2_get_be32(&bc);
+ if (c->width < 16 || c->width > avctx->width ||
+ c->height < 16 || c->height > avctx->height) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Invalid frame dimensions %dx%d\n",
+ c->width, c->height);
+ ret = AVERROR_INVALIDDATA;
+ goto header_fail;
+ }
+ if (c->width != avctx->width || c->height != avctx->height)
+ ff_set_dimensions(avctx, c->width, c->height);
+ 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;
+ }
+ c->tile_width = bytestream2_get_be32(&bc);
+ c->tile_height = bytestream2_get_be32(&bc);
+ 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);
+ ret = AVERROR_INVALIDDATA;
+ goto header_fail;
+ }
+ 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);
+ 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");
+ return AVERROR_INVALIDDATA;
+ }
+ 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);
+ return AVERROR_PATCHWELCOME;
+ }
+ } else {
+ avpriv_request_sample(avctx, "bpp=%d", c->bpp);
+ return AVERROR_PATCHWELCOME;
+ }
+ if (g2m_init_buffers(c)) {
+ ret = AVERROR(ENOMEM);
+ goto header_fail;
+ }
+ got_header = 1;
+ break;
+ case TILE_DATA:
+ if (!c->tiles_x || !c->tiles_y) {
+ av_log(avctx, AV_LOG_WARNING,
+ "No display info - skipping tile\n");
+ break;
+ }
+ if (chunk_size < 2) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid tile data size %d\n",
+ chunk_size);
+ break;
+ }
+ c->tile_x = bytestream2_get_byte(&bc);
+ c->tile_y = bytestream2_get_byte(&bc);
+ if (c->tile_x >= c->tiles_x || c->tile_y >= c->tiles_y) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Invalid tile pos %d,%d (in %dx%d grid)\n",
+ c->tile_x, c->tile_y, c->tiles_x, c->tiles_y);
+ break;
+ }
+ ret = 0;
+ switch (c->compression) {
+ case COMPR_EPIC_J_B:
+ av_log(avctx, AV_LOG_ERROR,
+ "ePIC j-b compression is not implemented yet\n");
+ return AVERROR(ENOSYS);
+ case COMPR_KEMPF_J_B:
+ ret = kempf_decode_tile(c, c->tile_x, c->tile_y,
+ buf + bytestream2_tell(&bc),
+ 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);
+ break;
+ case CURSOR_POS:
+ if (chunk_size < 5) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid cursor pos size %d\n",
+ chunk_size);
+ break;
+ }
+ c->cursor_x = bytestream2_get_be16(&bc);
+ c->cursor_y = bytestream2_get_be16(&bc);
+ break;
+ case CURSOR_SHAPE:
+ if (chunk_size < 8) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid cursor data size %d\n",
+ chunk_size);
+ break;
+ }
+ bytestream2_init(&tbc, buf + bytestream2_tell(&bc),
+ chunk_size - 4);
+ g2m_load_cursor(avctx, c, &tbc);
+ break;
+ case CHUNK_CC:
+ case CHUNK_CD:
+ break;
+ default:
+ av_log(avctx, AV_LOG_WARNING, "Skipping chunk type %02X\n",
+ chunk_type);
+ }
+
+ /* navigate to next chunk */
+ bytestream2_skip(&bc, chunk_start + chunk_size - bytestream2_tell(&bc));
+ }
+ if (got_header)
+ c->got_header = 1;
+
+ if (c->width && c->height) {
+ if ((ret = ff_get_buffer(avctx, pic, 0)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
+ }
+
+ pic->key_frame = got_header;
+ pic->pict_type = got_header ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
+
+ for (i = 0; i < avctx->height; i++)
+ memcpy(pic->data[0] + i * pic->linesize[0],
+ c->framebuf + i * c->framebuf_stride,
+ c->width * 3);
+ g2m_paint_cursor(c, pic->data[0], pic->linesize[0]);
+
+ *got_picture_ptr = 1;
+ }
+
+ return buf_size;
+header_fail:
+ c->width = c->height = 0;
+ c->tiles_x = c->tiles_y = 0;
+ return ret;
+}
+
+static av_cold int g2m_decode_init(AVCodecContext *avctx)
+{
+ G2MContext * const c = avctx->priv_data;
+ int ret;
+
+ if ((ret = jpg_init(avctx, &c->jc)) != 0) {
+ av_log(avctx, AV_LOG_ERROR, "Cannot initialise VLCs\n");
+ jpg_free_context(&c->jc);
+ return AVERROR(ENOMEM);
+ }
+
+ avctx->pix_fmt = AV_PIX_FMT_RGB24;
+
+ return 0;
+}
+
+static av_cold int g2m_decode_end(AVCodecContext *avctx)
+{
+ G2MContext * const c = avctx->priv_data;
+
+ jpg_free_context(&c->jc);
+
+ av_freep(&c->kempf_buf);
+ av_freep(&c->kempf_flags);
+ av_freep(&c->synth_tile);
+ av_freep(&c->jpeg_tile);
+ av_freep(&c->cursor);
+ av_freep(&c->framebuf);
+
+ return 0;
+}
+
+AVCodec ff_g2m_decoder = {
+ .name = "g2m",
+ .long_name = NULL_IF_CONFIG_SMALL("Go2Meeting"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_G2M,
+ .priv_data_size = sizeof(G2MContext),
+ .init = g2m_decode_init,
+ .close = g2m_decode_end,
+ .decode = g2m_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+};

libav-v9.6.tar.bz2/libavcodec/g722.h -> libav-v10.1.tar.bz2/libavcodec/g722.h Changed

libav-v9.6.tar.bz2/libavcodec/g722dec.c -> libav-v10.1.tar.bz2/libavcodec/g722dec.c Changed

@@ -44,7 +44,7 @@
 #define OFFSET(x) offsetof(G722Context, x)
 #define AD AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM
 static const AVOption options[] = {
- { "bits_per_codeword", "Bits per G722 codeword", OFFSET(bits_per_codeword), AV_OPT_TYPE_FLAGS, { .i64 = 8 }, 6, 8, AD },
+ { "bits_per_codeword", "Bits per G722 codeword", OFFSET(bits_per_codeword), AV_OPT_TYPE_INT, { .i64 = 8 }, 6, 8, AD },
 { NULL }
 };
 
@@ -67,9 +67,6 @@
 c->band[1].scale_factor = 2;
 c->prev_samples_pos = 22;
 
- avcodec_get_frame_defaults(&c->frame);
- avctx->coded_frame = &c->frame;
-
 return 0;
 }
 
@@ -88,6 +85,7 @@
 int *got_frame_ptr, AVPacket *avpkt)
 {
 G722Context *c = avctx->priv_data;
+ AVFrame *frame = data;
 int16_t *out_buf;
 int j, ret;
 const int skip = 8 - c->bits_per_codeword;
@@ -95,12 +93,12 @@
 GetBitContext gb;
 
 /* get output buffer */
- c->frame.nb_samples = avpkt->size * 2;
- if ((ret = ff_get_buffer(avctx, &c->frame)) < 0) {
+ frame->nb_samples = avpkt->size * 2;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- out_buf = (int16_t *)c->frame.data[0];
+ out_buf = (int16_t *)frame->data[0];
 
 init_get_bits(&gb, avpkt->data, avpkt->size * 8);
 
@@ -135,20 +133,19 @@
 }
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = c->frame;
+ *got_frame_ptr = 1;
 
 return avpkt->size;
 }
 
 AVCodec ff_adpcm_g722_decoder = {
 .name = "g722",
+ .long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_ADPCM_G722,
 .priv_data_size = sizeof(G722Context),
 .init = g722_decode_init,
 .decode = g722_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"),
 .priv_class = &g722_decoder_class,
 };

libav-v9.6.tar.bz2/libavcodec/g722enc.c -> libav-v10.1.tar.bz2/libavcodec/g722enc.c Changed

@@ -52,9 +52,6 @@
         av_freep(&c->node_buf[i]);
         av_freep(&c->nodep_buf[i]);
     }
-#if FF_API_OLD_ENCODE_AUDIO
-    av_freep(&avctx->coded_frame);
-#endif
     return 0;
 }
 
@@ -122,14 +119,6 @@
         }
     }
 
-#if FF_API_OLD_ENCODE_AUDIO
-    avctx->coded_frame = avcodec_alloc_frame();
-    if (!avctx->coded_frame) {
-        ret = AVERROR(ENOMEM);
-        goto error;
-    }
-#endif
-
     return 0;
 error:
     g722_encode_close(avctx);
@@ -393,6 +382,7 @@
 
 AVCodec ff_adpcm_g722_encoder = {
     .name           = "g722",
+    .long_name      = NULL_IF_CONFIG_SMALL("G.722 ADPCM"),
     .type           = AVMEDIA_TYPE_AUDIO,
     .id             = AV_CODEC_ID_ADPCM_G722,
     .priv_data_size = sizeof(G722Context),
@@ -400,7 +390,6 @@
     .close          = g722_encode_close,
     .encode2        = g722_encode_frame,
     .capabilities   = CODEC_CAP_SMALL_LAST_FRAME,
-    .long_name      = NULL_IF_CONFIG_SMALL("G.722 ADPCM"),
     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
                                                      AV_SAMPLE_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/g723_1.c -> libav-v10.1.tar.bz2/libavcodec/g723_1.c Changed

@@ -76,7 +76,6 @@
 
 typedef struct g723_1_context {
 AVClass *class;
- AVFrame frame;
 
 G723_1_Subframe subframe[4];
 enum FrameType cur_frame_type;
@@ -117,9 +116,6 @@
 avctx->sample_rate = 8000;
 p->pf_gain = 1 << 12;
 
- avcodec_get_frame_defaults(&p->frame);
- avctx->coded_frame = &p->frame;
-
 memcpy(p->prev_lsp, dc_lsp, LPC_ORDER * sizeof(*p->prev_lsp));
 memcpy(p->sid_lsp, dc_lsp, LPC_ORDER * sizeof(*p->sid_lsp));
 
@@ -1191,6 +1187,7 @@
 int *got_frame_ptr, AVPacket *avpkt)
 {
 G723_1_Context *p = avctx->priv_data;
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 int dec_mode = buf[0] & 3;
@@ -1220,13 +1217,13 @@
 p->cur_frame_type = UNTRANSMITTED_FRAME;
 }
 
- p->frame.nb_samples = FRAME_LEN;
- if ((ret = ff_get_buffer(avctx, &p->frame)) < 0) {
+ frame->nb_samples = FRAME_LEN;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
 
- out = (int16_t *)p->frame.data[0];
+ out = (int16_t *)frame->data[0];
 
 if (p->cur_frame_type == ACTIVE_FRAME) {
 if (!bad_frame)
@@ -1297,7 +1294,7 @@
 (FRAME_LEN + PITCH_MAX) * sizeof(*p->excitation));
 memset(p->prev_excitation, 0,
 PITCH_MAX * sizeof(*p->excitation));
- memset(p->frame.data[0], 0,
+ memset(frame->data[0], 0,
 (FRAME_LEN + LPC_ORDER) * sizeof(int16_t));
 } else {
 int16_t *buf = p->audio + LPC_ORDER;
@@ -1346,8 +1343,7 @@
 out[i] = av_clip_int16(p->audio[LPC_ORDER + i] << 1);
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = p->frame;
+ *got_frame_ptr = 1;
 
 return frame_size[dec_mode];
 }
@@ -1371,12 +1367,12 @@
 
 AVCodec ff_g723_1_decoder = {
 .name = "g723_1",
+ .long_name = NULL_IF_CONFIG_SMALL("G.723.1"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_G723_1,
 .priv_data_size = sizeof(G723_1_Context),
 .init = g723_1_decode_init,
 .decode = g723_1_decode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("G.723.1"),
 .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
 .priv_class = &g723_1dec_class,
 };

libav-v9.6.tar.bz2/libavcodec/g726.c -> libav-v10.1.tar.bz2/libavcodec/g726.c Changed

@@ -77,7 +77,6 @@
 
 typedef struct G726Context {
 AVClass *class;
- AVFrame frame;
 G726Tables tbls; /**< static tables needed for computation */
 
 Float11 sr[2]; /**< prev. reconstructed samples */
@@ -332,13 +331,6 @@
 
 g726_reset(c);
 
-#if FF_API_OLD_ENCODE_AUDIO
- avctx->coded_frame = avcodec_alloc_frame();
- if (!avctx->coded_frame)
- return AVERROR(ENOMEM);
- avctx->coded_frame->key_frame = 1;
-#endif
-
 /* select a frame size that will end on a byte boundary and have a size of
 approximately 1024 bytes */
 avctx->frame_size = ((int[]){ 4096, 2736, 2048, 1640 })[c->code_size - 2];
@@ -346,14 +338,6 @@
 return 0;
 }
 
-#if FF_API_OLD_ENCODE_AUDIO
-static av_cold int g726_encode_close(AVCodecContext *avctx)
-{
- av_freep(&avctx->coded_frame);
- return 0;
-}
-#endif
-
 static int g726_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
 const AVFrame *frame, int *got_packet_ptr)
 {
@@ -400,18 +384,15 @@
 
 AVCodec ff_adpcm_g726_encoder = {
 .name = "g726",
+ .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_ADPCM_G726,
 .priv_data_size = sizeof(G726Context),
 .init = g726_encode_init,
 .encode2 = g726_encode_frame,
-#if FF_API_OLD_ENCODE_AUDIO
- .close = g726_encode_close,
-#endif
 .capabilities = CODEC_CAP_SMALL_LAST_FRAME,
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
 AV_SAMPLE_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
 .priv_class = &class,
 .defaults = defaults,
 };
@@ -434,15 +415,13 @@
 
 avctx->sample_fmt = AV_SAMPLE_FMT_S16;
 
- avcodec_get_frame_defaults(&c->frame);
- avctx->coded_frame = &c->frame;
-
 return 0;
 }
 
 static int g726_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 G726Context *c = avctx->priv_data;
@@ -453,12 +432,12 @@
 out_samples = buf_size * 8 / c->code_size;
 
 /* get output buffer */
- c->frame.nb_samples = out_samples;
- if ((ret = ff_get_buffer(avctx, &c->frame)) < 0) {
+ frame->nb_samples = out_samples;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- samples = (int16_t *)c->frame.data[0];
+ samples = (int16_t *)frame->data[0];
 
 init_get_bits(&gb, buf, buf_size * 8);
 
@@ -468,8 +447,7 @@
 if (get_bits_left(&gb) > 0)
 av_log(avctx, AV_LOG_ERROR, "Frame invalidly split, missing parser?\n");
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = c->frame;
+ *got_frame_ptr = 1;
 
 return buf_size;
 }
@@ -482,6 +460,7 @@
 
 AVCodec ff_adpcm_g726_decoder = {
 .name = "g726",
+ .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_ADPCM_G726,
 .priv_data_size = sizeof(G726Context),
@@ -489,6 +468,5 @@
 .decode = g726_decode_frame,
 .flush = g726_decode_flush,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
 };
 #endif

libav-v9.6.tar.bz2/libavcodec/get_bits.h -> libav-v10.1.tar.bz2/libavcodec/get_bits.h Changed

@@ -27,6 +27,7 @@
 #define AVCODEC_GET_BITS_H
 
 #include <stdint.h>
+
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/log.h"
@@ -73,46 +74,48 @@
 } RL_VLC_ELEM;
 
 /* Bitstream reader API docs:
-name
- arbitrary name which is used as prefix for the internal variables
-
-gb
- getbitcontext
-
-OPEN_READER(name, gb)
- load gb into local variables
-
-CLOSE_READER(name, gb)
- store local vars in gb
-
-UPDATE_CACHE(name, gb)
- refill the internal cache from the bitstream
- after this call at least MIN_CACHE_BITS will be available,
-
-GET_CACHE(name, gb)
- will output the contents of the internal cache, next bit is MSB of 32 or 64 bit (FIXME 64bit)
-
-SHOW_UBITS(name, gb, num)
- will return the next num bits
-
-SHOW_SBITS(name, gb, num)
- will return the next num bits and do sign extension
-
-SKIP_BITS(name, gb, num)
- will skip over the next num bits
- note, this is equivalent to SKIP_CACHE; SKIP_COUNTER
-
-SKIP_CACHE(name, gb, num)
- will remove the next num bits from the cache (note SKIP_COUNTER MUST be called before UPDATE_CACHE / CLOSE_READER)
-
-SKIP_COUNTER(name, gb, num)
- will increment the internal bit counter (see SKIP_CACHE & SKIP_BITS)
-
-LAST_SKIP_BITS(name, gb, num)
- like SKIP_BITS, to be used if next call is UPDATE_CACHE or CLOSE_READER
-
-for examples see get_bits, show_bits, skip_bits, get_vlc
-*/
+ * name
+ * arbitrary name which is used as prefix for the internal variables
+ *
+ * gb
+ * getbitcontext
+ *
+ * OPEN_READER(name, gb)
+ * load gb into local variables
+ *
+ * CLOSE_READER(name, gb)
+ * store local vars in gb
+ *
+ * UPDATE_CACHE(name, gb)
+ * Refill the internal cache from the bitstream.
+ * After this call at least MIN_CACHE_BITS will be available.
+ *
+ * GET_CACHE(name, gb)
+ * Will output the contents of the internal cache,
+ * next bit is MSB of 32 or 64 bit (FIXME 64bit).
+ *
+ * SHOW_UBITS(name, gb, num)
+ * Will return the next num bits.
+ *
+ * SHOW_SBITS(name, gb, num)
+ * Will return the next num bits and do sign extension.
+ *
+ * SKIP_BITS(name, gb, num)
+ * Will skip over the next num bits.
+ * Note, this is equivalent to SKIP_CACHE; SKIP_COUNTER.
+ *
+ * SKIP_CACHE(name, gb, num)
+ * Will remove the next num bits from the cache (note SKIP_COUNTER
+ * MUST be called before UPDATE_CACHE / CLOSE_READER).
+ *
+ * SKIP_COUNTER(name, gb, num)
+ * Will increment the internal bit counter (see SKIP_CACHE & SKIP_BITS).
+ *
+ * LAST_SKIP_BITS(name, gb, num)
+ * Like SKIP_BITS, to be used if next call is UPDATE_CACHE or CLOSE_READER.
+ *
+ * For examples see get_bits, show_bits, skip_bits, get_vlc.
+ */
 
 #ifdef LONG_BITSTREAM_READER
 # define MIN_CACHE_BITS 32
@@ -122,57 +125,56 @@
 
 #if UNCHECKED_BITSTREAM_READER
 #define OPEN_READER(name, gb) \
- unsigned int name##_index = (gb)->index; \
- unsigned int av_unused name##_cache = 0
+ unsigned int name ## _index = (gb)->index; \
+ unsigned int av_unused name ## _cache = 0
 
 #define HAVE_BITS_REMAINING(name, gb) 1
 #else
 #define OPEN_READER(name, gb) \
- unsigned int name##_index = (gb)->index; \
- unsigned int av_unused name##_cache = 0; \
- unsigned int av_unused name##_size_plus8 = \
- (gb)->size_in_bits_plus8
+ unsigned int name ## _index = (gb)->index; \
+ unsigned int av_unused name ## _cache = 0; \
+ unsigned int av_unused name ## _size_plus8 = (gb)->size_in_bits_plus8
 
-#define HAVE_BITS_REMAINING(name, gb) \
- name##_index < name##_size_plus8
+#define HAVE_BITS_REMAINING(name, gb) name ## _index < name ## _size_plus8
 #endif
 
-#define CLOSE_READER(name, gb) (gb)->index = name##_index
+#define CLOSE_READER(name, gb) (gb)->index = name ## _index
 
 #ifdef BITSTREAM_READER_LE
 
 # ifdef LONG_BITSTREAM_READER
-# define UPDATE_CACHE(name, gb) name##_cache = \
- AV_RL64((gb)->buffer + (name##_index >> 3)) >> (name##_index & 7)
+# define UPDATE_CACHE(name, gb) name ## _cache = \
+ AV_RL64((gb)->buffer + (name ## _index >> 3)) >> (name ## _index & 7)
 # else
-# define UPDATE_CACHE(name, gb) name##_cache = \
- AV_RL32((gb)->buffer + (name##_index >> 3)) >> (name##_index & 7)
+# define UPDATE_CACHE(name, gb) name ## _cache = \
+ AV_RL32((gb)->buffer + (name ## _index >> 3)) >> (name ## _index & 7)
 # endif
 
-# define SKIP_CACHE(name, gb, num) name##_cache >>= (num)
+# define SKIP_CACHE(name, gb, num) name ## _cache >>= (num)
 
 #else
 
 # ifdef LONG_BITSTREAM_READER
-# define UPDATE_CACHE(name, gb) name##_cache = \
- AV_RB64((gb)->buffer + (name##_index >> 3)) >> (32 - (name##_index & 7))
+# define UPDATE_CACHE(name, gb) name ## _cache = \
+ AV_RB64((gb)->buffer + (name ## _index >> 3)) >> (32 - (name ## _index & 7))
 # else
-# define UPDATE_CACHE(name, gb) name##_cache = \
- AV_RB32((gb)->buffer + (name##_index >> 3)) << (name##_index & 7)
+# define UPDATE_CACHE(name, gb) name ## _cache = \
+ AV_RB32((gb)->buffer + (name ## _index >> 3)) << (name ## _index & 7)
 # endif
 
-# define SKIP_CACHE(name, gb, num) name##_cache <<= (num)
+# define SKIP_CACHE(name, gb, num) name ## _cache <<= (num)
 
 #endif
 
 #if UNCHECKED_BITSTREAM_READER
-# define SKIP_COUNTER(name, gb, num) name##_index += (num)
+# define SKIP_COUNTER(name, gb, num) name ## _index += (num)
 #else
 # define SKIP_COUNTER(name, gb, num) \
- name##_index = FFMIN(name##_size_plus8, name##_index + (num))
+ name ## _index = FFMIN(name ## _size_plus8, name ## _index + (num))
 #endif
 
-#define SKIP_BITS(name, gb, num) do { \
+#define SKIP_BITS(name, gb, num) \
+ do { \
 SKIP_CACHE(name, gb, num); \
 SKIP_COUNTER(name, gb, num); \
 } while (0)
@@ -180,21 +182,22 @@
 #define LAST_SKIP_BITS(name, gb, num) SKIP_COUNTER(name, gb, num)
 
 #ifdef BITSTREAM_READER_LE
-# define SHOW_UBITS(name, gb, num) zero_extend(name##_cache, num)
-# define SHOW_SBITS(name, gb, num) sign_extend(name##_cache, num)
+# define SHOW_UBITS(name, gb, num) zero_extend(name ## _cache, num)
+# define SHOW_SBITS(name, gb, num) sign_extend(name ## _cache, num)
 #else
-# define SHOW_UBITS(name, gb, num) NEG_USR32(name##_cache, num)
-# define SHOW_SBITS(name, gb, num) NEG_SSR32(name##_cache, num)
+# define SHOW_UBITS(name, gb, num) NEG_USR32(name ## _cache, num)
+# define SHOW_SBITS(name, gb, num) NEG_SSR32(name ## _cache, num)
 #endif
 
-#define GET_CACHE(name, gb) ((uint32_t)name##_cache)
+#define GET_CACHE(name, gb) ((uint32_t) name ## _cache)
 
 static inline int get_bits_count(const GetBitContext *s)
 {
 return s->index;
 }
 
-static inline void skip_bits_long(GetBitContext *s, int n){
+static inline void skip_bits_long(GetBitContext *s, int n)
+{
 #if UNCHECKED_BITSTREAM_READER
 s->index += n;
 #else
@@ -214,7 +217,7 @@
 OPEN_READER(re, s);
 UPDATE_CACHE(re, s);
 cache = GET_CACHE(re, s);
- sign = ~cache >> 31;
+ sign = ~cache >> 31;
 LAST_SKIP_BITS(re, s, n);
 CLOSE_READER(re, s);
 return (NEG_USR32(sign ^ cache, n) ^ sign) - sign;
@@ -268,10 +271,10 @@
 static inline unsigned int get_bits1(GetBitContext *s)
 {
 unsigned int index = s->index;
- uint8_t result = s->buffer[index>>3];
+ uint8_t result = s->buffer[index >> 3];
 #ifdef BITSTREAM_READER_LE
 result >>= index & 7;
- result &= 1;
+ result &= 1;
 #else
 result <<= index & 7;
 result >>= 8 - 1;
@@ -300,15 +303,15 @@
 */
 static inline unsigned int get_bits_long(GetBitContext *s, int n)
 {
- if (n <= MIN_CACHE_BITS)
+ if (n <= MIN_CACHE_BITS) {
 return get_bits(s, n);
- else {
+ } else {
 #ifdef BITSTREAM_READER_LE
 int ret = get_bits(s, 16);
- return ret | (get_bits(s, n-16) << 16);
+ return ret | (get_bits(s, n - 16) << 16);
 #else
- int ret = get_bits(s, 16) << (n-16);
- return ret | get_bits(s, n-16);
+ int ret = get_bits(s, 16) << (n - 16);
+ return ret | get_bits(s, n - 16);
 #endif
 }
 }
@@ -323,9 +326,9 @@
 } else {
 #ifdef BITSTREAM_READER_LE
 uint64_t ret = get_bits_long(s, 32);
- return ret | (uint64_t)get_bits_long(s, n - 32) << 32;
+ return ret | (uint64_t) get_bits_long(s, n - 32) << 32;
 #else
- uint64_t ret = (uint64_t)get_bits_long(s, n - 32) << 32;
+ uint64_t ret = (uint64_t) get_bits_long(s, n - 32) << 32;
 return ret | get_bits_long(s, 32);
 #endif
 }
@@ -344,9 +347,9 @@
 */
 static inline unsigned int show_bits_long(GetBitContext *s, int n)
 {
- if (n <= MIN_CACHE_BITS)
+ if (n <= MIN_CACHE_BITS) {
 return show_bits(s, n);
- else {
+ } else {
 GetBitContext gb = *s;
 return get_bits_long(&gb, n);
 }
@@ -377,19 +380,20 @@
 
 if (bit_size > INT_MAX - 7 || bit_size < 0 || !buffer) {
 buffer_size = bit_size = 0;
- buffer = NULL;
- ret = AVERROR_INVALIDDATA;
+ buffer = NULL;
+ ret = AVERROR_INVALIDDATA;
 }
 
 buffer_size = (bit_size + 7) >> 3;
 
- s->buffer = buffer;
- s->size_in_bits = bit_size;
+ s->buffer = buffer;
+ s->size_in_bits = bit_size;
 #if !UNCHECKED_BITSTREAM_READER
 s->size_in_bits_plus8 = bit_size + 8;
 #endif
- s->buffer_end = buffer + buffer_size;
- s->index = 0;
+ s->buffer_end = buffer + buffer_size;
+ s->index = 0;
+
 return ret;
 }
 
@@ -409,37 +413,40 @@
 return init_get_bits(s, buffer, byte_size * 8);
 }
 
-static inline void align_get_bits(GetBitContext *s)
+static inline const uint8_t *align_get_bits(GetBitContext *s)
 {
 int n = -get_bits_count(s) & 7;
- if (n) skip_bits(s, n);
+ if (n)
+ skip_bits(s, n);
+ return s->buffer + (s->index >> 3);
 }
 
 #define init_vlc(vlc, nb_bits, nb_codes, \
 bits, bits_wrap, bits_size, \
 codes, codes_wrap, codes_size, \
 flags) \
- ff_init_vlc_sparse(vlc, nb_bits, nb_codes, \
- bits, bits_wrap, bits_size, \
- codes, codes_wrap, codes_size, \
- NULL, 0, 0, flags)
+ ff_init_vlc_sparse(vlc, nb_bits, nb_codes, \
+ bits, bits_wrap, bits_size, \
+ codes, codes_wrap, codes_size, \
+ NULL, 0, 0, flags)
 
 int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
- const void *bits, int bits_wrap, int bits_size,
- const void *codes, int codes_wrap, int codes_size,
- const void *symbols, int symbols_wrap, int symbols_size,
- int flags);
-#define INIT_VLC_LE 2
-#define INIT_VLC_USE_NEW_STATIC 4
+ const void *bits, int bits_wrap, int bits_size,
+ const void *codes, int codes_wrap, int codes_size,
+ const void *symbols, int symbols_wrap, int symbols_size,
+ int flags);
 void ff_free_vlc(VLC *vlc);
 
-#define INIT_VLC_STATIC(vlc, bits, a,b,c,d,e,f,g, static_size) do { \
- static VLC_TYPE table[static_size][2]; \
- (vlc)->table = table; \
- (vlc)->table_allocated = static_size; \
- init_vlc(vlc, bits, a,b,c,d,e,f,g, INIT_VLC_USE_NEW_STATIC); \
- } while (0)
+#define INIT_VLC_LE 2
+#define INIT_VLC_USE_NEW_STATIC 4
 
+#define INIT_VLC_STATIC(vlc, bits, a, b, c, d, e, f, g, static_size) \
+ do { \
+ static VLC_TYPE table[static_size][2]; \
+ (vlc)->table = table; \
+ (vlc)->table_allocated = static_size; \
+ init_vlc(vlc, bits, a, b, c, d, e, f, g, INIT_VLC_USE_NEW_STATIC); \
+ } while (0)
 
 /**
 * If the vlc code is invalid and max_depth=1, then no bits will be removed.
@@ -478,32 +485,32 @@
 SKIP_BITS(name, gb, n); \
 } while (0)
 
-#define GET_RL_VLC(level, run, name, gb, table, bits, max_depth, need_update) \
- do { \
- int n, nb_bits; \
- unsigned int index; \
- \
- index = SHOW_UBITS(name, gb, bits); \
- level = table[index].level; \
- n = table[index].len; \
- \
- if (max_depth > 1 && n < 0) { \
- SKIP_BITS(name, gb, bits); \
- if (need_update) { \
- UPDATE_CACHE(name, gb); \
- } \
- \
- nb_bits = -n; \
- \
- index = SHOW_UBITS(name, gb, nb_bits) + level; \
- level = table[index].level; \
- n = table[index].len; \
- } \
- run = table[index].run; \
- SKIP_BITS(name, gb, n); \
+#define GET_RL_VLC(level, run, name, gb, table, bits, \
+ max_depth, need_update) \
+ do { \
+ int n, nb_bits; \
+ unsigned int index; \
+ \
+ index = SHOW_UBITS(name, gb, bits); \
+ level = table[index].level; \
+ n = table[index].len; \
+ \
+ if (max_depth > 1 && n < 0) { \
+ SKIP_BITS(name, gb, bits); \
+ if (need_update) { \
+ UPDATE_CACHE(name, gb); \
+ } \
+ \
+ nb_bits = -n; \
+ \
+ index = SHOW_UBITS(name, gb, nb_bits) + level; \
+ level = table[index].level; \
+ n = table[index].len; \
+ } \
+ run = table[index].run; \
+ SKIP_BITS(name, gb, n); \
 } while (0)
 
-
 /**
 * Parse a vlc code.
 * @param bits is the number of bits which will be read at once, must be
@@ -523,6 +530,7 @@
 GET_VLC(code, re, s, table, bits, max_depth);
 
 CLOSE_READER(re, s);
+
 return code;
 }
 
@@ -556,9 +564,8 @@
 {
 int i;
 
- for (i = n-1; i >= 0; i--) {
- av_log(NULL, AV_LOG_DEBUG, "%d", (bits>>i)&1);
- }
+ for (i = n - 1; i >= 0; i--)
+ av_log(NULL, AV_LOG_DEBUG, "%d", (bits >> i) & 1);
 for (i = n; i < 24; i++)
 av_log(NULL, AV_LOG_DEBUG, " ");
 }
@@ -570,9 +577,11 @@
 
 print_bin(r, n);
 av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d bit @%5d in %s %s:%d\n",
- r, n, r, get_bits_count(s)-n, file, func, line);
+ r, n, r, get_bits_count(s) - n, file, func, line);
+
 return r;
 }
+
 static inline int get_vlc_trace(GetBitContext *s, VLC_TYPE (*table)[2],
 int bits, int max_depth, const char *file,
 const char *func, int line)
@@ -581,14 +590,16 @@
 int pos = get_bits_count(s);
 int r = get_vlc2(s, table, bits, max_depth);
 int len = get_bits_count(s) - pos;
- int bits2 = show >> (24-len);
+ int bits2 = show >> (24 - len);
 
 print_bin(bits2, len);
 
 av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d vlc @%5d in %s %s:%d\n",
 bits2, len, r, pos, file, func, line);
+
 return r;
 }
+
 static inline int get_xbits_trace(GetBitContext *s, int n, const char *file,
 const char *func, int line)
 {
@@ -597,20 +608,22 @@
 
 print_bin(show, n);
 av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d xbt @%5d in %s %s:%d\n",
- show, n, r, get_bits_count(s)-n, file, func, line);
+ show, n, r, get_bits_count(s) - n, file, func, line);
+
 return r;
 }
 
-#define get_bits(s, n) get_bits_trace(s, n, __FILE__, __PRETTY_FUNCTION__, __LINE__)
-#define get_bits1(s) get_bits_trace(s, 1, __FILE__, __PRETTY_FUNCTION__, __LINE__)
+#define get_bits(s, n) get_bits_trace(s , n, __FILE__, __PRETTY_FUNCTION__, __LINE__)
+#define get_bits1(s) get_bits_trace(s, 1, __FILE__, __PRETTY_FUNCTION__, __LINE__)
 #define get_xbits(s, n) get_xbits_trace(s, n, __FILE__, __PRETTY_FUNCTION__, __LINE__)
-#define get_vlc(s, vlc) get_vlc_trace(s, (vlc)->table, (vlc)->bits, 3, __FILE__, __PRETTY_FUNCTION__, __LINE__)
-#define get_vlc2(s, tab, bits, max) get_vlc_trace(s, tab, bits, max, __FILE__, __PRETTY_FUNCTION__, __LINE__)
+
+#define get_vlc(s, vlc) get_vlc_trace(s, (vlc)->table, (vlc)->bits, 3, __FILE__, __PRETTY_FUNCTION__, __LINE__)
+#define get_vlc2(s, tab, bits, max) get_vlc_trace(s, tab, bits, max, __FILE__, __PRETTY_FUNCTION__, __LINE__)
 
 #define tprintf(p, ...) av_log(p, AV_LOG_DEBUG, __VA_ARGS__)
 
 #else //TRACE
-#define tprintf(p, ...) {}
+#define tprintf(p, ...) { }
 #endif
 
 #endif /* AVCODEC_GET_BITS_H */

libav-v9.6.tar.bz2/libavcodec/gif.c -> libav-v10.1.tar.bz2/libavcodec/gif.c Changed

@@ -4,6 +4,8 @@
 * Copyright (c) 2002 Francois Revol
 * Copyright (c) 2006 Baptiste Coudurier
 *
+ * first version by Francois Revol <revol@free.fr>
+ *
 * This file is part of Libav.
 *
 * Libav is free software; you can redistribute it and/or
@@ -22,8 +24,6 @@
 */
 
 /*
- * First version by Francois Revol revol@free.fr
- *
 * Features and limitations:
 * - currently no compression is performed,
 * in fact the size of the data is 9/8 the size of the image in 8bpp
@@ -53,7 +53,6 @@
 #include "put_bits.h"
 
 typedef struct {
- AVFrame picture;
 LZWState *lzw;
 uint8_t *buf;
 } GIFContext;
@@ -131,7 +130,13 @@
 {
 GIFContext *s = avctx->priv_data;
 
- 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->lzw = av_mallocz(ff_lzw_encode_state_size);
 if (!s->lzw)
 return AVERROR(ENOMEM);
@@ -145,8 +150,6 @@
 static int gif_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 const AVFrame *pict, int *got_packet)
 {
- GIFContext *s = avctx->priv_data;
- AVFrame *const p = &s->picture;
 uint8_t *outbuf_ptr, *end;
 int ret;
 
@@ -157,9 +160,6 @@
 outbuf_ptr = pkt->data;
 end = pkt->data + pkt->size;
 
- *p = *pict;
- p->pict_type = AV_PICTURE_TYPE_I;
- p->key_frame = 1;
 gif_image_write_header(avctx, &outbuf_ptr, (uint32_t *)pict->data[1]);
 gif_image_write_image(avctx, &outbuf_ptr, end, pict->data[0], pict->linesize[0]);
 
@@ -174,6 +174,8 @@
 {
 GIFContext *s = avctx->priv_data;
 
+ av_frame_free(&avctx->coded_frame);
+
 av_freep(&s->lzw);
 av_freep(&s->buf);
 return 0;
@@ -181,6 +183,7 @@
 
 AVCodec ff_gif_encoder = {
 .name = "gif",
+ .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_GIF,
 .priv_data_size = sizeof(GIFContext),
@@ -191,5 +194,4 @@
 AV_PIX_FMT_RGB8, AV_PIX_FMT_BGR8, AV_PIX_FMT_RGB4_BYTE, AV_PIX_FMT_BGR4_BYTE,
 AV_PIX_FMT_GRAY8, AV_PIX_FMT_PAL8, AV_PIX_FMT_NONE
 },
- .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"),
 };

libav-v9.6.tar.bz2/libavcodec/gifdec.c -> libav-v10.1.tar.bz2/libavcodec/gifdec.c Changed

@@ -20,8 +20,6 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-//#define DEBUG
-
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "bytestream.h"
@@ -34,7 +32,6 @@
 #define GCE_DISPOSAL_RESTORE 3
 
 typedef struct GifState {
- AVFrame picture;
 int screen_width;
 int screen_height;
 int bits_per_pixel;
@@ -49,8 +46,7 @@
 int gce_delay;
 
 /* LZW compatible decoder */
- const uint8_t *bytestream;
- const uint8_t *bytestream_end;
+ GetByteContext gb;
 LZWState *lzw;
 
 /* aux buffers */
@@ -63,17 +59,17 @@
 static const uint8_t gif87a_sig[6] = "GIF87a";
 static const uint8_t gif89a_sig[6] = "GIF89a";
 
-static int gif_read_image(GifState *s)
+static int gif_read_image(GifState *s, AVFrame *frame)
 {
 int left, top, width, height, bits_per_pixel, code_size, flags;
 int is_interleaved, has_local_palette, y, pass, y1, linesize, n, i;
 uint8_t *ptr, *spal, *palette, *ptr1;
 
- left = bytestream_get_le16(&s->bytestream);
- top = bytestream_get_le16(&s->bytestream);
- width = bytestream_get_le16(&s->bytestream);
- height = bytestream_get_le16(&s->bytestream);
- flags = bytestream_get_byte(&s->bytestream);
+ left = bytestream2_get_le16(&s->gb);
+ top = bytestream2_get_le16(&s->gb);
+ width = bytestream2_get_le16(&s->gb);
+ height = bytestream2_get_le16(&s->gb);
+ flags = bytestream2_get_byte(&s->gb);
 is_interleaved = flags & 0x40;
 has_local_palette = flags & 0x80;
 bits_per_pixel = (flags & 0x07) + 1;
@@ -81,7 +77,7 @@
 av_dlog(s->avctx, "gif: image x=%d y=%d w=%d h=%d\n", left, top, width, height);
 
 if (has_local_palette) {
- bytestream_get_buffer(&s->bytestream, s->local_palette, 3 * (1 << bits_per_pixel));
+ bytestream2_get_buffer(&s->gb, s->local_palette, 3 * (1 << bits_per_pixel));
 palette = s->local_palette;
 } else {
 palette = s->global_palette;
@@ -90,8 +86,11 @@
 
 /* verify that all the image is inside the screen dimensions */
 if (left + width > s->screen_width ||
- top + height > s->screen_height)
- return AVERROR(EINVAL);
+ top + height > s->screen_height ||
+ !width || !height) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid image dimensions.\n");
+ return AVERROR_INVALIDDATA;
+ }
 
 /* build the palette */
 n = (1 << bits_per_pixel);
@@ -107,13 +106,13 @@
 s->image_palette[s->transparent_color_index] = 0;
 
 /* now get the image data */
- code_size = bytestream_get_byte(&s->bytestream);
- ff_lzw_decode_init(s->lzw, code_size, s->bytestream,
- s->bytestream_end - s->bytestream, FF_LZW_GIF);
+ code_size = bytestream2_get_byte(&s->gb);
+ ff_lzw_decode_init(s->lzw, code_size, s->gb.buffer,
+ bytestream2_get_bytes_left(&s->gb), FF_LZW_GIF);
 
 /* read all the image */
- linesize = s->picture.linesize[0];
- ptr1 = s->picture.data[0] + top * linesize + left;
+ linesize = frame->linesize[0];
+ ptr1 = frame->data[0] + top * linesize + left;
 ptr = ptr1;
 pass = 0;
 y1 = 0;
@@ -152,7 +151,8 @@
 }
 /* read the garbage data until end marker is found */
 ff_lzw_decode_tail(s->lzw);
- s->bytestream = ff_lzw_cur_ptr(s->lzw);
+
+ bytestream2_skip(&s->gb, ff_lzw_size_read(s->lzw));
 return 0;
 }
 
@@ -161,8 +161,8 @@
 int ext_code, ext_len, i, gce_flags, gce_transparent_index;
 
 /* extension */
- ext_code = bytestream_get_byte(&s->bytestream);
- ext_len = bytestream_get_byte(&s->bytestream);
+ ext_code = bytestream2_get_byte(&s->gb);
+ ext_len = bytestream2_get_byte(&s->gb);
 
 av_dlog(s->avctx, "gif: ext_code=0x%x len=%d\n", ext_code, ext_len);
 
@@ -171,9 +171,9 @@
 if (ext_len != 4)
 goto discard_ext;
 s->transparent_color_index = -1;
- gce_flags = bytestream_get_byte(&s->bytestream);
- s->gce_delay = bytestream_get_le16(&s->bytestream);
- gce_transparent_index = bytestream_get_byte(&s->bytestream);
+ gce_flags = bytestream2_get_byte(&s->gb);
+ s->gce_delay = bytestream2_get_le16(&s->gb);
+ gce_transparent_index = bytestream2_get_byte(&s->gb);
 if (gce_flags & 0x01)
 s->transparent_color_index = gce_transparent_index;
 else
@@ -184,7 +184,7 @@
 gce_flags, s->gce_delay,
 s->transparent_color_index, s->gce_disposal);
 
- ext_len = bytestream_get_byte(&s->bytestream);
+ ext_len = bytestream2_get_byte(&s->gb);
 break;
 }
 
@@ -192,8 +192,8 @@
 discard_ext:
 while (ext_len != 0) {
 for (i = 0; i < ext_len; i++)
- bytestream_get_byte(&s->bytestream);
- ext_len = bytestream_get_byte(&s->bytestream);
+ bytestream2_get_byte(&s->gb);
+ ext_len = bytestream2_get_byte(&s->gb);
 
 av_dlog(s->avctx, "gif: ext_len1=%d\n", ext_len);
 }
@@ -206,31 +206,31 @@
 int v, n;
 int has_global_palette;
 
- if (s->bytestream_end < s->bytestream + 13)
- return -1;
+ if (bytestream2_get_bytes_left(&s->gb) < 13)
+ return AVERROR_INVALIDDATA;
 
 /* read gif signature */
- bytestream_get_buffer(&s->bytestream, sig, 6);
+ bytestream2_get_buffer(&s->gb, sig, 6);
 if (memcmp(sig, gif87a_sig, 6) != 0 &&
 memcmp(sig, gif89a_sig, 6) != 0)
- return -1;
+ return AVERROR_INVALIDDATA;
 
 /* read screen header */
 s->transparent_color_index = -1;
- s->screen_width = bytestream_get_le16(&s->bytestream);
- s->screen_height = bytestream_get_le16(&s->bytestream);
+ s->screen_width = bytestream2_get_le16(&s->gb);
+ s->screen_height = bytestream2_get_le16(&s->gb);
 if( (unsigned)s->screen_width > 32767
 || (unsigned)s->screen_height > 32767){
 av_log(NULL, AV_LOG_ERROR, "picture size too large\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- v = bytestream_get_byte(&s->bytestream);
+ v = bytestream2_get_byte(&s->gb);
 s->color_resolution = ((v & 0x70) >> 4) + 1;
 has_global_palette = (v & 0x80);
 s->bits_per_pixel = (v & 0x07) + 1;
- s->background_color_index = bytestream_get_byte(&s->bytestream);
- bytestream_get_byte(&s->bytestream); /* ignored */
+ s->background_color_index = bytestream2_get_byte(&s->gb);
+ bytestream2_get_byte(&s->gb); /* ignored */
 
 av_dlog(s->avctx, "gif: screen_w=%d screen_h=%d bpp=%d global_palette=%d\n",
 s->screen_width, s->screen_height, s->bits_per_pixel,
@@ -238,35 +238,36 @@
 
 if (has_global_palette) {
 n = 1 << s->bits_per_pixel;
- if (s->bytestream_end < s->bytestream + n * 3)
- return -1;
- bytestream_get_buffer(&s->bytestream, s->global_palette, n * 3);
+ if (bytestream2_get_bytes_left(&s->gb) < n * 3)
+ return AVERROR_INVALIDDATA;
+ bytestream2_get_buffer(&s->gb, s->global_palette, n * 3);
 }
 return 0;
 }
 
-static int gif_parse_next_image(GifState *s)
+static int gif_parse_next_image(GifState *s, AVFrame *frame)
 {
- while (s->bytestream < s->bytestream_end) {
- int code = bytestream_get_byte(&s->bytestream);
+ while (bytestream2_get_bytes_left(&s->gb) > 0) {
+ int code = bytestream2_get_byte(&s->gb);
+ int ret;
 
 av_dlog(s->avctx, "gif: code=%02x '%c'\n", code, code);
 
 switch (code) {
 case ',':
- return gif_read_image(s);
+ return gif_read_image(s, frame);
 case '!':
- if (gif_read_extension(s) < 0)
- return -1;
+ if ((ret = gif_read_extension(s)) < 0)
+ return ret;
 break;
 case ';':
 /* end of image */
 default:
 /* error or erroneous EOF */
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 static av_cold int gif_decode_init(AVCodecContext *avctx)
@@ -275,9 +276,6 @@
 
 s->avctx = avctx;
 
- avcodec_get_frame_defaults(&s->picture);
- avctx->coded_frame= &s->picture;
- s->picture.data[0] = NULL;
 ff_lzw_decode_open(&s->lzw);
 return 0;
 }
@@ -291,30 +289,26 @@
 AVFrame *picture = data;
 int ret;
 
- s->bytestream = buf;
- s->bytestream_end = buf + buf_size;
- if (gif_read_header1(s) < 0)
- return -1;
+ bytestream2_init(&s->gb, buf, buf_size);
+ if ((ret = gif_read_header1(s)) < 0)
+ return ret;
 
 avctx->pix_fmt = AV_PIX_FMT_PAL8;
- if (av_image_check_size(s->screen_width, s->screen_height, 0, avctx))
- return -1;
- avcodec_set_dimensions(avctx, s->screen_width, s->screen_height);
 
- if (s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
- if (ff_get_buffer(avctx, &s->picture) < 0) {
+ if ((ret = ff_set_dimensions(avctx, s->screen_width, s->screen_height)) < 0)
+ return ret;
+
+ if ((ret = ff_get_buffer(avctx, picture, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
- s->image_palette = (uint32_t *)s->picture.data[1];
- ret = gif_parse_next_image(s);
+ s->image_palette = (uint32_t *)picture->data[1];
+ ret = gif_parse_next_image(s, picture);
 if (ret < 0)
 return ret;
 
- *picture = s->picture;
 *got_frame = 1;
- return s->bytestream - buf;
+ return bytestream2_tell(&s->gb);
 }
 
 static av_cold int gif_decode_close(AVCodecContext *avctx)
@@ -322,13 +316,12 @@
 GifState *s = avctx->priv_data;
 
 ff_lzw_decode_close(&s->lzw);
- if(s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
 return 0;
 }
 
 AVCodec ff_gif_decoder = {
 .name = "gif",
+ .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_GIF,
 .priv_data_size = sizeof(GifState),
@@ -336,5 +329,4 @@
 .close = gif_decode_close,
 .decode = gif_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"),
 };

libav-v9.6.tar.bz2/libavcodec/golomb.h -> libav-v10.1.tar.bz2/libavcodec/golomb.h Changed

@@ -31,6 +31,7 @@
 #define AVCODEC_GOLOMB_H
 
 #include <stdint.h>
+
 #include "get_bits.h"
 #include "put_bits.h"
 
@@ -46,27 +47,26 @@
 extern const int8_t ff_interleaved_se_golomb_vlc_code[256];
 extern const uint8_t ff_interleaved_dirac_golomb_vlc_code[256];
 
-
- /**
+/**
 * read unsigned exp golomb code.
 */
-static inline int get_ue_golomb(GetBitContext *gb){
+static inline int get_ue_golomb(GetBitContext *gb)
+{
 unsigned int buf;
- int log;
 
 OPEN_READER(re, gb);
 UPDATE_CACHE(re, gb);
- buf=GET_CACHE(re, gb);
+ buf = GET_CACHE(re, gb);
 
- if(buf >= (1<<27)){
+ if (buf >= (1 << 27)) {
 buf >>= 32 - 9;
 LAST_SKIP_BITS(re, gb, ff_golomb_vlc_len[buf]);
 CLOSE_READER(re, gb);
 
 return ff_ue_golomb_vlc_code[buf];
- }else{
- log= 2*av_log2(buf) - 31;
- buf>>= log;
+ } else {
+ int log = 2 * av_log2(buf) - 31;
+ buf >>= log;
 buf--;
 LAST_SKIP_BITS(re, gb, 32 - log);
 CLOSE_READER(re, gb);
@@ -89,16 +89,17 @@
 return get_bits_long(gb, log + 1) - 1;
 }
 
- /**
+/**
 * read unsigned exp golomb code, constraint to a max of 31.
 * the return value is undefined if the stored value exceeds 31.
 */
-static inline int get_ue_golomb_31(GetBitContext *gb){
+static inline int get_ue_golomb_31(GetBitContext *gb)
+{
 unsigned int buf;
 
 OPEN_READER(re, gb);
 UPDATE_CACHE(re, gb);
- buf=GET_CACHE(re, gb);
+ buf = GET_CACHE(re, gb);
 
 buf >>= 32 - 9;
 LAST_SKIP_BITS(re, gb, ff_golomb_vlc_len[buf]);
@@ -113,24 +114,25 @@
 
 OPEN_READER(re, gb);
 UPDATE_CACHE(re, gb);
- buf=GET_CACHE(re, gb);
+ buf = GET_CACHE(re, gb);
 
- if(buf&0xAA800000){
+ if (buf & 0xAA800000) {
 buf >>= 32 - 8;
 LAST_SKIP_BITS(re, gb, ff_interleaved_golomb_vlc_len[buf]);
 CLOSE_READER(re, gb);
 
 return ff_interleaved_ue_golomb_vlc_code[buf];
- }else{
+ } else {
 unsigned ret = 1;
 
 do {
 buf >>= 32 - 8;
- LAST_SKIP_BITS(re, gb, FFMIN(ff_interleaved_golomb_vlc_len[buf], 8));
+ LAST_SKIP_BITS(re, gb,
+ FFMIN(ff_interleaved_golomb_vlc_len[buf], 8));
 
- if (ff_interleaved_golomb_vlc_len[buf] != 9){
+ if (ff_interleaved_golomb_vlc_len[buf] != 9) {
 ret <<= (ff_interleaved_golomb_vlc_len[buf] - 1) >> 1;
- ret |= ff_interleaved_dirac_golomb_vlc_code[buf];
+ ret |= ff_interleaved_dirac_golomb_vlc_code[buf];
 break;
 }
 ret = (ret << 4) | ff_interleaved_dirac_golomb_vlc_code[buf];
@@ -146,96 +148,115 @@
 /**
 * read unsigned truncated exp golomb code.
 */
-static inline int get_te0_golomb(GetBitContext *gb, int range){
+static inline int get_te0_golomb(GetBitContext *gb, int range)
+{
 assert(range >= 1);
 
- if(range==1) return 0;
- else if(range==2) return get_bits1(gb)^1;
- else return get_ue_golomb(gb);
+ if (range == 1)
+ return 0;
+ else if (range == 2)
+ return get_bits1(gb) ^ 1;
+ else
+ return get_ue_golomb(gb);
 }
 
 /**
 * read unsigned truncated exp golomb code.
 */
-static inline int get_te_golomb(GetBitContext *gb, int range){
+static inline int get_te_golomb(GetBitContext *gb, int range)
+{
 assert(range >= 1);
 
- if(range==2) return get_bits1(gb)^1;
- else return get_ue_golomb(gb);
+ if (range == 2)
+ return get_bits1(gb) ^ 1;
+ else
+ return get_ue_golomb(gb);
 }
 
-
 /**
 * read signed exp golomb code.
 */
-static inline int get_se_golomb(GetBitContext *gb){
+static inline int get_se_golomb(GetBitContext *gb)
+{
 unsigned int buf;
- int log;
 
 OPEN_READER(re, gb);
 UPDATE_CACHE(re, gb);
- buf=GET_CACHE(re, gb);
+ buf = GET_CACHE(re, gb);
 
- if(buf >= (1<<27)){
+ if (buf >= (1 << 27)) {
 buf >>= 32 - 9;
 LAST_SKIP_BITS(re, gb, ff_golomb_vlc_len[buf]);
 CLOSE_READER(re, gb);
 
 return ff_se_golomb_vlc_code[buf];
- }else{
- log= 2*av_log2(buf) - 31;
- buf>>= log;
+ } else {
+ int log = 2 * av_log2(buf) - 31;
+ buf >>= log;
 
 LAST_SKIP_BITS(re, gb, 32 - log);
 CLOSE_READER(re, gb);
 
- if(buf&1) buf= -(buf>>1);
- else buf= (buf>>1);
+ if (buf & 1)
+ buf = -(buf >> 1);
+ else
+ buf = (buf >> 1);
 
 return buf;
 }
 }
 
-static inline int svq3_get_se_golomb(GetBitContext *gb){
+static inline int get_se_golomb_long(GetBitContext *gb)
+{
+ unsigned int buf = get_ue_golomb_long(gb);
+
+ if (buf & 1)
+ buf = (buf + 1) >> 1;
+ else
+ buf = -(buf >> 1);
+
+ return buf;
+}
+
+static inline int svq3_get_se_golomb(GetBitContext *gb)
+{
 unsigned int buf;
- int log;
 
 OPEN_READER(re, gb);
 UPDATE_CACHE(re, gb);
- buf=GET_CACHE(re, gb);
+ buf = GET_CACHE(re, gb);
 
- if(buf&0xAA800000){
+ if (buf & 0xAA800000) {
 buf >>= 32 - 8;
 LAST_SKIP_BITS(re, gb, ff_interleaved_golomb_vlc_len[buf]);
 CLOSE_READER(re, gb);
 
 return ff_interleaved_se_golomb_vlc_code[buf];
- }else{
+ } else {
+ int log;
 LAST_SKIP_BITS(re, gb, 8);
 UPDATE_CACHE(re, gb);
 buf |= 1 | (GET_CACHE(re, gb) >> 8);
 
- if((buf & 0xAAAAAAAA) == 0)
+ if ((buf & 0xAAAAAAAA) == 0)
 return INVALID_VLC;
 
- for(log=31; (buf & 0x80000000) == 0; log--){
+ for (log = 31; (buf & 0x80000000) == 0; log--)
 buf = (buf << 2) - ((buf << log) >> (log - 1)) + (buf >> 30);
- }
 
- LAST_SKIP_BITS(re, gb, 63 - 2*log - 8);
+ LAST_SKIP_BITS(re, gb, 63 - 2 * log - 8);
 CLOSE_READER(re, gb);
 
 return (signed) (((((buf << log) >> log) - 1) ^ -(buf & 0x1)) + 1) >> 1;
 }
 }
 
-static inline int dirac_get_se_golomb(GetBitContext *gb){
- uint32_t buf;
- uint32_t ret;
-
- ret = svq3_get_ue_golomb(gb);
+static inline int dirac_get_se_golomb(GetBitContext *gb)
+{
+ uint32_t ret = svq3_get_ue_golomb(gb);
 
 if (ret) {
+ uint32_t buf;
 OPEN_READER(re, gb);
 UPDATE_CACHE(re, gb);
 buf = SHOW_SBITS(re, gb, 1);
@@ -250,24 +271,26 @@
 /**
 * read unsigned golomb rice code (ffv1).
 */
-static inline int get_ur_golomb(GetBitContext *gb, int k, int limit, int esc_len){
+static inline int get_ur_golomb(GetBitContext *gb, int k, int limit,
+ int esc_len)
+{
 unsigned int buf;
 int log;
 
 OPEN_READER(re, gb);
 UPDATE_CACHE(re, gb);
- buf=GET_CACHE(re, gb);
+ buf = GET_CACHE(re, gb);
 
- log= av_log2(buf);
+ log = av_log2(buf);
 
- if(log > 31-limit){
+ if (log > 31 - limit) {
 buf >>= log - k;
- buf += (30-log)<<k;
+ buf += (30 - log) << k;
 LAST_SKIP_BITS(re, gb, 32 + k - log);
 CLOSE_READER(re, gb);
 
 return buf;
- }else{
+ } else {
 LAST_SKIP_BITS(re, gb, limit);
 UPDATE_CACHE(re, gb);
 
@@ -283,24 +306,27 @@
 /**
 * read unsigned golomb rice code (jpegls).
 */
-static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, int esc_len){
+static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit,
+ int esc_len)
+{
 unsigned int buf;
 int log;
 
 OPEN_READER(re, gb);
 UPDATE_CACHE(re, gb);
- buf=GET_CACHE(re, gb);
+ buf = GET_CACHE(re, gb);
 
- log= av_log2(buf);
+ log = av_log2(buf);
 
- if(log - k >= 32-MIN_CACHE_BITS+(MIN_CACHE_BITS==32) && 32-log < limit){
+ if (log - k >= 32 - MIN_CACHE_BITS + (MIN_CACHE_BITS == 32) &&
+ 32 - log < limit) {
 buf >>= log - k;
- buf += (30-log)<<k;
+ buf += (30 - log) << k;
 LAST_SKIP_BITS(re, gb, 32 + k - log);
 CLOSE_READER(re, gb);
 
 return buf;
- }else{
+ } else {
 int i;
 for (i = 0; i < limit && SHOW_UBITS(re, gb, 1) == 0 && HAVE_BITS_REMAINING(re, gb); i++) {
 LAST_SKIP_BITS(re, gb, 1);
@@ -308,23 +334,23 @@
 }
 SKIP_BITS(re, gb, 1);
 
- if(i < limit - 1){
- if(k){
+ if (i < limit - 1) {
+ if (k) {
 buf = SHOW_UBITS(re, gb, k);
 LAST_SKIP_BITS(re, gb, k);
- }else{
- buf=0;
+ } else {
+ buf = 0;
 }
 
 CLOSE_READER(re, gb);
- return buf + (i<<k);
- }else if(i == limit - 1){
+ return buf + (i << k);
+ } else if (i == limit - 1) {
 buf = SHOW_UBITS(re, gb, esc_len);
 LAST_SKIP_BITS(re, gb, esc_len);
 CLOSE_READER(re, gb);
 
 return buf + 1;
- }else
+ } else
 return -1;
 }
 }
@@ -332,12 +358,16 @@
 /**
 * read signed golomb rice code (ffv1).
 */
-static inline int get_sr_golomb(GetBitContext *gb, int k, int limit, int esc_len){
- int v= get_ur_golomb(gb, k, limit, esc_len);
+static inline int get_sr_golomb(GetBitContext *gb, int k, int limit,
+ int esc_len)
+{
+ int v = get_ur_golomb(gb, k, limit, esc_len);
 
 v++;
- if (v&1) return v>>1;
- else return -(v>>1);
+ if (v & 1)
+ return v >> 1;
+ else
+ return -(v >> 1);
 
 // return (v>>1) ^ -(v&1);
 }
@@ -345,22 +375,25 @@
 /**
 * read signed golomb rice code (flac).
 */
-static inline int get_sr_golomb_flac(GetBitContext *gb, int k, int limit, int esc_len){
- int v= get_ur_golomb_jpegls(gb, k, limit, esc_len);
- return (v>>1) ^ -(v&1);
+static inline int get_sr_golomb_flac(GetBitContext *gb, int k, int limit,
+ int esc_len)
+{
+ int v = get_ur_golomb_jpegls(gb, k, limit, esc_len);
+ return (v >> 1) ^ -(v & 1);
 }
 
 /**
 * read unsigned golomb rice code (shorten).
 */
-static inline unsigned int get_ur_golomb_shorten(GetBitContext *gb, int k){
- return get_ur_golomb_jpegls(gb, k, INT_MAX, 0);
+static inline unsigned int get_ur_golomb_shorten(GetBitContext *gb, int k)
+{
+ return get_ur_golomb_jpegls(gb, k, INT_MAX, 0);
 }
 
 /**
 * read signed golomb rice code (shorten).
 */
-static inline int get_sr_golomb_shorten(GetBitContext* gb, int k)
+static inline int get_sr_golomb_shorten(GetBitContext *gb, int k)
 {
 int uvar = get_ur_golomb_jpegls(gb, k + 1, INT_MAX, 0);
 if (uvar & 1)
@@ -369,22 +402,21 @@
 return uvar >> 1;
 }
 
-
-
 #ifdef TRACE
 
 static inline int get_ue(GetBitContext *s, const char *file, const char *func,
 int line)
 {
- int show= show_bits(s, 24);
- int pos= get_bits_count(s);
- int i= get_ue_golomb(s);
- int len= get_bits_count(s) - pos;
- int bits= show>>(24-len);
+ int show = show_bits(s, 24);
+ int pos = get_bits_count(s);
+ int i = get_ue_golomb(s);
+ int len = get_bits_count(s) - pos;
+ int bits = show >> (24 - len);
 
 print_bin(bits, len);
 
- av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d ue @%5d in %s %s:%d\n", bits, len, i, pos, file, func, line);
+ av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d ue @%5d in %s %s:%d\n",
+ bits, len, i, pos, file, func, line);
 
 return i;
 }
@@ -392,87 +424,96 @@
 static inline int get_se(GetBitContext *s, const char *file, const char *func,
 int line)
 {
- int show= show_bits(s, 24);
- int pos= get_bits_count(s);
- int i= get_se_golomb(s);
- int len= get_bits_count(s) - pos;
- int bits= show>>(24-len);
+ int show = show_bits(s, 24);
+ int pos = get_bits_count(s);
+ int i = get_se_golomb(s);
+ int len = get_bits_count(s) - pos;
+ int bits = show >> (24 - len);
 
 print_bin(bits, len);
 
- av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d se @%5d in %s %s:%d\n", bits, len, i, pos, file, func, line);
+ av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d se @%5d in %s %s:%d\n",
+ bits, len, i, pos, file, func, line);
 
 return i;
 }
 
-static inline int get_te(GetBitContext *s, int r, char *file, const char *func, int line){
- int show= show_bits(s, 24);
- int pos= get_bits_count(s);
- int i= get_te0_golomb(s, r);
- int len= get_bits_count(s) - pos;
- int bits= show>>(24-len);
+static inline int get_te(GetBitContext *s, int r, char *file, const char *func,
+ int line)
+{
+ int show = show_bits(s, 24);
+ int pos = get_bits_count(s);
+ int i = get_te0_golomb(s, r);
+ int len = get_bits_count(s) - pos;
+ int bits = show >> (24 - len);
 
 print_bin(bits, len);
 
- av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d te @%5d in %s %s:%d\n", bits, len, i, pos, file, func, line);
+ av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d te @%5d in %s %s:%d\n",
+ bits, len, i, pos, file, func, line);
 
 return i;
 }
 
 #define get_ue_golomb(a) get_ue(a, __FILE__, __PRETTY_FUNCTION__, __LINE__)
 #define get_se_golomb(a) get_se(a, __FILE__, __PRETTY_FUNCTION__, __LINE__)
-#define get_te_golomb(a, r) get_te(a, r, __FILE__, __PRETTY_FUNCTION__, __LINE__)
+#define get_te_golomb(a, r) get_te(a, r, __FILE__, __PRETTY_FUNCTION__, __LINE__)
 #define get_te0_golomb(a, r) get_te(a, r, __FILE__, __PRETTY_FUNCTION__, __LINE__)
 
-#endif
+#endif /* TRACE */
 
 /**
 * write unsigned exp golomb code.
 */
-static inline void set_ue_golomb(PutBitContext *pb, int i){
- int e;
-
- assert(i>=0);
+static inline void set_ue_golomb(PutBitContext *pb, int i)
+{
+ assert(i >= 0);
 
 #if 0
- if(i=0){
+ if (i = 0) {
 put_bits(pb, 1, 1);
 return;
 }
 #endif
- if(i<256)
- put_bits(pb, ff_ue_golomb_len[i], i+1);
- else{
- e= av_log2(i+1);
-
- put_bits(pb, 2*e+1, i+1);
+ if (i < 256)
+ put_bits(pb, ff_ue_golomb_len[i], i + 1);
+ else {
+ int e = av_log2(i + 1);
+ put_bits(pb, 2 * e + 1, i + 1);
 }
 }
 
 /**
 * write truncated unsigned exp golomb code.
 */
-static inline void set_te_golomb(PutBitContext *pb, int i, int range){
+static inline void set_te_golomb(PutBitContext *pb, int i, int range)
+{
 assert(range >= 1);
- assert(i<=range);
+ assert(i <= range);
 
- if(range==2) put_bits(pb, 1, i^1);
- else set_ue_golomb(pb, i);
+ if (range == 2)
+ put_bits(pb, 1, i ^ 1);
+ else
+ set_ue_golomb(pb, i);
 }
 
 /**
 * write signed exp golomb code. 16 bits at most.
 */
-static inline void set_se_golomb(PutBitContext *pb, int i){
+static inline void set_se_golomb(PutBitContext *pb, int i)
+{
 #if 0
- if(i<=0) i= -2*i;
- else i= 2*i-1;
+ if (i <= 0)
+ i = -2 * i;
+ else
+ i = 2 * i - 1;
 #elif 1
- i= 2*i-1;
- if(i<0) i^= -1; //FIXME check if gcc does the right thing
+ i = 2 * i - 1;
+ if (i < 0)
+ i ^= -1; //FIXME check if gcc does the right thing
 #else
- i= 2*i-1;
- i^= (i>>31);
+ i = 2 * i - 1;
+ i ^= (i >> 31);
 #endif
 set_ue_golomb(pb, i);
 }
@@ -480,42 +521,45 @@
 /**
 * write unsigned golomb rice code (ffv1).
 */
-static inline void set_ur_golomb(PutBitContext *pb, int i, int k, int limit, int esc_len){
+static inline void set_ur_golomb(PutBitContext *pb, int i, int k, int limit,
+ int esc_len)
+{
 int e;
 
- assert(i>=0);
+ assert(i >= 0);
 
- e= i>>k;
- if(e<limit){
- put_bits(pb, e + k + 1, (1<<k) + (i&((1<<k)-1)));
- }else{
+ e = i >> k;
+ if (e < limit)
+ put_bits(pb, e + k + 1, (1 << k) + (i & ((1 << k) - 1)));
+ else
 put_bits(pb, limit + esc_len, i - limit + 1);
- }
 }
 
 /**
 * write unsigned golomb rice code (jpegls).
 */
-static inline void set_ur_golomb_jpegls(PutBitContext *pb, int i, int k, int limit, int esc_len){
+static inline void set_ur_golomb_jpegls(PutBitContext *pb, int i, int k,
+ int limit, int esc_len)
+{
 int e;
 
- assert(i>=0);
+ assert(i >= 0);
 
- e= (i>>k) + 1;
- if(e<limit){
- while(e > 31) {
+ e = (i >> k) + 1;
+ if (e < limit) {
+ while (e > 31) {
 put_bits(pb, 31, 0);
 e -= 31;
 }
 put_bits(pb, e, 1);
- if(k)
+ if (k)
 put_sbits(pb, k, i);
- }else{
- while(limit > 31) {
+ } else {
+ while (limit > 31) {
 put_bits(pb, 31, 0);
 limit -= 31;
 }
- put_bits(pb, limit , 1);
+ put_bits(pb, limit, 1);
 put_bits(pb, esc_len, i - 1);
 }
 }
@@ -523,11 +567,13 @@
 /**
 * write signed golomb rice code (ffv1).
 */
-static inline void set_sr_golomb(PutBitContext *pb, int i, int k, int limit, int esc_len){
+static inline void set_sr_golomb(PutBitContext *pb, int i, int k, int limit,
+ int esc_len)
+{
 int v;
 
- v = -2*i-1;
- v ^= (v>>31);
+ v = -2 * i - 1;
+ v ^= (v >> 31);
 
 set_ur_golomb(pb, v, k, limit, esc_len);
 }
@@ -535,11 +581,13 @@
 /**
 * write signed golomb rice code (flac).
 */
-static inline void set_sr_golomb_flac(PutBitContext *pb, int i, int k, int limit, int esc_len){
+static inline void set_sr_golomb_flac(PutBitContext *pb, int i, int k,
+ int limit, int esc_len)
+{
 int v;
 
- v = -2*i-1;
- v ^= (v>>31);
+ v = -2 * i - 1;
+ v ^= (v >> 31);
 
 set_ur_golomb_jpegls(pb, v, k, limit, esc_len);
 }

libav-v9.6.tar.bz2/libavcodec/gsm.h -> libav-v10.1.tar.bz2/libavcodec/gsm.h Changed

libav-v9.6.tar.bz2/libavcodec/gsm_parser.c -> libav-v10.1.tar.bz2/libavcodec/gsm_parser.c Changed

libav-v9.6.tar.bz2/libavcodec/gsmdec.c -> libav-v10.1.tar.bz2/libavcodec/gsmdec.c Changed

@@ -34,11 +34,10 @@
 
 static av_cold int gsm_init(AVCodecContext *avctx)
 {
- GSMContext *s = avctx->priv_data;
-
 avctx->channels = 1;
 avctx->channel_layout = AV_CH_LAYOUT_MONO;
- avctx->sample_rate = 8000;
+ if (!avctx->sample_rate)
+ avctx->sample_rate = 8000;
 avctx->sample_fmt = AV_SAMPLE_FMT_S16;
 
 switch (avctx->codec_id) {
@@ -48,19 +47,25 @@
 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;
+ }
 }
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
 static int gsm_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
- GSMContext *s = avctx->priv_data;
+ AVFrame *frame = data;
 int res;
 GetBitContext gb;
 const uint8_t *buf = avpkt->data;
@@ -73,30 +78,30 @@
 }
 
 /* get output buffer */
- s->frame.nb_samples = avctx->frame_size;
- if ((res = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = avctx->frame_size;
+ if ((res = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return res;
 }
- samples = (int16_t *)s->frame.data[0];
+ samples = (int16_t *)frame->data[0];
 
 switch (avctx->codec_id) {
 case AV_CODEC_ID_GSM:
 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;
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
 return avctx->block_align;
 }
@@ -109,6 +114,7 @@
 
 AVCodec ff_gsm_decoder = {
 .name = "gsm",
+ .long_name = NULL_IF_CONFIG_SMALL("GSM"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_GSM,
 .priv_data_size = sizeof(GSMContext),
@@ -116,11 +122,11 @@
 .decode = gsm_decode_frame,
 .flush = gsm_flush,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("GSM"),
 };
 
 AVCodec ff_gsm_ms_decoder = {
 .name = "gsm_ms",
+ .long_name = NULL_IF_CONFIG_SMALL("GSM Microsoft variant"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_GSM_MS,
 .priv_data_size = sizeof(GSMContext),
@@ -128,5 +134,4 @@
 .decode = gsm_decode_frame,
 .flush = gsm_flush,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("GSM Microsoft variant"),
 };

libav-v9.6.tar.bz2/libavcodec/gsmdec_data.c -> libav-v10.1.tar.bz2/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
+};

libav-v9.6.tar.bz2/libavcodec/gsmdec_data.h -> libav-v10.1.tar.bz2/libavcodec/gsmdec_data.h Changed

libav-v9.6.tar.bz2/libavcodec/gsmdec_template.c -> libav-v10.1.tar.bz2/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));

libav-v9.6.tar.bz2/libavcodec/h261.c -> libav-v10.1.tar.bz2/libavcodec/h261.c Changed

@@ -25,29 +25,68 @@
 * h261codec.
 */
 
-#include "dsputil.h"
 #include "avcodec.h"
 #include "h261.h"
 
-#define IS_FIL(a) ((a)&MB_TYPE_H261_FIL)
+#define IS_FIL(a) ((a) & MB_TYPE_H261_FIL)
 
-uint8_t ff_h261_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3];
+uint8_t ff_h261_rl_table_store[2][2 * MAX_RUN + MAX_LEVEL + 3];
 
-void ff_h261_loop_filter(MpegEncContext *s){
- H261Context * h= (H261Context*)s;
- const int linesize = s->linesize;
- const int uvlinesize= s->uvlinesize;
- uint8_t *dest_y = s->dest[0];
- uint8_t *dest_cb= s->dest[1];
- uint8_t *dest_cr= s->dest[2];
+static void h261_loop_filter(uint8_t *src, int stride)
+{
+ int x, y, xy, yz;
+ int temp[64];
 
- if(!(IS_FIL (h->mtype)))
+ for (x = 0; x < 8; x++) {
+ temp[x] = 4 * src[x];
+ temp[x + 7 * 8] = 4 * src[x + 7 * stride];
+ }
+ for (y = 1; y < 7; y++) {
+ for (x = 0; x < 8; x++) {
+ xy = y * stride + x;
+ yz = y * 8 + x;
+ temp[yz] = src[xy - stride] + 2 * src[xy] + src[xy + stride];
+ }
+ }
+
+ for (y = 0; y < 8; y++) {
+ src[y * stride] = (temp[y * 8] + 2) >> 2;
+ src[y * stride + 7] = (temp[y * 8 + 7] + 2) >> 2;
+ for (x = 1; x < 7; x++) {
+ xy = y * stride + x;
+ yz = y * 8 + x;
+ src[xy] = (temp[yz - 1] + 2 * temp[yz] + temp[yz + 1] + 8) >> 4;
+ }
+ }
+}
+
+void ff_h261_loop_filter(MpegEncContext *s)
+{
+ H261Context *h = (H261Context *)s;
+ const int linesize = s->linesize;
+ const int uvlinesize = s->uvlinesize;
+ uint8_t *dest_y = s->dest[0];
+ uint8_t *dest_cb = s->dest[1];
+ uint8_t *dest_cr = s->dest[2];
+
+ if (!(IS_FIL(h->mtype)))
+ return;
+
+ h261_loop_filter(dest_y, linesize);
+ h261_loop_filter(dest_y + 8, linesize);
+ h261_loop_filter(dest_y + 8 * linesize, linesize);
+ h261_loop_filter(dest_y + 8 * linesize + 8, linesize);
+ h261_loop_filter(dest_cb, uvlinesize);
+ h261_loop_filter(dest_cr, uvlinesize);
+}
+
+av_cold void ff_h261_common_init(void)
+{
+ static int done = 0;
+
+ if (done)
 return;
 
- s->dsp.h261_loop_filter(dest_y , linesize);
- s->dsp.h261_loop_filter(dest_y + 8, linesize);
- s->dsp.h261_loop_filter(dest_y + 8 * linesize , linesize);
- s->dsp.h261_loop_filter(dest_y + 8 * linesize + 8, linesize);
- s->dsp.h261_loop_filter(dest_cb, uvlinesize);
- s->dsp.h261_loop_filter(dest_cr, uvlinesize);
+ ff_init_rl(&ff_h261_rl_tcoeff, ff_h261_rl_table_store);
+ done = 1;
 }

libav-v9.6.tar.bz2/libavcodec/h261.h -> libav-v10.1.tar.bz2/libavcodec/h261.h Changed

@@ -29,11 +29,12 @@
 #define AVCODEC_H261_H
 
 #include "mpegvideo.h"
+#include "rl.h"
 
 /**
  * H261Context
  */
-typedef struct H261Context{
+typedef struct H261Context {
     MpegEncContext s;
 
     int current_mba;
@@ -44,8 +45,29 @@
     int current_mv_y;
     int gob_number;
     int gob_start_code_skipped; // 1 if gob start code is already read before gob header is read
-}H261Context;
+} H261Context;
 
 #define MB_TYPE_H261_FIL 0x800000
 
+extern uint8_t ff_h261_rl_table_store[2][2 * MAX_RUN + MAX_LEVEL + 3];
+
+extern const uint8_t ff_h261_mba_code[35];
+extern const uint8_t ff_h261_mba_bits[35];
+extern const uint8_t ff_h261_mtype_code[10];
+extern const uint8_t ff_h261_mtype_bits[10];
+extern const int     ff_h261_mtype_map[10];
+extern const uint8_t ff_h261_mv_tab[17][2];
+extern const uint8_t ff_h261_cbp_tab[63][2];
+extern RLTable ff_h261_rl_tcoeff;
+
+void ff_h261_loop_filter(MpegEncContext *s);
+void ff_h261_common_init(void);
+
+int ff_h261_get_picture_format(int width, int height);
+void ff_h261_reorder_mb_index(MpegEncContext *s);
+void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64],
+                       int motion_x, int motion_y);
+void ff_h261_encode_picture_header(MpegEncContext *s, int picture_number);
+void ff_h261_encode_init(MpegEncContext *s);
+
 #endif /* AVCODEC_H261_H */

libav-v9.6.tar.bz2/libavcodec/h261_parser.c -> libav-v10.1.tar.bz2/libavcodec/h261_parser.c Changed

@@ -27,38 +27,39 @@
 
 #include "parser.h"
 
-
-static int h261_find_frame_end(ParseContext *pc, AVCodecContext* avctx, const uint8_t *buf, int buf_size){
+static int h261_find_frame_end(ParseContext *pc, AVCodecContext *avctx,
+ const uint8_t *buf, int buf_size)
+{
 int vop_found, i, j;
 uint32_t state;
 
- vop_found= pc->frame_start_found;
- state= pc->state;
+ vop_found = pc->frame_start_found;
+ state = pc->state;
 
- for(i=0; i<buf_size && !vop_found; i++){
- state= (state<<8) | buf[i];
- for(j=0; j<8; j++){
- if(((state>>j)&0xFFFFF0) == 0x000100){
- vop_found=1;
+ for (i = 0; i < buf_size && !vop_found; i++) {
+ state = (state << 8) | buf[i];
+ for (j = 0; j < 8; j++) {
+ if (((state >> j) & 0xFFFFF0) == 0x000100) {
+ vop_found = 1;
 break;
 }
 }
 }
- if(vop_found){
- for(; i<buf_size; i++){
- state= (state<<8) | buf[i];
- for(j=0; j<8; j++){
- if(((state>>j)&0xFFFFF0) == 0x000100){
- pc->frame_start_found=0;
- pc->state= (state>>(3*8))+0xFF00;
- return i-2;
+ if (vop_found) {
+ for (; i < buf_size; i++) {
+ state = (state << 8) | buf[i];
+ for (j = 0; j < 8; j++) {
+ if (((state >> j) & 0xFFFFF0) == 0x000100) {
+ pc->frame_start_found = 0;
+ pc->state = (state >> (3 * 8)) + 0xFF00;
+ return i - 2;
 }
 }
 }
 }
 
- pc->frame_start_found= vop_found;
- pc->state= state;
+ pc->frame_start_found = vop_found;
+ pc->state = state;
 return END_NOT_FOUND;
 }
 
@@ -70,13 +71,13 @@
 ParseContext *pc = s->priv_data;
 int next;
 
- next= h261_find_frame_end(pc,avctx, buf, buf_size);
+ next = h261_find_frame_end(pc, avctx, buf, buf_size);
 if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
- *poutbuf = NULL;
+ *poutbuf = NULL;
 *poutbuf_size = 0;
 return buf_size;
 }
- *poutbuf = buf;
+ *poutbuf = buf;
 *poutbuf_size = buf_size;
 return next;
 }

libav-v10.1.tar.bz2/libavcodec/h261data.c Added

@@ -0,0 +1,155 @@
+/*
+ * copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
+ * copyright (c) 2004 Maarten Daniels
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * H.261 tables.
+ */
+
+#include <stdint.h>
+
+#include "rl.h"
+#include "h261.h"
+
+// H.261 VLC table for macroblock addressing
+const uint8_t ff_h261_mba_code[35] = {
+ 1, 3, 2, 3,
+ 2, 3, 2, 7,
+ 6, 11, 10, 9,
+ 8, 7, 6, 23,
+ 22, 21, 20, 19,
+ 18, 35, 34, 33,
+ 32, 31, 30, 29,
+ 28, 27, 26, 25,
+ 24,
+ 15, // (MBA stuffing)
+ 1 // (start code)
+};
+
+const uint8_t ff_h261_mba_bits[35] = {
+ 1, 3, 3, 4,
+ 4, 5, 5, 7,
+ 7, 8, 8, 8,
+ 8, 8, 8, 10,
+ 10, 10, 10, 10,
+ 10, 11, 11, 11,
+ 11, 11, 11, 11,
+ 11, 11, 11, 11,
+ 11,
+ 11, // (MBA stuffing)
+ 16 // (start code)
+};
+
+// H.261 VLC table for macroblock type
+const uint8_t ff_h261_mtype_code[10] = {
+ 1, 1, 1, 1,
+ 1, 1, 1, 1,
+ 1, 1
+};
+
+const uint8_t ff_h261_mtype_bits[10] = {
+ 4, 7, 1, 5,
+ 9, 8, 10, 3,
+ 2, 6
+};
+
+const int ff_h261_mtype_map[10] = {
+ MB_TYPE_INTRA4x4,
+ MB_TYPE_INTRA4x4 | MB_TYPE_QUANT,
+ MB_TYPE_CBP,
+ MB_TYPE_CBP | MB_TYPE_QUANT,
+ MB_TYPE_16x16,
+ MB_TYPE_16x16 | MB_TYPE_CBP,
+ MB_TYPE_16x16 | MB_TYPE_CBP | MB_TYPE_QUANT,
+ MB_TYPE_16x16 | MB_TYPE_H261_FIL,
+ MB_TYPE_16x16 | MB_TYPE_H261_FIL | MB_TYPE_CBP,
+ MB_TYPE_16x16 | MB_TYPE_H261_FIL | MB_TYPE_CBP | MB_TYPE_QUANT
+};
+
+// H.261 VLC table for motion vectors
+const uint8_t ff_h261_mv_tab[17][2] = {
+ { 1, 1 }, { 1, 2 }, { 1, 3 }, { 1, 4 }, { 3, 6 }, { 5, 7 }, { 4, 7 }, { 3, 7 },
+ { 11, 9 }, { 10, 9 }, { 9, 9 }, { 17, 10 }, { 16, 10 }, { 15, 10 }, { 14, 10 }, { 13, 10 }, { 12, 10 }
+};
+
+// H.261 VLC table for coded block pattern
+const uint8_t ff_h261_cbp_tab[63][2] = {
+ { 11, 5 }, { 9, 5 }, { 13, 6 }, { 13, 4 }, { 23, 7 }, { 19, 7 }, { 31, 8 }, { 12, 4 },
+ { 22, 7 }, { 18, 7 }, { 30, 8 }, { 19, 5 }, { 27, 8 }, { 23, 8 }, { 19, 8 }, { 11, 4 },
+ { 21, 7 }, { 17, 7 }, { 29, 8 }, { 17, 5 }, { 25, 8 }, { 21, 8 }, { 17, 8 }, { 15, 6 },
+ { 15, 8 }, { 13, 8 }, { 3, 9 }, { 15, 5 }, { 11, 8 }, { 7, 8 }, { 7, 9 }, { 10, 4 },
+ { 20, 7 }, { 16, 7 }, { 28, 8 }, { 14, 6 }, { 14, 8 }, { 12, 8 }, { 2, 9 }, { 16, 5 },
+ { 24, 8 }, { 20, 8 }, { 16, 8 }, { 14, 5 }, { 10, 8 }, { 6, 8 }, { 6, 9 }, { 18, 5 },
+ { 26, 8 }, { 22, 8 }, { 18, 8 }, { 13, 5 }, { 9, 8 }, { 5, 8 }, { 5, 9 }, { 12, 5 },
+ { 8, 8 }, { 4, 8 }, { 4, 9 }, { 7, 3 }, { 10, 5 }, { 8, 5 }, { 12, 6 }
+};
+
+// H.261 VLC table for transform coefficients
+static const uint16_t h261_tcoeff_vlc[65][2] = {
+ { 0x2, 2 }, { 0x3, 2 }, { 0x4, 4 }, { 0x5, 5 },
+ { 0x6, 7 }, { 0x26, 8 }, { 0x21, 8 }, { 0xa, 10 },
+ { 0x1d, 12 }, { 0x18, 12 }, { 0x13, 12 }, { 0x10, 12 },
+ { 0x1a, 13 }, { 0x19, 13 }, { 0x18, 13 }, { 0x17, 13 },
+ { 0x3, 3 }, { 0x6, 6 }, { 0x25, 8 }, { 0xc, 10 },
+ { 0x1b, 12 }, { 0x16, 13 }, { 0x15, 13 }, { 0x5, 4 },
+ { 0x4, 7 }, { 0xb, 10 }, { 0x14, 12 }, { 0x14, 13 },
+ { 0x7, 5 }, { 0x24, 8 }, { 0x1c, 12 }, { 0x13, 13 },
+ { 0x6, 5 }, { 0xf, 10 }, { 0x12, 12 }, { 0x7, 6 },
+ { 0x9, 10 }, { 0x12, 13 }, { 0x5, 6 }, { 0x1e, 12 },
+ { 0x4, 6 }, { 0x15, 12 }, { 0x7, 7 }, { 0x11, 12 },
+ { 0x5, 7 }, { 0x11, 13 }, { 0x27, 8 }, { 0x10, 13 },
+ { 0x23, 8 }, { 0x22, 8 }, { 0x20, 8 }, { 0xe, 10 },
+ { 0xd, 10 }, { 0x8, 10 }, { 0x1f, 12 }, { 0x1a, 12 },
+ { 0x19, 12 }, { 0x17, 12 }, { 0x16, 12 }, { 0x1f, 13 },
+ { 0x1e, 13 }, { 0x1d, 13 }, { 0x1c, 13 }, { 0x1b, 13 },
+ { 0x1, 6 } // escape
+};
+
+static const int8_t h261_tcoeff_level[64] = {
+ 0, 1, 2, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15,
+ 1, 2, 3, 4, 5, 6, 7, 1,
+ 2, 3, 4, 5, 1, 2, 3, 4,
+ 1, 2, 3, 1, 2, 3, 1, 2,
+ 1, 2, 1, 2, 1, 2, 1, 2,
+ 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1
+};
+
+static const int8_t h261_tcoeff_run[64] = {
+ 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1,
+ 1, 1, 1, 1, 1, 1, 2, 2,
+ 2, 2, 2, 3, 3, 3, 3, 4,
+ 4, 4, 5, 5, 5, 6, 6, 7,
+ 7, 8, 8, 9, 9, 10, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26
+};
+
+RLTable ff_h261_rl_tcoeff = {
+ 64,
+ 64,
+ h261_tcoeff_vlc,
+ h261_tcoeff_run,
+ h261_tcoeff_level,
+};

libav-v9.6.tar.bz2/libavcodec/h261dec.c -> libav-v10.1.tar.bz2/libavcodec/h261dec.c Changed

@@ -25,12 +25,11 @@
 * H.261 decoder.
 */
 
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h263.h"
 #include "h261.h"
-#include "h261data.h"
+#include "internal.h"
 
 #define H261_MBA_VLC_BITS 9
 #define H261_MTYPE_VLC_BITS 6
@@ -40,55 +39,50 @@
 #define MBA_STUFFING 33
 #define MBA_STARTCODE 34
 
-extern uint8_t ff_h261_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3];
-
 static VLC h261_mba_vlc;
 static VLC h261_mtype_vlc;
 static VLC h261_mv_vlc;
 static VLC h261_cbp_vlc;
 
-static int h261_decode_block(H261Context * h, DCTELEM * block, int n, int coded);
-
-static av_cold void h261_decode_init_vlc(H261Context *h){
+static av_cold void h261_decode_init_vlc(H261Context *h)
+{
 static int done = 0;
 
- if(!done){
+ if (!done) {
 done = 1;
 INIT_VLC_STATIC(&h261_mba_vlc, H261_MBA_VLC_BITS, 35,
- h261_mba_bits, 1, 1,
- h261_mba_code, 1, 1, 662);
+ ff_h261_mba_bits, 1, 1,
+ ff_h261_mba_code, 1, 1, 662);
 INIT_VLC_STATIC(&h261_mtype_vlc, H261_MTYPE_VLC_BITS, 10,
- h261_mtype_bits, 1, 1,
- h261_mtype_code, 1, 1, 80);
+ ff_h261_mtype_bits, 1, 1,
+ ff_h261_mtype_code, 1, 1, 80);
 INIT_VLC_STATIC(&h261_mv_vlc, H261_MV_VLC_BITS, 17,
- &h261_mv_tab[0][1], 2, 1,
- &h261_mv_tab[0][0], 2, 1, 144);
+ &ff_h261_mv_tab[0][1], 2, 1,
+ &ff_h261_mv_tab[0][0], 2, 1, 144);
 INIT_VLC_STATIC(&h261_cbp_vlc, H261_CBP_VLC_BITS, 63,
- &h261_cbp_tab[0][1], 2, 1,
- &h261_cbp_tab[0][0], 2, 1, 512);
- ff_init_rl(&h261_rl_tcoeff, ff_h261_rl_table_store);
- INIT_VLC_RL(h261_rl_tcoeff, 552);
+ &ff_h261_cbp_tab[0][1], 2, 1,
+ &ff_h261_cbp_tab[0][0], 2, 1, 512);
+ INIT_VLC_RL(ff_h261_rl_tcoeff, 552);
 }
 }
 
-static av_cold int h261_decode_init(AVCodecContext *avctx){
- H261Context *h= avctx->priv_data;
- MpegEncContext * const s = &h->s;
+static av_cold int h261_decode_init(AVCodecContext *avctx)
+{
+ H261Context *h = avctx->priv_data;
+ MpegEncContext *const s = &h->s;
 
 // set defaults
 ff_MPV_decode_defaults(s);
- s->avctx = avctx;
-
- s->width = s->avctx->coded_width;
- s->height = s->avctx->coded_height;
- s->codec_id = s->avctx->codec->id;
-
- s->out_format = FMT_H261;
- s->low_delay= 1;
- avctx->pix_fmt= AV_PIX_FMT_YUV420P;
-
- s->codec_id= avctx->codec->id;
-
+ s->avctx = avctx;
+ s->width = s->avctx->coded_width;
+ s->height = s->avctx->coded_height;
+ s->codec_id = s->avctx->codec->id;
+ s->out_format = FMT_H261;
+ s->low_delay = 1;
+ avctx->pix_fmt = AV_PIX_FMT_YUV420P;
+ s->codec_id = avctx->codec->id;
+
+ ff_h261_common_init();
 h261_decode_init_vlc(h);
 
 h->gob_start_code_skipped = 0;
@@ -100,14 +94,15 @@
 * Decode the group of blocks header or slice header.
 * @return <0 if an error occurred
 */
-static int h261_decode_gob_header(H261Context *h){
+static int h261_decode_gob_header(H261Context *h)
+{
 unsigned int val;
- MpegEncContext * const s = &h->s;
+ MpegEncContext *const s = &h->s;
 
- if ( !h->gob_start_code_skipped ){
+ if (!h->gob_start_code_skipped) {
 /* Check for GOB Start Code */
 val = show_bits(&s->gb, 15);
- if(val)
+ if (val)
 return -1;
 
 /* We have a GBSC */
@@ -117,34 +112,34 @@
 h->gob_start_code_skipped = 0;
 
 h->gob_number = get_bits(&s->gb, 4); /* GN */
- s->qscale = get_bits(&s->gb, 5); /* GQUANT */
+ s->qscale = get_bits(&s->gb, 5); /* GQUANT */
 
 /* Check if gob_number is valid */
- if (s->mb_height==18){ //cif
- if ((h->gob_number<=0) || (h->gob_number>12))
+ if (s->mb_height == 18) { // CIF
+ if ((h->gob_number <= 0) || (h->gob_number > 12))
 return -1;
- }
- else{ //qcif
- if ((h->gob_number!=1) && (h->gob_number!=3) && (h->gob_number!=5))
+ } else { // QCIF
+ if ((h->gob_number != 1) && (h->gob_number != 3) &&
+ (h->gob_number != 5))
 return -1;
 }
 
 /* GEI */
- while (get_bits1(&s->gb) != 0) {
+ while (get_bits1(&s->gb) != 0)
 skip_bits(&s->gb, 8);
- }
 
- if(s->qscale==0) {
+ if (s->qscale == 0) {
 av_log(s->avctx, AV_LOG_ERROR, "qscale has forbidden 0 value\n");
 if (s->avctx->err_recognition & AV_EF_BITSTREAM)
 return -1;
 }
 
- // For the first transmitted macroblock in a GOB, MBA is the absolute address. For
- // subsequent macroblocks, MBA is the difference between the absolute addresses of
- // the macroblock and the last transmitted macroblock.
+ /* For the first transmitted macroblock in a GOB, MBA is the absolute
+ * address. For subsequent macroblocks, MBA is the difference between
+ * the absolute addresses of the macroblock and the last transmitted
+ * macroblock. */
 h->current_mba = 0;
- h->mba_diff = 0;
+ h->mba_diff = 0;
 
 return 0;
 }
@@ -153,35 +148,35 @@
 * Decode the group of blocks / video packet header.
 * @return <0 if no resync found
 */
-static int ff_h261_resync(H261Context *h){
- MpegEncContext * const s = &h->s;
+static int h261_resync(H261Context *h)
+{
+ MpegEncContext *const s = &h->s;
 int left, ret;
 
- if ( h->gob_start_code_skipped ){
- ret= h261_decode_gob_header(h);
- if(ret>=0)
+ if (h->gob_start_code_skipped) {
+ ret = h261_decode_gob_header(h);
+ if (ret >= 0)
 return 0;
- }
- else{
- if(show_bits(&s->gb, 15)==0){
- ret= h261_decode_gob_header(h);
- if(ret>=0)
+ } else {
+ if (show_bits(&s->gb, 15) == 0) {
+ ret = h261_decode_gob_header(h);
+ if (ret >= 0)
 return 0;
 }
- //OK, it is not where it is supposed to be ...
- s->gb= s->last_resync_gb;
+ // OK, it is not where it is supposed to be ...
+ s->gb = s->last_resync_gb;
 align_get_bits(&s->gb);
- left= get_bits_left(&s->gb);
+ left = get_bits_left(&s->gb);
 
- for(;left>15+1+4+5; left-=8){
- if(show_bits(&s->gb, 15)==0){
- GetBitContext bak= s->gb;
+ for (; left > 15 + 1 + 4 + 5; left -= 8) {
+ if (show_bits(&s->gb, 15) == 0) {
+ GetBitContext bak = s->gb;
 
- ret= h261_decode_gob_header(h);
- if(ret>=0)
+ ret = h261_decode_gob_header(h);
+ if (ret >= 0)
 return 0;
 
- s->gb= bak;
+ s->gb = bak;
 }
 skip_bits(&s->gb, 8);
 }
@@ -194,32 +189,32 @@
 * Decode skipped macroblocks.
 * @return 0
 */
-static int h261_decode_mb_skipped(H261Context *h, int mba1, int mba2 )
+static int h261_decode_mb_skipped(H261Context *h, int mba1, int mba2)
 {
- MpegEncContext * const s = &h->s;
+ MpegEncContext *const s = &h->s;
 int i;
 
 s->mb_intra = 0;
 
- for(i=mba1; i<mba2; i++){
+ for (i = mba1; i < mba2; i++) {
 int j, xy;
 
- s->mb_x= ((h->gob_number-1) % 2) * 11 + i % 11;
- s->mb_y= ((h->gob_number-1) / 2) * 3 + i / 11;
- xy = s->mb_x + s->mb_y * s->mb_stride;
+ s->mb_x = ((h->gob_number - 1) % 2) * 11 + i % 11;
+ s->mb_y = ((h->gob_number - 1) / 2) * 3 + i / 11;
+ xy = s->mb_x + s->mb_y * s->mb_stride;
 ff_init_block_index(s);
 ff_update_block_index(s);
 
- for(j=0;j<6;j++)
+ for (j = 0; j < 6; j++)
 s->block_last_index[j] = -1;
 
- s->mv_dir = MV_DIR_FORWARD;
- s->mv_type = MV_TYPE_16X16;
- s->current_picture.f.mb_type[xy] = MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0;
- s->mv[0][0][0] = 0;
- s->mv[0][0][1] = 0;
- s->mb_skipped = 1;
- h->mtype &= ~MB_TYPE_H261_FIL;
+ s->mv_dir = MV_DIR_FORWARD;
+ s->mv_type = MV_TYPE_16X16;
+ s->current_picture.mb_type[xy] = MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0;
+ s->mv[0][0][0] = 0;
+ s->mv[0][0][1] = 0;
+ s->mb_skipped = 1;
+ h->mtype &= ~MB_TYPE_H261_FIL;
 
 ff_MPV_decode_mb(s, s->block);
 }
@@ -227,44 +222,140 @@
 return 0;
 }
 
-static int decode_mv_component(GetBitContext *gb, int v){
+static const int mvmap[17] = {
+ 0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14, -15, -16
+};
+
+static int decode_mv_component(GetBitContext *gb, int v)
+{
 int mv_diff = get_vlc2(gb, h261_mv_vlc.table, H261_MV_VLC_BITS, 2);
 
 /* check if mv_diff is valid */
- if ( mv_diff < 0 )
+ if (mv_diff < 0)
 return v;
 
 mv_diff = mvmap[mv_diff];
 
- if(mv_diff && !get_bits1(gb))
- mv_diff= -mv_diff;
+ if (mv_diff && !get_bits1(gb))
+ mv_diff = -mv_diff;
 
 v += mv_diff;
- if (v <=-16) v+= 32;
- else if(v >= 16) v-= 32;
+ if (v <= -16)
+ v += 32;
+ else if (v >= 16)
+ v -= 32;
 
 return v;
 }
 
-static int h261_decode_mb(H261Context *h){
- MpegEncContext * const s = &h->s;
+/**
+ * Decode a macroblock.
+ * @return <0 if an error occurred
+ */
+static int h261_decode_block(H261Context *h, int16_t *block, int n, int coded)
+{
+ MpegEncContext *const s = &h->s;
+ int code, level, i, j, run;
+ RLTable *rl = &ff_h261_rl_tcoeff;
+ const uint8_t *scan_table;
+
+ /* For the variable length encoding there are two code tables, one being
+ * used for the first transmitted LEVEL in INTER, INTER + MC and
+ * INTER + MC + FIL blocks, the second for all other LEVELs except the
+ * first one in INTRA blocks which is fixed length coded with 8 bits.
+ * NOTE: The two code tables only differ in one VLC so we handle that
+ * manually. */
+ scan_table = s->intra_scantable.permutated;
+ if (s->mb_intra) {
+ /* DC coef */
+ level = get_bits(&s->gb, 8);
+ // 0 (00000000b) and -128 (10000000b) are FORBIDDEN
+ if ((level & 0x7F) == 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "illegal dc %d at %d %d\n",
+ level, s->mb_x, s->mb_y);
+ return -1;
+ }
+ /* The code 1000 0000 is not used, the reconstruction level of 1024
+ * being coded as 1111 1111. */
+ if (level == 255)
+ level = 128;
+ block[0] = level;
+ i = 1;
+ } else if (coded) {
+ // Run Level Code
+ // EOB Not possible for first level when cbp is available (that's why the table is different)
+ // 0 1 1s
+ // * * 0*
+ int check = show_bits(&s->gb, 2);
+ i = 0;
+ if (check & 0x2) {
+ skip_bits(&s->gb, 2);
+ block[0] = (check & 0x1) ? -1 : 1;
+ i = 1;
+ }
+ } else {
+ i = 0;
+ }
+ if (!coded) {
+ s->block_last_index[n] = i - 1;
+ return 0;
+ }
+ for (;;) {
+ code = get_vlc2(&s->gb, rl->vlc.table, TCOEFF_VLC_BITS, 2);
+ if (code < 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "illegal ac vlc code at %dx%d\n",
+ s->mb_x, s->mb_y);
+ return -1;
+ }
+ if (code == rl->n) {
+ /* escape */
+ /* The remaining combinations of (run, level) are encoded with a
+ * 20-bit word consisting of 6 bits escape, 6 bits run and 8 bits
+ * level. */
+ run = get_bits(&s->gb, 6);
+ level = get_sbits(&s->gb, 8);
+ } else if (code == 0) {
+ break;
+ } else {
+ run = rl->table_run[code];
+ level = rl->table_level[code];
+ if (get_bits1(&s->gb))
+ level = -level;
+ }
+ i += run;
+ if (i >= 64) {
+ av_log(s->avctx, AV_LOG_ERROR, "run overflow at %dx%d\n",
+ s->mb_x, s->mb_y);
+ return -1;
+ }
+ j = scan_table[i];
+ block[j] = level;
+ i++;
+ }
+ s->block_last_index[n] = i - 1;
+ return 0;
+}
+
+static int h261_decode_mb(H261Context *h)
+{
+ MpegEncContext *const s = &h->s;
 int i, cbp, xy;
 
 cbp = 63;
 // Read mba
- do{
- h->mba_diff = get_vlc2(&s->gb, h261_mba_vlc.table, H261_MBA_VLC_BITS, 2);
+ do {
+ h->mba_diff = get_vlc2(&s->gb, h261_mba_vlc.table,
+ H261_MBA_VLC_BITS, 2);
 
 /* Check for slice end */
 /* NOTE: GOB can be empty (no MB data) or exist only of MBA_stuffing */
- if (h->mba_diff == MBA_STARTCODE){ // start code
+ if (h->mba_diff == MBA_STARTCODE) { // start code
 h->gob_start_code_skipped = 1;
 return SLICE_END;
 }
- }
- while( h->mba_diff == MBA_STUFFING ); // stuffing
+ } while (h->mba_diff == MBA_STUFFING); // stuffing
 
- if ( h->mba_diff < 0 ){
+ if (h->mba_diff < 0) {
 if (get_bits_left(&s->gb) <= 7)
 return SLICE_END;
 
@@ -272,81 +363,84 @@
 return SLICE_ERROR;
 }
 
- h->mba_diff += 1;
+ h->mba_diff += 1;
 h->current_mba += h->mba_diff;
 
- if ( h->current_mba > MBA_STUFFING )
+ if (h->current_mba > MBA_STUFFING)
 return SLICE_ERROR;
 
- s->mb_x= ((h->gob_number-1) % 2) * 11 + ((h->current_mba-1) % 11);
- s->mb_y= ((h->gob_number-1) / 2) * 3 + ((h->current_mba-1) / 11);
- xy = s->mb_x + s->mb_y * s->mb_stride;
+ s->mb_x = ((h->gob_number - 1) % 2) * 11 + ((h->current_mba - 1) % 11);
+ s->mb_y = ((h->gob_number - 1) / 2) * 3 + ((h->current_mba - 1) / 11);
+ xy = s->mb_x + s->mb_y * s->mb_stride;
 ff_init_block_index(s);
 ff_update_block_index(s);
 
 // Read mtype
 h->mtype = get_vlc2(&s->gb, h261_mtype_vlc.table, H261_MTYPE_VLC_BITS, 2);
- h->mtype = h261_mtype_map[h->mtype];
+ if (h->mtype < 0 || h->mtype >= FF_ARRAY_ELEMS(ff_h261_mtype_map)) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid mtype index %d\n",
+ h->mtype);
+ return SLICE_ERROR;
+ }
+ h->mtype = ff_h261_mtype_map[h->mtype];
 
 // Read mquant
- if ( IS_QUANT ( h->mtype ) ){
+ if (IS_QUANT(h->mtype))
 ff_set_qscale(s, get_bits(&s->gb, 5));
- }
 
 s->mb_intra = IS_INTRA4x4(h->mtype);
 
 // Read mv
- if ( IS_16X16 ( h->mtype ) ){
- // Motion vector data is included for all MC macroblocks. MVD is obtained from the macroblock vector by subtracting the
- // vector of the preceding macroblock. For this calculation the vector of the preceding macroblock is regarded as zero in the
- // following three situations:
- // 1) evaluating MVD for macroblocks 1, 12 and 23;
- // 2) evaluating MVD for macroblocks in which MBA does not represent a difference of 1;
- // 3) MTYPE of the previous macroblock was not MC.
- if ( ( h->current_mba == 1 ) || ( h->current_mba == 12 ) || ( h->current_mba == 23 ) ||
- ( h->mba_diff != 1))
- {
+ if (IS_16X16(h->mtype)) {
+ /* Motion vector data is included for all MC macroblocks. MVD is
+ * obtained from the macroblock vector by subtracting the vector
+ * of the preceding macroblock. For this calculation the vector
+ * of the preceding macroblock is regarded as zero in the
+ * following three situations:
+ * 1) evaluating MVD for macroblocks 1, 12 and 23;
+ * 2) evaluating MVD for macroblocks in which MBA does not represent a difference of 1;
+ * 3) MTYPE of the previous macroblock was not MC. */
+ if ((h->current_mba == 1) || (h->current_mba == 12) ||
+ (h->current_mba == 23) || (h->mba_diff != 1)) {
 h->current_mv_x = 0;
 h->current_mv_y = 0;
 }
 
- h->current_mv_x= decode_mv_component(&s->gb, h->current_mv_x);
- h->current_mv_y= decode_mv_component(&s->gb, h->current_mv_y);
- }else{
+ h->current_mv_x = decode_mv_component(&s->gb, h->current_mv_x);
+ h->current_mv_y = decode_mv_component(&s->gb, h->current_mv_y);
+ } else {
 h->current_mv_x = 0;
 h->current_mv_y = 0;
 }
 
 // Read cbp
- if ( HAS_CBP( h->mtype ) ){
+ if (HAS_CBP(h->mtype))
 cbp = get_vlc2(&s->gb, h261_cbp_vlc.table, H261_CBP_VLC_BITS, 2) + 1;
- }
 
- if(s->mb_intra){
- s->current_picture.f.mb_type[xy] = MB_TYPE_INTRA;
+ if (s->mb_intra) {
+ s->current_picture.mb_type[xy] = MB_TYPE_INTRA;
 goto intra;
 }
 
 //set motion vectors
- s->mv_dir = MV_DIR_FORWARD;
- s->mv_type = MV_TYPE_16X16;
- s->current_picture.f.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0;
- s->mv[0][0][0] = h->current_mv_x * 2;//gets divided by 2 in motion compensation
- s->mv[0][0][1] = h->current_mv_y * 2;
+ s->mv_dir = MV_DIR_FORWARD;
+ s->mv_type = MV_TYPE_16X16;
+ s->current_picture.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0;
+ s->mv[0][0][0] = h->current_mv_x * 2; // gets divided by 2 in motion compensation
+ s->mv[0][0][1] = h->current_mv_y * 2;
 
 intra:
 /* decode each block */
- if(s->mb_intra || HAS_CBP(h->mtype)){
+ if (s->mb_intra || HAS_CBP(h->mtype)) {
 s->dsp.clear_blocks(s->block[0]);
 for (i = 0; i < 6; i++) {
- if (h261_decode_block(h, s->block[i], i, cbp&32) < 0){
+ if (h261_decode_block(h, s->block[i], i, cbp & 32) < 0)
 return SLICE_ERROR;
- }
- cbp+=cbp;
+ cbp += cbp;
 }
- }else{
+ } else {
 for (i = 0; i < 6; i++)
- s->block_last_index[i]= -1;
+ s->block_last_index[i] = -1;
 }
 
 ff_MPV_decode_mb(s, s->block);
@@ -355,117 +449,34 @@
 }
 
 /**
- * Decode a macroblock.
- * @return <0 if an error occurred
- */
-static int h261_decode_block(H261Context * h, DCTELEM * block,
- int n, int coded)
-{
- MpegEncContext * const s = &h->s;
- int code, level, i, j, run;
- RLTable *rl = &h261_rl_tcoeff;
- const uint8_t *scan_table;
-
- // For the variable length encoding there are two code tables, one being used for
- // the first transmitted LEVEL in INTER, INTER+MC and INTER+MC+FIL blocks, the second
- // for all other LEVELs except the first one in INTRA blocks which is fixed length
- // coded with 8 bits.
- // NOTE: the two code tables only differ in one VLC so we handle that manually.
- scan_table = s->intra_scantable.permutated;
- if (s->mb_intra){
- /* DC coef */
- level = get_bits(&s->gb, 8);
- // 0 (00000000b) and -128 (10000000b) are FORBIDDEN
- if((level&0x7F) == 0){
- av_log(s->avctx, AV_LOG_ERROR, "illegal dc %d at %d %d\n", level, s->mb_x, s->mb_y);
- return -1;
- }
- // The code 1000 0000 is not used, the reconstruction level of 1024 being coded as 1111 1111.
- if (level == 255)
- level = 128;
- block[0] = level;
- i = 1;
- }else if(coded){
- // Run Level Code
- // EOB Not possible for first level when cbp is available (that's why the table is different)
- // 0 1 1s
- // * * 0*
- int check = show_bits(&s->gb, 2);
- i = 0;
- if ( check & 0x2 ){
- skip_bits(&s->gb, 2);
- block[0] = ( check & 0x1 ) ? -1 : 1;
- i = 1;
- }
- }else{
- i = 0;
- }
- if(!coded){
- s->block_last_index[n] = i - 1;
- return 0;
- }
- for(;;){
- code = get_vlc2(&s->gb, rl->vlc.table, TCOEFF_VLC_BITS, 2);
- if (code < 0){
- av_log(s->avctx, AV_LOG_ERROR, "illegal ac vlc code at %dx%d\n", s->mb_x, s->mb_y);
- return -1;
- }
- if (code == rl->n) {
- /* escape */
- // The remaining combinations of (run, level) are encoded with a 20-bit word consisting of 6 bits escape, 6 bits run and 8 bits level.
- run = get_bits(&s->gb, 6);
- level = get_sbits(&s->gb, 8);
- }else if(code == 0){
- break;
- }else{
- run = rl->table_run[code];
- level = rl->table_level[code];
- if (get_bits1(&s->gb))
- level = -level;
- }
- i += run;
- if (i >= 64){
- av_log(s->avctx, AV_LOG_ERROR, "run overflow at %dx%d\n", s->mb_x, s->mb_y);
- return -1;
- }
- j = scan_table[i];
- block[j] = level;
- i++;
- }
- s->block_last_index[n] = i-1;
- return 0;
-}
-
-/**
 * Decode the H.261 picture header.
 * @return <0 if no startcode found
 */
-static int h261_decode_picture_header(H261Context *h){
- MpegEncContext * const s = &h->s;
+static int h261_decode_picture_header(H261Context *h)
+{
+ MpegEncContext *const s = &h->s;
 int format, i;
- uint32_t startcode= 0;
+ uint32_t startcode = 0;
 
- for(i= get_bits_left(&s->gb); i>24; i-=1){
+ for (i = get_bits_left(&s->gb); i > 24; i -= 1) {
 startcode = ((startcode << 1) | get_bits(&s->gb, 1)) & 0x000FFFFF;
 
- if(startcode == 0x10)
+ if (startcode == 0x10)
 break;
 }
 
- if (startcode != 0x10){
+ if (startcode != 0x10) {
 av_log(s->avctx, AV_LOG_ERROR, "Bad picture start code\n");
 return -1;
 }
 
 /* temporal reference */
- i= get_bits(&s->gb, 5); /* picture timestamp */
- if(i < (s->picture_number&31))
+ i = get_bits(&s->gb, 5); /* picture timestamp */
+ if (i < (s->picture_number & 31))
 i += 32;
- s->picture_number = (s->picture_number&~31) + i;
-
- s->avctx->time_base= (AVRational){1001, 30000};
- s->current_picture.f.pts = s->picture_number;
+ s->picture_number = (s->picture_number & ~31) + i;
 
+ s->avctx->time_base = (AVRational) { 1001, 30000 };
 
 /* PTYPE starts here */
 skip_bits1(&s->gb); /* split screen off */
@@ -474,16 +485,16 @@
 
 format = get_bits1(&s->gb);
 
- //only 2 formats possible
- if (format == 0){//QCIF
- s->width = 176;
- s->height = 144;
- s->mb_width = 11;
+ // only 2 formats possible
+ if (format == 0) { // QCIF
+ s->width = 176;
+ s->height = 144;
+ s->mb_width = 11;
 s->mb_height = 9;
- }else{//CIF
- s->width = 352;
- s->height = 288;
- s->mb_width = 22;
+ } else { // CIF
+ s->width = 352;
+ s->height = 288;
+ s->mb_width = 22;
 s->mb_height = 18;
 }
 
@@ -493,39 +504,42 @@
 skip_bits1(&s->gb); /* Reserved */
 
 /* PEI */
- while (get_bits1(&s->gb) != 0){
+ while (get_bits1(&s->gb) != 0)
 skip_bits(&s->gb, 8);
- }
 
- // h261 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 (e.g. when a packet is lost)
+ /* 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
+ * (e.g. when a packet is lost). */
 s->pict_type = AV_PICTURE_TYPE_P;
 
 h->gob_number = 0;
 return 0;
 }
 
-static int h261_decode_gob(H261Context *h){
- MpegEncContext * const s = &h->s;
+static int h261_decode_gob(H261Context *h)
+{
+ MpegEncContext *const s = &h->s;
 
 ff_set_qscale(s, s->qscale);
 
 /* decode mb's */
- while(h->current_mba <= MBA_STUFFING)
- {
+ while (h->current_mba <= MBA_STUFFING) {
 int ret;
 /* DCT & quantize */
- ret= h261_decode_mb(h);
- if(ret<0){
- if(ret==SLICE_END){
+ ret = h261_decode_mb(h);
+ if (ret < 0) {
+ if (ret == SLICE_END) {
 h261_decode_mb_skipped(h, h->current_mba, 33);
 return 0;
 }
- av_log(s->avctx, AV_LOG_ERROR, "Error at MB: %d\n", s->mb_x + s->mb_y*s->mb_stride);
+ av_log(s->avctx, AV_LOG_ERROR, "Error at MB: %d\n",
+ s->mb_x + s->mb_y * s->mb_stride);
 return -1;
 }
 
- h261_decode_mb_skipped(h, h->current_mba-h->mba_diff, h->current_mba-1);
+ h261_decode_mb_skipped(h,
+ h->current_mba - h->mba_diff,
+ h->current_mba - 1);
 }
 
 return -1;
@@ -534,65 +548,60 @@
 /**
 * returns the number of bytes consumed for building the current frame
 */
-static int get_consumed_bytes(MpegEncContext *s, int buf_size){
- int pos= get_bits_count(&s->gb)>>3;
- if(pos==0) pos=1; //avoid infinite loops (i doubt that is needed but ...)
- if(pos+10>buf_size) pos=buf_size; // oops ;)
+static int get_consumed_bytes(MpegEncContext *s, int buf_size)
+{
+ int pos = get_bits_count(&s->gb) >> 3;
+ if (pos == 0)
+ pos = 1; // avoid infinite loops (i doubt that is needed but ...)
+ if (pos + 10 > buf_size)
+ pos = buf_size; // oops ;)
 
 return pos;
 }
 
-static int h261_decode_frame(AVCodecContext *avctx,
- void *data, int *got_frame,
- AVPacket *avpkt)
+static int h261_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame, AVPacket *avpkt)
 {
 const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- H261Context *h= avctx->priv_data;
- MpegEncContext *s = &h->s;
+ int buf_size = avpkt->size;
+ H261Context *h = avctx->priv_data;
+ MpegEncContext *s = &h->s;
 int ret;
 AVFrame *pict = data;
 
 av_dlog(avctx, "*****frame %d size=%d\n", avctx->frame_number, buf_size);
 av_dlog(avctx, "bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]);
- s->flags= avctx->flags;
- s->flags2= avctx->flags2;
+ s->flags = avctx->flags;
+ s->flags2 = avctx->flags2;
 
- h->gob_start_code_skipped=0;
+ h->gob_start_code_skipped = 0;
 
 retry:
+ init_get_bits(&s->gb, buf, buf_size * 8);
 
- init_get_bits(&s->gb, buf, buf_size*8);
-
- if(!s->context_initialized){
- if (ff_MPV_common_init(s) < 0) //we need the idct permutaton for reading a custom matrix
+ if (!s->context_initialized)
+ // we need the IDCT permutaton for reading a custom matrix
+ if (ff_MPV_common_init(s) < 0)
 return -1;
- }
-
- //we need to set current_picture_ptr before reading the header, otherwise we cannot store anyting im 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 */
- if (ret < 0){
+ if (ret < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "header damaged\n");
 return -1;
 }
 
- if (s->width != avctx->coded_width || s->height != avctx->coded_height){
- ParseContext pc= s->parse_context; //FIXME move this demuxing hack to libavformat
- s->parse_context.buffer=0;
+ if (s->width != avctx->coded_width || s->height != avctx->coded_height) {
+ ParseContext pc = s->parse_context; // FIXME move this demuxing hack to libavformat
+ s->parse_context.buffer = 0;
 ff_MPV_common_end(s);
- s->parse_context= pc;
+ 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;
 }
@@ -601,32 +610,33 @@
 s->current_picture.f.pict_type = s->pict_type;
 s->current_picture.f.key_frame = s->pict_type == AV_PICTURE_TYPE_I;
 
- if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==AV_PICTURE_TYPE_B)
- ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=AV_PICTURE_TYPE_I)
- || avctx->skip_frame >= AVDISCARD_ALL)
+ if ((avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type == AV_PICTURE_TYPE_B) ||
+ (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type != AV_PICTURE_TYPE_I) ||
+ avctx->skip_frame >= AVDISCARD_ALL)
 return get_consumed_bytes(s, buf_size);
 
- if(ff_MPV_frame_start(s, avctx) < 0)
+ if (ff_MPV_frame_start(s, avctx) < 0)
 return -1;
 
- ff_er_frame_start(s);
+ ff_mpeg_er_frame_start(s);
 
 /* decode each macroblock */
- s->mb_x=0;
- s->mb_y=0;
+ s->mb_x = 0;
+ s->mb_y = 0;
 
- while(h->gob_number < (s->mb_height==18 ? 12 : 5)){
- if(ff_h261_resync(h)<0)
+ while (h->gob_number < (s->mb_height == 18 ? 12 : 5)) {
+ if (h261_resync(h) < 0)
 break;
 h261_decode_gob(h);
 }
 ff_MPV_frame_end(s);
 
-assert(s->current_picture.f.pict_type == s->current_picture_ptr->f.pict_type);
-assert(s->current_picture.f.pict_type == s->pict_type);
+ assert(s->current_picture.f.pict_type == s->current_picture_ptr->f.pict_type);
+ assert(s->current_picture.f.pict_type == s->pict_type);
 
- *pict = s->current_picture_ptr->f;
- ff_print_debug_info(s, pict);
+ if ((ret = av_frame_ref(pict, &s->current_picture_ptr->f)) < 0)
+ return ret;
+ ff_print_debug_info(s, s->current_picture_ptr);
 
 *got_frame = 1;
 
@@ -635,7 +645,7 @@
 
 static av_cold int h261_decode_end(AVCodecContext *avctx)
 {
- H261Context *h= avctx->priv_data;
+ H261Context *h = avctx->priv_data;
 MpegEncContext *s = &h->s;
 
 ff_MPV_common_end(s);
@@ -644,6 +654,7 @@
 
 AVCodec ff_h261_decoder = {
 .name = "h261",
+ .long_name = NULL_IF_CONFIG_SMALL("H.261"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_H261,
 .priv_data_size = sizeof(H261Context),
@@ -651,5 +662,4 @@
 .close = h261_decode_end,
 .decode = h261_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("H.261"),
 };

libav-v9.6.tar.bz2/libavcodec/h261enc.c -> libav-v10.1.tar.bz2/libavcodec/h261enc.c Changed

@@ -25,19 +25,14 @@
 * H.261 encoder.
 */
 
-#include "dsputil.h"
+#include "libavutil/attributes.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h263.h"
 #include "h261.h"
-#include "h261data.h"
 
-extern uint8_t ff_h261_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3];
-
-static void h261_encode_block(H261Context * h, DCTELEM * block,
- int n);
-
-int ff_h261_get_picture_format(int width, int height){
+int ff_h261_get_picture_format(int width, int height)
+{
 // QCIF
 if (width == 176 && height == 144)
 return 0;
@@ -49,8 +44,9 @@
 return -1;
 }
 
-void ff_h261_encode_picture_header(MpegEncContext * s, int picture_number){
- H261Context * h = (H261Context *) s;
+void ff_h261_encode_picture_header(MpegEncContext *s, int picture_number)
+{
+ H261Context *h = (H261Context *)s;
 int format, temp_ref;
 
 avpriv_align_put_bits(&s->pb);
@@ -60,8 +56,8 @@
 
 put_bits(&s->pb, 20, 0x10); /* PSC */
 
- temp_ref= s->picture_number * (int64_t)30000 * s->avctx->time_base.num /
- (1001 * (int64_t)s->avctx->time_base.den); //FIXME maybe this should use a timestamp
+ temp_ref = s->picture_number * (int64_t)30000 * s->avctx->time_base.num /
+ (1001 * (int64_t)s->avctx->time_base.den); // FIXME maybe this should use a timestamp
 put_sbits(&s->pb, 5, temp_ref); /* TemporalReference */
 
 put_bits(&s->pb, 1, 0); /* split screen off */
@@ -76,7 +72,7 @@
 put_bits(&s->pb, 1, 0); /* reserved */
 
 put_bits(&s->pb, 1, 0); /* no PEI */
- if(format == 0)
+ if (format == 0)
 h->gob_number = -1;
 else
 h->gob_number = 0;
@@ -86,192 +82,99 @@
 /**
 * Encode a group of blocks header.
 */
-static void h261_encode_gob_header(MpegEncContext * s, int mb_line){
- H261Context * h = (H261Context *)s;
- if(ff_h261_get_picture_format(s->width, s->height) == 0){
- h->gob_number+=2; // QCIF
- }
- else{
- h->gob_number++; // CIF
+static void h261_encode_gob_header(MpegEncContext *s, int mb_line)
+{
+ H261Context *h = (H261Context *)s;
+ if (ff_h261_get_picture_format(s->width, s->height) == 0) {
+ h->gob_number += 2; // QCIF
+ } else {
+ h->gob_number++; // CIF
 }
- put_bits(&s->pb, 16, 1); /* GBSC */
+ put_bits(&s->pb, 16, 1); /* GBSC */
 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;
+ 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;
+ h->current_mv_x = 0;
+ h->current_mv_y = 0;
 }
 
-void ff_h261_reorder_mb_index(MpegEncContext* s){
- int index= s->mb_x + s->mb_y*s->mb_width;
+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 % 33 == 0)
+ h261_encode_gob_header(s, 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 */
- if(ff_h261_get_picture_format(s->width,s->height) == 1){ // CIF
- s->mb_x = index % 11 ; index /= 11;
- s->mb_y = index % 3 ; index /= 3;
- s->mb_x+= 11*(index % 2); index /= 2;
- s->mb_y+= 3*index;
+ * that's why we need to adjust the x and y index of the macroblocks */
+ if (ff_h261_get_picture_format(s->width, s->height) == 1) { // CIF
+ s->mb_x = index % 11;
+ index /= 11;
+ s->mb_y = index % 3;
+ index /= 3;
+ s->mb_x += 11 * (index % 2);
+ index /= 2;
+ s->mb_y += 3 * index;
 
 ff_init_block_index(s);
 ff_update_block_index(s);
 }
 }
 
-static void h261_encode_motion(H261Context * h, int val){
- MpegEncContext * const s = &h->s;
+static void h261_encode_motion(H261Context *h, int val)
+{
+ MpegEncContext *const s = &h->s;
 int sign, code;
- if(val==0){
+ if (val == 0) {
 code = 0;
- put_bits(&s->pb,h261_mv_tab[code][1],h261_mv_tab[code][0]);
- }
- else{
- if(val > 15)
- val -=32;
- if(val < -16)
- val+=32;
+ put_bits(&s->pb, ff_h261_mv_tab[code][1], ff_h261_mv_tab[code][0]);
+ } else {
+ if (val > 15)
+ val -= 32;
+ if (val < -16)
+ val += 32;
 sign = val < 0;
 code = sign ? -val : val;
- put_bits(&s->pb,h261_mv_tab[code][1],h261_mv_tab[code][0]);
- put_bits(&s->pb,1,sign);
+ put_bits(&s->pb, ff_h261_mv_tab[code][1], ff_h261_mv_tab[code][0]);
+ put_bits(&s->pb, 1, sign);
 }
 }
 
-static inline int get_cbp(MpegEncContext * s,
- DCTELEM block[6][64])
+static inline int get_cbp(MpegEncContext *s, int16_t block[6][64])
 {
 int i, cbp;
- cbp= 0;
- for (i = 0; i < 6; i++) {
+ cbp = 0;
+ for (i = 0; i < 6; i++)
 if (s->block_last_index[i] >= 0)
 cbp |= 1 << (5 - i);
- }
 return cbp;
 }
-void ff_h261_encode_mb(MpegEncContext * s,
- DCTELEM block[6][64],
- int motion_x, int motion_y)
-{
- H261Context * h = (H261Context *)s;
- int mvd, mv_diff_x, mv_diff_y, i, cbp;
- cbp = 63; // avoid warning
- mvd = 0;
-
- h->current_mba++;
- h->mtype = 0;
-
- if (!s->mb_intra){
- /* compute cbp */
- cbp= get_cbp(s, block);
-
- /* mvd indicates if this block is motion compensated */
- mvd = motion_x | motion_y;
-
- if((cbp | mvd | s->dquant ) == 0) {
- /* skip macroblock */
- s->skip_count++;
- h->current_mv_x=0;
- h->current_mv_y=0;
- return;
- }
- }
-
- /* MB is not skipped, encode MBA */
- put_bits(&s->pb, h261_mba_bits[(h->current_mba-h->previous_mba)-1], h261_mba_code[(h->current_mba-h->previous_mba)-1]);
-
- /* calculate MTYPE */
- if(!s->mb_intra){
- h->mtype++;
-
- if(mvd || s->loop_filter)
- h->mtype+=3;
- if(s->loop_filter)
- h->mtype+=3;
- if(cbp || s->dquant)
- h->mtype++;
- assert(h->mtype > 1);
- }
-
- if(s->dquant)
- h->mtype++;
-
- put_bits(&s->pb, h261_mtype_bits[h->mtype], h261_mtype_code[h->mtype]);
-
- h->mtype = h261_mtype_map[h->mtype];
-
- if(IS_QUANT(h->mtype)){
- ff_set_qscale(s,s->qscale+s->dquant);
- put_bits(&s->pb, 5, s->qscale);
- }
-
- 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);
- 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)){
- assert(cbp>0);
- put_bits(&s->pb,h261_cbp_tab[cbp-1][1],h261_cbp_tab[cbp-1][0]);
- }
- for(i=0; i<6; i++) {
- /* 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;
- }
-}
-
-void ff_h261_encode_init(MpegEncContext *s){
- static int done = 0;
-
- if (!done) {
- done = 1;
- ff_init_rl(&h261_rl_tcoeff, ff_h261_rl_table_store);
- }
-
- s->min_qcoeff= -127;
- s->max_qcoeff= 127;
- s->y_dc_scale_table=
- s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
-}
-
 
 /**
 * Encode an 8x8 block.
 * @param block the 8x8 block
 * @param n block index (0-3 are luma, 4-5 are chroma)
 */
-static void h261_encode_block(H261Context * h, DCTELEM * block, int n){
- MpegEncContext * const s = &h->s;
+static void h261_encode_block(H261Context *h, int16_t *block, int n)
+{
+ MpegEncContext *const s = &h->s;
 int level, run, i, j, last_index, last_non_zero, sign, slevel, code;
 RLTable *rl;
 
- rl = &h261_rl_tcoeff;
+ rl = &ff_h261_rl_tcoeff;
 if (s->mb_intra) {
 /* DC coef */
 level = block[0];
 /* 255 cannot be represented, so we clamp */
 if (level > 254) {
- level = 254;
+ level = 254;
 block[0] = 254;
 }
 /* 0 cannot be represented also */
 else if (level < 1) {
- level = 1;
+ level = 1;
 block[0] = 1;
 }
 if (level == 128)
@@ -279,31 +182,33 @@
 else
 put_bits(&s->pb, 8, level);
 i = 1;
- } else if((block[0]==1 || block[0] == -1) && (s->block_last_index[n] > -1)){
- //special case
- put_bits(&s->pb,2,block[0]>0 ? 2 : 3 );
+ } else if ((block[0] == 1 || block[0] == -1) &&
+ (s->block_last_index[n] > -1)) {
+ // special case
+ put_bits(&s->pb, 2, block[0] > 0 ? 2 : 3);
 i = 1;
 } else {
 i = 0;
 }
 
 /* AC coefs */
- last_index = s->block_last_index[n];
+ last_index = s->block_last_index[n];
 last_non_zero = i - 1;
 for (; i <= last_index; i++) {
- j = s->intra_scantable.permutated[i];
+ j = s->intra_scantable.permutated[i];
 level = block[j];
 if (level) {
- run = i - last_non_zero - 1;
- sign = 0;
+ run = i - last_non_zero - 1;
+ sign = 0;
 slevel = level;
 if (level < 0) {
- sign = 1;
+ sign = 1;
 level = -level;
 }
- code = get_rl_index(rl, 0 /*no last in H.261, EOB is used*/, run, level);
- if(run==0 && level < 16)
- code+=1;
+ code = get_rl_index(rl, 0 /*no last in H.261, EOB is used*/,
+ run, level);
+ if (run == 0 && level < 16)
+ code += 1;
 put_bits(&s->pb, rl->table_vlc[code][1], rl->table_vlc[code][0]);
 if (code == rl->n) {
 put_bits(&s->pb, 6, run);
@@ -316,22 +221,119 @@
 last_non_zero = i;
 }
 }
- if(last_index > -1){
- put_bits(&s->pb, rl->table_vlc[0][1], rl->table_vlc[0][0]);// END OF BLOCK
+ if (last_index > -1)
+ put_bits(&s->pb, rl->table_vlc[0][1], rl->table_vlc[0][0]); // EOB
+}
+
+void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64],
+ int motion_x, int motion_y)
+{
+ H261Context *h = (H261Context *)s;
+ int mvd, mv_diff_x, mv_diff_y, i, cbp;
+ cbp = 63; // avoid warning
+ mvd = 0;
+
+ h->current_mba++;
+ h->mtype = 0;
+
+ if (!s->mb_intra) {
+ /* compute cbp */
+ cbp = get_cbp(s, block);
+
+ /* mvd indicates if this block is motion compensated */
+ mvd = motion_x | motion_y;
+
+ if ((cbp | mvd | s->dquant) == 0) {
+ /* skip macroblock */
+ s->skip_count++;
+ h->current_mv_x = 0;
+ h->current_mv_y = 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]);
+
+ /* calculate MTYPE */
+ if (!s->mb_intra) {
+ h->mtype++;
+
+ if (mvd || s->loop_filter)
+ h->mtype += 3;
+ if (s->loop_filter)
+ h->mtype += 3;
+ if (cbp || s->dquant)
+ h->mtype++;
+ assert(h->mtype > 1);
+ }
+
+ if (s->dquant)
+ h->mtype++;
+
+ put_bits(&s->pb,
+ ff_h261_mtype_bits[h->mtype],
+ ff_h261_mtype_code[h->mtype]);
+
+ h->mtype = ff_h261_mtype_map[h->mtype];
+
+ if (IS_QUANT(h->mtype)) {
+ ff_set_qscale(s, s->qscale + s->dquant);
+ put_bits(&s->pb, 5, s->qscale);
+ }
+
+ 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);
+ 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)) {
+ assert(cbp > 0);
+ put_bits(&s->pb,
+ ff_h261_cbp_tab[cbp - 1][1],
+ ff_h261_cbp_tab[cbp - 1][0]);
+ }
+ for (i = 0; i < 6; i++)
+ /* 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;
 }
 }
 
+av_cold void ff_h261_encode_init(MpegEncContext *s)
+{
+ ff_h261_common_init();
+
+ s->min_qcoeff = -127;
+ s->max_qcoeff = 127;
+ s->y_dc_scale_table =
+ s->c_dc_scale_table = ff_mpeg1_dc_scale_table;
+}
+
 FF_MPV_GENERIC_CLASS(h261)
 
 AVCodec ff_h261_encoder = {
 .name = "h261",
+ .long_name = NULL_IF_CONFIG_SMALL("H.261"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_H261,
 .priv_data_size = sizeof(H261Context),
 .init = ff_MPV_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 },
- .long_name = NULL_IF_CONFIG_SMALL("H.261"),
+ .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
+ AV_PIX_FMT_NONE },
 .priv_class = &h261_class,
 };

libav-v9.6.tar.bz2/libavcodec/h263.c -> libav-v10.1.tar.bz2/libavcodec/h263.c Changed

@@ -27,10 +27,8 @@
 * h263/mpeg4 codec.
 */
 
-//#define DEBUG
 #include <limits.h>
 
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h263.h"
@@ -40,8 +38,6 @@
 #include "flv.h"
 #include "mpeg4video.h"
 
-//#undef NDEBUG
-//#include <assert.h>
 
 uint8_t ff_h263_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
 
@@ -52,7 +48,7 @@
 const int wrap = s->b8_stride;
 const int xy = s->block_index[0];
 
- s->current_picture.f.mbskip_table[mb_xy] = s->mb_skipped;
+ s->current_picture.mbskip_table[mb_xy] = s->mb_skipped;
 
 if(s->mv_type != MV_TYPE_8X8){
 int motion_x, motion_y;
@@ -71,30 +67,30 @@
 s->p_field_mv_table[i][0][mb_xy][0]= s->mv[0][i][0];
 s->p_field_mv_table[i][0][mb_xy][1]= s->mv[0][i][1];
 }
- s->current_picture.f.ref_index[0][4*mb_xy ] =
- s->current_picture.f.ref_index[0][4*mb_xy + 1] = s->field_select[0][0];
- s->current_picture.f.ref_index[0][4*mb_xy + 2] =
- s->current_picture.f.ref_index[0][4*mb_xy + 3] = s->field_select[0][1];
+ s->current_picture.ref_index[0][4*mb_xy ] =
+ s->current_picture.ref_index[0][4*mb_xy + 1] = s->field_select[0][0];
+ s->current_picture.ref_index[0][4*mb_xy + 2] =
+ s->current_picture.ref_index[0][4*mb_xy + 3] = s->field_select[0][1];
 }
 
 /* no update if 8X8 because it has been done during parsing */
- s->current_picture.f.motion_val[0][xy][0] = motion_x;
- s->current_picture.f.motion_val[0][xy][1] = motion_y;
- s->current_picture.f.motion_val[0][xy + 1][0] = motion_x;
- s->current_picture.f.motion_val[0][xy + 1][1] = motion_y;
- s->current_picture.f.motion_val[0][xy + wrap][0] = motion_x;
- s->current_picture.f.motion_val[0][xy + wrap][1] = motion_y;
- s->current_picture.f.motion_val[0][xy + 1 + wrap][0] = motion_x;
- s->current_picture.f.motion_val[0][xy + 1 + wrap][1] = motion_y;
+ s->current_picture.motion_val[0][xy][0] = motion_x;
+ s->current_picture.motion_val[0][xy][1] = motion_y;
+ s->current_picture.motion_val[0][xy + 1][0] = motion_x;
+ s->current_picture.motion_val[0][xy + 1][1] = motion_y;
+ s->current_picture.motion_val[0][xy + wrap][0] = motion_x;
+ s->current_picture.motion_val[0][xy + wrap][1] = motion_y;
+ s->current_picture.motion_val[0][xy + 1 + wrap][0] = motion_x;
+ s->current_picture.motion_val[0][xy + 1 + wrap][1] = motion_y;
 }
 
 if(s->encoding){ //FIXME encoding MUST be cleaned up
 if (s->mv_type == MV_TYPE_8X8)
- s->current_picture.f.mb_type[mb_xy] = MB_TYPE_L0 | MB_TYPE_8x8;
+ s->current_picture.mb_type[mb_xy] = MB_TYPE_L0 | MB_TYPE_8x8;
 else if(s->mb_intra)
- s->current_picture.f.mb_type[mb_xy] = MB_TYPE_INTRA;
+ s->current_picture.mb_type[mb_xy] = MB_TYPE_INTRA;
 else
- s->current_picture.f.mb_type[mb_xy] = MB_TYPE_L0 | MB_TYPE_16x16;
+ s->current_picture.mb_type[mb_xy] = MB_TYPE_L0 | MB_TYPE_16x16;
 }
 }
 
@@ -154,20 +150,20 @@
 Diag Top
 Left Center
 */
- if (!IS_SKIP(s->current_picture.f.mb_type[xy])) {
+ 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;
 
 if(s->mb_y){
 int qp_dt, qp_tt, qp_tc;
 
- if (IS_SKIP(s->current_picture.f.mb_type[xy - s->mb_stride]))
+ if (IS_SKIP(s->current_picture.mb_type[xy - s->mb_stride]))
 qp_tt=0;
 else
- qp_tt = s->current_picture.f.qscale_table[xy - s->mb_stride];
+ qp_tt = s->current_picture.qscale_table[xy - s->mb_stride];
 
 if(qp_c)
 qp_tc= qp_c;
@@ -176,57 +172,57 @@
 
 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.f.mb_type[xy - 1 - s->mb_stride]))
+ if (qp_tt || IS_SKIP(s->current_picture.mb_type[xy - 1 - s->mb_stride]))
 qp_dt= qp_tt;
 else
- qp_dt = s->current_picture.f.qscale_table[xy - 1 - s->mb_stride];
+ qp_dt = s->current_picture.qscale_table[xy - 1 - s->mb_stride];
 
 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){
 int qp_lc;
- if (qp_c || IS_SKIP(s->current_picture.f.mb_type[xy - 1]))
+ if (qp_c || IS_SKIP(s->current_picture.mb_type[xy - 1]))
 qp_lc= qp_c;
 else
- qp_lc = s->current_picture.f.qscale_table[xy - 1];
+ 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);
 }
 }
 }
 }
 
-void ff_h263_pred_acdc(MpegEncContext * s, DCTELEM *block, int n)
+void ff_h263_pred_acdc(MpegEncContext * s, int16_t *block, int n)
 {
 int x, y, wrap, a, c, pred_dc, scale, i;
 int16_t *dc_val, *ac_val, *ac_val1;
@@ -321,7 +317,7 @@
 static const int off[4]= {2, 1, 1, -1};
 
 wrap = s->b8_stride;
- mot_val = s->current_picture.f.motion_val[dir] + s->block_index[block];
+ mot_val = s->current_picture.motion_val[dir] + s->block_index[block];
 
 A = mot_val[ - 1];
 /* special case for first (slice) line */

libav-v9.6.tar.bz2/libavcodec/h263.h -> libav-v10.1.tar.bz2/libavcodec/h263.h Changed

@@ -26,6 +26,10 @@
 #include "mpegvideo.h"
 #include "rl.h"
 
+#if !FF_API_ASPECT_EXTENDED
+#define FF_ASPECT_EXTENDED 15
+#endif
+
 // 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
@@ -53,6 +57,10 @@
 extern VLC ff_h263_inter_MCBPC_vlc;
 extern VLC ff_h263_cbpy_vlc;
 
+extern const uint16_t ff_inter_vlc[103][2];
+extern const int8_t ff_inter_level[102];
+extern const int8_t ff_inter_run[102];
+
 extern RLTable ff_h263_rl_inter;
 
 extern RLTable ff_rl_intra_aic;
@@ -64,6 +72,8 @@
 
 extern uint8_t ff_h263_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
 
+extern const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[];
+
 
 int ff_h263_decode_motion(MpegEncContext * s, int pred, int f_code);
 av_const int ff_h263_aspect_to_info(AVRational aspect);
@@ -73,14 +83,14 @@
                              AVPacket *avpkt);
 int ff_h263_decode_end(AVCodecContext *avctx);
 void ff_h263_encode_mb(MpegEncContext *s,
-                       DCTELEM block[6][64],
+                       int16_t block[6][64],
                        int motion_x, int motion_y);
 void ff_h263_encode_picture_header(MpegEncContext *s, int picture_number);
 void ff_h263_encode_gob_header(MpegEncContext * s, int mb_line);
 int16_t *ff_h263_pred_motion(MpegEncContext * s, int block, int dir,
                              int *px, int *py);
 void ff_h263_encode_init(MpegEncContext *s);
-void ff_h263_decode_init_vlc(MpegEncContext *s);
+void ff_h263_decode_init_vlc(void);
 int ff_h263_decode_picture_header(MpegEncContext *s);
 int ff_h263_decode_gob_header(MpegEncContext *s);
 void ff_h263_update_motion_val(MpegEncContext * s);
@@ -89,7 +99,7 @@
 void ff_h263_encode_mba(MpegEncContext *s);
 void ff_init_qscale_tab(MpegEncContext *s);
 int ff_h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr);
-void ff_h263_pred_acdc(MpegEncContext * s, DCTELEM *block, int n);
+void ff_h263_pred_acdc(MpegEncContext * s, int16_t *block, int n);
 
 
 /**
@@ -99,7 +109,7 @@
 
 int ff_intel_h263_decode_picture_header(MpegEncContext *s);
 int ff_h263_decode_mb(MpegEncContext *s,
-                      DCTELEM block[6][64]);
+                      int16_t block[6][64]);
 
 /**
  * Return the value of the 3bit "source format" syntax element.
@@ -144,7 +154,7 @@
 }
 
 static inline int get_p_cbp(MpegEncContext * s,
-                      DCTELEM block[6][64],
+                      int16_t block[6][64],
                       int motion_x, int motion_y){
     int cbp, i;

libav-v9.6.tar.bz2/libavcodec/h263data.h -> libav-v10.1.tar.bz2/libavcodec/h263data.h Changed

libav-v9.6.tar.bz2/libavcodec/h263dec.c -> libav-v10.1.tar.bz2/libavcodec/h263dec.c Changed

@@ -26,79 +26,75 @@
 */
 
 #include "libavutil/cpu.h"
-#include "internal.h"
 #include "avcodec.h"
-#include "dsputil.h"
-#include "mpegvideo.h"
+#include "error_resilience.h"
+#include "flv.h"
 #include "h263.h"
 #include "h263_parser.h"
+#include "internal.h"
+#include "mpeg4video.h"
 #include "mpeg4video_parser.h"
+#include "mpegvideo.h"
 #include "msmpeg4.h"
-#include "vdpau_internal.h"
 #include "thread.h"
-#include "flv.h"
-#include "mpeg4video.h"
-
-//#define DEBUG
-//#define PRINT_FRAME_TIME
 
 av_cold int ff_h263_decode_init(AVCodecContext *avctx)
 {
 MpegEncContext *s = avctx->priv_data;
+ int ret;
 
- s->avctx = avctx;
- s->out_format = FMT_H263;
-
- s->width = avctx->coded_width;
- s->height = avctx->coded_height;
- s->workaround_bugs= avctx->workaround_bugs;
+ s->avctx = avctx;
+ s->out_format = FMT_H263;
+ s->width = avctx->coded_width;
+ s->height = avctx->coded_height;
+ s->workaround_bugs = avctx->workaround_bugs;
 
 // set defaults
 ff_MPV_decode_defaults(s);
- s->quant_precision=5;
- s->decode_mb= ff_h263_decode_mb;
- s->low_delay= 1;
+ s->quant_precision = 5;
+ s->decode_mb = ff_h263_decode_mb;
+ s->low_delay = 1;
 if (avctx->codec->id == AV_CODEC_ID_MSS2)
 avctx->pix_fmt = AV_PIX_FMT_YUV420P;
 else
 avctx->pix_fmt = avctx->get_format(avctx, avctx->codec->pix_fmts);
- s->unrestricted_mv= 1;
+ s->unrestricted_mv = 1;
 
 /* select sub codec */
- switch(avctx->codec->id) {
+ switch (avctx->codec->id) {
 case AV_CODEC_ID_H263:
- s->unrestricted_mv= 0;
+ s->unrestricted_mv = 0;
 avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
 break;
 case AV_CODEC_ID_MPEG4:
 break;
 case AV_CODEC_ID_MSMPEG4V1:
- s->h263_pred = 1;
- s->msmpeg4_version=1;
+ s->h263_pred = 1;
+ s->msmpeg4_version = 1;
 break;
 case AV_CODEC_ID_MSMPEG4V2:
- s->h263_pred = 1;
- s->msmpeg4_version=2;
+ s->h263_pred = 1;
+ s->msmpeg4_version = 2;
 break;
 case AV_CODEC_ID_MSMPEG4V3:
- s->h263_pred = 1;
- s->msmpeg4_version=3;
+ s->h263_pred = 1;
+ s->msmpeg4_version = 3;
 break;
 case AV_CODEC_ID_WMV1:
- s->h263_pred = 1;
- s->msmpeg4_version=4;
+ s->h263_pred = 1;
+ s->msmpeg4_version = 4;
 break;
 case AV_CODEC_ID_WMV2:
- s->h263_pred = 1;
- s->msmpeg4_version=5;
+ s->h263_pred = 1;
+ s->msmpeg4_version = 5;
 break;
 case AV_CODEC_ID_VC1:
 case AV_CODEC_ID_WMV3:
 case AV_CODEC_ID_VC1IMAGE:
 case AV_CODEC_ID_WMV3IMAGE:
 case AV_CODEC_ID_MSS2:
- s->h263_pred = 1;
- s->msmpeg4_version=6;
+ s->h263_pred = 1;
+ s->msmpeg4_version = 6;
 avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
 break;
 case AV_CODEC_ID_H263I:
@@ -107,17 +103,21 @@
 s->h263_flv = 1;
 break;
 default:
- return -1;
+ 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);
+ s->codec_id = avctx->codec->id;
+ avctx->hwaccel = ff_find_hwaccel(avctx);
 
 /* for h263, we allocate the images after having read the header */
- if (avctx->codec->id != AV_CODEC_ID_H263 && avctx->codec->id != AV_CODEC_ID_MPEG4)
- if (ff_MPV_common_init(s) < 0)
- return -1;
+ if (avctx->codec->id != AV_CODEC_ID_H263 &&
+ avctx->codec->id != AV_CODEC_ID_MPEG4)
+ if ((ret = ff_MPV_common_init(s)) < 0)
+ return ret;
 
- ff_h263_decode_init_vlc(s);
+ ff_h263dsp_init(&s->h263dsp);
+ ff_h263_decode_init_vlc();
 
 return 0;
 }
@@ -133,234 +133,250 @@
 /**
 * Return the number of bytes consumed for building the current frame.
 */
-static int get_consumed_bytes(MpegEncContext *s, int buf_size){
- int pos= (get_bits_count(&s->gb)+7)>>3;
+static int get_consumed_bytes(MpegEncContext *s, int buf_size)
+{
+ int pos = (get_bits_count(&s->gb) + 7) >> 3;
 
- if(s->divx_packed || s->avctx->hwaccel){
- //we would have to scan through the whole buf to handle the weird reordering ...
+ if (s->divx_packed || s->avctx->hwaccel) {
+ /* We would have to scan through the whole buf to handle the weird
+ * reordering ... */
 return buf_size;
- }else if(s->flags&CODEC_FLAG_TRUNCATED){
+ } else if (s->flags & CODEC_FLAG_TRUNCATED) {
 pos -= s->parse_context.last_index;
- if(pos<0) pos=0; // padding is not really read so this might be -1
+ // padding is not really read so this might be -1
+ if (pos < 0)
+ pos = 0;
 return pos;
- }else{
- if(pos==0) pos=1; //avoid infinite loops (i doubt that is needed but ...)
- if(pos+10>buf_size) pos=buf_size; // oops ;)
+ } else {
+ // avoid infinite loops (maybe not needed...)
+ if (pos == 0)
+ pos = 1;
+ // oops ;)
+ if (pos + 10 > buf_size)
+ pos = buf_size;
 
 return pos;
 }
 }
 
-static int decode_slice(MpegEncContext *s){
- const int part_mask= s->partitioned_frame ? (ER_AC_END|ER_AC_ERROR) : 0x7F;
+static int decode_slice(MpegEncContext *s)
+{
+ const int part_mask = s->partitioned_frame
+ ? (ER_AC_END | ER_AC_ERROR) : 0x7F;
 const int mb_size = 16;
- s->last_resync_gb= s->gb;
- s->first_slice_line= 1;
+ int ret;
 
- s->resync_mb_x= s->mb_x;
- s->resync_mb_y= s->mb_y;
+ s->last_resync_gb = s->gb;
+ s->first_slice_line = 1;
+ s->resync_mb_x = s->mb_x;
+ s->resync_mb_y = s->mb_y;
 
 ff_set_qscale(s, s->qscale);
 
 if (s->avctx->hwaccel) {
- const uint8_t *start= s->gb.buffer + get_bits_count(&s->gb)/8;
- const uint8_t *end = ff_h263_find_resync_marker(start + 1, s->gb.buffer_end);
- skip_bits_long(&s->gb, 8*(end - start));
+ const uint8_t *start = s->gb.buffer + get_bits_count(&s->gb) / 8;
+ const uint8_t *end = ff_h263_find_resync_marker(start + 1,
+ s->gb.buffer_end);
+ skip_bits_long(&s->gb, 8 * (end - start));
 return s->avctx->hwaccel->decode_slice(s->avctx, start, end - start);
 }
 
- if(s->partitioned_frame){
- const int qscale= s->qscale;
+ if (s->partitioned_frame) {
+ const int qscale = s->qscale;
 
- if(CONFIG_MPEG4_DECODER && s->codec_id==AV_CODEC_ID_MPEG4){
- if(ff_mpeg4_decode_partitions(s) < 0)
- return -1;
- }
+ if (CONFIG_MPEG4_DECODER && s->codec_id == AV_CODEC_ID_MPEG4)
+ if ((ret = ff_mpeg4_decode_partitions(s->avctx->priv_data)) < 0)
+ return ret;
 
 /* restore variables which were modified */
- s->first_slice_line=1;
- s->mb_x= s->resync_mb_x;
- s->mb_y= s->resync_mb_y;
+ s->first_slice_line = 1;
+ s->mb_x = s->resync_mb_x;
+ s->mb_y = s->resync_mb_y;
 ff_set_qscale(s, qscale);
 }
 
- for(; s->mb_y < s->mb_height; s->mb_y++) {
+ for (; s->mb_y < s->mb_height; s->mb_y++) {
 /* per-row end of slice checks */
- if(s->msmpeg4_version){
- if(s->resync_mb_y + s->slice_height == s->mb_y){
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, ER_MB_END);
+ if (s->msmpeg4_version) {
+ if (s->resync_mb_y + s->slice_height == s->mb_y) {
+ ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
+ s->mb_x - 1, s->mb_y, ER_MB_END);
 
 return 0;
 }
 }
 
- if(s->msmpeg4_version==1){
- s->last_dc[0]=
- s->last_dc[1]=
- s->last_dc[2]= 128;
+ if (s->msmpeg4_version == 1) {
+ s->last_dc[0] =
+ s->last_dc[1] =
+ s->last_dc[2] = 128;
 }
 
 ff_init_block_index(s);
- for(; s->mb_x < s->mb_width; s->mb_x++) {
+ for (; s->mb_x < s->mb_width; s->mb_x++) {
 int ret;
 
 ff_update_block_index(s);
 
- if(s->resync_mb_x == s->mb_x && s->resync_mb_y+1 == s->mb_y){
- s->first_slice_line=0;
- }
+ if (s->resync_mb_x == s->mb_x && s->resync_mb_y + 1 == s->mb_y)
+ s->first_slice_line = 0;
 
 /* DCT & quantize */
 
- s->mv_dir = MV_DIR_FORWARD;
+ 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);
+ ret = s->decode_mb(s, s->block);
 
- if (s->pict_type!=AV_PICTURE_TYPE_B)
+ if (s->pict_type != AV_PICTURE_TYPE_B)
 ff_h263_update_motion_val(s);
 
- if(ret<0){
- const int xy= s->mb_x + s->mb_y*s->mb_stride;
- if(ret==SLICE_END){
+ if (ret < 0) {
+ const int xy = s->mb_x + s->mb_y * s->mb_stride;
+ if (ret == SLICE_END) {
 ff_MPV_decode_mb(s, s->block);
- if(s->loop_filter)
+ if (s->loop_filter)
 ff_h263_loop_filter(s);
 
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, ER_MB_END&part_mask);
+ ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
+ s->mb_x, s->mb_y, ER_MB_END & part_mask);
 
 s->padding_bug_score--;
 
- if(++s->mb_x >= s->mb_width){
- s->mb_x=0;
- ff_draw_horiz_band(s, s->mb_y*mb_size, mb_size);
+ if (++s->mb_x >= s->mb_width) {
+ s->mb_x = 0;
+ ff_mpeg_draw_horiz_band(s, s->mb_y * mb_size, mb_size);
 ff_MPV_report_decode_progress(s);
 s->mb_y++;
 }
 return 0;
- }else if(ret==SLICE_NOEND){
- av_log(s->avctx, AV_LOG_ERROR, "Slice mismatch at MB: %d\n", xy);
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x+1, s->mb_y, ER_MB_END&part_mask);
- return -1;
+ } else if (ret == SLICE_NOEND) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Slice mismatch at MB: %d\n", xy);
+ ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
+ s->mb_x + 1, s->mb_y,
+ ER_MB_END & part_mask);
+ return AVERROR_INVALIDDATA;
 }
 av_log(s->avctx, AV_LOG_ERROR, "Error at MB: %d\n", xy);
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, ER_MB_ERROR&part_mask);
+ ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
+ s->mb_x, s->mb_y, ER_MB_ERROR & part_mask);
 
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 ff_MPV_decode_mb(s, s->block);
- if(s->loop_filter)
+ if (s->loop_filter)
 ff_h263_loop_filter(s);
 }
 
- ff_draw_horiz_band(s, s->mb_y*mb_size, mb_size);
+ ff_mpeg_draw_horiz_band(s, s->mb_y * mb_size, mb_size);
 ff_MPV_report_decode_progress(s);
 
- s->mb_x= 0;
+ s->mb_x = 0;
 }
 
- assert(s->mb_x==0 && s->mb_y==s->mb_height);
+ assert(s->mb_x == 0 && s->mb_y == s->mb_height);
 
- if(s->codec_id==AV_CODEC_ID_MPEG4
- && (s->workaround_bugs&FF_BUG_AUTODETECT)
- && get_bits_left(&s->gb) >= 48
- && show_bits(&s->gb, 24)==0x4010
- && !s->data_partitioning)
- s->padding_bug_score+=32;
+ if (s->codec_id == AV_CODEC_ID_MPEG4 &&
+ (s->workaround_bugs & FF_BUG_AUTODETECT) &&
+ get_bits_left(&s->gb) >= 48 &&
+ show_bits(&s->gb, 24) == 0x4010 &&
+ !s->data_partitioning)
+ s->padding_bug_score += 32;
 
 /* try to detect the padding bug */
- if( s->codec_id==AV_CODEC_ID_MPEG4
- && (s->workaround_bugs&FF_BUG_AUTODETECT)
- && get_bits_left(&s->gb) >=0
- && get_bits_left(&s->gb) < 48
-// && !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;
-
- if(bits_left==0){
- s->padding_bug_score+=16;
- } else if(bits_left != 1){
- int v= show_bits(&s->gb, 8);
- v|= 0x7F >> (7-(bits_count&7));
-
- if(v==0x7F && bits_left<=8)
+ if (s->codec_id == AV_CODEC_ID_MPEG4 &&
+ (s->workaround_bugs & FF_BUG_AUTODETECT) &&
+ get_bits_left(&s->gb) >= 0 &&
+ get_bits_left(&s->gb) < 48 &&
+ !s->data_partitioning) {
+ const int bits_count = get_bits_count(&s->gb);
+ const int bits_left = s->gb.size_in_bits - bits_count;
+
+ if (bits_left == 0) {
+ s->padding_bug_score += 16;
+ } else if (bits_left != 1) {
+ int v = show_bits(&s->gb, 8);
+ v |= 0x7F >> (7 - (bits_count & 7));
+
+ if (v == 0x7F && bits_left <= 8)
 s->padding_bug_score--;
- else if(v==0x7F && ((get_bits_count(&s->gb)+8)&8) && bits_left<=16)
- s->padding_bug_score+= 4;
+ else if (v == 0x7F && ((get_bits_count(&s->gb) + 8) & 8) &&
+ bits_left <= 16)
+ s->padding_bug_score += 4;
 else
 s->padding_bug_score++;
 }
 }
 
- if(s->workaround_bugs&FF_BUG_AUTODETECT){
- if(s->padding_bug_score > -2 && !s->data_partitioning /*&& (s->divx_version>=0 || !s->resync_marker)*/)
- s->workaround_bugs |= FF_BUG_NO_PADDING;
+ if (s->workaround_bugs & FF_BUG_AUTODETECT) {
+ if (s->padding_bug_score > -2 && !s->data_partitioning)
+ s->workaround_bugs |= FF_BUG_NO_PADDING;
 else
 s->workaround_bugs &= ~FF_BUG_NO_PADDING;
 }
 
 // handle formats which don't have unique end markers
- if(s->msmpeg4_version || (s->workaround_bugs&FF_BUG_NO_PADDING)){ //FIXME perhaps solve this more cleanly
- int left= get_bits_left(&s->gb);
- int max_extra=7;
+ if (s->msmpeg4_version || (s->workaround_bugs & FF_BUG_NO_PADDING)) { // FIXME perhaps solve this more cleanly
+ int left = get_bits_left(&s->gb);
+ int max_extra = 7;
 
 /* no markers in M$ crap */
- if(s->msmpeg4_version && s->pict_type==AV_PICTURE_TYPE_I)
- max_extra+= 17;
-
- /* buggy padding but the frame should still end approximately at the bitstream end */
- if((s->workaround_bugs&FF_BUG_NO_PADDING) && (s->err_recognition&AV_EF_BUFFER))
- max_extra+= 48;
- else if((s->workaround_bugs&FF_BUG_NO_PADDING))
- max_extra+= 256*256*256*64;
-
- if(left>max_extra){
- av_log(s->avctx, AV_LOG_ERROR, "discarding %d junk bits at end, next would be %X\n", left, show_bits(&s->gb, 24));
- }
- else if(left<0){
+ if (s->msmpeg4_version && s->pict_type == AV_PICTURE_TYPE_I)
+ max_extra += 17;
+
+ /* buggy padding but the frame should still end approximately at
+ * the bitstream end */
+ if ((s->workaround_bugs & FF_BUG_NO_PADDING) &&
+ (s->err_recognition & AV_EF_BUFFER))
+ max_extra += 48;
+ else if ((s->workaround_bugs & FF_BUG_NO_PADDING))
+ max_extra += 256 * 256 * 256 * 64;
+
+ if (left > max_extra)
+ av_log(s->avctx, AV_LOG_ERROR,
+ "discarding %d junk bits at end, next would be %X\n",
+ left, show_bits(&s->gb, 24));
+ else if (left < 0)
 av_log(s->avctx, AV_LOG_ERROR, "overreading %d bits\n", -left);
- }else
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, ER_MB_END);
+ else
+ ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
+ s->mb_x - 1, s->mb_y, ER_MB_END);
 
 return 0;
 }
 
- av_log(s->avctx, AV_LOG_ERROR, "slice end not reached but screenspace end (%d left %06X, score= %d)\n",
- get_bits_left(&s->gb),
- show_bits(&s->gb, 24), s->padding_bug_score);
+ av_log(s->avctx, AV_LOG_ERROR,
+ "slice end not reached but screenspace end (%d left %06X, score= %d)\n",
+ get_bits_left(&s->gb), show_bits(&s->gb, 24), s->padding_bug_score);
 
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, ER_MB_END&part_mask);
+ ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y,
+ ER_MB_END & part_mask);
 
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
-int ff_h263_decode_frame(AVCodecContext *avctx,
- void *data, int *got_frame,
- AVPacket *avpkt)
+int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
+ AVPacket *avpkt)
 {
 const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- MpegEncContext *s = avctx->priv_data;
+ int buf_size = avpkt->size;
+ MpegEncContext *s = avctx->priv_data;
 int ret;
 AVFrame *pict = data;
 
-#ifdef PRINT_FRAME_TIME
-uint64_t time= rdtsc();
-#endif
- s->flags= avctx->flags;
- s->flags2= avctx->flags2;
+ s->flags = avctx->flags;
+ s->flags2 = avctx->flags2;
 
 /* no supplementary picture */
 if (buf_size == 0) {
 /* special case for last picture */
- if (s->low_delay==0 && s->next_picture_ptr) {
- *pict = s->next_picture_ptr->f;
- s->next_picture_ptr= NULL;
+ if (s->low_delay == 0 && s->next_picture_ptr) {
+ if ((ret = av_frame_ref(pict, &s->next_picture_ptr->f)) < 0)
+ return ret;
+ s->next_picture_ptr = NULL;
 
 *got_frame = 1;
 }
@@ -368,58 +384,64 @@
 return 0;
 }
 
- if(s->flags&CODEC_FLAG_TRUNCATED){
+ if (s->flags & CODEC_FLAG_TRUNCATED) {
 int next;
 
- if(CONFIG_MPEG4_DECODER && s->codec_id==AV_CODEC_ID_MPEG4){
- next= ff_mpeg4_find_frame_end(&s->parse_context, buf, buf_size);
- }else if(CONFIG_H263_DECODER && s->codec_id==AV_CODEC_ID_H263){
- next= ff_h263_find_frame_end(&s->parse_context, buf, buf_size);
- }else{
- av_log(s->avctx, AV_LOG_ERROR, "this codec does not support truncated bitstreams\n");
- return -1;
+ if (CONFIG_MPEG4_DECODER && s->codec_id == AV_CODEC_ID_MPEG4) {
+ next = ff_mpeg4_find_frame_end(&s->parse_context, buf, buf_size);
+ } else if (CONFIG_H263_DECODER && s->codec_id == AV_CODEC_ID_H263) {
+ next = ff_h263_find_frame_end(&s->parse_context, buf, buf_size);
+ } else {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "this codec does not support truncated bitstreams\n");
+ return AVERROR(ENOSYS);
 }
 
- if( ff_combine_frame(&s->parse_context, next, (const uint8_t **)&buf, &buf_size) < 0 )
+ if (ff_combine_frame(&s->parse_context, next, (const uint8_t **)&buf,
+ &buf_size) < 0)
 return buf_size;
 }
 
+ 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);
+ else
+ ret = init_get_bits8(&s->gb, buf, buf_size);
+ s->bitstream_buffer_size = 0;
 
-retry:
-
- if(s->bitstream_buffer_size && (s->divx_packed || buf_size<20)){ //divx 5.01+/xvid frame reorder
- init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size*8);
- }else
- init_get_bits(&s->gb, buf, buf_size*8);
- s->bitstream_buffer_size=0;
+ if (ret < 0)
+ return ret;
 
- if (!s->context_initialized) {
- if (ff_MPV_common_init(s) < 0) //we need the idct permutaton for reading a custom matrix
- return -1;
- }
+ if (!s->context_initialized)
+ // 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,
 * otherwise we cannot store anyting in there */
 if (s->current_picture_ptr == NULL || s->current_picture_ptr->f.data[0]) {
- int i= ff_find_unused_picture(s, 0);
+ int i = ff_find_unused_picture(s, 0);
 if (i < 0)
 return i;
- s->current_picture_ptr= &s->picture[i];
+ s->current_picture_ptr = &s->picture[i];
 }
 
 /* let's go :-) */
- if (CONFIG_WMV2_DECODER && s->msmpeg4_version==5) {
- ret= ff_wmv2_decode_picture_header(s);
+ if (CONFIG_WMV2_DECODER && s->msmpeg4_version == 5) {
+ 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) {
- if(s->avctx->extradata_size && s->picture_number==0){
+ } else if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4) {
+ if (s->avctx->extradata_size && s->picture_number == 0) {
 GetBitContext gb;
 
- init_get_bits(&gb, s->avctx->extradata, s->avctx->extradata_size*8);
- ret = ff_mpeg4_decode_picture_header(s, &gb);
+ ret = init_get_bits8(&gb, s->avctx->extradata,
+ s->avctx->extradata_size);
+ if (ret < 0)
+ return ret;
+ 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) {
@@ -428,171 +450,59 @@
 ret = ff_h263_decode_picture_header(s);
 }
 
- if(ret==FRAME_SKIPPED) return get_consumed_bytes(s, buf_size);
+ if (ret == FRAME_SKIPPED)
+ return get_consumed_bytes(s, buf_size);
 
 /* skip if the header was thrashed */
- if (ret < 0){
+ if (ret < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "header damaged\n");
- return -1;
- }
-
- 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("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;
+ return ret;
 }
 
- 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;
+ avctx->has_b_frames = !s->low_delay;
 
- if(s->lavc_build<4653U)
- s->workaround_bugs|= FF_BUG_STD_QPEL;
+#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<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;
-
- if(s->lavc_build<4609U) //FIXME not sure about the version num but a 4609 file seems ok
- 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)
+ 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][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);
- s->picture_number=0;
- }
-#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 */
- /* an H263EncContext */
-
- if (!avctx->coded_width || !avctx->coded_height) {
- ParseContext pc= s->parse_context; //FIXME move these demuxng hack to avformat
-
- s->parse_context.buffer=0;
- ff_MPV_common_end(s);
- s->parse_context= pc;
- avcodec_set_dimensions(avctx, s->width, s->height);
-
- goto retry;
- }
-
+ /* 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
+ * an H263EncContext */
 if (s->width != avctx->coded_width ||
 s->height != avctx->coded_height ||
 s->context_reinit) {
 /* 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;
 }
 
- if((s->codec_id==AV_CODEC_ID_H263 || s->codec_id==AV_CODEC_ID_H263P || s->codec_id == AV_CODEC_ID_H263I))
+ if (s->codec_id == AV_CODEC_ID_H263 ||
+ s->codec_id == AV_CODEC_ID_H263P ||
+ s->codec_id == AV_CODEC_ID_H263I)
 s->gob_index = ff_h263_get_gob_height(s);
 
 // for skipping the frame
@@ -603,147 +513,140 @@
 if (s->last_picture_ptr == NULL &&
 (s->pict_type == AV_PICTURE_TYPE_B || s->droppable))
 return get_consumed_bytes(s, buf_size);
- if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==AV_PICTURE_TYPE_B)
- || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=AV_PICTURE_TYPE_I)
- || avctx->skip_frame >= AVDISCARD_ALL)
+ if ((avctx->skip_frame >= AVDISCARD_NONREF &&
+ s->pict_type == AV_PICTURE_TYPE_B) ||
+ (avctx->skip_frame >= AVDISCARD_NONKEY &&
+ s->pict_type != AV_PICTURE_TYPE_I) ||
+ avctx->skip_frame >= AVDISCARD_ALL)
 return get_consumed_bytes(s, buf_size);
 
- if(s->next_p_frame_damaged){
- if(s->pict_type==AV_PICTURE_TYPE_B)
+ if (s->next_p_frame_damaged) {
+ if (s->pict_type == AV_PICTURE_TYPE_B)
 return get_consumed_bytes(s, buf_size);
 else
- s->next_p_frame_damaged=0;
+ s->next_p_frame_damaged = 0;
 }
 
- if((s->avctx->flags2 & CODEC_FLAG2_FAST) && s->pict_type==AV_PICTURE_TYPE_B){
- s->me.qpel_put= s->dsp.put_2tap_qpel_pixels_tab;
- s->me.qpel_avg= s->dsp.avg_2tap_qpel_pixels_tab;
- }else if((!s->no_rounding) || s->pict_type==AV_PICTURE_TYPE_B){
- s->me.qpel_put= s->dsp.put_qpel_pixels_tab;
- s->me.qpel_avg= s->dsp.avg_qpel_pixels_tab;
- }else{
- s->me.qpel_put= s->dsp.put_no_rnd_qpel_pixels_tab;
- s->me.qpel_avg= s->dsp.avg_qpel_pixels_tab;
+ if ((!s->no_rounding) || s->pict_type == AV_PICTURE_TYPE_B) {
+ s->me.qpel_put = s->dsp.put_qpel_pixels_tab;
+ s->me.qpel_avg = s->dsp.avg_qpel_pixels_tab;
+ } else {
+ s->me.qpel_put = s->dsp.put_no_rnd_qpel_pixels_tab;
+ s->me.qpel_avg = s->dsp.avg_qpel_pixels_tab;
 }
 
- if(ff_MPV_frame_start(s, avctx) < 0)
- return -1;
+ if ((ret = ff_MPV_frame_start(s, avctx)) < 0)
+ return ret;
 
- if (!s->divx_packed) ff_thread_finish_setup(avctx);
-
- if (CONFIG_MPEG4_VDPAU_DECODER && (s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)) {
- ff_vdpau_mpeg4_decode_picture(s, s->gb.buffer, s->gb.buffer_end - s->gb.buffer);
- goto frame_end;
- }
+ if (!s->divx_packed && !avctx->hwaccel)
+ ff_thread_finish_setup(avctx);
 
 if (avctx->hwaccel) {
- if (avctx->hwaccel->start_frame(avctx, s->gb.buffer, s->gb.buffer_end - s->gb.buffer) < 0)
- return -1;
+ ret = avctx->hwaccel->start_frame(avctx, s->gb.buffer,
+ s->gb.buffer_end - s->gb.buffer);
+ if (ret < 0 )
+ return ret;
 }
 
- ff_er_frame_start(s);
+ ff_mpeg_er_frame_start(s);
 
- //the second part of the wmv2 header contains the MB skip bits which are stored in current_picture->mb_type
- //which is not available before ff_MPV_frame_start()
- if (CONFIG_WMV2_DECODER && s->msmpeg4_version==5){
+ /* the second part of the wmv2 header contains the MB skip bits which
+ * are stored in current_picture->mb_type which is not available before
+ * ff_MPV_frame_start() */
+ if (CONFIG_WMV2_DECODER && s->msmpeg4_version == 5) {
 ret = ff_wmv2_decode_secondary_picture_header(s);
- if(ret<0) return ret;
- if(ret==1) goto intrax8_decoded;
+ if (ret < 0)
+ return ret;
+ if (ret == 1)
+ goto intrax8_decoded;
 }
 
 /* decode each macroblock */
- s->mb_x=0;
- s->mb_y=0;
+ s->mb_x = 0;
+ s->mb_y = 0;
 
 ret = decode_slice(s);
- while(s->mb_y<s->mb_height){
- if(s->msmpeg4_version){
- if(s->slice_height==0 || s->mb_x!=0 || (s->mb_y%s->slice_height)!=0 || get_bits_left(&s->gb)<0)
+ while (s->mb_y < s->mb_height) {
+ if (s->msmpeg4_version) {
+ if (s->slice_height == 0 || s->mb_x != 0 ||
+ (s->mb_y % s->slice_height) != 0 || get_bits_left(&s->gb) < 0)
 break;
- }else{
- int prev_x=s->mb_x, prev_y=s->mb_y;
- if(ff_h263_resync(s)<0)
+ } else {
+ int prev_x = s->mb_x, prev_y = s->mb_y;
+ if (ff_h263_resync(s) < 0)
 break;
 if (prev_y * s->mb_width + prev_x < s->mb_y * s->mb_width + s->mb_x)
- s->error_occurred = 1;
+ s->er.error_occurred = 1;
 }
 
- if(s->msmpeg4_version<4 && s->h263_pred)
+ if (s->msmpeg4_version < 4 && s->h263_pred)
 ff_mpeg4_clean_buffers(s);
 
- if (decode_slice(s) < 0) ret = AVERROR_INVALIDDATA;
+ if (decode_slice(s) < 0)
+ ret = AVERROR_INVALIDDATA;
 }
 
- if (s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type==AV_PICTURE_TYPE_I)
- if(!CONFIG_MSMPEG4_DECODER || ff_msmpeg4_decode_ext_header(s, buf_size) < 0){
- s->error_status_table[s->mb_num-1]= ER_MB_ERROR;
- }
+ if (s->msmpeg4_version && s->msmpeg4_version < 4 &&
+ s->pict_type == AV_PICTURE_TYPE_I)
+ if (!CONFIG_MSMPEG4_DECODER ||
+ ff_msmpeg4_decode_ext_header(s, buf_size) < 0)
+ s->er.error_status_table[s->mb_num - 1] = ER_MB_ERROR;
 
- assert(s->bitstream_buffer_size==0);
-frame_end:
- /* divx 5.01+ bistream reorder stuff */
- if(s->codec_id==AV_CODEC_ID_MPEG4 && s->divx_packed){
- int current_pos= get_bits_count(&s->gb)>>3;
- int startcode_found=0;
-
- if(buf_size - current_pos > 5){
- int i;
- for(i=current_pos; i<buf_size-3; i++){
- if(buf[i]==0 && buf[i+1]==0 && buf[i+2]==1 && buf[i+3]==0xB6){
- startcode_found=1;
- break;
- }
- }
- }
- if(s->gb.buffer == s->bitstream_buffer && buf_size>7 && s->xvid_build>=0){ //xvid style
- startcode_found=1;
- current_pos=0;
- }
+ assert(s->bitstream_buffer_size == 0);
 
- 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);
 
 intrax8_decoded:
- ff_er_frame_end(s);
+ ff_er_frame_end(&s->er);
 
 if (avctx->hwaccel) {
- if (avctx->hwaccel->end_frame(avctx) < 0)
- return -1;
+ ret = avctx->hwaccel->end_frame(avctx);
+ if (ret < 0)
+ return ret;
 }
 
 ff_MPV_frame_end(s);
 
- assert(s->current_picture.f.pict_type == s->current_picture_ptr->f.pict_type);
+ if (!s->divx_packed && avctx->hwaccel)
+ ff_thread_finish_setup(avctx);
+
+ assert(s->current_picture.f.pict_type ==
+ s->current_picture_ptr->f.pict_type);
 assert(s->current_picture.f.pict_type == s->pict_type);
 if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) {
- *pict = s->current_picture_ptr->f;
+ if ((ret = av_frame_ref(pict, &s->current_picture_ptr->f)) < 0)
+ return ret;
+ ff_print_debug_info(s, s->current_picture_ptr);
 } else if (s->last_picture_ptr != NULL) {
- *pict = s->last_picture_ptr->f;
+ if ((ret = av_frame_ref(pict, &s->last_picture_ptr->f)) < 0)
+ return ret;
+ ff_print_debug_info(s, s->last_picture_ptr);
 }
 
- if(s->last_picture_ptr || s->low_delay){
+ if (s->last_picture_ptr || s->low_delay)
 *got_frame = 1;
- ff_print_debug_info(s, pict);
- }
-
-#ifdef PRINT_FRAME_TIME
-av_log(avctx, AV_LOG_DEBUG, "%"PRId64"\n", rdtsc()-time);
-#endif
 
- return (ret && (avctx->err_recognition & AV_EF_EXPLODE))?ret:get_consumed_bytes(s, buf_size);
+ if (ret && (avctx->err_recognition & AV_EF_EXPLODE))
+ return ret;
+ else
+ return get_consumed_bytes(s, buf_size);
 }
 
+const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = {
+#if CONFIG_VAAPI
+ AV_PIX_FMT_VAAPI_VLD,
+#endif
+#if CONFIG_VDPAU
+ AV_PIX_FMT_VDPAU,
+#endif
+ AV_PIX_FMT_YUV420P,
+ AV_PIX_FMT_NONE
+};
+
 AVCodec ff_h263_decoder = {
 .name = "h263",
+ .long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_H263,
 .priv_data_size = sizeof(MpegEncContext),
@@ -753,6 +656,5 @@
 .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 |
 CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
 .flush = ff_mpeg_flush,
- .long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"),
- .pix_fmts = ff_hwaccel_pixfmt_list_420,
+ .pix_fmts = ff_h263_hwaccel_pixfmt_list_420,
 };

libav-v10.1.tar.bz2/libavcodec/h263dsp.c Added

@@ -0,0 +1,124 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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);
+}

libav-v10.1.tar.bz2/libavcodec/h263dsp.h Added

@@ -0,0 +1,34 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 */

libav-v9.6.tar.bz2/libavcodec/h264.c -> libav-v10.1.tar.bz2/libavcodec/h264.c Changed

@@ -25,24 +25,27 @@
 * @author Michael Niedermayer <michaelni@gmx.at>
 */
 
+#include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/stereo3d.h"
+#include "libavutil/timer.h"
 #include "internal.h"
 #include "cabac.h"
 #include "cabac_functions.h"
 #include "dsputil.h"
+#include "error_resilience.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h264.h"
 #include "h264data.h"
+#include "h264chroma.h"
 #include "h264_mvpred.h"
 #include "golomb.h"
 #include "mathops.h"
 #include "rectangle.h"
+#include "svq3.h"
 #include "thread.h"
-#include "vdpau_internal.h"
-#include "libavutil/avassert.h"
 
-// #undef NDEBUG
 #include <assert.h>
 
 const uint16_t ff_h264_mb_sizes[4] = { 256, 384, 512, 768 };
@@ -59,21 +62,432 @@
 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10,
 };
 
-static const enum AVPixelFormat hwaccel_pixfmt_list_h264_jpeg_420[] = {
+static const uint8_t field_scan[16] = {
+ 0 + 0 * 4, 0 + 1 * 4, 1 + 0 * 4, 0 + 2 * 4,
+ 0 + 3 * 4, 1 + 1 * 4, 1 + 2 * 4, 1 + 3 * 4,
+ 2 + 0 * 4, 2 + 1 * 4, 2 + 2 * 4, 2 + 3 * 4,
+ 3 + 0 * 4, 3 + 1 * 4, 3 + 2 * 4, 3 + 3 * 4,
+};
+
+static const uint8_t field_scan8x8[64] = {
+ 0 + 0 * 8, 0 + 1 * 8, 0 + 2 * 8, 1 + 0 * 8,
+ 1 + 1 * 8, 0 + 3 * 8, 0 + 4 * 8, 1 + 2 * 8,
+ 2 + 0 * 8, 1 + 3 * 8, 0 + 5 * 8, 0 + 6 * 8,
+ 0 + 7 * 8, 1 + 4 * 8, 2 + 1 * 8, 3 + 0 * 8,
+ 2 + 2 * 8, 1 + 5 * 8, 1 + 6 * 8, 1 + 7 * 8,
+ 2 + 3 * 8, 3 + 1 * 8, 4 + 0 * 8, 3 + 2 * 8,
+ 2 + 4 * 8, 2 + 5 * 8, 2 + 6 * 8, 2 + 7 * 8,
+ 3 + 3 * 8, 4 + 1 * 8, 5 + 0 * 8, 4 + 2 * 8,
+ 3 + 4 * 8, 3 + 5 * 8, 3 + 6 * 8, 3 + 7 * 8,
+ 4 + 3 * 8, 5 + 1 * 8, 6 + 0 * 8, 5 + 2 * 8,
+ 4 + 4 * 8, 4 + 5 * 8, 4 + 6 * 8, 4 + 7 * 8,
+ 5 + 3 * 8, 6 + 1 * 8, 6 + 2 * 8, 5 + 4 * 8,
+ 5 + 5 * 8, 5 + 6 * 8, 5 + 7 * 8, 6 + 3 * 8,
+ 7 + 0 * 8, 7 + 1 * 8, 6 + 4 * 8, 6 + 5 * 8,
+ 6 + 6 * 8, 6 + 7 * 8, 7 + 2 * 8, 7 + 3 * 8,
+ 7 + 4 * 8, 7 + 5 * 8, 7 + 6 * 8, 7 + 7 * 8,
+};
+
+static const uint8_t field_scan8x8_cavlc[64] = {
+ 0 + 0 * 8, 1 + 1 * 8, 2 + 0 * 8, 0 + 7 * 8,
+ 2 + 2 * 8, 2 + 3 * 8, 2 + 4 * 8, 3 + 3 * 8,
+ 3 + 4 * 8, 4 + 3 * 8, 4 + 4 * 8, 5 + 3 * 8,
+ 5 + 5 * 8, 7 + 0 * 8, 6 + 6 * 8, 7 + 4 * 8,
+ 0 + 1 * 8, 0 + 3 * 8, 1 + 3 * 8, 1 + 4 * 8,
+ 1 + 5 * 8, 3 + 1 * 8, 2 + 5 * 8, 4 + 1 * 8,
+ 3 + 5 * 8, 5 + 1 * 8, 4 + 5 * 8, 6 + 1 * 8,
+ 5 + 6 * 8, 7 + 1 * 8, 6 + 7 * 8, 7 + 5 * 8,
+ 0 + 2 * 8, 0 + 4 * 8, 0 + 5 * 8, 2 + 1 * 8,
+ 1 + 6 * 8, 4 + 0 * 8, 2 + 6 * 8, 5 + 0 * 8,
+ 3 + 6 * 8, 6 + 0 * 8, 4 + 6 * 8, 6 + 2 * 8,
+ 5 + 7 * 8, 6 + 4 * 8, 7 + 2 * 8, 7 + 6 * 8,
+ 1 + 0 * 8, 1 + 2 * 8, 0 + 6 * 8, 3 + 0 * 8,
+ 1 + 7 * 8, 3 + 2 * 8, 2 + 7 * 8, 4 + 2 * 8,
+ 3 + 7 * 8, 5 + 2 * 8, 4 + 7 * 8, 5 + 4 * 8,
+ 6 + 3 * 8, 6 + 5 * 8, 7 + 3 * 8, 7 + 7 * 8,
+};
+
+// zigzag_scan8x8_cavlc[i] = zigzag_scan8x8[(i/4) + 16*(i%4)]
+static const uint8_t zigzag_scan8x8_cavlc[64] = {
+ 0 + 0 * 8, 1 + 1 * 8, 1 + 2 * 8, 2 + 2 * 8,
+ 4 + 1 * 8, 0 + 5 * 8, 3 + 3 * 8, 7 + 0 * 8,
+ 3 + 4 * 8, 1 + 7 * 8, 5 + 3 * 8, 6 + 3 * 8,
+ 2 + 7 * 8, 6 + 4 * 8, 5 + 6 * 8, 7 + 5 * 8,
+ 1 + 0 * 8, 2 + 0 * 8, 0 + 3 * 8, 3 + 1 * 8,
+ 3 + 2 * 8, 0 + 6 * 8, 4 + 2 * 8, 6 + 1 * 8,
+ 2 + 5 * 8, 2 + 6 * 8, 6 + 2 * 8, 5 + 4 * 8,
+ 3 + 7 * 8, 7 + 3 * 8, 4 + 7 * 8, 7 + 6 * 8,
+ 0 + 1 * 8, 3 + 0 * 8, 0 + 4 * 8, 4 + 0 * 8,
+ 2 + 3 * 8, 1 + 5 * 8, 5 + 1 * 8, 5 + 2 * 8,
+ 1 + 6 * 8, 3 + 5 * 8, 7 + 1 * 8, 4 + 5 * 8,
+ 4 + 6 * 8, 7 + 4 * 8, 5 + 7 * 8, 6 + 7 * 8,
+ 0 + 2 * 8, 2 + 1 * 8, 1 + 3 * 8, 5 + 0 * 8,
+ 1 + 4 * 8, 2 + 4 * 8, 6 + 0 * 8, 4 + 3 * 8,
+ 0 + 7 * 8, 4 + 4 * 8, 7 + 2 * 8, 3 + 6 * 8,
+ 5 + 5 * 8, 6 + 5 * 8, 6 + 6 * 8, 7 + 7 * 8,
+};
+
+static const uint8_t dequant4_coeff_init[6][3] = {
+ { 10, 13, 16 },
+ { 11, 14, 18 },
+ { 13, 16, 20 },
+ { 14, 18, 23 },
+ { 16, 20, 25 },
+ { 18, 23, 29 },
+};
+
+static const uint8_t dequant8_coeff_init_scan[16] = {
+ 0, 3, 4, 3, 3, 1, 5, 1, 4, 5, 2, 5, 3, 1, 5, 1
+};
+
+static const uint8_t dequant8_coeff_init[6][6] = {
+ { 20, 18, 32, 19, 25, 24 },
+ { 22, 19, 35, 21, 28, 26 },
+ { 26, 23, 42, 24, 33, 31 },
+ { 28, 25, 45, 26, 35, 33 },
+ { 32, 28, 51, 30, 40, 38 },
+ { 36, 32, 58, 34, 46, 43 },
+};
+
+static const enum AVPixelFormat h264_hwaccel_pixfmt_list_420[] = {
+#if CONFIG_H264_DXVA2_HWACCEL
+ AV_PIX_FMT_DXVA2_VLD,
+#endif
+#if CONFIG_H264_VAAPI_HWACCEL
+ AV_PIX_FMT_VAAPI_VLD,
+#endif
+#if CONFIG_H264_VDA_HWACCEL
+ AV_PIX_FMT_VDA_VLD,
+#endif
+#if CONFIG_H264_VDPAU_HWACCEL
+ AV_PIX_FMT_VDPAU,
+#endif
+ AV_PIX_FMT_YUV420P,
+ AV_PIX_FMT_NONE
+};
+
+static const enum AVPixelFormat h264_hwaccel_pixfmt_list_jpeg_420[] = {
+#if CONFIG_H264_DXVA2_HWACCEL
 AV_PIX_FMT_DXVA2_VLD,
+#endif
+#if CONFIG_H264_VAAPI_HWACCEL
 AV_PIX_FMT_VAAPI_VLD,
+#endif
+#if CONFIG_H264_VDA_HWACCEL
 AV_PIX_FMT_VDA_VLD,
+#endif
+#if CONFIG_H264_VDPAU_HWACCEL
+ AV_PIX_FMT_VDPAU,
+#endif
 AV_PIX_FMT_YUVJ420P,
 AV_PIX_FMT_NONE
 };
 
+static void h264_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)
+{
+ H264Context *h = opaque;
+
+ h->mb_x = mb_x;
+ h->mb_y = mb_y;
+ h->mb_xy = mb_x + mb_y * h->mb_stride;
+ memset(h->non_zero_count_cache, 0, sizeof(h->non_zero_count_cache));
+ assert(ref >= 0);
+ /* FIXME: It is possible albeit uncommon that slice references
+ * differ between slices. We take the easy approach and ignore
+ * it for now. If this turns out to have any relevance in
+ * practice then correct remapping should be added. */
+ if (ref >= h->ref_count[0])
+ ref = 0;
+ fill_rectangle(&h->cur_pic.ref_index[0][4 * h->mb_xy],
+ 2, 2, 2, ref, 1);
+ fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref, 1);
+ fill_rectangle(h->mv_cache[0][scan8[0]], 4, 4, 8,
+ pack16to32((*mv)[0][0][0], (*mv)[0][0][1]), 4);
+ assert(!FRAME_MBAFF(h));
+ ff_h264_hl_decode_mb(h);
+}
+
+void ff_h264_draw_horiz_band(H264Context *h, int y, int height)
+{
+ AVCodecContext *avctx = h->avctx;
+ Picture *cur = &h->cur_pic;
+ Picture *last = h->ref_list[0][0].f.data[0] ? &h->ref_list[0][0] : NULL;
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
+ int vshift = desc->log2_chroma_h;
+ const int field_pic = h->picture_structure != PICT_FRAME;
+ if (field_pic) {
+ height <<= 1;
+ y <<= 1;
+ }
+
+ height = FFMIN(height, avctx->height - y);
+
+ if (field_pic && h->first_field && !(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD))
+ return;
+
+ if (avctx->draw_horiz_band) {
+ AVFrame *src;
+ int offset[AV_NUM_DATA_POINTERS];
+ int i;
+
+ if (cur->f.pict_type == AV_PICTURE_TYPE_B || h->low_delay ||
+ (avctx->slice_flags & SLICE_FLAG_CODED_ORDER))
+ src = &cur->f;
+ else if (last)
+ src = &last->f;
+ else
+ return;
+
+ offset[0] = y * src->linesize[0];
+ offset[1] =
+ offset[2] = (y >> vshift) * src->linesize[1];
+ for (i = 3; i < AV_NUM_DATA_POINTERS; i++)
+ offset[i] = 0;
+
+ emms_c();
+
+ avctx->draw_horiz_band(avctx, src, offset,
+ y, h->picture_structure, height);
+ }
+}
+
+static void unref_picture(H264Context *h, Picture *pic)
+{
+ int off = offsetof(Picture, tf) + sizeof(pic->tf);
+ int i;
+
+ if (!pic->f.buf[0])
+ return;
+
+ ff_thread_release_buffer(h->avctx, &pic->tf);
+ av_buffer_unref(&pic->hwaccel_priv_buf);
+
+ av_buffer_unref(&pic->qscale_table_buf);
+ av_buffer_unref(&pic->mb_type_buf);
+ for (i = 0; i < 2; i++) {
+ av_buffer_unref(&pic->motion_val_buf[i]);
+ av_buffer_unref(&pic->ref_index_buf[i]);
+ }
+
+ memset((uint8_t*)pic + off, 0, sizeof(*pic) - off);
+}
+
+static void release_unused_pictures(H264Context *h, int remove_current)
+{
+ int i;
+
+ /* release non reference frames */
+ for (i = 0; i < MAX_PICTURE_COUNT; i++) {
+ 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]);
+ }
+ }
+}
+
+static int ref_picture(H264Context *h, Picture *dst, Picture *src)
+{
+ int ret, i;
+
+ av_assert0(!dst->f.buf[0]);
+ av_assert0(src->f.buf[0]);
+
+ src->tf.f = &src->f;
+ dst->tf.f = &dst->f;
+ ret = ff_thread_ref_frame(&dst->tf, &src->tf);
+ if (ret < 0)
+ goto fail;
+
+ dst->qscale_table_buf = av_buffer_ref(src->qscale_table_buf);
+ dst->mb_type_buf = av_buffer_ref(src->mb_type_buf);
+ if (!dst->qscale_table_buf || !dst->mb_type_buf)
+ goto fail;
+ dst->qscale_table = src->qscale_table;
+ dst->mb_type = src->mb_type;
+
+ for (i = 0; i < 2; i++) {
+ dst->motion_val_buf[i] = av_buffer_ref(src->motion_val_buf[i]);
+ dst->ref_index_buf[i] = av_buffer_ref(src->ref_index_buf[i]);
+ if (!dst->motion_val_buf[i] || !dst->ref_index_buf[i])
+ goto fail;
+ dst->motion_val[i] = src->motion_val[i];
+ dst->ref_index[i] = src->ref_index[i];
+ }
+
+ if (src->hwaccel_picture_private) {
+ dst->hwaccel_priv_buf = av_buffer_ref(src->hwaccel_priv_buf);
+ if (!dst->hwaccel_priv_buf)
+ goto fail;
+ dst->hwaccel_picture_private = dst->hwaccel_priv_buf->data;
+ }
+
+ for (i = 0; i < 2; i++)
+ dst->field_poc[i] = src->field_poc[i];
+
+ memcpy(dst->ref_poc, src->ref_poc, sizeof(src->ref_poc));
+ memcpy(dst->ref_count, src->ref_count, sizeof(src->ref_count));
+
+ dst->poc = src->poc;
+ dst->frame_num = src->frame_num;
+ dst->mmco_reset = src->mmco_reset;
+ dst->pic_id = src->pic_id;
+ dst->long_ref = src->long_ref;
+ dst->mbaff = src->mbaff;
+ dst->field_picture = src->field_picture;
+ dst->needs_realloc = src->needs_realloc;
+ dst->reference = src->reference;
+ dst->recovered = src->recovered;
+
+ return 0;
+fail:
+ unref_picture(h, dst);
+ return ret;
+}
+
+static int alloc_scratch_buffers(H264Context *h, int linesize)
+{
+ int alloc_size = FFALIGN(FFABS(linesize) + 32, 32);
+
+ if (h->bipred_scratchpad)
+ return 0;
+
+ h->bipred_scratchpad = av_malloc(16 * 6 * alloc_size);
+ // edge emu needs blocksize + filter length - 1
+ // (= 21x21 for h264)
+ h->edge_emu_buffer = av_mallocz(alloc_size * 2 * 21);
+ h->me.scratchpad = av_mallocz(alloc_size * 2 * 16 * 2);
+
+ if (!h->bipred_scratchpad || !h->edge_emu_buffer || !h->me.scratchpad) {
+ av_freep(&h->bipred_scratchpad);
+ av_freep(&h->edge_emu_buffer);
+ av_freep(&h->me.scratchpad);
+ return AVERROR(ENOMEM);
+ }
+
+ h->me.temp = h->me.scratchpad;
+
+ return 0;
+}
+
+static int init_table_pools(H264Context *h)
+{
+ const int big_mb_num = h->mb_stride * (h->mb_height + 1) + 1;
+ const int mb_array_size = h->mb_stride * h->mb_height;
+ const int b4_stride = h->mb_width * 4 + 1;
+ const int b4_array_size = b4_stride * h->mb_height * 4;
+
+ h->qscale_table_pool = av_buffer_pool_init(big_mb_num + h->mb_stride,
+ av_buffer_allocz);
+ h->mb_type_pool = av_buffer_pool_init((big_mb_num + h->mb_stride) *
+ sizeof(uint32_t), av_buffer_allocz);
+ h->motion_val_pool = av_buffer_pool_init(2 * (b4_array_size + 4) *
+ sizeof(int16_t), av_buffer_allocz);
+ h->ref_index_pool = av_buffer_pool_init(4 * mb_array_size, av_buffer_allocz);
+
+ if (!h->qscale_table_pool || !h->mb_type_pool || !h->motion_val_pool ||
+ !h->ref_index_pool) {
+ av_buffer_pool_uninit(&h->qscale_table_pool);
+ av_buffer_pool_uninit(&h->mb_type_pool);
+ av_buffer_pool_uninit(&h->motion_val_pool);
+ av_buffer_pool_uninit(&h->ref_index_pool);
+ return AVERROR(ENOMEM);
+ }
+
+ return 0;
+}
+
+static int alloc_picture(H264Context *h, Picture *pic)
+{
+ int i, ret = 0;
+
+ av_assert0(!pic->f.data[0]);
+
+ pic->tf.f = &pic->f;
+ ret = ff_thread_get_buffer(h->avctx, &pic->tf, pic->reference ?
+ AV_GET_BUFFER_FLAG_REF : 0);
+ if (ret < 0)
+ goto fail;
+
+ h->linesize = pic->f.linesize[0];
+ h->uvlinesize = pic->f.linesize[1];
+
+ if (h->avctx->hwaccel) {
+ const AVHWAccel *hwaccel = h->avctx->hwaccel;
+ av_assert0(!pic->hwaccel_picture_private);
+ if (hwaccel->priv_data_size) {
+ pic->hwaccel_priv_buf = av_buffer_allocz(hwaccel->priv_data_size);
+ if (!pic->hwaccel_priv_buf)
+ return AVERROR(ENOMEM);
+ pic->hwaccel_picture_private = pic->hwaccel_priv_buf->data;
+ }
+ }
+
+ if (!h->qscale_table_pool) {
+ ret = init_table_pools(h);
+ if (ret < 0)
+ goto fail;
+ }
+
+ pic->qscale_table_buf = av_buffer_pool_get(h->qscale_table_pool);
+ pic->mb_type_buf = av_buffer_pool_get(h->mb_type_pool);
+ if (!pic->qscale_table_buf || !pic->mb_type_buf)
+ goto fail;
+
+ pic->mb_type = (uint32_t*)pic->mb_type_buf->data + 2 * h->mb_stride + 1;
+ pic->qscale_table = pic->qscale_table_buf->data + 2 * h->mb_stride + 1;
+
+ for (i = 0; i < 2; i++) {
+ pic->motion_val_buf[i] = av_buffer_pool_get(h->motion_val_pool);
+ pic->ref_index_buf[i] = av_buffer_pool_get(h->ref_index_pool);
+ if (!pic->motion_val_buf[i] || !pic->ref_index_buf[i])
+ goto fail;
+
+ pic->motion_val[i] = (int16_t (*)[2])pic->motion_val_buf[i]->data + 4;
+ pic->ref_index[i] = pic->ref_index_buf[i]->data;
+ }
+
+ return 0;
+fail:
+ unref_picture(h, pic);
+ return (ret < 0) ? ret : AVERROR(ENOMEM);
+}
+
+static inline int pic_is_unused(H264Context *h, Picture *pic)
+{
+ if (!pic->f.buf[0])
+ return 1;
+ if (pic->needs_realloc && !(pic->reference & DELAYED_PIC_REF))
+ return 1;
+ return 0;
+}
+
+static int find_unused_picture(H264Context *h)
+{
+ int i;
+
+ for (i = 0; i < MAX_PICTURE_COUNT; i++) {
+ if (pic_is_unused(h, &h->DPB[i]))
+ break;
+ }
+ if (i == MAX_PICTURE_COUNT)
+ return AVERROR_INVALIDDATA;
+
+ if (h->DPB[i].needs_realloc) {
+ h->DPB[i].needs_realloc = 0;
+ unref_picture(h, &h->DPB[i]);
+ }
+
+ return i;
+}
+
 /**
 * Check if the top & left blocks are available if needed and
 * change the dc mode so it only uses the available blocks.
 */
 int ff_h264_check_intra4x4_pred_mode(H264Context *h)
 {
- MpegEncContext *const s = &h->s;
 static const int8_t top[12] = {
 -1, 0, LEFT_DC_PRED, -1, -1, -1, -1, -1, 0
 };
@@ -86,10 +500,10 @@
 for (i = 0; i < 4; i++) {
 int status = top[h->intra4x4_pred_mode_cache[scan8[0] + i]];
 if (status < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
 "top block unavailable for requested intra4x4 mode %d at %d %d\n",
- status, s->mb_x, s->mb_y);
- return -1;
+ status, h->mb_x, h->mb_y);
+ return AVERROR_INVALIDDATA;
 } else if (status) {
 h->intra4x4_pred_mode_cache[scan8[0] + i] = status;
 }
@@ -102,10 +516,10 @@
 if (!(h->left_samples_available & mask[i])) {
 int status = left[h->intra4x4_pred_mode_cache[scan8[0] + 8 * i]];
 if (status < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
 "left block unavailable for requested intra4x4 mode %d at %d %d\n",
- status, s->mb_x, s->mb_y);
- return -1;
+ status, h->mb_x, h->mb_y);
+ return AVERROR_INVALIDDATA;
 } else if (status) {
 h->intra4x4_pred_mode_cache[scan8[0] + 8 * i] = status;
 }
@@ -121,24 +535,23 @@
 */
 int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma)
 {
- MpegEncContext *const s = &h->s;
- static const int8_t top[7] = { LEFT_DC_PRED8x8, 1, -1, -1 };
- static const int8_t left[7] = { TOP_DC_PRED8x8, -1, 2, -1, DC_128_PRED8x8 };
+ 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 };
 
- if (mode > 6U) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ if (mode > 3U) {
+ av_log(h->avctx, AV_LOG_ERROR,
 "out of range intra chroma pred mode at %d %d\n",
- s->mb_x, s->mb_y);
- return -1;
+ h->mb_x, h->mb_y);
+ return AVERROR_INVALIDDATA;
 }
 
 if (!(h->top_samples_available & 0x8000)) {
 mode = top[mode];
 if (mode < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
 "top block unavailable for requested intra mode at %d %d\n",
- s->mb_x, s->mb_y);
- return -1;
+ h->mb_x, h->mb_y);
+ return AVERROR_INVALIDDATA;
 }
 }
 
@@ -151,10 +564,10 @@
 2 * (mode == DC_128_PRED8x8);
 }
 if (mode < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
 "left block unavailable for requested intra mode at %d %d\n",
- s->mb_x, s->mb_y);
- return -1;
+ h->mb_x, h->mb_y);
+ return AVERROR_INVALIDDATA;
 }
 }
 
@@ -176,19 +589,21 @@
 length--;
 
 #define STARTCODE_TEST \
- if (i + 2 < length && src[i + 1] == 0 && src[i + 2] <= 3) { \
- if (src[i + 2] != 3) { \
- /* startcode, so we must be past the end */ \
- length = i; \
- } \
- break; \
- }
+ if (i + 2 < length && src[i + 1] == 0 && src[i + 2] <= 3) { \
+ if (src[i + 2] != 3) { \
+ /* startcode, so we must be past the end */ \
+ length = i; \
+ } \
+ break; \
+ }
+
 #if HAVE_FAST_UNALIGNED
 #define FIND_FIRST_ZERO \
- if (i > 0 && !src[i]) \
- i--; \
- while (src[i]) \
- i++
+ if (i > 0 && !src[i]) \
+ i--; \
+ while (src[i]) \
+ i++
+
 #if HAVE_FAST_64BIT
 for (i = 0; i + 1 < length; i += 9) {
 if (!((~AV_RN64A(src + i) &
@@ -256,8 +671,8 @@
 }
 while (si < length)
 dst[di++] = src[si++];
-nsc:
 
+nsc:
 memset(dst + di, 0, FF_INPUT_BUFFER_PADDING_SIZE);
 
 *dst_length = di;
@@ -276,7 +691,7 @@
 int v = *src;
 int r;
 
- tprintf(h->s.avctx, "rbsp trailing %X\n", v);
+ tprintf(h->avctx, "rbsp trailing %X\n", v);
 
 for (r = 1; r < 9; r++) {
 if (v & 1)
@@ -289,12 +704,12 @@
 static inline int get_lowest_part_list_y(H264Context *h, Picture *pic, int n,
 int height, int y_offset, int list)
 {
- int raw_my = h->mv_cache[list][scan8[n]][1];
+ int raw_my = h->mv_cache[list][scan8[n]][1];
 int filter_height_up = (raw_my & 3) ? 2 : 0;
 int filter_height_down = (raw_my & 3) ? 3 : 0;
- int full_my = (raw_my >> 2) + y_offset;
- int top = full_my - filter_height_up;
- int bottom = full_my + filter_height_down + height;
+ int full_my = (raw_my >> 2) + y_offset;
+ int top = full_my - filter_height_up;
+ int bottom = full_my + filter_height_down + height;
 
 return FFMAX(abs(top), bottom);
 }
@@ -303,10 +718,9 @@
 int height, int y_offset, int list0,
 int list1, int *nrefs)
 {
- MpegEncContext *const s = &h->s;
 int my;
 
- y_offset += 16 * (s->mb_y >> MB_FIELD);
+ y_offset += 16 * (h->mb_y >> MB_FIELD(h));
 
 if (list0) {
 int ref_n = h->ref_cache[0][scan8[n]];
@@ -315,8 +729,8 @@
 // Error resilience puts the current picture in the ref list.
 // Don't try to wait on these as it will cause a deadlock.
 // Fields can wait on each other, though.
- if (ref->f.thread_opaque != s->current_picture.f.thread_opaque ||
- (ref->f.reference & 3) != s->picture_structure) {
+ if (ref->tf.progress->data != h->cur_pic.tf.progress->data ||
+ (ref->reference & 3) != h->picture_structure) {
 my = get_lowest_part_list_y(h, ref, n, height, y_offset, 0);
 if (refs[0][ref_n] < 0)
 nrefs[0] += 1;
@@ -328,8 +742,8 @@
 int ref_n = h->ref_cache[1][scan8[n]];
 Picture *ref = &h->ref_list[1][ref_n];
 
- if (ref->f.thread_opaque != s->current_picture.f.thread_opaque ||
- (ref->f.reference & 3) != s->picture_structure) {
+ if (ref->tf.progress->data != h->cur_pic.tf.progress->data ||
+ (ref->reference & 3) != h->picture_structure) {
 my = get_lowest_part_list_y(h, ref, n, height, y_offset, 1);
 if (refs[1][ref_n] < 0)
 nrefs[1] += 1;
@@ -345,9 +759,8 @@
 */
 static void await_references(H264Context *h)
 {
- MpegEncContext *const s = &h->s;
 const int mb_xy = h->mb_xy;
- const int mb_type = s->current_picture.f.mb_type[mb_xy];
+ const int mb_type = h->cur_pic.mb_type[mb_xy];
 int refs[2][48];
 int nrefs[2] = { 0 };
 int ref, list;
@@ -419,32 +832,32 @@
 int row = refs[list][ref];
 if (row >= 0) {
 Picture *ref_pic = &h->ref_list[list][ref];
- int ref_field = ref_pic->f.reference - 1;
+ int ref_field = ref_pic->reference - 1;
 int ref_field_picture = ref_pic->field_picture;
- int pic_height = 16 * s->mb_height >> ref_field_picture;
+ int pic_height = 16 * h->mb_height >> ref_field_picture;
 
- row <<= MB_MBAFF;
+ row <<= MB_MBAFF(h);
 nrefs[list]--;
 
- if (!FIELD_PICTURE && ref_field_picture) { // frame referencing two fields
- ff_thread_await_progress(&ref_pic->f,
+ if (!FIELD_PICTURE(h) && ref_field_picture) { // frame referencing two fields
+ ff_thread_await_progress(&ref_pic->tf,
 FFMIN((row >> 1) - !(row & 1),
 pic_height - 1),
 1);
- ff_thread_await_progress(&ref_pic->f,
+ ff_thread_await_progress(&ref_pic->tf,
 FFMIN((row >> 1), pic_height - 1),
 0);
- } else if (FIELD_PICTURE && !ref_field_picture) { // field referencing one field of a frame
- ff_thread_await_progress(&ref_pic->f,
+ } else if (FIELD_PICTURE(h) && !ref_field_picture) { // field referencing one field of a frame
+ ff_thread_await_progress(&ref_pic->tf,
 FFMIN(row * 2 + ref_field,
 pic_height - 1),
 0);
- } else if (FIELD_PICTURE) {
- ff_thread_await_progress(&ref_pic->f,
+ } else if (FIELD_PICTURE(h)) {
+ ff_thread_await_progress(&ref_pic->tf,
 FFMIN(row, pic_height - 1),
 ref_field);
 } else {
- ff_thread_await_progress(&ref_pic->f,
+ ff_thread_await_progress(&ref_pic->tf,
 FFMIN(row, pic_height - 1),
 0);
 }
@@ -462,20 +875,19 @@
 h264_chroma_mc_func chroma_op,
 int pixel_shift, int chroma_idc)
 {
- MpegEncContext *const s = &h->s;
 const int mx = h->mv_cache[list][scan8[n]][0] + src_x_offset * 8;
 int my = h->mv_cache[list][scan8[n]][1] + src_y_offset * 8;
 const int luma_xy = (mx & 3) + ((my & 3) << 2);
- int offset = ((mx >> 2) << pixel_shift) + (my >> 2) * h->mb_linesize;
+ ptrdiff_t offset = ((mx >> 2) << pixel_shift) + (my >> 2) * h->mb_linesize;
 uint8_t *src_y = pic->f.data[0] + offset;
 uint8_t *src_cb, *src_cr;
- int extra_width = h->emu_edge_width;
- int extra_height = h->emu_edge_height;
+ int extra_width = 0;
+ int extra_height = 0;
 int emu = 0;
 const int full_mx = mx >> 2;
 const int full_my = my >> 2;
- const int pic_width = 16 * s->mb_width;
- const int pic_height = 16 * s->mb_height >> MB_FIELD;
+ const int pic_width = 16 * h->mb_width;
+ const int pic_height = 16 * h->mb_height >> MB_FIELD(h);
 int ysh;
 
 if (mx & 7)
@@ -487,12 +899,12 @@
 full_my < 0 - extra_height ||
 full_mx + 16 /*FIXME*/ > pic_width + extra_width ||
 full_my + 16 /*FIXME*/ > pic_height + extra_height) {
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
+ 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 = s->edge_emu_buffer + (2 << pixel_shift) + 2 * h->mb_linesize;
+ src_y = h->edge_emu_buffer + (2 << pixel_shift) + 2 * h->mb_linesize;
 emu = 1;
 }
 
@@ -500,19 +912,19 @@
 if (!square)
 qpix_op[luma_xy](dest_y + delta, src_y + delta, h->mb_linesize);
 
- if (CONFIG_GRAY && s->flags & CODEC_FLAG_GRAY)
+ if (CONFIG_GRAY && h->flags & CODEC_FLAG_GRAY)
 return;
 
 if (chroma_idc == 3 /* yuv444 */) {
 src_cb = pic->f.data[1] + offset;
 if (emu) {
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
+ 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);
- src_cb = s->edge_emu_buffer + (2 << pixel_shift) + 2 * h->mb_linesize;
+ src_cb = h->edge_emu_buffer + (2 << pixel_shift) + 2 * h->mb_linesize;
 }
 qpix_op[luma_xy](dest_cb, src_cb, h->mb_linesize); // FIXME try variable height perhaps?
 if (!square)
@@ -520,13 +932,13 @@
 
 src_cr = pic->f.data[2] + offset;
 if (emu) {
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
+ 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);
- src_cr = s->edge_emu_buffer + (2 << pixel_shift) + 2 * h->mb_linesize;
+ src_cr = h->edge_emu_buffer + (2 << pixel_shift) + 2 * h->mb_linesize;
 }
 qpix_op[luma_xy](dest_cr, src_cr, h->mb_linesize); // FIXME try variable height perhaps?
 if (!square)
@@ -535,9 +947,9 @@
 }
 
 ysh = 3 - (chroma_idc == 2 /* yuv422 */);
- if (chroma_idc == 1 /* yuv420 */ && MB_FIELD) {
+ if (chroma_idc == 1 /* yuv420 */ && MB_FIELD(h)) {
 // chroma offset when predicting from a field of opposite parity
- my += 2 * ((s->mb_y & 1) - (pic->f.reference - 1));
+ my += 2 * ((h->mb_y & 1) - (pic->reference - 1));
 emu |= (my >> 3) < 0 || (my >> 3) + 8 >= (pic_height >> 1);
 }
 
@@ -547,20 +959,22 @@
 (my >> ysh) * h->mb_uvlinesize;
 
 if (emu) {
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer, 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 = s->edge_emu_buffer;
+ src_cb = h->edge_emu_buffer;
 }
 chroma_op(dest_cb, src_cb, h->mb_uvlinesize,
 height >> (chroma_idc == 1 /* yuv420 */),
 mx & 7, (my << (chroma_idc == 2 /* yuv422 */)) & 7);
 
 if (emu) {
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer, 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 = s->edge_emu_buffer;
+ src_cr = h->edge_emu_buffer;
 }
 chroma_op(dest_cr, src_cr, h->mb_uvlinesize, height >> (chroma_idc == 1 /* yuv420 */),
 mx & 7, (my << (chroma_idc == 2 /* yuv422 */)) & 7);
@@ -578,7 +992,6 @@
 int list0, int list1,
 int pixel_shift, int chroma_idc)
 {
- MpegEncContext *const s = &h->s;
 qpel_mc_func *qpix_op = qpix_put;
 h264_chroma_mc_func chroma_op = chroma_put;
 
@@ -593,8 +1006,8 @@
 dest_cb += (x_offset << pixel_shift) + y_offset * h->mb_uvlinesize;
 dest_cr += (x_offset << pixel_shift) + y_offset * h->mb_uvlinesize;
 }
- x_offset += 8 * s->mb_x;
- y_offset += 8 * (s->mb_y >> MB_FIELD);
+ x_offset += 8 * h->mb_x;
+ y_offset += 8 * (h->mb_y >> MB_FIELD(h));
 
 if (list0) {
 Picture *ref = &h->ref_list[0][h->ref_cache[0][scan8[n]]];
@@ -628,7 +1041,6 @@
 int list0, int list1,
 int pixel_shift, int chroma_idc)
 {
- MpegEncContext *const s = &h->s;
 int chroma_height;
 
 dest_y += (2 * x_offset << pixel_shift) + 2 * y_offset * h->mb_linesize;
@@ -647,8 +1059,8 @@
 dest_cb += (x_offset << pixel_shift) + y_offset * h->mb_uvlinesize;
 dest_cr += (x_offset << pixel_shift) + y_offset * h->mb_uvlinesize;
 }
- x_offset += 8 * s->mb_x;
- y_offset += 8 * (s->mb_y >> MB_FIELD);
+ x_offset += 8 * h->mb_x;
+ y_offset += 8 * (h->mb_y >> MB_FIELD(h));
 
 if (list0 && list1) {
 /* don't optimize for luma-only case, since B-frames usually
@@ -669,7 +1081,7 @@
 pixel_shift, chroma_idc);
 
 if (h->use_weight == 2) {
- int weight0 = h->implicit_weight[refn0][refn1][s->mb_y & 1];
+ int weight0 = h->implicit_weight[refn0][refn1][h->mb_y & 1];
 int weight1 = 64 - weight0;
 luma_weight_avg(dest_y, tmp_y, h->mb_linesize,
 height, 5, weight0, weight1, 0);
@@ -727,24 +1139,23 @@
 {
 /* fetch pixels for estimated mv 4 macroblocks ahead
 * optimized for 64byte cache lines */
- MpegEncContext *const s = &h->s;
 const int refn = h->ref_cache[list][scan8[0]];
 if (refn >= 0) {
- const int mx = (h->mv_cache[list][scan8[0]][0] >> 2) + 16 * s->mb_x + 8;
- const int my = (h->mv_cache[list][scan8[0]][1] >> 2) + 16 * s->mb_y;
+ const int mx = (h->mv_cache[list][scan8[0]][0] >> 2) + 16 * h->mb_x + 8;
+ const int my = (h->mv_cache[list][scan8[0]][1] >> 2) + 16 * h->mb_y;
 uint8_t **src = h->ref_list[list][refn].f.data;
 int off = (mx << pixel_shift) +
- (my + (s->mb_x & 3) * 4) * h->mb_linesize +
+ (my + (h->mb_x & 3) * 4) * h->mb_linesize +
 (64 << pixel_shift);
- s->vdsp.prefetch(src[0] + off, s->linesize, 4);
+ h->vdsp.prefetch(src[0] + off, h->linesize, 4);
 if (chroma_idc == 3 /* yuv444 */) {
- s->vdsp.prefetch(src[1] + off, s->linesize, 4);
- s->vdsp.prefetch(src[2] + off, s->linesize, 4);
+ h->vdsp.prefetch(src[1] + off, h->linesize, 4);
+ h->vdsp.prefetch(src[2] + off, h->linesize, 4);
 } else {
 off = ((mx >> 1) << pixel_shift) +
- ((my >> 1) + (s->mb_x & 7)) * s->uvlinesize +
+ ((my >> 1) + (h->mb_x & 7)) * h->uvlinesize +
 (64 << pixel_shift);
- s->vdsp.prefetch(src[1] + off, src[2] - src[1], 2);
+ h->vdsp.prefetch(src[1] + off, src[2] - src[1], 2);
 }
 }
 }
@@ -768,6 +1179,22 @@
 av_freep(&h->mb2b_xy);
 av_freep(&h->mb2br_xy);
 
+ av_buffer_pool_uninit(&h->qscale_table_pool);
+ av_buffer_pool_uninit(&h->mb_type_pool);
+ av_buffer_pool_uninit(&h->motion_val_pool);
+ av_buffer_pool_uninit(&h->ref_index_pool);
+
+ if (free_rbsp && h->DPB) {
+ for (i = 0; i < MAX_PICTURE_COUNT; i++)
+ unref_picture(h, &h->DPB[i]);
+ av_freep(&h->DPB);
+ } else if (h->DPB) {
+ for (i = 0; i < MAX_PICTURE_COUNT; i++)
+ h->DPB[i].needs_realloc = 1;
+ }
+
+ h->cur_pic_ptr = NULL;
+
 for (i = 0; i < MAX_THREADS; i++) {
 hx = h->thread_context[i];
 if (!hx)
@@ -775,6 +1202,15 @@
 av_freep(&hx->top_borders[1]);
 av_freep(&hx->top_borders[0]);
 av_freep(&hx->bipred_scratchpad);
+ av_freep(&hx->edge_emu_buffer);
+ av_freep(&hx->dc_val_base);
+ av_freep(&hx->me.scratchpad);
+ av_freep(&hx->er.mb_index2xy);
+ av_freep(&hx->er.error_status_table);
+ av_freep(&hx->er.er_temp_buffer);
+ av_freep(&hx->er.mbintra_table);
+ av_freep(&hx->er.mbskip_table);
+
 if (free_rbsp) {
 av_freep(&hx->rbsp_buffer[1]);
 av_freep(&hx->rbsp_buffer[0]);
@@ -858,55 +1294,63 @@
 
 int ff_h264_alloc_tables(H264Context *h)
 {
- MpegEncContext *const s = &h->s;
- const int big_mb_num = s->mb_stride * (s->mb_height + 1);
- const int row_mb_num = s->mb_stride * 2 * s->avctx->thread_count;
- int x, y;
+ const int big_mb_num = h->mb_stride * (h->mb_height + 1);
+ const int row_mb_num = h->mb_stride * 2 * h->avctx->thread_count;
+ int x, y, i;
 
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->intra4x4_pred_mode,
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->intra4x4_pred_mode,
 row_mb_num * 8 * sizeof(uint8_t), fail)
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->non_zero_count,
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->non_zero_count,
 big_mb_num * 48 * sizeof(uint8_t), fail)
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->slice_table_base,
- (big_mb_num + s->mb_stride) * sizeof(*h->slice_table_base), fail)
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->cbp_table,
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->slice_table_base,
+ (big_mb_num + h->mb_stride) * sizeof(*h->slice_table_base), fail)
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->cbp_table,
 big_mb_num * sizeof(uint16_t), fail)
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->chroma_pred_mode_table,
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->chroma_pred_mode_table,
 big_mb_num * sizeof(uint8_t), fail)
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mvd_table[0],
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->mvd_table[0],
 16 * row_mb_num * sizeof(uint8_t), fail);
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mvd_table[1],
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->mvd_table[1],
 16 * row_mb_num * sizeof(uint8_t), fail);
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->direct_table,
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->direct_table,
 4 * big_mb_num * sizeof(uint8_t), fail);
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->list_counts,
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->list_counts,
 big_mb_num * sizeof(uint8_t), fail)
 
 memset(h->slice_table_base, -1,
- (big_mb_num + s->mb_stride) * sizeof(*h->slice_table_base));
- h->slice_table = h->slice_table_base + s->mb_stride * 2 + 1;
+ (big_mb_num + h->mb_stride) * sizeof(*h->slice_table_base));
+ h->slice_table = h->slice_table_base + h->mb_stride * 2 + 1;
 
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mb2b_xy,
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->mb2b_xy,
 big_mb_num * sizeof(uint32_t), fail);
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->mb2br_xy,
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->mb2br_xy,
 big_mb_num * sizeof(uint32_t), fail);
- for (y = 0; y < s->mb_height; y++)
- for (x = 0; x < s->mb_width; x++) {
- const int mb_xy = x + y * s->mb_stride;
+ for (y = 0; y < h->mb_height; y++)
+ for (x = 0; x < h->mb_width; x++) {
+ const int mb_xy = x + y * h->mb_stride;
 const int b_xy = 4 * x + 4 * y * h->b_stride;
 
 h->mb2b_xy[mb_xy] = b_xy;
- h->mb2br_xy[mb_xy] = 8 * (FMO ? mb_xy : (mb_xy % (2 * s->mb_stride)));
+ h->mb2br_xy[mb_xy] = 8 * (FMO ? mb_xy : (mb_xy % (2 * h->mb_stride)));
 }
 
 if (!h->dequant4_coeff[0])
 init_dequant_tables(h);
 
+ if (!h->DPB) {
+ h->DPB = av_mallocz_array(MAX_PICTURE_COUNT, sizeof(*h->DPB));
+ if (!h->DPB)
+ return AVERROR(ENOMEM);
+ for (i = 0; i < MAX_PICTURE_COUNT; i++)
+ av_frame_unref(&h->DPB[i].f);
+ av_frame_unref(&h->cur_pic.f);
+ }
+
 return 0;
 
 fail:
 free_tables(h, 1);
- return -1;
+ return AVERROR(ENOMEM);
 }
 
 /**
@@ -914,20 +1358,24 @@
 */
 static void clone_tables(H264Context *dst, H264Context *src, int i)
 {
- MpegEncContext *const s = &src->s;
- dst->intra4x4_pred_mode = src->intra4x4_pred_mode + i * 8 * 2 * s->mb_stride;
+ dst->intra4x4_pred_mode = src->intra4x4_pred_mode + i * 8 * 2 * src->mb_stride;
 dst->non_zero_count = src->non_zero_count;
 dst->slice_table = src->slice_table;
 dst->cbp_table = src->cbp_table;
 dst->mb2b_xy = src->mb2b_xy;
 dst->mb2br_xy = src->mb2br_xy;
 dst->chroma_pred_mode_table = src->chroma_pred_mode_table;
- dst->mvd_table[0] = src->mvd_table[0] + i * 8 * 2 * s->mb_stride;
- dst->mvd_table[1] = src->mvd_table[1] + i * 8 * 2 * s->mb_stride;
+ dst->mvd_table[0] = src->mvd_table[0] + i * 8 * 2 * src->mb_stride;
+ dst->mvd_table[1] = src->mvd_table[1] + i * 8 * 2 * src->mb_stride;
 dst->direct_table = src->direct_table;
 dst->list_counts = src->list_counts;
+ dst->DPB = src->DPB;
+ dst->cur_pic_ptr = src->cur_pic_ptr;
+ dst->cur_pic = src->cur_pic;
 dst->bipred_scratchpad = NULL;
- ff_h264_pred_init(&dst->hpc, src->s.codec_id, src->sps.bit_depth_luma,
+ dst->edge_emu_buffer = NULL;
+ dst->me.scratchpad = NULL;
+ ff_h264_pred_init(&dst->hpc, src->avctx->codec_id, src->sps.bit_depth_luma,
 src->sps.chroma_format_idc);
 }
 
@@ -937,10 +1385,17 @@
 */
 static int context_init(H264Context *h)
 {
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->top_borders[0],
- h->s.mb_width * 16 * 3 * sizeof(uint8_t) * 2, fail)
- FF_ALLOCZ_OR_GOTO(h->s.avctx, h->top_borders[1],
- h->s.mb_width * 16 * 3 * sizeof(uint8_t) * 2, fail)
+ ERContext *er = &h->er;
+ int mb_array_size = h->mb_height * h->mb_stride;
+ int y_size = (2 * h->mb_width + 1) * (2 * h->mb_height + 1);
+ int c_size = h->mb_stride * (h->mb_height + 1);
+ int yc_size = y_size + 2 * c_size;
+ int x, y, i;
+
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->top_borders[0],
+ h->mb_width * 16 * 3 * sizeof(uint8_t) * 2, fail)
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->top_borders[1],
+ h->mb_width * 16 * 3 * sizeof(uint8_t) * 2, fail)
 
 h->ref_cache[0][scan8[5] + 1] =
 h->ref_cache[0][scan8[7] + 1] =
@@ -949,40 +1404,61 @@
 h->ref_cache[1][scan8[7] + 1] =
 h->ref_cache[1][scan8[13] + 1] = PART_NOT_AVAILABLE;
 
+ if (CONFIG_ERROR_RESILIENCE) {
+ /* init ER */
+ er->avctx = h->avctx;
+ er->dsp = &h->dsp;
+ er->decode_mb = h264_er_decode_mb;
+ er->opaque = h;
+ er->quarter_sample = 1;
+
+ er->mb_num = h->mb_num;
+ er->mb_width = h->mb_width;
+ er->mb_height = h->mb_height;
+ er->mb_stride = h->mb_stride;
+ er->b8_stride = h->mb_width * 2 + 1;
+
+ FF_ALLOCZ_OR_GOTO(h->avctx, er->mb_index2xy, (h->mb_num + 1) * sizeof(int),
+ fail); // error ressilience code looks cleaner with this
+ for (y = 0; y < h->mb_height; y++)
+ for (x = 0; x < h->mb_width; x++)
+ er->mb_index2xy[x + y * h->mb_width] = x + y * h->mb_stride;
+
+ er->mb_index2xy[h->mb_height * h->mb_width] = (h->mb_height - 1) *
+ h->mb_stride + h->mb_width;
+
+ FF_ALLOCZ_OR_GOTO(h->avctx, er->error_status_table,
+ mb_array_size * sizeof(uint8_t), fail);
+
+ FF_ALLOC_OR_GOTO(h->avctx, er->mbintra_table, mb_array_size, fail);
+ memset(er->mbintra_table, 1, mb_array_size);
+
+ FF_ALLOCZ_OR_GOTO(h->avctx, er->mbskip_table, mb_array_size + 2, fail);
+
+ FF_ALLOC_OR_GOTO(h->avctx, er->er_temp_buffer, h->mb_height * h->mb_stride,
+ fail);
+
+ FF_ALLOCZ_OR_GOTO(h->avctx, h->dc_val_base, yc_size * sizeof(int16_t), fail);
+ er->dc_val[0] = h->dc_val_base + h->mb_width * 2 + 2;
+ er->dc_val[1] = h->dc_val_base + y_size + h->mb_stride + 1;
+ er->dc_val[2] = er->dc_val[1] + c_size;
+ for (i = 0; i < yc_size; i++)
+ h->dc_val_base[i] = 1024;
+ }
+
 return 0;
 
 fail:
- return -1; // free_tables will clean up for us
+ return AVERROR(ENOMEM); // free_tables will clean up for us
 }
 
 static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size,
 int parse_extradata);
 
-static av_cold void common_init(H264Context *h)
-{
- MpegEncContext *const s = &h->s;
-
- s->width = s->avctx->width;
- s->height = s->avctx->height;
- s->codec_id = s->avctx->codec->id;
-
- ff_h264dsp_init(&h->h264dsp, 8, 1);
- ff_h264_pred_init(&h->hpc, s->codec_id, 8, 1);
-
- h->dequant_coeff_pps = -1;
- s->unrestricted_mv = 1;
-
- /* needed so that IDCT permutation is known early */
- ff_dsputil_init(&s->dsp, s->avctx);
- ff_videodsp_init(&s->vdsp, 8);
-
- memset(h->pps.scaling_matrix4, 16, 6 * 16 * sizeof(uint8_t));
- memset(h->pps.scaling_matrix8, 16, 2 * 64 * sizeof(uint8_t));
-}
-
 int ff_h264_decode_extradata(H264Context *h)
 {
- AVCodecContext *avctx = h->s.avctx;
+ AVCodecContext *avctx = h->avctx;
+ int ret;
 
 if (avctx->extradata[0] == 1) {
 int i, cnt, nalsize;
@@ -991,8 +1467,9 @@
 h->is_avc = 1;
 
 if (avctx->extradata_size < 7) {
- av_log(avctx, AV_LOG_ERROR, "avcC too short\n");
- return -1;
+ av_log(avctx, AV_LOG_ERROR,
+ "avcC %d too short\n", avctx->extradata_size);
+ return AVERROR_INVALIDDATA;
 }
 /* sps and pps in the avcC always have length coded with 2 bytes,
 * so put a fake nal_length_size = 2 while parsing them */
@@ -1003,11 +1480,12 @@
 for (i = 0; i < cnt; i++) {
 nalsize = AV_RB16(p) + 2;
 if (p - avctx->extradata + nalsize > avctx->extradata_size)
- return -1;
- if (decode_nal_units(h, p, nalsize, 1) < 0) {
+ return AVERROR_INVALIDDATA;
+ ret = decode_nal_units(h, p, nalsize, 1);
+ if (ret < 0) {
 av_log(avctx, AV_LOG_ERROR,
 "Decoding sps %d from avcC failed\n", i);
- return -1;
+ return ret;
 }
 p += nalsize;
 }
@@ -1016,11 +1494,12 @@
 for (i = 0; i < cnt; i++) {
 nalsize = AV_RB16(p) + 2;
 if (p - avctx->extradata + nalsize > avctx->extradata_size)
- return -1;
- if (decode_nal_units(h, p, nalsize, 1) < 0) {
+ return AVERROR_INVALIDDATA;
+ ret = decode_nal_units(h, p, nalsize, 1);
+ if (ret < 0) {
 av_log(avctx, AV_LOG_ERROR,
 "Decoding pps %d from avcC failed\n", i);
- return -1;
+ return ret;
 }
 p += nalsize;
 }
@@ -1028,8 +1507,9 @@
 h->nal_length_size = (avctx->extradata[4] & 0x03) + 1;
 } else {
 h->is_avc = 0;
- if (decode_nal_units(h, avctx->extradata, avctx->extradata_size, 1) < 0)
- return -1;
+ ret = decode_nal_units(h, avctx->extradata, avctx->extradata_size, 1);
+ if (ret < 0)
+ return ret;
 }
 return 0;
 }
@@ -1037,28 +1517,46 @@
 av_cold int ff_h264_decode_init(AVCodecContext *avctx)
 {
 H264Context *h = avctx->priv_data;
- MpegEncContext *const s = &h->s;
 int i;
+ int ret;
+
+ h->avctx = avctx;
 
- ff_MPV_decode_defaults(s);
+ h->bit_depth_luma = 8;
+ h->chroma_format_idc = 1;
 
- s->avctx = avctx;
- common_init(h);
+ ff_h264dsp_init(&h->h264dsp, 8, 1);
+ ff_h264chroma_init(&h->h264chroma, h->sps.bit_depth_chroma);
+ ff_h264qpel_init(&h->h264qpel, 8);
+ ff_h264_pred_init(&h->hpc, h->avctx->codec_id, 8, 1);
+
+ h->dequant_coeff_pps = -1;
+
+ /* needed so that IDCT permutation is known early */
+ if (CONFIG_ERROR_RESILIENCE)
+ ff_dsputil_init(&h->dsp, h->avctx);
+ ff_videodsp_init(&h->vdsp, 8);
+
+ memset(h->pps.scaling_matrix4, 16, 6 * 16 * sizeof(uint8_t));
+ memset(h->pps.scaling_matrix8, 16, 2 * 64 * sizeof(uint8_t));
 
- s->out_format = FMT_H264;
- s->workaround_bugs = avctx->workaround_bugs;
+ h->picture_structure = PICT_FRAME;
+ h->slice_context_count = 1;
+ h->workaround_bugs = avctx->workaround_bugs;
+ h->flags = avctx->flags;
 
 /* set defaults */
 // s->decode_mb = ff_h263_decode_mb;
- s->quarter_sample = 1;
 if (!avctx->has_b_frames)
- s->low_delay = 1;
+ h->low_delay = 1;
 
 avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
 
 ff_h264_decode_init_vlc();
 
- h->pixel_shift = 0;
+ ff_init_cabac_states();
+
+ h->pixel_shift = 0;
 h->sps.bit_depth_luma = avctx->bits_per_raw_sample = 8;
 
 h->thread_context[0] = h;
@@ -1068,55 +1566,71 @@
 h->prev_poc_msb = 1 << 16;
 h->x264_build = -1;
 ff_h264_reset_sei(h);
+ h->recovery_frame = -1;
+ h->frame_recovered = 0;
 if (avctx->codec_id == AV_CODEC_ID_H264) {
 if (avctx->ticks_per_frame == 1)
- s->avctx->time_base.den *= 2;
+ h->avctx->time_base.den *= 2;
 avctx->ticks_per_frame = 2;
 }
 
- if (avctx->extradata_size > 0 && avctx->extradata &&
- ff_h264_decode_extradata(h))
- return -1;
+ if (avctx->extradata_size > 0 && avctx->extradata) {
+ ret = ff_h264_decode_extradata(h);
+ if (ret < 0)
+ return ret;
+ }
 
 if (h->sps.bitstream_restriction_flag &&
- s->avctx->has_b_frames < h->sps.num_reorder_frames) {
- s->avctx->has_b_frames = h->sps.num_reorder_frames;
- s->low_delay = 0;
+ h->avctx->has_b_frames < h->sps.num_reorder_frames) {
+ h->avctx->has_b_frames = h->sps.num_reorder_frames;
+ h->low_delay = 0;
 }
 
+ avctx->internal->allocate_progress = 1;
+
 return 0;
 }
 
 #define IN_RANGE(a, b, size) (((a) >= (b)) && ((a) < ((b) + (size))))
+#undef REBASE_PICTURE
+#define REBASE_PICTURE(pic, new_ctx, old_ctx) \
+ ((pic && pic >= old_ctx->DPB && \
+ pic < old_ctx->DPB + MAX_PICTURE_COUNT) ? \
+ &new_ctx->DPB[pic - old_ctx->DPB] : NULL)
 
 static void copy_picture_range(Picture **to, Picture **from, int count,
- MpegEncContext *new_base,
- MpegEncContext *old_base)
+ H264Context *new_base,
+ H264Context *old_base)
 {
 int i;
 
 for (i = 0; i < count; i++) {
 assert((IN_RANGE(from[i], old_base, sizeof(*old_base)) ||
- IN_RANGE(from[i], old_base->picture,
- sizeof(Picture) * old_base->picture_count) ||
+ IN_RANGE(from[i], old_base->DPB,
+ sizeof(Picture) * MAX_PICTURE_COUNT) ||
 !from[i]));
 to[i] = REBASE_PICTURE(from[i], new_base, old_base);
 }
 }
 
-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)
@@ -1128,7 +1642,7 @@
 memset(h->sps_buffers, 0, sizeof(h->sps_buffers));
 memset(h->pps_buffers, 0, sizeof(h->pps_buffers));
 
- h->s.context_initialized = 0;
+ h->context_initialized = 0;
 
 return 0;
 }
@@ -1145,49 +1659,52 @@
 const AVCodecContext *src)
 {
 H264Context *h = dst->priv_data, *h1 = src->priv_data;
- MpegEncContext *const s = &h->s, *const s1 = &h1->s;
- int inited = s->context_initialized, err;
- int i;
+ int inited = h->context_initialized, err = 0;
+ int context_reinitialized = 0;
+ int i, ret;
 
- if (dst == src || !s1->context_initialized)
+ if (dst == src || !h1->context_initialized)
 return 0;
 
 if (inited &&
- (s->width != s1->width ||
- s->height != s1->height ||
- s->mb_width != s1->mb_width ||
- s->mb_height != s1->mb_height ||
+ (h->width != h1->width ||
+ h->height != h1->height ||
+ h->mb_width != h1->mb_width ||
+ h->mb_height != h1->mb_height ||
 h->sps.bit_depth_luma != h1->sps.bit_depth_luma ||
 h->sps.chroma_format_idc != h1->sps.chroma_format_idc ||
 h->sps.colorspace != h1->sps.colorspace)) {
 
+ /* set bits_per_raw_sample to the previous value. the check for changed
+ * bit depth in h264_set_parameter_from_sps() uses it and sets it to
+ * the current value */
+ h->avctx->bits_per_raw_sample = h->sps.bit_depth_luma;
+
 av_freep(&h->bipred_scratchpad);
 
- s->width = s1->width;
- s->height = s1->height;
- s->mb_height = s1->mb_height;
+ h->width = h1->width;
+ h->height = h1->height;
+ h->mb_height = h1->mb_height;
+ h->mb_width = h1->mb_width;
+ h->mb_num = h1->mb_num;
+ h->mb_stride = h1->mb_stride;
 h->b_stride = h1->b_stride;
 
 if ((err = h264_slice_header_init(h, 1)) < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR, "h264_slice_header_init() failed");
+ av_log(h->avctx, AV_LOG_ERROR, "h264_slice_header_init() failed");
 return err;
 }
- h->context_reinitialized = 1;
+ context_reinitialized = 1;
 
- /* update linesize on resize for h264. The h264 decoder doesn't
- * necessarily call ff_MPV_frame_start in the new thread */
- s->linesize = s1->linesize;
- s->uvlinesize = s1->uvlinesize;
+ /* update linesize on resize. The decoder doesn't
+ * necessarily call h264_frame_start in the new thread */
+ h->linesize = h1->linesize;
+ h->uvlinesize = h1->uvlinesize;
 
 /* copy block_offset since frame_start may not be called */
 memcpy(h->block_offset, h1->block_offset, sizeof(h->block_offset));
- h264_set_parameter_from_sps(h);
 }
 
- err = ff_mpeg_update_thread_context(dst, src);
- if (err)
- return err;
-
 if (!inited) {
 for (i = 0; i < MAX_SPS_COUNT; i++)
 av_freep(h->sps_buffers + i);
@@ -1195,43 +1712,96 @@
 for (i = 0; i < MAX_PPS_COUNT; i++)
 av_freep(h->pps_buffers + i);
 
- // copy all fields after MpegEnc
- memcpy(&h->s + 1, &h1->s + 1,
- sizeof(H264Context) - sizeof(MpegEncContext));
+ memcpy(h, h1, sizeof(*h1));
 memset(h->sps_buffers, 0, sizeof(h->sps_buffers));
 memset(h->pps_buffers, 0, sizeof(h->pps_buffers));
- if (ff_h264_alloc_tables(h) < 0) {
- av_log(dst, AV_LOG_ERROR, "Could not allocate memory for h264\n");
- return AVERROR(ENOMEM);
+ memset(&h->er, 0, sizeof(h->er));
+ memset(&h->me, 0, sizeof(h->me));
+ memset(&h->mb, 0, sizeof(h->mb));
+ memset(&h->mb_luma_dc, 0, sizeof(h->mb_luma_dc));
+ memset(&h->mb_padding, 0, sizeof(h->mb_padding));
+ h->context_initialized = 0;
+
+ memset(&h->cur_pic, 0, sizeof(h->cur_pic));
+ av_frame_unref(&h->cur_pic.f);
+ h->cur_pic.tf.f = &h->cur_pic.f;
+
+ h->avctx = dst;
+ h->DPB = NULL;
+ h->qscale_table_pool = NULL;
+ h->mb_type_pool = NULL;
+ h->ref_index_pool = NULL;
+ h->motion_val_pool = NULL;
+
+ ret = ff_h264_alloc_tables(h);
+ if (ret < 0) {
+ av_log(dst, AV_LOG_ERROR, "Could not allocate memory\n");
+ return ret;
+ }
+ ret = context_init(h);
+ if (ret < 0) {
+ av_log(dst, AV_LOG_ERROR, "context_init() failed.\n");
+ return ret;
 }
- context_init(h);
 
 for (i = 0; i < 2; i++) {
 h->rbsp_buffer[i] = NULL;
 h->rbsp_buffer_size[i] = 0;
 }
 h->bipred_scratchpad = NULL;
+ h->edge_emu_buffer = NULL;
 
 h->thread_context[0] = h;
 
- s->dsp.clear_blocks(h->mb);
- s->dsp.clear_blocks(h->mb + (24 * 16 << h->pixel_shift));
+ h->context_initialized = 1;
 }
 
+ h->avctx->coded_height = h1->avctx->coded_height;
+ h->avctx->coded_width = h1->avctx->coded_width;
+ h->avctx->width = h1->avctx->width;
+ h->avctx->height = h1->avctx->height;
+ h->coded_picture_number = h1->coded_picture_number;
+ h->first_field = h1->first_field;
+ h->picture_structure = h1->picture_structure;
+ h->qscale = h1->qscale;
+ h->droppable = h1->droppable;
+ h->low_delay = h1->low_delay;
+
+ for (i = 0; i < MAX_PICTURE_COUNT; i++) {
+ unref_picture(h, &h->DPB[i]);
+ if (h1->DPB[i].f.buf[0] &&
+ (ret = ref_picture(h, &h->DPB[i], &h1->DPB[i])) < 0)
+ return ret;
+ }
+
+ h->cur_pic_ptr = REBASE_PICTURE(h1->cur_pic_ptr, h, h1);
+ unref_picture(h, &h->cur_pic);
+ if ((ret = ref_picture(h, &h->cur_pic, &h1->cur_pic)) < 0)
+ return ret;
+
+ h->workaround_bugs = h1->workaround_bugs;
+ h->low_delay = h1->low_delay;
+ h->droppable = h1->droppable;
+
 /* frame_start may not be called for the next thread (if it's decoding
 * a bottom field) so this has to be allocated here */
- if (!h->bipred_scratchpad)
- h->bipred_scratchpad = av_malloc(16 * 6 * s->linesize);
+ err = alloc_scratch_buffers(h, h1->linesize);
+ if (err < 0)
+ return err;
 
 // extradata/NAL handling
 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
@@ -1252,21 +1822,22 @@
 copy_fields(h, h1, poc_lsb, redundant_pic_count);
 
 // reference lists
- copy_fields(h, h1, ref_count, list_count);
- copy_fields(h, h1, ref_list, intra_gb);
 copy_fields(h, h1, short_ref, cabac_init_idc);
 
- copy_picture_range(h->short_ref, h1->short_ref, 32, s, s1);
- copy_picture_range(h->long_ref, h1->long_ref, 32, s, s1);
+ copy_picture_range(h->short_ref, h1->short_ref, 32, h, h1);
+ copy_picture_range(h->long_ref, h1->long_ref, 32, h, h1);
 copy_picture_range(h->delayed_pic, h1->delayed_pic,
- MAX_DELAYED_PIC_COUNT + 2, s, s1);
+ MAX_DELAYED_PIC_COUNT + 2, h, h1);
 
 h->last_slice_type = h1->last_slice_type;
 
- if (!s->current_picture_ptr)
+ if (context_reinitialized)
+ h264_set_parameter_from_sps(h);
+
+ if (!h->cur_pic_ptr)
 return 0;
 
- if (!s->droppable) {
+ if (!h->droppable) {
 err = ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index);
 h->prev_poc_msb = h->poc_msb;
 h->prev_poc_lsb = h->poc_lsb;
@@ -1275,50 +1846,77 @@
 h->prev_frame_num = h->frame_num;
 h->outputed_poc = h->next_outputed_poc;
 
+ h->recovery_frame = h1->recovery_frame;
+ h->frame_recovered = h1->frame_recovered;
+
 return err;
 }
 
-int ff_h264_frame_start(H264Context *h)
+static int h264_frame_start(H264Context *h)
 {
- MpegEncContext *const s = &h->s;
- int i;
+ Picture *pic;
+ int i, ret;
 const int pixel_shift = h->pixel_shift;
 
- if (ff_MPV_frame_start(s, s->avctx) < 0)
- return -1;
- ff_er_frame_start(s);
+ release_unused_pictures(h, 1);
+ h->cur_pic_ptr = NULL;
+
+ i = find_unused_picture(h);
+ if (i < 0) {
+ av_log(h->avctx, AV_LOG_ERROR, "no frame buffer available\n");
+ return i;
+ }
+ pic = &h->DPB[i];
+
+ pic->reference = h->droppable ? 0 : h->picture_structure;
+ pic->f.coded_picture_number = h->coded_picture_number++;
+ pic->field_picture = h->picture_structure != PICT_FRAME;
 /*
- * ff_MPV_frame_start uses pict_type to derive key_frame.
- * This is incorrect for H.264; IDR markings must be used.
- * Zero here; IDR markings per slice in frame or fields are ORed in later.
+ * Zero key_frame here; IDR markings per slice in frame or fields are ORed
+ * in later.
 * See decode_nal_units().
 */
- s->current_picture_ptr->f.key_frame = 0;
- s->current_picture_ptr->mmco_reset = 0;
+ pic->f.key_frame = 0;
+ pic->mmco_reset = 0;
+ pic->recovered = 0;
+
+ if ((ret = alloc_picture(h, pic)) < 0)
+ return ret;
+
+ h->cur_pic_ptr = pic;
+ unref_picture(h, &h->cur_pic);
+ if ((ret = ref_picture(h, &h->cur_pic, h->cur_pic_ptr)) < 0)
+ return ret;
+
+ if (CONFIG_ERROR_RESILIENCE)
+ ff_er_frame_start(&h->er);
 
- assert(s->linesize && s->uvlinesize);
+ assert(h->linesize && h->uvlinesize);
 
 for (i = 0; i < 16; i++) {
- h->block_offset[i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 4 * s->linesize * ((scan8[i] - scan8[0]) >> 3);
- h->block_offset[48 + i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 8 * s->linesize * ((scan8[i] - scan8[0]) >> 3);
+ h->block_offset[i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 4 * h->linesize * ((scan8[i] - scan8[0]) >> 3);
+ h->block_offset[48 + i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 8 * h->linesize * ((scan8[i] - scan8[0]) >> 3);
 }
 for (i = 0; i < 16; i++) {
 h->block_offset[16 + i] =
- h->block_offset[32 + i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 4 * s->uvlinesize * ((scan8[i] - scan8[0]) >> 3);
+ h->block_offset[32 + i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 4 * h->uvlinesize * ((scan8[i] - scan8[0]) >> 3);
 h->block_offset[48 + 16 + i] =
- h->block_offset[48 + 32 + i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 8 * s->uvlinesize * ((scan8[i] - scan8[0]) >> 3);
+ h->block_offset[48 + 32 + i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 8 * h->uvlinesize * ((scan8[i] - scan8[0]) >> 3);
 }
 
 /* can't be in alloc_tables because linesize isn't known there.
 * FIXME: redo bipred weight to not require extra buffer? */
- for (i = 0; i < s->slice_context_count; i++)
- if (h->thread_context[i] && !h->thread_context[i]->bipred_scratchpad)
- h->thread_context[i]->bipred_scratchpad = av_malloc(16 * 6 * s->linesize);
+ for (i = 0; i < h->slice_context_count; i++)
+ if (h->thread_context[i]) {
+ ret = alloc_scratch_buffers(h->thread_context[i], h->linesize);
+ if (ret < 0)
+ return ret;
+ }
 
 /* Some macroblocks can be accessed before they're available in case
 * of lost slices, MBAFF or threading. */
 memset(h->slice_table, -1,
- (s->mb_height * s->mb_stride - 1) * sizeof(*h->slice_table));
+ (h->mb_height * h->mb_stride - 1) * sizeof(*h->slice_table));
 
 // s->decode = (s->flags & CODEC_FLAG_PSNR) || !s->encoding ||
 // s->current_picture.f.reference /* || h->contains_intra */ || 1;
@@ -1326,18 +1924,14 @@
 /* We mark the current picture as non-reference after allocating it, so
 * that if we break out due to an error it can be released automatically
 * in the next ff_MPV_frame_start().
- * SVQ3 as well as most other codecs have only last/next/current and thus
- * get released even with set reference, besides SVQ3 and others do not
- * mark frames as reference later "naturally". */
- if (s->codec_id != AV_CODEC_ID_SVQ3)
- s->current_picture_ptr->f.reference = 0;
+ */
+ h->cur_pic_ptr->reference = 0;
 
- s->current_picture_ptr->field_poc[0] =
- s->current_picture_ptr->field_poc[1] = INT_MAX;
+ h->cur_pic_ptr->field_poc[0] = h->cur_pic_ptr->field_poc[1] = INT_MAX;
 
 h->next_output_pic = NULL;
 
- assert(s->current_picture_ptr->long_ref == 0);
+ assert(h->cur_pic_ptr->long_ref == 0);
 
 return 0;
 }
@@ -1352,14 +1946,12 @@
 */
 static void decode_postinit(H264Context *h, int setup_finished)
 {
- MpegEncContext *const s = &h->s;
- Picture *out = s->current_picture_ptr;
- Picture *cur = s->current_picture_ptr;
+ Picture *out = h->cur_pic_ptr;
+ Picture *cur = h->cur_pic_ptr;
 int i, pics, out_of_order, out_idx;
 int invalid = 0, cnt = 0;
 
- s->current_picture_ptr->f.qscale_type = FF_QSCALE_TYPE_H264;
- s->current_picture_ptr->f.pict_type = s->pict_type;
+ h->cur_pic_ptr->f.pict_type = h->pict_type;
 
 if (h->next_output_pic)
 return;
@@ -1370,7 +1962,7 @@
 * The check in decode_nal_units() is not good enough to find this
 * yet, so we assume the worst for now. */
 // if (setup_finished)
- // ff_thread_finish_setup(s->avctx);
+ // ff_thread_finish_setup(h->avctx);
 return;
 }
 
@@ -1391,7 +1983,7 @@
 break;
 case SEI_PIC_STRUCT_TOP_BOTTOM:
 case SEI_PIC_STRUCT_BOTTOM_TOP:
- if (FIELD_OR_MBAFF_PICTURE)
+ if (FIELD_OR_MBAFF_PICTURE(h))
 cur->f.interlaced_frame = 1;
 else
 // try to flag soft telecine progressive
@@ -1405,7 +1997,6 @@
 cur->f.repeat_pict = 1;
 break;
 case SEI_PIC_STRUCT_FRAME_DOUBLING:
- // Force progressive here, doubling interlaced frame is a bad idea.
 cur->f.repeat_pict = 2;
 break;
 case SEI_PIC_STRUCT_FRAME_TRIPLING:
@@ -1418,7 +2009,7 @@
 cur->f.interlaced_frame = (h->sei_ct_type & (1 << 1)) != 0;
 } else {
 /* Derive interlacing flag from used decoding process. */
- cur->f.interlaced_frame = FIELD_OR_MBAFF_PICTURE;
+ cur->f.interlaced_frame = FIELD_OR_MBAFF_PICTURE(h);
 }
 h->prev_interlaced_frame = cur->f.interlaced_frame;
 
@@ -1440,20 +2031,60 @@
 }
 }
 
+ 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;
+ }
+
 // FIXME do something with unavailable reference frames
 
 /* Sort B-frames into display order */
 
 if (h->sps.bitstream_restriction_flag &&
- s->avctx->has_b_frames < h->sps.num_reorder_frames) {
- s->avctx->has_b_frames = h->sps.num_reorder_frames;
- s->low_delay = 0;
+ h->avctx->has_b_frames < h->sps.num_reorder_frames) {
+ h->avctx->has_b_frames = h->sps.num_reorder_frames;
+ h->low_delay = 0;
 }
 
- if (s->avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT &&
+ if (h->avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT &&
 !h->sps.bitstream_restriction_flag) {
- s->avctx->has_b_frames = MAX_DELAYED_PIC_COUNT - 1;
- s->low_delay = 0;
+ h->avctx->has_b_frames = MAX_DELAYED_PIC_COUNT - 1;
+ h->low_delay = 0;
 }
 
 pics = 0;
@@ -1463,8 +2094,8 @@
 assert(pics <= MAX_DELAYED_PIC_COUNT);
 
 h->delayed_pic[pics++] = cur;
- if (cur->f.reference == 0)
- cur->f.reference = DELAYED_PIC_REF;
+ if (cur->reference == 0)
+ cur->reference = DELAYED_PIC_REF;
 
 /* Frame reordering. This code takes pictures from coding order and sorts
 * them by their incremental POC value into display order. It supports POC
@@ -1474,7 +2105,7 @@
 * there is no delay, we can't detect that (since the frame was already
 * output to the user), so we also set h->mmco_reset to detect the MMCO
 * reset code.
- * FIXME: if we detect insufficient delays (as per s->avctx->has_b_frames),
+ * FIXME: if we detect insufficient delays (as per h->avctx->has_b_frames),
 * we increase the delay between input and output. All frames affected by
 * the lag (e.g. those that should have been output before another frame
 * that we already returned to the user) will be dropped. This is a bug
@@ -1506,40 +2137,39 @@
 out = h->delayed_pic[i];
 out_idx = i;
 }
- if (s->avctx->has_b_frames == 0 &&
+ if (h->avctx->has_b_frames == 0 &&
 (h->delayed_pic[0]->f.key_frame || h->mmco_reset))
 h->next_outputed_poc = INT_MIN;
 out_of_order = !out->f.key_frame && !h->mmco_reset &&
 (out->poc < h->next_outputed_poc);
 
 if (h->sps.bitstream_restriction_flag &&
- s->avctx->has_b_frames >= h->sps.num_reorder_frames) {
- } else if (out_of_order && pics - 1 == s->avctx->has_b_frames &&
- s->avctx->has_b_frames < MAX_DELAYED_PIC_COUNT) {
+ h->avctx->has_b_frames >= h->sps.num_reorder_frames) {
+ } else if (out_of_order && pics - 1 == h->avctx->has_b_frames &&
+ h->avctx->has_b_frames < MAX_DELAYED_PIC_COUNT) {
 if (invalid + cnt < MAX_DELAYED_PIC_COUNT) {
- s->avctx->has_b_frames = FFMAX(s->avctx->has_b_frames, cnt);
+ h->avctx->has_b_frames = FFMAX(h->avctx->has_b_frames, cnt);
 }
- s->low_delay = 0;
- } else if (s->low_delay &&
+ h->low_delay = 0;
+ } else if (h->low_delay &&
 ((h->next_outputed_poc != INT_MIN &&
 out->poc > h->next_outputed_poc + 2) ||
 cur->f.pict_type == AV_PICTURE_TYPE_B)) {
- s->low_delay = 0;
- s->avctx->has_b_frames++;
+ h->low_delay = 0;
+ h->avctx->has_b_frames++;
 }
 
- if (pics > s->avctx->has_b_frames) {
- out->f.reference &= ~DELAYED_PIC_REF;
+ if (pics > h->avctx->has_b_frames) {
+ out->reference &= ~DELAYED_PIC_REF;
 // for frame threading, the owner must be the second field's thread or
 // else the first thread can release the picture and reuse it unsafely
- out->owner2 = s;
 for (i = out_idx; h->delayed_pic[i]; i++)
 h->delayed_pic[i] = h->delayed_pic[i + 1];
 }
 memmove(h->last_pocs, &h->last_pocs[1],
 sizeof(*h->last_pocs) * (MAX_DELAYED_PIC_COUNT - 1));
 h->last_pocs[MAX_DELAYED_PIC_COUNT - 1] = cur->poc;
- if (!out_of_order && pics > s->avctx->has_b_frames) {
+ if (!out_of_order && pics > h->avctx->has_b_frames) {
 h->next_output_pic = out;
 if (out->mmco_reset) {
 if (out_idx > 0) {
@@ -1557,11 +2187,20 @@
 }
 h->mmco_reset = 0;
 } else {
- av_log(s->avctx, AV_LOG_DEBUG, "no picture\n");
+ av_log(h->avctx, AV_LOG_DEBUG, "no picture\n");
+ }
+
+ 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)
- ff_thread_finish_setup(s->avctx);
+ if (setup_finished && !h->avctx->hwaccel)
+ ff_thread_finish_setup(h->avctx);
 }
 
 static av_always_inline void backup_mb_border(H264Context *h, uint8_t *src_y,
@@ -1569,25 +2208,24 @@
 int linesize, int uvlinesize,
 int simple)
 {
- MpegEncContext *const s = &h->s;
 uint8_t *top_border;
 int top_idx = 1;
 const int pixel_shift = h->pixel_shift;
- int chroma444 = CHROMA444;
- int chroma422 = CHROMA422;
+ int chroma444 = CHROMA444(h);
+ int chroma422 = CHROMA422(h);
 
 src_y -= linesize;
 src_cb -= uvlinesize;
 src_cr -= uvlinesize;
 
- if (!simple && FRAME_MBAFF) {
- if (s->mb_y & 1) {
- if (!MB_MBAFF) {
- top_border = h->top_borders[0][s->mb_x];
+ if (!simple && FRAME_MBAFF(h)) {
+ if (h->mb_y & 1) {
+ if (!MB_MBAFF(h)) {
+ top_border = h->top_borders[0][h->mb_x];
 AV_COPY128(top_border, src_y + 15 * linesize);
 if (pixel_shift)
 AV_COPY128(top_border + 16, src_y + 15 * linesize + 16);
- if (simple || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
+ if (simple || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) {
 if (chroma444) {
 if (pixel_shift) {
 AV_COPY128(top_border + 32, src_cb + 15 * uvlinesize);
@@ -1617,20 +2255,20 @@
 }
 }
 }
- } else if (MB_MBAFF) {
+ } else if (MB_MBAFF(h)) {
 top_idx = 0;
 } else
 return;
 }
 
- top_border = h->top_borders[top_idx][s->mb_x];
+ top_border = h->top_borders[top_idx][h->mb_x];
 /* There are two lines saved, the line above the top macroblock
 * of a pair, and the line above the bottom macroblock. */
 AV_COPY128(top_border, src_y + 16 * linesize);
 if (pixel_shift)
 AV_COPY128(top_border + 16, src_y + 16 * linesize + 16);
 
- if (simple || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
+ if (simple || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) {
 if (chroma444) {
 if (pixel_shift) {
 AV_COPY128(top_border + 32, src_cb + 16 * linesize);
@@ -1667,36 +2305,35 @@
 int xchg, int chroma444,
 int simple, int pixel_shift)
 {
- MpegEncContext *const s = &h->s;
 int deblock_topleft;
 int deblock_top;
 int top_idx = 1;
 uint8_t *top_border_m1;
 uint8_t *top_border;
 
- if (!simple && FRAME_MBAFF) {
- if (s->mb_y & 1) {
- if (!MB_MBAFF)
+ if (!simple && FRAME_MBAFF(h)) {
+ if (h->mb_y & 1) {
+ if (!MB_MBAFF(h))
 return;
 } else {
- top_idx = MB_MBAFF ? 0 : 1;
+ top_idx = MB_MBAFF(h) ? 0 : 1;
 }
 }
 
 if (h->deblocking_filter == 2) {
- deblock_topleft = h->slice_table[h->mb_xy - 1 - s->mb_stride] == h->slice_num;
+ deblock_topleft = h->slice_table[h->mb_xy - 1 - h->mb_stride] == h->slice_num;
 deblock_top = h->top_type;
 } else {
- deblock_topleft = (s->mb_x > 0);
- deblock_top = (s->mb_y > !!MB_FIELD);
+ deblock_topleft = (h->mb_x > 0);
+ deblock_top = (h->mb_y > !!MB_FIELD(h));
 }
 
 src_y -= linesize + 1 + pixel_shift;
 src_cb -= uvlinesize + 1 + pixel_shift;
 src_cr -= uvlinesize + 1 + pixel_shift;
 
- top_border_m1 = h->top_borders[top_idx][s->mb_x - 1];
- top_border = h->top_borders[top_idx][s->mb_x];
+ top_border_m1 = h->top_borders[top_idx][h->mb_x - 1];
+ top_border = h->top_borders[top_idx][h->mb_x];
 
 #define XCHG(a, b, xchg) \
 if (pixel_shift) { \
@@ -1718,24 +2355,26 @@
 }
 XCHG(top_border + (0 << pixel_shift), src_y + (1 << pixel_shift), xchg);
 XCHG(top_border + (8 << pixel_shift), src_y + (9 << pixel_shift), 1);
- if (s->mb_x + 1 < s->mb_width) {
- XCHG(h->top_borders[top_idx][s->mb_x + 1],
+ if (h->mb_x + 1 < h->mb_width) {
+ XCHG(h->top_borders[top_idx][h->mb_x + 1],
 src_y + (17 << pixel_shift), 1);
 }
 }
- if (simple || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
+ if (simple || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) {
 if (chroma444) {
- if (deblock_topleft) {
- XCHG(top_border_m1 + (24 << pixel_shift), src_cb - (7 << pixel_shift), 1);
- XCHG(top_border_m1 + (40 << pixel_shift), src_cr - (7 << pixel_shift), 1);
- }
- XCHG(top_border + (16 << pixel_shift), src_cb + (1 << pixel_shift), xchg);
- XCHG(top_border + (24 << pixel_shift), src_cb + (9 << pixel_shift), 1);
- XCHG(top_border + (32 << pixel_shift), src_cr + (1 << pixel_shift), xchg);
- XCHG(top_border + (40 << pixel_shift), src_cr + (9 << pixel_shift), 1);
- if (s->mb_x + 1 < s->mb_width) {
- XCHG(h->top_borders[top_idx][s->mb_x + 1] + (16 << pixel_shift), src_cb + (17 << pixel_shift), 1);
- XCHG(h->top_borders[top_idx][s->mb_x + 1] + (32 << pixel_shift), src_cr + (17 << pixel_shift), 1);
+ if (deblock_top) {
+ if (deblock_topleft) {
+ XCHG(top_border_m1 + (24 << pixel_shift), src_cb - (7 << pixel_shift), 1);
+ XCHG(top_border_m1 + (40 << pixel_shift), src_cr - (7 << pixel_shift), 1);
+ }
+ XCHG(top_border + (16 << pixel_shift), src_cb + (1 << pixel_shift), xchg);
+ XCHG(top_border + (24 << pixel_shift), src_cb + (9 << pixel_shift), 1);
+ XCHG(top_border + (32 << pixel_shift), src_cr + (1 << pixel_shift), xchg);
+ XCHG(top_border + (40 << pixel_shift), src_cr + (9 << pixel_shift), 1);
+ if (h->mb_x + 1 < h->mb_width) {
+ XCHG(h->top_borders[top_idx][h->mb_x + 1] + (16 << pixel_shift), src_cb + (17 << pixel_shift), 1);
+ XCHG(h->top_borders[top_idx][h->mb_x + 1] + (32 << pixel_shift), src_cr + (17 << pixel_shift), 1);
+ }
 }
 } else {
 if (deblock_top) {
@@ -1750,7 +2389,7 @@
 }
 }
 
-static av_always_inline int dctcoef_get(DCTELEM *mb, int high_bit_depth,
+static av_always_inline int dctcoef_get(int16_t *mb, int high_bit_depth,
 int index)
 {
 if (high_bit_depth) {
@@ -1759,7 +2398,7 @@
 return AV_RN16A(mb + index);
 }
 
-static av_always_inline void dctcoef_set(DCTELEM *mb, int high_bit_depth,
+static av_always_inline void dctcoef_set(int16_t *mb, int high_bit_depth,
 int index, int value)
 {
 if (high_bit_depth) {
@@ -1777,84 +2416,81 @@
 int linesize,
 uint8_t *dest_y, int p)
 {
- MpegEncContext *const s = &h->s;
- void (*idct_add)(uint8_t *dst, DCTELEM *block, int stride);
- void (*idct_dc_add)(uint8_t *dst, DCTELEM *block, int stride);
+ void (*idct_add)(uint8_t *dst, int16_t *block, int stride);
+ void (*idct_dc_add)(uint8_t *dst, int16_t *block, int stride);
 int i;
- int qscale = p == 0 ? s->qscale : h->chroma_qp[p - 1];
+ int qscale = p == 0 ? h->qscale : h->chroma_qp[p - 1];
 block_offset += 16 * p;
 if (IS_INTRA4x4(mb_type)) {
- if (simple || !s->encoding) {
- if (IS_8x8DCT(mb_type)) {
- if (transform_bypass) {
- idct_dc_add =
- idct_add = s->dsp.add_pixels8;
+ if (IS_8x8DCT(mb_type)) {
+ if (transform_bypass) {
+ idct_dc_add =
+ idct_add = h->h264dsp.h264_add_pixels8_clear;
+ } else {
+ idct_dc_add = h->h264dsp.h264_idct8_dc_add;
+ idct_add = h->h264dsp.h264_idct8_add;
+ }
+ for (i = 0; i < 16; i += 4) {
+ uint8_t *const ptr = dest_y + block_offset[i];
+ const int dir = h->intra4x4_pred_mode_cache[scan8[i]];
+ if (transform_bypass && h->sps.profile_idc == 244 && dir <= 1) {
+ h->hpc.pred8x8l_add[dir](ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize);
 } else {
- idct_dc_add = h->h264dsp.h264_idct8_dc_add;
- idct_add = h->h264dsp.h264_idct8_add;
- }
- for (i = 0; i < 16; i += 4) {
- uint8_t *const ptr = dest_y + block_offset[i];
- const int dir = h->intra4x4_pred_mode_cache[scan8[i]];
- if (transform_bypass && h->sps.profile_idc == 244 && dir <= 1) {
- h->hpc.pred8x8l_add[dir](ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize);
- } else {
- const int nnz = h->non_zero_count_cache[scan8[i + p * 16]];
- h->hpc.pred8x8l[dir](ptr, (h->topleft_samples_available << i) & 0x8000,
- (h->topright_samples_available << i) & 0x4000, linesize);
- if (nnz) {
- if (nnz == 1 && dctcoef_get(h->mb, pixel_shift, i * 16 + p * 256))
- idct_dc_add(ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize);
- else
- idct_add(ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize);
- }
+ const int nnz = h->non_zero_count_cache[scan8[i + p * 16]];
+ h->hpc.pred8x8l[dir](ptr, (h->topleft_samples_available << i) & 0x8000,
+ (h->topright_samples_available << i) & 0x4000, linesize);
+ if (nnz) {
+ if (nnz == 1 && dctcoef_get(h->mb, pixel_shift, i * 16 + p * 256))
+ idct_dc_add(ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize);
+ else
+ idct_add(ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize);
 }
 }
+ }
+ } else {
+ if (transform_bypass) {
+ idct_dc_add =
+ idct_add = h->h264dsp.h264_add_pixels4_clear;
 } else {
- if (transform_bypass) {
- idct_dc_add =
- idct_add = s->dsp.add_pixels4;
- } else {
- idct_dc_add = h->h264dsp.h264_idct_dc_add;
- idct_add = h->h264dsp.h264_idct_add;
- }
- for (i = 0; i < 16; i++) {
- uint8_t *const ptr = dest_y + block_offset[i];
- const int dir = h->intra4x4_pred_mode_cache[scan8[i]];
+ idct_dc_add = h->h264dsp.h264_idct_dc_add;
+ idct_add = h->h264dsp.h264_idct_add;
+ }
+ for (i = 0; i < 16; i++) {
+ uint8_t *const ptr = dest_y + block_offset[i];
+ const int dir = h->intra4x4_pred_mode_cache[scan8[i]];
 
- if (transform_bypass && h->sps.profile_idc == 244 && dir <= 1) {
- h->hpc.pred4x4_add[dir](ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize);
- } else {
- uint8_t *topright;
- int nnz, tr;
- uint64_t tr_high;
- if (dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED) {
- const int topright_avail = (h->topright_samples_available << i) & 0x8000;
- assert(s->mb_y || linesize <= block_offset[i]);
- if (!topright_avail) {
- if (pixel_shift) {
- tr_high = ((uint16_t *)ptr)[3 - linesize / 2] * 0x0001000100010001ULL;
- topright = (uint8_t *)&tr_high;
- } else {
- tr = ptr[3 - linesize] * 0x01010101u;
- topright = (uint8_t *)&tr;
- }
- } else
- topright = ptr + (4 << pixel_shift) - linesize;
+ if (transform_bypass && h->sps.profile_idc == 244 && dir <= 1) {
+ h->hpc.pred4x4_add[dir](ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize);
+ } else {
+ uint8_t *topright;
+ int nnz, tr;
+ uint64_t tr_high;
+ if (dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED) {
+ const int topright_avail = (h->topright_samples_available << i) & 0x8000;
+ assert(h->mb_y || linesize <= block_offset[i]);
+ if (!topright_avail) {
+ if (pixel_shift) {
+ tr_high = ((uint16_t *)ptr)[3 - linesize / 2] * 0x0001000100010001ULL;
+ topright = (uint8_t *)&tr_high;
+ } else {
+ tr = ptr[3 - linesize] * 0x01010101u;
+ topright = (uint8_t *)&tr;
+ }
 } else
- topright = NULL;
+ topright = ptr + (4 << pixel_shift) - linesize;
+ } else
+ topright = NULL;
 
- h->hpc.pred4x4[dir](ptr, topright, linesize);
- nnz = h->non_zero_count_cache[scan8[i + p * 16]];
- if (nnz) {
- if (is_h264) {
- if (nnz == 1 && dctcoef_get(h->mb, pixel_shift, i * 16 + p * 256))
- idct_dc_add(ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize);
- else
- idct_add(ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize);
- } else if (CONFIG_SVQ3_DECODER)
- ff_svq3_add_idct_c(ptr, h->mb + i * 16 + p * 256, linesize, qscale, 0);
- }
+ h->hpc.pred4x4[dir](ptr, topright, linesize);
+ nnz = h->non_zero_count_cache[scan8[i + p * 16]];
+ if (nnz) {
+ if (is_h264) {
+ if (nnz == 1 && dctcoef_get(h->mb, pixel_shift, i * 16 + p * 256))
+ idct_dc_add(ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize);
+ else
+ idct_add(ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize);
+ } else if (CONFIG_SVQ3_DECODER)
+ ff_svq3_add_idct_c(ptr, h->mb + i * 16 + p * 256, linesize, qscale, 0);
 }
 }
 }
@@ -1872,7 +2508,8 @@
 0 * 16, 1 * 16, 4 * 16, 5 * 16,
 2 * 16, 3 * 16, 6 * 16, 7 * 16,
 8 * 16, 9 * 16, 12 * 16, 13 * 16,
- 10 * 16, 11 * 16, 14 * 16, 15 * 16 };
+ 10 * 16, 11 * 16, 14 * 16, 15 * 16
+ };
 for (i = 0; i < 16; i++)
 dctcoef_set(h->mb + (p * 256 << pixel_shift),
 pixel_shift, dc_mapping[i],
@@ -1894,8 +2531,7 @@
 int linesize,
 uint8_t *dest_y, int p)
 {
- MpegEncContext *const s = &h->s;
- void (*idct_add)(uint8_t *dst, DCTELEM *block, int stride);
+ void (*idct_add)(uint8_t *dst, int16_t *block, int stride);
 int i;
 block_offset += 16 * p;
 if (!IS_INTRA4x4(mb_type)) {
@@ -1912,9 +2548,9 @@
 for (i = 0; i < 16; i++)
 if (h->non_zero_count_cache[scan8[i + p * 16]] ||
 dctcoef_get(h->mb, pixel_shift, i * 16 + p * 256))
- s->dsp.add_pixels4(dest_y + block_offset[i],
- h->mb + (i * 16 + p * 256 << pixel_shift),
- linesize);
+ h->h264dsp.h264_add_pixels4_clear(dest_y + block_offset[i],
+ h->mb + (i * 16 + p * 256 << pixel_shift),
+ linesize);
 }
 } else {
 h->h264dsp.h264_idct_add16intra(dest_y, block_offset,
@@ -1925,8 +2561,8 @@
 } else if (h->cbp & 15) {
 if (transform_bypass) {
 const int di = IS_8x8DCT(mb_type) ? 4 : 1;
- idct_add = IS_8x8DCT(mb_type) ? s->dsp.add_pixels8
- : s->dsp.add_pixels4;
+ idct_add = IS_8x8DCT(mb_type) ? h->h264dsp.h264_add_pixels8_clear
+ : h->h264dsp.h264_add_pixels4_clear;
 for (i = 0; i < 16; i += di)
 if (h->non_zero_count_cache[scan8[i + p * 16]])
 idct_add(dest_y + block_offset[i],
@@ -1951,7 +2587,7 @@
 // FIXME benchmark weird rule, & below
 uint8_t *const ptr = dest_y + block_offset[i];
 ff_svq3_add_idct_c(ptr, h->mb + i * 16 + p * 256, linesize,
- s->qscale, IS_INTRA(mb_type) ? 1 : 0);
+ h->qscale, IS_INTRA(mb_type) ? 1 : 0);
 }
 }
 }
@@ -1971,12 +2607,12 @@
 
 void ff_h264_hl_decode_mb(H264Context *h)
 {
- MpegEncContext *const s = &h->s;
 const int mb_xy = h->mb_xy;
- const int mb_type = s->current_picture.f.mb_type[mb_xy];
- int is_complex = CONFIG_SMALL || h->is_complex || IS_INTRA_PCM(mb_type) || s->qscale == 0;
+ const int mb_type = h->cur_pic.mb_type[mb_xy];
+ int is_complex = CONFIG_SMALL || h->is_complex ||
+ IS_INTRA_PCM(mb_type) || h->qscale == 0;
 
- if (CHROMA444) {
+ if (CHROMA444(h)) {
 if (is_complex || h->pixel_shift)
 hl_decode_mb_444_complex(h);
 else
@@ -1989,17 +2625,16 @@
 hl_decode_mb_simple_8(h);
 }
 
-static int pred_weight_table(H264Context *h)
+int ff_pred_weight_table(H264Context *h)
 {
- MpegEncContext *const s = &h->s;
 int list, i;
 int luma_def, chroma_def;
 
 h->use_weight = 0;
 h->use_weight_chroma = 0;
- h->luma_log2_weight_denom = get_ue_golomb(&s->gb);
+ h->luma_log2_weight_denom = get_ue_golomb(&h->gb);
 if (h->sps.chroma_format_idc)
- h->chroma_log2_weight_denom = get_ue_golomb(&s->gb);
+ h->chroma_log2_weight_denom = get_ue_golomb(&h->gb);
 luma_def = 1 << h->luma_log2_weight_denom;
 chroma_def = 1 << h->chroma_log2_weight_denom;
 
@@ -2009,10 +2644,10 @@
 for (i = 0; i < h->ref_count[list]; i++) {
 int luma_weight_flag, chroma_weight_flag;
 
- luma_weight_flag = get_bits1(&s->gb);
+ luma_weight_flag = get_bits1(&h->gb);
 if (luma_weight_flag) {
- h->luma_weight[i][list][0] = get_se_golomb(&s->gb);
- h->luma_weight[i][list][1] = get_se_golomb(&s->gb);
+ h->luma_weight[i][list][0] = get_se_golomb(&h->gb);
+ h->luma_weight[i][list][1] = get_se_golomb(&h->gb);
 if (h->luma_weight[i][list][0] != luma_def ||
 h->luma_weight[i][list][1] != 0) {
 h->use_weight = 1;
@@ -2024,15 +2659,15 @@
 }
 
 if (h->sps.chroma_format_idc) {
- chroma_weight_flag = get_bits1(&s->gb);
+ chroma_weight_flag = get_bits1(&h->gb);
 if (chroma_weight_flag) {
 int j;
 for (j = 0; j < 2; j++) {
- h->chroma_weight[i][list][j][0] = get_se_golomb(&s->gb);
- h->chroma_weight[i][list][j][1] = get_se_golomb(&s->gb);
+ h->chroma_weight[i][list][j][0] = get_se_golomb(&h->gb);
+ h->chroma_weight[i][list][j][1] = get_se_golomb(&h->gb);
 if (h->chroma_weight[i][list][j][0] != chroma_def ||
 h->chroma_weight[i][list][j][1] != 0) {
- h->use_weight_chroma = 1;
+ h->use_weight_chroma = 1;
 h->chroma_weight_flag[list] = 1;
 }
 }
@@ -2059,7 +2694,6 @@
 */
 static void implicit_weight_table(H264Context *h, int field)
 {
- MpegEncContext *const s = &h->s;
 int ref0, ref1, i, cur_poc, ref_start, ref_count0, ref_count1;
 
 for (i = 0; i < 2; i++) {
@@ -2068,14 +2702,14 @@
 }
 
 if (field < 0) {
- if (s->picture_structure == PICT_FRAME) {
- cur_poc = s->current_picture_ptr->poc;
+ if (h->picture_structure == PICT_FRAME) {
+ cur_poc = h->cur_pic_ptr->poc;
 } else {
- cur_poc = s->current_picture_ptr->field_poc[s->picture_structure - 1];
+ cur_poc = h->cur_pic_ptr->field_poc[h->picture_structure - 1];
 }
- if (h->ref_count[0] == 1 && h->ref_count[1] == 1 && !FRAME_MBAFF &&
+ if (h->ref_count[0] == 1 && h->ref_count[1] == 1 && !FRAME_MBAFF(h) &&
 h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2 * cur_poc) {
- h->use_weight = 0;
+ h->use_weight = 0;
 h->use_weight_chroma = 0;
 return;
 }
@@ -2083,7 +2717,7 @@
 ref_count0 = h->ref_count[0];
 ref_count1 = h->ref_count[1];
 } else {
- cur_poc = s->current_picture_ptr->field_poc[field];
+ cur_poc = h->cur_pic_ptr->field_poc[field];
 ref_start = 16;
 ref_count0 = 16 + 2 * h->ref_count[0];
 ref_count1 = 16 + 2 * h->ref_count[1];
@@ -2137,17 +2771,19 @@
 int i;
 for (i = 0; i < MAX_DELAYED_PIC_COUNT; i++)
 h->last_pocs[i] = INT_MIN;
- h->outputed_poc = h->next_outputed_poc = INT_MIN;
+ h->outputed_poc = h->next_outputed_poc = INT_MIN;
 h->prev_interlaced_frame = 1;
 idr(h);
- if (h->s.current_picture_ptr)
- h->s.current_picture_ptr->f.reference = 0;
- h->s.first_field = 0;
+ if (h->cur_pic_ptr)
+ h->cur_pic_ptr->reference = 0;
+ h->first_field = 0;
 memset(h->ref_list[0], 0, sizeof(h->ref_list[0]));
 memset(h->ref_list[1], 0, sizeof(h->ref_list[1]));
 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->frame_recovered = 0;
 }
 
 /* forget old pics after a seek */
@@ -2158,20 +2794,35 @@
 
 for (i = 0; i < MAX_DELAYED_PIC_COUNT; i++) {
 if (h->delayed_pic[i])
- h->delayed_pic[i]->f.reference = 0;
+ h->delayed_pic[i]->reference = 0;
 h->delayed_pic[i] = NULL;
 }
 
 flush_change(h);
- ff_mpeg_flush(avctx);
+
+ if (h->DPB)
+ for (i = 0; i < MAX_PICTURE_COUNT; i++)
+ unref_picture(h, &h->DPB[i]);
+ h->cur_pic_ptr = NULL;
+ unref_picture(h, &h->cur_pic);
+
+ h->mb_x = h->mb_y = 0;
+
+ h->parse_context.state = -1;
+ h->parse_context.frame_start_found = 0;
+ h->parse_context.overread = 0;
+ 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;
 }
 
-static int init_poc(H264Context *h)
+int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc)
 {
- MpegEncContext *const s = &h->s;
 const int max_frame_num = 1 << h->sps.log2_max_frame_num;
 int field_poc[2];
- Picture *cur = s->current_picture_ptr;
 
 h->frame_num_offset = h->prev_frame_num_offset;
 if (h->frame_num < h->prev_frame_num)
@@ -2180,15 +2831,17 @@
 if (h->sps.poc_type == 0) {
 const int max_poc_lsb = 1 << h->sps.log2_max_poc_lsb;
 
- if (h->poc_lsb < h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb / 2)
+ if (h->poc_lsb < h->prev_poc_lsb &&
+ h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb / 2)
 h->poc_msb = h->prev_poc_msb + max_poc_lsb;
- else if (h->poc_lsb > h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb / 2)
+ else if (h->poc_lsb > h->prev_poc_lsb &&
+ h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb / 2)
 h->poc_msb = h->prev_poc_msb - max_poc_lsb;
 else
 h->poc_msb = h->prev_poc_msb;
 field_poc[0] =
 field_poc[1] = h->poc_msb + h->poc_lsb;
- if (s->picture_structure == PICT_FRAME)
+ if (h->picture_structure == PICT_FRAME)
 field_poc[1] += h->delta_poc_bottom;
 } else if (h->sps.poc_type == 1) {
 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc;
@@ -2223,7 +2876,7 @@
 field_poc[0] = expectedpoc + h->delta_poc[0];
 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field;
 
- if (s->picture_structure == PICT_FRAME)
+ if (h->picture_structure == PICT_FRAME)
 field_poc[1] += h->delta_poc[1];
 } else {
 int poc = 2 * (h->frame_num_offset + h->frame_num);
@@ -2235,11 +2888,11 @@
 field_poc[1] = poc;
 }
 
- if (s->picture_structure != PICT_BOTTOM_FIELD)
- s->current_picture_ptr->field_poc[0] = field_poc[0];
- if (s->picture_structure != PICT_TOP_FIELD)
- s->current_picture_ptr->field_poc[1] = field_poc[1];
- cur->poc = FFMIN(cur->field_poc[0], cur->field_poc[1]);
+ if (h->picture_structure != PICT_BOTTOM_FIELD)
+ pic_field_poc[0] = field_poc[0];
+ if (h->picture_structure != PICT_TOP_FIELD)
+ pic_field_poc[1] = field_poc[1];
+ *pic_poc = FFMIN(pic_field_poc[0], pic_field_poc[1]);
 
 return 0;
 }
@@ -2283,21 +2936,16 @@
 
 static int field_end(H264Context *h, int in_setup)
 {
- MpegEncContext *const s = &h->s;
- AVCodecContext *const avctx = s->avctx;
+ AVCodecContext *const avctx = h->avctx;
 int err = 0;
- s->mb_y = 0;
+ h->mb_y = 0;
 
- if (!in_setup && !s->droppable)
- ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX,
- s->picture_structure == PICT_BOTTOM_FIELD);
-
- if (CONFIG_H264_VDPAU_DECODER &&
- s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
- ff_vdpau_h264_set_reference_frames(s);
+ if (!in_setup && !h->droppable)
+ ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX,
+ h->picture_structure == PICT_BOTTOM_FIELD);
 
 if (in_setup || !(avctx->active_thread_type & FF_THREAD_FRAME)) {
- if (!s->droppable) {
+ if (!h->droppable) {
 err = ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index);
 h->prev_poc_msb = h->poc_msb;
 h->prev_poc_lsb = h->poc_lsb;
@@ -2313,10 +2961,6 @@
 "hardware accelerator failed to decode picture\n");
 }
 
- if (CONFIG_H264_VDPAU_DECODER &&
- s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
- ff_vdpau_h264_picture_complete(s);
-
 /*
 * FIXME: Error handling code does not seem to support interlaced
 * when slices span multiple rows
@@ -2329,10 +2973,13 @@
 * past end by one (callers fault) and resync_mb_y != 0
 * causes problems for the first MB line, too.
 */
- if (!FIELD_PICTURE)
- ff_er_frame_end(s);
-
- ff_MPV_frame_end(s);
+ if (CONFIG_ERROR_RESILIENCE && !FIELD_PICTURE(h)) {
+ h->er.cur_pic = h->cur_pic_ptr;
+ h->er.last_pic = h->ref_count[0] ? &h->ref_list[0][0] : NULL;
+ h->er.next_pic = h->ref_count[1] ? &h->ref_list[1][0] : NULL;
+ ff_er_frame_end(&h->er);
+ }
+ emms_c();
 
 h->current_slice = 0;
 
@@ -2344,21 +2991,12 @@
 */
 static int clone_slice(H264Context *dst, H264Context *src)
 {
- int ret;
-
 memcpy(dst->block_offset, src->block_offset, sizeof(dst->block_offset));
- dst->s.current_picture_ptr = src->s.current_picture_ptr;
- dst->s.current_picture = src->s.current_picture;
- dst->s.linesize = src->s.linesize;
- dst->s.uvlinesize = src->s.uvlinesize;
- dst->s.first_field = src->s.first_field;
-
- if (!dst->s.edge_emu_buffer &&
- (ret = ff_mpv_frame_size_alloc(&dst->s, dst->s.linesize))) {
- av_log(dst->s.avctx, AV_LOG_ERROR,
- "Failed to allocate scratch buffers\n");
- return ret;
- }
+ dst->cur_pic_ptr = src->cur_pic_ptr;
+ dst->cur_pic = src->cur_pic;
+ dst->linesize = src->linesize;
+ dst->uvlinesize = src->uvlinesize;
+ dst->first_field = src->first_field;
 
 dst->prev_poc_msb = src->prev_poc_msb;
 dst->prev_poc_lsb = src->prev_poc_lsb;
@@ -2369,7 +3007,6 @@
 memcpy(dst->short_ref, src->short_ref, sizeof(dst->short_ref));
 memcpy(dst->long_ref, src->long_ref, sizeof(dst->long_ref));
 memcpy(dst->default_ref_list, src->default_ref_list, sizeof(dst->default_ref_list));
- memcpy(dst->ref_list, src->ref_list, sizeof(dst->ref_list));
 
 memcpy(dst->dequant4_coeff, src->dequant4_coeff, sizeof(src->dequant4_coeff));
 memcpy(dst->dequant8_coeff, src->dequant8_coeff, sizeof(src->dequant8_coeff));
@@ -2406,50 +3043,37 @@
 
 static int h264_set_parameter_from_sps(H264Context *h)
 {
- MpegEncContext *s = &h->s;
-
- if (s->flags & CODEC_FLAG_LOW_DELAY ||
+ if (h->flags & CODEC_FLAG_LOW_DELAY ||
 (h->sps.bitstream_restriction_flag &&
 !h->sps.num_reorder_frames)) {
- if (s->avctx->has_b_frames > 1 || h->delayed_pic[0])
- av_log(h->s.avctx, AV_LOG_WARNING, "Delayed frames seen. "
+ if (h->avctx->has_b_frames > 1 || h->delayed_pic[0])
+ av_log(h->avctx, AV_LOG_WARNING, "Delayed frames seen. "
 "Reenabling low delay requires a codec flush.\n");
 else
- s->low_delay = 1;
+ h->low_delay = 1;
 }
 
- if (s->avctx->has_b_frames < 2)
- s->avctx->has_b_frames = !s->low_delay;
-
- if (h->sps.bit_depth_luma != h->sps.bit_depth_chroma) {
- av_log_missing_feature(s->avctx,
- "Different bit depth between chroma and luma", 1);
- return AVERROR_PATCHWELCOME;
- }
+ if (h->avctx->has_b_frames < 2)
+ h->avctx->has_b_frames = !h->low_delay;
 
- if (s->avctx->bits_per_raw_sample != h->sps.bit_depth_luma ||
+ if (h->avctx->bits_per_raw_sample != h->sps.bit_depth_luma ||
 h->cur_chroma_format_idc != h->sps.chroma_format_idc) {
- if (s->avctx->codec &&
- s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU &&
- (h->sps.bit_depth_luma != 8 || h->sps.chroma_format_idc > 1)) {
- av_log(s->avctx, AV_LOG_ERROR,
- "VDPAU decoding does not support video colorspace.\n");
- return AVERROR_INVALIDDATA;
- }
 if (h->sps.bit_depth_luma >= 8 && h->sps.bit_depth_luma <= 10) {
- s->avctx->bits_per_raw_sample = h->sps.bit_depth_luma;
+ h->avctx->bits_per_raw_sample = h->sps.bit_depth_luma;
 h->cur_chroma_format_idc = h->sps.chroma_format_idc;
 h->pixel_shift = h->sps.bit_depth_luma > 8;
 
 ff_h264dsp_init(&h->h264dsp, h->sps.bit_depth_luma,
 h->sps.chroma_format_idc);
- ff_h264_pred_init(&h->hpc, s->codec_id, h->sps.bit_depth_luma,
+ ff_h264chroma_init(&h->h264chroma, h->sps.bit_depth_chroma);
+ ff_h264qpel_init(&h->h264qpel, h->sps.bit_depth_luma);
+ ff_h264_pred_init(&h->hpc, h->avctx->codec_id, h->sps.bit_depth_luma,
 h->sps.chroma_format_idc);
- s->dsp.dct_bits = h->sps.bit_depth_luma > 8 ? 32 : 16;
- ff_dsputil_init(&s->dsp, s->avctx);
- ff_videodsp_init(&s->vdsp, h->sps.bit_depth_luma);
+ if (CONFIG_ERROR_RESILIENCE)
+ ff_dsputil_init(&h->dsp, h->avctx);
+ ff_videodsp_init(&h->vdsp, h->sps.bit_depth_luma);
 } else {
- av_log(s->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;
 }
@@ -2457,122 +3081,243 @@
 return 0;
 }
 
-static enum PixelFormat get_pixel_format(H264Context *h)
+static enum AVPixelFormat get_pixel_format(H264Context *h)
 {
- MpegEncContext *const s = &h->s;
 switch (h->sps.bit_depth_luma) {
 case 9:
- if (CHROMA444) {
- if (s->avctx->colorspace == AVCOL_SPC_RGB) {
+ if (CHROMA444(h)) {
+ if (h->avctx->colorspace == AVCOL_SPC_RGB) {
 return AV_PIX_FMT_GBRP9;
 } else
 return AV_PIX_FMT_YUV444P9;
- } else if (CHROMA422)
+ } else if (CHROMA422(h))
 return AV_PIX_FMT_YUV422P9;
 else
 return AV_PIX_FMT_YUV420P9;
 break;
 case 10:
- if (CHROMA444) {
- if (s->avctx->colorspace == AVCOL_SPC_RGB) {
+ if (CHROMA444(h)) {
+ if (h->avctx->colorspace == AVCOL_SPC_RGB) {
 return AV_PIX_FMT_GBRP10;
 } else
 return AV_PIX_FMT_YUV444P10;
- } else if (CHROMA422)
+ } else if (CHROMA422(h))
 return AV_PIX_FMT_YUV422P10;
 else
 return AV_PIX_FMT_YUV420P10;
 break;
 case 8:
- if (CHROMA444) {
- if (s->avctx->colorspace == AVCOL_SPC_RGB) {
+ if (CHROMA444(h)) {
+ if (h->avctx->colorspace == AVCOL_SPC_RGB) {
 return AV_PIX_FMT_GBRP;
 } else
- return s->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ444P
+ return h->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ444P
 : AV_PIX_FMT_YUV444P;
- } else if (CHROMA422) {
- return s->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ422P
+ } else if (CHROMA422(h)) {
+ return h->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ422P
 : AV_PIX_FMT_YUV422P;
 } else {
- return s->avctx->get_format(s->avctx, s->avctx->codec->pix_fmts ?
- s->avctx->codec->pix_fmts :
- s->avctx->color_range == AVCOL_RANGE_JPEG ?
- hwaccel_pixfmt_list_h264_jpeg_420 :
- ff_hwaccel_pixfmt_list_420);
+ return h->avctx->get_format(h->avctx, h->avctx->codec->pix_fmts ?
+ h->avctx->codec->pix_fmts :
+ h->avctx->color_range == AVCOL_RANGE_JPEG ?
+ h264_hwaccel_pixfmt_list_jpeg_420 :
+ h264_hwaccel_pixfmt_list_420);
 }
 break;
 default:
- av_log(s->avctx, AV_LOG_ERROR,
- "Unsupported bit depth: %d\n", h->sps.bit_depth_luma);
+ av_log(h->avctx, AV_LOG_ERROR,
+ "Unsupported bit depth %d\n", h->sps.bit_depth_luma);
 return AVERROR_INVALIDDATA;
 }
 }
 
+/* export coded and cropped frame dimensions to AVCodecContext */
+static int init_dimensions(H264Context *h)
+{
+ int width = h->width - (h->sps.crop_right + h->sps.crop_left);
+ int height = h->height - (h->sps.crop_top + h->sps.crop_bottom);
+
+ /* handle container cropping */
+ if (!h->sps.crop &&
+ FFALIGN(h->avctx->width, 16) == h->width &&
+ FFALIGN(h->avctx->height, 16) == h->height) {
+ width = h->avctx->width;
+ height = h->avctx->height;
+ }
+
+ if (width <= 0 || height <= 0) {
+ av_log(h->avctx, AV_LOG_ERROR, "Invalid cropped dimensions: %dx%d.\n",
+ width, height);
+ if (h->avctx->err_recognition & AV_EF_EXPLODE)
+ return AVERROR_INVALIDDATA;
+
+ av_log(h->avctx, AV_LOG_WARNING, "Ignoring cropping information.\n");
+ h->sps.crop_bottom = h->sps.crop_top = h->sps.crop_right = h->sps.crop_left = 0;
+ h->sps.crop = 0;
+
+ width = h->width;
+ height = h->height;
+ }
+
+ h->avctx->coded_width = h->width;
+ h->avctx->coded_height = h->height;
+ h->avctx->width = width;
+ h->avctx->height = height;
+
+ return 0;
+}
+
 static int h264_slice_header_init(H264Context *h, int reinit)
 {
- MpegEncContext *const s = &h->s;
+ int nb_slices = (HAVE_THREADS &&
+ h->avctx->active_thread_type & FF_THREAD_SLICE) ?
+ h->avctx->thread_count : 1;
 int i, ret;
 
- avcodec_set_dimensions(s->avctx, s->width, s->height);
- s->avctx->sample_aspect_ratio = h->sps.sar;
- av_assert0(s->avctx->sample_aspect_ratio.den);
+ h->avctx->sample_aspect_ratio = h->sps.sar;
+ av_assert0(h->avctx->sample_aspect_ratio.den);
+ av_pix_fmt_get_chroma_sub_sample(h->avctx->pix_fmt,
+ &h->chroma_x_shift, &h->chroma_y_shift);
 
 if (h->sps.timing_info_present_flag) {
 int64_t den = h->sps.time_scale;
 if (h->x264_build < 44U)
 den *= 2;
- av_reduce(&s->avctx->time_base.num, &s->avctx->time_base.den,
+ av_reduce(&h->avctx->time_base.num, &h->avctx->time_base.den,
 h->sps.num_units_in_tick, den, 1 << 30);
 }
 
- s->avctx->hwaccel = ff_find_hwaccel(s->avctx->codec->id, s->avctx->pix_fmt);
+ h->avctx->hwaccel = ff_find_hwaccel(h->avctx);
 
- if (reinit) {
+ if (reinit)
 free_tables(h, 0);
- if ((ret = ff_MPV_common_frame_size_change(s)) < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR, "ff_MPV_common_frame_size_change() failed.\n");
- return ret;
- }
- } else {
- if ((ret = ff_MPV_common_init(s) < 0)) {
- av_log(h->s.avctx, AV_LOG_ERROR, "ff_MPV_common_init() failed.\n");
- return ret;
- }
- }
- s->first_field = 0;
+ h->first_field = 0;
 h->prev_interlaced_frame = 1;
 
 init_scan_tables(h);
- if (ff_h264_alloc_tables(h) < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
- "Could not allocate memory for h264\n");
- return AVERROR(ENOMEM);
+ ret = ff_h264_alloc_tables(h);
+ if (ret < 0) {
+ av_log(h->avctx, AV_LOG_ERROR, "Could not allocate memory\n");
+ return ret;
 }
 
- if (!HAVE_THREADS || !(s->avctx->active_thread_type & FF_THREAD_SLICE)) {
- if (context_init(h) < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR, "context_init() failed.\n");
- return -1;
+ if (nb_slices > MAX_THREADS || (nb_slices > h->mb_height && h->mb_height)) {
+ int max_slices;
+ if (h->mb_height)
+ 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,"
+ " reducing to %d\n", nb_slices, max_slices);
+ nb_slices = max_slices;
+ }
+ h->slice_context_count = nb_slices;
+
+ if (!HAVE_THREADS || !(h->avctx->active_thread_type & FF_THREAD_SLICE)) {
+ ret = context_init(h);
+ if (ret < 0) {
+ av_log(h->avctx, AV_LOG_ERROR, "context_init() failed.\n");
+ return ret;
 }
 } else {
- for (i = 1; i < s->slice_context_count; i++) {
+ for (i = 1; i < h->slice_context_count; i++) {
 H264Context *c;
- c = h->thread_context[i] = av_malloc(sizeof(H264Context));
- memcpy(c, h->s.thread_context[i], sizeof(MpegEncContext));
- memset(&c->s + 1, 0, sizeof(H264Context) - sizeof(MpegEncContext));
- c->h264dsp = h->h264dsp;
- c->sps = h->sps;
- c->pps = h->pps;
- c->pixel_shift = h->pixel_shift;
+ c = h->thread_context[i] = av_mallocz(sizeof(H264Context));
+ if (!c)
+ return AVERROR(ENOMEM);
+ c->avctx = h->avctx;
+ c->dsp = h->dsp;
+ c->vdsp = h->vdsp;
+ c->h264dsp = h->h264dsp;
+ c->h264qpel = h->h264qpel;
+ c->h264chroma = h->h264chroma;
+ c->sps = h->sps;
+ c->pps = h->pps;
+ c->pixel_shift = h->pixel_shift;
+ c->width = h->width;
+ 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->qscale = h->qscale;
+ c->droppable = h->droppable;
+ c->data_partitioning = h->data_partitioning;
+ c->low_delay = h->low_delay;
+ c->mb_width = h->mb_width;
+ c->mb_height = h->mb_height;
+ c->mb_stride = h->mb_stride;
+ c->mb_num = h->mb_num;
+ c->flags = h->flags;
+ c->workaround_bugs = h->workaround_bugs;
+ c->pict_type = h->pict_type;
+
 init_scan_tables(c);
 clone_tables(c, h, i);
+ c->context_initialized = 1;
 }
 
- for (i = 0; i < s->slice_context_count; i++)
- if (context_init(h->thread_context[i]) < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR, "context_init() failed.\n");
- return -1;
+ for (i = 0; i < h->slice_context_count; i++)
+ if ((ret = context_init(h->thread_context[i])) < 0) {
+ av_log(h->avctx, AV_LOG_ERROR, "context_init() failed.\n");
+ return ret;
+ }
+ }
+
+ h->context_initialized = 1;
+
+ return 0;
+}
+
+int ff_set_ref_count(H264Context *h)
+{
+ int ref_count[2], list_count;
+ int num_ref_idx_active_override_flag, max_refs;
+
+ // set defaults, might be overridden a few lines later
+ 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) {
+ if (h->slice_type_nos == AV_PICTURE_TYPE_B)
+ h->direct_spatial_mv_pred = get_bits1(&h->gb);
+ num_ref_idx_active_override_flag = get_bits1(&h->gb);
+
+ if (num_ref_idx_active_override_flag) {
+ ref_count[0] = get_ue_golomb(&h->gb) + 1;
+ if (ref_count[0] < 1)
+ return AVERROR_INVALIDDATA;
+ if (h->slice_type_nos == AV_PICTURE_TYPE_B) {
+ ref_count[1] = get_ue_golomb(&h->gb) + 1;
+ if (ref_count[1] < 1)
+ return AVERROR_INVALIDDATA;
 }
+ }
+
+ if (h->slice_type_nos == AV_PICTURE_TYPE_B)
+ list_count = 2;
+ else
+ list_count = 1;
+ } else {
+ list_count = 0;
+ ref_count[0] = ref_count[1] = 0;
+ }
+
+ max_refs = h->picture_structure == PICT_FRAME ? 16 : 32;
+
+ if (ref_count[0] > max_refs || ref_count[1] > max_refs) {
+ av_log(h->avctx, AV_LOG_ERROR, "reference overflow\n");
+ h->ref_count[0] = h->ref_count[1] = 0;
+ return AVERROR_INVALIDDATA;
+ }
+
+ 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;
@@ -2580,7 +3325,7 @@
 
 /**
 * 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
@@ -2590,50 +3335,41 @@
 */
 static int decode_slice_header(H264Context *h, H264Context *h0)
 {
- MpegEncContext *const s = &h->s;
- MpegEncContext *const s0 = &h0->s;
 unsigned int first_mb_in_slice;
 unsigned int pps_id;
- int num_ref_idx_active_override_flag, max_refs, ret;
+ int ret;
 unsigned int slice_type, tmp, i, j;
 int default_ref_list_done = 0;
 int last_pic_structure, last_pic_droppable;
 int needs_reinit = 0;
+ int field_pic_flag, bottom_field_flag;
 
- /* FIXME: 2tap qpel isn't implemented for high bit depth. */
- if ((s->avctx->flags2 & CODEC_FLAG2_FAST) &&
- !h->nal_ref_idc && !h->pixel_shift) {
- s->me.qpel_put = s->dsp.put_2tap_qpel_pixels_tab;
- s->me.qpel_avg = s->dsp.avg_2tap_qpel_pixels_tab;
- } else {
- s->me.qpel_put = s->dsp.put_h264_qpel_pixels_tab;
- s->me.qpel_avg = s->dsp.avg_h264_qpel_pixels_tab;
- }
+ h->me.qpel_put = h->h264qpel.put_h264_qpel_pixels_tab;
+ h->me.qpel_avg = h->h264qpel.avg_h264_qpel_pixels_tab;
 
- first_mb_in_slice = get_ue_golomb(&s->gb);
+ first_mb_in_slice = get_ue_golomb(&h->gb);
 
 if (first_mb_in_slice == 0) { // FIXME better field boundary detection
- if (h0->current_slice && FIELD_PICTURE) {
+ if (h0->current_slice && h->cur_pic_ptr && FIELD_PICTURE(h)) {
 field_end(h, 1);
 }
 
 h0->current_slice = 0;
- if (!s0->first_field) {
- if (s->current_picture_ptr && !s->droppable &&
- s->current_picture_ptr->owner2 == s) {
- ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX,
- s->picture_structure == PICT_BOTTOM_FIELD);
+ if (!h0->first_field) {
+ if (h->cur_pic_ptr && !h->droppable) {
+ ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX,
+ h->picture_structure == PICT_BOTTOM_FIELD);
 }
- s->current_picture_ptr = NULL;
+ h->cur_pic_ptr = NULL;
 }
 }
 
- slice_type = get_ue_golomb_31(&s->gb);
+ slice_type = get_ue_golomb_31(&h->gb);
 if (slice_type > 9) {
- av_log(h->s.avctx, AV_LOG_ERROR,
- "slice type too large (%d) at %d %d\n",
- h->slice_type, s->mb_x, s->mb_y);
- return -1;
+ av_log(h->avctx, AV_LOG_ERROR,
+ "slice type %d too large at %d %d\n",
+ h->slice_type, h->mb_x, h->mb_y);
+ return AVERROR_INVALIDDATA;
 }
 if (slice_type > 4) {
 slice_type -= 5;
@@ -2649,94 +3385,93 @@
 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
- s->pict_type = h->slice_type;
+ h->pict_type = h->slice_type;
 
- pps_id = get_ue_golomb(&s->gb);
+ pps_id = get_ue_golomb(&h->gb);
 if (pps_id >= MAX_PPS_COUNT) {
- av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n");
- return -1;
+ 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]) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
 "non-existing PPS %u referenced\n",
 pps_id);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 h->pps = *h0->pps_buffers[pps_id];
 
 if (!h0->sps_buffers[h->pps.sps_id]) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
 "non-existing SPS %u referenced\n",
 h->pps.sps_id);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- if (h->pps.sps_id != h->current_sps_id ||
- h->context_reinitialized ||
+ if (h->pps.sps_id != h->sps.sps_id ||
 h0->sps_buffers[h->pps.sps_id]->new) {
- SPS *new_sps = h0->sps_buffers[h->pps.sps_id];
-
 h0->sps_buffers[h->pps.sps_id]->new = 0;
 
- if (h->sps.chroma_format_idc != new_sps->chroma_format_idc ||
- h->sps.bit_depth_luma != new_sps->bit_depth_luma)
- needs_reinit = 1;
-
- 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->bit_depth_luma != h->sps.bit_depth_luma ||
+ h->chroma_format_idc != h->sps.chroma_format_idc) {
+ h->bit_depth_luma = h->sps.bit_depth_luma;
+ h->chroma_format_idc = h->sps.chroma_format_idc;
+ needs_reinit = 1;
+ }
 if ((ret = h264_set_parameter_from_sps(h)) < 0)
 return ret;
 }
 
- s->avctx->profile = ff_h264_get_profile(&h->sps);
- s->avctx->level = h->sps.level_idc;
- s->avctx->refs = h->sps.ref_frame_count;
+ h->avctx->profile = ff_h264_get_profile(&h->sps);
+ h->avctx->level = h->sps.level_idc;
+ h->avctx->refs = h->sps.ref_frame_count;
 
- if (s->mb_width != h->sps.mb_width ||
- s->mb_height != h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag))
+ if (h->mb_width != h->sps.mb_width ||
+ h->mb_height != h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag))
 needs_reinit = 1;
 
- s->mb_width = h->sps.mb_width;
- s->mb_height = h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag);
+ h->mb_width = h->sps.mb_width;
+ h->mb_height = h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag);
+ h->mb_num = h->mb_width * h->mb_height;
+ h->mb_stride = h->mb_width + 1;
 
- h->b_stride = s->mb_width * 4;
+ h->b_stride = h->mb_width * 4;
 
- s->chroma_y_shift = h->sps.chroma_format_idc <= 1; // 400 uses yuv420p
+ h->chroma_y_shift = h->sps.chroma_format_idc <= 1; // 400 uses yuv420p
 
- s->width = 16 * s->mb_width - (2 >> CHROMA444) * FFMIN(h->sps.crop_right, (8 << CHROMA444) - 1);
- if (h->sps.frame_mbs_only_flag)
- s->height = 16 * s->mb_height - (1 << s->chroma_y_shift) * FFMIN(h->sps.crop_bottom, (16 >> s->chroma_y_shift) - 1);
- else
- s->height = 16 * s->mb_height - (2 << s->chroma_y_shift) * FFMIN(h->sps.crop_bottom, (16 >> s->chroma_y_shift) - 1);
-
- if (FFALIGN(s->avctx->width, 16) == s->width &&
- FFALIGN(s->avctx->height, 16) == s->height) {
- s->width = s->avctx->width;
- s->height = s->avctx->height;
- }
+ h->width = 16 * h->mb_width;
+ h->height = 16 * h->mb_height;
+
+ ret = init_dimensions(h);
+ if (ret < 0)
+ return ret;
 
 if (h->sps.video_signal_type_present_flag) {
- s->avctx->color_range = h->sps.full_range ? AVCOL_RANGE_JPEG
+ h->avctx->color_range = h->sps.full_range ? AVCOL_RANGE_JPEG
 : AVCOL_RANGE_MPEG;
 if (h->sps.colour_description_present_flag) {
- if (s->avctx->colorspace != h->sps.colorspace)
+ if (h->avctx->colorspace != h->sps.colorspace)
 needs_reinit = 1;
- s->avctx->color_primaries = h->sps.color_primaries;
- s->avctx->color_trc = h->sps.color_trc;
- s->avctx->colorspace = h->sps.colorspace;
+ h->avctx->color_primaries = h->sps.color_primaries;
+ h->avctx->color_trc = h->sps.color_trc;
+ h->avctx->colorspace = h->sps.colorspace;
 }
 }
 
- if (s->context_initialized &&
- (s->width != s->avctx->width ||
- s->height != s->avctx->height ||
- needs_reinit ||
- av_cmp_q(h->sps.sar, s->avctx->sample_aspect_ratio))) {
-
+ if (h->context_initialized &&
+ (h->width != h->avctx->coded_width ||
+ h->height != h->avctx->coded_height ||
+ needs_reinit)) {
 if (h != h0) {
- av_log(s->avctx, AV_LOG_ERROR, "changing width/height on "
+ av_log(h->avctx, AV_LOG_ERROR, "changing width/height on "
 "slice %d\n", h0->current_slice + 1);
 return AVERROR_INVALIDDATA;
 }
@@ -2745,31 +3480,30 @@
 
 if ((ret = get_pixel_format(h)) < 0)
 return ret;
- s->avctx->pix_fmt = ret;
+ h->avctx->pix_fmt = ret;
 
- av_log(h->s.avctx, AV_LOG_INFO, "Reinit context to %dx%d, "
- "pix_fmt: %d\n", s->width, s->height, s->avctx->pix_fmt);
+ av_log(h->avctx, AV_LOG_INFO, "Reinit context to %dx%d, "
+ "pix_fmt: %d\n", h->width, h->height, h->avctx->pix_fmt);
 
 if ((ret = h264_slice_header_init(h, 1)) < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
 "h264_slice_header_init() failed\n");
 return ret;
 }
- h->context_reinitialized = 1;
 }
- if (!s->context_initialized) {
+ if (!h->context_initialized) {
 if (h != h0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
 "Cannot (re-)initialize context during parallel decoding.\n");
- return -1;
+ return AVERROR_PATCHWELCOME;
 }
 
 if ((ret = get_pixel_format(h)) < 0)
 return ret;
- s->avctx->pix_fmt = ret;
+ h->avctx->pix_fmt = ret;
 
 if ((ret = h264_slice_header_init(h, 0)) < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
 "h264_slice_header_init() failed\n");
 return ret;
 }
@@ -2780,37 +3514,39 @@
 init_dequant_tables(h);
 }
 
- h->frame_num = get_bits(&s->gb, h->sps.log2_max_frame_num);
+ h->frame_num = get_bits(&h->gb, h->sps.log2_max_frame_num);
 
 h->mb_mbaff = 0;
 h->mb_aff_frame = 0;
- last_pic_structure = s0->picture_structure;
- last_pic_droppable = s0->droppable;
- s->droppable = h->nal_ref_idc == 0;
+ last_pic_structure = h0->picture_structure;
+ last_pic_droppable = h0->droppable;
+ h->droppable = h->nal_ref_idc == 0;
 if (h->sps.frame_mbs_only_flag) {
- s->picture_structure = PICT_FRAME;
+ h->picture_structure = PICT_FRAME;
 } else {
- if (get_bits1(&s->gb)) { // field_pic_flag
- s->picture_structure = PICT_TOP_FIELD + get_bits1(&s->gb); // bottom_field_flag
+ field_pic_flag = get_bits1(&h->gb);
+ if (field_pic_flag) {
+ bottom_field_flag = get_bits1(&h->gb);
+ h->picture_structure = PICT_TOP_FIELD + bottom_field_flag;
 } else {
- s->picture_structure = PICT_FRAME;
+ h->picture_structure = PICT_FRAME;
 h->mb_aff_frame = h->sps.mb_aff;
 }
 }
- h->mb_field_decoding_flag = s->picture_structure != PICT_FRAME;
+ h->mb_field_decoding_flag = h->picture_structure != PICT_FRAME;
 
 if (h0->current_slice != 0) {
- if (last_pic_structure != s->picture_structure ||
- last_pic_droppable != s->droppable) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ if (last_pic_structure != h->picture_structure ||
+ last_pic_droppable != h->droppable) {
+ av_log(h->avctx, AV_LOG_ERROR,
 "Changing field mode (%d -> %d) between slices is not allowed\n",
- last_pic_structure, s->picture_structure);
- s->picture_structure = last_pic_structure;
- s->droppable = last_pic_droppable;
+ last_pic_structure, h->picture_structure);
+ h->picture_structure = last_pic_structure;
+ h->droppable = last_pic_droppable;
 return AVERROR_INVALIDDATA;
- } else if (!s0->current_picture_ptr) {
- av_log(s->avctx, AV_LOG_ERROR,
- "unset current_picture_ptr on %d. slice\n",
+ } else if (!h0->cur_pic_ptr) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "unset cur_pic_ptr on slice %d\n",
 h0->current_slice + 1);
 return AVERROR_INVALIDDATA;
 }
@@ -2838,63 +3574,48 @@
 * decode frames as "finished".
 * We have to do that before the "dummy" in-between frame allocation,
 * since that can modify s->current_picture_ptr. */
- if (s0->first_field) {
- assert(s0->current_picture_ptr);
- assert(s0->current_picture_ptr->f.data[0]);
- assert(s0->current_picture_ptr->f.reference != DELAYED_PIC_REF);
-
- /* Mark old field/frame as completed */
- if (!last_pic_droppable && s0->current_picture_ptr->owner2 == s0) {
- ff_thread_report_progress(&s0->current_picture_ptr->f, INT_MAX,
- last_pic_structure == PICT_BOTTOM_FIELD);
- }
+ if (h0->first_field) {
+ assert(h0->cur_pic_ptr);
+ 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 */
- if (!FIELD_PICTURE || s->picture_structure == last_pic_structure) {
+ if (!FIELD_PICTURE(h) || h->picture_structure == last_pic_structure) {
 /* Previous field is unmatched. Don't display it, but let it
 * remain for reference if marked as such. */
 if (!last_pic_droppable && last_pic_structure != PICT_FRAME) {
- ff_thread_report_progress(&s0->current_picture_ptr->f, INT_MAX,
+ ff_thread_report_progress(&h0->cur_pic_ptr->tf, INT_MAX,
 last_pic_structure == PICT_TOP_FIELD);
 }
 } else {
- if (s0->current_picture_ptr->frame_num != h->frame_num) {
+ if (h0->cur_pic_ptr->frame_num != h->frame_num) {
 /* This and previous field were reference, but had
 * different frame_nums. Consider this field first in
 * pair. Throw away previous field except for reference
 * purposes. */
 if (!last_pic_droppable && last_pic_structure != PICT_FRAME) {
- ff_thread_report_progress(&s0->current_picture_ptr->f, INT_MAX,
+ ff_thread_report_progress(&h0->cur_pic_ptr->tf, INT_MAX,
 last_pic_structure == PICT_TOP_FIELD);
 }
 } else {
 /* Second field in complementary pair */
 if (!((last_pic_structure == PICT_TOP_FIELD &&
- s->picture_structure == PICT_BOTTOM_FIELD) ||
+ h->picture_structure == PICT_BOTTOM_FIELD) ||
 (last_pic_structure == PICT_BOTTOM_FIELD &&
- s->picture_structure == PICT_TOP_FIELD))) {
- av_log(s->avctx, AV_LOG_ERROR,
+ h->picture_structure == PICT_TOP_FIELD))) {
+ av_log(h->avctx, AV_LOG_ERROR,
 "Invalid field mode combination %d/%d\n",
- last_pic_structure, s->picture_structure);
- s->picture_structure = last_pic_structure;
- s->droppable = last_pic_droppable;
+ last_pic_structure, h->picture_structure);
+ h->picture_structure = last_pic_structure;
+ h->droppable = last_pic_droppable;
 return AVERROR_INVALIDDATA;
- } else if (last_pic_droppable != s->droppable) {
- av_log(s->avctx, AV_LOG_ERROR,
- "Cannot combine reference and non-reference fields in the same frame\n");
- av_log_ask_for_sample(s->avctx, NULL);
- s->picture_structure = last_pic_structure;
- s->droppable = last_pic_droppable;
+ } else if (last_pic_droppable != h->droppable) {
+ avpriv_request_sample(h->avctx,
+ "Found reference and non-reference fields in the same frame, which");
+ h->picture_structure = last_pic_structure;
+ h->droppable = last_pic_droppable;
 return AVERROR_PATCHWELCOME;
 }
-
- /* Take ownership of this buffer. Note that if another thread owned
- * the first field of this buffer, we're not operating on that pointer,
- * so the original thread is still responsible for reporting progress
- * on that first field (or if that was us, we just did that above).
- * By taking ownership, we assign responsibility to ourselves to
- * report progress on the second field. */
- s0->current_picture_ptr->owner2 = s0;
 }
 }
 }
@@ -2902,32 +3623,41 @@
 while (h->frame_num != h->prev_frame_num &&
 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->s.avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n",
+ av_log(h->avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n",
 h->frame_num, h->prev_frame_num);
- if (ff_h264_frame_start(h) < 0)
- return -1;
+ ret = h264_frame_start(h);
+ if (ret < 0) {
+ h0->first_field = 0;
+ return ret;
+ }
+
 h->prev_frame_num++;
- h->prev_frame_num %= 1 << h->sps.log2_max_frame_num;
- s->current_picture_ptr->frame_num = h->prev_frame_num;
- ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX, 0);
- ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX, 1);
- if ((ret = ff_generate_sliding_window_mmcos(h, 1)) < 0 &&
- s->avctx->err_recognition & AV_EF_EXPLODE)
+ h->prev_frame_num %= 1 << h->sps.log2_max_frame_num;
+ h->cur_pic_ptr->frame_num = h->prev_frame_num;
+ 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);
+ if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
 return ret;
- if (ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index) < 0 &&
- (s->avctx->err_recognition & AV_EF_EXPLODE))
- return AVERROR_INVALIDDATA;
- /* Error concealment: if a ref is missing, copy the previous ref in its place.
- * FIXME: avoiding a memcpy would be nice, but ref handling makes many assumptions
- * about there being no actual duplicates.
- * FIXME: this doesn't copy padding for out-of-frame motion vectors. Given we're
- * concealing a lost frame, this probably isn't noticeable by comparison, but it should
- * be fixed. */
+ ret = ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index);
+ if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
+ return ret;
+ /* Error concealment: If a ref is missing, copy the previous ref
+ * in its place.
+ * FIXME: Avoiding a memcpy would be nice, but ref handling makes
+ * many assumptions about there being no actual duplicates.
+ * FIXME: This does not copy padding for out-of-frame motion
+ * vectors. Given we are concealing a lost frame, this probably
+ * is not noticeable by comparison, but it should be fixed. */
 if (h->short_ref_count) {
 if (prev) {
- av_image_copy(h->short_ref[0]->f.data, h->short_ref[0]->f.linesize,
- (const uint8_t **)prev->f.data, prev->f.linesize,
- s->avctx->pix_fmt, s->mb_width * 16, s->mb_height * 16);
+ av_image_copy(h->short_ref[0]->f.data,
+ h->short_ref[0]->f.linesize,
+ (const uint8_t **)prev->f.data,
+ prev->f.linesize,
+ h->avctx->pix_fmt,
+ h->mb_width * 16,
+ h->mb_height * 16);
 h->short_ref[0]->poc = prev->poc + 2;
 }
 h->short_ref[0]->frame_num = h->prev_frame_num;
@@ -2937,61 +3667,62 @@
 /* See if we have a decoded first field looking for a pair...
 * We're using that to see whether to continue decoding in that
 * frame, or to allocate a new one. */
- if (s0->first_field) {
- assert(s0->current_picture_ptr);
- assert(s0->current_picture_ptr->f.data[0]);
- assert(s0->current_picture_ptr->f.reference != DELAYED_PIC_REF);
+ if (h0->first_field) {
+ assert(h0->cur_pic_ptr);
+ 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 */
- if (!FIELD_PICTURE || s->picture_structure == last_pic_structure) {
+ if (!FIELD_PICTURE(h) || h->picture_structure == last_pic_structure) {
 /* Previous field is unmatched. Don't display it, but let it
 * remain for reference if marked as such. */
- s0->current_picture_ptr = NULL;
- s0->first_field = FIELD_PICTURE;
+ h0->cur_pic_ptr = NULL;
+ h0->first_field = FIELD_PICTURE(h);
 } else {
- if (s0->current_picture_ptr->frame_num != h->frame_num) {
+ if (h0->cur_pic_ptr->frame_num != h->frame_num) {
 /* This and the previous field had different frame_nums.
 * Consider this field first in pair. Throw away previous
 * one except for reference purposes. */
- s0->first_field = 1;
- s0->current_picture_ptr = NULL;
+ h0->first_field = 1;
+ h0->cur_pic_ptr = NULL;
 } else {
 /* Second field in complementary pair */
- s0->first_field = 0;
+ h0->first_field = 0;
 }
 }
 } else {
 /* Frame or first field in a potentially complementary pair */
- s0->first_field = FIELD_PICTURE;
+ h0->first_field = FIELD_PICTURE(h);
 }
 
- if (!FIELD_PICTURE || s0->first_field) {
- if (ff_h264_frame_start(h) < 0) {
- s0->first_field = 0;
- return -1;
+ if (!FIELD_PICTURE(h) || h0->first_field) {
+ if (h264_frame_start(h) < 0) {
+ h0->first_field = 0;
+ return AVERROR_INVALIDDATA;
 }
 } else {
- ff_release_unused_pictures(s, 0);
+ release_unused_pictures(h, 0);
 }
 }
 if (h != h0 && (ret = clone_slice(h, h0)) < 0)
 return ret;
 
- s->current_picture_ptr->frame_num = h->frame_num; // FIXME frame_num cleanup
+ h->cur_pic_ptr->frame_num = h->frame_num; // FIXME frame_num cleanup
 
- assert(s->mb_num == s->mb_width * s->mb_height);
- if (first_mb_in_slice << FIELD_OR_MBAFF_PICTURE >= s->mb_num ||
- first_mb_in_slice >= s->mb_num) {
- av_log(h->s.avctx, AV_LOG_ERROR, "first_mb_in_slice overflow\n");
- return -1;
- }
- s->resync_mb_x = s->mb_x = first_mb_in_slice % s->mb_width;
- s->resync_mb_y = s->mb_y = (first_mb_in_slice / s->mb_width) << FIELD_OR_MBAFF_PICTURE;
- if (s->picture_structure == PICT_BOTTOM_FIELD)
- s->resync_mb_y = s->mb_y = s->mb_y + 1;
- assert(s->mb_y < s->mb_height);
+ assert(h->mb_num == h->mb_width * h->mb_height);
+ if (first_mb_in_slice << FIELD_OR_MBAFF_PICTURE(h) >= h->mb_num ||
+ first_mb_in_slice >= h->mb_num) {
+ av_log(h->avctx, AV_LOG_ERROR, "first_mb_in_slice overflow\n");
+ return AVERROR_INVALIDDATA;
+ }
+ h->resync_mb_x = h->mb_x = first_mb_in_slice % h->mb_width;
+ h->resync_mb_y = h->mb_y = (first_mb_in_slice / h->mb_width) <<
+ FIELD_OR_MBAFF_PICTURE(h);
+ if (h->picture_structure == PICT_BOTTOM_FIELD)
+ h->resync_mb_y = h->mb_y = h->mb_y + 1;
+ assert(h->mb_y < h->mb_height);
 
- if (s->picture_structure == PICT_FRAME) {
+ if (h->picture_structure == PICT_FRAME) {
 h->curr_pic_num = h->frame_num;
 h->max_pic_num = 1 << h->sps.log2_max_frame_num;
 } else {
@@ -3000,89 +3731,48 @@
 }
 
 if (h->nal_unit_type == NAL_IDR_SLICE)
- get_ue_golomb(&s->gb); /* idr_pic_id */
+ get_ue_golomb(&h->gb); /* idr_pic_id */
 
 if (h->sps.poc_type == 0) {
- h->poc_lsb = get_bits(&s->gb, h->sps.log2_max_poc_lsb);
+ h->poc_lsb = get_bits(&h->gb, h->sps.log2_max_poc_lsb);
 
- if (h->pps.pic_order_present == 1 && s->picture_structure == PICT_FRAME)
- h->delta_poc_bottom = get_se_golomb(&s->gb);
+ if (h->pps.pic_order_present == 1 && h->picture_structure == PICT_FRAME)
+ h->delta_poc_bottom = get_se_golomb(&h->gb);
 }
 
 if (h->sps.poc_type == 1 && !h->sps.delta_pic_order_always_zero_flag) {
- h->delta_poc[0] = get_se_golomb(&s->gb);
+ h->delta_poc[0] = get_se_golomb(&h->gb);
 
- if (h->pps.pic_order_present == 1 && s->picture_structure == PICT_FRAME)
- h->delta_poc[1] = get_se_golomb(&s->gb);
+ if (h->pps.pic_order_present == 1 && h->picture_structure == PICT_FRAME)
+ h->delta_poc[1] = get_se_golomb(&h->gb);
 }
 
- init_poc(h);
+ ff_init_poc(h, h->cur_pic_ptr->field_poc, &h->cur_pic_ptr->poc);
 
 if (h->pps.redundant_pic_cnt_present)
- h->redundant_pic_count = get_ue_golomb(&s->gb);
-
- // 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];
-
- if (h->slice_type_nos != AV_PICTURE_TYPE_I) {
- if (h->slice_type_nos == AV_PICTURE_TYPE_B)
- h->direct_spatial_mv_pred = get_bits1(&s->gb);
- num_ref_idx_active_override_flag = get_bits1(&s->gb);
-
- if (num_ref_idx_active_override_flag) {
- h->ref_count[0] = get_ue_golomb(&s->gb) + 1;
- if (h->ref_count[0] < 1)
- return AVERROR_INVALIDDATA;
- if (h->slice_type_nos == AV_PICTURE_TYPE_B) {
- h->ref_count[1] = get_ue_golomb(&s->gb) + 1;
- if (h->ref_count[1] < 1)
- return AVERROR_INVALIDDATA;
- }
- }
+ h->redundant_pic_count = get_ue_golomb(&h->gb);
 
- if (h->slice_type_nos == AV_PICTURE_TYPE_B)
- h->list_count = 2;
- else
- h->list_count = 1;
- } else {
- h->list_count = 0;
- h->ref_count[0] = h->ref_count[1] = 0;
- }
-
-
- max_refs = s->picture_structure == PICT_FRAME ? 16 : 32;
-
- if (h->ref_count[0] > max_refs || h->ref_count[1] > max_refs) {
- av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n");
- h->ref_count[0] = h->ref_count[1] = 0;
- return AVERROR_INVALIDDATA;
- }
+ ret = ff_set_ref_count(h);
+ if (ret < 0)
+ return ret;
+ else if (ret == 1)
+ default_ref_list_done = 0;
 
 if (!default_ref_list_done)
 ff_h264_fill_default_ref_list(h);
 
- if (h->slice_type_nos != AV_PICTURE_TYPE_I &&
- ff_h264_decode_ref_pic_list_reordering(h) < 0) {
- h->ref_count[1] = h->ref_count[0] = 0;
- return -1;
- }
-
 if (h->slice_type_nos != AV_PICTURE_TYPE_I) {
- s->last_picture_ptr = &h->ref_list[0][0];
- s->last_picture_ptr->owner2 = s;
- ff_copy_picture(&s->last_picture, s->last_picture_ptr);
- }
- if (h->slice_type_nos == AV_PICTURE_TYPE_B) {
- s->next_picture_ptr = &h->ref_list[1][0];
- s->next_picture_ptr->owner2 = s;
- ff_copy_picture(&s->next_picture, s->next_picture_ptr);
+ ret = ff_h264_decode_ref_pic_list_reordering(h);
+ if (ret < 0) {
+ h->ref_count[1] = h->ref_count[0] = 0;
+ return ret;
+ }
 }
 
 if ((h->pps.weighted_pred && h->slice_type_nos == AV_PICTURE_TYPE_P) ||
 (h->pps.weighted_bipred_idc == 1 &&
 h->slice_type_nos == AV_PICTURE_TYPE_B))
- pred_weight_table(h);
+ ff_pred_weight_table(h);
 else if (h->pps.weighted_bipred_idc == 2 &&
 h->slice_type_nos == AV_PICTURE_TYPE_B) {
 implicit_weight_table(h, -1);
@@ -3099,14 +3789,15 @@
 // or h->mmco, which will cause ref list mix-ups and decoding errors
 // further down the line. This may break decoding if the first slice is
 // corrupt, thus we only do this if frame-mt is enabled.
- if (h->nal_ref_idc &&
- ff_h264_decode_ref_pic_marking(h0, &s->gb,
- !(s->avctx->active_thread_type & FF_THREAD_FRAME) ||
- h0->current_slice == 0) < 0 &&
- (s->avctx->err_recognition & AV_EF_EXPLODE))
- return AVERROR_INVALIDDATA;
+ if (h->nal_ref_idc) {
+ ret = ff_h264_decode_ref_pic_marking(h0, &h->gb,
+ !(h->avctx->active_thread_type & FF_THREAD_FRAME) ||
+ h0->current_slice == 0);
+ if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
+ return AVERROR_INVALIDDATA;
+ }
 
- if (FRAME_MBAFF) {
+ if (FRAME_MBAFF(h)) {
 ff_h264_fill_mbaff_ref_list(h);
 
 if (h->pps.weighted_bipred_idc == 2 && h->slice_type_nos == AV_PICTURE_TYPE_B) {
@@ -3120,86 +3811,88 @@
 ff_h264_direct_ref_list_init(h);
 
 if (h->slice_type_nos != AV_PICTURE_TYPE_I && h->pps.cabac) {
- tmp = get_ue_golomb_31(&s->gb);
+ tmp = get_ue_golomb_31(&h->gb);
 if (tmp > 2) {
- av_log(s->avctx, AV_LOG_ERROR, "cabac_init_idc overflow\n");
- return -1;
+ av_log(h->avctx, AV_LOG_ERROR, "cabac_init_idc %u overflow\n", tmp);
+ return AVERROR_INVALIDDATA;
 }
 h->cabac_init_idc = tmp;
 }
 
 h->last_qscale_diff = 0;
- tmp = h->pps.init_qp + get_se_golomb(&s->gb);
+ tmp = h->pps.init_qp + get_se_golomb(&h->gb);
 if (tmp > 51 + 6 * (h->sps.bit_depth_luma - 8)) {
- av_log(s->avctx, AV_LOG_ERROR, "QP %u out of range\n", tmp);
- return -1;
+ av_log(h->avctx, AV_LOG_ERROR, "QP %u out of range\n", tmp);
+ return AVERROR_INVALIDDATA;
 }
- s->qscale = tmp;
- h->chroma_qp[0] = get_chroma_qp(h, 0, s->qscale);
- h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale);
+ h->qscale = tmp;
+ h->chroma_qp[0] = get_chroma_qp(h, 0, h->qscale);
+ h->chroma_qp[1] = get_chroma_qp(h, 1, h->qscale);
 // FIXME qscale / qp ... stuff
 if (h->slice_type == AV_PICTURE_TYPE_SP)
- get_bits1(&s->gb); /* sp_for_switch_flag */
+ get_bits1(&h->gb); /* sp_for_switch_flag */
 if (h->slice_type == AV_PICTURE_TYPE_SP ||
 h->slice_type == AV_PICTURE_TYPE_SI)
- get_se_golomb(&s->gb); /* slice_qs_delta */
+ 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(&s->gb);
+ tmp = get_ue_golomb_31(&h->gb);
 if (tmp > 2) {
- av_log(s->avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
 "deblocking_filter_idc %u out of range\n", tmp);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 h->deblocking_filter = tmp;
 if (h->deblocking_filter < 2)
 h->deblocking_filter ^= 1; // 1<->0
 
 if (h->deblocking_filter) {
- h->slice_alpha_c0_offset += get_se_golomb(&s->gb) << 1;
- h->slice_beta_offset += get_se_golomb(&s->gb) << 1;
- if (h->slice_alpha_c0_offset > 104U ||
- h->slice_beta_offset > 104U) {
- av_log(s->avctx, AV_LOG_ERROR,
+ 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);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 }
 
- if (s->avctx->skip_loop_filter >= AVDISCARD_ALL ||
- (s->avctx->skip_loop_filter >= AVDISCARD_NONKEY &&
+ if (h->avctx->skip_loop_filter >= AVDISCARD_ALL ||
+ (h->avctx->skip_loop_filter >= AVDISCARD_NONKEY &&
 h->slice_type_nos != AV_PICTURE_TYPE_I) ||
- (s->avctx->skip_loop_filter >= AVDISCARD_BIDIR &&
+ (h->avctx->skip_loop_filter >= AVDISCARD_BIDIR &&
 h->slice_type_nos == AV_PICTURE_TYPE_B) ||
- (s->avctx->skip_loop_filter >= AVDISCARD_NONREF &&
+ (h->avctx->skip_loop_filter >= AVDISCARD_NONREF &&
 h->nal_ref_idc == 0))
 h->deblocking_filter = 0;
 
 if (h->deblocking_filter == 1 && h0->max_contexts > 1) {
- if (s->avctx->flags2 & CODEC_FLAG2_FAST) {
+ if (h->avctx->flags2 & CODEC_FLAG2_FAST) {
 /* Cheat slightly for speed:
 * Do not bother to deblock across slices. */
 h->deblocking_filter = 2;
 } else {
 h0->max_contexts = 1;
 if (!h0->single_decode_warning) {
- av_log(s->avctx, AV_LOG_INFO,
+ av_log(h->avctx, AV_LOG_INFO,
 "Cannot parallelize deblocking type 1, decoding such frames in sequential order\n");
 h0->single_decode_warning = 1;
 }
 if (h != h0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
 "Deblocking switched inside frame.\n");
 return 1;
 }
 }
 }
- 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],
@@ -3207,9 +3900,9 @@
 6 * (h->sps.bit_depth_luma - 8);
 
 h0->last_slice_type = slice_type;
- h->slice_num = ++h0->current_slice;
+ h->slice_num = ++h0->current_slice;
 if (h->slice_num >= MAX_SLICES) {
- av_log(s->avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
 "Too many slices, increase MAX_SLICES and recompile\n");
 }
 
@@ -3218,57 +3911,50 @@
 int *ref2frm = h->ref2frm[h->slice_num & (MAX_SLICES - 1)][j];
 for (i = 0; i < 16; i++) {
 id_list[i] = 60;
- if (h->ref_list[j][i].f.data[0]) {
+ if (j < h->list_count && i < h->ref_count[j] &&
+ h->ref_list[j][i].f.buf[0]) {
 int k;
- uint8_t *base = h->ref_list[j][i].f.base[0];
+ AVBuffer *buf = h->ref_list[j][i].f.buf[0]->buffer;
 for (k = 0; k < h->short_ref_count; k++)
- if (h->short_ref[k]->f.base[0] == base) {
+ if (h->short_ref[k]->f.buf[0]->buffer == buf) {
 id_list[i] = k;
 break;
 }
 for (k = 0; k < h->long_ref_count; k++)
- if (h->long_ref[k] && h->long_ref[k]->f.base[0] == base) {
+ if (h->long_ref[k] && h->long_ref[k]->f.buf[0]->buffer == buf) {
 id_list[i] = h->short_ref_count + k;
 break;
 }
 }
 }
 
- ref2frm[0] =
- ref2frm[1] = -1;
+ ref2frm[0] =
+ ref2frm[1] = -1;
 for (i = 0; i < 16; i++)
- ref2frm[i + 2] = 4 * id_list[i] +
- (h->ref_list[j][i].f.reference & 3);
- ref2frm[18 + 0] =
- ref2frm[18 + 1] = -1;
+ ref2frm[i + 2] = 4 * id_list[i] + (h->ref_list[j][i].reference & 3);
+ ref2frm[18 + 0] =
+ ref2frm[18 + 1] = -1;
 for (i = 16; i < 48; i++)
 ref2frm[i + 4] = 4 * id_list[(i - 16) >> 1] +
- (h->ref_list[j][i].f.reference & 3);
+ (h->ref_list[j][i].reference & 3);
 }
 
- // FIXME: fix draw_edges + PAFF + frame threads
- h->emu_edge_width = (s->flags & CODEC_FLAG_EMU_EDGE ||
- (!h->sps.frame_mbs_only_flag &&
- s->avctx->active_thread_type))
- ? 0 : 16;
- h->emu_edge_height = (FRAME_MBAFF || FIELD_PICTURE) ? 0 : h->emu_edge_width;
-
- if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
- av_log(h->s.avctx, AV_LOG_DEBUG,
+ if (h->avctx->debug & FF_DEBUG_PICT_INFO) {
+ av_log(h->avctx, AV_LOG_DEBUG,
 "slice:%d %s mb:%d %c%s%s pps:%u frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s %s\n",
 h->slice_num,
- (s->picture_structure == PICT_FRAME ? "F" : s->picture_structure == PICT_TOP_FIELD ? "T" : "B"),
+ (h->picture_structure == PICT_FRAME ? "F" : h->picture_structure == PICT_TOP_FIELD ? "T" : "B"),
 first_mb_in_slice,
 av_get_picture_type_char(h->slice_type),
 h->slice_type_fixed ? " fix" : "",
 h->nal_unit_type == NAL_IDR_SLICE ? " IDR" : "",
 pps_id, h->frame_num,
- s->current_picture_ptr->field_poc[0],
- s->current_picture_ptr->field_poc[1],
+ h->cur_pic_ptr->field_poc[0],
+ h->cur_pic_ptr->field_poc[1],
 h->ref_count[0], h->ref_count[1],
- s->qscale,
+ 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") : "");
@@ -3291,12 +3977,11 @@
 case AV_PICTURE_TYPE_SI:
 return 4;
 default:
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 
 static av_always_inline void fill_filter_caches_inter(H264Context *h,
- MpegEncContext *const s,
 int mb_type, int top_xy,
 int left_xy[LEFT_MBS],
 int top_type,
@@ -3310,12 +3995,12 @@
 if (USES_LIST(top_type, list)) {
 const int b_xy = h->mb2b_xy[top_xy] + 3 * b_stride;
 const int b8_xy = 4 * top_xy + 2;
- int (*ref2frm)[64] = h->ref2frm[h->slice_table[top_xy] & (MAX_SLICES - 1)][0] + (MB_MBAFF ? 20 : 2);
- AV_COPY128(mv_dst - 1 * 8, s->current_picture.f.motion_val[list][b_xy + 0]);
+ int (*ref2frm)[64] = h->ref2frm[h->slice_table[top_xy] & (MAX_SLICES - 1)][0] + (MB_MBAFF(h) ? 20 : 2);
+ AV_COPY128(mv_dst - 1 * 8, h->cur_pic.motion_val[list][b_xy + 0]);
 ref_cache[0 - 1 * 8] =
- ref_cache[1 - 1 * 8] = ref2frm[list][s->current_picture.f.ref_index[list][b8_xy + 0]];
+ ref_cache[1 - 1 * 8] = ref2frm[list][h->cur_pic.ref_index[list][b8_xy + 0]];
 ref_cache[2 - 1 * 8] =
- ref_cache[3 - 1 * 8] = ref2frm[list][s->current_picture.f.ref_index[list][b8_xy + 1]];
+ ref_cache[3 - 1 * 8] = ref2frm[list][h->cur_pic.ref_index[list][b8_xy + 1]];
 } else {
 AV_ZERO128(mv_dst - 1 * 8);
 AV_WN32A(&ref_cache[0 - 1 * 8], ((LIST_NOT_USED) & 0xFF) * 0x01010101u);
@@ -3325,15 +4010,15 @@
 if (USES_LIST(left_type[LTOP], list)) {
 const int b_xy = h->mb2b_xy[left_xy[LTOP]] + 3;
 const int b8_xy = 4 * left_xy[LTOP] + 1;
- int (*ref2frm)[64] = h->ref2frm[h->slice_table[left_xy[LTOP]] & (MAX_SLICES - 1)][0] + (MB_MBAFF ? 20 : 2);
- AV_COPY32(mv_dst - 1 + 0, s->current_picture.f.motion_val[list][b_xy + b_stride * 0]);
- AV_COPY32(mv_dst - 1 + 8, s->current_picture.f.motion_val[list][b_xy + b_stride * 1]);
- AV_COPY32(mv_dst - 1 + 16, s->current_picture.f.motion_val[list][b_xy + b_stride * 2]);
- AV_COPY32(mv_dst - 1 + 24, s->current_picture.f.motion_val[list][b_xy + b_stride * 3]);
+ int (*ref2frm)[64] = h->ref2frm[h->slice_table[left_xy[LTOP]] & (MAX_SLICES - 1)][0] + (MB_MBAFF(h) ? 20 : 2);
+ AV_COPY32(mv_dst - 1 + 0, h->cur_pic.motion_val[list][b_xy + b_stride * 0]);
+ AV_COPY32(mv_dst - 1 + 8, h->cur_pic.motion_val[list][b_xy + b_stride * 1]);
+ AV_COPY32(mv_dst - 1 + 16, h->cur_pic.motion_val[list][b_xy + b_stride * 2]);
+ AV_COPY32(mv_dst - 1 + 24, h->cur_pic.motion_val[list][b_xy + b_stride * 3]);
 ref_cache[-1 + 0] =
- ref_cache[-1 + 8] = ref2frm[list][s->current_picture.f.ref_index[list][b8_xy + 2 * 0]];
+ ref_cache[-1 + 8] = ref2frm[list][h->cur_pic.ref_index[list][b8_xy + 2 * 0]];
 ref_cache[-1 + 16] =
- ref_cache[-1 + 24] = ref2frm[list][s->current_picture.f.ref_index[list][b8_xy + 2 * 1]];
+ ref_cache[-1 + 24] = ref2frm[list][h->cur_pic.ref_index[list][b8_xy + 2 * 1]];
 } else {
 AV_ZERO32(mv_dst - 1 + 0);
 AV_ZERO32(mv_dst - 1 + 8);
@@ -3357,8 +4042,8 @@
 }
 
 {
- int8_t *ref = &s->current_picture.f.ref_index[list][4 * mb_xy];
- int (*ref2frm)[64] = h->ref2frm[h->slice_num & (MAX_SLICES - 1)][0] + (MB_MBAFF ? 20 : 2);
+ int8_t *ref = &h->cur_pic.ref_index[list][4 * mb_xy];
+ int (*ref2frm)[64] = h->ref2frm[h->slice_num & (MAX_SLICES - 1)][0] + (MB_MBAFF(h) ? 20 : 2);
 uint32_t ref01 = (pack16to32(ref2frm[list][ref[0]], ref2frm[list][ref[1]]) & 0x00FF00FF) * 0x0101;
 uint32_t ref23 = (pack16to32(ref2frm[list][ref[2]], ref2frm[list][ref[3]]) & 0x00FF00FF) * 0x0101;
 AV_WN32A(&ref_cache[0 * 8], ref01);
@@ -3368,7 +4053,7 @@
 }
 
 {
- int16_t(*mv_src)[2] = &s->current_picture.f.motion_val[list][4 * s->mb_x + 4 * s->mb_y * b_stride];
+ int16_t(*mv_src)[2] = &h->cur_pic.motion_val[list][4 * h->mb_x + 4 * h->mb_y * b_stride];
 AV_COPY128(mv_dst + 8 * 0, mv_src + 0 * b_stride);
 AV_COPY128(mv_dst + 8 * 1, mv_src + 1 * b_stride);
 AV_COPY128(mv_dst + 8 * 2, mv_src + 2 * b_stride);
@@ -3382,31 +4067,30 @@
 */
 static int fill_filter_caches(H264Context *h, int mb_type)
 {
- MpegEncContext *const s = &h->s;
 const int mb_xy = h->mb_xy;
 int top_xy, left_xy[LEFT_MBS];
 int top_type, left_type[LEFT_MBS];
 uint8_t *nnz;
 uint8_t *nnz_cache;
 
- top_xy = mb_xy - (s->mb_stride << MB_FIELD);
+ top_xy = mb_xy - (h->mb_stride << MB_FIELD(h));
 
 /* Wow, what a mess, why didn't they simplify the interlacing & intra
 * stuff, I can't imagine that these complex rules are worth it. */
 
 left_xy[LBOT] = left_xy[LTOP] = mb_xy - 1;
- if (FRAME_MBAFF) {
- const int left_mb_field_flag = IS_INTERLACED(s->current_picture.f.mb_type[mb_xy - 1]);
+ if (FRAME_MBAFF(h)) {
+ const int left_mb_field_flag = IS_INTERLACED(h->cur_pic.mb_type[mb_xy - 1]);
 const int curr_mb_field_flag = IS_INTERLACED(mb_type);
- if (s->mb_y & 1) {
+ if (h->mb_y & 1) {
 if (left_mb_field_flag != curr_mb_field_flag)
- left_xy[LTOP] -= s->mb_stride;
+ left_xy[LTOP] -= h->mb_stride;
 } else {
 if (curr_mb_field_flag)
- top_xy += s->mb_stride &
- (((s->current_picture.f.mb_type[top_xy] >> 7) & 1) - 1);
+ top_xy += h->mb_stride &
+ (((h->cur_pic.mb_type[top_xy] >> 7) & 1) - 1);
 if (left_mb_field_flag != curr_mb_field_flag)
- left_xy[LBOT] += s->mb_stride;
+ left_xy[LBOT] += h->mb_stride;
 }
 }
 
@@ -3418,25 +4102,25 @@
 * This is a conservative estimate: could also check beta_offset
 * and more accurate chroma_qp. */
 int qp_thresh = h->qp_thresh; // FIXME strictly we should store qp_thresh for each mb of a slice
- int qp = s->current_picture.f.qscale_table[mb_xy];
+ int qp = h->cur_pic.qscale_table[mb_xy];
 if (qp <= qp_thresh &&
 (left_xy[LTOP] < 0 ||
- ((qp + s->current_picture.f.qscale_table[left_xy[LTOP]] + 1) >> 1) <= qp_thresh) &&
+ ((qp + h->cur_pic.qscale_table[left_xy[LTOP]] + 1) >> 1) <= qp_thresh) &&
 (top_xy < 0 ||
- ((qp + s->current_picture.f.qscale_table[top_xy] + 1) >> 1) <= qp_thresh)) {
- if (!FRAME_MBAFF)
+ ((qp + h->cur_pic.qscale_table[top_xy] + 1) >> 1) <= qp_thresh)) {
+ if (!FRAME_MBAFF(h))
 return 1;
 if ((left_xy[LTOP] < 0 ||
- ((qp + s->current_picture.f.qscale_table[left_xy[LBOT]] + 1) >> 1) <= qp_thresh) &&
- (top_xy < s->mb_stride ||
- ((qp + s->current_picture.f.qscale_table[top_xy - s->mb_stride] + 1) >> 1) <= qp_thresh))
+ ((qp + h->cur_pic.qscale_table[left_xy[LBOT]] + 1) >> 1) <= qp_thresh) &&
+ (top_xy < h->mb_stride ||
+ ((qp + h->cur_pic.qscale_table[top_xy - h->mb_stride] + 1) >> 1) <= qp_thresh))
 return 1;
 }
 }
 
- top_type = s->current_picture.f.mb_type[top_xy];
- left_type[LTOP] = s->current_picture.f.mb_type[left_xy[LTOP]];
- left_type[LBOT] = s->current_picture.f.mb_type[left_xy[LBOT]];
+ top_type = h->cur_pic.mb_type[top_xy];
+ left_type[LTOP] = h->cur_pic.mb_type[left_xy[LTOP]];
+ left_type[LBOT] = h->cur_pic.mb_type[left_xy[LBOT]];
 if (h->deblocking_filter == 2) {
 if (h->slice_table[top_xy] != h->slice_num)
 top_type = 0;
@@ -3455,10 +4139,10 @@
 if (IS_INTRA(mb_type))
 return 0;
 
- fill_filter_caches_inter(h, s, mb_type, top_xy, left_xy,
+ fill_filter_caches_inter(h, mb_type, top_xy, left_xy,
 top_type, left_type, mb_xy, 0);
 if (h->list_count == 2)
- fill_filter_caches_inter(h, s, mb_type, top_xy, left_xy,
+ fill_filter_caches_inter(h, mb_type, top_xy, left_xy,
 top_type, left_type, mb_xy, 1);
 
 nnz = h->non_zero_count[mb_xy];
@@ -3484,20 +4168,20 @@
 
 /* CAVLC 8x8dct requires NNZ values for residual decoding that differ
 * from what the loop filter needs */
- if (!CABAC && h->pps.transform_8x8_mode) {
+ if (!CABAC(h) && h->pps.transform_8x8_mode) {
 if (IS_8x8DCT(top_type)) {
- nnz_cache[4 + 8 * 0] =
- nnz_cache[5 + 8 * 0] = (h->cbp_table[top_xy] & 0x4000) >> 12;
- nnz_cache[6 + 8 * 0] =
- nnz_cache[7 + 8 * 0] = (h->cbp_table[top_xy] & 0x8000) >> 12;
+ nnz_cache[4 + 8 * 0] =
+ nnz_cache[5 + 8 * 0] = (h->cbp_table[top_xy] & 0x4000) >> 12;
+ nnz_cache[6 + 8 * 0] =
+ nnz_cache[7 + 8 * 0] = (h->cbp_table[top_xy] & 0x8000) >> 12;
 }
 if (IS_8x8DCT(left_type[LTOP])) {
- nnz_cache[3 + 8 * 1] =
- nnz_cache[3 + 8 * 2] = (h->cbp_table[left_xy[LTOP]] & 0x2000) >> 12; // FIXME check MBAFF
+ nnz_cache[3 + 8 * 1] =
+ nnz_cache[3 + 8 * 2] = (h->cbp_table[left_xy[LTOP]] & 0x2000) >> 12; // FIXME check MBAFF
 }
 if (IS_8x8DCT(left_type[LBOT])) {
- nnz_cache[3 + 8 * 3] =
- nnz_cache[3 + 8 * 4] = (h->cbp_table[left_xy[LBOT]] & 0x8000) >> 12; // FIXME check MBAFF
+ nnz_cache[3 + 8 * 3] =
+ nnz_cache[3 + 8 * 4] = (h->cbp_table[left_xy[LBOT]] & 0x8000) >> 12; // FIXME check MBAFF
 }
 
 if (IS_8x8DCT(mb_type)) {
@@ -3528,59 +4212,58 @@
 
 static void loop_filter(H264Context *h, int start_x, int end_x)
 {
- MpegEncContext *const s = &h->s;
 uint8_t *dest_y, *dest_cb, *dest_cr;
 int linesize, uvlinesize, mb_x, mb_y;
- const int end_mb_y = s->mb_y + FRAME_MBAFF;
+ const int end_mb_y = h->mb_y + FRAME_MBAFF(h);
 const int old_slice_type = h->slice_type;
 const int pixel_shift = h->pixel_shift;
- const int block_h = 16 >> s->chroma_y_shift;
+ const int block_h = 16 >> h->chroma_y_shift;
 
 if (h->deblocking_filter) {
 for (mb_x = start_x; mb_x < end_x; mb_x++)
- for (mb_y = end_mb_y - FRAME_MBAFF; mb_y <= end_mb_y; mb_y++) {
+ for (mb_y = end_mb_y - FRAME_MBAFF(h); mb_y <= end_mb_y; mb_y++) {
 int mb_xy, mb_type;
- mb_xy = h->mb_xy = mb_x + mb_y * s->mb_stride;
+ mb_xy = h->mb_xy = mb_x + mb_y * h->mb_stride;
 h->slice_num = h->slice_table[mb_xy];
- mb_type = s->current_picture.f.mb_type[mb_xy];
+ mb_type = h->cur_pic.mb_type[mb_xy];
 h->list_count = h->list_counts[mb_xy];
 
- if (FRAME_MBAFF)
+ if (FRAME_MBAFF(h))
 h->mb_mbaff =
 h->mb_field_decoding_flag = !!IS_INTERLACED(mb_type);
 
- s->mb_x = mb_x;
- s->mb_y = mb_y;
- dest_y = s->current_picture.f.data[0] +
- ((mb_x << pixel_shift) + mb_y * s->linesize) * 16;
- dest_cb = s->current_picture.f.data[1] +
- (mb_x << pixel_shift) * (8 << CHROMA444) +
- mb_y * s->uvlinesize * block_h;
- dest_cr = s->current_picture.f.data[2] +
- (mb_x << pixel_shift) * (8 << CHROMA444) +
- mb_y * s->uvlinesize * block_h;
+ h->mb_x = mb_x;
+ h->mb_y = mb_y;
+ dest_y = h->cur_pic.f.data[0] +
+ ((mb_x << pixel_shift) + mb_y * h->linesize) * 16;
+ dest_cb = h->cur_pic.f.data[1] +
+ (mb_x << pixel_shift) * (8 << CHROMA444(h)) +
+ mb_y * h->uvlinesize * block_h;
+ dest_cr = h->cur_pic.f.data[2] +
+ (mb_x << pixel_shift) * (8 << CHROMA444(h)) +
+ mb_y * h->uvlinesize * block_h;
 // FIXME simplify above
 
- if (MB_FIELD) {
- linesize = h->mb_linesize = s->linesize * 2;
- uvlinesize = h->mb_uvlinesize = s->uvlinesize * 2;
+ if (MB_FIELD(h)) {
+ linesize = h->mb_linesize = h->linesize * 2;
+ uvlinesize = h->mb_uvlinesize = h->uvlinesize * 2;
 if (mb_y & 1) { // FIXME move out of this function?
- dest_y -= s->linesize * 15;
- dest_cb -= s->uvlinesize * (block_h - 1);
- dest_cr -= s->uvlinesize * (block_h - 1);
+ dest_y -= h->linesize * 15;
+ dest_cb -= h->uvlinesize * (block_h - 1);
+ dest_cr -= h->uvlinesize * (block_h - 1);
 }
 } else {
- linesize = h->mb_linesize = s->linesize;
- uvlinesize = h->mb_uvlinesize = s->uvlinesize;
+ linesize = h->mb_linesize = h->linesize;
+ uvlinesize = h->mb_uvlinesize = h->uvlinesize;
 }
 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize,
 uvlinesize, 0);
 if (fill_filter_caches(h, mb_type))
 continue;
- h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.f.qscale_table[mb_xy]);
- h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.f.qscale_table[mb_xy]);
+ h->chroma_qp[0] = get_chroma_qp(h, 0, h->cur_pic.qscale_table[mb_xy]);
+ h->chroma_qp[1] = get_chroma_qp(h, 1, h->cur_pic.qscale_table[mb_xy]);
 
- if (FRAME_MBAFF) {
+ if (FRAME_MBAFF(h)) {
 ff_h264_filter_mb(h, mb_x, mb_y, dest_y, dest_cb, dest_cr,
 linesize, uvlinesize);
 } else {
@@ -3590,20 +4273,19 @@
 }
 }
 h->slice_type = old_slice_type;
- s->mb_x = end_x;
- s->mb_y = end_mb_y - FRAME_MBAFF;
- h->chroma_qp[0] = get_chroma_qp(h, 0, s->qscale);
- h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale);
+ h->mb_x = end_x;
+ h->mb_y = end_mb_y - FRAME_MBAFF(h);
+ h->chroma_qp[0] = get_chroma_qp(h, 0, h->qscale);
+ h->chroma_qp[1] = get_chroma_qp(h, 1, h->qscale);
 }
 
 static void predict_field_decoding_flag(H264Context *h)
 {
- MpegEncContext *const s = &h->s;
- const int mb_xy = s->mb_x + s->mb_y * s->mb_stride;
+ const int mb_xy = h->mb_x + h->mb_y * h->mb_stride;
 int mb_type = (h->slice_table[mb_xy - 1] == h->slice_num) ?
- s->current_picture.f.mb_type[mb_xy - 1] :
- (h->slice_table[mb_xy - s->mb_stride] == h->slice_num) ?
- s->current_picture.f.mb_type[mb_xy - s->mb_stride] : 0;
+ h->cur_pic.mb_type[mb_xy - 1] :
+ (h->slice_table[mb_xy - h->mb_stride] == h->slice_num) ?
+ h->cur_pic.mb_type[mb_xy - h->mb_stride] : 0;
 h->mb_mbaff = h->mb_field_decoding_flag = IS_INTERLACED(mb_type) ? 1 : 0;
 }
 
@@ -3612,11 +4294,10 @@
 */
 static void decode_finish_row(H264Context *h)
 {
- MpegEncContext *const s = &h->s;
- int top = 16 * (s->mb_y >> FIELD_PICTURE);
- int pic_height = 16 * s->mb_height >> FIELD_PICTURE;
- int height = 16 << FRAME_MBAFF;
- int deblock_border = (16 + 4) << FRAME_MBAFF;
+ int top = 16 * (h->mb_y >> FIELD_PICTURE(h));
+ int pic_height = 16 * h->mb_height >> FIELD_PICTURE(h);
+ int height = 16 << FRAME_MBAFF(h);
+ int deblock_border = (16 + 4) << FRAME_MBAFF(h);
 
 if (h->deblocking_filter) {
 if ((top + height) >= pic_height)
@@ -3624,47 +4305,54 @@
 top -= deblock_border;
 }
 
- if (top >= pic_height || (top + height) < h->emu_edge_height)
+ if (top >= pic_height || (top + height) < 0)
 return;
 
 height = FFMIN(height, pic_height - top);
- if (top < h->emu_edge_height) {
+ if (top < 0) {
 height = top + height;
 top = 0;
 }
 
- ff_draw_horiz_band(s, top, height);
+ ff_h264_draw_horiz_band(h, top, height);
 
- if (s->droppable)
+ if (h->droppable)
 return;
 
- ff_thread_report_progress(&s->current_picture_ptr->f, top + height - 1,
- s->picture_structure == PICT_BOTTOM_FIELD);
+ ff_thread_report_progress(&h->cur_pic_ptr->tf, top + height - 1,
+ h->picture_structure == PICT_BOTTOM_FIELD);
+}
+
+static void er_add_slice(H264Context *h, int startx, int starty,
+ int endx, int endy, int status)
+{
+#if CONFIG_ERROR_RESILIENCE
+ ERContext *er = &h->er;
+
+ er->ref_count = h->ref_count[0];
+ ff_er_add_slice(er, startx, starty, endx, endy, status);
+#endif
 }
 
 static int decode_slice(struct AVCodecContext *avctx, void *arg)
 {
 H264Context *h = *(void **)arg;
- MpegEncContext *const s = &h->s;
- const int part_mask = s->partitioned_frame ? (ER_AC_END | ER_AC_ERROR)
- : 0x7F;
- int lf_x_start = s->mb_x;
-
- s->mb_skip_run = -1;
-
- h->is_complex = FRAME_MBAFF || s->picture_structure != PICT_FRAME ||
- s->codec_id != AV_CODEC_ID_H264 ||
- (CONFIG_GRAY && (s->flags & CODEC_FLAG_GRAY));
+ int lf_x_start = h->mb_x;
+
+ h->mb_skip_run = -1;
+
+ h->is_complex = FRAME_MBAFF(h) || h->picture_structure != PICT_FRAME ||
+ avctx->codec_id != AV_CODEC_ID_H264 ||
+ (CONFIG_GRAY && (h->flags & CODEC_FLAG_GRAY));
 
 if (h->pps.cabac) {
 /* realign */
- align_get_bits(&s->gb);
+ align_get_bits(&h->gb);
 
 /* init cabac */
- ff_init_cabac_states(&h->cabac);
 ff_init_cabac_decoder(&h->cabac,
- s->gb.buffer + get_bits_count(&s->gb) / 8,
- (get_bits_left(&s->gb) + 7) / 8);
+ h->gb.buffer + get_bits_count(&h->gb) / 8,
+ (get_bits_left(&h->gb) + 7) / 8);
 
 ff_h264_init_cabac_states(h);
 
@@ -3678,54 +4366,54 @@
 ff_h264_hl_decode_mb(h);
 
 // FIXME optimal? or let mb_decode decode 16x32 ?
- if (ret >= 0 && FRAME_MBAFF) {
- s->mb_y++;
+ if (ret >= 0 && FRAME_MBAFF(h)) {
+ h->mb_y++;
 
 ret = ff_h264_decode_mb_cabac(h);
 
 if (ret >= 0)
 ff_h264_hl_decode_mb(h);
- s->mb_y--;
+ h->mb_y--;
 }
 eos = get_cabac_terminate(&h->cabac);
 
- if ((s->workaround_bugs & FF_BUG_TRUNCATED) &&
+ if ((h->workaround_bugs & FF_BUG_TRUNCATED) &&
 h->cabac.bytestream > h->cabac.bytestream_end + 2) {
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x - 1,
- s->mb_y, ER_MB_END & part_mask);
- if (s->mb_x >= lf_x_start)
- loop_filter(h, lf_x_start, s->mb_x + 1);
+ er_add_slice(h, h->resync_mb_x, h->resync_mb_y, h->mb_x - 1,
+ h->mb_y, ER_MB_END);
+ if (h->mb_x >= lf_x_start)
+ loop_filter(h, lf_x_start, h->mb_x + 1);
 return 0;
 }
 if (ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 2) {
- av_log(h->s.avctx, AV_LOG_ERROR,
- "error while decoding MB %d %d, bytestream (%td)\n",
- s->mb_x, s->mb_y,
+ av_log(h->avctx, AV_LOG_ERROR,
+ "error while decoding MB %d %d, bytestream %td\n",
+ h->mb_x, h->mb_y,
 h->cabac.bytestream_end - h->cabac.bytestream);
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x,
- s->mb_y, ER_MB_ERROR & part_mask);
- return -1;
+ er_add_slice(h, h->resync_mb_x, h->resync_mb_y, h->mb_x,
+ h->mb_y, ER_MB_ERROR);
+ return AVERROR_INVALIDDATA;
 }
 
- if (++s->mb_x >= s->mb_width) {
- loop_filter(h, lf_x_start, s->mb_x);
- s->mb_x = lf_x_start = 0;
+ if (++h->mb_x >= h->mb_width) {
+ loop_filter(h, lf_x_start, h->mb_x);
+ h->mb_x = lf_x_start = 0;
 decode_finish_row(h);
- ++s->mb_y;
- if (FIELD_OR_MBAFF_PICTURE) {
- ++s->mb_y;
- if (FRAME_MBAFF && s->mb_y < s->mb_height)
+ ++h->mb_y;
+ if (FIELD_OR_MBAFF_PICTURE(h)) {
+ ++h->mb_y;
+ if (FRAME_MBAFF(h) && h->mb_y < h->mb_height)
 predict_field_decoding_flag(h);
 }
 }
 
- if (eos || s->mb_y >= s->mb_height) {
- tprintf(s->avctx, "slice end %d %d\n",
- get_bits_count(&s->gb), s->gb.size_in_bits);
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x - 1,
- s->mb_y, ER_MB_END & part_mask);
- if (s->mb_x > lf_x_start)
- loop_filter(h, lf_x_start, s->mb_x);
+ if (eos || h->mb_y >= h->mb_height) {
+ tprintf(h->avctx, "slice end %d %d\n",
+ get_bits_count(&h->gb), h->gb.size_in_bits);
+ er_add_slice(h, h->resync_mb_x, h->resync_mb_y, h->mb_x - 1,
+ h->mb_y, ER_MB_END);
+ if (h->mb_x > lf_x_start)
+ loop_filter(h, lf_x_start, h->mb_x);
 return 0;
 }
 }
@@ -3737,69 +4425,70 @@
 ff_h264_hl_decode_mb(h);
 
 // FIXME optimal? or let mb_decode decode 16x32 ?
- if (ret >= 0 && FRAME_MBAFF) {
- s->mb_y++;
+ if (ret >= 0 && FRAME_MBAFF(h)) {
+ h->mb_y++;
 ret = ff_h264_decode_mb_cavlc(h);
 
 if (ret >= 0)
 ff_h264_hl_decode_mb(h);
- s->mb_y--;
+ h->mb_y--;
 }
 
 if (ret < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
- "error while decoding MB %d %d\n", s->mb_x, s->mb_y);
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x,
- s->mb_y, ER_MB_ERROR & part_mask);
- return -1;
+ av_log(h->avctx, AV_LOG_ERROR,
+ "error while decoding MB %d %d\n", h->mb_x, h->mb_y);
+ er_add_slice(h, h->resync_mb_x, h->resync_mb_y, h->mb_x,
+ h->mb_y, ER_MB_ERROR);
+ return ret;
 }
 
- if (++s->mb_x >= s->mb_width) {
- loop_filter(h, lf_x_start, s->mb_x);
- s->mb_x = lf_x_start = 0;
+ if (++h->mb_x >= h->mb_width) {
+ loop_filter(h, lf_x_start, h->mb_x);
+ h->mb_x = lf_x_start = 0;
 decode_finish_row(h);
- ++s->mb_y;
- if (FIELD_OR_MBAFF_PICTURE) {
- ++s->mb_y;
- if (FRAME_MBAFF && s->mb_y < s->mb_height)
+ ++h->mb_y;
+ if (FIELD_OR_MBAFF_PICTURE(h)) {
+ ++h->mb_y;
+ if (FRAME_MBAFF(h) && h->mb_y < h->mb_height)
 predict_field_decoding_flag(h);
 }
- if (s->mb_y >= s->mb_height) {
- tprintf(s->avctx, "slice end %d %d\n",
- get_bits_count(&s->gb), s->gb.size_in_bits);
-
- if (get_bits_left(&s->gb) == 0) {
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y,
- s->mb_x - 1, s->mb_y,
- ER_MB_END & part_mask);
+ if (h->mb_y >= h->mb_height) {
+ tprintf(h->avctx, "slice end %d %d\n",
+ get_bits_count(&h->gb), h->gb.size_in_bits);
+
+ if (get_bits_left(&h->gb) == 0) {
+ er_add_slice(h, h->resync_mb_x, h->resync_mb_y,
+ h->mb_x - 1, h->mb_y,
+ ER_MB_END);
 
 return 0;
 } else {
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y,
- s->mb_x - 1, s->mb_y,
- ER_MB_END & part_mask);
+ er_add_slice(h, h->resync_mb_x, h->resync_mb_y,
+ h->mb_x - 1, h->mb_y,
+ ER_MB_END);
 
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 }
 
- if (get_bits_left(&s->gb) <= 0 && s->mb_skip_run <= 0) {
- tprintf(s->avctx, "slice end %d %d\n",
- get_bits_count(&s->gb), s->gb.size_in_bits);
- if (get_bits_left(&s->gb) == 0) {
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y,
- s->mb_x - 1, s->mb_y,
- ER_MB_END & part_mask);
- if (s->mb_x > lf_x_start)
- loop_filter(h, lf_x_start, s->mb_x);
+ if (get_bits_left(&h->gb) <= 0 && h->mb_skip_run <= 0) {
+ tprintf(h->avctx, "slice end %d %d\n",
+ get_bits_count(&h->gb), h->gb.size_in_bits);
+
+ if (get_bits_left(&h->gb) == 0) {
+ er_add_slice(h, h->resync_mb_x, h->resync_mb_y,
+ h->mb_x - 1, h->mb_y,
+ ER_MB_END);
+ if (h->mb_x > lf_x_start)
+ loop_filter(h, lf_x_start, h->mb_x);
 
 return 0;
 } else {
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x,
- s->mb_y, ER_MB_ERROR & part_mask);
+ er_add_slice(h, h->resync_mb_x, h->resync_mb_y, h->mb_x,
+ h->mb_y, ER_MB_ERROR);
 
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 }
@@ -3812,23 +4501,26 @@
 * @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)
 {
- MpegEncContext *const s = &h->s;
- AVCodecContext *const avctx = s->avctx;
+ AVCodecContext *const avctx = h->avctx;
 H264Context *hx;
 int i;
 
- if (s->avctx->hwaccel ||
- s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
+ if (h->mb_y >= h->mb_height) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "Input contains more MB rows than the frame height.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (h->avctx->hwaccel)
 return 0;
 if (context_count == 1) {
 return decode_slice(avctx, &h);
 } else {
 for (i = 1; i < context_count; i++) {
- hx = h->thread_context[i];
- hx->s.err_recognition = avctx->err_recognition;
- hx->s.error_count = 0;
+ hx = h->thread_context[i];
+ hx->er.error_count = 0;
 }
 
 avctx->execute(avctx, decode_slice, h->thread_context,
@@ -3836,12 +4528,12 @@
 
 /* pull back stuff from slices to master context */
 hx = h->thread_context[context_count - 1];
- s->mb_x = hx->s.mb_x;
- s->mb_y = hx->s.mb_y;
- s->droppable = hx->s.droppable;
- s->picture_structure = hx->s.picture_structure;
+ h->mb_x = hx->mb_x;
+ h->mb_y = hx->mb_y;
+ h->droppable = hx->droppable;
+ h->picture_structure = hx->picture_structure;
 for (i = 1; i < context_count; i++)
- h->s.error_count += h->thread_context[i]->s.error_count;
+ h->er.error_count += h->thread_context[i]->er.error_count;
 }
 
 return 0;
@@ -3850,21 +4542,21 @@
 static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size,
 int parse_extradata)
 {
- MpegEncContext *const s = &h->s;
- AVCodecContext *const avctx = s->avctx;
+ 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
 int nal_index;
+ int ret = 0;
 
- h->max_contexts = s->slice_context_count;
- if (!(s->flags2 & CODEC_FLAG2_CHUNKS)) {
+ h->max_contexts = h->slice_context_count;
+ if (!(avctx->flags2 & CODEC_FLAG2_CHUNKS)) {
 h->current_slice = 0;
- if (!s->first_field)
- s->current_picture_ptr = NULL;
+ if (!h->first_field)
+ h->cur_pic_ptr = NULL;
 ff_h264_reset_sei(h);
 }
 
@@ -3888,7 +4580,7 @@
 for (i = 0; i < h->nal_length_size; i++)
 nalsize = (nalsize << 8) | buf[buf_index++];
 if (nalsize <= 0 || nalsize > buf_size - buf_index) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
 "AVC: nal size %d\n", nalsize);
 break;
 }
@@ -3917,29 +4609,29 @@
 ptr = ff_h264_decode_nal(hx, buf + buf_index, &dst_length,
 &consumed, next_avc - buf_index);
 if (ptr == NULL || dst_length < 0) {
- buf_index = -1;
+ ret = -1;
 goto end;
 }
 i = buf_index + consumed;
- if ((s->workaround_bugs & FF_BUG_AUTODETECT) && i + 3 < next_avc &&
+ if ((h->workaround_bugs & FF_BUG_AUTODETECT) && i + 3 < next_avc &&
 buf[i] == 0x00 && buf[i + 1] == 0x00 &&
 buf[i + 2] == 0x01 && buf[i + 3] == 0xE0)
- s->workaround_bugs |= FF_BUG_TRUNCATED;
+ h->workaround_bugs |= FF_BUG_TRUNCATED;
 
- if (!(s->workaround_bugs & FF_BUG_TRUNCATED))
- while (ptr[dst_length - 1] == 0 && dst_length > 0)
+ if (!(h->workaround_bugs & FF_BUG_TRUNCATED))
+ 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 (s->avctx->debug & FF_DEBUG_STARTCODE)
- av_log(h->s.avctx, AV_LOG_DEBUG,
+ if (h->avctx->debug & FF_DEBUG_STARTCODE)
+ av_log(h->avctx, AV_LOG_DEBUG,
 "NAL %d at %d/%d length %d\n",
 hx->nal_unit_type, buf_index, buf_size, dst_length);
 
 if (h->is_avc && (nalsize != consumed) && nalsize)
- av_log(h->s.avctx, AV_LOG_DEBUG,
+ av_log(h->avctx, AV_LOG_DEBUG,
 "AVC: Consumed only %d bytes instead of %d\n",
 consumed, nalsize);
 
@@ -3959,15 +4651,16 @@
 case NAL_DPA:
 case NAL_IDR_SLICE:
 case NAL_SLICE:
- init_get_bits(&hx->s.gb, ptr, bit_length);
- if (!get_ue_golomb(&hx->s.gb))
+ init_get_bits(&hx->gb, ptr, bit_length);
+ if (!get_ue_golomb(&hx->gb))
 nals_needed = nal_index;
 }
 continue;
 }
 
- // FIXME do not discard SEI id
- if (avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0)
+ if (avctx->skip_frame >= AVDISCARD_NONREF &&
+ h->nal_ref_idc == 0 &&
+ h->nal_unit_type != NAL_SEI)
 continue;
 
 again:
@@ -3975,46 +4668,62 @@
 * parsing. Decoding slices is not possible in codec init
 * with frame-mt */
 if (parse_extradata && HAVE_THREADS &&
- (s->avctx->active_thread_type & FF_THREAD_FRAME) &&
+ (h->avctx->active_thread_type & FF_THREAD_FRAME) &&
 (hx->nal_unit_type != NAL_PPS &&
 hx->nal_unit_type != NAL_SPS)) {
- av_log(avctx, AV_LOG_INFO, "Ignoring NAL unit %d during "
- "extradata parsing\n", hx->nal_unit_type);
+ if (hx->nal_unit_type < NAL_AUD ||
+ hx->nal_unit_type > NAL_AUXILIARY_SLICE)
+ av_log(avctx, AV_LOG_INFO,
+ "Ignoring NAL unit %d during extradata parsing\n",
+ hx->nal_unit_type);
 hx->nal_unit_type = NAL_FF_IGNORE;
 }
 err = 0;
 switch (hx->nal_unit_type) {
 case NAL_IDR_SLICE:
 if (h->nal_unit_type != NAL_IDR_SLICE) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
 "Invalid mix of idr and non-idr slices\n");
- buf_index = -1;
+ ret = -1;
 goto end;
 }
 idr(h); // FIXME ensure we don't lose some frames if there is reordering
 case NAL_SLICE:
- init_get_bits(&hx->s.gb, ptr, bit_length);
- hx->intra_gb_ptr =
- hx->inter_gb_ptr = &hx->s.gb;
- hx->s.data_partitioning = 0;
+ init_get_bits(&hx->gb, ptr, bit_length);
+ hx->intra_gb_ptr =
+ hx->inter_gb_ptr = &hx->gb;
+ hx->data_partitioning = 0;
 
 if ((err = decode_slice_header(hx, h)))
 break;
 
- s->current_picture_ptr->f.key_frame |=
+ if (h->sei_recovery_frame_cnt >= 0 && h->recovery_frame < 0) {
+ h->recovery_frame = (h->frame_num + h->sei_recovery_frame_cnt) &
+ ((1 << h->sps.log2_max_frame_num) - 1);
+ }
+
+ h->cur_pic_ptr->f.key_frame |=
 (hx->nal_unit_type == NAL_IDR_SLICE) ||
 (h->sei_recovery_frame_cnt >= 0);
 
+ if (hx->nal_unit_type == NAL_IDR_SLICE ||
+ h->recovery_frame == h->frame_num) {
+ h->recovery_frame = -1;
+ h->cur_pic_ptr->recovered = 1;
+ }
+ // 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->cur_pic_ptr->recovered |= !!(h->frame_recovered & FRAME_RECOVERED_IDR);
+
 if (h->current_slice == 1) {
- if (!(s->flags2 & CODEC_FLAG2_CHUNKS))
+ if (!(avctx->flags2 & CODEC_FLAG2_CHUNKS))
 decode_postinit(h, nal_index >= nals_needed);
 
- if (s->avctx->hwaccel &&
- s->avctx->hwaccel->start_frame(s->avctx, NULL, 0) < 0)
- return -1;
- if (CONFIG_H264_VDPAU_DECODER &&
- s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
- ff_vdpau_h264_picture_start(s);
+ if (h->avctx->hwaccel &&
+ (ret = h->avctx->hwaccel->start_frame(h->avctx, NULL, 0)) < 0)
+ return ret;
 }
 
 if (hx->redundant_pic_count == 0 &&
@@ -4026,31 +4735,36 @@
 hx->slice_type_nos == AV_PICTURE_TYPE_I) &&
 avctx->skip_frame < AVDISCARD_ALL) {
 if (avctx->hwaccel) {
- if (avctx->hwaccel->decode_slice(avctx,
- &buf[buf_index - consumed],
- consumed) < 0)
- return -1;
- } else if (CONFIG_H264_VDPAU_DECODER &&
- s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) {
- static const uint8_t start_code[] = {
- 0x00, 0x00, 0x01 };
- ff_vdpau_add_data_chunk(s, start_code,
- sizeof(start_code));
- ff_vdpau_add_data_chunk(s, &buf[buf_index - consumed],
- consumed);
+ ret = avctx->hwaccel->decode_slice(avctx,
+ &buf[buf_index - consumed],
+ consumed);
+ if (ret < 0)
+ return ret;
 } else
 context_count++;
 }
 break;
 case NAL_DPA:
- init_get_bits(&hx->s.gb, ptr, bit_length);
+ 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->s.data_partitioning = 1;
+ hx->data_partitioning = 1;
 break;
 case NAL_DPB:
 init_get_bits(&hx->intra_gb, ptr, bit_length);
@@ -4062,9 +4776,8 @@
 
 if (hx->redundant_pic_count == 0 &&
 hx->intra_gb_ptr &&
- hx->s.data_partitioning &&
- s->current_picture_ptr &&
- s->context_initialized &&
+ hx->data_partitioning &&
+ h->cur_pic_ptr && h->context_initialized &&
 (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc) &&
 (avctx->skip_frame < AVDISCARD_BIDIR ||
 hx->slice_type_nos != AV_PICTURE_TYPE_B) &&
@@ -4074,27 +4787,27 @@
 context_count++;
 break;
 case NAL_SEI:
- init_get_bits(&s->gb, ptr, bit_length);
+ init_get_bits(&h->gb, ptr, bit_length);
 ff_h264_decode_sei(h);
 break;
 case NAL_SPS:
- init_get_bits(&s->gb, ptr, bit_length);
- if (ff_h264_decode_seq_parameter_set(h) < 0 &&
- h->is_avc && (nalsize != consumed) && nalsize) {
- av_log(h->s.avctx, AV_LOG_DEBUG,
+ init_get_bits(&h->gb, ptr, bit_length);
+ ret = ff_h264_decode_seq_parameter_set(h);
+ if (ret < 0 && h->is_avc && (nalsize != consumed) && nalsize) {
+ av_log(h->avctx, AV_LOG_DEBUG,
 "SPS decoding failure, trying again with the complete NAL\n");
- init_get_bits(&s->gb, buf + buf_index + 1 - consumed,
+ init_get_bits(&h->gb, buf + buf_index + 1 - consumed,
 8 * (nalsize - 1));
 ff_h264_decode_seq_parameter_set(h);
 }
 
- if (h264_set_parameter_from_sps(h) < 0) {
- buf_index = -1;
+ ret = h264_set_parameter_from_sps(h);
+ if (ret < 0)
 goto end;
- }
+
 break;
 case NAL_PPS:
- init_get_bits(&s->gb, ptr, bit_length);
+ init_get_bits(&h->gb, ptr, bit_length);
 ff_h264_decode_picture_parameter_set(h, bit_length);
 break;
 case NAL_AUD:
@@ -4116,9 +4829,10 @@
 context_count = 0;
 }
 
- if (err < 0)
- av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n");
- else if (err == 1) {
+ if (err < 0) {
+ av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n");
+ 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
@@ -4135,19 +4849,18 @@
 
 end:
 /* clean up */
- if (s->current_picture_ptr && s->current_picture_ptr->owner2 == s &&
- !s->droppable) {
- ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX,
- s->picture_structure == PICT_BOTTOM_FIELD);
+ if (h->cur_pic_ptr && !h->droppable) {
+ ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX,
+ h->picture_structure == PICT_BOTTOM_FIELD);
 }
 
- return buf_index;
+ return (ret < 0) ? ret : buf_index;
 }
 
 /**
 * Return the number of bytes consumed for building the current frame.
 */
-static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size)
+static int get_consumed_bytes(int pos, int buf_size)
 {
 if (pos == 0)
 pos = 1; // avoid infinite loops (i doubt that is needed but ...)
@@ -4157,18 +4870,40 @@
 return pos;
 }
 
-static int decode_frame(AVCodecContext *avctx, void *data,
- int *got_frame, AVPacket *avpkt)
+static int output_frame(H264Context *h, AVFrame *dst, AVFrame *src)
+{
+ int i;
+ int ret = av_frame_ref(dst, src);
+ if (ret < 0)
+ return ret;
+
+ if (!h->sps.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;
+ int off = ((h->sps.crop_left >> hshift) << h->pixel_shift) +
+ (h->sps.crop_top >> vshift) * dst->linesize[i];
+ dst->data[i] += off;
+ }
+ return 0;
+}
+
+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;
 H264Context *h = avctx->priv_data;
- MpegEncContext *s = &h->s;
 AVFrame *pict = data;
 int buf_index = 0;
+ int ret;
 
- s->flags = avctx->flags;
- s->flags2 = avctx->flags2;
+ 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 */
 out:
@@ -4176,7 +4911,7 @@
 Picture *out;
 int i, out_idx;
 
- s->current_picture_ptr = NULL;
+ h->cur_pic_ptr = NULL;
 
 // FIXME factorize this with the output code below
 out = h->delayed_pic[0];
@@ -4195,8 +4930,10 @@
 h->delayed_pic[i] = h->delayed_pic[i + 1];
 
 if (out) {
+ ret = output_frame(h, pict, &out->f);
+ if (ret < 0)
+ return ret;
 *got_frame = 1;
- *pict = out->f;
 }
 
 return buf_index;
@@ -4204,41 +4941,43 @@
 
 buf_index = decode_nal_units(h, buf, buf_size, 0);
 if (buf_index < 0)
- return -1;
+ return AVERROR_INVALIDDATA;
 
- if (!s->current_picture_ptr && h->nal_unit_type == NAL_END_SEQUENCE) {
+ if (!h->cur_pic_ptr && h->nal_unit_type == NAL_END_SEQUENCE) {
 buf_size = 0;
 goto out;
 }
 
- if (!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr) {
+ if (!(avctx->flags2 & CODEC_FLAG2_CHUNKS) && !h->cur_pic_ptr) {
 if (avctx->skip_frame >= AVDISCARD_NONREF)
 return 0;
 av_log(avctx, AV_LOG_ERROR, "no frame!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- if (!(s->flags2 & CODEC_FLAG2_CHUNKS) ||
- (s->mb_y >= s->mb_height && s->mb_height)) {
- if (s->flags2 & CODEC_FLAG2_CHUNKS)
+ if (!(avctx->flags2 & CODEC_FLAG2_CHUNKS) ||
+ (h->mb_y >= h->mb_height && h->mb_height)) {
+ if (avctx->flags2 & CODEC_FLAG2_CHUNKS)
 decode_postinit(h, 1);
 
 field_end(h, 0);
- h->context_reinitialized = 0;
 
- if (!h->next_output_pic) {
- /* Wait for second field. */
- *got_frame = 0;
- } else {
+ *got_frame = 0;
+ if (h->next_output_pic && ((avctx->flags & CODEC_FLAG_OUTPUT_CORRUPT) ||
+ 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->f);
+ if (ret < 0)
+ return ret;
 *got_frame = 1;
- *pict = h->next_output_pic->f;
 }
 }
 
- assert(pict->data[0] || !*got_frame);
- ff_print_debug_info(s, pict);
+ assert(pict->buf[0] || !*got_frame);
 
- return get_consumed_bytes(s, buf_index, buf_size);
+ return get_consumed_bytes(buf_index, buf_size);
 }
 
 av_cold void ff_h264_free_context(H264Context *h)
@@ -4256,14 +4995,11 @@
 
 static av_cold int h264_decode_end(AVCodecContext *avctx)
 {
- H264Context *h = avctx->priv_data;
- MpegEncContext *s = &h->s;
+ H264Context *h = avctx->priv_data;
 
 ff_h264_free_context(h);
 
- ff_MPV_common_end(s);
-
- // memset(h, 0, sizeof(H264Context));
+ unref_picture(h, &h->cur_pic);
 
 return 0;
 }
@@ -4287,36 +5023,18 @@
 
 AVCodec ff_h264_decoder = {
 .name = "h264",
+ .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_H264,
 .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,
 .flush = flush_dpb,
- .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
 .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy),
 .update_thread_context = ONLY_IF_THREADS_ENABLED(decode_update_thread_context),
 .profiles = NULL_IF_CONFIG_SMALL(profiles),
 };
-
-#if CONFIG_H264_VDPAU_DECODER
-AVCodec ff_h264_vdpau_decoder = {
- .name = "h264_vdpau",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_H264,
- .priv_data_size = sizeof(H264Context),
- .init = ff_h264_decode_init,
- .close = h264_decode_end,
- .decode = decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU,
- .flush = flush_dpb,
- .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"),
- .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_VDPAU_H264,
- AV_PIX_FMT_NONE},
- .profiles = NULL_IF_CONFIG_SMALL(profiles),
-};
-#endif

libav-v9.6.tar.bz2/libavcodec/h264.h -> libav-v10.1.tar.bz2/libavcodec/h264.h Changed

@@ -29,16 +29,16 @@
 #define AVCODEC_H264_H
 
 #include "libavutil/intreadwrite.h"
-#include "dsputil.h"
 #include "cabac.h"
+#include "error_resilience.h"
+#include "get_bits.h"
 #include "mpegvideo.h"
+#include "h264chroma.h"
 #include "h264dsp.h"
 #include "h264pred.h"
+#include "h264qpel.h"
 #include "rectangle.h"
 
-#define interlaced_dct interlaced_dct_is_a_bad_name
-#define mb_intra mb_intra_is_not_initialized_see_mb_type
-
 #define MAX_SPS_COUNT 32
 #define MAX_PPS_COUNT 256
 
@@ -59,19 +59,19 @@
 #define MAX_SLICES 16
 
 #ifdef ALLOW_INTERLACE
-#define MB_MBAFF h->mb_mbaff
-#define MB_FIELD h->mb_field_decoding_flag
-#define FRAME_MBAFF h->mb_aff_frame
-#define FIELD_PICTURE (s->picture_structure != PICT_FRAME)
+#define MB_MBAFF(h) h->mb_mbaff
+#define MB_FIELD(h) h->mb_field_decoding_flag
+#define FRAME_MBAFF(h) h->mb_aff_frame
+#define FIELD_PICTURE(h) (h->picture_structure != PICT_FRAME)
 #define LEFT_MBS 2
 #define LTOP 0
 #define LBOT 1
 #define LEFT(i) (i)
 #else
-#define MB_MBAFF 0
-#define MB_FIELD 0
-#define FRAME_MBAFF 0
-#define FIELD_PICTURE 0
+#define MB_MBAFF(h) 0
+#define MB_FIELD(h) 0
+#define FRAME_MBAFF(h) 0
+#define FIELD_PICTURE(h) 0
 #undef IS_INTERLACED
 #define IS_INTERLACED(mb_type) 0
 #define LEFT_MBS 1
@@ -79,14 +79,14 @@
 #define LBOT 0
 #define LEFT(i) 0
 #endif
-#define FIELD_OR_MBAFF_PICTURE (FRAME_MBAFF || FIELD_PICTURE)
+#define FIELD_OR_MBAFF_PICTURE(h) (FRAME_MBAFF(h) || FIELD_PICTURE(h))
 
 #ifndef CABAC
-#define CABAC h->pps.cabac
+#define CABAC(h) h->pps.cabac
 #endif
 
-#define CHROMA422 (h->sps.chroma_format_idc == 2)
-#define CHROMA444 (h->sps.chroma_format_idc == 3)
+#define CHROMA422(h) (h->sps.chroma_format_idc == 2)
+#define CHROMA444(h) (h->sps.chroma_format_idc == 3)
 
 #define EXTENDED_SAR 255
 
@@ -99,19 +99,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,
 };
@@ -120,10 +120,11 @@
 * 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_UNREGISTERED = 5, ///< unregistered user data
- SEI_TYPE_RECOVERY_POINT = 6 ///< recovery point (frame # to decoder sync)
+ SEI_TYPE_RECOVERY_POINT = 6, ///< recovery point (frame # to decoder sync)
+ SEI_TYPE_FRAME_PACKING = 45, ///< frame packing arrangement
 } SEI_Type;
 
 /**
@@ -145,6 +146,7 @@
 * Sequence parameter set
 */
 typedef struct SPS {
+ unsigned int sps_id;
 int profile_idc;
 int level_idc;
 int chroma_format_idc;
@@ -164,6 +166,8 @@
 int mb_aff; ///< mb_adaptive_frame_field_flag
 int direct_8x8_inference_flag;
 int crop; ///< frame_cropping_flag
+
+ /* those 4 are already in luma samples */
 unsigned int crop_left; ///< frame_cropping_rect_left_offset
 unsigned int crop_right; ///< frame_cropping_rect_right_offset
 unsigned int crop_top; ///< frame_cropping_rect_top_offset
@@ -252,13 +256,41 @@
 * H264Context
 */
 typedef struct H264Context {
- MpegEncContext s;
+ AVCodecContext *avctx;
+ DSPContext dsp;
+ VideoDSPContext vdsp;
 H264DSPContext h264dsp;
+ H264ChromaContext h264chroma;
+ H264QpelContext h264qpel;
+ MotionEstContext me;
+ ParseContext parse_context;
+ GetBitContext gb;
+ ERContext er;
+
+ Picture *DPB;
+ Picture *cur_pic_ptr;
+ Picture cur_pic;
+
 int pixel_shift; ///< 0 for 8-bit H264, 1 for high-bit-depth H264
 int chroma_qp[2]; // QPc
 
 int qp_thresh; ///< QP threshold to skip loopfilter
 
+ /* coded dimensions -- 16 * mb w/h */
+ int width, height;
+ ptrdiff_t linesize, uvlinesize;
+ int chroma_x_shift, chroma_y_shift;
+
+ int qscale;
+ int droppable;
+ int data_partitioning;
+ int coded_picture_number;
+ int low_delay;
+
+ int context_initialized;
+ int flags;
+ int workaround_bugs;
+
 int prev_mb_skipped;
 int next_mb_skipped;
 
@@ -319,19 +351,11 @@
 uint32_t *mb2br_xy;
 int b_stride; // FIXME use s->b4_stride
 
- int mb_linesize; ///< may be equal to s->linesize or s->linesize * 2, for mbaff
- int mb_uvlinesize;
+ ptrdiff_t mb_linesize; ///< may be equal to s->linesize or s->linesize * 2, for mbaff
+ ptrdiff_t mb_uvlinesize;
 
- int emu_edge_width;
- int emu_edge_height;
-
- unsigned current_sps_id; ///< id of the current SPS
 SPS sps; ///< current sps
-
- /**
- * current pps
- */
- PPS pps; // FIXME move to Picture perhaps? (->no) do we need that?
+ PPS pps; ///< current pps
 
 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];
@@ -348,6 +372,8 @@
 int mb_aff_frame;
 int mb_field_decoding_flag;
 int mb_mbaff; ///< mb_aff_frame && mb_field_decoding_flag
+ int picture_structure;
+ int first_field;
 
 DECLARE_ALIGNED(8, uint16_t, sub_mb_type)[4];
 
@@ -386,9 +412,10 @@
 GetBitContext *intra_gb_ptr;
 GetBitContext *inter_gb_ptr;
 
- DECLARE_ALIGNED(16, DCTELEM, mb)[16 * 48 * 2]; ///< as a dct coeffecient is int32_t in high depth, we need to reserve twice the space.
- DECLARE_ALIGNED(16, DCTELEM, mb_luma_dc)[3][16 * 2];
- DCTELEM mb_padding[256 * 2]; ///< as mb is addressed by scantable[i] and scantable is uint8_t we can either check that i is not too large or ensure that there is some unused stuff after mb
+ const uint8_t *intra_pcm_ptr;
+ DECLARE_ALIGNED(16, int16_t, mb)[16 * 48 * 2]; ///< as a dct coeffecient is int32_t in high depth, we need to reserve twice the space.
+ DECLARE_ALIGNED(16, int16_t, mb_luma_dc)[3][16 * 2];
+ int16_t mb_padding[256 * 2]; ///< as mb is addressed by scantable[i] and scantable is uint8_t we can either check that i is not too large or ensure that there is some unused stuff after mb
 
 /**
 * Cabac
@@ -424,6 +451,13 @@
 
 int x264_build;
 
+ int mb_x, mb_y;
+ int resync_mb_x;
+ int resync_mb_y;
+ int mb_skip_run;
+ int mb_height, mb_width;
+ int mb_stride;
+ int mb_num;
 int mb_xy;
 
 int is_complex;
@@ -448,7 +482,8 @@
 int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4)
 int got_first; ///< this flag is != 0 if we've parsed a frame
 
- int context_reinitialized;
+ int bit_depth_luma; ///< luma bit depth from sps to detect changes
+ int chroma_format_idc; ///< chroma format from sps to detect changes
 
 SPS *sps_buffers[MAX_SPS_COUNT];
 PPS *pps_buffers[MAX_PPS_COUNT];
@@ -481,9 +516,9 @@
 
 int redundant_pic_count;
 
+ Picture default_ref_list[2][32]; ///< base reference list for all slices of a coded picture
 Picture *short_ref[32];
 Picture *long_ref[32];
- Picture default_ref_list[2][32]; ///< base reference list for all slices of a coded picture
 Picture *delayed_pic[MAX_DELAYED_PIC_COUNT + 2]; // FIXME size?
 int last_pocs[MAX_DELAYED_PIC_COUNT];
 Picture *next_output_pic;
@@ -521,12 +556,16 @@
 */
 int max_contexts;
 
+ int slice_context_count;
+
 /**
 * 1 if the single thread fallback warning has already been
 * displayed, 0 otherwise.
 */
 int single_decode_warning;
 
+ enum AVPictureType pict_type;
+
 int last_slice_type;
 /** @} */
 
@@ -544,6 +583,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).
@@ -569,6 +616,27 @@
 */
 int sei_recovery_frame_cnt;
 
+ /**
+ * recovery_frame is the frame_num at which the next frame should
+ * be fully constructed.
+ *
+ * Set to -1 when not expecting a recovery point.
+ */
+ int recovery_frame;
+
+/**
+ * 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)
+
+ 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
 
@@ -578,6 +646,13 @@
 
 int cur_chroma_format_idc;
 uint8_t *bipred_scratchpad;
+ uint8_t *edge_emu_buffer;
+ int16_t *dc_val_base;
+
+ AVBufferPool *qscale_table_pool;
+ AVBufferPool *mb_type_pool;
+ AVBufferPool *motion_val_pool;
+ AVBufferPool *ref_index_pool;
 } H264Context;
 
 extern const uint8_t ff_h264_chroma_qp[3][QP_MAX_NUM + 1]; ///< One chroma qp table for each supported bit depth (8, 9, 10).
@@ -618,7 +693,7 @@
 * Free any data that may have been allocated in the H264 context
 * like SPS, PPS etc.
 */
-av_cold void ff_h264_free_context(H264Context *h);
+void ff_h264_free_context(H264Context *h);
 
 /**
 * Reconstruct bitstream slice_type.
@@ -663,10 +738,9 @@
 int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma);
 
 void ff_h264_hl_decode_mb(H264Context *h);
-int ff_h264_frame_start(H264Context *h);
 int ff_h264_decode_extradata(H264Context *h);
-av_cold int ff_h264_decode_init(AVCodecContext *avctx);
-av_cold void ff_h264_decode_init_vlc(void);
+int ff_h264_decode_init(AVCodecContext *avctx);
+void ff_h264_decode_init_vlc(void);
 
 /**
 * Decode a macroblock
@@ -786,7 +860,7 @@
 const int top = h->intra4x4_pred_mode_cache[index8 - 8];
 const int min = FFMIN(left, top);
 
- tprintf(h->s.avctx, "mode:%d %d min:%d\n", left, top, min);
+ tprintf(h->avctx, "mode:%d %d min:%d\n", left, top, min);
 
 if (min < 0)
 return DC_PRED;
@@ -820,7 +894,7 @@
 AV_COPY32(&nnz[32], &nnz_cache[4 + 8 * 11]);
 AV_COPY32(&nnz[36], &nnz_cache[4 + 8 * 12]);
 
- if (!h->s.chroma_y_shift) {
+ if (!h->chroma_y_shift) {
 AV_COPY32(&nnz[24], &nnz_cache[4 + 8 * 8]);
 AV_COPY32(&nnz[28], &nnz_cache[4 + 8 * 9]);
 AV_COPY32(&nnz[40], &nnz_cache[4 + 8 * 13]);
@@ -829,18 +903,17 @@
 }
 
 static av_always_inline void write_back_motion_list(H264Context *h,
- MpegEncContext *const s,
 int b_stride,
 int b_xy, int b8_xy,
 int mb_type, int list)
 {
- int16_t(*mv_dst)[2] = &s->current_picture.f.motion_val[list][b_xy];
+ int16_t(*mv_dst)[2] = &h->cur_pic.motion_val[list][b_xy];
 int16_t(*mv_src)[2] = &h->mv_cache[list][scan8[0]];
 AV_COPY128(mv_dst + 0 * b_stride, mv_src + 8 * 0);
 AV_COPY128(mv_dst + 1 * b_stride, mv_src + 8 * 1);
 AV_COPY128(mv_dst + 2 * b_stride, mv_src + 8 * 2);
 AV_COPY128(mv_dst + 3 * b_stride, mv_src + 8 * 3);
- if (CABAC) {
+ if (CABAC(h)) {
 uint8_t (*mvd_dst)[2] = &h->mvd_table[list][FMO ? 8 * h->mb_xy
 : h->mb2br_xy[h->mb_xy]];
 uint8_t(*mvd_src)[2] = &h->mvd_cache[list][scan8[0]];
@@ -855,7 +928,7 @@
 }
 
 {
- int8_t *ref_index = &s->current_picture.f.ref_index[list][b8_xy];
+ int8_t *ref_index = &h->cur_pic.ref_index[list][b8_xy];
 int8_t *ref_cache = h->ref_cache[list];
 ref_index[0 + 0 * 2] = ref_cache[scan8[0]];
 ref_index[1 + 0 * 2] = ref_cache[scan8[4]];
@@ -866,21 +939,20 @@
 
 static av_always_inline void write_back_motion(H264Context *h, int mb_type)
 {
- MpegEncContext *const s = &h->s;
 const int b_stride = h->b_stride;
- const int b_xy = 4 * s->mb_x + 4 * s->mb_y * h->b_stride; // try mb2b(8)_xy
+ const int b_xy = 4 * h->mb_x + 4 * h->mb_y * h->b_stride; // try mb2b(8)_xy
 const int b8_xy = 4 * h->mb_xy;
 
 if (USES_LIST(mb_type, 0)) {
- write_back_motion_list(h, s, b_stride, b_xy, b8_xy, mb_type, 0);
+ write_back_motion_list(h, b_stride, b_xy, b8_xy, mb_type, 0);
 } else {
- fill_rectangle(&s->current_picture.f.ref_index[0][b8_xy],
+ fill_rectangle(&h->cur_pic.ref_index[0][b8_xy],
 2, 2, 2, (uint8_t)LIST_NOT_USED, 1);
 }
 if (USES_LIST(mb_type, 1))
- write_back_motion_list(h, s, b_stride, b_xy, b8_xy, mb_type, 1);
+ write_back_motion_list(h, b_stride, b_xy, b8_xy, mb_type, 1);
 
- if (h->slice_type_nos == AV_PICTURE_TYPE_B && CABAC) {
+ if (h->slice_type_nos == AV_PICTURE_TYPE_B && CABAC(h)) {
 if (IS_8X8(mb_type)) {
 uint8_t *direct_table = &h->direct_table[4 * h->mb_xy];
 direct_table[1] = h->sub_mb_type[1] >> 1;
@@ -902,4 +974,9 @@
 0x0001000100010001ULL));
 }
 
+void ff_h264_draw_horiz_band(H264Context *h, int y, int height);
+int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc);
+int ff_pred_weight_table(H264Context *h);
+int ff_set_ref_count(H264Context *h);
+
 #endif /* AVCODEC_H264_H */

libav-v9.6.tar.bz2/libavcodec/h264_cabac.c -> libav-v10.1.tar.bz2/libavcodec/h264_cabac.c Changed

@@ -25,13 +25,14 @@
 * @author Michael Niedermayer <michaelni@gmx.at>
 */
 
-#define CABAC 1
+#define CABAC(h) 1
 
+#include "libavutil/attributes.h"
+#include "libavutil/timer.h"
 #include "config.h"
 #include "cabac.h"
 #include "cabac_functions.h"
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "h264.h"
 #include "h264data.h"
@@ -42,7 +43,6 @@
 #include "x86/h264_i386.h"
 #endif
 
-//#undef NDEBUG
 #include <assert.h>
 
 /* Cabac pre state table */
@@ -1260,10 +1260,9 @@
 };
 
 void ff_h264_init_cabac_states(H264Context *h) {
- MpegEncContext * const s = &h->s;
 int i;
 const int8_t (*tab)[2];
- const int slice_qp = av_clip(s->qscale - 6*(h->sps.bit_depth_luma-8), 0, 51);
+ const int slice_qp = av_clip(h->qscale - 6*(h->sps.bit_depth_luma-8), 0, 51);
 
 if( h->slice_type_nos == AV_PICTURE_TYPE_I ) tab = cabac_context_init_I;
 else tab = cabac_context_init_PB[h->cabac_init_idc];
@@ -1281,13 +1280,12 @@
 }
 
 static int decode_cabac_field_decoding_flag(H264Context *h) {
- MpegEncContext * const s = &h->s;
- const long mbb_xy = h->mb_xy - 2L*s->mb_stride;
+ const long mbb_xy = h->mb_xy - 2L*h->mb_stride;
 
 unsigned long ctx = 0;
 
- ctx += h->mb_field_decoding_flag & !!s->mb_x; //for FMO:(s->current_picture.f.mb_type[mba_xy] >> 7) & (h->slice_table[mba_xy] == h->slice_num);
- ctx += (s->current_picture.f.mb_type[mbb_xy] >> 7) & (h->slice_table[mbb_xy] == h->slice_num);
+ ctx += h->mb_field_decoding_flag & !!h->mb_x; //for FMO:(s->current_picture.mb_type[mba_xy] >> 7) & (h->slice_table[mba_xy] == h->slice_num);
+ ctx += (h->cur_pic.mb_type[mbb_xy] >> 7) & (h->slice_table[mbb_xy] == h->slice_num);
 
 return get_cabac_noinline( &h->cabac, &(h->cabac_state+70)[ctx] );
 }
@@ -1323,34 +1321,33 @@
 }
 
 static int decode_cabac_mb_skip( H264Context *h, int mb_x, int mb_y ) {
- MpegEncContext * const s = &h->s;
 int mba_xy, mbb_xy;
 int ctx = 0;
 
- if(FRAME_MBAFF){ //FIXME merge with the stuff in fill_caches?
- int mb_xy = mb_x + (mb_y&~1)*s->mb_stride;
+ if (FRAME_MBAFF(h)) { //FIXME merge with the stuff in fill_caches?
+ int mb_xy = mb_x + (mb_y&~1)*h->mb_stride;
 mba_xy = mb_xy - 1;
 if( (mb_y&1)
 && h->slice_table[mba_xy] == h->slice_num
- && MB_FIELD == !!IS_INTERLACED( s->current_picture.f.mb_type[mba_xy] ) )
- mba_xy += s->mb_stride;
- if( MB_FIELD ){
- mbb_xy = mb_xy - s->mb_stride;
+ && MB_FIELD(h) == !!IS_INTERLACED( h->cur_pic.mb_type[mba_xy] ) )
+ mba_xy += h->mb_stride;
+ if (MB_FIELD(h)) {
+ mbb_xy = mb_xy - h->mb_stride;
 if( !(mb_y&1)
 && h->slice_table[mbb_xy] == h->slice_num
- && IS_INTERLACED( s->current_picture.f.mb_type[mbb_xy] ) )
- mbb_xy -= s->mb_stride;
+ && IS_INTERLACED( h->cur_pic.mb_type[mbb_xy] ) )
+ mbb_xy -= h->mb_stride;
 }else
- mbb_xy = mb_x + (mb_y-1)*s->mb_stride;
+ mbb_xy = mb_x + (mb_y-1)*h->mb_stride;
 }else{
 int mb_xy = h->mb_xy;
 mba_xy = mb_xy - 1;
- mbb_xy = mb_xy - (s->mb_stride << FIELD_PICTURE);
+ mbb_xy = mb_xy - (h->mb_stride << FIELD_PICTURE(h));
 }
 
- if( h->slice_table[mba_xy] == h->slice_num && !IS_SKIP( s->current_picture.f.mb_type[mba_xy] ))
+ if( h->slice_table[mba_xy] == h->slice_num && !IS_SKIP(h->cur_pic.mb_type[mba_xy] ))
 ctx++;
- if( h->slice_table[mbb_xy] == h->slice_num && !IS_SKIP( s->current_picture.f.mb_type[mbb_xy] ))
+ if( h->slice_table[mbb_xy] == h->slice_num && !IS_SKIP(h->cur_pic.mb_type[mbb_xy] ))
 ctx++;
 
 if( h->slice_type_nos == AV_PICTURE_TYPE_B )
@@ -1507,7 +1504,7 @@
 mvd += 1 << k;
 k++;
 if(k>24){
- av_log(h->s.avctx, AV_LOG_ERROR, "overflow in decode_cabac_mb_mvd\n");
+ av_log(h->avctx, AV_LOG_ERROR, "overflow in decode_cabac_mb_mvd\n");
 return INT_MIN;
 }
 }
@@ -1561,7 +1558,7 @@
 }
 
 static av_always_inline void
-decode_cabac_residual_internal(H264Context *h, DCTELEM *block,
+decode_cabac_residual_internal(H264Context *h, int16_t *block,
 int cat, int n, const uint8_t *scantable,
 const uint32_t *qmul, int max_coeff,
 int is_dc, int chroma422)
@@ -1629,9 +1626,9 @@
 #endif
 
 significant_coeff_ctx_base = h->cabac_state
- + significant_coeff_flag_offset[MB_FIELD][cat];
+ + significant_coeff_flag_offset[MB_FIELD(h)][cat];
 last_coeff_ctx_base = h->cabac_state
- + last_coeff_flag_offset[MB_FIELD][cat];
+ + last_coeff_flag_offset[MB_FIELD(h)][cat];
 abs_level_m1_ctx_base = h->cabac_state
 + coeff_abs_level_m1_offset[cat];
 
@@ -1651,7 +1648,7 @@
 if( last == max_coeff -1 ) {\
 index[coeff_count++] = last;\
 }
- const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
+ const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD(h)];
 #ifdef decode_significance
 coeff_count = decode_significance_8x8(CC, significant_coeff_ctx_base, index,
 last_coeff_ctx_base, sig_off);
@@ -1745,18 +1742,31 @@
 
 }
 
-static void decode_cabac_residual_dc_internal( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, int max_coeff ) {
+static av_noinline void decode_cabac_residual_dc_internal(H264Context *h,
+ int16_t *block,
+ int cat, int n,
+ const uint8_t *scantable,
+ int max_coeff)
+{
 decode_cabac_residual_internal(h, block, cat, n, scantable, NULL, max_coeff, 1, 0);
 }
 
-static void decode_cabac_residual_dc_internal_422(H264Context *h, DCTELEM *block,
- int cat, int n, const uint8_t *scantable,
- int max_coeff)
+static av_noinline void decode_cabac_residual_dc_internal_422(H264Context *h,
+ int16_t *block,
+ int cat, int n,
+ const uint8_t *scantable,
+ int max_coeff)
 {
 decode_cabac_residual_internal(h, block, cat, n, scantable, NULL, max_coeff, 1, 1);
 }
 
-static void decode_cabac_residual_nondc_internal( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) {
+static av_noinline void decode_cabac_residual_nondc_internal(H264Context *h,
+ int16_t *block,
+ int cat, int n,
+ const uint8_t *scantable,
+ const uint32_t *qmul,
+ int max_coeff)
+{
 decode_cabac_residual_internal(h, block, cat, n, scantable, qmul, max_coeff, 0, 0);
 }
 
@@ -1772,7 +1782,12 @@
 * because it allows improved constant propagation into get_cabac_cbf_ctx,
 * as well as because most blocks have zero CBFs. */
 
-static av_always_inline void decode_cabac_residual_dc( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, int max_coeff ) {
+static av_always_inline void decode_cabac_residual_dc(H264Context *h,
+ int16_t *block,
+ int cat, int n,
+ const uint8_t *scantable,
+ int max_coeff)
+{
 /* read coded block flag */
 if( get_cabac( &h->cabac, &h->cabac_state[get_cabac_cbf_ctx( h, cat, n, max_coeff, 1 ) ] ) == 0 ) {
 h->non_zero_count_cache[scan8[n]] = 0;
@@ -1782,7 +1797,7 @@
 }
 
 static av_always_inline void
-decode_cabac_residual_dc_422(H264Context *h, DCTELEM *block,
+decode_cabac_residual_dc_422(H264Context *h, int16_t *block,
 int cat, int n, const uint8_t *scantable,
 int max_coeff)
 {
@@ -1794,9 +1809,15 @@
 decode_cabac_residual_dc_internal_422(h, block, cat, n, scantable, max_coeff);
 }
 
-static av_always_inline void decode_cabac_residual_nondc( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) {
+static av_always_inline void decode_cabac_residual_nondc(H264Context *h,
+ int16_t *block,
+ int cat, int n,
+ const uint8_t *scantable,
+ const uint32_t *qmul,
+ int max_coeff)
+{
 /* read coded block flag */
- if( (cat != 5 || CHROMA444) && get_cabac( &h->cabac, &h->cabac_state[get_cabac_cbf_ctx( h, cat, n, max_coeff, 0 ) ] ) == 0 ) {
+ if( (cat != 5 || CHROMA444(h)) && get_cabac( &h->cabac, &h->cabac_state[get_cabac_cbf_ctx( h, cat, n, max_coeff, 0 ) ] ) == 0 ) {
 if( max_coeff == 64 ) {
 fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, 0, 1);
 } else {
@@ -1812,8 +1833,7 @@
 static const uint8_t ctx_cat[4][3] = {{0,6,10},{1,7,11},{2,8,12},{5,9,13}};
 const uint32_t *qmul;
 int i8x8, i4x4;
- MpegEncContext * const s = &h->s;
- int qscale = p == 0 ? s->qscale : h->chroma_qp[p-1];
+ int qscale = p == 0 ? h->qscale : h->chroma_qp[p-1];
 if( IS_INTRA16x16( mb_type ) ) {
 AV_ZERO128(h->mb_luma_dc[p]+0);
 AV_ZERO128(h->mb_luma_dc[p]+8);
@@ -1859,28 +1879,27 @@
 * @return 0 if OK, ER_AC_ERROR / ER_DC_ERROR / ER_MV_ERROR if an error is noticed
 */
 int ff_h264_decode_mb_cabac(H264Context *h) {
- MpegEncContext * const s = &h->s;
 int mb_xy;
 int mb_type, partition_count, cbp = 0;
 int dct8x8_allowed= h->pps.transform_8x8_mode;
 int decode_chroma = h->sps.chroma_format_idc == 1 || h->sps.chroma_format_idc == 2;
 const int pixel_shift = h->pixel_shift;
 
- mb_xy = h->mb_xy = s->mb_x + s->mb_y*s->mb_stride;
+ mb_xy = h->mb_xy = h->mb_x + h->mb_y*h->mb_stride;
 
- tprintf(s->avctx, "pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y);
+ tprintf(h->avctx, "pic:%d mb:%d/%d\n", h->frame_num, h->mb_x, h->mb_y);
 if( h->slice_type_nos != AV_PICTURE_TYPE_I ) {
 int skip;
 /* a skipped mb needs the aff flag from the following mb */
- if( FRAME_MBAFF && (s->mb_y&1)==1 && h->prev_mb_skipped )
+ if (FRAME_MBAFF(h) && (h->mb_y & 1) == 1 && h->prev_mb_skipped)
 skip = h->next_mb_skipped;
 else
- skip = decode_cabac_mb_skip( h, s->mb_x, s->mb_y );
+ skip = decode_cabac_mb_skip( h, h->mb_x, h->mb_y );
 /* read skip flags */
 if( skip ) {
- if( FRAME_MBAFF && (s->mb_y&1)==0 ){
- s->current_picture.f.mb_type[mb_xy] = MB_TYPE_SKIP;
- h->next_mb_skipped = decode_cabac_mb_skip( h, s->mb_x, s->mb_y+1 );
+ if (FRAME_MBAFF(h) && (h->mb_y & 1) == 0) {
+ h->cur_pic.mb_type[mb_xy] = MB_TYPE_SKIP;
+ h->next_mb_skipped = decode_cabac_mb_skip( h, h->mb_x, h->mb_y+1 );
 if(!h->next_mb_skipped)
 h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h);
 }
@@ -1895,15 +1914,15 @@
 
 }
 }
- if(FRAME_MBAFF){
- if( (s->mb_y&1) == 0 )
+ if (FRAME_MBAFF(h)) {
+ if( (h->mb_y&1) == 0 )
 h->mb_mbaff =
 h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h);
 }
 
 h->prev_mb_skipped = 0;
 
- fill_decode_neighbors(h, -(MB_FIELD));
+ fill_decode_neighbors(h, -(MB_FIELD(h)));
 
 if( h->slice_type_nos == AV_PICTURE_TYPE_B ) {
 int ctx = 0;
@@ -1967,7 +1986,7 @@
 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode;
 mb_type= i_mb_type_info[mb_type].type;
 }
- if(MB_FIELD)
+ if(MB_FIELD(h))
 mb_type |= MB_TYPE_INTERLACED;
 
 h->slice_table[ mb_xy ]= h->slice_num;
@@ -1989,7 +2008,8 @@
 // The pixels are stored in the same order as levels in h->mb array.
 if ((int) (h->cabac.bytestream_end - ptr) < mb_size)
 return -1;
- memcpy(h->mb, ptr, mb_size); ptr+=mb_size;
+ h->intra_pcm_ptr = ptr;
+ ptr += mb_size;
 
 ff_init_cabac_decoder(&h->cabac, ptr, h->cabac.bytestream_end - ptr);
 
@@ -1997,10 +2017,10 @@
 h->cbp_table[mb_xy] = 0xf7ef;
 h->chroma_pred_mode_table[mb_xy] = 0;
 // In deblocking, the quantizer is 0
- s->current_picture.f.qscale_table[mb_xy] = 0;
+ h->cur_pic.qscale_table[mb_xy] = 0;
 // All coeffs are present
 memset(h->non_zero_count[mb_xy], 16, 48);
- s->current_picture.f.mb_type[mb_xy] = mb_type;
+ h->cur_pic.mb_type[mb_xy] = mb_type;
 h->last_qscale_diff = 0;
 return 0;
 }
@@ -2022,7 +2042,7 @@
 int pred = pred_intra_mode( h, i );
 h->intra4x4_pred_mode_cache[ scan8[i] ] = decode_cabac_mb_intra4x4_pred_mode( h, pred );
 
- av_dlog(s->avctx, "i4x4 pred=%d mode=%d\n", pred,
+ av_dlog(h->avctx, "i4x4 pred=%d mode=%d\n", pred,
 h->intra4x4_pred_mode_cache[scan8[i]]);
 }
 }
@@ -2073,11 +2093,11 @@
 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)){
- int rc = h->ref_count[list] << MB_MBAFF;
+ int rc = h->ref_count[list] << MB_MBAFF(h);
 if (rc > 1) {
 ref[list][i] = decode_cabac_mb_ref( h, list, 4*i );
 if (ref[list][i] >= (unsigned) rc) {
- av_log(s->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref[list][i], rc);
+ av_log(h->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref[list][i], rc);
 return -1;
 }
 }else
@@ -2112,7 +2132,7 @@
 uint8_t (* mvd_cache)[2]= &h->mvd_cache[list][ scan8[index] ];
 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my);
 DECODE_CABAC_MB_MVD( h, list, index)
- tprintf(s->avctx, "final mv:%d %d\n", mx, my);
+ tprintf(h->avctx, "final mv:%d %d\n", mx, my);
 
 if(IS_SUB_8X8(sub_mb_type)){
 mv_cache[ 1 ][0]=
@@ -2159,11 +2179,11 @@
 if(IS_16X16(mb_type)){
 for(list=0; list<h->list_count; list++){
 if(IS_DIR(mb_type, 0, list)){
- int ref, rc = h->ref_count[list] << MB_MBAFF;
+ int ref, rc = h->ref_count[list] << MB_MBAFF(h);
 if (rc > 1) {
 ref= decode_cabac_mb_ref(h, list, 0);
 if (ref >= (unsigned) rc) {
- av_log(s->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref, rc);
+ av_log(h->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref, rc);
 return -1;
 }
 }else
@@ -2176,7 +2196,7 @@
 int mx,my,mpx,mpy;
 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my);
 DECODE_CABAC_MB_MVD( h, list, 0)
- tprintf(s->avctx, "final mv:%d %d\n", mx, my);
+ tprintf(h->avctx, "final mv:%d %d\n", mx, my);
 
 fill_rectangle(h->mvd_cache[list][ scan8[0] ], 4, 4, 8, pack8to16(mpx,mpy), 2);
 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4);
@@ -2187,11 +2207,11 @@
 for(list=0; list<h->list_count; list++){
 for(i=0; i<2; i++){
 if(IS_DIR(mb_type, i, list)){
- int ref, rc = h->ref_count[list] << MB_MBAFF;
+ int ref, rc = h->ref_count[list] << MB_MBAFF(h);
 if (rc > 1) {
 ref= decode_cabac_mb_ref( h, list, 8*i );
 if (ref >= (unsigned) rc) {
- av_log(s->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref, rc);
+ av_log(h->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref, rc);
 return -1;
 }
 }else
@@ -2207,7 +2227,7 @@
 int mx,my,mpx,mpy;
 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mx, &my);
 DECODE_CABAC_MB_MVD( h, list, 8*i)
- tprintf(s->avctx, "final mv:%d %d\n", mx, my);
+ tprintf(h->avctx, "final mv:%d %d\n", mx, my);
 
 fill_rectangle(h->mvd_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack8to16(mpx,mpy), 2);
 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4);
@@ -2222,11 +2242,11 @@
 for(list=0; list<h->list_count; list++){
 for(i=0; i<2; i++){
 if(IS_DIR(mb_type, i, list)){ //FIXME optimize
- int ref, rc = h->ref_count[list] << MB_MBAFF;
+ int ref, rc = h->ref_count[list] << MB_MBAFF(h);
 if (rc > 1) {
 ref= decode_cabac_mb_ref( h, list, 4*i );
 if (ref >= (unsigned) rc) {
- av_log(s->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref, rc);
+ av_log(h->avctx, AV_LOG_ERROR, "Reference %d >= %d\n", ref, rc);
 return -1;
 }
 }else
@@ -2243,7 +2263,7 @@
 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mx, &my);
 DECODE_CABAC_MB_MVD( h, list, 4*i)
 
- tprintf(s->avctx, "final mv:%d %d\n", mx, my);
+ tprintf(h->avctx, "final mv:%d %d\n", mx, my);
 fill_rectangle(h->mvd_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack8to16(mpx,mpy), 2);
 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4);
 }else{
@@ -2274,7 +2294,7 @@
 
 /* It would be better to do this in fill_decode_caches, but we don't know
 * the transform mode of the current macroblock there. */
- if (CHROMA444 && IS_8x8DCT(mb_type)){
+ if (CHROMA444(h) && IS_8x8DCT(mb_type)){
 int i;
 uint8_t *nnz_cache = h->non_zero_count_cache;
 for (i = 0; i < 2; i++){
@@ -2288,24 +2308,24 @@
 }
 }
 if (h->top_type && !IS_8x8DCT(h->top_type)){
- uint32_t top_empty = CABAC && !IS_INTRA(mb_type) ? 0 : 0x40404040;
+ uint32_t top_empty = CABAC(h) && !IS_INTRA(mb_type) ? 0 : 0x40404040;
 AV_WN32A(&nnz_cache[4+8* 0], top_empty);
 AV_WN32A(&nnz_cache[4+8* 5], top_empty);
 AV_WN32A(&nnz_cache[4+8*10], top_empty);
 }
 }
- s->current_picture.f.mb_type[mb_xy] = mb_type;
+ h->cur_pic.mb_type[mb_xy] = mb_type;
 
 if( cbp || IS_INTRA16x16( mb_type ) ) {
 const uint8_t *scan, *scan8x8;
 const uint32_t *qmul;
 
 if(IS_INTERLACED(mb_type)){
- scan8x8= s->qscale ? h->field_scan8x8 : h->field_scan8x8_q0;
- scan= s->qscale ? h->field_scan : h->field_scan_q0;
+ scan8x8= h->qscale ? h->field_scan8x8 : h->field_scan8x8_q0;
+ scan= h->qscale ? h->field_scan : h->field_scan_q0;
 }else{
- scan8x8= s->qscale ? h->zigzag_scan8x8 : h->zigzag_scan8x8_q0;
- scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
+ scan8x8= h->qscale ? h->zigzag_scan8x8 : h->zigzag_scan8x8_q0;
+ scan= h->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
 }
 
 // decode_cabac_mb_dqp
@@ -2318,7 +2338,7 @@
 ctx= 3;
 val++;
 if(val > 2*max_qp){ //prevent infinite loop
- av_log(h->s.avctx, AV_LOG_ERROR, "cabac decode of qscale diff failed at %d %d\n", s->mb_x, s->mb_y);
+ av_log(h->avctx, AV_LOG_ERROR, "cabac decode of qscale diff failed at %d %d\n", h->mb_x, h->mb_y);
 return -1;
 }
 }
@@ -2328,21 +2348,21 @@
 else
 val= -((val + 1)>>1);
 h->last_qscale_diff = val;
- s->qscale += val;
- if(((unsigned)s->qscale) > max_qp){
- if(s->qscale<0) s->qscale+= max_qp+1;
- else s->qscale-= max_qp+1;
+ h->qscale += val;
+ if(((unsigned)h->qscale) > max_qp){
+ if(h->qscale<0) h->qscale+= max_qp+1;
+ else h->qscale-= max_qp+1;
 }
- h->chroma_qp[0] = get_chroma_qp(h, 0, s->qscale);
- h->chroma_qp[1] = get_chroma_qp(h, 1, s->qscale);
+ h->chroma_qp[0] = get_chroma_qp(h, 0, h->qscale);
+ h->chroma_qp[1] = get_chroma_qp(h, 1, h->qscale);
 }else
 h->last_qscale_diff=0;
 
 decode_cabac_luma_residual(h, scan, scan8x8, pixel_shift, mb_type, cbp, 0);
- if(CHROMA444){
+ if (CHROMA444(h)) {
 decode_cabac_luma_residual(h, scan, scan8x8, pixel_shift, mb_type, cbp, 1);
 decode_cabac_luma_residual(h, scan, scan8x8, pixel_shift, mb_type, cbp, 2);
- } else if (CHROMA422) {
+ } else if (CHROMA422(h)) {
 if( cbp&0x30 ){
 int c;
 for (c = 0; c < 2; c++)
@@ -2354,7 +2374,7 @@
 if( cbp&0x20 ) {
 int c, i, i8x8;
 for( c = 0; c < 2; c++ ) {
- DCTELEM *mb = h->mb + (16*(16 + 16*c) << pixel_shift);
+ int16_t *mb = h->mb + (16*(16 + 16*c) << pixel_shift);
 qmul = h->dequant4_coeff[c+1+(IS_INTRA( mb_type ) ? 0:3)][h->chroma_qp[c]];
 for (i8x8 = 0; i8x8 < 2; i8x8++) {
 for (i = 0; i < 4; i++) {
@@ -2396,7 +2416,7 @@
 h->last_qscale_diff = 0;
 }
 
- s->current_picture.f.qscale_table[mb_xy] = s->qscale;
+ h->cur_pic.qscale_table[mb_xy] = h->qscale;
 write_back_non_zero_count(h);
 
 return 0;

libav-v9.6.tar.bz2/libavcodec/h264_cavlc.c -> libav-v10.1.tar.bz2/libavcodec/h264_cavlc.c Changed

@@ -25,7 +25,7 @@
 * @author Michael Niedermayer <michaelni@gmx.at>
 */
 
-#define CABAC 0
+#define CABAC(h) 0
 
 #include "internal.h"
 #include "avcodec.h"
@@ -35,7 +35,6 @@
 #include "h264_mvpred.h"
 #include "golomb.h"
 
-//#undef NDEBUG
 #include <assert.h>
 
 static const uint8_t golomb_to_inter_cbp_gray[16]={
@@ -292,7 +291,7 @@
 
 if(i<64) i= (i+1)>>1;
 
- tprintf(h->s.avctx, "pred_nnz L%X T%X n%d s%d P%X\n", left, top, n, scan8[n], i&31);
+ tprintf(h->avctx, "pred_nnz L%X T%X n%d s%d P%X\n", left, top, n, scan8[n], i&31);
 
 return i&31;
 }
@@ -442,8 +441,7 @@
 * @param max_coeff number of coefficients in the block
 * @return <0 if an error occurred
 */
-static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff){
- MpegEncContext * const s = &h->s;
+static int decode_residual(H264Context *h, GetBitContext *gb, int16_t *block, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff){
 static const int coeff_token_table_index[17]= {0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3};
 int level[16];
 int zeros_left, coeff_token, total_coeff, i, trailing_ones, run_before;
@@ -474,12 +472,12 @@
 if(total_coeff==0)
 return 0;
 if(total_coeff > (unsigned)max_coeff) {
- av_log(h->s.avctx, AV_LOG_ERROR, "corrupted macroblock %d %d (total_coeff=%d)\n", s->mb_x, s->mb_y, total_coeff);
+ av_log(h->avctx, AV_LOG_ERROR, "corrupted macroblock %d %d (total_coeff=%d)\n", h->mb_x, h->mb_y, total_coeff);
 return -1;
 }
 
 trailing_ones= coeff_token&3;
- tprintf(h->s.avctx, "trailing:%d, total:%d\n", trailing_ones, total_coeff);
+ tprintf(h->avctx, "trailing:%d, total:%d\n", trailing_ones, total_coeff);
 assert(total_coeff<=16);
 
 i = show_bits(gb, 3);
@@ -515,7 +513,7 @@
 level_code= 30 + get_bits(gb, prefix-3); //part
 if(prefix>=16){
 if(prefix > 25+3){
- av_log(h->s.avctx, AV_LOG_ERROR, "Invalid level prefix\n");
+ av_log(h->avctx, AV_LOG_ERROR, "Invalid level prefix\n");
 return -1;
 }
 level_code += (1<<(prefix-3))-4096;
@@ -611,8 +609,8 @@
 }
 
 if (zeros_left < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR,
- "negative number of zero coeffs at %d %d\n", s->mb_x, s->mb_y);
+ av_log(h->avctx, AV_LOG_ERROR,
+ "negative number of zero coeffs at %d %d\n", h->mb_x, h->mb_y);
 return AVERROR_INVALIDDATA;
 }
 
@@ -627,8 +625,7 @@
 
 static av_always_inline int decode_luma_residual(H264Context *h, GetBitContext *gb, const uint8_t *scan, const uint8_t *scan8x8, int pixel_shift, int mb_type, int cbp, int p){
 int i4x4, i8x8;
- MpegEncContext * const s = &h->s;
- int qscale = p == 0 ? s->qscale : h->chroma_qp[p-1];
+ int qscale = p == 0 ? h->qscale : h->chroma_qp[p-1];
 if(IS_INTRA16x16(mb_type)){
 AV_ZERO128(h->mb_luma_dc[p]+0);
 AV_ZERO128(h->mb_luma_dc[p]+8);
@@ -662,7 +659,7 @@
 for(i8x8=0; i8x8<4; i8x8++){
 if(cbp & (1<<i8x8)){
 if(IS_8x8DCT(mb_type)){
- DCTELEM *buf = &h->mb[64*i8x8+256*p << pixel_shift];
+ int16_t *buf = &h->mb[64*i8x8+256*p << pixel_shift];
 uint8_t *nnz;
 for(i4x4=0; i4x4<4; i4x4++){
 const int index= i4x4 + 4*i8x8 + p*16;
@@ -693,7 +690,6 @@
 }
 
 int ff_h264_decode_mb_cavlc(H264Context *h){
- MpegEncContext * const s = &h->s;
 int mb_xy;
 int partition_count;
 unsigned int mb_type, cbp;
@@ -701,32 +697,32 @@
 int decode_chroma = h->sps.chroma_format_idc == 1 || h->sps.chroma_format_idc == 2;
 const int pixel_shift = h->pixel_shift;
 
- mb_xy = h->mb_xy = s->mb_x + s->mb_y*s->mb_stride;
+ mb_xy = h->mb_xy = h->mb_x + h->mb_y*h->mb_stride;
 
- tprintf(s->avctx, "pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y);
+ tprintf(h->avctx, "pic:%d mb:%d/%d\n", h->frame_num, h->mb_x, h->mb_y);
 cbp = 0; /* avoid warning. FIXME: find a solution without slowing
 down the code */
 if(h->slice_type_nos != AV_PICTURE_TYPE_I){
- if(s->mb_skip_run==-1)
- s->mb_skip_run= get_ue_golomb(&s->gb);
+ if(h->mb_skip_run==-1)
+ h->mb_skip_run= get_ue_golomb(&h->gb);
 
- if (s->mb_skip_run--) {
- if(FRAME_MBAFF && (s->mb_y&1) == 0){
- if(s->mb_skip_run==0)
- h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb);
+ if (h->mb_skip_run--) {
+ if(FRAME_MBAFF(h) && (h->mb_y&1) == 0){
+ if(h->mb_skip_run==0)
+ h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&h->gb);
 }
 decode_mb_skip(h);
 return 0;
 }
 }
- if(FRAME_MBAFF){
- if( (s->mb_y&1) == 0 )
- h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb);
+ if (FRAME_MBAFF(h)) {
+ if( (h->mb_y&1) == 0 )
+ h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&h->gb);
 }
 
 h->prev_mb_skipped= 0;
 
- mb_type= get_ue_golomb(&s->gb);
+ mb_type= get_ue_golomb(&h->gb);
 if(h->slice_type_nos == AV_PICTURE_TYPE_B){
 if(mb_type < 23){
 partition_count= b_mb_type_info[mb_type].partition_count;
@@ -749,7 +745,7 @@
 mb_type--;
 decode_intra_mb:
 if(mb_type > 25){
- av_log(h->s.avctx, AV_LOG_ERROR, "mb_type %d in %c slice too large at %d %d\n", mb_type, av_get_picture_type_char(h->slice_type), s->mb_x, s->mb_y);
+ av_log(h->avctx, AV_LOG_ERROR, "mb_type %d in %c slice too large at %d %d\n", mb_type, av_get_picture_type_char(h->slice_type), h->mb_x, h->mb_y);
 return -1;
 }
 partition_count=0;
@@ -758,30 +754,29 @@
 mb_type= i_mb_type_info[mb_type].type;
 }
 
- if(MB_FIELD)
+ if(MB_FIELD(h))
 mb_type |= MB_TYPE_INTERLACED;
 
 h->slice_table[ mb_xy ]= h->slice_num;
 
 if(IS_INTRA_PCM(mb_type)){
- unsigned int x;
 const int mb_size = ff_h264_mb_sizes[h->sps.chroma_format_idc] *
- h->sps.bit_depth_luma >> 3;
+ h->sps.bit_depth_luma;
 
 // We assume these blocks are very rare so we do not optimize it.
- align_get_bits(&s->gb);
-
- // The pixels are stored in the same order as levels in h->mb array.
- for(x=0; x < mb_size; x++){
- ((uint8_t*)h->mb)[x]= get_bits(&s->gb, 8);
+ 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
- s->current_picture.f.qscale_table[mb_xy] = 0;
+ h->cur_pic.qscale_table[mb_xy] = 0;
 // All coeffs are present
 memset(h->non_zero_count[mb_xy], 16, 48);
 
- s->current_picture.f.mb_type[mb_xy] = mb_type;
+ h->cur_pic.mb_type[mb_xy] = mb_type;
 return 0;
 }
 
@@ -795,7 +790,7 @@
 if(IS_INTRA4x4(mb_type)){
 int i;
 int di = 1;
- if(dct8x8_allowed && get_bits1(&s->gb)){
+ if(dct8x8_allowed && get_bits1(&h->gb)){
 mb_type |= MB_TYPE_8x8DCT;
 di = 4;
 }
@@ -804,8 +799,8 @@
 for(i=0; i<16; i+=di){
 int mode= pred_intra_mode(h, i);
 
- if(!get_bits1(&s->gb)){
- const int rem_mode= get_bits(&s->gb, 3);
+ if(!get_bits1(&h->gb)){
+ const int rem_mode= get_bits(&h->gb, 3);
 mode = rem_mode + (rem_mode >= mode);
 }
 
@@ -823,7 +818,7 @@
 return -1;
 }
 if(decode_chroma){
- pred_mode= ff_h264_check_intra_pred_mode(h, get_ue_golomb_31(&s->gb), 1);
+ pred_mode= ff_h264_check_intra_pred_mode(h, get_ue_golomb_31(&h->gb), 1);
 if(pred_mode < 0)
 return -1;
 h->chroma_pred_mode= pred_mode;
@@ -835,9 +830,9 @@
 
 if(h->slice_type_nos == AV_PICTURE_TYPE_B){
 for(i=0; i<4; i++){
- h->sub_mb_type[i]= get_ue_golomb_31(&s->gb);
+ h->sub_mb_type[i]= get_ue_golomb_31(&h->gb);
 if(h->sub_mb_type[i] >=13){
- av_log(h->s.avctx, AV_LOG_ERROR, "B sub_mb_type %u out of range at %d %d\n", h->sub_mb_type[i], s->mb_x, s->mb_y);
+ av_log(h->avctx, AV_LOG_ERROR, "B sub_mb_type %u out of range at %d %d\n", h->sub_mb_type[i], h->mb_x, h->mb_y);
 return -1;
 }
 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
@@ -853,9 +848,9 @@
 }else{
 assert(h->slice_type_nos == AV_PICTURE_TYPE_P); //FIXME SP correct ?
 for(i=0; i<4; i++){
- h->sub_mb_type[i]= get_ue_golomb_31(&s->gb);
+ h->sub_mb_type[i]= get_ue_golomb_31(&h->gb);
 if(h->sub_mb_type[i] >=4){
- av_log(h->s.avctx, AV_LOG_ERROR, "P sub_mb_type %u out of range at %d %d\n", h->sub_mb_type[i], s->mb_x, s->mb_y);
+ av_log(h->avctx, AV_LOG_ERROR, "P sub_mb_type %u out of range at %d %d\n", h->sub_mb_type[i], h->mb_x, h->mb_y);
 return -1;
 }
 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
@@ -864,7 +859,7 @@
 }
 
 for(list=0; list<h->list_count; list++){
- int ref_count = IS_REF0(mb_type) ? 1 : h->ref_count[list] << MB_MBAFF;
+ int ref_count = IS_REF0(mb_type) ? 1 : h->ref_count[list] << MB_MBAFF(h);
 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)){
@@ -872,11 +867,11 @@
 if(ref_count == 1){
 tmp= 0;
 }else if(ref_count == 2){
- tmp= get_bits1(&s->gb)^1;
+ tmp= get_bits1(&h->gb)^1;
 }else{
- tmp= get_ue_golomb_31(&s->gb);
+ tmp= get_ue_golomb_31(&h->gb);
 if(tmp>=ref_count){
- av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", tmp);
+ av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", tmp);
 return -1;
 }
 }
@@ -908,9 +903,9 @@
 const int index= 4*i + block_width*j;
 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ];
 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my);
- mx += get_se_golomb(&s->gb);
- my += get_se_golomb(&s->gb);
- tprintf(s->avctx, "final mv:%d %d\n", mx, my);
+ mx += get_se_golomb(&h->gb);
+ my += get_se_golomb(&h->gb);
+ tprintf(h->avctx, "final mv:%d %d\n", mx, my);
 
 if(IS_SUB_8X8(sub_mb_type)){
 mv_cache[ 1 ][0]=
@@ -944,15 +939,15 @@
 for(list=0; list<h->list_count; list++){
 unsigned int val;
 if(IS_DIR(mb_type, 0, list)){
- int rc = h->ref_count[list] << MB_MBAFF;
+ int rc = h->ref_count[list] << MB_MBAFF(h);
 if (rc == 1) {
 val= 0;
 } else if (rc == 2) {
- val= get_bits1(&s->gb)^1;
+ val= get_bits1(&h->gb)^1;
 }else{
- val= get_ue_golomb_31(&s->gb);
+ val= get_ue_golomb_31(&h->gb);
 if (val >= rc) {
- av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
+ av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
 return -1;
 }
 }
@@ -962,9 +957,9 @@
 for(list=0; list<h->list_count; list++){
 if(IS_DIR(mb_type, 0, list)){
 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my);
- mx += get_se_golomb(&s->gb);
- my += get_se_golomb(&s->gb);
- tprintf(s->avctx, "final mv:%d %d\n", mx, my);
+ mx += get_se_golomb(&h->gb);
+ my += get_se_golomb(&h->gb);
+ tprintf(h->avctx, "final mv:%d %d\n", mx, my);
 
 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4);
 }
@@ -975,15 +970,15 @@
 for(i=0; i<2; i++){
 unsigned int val;
 if(IS_DIR(mb_type, i, list)){
- int rc = h->ref_count[list] << MB_MBAFF;
+ int rc = h->ref_count[list] << MB_MBAFF(h);
 if (rc == 1) {
 val= 0;
 } else if (rc == 2) {
- val= get_bits1(&s->gb)^1;
+ val= get_bits1(&h->gb)^1;
 }else{
- val= get_ue_golomb_31(&s->gb);
+ val= get_ue_golomb_31(&h->gb);
 if (val >= rc) {
- av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
+ av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
 return -1;
 }
 }
@@ -997,9 +992,9 @@
 unsigned int val;
 if(IS_DIR(mb_type, i, list)){
 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mx, &my);
- mx += get_se_golomb(&s->gb);
- my += get_se_golomb(&s->gb);
- tprintf(s->avctx, "final mv:%d %d\n", mx, my);
+ mx += get_se_golomb(&h->gb);
+ my += get_se_golomb(&h->gb);
+ tprintf(h->avctx, "final mv:%d %d\n", mx, my);
 
 val= pack16to32(mx,my);
 }else
@@ -1013,15 +1008,15 @@
 for(i=0; i<2; i++){
 unsigned int val;
 if(IS_DIR(mb_type, i, list)){ //FIXME optimize
- int rc = h->ref_count[list] << MB_MBAFF;
+ int rc = h->ref_count[list] << MB_MBAFF(h);
 if (rc == 1) {
 val= 0;
 } else if (rc == 2) {
- val= get_bits1(&s->gb)^1;
+ val= get_bits1(&h->gb)^1;
 }else{
- val= get_ue_golomb_31(&s->gb);
+ val= get_ue_golomb_31(&h->gb);
 if (val >= rc) {
- av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
+ av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
 return -1;
 }
 }
@@ -1035,9 +1030,9 @@
 unsigned int val;
 if(IS_DIR(mb_type, i, list)){
 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mx, &my);
- mx += get_se_golomb(&s->gb);
- my += get_se_golomb(&s->gb);
- tprintf(s->avctx, "final mv:%d %d\n", mx, my);
+ mx += get_se_golomb(&h->gb);
+ my += get_se_golomb(&h->gb);
+ tprintf(h->avctx, "final mv:%d %d\n", mx, my);
 
 val= pack16to32(mx,my);
 }else
@@ -1052,18 +1047,18 @@
 write_back_motion(h, mb_type);
 
 if(!IS_INTRA16x16(mb_type)){
- cbp= get_ue_golomb(&s->gb);
+ cbp= get_ue_golomb(&h->gb);
 
 if(decode_chroma){
 if(cbp > 47){
- av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%u) at %d %d\n", cbp, s->mb_x, s->mb_y);
+ av_log(h->avctx, AV_LOG_ERROR, "cbp too large (%u) at %d %d\n", cbp, h->mb_x, h->mb_y);
 return -1;
 }
 if(IS_INTRA4x4(mb_type)) cbp= golomb_to_intra4x4_cbp[cbp];
 else cbp= golomb_to_inter_cbp [cbp];
 }else{
 if(cbp > 15){
- av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%u) at %d %d\n", cbp, s->mb_x, s->mb_y);
+ av_log(h->avctx, AV_LOG_ERROR, "cbp too large (%u) at %d %d\n", cbp, h->mb_x, h->mb_y);
 return -1;
 }
 if(IS_INTRA4x4(mb_type)) cbp= golomb_to_intra4x4_cbp_gray[cbp];
@@ -1072,11 +1067,11 @@
 }
 
 if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){
- mb_type |= MB_TYPE_8x8DCT*get_bits1(&s->gb);
+ mb_type |= MB_TYPE_8x8DCT*get_bits1(&h->gb);
 }
 h->cbp=
 h->cbp_table[mb_xy]= cbp;
- s->current_picture.f.mb_type[mb_xy] = mb_type;
+ h->cur_pic.mb_type[mb_xy] = mb_type;
 
 if(cbp || IS_INTRA16x16(mb_type)){
 int i4x4, i8x8, chroma_idx;
@@ -1087,41 +1082,41 @@
 const int max_qp = 51 + 6*(h->sps.bit_depth_luma-8);
 
 if(IS_INTERLACED(mb_type)){
- scan8x8= s->qscale ? h->field_scan8x8_cavlc : h->field_scan8x8_cavlc_q0;
- scan= s->qscale ? h->field_scan : h->field_scan_q0;
+ scan8x8= h->qscale ? h->field_scan8x8_cavlc : h->field_scan8x8_cavlc_q0;
+ scan= h->qscale ? h->field_scan : h->field_scan_q0;
 }else{
- scan8x8= s->qscale ? h->zigzag_scan8x8_cavlc : h->zigzag_scan8x8_cavlc_q0;
- scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
+ scan8x8= h->qscale ? h->zigzag_scan8x8_cavlc : h->zigzag_scan8x8_cavlc_q0;
+ scan= h->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
 }
 
- dquant= get_se_golomb(&s->gb);
+ dquant= get_se_golomb(&h->gb);
 
- s->qscale += dquant;
+ h->qscale += dquant;
 
- if(((unsigned)s->qscale) > max_qp){
- if(s->qscale<0) s->qscale+= max_qp+1;
- else s->qscale-= max_qp+1;
- if(((unsigned)s->qscale) > max_qp){
- av_log(h->s.avctx, AV_LOG_ERROR, "dquant out of range (%d) at %d %d\n", dquant, s->mb_x, s->mb_y);
+ if(((unsigned)h->qscale) > max_qp){
+ if(h->qscale<0) h->qscale+= max_qp+1;
+ else h->qscale-= max_qp+1;
+ if(((unsigned)h->qscale) > max_qp){
+ av_log(h->avctx, AV_LOG_ERROR, "dquant out of range (%d) at %d %d\n", dquant, h->mb_x, h->mb_y);
 return -1;
 }
 }
 
- h->chroma_qp[0]= get_chroma_qp(h, 0, s->qscale);
- h->chroma_qp[1]= get_chroma_qp(h, 1, s->qscale);
+ h->chroma_qp[0]= get_chroma_qp(h, 0, h->qscale);
+ h->chroma_qp[1]= get_chroma_qp(h, 1, h->qscale);
 
 if( (ret = decode_luma_residual(h, gb, scan, scan8x8, pixel_shift, mb_type, cbp, 0)) < 0 ){
 return -1;
 }
 h->cbp_table[mb_xy] |= ret << 12;
- if(CHROMA444){
+ if (CHROMA444(h)) {
 if( decode_luma_residual(h, gb, scan, scan8x8, pixel_shift, mb_type, cbp, 1) < 0 ){
 return -1;
 }
 if( decode_luma_residual(h, gb, scan, scan8x8, pixel_shift, mb_type, cbp, 2) < 0 ){
 return -1;
 }
- } else if (CHROMA422) {
+ } else if (CHROMA422(h)) {
 if(cbp&0x30){
 for(chroma_idx=0; chroma_idx<2; chroma_idx++)
 if (decode_residual(h, gb, h->mb + ((256 + 16*16*chroma_idx) << pixel_shift),
@@ -1134,7 +1129,7 @@
 if(cbp&0x20){
 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]];
- DCTELEM *mb = h->mb + (16*(16 + 16*chroma_idx) << pixel_shift);
+ int16_t *mb = h->mb + (16*(16 + 16*chroma_idx) << pixel_shift);
 for (i8x8 = 0; i8x8 < 2; i8x8++) {
 for (i4x4 = 0; i4x4 < 4; i4x4++) {
 const int index = 16 + 16*chroma_idx + 8*i8x8 + i4x4;
@@ -1176,7 +1171,7 @@
 fill_rectangle(&h->non_zero_count_cache[scan8[16]], 4, 4, 8, 0, 1);
 fill_rectangle(&h->non_zero_count_cache[scan8[32]], 4, 4, 8, 0, 1);
 }
- s->current_picture.f.qscale_table[mb_xy] = s->qscale;
+ h->cur_pic.qscale_table[mb_xy] = h->qscale;
 write_back_non_zero_count(h);
 
 return 0;

libav-v9.6.tar.bz2/libavcodec/h264_direct.c -> libav-v10.1.tar.bz2/libavcodec/h264_direct.c Changed

@@ -26,14 +26,12 @@
 */
 
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h264.h"
 #include "rectangle.h"
 #include "thread.h"
 
-//#undef NDEBUG
 #include <assert.h>
 
 
@@ -50,14 +48,13 @@
 }
 
 void ff_h264_direct_dist_scale_factor(H264Context * const h){
- MpegEncContext * const s = &h->s;
- const int poc = h->s.current_picture_ptr->field_poc[ s->picture_structure == PICT_BOTTOM_FIELD ];
+ const int poc = h->cur_pic_ptr->field_poc[h->picture_structure == PICT_BOTTOM_FIELD];
 const int poc1 = h->ref_list[1][0].poc;
 int i, field;
 
- if (FRAME_MBAFF)
+ if (FRAME_MBAFF(h))
 for (field = 0; field < 2; field++){
- const int poc = h->s.current_picture_ptr->field_poc[field];
+ const int poc = h->cur_pic_ptr->field_poc[field];
 const int poc1 = h->ref_list[1][0].field_poc[field];
 for (i = 0; i < 2 * h->ref_count[0]; i++)
 h->dist_scale_factor_field[field][i^field] =
@@ -70,12 +67,11 @@
 }
 
 static void fill_colmap(H264Context *h, int map[2][16+32], int list, int field, int colfield, int mbafi){
- MpegEncContext * const s = &h->s;
 Picture * const ref1 = &h->ref_list[1][0];
 int j, old_ref, rfield;
 int start= mbafi ? 16 : 0;
 int end = mbafi ? 16+2*h->ref_count[0] : h->ref_count[0];
- int interl= mbafi || s->picture_structure != PICT_FRAME;
+ int interl= mbafi || h->picture_structure != PICT_FRAME;
 
 /* bogus; fills in for missing frames */
 memset(map[list], 0, sizeof(map[list]));
@@ -90,7 +86,7 @@
 poc= (poc&~3) + rfield + 1;
 
 for(j=start; j<end; j++){
- if (4 * h->ref_list[0][j].frame_num + (h->ref_list[0][j].f.reference & 3) == poc) {
+ if (4 * h->ref_list[0][j].frame_num + (h->ref_list[0][j].reference & 3) == poc) {
 int cur_ref= mbafi ? (j-16)^field : j;
 if (ref1->mbaff)
 map[list][2 * old_ref + (rfield^field) + 16] = cur_ref;
@@ -104,34 +100,33 @@
 }
 
 void ff_h264_direct_ref_list_init(H264Context * const h){
- MpegEncContext * const s = &h->s;
 Picture * const ref1 = &h->ref_list[1][0];
- Picture * const cur = s->current_picture_ptr;
+ Picture * const cur = h->cur_pic_ptr;
 int list, j, field;
- int sidx= (s->picture_structure&1)^1;
- int ref1sidx = (ref1->f.reference&1)^1;
+ int sidx= (h->picture_structure&1)^1;
+ int ref1sidx = (ref1->reference&1)^1;
 
 for(list=0; list<2; list++){
 cur->ref_count[sidx][list] = h->ref_count[list];
 for(j=0; j<h->ref_count[list]; j++)
- cur->ref_poc[sidx][list][j] = 4 * h->ref_list[list][j].frame_num + (h->ref_list[list][j].f.reference & 3);
+ cur->ref_poc[sidx][list][j] = 4 * h->ref_list[list][j].frame_num + (h->ref_list[list][j].reference & 3);
 }
 
- if(s->picture_structure == PICT_FRAME){
+ if(h->picture_structure == PICT_FRAME){
 memcpy(cur->ref_count[1], cur->ref_count[0], sizeof(cur->ref_count[0]));
 memcpy(cur->ref_poc [1], cur->ref_poc [0], sizeof(cur->ref_poc [0]));
 }
 
- cur->mbaff= FRAME_MBAFF;
+ cur->mbaff = FRAME_MBAFF(h);
 
 h->col_fieldoff= 0;
- if(s->picture_structure == PICT_FRAME){
- int cur_poc = s->current_picture_ptr->poc;
+ if(h->picture_structure == PICT_FRAME){
+ int cur_poc = h->cur_pic_ptr->poc;
 int *col_poc = h->ref_list[1]->field_poc;
 h->col_parity= (FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc));
 ref1sidx=sidx= h->col_parity;
- } else if (!(s->picture_structure & h->ref_list[1][0].f.reference) && !h->ref_list[1][0].mbaff) { // FL -> FL & differ parity
- h->col_fieldoff = 2 * h->ref_list[1][0].f.reference - 3;
+ } else if (!(h->picture_structure & h->ref_list[1][0].reference) && !h->ref_list[1][0].mbaff) { // FL -> FL & differ parity
+ h->col_fieldoff = 2 * h->ref_list[1][0].reference - 3;
 }
 
 if (h->slice_type_nos != AV_PICTURE_TYPE_B || h->direct_spatial_mv_pred)
@@ -139,7 +134,7 @@
 
 for(list=0; list<2; list++){
 fill_colmap(h, h->map_col_to_list0, list, sidx, ref1sidx, 0);
- if(FRAME_MBAFF)
+ if (FRAME_MBAFF(h))
 for(field=0; field<2; field++)
 fill_colmap(h, h->map_col_to_list0_field[field], list, field, field, 1);
 }
@@ -147,26 +142,25 @@
 
 static void await_reference_mb_row(H264Context * const h, Picture *ref, int mb_y)
 {
- int ref_field = ref->f.reference - 1;
+ int ref_field = ref->reference - 1;
 int ref_field_picture = ref->field_picture;
- int ref_height = 16*h->s.mb_height >> ref_field_picture;
+ int ref_height = 16*h->mb_height >> ref_field_picture;
 
- if(!HAVE_THREADS || !(h->s.avctx->active_thread_type&FF_THREAD_FRAME))
+ if(!HAVE_THREADS || !(h->avctx->active_thread_type&FF_THREAD_FRAME))
 return;
 
 //FIXME it can be safe to access mb stuff
 //even if pixels aren't deblocked yet
 
- ff_thread_await_progress(&ref->f,
+ ff_thread_await_progress(&ref->tf,
 FFMIN(16 * mb_y >> ref_field_picture, ref_height - 1),
 ref_field_picture && ref_field);
 }
 
 static void pred_spatial_direct_motion(H264Context * const h, int *mb_type){
- MpegEncContext * const s = &h->s;
 int b8_stride = 2;
 int b4_stride = h->b_stride;
- int mb_xy = h->mb_xy, mb_y = s->mb_y;
+ int mb_xy = h->mb_xy, mb_y = h->mb_y;
 int mb_type_col[2];
 const int16_t (*l1mv0)[2], (*l1mv1)[2];
 const int8_t *l1ref0, *l1ref1;
@@ -177,9 +171,9 @@
 int mv[2];
 int list;
 
- assert(h->ref_list[1][0].f.reference & 3);
+ assert(h->ref_list[1][0].reference & 3);
 
- await_reference_mb_row(h, &h->ref_list[1][0], s->mb_y + !!IS_INTERLACED(*mb_type));
+ await_reference_mb_row(h, &h->ref_list[1][0], h->mb_y + !!IS_INTERLACED(*mb_type));
 
 #define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM)
 
@@ -239,23 +233,23 @@
 return;
 }
 
- if (IS_INTERLACED(h->ref_list[1][0].f.mb_type[mb_xy])) { // AFL/AFR/FR/FL -> AFL/FL
+ if (IS_INTERLACED(h->ref_list[1][0].mb_type[mb_xy])) { // AFL/AFR/FR/FL -> AFL/FL
 if (!IS_INTERLACED(*mb_type)) { // AFR/FR -> AFL/FL
- mb_y = (s->mb_y&~1) + h->col_parity;
- mb_xy= s->mb_x + ((s->mb_y&~1) + h->col_parity)*s->mb_stride;
+ mb_y = (h->mb_y&~1) + h->col_parity;
+ mb_xy= h->mb_x + ((h->mb_y&~1) + h->col_parity)*h->mb_stride;
 b8_stride = 0;
 }else{
 mb_y += h->col_fieldoff;
- mb_xy += s->mb_stride*h->col_fieldoff; // non zero for FL -> FL & differ parity
+ mb_xy += h->mb_stride*h->col_fieldoff; // non zero for FL -> FL & differ parity
 }
 goto single_col;
 }else{ // AFL/AFR/FR/FL -> AFR/FR
 if(IS_INTERLACED(*mb_type)){ // AFL /FL -> AFR/FR
- mb_y = s->mb_y&~1;
- mb_xy= s->mb_x + (s->mb_y&~1)*s->mb_stride;
- mb_type_col[0] = h->ref_list[1][0].f.mb_type[mb_xy];
- mb_type_col[1] = h->ref_list[1][0].f.mb_type[mb_xy + s->mb_stride];
- b8_stride = 2+4*s->mb_stride;
+ mb_y = h->mb_y&~1;
+ mb_xy= h->mb_x + (h->mb_y&~1)*h->mb_stride;
+ mb_type_col[0] = h->ref_list[1][0].mb_type[mb_xy];
+ mb_type_col[1] = h->ref_list[1][0].mb_type[mb_xy + h->mb_stride];
+ b8_stride = 2+4*h->mb_stride;
 b4_stride *= 6;
 if (IS_INTERLACED(mb_type_col[0]) != IS_INTERLACED(mb_type_col[1])) {
 mb_type_col[0] &= ~MB_TYPE_INTERLACED;
@@ -273,7 +267,7 @@
 }else{ // AFR/FR -> AFR/FR
 single_col:
 mb_type_col[0] =
- mb_type_col[1] = h->ref_list[1][0].f.mb_type[mb_xy];
+ mb_type_col[1] = h->ref_list[1][0].mb_type[mb_xy];
 
 sub_mb_type |= MB_TYPE_16x16|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
 if(!is_b8x8 && (mb_type_col[0] & MB_TYPE_16x16_OR_INTRA)){
@@ -293,12 +287,12 @@
 
 await_reference_mb_row(h, &h->ref_list[1][0], mb_y);
 
- l1mv0 = &h->ref_list[1][0].f.motion_val[0][h->mb2b_xy [mb_xy]];
- l1mv1 = &h->ref_list[1][0].f.motion_val[1][h->mb2b_xy [mb_xy]];
- l1ref0 = &h->ref_list[1][0].f.ref_index [0][4 * mb_xy];
- l1ref1 = &h->ref_list[1][0].f.ref_index [1][4 * mb_xy];
+ l1mv0 = &h->ref_list[1][0].motion_val[0][h->mb2b_xy [mb_xy]];
+ l1mv1 = &h->ref_list[1][0].motion_val[1][h->mb2b_xy [mb_xy]];
+ l1ref0 = &h->ref_list[1][0].ref_index [0][4 * mb_xy];
+ l1ref1 = &h->ref_list[1][0].ref_index [1][4 * mb_xy];
 if(!b8_stride){
- if(s->mb_y&1){
+ if(h->mb_y&1){
 l1ref0 += 2;
 l1ref1 += 2;
 l1mv0 += 2*b4_stride;
@@ -414,10 +408,9 @@
 }
 
 static void pred_temp_direct_motion(H264Context * const h, int *mb_type){
- MpegEncContext * const s = &h->s;
 int b8_stride = 2;
 int b4_stride = h->b_stride;
- int mb_xy = h->mb_xy, mb_y = s->mb_y;
+ int mb_xy = h->mb_xy, mb_y = h->mb_y;
 int mb_type_col[2];
 const int16_t (*l1mv0)[2], (*l1mv1)[2];
 const int8_t *l1ref0, *l1ref1;
@@ -425,27 +418,27 @@
 unsigned int sub_mb_type;
 int i8, i4;
 
- assert(h->ref_list[1][0].f.reference & 3);
+ assert(h->ref_list[1][0].reference & 3);
 
- await_reference_mb_row(h, &h->ref_list[1][0], s->mb_y + !!IS_INTERLACED(*mb_type));
+ await_reference_mb_row(h, &h->ref_list[1][0], h->mb_y + !!IS_INTERLACED(*mb_type));
 
- if (IS_INTERLACED(h->ref_list[1][0].f.mb_type[mb_xy])) { // AFL/AFR/FR/FL -> AFL/FL
+ if (IS_INTERLACED(h->ref_list[1][0].mb_type[mb_xy])) { // AFL/AFR/FR/FL -> AFL/FL
 if (!IS_INTERLACED(*mb_type)) { // AFR/FR -> AFL/FL
- mb_y = (s->mb_y&~1) + h->col_parity;
- mb_xy= s->mb_x + ((s->mb_y&~1) + h->col_parity)*s->mb_stride;
+ mb_y = (h->mb_y&~1) + h->col_parity;
+ mb_xy= h->mb_x + ((h->mb_y&~1) + h->col_parity)*h->mb_stride;
 b8_stride = 0;
 }else{
 mb_y += h->col_fieldoff;
- mb_xy += s->mb_stride*h->col_fieldoff; // non zero for FL -> FL & differ parity
+ mb_xy += h->mb_stride*h->col_fieldoff; // non zero for FL -> FL & differ parity
 }
 goto single_col;
 }else{ // AFL/AFR/FR/FL -> AFR/FR
 if(IS_INTERLACED(*mb_type)){ // AFL /FL -> AFR/FR
- mb_y = s->mb_y&~1;
- mb_xy= s->mb_x + (s->mb_y&~1)*s->mb_stride;
- mb_type_col[0] = h->ref_list[1][0].f.mb_type[mb_xy];
- mb_type_col[1] = h->ref_list[1][0].f.mb_type[mb_xy + s->mb_stride];
- b8_stride = 2+4*s->mb_stride;
+ mb_y = h->mb_y&~1;
+ mb_xy= h->mb_x + (h->mb_y&~1)*h->mb_stride;
+ mb_type_col[0] = h->ref_list[1][0].mb_type[mb_xy];
+ mb_type_col[1] = h->ref_list[1][0].mb_type[mb_xy + h->mb_stride];
+ b8_stride = 2+4*h->mb_stride;
 b4_stride *= 6;
 if (IS_INTERLACED(mb_type_col[0]) != IS_INTERLACED(mb_type_col[1])) {
 mb_type_col[0] &= ~MB_TYPE_INTERLACED;
@@ -464,7 +457,7 @@
 }else{ // AFR/FR -> AFR/FR
 single_col:
 mb_type_col[0] =
- mb_type_col[1] = h->ref_list[1][0].f.mb_type[mb_xy];
+ mb_type_col[1] = h->ref_list[1][0].mb_type[mb_xy];
 
 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
 if(!is_b8x8 && (mb_type_col[0] & MB_TYPE_16x16_OR_INTRA)){
@@ -484,12 +477,12 @@
 
 await_reference_mb_row(h, &h->ref_list[1][0], mb_y);
 
- l1mv0 = &h->ref_list[1][0].f.motion_val[0][h->mb2b_xy [mb_xy]];
- l1mv1 = &h->ref_list[1][0].f.motion_val[1][h->mb2b_xy [mb_xy]];
- l1ref0 = &h->ref_list[1][0].f.ref_index [0][4 * mb_xy];
- l1ref1 = &h->ref_list[1][0].f.ref_index [1][4 * mb_xy];
+ l1mv0 = &h->ref_list[1][0].motion_val[0][h->mb2b_xy [mb_xy]];
+ l1mv1 = &h->ref_list[1][0].motion_val[1][h->mb2b_xy [mb_xy]];
+ l1ref0 = &h->ref_list[1][0].ref_index [0][4 * mb_xy];
+ l1ref1 = &h->ref_list[1][0].ref_index [1][4 * mb_xy];
 if(!b8_stride){
- if(s->mb_y&1){
+ if(h->mb_y&1){
 l1ref0 += 2;
 l1ref1 += 2;
 l1mv0 += 2*b4_stride;
@@ -502,10 +495,10 @@
 const int *dist_scale_factor = h->dist_scale_factor;
 int ref_offset;
 
- if(FRAME_MBAFF && IS_INTERLACED(*mb_type)){
- map_col_to_list0[0] = h->map_col_to_list0_field[s->mb_y&1][0];
- map_col_to_list0[1] = h->map_col_to_list0_field[s->mb_y&1][1];
- dist_scale_factor =h->dist_scale_factor_field[s->mb_y&1];
+ if (FRAME_MBAFF(h) && IS_INTERLACED(*mb_type)) {
+ map_col_to_list0[0] = h->map_col_to_list0_field[h->mb_y&1][0];
+ map_col_to_list0[1] = h->map_col_to_list0_field[h->mb_y&1][1];
+ dist_scale_factor =h->dist_scale_factor_field[h->mb_y&1];
 }
 ref_offset = (h->ref_list[1][0].mbaff<<4) & (mb_type_col[0]>>3); //if(h->ref_list[1][0].mbaff && IS_INTERLACED(mb_type_col[0])) ref_offset=16 else 0

libav-v9.6.tar.bz2/libavcodec/h264_loopfilter.c -> libav-v10.1.tar.bz2/libavcodec/h264_loopfilter.c Changed

@@ -25,16 +25,15 @@
 * @author Michael Niedermayer <michaelni@gmx.at>
 */
 
+#include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h264.h"
 #include "mathops.h"
 #include "rectangle.h"
 
-//#undef NDEBUG
 #include <assert.h>
 
 /* Deblocking filter (p153) */
@@ -244,23 +243,22 @@
 unsigned int uvlinesize,
 int pixel_shift)
 {
- MpegEncContext * const s = &h->s;
- int chroma = !(CONFIG_GRAY && (s->flags&CODEC_FLAG_GRAY));
- int chroma444 = CHROMA444;
- int chroma422 = CHROMA422;
+ int chroma = !(CONFIG_GRAY && (h->flags&CODEC_FLAG_GRAY));
+ int chroma444 = CHROMA444(h);
+ int chroma422 = CHROMA422(h);
 
 int mb_xy = h->mb_xy;
 int left_type= h->left_type[LTOP];
 int top_type= h->top_type;
 
 int qp_bd_offset = 6 * (h->sps.bit_depth_luma - 8);
- int a = h->slice_alpha_c0_offset - qp_bd_offset;
- int b = h->slice_beta_offset - qp_bd_offset;
+ int a = 52 + h->slice_alpha_c0_offset - qp_bd_offset;
+ int b = 52 + h->slice_beta_offset - qp_bd_offset;
 
- int mb_type = s->current_picture.f.mb_type[mb_xy];
- int qp = s->current_picture.f.qscale_table[mb_xy];
- int qp0 = s->current_picture.f.qscale_table[mb_xy - 1];
- int qp1 = s->current_picture.f.qscale_table[h->top_mb_xy];
+ int mb_type = h->cur_pic.mb_type[mb_xy];
+ int qp = h->cur_pic.qscale_table[mb_xy];
+ int qp0 = h->cur_pic.qscale_table[mb_xy - 1];
+ int qp1 = h->cur_pic.qscale_table[h->top_mb_xy];
 int qpc = get_chroma_qp( h, 0, qp );
 int qpc0 = get_chroma_qp( h, 0, qp0 );
 int qpc1 = get_chroma_qp( h, 0, qp1 );
@@ -272,7 +270,7 @@
 if( IS_INTRA(mb_type) ) {
 static const int16_t bS4[4] = {4,4,4,4};
 static const int16_t bS3[4] = {3,3,3,3};
- const int16_t *bSH = FIELD_PICTURE ? bS3 : bS4;
+ const int16_t *bSH = FIELD_PICTURE(h) ? bS3 : bS4;
 if(left_type)
 filter_mb_edgev( &img_y[4*0<<pixel_shift], linesize, bS4, qp0, a, b, h, 1);
 if( IS_8x8DCT(mb_type) ) {
@@ -373,12 +371,12 @@
 int step = 1+(mb_type>>24); //IS_8x8DCT(mb_type) ? 2 : 1;
 edges = 4 - 3*((mb_type>>3) & !(h->cbp & 15)); //(mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4;
 h->h264dsp.h264_loop_filter_strength( bS, h->non_zero_count_cache, h->ref_cache, h->mv_cache,
- h->list_count==2, edges, step, mask_edge0, mask_edge1, FIELD_PICTURE);
+ h->list_count==2, edges, step, mask_edge0, mask_edge1, FIELD_PICTURE(h));
 }
 if( IS_INTRA(left_type) )
 AV_WN64A(bS[0][0], 0x0004000400040004ULL);
 if( IS_INTRA(top_type) )
- AV_WN64A(bS[1][0], FIELD_PICTURE ? 0x0003000300030003ULL : 0x0004000400040004ULL);
+ AV_WN64A(bS[1][0], FIELD_PICTURE(h) ? 0x0003000300030003ULL : 0x0004000400040004ULL);
 
 #define FILTER(hv,dir,edge,intra)\
 if(AV_RN64A(bS[dir][edge])) { \
@@ -418,7 +416,7 @@
 }
 
 void ff_h264_filter_mb_fast( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize) {
- assert(!FRAME_MBAFF);
+ assert(!FRAME_MBAFF(h));
 if(!h->h264dsp.h264_loop_filter_strength || h->pps.chroma_qp_diff) {
 ff_h264_filter_mb(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize, uvlinesize);
 return;
@@ -465,11 +463,10 @@
 }
 
 static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize, int mb_xy, int mb_type, int mvy_limit, int first_vertical_edge_done, int a, int b, int chroma, int dir) {
- MpegEncContext * const s = &h->s;
 int edge;
 int chroma_qp_avg[2];
- int chroma444 = CHROMA444;
- int chroma422 = CHROMA422;
+ int chroma444 = CHROMA444(h);
+ int chroma422 = CHROMA422(h);
 const int mbm_xy = dir == 0 ? mb_xy -1 : h->top_mb_xy;
 const int mbm_type = dir == 0 ? h->left_type[LTOP] : h->top_type;
 
@@ -484,7 +481,7 @@
 
 if(mbm_type && !first_vertical_edge_done){
 
- if (FRAME_MBAFF && (dir == 1) && ((mb_y&1) == 0)
+ if (FRAME_MBAFF(h) && (dir == 1) && ((mb_y&1) == 0)
 && IS_INTERLACED(mbm_type&~mb_type)
 ) {
 // This is a special case in the norm where the filtering must
@@ -493,16 +490,16 @@
 //
 unsigned int tmp_linesize = 2 * linesize;
 unsigned int tmp_uvlinesize = 2 * uvlinesize;
- int mbn_xy = mb_xy - 2 * s->mb_stride;
+ int mbn_xy = mb_xy - 2 * h->mb_stride;
 int j;
 
- for(j=0; j<2; j++, mbn_xy += s->mb_stride){
+ for(j=0; j<2; j++, mbn_xy += h->mb_stride){
 DECLARE_ALIGNED(8, int16_t, bS)[4];
 int qp;
- if (IS_INTRA(mb_type | s->current_picture.f.mb_type[mbn_xy])) {
+ if (IS_INTRA(mb_type | h->cur_pic.mb_type[mbn_xy])) {
 AV_WN64A(bS, 0x0003000300030003ULL);
 } else {
- if (!CABAC && IS_8x8DCT(s->current_picture.f.mb_type[mbn_xy])) {
+ if (!CABAC(h) && IS_8x8DCT(h->cur_pic.mb_type[mbn_xy])) {
 bS[0]= 1+((h->cbp_table[mbn_xy] & 0x4000)||h->non_zero_count_cache[scan8[0]+0]);
 bS[1]= 1+((h->cbp_table[mbn_xy] & 0x4000)||h->non_zero_count_cache[scan8[0]+1]);
 bS[2]= 1+((h->cbp_table[mbn_xy] & 0x8000)||h->non_zero_count_cache[scan8[0]+2]);
@@ -517,12 +514,12 @@
 }
 // Do not use s->qscale as luma quantizer because it has not the same
 // value in IPCM macroblocks.
- qp = (s->current_picture.f.qscale_table[mb_xy] + s->current_picture.f.qscale_table[mbn_xy] + 1) >> 1;
- tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, tmp_linesize, tmp_uvlinesize);
- { int i; for (i = 0; i < 4; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); }
+ qp = (h->cur_pic.qscale_table[mb_xy] + h->cur_pic.qscale_table[mbn_xy] + 1) >> 1;
+ tprintf(h->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, tmp_linesize, tmp_uvlinesize);
+ { int i; for (i = 0; i < 4; i++) tprintf(h->avctx, " bS[%d]:%d", i, bS[i]); tprintf(h->avctx, "\n"); }
 filter_mb_edgeh( &img_y[j*linesize], tmp_linesize, bS, qp, a, b, h, 0 );
- chroma_qp_avg[0] = (h->chroma_qp[0] + get_chroma_qp(h, 0, s->current_picture.f.qscale_table[mbn_xy]) + 1) >> 1;
- chroma_qp_avg[1] = (h->chroma_qp[1] + get_chroma_qp(h, 1, s->current_picture.f.qscale_table[mbn_xy]) + 1) >> 1;
+ chroma_qp_avg[0] = (h->chroma_qp[0] + get_chroma_qp(h, 0, h->cur_pic.qscale_table[mbn_xy]) + 1) >> 1;
+ chroma_qp_avg[1] = (h->chroma_qp[1] + get_chroma_qp(h, 1, h->cur_pic.qscale_table[mbn_xy]) + 1) >> 1;
 if (chroma) {
 if (chroma444) {
 filter_mb_edgeh (&img_cb[j*uvlinesize], tmp_uvlinesize, bS, chroma_qp_avg[0], a, b, h, 0);
@@ -540,14 +537,14 @@
 if( IS_INTRA(mb_type|mbm_type)) {
 AV_WN64A(bS, 0x0003000300030003ULL);
 if ( (!IS_INTERLACED(mb_type|mbm_type))
- || ((FRAME_MBAFF || (s->picture_structure != PICT_FRAME)) && (dir == 0))
+ || ((FRAME_MBAFF(h) || (h->picture_structure != PICT_FRAME)) && (dir == 0))
 )
 AV_WN64A(bS, 0x0004000400040004ULL);
 } else {
 int i;
 int mv_done;
 
- if( dir && FRAME_MBAFF && IS_INTERLACED(mb_type ^ mbm_type)) {
+ if( dir && FRAME_MBAFF(h) && IS_INTERLACED(mb_type ^ mbm_type)) {
 AV_WN64A(bS, 0x0001000100010001ULL);
 mv_done = 1;
 }
@@ -582,10 +579,10 @@
 // Do not use s->qscale as luma quantizer because it has not the same
 // value in IPCM macroblocks.
 if(bS[0]+bS[1]+bS[2]+bS[3]){
- qp = (s->current_picture.f.qscale_table[mb_xy] + s->current_picture.f.qscale_table[mbm_xy] + 1) >> 1;
- tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize);
- chroma_qp_avg[0] = (h->chroma_qp[0] + get_chroma_qp(h, 0, s->current_picture.f.qscale_table[mbm_xy]) + 1) >> 1;
- chroma_qp_avg[1] = (h->chroma_qp[1] + get_chroma_qp(h, 1, s->current_picture.f.qscale_table[mbm_xy]) + 1) >> 1;
+ qp = (h->cur_pic.qscale_table[mb_xy] + h->cur_pic.qscale_table[mbm_xy] + 1) >> 1;
+ tprintf(h->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize);
+ chroma_qp_avg[0] = (h->chroma_qp[0] + get_chroma_qp(h, 0, h->cur_pic.qscale_table[mbm_xy]) + 1) >> 1;
+ chroma_qp_avg[1] = (h->chroma_qp[1] + get_chroma_qp(h, 1, h->cur_pic.qscale_table[mbm_xy]) + 1) >> 1;
 if( dir == 0 ) {
 filter_mb_edgev( &img_y[0], linesize, bS, qp, a, b, h, 1 );
 if (chroma) {
@@ -665,8 +662,8 @@
 /* Filter edge */
 // Do not use s->qscale as luma quantizer because it has not the same
 // value in IPCM macroblocks.
- qp = s->current_picture.f.qscale_table[mb_xy];
- tprintf(s->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize);
+ qp = h->cur_pic.qscale_table[mb_xy];
+ tprintf(h->avctx, "filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize);
 if( dir == 0 ) {
 filter_mb_edgev( &img_y[4*edge << h->pixel_shift], linesize, bS, qp, a, b, h, 0 );
 if (chroma) {
@@ -703,18 +700,17 @@
 }
 
 void ff_h264_filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize) {
- MpegEncContext * const s = &h->s;
- const int mb_xy= mb_x + mb_y*s->mb_stride;
- const int mb_type = s->current_picture.f.mb_type[mb_xy];
+ const int mb_xy= mb_x + mb_y*h->mb_stride;
+ const int mb_type = h->cur_pic.mb_type[mb_xy];
 const int mvy_limit = IS_INTERLACED(mb_type) ? 2 : 4;
 int first_vertical_edge_done = 0;
 av_unused int dir;
- int chroma = !(CONFIG_GRAY && (s->flags&CODEC_FLAG_GRAY));
+ int chroma = !(CONFIG_GRAY && (h->flags&CODEC_FLAG_GRAY));
 int qp_bd_offset = 6 * (h->sps.bit_depth_luma - 8);
- int a = h->slice_alpha_c0_offset - qp_bd_offset;
- int b = h->slice_beta_offset - qp_bd_offset;
+ int a = 52 + h->slice_alpha_c0_offset - qp_bd_offset;
+ int b = 52 + h->slice_beta_offset - qp_bd_offset;
 
- if (FRAME_MBAFF
+ if (FRAME_MBAFF(h)
 // and current and left pair do not have the same interlaced type
 && IS_INTERLACED(mb_type^h->left_type[LTOP])
 // and left mb is in available to us
@@ -743,9 +739,9 @@
 {3+4*0, 3+4*1, 3+4*2, 3+4*3, 3+4*0, 3+4*1, 3+4*2, 3+4*3},
 }
 };
- const uint8_t *off= offset[MB_FIELD][mb_y&1];
+ const uint8_t *off= offset[MB_FIELD(h)][mb_y&1];
 for( i = 0; i < 8; i++ ) {
- int j= MB_FIELD ? i>>2 : i&1;
+ int j= MB_FIELD(h) ? i>>2 : i&1;
 int mbn_xy = h->left_mb_xy[LEFT(j)];
 int mbn_type= h->left_type[LEFT(j)];
 
@@ -754,16 +750,16 @@
 else{
 bS[i] = 1 + !!(h->non_zero_count_cache[12+8*(i>>1)] |
 ((!h->pps.cabac && IS_8x8DCT(mbn_type)) ?
- (h->cbp_table[mbn_xy] & (((MB_FIELD ? (i&2) : (mb_y&1)) ? 8 : 2) << 12))
+ (h->cbp_table[mbn_xy] & (((MB_FIELD(h) ? (i&2) : (mb_y&1)) ? 8 : 2) << 12))
 :
 h->non_zero_count[mbn_xy][ off[i] ]));
 }
 }
 }
 
- mb_qp = s->current_picture.f.qscale_table[mb_xy];
- mbn0_qp = s->current_picture.f.qscale_table[h->left_mb_xy[0]];
- mbn1_qp = s->current_picture.f.qscale_table[h->left_mb_xy[1]];
+ mb_qp = h->cur_pic.qscale_table[mb_xy];
+ mbn0_qp = h->cur_pic.qscale_table[h->left_mb_xy[0]];
+ mbn1_qp = h->cur_pic.qscale_table[h->left_mb_xy[1]];
 qp[0] = ( mb_qp + mbn0_qp + 1 ) >> 1;
 bqp[0] = ( get_chroma_qp( h, 0, mb_qp ) +
 get_chroma_qp( h, 0, mbn0_qp ) + 1 ) >> 1;
@@ -776,18 +772,18 @@
 get_chroma_qp( h, 1, mbn1_qp ) + 1 ) >> 1;
 
 /* Filter edge */
- tprintf(s->avctx, "filter mb:%d/%d MBAFF, QPy:%d/%d, QPb:%d/%d QPr:%d/%d ls:%d uvls:%d", mb_x, mb_y, qp[0], qp[1], bqp[0], bqp[1], rqp[0], rqp[1], linesize, uvlinesize);
- { int i; for (i = 0; i < 8; i++) tprintf(s->avctx, " bS[%d]:%d", i, bS[i]); tprintf(s->avctx, "\n"); }
- if(MB_FIELD){
+ tprintf(h->avctx, "filter mb:%d/%d MBAFF, QPy:%d/%d, QPb:%d/%d QPr:%d/%d ls:%d uvls:%d", mb_x, mb_y, qp[0], qp[1], bqp[0], bqp[1], rqp[0], rqp[1], linesize, uvlinesize);
+ { int i; for (i = 0; i < 8; i++) tprintf(h->avctx, " bS[%d]:%d", i, bS[i]); tprintf(h->avctx, "\n"); }
+ if (MB_FIELD(h)) {
 filter_mb_mbaff_edgev ( h, img_y , linesize, bS , 1, qp [0], a, b, 1 );
 filter_mb_mbaff_edgev ( h, img_y + 8* linesize, linesize, bS+4, 1, qp [1], a, b, 1 );
 if (chroma){
- if (CHROMA444) {
+ if (CHROMA444(h)) {
 filter_mb_mbaff_edgev ( h, img_cb, uvlinesize, bS , 1, bqp[0], a, b, 1 );
 filter_mb_mbaff_edgev ( h, img_cb + 8*uvlinesize, uvlinesize, bS+4, 1, bqp[1], a, b, 1 );
 filter_mb_mbaff_edgev ( h, img_cr, uvlinesize, bS , 1, rqp[0], a, b, 1 );
 filter_mb_mbaff_edgev ( h, img_cr + 8*uvlinesize, uvlinesize, bS+4, 1, rqp[1], a, b, 1 );
- } else if (CHROMA422) {
+ } else if (CHROMA422(h)) {
 filter_mb_mbaff_edgecv(h, img_cb, uvlinesize, bS , 1, bqp[0], a, b, 1);
 filter_mb_mbaff_edgecv(h, img_cb + 8*uvlinesize, uvlinesize, bS+4, 1, bqp[1], a, b, 1);
 filter_mb_mbaff_edgecv(h, img_cr, uvlinesize, bS , 1, rqp[0], a, b, 1);
@@ -803,7 +799,7 @@
 filter_mb_mbaff_edgev ( h, img_y , 2* linesize, bS , 2, qp [0], a, b, 1 );
 filter_mb_mbaff_edgev ( h, img_y + linesize, 2* linesize, bS+1, 2, qp [1], a, b, 1 );
 if (chroma){
- if (CHROMA444) {
+ if (CHROMA444(h)) {
 filter_mb_mbaff_edgev ( h, img_cb, 2*uvlinesize, bS , 2, bqp[0], a, b, 1 );
 filter_mb_mbaff_edgev ( h, img_cb + uvlinesize, 2*uvlinesize, bS+1, 2, bqp[1], a, b, 1 );
 filter_mb_mbaff_edgev ( h, img_cr, 2*uvlinesize, bS , 2, rqp[0], a, b, 1 );

libav-v9.6.tar.bz2/libavcodec/h264_mb_template.c -> libav-v10.1.tar.bz2/libavcodec/h264_mb_template.c Changed

@@ -40,61 +40,60 @@
 
 static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
 {
- MpegEncContext *const s = &h->s;
- const int mb_x = s->mb_x;
- const int mb_y = s->mb_y;
+ const int mb_x = h->mb_x;
+ const int mb_y = h->mb_y;
 const int mb_xy = h->mb_xy;
- const int mb_type = s->current_picture.f.mb_type[mb_xy];
+ const int mb_type = h->cur_pic.mb_type[mb_xy];
 uint8_t *dest_y, *dest_cb, *dest_cr;
 int linesize, uvlinesize /*dct_offset*/;
 int i, j;
 int *block_offset = &h->block_offset[0];
- const int transform_bypass = !SIMPLE && (s->qscale == 0 && h->sps.transform_bypass);
+ const int transform_bypass = !SIMPLE && (h->qscale == 0 && h->sps.transform_bypass);
 /* is_h264 should always be true if SVQ3 is disabled. */
- const int is_h264 = !CONFIG_SVQ3_DECODER || SIMPLE || s->codec_id == AV_CODEC_ID_H264;
- void (*idct_add)(uint8_t *dst, DCTELEM *block, int stride);
- const int block_h = 16 >> s->chroma_y_shift;
- const int chroma422 = CHROMA422;
+ const int is_h264 = !CONFIG_SVQ3_DECODER || SIMPLE || h->avctx->codec_id == AV_CODEC_ID_H264;
+ void (*idct_add)(uint8_t *dst, int16_t *block, int stride);
+ const int block_h = 16 >> h->chroma_y_shift;
+ const int chroma422 = CHROMA422(h);
 
- dest_y = s->current_picture.f.data[0] + ((mb_x << PIXEL_SHIFT) + mb_y * s->linesize) * 16;
- dest_cb = s->current_picture.f.data[1] + (mb_x << PIXEL_SHIFT) * 8 + mb_y * s->uvlinesize * block_h;
- dest_cr = s->current_picture.f.data[2] + (mb_x << PIXEL_SHIFT) * 8 + mb_y * s->uvlinesize * block_h;
+ dest_y = h->cur_pic.f.data[0] + ((mb_x << PIXEL_SHIFT) + mb_y * h->linesize) * 16;
+ dest_cb = h->cur_pic.f.data[1] + (mb_x << PIXEL_SHIFT) * 8 + mb_y * h->uvlinesize * block_h;
+ dest_cr = h->cur_pic.f.data[2] + (mb_x << PIXEL_SHIFT) * 8 + mb_y * h->uvlinesize * block_h;
 
- s->vdsp.prefetch(dest_y + (s->mb_x & 3) * 4 * s->linesize + (64 << PIXEL_SHIFT), s->linesize, 4);
- s->vdsp.prefetch(dest_cb + (s->mb_x & 7) * s->uvlinesize + (64 << PIXEL_SHIFT), dest_cr - dest_cb, 2);
+ h->vdsp.prefetch(dest_y + (h->mb_x & 3) * 4 * h->linesize + (64 << PIXEL_SHIFT), h->linesize, 4);
+ h->vdsp.prefetch(dest_cb + (h->mb_x & 7) * h->uvlinesize + (64 << PIXEL_SHIFT), dest_cr - dest_cb, 2);
 
 h->list_counts[mb_xy] = h->list_count;
 
- if (!SIMPLE && MB_FIELD) {
- linesize = h->mb_linesize = s->linesize * 2;
- uvlinesize = h->mb_uvlinesize = s->uvlinesize * 2;
+ if (!SIMPLE && MB_FIELD(h)) {
+ linesize = h->mb_linesize = h->linesize * 2;
+ uvlinesize = h->mb_uvlinesize = h->uvlinesize * 2;
 block_offset = &h->block_offset[48];
 if (mb_y & 1) { // FIXME move out of this function?
- dest_y -= s->linesize * 15;
- dest_cb -= s->uvlinesize * (block_h - 1);
- dest_cr -= s->uvlinesize * (block_h - 1);
+ dest_y -= h->linesize * 15;
+ dest_cb -= h->uvlinesize * (block_h - 1);
+ dest_cr -= h->uvlinesize * (block_h - 1);
 }
- if (FRAME_MBAFF) {
+ if (FRAME_MBAFF(h)) {
 int list;
 for (list = 0; list < h->list_count; list++) {
 if (!USES_LIST(mb_type, list))
 continue;
 if (IS_16X16(mb_type)) {
 int8_t *ref = &h->ref_cache[list][scan8[0]];
- fill_rectangle(ref, 4, 4, 8, (16 + *ref) ^ (s->mb_y & 1), 1);
+ fill_rectangle(ref, 4, 4, 8, (16 + *ref) ^ (h->mb_y & 1), 1);
 } else {
 for (i = 0; i < 16; i += 4) {
 int ref = h->ref_cache[list][scan8[i]];
 if (ref >= 0)
 fill_rectangle(&h->ref_cache[list][scan8[i]], 2, 2,
- 8, (16 + ref) ^ (s->mb_y & 1), 1);
+ 8, (16 + ref) ^ (h->mb_y & 1), 1);
 }
 }
 }
 }
 } else {
- linesize = h->mb_linesize = s->linesize;
- uvlinesize = h->mb_uvlinesize = s->uvlinesize;
+ linesize = h->mb_linesize = h->linesize;
+ uvlinesize = h->mb_uvlinesize = h->uvlinesize;
 // dct_offset = s->linesize * 16;
 }
 
@@ -103,7 +102,7 @@
 const int bit_depth = h->sps.bit_depth_luma;
 int j;
 GetBitContext gb;
- init_get_bits(&gb, (uint8_t *)h->mb,
+ init_get_bits(&gb, h->intra_pcm_ptr,
 ff_h264_mb_sizes[h->sps.chroma_format_idc] * bit_depth);
 
 for (i = 0; i < 16; i++) {
@@ -111,7 +110,7 @@
 for (j = 0; j < 16; j++)
 tmp_y[j] = get_bits(&gb, bit_depth);
 }
- if (SIMPLE || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
+ if (SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) {
 if (!h->sps.chroma_format_idc) {
 for (i = 0; i < block_h; i++) {
 uint16_t *tmp_cb = (uint16_t *)(dest_cb + i * uvlinesize);
@@ -138,16 +137,16 @@
 }
 } else {
 for (i = 0; i < 16; i++)
- memcpy(dest_y + i * linesize, (uint8_t *)h->mb + i * 16, 16);
- if (SIMPLE || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
+ memcpy(dest_y + i * linesize, h->intra_pcm_ptr + i * 16, 16);
+ if (SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) {
 if (!h->sps.chroma_format_idc) {
 for (i = 0; i < block_h; i++) {
 memset(dest_cb + i * uvlinesize, 128, 8);
 memset(dest_cr + i * uvlinesize, 128, 8);
 }
 } else {
- uint8_t *src_cb = (uint8_t *)h->mb + 256;
- uint8_t *src_cr = (uint8_t *)h->mb + 256 + block_h * 8;
+ const uint8_t *src_cb = h->intra_pcm_ptr + 256;
+ const uint8_t *src_cr = h->intra_pcm_ptr + 256 + block_h * 8;
 for (i = 0; i < block_h; i++) {
 memcpy(dest_cb + i * uvlinesize, src_cb + i * 8, 8);
 memcpy(dest_cr + i * uvlinesize, src_cr + i * 8, 8);
@@ -161,7 +160,7 @@
 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize,
 uvlinesize, 1, 0, SIMPLE, PIXEL_SHIFT);
 
- if (SIMPLE || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
+ if (SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) {
 h->hpc.pred8x8[h->chroma_pred_mode](dest_cb, uvlinesize);
 h->hpc.pred8x8[h->chroma_pred_mode](dest_cr, uvlinesize);
 }
@@ -176,14 +175,14 @@
 } else if (is_h264) {
 if (chroma422) {
 FUNC(hl_motion_422)(h, dest_y, dest_cb, dest_cr,
- s->me.qpel_put, s->dsp.put_h264_chroma_pixels_tab,
- s->me.qpel_avg, s->dsp.avg_h264_chroma_pixels_tab,
+ h->me.qpel_put, h->h264chroma.put_h264_chroma_pixels_tab,
+ h->me.qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab,
 h->h264dsp.weight_h264_pixels_tab,
 h->h264dsp.biweight_h264_pixels_tab);
 } else {
 FUNC(hl_motion_420)(h, dest_y, dest_cb, dest_cr,
- s->me.qpel_put, s->dsp.put_h264_chroma_pixels_tab,
- s->me.qpel_avg, s->dsp.avg_h264_chroma_pixels_tab,
+ h->me.qpel_put, h->h264chroma.put_h264_chroma_pixels_tab,
+ h->me.qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab,
 h->h264dsp.weight_h264_pixels_tab,
 h->h264dsp.biweight_h264_pixels_tab);
 }
@@ -192,7 +191,7 @@
 hl_decode_mb_idct_luma(h, mb_type, is_h264, SIMPLE, transform_bypass,
 PIXEL_SHIFT, block_offset, linesize, dest_y, 0);
 
- if ((SIMPLE || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) &&
+ if ((SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) &&
 (h->cbp & 0x30)) {
 uint8_t *dest[2] = { dest_cb, dest_cr };
 if (transform_bypass) {
@@ -208,7 +207,7 @@
 h->mb + (16 * 16 * 2 << PIXEL_SHIFT),
 uvlinesize);
 } else {
- idct_add = s->dsp.add_pixels4;
+ idct_add = h->h264dsp.h264_add_pixels4_clear;
 for (j = 1; j < 3; j++) {
 for (i = j * 16; i < j * 16 + 4; i++)
 if (h->non_zero_count_cache[scan8[i]] ||
@@ -256,17 +255,13 @@
 uint8_t *const ptr = dest[j - 1] + block_offset[i];
 ff_svq3_add_idct_c(ptr, h->mb + i * 16,
 uvlinesize,
- ff_h264_chroma_qp[0][s->qscale + 12] - 12, 2);
+ ff_h264_chroma_qp[0][h->qscale + 12] - 12, 2);
 }
 }
 }
 }
 }
 }
- if (h->cbp || IS_INTRA(mb_type)) {
- s->dsp.clear_blocks(h->mb);
- s->dsp.clear_blocks(h->mb + (24 * 16 << PIXEL_SHIFT));
- }
 }
 
 #if !SIMPLE || BITS == 8
@@ -277,60 +272,59 @@
 
 static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h)
 {
- MpegEncContext *const s = &h->s;
- const int mb_x = s->mb_x;
- const int mb_y = s->mb_y;
+ const int mb_x = h->mb_x;
+ const int mb_y = h->mb_y;
 const int mb_xy = h->mb_xy;
- const int mb_type = s->current_picture.f.mb_type[mb_xy];
+ const int mb_type = h->cur_pic.mb_type[mb_xy];
 uint8_t *dest[3];
 int linesize;
 int i, j, p;
 int *block_offset = &h->block_offset[0];
- const int transform_bypass = !SIMPLE && (s->qscale == 0 && h->sps.transform_bypass);
- const int plane_count = (SIMPLE || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) ? 3 : 1;
+ const int transform_bypass = !SIMPLE && (h->qscale == 0 && h->sps.transform_bypass);
+ const int plane_count = (SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) ? 3 : 1;
 
 for (p = 0; p < plane_count; p++) {
- dest[p] = s->current_picture.f.data[p] +
- ((mb_x << PIXEL_SHIFT) + mb_y * s->linesize) * 16;
- s->vdsp.prefetch(dest[p] + (s->mb_x & 3) * 4 * s->linesize + (64 << PIXEL_SHIFT),
- s->linesize, 4);
+ dest[p] = h->cur_pic.f.data[p] +
+ ((mb_x << PIXEL_SHIFT) + mb_y * h->linesize) * 16;
+ h->vdsp.prefetch(dest[p] + (h->mb_x & 3) * 4 * h->linesize + (64 << PIXEL_SHIFT),
+ h->linesize, 4);
 }
 
 h->list_counts[mb_xy] = h->list_count;
 
- if (!SIMPLE && MB_FIELD) {
- linesize = h->mb_linesize = h->mb_uvlinesize = s->linesize * 2;
+ if (!SIMPLE && MB_FIELD(h)) {
+ linesize = h->mb_linesize = h->mb_uvlinesize = h->linesize * 2;
 block_offset = &h->block_offset[48];
 if (mb_y & 1) // FIXME move out of this function?
 for (p = 0; p < 3; p++)
- dest[p] -= s->linesize * 15;
- if (FRAME_MBAFF) {
+ dest[p] -= h->linesize * 15;
+ if (FRAME_MBAFF(h)) {
 int list;
 for (list = 0; list < h->list_count; list++) {
 if (!USES_LIST(mb_type, list))
 continue;
 if (IS_16X16(mb_type)) {
 int8_t *ref = &h->ref_cache[list][scan8[0]];
- fill_rectangle(ref, 4, 4, 8, (16 + *ref) ^ (s->mb_y & 1), 1);
+ fill_rectangle(ref, 4, 4, 8, (16 + *ref) ^ (h->mb_y & 1), 1);
 } else {
 for (i = 0; i < 16; i += 4) {
 int ref = h->ref_cache[list][scan8[i]];
 if (ref >= 0)
 fill_rectangle(&h->ref_cache[list][scan8[i]], 2, 2,
- 8, (16 + ref) ^ (s->mb_y & 1), 1);
+ 8, (16 + ref) ^ (h->mb_y & 1), 1);
 }
 }
 }
 }
 } else {
- linesize = h->mb_linesize = h->mb_uvlinesize = s->linesize;
+ linesize = h->mb_linesize = h->mb_uvlinesize = h->linesize;
 }
 
 if (!SIMPLE && IS_INTRA_PCM(mb_type)) {
 if (PIXEL_SHIFT) {
 const int bit_depth = h->sps.bit_depth_luma;
 GetBitContext gb;
- init_get_bits(&gb, (uint8_t *)h->mb, 768 * bit_depth);
+ init_get_bits(&gb, h->intra_pcm_ptr, 768 * bit_depth);
 
 for (p = 0; p < plane_count; p++)
 for (i = 0; i < 16; i++) {
@@ -342,7 +336,7 @@
 for (p = 0; p < plane_count; p++)
 for (i = 0; i < 16; i++)
 memcpy(dest[p] + i * linesize,
- (uint8_t *)h->mb + p * 256 + i * 16, 16);
+ h->intra_pcm_ptr + p * 256 + i * 16, 16);
 }
 } else {
 if (IS_INTRA(mb_type)) {
@@ -360,8 +354,8 @@
 linesize, 0, 1, SIMPLE, PIXEL_SHIFT);
 } else {
 FUNC(hl_motion_444)(h, dest[0], dest[1], dest[2],
- s->me.qpel_put, s->dsp.put_h264_chroma_pixels_tab,
- s->me.qpel_avg, s->dsp.avg_h264_chroma_pixels_tab,
+ h->me.qpel_put, h->h264chroma.put_h264_chroma_pixels_tab,
+ h->me.qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab,
 h->h264dsp.weight_h264_pixels_tab,
 h->h264dsp.biweight_h264_pixels_tab);
 }
@@ -371,10 +365,6 @@
 PIXEL_SHIFT, block_offset, linesize,
 dest[p], p);
 }
- if (h->cbp || IS_INTRA(mb_type)) {
- s->dsp.clear_blocks(h->mb);
- s->dsp.clear_blocks(h->mb + (24 * 16 << PIXEL_SHIFT));
- }
 }
 
 #endif

libav-v9.6.tar.bz2/libavcodec/h264_mc_template.c -> libav-v10.1.tar.bz2/libavcodec/h264_mc_template.c Changed

@@ -46,7 +46,7 @@
                     int list0, int list1)
 {
     if ((h->use_weight == 2 && list0 && list1 &&
-         (h->implicit_weight[h->ref_cache[0][scan8[n]]][h->ref_cache[1][scan8[n]]][h->s.mb_y & 1] != 32)) ||
+         (h->implicit_weight[h->ref_cache[0][scan8[n]]][h->ref_cache[1][scan8[n]]][h->mb_y & 1] != 32)) ||
         h->use_weight == 1)
         mc_part_weighted(h, n, square, height, delta, dest_y, dest_cb, dest_cr,
                          x_offset, y_offset, qpix_put, chroma_put,
@@ -67,13 +67,12 @@
                               h264_weight_func *weight_op,
                               h264_biweight_func *weight_avg)
 {
-    MpegEncContext *const s = &h->s;
     const int mb_xy   = h->mb_xy;
-    const int mb_type = s->current_picture.f.mb_type[mb_xy];
+    const int mb_type = h->cur_pic.mb_type[mb_xy];
 
     assert(IS_INTER(mb_type));
 
-    if (HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME))
+    if (HAVE_THREADS && (h->avctx->active_thread_type & FF_THREAD_FRAME))
         await_references(h);
     prefetch_motion(h, 0, PIXEL_SHIFT, CHROMA_IDC);

libav-v9.6.tar.bz2/libavcodec/h264_mp4toannexb_bsf.c -> libav-v10.1.tar.bz2/libavcodec/h264_mp4toannexb_bsf.c Changed

@@ -31,118 +31,135 @@
 int extradata_parsed;
 } H264BSFContext;
 
-static int alloc_and_copy(uint8_t **poutbuf, int *poutbuf_size,
+static int alloc_and_copy(uint8_t **poutbuf, int *poutbuf_size,
 const uint8_t *sps_pps, uint32_t sps_pps_size,
- const uint8_t *in, uint32_t in_size) {
- uint32_t offset = *poutbuf_size;
+ const uint8_t *in, uint32_t in_size)
+{
+ 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);
- if (!tmp)
- return AVERROR(ENOMEM);
- *poutbuf = tmp;
+ *poutbuf_size += sps_pps_size + in_size + nal_header_size;
+ 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);
+ memcpy(*poutbuf + offset, sps_pps, sps_pps_size);
+ memcpy(*poutbuf + sps_pps_size + nal_header_size + offset, in, in_size);
 if (!offset) {
- AV_WB32(*poutbuf+sps_pps_size, 1);
+ AV_WB32(*poutbuf + sps_pps_size, 1);
 } else {
- (*poutbuf+offset+sps_pps_size)[0] = (*poutbuf+offset+sps_pps_size)[1] = 0;
- (*poutbuf+offset+sps_pps_size)[2] = 1;
+ (*poutbuf + offset + sps_pps_size)[0] =
+ (*poutbuf + offset + sps_pps_size)[1] = 0;
+ (*poutbuf + offset + sps_pps_size)[2] = 1;
 }
 
 return 0;
 }
 
+static int h264_extradata_to_annexb(AVCodecContext *avctx, const int padding)
+{
+ uint16_t unit_size;
+ uint64_t total_size = 0;
+ uint8_t *out = NULL, unit_nb, sps_done = 0,
+ sps_seen = 0, pps_seen = 0;
+ const uint8_t *extradata = avctx->extradata + 4;
+ static const uint8_t nalu_header[4] = { 0, 0, 0, 1 };
+ int length_size = (*extradata++ & 0x3) + 1; // retrieve length coded size
+
+ if (length_size == 3)
+ return AVERROR(EINVAL);
+
+ /* retrieve sps and pps unit(s) */
+ unit_nb = *extradata++ & 0x1f; /* number of sps unit(s) */
+ if (!unit_nb) {
+ unit_nb = *extradata++; /* number of pps unit(s) */
+ sps_done++;
+
+ if (unit_nb)
+ pps_seen = 1;
+ } else {
+ sps_seen = 1;
+ }
+
+ while (unit_nb--) {
+ int err;
+
+ unit_size = AV_RB16(extradata);
+ total_size += unit_size + 4;
+ if (total_size > INT_MAX - padding ||
+ extradata + 2 + unit_size > avctx->extradata +
+ avctx->extradata_size) {
+ av_free(out);
+ return AVERROR(EINVAL);
+ }
+ 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;
+
+ if (!unit_nb && !sps_done++) {
+ unit_nb = *extradata++; /* number of pps unit(s) */
+ if (unit_nb)
+ pps_seen = 1;
+ }
+ }
+
+ if (out)
+ memset(out + total_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+
+ if (!sps_seen)
+ av_log(avctx, AV_LOG_WARNING,
+ "Warning: SPS NALU missing or invalid. "
+ "The resulting stream may not play.\n");
+
+ if (!pps_seen)
+ av_log(avctx, AV_LOG_WARNING,
+ "Warning: PPS NALU missing or invalid. "
+ "The resulting stream may not play.\n");
+
+ av_free(avctx->extradata);
+ avctx->extradata = out;
+ avctx->extradata_size = total_size;
+
+ return length_size;
+}
+
 static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
 AVCodecContext *avctx, const char *args,
- uint8_t **poutbuf, int *poutbuf_size,
- const uint8_t *buf, int buf_size,
- int keyframe) {
+ uint8_t **poutbuf, int *poutbuf_size,
+ const uint8_t *buf, int buf_size,
+ int keyframe)
+{
 H264BSFContext *ctx = bsfc->priv_data;
 uint8_t unit_type;
 int32_t nal_size;
- uint32_t cumul_size = 0;
+ uint32_t cumul_size = 0;
 const uint8_t *buf_end = buf + buf_size;
+ int ret = 0;
 
 /* nothing to filter */
 if (!avctx->extradata || avctx->extradata_size < 6) {
- *poutbuf = (uint8_t*) buf;
+ *poutbuf = (uint8_t *)buf;
 *poutbuf_size = buf_size;
 return 0;
 }
 
 /* retrieve sps and pps NAL units from extradata */
 if (!ctx->extradata_parsed) {
- uint16_t unit_size;
- uint64_t total_size = 0;
- uint8_t *out = NULL, unit_nb, sps_done = 0, sps_seen = 0, pps_seen = 0;
- const uint8_t *extradata = avctx->extradata+4;
- static const uint8_t nalu_header[4] = {0, 0, 0, 1};
-
- /* retrieve length coded size */
- ctx->length_size = (*extradata++ & 0x3) + 1;
- if (ctx->length_size == 3)
- return AVERROR(EINVAL);
-
- /* retrieve sps and pps unit(s) */
- unit_nb = *extradata++ & 0x1f; /* number of sps unit(s) */
- if (!unit_nb) {
- unit_nb = *extradata++; /* number of pps unit(s) */
- sps_done++;
-
- if (unit_nb)
- pps_seen = 1;
- } else {
- sps_seen = 1;
- }
-
- while (unit_nb--) {
- void *tmp;
-
- unit_size = AV_RB16(extradata);
- total_size += unit_size+4;
- if (total_size > INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE ||
- extradata+2+unit_size > avctx->extradata+avctx->extradata_size) {
- av_free(out);
- return AVERROR(EINVAL);
- }
- tmp = av_realloc(out, total_size + FF_INPUT_BUFFER_PADDING_SIZE);
- if (!tmp) {
- av_free(out);
- return AVERROR(ENOMEM);
- }
- out = tmp;
- memcpy(out+total_size-unit_size-4, nalu_header, 4);
- memcpy(out+total_size-unit_size, extradata+2, unit_size);
- extradata += 2+unit_size;
-
- if (!unit_nb && !sps_done++) {
- unit_nb = *extradata++; /* number of pps unit(s) */
- if (unit_nb)
- pps_seen = 1;
- }
- }
-
- if(out)
- memset(out + total_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-
- if (!sps_seen)
- av_log(avctx, AV_LOG_WARNING, "Warning: SPS NALU missing or invalid. The resulting stream may not play.\n");
- if (!pps_seen)
- av_log(avctx, AV_LOG_WARNING, "Warning: PPS NALU missing or invalid. The resulting stream may not play.\n");
-
- av_free(avctx->extradata);
- avctx->extradata = out;
- avctx->extradata_size = total_size;
+ ret = h264_extradata_to_annexb(avctx, FF_INPUT_BUFFER_PADDING_SIZE);
+ if (ret < 0)
+ return ret;
+ ctx->length_size = ret;
 ctx->first_idr = 1;
 ctx->extradata_parsed = 1;
 }
 
 *poutbuf_size = 0;
- *poutbuf = NULL;
+ *poutbuf = NULL;
 do {
 if (buf + ctx->length_size > buf_end)
 goto fail;
@@ -154,7 +171,7 @@
 } else
 nal_size = AV_RB32(buf);
 
- buf += ctx->length_size;
+ buf += ctx->length_size;
 unit_type = *buf & 0x1f;
 
 if (buf + nal_size > buf_end || nal_size < 0)
@@ -169,14 +186,13 @@
 ctx->first_idr = 0;
 } else {
 if (alloc_and_copy(poutbuf, poutbuf_size,
- NULL, 0,
- buf, nal_size) < 0)
+ NULL, 0, buf, nal_size) < 0)
 goto fail;
 if (!ctx->first_idr && unit_type == 1)
 ctx->first_idr = 1;
 }
 
- buf += nal_size;
+ buf += nal_size;
 cumul_size += nal_size + ctx->length_size;
 } while (cumul_size < buf_size);

libav-v9.6.tar.bz2/libavcodec/h264_mvpred.h -> libav-v10.1.tar.bz2/libavcodec/h264_mvpred.h Changed

@@ -32,41 +32,39 @@
 #include "avcodec.h"
 #include "h264.h"
 
-//#undef NDEBUG
 #include <assert.h>
 
 static av_always_inline int fetch_diagonal_mv(H264Context *h, const int16_t **C,
 int i, int list, int part_width)
 {
 const int topright_ref = h->ref_cache[list][i - 8 + part_width];
- MpegEncContext *s = &h->s;
 
 /* there is no consistent mapping of mvs to neighboring locations that will
 * make mbaff happy, so we can't move all this logic to fill_caches */
- if (FRAME_MBAFF) {
+ if (FRAME_MBAFF(h)) {
 #define SET_DIAG_MV(MV_OP, REF_OP, XY, Y4) \
 const int xy = XY, y4 = Y4; \
- const int mb_type = mb_types[xy + (y4 >> 2) * s->mb_stride]; \
+ const int mb_type = mb_types[xy + (y4 >> 2) * h->mb_stride]; \
 if (!USES_LIST(mb_type, list)) \
 return LIST_NOT_USED; \
- mv = s->current_picture_ptr->f.motion_val[list][h->mb2b_xy[xy] + 3 + y4 * h->b_stride]; \
+ mv = h->cur_pic_ptr->motion_val[list][h->mb2b_xy[xy] + 3 + y4 * h->b_stride]; \
 h->mv_cache[list][scan8[0] - 2][0] = mv[0]; \
 h->mv_cache[list][scan8[0] - 2][1] = mv[1] MV_OP; \
- return s->current_picture_ptr->f.ref_index[list][4 * xy + 1 + (y4 & ~1)] REF_OP;
+ return h->cur_pic_ptr->ref_index[list][4 * xy + 1 + (y4 & ~1)] REF_OP;
 
 if (topright_ref == PART_NOT_AVAILABLE
 && i >= scan8[0] + 8 && (i & 7) == 4
 && h->ref_cache[list][scan8[0] - 1] != PART_NOT_AVAILABLE) {
- const uint32_t *mb_types = s->current_picture_ptr->f.mb_type;
+ const uint32_t *mb_types = h->cur_pic_ptr->mb_type;
 const int16_t *mv;
 AV_ZERO32(h->mv_cache[list][scan8[0] - 2]);
 *C = h->mv_cache[list][scan8[0] - 2];
 
- if (!MB_FIELD && IS_INTERLACED(h->left_type[0])) {
- SET_DIAG_MV(* 2, >> 1, h->left_mb_xy[0] + s->mb_stride,
- (s->mb_y & 1) * 2 + (i >> 5));
+ if (!MB_FIELD(h) && IS_INTERLACED(h->left_type[0])) {
+ SET_DIAG_MV(* 2, >> 1, h->left_mb_xy[0] + h->mb_stride,
+ (h->mb_y & 1) * 2 + (i >> 5));
 }
- if (MB_FIELD && !IS_INTERLACED(h->left_type[0])) {
+ if (MB_FIELD(h) && !IS_INTERLACED(h->left_type[0])) {
 // left shift will turn LIST_NOT_USED into PART_NOT_AVAILABLE, but that's OK.
 SET_DIAG_MV(/ 2, << 1, h->left_mb_xy[i >= 36], ((i >> 2)) & 3);
 }
@@ -78,7 +76,7 @@
 *C = h->mv_cache[list][i - 8 + part_width];
 return topright_ref;
 } else {
- tprintf(s->avctx, "topright MV not available\n");
+ tprintf(h->avctx, "topright MV not available\n");
 
 *C = h->mv_cache[list][i - 8 - 1];
 return h->ref_cache[list][i - 8 - 1];
@@ -116,7 +114,7 @@
 
 diagonal_ref = fetch_diagonal_mv(h, &C, index8, list, part_width);
 match_count = (diagonal_ref == ref) + (top_ref == ref) + (left_ref == ref);
- tprintf(h->s.avctx, "pred_motion match_count=%d\n", match_count);
+ tprintf(h->avctx, "pred_motion match_count=%d\n", match_count);
 if (match_count > 1) { //most common
 *mx = mid_pred(A[0], B[0], C[0]);
 *my = mid_pred(A[1], B[1], C[1]);
@@ -143,10 +141,10 @@
 }
 }
 
- tprintf(h->s.avctx,
+ tprintf(h->avctx,
 "pred_motion (%2d %2d %2d) (%2d %2d %2d) (%2d %2d %2d) -> (%2d %2d %2d) at %2d %2d %d list %d\n",
 top_ref, B[0], B[1], diagonal_ref, C[0], C[1], left_ref,
- A[0], A[1], ref, *mx, *my, h->s.mb_x, h->s.mb_y, n, list);
+ A[0], A[1], ref, *mx, *my, h->mb_x, h->mb_y, n, list);
 }
 
 /**
@@ -163,8 +161,8 @@
 const int top_ref = h->ref_cache[list][scan8[0] - 8];
 const int16_t *const B = h->mv_cache[list][scan8[0] - 8];
 
- tprintf(h->s.avctx, "pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n",
- top_ref, B[0], B[1], h->s.mb_x, h->s.mb_y, n, list);
+ tprintf(h->avctx, "pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n",
+ top_ref, B[0], B[1], h->mb_x, h->mb_y, n, list);
 
 if (top_ref == ref) {
 *mx = B[0];
@@ -175,8 +173,8 @@
 const int left_ref = h->ref_cache[list][scan8[8] - 1];
 const int16_t *const A = h->mv_cache[list][scan8[8] - 1];
 
- tprintf(h->s.avctx, "pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n",
- left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list);
+ tprintf(h->avctx, "pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n",
+ left_ref, A[0], A[1], h->mb_x, h->mb_y, n, list);
 
 if (left_ref == ref) {
 *mx = A[0];
@@ -203,8 +201,8 @@
 const int left_ref = h->ref_cache[list][scan8[0] - 1];
 const int16_t *const A = h->mv_cache[list][scan8[0] - 1];
 
- tprintf(h->s.avctx, "pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n",
- left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list);
+ tprintf(h->avctx, "pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n",
+ left_ref, A[0], A[1], h->mb_x, h->mb_y, n, list);
 
 if (left_ref == ref) {
 *mx = A[0];
@@ -217,8 +215,8 @@
 
 diagonal_ref = fetch_diagonal_mv(h, &C, scan8[4], list, 2);
 
- tprintf(h->s.avctx, "pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n",
- diagonal_ref, C[0], C[1], h->s.mb_x, h->s.mb_y, n, list);
+ tprintf(h->avctx, "pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n",
+ diagonal_ref, C[0], C[1], h->mb_x, h->mb_y, n, list);
 
 if (diagonal_ref == ref) {
 *mx = C[0];
@@ -232,8 +230,8 @@
 }
 
 #define FIX_MV_MBAFF(type, refn, mvn, idx) \
- if (FRAME_MBAFF) { \
- if (MB_FIELD) { \
+ if (FRAME_MBAFF(h)) { \
+ if (MB_FIELD(h)) { \
 if (!IS_INTERLACED(type)) { \
 refn <<= 1; \
 AV_COPY32(mvbuf[idx], mvn); \
@@ -254,9 +252,8 @@
 {
 DECLARE_ALIGNED(4, static const int16_t, zeromv)[2] = { 0 };
 DECLARE_ALIGNED(4, int16_t, mvbuf)[3][2];
- MpegEncContext *const s = &h->s;
- int8_t *ref = s->current_picture.f.ref_index[0];
- int16_t(*mv)[2] = s->current_picture.f.motion_val[0];
+ int8_t *ref = h->cur_pic.ref_index[0];
+ int16_t(*mv)[2] = h->cur_pic.motion_val[0];
 int top_ref, left_ref, diagonal_ref, match_count, mx, my;
 const int16_t *A, *B, *C;
 int b_stride = h->b_stride;
@@ -294,8 +291,8 @@
 goto zeromv;
 }
 
- tprintf(h->s.avctx, "pred_pskip: (%d) (%d) at %2d %2d\n",
- top_ref, left_ref, h->s.mb_x, h->s.mb_y);
+ tprintf(h->avctx, "pred_pskip: (%d) (%d) at %2d %2d\n",
+ top_ref, left_ref, h->mb_x, h->mb_y);
 
 if (USES_LIST(h->topright_type, 0)) {
 diagonal_ref = ref[4 * h->topright_mb_xy + 2];
@@ -321,7 +318,7 @@
 }
 
 match_count = !diagonal_ref + !top_ref + !left_ref;
- tprintf(h->s.avctx, "pred_pskip_motion match_count=%d\n", match_count);
+ tprintf(h->avctx, "pred_pskip_motion match_count=%d\n", match_count);
 if (match_count > 1) {
 mx = mid_pred(A[0], B[0], C[0]);
 my = mid_pred(A[1], B[1], C[1]);
@@ -351,7 +348,6 @@
 
 static void fill_decode_neighbors(H264Context *h, int mb_type)
 {
- MpegEncContext *const s = &h->s;
 const int mb_xy = h->mb_xy;
 int topleft_xy, top_xy, topright_xy, left_xy[LEFT_MBS];
 static const uint8_t left_block_options[4][32] = {
@@ -363,7 +359,7 @@
 
 h->topleft_partition = -1;
 
- top_xy = mb_xy - (s->mb_stride << MB_FIELD);
+ top_xy = mb_xy - (h->mb_stride << MB_FIELD(h));
 
 /* Wow, what a mess, why didn't they simplify the interlacing & intra
 * stuff, I can't imagine that these complex rules are worth it. */
@@ -372,17 +368,17 @@
 topright_xy = top_xy + 1;
 left_xy[LBOT] = left_xy[LTOP] = mb_xy - 1;
 h->left_block = left_block_options[0];
- if (FRAME_MBAFF) {
- const int left_mb_field_flag = IS_INTERLACED(s->current_picture.f.mb_type[mb_xy - 1]);
+ if (FRAME_MBAFF(h)) {
+ const int left_mb_field_flag = IS_INTERLACED(h->cur_pic.mb_type[mb_xy - 1]);
 const int curr_mb_field_flag = IS_INTERLACED(mb_type);
- if (s->mb_y & 1) {
+ if (h->mb_y & 1) {
 if (left_mb_field_flag != curr_mb_field_flag) {
- left_xy[LBOT] = left_xy[LTOP] = mb_xy - s->mb_stride - 1;
+ left_xy[LBOT] = left_xy[LTOP] = mb_xy - h->mb_stride - 1;
 if (curr_mb_field_flag) {
- left_xy[LBOT] += s->mb_stride;
+ left_xy[LBOT] += h->mb_stride;
 h->left_block = left_block_options[3];
 } else {
- topleft_xy += s->mb_stride;
+ topleft_xy += h->mb_stride;
 /* take top left mv from the middle of the mb, as opposed
 * to all other modes which use the bottom right partition */
 h->topleft_partition = 0;
@@ -391,13 +387,13 @@
 }
 } else {
 if (curr_mb_field_flag) {
- topleft_xy += s->mb_stride & (((s->current_picture.f.mb_type[top_xy - 1] >> 7) & 1) - 1);
- topright_xy += s->mb_stride & (((s->current_picture.f.mb_type[top_xy + 1] >> 7) & 1) - 1);
- top_xy += s->mb_stride & (((s->current_picture.f.mb_type[top_xy] >> 7) & 1) - 1);
+ topleft_xy += h->mb_stride & (((h->cur_pic.mb_type[top_xy - 1] >> 7) & 1) - 1);
+ topright_xy += h->mb_stride & (((h->cur_pic.mb_type[top_xy + 1] >> 7) & 1) - 1);
+ top_xy += h->mb_stride & (((h->cur_pic.mb_type[top_xy] >> 7) & 1) - 1);
 }
 if (left_mb_field_flag != curr_mb_field_flag) {
 if (curr_mb_field_flag) {
- left_xy[LBOT] += s->mb_stride;
+ left_xy[LBOT] += h->mb_stride;
 h->left_block = left_block_options[3];
 } else {
 h->left_block = left_block_options[2];
@@ -413,11 +409,11 @@
 h->left_mb_xy[LBOT] = left_xy[LBOT];
 //FIXME do we need all in the context?
 
- h->topleft_type = s->current_picture.f.mb_type[topleft_xy];
- h->top_type = s->current_picture.f.mb_type[top_xy];
- h->topright_type = s->current_picture.f.mb_type[topright_xy];
- h->left_type[LTOP] = s->current_picture.f.mb_type[left_xy[LTOP]];
- h->left_type[LBOT] = s->current_picture.f.mb_type[left_xy[LBOT]];
+ h->topleft_type = h->cur_pic.mb_type[topleft_xy];
+ h->top_type = h->cur_pic.mb_type[top_xy];
+ h->topright_type = h->cur_pic.mb_type[topright_xy];
+ h->left_type[LTOP] = h->cur_pic.mb_type[left_xy[LTOP]];
+ h->left_type[LBOT] = h->cur_pic.mb_type[left_xy[LBOT]];
 
 if (FMO) {
 if (h->slice_table[topleft_xy] != h->slice_num)
@@ -441,7 +437,6 @@
 
 static void fill_decode_caches(H264Context *h, int mb_type)
 {
- MpegEncContext *const s = &h->s;
 int topleft_xy, top_xy, topright_xy, left_xy[LEFT_MBS];
 int topleft_type, top_type, topright_type, left_type[LEFT_MBS];
 const uint8_t *left_block = h->left_block;
@@ -484,7 +479,7 @@
 h->left_samples_available &= 0xFF5F;
 }
 } else {
- int left_typei = s->current_picture.f.mb_type[left_xy[LTOP] + s->mb_stride];
+ int left_typei = h->cur_pic.mb_type[left_xy[LTOP] + h->mb_stride];
 
 assert(left_xy[LTOP] == left_xy[LBOT]);
 if (!((left_typei & type_mask) && (left_type[LTOP] & type_mask))) {
@@ -541,7 +536,7 @@
 if (top_type) {
 nnz = h->non_zero_count[top_xy];
 AV_COPY32(&nnz_cache[4 + 8 * 0], &nnz[4 * 3]);
- if (!s->chroma_y_shift) {
+ if (!h->chroma_y_shift) {
 AV_COPY32(&nnz_cache[4 + 8 * 5], &nnz[4 * 7]);
 AV_COPY32(&nnz_cache[4 + 8 * 10], &nnz[4 * 11]);
 } else {
@@ -549,7 +544,7 @@
 AV_COPY32(&nnz_cache[4 + 8 * 10], &nnz[4 * 9]);
 }
 } else {
- uint32_t top_empty = CABAC && !IS_INTRA(mb_type) ? 0 : 0x40404040;
+ uint32_t top_empty = CABAC(h) && !IS_INTRA(mb_type) ? 0 : 0x40404040;
 AV_WN32A(&nnz_cache[4 + 8 * 0], top_empty);
 AV_WN32A(&nnz_cache[4 + 8 * 5], top_empty);
 AV_WN32A(&nnz_cache[4 + 8 * 10], top_empty);
@@ -560,12 +555,12 @@
 nnz = h->non_zero_count[left_xy[LEFT(i)]];
 nnz_cache[3 + 8 * 1 + 2 * 8 * i] = nnz[left_block[8 + 0 + 2 * i]];
 nnz_cache[3 + 8 * 2 + 2 * 8 * i] = nnz[left_block[8 + 1 + 2 * i]];
- if (CHROMA444) {
+ if (CHROMA444(h)) {
 nnz_cache[3 + 8 * 6 + 2 * 8 * i] = nnz[left_block[8 + 0 + 2 * i] + 4 * 4];
 nnz_cache[3 + 8 * 7 + 2 * 8 * i] = nnz[left_block[8 + 1 + 2 * i] + 4 * 4];
 nnz_cache[3 + 8 * 11 + 2 * 8 * i] = nnz[left_block[8 + 0 + 2 * i] + 8 * 4];
 nnz_cache[3 + 8 * 12 + 2 * 8 * i] = nnz[left_block[8 + 1 + 2 * i] + 8 * 4];
- } else if (CHROMA422) {
+ } else if (CHROMA422(h)) {
 nnz_cache[3 + 8 * 6 + 2 * 8 * i] = nnz[left_block[8 + 0 + 2 * i] - 2 + 4 * 4];
 nnz_cache[3 + 8 * 7 + 2 * 8 * i] = nnz[left_block[8 + 1 + 2 * i] - 2 + 4 * 4];
 nnz_cache[3 + 8 * 11 + 2 * 8 * i] = nnz[left_block[8 + 0 + 2 * i] - 2 + 8 * 4];
@@ -580,11 +575,11 @@
 nnz_cache[3 + 8 * 6 + 2 * 8 * i] =
 nnz_cache[3 + 8 * 7 + 2 * 8 * i] =
 nnz_cache[3 + 8 * 11 + 2 * 8 * i] =
- nnz_cache[3 + 8 * 12 + 2 * 8 * i] = CABAC && !IS_INTRA(mb_type) ? 0 : 64;
+ nnz_cache[3 + 8 * 12 + 2 * 8 * i] = CABAC(h) && !IS_INTRA(mb_type) ? 0 : 64;
 }
 }
 
- if (CABAC) {
+ if (CABAC(h)) {
 // top_cbp
 if (top_type)
 h->top_cbp = h->cbp_table[top_xy];
@@ -606,9 +601,9 @@
 int b_stride = h->b_stride;
 for (list = 0; list < h->list_count; list++) {
 int8_t *ref_cache = &h->ref_cache[list][scan8[0]];
- int8_t *ref = s->current_picture.f.ref_index[list];
+ int8_t *ref = h->cur_pic.ref_index[list];
 int16_t(*mv_cache)[2] = &h->mv_cache[list][scan8[0]];
- int16_t(*mv)[2] = s->current_picture.f.motion_val[list];
+ int16_t(*mv)[2] = h->cur_pic.motion_val[list];
 if (!USES_LIST(mb_type, list))
 continue;
 assert(!(IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred));
@@ -682,7 +677,7 @@
 }
 }
 
- if ((mb_type & (MB_TYPE_SKIP | MB_TYPE_DIRECT2)) && !FRAME_MBAFF)
+ if ((mb_type & (MB_TYPE_SKIP | MB_TYPE_DIRECT2)) && !FRAME_MBAFF(h))
 continue;
 
 if (!(mb_type & (MB_TYPE_SKIP | MB_TYPE_DIRECT2))) {
@@ -693,7 +688,7 @@
 AV_ZERO32(mv_cache[2 + 8 * 0]);
 AV_ZERO32(mv_cache[2 + 8 * 2]);
 
- if (CABAC) {
+ if (CABAC(h)) {
 if (USES_LIST(top_type, list)) {
 const int b_xy = h->mb2br_xy[top_xy];
 AV_COPY64(mvd_cache[0 - 1 * 8], mvd[b_xy + 0]);
@@ -764,8 +759,8 @@
 MAP_F2F(scan8[0] - 1 + 2 * 8, left_type[LBOT]) \
 MAP_F2F(scan8[0] - 1 + 3 * 8, left_type[LBOT])
 
- if (FRAME_MBAFF) {
- if (MB_FIELD) {
+ if (FRAME_MBAFF(h)) {
+ if (MB_FIELD(h)) {
 
 #define MAP_F2F(idx, mb_type) \
 if (!IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0) { \
@@ -800,13 +795,12 @@
 */
 static void av_unused decode_mb_skip(H264Context *h)
 {
- MpegEncContext *const s = &h->s;
 const int mb_xy = h->mb_xy;
 int mb_type = 0;
 
 memset(h->non_zero_count[mb_xy], 0, 48);
 
- if (MB_FIELD)
+ if (MB_FIELD(h))
 mb_type |= MB_TYPE_INTERLACED;
 
 if (h->slice_type_nos == AV_PICTURE_TYPE_B) {
@@ -826,10 +820,10 @@
 }
 
 write_back_motion(h, mb_type);
- s->current_picture.f.mb_type[mb_xy] = mb_type;
- s->current_picture.f.qscale_table[mb_xy] = s->qscale;
- h->slice_table[mb_xy] = h->slice_num;
- h->prev_mb_skipped = 1;
+ h->cur_pic.mb_type[mb_xy] = mb_type;
+ h->cur_pic.qscale_table[mb_xy] = h->qscale;
+ h->slice_table[mb_xy] = h->slice_num;
+ h->prev_mb_skipped = 1;
 }
 
 #endif /* AVCODEC_H264_MVPRED_H */

libav-v9.6.tar.bz2/libavcodec/h264_parser.c -> libav-v10.1.tar.bz2/libavcodec/h264_parser.c Changed

@@ -25,75 +25,138 @@
 * @author Michael Niedermayer <michaelni@gmx.at>
 */
 
+#include "libavutil/attributes.h"
 #include "parser.h"
 #include "h264data.h"
 #include "golomb.h"
+#include "internal.h"
 
 #include <assert.h>
 
 
-static int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size)
+static int h264_find_frame_end(H264Context *h, const uint8_t *buf,
+ int buf_size)
 {
 int i;
 uint32_t state;
- ParseContext *pc = &(h->s.parse_context);
+ ParseContext *pc = &h->parse_context;
 // mb_addr= pc->mb_addr - 1;
- state= pc->state;
- if(state>13)
- state= 7;
-
- for(i=0; i<buf_size; i++){
- if(state==7){
-#if HAVE_FAST_UNALIGNED
- /* we check i<buf_size instead of i+3/7 because its simpler
- * and there should be FF_INPUT_BUFFER_PADDING_SIZE bytes at the end
- */
-# if HAVE_FAST_64BIT
- while(i<buf_size && !((~*(const uint64_t*)(buf+i) & (*(const uint64_t*)(buf+i) - 0x0101010101010101ULL)) & 0x8080808080808080ULL))
- i+=8;
-# else
- while(i<buf_size && !((~*(const uint32_t*)(buf+i) & (*(const uint32_t*)(buf+i) - 0x01010101U)) & 0x80808080U))
- i+=4;
-# endif
-#endif
- for(; i<buf_size; i++){
- if(!buf[i]){
- state=2;
- break;
- }
- }
- }else if(state<=2){
- if(buf[i]==1) state^= 5; //2->7, 1->4, 0->5
- else if(buf[i]) state = 7;
- 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){
- if(pc->frame_start_found){
+ state = pc->state;
+ if (state > 13)
+ state = 7;
+
+ for (i = 0; i < buf_size; i++) {
+ if (state == 7) {
+ i += h->h264dsp.h264_find_start_code_candidate(buf + i, buf_size - i);
+ if (i < buf_size)
+ state = 2;
+ } else if (state <= 2) {
+ if (buf[i] == 1)
+ state ^= 5; // 2->7, 1->4, 0->5
+ else if (buf[i])
+ state = 7;
+ else
+ state >>= 1; // 2->1, 1->0, 0->0
+ } else if (state <= 5) {
+ 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){
- if(pc->frame_start_found){
- state+=8;
+ } else if (nalu_type == NAL_SLICE || nalu_type == NAL_DPA ||
+ nalu_type == NAL_IDR_SLICE) {
+ if (pc->frame_start_found) {
+ state += 8;
 continue;
- }else
+ } else
 pc->frame_start_found = 1;
 }
- state= 7;
- }else{
- if(buf[i] & 0x80)
+ state = 7;
+ } else {
+ if (buf[i] & 0x80)
 goto found;
- state= 7;
+ state = 7;
 }
 }
- pc->state= state;
+ pc->state = state;
 return END_NOT_FOUND;
 
 found:
- pc->state=7;
- pc->frame_start_found= 0;
- return i-(state&5);
+ pc->state = 7;
+ pc->frame_start_found = 0;
+ return i - (state & 5);
+}
+
+static int scan_mmco_reset(AVCodecParserContext *s)
+{
+ H264Context *h = s->priv_data;
+
+ h->slice_type_nos = s->pict_type & 3;
+
+ if (h->pps.redundant_pic_cnt_present)
+ get_ue_golomb(&h->gb); // redundant_pic_count
+
+ if (ff_set_ref_count(h) < 0)
+ return AVERROR_INVALIDDATA;
+
+ if (h->slice_type_nos != AV_PICTURE_TYPE_I) {
+ int list;
+ for (list = 0; list < h->list_count; list++) {
+ if (get_bits1(&h->gb)) {
+ int index;
+ for (index = 0; ; index++) {
+ unsigned int reordering_of_pic_nums_idc = get_ue_golomb_31(&h->gb);
+
+ if (reordering_of_pic_nums_idc < 3)
+ get_ue_golomb(&h->gb);
+ else if (reordering_of_pic_nums_idc > 3) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "illegal reordering_of_pic_nums_idc %d\n",
+ reordering_of_pic_nums_idc);
+ return AVERROR_INVALIDDATA;
+ } else
+ break;
+
+ if (index >= h->ref_count[list]) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "reference count %d overflow\n", index);
+ return AVERROR_INVALIDDATA;
+ }
+ }
+ }
+ }
+ }
+
+ if ((h->pps.weighted_pred && h->slice_type_nos == AV_PICTURE_TYPE_P) ||
+ (h->pps.weighted_bipred_idc == 1 && h->slice_type_nos == AV_PICTURE_TYPE_B))
+ ff_pred_weight_table(h);
+
+ if (get_bits1(&h->gb)) { // adaptive_ref_pic_marking_mode_flag
+ int i;
+ for (i = 0; i < MAX_MMCO_COUNT; i++) {
+ MMCOOpcode opcode = get_ue_golomb_31(&h->gb);
+ if (opcode > (unsigned) MMCO_LONG) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "illegal memory management control operation %d\n",
+ opcode);
+ return AVERROR_INVALIDDATA;
+ }
+ if (opcode == MMCO_END)
+ return 0;
+ else if (opcode == MMCO_RESET)
+ return 1;
+
+ if (opcode == MMCO_SHORT2UNUSED || opcode == MMCO_SHORT2LONG)
+ get_ue_golomb(&h->gb);
+ if (opcode == MMCO_SHORT2LONG || opcode == MMCO_LONG2UNUSED ||
+ opcode == MMCO_LONG || opcode == MMCO_SET_MAX_LONG)
+ get_ue_golomb_31(&h->gb);
+ }
+ }
+
+ return 0;
 }
 
 /**
@@ -108,30 +171,29 @@
 AVCodecContext *avctx,
 const uint8_t *buf, int buf_size)
 {
- H264Context *h = s->priv_data;
+ H264Context *h = s->priv_data;
 const uint8_t *buf_end = buf + buf_size;
 unsigned int pps_id;
 unsigned int slice_type;
- int state = -1;
+ int state = -1, got_reset = 0;
 const uint8_t *ptr;
+ int field_poc[2];
 
 /* set some sane default values */
- s->pict_type = AV_PICTURE_TYPE_I;
- s->key_frame = 0;
+ s->pict_type = AV_PICTURE_TYPE_I;
+ s->key_frame = 0;
+ s->picture_structure = AV_PICTURE_STRUCTURE_UNKNOWN;
 
- h->s.avctx= avctx;
- h->sei_recovery_frame_cnt = -1;
- h->sei_dpb_output_delay = 0;
- h->sei_cpb_removal_delay = -1;
- h->sei_buffering_period_present = 0;
+ h->avctx = avctx;
+ ff_h264_reset_sei(h);
 
 if (!buf_size)
 return 0;
 
- for(;;) {
+ for (;;) {
 int src_length, dst_length, consumed;
- buf = avpriv_mpv_find_start_code(buf, buf_end, &state);
- if(buf >= buf_end)
+ buf = avpriv_find_start_code(buf, buf_end, &state);
+ if (buf >= buf_end)
 break;
 --buf;
 src_length = buf_end - buf;
@@ -139,93 +201,189 @@
 case NAL_SLICE:
 case NAL_IDR_SLICE:
 // Do not walk the whole buffer just to decode slice header
- if (src_length > 20)
- src_length = 20;
+ if ((state & 0x1f) == NAL_IDR_SLICE || ((state >> 5) & 0x3) == 0) {
+ /* IDR or disposable slice
+ * No need to decode many bytes because MMCOs shall not be present. */
+ if (src_length > 60)
+ src_length = 60;
+ } else {
+ /* To decode up to MMCOs */
+ if (src_length > 1000)
+ src_length = 1000;
+ }
 break;
 }
- ptr= ff_h264_decode_nal(h, buf, &dst_length, &consumed, src_length);
- if (ptr==NULL || dst_length < 0)
+ ptr = ff_h264_decode_nal(h, buf, &dst_length, &consumed, src_length);
+ if (ptr == NULL || dst_length < 0)
 break;
 
- init_get_bits(&h->s.gb, ptr, 8*dst_length);
- switch(h->nal_unit_type) {
+ init_get_bits(&h->gb, ptr, 8 * dst_length);
+ switch (h->nal_unit_type) {
 case NAL_SPS:
 ff_h264_decode_seq_parameter_set(h);
 break;
 case NAL_PPS:
- ff_h264_decode_picture_parameter_set(h, h->s.gb.size_in_bits);
+ ff_h264_decode_picture_parameter_set(h, h->gb.size_in_bits);
 break;
 case NAL_SEI:
 ff_h264_decode_sei(h);
 break;
 case NAL_IDR_SLICE:
 s->key_frame = 1;
- /* fall through */
+
+ h->prev_frame_num = 0;
+ h->prev_frame_num_offset = 0;
+ h->prev_poc_msb =
+ h->prev_poc_lsb = 0;
+ /* fall through */
 case NAL_SLICE:
- get_ue_golomb(&h->s.gb); // skip first_mb_in_slice
- slice_type = get_ue_golomb_31(&h->s.gb);
+ get_ue_golomb(&h->gb); // skip first_mb_in_slice
+ slice_type = get_ue_golomb_31(&h->gb);
 s->pict_type = golomb_to_pict_type[slice_type % 5];
 if (h->sei_recovery_frame_cnt >= 0) {
 /* key frame, since recovery_frame_cnt is set */
 s->key_frame = 1;
 }
- pps_id= get_ue_golomb(&h->s.gb);
- if(pps_id>=MAX_PPS_COUNT) {
- av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n");
+ pps_id = get_ue_golomb(&h->gb);
+ if (pps_id >= MAX_PPS_COUNT) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "pps_id %u out of range\n", pps_id);
 return -1;
 }
- if(!h->pps_buffers[pps_id]) {
- av_log(h->s.avctx, AV_LOG_ERROR, "non-existing PPS referenced\n");
+ if (!h->pps_buffers[pps_id]) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "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->s.avctx, AV_LOG_ERROR, "non-existing SPS referenced\n");
+ 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 %u referenced\n", h->pps.sps_id);
 return -1;
 }
- h->sps = *h->sps_buffers[h->pps.sps_id];
- h->frame_num = get_bits(&h->s.gb, h->sps.log2_max_frame_num);
+ h->sps = *h->sps_buffers[h->pps.sps_id];
+ h->frame_num = get_bits(&h->gb, h->sps.log2_max_frame_num);
 
 avctx->profile = ff_h264_get_profile(&h->sps);
 avctx->level = h->sps.level_idc;
 
- if(h->sps.frame_mbs_only_flag){
- h->s.picture_structure= PICT_FRAME;
- }else{
- if(get_bits1(&h->s.gb)) { //field_pic_flag
- h->s.picture_structure= PICT_TOP_FIELD + get_bits1(&h->s.gb); //bottom_field_flag
+ if (h->sps.frame_mbs_only_flag) {
+ h->picture_structure = PICT_FRAME;
+ } else {
+ if (get_bits1(&h->gb)) { // field_pic_flag
+ h->picture_structure = PICT_TOP_FIELD + get_bits1(&h->gb); // bottom_field_flag
+ } else {
+ h->picture_structure = PICT_FRAME;
+ }
+ }
+
+ if (h->nal_unit_type == NAL_IDR_SLICE)
+ get_ue_golomb(&h->gb); /* idr_pic_id */
+ if (h->sps.poc_type == 0) {
+ h->poc_lsb = get_bits(&h->gb, h->sps.log2_max_poc_lsb);
+
+ if (h->pps.pic_order_present == 1 &&
+ h->picture_structure == PICT_FRAME)
+ h->delta_poc_bottom = get_se_golomb(&h->gb);
+ }
+
+ if (h->sps.poc_type == 1 &&
+ !h->sps.delta_pic_order_always_zero_flag) {
+ h->delta_poc[0] = get_se_golomb(&h->gb);
+
+ if (h->pps.pic_order_present == 1 &&
+ h->picture_structure == PICT_FRAME)
+ h->delta_poc[1] = get_se_golomb(&h->gb);
+ }
+
+ /* Decode POC of this picture.
+ * The prev_ values needed for decoding POC of the next picture are not set here. */
+ field_poc[0] = field_poc[1] = INT_MAX;
+ ff_init_poc(h, field_poc, &s->output_picture_number);
+
+ /* Continue parsing to check if MMCO_RESET is present.
+ * FIXME: MMCO_RESET could appear in non-first slice.
+ * Maybe, we should parse all undisposable non-IDR slice of this
+ * picture until encountering MMCO_RESET in a slice of it. */
+ if (h->nal_ref_idc && h->nal_unit_type != NAL_IDR_SLICE) {
+ got_reset = scan_mmco_reset(s);
+ if (got_reset < 0)
+ return got_reset;
+ }
+
+ /* Set up the prev_ values for decoding POC of the next picture. */
+ h->prev_frame_num = got_reset ? 0 : h->frame_num;
+ h->prev_frame_num_offset = got_reset ? 0 : h->frame_num_offset;
+ if (h->nal_ref_idc != 0) {
+ if (!got_reset) {
+ h->prev_poc_msb = h->poc_msb;
+ h->prev_poc_lsb = h->poc_lsb;
 } else {
- h->s.picture_structure= PICT_FRAME;
+ h->prev_poc_msb = 0;
+ h->prev_poc_lsb =
+ h->picture_structure == PICT_BOTTOM_FIELD ? 0 : field_poc[0];
 }
 }
 
- if(h->sps.pic_struct_present_flag) {
+ if (h->sps.pic_struct_present_flag) {
 switch (h->sei_pic_struct) {
- case SEI_PIC_STRUCT_TOP_FIELD:
- case SEI_PIC_STRUCT_BOTTOM_FIELD:
- s->repeat_pict = 0;
- break;
- case SEI_PIC_STRUCT_FRAME:
+ case SEI_PIC_STRUCT_TOP_FIELD:
+ case SEI_PIC_STRUCT_BOTTOM_FIELD:
+ s->repeat_pict = 0;
+ break;
+ case SEI_PIC_STRUCT_FRAME:
+ case SEI_PIC_STRUCT_TOP_BOTTOM:
+ case SEI_PIC_STRUCT_BOTTOM_TOP:
+ s->repeat_pict = 1;
+ break;
+ case SEI_PIC_STRUCT_TOP_BOTTOM_TOP:
+ case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM:
+ s->repeat_pict = 2;
+ break;
+ case SEI_PIC_STRUCT_FRAME_DOUBLING:
+ s->repeat_pict = 3;
+ break;
+ case SEI_PIC_STRUCT_FRAME_TRIPLING:
+ s->repeat_pict = 5;
+ break;
+ default:
+ s->repeat_pict = h->picture_structure == PICT_FRAME ? 1 : 0;
+ break;
+ }
+ } else {
+ s->repeat_pict = h->picture_structure == PICT_FRAME ? 1 : 0;
+ }
+
+ if (h->picture_structure == PICT_FRAME) {
+ s->picture_structure = AV_PICTURE_STRUCTURE_FRAME;
+ if (h->sps.pic_struct_present_flag) {
+ switch (h->sei_pic_struct) {
 case SEI_PIC_STRUCT_TOP_BOTTOM:
- case SEI_PIC_STRUCT_BOTTOM_TOP:
- s->repeat_pict = 1;
- break;
 case SEI_PIC_STRUCT_TOP_BOTTOM_TOP:
- case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM:
- s->repeat_pict = 2;
- break;
- case SEI_PIC_STRUCT_FRAME_DOUBLING:
- s->repeat_pict = 3;
+ s->field_order = AV_FIELD_TT;
 break;
- case SEI_PIC_STRUCT_FRAME_TRIPLING:
- s->repeat_pict = 5;
+ case SEI_PIC_STRUCT_BOTTOM_TOP:
+ case SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM:
+ s->field_order = AV_FIELD_BB;
 break;
 default:
- s->repeat_pict = h->s.picture_structure == PICT_FRAME ? 1 : 0;
+ s->field_order = AV_FIELD_PROGRESSIVE;
 break;
+ }
+ } else {
+ if (field_poc[0] < field_poc[1])
+ s->field_order = AV_FIELD_TT;
+ else if (field_poc[0] > field_poc[1])
+ s->field_order = AV_FIELD_BB;
+ else
+ s->field_order = AV_FIELD_PROGRESSIVE;
 }
 } else {
- s->repeat_pict = h->s.picture_structure == PICT_FRAME ? 1 : 0;
+ if (h->picture_structure == PICT_TOP_FIELD)
+ s->picture_structure = AV_PICTURE_STRUCTURE_TOP_FIELD;
+ else
+ s->picture_structure = AV_PICTURE_STRUCTURE_BOTTOM_FIELD;
+ s->field_order = AV_FIELD_UNKNOWN;
 }
 
 return 0; /* no need to evaluate the rest */
@@ -233,7 +391,7 @@
 buf += consumed;
 }
 /* didn't find a picture! */
- av_log(h->s.avctx, AV_LOG_ERROR, "missing picture in access unit\n");
+ av_log(h->avctx, AV_LOG_ERROR, "missing picture in access unit\n");
 return -1;
 }
 
@@ -242,39 +400,39 @@
 const uint8_t **poutbuf, int *poutbuf_size,
 const uint8_t *buf, int buf_size)
 {
- H264Context *h = s->priv_data;
- ParseContext *pc = &h->s.parse_context;
+ H264Context *h = s->priv_data;
+ ParseContext *pc = &h->parse_context;
 int next;
 
 if (!h->got_first) {
 h->got_first = 1;
 if (avctx->extradata_size) {
- h->s.avctx = avctx;
+ h->avctx = avctx;
 // must be done like in the decoder.
 // otherwise opening the parser, creating extradata,
 // and then closing and opening again
 // will cause has_b_frames to be always set.
 // NB: estimate_timings_from_pts behaves exactly like this.
 if (!avctx->has_b_frames)
- h->s.low_delay = 1;
+ h->low_delay = 1;
 ff_h264_decode_extradata(h);
 }
 }
 
- if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){
- next= buf_size;
- }else{
- next= ff_h264_find_frame_end(h, buf, buf_size);
+ if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
+ next = buf_size;
+ } else {
+ next = h264_find_frame_end(h, buf, buf_size);
 
 if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
- *poutbuf = NULL;
+ *poutbuf = NULL;
 *poutbuf_size = 0;
 return buf_size;
 }
 
- if(next<0 && next != END_NOT_FOUND){
- assert(pc->last_index + next >= 0 );
- ff_h264_find_frame_end(h, &pc->buffer[pc->last_index + next], -next); //update state
+ if (next < 0 && next != END_NOT_FOUND) {
+ assert(pc->last_index + next >= 0);
+ h264_find_frame_end(h, &pc->buffer[pc->last_index + next], -next); // update state
 }
 }
 
@@ -294,7 +452,7 @@
 s->flags &= PARSER_FLAG_COMPLETE_FRAMES;
 }
 
- *poutbuf = buf;
+ *poutbuf = buf;
 *poutbuf_size = buf_size;
 return next;
 }
@@ -304,39 +462,45 @@
 {
 int i;
 uint32_t state = -1;
- int has_sps= 0;
-
- for(i=0; i<=buf_size; i++){
- if((state&0xFFFFFF1F) == 0x107)
- has_sps=1;
-/* if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){
- }*/
- if((state&0xFFFFFF00) == 0x100 && (state&0xFFFFFF1F) != 0x107 && (state&0xFFFFFF1F) != 0x108 && (state&0xFFFFFF1F) != 0x109){
- if(has_sps){
- while(i>4 && buf[i-5]==0) i--;
- return i-4;
+ int has_sps = 0;
+
+ for (i = 0; i <= buf_size; i++) {
+ if ((state & 0xFFFFFF1F) == 0x107)
+ has_sps = 1;
+ /* if((state&0xFFFFFF1F) == 0x101 ||
+ * (state&0xFFFFFF1F) == 0x102 ||
+ * (state&0xFFFFFF1F) == 0x105) {
+ * }
+ */
+ if ((state & 0xFFFFFF00) == 0x100 && (state & 0xFFFFFF1F) != 0x107 &&
+ (state & 0xFFFFFF1F) != 0x108 && (state & 0xFFFFFF1F) != 0x109) {
+ if (has_sps) {
+ while (i > 4 && buf[i - 5] == 0)
+ i--;
+ return i - 4;
 }
 }
- if (i<buf_size)
- state= (state<<8) | buf[i];
+ if (i < buf_size)
+ state = (state << 8) | buf[i];
 }
 return 0;
 }
 
 static void close(AVCodecParserContext *s)
 {
- H264Context *h = s->priv_data;
- ParseContext *pc = &h->s.parse_context;
+ H264Context *h = s->priv_data;
+ ParseContext *pc = &h->parse_context;
 
 av_free(pc->buffer);
 ff_h264_free_context(h);
 }
 
-static int init(AVCodecParserContext *s)
+static av_cold int init(AVCodecParserContext *s)
 {
 H264Context *h = s->priv_data;
- h->thread_context[0] = h;
- h->s.slice_context_count = 1;
+ h->thread_context[0] = h;
+ h->slice_context_count = 1;
+ ff_h264dsp_init(&h->h264dsp, 8, 1);
 return 0;
 }

libav-v9.6.tar.bz2/libavcodec/h264_ps.c -> libav-v10.1.tar.bz2/libavcodec/h264_ps.c Changed

@@ -27,221 +27,212 @@
 
 #include "libavutil/imgutils.h"
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "h264.h"
 #include "h264data.h" //FIXME FIXME FIXME (just for zigzag_scan)
 #include "golomb.h"
 
-
-//#undef NDEBUG
-#include <assert.h>
-
 #define MAX_LOG2_MAX_FRAME_NUM (12 + 4)
 #define MIN_LOG2_MAX_FRAME_NUM 4
 
-static const AVRational pixel_aspect[17]={
- {0, 1},
- {1, 1},
- {12, 11},
- {10, 11},
- {16, 11},
- {40, 33},
- {24, 11},
- {20, 11},
- {32, 11},
- {80, 33},
- {18, 11},
- {15, 11},
- {64, 33},
- {160,99},
- {4, 3},
- {3, 2},
- {2, 1},
+static const AVRational pixel_aspect[17] = {
+ { 0, 1 },
+ { 1, 1 },
+ { 12, 11 },
+ { 10, 11 },
+ { 16, 11 },
+ { 40, 33 },
+ { 24, 11 },
+ { 20, 11 },
+ { 32, 11 },
+ { 80, 33 },
+ { 18, 11 },
+ { 15, 11 },
+ { 64, 33 },
+ { 160, 99 },
+ { 4, 3 },
+ { 3, 2 },
+ { 2, 1 },
+};
+
+#define QP(qP, depth) ((qP) + 6 * ((depth) - 8))
+
+#define CHROMA_QP_TABLE_END(d) \
+ QP(0, d), QP(1, d), QP(2, d), QP(3, d), QP(4, d), QP(5, d), \
+ QP(6, d), QP(7, d), QP(8, d), QP(9, d), QP(10, d), QP(11, d), \
+ QP(12, d), QP(13, d), QP(14, d), QP(15, d), QP(16, d), QP(17, d), \
+ QP(18, d), QP(19, d), QP(20, d), QP(21, d), QP(22, d), QP(23, d), \
+ QP(24, d), QP(25, d), QP(26, d), QP(27, d), QP(28, d), QP(29, d), \
+ QP(29, d), QP(30, d), QP(31, d), QP(32, d), QP(32, d), QP(33, d), \
+ QP(34, d), QP(34, d), QP(35, d), QP(35, d), QP(36, d), QP(36, d), \
+ QP(37, d), QP(37, d), QP(37, d), QP(38, d), QP(38, d), QP(38, d), \
+ QP(39, d), QP(39, d), QP(39, d), QP(39, d)
+
+const uint8_t ff_h264_chroma_qp[3][QP_MAX_NUM + 1] = {
+ { CHROMA_QP_TABLE_END(8) },
+ { 0, 1, 2, 3, 4, 5,
+ CHROMA_QP_TABLE_END(9) },
+ { 0, 1, 2, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11,
+ CHROMA_QP_TABLE_END(10) },
 };
 
-#define QP(qP,depth) ( (qP)+6*((depth)-8) )
-
-#define CHROMA_QP_TABLE_END(d) \
- QP(0,d), QP(1,d), QP(2,d), QP(3,d), QP(4,d), QP(5,d),\
- QP(6,d), QP(7,d), QP(8,d), QP(9,d), QP(10,d), QP(11,d),\
- QP(12,d), QP(13,d), QP(14,d), QP(15,d), QP(16,d), QP(17,d),\
- QP(18,d), QP(19,d), QP(20,d), QP(21,d), QP(22,d), QP(23,d),\
- QP(24,d), QP(25,d), QP(26,d), QP(27,d), QP(28,d), QP(29,d),\
- QP(29,d), QP(30,d), QP(31,d), QP(32,d), QP(32,d), QP(33,d),\
- QP(34,d), QP(34,d), QP(35,d), QP(35,d), QP(36,d), QP(36,d),\
- QP(37,d), QP(37,d), QP(37,d), QP(38,d), QP(38,d), QP(38,d),\
- QP(39,d), QP(39,d), QP(39,d), QP(39,d)
-
-const uint8_t ff_h264_chroma_qp[3][QP_MAX_NUM+1] = {
- {
- CHROMA_QP_TABLE_END(8)
- },
- {
- 0, 1, 2, 3, 4, 5,
- CHROMA_QP_TABLE_END(9)
- },
- {
- 0, 1, 2, 3, 4, 5,
- 6, 7, 8, 9, 10, 11,
- CHROMA_QP_TABLE_END(10)
- },
+static const uint8_t default_scaling4[2][16] = {
+ { 6, 13, 20, 28, 13, 20, 28, 32,
+ 20, 28, 32, 37, 28, 32, 37, 42 },
+ { 10, 14, 20, 24, 14, 20, 24, 27,
+ 20, 24, 27, 30, 24, 27, 30, 34 }
 };
 
-static const uint8_t default_scaling4[2][16]={
-{ 6,13,20,28,
- 13,20,28,32,
- 20,28,32,37,
- 28,32,37,42
-},{
- 10,14,20,24,
- 14,20,24,27,
- 20,24,27,30,
- 24,27,30,34
-}};
-
-static const uint8_t default_scaling8[2][64]={
-{ 6,10,13,16,18,23,25,27,
- 10,11,16,18,23,25,27,29,
- 13,16,18,23,25,27,29,31,
- 16,18,23,25,27,29,31,33,
- 18,23,25,27,29,31,33,36,
- 23,25,27,29,31,33,36,38,
- 25,27,29,31,33,36,38,40,
- 27,29,31,33,36,38,40,42
-},{
- 9,13,15,17,19,21,22,24,
- 13,13,17,19,21,22,24,25,
- 15,17,19,21,22,24,25,27,
- 17,19,21,22,24,25,27,28,
- 19,21,22,24,25,27,28,30,
- 21,22,24,25,27,28,30,32,
- 22,24,25,27,28,30,32,33,
- 24,25,27,28,30,32,33,35
-}};
-
-static inline int decode_hrd_parameters(H264Context *h, SPS *sps){
- MpegEncContext * const s = &h->s;
+static const uint8_t default_scaling8[2][64] = {
+ { 6, 10, 13, 16, 18, 23, 25, 27,
+ 10, 11, 16, 18, 23, 25, 27, 29,
+ 13, 16, 18, 23, 25, 27, 29, 31,
+ 16, 18, 23, 25, 27, 29, 31, 33,
+ 18, 23, 25, 27, 29, 31, 33, 36,
+ 23, 25, 27, 29, 31, 33, 36, 38,
+ 25, 27, 29, 31, 33, 36, 38, 40,
+ 27, 29, 31, 33, 36, 38, 40, 42 },
+ { 9, 13, 15, 17, 19, 21, 22, 24,
+ 13, 13, 17, 19, 21, 22, 24, 25,
+ 15, 17, 19, 21, 22, 24, 25, 27,
+ 17, 19, 21, 22, 24, 25, 27, 28,
+ 19, 21, 22, 24, 25, 27, 28, 30,
+ 21, 22, 24, 25, 27, 28, 30, 32,
+ 22, 24, 25, 27, 28, 30, 32, 33,
+ 24, 25, 27, 28, 30, 32, 33, 35 }
+};
+
+static inline int decode_hrd_parameters(H264Context *h, SPS *sps)
+{
 int cpb_count, i;
- cpb_count = get_ue_golomb_31(&s->gb) + 1;
+ cpb_count = get_ue_golomb_31(&h->gb) + 1;
 
- if(cpb_count > 32U){
- av_log(h->s.avctx, AV_LOG_ERROR, "cpb_count %d invalid\n", cpb_count);
- return -1;
+ if (cpb_count > 32U) {
+ av_log(h->avctx, AV_LOG_ERROR, "cpb_count %d invalid\n", cpb_count);
+ return AVERROR_INVALIDDATA;
 }
 
- get_bits(&s->gb, 4); /* bit_rate_scale */
- get_bits(&s->gb, 4); /* cpb_size_scale */
- for(i=0; i<cpb_count; i++){
- get_ue_golomb_long(&s->gb); /* bit_rate_value_minus1 */
- get_ue_golomb_long(&s->gb); /* cpb_size_value_minus1 */
- get_bits1(&s->gb); /* cbr_flag */
+ get_bits(&h->gb, 4); /* bit_rate_scale */
+ get_bits(&h->gb, 4); /* cpb_size_scale */
+ for (i = 0; i < cpb_count; i++) {
+ get_ue_golomb_long(&h->gb); /* bit_rate_value_minus1 */
+ get_ue_golomb_long(&h->gb); /* cpb_size_value_minus1 */
+ get_bits1(&h->gb); /* cbr_flag */
 }
- sps->initial_cpb_removal_delay_length = get_bits(&s->gb, 5) + 1;
- sps->cpb_removal_delay_length = get_bits(&s->gb, 5) + 1;
- sps->dpb_output_delay_length = get_bits(&s->gb, 5) + 1;
- sps->time_offset_length = get_bits(&s->gb, 5);
- sps->cpb_cnt = cpb_count;
+ sps->initial_cpb_removal_delay_length = get_bits(&h->gb, 5) + 1;
+ sps->cpb_removal_delay_length = get_bits(&h->gb, 5) + 1;
+ sps->dpb_output_delay_length = get_bits(&h->gb, 5) + 1;
+ sps->time_offset_length = get_bits(&h->gb, 5);
+ sps->cpb_cnt = cpb_count;
 return 0;
 }
 
-static inline int decode_vui_parameters(H264Context *h, SPS *sps){
- MpegEncContext * const s = &h->s;
+static inline int decode_vui_parameters(H264Context *h, SPS *sps)
+{
 int aspect_ratio_info_present_flag;
 unsigned int aspect_ratio_idc;
 
- aspect_ratio_info_present_flag= get_bits1(&s->gb);
-
- if( aspect_ratio_info_present_flag ) {
- aspect_ratio_idc= get_bits(&s->gb, 8);
- if( aspect_ratio_idc == EXTENDED_SAR ) {
- sps->sar.num= get_bits(&s->gb, 16);
- sps->sar.den= get_bits(&s->gb, 16);
- }else if(aspect_ratio_idc < FF_ARRAY_ELEMS(pixel_aspect)){
- sps->sar= pixel_aspect[aspect_ratio_idc];
- }else{
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n");
- return -1;
+ aspect_ratio_info_present_flag = get_bits1(&h->gb);
+
+ if (aspect_ratio_info_present_flag) {
+ aspect_ratio_idc = get_bits(&h->gb, 8);
+ if (aspect_ratio_idc == EXTENDED_SAR) {
+ sps->sar.num = get_bits(&h->gb, 16);
+ sps->sar.den = get_bits(&h->gb, 16);
+ } else if (aspect_ratio_idc < FF_ARRAY_ELEMS(pixel_aspect)) {
+ sps->sar = pixel_aspect[aspect_ratio_idc];
+ } else {
+ av_log(h->avctx, AV_LOG_ERROR, "illegal aspect ratio\n");
+ return AVERROR_INVALIDDATA;
 }
- }else{
- sps->sar.num=
- sps->sar.den= 0;
+ } else {
+ sps->sar.num =
+ sps->sar.den = 0;
 }
-// s->avctx->aspect_ratio= sar_width*s->width / (float)(s->height*sar_height);
 
- if(get_bits1(&s->gb)){ /* overscan_info_present_flag */
- get_bits1(&s->gb); /* overscan_appropriate_flag */
- }
+ if (get_bits1(&h->gb)) /* overscan_info_present_flag */
+ get_bits1(&h->gb); /* overscan_appropriate_flag */
 
- sps->video_signal_type_present_flag = get_bits1(&s->gb);
- if(sps->video_signal_type_present_flag){
- get_bits(&s->gb, 3); /* video_format */
- sps->full_range = get_bits1(&s->gb); /* video_full_range_flag */
+ sps->video_signal_type_present_flag = get_bits1(&h->gb);
+ if (sps->video_signal_type_present_flag) {
+ get_bits(&h->gb, 3); /* video_format */
+ sps->full_range = get_bits1(&h->gb); /* video_full_range_flag */
 
- sps->colour_description_present_flag = get_bits1(&s->gb);
- if(sps->colour_description_present_flag){
- sps->color_primaries = get_bits(&s->gb, 8); /* colour_primaries */
- sps->color_trc = get_bits(&s->gb, 8); /* transfer_characteristics */
- sps->colorspace = get_bits(&s->gb, 8); /* matrix_coefficients */
+ sps->colour_description_present_flag = get_bits1(&h->gb);
+ if (sps->colour_description_present_flag) {
+ sps->color_primaries = get_bits(&h->gb, 8); /* colour_primaries */
+ sps->color_trc = get_bits(&h->gb, 8); /* transfer_characteristics */
+ sps->colorspace = get_bits(&h->gb, 8); /* matrix_coefficients */
 if (sps->color_primaries >= AVCOL_PRI_NB)
- sps->color_primaries = AVCOL_PRI_UNSPECIFIED;
+ sps->color_primaries = AVCOL_PRI_UNSPECIFIED;
 if (sps->color_trc >= AVCOL_TRC_NB)
- sps->color_trc = AVCOL_TRC_UNSPECIFIED;
+ sps->color_trc = AVCOL_TRC_UNSPECIFIED;
 if (sps->colorspace >= AVCOL_SPC_NB)
- sps->colorspace = AVCOL_SPC_UNSPECIFIED;
+ sps->colorspace = AVCOL_SPC_UNSPECIFIED;
 }
 }
 
- if(get_bits1(&s->gb)){ /* chroma_location_info_present_flag */
- s->avctx->chroma_sample_location = get_ue_golomb(&s->gb)+1; /* chroma_sample_location_type_top_field */
- get_ue_golomb(&s->gb); /* chroma_sample_location_type_bottom_field */
+ /* chroma_location_info_present_flag */
+ if (get_bits1(&h->gb)) {
+ /* chroma_sample_location_type_top_field */
+ h->avctx->chroma_sample_location = get_ue_golomb(&h->gb) + 1;
+ get_ue_golomb(&h->gb); /* chroma_sample_location_type_bottom_field */
 }
 
- sps->timing_info_present_flag = get_bits1(&s->gb);
- if(sps->timing_info_present_flag){
- sps->num_units_in_tick = get_bits_long(&s->gb, 32);
- sps->time_scale = get_bits_long(&s->gb, 32);
- if(!sps->num_units_in_tick || !sps->time_scale){
- av_log(h->s.avctx, AV_LOG_ERROR, "time_scale/num_units_in_tick invalid or unsupported (%d/%d)\n", sps->time_scale, sps->num_units_in_tick);
- return -1;
+ sps->timing_info_present_flag = get_bits1(&h->gb);
+ if (sps->timing_info_present_flag) {
+ sps->num_units_in_tick = get_bits_long(&h->gb, 32);
+ sps->time_scale = get_bits_long(&h->gb, 32);
+ if (!sps->num_units_in_tick || !sps->time_scale) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "time_scale/num_units_in_tick invalid or unsupported (%d/%d)\n",
+ sps->time_scale, sps->num_units_in_tick);
+ return AVERROR_INVALIDDATA;
 }
- sps->fixed_frame_rate_flag = get_bits1(&s->gb);
+ sps->fixed_frame_rate_flag = get_bits1(&h->gb);
 }
 
- sps->nal_hrd_parameters_present_flag = get_bits1(&s->gb);
- if(sps->nal_hrd_parameters_present_flag)
- if(decode_hrd_parameters(h, sps) < 0)
- return -1;
- sps->vcl_hrd_parameters_present_flag = get_bits1(&s->gb);
- if(sps->vcl_hrd_parameters_present_flag)
- if(decode_hrd_parameters(h, sps) < 0)
- return -1;
- if(sps->nal_hrd_parameters_present_flag || sps->vcl_hrd_parameters_present_flag)
- get_bits1(&s->gb); /* low_delay_hrd_flag */
- sps->pic_struct_present_flag = get_bits1(&s->gb);
-
- sps->bitstream_restriction_flag = get_bits1(&s->gb);
- if(sps->bitstream_restriction_flag){
- get_bits1(&s->gb); /* motion_vectors_over_pic_boundaries_flag */
- get_ue_golomb(&s->gb); /* max_bytes_per_pic_denom */
- get_ue_golomb(&s->gb); /* max_bits_per_mb_denom */
- get_ue_golomb(&s->gb); /* log2_max_mv_length_horizontal */
- get_ue_golomb(&s->gb); /* log2_max_mv_length_vertical */
- sps->num_reorder_frames= get_ue_golomb(&s->gb);
- get_ue_golomb(&s->gb); /*max_dec_frame_buffering*/
-
- if (get_bits_left(&s->gb) < 0) {
- sps->num_reorder_frames=0;
- sps->bitstream_restriction_flag= 0;
+ sps->nal_hrd_parameters_present_flag = get_bits1(&h->gb);
+ if (sps->nal_hrd_parameters_present_flag)
+ if (decode_hrd_parameters(h, sps) < 0)
+ return AVERROR_INVALIDDATA;
+ sps->vcl_hrd_parameters_present_flag = get_bits1(&h->gb);
+ if (sps->vcl_hrd_parameters_present_flag)
+ if (decode_hrd_parameters(h, sps) < 0)
+ return AVERROR_INVALIDDATA;
+ if (sps->nal_hrd_parameters_present_flag ||
+ sps->vcl_hrd_parameters_present_flag)
+ get_bits1(&h->gb); /* low_delay_hrd_flag */
+ sps->pic_struct_present_flag = get_bits1(&h->gb);
+
+ sps->bitstream_restriction_flag = get_bits1(&h->gb);
+ if (sps->bitstream_restriction_flag) {
+ get_bits1(&h->gb); /* motion_vectors_over_pic_boundaries_flag */
+ get_ue_golomb(&h->gb); /* max_bytes_per_pic_denom */
+ get_ue_golomb(&h->gb); /* max_bits_per_mb_denom */
+ get_ue_golomb(&h->gb); /* log2_max_mv_length_horizontal */
+ get_ue_golomb(&h->gb); /* log2_max_mv_length_vertical */
+ sps->num_reorder_frames = get_ue_golomb(&h->gb);
+ get_ue_golomb(&h->gb); /*max_dec_frame_buffering*/
+
+ if (get_bits_left(&h->gb) < 0) {
+ sps->num_reorder_frames = 0;
+ sps->bitstream_restriction_flag = 0;
 }
 
- if(sps->num_reorder_frames > 16U /*max_dec_frame_buffering || max_dec_frame_buffering > 16*/){
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal num_reorder_frames %d\n", sps->num_reorder_frames);
- return -1;
+ if (sps->num_reorder_frames > 16U
+ /* max_dec_frame_buffering || max_dec_frame_buffering > 16 */) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "Clipping illegal num_reorder_frames %d\n",
+ sps->num_reorder_frames);
+ sps->num_reorder_frames = 16;
+ return AVERROR_INVALIDDATA;
 }
 }
- if (get_bits_left(&s->gb) < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR, "Overread VUI by %d bits\n", -get_bits_left(&s->gb));
+ if (get_bits_left(&h->gb) < 0) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "Overread VUI by %d bits\n", -get_bits_left(&h->gb));
 return AVERROR_INVALIDDATA;
 }
 
@@ -249,27 +240,30 @@
 }
 
 static void decode_scaling_list(H264Context *h, uint8_t *factors, int size,
- const uint8_t *jvt_list, const uint8_t *fallback_list){
- MpegEncContext * const s = &h->s;
+ const uint8_t *jvt_list,
+ const uint8_t *fallback_list)
+{
 int i, last = 8, next = 8;
 const uint8_t *scan = size == 16 ? zigzag_scan : ff_zigzag_direct;
- if(!get_bits1(&s->gb)) /* matrix not written, we use the predicted one */
- memcpy(factors, fallback_list, size*sizeof(uint8_t));
+ if (!get_bits1(&h->gb)) /* matrix not written, we use the predicted one */
+ memcpy(factors, fallback_list, size * sizeof(uint8_t));
 else
- for(i=0;i<size;i++){
- if(next)
- next = (last + get_se_golomb(&s->gb)) & 0xff;
- if(!i && !next){ /* matrix not written, we use the preset one */
- memcpy(factors, jvt_list, size*sizeof(uint8_t));
- break;
+ for (i = 0; i < size; i++) {
+ if (next)
+ next = (last + get_se_golomb(&h->gb)) & 0xff;
+ if (!i && !next) { /* matrix not written, we use the preset one */
+ memcpy(factors, jvt_list, size * sizeof(uint8_t));
+ break;
+ }
+ last = factors[scan[i]] = next ? next : last;
 }
- last = factors[scan[i]] = next ? next : last;
- }
 }
 
-static void decode_scaling_matrices(H264Context *h, SPS *sps, PPS *pps, int is_sps,
- uint8_t (*scaling_matrix4)[16], uint8_t (*scaling_matrix8)[64]){
- MpegEncContext * const s = &h->s;
+static void decode_scaling_matrices(H264Context *h, SPS *sps,
+ PPS *pps, int is_sps,
+ uint8_t(*scaling_matrix4)[16],
+ uint8_t(*scaling_matrix8)[64])
+{
 int fallback_sps = !is_sps && sps->scaling_matrix_present;
 const uint8_t *fallback[4] = {
 fallback_sps ? sps->scaling_matrix4[0] : default_scaling4[0],
@@ -277,57 +271,58 @@
 fallback_sps ? sps->scaling_matrix8[0] : default_scaling8[0],
 fallback_sps ? sps->scaling_matrix8[3] : default_scaling8[1]
 };
- if(get_bits1(&s->gb)){
+ if (get_bits1(&h->gb)) {
 sps->scaling_matrix_present |= is_sps;
- decode_scaling_list(h,scaling_matrix4[0],16,default_scaling4[0],fallback[0]); // Intra, Y
- decode_scaling_list(h,scaling_matrix4[1],16,default_scaling4[0],scaling_matrix4[0]); // Intra, Cr
- decode_scaling_list(h,scaling_matrix4[2],16,default_scaling4[0],scaling_matrix4[1]); // Intra, Cb
- decode_scaling_list(h,scaling_matrix4[3],16,default_scaling4[1],fallback[1]); // Inter, Y
- decode_scaling_list(h,scaling_matrix4[4],16,default_scaling4[1],scaling_matrix4[3]); // Inter, Cr
- decode_scaling_list(h,scaling_matrix4[5],16,default_scaling4[1],scaling_matrix4[4]); // Inter, Cb
- if(is_sps || pps->transform_8x8_mode){
- decode_scaling_list(h,scaling_matrix8[0],64,default_scaling8[0],fallback[2]); // Intra, Y
- if(sps->chroma_format_idc == 3){
- decode_scaling_list(h,scaling_matrix8[1],64,default_scaling8[0],scaling_matrix8[0]); // Intra, Cr
- decode_scaling_list(h,scaling_matrix8[2],64,default_scaling8[0],scaling_matrix8[1]); // Intra, Cb
+ decode_scaling_list(h, scaling_matrix4[0], 16, default_scaling4[0], fallback[0]); // Intra, Y
+ decode_scaling_list(h, scaling_matrix4[1], 16, default_scaling4[0], scaling_matrix4[0]); // Intra, Cr
+ decode_scaling_list(h, scaling_matrix4[2], 16, default_scaling4[0], scaling_matrix4[1]); // Intra, Cb
+ decode_scaling_list(h, scaling_matrix4[3], 16, default_scaling4[1], fallback[1]); // Inter, Y
+ decode_scaling_list(h, scaling_matrix4[4], 16, default_scaling4[1], scaling_matrix4[3]); // Inter, Cr
+ decode_scaling_list(h, scaling_matrix4[5], 16, default_scaling4[1], scaling_matrix4[4]); // Inter, Cb
+ if (is_sps || pps->transform_8x8_mode) {
+ decode_scaling_list(h, scaling_matrix8[0], 64, default_scaling8[0], fallback[2]); // Intra, Y
+ if (sps->chroma_format_idc == 3) {
+ decode_scaling_list(h, scaling_matrix8[1], 64, default_scaling8[0], scaling_matrix8[0]); // Intra, Cr
+ decode_scaling_list(h, scaling_matrix8[2], 64, default_scaling8[0], scaling_matrix8[1]); // Intra, Cb
 }
- decode_scaling_list(h,scaling_matrix8[3],64,default_scaling8[1],fallback[3]); // Inter, Y
- if(sps->chroma_format_idc == 3){
- decode_scaling_list(h,scaling_matrix8[4],64,default_scaling8[1],scaling_matrix8[3]); // Inter, Cr
- decode_scaling_list(h,scaling_matrix8[5],64,default_scaling8[1],scaling_matrix8[4]); // Inter, Cb
+ decode_scaling_list(h, scaling_matrix8[3], 64, default_scaling8[1], fallback[3]); // Inter, Y
+ if (sps->chroma_format_idc == 3) {
+ decode_scaling_list(h, scaling_matrix8[4], 64, default_scaling8[1], scaling_matrix8[3]); // Inter, Cr
+ decode_scaling_list(h, scaling_matrix8[5], 64, default_scaling8[1], scaling_matrix8[4]); // Inter, Cb
 }
 }
 }
 }
 
-int ff_h264_decode_seq_parameter_set(H264Context *h){
- MpegEncContext * const s = &h->s;
+int ff_h264_decode_seq_parameter_set(H264Context *h)
+{
 int profile_idc, level_idc, constraint_set_flags = 0;
 unsigned int sps_id;
 int i, log2_max_frame_num_minus4;
 SPS *sps;
 
- profile_idc= get_bits(&s->gb, 8);
- constraint_set_flags |= get_bits1(&s->gb) << 0; //constraint_set0_flag
- constraint_set_flags |= get_bits1(&s->gb) << 1; //constraint_set1_flag
- constraint_set_flags |= get_bits1(&s->gb) << 2; //constraint_set2_flag
- constraint_set_flags |= get_bits1(&s->gb) << 3; //constraint_set3_flag
- get_bits(&s->gb, 4); // reserved
- level_idc= get_bits(&s->gb, 8);
- sps_id= get_ue_golomb_31(&s->gb);
-
- if(sps_id >= MAX_SPS_COUNT) {
- av_log(h->s.avctx, AV_LOG_ERROR, "sps_id (%d) out of range\n", sps_id);
- return -1;
+ profile_idc = get_bits(&h->gb, 8);
+ constraint_set_flags |= get_bits1(&h->gb) << 0; // constraint_set0_flag
+ constraint_set_flags |= get_bits1(&h->gb) << 1; // constraint_set1_flag
+ constraint_set_flags |= get_bits1(&h->gb) << 2; // constraint_set2_flag
+ constraint_set_flags |= get_bits1(&h->gb) << 3; // constraint_set3_flag
+ get_bits(&h->gb, 4); // reserved
+ level_idc = get_bits(&h->gb, 8);
+ sps_id = get_ue_golomb_31(&h->gb);
+
+ if (sps_id >= MAX_SPS_COUNT) {
+ 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 == NULL)
- return -1;
+ sps = av_mallocz(sizeof(SPS));
+ if (!sps)
+ return AVERROR(ENOMEM);
 
- sps->time_offset_length = 24;
- sps->profile_idc= profile_idc;
+ sps->sps_id = sps_id;
+ sps->time_offset_length = 24;
+ sps->profile_idc = profile_idc;
 sps->constraint_set_flags = constraint_set_flags;
- sps->level_idc= level_idc;
+ sps->level_idc = level_idc;
 
 memset(sps->scaling_matrix4, 16, sizeof(sps->scaling_matrix4));
 memset(sps->scaling_matrix8, 16, sizeof(sps->scaling_matrix8));
@@ -338,117 +333,159 @@
 sps->profile_idc == 44 || sps->profile_idc == 83 ||
 sps->profile_idc == 86 || sps->profile_idc == 118 ||
 sps->profile_idc == 128 || sps->profile_idc == 144) {
- sps->chroma_format_idc= get_ue_golomb_31(&s->gb);
- if(sps->chroma_format_idc > 3) {
- av_log(h->s.avctx, AV_LOG_ERROR, "chroma_format_idc (%u) out of range\n", sps->chroma_format_idc);
+ sps->chroma_format_idc = get_ue_golomb_31(&h->gb);
+ if (sps->chroma_format_idc > 3) {
+ 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);
+ }
+ sps->bit_depth_luma = get_ue_golomb(&h->gb) + 8;
+ sps->bit_depth_chroma = get_ue_golomb(&h->gb) + 8;
+ if (sps->bit_depth_chroma != sps->bit_depth_luma) {
+ avpriv_request_sample(h->avctx,
+ "Different chroma and luma bit depth");
 goto fail;
- } else if(sps->chroma_format_idc == 3) {
- sps->residual_color_transform_flag = get_bits1(&s->gb);
 }
- sps->bit_depth_luma = get_ue_golomb(&s->gb) + 8;
- sps->bit_depth_chroma = get_ue_golomb(&s->gb) + 8;
- sps->transform_bypass = get_bits1(&s->gb);
- decode_scaling_matrices(h, sps, NULL, 1, sps->scaling_matrix4, sps->scaling_matrix8);
- }else{
- sps->chroma_format_idc= 1;
- sps->bit_depth_luma = 8;
- sps->bit_depth_chroma = 8;
+ sps->transform_bypass = get_bits1(&h->gb);
+ decode_scaling_matrices(h, sps, NULL, 1,
+ sps->scaling_matrix4, sps->scaling_matrix8);
+ } else {
+ sps->chroma_format_idc = 1;
+ sps->bit_depth_luma = 8;
+ sps->bit_depth_chroma = 8;
 }
 
- log2_max_frame_num_minus4 = get_ue_golomb(&s->gb);
+ log2_max_frame_num_minus4 = get_ue_golomb(&h->gb);
 if (log2_max_frame_num_minus4 < MIN_LOG2_MAX_FRAME_NUM - 4 ||
 log2_max_frame_num_minus4 > MAX_LOG2_MAX_FRAME_NUM - 4) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
 "log2_max_frame_num_minus4 out of range (0-12): %d\n",
 log2_max_frame_num_minus4);
 goto fail;
 }
 sps->log2_max_frame_num = log2_max_frame_num_minus4 + 4;
 
- sps->poc_type= get_ue_golomb_31(&s->gb);
+ sps->poc_type = get_ue_golomb_31(&h->gb);
 
- if(sps->poc_type == 0){ //FIXME #define
- sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4;
- } else if(sps->poc_type == 1){//FIXME #define
- sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb);
- sps->offset_for_non_ref_pic= get_se_golomb(&s->gb);
- sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb);
- sps->poc_cycle_length = get_ue_golomb(&s->gb);
+ if (sps->poc_type == 0) { // FIXME #define
+ sps->log2_max_poc_lsb = get_ue_golomb(&h->gb) + 4;
+ } else if (sps->poc_type == 1) { // FIXME #define
+ sps->delta_pic_order_always_zero_flag = get_bits1(&h->gb);
+ sps->offset_for_non_ref_pic = get_se_golomb(&h->gb);
+ sps->offset_for_top_to_bottom_field = get_se_golomb(&h->gb);
+ sps->poc_cycle_length = get_ue_golomb(&h->gb);
 
- if((unsigned)sps->poc_cycle_length >= FF_ARRAY_ELEMS(sps->offset_for_ref_frame)){
- av_log(h->s.avctx, AV_LOG_ERROR, "poc_cycle_length overflow %u\n", sps->poc_cycle_length);
+ if ((unsigned)sps->poc_cycle_length >=
+ FF_ARRAY_ELEMS(sps->offset_for_ref_frame)) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "poc_cycle_length overflow %u\n", sps->poc_cycle_length);
 goto fail;
 }
 
- for(i=0; i<sps->poc_cycle_length; i++)
- sps->offset_for_ref_frame[i]= get_se_golomb(&s->gb);
- }else if(sps->poc_type != 2){
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type);
+ for (i = 0; i < sps->poc_cycle_length; i++)
+ sps->offset_for_ref_frame[i] = get_se_golomb(&h->gb);
+ } else if (sps->poc_type != 2) {
+ av_log(h->avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type);
 goto fail;
 }
 
- sps->ref_frame_count= get_ue_golomb_31(&s->gb);
- if(sps->ref_frame_count > MAX_PICTURE_COUNT-2 || sps->ref_frame_count >= 32U){
- av_log(h->s.avctx, AV_LOG_ERROR, "too many reference frames\n");
+ sps->ref_frame_count = get_ue_golomb_31(&h->gb);
+ if (sps->ref_frame_count > MAX_PICTURE_COUNT - 2 ||
+ sps->ref_frame_count >= 32U) {
+ 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(&s->gb);
- sps->mb_width = get_ue_golomb(&s->gb) + 1;
- sps->mb_height= get_ue_golomb(&s->gb) + 1;
- if((unsigned)sps->mb_width >= INT_MAX/16 || (unsigned)sps->mb_height >= INT_MAX/16 ||
- av_image_check_size(16*sps->mb_width, 16*sps->mb_height, 0, h->s.avctx)){
- av_log(h->s.avctx, AV_LOG_ERROR, "mb_width/height overflow\n");
+ sps->gaps_in_frame_num_allowed_flag = get_bits1(&h->gb);
+ sps->mb_width = get_ue_golomb(&h->gb) + 1;
+ sps->mb_height = get_ue_golomb(&h->gb) + 1;
+ if ((unsigned)sps->mb_width >= INT_MAX / 16 ||
+ (unsigned)sps->mb_height >= INT_MAX / 16 ||
+ av_image_check_size(16 * sps->mb_width,
+ 16 * sps->mb_height, 0, h->avctx)) {
+ av_log(h->avctx, AV_LOG_ERROR, "mb_width/height overflow\n");
 goto fail;
 }
 
- sps->frame_mbs_only_flag= get_bits1(&s->gb);
- if(!sps->frame_mbs_only_flag)
- sps->mb_aff= get_bits1(&s->gb);
+ sps->frame_mbs_only_flag = get_bits1(&h->gb);
+ if (!sps->frame_mbs_only_flag)
+ sps->mb_aff = get_bits1(&h->gb);
 else
- sps->mb_aff= 0;
+ sps->mb_aff = 0;
 
- sps->direct_8x8_inference_flag= get_bits1(&s->gb);
- if(!sps->frame_mbs_only_flag && !sps->direct_8x8_inference_flag){
- av_log(h->s.avctx, AV_LOG_ERROR, "This stream was generated by a broken encoder, invalid 8x8 inference\n");
+ sps->direct_8x8_inference_flag = get_bits1(&h->gb);
+ if (!sps->frame_mbs_only_flag && !sps->direct_8x8_inference_flag) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "This stream was generated by a broken encoder, invalid 8x8 inference\n");
 goto fail;
 }
 
 #ifndef ALLOW_INTERLACE
- if(sps->mb_aff)
- av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF support not included; enable it at compile-time.\n");
+ if (sps->mb_aff)
+ av_log(h->avctx, AV_LOG_ERROR,
+ "MBAFF support not included; enable it at compile-time.\n");
 #endif
- sps->crop= get_bits1(&s->gb);
- if(sps->crop){
- int crop_vertical_limit = sps->chroma_format_idc & 2 ? 16 : 8;
- int crop_horizontal_limit = sps->chroma_format_idc == 3 ? 16 : 8;
- sps->crop_left = get_ue_golomb(&s->gb);
- sps->crop_right = get_ue_golomb(&s->gb);
- sps->crop_top = get_ue_golomb(&s->gb);
- sps->crop_bottom= get_ue_golomb(&s->gb);
- if(sps->crop_left || sps->crop_top){
- av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n");
- }
- if(sps->crop_right >= crop_horizontal_limit || sps->crop_bottom >= crop_vertical_limit){
- av_log(h->s.avctx, AV_LOG_ERROR, "brainfart cropping not supported, this could look slightly wrong ...\n");
+ sps->crop = get_bits1(&h->gb);
+ if (sps->crop) {
+ int crop_left = get_ue_golomb(&h->gb);
+ int crop_right = get_ue_golomb(&h->gb);
+ int crop_top = get_ue_golomb(&h->gb);
+ int crop_bottom = get_ue_golomb(&h->gb);
+
+ if (h->avctx->flags2 & CODEC_FLAG2_IGNORE_CROP) {
+ av_log(h->avctx, AV_LOG_DEBUG, "discarding sps cropping, original "
+ "values are l:%u r:%u t:%u b:%u\n",
+ crop_left, crop_right, crop_top, crop_bottom);
+
+ sps->crop_left =
+ sps->crop_right =
+ sps->crop_top =
+ sps->crop_bottom = 0;
+ } else {
+ int vsub = (sps->chroma_format_idc == 1) ? 1 : 0;
+ int hsub = (sps->chroma_format_idc == 1 ||
+ sps->chroma_format_idc == 2) ? 1 : 0;
+ int step_x = 1 << hsub;
+ int step_y = (2 - sps->frame_mbs_only_flag) << vsub;
+
+ if (crop_left & (0x1F >> (sps->bit_depth_luma > 8)) &&
+ !(h->avctx->flags & CODEC_FLAG_UNALIGNED)) {
+ crop_left &= ~(0x1F >> (sps->bit_depth_luma > 8));
+ av_log(h->avctx, AV_LOG_WARNING,
+ "Reducing left cropping to %d "
+ "chroma samples to preserve alignment.\n",
+ crop_left);
+ }
+
+ sps->crop_left = crop_left * step_x;
+ sps->crop_right = crop_right * step_x;
+ sps->crop_top = crop_top * step_y;
+ sps->crop_bottom = crop_bottom * step_y;
 }
- }else{
- sps->crop_left =
- sps->crop_right =
- sps->crop_top =
- sps->crop_bottom= 0;
+ } else {
+ sps->crop_left =
+ sps->crop_right =
+ sps->crop_top =
+ sps->crop_bottom =
+ sps->crop = 0;
 }
 
- sps->vui_parameters_present_flag= get_bits1(&s->gb);
- if( sps->vui_parameters_present_flag )
- if (decode_vui_parameters(h, sps) < 0)
+ sps->vui_parameters_present_flag = get_bits1(&h->gb);
+ if (sps->vui_parameters_present_flag) {
+ int ret = decode_vui_parameters(h, sps);
+ if (ret < 0 && h->avctx->err_recognition & AV_EF_EXPLODE)
 goto fail;
+ }
 
- if(!sps->sar.den)
- sps->sar.den= 1;
+ if (!sps->sar.den)
+ sps->sar.den = 1;
 
- if(s->avctx->debug&FF_DEBUG_PICT_INFO){
+ if (h->avctx->debug & FF_DEBUG_PICT_INFO) {
 static const char csp[4][5] = { "Gray", "420", "422", "444" };
- av_log(h->s.avctx, AV_LOG_DEBUG, "sps:%u profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%d/%d/%d/%d %s %s %d/%d\n",
+ av_log(h->avctx, AV_LOG_DEBUG,
+ "sps:%u profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%d/%d/%d/%d %s %s %d/%d\n",
 sps_id, sps->profile_idc, sps->level_idc,
 sps->poc_type,
 sps->ref_frame_count,
@@ -460,133 +497,141 @@
 sps->vui_parameters_present_flag ? "VUI" : "",
 csp[sps->chroma_format_idc],
 sps->timing_info_present_flag ? sps->num_units_in_tick : 0,
- sps->timing_info_present_flag ? sps->time_scale : 0
- );
+ sps->timing_info_present_flag ? sps->time_scale : 0);
 }
 sps->new = 1;
 
 av_free(h->sps_buffers[sps_id]);
 h->sps_buffers[sps_id] = sps;
 h->sps = *sps;
- h->current_sps_id = sps_id;
 
 return 0;
+
 fail:
 av_free(sps);
 return -1;
 }
 
-static void
-build_qp_table(PPS *pps, int t, int index, const int depth)
+static void build_qp_table(PPS *pps, int t, int index, const int depth)
 {
 int i;
- const int max_qp = 51 + 6*(depth-8);
- for(i = 0; i < max_qp+1; i++)
- pps->chroma_qp_table[t][i] = ff_h264_chroma_qp[depth-8][av_clip(i + index, 0, max_qp)];
+ const int max_qp = 51 + 6 * (depth - 8);
+ for (i = 0; i < max_qp + 1; i++)
+ pps->chroma_qp_table[t][i] =
+ ff_h264_chroma_qp[depth - 8][av_clip(i + index, 0, max_qp)];
 }
 
-int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length){
- MpegEncContext * const s = &h->s;
- unsigned int pps_id= get_ue_golomb(&s->gb);
+int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length)
+{
+ unsigned int pps_id = get_ue_golomb(&h->gb);
 PPS *pps;
- const int qp_bd_offset = 6*(h->sps.bit_depth_luma-8);
+ const int qp_bd_offset = 6 * (h->sps.bit_depth_luma - 8);
 int bits_left;
 
- if(pps_id >= MAX_PPS_COUNT) {
- av_log(h->s.avctx, AV_LOG_ERROR, "pps_id (%d) out of range\n", pps_id);
- return -1;
+ if (pps_id >= MAX_PPS_COUNT) {
+ av_log(h->avctx, AV_LOG_ERROR, "pps_id %u out of range\n", pps_id);
+ return AVERROR_INVALIDDATA;
 } else if (h->sps.bit_depth_luma > 10) {
- av_log(h->s.avctx, AV_LOG_ERROR, "Unimplemented luma bit depth=%d (max=10)\n", h->sps.bit_depth_luma);
+ av_log(h->avctx, AV_LOG_ERROR,
+ "Unimplemented luma bit depth=%d (max=10)\n",
+ h->sps.bit_depth_luma);
 return AVERROR_PATCHWELCOME;
 }
 
- pps= av_mallocz(sizeof(PPS));
- if(pps == NULL)
- return -1;
- pps->sps_id= get_ue_golomb_31(&s->gb);
- if((unsigned)pps->sps_id>=MAX_SPS_COUNT || h->sps_buffers[pps->sps_id] == NULL){
- av_log(h->s.avctx, AV_LOG_ERROR, "sps_id out of range\n");
+ pps = av_mallocz(sizeof(PPS));
+ if (!pps)
+ return AVERROR(ENOMEM);
+ 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 %u out of range\n", pps->sps_id);
 goto fail;
 }
 
- pps->cabac= get_bits1(&s->gb);
- pps->pic_order_present= get_bits1(&s->gb);
- pps->slice_group_count= get_ue_golomb(&s->gb) + 1;
- if(pps->slice_group_count > 1 ){
- pps->mb_slice_group_map_type= get_ue_golomb(&s->gb);
- av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n");
- switch(pps->mb_slice_group_map_type){
+ pps->cabac = get_bits1(&h->gb);
+ pps->pic_order_present = get_bits1(&h->gb);
+ pps->slice_group_count = get_ue_golomb(&h->gb) + 1;
+ if (pps->slice_group_count > 1) {
+ pps->mb_slice_group_map_type = get_ue_golomb(&h->gb);
+ av_log(h->avctx, AV_LOG_ERROR, "FMO not supported\n");
+ switch (pps->mb_slice_group_map_type) {
 case 0:
 #if 0
-| for( i = 0; i <= num_slice_groups_minus1; i++ ) | | |
-| run_length[ i ] |1 |ue(v) |
+ | for (i = 0; i <= num_slice_groups_minus1; i++) | | |
+ | run_length[i] |1 |ue(v) |
 #endif
 break;
 case 2:
 #if 0
-| for( i = 0; i < num_slice_groups_minus1; i++ ) | | |
-|{ | | |
-| top_left_mb[ i ] |1 |ue(v) |
-| bottom_right_mb[ i ] |1 |ue(v) |
-| } | | |
+ | for (i = 0; i < num_slice_groups_minus1; i++) { | | |
+ | top_left_mb[i] |1 |ue(v) |
+ | bottom_right_mb[i] |1 |ue(v) |
+ | } | | |
 #endif
 break;
 case 3:
 case 4:
 case 5:
 #if 0
-| slice_group_change_direction_flag |1 |u(1) |
-| slice_group_change_rate_minus1 |1 |ue(v) |
+ | slice_group_change_direction_flag |1 |u(1) |
+ | slice_group_change_rate_minus1 |1 |ue(v) |
 #endif
 break;
 case 6:
 #if 0
-| slice_group_id_cnt_minus1 |1 |ue(v) |
-| for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | |
-|) | | |
-| slice_group_id[ i ] |1 |u(v) |
+ | slice_group_id_cnt_minus1 |1 |ue(v) |
+ | for (i = 0; i <= slice_group_id_cnt_minus1; i++)| | |
+ | slice_group_id[i] |1 |u(v) |
 #endif
 break;
 }
 }
- pps->ref_count[0]= get_ue_golomb(&s->gb) + 1;
- pps->ref_count[1]= get_ue_golomb(&s->gb) + 1;
- if(pps->ref_count[0]-1 > 32-1 || pps->ref_count[1]-1 > 32-1){
- av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n");
+ pps->ref_count[0] = get_ue_golomb(&h->gb) + 1;
+ pps->ref_count[1] = get_ue_golomb(&h->gb) + 1;
+ if (pps->ref_count[0] - 1 > 32 - 1 || pps->ref_count[1] - 1 > 32 - 1) {
+ av_log(h->avctx, AV_LOG_ERROR, "reference overflow (pps)\n");
 goto fail;
 }
 
- pps->weighted_pred= get_bits1(&s->gb);
- pps->weighted_bipred_idc= get_bits(&s->gb, 2);
- pps->init_qp= get_se_golomb(&s->gb) + 26 + qp_bd_offset;
- pps->init_qs= get_se_golomb(&s->gb) + 26 + qp_bd_offset;
- pps->chroma_qp_index_offset[0]= get_se_golomb(&s->gb);
- pps->deblocking_filter_parameters_present= get_bits1(&s->gb);
- pps->constrained_intra_pred= get_bits1(&s->gb);
- pps->redundant_pic_cnt_present = get_bits1(&s->gb);
-
- pps->transform_8x8_mode= 0;
- h->dequant_coeff_pps= -1; //contents of sps/pps can change even if id doesn't, so reinit
- memcpy(pps->scaling_matrix4, h->sps_buffers[pps->sps_id]->scaling_matrix4, sizeof(pps->scaling_matrix4));
- memcpy(pps->scaling_matrix8, h->sps_buffers[pps->sps_id]->scaling_matrix8, sizeof(pps->scaling_matrix8));
-
- bits_left = bit_length - get_bits_count(&s->gb);
+ pps->weighted_pred = get_bits1(&h->gb);
+ pps->weighted_bipred_idc = get_bits(&h->gb, 2);
+ pps->init_qp = get_se_golomb(&h->gb) + 26 + qp_bd_offset;
+ pps->init_qs = get_se_golomb(&h->gb) + 26 + qp_bd_offset;
+ pps->chroma_qp_index_offset[0] = get_se_golomb(&h->gb);
+ pps->deblocking_filter_parameters_present = get_bits1(&h->gb);
+ pps->constrained_intra_pred = get_bits1(&h->gb);
+ pps->redundant_pic_cnt_present = get_bits1(&h->gb);
+
+ pps->transform_8x8_mode = 0;
+ // contents of sps/pps can change even if id doesn't, so reinit
+ h->dequant_coeff_pps = -1;
+ memcpy(pps->scaling_matrix4, h->sps_buffers[pps->sps_id]->scaling_matrix4,
+ sizeof(pps->scaling_matrix4));
+ memcpy(pps->scaling_matrix8, h->sps_buffers[pps->sps_id]->scaling_matrix8,
+ sizeof(pps->scaling_matrix8));
+
+ bits_left = bit_length - get_bits_count(&h->gb);
 if (bits_left && (bits_left > 8 ||
- show_bits(&s->gb, bits_left) != 1 << (bits_left - 1))) {
- pps->transform_8x8_mode= get_bits1(&s->gb);
- decode_scaling_matrices(h, h->sps_buffers[pps->sps_id], pps, 0, pps->scaling_matrix4, pps->scaling_matrix8);
- pps->chroma_qp_index_offset[1]= get_se_golomb(&s->gb); //second_chroma_qp_index_offset
+ show_bits(&h->gb, bits_left) != 1 << (bits_left - 1))) {
+ pps->transform_8x8_mode = get_bits1(&h->gb);
+ decode_scaling_matrices(h, h->sps_buffers[pps->sps_id], pps, 0,
+ pps->scaling_matrix4, pps->scaling_matrix8);
+ // second_chroma_qp_index_offset
+ pps->chroma_qp_index_offset[1] = get_se_golomb(&h->gb);
 } else {
- pps->chroma_qp_index_offset[1]= pps->chroma_qp_index_offset[0];
+ pps->chroma_qp_index_offset[1] = pps->chroma_qp_index_offset[0];
 }
 
- build_qp_table(pps, 0, pps->chroma_qp_index_offset[0], h->sps.bit_depth_luma);
- build_qp_table(pps, 1, pps->chroma_qp_index_offset[1], h->sps.bit_depth_luma);
- if(pps->chroma_qp_index_offset[0] != pps->chroma_qp_index_offset[1])
- pps->chroma_qp_diff= 1;
+ build_qp_table(pps, 0, pps->chroma_qp_index_offset[0],
+ h->sps.bit_depth_luma);
+ build_qp_table(pps, 1, pps->chroma_qp_index_offset[1],
+ h->sps.bit_depth_luma);
+ if (pps->chroma_qp_index_offset[0] != pps->chroma_qp_index_offset[1])
+ pps->chroma_qp_diff = 1;
 
- if(s->avctx->debug&FF_DEBUG_PICT_INFO){
- av_log(h->s.avctx, AV_LOG_DEBUG, "pps:%u sps:%u %s slice_groups:%d ref:%d/%d %s qp:%d/%d/%d/%d %s %s %s %s\n",
+ if (h->avctx->debug & FF_DEBUG_PICT_INFO) {
+ av_log(h->avctx, AV_LOG_DEBUG,
+ "pps:%u sps:%u %s slice_groups:%d ref:%d/%d %s qp:%d/%d/%d/%d %s %s %s %s\n",
 pps_id, pps->sps_id,
 pps->cabac ? "CABAC" : "CAVLC",
 pps->slice_group_count,
@@ -596,13 +641,13 @@
 pps->deblocking_filter_parameters_present ? "LPAR" : "",
 pps->constrained_intra_pred ? "CONSTR" : "",
 pps->redundant_pic_cnt_present ? "REDU" : "",
- pps->transform_8x8_mode ? "8x8DCT" : ""
- );
+ pps->transform_8x8_mode ? "8x8DCT" : "");
 }
 
 av_free(h->pps_buffers[pps_id]);
- h->pps_buffers[pps_id]= pps;
+ h->pps_buffers[pps_id] = pps;
 return 0;
+
 fail:
 av_free(pps);
 return -1;

libav-v9.6.tar.bz2/libavcodec/h264_refs.c -> libav-v10.1.tar.bz2/libavcodec/h264_refs.c Changed

@@ -26,33 +26,38 @@
 */
 
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "h264.h"
 #include "golomb.h"
 
-//#undef NDEBUG
 #include <assert.h>
 
+#define COPY_PICTURE(dst, src) \
+do {\
+ *(dst) = *(src);\
+ (dst)->f.extended_data = (dst)->f.data;\
+ (dst)->tf.f = &(dst)->f;\
+} while (0)
+
 
 static void pic_as_field(Picture *pic, const int parity){
 int i;
 for (i = 0; i < 4; ++i) {
 if (parity == PICT_BOTTOM_FIELD)
 pic->f.data[i] += pic->f.linesize[i];
- pic->f.reference = parity;
+ pic->reference = parity;
 pic->f.linesize[i] *= 2;
 }
 pic->poc= pic->field_poc[parity == PICT_BOTTOM_FIELD];
 }
 
-static int split_field_copy(Picture *dest, Picture *src,
- int parity, int id_add){
- int match = !!(src->f.reference & parity);
+static int split_field_copy(Picture *dest, Picture *src, int parity, int id_add)
+{
+ int match = !!(src->reference & parity);
 
 if (match) {
- *dest = *src;
- if(parity != PICT_FRAME){
+ COPY_PICTURE(dest, src);
+ if (parity != PICT_FRAME) {
 pic_as_field(dest, parity);
 dest->pic_id *= 2;
 dest->pic_id += id_add;
@@ -62,95 +67,116 @@
 return match;
 }
 
-static int build_def_list(Picture *def, Picture **in, int len, int is_long, int sel){
- int i[2]={0};
- int index=0;
+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;
 
- while(i[0]<len || i[1]<len){
- while (i[0] < len && !(in[ i[0] ] && (in[ i[0] ]->f.reference & sel)))
+ while ((i[0] < len || i[1] < len) && index < def_len) {
+ while (i[0] < len && !(in[i[0]] && (in[i[0]]->reference & sel)))
 i[0]++;
- while (i[1] < len && !(in[ i[1] ] && (in[ i[1] ]->f.reference & (sel^3))))
+ while (i[1] < len && !(in[i[1]] && (in[i[1]]->reference & (sel ^ 3))))
 i[1]++;
- if(i[0] < 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[0] < len && 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){
- 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);
+ if (i[1] < len && 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);
 }
 }
 
 return index;
 }
 
-static int add_sorted(Picture **sorted, Picture **src, int len, int limit, int dir){
+static int add_sorted(Picture **sorted, Picture **src, int len, int limit, int dir)
+{
 int i, best_poc;
- int out_i= 0;
+ int out_i = 0;
 
- for(;;){
- best_poc= dir ? INT_MIN : INT_MAX;
+ for (;;) {
+ best_poc = dir ? INT_MIN : INT_MAX;
 
- for(i=0; i<len; i++){
- const int poc= src[i]->poc;
- if(((poc > limit) ^ dir) && ((poc < best_poc) ^ dir)){
- best_poc= poc;
- sorted[out_i]= src[i];
+ for (i = 0; i < len; i++) {
+ const int poc = src[i]->poc;
+ if (((poc > limit) ^ dir) && ((poc < best_poc) ^ dir)) {
+ best_poc = poc;
+ sorted[out_i] = src[i];
 }
 }
- if(best_poc == (dir ? INT_MIN : INT_MAX))
+ if (best_poc == (dir ? INT_MIN : INT_MAX))
 break;
- limit= sorted[out_i++]->poc - dir;
+ limit = sorted[out_i++]->poc - dir;
 }
 return out_i;
 }
 
-int ff_h264_fill_default_ref_list(H264Context *h){
- MpegEncContext * const s = &h->s;
+int ff_h264_fill_default_ref_list(H264Context *h)
+{
 int i, len;
 
- if(h->slice_type_nos==AV_PICTURE_TYPE_B){
+ if (h->slice_type_nos == AV_PICTURE_TYPE_B) {
 Picture *sorted[32];
 int cur_poc, list;
 int lens[2];
 
- if(FIELD_PICTURE)
- cur_poc= s->current_picture_ptr->field_poc[ s->picture_structure == PICT_BOTTOM_FIELD ];
+ if (FIELD_PICTURE(h))
+ cur_poc = h->cur_pic_ptr->field_poc[h->picture_structure == PICT_BOTTOM_FIELD];
 else
- cur_poc= s->current_picture_ptr->poc;
-
- for(list= 0; list<2; list++){
- 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);
- assert(len<=32);
- len= build_def_list(h->default_ref_list[list] , sorted , len, 0, s->picture_structure);
- len+=build_def_list(h->default_ref_list[list]+len, h->long_ref, 16 , 1, s->picture_structure);
- assert(len<=32);
-
- if(len < h->ref_count[list])
- memset(&h->default_ref_list[list][len], 0, sizeof(Picture)*(h->ref_count[list] - len));
- lens[list]= len;
+ cur_poc = h->cur_pic_ptr->poc;
+
+ for (list = 0; list < 2; list++) {
+ 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);
+ assert(len <= 32);
+
+ 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);
+
+ if (len < h->ref_count[list])
+ memset(&h->default_ref_list[list][len], 0, sizeof(Picture) * (h->ref_count[list] - len));
+ lens[list] = len;
 }
 
- 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++);
- if(i == lens[0])
- FFSWAP(Picture, h->default_ref_list[1][0], h->default_ref_list[1][1]);
+ if (lens[0] == lens[1] && lens[1] > 1) {
+ 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]);
+ COPY_PICTURE(&h->default_ref_list[1][0], &h->default_ref_list[1][1]);
+ COPY_PICTURE(&h->default_ref_list[1][1], &tmp);
+ }
 }
- }else{
- len = build_def_list(h->default_ref_list[0] , h->short_ref, h->short_ref_count, 0, s->picture_structure);
- len+= build_def_list(h->default_ref_list[0]+len, h-> long_ref, 16 , 1, s->picture_structure);
- assert(len <= 32);
- if(len < h->ref_count[0])
- memset(&h->default_ref_list[0][len], 0, sizeof(Picture)*(h->ref_count[0] - len));
+ } else {
+ 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);
+
+ if (len < h->ref_count[0])
+ memset(&h->default_ref_list[0][len], 0, sizeof(Picture) * (h->ref_count[0] - len));
 }
 #ifdef TRACE
- for (i=0; i<h->ref_count[0]; i++) {
- tprintf(h->s.avctx, "List0: %s fn:%d 0x%p\n", (h->default_ref_list[0][i].long_ref ? "LT" : "ST"), h->default_ref_list[0][i].pic_id, h->default_ref_list[0][i].f.data[0]);
+ for (i = 0; i < h->ref_count[0]; i++) {
+ tprintf(h->avctx, "List0: %s fn:%d 0x%p\n",
+ (h->default_ref_list[0][i].long_ref ? "LT" : "ST"),
+ h->default_ref_list[0][i].pic_id,
+ h->default_ref_list[0][i].f.data[0]);
 }
- if(h->slice_type_nos==AV_PICTURE_TYPE_B){
- for (i=0; i<h->ref_count[1]; i++) {
- tprintf(h->s.avctx, "List1: %s fn:%d 0x%p\n", (h->default_ref_list[1][i].long_ref ? "LT" : "ST"), h->default_ref_list[1][i].pic_id, h->default_ref_list[1][i].f.data[0]);
+ if (h->slice_type_nos == AV_PICTURE_TYPE_B) {
+ for (i = 0; i < h->ref_count[1]; i++) {
+ tprintf(h->avctx, "List1: %s fn:%d 0x%p\n",
+ (h->default_ref_list[1][i].long_ref ? "LT" : "ST"),
+ h->default_ref_list[1][i].pic_id,
+ h->default_ref_list[1][i].f.data[0]);
 }
 }
 #endif
@@ -170,11 +196,10 @@
 * @return frame number (short term) or long term index of picture
 * described by pic_num
 */
-static int pic_num_extract(H264Context *h, int pic_num, int *structure){
- MpegEncContext * const s = &h->s;
-
- *structure = s->picture_structure;
- if(FIELD_PICTURE){
+static int pic_num_extract(H264Context *h, int pic_num, int *structure)
+{
+ *structure = h->picture_structure;
+ if (FIELD_PICTURE(h)) {
 if (!(pic_num & 1))
 /* opposite field */
 *structure ^= PICT_FRAME;
@@ -184,111 +209,121 @@
 return pic_num;
 }
 
-int ff_h264_decode_ref_pic_list_reordering(H264Context *h){
- MpegEncContext * const s = &h->s;
- int list, index, pic_structure;
+int ff_h264_decode_ref_pic_list_reordering(H264Context *h)
+{
+ int list, index, pic_structure, i;
 
 print_short_term(h);
 print_long_term(h);
 
- for(list=0; list<h->list_count; list++){
- memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]);
+ for (list = 0; list < h->list_count; list++) {
+ for (i = 0; i < h->ref_count[list]; i++)
+ COPY_PICTURE(&h->ref_list[list][i], &h->default_ref_list[list][i]);
 
- if(get_bits1(&s->gb)){
- int pred= h->curr_pic_num;
+ if (get_bits1(&h->gb)) {
+ int pred = h->curr_pic_num;
 
- for(index=0; ; index++){
- unsigned int reordering_of_pic_nums_idc= get_ue_golomb_31(&s->gb);
+ for (index = 0; ; index++) {
+ unsigned int reordering_of_pic_nums_idc = get_ue_golomb_31(&h->gb);
 unsigned int pic_id;
 int i;
 Picture *ref = NULL;
 
- if(reordering_of_pic_nums_idc==3)
+ if (reordering_of_pic_nums_idc == 3)
 break;
 
- if(index >= h->ref_count[list]){
- av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n");
+ if (index >= h->ref_count[list]) {
+ av_log(h->avctx, AV_LOG_ERROR, "reference count overflow\n");
 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(&s->gb) + 1;
- int frame_num;
-
- if(abs_diff_pic_num > h->max_pic_num){
- av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n");
- return -1;
- }
-
- 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->f.reference);
- assert(!ref->long_ref);
- if(
- ref->frame_num == frame_num &&
- (ref->f.reference & pic_structure)
- )
- break;
- }
- if(i>=0)
- ref->pic_id= pred;
- }else{
- int long_idx;
- pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx
-
- long_idx= pic_num_extract(h, pic_id, &pic_structure);
-
- if(long_idx>31){
- av_log(h->s.avctx, AV_LOG_ERROR, "long_term_pic_idx overflow\n");
- return -1;
- }
- ref = h->long_ref[long_idx];
- assert(!(ref && !ref->f.reference));
- if (ref && (ref->f.reference & pic_structure)) {
- ref->pic_id= pic_id;
- assert(ref->long_ref);
- i=0;
- }else{
- i=-1;
- }
+ 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 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;
+ break;
+ }
+ case 2: {
+ int long_idx;
+ pic_id = get_ue_golomb(&h->gb); // long_term_pic_idx
 
- if (i < 0) {
- av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n");
- memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME
+ 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 AVERROR_INVALIDDATA;
+ }
+ 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--){
- h->ref_list[list][i]= h->ref_list[list][i-1];
- }
- h->ref_list[list][index]= *ref;
- if (FIELD_PICTURE){
- 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 {
+ 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);
 }
- }else{
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n");
- return -1;
 }
 }
 }
 }
- 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]) {
- av_log(h->s.avctx, AV_LOG_ERROR, "Missing reference picture\n");
- if (h->default_ref_list[list][0].f.data[0])
- h->ref_list[list][index]= h->default_ref_list[list][0];
+ for (list = 0; list < h->list_count; list++) {
+ for (index = 0; index < h->ref_count[list]; index++) {
+ if (!h->ref_list[list][index].f.buf[0]) {
+ av_log(h->avctx, AV_LOG_ERROR, "Missing reference picture\n");
+ if (h->default_ref_list[list][0].f.buf[0])
+ COPY_PICTURE(&h->ref_list[list][index], &h->default_ref_list[list][0]);
 else
 return -1;
 }
@@ -298,28 +333,29 @@
 return 0;
 }
 
-void ff_h264_fill_mbaff_ref_list(H264Context *h){
+void ff_h264_fill_mbaff_ref_list(H264Context *h)
+{
 int list, i, j;
- for(list=0; list<2; list++){ //FIXME try list_count
- for(i=0; i<h->ref_count[list]; i++){
+ for (list = 0; list < 2; list++) { //FIXME try list_count
+ for (i = 0; i < h->ref_count[list]; i++) {
 Picture *frame = &h->ref_list[list][i];
- Picture *field = &h->ref_list[list][16+2*i];
- field[0] = *frame;
- for(j=0; j<3; j++)
+ Picture *field = &h->ref_list[list][16 + 2 * i];
+ COPY_PICTURE(field, frame);
+ for (j = 0; j < 3; j++)
 field[0].f.linesize[j] <<= 1;
- field[0].f.reference = PICT_TOP_FIELD;
- field[0].poc= field[0].field_poc[0];
- field[1] = field[0];
- for(j=0; j<3; j++)
+ field[0].reference = PICT_TOP_FIELD;
+ field[0].poc = field[0].field_poc[0];
+ COPY_PICTURE(field + 1, field);
+ for (j = 0; j < 3; j++)
 field[1].f.data[j] += frame->f.linesize[j];
- field[1].f.reference = PICT_BOTTOM_FIELD;
- field[1].poc= field[1].field_poc[1];
-
- h->luma_weight[16+2*i][list][0] = h->luma_weight[16+2*i+1][list][0] = h->luma_weight[i][list][0];
- h->luma_weight[16+2*i][list][1] = h->luma_weight[16+2*i+1][list][1] = h->luma_weight[i][list][1];
- for(j=0; j<2; j++){
- h->chroma_weight[16+2*i][list][j][0] = h->chroma_weight[16+2*i+1][list][j][0] = h->chroma_weight[i][list][j][0];
- h->chroma_weight[16+2*i][list][j][1] = h->chroma_weight[16+2*i+1][list][j][1] = h->chroma_weight[i][list][j][1];
+ field[1].reference = PICT_BOTTOM_FIELD;
+ field[1].poc = field[1].field_poc[1];
+
+ h->luma_weight[16 + 2 * i][list][0] = h->luma_weight[16 + 2 * i + 1][list][0] = h->luma_weight[i][list][0];
+ h->luma_weight[16 + 2 * i][list][1] = h->luma_weight[16 + 2 * i + 1][list][1] = h->luma_weight[i][list][1];
+ for (j = 0; j < 2; j++) {
+ h->chroma_weight[16 + 2 * i][list][j][0] = h->chroma_weight[16 + 2 * i + 1][list][j][0] = h->chroma_weight[i][list][j][0];
+ h->chroma_weight[16 + 2 * i][list][j][1] = h->chroma_weight[16 + 2 * i + 1][list][j][1] = h->chroma_weight[i][list][j][1];
 }
 }
 }
@@ -336,14 +372,15 @@
 * for display purposes) zero if one of the fields remains in
 * reference
 */
-static inline int unreference_pic(H264Context *h, Picture *pic, int refmask){
+static inline int unreference_pic(H264Context *h, Picture *pic, int refmask)
+{
 int i;
- if (pic->f.reference &= refmask) {
+ if (pic->reference &= refmask) {
 return 0;
 } else {
 for(i = 0; h->delayed_pic[i]; i++)
 if(pic == h->delayed_pic[i]){
- pic->f.reference = DELAYED_PIC_REF;
+ pic->reference = DELAYED_PIC_REF;
 break;
 }
 return 1;
@@ -358,15 +395,15 @@
 * @return pointer to the found picture, or NULL if no pic with the provided
 * frame number is found
 */
-static Picture * find_short(H264Context *h, int frame_num, int *idx){
- MpegEncContext * const s = &h->s;
+static Picture *find_short(H264Context *h, int frame_num, int *idx)
+{
 int i;
 
- for(i=0; i<h->short_ref_count; i++){
- Picture *pic= h->short_ref[i];
- if(s->avctx->debug&FF_DEBUG_MMCO)
- av_log(h->s.avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic);
- if(pic->frame_num == frame_num) {
+ for (i = 0; i < h->short_ref_count; i++) {
+ Picture *pic = h->short_ref[i];
+ if (h->avctx->debug & FF_DEBUG_MMCO)
+ av_log(h->avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic);
+ if (pic->frame_num == frame_num) {
 *idx = i;
 return pic;
 }
@@ -380,29 +417,31 @@
 * to be valid. Other list entries are shifted down.
 * @param i index into h->short_ref of picture to remove.
 */
-static void remove_short_at_index(H264Context *h, int i){
+static void remove_short_at_index(H264Context *h, int i)
+{
 assert(i >= 0 && i < h->short_ref_count);
- h->short_ref[i]= NULL;
+ h->short_ref[i] = NULL;
 if (--h->short_ref_count)
- memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i)*sizeof(Picture*));
+ memmove(&h->short_ref[i], &h->short_ref[i + 1],
+ (h->short_ref_count - i) * sizeof(Picture*));
 }
 
 /**
 *
 * @return the removed picture or NULL if an error occurs
 */
-static Picture * remove_short(H264Context *h, int frame_num, int ref_mask){
- MpegEncContext * const s = &h->s;
+static Picture *remove_short(H264Context *h, int frame_num, int ref_mask)
+{
 Picture *pic;
 int i;
 
- if(s->avctx->debug&FF_DEBUG_MMCO)
- av_log(h->s.avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count);
+ if (h->avctx->debug & FF_DEBUG_MMCO)
+ av_log(h->avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count);
 
 pic = find_short(h, frame_num, &i);
- if (pic){
- if(unreference_pic(h, pic, ref_mask))
- remove_short_at_index(h, i);
+ if (pic) {
+ if (unreference_pic(h, pic, ref_mask))
+ remove_short_at_index(h, i);
 }
 
 return pic;
@@ -413,15 +452,16 @@
 * that list.
 * @return the removed picture or NULL if an error occurs
 */
-static Picture * remove_long(H264Context *h, int i, int ref_mask){
+static Picture *remove_long(H264Context *h, int i, int ref_mask)
+{
 Picture *pic;
 
- pic= h->long_ref[i];
- if (pic){
- if(unreference_pic(h, pic, ref_mask)){
+ pic = h->long_ref[i];
+ if (pic) {
+ if (unreference_pic(h, pic, ref_mask)) {
 assert(h->long_ref[i]->long_ref == 1);
- h->long_ref[i]->long_ref= 0;
- h->long_ref[i]= NULL;
+ h->long_ref[i]->long_ref = 0;
+ h->long_ref[i] = NULL;
 h->long_ref_count--;
 }
 }
@@ -429,31 +469,33 @@
 return pic;
 }
 
-void ff_h264_remove_all_refs(H264Context *h){
+void ff_h264_remove_all_refs(H264Context *h)
+{
 int i;
 
- for(i=0; i<16; i++){
+ for (i = 0; i < 16; i++) {
 remove_long(h, i, 0);
 }
- assert(h->long_ref_count==0);
+ assert(h->long_ref_count == 0);
 
- for(i=0; i<h->short_ref_count; i++){
+ for (i = 0; i < h->short_ref_count; i++) {
 unreference_pic(h, h->short_ref[i], 0);
- h->short_ref[i]= NULL;
+ h->short_ref[i] = NULL;
 }
- h->short_ref_count=0;
+ h->short_ref_count = 0;
 }
 
 /**
 * print short term list
 */
-static void print_short_term(H264Context *h) {
+static void print_short_term(H264Context *h)
+{
 uint32_t i;
- if(h->s.avctx->debug&FF_DEBUG_MMCO) {
- av_log(h->s.avctx, AV_LOG_DEBUG, "short term list:\n");
- for(i=0; i<h->short_ref_count; i++){
- Picture *pic= h->short_ref[i];
- av_log(h->s.avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n",
+ if (h->avctx->debug & FF_DEBUG_MMCO) {
+ av_log(h->avctx, AV_LOG_DEBUG, "short term list:\n");
+ for (i = 0; i < h->short_ref_count; i++) {
+ Picture *pic = h->short_ref[i];
+ av_log(h->avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n",
 i, pic->frame_num, pic->poc, pic->f.data[0]);
 }
 }
@@ -462,14 +504,15 @@
 /**
 * print long term list
 */
-static void print_long_term(H264Context *h) {
+static void print_long_term(H264Context *h)
+{
 uint32_t i;
- if(h->s.avctx->debug&FF_DEBUG_MMCO) {
- av_log(h->s.avctx, AV_LOG_DEBUG, "long term list:\n");
- for(i = 0; i < 16; i++){
- Picture *pic= h->long_ref[i];
+ if (h->avctx->debug & FF_DEBUG_MMCO) {
+ av_log(h->avctx, AV_LOG_DEBUG, "long term list:\n");
+ for (i = 0; i < 16; i++) {
+ Picture *pic = h->long_ref[i];
 if (pic) {
- av_log(h->s.avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n",
+ av_log(h->avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n",
 i, pic->frame_num, pic->poc, pic->f.data[0]);
 }
 }
@@ -490,7 +533,6 @@
 
 int ff_generate_sliding_window_mmcos(H264Context *h, int first_slice)
 {
- MpegEncContext * const s = &h->s;
 MMCO mmco_temp[MAX_MMCO_COUNT], *mmco = first_slice ? h->mmco : mmco_temp;
 int mmco_index = 0, i;
 
@@ -498,16 +540,15 @@
 
 if (h->short_ref_count &&
 h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count &&
- !(FIELD_PICTURE && !s->first_field &&
- s->current_picture_ptr->f.reference)) {
- mmco[0].opcode = MMCO_SHORT2UNUSED;
+ !(FIELD_PICTURE(h) && !h->first_field && h->cur_pic_ptr->reference)) {
+ mmco[0].opcode = MMCO_SHORT2UNUSED;
 mmco[0].short_pic_num = h->short_ref[h->short_ref_count - 1]->frame_num;
- mmco_index = 1;
- if (FIELD_PICTURE) {
+ mmco_index = 1;
+ if (FIELD_PICTURE(h)) {
 mmco[0].short_pic_num *= 2;
- mmco[1].opcode = MMCO_SHORT2UNUSED;
- mmco[1].short_pic_num = mmco[0].short_pic_num + 1;
- mmco_index = 2;
+ mmco[1].opcode = MMCO_SHORT2UNUSED;
+ mmco[1].short_pic_num = mmco[0].short_pic_num + 1;
+ mmco_index = 2;
 }
 }
 
@@ -516,7 +557,7 @@
 } else if (!first_slice && mmco_index >= 0 &&
 (mmco_index != h->mmco_index ||
 (i = check_opcodes(h->mmco, mmco_temp, mmco_index)))) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
 "Inconsistent MMCO state between slices [%d, %d, %d]\n",
 mmco_index, h->mmco_index, i);
 return AVERROR_INVALIDDATA;
@@ -524,38 +565,41 @@
 return 0;
 }
 
-int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
- MpegEncContext * const s = &h->s;
+int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count)
+{
 int i, av_uninit(j);
- int current_ref_assigned=0, err=0;
+ int current_ref_assigned = 0, err = 0;
 Picture *av_uninit(pic);
 
- if((s->avctx->debug&FF_DEBUG_MMCO) && mmco_count==0)
- av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n");
+ if ((h->avctx->debug & FF_DEBUG_MMCO) && mmco_count == 0)
+ av_log(h->avctx, AV_LOG_DEBUG, "no mmco here\n");
 
- for(i=0; i<mmco_count; i++){
+ for (i = 0; i < mmco_count; i++) {
 int av_uninit(structure), av_uninit(frame_num);
- if(s->avctx->debug&FF_DEBUG_MMCO)
- av_log(h->s.avctx, AV_LOG_DEBUG, "mmco:%d %d %d\n", h->mmco[i].opcode, h->mmco[i].short_pic_num, h->mmco[i].long_arg);
+ if (h->avctx->debug & FF_DEBUG_MMCO)
+ av_log(h->avctx, AV_LOG_DEBUG, "mmco:%d %d %d\n", h->mmco[i].opcode,
+ h->mmco[i].short_pic_num, h->mmco[i].long_arg);
 
- if( mmco[i].opcode == MMCO_SHORT2UNUSED
- || mmco[i].opcode == MMCO_SHORT2LONG){
+ if (mmco[i].opcode == MMCO_SHORT2UNUSED ||
+ mmco[i].opcode == MMCO_SHORT2LONG) {
 frame_num = pic_num_extract(h, mmco[i].short_pic_num, &structure);
- pic = find_short(h, frame_num, &j);
- if(!pic){
- if(mmco[i].opcode != MMCO_SHORT2LONG || !h->long_ref[mmco[i].long_arg]
- || h->long_ref[mmco[i].long_arg]->frame_num != frame_num) {
- av_log(h->s.avctx, AV_LOG_ERROR, "mmco: unref short failure\n");
+ pic = find_short(h, frame_num, &j);
+ if (!pic) {
+ if (mmco[i].opcode != MMCO_SHORT2LONG ||
+ !h->long_ref[mmco[i].long_arg] ||
+ h->long_ref[mmco[i].long_arg]->frame_num != frame_num) {
+ av_log(h->avctx, AV_LOG_ERROR, "mmco: unref short failure\n");
 err = AVERROR_INVALIDDATA;
 }
 continue;
 }
 }
 
- switch(mmco[i].opcode){
+ switch (mmco[i].opcode) {
 case MMCO_SHORT2UNUSED:
- if(s->avctx->debug&FF_DEBUG_MMCO)
- av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: unref short %d count %d\n", h->mmco[i].short_pic_num, h->short_ref_count);
+ if (h->avctx->debug & FF_DEBUG_MMCO)
+ av_log(h->avctx, AV_LOG_DEBUG, "mmco: unref short %d count %d\n",
+ h->mmco[i].short_pic_num, h->short_ref_count);
 remove_short(h, frame_num, structure ^ PICT_FRAME);
 break;
 case MMCO_SHORT2LONG:
@@ -563,19 +607,19 @@
 remove_long(h, mmco[i].long_arg, 0);
 
 remove_short_at_index(h, j);
- h->long_ref[ mmco[i].long_arg ]= pic;
- if (h->long_ref[ mmco[i].long_arg ]){
- h->long_ref[ mmco[i].long_arg ]->long_ref=1;
+ h->long_ref[ mmco[i].long_arg ] = pic;
+ if (h->long_ref[mmco[i].long_arg]) {
+ h->long_ref[mmco[i].long_arg]->long_ref = 1;
 h->long_ref_count++;
 }
 break;
 case MMCO_LONG2UNUSED:
- j = pic_num_extract(h, mmco[i].long_arg, &structure);
+ j = pic_num_extract(h, mmco[i].long_arg, &structure);
 pic = h->long_ref[j];
 if (pic) {
 remove_long(h, j, structure ^ PICT_FRAME);
- } else if(s->avctx->debug&FF_DEBUG_MMCO)
- av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: unref long failure\n");
+ } else if (h->avctx->debug & FF_DEBUG_MMCO)
+ av_log(h->avctx, AV_LOG_DEBUG, "mmco: unref long failure\n");
 break;
 case MMCO_LONG:
 // Comment below left from previous code as it is an interresting note.
@@ -585,36 +629,37 @@
 * Report the problem and keep the pair where it is,
 * and mark this field valid.
 */
+ if (h->short_ref[0] == h->cur_pic_ptr)
+ remove_short_at_index(h, 0);
 
- if (h->long_ref[mmco[i].long_arg] != s->current_picture_ptr) {
+ if (h->long_ref[mmco[i].long_arg] != h->cur_pic_ptr) {
 remove_long(h, mmco[i].long_arg, 0);
 
- h->long_ref[ mmco[i].long_arg ]= s->current_picture_ptr;
- h->long_ref[ mmco[i].long_arg ]->long_ref=1;
+ h->long_ref[mmco[i].long_arg] = h->cur_pic_ptr;
+ h->long_ref[mmco[i].long_arg]->long_ref = 1;
 h->long_ref_count++;
 }
 
- s->current_picture_ptr->f.reference |= s->picture_structure;
- current_ref_assigned=1;
+ h->cur_pic_ptr->reference |= h->picture_structure;
+ current_ref_assigned = 1;
 break;
 case MMCO_SET_MAX_LONG:
 assert(mmco[i].long_arg <= 16);
 // just remove the long term which index is greater than new max
- for(j = mmco[i].long_arg; j<16; j++){
+ for (j = mmco[i].long_arg; j < 16; j++) {
 remove_long(h, j, 0);
 }
 break;
 case MMCO_RESET:
- while(h->short_ref_count){
+ while (h->short_ref_count) {
 remove_short(h, h->short_ref[0]->frame_num, 0);
 }
- for(j = 0; j < 16; j++) {
+ for (j = 0; j < 16; j++) {
 remove_long(h, j, 0);
 }
- h->frame_num=
- s->current_picture_ptr->frame_num= 0;
+ h->frame_num = h->cur_pic_ptr->frame_num = 0;
 h->mmco_reset = 1;
- s->current_picture_ptr->mmco_reset=1;
+ h->cur_pic_ptr->mmco_reset = 1;
 break;
 default: assert(0);
 }
@@ -627,39 +672,40 @@
 * in long_ref; trying to put it on the short list here is an
 * error in the encoded bit stream (ref: 7.4.3.3, NOTE 2 and 3).
 */
- if (h->short_ref_count && h->short_ref[0] == s->current_picture_ptr) {
+ if (h->short_ref_count && h->short_ref[0] == h->cur_pic_ptr) {
 /* Just mark the second field valid */
- s->current_picture_ptr->f.reference = PICT_FRAME;
- } else if (s->current_picture_ptr->long_ref) {
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term reference "
- "assignment for second field "
- "in complementary field pair "
- "(first field is long term)\n");
+ h->cur_pic_ptr->reference = PICT_FRAME;
+ } else if (h->cur_pic_ptr->long_ref) {
+ av_log(h->avctx, AV_LOG_ERROR, "illegal short term reference "
+ "assignment for second field "
+ "in complementary field pair "
+ "(first field is long term)\n");
 err = AVERROR_INVALIDDATA;
 } else {
- pic= remove_short(h, s->current_picture_ptr->frame_num, 0);
- if(pic){
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n");
+ pic = remove_short(h, h->cur_pic_ptr->frame_num, 0);
+ if (pic) {
+ av_log(h->avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n");
 err = AVERROR_INVALIDDATA;
 }
 
- if(h->short_ref_count)
- memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*));
+ if (h->short_ref_count)
+ memmove(&h->short_ref[1], &h->short_ref[0],
+ h->short_ref_count * sizeof(Picture*));
 
- h->short_ref[0]= s->current_picture_ptr;
+ h->short_ref[0] = h->cur_pic_ptr;
 h->short_ref_count++;
- s->current_picture_ptr->f.reference |= s->picture_structure;
+ h->cur_pic_ptr->reference |= h->picture_structure;
 }
 }
 
 if (h->long_ref_count + h->short_ref_count -
- (h->short_ref[0] == s->current_picture_ptr) > h->sps.ref_frame_count){
+ (h->short_ref[0] == h->cur_pic_ptr) > h->sps.ref_frame_count) {
 
 /* We have too many reference frames, probably due to corrupted
 * stream. Need to discard one frame. Prevents overrun of the
 * short_ref and long_ref buffers.
 */
- av_log(h->s.avctx, AV_LOG_ERROR,
+ av_log(h->avctx, AV_LOG_ERROR,
 "number of reference frames (%d+%d) exceeds max (%d; probably "
 "corrupt input), discarding one\n",
 h->long_ref_count, h->short_ref_count, h->sps.ref_frame_count);
@@ -680,23 +726,22 @@
 
 print_short_term(h);
 print_long_term(h);
- return (h->s.avctx->err_recognition & AV_EF_EXPLODE) ? err : 0;
+ return (h->avctx->err_recognition & AV_EF_EXPLODE) ? err : 0;
 }
 
 int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb,
 int first_slice)
 {
- MpegEncContext * const s = &h->s;
 int i, ret;
 MMCO mmco_temp[MAX_MMCO_COUNT], *mmco = first_slice ? h->mmco : mmco_temp;
 int mmco_index = 0;
 
- if (h->nal_unit_type == NAL_IDR_SLICE){ // FIXME fields
- s->broken_link = get_bits1(gb) - 1;
- if (get_bits1(gb)){
- mmco[0].opcode = MMCO_LONG;
+ if (h->nal_unit_type == NAL_IDR_SLICE) { // FIXME fields
+ skip_bits1(gb); // broken_link
+ if (get_bits1(gb)) {
+ mmco[0].opcode = MMCO_LONG;
 mmco[0].long_arg = 0;
- mmco_index = 1;
+ mmco_index = 1;
 }
 } else {
 if (get_bits1(gb)) { // adaptive_ref_pic_marking_mode_flag
@@ -704,7 +749,7 @@
 MMCOOpcode opcode = get_ue_golomb_31(gb);
 
 mmco[i].opcode = opcode;
- if (opcode == MMCO_SHORT2UNUSED || opcode == MMCO_SHORT2LONG){
+ if (opcode == MMCO_SHORT2UNUSED || opcode == MMCO_SHORT2LONG) {
 mmco[i].short_pic_num =
 (h->curr_pic_num - get_ue_golomb(gb) - 1) &
 (h->max_pic_num - 1);
@@ -724,8 +769,8 @@
 if (long_arg >= 32 ||
 (long_arg >= 16 && !(opcode == MMCO_SET_MAX_LONG &&
 long_arg == 16) &&
- !(opcode == MMCO_LONG2UNUSED && FIELD_PICTURE))){
- av_log(h->s.avctx, AV_LOG_ERROR,
+ !(opcode == MMCO_LONG2UNUSED && FIELD_PICTURE(h)))) {
+ av_log(h->avctx, AV_LOG_ERROR,
 "illegal long ref in memory management control "
 "operation %d\n", opcode);
 return -1;
@@ -733,8 +778,8 @@
 mmco[i].long_arg = long_arg;
 }
 
- if (opcode > (unsigned) MMCO_LONG){
- av_log(h->s.avctx, AV_LOG_ERROR,
+ if (opcode > (unsigned) MMCO_LONG) {
+ av_log(h->avctx, AV_LOG_ERROR,
 "illegal memory management control operation %d\n",
 opcode);
 return -1;
@@ -746,7 +791,7 @@
 } else {
 if (first_slice) {
 ret = ff_generate_sliding_window_mmcos(h, first_slice);
- if (ret < 0 && s->avctx->err_recognition & AV_EF_EXPLODE)
+ if (ret < 0 && h->avctx->err_recognition & AV_EF_EXPLODE)
 return ret;
 }
 mmco_index = -1;
@@ -757,10 +802,10 @@
 h->mmco_index = mmco_index;
 } else if (!first_slice && mmco_index >= 0 &&
 (mmco_index != h->mmco_index ||
- (i = check_opcodes(h->mmco, mmco_temp, mmco_index)))) {
- av_log(h->s.avctx, AV_LOG_ERROR,
- "Inconsistent MMCO state between slices [%d, %d, %d]\n",
- mmco_index, h->mmco_index, i);
+ check_opcodes(h->mmco, mmco_temp, mmco_index))) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "Inconsistent MMCO state between slices [%d, %d]\n",
+ mmco_index, h->mmco_index);
 return AVERROR_INVALIDDATA;
 }

libav-v9.6.tar.bz2/libavcodec/h264_sei.c -> libav-v10.1.tar.bz2/libavcodec/h264_sei.c Changed

@@ -25,135 +25,148 @@
 * @author Michael Niedermayer <michaelni@gmx.at>
 */
 
-#include "internal.h"
 #include "avcodec.h"
-#include "h264.h"
 #include "golomb.h"
+#include "h264.h"
+#include "internal.h"
 
-//#undef NDEBUG
-#include <assert.h>
-
-static const uint8_t sei_num_clock_ts_table[9]={
- 1, 1, 1, 2, 2, 3, 3, 2, 3
+static const uint8_t sei_num_clock_ts_table[9] = {
+ 1, 1, 1, 2, 2, 3, 3, 2, 3
 };
 
-void ff_h264_reset_sei(H264Context *h) {
+void ff_h264_reset_sei(H264Context *h)
+{
 h->sei_recovery_frame_cnt = -1;
 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){
- MpegEncContext * const s = &h->s;
- if(h->sps.nal_hrd_parameters_present_flag || h->sps.vcl_hrd_parameters_present_flag){
- h->sei_cpb_removal_delay = get_bits(&s->gb, h->sps.cpb_removal_delay_length);
- h->sei_dpb_output_delay = get_bits(&s->gb, h->sps.dpb_output_delay_length);
+static int decode_picture_timing(H264Context *h)
+{
+ if (h->sps.nal_hrd_parameters_present_flag ||
+ h->sps.vcl_hrd_parameters_present_flag) {
+ h->sei_cpb_removal_delay = get_bits(&h->gb,
+ h->sps.cpb_removal_delay_length);
+ h->sei_dpb_output_delay = get_bits(&h->gb,
+ h->sps.dpb_output_delay_length);
 }
- if(h->sps.pic_struct_present_flag){
+ if (h->sps.pic_struct_present_flag) {
 unsigned int i, num_clock_ts;
- h->sei_pic_struct = get_bits(&s->gb, 4);
+
+ h->sei_pic_struct = get_bits(&h->gb, 4);
 h->sei_ct_type = 0;
 
 if (h->sei_pic_struct > SEI_PIC_STRUCT_FRAME_TRIPLING)
- return -1;
+ return AVERROR_INVALIDDATA;
 
 num_clock_ts = sei_num_clock_ts_table[h->sei_pic_struct];
 
- for (i = 0 ; i < num_clock_ts ; i++){
- if(get_bits(&s->gb, 1)){ /* clock_timestamp_flag */
+ for (i = 0; i < num_clock_ts; i++) {
+ if (get_bits(&h->gb, 1)) { /* clock_timestamp_flag */
 unsigned int full_timestamp_flag;
- h->sei_ct_type |= 1<<get_bits(&s->gb, 2);
- skip_bits(&s->gb, 1); /* nuit_field_based_flag */
- skip_bits(&s->gb, 5); /* counting_type */
- full_timestamp_flag = get_bits(&s->gb, 1);
- skip_bits(&s->gb, 1); /* discontinuity_flag */
- skip_bits(&s->gb, 1); /* cnt_dropped_flag */
- skip_bits(&s->gb, 8); /* n_frames */
- if(full_timestamp_flag){
- skip_bits(&s->gb, 6); /* seconds_value 0..59 */
- skip_bits(&s->gb, 6); /* minutes_value 0..59 */
- skip_bits(&s->gb, 5); /* hours_value 0..23 */
- }else{
- if(get_bits(&s->gb, 1)){ /* seconds_flag */
- skip_bits(&s->gb, 6); /* seconds_value range 0..59 */
- if(get_bits(&s->gb, 1)){ /* minutes_flag */
- skip_bits(&s->gb, 6); /* minutes_value 0..59 */
- if(get_bits(&s->gb, 1)) /* hours_flag */
- skip_bits(&s->gb, 5); /* hours_value 0..23 */
+
+ h->sei_ct_type |= 1 << get_bits(&h->gb, 2);
+ skip_bits(&h->gb, 1); /* nuit_field_based_flag */
+ skip_bits(&h->gb, 5); /* counting_type */
+ full_timestamp_flag = get_bits(&h->gb, 1);
+ skip_bits(&h->gb, 1); /* discontinuity_flag */
+ skip_bits(&h->gb, 1); /* cnt_dropped_flag */
+ skip_bits(&h->gb, 8); /* n_frames */
+ if (full_timestamp_flag) {
+ skip_bits(&h->gb, 6); /* seconds_value 0..59 */
+ skip_bits(&h->gb, 6); /* minutes_value 0..59 */
+ skip_bits(&h->gb, 5); /* hours_value 0..23 */
+ } else {
+ if (get_bits(&h->gb, 1)) { /* seconds_flag */
+ skip_bits(&h->gb, 6); /* seconds_value range 0..59 */
+ if (get_bits(&h->gb, 1)) { /* minutes_flag */
+ skip_bits(&h->gb, 6); /* minutes_value 0..59 */
+ if (get_bits(&h->gb, 1)) /* hours_flag */
+ skip_bits(&h->gb, 5); /* hours_value 0..23 */
 }
 }
 }
- if(h->sps.time_offset_length > 0)
- skip_bits(&s->gb, h->sps.time_offset_length); /* time_offset */
+ if (h->sps.time_offset_length > 0)
+ skip_bits(&h->gb,
+ h->sps.time_offset_length); /* time_offset */
 }
 }
 
- if(s->avctx->debug & FF_DEBUG_PICT_INFO)
- av_log(s->avctx, AV_LOG_DEBUG, "ct_type:%X pic_struct:%d\n", h->sei_ct_type, h->sei_pic_struct);
+ if (h->avctx->debug & FF_DEBUG_PICT_INFO)
+ av_log(h->avctx, AV_LOG_DEBUG, "ct_type:%X pic_struct:%d\n",
+ h->sei_ct_type, h->sei_pic_struct);
 }
 return 0;
 }
 
-static int decode_unregistered_user_data(H264Context *h, int size){
- MpegEncContext * const s = &h->s;
- uint8_t user_data[16+256];
+static int decode_unregistered_user_data(H264Context *h, int size)
+{
+ uint8_t user_data[16 + 256];
 int e, build, i;
 
- if(size<16)
- return -1;
+ if (size < 16)
+ return AVERROR_INVALIDDATA;
 
- for(i=0; i<sizeof(user_data)-1 && i<size; i++){
- user_data[i]= get_bits(&s->gb, 8);
- }
+ for (i = 0; i < sizeof(user_data) - 1 && i < size; i++)
+ user_data[i] = get_bits(&h->gb, 8);
 
- user_data[i]= 0;
- e= sscanf(user_data+16, "x264 - core %d"/*%s - H.264/MPEG-4 AVC codec - Copyleft 2005 - http://www.videolan.org/x264.html*/, &build);
- if(e==1 && build>0)
- h->x264_build= build;
+ user_data[i] = 0;
+ e = sscanf(user_data + 16, "x264 - core %d", &build);
+ if (e == 1 && build > 0)
+ h->x264_build = build;
 
- if(s->avctx->debug & FF_DEBUG_BUGS)
- av_log(s->avctx, AV_LOG_DEBUG, "user data:\"%s\"\n", user_data+16);
+ if (h->avctx->debug & FF_DEBUG_BUGS)
+ av_log(h->avctx, AV_LOG_DEBUG, "user data:\"%s\"\n", user_data + 16);
 
- for(; i<size; i++)
- skip_bits(&s->gb, 8);
+ for (; i < size; i++)
+ skip_bits(&h->gb, 8);
 
 return 0;
 }
 
-static int decode_recovery_point(H264Context *h){
- MpegEncContext * const s = &h->s;
+static int decode_recovery_point(H264Context *h)
+{
+ h->sei_recovery_frame_cnt = get_ue_golomb(&h->gb);
 
- h->sei_recovery_frame_cnt = get_ue_golomb(&s->gb);
- skip_bits(&s->gb, 4); /* 1b exact_match_flag, 1b broken_link_flag, 2b changing_slice_group_idc */
+ /* 1b exact_match_flag,
+ * 1b broken_link_flag,
+ * 2b changing_slice_group_idc */
+ skip_bits(&h->gb, 4);
 
 return 0;
 }
 
-static int decode_buffering_period(H264Context *h){
- MpegEncContext * const s = &h->s;
+static int decode_buffering_period(H264Context *h)
+{
 unsigned int sps_id;
 int sched_sel_idx;
 SPS *sps;
 
- sps_id = get_ue_golomb_31(&s->gb);
- if(sps_id > 31 || !h->sps_buffers[sps_id]) {
- av_log(h->s.avctx, AV_LOG_ERROR, "non-existing SPS %d referenced in buffering period\n", sps_id);
- return -1;
+ sps_id = get_ue_golomb_31(&h->gb);
+ if (sps_id > 31 || !h->sps_buffers[sps_id]) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "non-existing SPS %d referenced in buffering period\n", sps_id);
+ return AVERROR_INVALIDDATA;
 }
 sps = h->sps_buffers[sps_id];
 
 // NOTE: This is really so duplicated in the standard... See H.264, D.1.1
 if (sps->nal_hrd_parameters_present_flag) {
 for (sched_sel_idx = 0; sched_sel_idx < sps->cpb_cnt; sched_sel_idx++) {
- h->initial_cpb_removal_delay[sched_sel_idx] = get_bits(&s->gb, sps->initial_cpb_removal_delay_length);
- skip_bits(&s->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset
+ h->initial_cpb_removal_delay[sched_sel_idx] =
+ get_bits(&h->gb, sps->initial_cpb_removal_delay_length);
+ // initial_cpb_removal_delay_offset
+ skip_bits(&h->gb, sps->initial_cpb_removal_delay_length);
 }
 }
 if (sps->vcl_hrd_parameters_present_flag) {
 for (sched_sel_idx = 0; sched_sel_idx < sps->cpb_cnt; sched_sel_idx++) {
- h->initial_cpb_removal_delay[sched_sel_idx] = get_bits(&s->gb, sps->initial_cpb_removal_delay_length);
- skip_bits(&s->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset
+ h->initial_cpb_removal_delay[sched_sel_idx] =
+ get_bits(&h->gb, sps->initial_cpb_removal_delay_length);
+ // initial_cpb_removal_delay_offset
+ skip_bits(&h->gb, sps->initial_cpb_removal_delay_length);
 }
 }
 
@@ -161,45 +174,85 @@
 return 0;
 }
 
-int ff_h264_decode_sei(H264Context *h){
- MpegEncContext * const s = &h->s;
+static int decode_frame_packing_arrangement(H264Context *h)
+{
+ get_ue_golomb(&h->gb); // frame_packing_arrangement_id
+ h->sei_frame_packing_present = !get_bits1(&h->gb);
+
+ if (h->sei_frame_packing_present) {
+ h->frame_packing_arrangement_type = get_bits(&h->gb, 7);
+ h->quincunx_subsampling = get_bits1(&h->gb);
+ 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
+ get_ue_golomb(&h->gb); // frame_packing_arrangement_repetition_period
+ }
+ skip_bits1(&h->gb); // frame_packing_arrangement_extension_flag
+
+ return 0;
+}
+
+int ff_h264_decode_sei(H264Context *h)
+{
+ while (get_bits_left(&h->gb) > 16) {
+ int size = 0;
+ int type = 0;
+ int ret = 0;
 
- while (get_bits_left(&s->gb) > 16) {
- int size, type;
+ do
+ type += show_bits(&h->gb, 8);
+ while (get_bits(&h->gb, 8) == 255);
 
- type=0;
- do{
- type+= show_bits(&s->gb, 8);
- }while(get_bits(&s->gb, 8) == 255);
+ do
+ size += show_bits(&h->gb, 8);
+ while (get_bits(&h->gb, 8) == 255);
 
- size=0;
- do{
- size+= show_bits(&s->gb, 8);
- }while(get_bits(&s->gb, 8) == 255);
+ if (size > get_bits_left(&h->gb) / 8) {
+ av_log(h->avctx, AV_LOG_ERROR, "SEI type %d truncated at %d\n",
+ type, get_bits_left(&h->gb));
+ return AVERROR_INVALIDDATA;
+ }
 
- switch(type){
+ switch (type) {
 case SEI_TYPE_PIC_TIMING: // Picture timing SEI
- if(decode_picture_timing(h) < 0)
- return -1;
+ ret = decode_picture_timing(h);
+ if (ret < 0)
+ return ret;
 break;
 case SEI_TYPE_USER_DATA_UNREGISTERED:
- if(decode_unregistered_user_data(h, size) < 0)
- return -1;
+ ret = decode_unregistered_user_data(h, size);
+ if (ret < 0)
+ return ret;
 break;
 case SEI_TYPE_RECOVERY_POINT:
- if(decode_recovery_point(h) < 0)
- return -1;
+ ret = decode_recovery_point(h);
+ if (ret < 0)
+ return ret;
+ break;
+ case SEI_TYPE_BUFFERING_PERIOD:
+ ret = decode_buffering_period(h);
+ if (ret < 0)
+ return ret;
 break;
- case SEI_BUFFERING_PERIOD:
- if(decode_buffering_period(h) < 0)
- return -1;
+ case SEI_TYPE_FRAME_PACKING:
+ ret = decode_frame_packing_arrangement(h);
+ if (ret < 0)
+ return ret;
 break;
 default:
- skip_bits(&s->gb, 8*size);
+ av_log(h->avctx, AV_LOG_DEBUG, "unknown SEI type %d\n", type);
+ skip_bits(&h->gb, 8 * size);
 }
 
- //FIXME check bits here
- align_get_bits(&s->gb);
+ // FIXME check bits here
+ align_get_bits(&h->gb);
 }
 
 return 0;

libav-v10.1.tar.bz2/libavcodec/h264addpx_template.c Added

@@ -0,0 +1,72 @@
+/*
+ * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder
+ * Copyright (c) 2003-2011 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * H.264 / AVC / MPEG4 part10 DSP functions.
+ * @author Michael Niedermayer <michaelni@gmx.at>
+ */
+
+#include "bit_depth_template.c"
+
+static void FUNCC(ff_h264_add_pixels4)(uint8_t *_dst, int16_t *_src, int stride)
+{
+ int i;
+ pixel *dst = (pixel *) _dst;
+ dctcoef *src = (dctcoef *) _src;
+ stride /= sizeof(pixel);
+
+ for (i = 0; i < 4; i++) {
+ dst[0] += src[0];
+ dst[1] += src[1];
+ dst[2] += src[2];
+ dst[3] += src[3];
+
+ dst += stride;
+ src += 4;
+ }
+
+ memset(_src, 0, sizeof(dctcoef) * 16);
+}
+
+static void FUNCC(ff_h264_add_pixels8)(uint8_t *_dst, int16_t *_src, int stride)
+{
+ int i;
+ pixel *dst = (pixel *) _dst;
+ dctcoef *src = (dctcoef *) _src;
+ stride /= sizeof(pixel);
+
+ for (i = 0; i < 8; i++) {
+ dst[0] += src[0];
+ dst[1] += src[1];
+ dst[2] += src[2];
+ dst[3] += src[3];
+ dst[4] += src[4];
+ dst[5] += src[5];
+ dst[6] += src[6];
+ dst[7] += src[7];
+
+ dst += stride;
+ src += 8;
+ }
+
+ memset(_src, 0, sizeof(dctcoef) * 64);
+}

libav-v10.1.tar.bz2/libavcodec/h264chroma.c Added

@@ -0,0 +1,55 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "libavutil/attributes.h"
+#include "h264chroma.h"
+
+#define BIT_DEPTH 8
+#include "h264chroma_template.c"
+#undef BIT_DEPTH
+
+#define BIT_DEPTH 16
+#include "h264chroma_template.c"
+#undef BIT_DEPTH
+
+#define SET_CHROMA(depth) \
+ c->put_h264_chroma_pixels_tab[0] = put_h264_chroma_mc8_ ## depth ## _c; \
+ c->put_h264_chroma_pixels_tab[1] = put_h264_chroma_mc4_ ## depth ## _c; \
+ c->put_h264_chroma_pixels_tab[2] = put_h264_chroma_mc2_ ## depth ## _c; \
+ c->avg_h264_chroma_pixels_tab[0] = avg_h264_chroma_mc8_ ## depth ## _c; \
+ c->avg_h264_chroma_pixels_tab[1] = avg_h264_chroma_mc4_ ## depth ## _c; \
+ c->avg_h264_chroma_pixels_tab[2] = avg_h264_chroma_mc2_ ## depth ## _c; \
+
+av_cold void ff_h264chroma_init(H264ChromaContext *c, int bit_depth)
+{
+ if (bit_depth > 8 && bit_depth <= 16) {
+ SET_CHROMA(16);
+ } else {
+ SET_CHROMA(8);
+ }
+
+ if (ARCH_AARCH64)
+ ff_h264chroma_init_aarch64(c, bit_depth);
+ if (ARCH_ARM)
+ ff_h264chroma_init_arm(c, bit_depth);
+ if (ARCH_PPC)
+ ff_h264chroma_init_ppc(c, bit_depth);
+ if (ARCH_X86)
+ ff_h264chroma_init_x86(c, bit_depth);
+}

libav-v10.1.tar.bz2/libavcodec/h264chroma.h Added

@@ -0,0 +1,38 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_H264CHROMA_H
+#define AVCODEC_H264CHROMA_H
+
+#include <stdint.h>
+
+typedef void (*h264_chroma_mc_func)(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int srcStride, int h, int x, int y);
+
+typedef struct H264ChromaContext {
+ h264_chroma_mc_func put_h264_chroma_pixels_tab[3];
+ h264_chroma_mc_func avg_h264_chroma_pixels_tab[3];
+} H264ChromaContext;
+
+void ff_h264chroma_init(H264ChromaContext *c, int bit_depth);
+
+void ff_h264chroma_init_aarch64(H264ChromaContext *c, int bit_depth);
+void ff_h264chroma_init_arm(H264ChromaContext *c, int bit_depth);
+void ff_h264chroma_init_ppc(H264ChromaContext *c, int bit_depth);
+void ff_h264chroma_init_x86(H264ChromaContext *c, int bit_depth);
+
+#endif /* AVCODEC_H264CHROMA_H */

libav-v10.1.tar.bz2/libavcodec/h264chroma_template.c Added

@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2000, 2001 Fabrice Bellard
+ * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <assert.h>
+
+#include "bit_depth_template.c"
+
+#define H264_CHROMA_MC(OPNAME, OP)\
+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){\
+ pixel *dst = (pixel*)_dst;\
+ pixel *src = (pixel*)_src;\
+ 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;\
+ stride /= sizeof(pixel);\
+ \
+ assert(x<8 && y<8 && x>=0 && y>=0);\
+\
+ if(D){\
+ for(i=0; i<h; i++){\
+ OP(dst[0], (A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1]));\
+ OP(dst[1], (A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2]));\
+ dst+= stride;\
+ src+= stride;\
+ }\
+ } else if (B + C) {\
+ const int E= B+C;\
+ const int step= C ? stride : 1;\
+ for(i=0; i<h; i++){\
+ OP(dst[0], (A*src[0] + E*src[step+0]));\
+ OP(dst[1], (A*src[1] + E*src[step+1]));\
+ 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;\
+ }\
+ }\
+}\
+\
+static void FUNCC(OPNAME ## h264_chroma_mc4)(uint8_t *_dst/*align 8*/, uint8_t *_src/*align 1*/, int stride, int h, int x, int y){\
+ pixel *dst = (pixel*)_dst;\
+ pixel *src = (pixel*)_src;\
+ 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;\
+ stride /= sizeof(pixel);\
+ \
+ assert(x<8 && y<8 && x>=0 && y>=0);\
+\
+ if(D){\
+ for(i=0; i<h; i++){\
+ OP(dst[0], (A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1]));\
+ OP(dst[1], (A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2]));\
+ OP(dst[2], (A*src[2] + B*src[3] + C*src[stride+2] + D*src[stride+3]));\
+ OP(dst[3], (A*src[3] + B*src[4] + C*src[stride+3] + D*src[stride+4]));\
+ dst+= stride;\
+ src+= stride;\
+ }\
+ } else if (B + C) {\
+ const int E= B+C;\
+ const int step= C ? stride : 1;\
+ for(i=0; i<h; i++){\
+ OP(dst[0], (A*src[0] + E*src[step+0]));\
+ OP(dst[1], (A*src[1] + E*src[step+1]));\
+ OP(dst[2], (A*src[2] + E*src[step+2]));\
+ OP(dst[3], (A*src[3] + E*src[step+3]));\
+ 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;\
+ }\
+ }\
+}\
+\
+static void FUNCC(OPNAME ## h264_chroma_mc8)(uint8_t *_dst/*align 8*/, uint8_t *_src/*align 1*/, int stride, int h, int x, int y){\
+ pixel *dst = (pixel*)_dst;\
+ pixel *src = (pixel*)_src;\
+ 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;\
+ stride /= sizeof(pixel);\
+ \
+ assert(x<8 && y<8 && x>=0 && y>=0);\
+\
+ if(D){\
+ for(i=0; i<h; i++){\
+ OP(dst[0], (A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1]));\
+ OP(dst[1], (A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2]));\
+ OP(dst[2], (A*src[2] + B*src[3] + C*src[stride+2] + D*src[stride+3]));\
+ OP(dst[3], (A*src[3] + B*src[4] + C*src[stride+3] + D*src[stride+4]));\
+ OP(dst[4], (A*src[4] + B*src[5] + C*src[stride+4] + D*src[stride+5]));\
+ OP(dst[5], (A*src[5] + B*src[6] + C*src[stride+5] + D*src[stride+6]));\
+ OP(dst[6], (A*src[6] + B*src[7] + C*src[stride+6] + D*src[stride+7]));\
+ OP(dst[7], (A*src[7] + B*src[8] + C*src[stride+7] + D*src[stride+8]));\
+ dst+= stride;\
+ src+= stride;\
+ }\
+ } else if (B + C) {\
+ const int E= B+C;\
+ const int step= C ? stride : 1;\
+ for(i=0; i<h; i++){\
+ OP(dst[0], (A*src[0] + E*src[step+0]));\
+ OP(dst[1], (A*src[1] + E*src[step+1]));\
+ OP(dst[2], (A*src[2] + E*src[step+2]));\
+ OP(dst[3], (A*src[3] + E*src[step+3]));\
+ OP(dst[4], (A*src[4] + E*src[step+4]));\
+ OP(dst[5], (A*src[5] + E*src[step+5]));\
+ OP(dst[6], (A*src[6] + E*src[step+6]));\
+ OP(dst[7], (A*src[7] + E*src[step+7]));\
+ 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;\
+ }\
+ }\
+}
+
+#define op_avg(a, b) a = (((a)+(((b) + 32)>>6)+1)>>1)
+#define op_put(a, b) a = (((b) + 32)>>6)
+
+H264_CHROMA_MC(put_ , op_put)
+H264_CHROMA_MC(avg_ , op_avg)
+#undef op_avg
+#undef op_put

libav-v9.6.tar.bz2/libavcodec/h264data.h -> libav-v10.1.tar.bz2/libavcodec/h264data.h Changed

@@ -59,27 +59,6 @@
     3 + 1 * 4, 3 + 2 * 4, 2 + 3 * 4, 3 + 3 * 4,
 };
 
-static const uint8_t field_scan[16] = {
-    0 + 0 * 4, 0 + 1 * 4, 1 + 0 * 4, 0 + 2 * 4,
-    0 + 3 * 4, 1 + 1 * 4, 1 + 2 * 4, 1 + 3 * 4,
-    2 + 0 * 4, 2 + 1 * 4, 2 + 2 * 4, 2 + 3 * 4,
-    3 + 0 * 4, 3 + 1 * 4, 3 + 2 * 4, 3 + 3 * 4,
-};
-
-static const uint8_t luma_dc_zigzag_scan[16] = {
-    0 * 16 + 0 * 64, 1 * 16 + 0 * 64, 2 * 16 + 0 * 64, 0 * 16 + 2 * 64,
-    3 * 16 + 0 * 64, 0 * 16 + 1 * 64, 1 * 16 + 1 * 64, 2 * 16 + 1 * 64,
-    1 * 16 + 2 * 64, 2 * 16 + 2 * 64, 3 * 16 + 2 * 64, 0 * 16 + 3 * 64,
-    3 * 16 + 1 * 64, 1 * 16 + 3 * 64, 2 * 16 + 3 * 64, 3 * 16 + 3 * 64,
-};
-
-static const uint8_t luma_dc_field_scan[16] = {
-    0 * 16 + 0 * 64, 2 * 16 + 0 * 64, 1 * 16 + 0 * 64, 0 * 16 + 2 * 64,
-    2 * 16 + 2 * 64, 3 * 16 + 0 * 64, 1 * 16 + 2 * 64, 3 * 16 + 2 * 64,
-    0 * 16 + 1 * 64, 2 * 16 + 1 * 64, 0 * 16 + 3 * 64, 2 * 16 + 3 * 64,
-    1 * 16 + 1 * 64, 3 * 16 + 1 * 64, 1 * 16 + 3 * 64, 3 * 16 + 3 * 64,
-};
-
 static const uint8_t chroma_dc_scan[4] = {
     (0 + 0 * 2) * 16, (1 + 0 * 2) * 16,
     (0 + 1 * 2) * 16, (1 + 1 * 2) * 16,
@@ -92,64 +71,6 @@
     (1 + 2 * 2) * 16, (1 + 3 * 2) * 16,
 };
 
-// zigzag_scan8x8_cavlc[i] = zigzag_scan8x8[(i/4) + 16*(i%4)]
-static const uint8_t zigzag_scan8x8_cavlc[64] = {
-    0 + 0 * 8, 1 + 1 * 8, 1 + 2 * 8, 2 + 2 * 8,
-    4 + 1 * 8, 0 + 5 * 8, 3 + 3 * 8, 7 + 0 * 8,
-    3 + 4 * 8, 1 + 7 * 8, 5 + 3 * 8, 6 + 3 * 8,
-    2 + 7 * 8, 6 + 4 * 8, 5 + 6 * 8, 7 + 5 * 8,
-    1 + 0 * 8, 2 + 0 * 8, 0 + 3 * 8, 3 + 1 * 8,
-    3 + 2 * 8, 0 + 6 * 8, 4 + 2 * 8, 6 + 1 * 8,
-    2 + 5 * 8, 2 + 6 * 8, 6 + 2 * 8, 5 + 4 * 8,
-    3 + 7 * 8, 7 + 3 * 8, 4 + 7 * 8, 7 + 6 * 8,
-    0 + 1 * 8, 3 + 0 * 8, 0 + 4 * 8, 4 + 0 * 8,
-    2 + 3 * 8, 1 + 5 * 8, 5 + 1 * 8, 5 + 2 * 8,
-    1 + 6 * 8, 3 + 5 * 8, 7 + 1 * 8, 4 + 5 * 8,
-    4 + 6 * 8, 7 + 4 * 8, 5 + 7 * 8, 6 + 7 * 8,
-    0 + 2 * 8, 2 + 1 * 8, 1 + 3 * 8, 5 + 0 * 8,
-    1 + 4 * 8, 2 + 4 * 8, 6 + 0 * 8, 4 + 3 * 8,
-    0 + 7 * 8, 4 + 4 * 8, 7 + 2 * 8, 3 + 6 * 8,
-    5 + 5 * 8, 6 + 5 * 8, 6 + 6 * 8, 7 + 7 * 8,
-};
-
-static const uint8_t field_scan8x8[64] = {
-    0 + 0 * 8, 0 + 1 * 8, 0 + 2 * 8, 1 + 0 * 8,
-    1 + 1 * 8, 0 + 3 * 8, 0 + 4 * 8, 1 + 2 * 8,
-    2 + 0 * 8, 1 + 3 * 8, 0 + 5 * 8, 0 + 6 * 8,
-    0 + 7 * 8, 1 + 4 * 8, 2 + 1 * 8, 3 + 0 * 8,
-    2 + 2 * 8, 1 + 5 * 8, 1 + 6 * 8, 1 + 7 * 8,
-    2 + 3 * 8, 3 + 1 * 8, 4 + 0 * 8, 3 + 2 * 8,
-    2 + 4 * 8, 2 + 5 * 8, 2 + 6 * 8, 2 + 7 * 8,
-    3 + 3 * 8, 4 + 1 * 8, 5 + 0 * 8, 4 + 2 * 8,
-    3 + 4 * 8, 3 + 5 * 8, 3 + 6 * 8, 3 + 7 * 8,
-    4 + 3 * 8, 5 + 1 * 8, 6 + 0 * 8, 5 + 2 * 8,
-    4 + 4 * 8, 4 + 5 * 8, 4 + 6 * 8, 4 + 7 * 8,
-    5 + 3 * 8, 6 + 1 * 8, 6 + 2 * 8, 5 + 4 * 8,
-    5 + 5 * 8, 5 + 6 * 8, 5 + 7 * 8, 6 + 3 * 8,
-    7 + 0 * 8, 7 + 1 * 8, 6 + 4 * 8, 6 + 5 * 8,
-    6 + 6 * 8, 6 + 7 * 8, 7 + 2 * 8, 7 + 3 * 8,
-    7 + 4 * 8, 7 + 5 * 8, 7 + 6 * 8, 7 + 7 * 8,
-};
-
-static const uint8_t field_scan8x8_cavlc[64] = {
-    0 + 0 * 8, 1 + 1 * 8, 2 + 0 * 8, 0 + 7 * 8,
-    2 + 2 * 8, 2 + 3 * 8, 2 + 4 * 8, 3 + 3 * 8,
-    3 + 4 * 8, 4 + 3 * 8, 4 + 4 * 8, 5 + 3 * 8,
-    5 + 5 * 8, 7 + 0 * 8, 6 + 6 * 8, 7 + 4 * 8,
-    0 + 1 * 8, 0 + 3 * 8, 1 + 3 * 8, 1 + 4 * 8,
-    1 + 5 * 8, 3 + 1 * 8, 2 + 5 * 8, 4 + 1 * 8,
-    3 + 5 * 8, 5 + 1 * 8, 4 + 5 * 8, 6 + 1 * 8,
-    5 + 6 * 8, 7 + 1 * 8, 6 + 7 * 8, 7 + 5 * 8,
-    0 + 2 * 8, 0 + 4 * 8, 0 + 5 * 8, 2 + 1 * 8,
-    1 + 6 * 8, 4 + 0 * 8, 2 + 6 * 8, 5 + 0 * 8,
-    3 + 6 * 8, 6 + 0 * 8, 4 + 6 * 8, 6 + 2 * 8,
-    5 + 7 * 8, 6 + 4 * 8, 7 + 2 * 8, 7 + 6 * 8,
-    1 + 0 * 8, 1 + 2 * 8, 0 + 6 * 8, 3 + 0 * 8,
-    1 + 7 * 8, 3 + 2 * 8, 2 + 7 * 8, 4 + 2 * 8,
-    3 + 7 * 8, 5 + 2 * 8, 4 + 7 * 8, 5 + 4 * 8,
-    6 + 3 * 8, 6 + 5 * 8, 7 + 3 * 8, 7 + 7 * 8,
-};
-
 typedef struct IMbInfo {
     uint16_t type;
     uint8_t pred_mode;
@@ -247,26 +168,4 @@
     { MB_TYPE_8x8   | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 4, },
 };
 
-static const uint8_t dequant4_coeff_init[6][3] = {
-    { 10, 13, 16 },
-    { 11, 14, 18 },
-    { 13, 16, 20 },
-    { 14, 18, 23 },
-    { 16, 20, 25 },
-    { 18, 23, 29 },
-};
-
-static const uint8_t dequant8_coeff_init_scan[16] = {
-    0, 3, 4, 3, 3, 1, 5, 1, 4, 5, 2, 5, 3, 1, 5, 1
-};
-
-static const uint8_t dequant8_coeff_init[6][6] = {
-    { 20, 18, 32, 19, 25, 24 },
-    { 22, 19, 35, 21, 28, 26 },
-    { 26, 23, 42, 24, 33, 31 },
-    { 28, 25, 45, 26, 35, 33 },
-    { 32, 28, 51, 30, 40, 38 },
-    { 36, 32, 58, 34, 46, 43 },
-};
-
 #endif /* AVCODEC_H264DATA_H */

libav-v9.6.tar.bz2/libavcodec/h264dsp.c -> libav-v10.1.tar.bz2/libavcodec/h264dsp.c Changed

@@ -26,8 +26,11 @@
 */
 
 #include <stdint.h>
+
+#include "libavutil/attributes.h"
 #include "avcodec.h"
 #include "h264dsp.h"
+#include "h264idct.h"
 #include "libavutil/common.h"
 
 #define BIT_DEPTH 8
@@ -42,11 +45,58 @@
 #include "h264dsp_template.c"
 #undef BIT_DEPTH
 
-void ff_h264dsp_init(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
+#define BIT_DEPTH 8
+#include "h264addpx_template.c"
+#undef BIT_DEPTH
+
+#define BIT_DEPTH 16
+#include "h264addpx_template.c"
+#undef BIT_DEPTH
+
+static int h264_find_start_code_candidate_c(const uint8_t *buf, int size)
+{
+ int i = 0;
+#if HAVE_FAST_UNALIGNED
+ /* we check i < size instead of i + 3 / 7 because it is
+ * simpler and there must be FF_INPUT_BUFFER_PADDING_SIZE
+ * bytes at the end.
+ */
+#if HAVE_FAST_64BIT
+ while (i < size &&
+ !((~*(const uint64_t *)(buf + i) &
+ (*(const uint64_t *)(buf + i) - 0x0101010101010101ULL)) &
+ 0x8080808080808080ULL))
+ i += 8;
+#else
+ while (i < size &&
+ !((~*(const uint32_t *)(buf + i) &
+ (*(const uint32_t *)(buf + i) - 0x01010101U)) &
+ 0x80808080U))
+ i += 4;
+#endif
+#endif
+ for (; i < size; i++)
+ if (!buf[i])
+ break;
+ return i;
+}
+
+av_cold void ff_h264dsp_init(H264DSPContext *c, const int bit_depth,
+ const int chroma_format_idc)
 {
 #undef FUNC
 #define FUNC(a, depth) a ## _ ## depth ## _c
 
+#define ADDPX_DSP(depth) \
+ c->h264_add_pixels4_clear = FUNC(ff_h264_add_pixels4, depth);\
+ c->h264_add_pixels8_clear = FUNC(ff_h264_add_pixels8, depth)
+
+ if (bit_depth > 8 && bit_depth <= 16) {
+ ADDPX_DSP(16);
+ } else {
+ ADDPX_DSP(8);
+ }
+
 #define H264_DSP(depth) \
 c->h264_idct_add= FUNC(ff_h264_idct_add, depth);\
 c->h264_idct8_add= FUNC(ff_h264_idct8_add, depth);\
@@ -54,13 +104,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);\
@@ -81,20 +131,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);\
@@ -111,8 +161,10 @@
 H264_DSP(8);
 break;
 }
+ 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 (HAVE_ALTIVEC) ff_h264dsp_init_ppc(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);
 }

libav-v9.6.tar.bz2/libavcodec/h264dsp.h -> libav-v10.1.tar.bz2/libavcodec/h264dsp.h Changed

@@ -29,8 +29,6 @@
 
 #include <stdint.h>
 
-#include "dsputil.h"
-
 typedef void (*h264_weight_func)(uint8_t *block, int stride, int height,
 int log2_denom, int weight, int offset);
 typedef void (*h264_biweight_func)(uint8_t *dst, uint8_t *src,
@@ -80,33 +78,48 @@
 
 /* IDCT */
 void (*h264_idct_add)(uint8_t *dst /*align 4*/,
- DCTELEM *block /*align 16*/, int stride);
+ int16_t *block /*align 16*/, int stride);
 void (*h264_idct8_add)(uint8_t *dst /*align 8*/,
- DCTELEM *block /*align 16*/, int stride);
+ int16_t *block /*align 16*/, int stride);
 void (*h264_idct_dc_add)(uint8_t *dst /*align 4*/,
- DCTELEM *block /*align 16*/, int stride);
+ int16_t *block /*align 16*/, int stride);
 void (*h264_idct8_dc_add)(uint8_t *dst /*align 8*/,
- DCTELEM *block /*align 16*/, int stride);
+ int16_t *block /*align 16*/, int stride);
 
 void (*h264_idct_add16)(uint8_t *dst /*align 16*/, const int *blockoffset,
- DCTELEM *block /*align 16*/, int stride,
+ int16_t *block /*align 16*/, int stride,
 const uint8_t nnzc[15 * 8]);
 void (*h264_idct8_add4)(uint8_t *dst /*align 16*/, const int *blockoffset,
- DCTELEM *block /*align 16*/, int stride,
+ int16_t *block /*align 16*/, int stride,
 const uint8_t nnzc[15 * 8]);
 void (*h264_idct_add8)(uint8_t **dst /*align 16*/, const int *blockoffset,
- DCTELEM *block /*align 16*/, int stride,
+ int16_t *block /*align 16*/, int stride,
 const uint8_t nnzc[15 * 8]);
 void (*h264_idct_add16intra)(uint8_t *dst /*align 16*/, const int *blockoffset,
- DCTELEM *block /*align 16*/,
+ int16_t *block /*align 16*/,
 int stride, const uint8_t nnzc[15 * 8]);
- void (*h264_luma_dc_dequant_idct)(DCTELEM *output,
- DCTELEM *input /*align 16*/, int qmul);
- void (*h264_chroma_dc_dequant_idct)(DCTELEM *block, int qmul);
+ void (*h264_luma_dc_dequant_idct)(int16_t *output,
+ int16_t *input /*align 16*/, int qmul);
+ void (*h264_chroma_dc_dequant_idct)(int16_t *block, int qmul);
+
+ /* bypass-transform */
+ void (*h264_add_pixels8_clear)(uint8_t *dst, int16_t *block, int stride);
+ void (*h264_add_pixels4_clear)(uint8_t *dst, int16_t *block, int stride);
+
+ /**
+ * Search buf from the start for up to size bytes. Return the index
+ * of a zero byte, or >= size if not found. Ideally, use lookahead
+ * to filter out any zero bytes that are known to not be followed by
+ * one or more further zero bytes and a one byte. Better still, filter
+ * out any bytes that form the trailing_zero_8bits syntax element too.
+ */
+ int (*h264_find_start_code_candidate)(const uint8_t *buf, int size);
 } H264DSPContext;
 
 void ff_h264dsp_init(H264DSPContext *c, const int bit_depth,
 const int chroma_format_idc);
+void ff_h264dsp_init_aarch64(H264DSPContext *c, const int bit_depth,
+ const int chroma_format_idc);
 void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth,
 const int chroma_format_idc);
 void ff_h264dsp_init_ppc(H264DSPContext *c, const int bit_depth,

libav-v9.6.tar.bz2/libavcodec/h264idct.c -> libav-v10.1.tar.bz2/libavcodec/h264idct.c Changed

libav-v10.1.tar.bz2/libavcodec/h264idct.h Added

@@ -0,0 +1,42 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_H264IDCT_H
+#define AVCODEC_H264IDCT_H
+
+#include <stdint.h>
+
+#define H264_IDCT(depth) \
+void ff_h264_idct8_add_ ## depth ## _c(uint8_t *dst, int16_t *block, int stride);\
+void ff_h264_idct_add_ ## depth ## _c(uint8_t *dst, int16_t *block, int stride);\
+void ff_h264_idct8_dc_add_ ## depth ## _c(uint8_t *dst, int16_t *block, int stride);\
+void ff_h264_idct_dc_add_ ## depth ## _c(uint8_t *dst, int16_t *block, int stride);\
+void ff_h264_idct_add16_ ## depth ## _c(uint8_t *dst, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[6*8]);\
+void ff_h264_idct_add16intra_ ## depth ## _c(uint8_t *dst, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[6*8]);\
+void ff_h264_idct8_add4_ ## depth ## _c(uint8_t *dst, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[6*8]);\
+void ff_h264_idct_add8_422_ ## depth ## _c(uint8_t **dest, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[6*8]);\
+void ff_h264_idct_add8_ ## depth ## _c(uint8_t **dest, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[6*8]);\
+void ff_h264_luma_dc_dequant_idct_ ## depth ## _c(int16_t *output, int16_t *input, int qmul);\
+void ff_h264_chroma422_dc_dequant_idct_ ## depth ## _c(int16_t *block, int qmul);\
+void ff_h264_chroma_dc_dequant_idct_ ## depth ## _c(int16_t *block, int qmul);
+
+H264_IDCT( 8)
+H264_IDCT( 9)
+H264_IDCT(10)
+
+#endif /* AVCODEC_H264IDCT_H */

libav-v9.6.tar.bz2/libavcodec/h264idct_template.c -> libav-v10.1.tar.bz2/libavcodec/h264idct_template.c Changed

@@ -27,27 +27,9 @@
 
 #include "bit_depth_template.c"
 #include "libavutil/common.h"
+#include "h264.h"
 
-#ifndef AVCODEC_H264IDCT_INTERNAL_H
-#define AVCODEC_H264IDCT_INTERNAL_H
-//FIXME this table is a duplicate from h264data.h, and will be removed once the tables from, h264 have been split
-static const uint8_t scan8[16*3]={
- 4+ 1*8, 5+ 1*8, 4+ 2*8, 5+ 2*8,
- 6+ 1*8, 7+ 1*8, 6+ 2*8, 7+ 2*8,
- 4+ 3*8, 5+ 3*8, 4+ 4*8, 5+ 4*8,
- 6+ 3*8, 7+ 3*8, 6+ 4*8, 7+ 4*8,
- 4+ 6*8, 5+ 6*8, 4+ 7*8, 5+ 7*8,
- 6+ 6*8, 7+ 6*8, 6+ 7*8, 7+ 7*8,
- 4+ 8*8, 5+ 8*8, 4+ 9*8, 5+ 9*8,
- 6+ 8*8, 7+ 8*8, 6+ 9*8, 7+ 9*8,
- 4+11*8, 5+11*8, 4+12*8, 5+12*8,
- 6+11*8, 7+11*8, 6+12*8, 7+12*8,
- 4+13*8, 5+13*8, 4+14*8, 5+14*8,
- 6+13*8, 7+13*8, 6+14*8, 7+14*8
-};
-#endif
-
-void FUNCC(ff_h264_idct_add)(uint8_t *_dst, DCTELEM *_block, int stride)
+void FUNCC(ff_h264_idct_add)(uint8_t *_dst, int16_t *_block, int stride)
 {
 int i;
 pixel *dst = (pixel*)_dst;
@@ -79,9 +61,11 @@
 dst[i + 2*stride]= av_clip_pixel(dst[i + 2*stride] + ((z1 - z2) >> 6));
 dst[i + 3*stride]= av_clip_pixel(dst[i + 3*stride] + ((z0 - z3) >> 6));
 }
+
+ memset(block, 0, 16 * sizeof(dctcoef));
 }
 
-void FUNCC(ff_h264_idct8_add)(uint8_t *_dst, DCTELEM *_block, int stride){
+void FUNCC(ff_h264_idct8_add)(uint8_t *_dst, int16_t *_block, int stride){
 int i;
 pixel *dst = (pixel*)_dst;
 dctcoef *block = (dctcoef*)_block;
@@ -151,14 +135,18 @@
 dst[i + 6*stride] = av_clip_pixel( dst[i + 6*stride] + ((b2 - b5) >> 6) );
 dst[i + 7*stride] = av_clip_pixel( dst[i + 7*stride] + ((b0 - b7) >> 6) );
 }
+
+ memset(block, 0, 64 * sizeof(dctcoef));
 }
 
 // assumes all AC coefs are 0
-void FUNCC(ff_h264_idct_dc_add)(uint8_t *_dst, DCTELEM *block, int stride){
+void FUNCC(ff_h264_idct_dc_add)(uint8_t *_dst, int16_t *_block, int stride){
 int i, j;
- int dc = (((dctcoef*)block)[0] + 32) >> 6;
 pixel *dst = (pixel*)_dst;
+ dctcoef *block = (dctcoef*)_block;
+ int dc = (block[0] + 32) >> 6;
 stride /= sizeof(pixel);
+ block[0] = 0;
 for( j = 0; j < 4; j++ )
 {
 for( i = 0; i < 4; i++ )
@@ -167,10 +155,12 @@
 }
 }
 
-void FUNCC(ff_h264_idct8_dc_add)(uint8_t *_dst, DCTELEM *block, int stride){
+void FUNCC(ff_h264_idct8_dc_add)(uint8_t *_dst, int16_t *_block, int stride){
 int i, j;
- int dc = (((dctcoef*)block)[0] + 32) >> 6;
 pixel *dst = (pixel*)_dst;
+ dctcoef *block = (dctcoef*)_block;
+ int dc = (block[0] + 32) >> 6;
+ block[0] = 0;
 stride /= sizeof(pixel);
 for( j = 0; j < 8; j++ )
 {
@@ -180,7 +170,7 @@
 }
 }
 
-void FUNCC(ff_h264_idct_add16)(uint8_t *dst, const int *block_offset, DCTELEM *block, int stride, const uint8_t nnzc[15*8]){
+void FUNCC(ff_h264_idct_add16)(uint8_t *dst, const int *block_offset, int16_t *block, int stride, const uint8_t nnzc[15*8]){
 int i;
 for(i=0; i<16; i++){
 int nnz = nnzc[ scan8[i] ];
@@ -191,7 +181,7 @@
 }
 }
 
-void FUNCC(ff_h264_idct_add16intra)(uint8_t *dst, const int *block_offset, DCTELEM *block, int stride, const uint8_t nnzc[15*8]){
+void FUNCC(ff_h264_idct_add16intra)(uint8_t *dst, const int *block_offset, int16_t *block, int stride, const uint8_t nnzc[15*8]){
 int i;
 for(i=0; i<16; i++){
 if(nnzc[ scan8[i] ]) FUNCC(ff_h264_idct_add )(dst + block_offset[i], block + i*16*sizeof(pixel), stride);
@@ -199,7 +189,7 @@
 }
 }
 
-void FUNCC(ff_h264_idct8_add4)(uint8_t *dst, const int *block_offset, DCTELEM *block, int stride, const uint8_t nnzc[15*8]){
+void FUNCC(ff_h264_idct8_add4)(uint8_t *dst, const int *block_offset, int16_t *block, int stride, const uint8_t nnzc[15*8]){
 int i;
 for(i=0; i<16; i+=4){
 int nnz = nnzc[ scan8[i] ];
@@ -210,7 +200,7 @@
 }
 }
 
-void FUNCC(ff_h264_idct_add8)(uint8_t **dest, const int *block_offset, DCTELEM *block, int stride, const uint8_t nnzc[15*8]){
+void FUNCC(ff_h264_idct_add8)(uint8_t **dest, const int *block_offset, int16_t *block, int stride, const uint8_t nnzc[15*8]){
 int i, j;
 for(j=1; j<3; j++){
 for(i=j*16; i<j*16+4; i++){
@@ -222,7 +212,7 @@
 }
 }
 
-void FUNCC(ff_h264_idct_add8_422)(uint8_t **dest, const int *block_offset, DCTELEM *block, int stride, const uint8_t nnzc[15*8]){
+void FUNCC(ff_h264_idct_add8_422)(uint8_t **dest, const int *block_offset, int16_t *block, int stride, const uint8_t nnzc[15*8]){
 int i, j;
 
 for(j=1; j<3; j++){
@@ -248,7 +238,7 @@
 * IDCT transforms the 16 dc values and dequantizes them.
 * @param qmul quantization parameter
 */
-void FUNCC(ff_h264_luma_dc_dequant_idct)(DCTELEM *_output, DCTELEM *_input, int qmul){
+void FUNCC(ff_h264_luma_dc_dequant_idct)(int16_t *_output, int16_t *_input, int qmul){
 #define stride 16
 int i;
 int temp[16];
@@ -283,7 +273,7 @@
 #undef stride
 }
 
-void FUNCC(ff_h264_chroma422_dc_dequant_idct)(DCTELEM *_block, int qmul){
+void FUNCC(ff_h264_chroma422_dc_dequant_idct)(int16_t *_block, int qmul){
 const int stride= 16*2;
 const int xStride= 16;
 int i;
@@ -310,7 +300,7 @@
 }
 }
 
-void FUNCC(ff_h264_chroma_dc_dequant_idct)(DCTELEM *_block, int qmul){
+void FUNCC(ff_h264_chroma_dc_dequant_idct)(int16_t *_block, int qmul){
 const int stride= 16*2;
 const int xStride= 16;
 int a,b,c,d,e;

libav-v9.6.tar.bz2/libavcodec/h264pred.c -> libav-v10.1.tar.bz2/libavcodec/h264pred.c Changed

@@ -25,6 +25,8 @@
 * @author Michael Niedermayer <michaelni@gmx.at>
 */
 
+#include "libavutil/attributes.h"
+#include "dsputil.h"
 #include "h264pred.h"
 
 #define BIT_DEPTH 8
@@ -267,12 +269,12 @@
 static void pred4x4_tm_vp8_c(uint8_t *src, const uint8_t *topright,
 ptrdiff_t stride)
 {
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride];
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride];
 uint8_t *top = src-stride;
 int y;
 
 for (y = 0; y < 4; y++) {
- uint8_t *cm_in = cm + src[-1];
+ const uint8_t *cm_in = cm + src[-1];
 src[0] = cm_in[top[0]];
 src[1] = cm_in[top[1]];
 src[2] = cm_in[top[2]];
@@ -293,12 +295,12 @@
 
 static void pred16x16_tm_vp8_c(uint8_t *src, ptrdiff_t stride)
 {
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride];
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride];
 uint8_t *top = src-stride;
 int y;
 
 for (y = 0; y < 16; y++) {
- uint8_t *cm_in = cm + src[-1];
+ const uint8_t *cm_in = cm + src[-1];
 src[0] = cm_in[top[0]];
 src[1] = cm_in[top[1]];
 src[2] = cm_in[top[2]];
@@ -375,12 +377,12 @@
 
 static void pred8x8_tm_vp8_c(uint8_t *src, ptrdiff_t stride)
 {
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride];
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride];
 uint8_t *top = src-stride;
 int y;
 
 for (y = 0; y < 8; y++) {
- uint8_t *cm_in = cm + src[-1];
+ const uint8_t *cm_in = cm + src[-1];
 src[0] = cm_in[top[0]];
 src[1] = cm_in[top[1]];
 src[2] = cm_in[top[2]];
@@ -396,11 +398,10 @@
 /**
 * Set the intra prediction function pointers.
 */
-void ff_h264_pred_init(H264PredContext *h, int codec_id, const int bit_depth,
- const int chroma_format_idc)
+av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id,
+ const int bit_depth,
+ const int chroma_format_idc)
 {
-// MpegEncContext * const s = &h->s;
-
 #undef FUNC
 #undef FUNCC
 #define FUNC(a, depth) a ## _ ## depth
@@ -471,7 +472,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 {\
@@ -479,7 +480,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);\
@@ -487,7 +488,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);\
@@ -513,7 +514,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);\
@@ -547,7 +548,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 {\

libav-v9.6.tar.bz2/libavcodec/h264pred.h -> libav-v10.1.tar.bz2/libavcodec/h264pred.h Changed

@@ -28,8 +28,8 @@
 #ifndef AVCODEC_H264PRED_H
 #define AVCODEC_H264PRED_H
 
-#include "libavutil/common.h"
-#include "dsputil.h"
+#include <stddef.h>
+#include <stdint.h>
 
 /**
 * Prediction types
@@ -98,15 +98,15 @@
 void(*pred16x16[4 + 3 + 2])(uint8_t *src, ptrdiff_t stride);
 
 void(*pred4x4_add[2])(uint8_t *pix /*align 4*/,
- const DCTELEM *block /*align 16*/, ptrdiff_t stride);
+ int16_t *block /*align 16*/, ptrdiff_t stride);
 void(*pred8x8l_add[2])(uint8_t *pix /*align 8*/,
- const DCTELEM *block /*align 16*/, ptrdiff_t stride);
+ int16_t *block /*align 16*/, ptrdiff_t stride);
 void(*pred8x8_add[3])(uint8_t *pix /*align 8*/,
 const int *block_offset,
- const DCTELEM *block /*align 16*/, ptrdiff_t stride);
+ int16_t *block /*align 16*/, ptrdiff_t stride);
 void(*pred16x16_add[3])(uint8_t *pix /*align 16*/,
 const int *block_offset,
- const DCTELEM *block /*align 16*/, ptrdiff_t stride);
+ int16_t *block /*align 16*/, ptrdiff_t stride);
 } H264PredContext;
 
 void ff_h264_pred_init(H264PredContext *h, int codec_id,

libav-v9.6.tar.bz2/libavcodec/h264pred_template.c -> libav-v10.1.tar.bz2/libavcodec/h264pred_template.c Changed

@@ -1131,7 +1131,7 @@
 #undef PL
 #undef SRC
 
-static void FUNCC(pred4x4_vertical_add)(uint8_t *_pix, const DCTELEM *_block,
+static void FUNCC(pred4x4_vertical_add)(uint8_t *_pix, int16_t *_block,
 ptrdiff_t stride)
 {
 int i;
@@ -1148,9 +1148,11 @@
 pix++;
 block++;
 }
+
+ memset(_block, 0, sizeof(dctcoef) * 16);
 }
 
-static void FUNCC(pred4x4_horizontal_add)(uint8_t *_pix, const DCTELEM *_block,
+static void FUNCC(pred4x4_horizontal_add)(uint8_t *_pix, int16_t *_block,
 ptrdiff_t stride)
 {
 int i;
@@ -1166,9 +1168,11 @@
 pix+= stride;
 block+= 4;
 }
+
+ memset(_block, 0, sizeof(dctcoef) * 16);
 }
 
-static void FUNCC(pred8x8l_vertical_add)(uint8_t *_pix, const DCTELEM *_block,
+static void FUNCC(pred8x8l_vertical_add)(uint8_t *_pix, int16_t *_block,
 ptrdiff_t stride)
 {
 int i;
@@ -1189,9 +1193,11 @@
 pix++;
 block++;
 }
+
+ memset(_block, 0, sizeof(dctcoef) * 64);
 }
 
-static void FUNCC(pred8x8l_horizontal_add)(uint8_t *_pix, const DCTELEM *_block,
+static void FUNCC(pred8x8l_horizontal_add)(uint8_t *_pix, int16_t *_block,
 ptrdiff_t stride)
 {
 int i;
@@ -1211,10 +1217,12 @@
 pix+= stride;
 block+= 8;
 }
+
+ memset(_block, 0, sizeof(dctcoef) * 64);
 }
 
 static void FUNCC(pred16x16_vertical_add)(uint8_t *pix, const int *block_offset,
- const DCTELEM *block,
+ int16_t *block,
 ptrdiff_t stride)
 {
 int i;
@@ -1224,7 +1232,7 @@
 
 static void FUNCC(pred16x16_horizontal_add)(uint8_t *pix,
 const int *block_offset,
- const DCTELEM *block,
+ int16_t *block,
 ptrdiff_t stride)
 {
 int i;
@@ -1233,7 +1241,7 @@
 }
 
 static void FUNCC(pred8x8_vertical_add)(uint8_t *pix, const int *block_offset,
- const DCTELEM *block, ptrdiff_t stride)
+ int16_t *block, ptrdiff_t stride)
 {
 int i;
 for(i=0; i<4; i++)
@@ -1241,7 +1249,7 @@
 }
 
 static void FUNCC(pred8x16_vertical_add)(uint8_t *pix, const int *block_offset,
- const DCTELEM *block, ptrdiff_t stride)
+ int16_t *block, ptrdiff_t stride)
 {
 int i;
 for(i=0; i<4; i++)
@@ -1251,7 +1259,7 @@
 }
 
 static void FUNCC(pred8x8_horizontal_add)(uint8_t *pix, const int *block_offset,
- const DCTELEM *block,
+ int16_t *block,
 ptrdiff_t stride)
 {
 int i;
@@ -1261,7 +1269,7 @@
 
 static void FUNCC(pred8x16_horizontal_add)(uint8_t *pix,
 const int *block_offset,
- const DCTELEM *block, ptrdiff_t stride)
+ int16_t *block, ptrdiff_t stride)
 {
 int i;
 for(i=0; i<4; i++)

libav-v10.1.tar.bz2/libavcodec/h264qpel.c Added

@@ -0,0 +1,89 @@
+/*
+ * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder
+ * Copyright (c) 2003-2010 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/attributes.h"
+#include "h264qpel.h"
+
+#define BIT_DEPTH 8
+#include "h264qpel_template.c"
+#undef BIT_DEPTH
+
+#define BIT_DEPTH 9
+#include "h264qpel_template.c"
+#undef BIT_DEPTH
+
+#define BIT_DEPTH 10
+#include "h264qpel_template.c"
+#undef BIT_DEPTH
+
+av_cold void ff_h264qpel_init(H264QpelContext *c, int bit_depth)
+{
+#undef FUNCC
+#define FUNCC(f, depth) f ## _ ## depth ## _c
+
+#define dspfunc2(PFX, IDX, NUM, depth) \
+ c->PFX ## _pixels_tab[IDX][ 0] = FUNCC(PFX ## NUM ## _mc00, depth); \
+ c->PFX ## _pixels_tab[IDX][ 1] = FUNCC(PFX ## NUM ## _mc10, depth); \
+ c->PFX ## _pixels_tab[IDX][ 2] = FUNCC(PFX ## NUM ## _mc20, depth); \
+ c->PFX ## _pixels_tab[IDX][ 3] = FUNCC(PFX ## NUM ## _mc30, depth); \
+ c->PFX ## _pixels_tab[IDX][ 4] = FUNCC(PFX ## NUM ## _mc01, depth); \
+ c->PFX ## _pixels_tab[IDX][ 5] = FUNCC(PFX ## NUM ## _mc11, depth); \
+ c->PFX ## _pixels_tab[IDX][ 6] = FUNCC(PFX ## NUM ## _mc21, depth); \
+ c->PFX ## _pixels_tab[IDX][ 7] = FUNCC(PFX ## NUM ## _mc31, depth); \
+ c->PFX ## _pixels_tab[IDX][ 8] = FUNCC(PFX ## NUM ## _mc02, depth); \
+ c->PFX ## _pixels_tab[IDX][ 9] = FUNCC(PFX ## NUM ## _mc12, depth); \
+ c->PFX ## _pixels_tab[IDX][10] = FUNCC(PFX ## NUM ## _mc22, depth); \
+ c->PFX ## _pixels_tab[IDX][11] = FUNCC(PFX ## NUM ## _mc32, depth); \
+ c->PFX ## _pixels_tab[IDX][12] = FUNCC(PFX ## NUM ## _mc03, depth); \
+ c->PFX ## _pixels_tab[IDX][13] = FUNCC(PFX ## NUM ## _mc13, depth); \
+ c->PFX ## _pixels_tab[IDX][14] = FUNCC(PFX ## NUM ## _mc23, depth); \
+ c->PFX ## _pixels_tab[IDX][15] = FUNCC(PFX ## NUM ## _mc33, depth)
+
+#define SET_QPEL(depth) \
+ dspfunc2(put_h264_qpel, 0, 16, depth); \
+ dspfunc2(put_h264_qpel, 1, 8, depth); \
+ dspfunc2(put_h264_qpel, 2, 4, depth); \
+ dspfunc2(put_h264_qpel, 3, 2, depth); \
+ dspfunc2(avg_h264_qpel, 0, 16, depth); \
+ dspfunc2(avg_h264_qpel, 1, 8, depth); \
+ dspfunc2(avg_h264_qpel, 2, 4, depth)
+
+ switch (bit_depth) {
+ default:
+ SET_QPEL(8);
+ break;
+ case 9:
+ SET_QPEL(9);
+ break;
+ case 10:
+ SET_QPEL(10);
+ break;
+ }
+
+ if (ARCH_AARCH64)
+ ff_h264qpel_init_aarch64(c, bit_depth);
+ if (ARCH_ARM)
+ ff_h264qpel_init_arm(c, bit_depth);
+ if (ARCH_PPC)
+ ff_h264qpel_init_ppc(c, bit_depth);
+ if (ARCH_X86)
+ ff_h264qpel_init_x86(c, bit_depth);
+}

libav-v10.1.tar.bz2/libavcodec/h264qpel.h Added

@@ -0,0 +1,39 @@
+/*
+ * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder
+ * Copyright (c) 2003-2010 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_H264QPEL_H
+#define AVCODEC_H264QPEL_H
+
+#include "dsputil.h"
+
+typedef struct H264QpelContext {
+ qpel_mc_func put_h264_qpel_pixels_tab[4][16];
+ qpel_mc_func avg_h264_qpel_pixels_tab[4][16];
+} H264QpelContext;
+
+void ff_h264qpel_init(H264QpelContext *c, int bit_depth);
+
+void ff_h264qpel_init_aarch64(H264QpelContext *c, int bit_depth);
+void ff_h264qpel_init_arm(H264QpelContext *c, int bit_depth);
+void ff_h264qpel_init_ppc(H264QpelContext *c, int bit_depth);
+void ff_h264qpel_init_x86(H264QpelContext *c, int bit_depth);
+
+#endif /* AVCODEC_H264QPEL_H */

libav-v10.1.tar.bz2/libavcodec/h264qpel_template.c Added

@@ -0,0 +1,549 @@
+/*
+ * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder
+ * Copyright (c) 2003-2010 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/common.h"
+#include "bit_depth_template.c"
+#include "hpel_template.c"
+
+static inline void FUNC(copy_block2)(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
+{
+ int i;
+ for(i=0; i<h; i++)
+ {
+ AV_WN2P(dst , AV_RN2P(src ));
+ dst+=dstStride;
+ src+=srcStride;
+ }
+}
+
+static inline void FUNC(copy_block4)(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
+{
+ int i;
+ for(i=0; i<h; i++)
+ {
+ AV_WN4P(dst , AV_RN4P(src ));
+ dst+=dstStride;
+ src+=srcStride;
+ }
+}
+
+static inline void FUNC(copy_block8)(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
+{
+ int i;
+ for(i=0; i<h; i++)
+ {
+ AV_WN4P(dst , AV_RN4P(src ));
+ AV_WN4P(dst+4*sizeof(pixel), AV_RN4P(src+4*sizeof(pixel)));
+ dst+=dstStride;
+ src+=srcStride;
+ }
+}
+
+static inline void FUNC(copy_block16)(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
+{
+ int i;
+ for(i=0; i<h; i++)
+ {
+ AV_WN4P(dst , AV_RN4P(src ));
+ AV_WN4P(dst+ 4*sizeof(pixel), AV_RN4P(src+ 4*sizeof(pixel)));
+ AV_WN4P(dst+ 8*sizeof(pixel), AV_RN4P(src+ 8*sizeof(pixel)));
+ AV_WN4P(dst+12*sizeof(pixel), AV_RN4P(src+12*sizeof(pixel)));
+ dst+=dstStride;
+ src+=srcStride;
+ }
+}
+
+#define H264_LOWPASS(OPNAME, OP, OP2) \
+static av_unused void FUNC(OPNAME ## h264_qpel2_h_lowpass)(uint8_t *_dst, uint8_t *_src, int dstStride, int srcStride){\
+ const int h=2;\
+ INIT_CLIP\
+ int i;\
+ pixel *dst = (pixel*)_dst;\
+ pixel *src = (pixel*)_src;\
+ dstStride /= sizeof(pixel);\
+ srcStride /= sizeof(pixel);\
+ for(i=0; i<h; i++)\
+ {\
+ OP(dst[0], (src[0]+src[1])*20 - (src[-1]+src[2])*5 + (src[-2]+src[3]));\
+ OP(dst[1], (src[1]+src[2])*20 - (src[0 ]+src[3])*5 + (src[-1]+src[4]));\
+ dst+=dstStride;\
+ src+=srcStride;\
+ }\
+}\
+\
+static av_unused void FUNC(OPNAME ## h264_qpel2_v_lowpass)(uint8_t *_dst, uint8_t *_src, int dstStride, int srcStride){\
+ const int w=2;\
+ INIT_CLIP\
+ int i;\
+ pixel *dst = (pixel*)_dst;\
+ pixel *src = (pixel*)_src;\
+ dstStride /= sizeof(pixel);\
+ srcStride /= sizeof(pixel);\
+ for(i=0; i<w; i++)\
+ {\
+ const int srcB= src[-2*srcStride];\
+ const int srcA= src[-1*srcStride];\
+ const int src0= src[0 *srcStride];\
+ const int src1= src[1 *srcStride];\
+ const int src2= src[2 *srcStride];\
+ const int src3= src[3 *srcStride];\
+ const int src4= src[4 *srcStride];\
+ OP(dst[0*dstStride], (src0+src1)*20 - (srcA+src2)*5 + (srcB+src3));\
+ OP(dst[1*dstStride], (src1+src2)*20 - (src0+src3)*5 + (srcA+src4));\
+ dst++;\
+ src++;\
+ }\
+}\
+\
+static av_unused void FUNC(OPNAME ## h264_qpel2_hv_lowpass)(uint8_t *_dst, int16_t *tmp, uint8_t *_src, int dstStride, int tmpStride, int srcStride){\
+ const int h=2;\
+ const int w=2;\
+ const int pad = (BIT_DEPTH > 9) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\
+ INIT_CLIP\
+ int i;\
+ pixel *dst = (pixel*)_dst;\
+ pixel *src = (pixel*)_src;\
+ dstStride /= sizeof(pixel);\
+ srcStride /= sizeof(pixel);\
+ src -= 2*srcStride;\
+ for(i=0; i<h+5; i++)\
+ {\
+ tmp[0]= (src[0]+src[1])*20 - (src[-1]+src[2])*5 + (src[-2]+src[3]) + pad;\
+ tmp[1]= (src[1]+src[2])*20 - (src[0 ]+src[3])*5 + (src[-1]+src[4]) + pad;\
+ tmp+=tmpStride;\
+ src+=srcStride;\
+ }\
+ tmp -= tmpStride*(h+5-2);\
+ for(i=0; i<w; i++)\
+ {\
+ const int tmpB= tmp[-2*tmpStride] - pad;\
+ const int tmpA= tmp[-1*tmpStride] - pad;\
+ const int tmp0= tmp[0 *tmpStride] - pad;\
+ const int tmp1= tmp[1 *tmpStride] - pad;\
+ const int tmp2= tmp[2 *tmpStride] - pad;\
+ const int tmp3= tmp[3 *tmpStride] - pad;\
+ const int tmp4= tmp[4 *tmpStride] - pad;\
+ OP2(dst[0*dstStride], (tmp0+tmp1)*20 - (tmpA+tmp2)*5 + (tmpB+tmp3));\
+ OP2(dst[1*dstStride], (tmp1+tmp2)*20 - (tmp0+tmp3)*5 + (tmpA+tmp4));\
+ dst++;\
+ tmp++;\
+ }\
+}\
+static void FUNC(OPNAME ## h264_qpel4_h_lowpass)(uint8_t *_dst, uint8_t *_src, int dstStride, int srcStride){\
+ const int h=4;\
+ INIT_CLIP\
+ int i;\
+ pixel *dst = (pixel*)_dst;\
+ pixel *src = (pixel*)_src;\
+ dstStride /= sizeof(pixel);\
+ srcStride /= sizeof(pixel);\
+ for(i=0; i<h; i++)\
+ {\
+ OP(dst[0], (src[0]+src[1])*20 - (src[-1]+src[2])*5 + (src[-2]+src[3]));\
+ OP(dst[1], (src[1]+src[2])*20 - (src[0 ]+src[3])*5 + (src[-1]+src[4]));\
+ OP(dst[2], (src[2]+src[3])*20 - (src[1 ]+src[4])*5 + (src[0 ]+src[5]));\
+ OP(dst[3], (src[3]+src[4])*20 - (src[2 ]+src[5])*5 + (src[1 ]+src[6]));\
+ dst+=dstStride;\
+ src+=srcStride;\
+ }\
+}\
+\
+static void FUNC(OPNAME ## h264_qpel4_v_lowpass)(uint8_t *_dst, uint8_t *_src, int dstStride, int srcStride){\
+ const int w=4;\
+ INIT_CLIP\
+ int i;\
+ pixel *dst = (pixel*)_dst;\
+ pixel *src = (pixel*)_src;\
+ dstStride /= sizeof(pixel);\
+ srcStride /= sizeof(pixel);\
+ for(i=0; i<w; i++)\
+ {\
+ const int srcB= src[-2*srcStride];\
+ const int srcA= src[-1*srcStride];\
+ const int src0= src[0 *srcStride];\
+ const int src1= src[1 *srcStride];\
+ const int src2= src[2 *srcStride];\
+ const int src3= src[3 *srcStride];\
+ const int src4= src[4 *srcStride];\
+ const int src5= src[5 *srcStride];\
+ const int src6= src[6 *srcStride];\
+ OP(dst[0*dstStride], (src0+src1)*20 - (srcA+src2)*5 + (srcB+src3));\
+ OP(dst[1*dstStride], (src1+src2)*20 - (src0+src3)*5 + (srcA+src4));\
+ OP(dst[2*dstStride], (src2+src3)*20 - (src1+src4)*5 + (src0+src5));\
+ OP(dst[3*dstStride], (src3+src4)*20 - (src2+src5)*5 + (src1+src6));\
+ dst++;\
+ src++;\
+ }\
+}\
+\
+static void FUNC(OPNAME ## h264_qpel4_hv_lowpass)(uint8_t *_dst, int16_t *tmp, uint8_t *_src, int dstStride, int tmpStride, int srcStride){\
+ const int h=4;\
+ const int w=4;\
+ const int pad = (BIT_DEPTH > 9) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\
+ INIT_CLIP\
+ int i;\
+ pixel *dst = (pixel*)_dst;\
+ pixel *src = (pixel*)_src;\
+ dstStride /= sizeof(pixel);\
+ srcStride /= sizeof(pixel);\
+ src -= 2*srcStride;\
+ for(i=0; i<h+5; i++)\
+ {\
+ tmp[0]= (src[0]+src[1])*20 - (src[-1]+src[2])*5 + (src[-2]+src[3]) + pad;\
+ tmp[1]= (src[1]+src[2])*20 - (src[0 ]+src[3])*5 + (src[-1]+src[4]) + pad;\
+ tmp[2]= (src[2]+src[3])*20 - (src[1 ]+src[4])*5 + (src[0 ]+src[5]) + pad;\
+ tmp[3]= (src[3]+src[4])*20 - (src[2 ]+src[5])*5 + (src[1 ]+src[6]) + pad;\
+ tmp+=tmpStride;\
+ src+=srcStride;\
+ }\
+ tmp -= tmpStride*(h+5-2);\
+ for(i=0; i<w; i++)\
+ {\
+ const int tmpB= tmp[-2*tmpStride] - pad;\
+ const int tmpA= tmp[-1*tmpStride] - pad;\
+ const int tmp0= tmp[0 *tmpStride] - pad;\
+ const int tmp1= tmp[1 *tmpStride] - pad;\
+ const int tmp2= tmp[2 *tmpStride] - pad;\
+ const int tmp3= tmp[3 *tmpStride] - pad;\
+ const int tmp4= tmp[4 *tmpStride] - pad;\
+ const int tmp5= tmp[5 *tmpStride] - pad;\
+ const int tmp6= tmp[6 *tmpStride] - pad;\
+ OP2(dst[0*dstStride], (tmp0+tmp1)*20 - (tmpA+tmp2)*5 + (tmpB+tmp3));\
+ OP2(dst[1*dstStride], (tmp1+tmp2)*20 - (tmp0+tmp3)*5 + (tmpA+tmp4));\
+ OP2(dst[2*dstStride], (tmp2+tmp3)*20 - (tmp1+tmp4)*5 + (tmp0+tmp5));\
+ OP2(dst[3*dstStride], (tmp3+tmp4)*20 - (tmp2+tmp5)*5 + (tmp1+tmp6));\
+ dst++;\
+ tmp++;\
+ }\
+}\
+\
+static void FUNC(OPNAME ## h264_qpel8_h_lowpass)(uint8_t *_dst, uint8_t *_src, int dstStride, int srcStride){\
+ const int h=8;\
+ INIT_CLIP\
+ int i;\
+ pixel *dst = (pixel*)_dst;\
+ pixel *src = (pixel*)_src;\
+ dstStride /= sizeof(pixel);\
+ srcStride /= sizeof(pixel);\
+ for(i=0; i<h; i++)\
+ {\
+ OP(dst[0], (src[0]+src[1])*20 - (src[-1]+src[2])*5 + (src[-2]+src[3 ]));\
+ OP(dst[1], (src[1]+src[2])*20 - (src[0 ]+src[3])*5 + (src[-1]+src[4 ]));\
+ OP(dst[2], (src[2]+src[3])*20 - (src[1 ]+src[4])*5 + (src[0 ]+src[5 ]));\
+ OP(dst[3], (src[3]+src[4])*20 - (src[2 ]+src[5])*5 + (src[1 ]+src[6 ]));\
+ OP(dst[4], (src[4]+src[5])*20 - (src[3 ]+src[6])*5 + (src[2 ]+src[7 ]));\
+ OP(dst[5], (src[5]+src[6])*20 - (src[4 ]+src[7])*5 + (src[3 ]+src[8 ]));\
+ OP(dst[6], (src[6]+src[7])*20 - (src[5 ]+src[8])*5 + (src[4 ]+src[9 ]));\
+ OP(dst[7], (src[7]+src[8])*20 - (src[6 ]+src[9])*5 + (src[5 ]+src[10]));\
+ dst+=dstStride;\
+ src+=srcStride;\
+ }\
+}\
+\
+static void FUNC(OPNAME ## h264_qpel8_v_lowpass)(uint8_t *_dst, uint8_t *_src, int dstStride, int srcStride){\
+ const int w=8;\
+ INIT_CLIP\
+ int i;\
+ pixel *dst = (pixel*)_dst;\
+ pixel *src = (pixel*)_src;\
+ dstStride /= sizeof(pixel);\
+ srcStride /= sizeof(pixel);\
+ for(i=0; i<w; i++)\
+ {\
+ const int srcB= src[-2*srcStride];\
+ const int srcA= src[-1*srcStride];\
+ const int src0= src[0 *srcStride];\
+ const int src1= src[1 *srcStride];\
+ const int src2= src[2 *srcStride];\
+ const int src3= src[3 *srcStride];\
+ const int src4= src[4 *srcStride];\
+ const int src5= src[5 *srcStride];\
+ const int src6= src[6 *srcStride];\
+ const int src7= src[7 *srcStride];\
+ const int src8= src[8 *srcStride];\
+ const int src9= src[9 *srcStride];\
+ const int src10=src[10*srcStride];\
+ OP(dst[0*dstStride], (src0+src1)*20 - (srcA+src2)*5 + (srcB+src3));\
+ OP(dst[1*dstStride], (src1+src2)*20 - (src0+src3)*5 + (srcA+src4));\
+ OP(dst[2*dstStride], (src2+src3)*20 - (src1+src4)*5 + (src0+src5));\
+ OP(dst[3*dstStride], (src3+src4)*20 - (src2+src5)*5 + (src1+src6));\
+ OP(dst[4*dstStride], (src4+src5)*20 - (src3+src6)*5 + (src2+src7));\
+ OP(dst[5*dstStride], (src5+src6)*20 - (src4+src7)*5 + (src3+src8));\
+ OP(dst[6*dstStride], (src6+src7)*20 - (src5+src8)*5 + (src4+src9));\
+ OP(dst[7*dstStride], (src7+src8)*20 - (src6+src9)*5 + (src5+src10));\
+ dst++;\
+ src++;\
+ }\
+}\
+\
+static void FUNC(OPNAME ## h264_qpel8_hv_lowpass)(uint8_t *_dst, int16_t *tmp, uint8_t *_src, int dstStride, int tmpStride, int srcStride){\
+ const int h=8;\
+ const int w=8;\
+ const int pad = (BIT_DEPTH > 9) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\
+ INIT_CLIP\
+ int i;\
+ pixel *dst = (pixel*)_dst;\
+ pixel *src = (pixel*)_src;\
+ dstStride /= sizeof(pixel);\
+ srcStride /= sizeof(pixel);\
+ src -= 2*srcStride;\
+ for(i=0; i<h+5; i++)\
+ {\
+ tmp[0]= (src[0]+src[1])*20 - (src[-1]+src[2])*5 + (src[-2]+src[3 ]) + pad;\
+ tmp[1]= (src[1]+src[2])*20 - (src[0 ]+src[3])*5 + (src[-1]+src[4 ]) + pad;\
+ tmp[2]= (src[2]+src[3])*20 - (src[1 ]+src[4])*5 + (src[0 ]+src[5 ]) + pad;\
+ tmp[3]= (src[3]+src[4])*20 - (src[2 ]+src[5])*5 + (src[1 ]+src[6 ]) + pad;\
+ tmp[4]= (src[4]+src[5])*20 - (src[3 ]+src[6])*5 + (src[2 ]+src[7 ]) + pad;\
+ tmp[5]= (src[5]+src[6])*20 - (src[4 ]+src[7])*5 + (src[3 ]+src[8 ]) + pad;\
+ tmp[6]= (src[6]+src[7])*20 - (src[5 ]+src[8])*5 + (src[4 ]+src[9 ]) + pad;\
+ tmp[7]= (src[7]+src[8])*20 - (src[6 ]+src[9])*5 + (src[5 ]+src[10]) + pad;\
+ tmp+=tmpStride;\
+ src+=srcStride;\
+ }\
+ tmp -= tmpStride*(h+5-2);\
+ for(i=0; i<w; i++)\
+ {\
+ const int tmpB= tmp[-2*tmpStride] - pad;\
+ const int tmpA= tmp[-1*tmpStride] - pad;\
+ const int tmp0= tmp[0 *tmpStride] - pad;\
+ const int tmp1= tmp[1 *tmpStride] - pad;\
+ const int tmp2= tmp[2 *tmpStride] - pad;\
+ const int tmp3= tmp[3 *tmpStride] - pad;\
+ const int tmp4= tmp[4 *tmpStride] - pad;\
+ const int tmp5= tmp[5 *tmpStride] - pad;\
+ const int tmp6= tmp[6 *tmpStride] - pad;\
+ const int tmp7= tmp[7 *tmpStride] - pad;\
+ const int tmp8= tmp[8 *tmpStride] - pad;\
+ const int tmp9= tmp[9 *tmpStride] - pad;\
+ const int tmp10=tmp[10*tmpStride] - pad;\
+ OP2(dst[0*dstStride], (tmp0+tmp1)*20 - (tmpA+tmp2)*5 + (tmpB+tmp3));\
+ OP2(dst[1*dstStride], (tmp1+tmp2)*20 - (tmp0+tmp3)*5 + (tmpA+tmp4));\
+ OP2(dst[2*dstStride], (tmp2+tmp3)*20 - (tmp1+tmp4)*5 + (tmp0+tmp5));\
+ OP2(dst[3*dstStride], (tmp3+tmp4)*20 - (tmp2+tmp5)*5 + (tmp1+tmp6));\
+ OP2(dst[4*dstStride], (tmp4+tmp5)*20 - (tmp3+tmp6)*5 + (tmp2+tmp7));\
+ OP2(dst[5*dstStride], (tmp5+tmp6)*20 - (tmp4+tmp7)*5 + (tmp3+tmp8));\
+ OP2(dst[6*dstStride], (tmp6+tmp7)*20 - (tmp5+tmp8)*5 + (tmp4+tmp9));\
+ OP2(dst[7*dstStride], (tmp7+tmp8)*20 - (tmp6+tmp9)*5 + (tmp5+tmp10));\
+ dst++;\
+ tmp++;\
+ }\
+}\
+\
+static void FUNC(OPNAME ## h264_qpel16_v_lowpass)(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
+ FUNC(OPNAME ## h264_qpel8_v_lowpass)(dst , src , dstStride, srcStride);\
+ FUNC(OPNAME ## h264_qpel8_v_lowpass)(dst+8*sizeof(pixel), src+8*sizeof(pixel), dstStride, srcStride);\
+ src += 8*srcStride;\
+ dst += 8*dstStride;\
+ FUNC(OPNAME ## h264_qpel8_v_lowpass)(dst , src , dstStride, srcStride);\
+ FUNC(OPNAME ## h264_qpel8_v_lowpass)(dst+8*sizeof(pixel), src+8*sizeof(pixel), dstStride, srcStride);\
+}\
+\
+static void FUNC(OPNAME ## h264_qpel16_h_lowpass)(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
+ FUNC(OPNAME ## h264_qpel8_h_lowpass)(dst , src , dstStride, srcStride);\
+ FUNC(OPNAME ## h264_qpel8_h_lowpass)(dst+8*sizeof(pixel), src+8*sizeof(pixel), dstStride, srcStride);\
+ src += 8*srcStride;\
+ dst += 8*dstStride;\
+ FUNC(OPNAME ## h264_qpel8_h_lowpass)(dst , src , dstStride, srcStride);\
+ FUNC(OPNAME ## h264_qpel8_h_lowpass)(dst+8*sizeof(pixel), src+8*sizeof(pixel), dstStride, srcStride);\
+}\
+\
+static void FUNC(OPNAME ## h264_qpel16_hv_lowpass)(uint8_t *dst, int16_t *tmp, uint8_t *src, int dstStride, int tmpStride, int srcStride){\
+ FUNC(OPNAME ## h264_qpel8_hv_lowpass)(dst , tmp , src , dstStride, tmpStride, srcStride);\
+ FUNC(OPNAME ## h264_qpel8_hv_lowpass)(dst+8*sizeof(pixel), tmp+8, src+8*sizeof(pixel), dstStride, tmpStride, srcStride);\
+ src += 8*srcStride;\
+ dst += 8*dstStride;\
+ FUNC(OPNAME ## h264_qpel8_hv_lowpass)(dst , tmp , src , dstStride, tmpStride, srcStride);\
+ FUNC(OPNAME ## h264_qpel8_hv_lowpass)(dst+8*sizeof(pixel), tmp+8, src+8*sizeof(pixel), dstStride, tmpStride, srcStride);\
+}\
+
+#define H264_MC(OPNAME, SIZE) \
+static av_unused void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc00)(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ FUNCC(OPNAME ## pixels ## SIZE)(dst, src, stride, SIZE);\
+}\
+\
+static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc10)(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ uint8_t half[SIZE*SIZE*sizeof(pixel)];\
+ FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(half, src, SIZE*sizeof(pixel), stride);\
+ FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, src, half, stride, stride, SIZE*sizeof(pixel), SIZE);\
+}\
+\
+static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc20)(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ FUNC(OPNAME ## h264_qpel ## SIZE ## _h_lowpass)(dst, src, stride, stride);\
+}\
+\
+static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc30)(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ uint8_t half[SIZE*SIZE*sizeof(pixel)];\
+ FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(half, src, SIZE*sizeof(pixel), stride);\
+ FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, src+sizeof(pixel), half, stride, stride, SIZE*sizeof(pixel), SIZE);\
+}\
+\
+static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc01)(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
+ uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
+ uint8_t half[SIZE*SIZE*sizeof(pixel)];\
+ FUNC(copy_block ## SIZE )(full, src - stride*2, SIZE*sizeof(pixel), stride, SIZE + 5);\
+ FUNC(put_h264_qpel ## SIZE ## _v_lowpass)(half, full_mid, SIZE*sizeof(pixel), SIZE*sizeof(pixel));\
+ FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, full_mid, half, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
+}\
+\
+static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc02)(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
+ uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
+ FUNC(copy_block ## SIZE )(full, src - stride*2, SIZE*sizeof(pixel), stride, SIZE + 5);\
+ FUNC(OPNAME ## h264_qpel ## SIZE ## _v_lowpass)(dst, full_mid, stride, SIZE*sizeof(pixel));\
+}\
+\
+static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc03)(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
+ uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
+ uint8_t half[SIZE*SIZE*sizeof(pixel)];\
+ FUNC(copy_block ## SIZE )(full, src - stride*2, SIZE*sizeof(pixel), stride, SIZE + 5);\
+ FUNC(put_h264_qpel ## SIZE ## _v_lowpass)(half, full_mid, SIZE*sizeof(pixel), SIZE*sizeof(pixel));\
+ FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, full_mid+SIZE*sizeof(pixel), half, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
+}\
+\
+static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc11)(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
+ uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
+ uint8_t halfH[SIZE*SIZE*sizeof(pixel)];\
+ uint8_t halfV[SIZE*SIZE*sizeof(pixel)];\
+ FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(halfH, src, SIZE*sizeof(pixel), stride);\
+ FUNC(copy_block ## SIZE )(full, src - stride*2, SIZE*sizeof(pixel), stride, SIZE + 5);\
+ FUNC(put_h264_qpel ## SIZE ## _v_lowpass)(halfV, full_mid, SIZE*sizeof(pixel), SIZE*sizeof(pixel));\
+ FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
+}\
+\
+static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc31)(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
+ uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
+ uint8_t halfH[SIZE*SIZE*sizeof(pixel)];\
+ uint8_t halfV[SIZE*SIZE*sizeof(pixel)];\
+ FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(halfH, src, SIZE*sizeof(pixel), stride);\
+ FUNC(copy_block ## SIZE )(full, src - stride*2 + sizeof(pixel), SIZE*sizeof(pixel), stride, SIZE + 5);\
+ FUNC(put_h264_qpel ## SIZE ## _v_lowpass)(halfV, full_mid, SIZE*sizeof(pixel), SIZE*sizeof(pixel));\
+ FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
+}\
+\
+static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc13)(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
+ uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
+ uint8_t halfH[SIZE*SIZE*sizeof(pixel)];\
+ uint8_t halfV[SIZE*SIZE*sizeof(pixel)];\
+ FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(halfH, src + stride, SIZE*sizeof(pixel), stride);\
+ FUNC(copy_block ## SIZE )(full, src - stride*2, SIZE*sizeof(pixel), stride, SIZE + 5);\
+ FUNC(put_h264_qpel ## SIZE ## _v_lowpass)(halfV, full_mid, SIZE*sizeof(pixel), SIZE*sizeof(pixel));\
+ FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
+}\
+\
+static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc33)(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
+ uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
+ uint8_t halfH[SIZE*SIZE*sizeof(pixel)];\
+ uint8_t halfV[SIZE*SIZE*sizeof(pixel)];\
+ FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(halfH, src + stride, SIZE*sizeof(pixel), stride);\
+ FUNC(copy_block ## SIZE )(full, src - stride*2 + sizeof(pixel), SIZE*sizeof(pixel), stride, SIZE + 5);\
+ FUNC(put_h264_qpel ## SIZE ## _v_lowpass)(halfV, full_mid, SIZE*sizeof(pixel), SIZE*sizeof(pixel));\
+ FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
+}\
+\
+static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc22)(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ int16_t tmp[SIZE*(SIZE+5)*sizeof(pixel)];\
+ FUNC(OPNAME ## h264_qpel ## SIZE ## _hv_lowpass)(dst, tmp, src, stride, SIZE*sizeof(pixel), stride);\
+}\
+\
+static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc21)(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ int16_t tmp[SIZE*(SIZE+5)*sizeof(pixel)];\
+ uint8_t halfH[SIZE*SIZE*sizeof(pixel)];\
+ uint8_t halfHV[SIZE*SIZE*sizeof(pixel)];\
+ FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(halfH, src, SIZE*sizeof(pixel), stride);\
+ FUNC(put_h264_qpel ## SIZE ## _hv_lowpass)(halfHV, tmp, src, SIZE*sizeof(pixel), SIZE*sizeof(pixel), stride);\
+ FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfHV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
+}\
+\
+static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc23)(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ int16_t tmp[SIZE*(SIZE+5)*sizeof(pixel)];\
+ uint8_t halfH[SIZE*SIZE*sizeof(pixel)];\
+ uint8_t halfHV[SIZE*SIZE*sizeof(pixel)];\
+ FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(halfH, src + stride, SIZE*sizeof(pixel), stride);\
+ FUNC(put_h264_qpel ## SIZE ## _hv_lowpass)(halfHV, tmp, src, SIZE*sizeof(pixel), SIZE*sizeof(pixel), stride);\
+ FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfHV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
+}\
+\
+static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc12)(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
+ uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
+ int16_t tmp[SIZE*(SIZE+5)*sizeof(pixel)];\
+ uint8_t halfV[SIZE*SIZE*sizeof(pixel)];\
+ uint8_t halfHV[SIZE*SIZE*sizeof(pixel)];\
+ FUNC(copy_block ## SIZE )(full, src - stride*2, SIZE*sizeof(pixel), stride, SIZE + 5);\
+ FUNC(put_h264_qpel ## SIZE ## _v_lowpass)(halfV, full_mid, SIZE*sizeof(pixel), SIZE*sizeof(pixel));\
+ FUNC(put_h264_qpel ## SIZE ## _hv_lowpass)(halfHV, tmp, src, SIZE*sizeof(pixel), SIZE*sizeof(pixel), stride);\
+ FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfV, halfHV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
+}\
+\
+static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc32)(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\
+ uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\
+ int16_t tmp[SIZE*(SIZE+5)*sizeof(pixel)];\
+ uint8_t halfV[SIZE*SIZE*sizeof(pixel)];\
+ uint8_t halfHV[SIZE*SIZE*sizeof(pixel)];\
+ FUNC(copy_block ## SIZE )(full, src - stride*2 + sizeof(pixel), SIZE*sizeof(pixel), stride, SIZE + 5);\
+ FUNC(put_h264_qpel ## SIZE ## _v_lowpass)(halfV, full_mid, SIZE*sizeof(pixel), SIZE*sizeof(pixel));\
+ FUNC(put_h264_qpel ## SIZE ## _hv_lowpass)(halfHV, tmp, src, SIZE*sizeof(pixel), SIZE*sizeof(pixel), stride);\
+ FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfV, halfHV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\
+}\
+
+#define op_avg(a, b) a = (((a)+CLIP(((b) + 16)>>5)+1)>>1)
+//#define op_avg2(a, b) a = (((a)*w1+cm[((b) + 16)>>5]*w2 + o + 64)>>7)
+#define op_put(a, b) a = CLIP(((b) + 16)>>5)
+#define op2_avg(a, b) a = (((a)+CLIP(((b) + 512)>>10)+1)>>1)
+#define op2_put(a, b) a = CLIP(((b) + 512)>>10)
+
+H264_LOWPASS(put_ , op_put, op2_put)
+H264_LOWPASS(avg_ , op_avg, op2_avg)
+H264_MC(put_, 2)
+H264_MC(put_, 4)
+H264_MC(put_, 8)
+H264_MC(put_, 16)
+H264_MC(avg_, 4)
+H264_MC(avg_, 8)
+H264_MC(avg_, 16)
+
+#undef op_avg
+#undef op_put
+#undef op2_avg
+#undef op2_put

libav-v10.1.tar.bz2/libavcodec/hevc.c Added

@@ -0,0 +1,3273 @@
+/*
+ * HEVC video decoder
+ *
+ * Copyright (C) 2012 - 2013 Guillaume Martres
+ * Copyright (C) 2012 - 2013 Mickael Raulet
+ * Copyright (C) 2012 - 2013 Gildas Cocherel
+ * Copyright (C) 2012 - 2013 Wassim Hamidouche
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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/common.h"
+#include "libavutil/internal.h"
+#include "libavutil/md5.h"
+#include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/stereo3d.h"
+
+#include "bytestream.h"
+#include "cabac_functions.h"
+#include "dsputil.h"
+#include "golomb.h"
+#include "hevc.h"
+
+const uint8_t ff_hevc_qpel_extra_before[4] = { 0, 3, 3, 2 };
+const uint8_t ff_hevc_qpel_extra_after[4] = { 0, 3, 4, 4 };
+const uint8_t ff_hevc_qpel_extra[4] = { 0, 6, 7, 6 };
+
+static const uint8_t scan_1x1[1] = { 0 };
+
+static const uint8_t horiz_scan2x2_x[4] = { 0, 1, 0, 1 };
+
+static const uint8_t horiz_scan2x2_y[4] = { 0, 0, 1, 1 };
+
+static const uint8_t horiz_scan4x4_x[16] = {
+ 0, 1, 2, 3,
+ 0, 1, 2, 3,
+ 0, 1, 2, 3,
+ 0, 1, 2, 3,
+};
+
+static const uint8_t horiz_scan4x4_y[16] = {
+ 0, 0, 0, 0,
+ 1, 1, 1, 1,
+ 2, 2, 2, 2,
+ 3, 3, 3, 3,
+};
+
+static const uint8_t horiz_scan8x8_inv[8][8] = {
+ { 0, 1, 2, 3, 16, 17, 18, 19, },
+ { 4, 5, 6, 7, 20, 21, 22, 23, },
+ { 8, 9, 10, 11, 24, 25, 26, 27, },
+ { 12, 13, 14, 15, 28, 29, 30, 31, },
+ { 32, 33, 34, 35, 48, 49, 50, 51, },
+ { 36, 37, 38, 39, 52, 53, 54, 55, },
+ { 40, 41, 42, 43, 56, 57, 58, 59, },
+ { 44, 45, 46, 47, 60, 61, 62, 63, },
+};
+
+static const uint8_t diag_scan2x2_x[4] = { 0, 0, 1, 1 };
+
+static const uint8_t diag_scan2x2_y[4] = { 0, 1, 0, 1 };
+
+static const uint8_t diag_scan2x2_inv[2][2] = {
+ { 0, 2, },
+ { 1, 3, },
+};
+
+const uint8_t ff_hevc_diag_scan4x4_x[16] = {
+ 0, 0, 1, 0,
+ 1, 2, 0, 1,
+ 2, 3, 1, 2,
+ 3, 2, 3, 3,
+};
+
+const uint8_t ff_hevc_diag_scan4x4_y[16] = {
+ 0, 1, 0, 2,
+ 1, 0, 3, 2,
+ 1, 0, 3, 2,
+ 1, 3, 2, 3,
+};
+
+static const uint8_t diag_scan4x4_inv[4][4] = {
+ { 0, 2, 5, 9, },
+ { 1, 4, 8, 12, },
+ { 3, 7, 11, 14, },
+ { 6, 10, 13, 15, },
+};
+
+const uint8_t ff_hevc_diag_scan8x8_x[64] = {
+ 0, 0, 1, 0,
+ 1, 2, 0, 1,
+ 2, 3, 0, 1,
+ 2, 3, 4, 0,
+ 1, 2, 3, 4,
+ 5, 0, 1, 2,
+ 3, 4, 5, 6,
+ 0, 1, 2, 3,
+ 4, 5, 6, 7,
+ 1, 2, 3, 4,
+ 5, 6, 7, 2,
+ 3, 4, 5, 6,
+ 7, 3, 4, 5,
+ 6, 7, 4, 5,
+ 6, 7, 5, 6,
+ 7, 6, 7, 7,
+};
+
+const uint8_t ff_hevc_diag_scan8x8_y[64] = {
+ 0, 1, 0, 2,
+ 1, 0, 3, 2,
+ 1, 0, 4, 3,
+ 2, 1, 0, 5,
+ 4, 3, 2, 1,
+ 0, 6, 5, 4,
+ 3, 2, 1, 0,
+ 7, 6, 5, 4,
+ 3, 2, 1, 0,
+ 7, 6, 5, 4,
+ 3, 2, 1, 7,
+ 6, 5, 4, 3,
+ 2, 7, 6, 5,
+ 4, 3, 7, 6,
+ 5, 4, 7, 6,
+ 5, 7, 6, 7,
+};
+
+static const uint8_t diag_scan8x8_inv[8][8] = {
+ { 0, 2, 5, 9, 14, 20, 27, 35, },
+ { 1, 4, 8, 13, 19, 26, 34, 42, },
+ { 3, 7, 12, 18, 25, 33, 41, 48, },
+ { 6, 11, 17, 24, 32, 40, 47, 53, },
+ { 10, 16, 23, 31, 39, 46, 52, 57, },
+ { 15, 22, 30, 38, 45, 51, 56, 60, },
+ { 21, 29, 37, 44, 50, 55, 59, 62, },
+ { 28, 36, 43, 49, 54, 58, 61, 63, },
+};
+
+/**
+ * NOTE: Each function hls_foo correspond to the function foo in the
+ * specification (HLS stands for High Level Syntax).
+ */
+
+/**
+ * Section 5.7
+ */
+
+/* free everything allocated by pic_arrays_init() */
+static void pic_arrays_free(HEVCContext *s)
+{
+ av_freep(&s->sao);
+ av_freep(&s->deblock);
+ av_freep(&s->split_cu_flag);
+
+ av_freep(&s->skip_flag);
+ av_freep(&s->tab_ct_depth);
+
+ av_freep(&s->tab_ipm);
+ av_freep(&s->cbf_luma);
+ av_freep(&s->is_pcm);
+
+ av_freep(&s->qp_y_tab);
+ av_freep(&s->tab_slice_address);
+ av_freep(&s->filter_slice_edges);
+
+ av_freep(&s->horizontal_bs);
+ av_freep(&s->vertical_bs);
+
+ av_buffer_pool_uninit(&s->tab_mvf_pool);
+ av_buffer_pool_uninit(&s->rpl_tab_pool);
+}
+
+/* allocate arrays that depend on frame dimensions */
+static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps)
+{
+ 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;
+
+ s->sao = av_mallocz_array(ctb_count, sizeof(*s->sao));
+ s->deblock = av_mallocz_array(ctb_count, sizeof(*s->deblock));
+ s->split_cu_flag = av_malloc(pic_size);
+ if (!s->sao || !s->deblock || !s->split_cu_flag)
+ goto fail;
+
+ s->skip_flag = av_malloc(pic_size_in_ctb);
+ 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->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));
+ if (!s->qp_y_tab || !s->filter_slice_edges || !s->tab_slice_address)
+ goto fail;
+
+ s->horizontal_bs = av_mallocz(2 * s->bs_width * (s->bs_height + 1));
+ s->vertical_bs = av_mallocz(2 * s->bs_width * (s->bs_height + 1));
+ if (!s->horizontal_bs || !s->vertical_bs)
+ goto fail;
+
+ 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);
+ if (!s->tab_mvf_pool || !s->rpl_tab_pool)
+ goto fail;
+
+ return 0;
+
+fail:
+ pic_arrays_free(s);
+ return AVERROR(ENOMEM);
+}
+
+static void pred_weight_table(HEVCContext *s, GetBitContext *gb)
+{
+ int i = 0;
+ int j = 0;
+ uint8_t luma_weight_l0_flag[16];
+ uint8_t chroma_weight_l0_flag[16];
+ uint8_t luma_weight_l1_flag[16];
+ uint8_t chroma_weight_l1_flag[16];
+
+ s->sh.luma_log2_weight_denom = get_ue_golomb_long(gb);
+ if (s->sps->chroma_format_idc != 0) {
+ int delta = get_se_golomb(gb);
+ s->sh.chroma_log2_weight_denom = av_clip_c(s->sh.luma_log2_weight_denom + delta, 0, 7);
+ }
+
+ for (i = 0; i < s->sh.nb_refs[L0]; i++) {
+ luma_weight_l0_flag[i] = get_bits1(gb);
+ if (!luma_weight_l0_flag[i]) {
+ s->sh.luma_weight_l0[i] = 1 << s->sh.luma_log2_weight_denom;
+ s->sh.luma_offset_l0[i] = 0;
+ }
+ }
+ if (s->sps->chroma_format_idc != 0) { // FIXME: invert "if" and "for"
+ for (i = 0; i < s->sh.nb_refs[L0]; i++)
+ chroma_weight_l0_flag[i] = get_bits1(gb);
+ } else {
+ for (i = 0; i < s->sh.nb_refs[L0]; i++)
+ chroma_weight_l0_flag[i] = 0;
+ }
+ for (i = 0; i < s->sh.nb_refs[L0]; i++) {
+ if (luma_weight_l0_flag[i]) {
+ int delta_luma_weight_l0 = get_se_golomb(gb);
+ s->sh.luma_weight_l0[i] = (1 << s->sh.luma_log2_weight_denom) + delta_luma_weight_l0;
+ s->sh.luma_offset_l0[i] = get_se_golomb(gb);
+ }
+ if (chroma_weight_l0_flag[i]) {
+ for (j = 0; j < 2; j++) {
+ int delta_chroma_weight_l0 = get_se_golomb(gb);
+ int delta_chroma_offset_l0 = get_se_golomb(gb);
+ s->sh.chroma_weight_l0[i][j] = (1 << s->sh.chroma_log2_weight_denom) + delta_chroma_weight_l0;
+ s->sh.chroma_offset_l0[i][j] = av_clip_c((delta_chroma_offset_l0 - ((128 * s->sh.chroma_weight_l0[i][j])
+ >> s->sh.chroma_log2_weight_denom) + 128), -128, 127);
+ }
+ } else {
+ s->sh.chroma_weight_l0[i][0] = 1 << s->sh.chroma_log2_weight_denom;
+ s->sh.chroma_offset_l0[i][0] = 0;
+ s->sh.chroma_weight_l0[i][1] = 1 << s->sh.chroma_log2_weight_denom;
+ s->sh.chroma_offset_l0[i][1] = 0;
+ }
+ }
+ if (s->sh.slice_type == B_SLICE) {
+ for (i = 0; i < s->sh.nb_refs[L1]; i++) {
+ luma_weight_l1_flag[i] = get_bits1(gb);
+ if (!luma_weight_l1_flag[i]) {
+ s->sh.luma_weight_l1[i] = 1 << s->sh.luma_log2_weight_denom;
+ s->sh.luma_offset_l1[i] = 0;
+ }
+ }
+ if (s->sps->chroma_format_idc != 0) {
+ for (i = 0; i < s->sh.nb_refs[L1]; i++)
+ chroma_weight_l1_flag[i] = get_bits1(gb);
+ } else {
+ for (i = 0; i < s->sh.nb_refs[L1]; i++)
+ chroma_weight_l1_flag[i] = 0;
+ }
+ for (i = 0; i < s->sh.nb_refs[L1]; i++) {
+ if (luma_weight_l1_flag[i]) {
+ int delta_luma_weight_l1 = get_se_golomb(gb);
+ s->sh.luma_weight_l1[i] = (1 << s->sh.luma_log2_weight_denom) + delta_luma_weight_l1;
+ s->sh.luma_offset_l1[i] = get_se_golomb(gb);
+ }
+ if (chroma_weight_l1_flag[i]) {
+ for (j = 0; j < 2; j++) {
+ int delta_chroma_weight_l1 = get_se_golomb(gb);
+ int delta_chroma_offset_l1 = get_se_golomb(gb);
+ s->sh.chroma_weight_l1[i][j] = (1 << s->sh.chroma_log2_weight_denom) + delta_chroma_weight_l1;
+ s->sh.chroma_offset_l1[i][j] = av_clip_c((delta_chroma_offset_l1 - ((128 * s->sh.chroma_weight_l1[i][j])
+ >> s->sh.chroma_log2_weight_denom) + 128), -128, 127);
+ }
+ } else {
+ s->sh.chroma_weight_l1[i][0] = 1 << s->sh.chroma_log2_weight_denom;
+ s->sh.chroma_offset_l1[i][0] = 0;
+ s->sh.chroma_weight_l1[i][1] = 1 << s->sh.chroma_log2_weight_denom;
+ s->sh.chroma_offset_l1[i][1] = 0;
+ }
+ }
+ }
+}
+
+static int decode_lt_rps(HEVCContext *s, LongTermRPS *rps, GetBitContext *gb)
+{
+ const HEVCSPS *sps = s->sps;
+ int max_poc_lsb = 1 << sps->log2_max_poc_lsb;
+ int prev_delta_msb = 0;
+ unsigned int nb_sps = 0, nb_sh;
+ int i;
+
+ rps->nb_refs = 0;
+ if (!sps->long_term_ref_pics_present_flag)
+ return 0;
+
+ if (sps->num_long_term_ref_pics_sps > 0)
+ nb_sps = get_ue_golomb_long(gb);
+ nb_sh = get_ue_golomb_long(gb);
+
+ if (nb_sh + nb_sps > FF_ARRAY_ELEMS(rps->poc))
+ return AVERROR_INVALIDDATA;
+
+ rps->nb_refs = nb_sh + nb_sps;
+
+ for (i = 0; i < rps->nb_refs; i++) {
+ uint8_t delta_poc_msb_present;
+
+ if (i < nb_sps) {
+ uint8_t lt_idx_sps = 0;
+
+ if (sps->num_long_term_ref_pics_sps > 1)
+ lt_idx_sps = get_bits(gb, av_ceil_log2(sps->num_long_term_ref_pics_sps));
+
+ rps->poc[i] = sps->lt_ref_pic_poc_lsb_sps[lt_idx_sps];
+ rps->used[i] = sps->used_by_curr_pic_lt_sps_flag[lt_idx_sps];
+ } else {
+ rps->poc[i] = get_bits(gb, sps->log2_max_poc_lsb);
+ rps->used[i] = get_bits1(gb);
+ }
+
+ delta_poc_msb_present = get_bits1(gb);
+ if (delta_poc_msb_present) {
+ int delta = get_ue_golomb_long(gb);
+
+ if (i && i != nb_sps)
+ delta += prev_delta_msb;
+
+ rps->poc[i] += s->poc - delta * max_poc_lsb - s->sh.pic_order_cnt_lsb;
+ prev_delta_msb = delta;
+ }
+ }
+
+ 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;
+ int i, ret;
+
+ // Coded parameters
+ sh->first_slice_in_pic_flag = get_bits1(gb);
+ if ((IS_IDR(s) || IS_BLA(s)) && sh->first_slice_in_pic_flag) {
+ s->seq_decode = (s->seq_decode + 1) & 0xff;
+ s->max_ra = INT_MAX;
+ if (IS_IDR(s))
+ ff_hevc_clear_refs(s);
+ }
+ if (s->nal_unit_type >= 16 && s->nal_unit_type <= 23)
+ sh->no_output_of_prior_pics_flag = get_bits1(gb);
+
+ sh->pps_id = get_ue_golomb_long(gb);
+ if (sh->pps_id >= MAX_PPS_COUNT || !s->pps_list[sh->pps_id]) {
+ 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;
+
+ ff_hevc_clear_refs(s);
+ ret = set_sps(s, s->sps);
+ if (ret < 0)
+ return ret;
+
+ 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;
+
+ if (s->pps->dependent_slice_segments_enabled_flag)
+ sh->dependent_slice_segment_flag = get_bits1(gb);
+
+ slice_address_length = av_ceil_log2(s->sps->ctb_width *
+ 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",
+ sh->slice_segment_addr);
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (!sh->dependent_slice_segment_flag) {
+ sh->slice_addr = sh->slice_segment_addr;
+ s->slice_idx++;
+ }
+ } else {
+ sh->slice_segment_addr = sh->slice_addr = 0;
+ s->slice_idx = 0;
+ s->slice_initialized = 0;
+ }
+
+ if (!sh->dependent_slice_segment_flag) {
+ s->slice_initialized = 0;
+
+ for (i = 0; i < s->pps->num_extra_slice_header_bits; i++)
+ 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 ||
+ 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);
+
+ if (s->sps->separate_colour_plane_flag)
+ sh->colour_plane_id = get_bits(gb, 2);
+
+ if (!IS_IDR(s)) {
+ 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);
+ if (!sh->first_slice_in_pic_flag && poc != s->poc) {
+ av_log(s->avctx, AV_LOG_WARNING,
+ "Ignoring POC change between slices: %d -> %d\n", s->poc, poc);
+ if (s->avctx->err_recognition & AV_EF_EXPLODE)
+ return AVERROR_INVALIDDATA;
+ poc = s->poc;
+ }
+ s->poc = poc;
+
+ short_term_ref_pic_set_sps_flag = get_bits1(gb);
+ if (!short_term_ref_pic_set_sps_flag) {
+ ret = ff_hevc_decode_short_term_rps(s, &sh->slice_rps, s->sps, 1);
+ if (ret < 0)
+ return ret;
+
+ sh->short_term_rps = &sh->slice_rps;
+ } else {
+ int numbits, rps_idx;
+
+ if (!s->sps->nb_st_rps) {
+ av_log(s->avctx, AV_LOG_ERROR, "No ref lists in the SPS.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ numbits = av_ceil_log2(s->sps->nb_st_rps);
+ rps_idx = numbits > 0 ? get_bits(gb, numbits) : 0;
+ sh->short_term_rps = &s->sps->st_rps[rps_idx];
+ }
+
+ ret = decode_lt_rps(s, &sh->long_term_rps, gb);
+ if (ret < 0) {
+ av_log(s->avctx, AV_LOG_WARNING, "Invalid long term RPS.\n");
+ if (s->avctx->err_recognition & AV_EF_EXPLODE)
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (s->sps->sps_temporal_mvp_enabled_flag)
+ sh->slice_temporal_mvp_enabled_flag = get_bits1(gb);
+ else
+ sh->slice_temporal_mvp_enabled_flag = 0;
+ } else {
+ s->sh.short_term_rps = NULL;
+ 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_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;
+
+ if (s->sps->sao_enabled) {
+ sh->slice_sample_adaptive_offset_flag[0] = get_bits1(gb);
+ sh->slice_sample_adaptive_offset_flag[1] =
+ sh->slice_sample_adaptive_offset_flag[2] = get_bits1(gb);
+ } else {
+ sh->slice_sample_adaptive_offset_flag[0] = 0;
+ sh->slice_sample_adaptive_offset_flag[1] = 0;
+ sh->slice_sample_adaptive_offset_flag[2] = 0;
+ }
+
+ sh->nb_refs[L0] = sh->nb_refs[L1] = 0;
+ if (sh->slice_type == P_SLICE || sh->slice_type == B_SLICE) {
+ int nb_refs;
+
+ sh->nb_refs[L0] = s->pps->num_ref_idx_l0_default_active;
+ if (sh->slice_type == B_SLICE)
+ sh->nb_refs[L1] = s->pps->num_ref_idx_l1_default_active;
+
+ if (get_bits1(gb)) { // num_ref_idx_active_override_flag
+ sh->nb_refs[L0] = get_ue_golomb_long(gb) + 1;
+ if (sh->slice_type == B_SLICE)
+ sh->nb_refs[L1] = get_ue_golomb_long(gb) + 1;
+ }
+ if (sh->nb_refs[L0] > MAX_REFS || sh->nb_refs[L1] > MAX_REFS) {
+ av_log(s->avctx, AV_LOG_ERROR, "Too many refs: %d/%d.\n",
+ sh->nb_refs[L0], sh->nb_refs[L1]);
+ return AVERROR_INVALIDDATA;
+ }
+
+ sh->rpl_modification_flag[0] = 0;
+ sh->rpl_modification_flag[1] = 0;
+ nb_refs = ff_hevc_frame_nb_refs(s);
+ if (!nb_refs) {
+ av_log(s->avctx, AV_LOG_ERROR, "Zero refs for a frame with P or B slices.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (s->pps->lists_modification_present_flag && nb_refs > 1) {
+ sh->rpl_modification_flag[0] = get_bits1(gb);
+ if (sh->rpl_modification_flag[0]) {
+ for (i = 0; i < sh->nb_refs[L0]; i++)
+ sh->list_entry_lx[0][i] = get_bits(gb, av_ceil_log2(nb_refs));
+ }
+
+ if (sh->slice_type == B_SLICE) {
+ sh->rpl_modification_flag[1] = get_bits1(gb);
+ if (sh->rpl_modification_flag[1] == 1)
+ for (i = 0; i < sh->nb_refs[L1]; i++)
+ sh->list_entry_lx[1][i] = get_bits(gb, av_ceil_log2(nb_refs));
+ }
+ }
+
+ if (sh->slice_type == B_SLICE)
+ sh->mvd_l1_zero_flag = get_bits1(gb);
+
+ if (s->pps->cabac_init_present_flag)
+ sh->cabac_init_flag = get_bits1(gb);
+ else
+ sh->cabac_init_flag = 0;
+
+ sh->collocated_ref_idx = 0;
+ if (sh->slice_temporal_mvp_enabled_flag) {
+ sh->collocated_list = L0;
+ if (sh->slice_type == B_SLICE)
+ sh->collocated_list = !get_bits1(gb);
+
+ if (sh->nb_refs[sh->collocated_list] > 1) {
+ 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);
+ return AVERROR_INVALIDDATA;
+ }
+ }
+ }
+
+ if ((s->pps->weighted_pred_flag && sh->slice_type == P_SLICE) ||
+ (s->pps->weighted_bipred_flag && sh->slice_type == B_SLICE)) {
+ pred_weight_table(s, gb);
+ }
+
+ sh->max_num_merge_cand = 5 - get_ue_golomb_long(gb);
+ if (sh->max_num_merge_cand < 1 || sh->max_num_merge_cand > 5) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Invalid number of merging MVP candidates: %d.\n",
+ sh->max_num_merge_cand);
+ return AVERROR_INVALIDDATA;
+ }
+ }
+
+ 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);
+ } else {
+ sh->slice_cb_qp_offset = 0;
+ sh->slice_cr_qp_offset = 0;
+ }
+
+ if (s->pps->deblocking_filter_control_present_flag) {
+ int deblocking_filter_override_flag = 0;
+
+ if (s->pps->deblocking_filter_override_enabled_flag)
+ deblocking_filter_override_flag = get_bits1(gb);
+
+ if (deblocking_filter_override_flag) {
+ sh->disable_deblocking_filter_flag = get_bits1(gb);
+ if (!sh->disable_deblocking_filter_flag) {
+ sh->beta_offset = get_se_golomb(gb) * 2;
+ sh->tc_offset = get_se_golomb(gb) * 2;
+ }
+ } else {
+ sh->disable_deblocking_filter_flag = s->pps->disable_dbf;
+ 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;
+ }
+
+ if (s->pps->seq_loop_filter_across_slices_enabled_flag &&
+ (sh->slice_sample_adaptive_offset_flag[0] ||
+ sh->slice_sample_adaptive_offset_flag[1] ||
+ !sh->disable_deblocking_filter_flag)) {
+ sh->slice_loop_filter_across_slices_enabled_flag = get_bits1(gb);
+ } else {
+ sh->slice_loop_filter_across_slices_enabled_flag = s->pps->seq_loop_filter_across_slices_enabled_flag;
+ }
+ } else if (!s->slice_initialized) {
+ av_log(s->avctx, AV_LOG_ERROR, "Independent slice segment missing.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ sh->num_entry_point_offsets = 0;
+ if (s->pps->tiles_enabled_flag || s->pps->entropy_coding_sync_enabled_flag) {
+ sh->num_entry_point_offsets = get_ue_golomb_long(gb);
+ if (sh->num_entry_point_offsets > 0) {
+ int offset_len = get_ue_golomb_long(gb) + 1;
+
+ for (i = 0; i < sh->num_entry_point_offsets; i++)
+ skip_bits(gb, offset_len);
+ }
+ }
+
+ if (s->pps->slice_header_extension_present_flag) {
+ 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;
+ 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 = FFUMOD(s->sh.slice_qp + 52 + 2 * s->sps->qp_bd_offset,
+ 52 + s->sps->qp_bd_offset) - s->sps->qp_bd_offset;
+
+ s->slice_initialized = 1;
+
+ return 0;
+}
+
+#define CTB(tab, x, y) ((tab)[(y) * s->sps->ctb_width + (x)])
+
+#define SET_SAO(elem, value) \
+do { \
+ if (!sao_merge_up_flag && !sao_merge_left_flag) \
+ sao->elem = value; \
+ else if (sao_merge_left_flag) \
+ sao->elem = CTB(s->sao, rx-1, ry).elem; \
+ else if (sao_merge_up_flag) \
+ sao->elem = CTB(s->sao, rx, ry-1).elem; \
+ else \
+ sao->elem = 0; \
+} while (0)
+
+static void hls_sao_param(HEVCContext *s, int rx, int ry)
+{
+ HEVCLocalContext *lc = &s->HEVClc;
+ int sao_merge_left_flag = 0;
+ int sao_merge_up_flag = 0;
+ int shift = s->sps->bit_depth - FFMIN(s->sps->bit_depth, 10);
+ SAOParams *sao = &CTB(s->sao, rx, ry);
+ int c_idx, i;
+
+ if (s->sh.slice_sample_adaptive_offset_flag[0] ||
+ s->sh.slice_sample_adaptive_offset_flag[1]) {
+ if (rx > 0) {
+ if (lc->ctb_left_flag)
+ sao_merge_left_flag = ff_hevc_sao_merge_flag_decode(s);
+ }
+ if (ry > 0 && !sao_merge_left_flag) {
+ if (lc->ctb_up_flag)
+ sao_merge_up_flag = ff_hevc_sao_merge_flag_decode(s);
+ }
+ }
+
+ for (c_idx = 0; c_idx < 3; c_idx++) {
+ if (!s->sh.slice_sample_adaptive_offset_flag[c_idx]) {
+ sao->type_idx[c_idx] = SAO_NOT_APPLIED;
+ continue;
+ }
+
+ if (c_idx == 2) {
+ sao->type_idx[2] = sao->type_idx[1];
+ sao->eo_class[2] = sao->eo_class[1];
+ } else {
+ SET_SAO(type_idx[c_idx], ff_hevc_sao_type_idx_decode(s));
+ }
+
+ if (sao->type_idx[c_idx] == SAO_NOT_APPLIED)
+ continue;
+
+ for (i = 0; i < 4; i++)
+ SET_SAO(offset_abs[c_idx][i], ff_hevc_sao_offset_abs_decode(s));
+
+ 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));
+ } else {
+ sao->offset_sign[c_idx][i] = 0;
+ }
+ }
+ SET_SAO(band_position[c_idx], ff_hevc_sao_band_position_decode(s));
+ } else if (c_idx != 2) {
+ SET_SAO(eo_class[c_idx], ff_hevc_sao_eo_class_decode(s));
+ }
+
+ // Inferred parameters
+ sao->offset_val[c_idx][0] = 0;
+ for (i = 0; i < 4; i++) {
+ sao->offset_val[c_idx][i + 1] = sao->offset_abs[c_idx][i] << shift;
+ if (sao->type_idx[c_idx] == SAO_EDGE) {
+ if (i > 1)
+ sao->offset_val[c_idx][i + 1] = -sao->offset_val[c_idx][i + 1];
+ } else if (sao->offset_sign[c_idx][i]) {
+ sao->offset_val[c_idx][i + 1] = -sao->offset_val[c_idx][i + 1];
+ }
+ }
+ }
+}
+
+#undef SET_SAO
+#undef CTB
+
+static void hls_residual_coding(HEVCContext *s, int x0, int y0,
+ int log2_trafo_size, enum ScanType scan_idx,
+ int c_idx)
+{
+#define GET_COORD(offset, n) \
+ do { \
+ x_c = (scan_x_cg[offset >> 4] << 2) + scan_x_off[n]; \
+ y_c = (scan_y_cg[offset >> 4] << 2) + scan_y_off[n]; \
+ } while (0)
+ HEVCLocalContext *lc = &s->HEVClc;
+ int transform_skip_flag = 0;
+
+ int last_significant_coeff_x, last_significant_coeff_y;
+ int last_scan_pos;
+ int n_end;
+ int num_coeff = 0;
+ int greater1_ctx = 1;
+
+ int num_last_subset;
+ int x_cg_last_sig, y_cg_last_sig;
+
+ const uint8_t *scan_x_cg, *scan_y_cg, *scan_x_off, *scan_y_off;
+
+ ptrdiff_t stride = s->frame->linesize[c_idx];
+ int hshift = s->sps->hshift[c_idx];
+ int vshift = s->sps->vshift[c_idx];
+ uint8_t *dst = &s->frame->data[c_idx][(y0 >> vshift) * stride +
+ ((x0 >> hshift) << s->sps->pixel_shift)];
+ DECLARE_ALIGNED(16, int16_t, coeffs[MAX_TB_SIZE * MAX_TB_SIZE]) = { 0 };
+ DECLARE_ALIGNED(8, uint8_t, significant_coeff_group_flag[8][8]) = { { 0 } };
+
+ int trafo_size = 1 << log2_trafo_size;
+ int i, qp, shift, add, scale, scale_m;
+ const uint8_t level_scale[] = { 40, 45, 51, 57, 64, 72 };
+ const uint8_t *scale_matrix;
+ uint8_t dc_scale;
+
+ // Derive QP for dequant
+ if (!lc->cu.cu_transquant_bypass_flag) {
+ static const int qp_c[] = {
+ 29, 30, 31, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37
+ };
+
+ static const uint8_t rem6[51 + 2 * 6 + 1] = {
+ 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2,
+ 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5,
+ 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3,
+ };
+
+ static const uint8_t div6[51 + 2 * 6 + 1] = {
+ 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3,
+ 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6,
+ 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10,
+ };
+ int qp_y = lc->qp_y;
+
+ if (c_idx == 0) {
+ qp = qp_y + s->sps->qp_bd_offset;
+ } else {
+ int qp_i, offset;
+
+ if (c_idx == 1)
+ offset = s->pps->cb_qp_offset + s->sh.slice_cb_qp_offset;
+ else
+ offset = s->pps->cr_qp_offset + s->sh.slice_cr_qp_offset;
+
+ qp_i = av_clip_c(qp_y + offset, -s->sps->qp_bd_offset, 57);
+ if (qp_i < 30)
+ qp = qp_i;
+ else if (qp_i > 43)
+ qp = qp_i - 6;
+ else
+ qp = qp_c[qp_i - 30];
+
+ qp += s->sps->qp_bd_offset;
+ }
+
+ shift = s->sps->bit_depth + log2_trafo_size - 5;
+ add = 1 << (shift - 1);
+ scale = level_scale[rem6[qp]] << (div6[qp]);
+ scale_m = 16; // default when no custom scaling lists.
+ dc_scale = 16;
+
+ if (s->sps->scaling_list_enable_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;
+
+ if (log2_trafo_size != 5)
+ matrix_id = 3 * matrix_id + c_idx;
+
+ scale_matrix = sl->sl[log2_trafo_size - 2][matrix_id];
+ if (log2_trafo_size >= 4)
+ dc_scale = sl->sl_dc[log2_trafo_size - 4][matrix_id];
+ }
+ }
+
+ if (s->pps->transform_skip_enabled_flag &&
+ !lc->cu.cu_transquant_bypass_flag &&
+ log2_trafo_size == 2) {
+ transform_skip_flag = ff_hevc_transform_skip_flag_decode(s, c_idx);
+ }
+
+ last_significant_coeff_x =
+ ff_hevc_last_significant_coeff_x_prefix_decode(s, c_idx, log2_trafo_size);
+ last_significant_coeff_y =
+ ff_hevc_last_significant_coeff_y_prefix_decode(s, c_idx, log2_trafo_size);
+
+ if (last_significant_coeff_x > 3) {
+ int suffix = ff_hevc_last_significant_coeff_suffix_decode(s, last_significant_coeff_x);
+ last_significant_coeff_x = (1 << ((last_significant_coeff_x >> 1) - 1)) *
+ (2 + (last_significant_coeff_x & 1)) +
+ suffix;
+ }
+
+ if (last_significant_coeff_y > 3) {
+ int suffix = ff_hevc_last_significant_coeff_suffix_decode(s, last_significant_coeff_y);
+ last_significant_coeff_y = (1 << ((last_significant_coeff_y >> 1) - 1)) *
+ (2 + (last_significant_coeff_y & 1)) +
+ suffix;
+ }
+
+ if (scan_idx == SCAN_VERT)
+ FFSWAP(int, last_significant_coeff_x, last_significant_coeff_y);
+
+ x_cg_last_sig = last_significant_coeff_x >> 2;
+ y_cg_last_sig = last_significant_coeff_y >> 2;
+
+ switch (scan_idx) {
+ case SCAN_DIAG: {
+ int last_x_c = last_significant_coeff_x & 3;
+ int last_y_c = last_significant_coeff_y & 3;
+
+ scan_x_off = ff_hevc_diag_scan4x4_x;
+ scan_y_off = ff_hevc_diag_scan4x4_y;
+ num_coeff = diag_scan4x4_inv[last_y_c][last_x_c];
+ if (trafo_size == 4) {
+ scan_x_cg = scan_1x1;
+ scan_y_cg = scan_1x1;
+ } else if (trafo_size == 8) {
+ num_coeff += diag_scan2x2_inv[y_cg_last_sig][x_cg_last_sig] << 4;
+ scan_x_cg = diag_scan2x2_x;
+ scan_y_cg = diag_scan2x2_y;
+ } else if (trafo_size == 16) {
+ num_coeff += diag_scan4x4_inv[y_cg_last_sig][x_cg_last_sig] << 4;
+ scan_x_cg = ff_hevc_diag_scan4x4_x;
+ scan_y_cg = ff_hevc_diag_scan4x4_y;
+ } else { // trafo_size == 32
+ num_coeff += diag_scan8x8_inv[y_cg_last_sig][x_cg_last_sig] << 4;
+ scan_x_cg = ff_hevc_diag_scan8x8_x;
+ scan_y_cg = ff_hevc_diag_scan8x8_y;
+ }
+ break;
+ }
+ case SCAN_HORIZ:
+ scan_x_cg = horiz_scan2x2_x;
+ scan_y_cg = horiz_scan2x2_y;
+ scan_x_off = horiz_scan4x4_x;
+ scan_y_off = horiz_scan4x4_y;
+ num_coeff = horiz_scan8x8_inv[last_significant_coeff_y][last_significant_coeff_x];
+ break;
+ default: //SCAN_VERT
+ scan_x_cg = horiz_scan2x2_y;
+ scan_y_cg = horiz_scan2x2_x;
+ scan_x_off = horiz_scan4x4_y;
+ scan_y_off = horiz_scan4x4_x;
+ num_coeff = horiz_scan8x8_inv[last_significant_coeff_x][last_significant_coeff_y];
+ break;
+ }
+ num_coeff++;
+ num_last_subset = (num_coeff - 1) >> 4;
+
+ for (i = num_last_subset; i >= 0; i--) {
+ int n, m;
+ int x_cg, y_cg, x_c, y_c;
+ int implicit_non_zero_coeff = 0;
+ int64_t trans_coeff_level;
+ int prev_sig = 0;
+ int offset = i << 4;
+
+ uint8_t significant_coeff_flag_idx[16];
+ uint8_t nb_significant_coeff_flag = 0;
+
+ x_cg = scan_x_cg[i];
+ y_cg = scan_y_cg[i];
+
+ if (i < num_last_subset && i > 0) {
+ int ctx_cg = 0;
+ if (x_cg < (1 << (log2_trafo_size - 2)) - 1)
+ ctx_cg += significant_coeff_group_flag[x_cg + 1][y_cg];
+ if (y_cg < (1 << (log2_trafo_size - 2)) - 1)
+ ctx_cg += significant_coeff_group_flag[x_cg][y_cg + 1];
+
+ significant_coeff_group_flag[x_cg][y_cg] =
+ ff_hevc_significant_coeff_group_flag_decode(s, c_idx, ctx_cg);
+ implicit_non_zero_coeff = 1;
+ } else {
+ significant_coeff_group_flag[x_cg][y_cg] =
+ ((x_cg == x_cg_last_sig && y_cg == y_cg_last_sig) ||
+ (x_cg == 0 && y_cg == 0));
+ }
+
+ last_scan_pos = num_coeff - offset - 1;
+
+ if (i == num_last_subset) {
+ n_end = last_scan_pos - 1;
+ significant_coeff_flag_idx[0] = last_scan_pos;
+ nb_significant_coeff_flag = 1;
+ } else {
+ n_end = 15;
+ }
+
+ if (x_cg < ((1 << log2_trafo_size) - 1) >> 2)
+ prev_sig = significant_coeff_group_flag[x_cg + 1][y_cg];
+ if (y_cg < ((1 << log2_trafo_size) - 1) >> 2)
+ prev_sig += significant_coeff_group_flag[x_cg][y_cg + 1] << 1;
+
+ for (n = n_end; n >= 0; n--) {
+ GET_COORD(offset, n);
+
+ if (significant_coeff_group_flag[x_cg][y_cg] &&
+ (n > 0 || implicit_non_zero_coeff == 0)) {
+ if (ff_hevc_significant_coeff_flag_decode(s, c_idx, x_c, y_c,
+ log2_trafo_size,
+ scan_idx,
+ prev_sig) == 1) {
+ significant_coeff_flag_idx[nb_significant_coeff_flag] = n;
+ nb_significant_coeff_flag++;
+ implicit_non_zero_coeff = 0;
+ }
+ } else {
+ int last_cg = (x_c == (x_cg << 2) && y_c == (y_cg << 2));
+ if (last_cg && implicit_non_zero_coeff && significant_coeff_group_flag[x_cg][y_cg]) {
+ significant_coeff_flag_idx[nb_significant_coeff_flag] = n;
+ nb_significant_coeff_flag++;
+ }
+ }
+ }
+
+ n_end = nb_significant_coeff_flag;
+
+ if (n_end) {
+ int first_nz_pos_in_cg = 16;
+ int last_nz_pos_in_cg = -1;
+ int c_rice_param = 0;
+ int first_greater1_coeff_idx = -1;
+ uint8_t coeff_abs_level_greater1_flag[16] = { 0 };
+ uint16_t coeff_sign_flag;
+ int sum_abs = 0;
+ int sign_hidden = 0;
+
+ // initialize first elem of coeff_bas_level_greater1_flag
+ int ctx_set = (i > 0 && c_idx == 0) ? 2 : 0;
+
+ if (!(i == num_last_subset) && greater1_ctx == 0)
+ ctx_set++;
+ greater1_ctx = 1;
+ last_nz_pos_in_cg = significant_coeff_flag_idx[0];
+
+ for (m = 0; m < (n_end > 8 ? 8 : n_end); m++) {
+ int n_idx = significant_coeff_flag_idx[m];
+ int inc = (ctx_set << 2) + greater1_ctx;
+ coeff_abs_level_greater1_flag[n_idx] =
+ ff_hevc_coeff_abs_level_greater1_flag_decode(s, c_idx, inc);
+ if (coeff_abs_level_greater1_flag[n_idx]) {
+ greater1_ctx = 0;
+ } else if (greater1_ctx > 0 && greater1_ctx < 3) {
+ greater1_ctx++;
+ }
+
+ if (coeff_abs_level_greater1_flag[n_idx] &&
+ first_greater1_coeff_idx == -1)
+ first_greater1_coeff_idx = n_idx;
+ }
+ first_nz_pos_in_cg = significant_coeff_flag_idx[n_end - 1];
+ sign_hidden = last_nz_pos_in_cg - first_nz_pos_in_cg >= 4 &&
+ !lc->cu.cu_transquant_bypass_flag;
+
+ if (first_greater1_coeff_idx != -1) {
+ coeff_abs_level_greater1_flag[first_greater1_coeff_idx] += ff_hevc_coeff_abs_level_greater2_flag_decode(s, c_idx, ctx_set);
+ }
+ if (!s->pps->sign_data_hiding_flag || !sign_hidden) {
+ coeff_sign_flag = ff_hevc_coeff_sign_flag(s, nb_significant_coeff_flag) << (16 - nb_significant_coeff_flag);
+ } else {
+ coeff_sign_flag = ff_hevc_coeff_sign_flag(s, nb_significant_coeff_flag - 1) << (16 - (nb_significant_coeff_flag - 1));
+ }
+
+ for (m = 0; m < n_end; m++) {
+ n = significant_coeff_flag_idx[m];
+ GET_COORD(offset, n);
+ trans_coeff_level = 1 + coeff_abs_level_greater1_flag[n];
+ if (trans_coeff_level == ((m < 8) ?
+ ((n == first_greater1_coeff_idx) ? 3 : 2) : 1)) {
+ int last_coeff_abs_level_remaining = ff_hevc_coeff_abs_level_remaining(s, trans_coeff_level, c_rice_param);
+
+ trans_coeff_level += last_coeff_abs_level_remaining;
+ if ((trans_coeff_level) > (3 * (1 << c_rice_param)))
+ c_rice_param = FFMIN(c_rice_param + 1, 4);
+ }
+ if (s->pps->sign_data_hiding_flag && sign_hidden) {
+ sum_abs += trans_coeff_level;
+ if (n == first_nz_pos_in_cg && ((sum_abs & 1) == 1))
+ trans_coeff_level = -trans_coeff_level;
+ }
+ if (coeff_sign_flag >> 15)
+ trans_coeff_level = -trans_coeff_level;
+ coeff_sign_flag <<= 1;
+ if (!lc->cu.cu_transquant_bypass_flag) {
+ if (s->sps->scaling_list_enable_flag) {
+ if (y_c || x_c || log2_trafo_size < 4) {
+ int pos;
+ switch (log2_trafo_size) {
+ case 3: pos = (y_c << 3) + x_c; break;
+ case 4: pos = ((y_c >> 1) << 3) + (x_c >> 1); break;
+ case 5: pos = ((y_c >> 2) << 3) + (x_c >> 2); break;
+ default: pos = (y_c << 2) + x_c;
+ }
+ scale_m = scale_matrix[pos];
+ } else {
+ scale_m = dc_scale;
+ }
+ }
+ trans_coeff_level = (trans_coeff_level * (int64_t)scale * (int64_t)scale_m + add) >> shift;
+ if(trans_coeff_level < 0) {
+ if((~trans_coeff_level) & 0xFffffffffff8000)
+ trans_coeff_level = -32768;
+ } else {
+ if (trans_coeff_level & 0xffffffffffff8000)
+ trans_coeff_level = 32767;
+ }
+ }
+ coeffs[y_c * trafo_size + x_c] = trans_coeff_level;
+ }
+ }
+ }
+
+ if (lc->cu.cu_transquant_bypass_flag) {
+ s->hevcdsp.transquant_bypass[log2_trafo_size - 2](dst, coeffs, stride);
+ } else {
+ if (transform_skip_flag)
+ s->hevcdsp.transform_skip(dst, coeffs, stride);
+ else if (lc->cu.pred_mode == MODE_INTRA && c_idx == 0 &&
+ log2_trafo_size == 2)
+ s->hevcdsp.transform_4x4_luma_add(dst, coeffs, stride);
+ else
+ s->hevcdsp.transform_add[log2_trafo_size - 2](dst, coeffs, stride);
+ }
+}
+
+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;
+
+ if (lc->cu.pred_mode == MODE_INTRA) {
+ int trafo_size = 1 << log2_trafo_size;
+ ff_hevc_set_neighbour_available(s, x0, y0, trafo_size, trafo_size);
+
+ s->hpc.intra_pred(s, x0, y0, log2_trafo_size, 0);
+ if (log2_trafo_size > 2) {
+ trafo_size = trafo_size << (s->sps->hshift[1] - 1);
+ ff_hevc_set_neighbour_available(s, x0, y0, trafo_size, trafo_size);
+ 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);
+ s->hpc.intra_pred(s, xBase, yBase, log2_trafo_size, 1);
+ s->hpc.intra_pred(s, xBase, yBase, log2_trafo_size, 2);
+ }
+ }
+
+ if (lc->tt.cbf_luma ||
+ SAMPLE_CBF(lc->tt.cbf_cb[trafo_depth], x0, y0) ||
+ SAMPLE_CBF(lc->tt.cbf_cr[trafo_depth], x0, y0)) {
+ int scan_idx = SCAN_DIAG;
+ int scan_idx_c = SCAN_DIAG;
+
+ if (s->pps->cu_qp_delta_enabled_flag && !lc->tu.is_cu_qp_delta_coded) {
+ lc->tu.cu_qp_delta = ff_hevc_cu_qp_delta_abs(s);
+ if (lc->tu.cu_qp_delta != 0)
+ 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);
+ }
+
+ if (lc->cu.pred_mode == MODE_INTRA && log2_trafo_size < 4) {
+ if (lc->tu.cur_intra_pred_mode >= 6 &&
+ lc->tu.cur_intra_pred_mode <= 14) {
+ scan_idx = SCAN_VERT;
+ } else if (lc->tu.cur_intra_pred_mode >= 22 &&
+ lc->tu.cur_intra_pred_mode <= 30) {
+ scan_idx = SCAN_HORIZ;
+ }
+
+ 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 &&
+ lc->pu.intra_pred_mode_c <= 30) {
+ scan_idx_c = SCAN_HORIZ;
+ }
+ }
+
+ if (lc->tt.cbf_luma)
+ hls_residual_coding(s, x0, y0, log2_trafo_size, scan_idx, 0);
+ if (log2_trafo_size > 2) {
+ if (SAMPLE_CBF(lc->tt.cbf_cb[trafo_depth], x0, y0))
+ hls_residual_coding(s, x0, y0, log2_trafo_size - 1, scan_idx_c, 1);
+ if (SAMPLE_CBF(lc->tt.cbf_cr[trafo_depth], x0, y0))
+ hls_residual_coding(s, x0, y0, log2_trafo_size - 1, scan_idx_c, 2);
+ } else if (blk_idx == 3) {
+ if (SAMPLE_CBF(lc->tt.cbf_cb[trafo_depth], xBase, yBase))
+ hls_residual_coding(s, xBase, yBase, log2_trafo_size, scan_idx_c, 1);
+ if (SAMPLE_CBF(lc->tt.cbf_cr[trafo_depth], xBase, yBase))
+ 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)
+{
+ 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 x_end = FFMIN(x0 + cb_size, s->sps->width);
+ int y_end = FFMIN(y0 + cb_size, s->sps->height);
+ int i, j;
+
+ for (j = (y0 >> log2_min_pu_size); j < (y_end >> log2_min_pu_size); j++)
+ for (i = (x0 >> log2_min_pu_size); i < (x_end >> log2_min_pu_size); i++)
+ s->is_pcm[i + j * min_pu_width] = 2;
+}
+
+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) =
+ SAMPLE_CBF(lc->tt.cbf_cb[trafo_depth - 1], xBase, yBase);
+ SAMPLE_CBF(lc->tt.cbf_cr[trafo_depth], x0, y0) =
+ SAMPLE_CBF(lc->tt.cbf_cr[trafo_depth - 1], xBase, yBase);
+ } else {
+ SAMPLE_CBF(lc->tt.cbf_cb[trafo_depth], x0, y0) =
+ SAMPLE_CBF(lc->tt.cbf_cr[trafo_depth], x0, y0) = 0;
+ }
+
+ if (lc->cu.intra_split_flag) {
+ if (trafo_depth == 1)
+ lc->tu.cur_intra_pred_mode = lc->pu.intra_pred_mode[blk_idx];
+ } else {
+ lc->tu.cur_intra_pred_mode = lc->pu.intra_pred_mode[0];
+ }
+
+ 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;
+
+ 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 &&
+ !(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;
+ }
+
+ if (log2_trafo_size > 2) {
+ if (trafo_depth == 0 ||
+ SAMPLE_CBF(lc->tt.cbf_cb[trafo_depth - 1], xBase, yBase)) {
+ SAMPLE_CBF(lc->tt.cbf_cb[trafo_depth], x0, y0) =
+ ff_hevc_cbf_cb_cr_decode(s, trafo_depth);
+ }
+
+ 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);
+ }
+ }
+
+ if (split_transform_flag) {
+ int x1 = x0 + ((1 << log2_trafo_size) >> 1);
+ int y1 = y0 + ((1 << log2_trafo_size) >> 1);
+
+ 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;
+ int min_tu_width = s->sps->min_tb_width;
+
+ if (lc->cu.pred_mode == MODE_INTRA || trafo_depth != 0 ||
+ SAMPLE_CBF(lc->tt.cbf_cb[trafo_depth], x0, y0) ||
+ SAMPLE_CBF(lc->tt.cbf_cr[trafo_depth], x0, y0)) {
+ lc->tt.cbf_luma = ff_hevc_cbf_luma_decode(s, trafo_depth);
+ }
+
+ 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;
+ for (i = 0; i < (1 << log2_trafo_size); i += min_tu_size)
+ for (j = 0; j < (1 << log2_trafo_size); j += min_tu_size) {
+ int x_tu = (x0 + j) >> log2_min_tu_size;
+ int y_tu = (y0 + i) >> log2_min_tu_size;
+ s->cbf_luma[y_tu * min_tu_width + x_tu] = 1;
+ }
+ }
+ if (!s->sh.disable_deblocking_filter_flag) {
+ 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)
+ 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)
+{
+ //TODO: non-4:2:0 support
+ HEVCLocalContext *lc = &s->HEVClc;
+ GetBitContext gb;
+ int cb_size = 1 << log2_cb_size;
+ int stride0 = s->frame->linesize[0];
+ uint8_t *dst0 = &s->frame->data[0][y0 * stride0 + (x0 << s->sps->pixel_shift)];
+ int stride1 = s->frame->linesize[1];
+ uint8_t *dst1 = &s->frame->data[1][(y0 >> s->sps->vshift[1]) * stride1 + ((x0 >> s->sps->hshift[1]) << s->sps->pixel_shift)];
+ 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_chroma;
+ const uint8_t *pcm = skip_bytes(&s->HEVClc.cc, (length + 7) >> 3);
+ int ret;
+
+ ff_hevc_deblocking_boundary_strengths(s, x0, y0, log2_cb_size,
+ lc->slice_or_tiles_up_boundary,
+ lc->slice_or_tiles_left_boundary);
+
+ ret = init_get_bits(&gb, pcm, length);
+ if (ret < 0)
+ return ret;
+
+ 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;
+}
+
+static void hls_mvd_coding(HEVCContext *s, int x0, int y0, int log2_cb_size)
+{
+ HEVCLocalContext *lc = &s->HEVClc;
+ int x = ff_hevc_abs_mvd_greater0_flag_decode(s);
+ int y = ff_hevc_abs_mvd_greater0_flag_decode(s);
+
+ if (x)
+ x += ff_hevc_abs_mvd_greater1_flag_decode(s);
+ if (y)
+ y += ff_hevc_abs_mvd_greater1_flag_decode(s);
+
+ switch (x) {
+ case 2: lc->pu.mvd.x = ff_hevc_mvd_decode(s); break;
+ case 1: lc->pu.mvd.x = ff_hevc_mvd_sign_flag_decode(s); break;
+ case 0: lc->pu.mvd.x = 0; break;
+ }
+
+ switch (y) {
+ case 2: lc->pu.mvd.y = ff_hevc_mvd_decode(s); break;
+ case 1: lc->pu.mvd.y = ff_hevc_mvd_sign_flag_decode(s); break;
+ case 0: lc->pu.mvd.y = 0; break;
+ }
+}
+
+/**
+ * 8.5.3.2.2.1 Luma sample interpolation process
+ *
+ * @param s HEVC decoding context
+ * @param dst target buffer for block data at block position
+ * @param dststride stride of the dst buffer
+ * @param ref reference picture buffer at origin (0, 0)
+ * @param mv motion vector (relative to block position) to get pixel data from
+ * @param x_off horizontal position of block from origin (0, 0)
+ * @param y_off vertical position of block from origin (0, 0)
+ * @param block_w width of block
+ * @param block_h height of block
+ */
+static void luma_mc(HEVCContext *s, int16_t *dst, 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 *src = ref->data[0];
+ ptrdiff_t srcstride = ref->linesize[0];
+ int pic_width = s->sps->width;
+ int pic_height = s->sps->height;
+
+ int mx = mv->x & 3;
+ int my = mv->y & 3;
+ int extra_left = ff_hevc_qpel_extra_before[mx];
+ int extra_top = ff_hevc_qpel_extra_before[my];
+
+ x_off += mv->x >> 2;
+ y_off += mv->y >> 2;
+ src += y_off * srcstride + (x_off << s->sps->pixel_shift);
+
+ 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, 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 + buf_offset;
+ srcstride = edge_emu_stride;
+ }
+ s->hevcdsp.put_hevc_qpel[my][mx](dst, dststride, src, srcstride, block_w,
+ block_h, lc->mc_buffer);
+}
+
+/**
+ * 8.5.3.2.2.2 Chroma sample interpolation process
+ *
+ * @param s HEVC decoding context
+ * @param dst1 target buffer for block data at block position (U plane)
+ * @param dst2 target buffer for block data at block position (V plane)
+ * @param dststride stride of the dst1 and dst2 buffers
+ * @param ref reference picture buffer at origin (0, 0)
+ * @param mv motion vector (relative to block position) to get pixel data from
+ * @param x_off horizontal position of block from origin (0, 0)
+ * @param y_off vertical position of block from origin (0, 0)
+ * @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)
+{
+ HEVCLocalContext *lc = &s->HEVClc;
+ uint8_t *src1 = ref->data[1];
+ uint8_t *src2 = ref->data[2];
+ ptrdiff_t src1stride = ref->linesize[1];
+ ptrdiff_t src2stride = ref->linesize[2];
+ int pic_width = s->sps->width >> 1;
+ int pic_height = s->sps->height >> 1;
+
+ int mx = mv->x & 7;
+ int my = mv->y & 7;
+
+ x_off += mv->x >> 3;
+ y_off += mv->y >> 3;
+ src1 += y_off * src1stride + (x_off << s->sps->pixel_shift);
+ src2 += y_off * src2stride + (x_off << s->sps->pixel_shift);
+
+ 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, 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 + 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, 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 + 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);
+ } else {
+ s->hevcdsp.put_hevc_epel[!!my][!!mx](dst1, dststride, src1, src1stride,
+ block_w, block_h, mx, my,
+ lc->mc_buffer);
+ s->hevcdsp.put_hevc_epel[!!my][!!mx](dst2, dststride, src2, src2stride,
+ block_w, block_h, mx, my,
+ lc->mc_buffer);
+ }
+}
+
+static void hevc_await_progress(HEVCContext *s, HEVCFrame *ref,
+ const Mv *mv, int y0, int height)
+{
+ int y = (mv->y >> 2) + y0 + height + 9;
+ ff_thread_await_progress(&ref->tf, y, 0);
+}
+
+static void hls_prediction_unit(HEVCContext *s, int x0, int y0,
+ int nPbW, int nPbH,
+ int log2_cb_size, int partIdx)
+{
+#define POS(c_idx, x, y) \
+ &s->frame->data[c_idx][((y) >> s->sps->vshift[c_idx]) * s->frame->linesize[c_idx] + \
+ (((x) >> s->sps->hshift[c_idx]) << s->sps->pixel_shift)]
+ HEVCLocalContext *lc = &s->HEVClc;
+ int merge_idx = 0;
+ struct MvField current_mv = {{{ 0 }}};
+
+ int min_pu_width = s->sps->min_pu_width;
+
+ MvField *tab_mvf = s->ref->tab_mvf;
+ RefPicList *refPicList = s->ref->refPicList;
+ HEVCFrame *ref0, *ref1;
+
+ int tmpstride = MAX_PB_SIZE;
+
+ uint8_t *dst0 = POS(0, x0, y0);
+ uint8_t *dst1 = POS(1, x0, y0);
+ uint8_t *dst2 = POS(2, x0, y0);
+ int log2_min_cb_size = s->sps->log2_min_cb_size;
+ 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 ref_idx[2];
+ int mvp_flag[2];
+ int x_pu, y_pu;
+ int i, j;
+
+ if (SAMPLE_CTB(s->skip_flag, x_cb, y_cb)) {
+ if (s->sh.max_num_merge_cand > 1)
+ merge_idx = ff_hevc_merge_idx_decode(s);
+ 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);
+ x_pu = x0 >> s->sps->log2_min_pu_size;
+ y_pu = y0 >> s->sps->log2_min_pu_size;
+
+ for (i = 0; i < nPbW >> s->sps->log2_min_pu_size; i++)
+ for (j = 0; j < nPbH >> s->sps->log2_min_pu_size; j++)
+ tab_mvf[(y_pu + j) * min_pu_width + x_pu + i] = current_mv;
+ } else { /* MODE_INTER */
+ lc->pu.merge_flag = ff_hevc_merge_flag_decode(s);
+ if (lc->pu.merge_flag) {
+ if (s->sh.max_num_merge_cand > 1)
+ merge_idx = ff_hevc_merge_idx_decode(s);
+ else
+ merge_idx = 0;
+
+ ff_hevc_luma_mv_merge_mode(s, x0, y0, nPbW, nPbH, 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;
+
+ for (i = 0; i < nPbW >> s->sps->log2_min_pu_size; i++)
+ for (j = 0; j < nPbH >> s->sps->log2_min_pu_size; j++)
+ tab_mvf[(y_pu + j) * min_pu_width + x_pu + i] = current_mv;
+ } else {
+ enum InterPredIdc inter_pred_idc = PRED_L0;
+ ff_hevc_set_neighbour_available(s, x0, y0, nPbW, nPbH);
+ if (s->sh.slice_type == B_SLICE)
+ inter_pred_idc = ff_hevc_inter_pred_idc_decode(s, nPbW, nPbH);
+
+ if (inter_pred_idc != PRED_L1) {
+ if (s->sh.nb_refs[L0]) {
+ ref_idx[0] = ff_hevc_ref_idx_lx_decode(s, s->sh.nb_refs[L0]);
+ current_mv.ref_idx[0] = ref_idx[0];
+ }
+ current_mv.pred_flag[0] = 1;
+ 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);
+ current_mv.mv[0].x += lc->pu.mvd.x;
+ current_mv.mv[0].y += lc->pu.mvd.y;
+ }
+
+ if (inter_pred_idc != PRED_L0) {
+ if (s->sh.nb_refs[L1]) {
+ ref_idx[1] = ff_hevc_ref_idx_lx_decode(s, s->sh.nb_refs[L1]);
+ current_mv.ref_idx[1] = ref_idx[1];
+ }
+
+ if (s->sh.mvd_l1_zero_flag == 1 && inter_pred_idc == PRED_BI) {
+ lc->pu.mvd.x = 0;
+ lc->pu.mvd.y = 0;
+ } else {
+ hls_mvd_coding(s, x0, y0, 1);
+ }
+
+ 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);
+ current_mv.mv[1].x += lc->pu.mvd.x;
+ current_mv.mv[1].y += lc->pu.mvd.y;
+ }
+
+ x_pu = x0 >> s->sps->log2_min_pu_size;
+ y_pu = y0 >> s->sps->log2_min_pu_size;
+
+ for (i = 0; i < nPbW >> s->sps->log2_min_pu_size; i++)
+ for(j = 0; j < nPbH >> s->sps->log2_min_pu_size; j++)
+ tab_mvf[(y_pu + j) * min_pu_width + x_pu + i] = current_mv;
+ }
+ }
+
+ if (current_mv.pred_flag[0]) {
+ ref0 = refPicList[0].ref[current_mv.ref_idx[0]];
+ if (!ref0)
+ return;
+ hevc_await_progress(s, ref0, &current_mv.mv[0], y0, nPbH);
+ }
+ if (current_mv.pred_flag[1]) {
+ ref1 = refPicList[1].ref[current_mv.ref_idx[1]];
+ if (!ref1)
+ return;
+ hevc_await_progress(s, ref1, &current_mv.mv[1], y0, nPbH);
+ }
+
+ 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, tmp2[MAX_PB_SIZE * MAX_PB_SIZE]);
+
+ luma_mc(s, tmp, tmpstride, ref0->frame,
+ &current_mv.mv[0], x0, y0, nPbW, nPbH);
+
+ if ((s->sh.slice_type == P_SLICE && s->pps->weighted_pred_flag) ||
+ (s->sh.slice_type == B_SLICE && s->pps->weighted_bipred_flag)) {
+ s->hevcdsp.weighted_pred(s->sh.luma_log2_weight_denom,
+ s->sh.luma_weight_l0[current_mv.ref_idx[0]],
+ s->sh.luma_offset_l0[current_mv.ref_idx[0]],
+ dst0, s->frame->linesize[0], tmp,
+ tmpstride, nPbW, nPbH);
+ } else {
+ s->hevcdsp.put_unweighted_pred(dst0, s->frame->linesize[0], tmp, tmpstride, nPbW, nPbH);
+ }
+ chroma_mc(s, tmp, tmp2, tmpstride, ref0->frame,
+ &current_mv.mv[0], x0 / 2, y0 / 2, nPbW / 2, nPbH / 2);
+
+ if ((s->sh.slice_type == P_SLICE && s->pps->weighted_pred_flag) ||
+ (s->sh.slice_type == B_SLICE && s->pps->weighted_bipred_flag)) {
+ s->hevcdsp.weighted_pred(s->sh.chroma_log2_weight_denom,
+ s->sh.chroma_weight_l0[current_mv.ref_idx[0]][0],
+ s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0],
+ dst1, s->frame->linesize[1], tmp, tmpstride,
+ nPbW / 2, nPbH / 2);
+ s->hevcdsp.weighted_pred(s->sh.chroma_log2_weight_denom,
+ s->sh.chroma_weight_l0[current_mv.ref_idx[0]][1],
+ s->sh.chroma_offset_l0[current_mv.ref_idx[0]][1],
+ dst2, s->frame->linesize[2], tmp2, tmpstride,
+ nPbW / 2, nPbH / 2);
+ } else {
+ s->hevcdsp.put_unweighted_pred(dst1, s->frame->linesize[1], tmp, tmpstride, nPbW/2, nPbH/2);
+ s->hevcdsp.put_unweighted_pred(dst2, s->frame->linesize[2], tmp2, tmpstride, nPbW/2, nPbH/2);
+ }
+ } else 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, tmp2[MAX_PB_SIZE * MAX_PB_SIZE]);
+
+ if (!ref1)
+ return;
+
+ luma_mc(s, tmp, tmpstride, ref1->frame,
+ &current_mv.mv[1], x0, y0, nPbW, nPbH);
+
+ if ((s->sh.slice_type == P_SLICE && s->pps->weighted_pred_flag) ||
+ (s->sh.slice_type == B_SLICE && s->pps->weighted_bipred_flag)) {
+ s->hevcdsp.weighted_pred(s->sh.luma_log2_weight_denom,
+ s->sh.luma_weight_l1[current_mv.ref_idx[1]],
+ s->sh.luma_offset_l1[current_mv.ref_idx[1]],
+ dst0, s->frame->linesize[0], tmp, tmpstride,
+ nPbW, nPbH);
+ } else {
+ s->hevcdsp.put_unweighted_pred(dst0, s->frame->linesize[0], tmp, tmpstride, nPbW, nPbH);
+ }
+
+ chroma_mc(s, tmp, tmp2, tmpstride, ref1->frame,
+ &current_mv.mv[1], x0/2, y0/2, nPbW/2, nPbH/2);
+
+ if ((s->sh.slice_type == P_SLICE && s->pps->weighted_pred_flag) ||
+ (s->sh.slice_type == B_SLICE && s->pps->weighted_bipred_flag)) {
+ s->hevcdsp.weighted_pred(s->sh.chroma_log2_weight_denom,
+ s->sh.chroma_weight_l1[current_mv.ref_idx[1]][0],
+ s->sh.chroma_offset_l1[current_mv.ref_idx[1]][0],
+ dst1, s->frame->linesize[1], tmp, tmpstride, nPbW/2, nPbH/2);
+ s->hevcdsp.weighted_pred(s->sh.chroma_log2_weight_denom,
+ s->sh.chroma_weight_l1[current_mv.ref_idx[1]][1],
+ s->sh.chroma_offset_l1[current_mv.ref_idx[1]][1],
+ dst2, s->frame->linesize[2], tmp2, tmpstride, nPbW/2, nPbH/2);
+ } else {
+ s->hevcdsp.put_unweighted_pred(dst1, s->frame->linesize[1], tmp, tmpstride, nPbW/2, nPbH/2);
+ s->hevcdsp.put_unweighted_pred(dst2, s->frame->linesize[2], tmp2, tmpstride, nPbW/2, nPbH/2);
+ }
+ } else 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, tmp2[MAX_PB_SIZE * MAX_PB_SIZE]);
+ DECLARE_ALIGNED(16, int16_t, tmp3[MAX_PB_SIZE * MAX_PB_SIZE]);
+ DECLARE_ALIGNED(16, int16_t, tmp4[MAX_PB_SIZE * MAX_PB_SIZE]);
+ HEVCFrame *ref0 = refPicList[0].ref[current_mv.ref_idx[0]];
+ HEVCFrame *ref1 = refPicList[1].ref[current_mv.ref_idx[1]];
+
+ if (!ref0 || !ref1)
+ return;
+
+ luma_mc(s, tmp, tmpstride, ref0->frame,
+ &current_mv.mv[0], x0, y0, nPbW, nPbH);
+ luma_mc(s, tmp2, tmpstride, ref1->frame,
+ &current_mv.mv[1], x0, y0, nPbW, nPbH);
+
+ if ((s->sh.slice_type == P_SLICE && s->pps->weighted_pred_flag) ||
+ (s->sh.slice_type == B_SLICE && s->pps->weighted_bipred_flag)) {
+ s->hevcdsp.weighted_pred_avg(s->sh.luma_log2_weight_denom,
+ s->sh.luma_weight_l0[current_mv.ref_idx[0]],
+ s->sh.luma_weight_l1[current_mv.ref_idx[1]],
+ s->sh.luma_offset_l0[current_mv.ref_idx[0]],
+ s->sh.luma_offset_l1[current_mv.ref_idx[1]],
+ dst0, s->frame->linesize[0],
+ tmp, tmp2, tmpstride, nPbW, nPbH);
+ } else {
+ s->hevcdsp.put_weighted_pred_avg(dst0, s->frame->linesize[0],
+ tmp, tmp2, tmpstride, nPbW, nPbH);
+ }
+
+ chroma_mc(s, tmp, tmp2, tmpstride, ref0->frame,
+ &current_mv.mv[0], x0 / 2, y0 / 2, nPbW / 2, nPbH / 2);
+ chroma_mc(s, tmp3, tmp4, tmpstride, ref1->frame,
+ &current_mv.mv[1], x0 / 2, y0 / 2, nPbW / 2, nPbH / 2);
+
+ if ((s->sh.slice_type == P_SLICE && s->pps->weighted_pred_flag) ||
+ (s->sh.slice_type == B_SLICE && s->pps->weighted_bipred_flag)) {
+ s->hevcdsp.weighted_pred_avg(s->sh.chroma_log2_weight_denom,
+ s->sh.chroma_weight_l0[current_mv.ref_idx[0]][0],
+ s->sh.chroma_weight_l1[current_mv.ref_idx[1]][0],
+ s->sh.chroma_offset_l0[current_mv.ref_idx[0]][0],
+ s->sh.chroma_offset_l1[current_mv.ref_idx[1]][0],
+ dst1, s->frame->linesize[1], tmp, tmp3,
+ tmpstride, nPbW / 2, nPbH / 2);
+ s->hevcdsp.weighted_pred_avg(s->sh.chroma_log2_weight_denom,
+ s->sh.chroma_weight_l0[current_mv.ref_idx[0]][1],
+ s->sh.chroma_weight_l1[current_mv.ref_idx[1]][1],
+ s->sh.chroma_offset_l0[current_mv.ref_idx[0]][1],
+ s->sh.chroma_offset_l1[current_mv.ref_idx[1]][1],
+ dst2, s->frame->linesize[2], tmp2, tmp4,
+ tmpstride, nPbW / 2, nPbH / 2);
+ } else {
+ s->hevcdsp.put_weighted_pred_avg(dst1, s->frame->linesize[1], tmp, tmp3, tmpstride, nPbW/2, nPbH/2);
+ s->hevcdsp.put_weighted_pred_avg(dst2, s->frame->linesize[2], tmp2, tmp4, tmpstride, nPbW/2, nPbH/2);
+ }
+ }
+}
+
+/**
+ * 8.4.1
+ */
+static int luma_intra_pred_mode(HEVCContext *s, int x0, int y0, int pu_size,
+ int prev_intra_luma_pred_flag)
+{
+ HEVCLocalContext *lc = &s->HEVClc;
+ int x_pu = x0 >> s->sps->log2_min_pu_size;
+ int y_pu = y0 >> s->sps->log2_min_pu_size;
+ int min_pu_width = s->sps->min_pu_width;
+ int size_in_pus = pu_size >> s->sps->log2_min_pu_size;
+ int x0b = x0 & ((1 << s->sps->log2_ctb_size) - 1);
+ int y0b = y0 & ((1 << s->sps->log2_ctb_size) - 1);
+
+ int cand_up = (lc->ctb_up_flag || y0b) ?
+ s->tab_ipm[(y_pu - 1) * min_pu_width + x_pu] : INTRA_DC;
+ int cand_left = (lc->ctb_left_flag || x0b) ?
+ s->tab_ipm[y_pu * min_pu_width + x_pu - 1] : INTRA_DC;
+
+ int y_ctb = (y0 >> (s->sps->log2_ctb_size)) << (s->sps->log2_ctb_size);
+
+ MvField *tab_mvf = s->ref->tab_mvf;
+ int intra_pred_mode;
+ int candidate[3];
+ int i, j;
+
+ // intra_pred_mode prediction does not cross vertical CTB boundaries
+ if ((y0 - 1) < y_ctb)
+ cand_up = INTRA_DC;
+
+ if (cand_left == cand_up) {
+ if (cand_left < 2) {
+ candidate[0] = INTRA_PLANAR;
+ candidate[1] = INTRA_DC;
+ candidate[2] = INTRA_ANGULAR_26;
+ } else {
+ candidate[0] = cand_left;
+ candidate[1] = 2 + ((cand_left - 2 - 1 + 32) & 31);
+ candidate[2] = 2 + ((cand_left - 2 + 1) & 31);
+ }
+ } else {
+ candidate[0] = cand_left;
+ candidate[1] = cand_up;
+ if (candidate[0] != INTRA_PLANAR && candidate[1] != INTRA_PLANAR) {
+ candidate[2] = INTRA_PLANAR;
+ } else if (candidate[0] != INTRA_DC && candidate[1] != INTRA_DC) {
+ candidate[2] = INTRA_DC;
+ } else {
+ candidate[2] = INTRA_ANGULAR_26;
+ }
+ }
+
+ if (prev_intra_luma_pred_flag) {
+ intra_pred_mode = candidate[lc->pu.mpm_idx];
+ } else {
+ if (candidate[0] > candidate[1])
+ FFSWAP(uint8_t, candidate[0], candidate[1]);
+ if (candidate[0] > candidate[2])
+ FFSWAP(uint8_t, candidate[0], candidate[2]);
+ if (candidate[1] > candidate[2])
+ FFSWAP(uint8_t, candidate[1], candidate[2]);
+
+ intra_pred_mode = lc->pu.rem_intra_luma_pred_mode;
+ for (i = 0; i < 3; i++)
+ if (intra_pred_mode >= candidate[i])
+ intra_pred_mode++;
+ }
+
+ /* write the intra prediction units into the mv array */
+ if (!size_in_pus)
+ size_in_pus = 1;
+ for (i = 0; i < size_in_pus; i++) {
+ memset(&s->tab_ipm[(y_pu + i) * min_pu_width + x_pu],
+ intra_pred_mode, size_in_pus);
+
+ for (j = 0; j < size_in_pus; j++) {
+ tab_mvf[(y_pu + j) * min_pu_width + x_pu + i].is_intra = 1;
+ tab_mvf[(y_pu + j) * min_pu_width + x_pu + i].pred_flag[0] = 0;
+ tab_mvf[(y_pu + j) * min_pu_width + x_pu + i].pred_flag[1] = 0;
+ tab_mvf[(y_pu + j) * min_pu_width + x_pu + i].ref_idx[0] = 0;
+ tab_mvf[(y_pu + j) * min_pu_width + x_pu + i].ref_idx[1] = 0;
+ tab_mvf[(y_pu + j) * min_pu_width + x_pu + i].mv[0].x = 0;
+ tab_mvf[(y_pu + j) * min_pu_width + x_pu + i].mv[0].y = 0;
+ tab_mvf[(y_pu + j) * min_pu_width + x_pu + i].mv[1].x = 0;
+ tab_mvf[(y_pu + j) * min_pu_width + x_pu + i].mv[1].y = 0;
+ }
+ }
+
+ return intra_pred_mode;
+}
+
+static av_always_inline void set_ct_depth(HEVCContext *s, int x0, int y0,
+ int log2_cb_size, int ct_depth)
+{
+ int length = (1 << log2_cb_size) >> s->sps->log2_min_cb_size;
+ int x_cb = x0 >> s->sps->log2_min_cb_size;
+ int y_cb = y0 >> s->sps->log2_min_cb_size;
+ int y;
+
+ for (y = 0; y < length; y++)
+ memset(&s->tab_ct_depth[(y_cb + y) * s->sps->min_cb_width + x_cb],
+ ct_depth, length);
+}
+
+static void intra_prediction_unit(HEVCContext *s, int x0, int y0,
+ int log2_cb_size)
+{
+ HEVCLocalContext *lc = &s->HEVClc;
+ static const uint8_t intra_chroma_table[4] = { 0, 26, 10, 1 };
+ uint8_t prev_intra_luma_pred_flag[4];
+ int split = lc->cu.part_mode == PART_NxN;
+ int pb_size = (1 << log2_cb_size) >> split;
+ int side = split + 1;
+ int chroma_mode;
+ int i, j;
+
+ for (i = 0; i < side; i++)
+ for (j = 0; j < side; j++)
+ prev_intra_luma_pred_flag[2 * i + j] = ff_hevc_prev_intra_luma_pred_flag_decode(s);
+
+ for (i = 0; i < side; i++) {
+ for (j = 0; j < side; j++) {
+ if (prev_intra_luma_pred_flag[2 * i + j])
+ lc->pu.mpm_idx = ff_hevc_mpm_idx_decode(s);
+ else
+ lc->pu.rem_intra_luma_pred_mode = ff_hevc_rem_intra_luma_pred_mode_decode(s);
+
+ lc->pu.intra_pred_mode[2 * i + j] =
+ luma_intra_pred_mode(s, x0 + pb_size * j, y0 + pb_size * i, pb_size,
+ prev_intra_luma_pred_flag[2 * i + j]);
+ }
+ }
+
+ chroma_mode = ff_hevc_intra_chroma_pred_mode_decode(s);
+ if (chroma_mode != 4) {
+ if (lc->pu.intra_pred_mode[0] == intra_chroma_table[chroma_mode])
+ lc->pu.intra_pred_mode_c = 34;
+ else
+ lc->pu.intra_pred_mode_c = intra_chroma_table[chroma_mode];
+ } else {
+ lc->pu.intra_pred_mode_c = lc->pu.intra_pred_mode[0];
+ }
+}
+
+static void intra_prediction_unit_default_value(HEVCContext *s,
+ int x0, int y0,
+ int log2_cb_size)
+{
+ HEVCLocalContext *lc = &s->HEVClc;
+ int pb_size = 1 << log2_cb_size;
+ int size_in_pus = pb_size >> s->sps->log2_min_pu_size;
+ int min_pu_width = s->sps->min_pu_width;
+ MvField *tab_mvf = s->ref->tab_mvf;
+ int x_pu = x0 >> s->sps->log2_min_pu_size;
+ int y_pu = y0 >> s->sps->log2_min_pu_size;
+ int j, k;
+
+ if (size_in_pus == 0)
+ size_in_pus = 1;
+ for (j = 0; j < size_in_pus; j++) {
+ memset(&s->tab_ipm[(y_pu + j) * min_pu_width + x_pu], INTRA_DC, size_in_pus);
+ for (k = 0; k < size_in_pus; k++)
+ tab_mvf[(y_pu + j) * min_pu_width + x_pu + k].is_intra = lc->cu.pred_mode == MODE_INTRA;
+ }
+}
+
+static int hls_coding_unit(HEVCContext *s, int x0, int y0, int log2_cb_size)
+{
+ int cb_size = 1 << log2_cb_size;
+ HEVCLocalContext *lc = &s->HEVClc;
+ int log2_min_cb_size = s->sps->log2_min_cb_size;
+ int length = cb_size >> log2_min_cb_size;
+ 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, ret;
+
+ 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;
+ if (s->pps->transquant_bypass_enable_flag) {
+ lc->cu.cu_transquant_bypass_flag = ff_hevc_cu_transquant_bypass_flag_decode(s);
+ if (lc->cu.cu_transquant_bypass_flag)
+ set_deblocking_bypass(s, x0, y0, log2_cb_size);
+ } else
+ lc->cu.cu_transquant_bypass_flag = 0;
+
+ if (s->sh.slice_type != I_SLICE) {
+ uint8_t skip_flag = ff_hevc_skip_flag_decode(s, x0, y0, x_cb, y_cb);
+
+ lc->cu.pred_mode = MODE_SKIP;
+ x = y_cb * min_cb_width + x_cb;
+ for (y = 0; y < length; y++) {
+ memset(&s->skip_flag[x], skip_flag, length);
+ x += min_cb_width;
+ }
+ lc->cu.pred_mode = skip_flag ? MODE_SKIP : MODE_INTER;
+ }
+
+ if (SAMPLE_CTB(s->skip_flag, x_cb, y_cb)) {
+ hls_prediction_unit(s, x0, y0, cb_size, cb_size, log2_cb_size, 0);
+ intra_prediction_unit_default_value(s, x0, y0, log2_cb_size);
+
+ if (!s->sh.disable_deblocking_filter_flag)
+ ff_hevc_deblocking_boundary_strengths(s, x0, y0, log2_cb_size,
+ lc->slice_or_tiles_up_boundary,
+ lc->slice_or_tiles_left_boundary);
+ } else {
+ if (s->sh.slice_type != I_SLICE)
+ lc->cu.pred_mode = ff_hevc_pred_mode_decode(s);
+ if (lc->cu.pred_mode != MODE_INTRA ||
+ log2_cb_size == s->sps->log2_min_cb_size) {
+ lc->cu.part_mode = ff_hevc_part_mode_decode(s, log2_cb_size);
+ lc->cu.intra_split_flag = lc->cu.part_mode == PART_NxN &&
+ lc->cu.pred_mode == MODE_INTRA;
+ }
+
+ if (lc->cu.pred_mode == MODE_INTRA) {
+ if (lc->cu.part_mode == PART_2Nx2N && s->sps->pcm_enabled_flag &&
+ log2_cb_size >= s->sps->pcm.log2_min_pcm_cb_size &&
+ log2_cb_size <= s->sps->pcm.log2_max_pcm_cb_size) {
+ lc->cu.pcm_flag = ff_hevc_pcm_flag_decode(s);
+ }
+ if (lc->cu.pcm_flag) {
+ 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)
+ set_deblocking_bypass(s, x0, y0, log2_cb_size);
+
+ if (ret < 0)
+ return ret;
+ } else {
+ intra_prediction_unit(s, x0, y0, log2_cb_size);
+ }
+ } else {
+ intra_prediction_unit_default_value(s, x0, y0, log2_cb_size);
+ switch (lc->cu.part_mode) {
+ case PART_2Nx2N:
+ 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);
+ break;
+ case PART_Nx2N:
+ 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 / 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);
+ break;
+ case PART_nLx2N:
+ 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);
+ 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 + cb_size / 2, y0 + cb_size / 2, cb_size / 2, cb_size / 2, log2_cb_size, 3);
+ break;
+ }
+ }
+
+ if (!lc->cu.pcm_flag) {
+ if (lc->cu.pred_mode != MODE_INTRA &&
+ !(lc->cu.part_mode == PART_2Nx2N && lc->pu.merge_flag)) {
+ lc->cu.rqt_root_cbf = ff_hevc_no_residual_syntax_flag_decode(s);
+ }
+ if (lc->cu.rqt_root_cbf) {
+ 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;
+ 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,
+ lc->slice_or_tiles_up_boundary,
+ lc->slice_or_tiles_left_boundary);
+ }
+ }
+ }
+
+ if (s->pps->cu_qp_delta_enabled_flag && lc->tu.is_cu_qp_delta_coded == 0)
+ ff_hevc_set_qPy(s, x0, y0, x0, y0, log2_cb_size);
+
+ x = y_cb * min_cb_width + x_cb;
+ for (y = 0; y < length; y++) {
+ memset(&s->qp_y_tab[x], lc->qp_y, length);
+ x += min_cb_width;
+ }
+
+ set_ct_depth(s, x0, y0, log2_cb_size, lc->ct.depth);
+
+ return 0;
+}
+
+static int hls_coding_quadtree(HEVCContext *s, int x0, int y0,
+ int log2_cb_size, int cb_depth)
+{
+ HEVCLocalContext *lc = &s->HEVClc;
+ const int cb_size = 1 << log2_cb_size;
+
+ lc->ct.depth = cb_depth;
+ 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);
+ } else {
+ SAMPLE(s->split_cu_flag, x0, y0) =
+ (log2_cb_size > s->sps->log2_min_cb_size);
+ }
+ if (s->pps->cu_qp_delta_enabled_flag &&
+ log2_cb_size >= s->sps->log2_ctb_size - s->pps->diff_cu_qp_delta_depth) {
+ lc->tu.is_cu_qp_delta_coded = 0;
+ lc->tu.cu_qp_delta = 0;
+ }
+
+ if (SAMPLE(s->split_cu_flag, x0, y0)) {
+ const int cb_size_split = cb_size >> 1;
+ const int x1 = x0 + cb_size_split;
+ const int y1 = y0 + cb_size_split;
+
+ log2_cb_size--;
+ cb_depth++;
+
+#define SUBDIVIDE(x, y) \
+do { \
+ if (x < s->sps->width && y < s->sps->height) { \
+ int ret = hls_coding_quadtree(s, x, y, log2_cb_size, cb_depth);\
+ if (ret < 0) \
+ return ret; \
+ } \
+} while (0)
+
+ SUBDIVIDE(x0, y0);
+ SUBDIVIDE(x1, y0);
+ SUBDIVIDE(x0, y1);
+ SUBDIVIDE(x1, y1);
+ } else {
+ int ret = hls_coding_unit(s, x0, y0, log2_cb_size);
+ if (ret < 0)
+ return ret;
+ }
+
+ return 0;
+}
+
+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, tile_up_boundary;
+ int slice_left_boundary, slice_up_boundary;
+
+ s->tab_slice_address[ctb_addr_rs] = s->sh.slice_addr;
+
+ if (s->pps->entropy_coding_sync_enabled_flag) {
+ if (x_ctb == 0 && (y_ctb & (ctb_size - 1)) == 0)
+ lc->first_qp_group = 1;
+ lc->end_of_tiles_x = s->sps->width;
+ } 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;
+ }
+ } else {
+ lc->end_of_tiles_x = s->sps->width;
+ }
+
+ 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];
+ } 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]]));
+}
+
+static int hls_slice_data(HEVCContext *s)
+{
+ int ctb_size = 1 << s->sps->log2_ctb_size;
+ int more_data = 1;
+ int x_ctb = 0;
+ int y_ctb = 0;
+ int ctb_addr_ts = s->pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs];
+ int ret;
+
+ 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;
+ hls_decode_neighbour(s, x_ctb, y_ctb, ctb_addr_ts);
+
+ ff_hevc_cabac_init(s, ctb_addr_ts);
+
+ hls_sao_param(s, x_ctb >> s->sps->log2_ctb_size, y_ctb >> s->sps->log2_ctb_size);
+
+ s->deblock[ctb_addr_rs].beta_offset = s->sh.beta_offset;
+ s->deblock[ctb_addr_rs].tc_offset = s->sh.tc_offset;
+ s->filter_slice_edges[ctb_addr_rs] = s->sh.slice_loop_filter_across_slices_enabled_flag;
+
+ ret = hls_coding_quadtree(s, x_ctb, y_ctb, s->sps->log2_ctb_size, 0);
+ if (ret < 0)
+ return ret;
+ more_data = !ff_hevc_end_of_slice_flag_decode(s);
+
+ ctb_addr_ts++;
+ ff_hevc_save_states(s, ctb_addr_ts);
+ ff_hevc_hls_filters(s, x_ctb, y_ctb, ctb_size);
+ }
+
+ if (x_ctb + ctb_size >= s->sps->width &&
+ y_ctb + ctb_size >= s->sps->height)
+ ff_hevc_hls_filter(s, x_ctb, y_ctb);
+
+ return ctb_addr_ts;
+}
+
+/**
+ * @return AVERROR_INVALIDDATA if the packet is not a valid NAL unit,
+ * 0 if the unit should be skipped, 1 otherwise
+ */
+static int hls_nal_unit(HEVCContext *s)
+{
+ GetBitContext *gb = &s->HEVClc.gb;
+ int nuh_layer_id;
+
+ if (get_bits1(gb) != 0)
+ return AVERROR_INVALIDDATA;
+
+ s->nal_unit_type = get_bits(gb, 6);
+
+ nuh_layer_id = get_bits(gb, 6);
+ s->temporal_id = get_bits(gb, 3) - 1;
+ if (s->temporal_id < 0)
+ return AVERROR_INVALIDDATA;
+
+ av_log(s->avctx, AV_LOG_DEBUG,
+ "nal_unit_type: %d, nuh_layer_id: %dtemporal_id: %d\n",
+ s->nal_unit_type, nuh_layer_id, s->temporal_id);
+
+ return nuh_layer_id == 0;
+}
+
+static void restore_tqb_pixels(HEVCContext *s)
+{
+ 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++) {
+ ptrdiff_t stride = s->frame->linesize[c_idx];
+ int hshift = s->sps->hshift[c_idx];
+ int vshift = s->sps->vshift[c_idx];
+ for (y = 0; y < s->sps->min_pu_height; y++) {
+ for (x = 0; x < s->sps->min_pu_width; x++) {
+ if (s->is_pcm[y * s->sps->min_pu_width + x]) {
+ int n;
+ int len = min_pu_size >> hshift;
+ uint8_t *src = &s->frame->data[c_idx][((y << s->sps->log2_min_pu_size) >> vshift) * stride + (((x << s->sps->log2_min_pu_size) >> hshift) << s->sps->pixel_shift)];
+ uint8_t *dst = &s->sao_frame->data[c_idx][((y << s->sps->log2_min_pu_size) >> vshift) * stride + (((x << s->sps->log2_min_pu_size) >> hshift) << s->sps->pixel_shift)];
+ for (n = 0; n < (min_pu_size >> vshift); n++) {
+ memcpy(dst, src, len);
+ src += stride;
+ dst += stride;
+ }
+ }
+ }
+ }
+ }
+}
+
+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;
+ 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);
+
+ 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;
+
+ ret = ff_hevc_set_new_ref(s, s->sps->sao_enabled ? &s->sao_frame : &s->frame,
+ s->poc);
+ if (ret < 0)
+ 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)
+ goto fail;
+
+ ff_thread_finish_setup(s->avctx);
+
+ return 0;
+
+fail:
+ if (s->ref)
+ ff_thread_report_progress(&s->ref->tf, INT_MAX, 0);
+ s->ref = NULL;
+ return ret;
+}
+
+static int decode_nal_unit(HEVCContext *s, const uint8_t *nal, int length)
+{
+ HEVCLocalContext *lc = &s->HEVClc;
+ GetBitContext *gb = &lc->gb;
+ int ctb_addr_ts, ret;
+
+ ret = init_get_bits8(gb, nal, length);
+ if (ret < 0)
+ return ret;
+
+ ret = hls_nal_unit(s);
+ if (ret < 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid NAL unit %d, skipping.\n",
+ s->nal_unit_type);
+ goto fail;
+ } else if (!ret)
+ return 0;
+
+ switch (s->nal_unit_type) {
+ case NAL_VPS:
+ ret = ff_hevc_decode_nal_vps(s);
+ if (ret < 0)
+ goto fail;
+ break;
+ case NAL_SPS:
+ ret = ff_hevc_decode_nal_sps(s);
+ if (ret < 0)
+ goto fail;
+ break;
+ case NAL_PPS:
+ ret = ff_hevc_decode_nal_pps(s);
+ if (ret < 0)
+ goto fail;
+ break;
+ case NAL_SEI_PREFIX:
+ case NAL_SEI_SUFFIX:
+ ret = ff_hevc_decode_nal_sei(s);
+ if (ret < 0)
+ goto fail;
+ break;
+ case NAL_TRAIL_R:
+ case NAL_TRAIL_N:
+ case NAL_TSA_N:
+ case NAL_TSA_R:
+ case NAL_STSA_N:
+ case NAL_STSA_R:
+ case NAL_BLA_W_LP:
+ case NAL_BLA_W_RADL:
+ case NAL_BLA_N_LP:
+ case NAL_IDR_W_RADL:
+ case NAL_IDR_N_LP:
+ case NAL_CRA_NUT:
+ case NAL_RADL_N:
+ case NAL_RADL_R:
+ case NAL_RASL_N:
+ case NAL_RASL_R:
+ ret = hls_slice_header(s);
+ if (ret < 0)
+ return ret;
+
+ if (s->max_ra == INT_MAX) {
+ if (s->nal_unit_type == NAL_CRA_NUT || IS_BLA(s)) {
+ s->max_ra = s->poc;
+ } else {
+ if (IS_IDR(s))
+ s->max_ra = INT_MIN;
+ }
+ }
+
+ if ((s->nal_unit_type == NAL_RASL_R || s->nal_unit_type == NAL_RASL_N) &&
+ s->poc <= s->max_ra) {
+ s->is_decoded = 0;
+ break;
+ } else {
+ if (s->nal_unit_type == NAL_RASL_R && s->poc > s->max_ra)
+ s->max_ra = INT_MIN;
+ }
+
+ if (s->sh.first_slice_in_pic_flag) {
+ ret = hevc_frame_start(s);
+ if (ret < 0)
+ 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;
+ }
+
+ if (!s->sh.dependent_slice_segment_flag &&
+ s->sh.slice_type != I_SLICE) {
+ ret = ff_hevc_slice_rpl(s);
+ if (ret < 0) {
+ av_log(s->avctx, AV_LOG_WARNING,
+ "Error constructing the reference lists for the current slice.\n");
+ goto fail;
+ }
+ }
+
+ 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 ||
+ (s->sps->pcm.loop_filter_disable_flag && s->sps->pcm_enabled_flag)) &&
+ s->sps->sao_enabled)
+ restore_tqb_pixels(s);
+ }
+
+ if (ctb_addr_ts < 0) {
+ ret = ctb_addr_ts;
+ goto fail;
+ }
+ break;
+ case NAL_EOS_NUT:
+ case NAL_EOB_NUT:
+ s->seq_decode = (s->seq_decode + 1) & 0xff;
+ s->max_ra = INT_MAX;
+ break;
+ case NAL_AUD:
+ case NAL_FD_NUT:
+ break;
+ default:
+ av_log(s->avctx, AV_LOG_INFO,
+ "Skipping NAL unit %d\n", s->nal_unit_type);
+ }
+
+ 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. */
+static int extract_rbsp(const uint8_t *src, int length,
+ HEVCNAL *nal)
+{
+ int i, si, di;
+ uint8_t *dst;
+
+#define STARTCODE_TEST \
+ if (i + 2 < length && src[i + 1] == 0 && src[i + 2] <= 3) { \
+ if (src[i + 2] != 3) { \
+ /* startcode, so we must be past the end */ \
+ length = i; \
+ } \
+ break; \
+ }
+#if HAVE_FAST_UNALIGNED
+#define FIND_FIRST_ZERO \
+ if (i > 0 && !src[i]) \
+ i--; \
+ while (src[i]) \
+ i++
+#if HAVE_FAST_64BIT
+ for (i = 0; i + 1 < length; i += 9) {
+ if (!((~AV_RN64A(src + i) &
+ (AV_RN64A(src + i) - 0x0100010001000101ULL)) &
+ 0x8000800080008080ULL))
+ continue;
+ FIND_FIRST_ZERO;
+ STARTCODE_TEST;
+ i -= 7;
+ }
+#else
+ for (i = 0; i + 1 < length; i += 5) {
+ if (!((~AV_RN32A(src + i) &
+ (AV_RN32A(src + i) - 0x01000101U)) &
+ 0x80008080U))
+ continue;
+ FIND_FIRST_ZERO;
+ STARTCODE_TEST;
+ i -= 3;
+ }
+#endif /* HAVE_FAST_64BIT */
+#else
+ for (i = 0; i + 1 < length; i += 2) {
+ if (src[i])
+ continue;
+ if (i > 0 && src[i - 1] == 0)
+ i--;
+ STARTCODE_TEST;
+ }
+#endif /* HAVE_FAST_UNALIGNED */
+
+ if (i >= length - 1) { // no escaped 0
+ nal->data = src;
+ nal->size = length;
+ return length;
+ }
+
+ av_fast_malloc(&nal->rbsp_buffer, &nal->rbsp_buffer_size,
+ length + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!nal->rbsp_buffer)
+ return AVERROR(ENOMEM);
+
+ dst = nal->rbsp_buffer;
+
+ memcpy(dst, src, i);
+ si = di = i;
+ while (si + 2 < length) {
+ // remove escapes (very rare 1:2^22)
+ if (src[si + 2] > 3) {
+ dst[di++] = src[si++];
+ dst[di++] = src[si++];
+ } else if (src[si] == 0 && src[si + 1] == 0) {
+ if (src[si + 2] == 3) { // escape
+ dst[di++] = 0;
+ dst[di++] = 0;
+ si += 3;
+
+ continue;
+ } else // next start code
+ goto nsc;
+ }
+
+ dst[di++] = src[si++];
+ }
+ while (si < length)
+ dst[di++] = src[si++];
+
+nsc:
+ memset(dst + di, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+
+ nal->data = dst;
+ nal->size = di;
+ return si;
+}
+
+static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length)
+{
+ int i, consumed, ret = 0;
+
+ s->ref = NULL;
+ s->eos = 0;
+
+ /* split the input packet into NAL units, so we know the upper bound on the
+ * number of slices in the frame */
+ s->nb_nals = 0;
+ while (length >= 4) {
+ HEVCNAL *nal;
+ int extract_length = 0;
+
+ if (s->is_nalff) {
+ int i;
+ for (i = 0; i < s->nal_length_size; i++)
+ extract_length = (extract_length << 8) | buf[i];
+ buf += s->nal_length_size;
+ length -= s->nal_length_size;
+
+ if (extract_length > length) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid NAL unit size.\n");
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
+ } else {
+ if (buf[2] == 0) {
+ length--;
+ buf++;
+ continue;
+ }
+ if (buf[0] != 0 || buf[1] != 0 || buf[2] != 1) {
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
+
+ buf += 3;
+ length -= 3;
+ extract_length = length;
+ }
+
+ if (s->nals_allocated < s->nb_nals + 1) {
+ int new_size = s->nals_allocated + 1;
+ HEVCNAL *tmp = av_realloc_array(s->nals, new_size, sizeof(*tmp));
+ if (!tmp) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ s->nals = tmp;
+ memset(s->nals + s->nals_allocated, 0,
+ (new_size - s->nals_allocated) * sizeof(*tmp));
+ s->nals_allocated = new_size;
+ }
+ nal = &s->nals[s->nb_nals++];
+
+ consumed = extract_rbsp(buf, extract_length, nal);
+ if (consumed < 0) {
+ ret = consumed;
+ goto fail;
+ }
+
+ ret = init_get_bits8(&s->HEVClc.gb, nal->data, nal->size);
+ if (ret < 0)
+ goto fail;
+ hls_nal_unit(s);
+
+ if (s->nal_unit_type == NAL_EOB_NUT ||
+ s->nal_unit_type == NAL_EOS_NUT)
+ s->eos = 1;
+
+ buf += consumed;
+ length -= consumed;
+ }
+
+ /* parse the NAL units */
+ for (i = 0; i < s->nb_nals; i++) {
+ int ret = decode_nal_unit(s, s->nals[i].data, s->nals[i].size);
+ if (ret < 0) {
+ av_log(s->avctx, AV_LOG_WARNING,
+ "Error parsing NAL unit #%d.\n", i);
+ goto fail;
+ }
+ }
+
+fail:
+ if (s->ref)
+ ff_thread_report_progress(&s->ref->tf, INT_MAX, 0);
+
+ return ret;
+}
+
+static void print_md5(void *log_ctx, int level, uint8_t md5[16])
+{
+ int i;
+ for (i = 0; i < 16; i++)
+ av_log(log_ctx, level, "%02"PRIx8, md5[i]);
+}
+
+static int verify_md5(HEVCContext *s, AVFrame *frame)
+{
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
+ int pixel_shift;
+ int i, j;
+
+ if (!desc)
+ return AVERROR(EINVAL);
+
+ pixel_shift = desc->comp[0].depth_minus1 > 7;
+
+ av_log(s->avctx, AV_LOG_DEBUG, "Verifying checksum for frame with POC %d: ",
+ s->poc);
+
+ /* the checksums are LE, so we have to byteswap for >8bpp formats
+ * on BE arches */
+#if HAVE_BIGENDIAN
+ if (pixel_shift && !s->checksum_buf) {
+ av_fast_malloc(&s->checksum_buf, &s->checksum_buf_size,
+ FFMAX3(frame->linesize[0], frame->linesize[1],
+ frame->linesize[2]));
+ if (!s->checksum_buf)
+ return AVERROR(ENOMEM);
+ }
+#endif
+
+ for (i = 0; frame->data[i]; i++) {
+ int width = s->avctx->coded_width;
+ int height = s->avctx->coded_height;
+ int w = (i == 1 || i == 2) ? (width >> desc->log2_chroma_w) : width;
+ int h = (i == 1 || i == 2) ? (height >> desc->log2_chroma_h) : height;
+ uint8_t md5[16];
+
+ av_md5_init(s->md5_ctx);
+ for (j = 0; j < h; j++) {
+ const uint8_t *src = frame->data[i] + j * frame->linesize[i];
+#if HAVE_BIGENDIAN
+ if (pixel_shift) {
+ s->dsp.bswap16_buf((uint16_t*)s->checksum_buf,
+ (const uint16_t*)src, w);
+ src = s->checksum_buf;
+ }
+#endif
+ av_md5_update(s->md5_ctx, src, w << pixel_shift);
+ }
+ av_md5_final(s->md5_ctx, md5);
+
+ if (!memcmp(md5, s->md5[i], 16)) {
+ av_log (s->avctx, AV_LOG_DEBUG, "plane %d - correct ", i);
+ print_md5(s->avctx, AV_LOG_DEBUG, md5);
+ av_log (s->avctx, AV_LOG_DEBUG, "; ");
+ } else {
+ av_log (s->avctx, AV_LOG_ERROR, "mismatching checksum of plane %d - ", i);
+ print_md5(s->avctx, AV_LOG_ERROR, md5);
+ av_log (s->avctx, AV_LOG_ERROR, " != ");
+ print_md5(s->avctx, AV_LOG_ERROR, s->md5[i]);
+ av_log (s->avctx, AV_LOG_ERROR, "\n");
+ return AVERROR_INVALIDDATA;
+ }
+ }
+
+ av_log(s->avctx, AV_LOG_DEBUG, "\n");
+
+ return 0;
+}
+
+static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output,
+ AVPacket *avpkt)
+{
+ int ret;
+ HEVCContext *s = avctx->priv_data;
+
+ if (!avpkt->size) {
+ ret = ff_hevc_output_frame(s, data, 1);
+ if (ret < 0)
+ return ret;
+
+ *got_output = ret;
+ return 0;
+ }
+
+ s->ref = NULL;
+ 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 &&
+ s->is_md5) {
+ ret = verify_md5(s, s->ref->frame);
+ if (ret < 0 && avctx->err_recognition & AV_EF_EXPLODE) {
+ ff_hevc_unref_frame(s, s->ref, ~0);
+ return ret;
+ }
+ }
+ s->is_md5 = 0;
+
+ if (s->is_decoded) {
+ av_log(avctx, AV_LOG_DEBUG, "Decoded frame with POC %d.\n", s->poc);
+ s->is_decoded = 0;
+ }
+
+ if (s->output_frame->buf[0]) {
+ av_frame_move_ref(data, s->output_frame);
+ *got_output = 1;
+ }
+
+ return avpkt->size;
+}
+
+static int hevc_ref_frame(HEVCContext *s, HEVCFrame *dst, HEVCFrame *src)
+{
+ int ret = ff_thread_ref_frame(&dst->tf, &src->tf);
+ if (ret < 0)
+ return ret;
+
+ dst->tab_mvf_buf = av_buffer_ref(src->tab_mvf_buf);
+ if (!dst->tab_mvf_buf)
+ goto fail;
+ dst->tab_mvf = src->tab_mvf;
+
+ dst->rpl_tab_buf = av_buffer_ref(src->rpl_tab_buf);
+ if (!dst->rpl_tab_buf)
+ goto fail;
+ dst->rpl_tab = src->rpl_tab;
+
+ dst->rpl_buf = av_buffer_ref(src->rpl_buf);
+ if (!dst->rpl_buf)
+ goto fail;
+
+ dst->poc = src->poc;
+ dst->ctb_count = src->ctb_count;
+ dst->window = src->window;
+ dst->flags = src->flags;
+ dst->sequence = src->sequence;
+
+ return 0;
+fail:
+ ff_hevc_unref_frame(s, dst, ~0);
+ return AVERROR(ENOMEM);
+}
+
+static av_cold int hevc_decode_free(AVCodecContext *avctx)
+{
+ HEVCContext *s = avctx->priv_data;
+ int i;
+
+ pic_arrays_free(s);
+
+ av_freep(&s->md5_ctx);
+
+ av_frame_free(&s->tmp_frame);
+ av_frame_free(&s->output_frame);
+
+ for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
+ ff_hevc_unref_frame(s, &s->DPB[i], ~0);
+ av_frame_free(&s->DPB[i].frame);
+ }
+
+ for (i = 0; i < FF_ARRAY_ELEMS(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++)
+ av_buffer_unref(&s->pps_list[i]);
+
+ for (i = 0; i < s->nals_allocated; i++)
+ av_freep(&s->nals[i].rbsp_buffer);
+ av_freep(&s->nals);
+ s->nals_allocated = 0;
+
+ return 0;
+}
+
+static av_cold int hevc_init_context(AVCodecContext *avctx)
+{
+ HEVCContext *s = avctx->priv_data;
+ int i;
+
+ s->avctx = avctx;
+
+ s->tmp_frame = av_frame_alloc();
+ if (!s->tmp_frame)
+ goto fail;
+
+ s->output_frame = av_frame_alloc();
+ if (!s->output_frame)
+ goto fail;
+
+ for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
+ s->DPB[i].frame = av_frame_alloc();
+ if (!s->DPB[i].frame)
+ goto fail;
+ s->DPB[i].tf.f = s->DPB[i].frame;
+ }
+
+ s->max_ra = INT_MAX;
+
+ s->md5_ctx = av_md5_alloc();
+ if (!s->md5_ctx)
+ goto fail;
+
+ ff_dsputil_init(&s->dsp, avctx);
+
+ s->context_initialized = 1;
+
+ return 0;
+
+fail:
+ hevc_decode_free(avctx);
+ return AVERROR(ENOMEM);
+}
+
+static int hevc_update_thread_context(AVCodecContext *dst,
+ const AVCodecContext *src)
+{
+ HEVCContext *s = dst->priv_data;
+ HEVCContext *s0 = src->priv_data;
+ int i, ret;
+
+ if (!s->context_initialized) {
+ ret = hevc_init_context(dst);
+ if (ret < 0)
+ return ret;
+ }
+
+ for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
+ ff_hevc_unref_frame(s, &s->DPB[i], ~0);
+ if (s0->DPB[i].frame->buf[0]) {
+ ret = hevc_ref_frame(s, &s->DPB[i], &s0->DPB[i]);
+ if (ret < 0)
+ return ret;
+ }
+ }
+
+ 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]) {
+ s->sps_list[i] = av_buffer_ref(s0->sps_list[i]);
+ if (!s->sps_list[i])
+ return AVERROR(ENOMEM);
+ }
+ }
+
+ for (i = 0; i < FF_ARRAY_ELEMS(s->pps_list); i++) {
+ av_buffer_unref(&s->pps_list[i]);
+ if (s0->pps_list[i]) {
+ s->pps_list[i] = av_buffer_ref(s0->pps_list[i]);
+ if (!s->pps_list[i])
+ return AVERROR(ENOMEM);
+ }
+ }
+
+ 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;
+ s->max_ra = s0->max_ra;
+
+ s->is_nalff = s0->is_nalff;
+ s->nal_length_size = s0->nal_length_size;
+
+ if (s0->eos) {
+ s->seq_decode = (s->seq_decode + 1) & 0xff;
+ s->max_ra = INT_MAX;
+ }
+
+ return 0;
+}
+
+static int hevc_decode_extradata(HEVCContext *s)
+{
+ AVCodecContext *avctx = s->avctx;
+ GetByteContext gb;
+ int ret;
+
+ bytestream2_init(&gb, avctx->extradata, avctx->extradata_size);
+
+ if (avctx->extradata_size > 3 &&
+ (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
+ * 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;
+
+ bytestream2_skip(&gb, 21);
+ nal_len_size = (bytestream2_get_byte(&gb) & 3) + 1;
+ num_arrays = bytestream2_get_byte(&gb);
+
+ /* nal units in the hvcC always have length coded with 2 bytes,
+ * so put a fake nal_length_size = 2 while parsing them */
+ s->nal_length_size = 2;
+
+ /* Decode nal units from hvcC. */
+ for (i = 0; i < num_arrays; i++) {
+ int type = bytestream2_get_byte(&gb) & 0x3f;
+ int cnt = bytestream2_get_be16(&gb);
+
+ for (j = 0; j < cnt; j++) {
+ // +2 for the nal size field
+ int nalsize = bytestream2_peek_be16(&gb) + 2;
+ if (bytestream2_get_bytes_left(&gb) < nalsize) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Invalid NAL unit size in extradata.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ 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);
+ return ret;
+ }
+ bytestream2_skip(&gb, nalsize);
+ }
+ }
+
+ /* 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;
+ ret = decode_nal_units(s, avctx->extradata, avctx->extradata_size);
+ if (ret < 0)
+ return ret;
+ }
+ return 0;
+}
+
+static av_cold int hevc_decode_init(AVCodecContext *avctx)
+{
+ HEVCContext *s = avctx->priv_data;
+ int ret;
+
+ ff_init_cabac_states();
+
+ avctx->internal->allocate_progress = 1;
+
+ ret = hevc_init_context(avctx);
+ if (ret < 0)
+ return ret;
+
+ if (avctx->extradata_size > 0 && avctx->extradata) {
+ ret = hevc_decode_extradata(s);
+ if (ret < 0) {
+ hevc_decode_free(avctx);
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
+static av_cold int hevc_init_thread_copy(AVCodecContext *avctx)
+{
+ HEVCContext *s = avctx->priv_data;
+ int ret;
+
+ memset(s, 0, sizeof(*s));
+
+ ret = hevc_init_context(avctx);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+static void hevc_decode_flush(AVCodecContext *avctx)
+{
+ HEVCContext *s = avctx->priv_data;
+ ff_hevc_flush_dpb(s);
+ s->max_ra = INT_MAX;
+}
+
+#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[] = {
+ { "apply_defdispwin", "Apply default display window from VUI", OFFSET(apply_defdispwin),
+ AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, PAR },
+ { NULL },
+};
+
+static const AVClass hevc_decoder_class = {
+ .class_name = "HEVC decoder",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+AVCodec ff_hevc_decoder = {
+ .name = "hevc",
+ .long_name = NULL_IF_CONFIG_SMALL("HEVC (High Efficiency Video Coding)"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_HEVC,
+ .priv_data_size = sizeof(HEVCContext),
+ .priv_class = &hevc_decoder_class,
+ .init = hevc_decode_init,
+ .close = hevc_decode_free,
+ .decode = hevc_decode_frame,
+ .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_FRAME_THREADS,
+ .profiles = NULL_IF_CONFIG_SMALL(profiles),
+};

libav-v10.1.tar.bz2/libavcodec/hevc.h Added

@@ -0,0 +1,1003 @@
+/*
+ * HEVC video decoder
+ *
+ * Copyright (C) 2012 - 2013 Guillaume Martres
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_HEVC_H
+#define AVCODEC_HEVC_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "libavutil/buffer.h"
+#include "libavutil/md5.h"
+
+#include "avcodec.h"
+#include "cabac.h"
+#include "dsputil.h"
+#include "get_bits.h"
+#include "hevcdsp.h"
+#include "internal.h"
+#include "thread.h"
+#include "videodsp.h"
+
+#define MAX_DPB_SIZE 16 // A.4.1
+#define MAX_REFS 16
+
+/**
+ * 7.4.2.1
+ */
+#define MAX_SUB_LAYERS 7
+#define MAX_VPS_COUNT 16
+#define MAX_SPS_COUNT 32
+#define MAX_PPS_COUNT 256
+#define MAX_SHORT_TERM_RPS_COUNT 64
+#define MAX_CU_SIZE 128
+
+//TODO: check if this is really the maximum
+#define MAX_TRANSFORM_DEPTH 5
+
+#define MAX_TB_SIZE 32
+#define MAX_PB_SIZE 64
+#define MAX_LOG2_CTB_SIZE 6
+#define MAX_QP 51
+#define DEFAULT_INTRA_TC_OFFSET 2
+
+#define HEVC_CONTEXTS 183
+
+#define MRG_MAX_NUM_CANDS 5
+
+#define L0 0
+#define L1 1
+
+#define EPEL_EXTRA_BEFORE 1
+#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.
+ */
+#define SAMPLE(tab, x, y) ((tab)[(y) * s->sps->width + (x)])
+#define SAMPLE_CTB(tab, x, y) ((tab)[(y) * min_cb_width + (x)])
+#define SAMPLE_CBF(tab, x, y) ((tab)[((y) & ((1<<log2_trafo_size)-1)) * MAX_CU_SIZE + ((x) & ((1<<log2_trafo_size)-1))])
+
+#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)
+
+#define FFUDIV(a,b) (((a) > 0 ? (a) : (a) - (b) + 1) / (b))
+#define FFUMOD(a,b) ((a) - (b) * FFUDIV(a,b))
+
+/**
+ * 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,
+};
+
+enum RPSType {
+ ST_CURR_BEF = 0,
+ ST_CURR_AFT,
+ ST_FOLL,
+ LT_CURR,
+ LT_FOLL,
+ NB_RPS_TYPE,
+};
+
+enum SliceType {
+ B_SLICE = 0,
+ P_SLICE = 1,
+ I_SLICE = 2,
+};
+
+enum SyntaxElement {
+ SAO_MERGE_FLAG = 0,
+ SAO_TYPE_IDX,
+ SAO_EO_CLASS,
+ SAO_BAND_POSITION,
+ SAO_OFFSET_ABS,
+ SAO_OFFSET_SIGN,
+ END_OF_SLICE_FLAG,
+ SPLIT_CODING_UNIT_FLAG,
+ CU_TRANSQUANT_BYPASS_FLAG,
+ SKIP_FLAG,
+ CU_QP_DELTA,
+ PRED_MODE_FLAG,
+ PART_MODE,
+ PCM_FLAG,
+ PREV_INTRA_LUMA_PRED_FLAG,
+ MPM_IDX,
+ REM_INTRA_LUMA_PRED_MODE,
+ INTRA_CHROMA_PRED_MODE,
+ MERGE_FLAG,
+ MERGE_IDX,
+ INTER_PRED_IDC,
+ REF_IDX_L0,
+ REF_IDX_L1,
+ ABS_MVD_GREATER0_FLAG,
+ ABS_MVD_GREATER1_FLAG,
+ ABS_MVD_MINUS2,
+ MVD_SIGN_FLAG,
+ MVP_LX_FLAG,
+ NO_RESIDUAL_DATA_FLAG,
+ SPLIT_TRANSFORM_FLAG,
+ CBF_LUMA,
+ CBF_CB_CR,
+ TRANSFORM_SKIP_FLAG,
+ LAST_SIGNIFICANT_COEFF_X_PREFIX,
+ LAST_SIGNIFICANT_COEFF_Y_PREFIX,
+ LAST_SIGNIFICANT_COEFF_X_SUFFIX,
+ LAST_SIGNIFICANT_COEFF_Y_SUFFIX,
+ SIGNIFICANT_COEFF_GROUP_FLAG,
+ SIGNIFICANT_COEFF_FLAG,
+ COEFF_ABS_LEVEL_GREATER1_FLAG,
+ COEFF_ABS_LEVEL_GREATER2_FLAG,
+ COEFF_ABS_LEVEL_REMAINING,
+ COEFF_SIGN_FLAG,
+};
+
+enum PartMode {
+ PART_2Nx2N = 0,
+ PART_2NxN = 1,
+ PART_Nx2N = 2,
+ PART_NxN = 3,
+ PART_2NxnU = 4,
+ PART_2NxnD = 5,
+ PART_nLx2N = 6,
+ PART_nRx2N = 7,
+};
+
+enum PredMode {
+ MODE_INTER = 0,
+ MODE_INTRA,
+ MODE_SKIP,
+};
+
+enum InterPredIdc {
+ PRED_L0 = 0,
+ PRED_L1,
+ PRED_BI,
+};
+
+enum IntraPredMode {
+ INTRA_PLANAR = 0,
+ INTRA_DC,
+ INTRA_ANGULAR_2,
+ INTRA_ANGULAR_3,
+ INTRA_ANGULAR_4,
+ INTRA_ANGULAR_5,
+ INTRA_ANGULAR_6,
+ INTRA_ANGULAR_7,
+ INTRA_ANGULAR_8,
+ INTRA_ANGULAR_9,
+ INTRA_ANGULAR_10,
+ INTRA_ANGULAR_11,
+ INTRA_ANGULAR_12,
+ INTRA_ANGULAR_13,
+ INTRA_ANGULAR_14,
+ INTRA_ANGULAR_15,
+ INTRA_ANGULAR_16,
+ INTRA_ANGULAR_17,
+ INTRA_ANGULAR_18,
+ INTRA_ANGULAR_19,
+ INTRA_ANGULAR_20,
+ INTRA_ANGULAR_21,
+ INTRA_ANGULAR_22,
+ INTRA_ANGULAR_23,
+ INTRA_ANGULAR_24,
+ INTRA_ANGULAR_25,
+ INTRA_ANGULAR_26,
+ INTRA_ANGULAR_27,
+ INTRA_ANGULAR_28,
+ INTRA_ANGULAR_29,
+ INTRA_ANGULAR_30,
+ INTRA_ANGULAR_31,
+ INTRA_ANGULAR_32,
+ INTRA_ANGULAR_33,
+ INTRA_ANGULAR_34,
+};
+
+enum SAOType {
+ SAO_NOT_APPLIED = 0,
+ SAO_BAND,
+ SAO_EDGE,
+};
+
+enum SAOEOClass {
+ SAO_EO_HORIZ = 0,
+ SAO_EO_VERT,
+ SAO_EO_135D,
+ SAO_EO_45D,
+};
+
+enum ScanType {
+ SCAN_DIAG = 0,
+ SCAN_HORIZ,
+ SCAN_VERT,
+};
+
+typedef struct ShortTermRPS {
+ unsigned int num_negative_pics;
+ int num_delta_pocs;
+ int32_t delta_poc[32];
+ uint8_t used[32];
+} ShortTermRPS;
+
+typedef struct LongTermRPS {
+ int poc[32];
+ uint8_t used[32];
+ uint8_t nb_refs;
+} LongTermRPS;
+
+typedef struct RefPicList {
+ struct HEVCFrame *ref[MAX_REFS];
+ int list[MAX_REFS];
+ int isLongTerm[MAX_REFS];
+ int nb_refs;
+} RefPicList;
+
+typedef struct RefPicListTab {
+ RefPicList refPicList[2];
+} RefPicListTab;
+
+typedef struct HEVCWindow {
+ int left_offset;
+ int right_offset;
+ int top_offset;
+ int bottom_offset;
+} HEVCWindow;
+
+typedef struct VUI {
+ AVRational sar;
+
+ int overscan_info_present_flag;
+ int overscan_appropriate_flag;
+
+ int video_signal_type_present_flag;
+ int video_format;
+ int video_full_range_flag;
+ int colour_description_present_flag;
+ uint8_t colour_primaries;
+ uint8_t transfer_characteristic;
+ uint8_t matrix_coeffs;
+
+ int chroma_loc_info_present_flag;
+ int chroma_sample_loc_type_top_field;
+ int chroma_sample_loc_type_bottom_field;
+ int neutra_chroma_indication_flag;
+
+ int field_seq_flag;
+ int frame_field_info_present_flag;
+
+ int default_display_window_flag;
+ HEVCWindow def_disp_win;
+
+ int vui_timing_info_present_flag;
+ uint32_t vui_num_units_in_tick;
+ uint32_t vui_time_scale;
+ int vui_poc_proportional_to_timing_flag;
+ int vui_num_ticks_poc_diff_one_minus1;
+ int vui_hrd_parameters_present_flag;
+
+ int bitstream_restriction_flag;
+ int tiles_fixed_structure_flag;
+ int motion_vectors_over_pic_boundaries_flag;
+ int restricted_ref_pic_lists_flag;
+ int min_spatial_segmentation_idc;
+ int max_bytes_per_pic_denom;
+ int max_bits_per_min_cu_denom;
+ int log2_max_mv_length_horizontal;
+ 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 {
+ 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];
+} PTL;
+
+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
+
+ PTL ptl;
+ int vps_sub_layer_ordering_info_present_flag;
+ unsigned int vps_max_dec_pic_buffering[MAX_SUB_LAYERS];
+ unsigned int vps_num_reorder_pics[MAX_SUB_LAYERS];
+ unsigned int vps_max_latency_increase[MAX_SUB_LAYERS];
+ int vps_max_layer_id;
+ int vps_num_layer_sets; ///< vps_num_layer_sets_minus1 + 1
+ uint8_t vps_timing_info_present_flag;
+ uint32_t vps_num_units_in_tick;
+ uint32_t vps_time_scale;
+ 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;
+} 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. */
+ uint8_t sl[4][6][64];
+ uint8_t sl_dc[2][6];
+} ScalingList;
+
+typedef struct HEVCSPS {
+ int vps_id;
+ int chroma_format_idc;
+ uint8_t separate_colour_plane_flag;
+
+ ///< output (i.e. cropped) values
+ int output_width, output_height;
+ HEVCWindow output_window;
+
+ HEVCWindow pic_conf_win;
+
+ int bit_depth;
+ int pixel_shift;
+ enum AVPixelFormat pix_fmt;
+
+ unsigned int log2_max_poc_lsb;
+ int pcm_enabled_flag;
+
+ int max_sub_layers;
+ struct {
+ int max_dec_pic_buffering;
+ int num_reorder_pics;
+ int max_latency_increase;
+ } temporal_layer[MAX_SUB_LAYERS];
+
+ VUI vui;
+ PTL ptl;
+
+ uint8_t scaling_list_enable_flag;
+ ScalingList scaling_list;
+
+ unsigned int nb_st_rps;
+ ShortTermRPS st_rps[MAX_SHORT_TERM_RPS_COUNT];
+
+ uint8_t amp_enabled_flag;
+ uint8_t sao_enabled;
+
+ uint8_t long_term_ref_pics_present_flag;
+ uint16_t lt_ref_pic_poc_lsb_sps[32];
+ uint8_t used_by_curr_pic_lt_sps_flag[32];
+ uint8_t num_long_term_ref_pics_sps;
+
+ struct {
+ uint8_t bit_depth;
+ uint8_t bit_depth_chroma;
+ unsigned int log2_min_pcm_cb_size;
+ unsigned int log2_max_pcm_cb_size;
+ uint8_t loop_filter_disable_flag;
+ } pcm;
+ uint8_t sps_temporal_mvp_enabled_flag;
+ uint8_t sps_strong_intra_smoothing_enable_flag;
+
+ unsigned int log2_min_cb_size;
+ unsigned int log2_diff_max_min_coding_block_size;
+ unsigned int log2_min_tb_size;
+ unsigned int log2_max_trafo_size;
+ unsigned int log2_ctb_size;
+ unsigned int log2_min_pu_size;
+
+ int max_transform_hierarchy_depth_inter;
+ int max_transform_hierarchy_depth_intra;
+
+ ///< coded frame dimension in various units
+ int width;
+ int height;
+ int ctb_width;
+ int ctb_height;
+ int ctb_size;
+ int min_cb_width;
+ int min_cb_height;
+ int min_tb_width;
+ int min_tb_height;
+ int min_pu_width;
+ int min_pu_height;
+
+ int hshift[3];
+ int vshift[3];
+
+ int qp_bd_offset;
+} HEVCSPS;
+
+typedef struct HEVCPPS {
+ unsigned int sps_id; ///< seq_parameter_set_id
+
+ uint8_t sign_data_hiding_flag;
+
+ uint8_t cabac_init_present_flag;
+
+ int num_ref_idx_l0_default_active; ///< num_ref_idx_l0_default_active_minus1 + 1
+ int num_ref_idx_l1_default_active; ///< num_ref_idx_l1_default_active_minus1 + 1
+ int pic_init_qp_minus26;
+
+ uint8_t constrained_intra_pred_flag;
+ uint8_t transform_skip_enabled_flag;
+
+ uint8_t cu_qp_delta_enabled_flag;
+ int diff_cu_qp_delta_depth;
+
+ int cb_qp_offset;
+ int cr_qp_offset;
+ uint8_t pic_slice_level_chroma_qp_offsets_present_flag;
+ uint8_t weighted_pred_flag;
+ uint8_t weighted_bipred_flag;
+ uint8_t output_flag_present_flag;
+ uint8_t transquant_bypass_enable_flag;
+
+ uint8_t dependent_slice_segments_enabled_flag;
+ 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
+ uint8_t uniform_spacing_flag;
+ uint8_t loop_filter_across_tiles_enabled_flag;
+
+ uint8_t seq_loop_filter_across_slices_enabled_flag;
+
+ 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
+
+ uint8_t scaling_list_data_present_flag;
+ ScalingList scaling_list;
+
+ uint8_t lists_modification_present_flag;
+ int log2_parallel_merge_level; ///< log2_parallel_merge_level_minus2 + 2
+ int num_extra_slice_header_bits;
+ uint8_t slice_header_extension_present_flag;
+
+ // Inferred parameters
+ 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
+} HEVCPPS;
+
+typedef struct SliceHeader {
+ unsigned int pps_id;
+
+ ///< address (in raster order) of the first block in the current slice segment
+ unsigned int slice_segment_addr;
+ ///< address (in raster order) of the first block in the current slice
+ unsigned int slice_addr;
+
+ enum SliceType slice_type;
+
+ int pic_order_cnt_lsb;
+
+ uint8_t first_slice_in_pic_flag;
+ uint8_t dependent_slice_segment_flag;
+ uint8_t pic_output_flag;
+ uint8_t colour_plane_id;
+
+ ///< RPS coded in the slice header itself is stored here
+ ShortTermRPS slice_rps;
+ const ShortTermRPS *short_term_rps;
+ LongTermRPS long_term_rps;
+ unsigned int list_entry_lx[2][32];
+
+ uint8_t rpl_modification_flag[2];
+ uint8_t no_output_of_prior_pics_flag;
+ uint8_t slice_temporal_mvp_enabled_flag;
+
+ unsigned int nb_refs[2];
+
+ uint8_t slice_sample_adaptive_offset_flag[3];
+ uint8_t mvd_l1_zero_flag;
+
+ uint8_t cabac_init_flag;
+ uint8_t disable_deblocking_filter_flag; ///< slice_header_disable_deblocking_filter_flag
+ uint8_t slice_loop_filter_across_slices_enabled_flag;
+ uint8_t collocated_list;
+
+ unsigned int collocated_ref_idx;
+
+ int slice_qp_delta;
+ int slice_cb_qp_offset;
+ int slice_cr_qp_offset;
+
+ 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 num_entry_point_offsets;
+
+ int8_t slice_qp;
+
+ uint8_t luma_log2_weight_denom;
+ int16_t chroma_log2_weight_denom;
+
+ int16_t luma_weight_l0[16];
+ int16_t chroma_weight_l0[16][2];
+ int16_t chroma_weight_l1[16][2];
+ int16_t luma_weight_l1[16];
+
+ int16_t luma_offset_l0[16];
+ int16_t chroma_offset_l0[16][2];
+
+ int16_t luma_offset_l1[16];
+ int16_t chroma_offset_l1[16][2];
+
+ int slice_ctb_addr_rs;
+} SliceHeader;
+
+typedef struct CodingTree {
+ int depth; ///< ctDepth
+} CodingTree;
+
+typedef struct CodingUnit {
+ int x;
+ int y;
+
+ 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 cu_transquant_bypass_flag;
+} CodingUnit;
+
+typedef struct Mv {
+ int16_t x; ///< horizontal component of motion vector
+ int16_t y; ///< vertical component of motion vector
+} Mv;
+
+typedef struct MvField {
+ Mv mv[2];
+ int8_t ref_idx[2];
+ int8_t pred_flag[2];
+ uint8_t is_intra;
+} MvField;
+
+typedef struct NeighbourAvailable {
+ int cand_bottom_left;
+ int cand_left;
+ int cand_up;
+ int cand_up_left;
+ int cand_up_right;
+ int cand_up_right_sap;
+} NeighbourAvailable;
+
+typedef struct PredictionUnit {
+ int mpm_idx;
+ int rem_intra_luma_pred_mode;
+ uint8_t intra_pred_mode[4];
+ Mv mvd;
+ uint8_t merge_flag;
+ uint8_t intra_pred_mode_c;
+} PredictionUnit;
+
+typedef struct TransformTree {
+ uint8_t cbf_cb[MAX_TRANSFORM_DEPTH][MAX_CU_SIZE * MAX_CU_SIZE];
+ uint8_t cbf_cr[MAX_TRANSFORM_DEPTH][MAX_CU_SIZE * MAX_CU_SIZE];
+ uint8_t cbf_luma;
+
+ // Inferred parameters
+ uint8_t inter_split_flag;
+} TransformTree;
+
+typedef struct TransformUnit {
+ int cu_qp_delta;
+
+ // Inferred parameters;
+ int cur_intra_pred_mode;
+ uint8_t is_cu_qp_delta_coded;
+} TransformUnit;
+
+typedef struct DBParams {
+ int beta_offset;
+ int tc_offset;
+} DBParams;
+
+#define HEVC_FRAME_FLAG_OUTPUT (1 << 0)
+#define HEVC_FRAME_FLAG_SHORT_REF (1 << 1)
+#define HEVC_FRAME_FLAG_LONG_REF (1 << 2)
+
+typedef struct HEVCFrame {
+ AVFrame *frame;
+ ThreadFrame tf;
+ MvField *tab_mvf;
+ RefPicList *refPicList;
+ RefPicListTab **rpl_tab;
+ int ctb_count;
+ int poc;
+ struct HEVCFrame *collocated_ref;
+
+ HEVCWindow window;
+
+ AVBufferRef *tab_mvf_buf;
+ AVBufferRef *rpl_tab_buf;
+ AVBufferRef *rpl_buf;
+
+ /**
+ * A sequence counter, so that old frames are output first
+ * after a POC reset
+ */
+ uint16_t sequence;
+
+ /**
+ * A combination of HEVC_FRAME_FLAG_*
+ */
+ uint8_t flags;
+} HEVCFrame;
+
+typedef struct HEVCNAL {
+ uint8_t *rbsp_buffer;
+ int rbsp_buffer_size;
+
+ int size;
+ const uint8_t *data;
+} HEVCNAL;
+
+struct HEVCContext;
+
+typedef struct HEVCPredContext {
+ void (*intra_pred)(struct HEVCContext *s, int x0, int y0,
+ int log2_size, int c_idx);
+
+ void (*pred_planar[4])(uint8_t *src, const uint8_t *top,
+ const uint8_t *left, ptrdiff_t stride);
+ void (*pred_dc)(uint8_t *src, const uint8_t *top, const uint8_t *left,
+ ptrdiff_t stride, int log2_size, int c_idx);
+ void (*pred_angular[4])(uint8_t *src, const uint8_t *top,
+ const uint8_t *left, ptrdiff_t stride,
+ int c_idx, int mode);
+} HEVCPredContext;
+
+typedef struct HEVCLocalContext {
+ DECLARE_ALIGNED(16, int16_t, mc_buffer[(MAX_PB_SIZE + 7) * MAX_PB_SIZE]);
+ uint8_t cabac_state[HEVC_CONTEXTS];
+
+ uint8_t first_qp_group;
+
+ GetBitContext gb;
+ CABACContext cc;
+ TransformTree tt;
+
+ int8_t qp_y;
+ int8_t curr_qp_y;
+
+ 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;
+ /* +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;
+ NeighbourAvailable na;
+
+ uint8_t slice_or_tiles_left_boundary;
+ uint8_t slice_or_tiles_up_boundary;
+} HEVCLocalContext;
+
+typedef struct HEVCContext {
+ const AVClass *c; // needed by private avoptions
+ AVCodecContext *avctx;
+
+ HEVCLocalContext HEVClc;
+
+ uint8_t cabac_state[HEVC_CONTEXTS];
+
+ /** 1 if the independent slice segment header was successfully parsed */
+ uint8_t slice_initialized;
+
+ AVFrame *frame;
+ AVFrame *sao_frame;
+ AVFrame *tmp_frame;
+ AVFrame *output_frame;
+
+ const HEVCVPS *vps;
+ const HEVCSPS *sps;
+ const HEVCPPS *pps;
+ AVBufferRef *vps_list[MAX_VPS_COUNT];
+ AVBufferRef *sps_list[MAX_SPS_COUNT];
+ AVBufferRef *pps_list[MAX_PPS_COUNT];
+
+ AVBufferPool *tab_mvf_pool;
+ AVBufferPool *rpl_tab_pool;
+
+ ///< candidate references for the current frame
+ RefPicList rps[5];
+
+ SliceHeader sh;
+ SAOParams *sao;
+ DBParams *deblock;
+ enum NALUnitType nal_unit_type;
+ int temporal_id; ///< temporal_id_plus1 - 1
+ HEVCFrame *ref;
+ HEVCFrame DPB[32];
+ int poc;
+ int pocTid0;
+ int slice_idx; ///< number of the slice being currently decoded
+ int eos; ///< current packet contains an EOS/EOB NAL
+ int max_ra;
+ int bs_width;
+ int bs_height;
+
+ int is_decoded;
+
+ HEVCPredContext hpc;
+ HEVCDSPContext hevcdsp;
+ VideoDSPContext vdsp;
+ DSPContext dsp;
+ int8_t *qp_y_tab;
+ uint8_t *split_cu_flag;
+ uint8_t *horizontal_bs;
+ uint8_t *vertical_bs;
+
+ int32_t *tab_slice_address;
+
+ // CU
+ uint8_t *skip_flag;
+ uint8_t *tab_ct_depth;
+ // PU
+ uint8_t *tab_ipm;
+
+ uint8_t *cbf_luma; // cbf_luma of colocated TU
+ uint8_t *is_pcm;
+
+ // CTB-level flags affecting loop filter operation
+ uint8_t *filter_slice_edges;
+
+ /** used on BE to byteswap the lines for checksumming */
+ uint8_t *checksum_buf;
+ int checksum_buf_size;
+
+ /**
+ * Sequence counters for decoded and output frames, so that old
+ * frames are output first after a POC reset
+ */
+ uint16_t seq_decode;
+ uint16_t seq_output;
+
+ 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;
+
+ 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 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;
+} HEVCContext;
+
+int ff_hevc_decode_short_term_rps(HEVCContext *s, ShortTermRPS *rps,
+ const HEVCSPS *sps, int is_slice_header);
+int ff_hevc_decode_nal_vps(HEVCContext *s);
+int ff_hevc_decode_nal_sps(HEVCContext *s);
+int ff_hevc_decode_nal_pps(HEVCContext *s);
+int ff_hevc_decode_nal_sei(HEVCContext *s);
+
+/**
+ * Mark all frames in DPB as unused for reference.
+ */
+void ff_hevc_clear_refs(HEVCContext *s);
+
+/**
+ * Drop all frames currently in DPB.
+ */
+void ff_hevc_flush_dpb(HEVCContext *s);
+
+/**
+ * Compute POC of the current frame and return it.
+ */
+int ff_hevc_compute_poc(HEVCContext *s, int poc_lsb);
+
+RefPicList *ff_hevc_get_ref_list(HEVCContext *s, HEVCFrame *frame,
+ int x0, int y0);
+
+/**
+ * Construct the reference picture sets for the current frame.
+ */
+int ff_hevc_frame_rps(HEVCContext *s);
+
+/**
+ * Construct the reference picture list(s) for the current slice.
+ */
+int ff_hevc_slice_rpl(HEVCContext *s);
+
+void ff_hevc_save_states(HEVCContext *s, int ctb_addr_ts);
+void ff_hevc_cabac_init(HEVCContext *s, int ctb_addr_ts);
+int ff_hevc_sao_merge_flag_decode(HEVCContext *s);
+int ff_hevc_sao_type_idx_decode(HEVCContext *s);
+int ff_hevc_sao_band_position_decode(HEVCContext *s);
+int ff_hevc_sao_offset_abs_decode(HEVCContext *s);
+int ff_hevc_sao_offset_sign_decode(HEVCContext *s);
+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_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_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);
+int ff_hevc_mpm_idx_decode(HEVCContext *s);
+int ff_hevc_rem_intra_luma_pred_mode_decode(HEVCContext *s);
+int ff_hevc_intra_chroma_pred_mode_decode(HEVCContext *s);
+int ff_hevc_merge_idx_decode(HEVCContext *s);
+int ff_hevc_merge_flag_decode(HEVCContext *s);
+int ff_hevc_inter_pred_idc_decode(HEVCContext *s, int nPbW, int nPbH);
+int ff_hevc_ref_idx_lx_decode(HEVCContext *s, int num_ref_idx_lx);
+int ff_hevc_mvp_lx_flag_decode(HEVCContext *s);
+int ff_hevc_no_residual_syntax_flag_decode(HEVCContext *s);
+int ff_hevc_abs_mvd_greater0_flag_decode(HEVCContext *s);
+int ff_hevc_abs_mvd_greater1_flag_decode(HEVCContext *s);
+int ff_hevc_mvd_decode(HEVCContext *s);
+int ff_hevc_mvd_sign_flag_decode(HEVCContext *s);
+int ff_hevc_split_transform_flag_decode(HEVCContext *s, int log2_trafo_size);
+int ff_hevc_cbf_cb_cr_decode(HEVCContext *s, int trafo_depth);
+int ff_hevc_cbf_luma_decode(HEVCContext *s, int trafo_depth);
+int ff_hevc_transform_skip_flag_decode(HEVCContext *s, int c_idx);
+int ff_hevc_last_significant_coeff_x_prefix_decode(HEVCContext *s, int c_idx,
+ int log2_size);
+int ff_hevc_last_significant_coeff_y_prefix_decode(HEVCContext *s, int c_idx,
+ int log2_size);
+int ff_hevc_last_significant_coeff_suffix_decode(HEVCContext *s,
+ int last_significant_coeff_prefix);
+int ff_hevc_significant_coeff_group_flag_decode(HEVCContext *s, int c_idx,
+ int ctx_cg);
+int ff_hevc_significant_coeff_flag_decode(HEVCContext *s, int c_idx, int x_c,
+ int y_c, int log2_trafo_size,
+ int scan_idx, int prev_sig);
+int ff_hevc_coeff_abs_level_greater1_flag_decode(HEVCContext *s, int c_idx,
+ int ctx_set);
+int ff_hevc_coeff_abs_level_greater2_flag_decode(HEVCContext *s, int c_idx,
+ int inc);
+int ff_hevc_coeff_abs_level_remaining(HEVCContext *s, int base_level,
+ int rc_rice_param);
+int ff_hevc_coeff_sign_flag(HEVCContext *s, uint8_t nb);
+
+/**
+ * Get the number of candidate references for the current frame.
+ */
+int ff_hevc_frame_nb_refs(HEVCContext *s);
+
+int ff_hevc_set_new_ref(HEVCContext *s, AVFrame **frame, int poc);
+
+/**
+ * Find next frame in output order and put a reference to it in frame.
+ * @return 1 if a frame was output, 0 otherwise
+ */
+int ff_hevc_output_frame(HEVCContext *s, AVFrame *frame, int flush);
+
+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);
+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);
+void ff_hevc_hls_filters(HEVCContext *s, int x_ctb, int y_ctb, int ctb_size);
+
+void ff_hevc_pps_free(HEVCPPS **ppps);
+
+void ff_hevc_pred_init(HEVCPredContext *hpc, int bit_depth);
+
+extern const uint8_t ff_hevc_qpel_extra_before[4];
+extern const uint8_t ff_hevc_qpel_extra_after[4];
+extern const uint8_t ff_hevc_qpel_extra[4];
+
+extern const uint8_t ff_hevc_diag_scan4x4_x[16];
+extern const uint8_t ff_hevc_diag_scan4x4_y[16];
+extern const uint8_t ff_hevc_diag_scan8x8_x[64];
+extern const uint8_t ff_hevc_diag_scan8x8_y[64];
+
+#endif /* AVCODEC_HEVC_H */

libav-v10.1.tar.bz2/libavcodec/hevc_cabac.c Added

@@ -0,0 +1,872 @@
+/*
+ * HEVC CABAC decoding
+ *
+ * Copyright (C) 2012 - 2013 Guillaume Martres
+ * Copyright (C) 2012 - 2013 Gildas Cocherel
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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/common.h"
+
+#include "cabac_functions.h"
+#include "hevc.h"
+
+#define CABAC_MAX_BIN 100
+
+/**
+ * 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
+};
+
+/**
+ * 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,
+ 130,
+ 154,
+ 160,
+ 160,
+};
+
+#define CNU 154
+/**
+ * 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, },
+};
+
+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 ||
+ (s->sps->ctb_width == 2 &&
+ ctb_addr_ts % s->sps->ctb_width == 0))) {
+ memcpy(s->cabac_state, s->HEVClc.cabac_state, HEVC_CONTEXTS);
+ }
+}
+
+static void load_states(HEVCContext *s)
+{
+ memcpy(s->HEVClc.cabac_state, s->cabac_state, HEVC_CONTEXTS);
+}
+
+static void cabac_reinit(HEVCLocalContext *lc)
+{
+ skip_bytes(&lc->cc, 0);
+}
+
+static void cabac_init_decoder(HEVCContext *s)
+{
+ GetBitContext *gb = &s->HEVClc.gb;
+ skip_bits(gb, 1);
+ align_get_bits(gb);
+ ff_init_cabac_decoder(&s->HEVClc.cc,
+ gb->buffer + get_bits_count(gb) / 8,
+ (get_bits_left(gb) + 7) / 8);
+}
+
+static void cabac_init_state(HEVCContext *s)
+{
+ int init_type = 2 - s->sh.slice_type;
+ int i;
+
+ if (s->sh.cabac_init_flag && s->sh.slice_type != I_SLICE)
+ init_type ^= 3;
+
+ for (i = 0; i < HEVC_CONTEXTS; i++) {
+ int init_value = init_values[init_type][i];
+ int m = (init_value >> 4) * 5 - 45;
+ int n = ((init_value & 15) << 3) - 16;
+ int pre = 2 * (((m * av_clip_c(s->sh.slice_qp, 0, 51)) >> 4) + n) - 127;
+
+ pre ^= pre >> 31;
+ if (pre > 124)
+ pre = 124 + (pre & 1);
+ s->HEVClc.cabac_state[i] = pre;
+ }
+}
+
+void ff_hevc_cabac_init(HEVCContext *s, int ctb_addr_ts)
+{
+ 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 ||
+ (s->pps->tiles_enabled_flag &&
+ 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->sps->ctb_width == 1)
+ cabac_init_state(s);
+ else if (s->sh.dependent_slice_segment_flag == 1)
+ load_states(s);
+ }
+ }
+ } else {
+ if (s->pps->tiles_enabled_flag &&
+ s->pps->tile_id[ctb_addr_ts] != s->pps->tile_id[ctb_addr_ts - 1]) {
+ cabac_reinit(&s->HEVClc);
+ cabac_init_state(s);
+ }
+ if (s->pps->entropy_coding_sync_enabled_flag) {
+ if (ctb_addr_ts % s->sps->ctb_width == 0) {
+ get_cabac_terminate(&s->HEVClc.cc);
+ cabac_reinit(&s->HEVClc);
+
+ if (s->sps->ctb_width == 1)
+ cabac_init_state(s);
+ else
+ load_states(s);
+ }
+ }
+ }
+}
+
+#define GET_CABAC(ctx) get_cabac(&s->HEVClc.cc, &s->HEVClc.cabac_state[ctx])
+
+int ff_hevc_sao_merge_flag_decode(HEVCContext *s)
+{
+ return GET_CABAC(elem_offset[SAO_MERGE_FLAG]);
+}
+
+int ff_hevc_sao_type_idx_decode(HEVCContext *s)
+{
+ if (!GET_CABAC(elem_offset[SAO_TYPE_IDX]))
+ return 0;
+
+ if (!get_cabac_bypass(&s->HEVClc.cc))
+ return SAO_BAND;
+ return SAO_EDGE;
+}
+
+int ff_hevc_sao_band_position_decode(HEVCContext *s)
+{
+ int i;
+ int value = get_cabac_bypass(&s->HEVClc.cc);
+
+ for (i = 0; i < 4; i++)
+ value = (value << 1) | get_cabac_bypass(&s->HEVClc.cc);
+ return value;
+}
+
+int ff_hevc_sao_offset_abs_decode(HEVCContext *s)
+{
+ int i = 0;
+ int length = (1 << (FFMIN(s->sps->bit_depth, 10) - 5)) - 1;
+
+ while (i < length && get_cabac_bypass(&s->HEVClc.cc))
+ i++;
+ return i;
+}
+
+int ff_hevc_sao_offset_sign_decode(HEVCContext *s)
+{
+ return get_cabac_bypass(&s->HEVClc.cc);
+}
+
+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);
+ return ret;
+}
+
+int ff_hevc_end_of_slice_flag_decode(HEVCContext *s)
+{
+ return get_cabac_terminate(&s->HEVClc.cc);
+}
+
+int ff_hevc_cu_transquant_bypass_flag_decode(HEVCContext *s)
+{
+ return GET_CABAC(elem_offset[CU_TRANSQUANT_BYPASS_FLAG]);
+}
+
+int ff_hevc_skip_flag_decode(HEVCContext *s, int x0, int y0, int x_cb, int y_cb)
+{
+ int min_cb_width = s->sps->min_cb_width;
+ int inc = 0;
+ int x0b = x0 & ((1 << s->sps->log2_ctb_size) - 1);
+ 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);
+ if (s->HEVClc.ctb_up_flag || y0b)
+ inc += !!SAMPLE_CTB(s->skip_flag, x_cb, y_cb - 1);
+
+ return GET_CABAC(elem_offset[SKIP_FLAG] + inc);
+}
+
+int ff_hevc_cu_qp_delta_abs(HEVCContext *s)
+{
+ int prefix_val = 0;
+ int suffix_val = 0;
+ int inc = 0;
+
+ while (prefix_val < 5 && GET_CABAC(elem_offset[CU_QP_DELTA] + inc)) {
+ prefix_val++;
+ inc = 1;
+ }
+ if (prefix_val >= 5) {
+ int k = 0;
+ while (k < CABAC_MAX_BIN && get_cabac_bypass(&s->HEVClc.cc)) {
+ suffix_val += 1 << k;
+ k++;
+ }
+ if (k == CABAC_MAX_BIN)
+ av_log(s->avctx, AV_LOG_ERROR, "CABAC_MAX_BIN : %d\n", k);
+
+ while (k--)
+ suffix_val += get_cabac_bypass(&s->HEVClc.cc) << k;
+ }
+ return prefix_val + suffix_val;
+}
+
+int ff_hevc_cu_qp_delta_sign_flag(HEVCContext *s)
+{
+ return get_cabac_bypass(&s->HEVClc.cc);
+}
+
+int ff_hevc_pred_mode_decode(HEVCContext *s)
+{
+ return GET_CABAC(elem_offset[PRED_MODE_FLAG]);
+}
+
+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 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];
+ if (s->HEVClc.ctb_up_flag || y0b)
+ 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);
+
+ return GET_CABAC(elem_offset[SPLIT_CODING_UNIT_FLAG] + inc);
+}
+
+int ff_hevc_part_mode_decode(HEVCContext *s, int log2_cb_size)
+{
+ if (GET_CABAC(elem_offset[PART_MODE])) // 1
+ return PART_2Nx2N;
+ if (log2_cb_size == s->sps->log2_min_cb_size) {
+ if (s->HEVClc.cu.pred_mode == MODE_INTRA) // 0
+ return PART_NxN;
+ if (GET_CABAC(elem_offset[PART_MODE] + 1)) // 01
+ return PART_2NxN;
+ if (log2_cb_size == 3) // 00
+ return PART_Nx2N;
+ if (GET_CABAC(elem_offset[PART_MODE] + 2)) // 001
+ return PART_Nx2N;
+ return PART_NxN; // 000
+ }
+
+ if (!s->sps->amp_enabled_flag) {
+ if (GET_CABAC(elem_offset[PART_MODE] + 1)) // 01
+ return PART_2NxN;
+ return PART_Nx2N;
+ }
+
+ if (GET_CABAC(elem_offset[PART_MODE] + 1)) { // 01X, 01XX
+ if (GET_CABAC(elem_offset[PART_MODE] + 3)) // 011
+ return PART_2NxN;
+ if (get_cabac_bypass(&s->HEVClc.cc)) // 0101
+ return PART_2NxnD;
+ return PART_2NxnU; // 0100
+ }
+
+ if (GET_CABAC(elem_offset[PART_MODE] + 3)) // 001
+ return PART_Nx2N;
+ if (get_cabac_bypass(&s->HEVClc.cc)) // 0001
+ return PART_nRx2N;
+ return PART_nLx2N; // 0000
+}
+
+int ff_hevc_pcm_flag_decode(HEVCContext *s)
+{
+ return get_cabac_terminate(&s->HEVClc.cc);
+}
+
+int ff_hevc_prev_intra_luma_pred_flag_decode(HEVCContext *s)
+{
+ return GET_CABAC(elem_offset[PREV_INTRA_LUMA_PRED_FLAG]);
+}
+
+int ff_hevc_mpm_idx_decode(HEVCContext *s)
+{
+ int i = 0;
+ while (i < 2 && get_cabac_bypass(&s->HEVClc.cc))
+ i++;
+ return i;
+}
+
+int ff_hevc_rem_intra_luma_pred_mode_decode(HEVCContext *s)
+{
+ int i;
+ int value = get_cabac_bypass(&s->HEVClc.cc);
+
+ for (i = 0; i < 4; i++)
+ value = (value << 1) | get_cabac_bypass(&s->HEVClc.cc);
+ return value;
+}
+
+int ff_hevc_intra_chroma_pred_mode_decode(HEVCContext *s)
+{
+ int ret;
+ 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);
+ return ret;
+}
+
+int ff_hevc_merge_idx_decode(HEVCContext *s)
+{
+ int i = GET_CABAC(elem_offset[MERGE_IDX]);
+
+ if (i != 0) {
+ while (i < s->sh.max_num_merge_cand-1 && get_cabac_bypass(&s->HEVClc.cc))
+ i++;
+ }
+ return i;
+}
+
+int ff_hevc_merge_flag_decode(HEVCContext *s)
+{
+ return GET_CABAC(elem_offset[MERGE_FLAG]);
+}
+
+int ff_hevc_inter_pred_idc_decode(HEVCContext *s, int nPbW, int nPbH)
+{
+ if (nPbW + nPbH == 12)
+ return GET_CABAC(elem_offset[INTER_PRED_IDC] + 4);
+ if (GET_CABAC(elem_offset[INTER_PRED_IDC] + s->HEVClc.ct.depth))
+ return PRED_BI;
+
+ return GET_CABAC(elem_offset[INTER_PRED_IDC] + 4);
+}
+
+int ff_hevc_ref_idx_lx_decode(HEVCContext *s, int num_ref_idx_lx)
+{
+ int i = 0;
+ int max = num_ref_idx_lx - 1;
+ int max_ctx = FFMIN(max, 2);
+
+ while (i < max_ctx && GET_CABAC(elem_offset[REF_IDX_L0] + i))
+ i++;
+ if (i == 2) {
+ while (i < max && get_cabac_bypass(&s->HEVClc.cc))
+ i++;
+ }
+
+ return i;
+}
+
+int ff_hevc_mvp_lx_flag_decode(HEVCContext *s)
+{
+ return GET_CABAC(elem_offset[MVP_LX_FLAG]);
+}
+
+int ff_hevc_no_residual_syntax_flag_decode(HEVCContext *s)
+{
+ return GET_CABAC(elem_offset[NO_RESIDUAL_DATA_FLAG]);
+}
+
+int ff_hevc_abs_mvd_greater0_flag_decode(HEVCContext *s)
+{
+ return GET_CABAC(elem_offset[ABS_MVD_GREATER0_FLAG]);
+}
+
+int ff_hevc_abs_mvd_greater1_flag_decode(HEVCContext *s)
+{
+ return GET_CABAC(elem_offset[ABS_MVD_GREATER1_FLAG] + 1);
+}
+
+int ff_hevc_mvd_decode(HEVCContext *s)
+{
+ int ret = 2;
+ int k = 1;
+
+ while (k < CABAC_MAX_BIN && get_cabac_bypass(&s->HEVClc.cc)) {
+ ret += 1 << k;
+ k++;
+ }
+ if (k == CABAC_MAX_BIN)
+ av_log(s->avctx, AV_LOG_ERROR, "CABAC_MAX_BIN : %d\n", k);
+ while (k--)
+ ret += get_cabac_bypass(&s->HEVClc.cc) << k;
+ return get_cabac_bypass_sign(&s->HEVClc.cc, -ret);
+}
+
+int ff_hevc_mvd_sign_flag_decode(HEVCContext *s)
+{
+ return get_cabac_bypass_sign(&s->HEVClc.cc, -1);
+}
+
+int ff_hevc_split_transform_flag_decode(HEVCContext *s, int log2_trafo_size)
+{
+ return GET_CABAC(elem_offset[SPLIT_TRANSFORM_FLAG] + 5 - log2_trafo_size);
+}
+
+int ff_hevc_cbf_cb_cr_decode(HEVCContext *s, int trafo_depth)
+{
+ return GET_CABAC(elem_offset[CBF_CB_CR] + trafo_depth);
+}
+
+int ff_hevc_cbf_luma_decode(HEVCContext *s, int trafo_depth)
+{
+ return GET_CABAC(elem_offset[CBF_LUMA] + !trafo_depth);
+}
+
+int ff_hevc_transform_skip_flag_decode(HEVCContext *s, int c_idx)
+{
+ return GET_CABAC(elem_offset[TRANSFORM_SKIP_FLAG] + !!c_idx);
+}
+
+#define LAST_SIG_COEFF(elem) \
+ int i = 0; \
+ int max = (log2_size << 1) - 1; \
+ int ctx_offset, ctx_shift; \
+ \
+ if (c_idx == 0) { \
+ ctx_offset = 3 * (log2_size - 2) + ((log2_size - 1) >> 2); \
+ ctx_shift = (log2_size + 1) >> 2; \
+ } else { \
+ ctx_offset = 15; \
+ ctx_shift = log2_size - 2; \
+ } \
+ while (i < max && \
+ GET_CABAC(elem_offset[elem] + (i >> ctx_shift) + ctx_offset)) \
+ i++; \
+ return i;
+
+int ff_hevc_last_significant_coeff_x_prefix_decode(HEVCContext *s, int c_idx,
+ int log2_size)
+{
+ LAST_SIG_COEFF(LAST_SIGNIFICANT_COEFF_X_PREFIX)
+}
+
+int ff_hevc_last_significant_coeff_y_prefix_decode(HEVCContext *s, int c_idx,
+ int log2_size)
+{
+ LAST_SIG_COEFF(LAST_SIGNIFICANT_COEFF_Y_PREFIX)
+}
+
+int ff_hevc_last_significant_coeff_suffix_decode(HEVCContext *s,
+ int last_significant_coeff_prefix)
+{
+ int i;
+ int length = (last_significant_coeff_prefix >> 1) - 1;
+ int value = get_cabac_bypass(&s->HEVClc.cc);
+
+ for (i = 1; i < length; i++)
+ value = (value << 1) | get_cabac_bypass(&s->HEVClc.cc);
+ return value;
+}
+
+int ff_hevc_significant_coeff_group_flag_decode(HEVCContext *s, int c_idx, int ctx_cg)
+{
+ int inc;
+
+ inc = FFMIN(ctx_cg, 1) + (c_idx>0 ? 2 : 0);
+
+ return GET_CABAC(elem_offset[SIGNIFICANT_COEFF_GROUP_FLAG] + inc);
+}
+
+int ff_hevc_significant_coeff_flag_decode(HEVCContext *s, int c_idx, int x_c, int y_c,
+ int log2_trafo_size, int scan_idx, int prev_sig)
+{
+ static const uint8_t ctx_idx_map[] = {
+ 0, 1, 4, 5, 2, 3, 4, 5, 6, 6, 8, 8, 7, 7, 8, 8
+ };
+ int x_cg = x_c >> 2;
+ int y_cg = y_c >> 2;
+ int sig_ctx, inc;
+
+ if (x_c + y_c == 0) {
+ sig_ctx = 0;
+ } else if (log2_trafo_size == 2) {
+ sig_ctx = ctx_idx_map[(y_c << 2) + x_c];
+ } else {
+ switch (prev_sig) {
+ case 0: {
+ int x_off = x_c & 3;
+ int y_off = y_c & 3;
+ sig_ctx = ((x_off + y_off) == 0) ? 2 : ((x_off + y_off) <= 2) ? 1 : 0;
+ }
+ break;
+ case 1:
+ sig_ctx = 2 - FFMIN(y_c & 3, 2);
+ break;
+ case 2:
+ sig_ctx = 2 - FFMIN(x_c & 3, 2);
+ break;
+ default:
+ sig_ctx = 2;
+ }
+
+ if (c_idx == 0 && (x_cg > 0 || y_cg > 0))
+ sig_ctx += 3;
+
+ if (log2_trafo_size == 3) {
+ sig_ctx += (scan_idx == SCAN_DIAG) ? 9 : 15;
+ } else {
+ sig_ctx += c_idx ? 12 : 21;
+ }
+ }
+
+ if (c_idx == 0)
+ inc = sig_ctx;
+ else
+ inc = sig_ctx + 27;
+
+ return GET_CABAC(elem_offset[SIGNIFICANT_COEFF_FLAG] + inc);
+}
+
+int ff_hevc_coeff_abs_level_greater1_flag_decode(HEVCContext *s, int c_idx, int inc)
+{
+
+ if (c_idx > 0)
+ inc += 16;
+
+ return GET_CABAC(elem_offset[COEFF_ABS_LEVEL_GREATER1_FLAG] + inc);
+}
+
+int ff_hevc_coeff_abs_level_greater2_flag_decode(HEVCContext *s, int c_idx, int inc)
+{
+ if (c_idx > 0)
+ inc += 4;
+
+ return GET_CABAC(elem_offset[COEFF_ABS_LEVEL_GREATER2_FLAG] + inc);
+}
+
+int ff_hevc_coeff_abs_level_remaining(HEVCContext *s, int base_level, int rc_rice_param)
+{
+ int prefix = 0;
+ int suffix = 0;
+ int last_coeff_abs_level_remaining;
+ int i;
+
+ while (prefix < CABAC_MAX_BIN && get_cabac_bypass(&s->HEVClc.cc))
+ prefix++;
+ if (prefix == CABAC_MAX_BIN)
+ av_log(s->avctx, AV_LOG_ERROR, "CABAC_MAX_BIN : %d\n", prefix);
+ if (prefix < 3) {
+ for (i = 0; i < rc_rice_param; i++)
+ suffix = (suffix << 1) | get_cabac_bypass(&s->HEVClc.cc);
+ last_coeff_abs_level_remaining = (prefix << rc_rice_param) + suffix;
+ } else {
+ int prefix_minus3 = prefix - 3;
+ for (i = 0; i < prefix_minus3 + rc_rice_param; i++)
+ suffix = (suffix << 1) | get_cabac_bypass(&s->HEVClc.cc);
+ last_coeff_abs_level_remaining = (((1 << prefix_minus3) + 3 - 1)
+ << rc_rice_param) + suffix;
+ }
+ return last_coeff_abs_level_remaining;
+}
+
+int ff_hevc_coeff_sign_flag(HEVCContext *s, uint8_t nb)
+{
+ int i;
+ int ret = 0;
+
+ for (i = 0; i < nb; i++)
+ ret = (ret << 1) | get_cabac_bypass(&s->HEVClc.cc);
+ return ret;
+}

libav-v10.1.tar.bz2/libavcodec/hevc_filter.c Added

@@ -0,0 +1,745 @@
+/*
+ * HEVC video decoder
+ *
+ * Copyright (C) 2012 - 2013 Guillaume Martres
+ * Copyright (C) 2013 Seppo Tomperi
+ * Copyright (C) 2013 Wassim Hamidouche
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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/internal.h"
+
+#include "cabac_functions.h"
+#include "golomb.h"
+#include "hevc.h"
+
+#define LUMA 0
+#define CB 1
+#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
+};
+
+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
+};
+
+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, qp_i, offset, idxt;
+
+ // slice qp offset is not used for deblocking
+ if (c_idx == 1)
+ offset = s->pps->cb_qp_offset;
+ else
+ offset = s->pps->cr_qp_offset;
+
+ qp_i = av_clip_c(qp_y + offset, 0, 57);
+ if (qp_i < 30)
+ qp = qp_i;
+ else if (qp_i > 43)
+ qp = qp_i - 6;
+ else
+ qp = qp_c[qp_i - 30];
+
+ idxt = av_clip_c(qp + DEFAULT_INTRA_TC_OFFSET + tc_offset, 0, 53);
+ return tctable[idxt];
+}
+
+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 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, qPy_a, qPy_b;
+
+ // qPy_pred
+ 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_a
+ if (availableA == 0)
+ qPy_a = qPy_pred;
+ else
+ qPy_a = s->qp_y_tab[(x_cb - 1) + y_cb * min_cb_width];
+
+ // qPy_b
+ if (availableB == 0)
+ qPy_b = qPy_pred;
+ else
+ qPy_b = s->qp_y_tab[x_cb + (y_cb - 1) * min_cb_width];
+
+ 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)
+{
+ 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 = FFUMOD(qp_y + s->HEVClc.tu.cu_qp_delta + 52 + 2 * off,
+ 52 + off) - off;
+ } else
+ s->HEVClc.qp_y = qp_y;
+}
+
+static int get_qPy(HEVCContext *s, int xC, int yC)
+{
+ int log2_min_cb_size = s->sps->log2_min_cb_size;
+ int x = xC >> log2_min_cb_size;
+ int y = yC >> log2_min_cb_size;
+ 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)
+{
+ int i;
+
+ for (i = 0; i < height; i++) {
+ memcpy(dst, src, width);
+ dst += stride;
+ src += stride;
+ }
+}
+
+#define CTB(tab, x, y) ((tab)[(y) * s->sps->ctb_width + (x)])
+
+static void sao_filter_CTB(HEVCContext *s, int x, int y)
+{
+ // TODO: This should be easily parallelizable
+ // 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
+ 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 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 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 left_tile_edge = 0, 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;
+ lfase[0] = CTB(s->filter_slice_edges, x_ctb, y_ctb);
+ classes[0] = 0;
+
+ if (!edges[0]) {
+ left_tile_edge = no_tile_filter && s->pps->tile_id[ctb_addr_ts] != s->pps->tile_id[s->pps->ctb_addr_rs_to_ts[ctb_addr_rs-1]];
+ sao[class] = &CTB(s->sao, x_ctb - 1, y_ctb);
+ vert_edge[0] = (!lfase[0] && CTB(s->tab_slice_address, x_ctb, y_ctb) != CTB(s->tab_slice_address, x_ctb - 1, y_ctb)) || left_tile_edge;
+ vert_edge[2] = vert_edge[0];
+ lfase[2] = CTB(s->filter_slice_edges, x_ctb - 1, y_ctb);
+ classes[class] = 2;
+ class++;
+ x_shift = 8;
+ }
+
+ if (!edges[1]) {
+ up_tile_edge = no_tile_filter && 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]];
+ sao[class] = &CTB(s->sao, x_ctb, y_ctb - 1);
+ horiz_edge[0] = (!lfase[0] && CTB(s->tab_slice_address, x_ctb, y_ctb) != CTB(s->tab_slice_address, x_ctb, y_ctb - 1)) || up_tile_edge;
+ horiz_edge[1] = horiz_edge[0];
+ lfase[1] = CTB(s->filter_slice_edges, x_ctb, y_ctb - 1);
+ classes[class] = 1;
+ class++;
+ y_shift = 4;
+
+ if (!edges[0]) {
+ classes[class] = 3;
+ sao[class] = &CTB(s->sao, x_ctb - 1, y_ctb - 1);
+ class++;
+
+ // Tile check here is done current CTB row/col, not above/left like you'd expect,
+ //but that is because the tile boundary always extends through the whole pic
+ vert_edge[1] = (!lfase[1] && CTB(s->tab_slice_address, x_ctb, y_ctb - 1) != CTB(s->tab_slice_address, x_ctb - 1, y_ctb - 1)) || left_tile_edge;
+ vert_edge[3] = vert_edge[1];
+ horiz_edge[2] = (!lfase[2] && CTB(s->tab_slice_address, x_ctb - 1, y_ctb) != CTB(s->tab_slice_address, x_ctb - 1, y_ctb - 1)) || up_tile_edge;
+ horiz_edge[3] = horiz_edge[2];
+ diag_edge[0] = (!lfase[0] && CTB(s->tab_slice_address, x_ctb, y_ctb) != CTB(s->tab_slice_address, x_ctb - 1, y_ctb - 1)) || left_tile_edge || up_tile_edge;
+ 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)) {
+ 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)) {
+ diag_edge[1] = !lfase[1] || left_tile_edge || up_tile_edge;
+ diag_edge[2] = diag_edge[1];
+ } else {
+ // Same slice, only consider tiles
+ diag_edge[2] = left_tile_edge || up_tile_edge;
+ diag_edge[1] = diag_edge[2];
+ }
+ }
+ }
+
+ for (c_idx = 0; c_idx < 3; c_idx++) {
+ int chroma = c_idx ? 1 : 0;
+ int x0 = x >> chroma;
+ int y0 = y >> chroma;
+ int stride = s->frame->linesize[c_idx];
+ int ctb_size = (1 << (s->sps->log2_ctb_size)) >> s->sps->hshift[c_idx];
+ int width = FFMIN(ctb_size,
+ (s->sps->width >> s->sps->hshift[c_idx]) - x0);
+ int height = FFMIN(ctb_size,
+ (s->sps->height >> s->sps->vshift[c_idx]) - y0);
+
+ uint8_t *src = &s->frame->data[c_idx][y0 * stride + (x0 << s->sps->pixel_shift)];
+ uint8_t *dst = &s->sao_frame->data[c_idx][y0 * stride + (x0 << s->sps->pixel_shift)];
+ int offset = (y_shift >> chroma) * stride + ((x_shift >> chroma) << s->sps->pixel_shift);
+
+ copy_CTB(dst - offset, src - offset,
+ (edges[2] ? width + (x_shift >> chroma) : width) << s->sps->pixel_shift,
+ (edges[3] ? height + (y_shift >> chroma) : height), stride);
+
+ for (class_index = 0; class_index < class; class_index++) {
+
+ 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;
+ 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]]);
+ break;
+ }
+ }
+ }
+}
+
+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;
+
+ if (x < 0 || x_pu >= s->sps->min_pu_width ||
+ y < 0 || 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)]
+
+static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0)
+{
+ uint8_t *src;
+ int x, y, x_end, y_end, chroma;
+ 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 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 tc_offset, left_tc_offset, beta_offset, left_beta_offset;
+ 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;
+ }
+
+ x_end = x0 + ctb_size;
+ if (x_end > s->sps->width)
+ x_end = s->sps->width;
+ y_end = y0 + ctb_size;
+ if (y_end > s->sps->height)
+ y_end = s->sps->height;
+
+ tc_offset = cur_tc_offset;
+ beta_offset = cur_beta_offset;
+
+ // vertical filtering luma
+ for (y = y0; y < y_end; y += 8) {
+ for (x = x0 ? x0 : 8; x < x_end; x += 8) {
+ 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 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)];
+ 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);
+ } else
+ s->hevcdsp.hevc_v_loop_filter_luma(src,
+ s->frame->linesize[LUMA],
+ beta, tc, no_p, no_q);
+ }
+ }
+ }
+
+ // 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];
+ 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 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)];
+ 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);
+ } else
+ s->hevcdsp.hevc_v_loop_filter_chroma(src,
+ s->frame->linesize[chroma],
+ c_tc, no_p, no_q);
+ }
+ }
+ }
+ }
+
+ // horizontal filtering luma
+ if (x_end != s->sps->width)
+ x_end -= 8;
+ for (y = y0 ? y0 : 8; y < y_end; y += 8) {
+ for (x = x0 ? x0 - 8 : 0; x < x_end; x += 8) {
+ const int bs0 = s->horizontal_bs[(x + y * s->bs_width) >> 2];
+ const int bs1 = s->horizontal_bs[(x + 4 + y * s->bs_width) >> 2];
+ if (bs0 || bs1) {
+ 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;
+ 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)];
+ 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);
+ } else
+ s->hevcdsp.hevc_h_loop_filter_luma(src,
+ s->frame->linesize[LUMA],
+ beta, tc, no_p, no_q);
+ }
+ }
+ }
+
+ // horizontal filtering chroma
+ for (chroma = 1; chroma <= 2; chroma++) {
+ for (y = y0 ? y0 : 16; y < y_end; y += 16) {
+ for (x = x0 - 8; x < x_end; x += 16) {
+ int bs0, bs1;
+ // to make sure no memory access over boundary when x = -8
+ // TODO: simplify with row based deblocking
+ if (x < 0) {
+ 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];
+ bs1 = 0;
+ } else {
+ 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;
+
+ 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)];
+ 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);
+ } else
+ s->hevcdsp.hevc_h_loop_filter_chroma(src,
+ s->frame->linesize[chroma],
+ c_tc, no_p, no_q);
+ }
+ }
+ }
+ }
+}
+
+static int boundary_strength(HEVCContext *s, MvField *curr,
+ uint8_t curr_cbf_luma, MvField *neigh,
+ uint8_t neigh_cbf_luma,
+ RefPicList *neigh_refPicList,
+ int tu_border)
+{
+ int mvs = curr->pred_flag[0] + curr->pred_flag[1];
+
+ if (tu_border) {
+ if (curr->is_intra || neigh->is_intra)
+ return 2;
+ if (curr_cbf_luma || neigh_cbf_luma)
+ return 1;
+ }
+
+ 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]] &&
+ 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 ||
+ abs(neigh->mv[1].x - curr->mv[1].x) >= 4 || abs(neigh->mv[1].y - curr->mv[1].y) >= 4) &&
+ (abs(neigh->mv[1].x - curr->mv[0].x) >= 4 || abs(neigh->mv[1].y - curr->mv[0].y) >= 4 ||
+ abs(neigh->mv[0].x - curr->mv[1].x) >= 4 || abs(neigh->mv[0].y - curr->mv[1].y) >= 4))
+ return 1;
+ else
+ return 0;
+ } else if (neigh_refPicList[0].list[neigh->ref_idx[0]] == s->ref->refPicList[0].list[curr->ref_idx[0]] &&
+ neigh_refPicList[1].list[neigh->ref_idx[1]] == s->ref->refPicList[1].list[curr->ref_idx[1]]) {
+ if (abs(neigh->mv[0].x - curr->mv[0].x) >= 4 || abs(neigh->mv[0].y - curr->mv[0].y) >= 4 ||
+ abs(neigh->mv[1].x - curr->mv[1].x) >= 4 || abs(neigh->mv[1].y - curr->mv[1].y) >= 4)
+ return 1;
+ else
+ return 0;
+ } else if (neigh_refPicList[1].list[neigh->ref_idx[1]] == s->ref->refPicList[0].list[curr->ref_idx[0]] &&
+ neigh_refPicList[0].list[neigh->ref_idx[0]] == s->ref->refPicList[1].list[curr->ref_idx[1]]) {
+ if (abs(neigh->mv[1].x - curr->mv[0].x) >= 4 || abs(neigh->mv[1].y - curr->mv[0].y) >= 4 ||
+ abs(neigh->mv[0].x - curr->mv[1].x) >= 4 || abs(neigh->mv[0].y - curr->mv[1].y) >= 4)
+ return 1;
+ else
+ return 0;
+ } else {
+ return 1;
+ }
+ } else { // 1 MV
+ Mv A, B;
+ int ref_A, ref_B;
+
+ if (curr->pred_flag[0]) {
+ A = curr->mv[0];
+ ref_A = s->ref->refPicList[0].list[curr->ref_idx[0]];
+ } else {
+ A = curr->mv[1];
+ ref_A = s->ref->refPicList[1].list[curr->ref_idx[1]];
+ }
+
+ if (neigh->pred_flag[0]) {
+ B = neigh->mv[0];
+ ref_B = neigh_refPicList[0].list[neigh->ref_idx[0]];
+ } else {
+ B = neigh->mv[1];
+ ref_B = neigh_refPicList[1].list[neigh->ref_idx[1]];
+ }
+
+ if (ref_A == ref_B) {
+ if (abs(A.x - B.x) >= 4 || abs(A.y - B.y) >= 4)
+ return 1;
+ else
+ return 0;
+ } else
+ return 1;
+ }
+ }
+
+ 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)
+{
+ 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, 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 yp_tu = (y0 - 1) >> 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;
+ 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 - 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)
+ bs = 0;
+ if (y0 == 0 || s->sh.disable_deblocking_filter_flag == 1)
+ bs = 0;
+ if (bs)
+ s->horizontal_bs[((x0 + i) + y0 * s->bs_width) >> 2] = bs;
+ }
+ }
+
+ // bs for TU internal horizontal PU boundaries
+ if (log2_trafo_size > s->sps->log2_min_pu_size && !is_intra)
+ for (j = 8; j < (1 << log2_trafo_size); j += 8) {
+ int yp_pu = (y0 + j - 1) >> log2_min_pu_size;
+ int yq_pu = (y0 + j) >> log2_min_pu_size;
+ 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) {
+ 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);
+
+ 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)
+ s->horizontal_bs[((x0 + i) + (y0 + j) * s->bs_width) >> 2] = bs;
+ }
+ }
+
+ // bs for vertical TU boundaries
+ if (x0 > 0 && (x0 & 7) == 0) {
+ int xp_pu = (x0 - 1) >> log2_min_pu_size;
+ int xq_pu = x0 >> log2_min_pu_size;
+ int xp_tu = (x0 - 1) >> log2_min_tu_size;
+ 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;
+ 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)
+ 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)
+ bs = 0;
+ if (x0 == 0 || s->sh.disable_deblocking_filter_flag == 1)
+ bs = 0;
+ if (bs)
+ s->vertical_bs[(x0 >> 3) + ((y0 + i) >> 2) * s->bs_width] = bs;
+ }
+ }
+
+ // bs for TU internal vertical PU boundaries
+ if (log2_trafo_size > log2_min_pu_size && !is_intra)
+ for (j = 0; j < (1 << log2_trafo_size); j += 4) {
+ int y_pu = (y0 + j) >> log2_min_pu_size;
+ int y_tu = (y0 + j) >> log2_min_tu_size;
+
+ 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 xp_tu = (x0 + i - 1) >> 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);
+
+ 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)
+ s->vertical_bs[((x0 + i) >> 3) + ((y0 + j) >> 2) * s->bs_width] = bs;
+ }
+ }
+}
+
+#undef LUMA
+#undef CB
+#undef CR
+
+void ff_hevc_hls_filter(HEVCContext *s, int x, int y)
+{
+ deblocking_filter_CTB(s, x, y);
+ if (s->sps->sao_enabled)
+ sao_filter_CTB(s, x, y);
+}
+
+void ff_hevc_hls_filters(HEVCContext *s, int x_ctb, int y_ctb, int ctb_size)
+{
+ if (y_ctb && x_ctb)
+ ff_hevc_hls_filter(s, x_ctb - ctb_size, y_ctb - ctb_size);
+ if (y_ctb && x_ctb >= s->sps->width - ctb_size) {
+ ff_hevc_hls_filter(s, x_ctb, y_ctb - ctb_size);
+ ff_thread_report_progress(&s->ref->tf, y_ctb - ctb_size, 0);
+ }
+ if (x_ctb && y_ctb >= s->sps->height - ctb_size)
+ ff_hevc_hls_filter(s, x_ctb - ctb_size, y_ctb);
+}

libav-v10.1.tar.bz2/libavcodec/hevc_mvs.c Added

@@ -0,0 +1,820 @@
+/*
+ * HEVC video decoder
+ *
+ * Copyright (C) 2012 - 2013 Guillaume Martres
+ * Copyright (C) 2013 Anand Meher Kotra
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "hevc.h"
+
+static const uint8_t l0_l1_cand_idx[12][2] = {
+ { 0, 1, },
+ { 1, 0, },
+ { 0, 2, },
+ { 2, 0, },
+ { 1, 2, },
+ { 2, 1, },
+ { 0, 3, },
+ { 3, 0, },
+ { 1, 3, },
+ { 3, 1, },
+ { 2, 3, },
+ { 3, 2, },
+};
+
+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);
+ int y0b = y0 & ((1 << s->sps->log2_ctb_size) - 1);
+
+ lc->na.cand_up = (lc->ctb_up_flag || y0b);
+ lc->na.cand_left = (lc->ctb_left_flag || x0b);
+ lc->na.cand_up_left = (!x0b && !y0b) ? lc->ctb_up_left_flag : lc->na.cand_left && lc->na.cand_up;
+ lc->na.cand_up_right_sap =
+ ((x0b + nPbW) == (1 << s->sps->log2_ctb_size)) ?
+ lc->ctb_up_right_flag && !y0b : lc->na.cand_up;
+ lc->na.cand_up_right =
+ ((x0b + nPbW) == (1 << s->sps->log2_ctb_size) ?
+ lc->ctb_up_right_flag && !y0b : lc->na.cand_up )
+ && (x0 + nPbW) < lc->end_of_tiles_x;
+ lc->na.cand_bottom_left = ((y0 + nPbH) >= lc->end_of_tiles_y) ? 0 : lc->na.cand_left;
+}
+
+/*
+ * 6.4.1 Derivation process for z-scan order block availability
+ */
+static int z_scan_block_avail(HEVCContext *s, int xCurr, int yCurr,
+ int xN, int yN)
+{
+#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 N;
+
+ 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,
+ yN >> s->sps->log2_min_tb_size);
+
+ 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)
+{
+ return !(nPbW << 1 == 1 << log2_cb_size &&
+ nPbH << 1 == 1 << log2_cb_size && partIdx == 1 &&
+ lc->cu.x + nPbW > xA1 &&
+ lc->cu.y + nPbH <= yA1);
+}
+
+/*
+ * 6.4.2 Derivation process for prediction block availability
+ */
+static int check_prediction_block_available(HEVCContext *s, int log2_cb_size,
+ int x0, int y0, int nPbW, int nPbH,
+ int xA1, int yA1, int partIdx)
+{
+ HEVCLocalContext *lc = &s->HEVClc;
+
+ if (lc->cu.x < xA1 && lc->cu.y < yA1 &&
+ (lc->cu.x + (1 << log2_cb_size)) > xA1 &&
+ (lc->cu.y + (1 << log2_cb_size)) > yA1)
+ return same_prediction_block(lc, log2_cb_size, x0, y0,
+ nPbW, nPbH, xA1, yA1, partIdx);
+ else
+ return z_scan_block_avail(s, x0, y0, xA1, yA1);
+}
+
+//check if the two luma locations belong to the same mostion estimation region
+static int isDiffMER(HEVCContext *s, int xN, int yN, int xP, int yP)
+{
+ uint8_t plevel = s->pps->log2_parallel_merge_level;
+
+ return xN >> plevel == xP >> plevel &&
+ yN >> plevel == yP >> plevel;
+}
+
+#define MATCH(x) (A.x == B.x)
+
+// check if the mv's and refidx are the same between A and B
+static int compareMVrefidx(struct MvField A, struct MvField B)
+{
+ if (A.pred_flag[0] && A.pred_flag[1] && B.pred_flag[0] && B.pred_flag[1])
+ return MATCH(ref_idx[0]) && MATCH(mv[0].x) && MATCH(mv[0].y) &&
+ MATCH(ref_idx[1]) && MATCH(mv[1].x) && MATCH(mv[1].y);
+
+ if (A.pred_flag[0] && !A.pred_flag[1] && B.pred_flag[0] && !B.pred_flag[1])
+ return MATCH(ref_idx[0]) && MATCH(mv[0].x) && MATCH(mv[0].y);
+
+ if (!A.pred_flag[0] && A.pred_flag[1] && !B.pred_flag[0] && B.pred_flag[1])
+ return MATCH(ref_idx[1]) && MATCH(mv[1].x) && MATCH(mv[1].y);
+
+ return 0;
+}
+
+static av_always_inline void mv_scale(Mv *dst, Mv *src, int td, int tb)
+{
+ int tx, scale_factor;
+
+ td = av_clip_int8_c(td);
+ tb = av_clip_int8_c(tb);
+ tx = (0x4000 + abs(td / 2)) / td;
+ scale_factor = av_clip_c((tb * tx + 32) >> 6, -4096, 4095);
+ dst->x = av_clip_int16_c((scale_factor * src->x + 127 +
+ (scale_factor * src->x < 0)) >> 8);
+ dst->y = av_clip_int16_c((scale_factor * src->y + 127 +
+ (scale_factor * src->y < 0)) >> 8);
+}
+
+static int check_mvset(Mv *mvLXCol, Mv *mvCol,
+ int colPic, int poc,
+ RefPicList *refPicList, int X, int refIdxLx,
+ RefPicList *refPicList_col, int listCol, int refidxCol)
+{
+ int cur_lt = refPicList[X].isLongTerm[refIdxLx];
+ int col_lt = refPicList_col[listCol].isLongTerm[refidxCol];
+ int col_poc_diff, cur_poc_diff;
+
+ if (cur_lt != col_lt) {
+ mvLXCol->x = 0;
+ mvLXCol->y = 0;
+ return 0;
+ }
+
+ col_poc_diff = colPic - refPicList_col[listCol].list[refidxCol];
+ cur_poc_diff = poc - refPicList[X].list[refIdxLx];
+
+ if (!col_poc_diff)
+ col_poc_diff = 1; // error resilience
+
+ if (cur_lt || col_poc_diff == cur_poc_diff) {
+ mvLXCol->x = mvCol->x;
+ mvLXCol->y = mvCol->y;
+ } else {
+ mv_scale(mvLXCol, mvCol, col_poc_diff, cur_poc_diff);
+ }
+ 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])
+
+// 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)
+{
+ RefPicList *refPicList = s->ref->refPicList;
+
+ if (temp_col.is_intra) {
+ mvLXCol->x = 0;
+ mvLXCol->y = 0;
+ return 0;
+ }
+
+ if (temp_col.pred_flag[0] == 0)
+ return CHECK_MVSET(1);
+ else if (temp_col.pred_flag[0] == 1 && temp_col.pred_flag[1] == 0)
+ return CHECK_MVSET(0);
+ else if (temp_col.pred_flag[0] == 1 && temp_col.pred_flag[1] == 1) {
+ int check_diffpicount = 0;
+ int i = 0;
+ for (i = 0; i < refPicList[0].nb_refs; i++) {
+ if (refPicList[0].list[i] > s->poc)
+ check_diffpicount++;
+ }
+ for (i = 0; i < refPicList[1].nb_refs; i++) {
+ if (refPicList[1].list[i] > s->poc)
+ check_diffpicount++;
+ }
+ if (check_diffpicount == 0 && X == 0)
+ return CHECK_MVSET(0);
+ else if (check_diffpicount == 0 && X == 1)
+ return CHECK_MVSET(1);
+ else {
+ if (s->sh.collocated_list == L1)
+ return CHECK_MVSET(0);
+ else
+ return CHECK_MVSET(1);
+ }
+ }
+
+ return 0;
+}
+
+#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 DERIVE_TEMPORAL_COLOCATED_MVS \
+ derive_temporal_colocated_mvs(s, temp_col, \
+ refIdxLx, mvLXCol, X, colPic, \
+ ff_hevc_get_ref_list(s, ref, x, y))
+
+/*
+ * 8.5.3.1.7 temporal luma motion vector prediction
+ */
+static int temporal_luma_motion_vector(HEVCContext *s, int x0, int y0,
+ int nPbW, int nPbH, int refIdxLx,
+ Mv *mvLXCol, int X)
+{
+ MvField *tab_mvf;
+ MvField temp_col;
+ int x, y, x_pu, y_pu;
+ int min_pu_width = s->sps->min_pu_width;
+ int availableFlagLXCol = 0;
+ int colPic;
+
+ HEVCFrame *ref = s->ref->collocated_ref;
+
+ if (!ref)
+ return 0;
+
+ tab_mvf = ref->tab_mvf;
+ colPic = ref->poc;
+
+ //bottom right collocated motion vector
+ x = x0 + nPbW;
+ y = y0 + nPbH;
+
+ ff_thread_await_progress(&ref->tf, y, 0);
+ if (tab_mvf &&
+ (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);
+ 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);
+ availableFlagLXCol = DERIVE_TEMPORAL_COLOCATED_MVS;
+ }
+ return availableFlagLXCol;
+}
+
+#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 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 singleMCLFlag, int part_idx,
+ struct MvField mergecandlist[])
+{
+ HEVCLocalContext *lc = &s->HEVClc;
+ RefPicList *refPicList = s->ref->refPicList;
+ MvField *tab_mvf = s->ref->tab_mvf;
+
+ 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;
+ const int cand_up_left = lc->na.cand_up_left;
+ const int cand_up = lc->na.cand_up;
+ const int cand_up_right = lc->na.cand_up_right_sap;
+
+ const int xA1 = x0 - 1;
+ const int yA1 = y0 + nPbH - 1;
+ const int xA1_pu = xA1 >> s->sps->log2_min_pu_size;
+ const int yA1_pu = yA1 >> s->sps->log2_min_pu_size;
+
+ const int xB1 = x0 + nPbW - 1;
+ const int yB1 = y0 - 1;
+ const int xB1_pu = xB1 >> s->sps->log2_min_pu_size;
+ const int yB1_pu = yB1 >> s->sps->log2_min_pu_size;
+
+ const int xB0 = x0 + nPbW;
+ const int yB0 = y0 - 1;
+ const int xB0_pu = xB0 >> s->sps->log2_min_pu_size;
+ const int yB0_pu = yB0 >> s->sps->log2_min_pu_size;
+
+ const int xA0 = x0 - 1;
+ const int yA0 = y0 + nPbH;
+ const int xA0_pu = xA0 >> s->sps->log2_min_pu_size;
+ const int yA0_pu = yA0 >> s->sps->log2_min_pu_size;
+
+ const int xB2 = x0 - 1;
+ const int yB2 = y0 - 1;
+ const int xB2_pu = xB2 >> s->sps->log2_min_pu_size;
+ const int yB2_pu = yB2 >> s->sps->log2_min_pu_size;
+
+ const int nb_refs = (s->sh.slice_type == P_SLICE) ?
+ s->sh.nb_refs[0] : FFMIN(s->sh.nb_refs[0], s->sh.nb_refs[1]);
+ int check_MER = 1;
+ int check_MER_1 = 1;
+
+ int zero_idx = 0;
+
+ int nb_merge_cand = 0;
+ int nb_orig_merge_cand = 0;
+
+ int is_available_a0;
+ int is_available_a1;
+ int is_available_b0;
+ int is_available_b1;
+ int is_available_b2;
+ int check_B0;
+ int check_A0;
+
+ //first left spatial merge candidate
+ is_available_a1 = AVAILABLE(cand_left, A1);
+
+ if (!singleMCLFlag && part_idx == 1 &&
+ (lc->cu.part_mode == PART_Nx2N ||
+ lc->cu.part_mode == PART_nLx2N ||
+ lc->cu.part_mode == PART_nRx2N) ||
+ isDiffMER(s, xA1, yA1, x0, y0)) {
+ is_available_a1 = 0;
+ }
+
+ if (is_available_a1)
+ mergecandlist[nb_merge_cand++] = TAB_MVF_PU(A1);
+
+ // above spatial merge candidate
+ is_available_b1 = AVAILABLE(cand_up, B1);
+
+ if (!singleMCLFlag && part_idx == 1 &&
+ (lc->cu.part_mode == PART_2NxN ||
+ lc->cu.part_mode == PART_2NxnU ||
+ lc->cu.part_mode == PART_2NxnD) ||
+ isDiffMER(s, xB1, yB1, x0, y0)) {
+ is_available_b1 = 0;
+ }
+
+ if (is_available_a1 && is_available_b1)
+ check_MER = !COMPARE_MV_REFIDX(B1, A1);
+
+ if (is_available_b1 && check_MER)
+ mergecandlist[nb_merge_cand++] = TAB_MVF_PU(B1);
+
+ // above right spatial merge candidate
+ check_MER = 1;
+ check_B0 = PRED_BLOCK_AVAILABLE(B0);
+
+ is_available_b0 = check_B0 && AVAILABLE(cand_up_right, B0);
+
+ if (isDiffMER(s, xB0, yB0, x0, y0))
+ is_available_b0 = 0;
+
+ if (is_available_b1 && is_available_b0)
+ check_MER = !COMPARE_MV_REFIDX(B0, B1);
+
+ if (is_available_b0 && check_MER)
+ mergecandlist[nb_merge_cand++] = TAB_MVF_PU(B0);
+
+ // left bottom spatial merge candidate
+ check_MER = 1;
+ check_A0 = PRED_BLOCK_AVAILABLE(A0);
+
+ is_available_a0 = check_A0 && AVAILABLE(cand_bottom_left, A0);
+
+ if (isDiffMER(s, xA0, yA0, x0, y0))
+ is_available_a0 = 0;
+
+ if (is_available_a1 && is_available_a0)
+ check_MER = !COMPARE_MV_REFIDX(A0, A1);
+
+ if (is_available_a0 && check_MER)
+ mergecandlist[nb_merge_cand++] = TAB_MVF_PU(A0);
+
+ // above left spatial merge candidate
+ check_MER = 1;
+
+ is_available_b2 = AVAILABLE(cand_up_left, B2);
+
+ if (isDiffMER(s, xB2, yB2, x0, y0))
+ is_available_b2 = 0;
+
+ if (is_available_a1 && is_available_b2)
+ check_MER = !COMPARE_MV_REFIDX(B2, A1);
+
+ if (is_available_b1 && is_available_b2)
+ check_MER_1 = !COMPARE_MV_REFIDX(B2, B1);
+
+ if (is_available_b2 && check_MER && check_MER_1 && nb_merge_cand != 4)
+ mergecandlist[nb_merge_cand++] = TAB_MVF_PU(B2);
+
+ // temporal motion vector candidate
+ if (s->sh.slice_temporal_mvp_enabled_flag &&
+ nb_merge_cand < s->sh.max_num_merge_cand) {
+ Mv mv_l0_col, mv_l1_col;
+ int available_l0 = temporal_luma_motion_vector(s, x0, y0, nPbW, nPbH,
+ 0, &mv_l0_col, 0);
+ int available_l1 = (s->sh.slice_type == B_SLICE) ?
+ temporal_luma_motion_vector(s, x0, y0, nPbW, nPbH,
+ 0, &mv_l1_col, 1) : 0;
+
+ if (available_l0 || available_l1) {
+ mergecandlist[nb_merge_cand].is_intra = 0;
+ mergecandlist[nb_merge_cand].pred_flag[0] = available_l0;
+ mergecandlist[nb_merge_cand].pred_flag[1] = available_l1;
+ if (available_l0) {
+ mergecandlist[nb_merge_cand].mv[0] = mv_l0_col;
+ mergecandlist[nb_merge_cand].ref_idx[0] = 0;
+ }
+ if (available_l1) {
+ mergecandlist[nb_merge_cand].mv[1] = mv_l1_col;
+ mergecandlist[nb_merge_cand].ref_idx[1] = 0;
+ }
+ nb_merge_cand++;
+ }
+ }
+
+ nb_orig_merge_cand = nb_merge_cand;
+
+ // combined bi-predictive merge candidates (applies for B slices)
+ if (s->sh.slice_type == B_SLICE && nb_orig_merge_cand > 1 &&
+ nb_orig_merge_cand < s->sh.max_num_merge_cand) {
+ int comb_idx;
+
+ for (comb_idx = 0; nb_merge_cand < s->sh.max_num_merge_cand &&
+ comb_idx < nb_orig_merge_cand * (nb_orig_merge_cand - 1); comb_idx++) {
+ int l0_cand_idx = l0_l1_cand_idx[comb_idx][0];
+ int l1_cand_idx = l0_l1_cand_idx[comb_idx][1];
+ MvField l0_cand = mergecandlist[l0_cand_idx];
+ MvField l1_cand = mergecandlist[l1_cand_idx];
+
+ if (l0_cand.pred_flag[0] && l1_cand.pred_flag[1] &&
+ (refPicList[0].list[l0_cand.ref_idx[0]] !=
+ refPicList[1].list[l1_cand.ref_idx[1]] ||
+ l0_cand.mv[0].x != l1_cand.mv[1].x ||
+ l0_cand.mv[0].y != l1_cand.mv[1].y)) {
+ mergecandlist[nb_merge_cand].ref_idx[0] = l0_cand.ref_idx[0];
+ mergecandlist[nb_merge_cand].ref_idx[1] = l1_cand.ref_idx[1];
+ mergecandlist[nb_merge_cand].pred_flag[0] = 1;
+ mergecandlist[nb_merge_cand].pred_flag[1] = 1;
+ mergecandlist[nb_merge_cand].mv[0].x = l0_cand.mv[0].x;
+ mergecandlist[nb_merge_cand].mv[0].y = l0_cand.mv[0].y;
+ mergecandlist[nb_merge_cand].mv[1].x = l1_cand.mv[1].x;
+ mergecandlist[nb_merge_cand].mv[1].y = l1_cand.mv[1].y;
+ mergecandlist[nb_merge_cand].is_intra = 0;
+ nb_merge_cand++;
+ }
+ }
+ }
+
+ // append Zero motion vector candidates
+ while (nb_merge_cand < s->sh.max_num_merge_cand) {
+ mergecandlist[nb_merge_cand].pred_flag[0] = 1;
+ mergecandlist[nb_merge_cand].pred_flag[1] = s->sh.slice_type == B_SLICE;
+ mergecandlist[nb_merge_cand].mv[0].x = 0;
+ mergecandlist[nb_merge_cand].mv[0].y = 0;
+ 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;
+
+ nb_merge_cand++;
+ zero_idx++;
+ }
+}
+
+/*
+ * 8.5.3.1.1 Derivation process of luma Mvs for merge mode
+ */
+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)
+{
+ int singleMCLFlag = 0;
+ int nCS = 1 << log2_cb_size;
+ struct MvField mergecand_list[MRG_MAX_NUM_CANDS] = { { { { 0 } } } };
+ int nPbW2 = nPbW;
+ int nPbH2 = nPbH;
+ HEVCLocalContext *lc = &s->HEVClc;
+
+ 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;
+ }
+
+ ff_hevc_set_neighbour_available(s, x0, y0, nPbW, nPbH);
+ derive_spatial_merge_candidates(s, x0, y0, nPbW, nPbH, log2_cb_size,
+ singleMCLFlag, part_idx, mergecand_list);
+
+ 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].pred_flag[1] = 0;
+ }
+
+ *mv = mergecand_list[merge_idx];
+}
+
+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) {
+ 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,
+ Mv *mv, int ref_idx_curr, int ref_idx)
+{
+ MvField *tab_mvf = s->ref->tab_mvf;
+ int min_pu_width = s->sps->min_pu_width;
+
+ RefPicList *refPicList = s->ref->refPicList;
+
+ if (TAB_MVF(x, y).pred_flag[pred_flag_index] == 1 &&
+ refPicList[pred_flag_index].list[TAB_MVF(x, y).ref_idx[pred_flag_index]] == refPicList[ref_idx_curr].list[ref_idx]) {
+ *mv = TAB_MVF(x, y).mv[pred_flag_index];
+ return 1;
+ }
+ 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)
+{
+ MvField *tab_mvf = s->ref->tab_mvf;
+ int min_pu_width = s->sps->min_pu_width;
+
+ RefPicList *refPicList = s->ref->refPicList;
+ 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) {
+ *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);
+ 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_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,
+ int merge_idx, MvField *mv,
+ int mvp_lx_flag, int LX)
+{
+ HEVCLocalContext *lc = &s->HEVClc;
+ MvField *tab_mvf = s->ref->tab_mvf;
+ int isScaledFlag_L0 = 0;
+ int availableFlagLXA0 = 0;
+ int availableFlagLXB0 = 0;
+ int numMVPCandLX = 0;
+ int min_pu_width = s->sps->min_pu_width;
+
+ int xA0, yA0;
+ int xA0_pu, yA0_pu;
+ int is_available_a0;
+
+ int xA1, yA1;
+ int xA1_pu, yA1_pu;
+ int is_available_a1;
+
+ int xB0, yB0;
+ int xB0_pu, yB0_pu;
+ int is_available_b0;
+
+ int xB1, yB1;
+ int xB1_pu = 0, yB1_pu = 0;
+ int is_available_b1 = 0;
+
+ int xB2, yB2;
+ int xB2_pu = 0, yB2_pu = 0;
+ int is_available_b2 = 0;
+ Mv mvpcand_list[2] = { { 0 } };
+ Mv mxA = { 0 };
+ Mv mxB = { 0 };
+ int ref_idx_curr = 0;
+ int ref_idx = 0;
+ int pred_flag_index_l0;
+ int pred_flag_index_l1;
+ int x0b = x0 & ((1 << s->sps->log2_ctb_size) - 1);
+ int y0b = y0 & ((1 << s->sps->log2_ctb_size) - 1);
+
+ int cand_up = (lc->ctb_up_flag || y0b);
+ int cand_left = (lc->ctb_left_flag || x0b);
+ int cand_up_left =
+ (!x0b && !y0b) ? lc->ctb_up_left_flag : cand_left && cand_up;
+ int cand_up_right =
+ (x0b + nPbW == (1 << s->sps->log2_ctb_size) ||
+ x0 + nPbW >= lc->end_of_tiles_x) ? lc->ctb_up_right_flag && !y0b
+ : cand_up;
+ int cand_bottom_left = (y0 + nPbH >= lc->end_of_tiles_y) ? 0 : cand_left;
+
+ ref_idx_curr = LX;
+ ref_idx = mv->ref_idx[LX];
+ pred_flag_index_l0 = LX;
+ pred_flag_index_l1 = !LX;
+
+ // left bottom spatial candidate
+ xA0 = x0 - 1;
+ yA0 = y0 + nPbH;
+ xA0_pu = xA0 >> s->sps->log2_min_pu_size;
+ yA0_pu = yA0 >> s->sps->log2_min_pu_size;
+
+ is_available_a0 = PRED_BLOCK_AVAILABLE(A0) && AVAILABLE(cand_bottom_left, A0);
+
+ //left spatial merge candidate
+ 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)
+ isScaledFlag_L0 = 1;
+
+ if (is_available_a0) {
+ availableFlagLXA0 = MP_MX(A0, pred_flag_index_l0, mxA);
+ if (!availableFlagLXA0)
+ availableFlagLXA0 = MP_MX(A0, pred_flag_index_l1, mxA);
+ }
+
+ if (is_available_a1 && !availableFlagLXA0) {
+ availableFlagLXA0 = MP_MX(A1, pred_flag_index_l0, mxA);
+ if (!availableFlagLXA0)
+ availableFlagLXA0 = MP_MX(A1, pred_flag_index_l1, mxA);
+ }
+
+ if (is_available_a0 && !availableFlagLXA0) {
+ availableFlagLXA0 = MP_MX_LT(A0, pred_flag_index_l0, mxA);
+ if (!availableFlagLXA0)
+ availableFlagLXA0 = MP_MX_LT(A0, pred_flag_index_l1, mxA);
+ }
+
+ if (is_available_a1 && !availableFlagLXA0) {
+ availableFlagLXA0 = MP_MX_LT(A1, pred_flag_index_l0, mxA);
+ if (!availableFlagLXA0)
+ availableFlagLXA0 = MP_MX_LT(A1, pred_flag_index_l1, mxA);
+ }
+
+ // B candidates
+ // above right spatial merge candidate
+ xB0 = x0 + nPbW;
+ yB0 = y0 - 1;
+ xB0_pu = xB0 >> s->sps->log2_min_pu_size;
+ yB0_pu = yB0 >> s->sps->log2_min_pu_size;
+
+ is_available_b0 = PRED_BLOCK_AVAILABLE(B0) && AVAILABLE(cand_up_right, B0);
+
+ if (is_available_b0) {
+ availableFlagLXB0 = MP_MX(B0, pred_flag_index_l0, mxB);
+ if (!availableFlagLXB0)
+ availableFlagLXB0 = MP_MX(B0, pred_flag_index_l1, mxB);
+ }
+
+ if (!availableFlagLXB0) {
+ // above spatial merge candidate
+ 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;
+
+ is_available_b1 = AVAILABLE(cand_up, B1);
+
+ if (is_available_b1) {
+ availableFlagLXB0 = MP_MX(B1, pred_flag_index_l0, mxB);
+ if (!availableFlagLXB0)
+ availableFlagLXB0 = MP_MX(B1, pred_flag_index_l1, mxB);
+ }
+ }
+
+ if (!availableFlagLXB0) {
+ // above left spatial merge candidate
+ xB2 = x0 - 1;
+ yB2 = y0 - 1;
+ xB2_pu = xB2 >> s->sps->log2_min_pu_size;
+ yB2_pu = yB2 >> s->sps->log2_min_pu_size;
+ is_available_b2 = AVAILABLE(cand_up_left, B2);
+
+ if (is_available_b2) {
+ availableFlagLXB0 = MP_MX(B2, pred_flag_index_l0, mxB);
+ if (!availableFlagLXB0)
+ availableFlagLXB0 = MP_MX(B2, pred_flag_index_l1, mxB);
+ }
+ }
+
+ if (isScaledFlag_L0 == 0) {
+ if (availableFlagLXB0) {
+ availableFlagLXA0 = 1;
+ mxA = mxB;
+ }
+ availableFlagLXB0 = 0;
+
+ // XB0 and L1
+ if (is_available_b0) {
+ availableFlagLXB0 = MP_MX_LT(B0, pred_flag_index_l0, mxB);
+ if (!availableFlagLXB0)
+ availableFlagLXB0 = MP_MX_LT(B0, pred_flag_index_l1, mxB);
+ }
+
+ if (is_available_b1 && !availableFlagLXB0) {
+ availableFlagLXB0 = MP_MX_LT(B1, pred_flag_index_l0, mxB);
+ if (!availableFlagLXB0)
+ availableFlagLXB0 = MP_MX_LT(B1, pred_flag_index_l1, mxB);
+ }
+
+ if (is_available_b2 && !availableFlagLXB0) {
+ availableFlagLXB0 = MP_MX_LT(B2, pred_flag_index_l0, mxB);
+ if (!availableFlagLXB0)
+ availableFlagLXB0 = MP_MX_LT(B2, pred_flag_index_l1, mxB);
+ }
+ }
+
+ if (availableFlagLXA0)
+ mvpcand_list[numMVPCandLX++] = mxA;
+
+ if (availableFlagLXB0 && (!availableFlagLXA0 || mxA.x != mxB.x || mxA.y != mxB.y))
+ mvpcand_list[numMVPCandLX++] = mxB;
+
+ //temporal motion vector prediction candidate
+ 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);
+ if (available_col)
+ mvpcand_list[numMVPCandLX++] = mv_col;
+ }
+
+ // insert zero motion vectors when the number of available candidates are less than 2
+ while (numMVPCandLX < 2)
+ mvpcand_list[numMVPCandLX++] = (Mv){ 0, 0 };
+
+ mv->mv[LX].x = mvpcand_list[mvp_lx_flag].x;
+ mv->mv[LX].y = mvpcand_list[mvp_lx_flag].y;
+}

libav-v10.1.tar.bz2/libavcodec/hevc_parser.c Added

@@ -0,0 +1,125 @@
+/*
+ * HEVC Annex B format parser
+ *
+ * Copyright (C) 2012 - 2013 Guillaume Martres
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/common.h"
+
+#include "parser.h"
+#include "hevc.h"
+
+#define START_CODE 0x000001 ///< start_code_prefix_one_3bytes
+
+/**
+ * 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)
+{
+ int i;
+ ParseContext *pc = s->priv_data;
+
+ for (i = 0; i < buf_size; i++) {
+ int nut;
+
+ pc->state64 = (pc->state64 << 8) | buf[i];
+
+ if (((pc->state64 >> 3 * 8) & 0xFFFFFF) != START_CODE)
+ continue;
+
+ nut = (pc->state64 >> 2 * 8 + 1) & 0x3F;
+ // Beginning of access unit
+ if ((nut >= NAL_VPS && nut <= NAL_AUD) || nut == NAL_SEI_PREFIX ||
+ (nut >= 41 && nut <= 44) || (nut >= 48 && nut <= 55)) {
+ if (pc->frame_start_found) {
+ pc->frame_start_found = 0;
+ return i - 5;
+ }
+ } else if (nut <= NAL_RASL_R ||
+ (nut >= NAL_BLA_W_LP && nut <= NAL_CRA_NUT)) {
+ int first_slice_segment_in_pic_flag = buf[i] >> 7;
+ if (first_slice_segment_in_pic_flag) {
+ if (!pc->frame_start_found) {
+ pc->frame_start_found = 1;
+ s->key_frame = nut >= NAL_BLA_W_LP && nut <= NAL_CRA_NUT;
+ } else { // First slice of next frame found
+ pc->frame_start_found = 0;
+ return i - 5;
+ }
+ }
+ }
+ }
+
+ return END_NOT_FOUND;
+}
+
+static int hevc_parse(AVCodecParserContext *s, AVCodecContext *avctx,
+ const uint8_t **poutbuf, int *poutbuf_size,
+ const uint8_t *buf, int buf_size)
+{
+ int next;
+ ParseContext *pc = s->priv_data;
+
+ if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
+ next = buf_size;
+ } else {
+ next = hevc_find_frame_end(s, buf, buf_size);
+ if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
+ *poutbuf = NULL;
+ *poutbuf_size = 0;
+ return buf_size;
+ }
+ }
+
+ *poutbuf = buf;
+ *poutbuf_size = buf_size;
+ return next;
+}
+
+// Split after the parameter sets at the beginning of the stream if they exist.
+static int hevc_split(AVCodecContext *avctx, const uint8_t *buf, int buf_size)
+{
+ int i;
+ uint32_t state = -1;
+ int has_ps = 0;
+
+ for (i = 0; i < buf_size; i++) {
+ state = (state << 8) | buf[i];
+ if (((state >> 8) & 0xFFFFFF) == START_CODE) {
+ int nut = (state >> 1) & 0x3F;
+ if (nut >= NAL_VPS && nut <= NAL_PPS)
+ has_ps = 1;
+ else if (has_ps)
+ return i - 3;
+ else // no parameter set at the beginning of the stream
+ return 0;
+ }
+ }
+ return 0;
+}
+
+AVCodecParser ff_hevc_parser = {
+ .codec_ids = { AV_CODEC_ID_HEVC },
+ .priv_data_size = sizeof(ParseContext),
+ .parser_parse = hevc_parse,
+ .parser_close = ff_parse_close,
+ .split = hevc_split,
+};

libav-v10.1.tar.bz2/libavcodec/hevc_ps.c Added

@@ -0,0 +1,1329 @@
+/*
+ * HEVC Parameter Set decoding
+ *
+ * Copyright (C) 2012 - 2103 Guillaume Martres
+ * Copyright (C) 2012 - 2103 Mickael Raulet
+ * Copyright (C) 2012 - 2013 Gildas Cocherel
+ * Copyright (C) 2013 Vittorio Giovara
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/imgutils.h"
+
+#include "golomb.h"
+#include "hevc.h"
+
+static const uint8_t default_scaling_list_intra[] = {
+ 16, 16, 16, 16, 17, 18, 21, 24,
+ 16, 16, 16, 16, 17, 19, 22, 25,
+ 16, 16, 17, 18, 20, 22, 25, 29,
+ 16, 16, 18, 21, 24, 27, 31, 36,
+ 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
+};
+
+static const uint8_t default_scaling_list_inter[] = {
+ 16, 16, 16, 16, 17, 18, 20, 24,
+ 16, 16, 16, 17, 18, 20, 24, 25,
+ 16, 16, 17, 18, 20, 24, 25, 28,
+ 16, 17, 18, 20, 24, 25, 28, 33,
+ 17, 18, 20, 24, 25, 28, 33, 41,
+ 18, 20, 24, 25, 28, 33, 41, 54,
+ 20, 24, 25, 28, 33, 41, 54, 71,
+ 24, 25, 28, 33, 41, 54, 71, 91
+};
+
+static const AVRational vui_sar[] = {
+ { 0, 1 },
+ { 1, 1 },
+ { 12, 11 },
+ { 10, 11 },
+ { 16, 11 },
+ { 40, 33 },
+ { 24, 11 },
+ { 20, 11 },
+ { 32, 11 },
+ { 80, 33 },
+ { 18, 11 },
+ { 15, 11 },
+ { 64, 33 },
+ { 160, 99 },
+ { 4, 3 },
+ { 3, 2 },
+ { 2, 1 },
+};
+
+int ff_hevc_decode_short_term_rps(HEVCContext *s, ShortTermRPS *rps,
+ const HEVCSPS *sps, int is_slice_header)
+{
+ HEVCLocalContext *lc = &s->HEVClc;
+ uint8_t rps_predict = 0;
+ int delta_poc;
+ int k0 = 0;
+ int k1 = 0;
+ int k = 0;
+ int i;
+
+ GetBitContext *gb = &lc->gb;
+
+ if (rps != sps->st_rps && sps->nb_st_rps)
+ rps_predict = get_bits1(gb);
+
+ if (rps_predict) {
+ const ShortTermRPS *rps_ridx;
+ int delta_rps, abs_delta_rps;
+ uint8_t use_delta_flag = 0;
+ uint8_t delta_rps_sign;
+
+ if (is_slice_header) {
+ 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);
+ return AVERROR_INVALIDDATA;
+ }
+ rps_ridx = &sps->st_rps[sps->nb_st_rps - delta_idx];
+ } else
+ rps_ridx = &sps->st_rps[rps - sps->st_rps - 1];
+
+ delta_rps_sign = get_bits1(gb);
+ abs_delta_rps = get_ue_golomb_long(gb) + 1;
+ delta_rps = (1 - (delta_rps_sign << 1)) * abs_delta_rps;
+ for (i = 0; i <= rps_ridx->num_delta_pocs; i++) {
+ int used = rps->used[k] = get_bits1(gb);
+
+ if (!used)
+ use_delta_flag = get_bits1(gb);
+
+ if (used || use_delta_flag) {
+ if (i < rps_ridx->num_delta_pocs)
+ delta_poc = delta_rps + rps_ridx->delta_poc[i];
+ else
+ delta_poc = delta_rps;
+ rps->delta_poc[k] = delta_poc;
+ if (delta_poc < 0)
+ k0++;
+ else
+ k1++;
+ k++;
+ }
+ }
+
+ rps->num_delta_pocs = k;
+ rps->num_negative_pics = k0;
+ // sort in increasing order (smallest first)
+ if (rps->num_delta_pocs != 0) {
+ int used, tmp;
+ 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--) {
+ 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 ((rps->num_negative_pics >> 1) != 0) {
+ 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;
+ k--;
+ }
+ }
+ } else {
+ unsigned int prev, nb_positive_pics;
+ rps->num_negative_pics = get_ue_golomb_long(gb);
+ nb_positive_pics = get_ue_golomb_long(gb);
+
+ if (rps->num_negative_pics >= MAX_REFS ||
+ nb_positive_pics >= MAX_REFS) {
+ av_log(s->avctx, AV_LOG_ERROR, "Too many refs in a short term RPS.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ rps->num_delta_pocs = rps->num_negative_pics + nb_positive_pics;
+ if (rps->num_delta_pocs) {
+ prev = 0;
+ for (i = 0; i < rps->num_negative_pics; i++) {
+ delta_poc = get_ue_golomb_long(gb) + 1;
+ prev -= delta_poc;
+ rps->delta_poc[i] = prev;
+ 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);
+ }
+ }
+ }
+ return 0;
+}
+
+
+static void decode_profile_tier_level(HEVCContext *s, PTLCommon *ptl)
+{
+ int i;
+ GetBitContext *gb = &s->HEVClc.gb;
+
+ 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->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;
+ GetBitContext *gb = &s->HEVClc.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);
+ }
+ 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])
+ decode_profile_tier_level(s, &ptl->sub_layer_ptl[i]);
+ if (ptl->sub_layer_level_present_flag[i])
+ ptl->sub_layer_ptl[i].level_idc = get_bits(gb, 8);
+ }
+}
+
+static void decode_sublayer_hrd(HEVCContext *s, unsigned int nb_cpb,
+ int subpic_params_present)
+{
+ GetBitContext *gb = &s->HEVClc.gb;
+ int i;
+
+ for (i = 0; i < nb_cpb; i++) {
+ get_ue_golomb_long(gb); // bit_rate_value_minus1
+ get_ue_golomb_long(gb); // cpb_size_value_minus1
+
+ if (subpic_params_present) {
+ 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 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;
+ int subpic_params_present = 0;
+ int i;
+
+ if (common_inf_present) {
+ nal_params_present = get_bits1(gb);
+ vcl_params_present = get_bits1(gb);
+
+ if (nal_params_present || vcl_params_present) {
+ subpic_params_present = get_bits1(gb);
+
+ if (subpic_params_present) {
+ skip_bits(gb, 8); // tick_divisor_minus2
+ skip_bits(gb, 5); // du_cpb_removal_delay_increment_length_minus1
+ skip_bits(gb, 1); // sub_pic_cpb_params_in_pic_timing_sei_flag
+ skip_bits(gb, 5); // dpb_output_delay_du_length_minus1
+ }
+
+ skip_bits(gb, 4); // bit_rate_scale
+ skip_bits(gb, 4); // cpb_size_scale
+
+ if (subpic_params_present)
+ 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
+ skip_bits(gb, 5); // dpb_output_delay_length_minus1
+ }
+ }
+
+ for (i = 0; i < max_sublayers; i++) {
+ int low_delay = 0;
+ 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
+ else
+ low_delay = get_bits1(gb);
+
+ if (!low_delay)
+ nb_cpb = get_ue_golomb_long(gb) + 1;
+
+ if (nal_params_present)
+ decode_sublayer_hrd(s, nb_cpb, subpic_params_present);
+ if (vcl_params_present)
+ decode_sublayer_hrd(s, nb_cpb, subpic_params_present);
+ }
+}
+
+int ff_hevc_decode_nal_vps(HEVCContext *s)
+{
+ int i,j;
+ GetBitContext *gb = &s->HEVClc.gb;
+ int vps_id = 0;
+ HEVCVPS *vps;
+ AVBufferRef *vps_buf = av_buffer_allocz(sizeof(*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) {
+ av_log(s->avctx, AV_LOG_ERROR, "VPS id out of range: %d\n", vps_id);
+ goto err;
+ }
+
+ if (get_bits(gb, 2) != 3) { // vps_reserved_three_2bits
+ av_log(s->avctx, AV_LOG_ERROR, "vps_reserved_three_2bits is not three\n");
+ goto err;
+ }
+
+ vps->vps_max_layers = get_bits(gb, 6) + 1;
+ vps->vps_max_sub_layers = get_bits(gb, 3) + 1;
+ vps->vps_temporal_id_nesting_flag = get_bits1(gb);
+
+ if (get_bits(gb, 16) != 0xffff) { // vps_reserved_ffff_16bits
+ av_log(s->avctx, AV_LOG_ERROR, "vps_reserved_ffff_16bits is not 0xffff\n");
+ goto err;
+ }
+
+ if (vps->vps_max_sub_layers > MAX_SUB_LAYERS) {
+ av_log(s->avctx, AV_LOG_ERROR, "vps_max_sub_layers out of range: %d\n",
+ vps->vps_max_sub_layers);
+ 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;
+ for (; i < vps->vps_max_sub_layers; i++) {
+ vps->vps_max_dec_pic_buffering[i] = get_ue_golomb_long(gb) + 1;
+ vps->vps_num_reorder_pics[i] = get_ue_golomb_long(gb);
+ vps->vps_max_latency_increase[i] = get_ue_golomb_long(gb) - 1;
+
+ if (vps->vps_max_dec_pic_buffering[i] > MAX_DPB_SIZE) {
+ av_log(s->avctx, AV_LOG_ERROR, "vps_max_dec_pic_buffering_minus1 out of range: %d\n",
+ vps->vps_max_dec_pic_buffering[i] - 1);
+ goto err;
+ }
+ if (vps->vps_num_reorder_pics[i] > vps->vps_max_dec_pic_buffering[i] - 1) {
+ av_log(s->avctx, AV_LOG_ERROR, "vps_max_num_reorder_pics out of range: %d\n",
+ vps->vps_num_reorder_pics[i]);
+ goto err;
+ }
+ }
+
+ vps->vps_max_layer_id = get_bits(gb, 6);
+ 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]
+
+ vps->vps_timing_info_present_flag = get_bits1(gb);
+ if (vps->vps_timing_info_present_flag) {
+ vps->vps_num_units_in_tick = get_bits_long(gb, 32);
+ vps->vps_time_scale = get_bits_long(gb, 32);
+ vps->vps_poc_proportional_to_timing_flag = get_bits1(gb);
+ if (vps->vps_poc_proportional_to_timing_flag)
+ vps->vps_num_ticks_poc_diff_one = get_ue_golomb_long(gb) + 1;
+ vps->vps_num_hrd_parameters = get_ue_golomb_long(gb);
+ for (i = 0; i < vps->vps_num_hrd_parameters; i++) {
+ int common_inf_present = 1;
+
+ get_ue_golomb_long(gb); // hrd_layer_set_idx
+ if (i)
+ common_inf_present = get_bits1(gb);
+ decode_hrd(s, common_inf_present, vps->vps_max_sub_layers);
+ }
+ }
+ get_bits1(gb); /* vps_extension_flag */
+
+ av_buffer_unref(&s->vps_list[vps_id]);
+ s->vps_list[vps_id] = vps_buf;
+ return 0;
+
+err:
+ av_buffer_unref(&vps_buf);
+ return AVERROR_INVALIDDATA;
+}
+
+static void decode_vui(HEVCContext *s, HEVCSPS *sps)
+{
+ VUI *vui = &sps->vui;
+ GetBitContext *gb = &s->HEVClc.gb;
+ int sar_present;
+
+ av_log(s->avctx, AV_LOG_DEBUG, "Decoding VUI\n");
+
+ sar_present = get_bits1(gb);
+ if (sar_present) {
+ uint8_t sar_idx = get_bits(gb, 8);
+ if (sar_idx < FF_ARRAY_ELEMS(vui_sar))
+ vui->sar = vui_sar[sar_idx];
+ else if (sar_idx == 255) {
+ 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);
+ }
+
+ vui->overscan_info_present_flag = get_bits1(gb);
+ if (vui->overscan_info_present_flag)
+ vui->overscan_appropriate_flag = get_bits1(gb);
+
+ vui->video_signal_type_present_flag = get_bits1(gb);
+ if (vui->video_signal_type_present_flag) {
+ 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;
+ }
+ }
+
+ vui->chroma_loc_info_present_flag = get_bits1(gb);
+ if (vui->chroma_loc_info_present_flag) {
+ vui->chroma_sample_loc_type_top_field = get_ue_golomb_long(gb);
+ vui->chroma_sample_loc_type_bottom_field = get_ue_golomb_long(gb);
+ }
+
+ vui->neutra_chroma_indication_flag = get_bits1(gb);
+ vui->field_seq_flag = get_bits1(gb);
+ vui->frame_field_info_present_flag = get_bits1(gb);
+
+ vui->default_display_window_flag = get_bits1(gb);
+ if (vui->default_display_window_flag) {
+ //TODO: * 2 is only valid for 420
+ vui->def_disp_win.left_offset = get_ue_golomb_long(gb) * 2;
+ vui->def_disp_win.right_offset = get_ue_golomb_long(gb) * 2;
+ 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->apply_defdispwin &&
+ s->avctx->flags2 & CODEC_FLAG2_IGNORE_CROP) {
+ av_log(s->avctx, AV_LOG_DEBUG,
+ "discarding vui default display window, "
+ "original values are l:%u r:%u t:%u b:%u\n",
+ vui->def_disp_win.left_offset,
+ vui->def_disp_win.right_offset,
+ vui->def_disp_win.top_offset,
+ vui->def_disp_win.bottom_offset);
+
+ vui->def_disp_win.left_offset =
+ vui->def_disp_win.right_offset =
+ vui->def_disp_win.top_offset =
+ vui->def_disp_win.bottom_offset = 0;
+ }
+ }
+
+ vui->vui_timing_info_present_flag = get_bits1(gb);
+ if (vui->vui_timing_info_present_flag) {
+ 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);
+ vui->vui_hrd_parameters_present_flag = get_bits1(gb);
+ if (vui->vui_hrd_parameters_present_flag)
+ decode_hrd(s, 1, sps->max_sub_layers);
+ }
+
+ vui->bitstream_restriction_flag = get_bits1(gb);
+ if (vui->bitstream_restriction_flag) {
+ vui->tiles_fixed_structure_flag = get_bits1(gb);
+ vui->motion_vectors_over_pic_boundaries_flag = get_bits1(gb);
+ vui->restricted_ref_pic_lists_flag = get_bits1(gb);
+ vui->min_spatial_segmentation_idc = get_ue_golomb_long(gb);
+ vui->max_bytes_per_pic_denom = get_ue_golomb_long(gb);
+ vui->max_bits_per_min_cu_denom = get_ue_golomb_long(gb);
+ vui->log2_max_mv_length_horizontal = get_ue_golomb_long(gb);
+ vui->log2_max_mv_length_vertical = get_ue_golomb_long(gb);
+ }
+}
+
+static void set_default_scaling_list_data(ScalingList *sl)
+{
+ int matrixId;
+
+ for (matrixId = 0; matrixId < 6; matrixId++) {
+ // 4x4 default is 16
+ memset(sl->sl[0][matrixId], 16, 16);
+ sl->sl_dc[0][matrixId] = 16; // default for 16x16
+ sl->sl_dc[1][matrixId] = 16; // default for 32x32
+ }
+ memcpy(sl->sl[1][0], default_scaling_list_intra, 64);
+ memcpy(sl->sl[1][1], default_scaling_list_intra, 64);
+ memcpy(sl->sl[1][2], default_scaling_list_intra, 64);
+ memcpy(sl->sl[1][3], default_scaling_list_inter, 64);
+ memcpy(sl->sl[1][4], default_scaling_list_inter, 64);
+ memcpy(sl->sl[1][5], default_scaling_list_inter, 64);
+ memcpy(sl->sl[2][0], default_scaling_list_intra, 64);
+ memcpy(sl->sl[2][1], default_scaling_list_intra, 64);
+ memcpy(sl->sl[2][2], default_scaling_list_intra, 64);
+ memcpy(sl->sl[2][3], default_scaling_list_inter, 64);
+ memcpy(sl->sl[2][4], default_scaling_list_inter, 64);
+ memcpy(sl->sl[2][5], default_scaling_list_inter, 64);
+ memcpy(sl->sl[3][0], default_scaling_list_intra, 64);
+ memcpy(sl->sl[3][1], default_scaling_list_inter, 64);
+}
+
+static int scaling_list_data(HEVCContext *s, ScalingList *sl)
+{
+ 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;
+
+ for (size_id = 0; size_id < 4; size_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]) {
+ 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) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Invalid delta in scaling list data: %d.\n", delta);
+ return AVERROR_INVALIDDATA;
+ }
+
+ memcpy(sl->sl[size_id][matrix_id],
+ sl->sl[size_id][matrix_id - delta],
+ size_id > 0 ? 64 : 16);
+ if (size_id > 1)
+ sl->sl_dc[size_id - 2][matrix_id] = sl->sl_dc[size_id - 2][matrix_id - delta];
+ }
+ } else {
+ int next_coef, coef_num;
+ int32_t scaling_list_delta_coef;
+
+ next_coef = 8;
+ 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];
+ sl->sl_dc[size_id - 2][matrix_id] = next_coef;
+ }
+ 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];
+ else
+ 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;
+ sl->sl[size_id][matrix_id][pos] = next_coef;
+ }
+ }
+ }
+
+ return 0;
+}
+
+int ff_hevc_decode_nal_sps(HEVCContext *s)
+{
+ const AVPixFmtDescriptor *desc;
+ GetBitContext *gb = &s->HEVClc.gb;
+ 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;
+
+ HEVCSPS *sps;
+ AVBufferRef *sps_buf = av_buffer_allocz(sizeof(*sps));
+
+ if (!sps_buf)
+ return AVERROR(ENOMEM);
+ sps = (HEVCSPS*)sps_buf->data;
+
+ av_log(s->avctx, AV_LOG_DEBUG, "Decoding SPS\n");
+
+ // Coded parameters
+
+ sps->vps_id = get_bits(gb, 4);
+ if (sps->vps_id >= MAX_VPS_COUNT) {
+ av_log(s->avctx, AV_LOG_ERROR, "VPS id out of range: %d\n", sps->vps_id);
+ ret = AVERROR_INVALIDDATA;
+ 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",
+ sps->max_sub_layers);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+
+ skip_bits1(gb); // temporal_id_nesting_flag
+
+ 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);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+
+ 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_PATCHWELCOME;
+ goto err;
+ }
+
+ if (sps->chroma_format_idc == 3)
+ sps->separate_colour_plane_flag = get_bits1(gb);
+
+ sps->width = get_ue_golomb_long(gb);
+ sps->height = get_ue_golomb_long(gb);
+ if ((ret = av_image_check_size(sps->width,
+ sps->height, 0, s->avctx)) < 0)
+ goto err;
+
+ if (get_bits1(gb)) { // pic_conformance_flag
+ //TODO: * 2 is only valid for 420
+ sps->pic_conf_win.left_offset = get_ue_golomb_long(gb) * 2;
+ sps->pic_conf_win.right_offset = get_ue_golomb_long(gb) * 2;
+ sps->pic_conf_win.top_offset = get_ue_golomb_long(gb) * 2;
+ sps->pic_conf_win.bottom_offset = get_ue_golomb_long(gb) * 2;
+
+ if (s->avctx->flags2 & CODEC_FLAG2_IGNORE_CROP) {
+ av_log(s->avctx, AV_LOG_DEBUG,
+ "discarding sps conformance window, "
+ "original values are l:%u r:%u t:%u b:%u\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);
+
+ 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_window = sps->pic_conf_win;
+ }
+
+ sps->bit_depth = get_ue_golomb_long(gb) + 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",
+ sps->bit_depth, bit_depth_chroma);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+
+ if (sps->chroma_format_idc == 1) {
+ switch (sps->bit_depth) {
+ case 8: sps->pix_fmt = AV_PIX_FMT_YUV420P; break;
+ case 9: sps->pix_fmt = AV_PIX_FMT_YUV420P9; break;
+ case 10: sps->pix_fmt = AV_PIX_FMT_YUV420P10; break;
+ default:
+ av_log(s->avctx, AV_LOG_ERROR, "Unsupported bit depth: %d\n",
+ sps->bit_depth);
+ ret = AVERROR_PATCHWELCOME;
+ goto err;
+ }
+ } else {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "non-4:2:0 support is currently unspecified.\n");
+ return AVERROR_PATCHWELCOME;
+ }
+
+ desc = av_pix_fmt_desc_get(sps->pix_fmt);
+ if (!desc) {
+ ret = AVERROR(EINVAL);
+ goto err;
+ }
+
+ sps->hshift[0] = sps->vshift[0] = 0;
+ sps->hshift[2] = sps->hshift[1] = desc->log2_chroma_w;
+ sps->vshift[2] = sps->vshift[1] = desc->log2_chroma_h;
+
+ sps->pixel_shift = sps->bit_depth > 8;
+
+ sps->log2_max_poc_lsb = get_ue_golomb_long(gb) + 4;
+ if (sps->log2_max_poc_lsb > 16) {
+ av_log(s->avctx, AV_LOG_ERROR, "log2_max_pic_order_cnt_lsb_minus4 out range: %d\n",
+ sps->log2_max_poc_lsb - 4);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+
+ sublayer_ordering_info = get_bits1(gb);
+ start = sublayer_ordering_info ? 0 : sps->max_sub_layers - 1;
+ for (i = start; i < sps->max_sub_layers; i++) {
+ sps->temporal_layer[i].max_dec_pic_buffering = get_ue_golomb_long(gb) + 1;
+ sps->temporal_layer[i].num_reorder_pics = get_ue_golomb_long(gb);
+ sps->temporal_layer[i].max_latency_increase = get_ue_golomb_long(gb) - 1;
+ if (sps->temporal_layer[i].max_dec_pic_buffering > MAX_DPB_SIZE) {
+ av_log(s->avctx, AV_LOG_ERROR, "sps_max_dec_pic_buffering_minus1 out of range: %d\n",
+ sps->temporal_layer[i].max_dec_pic_buffering - 1);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+ 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 (!sublayer_ordering_info) {
+ 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;
+
+ 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");
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+ sps->max_transform_hierarchy_depth_inter = get_ue_golomb_long(gb);
+ sps->max_transform_hierarchy_depth_intra = get_ue_golomb_long(gb);
+
+ sps->scaling_list_enable_flag = get_bits1(gb);
+ if (sps->scaling_list_enable_flag) {
+ set_default_scaling_list_data(&sps->scaling_list);
+
+ if (get_bits1(gb)) {
+ ret = scaling_list_data(s, &sps->scaling_list);
+ if (ret < 0)
+ goto err;
+ }
+ }
+
+ sps->amp_enabled_flag = get_bits1(gb);
+ sps->sao_enabled = get_bits1(gb);
+
+ sps->pcm_enabled_flag = get_bits1(gb);
+ if (sps->pcm_enabled_flag) {
+ sps->pcm.bit_depth = get_bits(gb, 4) + 1;
+ sps->pcm.bit_depth_chroma = get_bits(gb, 4) + 1;
+ sps->pcm.log2_min_pcm_cb_size = get_ue_golomb_long(gb) + 3;
+ sps->pcm.log2_max_pcm_cb_size = sps->pcm.log2_min_pcm_cb_size +
+ get_ue_golomb_long(gb);
+ if (sps->pcm.bit_depth > sps->bit_depth) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "PCM bit depth (%d) is greater than normal bit depth (%d)\n",
+ sps->pcm.bit_depth, sps->bit_depth);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+
+ sps->pcm.loop_filter_disable_flag = get_bits1(gb);
+ }
+
+ sps->nb_st_rps = get_ue_golomb_long(gb);
+ if (sps->nb_st_rps > MAX_SHORT_TERM_RPS_COUNT) {
+ av_log(s->avctx, AV_LOG_ERROR, "Too many short term RPS: %d.\n",
+ sps->nb_st_rps);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+ for (i = 0; i < sps->nb_st_rps; i++) {
+ if ((ret = ff_hevc_decode_short_term_rps(s, &sps->st_rps[i],
+ sps, 0)) < 0)
+ goto err;
+ }
+
+ sps->long_term_ref_pics_present_flag = get_bits1(gb);
+ if (sps->long_term_ref_pics_present_flag) {
+ sps->num_long_term_ref_pics_sps = get_ue_golomb_long(gb);
+ for (i = 0; i < sps->num_long_term_ref_pics_sps; i++) {
+ sps->lt_ref_pic_poc_lsb_sps[i] = get_bits(gb, sps->log2_max_poc_lsb);
+ sps->used_by_curr_pic_lt_sps_flag[i] = get_bits1(gb);
+ }
+ }
+
+ sps->sps_temporal_mvp_enabled_flag = get_bits1(gb);
+ sps->sps_strong_intra_smoothing_enable_flag = get_bits1(gb);
+ sps->vui.sar = (AVRational){0, 1};
+ vui_present = get_bits1(gb);
+ if (vui_present)
+ decode_vui(s, sps);
+ skip_bits1(gb); // sps_extension_flag
+
+ 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;
+ sps->output_window.bottom_offset += sps->vui.def_disp_win.bottom_offset;
+ }
+ if (sps->output_window.left_offset & (0x1F >> (sps->pixel_shift)) &&
+ !(s->avctx->flags & CODEC_FLAG_UNALIGNED)) {
+ sps->output_window.left_offset &= ~(0x1F >> (sps->pixel_shift));
+ av_log(s->avctx, AV_LOG_WARNING, "Reducing left output window to %d "
+ "chroma samples to preserve alignment.\n",
+ sps->output_window.left_offset);
+ }
+ sps->output_width = sps->width -
+ (sps->output_window.left_offset + sps->output_window.right_offset);
+ sps->output_height = sps->height -
+ (sps->output_window.top_offset + sps->output_window.bottom_offset);
+ if (sps->output_width <= 0 || sps->output_height <= 0) {
+ av_log(s->avctx, AV_LOG_WARNING, "Invalid visible frame dimensions: %dx%d.\n",
+ sps->output_width, sps->output_height);
+ if (s->avctx->err_recognition & AV_EF_EXPLODE) {
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+ 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;
+ }
+
+ // 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->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->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)) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid coded frame dimensions.\n");
+ goto err;
+ }
+
+ if (sps->log2_ctb_size > MAX_LOG2_CTB_SIZE) {
+ av_log(s->avctx, AV_LOG_ERROR, "CTB size out of range: 2^%d\n", sps->log2_ctb_size);
+ goto err;
+ }
+ if (sps->max_transform_hierarchy_depth_inter > sps->log2_ctb_size - sps->log2_min_tb_size) {
+ av_log(s->avctx, AV_LOG_ERROR, "max_transform_hierarchy_depth_inter out of range: %d\n",
+ sps->max_transform_hierarchy_depth_inter);
+ goto err;
+ }
+ if (sps->max_transform_hierarchy_depth_intra > sps->log2_ctb_size - sps->log2_min_tb_size) {
+ av_log(s->avctx, AV_LOG_ERROR, "max_transform_hierarchy_depth_intra out of range: %d\n",
+ sps->max_transform_hierarchy_depth_intra);
+ 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",
+ 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; "
+ "cropped wxh: %dx%d; pix_fmt: %s.\n",
+ sps_id, sps->width, sps->height,
+ sps->output_width, sps->output_height,
+ av_get_pix_fmt_name(sps->pix_fmt));
+ }
+
+ /* check if this is a repeat of an already parsed SPS, then keep the
+ * original one.
+ * otherwise drop all PPSes that depend on it */
+ if (s->sps_list[sps_id] &&
+ !memcmp(s->sps_list[sps_id]->data, sps_buf->data, sps_buf->size)) {
+ av_buffer_unref(&sps_buf);
+ } else {
+ for (i = 0; i < FF_ARRAY_ELEMS(s->pps_list); i++) {
+ if (s->pps_list[i] && ((HEVCPPS*)s->pps_list[i]->data)->sps_id == sps_id)
+ av_buffer_unref(&s->pps_list[i]);
+ }
+ av_buffer_unref(&s->sps_list[sps_id]);
+ s->sps_list[sps_id] = sps_buf;
+ }
+
+ return 0;
+
+err:
+ av_buffer_unref(&sps_buf);
+ return ret;
+}
+
+static void hevc_pps_free(void *opaque, uint8_t *data)
+{
+ HEVCPPS *pps = (HEVCPPS*)data;
+
+ av_freep(&pps->column_width);
+ av_freep(&pps->row_height);
+ av_freep(&pps->col_bd);
+ av_freep(&pps->row_bd);
+ av_freep(&pps->col_idxX);
+ av_freep(&pps->ctb_addr_rs_to_ts);
+ av_freep(&pps->ctb_addr_ts_to_rs);
+ av_freep(&pps->tile_pos_rs);
+ av_freep(&pps->tile_id);
+ av_freep(&pps->min_cb_addr_zs);
+ av_freep(&pps->min_tb_addr_zs);
+
+ av_freep(&pps);
+}
+
+int ff_hevc_decode_nal_pps(HEVCContext *s)
+{
+ GetBitContext *gb = &s->HEVClc.gb;
+ HEVCSPS *sps = NULL;
+ 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;
+ unsigned int pps_id = 0;
+
+ AVBufferRef *pps_buf;
+ HEVCPPS *pps = av_mallocz(sizeof(*pps));
+
+ if (!pps)
+ return AVERROR(ENOMEM);
+
+ pps_buf = av_buffer_create((uint8_t *)pps, sizeof(*pps),
+ hevc_pps_free, NULL, 0);
+ if (!pps_buf) {
+ av_freep(&pps);
+ return AVERROR(ENOMEM);
+ }
+
+ av_log(s->avctx, AV_LOG_DEBUG, "Decoding PPS\n");
+
+ // Default values
+ pps->loop_filter_across_tiles_enabled_flag = 1;
+ pps->num_tile_columns = 1;
+ pps->num_tile_rows = 1;
+ pps->uniform_spacing_flag = 1;
+ pps->disable_dbf = 0;
+ pps->beta_offset = 0;
+ pps->tc_offset = 0;
+
+ // Coded parameters
+ pps_id = get_ue_golomb_long(gb);
+ if (pps_id >= MAX_PPS_COUNT) {
+ av_log(s->avctx, AV_LOG_ERROR, "PPS id out of range: %d\n", pps_id);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+ pps->sps_id = get_ue_golomb_long(gb);
+ if (pps->sps_id >= MAX_SPS_COUNT) {
+ av_log(s->avctx, AV_LOG_ERROR, "SPS id out of range: %d\n", pps->sps_id);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+ if (!s->sps_list[pps->sps_id]) {
+ 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;
+
+ pps->dependent_slice_segments_enabled_flag = get_bits1(gb);
+ pps->output_flag_present_flag = get_bits1(gb);
+ pps->num_extra_slice_header_bits = get_bits(gb, 3);
+
+ pps->sign_data_hiding_flag = get_bits1(gb);
+
+ pps->cabac_init_present_flag = get_bits1(gb);
+
+ pps->num_ref_idx_l0_default_active = get_ue_golomb_long(gb) + 1;
+ pps->num_ref_idx_l1_default_active = get_ue_golomb_long(gb) + 1;
+
+ pps->pic_init_qp_minus26 = get_se_golomb(gb);
+
+ pps->constrained_intra_pred_flag = get_bits1(gb);
+ pps->transform_skip_enabled_flag = get_bits1(gb);
+
+ pps->cu_qp_delta_enabled_flag = get_bits1(gb);
+ pps->diff_cu_qp_delta_depth = 0;
+ if (pps->cu_qp_delta_enabled_flag)
+ pps->diff_cu_qp_delta_depth = get_ue_golomb_long(gb);
+
+ pps->cb_qp_offset = get_se_golomb(gb);
+ if (pps->cb_qp_offset < -12 || pps->cb_qp_offset > 12) {
+ av_log(s->avctx, AV_LOG_ERROR, "pps_cb_qp_offset out of range: %d\n",
+ pps->cb_qp_offset);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+ pps->cr_qp_offset = get_se_golomb(gb);
+ if (pps->cr_qp_offset < -12 || pps->cr_qp_offset > 12) {
+ av_log(s->avctx, AV_LOG_ERROR, "pps_cr_qp_offset out of range: %d\n",
+ pps->cr_qp_offset);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+ pps->pic_slice_level_chroma_qp_offsets_present_flag = get_bits1(gb);
+
+ pps->weighted_pred_flag = get_bits1(gb);
+ pps->weighted_bipred_flag = get_bits1(gb);
+
+ pps->transquant_bypass_enable_flag = get_bits1(gb);
+ pps->tiles_enabled_flag = get_bits1(gb);
+ 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;
+ 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",
+ pps->num_tile_columns - 1);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+ if (pps->num_tile_rows == 0 ||
+ pps->num_tile_rows >= sps->height) {
+ av_log(s->avctx, AV_LOG_ERROR, "num_tile_rows_minus1 out of range: %d\n",
+ pps->num_tile_rows - 1);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+
+ pps->column_width = av_malloc_array(pps->num_tile_columns, sizeof(*pps->column_width));
+ pps->row_height = av_malloc_array(pps->num_tile_rows, sizeof(*pps->row_height));
+ if (!pps->column_width || !pps->row_height) {
+ ret = AVERROR(ENOMEM);
+ goto err;
+ }
+
+ pps->uniform_spacing_flag = get_bits1(gb);
+ if (!pps->uniform_spacing_flag) {
+ 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];
+ }
+ if (sum >= sps->ctb_width) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid tile widths.\n");
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+ pps->column_width[pps->num_tile_columns - 1] = sps->ctb_width - sum;
+
+ 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];
+ }
+ if (sum >= sps->ctb_height) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid tile heights.\n");
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+ pps->row_height[pps->num_tile_rows - 1] = sps->ctb_height - sum;
+ }
+ pps->loop_filter_across_tiles_enabled_flag = get_bits1(gb);
+ }
+
+ pps->seq_loop_filter_across_slices_enabled_flag = get_bits1(gb);
+
+ 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);
+ if (!pps->disable_dbf) {
+ pps->beta_offset = get_se_golomb(gb) * 2;
+ pps->tc_offset = get_se_golomb(gb) * 2;
+ if (pps->beta_offset/2 < -6 || pps->beta_offset/2 > 6) {
+ av_log(s->avctx, AV_LOG_ERROR, "pps_beta_offset_div2 out of range: %d\n",
+ pps->beta_offset/2);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+ if (pps->tc_offset/2 < -6 || pps->tc_offset/2 > 6) {
+ av_log(s->avctx, AV_LOG_ERROR, "pps_tc_offset_div2 out of range: %d\n",
+ pps->tc_offset/2);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+ }
+ }
+
+ 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)
+ goto err;
+ }
+ pps->lists_modification_present_flag = get_bits1(gb);
+ pps->log2_parallel_merge_level = get_ue_golomb_long(gb) + 2;
+ if (pps->log2_parallel_merge_level > sps->log2_ctb_size) {
+ av_log(s->avctx, AV_LOG_ERROR, "log2_parallel_merge_level_minus2 out of range: %d\n",
+ pps->log2_parallel_merge_level - 2);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+
+ pps->slice_header_extension_present_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));
+ pps->row_bd = av_malloc_array(pps->num_tile_rows + 1, sizeof(*pps->row_bd));
+ pps->col_idxX = av_malloc_array(sps->ctb_width, sizeof(*pps->col_idxX));
+ if (!pps->col_bd || !pps->row_bd || !pps->col_idxX) {
+ ret = AVERROR(ENOMEM);
+ goto err;
+ }
+
+ if (pps->uniform_spacing_flag) {
+ if (!pps->column_width) {
+ pps->column_width = av_malloc_array(pps->num_tile_columns, sizeof(*pps->column_width));
+ pps->row_height = av_malloc_array(pps->num_tile_rows, sizeof(*pps->row_height));
+ }
+ if (!pps->column_width || !pps->row_height) {
+ ret = AVERROR(ENOMEM);
+ goto err;
+ }
+
+ for (i = 0; i < pps->num_tile_columns; i++) {
+ pps->column_width[i] = ((i + 1) * sps->ctb_width) / pps->num_tile_columns -
+ (i * sps->ctb_width) / pps->num_tile_columns;
+ }
+
+ for (i = 0; i < pps->num_tile_rows; i++) {
+ pps->row_height[i] = ((i + 1) * sps->ctb_height) / pps->num_tile_rows -
+ (i * sps->ctb_height) / pps->num_tile_rows;
+ }
+ }
+
+ pps->col_bd[0] = 0;
+ for (i = 0; i < pps->num_tile_columns; i++)
+ pps->col_bd[i + 1] = pps->col_bd[i] + pps->column_width[i];
+
+ pps->row_bd[0] = 0;
+ for (i = 0; i < pps->num_tile_rows; i++)
+ 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;
+ }
+
+ /**
+ * 6.5
+ */
+ pic_area_in_ctbs = sps->ctb_width * sps->ctb_height;
+ pic_area_in_min_cbs = sps->min_cb_width * sps->min_cb_height;
+ pic_area_in_min_tbs = sps->min_tb_width * sps->min_tb_height;
+
+ pps->ctb_addr_rs_to_ts = av_malloc_array(pic_area_in_ctbs, sizeof(*pps->ctb_addr_rs_to_ts));
+ pps->ctb_addr_ts_to_rs = av_malloc_array(pic_area_in_ctbs, sizeof(*pps->ctb_addr_ts_to_rs));
+ pps->tile_id = av_malloc_array(pic_area_in_ctbs, sizeof(*pps->tile_id));
+ pps->min_cb_addr_zs = av_malloc_array(pic_area_in_min_cbs, sizeof(*pps->min_cb_addr_zs));
+ pps->min_tb_addr_zs = av_malloc_array(pic_area_in_min_tbs, sizeof(*pps->min_tb_addr_zs));
+ if (!pps->ctb_addr_rs_to_ts || !pps->ctb_addr_ts_to_rs ||
+ !pps->tile_id || !pps->min_cb_addr_zs || !pps->min_tb_addr_zs) {
+ ret = AVERROR(ENOMEM);
+ goto err;
+ }
+
+ for (ctb_addr_rs = 0; ctb_addr_rs < pic_area_in_ctbs; ctb_addr_rs++) {
+ int tb_x = ctb_addr_rs % sps->ctb_width;
+ int tb_y = ctb_addr_rs / sps->ctb_width;
+ int tile_x = 0;
+ int tile_y = 0;
+ int val = 0;
+
+ for (i = 0; i < pps->num_tile_columns; i++) {
+ if (tb_x < pps->col_bd[i + 1]) {
+ tile_x = i;
+ break;
+ }
+ }
+
+ for (i = 0; i < pps->num_tile_rows; i++) {
+ if (tb_y < pps->row_bd[i + 1]) {
+ tile_y = i;
+ break;
+ }
+ }
+
+ for (i = 0; i < tile_x; i++)
+ val += pps->row_height[tile_y] * pps->column_width[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;
+ }
+
+ for (j = 0, tile_id = 0; j < pps->num_tile_rows; j++)
+ for (i = 0; i < pps->num_tile_columns; i++, tile_id++)
+ for (y = pps->row_bd[j]; y < pps->row_bd[j + 1]; y++)
+ for (x = pps->col_bd[i]; x < pps->col_bd[i + 1]; x++)
+ pps->tile_id[pps->ctb_addr_rs_to_ts[y * sps->ctb_width + x]] = tile_id;
+
+ pps->tile_pos_rs = av_malloc_array(tile_id, sizeof(*pps->tile_pos_rs));
+ if (!pps->tile_pos_rs) {
+ ret = AVERROR(ENOMEM);
+ goto err;
+ }
+
+ for (j = 0; j < pps->num_tile_rows; j++)
+ for (i = 0; i < pps->num_tile_columns; i++)
+ pps->tile_pos_rs[j * pps->num_tile_columns + i] = pps->row_bd[j] * sps->ctb_width + pps->col_bd[i];
+
+ 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 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);
+ 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);
+ }
+ pps->min_cb_addr_zs[y * sps->min_cb_width + x] = val;
+ }
+ }
+
+ 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 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);
+ 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);
+ }
+ pps->min_tb_addr_zs[y * sps->min_tb_width + x] = val;
+ }
+ }
+
+ av_buffer_unref(&s->pps_list[pps_id]);
+ s->pps_list[pps_id] = pps_buf;
+
+ return 0;
+
+err:
+ av_buffer_unref(&pps_buf);
+ return ret;
+}

libav-v10.1.tar.bz2/libavcodec/hevc_refs.c Added

@@ -0,0 +1,489 @@
+/*
+ * HEVC video decoder
+ *
+ * Copyright (C) 2012 - 2013 Guillaume Martres
+ * Copyright (C) 2012 - 2013 Gildas Cocherel
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/pixdesc.h"
+
+#include "internal.h"
+#include "thread.h"
+#include "hevc.h"
+
+void ff_hevc_unref_frame(HEVCContext *s, HEVCFrame *frame, int flags)
+{
+ /* frame->frame can be NULL if context init failed */
+ if (!frame->frame || !frame->frame->buf[0])
+ return;
+
+ frame->flags &= ~flags;
+ if (!frame->flags) {
+ ff_thread_release_buffer(s->avctx, &frame->tf);
+
+ av_buffer_unref(&frame->tab_mvf_buf);
+ frame->tab_mvf = NULL;
+
+ av_buffer_unref(&frame->rpl_buf);
+ av_buffer_unref(&frame->rpl_tab_buf);
+ frame->rpl_tab = NULL;
+ frame->refPicList = NULL;
+
+ frame->collocated_ref = NULL;
+ }
+}
+
+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 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];
+ }
+}
+
+void ff_hevc_clear_refs(HEVCContext *s)
+{
+ 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);
+}
+
+void ff_hevc_flush_dpb(HEVCContext *s)
+{
+ int i;
+ for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++)
+ ff_hevc_unref_frame(s, &s->DPB[i], ~0);
+}
+
+static HEVCFrame *alloc_frame(HEVCContext *s)
+{
+ int i, j, ret;
+ for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
+ HEVCFrame *frame = &s->DPB[i];
+ if (frame->frame->buf[0])
+ continue;
+
+ ret = ff_thread_get_buffer(s->avctx, &frame->tf,
+ AV_GET_BUFFER_FLAG_REF);
+ if (ret < 0)
+ return NULL;
+
+ frame->rpl_buf = av_buffer_allocz(s->nb_nals * sizeof(RefPicListTab));
+ if (!frame->rpl_buf)
+ goto fail;
+
+ 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->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->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;
+
+ return frame;
+
+fail:
+ ff_hevc_unref_frame(s, frame, ~0);
+ return NULL;
+ }
+ av_log(s->avctx, AV_LOG_ERROR, "Error allocating frame, DPB full.\n");
+ return NULL;
+}
+
+int ff_hevc_set_new_ref(HEVCContext *s, AVFrame **frame, int poc)
+{
+ HEVCFrame *ref;
+ int i;
+
+ /* check that this POC doesn't already exist */
+ for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
+ HEVCFrame *frame = &s->DPB[i];
+
+ if (frame->frame->buf[0] && frame->sequence == s->seq_decode &&
+ frame->poc == poc) {
+ av_log(s->avctx, AV_LOG_ERROR, "Duplicate POC in a sequence: %d.\n",
+ poc);
+ return AVERROR_INVALIDDATA;
+ }
+ }
+
+ ref = alloc_frame(s);
+ if (!ref)
+ return AVERROR(ENOMEM);
+
+ *frame = ref->frame;
+ s->ref = ref;
+
+ 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;
+}
+
+int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush)
+{
+ do {
+ int nb_output = 0;
+ int min_poc = INT_MAX;
+ int i, min_idx, ret;
+
+ for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
+ HEVCFrame *frame = &s->DPB[i];
+ if ((frame->flags & HEVC_FRAME_FLAG_OUTPUT) &&
+ frame->sequence == s->seq_output) {
+ nb_output++;
+ if (frame->poc < min_poc) {
+ min_poc = frame->poc;
+ min_idx = i;
+ }
+ }
+ }
+
+ /* wait for more frames before output */
+ if (!flush && s->seq_output == s->seq_decode && s->sps &&
+ nb_output <= s->sps->temporal_layer[s->sps->max_sub_layers - 1].num_reorder_pics)
+ return 0;
+
+ if (nb_output) {
+ HEVCFrame *frame = &s->DPB[min_idx];
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->frame->format);
+ int pixel_shift;
+
+ if (!desc)
+ return AVERROR_BUG;
+
+ pixel_shift = desc->comp[0].depth_minus1 > 7;
+
+ ret = av_frame_ref(out, frame->frame);
+ ff_hevc_unref_frame(s, frame, HEVC_FRAME_FLAG_OUTPUT);
+ if (ret < 0)
+ return ret;
+
+ 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) * out->linesize[i];
+ out->data[i] += off;
+ }
+ av_log(s->avctx, AV_LOG_DEBUG,
+ "Output frame with POC %d.\n", frame->poc);
+ return 1;
+ }
+
+ if (s->seq_output != s->seq_decode)
+ s->seq_output = (s->seq_output + 1) & 0xff;
+ else
+ break;
+ } while (1);
+
+ return 0;
+}
+
+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 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->refPicList = (RefPicList *)frame->rpl_tab[ctb_addr_ts];
+
+ return 0;
+}
+
+int ff_hevc_slice_rpl(HEVCContext *s)
+{
+ SliceHeader *sh = &s->sh;
+
+ uint8_t nb_list = sh->slice_type == B_SLICE ? 2 : 1;
+ uint8_t list_idx;
+ int i, j, ret;
+
+ ret = init_slice_rpl(s);
+ if (ret < 0)
+ return ret;
+
+ if (!(s->rps[ST_CURR_BEF].nb_refs + s->rps[ST_CURR_AFT].nb_refs +
+ s->rps[LT_CURR].nb_refs)) {
+ av_log(s->avctx, AV_LOG_ERROR, "Zero refs in the frame RPS.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ for (list_idx = 0; list_idx < nb_list; list_idx++) {
+ RefPicList rpl_tmp = { { 0 } };
+ RefPicList *rpl = &s->ref->refPicList[list_idx];
+
+ /* 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 */
+ int cand_lists[3] = { list_idx ? ST_CURR_AFT : ST_CURR_BEF,
+ list_idx ? ST_CURR_BEF : ST_CURR_AFT,
+ LT_CURR };
+
+ /* concatenate the candidate lists for the current frame */
+ while (rpl_tmp.nb_refs < sh->nb_refs[list_idx]) {
+ 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.nb_refs++;
+ }
+ }
+ }
+
+ /* reorder the references if necessary */
+ if (sh->rpl_modification_flag[list_idx]) {
+ for (i = 0; i < sh->nb_refs[list_idx]; i++) {
+ int idx = sh->list_entry_lx[list_idx][i];
+
+ if (idx >= rpl_tmp.nb_refs) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid reference index.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ rpl->list[i] = rpl_tmp.list[idx];
+ rpl->ref[i] = rpl_tmp.ref[idx];
+ rpl->isLongTerm[i] = rpl_tmp.isLongTerm[idx];
+ rpl->nb_refs++;
+ }
+ } else {
+ memcpy(rpl, &rpl_tmp, sizeof(*rpl));
+ rpl->nb_refs = FFMIN(rpl->nb_refs, sh->nb_refs[list_idx]);
+ }
+
+ if (sh->collocated_list == list_idx &&
+ sh->collocated_ref_idx < rpl->nb_refs)
+ s->ref->collocated_ref = rpl->ref[sh->collocated_ref_idx];
+ }
+
+ return 0;
+}
+
+static HEVCFrame *find_ref_idx(HEVCContext *s, int poc)
+{
+ int i;
+ int LtMask = (1 << s->sps->log2_max_poc_lsb) - 1;
+
+ 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->poc & LtMask) == poc)
+ return ref;
+ }
+ }
+
+ 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->poc == poc || (ref->poc & LtMask) == poc)
+ return ref;
+ }
+ }
+
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Could not find ref with POC %d\n", poc);
+ return NULL;
+}
+
+static void mark_ref(HEVCFrame *frame, int flag)
+{
+ frame->flags &= ~(HEVC_FRAME_FLAG_LONG_REF | HEVC_FRAME_FLAG_SHORT_REF);
+ frame->flags |= flag;
+}
+
+static HEVCFrame *generate_missing_ref(HEVCContext *s, int poc)
+{
+ 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);
+ } else {
+ for (i = 0; frame->frame->data[i]; i++)
+ for (y = 0; y < (s->sps->height >> s->sps->vshift[i]); y++)
+ for (x = 0; x < (s->sps->width >> s->sps->hshift[i]); x++) {
+ AV_WN16(frame->frame->data[i] + y * frame->frame->linesize[i] + 2 * x,
+ 1 << (s->sps->bit_depth - 1));
+ }
+ }
+
+ frame->poc = poc;
+ frame->sequence = s->seq_decode;
+ frame->flags = 0;
+
+ ff_thread_report_progress(&frame->tf, INT_MAX, 0);
+
+ return frame;
+}
+
+/* add a reference with the given poc to the list and mark it as used in DPB */
+static int add_candidate_ref(HEVCContext *s, RefPicList *list,
+ int poc, int ref_flag)
+{
+ HEVCFrame *ref = find_ref_idx(s, poc);
+
+ if (ref == s->ref)
+ return AVERROR_INVALIDDATA;
+
+ if (!ref) {
+ ref = generate_missing_ref(s, poc);
+ if (!ref)
+ return AVERROR(ENOMEM);
+ }
+
+ list->list[list->nb_refs] = ref->poc;
+ list->ref[list->nb_refs] = ref;
+ list->nb_refs++;
+
+ mark_ref(ref, ref_flag);
+ return 0;
+}
+
+int ff_hevc_frame_rps(HEVCContext *s)
+{
+ const ShortTermRPS *short_rps = s->sh.short_term_rps;
+ const LongTermRPS *long_rps = &s->sh.long_term_rps;
+ RefPicList *rps = s->rps;
+ int i, ret;
+
+ if (!short_rps) {
+ rps[0].nb_refs = rps[1].nb_refs = 0;
+ return 0;
+ }
+
+ /* clear the reference flags on all frames except the current one */
+ for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
+ HEVCFrame *frame = &s->DPB[i];
+
+ if (frame == s->ref)
+ continue;
+
+ mark_ref(frame, 0);
+ }
+
+ for (i = 0; i < NB_RPS_TYPE; i++)
+ rps[i].nb_refs = 0;
+
+ /* add the short refs */
+ for (i = 0; i < short_rps->num_delta_pocs; i++) {
+ int poc = s->poc + short_rps->delta_poc[i];
+ int list;
+
+ if (!short_rps->used[i])
+ list = ST_FOLL;
+ else if (i < short_rps->num_negative_pics)
+ list = ST_CURR_BEF;
+ else
+ list = ST_CURR_AFT;
+
+ ret = add_candidate_ref(s, &rps[list], poc, HEVC_FRAME_FLAG_SHORT_REF);
+ if (ret < 0)
+ return ret;
+ }
+
+ /* add the long refs */
+ for (i = 0; i < long_rps->nb_refs; i++) {
+ int poc = long_rps->poc[i];
+ int list = long_rps->used[i] ? LT_CURR : LT_FOLL;
+
+ ret = add_candidate_ref(s, &rps[list], poc, HEVC_FRAME_FLAG_LONG_REF);
+ if (ret < 0)
+ return ret;
+ }
+
+ /* release any frames that are now unused */
+ for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++)
+ ff_hevc_unref_frame(s, &s->DPB[i], 0);
+
+ return 0;
+}
+
+int ff_hevc_compute_poc(HEVCContext *s, int poc_lsb)
+{
+ int max_poc_lsb = 1 << s->sps->log2_max_poc_lsb;
+ int prev_poc_lsb = s->pocTid0 % max_poc_lsb;
+ 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)
+ poc_msb = prev_poc_msb + max_poc_lsb;
+ 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 ||
+ s->nal_unit_type == NAL_BLA_W_RADL ||
+ s->nal_unit_type == NAL_BLA_N_LP)
+ poc_msb = 0;
+
+ return poc_msb + poc_lsb;
+}
+
+int ff_hevc_frame_nb_refs(HEVCContext *s)
+{
+ int ret = 0;
+ int i;
+ const ShortTermRPS *rps = s->sh.short_term_rps;
+ LongTermRPS *long_rps = &s->sh.long_term_rps;
+
+ if (rps) {
+ for (i = 0; i < rps->num_negative_pics; i++)
+ ret += !!rps->used[i];
+ for (; i < rps->num_delta_pocs; i++)
+ ret += !!rps->used[i];
+ }
+
+ if (long_rps) {
+ for (i = 0; i < long_rps->nb_refs; i++)
+ ret += !!long_rps->used[i];
+ }
+ return ret;
+}

libav-v10.1.tar.bz2/libavcodec/hevc_sei.c Added

@@ -0,0 +1,123 @@
+/*
+ * HEVC Supplementary Enhancement Information messages
+ *
+ * Copyright (C) 2012 - 2013 Guillaume Martres
+ * Copyright (C) 2012 - 2013 Gildas Cocherel
+ * Copyright (C) 2013 Vittorio Giovara
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "golomb.h"
+#include "hevc.h"
+
+static void decode_nal_sei_decoded_picture_hash(HEVCContext *s)
+{
+ int cIdx, i;
+ GetBitContext *gb = &s->HEVClc.gb;
+ uint8_t hash_type = get_bits(gb, 8);
+
+ for (cIdx = 0; cIdx < 3; cIdx++) {
+ if (hash_type == 0) {
+ s->is_md5 = 1;
+ for (i = 0; i < 16; i++)
+ s->md5[cIdx][i] = get_bits(gb, 8);
+ } else if (hash_type == 1) {
+ // picture_crc = get_bits(gb, 16);
+ skip_bits(gb, 16);
+ } else if (hash_type == 2) {
+ // picture_checksum = get_bits(gb, 32);
+ skip_bits(gb, 32);
+ }
+ }
+}
+
+static void decode_nal_sei_frame_packing_arrangement(HEVCContext *s)
+{
+ GetBitContext *gb = &s->HEVClc.gb;
+
+ 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 (!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_nal_sei_message(HEVCContext *s)
+{
+ GetBitContext *gb = &s->HEVClc.gb;
+
+ int payload_type = 0;
+ int payload_size = 0;
+ int byte = 0xFF;
+ av_log(s->avctx, AV_LOG_DEBUG, "Decoding SEI\n");
+
+ while (byte == 0xFF) {
+ byte = get_bits(gb, 8);
+ payload_type += byte;
+ }
+ byte = 0xFF;
+ while (byte == 0xFF) {
+ byte = get_bits(gb, 8);
+ payload_size += byte;
+ }
+ if (s->nal_unit_type == NAL_SEI_PREFIX) {
+ if (payload_type == 256)
+ decode_nal_sei_decoded_picture_hash(s);
+ else if (payload_type == 45)
+ decode_nal_sei_frame_packing_arrangement(s);
+ else {
+ av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type);
+ skip_bits(gb, 8 * payload_size);
+ }
+ } else { /* nal_unit_type == NAL_SEI_SUFFIX */
+ if (payload_type == 132)
+ 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);
+ }
+ }
+ return 0;
+}
+
+static int more_rbsp_data(GetBitContext *gb)
+{
+ return get_bits_left(gb) > 0 && show_bits(gb, 8) != 0x80;
+}
+
+int ff_hevc_decode_nal_sei(HEVCContext *s)
+{
+ do {
+ decode_nal_sei_message(s);
+ } while (more_rbsp_data(&s->HEVClc.gb));
+ return 0;
+}

libav-v10.1.tar.bz2/libavcodec/hevcdsp.c Added

@@ -0,0 +1,190 @@
+/*
+ * HEVC video decoder
+ *
+ * Copyright (C) 2012 - 2013 Guillaume Martres
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#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 },
+};
+
+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 },
+};
+
+#define BIT_DEPTH 8
+#include "hevcdsp_template.c"
+#undef BIT_DEPTH
+
+#define BIT_DEPTH 9
+#include "hevcdsp_template.c"
+#undef BIT_DEPTH
+
+#define BIT_DEPTH 10
+#include "hevcdsp_template.c"
+#undef BIT_DEPTH
+
+void ff_hevc_dsp_init(HEVCDSPContext *hevcdsp, int bit_depth)
+{
+#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);   \
+    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);
+        break;
+    case 10:
+        HEVC_DSP(10);
+        break;
+    default:
+        HEVC_DSP(8);
+        break;
+    }
+}

libav-v10.1.tar.bz2/libavcodec/hevcdsp.h Added

@@ -0,0 +1,109 @@
+/*
+ * HEVC video decoder
+ *
+ * Copyright (C) 2012 - 2013 Guillaume Martres
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_HEVCDSP_H
+#define AVCODEC_HEVCDSP_H
+
+#include "get_bits.h"
+
+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 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);
+ 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)(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);
+
+extern const int8_t ff_hevc_epel_filters[7][16];
+
+#endif /* AVCODEC_HEVCDSP_H */

libav-v10.1.tar.bz2/libavcodec/hevcdsp_template.c Added

@@ -0,0 +1,1340 @@
+/*
+ * HEVC video decoder
+ *
+ * Copyright (C) 2012 - 2013 Guillaume Martres
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "get_bits.h"
+#include "hevc.h"
+
+#include "bit_depth_template.c"
+
+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;
+
+ stride /= sizeof(pixel);
+
+ for (y = 0; y < size; y++) {
+ for (x = 0; x < size; x++)
+ dst[x] = get_bits(gb, pcm_bit_depth) << (BIT_DEPTH - pcm_bit_depth);
+ dst += stride;
+ }
+}
+
+static void FUNC(transquant_bypass4x4)(uint8_t *_dst, int16_t *coeffs,
+ ptrdiff_t stride)
+{
+ int x, y;
+ pixel *dst = (pixel *)_dst;
+
+ stride /= sizeof(pixel);
+
+ for (y = 0; y < 4; y++) {
+ for (x = 0; x < 4; x++) {
+ 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)
+{
+ int x, y;
+ pixel *dst = (pixel *)_dst;
+
+ stride /= sizeof(pixel);
+
+ for (y = 0; y < 8; y++) {
+ for (x = 0; x < 8; x++) {
+ 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)
+{
+ int x, y;
+ pixel *dst = (pixel *)_dst;
+
+ stride /= sizeof(pixel);
+
+ for (y = 0; y < 16; y++) {
+ for (x = 0; x < 16; x++) {
+ 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)
+{
+ int x, y;
+ pixel *dst = (pixel *)_dst;
+
+ stride /= sizeof(pixel);
+
+ for (y = 0; y < 32; y++) {
+ for (x = 0; x < 32; x++) {
+ 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)
+{
+ pixel *dst = (pixel *)_dst;
+ int shift = 13 - BIT_DEPTH;
+#if BIT_DEPTH <= 13
+ int offset = 1 << (shift - 1);
+#else
+ int offset = 0;
+#endif
+ int x, y;
+
+ 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;
+ }
+}
+
+#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;
+ 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);
+ for (i = 0; i < 4; i++) {
+ TR_4x4_LUMA(dst, coeffs, 1, ADD_AND_SCALE);
+ coeffs += 4;
+ 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); \
+ } while (0)
+
+static void FUNC(transform_4x4_add)(uint8_t *_dst, int16_t *coeffs,
+ ptrdiff_t stride)
+{
+ int i;
+ 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(src, src, 4, 4, SCALE);
+ src++;
+ }
+
+ shift = 20 - BIT_DEPTH;
+ add = 1 << (shift - 1);
+ for (i = 0; i < 4; i++) {
+ TR_4(dst, coeffs, 1, 1, ADD_AND_SCALE);
+ coeffs += 4;
+ 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]); \
+ } \
+ } 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]); \
+ } \
+ } 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]); \
+ } \
+ } while (0)
+
+
+
+static void FUNC(transform_8x8_add)(uint8_t *_dst, int16_t *coeffs,
+ ptrdiff_t stride)
+{
+ int i;
+ 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(src, src, 8, 8, SCALE);
+ src++;
+ }
+
+ shift = 20 - BIT_DEPTH;
+ add = 1 << (shift - 1);
+ for (i = 0; i < 8; i++) {
+ TR_8(dst, coeffs, 1, 1, ADD_AND_SCALE);
+ coeffs += 8;
+ dst += stride;
+ }
+}
+
+static void FUNC(transform_16x16_add)(uint8_t *_dst, int16_t *coeffs,
+ ptrdiff_t stride)
+{
+ int i;
+ 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(src, src, 16, 16, SCALE);
+ src++;
+ }
+
+ shift = 20 - BIT_DEPTH;
+ add = 1 << (shift - 1);
+ for (i = 0; i < 16; i++) {
+ TR_16(dst, coeffs, 1, 1, ADD_AND_SCALE);
+ coeffs += 16;
+ dst += stride;
+ }
+}
+
+static void FUNC(transform_32x32_add)(uint8_t *_dst, int16_t *coeffs,
+ ptrdiff_t stride)
+{
+ int i;
+ 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(src, src, 32, 32, SCALE);
+ src++;
+ }
+ src = coeffs;
+ shift = 20 - BIT_DEPTH;
+ add = 1 << (shift - 1);
+ for (i = 0; i < 32; i++) {
+ TR_32(dst, coeffs, 1, 1, ADD_AND_SCALE);
+ coeffs += 32;
+ dst += stride;
+ }
+}
+
+static void FUNC(sao_band_filter)(uint8_t *_dst, uint8_t *_src,
+ ptrdiff_t stride, SAOParams *sao,
+ int *borders, int width, int height,
+ int c_idx, int class)
+{
+ 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 *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;
+ if (!borders[3])
+ height -= (4 >> chroma) + 2;
+ break;
+ case 1:
+ init_y = -(4 >> chroma) - 2;
+ if (!borders[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;
+ break;
+ case 3:
+ init_y = -(4 >> chroma) - 2;
+ init_x = -(8 >> chroma) - 2;
+ width = (8 >> chroma) + 2;
+ height = (4 >> chroma) + 2;
+ break;
+ }
+
+ dst = dst + (init_y * stride + init_x);
+ src = src + (init_y * stride + init_x);
+ for (k = 0; k < 4; k++)
+ 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[src[x] >> shift]);
+ dst += stride;
+ src += stride;
+ }
+}
+
+static void FUNC(sao_band_filter_0)(uint8_t *dst, uint8_t *src,
+ 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, 0);
+}
+
+static void FUNC(sao_band_filter_1)(uint8_t *dst, uint8_t *src,
+ 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, 1);
+}
+
+static void FUNC(sao_band_filter_2)(uint8_t *dst, uint8_t *src,
+ 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, 2);
+}
+
+static void FUNC(sao_band_filter_3)(uint8_t *_dst, uint8_t *_src,
+ 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);
+}
+
+static void FUNC(sao_edge_filter_0)(uint8_t *_dst, uint8_t *_src,
+ 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 x, y;
+ 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
+ };
+ static const uint8_t edge_idx[] = { 1, 2, 0, 3, 4 };
+
+#define CMP(a, b) ((a) > (b) ? 1 : ((a) == (b) ? 0 : -1))
+
+ stride /= sizeof(pixel);
+
+ if (!borders[2])
+ width -= (8 >> chroma) + 2;
+ if (!borders[3])
+ height -= (4 >> chroma) + 2;
+
+ dst = dst + (init_y * stride + init_x);
+ src = src + (init_y * stride + init_x);
+ init_y = init_x = 0;
+ if (sao_eo_class != SAO_EO_VERT) {
+ if (borders[0]) {
+ int offset_val = sao_offset_val[0];
+ int y_stride = 0;
+ for (y = 0; y < height; y++) {
+ dst[y_stride] = av_clip_pixel(src[y_stride] + offset_val);
+ y_stride += stride;
+ }
+ init_x = 1;
+ }
+ if (borders[2]) {
+ int offset_val = sao_offset_val[0];
+ 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;
+ }
+ width--;
+ }
+ }
+ if (sao_eo_class != SAO_EO_HORIZ) {
+ if (borders[1]) {
+ int offset_val = sao_offset_val[0];
+ for (x = init_x; x < width; x++)
+ dst[x] = av_clip_pixel(src[x] + offset_val);
+ init_y = 1;
+ }
+ if (borders[3]) {
+ int offset_val = sao_offset_val[0];
+ int y_stride = stride * (height - 1);
+ 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_0_1 = (init_y + pos_0_1) * stride;
+ int y_stride_1_1 = (init_y + pos_1_1) * stride;
+ for (y = init_y; y < height; y++) {
+ for (x = init_x; x < width; x++) {
+ int diff0 = CMP(src[x + y_stride], src[x + pos_0_0 + y_stride_0_1]);
+ int diff1 = CMP(src[x + y_stride], src[x + pos_1_0 + y_stride_1_1]);
+ int offset_val = edge_idx[2 + diff0 + diff1];
+ dst[x + y_stride] = av_clip_pixel(src[x + y_stride] + sao_offset_val[offset_val]);
+ }
+ y_stride += stride;
+ y_stride_0_1 += stride;
+ y_stride_1_1 += stride;
+ }
+ }
+
+ {
+ // Restore pixels that can't be modified
+ int save_upper_left = !diag_edge && sao_eo_class == SAO_EO_135D && !borders[0] && !borders[1];
+ if (vert_edge && sao_eo_class != SAO_EO_VERT)
+ for (y = init_y+save_upper_left; y< height; y++)
+ dst[y*stride] = src[y*stride];
+ if(horiz_edge && sao_eo_class != SAO_EO_HORIZ)
+ for(x = init_x+save_upper_left; x<width; x++)
+ dst[x] = src[x];
+ if(diag_edge && sao_eo_class == SAO_EO_135D)
+ dst[0] = src[0];
+ }
+
+#undef CMP
+}
+
+static void FUNC(sao_edge_filter_1)(uint8_t *_dst, uint8_t *_src,
+ 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 x, y;
+ 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
+ };
+ static const uint8_t edge_idx[] = { 1, 2, 0, 3, 4 };
+
+#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;
+ height = (4 >> chroma) + 2;
+
+ dst = dst + (init_y * stride + init_x);
+ src = src + (init_y * stride + init_x);
+ init_y = init_x = 0;
+ if (sao_eo_class != SAO_EO_VERT) {
+ if (borders[0]) {
+ int offset_val = sao_offset_val[0];
+ int y_stride = 0;
+ for (y = 0; y < height; y++) {
+ dst[y_stride] = av_clip_pixel(src[y_stride] + offset_val);
+ y_stride += stride;
+ }
+ init_x = 1;
+ }
+ if (borders[2]) {
+ int offset_val = sao_offset_val[0];
+ 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;
+ }
+ 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_0_1 = (init_y + pos_0_1) * stride;
+ int y_stride_1_1 = (init_y + pos_1_1) * stride;
+ for (y = init_y; y < height; y++) {
+ for (x = init_x; x < width; x++) {
+ int diff0 = CMP(src[x + y_stride], src[x + pos_0_0 + y_stride_0_1]);
+ int diff1 = CMP(src[x + y_stride], src[x + pos_1_0 + y_stride_1_1]);
+ int offset_val = edge_idx[2 + diff0 + diff1];
+ dst[x + y_stride] = av_clip_pixel(src[x + y_stride] + sao_offset_val[offset_val]);
+ }
+ y_stride += stride;
+ y_stride_0_1 += stride;
+ y_stride_1_1 += stride;
+ }
+ }
+
+ {
+ // Restore pixels that can't be modified
+ int save_lower_left = !diag_edge && sao_eo_class == SAO_EO_45D && !borders[0];
+ if(vert_edge && sao_eo_class != SAO_EO_VERT)
+ for(y = init_y; y< height-save_lower_left; y++)
+ dst[y*stride] = src[y*stride];
+ if(horiz_edge && sao_eo_class != SAO_EO_HORIZ)
+ for(x = init_x+save_lower_left; x<width; x++)
+ dst[(height-1)*stride+x] = src[(height-1)*stride+x];
+ if(diag_edge && sao_eo_class == SAO_EO_45D)
+ dst[stride*(height-1)] = src[stride*(height-1)];
+ }
+
+#undef CMP
+}
+
+static void FUNC(sao_edge_filter_2)(uint8_t *_dst, uint8_t *_src,
+ 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 x, y;
+ 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
+ };
+ static const uint8_t edge_idx[] = { 1, 2, 0, 3, 4 };
+
+#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])
+ height -= (4 >> chroma) + 2;
+
+ dst = dst + (init_y * stride + init_x);
+ src = src + (init_y * stride + init_x);
+ init_y = init_x = 0;
+ if (sao_eo_class != SAO_EO_HORIZ) {
+ if (borders[1]) {
+ int offset_val = sao_offset_val[0];
+ for (x = init_x; x < width; x++)
+ dst[x] = av_clip_pixel(src[x] + offset_val);
+ init_y = 1;
+ }
+ if (borders[3]) {
+ int offset_val = sao_offset_val[0];
+ int y_stride = stride * (height - 1);
+ 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_0_1 = (init_y + pos_0_1) * stride;
+ int y_stride_1_1 = (init_y + pos_1_1) * stride;
+ for (y = init_y; y < height; y++) {
+ for (x = init_x; x < width; x++) {
+ int diff0 = CMP(src[x + y_stride], src[x + pos_0_0 + y_stride_0_1]);
+ int diff1 = CMP(src[x + y_stride], src[x + pos_1_0 + y_stride_1_1]);
+ int offset_val = edge_idx[2 + diff0 + diff1];
+ dst[x + y_stride] = av_clip_pixel(src[x + y_stride] + sao_offset_val[offset_val]);
+ }
+ y_stride += stride;
+ y_stride_0_1 += stride;
+ y_stride_1_1 += stride;
+ }
+ }
+
+ {
+ // Restore pixels that can't be modified
+ int save_upper_right = !diag_edge && sao_eo_class == SAO_EO_45D && !borders[1];
+ if(vert_edge && sao_eo_class != SAO_EO_VERT)
+ for(y = init_y+save_upper_right; y< height; y++)
+ dst[y*stride+width-1] = src[y*stride+width-1];
+ if(horiz_edge && sao_eo_class != SAO_EO_HORIZ)
+ for(x = init_x; x<width-save_upper_right; x++)
+ dst[x] = src[x];
+ if(diag_edge && sao_eo_class == SAO_EO_45D)
+ dst[width-1] = src[width-1];
+ }
+#undef CMP
+}
+
+static void FUNC(sao_edge_filter_3)(uint8_t *_dst, uint8_t *_src,
+ 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 x, y;
+ 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
+ };
+ static const uint8_t edge_idx[] = { 1, 2, 0, 3, 4 };
+
+#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);
+ 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_0_1 = (init_y + pos_0_1) * stride;
+ int y_stride_1_1 = (init_y + pos_1_1) * stride;
+
+ for (y = init_y; y < height; y++) {
+ for (x = init_x; x < width; x++) {
+ int diff0 = CMP(src[x + y_stride], src[x + pos_0_0 + y_stride_0_1]);
+ int diff1 = CMP(src[x + y_stride], src[x + pos_1_0 + y_stride_1_1]);
+ int offset_val = edge_idx[2 + diff0 + diff1];
+ dst[x + y_stride] = av_clip_pixel(src[x + y_stride] + sao_offset_val[offset_val]);
+ }
+ y_stride += stride;
+ y_stride_0_1 += stride;
+ y_stride_1_1 += stride;
+ }
+ }
+
+ {
+ // Restore pixels that can't be modified
+ int save_lower_right = !diag_edge && sao_eo_class == SAO_EO_135D;
+ if(vert_edge && sao_eo_class != SAO_EO_VERT)
+ for(y = init_y; y< height-save_lower_right; y++)
+ dst[y*stride+width-1] = src[y*stride+width-1];
+ if(horiz_edge && sao_eo_class != SAO_EO_HORIZ)
+ for(x = init_x; x<width-save_lower_right; x++)
+ dst[(height-1)*stride+x] = src[(height-1)*stride+x];
+ if(diag_edge && sao_eo_class == SAO_EO_135D)
+ dst[stride*(height-1)+width-1] = src[stride*(height-1)+width-1];
+ }
+#undef CMP
+}
+
+#undef SET
+#undef SCALE
+#undef ADD_AND_SCALE
+#undef TR_4
+#undef TR_8
+#undef TR_16
+#undef TR_32
+
+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;
+ ptrdiff_t srcstride = _srcstride / sizeof(pixel);
+
+ for (y = 0; y < height; y++) {
+ for (x = 0; x < width; x++)
+ dst[x] = src[x] << (14 - BIT_DEPTH);
+ src += srcstride;
+ dst += dststride;
+ }
+}
+
+#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) \
+static void FUNC(put_hevc_qpel_h ## H)(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); \
+ \
+ for (y = 0; y < height; y++) { \
+ for (x = 0; x < width; x++) \
+ dst[x] = QPEL_FILTER_ ## H(src, 1) >> (BIT_DEPTH - 8); \
+ src += srcstride; \
+ dst += dststride; \
+ } \
+}
+
+#define PUT_HEVC_QPEL_V(V) \
+static void FUNC(put_hevc_qpel_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); \
+ \
+ for (y = 0; y < height; y++) { \
+ for (x = 0; x < width; x++) \
+ 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; \
+ } \
+}
+
+PUT_HEVC_QPEL_H(1)
+PUT_HEVC_QPEL_H(2)
+PUT_HEVC_QPEL_H(3)
+PUT_HEVC_QPEL_V(1)
+PUT_HEVC_QPEL_V(2)
+PUT_HEVC_QPEL_V(3)
+PUT_HEVC_QPEL_HV(1, 1)
+PUT_HEVC_QPEL_HV(1, 2)
+PUT_HEVC_QPEL_HV(1, 3)
+PUT_HEVC_QPEL_HV(2, 1)
+PUT_HEVC_QPEL_HV(2, 2)
+PUT_HEVC_QPEL_HV(2, 3)
+PUT_HEVC_QPEL_HV(3, 1)
+PUT_HEVC_QPEL_HV(3, 2)
+PUT_HEVC_QPEL_HV(3, 3)
+
+static void FUNC(put_hevc_epel_pixels)(int16_t *dst, ptrdiff_t dststride,
+ uint8_t *_src, ptrdiff_t _srcstride,
+ int width, int height, int mx, int my,
+ int16_t* mcbuffer)
+{
+ int x, y;
+ pixel *src = (pixel *)_src;
+ ptrdiff_t srcstride = _srcstride / sizeof(pixel);
+
+ for (y = 0; y < height; y++) {
+ 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])
+
+static void FUNC(put_hevc_epel_h)(int16_t *dst, ptrdiff_t dststride,
+ uint8_t *_src, ptrdiff_t _srcstride,
+ int width, int height, int mx, int my,
+ int16_t* mcbuffer)
+{
+ int x, y;
+ 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++)
+ dst[x] = EPEL_FILTER(src, 1) >> (BIT_DEPTH - 8);
+ src += srcstride;
+ dst += dststride;
+ }
+}
+
+static void FUNC(put_hevc_epel_v)(int16_t *dst, ptrdiff_t dststride,
+ uint8_t *_src, ptrdiff_t _srcstride,
+ int width, int height, int mx, int my,
+ int16_t* mcbuffer)
+{
+ int x, y;
+ pixel *src = (pixel *)_src;
+ ptrdiff_t srcstride = _srcstride / sizeof(pixel);
+ 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++)
+ dst[x] = EPEL_FILTER(src, srcstride) >> (BIT_DEPTH - 8);
+ src += srcstride;
+ dst += dststride;
+ }
+}
+
+static void FUNC(put_hevc_epel_hv)(int16_t *dst, ptrdiff_t dststride,
+ uint8_t *_src, ptrdiff_t _srcstride,
+ int width, int height, int mx, int my,
+ int16_t* mcbuffer)
+{
+ int x, y;
+ 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];
+ 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 = tmp_array;
+
+ src -= EPEL_EXTRA_BEFORE * srcstride;
+
+ for (y = 0; y < height + EPEL_EXTRA; y++) {
+ 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;
+ 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++)
+ dst[x] = EPEL_FILTER(tmp, MAX_PB_SIZE) >> 6;
+ tmp += MAX_PB_SIZE;
+ dst += dststride;
+ }
+}
+
+static void FUNC(put_unweighted_pred)(uint8_t *_dst, ptrdiff_t _dststride,
+ int16_t *src, ptrdiff_t srcstride,
+ int width, int height)
+{
+ int x, y;
+ pixel *dst = (pixel *)_dst;
+ ptrdiff_t dststride = _dststride / sizeof(pixel);
+
+ int shift = 14 - BIT_DEPTH;
+#if BIT_DEPTH < 14
+ int offset = 1 << (shift - 1);
+#else
+ int offset = 0;
+#endif
+ for (y = 0; y < height; y++) {
+ for (x = 0; x < width; x++)
+ dst[x] = av_clip_pixel((src[x] + offset) >> shift);
+ dst += dststride;
+ src += srcstride;
+ }
+}
+
+static void FUNC(put_weighted_pred_avg)(uint8_t *_dst, ptrdiff_t _dststride,
+ int16_t *src1, int16_t *src2,
+ ptrdiff_t srcstride,
+ int width, int height)
+{
+ int x, y;
+ pixel *dst = (pixel *)_dst;
+ ptrdiff_t dststride = _dststride / sizeof(pixel);
+
+ int shift = 14 + 1 - BIT_DEPTH;
+#if BIT_DEPTH < 14
+ int offset = 1 << (shift - 1);
+#else
+ int offset = 0;
+#endif
+
+ for (y = 0; y < height; y++) {
+ for (x = 0; x < width; x++)
+ dst[x] = av_clip_pixel((src1[x] + src2[x] + offset) >> shift);
+ dst += dststride;
+ src1 += srcstride;
+ src2 += srcstride;
+ }
+}
+
+static void FUNC(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)
+{
+ 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));
+
+ for (y = 0; y < height; y++) {
+ for (x = 0; x < width; x++) {
+ if (log2Wd >= 1) {
+ dst[x] = av_clip_pixel(((src[x] * wx + offset) >> log2Wd) + ox);
+ } else {
+ dst[x] = av_clip_pixel(src[x] * wx + ox);
+ }
+ }
+ dst += dststride;
+ src += srcstride;
+ }
+}
+
+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,
+ int width, int height)
+{
+ 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));
+
+ for (y = 0; y < height; y++) {
+ 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;
+ }
+}
+
+// line zero
+#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[-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;
+ 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 dp3 = abs(TP2 - 2 * TP1 + TP0);
+ const int dq3 = abs(TQ2 - 2 * TQ1 + TQ0);
+ const int d0 = dp0 + dq0;
+ const int d3 = dp3 + dq3;
+ 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) {
+ pix += 4 * ystride;
+ continue;
+ } else {
+ const int beta_3 = beta >> 3;
+ const int beta_2 = beta >> 2;
+ const int tc25 = ((tc * 5 + 1) >> 1);
+
+ 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
+ const int tc2 = tc << 1;
+ for (d = 0; d < 4; d++) {
+ const int p3 = P3;
+ const int p2 = P2;
+ const int p1 = P1;
+ const int p0 = P0;
+ const int q0 = Q0;
+ const int q1 = Q1;
+ 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);
+ }
+ 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);
+ }
+ pix += ystride;
+ }
+ } else { // normal filtering
+ int nd_p = 1;
+ int nd_q = 1;
+ const int tc_2 = tc >> 1;
+ if (dp0 + dp3 < ((beta + (beta >> 1)) >> 3))
+ nd_p = 2;
+ if (dq0 + dq3 < ((beta + (beta >> 1)) >> 3))
+ nd_q = 2;
+
+ for (d = 0; d < 4; d++) {
+ const int p2 = P2;
+ const int p1 = P1;
+ const int p0 = P0;
+ const int q0 = Q0;
+ const int q1 = Q1;
+ const int q2 = Q2;
+ int delta0 = (9 * (q0 - p0) - 3 * (q1 - p1) + 8) >> 4;
+ if (abs(delta0) < 10 * tc) {
+ delta0 = av_clip(delta0, -tc, tc);
+ if (!no_p)
+ P0 = av_clip_pixel(p0 + delta0);
+ if (!no_q)
+ Q0 = av_clip_pixel(q0 - delta0);
+ if (!no_p && nd_p > 1) {
+ const int deltap1 = av_clip((((p2 + p0 + 1) >> 1) - p1 + delta0) >> 1, -tc_2, tc_2);
+ P1 = av_clip_pixel(p1 + deltap1);
+ }
+ if (!no_q && nd_q > 1) {
+ const int deltaq1 = av_clip((((q2 + q0 + 1) >> 1) - q1 - delta0) >> 1, -tc_2, tc_2);
+ Q1 = av_clip_pixel(q1 + deltaq1);
+ }
+ }
+ pix += ystride;
+ }
+ }
+ }
+ }
+}
+
+static void FUNC(hevc_loop_filter_chroma)(uint8_t *_pix, ptrdiff_t _xstride,
+ ptrdiff_t _ystride, int *_tc,
+ uint8_t *_no_p, uint8_t *_no_q)
+{
+ int d, j, no_p, no_q;
+ pixel *pix = (pixel *)_pix;
+ ptrdiff_t xstride = _xstride / sizeof(pixel);
+ ptrdiff_t ystride = _ystride / sizeof(pixel);
+
+ for (j = 0; j < 2; j++) {
+ const int tc = _tc[j] << (BIT_DEPTH - 8);
+ if (tc <= 0) {
+ pix += 4 * ystride;
+ continue;
+ }
+ no_p = _no_p[j];
+ no_q = _no_q[j];
+
+ for (d = 0; d < 4; d++) {
+ int delta0;
+ const int p1 = P1;
+ const int p0 = P0;
+ const int q0 = Q0;
+ const int q1 = Q1;
+ delta0 = av_clip((((q0 - p0) << 2) + p1 - q1 + 4) >> 3, -tc, tc);
+ if (!no_p)
+ P0 = av_clip_pixel(p0 + delta0);
+ if (!no_q)
+ Q0 = av_clip_pixel(q0 - delta0);
+ pix += ystride;
+ }
+ }
+}
+
+static void FUNC(hevc_h_loop_filter_chroma)(uint8_t *pix, ptrdiff_t stride,
+ 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)
+{
+ FUNC(hevc_loop_filter_chroma)(pix, sizeof(pixel), stride, tc, no_p, no_q);
+}
+
+static void FUNC(hevc_h_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, 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);
+}
+
+#undef P3
+#undef P2
+#undef P1
+#undef P0
+#undef Q0
+#undef Q1
+#undef Q2
+#undef Q3
+
+#undef TP3
+#undef TP2
+#undef TP1
+#undef TP0
+#undef TQ0
+#undef TQ1
+#undef TQ2
+#undef TQ3

libav-v10.1.tar.bz2/libavcodec/hevcpred.c Added

@@ -0,0 +1,65 @@
+/*
+ * HEVC video decoder
+ *
+ * Copyright (C) 2012 - 2013 Guillaume Martres
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "hevc.h"
+
+#define BIT_DEPTH 8
+#include "hevcpred_template.c"
+#undef BIT_DEPTH
+
+#define BIT_DEPTH 9
+#include "hevcpred_template.c"
+#undef BIT_DEPTH
+
+#define BIT_DEPTH 10
+#include "hevcpred_template.c"
+#undef BIT_DEPTH
+
+void ff_hevc_pred_init(HEVCPredContext *hpc, int bit_depth)
+{
+#undef FUNC
+#define FUNC(a, depth) a ## _ ## 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_angular[3] = FUNC(pred_angular_3, depth);
+
+    switch (bit_depth) {
+    case 9:
+        HEVC_PRED(9);
+        break;
+    case 10:
+        HEVC_PRED(10);
+        break;
+    default:
+        HEVC_PRED(8);
+        break;
+    }
+}

libav-v10.1.tar.bz2/libavcodec/hevcpred_template.c Added

@@ -0,0 +1,560 @@
+/*
+ * HEVC video decoder
+ *
+ * Copyright (C) 2012 - 2013 Guillaume Martres
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/pixdesc.h"
+
+#include "hevc.h"
+
+#include "bit_depth_template.c"
+
+#define POS(x, y) src[(x) + stride * (y)]
+
+static void FUNC(intra_pred)(HEVCContext *s, int x0, int y0, int log2_size, int c_idx)
+{
+#define PU(x) \
+ ((x) >> s->sps->log2_min_pu_size)
+#define MVF(x, y) \
+ (s->ref->tab_mvf[(x) + (y) * min_pu_width])
+#define MVF_PU(x, y) \
+ MVF(PU(x0 + ((x) << hshift)), PU(y0 + ((y) << vshift)))
+#define IS_INTRA(x, y) \
+ MVF_PU(x, y).is_intra
+#define MIN_TB_ADDR_ZS(x, y) \
+ s->pps->min_tb_addr_zs[(y) * s->sps->min_tb_width + (x)]
+#define EXTEND_LEFT(ptr, start, length) \
+ for (i = (start); i > (start) - (length); i--) \
+ ptr[i - 1] = ptr[i]
+#define EXTEND_RIGHT(ptr, start, length) \
+ for (i = (start); i < (start) + (length); i++) \
+ ptr[i] = ptr[i - 1]
+#define EXTEND_UP(ptr, start, length) EXTEND_LEFT(ptr, start, length)
+#define EXTEND_DOWN(ptr, start, length) EXTEND_RIGHT(ptr, start, length)
+#define EXTEND_LEFT_CIP(ptr, start, length) \
+ for (i = (start); i > (start) - (length); i--) \
+ if (!IS_INTRA(i - 1, -1)) \
+ ptr[i - 1] = ptr[i]
+#define EXTEND_RIGHT_CIP(ptr, start, length) \
+ for (i = (start); i < (start) + (length); i++) \
+ if (!IS_INTRA(i, -1)) \
+ ptr[i] = ptr[i - 1]
+#define EXTEND_UP_CIP(ptr, start, length) \
+ for (i = (start); i > (start) - (length); i--) \
+ if (!IS_INTRA(-1, i - 1)) \
+ ptr[i - 1] = ptr[i]
+#define EXTEND_UP_CIP_0(ptr, start, length) \
+ for (i = (start); i > (start) - (length); i--) \
+ ptr[i - 1] = ptr[i]
+#define EXTEND_DOWN_CIP(ptr, start, length) \
+ for (i = (start); i < (start) + (length); i++) \
+ if (!IS_INTRA(-1, i)) \
+ ptr[i] = ptr[i - 1]
+ HEVCLocalContext *lc = &s->HEVClc;
+ int i;
+ int hshift = s->sps->hshift[c_idx];
+ int vshift = s->sps->vshift[c_idx];
+ int size = (1 << log2_size);
+ int size_in_luma = size << hshift;
+ int size_in_tbs = size_in_luma >> s->sps->log2_min_tb_size;
+ int x = x0 >> hshift;
+ int y = y0 >> vshift;
+ int x_tb = x0 >> s->sps->log2_min_tb_size;
+ int y_tb = y0 >> s->sps->log2_min_tb_size;
+ int cur_tb_addr = MIN_TB_ADDR_ZS(x_tb, y_tb);
+
+ ptrdiff_t stride = s->frame->linesize[c_idx] / sizeof(pixel);
+ pixel *src = (pixel*)s->frame->data[c_idx] + x + y * stride;
+
+ int min_pu_width = s->sps->min_pu_width;
+
+ enum IntraPredMode mode = c_idx ? lc->pu.intra_pred_mode_c :
+ lc->tu.cur_intra_pred_mode;
+
+ pixel left_array[2 * MAX_TB_SIZE + 1];
+ pixel filtered_left_array[2 * MAX_TB_SIZE + 1];
+ pixel top_array[2 * MAX_TB_SIZE + 1];
+ pixel filtered_top_array[2 * MAX_TB_SIZE + 1];
+
+ pixel *left = left_array + 1;
+ pixel *top = top_array + 1;
+ pixel *filtered_left = filtered_left_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;
+ int cand_up_left = lc->na.cand_up_left;
+ int cand_up = lc->na.cand_up;
+ int cand_up_right = lc->na.cand_up_right && cur_tb_addr > MIN_TB_ADDR_ZS(x_tb + size_in_tbs, y_tb - 1);
+
+ int bottom_left_size = (FFMIN(y0 + 2 * size_in_luma, s->sps->height) -
+ (y0 + size_in_luma)) >> vshift;
+ int top_right_size = (FFMIN(x0 + 2 * size_in_luma, s->sps->width) -
+ (x0 + size_in_luma)) >> hshift;
+
+ 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)
+ size_in_luma_pu++;
+ if (cand_bottom_left == 1 && on_pu_edge_x) {
+ int x_left_pu = PU(x0 - 1);
+ int y_bottom_pu = PU(y0 + size_in_luma);
+ int max = FFMIN(size_in_luma_pu, s->sps->min_pu_height - y_bottom_pu);
+ cand_bottom_left = 0;
+ for (i = 0; i < max; i++)
+ cand_bottom_left |= MVF(x_left_pu, y_bottom_pu + i).is_intra;
+ }
+ if (cand_left == 1 && on_pu_edge_x) {
+ int x_left_pu = PU(x0 - 1);
+ int y_left_pu = PU(y0);
+ int max = FFMIN(size_in_luma_pu, s->sps->min_pu_height - y_left_pu);
+ cand_left = 0;
+ for (i = 0; i < max; i++)
+ cand_left |= MVF(x_left_pu, y_left_pu + i).is_intra;
+ }
+ if (cand_up_left == 1) {
+ int x_left_pu = PU(x0 - 1);
+ int y_top_pu = PU(y0 - 1);
+ cand_up_left = MVF(x_left_pu, y_top_pu).is_intra;
+ }
+ if (cand_up == 1 && on_pu_edge_y) {
+ int x_top_pu = PU(x0);
+ int y_top_pu = PU(y0 - 1);
+ int max = FFMIN(size_in_luma_pu, s->sps->min_pu_width - x_top_pu);
+ cand_up = 0;
+ for (i = 0; i < max; i++)
+ cand_up |= MVF(x_top_pu + i, y_top_pu).is_intra;
+ }
+ if (cand_up_right == 1 && on_pu_edge_y) {
+ int y_top_pu = PU(y0 - 1);
+ int x_right_pu = PU(x0 + size_in_luma);
+ int max = FFMIN(size_in_luma_pu, s->sps->min_pu_width - x_right_pu);
+ cand_up_right = 0;
+ for (i = 0; i < max; i++)
+ cand_up_right |= MVF(x_right_pu + i, y_top_pu).is_intra;
+ }
+ for (i = 0; i < 2 * MAX_TB_SIZE; i++) {
+ left[i] = 128;
+ top[i] = 128;
+ }
+ }
+ 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)
+ 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)
+ left[i] = POS(-1, i);
+ }
+ if (cand_left)
+ for (i = size - 1; i >= 0; i--)
+ if (IS_INTRA(-1, i) || !s->pps->constrained_intra_pred_flag)
+ left[i] = POS(-1, i);
+ if (cand_up_left)
+ if (IS_INTRA(-1, -1) || !s->pps->constrained_intra_pred_flag) {
+ left[-1] = POS(-1, -1);
+ top[-1] = left[-1];
+ }
+ if (cand_up)
+ for (i = size - 1; i >= 0; i--)
+ if (IS_INTRA(i, -1) || !s->pps->constrained_intra_pred_flag)
+ 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)
+ 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)
+ top[i] = POS(i, -1);
+ }
+
+ if (s->pps->constrained_intra_pred_flag == 1) {
+ if (cand_bottom_left || cand_left || cand_up_left || cand_up || cand_up_right) {
+ int size_max_x = x0 + ((2 * size) << hshift) < s->sps->width ?
+ 2 * size : (s->sps->width - x0) >> hshift;
+ int size_max_y = y0 + ((2 * size) << vshift) < s->sps->height ?
+ 2 * size : (s->sps->height - y0) >> vshift;
+ int j = size + (cand_bottom_left? bottom_left_size: 0) -1;
+ if (!cand_up_right) {
+ size_max_x = x0 + ((size) << hshift) < s->sps->width ?
+ size : (s->sps->width - x0) >> hshift;
+ }
+ if (!cand_bottom_left) {
+ size_max_y = y0 + (( size) << vshift) < s->sps->height ?
+ size : (s->sps->height - y0) >> vshift;
+ }
+ if (cand_bottom_left || cand_left || cand_up_left) {
+ 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);
+ left[-1] = top[-1];
+ j = 0;
+ }
+ } else {
+ j = 0;
+ while (j < size_max_x && !IS_INTRA(j, -1))
+ j++;
+ if (j > 0)
+ if (x0 > 0) {
+ EXTEND_LEFT_CIP(top, j, j + 1);
+ } else {
+ EXTEND_LEFT_CIP(top, j, j);
+ top[-1] = top[0];
+ }
+ left[-1] = top[-1];
+ j = 0;
+ }
+ if (cand_bottom_left || cand_left) {
+ EXTEND_DOWN_CIP(left, j, size_max_y - j);
+ }
+ if (!cand_left) {
+ EXTEND_DOWN(left, 0, size);
+ }
+ if (!cand_bottom_left) {
+ EXTEND_DOWN(left, size, size);
+ }
+ if (x0 != 0 && y0 != 0) {
+ EXTEND_UP_CIP(left, size_max_y - 1, size_max_y);
+ } 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);
+ }
+ top[-1] = left[-1];
+ if (y0 != 0) {
+ EXTEND_RIGHT_CIP(top, 0, size_max_x);
+ }
+ }
+ }
+ // Infer the unavailable samples
+ if (!cand_bottom_left) {
+ if (cand_left) {
+ EXTEND_DOWN(left, size, size);
+ } else if (cand_up_left) {
+ EXTEND_DOWN(left, 0, 2 * size);
+ cand_left = 1;
+ } else if (cand_up) {
+ left[-1] = top[0];
+ EXTEND_DOWN(left, 0, 2 * size);
+ cand_up_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;
+ cand_up_left = 1;
+ cand_left = 1;
+ } else { // No samples available
+ top[0] = left[-1] = (1 << (BIT_DEPTH - 1));
+ EXTEND_RIGHT(top, 1, 2 * size - 1);
+ EXTEND_DOWN(left, 0, 2 * size);
+ }
+ }
+
+ if (!cand_left) {
+ EXTEND_UP(left, size, size);
+ }
+ if (!cand_up_left) {
+ left[-1] = left[0];
+ }
+ if (!cand_up) {
+ top[0] = left[-1];
+ EXTEND_RIGHT(top, 1, size - 1);
+ }
+ if (!cand_up_right) {
+ EXTEND_RIGHT(top, size, size);
+ }
+
+ top[-1] = left[-1];
+
+ // 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 - 26),
+ FFABS((int)mode - 10));
+ 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(left[-1] + left[63] - 2 * left[31]) < threshold) {
+ // We can't just overwrite values in top because it could be
+ // a pointer into src
+ filtered_top[-1] = top[-1];
+ filtered_top[63] = top[63];
+ for (i = 0; i < 63; i++)
+ filtered_top[i] = ((64 - (i + 1)) * top[-1] +
+ (i + 1) * top[63] + 32) >> 6;
+ for (i = 0; i < 63; i++)
+ left[i] = ((64 - (i + 1)) * left[-1] +
+ (i + 1) * left[63] + 32) >> 6;
+ top = filtered_top;
+ } else {
+ filtered_left[2 * size - 1] = left[2 * size - 1];
+ filtered_top[2 * size - 1] = top[2 * size - 1];
+ 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;
+ for (i = 2 * size - 2; i >= 0; i--)
+ filtered_top[i] = (top[i + 1] + 2 * top[i] +
+ top[i - 1] + 2) >> 2;
+ left = filtered_left;
+ top = filtered_top;
+ }
+ }
+ }
+
+ switch (mode) {
+ case INTRA_PLANAR:
+ 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);
+ break;
+ default:
+ s->hpc.pred_angular[log2_size - 2]((uint8_t *)src, (uint8_t *)top,
+ (uint8_t *)left, stride, c_idx,
+ mode);
+ break;
+ }
+}
+
+static void FUNC(pred_planar_0)(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;
+ 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;
+}
+
+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;
+ 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;
+}
+
+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;
+ 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;
+}
+
+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;
+ 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;
+}
+
+static void FUNC(pred_dc)(uint8_t *_src, const uint8_t *_top,
+ const uint8_t *_left,
+ 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;
+ pixel4 a;
+ for (i = 0; i < size; i++)
+ dc += left[i] + top[i];
+
+ dc >>= log2_size + 1;
+
+ a = PIXEL_SPLAT_X4(dc);
+
+ for (i = 0; i < size; i++)
+ for (j = 0; j < size / 4; j++)
+ AV_WN4PA(&POS(j * 4, i), a);
+
+ if (c_idx == 0 && size < 32) {
+ 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++)
+ POS(0, y) = (left[y] + 3 * dc + 2) >> 2;
+ }
+}
+
+static av_always_inline void FUNC(pred_angular)(uint8_t *_src,
+ const uint8_t *_top,
+ const uint8_t *_left,
+ ptrdiff_t stride, int c_idx,
+ int mode, int size)
+{
+ int x, y;
+ 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
+ };
+ static const int inv_angle[] = {
+ -4096, -1638, -910, -630, -482, -390, -315, -256, -315, -390, -482,
+ -630, -910, -1638, -4096
+ };
+
+ int angle = intra_pred_angle[mode - 2];
+ pixel ref_array[3 * MAX_TB_SIZE + 1];
+ pixel *ref_tmp = ref_array + size;
+ const pixel *ref;
+ int last = (size * angle) >> 5;
+
+ if (mode >= 18) {
+ ref = top - 1;
+ if (angle < 0 && last < -1) {
+ 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 = ref_tmp;
+ }
+
+ for (y = 0; y < size; y++) {
+ int idx = ((y + 1) * angle) >> 5;
+ int fact = ((y + 1) * angle) & 31;
+ if (fact) {
+ for (x = 0; x < size; x++) {
+ POS(x, y) = ((32 - fact) * ref[x + idx + 1] +
+ fact * ref[x + idx + 2] + 16) >> 5;
+ }
+ } else {
+ for (x = 0; x < size; x++)
+ POS(x, y) = ref[x + idx + 1];
+ }
+ }
+ if (mode == 26 && c_idx == 0 && size < 32) {
+ for (y = 0; y < size; y++)
+ POS(0, y) = av_clip_pixel(top[0] + ((left[y] - left[-1]) >> 1));
+ }
+ } else {
+ ref = left - 1;
+ if (angle < 0 && last < -1) {
+ 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 = ref_tmp;
+ }
+
+ for (x = 0; x < size; x++) {
+ int idx = ((x + 1) * angle) >> 5;
+ int fact = ((x + 1) * angle) & 31;
+ if (fact) {
+ for (y = 0; y < size; y++) {
+ POS(x, y) = ((32 - fact) * ref[y + idx + 1] +
+ fact * ref[y + idx + 2] + 16) >> 5;
+ }
+ } else {
+ for (y = 0; y < size; y++)
+ POS(x, y) = ref[y + idx + 1];
+ }
+ }
+ if (mode == 10 && c_idx == 0 && size < 32) {
+ for (x = 0; x < size; x++)
+ POS(x, 0) = av_clip_pixel(left[0] + ((top[x] - top[-1]) >> 1));
+ }
+ }
+}
+
+static void FUNC(pred_angular_0)(uint8_t *src, const uint8_t *top,
+ const uint8_t *left,
+ ptrdiff_t stride, int c_idx, int mode)
+{
+ FUNC(pred_angular)(src, top, left, stride, c_idx, mode, 1 << 2);
+}
+
+static void FUNC(pred_angular_1)(uint8_t *src, const uint8_t *top,
+ const uint8_t *left,
+ ptrdiff_t stride, int c_idx, int mode)
+{
+ FUNC(pred_angular)(src, top, left, stride, c_idx, mode, 1 << 3);
+}
+
+static void FUNC(pred_angular_2)(uint8_t *src, const uint8_t *top,
+ const uint8_t *left,
+ ptrdiff_t stride, int c_idx, int mode)
+{
+ FUNC(pred_angular)(src, top, left, stride, c_idx, mode, 1 << 4);
+}
+
+static void FUNC(pred_angular_3)(uint8_t *src, const uint8_t *top,
+ const uint8_t *left,
+ ptrdiff_t stride, int c_idx, int mode)
+{
+ 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

libav-v10.1.tar.bz2/libavcodec/hnm4video.c Added

@@ -0,0 +1,459 @@
+/*
+ * Cryo Interactive Entertainment HNM4 video decoder
+ *
+ * Copyright (c) 2012 David Kment
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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;
+ uint16_t width;
+ uint16_t 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");
+ 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");
+ break;
+ } else if (writeoffset + count >= hnm->width * hnm->height) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Attempting to write out of bounds");
+ 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, 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) {
+ 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;
+ while (count > 0) {
+ hnm->current[writeoffset++] = bytestream2_peek_byte(&gb);
+ count--;
+ }
+ bytestream2_skip(&gb, 1);
+ } else {
+ 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 + count >= hnm->width * hnm->height) {
+ av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds");
+ break;
+ } else if (backward && offset >= hnm->width * hnm->height) {
+ av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds");
+ break;
+ } else if (writeoffset + count >= hnm->width * hnm->height) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Attempting to write out of bounds");
+ 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) {
+ 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;
+ }
+ } 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)
+ offset -= 0x10000;
+
+ if (offset + hnm->width + count >= hnm->width * hnm->height) {
+ av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds");
+ break;
+ } else if (writeoffset + hnm->width + count >= hnm->width * hnm->height) {
+ av_log(avctx, AV_LOG_ERROR, "Attempting to write out of bounds");
+ 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 ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
+ }
+
+ chunk_id = AV_RL16(avpkt->data + 4);
+
+ if (chunk_id == HNM4_CHUNK_ID_PL) {
+ hnm_update_palette(avctx, avpkt->data, avpkt->size);
+ frame->palette_has_changed = 1;
+ } else if (chunk_id == HNM4_CHUNK_ID_IZ) {
+ 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 (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) {
+ 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,
+};

libav-v10.1.tar.bz2/libavcodec/hpel_template.c Added

@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2000, 2001 Fabrice Bellard
+ * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#define DEF_HPEL(OPNAME, OP) \
+static inline void FUNCC(OPNAME ## _pixels2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\
+ int i;\
+ for(i=0; i<h; i++){\
+ OP(*((pixel2*)(block )), AV_RN2P(pixels ));\
+ pixels+=line_size;\
+ block +=line_size;\
+ }\
+}\
+static inline void FUNCC(OPNAME ## _pixels4)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\
+ int i;\
+ for(i=0; i<h; i++){\
+ OP(*((pixel4*)(block )), AV_RN4P(pixels ));\
+ pixels+=line_size;\
+ block +=line_size;\
+ }\
+}\
+static inline void FUNCC(OPNAME ## _pixels8)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\
+ int i;\
+ for(i=0; i<h; i++){\
+ OP(*((pixel4*)(block )), AV_RN4P(pixels ));\
+ OP(*((pixel4*)(block+4*sizeof(pixel))), AV_RN4P(pixels+4*sizeof(pixel)));\
+ pixels+=line_size;\
+ block +=line_size;\
+ }\
+}\
+\
+static inline void FUNC(OPNAME ## _pixels8_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \
+ int src_stride1, int src_stride2, int h){\
+ int i;\
+ for(i=0; i<h; i++){\
+ pixel4 a,b;\
+ a= AV_RN4P(&src1[i*src_stride1 ]);\
+ b= AV_RN4P(&src2[i*src_stride2 ]);\
+ OP(*((pixel4*)&dst[i*dst_stride ]), rnd_avg_pixel4(a, b));\
+ a= AV_RN4P(&src1[i*src_stride1+4*sizeof(pixel)]);\
+ b= AV_RN4P(&src2[i*src_stride2+4*sizeof(pixel)]);\
+ OP(*((pixel4*)&dst[i*dst_stride+4*sizeof(pixel)]), rnd_avg_pixel4(a, b));\
+ }\
+}\
+\
+static inline void FUNC(OPNAME ## _pixels4_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \
+ int src_stride1, int src_stride2, int h){\
+ int i;\
+ for(i=0; i<h; i++){\
+ pixel4 a,b;\
+ a= AV_RN4P(&src1[i*src_stride1 ]);\
+ b= AV_RN4P(&src2[i*src_stride2 ]);\
+ OP(*((pixel4*)&dst[i*dst_stride ]), rnd_avg_pixel4(a, b));\
+ }\
+}\
+\
+static inline void FUNC(OPNAME ## _pixels2_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \
+ int src_stride1, int src_stride2, int h){\
+ int i;\
+ for(i=0; i<h; i++){\
+ pixel4 a,b;\
+ a= AV_RN2P(&src1[i*src_stride1 ]);\
+ b= AV_RN2P(&src2[i*src_stride2 ]);\
+ OP(*((pixel2*)&dst[i*dst_stride ]), rnd_avg_pixel4(a, b));\
+ }\
+}\
+\
+static inline void FUNC(OPNAME ## _pixels16_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \
+ int src_stride1, int src_stride2, int h){\
+ FUNC(OPNAME ## _pixels8_l2)(dst , src1 , src2 , dst_stride, src_stride1, src_stride2, h);\
+ FUNC(OPNAME ## _pixels8_l2)(dst+8*sizeof(pixel), src1+8*sizeof(pixel), src2+8*sizeof(pixel), dst_stride, src_stride1, src_stride2, h);\
+}\
+\
+CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16) , FUNCC(OPNAME ## _pixels8) , 8*sizeof(pixel))
+
+
+#define op_avg(a, b) a = rnd_avg_pixel4(a, b)
+#define op_put(a, b) a = b
+
+DEF_HPEL(avg, op_avg)
+DEF_HPEL(put, op_put)
+#undef op_avg
+#undef op_put

libav-v10.1.tar.bz2/libavcodec/hpeldsp.c Added

@@ -0,0 +1,69 @@
+/*
+ * Half-pel DSP functions.
+ * Copyright (c) 2000, 2001 Fabrice Bellard
+ * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * gmc & q-pel & 32/64 bit based MC by Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Half-pel DSP functions.
+ */
+
+#include "libavutil/attributes.h"
+#include "libavutil/intreadwrite.h"
+#include "hpeldsp.h"
+
+#define BIT_DEPTH 8
+#include "hpeldsp_template.c"
+
+av_cold void ff_hpeldsp_init(HpelDSPContext *c, int flags)
+{
+#define hpel_funcs(prefix, idx, num) \
+ c->prefix ## _pixels_tab idx [0] = prefix ## _pixels ## num ## _8_c; \
+ c->prefix ## _pixels_tab idx [1] = prefix ## _pixels ## num ## _x2_8_c; \
+ c->prefix ## _pixels_tab idx [2] = prefix ## _pixels ## num ## _y2_8_c; \
+ c->prefix ## _pixels_tab idx [3] = prefix ## _pixels ## num ## _xy2_8_c
+
+ hpel_funcs(put, [0], 16);
+ hpel_funcs(put, [1], 8);
+ hpel_funcs(put, [2], 4);
+ hpel_funcs(put, [3], 2);
+ hpel_funcs(put_no_rnd, [0], 16);
+ hpel_funcs(put_no_rnd, [1], 8);
+ hpel_funcs(avg, [0], 16);
+ hpel_funcs(avg, [1], 8);
+ hpel_funcs(avg, [2], 4);
+ hpel_funcs(avg, [3], 2);
+ hpel_funcs(avg_no_rnd,, 16);
+
+ if (ARCH_AARCH64)
+ ff_hpeldsp_init_aarch64(c, flags);
+ if (ARCH_ARM)
+ ff_hpeldsp_init_arm(c, flags);
+ if (ARCH_BFIN)
+ ff_hpeldsp_init_bfin(c, flags);
+ if (ARCH_PPC)
+ ff_hpeldsp_init_ppc(c, flags);
+ if (HAVE_VIS)
+ ff_hpeldsp_init_vis(c, flags);
+ if (ARCH_X86)
+ ff_hpeldsp_init_x86(c, flags);
+}

libav-v10.1.tar.bz2/libavcodec/hpeldsp.h Added

@@ -0,0 +1,104 @@
+/*
+ * Half-pel DSP functions.
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
+ * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Half-pel DSP functions.
+ */
+
+#ifndef AVCODEC_HPELDSP_H
+#define AVCODEC_HPELDSP_H
+
+#include <stdint.h>
+#include <stddef.h>
+
+/* add and put pixel (decoding) */
+// blocksizes for hpel_pixels_func are 8x4,8x8 16x8 16x16
+// h for hpel_pixels_func is limited to {width/2, width} but never larger
+// than 16 and never smaller than 4
+typedef void (*op_pixels_func)(uint8_t *block /*align width (8 or 16)*/,
+ const uint8_t *pixels /*align 1*/,
+ ptrdiff_t line_size, int h);
+
+/**
+ * Half-pel DSP context.
+ */
+typedef struct HpelDSPContext {
+ /**
+ * Halfpel motion compensation with rounding (a+b+1)>>1.
+ * this is an array[4][4] of motion compensation functions for 4
+ * horizontal blocksizes (8,16) and the 4 halfpel positions 
+ * *pixels_tab[ 0->16xH 1->8xH ][ xhalfpel + 2*yhalfpel ]
+ * @param block destination where the result is stored
+ * @param pixels source
+ * @param line_size number of bytes in a horizontal line of block
+ * @param h height
+ */
+ op_pixels_func put_pixels_tab[4][4];
+
+ /**
+ * Halfpel motion compensation with rounding (a+b+1)>>1.
+ * This is an array[4][4] of motion compensation functions for 4
+ * horizontal blocksizes (8,16) and the 4 halfpel positions 
+ * *pixels_tab[ 0->16xH 1->8xH ][ xhalfpel + 2*yhalfpel ]
+ * @param block destination into which the result is averaged (a+b+1)>>1
+ * @param pixels source
+ * @param line_size number of bytes in a horizontal line of block
+ * @param h height
+ */
+ op_pixels_func avg_pixels_tab[4][4];
+
+ /**
+ * Halfpel motion compensation with no rounding (a+b)>>1.
+ * this is an array[2][4] of motion compensation functions for 2
+ * horizontal blocksizes (8,16) and the 4 halfpel positions 
+ * *pixels_tab[ 0->16xH 1->8xH ][ xhalfpel + 2*yhalfpel ]
+ * @param block destination where the result is stored
+ * @param pixels source
+ * @param line_size number of bytes in a horizontal line of block
+ * @param h height
+ */
+ op_pixels_func put_no_rnd_pixels_tab[2][4];
+
+ /**
+ * Halfpel motion compensation with no rounding (a+b)>>1.
+ * this is an array[4] of motion compensation functions for 1
+ * horizontal blocksize (16) and the 4 halfpel positions 
+ * *pixels_tab[0][ xhalfpel + 2*yhalfpel ]
+ * @param block destination into which the result is averaged (a+b)>>1
+ * @param pixels source
+ * @param line_size number of bytes in a horizontal line of block
+ * @param h height
+ */
+ op_pixels_func avg_no_rnd_pixels_tab[4];
+} HpelDSPContext;
+
+void ff_hpeldsp_init(HpelDSPContext *c, int flags);
+
+void ff_hpeldsp_init_aarch64(HpelDSPContext *c, int flags);
+void ff_hpeldsp_init_arm(HpelDSPContext *c, int flags);
+void ff_hpeldsp_init_bfin(HpelDSPContext *c, int flags);
+void ff_hpeldsp_init_ppc(HpelDSPContext *c, int flags);
+void ff_hpeldsp_init_vis(HpelDSPContext *c, int flags);
+void ff_hpeldsp_init_x86(HpelDSPContext *c, int flags);
+
+#endif /* AVCODEC_HPELDSP_H */

libav-v10.1.tar.bz2/libavcodec/hpeldsp_template.c Added

@@ -0,0 +1,254 @@
+/*
+ * Half-pel DSP functions.
+ * Copyright (c) 2000, 2001 Fabrice Bellard
+ * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * gmc & q-pel & 32/64 bit based MC by Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Half-pel DSP functions.
+ */
+
+#include "bit_depth_template.c"
+
+#include "hpel_template.c"
+
+#define PIXOP2(OPNAME, OP) \
+static inline void FUNC(OPNAME ## _no_rnd_pixels8_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \
+ int src_stride1, int src_stride2, int h){\
+ int i;\
+ for(i=0; i<h; i++){\
+ pixel4 a,b;\
+ a= AV_RN4P(&src1[i*src_stride1 ]);\
+ b= AV_RN4P(&src2[i*src_stride2 ]);\
+ OP(*((pixel4*)&dst[i*dst_stride ]), no_rnd_avg_pixel4(a, b));\
+ a= AV_RN4P(&src1[i*src_stride1+4*sizeof(pixel)]);\
+ b= AV_RN4P(&src2[i*src_stride2+4*sizeof(pixel)]);\
+ OP(*((pixel4*)&dst[i*dst_stride+4*sizeof(pixel)]), no_rnd_avg_pixel4(a, b));\
+ }\
+}\
+\
+static inline void FUNCC(OPNAME ## _no_rnd_pixels8_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\
+ FUNC(OPNAME ## _no_rnd_pixels8_l2)(block, pixels, pixels+sizeof(pixel), line_size, line_size, line_size, h);\
+}\
+\
+static inline void FUNCC(OPNAME ## _pixels8_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\
+ FUNC(OPNAME ## _pixels8_l2)(block, pixels, pixels+sizeof(pixel), line_size, line_size, line_size, h);\
+}\
+\
+static inline void FUNCC(OPNAME ## _no_rnd_pixels8_y2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\
+ FUNC(OPNAME ## _no_rnd_pixels8_l2)(block, pixels, pixels+line_size, line_size, line_size, line_size, h);\
+}\
+\
+static inline void FUNCC(OPNAME ## _pixels8_y2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\
+ FUNC(OPNAME ## _pixels8_l2)(block, pixels, pixels+line_size, line_size, line_size, line_size, h);\
+}\
+\
+static inline void FUNCC(OPNAME ## _pixels4_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\
+ FUNC(OPNAME ## _pixels4_l2)(block, pixels, pixels+sizeof(pixel), line_size, line_size, line_size, h);\
+}\
+\
+static inline void FUNCC(OPNAME ## _pixels4_y2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\
+ FUNC(OPNAME ## _pixels4_l2)(block, pixels, pixels+line_size, line_size, line_size, line_size, h);\
+}\
+\
+static inline void FUNCC(OPNAME ## _pixels2_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\
+ FUNC(OPNAME ## _pixels2_l2)(block, pixels, pixels+sizeof(pixel), line_size, line_size, line_size, h);\
+}\
+\
+static inline void FUNCC(OPNAME ## _pixels2_y2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\
+ FUNC(OPNAME ## _pixels2_l2)(block, pixels, pixels+line_size, line_size, line_size, line_size, h);\
+}\
+\
+static inline void FUNCC(OPNAME ## _pixels2_xy2)(uint8_t *_block, const uint8_t *_pixels, ptrdiff_t line_size, int h)\
+{\
+ int i, a0, b0, a1, b1;\
+ pixel *block = (pixel*)_block;\
+ const pixel *pixels = (const pixel*)_pixels;\
+ line_size /= sizeof(pixel);\
+ a0= pixels[0];\
+ b0= pixels[1] + 2;\
+ a0 += b0;\
+ b0 += pixels[2];\
+\
+ pixels+=line_size;\
+ for(i=0; i<h; i+=2){\
+ a1= pixels[0];\
+ b1= pixels[1];\
+ a1 += b1;\
+ b1 += pixels[2];\
+\
+ block[0]= (a1+a0)>>2; /* FIXME non put */\
+ block[1]= (b1+b0)>>2;\
+\
+ pixels+=line_size;\
+ block +=line_size;\
+\
+ a0= pixels[0];\
+ b0= pixels[1] + 2;\
+ a0 += b0;\
+ b0 += pixels[2];\
+\
+ block[0]= (a1+a0)>>2;\
+ block[1]= (b1+b0)>>2;\
+ pixels+=line_size;\
+ block +=line_size;\
+ }\
+}\
+\
+static inline void FUNCC(OPNAME ## _pixels4_xy2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)\
+{\
+ /* FIXME HIGH BIT DEPTH */\
+ int i;\
+ const uint32_t a= AV_RN32(pixels );\
+ const uint32_t b= AV_RN32(pixels+1);\
+ uint32_t l0= (a&0x03030303UL)\
+ + (b&0x03030303UL)\
+ + 0x02020202UL;\
+ uint32_t h0= ((a&0xFCFCFCFCUL)>>2)\
+ + ((b&0xFCFCFCFCUL)>>2);\
+ uint32_t l1,h1;\
+\
+ pixels+=line_size;\
+ for(i=0; i<h; i+=2){\
+ uint32_t a= AV_RN32(pixels );\
+ uint32_t b= AV_RN32(pixels+1);\
+ l1= (a&0x03030303UL)\
+ + (b&0x03030303UL);\
+ h1= ((a&0xFCFCFCFCUL)>>2)\
+ + ((b&0xFCFCFCFCUL)>>2);\
+ OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\
+ pixels+=line_size;\
+ block +=line_size;\
+ a= AV_RN32(pixels );\
+ b= AV_RN32(pixels+1);\
+ l0= (a&0x03030303UL)\
+ + (b&0x03030303UL)\
+ + 0x02020202UL;\
+ h0= ((a&0xFCFCFCFCUL)>>2)\
+ + ((b&0xFCFCFCFCUL)>>2);\
+ OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\
+ pixels+=line_size;\
+ block +=line_size;\
+ }\
+}\
+\
+static inline void FUNCC(OPNAME ## _pixels8_xy2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)\
+{\
+ /* FIXME HIGH BIT DEPTH */\
+ int j;\
+ for(j=0; j<2; j++){\
+ int i;\
+ const uint32_t a= AV_RN32(pixels );\
+ const uint32_t b= AV_RN32(pixels+1);\
+ uint32_t l0= (a&0x03030303UL)\
+ + (b&0x03030303UL)\
+ + 0x02020202UL;\
+ uint32_t h0= ((a&0xFCFCFCFCUL)>>2)\
+ + ((b&0xFCFCFCFCUL)>>2);\
+ uint32_t l1,h1;\
+\
+ pixels+=line_size;\
+ for(i=0; i<h; i+=2){\
+ uint32_t a= AV_RN32(pixels );\
+ uint32_t b= AV_RN32(pixels+1);\
+ l1= (a&0x03030303UL)\
+ + (b&0x03030303UL);\
+ h1= ((a&0xFCFCFCFCUL)>>2)\
+ + ((b&0xFCFCFCFCUL)>>2);\
+ OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\
+ pixels+=line_size;\
+ block +=line_size;\
+ a= AV_RN32(pixels );\
+ b= AV_RN32(pixels+1);\
+ l0= (a&0x03030303UL)\
+ + (b&0x03030303UL)\
+ + 0x02020202UL;\
+ h0= ((a&0xFCFCFCFCUL)>>2)\
+ + ((b&0xFCFCFCFCUL)>>2);\
+ OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\
+ pixels+=line_size;\
+ block +=line_size;\
+ }\
+ pixels+=4-line_size*(h+1);\
+ block +=4-line_size*h;\
+ }\
+}\
+\
+static inline void FUNCC(OPNAME ## _no_rnd_pixels8_xy2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)\
+{\
+ /* FIXME HIGH BIT DEPTH */\
+ int j;\
+ for(j=0; j<2; j++){\
+ int i;\
+ const uint32_t a= AV_RN32(pixels );\
+ const uint32_t b= AV_RN32(pixels+1);\
+ uint32_t l0= (a&0x03030303UL)\
+ + (b&0x03030303UL)\
+ + 0x01010101UL;\
+ uint32_t h0= ((a&0xFCFCFCFCUL)>>2)\
+ + ((b&0xFCFCFCFCUL)>>2);\
+ uint32_t l1,h1;\
+\
+ pixels+=line_size;\
+ for(i=0; i<h; i+=2){\
+ uint32_t a= AV_RN32(pixels );\
+ uint32_t b= AV_RN32(pixels+1);\
+ l1= (a&0x03030303UL)\
+ + (b&0x03030303UL);\
+ h1= ((a&0xFCFCFCFCUL)>>2)\
+ + ((b&0xFCFCFCFCUL)>>2);\
+ OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\
+ pixels+=line_size;\
+ block +=line_size;\
+ a= AV_RN32(pixels );\
+ b= AV_RN32(pixels+1);\
+ l0= (a&0x03030303UL)\
+ + (b&0x03030303UL)\
+ + 0x01010101UL;\
+ h0= ((a&0xFCFCFCFCUL)>>2)\
+ + ((b&0xFCFCFCFCUL)>>2);\
+ OP(*((uint32_t*)block), h0+h1+(((l0+l1)>>2)&0x0F0F0F0FUL));\
+ pixels+=line_size;\
+ block +=line_size;\
+ }\
+ pixels+=4-line_size*(h+1);\
+ block +=4-line_size*h;\
+ }\
+}\
+\
+CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_x2) , FUNCC(OPNAME ## _pixels8_x2) , 8*sizeof(pixel))\
+CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_y2) , FUNCC(OPNAME ## _pixels8_y2) , 8*sizeof(pixel))\
+CALL_2X_PIXELS(FUNCC(OPNAME ## _pixels16_xy2), FUNCC(OPNAME ## _pixels8_xy2), 8*sizeof(pixel))\
+av_unused CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16) , FUNCC(OPNAME ## _pixels8) , 8*sizeof(pixel))\
+CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16_x2) , FUNCC(OPNAME ## _no_rnd_pixels8_x2) , 8*sizeof(pixel))\
+CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16_y2) , FUNCC(OPNAME ## _no_rnd_pixels8_y2) , 8*sizeof(pixel))\
+CALL_2X_PIXELS(FUNCC(OPNAME ## _no_rnd_pixels16_xy2), FUNCC(OPNAME ## _no_rnd_pixels8_xy2), 8*sizeof(pixel))\
+
+#define op_avg(a, b) a = rnd_avg_pixel4(a, b)
+#define op_put(a, b) a = b
+#if BIT_DEPTH == 8
+#define put_no_rnd_pixels8_8_c put_pixels8_8_c
+PIXOP2(avg, op_avg)
+PIXOP2(put, op_put)
+#endif
+#undef op_avg
+#undef op_put

libav-v9.6.tar.bz2/libavcodec/huffman.c -> libav-v10.1.tar.bz2/libavcodec/huffman.c Changed

libav-v9.6.tar.bz2/libavcodec/huffyuv.c -> libav-v10.1.tar.bz2/libavcodec/huffyuv.c Changed

libav-v9.6.tar.bz2/libavcodec/huffyuv.h -> libav-v10.1.tar.bz2/libavcodec/huffyuv.h Changed

libav-v9.6.tar.bz2/libavcodec/huffyuvdec.c -> libav-v10.1.tar.bz2/libavcodec/huffyuvdec.c Changed

@@ -29,7 +29,6 @@
 */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "get_bits.h"
 #include "huffyuv.h"
 #include "thread.h"
@@ -242,7 +241,6 @@
 ff_huffyuv_common_init(avctx);
 memset(s->vlc, 0, 3 * sizeof(VLC));
 
- avctx->coded_frame = &s->picture;
 s->interlaced = s->height > 288;
 
 s->bgr32 = 1;
@@ -338,7 +336,6 @@
 HYuvContext *s = avctx->priv_data;
 int i;
 
- avctx->coded_frame= &s->picture;
 ff_huffyuv_alloc_temp(s);
 
 for (i = 0; i < 6; i++)
@@ -444,7 +441,7 @@
 }
 }
 
-static void draw_slice(HYuvContext *s, int y)
+static void draw_slice(HYuvContext *s, AVFrame *frame, int y)
 {
 int h, cy, i;
 int offset[AV_NUM_DATA_POINTERS];
@@ -461,14 +458,14 @@
 cy = y;
 }
 
- offset[0] = s->picture.linesize[0]*y;
- offset[1] = s->picture.linesize[1]*cy;
- offset[2] = s->picture.linesize[2]*cy;
+ offset[0] = frame->linesize[0] * y;
+ offset[1] = frame->linesize[1] * cy;
+ offset[2] = frame->linesize[2] * cy;
 for (i = 3; i < AV_NUM_DATA_POINTERS; i++)
 offset[i] = 0;
 emms_c();
 
- s->avctx->draw_horiz_band(s->avctx, &s->picture, offset, y, 3, h);
+ s->avctx->draw_horiz_band(s->avctx, frame, offset, y, 3, h);
 
 s->last_slice_end = y + h;
 }
@@ -483,11 +480,10 @@
 const int width2 = s->width>>1;
 const int height = s->height;
 int fake_ystride, fake_ustride, fake_vstride;
- AVFrame * const p = &s->picture;
+ ThreadFrame frame = { .f = data };
+ AVFrame * const p = data;
 int table_size = 0;
 
- AVFrame *picture = data;
-
 av_fast_malloc(&s->bitstream_buffer,
 &s->bitstream_buffer_size,
 buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
@@ -498,11 +494,7 @@
 s->dsp.bswap_buf((uint32_t*)s->bitstream_buffer,
 (const uint32_t*)buf, buf_size / 4);
 
- if (p->data[0])
- ff_thread_release_buffer(avctx, p);
-
- p->reference = 0;
- if (ff_thread_get_buffer(avctx, p) < 0) {
+ if (ff_thread_get_buffer(avctx, &frame, 0) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return -1;
 }
@@ -573,7 +565,7 @@
 if (y >= s->height) break;
 }
 
- draw_slice(s, y);
+ draw_slice(s, p, y);
 
 ydst = p->data[0] + p->linesize[0]*y;
 udst = p->data[1] + p->linesize[1]*cy;
@@ -595,7 +587,7 @@
 }
 }
 }
- draw_slice(s, height);
+ draw_slice(s, p, height);
 
 break;
 case MEDIAN:
@@ -652,7 +644,7 @@
 }
 if (y >= height) break;
 }
- draw_slice(s, y);
+ draw_slice(s, p, y);
 
 decode_422_bitstream(s, width);
 
@@ -667,7 +659,7 @@
 }
 }
 
- draw_slice(s, height);
+ draw_slice(s, p, height);
 break;
 }
 }
@@ -711,7 +703,7 @@
 }
 }
 // just 1 large slice as this is not possible in reverse order
- draw_slice(s, height);
+ draw_slice(s, p, height);
 break;
 default:
 av_log(avctx, AV_LOG_ERROR,
@@ -725,7 +717,6 @@
 }
 emms_c();
 
- *picture = *p;
 *got_frame = 1;
 
 return (get_bits_count(&s->gb) + 31) / 32 * 4 + table_size;
@@ -736,9 +727,6 @@
 HYuvContext *s = avctx->priv_data;
 int i;
 
- if (s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
-
 ff_huffyuv_common_end(s);
 av_freep(&s->bitstream_buffer);
 
@@ -752,6 +740,7 @@
 #if CONFIG_HUFFYUV_DECODER
 AVCodec ff_huffyuv_decoder = {
 .name = "huffyuv",
+ .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_HUFFYUV,
 .priv_data_size = sizeof(HYuvContext),
@@ -761,13 +750,13 @@
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND |
 CODEC_CAP_FRAME_THREADS,
 .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy),
- .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"),
 };
 #endif
 
 #if CONFIG_FFVHUFF_DECODER
 AVCodec ff_ffvhuff_decoder = {
 .name = "ffvhuff",
+ .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_FFVHUFF,
 .priv_data_size = sizeof(HYuvContext),
@@ -777,6 +766,5 @@
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND |
 CODEC_CAP_FRAME_THREADS,
 .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy),
- .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"),
 };
 #endif

libav-v9.6.tar.bz2/libavcodec/huffyuvenc.c -> libav-v10.1.tar.bz2/libavcodec/huffyuvenc.c Changed

@@ -55,24 +55,29 @@
 
 static inline void sub_left_prediction_bgr32(HYuvContext *s, uint8_t *dst,
 uint8_t *src, int w,
- int *red, int *green, int *blue)
+ int *red, int *green, int *blue,
+ int *alpha)
 {
 int i;
- int r,g,b;
+ int r, g, b, a;
 r = *red;
 g = *green;
 b = *blue;
+ a = *alpha;
 
 for (i = 0; i < FFMIN(w, 4); i++) {
 const int rt = src[i * 4 + R];
 const int gt = src[i * 4 + G];
 const int bt = src[i * 4 + B];
+ const int at = src[i * 4 + A];
 dst[i * 4 + R] = rt - r;
 dst[i * 4 + G] = gt - g;
 dst[i * 4 + B] = bt - b;
+ dst[i * 4 + A] = at - a;
 r = rt;
 g = gt;
 b = bt;
+ a = at;
 }
 
 s->dsp.diff_bytes(dst + 16, src + 16, src + 12, w * 4 - 16);
@@ -80,6 +85,35 @@
 *red = src[(w - 1) * 4 + R];
 *green = src[(w - 1) * 4 + G];
 *blue = src[(w - 1) * 4 + B];
+ *alpha = src[(w - 1) * 4 + A];
+}
+
+static inline void sub_left_prediction_rgb24(HYuvContext *s, uint8_t *dst,
+ uint8_t *src, int w,
+ int *red, int *green, int *blue)
+{
+ int i;
+ int r, g, b;
+ r = *red;
+ g = *green;
+ b = *blue;
+ for (i = 0; i < FFMIN(w, 16); i++) {
+ const int rt = src[i * 3 + 0];
+ const int gt = src[i * 3 + 1];
+ const int bt = src[i * 3 + 2];
+ dst[i * 3 + 0] = rt - r;
+ dst[i * 3 + 1] = gt - g;
+ dst[i * 3 + 2] = bt - b;
+ r = rt;
+ g = gt;
+ b = bt;
+ }
+
+ s->dsp.diff_bytes(dst + 48, src + 48, src + 48 - 3, w * 3 - 48);
+
+ *red = src[(w - 1) * 3 + 0];
+ *green = src[(w - 1) * 3 + 1];
+ *blue = src[(w - 1) * 3 + 2];
 }
 
 static int store_table(HYuvContext *s, const uint8_t *len, uint8_t *buf)
@@ -117,16 +151,26 @@
 avctx->stats_out = av_mallocz(1024*30); // 21*256*3(%llu ) + 3(\n) + 1(0) = 16132
 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;
 
 switch (avctx->pix_fmt) {
 case AV_PIX_FMT_YUV420P:
- s->bitstream_bpp = 12;
- break;
 case AV_PIX_FMT_YUV422P:
- s->bitstream_bpp = 16;
+ if (s->width & 1) {
+ av_log(avctx, AV_LOG_ERROR, "Width must be even for this colorspace.\n");
+ return -1;
+ }
+ s->bitstream_bpp = avctx->pix_fmt == AV_PIX_FMT_YUV420P ? 12 : 16;
 break;
 case AV_PIX_FMT_RGB32:
+ s->bitstream_bpp = 32;
+ break;
+ case AV_PIX_FMT_RGB24:
 s->bitstream_bpp = 24;
 break;
 default:
@@ -338,44 +382,52 @@
 return 0;
 }
 
-static int encode_bgr_bitstream(HYuvContext *s, int count)
+static inline int encode_bgra_bitstream(HYuvContext *s, int count, int planes)
 {
 int i;
 
- if (s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb) >> 3) < 3 * 4 * count) {
+ if (s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb) >> 3) <
+ 4 * planes * count) {
 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
 return -1;
 }
 
-#define LOAD3\
- int g = s->temp[0][4 * i + G];\
- int b = (s->temp[0][4 * i + B] - g) & 0xff;\
- int r = (s->temp[0][4 * i + R] - g) & 0xff;
-#define STAT3\
- s->stats[0][b]++;\
- s->stats[1][g]++;\
- s->stats[2][r]++;
-#define WRITE3\
- put_bits(&s->pb, s->len[1][g], s->bits[1][g]);\
- put_bits(&s->pb, s->len[0][b], s->bits[0][b]);\
- put_bits(&s->pb, s->len[2][r], s->bits[2][r]);
+#define LOAD_GBRA \
+ int g = s->temp[0][planes == 3 ? 3 * i + 1 : 4 * i + G]; \
+ int b = s->temp[0][planes == 3 ? 3 * i + 2 : 4 * i + B] - g & 0xFF; \
+ int r = s->temp[0][planes == 3 ? 3 * i + 0 : 4 * i + R] - g & 0xFF; \
+ int a = s->temp[0][planes * i + A];
+
+#define STAT_BGRA \
+ s->stats[0][b]++; \
+ s->stats[1][g]++; \
+ s->stats[2][r]++; \
+ if (planes == 4) \
+ s->stats[2][a]++;
+
+#define WRITE_GBRA \
+ put_bits(&s->pb, s->len[1][g], s->bits[1][g]); \
+ put_bits(&s->pb, s->len[0][b], s->bits[0][b]); \
+ put_bits(&s->pb, s->len[2][r], s->bits[2][r]); \
+ if (planes == 4) \
+ put_bits(&s->pb, s->len[2][a], s->bits[2][a]);
 
 if ((s->flags & CODEC_FLAG_PASS1) &&
 (s->avctx->flags2 & CODEC_FLAG2_NO_OUTPUT)) {
 for (i = 0; i < count; i++) {
- LOAD3;
- STAT3;
+ LOAD_GBRA;
+ STAT_BGRA;
 }
 } else if (s->context || (s->flags & CODEC_FLAG_PASS1)) {
 for (i = 0; i < count; i++) {
- LOAD3;
- STAT3;
- WRITE3;
+ LOAD_GBRA;
+ STAT_BGRA;
+ WRITE_GBRA;
 }
 } else {
 for (i = 0; i < count; i++) {
- LOAD3;
- WRITE3;
+ LOAD_GBRA;
+ WRITE_GBRA;
 }
 }
 return 0;
@@ -391,7 +443,7 @@
 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 (!pkt->data &&
@@ -400,10 +452,6 @@
 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]);
@@ -529,25 +577,57 @@
 const int stride = -p->linesize[0];
 const int fake_stride = -fake_ystride;
 int y;
- int leftr, leftg, leftb;
+ int leftr, leftg, leftb, lefta;
 
+ put_bits(&s->pb, 8, lefta = data[A]);
 put_bits(&s->pb, 8, leftr = data[R]);
 put_bits(&s->pb, 8, leftg = data[G]);
 put_bits(&s->pb, 8, leftb = data[B]);
- put_bits(&s->pb, 8, 0);
 
- sub_left_prediction_bgr32(s, s->temp[0], data + 4, width - 1, &leftr, &leftg, &leftb);
- encode_bgr_bitstream(s, width - 1);
+ sub_left_prediction_bgr32(s, s->temp[0], data + 4, width - 1,
+ &leftr, &leftg, &leftb, &lefta);
+ encode_bgra_bitstream(s, width - 1, 4);
 
 for (y = 1; y < s->height; y++) {
 uint8_t *dst = data + y*stride;
 if (s->predictor == PLANE && s->interlaced < y) {
 s->dsp.diff_bytes(s->temp[1], dst, dst - fake_stride, width * 4);
- sub_left_prediction_bgr32(s, s->temp[0], s->temp[1], width, &leftr, &leftg, &leftb);
+ sub_left_prediction_bgr32(s, s->temp[0], s->temp[1], width,
+ &leftr, &leftg, &leftb, &lefta);
 } else {
- sub_left_prediction_bgr32(s, s->temp[0], dst, width, &leftr, &leftg, &leftb);
+ sub_left_prediction_bgr32(s, s->temp[0], dst, width,
+ &leftr, &leftg, &leftb, &lefta);
 }
- encode_bgr_bitstream(s, width);
+ encode_bgra_bitstream(s, width, 4);
+ }
+ } else if (avctx->pix_fmt == AV_PIX_FMT_RGB24) {
+ uint8_t *data = p->data[0] + (height - 1) * p->linesize[0];
+ const int stride = -p->linesize[0];
+ const int fake_stride = -fake_ystride;
+ int y;
+ int leftr, leftg, leftb;
+
+ put_bits(&s->pb, 8, leftr = data[0]);
+ put_bits(&s->pb, 8, leftg = data[1]);
+ put_bits(&s->pb, 8, leftb = data[2]);
+ put_bits(&s->pb, 8, 0);
+
+ sub_left_prediction_rgb24(s, s->temp[0], data + 3, width - 1,
+ &leftr, &leftg, &leftb);
+ encode_bgra_bitstream(s, width-1, 3);
+
+ for (y = 1; y < s->height; y++) {
+ uint8_t *dst = data + y * stride;
+ if (s->predictor == PLANE && s->interlaced < y) {
+ s->dsp.diff_bytes(s->temp[1], dst, dst - fake_stride,
+ width * 3);
+ sub_left_prediction_rgb24(s, s->temp[0], s->temp[1], width,
+ &leftr, &leftg, &leftb);
+ } else {
+ sub_left_prediction_rgb24(s, s->temp[0], dst, width,
+ &leftr, &leftg, &leftb);
+ }
+ encode_bgra_bitstream(s, width, 3);
 }
 } else {
 av_log(avctx, AV_LOG_ERROR, "Format not supported!\n");
@@ -597,12 +677,15 @@
 av_freep(&avctx->extradata);
 av_freep(&avctx->stats_out);
 
+ av_frame_free(&avctx->coded_frame);
+
 return 0;
 }
 
 #if CONFIG_HUFFYUV_ENCODER
 AVCodec ff_huffyuv_encoder = {
 .name = "huffyuv",
+ .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_HUFFYUV,
 .priv_data_size = sizeof(HYuvContext),
@@ -610,15 +693,16 @@
 .encode2 = encode_frame,
 .close = encode_end,
 .pix_fmts = (const enum AVPixelFormat[]){
- AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE
+ AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB24,
+ AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE
 },
- .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"),
 };
 #endif
 
 #if CONFIG_FFVHUFF_ENCODER
 AVCodec ff_ffvhuff_encoder = {
 .name = "ffvhuff",
+ .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_FFVHUFF,
 .priv_data_size = sizeof(HYuvContext),
@@ -626,8 +710,8 @@
 .encode2 = encode_frame,
 .close = encode_end,
 .pix_fmts = (const enum AVPixelFormat[]){
- AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE
+ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB24,
+ AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE
 },
- .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"),
 };
 #endif

libav-v9.6.tar.bz2/libavcodec/idcinvideo.c -> libav-v10.1.tar.bz2/libavcodec/idcinvideo.c Changed

@@ -66,7 +66,6 @@
 typedef struct IdcinContext {
 
 AVCodecContext *avctx;
- AVFrame frame;
 
 const unsigned char *buf;
 int size;
@@ -168,12 +167,10 @@
 huff_build_tree(s, i);
 }
 
- s->frame.data[0] = NULL;
-
 return 0;
 }
 
-static void idcin_decode_vlcs(IdcinContext *s)
+static void idcin_decode_vlcs(IdcinContext *s, AVFrame *frame)
 {
 hnode *hnodes;
 long x, y;
@@ -182,8 +179,8 @@
 int bit_pos, node_num, dat_pos;
 
 prev = bit_pos = dat_pos = 0;
- for (y = 0; y < (s->frame.linesize[0] * s->avctx->height);
- y += s->frame.linesize[0]) {
+ for (y = 0; y < (frame->linesize[0] * s->avctx->height);
+ y += frame->linesize[0]) {
 for (x = y; x < y + s->avctx->width; x++) {
 node_num = s->num_huff_nodes[prev];
 hnodes = s->huff_nodes[prev];
@@ -203,7 +200,7 @@
 bit_pos--;
 }
 
- s->frame.data[0][x] = node_num;
+ frame->data[0][x] = node_num;
 prev = node_num;
 }
 }
@@ -217,52 +214,39 @@
 int buf_size = avpkt->size;
 IdcinContext *s = avctx->priv_data;
 const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
+ AVFrame *frame = data;
+ int ret;
 
 s->buf = buf;
 s->size = buf_size;
 
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
-
- if (ff_get_buffer(avctx, &s->frame)) {
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, " id CIN Video: get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
- idcin_decode_vlcs(s);
+ idcin_decode_vlcs(s, frame);
 
 if (pal) {
- s->frame.palette_has_changed = 1;
+ frame->palette_has_changed = 1;
 memcpy(s->pal, pal, AVPALETTE_SIZE);
 }
 /* make the palette available on the way out */
- memcpy(s->frame.data[1], s->pal, AVPALETTE_SIZE);
+ memcpy(frame->data[1], s->pal, AVPALETTE_SIZE);
 
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
 /* report that the buffer was completely consumed */
 return buf_size;
 }
 
-static av_cold int idcin_decode_end(AVCodecContext *avctx)
-{
- IdcinContext *s = avctx->priv_data;
-
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
-
- return 0;
-}
-
 AVCodec ff_idcin_decoder = {
 .name = "idcinvideo",
+ .long_name = NULL_IF_CONFIG_SMALL("id Quake II CIN video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_IDCIN,
 .priv_data_size = sizeof(IdcinContext),
 .init = idcin_decode_init,
- .close = idcin_decode_end,
 .decode = idcin_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("id Quake II CIN video"),
 };

libav-v9.6.tar.bz2/libavcodec/iff.c -> libav-v10.1.tar.bz2/libavcodec/iff.c Changed

@@ -25,6 +25,8 @@
 * IFF PBM/ILBM bitmap decoder
 */
 
+#include <stdint.h>
+
 #include "libavutil/imgutils.h"
 #include "bytestream.h"
 #include "avcodec.h"
@@ -32,7 +34,7 @@
 #include "internal.h"
 
 typedef struct {
- AVFrame frame;
+ AVFrame *frame;
 int planesize;
 uint8_t * planebuf;
 int init; // 1 if buffer and palette data already initialized, 0 otherwise
@@ -120,7 +122,7 @@
 /**
 * Convert CMAP buffer (stored in extradata) to lavc palette format
 */
-static int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
+static int cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
 {
 int count, i;
 
@@ -133,19 +135,25 @@
 // If extradata is smaller than actually needed, fill the remaining with black.
 count = FFMIN(avctx->extradata_size / 3, count);
 if (count) {
- for (i=0; i < count; i++) {
- pal[i] = 0xFF000000 | AV_RB24( avctx->extradata + i*3 );
- }
+ for (i = 0; i < count; i++)
+ pal[i] = 0xFF000000 | AV_RB24(avctx->extradata + i * 3);
 } else { // Create gray-scale color palette for bps < 8
 count = 1 << avctx->bits_per_coded_sample;
 
- for (i=0; i < count; i++) {
+ for (i = 0; i < count; i++)
 pal[i] = 0xFF000000 | gray2rgb((i * 255) >> avctx->bits_per_coded_sample);
- }
 }
 return 0;
 }
 
+static av_cold int decode_end(AVCodecContext *avctx)
+{
+ IffContext *s = avctx->priv_data;
+ av_frame_free(&s->frame);
+ av_freep(&s->planebuf);
+ return 0;
+}
+
 static av_cold int decode_init(AVCodecContext *avctx)
 {
 IffContext *s = avctx->priv_data;
@@ -164,11 +172,15 @@
 if ((err = av_image_check_size(avctx->width, avctx->height, 0, avctx)))
 return err;
 s->planesize = FFALIGN(avctx->width, 16) >> 3; // Align plane size in bits to word-boundary
- s->planebuf = av_malloc(s->planesize + FF_INPUT_BUFFER_PADDING_SIZE);
+ s->planebuf = av_malloc(s->planesize + FF_INPUT_BUFFER_PADDING_SIZE);
 if (!s->planebuf)
 return AVERROR(ENOMEM);
 
- s->frame.reference = 1;
+ s->frame = av_frame_alloc();
+ if (!s->frame) {
+ decode_end(avctx);
+ return AVERROR(ENOMEM);
+ }
 
 return 0;
 }
@@ -206,12 +218,12 @@
 dst[1] |= lut[mask++];
 dst[2] |= lut[mask++];
 dst[3] |= lut[mask];
- mask = (*buf++ << 2) & 0x3F;
+ mask = (*buf++ << 2) & 0x3F;
 dst[4] |= lut[mask++];
 dst[5] |= lut[mask++];
 dst[6] |= lut[mask++];
 dst[7] |= lut[mask];
- dst += 8;
+ dst += 8;
 } while (--buf_size);
 }
 
@@ -223,9 +235,10 @@
 * @param buf the source byterun1 compressed bitstream
 * @param buf_end the EOF of source byterun1 compressed bitstream
 * @return number of consumed bytes in byterun1 compressed bitstream
-*/
+ */
 static int decode_byterun(uint8_t *dst, int dst_size,
- const uint8_t *buf, const uint8_t *const buf_end) {
+ const uint8_t *buf, const uint8_t *const buf_end)
+{
 const uint8_t *const buf_start = buf;
 unsigned x;
 for (x = 0; x < dst_size && buf < buf_end;) {
@@ -247,129 +260,122 @@
 }
 
 static int decode_frame_ilbm(AVCodecContext *avctx,
- void *data, int *got_frame,
- AVPacket *avpkt)
+ void *data, int *got_frame,
+ AVPacket *avpkt)
 {
- IffContext *s = avctx->priv_data;
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- const uint8_t *buf_end = buf+buf_size;
+ IffContext *s = avctx->priv_data;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ const uint8_t *buf_end = buf + buf_size;
 int y, plane, res;
 
- if (s->init) {
- if ((res = avctx->reget_buffer(avctx, &s->frame)) < 0) {
- av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return res;
- }
- } else if ((res = ff_get_buffer(avctx, &s->frame)) < 0) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ if ((res = ff_reget_buffer(avctx, s->frame)) < 0)
 return res;
- } else if (avctx->bits_per_coded_sample <= 8 && avctx->pix_fmt != AV_PIX_FMT_GRAY8) {
- if ((res = ff_cmap_read_palette(avctx, (uint32_t*)s->frame.data[1])) < 0)
+
+ if (!s->init && avctx->bits_per_coded_sample <= 8 &&
+ avctx->pix_fmt != AV_PIX_FMT_GRAY8) {
+ if ((res = cmap_read_palette(avctx, (uint32_t *)s->frame->data[1])) < 0)
 return res;
 }
 s->init = 1;
 
- if (avctx->codec_tag == MKTAG('I','L','B','M')) { // interleaved
+ if (avctx->codec_tag == MKTAG('I', 'L', 'B', 'M')) { // interleaved
 if (avctx->pix_fmt == AV_PIX_FMT_PAL8 || avctx->pix_fmt == AV_PIX_FMT_GRAY8) {
- for(y = 0; y < avctx->height; y++ ) {
- uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ];
+ for (y = 0; y < avctx->height; y++) {
+ uint8_t *row = &s->frame->data[0][y * s->frame->linesize[0]];
 memset(row, 0, avctx->width);
- for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) {
+ for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end;
+ plane++) {
 decodeplane8(row, buf, FFMIN(s->planesize, buf_end - buf), plane);
 buf += s->planesize;
 }
 }
 } else { // AV_PIX_FMT_BGR32
- for(y = 0; y < avctx->height; y++ ) {
- uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
+ for (y = 0; y < avctx->height; y++) {
+ uint8_t *row = &s->frame->data[0][y * s->frame->linesize[0]];
 memset(row, 0, avctx->width << 2);
- for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) {
- decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), plane);
+ for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end;
+ plane++) {
+ decodeplane32((uint32_t *)row, buf,
+ FFMIN(s->planesize, buf_end - buf), plane);
 buf += s->planesize;
 }
 }
 }
 } else if (avctx->pix_fmt == AV_PIX_FMT_PAL8 || avctx->pix_fmt == AV_PIX_FMT_GRAY8) { // IFF-PBM
- for(y = 0; y < avctx->height; y++ ) {
- uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]];
+ for (y = 0; y < avctx->height && buf < buf_end; y++) {
+ uint8_t *row = &s->frame->data[0][y * s->frame->linesize[0]];
 memcpy(row, buf, FFMIN(avctx->width, buf_end - buf));
 buf += avctx->width + (avctx->width % 2); // padding if odd
 }
 }
 
+ if ((res = av_frame_ref(data, s->frame)) < 0)
+ return res;
+
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
+
 return buf_size;
 }
 
 static int decode_frame_byterun1(AVCodecContext *avctx,
- void *data, int *got_frame,
- AVPacket *avpkt)
+ void *data, int *got_frame,
+ AVPacket *avpkt)
 {
- IffContext *s = avctx->priv_data;
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- const uint8_t *buf_end = buf+buf_size;
+ IffContext *s = avctx->priv_data;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ const uint8_t *buf_end = buf + buf_size;
 int y, plane, res;
 
- if (s->init) {
- if ((res = avctx->reget_buffer(avctx, &s->frame)) < 0) {
- av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return res;
- }
- } else if ((res = ff_get_buffer(avctx, &s->frame)) < 0) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ if ((res = ff_reget_buffer(avctx, s->frame)) < 0)
 return res;
- } else if (avctx->bits_per_coded_sample <= 8 && avctx->pix_fmt != AV_PIX_FMT_GRAY8) {
- if ((res = ff_cmap_read_palette(avctx, (uint32_t*)s->frame.data[1])) < 0)
+
+ if (!s->init && avctx->bits_per_coded_sample <= 8 &&
+ avctx->pix_fmt != AV_PIX_FMT_GRAY8) {
+ if ((res = cmap_read_palette(avctx, (uint32_t *)s->frame->data[1])) < 0)
 return res;
 }
 s->init = 1;
 
- if (avctx->codec_tag == MKTAG('I','L','B','M')) { //interleaved
+ if (avctx->codec_tag == MKTAG('I', 'L', 'B', 'M')) { // interleaved
 if (avctx->pix_fmt == AV_PIX_FMT_PAL8 || avctx->pix_fmt == AV_PIX_FMT_GRAY8) {
- for(y = 0; y < avctx->height ; y++ ) {
- uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ];
+ for (y = 0; y < avctx->height; y++) {
+ uint8_t *row = &s->frame->data[0][y * s->frame->linesize[0]];
 memset(row, 0, avctx->width);
 for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) {
 buf += decode_byterun(s->planebuf, s->planesize, buf, buf_end);
 decodeplane8(row, s->planebuf, s->planesize, plane);
 }
 }
- } else { //AV_PIX_FMT_BGR32
- for(y = 0; y < avctx->height ; y++ ) {
- uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
+ } else { // AV_PIX_FMT_BGR32
+ for (y = 0; y < avctx->height; y++) {
+ uint8_t *row = &s->frame->data[0][y * s->frame->linesize[0]];
 memset(row, 0, avctx->width << 2);
 for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) {
 buf += decode_byterun(s->planebuf, s->planesize, buf, buf_end);
- decodeplane32((uint32_t *) row, s->planebuf, s->planesize, plane);
+ decodeplane32((uint32_t *)row, s->planebuf, s->planesize, plane);
 }
 }
 }
 } else {
- for(y = 0; y < avctx->height ; y++ ) {
- uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
+ for (y = 0; y < avctx->height; y++) {
+ uint8_t *row = &s->frame->data[0][y * s->frame->linesize[0]];
 buf += decode_byterun(row, avctx->width, buf, buf_end);
 }
 }
 
+ if ((res = av_frame_ref(data, s->frame)) < 0)
+ return res;
+
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
- return buf_size;
-}
 
-static av_cold int decode_end(AVCodecContext *avctx)
-{
- IffContext *s = avctx->priv_data;
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
- av_freep(&s->planebuf);
- return 0;
+ return buf_size;
 }
 
 AVCodec ff_iff_ilbm_decoder = {
 .name = "iff_ilbm",
+ .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_IFF_ILBM,
 .priv_data_size = sizeof(IffContext),
@@ -377,11 +383,11 @@
 .close = decode_end,
 .decode = decode_frame_ilbm,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"),
 };
 
 AVCodec ff_iff_byterun1_decoder = {
 .name = "iff_byterun1",
+ .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_IFF_BYTERUN1,
 .priv_data_size = sizeof(IffContext),
@@ -389,5 +395,4 @@
 .close = decode_end,
 .decode = decode_frame_byterun1,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"),
 };

libav-v9.6.tar.bz2/libavcodec/iirfilter.c -> libav-v10.1.tar.bz2/libavcodec/iirfilter.c Changed

@@ -26,6 +26,7 @@
 
 #include "iirfilter.h"
 #include <math.h>
+#include "libavutil/attributes.h"
 #include "libavutil/common.h"
 
 /**
@@ -48,10 +49,11 @@
 /// maximum supported filter order
 #define MAXORDER 30
 
-static int butterworth_init_coeffs(void *avc, struct FFIIRFilterCoeffs *c,
- enum IIRFilterMode filt_mode,
- int order, float cutoff_ratio,
- float stopband)
+static av_cold int butterworth_init_coeffs(void *avc,
+ struct FFIIRFilterCoeffs *c,
+ enum IIRFilterMode filt_mode,
+ int order, float cutoff_ratio,
+ float stopband)
 {
 int i, j;
 double wa;
@@ -113,9 +115,9 @@
 return 0;
 }
 
-static int biquad_init_coeffs(void *avc, struct FFIIRFilterCoeffs *c,
- enum IIRFilterMode filt_mode, int order,
- float cutoff_ratio, float stopband)
+static av_cold int biquad_init_coeffs(void *avc, struct FFIIRFilterCoeffs *c,
+ enum IIRFilterMode filt_mode, int order,
+ float cutoff_ratio, float stopband)
 {
 double cos_w0, sin_w0;
 double a0, x0, x1;

libav-v9.6.tar.bz2/libavcodec/imc.c -> libav-v10.1.tar.bz2/libavcodec/imc.c Changed

@@ -36,6 +36,8 @@
 #include <stdio.h>
 
 #include "libavutil/channel_layout.h"
+#include "libavutil/float_dsp.h"
+#include "libavutil/internal.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dsputil.h"
@@ -78,8 +80,6 @@
 } IMCChannel;
 
 typedef struct {
- AVFrame frame;
-
 IMCChannel chctx[2];
 
 /** MDCT tables */
@@ -95,10 +95,13 @@
 GetBitContext gb;
 
 DSPContext dsp;
+ AVFloatDSPContext fdsp;
 FFTContext fft;
 DECLARE_ALIGNED(32, FFTComplex, samples)[COEFFS / 2];
 float *out_samples;
 
+ int coef0_pos;
+
 int8_t cyclTab[32], cyclTab2[32];
 float weights1[31], weights2[31];
 } IMCContext;
@@ -180,7 +183,7 @@
 avctx->channels = 1;
 
 if (avctx->channels > 2) {
- av_log_ask_for_sample(avctx, "Number of channels is not supported\n");
+ avpriv_request_sample(avctx, "Number of channels > 2");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -244,13 +247,11 @@
 return ret;
 }
 ff_dsputil_init(&q->dsp, avctx);
+ avpriv_float_dsp_init(&q->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
 avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
 avctx->channel_layout = avctx->channels == 1 ? AV_CH_LAYOUT_MONO
 : AV_CH_LAYOUT_STEREO;
 
- avcodec_get_frame_defaults(&q->frame);
- avctx->coded_frame = &q->frame;
-
 return 0;
 }
 
@@ -337,6 +338,17 @@
 }
 }
 
+static void imc_read_level_coeffs_raw(IMCContext *q, int stream_format_code,
+ int *levlCoeffs)
+{
+ int i;
+
+ q->coef0_pos = get_bits(&q->gb, 5);
+ levlCoeffs[0] = get_bits(&q->gb, 7);
+ for (i = 1; i < BANDS; i++)
+ levlCoeffs[i] = get_bits(&q->gb, 4);
+}
+
 static void imc_decode_level_coefficients(IMCContext *q, int *levlCoeffBuf,
 float *flcoeffs1, float *flcoeffs2)
 {
@@ -391,6 +403,28 @@
 }
 }
 
+static void imc_decode_level_coefficients_raw(IMCContext *q, int *levlCoeffBuf,
+ float *flcoeffs1, float *flcoeffs2)
+{
+ int i, level, pos;
+ float tmp, tmp2;
+
+ pos = q->coef0_pos;
+ flcoeffs1[pos] = 20000.0 / pow (2, levlCoeffBuf[0] * 0.18945); // 0.18945 = log2(10) * 0.05703125
+ flcoeffs2[pos] = log2f(flcoeffs1[0]);
+ tmp = flcoeffs1[pos];
+ tmp2 = flcoeffs2[pos];
+
+ levlCoeffBuf++;
+ for (i = 0; i < BANDS; i++) {
+ if (i == pos)
+ continue;
+ level = *levlCoeffBuf++;
+ flcoeffs1[i] = tmp * powf(10.0, -level * 0.4375); //todo tab
+ flcoeffs2[i] = tmp2 - 1.4533435415 * level; // 1.4533435415 = log2(10) * 0.4375
+ }
+}
+
 /**
 * Perform bit allocation depending on bits available
 */
@@ -450,6 +484,10 @@
 iacc += chctx->bandWidthT[i];
 summa += chctx->bandWidthT[i] * chctx->flcoeffs4[i];
 }
+
+ if (!iacc)
+ return AVERROR_INVALIDDATA;
+
 chctx->bandWidthT[BANDS - 1] = 0;
 summa = (summa * 0.5 - freebits) / iacc;
 
@@ -759,12 +797,56 @@
 return 0;
 }
 
+static void imc_refine_bit_allocation(IMCContext *q, IMCChannel *chctx)
+{
+ int i, j;
+ int bits, summer;
+
+ for (i = 0; i < BANDS; i++) {
+ chctx->sumLenArr[i] = 0;
+ chctx->skipFlagRaw[i] = 0;
+ for (j = band_tab[i]; j < band_tab[i + 1]; j++)
+ chctx->sumLenArr[i] += chctx->CWlengthT[j];
+ if (chctx->bandFlagsBuf[i])
+ if ((((band_tab[i + 1] - band_tab[i]) * 1.5) > chctx->sumLenArr[i]) && (chctx->sumLenArr[i] > 0))
+ chctx->skipFlagRaw[i] = 1;
+ }
+
+ imc_get_skip_coeff(q, chctx);
+
+ for (i = 0; i < BANDS; i++) {
+ chctx->flcoeffs6[i] = chctx->flcoeffs1[i];
+ /* band has flag set and at least one coded coefficient */
+ if (chctx->bandFlagsBuf[i] && (band_tab[i + 1] - band_tab[i]) != chctx->skipFlagCount[i]) {
+ chctx->flcoeffs6[i] *= q->sqrt_tab[ band_tab[i + 1] - band_tab[i]] /
+ q->sqrt_tab[(band_tab[i + 1] - band_tab[i] - chctx->skipFlagCount[i])];
+ }
+ }
+
+ /* calculate bits left, bits needed and adjust bit allocation */
+ bits = summer = 0;
+
+ for (i = 0; i < BANDS; i++) {
+ if (chctx->bandFlagsBuf[i]) {
+ for (j = band_tab[i]; j < band_tab[i + 1]; j++) {
+ if (chctx->skipFlags[j]) {
+ summer += chctx->CWlengthT[j];
+ chctx->CWlengthT[j] = 0;
+ }
+ }
+ bits += chctx->skipFlagBits[i];
+ summer -= chctx->skipFlagBits[i];
+ }
+ }
+ imc_adjust_bit_allocation(q, chctx, summer);
+}
+
 static int imc_decode_block(AVCodecContext *avctx, IMCContext *q, int ch)
 {
 int stream_format_code;
 int imc_hdr, i, j, ret;
 int flag;
- int bits, summer;
+ int bits;
 int counter, bitscount;
 IMCChannel *chctx = q->chctx + ch;
 
@@ -778,12 +860,6 @@
 }
 stream_format_code = get_bits(&q->gb, 3);
 
- if (stream_format_code & 1) {
- av_log_ask_for_sample(avctx, "Stream format %X is not supported\n",
- stream_format_code);
- return AVERROR_PATCHWELCOME;
- }
-
 if (stream_format_code & 0x04)
 chctx->decoder_reset = 1;
 
@@ -796,7 +872,13 @@
 }
 
 flag = get_bits1(&q->gb);
- imc_read_level_coeffs(q, stream_format_code, chctx->levlCoeffBuf);
+ if (stream_format_code & 0x1)
+ imc_decode_level_coefficients_raw(q, chctx->levlCoeffBuf,
+ chctx->flcoeffs1, chctx->flcoeffs2);
+ else if (stream_format_code & 0x1)
+ imc_read_level_coeffs_raw(q, stream_format_code, chctx->levlCoeffBuf);
+ else
+ imc_read_level_coeffs(q, stream_format_code, chctx->levlCoeffBuf);
 
 if (stream_format_code & 0x4)
 imc_decode_level_coefficients(q, chctx->levlCoeffBuf,
@@ -808,20 +890,31 @@
 memcpy(chctx->old_floor, chctx->flcoeffs1, 32 * sizeof(float));
 
 counter = 0;
- for (i = 0; i < BANDS; i++) {
- if (chctx->levlCoeffBuf[i] == 16) {
- chctx->bandWidthT[i] = 0;
- counter++;
- } else
- chctx->bandWidthT[i] = band_tab[i + 1] - band_tab[i];
- }
- memset(chctx->bandFlagsBuf, 0, BANDS * sizeof(int));
- for (i = 0; i < BANDS - 1; i++) {
- if (chctx->bandWidthT[i])
- chctx->bandFlagsBuf[i] = get_bits1(&q->gb);
- }
+ if (stream_format_code & 0x1) {
+ for (i = 0; i < BANDS; i++) {
+ chctx->bandWidthT[i] = band_tab[i + 1] - band_tab[i];
+ chctx->bandFlagsBuf[i] = 0;
+ chctx->flcoeffs3[i] = chctx->flcoeffs2[i] * 2;
+ chctx->flcoeffs5[i] = 1.0;
+ }
+ } else {
+ for (i = 0; i < BANDS; i++) {
+ if (chctx->levlCoeffBuf[i] == 16) {
+ chctx->bandWidthT[i] = 0;
+ counter++;
+ } else
+ chctx->bandWidthT[i] = band_tab[i + 1] - band_tab[i];
+ }
 
- imc_calculate_coeffs(q, chctx->flcoeffs1, chctx->flcoeffs2, chctx->bandWidthT, chctx->flcoeffs3, chctx->flcoeffs5);
+ memset(chctx->bandFlagsBuf, 0, BANDS * sizeof(int));
+ for (i = 0; i < BANDS - 1; i++)
+ if (chctx->bandWidthT[i])
+ chctx->bandFlagsBuf[i] = get_bits1(&q->gb);
+
+ imc_calculate_coeffs(q, chctx->flcoeffs1, chctx->flcoeffs2,
+ chctx->bandWidthT, chctx->flcoeffs3,
+ chctx->flcoeffs5);
+ }
 
 bitscount = 0;
 /* first 4 bands will be assigned 5 bits per coefficient */
@@ -833,7 +926,10 @@
 chctx->CWlengthT[1] = 5;
 chctx->CWlengthT[2] = 5;
 for (i = 1; i < 4; i++) {
- bits = (chctx->levlCoeffBuf[i] == 16) ? 0 : 5;
+ if (stream_format_code & 0x1)
+ bits = 5;
+ else
+ bits = (chctx->levlCoeffBuf[i] == 16) ? 0 : 5;
 chctx->bitsBandT[i] = bits;
 for (j = band_tab[i]; j < band_tab[i + 1]; j++) {
 chctx->CWlengthT[j] = bits;
@@ -855,43 +951,12 @@
 return ret;
 }
 
- for (i = 0; i < BANDS; i++) {
- chctx->sumLenArr[i] = 0;
- chctx->skipFlagRaw[i] = 0;
- for (j = band_tab[i]; j < band_tab[i + 1]; j++)
- chctx->sumLenArr[i] += chctx->CWlengthT[j];
- if (chctx->bandFlagsBuf[i])
- if ((((band_tab[i + 1] - band_tab[i]) * 1.5) > chctx->sumLenArr[i]) && (chctx->sumLenArr[i] > 0))
- chctx->skipFlagRaw[i] = 1;
- }
-
- imc_get_skip_coeff(q, chctx);
-
- for (i = 0; i < BANDS; i++) {
- chctx->flcoeffs6[i] = chctx->flcoeffs1[i];
- /* band has flag set and at least one coded coefficient */
- if (chctx->bandFlagsBuf[i] && (band_tab[i + 1] - band_tab[i]) != chctx->skipFlagCount[i]) {
- chctx->flcoeffs6[i] *= q->sqrt_tab[ band_tab[i + 1] - band_tab[i]] /
- q->sqrt_tab[(band_tab[i + 1] - band_tab[i] - chctx->skipFlagCount[i])];
- }
- }
-
- /* calculate bits left, bits needed and adjust bit allocation */
- bits = summer = 0;
-
- for (i = 0; i < BANDS; i++) {
- if (chctx->bandFlagsBuf[i]) {
- for (j = band_tab[i]; j < band_tab[i + 1]; j++) {
- if (chctx->skipFlags[j]) {
- summer += chctx->CWlengthT[j];
- chctx->CWlengthT[j] = 0;
- }
- }
- bits += chctx->skipFlagBits[i];
- summer -= chctx->skipFlagBits[i];
- }
+ if (stream_format_code & 0x1) {
+ for (i = 0; i < BANDS; i++)
+ chctx->skipFlags[i] = 0;
+ } else {
+ imc_refine_bit_allocation(q, chctx);
 }
- imc_adjust_bit_allocation(q, chctx, summer);
 
 for (i = 0; i < BANDS; i++) {
 chctx->sumLenArr[i] = 0;
@@ -925,6 +990,7 @@
 static int imc_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 int ret, i;
@@ -939,14 +1005,14 @@
 }
 
 /* get output buffer */
- q->frame.nb_samples = COEFFS;
- if ((ret = ff_get_buffer(avctx, &q->frame)) < 0) {
+ frame->nb_samples = COEFFS;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
 
 for (i = 0; i < avctx->channels; i++) {
- q->out_samples = (float *)q->frame.extended_data[i];
+ q->out_samples = (float *)frame->extended_data[i];
 
 q->dsp.bswap16_buf(buf16, (const uint16_t*)buf, IMC_BLOCK_SIZE / 2);
 
@@ -959,12 +1025,11 @@
 }
 
 if (avctx->channels == 2) {
- q->dsp.butterflies_float((float *)q->frame.extended_data[0],
- (float *)q->frame.extended_data[1], COEFFS);
+ q->fdsp.butterflies_float((float *)frame->extended_data[0],
+ (float *)frame->extended_data[1], COEFFS);
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = q->frame;
+ *got_frame_ptr = 1;
 
 return IMC_BLOCK_SIZE * avctx->channels;
 }
@@ -982,6 +1047,7 @@
 
 AVCodec ff_imc_decoder = {
 .name = "imc",
+ .long_name = NULL_IF_CONFIG_SMALL("IMC (Intel Music Coder)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_IMC,
 .priv_data_size = sizeof(IMCContext),
@@ -989,13 +1055,13 @@
 .close = imc_decode_close,
 .decode = imc_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("IMC (Intel Music Coder)"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_NONE },
 };
 
 AVCodec ff_iac_decoder = {
 .name = "iac",
+ .long_name = NULL_IF_CONFIG_SMALL("IAC (Indeo Audio Coder)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_IAC,
 .priv_data_size = sizeof(IMCContext),
@@ -1003,7 +1069,6 @@
 .close = imc_decode_close,
 .decode = imc_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("IAC (Indeo Audio Coder)"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/imgconvert.c -> libav-v10.1.tar.bz2/libavcodec/imgconvert.c Changed

@@ -32,6 +32,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
+#include "imgconvert.h"
 #include "internal.h"
 #include "libavutil/colorspace.h"
 #include "libavutil/common.h"
@@ -39,7 +40,7 @@
 #include "libavutil/imgutils.h"
 
 #if HAVE_MMX_EXTERNAL
-#include "x86/dsputil_mmx.h"
+#include "x86/dsputil_x86.h"
 #endif
 
 #if HAVE_MMX_EXTERNAL
@@ -59,7 +60,7 @@
 
 static int is_gray(const AVPixFmtDescriptor *desc)
 {
- return desc->nb_components - (desc->flags & PIX_FMT_ALPHA) == 1;
+ return desc->nb_components - (desc->flags & AV_PIX_FMT_FLAG_ALPHA) == 1;
 }
 
 int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt,
@@ -85,11 +86,11 @@
 dst_desc->log2_chroma_h > src_desc->log2_chroma_h)
 loss |= FF_LOSS_RESOLUTION;
 
- if ((src_desc->flags & PIX_FMT_RGB) != (dst_desc->flags & PIX_FMT_RGB))
+ if ((src_desc->flags & AV_PIX_FMT_FLAG_RGB) != (dst_desc->flags & AV_PIX_FMT_FLAG_RGB))
 loss |= FF_LOSS_COLORSPACE;
 
- if (has_alpha && !(dst_desc->flags & PIX_FMT_ALPHA) &&
- (dst_desc->flags & PIX_FMT_ALPHA))
+ if (has_alpha && !(dst_desc->flags & AV_PIX_FMT_FLAG_ALPHA) &&
+ (dst_desc->flags & AV_PIX_FMT_FLAG_ALPHA))
 loss |= FF_LOSS_ALPHA;
 
 if (dst_pix_fmt == AV_PIX_FMT_PAL8 && !is_gray(src_desc))
@@ -136,24 +137,6 @@
 return dst_pix_fmt;
 }
 
-#if FF_API_FIND_BEST_PIX_FMT
-enum AVPixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum AVPixelFormat src_pix_fmt,
- int has_alpha, int *loss_ptr)
-{
- enum AVPixelFormat list[64];
- int i, j = 0;
-
- // test only the first 64 pixel formats to avoid undefined behaviour
- for (i = 0; i < 64; i++) {
- if (pix_fmt_mask & (1ULL << i))
- list[j++] = i;
- }
- list[j] = AV_PIX_FMT_NONE;
-
- return avcodec_find_best_pix_fmt2(list, src_pix_fmt, has_alpha, loss_ptr);
-}
-#endif /* FF_API_FIND_BEST_PIX_FMT */
-
 enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat *pix_fmt_list,
 enum AVPixelFormat src_pix_fmt,
 int has_alpha, int *loss_ptr)
@@ -277,8 +260,8 @@
 /* return true if yuv planar */
 static inline int is_yuv_planar(const AVPixFmtDescriptor *desc)
 {
- return (!(desc->flags & PIX_FMT_RGB) &&
- (desc->flags & PIX_FMT_PLANAR));
+ return (!(desc->flags & AV_PIX_FMT_FLAG_RGB) &&
+ (desc->flags & AV_PIX_FMT_FLAG_PLANAR));
 }
 
 int av_picture_crop(AVPicture *dst, const AVPicture *src,
@@ -365,6 +348,8 @@
 return 0;
 }
 
+#if FF_API_DEINTERLACE
+
 #if !HAVE_MMX_EXTERNAL
 /* filter parameters: [-1 4 2 4 -1] // 8 */
 static void deinterlace_line_c(uint8_t *dst,
@@ -373,7 +358,7 @@
 const uint8_t *lum,
 int size)
 {
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
 int sum;
 
 for(;size > 0;size--) {
@@ -396,7 +381,7 @@
 uint8_t *lum_m2, uint8_t *lum_m1,
 uint8_t *lum, int size)
 {
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
 int sum;
 
 for(;size > 0;size--) {
@@ -523,3 +508,5 @@
 emms_c();
 return 0;
 }
+
+#endif /* FF_API_DEINTERLACE */

libav-v10.1.tar.bz2/libavcodec/imgconvert.h Added

@@ -0,0 +1,29 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_IMGCONVERT_H
+#define AVCODEC_IMGCONVERT_H
+
+#include <stdint.h>
+
+/* 1/2^n downscaling functions */
+void ff_shrink22(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
+void ff_shrink44(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
+void ff_shrink88(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
+
+#endif /* AVCODEC_IMGCONVERT_H */

libav-v9.6.tar.bz2/libavcodec/indeo2.c -> libav-v10.1.tar.bz2/libavcodec/indeo2.c Changed

@@ -29,11 +29,12 @@
 #include "avcodec.h"
 #include "get_bits.h"
 #include "indeo2data.h"
+#include "internal.h"
 #include "mathops.h"
 
 typedef struct Ir2Context{
 AVCodecContext *avctx;
- AVFrame picture;
+ AVFrame *picture;
 GetBitContext gb;
 int decode_delta;
 } Ir2Context;
@@ -47,8 +48,8 @@
 return get_vlc2(gb, ir2_vlc.table, CODE_VLC_BITS, 1) + 1;
 }
 
-static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst, int stride,
- const uint8_t *table)
+static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst,
+ int stride, const uint8_t *table)
 {
 int i;
 int j;
@@ -56,16 +57,16 @@
 int c;
 int t;
 
- if(width&1)
- return -1;
+ if (width & 1)
+ return AVERROR_INVALIDDATA;
 
 /* first line contain absolute values, other lines contain deltas */
- while (out < width){
+ while (out < width) {
 c = ir2_get_code(&ctx->gb);
- if(c >= 0x80) { /* we have a run */
+ if (c >= 0x80) { /* we have a run */
 c -= 0x7F;
- if(out + c*2 > width)
- return -1;
+ if (out + c*2 > width)
+ return AVERROR_INVALIDDATA;
 for (i = 0; i < c * 2; i++)
 dst[out++] = 0x80;
 } else { /* copy two values from table */
@@ -75,25 +76,25 @@
 }
 dst += stride;
 
- for (j = 1; j < height; j++){
+ for (j = 1; j < height; j++) {
 out = 0;
- while (out < width){
+ while (out < width) {
 c = ir2_get_code(&ctx->gb);
- if(c >= 0x80) { /* we have a skip */
+ if (c >= 0x80) { /* we have a skip */
 c -= 0x7F;
- if(out + c*2 > width)
- return -1;
+ if (out + c*2 > width)
+ return AVERROR_INVALIDDATA;
 for (i = 0; i < c * 2; i++) {
 dst[out] = dst[out - stride];
 out++;
 }
 } else { /* add two deltas from table */
- t = dst[out - stride] + (table[c * 2] - 128);
- t= av_clip_uint8(t);
+ t = dst[out - stride] + (table[c * 2] - 128);
+ t = av_clip_uint8(t);
 dst[out] = t;
 out++;
- t = dst[out - stride] + (table[(c * 2) + 1] - 128);
- t= av_clip_uint8(t);
+ t = dst[out - stride] + (table[(c * 2) + 1] - 128);
+ t = av_clip_uint8(t);
 dst[out] = t;
 out++;
 }
@@ -103,31 +104,31 @@
 return 0;
 }
 
-static int ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8_t *dst, int stride,
- const uint8_t *table)
+static int ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8_t *dst,
+ int stride, const uint8_t *table)
 {
 int j;
 int out = 0;
 int c;
 int t;
 
- if(width&1)
- return -1;
+ if (width & 1)
+ return AVERROR_INVALIDDATA;
 
- for (j = 0; j < height; j++){
+ for (j = 0; j < height; j++) {
 out = 0;
- while (out < width){
+ while (out < width) {
 c = ir2_get_code(&ctx->gb);
- if(c >= 0x80) { /* we have a skip */
- c -= 0x7F;
+ if (c >= 0x80) { /* we have a skip */
+ c -= 0x7F;
 out += c * 2;
 } else { /* add two deltas from table */
- t = dst[out] + (((table[c * 2] - 128)*3) >> 2);
- t= av_clip_uint8(t);
+ t = dst[out] + (((table[c * 2] - 128)*3) >> 2);
+ t = av_clip_uint8(t);
 dst[out] = t;
 out++;
- t = dst[out] + (((table[(c * 2) + 1] - 128)*3) >> 2);
- t= av_clip_uint8(t);
+ t = dst[out] + (((table[(c * 2) + 1] - 128)*3) >> 2);
+ t = av_clip_uint8(t);
 dst[out] = t;
 out++;
 }
@@ -141,21 +142,16 @@
 void *data, int *got_frame,
 AVPacket *avpkt)
 {
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
 Ir2Context * const s = avctx->priv_data;
- AVFrame *picture = data;
- AVFrame * const p = &s->picture;
- int start;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ AVFrame *picture = data;
+ AVFrame * const p = s->picture;
+ int start, ret;
 
- if(p->data[0])
- avctx->release_buffer(avctx, p);
-
- p->reference = 1;
- p->buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, p)) {
+ if ((ret = ff_reget_buffer(avctx, p)) < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 start = 48; /* hardcoded for now */
@@ -176,30 +172,46 @@
 init_get_bits(&s->gb, buf + start, (buf_size - start) * 8);
 
 if (s->decode_delta) { /* intraframe */
- ir2_decode_plane(s, avctx->width, avctx->height,
- s->picture.data[0], s->picture.linesize[0], ir2_luma_table);
+ if ((ret = ir2_decode_plane(s, avctx->width, avctx->height,
+ p->data[0], p->linesize[0],
+ ir2_luma_table)) < 0)
+ return ret;
+
 /* swapped U and V */
- ir2_decode_plane(s, avctx->width >> 2, avctx->height >> 2,
- s->picture.data[2], s->picture.linesize[2], ir2_luma_table);
- ir2_decode_plane(s, avctx->width >> 2, avctx->height >> 2,
- s->picture.data[1], s->picture.linesize[1], ir2_luma_table);
+ if ((ret = ir2_decode_plane(s, avctx->width >> 2, avctx->height >> 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,
+ p->data[1], p->linesize[1],
+ ir2_luma_table)) < 0)
+ return ret;
 } else { /* interframe */
- ir2_decode_plane_inter(s, avctx->width, avctx->height,
- s->picture.data[0], s->picture.linesize[0], ir2_luma_table);
+ if ((ret = ir2_decode_plane_inter(s, avctx->width, avctx->height,
+ p->data[0], p->linesize[0],
+ ir2_luma_table)) < 0)
+ return ret;
 /* swapped U and V */
- ir2_decode_plane_inter(s, avctx->width >> 2, avctx->height >> 2,
- s->picture.data[2], s->picture.linesize[2], ir2_luma_table);
- ir2_decode_plane_inter(s, avctx->width >> 2, avctx->height >> 2,
- s->picture.data[1], s->picture.linesize[1], ir2_luma_table);
+ if ((ret = ir2_decode_plane_inter(s, avctx->width >> 2, avctx->height >> 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,
+ p->data[1], p->linesize[1],
+ ir2_luma_table)) < 0)
+ return ret;
 }
 
- *picture = s->picture;
+ if ((ret = av_frame_ref(picture, p)) < 0)
+ return ret;
+
 *got_frame = 1;
 
 return buf_size;
 }
 
-static av_cold int ir2_decode_init(AVCodecContext *avctx){
+static av_cold int ir2_decode_init(AVCodecContext *avctx)
+{
 Ir2Context * const ic = avctx->priv_data;
 static VLC_TYPE vlc_tables[1 << CODE_VLC_BITS][2];
 
@@ -207,6 +219,10 @@
 
 avctx->pix_fmt= AV_PIX_FMT_YUV410P;
 
+ ic->picture = av_frame_alloc();
+ if (!ic->picture)
+ return AVERROR(ENOMEM);
+
 ir2_vlc.table = vlc_tables;
 ir2_vlc.table_allocated = 1 << CODE_VLC_BITS;
 #ifdef BITSTREAM_READER_LE
@@ -222,18 +238,18 @@
 return 0;
 }
 
-static av_cold int ir2_decode_end(AVCodecContext *avctx){
+static av_cold int ir2_decode_end(AVCodecContext *avctx)
+{
 Ir2Context * const ic = avctx->priv_data;
- AVFrame *pic = &ic->picture;
 
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
+ av_frame_free(&ic->picture);
 
 return 0;
 }
 
 AVCodec ff_indeo2_decoder = {
 .name = "indeo2",
+ .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_INDEO2,
 .priv_data_size = sizeof(Ir2Context),
@@ -241,5 +257,4 @@
 .close = ir2_decode_end,
 .decode = ir2_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"),
 };

libav-v9.6.tar.bz2/libavcodec/indeo3.c -> libav-v10.1.tar.bz2/libavcodec/indeo3.c Changed

@@ -32,9 +32,9 @@
 #include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "bytestream.h"
 #include "get_bits.h"
+#include "hpeldsp.h"
 #include "internal.h"
 
 #include "indeo3data.h"
@@ -81,8 +81,7 @@
 
 typedef struct Indeo3DecodeContext {
 AVCodecContext *avctx;
- AVFrame frame;
- DSPContext dsp;
+ HpelDSPContext hdsp;
 
 GetBitContext gb;
 int need_resync;
@@ -252,19 +251,17 @@
 /* copy using 16xH blocks */
 if (!((cell->xpos << 2) & 15) && w >= 4) {
 for (; w >= 4; src += 16, dst += 16, w -= 4)
- ctx->dsp.put_no_rnd_pixels_tab[0][0](dst, src, plane->pitch, h);
+ ctx->hdsp.put_pixels_tab[0][0](dst, src, plane->pitch, h);
 }
 
 /* copy using 8xH blocks */
 if (!((cell->xpos << 2) & 7) && w >= 2) {
- ctx->dsp.put_no_rnd_pixels_tab[1][0](dst, src, plane->pitch, h);
+ ctx->hdsp.put_pixels_tab[1][0](dst, src, plane->pitch, h);
 w -= 2;
 src += 8;
 dst += 8;
- }
-
- if (w >= 1) {
- copy_block4(dst, src, plane->pitch, plane->pitch, h);
+ } else if (w >= 1) {
+ ctx->hdsp.put_pixels_tab[2][0](dst, src, plane->pitch, h);
 w--;
 src += 4;
 dst += 4;
@@ -336,7 +333,7 @@
 
 #define RLE_BLOCK_COPY \
 if (cell->mv_ptr || !skip_flag) \
- copy_block4(dst, ref, row_offset, row_offset, 4 << v_zoom)
+ ctx->hdsp.put_pixels_tab[2][0](dst, ref, row_offset, 4 << v_zoom)
 
 #define RLE_BLOCK_COPY_8 \
 pix64 = AV_RN64(ref);\
@@ -348,7 +345,7 @@
 fill_64(dst, pix64, 8, row_offset)
 
 #define RLE_LINES_COPY \
- copy_block4(dst, ref, row_offset, row_offset, num_lines << v_zoom)
+ ctx->hdsp.put_pixels_tab[2][0](dst, ref, row_offset, num_lines << v_zoom)
 
 #define RLE_LINES_COPY_M10 \
 pix64 = AV_RN64(ref);\
@@ -416,7 +413,8 @@
 }
 
 
-static int decode_cell_data(Cell *cell, uint8_t *block, uint8_t *ref_block,
+static int decode_cell_data(Indeo3DecodeContext *ctx, Cell *cell,
+ uint8_t *block, uint8_t *ref_block,
 int pitch, int h_zoom, int v_zoom, int mode,
 const vqEntry *delta[2], int swap_quads[2],
 const uint8_t **data_ptr, const uint8_t *last_ptr)
@@ -661,14 +659,16 @@
 }
 
 zoom_fac = mode >= 3;
- error = decode_cell_data(cell, block, ref_block, plane->pitch, 0, zoom_fac,
- mode, delta, swap_quads, &data_ptr, last_ptr);
+ error = decode_cell_data(ctx, cell, block, ref_block, plane->pitch,
+ 0, zoom_fac, mode, delta, swap_quads,
+ &data_ptr, last_ptr);
 break;
 case 10: /*-------------------- MODE 10 (8x8 block processing) ---------------------*/
 case 11: /*----------------- MODE 11 (4x8 INTER block processing) ------------------*/
 if (mode == 10 && !cell->mv_ptr) { /* MODE 10 INTRA processing */
- error = decode_cell_data(cell, block, ref_block, plane->pitch, 1, 1,
- mode, delta, swap_quads, &data_ptr, last_ptr);
+ error = decode_cell_data(ctx, cell, block, ref_block, plane->pitch,
+ 1, 1, mode, delta, swap_quads,
+ &data_ptr, last_ptr);
 } else { /* mode 10 and 11 INTER processing */
 if (mode == 11 && !cell->mv_ptr) {
 av_log(avctx, AV_LOG_ERROR, "Attempt to use Mode 11 for an INTRA cell!\n");
@@ -676,7 +676,7 @@
 }
 
 zoom_fac = mode == 10;
- error = decode_cell_data(cell, block, ref_block, plane->pitch,
+ error = decode_cell_data(ctx, cell, block, ref_block, plane->pitch,
 zoom_fac, 1, mode, delta, swap_quads,
 &data_ptr, last_ptr);
 }
@@ -944,7 +944,7 @@
 free_frame_buffers(ctx);
 if ((res = allocate_frame_buffers(ctx, avctx)) < 0)
 return res;
- avcodec_set_dimensions(avctx, width, height);
+ ff_set_dimensions(avctx, width, height);
 }
 
 y_offset = bytestream2_get_le32(&gb);
@@ -986,12 +986,12 @@
 }
 
 if (ctx->frame_flags & BS_8BIT_PEL) {
- av_log_ask_for_sample(avctx, "8-bit pixel format\n");
+ avpriv_request_sample(avctx, "8-bit pixel format");
 return AVERROR_PATCHWELCOME;
 }
 
 if (ctx->frame_flags & BS_MV_X_HALF || ctx->frame_flags & BS_MV_Y_HALF) {
- av_log_ask_for_sample(avctx, "halfpel motion vectors\n");
+ avpriv_request_sample(avctx, "Halfpel motion vectors");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -1045,7 +1045,7 @@
 
 build_requant_tab();
 
- ff_dsputil_init(&ctx->dsp, avctx);
+ ff_hpeldsp_init(&ctx->hdsp, avctx->flags);
 
 allocate_frame_buffers(ctx, avctx);
 
@@ -1059,6 +1059,7 @@
 Indeo3DecodeContext *ctx = avctx->priv_data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
+ AVFrame *frame = data;
 int res;
 
 res = decode_frame_headers(ctx, avctx, buf, buf_size);
@@ -1095,27 +1096,22 @@
 if ((res = decode_plane(ctx, avctx, &ctx->planes[2], ctx->v_data_ptr, ctx->v_data_size, 10)))
 return res;
 
- if (ctx->frame.data[0])
- avctx->release_buffer(avctx, &ctx->frame);
-
- ctx->frame.reference = 0;
- if ((res = ff_get_buffer(avctx, &ctx->frame)) < 0) {
+ if ((res = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(ctx->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return res;
 }
 
 output_plane(&ctx->planes[0], ctx->buf_sel,
- ctx->frame.data[0], ctx->frame.linesize[0],
+ frame->data[0], frame->linesize[0],
 avctx->height);
 output_plane(&ctx->planes[1], ctx->buf_sel,
- ctx->frame.data[1], ctx->frame.linesize[1],
+ frame->data[1], frame->linesize[1],
 (avctx->height + 3) >> 2);
 output_plane(&ctx->planes[2], ctx->buf_sel,
- ctx->frame.data[2], ctx->frame.linesize[2],
+ frame->data[2], frame->linesize[2],
 (avctx->height + 3) >> 2);
 
 *got_frame = 1;
- *(AVFrame*)data = ctx->frame;
 
 return buf_size;
 }
@@ -1123,18 +1119,14 @@
 
 static av_cold int decode_close(AVCodecContext *avctx)
 {
- Indeo3DecodeContext *ctx = avctx->priv_data;
-
 free_frame_buffers(avctx->priv_data);
 
- if (ctx->frame.data[0])
- avctx->release_buffer(avctx, &ctx->frame);
-
 return 0;
 }
 
 AVCodec ff_indeo3_decoder = {
 .name = "indeo3",
+ .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 3"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_INDEO3,
 .priv_data_size = sizeof(Indeo3DecodeContext),
@@ -1142,5 +1134,4 @@
 .close = decode_close,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 3"),
 };

libav-v9.6.tar.bz2/libavcodec/indeo4.c -> libav-v10.1.tar.bz2/libavcodec/indeo4.c Changed

@@ -30,7 +30,6 @@
 #define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "ivi_dsp.h"
 #include "ivi_common.h"
 #include "indeo4data.h"
@@ -57,8 +56,8 @@
 int is_2d_trans;
 } transforms[18] = {
 { ff_ivi_inverse_haar_8x8, ff_ivi_dc_haar_2d, 1 },
- { NULL, NULL, 0 }, /* inverse Haar 8x1 */
- { NULL, NULL, 0 }, /* inverse Haar 1x8 */
+ { ff_ivi_row_haar8, ff_ivi_dc_haar_2d, 0 },
+ { ff_ivi_col_haar8, ff_ivi_dc_haar_2d, 0 },
 { ff_ivi_put_pixels_8x8, ff_ivi_put_dc_pixel_8x8, 1 },
 { ff_ivi_inverse_slant_8x8, ff_ivi_dc_slant_2d, 1 },
 { ff_ivi_row_slant8, ff_ivi_dc_row_slant, 1 },
@@ -66,13 +65,13 @@
 { NULL, NULL, 0 }, /* inverse DCT 8x8 */
 { NULL, NULL, 0 }, /* inverse DCT 8x1 */
 { NULL, NULL, 0 }, /* inverse DCT 1x8 */
- { NULL, NULL, 0 }, /* inverse Haar 4x4 */
+ { ff_ivi_inverse_haar_4x4, ff_ivi_dc_haar_2d, 1 },
 { ff_ivi_inverse_slant_4x4, ff_ivi_dc_slant_2d, 1 },
 { NULL, NULL, 0 }, /* no transform 4x4 */
- { NULL, NULL, 0 }, /* inverse Haar 1x4 */
- { NULL, NULL, 0 }, /* inverse Haar 4x1 */
- { NULL, NULL, 0 }, /* inverse slant 1x4 */
- { NULL, NULL, 0 }, /* inverse slant 4x1 */
+ { ff_ivi_row_haar4, ff_ivi_dc_haar_2d, 0 },
+ { ff_ivi_col_haar4, ff_ivi_dc_haar_2d, 0 },
+ { ff_ivi_row_slant4, ff_ivi_dc_row_slant, 0 },
+ { ff_ivi_col_slant4, ff_ivi_dc_col_slant, 0 },
 { NULL, NULL, 0 }, /* inverse DCT 4x4 */
 };
 
@@ -210,6 +209,7 @@
 if (ivi_pic_config_cmp(&pic_conf, &ctx->pic_conf)) {
 if (ff_ivi_init_planes(ctx->planes, &pic_conf)) {
 av_log(avctx, AV_LOG_ERROR, "Couldn't reallocate color planes!\n");
+ ctx->pic_conf.luma_bands = 0;
 return AVERROR(ENOMEM);
 }
 
@@ -293,6 +293,7 @@
 
 band->is_empty = get_bits1(&ctx->gb);
 if (!band->is_empty) {
+ int old_blk_size = band->blk_size;
 /* skip header size
 * If header size is not given, header size is 4 bytes. */
 if (get_bits1(&ctx->gb))
@@ -330,12 +331,12 @@
 transform_id = get_bits(&ctx->gb, 5);
 if (transform_id >= FF_ARRAY_ELEMS(transforms) ||
 !transforms[transform_id].inv_trans) {
- av_log_ask_for_sample(avctx, "Unimplemented transform: %d!\n", transform_id);
+ avpriv_request_sample(avctx, "Transform %d", transform_id);
 return AVERROR_PATCHWELCOME;
 }
 if ((transform_id >= 7 && transform_id <= 9) ||
 transform_id == 17) {
- av_log_ask_for_sample(avctx, "DCT transform not supported yet!\n");
+ avpriv_request_sample(avctx, "DCT transform");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -347,25 +348,59 @@
 band->inv_transform = transforms[transform_id].inv_trans;
 band->dc_transform = transforms[transform_id].dc_trans;
 band->is_2d_trans = transforms[transform_id].is_2d_trans;
+ if (transform_id < 10)
+ band->transform_size = 8;
+ else
+ band->transform_size = 4;
+
+ if (band->blk_size != band->transform_size)
+ return AVERROR_INVALIDDATA;
 
 scan_indx = get_bits(&ctx->gb, 4);
 if (scan_indx == 15) {
 av_log(avctx, AV_LOG_ERROR, "Custom scan pattern encountered!\n");
 return AVERROR_INVALIDDATA;
 }
+ if (scan_indx > 4 && scan_indx < 10) {
+ if (band->blk_size != 4)
+ return AVERROR_INVALIDDATA;
+ } else if (band->blk_size != 8)
+ return AVERROR_INVALIDDATA;
+
 band->scan = scan_index_to_tab[scan_indx];
 
 band->quant_mat = get_bits(&ctx->gb, 5);
- if (band->quant_mat == 31) {
- av_log(avctx, AV_LOG_ERROR, "Custom quant matrix encountered!\n");
+ 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;
+ return AVERROR_INVALIDDATA;
+ }
+ } else {
+ if (old_blk_size != band->blk_size) {
+ av_log(avctx, AV_LOG_ERROR,
+ "The band block size does not match the configuration "
+ "inherited\n");
+ return AVERROR_INVALIDDATA;
+ }
+ if (band->quant_mat < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid quant_mat inherited\n");
 return AVERROR_INVALIDDATA;
 }
 }
 
 /* decode block huffman codebook */
- if (ff_ivi_dec_huff_desc(&ctx->gb, get_bits1(&ctx->gb), IVI_BLK_HUFF,
- &band->blk_vlc, avctx))
- return AVERROR_INVALIDDATA;
+ if (!get_bits1(&ctx->gb))
+ band->blk_vlc.tab = ctx->blk_vlc.tab;
+ else
+ if (ff_ivi_dec_huff_desc(&ctx->gb, 1, IVI_BLK_HUFF,
+ &band->blk_vlc, avctx))
+ return AVERROR_INVALIDDATA;
 
 /* select appropriate rvmap table for this band */
 band->rvmap_sel = get_bits1(&ctx->gb) ? get_bits(&ctx->gb, 3) : 8;
@@ -457,7 +492,7 @@
 }
 
 mb->mv_x = mb->mv_y = 0; /* no motion vector coded */
- if (band->inherit_mv) {
+ if (band->inherit_mv && ref_mb) {
 /* motion vector inheritance */
 if (mv_scale) {
 mb->mv_x = ivi_scale_mv(ref_mb->mv_x, mv_scale);
@@ -469,7 +504,10 @@
 }
 } else {
 if (band->inherit_mv) {
- mb->type = ref_mb->type; /* copy mb_type from corresponding reference mb */
+ /* copy mb_type from corresponding reference mb */
+ if (!ref_mb)
+ return AVERROR_INVALIDDATA;
+ mb->type = ref_mb->type;
 } else if (ctx->frame_type == FRAMETYPE_INTRA ||
 ctx->frame_type == FRAMETYPE_INTRA1) {
 mb->type = 0; /* mb_type is always INTRA for intra-frames */
@@ -493,14 +531,15 @@
 mb->mv_x = mb->mv_y = 0; /* there is no motion vector in intra-macroblocks */
 } else {
 if (band->inherit_mv) {
- /* motion vector inheritance */
- if (mv_scale) {
- mb->mv_x = ivi_scale_mv(ref_mb->mv_x, mv_scale);
- mb->mv_y = ivi_scale_mv(ref_mb->mv_y, mv_scale);
- } else {
- mb->mv_x = ref_mb->mv_x;
- mb->mv_y = ref_mb->mv_y;
- }
+ if (ref_mb)
+ /* motion vector inheritance */
+ if (mv_scale) {
+ mb->mv_x = ivi_scale_mv(ref_mb->mv_x, mv_scale);
+ mb->mv_y = ivi_scale_mv(ref_mb->mv_y, mv_scale);
+ } else {
+ mb->mv_x = ref_mb->mv_x;
+ mb->mv_y = ref_mb->mv_y;
+ }
 } else {
 /* decode motion vector deltas */
 mv_delta = get_vlc2(&ctx->gb, ctx->mb_vlc.tab->table,
@@ -600,12 +639,12 @@
 
 AVCodec ff_indeo4_decoder = {
 .name = "indeo4",
+ .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 4"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_INDEO4,
 .priv_data_size = sizeof(IVI45DecContext),
 .init = decode_init,
 .close = ff_ivi_decode_close,
 .decode = ff_ivi_decode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 4"),
 .capabilities = CODEC_CAP_DR1,
 };

libav-v9.6.tar.bz2/libavcodec/indeo5.c -> libav-v10.1.tar.bz2/libavcodec/indeo5.c Changed

@@ -74,7 +74,7 @@
 tile_size = (ctx->gop_flags & 0x40) ? 64 << get_bits(&ctx->gb, 2) : 0;
 if (tile_size > 256) {
 av_log(avctx, AV_LOG_ERROR, "Invalid tile size: %d\n", tile_size);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 /* decode number of wavelet bands */
@@ -85,7 +85,7 @@
 if (ctx->is_scalable && (pic_conf.luma_bands != 4 || pic_conf.chroma_bands != 1)) {
 av_log(avctx, AV_LOG_ERROR, "Scalability: unsupported subdivision! Luma bands: %d, chroma bands: %d\n",
 pic_conf.luma_bands, pic_conf.chroma_bands);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 pic_size_indx = get_bits(&ctx->gb, 4);
@@ -98,8 +98,8 @@
 }
 
 if (ctx->gop_flags & 2) {
- av_log(avctx, AV_LOG_ERROR, "YV12 picture format not supported!\n");
- return -1;
+ avpriv_report_missing_feature(avctx, "YV12 picture format");
+ return AVERROR_PATCHWELCOME;
 }
 
 pic_conf.chroma_height = (pic_conf.pic_height + 3) >> 2;
@@ -113,11 +113,11 @@
 }
 
 /* check if picture layout was changed and reallocate buffers */
- if (ivi_pic_config_cmp(&pic_conf, &ctx->pic_conf)) {
+ if (ivi_pic_config_cmp(&pic_conf, &ctx->pic_conf) || ctx->gop_invalid) {
 result = ff_ivi_init_planes(ctx->planes, &pic_conf);
- if (result) {
+ if (result < 0) {
 av_log(avctx, AV_LOG_ERROR, "Couldn't reallocate color planes!\n");
- return -1;
+ return result;
 }
 ctx->pic_conf = pic_conf;
 blk_size_changed = 1; /* force reallocation of the internal structures */
@@ -140,46 +140,54 @@
 }
 
 if (get_bits1(&ctx->gb)) {
- av_log(avctx, AV_LOG_ERROR, "Extended transform info encountered!\n");
- return -1;
+ avpriv_report_missing_feature(avctx, "Extended transform info");
+ return AVERROR_PATCHWELCOME;
 }
 
 /* select transform function and scan pattern according to plane and band number */
 switch ((p << 2) + i) {
 case 0:
- band->inv_transform = ff_ivi_inverse_slant_8x8;
- band->dc_transform = ff_ivi_dc_slant_2d;
- band->scan = ff_zigzag_direct;
+ band->inv_transform = ff_ivi_inverse_slant_8x8;
+ band->dc_transform = ff_ivi_dc_slant_2d;
+ band->scan = ff_zigzag_direct;
+ band->transform_size = 8;
 break;
 
 case 1:
- band->inv_transform = ff_ivi_row_slant8;
- band->dc_transform = ff_ivi_dc_row_slant;
- band->scan = ff_ivi_vertical_scan_8x8;
+ band->inv_transform = ff_ivi_row_slant8;
+ band->dc_transform = ff_ivi_dc_row_slant;
+ band->scan = ff_ivi_vertical_scan_8x8;
+ band->transform_size = 8;
 break;
 
 case 2:
- band->inv_transform = ff_ivi_col_slant8;
- band->dc_transform = ff_ivi_dc_col_slant;
- band->scan = ff_ivi_horizontal_scan_8x8;
+ band->inv_transform = ff_ivi_col_slant8;
+ band->dc_transform = ff_ivi_dc_col_slant;
+ band->scan = ff_ivi_horizontal_scan_8x8;
+ band->transform_size = 8;
 break;
 
 case 3:
- band->inv_transform = ff_ivi_put_pixels_8x8;
- band->dc_transform = ff_ivi_put_dc_pixel_8x8;
- band->scan = ff_ivi_horizontal_scan_8x8;
+ band->inv_transform = ff_ivi_put_pixels_8x8;
+ band->dc_transform = ff_ivi_put_dc_pixel_8x8;
+ band->scan = ff_ivi_horizontal_scan_8x8;
+ band->transform_size = 8;
 break;
 
 case 4:
- band->inv_transform = ff_ivi_inverse_slant_4x4;
- band->dc_transform = ff_ivi_dc_slant_2d;
- band->scan = ff_ivi_direct_scan_4x4;
+ band->inv_transform = ff_ivi_inverse_slant_4x4;
+ band->dc_transform = ff_ivi_dc_slant_2d;
+ band->scan = ff_ivi_direct_scan_4x4;
+ band->transform_size = 4;
 break;
 }
 
 band->is_2d_trans = band->inv_transform == ff_ivi_inverse_slant_8x8 ||
 band->inv_transform == ff_ivi_inverse_slant_4x4;
 
+ if (band->transform_size != band->blk_size)
+ return AVERROR_INVALIDDATA;
+
 /* select dequant matrix according to plane and band number */
 if (!p) {
 quant_mat = (pic_conf.luma_bands > 1) ? i+1 : 0;
@@ -201,7 +209,7 @@
 
 if (get_bits(&ctx->gb, 2)) {
 av_log(avctx, AV_LOG_ERROR, "End marker missing!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 }
@@ -230,17 +238,17 @@
 if (blk_size_changed) {
 result = ff_ivi_init_tiles(ctx->planes, pic_conf.tile_width,
 pic_conf.tile_height);
- if (result) {
+ if (result < 0) {
 av_log(avctx, AV_LOG_ERROR,
 "Couldn't reallocate internal structures!\n");
- return -1;
+ return result;
 }
 }
 
 if (ctx->gop_flags & 8) {
 if (get_bits(&ctx->gb, 3)) {
 av_log(avctx, AV_LOG_ERROR, "Alignment bits are not zero!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 if (get_bits1(&ctx->gb))
@@ -289,25 +297,27 @@
 */
 static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx)
 {
+ int ret;
+
 if (get_bits(&ctx->gb, 5) != 0x1F) {
 av_log(avctx, AV_LOG_ERROR, "Invalid picture start code!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 ctx->prev_frame_type = ctx->frame_type;
 ctx->frame_type = get_bits(&ctx->gb, 3);
 if (ctx->frame_type >= 5) {
 av_log(avctx, AV_LOG_ERROR, "Invalid frame type: %d \n", ctx->frame_type);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 ctx->frame_num = get_bits(&ctx->gb, 8);
 
 if (ctx->frame_type == FRAMETYPE_INTRA) {
- ctx->gop_invalid = 1;
- if (decode_gop_header(ctx, avctx)) {
+ if ((ret = decode_gop_header(ctx, avctx)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "Invalid GOP header, skipping frames.\n");
- return AVERROR_INVALIDDATA;
+ ctx->gop_invalid = 1;
+ return ret;
 }
 ctx->gop_invalid = 0;
 }
@@ -324,8 +334,10 @@
 skip_hdr_extension(&ctx->gb); /* XXX: untested */
 
 /* decode macroblock huffman codebook */
- if (ff_ivi_dec_huff_desc(&ctx->gb, ctx->frame_flags & 0x40, IVI_MB_HUFF, &ctx->mb_vlc, avctx))
- return -1;
+ ret = ff_ivi_dec_huff_desc(&ctx->gb, ctx->frame_flags & 0x40,
+ IVI_MB_HUFF, &ctx->mb_vlc, avctx);
+ if (ret < 0)
+ return ret;
 
 skip_bits(&ctx->gb, 3); /* FIXME: unknown meaning! */
 }
@@ -347,7 +359,7 @@
 static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band,
 AVCodecContext *avctx)
 {
- int i;
+ int i, ret;
 uint8_t band_flags;
 
 band_flags = get_bits(&ctx->gb, 8);
@@ -371,7 +383,7 @@
 if (band->num_corr > 61) {
 av_log(avctx, AV_LOG_ERROR, "Too many corrections: %d\n",
 band->num_corr);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 /* read correction pairs */
@@ -383,8 +395,10 @@
 band->rvmap_sel = (band_flags & 0x40) ? get_bits(&ctx->gb, 3) : 8;
 
 /* decode block huffman codebook */
- if (ff_ivi_dec_huff_desc(&ctx->gb, band_flags & 0x80, IVI_BLK_HUFF, &band->blk_vlc, avctx))
- return -1;
+ ret = ff_ivi_dec_huff_desc(&ctx->gb, band_flags & 0x80, IVI_BLK_HUFF,
+ &band->blk_vlc, avctx);
+ if (ret < 0)
+ return ret;
 
 band->checksum_present = get_bits1(&ctx->gb);
 if (band->checksum_present)
@@ -451,7 +465,7 @@
 if (get_bits1(&ctx->gb)) {
 if (ctx->frame_type == FRAMETYPE_INTRA) {
 av_log(avctx, AV_LOG_ERROR, "Empty macroblock in an INTRA picture!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 mb->type = 1; /* empty macroblocks are always INTER */
 mb->cbp = 0; /* all blocks are empty */
@@ -615,7 +629,7 @@
 result = ff_ivi_init_planes(ctx->planes, &ctx->pic_conf);
 if (result) {
 av_log(avctx, AV_LOG_ERROR, "Couldn't allocate color planes!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 ctx->buf_switch = 0;
@@ -635,12 +649,12 @@
 
 AVCodec ff_indeo5_decoder = {
 .name = "indeo5",
+ .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 5"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_INDEO5,
 .priv_data_size = sizeof(IVI45DecContext),
 .init = decode_init,
 .close = ff_ivi_decode_close,
 .decode = ff_ivi_decode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo Video Interactive 5"),
 .capabilities = CODEC_CAP_DR1,
 };

libav-v9.6.tar.bz2/libavcodec/intelh263dec.c -> libav-v10.1.tar.bz2/libavcodec/intelh263dec.c Changed

libav-v9.6.tar.bz2/libavcodec/internal.h -> libav-v10.1.tar.bz2/libavcodec/internal.h Changed

@@ -26,34 +26,35 @@
 
 #include <stdint.h>
 
+#include "libavutil/buffer.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/pixfmt.h"
 #include "avcodec.h"
+#include "config.h"
 
-#define FF_SANE_NB_CHANNELS 128U
+#define FF_SANE_NB_CHANNELS 63U
 
-typedef struct InternalBuffer {
- uint8_t *base[AV_NUM_DATA_POINTERS];
- uint8_t *data[AV_NUM_DATA_POINTERS];
- int linesize[AV_NUM_DATA_POINTERS];
- int width;
- int height;
- enum AVPixelFormat pix_fmt;
-} InternalBuffer;
-
-typedef struct AVCodecInternal {
+typedef struct FramePool {
 /**
- * internal buffer count
- * used by default get/release/reget_buffer().
+ * Pools for each data plane. For audio all the planes have the same size,
+ * so only pools[0] is used.
 */
- int buffer_count;
+ AVBufferPool *pools[4];
 
- /**
- * internal buffers
- * used by default get/release/reget_buffer().
+ /*
+ * Pool parameters
 */
- InternalBuffer *buffer;
+ int format;
+ int width, height;
+ int stride_align[AV_NUM_DATA_POINTERS];
+ int linesize[4];
+ int planes;
+ int channels;
+ int samples;
+} FramePool;
 
+typedef struct AVCodecInternal {
 /**
 * Whether the parent AVCodecContext is a copy of the context which had
 * init() called on it.
@@ -62,13 +63,20 @@
 */
 int is_copy;
 
-#if FF_API_OLD_DECODE_AUDIO
 /**
- * Internal sample count used by avcodec_encode_audio() to fabricate pts.
- * Can be removed along with avcodec_encode_audio().
+ * Whether to allocate progress for frame threading.
+ *
+ * The codec must set it to 1 if it uses ff_thread_await/report_progress(),
+ * then progress will be allocated in ff_thread_get_buffer(). The frames
+ * then MUST be freed with ff_thread_release_buffer().
+ *
+ * If the codec does not need to call the progress functions (there are no
+ * dependencies between the frames), it should leave this at 0. Then it can
+ * decode straight to the user-provided frames (which the user will then
+ * free with av_frame_unref()), there is no need to call
+ * ff_thread_release_buffer().
 */
- int sample_count;
-#endif
+ int allocate_progress;
 
 /**
 * An audio frame with less than required samples has been submitted and
@@ -76,11 +84,17 @@
 */
 int last_audio_frame;
 
+ AVFrame *to_free;
+
+ FramePool *pool;
+
+ void *thread_ctx;
+
 /**
- * The data for the last allocated audio frame.
- * Stored here so we can free it.
+ * Current packet as passed into the decoder, to avoid having to pass the
+ * packet into every function.
 */
- uint8_t *audio_data;
+ AVPacket *pkt;
 } AVCodecInternal;
 
 struct AVCodecDefault {
@@ -92,11 +106,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.
@@ -149,6 +162,28 @@
 * AVCodecContext.get_buffer() and should be used instead calling get_buffer()
 * directly.
 */
-int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame);
+int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags);
+
+/**
+ * Identical in function to av_frame_make_writable(), except it uses
+ * ff_get_buffer() to allocate the buffer when needed.
+ */
+int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame);
+
+const uint8_t *avpriv_find_start_code(const uint8_t *restrict p,
+ const uint8_t *end,
+ uint32_t *restrict 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 */

libav-v9.6.tar.bz2/libavcodec/interplayvideo.c -> libav-v10.1.tar.bz2/libavcodec/interplayvideo.c Changed

@@ -40,7 +40,7 @@
 
 #include "avcodec.h"
 #include "bytestream.h"
-#include "dsputil.h"
+#include "hpeldsp.h"
 #define BITSTREAM_READER_LE
 #include "get_bits.h"
 #include "internal.h"
@@ -50,10 +50,9 @@
 typedef struct IpvideoContext {
 
 AVCodecContext *avctx;
- DSPContext dsp;
- AVFrame second_last_frame;
- AVFrame last_frame;
- AVFrame current_frame;
+ HpelDSPContext hdsp;
+ AVFrame *second_last_frame;
+ AVFrame *last_frame;
 const unsigned char *decoding_map;
 int decoding_map_size;
 
@@ -67,39 +66,39 @@
 uint32_t pal[256];
 } IpvideoContext;
 
-static int copy_from(IpvideoContext *s, AVFrame *src, int delta_x, int delta_y)
+static int copy_from(IpvideoContext *s, AVFrame *src, AVFrame *dst, int delta_x, int delta_y)
 {
- int current_offset = s->pixel_ptr - s->current_frame.data[0];
- int motion_offset = current_offset + delta_y * s->current_frame.linesize[0]
+ int current_offset = s->pixel_ptr - dst->data[0];
+ int motion_offset = current_offset + delta_y * dst->linesize[0]
 + delta_x * (1 + s->is_16bpp);
 if (motion_offset < 0) {
 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset < 0 (%d)\n", motion_offset);
- return -1;
+ return AVERROR_INVALIDDATA;
 } else if (motion_offset > s->upper_motion_limit_offset) {
 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset above limit (%d >= %d)\n",
 motion_offset, s->upper_motion_limit_offset);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (src->data[0] == NULL) {
 av_log(s->avctx, AV_LOG_ERROR, "Invalid decode type, corrupted header?\n");
 return AVERROR(EINVAL);
 }
- s->dsp.put_pixels_tab[!s->is_16bpp][0](s->pixel_ptr, src->data[0] + motion_offset,
- s->current_frame.linesize[0], 8);
+ s->hdsp.put_pixels_tab[!s->is_16bpp][0](s->pixel_ptr, src->data[0] + motion_offset,
+ dst->linesize[0], 8);
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0x0(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x0(IpvideoContext *s, AVFrame *frame)
 {
- return copy_from(s, &s->last_frame, 0, 0);
+ return copy_from(s, s->last_frame, frame, 0, 0);
 }
 
-static int ipvideo_decode_block_opcode_0x1(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x1(IpvideoContext *s, AVFrame *frame)
 {
- return copy_from(s, &s->second_last_frame, 0, 0);
+ return copy_from(s, s->second_last_frame, frame, 0, 0);
 }
 
-static int ipvideo_decode_block_opcode_0x2(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x2(IpvideoContext *s, AVFrame *frame)
 {
 unsigned char B;
 int x, y;
@@ -120,10 +119,10 @@
 }
 
 av_dlog(NULL, " motion byte = %d, (x, y) = (%d, %d)\n", B, x, y);
- return copy_from(s, &s->second_last_frame, x, y);
+ return copy_from(s, s->second_last_frame, frame, x, y);
 }
 
-static int ipvideo_decode_block_opcode_0x3(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x3(IpvideoContext *s, AVFrame *frame)
 {
 unsigned char B;
 int x, y;
@@ -146,10 +145,10 @@
 }
 
 av_dlog(NULL, " motion byte = %d, (x, y) = (%d, %d)\n", B, x, y);
- return copy_from(s, &s->current_frame, x, y);
+ return copy_from(s, frame, frame, x, y);
 }
 
-static int ipvideo_decode_block_opcode_0x4(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x4(IpvideoContext *s, AVFrame *frame)
 {
 int x, y;
 unsigned char B, BL, BH;
@@ -167,10 +166,10 @@
 y = -8 + BH;
 
 av_dlog(NULL, " motion byte = %d, (x, y) = (%d, %d)\n", B, x, y);
- return copy_from(s, &s->last_frame, x, y);
+ return copy_from(s, s->last_frame, frame, x, y);
 }
 
-static int ipvideo_decode_block_opcode_0x5(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x5(IpvideoContext *s, AVFrame *frame)
 {
 signed char x, y;
 
@@ -180,10 +179,10 @@
 y = bytestream2_get_byte(&s->stream_ptr);
 
 av_dlog(NULL, " motion bytes = %d, %d\n", x, y);
- return copy_from(s, &s->last_frame, x, y);
+ return copy_from(s, s->last_frame, frame, x, y);
 }
 
-static int ipvideo_decode_block_opcode_0x6(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x6(IpvideoContext *s, AVFrame *frame)
 {
 /* mystery opcode? skip multiple blocks? */
 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: Help! Mystery opcode 0x6 seen\n");
@@ -192,7 +191,7 @@
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0x7(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x7(IpvideoContext *s, AVFrame *frame)
 {
 int x, y;
 unsigned char P[2];
@@ -231,7 +230,7 @@
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0x8(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x8(IpvideoContext *s, AVFrame *frame)
 {
 int x, y;
 unsigned char P[4];
@@ -304,7 +303,7 @@
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s, AVFrame *frame)
 {
 int x, y;
 unsigned char P[4];
@@ -369,7 +368,7 @@
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0xA(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xA(IpvideoContext *s, AVFrame *frame)
 {
 int x, y;
 unsigned char P[8];
@@ -430,7 +429,7 @@
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0xB(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xB(IpvideoContext *s, AVFrame *frame)
 {
 int y;
 
@@ -444,7 +443,7 @@
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0xC(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xC(IpvideoContext *s, AVFrame *frame)
 {
 int x, y;
 
@@ -463,7 +462,7 @@
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0xD(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xD(IpvideoContext *s, AVFrame *frame)
 {
 int y;
 unsigned char P[2];
@@ -483,7 +482,7 @@
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0xE(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xE(IpvideoContext *s, AVFrame *frame)
 {
 int y;
 unsigned char pix;
@@ -500,7 +499,7 @@
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0xF(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xF(IpvideoContext *s, AVFrame *frame)
 {
 int x, y;
 unsigned char sample[2];
@@ -521,7 +520,7 @@
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0x6_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x6_16(IpvideoContext *s, AVFrame *frame)
 {
 signed char x, y;
 
@@ -530,10 +529,10 @@
 y = bytestream2_get_byte(&s->stream_ptr);
 
 av_dlog(NULL, " motion bytes = %d, %d\n", x, y);
- return copy_from(s, &s->second_last_frame, x, y);
+ return copy_from(s, s->second_last_frame, frame, x, y);
 }
 
-static int ipvideo_decode_block_opcode_0x7_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x7_16(IpvideoContext *s, AVFrame *frame)
 {
 int x, y;
 uint16_t P[2];
@@ -570,7 +569,7 @@
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0x8_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x8_16(IpvideoContext *s, AVFrame *frame)
 {
 int x, y;
 uint16_t P[4];
@@ -646,7 +645,7 @@
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0x9_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0x9_16(IpvideoContext *s, AVFrame *frame)
 {
 int x, y;
 uint16_t P[4];
@@ -713,7 +712,7 @@
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0xA_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xA_16(IpvideoContext *s, AVFrame *frame)
 {
 int x, y;
 uint16_t P[8];
@@ -779,7 +778,7 @@
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0xB_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xB_16(IpvideoContext *s, AVFrame *frame)
 {
 int x, y;
 uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
@@ -795,7 +794,7 @@
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0xC_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xC_16(IpvideoContext *s, AVFrame *frame)
 {
 int x, y;
 uint16_t *pixel_ptr = (uint16_t*)s->pixel_ptr;
@@ -815,7 +814,7 @@
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0xD_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xD_16(IpvideoContext *s, AVFrame *frame)
 {
 int x, y;
 uint16_t P[2];
@@ -836,7 +835,7 @@
 return 0;
 }
 
-static int ipvideo_decode_block_opcode_0xE_16(IpvideoContext *s)
+static int ipvideo_decode_block_opcode_0xE_16(IpvideoContext *s, AVFrame *frame)
 {
 int x, y;
 uint16_t pix;
@@ -855,7 +854,7 @@
 return 0;
 }
 
-static int (* const ipvideo_decode_block[])(IpvideoContext *s) = {
+static int (* const ipvideo_decode_block[])(IpvideoContext *s, AVFrame *frame) = {
 ipvideo_decode_block_opcode_0x0, ipvideo_decode_block_opcode_0x1,
 ipvideo_decode_block_opcode_0x2, ipvideo_decode_block_opcode_0x3,
 ipvideo_decode_block_opcode_0x4, ipvideo_decode_block_opcode_0x5,
@@ -866,7 +865,7 @@
 ipvideo_decode_block_opcode_0xE, ipvideo_decode_block_opcode_0xF,
 };
 
-static int (* const ipvideo_decode_block16[])(IpvideoContext *s) = {
+static int (* const ipvideo_decode_block16[])(IpvideoContext *s, AVFrame *frame) = {
 ipvideo_decode_block_opcode_0x0, ipvideo_decode_block_opcode_0x1,
 ipvideo_decode_block_opcode_0x2, ipvideo_decode_block_opcode_0x3,
 ipvideo_decode_block_opcode_0x4, ipvideo_decode_block_opcode_0x5,
@@ -877,30 +876,26 @@
 ipvideo_decode_block_opcode_0xE_16, ipvideo_decode_block_opcode_0x1,
 };
 
-static void ipvideo_decode_opcodes(IpvideoContext *s)
+static void ipvideo_decode_opcodes(IpvideoContext *s, AVFrame *frame)
 {
 int x, y;
 unsigned char opcode;
 int ret;
- static int frame = 0;
 GetBitContext gb;
 
- av_dlog(NULL, "------------------ frame %d\n", frame);
- frame++;
-
 bytestream2_skip(&s->stream_ptr, 14); /* data starts 14 bytes in */
 if (!s->is_16bpp) {
 /* this is PAL8, so make the palette available */
- memcpy(s->current_frame.data[1], s->pal, AVPALETTE_SIZE);
+ memcpy(frame->data[1], s->pal, AVPALETTE_SIZE);
 
- s->stride = s->current_frame.linesize[0];
+ s->stride = frame->linesize[0];
 } else {
- s->stride = s->current_frame.linesize[0] >> 1;
+ s->stride = frame->linesize[0] >> 1;
 s->mv_ptr = s->stream_ptr;
 bytestream2_skip(&s->mv_ptr, bytestream2_get_le16(&s->stream_ptr));
 }
 s->line_inc = s->stride - 8;
- s->upper_motion_limit_offset = (s->avctx->height - 8) * s->current_frame.linesize[0]
+ s->upper_motion_limit_offset = (s->avctx->height - 8) * frame->linesize[0]
 + (s->avctx->width - 8) * (1 + s->is_16bpp);
 
 init_get_bits(&gb, s->decoding_map, s->decoding_map_size * 8);
@@ -913,17 +908,17 @@
 x, y, opcode, bytestream2_tell(&s->stream_ptr));
 
 if (!s->is_16bpp) {
- s->pixel_ptr = s->current_frame.data[0] + x
- + y*s->current_frame.linesize[0];
- ret = ipvideo_decode_block[opcode](s);
+ s->pixel_ptr = frame->data[0] + x
+ + y*frame->linesize[0];
+ ret = ipvideo_decode_block[opcode](s, frame);
 } else {
- s->pixel_ptr = s->current_frame.data[0] + x*2
- + y*s->current_frame.linesize[0];
- ret = ipvideo_decode_block16[opcode](s);
+ s->pixel_ptr = frame->data[0] + x*2
+ + y*frame->linesize[0];
+ ret = ipvideo_decode_block16[opcode](s, frame);
 }
 if (ret != 0) {
 av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode problem on frame %d, @ block (%d, %d)\n",
- frame, x, y);
+ s->avctx->frame_number, x, y);
 return;
 }
 }
@@ -944,10 +939,15 @@
 s->is_16bpp = avctx->bits_per_coded_sample == 16;
 avctx->pix_fmt = s->is_16bpp ? AV_PIX_FMT_RGB555 : AV_PIX_FMT_PAL8;
 
- ff_dsputil_init(&s->dsp, avctx);
+ ff_hpeldsp_init(&s->hdsp, avctx->flags);
 
- s->current_frame.data[0] = s->last_frame.data[0] =
- s->second_last_frame.data[0] = NULL;
+ s->last_frame = av_frame_alloc();
+ s->second_last_frame = av_frame_alloc();
+ if (!s->last_frame || !s->second_last_frame) {
+ av_frame_free(&s->last_frame);
+ av_frame_free(&s->second_last_frame);
+ return AVERROR(ENOMEM);
+ }
 
 return 0;
 }
@@ -959,6 +959,8 @@
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 IpvideoContext *s = avctx->priv_data;
+ AVFrame *frame = data;
+ int ret;
 
 /* decoding map contains 4 bits of information per 8x8 block */
 s->decoding_map_size = avctx->width * avctx->height / (8 * 8 * 2);
@@ -972,31 +974,28 @@
 bytestream2_init(&s->stream_ptr, buf + s->decoding_map_size,
 buf_size - s->decoding_map_size);
 
- s->current_frame.reference = 3;
- if (ff_get_buffer(avctx, &s->current_frame)) {
+ if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) {
 av_log(avctx, AV_LOG_ERROR, " Interplay Video: get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 if (!s->is_16bpp) {
 const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
 if (pal) {
- s->current_frame.palette_has_changed = 1;
+ frame->palette_has_changed = 1;
 memcpy(s->pal, pal, AVPALETTE_SIZE);
 }
 }
 
- ipvideo_decode_opcodes(s);
+ ipvideo_decode_opcodes(s, frame);
 
 *got_frame = 1;
- *(AVFrame*)data = s->current_frame;
 
 /* shuffle frames */
- if (s->second_last_frame.data[0])
- avctx->release_buffer(avctx, &s->second_last_frame);
- s->second_last_frame = s->last_frame;
- s->last_frame = s->current_frame;
- s->current_frame.data[0] = NULL; /* catch any access attempts */
+ av_frame_unref(s->second_last_frame);
+ FFSWAP(AVFrame*, s->second_last_frame, s->last_frame);
+ if ((ret = av_frame_ref(s->last_frame, frame)) < 0)
+ return ret;
 
 /* report that the buffer was completely consumed */
 return buf_size;
@@ -1006,17 +1005,15 @@
 {
 IpvideoContext *s = avctx->priv_data;
 
- /* release the last frame */
- if (s->last_frame.data[0])
- avctx->release_buffer(avctx, &s->last_frame);
- if (s->second_last_frame.data[0])
- avctx->release_buffer(avctx, &s->second_last_frame);
+ av_frame_free(&s->last_frame);
+ av_frame_free(&s->second_last_frame);
 
 return 0;
 }
 
 AVCodec ff_interplay_video_decoder = {
 .name = "interplayvideo",
+ .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_INTERPLAY_VIDEO,
 .priv_data_size = sizeof(IpvideoContext),
@@ -1024,5 +1021,4 @@
 .close = ipvideo_decode_end,
 .decode = ipvideo_decode_frame,
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_PARAM_CHANGE,
- .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE video"),
 };

libav-v9.6.tar.bz2/libavcodec/intrax8.c -> libav-v10.1.tar.bz2/libavcodec/intrax8.c Changed

@@ -22,6 +22,7 @@
  */
 
 #include "avcodec.h"
+#include "error_resilience.h"
 #include "get_bits.h"
 #include "mpegvideo.h"
 #include "msmpeg4data.h"
@@ -723,7 +724,6 @@
  * @param dquant doubled quantizer, it would be odd in case of VC-1 halfpq==1.
  * @param quant_offset offset away from zero
  */
-//FIXME extern uint8_t ff_wmv3_dc_scale_table[32];
 int ff_intrax8_decode_picture(IntraX8Context * const w, int dquant, int quant_offset){
     MpegEncContext * const s= w->s;
     int mb_xy;
@@ -773,18 +773,18 @@
                 /*emulate MB info in the relevant tables*/
                 s->mbskip_table [mb_xy]=0;
                 s->mbintra_table[mb_xy]=1;
-                s->current_picture.f.qscale_table[mb_xy] = w->quant;
+                s->current_picture.qscale_table[mb_xy] = w->quant;
                 mb_xy++;
             }
             s->dest[0]+= 8;
         }
         if(s->mb_y&1){
-            ff_draw_horiz_band(s, (s->mb_y-1)*8, 16);
+            ff_mpeg_draw_horiz_band(s, (s->mb_y-1)*8, 16);
         }
     }
 
 error:
-    ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y,
+    ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y,
                         (s->mb_x>>1)-1, (s->mb_y>>1)-1,
                         ER_MB_END );
     return 0;

libav-v9.6.tar.bz2/libavcodec/intrax8dsp.c -> libav-v10.1.tar.bz2/libavcodec/intrax8dsp.c Changed

libav-v9.6.tar.bz2/libavcodec/ituh263dec.c -> libav-v10.1.tar.bz2/libavcodec/ituh263dec.c Changed

@@ -27,11 +27,11 @@
 * h263 decoder.
 */
 
-//#define DEBUG
 #include <limits.h>
 
+#include "libavutil/attributes.h"
+#include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h263.h"
@@ -40,9 +40,6 @@
 #include "flv.h"
 #include "mpeg4video.h"
 
-//#undef NDEBUG
-//#include <assert.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
@@ -101,7 +98,7 @@
 /* init vlcs */
 
 /* XXX: find a better solution to handle static init */
-void ff_h263_decode_init_vlc(MpegEncContext *s)
+av_cold void ff_h263_decode_init_vlc(void)
 {
 static int done = 0;
 
@@ -238,7 +235,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 +252,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)
@@ -352,20 +349,20 @@
 do{
 if (get_bits1(&s->gb)) {
 /* skip mb */
- mot_val = s->current_picture.f.motion_val[0][s->block_index[0]];
+ mot_val = s->current_picture.motion_val[0][s->block_index[0]];
 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;
 
- s->current_picture.f.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;
 }
 cbpc = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2);
 }while(cbpc == 20);
 
 if(cbpc & 4){
- s->current_picture.f.mb_type[xy] = MB_TYPE_INTRA;
+ s->current_picture.mb_type[xy] = MB_TYPE_INTRA;
 }else{
 get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1);
 if (cbpc & 8) {
@@ -377,7 +374,7 @@
 }
 
 if ((cbpc & 16) == 0) {
- s->current_picture.f.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0;
+ s->current_picture.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0;
 /* 16x16 motion prediction */
 mot_val= ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
 if (s->umvplus)
@@ -395,7 +392,7 @@
 mot_val[1 ]= mot_val[3 ]=
 mot_val[1+stride]= mot_val[3+stride]= my;
 } else {
- s->current_picture.f.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0;
+ s->current_picture.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0;
 for(i=0;i<4;i++) {
 mot_val = ff_h263_pred_motion(s, i, 0, &pred_x, &pred_y);
 if (s->umvplus)
@@ -438,7 +435,7 @@
 ff_set_qscale(s, s->qscale);
 }
 
-static int h263_decode_block(MpegEncContext * s, DCTELEM * block,
+static int h263_decode_block(MpegEncContext * s, int16_t * block,
 int n, int coded)
 {
 int code, level, i, j, last, run;
@@ -563,7 +560,7 @@
 
 static int h263_skip_b_part(MpegEncContext *s, int cbp)
 {
- LOCAL_ALIGNED_16(DCTELEM, dblock, [64]);
+ LOCAL_ALIGNED_16(int16_t, dblock, [64]);
 int i, mbi;
 
 /* we have to set s->mb_intra to zero to decode B-part of PB-frame correctly
@@ -599,7 +596,7 @@
 }
 
 int ff_h263_decode_mb(MpegEncContext *s,
- DCTELEM block[6][64])
+ int16_t block[6][64])
 {
 int cbpc, cbpy, i, cbp, pred_x, pred_y, mx, my, dquant;
 int16_t *mot_val;
@@ -617,7 +614,7 @@
 s->block_last_index[i] = -1;
 s->mv_dir = MV_DIR_FORWARD;
 s->mv_type = MV_TYPE_16X16;
- s->current_picture.f.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;
 s->mv[0][0][0] = 0;
 s->mv[0][0][1] = 0;
 s->mb_skipped = !(s->obmc | s->loop_filter);
@@ -650,7 +647,7 @@
 
 s->mv_dir = MV_DIR_FORWARD;
 if ((cbpc & 16) == 0) {
- s->current_picture.f.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0;
+ s->current_picture.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0;
 /* 16x16 motion prediction */
 s->mv_type = MV_TYPE_16X16;
 ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
@@ -675,7 +672,7 @@
 if (s->umvplus && (mx - pred_x) == 1 && (my - pred_y) == 1)
 skip_bits1(&s->gb); /* Bit stuffing to prevent PSC */
 } else {
- s->current_picture.f.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0;
+ s->current_picture.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0;
 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);
@@ -703,8 +700,8 @@
 } else if(s->pict_type==AV_PICTURE_TYPE_B) {
 int mb_type;
 const int stride= s->b8_stride;
- int16_t *mot_val0 = s->current_picture.f.motion_val[0][2 * (s->mb_x + s->mb_y * stride)];
- int16_t *mot_val1 = s->current_picture.f.motion_val[1][2 * (s->mb_x + s->mb_y * stride)];
+ int16_t *mot_val0 = s->current_picture.motion_val[0][2 * (s->mb_x + s->mb_y * stride)];
+ int16_t *mot_val1 = s->current_picture.motion_val[1][2 * (s->mb_x + s->mb_y * stride)];
 // const int mv_xy= s->mb_x + 1 + s->mb_y * s->mb_stride;
 
 //FIXME ugly
@@ -753,6 +750,8 @@
 }
 
 if(IS_DIRECT(mb_type)){
+ if (!s->pp_time)
+ return AVERROR_INVALIDDATA;
 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT;
 mb_type |= ff_mpeg4_set_direct_mv(s, 0, 0);
 }else{
@@ -787,7 +786,7 @@
 }
 }
 
- s->current_picture.f.mb_type[xy] = mb_type;
+ s->current_picture.mb_type[xy] = mb_type;
 } else { /* I-Frame */
 do{
 cbpc = get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2);
@@ -802,11 +801,11 @@
 dquant = cbpc & 4;
 s->mb_intra = 1;
 intra:
- s->current_picture.f.mb_type[xy] = MB_TYPE_INTRA;
+ s->current_picture.mb_type[xy] = MB_TYPE_INTRA;
 if (s->h263_aic) {
 s->ac_pred = get_bits1(&s->gb);
 if(s->ac_pred){
- s->current_picture.f.mb_type[xy] = MB_TYPE_INTRA | MB_TYPE_ACPRED;
+ s->current_picture.mb_type[xy] = MB_TYPE_INTRA | MB_TYPE_ACPRED;
 
 s->h263_aic_dir = get_bits1(&s->gb);
 }
@@ -888,7 +887,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 */

libav-v9.6.tar.bz2/libavcodec/ituh263enc.c -> libav-v10.1.tar.bz2/libavcodec/ituh263enc.c Changed

@@ -27,10 +27,9 @@
 * h263 bitstream encoder.
 */
 
-//#define DEBUG
 #include <limits.h>
 
-#include "dsputil.h"
+#include "libavutil/attributes.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h263.h"
@@ -40,9 +39,6 @@
 #include "mpeg4video.h"
 #include "internal.h"
 
-//#undef NDEBUG
-//#include <assert.h>
-
 /**
 * Table of number of bits a motion vector component needs.
 */
@@ -275,7 +271,7 @@
 */
 void ff_clean_h263_qscales(MpegEncContext *s){
 int i;
- int8_t * const qscale_table = s->current_picture.f.qscale_table;
+ int8_t * const qscale_table = s->current_picture.qscale_table;
 
 ff_init_qscale_tab(s);
 
@@ -306,7 +302,7 @@
 * @param block the 8x8 block
 * @param n block index (0-3 are luma, 4-5 are chroma)
 */
-static void h263_encode_block(MpegEncContext * s, DCTELEM * block, int n)
+static void h263_encode_block(MpegEncContext * s, int16_t * block, int n)
 {
 int level, run, last, i, j, last_index, last_non_zero, sign, slevel, code;
 RLTable *rl;
@@ -455,7 +451,7 @@
 }
 
 void ff_h263_encode_mb(MpegEncContext * s,
- DCTELEM block[6][64],
+ int16_t block[6][64],
 int motion_x, int motion_y)
 {
 int cbpc, cbpy, i, cbp, pred_x, pred_y;
@@ -529,8 +525,8 @@
 /* motion vectors: 8x8 mode*/
 ff_h263_pred_motion(s, i, 0, &pred_x, &pred_y);
 
- motion_x = s->current_picture.f.motion_val[0][s->block_index[i]][0];
- motion_y = s->current_picture.f.motion_val[0][s->block_index[i]][1];
+ motion_x = s->current_picture.motion_val[0][s->block_index[i]][0];
+ motion_y = s->current_picture.motion_val[0][s->block_index[i]][1];
 if (!s->umvplus) {
 ff_h263_encode_motion_vector(s, motion_x - pred_x,
 motion_y - pred_y, 1);
@@ -683,7 +679,7 @@
 }
 }
 
-static void init_mv_penalty_and_fcode(MpegEncContext *s)
+static av_cold void init_mv_penalty_and_fcode(MpegEncContext *s)
 {
 int f_code;
 int mv;
@@ -725,7 +721,9 @@
 }
 }
 
-static void init_uni_h263_rl_tab(RLTable *rl, uint32_t *bits_tab, uint8_t *len_tab){
+static av_cold void init_uni_h263_rl_tab(RLTable *rl, uint32_t *bits_tab,
+ uint8_t *len_tab)
+{
 int slevel, run, last;
 
 assert(MAX_LEVEL >= 64);
@@ -768,7 +766,7 @@
 }
 }
 
-void ff_h263_encode_init(MpegEncContext *s)
+av_cold void ff_h263_encode_init(MpegEncContext *s)
 {
 static int done = 0;

libav-v9.6.tar.bz2/libavcodec/ivi_common.c -> libav-v10.1.tar.bz2/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"
@@ -35,12 +36,62 @@
 #include "ivi_common.h"
 #include "ivi_dsp.h"
 
-extern const IVIHuffDesc ff_ivi_mb_huff_desc[8]; ///< static macroblock huffman tables
-extern const IVIHuffDesc ff_ivi_blk_huff_desc[8]; ///< static block huffman tables
+/**
+ * These are 2x8 predefined Huffman codebooks for coding macroblock/block
+ * signals. They are specified using "huffman descriptors" in order to
+ * avoid huge static tables. The decoding tables will be generated at
+ * startup from these descriptors.
+ */
+/** static macroblock huffman tables */
+static const IVIHuffDesc ivi_mb_huff_desc[8] = {
+ {8, {0, 4, 5, 4, 4, 4, 6, 6}},
+ {12, {0, 2, 2, 3, 3, 3, 3, 5, 3, 2, 2, 2}},
+ {12, {0, 2, 3, 4, 3, 3, 3, 3, 4, 3, 2, 2}},
+ {12, {0, 3, 4, 4, 3, 3, 3, 3, 3, 2, 2, 2}},
+ {13, {0, 4, 4, 3, 3, 3, 3, 2, 3, 3, 2, 1, 1}},
+ {9, {0, 4, 4, 4, 4, 3, 3, 3, 2}},
+ {10, {0, 4, 4, 4, 4, 3, 3, 2, 2, 2}},
+ {12, {0, 4, 4, 4, 3, 3, 2, 3, 2, 2, 2, 2}}
+};
+
+/** static block huffman tables */
+static const IVIHuffDesc ivi_blk_huff_desc[8] = {
+ {10, {1, 2, 3, 4, 4, 7, 5, 5, 4, 1}},
+ {11, {2, 3, 4, 4, 4, 7, 5, 4, 3, 3, 2}},
+ {12, {2, 4, 5, 5, 5, 5, 6, 4, 4, 3, 1, 1}},
+ {13, {3, 3, 4, 4, 5, 6, 6, 4, 4, 3, 2, 1, 1}},
+ {11, {3, 4, 4, 5, 5, 5, 6, 5, 4, 2, 2}},
+ {13, {3, 4, 5, 5, 5, 5, 6, 4, 3, 3, 2, 1, 1}},
+ {13, {3, 4, 5, 5, 5, 6, 5, 4, 3, 3, 2, 1, 1}},
+ {9, {3, 4, 4, 5, 5, 5, 6, 5, 5}}
+};
 
 static VLC ivi_mb_vlc_tabs [8]; ///< static macroblock Huffman tables
 static VLC ivi_blk_vlc_tabs[8]; ///< static block Huffman tables
 
+typedef void (*ivi_mc_func) (int16_t *buf, const int16_t *ref_buf,
+ uint32_t pitch, int mc_type);
+
+static int ivi_mc(IVIBandDesc *band, ivi_mc_func mc,
+ int offs, int mv_x, int mv_y, int mc_type)
+{
+ int ref_offs = offs + mv_y * band->pitch + mv_x;
+ int buf_size = band->pitch * band->aheight;
+ int min_size = band->pitch * (band->blk_size - 1) + band->blk_size;
+ int ref_size = (mc_type > 1) * band->pitch + (mc_type & 1);
+
+ if (offs < 0 || ref_offs < 0 || !band->ref_buf)
+ return AVERROR_INVALIDDATA;
+ if (buf_size - min_size < offs)
+ return AVERROR_INVALIDDATA;
+ if (buf_size - min_size - ref_size < ref_offs)
+ return AVERROR_INVALIDDATA;
+
+ mc(band->buf + offs, band->ref_buf + ref_offs, band->pitch, mc_type);
+
+ return 0;
+}
+
 /**
 * Reverse "nbits" bits of the value "val" and return the result
 * in the least significant bits.
@@ -50,9 +101,10 @@
 uint16_t res;
 
 if (nbits <= 8) {
- res = ff_reverse[val] >> (8-nbits);
+ res = ff_reverse[val] >> (8 - nbits);
 } else
- res = ((ff_reverse[val & 0xFF] << 8) + (ff_reverse[val >> 8])) >> (16-nbits);
+ res = ((ff_reverse[val & 0xFF] << 8) +
+ (ff_reverse[val >> 8])) >> (16 - nbits);
 
 return res;
 }
@@ -85,7 +137,7 @@
 
 bits[pos] = i + cb->xbits[i] + not_last_row;
 if (bits[pos] > IVI_VLC_BITS)
- return -1; /* invalid descriptor */
+ return AVERROR_INVALIDDATA; /* invalid descriptor */
 
 codewords[pos] = inv_bits((prefix | j), bits[pos]);
 if (!bits[pos])
@@ -100,7 +152,7 @@
 (flag ? INIT_VLC_USE_NEW_STATIC : 0) | INIT_VLC_LE);
 }
 
-void ff_ivi_init_static_vlc(void)
+av_cold void ff_ivi_init_static_vlc(void)
 {
 int i;
 static VLC_TYPE table_data[8192 * 16][2];
@@ -111,10 +163,12 @@
 for (i = 0; i < 8; i++) {
 ivi_mb_vlc_tabs[i].table = table_data + i * 2 * 8192;
 ivi_mb_vlc_tabs[i].table_allocated = 8192;
- ivi_create_huff_from_desc(&ff_ivi_mb_huff_desc[i], &ivi_mb_vlc_tabs[i], 1);
+ ivi_create_huff_from_desc(&ivi_mb_huff_desc[i],
+ &ivi_mb_vlc_tabs[i], 1);
 ivi_blk_vlc_tabs[i].table = table_data + (i * 2 + 1) * 8192;
 ivi_blk_vlc_tabs[i].table_allocated = 8192;
- ivi_create_huff_from_desc(&ff_ivi_blk_huff_desc[i], &ivi_blk_vlc_tabs[i], 1);
+ ivi_create_huff_from_desc(&ivi_blk_huff_desc[i],
+ &ivi_blk_vlc_tabs[i], 1);
 }
 initialized_vlcs = 1;
 }
@@ -138,56 +192,59 @@
 * @param[in] desc2 ptr to the 2nd descriptor to compare
 * @return comparison result: 0 - equal, 1 - not equal
 */
-static int ivi_huff_desc_cmp(const IVIHuffDesc *desc1, const IVIHuffDesc *desc2)
+static int ivi_huff_desc_cmp(const IVIHuffDesc *desc1,
+ const IVIHuffDesc *desc2)
 {
- return desc1->num_rows != desc2->num_rows
- || memcmp(desc1->xbits, desc2->xbits, desc1->num_rows);
+ return desc1->num_rows != desc2->num_rows ||
+ memcmp(desc1->xbits, desc2->xbits, desc1->num_rows);
 }
 
 int ff_ivi_dec_huff_desc(GetBitContext *gb, int desc_coded, int which_tab,
 IVIHuffTab *huff_tab, AVCodecContext *avctx)
 {
- int i, result;
+ int i, result;
 IVIHuffDesc new_huff;
 
 if (!desc_coded) {
 /* select default table */
 huff_tab->tab = (which_tab) ? &ivi_blk_vlc_tabs[7]
- : &ivi_mb_vlc_tabs [7];
- } else {
- huff_tab->tab_sel = get_bits(gb, 3);
- if (huff_tab->tab_sel == 7) {
- /* custom huffman table (explicitly encoded) */
- new_huff.num_rows = get_bits(gb, 4);
- if (!new_huff.num_rows) {
- av_log(avctx, AV_LOG_ERROR, "Empty custom Huffman table!\n");
- return AVERROR_INVALIDDATA;
- }
-
- for (i = 0; i < new_huff.num_rows; i++)
- new_huff.xbits[i] = get_bits(gb, 4);
+ : &ivi_mb_vlc_tabs [7];
+ return 0;
+ }
 
- /* Have we got the same custom table? Rebuild if not. */
- if (ivi_huff_desc_cmp(&new_huff, &huff_tab->cust_desc)) {
- ivi_huff_desc_copy(&huff_tab->cust_desc, &new_huff);
+ huff_tab->tab_sel = get_bits(gb, 3);
+ if (huff_tab->tab_sel == 7) {
+ /* custom huffman table (explicitly encoded) */
+ new_huff.num_rows = get_bits(gb, 4);
+ if (!new_huff.num_rows) {
+ av_log(avctx, AV_LOG_ERROR, "Empty custom Huffman table!\n");
+ return AVERROR_INVALIDDATA;
+ }
 
- if (huff_tab->cust_tab.table)
- ff_free_vlc(&huff_tab->cust_tab);
- result = ivi_create_huff_from_desc(&huff_tab->cust_desc,
- &huff_tab->cust_tab, 0);
- if (result) {
- huff_tab->cust_desc.num_rows = 0; // reset faulty description
- av_log(avctx, AV_LOG_ERROR,
- "Error while initializing custom vlc table!\n");
- return result;
- }
+ for (i = 0; i < new_huff.num_rows; i++)
+ new_huff.xbits[i] = get_bits(gb, 4);
+
+ /* Have we got the same custom table? Rebuild if not. */
+ if (ivi_huff_desc_cmp(&new_huff, &huff_tab->cust_desc)) {
+ ivi_huff_desc_copy(&huff_tab->cust_desc, &new_huff);
+
+ if (huff_tab->cust_tab.table)
+ ff_free_vlc(&huff_tab->cust_tab);
+ result = ivi_create_huff_from_desc(&huff_tab->cust_desc,
+ &huff_tab->cust_tab, 0);
+ if (result) {
+ // reset faulty description
+ huff_tab->cust_desc.num_rows = 0;
+ av_log(avctx, AV_LOG_ERROR,
+ "Error while initializing custom vlc table!\n");
+ return result;
 }
- huff_tab->tab = &huff_tab->cust_tab;
- } else {
- /* select one of predefined tables */
- huff_tab->tab = (which_tab) ? &ivi_blk_vlc_tabs[huff_tab->tab_sel]
- : &ivi_mb_vlc_tabs [huff_tab->tab_sel];
 }
+ huff_tab->tab = &huff_tab->cust_tab;
+ } else {
+ /* select one of predefined tables */
+ huff_tab->tab = (which_tab) ? &ivi_blk_vlc_tabs[huff_tab->tab_sel]
+ : &ivi_mb_vlc_tabs [huff_tab->tab_sel];
 }
 
 return 0;
@@ -215,17 +272,23 @@
 av_freep(&planes[p].bands[b].tiles);
 }
 av_freep(&planes[p].bands);
+ planes[p].num_bands = 0;
 }
 }
 
 av_cold int ff_ivi_init_planes(IVIPlaneDesc *planes, const IVIPicConfig *cfg)
 {
- int p, b;
- uint32_t b_width, b_height, align_fac, width_aligned, height_aligned, buf_size;
+ int p, b;
+ uint32_t b_width, b_height, align_fac, width_aligned,
+ height_aligned, buf_size;
 IVIBandDesc *band;
 
 ivi_free_buffers(planes);
 
+ if (cfg->pic_width < 1 || cfg->pic_height < 1 ||
+ cfg->luma_bands < 1 || cfg->chroma_bands < 1)
+ return AVERROR_INVALIDDATA;
+
 /* fill in the descriptor of the luminance plane */
 planes[0].width = cfg->pic_width;
 planes[0].height = cfg->pic_height;
@@ -244,8 +307,10 @@
 /* select band dimensions: if there is only one band then it
 * has the full size, if there are several bands each of them
 * has only half size */
- b_width = planes[p].num_bands == 1 ? planes[p].width : (planes[p].width + 1) >> 1;
- b_height = planes[p].num_bands == 1 ? planes[p].height : (planes[p].height + 1) >> 1;
+ b_width = planes[p].num_bands == 1 ? planes[p].width
+ : (planes[p].width + 1) >> 1;
+ b_height = planes[p].num_bands == 1 ? planes[p].height
+ : (planes[p].height + 1) >> 1;
 
 /* luma band buffers will be aligned on 16x16 (max macroblock size) */
 /* chroma band buffers will be aligned on 8x8 (max macroblock size) */
@@ -273,19 +338,56 @@
 if (!band->bufs[2])
 return AVERROR(ENOMEM);
 }
+ /* reset custom vlc */
+ planes[p].bands[0].blk_vlc.cust_desc.num_rows = 0;
+ }
+ }
 
- planes[p].bands[0].blk_vlc.cust_desc.num_rows = 0; /* reset custom vlc */
+ return 0;
+}
+
+static int ivi_init_tiles(IVIBandDesc *band, IVITile *ref_tile,
+ int p, int b, int t_height, int t_width)
+{
+ int x, y;
+ IVITile *tile = band->tiles;
+
+ for (y = 0; y < band->height; y += t_height) {
+ for (x = 0; x < band->width; x += t_width) {
+ tile->xpos = x;
+ tile->ypos = y;
+ tile->mb_size = band->mb_size;
+ tile->width = FFMIN(band->width - x, t_width);
+ tile->height = FFMIN(band->height - y, t_height);
+ tile->is_empty = tile->data_size = 0;
+ /* calculate number of macroblocks */
+ tile->num_MBs = IVI_MBs_PER_TILE(tile->width, tile->height,
+ band->mb_size);
+
+ av_freep(&tile->mbs);
+ tile->mbs = av_malloc(tile->num_MBs * sizeof(IVIMbInfo));
+ if (!tile->mbs)
+ return AVERROR(ENOMEM);
+
+ tile->ref_mbs = 0;
+ if (p || b) {
+ if (tile->num_MBs != ref_tile->num_MBs)
+ return AVERROR_INVALIDDATA;
+ tile->ref_mbs = ref_tile->mbs;
+ ref_tile++;
+ }
+ tile++;
 }
 }
 
 return 0;
 }
 
-av_cold int ff_ivi_init_tiles(IVIPlaneDesc *planes, int tile_width, int tile_height)
+av_cold int ff_ivi_init_tiles(IVIPlaneDesc *planes,
+ int tile_width, int tile_height)
 {
- int p, b, x, y, x_tiles, y_tiles, t_width, t_height;
+ int p, b, x_tiles, y_tiles, t_width, t_height, ret;
 IVIBandDesc *band;
- IVITile *tile, *ref_tile;
 
 for (p = 0; p < 3; p++) {
 t_width = !p ? tile_width : (tile_width + 3) >> 2;
@@ -307,41 +409,14 @@
 if (!band->tiles)
 return AVERROR(ENOMEM);
 
- tile = band->tiles;
-
 /* use the first luma band as reference for motion vectors
 * and quant */
- ref_tile = planes[0].bands[0].tiles;
-
- for (y = 0; y < band->height; y += t_height) {
- for (x = 0; x < band->width; x += t_width) {
- tile->xpos = x;
- tile->ypos = y;
- tile->mb_size = band->mb_size;
- tile->width = FFMIN(band->width - x, t_width);
- tile->height = FFMIN(band->height - y, t_height);
- tile->is_empty = tile->data_size = 0;
- /* calculate number of macroblocks */
- tile->num_MBs = IVI_MBs_PER_TILE(tile->width, tile->height,
- band->mb_size);
-
- av_freep(&tile->mbs);
- tile->mbs = av_malloc(tile->num_MBs * sizeof(IVIMbInfo));
- if (!tile->mbs)
- return AVERROR(ENOMEM);
-
- tile->ref_mbs = 0;
- if (p || b) {
- tile->ref_mbs = ref_tile->mbs;
- ref_tile++;
- }
-
- tile++;
- }
- }
-
- }// for b
- }// for p
+ ret = ivi_init_tiles(band, planes[0].bands[0].tiles,
+ p, b, t_height, t_width);
+ if (ret < 0)
+ return ret;
+ }
+ }
 
 return 0;
 }
@@ -373,6 +448,116 @@
 return len;
 }
 
+static int ivi_dc_transform(IVIBandDesc *band, int *prev_dc, int buf_offs,
+ int blk_size)
+{
+ int buf_size = band->pitch * band->aheight - buf_offs;
+ int min_size = (blk_size - 1) * band->pitch + blk_size;
+
+ if (!band->dc_transform)
+ return 0;
+
+
+ if (min_size > buf_size)
+ return AVERROR_INVALIDDATA;
+
+ band->dc_transform(prev_dc, band->buf + buf_offs,
+ band->pitch, blk_size);
+
+ return 0;
+}
+
+static int ivi_decode_coded_blocks(GetBitContext *gb, IVIBandDesc *band,
+ ivi_mc_func mc, int mv_x, int mv_y,
+ int *prev_dc, int is_intra, int mc_type,
+ uint32_t quant, int offs,
+ AVCodecContext *avctx)
+{
+ const uint16_t *base_tab = is_intra ? band->intra_base : band->inter_base;
+ RVMapDesc *rvmap = band->rv_map;
+ uint8_t col_flags[8];
+ int32_t trvec[64];
+ uint32_t sym = 0, lo, hi, q;
+ int pos, run, val;
+ int blk_size = band->blk_size;
+ int num_coeffs = blk_size * blk_size;
+ int col_mask = blk_size - 1;
+ int scan_pos = -1;
+ int min_size = band->pitch * (band->transform_size - 1) +
+ band->transform_size;
+ int buf_size = band->pitch * band->aheight - offs;
+
+ if (min_size > buf_size)
+ return AVERROR_INVALIDDATA;
+
+ if (!band->scan) {
+ av_log(avctx, AV_LOG_ERROR, "Scan pattern is not set.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ /* zero transform vector */
+ memset(trvec, 0, num_coeffs * sizeof(trvec[0]));
+ /* zero column flags */
+ memset(col_flags, 0, sizeof(col_flags));
+ while (scan_pos <= num_coeffs) {
+ sym = get_vlc2(gb, band->blk_vlc.tab->table,
+ IVI_VLC_BITS, 1);
+ if (sym == rvmap->eob_sym)
+ break; /* End of block */
+
+ /* Escape - run/val explicitly coded using 3 vlc codes */
+ if (sym == rvmap->esc_sym) {
+ run = get_vlc2(gb, band->blk_vlc.tab->table, IVI_VLC_BITS, 1) + 1;
+ lo = get_vlc2(gb, band->blk_vlc.tab->table, IVI_VLC_BITS, 1);
+ hi = get_vlc2(gb, band->blk_vlc.tab->table, IVI_VLC_BITS, 1);
+ /* merge them and convert into signed val */
+ val = IVI_TOSIGNED((hi << 6) | lo);
+ } else {
+ if (sym >= 256U) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid sym encountered: %d.\n", sym);
+ return AVERROR_INVALIDDATA;
+ }
+ run = rvmap->runtab[sym];
+ val = rvmap->valtab[sym];
+ }
+
+ /* de-zigzag and dequantize */
+ scan_pos += run;
+ if (scan_pos >= num_coeffs || scan_pos < 0)
+ break;
+ pos = band->scan[scan_pos];
+
+ if (!val)
+ av_dlog(avctx, "Val = 0 encountered!\n");
+
+ q = (base_tab[pos] * quant) >> 9;
+ if (q > 1)
+ val = val * q + FFSIGN(val) * (((q ^ 1) - 1) >> 1);
+ trvec[pos] = val;
+ /* track columns containing non-zero coeffs */
+ col_flags[pos & col_mask] |= !!val;
+ }
+
+ if (scan_pos < 0 || scan_pos >= num_coeffs && sym != rvmap->eob_sym)
+ return AVERROR_INVALIDDATA; /* corrupt block data */
+
+ /* undoing DC coeff prediction for intra-blocks */
+ if (is_intra && band->is_2d_trans) {
+ *prev_dc += trvec[0];
+ trvec[0] = *prev_dc;
+ col_flags[0] |= !!*prev_dc;
+ }
+
+ /* apply inverse transform */
+ band->inv_transform(trvec, band->buf + offs,
+ band->pitch, col_flags);
+
+ /* apply motion compensation */
+ if (!is_intra)
+ return ivi_mc(band, mc, offs, mv_x, mv_y, mc_type);
+
+ return 0;
+}
 /*
 * Decode block data:
 * extract huffman-coded transform coefficients from the bitstream,
@@ -384,27 +569,22 @@
 * @param[in] tile pointer to the tile descriptor
 * @return result code: 0 - OK, -1 = error (corrupted blocks data)
 */
-static int ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile,
- AVCodecContext *avctx)
+static int ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band,
+ IVITile *tile, AVCodecContext *avctx)
 {
- int mbn, blk, num_blocks, num_coeffs, blk_size, scan_pos, run, val,
- pos, is_intra, mc_type = 0, mv_x, mv_y, col_mask;
- uint8_t col_flags[8];
- int32_t prev_dc, trvec[64];
- uint32_t cbp, sym, lo, hi, quant, buf_offs, q;
- IVIMbInfo *mb;
- RVMapDesc *rvmap = band->rv_map;
- void (*mc_with_delta_func)(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type);
- void (*mc_no_delta_func) (int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type);
- const uint16_t *base_tab;
- const uint8_t *scale_tab;
-
- prev_dc = 0; /* init intra prediction for the DC coefficient */
-
+ int mbn, blk, num_blocks, blk_size, ret, is_intra, mc_type = 0;
+ int mv_x = 0, mv_y = 0;
+ int32_t prev_dc;
+ uint32_t cbp, quant, buf_offs;
+ IVIMbInfo *mb;
+ ivi_mc_func mc_with_delta_func, mc_no_delta_func;
+ const uint8_t *scale_tab;
+
+ /* init intra prediction for the DC coefficient */
+ prev_dc = 0;
 blk_size = band->blk_size;
- col_mask = blk_size - 1; /* column mask for tracking non-zero coeffs */
- num_blocks = (band->mb_size != blk_size) ? 4 : 1; /* number of blocks per mb */
- num_coeffs = blk_size * blk_size;
+ /* number of blocks per mb */
+ num_blocks = (band->mb_size != blk_size) ? 4 : 1;
 if (blk_size == 8) {
 mc_with_delta_func = ff_ivi_mc_8x8_delta;
 mc_no_delta_func = ff_ivi_mc_8x8_no_delta;
@@ -418,9 +598,12 @@
 cbp = mb->cbp;
 buf_offs = mb->buf_offs;
 
- quant = av_clip(band->glob_quant + mb->q_delta, 0, 23);
+ quant = band->glob_quant + mb->q_delta;
+ if (avctx->codec_id == AV_CODEC_ID_INDEO4)
+ quant = av_clip(quant, 0, 31);
+ else
+ quant = av_clip(quant, 0, 23);
 
- base_tab = is_intra ? band->intra_base : band->inter_base;
 scale_tab = is_intra ? band->intra_scale : band->inter_scale;
 if (scale_tab)
 quant = scale_tab[quant];
@@ -441,10 +624,10 @@
 cx = mb->mv_x & band->is_halfpel;
 cy = mb->mv_y & band->is_halfpel;
 
- if ( mb->xpos + dmv_x < 0
- || mb->xpos + dmv_x + band->mb_size + cx > band->pitch
- || mb->ypos + dmv_y < 0
- || mb->ypos + dmv_y + band->mb_size + cy > band->aheight) {
+ if (mb->xpos + dmv_x < 0 ||
+ mb->xpos + dmv_x + band->mb_size + cx > band->pitch ||
+ mb->ypos + dmv_y < 0 ||
+ mb->ypos + dmv_y + band->mb_size + cy > band->aheight) {
 return AVERROR_INVALIDDATA;
 }
 }
@@ -460,81 +643,25 @@
 }
 
 if (cbp & 1) { /* block coded ? */
- if (!band->scan) {
- av_log(avctx, AV_LOG_ERROR, "Scan pattern is not set.\n");
- return AVERROR_INVALIDDATA;
- }
-
- scan_pos = -1;
- memset(trvec, 0, num_coeffs*sizeof(trvec[0])); /* zero transform vector */
- memset(col_flags, 0, sizeof(col_flags)); /* zero column flags */
-
- while (scan_pos <= num_coeffs) {
- sym = get_vlc2(gb, band->blk_vlc.tab->table, IVI_VLC_BITS, 1);
- if (sym == rvmap->eob_sym)
- break; /* End of block */
-
- if (sym == rvmap->esc_sym) { /* Escape - run/val explicitly coded using 3 vlc codes */
- run = get_vlc2(gb, band->blk_vlc.tab->table, IVI_VLC_BITS, 1) + 1;
- lo = get_vlc2(gb, band->blk_vlc.tab->table, IVI_VLC_BITS, 1);
- hi = get_vlc2(gb, band->blk_vlc.tab->table, IVI_VLC_BITS, 1);
- val = IVI_TOSIGNED((hi << 6) | lo); /* merge them and convert into signed val */
- } else {
- if (sym >= 256U) {
- av_log(avctx, AV_LOG_ERROR, "Invalid sym encountered: %d.\n", sym);
- return -1;
- }
- run = rvmap->runtab[sym];
- val = rvmap->valtab[sym];
- }
-
- /* de-zigzag and dequantize */
- scan_pos += run;
- if (scan_pos >= num_coeffs)
- break;
- pos = band->scan[scan_pos];
-
- if (!val)
- av_dlog(avctx, "Val = 0 encountered!\n");
-
- q = (base_tab[pos] * quant) >> 9;
- if (q > 1)
- val = val * q + FFSIGN(val) * (((q ^ 1) - 1) >> 1);
- trvec[pos] = val;
- col_flags[pos & col_mask] |= !!val; /* track columns containing non-zero coeffs */
- }// while
-
- if (scan_pos >= num_coeffs && sym != rvmap->eob_sym)
- return -1; /* corrupt block data */
-
- /* undoing DC coeff prediction for intra-blocks */
- if (is_intra && band->is_2d_trans) {
- prev_dc += trvec[0];
- trvec[0] = prev_dc;
- col_flags[0] |= !!prev_dc;
- }
-
- /* apply inverse transform */
- band->inv_transform(trvec, band->buf + buf_offs,
- band->pitch, col_flags);
-
- /* apply motion compensation */
- if (!is_intra)
- mc_with_delta_func(band->buf + buf_offs,
- band->ref_buf + buf_offs + mv_y * band->pitch + mv_x,
- band->pitch, mc_type);
+ ret = ivi_decode_coded_blocks(gb, band, mc_with_delta_func,
+ mv_x, mv_y, &prev_dc, is_intra,
+ mc_type, quant, buf_offs, avctx);
+ if (ret < 0)
+ return ret;
 } else {
 /* block not coded */
 /* for intra blocks apply the dc slant transform */
 /* for inter - perform the motion compensation without delta */
 if (is_intra) {
- if (band->dc_transform)
- band->dc_transform(&prev_dc, band->buf + buf_offs,
- band->pitch, blk_size);
- } else
- mc_no_delta_func(band->buf + buf_offs,
- band->ref_buf + buf_offs + mv_y * band->pitch + mv_x,
- band->pitch, mc_type);
+ ret = ivi_dc_transform(band, &prev_dc, buf_offs, blk_size);
+ if (ret < 0)
+ return ret;
+ } else {
+ ret = ivi_mc(band, mc_no_delta_func, buf_offs,
+ mv_x, mv_y, mc_type);
+ if (ret < 0)
+ return ret;
+ }
 }
 
 cbp >>= 1;
@@ -559,12 +686,11 @@
 IVITile *tile, int32_t mv_scale)
 {
 int x, y, need_mc, mbn, blk, num_blocks, mv_x, mv_y, mc_type;
- int offs, mb_offset, row_offset;
+ int offs, mb_offset, row_offset, ret;
 IVIMbInfo *mb, *ref_mb;
 const int16_t *src;
 int16_t *dst;
- void (*mc_no_delta_func)(int16_t *buf, const int16_t *ref_buf, uint32_t pitch,
- int mc_type);
+ ivi_mc_func mc_no_delta_func;
 
 if (tile->num_MBs != IVI_MBs_PER_TILE(tile->width, tile->height, band->mb_size)) {
 av_log(avctx, AV_LOG_ERROR, "Allocated tile size %d mismatches "
@@ -599,7 +725,7 @@
 if (band->inherit_qdelta && ref_mb)
 mb->q_delta = ref_mb->q_delta;
 
- if (band->inherit_mv) {
+ if (band->inherit_mv && ref_mb) {
 /* motion vector inheritance */
 if (mv_scale) {
 mb->mv_x = ivi_scale_mv(ref_mb->mv_x, mv_scale);
@@ -638,9 +764,10 @@
 for (blk = 0; blk < num_blocks; blk++) {
 /* adjust block position in the buffer according with its number */
 offs = mb->buf_offs + band->blk_size * ((blk & 1) + !!(blk & 2) * band->pitch);
- mc_no_delta_func(band->buf + offs,
- band->ref_buf + offs + mv_y * band->pitch + mv_x,
- band->pitch, mc_type);
+ ret = ivi_mc(band, mc_no_delta_func, offs,
+ mv_x, mv_y, mc_type);
+ if (ret < 0)
+ return ret;
 }
 }
 } else {
@@ -774,8 +901,16 @@
 break;
 
 result = ivi_decode_blocks(&ctx->gb, band, tile, avctx);
- if (result < 0 || ((get_bits_count(&ctx->gb) - pos) >> 3) != tile->data_size) {
- av_log(avctx, AV_LOG_ERROR, "Corrupted tile data encountered!\n");
+ if (result < 0) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Corrupted tile data encountered!\n");
+ break;
+ }
+
+ if (((get_bits_count(&ctx->gb) - pos) >> 3) != tile->data_size) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Tile data_size mismatch!\n");
+ result = AVERROR_INVALIDDATA;
 break;
 }
 
@@ -783,7 +918,8 @@
 }
 }
 
- /* restore the selected rvmap table by applying its corrections in reverse order */
+ /* restore the selected rvmap table by applying its corrections in
+ * reverse order */
 for (i = band->num_corr-1; i >= 0; i--) {
 idx1 = band->corr[i*2];
 idx2 = band->corr[i*2+1];
@@ -796,7 +932,8 @@
 uint16_t chksum = ivi_calc_band_checksum(band);
 if (chksum != band->checksum) {
 av_log(avctx, AV_LOG_ERROR,
- "Band checksum mismatch! Plane %d, band %d, received: %x, calculated: %x\n",
+ "Band checksum mismatch! Plane %d, band %d, "
+ "received: %x, calculated: %x\n",
 band->plane, band->band_num, band->checksum, chksum);
 }
 }
@@ -812,6 +949,7 @@
 {
 IVI45DecContext *ctx = avctx->priv_data;
 const uint8_t *buf = avpkt->data;
+ AVFrame *frame = data;
 int buf_size = avpkt->size;
 int result, p, b;
 
@@ -823,14 +961,19 @@
 if (result) {
 av_log(avctx, AV_LOG_ERROR,
 "Error while decoding picture header: %d\n", result);
- return -1;
+ return result;
 }
 if (ctx->gop_invalid)
 return AVERROR_INVALIDDATA;
 
 if (ctx->gop_flags & IVI5_IS_PROTECTED) {
- av_log(avctx, AV_LOG_ERROR, "Password-protected clip!\n");
- return -1;
+ avpriv_report_missing_feature(avctx, "Password-protected clip!\n");
+ return AVERROR_PATCHWELCOME;
+ }
+
+ if (!ctx->planes[0].bands) {
+ av_log(avctx, AV_LOG_ERROR, "Color planes not initialized yet\n");
+ return AVERROR_INVALIDDATA;
 }
 
 ctx->switch_buffers(ctx);
@@ -841,51 +984,60 @@
 for (p = 0; p < 3; p++) {
 for (b = 0; b < ctx->planes[p].num_bands; b++) {
 result = decode_band(ctx, &ctx->planes[p].bands[b], avctx);
- if (result) {
+ if (result < 0) {
 av_log(avctx, AV_LOG_ERROR,
 "Error while decoding band: %d, plane: %d\n", b, p);
- return -1;
+ return result;
 }
 }
 }
+ } else {
+ if (ctx->is_scalable)
+ return AVERROR_INVALIDDATA;
+
+ for (p = 0; p < 3; p++) {
+ if (!ctx->planes[p].bands[0].buf)
+ return AVERROR_INVALIDDATA;
+ }
 }
 
 //STOP_TIMER("decode_planes"); }
 
- /* If the bidirectional mode is enabled, next I and the following P frame will */
- /* be sent together. Unfortunately the approach below seems to be the only way */
- /* to handle the B-frames mode. That's exactly the same Intel decoders do. */
- if (avctx->codec_id == AV_CODEC_ID_INDEO4 && ctx->frame_type == 0/*FRAMETYPE_INTRA*/) {
+ /* If the bidirectional mode is enabled, next I and the following P
+ * frame will be sent together. Unfortunately the approach below seems
+ * to be the only way to handle the B-frames mode.
+ * That's exactly the same Intel decoders do.
+ */
+ if (avctx->codec_id == AV_CODEC_ID_INDEO4 &&
+ ctx->frame_type == 0/*FRAMETYPE_INTRA*/) {
 while (get_bits(&ctx->gb, 8)); // skip version string
 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");
 }
 
- if (ctx->frame.data[0])
- avctx->release_buffer(avctx, &ctx->frame);
+ result = ff_set_dimensions(avctx, ctx->planes[0].width, ctx->planes[0].height);
+ if (result < 0)
+ return result;
 
- ctx->frame.reference = 0;
- avcodec_set_dimensions(avctx, ctx->planes[0].width, ctx->planes[0].height);
- if ((result = ff_get_buffer(avctx, &ctx->frame)) < 0) {
+ if ((result = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return result;
 }
 
 if (ctx->is_scalable) {
 if (avctx->codec_id == AV_CODEC_ID_INDEO4)
- ff_ivi_recompose_haar(&ctx->planes[0], ctx->frame.data[0], ctx->frame.linesize[0]);
+ ff_ivi_recompose_haar(&ctx->planes[0], frame->data[0], frame->linesize[0]);
 else
- ff_ivi_recompose53 (&ctx->planes[0], ctx->frame.data[0], ctx->frame.linesize[0]);
+ ff_ivi_recompose53 (&ctx->planes[0], frame->data[0], frame->linesize[0]);
 } else {
- ivi_output_plane(&ctx->planes[0], ctx->frame.data[0], ctx->frame.linesize[0]);
+ ivi_output_plane(&ctx->planes[0], frame->data[0], frame->linesize[0]);
 }
 
- ivi_output_plane(&ctx->planes[2], ctx->frame.data[1], ctx->frame.linesize[1]);
- ivi_output_plane(&ctx->planes[1], ctx->frame.data[2], ctx->frame.linesize[2]);
+ ivi_output_plane(&ctx->planes[2], frame->data[1], frame->linesize[1]);
+ ivi_output_plane(&ctx->planes[1], frame->data[2], frame->linesize[2]);
 
 *got_frame = 1;
- *(AVFrame*)data = ctx->frame;
 
 return buf_size;
 }
@@ -902,9 +1054,6 @@
 if (ctx->mb_vlc.cust_tab.table)
 ff_free_vlc(&ctx->mb_vlc.cust_tab);
 
- if (ctx->frame.data[0])
- avctx->release_buffer(avctx, &ctx->frame);
-
 #if IVI4_STREAM_ANALYSER
 if (avctx->codec_id == AV_CODEC_ID_INDEO4) {
 if (ctx->is_scalable)
@@ -927,35 +1076,6 @@
 
 
 /**
- * These are 2x8 predefined Huffman codebooks for coding macroblock/block
- * signals. They are specified using "huffman descriptors" in order to
- * avoid huge static tables. The decoding tables will be generated at
- * startup from these descriptors.
- */
-const IVIHuffDesc ff_ivi_mb_huff_desc[8] = {
- {8, {0, 4, 5, 4, 4, 4, 6, 6}},
- {12, {0, 2, 2, 3, 3, 3, 3, 5, 3, 2, 2, 2}},
- {12, {0, 2, 3, 4, 3, 3, 3, 3, 4, 3, 2, 2}},
- {12, {0, 3, 4, 4, 3, 3, 3, 3, 3, 2, 2, 2}},
- {13, {0, 4, 4, 3, 3, 3, 3, 2, 3, 3, 2, 1, 1}},
- {9, {0, 4, 4, 4, 4, 3, 3, 3, 2}},
- {10, {0, 4, 4, 4, 4, 3, 3, 2, 2, 2}},
- {12, {0, 4, 4, 4, 3, 3, 2, 3, 2, 2, 2, 2}}
-};
-
-const IVIHuffDesc ff_ivi_blk_huff_desc[8] = {
- {10, {1, 2, 3, 4, 4, 7, 5, 5, 4, 1}},
- {11, {2, 3, 4, 4, 4, 7, 5, 4, 3, 3, 2}},
- {12, {2, 4, 5, 5, 5, 5, 6, 4, 4, 3, 1, 1}},
- {13, {3, 3, 4, 4, 5, 6, 6, 4, 4, 3, 2, 1, 1}},
- {11, {3, 4, 4, 5, 5, 5, 6, 5, 4, 2, 2}},
- {13, {3, 4, 5, 5, 5, 5, 6, 4, 3, 3, 2, 1, 1}},
- {13, {3, 4, 5, 5, 5, 6, 5, 4, 3, 3, 2, 1, 1}},
- {9, {3, 4, 4, 5, 5, 5, 6, 5, 5}}
-};
-
-
-/**
 * Scan patterns shared between indeo4 and indeo5
 */
 const uint8_t ff_ivi_vertical_scan_8x8[64] = {

libav-v9.6.tar.bz2/libavcodec/ivi_common.h -> libav-v10.1.tar.bz2/libavcodec/ivi_common.h Changed

libav-v9.6.tar.bz2/libavcodec/ivi_dsp.c -> libav-v10.1.tar.bz2/libavcodec/ivi_dsp.c Changed

@@ -27,8 +27,6 @@
 */
 
 #include "avcodec.h"
-#include "dsputil.h"
-#include "dwt.h"
 #include "ivi_common.h"
 #include "ivi_dsp.h"
 
@@ -40,7 +38,7 @@
 int32_t b0_1, b0_2, b1_1, b1_2, b1_3, b2_1, b2_2, b2_3, b2_4, b2_5, b2_6;
 int32_t b3_1, b3_2, b3_3, b3_4, b3_5, b3_6, b3_7, b3_8, b3_9;
 int32_t pitch, back_pitch;
- const IDWTELEM *b0_ptr, *b1_ptr, *b2_ptr, *b3_ptr;
+ const short *b0_ptr, *b1_ptr, *b2_ptr, *b3_ptr;
 const int num_bands = 4;
 
 /* all bands should have the same pitch */
@@ -183,7 +181,7 @@
 const int dst_pitch)
 {
 int x, y, indx, b0, b1, b2, b3, p0, p1, p2, p3;
- const IDWTELEM *b0_ptr, *b1_ptr, *b2_ptr, *b3_ptr;
+ const short *b0_ptr, *b1_ptr, *b2_ptr, *b3_ptr;
 int32_t pitch;
 
 /* all bands should have the same pitch */
@@ -250,12 +248,14 @@
 d8 = COMPENSATE(t8); }
 
 /** inverse 4-point Haar transform */
-#define INV_HAAR4(s1, s3, s5, s7) {\
- HAAR_BFLY(s1, s5); HAAR_BFLY(s1, s3); HAAR_BFLY(s5, s7);\
- s1 = COMPENSATE(s1);\
- s3 = COMPENSATE(s3);\
- s5 = COMPENSATE(s5);\
- s7 = COMPENSATE(s7); }
+#define INV_HAAR4(s1, s3, s5, s7, d1, d2, d3, d4, t0, t1, t2, t3, t4) {\
+ IVI_HAAR_BFLY(s1, s3, t0, t1, t4);\
+ IVI_HAAR_BFLY(t0, s5, t2, t3, t4);\
+ d1 = COMPENSATE(t2);\
+ d2 = COMPENSATE(t3);\
+ IVI_HAAR_BFLY(t1, s7, t2, t3, t4);\
+ d3 = COMPENSATE(t2);\
+ d4 = COMPENSATE(t3); }
 
 void ff_ivi_inverse_haar_8x8(const int32_t *in, int16_t *out, uint32_t pitch,
 const uint8_t *flags)
@@ -312,6 +312,153 @@
 #undef COMPENSATE
 }
 
+void ff_ivi_row_haar8(const int32_t *in, int16_t *out, uint32_t pitch,
+ const uint8_t *flags)
+{
+ int i;
+ int t0, t1, t2, t3, t4, t5, t6, t7, t8;
+
+ /* apply the InvHaar8 to all rows */
+#define COMPENSATE(x) (x)
+ for (i = 0; i < 8; i++) {
+ if ( !in[0] && !in[1] && !in[2] && !in[3]
+ && !in[4] && !in[5] && !in[6] && !in[7]) {
+ memset(out, 0, 8 * sizeof(out[0]));
+ } else {
+ INV_HAAR8(in[0], in[1], in[2], in[3],
+ in[4], in[5], in[6], in[7],
+ out[0], out[1], out[2], out[3],
+ out[4], out[5], out[6], out[7],
+ t0, t1, t2, t3, t4, t5, t6, t7, t8);
+ }
+ in += 8;
+ out += pitch;
+ }
+#undef COMPENSATE
+}
+
+void ff_ivi_col_haar8(const int32_t *in, int16_t *out, uint32_t pitch,
+ const uint8_t *flags)
+{
+ int i;
+ int t0, t1, t2, t3, t4, t5, t6, t7, t8;
+
+ /* apply the InvHaar8 to all columns */
+#define COMPENSATE(x) (x)
+ for (i = 0; i < 8; i++) {
+ if (flags[i]) {
+ INV_HAAR8(in[ 0], in[ 8], in[16], in[24],
+ in[32], in[40], in[48], in[56],
+ out[0 * pitch], out[1 * pitch],
+ out[2 * pitch], out[3 * pitch],
+ out[4 * pitch], out[5 * pitch],
+ out[6 * pitch], out[7 * pitch],
+ t0, t1, t2, t3, t4, t5, t6, t7, t8);
+ } else
+ out[0 * pitch] = out[1 * pitch] =
+ out[2 * pitch] = out[3 * pitch] =
+ out[4 * pitch] = out[5 * pitch] =
+ out[6 * pitch] = out[7 * pitch] = 0;
+
+ in++;
+ out++;
+ }
+#undef COMPENSATE
+}
+
+void ff_ivi_inverse_haar_4x4(const int32_t *in, int16_t *out, uint32_t pitch,
+ const uint8_t *flags)
+{
+ int i, shift, sp1, sp2;
+ const int32_t *src;
+ int32_t *dst;
+ int tmp[16];
+ int t0, t1, t2, t3, t4;
+
+ /* apply the InvHaar4 to all columns */
+#define COMPENSATE(x) (x)
+ src = in;
+ dst = tmp;
+ for (i = 0; i < 4; i++) {
+ if (flags[i]) {
+ /* pre-scaling */
+ shift = !(i & 2);
+ sp1 = src[0] << shift;
+ sp2 = src[4] << shift;
+ INV_HAAR4( sp1, sp2, src[8], src[12],
+ dst[0], dst[4], dst[8], dst[12],
+ t0, t1, t2, t3, t4);
+ } else
+ dst[0] = dst[4] = dst[8] = dst[12] = 0;
+
+ src++;
+ dst++;
+ }
+#undef COMPENSATE
+
+ /* apply the InvHaar8 to all rows */
+#define COMPENSATE(x) (x)
+ src = tmp;
+ for (i = 0; i < 4; i++) {
+ if (!src[0] && !src[1] && !src[2] && !src[3]) {
+ memset(out, 0, 4 * sizeof(out[0]));
+ } else {
+ INV_HAAR4(src[0], src[1], src[2], src[3],
+ out[0], out[1], out[2], out[3],
+ t0, t1, t2, t3, t4);
+ }
+ src += 4;
+ out += pitch;
+ }
+#undef COMPENSATE
+}
+
+void ff_ivi_row_haar4(const int32_t *in, int16_t *out, uint32_t pitch,
+ const uint8_t *flags)
+{
+ int i;
+ int t0, t1, t2, t3, t4;
+
+ /* apply the InvHaar4 to all rows */
+#define COMPENSATE(x) (x)
+ for (i = 0; i < 4; i++) {
+ if (!in[0] && !in[1] && !in[2] && !in[3]) {
+ memset(out, 0, 4 * sizeof(out[0]));
+ } else {
+ INV_HAAR4(in[0], in[1], in[2], in[3],
+ out[0], out[1], out[2], out[3],
+ t0, t1, t2, t3, t4);
+ }
+ in += 4;
+ out += pitch;
+ }
+#undef COMPENSATE
+}
+
+void ff_ivi_col_haar4(const int32_t *in, int16_t *out, uint32_t pitch,
+ const uint8_t *flags)
+{
+ int i;
+ int t0, t1, t2, t3, t4;
+
+ /* apply the InvHaar8 to all columns */
+#define COMPENSATE(x) (x)
+ for (i = 0; i < 4; i++) {
+ if (flags[i]) {
+ INV_HAAR4(in[0], in[4], in[8], in[12],
+ out[0 * pitch], out[1 * pitch],
+ out[2 * pitch], out[3 * pitch],
+ t0, t1, t2, t3, t4);
+ } else
+ out[0 * pitch] = out[1 * pitch] =
+ out[2 * pitch] = out[3 * pitch] = 0;
+
+ in++;
+ out++;
+ }
+#undef COMPENSATE
+}
+
 void ff_ivi_dc_haar_2d(const int32_t *in, int16_t *out, uint32_t pitch,
 int blk_size)
 {
@@ -548,6 +695,49 @@
 }
 }
 
+void ff_ivi_row_slant4(const int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags)
+{
+ int i;
+ int t0, t1, t2, t3, t4;
+
+#define COMPENSATE(x) ((x + 1)>>1)
+ for (i = 0; i < 4; i++) {
+ if (!in[0] && !in[1] && !in[2] && !in[3]) {
+ memset(out, 0, 4*sizeof(out[0]));
+ } else {
+ IVI_INV_SLANT4( in[0], in[1], in[2], in[3],
+ out[0], out[1], out[2], out[3],
+ t0, t1, t2, t3, t4);
+ }
+ in += 4;
+ out += pitch;
+ }
+#undef COMPENSATE
+}
+
+void ff_ivi_col_slant4(const int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags)
+{
+ int i, row2;
+ int t0, t1, t2, t3, t4;
+
+ row2 = pitch << 1;
+
+#define COMPENSATE(x) ((x + 1)>>1)
+ for (i = 0; i < 4; i++) {
+ if (flags[i]) {
+ IVI_INV_SLANT4(in[0], in[4], in[8], in[12],
+ out[0], out[pitch], out[row2], out[row2 + pitch],
+ t0, t1, t2, t3, t4);
+ } else {
+ out[0] = out[pitch] = out[row2] = out[row2 + pitch] = 0;
+ }
+
+ in++;
+ out++;
+ }
+#undef COMPENSATE
+}
+
 void ff_ivi_put_pixels_8x8(const int32_t *in, int16_t *out, uint32_t pitch,
 const uint8_t *flags)
 {

libav-v9.6.tar.bz2/libavcodec/ivi_dsp.h -> libav-v10.1.tar.bz2/libavcodec/ivi_dsp.h Changed

@@ -66,6 +66,71 @@
                              const uint8_t *flags);
 
 /**
+ *  one-dimensional inverse 8-point Haar transform on rows for Indeo 4
+ *
+ *  @param[in]  in        pointer to the vector of transform coefficients
+ *  @param[out] out       pointer to the output buffer (frame)
+ *  @param[in]  pitch     pitch to move to the next y line
+ *  @param[in]  flags     pointer to the array of column flags:
+ *                        != 0 - non_empty column, 0 - empty one
+ *                        (this array must be filled by caller)
+ */
+void ff_ivi_row_haar8(const int32_t *in, int16_t *out, uint32_t pitch,
+                      const uint8_t *flags);
+
+/**
+ *  one-dimensional inverse 8-point Haar transform on columns for Indeo 4
+ *
+ *  @param[in]  in        pointer to the vector of transform coefficients
+ *  @param[out] out       pointer to the output buffer (frame)
+ *  @param[in]  pitch     pitch to move to the next y line
+ *  @param[in]  flags     pointer to the array of column flags:
+ *                        != 0 - non_empty column, 0 - empty one
+ *                        (this array must be filled by caller)
+ */
+void ff_ivi_col_haar8(const int32_t *in, int16_t *out, uint32_t pitch,
+                      const uint8_t *flags);
+
+/**
+ *  two-dimensional inverse Haar 4x4 transform for Indeo 4
+ *
+ *  @param[in]  in        pointer to the vector of transform coefficients
+ *  @param[out] out       pointer to the output buffer (frame)
+ *  @param[in]  pitch     pitch to move to the next y line
+ *  @param[in]  flags     pointer to the array of column flags:
+ *                        != 0 - non_empty column, 0 - empty one
+ *                        (this array must be filled by caller)
+ */
+void ff_ivi_inverse_haar_4x4(const int32_t *in, int16_t *out, uint32_t pitch,
+                             const uint8_t *flags);
+
+/**
+ *  one-dimensional inverse 4-point Haar transform on rows for Indeo 4
+ *
+ *  @param[in]  in        pointer to the vector of transform coefficients
+ *  @param[out] out       pointer to the output buffer (frame)
+ *  @param[in]  pitch     pitch to move to the next y line
+ *  @param[in]  flags     pointer to the array of column flags:
+ *                        != 0 - non_empty column, 0 - empty one
+ *                        (this array must be filled by caller)
+ */
+void ff_ivi_row_haar4(const int32_t *in, int16_t *out, uint32_t pitch,
+                      const uint8_t *flags);
+
+/**
+ *  one-dimensional inverse 4-point Haar transform on columns for Indeo 4
+ *
+ *  @param[in]  in        pointer to the vector of transform coefficients
+ *  @param[out] out       pointer to the output buffer (frame)
+ *  @param[in]  pitch     pitch to move to the next y line
+ *  @param[in]  flags     pointer to the array of column flags:
+ *                        != 0 - non_empty column, 0 - empty one
+ *                        (this array must be filled by caller)
+ */
+void ff_ivi_col_haar4(const int32_t *in, int16_t *out, uint32_t pitch,
+                      const uint8_t *flags);
+
+/**
  *  DC-only two-dimensional inverse Haar transform for Indeo 4.
  *  Performing the inverse transform in this case is equivalent to
  *  spreading DC_coeff >> 3 over the whole block.
@@ -142,6 +207,30 @@
                        const uint8_t *flags);
 
 /**
+ *  inverse 1D row slant transform
+ *
+ *  @param[in]    in      pointer to the vector of transform coefficients
+ *  @param[out]   out     pointer to the output buffer (frame)
+ *  @param[in]    pitch   pitch to move to the next y line
+ *  @param[in]    flags   pointer to the array of column flags (unused here)
+ */
+void ff_ivi_row_slant4(const int32_t *in, int16_t *out, uint32_t pitch,
+                       const uint8_t *flags);
+
+/**
+ *  inverse 1D column slant transform
+ *
+ *  @param[in]    in      pointer to the vector of transform coefficients
+ *  @param[out]   out     pointer to the output buffer (frame)
+ *  @param[in]    pitch   pitch to move to the next y line
+ *  @param[in]    flags   pointer to the array of column flags:
+ *                        != 0 - non_empty column, 0 - empty one
+ *                        (this array must be filled by caller)
+ */
+void ff_ivi_col_slant4(const int32_t *in, int16_t *out, uint32_t pitch,
+                       const uint8_t *flags);
+
+/**
  *  DC-only inverse row slant transform
  */
 void ff_ivi_dc_row_slant(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size);

libav-v9.6.tar.bz2/libavcodec/jfdctfst.c -> libav-v10.1.tar.bz2/libavcodec/jfdctfst.c Changed

@@ -69,7 +69,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "libavutil/common.h"
-#include "dsputil.h"
+#include "dct.h"
 
 #define DCTSIZE 8
 #define GLOBAL(x) x
@@ -136,17 +136,17 @@
 #endif
 
 
-/* Multiply a DCTELEM variable by an int32_t constant, and immediately
- * descale to yield a DCTELEM result.
+/* Multiply a int16_t variable by an int32_t constant, and immediately
+ * descale to yield a int16_t result.
 */
 
-#define MULTIPLY(var,const) ((DCTELEM) DESCALE((var) * (const), CONST_BITS))
+#define MULTIPLY(var,const) ((int16_t) DESCALE((var) * (const), CONST_BITS))
 
-static av_always_inline void row_fdct(DCTELEM * data){
+static av_always_inline void row_fdct(int16_t * data){
 int tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
 int tmp10, tmp11, tmp12, tmp13;
 int z1, z2, z3, z4, z5, z11, z13;
- DCTELEM *dataptr;
+ int16_t *dataptr;
 int ctr;
 
 /* Pass 1: process rows. */
@@ -205,12 +205,12 @@
 */
 
 GLOBAL(void)
-ff_fdct_ifast (DCTELEM * data)
+ff_fdct_ifast (int16_t * data)
 {
 int tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
 int tmp10, tmp11, tmp12, tmp13;
 int z1, z2, z3, z4, z5, z11, z13;
- DCTELEM *dataptr;
+ int16_t *dataptr;
 int ctr;
 
 row_fdct(data);
@@ -271,12 +271,12 @@
 */
 
 GLOBAL(void)
-ff_fdct_ifast248 (DCTELEM * data)
+ff_fdct_ifast248 (int16_t * data)
 {
 int tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
 int tmp10, tmp11, tmp12, tmp13;
 int z1;
- DCTELEM *dataptr;
+ int16_t *dataptr;
 int ctr;
 
 row_fdct(data);

libav-v9.6.tar.bz2/libavcodec/jfdctint_template.c -> libav-v10.1.tar.bz2/libavcodec/jfdctint_template.c Changed

@@ -60,7 +60,7 @@
 */
 
 #include "libavutil/common.h"
-#include "dsputil.h"
+#include "dct.h"
 
 #include "bit_depth_template.c"
 
@@ -184,12 +184,12 @@
 #endif
 
 
-static av_always_inline void FUNC(row_fdct)(DCTELEM *data)
+static av_always_inline void FUNC(row_fdct)(int16_t *data)
 {
 int tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
 int tmp10, tmp11, tmp12, tmp13;
 int z1, z2, z3, z4, z5;
- DCTELEM *dataptr;
+ int16_t *dataptr;
 int ctr;
 
 /* Pass 1: process rows. */
@@ -216,13 +216,13 @@
 tmp11 = tmp1 + tmp2;
 tmp12 = tmp1 - tmp2;
 
- dataptr[0] = (DCTELEM) ((tmp10 + tmp11) << PASS1_BITS);
- dataptr[4] = (DCTELEM) ((tmp10 - tmp11) << PASS1_BITS);
+ dataptr[0] = (int16_t) ((tmp10 + tmp11) << PASS1_BITS);
+ dataptr[4] = (int16_t) ((tmp10 - tmp11) << PASS1_BITS);
 
 z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);
- dataptr[2] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp13, FIX_0_765366865),
+ dataptr[2] = (int16_t) DESCALE(z1 + MULTIPLY(tmp13, FIX_0_765366865),
 CONST_BITS-PASS1_BITS);
- dataptr[6] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp12, - FIX_1_847759065),
+ dataptr[6] = (int16_t) DESCALE(z1 + MULTIPLY(tmp12, - FIX_1_847759065),
 CONST_BITS-PASS1_BITS);
 
 /* Odd part per figure 8 --- note paper omits factor of sqrt(2).
@@ -248,10 +248,10 @@
 z3 += z5;
 z4 += z5;
 
- dataptr[7] = (DCTELEM) DESCALE(tmp4 + z1 + z3, CONST_BITS-PASS1_BITS);
- dataptr[5] = (DCTELEM) DESCALE(tmp5 + z2 + z4, CONST_BITS-PASS1_BITS);
- dataptr[3] = (DCTELEM) DESCALE(tmp6 + z2 + z3, CONST_BITS-PASS1_BITS);
- dataptr[1] = (DCTELEM) DESCALE(tmp7 + z1 + z4, CONST_BITS-PASS1_BITS);
+ dataptr[7] = (int16_t) DESCALE(tmp4 + z1 + z3, CONST_BITS-PASS1_BITS);
+ dataptr[5] = (int16_t) DESCALE(tmp5 + z2 + z4, CONST_BITS-PASS1_BITS);
+ dataptr[3] = (int16_t) DESCALE(tmp6 + z2 + z3, CONST_BITS-PASS1_BITS);
+ dataptr[1] = (int16_t) DESCALE(tmp7 + z1 + z4, CONST_BITS-PASS1_BITS);
 
 dataptr += DCTSIZE; /* advance pointer to next row */
 }
@@ -262,12 +262,12 @@
 */
 
 GLOBAL(void)
-FUNC(ff_jpeg_fdct_islow)(DCTELEM *data)
+FUNC(ff_jpeg_fdct_islow)(int16_t *data)
 {
 int tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
 int tmp10, tmp11, tmp12, tmp13;
 int z1, z2, z3, z4, z5;
- DCTELEM *dataptr;
+ int16_t *dataptr;
 int ctr;
 
 FUNC(row_fdct)(data);
@@ -344,12 +344,12 @@
 * you do even part two times.
 */
 GLOBAL(void)
-FUNC(ff_fdct248_islow)(DCTELEM *data)
+FUNC(ff_fdct248_islow)(int16_t *data)
 {
 int tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
 int tmp10, tmp11, tmp12, tmp13;
 int z1;
- DCTELEM *dataptr;
+ int16_t *dataptr;
 int ctr;
 
 FUNC(row_fdct)(data);

libav-v10.1.tar.bz2/libavcodec/jpeg2000.c Added

@@ -0,0 +1,510 @@
+/*
+ * JPEG 2000 encoder and decoder common functions
+ * Copyright (c) 2007 Kamil Nowosad
+ * Copyright (c) 2013 Nicolas Bertrand <nicoinattendu@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * JPEG 2000 image encoder and decoder common functions
+ */
+
+#include "libavutil/common.h"
+#include "libavutil/mem.h"
+#include "avcodec.h"
+#include "jpeg2000.h"
+
+#define SHL(a, n) ((n) >= 0 ? (a) << (n) : (a) >> -(n))
+
+/* tag tree routines */
+
+/* allocate the memory for tag tree */
+static int32_t tag_tree_size(uint16_t w, uint16_t h)
+{
+ uint32_t res = 0;
+ while (w > 1 || h > 1) {
+ res += w * h;
+ if (res + 1 >= INT32_MAX)
+ return -1;
+ w = (w + 1) >> 1;
+ h = (h + 1) >> 1;
+ }
+ return (int32_t)(res + 1);
+}
+
+static Jpeg2000TgtNode *ff_jpeg2000_tag_tree_init(int w, int h)
+{
+ int pw = w, ph = h;
+ Jpeg2000TgtNode *res, *t, *t2;
+ int32_t tt_size;
+
+ tt_size = tag_tree_size(w, h);
+ if (tt_size == -1)
+ return NULL;
+
+ t = res = av_mallocz_array(tt_size, sizeof(*t));
+ if (!res)
+ return NULL;
+
+ while (w > 1 || h > 1) {
+ int i, j;
+ pw = w;
+ ph = h;
+
+ w = (w + 1) >> 1;
+ h = (h + 1) >> 1;
+ t2 = t + pw * ph;
+
+ for (i = 0; i < ph; i++)
+ for (j = 0; j < pw; j++)
+ t[i * pw + j].parent = &t2[(i >> 1) * w + (j >> 1)];
+
+ t = t2;
+ }
+ t[0].parent = NULL;
+ return res;
+}
+
+uint8_t ff_jpeg2000_sigctxno_lut[256][4];
+
+static int getsigctxno(int flag, int bandno)
+{
+ int h, v, d;
+
+ h = ((flag & JPEG2000_T1_SIG_E) ? 1 : 0) +
+ ((flag & JPEG2000_T1_SIG_W) ? 1 : 0);
+ v = ((flag & JPEG2000_T1_SIG_N) ? 1 : 0) +
+ ((flag & JPEG2000_T1_SIG_S) ? 1 : 0);
+ d = ((flag & JPEG2000_T1_SIG_NE) ? 1 : 0) +
+ ((flag & JPEG2000_T1_SIG_NW) ? 1 : 0) +
+ ((flag & JPEG2000_T1_SIG_SE) ? 1 : 0) +
+ ((flag & JPEG2000_T1_SIG_SW) ? 1 : 0);
+ if (bandno < 3) {
+ if (bandno == 1)
+ FFSWAP(int, h, v);
+ if (h == 2)
+ return 8;
+ if (h == 1) {
+ if (v >= 1)
+ return 7;
+ if (d >= 1)
+ return 6;
+ return 5;
+ }
+ if (v == 2)
+ return 4;
+ if (v == 1)
+ return 3;
+ if (d >= 2)
+ return 2;
+ if (d == 1)
+ return 1;
+ } else {
+ if (d >= 3)
+ return 8;
+ if (d == 2) {
+ if (h + v >= 1)
+ return 7;
+ return 6;
+ }
+ if (d == 1) {
+ if (h + v >= 2)
+ return 5;
+ if (h + v == 1)
+ return 4;
+ return 3;
+ }
+ if (h + v >= 2)
+ return 2;
+ if (h + v == 1)
+ return 1;
+ }
+ return 0;
+}
+
+uint8_t ff_jpeg2000_sgnctxno_lut[16][16], ff_jpeg2000_xorbit_lut[16][16];
+
+static const int contribtab[3][3] = { { 0, -1, 1 }, { -1, -1, 0 }, { 1, 0, 1 } };
+static const int ctxlbltab[3][3] = { { 13, 12, 11 }, { 10, 9, 10 }, { 11, 12, 13 } };
+static const int xorbittab[3][3] = { { 1, 1, 1 }, { 1, 0, 0 }, { 0, 0, 0 } };
+
+static int getsgnctxno(int flag, uint8_t *xorbit)
+{
+ int vcontrib, hcontrib;
+
+ hcontrib = contribtab[flag & JPEG2000_T1_SIG_E ? flag & JPEG2000_T1_SGN_E ? 1 : 2 : 0]
+ [flag & JPEG2000_T1_SIG_W ? flag & JPEG2000_T1_SGN_W ? 1 : 2 : 0] + 1;
+ vcontrib = contribtab[flag & JPEG2000_T1_SIG_S ? flag & JPEG2000_T1_SGN_S ? 1 : 2 : 0]
+ [flag & JPEG2000_T1_SIG_N ? flag & JPEG2000_T1_SGN_N ? 1 : 2 : 0] + 1;
+ *xorbit = xorbittab[hcontrib][vcontrib];
+
+ return ctxlbltab[hcontrib][vcontrib];
+}
+
+void ff_jpeg2000_init_tier1_luts(void)
+{
+ int i, j;
+ for (i = 0; i < 256; i++)
+ for (j = 0; j < 4; j++)
+ ff_jpeg2000_sigctxno_lut[i][j] = getsigctxno(i, j);
+ for (i = 0; i < 16; i++)
+ for (j = 0; j < 16; j++)
+ ff_jpeg2000_sgnctxno_lut[i][j] =
+ getsgnctxno(i + (j << 8), &ff_jpeg2000_xorbit_lut[i][j]);
+}
+
+void ff_jpeg2000_set_significance(Jpeg2000T1Context *t1, int x, int y,
+ int negative)
+{
+ x++;
+ y++;
+ t1->flags[y][x] |= JPEG2000_T1_SIG;
+ if (negative) {
+ t1->flags[y][x + 1] |= JPEG2000_T1_SIG_W | JPEG2000_T1_SGN_W;
+ t1->flags[y][x - 1] |= JPEG2000_T1_SIG_E | JPEG2000_T1_SGN_E;
+ t1->flags[y + 1][x] |= JPEG2000_T1_SIG_N | JPEG2000_T1_SGN_N;
+ t1->flags[y - 1][x] |= JPEG2000_T1_SIG_S | JPEG2000_T1_SGN_S;
+ } else {
+ t1->flags[y][x + 1] |= JPEG2000_T1_SIG_W;
+ t1->flags[y][x - 1] |= JPEG2000_T1_SIG_E;
+ t1->flags[y + 1][x] |= JPEG2000_T1_SIG_N;
+ t1->flags[y - 1][x] |= JPEG2000_T1_SIG_S;
+ }
+ t1->flags[y + 1][x + 1] |= JPEG2000_T1_SIG_NW;
+ t1->flags[y + 1][x - 1] |= JPEG2000_T1_SIG_NE;
+ t1->flags[y - 1][x + 1] |= JPEG2000_T1_SIG_SW;
+ t1->flags[y - 1][x - 1] |= JPEG2000_T1_SIG_SE;
+}
+
+static const uint8_t lut_gain[2][4] = { { 0, 0, 0, 0 }, { 0, 1, 1, 2 } };
+
+int ff_jpeg2000_init_component(Jpeg2000Component *comp,
+ Jpeg2000CodingStyle *codsty,
+ Jpeg2000QuantStyle *qntsty,
+ int cbps, int dx, int dy,
+ AVCodecContext *avctx)
+{
+ uint8_t log2_band_prec_width, log2_band_prec_height;
+ int reslevelno, bandno, gbandno = 0, ret, i, j;
+ uint32_t csize;
+
+ if (!codsty->nreslevels2decode) {
+ av_log(avctx, AV_LOG_ERROR, "nreslevels2decode uninitialized\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (ret = ff_jpeg2000_dwt_init(&comp->dwt, comp->coord,
+ codsty->nreslevels2decode - 1,
+ codsty->transform))
+ return ret;
+ // component size comp->coord is uint16_t so ir cannot overflow
+ csize = (comp->coord[0][1] - comp->coord[0][0]) *
+ (comp->coord[1][1] - comp->coord[1][0]);
+
+ if (codsty->transform == FF_DWT97) {
+ comp->i_data = NULL;
+ comp->f_data = av_malloc_array(csize, sizeof(*comp->f_data));
+ if (!comp->f_data)
+ return AVERROR(ENOMEM);
+ } else {
+ comp->f_data = NULL;
+ comp->i_data = av_malloc_array(csize, sizeof(*comp->i_data));
+ if (!comp->i_data)
+ return AVERROR(ENOMEM);
+ }
+ comp->reslevel = av_malloc_array(codsty->nreslevels, sizeof(*comp->reslevel));
+ if (!comp->reslevel)
+ return AVERROR(ENOMEM);
+ /* LOOP on resolution levels */
+ for (reslevelno = 0; reslevelno < codsty->nreslevels; reslevelno++) {
+ int declvl = codsty->nreslevels - reslevelno; // N_L -r see ISO/IEC 15444-1:2002 B.5
+ Jpeg2000ResLevel *reslevel = comp->reslevel + reslevelno;
+
+ /* Compute borders for each resolution level.
+ * Computation of trx_0, trx_1, try_0 and try_1.
+ * see ISO/IEC 15444-1:2002 eq. B.5 and B-14 */
+ for (i = 0; i < 2; i++)
+ for (j = 0; j < 2; j++)
+ reslevel->coord[i][j] =
+ ff_jpeg2000_ceildivpow2(comp->coord_o[i][j], declvl - 1);
+ // update precincts size: 2^n value
+ reslevel->log2_prec_width = codsty->log2_prec_widths[reslevelno];
+ reslevel->log2_prec_height = codsty->log2_prec_heights[reslevelno];
+
+ /* Number of bands for each resolution level */
+ if (reslevelno == 0)
+ reslevel->nbands = 1;
+ else
+ reslevel->nbands = 3;
+
+ /* Number of precincts wich span the tile for resolution level reslevelno
+ * see B.6 in ISO/IEC 15444-1:2002 eq. B-16
+ * num_precincts_x = |- trx_1 / 2 ^ log2_prec_width) -| - (trx_0 / 2 ^ log2_prec_width)
+ * num_precincts_y = |- try_1 / 2 ^ log2_prec_width) -| - (try_0 / 2 ^ log2_prec_width)
+ * for Dcinema profiles in JPEG 2000
+ * num_precincts_x = |- trx_1 / 2 ^ log2_prec_width) -|
+ * num_precincts_y = |- try_1 / 2 ^ log2_prec_width) -| */
+ if (reslevel->coord[0][1] == reslevel->coord[0][0])
+ reslevel->num_precincts_x = 0;
+ else
+ reslevel->num_precincts_x =
+ ff_jpeg2000_ceildivpow2(reslevel->coord[0][1],
+ reslevel->log2_prec_width) -
+ (reslevel->coord[0][0] >> reslevel->log2_prec_width);
+
+ if (reslevel->coord[1][1] == reslevel->coord[1][0])
+ reslevel->num_precincts_y = 0;
+ else
+ reslevel->num_precincts_y =
+ ff_jpeg2000_ceildivpow2(reslevel->coord[1][1],
+ reslevel->log2_prec_height) -
+ (reslevel->coord[1][0] >> reslevel->log2_prec_height);
+
+ reslevel->band = av_malloc_array(reslevel->nbands, sizeof(*reslevel->band));
+ if (!reslevel->band)
+ return AVERROR(ENOMEM);
+
+ for (bandno = 0; bandno < reslevel->nbands; bandno++, gbandno++) {
+ Jpeg2000Band *band = reslevel->band + bandno;
+ int cblkno, precno;
+ int nb_precincts;
+
+ /* TODO: Implementation of quantization step not finished,
+ * see ISO/IEC 15444-1:2002 E.1 and A.6.4. */
+ switch (qntsty->quantsty) {
+ uint8_t gain;
+ int numbps;
+ case JPEG2000_QSTY_NONE:
+ /* TODO: to verify. No quantization in this case */
+ band->f_stepsize = 1;
+ break;
+ case JPEG2000_QSTY_SI:
+ /*TODO: Compute formula to implement. */
+ numbps = cbps +
+ lut_gain[codsty->transform == FF_DWT53][bandno + (reslevelno > 0)];
+ band->f_stepsize = SHL(2048 + qntsty->mant[gbandno],
+ 2 + numbps - qntsty->expn[gbandno]);
+ break;
+ case JPEG2000_QSTY_SE:
+ /* Exponent quantization step.
+ * Formula:
+ * delta_b = 2 ^ (R_b - expn_b) * (1 + (mant_b / 2 ^ 11))
+ * R_b = R_I + log2 (gain_b )
+ * see ISO/IEC 15444-1:2002 E.1.1 eqn. E-3 and E-4 */
+ /* TODO/WARN: value of log2 (gain_b ) not taken into account
+ * but it works (compared to OpenJPEG). Why?
+ * Further investigation needed. */
+ gain = cbps;
+ band->f_stepsize = pow(2.0, gain - qntsty->expn[gbandno]);
+ band->f_stepsize *= qntsty->mant[gbandno] / 2048.0 + 1.0;
+ break;
+ default:
+ band->f_stepsize = 0;
+ av_log(avctx, AV_LOG_ERROR, "Unknown quantization format\n");
+ break;
+ }
+ /* FIXME: In openjepg code stespize = stepsize * 0.5. Why?
+ * If not set output of entropic decoder is not correct. */
+ if (!av_codec_is_encoder(avctx->codec))
+ band->f_stepsize *= 0.5;
+
+ band->i_stepsize = band->f_stepsize * (1 << 16);
+
+ /* computation of tbx_0, tbx_1, tby_0, tby_1
+ * see ISO/IEC 15444-1:2002 B.5 eq. B-15 and tbl B.1
+ * codeblock width and height is computed for
+ * DCI JPEG 2000 codeblock_width = codeblock_width = 32 = 2 ^ 5 */
+ if (reslevelno == 0) {
+ /* for reslevelno = 0, only one band, x0_b = y0_b = 0 */
+ for (i = 0; i < 2; i++)
+ for (j = 0; j < 2; j++)
+ band->coord[i][j] =
+ ff_jpeg2000_ceildivpow2(comp->coord_o[i][j] - comp->coord_o[i][0],
+ declvl - 1);
+ log2_band_prec_width = reslevel->log2_prec_width;
+ log2_band_prec_height = reslevel->log2_prec_height;
+ /* see ISO/IEC 15444-1:2002 eq. B-17 and eq. B-15 */
+ band->log2_cblk_width = FFMIN(codsty->log2_cblk_width,
+ reslevel->log2_prec_width);
+ band->log2_cblk_height = FFMIN(codsty->log2_cblk_height,
+ reslevel->log2_prec_height);
+ } else {
+ /* 3 bands x0_b = 1 y0_b = 0; x0_b = 0 y0_b = 1; x0_b = y0_b = 1 */
+ /* x0_b and y0_b are computed with ((bandno + 1 >> i) & 1) */
+ for (i = 0; i < 2; i++)
+ for (j = 0; j < 2; j++)
+ /* Formula example for tbx_0 = ceildiv((tcx_0 - 2 ^ (declvl - 1) * x0_b) / declvl) */
+ band->coord[i][j] =
+ ff_jpeg2000_ceildivpow2(comp->coord_o[i][j] - comp->coord_o[i][0] -
+ (((bandno + 1 >> i) & 1) << declvl - 1),
+ declvl);
+ /* TODO: Manage case of 3 band offsets here or
+ * in coding/decoding function? */
+
+ /* see ISO/IEC 15444-1:2002 eq. B-17 and eq. B-15 */
+ band->log2_cblk_width = FFMIN(codsty->log2_cblk_width,
+ reslevel->log2_prec_width - 1);
+ band->log2_cblk_height = FFMIN(codsty->log2_cblk_height,
+ reslevel->log2_prec_height - 1);
+
+ log2_band_prec_width = reslevel->log2_prec_width - 1;
+ log2_band_prec_height = reslevel->log2_prec_height - 1;
+ }
+
+ for (j = 0; j < 2; j++)
+ band->coord[0][j] = ff_jpeg2000_ceildiv(band->coord[0][j], dx);
+ for (j = 0; j < 2; j++)
+ band->coord[1][j] = ff_jpeg2000_ceildiv(band->coord[1][j], dy);
+
+ band->prec = av_malloc_array(reslevel->num_precincts_x *
+ reslevel->num_precincts_y,
+ sizeof(*band->prec));
+ if (!band->prec)
+ return AVERROR(ENOMEM);
+
+ nb_precincts = reslevel->num_precincts_x * reslevel->num_precincts_y;
+
+ for (precno = 0; precno < nb_precincts; precno++) {
+ Jpeg2000Prec *prec = band->prec + precno;
+
+ /* TODO: Explain formula for JPEG200 DCINEMA. */
+ /* TODO: Verify with previous count of codeblocks per band */
+
+ /* Compute P_x0 */
+ prec->coord[0][0] = (precno % reslevel->num_precincts_x) *
+ (1 << log2_band_prec_width);
+ prec->coord[0][0] = FFMAX(prec->coord[0][0], band->coord[0][0]);
+
+ /* Compute P_y0 */
+ prec->coord[1][0] = (precno / reslevel->num_precincts_x) *
+ (1 << log2_band_prec_height);
+ prec->coord[1][0] = FFMAX(prec->coord[1][0], band->coord[1][0]);
+
+ /* Compute P_x1 */
+ prec->coord[0][1] = prec->coord[0][0] +
+ (1 << log2_band_prec_width);
+ prec->coord[0][1] = FFMIN(prec->coord[0][1], band->coord[0][1]);
+
+ /* Compute P_y1 */
+ prec->coord[1][1] = prec->coord[1][0] +
+ (1 << log2_band_prec_height);
+ prec->coord[1][1] = FFMIN(prec->coord[1][1], band->coord[1][1]);
+
+ prec->nb_codeblocks_width =
+ ff_jpeg2000_ceildivpow2(prec->coord[0][1] -
+ prec->coord[0][0],
+ band->log2_cblk_width);
+ prec->nb_codeblocks_height =
+ ff_jpeg2000_ceildivpow2(prec->coord[1][1] -
+ prec->coord[1][0],
+ band->log2_cblk_height);
+
+ /* Tag trees initialization */
+ prec->cblkincl =
+ ff_jpeg2000_tag_tree_init(prec->nb_codeblocks_width,
+ prec->nb_codeblocks_height);
+ if (!prec->cblkincl)
+ return AVERROR(ENOMEM);
+
+ prec->zerobits =
+ ff_jpeg2000_tag_tree_init(prec->nb_codeblocks_width,
+ prec->nb_codeblocks_height);
+ if (!prec->zerobits)
+ return AVERROR(ENOMEM);
+
+ prec->cblk = av_mallocz_array(prec->nb_codeblocks_width *
+ prec->nb_codeblocks_height,
+ sizeof(*prec->cblk));
+ if (!prec->cblk)
+ return AVERROR(ENOMEM);
+ for (cblkno = 0; cblkno < prec->nb_codeblocks_width * prec->nb_codeblocks_height; cblkno++) {
+ Jpeg2000Cblk *cblk = prec->cblk + cblkno;
+ uint16_t Cx0, Cy0;
+
+ /* Compute coordinates of codeblocks */
+ /* Compute Cx0*/
+ Cx0 = (prec->coord[0][0] >> band->log2_cblk_width) << band->log2_cblk_width;
+ Cx0 = Cx0 + ((cblkno % prec->nb_codeblocks_width) << band->log2_cblk_width);
+ cblk->coord[0][0] = FFMAX(Cx0, prec->coord[0][0]);
+
+ /* Compute Cy0*/
+ Cy0 = (prec->coord[1][0] >> band->log2_cblk_height) << band->log2_cblk_height;
+ Cy0 = Cy0 + ((cblkno / prec->nb_codeblocks_width) << band->log2_cblk_height);
+ cblk->coord[1][0] = FFMAX(Cy0, prec->coord[1][0]);
+
+ /* Compute Cx1 */
+ cblk->coord[0][1] = FFMIN(Cx0 + (1 << band->log2_cblk_width),
+ prec->coord[0][1]);
+
+ /* Compute Cy1 */
+ cblk->coord[1][1] = FFMIN(Cy0 + (1 << band->log2_cblk_height),
+ prec->coord[1][1]);
+ /* Update code-blocks coordinates according sub-band position */
+ if ((bandno + !!reslevelno) & 1) {
+ cblk->coord[0][0] += comp->reslevel[reslevelno-1].coord[0][1] -
+ comp->reslevel[reslevelno-1].coord[0][0];
+ cblk->coord[0][1] += comp->reslevel[reslevelno-1].coord[0][1] -
+ comp->reslevel[reslevelno-1].coord[0][0];
+ }
+ if ((bandno + !!reslevelno) & 2) {
+ cblk->coord[1][0] += comp->reslevel[reslevelno-1].coord[1][1] -
+ comp->reslevel[reslevelno-1].coord[1][0];
+ cblk->coord[1][1] += comp->reslevel[reslevelno-1].coord[1][1] -
+ comp->reslevel[reslevelno-1].coord[1][0];
+ }
+
+ cblk->zero = 0;
+ cblk->lblock = 3;
+ cblk->length = 0;
+ cblk->lengthinc = 0;
+ cblk->npasses = 0;
+ }
+ }
+ }
+ }
+ return 0;
+}
+
+void ff_jpeg2000_cleanup(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty)
+{
+ int reslevelno, bandno, precno;
+ for (reslevelno = 0;
+ comp->reslevel && reslevelno < codsty->nreslevels;
+ reslevelno++) {
+ Jpeg2000ResLevel *reslevel = comp->reslevel + reslevelno;
+
+ for (bandno = 0; bandno < reslevel->nbands; bandno++) {
+ Jpeg2000Band *band = reslevel->band + bandno;
+ for (precno = 0; precno < reslevel->num_precincts_x * reslevel->num_precincts_y; precno++) {
+ Jpeg2000Prec *prec = band->prec + precno;
+ av_freep(&prec->zerobits);
+ av_freep(&prec->cblkincl);
+ av_freep(&prec->cblk);
+ }
+
+ av_freep(&band->prec);
+ }
+ av_freep(&reslevel->band);
+ }
+
+ ff_dwt_destroy(&comp->dwt);
+ av_freep(&comp->reslevel);
+ av_freep(&comp->i_data);
+ av_freep(&comp->f_data);
+}

libav-v10.1.tar.bz2/libavcodec/jpeg2000.h Added

@@ -0,0 +1,257 @@
+/*
+ * JPEG 2000 common defines, structures and functions
+ * Copyright (c) 2007 Kamil Nowosad
+ * Copyright (c) 2013 Nicolas Bertrand <nicoinattendu@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_JPEG2000_H
+#define AVCODEC_JPEG2000_H
+
+/**
+ * @file
+ * JPEG 2000 structures and defines common
+ * to encoder and decoder
+ */
+
+#include <stdint.h>
+
+#include "avcodec.h"
+#include "mqc.h"
+#include "jpeg2000dwt.h"
+
+enum Jpeg2000Markers {
+ JPEG2000_SOC = 0xff4f, // start of codestream
+ JPEG2000_SIZ = 0xff51, // image and tile size
+ JPEG2000_COD, // coding style default
+ JPEG2000_COC, // coding style component
+ JPEG2000_TLM = 0xff55, // packed packet headers, tile-part header
+ JPEG2000_PLM = 0xff57, // tile-part lengths
+ JPEG2000_PLT, // packet length, main header
+ JPEG2000_QCD = 0xff5c, // quantization default
+ JPEG2000_QCC, // quantization component
+ JPEG2000_RGN, // region of interest
+ JPEG2000_POC, // progression order change
+ JPEG2000_PPM, // packet length, tile-part header
+ JPEG2000_PPT, // packed packet headers, main header
+ JPEG2000_CRG = 0xff63, // component registration
+ JPEG2000_COM, // comment
+ JPEG2000_SOT = 0xff90, // start of tile-part
+ JPEG2000_SOP, // start of packet
+ JPEG2000_EPH, // end of packet header
+ JPEG2000_SOD, // start of data
+ JPEG2000_EOC = 0xffd9, // end of codestream
+};
+
+enum Jpeg2000Quantsty { // quantization style
+ JPEG2000_QSTY_NONE, // no quantization
+ JPEG2000_QSTY_SI, // scalar derived
+ JPEG2000_QSTY_SE // scalar expounded
+};
+
+#define JPEG2000_MAX_CBLKW 64
+#define JPEG2000_MAX_CBLKH 64
+
+
+#define JPEG2000_MAX_DECLEVELS 32
+#define JPEG2000_MAX_RESLEVELS (JPEG2000_MAX_DECLEVELS + 1)
+
+// T1 flags
+// flags determining significance of neighbor coefficients
+#define JPEG2000_T1_SIG_N 0x0001
+#define JPEG2000_T1_SIG_E 0x0002
+#define JPEG2000_T1_SIG_W 0x0004
+#define JPEG2000_T1_SIG_S 0x0008
+#define JPEG2000_T1_SIG_NE 0x0010
+#define JPEG2000_T1_SIG_NW 0x0020
+#define JPEG2000_T1_SIG_SE 0x0040
+#define JPEG2000_T1_SIG_SW 0x0080
+#define JPEG2000_T1_SIG_NB (JPEG2000_T1_SIG_N | JPEG2000_T1_SIG_E | \
+ JPEG2000_T1_SIG_S | JPEG2000_T1_SIG_W | \
+ JPEG2000_T1_SIG_NE | JPEG2000_T1_SIG_NW | \
+ JPEG2000_T1_SIG_SE | JPEG2000_T1_SIG_SW)
+// flags determining sign bit of neighbor coefficients
+#define JPEG2000_T1_SGN_N 0x0100
+#define JPEG2000_T1_SGN_S 0x0200
+#define JPEG2000_T1_SGN_W 0x0400
+#define JPEG2000_T1_SGN_E 0x0800
+
+#define JPEG2000_T1_VIS 0x1000
+#define JPEG2000_T1_SIG 0x2000
+#define JPEG2000_T1_REF 0x4000
+
+#define JPEG2000_T1_SGN 0x8000
+
+// Codeblock coding styles
+#define JPEG2000_CBLK_BYPASS 0x01 // Selective arithmetic coding bypass
+#define JPEG2000_CBLK_RESET 0x02 // Reset context probabilities
+#define JPEG2000_CBLK_TERMALL 0x04 // Terminate after each coding pass
+#define JPEG2000_CBLK_VSC 0x08 // Vertical stripe causal context formation
+#define JPEG2000_CBLK_PREDTERM 0x10 // Predictable termination
+#define JPEG2000_CBLK_SEGSYM 0x20 // Segmentation symbols present
+
+// Coding styles
+#define JPEG2000_CSTY_PREC 0x01 // Precincts defined in coding style
+#define JPEG2000_CSTY_SOP 0x02 // SOP marker present
+#define JPEG2000_CSTY_EPH 0x04 // EPH marker present
+
+// Progression orders
+#define JPEG2000_PGOD_LRCP 0x00 // Layer-resolution level-component-position progression
+#define JPEG2000_PGOD_RLCP 0x01 // Resolution level-layer-component-position progression
+#define JPEG2000_PGOD_RPCL 0x02 // Resolution level-position-component-layer progression
+#define JPEG2000_PGOD_PCRL 0x03 // Position-component-resolution level-layer progression
+#define JPEG2000_PGOD_CPRL 0x04 // Component-position-resolution level-layer progression
+
+typedef struct Jpeg2000T1Context {
+ int data[JPEG2000_MAX_CBLKW][JPEG2000_MAX_CBLKH];
+ int flags[JPEG2000_MAX_CBLKW + 2][JPEG2000_MAX_CBLKH + 2];
+ MqcState mqc;
+} Jpeg2000T1Context;
+
+typedef struct Jpeg2000TgtNode {
+ uint8_t val;
+ uint8_t vis;
+ struct Jpeg2000TgtNode *parent;
+} Jpeg2000TgtNode;
+
+typedef struct Jpeg2000CodingStyle {
+ uint8_t nreslevels; // number of resolution levels
+ uint8_t nreslevels2decode; // number of resolution levels to decode
+ uint8_t log2_cblk_width,
+ log2_cblk_height; // exponent of codeblock size
+ uint8_t transform; // DWT type
+ uint8_t csty; // coding style
+ uint8_t nlayers; // number of layers
+ uint8_t mct; // multiple component transformation
+ uint8_t cblk_style; // codeblock coding style
+ uint8_t prog_order; // progression order
+ uint8_t log2_prec_widths[JPEG2000_MAX_RESLEVELS]; // precincts size according resolution levels
+ uint8_t log2_prec_heights[JPEG2000_MAX_RESLEVELS]; // TODO: initialize prec_size array with 0?
+} Jpeg2000CodingStyle;
+
+typedef struct Jpeg2000QuantStyle {
+ uint8_t expn[JPEG2000_MAX_DECLEVELS * 3]; // quantization exponent
+ uint32_t mant[JPEG2000_MAX_DECLEVELS * 3]; // quantization mantissa
+ uint8_t quantsty; // quantization style
+ uint8_t nguardbits; // number of guard bits
+} Jpeg2000QuantStyle;
+
+typedef struct Jpeg2000Cblk {
+ uint8_t npasses;
+ uint8_t ninclpasses; // number coding of passes included in codestream
+ uint8_t nonzerobits;
+ uint16_t length;
+ uint16_t lengthinc;
+ uint8_t lblock;
+ uint8_t zero;
+ uint8_t data[8192];
+ uint16_t coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}}
+} Jpeg2000Cblk; // code block
+
+typedef struct Jpeg2000Prec {
+ uint16_t nb_codeblocks_width;
+ uint16_t nb_codeblocks_height;
+ Jpeg2000TgtNode *zerobits;
+ Jpeg2000TgtNode *cblkincl;
+ Jpeg2000Cblk *cblk;
+ uint16_t coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}}
+} Jpeg2000Prec; // precinct
+
+typedef struct Jpeg2000Band {
+ uint16_t coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}}
+ uint16_t log2_cblk_width, log2_cblk_height;
+ int i_stepsize; // quantization stepsize
+ float f_stepsize; // quantization stepsize
+ Jpeg2000Prec *prec;
+} Jpeg2000Band; // subband
+
+typedef struct Jpeg2000ResLevel {
+ uint8_t nbands;
+ uint16_t coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}}
+ uint16_t num_precincts_x, num_precincts_y; // number of precincts in x/y direction
+ uint8_t log2_prec_width, log2_prec_height; // exponent of precinct size
+ Jpeg2000Band *band;
+} Jpeg2000ResLevel; // resolution level
+
+typedef struct Jpeg2000Component {
+ Jpeg2000ResLevel *reslevel;
+ DWTContext dwt;
+ float *f_data;
+ int *i_data;
+ uint16_t coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}} -- can be reduced with lowres option
+ uint16_t coord_o[2][2]; // border coordinates {{x0, x1}, {y0, y1}} -- original values from jpeg2000 headers
+} Jpeg2000Component;
+
+/* misc tools */
+static inline int ff_jpeg2000_ceildivpow2(int a, int b)
+{
+ return (a + (1 << b) - 1) >> b;
+}
+
+static inline int ff_jpeg2000_ceildiv(int a, int b)
+{
+ return (a + b - 1) / b;
+}
+
+/* TIER-1 routines */
+
+/* Set up lookup tables used in TIER-1. */
+void ff_jpeg2000_init_tier1_luts(void);
+
+/* Update significance of a coefficient at current position (x,y) and
+ * for neighbors. */
+void ff_jpeg2000_set_significance(Jpeg2000T1Context *t1,
+ int x, int y, int negative);
+
+extern uint8_t ff_jpeg2000_sigctxno_lut[256][4];
+
+/* Get context label (number in range[0..8]) of a coefficient for significance
+ * propagation and cleanup coding passes. */
+static inline int ff_jpeg2000_getsigctxno(int flag, int bandno)
+{
+ return ff_jpeg2000_sigctxno_lut[flag & 255][bandno];
+}
+
+static const uint8_t refctxno_lut[2][2] = { { 14, 15 }, { 16, 16 } };
+
+/* Get context label (number in range[14..16]) of a coefficient for magnitude
+ * refinement pass. */
+static inline int ff_jpeg2000_getrefctxno(int flag)
+{
+ return refctxno_lut[(flag >> 14) & 1][(flag & 255) != 0];
+}
+
+extern uint8_t ff_jpeg2000_sgnctxno_lut[16][16];
+extern uint8_t ff_jpeg2000_xorbit_lut[16][16];
+
+/* Get context label (number in range[9..13]) for sign decoding. */
+static inline int ff_jpeg2000_getsgnctxno(int flag, int *xorbit)
+{
+ *xorbit = ff_jpeg2000_xorbit_lut[flag & 15][(flag >> 8) & 15];
+ return ff_jpeg2000_sgnctxno_lut[flag & 15][(flag >> 8) & 15];
+}
+
+int ff_jpeg2000_init_component(Jpeg2000Component *comp,
+ Jpeg2000CodingStyle *codsty,
+ Jpeg2000QuantStyle *qntsty,
+ int cbps, int dx, int dy,
+ AVCodecContext *ctx);
+
+void ff_jpeg2000_cleanup(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty);
+
+#endif /* AVCODEC_JPEG2000_H */

libav-v10.1.tar.bz2/libavcodec/jpeg2000dec.c Added

@@ -0,0 +1,1512 @@
+/*
+ * JPEG 2000 image decoder
+ * Copyright (c) 2007 Kamil Nowosad
+ * Copyright (c) 2013 Nicolas Bertrand <nicoinattendu@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * JPEG 2000 image decoder
+ */
+
+#include "libavutil/common.h"
+#include "libavutil/opt.h"
+#include "avcodec.h"
+#include "bytestream.h"
+#include "internal.h"
+#include "thread.h"
+#include "jpeg2000.h"
+
+#define JP2_SIG_TYPE 0x6A502020
+#define JP2_SIG_VALUE 0x0D0A870A
+#define JP2_CODESTREAM 0x6A703263
+
+#define HAD_COC 0x01
+#define HAD_QCC 0x02
+
+typedef struct Jpeg2000TilePart {
+ uint8_t tile_index; // Tile index who refers the tile-part
+ const uint8_t *tp_end;
+ GetByteContext tpg; // bit stream in tile-part
+} Jpeg2000TilePart;
+
+/* RMK: For JPEG2000 DCINEMA 3 tile-parts in a tile
+ * one per component, so tile_part elements have a size of 3 */
+typedef struct Jpeg2000Tile {
+ Jpeg2000Component *comp;
+ uint8_t properties[4];
+ Jpeg2000CodingStyle codsty[4];
+ Jpeg2000QuantStyle qntsty[4];
+ Jpeg2000TilePart tile_part[3];
+ uint16_t tp_idx; // Tile-part index
+} Jpeg2000Tile;
+
+typedef struct Jpeg2000DecoderContext {
+ AVClass *class;
+ AVCodecContext *avctx;
+ GetByteContext g;
+
+ int width, height;
+ int image_offset_x, image_offset_y;
+ int tile_offset_x, tile_offset_y;
+ uint8_t cbps[4]; // bits per sample in particular components
+ uint8_t sgnd[4]; // if a component is signed
+ uint8_t properties[4];
+ int cdx[4], cdy[4];
+ int precision;
+ int ncomponents;
+ int tile_width, tile_height;
+ unsigned numXtiles, numYtiles;
+ int maxtilelen;
+
+ Jpeg2000CodingStyle codsty[4];
+ Jpeg2000QuantStyle qntsty[4];
+
+ int bit_index;
+
+ int16_t curtileno;
+ Jpeg2000Tile *tile;
+
+ /*options parameters*/
+ int reduction_factor;
+} Jpeg2000DecoderContext;
+
+/* get_bits functions for JPEG2000 packet bitstream
+ * It is a get_bit function with a bit-stuffing routine. If the value of the
+ * byte is 0xFF, the next byte includes an extra zero bit stuffed into the MSB.
+ * cf. ISO-15444-1:2002 / B.10.1 Bit-stuffing routine */
+static int get_bits(Jpeg2000DecoderContext *s, int n)
+{
+ int res = 0;
+ while (--n >= 0) {
+ res <<= 1;
+ if (s->bit_index == 0) {
+ s->bit_index = 7 + (bytestream2_get_byte(&s->g) != 0xFFu);
+ }
+ s->bit_index--;
+ res |= (bytestream2_peek_byte(&s->g) >> s->bit_index) & 1;
+ }
+ return res;
+}
+
+static void jpeg2000_flush(Jpeg2000DecoderContext *s)
+{
+ if (bytestream2_get_byte(&s->g) == 0xff)
+ bytestream2_skip(&s->g, 1);
+ s->bit_index = 8;
+}
+
+/* decode the value stored in node */
+static int tag_tree_decode(Jpeg2000DecoderContext *s, Jpeg2000TgtNode *node,
+ int threshold)
+{
+ Jpeg2000TgtNode *stack[30];
+ int sp = -1, curval = 0;
+
+ if (!node)
+ return AVERROR_INVALIDDATA;
+
+ while (node && !node->vis) {
+ stack[++sp] = node;
+ node = node->parent;
+ }
+
+ if (node)
+ curval = node->val;
+ else
+ curval = stack[sp]->val;
+
+ while (curval < threshold && sp >= 0) {
+ if (curval < stack[sp]->val)
+ curval = stack[sp]->val;
+ while (curval < threshold) {
+ int ret;
+ if ((ret = get_bits(s, 1)) > 0) {
+ stack[sp]->vis++;
+ break;
+ } else if (!ret)
+ curval++;
+ else
+ return ret;
+ }
+ stack[sp]->val = curval;
+ sp--;
+ }
+ return curval;
+}
+
+/* marker segments */
+/* get sizes and offsets of image, tiles; number of components */
+static int get_siz(Jpeg2000DecoderContext *s)
+{
+ int i;
+ int ncomponents;
+
+ if (bytestream2_get_bytes_left(&s->g) < 36)
+ return AVERROR_INVALIDDATA;
+
+ s->avctx->profile = bytestream2_get_be16u(&s->g); // Rsiz
+ s->width = bytestream2_get_be32u(&s->g); // Width
+ s->height = bytestream2_get_be32u(&s->g); // Height
+ s->image_offset_x = bytestream2_get_be32u(&s->g); // X0Siz
+ s->image_offset_y = bytestream2_get_be32u(&s->g); // Y0Siz
+ s->tile_width = bytestream2_get_be32u(&s->g); // XTSiz
+ s->tile_height = bytestream2_get_be32u(&s->g); // YTSiz
+ s->tile_offset_x = bytestream2_get_be32u(&s->g); // XT0Siz
+ s->tile_offset_y = bytestream2_get_be32u(&s->g); // YT0Siz
+ ncomponents = bytestream2_get_be16u(&s->g); // CSiz
+
+ if (ncomponents <= 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid number of components: %d\n",
+ s->ncomponents);
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (ncomponents > 3) {
+ avpriv_request_sample(s->avctx, "Support for %d components",
+ s->ncomponents);
+ return AVERROR_PATCHWELCOME;
+ }
+
+ s->ncomponents = ncomponents;
+
+ if (s->tile_width <= 0 || s->tile_height <= 0 ||
+ s->tile_width > s->width || s->tile_height > s->height) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid tile dimension %dx%d.\n",
+ s->tile_width, s->tile_height);
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (bytestream2_get_bytes_left(&s->g) < 3 * s->ncomponents)
+ return AVERROR_INVALIDDATA;
+
+ for (i = 0; i < s->ncomponents; i++) { // Ssiz_i XRsiz_i, YRsiz_i
+ uint8_t x = bytestream2_get_byteu(&s->g);
+ s->cbps[i] = (x & 0x7f) + 1;
+ s->precision = FFMAX(s->cbps[i], s->precision);
+ s->sgnd[i] = !!(x & 0x80);
+ s->cdx[i] = bytestream2_get_byteu(&s->g);
+ s->cdy[i] = bytestream2_get_byteu(&s->g);
+
+ if (s->cdx[i] != 1 || s->cdy[i] != 1) {
+ avpriv_request_sample(s->avctx,
+ "CDxy values %d %d for component %d",
+ s->cdx[i], s->cdy[i], i);
+ if (!s->cdx[i] || !s->cdy[i])
+ return AVERROR_INVALIDDATA;
+ else
+ return AVERROR_PATCHWELCOME;
+ }
+ }
+
+ s->numXtiles = ff_jpeg2000_ceildiv(s->width - s->tile_offset_x, s->tile_width);
+ s->numYtiles = ff_jpeg2000_ceildiv(s->height - s->tile_offset_y, s->tile_height);
+
+ s->tile = av_mallocz_array(s->numXtiles * s->numYtiles, sizeof(*s->tile));
+ if (!s->tile) {
+ s->numXtiles = s->numYtiles = 0;
+ return AVERROR(ENOMEM);
+ }
+
+ for (i = 0; i < s->numXtiles * s->numYtiles; i++) {
+ Jpeg2000Tile *tile = s->tile + i;
+
+ tile->comp = av_mallocz(s->ncomponents * sizeof(*tile->comp));
+ if (!tile->comp)
+ return AVERROR(ENOMEM);
+ }
+
+ /* compute image size with reduction factor */
+ s->avctx->width = ff_jpeg2000_ceildivpow2(s->width - s->image_offset_x,
+ s->reduction_factor);
+ s->avctx->height = ff_jpeg2000_ceildivpow2(s->height - s->image_offset_y,
+ s->reduction_factor);
+
+ switch (s->ncomponents) {
+ case 1:
+ if (s->precision > 8)
+ s->avctx->pix_fmt = AV_PIX_FMT_GRAY16;
+ else
+ s->avctx->pix_fmt = AV_PIX_FMT_GRAY8;
+ break;
+ case 3:
+ switch (s->avctx->profile) {
+ case FF_PROFILE_JPEG2000_DCINEMA_2K:
+ case FF_PROFILE_JPEG2000_DCINEMA_4K:
+ /* XYZ color-space for digital cinema profiles */
+ s->avctx->pix_fmt = AV_PIX_FMT_XYZ12;
+ break;
+ default:
+ if (s->precision > 8)
+ s->avctx->pix_fmt = AV_PIX_FMT_RGB48;
+ else
+ s->avctx->pix_fmt = AV_PIX_FMT_RGB24;
+ break;
+ }
+ break;
+ case 4:
+ s->avctx->pix_fmt = AV_PIX_FMT_RGBA;
+ break;
+ default:
+ /* pixel format can not be identified */
+ s->avctx->pix_fmt = AV_PIX_FMT_NONE;
+ break;
+ }
+ return 0;
+}
+
+/* get common part for COD and COC segments */
+static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c)
+{
+ uint8_t byte;
+
+ if (bytestream2_get_bytes_left(&s->g) < 5)
+ return AVERROR_INVALIDDATA;
+
+ /* nreslevels = number of resolution levels
+ = number of decomposition level +1 */
+ c->nreslevels = bytestream2_get_byteu(&s->g) + 1;
+
+ if (c->nreslevels > JPEG2000_MAX_RESLEVELS)
+ return AVERROR_INVALIDDATA;
+
+ /* compute number of resolution levels to decode */
+ if (c->nreslevels < s->reduction_factor)
+ c->nreslevels2decode = 1;
+ else
+ c->nreslevels2decode = c->nreslevels - s->reduction_factor;
+
+ c->log2_cblk_width = bytestream2_get_byteu(&s->g) + 2; // cblk width
+ c->log2_cblk_height = bytestream2_get_byteu(&s->g) + 2; // cblk height
+
+ if (c->log2_cblk_width > 10 || c->log2_cblk_height > 10 ||
+ c->log2_cblk_width + c->log2_cblk_height > 12) {
+ av_log(s->avctx, AV_LOG_ERROR, "cblk size invalid\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ c->cblk_style = bytestream2_get_byteu(&s->g);
+ if (c->cblk_style != 0) { // cblk style
+ avpriv_request_sample(s->avctx, "Support for extra cblk styles");
+ return AVERROR_PATCHWELCOME;
+ }
+ c->transform = bytestream2_get_byteu(&s->g); // DWT transformation type
+ /* set integer 9/7 DWT in case of BITEXACT flag */
+ if ((s->avctx->flags & CODEC_FLAG_BITEXACT) && (c->transform == FF_DWT97))
+ c->transform = FF_DWT97_INT;
+
+ if (c->csty & JPEG2000_CSTY_PREC) {
+ int i;
+ for (i = 0; i < c->nreslevels; i++) {
+ byte = bytestream2_get_byte(&s->g);
+ c->log2_prec_widths[i] = byte & 0x0F; // precinct PPx
+ c->log2_prec_heights[i] = (byte >> 4) & 0x0F; // precinct PPy
+ }
+ } else {
+ memset(c->log2_prec_widths , 15, sizeof(c->log2_prec_widths ));
+ memset(c->log2_prec_heights, 15, sizeof(c->log2_prec_heights));
+ }
+ return 0;
+}
+
+/* get coding parameters for a particular tile or whole image*/
+static int get_cod(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c,
+ uint8_t *properties)
+{
+ Jpeg2000CodingStyle tmp;
+ int compno, ret;
+
+ if (bytestream2_get_bytes_left(&s->g) < 5)
+ return AVERROR_INVALIDDATA;
+
+ tmp.csty = bytestream2_get_byteu(&s->g);
+
+ // get progression order
+ tmp.prog_order = bytestream2_get_byteu(&s->g);
+
+ tmp.nlayers = bytestream2_get_be16u(&s->g);
+ tmp.mct = bytestream2_get_byteu(&s->g); // multiple component transformation
+
+ if (tmp.mct && s->ncomponents < 3) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "MCT %d with too few components (%d)\n",
+ tmp.mct, s->ncomponents);
+ return AVERROR_INVALIDDATA;
+ }
+
+ if ((ret = get_cox(s, &tmp)) < 0)
+ return ret;
+
+ for (compno = 0; compno < s->ncomponents; compno++)
+ if (!(properties[compno] & HAD_COC))
+ memcpy(c + compno, &tmp, sizeof(tmp));
+ return 0;
+}
+
+/* Get coding parameters for a component in the whole image or a
+ * particular tile. */
+static int get_coc(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c,
+ uint8_t *properties)
+{
+ int compno, ret;
+
+ if (bytestream2_get_bytes_left(&s->g) < 2)
+ return AVERROR_INVALIDDATA;
+
+ compno = bytestream2_get_byteu(&s->g);
+
+ if (compno >= s->ncomponents) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Invalid compno %d. There are %d components in the image.\n",
+ compno, s->ncomponents);
+ return AVERROR_INVALIDDATA;
+ }
+
+ c += compno;
+ c->csty = bytestream2_get_byteu(&s->g);
+
+ if ((ret = get_cox(s, c)) < 0)
+ return ret;
+
+ properties[compno] |= HAD_COC;
+ return 0;
+}
+
+/* Get common part for QCD and QCC segments. */
+static int get_qcx(Jpeg2000DecoderContext *s, int n, Jpeg2000QuantStyle *q)
+{
+ int i, x;
+
+ if (bytestream2_get_bytes_left(&s->g) < 1)
+ return AVERROR_INVALIDDATA;
+
+ x = bytestream2_get_byteu(&s->g); // Sqcd
+
+ q->nguardbits = x >> 5;
+ q->quantsty = x & 0x1f;
+
+ if (q->quantsty == JPEG2000_QSTY_NONE) {
+ n -= 3;
+ if (bytestream2_get_bytes_left(&s->g) < n ||
+ n > JPEG2000_MAX_DECLEVELS)
+ return AVERROR_INVALIDDATA;
+ for (i = 0; i < n; i++)
+ q->expn[i] = bytestream2_get_byteu(&s->g) >> 3;
+ } else if (q->quantsty == JPEG2000_QSTY_SI) {
+ if (bytestream2_get_bytes_left(&s->g) < 2)
+ return AVERROR_INVALIDDATA;
+ x = bytestream2_get_be16u(&s->g);
+ q->expn[0] = x >> 11;
+ q->mant[0] = x & 0x7ff;
+ for (i = 1; i < JPEG2000_MAX_DECLEVELS * 3; i++) {
+ int curexpn = FFMAX(0, q->expn[0] - (i - 1) / 3);
+ q->expn[i] = curexpn;
+ q->mant[i] = q->mant[0];
+ }
+ } else {
+ n = (n - 3) >> 1;
+ if (bytestream2_get_bytes_left(&s->g) < 2 * n ||
+ n > JPEG2000_MAX_DECLEVELS)
+ return AVERROR_INVALIDDATA;
+ for (i = 0; i < n; i++) {
+ x = bytestream2_get_be16u(&s->g);
+ q->expn[i] = x >> 11;
+ q->mant[i] = x & 0x7ff;
+ }
+ }
+ return 0;
+}
+
+/* Get quantization parameters for a particular tile or a whole image. */
+static int get_qcd(Jpeg2000DecoderContext *s, int n, Jpeg2000QuantStyle *q,
+ uint8_t *properties)
+{
+ Jpeg2000QuantStyle tmp;
+ int compno, ret;
+
+ if ((ret = get_qcx(s, n, &tmp)) < 0)
+ return ret;
+ for (compno = 0; compno < s->ncomponents; compno++)
+ if (!(properties[compno] & HAD_QCC))
+ memcpy(q + compno, &tmp, sizeof(tmp));
+ return 0;
+}
+
+/* Get quantization parameters for a component in the whole image
+ * on in a particular tile. */
+static int get_qcc(Jpeg2000DecoderContext *s, int n, Jpeg2000QuantStyle *q,
+ uint8_t *properties)
+{
+ int compno;
+
+ if (bytestream2_get_bytes_left(&s->g) < 1)
+ return AVERROR_INVALIDDATA;
+
+ compno = bytestream2_get_byteu(&s->g);
+
+ if (compno >= s->ncomponents) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Invalid compno %d. There are %d components in the image.\n",
+ compno, s->ncomponents);
+ return AVERROR_INVALIDDATA;
+ }
+
+ properties[compno] |= HAD_QCC;
+ return get_qcx(s, n - 1, q + compno);
+}
+
+/* Get start of tile segment. */
+static int get_sot(Jpeg2000DecoderContext *s, int n)
+{
+ Jpeg2000TilePart *tp;
+ uint16_t Isot;
+ uint32_t Psot;
+ uint8_t TPsot;
+
+ if (bytestream2_get_bytes_left(&s->g) < 8)
+ return AVERROR_INVALIDDATA;
+
+ Isot = bytestream2_get_be16u(&s->g); // Isot
+ if (Isot >= s->numXtiles * s->numYtiles)
+ return AVERROR_INVALIDDATA;
+
+ if (Isot) {
+ avpriv_request_sample(s->avctx, "Support for more than one tile");
+ return AVERROR_PATCHWELCOME;
+ }
+ Psot = bytestream2_get_be32u(&s->g); // Psot
+ TPsot = bytestream2_get_byteu(&s->g); // TPsot
+
+ /* Read TNSot but not used */
+ bytestream2_get_byteu(&s->g); // TNsot
+
+ if (Psot > bytestream2_get_bytes_left(&s->g) + n + 2) {
+ av_log(s->avctx, AV_LOG_ERROR, "Psot %d too big\n", Psot);
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (TPsot >= FF_ARRAY_ELEMS(s->tile[Isot].tile_part)) {
+ avpriv_request_sample(s->avctx, "Support for %d components", TPsot);
+ return AVERROR_PATCHWELCOME;
+ }
+
+ s->tile[Isot].tp_idx = TPsot;
+ tp = s->tile[Isot].tile_part + TPsot;
+ tp->tile_index = Isot;
+ tp->tp_end = s->g.buffer + Psot - n - 2;
+
+ if (!TPsot) {
+ Jpeg2000Tile *tile = s->tile + s->curtileno;
+
+ /* copy defaults */
+ memcpy(tile->codsty, s->codsty, s->ncomponents * sizeof(Jpeg2000CodingStyle));
+ memcpy(tile->qntsty, s->qntsty, s->ncomponents * sizeof(Jpeg2000QuantStyle));
+ }
+
+ return 0;
+}
+
+/* Tile-part lengths: see ISO 15444-1:2002, section A.7.1
+ * Used to know the number of tile parts and lengths.
+ * There may be multiple TLMs in the header.
+ * TODO: The function is not used for tile-parts management, nor anywhere else.
+ * It can be useful to allocate memory for tile parts, before managing the SOT
+ * markers. Parsing the TLM header is needed to increment the input header
+ * buffer.
+ * This marker is mandatory for DCI. */
+static uint8_t get_tlm(Jpeg2000DecoderContext *s, int n)
+{
+ uint8_t Stlm, ST, SP, tile_tlm, i;
+ bytestream2_get_byte(&s->g); /* Ztlm: skipped */
+ Stlm = bytestream2_get_byte(&s->g);
+
+ // too complex ? ST = ((Stlm >> 4) & 0x01) + ((Stlm >> 4) & 0x02);
+ ST = (Stlm >> 4) & 0x03;
+ // TODO: Manage case of ST = 0b11 --> raise error
+ SP = (Stlm >> 6) & 0x01;
+ tile_tlm = (n - 4) / ((SP + 1) * 2 + ST);
+ for (i = 0; i < tile_tlm; i++) {
+ switch (ST) {
+ case 0:
+ break;
+ case 1:
+ bytestream2_get_byte(&s->g);
+ break;
+ case 2:
+ bytestream2_get_be16(&s->g);
+ break;
+ case 3:
+ bytestream2_get_be32(&s->g);
+ break;
+ }
+ if (SP == 0) {
+ bytestream2_get_be16(&s->g);
+ } else {
+ bytestream2_get_be32(&s->g);
+ }
+ }
+ return 0;
+}
+
+static int init_tile(Jpeg2000DecoderContext *s, int tileno)
+{
+ int compno;
+ int tilex = tileno % s->numXtiles;
+ int tiley = tileno / s->numXtiles;
+ Jpeg2000Tile *tile = s->tile + tileno;
+
+ if (!tile->comp)
+ return AVERROR(ENOMEM);
+
+ for (compno = 0; compno < s->ncomponents; compno++) {
+ Jpeg2000Component *comp = tile->comp + compno;
+ Jpeg2000CodingStyle *codsty = tile->codsty + compno;
+ Jpeg2000QuantStyle *qntsty = tile->qntsty + compno;
+ int ret; // global bandno
+
+ comp->coord_o[0][0] = FFMAX(tilex * s->tile_width + s->tile_offset_x, s->image_offset_x);
+ comp->coord_o[0][1] = FFMIN((tilex + 1) * s->tile_width + s->tile_offset_x, s->width);
+ comp->coord_o[1][0] = FFMAX(tiley * s->tile_height + s->tile_offset_y, s->image_offset_y);
+ comp->coord_o[1][1] = FFMIN((tiley + 1) * s->tile_height + s->tile_offset_y, s->height);
+
+ comp->coord[0][0] = ff_jpeg2000_ceildivpow2(comp->coord_o[0][0], s->reduction_factor);
+ comp->coord[0][1] = ff_jpeg2000_ceildivpow2(comp->coord_o[0][1], s->reduction_factor);
+ comp->coord[1][0] = ff_jpeg2000_ceildivpow2(comp->coord_o[1][0], s->reduction_factor);
+ comp->coord[1][1] = ff_jpeg2000_ceildivpow2(comp->coord_o[1][1], s->reduction_factor);
+
+ if (ret = ff_jpeg2000_init_component(comp, codsty, qntsty,
+ s->cbps[compno], s->cdx[compno],
+ s->cdy[compno], s->avctx))
+ return ret;
+ }
+ return 0;
+}
+
+/* Read the number of coding passes. */
+static int getnpasses(Jpeg2000DecoderContext *s)
+{
+ int num;
+ if (!get_bits(s, 1))
+ return 1;
+ if (!get_bits(s, 1))
+ return 2;
+ if ((num = get_bits(s, 2)) != 3)
+ return num < 0 ? num : 3 + num;
+ if ((num = get_bits(s, 5)) != 31)
+ return num < 0 ? num : 6 + num;
+ num = get_bits(s, 7);
+ return num < 0 ? num : 37 + num;
+}
+
+static int getlblockinc(Jpeg2000DecoderContext *s)
+{
+ int res = 0, ret;
+ while (ret = get_bits(s, 1)) {
+ if (ret < 0)
+ return ret;
+ res++;
+ }
+ return res;
+}
+
+static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s,
+ Jpeg2000CodingStyle *codsty,
+ Jpeg2000ResLevel *rlevel, int precno,
+ int layno, uint8_t *expn, int numgbits)
+{
+ int bandno, cblkno, ret, nb_code_blocks;
+
+ if (!(ret = get_bits(s, 1))) {
+ jpeg2000_flush(s);
+ return 0;
+ } else if (ret < 0)
+ return ret;
+
+ for (bandno = 0; bandno < rlevel->nbands; bandno++) {
+ Jpeg2000Band *band = rlevel->band + bandno;
+ Jpeg2000Prec *prec = band->prec + precno;
+
+ if (band->coord[0][0] == band->coord[0][1] ||
+ band->coord[1][0] == band->coord[1][1])
+ continue;
+ nb_code_blocks = prec->nb_codeblocks_height *
+ prec->nb_codeblocks_width;
+ for (cblkno = 0; cblkno < nb_code_blocks; cblkno++) {
+ Jpeg2000Cblk *cblk = prec->cblk + cblkno;
+ int incl, newpasses, llen;
+
+ if (cblk->npasses)
+ incl = get_bits(s, 1);
+ else
+ incl = tag_tree_decode(s, prec->cblkincl + cblkno, layno + 1) == layno;
+ if (!incl)
+ continue;
+ else if (incl < 0)
+ return incl;
+
+ if (!cblk->npasses) {
+ int v = expn[bandno] + numgbits - 1 -
+ tag_tree_decode(s, prec->zerobits + cblkno, 100);
+ if (v < 0) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "nonzerobits %d invalid\n", v);
+ return AVERROR_INVALIDDATA;
+ }
+ cblk->nonzerobits = v;
+ }
+ if ((newpasses = getnpasses(s)) < 0)
+ return newpasses;
+ if ((llen = getlblockinc(s)) < 0)
+ return llen;
+ cblk->lblock += llen;
+ if ((ret = get_bits(s, av_log2(newpasses) + cblk->lblock)) < 0)
+ return ret;
+ if (ret > sizeof(cblk->data)) {
+ avpriv_request_sample(s->avctx,
+ "Block with lengthinc greater than %zu",
+ sizeof(cblk->data));
+ return AVERROR_PATCHWELCOME;
+ }
+ cblk->lengthinc = ret;
+ cblk->npasses += newpasses;
+ }
+ }
+ jpeg2000_flush(s);
+
+ if (codsty->csty & JPEG2000_CSTY_EPH) {
+ if (bytestream2_peek_be16(&s->g) == JPEG2000_EPH)
+ bytestream2_skip(&s->g, 2);
+ else
+ av_log(s->avctx, AV_LOG_ERROR, "EPH marker not found.\n");
+ }
+
+ for (bandno = 0; bandno < rlevel->nbands; bandno++) {
+ Jpeg2000Band *band = rlevel->band + bandno;
+ Jpeg2000Prec *prec = band->prec + precno;
+
+ nb_code_blocks = prec->nb_codeblocks_height * prec->nb_codeblocks_width;
+ for (cblkno = 0; cblkno < nb_code_blocks; cblkno++) {
+ Jpeg2000Cblk *cblk = prec->cblk + cblkno;
+ if (bytestream2_get_bytes_left(&s->g) < cblk->lengthinc)
+ return AVERROR_INVALIDDATA;
+ /* Code-block data can be empty. In that case initialize data
+ * with 0xFFFF. */
+ if (cblk->lengthinc > 0) {
+ bytestream2_get_bufferu(&s->g, cblk->data, cblk->lengthinc);
+ } else {
+ cblk->data[0] = 0xFF;
+ cblk->data[1] = 0xFF;
+ }
+ cblk->length += cblk->lengthinc;
+ cblk->lengthinc = 0;
+
+ if (cblk->length > sizeof(cblk->data)) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Block length %d > data size %zd\n",
+ cblk->length, sizeof(cblk->data));
+ return AVERROR_INVALIDDATA;
+ }
+ }
+ }
+ return 0;
+}
+
+static int jpeg2000_decode_packets(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile)
+{
+ int ret = 0;
+ int layno, reslevelno, compno, precno, ok_reslevel;
+ int x, y;
+
+ s->bit_index = 8;
+ switch (tile->codsty[0].prog_order) {
+ case JPEG2000_PGOD_LRCP:
+ for (layno = 0; layno < tile->codsty[0].nlayers; layno++) {
+ ok_reslevel = 1;
+ for (reslevelno = 0; ok_reslevel; reslevelno++) {
+ ok_reslevel = 0;
+ for (compno = 0; compno < s->ncomponents; compno++) {
+ Jpeg2000CodingStyle *codsty = tile->codsty + compno;
+ Jpeg2000QuantStyle *qntsty = tile->qntsty + compno;
+ if (reslevelno < codsty->nreslevels) {
+ Jpeg2000ResLevel *rlevel = tile->comp[compno].reslevel +
+ reslevelno;
+ ok_reslevel = 1;
+ for (precno = 0; precno < rlevel->num_precincts_x * rlevel->num_precincts_y; precno++)
+ if ((ret = jpeg2000_decode_packet(s,
+ codsty, rlevel,
+ precno, layno,
+ qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0),
+ qntsty->nguardbits)) < 0)
+ return ret;
+ }
+ }
+ }
+ }
+ break;
+
+ case JPEG2000_PGOD_CPRL:
+ for (compno = 0; compno < s->ncomponents; compno++) {
+ Jpeg2000CodingStyle *codsty = tile->codsty + compno;
+ Jpeg2000QuantStyle *qntsty = tile->qntsty + compno;
+
+ /* Set bit stream buffer address according to tile-part.
+ * For DCinema one tile-part per component, so can be
+ * indexed by component. */
+ s->g = tile->tile_part[compno].tpg;
+
+ /* Position loop (y axis)
+ * TODO: Automate computing of step 256.
+ * Fixed here, but to be computed before entering here. */
+ for (y = 0; y < s->height; y += 256) {
+ /* Position loop (y axis)
+ * TODO: automate computing of step 256.
+ * Fixed here, but to be computed before entering here. */
+ for (x = 0; x < s->width; x += 256) {
+ for (reslevelno = 0; reslevelno < codsty->nreslevels; reslevelno++) {
+ uint16_t prcx, prcy;
+ uint8_t reducedresno = codsty->nreslevels - 1 -reslevelno; // ==> N_L - r
+ Jpeg2000ResLevel *rlevel = tile->comp[compno].reslevel + reslevelno;
+
+ if (!((y % (1 << (rlevel->log2_prec_height + reducedresno)) == 0) ||
+ (y == 0))) // TODO: 2nd condition simplified as try0 always =0 for dcinema
+ continue;
+
+ if (!((x % (1 << (rlevel->log2_prec_width + reducedresno)) == 0) ||
+ (x == 0))) // TODO: 2nd condition simplified as try0 always =0 for dcinema
+ continue;
+
+ // check if a precinct exists
+ 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;
+ for (layno = 0; layno < tile->codsty[0].nlayers; layno++) {
+ if ((ret = jpeg2000_decode_packet(s, codsty, rlevel,
+ precno, layno,
+ qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0),
+ qntsty->nguardbits)) < 0)
+ return ret;
+ }
+ }
+ }
+ }
+ }
+ break;
+
+ case JPEG2000_PGOD_RLCP:
+ avpriv_request_sample(s->avctx, "Progression order RLCP");
+ ret = AVERROR_PATCHWELCOME;
+ break;
+
+ case JPEG2000_PGOD_RPCL:
+ avpriv_request_sample(s->avctx, "Progression order RPCL");
+ ret = AVERROR_PATCHWELCOME;
+ break;
+
+ case JPEG2000_PGOD_PCRL:
+ avpriv_request_sample(s->avctx, "Progression order PCRL");
+ ret = AVERROR_PATCHWELCOME;
+ break;
+
+ default:
+ break;
+ }
+
+ /* EOC marker reached */
+ bytestream2_skip(&s->g, 2);
+
+ return ret;
+}
+
+/* TIER-1 routines */
+static void decode_sigpass(Jpeg2000T1Context *t1, int width, int height,
+ int bpno, int bandno, int bpass_csty_symbol,
+ int vert_causal_ctx_csty_symbol)
+{
+ int mask = 3 << (bpno - 1), y0, x, y;
+
+ for (y0 = 0; y0 < height; y0 += 4)
+ for (x = 0; x < width; x++)
+ for (y = y0; y < height && y < y0 + 4; y++) {
+ if ((t1->flags[y+1][x+1] & JPEG2000_T1_SIG_NB)
+ && !(t1->flags[y+1][x+1] & (JPEG2000_T1_SIG | JPEG2000_T1_VIS))) {
+ int flags_mask = -1;
+ if (vert_causal_ctx_csty_symbol && y == y0 + 3)
+ flags_mask &= ~(JPEG2000_T1_SIG_S | JPEG2000_T1_SIG_SW | JPEG2000_T1_SIG_SE);
+ if (ff_mqc_decode(&t1->mqc, t1->mqc.cx_states + ff_jpeg2000_getsigctxno(t1->flags[y+1][x+1] & flags_mask, bandno))) {
+ int xorbit, ctxno = ff_jpeg2000_getsgnctxno(t1->flags[y+1][x+1], &xorbit);
+ if (bpass_csty_symbol)
+ t1->data[y][x] = ff_mqc_decode(&t1->mqc, t1->mqc.cx_states + ctxno) ? -mask : mask;
+ else
+ t1->data[y][x] = (ff_mqc_decode(&t1->mqc, t1->mqc.cx_states + ctxno) ^ xorbit) ?
+ -mask : mask;
+
+ ff_jpeg2000_set_significance(t1, x, y,
+ t1->data[y][x] < 0);
+ }
+ t1->flags[y + 1][x + 1] |= JPEG2000_T1_VIS;
+ }
+ }
+}
+
+static void decode_refpass(Jpeg2000T1Context *t1, int width, int height,
+ int bpno)
+{
+ int phalf, nhalf;
+ int y0, x, y;
+
+ phalf = 1 << (bpno - 1);
+ nhalf = -phalf;
+
+ for (y0 = 0; y0 < height; y0 += 4)
+ for (x = 0; x < width; x++)
+ for (y = y0; y < height && y < y0 + 4; y++)
+ if ((t1->flags[y + 1][x + 1] & (JPEG2000_T1_SIG | JPEG2000_T1_VIS)) == JPEG2000_T1_SIG) {
+ int ctxno = ff_jpeg2000_getrefctxno(t1->flags[y + 1][x + 1]);
+ int r = ff_mqc_decode(&t1->mqc,
+ t1->mqc.cx_states + ctxno)
+ ? phalf : nhalf;
+ t1->data[y][x] += t1->data[y][x] < 0 ? -r : r;
+ t1->flags[y + 1][x + 1] |= JPEG2000_T1_REF;
+ }
+}
+
+static void decode_clnpass(Jpeg2000DecoderContext *s, Jpeg2000T1Context *t1,
+ int width, int height, int bpno, int bandno,
+ int seg_symbols, int vert_causal_ctx_csty_symbol)
+{
+ int mask = 3 << (bpno - 1), y0, x, y, runlen, dec;
+
+ for (y0 = 0; y0 < height; y0 += 4) {
+ for (x = 0; x < width; x++) {
+ if (y0 + 3 < height &&
+ !((t1->flags[y0 + 1][x + 1] & (JPEG2000_T1_SIG_NB | JPEG2000_T1_VIS | JPEG2000_T1_SIG)) ||
+ (t1->flags[y0 + 2][x + 1] & (JPEG2000_T1_SIG_NB | JPEG2000_T1_VIS | JPEG2000_T1_SIG)) ||
+ (t1->flags[y0 + 3][x + 1] & (JPEG2000_T1_SIG_NB | JPEG2000_T1_VIS | JPEG2000_T1_SIG)) ||
+ (t1->flags[y0 + 4][x + 1] & (JPEG2000_T1_SIG_NB | JPEG2000_T1_VIS | JPEG2000_T1_SIG)))) {
+ if (!ff_mqc_decode(&t1->mqc, t1->mqc.cx_states + MQC_CX_RL))
+ continue;
+ runlen = ff_mqc_decode(&t1->mqc,
+ t1->mqc.cx_states + MQC_CX_UNI);
+ runlen = (runlen << 1) | ff_mqc_decode(&t1->mqc,
+ t1->mqc.cx_states +
+ MQC_CX_UNI);
+ dec = 1;
+ } else {
+ runlen = 0;
+ dec = 0;
+ }
+
+ for (y = y0 + runlen; y < y0 + 4 && y < height; y++) {
+ if (!dec) {
+ if (!(t1->flags[y+1][x+1] & (JPEG2000_T1_SIG | JPEG2000_T1_VIS))) {
+ int flags_mask = -1;
+ if (vert_causal_ctx_csty_symbol && y == y0 + 3)
+ flags_mask &= ~(JPEG2000_T1_SIG_S | JPEG2000_T1_SIG_SW | JPEG2000_T1_SIG_SE);
+ dec = ff_mqc_decode(&t1->mqc, t1->mqc.cx_states + ff_jpeg2000_getsigctxno(t1->flags[y+1][x+1] & flags_mask,
+ bandno));
+ }
+ }
+ if (dec) {
+ int xorbit;
+ int ctxno = ff_jpeg2000_getsgnctxno(t1->flags[y + 1][x + 1],
+ &xorbit);
+ t1->data[y][x] = (ff_mqc_decode(&t1->mqc,
+ t1->mqc.cx_states + ctxno) ^
+ xorbit)
+ ? -mask : mask;
+ ff_jpeg2000_set_significance(t1, x, y, t1->data[y][x] < 0);
+ }
+ dec = 0;
+ t1->flags[y + 1][x + 1] &= ~JPEG2000_T1_VIS;
+ }
+ }
+ }
+ if (seg_symbols) {
+ int val;
+ val = ff_mqc_decode(&t1->mqc, t1->mqc.cx_states + MQC_CX_UNI);
+ val = (val << 1) + ff_mqc_decode(&t1->mqc, t1->mqc.cx_states + MQC_CX_UNI);
+ val = (val << 1) + ff_mqc_decode(&t1->mqc, t1->mqc.cx_states + MQC_CX_UNI);
+ val = (val << 1) + ff_mqc_decode(&t1->mqc, t1->mqc.cx_states + MQC_CX_UNI);
+ if (val != 0xa)
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Segmentation symbol value incorrect\n");
+ }
+}
+
+static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty,
+ Jpeg2000T1Context *t1, Jpeg2000Cblk *cblk,
+ int width, int height, int bandpos)
+{
+ int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1, y;
+ int clnpass_cnt = 0;
+ int bpass_csty_symbol = codsty->cblk_style & JPEG2000_CBLK_BYPASS;
+ int vert_causal_ctx_csty_symbol = codsty->cblk_style & JPEG2000_CBLK_VSC;
+
+ for (y = 0; y < height; y++)
+ memset(t1->data[y], 0, width * sizeof(**t1->data));
+
+ /* If code-block contains no compressed data: nothing to do. */
+ if (!cblk->length)
+ return 0;
+ for (y = 0; y < height + 2; y++)
+ memset(t1->flags[y], 0, (width + 2) * sizeof(**t1->flags));
+
+ ff_mqc_initdec(&t1->mqc, cblk->data);
+ cblk->data[cblk->length] = 0xff;
+ cblk->data[cblk->length + 1] = 0xff;
+
+ while (passno--) {
+ switch (pass_t) {
+ case 0:
+ decode_sigpass(t1, width, height, bpno + 1, bandpos,
+ bpass_csty_symbol && (clnpass_cnt >= 4),
+ vert_causal_ctx_csty_symbol);
+ break;
+ case 1:
+ decode_refpass(t1, width, height, bpno + 1);
+ if (bpass_csty_symbol && clnpass_cnt >= 4)
+ ff_mqc_initdec(&t1->mqc, cblk->data);
+ break;
+ case 2:
+ decode_clnpass(s, t1, width, height, bpno + 1, bandpos,
+ codsty->cblk_style & JPEG2000_CBLK_SEGSYM,
+ vert_causal_ctx_csty_symbol);
+ clnpass_cnt = clnpass_cnt + 1;
+ if (bpass_csty_symbol && clnpass_cnt >= 4)
+ ff_mqc_initdec(&t1->mqc, cblk->data);
+ break;
+ }
+
+ pass_t++;
+ if (pass_t == 3) {
+ bpno--;
+ pass_t = 0;
+ }
+ }
+ return 0;
+}
+
+/* TODO: Verify dequantization for lossless case
+ * comp->data can be float or int
+ * band->stepsize can be float or int
+ * depending on the type of DWT transformation.
+ * see ISO/IEC 15444-1:2002 A.6.1 */
+
+/* Float dequantization of a codeblock.*/
+static void dequantization_float(int x, int y, Jpeg2000Cblk *cblk,
+ Jpeg2000Component *comp,
+ Jpeg2000T1Context *t1, Jpeg2000Band *band)
+{
+ int i, j;
+ int w = cblk->coord[0][1] - cblk->coord[0][0];
+ for (j = 0; j < (cblk->coord[1][1] - cblk->coord[1][0]); ++j) {
+ float *datap = &comp->f_data[(comp->coord[0][1] - comp->coord[0][0]) * (y + j) + x];
+ int *src = t1->data[j];
+ for (i = 0; i < w; ++i)
+ datap[i] = src[i] * band->f_stepsize;
+ }
+}
+
+/* Integer dequantization of a codeblock.*/
+static void dequantization_int(int x, int y, Jpeg2000Cblk *cblk,
+ Jpeg2000Component *comp,
+ Jpeg2000T1Context *t1, Jpeg2000Band *band)
+{
+ int i, j;
+ int w = cblk->coord[0][1] - cblk->coord[0][0];
+ for (j = 0; j < (cblk->coord[1][1] - cblk->coord[1][0]); ++j) {
+ int32_t *datap = &comp->i_data[(comp->coord[0][1] - comp->coord[0][0]) * (y + j) + x];
+ int *src = t1->data[j];
+ for (i = 0; i < w; ++i)
+ datap[i] = (src[i] * band->i_stepsize + (1 << 15)) >> 16;
+ }
+}
+
+/* Inverse ICT parameters in float and integer.
+ * int value = (float value) * (1<<16) */
+static const float f_ict_params[4] = {
+ 1.402f,
+ 0.34413f,
+ 0.71414f,
+ 1.772f
+};
+static const int i_ict_params[4] = {
+ 91881,
+ 22553,
+ 46802,
+ 116130
+};
+
+static void mct_decode(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile)
+{
+ int i, csize = 1;
+ int32_t *src[3], i0, i1, i2;
+ float *srcf[3], i0f, i1f, i2f;
+
+ for (i = 0; i < 3; i++)
+ if (tile->codsty[0].transform == FF_DWT97)
+ srcf[i] = tile->comp[i].f_data;
+ else
+ src [i] = tile->comp[i].i_data;
+
+ for (i = 0; i < 2; i++)
+ csize *= tile->comp[0].coord[i][1] - tile->comp[0].coord[i][0];
+ switch (tile->codsty[0].transform) {
+ case FF_DWT97:
+ for (i = 0; i < csize; i++) {
+ i0f = *srcf[0] + (f_ict_params[0] * *srcf[2]);
+ i1f = *srcf[0] - (f_ict_params[1] * *srcf[1])
+ - (f_ict_params[2] * *srcf[2]);
+ i2f = *srcf[0] + (f_ict_params[3] * *srcf[1]);
+ *srcf[0]++ = i0f;
+ *srcf[1]++ = i1f;
+ *srcf[2]++ = i2f;
+ }
+ break;
+ case FF_DWT97_INT:
+ for (i = 0; i < csize; i++) {
+ i0 = *src[0] + (((i_ict_params[0] * *src[2]) + (1 << 15)) >> 16);
+ i1 = *src[0] - (((i_ict_params[1] * *src[1]) + (1 << 15)) >> 16)
+ - (((i_ict_params[2] * *src[2]) + (1 << 15)) >> 16);
+ i2 = *src[0] + (((i_ict_params[3] * *src[1]) + (1 << 15)) >> 16);
+ *src[0]++ = i0;
+ *src[1]++ = i1;
+ *src[2]++ = i2;
+ }
+ break;
+ case FF_DWT53:
+ for (i = 0; i < csize; i++) {
+ i1 = *src[0] - (*src[2] + *src[1] >> 2);
+ i0 = i1 + *src[2];
+ i2 = i1 + *src[1];
+ *src[0]++ = i0;
+ *src[1]++ = i1;
+ *src[2]++ = i2;
+ }
+ break;
+ }
+}
+
+static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
+ AVFrame *picture)
+{
+ int compno, reslevelno, bandno;
+ int x, y;
+
+ uint8_t *line;
+ Jpeg2000T1Context t1;
+ /* Loop on tile components */
+
+ for (compno = 0; compno < s->ncomponents; compno++) {
+ Jpeg2000Component *comp = tile->comp + compno;
+ Jpeg2000CodingStyle *codsty = tile->codsty + compno;
+ /* Loop on resolution levels */
+ for (reslevelno = 0; reslevelno < codsty->nreslevels2decode; reslevelno++) {
+ Jpeg2000ResLevel *rlevel = comp->reslevel + reslevelno;
+ /* Loop on bands */
+ for (bandno = 0; bandno < rlevel->nbands; bandno++) {
+ uint16_t nb_precincts, precno;
+ Jpeg2000Band *band = rlevel->band + bandno;
+ int cblkno = 0, bandpos;
+ bandpos = bandno + (reslevelno > 0);
+
+ if (band->coord[0][0] == band->coord[0][1] ||
+ band->coord[1][0] == band->coord[1][1])
+ continue;
+
+ nb_precincts = rlevel->num_precincts_x * rlevel->num_precincts_y;
+ /* Loop on precincts */
+ for (precno = 0; precno < nb_precincts; precno++) {
+ Jpeg2000Prec *prec = band->prec + precno;
+
+ /* Loop on codeblocks */
+ for (cblkno = 0; cblkno < prec->nb_codeblocks_width * prec->nb_codeblocks_height; cblkno++) {
+ int x, y;
+ Jpeg2000Cblk *cblk = prec->cblk + cblkno;
+ decode_cblk(s, codsty, &t1, cblk,
+ cblk->coord[0][1] - cblk->coord[0][0],
+ cblk->coord[1][1] - cblk->coord[1][0],
+ bandpos);
+
+ x = cblk->coord[0][0];
+ y = cblk->coord[1][0];
+
+ if (codsty->transform == FF_DWT97)
+ dequantization_float(x, y, cblk, comp, &t1, band);
+ else
+ dequantization_int(x, y, cblk, comp, &t1, band);
+ } /* end cblk */
+ } /*end prec */
+ } /* end band */
+ } /* end reslevel */
+
+ /* inverse DWT */
+ ff_dwt_decode(&comp->dwt, codsty->transform == FF_DWT97 ? (void*)comp->f_data : (void*)comp->i_data);
+ } /*end comp */
+
+ /* inverse MCT transformation */
+ if (tile->codsty[0].mct)
+ mct_decode(s, tile);
+
+ if (s->precision <= 8) {
+ for (compno = 0; compno < s->ncomponents; compno++) {
+ Jpeg2000Component *comp = tile->comp + compno;
+ Jpeg2000CodingStyle *codsty = tile->codsty + compno;
+ float *datap = comp->f_data;
+ int32_t *i_datap = comp->i_data;
+ int cbps = s->cbps[compno];
+ int w = tile->comp[compno].coord[0][1] - s->image_offset_x;
+
+ y = tile->comp[compno].coord[1][0] - s->image_offset_y;
+ line = picture->data[0] + y * picture->linesize[0];
+ for (; y < tile->comp[compno].coord[1][1] - s->image_offset_y; y += s->cdy[compno]) {
+ uint8_t *dst;
+
+ x = tile->comp[compno].coord[0][0] - s->image_offset_x;
+ dst = line + x * s->ncomponents + compno;
+
+ if (codsty->transform == FF_DWT97) {
+ for (; x < w; x += s->cdx[compno]) {
+ int val = lrintf(*datap) + (1 << (cbps - 1));
+ /* DC level shift and clip see ISO 15444-1:2002 G.1.2 */
+ val = av_clip(val, 0, (1 << cbps) - 1);
+ *dst = val << (8 - cbps);
+ datap++;
+ dst += s->ncomponents;
+ }
+ } else {
+ for (; x < w; x += s->cdx[compno]) {
+ int val = *i_datap + (1 << (cbps - 1));
+ /* DC level shift and clip see ISO 15444-1:2002 G.1.2 */
+ val = av_clip(val, 0, (1 << cbps) - 1);
+ *dst = val << (8 - cbps);
+ i_datap++;
+ dst += s->ncomponents;
+ }
+ }
+ line += picture->linesize[0];
+ }
+ }
+ } else {
+ for (compno = 0; compno < s->ncomponents; compno++) {
+ Jpeg2000Component *comp = tile->comp + compno;
+ Jpeg2000CodingStyle *codsty = tile->codsty + compno;
+ float *datap = comp->f_data;
+ int32_t *i_datap = comp->i_data;
+ uint16_t *linel;
+ int cbps = s->cbps[compno];
+ int w = tile->comp[compno].coord[0][1] - s->image_offset_x;
+
+ y = tile->comp[compno].coord[1][0] - s->image_offset_y;
+ linel = (uint16_t *)picture->data[0] + y * (picture->linesize[0] >> 1);
+ for (; y < tile->comp[compno].coord[1][1] - s->image_offset_y; y += s->cdy[compno]) {
+ uint16_t *dst;
+ x = tile->comp[compno].coord[0][0] - s->image_offset_x;
+ dst = linel + (x * s->ncomponents + compno);
+ if (codsty->transform == FF_DWT97) {
+ for (; x < w; x += s-> cdx[compno]) {
+ int val = lrintf(*datap) + (1 << (cbps - 1));
+ /* DC level shift and clip see ISO 15444-1:2002 G.1.2 */
+ val = av_clip(val, 0, (1 << cbps) - 1);
+ /* align 12 bit values in little-endian mode */
+ *dst = val << (16 - cbps);
+ datap++;
+ dst += s->ncomponents;
+ }
+ } else {
+ for (; x < w; x += s-> cdx[compno]) {
+ int val = *i_datap + (1 << (cbps - 1));
+ /* DC level shift and clip see ISO 15444-1:2002 G.1.2 */
+ val = av_clip(val, 0, (1 << cbps) - 1);
+ /* align 12 bit values in little-endian mode */
+ *dst = val << (16 - cbps);
+ i_datap++;
+ dst += s->ncomponents;
+ }
+ }
+ linel += picture->linesize[0] >> 1;
+ }
+ }
+ }
+
+ return 0;
+}
+
+static void jpeg2000_dec_cleanup(Jpeg2000DecoderContext *s)
+{
+ int tileno, compno;
+ for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++) {
+ for (compno = 0; compno < s->ncomponents; compno++) {
+ Jpeg2000Component *comp = s->tile[tileno].comp + compno;
+ Jpeg2000CodingStyle *codsty = s->tile[tileno].codsty + compno;
+
+ ff_jpeg2000_cleanup(comp, codsty);
+ }
+ av_freep(&s->tile[tileno].comp);
+ }
+ av_freep(&s->tile);
+ s->numXtiles = s->numYtiles = 0;
+}
+
+static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s)
+{
+ Jpeg2000CodingStyle *codsty = s->codsty;
+ Jpeg2000QuantStyle *qntsty = s->qntsty;
+ uint8_t *properties = s->properties;
+
+ for (;;) {
+ int len, ret = 0;
+ uint16_t marker;
+ int oldpos;
+
+ if (bytestream2_get_bytes_left(&s->g) < 2) {
+ av_log(s->avctx, AV_LOG_ERROR, "Missing EOC\n");
+ break;
+ }
+
+ marker = bytestream2_get_be16u(&s->g);
+ oldpos = bytestream2_tell(&s->g);
+
+ if (marker == JPEG2000_SOD) {
+ Jpeg2000Tile *tile;
+ Jpeg2000TilePart *tp;
+
+ if (s->curtileno < 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "Missing SOT\n");
+ return AVERROR_INVALIDDATA;
+ }
+ if (!s->tile) {
+ av_log(s->avctx, AV_LOG_ERROR, "Missing SIZ\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ tile = s->tile + s->curtileno;
+ tp = tile->tile_part + tile->tp_idx;
+ bytestream2_init(&tp->tpg, s->g.buffer, tp->tp_end - s->g.buffer);
+ bytestream2_skip(&s->g, tp->tp_end - s->g.buffer);
+
+ continue;
+ }
+ if (marker == JPEG2000_EOC)
+ break;
+
+ len = bytestream2_get_be16u(&s->g);
+ if (len < 2 || bytestream2_get_bytes_left(&s->g) < len - 2)
+ return AVERROR_INVALIDDATA;
+
+ switch (marker) {
+ case JPEG2000_SIZ:
+ ret = get_siz(s);
+ break;
+ case JPEG2000_COC:
+ ret = get_coc(s, codsty, properties);
+ break;
+ case JPEG2000_COD:
+ ret = get_cod(s, codsty, properties);
+ break;
+ case JPEG2000_QCC:
+ ret = get_qcc(s, len, qntsty, properties);
+ break;
+ case JPEG2000_QCD:
+ ret = get_qcd(s, len, qntsty, properties);
+ break;
+ case JPEG2000_SOT:
+ if (!(ret = get_sot(s, len))) {
+ codsty = s->tile[s->curtileno].codsty;
+ qntsty = s->tile[s->curtileno].qntsty;
+ properties = s->tile[s->curtileno].properties;
+ }
+ break;
+ case JPEG2000_COM:
+ // the comment is ignored
+ bytestream2_skip(&s->g, len - 2);
+ break;
+ case JPEG2000_TLM:
+ // Tile-part lengths
+ ret = get_tlm(s, len);
+ break;
+ default:
+ av_log(s->avctx, AV_LOG_ERROR,
+ "unsupported marker 0x%.4X at pos 0x%X\n",
+ marker, bytestream2_tell(&s->g) - 4);
+ bytestream2_skip(&s->g, len - 2);
+ break;
+ }
+ if (bytestream2_tell(&s->g) - oldpos != len || ret) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "error during processing marker segment %.4x\n", marker);
+ return ret ? ret : -1;
+ }
+ }
+ return 0;
+}
+
+/* Read bit stream packets --> T2 operation. */
+static int jpeg2000_read_bitstream_packets(Jpeg2000DecoderContext *s)
+{
+ int ret = 0;
+ int tileno;
+
+ for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++) {
+ Jpeg2000Tile *tile = s->tile + tileno;
+
+ if (ret = init_tile(s, tileno))
+ return ret;
+
+ s->g = tile->tile_part[0].tpg;
+ if (ret = jpeg2000_decode_packets(s, tile))
+ return ret;
+ }
+
+ return 0;
+}
+
+static int jp2_find_codestream(Jpeg2000DecoderContext *s)
+{
+ uint32_t atom_size, atom;
+ int found_codestream = 0, search_range = 10;
+
+ while(!found_codestream && search_range
+ &&
+ bytestream2_get_bytes_left(&s->g) >= 8) {
+ atom_size = bytestream2_get_be32u(&s->g);
+ atom = bytestream2_get_be32u(&s->g);
+ if (atom == JP2_CODESTREAM) {
+ found_codestream = 1;
+ } else {
+ if (bytestream2_get_bytes_left(&s->g) < atom_size - 8)
+ return 0;
+ bytestream2_skipu(&s->g, atom_size - 8);
+ search_range--;
+ }
+ }
+
+ if (found_codestream)
+ return 1;
+ return 0;
+}
+
+static int jpeg2000_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame, AVPacket *avpkt)
+{
+ Jpeg2000DecoderContext *s = avctx->priv_data;
+ ThreadFrame frame = { .f = data };
+ AVFrame *picture = data;
+ int tileno, ret;
+
+ s->avctx = avctx;
+ bytestream2_init(&s->g, avpkt->data, avpkt->size);
+ s->curtileno = 0; // TODO: only one tile in DCI JP2K. to implement for more tiles
+
+ if (bytestream2_get_bytes_left(&s->g) < 2) {
+ ret = AVERROR_INVALIDDATA;
+ goto end;
+ }
+
+ // check if the image is in jp2 format
+ if (bytestream2_get_bytes_left(&s->g) >= 12 &&
+ (bytestream2_get_be32u(&s->g) == 12) &&
+ (bytestream2_get_be32u(&s->g) == JP2_SIG_TYPE) &&
+ (bytestream2_get_be32u(&s->g) == JP2_SIG_VALUE)) {
+ if (!jp2_find_codestream(s)) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Could not find Jpeg2000 codestream atom.\n");
+ ret = AVERROR_INVALIDDATA;
+ goto end;
+ }
+ } else {
+ bytestream2_seek(&s->g, 0, SEEK_SET);
+ }
+
+ if (bytestream2_get_be16u(&s->g) != JPEG2000_SOC) {
+ av_log(avctx, AV_LOG_ERROR, "SOC marker not present\n");
+ ret = AVERROR_INVALIDDATA;
+ goto end;
+ }
+ if (ret = jpeg2000_read_main_headers(s))
+ goto end;
+
+ /* get picture buffer */
+ if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "ff_thread_get_buffer() failed.\n");
+ goto end;
+ }
+ picture->pict_type = AV_PICTURE_TYPE_I;
+ picture->key_frame = 1;
+
+ if (ret = jpeg2000_read_bitstream_packets(s))
+ goto end;
+ for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++)
+ if (ret = jpeg2000_decode_tile(s, s->tile + tileno, picture))
+ goto end;
+
+ jpeg2000_dec_cleanup(s);
+
+ *got_frame = 1;
+
+ return bytestream2_tell(&s->g);
+
+end:
+ jpeg2000_dec_cleanup(s);
+ return ret;
+}
+
+static void jpeg2000_init_static_data(AVCodec *codec)
+{
+ ff_jpeg2000_init_tier1_luts();
+ ff_mqc_init_context_tables();
+}
+
+#define OFFSET(x) offsetof(Jpeg2000DecoderContext, x)
+#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
+
+static const AVOption options[] = {
+ { "lowres", "Lower the decoding resolution by a power of two",
+ OFFSET(reduction_factor), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, JPEG2000_MAX_RESLEVELS - 1, VD },
+ { NULL },
+};
+
+static const AVProfile profiles[] = {
+ { FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0, "JPEG 2000 codestream restriction 0" },
+ { FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1, "JPEG 2000 codestream restriction 1" },
+ { FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION, "JPEG 2000 no codestream restrictions" },
+ { FF_PROFILE_JPEG2000_DCINEMA_2K, "JPEG 2000 digital cinema 2K" },
+ { FF_PROFILE_JPEG2000_DCINEMA_4K, "JPEG 2000 digital cinema 4K" },
+ { FF_PROFILE_UNKNOWN },
+};
+
+static const AVClass class = {
+ .class_name = "jpeg2000",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+AVCodec ff_jpeg2000_decoder = {
+ .name = "jpeg2000",
+ .long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_JPEG2000,
+ .capabilities = CODEC_CAP_FRAME_THREADS,
+ .priv_data_size = sizeof(Jpeg2000DecoderContext),
+ .init_static_data = jpeg2000_init_static_data,
+ .decode = jpeg2000_decode_frame,
+ .priv_class = &class,
+ .profiles = NULL_IF_CONFIG_SMALL(profiles)
+};

libav-v10.1.tar.bz2/libavcodec/jpeg2000dwt.c Added

@@ -0,0 +1,357 @@
+/*
+ * Discrete wavelet transform
+ * Copyright (c) 2007 Kamil Nowosad
+ * Copyright (c) 2013 Nicolas Bertrand <nicoinattendu@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Discrete wavelet transform
+ */
+
+#include "libavutil/common.h"
+#include "libavutil/mem.h"
+#include "jpeg2000dwt.h"
+#include "internal.h"
+
+/* Defines for 9/7 DWT lifting parameters.
+ * Parameters are in float. */
+#define F_LFTG_ALPHA 1.586134342059924f
+#define F_LFTG_BETA 0.052980118572961f
+#define F_LFTG_GAMMA 0.882911075530934f
+#define F_LFTG_DELTA 0.443506852043971f
+#define F_LFTG_K 1.230174104914001f
+#define F_LFTG_X 1.625732422f
+/* FIXME: Why use 1.625732422 instead of 1/F_LFTG_K?
+ * Incorrect value in JPEG2000 norm.
+ * see (ISO/IEC 15444:1 (version 2002) F.3.8.2 */
+
+/* Lifting parameters in integer format.
+ * Computed as param = (float param) * (1 << 16) */
+#define I_LFTG_ALPHA 103949
+#define I_LFTG_BETA 3472
+#define I_LFTG_GAMMA 57862
+#define I_LFTG_DELTA 29066
+#define I_LFTG_K 80621
+#define I_LFTG_X 106544
+
+
+static inline void extend53(int *p, int i0, int i1)
+{
+ p[i0 - 1] = p[i0 + 1];
+ p[i1] = p[i1 - 2];
+ p[i0 - 2] = p[i0 + 2];
+ p[i1 + 1] = p[i1 - 3];
+}
+
+static inline void extend97_float(float *p, int i0, int i1)
+{
+ int i;
+
+ for (i = 1; i <= 4; i++) {
+ p[i0 - i] = p[i0 + i];
+ p[i1 + i - 1] = p[i1 - i - 1];
+ }
+}
+
+static inline void extend97_int(int32_t *p, int i0, int i1)
+{
+ int i;
+
+ for (i = 1; i <= 4; i++) {
+ p[i0 - i] = p[i0 + i];
+ p[i1 + i - 1] = p[i1 - i - 1];
+ }
+}
+
+static void sr_1d53(int *p, int i0, int i1)
+{
+ int i;
+
+ if (i1 == i0 + 1)
+ return;
+
+ extend53(p, i0, i1);
+
+ for (i = i0 / 2; i < i1 / 2 + 1; i++)
+ p[2 * i] -= (p[2 * i - 1] + p[2 * i + 1] + 2) >> 2;
+ for (i = i0 / 2; i < i1 / 2; i++)
+ p[2 * i + 1] += (p[2 * i] + p[2 * i + 2]) >> 1;
+}
+
+static void dwt_decode53(DWTContext *s, int *t)
+{
+ int lev;
+ int w = s->linelen[s->ndeclevels - 1][0];
+ int32_t *line = s->i_linebuf;
+ line += 3;
+
+ for (lev = 0; lev < s->ndeclevels; lev++) {
+ int lh = s->linelen[lev][0],
+ lv = s->linelen[lev][1],
+ mh = s->mod[lev][0],
+ mv = s->mod[lev][1],
+ lp;
+ int *l;
+
+ // HOR_SD
+ l = line + mh;
+ for (lp = 0; lp < lv; lp++) {
+ int i, j = 0;
+ // copy with interleaving
+ for (i = mh; i < lh; i += 2, j++)
+ l[i] = t[w * lp + j];
+ for (i = 1 - mh; i < lh; i += 2, j++)
+ l[i] = t[w * lp + j];
+
+ sr_1d53(line, mh, mh + lh);
+
+ for (i = 0; i < lh; i++)
+ t[w * lp + i] = l[i];
+ }
+
+ // VER_SD
+ l = line + mv;
+ for (lp = 0; lp < lh; lp++) {
+ int i, j = 0;
+ // copy with interleaving
+ for (i = mv; i < lv; i += 2, j++)
+ l[i] = t[w * j + lp];
+ for (i = 1 - mv; i < lv; i += 2, j++)
+ l[i] = t[w * j + lp];
+
+ sr_1d53(line, mv, mv + lv);
+
+ for (i = 0; i < lv; i++)
+ t[w * i + lp] = l[i];
+ }
+ }
+}
+
+static void sr_1d97_float(float *p, int i0, int i1)
+{
+ int i;
+
+ if (i1 == i0 + 1)
+ return;
+
+ extend97_float(p, i0, i1);
+
+ for (i = i0 / 2 - 1; i < i1 / 2 + 2; i++)
+ p[2 * i] -= F_LFTG_DELTA * (p[2 * i - 1] + p[2 * i + 1]);
+ /* step 4 */
+ for (i = i0 / 2 - 1; i < i1 / 2 + 1; i++)
+ p[2 * i + 1] -= F_LFTG_GAMMA * (p[2 * i] + p[2 * i + 2]);
+ /*step 5*/
+ for (i = i0 / 2; i < i1 / 2 + 1; i++)
+ p[2 * i] += F_LFTG_BETA * (p[2 * i - 1] + p[2 * i + 1]);
+ /* step 6 */
+ for (i = i0 / 2; i < i1 / 2; i++)
+ p[2 * i + 1] += F_LFTG_ALPHA * (p[2 * i] + p[2 * i + 2]);
+}
+
+static void dwt_decode97_float(DWTContext *s, float *t)
+{
+ int lev;
+ int w = s->linelen[s->ndeclevels - 1][0];
+ float *line = s->f_linebuf;
+ float *data = t;
+ /* position at index O of line range [0-5,w+5] cf. extend function */
+ line += 5;
+
+ for (lev = 0; lev < s->ndeclevels; lev++) {
+ int lh = s->linelen[lev][0],
+ lv = s->linelen[lev][1],
+ mh = s->mod[lev][0],
+ mv = s->mod[lev][1],
+ lp;
+ float *l;
+ // HOR_SD
+ l = line + mh;
+ for (lp = 0; lp < lv; lp++) {
+ int i, j = 0;
+ // copy with interleaving
+ for (i = mh; i < lh; i += 2, j++)
+ l[i] = data[w * lp + j] * F_LFTG_K;
+ for (i = 1 - mh; i < lh; i += 2, j++)
+ l[i] = data[w * lp + j] * F_LFTG_X;
+
+ sr_1d97_float(line, mh, mh + lh);
+
+ for (i = 0; i < lh; i++)
+ data[w * lp + i] = l[i];
+ }
+
+ // VER_SD
+ l = line + mv;
+ for (lp = 0; lp < lh; lp++) {
+ int i, j = 0;
+ // copy with interleaving
+ for (i = mv; i < lv; i += 2, j++)
+ l[i] = data[w * j + lp] * F_LFTG_K;
+ for (i = 1 - mv; i < lv; i += 2, j++)
+ l[i] = data[w * j + lp] * F_LFTG_X;
+
+ sr_1d97_float(line, mv, mv + lv);
+
+ for (i = 0; i < lv; i++)
+ data[w * i + lp] = l[i];
+ }
+ }
+}
+
+static void sr_1d97_int(int32_t *p, int i0, int i1)
+{
+ int i;
+
+ if (i1 == i0 + 1)
+ return;
+
+ extend97_int(p, i0, i1);
+
+ for (i = i0 / 2 - 1; i < i1 / 2 + 2; i++)
+ p[2 * i] -= (I_LFTG_DELTA * (p[2 * i - 1] + p[2 * i + 1]) + (1 << 15)) >> 16;
+ /* step 4 */
+ for (i = i0 / 2 - 1; i < i1 / 2 + 1; i++)
+ p[2 * i + 1] -= (I_LFTG_GAMMA * (p[2 * i] + p[2 * i + 2]) + (1 << 15)) >> 16;
+ /*step 5*/
+ for (i = i0 / 2; i < i1 / 2 + 1; i++)
+ p[2 * i] += (I_LFTG_BETA * (p[2 * i - 1] + p[2 * i + 1]) + (1 << 15)) >> 16;
+ /* step 6 */
+ for (i = i0 / 2; i < i1 / 2; i++)
+ p[2 * i + 1] += (I_LFTG_ALPHA * (p[2 * i] + p[2 * i + 2]) + (1 << 15)) >> 16;
+}
+
+static void dwt_decode97_int(DWTContext *s, int32_t *t)
+{
+ int lev;
+ int w = s->linelen[s->ndeclevels - 1][0];
+ int32_t *line = s->i_linebuf;
+ int32_t *data = t;
+ /* position at index O of line range [0-5,w+5] cf. extend function */
+ line += 5;
+
+ for (lev = 0; lev < s->ndeclevels; lev++) {
+ int lh = s->linelen[lev][0],
+ lv = s->linelen[lev][1],
+ mh = s->mod[lev][0],
+ mv = s->mod[lev][1],
+ lp;
+ int32_t *l;
+ // HOR_SD
+ l = line + mh;
+ for (lp = 0; lp < lv; lp++) {
+ int i, j = 0;
+ // rescale with interleaving
+ for (i = mh; i < lh; i += 2, j++)
+ l[i] = ((data[w * lp + j] * I_LFTG_K) + (1 << 15)) >> 16;
+ for (i = 1 - mh; i < lh; i += 2, j++)
+ l[i] = ((data[w * lp + j] * I_LFTG_X) + (1 << 15)) >> 16;
+
+ sr_1d97_int(line, mh, mh + lh);
+
+ for (i = 0; i < lh; i++)
+ data[w * lp + i] = l[i];
+ }
+
+ // VER_SD
+ l = line + mv;
+ for (lp = 0; lp < lh; lp++) {
+ int i, j = 0;
+ // rescale with interleaving
+ for (i = mv; i < lv; i += 2, j++)
+ l[i] = ((data[w * j + lp] * I_LFTG_K) + (1 << 15)) >> 16;
+ for (i = 1 - mv; i < lv; i += 2, j++)
+ l[i] = ((data[w * j + lp] * I_LFTG_X) + (1 << 15)) >> 16;
+
+ sr_1d97_int(line, mv, mv + lv);
+
+ for (i = 0; i < lv; i++)
+ data[w * i + lp] = l[i];
+ }
+ }
+}
+
+int ff_jpeg2000_dwt_init(DWTContext *s, uint16_t border[2][2],
+ int decomp_levels, int type)
+{
+ int i, j, lev = decomp_levels, maxlen,
+ b[2][2];
+
+ s->ndeclevels = decomp_levels;
+ s->type = type;
+
+ for (i = 0; i < 2; i++)
+ for (j = 0; j < 2; j++)
+ b[i][j] = border[i][j];
+
+ maxlen = FFMAX(b[0][1] - b[0][0],
+ b[1][1] - b[1][0]);
+ while (--lev >= 0)
+ for (i = 0; i < 2; i++) {
+ s->linelen[lev][i] = b[i][1] - b[i][0];
+ s->mod[lev][i] = b[i][0] & 1;
+ for (j = 0; j < 2; j++)
+ b[i][j] = (b[i][j] + 1) >> 1;
+ }
+ switch (type) {
+ case FF_DWT97:
+ s->f_linebuf = av_malloc((maxlen + 12) * sizeof(*s->f_linebuf));
+ if (!s->f_linebuf)
+ return AVERROR(ENOMEM);
+ break;
+ case FF_DWT97_INT:
+ s->i_linebuf = av_malloc((maxlen + 12) * sizeof(*s->i_linebuf));
+ if (!s->i_linebuf)
+ return AVERROR(ENOMEM);
+ break;
+ case FF_DWT53:
+ s->i_linebuf = av_malloc((maxlen + 6) * sizeof(*s->i_linebuf));
+ if (!s->i_linebuf)
+ return AVERROR(ENOMEM);
+ break;
+ default:
+ return -1;
+ }
+ return 0;
+}
+
+int ff_dwt_decode(DWTContext *s, void *t)
+{
+ switch (s->type) {
+ case FF_DWT97:
+ dwt_decode97_float(s, t);
+ break;
+ case FF_DWT97_INT:
+ dwt_decode97_int(s, t);
+ break;
+ case FF_DWT53:
+ dwt_decode53(s, t);
+ break;
+ default:
+ return -1;
+ }
+ return 0;
+}
+
+void ff_dwt_destroy(DWTContext *s)
+{
+ av_freep(&s->f_linebuf);
+ av_freep(&s->i_linebuf);
+}

libav-v10.1.tar.bz2/libavcodec/jpeg2000dwt.h Added

@@ -0,0 +1,64 @@
+/*
+ * Discrete wavelet transform
+ * Copyright (c) 2007 Kamil Nowosad
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_JPEG2000DWT_H
+#define AVCODEC_JPEG2000DWT_H
+
+/**
+ * @file
+ * Discrete wavelet transform
+ */
+
+#include <stdint.h>
+
+#define FF_DWT_MAX_DECLVLS 32 ///< max number of decomposition levels
+
+enum DWTType {
+ FF_DWT97,
+ FF_DWT53,
+ FF_DWT97_INT
+};
+
+typedef struct DWTContext {
+ /// line lengths { horizontal, vertical } in consecutive decomposition levels
+ uint16_t linelen[FF_DWT_MAX_DECLVLS][2];
+ uint8_t mod[FF_DWT_MAX_DECLVLS][2]; ///< coordinates (x0, y0) of decomp. levels mod 2
+ uint8_t ndeclevels; ///< number of decomposition levels
+ uint8_t type; ///< 0 for 9/7; 1 for 5/3
+ int32_t *i_linebuf; ///< int buffer used by transform
+ float *f_linebuf; ///< float buffer used by transform
+} DWTContext;
+
+/**
+ * Initialize DWT.
+ * @param s DWT context
+ * @param border coordinates of transformed region {{x0, x1}, {y0, y1}}
+ * @param decomp_levels number of decomposition levels
+ * @param type 0 for DWT 9/7; 1 for DWT 5/3
+ */
+int ff_jpeg2000_dwt_init(DWTContext *s, uint16_t border[2][2],
+ int decomp_levels, int type);
+
+int ff_dwt_decode(DWTContext *s, void *t);
+
+void ff_dwt_destroy(DWTContext *s);
+
+#endif /* AVCODEC_JPEG2000DWT_H */

libav-v9.6.tar.bz2/libavcodec/jpegls.c -> libav-v10.1.tar.bz2/libavcodec/jpegls.c Changed

@@ -27,63 +27,76 @@
 
 #include "jpegls.h"
 
-void ff_jpegls_init_state(JLSState *state){
+void ff_jpegls_init_state(JLSState *state)
+{
 int i;
 
 state->twonear = state->near * 2 + 1;
- state->range = ((state->maxval + state->twonear - 1) / state->twonear) + 1;
+ state->range = (state->maxval + state->twonear - 1) / state->twonear + 1;
 
 // QBPP = ceil(log2(RANGE))
- for(state->qbpp = 0; (1 << state->qbpp) < state->range; state->qbpp++);
+ for (state->qbpp = 0; (1 << state->qbpp) < state->range; state->qbpp++)
+ ;
 
- if(state->bpp < 8)
- state->limit = 16 + 2 * state->bpp - state->qbpp;
+ if (state->bpp < 8)
+ state->limit = 2 * state->bpp - state->qbpp + 16;
 else
- state->limit = (4 * state->bpp) - state->qbpp;
+ state->limit = 4 * state->bpp - state->qbpp;
 
- for(i = 0; i < 367; i++) {
- state->A[i] = FFMAX((state->range + 32) >> 6, 2);
+ for (i = 0; i < 367; i++) {
+ state->A[i] = FFMAX(state->range + 32 >> 6, 2);
 state->N[i] = 1;
 }
-
 }
 
 /**
 * Custom value clipping function used in T1, T2, T3 calculation
 */
-static inline int iso_clip(int v, int vmin, int vmax){
- if(v > vmax || v < vmin) return vmin;
- else return v;
+static inline int iso_clip(int v, int vmin, int vmax)
+{
+ if (v > vmax || v < vmin)
+ return vmin;
+ else
+ return v;
 }
 
-void ff_jpegls_reset_coding_parameters(JLSState *s, int reset_all){
- const int basic_t1= 3;
- const int basic_t2= 7;
- const int basic_t3= 21;
+void ff_jpegls_reset_coding_parameters(JLSState *s, int reset_all)
+{
+ const int basic_t1 = 3;
+ const int basic_t2 = 7;
+ const int basic_t3 = 21;
 int factor;
 
- if(s->maxval==0 || reset_all) s->maxval= (1 << s->bpp) - 1;
+ if (s->maxval == 0 || reset_all)
+ s->maxval = (1 << s->bpp) - 1;
 
- if(s->maxval >=128){
- factor= (FFMIN(s->maxval, 4095) + 128)>>8;
+ if (s->maxval >= 128) {
+ factor = FFMIN(s->maxval, 4095) + 128 >> 8;
 
- if(s->T1==0 || reset_all)
- s->T1= iso_clip(factor*(basic_t1-2) + 2 + 3*s->near, s->near+1, s->maxval);
- if(s->T2==0 || reset_all)
- s->T2= iso_clip(factor*(basic_t2-3) + 3 + 5*s->near, s->T1, s->maxval);
- if(s->T3==0 || reset_all)
- s->T3= iso_clip(factor*(basic_t3-4) + 4 + 7*s->near, s->T2, s->maxval);
- }else{
- factor= 256 / (s->maxval + 1);
+ if (s->T1 == 0 || reset_all)
+ s->T1 = iso_clip(factor * (basic_t1 - 2) + 2 + 3 * s->near,
+ s->near + 1, s->maxval);
+ if (s->T2 == 0 || reset_all)
+ s->T2 = iso_clip(factor * (basic_t2 - 3) + 3 + 5 * s->near,
+ s->T1, s->maxval);
+ if (s->T3 == 0 || reset_all)
+ s->T3 = iso_clip(factor * (basic_t3 - 4) + 4 + 7 * s->near,
+ s->T2, s->maxval);
+ } else {
+ factor = 256 / (s->maxval + 1);
 
- if(s->T1==0 || reset_all)
- s->T1= iso_clip(FFMAX(2, basic_t1/factor + 3*s->near), s->near+1, s->maxval);
- if(s->T2==0 || reset_all)
- s->T2= iso_clip(FFMAX(3, basic_t2/factor + 5*s->near), s->T1, s->maxval);
- if(s->T3==0 || reset_all)
- s->T3= iso_clip(FFMAX(4, basic_t3/factor + 7*s->near), s->T2, s->maxval);
+ if (s->T1 == 0 || reset_all)
+ s->T1 = iso_clip(FFMAX(2, basic_t1 / factor + 3 * s->near),
+ s->near + 1, s->maxval);
+ if (s->T2 == 0 || reset_all)
+ s->T2 = iso_clip(FFMAX(3, basic_t2 / factor + 5 * s->near),
+ s->T1, s->maxval);
+ if (s->T3 == 0 || reset_all)
+ s->T3 = iso_clip(FFMAX(4, basic_t3 / factor + 7 * s->near),
+ s->T2, s->maxval);
 }
 
- if(s->reset==0 || reset_all) s->reset= 64;
+ if (s->reset == 0 || reset_all)
+ s->reset = 64;
 av_dlog(NULL, "[JPEG-LS RESET] T=%i,%i,%i\n", s->T1, s->T2, s->T3);
 }

libav-v9.6.tar.bz2/libavcodec/jpegls.h -> libav-v10.1.tar.bz2/libavcodec/jpegls.h Changed

@@ -28,21 +28,20 @@
 #ifndef AVCODEC_JPEGLS_H
 #define AVCODEC_JPEGLS_H
 
-#include "avcodec.h"
 #include "libavutil/common.h"
+#include "avcodec.h"
 
-typedef struct JpeglsContext{
+typedef struct JpeglsContext {
 AVCodecContext *avctx;
- AVFrame picture;
-}JpeglsContext;
+} JpeglsContext;
 
-typedef struct JLSState{
+typedef struct JLSState {
 int T1, T2, T3;
 int A[367], B[367], C[365], N[367];
 int limit, reset, bpp, qbpp, maxval, range;
 int near, twonear;
 int run_index[3];
-}JLSState;
+} JLSState;
 
 extern const uint8_t ff_log2_run[32];
 
@@ -54,19 +53,29 @@
 /**
 * Calculate quantized gradient value, used for context determination
 */
-static inline int ff_jpegls_quantize(JLSState *s, int v){ //FIXME optimize
- if(v==0) return 0;
- if(v < 0){
- if(v <= -s->T3) return -4;
- if(v <= -s->T2) return -3;
- if(v <= -s->T1) return -2;
- if(v < -s->near) return -1;
+static inline int ff_jpegls_quantize(JLSState *s, int v)
+{
+ if (v == 0)
 return 0;
- }else{
- if(v <= s->near) return 0;
- if(v < s->T1) return 1;
- if(v < s->T2) return 2;
- if(v < s->T3) return 3;
+ if (v < 0) {
+ if (v <= -s->T3)
+ return -4;
+ if (v <= -s->T2)
+ return -3;
+ if (v <= -s->T1)
+ return -2;
+ if (v < -s->near)
+ return -1;
+ return 0;
+ } else {
+ if (v <= s->near)
+ return 0;
+ if (v < s->T1)
+ return 1;
+ if (v < s->T2)
+ return 2;
+ if (v < s->T3)
+ return 3;
 return 4;
 }
 }
@@ -76,37 +85,39 @@
 */
 void ff_jpegls_reset_coding_parameters(JLSState *s, int reset_all);
 
-
-static inline void ff_jpegls_downscale_state(JLSState *state, int Q){
- if(state->N[Q] == state->reset){
- state->A[Q] >>=1;
- state->B[Q] >>=1;
- state->N[Q] >>=1;
+static inline void ff_jpegls_downscale_state(JLSState *state, int Q)
+{
+ if (state->N[Q] == state->reset) {
+ state->A[Q] >>= 1;
+ state->B[Q] >>= 1;
+ state->N[Q] >>= 1;
 }
 state->N[Q]++;
 }
 
-static inline int ff_jpegls_update_state_regular(JLSState *state, int Q, int err){
+static inline int ff_jpegls_update_state_regular(JLSState *state,
+ int Q, int err)
+{
 state->A[Q] += FFABS(err);
- err *= state->twonear;
+ err *= state->twonear;
 state->B[Q] += err;
 
 ff_jpegls_downscale_state(state, Q);
 
- if(state->B[Q] <= -state->N[Q]) {
- state->B[Q]= FFMAX(state->B[Q] + state->N[Q], 1-state->N[Q]);
- if(state->C[Q] > -128)
+ if (state->B[Q] <= -state->N[Q]) {
+ state->B[Q] = FFMAX(state->B[Q] + state->N[Q], 1 - state->N[Q]);
+ if (state->C[Q] > -128)
 state->C[Q]--;
- }else if(state->B[Q] > 0){
- state->B[Q]= FFMIN(state->B[Q] - state->N[Q], 0);
- if(state->C[Q] < 127)
+ } else if (state->B[Q] > 0) {
+ state->B[Q] = FFMIN(state->B[Q] - state->N[Q], 0);
+ if (state->C[Q] < 127)
 state->C[Q]++;
 }
 
 return err;
 }
 
-#define R(a, i ) (bits == 8 ? ((uint8_t*)(a))[i] : ((uint16_t*)(a))[i] )
-#define W(a, i, v) (bits == 8 ? (((uint8_t*)(a))[i]=v) : (((uint16_t*)(a))[i]=v))
+#define R(a, i) (bits == 8 ? ((uint8_t *)(a))[i] : ((uint16_t *)(a))[i])
+#define W(a, i, v) (bits == 8 ? (((uint8_t *)(a))[i] = v) : (((uint16_t *)(a))[i] = v))
 
 #endif /* AVCODEC_JPEGLS_H */

libav-v9.6.tar.bz2/libavcodec/jpeglsdec.c -> libav-v10.1.tar.bz2/libavcodec/jpeglsdec.c Changed

@@ -34,18 +34,16 @@
 #include "jpegls.h"
 #include "jpeglsdec.h"
 
-
 /*
-* Uncomment this to significantly speed up decoding of broken JPEG-LS
-* (or test broken JPEG-LS decoder) and slow down ordinary decoding a bit.
-*
-* There is no Golomb code with length >= 32 bits possible, so check and
-* avoid situation of 32 zeros, Libav Golomb decoder is painfully slow
-* on this errors.
-*/
+ * Uncomment this to significantly speed up decoding of broken JPEG-LS
+ * (or test broken JPEG-LS decoder) and slow down ordinary decoding a bit.
+ *
+ * There is no Golomb code with length >= 32 bits possible, so check and
+ * avoid situation of 32 zeros, Libav Golomb decoder is painfully slow
+ * on this errors.
+ */
 //#define JLS_BROKEN
 
-
 /**
 * Decode LSE block with initialization parameters
 */
@@ -56,13 +54,13 @@
 skip_bits(&s->gb, 16); /* length: FIXME: verify field validity */
 id = get_bits(&s->gb, 8);
 
- switch(id){
+ switch (id) {
 case 1:
- s->maxval= get_bits(&s->gb, 16);
- s->t1= get_bits(&s->gb, 16);
- s->t2= get_bits(&s->gb, 16);
- s->t3= get_bits(&s->gb, 16);
- s->reset= get_bits(&s->gb, 16);
+ s->maxval = get_bits(&s->gb, 16);
+ s->t1 = get_bits(&s->gb, 16);
+ s->t2 = get_bits(&s->gb, 16);
+ s->t3 = get_bits(&s->gb, 16);
+ s->reset = get_bits(&s->gb, 16);
 
 // ff_jpegls_reset_coding_parameters(s, 0);
 //FIXME quant table?
@@ -70,13 +68,13 @@
 case 2:
 case 3:
 av_log(s->avctx, AV_LOG_ERROR, "palette not supported\n");
- return -1;
+ return AVERROR(ENOSYS);
 case 4:
 av_log(s->avctx, AV_LOG_ERROR, "oversize image not supported\n");
- return -1;
+ return AVERROR(ENOSYS);
 default:
 av_log(s->avctx, AV_LOG_ERROR, "invalid id %d\n", id);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 av_dlog(s->avctx, "ID=%i, T=%i,%i,%i\n", id, s->t1, s->t2, s->t3);
 
@@ -86,27 +84,30 @@
 /**
 * Get context-dependent Golomb code, decode it and update context
 */
-static inline int ls_get_code_regular(GetBitContext *gb, JLSState *state, int Q){
+static inline int ls_get_code_regular(GetBitContext *gb, JLSState *state, int Q)
+{
 int k, ret;
 
- for(k = 0; (state->N[Q] << k) < state->A[Q]; k++);
+ for (k = 0; (state->N[Q] << k) < state->A[Q]; k++)
+ ;
 
 #ifdef JLS_BROKEN
- if(!show_bits_long(gb, 32))return -1;
+ if (!show_bits_long(gb, 32))
+ return -1;
 #endif
 ret = get_ur_golomb_jpegls(gb, k, state->limit, state->qbpp);
 
 /* decode mapped error */
- if(ret & 1)
- ret = -((ret + 1) >> 1);
+ if (ret & 1)
+ ret = -(ret + 1 >> 1);
 else
 ret >>= 1;
 
 /* for NEAR=0, k=0 and 2*B[Q] <= - N[Q] mapping is reversed */
- if(!state->near && !k && (2 * state->B[Q] <= -state->N[Q]))
+ if (!state->near && !k && (2 * state->B[Q] <= -state->N[Q]))
 ret = -(ret + 1);
 
- ret= ff_jpegls_update_state_regular(state, Q, ret);
+ ret = ff_jpegls_update_state_regular(state, Q, ret);
 
 return ret;
 }
@@ -114,29 +115,34 @@
 /**
 * Get Golomb code, decode it and update state for run termination
 */
-static inline int ls_get_code_runterm(GetBitContext *gb, JLSState *state, int RItype, int limit_add){
+static inline int ls_get_code_runterm(GetBitContext *gb, JLSState *state,
+ int RItype, int limit_add)
+{
 int k, ret, temp, map;
 int Q = 365 + RItype;
 
- temp= state->A[Q];
- if(RItype)
+ temp = state->A[Q];
+ if (RItype)
 temp += state->N[Q] >> 1;
 
- for(k = 0; (state->N[Q] << k) < temp; k++);
+ for (k = 0; (state->N[Q] << k) < temp; k++)
+ ;
 
 #ifdef JLS_BROKEN
- if(!show_bits_long(gb, 32))return -1;
+ if (!show_bits_long(gb, 32))
+ return -1;
 #endif
- ret = get_ur_golomb_jpegls(gb, k, state->limit - limit_add - 1, state->qbpp);
+ ret = get_ur_golomb_jpegls(gb, k, state->limit - limit_add - 1,
+ state->qbpp);
 
 /* decode mapped error */
 map = 0;
- if(!k && (RItype || ret) && (2 * state->B[Q] < state->N[Q]))
+ if (!k && (RItype || ret) && (2 * state->B[Q] < state->N[Q]))
 map = 1;
 ret += RItype + map;
 
- if(ret & 1){
- ret = map - ((ret + 1) >> 1);
+ if (ret & 1) {
+ ret = map - (ret + 1 >> 1);
 state->B[Q]++;
 } else {
 ret = ret >> 1;
@@ -144,7 +150,7 @@
 
 /* update state */
 state->A[Q] += FFABS(ret) - RItype;
- ret *= state->twonear;
+ ret *= state->twonear;
 ff_jpegls_downscale_state(state, Q);
 
 return ret;
@@ -153,12 +159,15 @@
 /**
 * Decode one line of image
 */
-static inline void ls_decode_line(JLSState *state, MJpegDecodeContext *s, void *last, void *dst, int last2, int w, int stride, int comp, int bits){
+static inline void ls_decode_line(JLSState *state, MJpegDecodeContext *s,
+ void *last, void *dst, int last2, int w,
+ int stride, int comp, int bits)
+{
 int i, x = 0;
 int Ra, Rb, Rc, Rd;
 int D0, D1, D2;
 
- while(x < w) {
+ while (x < w) {
 int err, pred;
 
 /* compute gradients */
@@ -170,49 +179,51 @@
 D1 = Rb - Rc;
 D2 = Rc - Ra;
 /* run mode */
- if((FFABS(D0) <= state->near) && (FFABS(D1) <= state->near) && (FFABS(D2) <= state->near)) {
+ if ((FFABS(D0) <= state->near) &&
+ (FFABS(D1) <= state->near) &&
+ (FFABS(D2) <= state->near)) {
 int r;
 int RItype;
 
 /* decode full runs while available */
- while(get_bits1(&s->gb)) {
+ while (get_bits1(&s->gb)) {
 int r;
 r = 1 << ff_log2_run[state->run_index[comp]];
- if(x + r * stride > w) {
+ if (x + r * stride > w)
 r = (w - x) / stride;
- }
- for(i = 0; i < r; i++) {
+ for (i = 0; i < r; i++) {
 W(dst, x, Ra);
 x += stride;
 }
 /* if EOL reached, we stop decoding */
- if(r != (1 << ff_log2_run[state->run_index[comp]]))
+ if (r != 1 << ff_log2_run[state->run_index[comp]])
 return;
- if(state->run_index[comp] < 31)
+ if (state->run_index[comp] < 31)
 state->run_index[comp]++;
- if(x + stride > w)
+ if (x + stride > w)
 return;
 }
 /* decode aborted run */
 r = ff_log2_run[state->run_index[comp]];
- if(r)
+ if (r)
 r = get_bits_long(&s->gb, r);
- for(i = 0; i < r; i++) {
+ for (i = 0; i < r; i++) {
 W(dst, x, Ra);
 x += stride;
 }
 
 /* decode run termination value */
- Rb = R(last, x);
+ Rb = R(last, x);
 RItype = (FFABS(Ra - Rb) <= state->near) ? 1 : 0;
- err = ls_get_code_runterm(&s->gb, state, RItype, ff_log2_run[state->run_index[comp]]);
- if(state->run_index[comp])
+ err = ls_get_code_runterm(&s->gb, state, RItype,
+ ff_log2_run[state->run_index[comp]]);
+ if (state->run_index[comp])
 state->run_index[comp]--;
 
- if(state->near && RItype){
+ if (state->near && RItype) {
 pred = Ra + err;
 } else {
- if(Rb < Ra)
+ if (Rb < Ra)
 pred = Rb - err;
 else
 pred = Rb + err;
@@ -220,31 +231,33 @@
 } else { /* regular mode */
 int context, sign;
 
- context = ff_jpegls_quantize(state, D0) * 81 + ff_jpegls_quantize(state, D1) * 9 + ff_jpegls_quantize(state, D2);
- pred = mid_pred(Ra, Ra + Rb - Rc, Rb);
+ context = ff_jpegls_quantize(state, D0) * 81 +
+ ff_jpegls_quantize(state, D1) * 9 +
+ ff_jpegls_quantize(state, D2);
+ pred = mid_pred(Ra, Ra + Rb - Rc, Rb);
 
- if(context < 0){
+ if (context < 0) {
 context = -context;
- sign = 1;
- }else{
+ sign = 1;
+ } else {
 sign = 0;
 }
 
- if(sign){
+ if (sign) {
 pred = av_clip(pred - state->C[context], 0, state->maxval);
- err = -ls_get_code_regular(&s->gb, state, context);
+ err = -ls_get_code_regular(&s->gb, state, context);
 } else {
 pred = av_clip(pred + state->C[context], 0, state->maxval);
- err = ls_get_code_regular(&s->gb, state, context);
+ err = ls_get_code_regular(&s->gb, state, context);
 }
 
 /* we have to do something more for near-lossless coding */
 pred += err;
 }
- if(state->near){
- if(pred < -state->near)
+ if (state->near) {
+ if (pred < -state->near)
 pred += state->range * state->twonear;
- else if(pred > state->maxval + state->near)
+ else if (pred > state->maxval + state->near)
 pred -= state->range * state->twonear;
 pred = av_clip(pred, 0, state->maxval);
 }
@@ -255,51 +268,59 @@
 }
 }
 
-int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, int point_transform, int ilv){
+int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
+ int point_transform, int ilv)
+{
 int i, t = 0;
 uint8_t *zero, *last, *cur;
 JLSState *state;
- int off = 0, stride = 1, width, shift;
+ int off = 0, stride = 1, width, shift, ret = 0;
 
 zero = av_mallocz(s->picture_ptr->linesize[0]);
 last = zero;
- cur = s->picture_ptr->data[0];
+ cur = s->picture_ptr->data[0];
 
 state = av_mallocz(sizeof(JLSState));
 /* initialize JPEG-LS state from JPEG parameters */
- state->near = near;
- state->bpp = (s->bits < 2) ? 2 : s->bits;
+ state->near = near;
+ state->bpp = (s->bits < 2) ? 2 : s->bits;
 state->maxval = s->maxval;
- state->T1 = s->t1;
- state->T2 = s->t2;
- state->T3 = s->t3;
- state->reset = s->reset;
+ state->T1 = s->t1;
+ state->T2 = s->t2;
+ state->T3 = s->t3;
+ state->reset = s->reset;
 ff_jpegls_reset_coding_parameters(state, 0);
 ff_jpegls_init_state(state);
 
- if(s->bits <= 8)
+ if (s->bits <= 8)
 shift = point_transform + (8 - s->bits);
 else
 shift = point_transform + (16 - s->bits);
 
- av_dlog(s->avctx, "JPEG-LS params: %ix%i NEAR=%i MV=%i T(%i,%i,%i) RESET=%i, LIMIT=%i, qbpp=%i, RANGE=%i\n",
+ av_dlog(s->avctx,
+ "JPEG-LS params: %ix%i NEAR=%i MV=%i T(%i,%i,%i) "
+ "RESET=%i, LIMIT=%i, qbpp=%i, RANGE=%i\n",
 s->width, s->height, state->near, state->maxval,
 state->T1, state->T2, state->T3,
 state->reset, state->limit, state->qbpp, state->range);
 av_dlog(s->avctx, "JPEG params: ILV=%i Pt=%i BPP=%i, scan = %i\n",
 ilv, point_transform, s->bits, s->cur_scan);
- if(ilv == 0) { /* separate planes */
- off = s->cur_scan - 1;
+ if (ilv == 0) { /* separate planes */
+ if (s->cur_scan > s->nb_components) {
+ ret = AVERROR_INVALIDDATA;
+ goto end;
+ }
+ off = s->cur_scan - 1;
 stride = (s->nb_components > 1) ? 3 : 1;
- width = s->width * stride;
- cur += off;
- for(i = 0; i < s->height; i++) {
- if(s->bits <= 8){
- ls_decode_line(state, s, last, cur, t, width, stride, off, 8);
+ width = s->width * stride;
+ cur += off;
+ for (i = 0; i < s->height; i++) {
+ if (s->bits <= 8) {
+ ls_decode_line(state, s, last, cur, t, width, stride, off, 8);
 t = last[0];
- }else{
+ } else {
 ls_decode_line(state, s, last, cur, t, width, stride, off, 16);
- t = *((uint16_t*)last);
+ t = *((uint16_t *)last);
 }
 last = cur;
 cur += s->picture_ptr->linesize[0];
@@ -309,14 +330,15 @@
 skip_bits(&s->gb, 16); /* skip RSTn */
 }
 }
- } else if(ilv == 1) { /* line interleaving */
+ } else if (ilv == 1) { /* line interleaving */
 int j;
- int Rc[3] = {0, 0, 0};
+ int Rc[3] = { 0, 0, 0 };
 memset(cur, 0, s->picture_ptr->linesize[0]);
 width = s->width * 3;
- for(i = 0; i < s->height; i++) {
- for(j = 0; j < 3; j++) {
- ls_decode_line(state, s, last + j, cur + j, Rc[j], width, 3, j, 8);
+ for (i = 0; i < s->height; i++) {
+ for (j = 0; j < 3; j++) {
+ ls_decode_line(state, s, last + j, cur + j,
+ Rc[j], width, 3, j, 8);
 Rc[j] = last[j];
 
 if (s->restart_interval && !--s->restart_count) {
@@ -327,47 +349,46 @@
 last = cur;
 cur += s->picture_ptr->linesize[0];
 }
- } else if(ilv == 2) { /* sample interleaving */
- av_log(s->avctx, AV_LOG_ERROR, "Sample interleaved images are not supported.\n");
- av_free(state);
- av_free(zero);
- return -1;
+ } else if (ilv == 2) { /* sample interleaving */
+ avpriv_report_missing_feature(s->avctx, "Sample interleaved images");
+ ret = AVERROR_PATCHWELCOME;
+ goto end;
 }
 
- if(shift){ /* we need to do point transform or normalize samples */
+ if (shift) { /* we need to do point transform or normalize samples */
 int x, w;
 
 w = s->width * s->nb_components;
 
- if(s->bits <= 8){
+ if (s->bits <= 8) {
 uint8_t *src = s->picture_ptr->data[0];
 
- for(i = 0; i < s->height; i++){
- for(x = off; x < w; x+= stride){
+ for (i = 0; i < s->height; i++) {
+ for (x = off; x < w; x += stride)
 src[x] <<= shift;
- }
 src += s->picture_ptr->linesize[0];
 }
- }else{
- uint16_t *src = (uint16_t*) s->picture_ptr->data[0];
+ } else {
+ uint16_t *src = (uint16_t *)s->picture_ptr->data[0];
 
- for(i = 0; i < s->height; i++){
- for(x = 0; x < w; x++){
+ for (i = 0; i < s->height; i++) {
+ for (x = 0; x < w; x++)
 src[x] <<= shift;
- }
- src += s->picture_ptr->linesize[0]/2;
+ src += s->picture_ptr->linesize[0] / 2;
 }
 }
 }
+
+end:
 av_free(state);
 av_free(zero);
 
- return 0;
+ return ret;
 }
 
-
 AVCodec ff_jpegls_decoder = {
 .name = "jpegls",
+ .long_name = NULL_IF_CONFIG_SMALL("JPEG-LS"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_JPEGLS,
 .priv_data_size = sizeof(MJpegDecodeContext),
@@ -375,5 +396,4 @@
 .close = ff_mjpeg_decode_end,
 .decode = ff_mjpeg_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("JPEG-LS"),
 };

libav-v9.6.tar.bz2/libavcodec/jpeglsdec.h -> libav-v10.1.tar.bz2/libavcodec/jpeglsdec.h Changed

libav-v9.6.tar.bz2/libavcodec/jpeglsenc.c -> libav-v10.1.tar.bz2/libavcodec/jpeglsenc.c Changed

@@ -30,28 +30,29 @@
 #include "golomb.h"
 #include "internal.h"
 #include "mathops.h"
-#include "dsputil.h"
 #include "mjpeg.h"
 #include "jpegls.h"
 
-
 /**
 * Encode error from regular symbol
 */
-static inline void ls_encode_regular(JLSState *state, PutBitContext *pb, int Q, int err){
+static inline void ls_encode_regular(JLSState *state, PutBitContext *pb, int Q,
+ int err)
+{
 int k;
 int val;
 int map;
 
- for(k = 0; (state->N[Q] << k) < state->A[Q]; k++);
+ for (k = 0; (state->N[Q] << k) < state->A[Q]; k++)
+ ;
 
 map = !state->near && !k && (2 * state->B[Q] <= -state->N[Q]);
 
- if(err < 0)
+ if (err < 0)
 err += state->range;
- if(err >= ((state->range + 1) >> 1)) {
+ if (err >= (state->range + 1 >> 1)) {
 err -= state->range;
- val = 2 * FFABS(err) - 1 - map;
+ val = 2 * FFABS(err) - 1 - map;
 } else
 val = 2 * err + map;
 
@@ -63,27 +64,30 @@
 /**
 * Encode error from run termination
 */
-static inline void ls_encode_runterm(JLSState *state, PutBitContext *pb, int RItype, int err, int limit_add){
+static inline void ls_encode_runterm(JLSState *state, PutBitContext *pb,
+ int RItype, int err, int limit_add)
+{
 int k;
 int val, map;
 int Q = 365 + RItype;
 int temp;
 
 temp = state->A[Q];
- if(RItype)
+ if (RItype)
 temp += state->N[Q] >> 1;
- for(k = 0; (state->N[Q] << k) < temp; k++);
+ for (k = 0; (state->N[Q] << k) < temp; k++)
+ ;
 map = 0;
- if(!k && err && (2 * state->B[Q] < state->N[Q]))
+ if (!k && err && (2 * state->B[Q] < state->N[Q]))
 map = 1;
 
- if(err < 0)
- val = - (2 * err) - 1 - RItype + map;
+ if (err < 0)
+ val = -(2 * err) - 1 - RItype + map;
 else
 val = 2 * err - RItype - map;
 set_ur_golomb_jpegls(pb, val, k, state->limit - limit_add - 1, state->qbpp);
 
- if(err < 0)
+ if (err < 0)
 state->B[Q]++;
 state->A[Q] += (val + 1 - RItype) >> 1;
 
@@ -93,19 +97,21 @@
 /**
 * Encode run value as specified by JPEG-LS standard
 */
-static inline void ls_encode_run(JLSState *state, PutBitContext *pb, int run, int comp, int trail){
- while(run >= (1 << ff_log2_run[state->run_index[comp]])){
+static inline void ls_encode_run(JLSState *state, PutBitContext *pb, int run,
+ int comp, int trail)
+{
+ while (run >= (1 << ff_log2_run[state->run_index[comp]])) {
 put_bits(pb, 1, 1);
 run -= 1 << ff_log2_run[state->run_index[comp]];
- if(state->run_index[comp] < 31)
+ if (state->run_index[comp] < 31)
 state->run_index[comp]++;
 }
 /* if hit EOL, encode another full run, else encode aborted run */
- if(!trail && run) {
+ if (!trail && run) {
 put_bits(pb, 1, 1);
- }else if(trail){
+ } else if (trail) {
 put_bits(pb, 1, 0);
- if(ff_log2_run[state->run_index[comp]])
+ if (ff_log2_run[state->run_index[comp]])
 put_bits(pb, ff_log2_run[state->run_index[comp]], run);
 }
 }
@@ -113,12 +119,15 @@
 /**
 * Encode one line of image
 */
-static inline void ls_encode_line(JLSState *state, PutBitContext *pb, void *last, void *cur, int last2, int w, int stride, int comp, int bits){
+static inline void ls_encode_line(JLSState *state, PutBitContext *pb,
+ void *last, void *cur, int last2, int w,
+ int stride, int comp, int bits)
+{
 int x = 0;
 int Ra, Rb, Rc, Rd;
 int D0, D1, D2;
 
- while(x < w) {
+ while (x < w) {
 int err, pred, sign;
 
 /* compute gradients */
@@ -131,71 +140,76 @@
 D2 = Rc - Ra;
 
 /* run mode */
- if((FFABS(D0) <= state->near) && (FFABS(D1) <= state->near) && (FFABS(D2) <= state->near)) {
+ if ((FFABS(D0) <= state->near) &&
+ (FFABS(D1) <= state->near) &&
+ (FFABS(D2) <= state->near)) {
 int RUNval, RItype, run;
 
- run = 0;
+ run = 0;
 RUNval = Ra;
- while(x < w && (FFABS(R(cur, x) - RUNval) <= state->near)){
+ while (x < w && (FFABS(R(cur, x) - RUNval) <= state->near)) {
 run++;
 W(cur, x, Ra);
 x += stride;
 }
 ls_encode_run(state, pb, run, comp, x < w);
- if(x >= w)
+ if (x >= w)
 return;
- Rb = R(last, x);
- RItype = (FFABS(Ra - Rb) <= state->near);
- pred = RItype ? Ra : Rb;
- err = R(cur, x) - pred;
+ Rb = R(last, x);
+ RItype = FFABS(Ra - Rb) <= state->near;
+ pred = RItype ? Ra : Rb;
+ err = R(cur, x) - pred;
 
- if(!RItype && Ra > Rb)
+ if (!RItype && Ra > Rb)
 err = -err;
 
- if(state->near){
- if(err > 0)
- err = (state->near + err) / state->twonear;
+ if (state->near) {
+ if (err > 0)
+ err = (state->near + err) / state->twonear;
 else
 err = -(state->near - err) / state->twonear;
 
- if(RItype || (Rb >= Ra))
+ if (RItype || (Rb >= Ra))
 Ra = av_clip(pred + err * state->twonear, 0, state->maxval);
 else
 Ra = av_clip(pred - err * state->twonear, 0, state->maxval);
 W(cur, x, Ra);
 }
- if(err < 0)
+ if (err < 0)
 err += state->range;
- if(err >= ((state->range + 1) >> 1))
+ if (err >= state->range + 1 >> 1)
 err -= state->range;
 
- ls_encode_runterm(state, pb, RItype, err, ff_log2_run[state->run_index[comp]]);
+ ls_encode_runterm(state, pb, RItype, err,
+ ff_log2_run[state->run_index[comp]]);
 
- if(state->run_index[comp] > 0)
+ if (state->run_index[comp] > 0)
 state->run_index[comp]--;
 } else { /* regular mode */
 int context;
 
- context = ff_jpegls_quantize(state, D0) * 81 + ff_jpegls_quantize(state, D1) * 9 + ff_jpegls_quantize(state, D2);
- pred = mid_pred(Ra, Ra + Rb - Rc, Rb);
+ context = ff_jpegls_quantize(state, D0) * 81 +
+ ff_jpegls_quantize(state, D1) * 9 +
+ ff_jpegls_quantize(state, D2);
+ pred = mid_pred(Ra, Ra + Rb - Rc, Rb);
 
- if(context < 0){
+ if (context < 0) {
 context = -context;
- sign = 1;
- pred = av_clip(pred - state->C[context], 0, state->maxval);
- err = pred - R(cur, x);
- }else{
+ sign = 1;
+ pred = av_clip(pred - state->C[context], 0, state->maxval);
+ err = pred - R(cur, x);
+ } else {
 sign = 0;
 pred = av_clip(pred + state->C[context], 0, state->maxval);
- err = R(cur, x) - pred;
+ err = R(cur, x) - pred;
 }
 
- if(state->near){
- if(err > 0)
- err = (state->near + err) / state->twonear;
+ if (state->near) {
+ if (err > 0)
+ err = (state->near + err) / state->twonear;
 else
 err = -(state->near - err) / state->twonear;
- if(!sign)
+ if (!sign)
 Ra = av_clip(pred + err * state->twonear, 0, state->maxval);
 else
 Ra = av_clip(pred - err * state->twonear, 0, state->maxval);
@@ -208,18 +222,22 @@
 }
 }
 
-static void ls_store_lse(JLSState *state, PutBitContext *pb){
+static void ls_store_lse(JLSState *state, PutBitContext *pb)
+{
 /* Test if we have default params and don't need to store LSE */
 JLSState state2 = { 0 };
- state2.bpp = state->bpp;
+ state2.bpp = state->bpp;
 state2.near = state->near;
 ff_jpegls_reset_coding_parameters(&state2, 1);
- if(state->T1 == state2.T1 && state->T2 == state2.T2 && state->T3 == state2.T3 && state->reset == state2.reset)
+ if (state->T1 == state2.T1 &&
+ state->T2 == state2.T2 &&
+ state->T3 == state2.T3 &&
+ state->reset == state2.reset)
 return;
 /* store LSE type 1 */
 put_marker(pb, LSE);
 put_bits(pb, 16, 13);
- put_bits(pb, 8, 1);
+ put_bits(pb, 8, 1);
 put_bits(pb, 16, state->maxval);
 put_bits(pb, 16, state->T1);
 put_bits(pb, 16, state->T2);
@@ -230,9 +248,8 @@
 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 int near = avctx->prediction_method;
+ const AVFrame *const p = pict;
+ const int near = avctx->prediction_method;
 PutBitContext pb, pb2;
 GetBitContext gb;
 uint8_t *buf2, *zero, *cur, *last;
@@ -240,17 +257,14 @@
 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)
+ if (avctx->pix_fmt == AV_PIX_FMT_GRAY8 ||
+ avctx->pix_fmt == AV_PIX_FMT_GRAY16)
 comps = 1;
 else
 comps = 3;
 
- if ((ret = ff_alloc_packet(pkt, avctx->width*avctx->height*comps*4 +
- FF_MIN_BUFFER_SIZE)) < 0) {
+ if ((ret = ff_alloc_packet(pkt, avctx->width * avctx->height * comps * 4 +
+ FF_MIN_BUFFER_SIZE)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n");
 return ret;
 }
@@ -264,31 +278,31 @@
 put_marker(&pb, SOI);
 put_marker(&pb, SOF48);
 put_bits(&pb, 16, 8 + comps * 3); // header size depends on components
- put_bits(&pb, 8, (avctx->pix_fmt == AV_PIX_FMT_GRAY16) ? 16 : 8); // bpp
+ put_bits(&pb, 8, (avctx->pix_fmt == AV_PIX_FMT_GRAY16) ? 16 : 8); // bpp
 put_bits(&pb, 16, avctx->height);
 put_bits(&pb, 16, avctx->width);
- put_bits(&pb, 8, comps); // components
- for(i = 1; i <= comps; i++) {
- put_bits(&pb, 8, i); // component ID
- put_bits(&pb, 8, 0x11); // subsampling: none
- put_bits(&pb, 8, 0); // Tiq, used by JPEG-LS ext
+ put_bits(&pb, 8, comps); // components
+ for (i = 1; i <= comps; i++) {
+ put_bits(&pb, 8, i); // component ID
+ put_bits(&pb, 8, 0x11); // subsampling: none
+ put_bits(&pb, 8, 0); // Tiq, used by JPEG-LS ext
 }
 
 put_marker(&pb, SOS);
 put_bits(&pb, 16, 6 + comps * 2);
- put_bits(&pb, 8, comps);
- for(i = 1; i <= comps; i++) {
- put_bits(&pb, 8, i); // component ID
- put_bits(&pb, 8, 0); // mapping index: none
+ put_bits(&pb, 8, comps);
+ for (i = 1; i <= comps; i++) {
+ put_bits(&pb, 8, i); // component ID
+ put_bits(&pb, 8, 0); // mapping index: none
 }
- put_bits(&pb, 8, near);
- put_bits(&pb, 8, (comps > 1) ? 1 : 0); // interleaving: 0 - plane, 1 - line
- put_bits(&pb, 8, 0); // point transform: none
+ put_bits(&pb, 8, near);
+ put_bits(&pb, 8, (comps > 1) ? 1 : 0); // interleaving: 0 - plane, 1 - line
+ put_bits(&pb, 8, 0); // point transform: none
 
 state = av_mallocz(sizeof(JLSState));
 /* initialize JPEG-LS state from JPEG parameters */
 state->near = near;
- state->bpp = (avctx->pix_fmt == AV_PIX_FMT_GRAY16) ? 16 : 8;
+ state->bpp = (avctx->pix_fmt == AV_PIX_FMT_GRAY16) ? 16 : 8;
 ff_jpegls_reset_coding_parameters(state, 0);
 ff_jpegls_init_state(state);
 
@@ -296,70 +310,72 @@
 
 zero = av_mallocz(p->linesize[0]);
 last = zero;
- cur = p->data[0];
- if(avctx->pix_fmt == AV_PIX_FMT_GRAY8){
+ cur = p->data[0];
+ if (avctx->pix_fmt == AV_PIX_FMT_GRAY8) {
 int t = 0;
 
- for(i = 0; i < avctx->height; i++) {
- ls_encode_line(state, &pb2, last, cur, t, avctx->width, 1, 0, 8);
- t = last[0];
+ for (i = 0; i < avctx->height; i++) {
+ ls_encode_line(state, &pb2, last, cur, t, avctx->width, 1, 0, 8);
+ t = last[0];
 last = cur;
 cur += p->linesize[0];
 }
- }else if(avctx->pix_fmt == AV_PIX_FMT_GRAY16){
+ } else if (avctx->pix_fmt == AV_PIX_FMT_GRAY16) {
 int t = 0;
 
- for(i = 0; i < avctx->height; i++) {
+ for (i = 0; i < avctx->height; i++) {
 ls_encode_line(state, &pb2, last, cur, t, avctx->width, 1, 0, 16);
- t = *((uint16_t*)last);
+ t = *((uint16_t *)last);
 last = cur;
 cur += p->linesize[0];
 }
- }else if(avctx->pix_fmt == AV_PIX_FMT_RGB24){
+ } else if (avctx->pix_fmt == AV_PIX_FMT_RGB24) {
 int j, width;
- int Rc[3] = {0, 0, 0};
+ int Rc[3] = { 0, 0, 0 };
 
 width = avctx->width * 3;
- for(i = 0; i < avctx->height; i++) {
- for(j = 0; j < 3; j++) {
- ls_encode_line(state, &pb2, last + j, cur + j, Rc[j], width, 3, j, 8);
+ for (i = 0; i < avctx->height; i++) {
+ for (j = 0; j < 3; j++) {
+ ls_encode_line(state, &pb2, last + j, cur + j, Rc[j],
+ width, 3, j, 8);
 Rc[j] = last[j];
 }
 last = cur;
- cur += s->picture.linesize[0];
+ cur += p->linesize[0];
 }
- }else if(avctx->pix_fmt == AV_PIX_FMT_BGR24){
+ } else if (avctx->pix_fmt == AV_PIX_FMT_BGR24) {
 int j, width;
- int Rc[3] = {0, 0, 0};
+ int Rc[3] = { 0, 0, 0 };
 
 width = avctx->width * 3;
- for(i = 0; i < avctx->height; i++) {
- for(j = 2; j >= 0; j--) {
- ls_encode_line(state, &pb2, last + j, cur + j, Rc[j], width, 3, j, 8);
+ for (i = 0; i < avctx->height; i++) {
+ for (j = 2; j >= 0; j--) {
+ ls_encode_line(state, &pb2, last + j, cur + j, Rc[j],
+ width, 3, j, 8);
 Rc[j] = last[j];
 }
 last = cur;
- cur += s->picture.linesize[0];
+ cur += p->linesize[0];
 }
 }
 
 av_free(zero);
 av_free(state);
 
- // the specification says that after doing 0xff escaping unused bits in the
- // last byte must be set to 0, so just append 7 "optional" zero-bits to
- // avoid special-casing.
+ /* the specification says that after doing 0xff escaping unused bits in
+ * the last byte must be set to 0, so just append 7 "optional" zero-bits
+ * to avoid special-casing. */
 put_bits(&pb2, 7, 0);
 size = put_bits_count(&pb2);
 flush_put_bits(&pb2);
 /* do escape coding */
 init_get_bits(&gb, buf2, size);
 size -= 7;
- while(get_bits_count(&gb) < size){
+ while (get_bits_count(&gb) < size) {
 int v;
 v = get_bits(&gb, 8);
 put_bits(&pb, 8, v);
- if(v == 0xFF){
+ if (v == 0xFF) {
 v = get_bits(&gb, 7);
 put_bits(&pb, 8, v);
 }
@@ -379,29 +395,43 @@
 return 0;
 }
 
-static av_cold int encode_init_ls(AVCodecContext *ctx) {
- JpeglsContext *c = (JpeglsContext*)ctx->priv_data;
-
- c->avctx = ctx;
- ctx->coded_frame = &c->picture;
+static av_cold int encode_close(AVCodecContext *avctx)
+{
+ av_frame_free(&avctx->coded_frame);
+ return 0;
+}
 
- if(ctx->pix_fmt != AV_PIX_FMT_GRAY8 && ctx->pix_fmt != AV_PIX_FMT_GRAY16 && ctx->pix_fmt != AV_PIX_FMT_RGB24 && ctx->pix_fmt != AV_PIX_FMT_BGR24){
- av_log(ctx, AV_LOG_ERROR, "Only grayscale and RGB24/BGR24 images are supported\n");
+static av_cold int encode_init_ls(AVCodecContext *ctx)
+{
+ ctx->coded_frame = av_frame_alloc();
+ if (!ctx->coded_frame)
+ return AVERROR(ENOMEM);
+
+ 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 &&
+ ctx->pix_fmt != AV_PIX_FMT_RGB24 &&
+ ctx->pix_fmt != AV_PIX_FMT_BGR24) {
+ av_log(ctx, AV_LOG_ERROR,
+ "Only grayscale and RGB24/BGR24 images are supported\n");
 return -1;
 }
 return 0;
 }
 
-AVCodec ff_jpegls_encoder = { //FIXME avoid MPV_* lossless JPEG should not need them
+AVCodec ff_jpegls_encoder = {
 .name = "jpegls",
+ .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, AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16,
+ .pix_fmts = (const enum AVPixelFormat[]) {
+ AV_PIX_FMT_BGR24, AV_PIX_FMT_RGB24,
+ AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16,
 AV_PIX_FMT_NONE
 },
- .long_name = NULL_IF_CONFIG_SMALL("JPEG-LS"),
 };

libav-v9.6.tar.bz2/libavcodec/jrevdct.c -> libav-v10.1.tar.bz2/libavcodec/jrevdct.c Changed

@@ -63,7 +63,7 @@
 */
 
 #include "libavutil/common.h"
-#include "dsputil.h"
+#include "dct.h"
 
 #define EIGHT_BIT_SAMPLES
 
@@ -74,7 +74,7 @@
 
 #define RIGHT_SHIFT(x, n) ((x) >> (n))
 
-typedef DCTELEM DCTBLOCK[DCTSIZE2];
+typedef int16_t DCTBLOCK[DCTSIZE2];
 
 #define CONST_BITS 13
 
@@ -213,7 +213,7 @@
 int32_t tmp10, tmp11, tmp12, tmp13;
 int32_t z1, z2, z3, z4, z5;
 int32_t d0, d1, d2, d3, d4, d5, d6, d7;
- register DCTELEM *dataptr;
+ register int16_t *dataptr;
 int rowctr;
 
 /* Pass 1: process rows. */
@@ -249,7 +249,7 @@
 /* AC terms all zero */
 if (d0) {
 /* Compute a 32 bit value to assign. */
- DCTELEM dcval = (DCTELEM) (d0 << PASS1_BITS);
+ int16_t dcval = (int16_t) (d0 << PASS1_BITS);
 register int v = (dcval & 0xffff) | ((dcval << 16) & 0xffff0000);
 
 idataptr[0] = v;
@@ -574,14 +574,14 @@
 }
 /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */
 
- dataptr[0] = (DCTELEM) DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS);
- dataptr[7] = (DCTELEM) DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS);
- dataptr[1] = (DCTELEM) DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS);
- dataptr[6] = (DCTELEM) DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS);
- dataptr[2] = (DCTELEM) DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS);
- dataptr[5] = (DCTELEM) DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS);
- dataptr[3] = (DCTELEM) DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS);
- dataptr[4] = (DCTELEM) DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS);
+ dataptr[0] = (int16_t) DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS);
+ dataptr[7] = (int16_t) DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS);
+ dataptr[1] = (int16_t) DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS);
+ dataptr[6] = (int16_t) DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS);
+ dataptr[2] = (int16_t) DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS);
+ dataptr[5] = (int16_t) DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS);
+ dataptr[3] = (int16_t) DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS);
+ dataptr[4] = (int16_t) DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS);
 
 dataptr += DCTSIZE; /* advance pointer to next row */
 }
@@ -920,21 +920,21 @@
 
 /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */
 
- dataptr[DCTSIZE*0] = (DCTELEM) DESCALE(tmp10 + tmp3,
+ dataptr[DCTSIZE*0] = (int16_t) DESCALE(tmp10 + tmp3,
 CONST_BITS+PASS1_BITS+3);
- dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp10 - tmp3,
+ dataptr[DCTSIZE*7] = (int16_t) DESCALE(tmp10 - tmp3,
 CONST_BITS+PASS1_BITS+3);
- dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp11 + tmp2,
+ dataptr[DCTSIZE*1] = (int16_t) DESCALE(tmp11 + tmp2,
 CONST_BITS+PASS1_BITS+3);
- dataptr[DCTSIZE*6] = (DCTELEM) DESCALE(tmp11 - tmp2,
+ dataptr[DCTSIZE*6] = (int16_t) DESCALE(tmp11 - tmp2,
 CONST_BITS+PASS1_BITS+3);
- dataptr[DCTSIZE*2] = (DCTELEM) DESCALE(tmp12 + tmp1,
+ dataptr[DCTSIZE*2] = (int16_t) DESCALE(tmp12 + tmp1,
 CONST_BITS+PASS1_BITS+3);
- dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp12 - tmp1,
+ dataptr[DCTSIZE*5] = (int16_t) DESCALE(tmp12 - tmp1,
 CONST_BITS+PASS1_BITS+3);
- dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp13 + tmp0,
+ dataptr[DCTSIZE*3] = (int16_t) DESCALE(tmp13 + tmp0,
 CONST_BITS+PASS1_BITS+3);
- dataptr[DCTSIZE*4] = (DCTELEM) DESCALE(tmp13 - tmp0,
+ dataptr[DCTSIZE*4] = (int16_t) DESCALE(tmp13 - tmp0,
 CONST_BITS+PASS1_BITS+3);
 
 dataptr++; /* advance pointer to next column */

libav-v9.6.tar.bz2/libavcodec/jvdec.c -> libav-v10.1.tar.bz2/libavcodec/jvdec.c Changed

@@ -25,14 +25,16 @@
 * @author Peter Ross <pross@xvid.org>
 */
 
+#include "libavutil/intreadwrite.h"
+
 #include "avcodec.h"
 #include "dsputil.h"
 #include "get_bits.h"
-#include "libavutil/intreadwrite.h"
+#include "internal.h"
 
 typedef struct JvContext {
 DSPContext dsp;
- AVFrame frame;
+ AVFrame *frame;
 uint32_t palette[AVPALETTE_COUNT];
 int palette_has_changed;
 } JvContext;
@@ -40,6 +42,11 @@
 static av_cold int decode_init(AVCodecContext *avctx)
 {
 JvContext *s = avctx->priv_data;
+
+ 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;
@@ -56,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);
 }
 }
 
@@ -83,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];
 
@@ -118,34 +126,33 @@
 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;
- int buf_size = avpkt->size;
- const uint8_t *buf = avpkt->data;
+ JvContext *s = avctx->priv_data;
+ int buf_size = avpkt->size;
+ const uint8_t *buf = avpkt->data;
 const uint8_t *buf_end = buf + buf_size;
- int video_size, video_type, i, j;
+ int video_size, video_type, i, j, ret;
 
 video_size = AV_RL32(buf);
 video_type = buf[4];
 buf += 5;
 
 if (video_size) {
- if (avctx->reget_buffer(avctx, &s->frame) < 0) {
+ if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 if (video_type == 0 || video_type == 1) {
@@ -154,18 +161,21 @@
 
 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,
- s->frame.linesize[0], &s->dsp);
+ 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) {
 if (buf + 1 <= buf_end) {
 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;
 }
 }
@@ -179,14 +189,15 @@
 }
 
 if (video_size) {
- 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;
- memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
-
+ 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;
+ memcpy(s->frame->data[1], s->palette, AVPALETTE_SIZE);
+
+ if ((ret = av_frame_ref(data, s->frame)) < 0)
+ return ret;
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 }
 
 return buf_size;
@@ -196,8 +207,7 @@
 {
 JvContext *s = avctx->priv_data;
 
- if(s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ av_frame_free(&s->frame);
 
 return 0;
 }

libav-v9.6.tar.bz2/libavcodec/kbdwin.c -> libav-v10.1.tar.bz2/libavcodec/kbdwin.c Changed

libav-v9.6.tar.bz2/libavcodec/kgv1dec.c -> libav-v10.1.tar.bz2/libavcodec/kgv1dec.c Changed

@@ -32,20 +32,22 @@
 
 typedef struct {
 AVCodecContext *avctx;
- AVFrame prev, cur;
+ uint16_t *frame_buffer;
+ uint16_t *last_frame_buffer;
 } KgvContext;
 
 static void decode_flush(AVCodecContext *avctx)
 {
 KgvContext * const c = avctx->priv_data;
 
- if (c->prev.data[0])
- avctx->release_buffer(avctx, &c->prev);
+ av_freep(&c->frame_buffer);
+ av_freep(&c->last_frame_buffer);
 }
 
 static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
 AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 const uint8_t *buf_end = buf + avpkt->size;
 KgvContext * const c = avctx->priv_data;
@@ -55,32 +57,34 @@
 int w, h, i, res;
 
 if (avpkt->size < 2)
- return -1;
+ return AVERROR_INVALIDDATA;
 
 w = (buf[0] + 1) * 8;
 h = (buf[1] + 1) * 8;
 buf += 2;
 
- if (av_image_check_size(w, h, 0, avctx))
- return -1;
-
 if (w != avctx->width || h != avctx->height) {
- if (c->prev.data[0])
- avctx->release_buffer(avctx, &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;
 
- c->cur.reference = 3;
- if ((res = ff_get_buffer(avctx, &c->cur)) < 0)
+ if ((res = ff_get_buffer(avctx, frame, 0)) < 0)
 return res;
- out = (uint16_t *) c->cur.data[0];
- if (c->prev.data[0]) {
- prev = (uint16_t *) 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;
@@ -156,12 +160,12 @@
 if (outcnt - maxcnt)
 av_log(avctx, AV_LOG_DEBUG, "frame finished with %d diff\n", outcnt - maxcnt);
 
- *got_frame = 1;
- *(AVFrame*)data = c->cur;
+ 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);
 
- if (c->prev.data[0])
- avctx->release_buffer(avctx, &c->prev);
- FFSWAP(AVFrame, c->cur, c->prev);
+ *got_frame = 1;
 
 return avpkt->size;
 }
@@ -172,7 +176,6 @@
 
 c->avctx = avctx;
 avctx->pix_fmt = AV_PIX_FMT_RGB555;
- avctx->flags |= CODEC_FLAG_EMU_EDGE;
 
 return 0;
 }
@@ -185,6 +188,7 @@
 
 AVCodec ff_kgv1_decoder = {
 .name = "kgv1",
+ .long_name = NULL_IF_CONFIG_SMALL("Kega Game Video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_KGV1,
 .priv_data_size = sizeof(KgvContext),
@@ -192,6 +196,5 @@
 .close = decode_end,
 .decode = decode_frame,
 .flush = decode_flush,
- .long_name = NULL_IF_CONFIG_SMALL("Kega Game Video"),
 .capabilities = CODEC_CAP_DR1,
 };

libav-v9.6.tar.bz2/libavcodec/kmvc.c -> libav-v10.1.tar.bz2/libavcodec/kmvc.c Changed

@@ -30,6 +30,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "internal.h"
+#include "libavutil/common.h"
 
 #define KMVC_KEYFRAME 0x80
 #define KMVC_PALETTE 0x40
@@ -41,13 +42,12 @@
 */
 typedef struct KmvcContext {
 AVCodecContext *avctx;
- AVFrame pic;
 
 int setpal;
 int palsize;
 uint32_t pal[MAX_PALSIZE];
 uint8_t *cur, *prev;
- uint8_t *frm0, *frm1;
+ uint8_t frm0[320 * 200], frm1[320 * 200];
 GetByteContext g;
 } KmvcContext;
 
@@ -56,7 +56,7 @@
 int bitbuf;
 } BitBuf;
 
-#define BLK(data, x, y) data[(x) + (y) * 320]
+#define BLK(data, x, y) data[av_clip((x) + (y) * 320, 0, 320 * 200 -1)]
 
 #define kmvc_init_getbits(bb, g) bb.bits = 7; bb.bitbuf = bytestream2_get_byte(g);
 
@@ -247,21 +247,18 @@
 AVPacket *avpkt)
 {
 KmvcContext *const ctx = avctx->priv_data;
+ AVFrame *frame = data;
 uint8_t *out, *src;
- int i;
+ int i, ret;
 int header;
 int blocksize;
 const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
 
 bytestream2_init(&ctx->g, avpkt->data, avpkt->size);
- if (ctx->pic.data[0])
- avctx->release_buffer(avctx, &ctx->pic);
 
- ctx->pic.reference = 1;
- ctx->pic.buffer_hints = FF_BUFFER_HINTS_VALID;
- if (ff_get_buffer(avctx, &ctx->pic) < 0) {
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 header = bytestream2_get_byte(&ctx->g);
@@ -277,15 +274,15 @@
 }
 
 if (header & KMVC_KEYFRAME) {
- ctx->pic.key_frame = 1;
- ctx->pic.pict_type = AV_PICTURE_TYPE_I;
+ frame->key_frame = 1;
+ frame->pict_type = AV_PICTURE_TYPE_I;
 } else {
- ctx->pic.key_frame = 0;
- ctx->pic.pict_type = AV_PICTURE_TYPE_P;
+ frame->key_frame = 0;
+ frame->pict_type = AV_PICTURE_TYPE_P;
 }
 
 if (header & KMVC_PALETTE) {
- ctx->pic.palette_has_changed = 1;
+ frame->palette_has_changed = 1;
 // palette starts from index 1 and has 127 entries
 for (i = 1; i <= ctx->palsize; i++) {
 ctx->pal[i] = bytestream2_get_be24(&ctx->g);
@@ -293,23 +290,23 @@
 }
 
 if (pal) {
- ctx->pic.palette_has_changed = 1;
+ frame->palette_has_changed = 1;
 memcpy(ctx->pal, pal, AVPALETTE_SIZE);
 }
 
 if (ctx->setpal) {
 ctx->setpal = 0;
- ctx->pic.palette_has_changed = 1;
+ frame->palette_has_changed = 1;
 }
 
 /* make the palette available on the way out */
- memcpy(ctx->pic.data[1], ctx->pal, 1024);
+ memcpy(frame->data[1], ctx->pal, 1024);
 
 blocksize = bytestream2_get_byte(&ctx->g);
 
 if (blocksize != 8 && blocksize != 127) {
 av_log(avctx, AV_LOG_ERROR, "Block size = %i\n", blocksize);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 memset(ctx->cur, 0, 320 * 200);
 switch (header & KMVC_METHOD) {
@@ -325,15 +322,15 @@
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "Unknown compression method %i\n", header & KMVC_METHOD);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- out = ctx->pic.data[0];
+ out = frame->data[0];
 src = ctx->cur;
 for (i = 0; i < avctx->height; i++) {
 memcpy(out, src, avctx->width);
 src += 320;
- out += ctx->pic.linesize[0];
+ out += frame->linesize[0];
 }
 
 /* flip buffers */
@@ -346,7 +343,6 @@
 }
 
 *got_frame = 1;
- *(AVFrame *) data = ctx->pic;
 
 /* always report that the buffer was completely consumed */
 return avpkt->size;
@@ -366,11 +362,9 @@
 
 if (avctx->width > 320 || avctx->height > 200) {
 av_log(avctx, AV_LOG_ERROR, "KMVC supports frames <= 320x200\n");
- return -1;
+ return AVERROR(EINVAL);
 }
 
- c->frm0 = av_mallocz(320 * 200);
- c->frm1 = av_mallocz(320 * 200);
 c->cur = c->frm0;
 c->prev = c->frm1;
 
@@ -404,31 +398,13 @@
 return 0;
 }
 
-
-
-/*
- * Uninit kmvc decoder
- */
-static av_cold int decode_end(AVCodecContext * avctx)
-{
- KmvcContext *const c = avctx->priv_data;
-
- av_freep(&c->frm0);
- av_freep(&c->frm1);
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
-
- return 0;
-}
-
 AVCodec ff_kmvc_decoder = {
 .name = "kmvc",
+ .long_name = NULL_IF_CONFIG_SMALL("Karl Morton's video codec"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_KMVC,
 .priv_data_size = sizeof(KmvcContext),
 .init = decode_init,
- .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Karl Morton's video codec"),
 };

libav-v9.6.tar.bz2/libavcodec/lagarith.c -> libav-v10.1.tar.bz2/libavcodec/lagarith.c Changed

@@ -48,11 +48,11 @@
 
 typedef struct LagarithContext {
 AVCodecContext *avctx;
- AVFrame picture;
 DSPContext dsp;
 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;
 
@@ -249,9 +249,12 @@
 int L, TL;
 
 if (!line) {
+ int i, align_width = (width - 1) & ~31;
 /* Left prediction only for first line */
 L = l->dsp.add_hfyu_left_prediction(buf + 1, buf + 1,
- width - 1, buf[0]);
+ align_width, buf[0]);
+ for (i = align_width + 1; i < width; i++)
+ buf[i] += buf[i - 1];
 } else {
 /* Left pixel is actually prev_row[width] */
 L = buf[width - stride - 1];
@@ -277,11 +280,18 @@
 int L, TL;
 
 if (!line) {
+ int i, align_width;
 if (is_luma) {
 buf++;
 width--;
 }
- l->dsp.add_hfyu_left_prediction(buf + 1, buf + 1, width - 1, buf[0]);
+
+ align_width = (width - 1) & ~31;
+ l->dsp.add_hfyu_left_prediction(buf + 1, buf + 1, align_width, buf[0]);
+
+ for (i = align_width + 1; i < width; i++)
+ buf[i] += buf[i - 1];
+
 return;
 }
 if (line == 1) {
@@ -294,14 +304,17 @@
 L += buf[i];
 buf[i] = L;
 }
- buf += HEAD;
- width -= HEAD;
+ 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->dsp.add_hfyu_median_prediction(buf, buf - stride, buf, width,
- &L, &TL);
 }
 
 static int lag_decode_line(LagarithContext *l, lag_rac *rac,
@@ -502,19 +515,14 @@
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 LagarithContext *l = avctx->priv_data;
- AVFrame *const p = &l->picture;
+ ThreadFrame frame = { .f = data };
+ AVFrame *const p = data;
 uint8_t frametype = 0;
 uint32_t offset_gu = 0, offset_bv = 0, offset_ry = 9;
 uint32_t offs[4];
 uint8_t *srcs[4], *dst;
 int i, j, planes = 3;
 
- AVFrame *picture = data;
-
- if (p->data[0])
- ff_thread_release_buffer(avctx, p);
-
- p->reference = 0;
 p->key_frame = 1;
 
 frametype = buf[0];
@@ -526,7 +534,7 @@
 case FRAME_SOLID_RGBA:
 avctx->pix_fmt = AV_PIX_FMT_RGB32;
 
- if (ff_thread_get_buffer(avctx, p) < 0) {
+ if (ff_thread_get_buffer(avctx, &frame, 0) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return -1;
 }
@@ -548,7 +556,7 @@
 if (frametype == FRAME_ARITH_RGB24 || frametype == FRAME_U_RGB24)
 avctx->pix_fmt = AV_PIX_FMT_RGB24;
 
- if (ff_thread_get_buffer(avctx, p) < 0) {
+ if (ff_thread_get_buffer(avctx, &frame, 0) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return -1;
 }
@@ -557,13 +565,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 * planes + 1);
- 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;
@@ -608,7 +615,7 @@
 case FRAME_ARITH_YUY2:
 avctx->pix_fmt = AV_PIX_FMT_YUV422P;
 
- if (ff_thread_get_buffer(avctx, p) < 0) {
+ if (ff_thread_get_buffer(avctx, &frame, 0) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return -1;
 }
@@ -634,7 +641,7 @@
 case FRAME_ARITH_YV12:
 avctx->pix_fmt = AV_PIX_FMT_YUV420P;
 
- if (ff_thread_get_buffer(avctx, p) < 0) {
+ if (ff_thread_get_buffer(avctx, &frame, 0) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return -1;
 }
@@ -663,7 +670,6 @@
 return -1;
 }
 
- *picture = *p;
 *got_frame = 1;
 
 return buf_size;
@@ -683,8 +689,6 @@
 {
 LagarithContext *l = avctx->priv_data;
 
- if (l->picture.data[0])
- ff_thread_release_buffer(avctx, &l->picture);
 av_freep(&l->rgb_planes);
 
 return 0;
@@ -692,6 +696,7 @@
 
 AVCodec ff_lagarith_decoder = {
 .name = "lagarith",
+ .long_name = NULL_IF_CONFIG_SMALL("Lagarith lossless"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_LAGARITH,
 .priv_data_size = sizeof(LagarithContext),
@@ -699,5 +704,4 @@
 .close = lag_decode_end,
 .decode = lag_decode_frame,
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
- .long_name = NULL_IF_CONFIG_SMALL("Lagarith lossless"),
 };

libav-v9.6.tar.bz2/libavcodec/lcldec.c -> libav-v10.1.tar.bz2/libavcodec/lcldec.c Changed

@@ -55,8 +55,6 @@
 * Decoder context
 */
 typedef struct LclDecContext {
- AVFrame pic;
-
 // Image type
 int imgtype;
 // Compression type
@@ -132,7 +130,7 @@
 int zret = inflateReset(&c->zstream);
 if (zret != Z_OK) {
 av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret);
- return -1;
+ return AVERROR_UNKNOWN;
 }
 c->zstream.next_in = src;
 c->zstream.avail_in = src_len;
@@ -141,12 +139,12 @@
 zret = inflate(&c->zstream, Z_FINISH);
 if (zret != Z_OK && zret != Z_STREAM_END) {
 av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", zret);
- return -1;
+ return AVERROR_UNKNOWN;
 }
 if (expected != (unsigned int)c->zstream.total_out) {
 av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %lu)\n",
 expected, c->zstream.total_out);
- return -1;
+ return AVERROR_UNKNOWN;
 }
 return c->zstream.total_out;
 }
@@ -160,6 +158,7 @@
 */
 static int 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;
 LclDecContext * const c = avctx->priv_data;
@@ -172,21 +171,16 @@
 unsigned int height = avctx->height; // Real image height
 unsigned int mszh_dlen;
 unsigned char yq, y1q, uq, vq;
- int uqvq;
+ int uqvq, ret;
 unsigned int mthread_inlen, mthread_outlen;
 unsigned int len = buf_size;
 
- if(c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
-
- c->pic.reference = 0;
- c->pic.buffer_hints = FF_BUFFER_HINTS_VALID;
- if(ff_get_buffer(avctx, &c->pic) < 0){
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
- outptr = c->pic.data[0]; // Output image pointer
+ outptr = frame->data[0]; // Output image pointer
 
 /* Decompress frame */
 switch (avctx->codec_id) {
@@ -202,14 +196,14 @@
 if (mthread_outlen != mszh_dlen) {
 av_log(avctx, AV_LOG_ERROR, "Mthread1 decoded size differs (%d != %d)\n",
 mthread_outlen, mszh_dlen);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 mszh_dlen = mszh_decomp(encoded + 8 + mthread_inlen, len - 8 - mthread_inlen,
 c->decomp_buf + mthread_outlen, c->decomp_size - mthread_outlen);
 if (mthread_outlen != mszh_dlen) {
 av_log(avctx, AV_LOG_ERROR, "Mthread2 decoded size differs (%d != %d)\n",
 mthread_outlen, mszh_dlen);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 encoded = c->decomp_buf;
 len = c->decomp_size;
@@ -218,7 +212,7 @@
 if (c->decomp_size != mszh_dlen) {
 av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %d)\n",
 c->decomp_size, mszh_dlen);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 encoded = c->decomp_buf;
 len = mszh_dlen;
@@ -249,7 +243,7 @@
 }
 default:
 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown MSZH compression in frame decoder.\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 break;
 #if CONFIG_ZLIB_DECODER
@@ -266,7 +260,6 @@
 break;
 }
 } else if (c->flags & FLAG_MULTITHREAD) {
- int ret;
 mthread_inlen = AV_RL32(encoded);
 mthread_inlen = FFMIN(mthread_inlen, len - 8);
 mthread_outlen = AV_RL32(encoded+4);
@@ -286,7 +279,7 @@
 #endif
 default:
 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown codec in frame decoder compression switch.\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 
@@ -370,14 +363,14 @@
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown imagetype in pngfilter switch.\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 
 /* Convert colorspace */
- y_out = c->pic.data[0] + (height - 1) * c->pic.linesize[0];
- u_out = c->pic.data[1] + (height - 1) * c->pic.linesize[1];
- v_out = c->pic.data[2] + (height - 1) * c->pic.linesize[2];
+ y_out = frame->data[0] + (height - 1) * frame->linesize[0];
+ u_out = frame->data[1] + (height - 1) * frame->linesize[1];
+ v_out = frame->data[2] + (height - 1) * frame->linesize[2];
 switch (c->imgtype) {
 case IMGTYPE_YUV111:
 for (row = 0; row < height; row++) {
@@ -386,9 +379,9 @@
 u_out[col] = *encoded++ + 128;
 v_out[col] = *encoded++ + 128;
 }
- y_out -= c->pic.linesize[0];
- u_out -= c->pic.linesize[1];
- v_out -= c->pic.linesize[2];
+ y_out -= frame->linesize[0];
+ u_out -= frame->linesize[1];
+ v_out -= frame->linesize[2];
 }
 break;
 case IMGTYPE_YUV422:
@@ -401,14 +394,14 @@
 v_out[ col >> 1 ] = *encoded++ + 128;
 v_out[(col >> 1) + 1] = *encoded++ + 128;
 }
- y_out -= c->pic.linesize[0];
- u_out -= c->pic.linesize[1];
- v_out -= c->pic.linesize[2];
+ y_out -= frame->linesize[0];
+ u_out -= frame->linesize[1];
+ v_out -= frame->linesize[2];
 }
 break;
 case IMGTYPE_RGB24:
 for (row = height - 1; row >= 0; row--) {
- pixel_ptr = row * c->pic.linesize[0];
+ pixel_ptr = row * frame->linesize[0];
 memcpy(outptr + pixel_ptr, encoded, 3 * width);
 encoded += 3 * width;
 }
@@ -421,9 +414,9 @@
 u_out[col >> 2] = *encoded++ + 128;
 v_out[col >> 2] = *encoded++ + 128;
 }
- y_out -= c->pic.linesize[0];
- u_out -= c->pic.linesize[1];
- v_out -= c->pic.linesize[2];
+ y_out -= frame->linesize[0];
+ u_out -= frame->linesize[1];
+ v_out -= frame->linesize[2];
 }
 break;
 case IMGTYPE_YUV211:
@@ -434,35 +427,34 @@
 u_out[col >> 1] = *encoded++ + 128;
 v_out[col >> 1] = *encoded++ + 128;
 }
- y_out -= c->pic.linesize[0];
- u_out -= c->pic.linesize[1];
- v_out -= c->pic.linesize[2];
+ y_out -= frame->linesize[0];
+ u_out -= frame->linesize[1];
+ v_out -= frame->linesize[2];
 }
 break;
 case IMGTYPE_YUV420:
- u_out = c->pic.data[1] + ((height >> 1) - 1) * c->pic.linesize[1];
- v_out = c->pic.data[2] + ((height >> 1) - 1) * c->pic.linesize[2];
+ u_out = frame->data[1] + ((height >> 1) - 1) * frame->linesize[1];
+ v_out = frame->data[2] + ((height >> 1) - 1) * frame->linesize[2];
 for (row = 0; row < height - 1; row += 2) {
 for (col = 0; col < width - 1; col += 2) {
 memcpy(y_out + col, encoded, 2);
 encoded += 2;
- memcpy(y_out + col - c->pic.linesize[0], encoded, 2);
+ memcpy(y_out + col - frame->linesize[0], encoded, 2);
 encoded += 2;
 u_out[col >> 1] = *encoded++ + 128;
 v_out[col >> 1] = *encoded++ + 128;
 }
- y_out -= c->pic.linesize[0] << 1;
- u_out -= c->pic.linesize[1];
- v_out -= c->pic.linesize[2];
+ y_out -= frame->linesize[0] << 1;
+ u_out -= frame->linesize[1];
+ v_out -= frame->linesize[2];
 }
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "BUG! Unknown imagetype in image decoder.\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 *got_frame = 1;
- *(AVFrame*)data = c->pic;
 
 /* always report that the buffer was completely consumed */
 return buf_size;
@@ -626,8 +618,6 @@
 LclDecContext * const c = avctx->priv_data;
 
 av_freep(&c->decomp_buf);
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
 #if CONFIG_ZLIB_DECODER
 if (avctx->codec_id == AV_CODEC_ID_ZLIB)
 inflateEnd(&c->zstream);
@@ -639,6 +629,7 @@
 #if CONFIG_MSZH_DECODER
 AVCodec ff_mszh_decoder = {
 .name = "mszh",
+ .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) MSZH"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MSZH,
 .priv_data_size = sizeof(LclDecContext),
@@ -646,13 +637,13 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) MSZH"),
 };
 #endif
 
 #if CONFIG_ZLIB_DECODER
 AVCodec ff_zlib_decoder = {
 .name = "zlib",
+ .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_ZLIB,
 .priv_data_size = sizeof(LclDecContext),
@@ -660,6 +651,5 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"),
 };
 #endif

libav-v9.6.tar.bz2/libavcodec/lclenc.c -> libav-v10.1.tar.bz2/libavcodec/lclenc.c Changed

@@ -54,7 +54,6 @@
 typedef struct LclEncContext {
 
     AVCodecContext *avctx;
-    AVFrame pic;
 
     // Image type
     int imgtype;
@@ -74,7 +73,7 @@
                         const AVFrame *pict, int *got_packet)
 {
     LclEncContext *c = avctx->priv_data;
-    AVFrame * const p = &c->pic;
+    const AVFrame * const p = pict;
     int i, ret;
     int zret; // Zlib return code
     int max_size = deflateBound(&c->zstream, avctx->width * avctx->height * 3);
@@ -85,10 +84,6 @@
             return ret;
     }
 
-    *p = *pict;
-    p->pict_type= AV_PICTURE_TYPE_I;
-    p->key_frame= 1;
-
     if(avctx->pix_fmt != AV_PIX_FMT_BGR24){
         av_log(avctx, AV_LOG_ERROR, "Format not supported!\n");
         return -1;
@@ -139,7 +134,13 @@
     assert(avctx->width && avctx->height);
 
     avctx->extradata= av_mallocz(8);
-    avctx->coded_frame= &c->pic;
+
+    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;
 
     // Will be user settable someday
     c->compression = 6;
@@ -181,11 +182,14 @@
     av_freep(&avctx->extradata);
     deflateEnd(&c->zstream);
 
+    av_frame_free(&avctx->coded_frame);
+
     return 0;
 }
 
 AVCodec ff_zlib_encoder = {
     .name           = "zlib",
+    .long_name      = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_ZLIB,
     .priv_data_size = sizeof(LclEncContext),
@@ -193,5 +197,4 @@
     .encode2        = encode_frame,
     .close          = encode_end,
     .pix_fmts       = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE },
-    .long_name      = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"),
 };

libav-v9.6.tar.bz2/libavcodec/libavcodec.v -> libav-v10.1.tar.bz2/libavcodec/libavcodec.v Changed

libav-v9.6.tar.bz2/libavcodec/libfaac.c -> libav-v10.1.tar.bz2/libavcodec/libfaac.c Changed

@@ -46,9 +46,6 @@
 {
     FaacAudioContext *s = avctx->priv_data;
 
-#if FF_API_OLD_ENCODE_AUDIO
-    av_freep(&avctx->coded_frame);
-#endif
     av_freep(&avctx->extradata);
     ff_af_queue_close(&s->afq);
 
@@ -133,14 +130,6 @@
 
     avctx->frame_size = samples_input / avctx->channels;
 
-#if FF_API_OLD_ENCODE_AUDIO
-    avctx->coded_frame= avcodec_alloc_frame();
-    if (!avctx->coded_frame) {
-        ret = AVERROR(ENOMEM);
-        goto error;
-    }
-#endif
-
     /* Set decoder specific info */
     avctx->extradata_size = 0;
     if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) {
@@ -236,6 +225,7 @@
 
 AVCodec ff_libfaac_encoder = {
     .name           = "libfaac",
+    .long_name      = NULL_IF_CONFIG_SMALL("libfaac AAC (Advanced Audio Coding)"),
     .type           = AVMEDIA_TYPE_AUDIO,
     .id             = AV_CODEC_ID_AAC,
     .priv_data_size = sizeof(FaacAudioContext),
@@ -245,7 +235,6 @@
     .capabilities   = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
                                                      AV_SAMPLE_FMT_NONE },
-    .long_name      = NULL_IF_CONFIG_SMALL("libfaac AAC (Advanced Audio Coding)"),
     .profiles       = NULL_IF_CONFIG_SMALL(profiles),
     .channel_layouts = faac_channel_layouts,
 };

libav-v10.1.tar.bz2/libavcodec/libfdk-aacdec.c Added

@@ -0,0 +1,309 @@
+/*
+ * AAC decoder wrapper
+ * Copyright (c) 2012 Martin Storsjo
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <fdk-aac/aacdecoder_lib.h>
+
+#include "libavutil/channel_layout.h"
+#include "libavutil/common.h"
+#include "libavutil/opt.h"
+#include "avcodec.h"
+#include "internal.h"
+
+enum ConcealMethod {
+ CONCEAL_METHOD_DEFAULT = -1,
+ CONCEAL_METHOD_SPECTRAL_MUTING = 0,
+ CONCEAL_METHOD_NOISE_SUBSTITUTION = 1,
+ CONCEAL_METHOD_ENERGY_INTERPOLATION = 2,
+ CONCEAL_METHOD_NB,
+};
+
+typedef struct FDKAACDecContext {
+ const AVClass *class;
+ HANDLE_AACDECODER handle;
+ int initialized;
+ enum ConcealMethod conceal_method;
+} FDKAACDecContext;
+
+#define OFFSET(x) offsetof(FDKAACDecContext, x)
+#define AD AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM
+static const AVOption fdk_aac_dec_options[] = {
+ { "conceal", "Error concealment method", OFFSET(conceal_method), AV_OPT_TYPE_INT, { .i64 = CONCEAL_METHOD_DEFAULT }, CONCEAL_METHOD_DEFAULT, CONCEAL_METHOD_NB - 1, AD, "conceal" },
+ { "default", "Default", 0, AV_OPT_TYPE_CONST, { .i64 = CONCEAL_METHOD_DEFAULT }, INT_MIN, INT_MAX, AD, "conceal" },
+ { "spectral", "Spectral muting", 0, AV_OPT_TYPE_CONST, { .i64 = CONCEAL_METHOD_SPECTRAL_MUTING }, INT_MIN, INT_MAX, AD, "conceal" },
+ { "noise", "Noise Substitution", 0, AV_OPT_TYPE_CONST, { .i64 = CONCEAL_METHOD_NOISE_SUBSTITUTION }, INT_MIN, INT_MAX, AD, "conceal" },
+ { "energy", "Energy Interpolation", 0, AV_OPT_TYPE_CONST, { .i64 = CONCEAL_METHOD_ENERGY_INTERPOLATION }, INT_MIN, INT_MAX, AD, "conceal" },
+ { NULL }
+};
+
+static const AVClass fdk_aac_dec_class = {
+ "libfdk-aac decoder", av_default_item_name, fdk_aac_dec_options, LIBAVUTIL_VERSION_INT
+};
+
+static int get_stream_info(AVCodecContext *avctx)
+{
+ FDKAACDecContext *s = avctx->priv_data;
+ CStreamInfo *info = aacDecoder_GetStreamInfo(s->handle);
+ int channel_counts[9] = { 0 };
+ int i, ch_error = 0;
+ uint64_t ch_layout = 0;
+
+ if (!info) {
+ av_log(avctx, AV_LOG_ERROR, "Unable to get stream info\n");
+ return AVERROR_UNKNOWN;
+ }
+
+ if (info->sampleRate <= 0) {
+ av_log(avctx, AV_LOG_ERROR, "Stream info not initialized\n");
+ return AVERROR_UNKNOWN;
+ }
+ avctx->sample_rate = info->sampleRate;
+ avctx->frame_size = info->frameSize;
+
+ for (i = 0; i < info->numChannels; i++) {
+ AUDIO_CHANNEL_TYPE ctype = info->pChannelType[i];
+ if (ctype <= ACT_NONE || ctype > ACT_TOP) {
+ av_log(avctx, AV_LOG_WARNING, "unknown channel type\n");
+ break;
+ }
+ channel_counts[ctype]++;
+ }
+ av_log(avctx, AV_LOG_DEBUG,
+ "%d channels - front:%d side:%d back:%d lfe:%d top:%d\n",
+ info->numChannels,
+ channel_counts[ACT_FRONT], channel_counts[ACT_SIDE],
+ channel_counts[ACT_BACK], channel_counts[ACT_LFE],
+ channel_counts[ACT_FRONT_TOP] + channel_counts[ACT_SIDE_TOP] +
+ channel_counts[ACT_BACK_TOP] + channel_counts[ACT_TOP]);
+
+ switch (channel_counts[ACT_FRONT]) {
+ case 4:
+ ch_layout |= AV_CH_LAYOUT_STEREO | AV_CH_FRONT_LEFT_OF_CENTER |
+ AV_CH_FRONT_RIGHT_OF_CENTER;
+ break;
+ case 3:
+ ch_layout |= AV_CH_LAYOUT_STEREO | AV_CH_FRONT_CENTER;
+ break;
+ case 2:
+ ch_layout |= AV_CH_LAYOUT_STEREO;
+ break;
+ case 1:
+ ch_layout |= AV_CH_FRONT_CENTER;
+ break;
+ default:
+ av_log(avctx, AV_LOG_WARNING,
+ "unsupported number of front channels: %d\n",
+ channel_counts[ACT_FRONT]);
+ ch_error = 1;
+ break;
+ }
+ if (channel_counts[ACT_SIDE] > 0) {
+ if (channel_counts[ACT_SIDE] == 2) {
+ ch_layout |= AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT;
+ } else {
+ av_log(avctx, AV_LOG_WARNING,
+ "unsupported number of side channels: %d\n",
+ channel_counts[ACT_SIDE]);
+ ch_error = 1;
+ }
+ }
+ if (channel_counts[ACT_BACK] > 0) {
+ switch (channel_counts[ACT_BACK]) {
+ case 3:
+ ch_layout |= AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT | AV_CH_BACK_CENTER;
+ break;
+ case 2:
+ ch_layout |= AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT;
+ break;
+ case 1:
+ ch_layout |= AV_CH_BACK_CENTER;
+ break;
+ default:
+ av_log(avctx, AV_LOG_WARNING,
+ "unsupported number of back channels: %d\n",
+ channel_counts[ACT_BACK]);
+ ch_error = 1;
+ break;
+ }
+ }
+ if (channel_counts[ACT_LFE] > 0) {
+ if (channel_counts[ACT_LFE] == 1) {
+ ch_layout |= AV_CH_LOW_FREQUENCY;
+ } else {
+ av_log(avctx, AV_LOG_WARNING,
+ "unsupported number of LFE channels: %d\n",
+ channel_counts[ACT_LFE]);
+ ch_error = 1;
+ }
+ }
+ if (!ch_error &&
+ av_get_channel_layout_nb_channels(ch_layout) != info->numChannels) {
+ av_log(avctx, AV_LOG_WARNING, "unsupported channel configuration\n");
+ ch_error = 1;
+ }
+ if (ch_error)
+ avctx->channel_layout = 0;
+ else
+ avctx->channel_layout = ch_layout;
+
+ avctx->channels = info->numChannels;
+
+ return 0;
+}
+
+static av_cold int fdk_aac_decode_close(AVCodecContext *avctx)
+{
+ FDKAACDecContext *s = avctx->priv_data;
+
+ if (s->handle)
+ aacDecoder_Close(s->handle);
+
+ return 0;
+}
+
+static av_cold int fdk_aac_decode_init(AVCodecContext *avctx)
+{
+ FDKAACDecContext *s = avctx->priv_data;
+ AAC_DECODER_ERROR err;
+
+ s->handle = aacDecoder_Open(avctx->extradata_size ? TT_MP4_RAW : TT_MP4_ADTS, 1);
+ if (!s->handle) {
+ av_log(avctx, AV_LOG_ERROR, "Error opening decoder\n");
+ return AVERROR_UNKNOWN;
+ }
+
+ if (avctx->extradata_size) {
+ if ((err = aacDecoder_ConfigRaw(s->handle, &avctx->extradata,
+ &avctx->extradata_size)) != AAC_DEC_OK) {
+ av_log(avctx, AV_LOG_ERROR, "Unable to set extradata\n");
+ return AVERROR_INVALIDDATA;
+ }
+ }
+
+ if (s->conceal_method != CONCEAL_METHOD_DEFAULT) {
+ if ((err = aacDecoder_SetParam(s->handle, AAC_CONCEAL_METHOD,
+ s->conceal_method)) != AAC_DEC_OK) {
+ av_log(avctx, AV_LOG_ERROR, "Unable to set error concealment method\n");
+ return AVERROR_UNKNOWN;
+ }
+ }
+
+ avctx->sample_fmt = AV_SAMPLE_FMT_S16;
+
+ return 0;
+}
+
+static int fdk_aac_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, AVPacket *avpkt)
+{
+ FDKAACDecContext *s = avctx->priv_data;
+ AVFrame *frame = data;
+ int ret;
+ AAC_DECODER_ERROR err;
+ UINT valid = avpkt->size;
+ uint8_t *buf, *tmpptr = NULL;
+ int buf_size;
+
+ err = aacDecoder_Fill(s->handle, &avpkt->data, &avpkt->size, &valid);
+ if (err != AAC_DEC_OK) {
+ av_log(avctx, AV_LOG_ERROR, "aacDecoder_Fill() failed: %x\n", err);
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (s->initialized) {
+ frame->nb_samples = avctx->frame_size;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "ff_get_buffer() failed\n");
+ return ret;
+ }
+ buf = frame->extended_data[0];
+ buf_size = avctx->channels * frame->nb_samples *
+ av_get_bytes_per_sample(avctx->sample_fmt);
+ } else {
+ buf_size = 50 * 1024;
+ buf = tmpptr = av_malloc(buf_size);
+ if (!buf)
+ return AVERROR(ENOMEM);
+ }
+
+ err = aacDecoder_DecodeFrame(s->handle, (INT_PCM *) buf, buf_size, 0);
+ if (err == AAC_DEC_NOT_ENOUGH_BITS) {
+ ret = avpkt->size - valid;
+ goto end;
+ }
+ if (err != AAC_DEC_OK) {
+ av_log(avctx, AV_LOG_ERROR,
+ "aacDecoder_DecodeFrame() failed: %x\n", err);
+ ret = AVERROR_UNKNOWN;
+ goto end;
+ }
+
+ if (!s->initialized) {
+ if ((ret = get_stream_info(avctx)) < 0)
+ goto end;
+ s->initialized = 1;
+ frame->nb_samples = avctx->frame_size;
+ }
+
+ if (tmpptr) {
+ frame->nb_samples = avctx->frame_size;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "ff_get_buffer() failed\n");
+ goto end;
+ }
+ memcpy(frame->extended_data[0], tmpptr,
+ avctx->channels * avctx->frame_size *
+ av_get_bytes_per_sample(avctx->sample_fmt));
+ }
+
+ *got_frame_ptr = 1;
+ ret = avpkt->size - valid;
+
+end:
+ av_free(tmpptr);
+ return ret;
+}
+
+static av_cold void fdk_aac_decode_flush(AVCodecContext *avctx)
+{
+ FDKAACDecContext *s = avctx->priv_data;
+ AAC_DECODER_ERROR err;
+
+ if (!s->handle)
+ return;
+
+ if ((err = aacDecoder_SetParam(s->handle,
+ AAC_TPDEC_CLEAR_BUFFER, 1)) != AAC_DEC_OK)
+ av_log(avctx, AV_LOG_WARNING, "failed to clear buffer when flushing\n");
+}
+
+AVCodec ff_libfdk_aac_decoder = {
+ .name = "libfdk_aac",
+ .long_name = NULL_IF_CONFIG_SMALL("Fraunhofer FDK AAC"),
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = AV_CODEC_ID_AAC,
+ .priv_data_size = sizeof(FDKAACDecContext),
+ .init = fdk_aac_decode_init,
+ .decode = fdk_aac_decode_frame,
+ .close = fdk_aac_decode_close,
+ .flush = fdk_aac_decode_flush,
+ .capabilities = CODEC_CAP_DR1,
+ .priv_class = &fdk_aac_dec_class,
+};

libav-v9.6.tar.bz2/libavcodec/libfdk-aacenc.c -> libav-v10.1.tar.bz2/libavcodec/libfdk-aacenc.c Changed

@@ -97,9 +97,6 @@
 
 if (s->handle)
 aacEncClose(&s->handle);
-#if FF_API_OLD_ENCODE_AUDIO
- av_freep(&avctx->coded_frame);
-#endif
 av_freep(&avctx->extradata);
 ff_af_queue_close(&s->afq);
 
@@ -200,6 +197,7 @@
 avctx->bit_rate = (96*sce + 128*cpe) * avctx->sample_rate / 44;
 if (avctx->profile == FF_PROFILE_AAC_HE ||
 avctx->profile == FF_PROFILE_AAC_HE_V2 ||
+ avctx->profile == FF_PROFILE_MPEG2_AAC_HE ||
 s->eld_sbr)
 avctx->bit_rate /= 2;
 }
@@ -250,7 +248,7 @@
 }
 
 if (avctx->cutoff > 0) {
- if (avctx->cutoff < (avctx->sample_rate + 255) >> 8) {
+ if (avctx->cutoff < (avctx->sample_rate + 255) >> 8 || avctx->cutoff > 20000) {
 av_log(avctx, AV_LOG_ERROR, "cutoff valid range is %d-20000\n",
 (avctx->sample_rate + 255) >> 8);
 goto error;
@@ -275,13 +273,6 @@
 goto error;
 }
 
-#if FF_API_OLD_ENCODE_AUDIO
- avctx->coded_frame = avcodec_alloc_frame();
- if (!avctx->coded_frame) {
- ret = AVERROR(ENOMEM);
- goto error;
- }
-#endif
 avctx->frame_size = info.frameLength;
 avctx->delay = info.encoderDelay;
 ff_af_queue_init(avctx, &s->afq);
@@ -405,6 +396,7 @@
 
 AVCodec ff_libfdk_aac_encoder = {
 .name = "libfdk_aac",
+ .long_name = NULL_IF_CONFIG_SMALL("Fraunhofer FDK AAC"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_AAC,
 .priv_data_size = sizeof(AACContext),
@@ -414,7 +406,6 @@
 .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
 AV_SAMPLE_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("Fraunhofer FDK AAC"),
 .priv_class = &aac_enc_class,
 .defaults = aac_encode_defaults,
 .profiles = profiles,

libav-v9.6.tar.bz2/libavcodec/libgsm.c -> libav-v10.1.tar.bz2/libavcodec/libgsm.c Changed

@@ -27,7 +27,12 @@
 
 // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
 
+#include "config.h"
+#if HAVE_GSM_H
+#include <gsm.h>
+#else
 #include <gsm/gsm.h>
+#endif
 
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
@@ -72,21 +77,10 @@
 }
 }
 
-#if FF_API_OLD_ENCODE_AUDIO
- avctx->coded_frame= avcodec_alloc_frame();
- if (!avctx->coded_frame) {
- gsm_destroy(avctx->priv_data);
- return AVERROR(ENOMEM);
- }
-#endif
-
 return 0;
 }
 
 static av_cold int libgsm_encode_close(AVCodecContext *avctx) {
-#if FF_API_OLD_ENCODE_AUDIO
- av_freep(&avctx->coded_frame);
-#endif
 gsm_destroy(avctx->priv_data);
 avctx->priv_data = NULL;
 return 0;
@@ -120,6 +114,7 @@
 
 AVCodec ff_libgsm_encoder = {
 .name = "libgsm",
+ .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_GSM,
 .init = libgsm_encode_init,
@@ -127,11 +122,11 @@
 .close = libgsm_encode_close,
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
 AV_SAMPLE_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
 };
 
 AVCodec ff_libgsm_ms_encoder = {
 .name = "libgsm_ms",
+ .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_GSM_MS,
 .init = libgsm_encode_init,
@@ -139,11 +134,9 @@
 .close = libgsm_encode_close,
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
 AV_SAMPLE_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
 };
 
 typedef struct LibGSMDecodeContext {
- AVFrame frame;
 struct gsm_state *state;
 } LibGSMDecodeContext;
 
@@ -170,9 +163,6 @@
 }
 }
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
@@ -189,6 +179,7 @@
 {
 int i, ret;
 LibGSMDecodeContext *s = avctx->priv_data;
+ AVFrame *frame = data;
 uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 int16_t *samples;
@@ -199,12 +190,12 @@
 }
 
 /* get output buffer */
- s->frame.nb_samples = avctx->frame_size;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = avctx->frame_size;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- samples = (int16_t *)s->frame.data[0];
+ samples = (int16_t *)frame->data[0];
 
 for (i = 0; i < avctx->frame_size / GSM_FRAME_SIZE; i++) {
 if ((ret = gsm_decode(s->state, buf, samples)) < 0)
@@ -213,8 +204,7 @@
 samples += GSM_FRAME_SIZE;
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
 return avctx->block_align;
 }
@@ -231,6 +221,7 @@
 
 AVCodec ff_libgsm_decoder = {
 .name = "libgsm",
+ .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_GSM,
 .priv_data_size = sizeof(LibGSMDecodeContext),
@@ -239,11 +230,11 @@
 .decode = libgsm_decode_frame,
 .flush = libgsm_flush,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
 };
 
 AVCodec ff_libgsm_ms_decoder = {
 .name = "libgsm_ms",
+ .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_GSM_MS,
 .priv_data_size = sizeof(LibGSMDecodeContext),
@@ -252,5 +243,4 @@
 .decode = libgsm_decode_frame,
 .flush = libgsm_flush,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
 };

libav-v9.6.tar.bz2/libavcodec/libilbc.c -> libav-v10.1.tar.bz2/libavcodec/libilbc.c Changed

@@ -41,7 +41,6 @@
 
 typedef struct ILBCDecContext {
 const AVClass *class;
- AVFrame frame;
 iLBC_Dec_Inst_t decoder;
 int enhance;
 } ILBCDecContext;
@@ -66,8 +65,6 @@
 }
 
 WebRtcIlbcfix_InitDecode(&s->decoder, mode, s->enhance);
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
 
 avctx->channels = 1;
 avctx->channel_layout = AV_CH_LAYOUT_MONO;
@@ -83,6 +80,7 @@
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 ILBCDecContext *s = avctx->priv_data;
+ AVFrame *frame = data;
 int ret;
 
 if (s->decoder.no_of_bytes > buf_size) {
@@ -91,30 +89,29 @@
 return AVERROR_INVALIDDATA;
 }
 
- s->frame.nb_samples = s->decoder.blockl;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = s->decoder.blockl;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
 
- WebRtcIlbcfix_DecodeImpl((WebRtc_Word16*) s->frame.data[0],
+ WebRtcIlbcfix_DecodeImpl((WebRtc_Word16*) frame->data[0],
 (const WebRtc_UWord16*) buf, &s->decoder, 1);
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
 return s->decoder.no_of_bytes;
 }
 
 AVCodec ff_libilbc_decoder = {
 .name = "libilbc",
+ .long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_ILBC,
 .priv_data_size = sizeof(ILBCDecContext),
 .init = ilbc_decode_init,
 .decode = ilbc_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"),
 .priv_class = &ilbc_dec_class,
 };
 
@@ -156,20 +153,7 @@
 
 avctx->block_align = s->encoder.no_of_bytes;
 avctx->frame_size = s->encoder.blockl;
-#if FF_API_OLD_ENCODE_AUDIO
- avctx->coded_frame = avcodec_alloc_frame();
- if (!avctx->coded_frame)
- return AVERROR(ENOMEM);
-#endif
-
- return 0;
-}
 
-static av_cold int ilbc_encode_close(AVCodecContext *avctx)
-{
-#if FF_API_OLD_ENCODE_AUDIO
- av_freep(&avctx->coded_frame);
-#endif
 return 0;
 }
 
@@ -198,15 +182,14 @@
 
 AVCodec ff_libilbc_encoder = {
 .name = "libilbc",
+ .long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_ILBC,
 .priv_data_size = sizeof(ILBCEncContext),
 .init = ilbc_encode_init,
 .encode2 = ilbc_encode_frame,
- .close = ilbc_encode_close,
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
 AV_SAMPLE_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"),
 .defaults = ilbc_encode_defaults,
 .priv_class = &ilbc_enc_class,
 };

libav-v9.6.tar.bz2/libavcodec/libmp3lame.c -> libav-v10.1.tar.bz2/libavcodec/libmp3lame.c Changed

@@ -57,18 +57,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;
@@ -78,9 +74,6 @@
 {
 LAMEContext *s = avctx->priv_data;
 
-#if FF_API_OLD_ENCODE_AUDIO
- av_freep(&avctx->coded_frame);
-#endif
 av_freep(&s->samples_flt[0]);
 av_freep(&s->samples_flt[1]);
 av_freep(&s->buffer);
@@ -142,14 +135,6 @@
 
 avctx->frame_size = lame_get_framesize(s->gfp);
 
-#if FF_API_OLD_ENCODE_AUDIO
- avctx->coded_frame = avcodec_alloc_frame();
- if (!avctx->coded_frame) {
- ret = AVERROR(ENOMEM);
- goto error;
- }
-#endif
-
 /* allocate float sample buffers */
 if (avctx->sample_fmt == AV_SAMPLE_FMT_FLTP) {
 int ch;
@@ -296,6 +281,7 @@
 
 AVCodec ff_libmp3lame_encoder = {
 .name = "libmp3lame",
+ .long_name = NULL_IF_CONFIG_SMALL("libmp3lame MP3 (MPEG audio layer 3)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_MP3,
 .priv_data_size = sizeof(LAMEContext),
@@ -311,7 +297,6 @@
 .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO,
 AV_CH_LAYOUT_STEREO,
 0 },
- .long_name = NULL_IF_CONFIG_SMALL("libmp3lame MP3 (MPEG audio layer 3)"),
 .priv_class = &libmp3lame_class,
 .defaults = libmp3lame_defaults,
 };

libav-v9.6.tar.bz2/libavcodec/libopencore-amr.c -> libav-v10.1.tar.bz2/libavcodec/libopencore-amr.c Changed

@@ -34,7 +34,7 @@
 avctx->sample_rate = 8000 * is_amr_wb;
 
 if (avctx->channels > 1) {
- av_log_missing_feature(avctx, "multi-channel AMR", 0);
+ avpriv_report_missing_feature(avctx, "multi-channel AMR");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -51,7 +51,6 @@
 
 typedef struct AMRContext {
 AVClass *av_class;
- AVFrame frame;
 void *dec_state;
 void *enc_state;
 int enc_bitrate;
@@ -76,9 +75,6 @@
 return -1;
 }
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
@@ -94,6 +90,7 @@
 static int amr_nb_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 AMRContext *s = avctx->priv_data;
@@ -105,8 +102,8 @@
 buf, buf_size, avctx->frame_number);
 
 /* get output buffer */
- s->frame.nb_samples = 160;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = 160;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -123,16 +120,16 @@
 av_dlog(avctx, "packet_size=%d buf= 0x%X %X %X %X\n",
 packet_size, buf[0], buf[1], buf[2], buf[3]);
 /* call decoder */
- Decoder_Interface_Decode(s->dec_state, buf, (short *)s->frame.data[0], 0);
+ Decoder_Interface_Decode(s->dec_state, buf, (short *)frame->data[0], 0);
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
 return packet_size;
 }
 
 AVCodec ff_libopencore_amrnb_decoder = {
 .name = "libopencore_amrnb",
+ .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_AMR_NB,
 .priv_data_size = sizeof(AMRContext),
@@ -140,7 +137,6 @@
 .close = amr_nb_decode_close,
 .decode = amr_nb_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"),
 };
 #endif /* CONFIG_LIBOPENCORE_AMRNB_DECODER */
 
@@ -206,11 +202,6 @@
 avctx->frame_size = 160;
 avctx->delay = 50;
 ff_af_queue_init(avctx, &s->afq);
-#if FF_API_OLD_ENCODE_AUDIO
- avctx->coded_frame = avcodec_alloc_frame();
- if (!avctx->coded_frame)
- return AVERROR(ENOMEM);
-#endif
 
 s->enc_state = Encoder_Interface_init(s->enc_dtx);
 if (!s->enc_state) {
@@ -231,9 +222,6 @@
 
 Encoder_Interface_exit(s->enc_state);
 ff_af_queue_close(&s->afq);
-#if FF_API_OLD_ENCODE_AUDIO
- av_freep(&avctx->coded_frame);
-#endif
 return 0;
 }
 
@@ -296,6 +284,7 @@
 
 AVCodec ff_libopencore_amrnb_encoder = {
 .name = "libopencore_amrnb",
+ .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_AMR_NB,
 .priv_data_size = sizeof(AMRContext),
@@ -305,7 +294,6 @@
 .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SMALL_LAST_FRAME,
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
 AV_SAMPLE_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"),
 .priv_class = &class,
 };
 #endif /* CONFIG_LIBOPENCORE_AMRNB_ENCODER */
@@ -319,7 +307,6 @@
 #include <opencore-amrwb/if_rom.h>
 
 typedef struct AMRWBContext {
- AVFrame frame;
 void *state;
 } AMRWBContext;
 
@@ -333,15 +320,13 @@
 
 s->state = D_IF_init();
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
 static int amr_wb_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 AMRWBContext *s = avctx->priv_data;
@@ -350,8 +335,8 @@
 static const uint8_t block_size[16] = {18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1};
 
 /* get output buffer */
- s->frame.nb_samples = 320;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = 320;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -365,10 +350,9 @@
 return AVERROR_INVALIDDATA;
 }
 
- D_IF_decode(s->state, buf, (short *)s->frame.data[0], _good_frame);
+ D_IF_decode(s->state, buf, (short *)frame->data[0], _good_frame);
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
 return packet_size;
 }
@@ -383,6 +367,7 @@
 
 AVCodec ff_libopencore_amrwb_decoder = {
 .name = "libopencore_amrwb",
+ .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-WB (Adaptive Multi-Rate Wide-Band)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_AMR_WB,
 .priv_data_size = sizeof(AMRWBContext),
@@ -390,7 +375,6 @@
 .close = amr_wb_decode_close,
 .decode = amr_wb_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-WB (Adaptive Multi-Rate Wide-Band)"),
 };
 
 #endif /* CONFIG_LIBOPENCORE_AMRWB_DECODER */

libav-v9.6.tar.bz2/libavcodec/libopenjpegdec.c -> libav-v10.1.tar.bz2/libavcodec/libopenjpegdec.c Changed

@@ -33,6 +33,7 @@
 #include "libavutil/pixfmt.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
+#include "internal.h"
 #include "thread.h"
 
 #define JP2_SIG_TYPE 0x6A502020
@@ -57,17 +58,19 @@
 AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, \
 AV_PIX_FMT_YUV444P16
 
+#define XYZ_PIXEL_FORMATS AV_PIX_FMT_XYZ12
+
 static const enum AVPixelFormat rgb_pix_fmts[] = {RGB_PIXEL_FORMATS};
 static const enum AVPixelFormat gray_pix_fmts[] = {GRAY_PIXEL_FORMATS};
 static const enum AVPixelFormat yuv_pix_fmts[] = {YUV_PIXEL_FORMATS};
 static const enum AVPixelFormat any_pix_fmts[] = {RGB_PIXEL_FORMATS,
 GRAY_PIXEL_FORMATS,
- YUV_PIXEL_FORMATS};
+ YUV_PIXEL_FORMATS,
+ XYZ_PIXEL_FORMATS};
 
 typedef struct {
 AVClass *class;
 opj_dparameters_t dec_params;
- AVFrame image;
 int lowres;
 int lowqual;
 } LibOpenJPEGContext;
@@ -239,16 +242,6 @@
 LibOpenJPEGContext *ctx = avctx->priv_data;
 
 opj_set_default_decoder_parameters(&ctx->dec_params);
- avcodec_get_frame_defaults(&ctx->image);
- avctx->coded_frame = &ctx->image;
- return 0;
-}
-
-static av_cold int libopenjpeg_decode_init_thread_copy(AVCodecContext *avctx)
-{
- LibOpenJPEGContext *ctx = avctx->priv_data;
-
- avctx->coded_frame = &ctx->image;
 return 0;
 }
 
@@ -259,12 +252,13 @@
 uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 LibOpenJPEGContext *ctx = avctx->priv_data;
- AVFrame *picture = &ctx->image, *output = data;
+ ThreadFrame frame = { .f = data };
+ AVFrame *picture = data;
 const AVPixFmtDescriptor *desc;
 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;
@@ -286,7 +280,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);
 
@@ -301,7 +295,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.
@@ -311,7 +305,7 @@
 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;
@@ -322,13 +316,9 @@
 height = (height + (1 << ctx->lowres) - 1) >> ctx->lowres;
 }
 
- 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))
@@ -347,10 +337,7 @@
 if (image->comps[i].prec > avctx->bits_per_raw_sample)
 avctx->bits_per_raw_sample = image->comps[i].prec;
 
- if (picture->data[0])
- ff_thread_release_buffer(avctx, picture);
-
- if (ff_thread_get_buffer(avctx, picture) < 0) {
+ if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "ff_thread_get_buffer() failed\n");
 goto done;
 }
@@ -362,6 +349,7 @@
 if (!stream) {
 av_log(avctx, AV_LOG_ERROR,
 "Codestream could not be opened for reading.\n");
+ ret = AVERROR_UNKNOWN;
 goto done;
 }
 
@@ -372,6 +360,7 @@
 
 if (!image) {
 av_log(avctx, AV_LOG_ERROR, "Error decoding codestream.\n");
+ ret = AVERROR_UNKNOWN;
 goto done;
 }
 
@@ -408,10 +397,10 @@
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "unsupported pixel size %d\n", pixel_size);
+ ret = AVERROR_PATCHWELCOME;
 goto done;
 }
 
- *output = ctx->image;
 *got_frame = 1;
 ret = buf_size;
 
@@ -421,15 +410,6 @@
 return ret;
 }
 
-static av_cold int libopenjpeg_decode_close(AVCodecContext *avctx)
-{
- LibOpenJPEGContext *ctx = avctx->priv_data;
-
- if (ctx->image.data[0])
- ff_thread_release_buffer(avctx, &ctx->image);
- return 0;
-}
-
 #define OFFSET(x) offsetof(LibOpenJPEGContext, x)
 #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
 
@@ -448,14 +428,12 @@
 
 AVCodec ff_libopenjpeg_decoder = {
 .name = "libopenjpeg",
+ .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_JPEG2000,
 .priv_data_size = sizeof(LibOpenJPEGContext),
 .init = libopenjpeg_decode_init,
- .close = libopenjpeg_decode_close,
 .decode = libopenjpeg_decode_frame,
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
- .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"),
 .priv_class = &class,
- .init_thread_copy = ONLY_IF_THREADS_ENABLED(libopenjpeg_decode_init_thread_copy),
 };

libav-v9.6.tar.bz2/libavcodec/libopenjpegenc.c -> libav-v10.1.tar.bz2/libavcodec/libopenjpegenc.c Changed

libav-v9.6.tar.bz2/libavcodec/libopusdec.c -> libav-v10.1.tar.bz2/libavcodec/libopusdec.c Changed

@@ -32,7 +32,6 @@
 
 struct libopus_context {
 OpusMSDecoder *dec;
- AVFrame frame;
 };
 
 #define OPUS_HEAD_SIZE 19
@@ -95,8 +94,7 @@
 opus_strerror(ret));
 
 avc->delay = 3840; /* Decoder delay (in samples) at 48kHz */
- avcodec_get_frame_defaults(&opus->frame);
- avc->coded_frame = &opus->frame;
+
 return 0;
 }
 
@@ -110,14 +108,15 @@
 
 #define MAX_FRAME_SIZE (960 * 6)
 
-static int libopus_decode(AVCodecContext *avc, void *frame,
+static int libopus_decode(AVCodecContext *avc, void *data,
 int *got_frame_ptr, AVPacket *pkt)
 {
 struct libopus_context *opus = avc->priv_data;
+ AVFrame *frame = data;
 int ret, nb_samples;
 
- opus->frame.nb_samples = MAX_FRAME_SIZE;
- ret = ff_get_buffer(avc, &opus->frame);
+ frame->nb_samples = MAX_FRAME_SIZE;
+ ret = ff_get_buffer(avc, frame, 0);
 if (ret < 0) {
 av_log(avc, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
@@ -125,12 +124,12 @@
 
 if (avc->sample_fmt == AV_SAMPLE_FMT_S16)
 nb_samples = opus_multistream_decode(opus->dec, pkt->data, pkt->size,
- (opus_int16 *)opus->frame.data[0],
- opus->frame.nb_samples, 0);
+ (opus_int16 *)frame->data[0],
+ frame->nb_samples, 0);
 else
 nb_samples = opus_multistream_decode_float(opus->dec, pkt->data, pkt->size,
- (float *)opus->frame.data[0],
- opus->frame.nb_samples, 0);
+ (float *)frame->data[0],
+ frame->nb_samples, 0);
 
 if (nb_samples < 0) {
 av_log(avc, AV_LOG_ERROR, "Decoding error: %s\n",
@@ -138,9 +137,9 @@
 return ff_opus_error_to_averror(nb_samples);
 }
 
- opus->frame.nb_samples = nb_samples;
- *(AVFrame *)frame = opus->frame;
- *got_frame_ptr = 1;
+ frame->nb_samples = nb_samples;
+ *got_frame_ptr = 1;
+
 return pkt->size;
 }
 
@@ -153,6 +152,7 @@
 
 AVCodec ff_libopus_decoder = {
 .name = "libopus",
+ .long_name = NULL_IF_CONFIG_SMALL("libopus Opus"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_OPUS,
 .priv_data_size = sizeof(struct libopus_context),
@@ -161,7 +161,6 @@
 .decode = libopus_decode,
 .flush = libopus_flush,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("libopus Opus"),
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,
 AV_SAMPLE_FMT_S16,
 AV_SAMPLE_FMT_NONE },

libav-v9.6.tar.bz2/libavcodec/libopusenc.c -> libav-v10.1.tar.bz2/libavcodec/libopusenc.c Changed

@@ -375,7 +375,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" },
@@ -403,6 +403,7 @@
 
 AVCodec ff_libopus_encoder = {
     .name            = "libopus",
+    .long_name       = NULL_IF_CONFIG_SMALL("libopus Opus"),
     .type            = AVMEDIA_TYPE_AUDIO,
     .id              = AV_CODEC_ID_OPUS,
     .priv_data_size  = sizeof(LibopusEncContext),
@@ -415,7 +416,6 @@
                                                       AV_SAMPLE_FMT_NONE },
     .channel_layouts = ff_vorbis_channel_layouts,
     .supported_samplerates = libopus_sample_rates,
-    .long_name       = NULL_IF_CONFIG_SMALL("libopus Opus"),
     .priv_class      = &libopus_class,
     .defaults        = libopus_defaults,
 };

libav-v9.6.tar.bz2/libavcodec/libschroedinger.c -> libav-v10.1.tar.bz2/libavcodec/libschroedinger.c Changed

@@ -23,8 +23,9 @@
 * function definitions common to libschroedinger decoder and encoder
 */
 
-#include "libschroedinger.h"
+#include "libavutil/attributes.h"
 #include "libavutil/mem.h"
+#include "libschroedinger.h"
 
 static const SchroVideoFormatInfo ff_schro_video_format_info[] = {
 { 640, 480, 24000, 1001},
@@ -46,7 +47,7 @@
 { 4096, 2160, 24, 1 },
 };
 
-static unsigned int get_video_format_idx(AVCodecContext *avccontext)
+static unsigned int get_video_format_idx(AVCodecContext *avctx)
 {
 unsigned int ret_idx = 0;
 unsigned int idx;
@@ -55,18 +56,18 @@
 
 for (idx = 1; idx < num_formats; ++idx) {
 const SchroVideoFormatInfo *vf = &ff_schro_video_format_info[idx];
- if (avccontext->width == vf->width &&
- avccontext->height == vf->height) {
+ if (avctx->width == vf->width &&
+ avctx->height == vf->height) {
 ret_idx = idx;
- if (avccontext->time_base.den == vf->frame_rate_num &&
- avccontext->time_base.num == vf->frame_rate_denom)
+ if (avctx->time_base.den == vf->frame_rate_num &&
+ avctx->time_base.num == vf->frame_rate_denom)
 return idx;
 }
 }
 return ret_idx;
 }
 
-void ff_schro_queue_init(FFSchroQueue *queue)
+av_cold void ff_schro_queue_init(FFSchroQueue *queue)
 {
 queue->p_head = queue->p_tail = NULL;
 queue->size = 0;
@@ -136,12 +137,12 @@
 SCHRO_VIDEO_FORMAT_DC4K_24 ,
 };
 
-SchroVideoFormatEnum ff_get_schro_video_format_preset(AVCodecContext *avccontext)
+SchroVideoFormatEnum ff_get_schro_video_format_preset(AVCodecContext *avctx)
 {
 unsigned int num_formats = sizeof(ff_schro_video_formats) /
 sizeof(ff_schro_video_formats[0]);
 
- unsigned int idx = get_video_format_idx(avccontext);
+ unsigned int idx = get_video_format_idx(avctx);
 
 return (idx < num_formats) ? ff_schro_video_formats[idx] :
 SCHRO_VIDEO_FORMAT_CUSTOM;
@@ -175,7 +176,7 @@
 av_freep(&p_pic);
 }
 
-SchroFrame *ff_create_schro_frame(AVCodecContext *avccontext,
+SchroFrame *ff_create_schro_frame(AVCodecContext *avctx,
 SchroFrameFormat schro_frame_fmt)
 {
 AVPicture *p_pic;
@@ -184,13 +185,13 @@
 int y_height, uv_height;
 int i;
 
- y_width = avccontext->width;
- y_height = avccontext->height;
+ y_width = avctx->width;
+ y_height = avctx->height;
 uv_width = y_width >> (SCHRO_FRAME_FORMAT_H_SHIFT(schro_frame_fmt));
 uv_height = y_height >> (SCHRO_FRAME_FORMAT_V_SHIFT(schro_frame_fmt));
 
 p_pic = av_mallocz(sizeof(AVPicture));
- avpicture_alloc(p_pic, avccontext->pix_fmt, y_width, y_height);
+ avpicture_alloc(p_pic, avctx->pix_fmt, y_width, y_height);
 
 p_frame = schro_frame_new();
 p_frame->format = schro_frame_fmt;

libav-v9.6.tar.bz2/libavcodec/libschroedinger.h -> libav-v10.1.tar.bz2/libavcodec/libschroedinger.h Changed

libav-v9.6.tar.bz2/libavcodec/libschroedingerdec.c -> libav-v10.1.tar.bz2/libavcodec/libschroedingerdec.c Changed

@@ -70,9 +70,6 @@
 
 /** end of sequence pulled */
 int eos_pulled;
-
- /** decoded picture */
- AVFrame dec_frame;
 } SchroDecoderParams;
 
 typedef struct SchroParseUnitContext {
@@ -151,14 +148,14 @@
 return AV_PIX_FMT_NONE;
 }
 
-static av_cold int libschroedinger_decode_init(AVCodecContext *avccontext)
+static av_cold int libschroedinger_decode_init(AVCodecContext *avctx)
 {
 
- SchroDecoderParams *p_schro_params = avccontext->priv_data;
+ SchroDecoderParams *p_schro_params = avctx->priv_data;
 /* First of all, initialize our supporting libraries. */
 schro_init();
 
- schro_debug_set_level(avccontext->debug);
+ schro_debug_set_level(avctx->debug);
 p_schro_params->decoder = schro_decoder_new();
 schro_decoder_set_skip_ratio(p_schro_params->decoder, 1);
 
@@ -175,38 +172,38 @@
 schro_frame_unref(frame);
 }
 
-static void libschroedinger_handle_first_access_unit(AVCodecContext *avccontext)
+static void libschroedinger_handle_first_access_unit(AVCodecContext *avctx)
 {
- SchroDecoderParams *p_schro_params = avccontext->priv_data;
+ SchroDecoderParams *p_schro_params = avctx->priv_data;
 SchroDecoder *decoder = p_schro_params->decoder;
 
 p_schro_params->format = schro_decoder_get_video_format(decoder);
 
 /* Tell Libav about sequence details. */
 if (av_image_check_size(p_schro_params->format->width,
- p_schro_params->format->height, 0, avccontext) < 0) {
- av_log(avccontext, AV_LOG_ERROR, "invalid dimensions (%dx%d)\n",
+ p_schro_params->format->height, 0, avctx) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "invalid dimensions (%dx%d)\n",
 p_schro_params->format->width, p_schro_params->format->height);
- avccontext->height = avccontext->width = 0;
+ avctx->height = avctx->width = 0;
 return;
 }
- avccontext->height = p_schro_params->format->height;
- avccontext->width = p_schro_params->format->width;
- avccontext->pix_fmt = get_chroma_format(p_schro_params->format->chroma_format);
+ avctx->height = p_schro_params->format->height;
+ avctx->width = p_schro_params->format->width;
+ avctx->pix_fmt = get_chroma_format(p_schro_params->format->chroma_format);
 
 if (ff_get_schro_frame_format(p_schro_params->format->chroma_format,
 &p_schro_params->frame_format) == -1) {
- av_log(avccontext, AV_LOG_ERROR,
+ av_log(avctx, AV_LOG_ERROR,
 "This codec currently only supports planar YUV 4:2:0, 4:2:2 "
 "and 4:4:4 formats.\n");
 return;
 }
 
- avccontext->time_base.den = p_schro_params->format->frame_rate_numerator;
- avccontext->time_base.num = p_schro_params->format->frame_rate_denominator;
+ avctx->time_base.den = p_schro_params->format->frame_rate_numerator;
+ avctx->time_base.num = p_schro_params->format->frame_rate_denominator;
 }
 
-static int libschroedinger_decode_frame(AVCodecContext *avccontext,
+static int libschroedinger_decode_frame(AVCodecContext *avctx,
 void *data, int *got_frame,
 AVPacket *avpkt)
 {
@@ -215,10 +212,11 @@
 int64_t pts = avpkt->pts;
 SchroTag *tag;
 
- SchroDecoderParams *p_schro_params = avccontext->priv_data;
+ SchroDecoderParams *p_schro_params = avctx->priv_data;
 SchroDecoder *decoder = p_schro_params->decoder;
 SchroBuffer *enc_buf;
 SchroFrame* frame;
+ AVFrame *avframe = data;
 int state;
 int go = 1;
 int outer = 1;
@@ -241,17 +239,17 @@
 /* Set Schrotag with the pts to be recovered after decoding*/
 enc_buf->tag = schro_tag_new(av_malloc(sizeof(int64_t)), av_free);
 if (!enc_buf->tag->value) {
- av_log(avccontext, AV_LOG_ERROR, "Unable to allocate SchroTag\n");
+ av_log(avctx, AV_LOG_ERROR, "Unable to allocate SchroTag\n");
 return AVERROR(ENOMEM);
 }
 AV_WN(64, enc_buf->tag->value, pts);
 /* Push buffer into decoder. */
 if (SCHRO_PARSE_CODE_IS_PICTURE(enc_buf->data[4]) &&
 SCHRO_PARSE_CODE_NUM_REFS(enc_buf->data[4]) > 0)
- avccontext->has_b_frames = 1;
+ avctx->has_b_frames = 1;
 state = schro_decoder_push(decoder, enc_buf);
 if (state == SCHRO_DECODER_FIRST_ACCESS_UNIT)
- libschroedinger_handle_first_access_unit(avccontext);
+ libschroedinger_handle_first_access_unit(avctx);
 go = 1;
 } else
 outer = 0;
@@ -261,7 +259,7 @@
 state = schro_decoder_wait(decoder);
 switch (state) {
 case SCHRO_DECODER_FIRST_ACCESS_UNIT:
- libschroedinger_handle_first_access_unit(avccontext);
+ libschroedinger_handle_first_access_unit(avctx);
 break;
 
 case SCHRO_DECODER_NEED_BITS:
@@ -271,7 +269,7 @@
 
 case SCHRO_DECODER_NEED_FRAME:
 /* Decoder needs a frame - create one and push it in. */
- frame = ff_create_schro_frame(avccontext,
+ frame = ff_create_schro_frame(avctx,
 p_schro_params->frame_format);
 schro_decoder_add_output_picture(decoder, frame);
 break;
@@ -285,7 +283,7 @@
 /* Add relation between schroframe and pts. */
 framewithpts = av_malloc(sizeof(LibSchroFrameContext));
 if (!framewithpts) {
- av_log(avccontext, AV_LOG_ERROR, "Unable to allocate FrameWithPts\n");
+ av_log(avctx, AV_LOG_ERROR, "Unable to allocate FrameWithPts\n");
 return AVERROR(ENOMEM);
 }
 framewithpts->frame = frame;
@@ -312,35 +310,29 @@
 framewithpts = ff_schro_queue_pop(&p_schro_params->dec_frame_queue);
 
 if (framewithpts && framewithpts->frame) {
- if (p_schro_params->dec_frame.data[0])
- avccontext->release_buffer(avccontext, &p_schro_params->dec_frame);
- if (ff_get_buffer(avccontext, &p_schro_params->dec_frame) < 0) {
- av_log(avccontext, AV_LOG_ERROR, "Unable to allocate buffer\n");
+ if (ff_get_buffer(avctx, avframe, 0) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Unable to allocate buffer\n");
 return AVERROR(ENOMEM);
 }
 
- memcpy(p_schro_params->dec_frame.data[0],
+ memcpy(avframe->data[0],
 framewithpts->frame->components[0].data,
 framewithpts->frame->components[0].length);
 
- memcpy(p_schro_params->dec_frame.data[1],
+ memcpy(avframe->data[1],
 framewithpts->frame->components[1].data,
 framewithpts->frame->components[1].length);
 
- memcpy(p_schro_params->dec_frame.data[2],
+ memcpy(avframe->data[2],
 framewithpts->frame->components[2].data,
 framewithpts->frame->components[2].length);
 
 /* Fill frame with current buffer data from Schroedinger. */
- p_schro_params->dec_frame.format = -1; /* Unknown -1 */
- p_schro_params->dec_frame.width = framewithpts->frame->width;
- p_schro_params->dec_frame.height = framewithpts->frame->height;
- p_schro_params->dec_frame.pkt_pts = framewithpts->pts;
- p_schro_params->dec_frame.linesize[0] = framewithpts->frame->components[0].stride;
- p_schro_params->dec_frame.linesize[1] = framewithpts->frame->components[1].stride;
- p_schro_params->dec_frame.linesize[2] = framewithpts->frame->components[2].stride;
-
- *(AVFrame*)data = p_schro_params->dec_frame;
+ avframe->pkt_pts = framewithpts->pts;
+ avframe->linesize[0] = framewithpts->frame->components[0].stride;
+ avframe->linesize[1] = framewithpts->frame->components[1].stride;
+ avframe->linesize[2] = framewithpts->frame->components[2].stride;
+
 *got_frame = 1;
 
 /* Now free the frame resources. */
@@ -354,16 +346,13 @@
 }
 
 
-static av_cold int libschroedinger_decode_close(AVCodecContext *avccontext)
+static av_cold int libschroedinger_decode_close(AVCodecContext *avctx)
 {
- SchroDecoderParams *p_schro_params = avccontext->priv_data;
+ SchroDecoderParams *p_schro_params = avctx->priv_data;
 /* Free the decoder. */
 schro_decoder_free(p_schro_params->decoder);
 av_freep(&p_schro_params->format);
 
- if (p_schro_params->dec_frame.data[0])
- avccontext->release_buffer(avccontext, &p_schro_params->dec_frame);
-
 /* Free data in the output frame queue. */
 ff_schro_queue_free(&p_schro_params->dec_frame_queue,
 libschroedinger_decode_frame_free);
@@ -371,11 +360,11 @@
 return 0;
 }
 
-static void libschroedinger_flush(AVCodecContext *avccontext)
+static void libschroedinger_flush(AVCodecContext *avctx)
 {
 /* Got a seek request. Free the decoded frames queue and then reset
 * the decoder */
- SchroDecoderParams *p_schro_params = avccontext->priv_data;
+ SchroDecoderParams *p_schro_params = avctx->priv_data;
 
 /* Free data in the output frame queue. */
 ff_schro_queue_free(&p_schro_params->dec_frame_queue,
@@ -389,6 +378,7 @@
 
 AVCodec ff_libschroedinger_decoder = {
 .name = "libschroedinger",
+ .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_DIRAC,
 .priv_data_size = sizeof(SchroDecoderParams),
@@ -397,5 +387,4 @@
 .decode = libschroedinger_decode_frame,
 .capabilities = CODEC_CAP_DELAY,
 .flush = libschroedinger_flush,
- .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"),
 };

libav-v9.6.tar.bz2/libavcodec/libschroedingerenc.c -> libav-v10.1.tar.bz2/libavcodec/libschroedingerenc.c Changed

@@ -27,13 +27,11 @@
 * (http://dirac.sourceforge.net/specification.html).
 */
 
-#undef NDEBUG
-#include <assert.h>
-
 #include <schroedinger/schro.h>
 #include <schroedinger/schrodebug.h>
 #include <schroedinger/schrovideoformat.h>
 
+#include "libavutil/attributes.h"
 #include "avcodec.h"
 #include "internal.h"
 #include "libschroedinger.h"
@@ -48,9 +46,6 @@
 /** Schroedinger frame format */
 SchroFrameFormat frame_format;
 
- /** frame being encoded */
- AVFrame picture;
-
 /** frame size */
 int frame_size;
 
@@ -79,33 +74,32 @@
 /**
 * Works out Schro-compatible chroma format.
 */
-static int set_chroma_format(AVCodecContext *avccontext)
+static int set_chroma_format(AVCodecContext *avctx)
 {
 int num_formats = sizeof(schro_pixel_format_map) /
 sizeof(schro_pixel_format_map[0]);
 int idx;
 
- SchroEncoderParams *p_schro_params = avccontext->priv_data;
+ SchroEncoderParams *p_schro_params = avctx->priv_data;
 
 for (idx = 0; idx < num_formats; ++idx) {
- if (schro_pixel_format_map[idx].ff_pix_fmt ==
- avccontext->pix_fmt) {
+ if (schro_pixel_format_map[idx].ff_pix_fmt == avctx->pix_fmt) {
 p_schro_params->format->chroma_format =
 schro_pixel_format_map[idx].schro_pix_fmt;
 return 0;
 }
 }
 
- av_log(avccontext, AV_LOG_ERROR,
+ av_log(avctx, AV_LOG_ERROR,
 "This codec currently only supports planar YUV 4:2:0, 4:2:2"
 " and 4:4:4 formats.\n");
 
 return -1;
 }
 
-static int libschroedinger_encode_init(AVCodecContext *avccontext)
+static av_cold int libschroedinger_encode_init(AVCodecContext *avctx)
 {
- SchroEncoderParams *p_schro_params = avccontext->priv_data;
+ SchroEncoderParams *p_schro_params = avctx->priv_data;
 SchroVideoFormatEnum preset;
 
 /* Initialize the libraries that libschroedinger depends on. */
@@ -115,75 +109,77 @@
 p_schro_params->encoder = schro_encoder_new();
 
 if (!p_schro_params->encoder) {
- av_log(avccontext, AV_LOG_ERROR,
+ av_log(avctx, AV_LOG_ERROR,
 "Unrecoverable Error: schro_encoder_new failed. ");
 return -1;
 }
 
 /* Initialize the format. */
- preset = ff_get_schro_video_format_preset(avccontext);
+ preset = ff_get_schro_video_format_preset(avctx);
 p_schro_params->format =
 schro_encoder_get_video_format(p_schro_params->encoder);
 schro_video_format_set_std_video_format(p_schro_params->format, preset);
- p_schro_params->format->width = avccontext->width;
- p_schro_params->format->height = avccontext->height;
+ p_schro_params->format->width = avctx->width;
+ p_schro_params->format->height = avctx->height;
 
- if (set_chroma_format(avccontext) == -1)
+ if (set_chroma_format(avctx) == -1)
 return -1;
 
- if (avccontext->color_primaries == AVCOL_PRI_BT709) {
+ if (avctx->color_primaries == AVCOL_PRI_BT709) {
 p_schro_params->format->colour_primaries = SCHRO_COLOUR_PRIMARY_HDTV;
- } else if (avccontext->color_primaries == AVCOL_PRI_BT470BG) {
+ } else if (avctx->color_primaries == AVCOL_PRI_BT470BG) {
 p_schro_params->format->colour_primaries = SCHRO_COLOUR_PRIMARY_SDTV_625;
- } else if (avccontext->color_primaries == AVCOL_PRI_SMPTE170M) {
+ } else if (avctx->color_primaries == AVCOL_PRI_SMPTE170M) {
 p_schro_params->format->colour_primaries = SCHRO_COLOUR_PRIMARY_SDTV_525;
 }
 
- if (avccontext->colorspace == AVCOL_SPC_BT709) {
+ if (avctx->colorspace == AVCOL_SPC_BT709) {
 p_schro_params->format->colour_matrix = SCHRO_COLOUR_MATRIX_HDTV;
- } else if (avccontext->colorspace == AVCOL_SPC_BT470BG) {
+ } else if (avctx->colorspace == AVCOL_SPC_BT470BG) {
 p_schro_params->format->colour_matrix = SCHRO_COLOUR_MATRIX_SDTV;
 }
 
- if (avccontext->color_trc == AVCOL_TRC_BT709) {
+ if (avctx->color_trc == AVCOL_TRC_BT709) {
 p_schro_params->format->transfer_function = SCHRO_TRANSFER_CHAR_TV_GAMMA;
 }
 
 if (ff_get_schro_frame_format(p_schro_params->format->chroma_format,
 &p_schro_params->frame_format) == -1) {
- av_log(avccontext, AV_LOG_ERROR,
+ av_log(avctx, AV_LOG_ERROR,
 "This codec currently supports only planar YUV 4:2:0, 4:2:2"
 " and 4:4:4 formats.\n");
 return -1;
 }
 
- p_schro_params->format->frame_rate_numerator = avccontext->time_base.den;
- p_schro_params->format->frame_rate_denominator = avccontext->time_base.num;
+ p_schro_params->format->frame_rate_numerator = avctx->time_base.den;
+ p_schro_params->format->frame_rate_denominator = avctx->time_base.num;
 
- p_schro_params->frame_size = avpicture_get_size(avccontext->pix_fmt,
- avccontext->width,
- avccontext->height);
+ p_schro_params->frame_size = avpicture_get_size(avctx->pix_fmt,
+ avctx->width,
+ avctx->height);
 
- avccontext->coded_frame = &p_schro_params->picture;
+ avctx->coded_frame = av_frame_alloc();
+ if (!avctx->coded_frame)
+ return AVERROR(ENOMEM);
 
- if (!avccontext->gop_size) {
+ if (!avctx->gop_size) {
 schro_encoder_setting_set_double(p_schro_params->encoder,
 "gop_structure",
 SCHRO_ENCODER_GOP_INTRA_ONLY);
 
- if (avccontext->coder_type == FF_CODER_TYPE_VLC)
+ if (avctx->coder_type == FF_CODER_TYPE_VLC)
 schro_encoder_setting_set_double(p_schro_params->encoder,
 "enable_noarith", 1);
 } else {
 schro_encoder_setting_set_double(p_schro_params->encoder,
- "au_distance", avccontext->gop_size);
- avccontext->has_b_frames = 1;
+ "au_distance", avctx->gop_size);
+ avctx->has_b_frames = 1;
 p_schro_params->dts = -1;
 }
 
 /* FIXME - Need to handle SCHRO_ENCODER_RATE_CONTROL_LOW_DELAY. */
- if (avccontext->flags & CODEC_FLAG_QSCALE) {
- if (!avccontext->global_quality) {
+ if (avctx->flags & CODEC_FLAG_QSCALE) {
+ if (!avctx->global_quality) {
 /* lossless coding */
 schro_encoder_setting_set_double(p_schro_params->encoder,
 "rate_control",
@@ -194,7 +190,7 @@
 "rate_control",
 SCHRO_ENCODER_RATE_CONTROL_CONSTANT_QUALITY);
 
- quality = avccontext->global_quality / FF_QP2LAMBDA;
+ quality = avctx->global_quality / FF_QP2LAMBDA;
 if (quality > 10)
 quality = 10;
 schro_encoder_setting_set_double(p_schro_params->encoder,
@@ -206,19 +202,17 @@
 SCHRO_ENCODER_RATE_CONTROL_CONSTANT_BITRATE);
 
 schro_encoder_setting_set_double(p_schro_params->encoder,
- "bitrate",
- avccontext->bit_rate);
-
+ "bitrate", avctx->bit_rate);
 }
 
- if (avccontext->flags & CODEC_FLAG_INTERLACED_ME)
+ if (avctx->flags & CODEC_FLAG_INTERLACED_ME)
 /* All material can be coded as interlaced or progressive
 irrespective of the type of source material. */
 schro_encoder_setting_set_double(p_schro_params->encoder,
 "interlaced_coding", 1);
 
 schro_encoder_setting_set_double(p_schro_params->encoder, "open_gop",
- !(avccontext->flags & CODEC_FLAG_CLOSED_GOP));
+ !(avctx->flags & CODEC_FLAG_CLOSED_GOP));
 
 /* FIXME: Signal range hardcoded to 8-bit data until both libschroedinger
 * and libdirac support other bit-depth data. */
@@ -230,7 +224,7 @@
 p_schro_params->format);
 
 /* Set the debug level. */
- schro_debug_set_level(avccontext->debug);
+ schro_debug_set_level(avctx->debug);
 
 schro_encoder_start(p_schro_params->encoder);
 
@@ -239,19 +233,19 @@
 return 0;
 }
 
-static SchroFrame *libschroedinger_frame_from_data(AVCodecContext *avccontext,
+static SchroFrame *libschroedinger_frame_from_data(AVCodecContext *avctx,
 const AVFrame *frame)
 {
- SchroEncoderParams *p_schro_params = avccontext->priv_data;
+ SchroEncoderParams *p_schro_params = avctx->priv_data;
 SchroFrame *in_frame;
 /* Input line size may differ from what the codec supports. Especially
 * when transcoding from one format to another. So use avpicture_layout
 * to copy the frame. */
- in_frame = ff_create_schro_frame(avccontext, p_schro_params->frame_format);
+ in_frame = ff_create_schro_frame(avctx, p_schro_params->frame_format);
 
 if (in_frame)
- avpicture_layout((const AVPicture *)frame, avccontext->pix_fmt,
- avccontext->width, avccontext->height,
+ avpicture_layout((const AVPicture *)frame, avctx->pix_fmt,
+ avctx->width, avctx->height,
 in_frame->components[0].data,
 p_schro_params->frame_size);
 
@@ -266,11 +260,11 @@
 av_free(enc_frame);
 }
 
-static int libschroedinger_encode_frame(AVCodecContext *avccontext, AVPacket *pkt,
+static int libschroedinger_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 const AVFrame *frame, int *got_packet)
 {
 int enc_size = 0;
- SchroEncoderParams *p_schro_params = avccontext->priv_data;
+ SchroEncoderParams *p_schro_params = avctx->priv_data;
 SchroEncoder *encoder = p_schro_params->encoder;
 struct FFSchroEncodedFrame *p_frame_output = NULL;
 int go = 1;
@@ -288,8 +282,7 @@
 }
 } else {
 /* Allocate frame data to schro input buffer. */
- SchroFrame *in_frame = libschroedinger_frame_from_data(avccontext,
- frame);
+ SchroFrame *in_frame = libschroedinger_frame_from_data(avctx, frame);
 /* Load next frame. */
 schro_encoder_push_frame(encoder, in_frame);
 }
@@ -299,22 +292,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);
- assert(enc_buf->length > 0);
- assert(enc_buf->length <= buf_size);
+ 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);
@@ -361,7 +359,7 @@
 break;
 
 default:
- av_log(avccontext, AV_LOG_ERROR, "Unknown Schro Encoder state\n");
+ av_log(avctx, AV_LOG_ERROR, "Unknown Schro Encoder state\n");
 return -1;
 }
 }
@@ -381,17 +379,17 @@
 if (last_frame_in_sequence && p_schro_params->enc_buf_size > 0)
 pkt_size += p_schro_params->enc_buf_size;
 if ((ret = ff_alloc_packet(pkt, pkt_size)) < 0) {
- av_log(avccontext, AV_LOG_ERROR, "Error getting output packet of size %d.\n", pkt_size);
+ av_log(avctx, AV_LOG_ERROR, "Error getting output packet of size %d.\n", pkt_size);
 goto error;
 }
 
 memcpy(pkt->data, p_frame_output->p_encbuf, p_frame_output->size);
- avccontext->coded_frame->key_frame = p_frame_output->key_frame;
+ avctx->coded_frame->key_frame = p_frame_output->key_frame;
 /* Use the frame number of the encoded frame as the pts. It is OK to
 * do so since Dirac is a constant frame rate codec. It expects input
 * to be of constant frame rate. */
 pkt->pts =
- avccontext->coded_frame->pts = p_frame_output->frame_num;
+ avctx->coded_frame->pts = p_frame_output->frame_num;
 pkt->dts = p_schro_params->dts++;
 enc_size = p_frame_output->size;
 
@@ -416,9 +414,9 @@
 }
 
 
-static int libschroedinger_encode_close(AVCodecContext *avccontext)
+static int libschroedinger_encode_close(AVCodecContext *avctx)
 {
- SchroEncoderParams *p_schro_params = avccontext->priv_data;
+ SchroEncoderParams *p_schro_params = avctx->priv_data;
 
 /* Close the encoder. */
 schro_encoder_free(p_schro_params->encoder);
@@ -435,12 +433,15 @@
 /* Free the video format structure. */
 av_freep(&p_schro_params->format);
 
+ av_frame_free(&avctx->coded_frame);
+
 return 0;
 }
 
 
 AVCodec ff_libschroedinger_encoder = {
 .name = "libschroedinger",
+ .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_DIRAC,
 .priv_data_size = sizeof(SchroEncoderParams),
@@ -451,5 +452,4 @@
 .pix_fmts = (const enum AVPixelFormat[]){
 AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE
 },
- .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"),
 };

libav-v9.6.tar.bz2/libavcodec/libspeexdec.c -> libav-v10.1.tar.bz2/libavcodec/libspeexdec.c Changed

@@ -29,7 +29,6 @@
 #include "internal.h"
 
 typedef struct {
- AVFrame frame;
 SpeexBits bits;
 SpeexStereoState stereo;
 void *dec_state;
@@ -102,9 +101,6 @@
 speex_decoder_ctl(s->dec_state, SPEEX_SET_HANDLER, &callback);
 }
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
@@ -114,23 +110,24 @@
 uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 LibSpeexContext *s = avctx->priv_data;
+ AVFrame *frame = data;
 int16_t *output;
 int ret, consumed = 0;
 
 /* get output buffer */
- s->frame.nb_samples = s->frame_size;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = s->frame_size;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- output = (int16_t *)s->frame.data[0];
+ output = (int16_t *)frame->data[0];
 
 /* if there is not enough data left for the smallest possible frame or the
 next 5 bits are a terminator code, reset the libspeex buffer using the
 current packet, otherwise ignore the current packet and keep decoding
 frames from the libspeex buffer. */
 if (speex_bits_remaining(&s->bits) < 5 ||
- speex_bits_peek_unsigned(&s->bits, 5) == 0x1F) {
+ speex_bits_peek_unsigned(&s->bits, 5) == 0xF) {
 /* check for flush packet */
 if (!buf || !buf_size) {
 *got_frame_ptr = 0;
@@ -150,8 +147,7 @@
 if (avctx->channels == 2)
 speex_decode_stereo_int(output, s->frame_size, &s->stereo);
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
 return consumed;
 }
@@ -174,6 +170,7 @@
 
 AVCodec ff_libspeex_decoder = {
 .name = "libspeex",
+ .long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_SPEEX,
 .priv_data_size = sizeof(LibSpeexContext),
@@ -182,5 +179,4 @@
 .decode = libspeex_decode_frame,
 .flush = libspeex_decode_flush,
 .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DELAY | CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"),
 };

libav-v9.6.tar.bz2/libavcodec/libspeexenc.c -> libav-v10.1.tar.bz2/libavcodec/libspeexenc.c Changed

@@ -251,16 +251,6 @@
         av_log(avctx, AV_LOG_ERROR, "memory allocation error\n");
         return AVERROR(ENOMEM);
     }
-#if FF_API_OLD_ENCODE_AUDIO
-    avctx->coded_frame = avcodec_alloc_frame();
-    if (!avctx->coded_frame) {
-        av_freep(&avctx->extradata);
-        speex_header_free(header_data);
-        speex_encoder_destroy(s->enc_state);
-        av_log(avctx, AV_LOG_ERROR, "memory allocation error\n");
-        return AVERROR(ENOMEM);
-    }
-#endif
 
     /* copy header packet to extradata */
     memcpy(avctx->extradata, header_data, header_size);
@@ -329,9 +319,6 @@
     speex_encoder_destroy(s->enc_state);
 
     ff_af_queue_close(&s->afq);
-#if FF_API_OLD_ENCODE_AUDIO
-    av_freep(&avctx->coded_frame);
-#endif
     av_freep(&avctx->extradata);
 
     return 0;
@@ -363,6 +350,7 @@
 
 AVCodec ff_libspeex_encoder = {
     .name           = "libspeex",
+    .long_name      = NULL_IF_CONFIG_SMALL("libspeex Speex"),
     .type           = AVMEDIA_TYPE_AUDIO,
     .id             = AV_CODEC_ID_SPEEX,
     .priv_data_size = sizeof(LibSpeexEncContext),
@@ -376,7 +364,6 @@
                                            AV_CH_LAYOUT_STEREO,
                                            0 },
     .supported_samplerates = (const int[]){ 8000, 16000, 32000, 0 },
-    .long_name      = NULL_IF_CONFIG_SMALL("libspeex Speex"),
     .priv_class     = &class,
     .defaults       = defaults,
 };

libav-v9.6.tar.bz2/libavcodec/libtheoraenc.c -> libav-v10.1.tar.bz2/libavcodec/libtheoraenc.c Changed

@@ -58,8 +58,8 @@
 const ogg_packet* packet)
 {
 const char* message = NULL;
- uint8_t* newdata = NULL;
 int newsize = avc_context->extradata_size + 2 + packet->bytes;
+ int err = AVERROR_INVALIDDATA;
 
 if (packet->bytes < 0) {
 message = "ogg_packet has negative size";
@@ -68,16 +68,16 @@
 } else if (newsize < avc_context->extradata_size) {
 message = "extradata_size would overflow";
 } 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";
+ }
 }
 if (message) {
 av_log(avc_context, AV_LOG_ERROR, "concatenate_packet failed: %s\n", message);
- return -1;
+ return err;
 }
 
- avc_context->extradata = newdata;
 avc_context->extradata_size = newsize;
 AV_WB16(avc_context->extradata + (*offset), packet->bytes);
 *offset += 2;
@@ -207,7 +207,7 @@
 * 0 <= p <=63
 * an int value
 */
- t_info.quality = av_clip(avc_context->global_quality / (float)FF_QP2LAMBDA, 0, 10) * 6.3;
+ t_info.quality = av_clipf(avc_context->global_quality / (float)FF_QP2LAMBDA, 0, 10) * 6.3;
 t_info.target_bitrate = 0;
 } else {
 t_info.target_bitrate = avc_context->bit_rate;
@@ -259,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;
 }
@@ -365,6 +365,7 @@
 /** AVCodec struct exposed to libavcodec */
 AVCodec ff_libtheora_encoder = {
 .name = "libtheora",
+ .long_name = NULL_IF_CONFIG_SMALL("libtheora Theora"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_THEORA,
 .priv_data_size = sizeof(TheoraContext),
@@ -375,5 +376,4 @@
 .pix_fmts = (const enum AVPixelFormat[]){
 AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE
 },
- .long_name = NULL_IF_CONFIG_SMALL("libtheora Theora"),
 };

libav-v9.6.tar.bz2/libavcodec/libvo-aacenc.c -> libav-v10.1.tar.bz2/libavcodec/libvo-aacenc.c Changed

@@ -47,9 +47,6 @@
     AACContext *s = avctx->priv_data;
 
     s->codec_api.Uninit(s->handle);
-#if FF_API_OLD_ENCODE_AUDIO
-    av_freep(&avctx->coded_frame);
-#endif
     av_freep(&avctx->extradata);
     ff_af_queue_close(&s->afq);
     av_freep(&s->end_buffer);
@@ -63,11 +60,6 @@
     AACENC_PARAM params = { 0 };
     int index, ret;
 
-#if FF_API_OLD_ENCODE_AUDIO
-    avctx->coded_frame = avcodec_alloc_frame();
-    if (!avctx->coded_frame)
-        return AVERROR(ENOMEM);
-#endif
     avctx->frame_size = FRAME_SIZE;
     avctx->delay      = ENC_DELAY;
     s->last_frame     = 2;
@@ -189,6 +181,7 @@
 
 AVCodec ff_libvo_aacenc_encoder = {
     .name           = "libvo_aacenc",
+    .long_name      = NULL_IF_CONFIG_SMALL("Android VisualOn AAC (Advanced Audio Coding)"),
     .type           = AVMEDIA_TYPE_AUDIO,
     .id             = AV_CODEC_ID_AAC,
     .priv_data_size = sizeof(AACContext),
@@ -198,5 +191,4 @@
     .capabilities   = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
                                                      AV_SAMPLE_FMT_NONE },
-    .long_name      = NULL_IF_CONFIG_SMALL("Android VisualOn AAC (Advanced Audio Coding)"),
 };

libav-v9.6.tar.bz2/libavcodec/libvo-amrwbenc.c -> libav-v10.1.tar.bz2/libavcodec/libvo-amrwbenc.c Changed

@@ -94,11 +94,6 @@
 
     avctx->frame_size  = 320;
     avctx->delay       =  80;
-#if FF_API_OLD_ENCODE_AUDIO
-    avctx->coded_frame = avcodec_alloc_frame();
-    if (!avctx->coded_frame)
-        return AVERROR(ENOMEM);
-#endif
 
     s->state     = E_IF_init();
 
@@ -110,7 +105,6 @@
     AMRWBContext *s = avctx->priv_data;
 
     E_IF_exit(s->state);
-    av_freep(&avctx->coded_frame);
     return 0;
 }
 
@@ -146,6 +140,8 @@
 
 AVCodec ff_libvo_amrwbenc_encoder = {
     .name           = "libvo_amrwbenc",
+    .long_name      = NULL_IF_CONFIG_SMALL("Android VisualOn AMR-WB "
+                                           "(Adaptive Multi-Rate Wide-Band)"),
     .type           = AVMEDIA_TYPE_AUDIO,
     .id             = AV_CODEC_ID_AMR_WB,
     .priv_data_size = sizeof(AMRWBContext),
@@ -154,7 +150,5 @@
     .close          = amr_wb_encode_close,
     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
                                                      AV_SAMPLE_FMT_NONE },
-    .long_name      = NULL_IF_CONFIG_SMALL("Android VisualOn AMR-WB "
-                                           "(Adaptive Multi-Rate Wide-Band)"),
     .priv_class     = &class,
 };

libav-v9.6.tar.bz2/libavcodec/libvorbis.c -> libav-v10.1.tar.bz2/libavcodec/libvorbis.c Changed

@@ -162,9 +162,6 @@
 
     av_fifo_free(s->pkt_fifo);
     ff_af_queue_close(&s->afq);
-#if FF_API_OLD_ENCODE_AUDIO
-    av_freep(&avctx->coded_frame);
-#endif
     av_freep(&avctx->extradata);
 
     return 0;
@@ -241,14 +238,6 @@
         goto error;
     }
 
-#if FF_API_OLD_ENCODE_AUDIO
-    avctx->coded_frame = avcodec_alloc_frame();
-    if (!avctx->coded_frame) {
-        ret = AVERROR(ENOMEM);
-        goto error;
-    }
-#endif
-
     return 0;
 error:
     oggvorbis_encode_close(avctx);
@@ -348,6 +337,7 @@
 
 AVCodec ff_libvorbis_encoder = {
     .name           = "libvorbis",
+    .long_name      = NULL_IF_CONFIG_SMALL("libvorbis Vorbis"),
     .type           = AVMEDIA_TYPE_AUDIO,
     .id             = AV_CODEC_ID_VORBIS,
     .priv_data_size = sizeof(OggVorbisContext),
@@ -357,7 +347,6 @@
     .capabilities   = CODEC_CAP_DELAY,
     .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
                                                       AV_SAMPLE_FMT_NONE },
-    .long_name      = NULL_IF_CONFIG_SMALL("libvorbis Vorbis"),
     .priv_class     = &class,
     .defaults       = defaults,
 };

libav-v10.1.tar.bz2/libavcodec/libvpx.c Added

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2013 Guillaume Martres <smarter@ubuntu.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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"
+
+int ff_vp9_check_experimental(AVCodecContext *avctx)
+{
+ if (avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL &&
+ (vpx_codec_version_major() < 1 ||
+ (vpx_codec_version_major() == 1 && vpx_codec_version_minor() < 3))) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Non-experimental support of VP9 requires libvpx >= 1.3.0\n");
+ return AVERROR_EXPERIMENTAL;
+ }
+ return 0;
+}

libav-v10.1.tar.bz2/libavcodec/libvpx.h Added

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2013 Guillaume Martres <smarter@ubuntu.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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"
+
+int ff_vp9_check_experimental(AVCodecContext *avctx);
+
+#endif /* AVCODEC_LIBVPX_H */

libav-v9.6.tar.bz2/libavcodec/libvpxdec.c -> libav-v10.1.tar.bz2/libavcodec/libvpxdec.c Changed

@@ -30,15 +30,17 @@
 #include "libavutil/common.h"
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
+#include "internal.h"
+#include "libvpx.h"
 
 typedef struct VP8DecoderContext {
 struct vpx_codec_ctx decoder;
 } VP8Context;
 
-static av_cold int vp8_init(AVCodecContext *avctx)
+static av_cold int vpx_init(AVCodecContext *avctx,
+ const struct vpx_codec_iface *iface)
 {
 VP8Context *ctx = avctx->priv_data;
- const struct vpx_codec_iface *iface = &vpx_codec_vp8_dx_algo;
 struct vpx_codec_dec_cfg deccfg = {
 /* token partitions+1 would be a decent choice */
 .threads = FFMIN(avctx->thread_count, 16)
@@ -65,6 +67,7 @@
 AVFrame *picture = data;
 const void *iter = NULL;
 struct vpx_image *img;
+ int ret;
 
 if (vpx_codec_decode(&ctx->decoder, avpkt->data, avpkt->size, NULL, 0) !=
 VPX_CODEC_OK) {
@@ -88,18 +91,14 @@
 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;
 }
- picture->data[0] = img->planes[0];
- picture->data[1] = img->planes[1];
- picture->data[2] = img->planes[2];
- picture->data[3] = NULL;
- picture->linesize[0] = img->stride[0];
- picture->linesize[1] = img->stride[1];
- picture->linesize[2] = img->stride[2];
- picture->linesize[3] = 0;
+ if ((ret = ff_get_buffer(avctx, picture, 0)) < 0)
+ return ret;
+ av_image_copy(picture->data, picture->linesize, img->planes,
+ img->stride, avctx->pix_fmt, img->d_w, img->d_h);
 *got_frame = 1;
 }
 return avpkt->size;
@@ -112,14 +111,43 @@
 return 0;
 }
 
-AVCodec ff_libvpx_decoder = {
+#if CONFIG_LIBVPX_VP8_DECODER
+static av_cold int vp8_init(AVCodecContext *avctx)
+{
+ return vpx_init(avctx, &vpx_codec_vp8_dx_algo);
+}
+
+AVCodec ff_libvpx_vp8_decoder = {
 .name = "libvpx",
+ .long_name = NULL_IF_CONFIG_SMALL("libvpx VP8"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_VP8,
 .priv_data_size = sizeof(VP8Context),
 .init = vp8_init,
 .close = vp8_free,
 .decode = vp8_decode,
+ .capabilities = CODEC_CAP_AUTO_THREADS | CODEC_CAP_DR1,
+};
+#endif /* CONFIG_LIBVPX_VP8_DECODER */
+
+#if CONFIG_LIBVPX_VP9_DECODER
+static av_cold int vp9_init(AVCodecContext *avctx)
+{
+ int ret;
+ if ((ret = ff_vp9_check_experimental(avctx)))
+ return ret;
+ return vpx_init(avctx, &vpx_codec_vp9_dx_algo);
+}
+
+AVCodec ff_libvpx_vp9_decoder = {
+ .name = "libvpx-vp9",
+ .long_name = NULL_IF_CONFIG_SMALL("libvpx VP9"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_VP9,
+ .priv_data_size = sizeof(VP8Context),
+ .init = vp9_init,
+ .close = vp8_free,
+ .decode = vp8_decode,
 .capabilities = CODEC_CAP_AUTO_THREADS,
- .long_name = NULL_IF_CONFIG_SMALL("libvpx VP8"),
 };
+#endif /* CONFIG_LIBVPX_VP9_DECODER */

libav-v9.6.tar.bz2/libavcodec/libvpxenc.c -> libav-v10.1.tar.bz2/libavcodec/libvpxenc.c Changed

@@ -30,6 +30,7 @@
 
 #include "avcodec.h"
 #include "internal.h"
+#include "libvpx.h"
 #include "libavutil/base64.h"
 #include "libavutil/common.h"
 #include "libavutil/mathematics.h"
@@ -214,10 +215,10 @@
 return 0;
 }
 
-static av_cold int vp8_init(AVCodecContext *avctx)
+static av_cold int vpx_init(AVCodecContext *avctx,
+ const struct vpx_codec_iface *iface)
 {
 VP8Context *ctx = avctx->priv_data;
- const struct vpx_codec_iface *iface = &vpx_codec_vp8_cx_algo;
 struct vpx_codec_enc_cfg enccfg;
 int res;
 
@@ -353,7 +354,7 @@
 vpx_img_wrap(&ctx->rawimg, 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);
@@ -467,11 +468,13 @@
 break;
 case VPX_CODEC_STATS_PKT: {
 struct vpx_fixed_buf *stats = &ctx->twopass_stats;
- stats->buf = av_realloc(stats->buf,
- 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);
@@ -565,13 +568,6 @@
 { NULL }
 };
 
-static const AVClass class = {
- .class_name = "libvpx encoder",
- .item_name = av_default_item_name,
- .option = options,
- .version = LIBAVUTIL_VERSION_INT,
-};
-
 static const AVCodecDefault defaults[] = {
 { "qmin", "-1" },
 { "qmax", "-1" },
@@ -580,8 +576,22 @@
 { NULL },
 };
 
-AVCodec ff_libvpx_encoder = {
+#if CONFIG_LIBVPX_VP8_ENCODER
+static av_cold int vp8_init(AVCodecContext *avctx)
+{
+ return vpx_init(avctx, &vpx_codec_vp8_cx_algo);
+}
+
+static const AVClass class_vp8 = {
+ .class_name = "libvpx encoder",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+AVCodec ff_libvpx_vp8_encoder = {
 .name = "libvpx",
+ .long_name = NULL_IF_CONFIG_SMALL("libvpx VP8"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_VP8,
 .priv_data_size = sizeof(VP8Context),
@@ -590,7 +600,39 @@
 .close = vp8_free,
 .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
 .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("libvpx VP8"),
- .priv_class = &class,
+ .priv_class = &class_vp8,
+ .defaults = defaults,
+};
+#endif /* CONFIG_LIBVPX_VP8_ENCODER */
+
+#if CONFIG_LIBVPX_VP9_ENCODER
+static av_cold int vp9_init(AVCodecContext *avctx)
+{
+ int ret;
+ if ((ret = ff_vp9_check_experimental(avctx)))
+ return ret;
+ return vpx_init(avctx, &vpx_codec_vp9_cx_algo);
+}
+
+static const AVClass class_vp9 = {
+ .class_name = "libvpx encoder",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+AVCodec ff_libvpx_vp9_encoder = {
+ .name = "libvpx-vp9",
+ .long_name = NULL_IF_CONFIG_SMALL("libvpx VP9"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_VP9,
+ .priv_data_size = sizeof(VP8Context),
+ .init = vp9_init,
+ .encode2 = vp8_encode,
+ .close = vp8_free,
+ .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,
 };
+#endif /* CONFIG_LIBVPX_VP9_ENCODER */

libav-v10.1.tar.bz2/libavcodec/libwavpackenc.c Added

@@ -0,0 +1,194 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <wavpack/wavpack.h>
+#include <string.h>
+
+#include "libavutil/attributes.h"
+#include "libavutil/opt.h"
+#include "libavutil/samplefmt.h"
+
+#include "audio_frame_queue.h"
+#include "avcodec.h"
+#include "internal.h"
+
+#define WV_DEFAULT_BLOCK_SIZE 32768
+
+typedef struct LibWavpackContext {
+ const AVClass *class;
+ WavpackContext *wv;
+ AudioFrameQueue afq;
+
+ AVPacket *pkt;
+ int user_size;
+
+ int got_output;
+} LibWavpackContext;
+
+static int wavpack_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
+ const AVFrame *frame, int *got_output)
+{
+ LibWavpackContext *s = avctx->priv_data;
+ int ret;
+
+ s->got_output = 0;
+ s->pkt = pkt;
+ s->user_size = pkt->size;
+
+ if (frame) {
+ ret = ff_af_queue_add(&s->afq, frame);
+ if (ret < 0)
+ return ret;
+
+ ret = WavpackPackSamples(s->wv, (int32_t*)frame->data[0], frame->nb_samples);
+ if (!ret) {
+ av_log(avctx, AV_LOG_ERROR, "Error encoding a frame: %s\n",
+ WavpackGetErrorMessage(s->wv));
+ return AVERROR_UNKNOWN;
+ }
+ }
+
+ if (!s->got_output &&
+ (!frame || frame->nb_samples < avctx->frame_size)) {
+ ret = WavpackFlushSamples(s->wv);
+ if (!ret) {
+ av_log(avctx, AV_LOG_ERROR, "Error flushing the encoder: %s\n",
+ WavpackGetErrorMessage(s->wv));
+ return AVERROR_UNKNOWN;
+ }
+ }
+
+ if (s->got_output) {
+ ff_af_queue_remove(&s->afq, avctx->frame_size, &pkt->pts, &pkt->duration);
+ *got_output = 1;
+ }
+
+ return 0;
+}
+
+static int encode_callback(void *id, void *data, int32_t count)
+{
+ AVCodecContext *avctx = id;
+ LibWavpackContext *s = avctx->priv_data;
+ int ret, offset = s->pkt->size;
+
+ if (s->user_size) {
+ if (s->user_size - count < s->pkt->size) {
+ av_log(avctx, AV_LOG_ERROR, "Provided packet too small.\n");
+ return 0;
+ }
+ s->pkt->size += count;
+ } else {
+ ret = av_grow_packet(s->pkt, count);
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Error allocating output packet.\n");
+ return 0;
+ }
+ }
+
+ memcpy(s->pkt->data + offset, data, count);
+
+ s->got_output = 1;
+
+ return 1;
+}
+
+static av_cold int wavpack_encode_init(AVCodecContext *avctx)
+{
+ LibWavpackContext *s = avctx->priv_data;
+ WavpackConfig config = { 0 };
+ int ret;
+
+ s->wv = WavpackOpenFileOutput(encode_callback, avctx, NULL);
+ if (!s->wv) {
+ av_log(avctx, AV_LOG_ERROR, "Error allocating the encoder.\n");
+ return AVERROR(ENOMEM);
+ }
+
+ if (!avctx->frame_size)
+ avctx->frame_size = WV_DEFAULT_BLOCK_SIZE;
+
+ config.bytes_per_sample = 4;
+ config.bits_per_sample = 32;
+ config.block_samples = avctx->frame_size;
+ config.channel_mask = avctx->channel_layout;
+ config.num_channels = avctx->channels;
+ config.sample_rate = avctx->sample_rate;
+
+ if (avctx->compression_level != FF_COMPRESSION_DEFAULT) {
+ if (avctx->compression_level >= 3) {
+ config.flags |= CONFIG_VERY_HIGH_FLAG;
+
+ if (avctx->compression_level >= 8)
+ config.xmode = 6;
+ else if (avctx->compression_level >= 7)
+ config.xmode = 5;
+ else if (avctx->compression_level >= 6)
+ config.xmode = 4;
+ else if (avctx->compression_level >= 5)
+ config.xmode = 3;
+ else if (avctx->compression_level >= 4)
+ config.xmode = 2;
+ } else if (avctx->compression_level >= 2)
+ config.flags |= CONFIG_HIGH_FLAG;
+ else if (avctx->compression_level < 1)
+ config.flags |= CONFIG_FAST_FLAG;
+ }
+
+ ret = WavpackSetConfiguration(s->wv, &config, -1);
+ if (!ret)
+ goto fail;
+
+ ret = WavpackPackInit(s->wv);
+ if (!ret)
+ goto fail;
+
+ ff_af_queue_init(avctx, &s->afq);
+
+ return 0;
+
+fail:
+ av_log(avctx, AV_LOG_ERROR, "Error configuring the encoder: %s.\n",
+ WavpackGetErrorMessage(s->wv));
+ WavpackCloseFile(s->wv);
+ return AVERROR_UNKNOWN;
+}
+
+static av_cold int wavpack_encode_close(AVCodecContext *avctx)
+{
+ LibWavpackContext *s = avctx->priv_data;
+
+ WavpackCloseFile(s->wv);
+
+ ff_af_queue_close(&s->afq);
+
+ return 0;
+}
+
+AVCodec ff_libwavpack_encoder = {
+ .name = "libwavpack",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = AV_CODEC_ID_WAVPACK,
+ .priv_data_size = sizeof(LibWavpackContext),
+ .init = wavpack_encode_init,
+ .encode2 = wavpack_encode_frame,
+ .close = wavpack_encode_close,
+ .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SMALL_LAST_FRAME,
+ .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S32,
+ AV_SAMPLE_FMT_NONE },
+};

libav-v10.1.tar.bz2/libavcodec/libwebpenc.c Added

@@ -0,0 +1,287 @@
+/*
+ * WebP encoding support via libwebp
+ * Copyright (c) 2013 Justin Ruggles <justin.ruggles@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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_image_copy(alt_frame->data, alt_frame->linesize,
+ frame->data, frame->linesize,
+ avctx->pix_fmt, frame->width, frame->height);
+ 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,
+};

libav-v9.6.tar.bz2/libavcodec/libx264.c -> libav-v10.1.tar.bz2/libavcodec/libx264.c Changed

@@ -23,8 +23,14 @@
 #include "libavutil/opt.h"
 #include "libavutil/mem.h"
 #include "libavutil/pixdesc.h"
+#include "libavutil/stereo3d.h"
 #include "avcodec.h"
 #include "internal.h"
+
+#if defined(_MSC_VER)
+#define X264_API_IMPORTS 1
+#endif
+
 #include <x264.h>
 #include <float.h>
 #include <math.h>
@@ -39,7 +45,6 @@
 x264_picture_t pic;
 uint8_t *sei;
 int sei_size;
- AVFrame out_pic;
 char *preset;
 char *tune;
 char *profile;
@@ -56,6 +61,7 @@
 int weightb;
 int ssim;
 int intra_refresh;
+ int bluray_compat;
 int b_bias;
 int b_pyramid;
 int mixed_refs;
@@ -70,6 +76,7 @@
 int slice_max_size;
 char *stats;
 int nal_hrd;
+ char *x264_params;
 } X264Context;
 
 static void X264_log(void *p, int level, const char *fmt, va_list args)
@@ -128,6 +135,7 @@
 x264_nal_t *nal;
 int nnal, i, ret;
 x264_picture_t pic_out;
+ AVFrameSideData *side_data;
 
 x264_picture_init( &x4->pic );
 x4->pic.img.i_csp = x4->params.i_csp;
@@ -157,8 +165,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;
@@ -174,20 +216,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;
@@ -203,6 +245,8 @@
 if (x4->enc)
 x264_encoder_close(x4->enc);
 
+ av_frame_free(&avctx->coded_frame);
+
 return 0;
 }
 
@@ -218,6 +262,9 @@
 case AV_PIX_FMT_YUV444P:
 case AV_PIX_FMT_YUV444P9:
 case AV_PIX_FMT_YUV444P10: return X264_CSP_I444;
+ case AV_PIX_FMT_NV12: return X264_CSP_NV12;
+ case AV_PIX_FMT_NV16:
+ case AV_PIX_FMT_NV20: return X264_CSP_NV16;
 };
 return 0;
 }
@@ -278,7 +325,8 @@
 (float)avctx->rc_initial_buffer_occupancy / avctx->rc_buffer_size;
 }
 
- x4->params.rc.f_ip_factor = 1 / fabs(avctx->i_quant_factor);
+ if (avctx->i_quant_factor > 0)
+ x4->params.rc.f_ip_factor = 1 / fabs(avctx->i_quant_factor);
 x4->params.rc.f_pb_factor = avctx->b_quant_factor;
 x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
 
@@ -351,6 +399,10 @@
 x4->params.analyse.b_ssim = x4->ssim;
 if (x4->intra_refresh >= 0)
 x4->params.b_intra_refresh = x4->intra_refresh;
+ if (x4->bluray_compat >= 0) {
+ x4->params.b_bluray_compat = x4->bluray_compat;
+ x4->params.b_vfr_input = 0;
+ }
 if (x4->b_bias != INT_MIN)
 x4->params.i_bframe_bias = x4->b_bias;
 if (x4->b_pyramid >= 0)
@@ -407,6 +459,22 @@
 if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER)
 x4->params.b_repeat_headers = 0;
 
+ if (x4->x264_params) {
+ AVDictionary *dict = NULL;
+ AVDictionaryEntry *en = NULL;
+
+ if (!av_dict_parse_string(&dict, x4->x264_params, "=", ":", 0)) {
+ while ((en = av_dict_get(dict, "", en, AV_DICT_IGNORE_SUFFIX))) {
+ if (x264_param_parse(&x4->params, en->key, en->value) < 0)
+ av_log(avctx, AV_LOG_WARNING,
+ "Error parsing option '%s = %s'.\n",
+ en->key, en->value);
+ }
+
+ av_dict_free(&dict);
+ }
+ }
+
 // update AVCodecContext with x264 parameters
 avctx->has_b_frames = x4->params.i_bframe ?
 x4->params.i_bframe_pyramid ? 2 : 1 : 0;
@@ -419,7 +487,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;
@@ -452,6 +522,8 @@
 AV_PIX_FMT_YUVJ420P,
 AV_PIX_FMT_YUV422P,
 AV_PIX_FMT_YUV444P,
+ AV_PIX_FMT_NV12,
+ AV_PIX_FMT_NV16,
 AV_PIX_FMT_NONE
 };
 static const enum AVPixelFormat pix_fmts_9bit[] = {
@@ -463,6 +535,7 @@
 AV_PIX_FMT_YUV420P10,
 AV_PIX_FMT_YUV422P10,
 AV_PIX_FMT_YUV444P10,
+ AV_PIX_FMT_NV20,
 AV_PIX_FMT_NONE
 };
 
@@ -501,6 +574,7 @@
 { "smart", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_WEIGHTP_SMART}, INT_MIN, INT_MAX, VE, "weightp" },
 { "ssim", "Calculate and print SSIM stats.", OFFSET(ssim), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE },
 { "intra-refresh", "Use Periodic Intra Refresh instead of IDR frames.",OFFSET(intra_refresh),AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE },
+ { "bluray-compat", "Bluray compatibility workarounds.", OFFSET(bluray_compat) ,AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE },
 { "b-bias", "Influences how often B-frames are used", OFFSET(b_bias), AV_OPT_TYPE_INT, { .i64 = INT_MIN}, INT_MIN, INT_MAX, VE },
 { "b-pyramid", "Keep some B-frames as references.", OFFSET(b_pyramid), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE, "b_pyramid" },
 { "none", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_B_PYRAMID_NONE}, INT_MIN, INT_MAX, VE, "b_pyramid" },
@@ -527,6 +601,7 @@
 { "none", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_NAL_HRD_NONE}, INT_MIN, INT_MAX, VE, "nal-hrd" },
 { "vbr", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_NAL_HRD_VBR}, INT_MIN, INT_MAX, VE, "nal-hrd" },
 { "cbr", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_NAL_HRD_CBR}, INT_MIN, INT_MAX, VE, "nal-hrd" },
+ { "x264-params", "Override the x264 configuration using a :-separated list of key=value parameters", OFFSET(x264_params), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
 { NULL },
 };
 
@@ -541,6 +616,7 @@
 { "b", "0" },
 { "bf", "-1" },
 { "g", "-1" },
+ { "i_qfactor", "-1" },
 { "qmin", "-1" },
 { "qmax", "-1" },
 { "qdiff", "-1" },
@@ -566,6 +642,7 @@
 
 AVCodec ff_libx264_encoder = {
 .name = "libx264",
+ .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_H264,
 .priv_data_size = sizeof(X264Context),
@@ -573,7 +650,6 @@
 .encode2 = X264_frame,
 .close = X264_close,
 .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
- .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
 .priv_class = &class,
 .defaults = x264_defaults,
 .init_static_data = X264_init_static,

libav-v9.6.tar.bz2/libavcodec/libxavs.c -> libav-v10.1.tar.bz2/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;
@@ -113,10 +112,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;
@@ -132,14 +131,14 @@
 
 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;
@@ -153,46 +152,46 @@
 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;
@@ -210,6 +209,8 @@
 if (x4->enc)
 xavs_encoder_close(x4->enc);
 
+ av_frame_free(&avctx->coded_frame);
+
 return 0;
 }
 
@@ -357,7 +358,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) {
@@ -420,6 +424,7 @@
 
 AVCodec ff_libxavs_encoder = {
 .name = "libxavs",
+ .long_name = NULL_IF_CONFIG_SMALL("libxavs Chinese AVS (Audio Video Standard)"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_CAVS,
 .priv_data_size = sizeof(XavsContext),
@@ -428,7 +433,6 @@
 .close = XAVS_close,
 .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
 .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("libxavs Chinese AVS (Audio Video Standard)"),
 .priv_class = &class,
 .defaults = xavs_defaults,
 };

libav-v9.6.tar.bz2/libavcodec/libxvid.c -> libav-v10.1.tar.bz2/libavcodec/libxvid.c Changed

@@ -54,7 +54,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 */
@@ -606,7 +605,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;
 }
@@ -617,7 +618,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;
 
@@ -633,7 +634,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;
@@ -750,6 +750,7 @@
 
 AVCodec ff_libxvid_encoder = {
 .name = "libxvid",
+ .long_name = NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MPEG4,
 .priv_data_size = sizeof(struct xvid_context),
@@ -757,5 +758,4 @@
 .encode2 = xvid_encode_frame,
 .close = xvid_encode_close,
 .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"),
 };

libav-v9.6.tar.bz2/libavcodec/libxvid_rc.c -> libav-v10.1.tar.bz2/libavcodec/libxvid_rc.c Changed

@@ -27,9 +27,10 @@
 #include <fcntl.h>
 #endif
 
+#include "libavutil/attributes.h"
+#include "libavutil/internal.h"
 #include "avcodec.h"
 #include "libxvid.h"
-//#include "dsputil.h"
 #include "mpegvideo.h"
 
 #undef NDEBUG
@@ -54,7 +55,7 @@
 return -1;
 }
 #if !HAVE_MKSTEMP
- fd = open(*filename, O_RDWR | O_BINARY | O_CREAT, 0444);
+ fd = avpriv_open(*filename, O_RDWR | O_BINARY | O_CREAT, 0444);
 #else
 snprintf(*filename, len, "/tmp/%sXXXXXX", prefix);
 fd = mkstemp(*filename);
@@ -71,7 +72,8 @@
 return fd; /* success */
 }
 
-int ff_xvid_rate_control_init(MpegEncContext *s){
+av_cold int ff_xvid_rate_control_init(MpegEncContext *s)
+{
 char *tmp_name;
 int fd, i;
 xvid_plg_create_t xvid_plg_create = { 0 };
@@ -169,7 +171,8 @@
 return xvid_plg_data.quant * FF_QP2LAMBDA;
 }
 
-void ff_xvid_rate_control_uninit(MpegEncContext *s){
+av_cold void ff_xvid_rate_control_uninit(MpegEncContext *s)
+{
 xvid_plg_destroy_t xvid_plg_destroy;
 
 xvid_plugin_2pass2(s->rc_context.non_lavc_opaque, XVID_PLG_DESTROY, &xvid_plg_destroy, NULL);

libav-v9.6.tar.bz2/libavcodec/ljpegenc.c -> libav-v10.1.tar.bz2/libavcodec/ljpegenc.c Changed

@@ -30,6 +30,10 @@
 * lossless JPEG encoder.
 */
 
+#include "libavutil/frame.h"
+#include "libavutil/mem.h"
+#include "libavutil/pixdesc.h"
+
 #include "avcodec.h"
 #include "dsputil.h"
 #include "internal.h"
@@ -37,179 +41,294 @@
 #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];
- }
- if ((ret = ff_alloc_packet(pkt, max_pkt_size)) < 0) {
- av_log(avctx, AV_LOG_ERROR, "Error getting output packet of size %d.\n", max_pkt_size);
- return ret;
- }
-
- init_put_bits(&s->pb, pkt->data, pkt->size);
+ int vsample[3];
+ int hsample[3];
 
- *p = *pict;
- p->pict_type= AV_PICTURE_TYPE_I;
- p->key_frame= 1;
+ 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];
 
- ff_mjpeg_encode_picture_header(s);
+ uint16_t (*scratch)[4];
+} LJpegEncContext;
 
- s->header_bits= put_bits_count(&s->pb);
+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 * 3) {
+ av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n");
+ return -1;
+ }
 
- if(avctx->pix_fmt == AV_PIX_FMT_BGRA){
- 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++)
+ top[i]= left[i]= topleft[i]= buffer[0][i];
 
- for(i=0; i<3; i++){
- buffer[0][i]= 1 << (9 - 1);
- }
+ for (x = 0; x < width; x++) {
+ 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;
 
- for(y = 0; y < height; y++) {
- const int modified_predictor= y ? predictor : 1;
- uint8_t *ptr = p->data[0] + (linesize * y);
+ for (i = 0; i < 3; i++) {
+ int pred, diff;
 
- 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;
- }
+ PREDICT(pred, topleft[i], top[i], left[i], modified_predictor);
 
- for(i=0; i<3; i++){
- top[i]= left[i]= topleft[i]= buffer[0][i];
- }
- for(x = 0; x < width; x++) {
- 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;
+ topleft[i] = top[i];
+ top[i] = buffer[x+1][i];
 
- for(i=0;i<3;i++) {
- int pred, diff;
+ left[i] = buffer[x][i];
 
- PREDICT(pred, topleft[i], top[i], left[i], modified_predictor);
+ diff = ((left[i] - pred + 0x100) & 0x1FF) - 0x100;
 
- topleft[i]= top[i];
- top[i]= buffer[x+1][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);
+ }
+ }
+ }
 
- 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_BGR24)
+ max_pkt_size += width * height * 3 * 3;
+ else {
+ max_pkt_size += mb_width * mb_height * 3 * 4
+ * s->hsample[0] * s->vsample[0];
+ }
+ if ((ret = ff_alloc_packet(pkt, max_pkt_size)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Error getting output packet of size %d.\n", max_pkt_size);
+ return ret;
+ }
+
+ init_put_bits(&pb, pkt->data, pkt->size);
+
+ ff_mjpeg_encode_picture_header(avctx, &pb, &s->scantable,
+ s->matrix);
+
+ header_bits = put_bits_count(&pb);
+
+ if (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();
 
- ff_mjpeg_encode_picture_trailer(s);
- s->picture_number++;
+ ff_mjpeg_encode_picture_trailer(&pb, header_bits);
 
- flush_put_bits(&s->pb);
- pkt->size = put_bits_ptr(&s->pb) - s->pb.buf;
+ 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);
 
-AVCodec ff_ljpeg_encoder = { //FIXME avoid MPV_* lossless JPEG should not need them
+ return 0;
+}
+
+static av_cold int ljpeg_encode_init(AVCodecContext *avctx)
+{
+ LJpegEncContext *s = avctx->priv_data;
+ int chroma_v_shift, chroma_h_shift;
+
+ 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);
+
+ av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &chroma_h_shift,
+ &chroma_v_shift);
+
+ if (avctx->pix_fmt == AV_PIX_FMT_BGR24) {
+ s->vsample[0] = s->hsample[0] =
+ s->vsample[1] = s->hsample[1] =
+ s->vsample[2] = s->hsample[2] = 1;
+ } else {
+ s->vsample[0] = 2;
+ s->vsample[1] = 2 >> chroma_v_shift;
+ s->vsample[2] = 2 >> chroma_v_shift;
+ s->hsample[0] = 2;
+ s->hsample[1] = 2 >> chroma_h_shift;
+ s->hsample[2] = 2 >> chroma_h_shift;
+ }
+
+ 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 = {
 .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,
- .long_name = NULL_IF_CONFIG_SMALL("Lossless JPEG"),
+ .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_YUVJ420P,
+ AV_PIX_FMT_YUVJ422P,
+ AV_PIX_FMT_YUVJ444P,
+ AV_PIX_FMT_BGR24,
+ AV_PIX_FMT_YUV420P,
+ AV_PIX_FMT_YUV422P,
+ AV_PIX_FMT_YUVJ444P,
+ AV_PIX_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/loco.c -> libav-v10.1.tar.bz2/libavcodec/loco.c Changed

@@ -30,29 +30,38 @@
 #include "internal.h"
 #include "mathops.h"
 
-enum LOCO_MODE {LOCO_UNKN=0, LOCO_CYUY2=-1, LOCO_CRGB=-2, LOCO_CRGBA=-3, LOCO_CYV12=-4,
- LOCO_YUY2=1, LOCO_UYVY=2, LOCO_RGB=3, LOCO_RGBA=4, LOCO_YV12=5};
+enum LOCO_MODE {
+ LOCO_UNKN = 0,
+ LOCO_CYUY2 = -1,
+ LOCO_CRGB = -2,
+ LOCO_CRGBA = -3,
+ LOCO_CYV12 = -4,
+ LOCO_YUY2 = 1,
+ LOCO_UYVY = 2,
+ LOCO_RGB = 3,
+ LOCO_RGBA = 4,
+ LOCO_YV12 = 5,
+};
 
-typedef struct LOCOContext{
+typedef struct LOCOContext {
 AVCodecContext *avctx;
- AVFrame pic;
 int lossy;
 int mode;
 } LOCOContext;
 
-typedef struct RICEContext{
+typedef struct RICEContext {
 GetBitContext gb;
 int save, run, run2; /* internal rice decoder state */
 int sum, count; /* sum and count for getting rice parameter */
 int lossy;
-}RICEContext;
+} RICEContext;
 
 static int loco_get_rice_param(RICEContext *r)
 {
 int cnt = 0;
 int val = r->count;
 
- while(r->sum > val && cnt < 9) {
+ while (r->sum > val && cnt < 9) {
 val <<= 1;
 cnt++;
 }
@@ -65,8 +74,8 @@
 r->sum += val;
 r->count++;
 
- if(r->count == 16) {
- r->sum >>= 1;
+ if (r->count == 16) {
+ r->sum >>= 1;
 r->count >>= 1;
 }
 }
@@ -80,19 +89,18 @@
 return 0;
 }
 v = get_ur_golomb_jpegls(&r->gb, loco_get_rice_param(r), INT_MAX, 0);
- loco_update_rice_param(r, (v+1)>>1);
+ loco_update_rice_param(r, (v + 1) >> 1);
 if (!v) {
 if (r->save >= 0) {
 r->run = get_ur_golomb_jpegls(&r->gb, 2, INT_MAX, 0);
- if(r->run > 1)
+ if (r->run > 1)
 r->save += r->run + 1;
 else
 r->save -= 3;
- }
- else
+ } else
 r->run2++;
 } else {
- v = ((v>>1) + r->lossy) ^ -(v&1);
+ v = ((v >> 1) + r->lossy) ^ -(v & 1);
 if (r->run2 > 0) {
 if (r->run2 > 2)
 r->save += r->run2;
@@ -125,16 +133,16 @@
 int i, j;
 
 init_get_bits(&rc.gb, buf, buf_size*8);
- rc.save = 0;
- rc.run = 0;
- rc.run2 = 0;
+ rc.save = 0;
+ rc.run = 0;
+ rc.run2 = 0;
 rc.lossy = l->lossy;
 
- rc.sum = 8;
+ rc.sum = 8;
 rc.count = 1;
 
 /* restore top left pixel */
- val = loco_get_rice(&rc);
+ val = loco_get_rice(&rc);
 data[0] = 128 + val;
 /* restore top line */
 for (i = 1; i < width; i++) {
@@ -161,19 +169,15 @@
 void *data, int *got_frame,
 AVPacket *avpkt)
 {
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
 LOCOContext * const l = avctx->priv_data;
- AVFrame * const p = &l->pic;
- int decoded;
-
- if(p->data[0])
- avctx->release_buffer(avctx, p);
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ AVFrame * const p = data;
+ int decoded, ret;
 
- p->reference = 0;
- if(ff_get_buffer(avctx, p) < 0){
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 p->key_frame = 1;
 
@@ -251,7 +255,6 @@
 }
 
 *got_frame = 1;
- *(AVFrame*)data = l->pic;
 
 return buf_size;
 buf_too_small:
@@ -259,7 +262,8 @@
 return AVERROR(EINVAL);
 }
 
-static av_cold int decode_init(AVCodecContext *avctx){
+static av_cold int decode_init(AVCodecContext *avctx)
+{
 LOCOContext * const l = avctx->priv_data;
 int version;
 
@@ -267,10 +271,10 @@
 if (avctx->extradata_size < 12) {
 av_log(avctx, AV_LOG_ERROR, "Extradata size must be >= 12 instead of %i\n",
 avctx->extradata_size);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 version = AV_RL32(avctx->extradata);
- switch(version) {
+ switch (version) {
 case 1:
 l->lossy = 0;
 break;
@@ -279,51 +283,45 @@
 break;
 default:
 l->lossy = AV_RL32(avctx->extradata + 8);
- av_log_ask_for_sample(avctx, "This is LOCO codec version %i.\n", version);
+ avpriv_request_sample(avctx, "LOCO codec version %i", version);
 }
 
 l->mode = AV_RL32(avctx->extradata + 4);
- switch(l->mode) {
- case LOCO_CYUY2: case LOCO_YUY2: case LOCO_UYVY:
+ switch (l->mode) {
+ case LOCO_CYUY2:
+ case LOCO_YUY2:
+ case LOCO_UYVY:
 avctx->pix_fmt = AV_PIX_FMT_YUV422P;
 break;
- case LOCO_CRGB: case LOCO_RGB:
+ case LOCO_CRGB:
+ case LOCO_RGB:
 avctx->pix_fmt = AV_PIX_FMT_BGR24;
 break;
- case LOCO_CYV12: case LOCO_YV12:
+ case LOCO_CYV12:
+ case LOCO_YV12:
 avctx->pix_fmt = AV_PIX_FMT_YUV420P;
 break;
- case LOCO_CRGBA: case LOCO_RGBA:
+ case LOCO_CRGBA:
+ case LOCO_RGBA:
 avctx->pix_fmt = AV_PIX_FMT_RGB32;
 break;
 default:
 av_log(avctx, AV_LOG_INFO, "Unknown colorspace, index = %i\n", l->mode);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- if(avctx->debug & FF_DEBUG_PICT_INFO)
+ if (avctx->debug & FF_DEBUG_PICT_INFO)
 av_log(avctx, AV_LOG_INFO, "lossy:%i, version:%i, mode: %i\n", l->lossy, version, l->mode);
 
 return 0;
 }
 
-static av_cold int decode_end(AVCodecContext *avctx){
- LOCOContext * const l = avctx->priv_data;
- AVFrame *pic = &l->pic;
-
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
-
- return 0;
-}
-
 AVCodec ff_loco_decoder = {
 .name = "loco",
+ .long_name = NULL_IF_CONFIG_SMALL("LOCO"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_LOCO,
 .priv_data_size = sizeof(LOCOContext),
 .init = decode_init,
- .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("LOCO"),
 };

libav-v9.6.tar.bz2/libavcodec/lpc.c -> libav-v10.1.tar.bz2/libavcodec/lpc.c Changed

@@ -176,7 +176,7 @@
 double autoc[MAX_LPC_ORDER+1];
 double ref[MAX_LPC_ORDER];
 double lpc[MAX_LPC_ORDER][MAX_LPC_ORDER];
- int i, j, pass;
+ int i, j, pass = 0;
 int opt_order;
 
 assert(max_order >= MIN_LPC_ORDER && max_order <= MAX_LPC_ORDER &&
@@ -189,7 +189,7 @@
 ff_lpc_init(s, blocksize, max_order, lpc_type);
 }
 
- if (lpc_type == FF_LPC_TYPE_LEVINSON) {
+ if (lpc_type == FF_LPC_TYPE_LEVINSON || (lpc_type == FF_LPC_TYPE_CHOLESKY && lpc_passes > 1)) {
 s->lpc_apply_welch_window(samples, blocksize, s->windowed_samples);
 
 s->lpc_compute_autocorr(s->windowed_samples, blocksize, max_order, autoc);
@@ -198,12 +198,21 @@
 
 for(i=0; i<max_order; i++)
 ref[i] = fabs(lpc[i][i]);
- } else if (lpc_type == FF_LPC_TYPE_CHOLESKY) {
+
+ pass++;
+ }
+
+ if (lpc_type == FF_LPC_TYPE_CHOLESKY) {
 LLSModel m[2];
- double var[MAX_LPC_ORDER+1], av_uninit(weight);
+ 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));
 
- for(pass=0; pass<lpc_passes; pass++){
- av_init_lls(&m[pass&1], max_order);
+ for(j=0; j<max_order; j++)
+ 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);
 
 weight=0;
 for(i=max_order; i<blocksize; i++){
@@ -212,7 +221,7 @@
 
 if(pass){
 double eval, inv, rinv;
- eval= av_evaluate_lls(&m[(pass-1)&1], var+1, max_order-1);
+ eval= m[pass&1].evaluate_lls(&m[(pass-1)&1], var+1, max_order-1);
 eval= (512>>pass) + fabs(eval - var[0]);
 inv = 1/eval;
 rinv = sqrt(inv);
@@ -222,9 +231,9 @@
 }else
 weight++;
 
- av_update_lls(&m[pass&1], var, 1.0);
+ m[pass&1].update_lls(&m[pass&1], var);
 }
- av_solve_lls(&m[pass&1], 0.001, 0);
+ avpriv_solve_lls(&m[pass&1], 0.001, 0);
 }
 
 for(i=0; i<max_order; i++){
@@ -257,15 +266,11 @@
 s->max_order = max_order;
 s->lpc_type = lpc_type;
 
- if (lpc_type == FF_LPC_TYPE_LEVINSON) {
- s->windowed_buffer = av_mallocz((blocksize + 2 + FFALIGN(max_order, 4)) *
- sizeof(*s->windowed_samples));
- if (!s->windowed_buffer)
- return AVERROR(ENOMEM);
- s->windowed_samples = s->windowed_buffer + FFALIGN(max_order, 4);
- } else {
- s->windowed_samples = NULL;
- }
+ s->windowed_buffer = av_mallocz((blocksize + 2 + FFALIGN(max_order, 4)) *
+ sizeof(*s->windowed_samples));
+ if (!s->windowed_buffer)
+ return AVERROR(ENOMEM);
+ s->windowed_samples = s->windowed_buffer + FFALIGN(max_order, 4);
 
 s->lpc_apply_welch_window = lpc_apply_welch_window_c;
 s->lpc_compute_autocorr = lpc_compute_autocorr_c;

libav-v9.6.tar.bz2/libavcodec/lpc.h -> libav-v10.1.tar.bz2/libavcodec/lpc.h Changed

libav-v9.6.tar.bz2/libavcodec/lzw.c -> libav-v10.1.tar.bz2/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);
@@ -92,9 +93,10 @@
 return c & s->curmask;
 }
 
-const uint8_t* ff_lzw_cur_ptr(LZWState *p)
+int ff_lzw_size_read(LZWState *p)
 {
- return ((struct LZWState*)p)->pbuf;
+ struct LZWState *s = p;
+ return bytestream2_tell(&s->gb);
 }
 
 void ff_lzw_decode_tail(LZWState *p)
@@ -102,17 +104,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)
@@ -140,8 +137,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;

libav-v9.6.tar.bz2/libavcodec/lzw.h -> libav-v10.1.tar.bz2/libavcodec/lzw.h Changed

libav-v9.6.tar.bz2/libavcodec/mace.c -> libav-v10.1.tar.bz2/libavcodec/mace.c Changed

@@ -155,7 +155,6 @@
 } ChannelData;
 
 typedef struct MACEContext {
- AVFrame frame;
 ChannelData chd[2];
 } MACEContext;
 
@@ -227,21 +226,17 @@
 
 static av_cold int mace_decode_init(AVCodecContext * avctx)
 {
- MACEContext *ctx = avctx->priv_data;
-
- if (avctx->channels > 2)
- return -1;
+ if (avctx->channels > 2 || avctx->channels < 1)
+ return AVERROR(EINVAL);
 avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
 
- avcodec_get_frame_defaults(&ctx->frame);
- avctx->coded_frame = &ctx->frame;
-
 return 0;
 }
 
 static int mace_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 int16_t **samples;
@@ -250,12 +245,12 @@
 int is_mace3 = (avctx->codec_id == AV_CODEC_ID_MACE3);
 
 /* get output buffer */
- ctx->frame.nb_samples = 3 * (buf_size << (1 - is_mace3)) / avctx->channels;
- if ((ret = ff_get_buffer(avctx, &ctx->frame)) < 0) {
+ frame->nb_samples = 3 * (buf_size << (1 - is_mace3)) / avctx->channels;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- samples = (int16_t **)ctx->frame.extended_data;
+ samples = (int16_t **)frame->extended_data;
 
 for(i = 0; i < avctx->channels; i++) {
 int16_t *output = samples[i];
@@ -279,34 +274,33 @@
 }
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = ctx->frame;
+ *got_frame_ptr = 1;
 
 return buf_size;
 }
 
 AVCodec ff_mace3_decoder = {
 .name = "mace3",
+ .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 3:1"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_MACE3,
 .priv_data_size = sizeof(MACEContext),
 .init = mace_decode_init,
 .decode = mace_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 3:1"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
 AV_SAMPLE_FMT_NONE },
 };
 
 AVCodec ff_mace6_decoder = {
 .name = "mace6",
+ .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 6:1"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_MACE6,
 .priv_data_size = sizeof(MACEContext),
 .init = mace_decode_init,
 .decode = mace_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 6:1"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
 AV_SAMPLE_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/mathops.h -> libav-v10.1.tar.bz2/libavcodec/mathops.h Changed

libav-v9.6.tar.bz2/libavcodec/mathtables.c -> libav-v10.1.tar.bz2/libavcodec/mathtables.c Changed

@@ -85,3 +85,38 @@
 0x07,0x87,0x47,0xC7,0x27,0xA7,0x67,0xE7,0x17,0x97,0x57,0xD7,0x37,0xB7,0x77,0xF7,
 0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF,
 };
+
+#define times4(x) x, x, x, x
+#define times256(x) times4(times4(times4(times4(times4(x)))))
+
+const uint8_t ff_cropTbl[256 + 2 * 1024] = {
+times256(0x00),
+0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
+0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
+0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
+0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
+0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
+0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
+0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
+0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
+0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
+0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
+times256(0xFF)
+};
+
+const uint8_t ff_zigzag_direct[64] = {
+    0,   1,  8, 16,  9,  2,  3, 10,
+    17, 24, 32, 25, 18, 11,  4,  5,
+    12, 19, 26, 33, 40, 48, 41, 34,
+    27, 20, 13,  6,  7, 14, 21, 28,
+    35, 42, 49, 56, 57, 50, 43, 36,
+    29, 22, 15, 23, 30, 37, 44, 51,
+    58, 59, 52, 45, 38, 31, 39, 46,
+    53, 60, 61, 54, 47, 55, 62, 63
+};

libav-v9.6.tar.bz2/libavcodec/mdct_fixed.c -> libav-v10.1.tar.bz2/libavcodec/mdct_fixed.c Changed

libav-v9.6.tar.bz2/libavcodec/mdct_float.c -> libav-v10.1.tar.bz2/libavcodec/mdct_float.c Changed

libav-v10.1.tar.bz2/libavcodec/mdct_template.c Added

@@ -0,0 +1,203 @@
+/*
+ * MDCT/IMDCT transforms
+ * Copyright (c) 2002 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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
+# define RSCALE(x) ((x) >> 1)
+#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);
+}

libav-v9.6.tar.bz2/libavcodec/mdec.c -> libav-v10.1.tar.bz2/libavcodec/mdec.c Changed

@@ -28,15 +28,14 @@
 */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "mpeg12.h"
 #include "thread.h"
 
-typedef struct MDECContext{
+typedef struct MDECContext {
 AVCodecContext *avctx;
 DSPContext dsp;
- AVFrame picture;
+ ThreadFrame frame;
 GetBitContext gb;
 ScanTable scantable;
 int version;
@@ -45,48 +44,48 @@
 int mb_width;
 int mb_height;
 int mb_x, mb_y;
- DECLARE_ALIGNED(16, DCTELEM, block)[6][64];
+ DECLARE_ALIGNED(16, int16_t, block)[6][64];
 uint8_t *bitstream_buffer;
 unsigned int bitstream_buffer_size;
 int block_last_index[6];
 } MDECContext;
 
 //very similar to MPEG-1
-static inline int mdec_decode_block_intra(MDECContext *a, DCTELEM *block, int n)
+static inline int mdec_decode_block_intra(MDECContext *a, int16_t *block, int n)
 {
 int level, diff, i, j, run;
 int component;
 RLTable *rl = &ff_rl_mpeg1;
- uint8_t * const scantable= a->scantable.permutated;
- const uint16_t *quant_matrix= ff_mpeg1_default_intra_matrix;
- const int qscale= a->qscale;
+ uint8_t * const scantable = a->scantable.permutated;
+ const uint16_t *quant_matrix = ff_mpeg1_default_intra_matrix;
+ const int qscale = a->qscale;
 
 /* DC coefficient */
- if(a->version==2){
- block[0]= 2*get_sbits(&a->gb, 10) + 1024;
- }else{
+ if (a->version == 2) {
+ block[0] = 2 * get_sbits(&a->gb, 10) + 1024;
+ } else {
 component = (n <= 3 ? 0 : n - 4 + 1);
 diff = decode_dc(&a->gb, component);
 if (diff >= 0xffff)
- return -1;
- a->last_dc[component]+= diff;
- block[0] = a->last_dc[component]<<3;
+ return AVERROR_INVALIDDATA;
+ a->last_dc[component] += diff;
+ block[0] = a->last_dc[component] << 3;
 }
 
 i = 0;
 {
 OPEN_READER(re, &a->gb);
 /* now quantify & encode AC coefficients */
- for(;;) {
+ for (;;) {
 UPDATE_CACHE(re, &a->gb);
 GET_RL_VLC(level, run, re, &a->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
 
- if(level == 127){
+ if (level == 127) {
 break;
- } else if(level != 0) {
- i += run;
- j = scantable[i];
- level= (level*qscale*quant_matrix[j])>>3;
+ } else if (level != 0) {
+ i += run;
+ j = scantable[i];
+ level = (level * qscale * quant_matrix[j]) >> 3;
 level = (level ^ SHOW_SBITS(re, &a->gb, 1)) - SHOW_SBITS(re, &a->gb, 1);
 LAST_SKIP_BITS(re, &a->gb, 1);
 } else {
@@ -94,21 +93,21 @@
 run = SHOW_UBITS(re, &a->gb, 6)+1; LAST_SKIP_BITS(re, &a->gb, 6);
 UPDATE_CACHE(re, &a->gb);
 level = SHOW_SBITS(re, &a->gb, 10); SKIP_BITS(re, &a->gb, 10);
- i += run;
- j = scantable[i];
- if(level<0){
- level= -level;
- level= (level*qscale*quant_matrix[j])>>3;
- level= (level-1)|1;
- level= -level;
- }else{
- level= (level*qscale*quant_matrix[j])>>3;
- level= (level-1)|1;
+ i += run;
+ j = scantable[i];
+ if (level < 0) {
+ level = -level;
+ level = (level * qscale * quant_matrix[j]) >> 3;
+ level = (level - 1) | 1;
+ level = -level;
+ } else {
+ level = (level * qscale * quant_matrix[j]) >> 3;
+ level = (level - 1) | 1;
 }
 }
- if (i > 63){
+ if (i > 63) {
 av_log(a->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", a->mb_x, a->mb_y);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 block[j] = level;
@@ -119,36 +118,40 @@
 return 0;
 }
 
-static inline int decode_mb(MDECContext *a, DCTELEM block[6][64]){
- int i;
- const int block_index[6]= {5,4,0,1,2,3};
+static inline int decode_mb(MDECContext *a, int16_t block[6][64])
+{
+ int i, ret;
+ const int block_index[6] = { 5, 4, 0, 1, 2, 3 };
 
 a->dsp.clear_blocks(block[0]);
 
- for(i=0; i<6; i++){
- if( mdec_decode_block_intra(a, block[ block_index[i] ], block_index[i]) < 0 ||
- get_bits_left(&a->gb) < 0)
- return -1;
+ for (i = 0; i < 6; i++) {
+ if ((ret = mdec_decode_block_intra(a, block[block_index[i]],
+ block_index[i])) < 0)
+ return ret;
+ if (get_bits_left(&a->gb) < 0)
+ return AVERROR_INVALIDDATA;
 }
 return 0;
 }
 
-static inline void idct_put(MDECContext *a, int mb_x, int mb_y){
- DCTELEM (*block)[64]= a->block;
- int linesize= a->picture.linesize[0];
+static inline void idct_put(MDECContext *a, AVFrame *frame, int mb_x, int mb_y)
+{
+ int16_t (*block)[64] = a->block;
+ int linesize = frame->linesize[0];
 
- uint8_t *dest_y = a->picture.data[0] + (mb_y * 16* linesize ) + mb_x * 16;
- uint8_t *dest_cb = a->picture.data[1] + (mb_y * 8 * a->picture.linesize[1]) + mb_x * 8;
- uint8_t *dest_cr = a->picture.data[2] + (mb_y * 8 * a->picture.linesize[2]) + mb_x * 8;
+ uint8_t *dest_y = frame->data[0] + (mb_y * 16* linesize ) + mb_x * 16;
+ uint8_t *dest_cb = frame->data[1] + (mb_y * 8 * frame->linesize[1]) + mb_x * 8;
+ uint8_t *dest_cr = frame->data[2] + (mb_y * 8 * frame->linesize[2]) + mb_x * 8;
 
- a->dsp.idct_put(dest_y , linesize, block[0]);
- a->dsp.idct_put(dest_y + 8, linesize, block[1]);
- a->dsp.idct_put(dest_y + 8*linesize , linesize, block[2]);
- a->dsp.idct_put(dest_y + 8*linesize + 8, linesize, block[3]);
+ a->dsp.idct_put(dest_y, linesize, block[0]);
+ a->dsp.idct_put(dest_y + 8, linesize, block[1]);
+ a->dsp.idct_put(dest_y + 8 * linesize, linesize, block[2]);
+ a->dsp.idct_put(dest_y + 8 * linesize + 8, linesize, block[3]);
 
- if(!(a->avctx->flags&CODEC_FLAG_GRAY)){
- a->dsp.idct_put(dest_cb, a->picture.linesize[1], block[4]);
- a->dsp.idct_put(dest_cr, a->picture.linesize[2], block[5]);
+ if (!(a->avctx->flags & CODEC_FLAG_GRAY)) {
+ a->dsp.idct_put(dest_cb, frame->linesize[1], block[4]);
+ a->dsp.idct_put(dest_cr, frame->linesize[2], block[5]);
 }
 }
 
@@ -156,116 +159,92 @@
 void *data, int *got_frame,
 AVPacket *avpkt)
 {
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
 MDECContext * const a = avctx->priv_data;
- AVFrame *picture = data;
- AVFrame * const p= &a->picture;
- int i;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ ThreadFrame frame = { .f = data };
+ int i, ret;
 
- if(p->data[0])
- ff_thread_release_buffer(avctx, p);
-
- p->reference= 0;
- if(ff_thread_get_buffer(avctx, p) < 0){
+ if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
- p->pict_type= AV_PICTURE_TYPE_I;
- p->key_frame= 1;
+ frame.f->pict_type = AV_PICTURE_TYPE_I;
+ frame.f->key_frame = 1;
 
 av_fast_malloc(&a->bitstream_buffer, &a->bitstream_buffer_size, buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
 if (!a->bitstream_buffer)
 return AVERROR(ENOMEM);
- for(i=0; i<buf_size; i+=2){
- a->bitstream_buffer[i] = buf[i+1];
- a->bitstream_buffer[i+1]= buf[i ];
+ for (i = 0; i < buf_size; i += 2) {
+ a->bitstream_buffer[i] = buf[i + 1];
+ a->bitstream_buffer[i + 1] = buf[i];
 }
- init_get_bits(&a->gb, a->bitstream_buffer, buf_size*8);
+ init_get_bits(&a->gb, a->bitstream_buffer, buf_size * 8);
 
 /* skip over 4 preamble bytes in stream (typically 0xXX 0xXX 0x00 0x38) */
 skip_bits(&a->gb, 32);
 
- a->qscale= get_bits(&a->gb, 16);
- a->version= get_bits(&a->gb, 16);
+ a->qscale = get_bits(&a->gb, 16);
+ a->version = get_bits(&a->gb, 16);
 
- a->last_dc[0]=
- a->last_dc[1]=
- a->last_dc[2]= 128;
+ a->last_dc[0] = a->last_dc[1] = a->last_dc[2] = 128;
 
- for(a->mb_x=0; a->mb_x<a->mb_width; a->mb_x++){
- for(a->mb_y=0; a->mb_y<a->mb_height; a->mb_y++){
- if( decode_mb(a, a->block) <0)
- return -1;
+ for (a->mb_x = 0; a->mb_x < a->mb_width; a->mb_x++) {
+ for (a->mb_y = 0; a->mb_y < a->mb_height; a->mb_y++) {
+ if ((ret = decode_mb(a, a->block)) < 0)
+ return ret;
 
- idct_put(a, a->mb_x, a->mb_y);
+ idct_put(a, frame.f, a->mb_x, a->mb_y);
 }
 }
 
- p->quality= a->qscale * FF_QP2LAMBDA;
- memset(p->qscale_table, a->qscale, a->mb_width);
-
- *picture = a->picture;
 *got_frame = 1;
 
- return (get_bits_count(&a->gb)+31)/32*4;
+ return (get_bits_count(&a->gb) + 31) / 32 * 4;
 }
 
-static av_cold void mdec_common_init(AVCodecContext *avctx){
+static av_cold int decode_init(AVCodecContext *avctx)
+{
 MDECContext * const a = avctx->priv_data;
 
- ff_dsputil_init(&a->dsp, avctx);
-
- a->mb_width = (avctx->coded_width + 15) / 16;
- a->mb_height = (avctx->coded_height + 15) / 16;
-
- avctx->coded_frame= &a->picture;
- a->avctx= avctx;
-}
+ a->mb_width = (avctx->coded_width + 15) / 16;
+ a->mb_height = (avctx->coded_height + 15) / 16;
 
-static av_cold int decode_init(AVCodecContext *avctx){
- MDECContext * const a = avctx->priv_data;
- AVFrame *p= &a->picture;
+ a->avctx = avctx;
 
- mdec_common_init(avctx);
+ ff_dsputil_init(&a->dsp, avctx);
 ff_mpeg12_init_vlcs();
 ff_init_scantable(a->dsp.idct_permutation, &a->scantable, ff_zigzag_direct);
 
- if( avctx->idct_algo == FF_IDCT_AUTO )
+ if (avctx->idct_algo == FF_IDCT_AUTO)
 avctx->idct_algo = FF_IDCT_SIMPLE;
- p->qstride= 0;
- p->qscale_table= av_mallocz(a->mb_width);
- avctx->pix_fmt= AV_PIX_FMT_YUVJ420P;
+ avctx->pix_fmt = AV_PIX_FMT_YUVJ420P;
 
 return 0;
 }
 
-static av_cold int decode_init_thread_copy(AVCodecContext *avctx){
+static av_cold int decode_init_thread_copy(AVCodecContext *avctx)
+{
 MDECContext * const a = avctx->priv_data;
- AVFrame *p = &a->picture;
 
- avctx->coded_frame = p;
- a->avctx= avctx;
-
- p->qscale_table = av_mallocz( a->mb_width);
+ a->avctx = avctx;
 
 return 0;
 }
 
-static av_cold int decode_end(AVCodecContext *avctx){
+static av_cold int decode_end(AVCodecContext *avctx)
+{
 MDECContext * const a = avctx->priv_data;
 
- if(a->picture.data[0])
- avctx->release_buffer(avctx, &a->picture);
 av_freep(&a->bitstream_buffer);
- av_freep(&a->picture.qscale_table);
- a->bitstream_buffer_size=0;
+ a->bitstream_buffer_size = 0;
 
 return 0;
 }
 
 AVCodec ff_mdec_decoder = {
 .name = "mdec",
+ .long_name = NULL_IF_CONFIG_SMALL("Sony PlayStation MDEC (Motion DECoder)"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MDEC,
 .priv_data_size = sizeof(MDECContext),
@@ -273,6 +252,5 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
- .long_name = NULL_IF_CONFIG_SMALL("Sony PlayStation MDEC (Motion DECoder)"),
 .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy)
 };

libav-v10.1.tar.bz2/libavcodec/metasound.c Added

@@ -0,0 +1,388 @@
+/*
+ * Voxware MetaSound decoder
+ * Copyright (c) 2013 Konstantin Shishkov
+ * based on TwinVQ decoder
+ * Copyright (c) 2009 Vitor Sessak
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <math.h>
+#include <stdint.h>
+
+#define BITSTREAM_READER_LE
+#include "libavutil/channel_layout.h"
+#include "libavutil/float_dsp.h"
+#include "avcodec.h"
+#include "get_bits.h"
+#include "fft.h"
+#include "internal.h"
+#include "lsp.h"
+#include "sinewin.h"
+
+#include "twinvq.h"
+#include "metasound_data.h"
+
+static void add_peak(float period, int width, const float *shape,
+ float ppc_gain, float *speech, int len)
+{
+ int i, j, center;
+ const float *shape_end = shape + len;
+
+ // First peak centered around zero
+ for (i = 0; i < width / 2; i++)
+ speech[i] += ppc_gain * *shape++;
+
+ for (i = 1; i < ROUNDED_DIV(len, width); i++) {
+ center = (int)(i * period + 0.5);
+ for (j = -width / 2; j < (width + 1) / 2; j++)
+ speech[j + center] += ppc_gain * *shape++;
+ }
+
+ // For the last block, be careful not to go beyond the end of the buffer
+ center = (int)(i * period + 0.5);
+ for (j = -width / 2; j < (width + 1) / 2 && shape < shape_end; j++)
+ speech[j + center] += ppc_gain * *shape++;
+}
+
+static void decode_ppc(TwinVQContext *tctx, int period_coef, int g_coef,
+ const float *shape, float *speech)
+{
+ const TwinVQModeTab *mtab = tctx->mtab;
+ int isampf = tctx->avctx->sample_rate / 1000;
+ int ibps = tctx->avctx->bit_rate / (1000 * tctx->avctx->channels);
+ int width;
+
+ float ratio = (float)mtab->size / isampf;
+ float min_period, max_period, period_range, period;
+ float some_mult;
+
+ float pgain_base, pgain_step, ppc_gain;
+
+ if (tctx->avctx->channels == 1) {
+ min_period = log2(ratio * 0.2);
+ max_period = min_period + log2(6);
+ } else {
+ min_period = (int)(ratio * 0.2 * 400 + 0.5) / 400.0;
+ max_period = (int)(ratio * 0.2 * 400 * 6 + 0.5) / 400.0;
+ }
+ period_range = max_period - min_period;
+ period = min_period + period_coef * period_range /
+ ((1 << mtab->ppc_period_bit) - 1);
+ if (tctx->avctx->channels == 1)
+ period = powf(2.0, period);
+ else
+ period = (int)(period * 400 + 0.5) / 400.0;
+
+ switch (isampf) {
+ case 8: some_mult = 2.0; break;
+ case 11: some_mult = 3.0; break;
+ case 16: some_mult = 3.0; break;
+ case 22: some_mult = ibps == 32 ? 2.0 : 4.0; break;
+ case 44: some_mult = 8.0; break;
+ default: some_mult = 4.0;
+ }
+
+ width = (int)(some_mult / (mtab->size / period) * mtab->ppc_shape_len);
+ if (isampf == 22 && ibps == 32)
+ width = (int)((2.0 / period + 1) * width + 0.5);
+
+ pgain_base = tctx->avctx->channels == 2 ? 25000.0 : 20000.0;
+ pgain_step = pgain_base / ((1 << mtab->pgain_bit) - 1);
+ ppc_gain = 1.0 / 8192 *
+ twinvq_mulawinv(pgain_step * g_coef + pgain_step / 2,
+ pgain_base, TWINVQ_PGAIN_MU);
+
+ add_peak(period, width, shape, ppc_gain, speech, mtab->ppc_shape_len);
+}
+
+static void dec_bark_env(TwinVQContext *tctx, const uint8_t *in, int use_hist,
+ int ch, float *out, float gain,
+ enum TwinVQFrameType ftype)
+{
+ const TwinVQModeTab *mtab = tctx->mtab;
+ int i, j;
+ float *hist = tctx->bark_hist[ftype][ch];
+ float val = ((const float []) { 0.4, 0.35, 0.28 })[ftype];
+ int bark_n_coef = mtab->fmode[ftype].bark_n_coef;
+ int fw_cb_len = mtab->fmode[ftype].bark_env_size / bark_n_coef;
+ int idx = 0;
+
+ if (tctx->avctx->channels == 1)
+ val = 0.5;
+ for (i = 0; i < fw_cb_len; i++)
+ for (j = 0; j < bark_n_coef; j++, idx++) {
+ float tmp2 = mtab->fmode[ftype].bark_cb[fw_cb_len * in[j] + i] *
+ (1.0 / 2048);
+ float st;
+
+ if (tctx->avctx->channels == 1)
+ st = use_hist ?
+ tmp2 + val * hist[idx] + 1.0 : tmp2 + 1.0;
+ else
+ st = use_hist ? (1.0 - val) * tmp2 + val * hist[idx] + 1.0
+ : tmp2 + 1.0;
+
+ hist[idx] = tmp2;
+ if (st < 0.1)
+ st = 0.1;
+
+ twinvq_memset_float(out, st * gain,
+ mtab->fmode[ftype].bark_tab[idx]);
+ out += mtab->fmode[ftype].bark_tab[idx];
+ }
+}
+
+static void read_cb_data(TwinVQContext *tctx, GetBitContext *gb,
+ uint8_t *dst, enum TwinVQFrameType ftype)
+{
+ int i;
+
+ for (i = 0; i < tctx->n_div[ftype]; i++) {
+ int bs_second_part = (i >= tctx->bits_main_spec_change[ftype]);
+
+ *dst++ = get_bits(gb, tctx->bits_main_spec[0][ftype][bs_second_part]);
+ *dst++ = get_bits(gb, tctx->bits_main_spec[1][ftype][bs_second_part]);
+ }
+}
+
+static int metasound_read_bitstream(AVCodecContext *avctx, TwinVQContext *tctx,
+ const uint8_t *buf, int buf_size)
+{
+ TwinVQFrameData *bits;
+ const TwinVQModeTab *mtab = tctx->mtab;
+ int channels = tctx->avctx->channels;
+ int sub;
+ GetBitContext gb;
+ int i, j, k;
+
+ init_get_bits(&gb, buf, buf_size * 8);
+
+ for (tctx->cur_frame = 0; tctx->cur_frame < tctx->frames_per_packet;
+ tctx->cur_frame++) {
+ bits = tctx->bits + tctx->cur_frame;
+
+ bits->window_type = get_bits(&gb, TWINVQ_WINDOW_TYPE_BITS);
+
+ if (bits->window_type > 8) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid window type, broken sample?\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ bits->ftype = ff_twinvq_wtype_to_ftype_table[tctx->bits[tctx->cur_frame].window_type];
+
+ sub = mtab->fmode[bits->ftype].sub;
+
+ if (bits->ftype != TWINVQ_FT_SHORT && !tctx->is_6kbps)
+ get_bits(&gb, 2);
+
+ read_cb_data(tctx, &gb, bits->main_coeffs, bits->ftype);
+
+ 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);
+
+ for (i = 0; i < channels; i++)
+ for (j = 0; j < sub; j++)
+ 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 (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);
+ }
+ }
+
+ // subframes are aligned to nibbles
+ if (get_bits_count(&gb) & 3)
+ skip_bits(&gb, 4 - (get_bits_count(&gb) & 3));
+ }
+
+ return 0;
+}
+
+typedef struct MetasoundProps {
+ uint32_t tag;
+ int bit_rate;
+ int channels;
+ int sample_rate;
+} MetasoundProps;
+
+static const MetasoundProps codec_props[] = {
+ { MKTAG('V','X','0','3'), 6, 1, 8000 },
+ { MKTAG('V','X','0','4'), 12, 2, 8000 },
+
+ { MKTAG('V','O','X','i'), 8, 1, 8000 },
+ { MKTAG('V','O','X','j'), 10, 1, 11025 },
+ { MKTAG('V','O','X','k'), 16, 1, 16000 },
+ { MKTAG('V','O','X','L'), 24, 1, 22050 },
+ { MKTAG('V','O','X','q'), 32, 1, 44100 },
+ { MKTAG('V','O','X','r'), 40, 1, 44100 },
+ { MKTAG('V','O','X','s'), 48, 1, 44100 },
+ { MKTAG('V','O','X','t'), 16, 2, 8000 },
+ { MKTAG('V','O','X','u'), 20, 2, 11025 },
+ { MKTAG('V','O','X','v'), 32, 2, 16000 },
+ { MKTAG('V','O','X','w'), 48, 2, 22050 },
+ { MKTAG('V','O','X','x'), 64, 2, 44100 },
+ { MKTAG('V','O','X','y'), 80, 2, 44100 },
+ { MKTAG('V','O','X','z'), 96, 2, 44100 },
+
+ { 0, 0, 0, 0 }
+};
+
+static av_cold int metasound_decode_init(AVCodecContext *avctx)
+{
+ int isampf, ibps;
+ TwinVQContext *tctx = avctx->priv_data;
+ uint32_t tag;
+ const MetasoundProps *props = codec_props;
+
+ if (!avctx->extradata || avctx->extradata_size < 16) {
+ av_log(avctx, AV_LOG_ERROR, "Missing or incomplete extradata\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ tag = AV_RL32(avctx->extradata + 12);
+
+ for (;;) {
+ if (!props->tag) {
+ av_log(avctx, AV_LOG_ERROR, "Could not find tag %08X\n", tag);
+ return AVERROR_INVALIDDATA;
+ }
+ if (props->tag == tag) {
+ avctx->sample_rate = props->sample_rate;
+ avctx->channels = props->channels;
+ avctx->bit_rate = props->bit_rate * 1000;
+ isampf = avctx->sample_rate / 1000;
+ break;
+ }
+ props++;
+ }
+
+ if (avctx->channels <= 0 || avctx->channels > TWINVQ_CHANNELS_MAX) {
+ av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels: %i\n",
+ avctx->channels);
+ return AVERROR_INVALIDDATA;
+ }
+ avctx->channel_layout = avctx->channels == 1 ? AV_CH_LAYOUT_MONO
+ : AV_CH_LAYOUT_STEREO;
+
+ 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, ibps);
+ return AVERROR(ENOSYS);
+ }
+
+ 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);
+}
+
+AVCodec ff_metasound_decoder = {
+ .name = "metasound",
+ .long_name = NULL_IF_CONFIG_SMALL("Voxware MetaSound"),
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = AV_CODEC_ID_METASOUND,
+ .priv_data_size = sizeof(TwinVQContext),
+ .init = metasound_decode_init,
+ .close = ff_twinvq_decode_close,
+ .decode = ff_twinvq_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
+ AV_SAMPLE_FMT_NONE },
+};

libav-v10.1.tar.bz2/libavcodec/metasound_data.c Added

@@ -0,0 +1,15335 @@
+/*
+ * MetaSound decoder
+ * Copyright (c) 2013 Konstantin Shishkov
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#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,
+       -35,   -442,   -139,    -69,    -59,     29,    -62,    -67,
+       -17,    -42,     74,     10,    107,     74,   -109,     40,
+    -10210,    -33,  -3210,   -410,   -106,    512,     40,    -17,
+       109,     67,     99,    170,     53,     34,    -68,    -16,
+      3895,    -71,   -116,      1,    608,     66,   -215,     34,
+        77,     50,    -45,    -73,      3,     11,    -33,     18,
+       -34,     58,     25,   4420,     96,     77,    -67,     23,
+       -83,  -6724,    226,    -32,   -150,   -154,     30,    -12,
+        -8,     -7,     89,     42,    173,    -51,     38,  -1852,
+        40,    -48,    -40,     81,     34,     81,     66,     16,
+        20,      3,     99,     41,    123,     52,    154,     20,
+       -38,      6,  10889,    -44,     22,    -39,     55,    -34,
+        25,    -45,    -22,    139,     19,    -20,    -64,  -2242,
+      -473,   -113,    316,    127,    -31,    128,   -363,   -124,
+       196,    259,    -60,  -3792,    -41,   -103,    104,    -80,
+      -389,    179,    110,     83,   3174,     60,   -197,    101,
+        66,    -47,   -107,     96,    -27,     45,    -21,      6,
+       116,    -51,     -8,   -594,    377,   -279,    158,   -159,
+      4595,   -163,   -210,     19,      3,   -292,    -67,     14,
+       115,    -41,   -125,   -154,   -263,   -101,      4,    -11,
+       -89,    130,     58,     32,     92,     16,    126,    -93,
+       -99,  -4239,    -69,     88,      5,   -113,    -18,     35,
+        31,    -48,    -16,     35,     62,  -2839,     14,    121,
+        19,     41,    125,   -102,     26, -13144,      6,    -30,
+        -7,     60,      4,     36,    -40,    -26,     54,    -57,
+        -9,    -30,     13,     -1,     73,   -131,     29,    256,
+        39,    -51,    -12,   1788,      4,     10,    -58,     17,
+       -36,     -2,     13,     59,    -20,    -21,    173,    129,
+      -435,   -107,   -214,     33,   3078,     13,     31,    148,
+     -2975,   -311,     38,     25,   -247,   -542,     34,    106,
+      -392,     85,   -203,    182,   -232,    423,    629,   -183,
+       800,   -466,   3145,  -2498,   -305,     39,     22,     41,
+         0,    -14,    671,   -181,   3197,    109,   2900,     72,
+       -64,      8,    414,    133,    244,   -263,     53,    -69,
+        70, -13756,    -13,     21,     50,     12,    -14,    -12,
+        -7,     97,    -32,     24,     51,    -24,    -29,     53,
+        34,    -19,  -2341,    976,     25,    -58,     18,    -48,
+     -2490,    -55,    -31,   -165,    -36,     28,    -26,     92,
+        60,    137,     69,  -5341,   -125,   1966,   -154,    -66,
+       -13,    -84,    -13,     81,    -46,    -96,     50,    -50,
+      -114,     15,     30,   -211,   -147,   -555,   3998,     88,
+       358,   -159,   -105,    -51,   -109,    -16,     70,     91,
+       268,    125,    -95,    -62,     38,  -3227,   3591,    -15,
+        92,    -72,    115,    144,    -40,    142,    172,     72,
+       -17,     23,      1,     28,    -38,   -135,    220,    -80,
+      -179,      9,    -32,     -6,     37,    -33,     -3,    -89,
+      7314,      5,    194,    -13,     23,     31,     42,     84,
+       197,   -163,   -251,   -273,    193,    206,   -613,    394,
+      3469,   2587,   -701,     62,    301,   -104,    200,    164,
+      -201,   -473,     52,   -473,    128,   -381,    404,    -69,
+      -230,   -537,    157,    389,     -7,   2783,   3058,     95,
+       -59,   1618,      1,      4,     53,     -6,     28,     10,
+         2,     82,     28,     -8,    -14,     25,     59,     10,
+        -4,     36,   -777,  -4984,     29,      8,     85,    -43,
+      -137,    -34,     53,    -58,      1,    -27,     91,     15,
+        80,    -19,   -186,    467,     94,   -382,    129,    327,
+      3053,   -221,    399,  -2821,   1090,    278,     -2,   -163,
+      -398,    126,   -266,    180,   -235,     70,    -18,    -34,
+       -45,    159,    -32,     66,     11,   3177,   -188,     27,
+        35,    -52,    114,    -28,   -136,    186,   2146,    100,
+        92,      6,     58,    -70,    159,    -14,    -32,      9,
+         6,    -27,    -73,     28,     23,    -24,    101,    148,
+        80,    -52,    -27,    -53,    -36,      4,    -74,     47,
+       -30,   -108,     34,   7213,     12,     31,    -17,   -185,
+      3318,    199,    192,   3450,    -87,      3,     47,     46,
+      -141,     49,     83,    -82,   -132,    -82,     68,    138,
+     -1031,   -236,    390,    -37,     23,    -94,     -7,      9,
+     -2958,  -1846,    -43,     23,     25,    -79,   -193,    -77,
+     -3332,  -3355,   -139,     56,    163,  -3302,    -82,    -25,
+        35,     96,     73,    166,   -154,    174,   -121,     14,
+       -89,    101,  -3751,   -344,   -240,    -35,    401,    -14,
+        47,    -49,     24,    -78,     24,      6,     68,     51,
+      -145,     20,     83,     57,    147,   -100,     60,     33,
+       -53,     11,     37,  -5793,    -93,    -67,     -9,    117,
+       112,    -51,     60,     48,     49,    328,    293,    127,
+      -314,  -3022,    374,   3283,    -86,    588,   -346,    436,
+        -7,    -26,    -88,    104,    205,    150,    147,     34,
+       126,     85,     46,   -125,   -119,     75,     13,    144,
+      3721,    275,    -71,     43,    163,    -73,   -292,   -381,
+       -79,     33,     79,    -79,     34,    -94,     18,    229,
+        63,     28,    -44,     97,  -3606,     77,    -95,   -162,
+       163,     62,   6180,     81,    -51,    -19,     -5,    109,
+        71,      7,    -37,   -100,    -31,    -94,    188,    169,
+       -14,   2606,   -417,     18,  -4371,    -25,    180,    108,
+        17,     33,     48,    -46,    -93,    -77,     32,    -37,
+       -71,   -271,    -48,   -273,    -14,    115,    -59,   -312,
+     -3334,  -3046,     71,   -166,    379,    209,   -142,     22,
+        89,    -41,    -40,     -7,    -50,      8,    -15,     12,
+       -70,    -27,    -27,     25,    -31,     38,     -5,   2831,
+       -89,     -8,    -50,   -110,   1368,    -59,  -2307,      6,
+       179,     75,    189,    170,    -55,    330,    -70,    172,
+        67,   -492,    -57,  -3408,      9,    -93, -11400,     14,
+        -1,    -21,     65,    -15,     45,    -22,     40,    -10,
+       -41,     23,    -29,    -96,    -55,    -66,    -57,    -61,
+       -29,    -15,   -101,  -9831,     33,     42,    -35,     42,
+       -44,    -58,     11,    -40,     27,     21,    715,   -315,
+      -255,   -115,   1736,      4,     41,    -70,    -51,   -108,
+       160,     -9,     87,     -6,     36,    -20,    -68,     10,
+        82,    -33,    -42,     15,    -57,    -40,    -31,     21,
+     10023,     62,    -41,    -10,     85,    -65,    -12,    -61,
+       -72,   -610,    128,    -76,    198,    367,  -4564,     60,
+       158,    -13,   -134,    -45,    -33,    -11,    -51,    -72,
+       111,   -188,    232,   -494,    -27,     42,     46,    -23,
+       137,   3174,  -3598,    211,    152,    155,   -299,     56,
+       -23,   -123,    132,     50,     28,    -64,     28,      9,
+       -17,     31,    112,    -19,      4,     45,  -7175,     54,
+       -61,     -7,     87,    164,    195,    -29,    -48,     28,
+       -60,     70,    -69,    112,   -295,      5,    -89,     38,
+        36, -11501,     17,    -26,    -64,   -222,     91,    -23,
+       -89,      0,    -94,   2191,    -74,    -84,    -61,    -41,
+        57,     24,    -35,    -28,    -37,    486,    131,   3699,
+      -277,     64,   -125,   -243,    270,    313,   -112,    145,
+        47,  -2862,   -254,   -110,    -27,    -69,   -342,   -120,
+       216,     35,     24,     62,    -39,    -29,   2402,     -7,
+        -3,     14,    -47,    -27,      4,     27,     20,     81,
+       138,     75,    178,    421,  -2943,  -3080,    -84,    -40,
+       -58,   -195,   -182,    101,   -187,      6,    -83,    269,
+       -32,    -99,     51,    -38,     44,     82,    -14,    -35,
+         0,      8,    -23,  10754,    -73,    -57,     68,    107,
+        85,     77,    101,      1,    -28,    103,    -10,     48,
+        55,     33,    -93,    -18,      8,     28,    -14,   -575,
+        28, -11712,     90,   -186,     58,     38,    -42,   2156,
+       -82,     28,    -23,     43,     43,      8,     25,     65,
+         0,    -53,     28,    -88,    388,    -36,    363,     64,
+      3068,     56,    320,   -202,  -3433,     73,   -339,   -157,
+       373,   -216,    -43,    171,    140,   -437,   -143,  -2820,
+      -101,     53,   -111,     65,    -39,     65,    -30,     69,
+       -55,     49,     45,    126,    174,    220,     73,   -101,
+       -60,   -151,    -13,    -41,    -48,     -9,     25,   -122,
+       -80,  -2450,     19,     94,     14,    -18,    -19,     60,
+     -3252,    -10,   3390,    -15,   -365,    -15,    -73,   -222,
+       307,     70,    -95,    237,   -142,   -163,    -44,   -138,
+        -7,      6,    -36,    -67,      9,    -22,  10235,    -56,
+        -8,     44,   -155,   -117,    -22,    -32,    -74,    -14,
+};
+
+static const int16_t cb0808l1[] = {
+       -58,    222,   -154,    -74,    -53,   4939,    421,     67,
+        26,    132,     60,    -97,     -1,    -43,    328,      2,
+       460,    -66,    -11,    -45,    -56,    -86, -10569,   -129,
+        58,    -25,     39,     28,     26,     45,    -61,   -139,
+       -22,   -135,   -282,   -517,   -368,     55,    -47,     30,
+      -110,     47,     75,    -13,     65,    -41,    104,   4745,
+      -149,    -99,     28,    421,    517,    -56,     81,   -309,
+        67,    -42,     -6,     17,    -60,   -151,     50,    -84,
+        -9,     29,    -72,  -3019,     82,   -195,     41,    -14,
+      -206,    -34,    -58,    -18,     30,   2154,    -20,      2,
+        -1,     41,    -10,      7,     86,    494,    123,    328,
+        73,    213,    -29,     17,     43,    -92,    -61,     -9,
+      -130,   -113,     33,    -28,  -6677,   -198,   -185,   -236,
+       183,   -108,    739,     60,     98,   -314,     66,     10,
+     -3161,   -159,  -2850,    118,     37,    -41,   -119,   3087,
+        43,    -36,     42,    106,   -174,  -3379,    -92,   -142,
+      -237,     94,    -59,   -123,   -117,    144,    -75,    146,
+      -268,    561,  -1160,    336,   1477,    207,     89,    130,
+       127,   3763,   -372,     48,     99,    204,     84,    209,
+       103,    118,    125,    326,    -29,   -206,    139,    -61,
+        94,     77,   6624,   -163,     23,     27,   -104,    150,
+       -76,   -205,   -186,    -30,   -227,    -58,     17,     25,
+     -6536,    -19,    -66,    -45,    -72,     41,     49,    -79,
+       105,     -4,   -117,    -37,   -183,    216,    -27,    -23,
+       -31,  -2720,     53,    -23,    -46,     -9,    -10,     50,
+       -12,    -50,    -56,     35,   5498,   -110,     -2,     44,
+        -1,     13,     52,    -18,    -61,    -80,    -29,     25,
+        61,    -37,     93,    -19,     67,     75,    -41,    254,
+       161,    118,  -3379,    398,     -9,   -208,   -143,    207,
+      -135,    -32,    171,    187,   -194,    466,    -55,    158,
+        34,    105,   4986,     27,    -41,     20,     87,   -110,
+        39,     80,    -37,      8,    -25,    -44,   -108,   -171,
+      -366,    208,   -225,      1,   -124,     21,     81, -10349,
+       -51,     33,    -51,    141,    -36,    106,   -100,    320,
+       122,      3,    266,     72,     -8,   -112,     55,   -107,
+     -4154,    -69,      0,     71,   -153,    -80,    -50,     20,
+      -112,    225,  -1982,    273,    -19,   -127,    109,    -25,
+        47,     57,    -98,    -10,     42,    -25,     10,     24,
+        41,    -73,     45,  -3523,   -370,   3213,     54,    -87,
+        67,   -185,    100,    -33,    -41,      3,    -38,     70,
+      -108,   -120,    -67,   -144,   -181,    -33,   -104,    429,
+        89,    849,   3022,  -2765,   -341,    184,   -248,    610,
+       408,   -222,    184,     84,    -64,    479,   -146,     47,
+      -100,     13,     17,     -7,     58,    -13,    -36,    -23,
+        -1,    -25,     10,   2666,   -113,    -41,   -140,   3064,
+       105,     31,   3042,    -75,   -132,   -113,     80,   -100,
+       -39,    216,     -4,      7,    -43,    242,     19,  -1031,
+       731,  -3659,    -24,    -20,    109,    126,   2980,     19,
+       -11,    -48,     57,   -138,    -11,   -211,   -151,    540,
+      -113,   -110,      0,   -415,    150,    -80,    -80,    209,
+       -82,  -5212,   -125,    376,      8,    131,   -138,     30,
+      -922,   -320,    181,    -75,    138,   -112,    146,    -72,
+        64,    -75,   -262,   4872,    -11,    -61,     37,   -205,
+        48,  -2257,     82,    106,     93,    -66,     48,     71,
+        29,     72,     32,     29,     17,      5,     34,     29,
+       -29,    -72,     50,  -7702,   -114,   -117,     47,     11,
+        19,    100,     48,    -28,     -8,     53,     21,     80,
+       -43,     37,    164,     22,    -15,  -5258,    -23,    -32,
+       108,     52,      7,   -161,     11,     84,    141,     -8,
+       -12,    -25,    111,    146,    -96,     66,   7388,     54,
+        17,    -54,     62,     44,    -66,    -13,     26,     13,
+        85,    -79,    -21,     98,    156,    181,   -103,   -188,
+       -35,   -179,     83,    117,    -92,     49,   -185,   3800,
+       -90,     14,     42,     94,    -83,   -178,   -156,     -8,
+        33,     42,    204,     42,      1,    -85,     47,     10,
+     10804,     36,      8,     26,    -47,    -51,   -189,     83,
+       -47,    -23,    104,  -7142,    -67,     55,     21,     68,
+         8,    -84,    -60,    -43,    142,    -41,     27,    -72,
+       -70,   -170,   -141,    202,   -198,   -105,     41,  -3553,
+       -34,   -148,     34,    -62,   -161,    -20,    -73,    128,
+       162,  -8343,      4,    -71,    -46,     12,     27,     48,
+       -41,     50,    -19,    -88,      7,     79,     29,    -19,
+       -31,    -49,   -147,  -1886,   -103,   -213,     28,   -183,
+      4119,     87,      6,     -6,     51,   -190,   -167,   -116,
+        23,    -26,      7,    -38,   5442,  -1869,    -81,    197,
+       105,   -122,     65,    220,     32,    -57,    -39,    -15,
+         4,    112,    -55,   -139,   -825,    985,   -109,   2558,
+       218,     94,     65,   -184,   3269,    101,    -65,     42,
+       372,    -38,     58,      8,   -143,   -544,   -268,    121,
+        38,     61,    -63,    -10,    -30,    -52,    -76,    -74,
+     -6690,     -5,   -160,     76,    -77,     74,    374,   -917,
+       239,   -203,    550,    -84,   -305,    292,    -51,     36,
+       135,    -79,     27,    -69,   -309,   4561,    -67,     11,
+       -60,     43,     18,     -2,      8,    -15,     20,     22,
+        -2,    -41,  -2396,     37,    -79,     67,     27,    -84,
+       353,   -213,  -2336,     58,     39,    126,    -78,    -98,
+       -90,     -3,     -9,    -43,     -2,    -29,     -5,   -149,
+        42,     98,   -109,    137,     58,    -83,    -38,     51,
+      6525,     50,     97,    -31,      8,    132,    -71,    -55,
+        11,    120,      2,    -43,    136,    -37,    -85,    150,
+       133,     67,    -41,   -452,   -104,      4,    126,    100,
+     -2660,   -108,   -109,    -64,    615,    -75,     45,     10,
+       -57,    -57,   -108,    167,   -218,    -10,   -331,    -26,
+       -21,   6561,     73,   -599,    126,    -23,    250,   -103,
+        -4,    -28,    -20,    -35,    -19,     51,      9,    -25,
+       -40, -11220,     -2,     28,    -12,     23,   3481,    169,
+       159,   -217,    -48,    114,    -93,    -34,   -191,    -63,
+        31,    182,     79,     90,     55,     67,   -145,    409,
+       190,  -7791,    -26,     18,     71,   -113,    -80,     69,
+       -21,    -27,   -121,     51,   -148,    103,    196,   2726,
+       -67,   3022,    -28,     26,    -99,     51,     24,     61,
+       104,     89,    -57,    -23,   -112,     43,      6,     13,
+      -184,   -168,    117,    -29,   1865,     -3,     20,      8,
+        30,     32,    -81,     80,    -20,    -59,     37,     19,
+      -107,  -3920,   -259,     44,     23,   -129,     24,    -66,
+       -27,  -3071,    116,      9,    -76,     56,    -83,     25,
+        54,    -20,      2,    230,     56,    -41,    131,    -15,
+       -62,     61,     56,     74,    -34,    110,   4606,     -4,
+        18,    -47,    331,   -106,    -78,     70,     53,     70,
+       -22,     77,    -71,    -60,   -101,     70,      7,    104,
+        -7,     39,    -27,   7210,    253,    -15,      0,    -96,
+        32,     50,    -10,     33,   2058,     11,    -15,     42,
+       -14,     51,      4,     -3,    -11,    -86,     10,     33,
+        21,    -18,    -31,     -7,     53,     -7,     95,      7,
+        75, -11314,      7,     17,    -16,    -83,   -475,   -887,
+     -1141,      1,   -101,      5,    -46,    110,    -90,    -47,
+       -15,     19,     66,  -4078,    104,     43,    105,   -126,
+       181,     43,  -1655,    -81,    -11,     33,    -33,     33,
+        28,    -44,     35,     -6,    -38,     68,    -40,     67,
+        73,    -29,    171,  11982,     42,     -8,    -66,    -66,
+        40,    -19,     14,     33,    -63,     24,     94,    -94,
+      -106,    584,    330,   -108,  -3841,    782,   -300,    -11,
+      -303,   -174,   -217,     -3,     24,    168,    187,   -166,
+        54,    238,   -269,    -27,    182,     -4,    -72,    -47,
+        32,     39,   7622,    -46,    -67,    -53,     56,    123,
+       -50,     69,    -36,   -275,    628,    -55,    195,    -56,
+      -265,   -132,    -39,     -4,    169,    113,   -180,    -19,
+        88,  -6427,     42,   -257,   1180,    359,    335,   3821,
+       116,     79,      3,    -93,     67,    -44,     58,    -16,
+       265,    172,    -39,    -44,     18,     92,      4,    218,
+       122,  -2993,    150,    138,    618,     66,   -618,    402,
+      2227,     10,     38,    308,    338,    -70,    265,   1047,
+      -104,   -182,    305,   -162,    -99,    510,    -20,   -114,
+       529,    -42,  -3569,     52,    -80,   -314,    716,    -31,
+       259,     59,    -73,   -117,     38,    -44,    -16,    -74,
+     -5060,     35,     10,    -30,     54,    217,     36,   -205,
+};
+
+static const int16_t cb0808s0[] = {
+     -2191,   -865,  -1906,   -251,    274,    594,  -1214,    677,
+       482,  -1176,     43,  -1098,   -203,   -537,   1834,   1332,
+       308,    432,   -191,   3091,   1892,    926,   -446,  -1206,
+      -613,    198,    575,    -38,    264,    375,    278,   -691,
+      -107,     17,   -239,    261,    848,   -620,    183,    624,
+       122,   -358,    -50,   1017,  -1075,   -705,   -346,    337,
+      -121,    100,   -218,  -1051,   -463,  -4728,   -513,  -1151,
+       737,   4356,    684,  -1374,   1630,    521,   -520,    -52,
+        90,    119,    -43,   -131,     24,     -2,   -184,    -65,
+       614,    371,   -448,   -414,   1415,   -687,   -224,    584,
+      -768,  -1210,   2941,  -3057,    132,    406,   -952,    291,
+       295,   -798,    608,  -1476,   -516,     21,   -302,   2085,
+     -1700,  -2655,   -355,    175,   -409,    662,     46,   -247,
+      -201,   -580,    179,    -54,    458,    836,   1543,   1829,
+      -282,   -278,    412,   2422,   2077,    197,   -897,    451,
+       595,   1547,    538,    825,    563,    443,   -576,   -854,
+      -572,    241,   -471,    201,   -311,   -529,    112,  -5128,
+      -173,   -233,   -435,    340,    158,    -41,    273,   -224,
+       919,  -1570,   1075,    265,   -282,   1256,   1007,    231,
+       720,    417,   -401,  -4589,   -747,   -453,  -1112,     54,
+       156,   -561,   2746,   -422,    -83,    -91,   -381,   -270,
+     -1226,    987,   -965,    625,   -474,    565,   2890,    -85,
+      1291,   -280,    626,    -26,    840,   1122,  -1915,    780,
+      -702,    792,   -578,   -122,     -9,   1175,   -194,   -571,
+      2940,    540,     31,   1817,   -352,    264,    953,  -2035,
+       238,   3250,  -1561,    653,   -331,   -393,    827,   -382,
+       323,    281,  -1339,   -819,    545,    207,     14,    338,
+       432,    860,   1691,    142,    711,    381,  -1151,   4164,
+      -867,   -241,    111,   -513,   -863,     78,   1453,   -363,
+      -128,   -232,  -1853,   2373,  -1156,    210,    698,   1134,
+      -869,   -177,   -352,   1514,  -1370,   -789,  -1193,    819,
+       348,     80,    492,    179,   -909,    591,   -600,   -377,
+     -1709,     59,   -539,    557,    -45,   -362,    778,  -4919,
+      -647,    203,    865,   -313,   -257,    173,  -2415,   1005,
+     -1771,    843,   -474,   1619,   1193,   -186,    305,    636,
+      -662,   1976,    546,    -82,   -108,   -751,    850,    521,
+     -1625,  -3135,   -388,     64,    249,  -1189,  -1552,   2629,
+         2,   -221,   -105,    754,    251,    219,   -270,   -202,
+       545,    147,   1019,    108,  -1358,  -1317,   1362,  -1323,
+     -3322,   -405,   -371,   -554,   -334,    296,    493,    248,
+        -4,   1340,    123,   -584,   -804,   -766,   -164,   -470,
+       295,    218,     -3,     62,   -194,   -657,   5016,    280,
+        -4,    -69,   -281,   -994,    209,    307,   8648,    -37,
+      -138,     45,   -329,   -101,    -65,     98,     58,    714,
+        56,   -170,     60,   -203,   -248,    103,    107,   -408,
+       596,    170,     61,    584,    727,   -434,   -181,  -5116,
+      -502,    494,     52,     83,   -105,    325,     68,   -561,
+      -274,    371,  -1833,    -78,  -2990,    320,    141,   -748,
+      1764,   1157,   -538,   -276,  -1594,   -152,    838,    -45,
+      1137,     13,   -803,   -162,   -838,  -1199,   2003,    580,
+      3687,   -844,   -552,   -271,   -462,  -1034,    -29,    273,
+       862,    269,     95,    186,   -222,   -124,     79,    -34,
+      -684,    808,  -1061,   -916,    610,    539,   1289,    782,
+      1216,   3213,    -38,   -546,  -1209,   -398,     98,    -39,
+        58,  -1271,   -611,    573,    499,  -2170,   -157,   -943,
+      -595,    436,   1203,    487,  -1419,   -570,   1468,    711,
+      -589,   -101,   3299,    -45,  -1432,   -453,   1820,    677,
+      1052,  -1793,   1071,   -400,    268,   -464,    443,    508,
+      -273,   -736,   -233,    270,  -1187,  -1931,  -1208,   -519,
+      -879,    325,   1032,    280,    565,    294,   2588,   -303,
+       640,  -1398,   1070,    674,     57,   -165,    -46,    512,
+       757,  -3471,   -812,   -854,     45,    101,   3195,   -786,
+       -61,    122,  -1234,    -74,    119,   -389,    254,    -84,
+       829,   1465,   -930,    171,   -248,    201,    939,      1,
+        52,  -3517,  -1854,    147,   -843,    310,    502,    729,
+       191,    525,    333,   -669,  -3358,    215,    552,    156,
+     -1771,    982,   -746,    523,   -187,   -684,    456,    123,
+     -1544,   -145,     58,  -1083,  -1646,  -1309,    775,   1436,
+      1409,  -1114,   -171,     26,  -1775,   1103,   -392,  -2053,
+     -1221,    100,  -1120,     25,   -295,    306,   -105,   -514,
+     -4362,    156,  -2172,   -191,    -90,      7,    -62,    244,
+      -107,    521,    309,     22,   -663,    239,   -213,   -226,
+       100,   2228,   -330,   -197,  -1247,   -876,   1561,     -1,
+      -354,    439,   -163,   -318,    -61,  -1184,  -3022,   1434,
+        65,     87,    806,  -2093,   3016,   1022,   -779,   -391,
+       -18,  -1371,   -548,    910,   -910,   -438,    673,     48,
+      1028,    548,    153,   -337,    554,    353,   1686,    468,
+      -190,   -113,   -560,    542,     94,   -140,   -194,    -58,
+       165,   -154,   -311,   4744,   -148,     49,   -253,    180,
+       -65,   -125,   -139,    -49,   -115,   -270,    439,    139,
+       210,    202,   -207,    -65,   -477,    168,  -4720,    -96,
+     -1091,  -2071,   -567,  -1330,    237,    411,   -123,   1197,
+      2625,   1348,   -230,    362,   -147,   -139,   -699,   1210,
+      -299,     92,   2835,    -36,   -296,    287,   2426,  -1171,
+      -218,    884,   -320,   1130,  -1085,   1177,   -953,   -776,
+       609,    827,    -90,    131,  -2757,    567,    885,  -2359,
+       955,   -200,  -1883,    131,    282,    -80,    141,     -8,
+       -33,    333,    809,    357,    -13,    499,    597,    923,
+     -1725,  -1533,    465,    -93,   2187,   -841,    751,     74,
+     -2158,     99,  -1078,   -459,    648,   -258,    349,   -917,
+      1200,    374,  -1741,  -1013,    724,    -61,    182,   4032,
+      -581,   1123,   -400,   -459,   -443,   -316,      3,   -271,
+      -248,    -17,    595,    206,  -1188,   2869,   1338,   -253,
+       316,   -474,   1680,   -856,  -1487,    547,    679,    425,
+      -258,     92,     -4,    -24,    117,   -157,    385,   -257,
+      -332,  -5597,    -68,   -329,    -65,   -108,   -277,    202,
+      -400,    124,    -51,      5,     71,     90,   -927,    966,
+       780,    305,    703,    802,  -1661,  -1415,    -66,    437,
+      -610,    317,    795,    599,   -189,    322,   -519,  -4010,
+       729,   -620,  -2127,    351,    506,    -68,    162,   -983,
+      -288,   3167,   -140,    991,   -599,    128,   1868,     64,
+       -63,     -1,   2047,    155,   -871,   -130,    226,    508,
+       499,    882,   3762,   -383,    -23,      0,   -345,   -488,
+       167,    648,    395,    114,   1121,    343,    232,   -538,
+        15,    342,   -820,     38,    435,   -468,   -282,   -415,
+     -5021,   -293,    147,    533,   -128,    -70,    503,    844,
+       -86,   1836,  -2103,  -1143,    -70,   -510,    576,   -689,
+       410,  -2101,    433,    339,   -417,    820,    157,    173,
+       454,   -586,   1219,    -73,  -5123,    344,    397,     53,
+       105,    501,    -59,    515,    194,    356,     78,    706,
+       303,    332,   4532,    739,    961,   -521,   -392,     20,
+      -697,    823,    607,   -243,    332,    365,   -330,    307,
+       429,   -865,     -8,    545,     -3,   6041,   -310,    272,
+       464,     22,   -156,    142,    -63,    -87,    297,    -24,
+       562,     -9,    147,    341,    -21,    119,   1386,    947,
+     -1738,   -500,   -655,     95,     32,     32,    187,    518,
+      1330,     95,   -324,   3620,    737,    -54,     55,    670,
+     -1252,    995,    484,   1347,   -745,    244,    262,    -83,
+      -122,   1194,   -653,  -1111,   -327,   -325,   3579,   -214,
+       -37,   -412,   -267,   -377,    -62,    131,    360,    203,
+     -5713,    -42,     94,    279,    406,   -355,     34,   -144,
+       156,   -256,    -48,    -98,  -1392,   1273,    202,  -1249,
+     -3457,   -710,   1007,     37,  -1788,     86,   -570,    535,
+        17,   -369,   1640,    816,   -117,    128,   -969,  -1381,
+       224,   1519,   -996,   -833,    931,    185,    804,    465,
+        82,     69,   -247,   3312,   -430,    -23,    173,   -223,
+      3080,   1848,  -1187,  -1494,   -485,  -1131,    496,   -517,
+      -596,    320,   -853,  -1303,    240,   -298,    159,    527,
+      -257,    412,    839,  -1020,    706,  -3499,   -175,  -1089,
+      -717,   -325,    261,    310,  -1740,  -1035,   -403,   -229,
+      -861,   -970,    -62,   -192,    535,  -2154,   -364,  -1133,
+       979,  -3299,    353,    982,   -517,   1144,   -563,    675,
+       285,     63,     17,  -1957,     82,     28,   -513,    501,
+     -1183,   1476,   -813,   -254,  -1584,  -1181,   -426,    -56,
+      -916,    203,  -2693,    209,  -1066,  -1174,    279,    439,
+       201,   1179,    797,    407,    851,    927,    316,   -640,
+      1398,   -128,   2741,    563,  -1789,    989,    932,    247,
+         6,   -617,    268,   -691,   1112,   -569,    883,    298,
+        37,   -362,   -661,    -17,   -154,   -574,    721,   4578,
+       205,    507,     77,    -90,   -433,  -1613,    270,   -500,
+     -1061,   1634,   -388,   -432,   -648,  -1985,    629,   2887,
+      -201,    -32,    223,    621,    143,    446,   1384,   1109,
+       299,    329,  -1002,   -356,   1504,    -77,     49,    952,
+      4166,   -544,    -85,   -412,   -249,    474,     27,   -107,
+};
+
+static const int16_t cb0808s1[] = {
+      2632,   1511,    944,   -180,  -2377,     54,   -470,   -187,
+      -710,   -998,   -516,   -916,   -440,   -842,    285,     22,
+      -282,   -459,   -299,  -2769,  -2285,   -380,  -2194,    801,
+      -595,   -252,    504,    -69,   -752,    972,    639,    277,
+       502,    117,  -1072,   -145,   1462,   -528,   2165,    880,
+      -182,  -2953,    750,  -1090,    596,    105,    187,    555,
+      -153,   -113,    830,    161,    308,    -44,   -250,    -58,
+      -507,   -406,   -626,   1453,   1357,    116,   -456,   3242,
+      -607,     94,    390,    393,    114,   1069,     -2,      2,
+      2497,   1405,   -755,   1353,    192,   1288,   -187,    262,
+      1722,     91,    885,   -622,   -321,    246,  -1835,     17,
+       213,    -80,   -658,  -1940,    275,    845,   -365,    276,
+      2142,   -216,  -3402,   -646,    549,    -78,   -176,    -52,
+       785,  -1335,     44,    163,   -409,   1273,    679,   -377,
+       788,  -1355,  -1721,    332,    223,   1409,   -104,    165,
+       354,    322,   2414,  -1611,    216,     -6,   -232,  -1770,
+     -1931,   2496,   -530,    228,   -924,   -173,   -329,   -575,
+     -1709,   -900,    199,    223,    690,   -636,     73,   -367,
+       460,   -823,  -5105,    435,    957,    224,    246,    406,
+      -673,    752,    412,   -158,   -267,      4,    694,     10,
+       -45,    219,   1040,    778,  -1910,   1886,   -691,    674,
+      1085,   -537,    376,   1048,    858,   -161,    613,    376,
+       535,  -1349,  -1913,   -518,   -850,    665,    772,  -2985,
+       -66,    -42,   2142,   -848,  -1151,    237,   -211,   -161,
+     -2753,    603,    507,     39,   -575,    -61,  -1053,   -273,
+       290,   -258,   -162,    139,     95,    -12,   -201,   -236,
+       709,   -328,   -314,   -130,  -5337,    100,    -18,    -97,
+      -206,   1827,   1722,    302,    924,   -203,    761,   -715,
+       -24,    372,   -600,   2115,   1197,  -1406,    676,  -2068,
+      -167,   -221,   -936,   1419,    353,   -317,    245,  -2890,
+       623,    265,   -622,    204,   2549,    596,    239,    -25,
+      -672,    583,    117,    -13,  -2251,  -1325,   1984,   1431,
+     -1335,  -1268,    735,    245,    105,    593,   -193,   -614,
+       909,   -339,  -1033,    383,    102,    363,    732,   1439,
+      1028,   1275,    442,    987,  -3901,   -257,    -36,    224,
+      -116,   -402,    200,   -596,   -125,    372,   -572,    398,
+      -543,   1024,   1746,   -736,  -1056,  -1736,    953,   1026,
+      -965,    442,  -1565,   -448,    -96,   1498,     30,   -231,
+      -483,     73,  -3185,   1765,   1313,   -100,    477,   -198,
+       782,    316,    364,   -107,   -431,  -1795,   -244,    122,
+      -423,   -385,    457,   -872,   -535,  -1098,     80,   -110,
+      1420,    646,     33,  -3226,    648,    861,    328,  -1269,
+      -558,    495,    881,    112,    479,    170,   -309,   1904,
+     -1412,   -768,  -1220,    -34,    995,   -649,    162,      1,
+       153,    985,    762,   -263,   -188,     77,    760,  -2346,
+      3430,   -450,   1677,   1090,   1771,   2109,    -14,   -119,
+      -995,    268,    141,     33,     35,     31,    537,     65,
+      -345,     69,    192,    763,    -18,   1078,   3829,    274,
+       442,   -173,   -412,    434,   -695,    924,      2,   1551,
+       566,    -85,    217,    976,   2196,   -503,  -1401,    759,
+       922,  -3024,   -963,     -3,    600,   -452,   -193,   -787,
+         7,    186,    828,    515,    148,   -225,  -1250,   -985,
+       443,   -511,   2037,   1560,   3230,    647,   1418,   -165,
+      -261,   -369,    224,    450,   -100,   -271,   -122,   -511,
+      -691,  -1444,    906,   -144,    248,    452,    957,    -70,
+      -517,    116,  -3559,   -877,   -399,    418,  -1300,   -415,
+      -177,    770,  -2566,   -371,  -1673,  -1042,   -500,   -290,
+      -708,   -631,    193,   2494,    319,    545,    767,    102,
+       231,    -43,   -139,    -97,   -700,  -1592,    282,   1325,
+     -1419,   -647,    449,   1995,   -737,    661,   1617,    725,
+     -1464,    615,    906,    202,   -154,   -228,  -2194,   -231,
+       299,    110,   1318,   1053,   -312,    843,   -937,  -1697,
+      -592,  -1224,   -633,    -50,    792,   1600,  -1187,   -171,
+       211,   -744,   -306,    186,   1914,  -3119,   -904,   -159,
+       178,   -596,   -654,    817,     94,   -242,  -2376,   -218,
+      -421,   -365,   -699,    177,   -427,    -32,    265,    -33,
+       245,    -34,   5309,   -307,   -262,   -299,     86,    278,
+        33,   -200,   -180,    -56,    337,   1034,   -229,   4952,
+       306,   -609,    189,    -22,    280,   -160,   -507,    135,
+     -1265,   -252,    434,   -427,    158,   -546,   -130,  -2500,
+       597,    908,    918,    706,   1227,   3390,    995,    298,
+      -558,   1307,    765,   -144,    -37,   -286,    122,    215,
+     -1251,   1090,     85,   -914,    522,    316,   1829,   -701,
+      -365,  -3311,    312,     22,    680,  -1351,    220,    243,
+       166,    -36,    780,   2395,    -64,    836,   1037,    735,
+       966,    173,   1114,    192,    510,  -1054,   1341,   -616,
+      1559,    897,    338,     -3,   -194,   -214,   -573,   -265,
+       328,   -365,    433,   -505,    -86,     33,   -156,   -129,
+      -137,    119,    143,   5773,    -76,     68,    820,   1215,
+      1315,    713,     12,   1590,    131,   -193,   -881,   -227,
+       736,    581,    736,    -37,   -434,   -449,   -348,   4189,
+      2180,  -1360,  -1663,    -74,   1215,    278,   2092,    -66,
+       313,    388,  -1373,     25,    599,    888,    -87,    293,
+        30,    367,   1010,   -883,    818,   -910,  -1918,    864,
+       482,   -968,  -1249,    222,   1100,     23,    -87,   2493,
+      -248,   -622,    240,    151,    873,  -2735,   1325,   -700,
+      -411,    282,  -2361,  -1843,   -631,   -208,    103,   -411,
+       831,   -446,   -292,    450,    184,   -158,    484,  -1964,
+      4663,    123,     18,    174,    621,    158,   -788,    233,
+       302,    441,   -339,    200,    -62,   -197,     -9,   -236,
+       984,    584,   -521,   -373,   -205,    910,    392,    850,
+     -2968,     68,   -727,   1330,    578,     36,   -385,    754,
+      -538,    -36,    271,    418,   -548,   1775,  -1045,   -879,
+     -1407,    524,  -1085,  -1479,    371,     19,    873,    171,
+      2932,   -216,     42,     71,  -1187,   -570,   -524,    344,
+      -770,  -4086,   -735,   -515,   1055,   -551,    945,  -1408,
+       913,  -1005,   -222,   -443,     60,   -194,   -734,   1908,
+      -534,  -1351,     72,   -938,    -66,  -2756,   1313,   -169,
+     -1550,    450,   -610,    893,   1100,   -583,     87,   -145,
+      -210,    281,   1402,    674,      0,    -38,    874,   -363,
+      2436,   2156,  -1659,   -481,   -130,    -63,   -669,   -316,
+      -761,   -413,    108,   2362,    354,     76,  -1725,   -924,
+     -1443,   1251,    871,  -2058,    518,    955,   -283,    680,
+       -85,   -560,   -464,    127,   -216,  -1382,   1908,    238,
+      -182,    459,  -1227,   1144,   2266,    -96,    595,   -750,
+       912,   -198,   1786,  -1423,   -618,   -450,    185,  -1212,
+       706,   -689,   -154,   -365,   -681,  -1378,    914,  -1200,
+      -253,   -532,   3244,    444,      1,    -96,   -404,    -64,
+      -412,  -1400,  -2830,   -785,    940,   -217,    358,    618,
+       208,  -2974,   -365,    -32,    -63,   -233,   -868,   -413,
+       358,   -451,   1310,   -751,  -1329,  -2480,     63,    458,
+      -273,   1270,    316,     93,   -453,   -463,  -1258,    -57,
+     -1073,  -2037,     46,   -160,   4609,  -1193,    192,   -355,
+      -963,    -92,    752,    593,    102,    -80,   -121,    166,
+      -606,   -274,     28,    258,     45,    -45,    928,   -949,
+      -134,   -268,    -77,    242,   1623,  -1290,    739,    109,
+       285,    175,    -92,  -4053,   -482,    366,    217,   -126,
+      -843,    950,  -1068,    777,   1818,    550,   -891,    -34,
+      -995,   1976,   2677,   -764,     45,    -40,  -1800,    569,
+      -323,   -102,  -1064,   4000,   -109,   -423,   -289,    738,
+      -872,    808,   -977,    504,   -901,     41,    -45,   -287,
+      -140,   -444,    477,   -271,   -876,    301,  -2421,   1633,
+      -918,   -660,   -149,  -2542,   -503,   -265,   -107,   -623,
+      -447,   -782,   -858,   -535,   -220,    442,    661,   -209,
+       878,  -1601,   3610,    149,   -331,    190,    102,    270,
+      1451,    237,     13,  -1026,    178,   1290,   -281,   -217,
+        11,  -1728,   1043,  -2992,   -718,   -776,    357,   -615,
+      -231,    813,   -473,   1634,    539,   -513,    240,   1158,
+       144,     57,   1249,   1479,   -481,   -733,   1663,   -757,
+       641,    680,   -468,  -2697,    -29,    -62,   1253,   1142,
+       292,    245,    -96,    295,   -664,   -264,   -308,   -670,
+      -705,    155,  -4024,    330,    191,    -77,  -1502,    326,
+         9,    295,   -567,     34,   -104,   -123,   -320,   -255,
+      1124,    320,     98,   1299,   -436,   1491,   -341,    908,
+        11,      8,    988,  -1921,      5,  -1391,    859,  -1291,
+      -581,    546,    -95,    272,   -441,    185,   -256,    313,
+       466,   -393,    -50,   4430,   -940,     87,   -224,    390,
+      -539,   -290,  -1046,    531,  -2329,   1275,   -586,  -1046,
+     -1682,   1159,    908,   2023,    951,   -273,    -68,    713,
+      -556,    770,    783,    223,     60,   -881,    -97,    760,
+       556,   -237,   -263,   -246,   -240,    165,    526,    832,
+     -4761,    432,   -339,    186,    492,     81,   -136,   -827,
+      -390,  -1026,   -371,   -292,    937,   -243,   -136,      6,
+        49,   -223,   -600,   -355,   5306,    140,     34,    -84,
+};
+
+static const int16_t cb0808m0[] = {
+     -3555,   -106,   -131,    -53,   -156,    196,   -206,   -104,
+        18,  -2948,    122,    146,   -520,      2,    294,   -419,
+        -1,    -25,   -257,   9334,     87,    -55,    -42,     30,
+        92,     35,    195,     31,     59,     88,     47,     47,
+      -220,    564,  -1686,    426,    106,    396,     97,   1315,
+      2331,    167,  -1261,   1003,    732,   -300,   -342,    418,
+        87,    236,   -245,   2235,     11,    725,    -24,   -169,
+      -480,   2845,     96,    -34,     67,    857,     28,     50,
+        92,   2100,    -84,   -600,  -1990,  -2208,   -163,    299,
+       431,   -825,   -283,    299,    -98,    391,    -65,    -92,
+      -200,   -689,   2236,    -82,    -81,    -52,    127,     86,
+      -137,   -319,  -2561,    -90,    547,   -198,     10,    195,
+      -366,  -2688,    -77,   -234,   -112,   -245,    270,    199,
+      2674,    -57,   -673,     -9,   1029,    -31,    311,    -50,
+      -160,   -175,   2371,   2711,    409,    -19,     22,   -244,
+       312,   -158,    270,   -125,   -247,    118,    -91,   -602,
+        86,    174,   -216,     18,   3048,  -1953,    171,  -1985,
+      -297,    295,    -38,   -198,   -229,    363,    -13,    127,
+        13,   -202,   -117,     65,     74,     63,    125,    -62,
+        -2,   -543,   -680,  -4269,   -130,    325,    -49,   -245,
+       -50,   -509,   -151,    -19,      3,    152,   -980,   -129,
+      -234,    399,    349,    171,   -196,   4952,     -2,     36,
+       288,    771,   2313,    231,    -39,    572,  -3012,     77,
+      -501,   -215,   -228,   -444,    830,    200,   -188,   -157,
+      3248,    279,  -3319,      0,     76,     10,    160,    -80,
+       135,    102,   -349,    174,    -30,    -88,   -145,   -205,
+        10,   -185,    177,    -34,     25,     31,    218,     -4,
+       191,    172,    228,   -136,   -178,    268,    638,   3559,
+        55,    198,    145,    342,    -25,  -1940,   2866,   -334,
+      -921,   1941,   -464,    273,   -181,   -506,    -21,   -410,
+       116,   -179,    -49,   -273,    -22,    -36,  -1298,    274,
+     -1831,    321,   -382,    238,  -3464,    -68,   -194,     32,
+       -95,   -506,     72,     64,   -329,     19,    -39,    347,
+      -302,    204,    145,    -72,    855,   -112,  -3596,    989,
+     -2801,    386,  -2623,   -471,    101,   -155,    257,    291,
+        30,   -153,    185,    172,    511,     20,    166,    274,
+        29,  -3023,    129,     33,   -219,   -205,      6,     47,
+      -407,    137,    563,   -106,  -2065,     76,    201,    -99,
+      -170,    -77,    170,  -4536,   -440,    -96,   -940,  -1066,
+        81,    205,    358,    435,    -78,   -148,   -201,    -85,
+      -307,   -306,     14,    -47,   -101,   -187,   -136,    380,
+        -4,    -32,    -34,    -54,    528,    -58,   6389,    302,
+       -79,     52,    -28,    -65,    -77,    -12,   9024,   -100,
+       262,     20,    -67,    -31,     50,    -33,    -30,   -140,
+       326,  -1170,   -304,   -136,   -233,    170,     60,    314,
+      -166,   -208,   -105,   -245,   -169,    -72,    137,  -7173,
+        -2,    375,    152,    226,   -206,   -341,    303,     47,
+      1010,   -188,    577,   -292,  -3581,    -12,   -195,     20,
+      2165,   -206,    -88,    -83,   -132,    -40,   -443,    236,
+      -333,    179,   -211,    -56,    318,   -409,   3106,     95,
+     11636,    340,    204,   -323,    167,     76,     61,     65,
+      -157,     71,    -21,     38,     66,    391,    -52,     20,
+       -17,     11,    259,     45,   -194,    440,   3432,    122,
+       468,   -595,  -1856,     94,   -427,   -133,    149,   -273,
+        61,  -6622,     48,     97,   -162,     93,    402,   -104,
+      -207,     64,   -278,     92,    387,      3,     96,     -2,
+       -27,    -30,     84,     64,     35,    -65,     98,     85,
+       -16,   -248,   7930,     74,      4,   -104,     83,    -48,
+        40,  -2104,    -86,    -89,     99,   -142,     65,  -2713,
+        63,   -431,    523,    687,    212,  -1515,      3,     59,
+        55,     -6,     22,     -8,   -148,    180,     78,   7833,
+       -63,    -83,     13,   -187,   -116,    156,    -29,   -186,
+      -160,    148,    -82,   -303,   -166,    112,   -103,    -39,
+      -165,   2827,    -54,    -26,     24,  -3055,     78,     21,
+       128,    -81,    -25,   -122,     51,    -54,    -19,    188,
+       -18,     -1,   -140,    -18,  -8085,    124,    -46,     45,
+      -574,     12,   -150,    147,     65,   -209,   -396,   -444,
+     -3882,   -291,   -231,    296,    244,     76,    180,     36,
+     -2575,    659,    -63,   3277,    -85,     48,   -518,   -353,
+       130,     50,     13,    338,   -343,   -276,    -16,    353,
+     -6036,    -77,     18,    139,     43,    335,    294,     99,
+       219,    442,    -25,    -53,     40,    271,    175,   -282,
+       -91,    430,  -4428,    -15,  -2857,    -62,    -27,   -170,
+        33,   -681,   -110,    -76,    153,     42,   -134,   -145,
+       222,   -177,    -39,    314,   2270,    526,    500,   2417,
+       339,   1808,    -17,    464,   -525,    -97,    124,    -32,
+       370,     48,  -1675,    -62,   -169,   2642,   2511,    -43,
+     -1037,   -184,     54,   -569,   -504,   -247,    -40,    327,
+         7,     82,   -197,   2774,    -34,  -2931,   -204,   -112,
+       194,   -362,    187,     65,   -166,    115,   -125,     14,
+       210,    144,    -75,     57,   -255,   -151,  -3566,   -153,
+       182,     89,  -2530,     98,   -265,   -173,   -133,    260,
+       -25,  -1292,     35,    131,    -98,    -85,   -237,     82,
+      1353,     47,   3842,    148,    171,    183,    234,     89,
+       -93,     47,    102,     -4,     90,   2980,    289,   -231,
+       353,    497,   -109,    190,  -2869,    697,    136,     90,
+      -244,    298,   -119,   -519,    -50,    207,    -43,  -1376,
+       356,   1934,    701,  -2323,    671,     71,    -56,   -167,
+     -3793,  -3749,   -103,    134,   -228,    -13,     27,    -45,
+      -105,    172,    -77,    -23,     53,    110,   -118,    -80,
+      -164,   -192,   -563,    393,    -58,   -428,   -360,   3696,
+       162,   -173,   1683,   -430,    452,    -92,    107,    -41,
+        28,    -85,    421,    -66,    354,    -88,    723,   2751,
+     -2955,   -481,   -134,   -231,   -145,      3,     65,    -88,
+       189,    187,    151,    174,    -36,    240,   -253,   -235,
+      -194,  -5410,    -47,    -98,    338,   -487,    -81,    -35,
+       -82,   -440,     31,    109,    217,    276,  -1805,    278,
+       273,   -369,    629,   -293,   -525,  -3832,     73,    -56,
+      -363,   1709,    177,  -2813,    796,   -162,   -341,   1176,
+       -75,    533,    854,    719,    242,   -194,     90,   -147,
+       203,   -136,   -138,   -764,      6,  -2787,    -13,   1104,
+      1497,   1097,     90,   -867,   -718,   -317,    119,    180,
+       160,    257,   2532,   -557,    -62,     14,    665,   1520,
+       456,    826,    394,   -605,    908,    222,   -140,    121,
+       121,    232,    124,     96,    -87,     48,    -51,     41,
+     -7821,    -37,    130,    -11,    -33,   -137,     16,     42,
+      1509,     -8,    119,    -83,    -18,     64,     41,   -178,
+       -28,    182,    532,    678,    -75,    277,   -230,    -70,
+       -71,     -8,   -150,    321,  -6298,    -20,   -131,    -65,
+       139,   -215,   -155,    -27,   -110,   -257,     32,    201,
+       215,    184,   8932,   -106,    -50,     66,     15,    -44,
+       203,    -38,     19,    -78,     65,    135,   -123,    166,
+       117,     76,      4,     34,    -90,   5984,     59,    -72,
+       356,    -64,      6,    -62,     43,    -86,   -175,   -106,
+        10,     25,   3812,   -135,  -3313,    142,    348,   -101,
+       -35,    378,   -250,   -106,   -299,    237,     40,    -32,
+       236,   -521,     63,   -143,    538,   -256,     43,    -45,
+      1642,    726,  -3225,    109,   -997,      3,   -256,    -27,
+      -182,    -78,  -4092,     -9,    231,     34,      9,     -6,
+       155,   2842,     53,   -130,   -390,   -146,    168,    -74,
+     -2023,   -955,    576,   -629,    -76,     70,    140,   -287,
+      -401,    966,    359,   1185,   -226,    713,    753,   -739,
+     -4238,   3364,     75,   -213,     27,   -172,    -34,    171,
+      -118,    -46,   -164,    -13,    -54,   -203,   -154,    -12,
+        65,  -3777,  -3452,    297,   -104,    -93,    -81,     69,
+      -179,   -321,     51,     47,    242,    -15,   -144,    -43,
+      2827,     67,   -305,     54,  -3044,     57,    -15,   -427,
+       311,   -205,    226,   -490,     37,    363,    -88,   -408,
+};
+
+static const int16_t cb0808m1[] = {
+      3329,     59,    195,    -91,    -70,   3262,   -132,    360,
+       157,   -410,    184,    -99,   -138,    337,    289,    317,
+       156,   -589,   -127,   -204,     37,   -175,  -5661,    -52,
+       942,    156,     -1,   -197,    353,     90,     57,   -287,
+      -218,    438,     -4,   -262,      9,    322,   -167,   2904,
+       -12,  -2647,   -248,   -203,   -267,   -116,   -135,    333,
+      -220,   -200,     40,    228,   2677,   -462,   -183,   -129,
+      2898,   -728,    793,    422,    541,   -350,     28,    222,
+      2790,   -231,   -195,   -191,   3002,    182,   -610,    145,
+      -226,   -102,    285,    344,   -357,    217,   -146,    -98,
+        18,   -255,     96,   -151,    266,    208,   -459,   -132,
+      -345,   4059,   -371,     79,     44,    -63,   -233,    334,
+        44,   3884,     49,  -3303,     88,    -23,   -287,   -461,
+        57,     94,    -53,   -129,    104,    167,    -25,    -79,
+      -125,   -630,  -2352,    150,   -419,     40,    -63,    603,
+        67,    209,    321,  -1765,   -200,     68,    473,    622,
+         5,  -2883,    112,    188,   -189,  -2765,    169,    397,
+      -330,   -642,   -798,    129,   -110,   -164,    -20,    176,
+      -213,  -5415,     39,     31,     13,    270,   -477,    166,
+       167,      4,    216,    -12,   -528,    -75,   -291,    396,
+      -499,  -2011,   -172,   -265,     96,     83,   -279,    114,
+      -166,    833,     30,   2493,     94,    130,   -183,   -659,
+         1,   -227,     75,    349,  -2757,     82,   -116,      9,
+       952,   -112,  -2444,   -333,   -206,   -406,    201,     15,
+      -768,     88,   1390,    -33,   -558,     97,   -201,     29,
+      3470,     50,    -40,   -271,   -171,    -26,     47,    485,
+      -250,   3318,    112,    639,  -2911,    123,   -264,      3,
+         8,    379,     73,     54,     88,    227,     73,     58,
+      -572,    782,   -183,    305,     49,    -23,  -2968,    -41,
+       291,    -25,    157,    295,  -2118,    125,      5,   -193,
+      -159,   -543,    -75,   1181,   -191,   -547,    -93,    117,
+     -1831,    265,   -607,    -30,    194,  -3929,    -70,    159,
+        79,  -1519,     38,    201,     14,    -24,    -76,   -366,
+        14,  -2748,      0,   -372,    405,     39,   -170,    320,
+      -257,   2153,    -12,    158,    322,  -4013,     22,   -101,
+       217,    637,    273,   -430,    228,   -428,    102,   -356,
+      -266,     82,    -31,     14,   -223,  -2595,   -360,   2094,
+      -379,    624,   -192,    245,    294,   1484,   -117,    156,
+       -53,   3668,  -3573,   -118,   -213,    257,   -211,     66,
+       -62,   -173,   -166,   -123,    163,    -81,    -39,    -74,
+       -21,    126,    722,   -136,   2050,   -206,     86,    275,
+        76,   -249,     55,  -2508,     95,    -60,    -34,   -360,
+        -9,    187,     34,    -87,    -30,    137,     48,   4761,
+       109,    511,   -496,    104,    399,   -361,    162,     78,
+       -29,    159,   -112,    182,    246,     52,    255,    338,
+       -35,     -1,    -68,      5,    182,   7675,   -119,    -14,
+     -1901,   -111,   -106,     22,    -16,     81,    159,  -2423,
+       -71,    -24,   -153,   -520,    126,    370,   -186,    230,
+       -51,   -401,    206,    -32,     52,    -71,    -79,    503,
+      -239,   -231,     55,   -133,   5226,    -45,   -165,     57,
+      2314,   -209,    302,     78,    154,  -3092,   -605,   -498,
+       410,    159,    336,   -147,   -120,    143,     36,    587,
+      -182,   -182,   1457,   1008,   2524,   -446,   2333,   -497,
+      -761,   -162,    125,    420,    225,   -117,   -324,    437,
+       -50,    190,    129,    259,     33,     -2,     -9,     32,
+       -24,     91,     97,    201,     19,    169,   3535,    485,
+      -144,    330,   -193,  -2715,    603,    303,   1124,    107,
+     -1386,  -1437,   -203,    180,    -81,    303,    209,    -21,
+       -65,     26,     91,     98,  -1349,    196,   2103,    917,
+      -732,    834,   1456,    -92,   -455,   -130,   -732,   -288,
+        39,    -85,   -557,    -39,   3213,    297,    392,   -378,
+      -520,    795,  -2407,      6,      7,    406,    203,    -73,
+      -247,    317,  -3336,   3166,    206,    -36,    159,   -279,
+       442,     54,   -324,    -18,    544,   -250,    142,   -440,
+       100,   -145,  -3772,   -199,    139,   -156,    -11,     34,
+      -178,   -233,   -370,    601,    -58,   1679,   -170,     76,
+       684,    -35,    -73,    -52,    -33,     -3,    -89,     -5,
+       -82,     73,    -11,     51,    -48,    -12,   -376,   4348,
+      -203,   -432,    189,    -35,    144,     31,    181,   -106,
+     -5112,    552,    480,      0,     63,     31,     33,    504,
+      1055,  -3007,   -214,    154,   -100,    246,    269,   -423,
+       579,     63,   1668,   -296,    390,    109,     21,     -6,
+        71,   3321,    246,    197,    355,   -198,    472,    135,
+       437,  -1734,   1299,    227,   -618,    -48,   -199,    217,
+      -230,     70,     99,   2632,   -203,   3105,    -87,    149,
+       303,    124,    362,   -322,    -44,     38,    104,    -28,
+        48,   -175,   -468,   -410,  -4451,   -152,   2157,     26,
+      -281,   -581,     36,   -205,    101,    230,    192,   -129,
+       319,     20,     65,   4879,    123,   -236,   -178,   -128,
+      -387,   -124,    528,    142,   -775,   -301,    -88,   -380,
+       120,    -42,    -17,     64,  -1074,  -3350,   1335,  -1078,
+       -14,   -462,   -113,    253,    450,     36,     -8,   -346,
+       -54,     -7,     52,   -100,     74,   8266,   -193,    -36,
+       -51,     12,     59,    -68,    190,    -36,     89,     38,
+       -59,     13,    269,    109,    -15,   -141,    -64,    -60,
+       238,      6,  -4338,    381,   1252,    354,    -41,     41,
+       191,   -236,    122,  -2712,    352,   -117,   -121,   -284,
+      1516,    473,   -332,   -277,  -1792,   -335,     84,     64,
+      9595,   -246,   -278,    446,    -95,    -32,     60,   -146,
+       104,    -84,     -3,    107,   -116,   -377,    101,   -149,
+       -45,    364,    104,   -193,   -254,   2929,   -164,    -93,
+       324,    749,   -928,    435,   2357,    350,    -40,   -153,
+       -48,   -626,    390,    -48,  -4248,   -458,   -930,   -218,
+      -486,   1769,    335,    152,    165,    111,    118,   -407,
+       -87,   -373,   -333,   -134,     86,    -32,   -144,    -18,
+       -16,  -7549,   -146,     49,   -184,    116,    -28,    -51,
+       190,    115,     80,     68,    129,    206,    294,    331,
+       179,   -270,    174,   2444,     55,  -3271,     70,   -124,
+       228,    330,    -21,   -419,     62,   -140,  -2388,      7,
+     -2683,   -129,  -1050,   -548,    811,    189,    359,   -385,
+       -82,   9031,     95,     77,    -69,    164,    261,     61,
+       -73,    230,   -163,    141,    -38,    -43,   -150,    164,
+        28,    164,     59,    -58,   -312,   -134,    102,    -67,
+       166,   -163,     63,  -6795,   -103,   -147,     81,    273,
+       133,    122,   -162,   -207,    127,    -60,   4628,     -1,
+      1315,    518,   -163,   -246,     54,    239,    154,   -154,
+       265,   2000,     25,    227,     42,    179,     88,  -3446,
+      -214,    182,    438,     90,    196,    -69,    134,    -56,
+      -451,    716,  -1120,   -287,    118,    230,    -37,    145,
+       284,   -250,    139,   -947,    203,  -3176,    -57,    151,
+      3201,    818,    -87,    347,   -486,   -201,   1176,   -325,
+      -966,   -263,   -184,    238,   -156,   -396,    152,    959,
+       -59,    -33,   -159,     -3,   9394,   -119,    -81,    -50,
+        67,      9,     27,    -62,   -121,   -210,     48,   -211,
+         5,    396,    633,     34,    -16,     67,   -247,    -77,
+       128,    441,   3896,    251,    970,    119,   -387,    -35,
+       124,    -64,   -664,  -6550,    101,    -52,     19,     44,
+      -132,     79,    731,   -155,   -262,   -140,    -31,   -191,
+      -110,    276,   -162,    -49,     81,   -117,     15,   -570,
+       420,  -1232,   -125,   3737,    -95,    544,   -149,    463,
+      -129,   -345,    350,    183,    173,    197,    464,    180,
+      -249,   -365,   -785,     -9,  -3411,   -235,   -124,    225,
+     -4516,    196,   -150,    -89,    -89,     54,   -110,    137,
+      -431,    272,    -12,     -7,    114,   -201,    166,   1570,
+       -74,    -88,   6019,    350,    -75,     68,    -29,    -81,
+       -50,     57,    -62,    103,     61,    276,     22,   -131,
+      -134,  -3347,    -60,  -3397,   -311,   -105,     90,   -159,
+      -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,
+       270,     16,   3747,   -773,   3027,    224,     92,   -168,
+        -7,    -62,    -79,    -44,     -9,     -4,    -58,    -78,
+      1063,    203,     -2,     76,    289,    -36,     92,    -29,
+       -78,   -148,  -5176,    137,    219,    299,     89,   -233,
+        62,   -129,     33,    123,    -30,    197,   4018,    -37,
+       -38,    139,     41,    153,     71,    -26,     27,     53,
+        72,   3358,    -68,   -122,    293,    -19,   -355,    104,
+        34,   3121,     16,     29,   -344,     37,    174,    -28,
+       -43,   -102,    -59,  -1661,     14,      5,    -62,     -1,
+        14,     15,    -42,      4,    -31,     -2,     13,     23,
+       957,   -419,     20,     31,    -14,     51,     24,    -46,
+         8,    -16,     27,    -75,    -27,    -33,    -28,     18,
+       -67,   -152,    -48,     47,     90,     48,    -74,   -103,
+       -18,   4863,      3,    132,    414,    -86,    -60,    285,
+        16,     32,    -44,      0,     22,   -163,     23,     -3,
+        23,    -61,  13224,     52,   -139,    -13,    171,    215,
+       -51,    -21,    -48,     33,    -10,    -17,    -21,  -7662,
+       -57,    -44,    -51,     35,     35,     34,    105,    178,
+       -77,     77,    147,     67,   -816,   2913,  -3087,    516,
+      -112,   -296,     21,    133,    211,    162,     87,    -25,
+      -535,   -830,    -12,     46,    -59,    -10,     -4,     42,
+         0,    -91,     -9,     47,    -90,    -29,     74,    322,
+      -106,     83,     44,   4693,   -788,    -73,    -85,   -105,
+       -76,  -1031,     34,      6,     78,    -34,    160,    -48,
+      -707,    -12,     -9,     39,     14,     23,     88,  -2286,
+        21,    -25,     42,    130,     39,    251,     16,    -50,
+       397,   -226,  -2570,     88,   -129,   -347,    159,     92,
+         0,    -44,    -49,    235,   -196,    -24,    -36,    113,
+     13387,     45,     22,     54,    -20,     29,     27,    -27,
+        54,     38,    -63,    -12,    -74,     45,     -8,   -115,
+       591,     46,      5,   -234,     57,    124,     86,  -3794,
+       -51,    292,   -160,   -152,     96,   -334,    348,     96,
+      -186,  -3870,  -3715,     54,      0,    -29,    -65,    -68,
+         6,    132,     47,   -155,     62,     26,     66,    -10,
+       -46,  -3093,     66,   3633,    183,   -171,   -132,    -24,
+       154,    157,    129,   -185,     12,    -26,     96,    -12,
+        88,    -34,     42,    -15,     37,  -6625,    -27,     13,
+        41,    -30,     62,    142,    -93,   -168,     84,    -22,
+       139,    -19,     18,  10590,   -111,     36,     13,    -44,
+         4,    -45,     -3,     -3,     28,    -25,     -4,    115,
+       119,    -49,     41,     33,     87,    -85,  12444,     73,
+        71,   -111,     61,    -15,    117,     23,    -24,     -5,
+       131,    -31,     -1,    -22,    -57,    -12,     50,     35,
+     -1555,    -20,     38,     82,    -52,     27,   -128, -14106,
+       808,    190,     89,    595,     63,   -291,    282,    -48,
+        32,   -706,   -433,   -673,   3285,   1311,    830,   3745,
+      -204,  -1185,   -584,    -51,    952,   1005,   -566,   1764,
+       186,   1211,   -495,   -112,   1213,    192,   2320,    -43,
+       -30,     24,  -1152,      2,      2,     32,    -55,    -25,
+        -2,    -17,    -14,     -6,     22,    -54,     32,     45,
+        10,    -85,    -26,    -16,    -66,    -60,   -210,   -104,
+       208,   -248,     62,    -28, -14552,    -11,    -44,   1601,
+        47,   -138,     46,    -35,   2647,    -81,     -3,    -38,
+       -66,    -59,    -33,    -19,     43,    -17,    -79,     53,
+      1821,  -1572,   2582,     85,     48,   -140,     78,   -155,
+      -173,     96,    -32,    121,    -58,    201,   -174,    -54,
+        74,  -2442,   -282,   -771,     37,  -2930,     15,   1762,
+       154,    263,    -15,    -19,    139,    246,   -243,    -31,
+        84,    145,      8,    152,     43,    128,    679,   1828,
+      3476,     17,     92,    102,    258,    -29,   -275,    -39,
+      -187,     88,     70,     28,      2,   2143,    274,    202,
+       -67,    -13,    -22,     68,    -35,    135,    114,    108,
+        27,      1, -11248,   -100,     14,     26,     59,     10,
+       -24,     30,      1,    -38,     -9,     21,     18,     -1,
+      2029,    -83,   -342,   3443,    -25,      7,      0,     54,
+        78,    198,     45,    233,     -6,      0,   -109,   -172,
+     -2250,     41,    -79,   2820,     44,    216,     39,     59,
+       -41,     52,     79,    -52,     12,     23,    -72,   -125,
+        83,     17,    -28,    -32,     13,      2,     28,      0,
+       -26,     75,    -81,     66,     25,    -81,   6516,      9,
+       -93,     49,  -4036,  -2484,    -42,    -71,    178,     99,
+      -133,     79,    -41,   -112,     57,     66,    -28,     13,
+        39,     64,   -123,   3174,   3061,    259,     55,    123,
+      -123,    246,   -138,    139,     75,     31,   -215,   -154,
+      -218,     26,     16,     21,    126,     26,    -33,    -10,
+       -15,     16,    -20,    -53,     21,  15526,    -35,    -59,
+       -50,    -11,    -58,     67,    -11,    107,    -24,    -37,
+      8155,     31,   -111,    -62,    138,    -60,    -10,     84,
+      -128,     37,     24,    -45,    -10,    129,    -68,    -37,
+        42,    -80,   -205,    -79,   5994,    -93,   -270,   -400,
+        20,    -89,    -39,   -200,    230,    197,    325,   -305,
+      -294,     94,   3207,    128,   3119,    226,     28,    -49,
+       264,    186,      8,    -29,    -13,     27,     22,    -63,
+        43,     84,    -19,     57,  -2605,    316,    259,    -43,
+        50,  -2241,    105,    -12,    -23,    -36,     89,     41,
+       -15,    145,     10,    -81,      7,    -50,     70,     60,
+       -23,     55,    -62,      0,     52,    -77,    180,     74,
+        79, -14297,      6,     24,    299,   -107,      4,    -29,
+     -3252,    -51,     40,   -143,   3550,    -28,    102,     24,
+       215,    147,   -169,    -60,    -43,   -486,      5,     -1,
+        62,   -116,  -2917,    430,     50,   2927,    139,    127,
+        63,    -53,    141,   -255,    -85,     95,   -101,   -176,
+       195,    104,  -3066,    -56,   3239,   -161,   -214,     57,
+        24,   -375,   -181,      0,   -259,    130,   -120,     -2,
+        -6,    175,   -147,   -185,     68,    219,    425,   2685,
+     -3120,    266,    246,   -270,    -70,    273,    168,    121,
+      -143,   2641,   -553,   -547,    638,    113,   2965,   -161,
+        29,   -374,    105,   -869,    108,     70,     15,    230,
+       -54,   -106,    -21,     -4,     86,     85,    155,   -120,
+       -17,    -21,  -2534,     57,    149,   -129,     21,   -169,
+     -2289,   -127,    -19,    -26,      3,     60,     35,      1,
+       -28,     -7,     36,   -180,    -13,     87,    -68,     56,
+        80,     64,     -8,    -73,   6691,    -32,     47,     48,
+        -6,     61,     36,     -8,    -41,     -1,     13,     68,
+       140,    -51,     25,     12,      3,     57,    -54,    -33,
+       -19,     12,     28,    -60,    -56,  -2399,    -14,    127,
+      1935,     84,    127,   -193,     -3,   3307,    -56,     15,
+        31,   -116,   -187,    236,   -289,    261,     69,    144,
+      1723,     79,    -68,    102,    727,     69,    654,    -60,
+        21,    124,   3497,    248,   -684,   1469,    368,   -254,
+      -211,  -2600,    771,   -138,    368,   3089,     52,   -206,
+       147,    200,    -15,   -136,    194,   -164,   -352,   -152,
+     -4870,      5,    191,     -3,    -97,     28,    -41,    107,
+         2,     11,     60,    -76,    -35,    -42,    129,    -77,
+     -2610,   -295,   -218,   -369,     10,    253,     15,   -125,
+        74,    -87,    -70,   3366,    115,    240,   -106,    -93,
+       121,     10,     36,      9,    -18,    -66,    -77,      7,
+        37,    -76,    -22,   2913,    242,     22,    172,    102,
+       186,   -231,     90,    -11,    -57,     45,    -10,    -44,
+       -84,     44,   -117,    -43,     49,   5585,     18,   -166,
+       -43,     64,     28,     -9,     26,   -160,     31,    -28,
+        29,     56,     29,    -57,    109,    -25,   3140,   -131,
+        57,    -20,     27,    -27,     -5,    -42,    -52,     18,
+        23,    -56,    -38,    -14,    213,    -33,    -86,  -4741,
+      -151,    -46,      1,    -17,     46,      7,    -13,      0,
+        50,     28,    -57,  -7291,    -20,     12,     66,    214,
+};
+
+static const int16_t cb1616l1[] = {
+       -81,      5,    -16,     34,     19,  10938,    141,    -21,
+        27,   -105,   -110,     32,    -67,    -75,     19,   -138,
+         3,    -14,   -408,   -302,     36,  -4612,     23,   -579,
+       -35,     19,   -312,     35,    120,     97,     82,   -109,
+        41,  -1745,   -158,    299,  -3069,     84,     18,   -447,
+       -33,     65,    -32,     45,     -7,    144,     86,    100,
+     -1738,    250,   -226,   -137,    159,    -45,    134,    438,
+       102,     37,    -15,   -161,    -23,   4221,    174,     47,
+      -264,   -182,   -182,    686,   -248,     89,    -41,     80,
+     -2687,   -194,   2552,    407,  -1106,   -970,   -181,   -228,
+      4395,    118,   1027,   -255,    136,    100,    -43,    246,
+        80,     15,     34,     82,    -54,   -367,    698,    232,
+      -177,     45,    -67,     49,    138,   -158,    168,    202,
+        43,    -70,   -101,     20,    -97,  -3465,   -342,   -255,
+       127,     25,    -52,     -5,      7,     76,     -3,     19,
+       -19,     42,     10,    -63,     16,    121,    732,  -3127,
+       -43,    116,     36,  -2519,     23,     18,    181,     41,
+       -32,    -11,     22,     51,     35,     16,    -34,    -62,
+      1744,     94,    173,  -1243,   -262,     11,   3218,    239,
+       149,   -219,     29,    118,   -382,   -289,    -42,    161,
+        17,     -1,   2551,    -83,     90,   -128,    138,   3238,
+        43,    -29,   -112,    110,   -268,    293,     23,   -117,
+       -64,   -137,     79,    -70, -10747,    -66,     73,     90,
+        35,     90,    -29,    -78,   -111,     75,     48,      8,
+      -169,   2944,     16,     89,    186,    -34,     82,    241,
+       -46,    257,   -243,     93,   2966,    178,   -256,    -18,
+       -33,    103,   -320,   -271,   3088,   2893,   -250,    102,
+       696,    124,   -211,     18,   -143,     97,    216,    -99,
+       195,     40,    -35,    144,     26,    135,   -152,   -215,
+       120,     25,   -254,  -1875,    657,    197,  -3527,   -332,
+       310,    -11,   1958,    102,    -12,    -45,      2,   -127,
+         4,      1,    -19,     47,    -20,    -52,     97,    -30,
+     -7738,     51,     26,      5,    -21,     18,     15,     15,
+        66,     30,     -8,     -7,    -31,     -1,    -33,     38,
+       164,     90,   6798,    -33,    -90,    -17,     -5,     14,
+       -42,     21,    -20,    -41,     48,     -6,    -36,      6,
+      -207,  -4363,   5075,     31,      6,    100,     65,     86,
+        19,   -158,     28,   -134,    -91,    -68,      9,    -26,
+       -37,   2588,    307,   3467,   -451,    101,   -441,    323,
+        62,    188,   -132,   -294,     98,    -22,    152,    -46,
+        65,    -39,    -37,    -82,     -9,     18,     43,     17,
+         8,     56,     97, -11564,     21,     15,     75,     85,
+       155,     15,     32,      0,     20,    -45,   7412,     48,
+         3,     38,     72,     30,     23,     42,    -20,   -110,
+      -454,   -233,    653,   -325,   -276,    504,   -481,    583,
+       270,   -649,    481,  -3166,   1619,    164,    -90,    150,
+        32,    -96,    -47,     49,    -13,    115,   -183,     75,
+        62,  -9026,     12,    -93,   -715,      6,    137,   -338,
+       810,    -39,   -277,   -108,    -20,    315,    572,     -3,
+     -4570,   1053,   -132,     13,    388,   -223,   -355,     31,
+       -47,     61,   -113,      5,    -38,     43,    -47,    -80,
+      2550,     27,    247,    277,    -86,    336,    139,    146,
+      -111,    -73,    187,   -312,     68,   -276,     72,    638,
+        73,    792,   -170,   1383,    421,   -703,  -3813,    112,
+       391,   -195,   -162,    -28,    -25,    317,    228,    -83,
+      4611,    654,    353,   -380,   -283,   -627,   -301,    161,
+      -156,    -81,      5,    -15,    -13,    -17,     53,    -50,
+        36,    -66,  -7921,     -2,    -54,    -41,    -26,     47,
+        -3,     22,     -6,     11,     63,      2,     42,     71,
+       -50,    -87,    -39,      2,    -56,     -2,  11165,     44,
+      -119,    -74,    131,    134,      5,    115,    -39,    144,
+       -23,      0,    186,   4648,    351,     36,    -70,    -71,
+      1706,   2131,   -228,     42,      6,      8,      4,    -43,
+       -12,    -40,    -44,     -7,    -14,     11,     83,    -93,
+      -144,    186,    -46,     -9,     13,    -87,   -120,     70,
+      -209,    115,  -3513,    139,    -46,    133,     96,     25,
+       215,    -35,   -437,    126,    403,   -115,    145,    203,
+       -69,   -334,     37,    934,   -481,   3163,  -2528,    -49,
+        57,    100,     76,     82,    251,    288,   -114,     46,
+      -201,   -161,   -161,   -716,  -4080,    378,   -830,   -254,
+        12,  -2110,   -300,     78,    288,     48,    -90,    -99,
+       -31,   -110,    201,     66,    327,    119,   -180,    148,
+       633,     71,  -4100,     33,     57,     -9,    -48,    151,
+       -20,     72,     71,    -11,     39,    -67,    176,     27,
+       143,    198,    383,    155,   3182,   -128,   -152,  -3209,
+      -172,   -262,    -13,    129,   -167,   -128,     55,     46,
+       -37,     70,    107,      7,    -23,  -2082,    241,    236,
+       -47,    -85,    105,    -47,   -202,    208,    201,     30,
+      -106,    -14,    -38,     14,    -45,     24,    -24,  12083,
+        22,    151,    -58,     -9,     59,    170,    113,    -82,
+       369,   -155,     53,     97,   -185,    -57,    203,    311,
+       236,   4789,    -24,   -591,  -1463,    118,     94,   -274,
+      3188,   -145,   -406,    183,      0,    -54,     17,    -22,
+        37,    -55,    -34,     63,   -340,    175,   -300,    106,
+      -190,    -38,     67,     -2,     19,    -46,    -42,     11,
+       -33,    -33,    -28,    -10,    -27,  -9235,     29,     62,
+      -927,   1285,     49,     72,     65,     89,     57,    -44,
+        -9,    -15,     85,     -1,     74,     81,   -123,    160,
+        69,  -2803,    -22,     47,   -467,    -74,    748,    168,
+        -9,    235,  -3155,   -154,     48,    483,   -341,     74,
+      2403,     97,     93,   -106,    219,    136,   -191,    -50,
+         7,     71,   -103,    261,   3283,   -124,   -624,  -2570,
+        73,    -31,     10,    -73,     30,    -15,  -2256,     -2,
+       -73,     55,     73,     14,    -74,    -81,     38,    352,
+       108,    -18,     25,     61,     54,      1,     -5,    109,
+        25,  -2676,    -25,    -52,   -316,      2,     36,    -36,
+      -355,     40,    -19,    120,     27,     -4,    -51,     -8,
+        42,    -10,    -28,    -90,   -143,     29,    -10,  -8442,
+       -22,   -566,     59,    -39,     -1,     27,     29,    -20,
+         6,     19,      0,    -36,     38,     68,    -43,     35,
+        22,    -47,   -146,   3567,     13,     12,   3230,    -18,
+       -32,     75,   -112,     -8,   -157,    -23,    101,    165,
+       198,     93,    383,   1236,   1077,  -3592,  -1401,   1135,
+       844,   -266,    -74,    -70,   -280,    -98,     67,   -109,
+        38,  -5109,    -66,    -57,     89,    -21,      6,     19,
+       -21,     70,     60,     76,     35,     18,     44,     51,
+        45,     40,     54,  -6685,    -67,      9,    113,    -29,
+       -10,    -96,     80,     98,    103,    -40,     -8,    -20,
+      -131,     15,    262,     47,   -253,   -116,    -12,  -4807,
+         2,    -81,     76,    -46,     37,    353,   -130,   -191,
+      -127,    -10,    -35,     91,   -122,    173,   -165,     -8,
+    -15179,     86,   -186,    123,   -295,    -25,     21,     63,
+       -93,    730,     20,   -120,  -4624,    340,   -253,   -473,
+        44,    -18,    -99,    -37,    -54,   -317,     65,    -52,
+      2167,     68,   -245,    224,    117,   -180,  -4695,   -276,
+       118,    142,   -101,    202,   -301,    -33,   -129,   -303,
+       -90,    -75,     50,     98,    -56,    -68,   -153,    -38,
+       168,   -278,    -22,    -64,   9757,    -91,    -23,   1284,
+        53,     56,    -11,    -46,  -1645,     11,     15,     12,
+         8,    -40,     -2,     84,    -56,     17,     -7,    -30,
+     -4010,  -3557,   -252,     56,    -79,    -87,     -7,      8,
+        79,     16,     21,     51,    -63,    -22,    118,    228,
+     -1525,    -78,    -22,     -2,     16,    -49,     17,    -37,
+        -3,    -14,     10,     31,     17,   -111,     32,   -144,
+     -3612,   3473,     79,     23,    -89,     74,     33,    -29,
+        11,    -42,    -42,   -129,    -41,    155,     52,     31,
+      -162,  12609,    147,     17,     68,      2,     15,    -12,
+       -39,     50,   -108,    -66,    121,     69,    -27,     94,
+};
+
+static const int16_t cb1616s0[] = {
+      1213,  -1302,  -1130,     90,    -69,     22,   -360,    360,
+       -55,    453,   -705,   4416,    227,    173,     -8,    149,
+       210,   -118,     51,  -3759,    949,   2418,   -238,    201,
+      -597,     94,   -253,     24,    225,   -497,    -59,    273,
+       576,    651,    608,   -483,    335,   -125,    256,  -2873,
+       318,   -146,   -650,   -306,  -2021,   1044,     41,   -455,
+     -1120,    832,    978,    212,   -463,   -209,     12,   -275,
+       -20,    118,     31,    639,   5933,   -180,   -121,   -285,
+        65,    212,    439,   -135,    538,    116,   -302,   -245,
+      2534,   -623,   1549,    -34,    727,  -1750,   1477,     79,
+      1669,   -828,    618,   -856,    773,   -286,    343,    -94,
+       107,   -320,  -3144,   -380,    694,    -80,    843,    103,
+      -700,   -269,    452,  -6847,    -12,   -527,     97,    -21,
+       -76,   -246,      2,   -104,    -68,     98,    312,    117,
+      -342,   1025,    207,    838,    -71,   2463,     60,  -1294,
+      1549,  -1310,   -202,  -1585,    682,    327,    608,    649,
+       664,   -801,    588,    137,   -468,    286,    234,  -6726,
+      -107,    177,   -147,    278,    118,    -81,   -242,     97,
+      -235,   1599,   -877,   1985,    448,   -319,   -745,   -504,
+      -433,  -1859,    -35,    286,   -665,  -1449,   -124,    -97,
+       930,   2622,    682,    698,   1898,   1120,   -323,   -142,
+      -679,    294,   -162,   -539,  -1649,    152,     23,   -414,
+      1493,    602,    913,   1428,  -3212,   -103,   -330,    557,
+       463,     92,    251,    339,     16,    936,   -116,    229,
+      -827,   -504,   2015,   1553,   -503,   -350,    214,    386,
+       295,   2697,    429,     72,   -705,   -120,    427,   -139,
+      -334,   -318,  -6613,   -468,     10,   -122,     59,   -322,
+      -165,   -144,     45,   -427,    -12,    -79,   -202,   -266,
+       981,   -273,    240,   -454,    -30,   -119,    340,     92,
+      -251,    247,    189,     71,    243,  -5648,   -601,   -434,
+      -674,    867,   -713,   -428,   -101,   -231,   1144,    -89,
+       -10,     57,    302,    154,    362,   -425,   2014,   2577,
+     -8659,    389,    -90,     76,     15,    147,     30,   -202,
+       -99,   -255,   -242,   -165,    257,     97,     41,    -72,
+       263,    613,    272,    400,   5020,   -199,   -196,   -177,
+      -276,    -25,     28,     97,   -155,    119,    763,     33,
+     -3540,  -1447,     16,   -169,    148,   -143,    707,  -2483,
+       178,     83,    -83,    154,    -75,    -15,    153,    283,
+      -323,   -139,  -1390,     69,    725,  -1744,    331,  -3665,
+       415,   -514,   -366,    124,    660,   -295,    180,     77,
+      -228,    192,    684,   -193,      4,   4409,    298,    427,
+       591,    290,   -159,   -166,   -372,   -514,  -1840,   -562,
+       795,  -1765,   -349,   1178,  -1619,   -391,    615,   -784,
+      1353,    746,   -871,   -994,    182,   -464,   -498,    -96,
+      -306,   -729,    743,    270,    223,   -731,     73,   2692,
+      1110,  -2354,   -328,    -21,   -172,   -339,   -528,     93,
+      -338,    548,   1498,    309,   -134,    160,   -247,   -619,
+      1127,    783,  -1557,    400,   1035,   -445,   -155,  -2443,
+       590,   -790,    137,    388,   1188,    844,   -395,   1005,
+        55,   1141,   -122,  -3174,    138,    155,   -506,    306,
+     -3255,   2432,   -116,  -1289,   -744,   -350,      3,    192,
+      -156,     95,   -552,    -57,    329,   -405,    737,    138,
+      -835,   4096,  -1037,    797,   -417,   -418,   -507,   -694,
+      -256,     78,    -94,    -63,    -93,    754,   -555,    -90,
+     -1518,   -878,    167,   -392,   -100,    -78,    -80,    -45,
+      4774,    114,   -284,   -560,    -21,    275,     15,   -195,
+     -1692,   -711,  -1057,    167,  -1555,   -690,   -263,   -267,
+       310,   -229,    -14,   -880,    426,  -2826,    320,    -49,
+     -1223,   -725,   3538,   -270,   -606,  -1812,    481,   -703,
+       176,   -284,   -173,    271,    847,    711,    239,    314,
+      1233,    -61,    477,    429,   -691,   -156,   6712,    850,
+       365,    229,   -197,   -355,    298,    250,    207,   -437,
+     -1647,   -261,    165,    114,    165,   1165,    -58,   -597,
+     -3290,   -517,   -478,   -842,   -187,   -448,   -302,   -204,
+       410,    544,    669,  -2012,    476,    434,    214,    698,
+       302,    100,     61,     63,   -386,    918,   4434,   -230,
+       157,  -1019,  -1487,   2239,   -774,   -234,   -378,    772,
+      -190,    270,    -61,    -19,    322,    488,    937,  -3582,
+      -415,   2091,   1862,     81,   -134,   1285,  -2732,    221,
+      -235,    388,   -216,    -63,    664,   -105,    -37,    165,
+       899,   -373,    284,   -375,    286,   -263,   -295,    276,
+      -246,    188,   5285,   -303,    290,    -60,     -1,     95,
+      -703,   -288,     74,   -717,   -127,    -53,   -422,   -452,
+       166,    -54,    -15,    268,    238,    -31,   -279,  -5872,
+       863,   -907,   -101,    885,    552,    442,  -2336,  -2142,
+      -804,   -147,   -791,   1000,     96,    250,   -306,    134,
+       743,  -1648,   -867,    673,   1594,   3725,    527,   -676,
+      -661,    238,    262,    560,    277,    -58,    444,    166,
+     -1039,   -702,    558,   -970,  -1763,  -1198,    580,    378,
+      -421,   -972,    630,   -279,  -2456,  -1222,   -232,   -749,
+     -3325,    174,    789,    729,   -487,    583,   -157,   1503,
+      -801,    -38,    -11,    556,     81,   1508,   -140,     74,
+      1373,    912,   1471,      4,  -1080,   -105,    -58,   -104,
+       -54,   -544,  -2392,   1550,    318,   -506,    -11,   -180,
+     -1891,   -230,   -259,  -1182,   -154,    524,   -568,   1972,
+       546,    469,   -720,   1089,  -1530,   -680,   1349,    429,
+        82,  -1524,   1894,    -90,    188,   -145,     15,  -1113,
+        15,     53,    282,   2212,   -736,   -941,  -1148,   -344,
+      1473,    344,    392,   -333,   -556,   -480,  -3833,     35,
+      -160,   -525,    151,   -534,   -782,     38,    520,   -416,
+      -384,   7582,   -158,    -29,     74,    -57,    -23,     73,
+      -393,   -245,    -12,   -260,   -154,   -319,    357,    247,
+      -306,    351,    273,    755,    227,     89,    283,   -152,
+        17,   5129,    191,   -213,   -531,    255,   -468,   -209,
+      1128,     72,   -807,    225,   -319,   1638,     42,     20,
+       935,    -52,   -326,    541,  -1174,    130,    284,   -112,
+       444,   3959,    262,   -631,   -262,    275,   1025,    190,
+      1125,   -265,    -95,    265,     35,    270,    -92,    -30,
+      -141,    325,   -435,     45,   -659,    149,   3648,    339,
+     -1701,  -1338,   -144,   -989,   -604,     84,   -394,    168,
+      -302,  -1294,   -433,   -921,   1271,     77,    374,   -604,
+      -230,     97,    206,   -138,   2909,    478,    707,      0,
+      1242,   -340,  -1659,    349,   2751,  -1175,   -146,   1038,
+        65,   -775,   -423,     14,     22,     41,   -905,    287,
+       280,   -933,    195,  -1817,    540,  -2374,   -661,  -1102,
+       879,   1232,     29,  -1683,    286,   -136,    658,   -395,
+     -1782,  -2823,   -624,   -223,   -299,   2859,   -103,    -45,
+       544,     82,    -21,   -263,   -666,   -362,   -732,    249,
+      1087,   -242,     30,    663,   -386,   -350,   1240,   -492,
+      -868,     69,    -41,     35,     30,  -1791,   3870,   -455,
+      1355,   1098,   2933,    347,    361,     79,   2855,    -26,
+       -66,   -598,    -43,     21,   -386,   -802,    -81,   -436,
+       846,   -673,    377,   -326,  -1217,   1465,   -480,   -205,
+     -2168,  -1689,    690,    355,   1192,    734,   -113,     39,
+      -486,   -644,    438,   1096,   -723,   -524,  -1634,   -621,
+      -394,    226,    167,   -625,   -709,    854,   3005,   -910,
+        13,   -793,  -1517,  -1254,     18,   -440,   -836,    651,
+       -31,    229,  -1081,   -126,   -191,  -3612,    487,    451,
+      -292,    943,  -2018,   -618,   -259,   -649,   -723,   -447,
+      -238,   1096,  -2228,    675,    563,   -316,  -1248,     32,
+       -28,    293,  -1817,    226,    267,   1291,    624,  -2279,
+       143,    650,      5,   -563,   -504,  -2124,    -94,  -1613,
+     -3050,    708,  -3458,    442,     30,     65,    -80,     89,
+       204,   -245,     94,     28,     -2,   -231,    623,   -189,
+      -405,  -2147,   1147,   3124,    806,   1048,   1145,    653,
+        47,     86,     -4,     46,    437,    229,   -190,    310,
+      1995,    -48,  -1015,  -1806,   -266,   -941,    361,    179,
+       172,    397,    182,    323,   -516,   3435,      7,     -5,
+};
+
+static const int16_t cb1616s1[] = {
+     -2521,   -518,   1830,    985,   -500,    109,   -807,   -197,
+       543,  -1036,    104,   1989,    428,    740,   1110,   -366,
+      1482,    899,  -1828,    159,  -3015,   -311,   -792,    -42,
+         3,   -412,   -157,    -13,    863,   -248,    261,   -187,
+      -409,    156,    772,    271,    318,   -262,     78,   -571,
+        28,    370,    119,    302,  -4794,    106,   -123,   -153,
+      1857,   -702,   1090,   -319,    415,   -327,   2124,   -170,
+      -411,    174,     62,     -7,    921,   -128,    735,   -127,
+       972,   1678,    166,  -1471,   -208,   -224,    871,   -900,
+      -223,   -817,    288,   -472,     10,     31,   -401,  -3201,
+     -1290,     -3,   -301,    183,    730,    473,    438,    -81,
+       882,    -64,   2898,   -242,    408,   -211,   -333,   -254,
+      -820,    612,  -1128,    -60,    -73,  -2516,     45,    637,
+      -130,    459,   -312,   -223,   -629,   1490,   1792,   -199,
+       -21,   -545,   1772,  -1084,   -173,    381,    380,   1289,
+      -117,    483,    138,  -1200,   -519,    598,  -3453,    349,
+     -3102,   1260,   -170,    238,   -684,     48,   -483,   -883,
+      -879,    139,    298,   -110,   -203,   -955,    195,     57,
+      -550,   1945,   -711,   -688,  -1470,   1527,     58,    317,
+       656,    310,     57,    162,   2006,   1387,    845,   -127,
+      -398,    318,   2520,   2002,   -906,   -323,   -194,    907,
+       588,   -228,   -357,   -316,    557,   -596,  -1559,     -3,
+      1614,   1317,  -1701,    936,    -89,  -2270,   1327,   1046,
+       400,   -233,     18,   -730,    -23,   -181,   -593,     74,
+      -570,   -969,    432,   -261,   -833,    -90,  -4675,    786,
+      -566,   -183,   -859,   -554,    346,   -493,   -201,   -220,
+       241,   -919,  -1896,    265,   -802,   1380,   -718,  -1103,
+      -574,    307,    138,  -1260,    175,   2540,    -82,     58,
+      1046,  -1381,   2486,    582,    455,    485,   -824,   -150,
+        57,    -45,   -155,   -490,  -1108,  -2191,    833,    423,
+     -2011,    267,    779,    140,    -28,     57,     94,      6,
+      -301,      5,   -833,  -1226,   -193,   1110,    -63,     79,
+      -492,  -1465,  -2733,    444,     56,  -1116,   -601,     20,
+      -618,  -1315,   -695,   1146,    -66,    336,   -166,    158,
+       530,    -53,   -371,   -594,   -685,    114,   -146,    373,
+       174,     -1,     47,    119,   -124,   -121,  -6697,    -94,
+     -3544,   1506,   1221,   -101,   2160,    558,   -254,   -728,
+       511,    378,   -383,     12,    626,    172,    183,    354,
+        49,   1669,   1188,   3810,    409,    152,    694,  -2520,
+       342,     61,    -85,    -38,   -170,      5,    305,    154,
+      -348,    699,    332,   2542,    673,  -1130,  -2601,    554,
+      1483,    466,    271,    490,   -644,    822,    -96,    477,
+       131,  -2051,   -111,     43,    -31,    -62,   -767,  -3257,
+       663,    488,   1823,    522,   -525,   -249,    481,     -7,
+     -1298,   -941,   -335,   -566,    305,    534,   -735,    207,
+       709,  -3170,     19,    -20,  -1888,    271,  -1697,    117,
+      1837,   2690,    305,   -483,   -463,    407,   -706,    467,
+       518,   1806,    244,    -80,   -453,   -505,    882,    843,
+      1328,   -280,    175,    319,   -842,    192,   -680,   -469,
+      5440,   -205,   -187,     53,    332,    204,   -184,     96,
+      1026,   -525,     20,    975,    125,  -1562,  -1873,   -757,
+      -137,    133,    -10,   -340,   -783,  -1484,  -2206,   1238,
+     -5212,   -466,    129,   -224,     17,    497,    -41,    846,
+        88,    -41,    285,    284,   -155,     21,   -225,    150,
+       223,   -807,   -444,  -1141,   -908,    292,   -326,    559,
+      -446,   -283,    -41,   -277,  -3479,   -667,    532,     83,
+       257,    383,  -2986,   1685,    697,    777,   1551,   -142,
+      1786,    579,   -531,    787,    712,   -984,    603,   -174,
+      -459,   1303,   -943,    741,   1103,    -73,    600,   -403,
+       -42,   -169,    -90,    220,    208,    105,  -4083,  -1069,
+       981,   -926,    124,    273,   -145,   -133,    307,   4720,
+       209,    324,    -79,     12,    -41,   -220,    211,   -184,
+       435,    307,  -1544,     83,   1565,   -445,   -217,   -648,
+      -379,  -1270,  -1590,  -2337,   -860,    348,    648,   -157,
+      -785,   3318,   -123,   -138,   -412,   -876,    358,   -173,
+      -280,    -81,   -149,   -167,   -160,  -2113,     20,    -40,
+      1022,    432,   -721,     55,   -651,     17,  -1135,   -380,
+      -542,  -1128,   2919,   -475,   -143,    -53,    176,   -152,
+         7,    -29,   -172,    174,    195,  -8005,    277,    105,
+        35,    115,   -314,    137,   -253,     75,   -278,     90,
+     -1508,     79,   -153,   -560,   1027,   -349,   -292,   -466,
+     -1101,   -324,    -84,   4251,    822,   -420,     55,     43,
+      1886,    281,    964,   2408,    425,   1187,    -27,    -84,
+     -1277,     63,   -978,   -143,    506,    727,   -155,   -384,
+      3434,    592,   -262,   -438,    -30,   2849,    -69,    -58,
+      -181,    -87,     20,    299,    412,   -263,    702,    131,
+      -271,    -10,    736,    121,  -6299,   -132,   -116,     26,
+      -253,   -586,     32,   -145,   -251,    -12,    471,    135,
+       585,    604,     29,    873,    363,     -2,  -1595,     41,
+     -1147,   -142,    665,  -2752,   1302,   -358,   -134,     29,
+      -691,    -12,   -702,   -459,    100,    278,      9,     54,
+        66,   -458,     53,    213,    193,     14,   -400,   4870,
+      -950,   -209,     50,    470,    449,      3,   -118,   2287,
+      -469,    -58,    126,   1011,   -826,    386,  -1019,  -2390,
+      -586,  -1401,    137,    760,    141,    -89,    117,   -252,
+      3106,   -936,   -198,    390,    463,   -245,   -509,   -123,
+      3057,   1200,   3451,    282,   -332,   -585,   -662,   -955,
+       165,   -276,     73,    373,    202,    506,    356,    125,
+       141,   -613,   -670,    446,   2031,   1521,   -446,   1339,
+       198,   -112,    214,     70,    265,  -1310,   2492,   -133,
+     -1880,   -347,   -961,    312,  -3714,   -475,    102,    391,
+        64,   1091,   -686,   -101,    144,    447,    173,     66,
+      -374,    342,     69,  -3379,  -1331,   1160,   -889,   -858,
+       982,  -1613,   -223,     57,    186,    428,    226,   -477,
+       449,  -1052,   -661,   -382,    459,    277,   -277,   -250,
+        12,   4077,   -260,   -161,   -163,     38,    159,    243,
+       131,    457,  -2253,   -301,  -1626,     37,    806,    104,
+       191,   1899,    346,    398,  -1108,   -623,   -391,   1092,
+      1252,   1126,     81,   -116,   1192,    674,  -1321,    -32,
+      1739,   -708,   -230,   -844,   -507,    415,    261,    211,
+      -619,   -191,   5460,      8,    139,    197,    392,   -556,
+      -215,     66,     64,   -808,      0,   -136,    151,    156,
+       260,     94,    418,  -1446,   1815,   -540,   -793,    451,
+      -477,   1788,   -124,    330,   1638,    342,   -503,   -384,
+     -1201,   -762,    929,  -2886,    888,    -63,    318,    598,
+        42,  -1226,   -400,   -462,   -136,    321,   1872,    376,
+      1260,    142,    -79,   4377,      9,    294,    -71,   -190,
+       -21,  -2612,   -240,     26,    -18,   -227,    864,     79,
+      2588,   -882,     87,  -2976,      9,    480,  -1573,   -170,
+      -429,    201,   -124,    171,    632,    -60,   -447,     64,
+       -37,  -1182,    -86,   -105,   2901,  -3557,   -134,    486,
+       141,   -259,    239,    465,    467,   1009,   -409,     34,
+       254,   2469,   1002,    834,    557,   -845,    149,   -747,
+      -504,    494,   1382,   1067,    353,    191,  -1105,   1705,
+      -586,   1472,   -444,  -1303,    198,    602,    471,    468,
+      4855,    127,   -141,    487,   -454,   -138,   -392,   -118,
+      -491,   -948,     58,   -290,     -7,   -662,    229,   -268,
+        -2,   -537,   -620,  -4770,   1152,   -173,    166,    -69,
+        32,  -2555,    433,   -583,  -2219,   1107,   1082,   -942,
+      -173,    399,   -601,    250,    423,    125,   -448,    352,
+      -571,   -406,      0,   4735,   -264,   -174,  -1020,   1105,
+     -1149,   -171,   -252,   -130,   -202,    -74,    601,    601,
+       570,  -2742,  -1403,   3129,   -349,    194,    309,    130,
+       261,     93,    154,   -117,   -418,   -657,    270,   -160,
+      1660,   -818,    613,  -1458,   -653,  -3763,   -232,     90,
+      -265,    -99,    -28,    -13,   -281,   -553,     11,   -142,
+     -1764,  -4548,    936,    -21,   -683,    -88,   -806,   -187,
+        28,     78,    -70,    -99,     -2,   -493,    -16,     48,
+};
+
+static const int16_t cb1616m0[] = {
+     -3821,  -3397,    203,    -25,    -22,     68,    189,    -13,
+      -286,     94,     18,    288,     29,     -5,      3,   -414,
+      1483,   -172,  -1275,   -180,  -3792,    360,    145,   -143,
+       444,   -139,   -198,     70,    -17,   -353,   -121,     -6,
+        76,    -50,   2987,    173,  -3070,   -229,    -16,    192,
+       134,    -55,    -86,   -200,    128,  -2052,    -59,    -11,
+        -4,    309,    179,    494,   -138,   -363,   -336,    119,
+      -127,   2497,   -169,   -316,    -87,   -538,     42,   -534,
+       315,   2364,     61,    269,    -87,    -94,     82,  -2069,
+        18,   1238,     -7,     79,     -9,     41,     70,     50,
+       209,   -158,   -136,     28,   -275,     62,    296,     77,
+      6269,   -184,     73,    -19,    -25,    -57,    134,    -52,
+      8569,   -176,     -8,     17,     15,     79,     36,   -137,
+        12,     44,   -270,   2335,    111,    517,    -83,    207,
+      -276,   2577,   -198,     83,    376,    -75,   -273,     62,
+       109,      4,    -48,    122,    -41,     99,    -87,     14,
+     -7696,   -118,    -66,    171,     96,    -31,    123,   -217,
+      -676,   -439,    407,     97,   -281,   1873,    626,   -148,
+      -548,   1634,    704,     97,  -2076,   -336,    632,   -371,
+       113,    544,    -88,    184,  -2200,   -420,   -592,   -168,
+       759,    291,   2215,    704,   -140,   -145,  -4088,    295,
+       186,   -270,    283,    294,    -42,     76,     69,     41,
+      -140,   1635,   -200,   -682,    302,   -192,    902,   -540,
+      -843,   -494,   -529,    102,   -759,   -165,   3160,   -180,
+     -1450,   -424,    -16,      6,   -548,    296,  -3056,    219,
+     -1883,   -109,   -566,   -431,     95,   -422,   -532,    -26,
+       120,    -46,     23,    174,    175,   -369,    110,     -2,
+        25,    132,     -1,  -3338,    -67,   2140,    -25,    566,
+      -129,     35,   1187,    337,   1999,   2712,    -71,     45,
+      -177,     94,   -321,   -197,   -573,     98,    225,     46,
+        53,     78,    -40,     82,     23,   2718,   2534,     89,
+       -65,     77,    206,    343,    527,    102,   -191,     94,
+       463,    111,  -4529,     97,    876,   -205,   -944,    181,
+      -132,    467,    366,     85,   -302,   -100,    -33,    -76,
+     -3087,  -2546,    215,    277,    -52,    352,    137,    -45,
+       162,    590,    406,    382,     85,  -2824,    141,    219,
+     -3790,     40,    126,     32,     30,    100,    121,   -210,
+       196,   -268,    178,    102,   1229,    -80,   -750,    -11,
+       -57,     84,    238,   3571,    274,   -254,     55,  -1616,
+      -176,   -755,     46,  -1306,   -201,   -228,    101,    197,
+       -93,   -156,    319,     82,   -385,    -17,  -4660,    180,
+      1278,   -113,   -215,    103,    832,   -233,    412,    249,
+      -900,   -132,  -3427,     52,    416,    267,    317,   -384,
+       130,     78,     91,   -360,     75,    386,   2219,   -360,
+     -2975,     17,    286,   -294,   -213,    231,    131,    821,
+      -358,    222,   -230,    -44,    -93,  -1151,    294,   -316,
+        -8,    129,    231,   -993,    -58,   3319,     48,  -2546,
+      -213,    -14,   3208,    162,   -240,   -176,    307,   -165,
+       -20,    348,   -113,    -78,    -91,     -8,   -261,   8033,
+      -179,     64,     -7,   -113,    -59,    -32,   -170,     52,
+        55,    -80,    140,     64,    -39,    915,     28,    416,
+        38,  -2328,    206,    115,    366,    -92,    652,    110,
+     -2838,    -59,    613,     23,    109,   -151,   -198,    185,
+      3033,   -122,   2863,   -273,     86,     41,    114,    -99,
+       315,    372,     14,   2191,   -171,    531,    -18,    -34,
+      -352,    130,   -360,    117,  -2896,      2,   -564,     51,
+       223,     57,   -257,   3161,   3130,   -384,    126,    -40,
+      -160,   -232,   -138,     81,    -34,    -96,     82,      9,
+        62,   -161,    344,    100,    790,   -243,   -344,   -393,
+      -531,    401,     90,    171,    144,   -329,      7,  -4639,
+      -135,     -6,    351,    -21,   -195,    224,    -25,   6027,
+       224,    -14,    344,    170,   -169,    -97,    252,   -488,
+      -379,    -73,    629,     -9,    266,    152,    -64,    330,
+        -8,   2080,    -91,  -3315,    229,     25,     45,   -528,
+      -123,   2951,     40,    -85,     -4,  -2695,    -38,   -112,
+        84,    -30,     79,    762,    151,  -4089,    -95,   -151,
+         9,    138,   -206,     -3,  -2114,     99,   -100,    116,
+      -403,    -56,     -8,    -36,    115,    -18,   -195,    -38,
+      -240,      8,    -32,    122,    125,  -7406,     45,   -210,
+       111,   -152,   -152,    -35,    -72,     28,   -154,    303,
+     -3147,    459,  -2881,    -14,    -13,    -56,   -126,    -69,
+      -213,    -97,    202,    -88,   -277,   -557,    451,   -376,
+       -91,    319,    141,   2728,     23,   2506,   -101,    632,
+        62,   -314,    159,     44,   1231,    -65,    -37,    192,
+      3118,   -186,   -396,   -108,     71,   2111,    586,     95,
+        15,    -28,    176,     20,    -67,      3,   -265,    101,
+      -182,    -21,   -455,    -15,  -6225,    -45,   -353,   -384,
+       -22,    113,    -40,    -47,     57,    -73,   -503,    134,
+       736,    -70,   -125,     -5,   -250,     62,    165,    182,
+       185,   -132,    426,   -276,    100,   -497,    -23,     81,
+      -112,  -3528,  -1997,   -234,   -154,    -91,   -125,    -26,
+       179,   -611,    655,    767,  -1064,    130,   -264,    107,
+      2811,  -1391,    298,    -20,     37,    -74,    -12,   -157,
+      -270,   -106,   2559,    -89,  -3107,     55,    187,   -265,
+       195,    140,      1,   -484,    713,    171,  -1123,   -226,
+      3666,   -367,   -516,   -249,     38,    195,    236,   -378,
+      -383,   -205,    -72,     -7,     15,  -9329,     -6,    -26,
+        56,    141,     48,      6,   -141,    -95,    -69,    -40,
+       -99,    -80,     73,   -253,    456,   -174,     51,   -250,
+       -48,  -2115,    -63,  -2555,    -25,  -2058,    -58,     66,
+       176,     14, -10053,    -23,    -39,    -37,    -15,     38,
+        82,     11,     97,    169,      5,    -67,     57,     61,
+     -2248,    108,    -19,    256,   -169,   -122,   -336,   -431,
+       -77,   -250,   -156,   -745,    184,    684,  10559,   -199,
+       -34,    -37,     96,    -82,    -17,     60,     65,     21,
+       -67,   -337,     62,     35,     74,   -214,     38,     47,
+      -129,   6139,   -139,    -57,   -154,    261,      7,   -127,
+       109,     40,    179,    -99,    198,    -51,     48,    -36,
+     -2377,   -194,   -334,  -2826,    103,   -220,    -57,     41,
+       979,   -895,     68,   -217,  -1712,   -430,    -98,     91,
+      -107,  -1755,   2615,     84,   -500,    231,    480,    -31,
+       146,   -157,   -120,    152,   2342,    -36,  -1969,     57,
+      -109,    476,   -243,    261,    -58,   1998,      4,   1388,
+       -98,     45,   -140,    400,    -76,   -321,    -22,     -9,
+       210,    517,      5,  -4708,     66,   -330,   -405,    -19,
+      2158,    -65,  -2163,    244,    -16,   -192,    494,   -381,
+      -194,    413,     89,    220,    455,    -54,      4,    206,
+       221,  -4998,     63,   -365,    354,    364,    677,    207,
+       -66,    -27,   -477,   -182,    841,     85,    -40,    166,
+      -185,    321,   -293,   -181,   -429,   -231,   1401,   -122,
+       938,     67,   -185,     51,   3188,   -802,    421,  -3230,
+      1432,   -432,   -658,   -587,   -843,    421,    177,    446,
+       510,   -140,    -90,   -127,    -78,      2,   1089,   -185,
+       301,   -393,   4100,   -152,    265,    224,     25,     95,
+       534,    280,   -254,    -45,     -5,   -207,     49,   -126,
+      8922,     43,      9,     21,     28,     21,    -42,    -84,
+        38,     90,  -2014,     61,   -149,    188,  -3350,   -120,
+       -43,     10,     14,    155,   -225,   -351,   -114,     28,
+       -23,  -4400,    367,    -51,     76,    -89,   -113,    122,
+      2007,     25,   -348,   -227,   -370,    -61,    135,    -79,
+};
+
+static const int16_t cb1616m1[] = {
+      -321,     -7,  -6725,    -36,     77,    -20,   -101,   -529,
+      -166,     97,    -76,   -232,    -70,     16,     13,     93,
+       -50,    222,   -258,  -4424,   -125,    125,     83,    313,
+      -246,   -325,    108,   -331,    484,   -188,    192,   -964,
+      2603,    -38,  -2236,     58,    337,   -254,    -17,    -90,
+       -88,     40,   -141,  -1293,    -56,   -811,    247,    -78,
+       -34,    144,    112,     43,    142,   -137,   -147,     56,
+      -406,     12,    210,    132,   3707,    109,   -896,   -268,
+     -2295,   -509,     32,   -219,    113,   -104,    141,    273,
+        18,   -358,     16,  -3354,   3474,   -167,    220,     10,
+       104,   -175,     -8,    -71,    -77,    -48,    277,     82,
+        86,     35,   -712,    -32,     36,    -65,    213,    121,
+       -76,   -742,    291,  -4587,   -169,   -122,    -77,   -285,
+        54,   -120,     89,     71,     12,   -133,     54,   -215,
+     -1906,   -115,   3220,   -194,   -391,     87,    415,   -212,
+      -210,   -138,    182,    590,    713,    944,    320,    142,
+     -1970,    197,    -79,   -548,    458,   2836,     33,    -62,
+      -183,   -149,   -640,    147,   -427,   -113,   -178,  -1631,
+      -108,   2666,    -58,   2210,   -251,    288,     16,    382,
+      2123,    636,     -4,   1118,    232,    335,    -33,   -114,
+        24,    -68,   1309,    -38,   2080,    534,    288,   -162,
+      -630,   -360,   -643,     10,     62,  -2229,    263,     19,
+       310,    -44,    419,   2846,  -2579,   -159,   -246,    685,
+       -67,    394,    314,   -356,   -158,     19,     90,    116,
+     -2261,    163,    664,    163,   -191,    -49,    -18,   -308,
+       -15,   2508,   -370,    693,    -62,    818,   -307,   -658,
+       133,   1858,  -4900,     53,  -2485,    -48,     -9,    126,
+       159,      6,    -71,    291,    102,   -367,    -62,     27,
+        88,     -6,    204,    -65,   -725,     31,   -159,     -1,
+        -5,     45,   -133,   -146,    261,  -4481,    -19,    694,
+      -261,   -478,   -177,     88,    214,   -836,    -14,   -762,
+      -111,    501,      0,    254,   1971,  -1024,   2678,   -141,
+     -6064,     76,    430,    160,   -195,   -582,    280,    580,
+       183,   -315,    -13,    665,    -53,    315,   -199,    438,
+       220,   3267,    194,      2,   2808,    -88,     42,    150,
+      -179,    237,   -155,    143,     46,     99,     27,     30,
+     -6137,    -51,    -89,    201,    145,   -179,     13,   -358,
+        55,     71,     -3,     28,     -9,    -16,    125,    160,
+       159,    -21,  -5407,   -485,     -4,    -88,    -89,     44,
+         3,    166,     22,   -413,    993,     80,    485,   -107,
+       446,   -943,   1025,    261,     -3,   2991,    547,   -268,
+      -109,    536,    -10,    187,     17,    388,   -120,    -71,
+      -343,   -416,    162,     69,     -9,     46,   -477,     83,
+      6134,    146,   -236,   -125,    -94,    -55,   -274,   -231,
+      1120,    171,   -139,  -2714,     80,   -111,     20,   2475,
+      -135,  -1710,    317,   -762,    155,   1222,     68,   1192,
+       -15,   1825,    -36,    -45,   -120,   -484,   -131,   -162,
+      -128,    163,   -407,     72,   -222,    -46,   -222,  -5319,
+       278,   -373,   -436,    284,    138,   -243,   -104,     28,
+       -77,   3022,     93,    -15,   -581,   -498,    292,   -165,
+     -1740,    121,    195,  -1368,   -134,    -68,    -20,    -75,
+       -10,    113,    128,   -381,   -507,   -237,   -709,     13,
+       -22,    155,  -5065,    -95,    246,   -226,    193,    687,
+      1839,    246,   -232,   -359,    475,    106,    297,    205,
+     -2702,   -378,   -219,    -20,    140,  -3198,    192,  -3077,
+      -135,    -38,    -23,    213,    -72,    255,    -90,   -130,
+      -150,     62,   -484,    -94,  -2625,    -89,    344,   -129,
+      2655,    369,    -35,     17,   -697,    251,   -343,     68,
+        53,    176,   3104,    237,    -75,  -3020,    178,     45,
+       -86,     45,   -115,    183,     49,     26,    140,     77,
+        40,  -2315,    249,   1791,     48,   -755,    -12,    201,
+      -455,   -250,    -62,   1729,   -113,   -959,    238,   -114,
+       289,   -135,  -2208,   2748,     65,    306,    -83,      3,
+      -513,   -481,    -49,   -163,   -568,    -88,    668,    -51,
+     -2586,    106,    -22,    584,   -453,   -350,    333,   -177,
+      -236,   -657,    536,   -349,    394,    -56,     14,    133,
+       -55,    -84,    210,    -19,  -8647,    154,     80,     27,
+        -7,    -76,   -117,    100,   -201,      1,    296,   -101,
+        -6,   5642,    137,    -59,    -93,     95,   -110,   -280,
+       -61,   -300,     25,    887,     43,    -30,   2493,     76,
+       -22,   -343,    489,    266,    308,    163,    132,   -349,
+      2021,     18,  15536,     61,     11,    -41,    -42,     41,
+        -4,   -183,    -40,    -24,     26,    241,   -102,   -115,
+      -164,   2044,    -35,   -217,   -226,    734,   -228,  -2546,
+       218,      0,    122,   -150,   -528,   -188,  -1273,    155,
+       107,    -33,    -37,   -293,      6,    112,   -155,   -228,
+       192,  -2378,    153,  -1045,    213,   2975,     39,   -159,
+       -10,    -41,     34,   -125,      4,    -30,   3907,    -41,
+       848,   -346,    191,   -195,   -292,   -126,   3421,    -24,
+      -244,     92,    693,     64,   -193,    192,    121,    -33,
+      -141,    523,   -162,   2754,     71,     59,     40,    -63,
+      -142,   -100,   -338,    379,   -136,    -64,   -196,     11,
+      3198,    162,   2097,   -132,  -2359,   -193,   -398,   -318,
+       842,   -635,   -168,    425,   2001,   -136,    290,    206,
+       562,    -96,     -8,   -214,    -45,    -11,      4,     52,
+       177,   -148,    229,     33,    -48,    -46,   6538,   -106,
+       -27,    -22,   6527,     20,   -405,    157,     87,    208,
+      -117,     -4,     30,     87,     28,   -356,    -76,   -108,
+       -33,   -568,   -270,    177,     49,   -457,  -3210,    119,
+       103,    256,   -180,    211,  -1209,   -369,   -256,     37,
+       -47,   4976,     84,    207,    225,    224,   -425,    396,
+       921,     58,   -150,    104,   1509,     15,    -58,   1724,
+        47,    -24,     21,    376,    353,    482,   -236,    634,
+       306,   3179,     73,    -33,    -54,   -169,   -214,    146,
+      4322,   -216,   -644,    305,    305,   -453,     53,    143,
+        -9,  -1472,   -141,   1314,     57,     40,    -55,    -80,
+        67,   9264,     57,     86,     22,   -147,      1,     -6,
+         0,     39,      7,    114,    -51,   -137,    155,    -15,
+      -122,      5,    137,    125,    213,     -6,   7158,     36,
+       -52,    -54,    149,    901,    859,    703,    366,    673,
+       -13,   1186,    588,   -202,   -451,     18,   -585,   -250,
+     -2632,   -134,     61,  -3038,   1022,     78,   -672,   -276,
+        96,    838,    533,   -254,   -525,   -106,   -378,   1627,
+        12,     31,    317,   -118,     81,    313,   -186,    197,
+       452,  -2971,     83,   1326,    419,  -2366,   -328,    -87,
+      -103,   -243,   -280,     25,   -240,    590,   -232,    105,
+     -2966,  -2391,   -326,    338,     80,   -392,   -243,    271,
+        -7,   1127,      1,   1901,  -2279,   -207,     32,    -99,
+       560,   -193,    371,    494,    506,    255,    332,  10737,
+        48,      8,    -33,    -33,     32,    -33,     45,   -104,
+      -259,    -99,    -37,   -134,     72,    -50,    138,    428,
+     -2258,     77,    744,      5,     96,   3020,   -269,     49,
+       112,   -223,    186,     48,    224,   2571,    340,   -129,
+       -39,  -1900,    -45,   1978,   -261,    223,    294,     22,
+      -108,    -58,    109,    -31,  -3252,   -138,  -2969,    -19,
+      -133,    190,    -36,    132,   -136,     63,   -175,    351,
+       -76,    232,  -2708,    -17,    -24,   -130,   -474,     74,
+     -2978,     45,   -139,    -23,    227,    -42,   -141,    278,
+        81,      8,  -2491,   -446,    315,    -64,   -167,   -643,
+      -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,
+       -75,   -260,    426,    -96,    -37,    -38,    117,   -938,
+       487,     60,    286,    571,    368,   -551,    198,   -102,
+        15,    -11,   4535,   -127,   -241,    114,    -77,   -316,
+       302,    195,   -149,    -73,    357,   -128,    -23,     34,
+       319,    -97,    189,   5918,    -20,   -134,    -47,   -249,
+         7,      3,    116,      7,     48,     47,     92,     19,
+        14,     31,   -388,   -329,  -1878,   -944,    958,    632,
+      1973,    182,   -130,   -193,   2309,   -868,     63,    260,
+       -12,    -89,    -88,   -208,    127,   -168,    237,     74,
+      1153,    925,   2292,   2992,    -35,    204,    766,   -930,
+       -87,    341,   -101,    501,     35,   -182,    112,     91,
+       -28,     79,    193,    -73,    -71,     52,     82,   -427,
+      -147,    -69,   4722,    468,   -187,     98,   -295,    292,
+      -991,     43,     98,    225,   -555,   -595,    -66,   -181,
+        91,   -152,     -3,     89,   -219,    356,   -375,   -114,
+     -1546,   -620,    648,   1946,     39,   -608,   -942,    103,
+       179,    170,  -2350,    157,   1132,   -944,   -283,     64,
+      -393,     15,    -90,    761,   -185,    644,   -360,      5,
+     -5212,    106,   -136,    -40,   -159,    -40,   -120,    -43,
+        -8,   -195,    208,   -179,   -295,    -63,     19,     32,
+      -104,    -23,    132,    660,   -460,    237,    523,   -676,
+      -378,    -81,   -184,   2718,     64,    531,   2119,  -1564,
+       614,    933,      6,     65,    -50,     55,    243,   -539,
+      1168,    953,   -283,     45,    476,   -346,   2285,   1892,
+       615,   -521,     23,  -2079,     57,    -11,    208,   1029,
+       371,     28,    170,    -63,   -167,    184,   -217,     76,
+      -320,  -2747,    542,  -2098,   -407,    -10,   -876,  -1477,
+      -306,    565,     57,    -49,   -111,    185,   -250,    120,
+      -186,    214,   -520,    463,    792,  -2420,   2760,   -383,
+      -783,  -1097,   -441,   -535,   1070,     78,     96,    122,
+      -193,    516,    114,    100,   -413,    100,    -23,   -153,
+      1267,  -4210,   -742,    228,    659,    399,   -169,    412,
+       -81,   1056,      4,   -254,    173,    109,   -218,    196,
+        64,     26,   -113,    -60,     -8,     15,   5497,    -76,
+       169,   -294,   -394,    596,    379,     12,    -64,   -203,
+      -138,     41,   -249,    -53,    -44,    -19,     55,    -34,
+        99,     36,    -70,      8,     46,   2787,    842,   1917,
+      -693,   -424,    151,    464,  -1162,   1027,    148,  -1027,
+      -173,    328,     23,    792,   -184,    395,   -684,    229,
+      -139,     -7,   2788,    404,     43,  -1508,   -590,      6,
+      -184,    904,    475,    -37,    276,   -361,   1924,   -188,
+      -113,  -1334,   -176,     11,    -34,    -70,    -68,     95,
+      -433,    225,    437,   -451,    471,   -272,   -385,   2793,
+     -2685,    544,    881,    409,   -789,    700,     -5,   -144,
+        66,    -17,    504,   -397,    264,     74,    -81,  -1803,
+       444,   -573,    633,   -391,  -3339,    192,    484,   1126,
+      -306,    153,    303,     61,   -253,   -255,    -57,   -277,
+       -88,   -100,     32,     79,  -1320,   -857,   3080,   1178,
+       323,    353,   -149,   1316,   -399,    236,   -129,    231,
+       323,    696,     59,   1217,   -567,   -268,    642,    384,
+      -327,    -47,    466,   1530,   1092,  -1176,    612,    257,
+      -143,   -270,    487,    -62,    332,   1089,    961,   -706,
+       938,     78,     97,  -2805,  -1088,   -871,   -273,     87,
+      -345,    148,    113,    167,     97,     31,     68,    -47,
+       -53,     53,     29,  -5723,    -53,    -12,    241,     92,
+       131,    139,     48,    102,    -26,    -47,    664,   -580,
+        -7,   1287,   2531,   1061,   -710,     24,   1389,  -1742,
+       254,  -1147,    539,   -150,    -24,    495,   -204,   -171,
+       955,    202,   -111,    147,  -1458,  -3973,    421,   -416,
+      -544,    392,   1419,   -178,   -168,    -53,     50,   -537,
+        -7,   -346,   -289,    -52,    -38,   -259,   -115,   -136,
+      -138,    -89,   -205,   -661,  -4429,   -110,    380,   -721,
+      -180,    127,  -1371,    -78,    276,    319,    229,   -934,
+       267,   -353,     44,     65,    449,    -32,    159,    -11,
+       -22,   -571,    100,   -676,   2892,  -2740,    907,    511,
+       248,    441,    -62,   -517,   -347,   -235,    319,     -8,
+      -140,    309,    258,   -106,    215,      1,  -3252,    426,
+       455,  -2213,   1031,    430,    746,    367,    602,    187,
+      -147,   -200,     97,    555,   -107,   -249,    -71,    101,
+        59,    -94,    -64,    -33,    221,    184,   -791,    671,
+      -191,    284,  -1311,    402,    -29,    250,   -190,   -503,
+        38,    106,    586,   4767,    526,    147,   -182,    249,
+       146,     17,    293,  -1095,   1079,   -161,    141,     -2,
+       681,   -275,   -171,  -4504,     61,   -105,   -306,    -66,
+       229,     20,   -102,    -93,    334,   -189,      5,     -6,
+       417,   2551,    -63,   -852,   1608,   1820,    670,   1592,
+       102,    203,    147,   -767,   -147,    310,   -718,    175,
+       551,    -98,   -202,    309,     70,     81,    -55,   1518,
+       222,    338,   -356,    349,     97,     86,    495,   -233,
+      -121,   2936,    200,    935,   -381,   2474,     53,    494,
+       248,   -139,    -45,    100,  -1287,   -181,   -370,    311,
+       287,   3016,    -96,   -128,   2146,    567,   -383,   -551,
+       -96,    144,    495,    428,    -32,    137,     27,   -272,
+      -149,      9,    -61,    177,  -5236,     91,   -837,    611,
+      -279,    -74,    652,     14,   -178,    -82,    -89,    347,
+      -245,    647,    -62,     49,   -215,     29,    -55,    -27,
+       178,     79,    -19,    -59,    177,   -152,      0,    189,
+       -10,    128,   -115,     33,     61,   -106,     56,    -13,
+       135,    116,  -5772,    157,     43,     26,    -11,    102,
+        -4,    -52,    208,   -186,    198,     99,     81,    -29,
+      -103,    193,    -35,    -84,     -4,   -111,  -5251,     84,
+        71,    -85,    -77,     55,    234,     38,      0,    -35,
+        60,   5875,     98,     36,   -219,    -17,   -419,   -136,
+        47,     34,     55,    -21,    -17,     -1,     72,     94,
+        52,     -3,   -703,  -1437,   -518,    557,    121,    356,
+      -345,   -717,   -438,   -279,     13,     70,    -95,     -2,
+     -4170,     40,    136,     17,   -153,      8,   -149,    -27,
+      -559,    268,   -237,    -82,   -220,   -921,   -588,   -150,
+      3481,  -1906,    647,    675,   -455,    598,   -386,    -52,
+        -7,    222,   -201,     90,     54,     75,   -283,    118,
+      -375,   5768,     20,   -126,   -141,    -99,     64,    116,
+        16,    -58,      0,    -31,    -15,    250,   -104,    -30,
+      -144,    115,     12,    117,   -482,  -1709,   -436,    122,
+      -246,     -7,    271,   1961,    154,    149,    -86,    147,
+       258,    531,   1760,    914,  -1196,  -1800,    812,   -621,
+       125,   -161,   1361,     50,   -651,  -1307,    360,   -785,
+       205,   -156,    294,     21,  -3484,    -18,    -79,   -266,
+       770,    307,     29,   -765,   -250,    183,     55,    131,
+      1452,    260,    224,    221,   -347,    360,   -352,  -2188,
+      -664,   -503,    313,    406,   -251,   3268,    210,    -46,
+       129,   -276,    343,   -143,    104,    -55,    461,     17,
+      -576,   -287,   -289,     33,  -2500,    -85,   -428,  -1137,
+       918,   -245,   -490,   -260,   -270,   -133,   -591,    199,
+      -294,   2784,    102,     19,   -109,   -745,     91,   -524,
+       -44,     28,    252,   -511,    -80,   -146,    271,    519,
+      -216,  -2280,   -411,   3699,   -368,   -538,    427,   -158,
+       114,    -50,   -589,   -340,   -180,    703,   -186,    487,
+      -649,    668,   -916,   -436,  -3684,  -1016,    877,    -65,
+      -153,    -62,   -148,    -17,   -106,    142,    -73,     -1,
+       -68,    567,   -658,    815,   2270,   -563,   -519,   -226,
+      -223,   -282,    584,    240,  -1522,  -1935,   1169,    880,
+       127,  -1276,   -127,    399,     63,     25,  -1297,   2131,
+       592,   1652,   2609,     69,   -581,   -179,    947,    597,
+       150,     35,      0,   -255,   -232,   -728,    239,     91,
+       130,   -234,    231,     56,  -2181,   1774,  -2196,   1633,
+     -1065,   -662,    777,   -175,   -128,    267,     -7,     51,
+        27,   -133,     95,   -500,    188,   -167,     94,   -176,
+       -29,    -65,   -161,   -141,   -694,   -968,    594,   -269,
+      -422,   -472,   -731,   1210,   -816,   2142,  -1321,  -1746,
+      -149,   -983,   1310,   -839,    762,    284,     99,    -31,
+     -1169,    -84,  -1119,    -55,   -720,   -944,  -1115,   -271,
+     -1032,   1064,    187,  -1013,   2987,     26,   -209,    516,
+        -8,    107,    -24,    188,    278,    -53,    624,    460,
+      -275,  -1881,  -2001,    851,  -1740,   -407,   1643,   -352,
+       -17,   -528,   -538,   -175,    179,    416,   -297,     54,
+       132,   -491,    -76,     34,   -440,    175,   2065,  -2006,
+      -164,     38,   -403,    902,   -129,    215,   1545,   -414,
+     -1183,   -532,    578,    248,   -308,    189,   -563,   -345,
+      -949,   -279,   1693,   -959,    101,    783,      9,   1641,
+      1494,    167,   -294,   -538,    951,    115,    590,    105,
+      -847,  -1003,    464,   -368,  -1268,    641,    254,    243,
+       488,   2636,  -1209,   -272,    437,    445,    781,   -463,
+      -415,    538,   -811,    588,   1083,    206,   -547,    171,
+      -585,   -744,    343,   -604,    395,    -76,    910,   -523,
+      -108,   -449,    625,   -325,  -1079,    273,  -1473,  -1096,
+      -137,   -565,   2077,   -623,    214,   -342,   -273,    769,
+      1137,   -879,   -731,     56,  -1098,    211,    822,    579,
+      -839,    164,   -600,    -80,     61,    316,    644,   1445,
+       891,  -1796,  -1798,   -162,  -1631,   -492,   -626,    593,
+       544,     66,     63,   -857,  -1273,    406,   1665,    899,
+      -467,     87,   -117,   -469,    126,     30,   -931,   1446,
+      -190,    388,  -1608,   -316,  -2199,   -127,    484,    -51,
+        56,   -524,   1524,   -103,   1231,   -740,    717,   -861,
+       823,   -665,  -1790,    411,   -690,    303,  -1615,     63,
+      -232,     19,   1090,    -96,    137,     80,  -1027,    581,
+       -61,    672,    133,    444,   -767,    766,    -42,  -3174,
+      -270,    -23,   -126,  -1111,     67,  -1367,      4,    315,
+       -53,    -90,   -165,     48,  -1657,   -117,    392,    356,
+       792,   -610,   -618,   -219,    446,    102,    374,    207,
+      1026,   2480,   -461,   -782,   1161,  -1351,   1032,    486,
+      -308,    290,   -272,    899,   1912,     36,   -624,    286,
+      -428,   -623,   -665,     12,   -621,  -1985,    -34,    468,
+       318,   -467,    127,   -972,    -39,   -663,   2307,    -26,
+       406,   -468,   -657,  -1404,   -342,   2356,   -395,  -1422,
+     -1243,    465,     90,   -665,   -280,   -290,    -21,  -1752,
+       280,    271,    395,    240,   -402,     55,   1077,    148,
+      -309,   1818,    483,  -1293,     43,    261,    566,   -131,
+       947,   -815,   -872,  -1021,  -1001,   -395,    263,   -555,
+        78,  -2193,   -360,    -76,  -1029,   -493,   -464,   1339,
+       -53,    750,   -671,  -1349,    133,    -70,    114,    501,
+       766,   -816,    703,   -992,   -122,   -520,  -1323,  -2539,
+      -365,    -35,   -555,   -888,   1515,   -191,   1322,   1633,
+      -674,    451,  -1246,    270,   -868,    703,   -394,    106,
+      -779,    754,    650,   1066,   -417,  -1305,    149,   -165,
+};
+
+static const int16_t cb4432l1[] = {
+     -3867,   -448,   2202,    129,   -100,    393,     37,   -267,
+      -156,     23,   -274,    222,     33,   -191,    104,   -140,
+       -50,    -28,   -148,   -181,    -22,      6,    489,    993,
+     -2764,   1191,   -773,    781,   -460,    843,    -77,  -1417,
+       390,    124,   -203,    205,    662,    -16,    569,   -963,
+       609,   -155,     64,   -293,   2649,  -2533,     70,   -472,
+      -482,  -1732,    235,     -5,   -485,    116,   -177,   -104,
+       314,   -355,    118,     25,    921,    285,    130,    -94,
+        77,    121,   1068,   -435,   1407,    447,   -427,  -1096,
+      -757,    258,     19,   3236,    702,    362,   -928,   -348,
+      -150,   -784,   -687,   -388,   -176,    -38,     16,    -14,
+      1017,    879,    935,   1280,   1014,    -85,   -256,   -103,
+     -3384,   -928,   -200,   -406,   -175,    304,    -54,    195,
+       -78,    676,   -356,   -167,   -165,    -56,  -3133,    156,
+      -171,   -684,   -698,   -135,    230,    -30,     32,    542,
+      1959,   -124,    -76,    162,    182,   -174,   1011,    -97,
+       678,     10,    188,     30,   1086,   -262,   -157,    250,
+       241,    233,   -584,   3276,   2126,    -50,   -207,    637,
+      -440,    331,   -434,    251,   -267,    269,   -392,     68,
+      -244,      8,    928,    827,  -1096,   -309,   -356,   -375,
+     -3204,    422,    695,      2,    240,    595,    641,    582,
+       342,     42,      7,    539,    -64,   -116,     82,     16,
+        26,   -136,   -122,   -114,  -5814,     22,   -272,     10,
+       113,    186,   -422,    -95,    309,    308,   -118,   -208,
+        52,   -175,     12,   -106,     -6,     20,     58,   6053,
+      -101,    -20,     10,     70,    189,     57,    -11,    210,
+        83,    239,     -6,    -79,   -233,    -59,     31,    -30,
+       -62,     64,    -38,     25,    -78,   -202,   -215,   -115,
+      1477,    255,    101,  -2575,    186,   3140,    -46,    -45,
+        53,   -183,    -89,   -412,    183,   -222,     50,   -237,
+        96,     35,   1684,   -521,   -169,   -436,   -295,   1390,
+       261,     27,    163,    352,     68,  -3677,     12,    310,
+      -599,    331,    138,   -333,   -269,   -130,    -44,    -14,
+       265,   -626,    258,    -59,     31,    -17,    222,    -10,
+      -364,    280,   -183,   -235,   -217,     73,    -67,    114,
+       196,  -5132,    269,    159,     -6,    -36,   -248,    274,
+      -328,   2712,   -393,   2763,    507,   -110,   -166,    -84,
+       -72,  -1111,    -19,    370,     25,      5,    156,    -32,
+       237,    -57,   -106,    -22,    370,   -229,   1099,   4297,
+       152,     72,    -56,    347,     64,   -501,    -57,    178,
+       175,    -14,    -84,   -626,    555,    155,     20,    -75,
+        20,    -33,   -254,   -125,     -9,    150,     91,     -7,
+       -45,    239,   -109,     72,    -66,   -172,   -211,   6063,
+      -205,    171,    -75,     50,    -75,     22,    109,     21,
+       -58,     58,   -105,   -432,    310,   3782,    -18,  -1071,
+        19,     20,   1455,    337,   -257,   -288,    -52,    519,
+        43,     80,   -175,   -218,      9,    176,    -28,   -418,
+       200,   -514,    351,    119,  -5920,    -96,    -33,   -289,
+        74,     26,    120,    -37,    113,     47,   -145,    -17,
+       334,     46,     47,     19,    274,    172,    159,   -404,
+      3151,   -408,   -559,    987,   -178,    253,    -90,   -498,
+      1454,   1183,    392,    762,    220,  -1207,   -220,    -69,
+       -85,     22,   1644,   1858,    725,   1084,      0,   -257,
+       290,   1712,   -151,   -188,   -390,    638,   -327,  -2185,
+      -322,  -1116,   -150,    120,   -140,    198,    162,    -83,
+      1321,    232,    242,    -52,   -456,    778,   -288,     65,
+      2431,     37,     85,   -489,    862,   2776,    260,    -72,
+       792,    100,     17,   -210,    588,     49,    600,    246,
+      -258,    128,    -51,   -492,   -395,   -489,     50,  -5308,
+       -67,    314,    124,     46,   -188,    -64,   -101,     51,
+      -535,    108,     56,     -4,   -191,   -923,    485,    578,
+      1320,    228,   -535,    310,    227,    395,  -1441,   2660,
+       226,   -392,    221,   -686,   1749,   -175,   -904,   -571,
+      -129,    154,   2622,    609,   -247,   -240,   -893,     98,
+       291,  -2277,    411,    260,   -160,   2061,   -203,   -437,
+       359,     21,   -101,     19,     49,     15,    -98,     82,
+         3,   -555,    164,   -152,    -58,     38,    175,   -439,
+       -37,     68,    -21,   -181,  -5556,    -27,      8,     48,
+        21,   -151,    381,      3,   -152,    -74,    202,    -29,
+      1863,   1713,   -922,  -1976,    551,  -1522,    525,   -116,
+       146,  -1730,   -238,    -72,   -183,    126,    234,   -240,
+        82,    138,    -60,   -131,  -2226,    226,   -702,    183,
+       -81,    462,  -2851,  -1419,  -1005,    124,    -81,   -252,
+       -65,    147,    -58,   -179,    306,    154,    122,    -69,
+        69,     11,    115,    296,   3340,   -501,  -2580,   -804,
+         9,    591,    -86,     88,    127,    588,    183,     48,
+        79,    -38,   -199,     63,   -140,     29,     88,    -28,
+       259,     69,   1743,   -531,    110,    -18,    776,    -18,
+      -177,    112,     36,   -243,   -208,    528,    -47,   4709,
+       107,   -125,    140,     -1,     22,     15,    416,   -194,
+      -267,    -49,     43,     -3,   -308,    214,   -128,    140,
+      5372,   -123,     70,    275,    210,    182,   -147,   -131,
+       -84,     69,    116,     29,   -401,   -162,   -236,   -173,
+       378,     45,    -12,    -77,  -6209,   -103,    126,     54,
+       -19,    -20,     43,     64,     92,     -8,    -12,    118,
+      -123,     58,  -3628,   -414,  -2147,     76,     95,    -99,
+       357,    -10,    278,      4,   -608,    504,    105,    -72,
+      -109,    -92,    -55,    367,   -167,     40,    -34,     76,
+       220,   3434,   -366,    191,    248,     29,    187,   -177,
+       155,   -348,   -341,  -2466,    272,   -136,    510,    139,
+        81,    184,     33,   -299,     92,    -44,   -402,   -583,
+      -725,   -400,   -159,    751,   -225,    377,   -160,   1556,
+     -2652,    685,  -1077,   1276,    332,   -257,  -1449,   -282,
+      -231,   -145,     58,    173,    421,    271,    401,   -186,
+        79,   -258,    127,    252,    214,     96,    157,    195,
+       205,    118,  -4771,    -95,   -164,    217,    477,    -51,
+        -4,      8,   1450,    -51,    -52,    952,    675,    929,
+      -273,    475,      9,    282,   -249,    236,    746,  -1407,
+      -272,   1845,    692,   -105,   2690,    168,      1,     -1,
+       157,   -599,    305,    255,  -2252,     45,   -199,    119,
+     -3489,   -161,      6,   -263,   -259,    338,   -251,     61,
+       153,   -124,    432,     -7,    131,      5,    305,   -322,
+     -3283,    -32,   -336,   -273,   2243,    863,     -1,    681,
+      -365,   -246,   -152,    375,   -133,    -15,   -208,   -104,
+        89,    128,   -135,     44,   -255,    549,  -2751,    -48,
+       270,  -2584,   -549,   -631,    445,    182,   -198,    743,
+      -215,    -60,   -400,   1383,    167,    -65,    250,    146,
+       185,     22,   -484,   -161,     86,   1758,    964,    404,
+     -2574,   1026,      6,   -516,   -724,    315,  -1891,    311,
+         2,    339,    -39,    324,    299,   -497,    -12,    179,
+     -1242,    364,   -185,   -197,  -1474,    232,   -490,   4042,
+      -105,    887,     31,    539,    235,     75,   -112,   -200,
+       -31,     74,    -76,    -16,    -20,     38,   -159,   -143,
+       114,    -77,   -110,     28,    -18,    -84,    -27,    -53,
+       -82,   -224,     75,      0,    -46,    -64,     44,   -112,
+        84,    -85,  -6030,    -24,    661,   -474,   -178,      8,
+     -1023,   -396,    199,    -19,    -50,    -93,    385,    209,
+     -1227,   2492,   2163,    986,  -1359,    399,    848,    681,
+      -829,    211,    696,   -599,  -1398,   1951,   -113,    374,
+       -17,  -1113,  -1708,   1294,    666,   1774,    623,    259,
+       105,    961,    -87,     43,   -463,     65,    155,    -26,
+       -31,  -1477,   -508,   1091,  -1463,   -524,  -1853,   1354,
+       434,     86,    893,   -871,    151,  -1887,    205,    423,
+       857,    -55,    -11,    -39,    341,     61,   1158,   2650,
+       899,  -2491,   -593,   -843,  -1399,    -15,   -713,   -171,
+      -195,   -523,    -46,    243,    117,    241,     -8,    140,
+      -149,   -191,     70,    134,  -1158,   1933,   1135,  -2284,
+     -1049,   1717,    378,   -155,    -37,    171,   -692,   -280,
+       918,   -786,   -123,    558,    571,     39,   -315,     62,
+        27,     59,    708,   -134,   -200,   -168,   -134,    148,
+      -142,     25,    164,   -282,    284,    -95,    -35,    376,
+       165,    367,   -335,    271,    249,  -4520,    176,    -36,
+      -216,  -1303,    375,     92,    602,   -889,   -390,    284,
+        78,  -1318,   1259,   1865,   1498,   2063,   -234,   -840,
+      -391,     88,    168,   -235,    -74,     31,   -239,   1221,
+        71,  -1637,   1513,     68,   2201,   1513,  -1099,   -622,
+       426,    343,   -330,   -648,    381,   -156,     27,    -31,
+       -92,    133,    210,    103,   -155,   2061,   -366,  -1173,
+       -31,   -274,   -713,   -471,    509,   1044,    208,    403,
+       486,    -66,   -521,  -1883,   -180,   -537,   1283,    -98,
+     -1464,   -456,    508,   -619,   -546,    685,    944,    -85,
+       311,   1172,   -194,   1406,    -99,   -827,   1506,    396,
+       196,  -1534,  -1181,   1588,   1250,     47,   1034,   -171,
+     -1247,    -98,   -120,   1181,  -2195,   -384,    945,    627,
+        26,   -248,   1372,   -671,    214,   -649,    -17,    -44,
+      -500,   -559,    577,   -601,     32,    421,    531,    344,
+     -1233,    145,    348,    614,   -560,   -244,   -357,   -202,
+       814,   -494,  -2320,    308,  -2277,   -481,   -518,   -431,
+      -851,     43,   -204,    -26,   -742,   1083,   -130,   2002,
+      1642,  -1156,   1746,   -529,    937,   -544,    416,   -741,
+       763,   -232,    509,    243,   -458,     78,   -130,    143,
+      -123,     71,   -666,   -105,     31,  -1061,    441,    -48,
+       411,  -1547,    155,   -730,    439,   1624,    873,   -611,
+      -470,   2348,   -157,   1184,    678,   -174,    542,    -95,
+       -12,   -405,    237,    322,  -1194,   1903,   1496,    357,
+       -34,   -661,  -1024,   2236,    860,   -256,    617,    756,
+      -485,   -273,   -589,    536,    214,   -286,    782,    418,
+       346,   -462,    443,   1056,   -914,   -304,   -564,   -332,
+      1823,   2079,     93,   -975,   -891,  -1089,   -720,  -1127,
+       702,    300,    787,    374,    -78,   1070,    691,   1339,
+      -797,     57,    482,    432,    748,   1538,    673,   1885,
+      -504,   1913,   -190,   -135,    881,   -139,     84,    379,
+      -176,   -129,   -331,    -34,   -690,    282,   -563,     51,
+        71,   -714,   -103,   1074,   -651,   -582,   1388,   -320,
+     -1115,   1547,  -1088,    -65,  -2634,   -201,   -653,    116,
+      -238,   -218,    476,   1417,   1671,   1135,  -1025,    614,
+      -662,    127,    863,   -117,    726,   -971,   1382,   -286,
+       465,   1195,   -715,    862,  -1256,    105,     37,  -1190,
+      -442,  -1777,     50,    162,   1577,    580,    762,    253,
+        92,   -308,  -1238,   -161,    295,   -150,   1733,   1831,
+      -527,   -527,    -28,     70,   -359,  -1590,    860,   -221,
+        47,  -1201,   -254,     39,    780,   -326,   1097,  -1019,
+       834,    362,    357,     41,    693,  -1099,  -2687,    614,
+       270,   -128,   -322,  -1149,    631,    -46,   -343,   1495,
+      -896,   -864,   1545,    200,   -922,  -1133,   -637,  -1231,
+       484,   -796,   -743,   -371,    999,   1300,    173,    -19,
+};
+
+static const int16_t cb4432s0[] = {
+     -2558,   2751,   -440,   1200,   1067,   -725,   -492,    588,
+       234,   -209,   -108,   -230,    223,   -231,   -235,   -132,
+       -51,     88,   -290,   -214,    -99,    -60,    175,   2546,
+      -991,    907,    446,    635,    284,    707,    238,    220,
+      -308,    259,      8,   -435,  -2207,  -1487,  -1579,     46,
+       285,   -249,    154,   -370,     37,     42,   1524,  -1853,
+      1393,   1204,    126,   1751,     82,    136,    363,  -2411,
+      -782,   -128,   -818,   -232,    765,   -173,   -127,    732,
+       260,   -101,    868,   -249,    290,     32,    645,     55,
+     -1742,  -1077,    392,   -568,    629,   -920,   -243,    791,
+      -604,   -363,    117,  -1360,    -15,   -245,  -3655,     54,
+      -297,     10,    124,     11,  -1114,   -567,   3882,  -2042,
+     -1120,    -42,   -114,   -914,    419,    307,     44,    277,
+      -101,    429,    170,    187,   -528,   -705,    348,    -19,
+       180,    -76,     91,  -1861,   -181,   -171,    804,   -730,
+       222,   -184,    349,    191,   -125,     14,   4270,   -467,
+      -272,     29,   -216,    212,    426,   -222,     11,    -16,
+      -852,    101,    576,    178,    351,    647,     90,    179,
+      -681,   -187,     77,   4115,   -976,   -726,    711,    763,
+       572,  -1166,    -46,   -445,   -103,    135,    294,    300,
+        10,    737,    386,   -399,   -349,    -52,   5393,   -107,
+       -32,   -229,   -154,   -181,     82,    -68,    -13,    -77,
+        48,     75,    117,    -50,    254,    233,     98,     75,
+     -2218,  -2214,   1491,    832,    225,  -1057,    267,    539,
+      1963,   -245,   -353,    454,   -430,    -54,   -747,    -58,
+      -438,    -90,    -64,    277,    214,   -105,    -47,  -1301,
+      -404,  -1179,    682,  -4093,    764,   -270,   -342,   -367,
+     -1378,      6,    -83,    429,    398,     61,   -149,    180,
+        31,    169,   -218,    152,    -71,    -38,   2605,    679,
+      -175,   -533,   1787,    611,    484,   -322,    158,   -561,
+       125,    -35,    -42,   -190,    529,    449,    157,  -3105,
+       106,    168,     -8,    -66,    -80,   1463,   1136,   4793,
+       -98,   -432,    538,   -145,    241,   -158,    105,   -372,
+        39,   -160,     92,   -223,     81,    245,   -142,   -162,
+      -167,   -297,    -49,    -98,    582,  -5178,   1130,   -271,
+       567,   -251,     55,    487,   -303,     31,    -25,     87,
+       -70,    154,    -23,   -221,     70,    208,     48,   -137,
+        46,     59,     -9,  -1397,   -970,    224,    714,    161,
+        24,   -307,   1295,   1467,   -155,   -505,   -521,   -244,
+       503,    -25,   -989,   3664,   -148,     12,   -135,    218,
+      -159,   -156,   -769,   -421,    553,    715,    697,   -181,
+      1426,    425,    -39,   -103,  -4558,    171,    347,    161,
+       170,    128,   -210,    -35,     31,    125,   -264,   -135,
+      -100,   2685,   -230,   2062,   1618,    -99,   -874,    926,
+       757,    380,    404,    -73,     30,     29,    462,    725,
+      -389,   -246,     20,    150,   -234,    -58,   -183,     10,
+       156,    482,   -232,    124,    115,    180,   -615,   -395,
+       330,    -85,   -435,   3279,   1493,    686,   1157,    245,
+     -1067,  -1953,     23,    796,   -540,    175,     56,  -1931,
+        89,    705,   -342,    551,  -1999,   1951,  -2305,   -497,
+      -266,    275,  -1503,    351,   -355,   -353,    236,   -358,
+      -271,    -40,    136,    217,    -13,    -45,  -2091,   1141,
+       730,  -1888,   1131,    660,   1271,    439,   2597,     92,
+       319,    -91,     62,    316,    287,   -260,    121,    -33,
+      -117,    -22,    -79,   -170,   -164,   1486,    134,    -62,
+       -36,  -3367,   -235,   1221,   1239,     78,    -54,   -489,
+       268,   -560,   -774,    851,   -973,    -62,   -174,   -138,
+      -459,    390,    -22,    -42,     83,   1339,   1307,    462,
+     -3768,    511,    300,   -525,   -787,    -89,    675,  -2074,
+        37,    -48,    252,    598,   -332,     67,   -187,      2,
+      -106,    -35,   -148,   -186,   -542,    799,   2363,   -155,
+      -665,  -2867,   -209,   -200,    -80,   1682,   1082,      2,
+       516,   -481,    276,     -1,   -220,     54,    -12,    259,
+       161,   -148,    566,  -1489,   -731,   1262,    499,   -816,
+       115,   4057,    -71,    701,     39,   -132,   -223,    -16,
+       229,     -2,    -40,    -61,    234,    405,    108,    304,
+       -62,   -396,   1369,  -1438,  -2045,   1954,    759,    969,
+      -166,   -235,   -115,    -68,   1923,   1815,   -776,   -855,
+        34,    -63,     17,     87,    223,   -145,   -130,    -16,
+      -313,  -1704,   -458,   -332,    420,   1332,    676,    878,
+     -3847,   -360,    427,    537,    651,   -167,   -451,   -197,
+       277,    136,   -201,    517,     10,   -156,     35,   -927,
+      1250,   -173,   1004,   -169,    322,   -140,   -559,  -4656,
+      -343,   -264,    -61,    -12,    195,    -10,   -123,    -23,
+       -20,     -6,   -367,   -102,   -215,     41,    838,   1513,
+       552,  -1609,   -753,   -763,   -656,   -633,     14,     35,
+       141,    117,   -121,    857,  -1494,    578,   2546,   1034,
+      -676,    571,    817,   -218,   -111,   1424,    -51,    878,
+     -2860,   -257,    104,   -526,    782,    708,   2350,   -500,
+      -342,    219,   -406,    836,   -117,    288,   -415,    798,
+        14,   -311,   -455,      3,   -410,   -144,    -30,   -977,
+      -145,  -2466,   -957,   1370,  -3201,   -327,    -85,    149,
+      -580,    198,    350,    140,   -104,    327,   -128,   -178,
+        58,    294,     50,   1814,    581,   -909,    287,   -267,
+     -3992,     61,   -860,    258,   -271,   -223,    237,   -291,
+        -3,     66,    110,   -620,    319,    -62,    177,    364,
+       110,   -163,   -921,   -863,    251,   4922,    280,    121,
+       128,    209,   -126,    578,    -56,     41,    124,    350,
+       245,   -465,    -67,      5,    651,    147,    200,      0,
+        21,   -609,   -332,     -3,    247,   -412,    128,     42,
+     -1405,   -301,   -341,   -484,   -491,    -55,    361,   -100,
+       -30,   -405,    643,   4249,    -31,    -91,    -10,      6,
+       425,   -350,  -1501,    817,  -1348,   -201,   -345,  -3643,
+       235,    691,    332,    219,    199,   -398,    130,    -50,
+      -190,     89,    -23,    100,   1327,   -200,    146,    482,
+      -624,   -479,   -391,    188,    129,    614,   -335,   -564,
+      1021,   -107,   -199,    145,    201,    571,   1276,   4253,
+        58,    121,    295,     38,     26,     47,  -1333,   1138,
+      3125,    357,    -72,    347,    276,   -272,    120,    -77,
+       535,    247,    -71,  -2054,  -1860,    -73,    -62,    266,
+       -30,    183,     17,    -46,     -7,   -140,    997,    526,
+       -47,    -59,   1540,    373,    162,   -150,   -107,    -74,
+      -278,    -37,   4268,    -21,   -269,    359,    111,   -115,
+        -5,   -206,    -87,    -44,   -517,     54,  -2859,    189,
+      -297,   -863,   -918,   -929,   -543,     25,  -2866,    -79,
+     -1101,   -275,   -410,   -458,    -75,   -211,   -420,     96,
+       467,    -66,    -15,   -580,   -420,   -586,     -7,    109,
+       236,    227,   -488,    106,    258,     76,     78,     -8,
+      -199,  -4888,   -134,   -205,    -33,   -243,    -19,    -10,
+       157,    129,    120,   -928,    604,   -345,    -47,   -430,
+      -257,    273,     81,   1949,    490,    272,   -205,   2460,
+       -54,    103,  -2924,   -529,   -211,    -60,    279,    220,
+       -57,    342,    209,    984,  -1410,  -3363,  -1028,  -1301,
+     -1293,    227,   1142,  -1068,   -512,    758,    364,     46,
+      -358,     16,    257,   -158,   -253,   -182,     -2,    181,
+      1475,   1574,    215,   -968,    246,    369,   -273,   -717,
+       546,     74,  -3872,    293,     98,    130,   -244,     41,
+       143,    699,    -56,   -126,     67,     54,     -2,   -878,
+      2334,    883,    215,  -1979,    246,   -759,    499,    248,
+       751,   -202,    580,  -3018,    359,   -139,    210,    -47,
+      -168,     89,   -659,    259,    -54,    -40,   -490,   -169,
+      -769,    569,   -171,     64,   -845,    519,   1251,    -71,
+      -459,  -4436,    257,   -334,   -826,   -183,    115,   -408,
+       -77,    544,    173,   -258,     48,    331,   1735,   1035,
+      2793,   1154,  -1901,    275,   -109,  -1185,   -403,   1332,
+      -282,     36,   -367,     21,     27,    362,   -425,    217,
+       150,   -304,    192,     53,  -1100,     27,    628,    698,
+      -634,    -25,     84,      8,   -103,    533,   -301,    218,
+      4350,    119,   -109,    309,     24,   -352,   -147,   -274,
+       156,     85,      9,   1706,   -854,   2012,  -1573,    112,
+      -673,  -1538,    -91,    415,  -1525,    866,   1493,   -621,
+      -396,    277,   -604,   -363,    114,   -360,   -252,    -18,
+       -31,    -77,   -591,   2483,    535,  -1520,  -1057,  -2189,
+       -51,    798,    276,  -1426,     72,   -303,    402,    111,
+       327,    272,     -8,   -216,    189,   1282,    152,    -45,
+       -33,   1524,   2301,   -341,   1992,    939,   1678,   1011,
+       114,    167,    586,   -500,     40,   -473,   -274,    596,
+      1237,   -126,    205,    254,   -284,   -367,   -119,     64,
+      1915,    437,   -585,      1,    402,   -271,   -984,    530,
+       267,   3634,    495,   -219,   -728,    -67,  -1340,    983,
+       122,      6,    110,   -166,    111,    102,   -139,  -2499,
+       753,   1011,   1755,  -1252,    872,   -510,  -1844,   1388,
+      -782,    287,    461,     36,     77,    437,   -361,   -216,
+      -415,    158,    -77,   -123,     57,    -93,   3408,    504,
+      -942,    434,   -648,   -251,   -420,   -387,   1373,   -229,
+       236,   -191,      3,    204,    612,    393,   -285,    560,
+      -164,   -199,    303,    146,     93,   1248,   2425,   1001,
+      1261,   -239,   1085,  -1878,   -375,   -544,   -995,   -192,
+      -319,    542,    280,   -716,  -1323,    -67,    -34,    252,
+       -36,    206,   -126,    -28,     26,  -1135,   2799,    527,
+       -47,  -2008,    509,   -232,   -953,    332,   -386,   -108,
+       290,    507,    578,   -809,    375,    850,  -1413,    831,
+      -137,    259,     25,  -1075,    407,   1784,  -1539,   1658,
+      1450,   -969,    467,      4,    785,   -595,    912,     34,
+        91,    286,   1035,   -524,    276,   -322,     11,    651,
+       733,    243,     45,   -145,    357,    524,   -697,   -259,
+      -757,  -1057,    181,   1324,    148,   -502,    -64,   -379,
+      -746,   1385,    395,    184,   -749,   -197,  -3375,   -546,
+        -4,    532,   -270,    687,    501,    285,    401,    431,
+     -1888,   -639,    655,   -325,   1896,  -1883,     53,  -1018,
+     -1475,    802,   -486,    -68,    232,   1337,    428,    232,
+      1754,  -1687,   -518,   -372,    508,  -1269,    327,   -900,
+      -468,   1127,   1397,   1597,    837,    659,   -617,     99,
+       264,   -460,    296,     44,   -295,   -209,   -174,   1105,
+       896,   1065,   -174,      5,    845,   1311,   1370,  -2548,
+       351,   -660,    -24,  -1089,   -787,  -1312,    -22,   -585,
+      -197,    749,    293,   -112,   -169,    -23,      3,   1151,
+       529,   1173,    224,  -1517,    930,    -52,    268,  -1282,
+      -559,    466,   -528,   1506,   -231,   -337,    993,  -1314,
+      -250,  -3042,     57,     19,     15,   1812,    697,   -389,
+      -201,    647,   -723,  -1098,   -177,   -225,  -2694,   -495,
+      -431,   -238,    388,  -1731,    997,    227,   -765,   -222,
+        94,   -611,     35,    187,   -935,  -1470,   1013,   1051,
+      -378,    311,   -710,   -566,   -532,   -369,  -1599,    553,
+       167,    450,  -1068,   2834,   -125,    601,   -113,   -503,
+        40,     14,    -36,   -220,  -1543,    867,   -612,  -1834,
+       888,  -1791,   1296,   -229,   -593,   -760,   -197,    428,
+     -1290,    892,    -62,   1113,  -1228,   -965,    -90,   -300,
+       288,   -133,    779,  -1211,   -627,    268,    180,    913,
+      2230,   -413,   -146,   -217,    170,  -1157,  -1551,    877,
+        75,   1784,   -174,   -230,   -757,   1243,    625,    -49,
+       114,   -218,   -409,    195,  -1165,   1492,    213,   1100,
+      -101,   -957,   1016,    663,   -704,    817,     94,   -279,
+      -256,    469,    -75,   -123,  -2954,    948,   -407,    275,
+};
+
+static const int16_t cb4432s1[] = {
+      5416,   -223,   -123,    156,    -33,    185,   -144,   -108,
+      -199,    -68,    -36,     11,     37,    124,   -301,     58,
+       -21,    155,     99,    -10,    -78,    -26,    -70,  -3160,
+     -1037,     98,    155,   -373,    834,    652,   -277,   -429,
+      -529,   -103,   -358,    187,   1161,   -157,    147,   -400,
+       461,    156,    237,    481,    -67,     99,    939,   1179,
+      -659,   1337,    578,   -489,   -481,   -427,   -622,    131,
+      1826,   -734,   -995,     -5,   -461,    514,    -83,   -271,
+     -2928,    -86,   -382,   -205,   -133,   -386,   -195,    -67,
+       508,    586,    607,   -910,   -181,  -2046,   1212,   -179,
+        23,    408,  -1929,   2044,   2160,   -879,     74,    179,
+        72,   -164,     47,    162,   1497,    826,   2978,   -912,
+       454,   -618,  -1907,   -501,   -494,   -299,     96,   -138,
+      -114,    -51,   -171,    445,   1144,   -187,    217,    224,
+       402,     13,     42,    -58,  -1692,   4162,   1272,    970,
+      -278,    327,     88,    -31,   -182,    279,   -610,     78,
+      -432,   -147,   -142,   -725,    -17,    -95,    388,    133,
+       -61,     28,  -1365,   1441,    606,    411,    923,   -332,
+      1843,   1934,  -1451,   -514,   -283,    768,    940,   -428,
+        31,   1105,    248,    -78,  -1477,   -367,    404,     68,
+      -178,     17,    691,   -265,   -105,   1681,   -476,  -1307,
+     -3434,  -1700,   -524,   -871,    472,   -171,    237,    104,
+      -142,   -231,   -292,   -285,    266,   -259,   -166,    -97,
+      -432,   4003,   1220,   -356,   2110,   -220,   -465,    -48,
+       117,   -178,    290,    -21,    205,    -19,    321,   -343,
+      -328,    -57,    215,   -345,    304,      2,     10,  -2071,
+       185,    433,    212,  -1165,    112,    242,   -294,   -162,
+      1107,   1176,   -396,   1400,  -2600,   -434,   -640,    457,
+       100,   -268,    809,    128,   -236,    -66,    -94,   -842,
+        82,    163,    227,  -2641,   -485,    291,   -326,     42,
+       234,   -648,   1355,   3016,  -1403,    -71,    188,    792,
+        15,    -16,   -522,    -75,    106,   -824,   1133,    947,
+       477,   -642,   -531,   -808,   4100,    -34,   -407,    133,
+        33,     15,     63,     72,   -223,    -15,   -491,     38,
+        47,    258,   -236,    192,   1628,    173,  -2116,    687,
+       295,    -74,   -183,     95,    529,    149,   -372,    182,
+      1317,     21,  -1424,  -3156,   -111,    -96,    580,    284,
+      -274,     41,    145,   1314,     79,   1830,    262,   -325,
+       -16,    169,   -245,  -2038,   1959,    892,    946,    303,
+      -171,   -432,    883,     34,   -238,   2463,   -294,     25,
+        24,   -106,    -45,    509,   -154,    496,    109,    115,
+       169,    702,    396,    -97,    657,   -251,   -112,   -114,
+      -144,   -230,    517,   -190,   4885,    -45,   -152,     -9,
+      -170,  -2021,    541,   -905,  -2015,   2588,   -936,    -20,
+      -300,    384,    433,   -123,    119,   -505,   -126,    295,
+       526,  -1352,    450,    142,   -126,   -115,      1,   -140,
+      -734,    672,   -147,   -660,   -747,    652,    161,   -163,
+        51,   -616,  -1974,   1413,  -3145,    922,  -1289,    215,
+       182,   -838,   -171,    107,   -333,     34,    216,   -307,
+      -359,    496,   -343,   -325,  -2552,  -1573,    588,   -441,
+      1296,  -3075,    119,   -131,     54,    206,    278,    106,
+      -100,    112,    220,    -49,    -80,   -229,   1051,   3271,
+     -1300,    324,    -31,  -1025,   1659,   1526,   -161,    669,
+       -56,    430,    201,   -535,   -126,     -9,   -380,    222,
+       212,   -345,   -282,    195,    -41,  -1235,   -593,   -593,
+      1557,     71,   1023,   -831,    545,   -875,    161,   -772,
+        99,   -190,   1616,    338,   -251,   -201,  -3104,   -774,
+         4,   -121,    178,    -80,    652,  -1018,   -441,   -343,
+      -236,   -240,   -244,    -26,   2192,     75,  -1348,   3771,
+       -22,   -850,   -251,    316,    132,    -21,     63,    104,
+       152,    185,    -40,    275,  -1356,    482,   3081,    571,
+      -481,  -1387,    815,   1285,   -352,    -98,    -41,    573,
+      -307,  -1879,    427,    196,    169,    -26,   -232,    -98,
+      -411,   -231,  -2034,   -969,    271,   1421,  -1485,   -407,
+      1404,   -343,    861,    888,    -11,    202,   -245,   -397,
+       104,    229,    309,  -2757,    315,    416,    393,    194,
+      -176,   -663,   -166,   -229,    244,   -152,    183,     24,
+      -205,     97,   -255,   -299,    123,    -12,     53,    102,
+      -362,    371,    223,     46,    132,  -5177,    157,    -92,
+     -1114,    -28,    135,   -831,    627,   -428,  -1116,    421,
+       761,    458,   3256,   -167,    355,   2045,    113,    234,
+      -154,     20,    -39,     61,    -81,     63,     98,   -171,
+      1727,  -1193,   2103,    416,   -421,   -575,   -636,   -114,
+       700,   -260,   1610,   -336,    521,   2591,   -738,     43,
+       103,    -63,   -335,    168,    110,     41,   1995,   3554,
+      1443,    -53,   -206,    992,    767,   -372,    141,    -24,
+       173,     60,   -237,     69,   -173,    -73,    137,    167,
+      -164,   -159,    312,   -151,    -78,    619,   -192,    689,
+       -69,  -2805,   -259,   -288,   -231,     28,  -1682,   2316,
+      2298,   -336,   -131,     59,    542,   -218,   -281,   -214,
+       -41,    116,    138,      8,   -297,    -45,   -215,   -167,
+      1587,  -1061,  -1976,   -445,    401,  -2392,    -42,    581,
+      -519,   -230,   1461,    542,    113,   -634,   1776,    332,
+       191,      5,    174,   1939,    -26,   -242,    120,    230,
+      -986,   3501,  -1125,    -89,      3,   -580,   -219,   -255,
+        37,   -119,     94,    -17,   -297,   -176,   -434,   -234,
+        55,    -63,  -1167,   -492,  -1753,  -3397,    185,   -794,
+       689,    819,    -32,   -836,    335,   -133,    724,   -299,
+      -318,    424,    558,   -654,    119,   -447,    140,   -100,
+        72,   -872,  -1432,   -203,    -40,    -14,    -59,    550,
+        85,    -53,   5007,    258,    401,   -184,   -313,   -170,
+        66,   -185,    -82,    -61,    210,     48,   -204,    -96,
+       130,   -562,  -1700,  -1037,  -3926,   -884,   1115,     -6,
+      -100,    842,   -450,    877,     76,    568,   -623,     27,
+        73,   -195,    328,     41,    -24,    124,    -77,   1499,
+       540,  -1064,   4517,    -22,    -35,    839,    -48,    253,
+      -259,     96,    409,     90,     26,   -177,    365,    -48,
+      -324,    -26,    -23,    -83,    -77,    -80,   1599,   1486,
+       266,    659,    236,    231,    -16,    359,   -163,    455,
+      -999,  -1169,   2453,   -599,   -945,      4,  -2110,   -174,
+      -736,    344,    232,    142,     32,    -99,    763,    133,
+      -325,    -56,   1635,   -439,    843,      2,  -1704,    -13,
+       771,   3680,    -89,    182,      4,     42,    394,    404,
+        82,    312,     91,    141,  -1577,   1765,   3141,    625,
+      -271,  -2122,    423,    353,    489,    606,   -290,   -190,
+       486,   -131,    118,    236,    248,   -209,     -2,   -162,
+       -95,     95,    170,    278,  -2233,    549,     34,   -846,
+      3595,    445,   -400,    -65,    131,    -14,    -16,    611,
+      -116,   1293,     98,   -680,    189,    217,    -15,   -549,
+       131,      8,   -768,  -1082,    841,   -346,    129,    -33,
+      -778,    322,  -2508,  -2128,  -1895,  -2021,    -27,    -42,
+       -51,   -536,    239,     -1,     78,    105,     48,     79,
+       207,    422,   -181,     18,    -94,   -152,   -181,  -5012,
+      -187,     -3,   -118,   -397,    -84,    -49,    129,   -276,
+       188,     45,   -146,   -235,   -109,     83,     32,    -79,
+      2039,   -616,    257,  -1575,  -1756,  -2364,    222,    195,
+     -1138,   -290,     58,   -641,   -252,    -11,    402,    -31,
+     -1040,   -592,    676,   -118,   -231,     94,   -123,   1642,
+      1404,   -334,   -728,  -3425,    382,    111,   -194,    677,
+       177,   -182,    434,    860,  -1022,     84,   1214,   -733,
+       300,     -2,   -259,    140,     35,     96,   1164,  -1476,
+      -757,    -74,    239,   -203,   1796,   1207,   1732,  -3029,
+      -610,    658,    490,   -465,    136,     56,   -614,   -612,
+      -123,     93,   -151,    162,     56,    502,   1634,  -1825,
+        45,   1033,   1554,  -2380,   1615,   1317,    786,    387,
+      -255,   -423,    -44,   -246,   -213,   -149,    107,    -74,
+       -94,     45,   -204,     13,  -1959,    936,   2023,   1000,
+      1031,    112,    574,    323,    163,    947,   -657,    492,
+     -2624,    -44,    739,   -305,    -31,    247,    270,    213,
+       -46,    -90,     43,  -1504,    931,    -61,   4045,   -863,
+       389,   -386,   -130,   -374,   -583,   -800,   -900,    158,
+      -455,    169,    134,   -164,     54,   -117,   -185,    -90,
+      -203,    -41,   -811,  -2082,    169,    287,   -378,    -15,
+       231,     83,     89,   -187,    198,     18,    178,    -18,
+       527,    -40,     94,     54,     79,  -4356,    248,    162,
+       -94,  -1431,    -31,  -2048,    651,   1231,   -508,  -1089,
+     -1255,    766,   1673,    357,     13,   -813,  -2403,    179,
+      -470,     65,   -339,    154,      9,     56,    246,     66,
+     -2308,   1443,   -947,   -744,  -2473,  -1248,   -113,   1017,
+      -608,    149,   -182,     41,   -524,     16,    285,   -268,
+      -781,    -57,   -346,    194,    256,    -51,    107,   -484,
+      -190,   -125,   -645,    487,    314,     74,   -555,  -1012,
+       325,     76,    233,   -205,   -189,    -48,  -4593,   -122,
+        10,    121,    -91,    108,    -49,    254,  -1662,   2500,
+        87,  -1540,   -200,    287,   -329,    -50,   -401,    182,
+     -1300,    689,    915,   -224,   -768,    471,   -339,    133,
+       407,   -344,     99,     96,    111,   1224,  -1431,   2069,
+      -282,    127,    397,   -119,   1332,  -1299,    744,   -535,
+       800,    327,    874,    700,   -424,  -1596,   1365,   -651,
+      -151,    113,    102,    -24,    464,    125,    911,  -1583,
+      -372,    747,      2,    429,    -47,    -64,     34,   1700,
+      -741,    343,    728,   -226,   1889,     78,   -515,   2827,
+        77,    -66,    108,    515,     90,   2227,   -678,   1301,
+      -974,    122,   -983,   2357,     64,  -1479,    186,   1436,
+      -245,    204,    460,    191,   -677,   -335,   -200,   -135,
+      -106,   -101,   1112,  -2733,   -641,     73,   1265,  -1281,
+     -1332,   -743,    675,    129,  -1144,  -1169,    331,   -143,
+       -87,    809,   -891,   -848,    246,    243,     97,   -170,
+        36,  -1109,    102,   1055,  -1395,   1384,   1155,    439,
+     -1549,   -300,  -2069,   1014,    187,   -782,    980,   -971,
+      -345,   -583,    -66,   -138,   -317,   -124,     48,   -152,
+       -98,     92,   2446,    128,  -1232,   2148,   -337,   -615,
+       467,   1573,   -613,    857,    303,    422,  -1340,   -420,
+       305,   -626,     94,   -496,   -386,   -129,    243,     27,
+      -200,  -1373,   1468,  -2040,    151,   -675,     65,   1464,
+      -432,    545,    269,   -510,    584,  -1935,    970,   -319,
+      1465,    490,    263,    555,   -256,    -49,    315,   -242,
+      -394,   -312,    -88,    201,   -121,   -302,    172,     49,
+       234,     59,    327,    155,    199,   -187,    -41,    -74,
+        52,    -31,    -59,  -5574,   -121,    282,    343,   -125,
+      -200,   -575,   1328,    155,  -1928,    250,    702,     21,
+     -2718,   -153,   -102,   2131,    612,    432,  -1072,   -457,
+       222,    427,    144,    149,   -433,  -1573,   1337,   -650,
+       176,     13,  -1273,    280,   -751,   -236,    453,    204,
+     -1595,  -2896,   -272,    233,    485,     82,   -139,   -528,
+      -140,   -399,    -56,   -274,   -335,    176,   -756,    243,
+      2250,   -305,    721,   1711,      7,  -1230,  -1590,  -1872,
+      -137,   -714,    263,  -1643,    362,   -266,   -176,     64,
+       -36,    -63,    687,   -483,  -1488,    709,    929,   1349,
+     -1245,    645,  -1619,    735,   -651,   1850,   1031,    159,
+      -625,    838,    242,   -396,   -397,    -41,   1237,    304,
+        81,    -94,   -736,    578,   1279,   1064,     81,   1900,
+      -179,    224,    266,   -429,    734,    500,    995,   -882,
+      1563,   1813,   -519,    758,    532,    -27,     27,    453,
+};
+
+static const int16_t cb4432m0[] = {
+     -6132,   -262,   -273,  -1250,   -577,    984,   -430,   -410,
+      -464,    577,   -578,   -178,    -32,    369,   -624,    267,
+       -68,    474,   -480,   -225,    166,   -409,    437,   4633,
+        98,  -1560,   -464,   -869,    103,    193,    461,     72,
+       292,   -245,   1102,    417,   -325,    461,     74,     43,
+      -120,   -213,    333,    160,   -468,   -212,     31,    -81,
+      6516,    182,    201,   -212,    -66,    -49,   -266,    148,
+      -108,     98,    -46,    -11,    -59,    -20,    -20,   2332,
+      -294,   -560,    198,   -647,    -47,   -638,  -3877,     11,
+       834,    547,     47,   2541,   -126,     -5,   -366,    339,
+         3,      2,    -66,     60,   -526,    914,    321,   -658,
+      3605,     59,  -2392,   -655,    384,    775,    366,    327,
+       356,    386,    751,   -375,     38,   -205,    -15,   -442,
+      -212,  -1241,   1913,   -421,   -755,     45,  -1637,    -36,
+     -2435,   1504,  -1248,   -763,   -664,    133,   -123,    814,
+       241,   -243,   -446,     66,   -131,   -213,   2036,   1294,
+     -2138,    677,  -1042,   -771,    294,    371,    474,     85,
+      1403,  -2618,   -478,   -537,    275,   -826,    349,     84,
+       264,   -272,    -61,   -705,    175,   -972,    868,     25,
+      4183,    881,   -639,   -833,   -757,  -1063,   -991,   -257,
+      -137,   -619,   -285,   -454,     77,   -169,    316,    -45,
+      4362,   -203,  -2132,   -424,   -820,   -503,    340,    340,
+      -612,    648,      2,   -342,     81,    630,  -1518,    235,
+       216,    210,    665,    231,    130,   -879,     38,    675,
+      -136,    -48,    540,   -234,   -152,   -169,  -5745,   -294,
+       -24,      8,   -129,     -8,    308,    -14,    -16,    147,
+        62,     70,    248,  -2014,     76,   -190,   -328,  -1899,
+      -353,   -140,    836,   -365,   -112,  -3945,   -736,    467,
+      -258,    601,    617,     74,     62,    394,    180,   1151,
+      -810,     36,    457,    406,     75,     -8,  -5004,   2335,
+      -108,   -123,    299,   -335,    112,   -499,   -268,   -185,
+       461,    208,    -38,   -164,    764,   -504,    272,   4853,
+       396,    265,  -1133,   -433,    769,   -458,   1005,    645,
+        81,   -172,    385,    -56,   -130,   -393,    128,    -73,
+        31,   2038,    127,   -436,    123,  -2525,    282,   -448,
+      -489,   -295,    -14,     85,   -462,    -49,    262,    -93,
+       238,   -148,  -3953,   -414,   -259,     33,   -892,    459,
+     -2186,     60,    444,   -610,    844,   -486,   -299,    219,
+      -433,     19,  -1183,    276,    -29,    388,   3327,    102,
+      -914,   -221,    486,   -892,   -550,    190,    151,   -141,
+      -336,    194,   -242,   -224,    405,    879,   1600,    349,
+     -2082,    -38,   -514,     18,  -3574,    161,   -142,    -38,
+     -1815,    540,    228,     33,    164,   1074,      4,   -278,
+       -58,   4085,   -295,   -795,     31,    494,    555,   -250,
+        22,   -202,   -312,     92,    109,   -238,   -448,   -622,
+     -1511,  -4346,   -417,   -706,     37,   1157,    -96,   -199,
+       -59,    285,    -43,   -217,    -22,    -95,    103,   2242,
+       244,     45,    -74,     -7,    366,    -79,   -359,   -286,
+       188,    -14,     34,     49,    245,   -108,    -84,     88,
+      -333,   -216,    -79,     15,  -5710,    -36,   -102,   -552,
+      -213,     -8,   -356,    515,    212,   -265,     80,    316,
+     -1163,   -561,   -517,   -714,   -375,  -4176,     73,   -666,
+      -363,    -28,   1248,    -68,    478,   2648,    642,   -710,
+      -555,   -744,   -166,   -744,   -596,    138,    499,     59,
+       453,   -583,   -290,    -11,    -48,   4174,   -252,    -74,
+       -78,    -62,    449,   -265,   -818,   -357,    171,   -513,
+        72,    106,    -45,    649,    145,   5558,    -60,   -136,
+        69,   -172,   -134,    -66,    -68,    100,    683,   -427,
+       795,   -407,    345,   4930,   -838,    361,    279,   -190,
+       173,   -341,     -9,    722,    383,   -140,    123,   -269,
+       154,     31,    335,   -465,    311,     46,   4535,   -131,
+        90,    151,    287,    -11,   -526,   -614,  -2253,   -321,
+       -93,   -550,   -128,     25,    303,   -139,     19,      0,
+     -3255,   -161,    276,    103,   -245,   -515,    816,  -1042,
+     -1449,   1693,   -627,   1287,   -837,   -727,    -80,   -478,
+      -337,    116,      1,   -270,   -567,   -311,   -407,  -1656,
+      -216,    196,   3004,   -285,   -521,   1510,   1818,   1392,
+        42,    -44,   -244,   -349,    959,   -183,     25,     58,
+        43,   -345,   -310,  -8192,    -84,    311,    -60,   -348,
+       125,     33,    -79,   -138,     88,    138,   -121,    -37,
+      -211,   -118,   -142,    -37,   -132,    181,    162,  -1423,
+      1781,  -3453,   1261,    134,    670,   1218,    761,    292,
+      -146,   -825,    672,    737,    293,    433,    245,   -392,
+        46,    598,    257,   -234,  -1201,    718,  -4549,   -573,
+      -696,   -224,    -85,     75,   -268,    244,   1817,    341,
+      -166,    436,   -386,  -1247,     22,   -112,    -55,   -451,
+       106,    388,    -32,   -254,  -2400,   -373,    892,    334,
+     -4114,   -307,   -107,   -316,     41,   -214,   -403,    -56,
+      -469,   -246,    120,   -237,    266,     43,   3257,  -3925,
+       291,    239,    752,   -411,    162,    437,    159,    256,
+        37,     71,    -79,   -136,   -475,    124,   -208,   -216,
+      -245,     16,     40,   -459,  -4320,    340,  -1462,    914,
+        10,    490,    436,    162,    271,   -238,    -38,   2219,
+        25,   -141,    405,    107,    235,    282,    -55,     -7,
+     -3429,    565,  -1095,   -678,   1979,    233,   -874,    592,
+      -474,    680,    402,   -738,     21,    274,   -321,    655,
+      -348,   -546,    510,     62,     23,   4722,    572,    423,
+      -256,    473,   1240,   -997,   -899,    -53,    -73,    332,
+      -902,   -771,   -335,      0,    769,   -587,    592,   -703,
+      -600,    -77,    -94,   -207,    792,   -133,   -758,    500,
+       -14,    330,     22,   -281,  -5460,    152,    607,    337,
+       -39,   -118,    -80,    -51,    228,     65,     -6,    540,
+     -3515,  -1712,   -449,   -157,   -164,   -195,  -1655,  -1285,
+        90,   -517,   -116,     11,   1402,   -162,    -64,   -103,
+        46,    302,     37,     71,   2903,   2952,    780,   -487,
+      -297,   -426,   -369,    150,   -129,   -233,    813,   1639,
+       190,    310,   -311,    320,     94,   -247,   1484,    -32,
+        70,   -220,    560,    372,     54,    205,     96,  -3567,
+      -680,   1683,  -2377,     17,    548,   -266,    257,    656,
+       331,    205,   -121,   -814,    139,    326,   -370,    625,
+      2035,    818,    775,  -1165,    -41,  -4258,     41,   1109,
+       984,   -885,    -43,   -314,    204,    204,     95,    407,
+      -351,    101,    133,   -929,    899,     -6,    384,   -177,
+      -330,    240,     90,     78,   -318,   -455,     -5,   -365,
+       -61,    -80,    -72,  -4850,   -338,   -384,     30,    181,
+     -2721,   -767,   3217,    453,   -226,   -582,    283,    135,
+      -103,    265,    494,  -1444,   -120,     70,   -976,    -67,
+       -90,    660,    366,   -609,     32,    205,     73,     51,
+       346,     -6,   -120,    -10,    300,     32,    270,    139,
+       -55,    453,   5712,    353,   -145,    176,   -168,    216,
+       205,    -30,   -304,   1085,    221,    464,   -426,   1662,
+     -1397,  -1114,    301,  -1058,   3553,   -388,    743,    696,
+      -893,   -296,    -57,   -254,   -251,   -178,    417,     82,
+      -988,  -3566,   2171,  -1312,   -954,    -23,  -1349,    480,
+       566,     24,   -643,   -292,    -68,    303,     73,    -81,
+       296,      7,    371,     94,   1718,    498,   -774,    857,
+      1014,    358,    436,    210,  -3481,   -202,   -416,     59,
+      1987,    137,   -476,     32,   -627,    193,    368,     -3,
+      -290,  -3035,   -352,   -455,   -609,   -175,     -5,   -600,
+      -181,   -249,  -2551,    226,    105,   -249,   1851,    -86,
+     -1203,    214,    -57,   -505,   -522,   -247,   -154,    -40,
+       -17,   -523,    333,  -1777,   -354,  -1568,  -3492,   1032,
+      1577,     90,    153,    534,   -106,   -538,    102,      3,
+      -198,    -99,    -23,    835,   3495,  -1099,     44,    732,
+      -350,    926,   -472,    533,   1529,     54,   -844,   1295,
+       573,    414,    -23,    -71,    279,   -891,    287,    126,
+      1456,    973,    456,   1608,   -646,  -1244,    452,    651,
+       694,    855,   -235,   -503,    745,   -544,  -3512,   -138,
+       678,    473,    220,   -273,     -9,    265,  -1874,    397,
+      1196,    284,   -963,    298,    318,  -2309,   -162,    322,
+     -1250,    -16,  -1004,     -5,   2800,    -64,     72,   -482,
+      -162,   -412,  -2922,    774,   -335,    238,  -1144,   -134,
+      1428,    558,   1969,   -659,    902,  -1698,    793,   -858,
+      -613,    998,    253,   -336,   -348,    -80,   -117,   -264,
+       355,    808,    784,   -559,   2030,   1952,   -244,  -1130,
+      -986,   1883,   1171,   -493,   -326,   -880,   2588,   -243,
+      -204,    194,   -172,    -65,   2026,    424,    587,   -317,
+      2550,   -601,    203,   -669,    475,   -676,  -1492,     27,
+        41,  -1078,   -299,   -630,    177,   -164,   -429,   -246,
+      -357,   1191,   -867,  -1363,   1621,   -110,    916,    217,
+     -1269,    622,   -434,  -1113,    888,    -41,   1020,  -1774,
+        46,     80,   -483,   -892,    -61,   -472,    193,   -192,
+      2000,   -103,    740,   -223,   2493,    422,   2508,   -331,
+       470,  -1233,     47,    595,    795,   -465,   -320,   -163,
+       128,      6,   -209,    603,    536,   -416,  -1455,    -87,
+     -1191,    -98,   -281,   1003,   1421,    388,   1163,  -1146,
+       -81,   -299,   2518,  -1072,    207,   -443,    506,   -220,
+      -346,     98,   2119,   -416,  -2268,   -498,    109,  -1342,
+      -335,   1125,   -712,    156,  -1088,  -2092,   1164,   -500,
+       113,    -17,    551,   -199,    262,    -27,   -692,   -629,
+       204,  -1448,  -1606,  -1554,    289,    382,   -691,   1229,
+       414,  -1746,  -1198,   1113,   -386,    310,   1354,    -12,
+      -284,   -569,     46,   -558,   1495,    172,   -899,    617,
+       827,   -365,    100,   1008,    136,   2111,     10,   2320,
+      -291,    364,   -401,   -408,   -528,   -612,    127,   1218,
+      -384,    129,  -1603,    438,   1029,   2536,   -150,  -1432,
+      -856,   1068,    773,   -762,   -808,    676,   -693,    404,
+       145,      4,     27,   -148,   -318,  -1019,   -277,   1404,
+       880,  -1135,    861,    903,    739,    303,    139,   1918,
+      -952,    801,   -306,  -2439,     -3,    442,   -590,  -1034,
+       178,    430,    153,   1853,   1997,    742,   1745,   -608,
+      -237,    160,    523,    950,     82,  -1468,  -1592,    807,
+       719,    618,    319,     57,    235,    287,   1344,    -50,
+       324,   -182,   -365,   -381,   -377,   1989,    147,   -573,
+      1246,   1769,   -473,   -178,    961,  -1297,   -750,  -1428,
+     -1246,    789,    158,    612,     17,   -292,   -227,   -142,
+        64,     51,    -16,   -301,   -287,    -60,   -404,   -267,
+       109,   -108,    189,   -438,     48,     95,  -5059,    -42,
+};
+
+static const int16_t cb4432m1[] = {
+      7567,    273,    268,    -74,    201,    274,   -149,   -146,
+      -262,    243,   -273,     63,   -127,    135,   -160,    231,
+       120,    209,    -91,   -218,    -38,  -1206,   -468,   -159,
+       278,    536,   -995,    -60,     22,   1041,   -550,   -121,
+      -241,   -664,    427,   -416,  -1395,   -732,    152,   3247,
+       -67,   -154,  -2430,    421,   -405,   -558,    -73,  -2887,
+      -272,    -60,    365,    745,    287,   -622,  -1103,    412,
+       266,     82,     61,  -2172,   -379,    529,   -125,  -1482,
+       319,    643,    222,   -508,   2451,   -970,     71,    237,
+      -280,    202,    983,   -223,   -307,   -130,    217,   3209,
+        49,    -30,    275,    -12,   -260,  -3959,   1219,   -104,
+     -2700,   -201,     54,    851,   -590,    691,   -254,    408,
+       296,    -48,   -364,    216,     16,    220,   -415,    218,
+        83,     43,  -4032,  -1359,     25,     15,   -279,  -2092,
+       794,   -433,   -195,   -162,    606,    166,     87,   -316,
+       508,    242,   -359,    687,   -178,     14,  -2969,   -500,
+     -1041,   3234,    679,    170,   -791,   -127,   -630,    -16,
+       -19,    181,     -2,   -185,   -172,    -88,   -118,   -167,
+       128,    121,    239,    321,   -125,    217,  -7260,   -157,
+      -161,   -347,   -257,    102,  -1181,     71,   -379,   -205,
+      -268,    144,   -174,   -106,    305,     23,    -47,    202,
+      -110,    660,     54,  -2963,   -119,  -1371,  -2823,   1171,
+      -726,    690,    534,    161,   -435,    753,     58,    227,
+       241,    138,    -76,    473,    193,  -1926,  -2183,  -2526,
+     -1428,    284,  -1270,    336,  -1458,    208,     41,   -356,
+       345,    153,   -273,   -166,    500,     42,    120,    -35,
+       -81,     56,   1747,  -3050,  -2029,   -764,   -947,    888,
+       422,    374,    143,   -318,   -225,    604,    343,    -91,
+      1626,     75,   -211,    160,   -667,   -195,     38,   -446,
+     -1269,   -108,   -959,   -616,   -530,    554,   2865,   -156,
+      -358,   -429,   -261,     23,    511,    340,   -548,   2347,
+       105,     12,    -32,    164,    170,   -168,    268,   2587,
+      3511,    612,    329,    159,    456,    273,   -452,    168,
+      -394,    799,    -58,    160,   -480,   -257,    242,    167,
+        46,  -1433,  -1631,     50,    852,    509,    864,   -381,
+      -306,   -698,    261,   -702,    -19,   4113,    -38,   -153,
+       -11,    405,   -441,   -120,    139,   -265,    225,    342,
+       199,   2085,    237,    278,    252,   1537,    119,    182,
+      -174,   -193,   2486,     87,   2903,   -311,   -304,    273,
+      -217,   -256,   -264,   -675,   -819,   -188,   -615,  -1183,
+       495,   -154,   -687,   2423,    197,    -63,   -146,   1151,
+       896,  -1129,    -58,   1114,  -1644,   1219,   -648,    -71,
+      -130,  -2643,    533,   -218,   3942,    -83,    208,   -724,
+       198,   -643,    590,   -944,    -56,   -420,    115,     23,
+      -414,   -144,    295,    219,    -36,    393,   -174,     91,
+       290,  -7066,    158,   -275,    -70,   -119,     -1,    302,
+      -262,    -73,    -61,    110,   -196,    -25,     87,   -446,
+      -159,     -6,   -107,    115,  -7562,      5,    -33,    284,
+      -106,     34,   -140,    160,   -304,   -272,   -169,     25,
+        93,   -205,     28,    169,   -165,    -34,    -50,    343,
+      2204,   1440,    817,  -1921,   -590,   -527,     81,   -364,
+      -354,    163,  -1058,   1977,    244,    -75,   1201,   -207,
+       293,   -289,   -105,   -121,   3588,    925,     -2,   -201,
+      -860,    917,    100,    265,   -200,    -44,   -529,    351,
+      -579,   -103,    186,  -3622,     52,    181,   -259,   -411,
+        -4,   -328,    380,    517,    306,     57,    340,    -65,
+      -263,   -311,    494,    326,  -6136,    747,   -141,    296,
+       217,     -2,   -125,      8,    -88,    254,  -2934,   -259,
+       946,   -905,    653,    436,   3393,   -147,   -157,     27,
+       166,    299,      8,    -16,    643,    114,    217,     57,
+       -21,   -298,     19,    129,   1721,   -134,   2337,    781,
+      -483,   -748,    118,   -330,   -226,  -3762,    222,   -417,
+      -154,    -24,    -13,   1138,    210,    357,   -122,    257,
+      -369,    863,     13,   -320,   -439,   -433,   3469,   -869,
+       116,  -2772,    202,   1065,   -130,   -287,    142,   -288,
+        54,    318,    131,    -16,     84,    238,   -361,    934,
+      1341,     37,    130,   -412,    146,   -724,     -3,   -823,
+      2555,  -1263,     11,   -147,   3164,    -83,    -39,   -127,
+       258,     26,  -1181,   3339,   -676,    -30,    -56,    691,
+       867,    715,   -903,    293,   -205,   -392,    -22,    529,
+       -76,   2201,    433,    134,   1338,    -18,     85,   3128,
+        33,    924,    257,   1662,   -769,    321,   -449,   -374,
+       -58,   -597,  -1670,     97,    222,   -998,    404,   -155,
+       133,    358,   -250,   -125,    163,   6027,   -228,   -116,
+       -61,   -878,   -693,    710,   -516,   -191,    -27,    443,
+        83,   -174,   -695,   -117,   -107,    -53,   -142,     92,
+      -145,   -114,    -62,   -710,  -3192,   -872,   3284,   -521,
+       -36,   -948,    252,   -253,   -143,    260,    109,    -24,
+       262,   -169,   -196,    195,    105,     27,   -135,   1722,
+      1862,   -513,   -270,   -144,   -414,    -59,     91,   -288,
+       -96,    -56,   -204,    273,    170,   -171,    -62,  -4993,
+      -125,    -67,    -50,    226,   -275,    600,    105,   -217,
+      -450,    -87,    -20,   -353,     24,    -74,    167,   1881,
+     -4260,   -144,     48,     92,    187,    319,    341,     22,
+        -4,    405,    147,    237,   -120,    122,   -237,     56,
+      -515,   -153,    333,    834,    401,    210,  -5516,      7,
+       127,    147,   -140,   -479,    -26,  -1669,    -21,   -147,
+        60,    387,    565,   -140,  -5827,   -269,  -1119,   -324,
+       118,   -199,    -11,    105,    -49,    150,   -148,    178,
+       182,    162,    150,     68,   -227,      3,    221,   -330,
+       -23,     65,   6262,     71,     48,    -41,    -10,     -1,
+       -44,   -255,    -50,   -138,   -109,    -54,    -31,    492,
+      -214,    239,   -194,     35,  -6348,   -148,      9,     25,
+      -123,     84,   -448,    241,    148,    -35,     52,     35,
+         7,     99,    -16,     57,    -43,   -256,   3336,    373,
+       211,   -513,   2328,     86,   -274,    386,     74,   -174,
+       624,  -1037,  -1154,     36,   -209,  -1028,   -101,   -412,
+      -103,   -267,   -107,   -126,    163,   -394,  -1097,   -100,
+     -1575,   -542,   3326,  -2149,    547,    626,   -278,   -414,
+      -781,    486,   -186,   -159,    138,   -187,   -821,    419,
+       393,  -4266,    828,    431,     86,    745,   1313,   1484,
+       260,     52,    163,   -455,  -1071,    186,    522,    288,
+       421,     18,     97,   1267,    200,   2637,   -189,    729,
+       746,    203,   -639,   -843,   2164,    671,     84,  -2384,
+       430,   -161,    404,    166,    -33,    -17,    591,   -227,
+     -3849,   1579,    175,   -718,     99,   -410,   -844,   -239,
+        32,    212,    163,    480,    843,   -379,   -621,   -317,
+      -424,    113,   -262,     44,    -93,    529,    144,   -218,
+       140,   3257,   -575,  -2697,    144,    -83,   -186,    -44,
+       977,    153,   -230,  -1530,    234,    212,    212,    331,
+       412,   -125,     -3,    422,   -329,  -2181,   1406,    363,
+       -90,    -86,    329,   -267,  -4462,   -189,    -87,    154,
+        66,   -200,     37,     80,   -109,   -199,    125,   1983,
+       260,   -438,  -2417,   3259,   -974,    453,     41,    -77,
+      -538,   1123,    119,    120,    254,   -239,   -134,     33,
+      -384,   -407,     27,    465,   1810,   -910,    980,    -15,
+     -1307,   -919,   1880,   -327,   -303,   -198,    149,    413,
+      2176,   2269,   -707,    343,    360,    169,    148,    182,
+       104,    163,    857,    291,   -153,    303,   -679,   -386,
+      -868,   2283,   -320,    167,   3257,   1741,    338,    467,
+       209,    207,    834,   -226,   -479,   -120,   1674,    -61,
+       696,    -93,  -1327,   2176,    716,    402,   1688,   2219,
+      -339,    779,    366,    358,    241,   -695,   -272,   -136,
+       -48,     36,   -269,    862,   -616,   -118,  -2028,   1678,
+      1971,    115,    290,     71,   -765,     31,  -2874,    122,
+        13,   -424,   -281,   -320,    233,  -1032,     40,   -186,
+      1208,    274,  -2310,  -1594,    289,    230,   1264,    962,
+      -310,     23,   -548,     12,    -38,  -2734,    664,     37,
+       346,   -620,    266,    -98,     82,   2369,    963,  -1391,
+      -451,    833,     82,    175,    448,   1874,    345,   -440,
+       155,    130,     94,    326,   3223,    234,   -163,   -384,
+      -354,   -539,    827,     -9,    530,   -226,    -21,    332,
+     -2298,   3221,   1470,   -282,   -800,    231,    314,   -998,
+     -1051,   -648,   -434,    743,    -72,    119,     91,    414,
+       379,   1370,   -637,   -998,    851,  -2904,   -266,  -1652,
+     -1356,  -1339,  -1679,   -181,    245,    731,   -231,     -2,
+       221,   -182,   -325,   -411,    346,    246,  -2629,   1736,
+      -361,     24,    229,   1168,    747,    309,    425,   -128,
+      -320,   -496,    109,   1496,    -70,   -797,     37,   -271,
+       -39,    906,    -62,   -194,   1753,    311,    689,   1354,
+     -1035,   -973,   -438,   1166,   2197,    -99,   -380,   -274,
+     -1565,    447,    100,    349,    485,    653,    744,     50,
+      -582,   -123,  -1396,    156,    -27,    349,  -1067,  -1382,
+      1388,  -1061,   -554,    894,    -80,   -783,  -1500,   -736,
+       897,   1158,  -1386,    -40,   -280,   -819,   -672,   -895,
+       994,   -308,   -466,   -578,    455,  -1536,    879,   -448,
+       542,   1508,    850,  -2465,    816,    641,   -427,    310,
+      -168,    -41,   -908,   -302,   1513,    -29,  -1144,    588,
+     -1703,   1144,   2623,     90,    284,    866,    335,   -351,
+       419,   -745,    879,   -183,   -824,  -1713,    -34,    -15,
+      -913,     37,   -460,    778,   2130,   -145,   -153,   1761,
+      1420,   -243,    -32,   -877,    140,   -700,    612,  -2053,
+       321,    -78,   -165,    200,    526,  -1002,   2176,  -1022,
+      1436,    298,    -21,  -1378,    515,    304,    974,   1722,
+      2054,    661,    425,    282,    471,    438,     70,    169,
+      1587,  -2076,    -40,   -702,    264,   -146,  -1499,   -863,
+     -1775,  -1059,   -490,     92,    631,  -1194,  -1031,    335,
+       257,  -1299,    241,   -270,   -325,   -322,    -37,      0,
+      -685,    897,    984,   -909,   1556,   1281,   1367,  -1269,
+     -1591,    415,  -1156,   -374,   -110,   1552,   -695,     74,
+      -167,   -473,   1421,   -611,    175,   1521,   1322,    436,
+      1969,   -787,   1041,   -730,   -598,    188,   -794,   -531,
+     -2198,   -317,    -11,     -8,   -407,    198,  -1180,  -1675,
+       174,    981,    467,   -149,   -890,    263,   1030,   -121,
+      2147,   -135,   1975,   -634,    431,   -238,   -695,   1338,
+      -172,    110,    147,   -334,   -726,     65,   -873,    667,
+       997,  -1118,   -339,    144,   -700,   1303,   -207,   -609,
+     -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,
+       -96,  -3145,   2917,   -260,    349,    668,    -72,      6,
+       157,    -62,   -128,     20,    -82,  -1357,   -707,   -619,
+      -313,   -229,   3010,   -169,    -27,    738,    971,  -1450,
+       246,    154,   -163,    -15,    -93,      5,    -35,    -42,
+        24,     31,    -25,   6803,     33,    -32,    -68,    -68,
+       -44,    317,     43,   -106,    608,   -999,   -699,    582,
+        46,   1631,    830,  -1570,  -2645,    992,   2126,    132,
+      2377,   1551,    247,   -247,   1508,    -34,    162,   -275,
+       -81,   -654,   -625,    125,    -33,   -210,    309,    900,
+       571,    726,   2691,   2821,   -698,     60,     46,   -483,
+        14,   -210,   -295,    102,    214,    226,   2622,    -82,
+      -390,   1436,    107,    554,    381,   1307,   2283,   -190,
+        27,    -35,   5557,    283,    103,    180,    104,    -89,
+      -186,   -319,   -225,   -141,     92,      1,  -1942,   1025,
+       906,     32,     -3,  -1089,    182,   -799,    483,   -368,
+     -1734,   -103,   1680,    474,   -133,  -1067,   -545,   -219,
+      -118,   -635,  -2559,   1002,   2554,   -640,   -505,    179,
+      -344,    -81,    107,    -61,     79,    -12,    -29,    -37,
+     -7574,    -92,     64,     92,   -164,    -20,    -61,    -35,
+      -312,   -159,    333,  -3401,  -2596,   -344,     88,    604,
+       535,    -87,    365,    -13,    -77,    131,    127,    588,
+       302,    -94,   -506,   2427,     99,    304,   2653,  -1104,
+      1380,    976,   -530,   -120,   -105,    293,      9,   -826,
+       388,    -66,    421,   -202,    605,    675,   4060,    978,
+       143,    -94,     21,  -2444,    -30,    554,    695,   2878,
+       657,   -104,   -435,   -326,    307,     20,     20,    159,
+       106,  -3473,    326,  -1029,   -304,    670,  -2109,   -431,
+       573,    704,    293,    -45,   -169,   -119,   -191,    599,
+      -910,   1976,   -165,    581,   1209,  -1689,   2365,   -370,
+      -601,   -696,    374,    202,   -114,    -61,      3,    -63,
+        30,    369,   -158,   -128,    198,     52,    -98,    -44,
+      -323,  -5118,  -1100,   -669,   2256,     32,    -66,    206,
+        65,   2801,    783,   -470,   -973,    471,   -211,    -27,
+      1879,    302,   -388,   -249,    301,    537,   2761,    321,
+       571,     20,    337,   1336,    522,    231,    368,   -363,
+     -2065,    -57,  -2565,   -584,   -611,     56,    814,   -382,
+      1671,    408,    492,     12,   1201,   1513,    247,   2165,
+      -592,  -1246,   -493,  -1012,  -1330,   1251,     75,   -100,
+       182,     52,    -47,    710,  -1137,   2420,   -559,    266,
+      -801,   2523,   1229,    736,   -409,    -49,    269,   -174,
+      -179,    -24,    348,   -661,    251,  -1039,   2647,    283,
+       728,  -1850,  -2088,    196,     39,    -72,    -35,    -94,
+      -540,    266,    340,   -450,    763,     -5,    113,   2618,
+     -2737,   1047,   -246,   -522,   -182,    376,   1068,    203,
+      1238,   -938,    211,   -308,   -395,   -629,    596,  -2634,
+      1452,  -1155,     83,    -89,  -3121,    419,     40,   2691,
+      -306,   -343,      4,   -347,   -725,   -117,   -315,    115,
+      -215,     26,    429,   1074,  -1831,  -1850,   2609,     72,
+       467,    191,    432,    857,   -186,      0,   -443,    -24,
+       500,    541,     30,   2324,  -1160,  -1153,   1783,   1282,
+     -1992,    101,   -108,   -108,    556,  -2012,    506,    691,
+       -65,   -610,    402,    610,   1941,   -121,    942,    589,
+      1879,     58,    312,  -2218,  -2056,  -2284,   -350,   -453,
+       306,     38,   -579,   -185,   -101,   -196,   -150,    156,
+       126,    -44,   -143,  -7923,    126,   -120,   -138,   -233,
+        97,    -20,   -121,   -175,     -8,    -13,   -123,   -365,
+       251,    730,   2883,    667,   -418,   -208,   2170,  -1442,
+       196,   -389,   -516,    252,    -98,    525,  -1819,   -647,
+      1575,    768,   1124,   -428,  -1010,  -2027,    411,   -473,
+       863,    210,    908,     40,    145,     37,    192,    189,
+        52,   -217,   -168,     63,     -7,    -53,   -121,     13,
+      -145,      0,    -37,     61,  -7979,   -142,     32,    118,
+       190,     -7,    -13,    113,     36,     31,   1461,  -2088,
+      2391,   -939,    -66,    822,    280,    246,   -157,   -183,
+      -433,   -356,     88,   -101,   3969,  -3388,    -84,     84,
+       130,     35,     74,     37,    181,   -195,    219,    -29,
+       -23,    -32,     69,    625,   2328,   -192,  -2617,    287,
+       543,  -1604,    823,   -547,   -277,    764,    276,    156,
+       198,     17,     84,    346,    -27,   -129,    143,    217,
+       212,   -249,     20,   6449,      7,     51,   -889,    -88,
+       265,    282,  -1956,   1327,  -1025,   1338,  -1709,  -1008,
+       372,     57,   1404,    234,   2621,    -18,    663,    301,
+         0,    167,   -372,  -2534,   1945,   -191,    198,    359,
+       -43,     92,     24,  -5498,    -63,    189,     36,   -369,
+       352,    381,   -205,   -144,   -119,   -267,    -60,    -10,
+       387,   2388,   -155,   -450,    465,   1529,   -216,   2673,
+      -146,    118,     50,    290,    147,     11,  -2912,    863,
+      2184,   -689,    -44,     59,   -663,    663,    675,    295,
+      1331,   -115,    -10,    -54,     -1,     31,   1699,    127,
+       215,   2966,    163,    416,  -1053,   1216,    356,   1428,
+      -166,   -172,     -2,   -355,   -169,   -331,    -94,    -78,
+      -123,   4875,    311,     67,   1145,    397,   -288,    212,
+      -344,   -290,    126,     16,    176,    485,    551,   -526,
+        11,    120,   -274,     83,  -5399,   -154,  -1611,    887,
+       321,   -446,   1166,   -333,    652,    310,   -895,     62,
+      -219,   2840,   -753,    -34,  -3203,  -3600,    464,   -249,
+       336,    297,    -85,    316,    144,    306,   -249,    149,
+       112,     73,    192,    -89,     18,    197,    116,     51,
+        37,    212,  -7248,    163,     31,    -52,    -31,   -101,
+     -1366,   -353,   -325,  -1335,   -440,   1193,    670,  -2635,
+       872,   1400,    733,    395,    122,    130,  -4146,      0,
+      -382,   1486,    308,   1179,   -412,    288,    701,    161,
+       147,    959,     60,     77,   -123,     17,    193,    204,
+      -226,    388,    272,   -588,   -157,   2823,    735,   -745,
+      2368,    359,  -1088,  -2004,  -1293,   2018,    483,    320,
+     -1014,   -806,   -479,    -68,    -51,    168,    873,     27,
+     -7906,     57,     19,    -23,     27,     43,    -13,    -50,
+        93,     16,     29,     31,    -26,     32,    -22,    453,
+      2922,  -2560,    138,    923,  -1245,   -405,     10,    228,
+      -270,    145,   -192,     83,     48,    101,     77,   -226,
+        36,   7792,    126,   -275,    -37,    -36,      9,     45,
+       -89,     13,    148,    125,     24,   -442,    111,    -12,
+       540,   1794,   3008,   1620,   -185,  -1394,   -161,    -25,
+      -313,   -317,    591,   2507,    134,   -369,     77,    527,
+      -619,   -236,   2681,     87,  -1060,    -34,   1894,  -1123,
+       373,   -628,   1934,  -1279,  -1689,   -609,   -472,   -598,
+       405,    229,    414,     12,  -2923,    -33,   -435,    -49,
+      2380,    -34,   -344,  -2171,   -284,    274,    226,   -287,
+       -84,    -57,     -1,   -169,    -50,    479,    707,  -2774,
+      -532,   -640,   -244,     44,    458,   2519,   -590,   -472,
+};
+
+static const int16_t cb4448sl1[] = {
+     -2878,   -714,   3098,    -76,    -51,    232,    118,   -780,
+      -691,   -267,   -309,    105,   -179,     -5,    -84,    -11,
+      -120,   -379,    458,  -3161,     65,   2994,     64,    374,
+      -440,     62,   -183,     28,   -561,     73,     59,  -2565,
+       445,   -451,  -1026,    437,     10,   -173,   1243,  -2278,
+      -481,   -395,   -154,  -2402,    945,  -2789,    117,  -1184,
+        75,   -704,    527,    478,   -589,     17,    131,   -110,
+       574,  -1055,   -628,   -277,   2798,   1483,   -657,  -1996,
+      -248,    194,   -284,    822,    225,   -170,    -10,   -302,
+      -427,  -1700,    -90,   2756,   2124,    -49,   -964,    372,
+      -637,    443,     13,    -69,    -71,    196,  -1971,    110,
+      1147,    698,   1333,   1369,    527,    165,    903,    577,
+     -2134,     56,    -33,     34,    183,    247,   -342,    974,
+      1079,   2478,    -26,     80,  -2377,    430,  -1422,    428,
+     -2187,   -469,  -1280,   -326,    -40,    188,    911,    405,
+      2772,    279,   -493,    265,    768,     45,   5778,     44,
+       121,   -257,   -135,    124,    263,     15,    197,   -114,
+         5,    -14,     -8,    -82,   3989,   -511,    197,   2446,
+      -292,   -205,   -919,    162,   -121,    145,    -40,     71,
+      -105,     72,   2035,    960,   -145,   -467,   -518,    167,
+     -2988,    421,    860,    320,     40,   -446,    319,    160,
+       140,    511,    -55,    213,   -148,   -527,   -666,    687,
+         9,     23,    344,   -156,  -4646,   -125,   -220,      9,
+       134,    -25,     16,  -1319,    763,     58,  -1586,   -438,
+       301,   -411,   -337,  -3398,    358,    -68,   -111,   5483,
+       -36,   -456,    -94,   -116,    204,     95,     84,    -73,
+      -163,     69,   -190,     64,  -3716,   -326,   1815,   -843,
+       312,   -498,    684,   -641,   -766,   -104,    606,     70,
+      2630,     51,   -170,  -3584,    167,    461,   -162,    132,
+       496,     91,    171,    255,     48,      2,   -120,  -1196,
+       534,   -431,   2669,   -403,      8,    287,   -391,   2557,
+       849,    167,   -275,   -184,    605,  -3570,    113,     22,
+     -2586,    668,    294,   -910,     67,   -141,      0,    418,
+       271,     75,     90,   -124,    446,   -142,   -635,    631,
+      -956,   1566,     25,  -1982,    790,   2770,     33,   -520,
+        23,  -7488,     67,    -73,     60,     64,    -46,    -36,
+        76,      3,     22,    149,     61,     34,    255,   -380,
+      -284,  -2531,  -1423,   1507,   -926,  -1074,   -929,  -1430,
+      -141,    165,    -80,   -268,     21,   -767,   1542,   3197,
+      -191,   2014,   -304,    595,    536,   -906,   -126,   -354,
+       -76,   -162,   -125,  -3139,   3197,    934,    366,   -923,
+      -330,    277,   -284,   -163,    -12,    402,     15,   -146,
+        20,     83,    111,    196,     23,     71,     77,   7287,
+      -175,    -13,   -227,    -59,    -56,    -28,      1,    163,
+       -50,     59,    635,    150,     95,   2750,    775,  -2057,
+       423,  -1078,   1749,     -3,   -655,   -365,   -357,    145,
+       -76,      5,    -93,    224,    150,    108,    -34,    173,
+       148,   -371,     34,     48,  -8037,     65,     50,    103,
+       -42,    -10,    -96,    -90,     -3,     60,     92,    -79,
+       -76,    386,    114,  -1947,    833,  -1279,   -484,    217,
+      3156,    226,    485,   1191,    425,     88,    -59,   -243,
+      2292,   1681,    671,     62,    899,  -2453,   -100,   1039,
+       713,   -104,    554,    219,    356,    963,    741,   -102,
+       455,   2067,   -324,    172,     28,    772,    752,  -2351,
+     -1438,   -865,  -1668,    105,   1034,   1195,     14,   -350,
+      -425,   -648,   2086,   -532,    634,   1537,    -33,   -598,
+      2888,    -85,    184,    158,   -164,   3339,    237,   -284,
+       -54,   -246,     46,   -254,    365,     55,   1928,   -346,
+      -357,    331,    139,     16,    674,   -384,    -67,  -3399,
+       165,     76,    215,    137,  -3187,   -146,   -264,   -165,
+     -3039,    235,   -541,   -630,    -32,    -33,   -211,    160,
+      -121,   -111,  -1296,    -47,   -128,    292,  -1523,   1540,
+       771,   -166,   -509,    212,   2758,   -327,   -418,   -305,
+        -9,    465,   2513,    195,    -70,   -209,    -66,    127,
+      -147,  -3161,   -192,   -541,   -555,    131,   -858,  -1609,
+       973,   -156,  -1877,     60,   1011,     66,   -348,    912,
+     -1731,  -1296,    305,   -369,   -560,    470,     46,   -863,
+      -124,    -37,     40,   -395,  -4886,    -20,    221,    228,
+       177,    182,     98,   -151,   -195,    854,   -194,   -374,
+       301,    586,     58,   -908,    -19,  -4198,   -171,    330,
+        48,  -3312,   -164,   1913,   1183,    -42,   1287,   -353,
+       757,    620,   -547,    251,   -520,     59,     43,   -179,
+      -191,   -131,  -2951,   -944,  -2479,    344,   -813,    104,
+      -697,    -44,   -270,    198,    245,   2866,    208,    178,
+      -248,     38,     19,    577,   2812,   -765,   -855,   -439,
+       -60,    -30,   -352,   1521,  -1069,    457,    415,    572,
+      -749,   -144,    100,    515,   -794,  -1554,   2507,   -270,
+        10,     62,   2507,  -1550,    -75,     70,   2530,    562,
+       132,   -141,    251,    156,    835,    102,    717,   3226,
+      3327,    172,     84,   -205,    -11,    208,   -310,    164,
+       -27,     11,    281,     37,   -518,     20,    -76,     82,
+      5436,   -543,   -301,    112,    359,   -140,    -94,     78,
+       -18,     38,   -196,    -92,     13,   -111,    -23,     30,
+       -15,    -94,    101,    142,  -6455,    321,    322,     50,
+      -216,   -321,    -10,   -465,    101,     45,   -585,   -969,
+      1248,   -456,  -2523,   -852,  -2129,   -889,     33,  -1424,
+      1462,    583,    749,    527,  -1737,   1262,   -594,    414,
+      -215,  -1184,    412,   1758,  -1836,   1248,    440,   -178,
+       784,   3591,   -227,     43,   -493,   -766,   -270,    150,
+       151,    -56,   -110,  -2832,    -73,   -166,    470,   -179,
+      -681,     71,   -114,  -2743,   -806,   -560,     63,   -244,
+       -90,    182,   -143,    995,    404,    -13,  -1343,   1524,
+     -2472,   1718,   -957,   1229,    458,   -395,  -2817,   -579,
+       -99,    340,   1538,    684,   -492,   1156,    -45,    -65,
+      -305,  -1408,   -325,   -270,   -358,   -127,     92,    -97,
+       415,     85,  -4749,    173,   -296,   -203,    331,    315,
+       184,    -46,   1315,   -146,    -55,    427,     37,    255,
+      -209,    272,    735,    506,    105,    103,    902,  -3449,
+       116,   2304,    616,  -1564,   1508,    478,    320,  -2418,
+       244,   -176,    -32,    238,     92,    290,   -168,    -78,
+     -3464,    270,  -1902,      2,    696,     92,  -1610,   -206,
+       -49,    178,    121,     27,    119,     72,   -253,   -398,
+     -2720,    -81,   -162,   -550,   2595,   1445,    249,   -104,
+       218,   -310,    -95,     18,   -473,   1908,    432,   -227,
+      -168,  -2725,   -240,  -1830,    199,    437,  -1392,    304,
+      1461,  -2394,   -603,   -540,    769,    340,   -104,   1569,
+       -21,    338,   -874,   1533,    281,    -59,    487,   2120,
+       179,   -140,   -328,    -57,     63,   -110,  -1330,   -485,
+     -2427,   1159,    355,    -26,  -2055,    154,   -563,   -132,
+        49,   -329,   -187,    -24,    -71,  -3970,    276,    158,
+        92,   -202,      7,   -422,   -578,    186,   -407,   4960,
+      -595,   1027,    417,    691,     69,    133,    123,   -147,
+};
+
+static const int16_t cb4448ss0[] = {
+     -2680,   2499,   -328,   2212,   1288,    -57,   -727,     76,
+      -210,   -218,     41,   -343,    -26,    -38,     43,    606,
+      -619,   -531,  -2082,     87,  -1127,   1282,    -23,   2272,
+     -1816,    104,    -31,     85,    -22,     60,   1293,    138,
+       382,    432,    489,   -372,  -1649,  -2809,  -2556,    -98,
+      -232,   -233,    169,    186,     79,   1157,   2113,   -942,
+       636,    877,   -601,   2277,   1411,   1165,   1029,   -613,
+      -348,    -38,    -19,     45,   1318,  -1980,     12,   2762,
+      1519,    184,   1980,    -49,   -270,    361,   -172,   -601,
+      -196,    186,    -67,   -124,   1503,  -1011,    263,    223,
+      -384,    153,    -21,  -1063,   -239,   1171,  -3501,    512,
+      -162,   -180,    139,   -680,    609,  -1919,   2969,  -2321,
+      -183,    194,   -558,     26,     91,    340,    -25,    -31,
+       127,    662,    182,    191,  -2201,  -2603,   2252,   -523,
+       277,     50,    355,    295,    -65,    355,    207,     82,
+      -489,   -143,   -218,     89,    666,   -359,   2716,  -2310,
+     -1912,    417,    400,     43,    110,    -93,   -142,     61,
+     -3000,    454,   -153,      0,   -413,    469,    339,    318,
+      -197,     75,    -80,   2894,   -129,     82,   1431,   1183,
+       429,  -1556,  -1339,  -1573,    -92,   -911,   -230,    -12,
+        -4,   -145,   -388,   -419,     -5,   -241,   7120,    165,
+      -125,   -122,    126,   -150,    109,   -146,    -61,    -49,
+        47,     70,    -43,     40,   1867,   1473,  -1278,   1229,
+     -2256,    -90,     10,   -744,   1196,   -109,    402,    258,
+       690,    -74,     26,   1294,  -1079,    142,  -2384,   -324,
+     -1696,  -2741,    321,     66,     83,   -127,   -131,    156,
+       166,    135,   1812,  -3445,     10,    535,   -547,    481,
+     -2243,    287,   -335,    218,    195,     -1,    -25,    -94,
+       195,   1433,  -1428,  -1444,    520,    219,   3363,   -388,
+      -807,   -454,    -29,    316,    125,    159,   -144,   -156,
+      -317,    752,    256,    216,    340,    488,    147,  -5662,
+        55,   -110,    387,   -102,   -211,    -66,    -26,   3688,
+      -172,  -2366,   -244,     -5,    353,     11,    503,     88,
+       227,     69,   -240,   -187,    -58,   -389,  -1783,  -1427,
+        20,   -618,    544,  -1337,    628,  -3180,    708,   -538,
+      -423,    115,     49,   -161,    184,   -682,   -223,    689,
+      1299,   -891,  -1073,  -1228,   -305,     47,  -2221,  -1559,
+       598,   -380,    166,    143,   -366,    287,   2122,    509,
+       629,    235,   1523,   2900,   -640,   -425,   -462,   -231,
+       -53,    -27,   -263,   2090,  -1892,  -1147,    -42,    866,
+     -2301,    461,  -1082,   -625,    -85,    148,    229,    -25,
+        85,     53,    259,    -81,  -4072,   2577,    -12,     -7,
+       335,   -151,   -691,   -137,     98,    372,    -37,   -192,
+       -17,   3318,   -558,   2064,    396,    258,  -1067,    229,
+      1122,    298,    -25,     40,     27,   -134,   -166,   -247,
+     -2010,   -440,   1066,  -1400,  -3454,   -289,    428,    629,
+      -158,    126,    129,    183,    -12,   -171,   -120,    421,
+      -445,     66,   -900,   3680,   1583,   1985,     25,    229,
+      -535,     -1,     45,    207,    -54,    -30,   1581,   -938,
+      -703,    405,    878,   -398,  -1069,   1748,  -2587,  -1419,
+      -375,   -441,   -487,    109,     21,  -1399,    648,   -271,
+      -701,    635,    115,   -138,   -458,   -600,  -1891,    585,
+       420,  -1916,   1135,      7,   1584,    910,   4267,   1328,
+       279,    395,    -35,    -99,   -168,    503,    216,   -126,
+       211,    212,    193,  -2205,    491,    696,     41,    283,
+       649,  -3425,   -999,    200,    625,   -261,   -378,    -47,
+       -15,    -30,  -1262,   1700,  -2191,    196,  -1773,   -251,
+        84,    498,   -261,    150,    451,     41,    336,     27,
+       -56,    562,    -86,     -1,  -1073,   1461,   2148,  -2961,
+      -326,   -257,    440,    -42,    -48,   -320,    122,     94,
+     -1267,   -830,   2810,    -94,   -201,    990,   2415,   -740,
+      -166,   -267,   -157,     68,    301,    290,     65,    931,
+      1969,   -170,      6,    149,   -272,   -105,    542,    -11,
+     -3888,    105,    305,    333,    -14,    -39,   1944,  -1164,
+        88,   3829,  -1190,   -535,   -644,   -330,    509,    -93,
+      -314,   -228,   -294,   -342,    -26,   1143,  -2371,   -400,
+        74,    101,    -68,   -583,  -1091,   3367,   1146,   -638,
+      -436,    136,     41,    -92,   1518,   2818,  -2214,  -2044,
+       636,     -2,     79,   -508,    676,   -439,   -358,   -198,
+       -69,    271,     59,   1638,    468,     97,    264,     -8,
+     -5152,   -152,    152,    252,    401,   -375,    -17,   -132,
+        51,     63,    633,   -180,    367,    111,    -18,     15,
+       -52,    128,    -54,     11,     96,   -122,    -26,  -7257,
+       -42,  -1221,   -688,    197,   -107,   -217,    141,   -289,
+       141,    269,    439,   -747,  -3743,   2098,    226,    137,
+        26,  -1645,  -1735,    -80,     43,   -216,    245,    544,
+       157,     40,    238,    237,   -989,    379,     88,    639,
+     -1335,   1542,   1147,   -510,   1008,   -134,   -626,    696,
+     -3034,    334,   -689,    115,   -168,     39,   1750,   -649,
+      -233,    -99,   -231,    515,    112,    -11,   -162,   -133,
+      -138,   -486,  -4137,    204,   -102,    867,  -1030,    219,
+      -254,  -2787,   -128,    961,  -2837,   -482,   -195,    691,
+      -170,   -178,    164,    -54,  -2008,   -116,     74,    398,
+       -96,   -472,    407,     27,    287,    628,     97,  -1425,
+     -3923,      6,    117,  -1081,    930,    396,    452,     87,
+      -441,   -155,   -738,   1089,   2128,  -3133,    -21,   -622,
+       -48,   -127,    506,    985,   -200,   3361,    184,   -522,
+        41,    503,    209,     14,    -96,    791,   1263,    289,
+      -101,  -1728,  -1073,   -517,   4156,   -685,    214,   -721,
+      -608,   -102,   -295,   -114,    126,   -340,    109,     88,
+     -1588,     82,   -549,   -376,     76,     84,   -210,     59,
+      -130,    321,    678,   4704,    564,     -1,    100,    325,
+      -296,    256,   -936,   -886,  -1088,   -191,    476,  -3684,
+      1359,     12,   -397,    -70,    -17,     58,    569,    353,
+       821,    -77,    253,    153,   5697,   -171,    181,      3,
+       -90,   -413,   -265,    142,     62,    959,    151,   -103,
+       845,   -340,   -280,   -733,   -592,   -244,   2534,   3089,
+       935,   -393,   -105,    145,   -666,  -2865,  -1532,    717,
+      2867,    206,   -800,   -125,    -34,   -189,   -138,     42,
+       189,   -141,    107,  -3030,  -3795,   -494,    108,   -149,
+       382,    760,   -142,    337,   -844,    228,    124,    232,
+       -23,     -1,   2298,    750,    636,   -353,    157,    676,
+      -191,    812,   3434,    759,    543,    -17,   -213,    -95,
+       316,   -693,   -604,  -1059,     32,   -496,  -3334,   -272,
+      -104,   -495,   -130,    627,   -376,     74,   -599,     55,
+     -2185,   -968,    517,   -343,     21,   -249,   -963,    268,
+      3339,    239,    771,   -134,     42,    231,     75,   1633,
+       331,   -125,   -414,    457,   -316,    111,   -475,    363,
+      -687,  -4105,    469,    443,    113,     72,   1498,    406,
+       915,   -229,    564,   -377,     89,    137,     39,      2,
+       -29,   -416,   -149,   3598,   -253,     12,  -1015,   3016,
+       916,   -726,  -2286,    -99,  -1085,   -238,    690,    -44,
+       -51,   -115,     25,     56,   -905,  -3050,  -1121,    -24,
+     -2160,  -1424,   1009,   -180,   -424,    188,   -417,    -66,
+       -86,     74,    -28,   -225,   -937,    -90,    251,  -1850,
+      1939,   1843,    833,  -1879,   -192,   -318,    103,   -363,
+       -22,    -57,  -2833,   -118,   -277,    -98,    -85,   -495,
+      -874,   3027,   -141,  -1490,   -172,   -266,    -32,    190,
+       -12,   -364,   -380,  -2107,    249,   -217,    662,   -584,
+        89,   -563,   1153,  -3091,   -656,    463,    144,    -26,
+};
+
+static const int16_t cb4448ss1[] = {
+      6475,    -60,    162,     42,    -71,     50,    -85,   -278,
+       -14,    -60,    -53,    132,     28,    -65,    -71,    -62,
+         6,    119,    195,   -140,     28,     37,   -603,  -4956,
+      -290,    700,   -241,     11,   -301,    297,  -1009,    468,
+       885,    192,     40,    495,    846,    -28,    201,   -255,
+       927,   -644,   2424,   2882,    -82,  -1764,   1077,    315,
+       946,    843,    399,    176,    567,    546,    377,    283,
+      2469,  -1815,    -65,     12,    422,   -368,   -639,   -493,
+     -5606,     84,    122,    241,    267,     -8,   -257,    -23,
+      -220,   -118,    139,  -1582,   -218,  -2436,   2539,   -270,
+       146,   -262,   -489,   1551,    604,   -225,    363,    234,
+      -110,   -166,   1058,   2342,   1950,     43,   2362,  -1189,
+       492,    172,   -296,    159,   -430,   -311,   -135,   -182,
+        77,   -444,  -1995,   -855,   2080,   -457,    389,    872,
+      2549,    935,   -128,    519,   -374,    310,     96,    119,
+      -263,   1981,  -1019,   -628,    212,   -173,  -2292,   1066,
+     -1985,   -426,    115,   -746,    147,      3,     94,    195,
+     -1762,   1713,   -337,   1884,   -123,   -480,     95,    777,
+      1073,   2117,   -969,     16,     11,    123,    374,   -394,
+     -1419,    829,   1657,   1294,  -2770,    286,    813,   -290,
+      -115,    111,    312,     53,     44,    896,     34,  -2288,
+     -3443,  -2053,     98,    293,    429,   -168,     74,    -58,
+       221,   -383,    100,     63,   1925,  -1207,    199,     94,
+       -94,   3060,   1825,    611,    292,   -141,    382,    141,
+       105,   -151,      0,   1448,   -267,    206,    932,   -682,
+       251,   -183,   1080,    161,   4334,   -397,    525,    -91,
+       127,   -104,    921,  -2282,   -274,  -1070,    387,   -312,
+      1380,   2769,   -554,   1501,   -921,    102,   -183,   -104,
+       -66,  -1656,   2049,    122,  -2271,     84,   -276,   -204,
+       353,    380,   -414,  -1757,  -1035,   -318,   -130,    -10,
+       163,   -471,   2425,   2864,  -1892,    294,    817,    754,
+       277,    -29,   -214,    -39,   -312,    -57,    -54,    986,
+      2286,   -574,     34,   -641,   3783,    214,   -399,   -155,
+        38,   -148,    -42,    -89,     97,    -17,  -2192,    729,
+       272,   1168,  -3593,    150,     96,   -473,    211,    -60,
+       136,    -26,    142,   -285,     93,    666,   -465,   -181,
+      2016,   -338,  -2186,  -2608,   -449,    107,    -18,     45,
+        24,    245,   -119,    244,    442,   1509,    158,    242,
+       169,    -16,   -221,    104,    115,     16,   -217,     23,
+       -25,    130,   4076,    662,   -315,   3068,    -35,     36,
+      2785,   -223,   -528,   -157,     43,    186,   -514,   -240,
+        15,   -245,    520,   -110,   -781,   -641,    294,    -20,
+        64,    -44,    400,   -109,   4756,   1334,   -421,   -195,
+       130,  -2182,     64,   -897,  -1423,   3081,   -523,    378,
+      -164,    968,    593,   -192,     71,    114,   -143,    -10,
+      1961,  -3141,   3173,    -39,   -110,    -57,    144,    -68,
+      -429,     30,    -10,    467,    159,     40,     67,    260,
+       814,   -168,   -836,   1073,  -3562,   1786,  -1205,   -148,
+      -105,     94,      5,    143,    138,     18,  -1384,     20,
+       635,   -126,    -71,    -87,   -320,   -407,    559,   -151,
+      1312,  -4395,   -755,   -263,    -77,   1657,    699,    426,
+       469,   -469,    253,    -80,    317,    -71,    268,   3592,
+     -2051,    304,    157,     43,   1872,   3794,  -1537,   1226,
+      -159,   -335,    340,   -385,   -253,   -195,     21,    106,
+       -31,   -187,    -63,  -2771,    446,   -708,    202,   -186,
+       548,    832,   1757,  -1274,   1234,   -756,   -160,     76,
+       -82,     64,   2169,     13,   -849,    244,  -2486,  -2138,
+       844,   -178,    270,    297,    150,    202,    -41,   -188,
+       121,  -1272,    371,   -319,   2848,   -469,  -2059,   1290,
+      -457,   -380,    690,    148,    -51,   -340,    113,     57,
+     -1259,   -396,  -1404,    336,   -511,    576,   4441,    124,
+       143,   -483,     85,    138,    196,     38,   -188,   1177,
+      -764,  -2067,    820,   -264,    218,   -300,   -501,   -230,
+     -2529,   1349,  -1606,   -199,     92,    -55,  -1324,   -702,
+      2078,  -1269,    414,    -50,     29,     12,     87,   -593,
+       217,    -82,     94,  -2392,    308,   2315,   2188,    768,
+     -1103,    -77,    579,   1706,   -826,   -224,   -297,    145,
+      -640,    570,    146,   -199,   1187,   -872,    327,   -310,
+      -122,    -23,    -13,    808,   -139,  -4425,   -670,    412,
+        -4,    -70,   -162,  -1056,    685,   -312,   -957,    339,
+       893,   -252,   4040,   -105,     76,    993,    281,    -79,
+      -139,    168,   -298,    795,  -1107,    395,    386,   -524,
+      1052,  -2341,   2537,    474,    726,  -1028,   -357,    -52,
+       115,     -9,   1349,  -2240,    785,   2751,     77,    922,
+       385,   -539,   -148,    410,    251,    -70,    199,     51,
+      1728,   -206,   1181,   1182,   1388,   -791,    121,     -3,
+         8,   -147,    -95,    101,    886,  -2412,     19,   2401,
+      -116,    718,   -592,   -221,    724,    -33,    690,   -180,
+       868,  -3330,    377,   -336,    128,    267,  -2075,   2848,
+      2994,   -300,      3,   -153,     41,   -456,     38,    -31,
+       309,   -106,    -92,    -14,     96,    672,    634,    207,
+      1556,    438,  -2147,    282,   2443,  -1662,    511,    457,
+      -259,   -505,    173,   -204,   -858,   -117,   2751,    852,
+       220,   -512,  -2576,   1542,    357,    -77,     -4,    165,
+       -63,    189,    302,   -699,   -764,  -1559,     25,   -233,
+       405,    173,    698,    -73,   -300,  -1442,  -2923,  -1326,
+       -25,     98,   -196,  -2915,  -1169,  -3392,    691,    353,
+      -196,     96,     41,    180,    198,    280,    207,   -158,
+       -19,   1556,    991,   -523,   -280,  -1599,   1368,  -3247,
+      -996,    159,   -136,   -469,    -48,      0,     30,     95,
+      -765,     33,   6580,   -180,    316,   -176,    105,    -21,
+        -9,    166,    148,    -52,    -49,     42,      2,    318,
+       -55,    -91,  -1461,  -1474,  -3086,   -756,   1479,    -29,
+      -668,   -255,    -51,    241,    249,   -212,    132,   -129,
+      -410,    113,     17,    301,    185,     96,     10,    188,
+        38,   -772,   5152,    -13,    -10,   1527,    806,    -23,
+       -79,   1102,    -77,    329,    -99,   -404,   2276,   -873,
+     -2681,   -765,     71,     20,  -2448,   -803,   1827,   1115,
+      -160,    -15,    288,    -46,    573,    100,   -726,   -694,
+      -406,    288,     61,  -2216,   -904,     77,  -2983,   -962,
+     -1438,    809,    -38,    -79,     95,     52,   -231,    518,
+       115,     41,    908,    780,    805,   -207,  -2161,    554,
+       968,   3111,    133,   -158,    -13,    -34,   -182,    -60,
+       105,    718,  -1245,    227,   -818,   1184,    903,    603,
+      -988,  -2647,   1847,    141,    817,   -337,    131,    393,
+      1653,    839,   -261,    466,    465,   -297,   1440,   -431,
+      2058,  -1857,  -1416,    310,   -722,    -54,    203,   -266,
+      3770,    172,   -593,    -73,   -508,    -61,   1110,   1261,
+       275,   1681,    447,   -147,    -95,     33,   1281,  -3119,
+        24,   -308,    366,   -468,    232,    358,    667,   -942,
+       696,   -924,  -2059,    -62,    151,  -2102,    332,    258,
+      -186,   -636,    685,    214,  -3174,  -1243,    573,   -276,
+         9,   -262,    -20,    158,   -174,    -21,    593,  -6198,
+      -266,   -270,    -63,   -203,     63,   -396,   -100,    191,
+       212,     85,    120,   -791,     37,    -47,   2108,    652,
+       519,    346,    106,  -1840,  -2566,   -563,     14,    266,
+        10,    214,    504,  -1269,     50,    164,    120,   -105,
+      -546,   -212,    -79,     41,   -171,    675,   -252,   4373,
+       -16,  -1697,  -1491,  -3588,   -587,    623,     67,    269,
+       484,    -25,   1067,    580,   -598,    195,     47,    -17,
+};
+
+static const int16_t cb4448sm0[] = {
+     -5114,    166,   -785,    635,   -528,   -102,    269,    492,
+      -185,   -614,    122,   -124,     85,    145,    270,   -154,
+        39,   2524,     58,    -57,    119,      5,    343,   2873,
+      -278,   -787,    137,     62,   -169,   2049,   1476,   -325,
+       130,   -702,   2882,    -19,    310,   -258,   -135,     88,
+      -268,     69,     69,    695,  -1935,    815,    678,     44,
+      3085,    278,   -587,  -1326,    360,    145,    -17,     66,
+     -2475,   -594,    132,    358,    406,   -369,   -237,   3363,
+       329,   -424,     52,     49,    291,   -236,  -2332,   -261,
+        49,    -27,    170,   3656,   -214,   -603,    264,     60,
+       -87,    145,    116,    179,    190,    679,    339,   -340,
+      3272,    641,  -2631,    484,    159,    305,    290,    208,
+       226,     68,    102,   -145,   -356,    153,    647,  -2046,
+       937,  -1666,   1093,    -29,  -1161,    749,  -2360,    171,
+     -2185,    841,  -1406,  -1057,  -1764,   -300,   -205,    452,
+      2168,   -214,   -153,    291,   -106,     79,   1717,    -20,
+     -1771,    286,   -466,    686,    167,    137,      5,     43,
+      1075,  -2601,    261,    -86,   -333,   -724,    162,    186,
+         4,   -334,   -412,   -309,    888,   -114,    531,    297,
+      4284,    297,  -1695,   -212,     75,   -263,  -2313,    102,
+      -434,    352,  -1813,   -472,    114,   -185,      6,     66,
+      8061,    414,   -577,    672,   -152,    152,      1,     38,
+       -66,     48,    -35,     62,    -98,    -19,  -3762,     98,
+       242,    114,    359,   -162,    115,  -3038,    340,    253,
+      -526,   -144,     14,   -147,     28,   -352,  -5858,     46,
+      -597,   -392,    226,    -54,    -70,    -47,    -45,     16,
+        53,    137,    172,  -3017,    -22,   -163,   -267,  -3289,
+       -31,   -174,    110,    794,    425,     67,     58,    -72,
+      -156,   3937,   -585,   2116,     99,  -1115,   -257,    801,
+       270,   -329,   -257,    -18,    122,   -369,  -2196,   1746,
+      -305,    599,    800,    749,   1466,   -299,  -1519,   -255,
+      -233,    217,   -117,   -256,    301,   -249,   -327,   5530,
+        86,    135,   -784,   -137,    610,     -7,     55,     93,
+      -106,    -50,    267,   -229,    -26,  -1070,     13,    -75,
+      1733,   2929,   -130,   -713,     15,  -2144,    104,   -318,
+       282,     -8,   -285,   -468,   -124,     59,    520,    -78,
+      -332,   -654,  -5048,    212,   -388,     97,  -1523,    227,
+     -2545,   2159,   -127,   1020,     79,   -664,    403,    -31,
+      -356,     -1,   -436,    -86,     75,    610,   3048,    235,
+     -3133,  -1189,    -44,    -23,   -324,    260,    469,   -113,
+        22,     53,    525,    427,    469,   1016,    420,    493,
+     -1229,   -238,  -2671,    361,  -2745,    193,   -253,    -59,
+        15,     53,    -57,     36,   -144,    127,     25,     11,
+       -34,   6560,    -12,    -80,    -72,     70,    654,  -1135,
+       158,    279,    298,    746,   -190,  -1382,    138,    527,
+     -1504,  -2753,   -106,    -55,    225,     54,    136,     53,
+       506,    174,    268,   -533,    -43,   -416,   -196,   6266,
+       -81,     22,   -158,    350,   1177,   -728,    594,     34,
+      -368,   -226,   -584,    247,    804,  -1141,     78,   3923,
+       -53,    309,     58,    -45,  -7634,    -73,     39,   -152,
+        55,    -77,    -45,    -62,    -25,   -247,   -161,     28,
+     -2629,   -401,   -295,   -687,    298,  -3240,      0,   -251,
+         7,    -49,    494,   -198,    202,   2201,   -301,     83,
+        45,   -964,    256,  -1499,  -2394,     24,   -267,   -599,
+        46,    161,   -370,     81,    636,   3146,  -2077,   -964,
+       322,    400,   -635,   -688,   -630,    -92,   -235,    104,
+       -77,   -541,    511,   2722,    441,   2757,    952,    739,
+      -257,   -254,   -438,   -122,   -151,     12,    578,    -92,
+      -440,    -63,     93,   4971,   -499,    419,   1374,   -165,
+      -417,     64,    -13,   -235,   1080,    -77,    536,     68,
+      -842,   -772,   1627,   -471,  -1350,   -144,   2849,    219,
+       114,     68,    -55,    350,    -11,  -1334,  -3042,   1166,
+      -147,   -891,   -483,   1461,    339,    808,    362,   -101,
+     -2807,    -24,   -377,    518,   -438,    194,   -110,    194,
+      -826,   3380,    -81,    -30,    -43,    103,    -99,   1539,
+      -614,    -13,  -1154,    196,  -3122,   -521,   1454,   -319,
+       159,   -428,    722,   -208,    162,   1871,   2534,   2287,
+       946,    261,   -483,   -645,     26,   -170,    -31,     17,
+       164,    104,    -44,  -8192,    -20,     94,   -235,     56,
+        68,    -58,    380,    -25,   -170,     17,     16,   -154,
+        63,    477,   1280,    614,   -529,  -2347,   -360,    159,
+      1967,  -2085,    485,    335,    378,    178,   1633,   -437,
+       -46,     23,    640,   1465,    -91,   1279,  -1025,  -1007,
+      -236,   2632,   -257,    262,    177,   3029,  -3149,  -1001,
+       231,   -262,     87,   -243,    -68,   -597,    109,     62,
+      -264,     37,   -463,  -3105,   -633,    881,   1026,    -86,
+       417,    705,  -1144,    -68,  -2084,     46,    124,    -36,
+     -2461,    -73,   -126,   -303,   1079,   -358,  -2764,   -761,
+     -1454,   -245,    203,      0,   -179,   -117,   2571,  -4751,
+       -20,    194,    298,    258,    390,    270,    -36,    182,
+       152,    -56,    -97,    -47,    138,   -233,   -111,  -1490,
+      -490,   -329,    662,   -320,  -4697,    443,     66,    352,
+       203,   -114,   -119,    186,    649,   -106,     -5,   2280,
+      1132,   -376,   1168,    919,   1858,    271,  -1741,   -130,
+     -3388,    264,    618,  -2375,    260,   1279,    110,    732,
+       128,   -373,     54,   -182,     99,   -131,      9,     30,
+       -83,     27,    204,    109,   -306,   6903,    130,     -7,
+      -115,     92,   -241,    119,   -640,   -871,    -40,    372,
+       -68,   -147,  -1503,    -58,    920,   -466,    311,    144,
+     -3648,   -121,   -357,      5,   1968,   -737,  -1491,    596,
+       818,    122,    688,   -137,  -2415,   -368,    236,     71,
+      -597,   -193,   -395,    795,    855,    657,    -49,    844,
+     -3320,  -1921,    846,     17,   -293,    -17,  -1676,  -1826,
+      -138,    897,   -207,     -3,   1838,   -901,     86,    275,
+       964,    230,    510,    -10,   2879,   3949,    332,    289,
+       109,   -229,     18,    238,    244,    287,     44,    103,
+       367,     21,  -1134,   -378,   1338,   -828,   3500,      5,
+      1027,    475,    208,    654,    589,    -92,    236,    -85,
+      -115,   1095,  -2504,    827,   -885,   -806,   -155,   2112,
+      -346,   1120,   -350,   -911,   -234,    231,     55,     87,
+      1957,    601,    755,  -1248,    753,  -2726,   -481,   2038,
+        96,   -363,    309,    150,    299,   -561,   -698,  -1030,
+       118,   1224,   3240,  -1523,   1476,    342,   -688,    -76,
+       192,     -8,   -319,    350,    149,   -331,    155,   -436,
+       286,   -994,    160,  -2696,   -423,  -2798,   -135,   -108,
+     -2846,   -254,   3590,    350,    130,   -810,    463,   -123,
+        59,   -256,    251,   -750,    -76,     -8,  -1633,    150,
+      -931,   1958,   1523,  -2527,    239,   -287,    172,    332,
+       -13,    486,    247,    -26,    149,     59,    130,    265,
+        19,    209,   7220,    -23,    -99,    -69,    -66,    -70,
+       -54,    -75,     60,   -264,   -102,   1079,   -535,   1587,
+      -557,  -1499,    241,  -2596,   1157,   -140,    270,     33,
+};
+
+static const int16_t cb4448sm1[] = {
+      7894,   -331,    383,   -556,     63,   -371,    -23,     73,
+        46,   -145,    105,     43,   -199,    -52,    -85,    -85,
+        13,    -21,   -230,   7379,    268,   -243,   -460,    251,
+        73,     12,    115,    -18,   -247,    433,    -90,   -518,
+       962,      0,   -960,    184,   -305,  -2003,    276,   1696,
+      2418,    270,  -2140,   -215,   -534,   -389,   -403,  -3500,
+       416,    567,   -393,   -183,    253,   -100,   -285,   -107,
+       100,    281,   -527,  -2944,    -86,   2652,    311,   -785,
+      -811,   -283,    425,    -77,    393,    136,    170,   1290,
+      -765,    108,    676,   -213,  -1226,   -470,    427,   3499,
+       616,  -1211,   -226,    -37,     88,  -2792,    351,     78,
+     -2975,     99,    192,   1390,   -338,     47,     -8,     58,
+      -255,     50,    221,    -49,   -788,   -207,  -2122,   -167,
+      -692,    379,  -3239,   -965,   -698,   -463,    -45,     34,
+      1785,   1026,  -1107,    113,    124,   -258,   -277,   -714,
+      2764,   -178,   -200,    907,    -45,   -213,  -2575,   -530,
+      -112,   3616,   -128,     76,   -366,   -135,    -22,    -51,
+       125,   -100,    -79,    142,     54,    107,     87,    493,
+       -34,   -221,   -448,   -243,    994,    845,  -4656,   -105,
+      -487,     41,   -112,    349,  -4328,    -72,    513,   -112,
+      -685,   -470,   -138,   -541,    340,  -1505,    -24,     37,
+       169,   -405,   -434,  -2994,    -42,   -416,  -1927,   1551,
+     -1488,    420,    179,    -66,     14,     92,    147,    141,
+       497,    404,   -412,   2301,    336,  -2877,  -1845,   -948,
+      -784,    262,   -211,      6,  -1678,   -434,  -1433,   -727,
+      1254,    542,  -1430,   -302,   1558,    107,    617,   -833,
+      -369,   -178,   1682,  -2569,  -1232,  -1556,    -87,   -178,
+       400,   -178,   -427,   -124,    -63,    142,   -221,     33,
+      2880,   -227,   -356,   -466,  -3362,   -398,   -167,    164,
+       126,     59,     -1,      5,    212,     25,   2062,   -462,
+       -33,    -46,     45,   -201,    823,   -268,   -302,   3623,
+       389,    382,    136,    -30,    -64,      2,   -600,   3114,
+      2720,    273,   -588,   -235,   -313,   -141,     37,    -28,
+       355,    184,   -433,   -110,   -576,    -56,    134,   -623,
+      -271,  -2529,  -2753,    947,   1319,     -2,    620,     36,
+      -412,  -1986,    221,   -404,    514,   3223,   -106,   1497,
+      -368,   -167,   -142,   -366,   -125,     16,    142,   -435,
+      -160,   2845,   -153,    470,    387,   3117,    -75,   -375,
+       658,    259,    755,     -3,   3744,   -517,  -1446,   -667,
+      1372,  -1692,    117,    -96,    195,   -201,   -134,    -76,
+       179,     97,     71,   1887,    161,    365,    228,   1177,
+       235,   -834,    -48,   1667,  -1123,   2217,   -209,    100,
+      -219,  -2778,     81,   -579,   3421,   -326,   -492,   -233,
+        78,     32,    117,    -74,    -80,     85,   -282,    453,
+       500,    721,    800,     83,   -624,   1000,    165,    -20,
+      -516,  -4193,   -334,    107,   1221,  -1507,    -10,    523,
+        85,    -44,     21,     34,    199,   -106,  -2233,    525,
+      2138,     40,    -55,    -63,  -8179,    326,    333,   -152,
+       -27,    137,    212,    130,    -10,     76,    -61,   -113,
+      -544,   -179,   -187,      0,  -5308,    322,   -326,    513,
+       415,    375,    -92,   -354,     69,     77,     65,     93,
+      -352,   -165,  -1837,   1790,    914,   -276,   2215,  -1418,
+       343,    281,      4,    283,   4398,   1695,   -248,    153,
+      -166,    751,    822,   -406,   -456,   -251,    185,   -251,
+      -222,   -169,   -266,  -6323,    249,    -40,    -45,   -203,
+        47,    -83,   -621,   -174,    327,     30,    114,    -29,
+      -505,   -224,   1804,   1582,  -2292,   2102,   -746,   -421,
+       170,    438,   -171,    153,     84,   -157,  -2937,   -123,
+       -81,   -227,    -98,    263,   3531,     36,    105,   -479,
+       -94,   -357,    -22,   -124,    279,   -116,    543,    201,
+      -393,   -226,  -2255,   -133,   1613,   -123,   2687,     70,
+       191,    240,   -996,   -676,    606,  -1245,   -306,    413,
+      -272,   -539,    485,   3583,   -224,    432,    389,     31,
+      -888,    318,   -149,   -228,    764,   -426,   1608,  -2656,
+       254,  -2193,    252,    484,    -90,   -117,   -257,  -2210,
+      -156,    553,    559,    680,    298,    -16,   -519,   1172,
+      2172,   1288,   -113,    186,   -199,  -1415,    -83,  -1984,
+       667,  -1013,    344,   -399,   2889,  -1175,   -908,    186,
+       185,    -22,   -328,   3132,  -1166,    209,   -213,    386,
+      2140,    552,   1023,    719,    529,   -169,    421,    196,
+        76,   1995,    532,    -75,   2060,   -526,    396,   2974,
+      -264,   -348,    149,    586,     22,     97,   -337,   -252,
+       357,    103,  -2308,  -2578,  -1836,   -277,    346,   -314,
+      -989,    185,   -314,    102,     56,   3779,   -265,  -1029,
+       -12,   -126,   -431,    356,  -2493,    -86,    172,    116,
+        61,   -146,  -2220,    211,   -165,    233,   -327,     73,
+        -7,   -104,   -546,    253,  -2406,    361,   2252,    486,
+       675,   -177,   2643,    603,    300,   1123,   -642,    361,
+       684,  -2151,    569,  -1014,    120,    -50,    321,   3174,
+      3080,   -733,   -427,    299,    169,   -123,   -140,    -13,
+      -315,     21,   -120,    -24,    174,   -191,   -350,  -7842,
+      -145,   -169,   -419,    -15,    150,   -130,    -73,    162,
+        -9,     38,   -287,    109,    390,    147,    151,   1907,
+     -4243,      7,   -207,   -147,   -230,   -343,   -117,   -111,
+       107,    132,   1457,    -88,     -8,   -445,   -176,   -172,
+     -1799,   -813,    486,   1150,  -3026,   -168,  -2620,   -584,
+       178,   -543,  -1868,   -359,   -113,  -1783,    214,   -663,
+       473,    866,   -136,    169,  -3324,   -129,  -3404,   -249,
+       234,    422,    251,    340,   -343,    231,    134,    -42,
+        32,     64,   -209,     12,    236,   -267,   -419,      1,
+       260,   -109,   6508,    105,      7,   -273,   -123,   -107,
+      -152,   -274,   -157,     75,     74,   -201,     46,     37,
+       338,    -21,   -180,    208,  -6417,    794,    250,    -81,
+      -585,      4,   -119,   -314,    529,    219,    159,   -132,
+      -277,     76,   -613,   4933,     15,    213,   2461,    286,
+       542,    177,   2767,    389,    136,    750,    559,   -994,
+       684,    -12,  -2081,   -546,    -89,  -3733,    548,   -620,
+       675,    118,   -121,    190,    -52,     19,    -19,     25,
+     -1224,    344,   3094,  -2067,      7,    273,  -1268,   -375,
+      -297,   -201,    271,   -191,    123,      6,   -260,   2284,
+      -308,  -3062,    242,    668,   -221,   1146,   1218,    473,
+      -133,     82,     57,    112,  -1677,     78,   -229,    354,
+      -463,    763,   1628,   2243,   1386,   1630,   -145,    255,
+       -60,    228,    195,   -864,   2539,   -466,    985,  -3075,
+         2,    118,    221,   -395,   -450,   -256,   -158,    -32,
+     -3829,   2012,    -50,   -465,    146,  -1091,   -318,    271,
+       -12,    596,    160,    120,     92,   -209,   -335,    104,
+       -28,    689,    305,   -548,   -849,   1617,    605,    185,
+      -414,   3899,   -273,     51,    182,   -192,    121,    616,
+      1219,    414,   -959,  -4219,   1319,     60,    246,   -468,
+       -32,    225,    338,    -39,   1235,  -2079,   2250,    626,
+       121,    296,   -137,   -339,  -1870,    -47,   -397,    124,
+};
+
+static const int16_t fcb8l[] = {
+     -1239,  -1310,  -1240,  -1146,  -1337,   1303,   -482,   2215,
+      2026,   2222,  -1144,  -1188,  -1209,   2535,  -1111,   -844,
+      1485,    625,   1254,   1204,   5932,  -1116,  -1235,  -1208,
+      -801,  -1020,   -558,   1387,   1513,  -1079,   3220,   -896,
+     -1083,  -1166,   2246,  -1210,   -838,   -950,   -960,    764,
+     13941,  -1307,   -817,  -1253,   1850,  -1320,  -1361,  -1218,
+      -671,    780,   -839,  -1068,   -776,   2977,   -714,   -944,
+      -823,   -580,    357,    591,    302,  -1078,   -895,  -1020,
+      3116,  -1144,   1438,   -891,    -71,   1528,   -238,  -1297,
+     -1020,   4616,  -1185,   -514,  -1154,  -1157,   1901,   2372,
+     -1131,  -1289,  -1273,  -1289,  -1311,  -1331,  -1340,    439,
+       455,   2395,   -537,  -1180,   2409,  -1084,   -580,   1937,
+       846,    -51,    615,   1099,   3854,  -1177,   -912,  -1095,
+       656,   -995,   -647,   3298,   -976,   -436,  12323,  -1291,
+     -1187,  -1341,   4779,  -1368,  -1357,  -1317,   -985,   1407,
+      -513,  -1387,  -1224,  -1069,  -1218,  -1117,   -181,  -1209,
+      5376,   4256,    -22,  -1232,  -1173,   -834,  -1054,   -947,
+      -611,   -822,   -206,   5572,   -988,   1067,   -837,    738,
+      -332,    -38,    -59,    143,    248,    386,   -447,  -1233,
+     -1258,  -1169,   3653,  -1045,   -657,   -926,   2004,   2201,
+     -1164,   7042,  -1302,  -1313,   -812,    150,   -129,    305,
+       442,    742,  -1185,  -1293,  -1220,   -872,  -1304,  -1260,
+      -853,  -1293,   2962,   3011,   -178,  -1187,  -1087,   -896,
+      -895,  -1053,   3788,     59,   -169,   1632,  -1201,  -1289,
+      5263,   -896,    331,   -852,    218,    825,   1129,   1024,
+       -39,  -1186,  -1054,   1862,  -1198,   2010,  -1075,  -1005,
+       702,   1550,   4491,  -1055,   -890,   -645,   -987,   2465,
+       529,    194,    -72,    370,   1547,   -968,   -849,  -1153,
+      6459,  -1164,  -1061,  -1020,   -838,    125,   3698,  -1168,
+     -1066,   1882,  -1159,   -439,  -1017,   -759,    744,   1302,
+      -812,   -985,  -1002,  -1029,   -871,   3690,   -170,    604,
+       623,   1272,   6135,  -1012,  -1231,  -1066,   -927,  -1082,
+      2393,   -843,   1537,   1240,   -866,  -1161,   -866,   6639,
+      -994,   -860,   -264,   -298,    469,   1184,   -868,  -1262,
+      2167,  -1177,   2132,   -987,   -563,    969,   1145,   1508,
+      -735,  -1232,  -1090,  -1204,   1507,  -1101,   -393,    755,
+       975,   1246,   1944,  -1068,  -1169,  -1040,   -987,  -1301,
+      5488,  -1057,   3150,   1890,  -1133,   2725,  -1123,   -963,
+      1901,    260,   -484,    449,    564,   1144,    679,  -1118,
+      -989,   -702,   -556,    162,    689,    712,    673,    443,
+      -695,  -1247,  -1019,  -1065,   -406,  -1143,   1750,   -743,
+      2644,   2402,  -1171,  -1157,  -1059,   -823,   -688,   1314,
+      1458,    629,    857,    856,   -875,  -1316,   3470,  -1061,
+      -846,   -761,   -712,   -955,    978,   1967,   -980,   3517,
+      -994,   -953,   -903,     56,    228,    -30,    359,    560,
+      9926,  -1178,  -1056,   -627,   -952,   -481,  -1168,   -268,
+      -701,   -555,   -887,  -1212,   1768,  -1156,   -396,   -755,
+      -119,   1594,    949,   1201,   -844,   1734,   1312,   -331,
+      -500,   -280,   -125,   -219,   -139,    496,  -1121,  -1227,
+     -1145,   -215,  -1123,   -765,   -173,   4055,   1086,   1465,
+      -714,   -904,   -901,   -713,  -1073,   1233,   -797,    645,
+        58,    897,   -518,   -624,   -441,   -554,   1139,    549,
+       147,     72,    127,    428,  -1104,   -979,   2433,   1867,
+      -237,   -745,   -280,    110,    794,    631,  -1049,   1141,
+      -974,   -920,   -849,   -392,    634,    414,    614,    797,
+     -1162,  -1344,  -1192,  -1259,  -1079,   -912,   2717,   2548,
+      1847,   1920,  -1004,  -1091,  -1006,   -692,    -85,    -24,
+      1014,   1427,    751,   -584,   6057,  -1206,  -1072,   -795,
+      -921,  -1103,  -1157,   -623,   -818,   2641,   3121,  -1084,
+     -1095,   -939,   -664,   -694,    884,    555,    144,    593,
+      -874,  -1074,    417,  -1027,     -6,   -790,   1687,     80,
+      1018,    738,   -527,   -958,   -701,   -377,     -4,    155,
+       304,   -348,   -947,   -342,   2269,  -1040,   1124,   -494,
+       -76,     76,      2,    114,   -194,    348,    904,    466,
+      -577,   -717,    107,    -39,    -29,    158,    101,    149,
+      -968,   -921,    558,   -264,   -445,    138,   -121,    -33,
+       105,    243,   -478,  -1047,   -937,   -751,   -609,   -822,
+      -709,   -976,  -1006,   2800,  -1108,  -1292,  -1055,  -1272,
+     -1295,  -1152,    305,  -1144,    635,   2067,   -584,  -1135,
+      -663,  -1130,   -754,  -1009,   -937,   -515,   1473,    841,
+     -1235,  -1338,  -1305,  -1141,  -1109,  -1217,   -238,   1915,
+      3550,   2306,   -963,   -985,   -874,    763,   -826,   -694,
+        19,    391,    379,    776,   -582,  -1216,  -1285,  -1164,
+     -1276,  -1305,  -1273,   2631,   -579,   2487,   1058,   -655,
+      -808,   -878,   -910,  -1006,  -1122,   -590,   -663,    428,
+      2185,  -1125,  -1032,  -1076,   -873,  -1139,  -1029,   -477,
+      1720,   1238,  -1111,  -1311,  -1343,   1074,  -1328,  -1181,
+      -970,   -386,   2359,   1777,  -1045,  -1189,  -1117,  -1053,
+      -942,   -329,    501,   1237,    808,   1022,   -866,  -1048,
+      -678,   1597,   1528,   -262,   -256,    231,    418,    728,
+};
+
+static const int16_t fcb8s[] = {
+     -1022,   -858,   -773,    304,   -881,   -771,   -341,    937,
+       270,    420,   -684,  -1000,   -795,   -903,   -671,   -575,
+        14,   3327,    528,    893,    965,   -541,   -947,  -1027,
+      4008,  -1081,   -743,   -991,   -808,    933,  -1406,  -1173,
+      7513,   -824,   -213,   -797,   -648,    -40,    176,    217,
+     -1298,   6743,   -755,   -232,   -440,   -680,   -269,    -60,
+       -80,    -85,   -893,  -1044,   -726,   -733,   -834,   -641,
+       231,   -779,   -501,   1832,  -1296,   2548,   2754,     19,
+      -210,   -708,   -205,    -74,     18,     55,  -1225,  -1123,
+     -1239,   6991,   -689,    272,   -290,     56,    356,    675,
+      1623,  -1134,   -607,   1426,   -872,    511,  -1060,    408,
+       253,    423,   1960,  -1337,  -1152,   -985,   -924,   2020,
+      -398,    348,   4188,   1044,   -650,   -831,   2909,   2083,
+      -457,     -5,  -1037,   -964,   -128,    -40,   6019,   -858,
+      -937,   -559,   -624,   -601,   -411,    120,   -289,    412,
+     -1271,  -1351,   3858,  -1214,   2224,   -325,   -165,    535,
+       559,    386,   1868,    649,    269,    245,   -708,   -778,
+      -179,    -12,    101,    -12,  -1235,   -892,   -829,   2570,
+      -574,   -431,    170,    167,    492,    531,   -930,  -1093,
+     -1037,  -1177,  -1151,   -912,   -466,    303,   1601,   4089,
+     -1234,   3160,   -631,  -1090,   -741,   -274,    103,     13,
+       356,    289,   2709,  -1115,  -1011,   -965,   -948,   -563,
+      1939,    870,   1187,    550,  -1028,  -1217,   -726,   -954,
+      -694,   -753,   3729,    141,    518,    854,  -1102,   1138,
+      -947,   -620,   -379,   -436,     72,    449,    432,    428,
+     -1112,   1276,    544,   -334,   -445,    179,    -32,    -37,
+         9,     28,  -1252,   2983,   -963,   1256,    419,    -10,
+        17,    211,    218,    191,    126,   -942,   -691,   -529,
+      -533,   -193,   1216,    150,    389,    152,  -1191,   -987,
+      -942,   -860,   -463,   -705,   -159,    184,   1893,   1080,
+      1753,   -694,   -609,   -699,     61,    269,   -126,     93,
+       236,    380,   -527,   -966,   -334,    163,   -662,   3295,
+      -477,    591,    259,    638,    397,    181,   -598,   -129,
+        35,    -51,   -122,     64,    -32,    -98,  -1351,  -1140,
+      3372,   -753,   -776,    718,    513,    134,    420,    354,
+     -1128,   -546,   -743,    297,   1819,    -77,    179,     17,
+       181,    206,  -1028,  -1027,   -757,   -755,   -389,   1035,
+       227,    249,    315,    395,   -931,   -881,   1207,   -777,
+      -165,   -531,   -375,     73,    346,    332,  -1159,   -788,
+      1196,    959,   -432,   -337,    243,    176,    321,     -7,
+};
+
+static const int16_t fcb8m[] = {
+     -1379,  -1331,  -1277,  -1266,   -927,      0,   2552,   2575,
+       425,     48,   2568,    -26,   -841,   -762,   -679,   -562,
+      -420,    186,     68,     69,   -743,   -193,    266,     92,
+      1714,   -241,   -357,    -93,   -252,   -222,   -884,   -385,
+      2436,   -446,   -150,   -533,   -192,    -33,    226,      8,
+      -756,  -1180,  -1238,  -1258,  -1250,  -1147,   -764,    141,
+      3075,   4136,  -1255,  -1288,  -1202,  -1188,  -1222,  -1257,
+      -500,   1989,   4062,   1328,   -300,   -186,   -399,   -329,
+      -330,   -533,   -313,   2030,    193,   -128,   -933,  -1016,
+        66,   1648,   -228,   -321,    236,    114,    356,    212,
+      -677,   -826,   -784,   -670,   -484,   -423,   -188,    215,
+      2476,    652,   3424,   1991,    940,   -576,   -942,  -1038,
+     -1097,  -1161,  -1120,   -956,   -763,   -416,   2824,   1429,
+      -693,   -755,   -455,   -670,   -535,   -225,   4814,    116,
+      -940,   -953,  -1008,   -856,   -797,   -582,   -531,   -213,
+      -412,   2479,   -156,   -218,   -319,   -168,   -236,   -248,
+      -305,   -515,   -224,   -382,   -501,   -759,    139,   1789,
+      -258,   -343,   -167,    721,  -1014,  -1092,   -975,  -1070,
+     -1126,   -778,   -178,     36,    522,   5371,   -402,  -1351,
+     -1577,  -1662,  -1642,  -1560,  -1249,   -870,    602,   8968,
+     -1126,  -1102,  -1118,  -1072,   -946,   -511,    482,   1635,
+      1108,   2471,   -935,   -748,   -302,   -445,   -810,   -359,
+      1433,    -83,    336,   1834,   -712,   -773,   -752,   -609,
+      -391,    625,   2550,    403,   -447,    -18,   -261,     91,
+      5096,   -199,   -887,  -1018,   -728,   -930,   -921,   -684,
+       -22,   2422,   2118,   -417,   -757,   -789,   -732,   -794,
+      -785,   -664,   -627,    885,    471,    798,   -429,   -684,
+      -454,   -185,    185,    -26,   -990,   -369,   1048,    -25,
+       -98,    720,     41,    -60,     -3,    -92,   -790,   -147,
+       846,   4007,   -346,   -907,   -849,   -730,   -639,   -842,
+      9096,    617,  -1164,  -1275,  -1380,  -1396,  -1391,  -1364,
+     -1342,  -1080,    655,   5687,    505,   -818,  -1134,  -1125,
+     -1136,  -1123,  -1088,   -996,      3,     36,    -48,    -28,
+       121,    -55,    172,    -43,     21,    -74,   1537,    -69,
+       378,    -38,   -113,    159,   -149,   -609,   -693,   -796,
+      -715,    588,    376,   -744,   -659,   -316,    145,    448,
+       659,    320,    787,   -315,   -956,   -682,   -595,   -327,
+       146,    348,    837,    577,  -1011,  -1014,   -647,   -159,
+       679,    158,    294,    670,    507,    540,    418,    558,
+        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,
+       214,   1615,   1819,   1510,   -914,  -1190,   -273,  -1099,
+      -522,   -996,   -206,   3946,    996,   1678,  -1220,  -1201,
+      2850,  -1022,   1101,   -814,   -188,    879,   1549,   1279,
+     -1129,   1928,   1550,     38,   -356,   -574,   -157,    286,
+       481,    475,  -1079,  -1176,   -861,   -548,   -657,   -381,
+       538,    948,   -838,    779,  -1149,   -962,   1788,   -779,
+      -742,   -311,    205,    299,    472,    715,    702,   -843,
+      -931,   -790,   -624,   -332,    324,    778,    785,    670,
+     -1137,  -1205,   -103,  -1182,  -1071,   -950,    101,    527,
+      1596,   1004,    682,   -564,  -1053,   -844,  -1184,   1732,
+      -862,   1994,   -988,   1131,  -1069,  -1276,  -1053,   6414,
+     -1259,   -186,   -930,    118,    375,   1092,   6215,   -900,
+      -920,   -935,   -981,   -970,   -766,   -902,   -334,   1629,
+     -1094,  -1142,  -1155,   -779,  -1092,   1011,   -490,   1063,
+      1569,   1340,   2242,  -1313,   6027,  -1319,  -1337,   -789,
+     -1296,   -457,    819,   2276,  -1071,  -1065,   -715,    802,
+      -996,    397,   2396,    -27,   1225,    935,   1400,   -862,
+      -802,   1846,   -513,   -249,   -704,    515,    872,    662,
+     -1141,   5876,   -691,   -404,   -603,   -148,    -57,    187,
+       649,    788,  -1116,   -915,   -551,   3843,   -737,   -133,
+       498,    155,    227,    718,   1798,   1397,   -868,   -716,
+      -586,   -580,    -71,    -67,    311,    536,   2465,   -524,
+      1837,   -231,   -210,    263,    231,    -10,   -164,   -324,
+      -951,  -1130,   5206,   -525,   -603,   -401,    223,    438,
+      1011,   1077,   -726,  -1102,  -1013,   -386,   -786,   4281,
+      -329,    262,    550,   1292,   -629,   -943,   -976,    773,
+      -867,    908,   -680,   -154,    362,   1056,  -1051,   -703,
+     -1333,  -1424,  -1026,   -793,   -859,   -882,   -148,   9958,
+     -1193,  -1156,  -1077,   1241,  -1013,   -726,   -139,    551,
+      1150,   1019,   -733,   -997,   -651,   -625,    -54,    722,
+        73,    -14,    361,    435,   4013,  -1260,  -1195,   1452,
+     -1105,   1273,   -670,   1546,   1038,   1680,   -812,  -1060,
+      -853,  -1058,   2094,   -801,   -457,   -320,    683,    960,
+     -1019,  -1158,  -1118,  -1034,   -617,    404,   1376,    847,
+      1014,    951,    -12,  -1004,  -1221,  -1131,    649,  -1052,
+       442,   -167,   -859,   3868,  -1216,  -1298,  -1311,   2866,
+     -1310,   -639,  -1079,   1576,   1760,   1837,    118,  -1080,
+      -862,   -845,  -1065,  -1069,   2199,   -766,    495,   1309,
+      -996,  -1040,   -741,   1357,   1726,    382,    264,     92,
+       659,    665,   -781,  -1356,   2055,  -1198,     15,   2143,
+       631,    569,    918,   1120,   -948,  -1253,  -1234,   2442,
+     -1062,   2206,     48,    660,   1822,   1480,   -639,    627,
+      -432,   -477,    845,    216,    228,    152,    157,    295,
+      2444,   -908,   -465,   -768,    109,    251,     72,    -59,
+       169,    405,   4395,   -837,   -931,   -839,   -215,   -564,
+       655,    359,    503,    296,   3514,  -1082,  -1185,   -827,
+      2879,  -1224,   -811,   -970,    804,    911,   3028,  -1284,
+      -688,  -1226,  -1251,   -551,  -1247,   -275,   3441,   2322,
+      -630,  -1213,   -108,  -1191,   1129,   -854,   2848,   1609,
+      1048,   1535,   2784,  -1245,    772,  -1230,  -1298,   -686,
+     -1293,   -639,    278,   2455,   9975,  -1077,  -1233,  -1055,
+      -139,   -853,    -48,     24,   -720,    533,  -1191,   2809,
+     -1015,   -899,    -28,   -765,   -147,    146,    592,    814,
+     12493,  -1274,  -1072,  -1297,    877,  -1068,  -1179,  -1032,
+      1023,  -1178,   -840,    930,   -660,   1216,   -366,   -406,
+       -97,     77,    179,    340,   -973,   -993,   2280,   1775,
+      -631,    -17,   -186,    507,    459,    645,   2095,  -1019,
+     -1067,   -949,   -857,  -1202,   -904,    -48,   1156,   1273,
+     -1230,  -1245,  -1203,  -1036,  -1150,   -955,   1193,   1943,
+      1437,   1329,   -618,  -1055,   -730,  -1014,   4953,  -1125,
+      1089,   1085,   1047,   1045,    813,  -1036,   1270,   -715,
+      -684,    -96,   -131,    289,    782,    628,   -979,   1060,
+      -975,   -964,   -811,    -14,    223,    422,    563,    696,
+      -901,   -633,    496,   -136,     22,    -83,    -52,    264,
+        24,    147,   -446,  -1197,  -1258,   -687,  -1239,   -795,
+     -1066,  -1196,    147,   2653,  -1231,  -1275,  -1240,  -1041,
+     -1260,  -1159,   1961,    -34,   2937,   2128,  -1318,  -1355,
+     -1326,  -1300,  -1345,  -1326,   -870,   -298,   2014,   3890,
+      -933,  -1014,   -859,  -1074,   -506,  -1163,   -954,   -819,
+       440,    732,   -582,  -1268,  -1206,  -1037,  -1081,  -1255,
+     -1150,   -835,   2360,   1469,  -1232,  -1384,  -1388,    542,
+     -1359,   -606,  -1335,   1852,   2142,   3722,  -1218,  -1321,
+     -1268,  -1207,  -1203,  -1316,   -954,   -696,   4730,   2920,
+     -1225,  -1306,  -1131,  -1273,  -1276,  -1238,  -1040,   2079,
+      2652,   1931,  -1167,  -1302,    659,   -532,   -650,   -560,
+     -1028,    186,   1224,   2811,   -896,   -449,   -999,   -823,
+       -81,   -876,    502,   -293,    680,    733,   -836,  -1111,
+     -1132,   -865,  -1141,   -938,   -980,   1287,    581,   1438,
+};
+
+static const int16_t fcb16s[] = {
+      1260,  -1427,  -1400,   -996,   -958,  -1195,   6261,     31,
+       967,    752,   3776,   -975,   -840,   -707,   -696,   -555,
+        45,   1159,      4,    358,   4718,  -1471,  -1464,  -1291,
+     -1364,   -934,   -878,   5198,   -273,   1555,  -1438,  -1729,
+     -1579,  -1470,  -1820,  -1436,  -1255,   -631,   4287,   4025,
+      1233,   -684,   -748,   -742,   -547,   -229,    321,    126,
+       794,    670,   6689,  -1041,  -1160,   -861,  -1002,   -976,
+       147,   -668,    521,    940,  -1186,   2097,   -570,   1759,
+      -251,   -442,    -92,     46,     99,     12,  -1336,  -1061,
+      4427,   -945,   -861,   -460,   -306,    494,    481,    536,
+     -1101,  -1105,   2695,    316,   -801,   -159,   1042,   -577,
+       -78,    340,   2347,   1448,    135,   -381,   -688,   -493,
+      -254,   -234,    -74,    -80,  -1047,  -1246,   -729,   -985,
+      5399,  -1018,    643,    822,    889,    432,   -328,  -1386,
+     -1420,   -702,  -1450,   6927,  -1107,    465,   1625,   1116,
+     -1258,   2847,   -893,   -895,   -521,   -263,    112,    157,
+       556,    500,    182,   -652,   -226,    258,   -638,   -566,
+      -419,   -669,   -224,   -221,  -1197,   -227,   -582,     92,
+      1914,   -184,    -11,    -18,    270,    166,  -1294,    -62,
+      1536,   2470,   -413,   -619,   -399,     24,    106,     54,
+     -1223,   2672,   2400,    -54,   -577,   -692,   -301,     -3,
+       206,     89,  -1424,  -1491,   8425,  -1072,   -242,   -420,
+      -194,     -1,    489,    331,   -938,  -1319,   2493,  -1355,
+       551,   2297,    197,     -9,    717,    434,  -1237,   -773,
+     -1021,   3945,   -566,    116,    246,    150,    510,    370,
+     11804,   -457,  -1006,  -1231,  -1175,  -1086,  -1221,    589,
+      -679,   -757,  -1183,   6502,   -584,   -454,   -629,   -570,
+      -413,   -352,   -279,    -32,  -1236,   -946,   -760,   1535,
+      -865,   -712,   -224,    343,    647,    613,  -1348,   -938,
+      -961,   8273,  -1130,   -591,   -225,    210,    420,    140,
+     -1247,  -1166,   -966,   -986,  -1120,   -907,   -181,    470,
+      1888,   1161,  -1076,  -1298,   3479,  -1151,   2410,   -396,
+         1,    -44,    357,    594,   -896,    745,    -33,   -422,
+      -332,   -259,      0,     48,    143,    190,  -1009,   -837,
+      -876,   -371,   -370,   1520,   -150,    251,    240,    448,
+     -1024,  -1008,   -568,   -450,   -611,   -536,   1763,    -34,
+       355,    454,   -769,   -599,   -639,   -737,   -912,   -725,
+      -504,   -230,    532,   3294,  -1077,   -289,   -875,   -542,
+      -574,   -604,   -339,   2511,    479,    742,  -1218,   -946,
+      1321,   -522,   -544,   -950,   -765,    632,    639,    497,
+};
+
+static const int16_t fcb16m[] = {
+      -940,  -1197,  -1190,  -1200,  -1192,   -960,   -718,    610,
+      3300,   3253,  -1515,  -1689,  -1798,  -1798,  -1793,  -1764,
+     -1616,     33,   2377,   7778,   -668,   1745,   1501,    785,
+      -336,   -823,   -708,   -446,   -455,   -812,   8862,    159,
+     -1141,  -1261,  -1323,  -1299,  -1261,  -1227,  -1214,  -1090,
+      3584,   2092,    688,   -531,   -848,  -1000,  -1047,  -1192,
+     -1104,   -887,   5163,   -347,  -1129,  -1285,  -1336,  -1291,
+     -1249,  -1109,   -498,   2511,   -611,   -703,   -516,   -240,
+       -68,    399,   1570,    252,     -5,     43,  -1163,  -1168,
+     -1008,   -921,   -995,   -569,    925,   1511,   1001,   2023,
+     12926,    135,  -1598,  -1778,  -1847,  -1850,  -1836,  -1734,
+     -1695,  -1690,    621,   4647,    588,   -752,   -973,   -996,
+      -953,  -1081,  -1060,   -672,   -868,    259,   4940,   -117,
+      -718,   -907,   -828,   -776,   -606,   -981,  -1002,   -526,
+      -385,    527,   1501,   -239,     38,     25,    112,    -77,
+      1122,   -250,   -352,  -1113,  -1101,   -942,   -681,   5156,
+      -800,   -636,   5814,   -160,   -777,   -825,   -844,   -747,
+      -697,   -645,   -668,   -492,   -936,    491,   -280,   2573,
+      -269,   -736,   -375,   -265,    -98,   -243,   -920,   -236,
+       446,   1095,   -666,   -600,   -246,    783,    282,      0,
+     -1064,   -116,   2271,   -118,   -482,   -240,   -187,   -271,
+        36,     91,   -695,   -254,   -383,   -948,    745,   2722,
+      -129,   -799,    238,   -379,   2872,   -516,   -868,   -623,
+      -551,   -275,     22,    379,   -185,   -230,   1524,   -672,
+     -1062,  -1164,  -1177,  -1137,  -1058,   -790,      6,   4928,
+      -551,   -389,   -460,   -394,   -674,   -586,   -327,   -178,
+       615,   2868,  -1467,  -1203,  -1316,  -1120,   -996,    747,
+      -219,   2023,   1875,    254,   -871,   -992,  -1062,  -1110,
+     -1149,   -992,   -492,     40,    528,   5374,     83,   -559,
+      -862,   -760,   -541,     28,    207,    629,    502,   1260,
+      -473,  -1110,  -1336,  -1390,  -1412,  -1379,  -1329,  -1081,
+      -238,   9844,  -1332,  -1306,  -1275,   -881,  -1267,  -1249,
+      -237,   2882,   3535,    584,    -13,     52,    -50,     -4,
+         7,      5,     20,    -55,      5,     45,   1587,    350,
+       191,    617,    153,   -236,   -336,   -649,   -798,  -1063,
+      1451,    707,    253,   -733,   -923,   -859,   -621,   -738,
+      -555,   1623,   1727,   -411,   -724,   -772,   -746,   -675,
+      -688,   -209,    915,    622,  -1038,   -474,   -343,    -91,
+      -173,   -104,    255,     96,   1547,    773,   -625,   2272,
+       -90,   -509,   -527,   -247,   -147,   -234,    -45,    166,
+};
+
+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,
+      -346,   2160,    694,    952,  -1302,   -619,    502,   -378,
+      -624,   -178,    349,   -100,    204,    546,  -1450,  -1127,
+     -1302,  -1297,  -1051,   -840,   3426,   1346,   1577,   1723,
+     -1267,   -710,   -872,    448,  -1023,   -728,   -521,   -134,
+       874,    936,  -1134,   -549,    203,   -932,  -1051,    755,
+      -608,   -199,    858,   1008,   1819,   -842,   -773,   -739,
+       818,   -371,    289,    293,    656,    704,    308,  -1009,
+      -959,  -1089,    466,   -468,    279,    897,    764,    797,
+     -1433,  -1276,  -1253,  -1326,  -1182,   -992,    -85,   4339,
+      2135,   2136,   1131,   -917,   -966,   -859,   -889,   1178,
+        62,    659,    771,    882,   1844,   -607,   1184,   -766,
+      -805,   -385,    -61,    502,    648,    732,  -1245,   1315,
+      -818,   -827,    621,   -588,    193,    480,    649,    776,
+     -1178,  -1202,  -1152,  -1088,   -857,   -191,    -49,    129,
+      1950,   1237,  -1461,  -1290,  -1342,  -1401,  -1338,  -1213,
+      -623,    224,   4086,   2517,  -1150,   -814,   -747,    916,
+       807,   -288,    319,    436,    560,    718,    392,   -973,
+      -988,    411,   -954,   -502,    214,    621,    856,    831,
+     -1268,   4012,   -852,  -1002,  -1014,   -577,     32,    552,
+       987,   1138,  -1205,  -1319,  -1145,   -928,     80,    371,
+       277,    779,    859,    902,  -1141,   -991,   -957,    707,
+      -892,   1098,    126,    381,    668,    870,  -1254,   -995,
+     -1163,   -926,  -1149,   2572,    -17,    747,   1456,   1509,
+     -1004,   -867,   1205,   -797,    938,   -657,    346,    520,
+       782,    872,  -1328,  -1080,  -1111,  -1067,   2227,   -892,
+       665,   1604,   1425,   1477,   1869,   -668,   -712,   1044,
+      -800,   -139,      0,    355,    609,    717,  -1192,   -632,
+      3546,   -780,   -870,   -501,    141,    504,    921,   1027,
+     -1125,  -1087,   1154,   -660,   -987,    937,     82,   1390,
+      1360,   1243,   1259,   -550,   -769,   -787,   -743,   -362,
+       -12,    177,    321,    505,  -1147,   -899,   -947,   -849,
+      1371,   -462,   -127,     16,    752,    954,  -1405,    448,
+     -1181,  -1259,  -1204,   -868,   -468,    110,   1293,   1263,
+     -1267,  -1180,  -1238,   -930,   -940,    916,   1793,    653,
+      1070,   1137,   -216,   -997,   -845,   -659,   -699,   -174,
+       758,    961,    417,    630,  -1123,   1691,   1229,   -732,
+      -937,   -491,    -78,    265,    744,    864,   4771,   -856,
+     -1005,  -1007,   -934,   -484,    -17,    579,    861,    959,
+     -1264,     70,   -961,   -864,   -860,   -302,    314,    788,
+       487,    686,  -1133,   -790,   -466,    561,   -812,   -256,
+      2078,    -58,    757,    953,  -1133,   -286,   -655,   -476,
+       -23,   -629,      7,    182,    426,    504,  -1110,    314,
+       497,   -822,   -662,   -754,   1179,   1726,    696,    955,
+      1793,  -1143,  -1268,  -1279,  -1207,   -873,   -183,   1546,
+      1440,   1305,  -1278,   1396,   -779,    558,   -840,    -32,
+       -18,    257,    616,    757,    265,   -906,    499,   -897,
+      -846,   -435,    362,    434,    752,    732,    453,    150,
+     -1029,  -1182,  -1195,   -940,   -297,    876,   1084,   1051,
+     -1377,   1354,  -1148,  -1313,  -1211,   -937,   -366,   1942,
+      1323,   1410,    311,   -270,    -81,   -159,     42,     42,
+         7,    357,    255,    285,   1973,   1386,   -752,   -873,
+      -916,   -466,    -39,    493,    638,    759,  -1338,   1107,
+     -1081,  -1165,  -1038,   -484,   1722,    534,   1038,   1102,
+     -1446,  -1212,  -1337,  -1452,  -1422,  -1291,   -690,   1634,
+      1348,   1640,  -1044,   -184,   -757,   -683,   -100,   1044,
+       369,    349,    432,    584,  -1137,   -528,   1425,   1294,
+      -842,   -257,    -32,    289,    639,    796,  -1418,  -1229,
+     -1282,  -1391,  -1421,  -1234,   -852,   -765,    737,   2076,
+     -1104,   -928,   -936,  -1088,    378,   -765,   1603,    581,
+       753,    925,  -1191,   -841,   -919,   2886,   -907,   -232,
+       180,    543,    956,   1070,  -1314,   -843,    804,  -1094,
+     -1209,  -1031,   -626,    698,   1049,   1152,    256,    831,
+      -841,   -814,   -841,    -54,    134,    347,    535,    658,
+       104,   -801,   -959,   -519,   -406,    156,     12,     13,
+       380,    494,  -1144,  -1112,   -973,   -965,   -916,   -474,
+      -225,    460,    402,    734,  -1448,  -1316,  -1278,    231,
+     -1086,   -578,    584,   1115,   1275,   1260,  -1321,   -963,
+     -1127,  -1288,     41,  -1102,    -31,   1331,   1003,   1145,
+       112,  -1270,  -1343,  -1376,  -1114,   -778,    392,   1918,
+      1165,   1246,  -1247,   -870,  -1232,  -1147,  -1075,    570,
+       181,   1983,    971,   1216,  -1309,  -1199,    260,  -1136,
+      -950,   -742,   1067,    703,   1150,   1144,  -1405,  -1533,
+     -1564,  -1549,  -1264,   -737,   1085,   1706,   1806,   1785,
+       282,  -1173,  -1128,  -1188,   -971,   -885,   -291,    254,
+       841,    987,   -142,  -1068,  -1264,  -1232,  -1058,    138,
+       546,    521,   1096,    987,    890,   -936,  -1020,  -1051,
+      -871,   -521,   1686,    625,    930,    936,  -1343,   -924,
+     -1231,  -1247,  -1052,   -951,   1110,    125,    826,   1116,
+};
+
+static const int16_t fcb44ss[] = {
+      6575,   -881,  -1291,  -1258,  -1090,   -517,   -268,    -56,
+       106,    295,   -303,  -1134,  -1113,   -650,   -508,   1843,
+      -235,   -141,    454,    832,  -1212,    856,   -404,   -620,
+      -682,   -487,    -69,    865,    341,     95,   3626,  -1037,
+     -1366,  -1349,  -1126,   -558,    187,    343,    657,    765,
+      -410,   -735,  -1046,  -1023,   -897,   -673,   -366,   3174,
+      1264,    720,   -730,   -922,   -523,   -821,   4042,   -463,
+        45,    329,    213,    -93,    301,  -1011,    277,   -840,
+      -820,   -451,    417,    470,    739,    953,  -1219,  -1286,
+     -1545,  -1426,  -1209,   -803,   1156,   1311,   1329,   1329,
+      -643,  -1136,  -1200,   -912,   1221,   -695,    342,    910,
+       905,    812,   -996,   -365,   4868,   -738,   -591,   -621,
+        17,    -42,      0,    100,   2085,  -1214,  -1434,  -1432,
+     -1243,   -577,   -626,    140,   1357,   1821,  -1064,  -1261,
+     -1629,  -1525,  -1488,  -1101,   -631,    551,   3556,   3974,
+      -635,   -846,  -1005,   -646,   -803,    123,   -151,    357,
+      2137,    953,  -1168,  -1055,  -1115,  -1061,   -823,   -651,
+      3842,    606,    491,    491,  -1297,  -1063,   -990,  -1051,
+     -1202,   -983,   -468,    -47,    163,    336,  -1131,   -446,
+      -683,    644,   -660,   -675,   1251,    373,    195,   -123,
+     -1109,   -430,   1820,   1883,   -862,   -743,   -265,    119,
+        66,    -41,  -1281,   -768,   1941,   -955,  -1054,   -856,
+       528,    363,    488,    545,   -936,   -682,   -814,   5534,
+      -826,   -347,     58,    -38,    168,     14,   1224,   -719,
+      -300,   -766,   -407,    630,    269,     39,   -230,   -701,
+      1601,   -958,   -945,   -955,   -734,   -487,    -20,   1392,
+       544,    282,   -118,  -1133,  -1161,  -1065,   -939,   -213,
+      -129,   -271,    451,   2570,   -895,   -805,   -536,   1455,
+      1496,   -647,   -199,    114,     95,    -42,   2230,   -855,
+      -715,   -819,   1762,   -699,    -50,   -109,    163,    207,
+      -334,   -759,   3297,   -645,   2561,     77,   -239,   -259,
+      -275,   -445,  -1304,   3536,   1610,   -526,   -926,   -582,
+       -12,     44,   -180,    -69,   -804,   1107,   1451,   -868,
+      -851,   -589,   -354,    -85,     88,    336,   -537,   -444,
+        40,    231,   -715,   -523,   -351,   -379,   -123,    171,
+      1223,   -328,   -567,   2182,   -291,   -352,     20,   -157,
+      -338,   -635,   2194,   -476,   1624,   -802,   -762,   -585,
+      -245,     48,     63,    -45,    -32,   -646,    847,   -556,
+      -727,   -259,   1309,    239,   -128,   -755,  -1018,   -640,
+       876,   -642,   -906,   1394,    -26,    338,    204,    148,
+      -988,   -521,    135,   -807,   1065,   -525,    -80,   -248,
+       383,    836,    521,     13,   -553,   -865,   -928,   -631,
+      -137,    -83,    446,    221,   1924,     48,   -621,   -845,
+      -782,   -544,   -531,   -418,    -79,    915,   -711,   1247,
+      -938,   -766,   -995,   1459,     31,    199,    261,    190,
+      -670,  -1207,  -1013,    108,   -670,    204,    407,    266,
+       473,    998,   -606,   -923,   1845,  -1061,    910,   -774,
+       268,    493,    178,     61,   1938,  -1237,  -1010,  -1097,
+      -780,   -368,   1125,    354,    398,    550,   1032,  -1128,
+     -1196,   -908,   -767,    529,   2326,    728,    227,    -13,
+     -1113,   -367,    382,   -939,  -1094,   -896,   -463,    446,
+       896,   1128,   -591,   -823,   -894,   3052,   -968,   2157,
+      -153,    -71,    111,    118,  -1106,   -930,   -911,   1663,
+      -905,   -691,   -226,    503,    665,    702,   2067,  -1149,
+      -828,    990,   -850,   -426,   -159,    148,    379,    512,
+     -1268,  -1390,  -1492,  -1343,  -1419,   2246,   -224,   2124,
+      1523,   1338,    522,   1613,   -344,   -694,   -487,   -325,
+       293,     96,   -374,   -679,   -364,    124,  -1201,  -1274,
+     -1078,   -513,     15,   1045,    529,    680,    131,  -1067,
+     -1030,   -888,   -806,   -122,   1002,   1302,    757,   -473,
+      -530,   -538,   -821,   -373,     72,    797,    864,    265,
+      -542,  -1090,   -241,  -1095,  -1205,   -991,  -1172,   5025,
+      -420,    728,    461,    103,   2325,   -915,  -1012,   -854,
+     -1117,   2018,   -377,    -35,    266,    443,   -949,  -1163,
+     -1064,  -1057,   -802,    721,   1278,    470,    308,    263,
+       474,   -773,  -1033,   -892,    227,    -30,     39,    101,
+       456,    476,  -1263,   7275,   -946,  -1157,  -1304,   -922,
+       248,    143,    -98,    312,   3419,   -402,   -649,   -629,
+      -554,    -48,    487,     72,   -171,   -687,  -1167,   1869,
+      -524,   1490,   -869,   -236,    111,     68,     77,    -85,
+      1481,    906,  -1189,  -1321,  -1124,   -554,    429,    321,
+       814,    699,  -1048,    486,   -858,  -1096,  -1072,   -744,
+      1676,    -73,    593,    632,    779,  -1265,  -1470,  -1379,
+     -1050,   -548,    781,    524,   1022,   1079,  -1149,   3719,
+     -1064,  -1180,  -1159,   -775,   -211,    241,    492,    555,
+      3025,   2828,   -849,  -1133,  -1063,   -567,    -70,   -142,
+      -176,    -62,   -614,   1745,   -684,   -610,   1478,   -619,
+      -235,   -361,    -84,    -44,  -1155,   1494,  -1183,  -1210,
+     -1294,  -1017,   -330,    210,    931,   1368,  -1306,   2714,
+     -1052,  -1128,  -1220,   -908,   2409,    441,    310,    318,
+};
+
+static const int16_t fcb44sm[] = {
+      5619,   -163,  -1005,   -856,   -831,   -644,   -612,   -759,
+      -770,   -456,    199,   -551,  -1348,    -80,    131,   -481,
+       334,    202,    366,   1246,  -1245,    499,  -1454,   -396,
+      -675,   -257,    525,   1001,    878,   1075,  -1004,  -1010,
+     -1127,   -947,   -976,    332,   3533,   1315,    265,   -683,
+     -1114,   1056,  -1009,   1154,   -728,   -212,    620,    169,
+       102,   -110,   -658,   -902,  -1238,  -1213,  -1238,   -926,
+      -735,   -455,   1130,   5139,  -1184,    190,   1590,   -604,
+      -800,   -373,   -366,    251,    720,    571,     -6,    304,
+     -1228,   -369,   -659,   -506,    -25,   -234,    313,   2366,
+       623,   1473,   -315,    780,   1048,   -416,   -586,   -737,
+     -1029,  -1094,    483,   -725,   -771,   -379,   -268,    -15,
+       697,   1774,     -1,   -999,   -987,   -867,  -1339,  -1255,
+     -1018,   -652,   -125,    643,   3006,   2417,   -543,   1629,
+      1557,   -684,   -568,   -474,   -132,   -291,   -338,   -321,
+     -1250,    641,   -158,   -935,   -575,   -575,    154,    415,
+       798,   1421,   3147,   1903,   -335,   -767,   -729,   -627,
+      -611,   -752,   -836,   -735,    678,    502,   -946,    556,
+      -821,    -51,   -256,     94,    151,     70,   -808,   -324,
+      -359,   3637,    286,    -90,   -365,   -613,   -782,   -871,
+        75,   1051,   -780,   -487,     47,    273,   1768,   -102,
+      -828,  -1267,  -1093,   1420,   -624,    225,   1307,     85,
+       239,   -152,   -649,   -853,  -1072,   -796,   -644,   1383,
+      1143,   -199,     94,    -25,     70,     52,  -1064,   2487,
+      -844,   -607,   -587,    148,    726,    224,   -238,   -484,
+      -957,   -729,   1517,   1334,   -475,   -317,   -253,   -186,
+         1,     17,   -832,   1450,    423,   1408,   -576,   -825,
+      -630,   -579,   -312,    314,    788,    382,  -1000,  -1060,
+      -763,    968,   -135,     56,    143,    477,   -736,     30,
+      4023,     68,   -266,   -420,   -538,   -751,   -893,   -879,
+      -935,     59,    465,    887,   -351,   1396,    176,   -250,
+      -684,  -1019,   -515,   -815,   -957,   -439,    188,   3794,
+        86,    -98,   -245,   -829,   1894,   -386,   -865,   1513,
+        24,   -506,   -281,   -615,   -476,   -364,  -1283,   -963,
+      -339,   -133,   -161,   -480,     25,    230,   1364,   1815,
+      1766,   -844,  -1423,  -1185,   -972,   -458,   -275,    138,
+      1317,   1778,  -1295,   -874,  -1211,   -792,   -601,   -500,
+      2301,    901,   1336,    842,   1355,   -426,  -1160,   -959,
+      -801,   -433,   1852,    144,    284,    169,  -1122,   -851,
+      -957,    272,   -393,    817,    862,    262,    333,    802,
+       320,   -576,   1615,   -615,   -886,   -311,    108,     13,
+         1,    320,  -1205,    962,   -483,   -791,   -749,   1158,
+       677,    -57,    166,    279,   -860,   1237,   -971,  -1057,
+      -598,   -285,    884,   1174,    657,   -303,   2254,   -706,
+     -1113,   -655,    719,    234,   -124,   -199,   -135,   -360,
+      -758,   -623,   -385,    -18,   3243,    470,   -139,   -286,
+      -520,   -953,  -1193,  -1140,  -1297,  -1137,   -764,     25,
+       235,   2217,   1501,   1369,   2024,    781,  -1353,   -835,
+      -824,   -601,   -259,   -140,    387,    671,      3,   -974,
+      -760,   -884,   -485,    709,   1505,    -95,    321,    739,
+      1610,   -156,   1515,    -76,   -420,   -369,   -189,   -506,
+      -705,   -907,  -1052,   -516,  -1048,   -996,   -471,   1195,
+       212,    184,    800,   1665,    747,  -1029,  -1013,    789,
+      -703,    559,   -139,    -98,    380,    523,   -355,   2047,
+      -766,   -991,   -809,   -566,   -257,   -242,    485,   1322,
+      1989,   -330,   -945,   -559,   -448,   1241,    811,     10,
+      -767,  -1218,   1600,   -755,    428,   -729,   -355,   -665,
+      -416,   -120,    381,    548,   -717,    -14,   1587,   -886,
+        -9,    353,    839,    201,   -454,  -1112,  -1334,   -309,
+       660,   -375,   -661,   -511,   1437,    540,    492,      0,
+        95,   3911,   -237,   -301,   -562,   -483,   -569,   -799,
+      -883,   -580,   -670,   -980,  -1056,   -896,   -797,   1551,
+       267,   1000,   1617,     75,  -1132,   -403,   -988,   -830,
+      -627,   1164,   1315,   1594,    310,   -564,  -1091,   -563,
+      1195,   -442,   1086,   -344,   -176,   -258,    175,    476,
+       923,    -37,   -629,   -919,   1278,   -610,    113,   -314,
+       -81,    192,    731,   -944,  -1297,  -1108,   -934,   -259,
+       640,   1164,   1326,    558,   -767,   -519,   -875,   -930,
+      -817,   -533,    496,   2605,   1359,   -131,  -1010,    912,
+     -1055,   -309,    768,   -198,   -166,    -76,    429,    640,
+      3283,   -895,  -1229,   -853,   -853,   -399,    147,     44,
+       237,    495,   -833,   -909,  -1004,   -811,   1039,   1627,
+      -194,    295,    738,    290,   -771,    237,   -912,   -479,
+      -648,   -518,   -226,    573,   2346,    419,   1013,   1510,
+      -865,   -873,   -982,   -557,    598,     50,     81,    -81,
+     -1150,   -640,  -1011,   1991,   -561,   -140,     42,    175,
+       521,    799,   3231,    -46,  -1004,   -994,  -1140,  -1094,
+      -957,   -860,      8,   2346,    212,   -499,    -55,   -997,
+      -623,   -588,     38,    -58,    975,   1529,   -986,   -891,
+     -1121,   -619,   1967,   -463,     -7,    632,    768,    953,
+};
+
+static const float lsp8[] = {
+     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 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[] = {
+     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 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[] = {
+     0.0927,  0.2291,  0.4059,  0.5779,  0.7288,  0.8821,  1.0377,  1.1915,
+     1.3433,  1.4931,  1.6475,  1.7989,  1.9381,  2.0858,  2.2321,  2.3765,
+     2.5187,  2.6530,  2.7895,  2.9354,  0.0944,  0.1974,  0.3046,  0.4714,
+     0.6116,  0.7829,  0.9027,  1.0375,  1.1869,  1.3488,  1.5036,  1.6781,
+     1.8276,  1.9983,  2.1449,  2.3089,  2.4534,  2.6113,  2.7553,  2.9062,
+     0.1168,  0.2843,  0.4907,  0.6706,  0.8100,  0.9417,  1.0753,  1.2014,
+     1.3151,  1.4496,  1.5832,  1.7379,  1.8642,  2.0230,  2.1681,  2.3250,
+     2.4676,  2.6242,  2.7602,  2.9066,  0.1353,  0.2335,  0.3370,  0.4380,
+     0.5819,  0.7353,  0.8671,  1.0160,  1.1435,  1.2977,  1.4860,  1.6739,
+     1.8412,  2.0028,  2.1537,  2.3124,  2.4741,  2.6272,  2.7862,  2.9536,
+     0.1003,  0.2226,  0.3584,  0.4971,  0.6291,  0.7710,  0.9157,  1.0669,
+     1.2143,  1.3624,  1.5104,  1.6681,  1.8164,  1.9823,  2.1394,  2.3082,
+     2.4677,  2.6306,  2.7909,  2.9382,  0.1056,  0.2027,  0.2956,  0.4005,
+     0.5215,  0.6708,  0.8545,  1.0557,  1.2344,  1.4023,  1.5676,  1.7278,
+     1.8808,  2.0381,  2.1846,  2.3376,  2.4887,  2.6377,  2.7878,  2.9504,
+     0.1015,  0.2462,  0.4122,  0.5783,  0.7233,  0.8833,  1.0377,  1.1903,
+     1.3341,  1.4727,  1.6138,  1.7582,  1.8912,  2.0370,  2.1701,  2.3125,
+     2.4500,  2.6006,  2.7507,  2.9166,  0.1787,  0.2418,  0.3265,  0.5379,
+     0.6584,  0.7681,  0.9545,  1.1050,  1.2125,  1.3528,  1.4763,  1.6705,
+     1.8136,  1.9594,  2.0936,  2.2724,  2.4394,  2.5919,  2.7037,  2.8747,
+     0.0859,  0.1600,  0.2980,  0.4933,  0.6696,  0.8285,  0.9958,  1.1545,
+     1.3107,  1.4591,  1.6127,  1.7652,  1.9143,  2.0680,  2.2171,  2.3643,
+     2.5141,  2.6611,  2.8143,  2.9691,  0.0910,  0.2110,  0.3364,  0.4718,
+     0.5856,  0.7298,  0.8910,  1.0514,  1.1988,  1.3572,  1.5178,  1.6861,
+     1.8399,  2.0099,  2.1639,  2.3225,  2.4774,  2.6321,  2.7863,  2.9412,
+     0.1904,  0.2874,  0.3681,  0.4981,  0.6248,  0.7880,  0.9121,  1.0750,
+     1.2185,  1.3809,  1.5296,  1.7007,  1.8592,  2.0470,  2.1913,  2.3250,
+     2.4519,  2.5984,  2.7408,  2.9023,  0.0917,  0.2067,  0.3246,  0.4961,
+     0.6310,  0.8024,  0.9438,  1.1008,  1.2362,  1.3892,  1.5407,  1.7033,
+     1.8427,  2.0061,  2.1498,  2.3117,  2.4550,  2.6053,  2.7462,  2.9029,
+     0.0989,  0.2193,  0.3756,  0.5410,  0.6929,  0.8368,  0.9801,  1.1250,
+     1.2677,  1.4184,  1.5677,  1.7292,  1.8770,  2.0311,  2.1803,  2.3306,
+     2.4836,  2.6339,  2.7943,  2.9549,  0.0861,  0.1943,  0.3057,  0.4867,
+     0.6194,  0.7592,  0.9184,  1.1052,  1.2486,  1.4064,  1.5609,  1.7273,
+     1.8703,  2.0291,  2.1686,  2.3225,  2.4628,  2.6115,  2.7471,  2.9005,
+     0.0932,  0.2110,  0.3737,  0.5479,  0.7120,  0.8570,  0.9975,  1.1364,
+     1.2772,  1.4220,  1.5612,  1.7089,  1.8410,  1.9827,  2.1263,  2.2859,
+     2.4459,  2.6172,  2.7788,  2.9395,  0.1193,  0.2341,  0.3523,  0.5029,
+     0.6437,  0.7803,  0.9367,  1.1007,  1.2392,  1.3869,  1.5425,  1.7168,
+     1.8709,  2.0248,  2.1584,  2.2949,  2.4308,  2.5823,  2.7235,  2.9034,
+     0.0834,  0.1988,  0.3557,  0.5261,  0.6767,  0.8427,  1.0029,  1.1683,
+     1.3138,  1.4527,  1.6046,  1.7583,  1.9011,  2.0517,  2.1928,  2.3397,
+     2.4839,  2.6291,  2.7771,  2.9329,  0.0938,  0.1967,  0.3213,  0.4675,
+     0.6068,  0.7664,  0.9418,  1.1120,  1.2535,  1.3932,  1.5243,  1.6801,
+     1.8346,  1.9931,  2.1376,  2.3035,  2.4636,  2.6244,  2.7829,  2.9371,
+     0.1017,  0.2552,  0.4327,  0.6017,  0.7467,  0.8797,  1.0097,  1.1442,
+     1.2628,  1.4049,  1.5541,  1.7090,  1.8461,  1.9982,  2.1486,  2.3029,
+     2.4513,  2.6075,  2.7594,  2.9209,  0.1031,  0.2295,  0.3747,  0.5122,
+     0.6596,  0.7935,  0.9345,  1.1050,  1.2384,  1.3543,  1.4739,  1.6136,
+     1.7447,  1.8914,  2.0434,  2.1916,  2.3557,  2.5396,  2.7419,  2.9401,
+     0.1007,  0.2374,  0.3715,  0.5173,  0.6465,  0.8069,  0.9553,  1.1145,
+     1.2594,  1.4143,  1.5617,  1.7166,  1.8457,  2.0012,  2.1462,  2.2864,
+     2.4258,  2.5910,  2.7372,  2.9018,  0.0808,  0.1726,  0.2849,  0.4592,
+     0.6118,  0.7853,  0.9588,  1.1256,  1.2751,  1.4392,  1.5898,  1.7514,
+     1.8977,  2.0554,  2.1937,  2.3430,  2.4831,  2.6249,  2.7601,  2.9155,
+     0.1669,  0.2574,  0.3694,  0.5569,  0.6773,  0.8061,  1.0160,  1.1667,
+     1.2791,  1.4041,  1.5452,  1.7207,  1.8524,  2.0038,  2.1414,  2.3338,
+     2.4747,  2.6157,  2.7303,  2.8848,  0.1598,  0.2521,  0.3416,  0.5149,
+     0.6703,  0.7941,  0.9408,  1.1164,  1.2017,  1.3293,  1.4908,  1.6783,
+     1.8438,  1.9927,  2.1149,  2.2698,  2.4420,  2.6193,  2.7583,  2.9103,
+     0.0902,  0.1978,  0.3265,  0.4578,  0.5878,  0.7439,  0.9110,  1.0906,
+     1.2556,  1.4125,  1.5688,  1.7295,  1.8829,  2.0472,  2.2058,  2.3537,
+     2.5075,  2.6548,  2.8058,  2.9538,  0.0818,  0.1695,  0.2794,  0.4470,
+     0.6069,  0.7641,  0.9313,  1.0946,  1.2411,  1.4072,  1.5640,  1.7186,
+     1.8651,  2.0254,  2.1726,  2.3286,  2.4784,  2.6287,  2.7750,  2.9339,
+     0.1980,  0.3134,  0.4099,  0.4975,  0.6491,  0.8376,  0.9441,  1.0298,
+     1.1795,  1.3866,  1.5784,  1.7209,  1.8137,  1.9271,  2.0863,  2.2930,
+     2.4696,  2.6184,  2.7587,  2.9251,  0.1338,  0.2341,  0.3566,  0.4797,
+     0.6129,  0.7580,  0.9093,  1.0491,  1.1911,  1.3313,  1.4841,  1.6503,
+     1.8035,  1.9685,  2.1128,  2.2694,  2.4093,  2.5728,  2.7206,  2.8994,
+     0.0937,  0.2034,  0.3447,  0.5032,  0.6370,  0.7993,  0.9674,  1.1323,
+     1.2830,  1.4199,  1.5492,  1.7010,  1.8513,  2.0087,  2.1550,  2.3115,
+     2.4643,  2.6237,  2.7812,  2.9392,  0.1085,  0.2152,  0.3126,  0.4569,
+     0.5718,  0.7213,  0.8837,  1.0604,  1.2053,  1.3755,  1.5397,  1.7001,
+     1.8409,  2.0039,  2.1498,  2.3080,  2.4535,  2.6063,  2.7505,  2.9110,
+     0.0562,  0.2066,  0.4034,  0.5490,  0.6682,  0.7924,  0.9495,  1.0800,
+     1.1869,  1.3156,  1.4834,  1.6619,  1.8404,  2.0199,  2.1509,  2.2755,
+     2.4072,  2.5580,  2.6993,  2.8913,  0.0939,  0.2303,  0.3742,  0.5260,
+     0.6662,  0.8294,  0.9769,  1.1315,  1.2792,  1.4153,  1.5436,  1.6701,
+     1.8215,  1.9920,  2.1310,  2.3005,  2.4534,  2.5786,  2.7204,  2.9068,
+     0.1005,  0.2442,  0.3898,  0.5398,  0.6958,  0.8474,  1.0008,  1.1556,
+     1.3020,  1.4456,  1.5954,  1.7470,  1.8922,  2.0500,  2.2019,  2.3492,
+     2.4963,  2.6412,  2.7890,  2.9423,  0.1022,  0.2031,  0.3213,  0.4402,
+     0.5637,  0.7117,  0.8673,  1.0242,  1.1727,  1.3206,  1.4846,  1.6465,
+     1.8015,  1.9655,  2.1233,  2.2873,  2.4464,  2.6074,  2.7685,  2.9409,
+     0.1985,  0.3497,  0.4622,  0.5982,  0.7489,  0.8752,  0.9925,  1.1679,
+     1.3288,  1.4606,  1.5820,  1.7492,  1.8922,  2.0511,  2.1780,  2.3373,
+     2.4760,  2.6233,  2.7466,  2.8978,  0.1284,  0.2433,  0.3630,  0.4852,
+     0.6117,  0.7460,  0.8904,  1.0360,  1.1738,  1.3142,  1.4696,  1.6185,
+     1.7719,  1.9318,  2.0961,  2.2697,  2.4408,  2.6046,  2.7681,  2.9451,
+     0.1042,  0.2286,  0.3598,  0.5064,  0.6438,  0.7899,  0.9350,  1.0891,
+     1.2323,  1.3807,  1.5225,  1.6747,  1.8153,  1.9669,  2.1145,  2.2832,
+     2.4430,  2.6085,  2.7748,  2.9346,  0.0780,  0.1724,  0.2440,  0.3489,
+     0.5280,  0.7426,  0.9272,  1.0914,  1.2562,  1.4188,  1.5804,  1.7376,
+     1.8909,  2.0473,  2.1946,  2.3457,  2.4950,  2.6424,  2.7926,  2.9549,
+     0.1103,  0.2608,  0.4087,  0.5538,  0.6923,  0.8418,  0.9940,  1.1507,
+     1.2919,  1.4406,  1.5802,  1.7262,  1.8638,  2.0085,  2.1572,  2.2975,
+     2.4329,  2.5866,  2.7380,  2.9107,  0.1297,  0.2532,  0.4003,  0.5329,
+     0.6733,  0.7950,  0.9557,  1.0859,  1.2235,  1.3538,  1.5037,  1.6389,
+     1.7964,  1.9285,  2.0898,  2.2541,  2.4231,  2.5711,  2.6875,  2.8947,
+     0.0871,  0.1968,  0.3425,  0.4949,  0.6424,  0.7959,  0.9534,  1.1132,
+     1.2656,  1.4229,  1.5785,  1.7271,  1.8729,  2.0355,  2.1998,  2.3562,
+     2.5151,  2.6663,  2.8145,  2.9534,  0.1038,  0.2204,  0.3248,  0.4566,
+     0.5947,  0.7443,  0.8811,  1.0379,  1.2031,  1.3772,  1.5430,  1.7092,
+     1.8625,  2.0322,  2.1904,  2.3417,  2.4960,  2.6458,  2.7979,  2.9485,
+     0.1329,  0.2763,  0.3943,  0.5147,  0.6512,  0.8071,  0.9410,  1.0879,
+     1.2298,  1.3850,  1.5282,  1.6674,  1.8137,  1.9993,  2.1344,  2.2749,
+     2.4257,  2.5863,  2.7410,  2.9184,  0.1052,  0.2142,  0.3584,  0.5033,
+     0.6387,  0.7804,  0.9320,  1.0780,  1.2172,  1.3764,  1.5421,  1.6887,
+     1.8246,  1.9833,  2.1245,  2.2797,  2.4237,  2.5779,  2.7257,  2.9097,
+     0.1092,  0.2676,  0.4071,  0.5355,  0.6661,  0.8142,  0.9621,  1.1173,
+     1.2628,  1.4185,  1.5696,  1.7220,  1.8595,  2.0178,  2.1720,  2.3221,
+     2.4718,  2.6259,  2.7775,  2.9334,  0.0929,  0.2017,  0.3073,  0.4570,
+     0.5775,  0.7635,  0.9299,  1.0832,  1.2334,  1.3935,  1.5420,  1.7112,
+     1.8601,  2.0309,  2.1735,  2.3230,  2.4543,  2.6034,  2.7418,  2.8988,
+     0.0775,  0.2005,  0.3490,  0.5200,  0.6747,  0.8383,  0.9885,  1.1738,
+     1.3141,  1.4236,  1.5892,  1.7402,  1.8474,  2.0210,  2.1593,  2.2730,
+     2.4235,  2.5604,  2.7128,  2.9005,  0.1104,  0.2292,  0.3353,  0.4732,
+     0.6152,  0.7675,  0.9164,  1.0907,  1.2594,  1.4064,  1.5218,  1.6426,
+     1.8018,  1.9937,  2.1362,  2.2961,  2.4523,  2.6083,  2.7613,  2.9202,
+     0.0826,  0.2000,  0.3384,  0.5144,  0.6694,  0.8377,  0.9870,  1.1461,
+     1.2950,  1.4495,  1.5872,  1.7387,  1.8793,  2.0329,  2.1723,  2.3114,
+     2.4415,  2.5908,  2.7354,  2.9028,  0.1063,  0.2268,  0.3442,  0.4735,
+     0.6116,  0.7507,  0.9028,  1.0768,  1.2426,  1.4052,  1.5566,  1.7015,
+     1.8243,  1.9742,  2.1276,  2.2824,  2.4262,  2.5953,  2.7627,  2.9290,
+     0.1150,  0.2814,  0.4543,  0.6095,  0.7373,  0.8592,  0.9908,  1.1108,
+     1.2339,  1.3590,  1.4864,  1.6168,  1.7392,  1.8752,  2.0212,  2.1688,
+     2.3128,  2.4869,  2.7019,  2.9239,  0.0948,  0.2074,  0.3433,  0.4943,
+     0.6346,  0.7645,  0.8809,  1.0610,  1.2307,  1.3487,  1.4655,  1.6186,
+     1.7534,  1.8859,  2.0486,  2.2200,  2.3835,  2.5581,  2.7565,  2.9502,
+     0.1062,  0.2239,  0.3683,  0.5197,  0.6704,  0.8184,  0.9642,  1.1127,
+     1.2556,  1.3976,  1.5405,  1.6940,  1.8375,  1.9888,  2.1377,  2.2980,
+     2.4555,  2.6184,  2.7849,  2.9452,  0.0888,  0.2005,  0.2847,  0.4322,
+     0.5763,  0.7577,  0.9262,  1.1095,  1.2719,  1.4331,  1.5843,  1.7452,
+     1.8845,  2.0385,  2.1805,  2.3345,  2.4750,  2.6217,  2.7555,  2.9013,
+     0.1713,  0.2617,  0.3868,  0.5859,  0.7073,  0.8535,  1.0593,  1.1778,
+     1.3109,  1.4508,  1.5910,  1.7463,  1.8911,  2.0651,  2.2035,  2.3355,
+     2.4947,  2.6440,  2.7424,  2.8943,  0.1346,  0.2549,  0.4089,  0.5488,
+     0.6949,  0.8394,  0.9810,  1.1145,  1.2528,  1.4044,  1.5423,  1.6872,
+     1.8274,  1.9726,  2.1403,  2.2809,  2.4128,  2.5564,  2.6887,  2.8895,
+     0.0776,  0.1621,  0.2553,  0.4191,  0.5988,  0.7921,  0.9651,  1.1350,
+     1.2930,  1.4475,  1.6011,  1.7585,  1.9068,  2.0638,  2.2102,  2.3594,
+     2.5096,  2.6581,  2.8099,  2.9654,  0.0864,  0.1778,  0.2854,  0.4235,
+     0.5568,  0.7220,  0.8963,  1.0609,  1.2217,  1.3830,  1.5422,  1.7018,
+     1.8551,  2.0206,  2.1783,  2.3328,  2.4869,  2.6366,  2.7923,  2.9539,
+     0.1144,  0.2576,  0.4186,  0.5594,  0.6875,  0.8221,  0.9598,  1.0944,
+     1.2273,  1.3713,  1.5152,  1.6628,  1.8070,  1.9525,  2.0965,  2.2535,
+     2.4132,  2.5725,  2.7250,  2.9150,  0.1079,  0.2221,  0.3334,  0.4845,
+     0.6083,  0.7516,  0.9018,  1.0594,  1.2060,  1.3673,  1.5212,  1.6880,
+     1.8208,  1.9831,  2.1269,  2.2909,  2.4366,  2.6027,  2.7339,  2.8924,
+     0.0994,  0.2233,  0.3634,  0.5145,  0.6568,  0.8131,  0.9746,  1.1296,
+     1.2666,  1.4116,  1.5748,  1.7264,  1.8649,  2.0217,  2.1716,  2.3293,
+     2.4900,  2.6455,  2.7818,  2.9362,  0.1120,  0.2079,  0.3128,  0.4124,
+     0.5291,  0.6816,  0.8478,  1.0150,  1.1772,  1.3456,  1.5208,  1.6882,
+     1.8458,  2.0078,  2.1627,  2.3198,  2.4733,  2.6251,  2.7796,  2.9489,
+     0.0853,  0.2030,  0.3669,  0.5326,  0.6678,  0.8086,  0.9526,  1.1142,
+     1.2551,  1.4158,  1.5694,  1.7073,  1.8431,  1.9686,  2.1153,  2.2376,
+     2.3686,  2.5591,  2.7320,  2.9104,  0.0905,  0.2166,  0.3539,  0.5201,
+     0.6700,  0.8346,  0.9883,  1.1457,  1.2714,  1.3845,  1.5172,  1.6688,
+     1.8008,  1.9535,  2.1019,  2.2708,  2.4135,  2.5974,  2.7486,  2.9033,
+     0.0084,  0.0374,  0.0164, -0.0153,  0.0288,  0.0107, -0.0255, -0.0242,
+     0.0000, -0.0055, -0.0081, -0.0075, -0.0022, -0.0052, -0.0069, -0.0017,
+     0.0003,  0.0091,  0.0028, -0.0027,  0.0085,  0.0043, -0.0235, -0.0411,
+     0.0202,  0.0359,  0.0376,  0.0321,  0.0306, -0.0358, -0.0276, -0.0090,
+     0.0032,  0.0048,  0.0309,  0.0332,  0.0284,  0.0237,  0.0051, -0.0101,
+    -0.0233, -0.0428, -0.0585, -0.0387,  0.0039,  0.0081,  0.0029, -0.0017,
+    -0.0006, -0.0068,  0.0044,  0.0182,  0.0376,  0.0387, -0.0334, -0.0269,
+    -0.0182, -0.0069, -0.0026,  0.0035, -0.0049, -0.0212, -0.0408, -0.0245,
+     0.0186,  0.0189,  0.0153,  0.0120,  0.0157,  0.0055, -0.0046,  0.0179,
+     0.0284, -0.0032, -0.0261, -0.0205, -0.0039,  0.0174,  0.0299,  0.0207,
+     0.0012, -0.0056,  0.0010,  0.0141, -0.0119,  0.0190,  0.0315,  0.0033,
+    -0.0128,  0.0300,  0.0328,  0.0308,  0.0353,  0.0266,  0.0066, -0.0328,
+    -0.0273,  0.0054,  0.0145,  0.0175,  0.0015, -0.0171,  0.0062, -0.0164,
+     0.0045, -0.0071,  0.0025,  0.0278,  0.0283,  0.0117, -0.0026, -0.0285,
+    -0.0408, -0.0366, -0.0059, -0.0208, -0.0354, -0.0334, -0.0263, -0.0064,
+     0.0072, -0.0006, -0.0235, -0.0037, -0.0307, -0.0294, -0.0163, -0.0197,
+    -0.0235,  0.0192,  0.0013, -0.0219, -0.0123, -0.0004, -0.0081, -0.0096,
+    -0.0123, -0.0101,  0.0021,  0.0151,  0.0106,  0.0151,  0.0292,  0.0033,
+     0.0283,  0.0124,  0.0058, -0.0017, -0.0038,  0.0152,  0.0141,  0.0132,
+     0.0178,  0.0157,  0.0073,  0.0176,  0.0141,  0.0097, -0.0092, -0.0163,
+    -0.0230, -0.0134, -0.0099, -0.0147,  0.0040, -0.0183, -0.0175, -0.0080,
+    -0.0083, -0.0290, -0.0417, -0.0398, -0.0269, -0.0199, -0.0143, -0.0053,
+    -0.0099, -0.0054, -0.0199, -0.0219, -0.0170,  0.0107,  0.0194,  0.0035,
+     0.0437,  0.0406,  0.0215,  0.0120,  0.0053, -0.0028,  0.0238,  0.0337,
+     0.0217,  0.0011,  0.0227,  0.0244,  0.0327,  0.0378,  0.0437,  0.0356,
+    -0.0033,  0.0113,  0.0407,  0.0334, -0.0125, -0.0003, -0.0141, -0.0273,
+    -0.0137, -0.0079, -0.0145, -0.0071,  0.0114,  0.0181,  0.0150,  0.0085,
+    -0.0077, -0.0038, -0.0219, -0.0263, -0.0187, -0.0233,  0.0133,  0.0265,
+    -0.0156, -0.0091, -0.0110, -0.0016,  0.0143,  0.0177,  0.0240,  0.0082,
+    -0.0143, -0.0257, -0.0014,  0.0002,  0.0082,  0.0180,  0.0325,  0.0340,
+    -0.0153, -0.0389, -0.0240,  0.0082,  0.0140,  0.0046, -0.0138, -0.0378,
+    -0.0366,  0.0297,  0.0252,  0.0078,  0.0063,  0.0006,  0.0044,  0.0074,
+     0.0094,  0.0113,  0.0105,  0.0137,  0.0438,  0.0262, -0.0078, -0.0185,
+    -0.0215, -0.0407, -0.0435, -0.0208, -0.0004, -0.0144, -0.0205, -0.0248,
+    -0.0159, -0.0069, -0.0153,  0.0132,  0.0355,  0.0298,  0.0120,  0.0072,
+     0.0236,  0.0526,  0.0479,  0.0233, -0.0133, -0.0283, -0.0468, -0.0549,
+    -0.0370,  0.0032,  0.0056,  0.0023,  0.0050,  0.0024,  0.0279,  0.0116,
+    -0.0045, -0.0012,  0.0107,  0.0190,  0.0253,  0.0191,  0.0043,  0.0193,
+    -0.0348, -0.0246,  0.0123,  0.0210,  0.0135, -0.0096, -0.0109, -0.0076,
+    -0.0156, -0.0290,  0.0160,  0.0194,  0.0219,  0.0259,  0.0250,  0.0195,
+     0.4948,  0.4961,  0.4940,  0.4878,  0.4849,  0.4727,  0.4571,  0.4551,
+     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,
+};
+
+static const int16_t shape8[] = {
+      2765,   1262,   6624,    867,    688,   1884,   3245,   1248,
+     -2160,    593,    182,  -1004,  -1067,    687,   1021,   -920,
+      1396,   -242,  -2817,  -1838,  -3351,   1000,   5995,   2459,
+      -283,   1909,   1452,  -4569,    556,  -2004,    -42,  -3393,
+       -50,   -385,    597,    983,    420,   6311,  -1572,  -1665,
+      6128,  -1688,  -5191,   -337,  -4199,    371,   1032,    -84,
+      2169,    931,   -392,   -250,    137,    831,   8194,   -489,
+       -92,    209,    115,   1453,    246,   -647,    936,   1097,
+      -400,    597,    392,     93,  -7709,   -711,   -724,   2051,
+       497,   1919,   -876,   -769,   -172,   2972,    952,    555,
+       151,   -617,    773,   4840,  -3671,    841,    244,   -661,
+     -3424,    958,     81,    532,   -315,    796,   5491,   -516,
+        -1,  -1371,   -531,  -5538,    313,  -1749,   2413,   -835,
+     -3143,   -244,  -3470,   -850,  -4241,   -859,    -74,   2141,
+     -1005,   4643,   -339,   4089,   -861,  -6612,    483,  -2888,
+      -580,    -45,   3662,    918,   -317,   3596,   -741,    897,
+     -2578,   -654,  -1628,  -1865,    629,   3219,    214,  -1898,
+      1173,  -4509,   1682,  -2161,    697,   -147,   9839,    751,
+     -1094,   -341,   -669,  -1322,    649,   -832,   -382,  -5467,
+       -44,   3510,   1312,   3104,   -202,   1870,   -155,    601,
+       719,    -22,   -350,    394,     81,    397,  -9185,   -174,
+       351,  -4717,  -4450,   3672,   1163,   2351,   1720,   1048,
+     -1221,   -280,    -18,    -15,    678,  -3931,   4707,    -99,
+      1823,   -535,  -1836,    138,   1166,  -3031,   5515,   1362,
+      1235,    455,    595,  -3671,   1102,   -163,     62,   1104,
+       813,    870,   -295,  -1088,   -299,  -3976,    805,  -7468,
+      -412,  -2109,    236,     46,  -5764,    615,  -1475,    853,
+       790,  -6197,    312,    637,  -3923,   -422,  -1086,  -5647,
+       878,  -1410,   2085,    -51,  -2941,   -769,    -63,    838,
+       823,    741,   2785,    450,  -7003,   -121,   -915,     60,
+       -41,      0,    -39,   8774,    647,   -521,    379,   -342,
+      -344,    818,   1316,   1056,    182,   2765,   -467,   7886,
+        45,    791,   -415,   3864,  -2428,   2255,   -661,    -64,
+      1693,    144,   1784,  -1194,    -46,  -1856,   1208,   4131,
+       914,   8028,    -17,   1939,  -1415,    533,    291,   -466,
+       186,   -705,    668,   -614,   -253,  -2190,    287,   3929,
+      1472,  -1561,      5,    889,  -2020,    158,    -14,  -1419,
+      1338,   -353,    622,    -54,     87,  -1104,  -2911,    513,
+      -632,   1533,   -267,     22,   6567,    295,    325,   6883,
+       963,   -373,   -349,    183,    896,   1845,  -1157,    351,
+      -367,   1171,   4362,    508,   5632,    704,  -1420,  -1886,
+       686,   5230,     -9,   2422,    230,    264,   3738,   -270,
+      -344,   -528,   -936,   2286,   -540,   4274,    337,   -665,
+       737,   1639,  -1307,   5827,    592,  -1372,   -412,   1419,
+      4579,    335,    223,  -1067,   -112,   -446,    149,   1375,
+      -155,   -392,  -1980,    561,    -67,    341,   6957,    475,
+     11449,     39,     81,    766,  -1880,    558,   -134,  -7940,
+      -489,    249,   -886,   -358,   6850,   2794,  -2217,   1111,
+     -1222,  -1130,   -818,   1076,  -1823,    865,  -2220,   1179,
+      4492,    224,  -2073,   -338,  -5351,   -390,    133,    496,
+       -42,    -16,     46,    437,    322,   -275,    -72,     48,
+      -325,    313,   1108,  -1044,   -851,  -5030,   1035,   4316,
+     -1281,   -913,  -1419,   -941,   1914,    960,   1242,    202,
+      5109,    475,   1254,   1725,  -1504,     -4,   -269,   -421,
+      -150,  -4409,   -610,  -1548,  -1684,   -817,   -210,     72,
+      -679,   -106,  -3809,  -1137,      4,   7220,    -95,    810,
+      2432,   -331,    492,    -81,    138,    -62,   -613,   -636,
+       106,  10908,    912,    144,    192,   1251,  -3970,   -954,
+      1145,   1175,  -1721,   5326,  -1721,   -569,  -3661,  -1166,
+      6605,   -744,  -1494,    853,    134,   3259,   -504,  -1740,
+       180,   -207,   -659,    196,    179,   -106,    118,    789,
+      -834,  10339,   -420,  -3002,   -456,    113,   6435,    949,
+       721,  -2709,  -1599,   -684,  -8068,    174,  -1416,    -58,
+       974,    308,   -726,   1237,  -1594,    519,   -131,   -198,
+     -1395,   1180,   -173,    338,  -5584,   -279,   -236,   6817,
+        89,   -220,   3967,   -107,     65,   2479,    -22,    642,
+      7179,   1179,   -229,   -202,   4948,  -5465,   1632,  -1285,
+      2188,  -2037,   1763,    636,   4247,    995,   1176,      2,
+     -2398,   1236,   -661,    382,  -1075,    130,    103,   -187,
+       604,   -306,  -2635,  -2185,    157,    775,   6373,   -924,
+      1758,  -3043,   1707,   2852,  -2148,   6779,    376,  -1018,
+     -2374,   -989,    249,  -5393,    -32,    538,   -416,  -5108,
+      -658,   1839,    419,   1153,  -3956,   -617,  -1925,   5434,
+       626,   1488,  -3824,    140,    370,  -2230,  -7031,   1989,
+      -581,    639,  -4249,   -216,   1225,   -776,   -973,   -542,
+     -2922,  -1783,  -2430,  -3251,    958,   3313,    636,  -6277,
+       119,   -866,   -406,   -156,  -4839,    966,   -469,   5559,
+       193,    376,  -4810,   -870,    163,   4130,   2596,   2203,
+      -114,   2423,   -622,   -424,   2935,    749,   2500,   4230,
+      -162,  -1489,   2169,  -5156,    751,   2748,   2240,  -1549,
+      4821,    175,   2274,    854,   2993,    838,    322,  -2663,
+      -794,   -283,    -98,   1393,   -709,    362,    285,  -1085,
+      1075,    374,   1062,   6512,  -3375,  -3138,   3939,   3628,
+      3926,  -2442,   1989,   -583,  -1282,  -1882,  -3920,  -4593,
+       540,   2667,   -155,    156,  -2428,   1229,   -436,   1754,
+      2815,  -1634,  -2299,   1155,    990,   3689,  -1242,   3145,
+      3951,     45,    186,  -1110,    257,   -335,   8929,    533,
+      -173,    813,     21,   1584,    541,    -44,   1349,    108,
+     -5163,   -684,   5522,   -868,  -5795,    769,    583,   2827,
+      -818,  -5551,   1485,     37,   -631,   -262,  -4352,   -532,
+        61,    434,   1775,   8974,   -112,   -852,  -1227,  -1645,
+       260,    298,   -430,    863,  -3860,    -97,   6467,   -328,
+     -2418,    -61,  -1253,   1575,     30,  -5683,   2113,    973,
+      -371,    -51,   5355,    471,   -584,   -492,  -2187,   2799,
+      -506,   4435,   1950,  -3415,   -363,   -404,    941,   2628,
+      -146,    434,   2853,    889,    634,   5749,    -54,    126,
+       189,  -1384,   -379,  -3205,   -540,   1720,    942,  -6300,
+      -286,    -58,  -1083,   3782,    251,   -334,   4172,    631,
+        17,     83,    707,   1322,   3273,   -573,   1024,  -6112,
+      -540,   4916,    155,  -1209,    308,   -738,  -2150,    786,
+      -168,     68,   -201,    -64,   -752,  -1595,  -9188,    320,
+      -426,    111,  -2183,    886,   -737,    193,   -837,   3219,
+      5936,   4022,    764,    -82,   3344,   -855,   3705,  -2652,
+      1533,   -206,  -3673,   1235,   1163,  -1217,   3183,   1313,
+      -745,   6554,   7019,   1302,   2129,    268,    -70,    110,
+       412,   -155,  -1703,  -4945,    105,  -1705,    412,  -6588,
+      2905,   1279,     73,  -2446,  -5635,   1168,   2974,    404,
+      -650,    265,  -1773,  -1857,   -108,   -651,    657,   -824,
+      3352,    177,    155,   1275,   2012,     31,     -7,  -1065,
+      2062,    411,  -2325,   -208,  -6306,    683,   1037,  -1060,
+       191,   -187,   -585,   6103,   -459,    571,   1640,   -693,
+       922,  -2291,    537,   1934,    263,   3847,   -202,   7060,
+       136,   4368,   2963,  -1032,     18,   1836,   -144,  -3853,
+       474,   2005,   1298,   2396,    825,  -2274,     12,   3759,
+      -394,    907,    490,   2997,   2180,  -1570,  -1000,   5982,
+      -129,   -820,  -3001,   2684,  -1132,  -2908,   1101,   5044,
+       393,  -1637,    393,   1343,  -1231,    404,   1817,   1463,
+      -443,   1053,   -584,  -7756,     45,    499,  -4109,    214,
+       535,  -3348,     54,  -1594,   6913,      0,    -94,   8772,
+       500,     13,    734,      5,    798,  -1521,    853,    -82,
+      -263,   -619,   1558,    456,   5911,  -1376,   1054,   -971,
+     -1275,   -147,   -111,   4964,    321,     67,   7024,   -525,
+       620,    883,  -1058,  -1132,  -3313,    630,    226,  -6201,
+     -1011,   1111,   -820,   -295,    580,    636,   2452,   -638,
+      6840,   -285,    655,   1502,  -1049,   -567,    329,    -33,
+      -249,    570,    186,    167,    780,   1104,     42,    197,
+     10034,  -1295,   -208,     32,  -1473,    716,    159,  -6672,
+       -45,    519,  -4300,   -246,   3692,   5062,   4305,   -748,
+      -548,    181,   -382,   -881,  -1968,    580,    964,   -420,
+      -327,  -3397,  -1584,   2770,  -3501,   1659,  -1252,   2352,
+         6,     30,      0,   -273,     27,   -204,   -485,   -432,
+        -6,    176,   -428,   1562,    104,  -6511,  -1084,   2205,
+       -11,  -5254,   -132,   -508,    -69,    373,  -1503,    208,
+       -58,   5311,     92,   -966,  -6563,   -480,    -24,   1424,
+     -1498,   -165,   4594,   -903,  -1787,   -353,  -7284,    142,
+      1008,    875,  -6109,    -16,    162,   4895,     30,   -188,
+      2099,   1581,    300,   -259,   -921,   -386,   -488,    140,
+      -482,   7135,    -77,    494,   -196,   3207,   -250,   -102,
+       318,    978,    161,   7292,     55,  -1347,  -2605,    898,
+      1833,    602,  -1988,    630,   -145,   -102,   -414,   -133,
+       417,   -603,    156,  -1151,   -395,    625,  -1676,     86,
+       680,  13321,    322,  -5816,   -292,   -223,   4205,   -361,
+       903,   -224,   1745,     95,  -6598,     79,   2323,    -24,
+       263,    778,    146,   -939,   1814,   1945,    720,    367,
+     -2987,    899,  -4409,    136,  -3185,   -342,  -3304,   1016,
+       284,   -345,   2313,   -403,    389,  -1403,   1835,    151,
+      -132,  -1702,   -339,  -5679,   2026,  -2990,     47,   -564,
+       399,  -2167,   1392,   1384,   5094,  -2954,   4467,    -22,
+       -23,    408,   1620,   1381,   2380,    805,    380,    -36,
+      -803,    765,   -778,    905,   -200,   -669,   3942,    289,
+       176,  -4767,   2015,  -3554,   1206,   6071,    180,   2057,
+       -48,    365,    -48,  -2423,    585,   -109,  -1298,   2519,
+      -525,   -589,    374,    976,   3667,   2091,  -2890,   1371,
+      -726,   -216,  -1027,   -116,   2122,   -619,  -3826,   4649,
+      1167,      0,   1237,   1538,   2505,   -548,  -3093,   1344,
+      -558,  -1927,    199,   2462,   1327,   4597,    833,  -3660,
+      -341,  -1010,    428,    148,  -1682,    130,   1569,   8785,
+      -752,  -1032,  -2407,    353,   -379,   3311,    892,    893,
+     -2596,   -217,   -835,  -2291,   1137,  -4339,    -58,   2759,
+       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,
+     -1907,  -2371,   -555,   -324,   -479,   6961,   -286,  -4290,
+       626,   -953,    -14,  -1681,   -443,   1504,   -366,    513,
+     -1206,    870,   9239,    112,   -213,    425,    381,   1802,
+       750,    594,     61,   -152,  -2060,  -8997,   -752,    197,
+      -493,   -176,   -389,   -591,   2988,    654,   2404,   -204,
+       304,   -279,    202,     66,   -185,    415,    159,  -1514,
+     -6775,    -37,  -2617,  -1246,  -4012,   1208,   -554,   3240,
+      -655,   -394,  -1464,  -4448,    388,   1058,   -364,  -1760,
+      1081,   -558,   -116,   -108,     99,   -925,    763,  -1301,
+      -251,    258,    -33,    311,    555,    227,   -279,   -601,
+      -135,   -675, -10615,   -937,    158,    503,  -2044,   1075,
+      -114,   4278,  -9040,     67,  -1076,   -705,   -122,   -533,
+      3299,  -1826,  -1316,    708,  -3840,   -740,   -370,  -1074,
+        87,   -462,   2177,  -1177,     57,  -6311,   -170,   -777,
+      -256,    435,    291,  10371,    -82,   -425,  -1757,   -196,
+      3824,  -6289,     62,   4506,   -519,   -783,   1155,    878,
+       295,  -2044,    305,    186,    263,  -1716,   -482,  -5678,
+       415,   2709,    213,   7531,   1376,    813,   1803,    190,
+       398,   6483,   1425,    235,   2713,    520,  -2892,  -1191,
+      6074,    654,  -6535,    320,   -736,   -478,   2563,   -309,
+     -3477,   -155,    275,   1024,    390,   -386,   -331,  14043,
+       251,   -410,   1496,     24,   1272,   -816,    549,   -238,
+     -2489,    158,    194,      1,   -306,  -3088,   -264,    200,
+       -30,   -520,   -472,    -30,   -464,   -764,    440,   -659,
+        88,    778,    -31,  -1794,  -3817,   -344,    887,   -551,
+       115,   -763,  -5338,   2906,     50,    736,   5536,  -1101,
+       330,   -405,    416,   1022,    -93,     71,  10034,   -200,
+     -1258,  -3405,    480,    141,    399,    500,    311,   -503,
+       301,   4398,    454,   -922,    975,   -101,   -775,    -81,
+     -1723,   1077,    857,  -1682,    813,    847,    342,   -276,
+      3582,   2991,   5571,    713,   1280,    596,  -1325,  -1087,
+      -681,   1411,    391,  -1728,    492,    544,   1512,   -724,
+     -7445,   -426,      6,   -534,  -3643,  -1598,   2650,   -834,
+      2096,   -333,     67,   1746,  -1584,  -1003,   1272,   1710,
+      1666,    176, -11716,    329,  -1829,    385,    802,   -382,
+      2244,     -8,   -222,  -2351,    369,  -1067,  -9354,    293,
+       -51,  -1849,   -500,  -2350,  -1824,   -826,   -450,  -2155,
+       456,    245,   1796,    320,    -73,   -306,   -122,    290,
+       118,   -298,   -675,   -180,   -828,     86,    -44,    165,
+       435,  -8249,    769,    630,  -1670,   -762,    453,   5893,
+       259,    -92,  -1003,   -358,    -32,  -1350,   -535,   -289,
+       409,   -558,   -344,   -752,   6037,   -680,   2471,    581,
+      -351,   1251,  -5827,    194,   -104,    815,   1257,   -619,
+       243,    410,   4455,   -969,     50,   1286,  -1013,   -293,
+     -7740,     73,    615,    523,   -149,   -824,   2235,   1571,
+       970,    944,   4778,   -132,  -5082,     83,    129,   -820,
+      -803,    694,   1615,   1163,    517,   -402,    -80,    762,
+      -107,   -419,    142,   -294,  11298,    301,    484,   -513,
+       105,    547,   1130,  -4253,   -742,    376,  -1545,   1076,
+      4372,   2338,  -2847,    495,   -190,  -2444,    931,   6487,
+       117,  -1273,   1488,    -75,   -322,   -487,  -2614,   -251,
+      1233,   4111,   -321,   -219,  -7961,    -11,    107,   -808,
+       450,    111,   4395,     89,    772,  -1878,  -1894,   1075,
+      -544,  -9467,   -459,    637,    842,   -956,   -738,   4452,
+       777,    -75,   -209,   -302,   -796,    785,  -7413,    321,
+       649,    -55,    114,     43,  -1026,   -223,   -611,    209,
+     -5543,   8206,    907,  -3358,   1452,   -543,  -3173,    525,
+       -95,     35,   -475,   -525,   -705,   -569,    350,    206,
+      -108,  -1523,   -680,   -283,  -2583,  -4992,    -59,   -968,
+     -1719,  -2750,   5884,    455,     29,    436,    784,   -101,
+      -216,    110,    612,   -511,    -12,     98,    -67,    177,
+     -1210,    222,   -345,    243, -12670,   -472,    282,  -2149,
+       687,  -2631,   4434,     77,   -521,   -404,   -934,    212,
+      -695,   -369,   1138,   1348,   -905,    501,    299, -10467,
+      1018,    818,   1941,     31,    257,   1219,    944,   -157,
+      1968,  -1649,   -126,   -440,   -599,     -1,   6190,   2574,
+      -332,    753,    195,   -131,   5972,   -297,    672,    -86,
+      -143,   -303,      5,   -121,   -154,   -613,   5541,  -1516,
+      -304,    962,     69,  -1857,   4142,   -134,    706,    896,
+     -1226,   -135,   -310,  -9261,   1135,  -3437,    620,    802,
+       -33,   -582,   1909,   1407,    242,   2599,  -1533,   -279,
+       836,   8070,  -1207,   5745,    200,    -77,    162,    781,
+      -466,  -1555,   3297,   -957,    225,   1290,      7,    677,
+        41,   -549,  -2778,   1400,    379,  -3367,    369,    615,
+     -6402,    527,     58,   5679,   -114,   -180,   2842,     88,
+     -2611,    -50,    371,    161,   -444,   2062,    -38,    272,
+     -8562,    769,     18,  -2593,   -226,   -503,   -959,  -1295,
+       189,   -371,   -675,  -1528,    -98,    514,  -1236,    116,
+       202,  13662,   1596,   -328,     61,   3567,   -486,  -3316,
+     -8473,   -317,   2868,   -419,    -17,    535,   -965,   -503,
+     -3848,   2222,    620,  -1740,      2,   6505,    473,   -297,
+       -70,   3043,    -51,  -1520,    993,   1046,   1965,   3240,
+      1971,    -60,   -650,    -53,   -248,  -4428,   -365,  -3723,
+      1122,  -1681,   1629,   1358,    -17,   1136,   -256,   2344,
+      -282,    156,    127,   -155,    318,  -1281,  -1066,     57,
+      -889,   -253,  -1396,   -579,   -920,  -1006,  -9202,   -703,
+       195,   5186,    241,   1742,    996,    118,   1431,   4415,
+     -2452,   6837,  -1272,   -569,   3485,    328,    441,    832,
+       553,     94,    648,     92,   -378,  11167,    775,    457,
+      1712,    -24,    941,   5433,  -1645,   2166,    249,    -55,
+     -1816,    383,    735,   -876,    443,   -568,    293,  -1266,
+      6963,   -178,   -174,  -1186,   1119,   -208,    821,   1499,
+     -1496,  -2171,   1434,    874,    133,  -7466,   -545,   2193,
+      -775,  -1405,  -1205,   -575,  -1996,   -645,   -552,   -263,
+      8861,   -517,     76,   -992,    278,   2417,  -1369,     35,
+     -1461,  -1399,    517,    185,  -2895,    347,  -3871,   3644,
+       284,   3284,    -12,   -169,  -1981,   1196,    -67,   2868,
+       910,    134,   -530,    150,  -1328,   1902,   -746,    351,
+      -222,    522,  -5702,    797,  -1900,    241,   2270,    764,
+      -335,   1348,   -349,    784,  -1586,   -537,    148,   3211,
+     -1692,     56,   1678,   -321,   -290,   7902,     69,     52,
+       310,    337,    250,    596,   9998,    336,   1037,    163,
+        64,   -441,   2894,  -1033,    730,   -718,  -1252,    459,
+      -131,   7840,   -922,   -555,   5671,    299,    689,   1115,
+      -646,   -505,   -263,    608,   -494,      0,    442,  -1802,
+      -598,   -701,  -4184,     70,  -1319,    -90,   9155,   -339,
+         0,    121,    462,    735,   -639,    481,    125,   6924,
+      3379,    683,   3053,  -1219,   -499,   1067,   -148,  -2705,
+       -11,    795,   1675,    898,    226,   1232,     49,   -572,
+     -9309,   2223,    949,    767,   -821,    -91,   1075,   -352,
+     -7829,    554,   -593,   1284,   -245,   1239,   1166,  -1157,
+     -5274,    808,    871,  -1446,   7575,   -397,   -755,    752,
+      4193,    179,   -205,    -37,   -750,  -2675,   -407,   -700,
+       220,    -77,   1604,     63,    461,  -9994,   -645,  -1629,
+       103,    576,    132,  10005,    -49,  -1005,     97,  -1608,
+       515,    -10,   -146,  -1878,    880,    429,  -1271,    996,
+      -365,     76,   -409,   2461,     29,   1159,    217,  -6240,
+      -200,   -746,    118,  -1884,    457,   -816,   -608,   3215,
+       244,    749,   2268,   -236,  -1276,   -278,   1392,  -1767,
+      1255,  -1474,  -8136,   1388,   -770,    225,   -443,     10,
+      -392,    659,  -1118,  -1651,   -514,   -935,   -111,   1112,
+       973,   -247,   -235, -13010,   -737,     40,   -141,   5167,
+      -910,    279,   -467,  -3762,    847,  -3935,   1018,   1922,
+       830,    190,    253,  -1130,   -415,    371,    718,   3833,
+      1036,  -5358,   -928,    866,   -514,   2724,   2354,    449,
+       210,   1462,    680,  -1880,    -62,  10988,    809,   -602,
+       145,   -536,    114,   -147,   -568,   3193,   -322,    892,
+      -637,  -1381,    -65,    761,   1615,   5025,   -327,   4941,
+      -631,  -5225,   1204,   3042,    998,  -1047,   -959,   -106,
+      1610,   -151,    120,  -1152,    191,     30,  11963,    101,
+        18,   -410,  -1288,    370,   -771,   1337,   -544,   -613,
+       289,   -117,   1625,  -4506,   2582,  -1690,   -105,  -5324,
+       -93,    285,  -1167,  -3564,   -729,  -4790,    595,    275,
+      -216,   -217,  -6000,    682,   -171,   -875,    224,   -164,
+      2919,    796,    -81,   1434,    186,   -375,  -4113,   -179,
+       277,   1363,   -453,   2505,    388,  -1840,   -165,  -4800,
+       -42,  -6632,     54,   -735,   -553,  -1679,    917,     -2,
+      -632,    417,   -478,   -494,   -265,     73,   -372,   -360,
+       179,   -448,    265,    299,   -152,   -211,  12730,    -77,
+      1954,   -534,    773,    524,    438,   1901,  -4413,   -358,
+      1552,   -248,  -1588,   -122,   -127,   5405,    226,   -849,
+     -7495,   -357,    -89,    185,    746,    851,    669,    305,
+      -247,   3457,   -193,   -161,    638,    600,    610,    855,
+     -1292,    398,   1528,   2250,   1651,  -8414,    763,   1529,
+      -346,   3769,   -111,  -6494,    347,   -742,   1941,   1967,
+       582,  -5499,   -765,   -818,   1850,  -1604,   -243,   -943,
+       -11,    884,  -2996,  -2375,   1010,   -374,   6605,   -287,
+     -5073,    211,   -758,    703,  -2607,    747,   -130,   -429,
+     -2481,   4894,   -457,   3225,    958,   8533,    542,   6177,
+     -1069,  -1210,   -963,  -5943,    -86,   1424,   -567,    827,
+      -510,  -6577,   -258,     -4,  -4430,    115,   5401,   1390,
+       354,   1755,   -998,    852,    993,   -481,    218,   -987,
+       779,   -417,    591,   6011,    528,    289,   -336,   -558,
+        60,   9124,   -174,    235,   -239,   -144,   -260,  -3472,
+       746,   4781,    652,  -4831,   -739,    -21,    864,  -2310,
+       652,   7147,    116,   -318,    -50,  -3485,   -325,   -345,
+     -5784,   1144,   2399,  -1443,    991,  -2318,   -785,   -281,
+      -207,  -1448,    309,   1001,    952,   1472,  -5901,   -780,
+     -2459,   1518,   9878,  -1229,    670,   -523,   1217,   -164,
+       -55,    -95,    243,   7909,     86,  -4380,   -859,   -599,
+      -183,  -2339,    774,  -1210,   -502,   -899,     53,   1039,
+        34,  -7753,   -296,  -1951,  -4559,   1182,   -150,   2878,
+     -4910,   2761,  -1481,   2048,   2600,   1808,  -2953,  -2257,
+        62,    162,   1115,    214,  -4510,    926,  -6669,   1443,
+      -124,    193,   -314,    302,    699,    -18,    745,    341,
+       895,   -615,   -295,   -181,    143,   -427,   6528,   1074,
+     -1126,    374,   -298,  -1274,     22,    887,   -511,  -1057,
+      3228,    722,    607,    624,    -95,  11085,   1006,   -788,
+      -285,    -92,   1342,   -325,   -828,     42,  -3588,   -631,
+      -576,   4559,   -668,  -1294,   1739,   1697,   -647,   2336,
+       376,   -120,   1350,    646,   -325,     95,   5974,    775,
+       199,  -8557,    931,   -336,   -651,   -561,   -433,  -2266,
+      -129,   -657,  -1184,     67,    577,    617,   1880,    552,
+        90,   -617,   -273,  -1571,  -7481,    261,    -26,    -20,
+      -459,  -1028,     57,  -8516,    -43,   2774,      1,  -4238,
+       680,  -3310,    -56,   -152,    548,  -1983,    920,    899,
+      2180,   -307,  -2230,  -1685,   -998,   2091,   -112,     21,
+     -1551,   1182,   6649,   -326,    792,   1818,  -7596,    563,
+      1076,   7422,   -908,   1524,   -223,   5798,   1318,  -3376,
+       517,   4162,    756,  -4142,   1776,    390,    334,    -44,
+       218,   5290,    792,     39,   1692,    542,    -62,   -595,
+       590,     27,   8922,    989,    182,    725,    112,    458,
+     -9170,  -1000,   1176,  -1290,  -1403,   -726,   5990,   -297,
+      1234,  -1724,   -601,    528,   1072,    184,   -146,     61,
+       685,   1208,    -88,   -211,    356,   9569,   -363,   -135,
+      -159,  -1061,   -105,   -410,    -58,    335,  -9986,   -300,
+      -211,    607,    443,   -410,  -1730,   -328,    275,    579,
+       805,    899,   -464,    -18,    296,   -446,   2396,    -13,
+       414,  -9662,   -385,   -808,  -1867,    154,   -572,   3351,
+     -1839,    -80,   1157,   -326,    481,   8815,  -1039,   1065,
+      2110,   1223,   -960,    -33,   -464,  -5660,    490,   -314,
+       346,    730,   -387,  -1102,   6656,   -719,  -1173,    -57,
+     -1186,   2394,  -1300,   -665,   -586,    -39,    -71,    155,
+      1184,      4,  -3269,   -333,   -747,    580,    279,   -583,
+      7164,   -185,    110,   2465,    428,    507,   4462,  -4461,
+       199,    337,  -3597,   -249,    -70,   -680,  -5549,   1533,
+       917,   -303,  -9230,   -431,   -124,  -1019,    369,    139,
+      1367,    151,  -1047,   6820,   -151,    222,  -2934,   -817,
+       971,  -7325,    556,   1035,  -1240,   3115,  -1326,   4012,
+      2812,   1057,   2580,   -261,   3989,   1999,   1624,   2402,
+      -310,    779,   -354,   -377,   -149,   1035,  -2363,    358,
+      3666,   -246,  -1896,    375,   3919,  -1392,    683,    624,
+     -5872,    644,    391,    288,   -198,   -237,     68,   -284,
+        88,  -1016,    250,     32,   1188,   -243,   -608,   -320,
+      -219, -11087,    543,    156,   1034,   -169,   -183,   -549,
+       -66,    716,    996,   -928,   -309,   5577,    229,    125,
+     -1328,   9027,   -698,   -485,  -1694,    839,    343,    449,
+      1655,   1005,   1053,   -408,   9106,    186,    670,    774,
+       314,    573,   3888,   -882,     26,   2518,   -533,   -195,
+       555,    337,   -246, -10779,   -231,     31,   -314,   -941,
+      1129,    333,  -7503,    168,   -551,    237,   -159,   4399,
+       421,    693,    198,   -196,   -561,   1035,   -548,   1058,
+       527,   3617,   -361,   1317,  -1975,  -2638,  -1966,   -120,
+      -324,   5678,  -2252,   -663,    181,   -273,  -3073,   -282,
+      -622,    363,     71,    184,   -776,    284,  -1516,   -430,
+         3,    937,   8587,    258,  -1060,  -1555,   -830,   -338,
+       318,  -9130,   -110,    459,   -572,     70,     93,    120,
+      -534,   1296,   -168,     29,   -914,   -332,   -997,   -818,
+       270,   -243,    523,     56, -11847,   -448,     11,   -154,
+       164,   2115,    -13,   -635,    708,   -663,     43,   -248,
+     -3244,    254,     19,  -1125,    508,    154,   8697,    191,
+       595,   4393,  -2806,   -168,  -1916,    393,   3976,    897,
+     -1716,    -35,   -180,    605,  -1057,  -1194,    100,   -384,
+       -37,   -107,   2739,   -207,   6899,    176,     81,   -901,
+      1280,  -1670,   -101,    281,   1147,     48,     21,   -151,
+     -1236,    210,     98,   -114,   -573,   7940,   -153,   -302,
+     -1331,    337,   -322,   6598,    477,    147,   -999,  -3166,
+      -232,  -5104,   -799,  -1866,    -58,  -4213,   1376,    181,
+       675,    562,    126,    235,   2260,  -5152,   -243,   -699,
+     -1476,   4135,    569,    567,    737,  -4163,    613,  -1057,
+      1778,    546,   -450,    -24,    325,    366,   2406,  -1319,
+        60,  -5126,     49,    657,  -5937,   -194,    882,   3267,
+       178,   -298,   1873,  12422,    459,    272,    195,  -1827,
+       212,   -802,    730,    471,   1556,    422,    640,    236,
+        71,    597,   5783,   5378,   -649,   1524,    829,    437,
+      -351,   -122,  -1400,   2119,   -128,     75,  -1677,   -633,
+      -322,  -6382,   -573,   -974,   1672,   -378,   -242,   3708,
+        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,
+      -521,    537,   -924,   -156,   -261,    195,   1049,    -39,
+       236,   -137,      0,   3199,    225,     46,     86,   -215,
+       557,  -5394,     17,    911,  -1690,    -48,    -48,   -175,
+       -11,   -631,   -153,   4474,   -347,    -39,   1759,    154,
+       170,   -180,   -273,    603,   -590,  -5195,    -74,   1789,
+       240,   -212,    431,   2447,    368,    -76,   -313,     11,
+     -2926,     19,    -71,    208,    -51,   -728,  -6412,    -61,
+       141,   -112,   5280,    -76,   4435,   -402,    -25,     46,
+       210,   -104,    172,  -3830,   -366,    -23,    239,   -112,
+       137,   6692,  -6288,   -720,   -132,   -136,    552,  -1688,
+      -345,   -289,   -485,    149,    174,    180,    361,   -236,
+        92,    407,      6,   2373,    380,   -167,    845,    444,
+      -834,  -9358,    413,  -1302,    460,     77,     34,     56,
+     -1516,   -143,    207,    -43,    -31,   -106,    -52,    403,
+      -309,    298,    -88,   1552,   -240,   -776,    624,  -4181,
+      -342,  -4804,     57,    -23,    160,    -44,    469,    -17,
+     -3997,  -5079,   -263,     72,    181,   1085,    538,   -611,
+      -368,     59,   -204,   -195,    -40,   -201,   -803,  -5093,
+     -3216,    480,     46,   -729,    244,   3320,    185,    503,
+      2979,   -416,    110,     25,    140,   -502,   2236,  -4420,
+       -36,   -238,   -278,     60,    -82,   -597,    218,     69,
+       -95,  -2102,  -2138,  -2308,  -3796,     20,   -211,   -229,
+       297,   3665,     81,    148,   1315,  -4537,    -38,    186,
+     -3106,   -526,     90,    -35,   -193,   -302,  -5860,    276,
+      -308,    206,    645,      1,   -242,    580,   3025,  -2583,
+       -90,    511,   -315,   -137,  -2033,  -4313,    693,    485,
+      -211,   1486,   1180,    181,   -136,    204,     23,    383,
+      1479,   -213,     42,     32,    -64,   -136,    -91,   -146,
+       434,    231,     36,    -58,  -3254,  -2647,    -18,    345,
+       171,    -60,     84,    209,    246,   -587,   9447,    -67,
+      -187,   -108,   -226,   -458,   -519, -11089,   -422,   -502,
+       132,     79,    298,   -475,   -412,    196,   -164,  -7347,
+       185,   -131,    369,     18,   -500,    644,   -334,     93,
+       -77,     71,    341,   3566,   -281,  -4191,   -145,     87,
+        37,    306,  -3482,  -5739,    161,   -245,    293,    208,
+       380,   2888,     31,    -23,  -2061,   -597,    -56,    350,
+      -105,   1167,     64,    342,   3638,    -79,   -106,    148,
+      5422,   -719,   -232,      8,   -395,   3249,  -5093,   -222,
+      -707,    241,    318,    735,    376,     78,   -166,  -1614,
+        -9,  -3373,    330,  -1540,   2028,   3400,     -9,    317,
+         9,   4903,    262,     62,    222,    -95,   -208, -13376,
+      -101,    121,    298,      5,    172,    406,   -164,     79,
+       172,   1993,    235,    229,   1193,   -274,   5944,   -918,
+       -15,   1304,    307,   1150,   -385,   -794,  -3467,    660,
+      2143,    147,   -279,   -751,   -305,   1052,    205,   -108,
+       572,   -212,     29,    -50,      6,   3749,    238,  -2016,
+     -1118,  -1329,   -971,   2633,    519,    194,   3545,    -11,
+        77,    -92,   1215,   -439,    152,   -863,   1604,    180,
+      -514,    252,    308,   -131,   -938,    133,    378,     11,
+     12153,     51,    486,     71,   -476,   -599,     57,   -127,
+      2685,   -173,   -182,    468,  -3469,   -594,   -380,    265,
+      -879,   -352,   -278,   -309,    575,    124,  10814,   -765,
+       -64,    710,   -105,    296,   2562,     98,   -358,    556,
+      2921,   -133,     -5,   -406,     42,    496,  -1053,  -1957,
+       701,    266,    260,   -441,     43,   -192,     -1,  -2174,
+      9894,    -90,   -181,     29,     50,   -858,     59,   -190,
+        49,   -282,   1632,   1525,    100,  -3659,     13,    173,
+      -240,   5304,   -383,    263,   -311,   1747,    169,  -2203,
+       -29,   -106,    342,   -301,     66,     49,     23,    857,
+      -607,    698,  -1198,   -191,   -450,  -1875,   -329,  -2156,
+       156,     95,    145,    129,   -321,     88,   1049,   3980,
+       -14,    321,  -1484,    895,    -30,  -2174,    289,    933,
+      -933,     15,   2631,     68,   3054,    221,    -87,    175,
+       200,    937,    -87,  -2032,    348,    146,   -372,     60,
+     -2566,   3497,    -98,    313,    536,   -299,    -58,  -8949,
+       323,   -524,   -331,    713,    -47,    360,    155,    168,
+       687,  -1391,   1973,    670,    788,   -202,   -129,  -5113,
+        54,   1178,   1218,    172,    630,   -154,  -1047,    840,
+        71,   -337,     91,    214,   -474,    624,   -773,     16,
+      -126,    340,   -631,   -482,   -155,    419,     50, -10976,
+      -742,   -781,    169,    149,     33,   -169,     44,    354,
+        26,    129,   -179,   1401,    776,   -155,  -3996,   -813,
+       594,    238,    -61,    168,   -383,  -9261,    294,    470,
+      -322,   -190,   -956,   -290,     27,   -438,   -254,  12571,
+       344,   -393,   -568,     56,     81,    171,   -115,  -4370,
+        49,   -322,   -237,   -692,    -55,    -49,   4317,     -6,
+     -4837,   -156,    179,    247,   -338,    -48,    952,  -1061,
+       -33,   -934,    250,   -256,  -1622,   1039,   -738,   2719,
+       -20,   -190,    249,   -119,   -235,   6080,    123,   -502,
+     -1443,     86,  -1684,   -177,   -128,    -58,   -237,   -641,
+      -177,     64,  -2416,     15,   -116,  -6465,   -412,    161,
+       419,    768,     36,    113,   -944,   -241,  -1424,    -95,
+       635,   1798,  -2257,    -18,   3046,    173,    -33,   -207,
+       -52,   -831,  -5730,    -54,   -199,    194,   -255,    467,
+      -211,   -853,   -512,  11619,    148,   3681,  -4603,   -282,
+       129,   -205,   -606,    167,    306,    464,    485,   -959,
+      -203,    254,    151,  -6880,   -262,   5180,    658,  -1378,
+      1174,    -53,    -59,    -33,  -3077,   -127,   -223,    -17,
+       -31,  -2190,     23,    317,   -169,    203,   -223,   -222,
+     -5295,    116,     80,  -2757,   -666,   3377,   -476,     85,
+      -630,   -147,   1740,   -175,   -115,    207,    240,   -248,
+       -95,  -1016,   3966,   3998,   -343,  -4751,    187,   -113,
+      -250,    111,   -510,   -203,    130,     89,    311,    608,
+      -221,   -381,   -253,   -359,  -2254,     45,    224,   -141,
+        45,    -19,    480,  -5074,    797,  -4580,   -163,    110,
+      -234,    337,      6,    707,    492,  -5493,  -2750,    -94,
+      -363,    113,   2345,    344,    379,    464,  -3222,    -56,
+      -269,   -262,    -10,   -609,    324,   3043,    209,   3092,
+      -600,     42,   -615,    -17,    -53,     30,   1123,    224,
+       593,    632,    -90,    428,   1117,  -1429,  -6741,    -95,
+      -293,   -103,  -2784,    251,   1688,    621,   -349,   1059,
+     -1093,   -148,    447,    149,     88,     92,    687,   1249,
+        80,    289,  -1841,    221,    -10,    -92,  -1736,    118,
+       136,    138,   -162,  -4162,   -111,     62,     95,    166,
+      -172,   -695,  -3685,   5694,   -527,   2032,   -549,     43,
+      -101,    221,    181,   -479,   7697,   2007,   -127,    805,
+       -83,   -535,   1354,   -383,    253,   -622,   2910,   1249,
+       782,     13,     42,    994,   -545,     75,   -485,    330,
+       -16,    343,    272,   -781,    360,    -97,    -25,   -875,
+    -12689,   -623,   -307,    195,   -256, -11644,    229,    180,
+       -42,   -361,   -124,    -81,    -23,   -460,  -1993,    212,
+      -634,   -847,   1616,   -546,   -583,     99,   3800,     10,
+       177,    366,   6106,   -173,    265,   -213,     10,   1108,
+      -288,  -1690,   -237,   -312,     38,  -2272,    431,    -26,
+      -178,   -764,    507,    355,    677,   -214,   -816, -12411,
+        47,     12,    294,   -295,  -3916,   -677,  -4885,   -250,
+      -453,  -7716,    478,    231,     17,   -248,    147,   1064,
+       637,    -80,    -41,    265,   -383,    142,    116,   2991,
+     -3060,    809,   2056,   -119,   -866,    -22,   -660,    233,
+       306,  -1873,  -1141,   6995,    186,  -8678,   -109,    -39,
+      -105,    730,     18,   -846,    273,  -2922,    210,     26,
+      -174,   -142,    990,    131,   -436,   1422,   -217,  -3152,
+      3224,     35,    315,    -47,     48,   -221,    568,     44,
+       182,   1696,  -1755,   -193,    527,    158,   -555,  -3485,
+       171,  -4552,    -47,  -4680,     95,   -112,    184,     80,
+       -36,   -915,     87,     24,   -259,  -1743,     68,   -117,
+       405,     11,     40,   -320,    -17,   -158,   -134,   -186,
+     -1206,   -466,   1262,    133,   -254,   -100,    210,  -1735,
+      -636,    319,   -978,     69,    197,   -521,  -5503,    -78,
+      -544,  -1011,    101,   -489,   -371,    -79,   -196,    -18,
+      -839,   1091,    682,  -1441,  -2375,  -1127,     54,    829,
+      -306,   -255,    641,  -3665,    473,   3504,  -1035,   -160,
+      -467,   -275,   -437,     79, -13513,    326,    132,     82,
+       188,    362,    -74,   1406,    -46,   2864,    351,   -558,
+     -1277,    108,    -92,    -53,     72,    -41,    -31,    -97,
+       353,     73,   1864,   -207,    106,    -81,  -3930,    173,
+        41,   -539,   -497,    135,   -526,   -823,     69,    -10,
+       176,    648,  -1710,    564,     80,    237,  -1956,    234,
+        11,    142,   -849,   4116,   -473,    110,    129,   2137,
+      -170,   3193,     10,    245,   -953,   -827,    -30,   1235,
+       366,    -67,     54,   -567,  -7377,   2461,    582,     74,
+     -1988,    -33,   -296,   3090,    -54,    145,    564,   -295,
+};
+
+static const uint16_t bark_tab_l8_512[] = {
+    4,  5,  4,  5,  4,  5,  5,  5,  5,  6,  6,  6,  6,  8,  7,  9,
+    9, 11, 11, 14, 15, 17, 20, 24, 28, 34, 41, 51, 64, 83,
+};
+
+static const uint16_t bark_tab_m8_256[] = {
+    3, 4, 3, 4, 3, 4, 4, 5, 5, 6, 6, 8, 9, 11, 13, 17, 23, 29, 41, 58
+};
+
+static const uint16_t bark_tab_s8_64[] = {
+    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
+};
+
+static const uint16_t bark_tab_m16_512[] = {
+     3,  3,  3,  3,  4,  3,  4,   4,  4,  5,  5,  6,  7,  8, 10, 12,
+    14, 18, 24, 30, 42, 59, 89, 152
+};
+
+static const uint16_t bark_tab_s16_128[] = {
+    2, 2, 2, 3, 3, 5, 7, 12, 25, 67
+};
+
+static const uint16_t bark_tab_s16_64[] = {
+    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,
+    64, 79, 98, 123, 161, 220, 320, 512,
+};
+
+static const uint16_t bark_tab_m44_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_s44_128[] = {
+    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 },
+        { 2, bark_tab_m8_256, 20, fcb8m, 2, 5, cb0808m0, cb0808m1, 16 },
+        { 1, bark_tab_l8_512, 30, fcb8l, 3, 6, cb0808l0, cb0808l1, 17 }
+    },
+    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 },
+        { 2, bark_tab_m16_512,  24, fcb16m, 2, 5, cb1616m0, cb1616m1, 15 },
+        { 1, bark_tab_l16_1024, 30, fcb16l, 3, 6, cb1616l0, cb1616l1, 16 }
+    },
+    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 },
+        {  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_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 },
+        {  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
+};

libav-v10.1.tar.bz2/libavcodec/metasound_data.h Added

@@ -0,0 +1,49 @@
+/*
+ * MetaSound decoder
+ * Copyright (c) 2013 Konstantin Shishkov
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_METASOUND_DATA_H
+#define AVCODEC_METASOUND_DATA_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "twinvq.h"
+
+extern const TwinVQModeTab ff_metasound_mode0806;
+extern const TwinVQModeTab ff_metasound_mode0806s;
+extern const TwinVQModeTab ff_metasound_mode0808;
+extern const TwinVQModeTab ff_metasound_mode0808s;
+extern const TwinVQModeTab ff_metasound_mode1110;
+extern const TwinVQModeTab ff_metasound_mode1110s;
+extern const TwinVQModeTab ff_metasound_mode1616;
+extern const TwinVQModeTab ff_metasound_mode1616s;
+extern const TwinVQModeTab ff_metasound_mode2224;
+extern const TwinVQModeTab ff_metasound_mode2224s;
+extern const TwinVQModeTab ff_metasound_mode2232;
+extern const TwinVQModeTab ff_metasound_mode2232s;
+extern const TwinVQModeTab ff_metasound_mode4432;
+extern const TwinVQModeTab ff_metasound_mode4432s;
+extern const TwinVQModeTab ff_metasound_mode4440;
+extern const TwinVQModeTab ff_metasound_mode4440s;
+extern const TwinVQModeTab ff_metasound_mode4448;
+extern const TwinVQModeTab ff_metasound_mode4448s;
+
+#endif /* AVCODEC_METASOUND_DATA_H */

libav-v9.6.tar.bz2/libavcodec/mimic.c -> libav-v10.1.tar.bz2/libavcodec/mimic.c Changed

@@ -28,6 +28,7 @@
 #include "get_bits.h"
 #include "bytestream.h"
 #include "dsputil.h"
+#include "hpeldsp.h"
 #include "thread.h"
 
 #define MIMIC_HEADER_SIZE 20
@@ -44,14 +45,15 @@
 int cur_index;
 int prev_index;
 
- AVFrame buf_ptrs [16];
+ ThreadFrame frames [16];
 AVPicture flipped_ptrs[16];
 
- DECLARE_ALIGNED(16, DCTELEM, dct_block)[64];
+ DECLARE_ALIGNED(16, int16_t, dct_block)[64];
 
 GetBitContext gb;
 ScanTable scantable;
 DSPContext dsp;
+ HpelDSPContext hdsp;
 VLC vlc;
 
 /* Kept in the context so multithreading can have a constant to read from */
@@ -109,37 +111,76 @@
 53, 60, 61, 54, 47, 55, 62, 63,
 };
 
+static av_cold int mimic_decode_end(AVCodecContext *avctx)
+{
+ MimicContext *ctx = avctx->priv_data;
+ int i;
+
+ av_free(ctx->swap_buf);
+
+ for (i = 0; i < FF_ARRAY_ELEMS(ctx->frames); i++) {
+ if (ctx->frames[i].f)
+ ff_thread_release_buffer(avctx, &ctx->frames[i]);
+ av_frame_free(&ctx->frames[i].f);
+ }
+
+ if (!avctx->internal->is_copy)
+ ff_free_vlc(&ctx->vlc);
+
+ return 0;
+}
+
 static av_cold int mimic_decode_init(AVCodecContext *avctx)
 {
 MimicContext *ctx = avctx->priv_data;
+ int ret, i;
+
+ avctx->internal->allocate_progress = 1;
 
 ctx->prev_index = 0;
- ctx->cur_index = 15;
+ ctx->cur_index = 15;
 
- if(init_vlc(&ctx->vlc, 11, FF_ARRAY_ELEMS(huffbits),
- huffbits, 1, 1, huffcodes, 4, 4, 0)) {
+ if ((ret = init_vlc(&ctx->vlc, 11, FF_ARRAY_ELEMS(huffbits),
+ huffbits, 1, 1, huffcodes, 4, 4, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "error initializing vlc table\n");
- return -1;
+ return ret;
 }
 ff_dsputil_init(&ctx->dsp, avctx);
+ ff_hpeldsp_init(&ctx->hdsp, avctx->flags);
 ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable, col_zag);
 
+ for (i = 0; i < FF_ARRAY_ELEMS(ctx->frames); i++) {
+ ctx->frames[i].f = av_frame_alloc();
+ if (!ctx->frames[i].f) {
+ mimic_decode_end(avctx);
+ return AVERROR(ENOMEM);
+ }
+ }
+
 return 0;
 }
 
 static int mimic_decode_update_thread_context(AVCodecContext *avctx, const AVCodecContext *avctx_from)
 {
 MimicContext *dst = avctx->priv_data, *src = avctx_from->priv_data;
+ int i, ret;
 
- if (avctx == avctx_from) return 0;
+ if (avctx == avctx_from)
+ return 0;
 
 dst->cur_index = src->next_cur_index;
 dst->prev_index = src->next_prev_index;
 
- memcpy(dst->buf_ptrs, src->buf_ptrs, sizeof(src->buf_ptrs));
 memcpy(dst->flipped_ptrs, src->flipped_ptrs, sizeof(src->flipped_ptrs));
 
- memset(&dst->buf_ptrs[dst->cur_index], 0, sizeof(AVFrame));
+ for (i = 0; i < FF_ARRAY_ELEMS(dst->frames); i++) {
+ ff_thread_release_buffer(avctx, &dst->frames[i]);
+ if (src->frames[i].f->data[0]) {
+ ret = ff_thread_ref_frame(&dst->frames[i], &src->frames[i]);
+ if (ret < 0)
+ return ret;
+ }
+ }
 
 return 0;
 }
@@ -183,30 +224,30 @@
 
 static int vlc_decode_block(MimicContext *ctx, int num_coeffs, int qscale)
 {
- DCTELEM *block = ctx->dct_block;
+ int16_t *block = ctx->dct_block;
 unsigned int pos;
 
 ctx->dsp.clear_block(block);
 
 block[0] = get_bits(&ctx->gb, 8) << 3;
 
- for(pos = 1; pos < num_coeffs; pos++) {
+ for (pos = 1; pos < num_coeffs; pos++) {
 uint32_t vlc, num_bits;
 int value;
 int coeff;
 
 vlc = get_vlc2(&ctx->gb, ctx->vlc.table, ctx->vlc.bits, 3);
- if(!vlc) /* end-of-block code */
- return 1;
- if(vlc == -1)
+ if (!vlc) /* end-of-block code */
 return 0;
+ if (vlc == -1)
+ return AVERROR_INVALIDDATA;
 
 /* pos_add and num_bits are coded in the vlc code */
- pos += vlc&15; // pos_add
- num_bits = vlc>>4; // num_bits
+ pos += vlc & 15; // pos_add
+ num_bits = vlc >> 4; // num_bits
 
- if(pos >= 64)
- return 0;
+ if (pos >= 64)
+ return AVERROR_INVALIDDATA;
 
 value = get_bits(&ctx->gb, num_bits);
 
@@ -214,7 +255,7 @@
 * a factor of 4 was added to the input */
 
 coeff = vlcdec_lookup[num_bits][value];
- if(pos<3)
+ if (pos < 3)
 coeff <<= 4;
 else /* TODO Use >> 10 instead of / 1001 */
 coeff = (coeff * qscale) / 1001;
@@ -222,81 +263,86 @@
 block[ctx->scantable.permutated[pos]] = coeff;
 }
 
- return 1;
+ return 0;
 }
 
 static int decode(MimicContext *ctx, int quality, int num_coeffs,
 int is_iframe)
 {
- int y, x, plane, cur_row = 0;
+ int ret, y, x, plane, cur_row = 0;
 
- for(plane = 0; plane < 3; plane++) {
+ for (plane = 0; plane < 3; plane++) {
 const int is_chroma = !!plane;
- const int qscale = av_clip(10000-quality,is_chroma?1000:2000,10000)<<2;
- const int stride = ctx->flipped_ptrs[ctx->cur_index].linesize[plane];
- const uint8_t *src = ctx->flipped_ptrs[ctx->prev_index].data[plane];
- uint8_t *dst = ctx->flipped_ptrs[ctx->cur_index ].data[plane];
-
- for(y = 0; y < ctx->num_vblocks[plane]; y++) {
- for(x = 0; x < ctx->num_hblocks[plane]; x++) {
-
+ const int qscale = av_clip(10000 - quality, is_chroma ? 1000 : 2000,
+ 10000) << 2;
+ const int stride = ctx->flipped_ptrs[ctx->cur_index ].linesize[plane];
+ const uint8_t *src = ctx->flipped_ptrs[ctx->prev_index].data[plane];
+ uint8_t *dst = ctx->flipped_ptrs[ctx->cur_index ].data[plane];
+
+ for (y = 0; y < ctx->num_vblocks[plane]; y++) {
+ for (x = 0; x < ctx->num_hblocks[plane]; x++) {
 /* Check for a change condition in the current block.
 * - iframes always change.
 * - Luma plane changes on get_bits1 == 0
 * - Chroma planes change on get_bits1 == 1 */
- if(is_iframe || get_bits1(&ctx->gb) == is_chroma) {
-
+ if (is_iframe || get_bits1(&ctx->gb) == is_chroma) {
 /* Luma planes may use a backreference from the 15 last
 * frames preceding the previous. (get_bits1 == 1)
 * Chroma planes don't use backreferences. */
- if(is_chroma || is_iframe || !get_bits1(&ctx->gb)) {
-
- if(!vlc_decode_block(ctx, num_coeffs, qscale))
- return 0;
+ if (is_chroma || is_iframe || !get_bits1(&ctx->gb)) {
+ if ((ret = vlc_decode_block(ctx, num_coeffs,
+ qscale)) < 0) {
+ av_log(ctx->avctx, AV_LOG_ERROR, "Error decoding "
+ "block.\n");
+ return ret;
+ }
 ctx->dsp.idct_put(dst, stride, ctx->dct_block);
 } else {
 unsigned int backref = get_bits(&ctx->gb, 4);
- int index = (ctx->cur_index+backref)&15;
- uint8_t *p = ctx->flipped_ptrs[index].data[0];
+ int index = (ctx->cur_index + backref) & 15;
+ uint8_t *p = ctx->flipped_ptrs[index].data[0];
 
 if (index != ctx->cur_index && p) {
- ff_thread_await_progress(&ctx->buf_ptrs[index], cur_row, 0);
+ ff_thread_await_progress(&ctx->frames[index],
+ cur_row, 0);
 p += src -
- ctx->flipped_ptrs[ctx->prev_index].data[plane];
- ctx->dsp.put_pixels_tab[1][0](dst, p, stride, 8);
+ ctx->flipped_ptrs[ctx->prev_index].data[plane];
+ ctx->hdsp.put_pixels_tab[1][0](dst, p, stride, 8);
 } else {
 av_log(ctx->avctx, AV_LOG_ERROR,
 "No such backreference! Buggy sample.\n");
 }
 }
 } else {
- ff_thread_await_progress(&ctx->buf_ptrs[ctx->prev_index], cur_row, 0);
- ctx->dsp.put_pixels_tab[1][0](dst, src, stride, 8);
+ ff_thread_await_progress(&ctx->frames[ctx->prev_index],
+ cur_row, 0);
+ ctx->hdsp.put_pixels_tab[1][0](dst, src, stride, 8);
 }
 src += 8;
 dst += 8;
 }
- src += (stride - ctx->num_hblocks[plane])<<3;
- dst += (stride - ctx->num_hblocks[plane])<<3;
+ src += (stride - ctx->num_hblocks[plane]) << 3;
+ dst += (stride - ctx->num_hblocks[plane]) << 3;
 
- ff_thread_report_progress(&ctx->buf_ptrs[ctx->cur_index], cur_row++, 0);
+ ff_thread_report_progress(&ctx->frames[ctx->cur_index],
+ cur_row++, 0);
 }
 }
 
- return 1;
+ return 0;
 }
 
 /**
 * Flip the buffer upside-down and put it in the YVU order to match the
 * way Mimic encodes frames.
 */
-static void prepare_avpic(MimicContext *ctx, AVPicture *dst, AVPicture *src)
+static void prepare_avpic(MimicContext *ctx, AVPicture *dst, AVFrame *src)
 {
 int i;
- dst->data[0] = src->data[0]+( ctx->avctx->height -1)*src->linesize[0];
- dst->data[1] = src->data[2]+((ctx->avctx->height>>1)-1)*src->linesize[2];
- dst->data[2] = src->data[1]+((ctx->avctx->height>>1)-1)*src->linesize[1];
- for(i = 0; i < 3; i++)
+ dst->data[0] = src->data[0] + ( ctx->avctx->height - 1) * src->linesize[0];
+ dst->data[1] = src->data[2] + ((ctx->avctx->height >> 1) - 1) * src->linesize[2];
+ dst->data[2] = src->data[1] + ((ctx->avctx->height >> 1) - 1) * src->linesize[1];
+ for (i = 0; i < 3; i++)
 dst->linesize[i] = -src->linesize[i];
 }
 
@@ -304,18 +350,18 @@
 int *got_frame, AVPacket *avpkt)
 {
 const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- MimicContext *ctx = avctx->priv_data;
+ int buf_size = avpkt->size;
+ int swap_buf_size = buf_size - MIMIC_HEADER_SIZE;
+ MimicContext *ctx = avctx->priv_data;
 GetByteContext gb;
 int is_pframe;
 int width, height;
 int quality, num_coeffs;
- int swap_buf_size = buf_size - MIMIC_HEADER_SIZE;
 int res;
 
 if (buf_size <= MIMIC_HEADER_SIZE) {
 av_log(avctx, AV_LOG_ERROR, "insufficient data\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 bytestream2_init(&gb, buf, MIMIC_HEADER_SIZE);
@@ -328,99 +374,100 @@
 num_coeffs = bytestream2_get_byteu(&gb);
 bytestream2_skip(&gb, 3); /* some constant */
 
- if(!ctx->avctx) {
+ if (!ctx->avctx) {
 int i;
 
- if(!(width == 160 && height == 120) &&
- !(width == 320 && height == 240)) {
+ if (!(width == 160 && height == 120) &&
+ !(width == 320 && height == 240)) {
 av_log(avctx, AV_LOG_ERROR, "invalid width/height!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 ctx->avctx = avctx;
 avctx->width = width;
 avctx->height = height;
 avctx->pix_fmt = AV_PIX_FMT_YUV420P;
- for(i = 0; i < 3; i++) {
+ for (i = 0; i < 3; i++) {
 ctx->num_vblocks[i] = -((-height) >> (3 + !!i));
- ctx->num_hblocks[i] = width >> (3 + !!i) ;
+ ctx->num_hblocks[i] = width >> (3 + !!i);
 }
- } else if(width != ctx->avctx->width || height != ctx->avctx->height) {
- av_log(avctx, AV_LOG_ERROR, "resolution changing is not supported\n");
- return -1;
+ } else if (width != ctx->avctx->width || height != ctx->avctx->height) {
+ avpriv_request_sample(avctx, "Resolution changing");
+ return AVERROR_PATCHWELCOME;
 }
 
- if(is_pframe && !ctx->buf_ptrs[ctx->prev_index].data[0]) {
+ if (is_pframe && !ctx->frames[ctx->prev_index].f->data[0]) {
 av_log(avctx, AV_LOG_ERROR, "decoding must start with keyframe\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- ctx->buf_ptrs[ctx->cur_index].reference = 1;
- ctx->buf_ptrs[ctx->cur_index].pict_type = is_pframe ? AV_PICTURE_TYPE_P:AV_PICTURE_TYPE_I;
- if(ff_thread_get_buffer(avctx, &ctx->buf_ptrs[ctx->cur_index])) {
+ ff_thread_release_buffer(avctx, &ctx->frames[ctx->cur_index]);
+ ctx->frames[ctx->cur_index].f->pict_type = is_pframe ? AV_PICTURE_TYPE_P :
+ AV_PICTURE_TYPE_I;
+ if ((res = ff_thread_get_buffer(avctx, &ctx->frames[ctx->cur_index],
+ AV_GET_BUFFER_FLAG_REF)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return res;
 }
 
 ctx->next_prev_index = ctx->cur_index;
 ctx->next_cur_index = (ctx->cur_index - 1) & 15;
 
 prepare_avpic(ctx, &ctx->flipped_ptrs[ctx->cur_index],
- (AVPicture*) &ctx->buf_ptrs[ctx->cur_index]);
+ ctx->frames[ctx->cur_index].f);
 
 ff_thread_finish_setup(avctx);
 
 av_fast_padded_malloc(&ctx->swap_buf, &ctx->swap_buf_size, swap_buf_size);
- if(!ctx->swap_buf)
+ if (!ctx->swap_buf)
 return AVERROR(ENOMEM);
 
 ctx->dsp.bswap_buf(ctx->swap_buf,
- (const uint32_t*) (buf + MIMIC_HEADER_SIZE),
- swap_buf_size>>2);
+ (const uint32_t*) (buf + MIMIC_HEADER_SIZE),
+ swap_buf_size >> 2);
 init_get_bits(&ctx->gb, ctx->swap_buf, swap_buf_size << 3);
 
 res = decode(ctx, quality, num_coeffs, !is_pframe);
- ff_thread_report_progress(&ctx->buf_ptrs[ctx->cur_index], INT_MAX, 0);
- if (!res) {
+ ff_thread_report_progress(&ctx->frames[ctx->cur_index], INT_MAX, 0);
+ if (res < 0) {
 if (!(avctx->active_thread_type & FF_THREAD_FRAME)) {
- ff_thread_release_buffer(avctx, &ctx->buf_ptrs[ctx->cur_index]);
- return -1;
+ ff_thread_release_buffer(avctx, &ctx->frames[ctx->cur_index]);
+ return res;
 }
 }
 
- *(AVFrame*)data = ctx->buf_ptrs[ctx->cur_index];
+ if ((res = av_frame_ref(data, ctx->frames[ctx->cur_index].f)) < 0)
+ return res;
 *got_frame = 1;
 
 ctx->prev_index = ctx->next_prev_index;
 ctx->cur_index = ctx->next_cur_index;
 
 /* Only release frames that aren't used for backreferences anymore */
- if(ctx->buf_ptrs[ctx->cur_index].data[0])
- ff_thread_release_buffer(avctx, &ctx->buf_ptrs[ctx->cur_index]);
+ ff_thread_release_buffer(avctx, &ctx->frames[ctx->cur_index]);
 
 return buf_size;
 }
 
-static av_cold int mimic_decode_end(AVCodecContext *avctx)
+static av_cold int mimic_init_thread_copy(AVCodecContext *avctx)
 {
 MimicContext *ctx = avctx->priv_data;
 int i;
 
- av_free(ctx->swap_buf);
-
- if (avctx->internal->is_copy)
- return 0;
-
- for(i = 0; i < 16; i++)
- if(ctx->buf_ptrs[i].data[0])
- ff_thread_release_buffer(avctx, &ctx->buf_ptrs[i]);
- ff_free_vlc(&ctx->vlc);
+ for (i = 0; i < FF_ARRAY_ELEMS(ctx->frames); i++) {
+ ctx->frames[i].f = av_frame_alloc();
+ if (!ctx->frames[i].f) {
+ mimic_decode_end(avctx);
+ return AVERROR(ENOMEM);
+ }
+ }
 
 return 0;
 }
 
 AVCodec ff_mimic_decoder = {
 .name = "mimic",
+ .long_name = NULL_IF_CONFIG_SMALL("Mimic"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MIMIC,
 .priv_data_size = sizeof(MimicContext),
@@ -428,6 +475,6 @@
 .close = mimic_decode_end,
 .decode = mimic_decode_frame,
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
- .long_name = NULL_IF_CONFIG_SMALL("Mimic"),
- .update_thread_context = ONLY_IF_THREADS_ENABLED(mimic_decode_update_thread_context)
+ .update_thread_context = ONLY_IF_THREADS_ENABLED(mimic_decode_update_thread_context),
+ .init_thread_copy = ONLY_IF_THREADS_ENABLED(mimic_init_thread_copy),
 };

libav-v9.6.tar.bz2/libavcodec/mjpegbdec.c -> libav-v10.1.tar.bz2/libavcodec/mjpegbdec.c Changed

@@ -45,10 +45,10 @@
 int buf_size = avpkt->size;
 MJpegDecodeContext *s = avctx->priv_data;
 const uint8_t *buf_end, *buf_ptr;
- AVFrame *picture = data;
 GetBitContext hgb; /* for the header */
 uint32_t dqt_offs, dht_offs, sof_offs, sos_offs, second_field_offs;
 uint32_t field_size, sod_offs;
+ int ret;
 
 buf_ptr = buf;
 buf_end = buf + buf_size;
@@ -136,17 +136,13 @@
 
 //XXX FIXME factorize, this looks very similar to the EOI code
 
- *picture= *s->picture_ptr;
+ if ((ret = av_frame_ref(data, s->picture_ptr)) < 0)
+ return ret;
 *got_frame = 1;
 
- if(!s->lossless){
- picture->quality= FFMAX3(s->qscale[0], s->qscale[1], s->qscale[2]);
- picture->qstride= 0;
- picture->qscale_table= s->qscale_table;
- memset(picture->qscale_table, picture->quality, (s->width+15)/16);
- if(avctx->debug & FF_DEBUG_QP)
- av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", picture->quality);
- picture->quality*= FF_QP2LAMBDA;
+ if (!s->lossless && avctx->debug & FF_DEBUG_QP) {
+ av_log(avctx, AV_LOG_DEBUG, "QP: %d\n",
+ FFMAX3(s->qscale[0], s->qscale[1], s->qscale[2]));
 }
 
 return buf_size;
@@ -154,6 +150,7 @@
 
 AVCodec ff_mjpegb_decoder = {
 .name = "mjpegb",
+ .long_name = NULL_IF_CONFIG_SMALL("Apple MJPEG-B"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MJPEGB,
 .priv_data_size = sizeof(MJpegDecodeContext),
@@ -161,5 +158,4 @@
 .close = ff_mjpeg_decode_end,
 .decode = mjpegb_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Apple MJPEG-B"),
 };

libav-v9.6.tar.bz2/libavcodec/mjpegdec.c -> libav-v10.1.tar.bz2/libavcodec/mjpegdec.c Changed

@@ -30,13 +30,11 @@
 * MJPEG decoder.
 */
 
-// #define DEBUG
 #include <assert.h>
 
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "mjpeg.h"
 #include "mjpegdec.h"
@@ -86,10 +84,15 @@
 {
 MJpegDecodeContext *s = avctx->priv_data;
 
- if (!s->picture_ptr)
- s->picture_ptr = &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);
 ff_dsputil_init(&s->dsp, avctx);
 ff_init_scantable(s->dsp.idct_permutation, &s->scantable, ff_zigzag_direct);
 s->buffer_size = 0;
@@ -212,7 +215,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;
 
 /* XXX: verify len field validity */
 len = get_bits(&s->gb, 16);
@@ -243,10 +246,17 @@
 if (nb_components <= 0 ||
 nb_components > MAX_COMPONENTS)
 return -1;
+ if (s->interlaced && (s->bottom_field == !s->interlace_polarity)) {
+ if (nb_components != s->nb_components) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "nb_components changing in interlaced picture\n");
+ return AVERROR_INVALIDDATA;
+ }
+ }
 if (s->ls && !(s->bits <= 8 || nb_components == 1)) {
- av_log_missing_feature(s->avctx,
- "For JPEG-LS anything except <= 8 bits/component"
- " or 16-bit gray", 0);
+ avpriv_report_missing_feature(s->avctx,
+ "JPEG-LS that is not <= 8 "
+ "bits/component or 16-bit gray");
 return AVERROR_PATCHWELCOME;
 }
 s->nb_components = nb_components;
@@ -265,13 +275,20 @@
 s->quant_index[i] = get_bits(&s->gb, 8);
 if (s->quant_index[i] >= 4)
 return AVERROR_INVALIDDATA;
+ if (!s->h_count[i] || !s->v_count[i]) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Invalid sampling factor in component %d %d:%d\n",
+ i, s->h_count[i], s->v_count[i]);
+ return AVERROR_INVALIDDATA;
+ }
+
 av_log(s->avctx, AV_LOG_DEBUG, "component %d %d:%d id: %d quant:%d\n",
 i, s->h_count[i], s->v_count[i],
 s->component_id[i], s->quant_index[i]);
 }
 
 if (s->ls && (s->h_max > 1 || s->v_max > 1)) {
- av_log_missing_feature(s->avctx, "Subsampling in JPEG-LS", 0);
+ avpriv_report_missing_feature(s->avctx, "Subsampling in JPEG-LS");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -281,8 +298,6 @@
 /* if different size, realloc/alloc picture */
 /* XXX: also check h_count and v_count */
 if (width != s->width || height != s->height) {
- av_freep(&s->qscale_table);
-
 s->width = width;
 s->height = height;
 s->interlaced = 0;
@@ -298,9 +313,10 @@
 height *= 2;
 }
 
- avcodec_set_dimensions(s->avctx, width, height);
+ ret = ff_set_dimensions(s->avctx, width, height);
+ if (ret < 0)
+ return ret;
 
- s->qscale_table = av_mallocz((s->width + 15) / 16);
 s->first_picture = 0;
 }
 
@@ -351,10 +367,14 @@
 s->avctx->pix_fmt = AV_PIX_FMT_GRAY16;
 }
 
- if (s->picture_ptr->data[0])
- s->avctx->release_buffer(s->avctx, s->picture_ptr);
+ 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;
+ }
 
- if (ff_get_buffer(s->avctx, s->picture_ptr) < 0) {
+ av_frame_unref(s->picture_ptr);
+ if (ff_get_buffer(s->avctx, s->picture_ptr, AV_GET_BUFFER_FLAG_REF) < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return -1;
 }
@@ -408,7 +428,7 @@
 }
 
 /* decode block and dequantize */
-static int decode_block(MJpegDecodeContext *s, DCTELEM *block, int component,
+static int decode_block(MJpegDecodeContext *s, int16_t *block, int component,
 int dc_index, int ac_index, int16_t *quant_matrix)
 {
 int code, i, j, level, val;
@@ -456,7 +476,7 @@
 return 0;
 }
 
-static int decode_dc_progressive(MJpegDecodeContext *s, DCTELEM *block,
+static int decode_dc_progressive(MJpegDecodeContext *s, int16_t *block,
 int component, int dc_index,
 int16_t *quant_matrix, int Al)
 {
@@ -474,7 +494,7 @@
 }
 
 /* decode block and dequantize - progressive JPEG version */
-static int decode_block_progressive(MJpegDecodeContext *s, DCTELEM *block,
+static int decode_block_progressive(MJpegDecodeContext *s, int16_t *block,
 uint8_t *last_nnz, int ac_index,
 int16_t *quant_matrix,
 int ss, int se, int Al, int *EOBRUN)
@@ -572,7 +592,7 @@
 }
 
 /* decode block and dequantize - progressive JPEG refinement pass */
-static int decode_block_refinement(MJpegDecodeContext *s, DCTELEM *block,
+static int decode_block_refinement(MJpegDecodeContext *s, int16_t *block,
 uint8_t *last_nnz,
 int ac_index, int16_t *quant_matrix,
 int ss, int se, int Al, int *EOBRUN)
@@ -709,10 +729,9 @@
 }
 
 static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor,
- int point_transform)
+ int point_transform, int nb_components)
 {
 int i, mb_x, mb_y;
- const int nb_components = 3;
 
 for (mb_y = 0; mb_y < s->mb_height; mb_y++) {
 for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
@@ -811,26 +830,12 @@
 if (mb_bitmask)
 init_get_bits(&mb_bitmask_gb, mb_bitmask, s->mb_width * s->mb_height);
 
- if (s->flipped && s->avctx->flags & CODEC_FLAG_EMU_EDGE) {
- av_log(s->avctx, AV_LOG_ERROR,
- "Can not flip image with CODEC_FLAG_EMU_EDGE set!\n");
- s->flipped = 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) {
- // 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++) {
@@ -864,8 +869,9 @@
 ptr = data[c] + block_offset;
 if (!s->progressive) {
 if (copy_mb)
- copy_block8(ptr, reference_data[c] + block_offset,
- linesize[c], linesize[c], 8);
+ s->hdsp.put_pixels_tab[1][0](ptr,
+ reference_data[c] + block_offset,
+ linesize[c], 8);
 else {
 s->dsp.clear_block(s->block);
 if (decode_block(s, s->block, i,
@@ -880,7 +886,7 @@
 } else {
 int block_idx = s->block_stride[c] * (v * mb_y + y) +
 (h * mb_x + x);
- DCTELEM *block = s->blocks[c][block_idx];
+ int16_t *block = s->blocks[c][block_idx];
 if (Ah)
 block[0] += get_bits1(&s->gb) *
 s->quant_matrixes[s->quant_index[c]][0] << Al;
@@ -939,6 +945,11 @@
 int16_t *quant_matrix = s->quant_matrixes[s->quant_index[c]];
 GetBitContext mb_bitmask_gb;
 
+ if (ss < 0 || ss >= 64 ||
+ se < ss || se >= 64 ||
+ Ah < 0 || Al < 0)
+ return AVERROR_INVALIDDATA;
+
 if (mb_bitmask)
 init_get_bits(&mb_bitmask_gb, mb_bitmask, s->mb_width * s->mb_height);
 
@@ -957,7 +968,7 @@
 int block_offset = mb_y * linesize * 8;
 uint8_t *ptr = data + block_offset;
 int block_idx = mb_y * s->block_stride[c];
- DCTELEM (*block)[64] = &s->blocks[c][block_idx];
+ int16_t (*block)[64] = &s->blocks[c][block_idx];
 uint8_t *last_nnz = &s->last_nnz[c][block_idx];
 for (mb_x = 0; mb_x < s->mb_width; mb_x++, block++, last_nnz++) {
 const int copy_mb = mb_bitmask && !get_bits1(&mb_bitmask_gb);
@@ -979,8 +990,9 @@
 
 if (last_scan) {
 if (copy_mb) {
- copy_block8(ptr, reference_data + block_offset,
- linesize, linesize, 8);
+ s->hdsp.put_pixels_tab[1][0](ptr,
+ reference_data + block_offset,
+ linesize, 8);
 } else {
 s->dsp.idct_put(ptr, linesize, *block);
 ptr += 8;
@@ -1094,7 +1106,8 @@
 return ret;
 } else {
 if ((ret = ljpeg_decode_yuv_scan(s, predictor,
- point_transform)) < 0)
+ point_transform,
+ nb_components)) < 0)
 return ret;
 }
 }
@@ -1443,6 +1456,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;
@@ -1451,7 +1465,6 @@
 int unescaped_buf_size;
 int start_code;
 int ret = 0;
- AVFrame *picture = data;
 
 s->got_picture = 0; // picture from previous image can not be reused
 buf_ptr = buf;
@@ -1464,153 +1477,167 @@
 /* EOF */
 if (start_code < 0) {
 goto the_end;
- } else if (unescaped_buf_size > (1U<<29)) {
- av_log(avctx, AV_LOG_ERROR, "MJPEG packet 0x%x too big (0x%x/0x%x), corrupt data?\n",
+ } 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",
 start_code, unescaped_buf_size, buf_size);
 return AVERROR_INVALIDDATA;
- } else {
- av_log(avctx, AV_LOG_DEBUG, "marker=%x avail_size_in_buf=%td\n",
- start_code, buf_end - buf_ptr);
+ }
 
- init_get_bits(&s->gb, unescaped_buf_ptr, unescaped_buf_size * 8);
+ av_log(avctx, AV_LOG_DEBUG, "marker=%x avail_size_in_buf=%td\n",
+ start_code, buf_end - buf_ptr);
 
- s->start_code = start_code;
- if (s->avctx->debug & FF_DEBUG_STARTCODE)
- av_log(avctx, AV_LOG_DEBUG, "startcode: %X\n", start_code);
+ ret = init_get_bits(&s->gb, unescaped_buf_ptr,
+ unescaped_buf_size * 8);
+ if (ret < 0)
+ return ret;
 
- /* process markers */
- if (start_code >= 0xd0 && start_code <= 0xd7)
- av_log(avctx, AV_LOG_DEBUG,
- "restart marker: %d\n", start_code & 0x0f);
- /* APP fields */
- else if (start_code >= APP0 && start_code <= APP15)
- mjpeg_decode_app(s);
- /* Comment */
- else if (start_code == COM)
- mjpeg_decode_com(s);
-
- switch (start_code) {
- case SOI:
- s->restart_interval = 0;
- s->restart_count = 0;
- /* nothing to do on SOI */
+ s->start_code = start_code;
+ if (s->avctx->debug & FF_DEBUG_STARTCODE)
+ av_log(avctx, AV_LOG_DEBUG, "startcode: %X\n", start_code);
+
+ /* process markers */
+ if (start_code >= 0xd0 && start_code <= 0xd7)
+ av_log(avctx, AV_LOG_DEBUG,
+ "restart marker: %d\n", start_code & 0x0f);
+ /* APP fields */
+ else if (start_code >= APP0 && start_code <= APP15)
+ mjpeg_decode_app(s);
+ /* Comment */
+ else if (start_code == COM)
+ mjpeg_decode_com(s);
+
+ if (!CONFIG_JPEGLS_DECODER &&
+ (start_code == SOF48 || start_code == LSE)) {
+ av_log(avctx, AV_LOG_ERROR, "JPEG-LS support not enabled.\n");
+ return AVERROR(ENOSYS);
+ }
+
+ switch (start_code) {
+ case SOI:
+ s->restart_interval = 0;
+ s->restart_count = 0;
+ /* nothing to do on SOI */
+ break;
+ case DQT:
+ ff_mjpeg_decode_dqt(s);
+ break;
+ case DHT:
+ if ((ret = ff_mjpeg_decode_dht(s)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "huffman table decode error\n");
+ return ret;
+ }
+ break;
+ case SOF0:
+ case SOF1:
+ s->lossless = 0;
+ s->ls = 0;
+ s->progressive = 0;
+ if ((ret = ff_mjpeg_decode_sof(s)) < 0)
+ return ret;
+ break;
+ case SOF2:
+ s->lossless = 0;
+ s->ls = 0;
+ s->progressive = 1;
+ if ((ret = ff_mjpeg_decode_sof(s)) < 0)
+ return ret;
+ break;
+ case SOF3:
+ s->lossless = 1;
+ s->ls = 0;
+ s->progressive = 0;
+ if ((ret = ff_mjpeg_decode_sof(s)) < 0)
+ return ret;
+ break;
+ case SOF48:
+ s->lossless = 1;
+ s->ls = 1;
+ s->progressive = 0;
+ if ((ret = ff_mjpeg_decode_sof(s)) < 0)
+ return ret;
+ break;
+ case LSE:
+ if (!CONFIG_JPEGLS_DECODER ||
+ (ret = ff_jpegls_decode_lse(s)) < 0)
+ return ret;
+ break;
+ case EOI:
+ s->cur_scan = 0;
+ if ((s->buggy_avid && !s->interlaced) || s->restart_interval)
 break;
- case DQT:
- ff_mjpeg_decode_dqt(s);
+eoi_parser:
+ if (!s->got_picture) {
+ av_log(avctx, AV_LOG_WARNING,
+ "Found EOI before any SOF, ignoring\n");
 break;
- case DHT:
- if ((ret = ff_mjpeg_decode_dht(s)) < 0) {
- av_log(avctx, AV_LOG_ERROR, "huffman table decode error\n");
- return ret;
+ }
+ if (s->interlaced) {
+ s->bottom_field ^= 1;
+ /* if not bottom field, do not output image yet */
+ if (s->bottom_field == !s->interlace_polarity)
+ goto not_the_end;
+ }
+ if ((ret = av_frame_ref(frame, s->picture_ptr)) < 0)
+ return ret;
+ if (s->flipped) {
+ int i;
+ for (i = 0; frame->data[i]; i++) {
+ int h = frame->height >> ((i == 1 || i == 2) ?
+ s->pix_desc->log2_chroma_h : 0);
+ frame->data[i] += frame->linesize[i] * (h - 1);
+ frame->linesize[i] *= -1;
 }
- break;
- case SOF0:
- case SOF1:
- s->lossless = 0;
- s->ls = 0;
- s->progressive = 0;
- if ((ret = ff_mjpeg_decode_sof(s)) < 0)
- return ret;
- break;
- case SOF2:
- s->lossless = 0;
- s->ls = 0;
- s->progressive = 1;
- if ((ret = ff_mjpeg_decode_sof(s)) < 0)
- return ret;
- break;
- case SOF3:
- s->lossless = 1;
- s->ls = 0;
- s->progressive = 0;
- if ((ret = ff_mjpeg_decode_sof(s)) < 0)
- return ret;
- break;
- case SOF48:
- s->lossless = 1;
- s->ls = 1;
- s->progressive = 0;
- if ((ret = ff_mjpeg_decode_sof(s)) < 0)
- return ret;
- break;
- case LSE:
- if (!CONFIG_JPEGLS_DECODER ||
- (ret = ff_jpegls_decode_lse(s)) < 0)
- return ret;
- break;
- case EOI:
- s->cur_scan = 0;
- if ((s->buggy_avid && !s->interlaced) || s->restart_interval)
- break;
-eoi_parser:
- if (!s->got_picture) {
- av_log(avctx, AV_LOG_WARNING,
- "Found EOI before any SOF, ignoring\n");
- break;
- }
- if (s->interlaced) {
- s->bottom_field ^= 1;
- /* if not bottom field, do not output image yet */
- if (s->bottom_field == !s->interlace_polarity)
- goto not_the_end;
- }
- *picture = *s->picture_ptr;
- *got_frame = 1;
-
- if (!s->lossless) {
- picture->quality = FFMAX3(s->qscale[0],
- s->qscale[1],
- s->qscale[2]);
- picture->qstride = 0;
- picture->qscale_table = s->qscale_table;
- memset(picture->qscale_table, picture->quality,
- (s->width + 15) / 16);
- if (avctx->debug & FF_DEBUG_QP)
- av_log(avctx, AV_LOG_DEBUG,
- "QP: %d\n", picture->quality);
- picture->quality *= FF_QP2LAMBDA;
- }
+ }
+ *got_frame = 1;
 
- goto the_end;
- case SOS:
- if (!s->got_picture) {
- av_log(avctx, AV_LOG_WARNING,
- "Can not process SOS before SOF, skipping\n");
- break;
- }
- if ((ret = ff_mjpeg_decode_sos(s, NULL, NULL)) < 0 &&
- (avctx->err_recognition & AV_EF_EXPLODE))
- return ret;
- /* buggy avid puts EOI every 10-20th frame */
- /* if restart period is over process EOI */
- if ((s->buggy_avid && !s->interlaced) || s->restart_interval)
- goto eoi_parser;
- break;
- case DRI:
- mjpeg_decode_dri(s);
- break;
- case SOF5:
- case SOF6:
- case SOF7:
- case SOF9:
- case SOF10:
- case SOF11:
- case SOF13:
- case SOF14:
- case SOF15:
- case JPG:
- av_log(avctx, AV_LOG_ERROR,
- "mjpeg: unsupported coding type (%x)\n", start_code);
- break;
+ if (!s->lossless &&
+ avctx->debug & FF_DEBUG_QP) {
+ av_log(avctx, AV_LOG_DEBUG,
+ "QP: %d\n", FFMAX3(s->qscale[0],
+ s->qscale[1],
+ s->qscale[2]));
 }
 
-not_the_end:
- /* eof process start code */
- buf_ptr += (get_bits_count(&s->gb) + 7) / 8;
- av_log(avctx, AV_LOG_DEBUG,
- "marker parser used %d bytes (%d bits)\n",
- (get_bits_count(&s->gb) + 7) / 8, get_bits_count(&s->gb));
+ goto the_end;
+ case SOS:
+ if (!s->got_picture) {
+ av_log(avctx, AV_LOG_WARNING,
+ "Can not process SOS before SOF, skipping\n");
+ break;
+ }
+ if ((ret = ff_mjpeg_decode_sos(s, NULL, NULL)) < 0 &&
+ (avctx->err_recognition & AV_EF_EXPLODE))
+ return ret;
+ /* buggy avid puts EOI every 10-20th frame */
+ /* if restart period is over process EOI */
+ if ((s->buggy_avid && !s->interlaced) || s->restart_interval)
+ goto eoi_parser;
+ break;
+ case DRI:
+ mjpeg_decode_dri(s);
+ break;
+ case SOF5:
+ case SOF6:
+ case SOF7:
+ case SOF9:
+ case SOF10:
+ case SOF11:
+ case SOF13:
+ case SOF14:
+ case SOF15:
+ case JPG:
+ av_log(avctx, AV_LOG_ERROR,
+ "mjpeg: unsupported coding type (%x)\n", start_code);
+ break;
 }
+
+not_the_end:
+ /* eof process start code */
+ buf_ptr += (get_bits_count(&s->gb) + 7) / 8;
+ av_log(avctx, AV_LOG_DEBUG,
+ "marker parser used %d bytes (%d bits)\n",
+ (get_bits_count(&s->gb) + 7) / 8, get_bits_count(&s->gb));
 }
 if (s->got_picture) {
 av_log(avctx, AV_LOG_WARNING, "EOI missing, emulating\n");
@@ -1630,11 +1657,13 @@
 MJpegDecodeContext *s = avctx->priv_data;
 int i, j;
 
- if (s->picture_ptr && s->picture_ptr->data[0])
- avctx->release_buffer(avctx, 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_free(s->qscale_table);
 av_freep(&s->ljpeg_buffer);
 s->ljpeg_buffer_size = 0;
 
@@ -1666,6 +1695,7 @@
 
 AVCodec ff_mjpeg_decoder = {
 .name = "mjpeg",
+ .long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MJPEG,
 .priv_data_size = sizeof(MJpegDecodeContext),
@@ -1673,12 +1703,12 @@
 .close = ff_mjpeg_decode_end,
 .decode = ff_mjpeg_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"),
 .priv_class = &mjpegdec_class,
 };
 
 AVCodec ff_thp_decoder = {
 .name = "thp",
+ .long_name = NULL_IF_CONFIG_SMALL("Nintendo Gamecube THP video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_THP,
 .priv_data_size = sizeof(MJpegDecodeContext),
@@ -1686,5 +1716,4 @@
 .close = ff_mjpeg_decode_end,
 .decode = ff_mjpeg_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Nintendo Gamecube THP video"),
 };

libav-v9.6.tar.bz2/libavcodec/mjpegdec.h -> libav-v10.1.tar.bz2/libavcodec/mjpegdec.h Changed

@@ -30,10 +30,12 @@
 #define AVCODEC_MJPEGDEC_H
 
 #include "libavutil/log.h"
+#include "libavutil/pixdesc.h"
 
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dsputil.h"
+#include "hpeldsp.h"
 
 #define MAX_COMPONENTS 4
 
@@ -83,17 +85,18 @@
 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
 int8_t *qscale_table;
- DECLARE_ALIGNED(16, DCTELEM, block)[64];
- DCTELEM (*blocks[MAX_COMPONENTS])[64]; ///< intermediate sums (progressive mode)
+ DECLARE_ALIGNED(16, int16_t, block)[64];
+ int16_t (*blocks[MAX_COMPONENTS])[64]; ///< intermediate sums (progressive mode)
 uint8_t *last_nnz[MAX_COMPONENTS];
 uint64_t coefs_finished[MAX_COMPONENTS]; ///< bitmask of which coefs have been completely decoded (progressive mode)
 ScanTable scantable;
 DSPContext dsp;
+ HpelDSPContext hdsp;
 
 int restart_interval;
 int restart_count;
@@ -111,6 +114,8 @@
 unsigned int ljpeg_buffer_size;
 
 int extern_huff;
+
+ const AVPixFmtDescriptor *pix_desc;
 } MJpegDecodeContext;
 
 int ff_mjpeg_decode_init(AVCodecContext *avctx);

libav-v9.6.tar.bz2/libavcodec/mjpegenc.c -> libav-v10.1.tar.bz2/libavcodec/mjpegenc.c Changed

@@ -30,20 +30,15 @@
 * MJPEG encoder.
 */
 
-//#define DEBUG
 #include <assert.h>
 
+#include "libavutil/pixdesc.h"
+
 #include "avcodec.h"
-#include "dsputil.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;
@@ -83,10 +78,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);
@@ -104,33 +98,21 @@
 return n + 17;
 }
 
-static void jpeg_table_header(MpegEncContext *s)
+static void jpeg_table_header(PutBitContext *p, ScanTable *intra_scantable,
+ uint16_t intra_matrix[64])
 {
- PutBitContext *p = &s->pb;
 int i, j, size;
 uint8_t *ptr;
 
 /* 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, 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, intra_matrix[j]);
 }
-#endif
 
 /* huffman table */
 put_marker(p, DHT);
@@ -138,40 +120,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->aspect_ratio_info /* && !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, 0x0201); /* 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, 0x0201); /* 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);
@@ -181,9 +161,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);
@@ -194,93 +174,106 @@
 }
 }
 
-void ff_mjpeg_encode_picture_header(MpegEncContext *s)
+void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
+ ScanTable *intra_scantable,
+ uint16_t intra_matrix[64])
 {
- const int lossless= s->avctx->codec_id != AV_CODEC_ID_MJPEG;
+ int chroma_h_shift, chroma_v_shift;
+ const int lossless = avctx->codec_id != AV_CODEC_ID_MJPEG;
+ int hsample[3], vsample[3];
+
+ 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_BGR24) {
+ vsample[0] = hsample[0] =
+ vsample[1] = hsample[1] =
+ vsample[2] = 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;
+ }
 
- put_marker(&s->pb, SOI);
+ put_marker(pb, SOI);
 
- jpeg_put_comments(s);
+ jpeg_put_comments(avctx, pb);
 
- jpeg_table_header(s);
+ jpeg_table_header(pb, intra_scantable, intra_matrix);
 
- 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: assert(0);
 }
 
- put_bits(&s->pb, 16, 17);
- if(lossless && s->avctx->pix_fmt == AV_PIX_FMT_BGRA)
- put_bits(&s->pb, 8, 9); /* 9 bits/component RCT */
+ put_bits(pb, 16, 17);
+ if (lossless && 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, 0); /* 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, 0); /* 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: assert(0);
 }
 
- put_bits(&s->pb, 8, 0); /* Ah/Al (not used) */
+ put_bits(pb, 8, 0); /* Ah/Al (not used) */
 }
 
-static void escape_FF(MpegEncContext *s, int start)
+static void escape_FF(PutBitContext *pb, int start)
 {
- int size= put_bits_count(&s->pb) - start*8;
+ int size = put_bits_count(pb) - start * 8;
 int i, ff_count;
- uint8_t *buf= s->pb.buf + start;
+ uint8_t *buf = pb->buf + start;
 int align= (-(size_t)(buf))&3;
 
 assert((size&7) == 0);
@@ -313,8 +306,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];
@@ -335,25 +328,25 @@
 if(length) put_bits(pbc, length, (1<<length)-1);
 }
 
-void ff_mjpeg_encode_picture_trailer(MpegEncContext *s)
+void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits)
 {
- ff_mjpeg_encode_stuffing(&s->pb);
- flush_put_bits(&s->pb);
+ ff_mjpeg_encode_stuffing(pb);
+ flush_put_bits(pb);
 
- assert((s->header_bits&7)==0);
+ assert((header_bits & 7) == 0);
 
- escape_FF(s, s->header_bits>>3);
+ escape_FF(pb, header_bits >> 3);
 
- 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) {
@@ -363,13 +356,13 @@
 
 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);
 }
 }
 
-static void encode_block(MpegEncContext *s, DCTELEM *block, int n)
+static void encode_block(MpegEncContext *s, int16_t *block, int n)
 {
 int mant, nbits, code, i, j;
 int component, dc, run, last_index, val;
@@ -382,11 +375,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;
 }
@@ -427,7 +420,7 @@
 put_bits(&s->pb, huff_size_ac[0], huff_code_ac[0]);
 }
 
-void ff_mjpeg_encode_mb(MpegEncContext *s, DCTELEM block[6][64])
+void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[6][64])
 {
 int i;
 for(i=0;i<5;i++) {
@@ -446,6 +439,7 @@
 
 AVCodec ff_mjpeg_encoder = {
 .name = "mjpeg",
+ .long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MJPEG,
 .priv_data_size = sizeof(MpegEncContext),
@@ -455,5 +449,4 @@
 .pix_fmts = (const enum AVPixelFormat[]){
 AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_NONE
 },
- .long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"),
 };

libav-v9.6.tar.bz2/libavcodec/mjpegenc.h -> libav-v10.1.tar.bz2/libavcodec/mjpegenc.h Changed

@@ -33,7 +33,8 @@
 #ifndef AVCODEC_MJPEGENC_H
 #define AVCODEC_MJPEGENC_H
 
-#include "dsputil.h"
+#include <stdint.h>
+
 #include "mpegvideo.h"
 
 typedef struct MJpegContext {
@@ -50,11 +51,13 @@
 
 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 intra_matrix[64]);
+void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits);
 void ff_mjpeg_encode_stuffing(PutBitContext *pbc);
-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);
-void ff_mjpeg_encode_mb(MpegEncContext *s, DCTELEM block[6][64]);
+void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[6][64]);
 
 #endif /* AVCODEC_MJPEGENC_H */

libav-v9.6.tar.bz2/libavcodec/mlp.h -> libav-v10.1.tar.bz2/libavcodec/mlp.h Changed

libav-v9.6.tar.bz2/libavcodec/mlp_parser.c -> libav-v10.1.tar.bz2/libavcodec/mlp_parser.c Changed

@@ -28,6 +28,7 @@
 
 #include "libavutil/channel_layout.h"
 #include "libavutil/crc.h"
+#include "libavutil/internal.h"
 #include "get_bits.h"
 #include "parser.h"
 #include "mlp_parser.h"
@@ -168,13 +169,16 @@
 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);
 
 channel_arrangement = get_bits(gb, 5);
 mh->channels_thd_stream1 = truehd_channels(channel_arrangement);
 mh->channel_layout_thd_stream1 = 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);
@@ -322,16 +326,55 @@
 
 if (mh.stream_type == 0xbb) {
 /* MLP stream */
- avctx->channels = mh.channels_mlp;
- avctx->channel_layout = mh.channel_layout_mlp;
+#if FF_API_REQUEST_CHANNELS
+FF_DISABLE_DEPRECATION_WARNINGS
+ if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
+ mh.num_substreams > 1) {
+ avctx->channels = 2;
+ avctx->channel_layout = AV_CH_LAYOUT_STEREO;
+ } else
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+ 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 {
+ avctx->channels = mh.channels_mlp;
+ avctx->channel_layout = mh.channel_layout_mlp;
+ }
 } else { /* mh.stream_type == 0xba */
 /* TrueHD stream */
- if (mh.channels_thd_stream2) {
- avctx->channels = mh.channels_thd_stream2;
- avctx->channel_layout = mh.channel_layout_thd_stream2;
- } else {
+#if FF_API_REQUEST_CHANNELS
+FF_DISABLE_DEPRECATION_WARNINGS
+ if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
+ mh.num_substreams > 1) {
+ avctx->channels = 2;
+ avctx->channel_layout = AV_CH_LAYOUT_STEREO;
+ } else if (avctx->request_channels > 0 &&
+ avctx->request_channels <= mh.channels_thd_stream1) {
 avctx->channels = mh.channels_thd_stream1;
 avctx->channel_layout = mh.channel_layout_thd_stream1;
+ } else
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+ 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 (!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 {
+ avctx->channels = mh.channels_thd_stream2;
+ avctx->channel_layout = mh.channel_layout_thd_stream2;
 }
 }

libav-v9.6.tar.bz2/libavcodec/mlp_parser.h -> libav-v10.1.tar.bz2/libavcodec/mlp_parser.h Changed

@@ -31,13 +31,17 @@
 
 typedef struct MLPHeaderInfo
 {
- int stream_type; ///< 0xBB for MLP, 0xBA for TrueHD
+ int stream_type; ///< 0xBB for MLP, 0xBA for TrueHD
 
- int group1_bits; ///< The bit depth of the first substream
- int group2_bits; ///< Bit depth of the second substream (MLP only)
+ int group1_bits; ///< The bit depth of the first substream
+ int group2_bits; ///< Bit depth of the second substream (MLP only)
 
- int group1_samplerate; ///< Sample rate of first substream
- int group2_samplerate; ///< Sample rate of second substream (MLP only)
+ int group1_samplerate; ///< Sample rate of first substream
+ int group2_samplerate; ///< Sample rate of second substream (MLP only)
+
+ int channel_modifier_thd_stream0; ///< Channel modifier for substream 0 of TrueHD sreams ("2-channel presentation")
+ int channel_modifier_thd_stream1; ///< Channel modifier for substream 1 of TrueHD sreams ("6-channel presentation")
+ int channel_modifier_thd_stream2; ///< Channel modifier for substream 2 of TrueHD sreams ("8-channel presentation")
 
 int channels_mlp; ///< Channel count for MLP streams
 int channels_thd_stream1; ///< Channel count for substream 1 of TrueHD streams ("6-channel presentation")
@@ -46,13 +50,13 @@
 uint64_t channel_layout_thd_stream1; ///< Channel layout for substream 1 of TrueHD streams ("6-channel presentation")
 uint64_t channel_layout_thd_stream2; ///< Channel layout for substream 2 of TrueHD streams ("8-channel presentation")
 
- int access_unit_size; ///< Number of samples per coded frame
- int access_unit_size_pow2; ///< Next power of two above number of samples per frame
+ int access_unit_size; ///< Number of samples per coded frame
+ int access_unit_size_pow2; ///< Next power of two above number of samples per frame
 
- int is_vbr; ///< Stream is VBR instead of CBR
- int peak_bitrate; ///< Peak bitrate for VBR, actual bitrate (==peak) for CBR
+ int is_vbr; ///< Stream is VBR instead of CBR
+ int peak_bitrate; ///< Peak bitrate for VBR, actual bitrate (==peak) for CBR
 
- int num_substreams; ///< Number of substreams within stream
+ int num_substreams; ///< Number of substreams within stream
 } MLPHeaderInfo;

libav-v9.6.tar.bz2/libavcodec/mlpdec.c -> libav-v10.1.tar.bz2/libavcodec/mlpdec.c Changed

@@ -27,6 +27,7 @@
 #include <stdint.h>
 
 #include "avcodec.h"
+#include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/channel_layout.h"
 #include "get_bits.h"
@@ -59,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];
@@ -118,7 +121,6 @@
 
 typedef struct MLPDecodeContext {
 AVCodecContext *avctx;
- AVFrame frame;
 
 /// Current access unit being read has a major sync.
 int is_major_sync_unit;
@@ -268,9 +270,6 @@
 m->substream[substr].lossless_check_data = 0xffffffff;
 ff_mlpdsp_init(&m->dsp);
 
- avcodec_get_frame_defaults(&m->frame);
- avctx->coded_frame = &m->frame;
-
 return 0;
 }
 
@@ -333,9 +332,10 @@
 return AVERROR_INVALIDDATA;
 }
 if (mh.num_substreams > MAX_SUBSTREAMS) {
- av_log_ask_for_sample(m->avctx,
- "Number of substreams %d is larger than the maximum supported "
- "by the decoder.\n", mh.num_substreams);
+ avpriv_request_sample(m->avctx,
+ "%d substreams (more than the "
+ "maximum supported by the decoder)",
+ mh.num_substreams);
 return AVERROR_PATCHWELCOME;
 }
 
@@ -376,6 +376,46 @@
 m->substream[substr].ch_layout = mh.channel_layout_thd_stream1;
 }
 
+ /* 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;
 }
 
@@ -392,9 +432,10 @@
 uint8_t checksum;
 uint8_t lossless_check;
 int start_count = get_bits_count(gbp);
- const int max_matrix_channel = m->avctx->codec_id == AV_CODEC_ID_MLP
- ? MAX_MATRIX_CHANNEL_MLP
- : MAX_MATRIX_CHANNEL_TRUEHD;
+ int min_channel, max_channel, max_matrix_channel;
+ const int std_max_matrix_channel = m->avctx->codec_id == AV_CODEC_ID_MLP
+ ? MAX_MATRIX_CHANNEL_MLP
+ : MAX_MATRIX_CHANNEL_TRUEHD;
 
 sync_word = get_bits(gbp, 13);
 
@@ -413,18 +454,18 @@
 
 skip_bits(gbp, 16); /* Output timestamp */
 
- s->min_channel = get_bits(gbp, 4);
- s->max_channel = get_bits(gbp, 4);
- s->max_matrix_channel = get_bits(gbp, 4);
+ min_channel = get_bits(gbp, 4);
+ max_channel = get_bits(gbp, 4);
+ max_matrix_channel = get_bits(gbp, 4);
 
- if (s->max_matrix_channel > max_matrix_channel) {
+ if (max_matrix_channel > std_max_matrix_channel) {
 av_log(m->avctx, AV_LOG_ERROR,
 "Max matrix channel cannot be greater than %d.\n",
 max_matrix_channel);
 return AVERROR_INVALIDDATA;
 }
 
- if (s->max_channel != s->max_matrix_channel) {
+ if (max_channel != max_matrix_channel) {
 av_log(m->avctx, AV_LOG_ERROR,
 "Max channel must be equal max matrix channel.\n");
 return AVERROR_INVALIDDATA;
@@ -433,26 +474,43 @@
 /* This should happen for TrueHD streams with >6 channels and MLP's noise
 * type. It is not yet known if this is allowed. */
 if (s->max_channel > MAX_MATRIX_CHANNEL_MLP && !s->noise_type) {
- av_log_ask_for_sample(m->avctx,
- "Number of channels %d is larger than the maximum supported "
- "by the decoder.\n", s->max_channel + 2);
+ avpriv_request_sample(m->avctx,
+ "%d channels (more than the "
+ "maximum supported by the decoder)",
+ s->max_channel + 2);
 return AVERROR_PATCHWELCOME;
 }
 
- if (s->min_channel > s->max_channel) {
+ if (min_channel > max_channel) {
 av_log(m->avctx, AV_LOG_ERROR,
 "Substream min channel cannot be greater than max channel.\n");
 return AVERROR_INVALIDDATA;
 }
 
- if (m->avctx->request_channels > 0
- && s->max_channel + 1 >= m->avctx->request_channels
- && substr < m->max_decoded_substream) {
+ s->min_channel = min_channel;
+ s->max_channel = max_channel;
+ s->max_matrix_channel = max_matrix_channel;
+
+#if FF_API_REQUEST_CHANNELS
+FF_DISABLE_DEPRECATION_WARNINGS
+ if (m->avctx->request_channels > 0 &&
+ m->avctx->request_channels <= s->max_channel + 1 &&
+ m->max_decoded_substream > substr) {
 av_log(m->avctx, AV_LOG_DEBUG,
- "Extracting %d channel downmix from substream %d. "
+ "Extracting %d-channel downmix from substream %d. "
 "Further substreams will be skipped.\n",
 s->max_channel + 1, substr);
 m->max_decoded_substream = substr;
+ } else
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+ 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",
+ s->max_channel + 1, s->ch_layout, substr);
+ m->max_decoded_substream = substr;
 }
 
 s->noise_shift = get_bits(gbp, 4);
@@ -484,9 +542,9 @@
 channel);
 }
 if (ch_assign > s->max_matrix_channel) {
- av_log_ask_for_sample(m->avctx,
- "Assignment of matrix channel %d to invalid output channel %d.\n",
- ch, ch_assign);
+ avpriv_request_sample(m->avctx,
+ "Assignment of matrix channel %d to invalid output channel %d",
+ ch, ch_assign);
 return AVERROR_PATCHWELCOME;
 }
 s->ch_assign[ch_assign] = ch;
@@ -817,8 +875,8 @@
 if (s->data_check_present) {
 expected_stream_pos = get_bits_count(gbp);
 expected_stream_pos += get_bits(gbp, 16);
- av_log_ask_for_sample(m->avctx, "This file contains some features "
- "we have not tested yet.\n");
+ avpriv_request_sample(m->avctx,
+ "Substreams with VLC block size check info");
 }
 
 if (s->blockpos + s->blocksize > m->access_unit_size) {
@@ -963,7 +1021,7 @@
 /** Write the audio data into the output buffer. */
 
 static int output_data(MLPDecodeContext *m, unsigned int substr,
- void *data, int *got_frame_ptr)
+ AVFrame *frame, int *got_frame_ptr)
 {
 AVCodecContext *avctx = m->avctx;
 SubStream *s = &m->substream[substr];
@@ -984,13 +1042,13 @@
 }
 
 /* get output buffer */
- m->frame.nb_samples = s->blockpos;
- if ((ret = ff_get_buffer(avctx, &m->frame)) < 0) {
+ frame->nb_samples = s->blockpos;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- data_32 = (int32_t *)m->frame.data[0];
- data_16 = (int16_t *)m->frame.data[0];
+ data_32 = (int32_t *)frame->data[0];
+ data_16 = (int16_t *)frame->data[0];
 
 for (i = 0; i < s->blockpos; i++) {
 for (out_ch = 0; out_ch <= s->max_matrix_channel; out_ch++) {
@@ -1003,8 +1061,11 @@
 }
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = m->frame;
+ /* 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;
 }
@@ -1211,24 +1272,24 @@
 
 AVCodec ff_mlp_decoder = {
 .name = "mlp",
+ .long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_MLP,
 .priv_data_size = sizeof(MLPDecodeContext),
 .init = mlp_decode_init,
 .decode = read_access_unit,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)"),
 };
 
 #if CONFIG_TRUEHD_DECODER
 AVCodec ff_truehd_decoder = {
 .name = "truehd",
+ .long_name = NULL_IF_CONFIG_SMALL("TrueHD"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_TRUEHD,
 .priv_data_size = sizeof(MLPDecodeContext),
 .init = mlp_decode_init,
 .decode = read_access_unit,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("TrueHD"),
 };
 #endif /* CONFIG_TRUEHD_DECODER */

libav-v9.6.tar.bz2/libavcodec/mlpdsp.c -> libav-v10.1.tar.bz2/libavcodec/mlpdsp.c Changed

@@ -20,13 +20,14 @@
  */
 
 #include "config.h"
+#include "libavutil/attributes.h"
 #include "mlpdsp.h"
 #include "mlp.h"
 
-static void ff_mlp_filter_channel(int32_t *state, const int32_t *coeff,
-                                  int firorder, int iirorder,
-                                  unsigned int filter_shift, int32_t mask, int blocksize,
-                                  int32_t *sample_buffer)
+static void mlp_filter_channel(int32_t *state, const int32_t *coeff,
+                               int firorder, int iirorder,
+                               unsigned int filter_shift, int32_t mask,
+                               int blocksize, int32_t *sample_buffer)
 {
     int32_t *firbuf = state;
     int32_t *iirbuf = state + MAX_BLOCKSIZE + MAX_FIR_ORDER;
@@ -56,9 +57,9 @@
     }
 }
 
-void ff_mlpdsp_init(MLPDSPContext *c)
+av_cold void ff_mlpdsp_init(MLPDSPContext *c)
 {
-    c->mlp_filter_channel = ff_mlp_filter_channel;
+    c->mlp_filter_channel = mlp_filter_channel;
     if (ARCH_X86)
         ff_mlpdsp_init_x86(c);
 }

libav-v9.6.tar.bz2/libavcodec/mmvideo.c -> libav-v10.1.tar.bz2/libavcodec/mmvideo.c Changed

@@ -34,6 +34,7 @@
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "bytestream.h"
+#include "internal.h"
 
 #define MM_PREAMBLE_SIZE 6
 
@@ -47,7 +48,7 @@
 
 typedef struct MmContext {
 AVCodecContext *avctx;
- AVFrame frame;
+ AVFrame *frame;
 int palette[AVPALETTE_COUNT];
 GetByteContext gb;
 } MmContext;
@@ -60,7 +61,9 @@
 
 avctx->pix_fmt = AV_PIX_FMT_PAL8;
 
- s->frame.reference = 1;
+ s->frame = av_frame_alloc();
+ if (!s->frame)
+ return AVERROR(ENOMEM);
 
 return 0;
 }
@@ -104,9 +107,9 @@
 run_length *=2;
 
 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;
 
@@ -125,7 +128,8 @@
 */
 static int mm_decode_inter(MmContext * s, int half_horiz, int half_vert)
 {
- int data_off = bytestream2_get_le16(&s->gb), y;
+ int data_off = bytestream2_get_le16(&s->gb);
+ int y = 0;
 GetByteContext data_ptr;
 
 if (bytestream2_get_bytes_left(&s->gb) < data_off)
@@ -152,13 +156,13 @@
 int replace = (replace_array >> (7-j)) & 1;
 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;
@@ -187,9 +191,9 @@
 buf_size -= MM_PREAMBLE_SIZE;
 bytestream2_init(&s->gb, buf, buf_size);
 
- if (avctx->reget_buffer(avctx, &s->frame) < 0) {
+ if ((res = ff_reget_buffer(avctx, s->frame)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return res;
 }
 
 switch(type) {
@@ -207,10 +211,12 @@
 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)
+ return res;
 
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
 return buf_size;
 }
@@ -219,14 +225,14 @@
 {
 MmContext *s = avctx->priv_data;
 
- if(s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ av_frame_free(&s->frame);
 
 return 0;
 }
 
 AVCodec ff_mmvideo_decoder = {
 .name = "mmvideo",
+ .long_name = NULL_IF_CONFIG_SMALL("American Laser Games MM Video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MMVIDEO,
 .priv_data_size = sizeof(MmContext),
@@ -234,5 +240,4 @@
 .close = mm_decode_end,
 .decode = mm_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("American Laser Games MM Video"),
 };

libav-v9.6.tar.bz2/libavcodec/motion_est.c -> libav-v10.1.tar.bz2/libavcodec/motion_est.c Changed

@@ -32,7 +32,6 @@
 #include <limits.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mathops.h"
 #include "mpegvideo.h"
 
@@ -290,7 +289,7 @@
 return 0;
 }
 
-static void zero_hpel(uint8_t *a, const uint8_t *b, int stride, int h){
+static void zero_hpel(uint8_t *a, const uint8_t *b, ptrdiff_t stride, int h){
 }
 
 int ff_init_me(MpegEncContext *s){
@@ -302,8 +301,9 @@
 av_log(s->avctx, AV_LOG_ERROR, "ME_MAP size is too small for SAB diamond\n");
 return -1;
 }
- //special case of snow is needed because snow uses its own iterative ME code
- if(s->me_method!=ME_ZERO && s->me_method!=ME_EPZS && s->me_method!=ME_X1 && s->avctx->codec_id != AV_CODEC_ID_SNOW){
+ if (s->me_method != ME_ZERO &&
+ s->me_method != ME_EPZS &&
+ s->me_method != ME_X1) {
 av_log(s->avctx, AV_LOG_ERROR, "me_method is only allowed to be set to zero and epzs; for hex,umh,full and others see dia_size\n");
 return -1;
 }
@@ -339,9 +339,11 @@
 else
 c->sub_motion_search= hpel_motion_search;
 }
- c->hpel_avg= s->dsp.avg_pixels_tab;
- if(s->no_rounding) c->hpel_put= s->dsp.put_no_rnd_pixels_tab;
- else c->hpel_put= s->dsp.put_pixels_tab;
+ c->hpel_avg = s->hdsp.avg_pixels_tab;
+ if (s->no_rounding)
+ c->hpel_put = s->hdsp.put_no_rnd_pixels_tab;
+ else
+ c->hpel_put = s->hdsp.put_pixels_tab;
 
 if(s->linesize){
 c->stride = s->linesize;
@@ -354,16 +356,14 @@
 /* 8x8 fullpel search would need a 4x4 chroma compare, which we do
 * not have yet, and even if we had, the motion estimation code
 * does not expect it. */
- if(s->codec_id != AV_CODEC_ID_SNOW){
- if((c->avctx->me_cmp&FF_CMP_CHROMA)/* && !s->dsp.me_cmp[2]*/){
- s->dsp.me_cmp[2]= zero_cmp;
- }
- if((c->avctx->me_sub_cmp&FF_CMP_CHROMA) && !s->dsp.me_sub_cmp[2]){
- s->dsp.me_sub_cmp[2]= zero_cmp;
- }
- c->hpel_put[2][0]= c->hpel_put[2][1]=
- c->hpel_put[2][2]= c->hpel_put[2][3]= zero_hpel;
+ if((c->avctx->me_cmp&FF_CMP_CHROMA)/* && !s->dsp.me_cmp[2]*/){
+ s->dsp.me_cmp[2]= zero_cmp;
+ }
+ if((c->avctx->me_sub_cmp&FF_CMP_CHROMA) && !s->dsp.me_sub_cmp[2]){
+ s->dsp.me_sub_cmp[2]= zero_cmp;
 }
+ c->hpel_put[2][0]= c->hpel_put[2][1]=
+ c->hpel_put[2][2]= c->hpel_put[2][3]= zero_hpel;
 
 if(s->codec_id == AV_CODEC_ID_H261){
 c->sub_motion_search= no_sub_motion_search;
@@ -496,16 +496,16 @@
 if(mv4){
 int mot_xy= s->block_index[0];
 
- s->current_picture.f.motion_val[0][mot_xy ][0] = mx;
- s->current_picture.f.motion_val[0][mot_xy ][1] = my;
- s->current_picture.f.motion_val[0][mot_xy + 1][0] = mx;
- s->current_picture.f.motion_val[0][mot_xy + 1][1] = my;
+ s->current_picture.motion_val[0][mot_xy ][0] = mx;
+ s->current_picture.motion_val[0][mot_xy ][1] = my;
+ s->current_picture.motion_val[0][mot_xy + 1][0] = mx;
+ s->current_picture.motion_val[0][mot_xy + 1][1] = my;
 
 mot_xy += s->b8_stride;
- s->current_picture.f.motion_val[0][mot_xy ][0] = mx;
- s->current_picture.f.motion_val[0][mot_xy ][1] = my;
- s->current_picture.f.motion_val[0][mot_xy + 1][0] = mx;
- s->current_picture.f.motion_val[0][mot_xy + 1][1] = my;
+ s->current_picture.motion_val[0][mot_xy ][0] = mx;
+ s->current_picture.motion_val[0][mot_xy ][1] = my;
+ s->current_picture.motion_val[0][mot_xy + 1][0] = mx;
+ s->current_picture.motion_val[0][mot_xy + 1][1] = my;
 }
 }
 
@@ -578,8 +578,8 @@
 const int mot_stride = s->b8_stride;
 const int mot_xy = s->block_index[block];
 
- P_LEFT[0] = s->current_picture.f.motion_val[0][mot_xy - 1][0];
- P_LEFT[1] = s->current_picture.f.motion_val[0][mot_xy - 1][1];
+ P_LEFT[0] = s->current_picture.motion_val[0][mot_xy - 1][0];
+ P_LEFT[1] = s->current_picture.motion_val[0][mot_xy - 1][1];
 
 if(P_LEFT[0] > (c->xmax<<shift)) P_LEFT[0] = (c->xmax<<shift);
 
@@ -588,10 +588,10 @@
 c->pred_x= pred_x4= P_LEFT[0];
 c->pred_y= pred_y4= P_LEFT[1];
 } else {
- P_TOP[0] = s->current_picture.f.motion_val[0][mot_xy - mot_stride ][0];
- P_TOP[1] = s->current_picture.f.motion_val[0][mot_xy - mot_stride ][1];
- P_TOPRIGHT[0] = s->current_picture.f.motion_val[0][mot_xy - mot_stride + off[block]][0];
- P_TOPRIGHT[1] = s->current_picture.f.motion_val[0][mot_xy - mot_stride + off[block]][1];
+ P_TOP[0] = s->current_picture.motion_val[0][mot_xy - mot_stride ][0];
+ P_TOP[1] = s->current_picture.motion_val[0][mot_xy - mot_stride ][1];
+ P_TOPRIGHT[0] = s->current_picture.motion_val[0][mot_xy - mot_stride + off[block]][0];
+ P_TOPRIGHT[1] = s->current_picture.motion_val[0][mot_xy - mot_stride + off[block]][1];
 if(P_TOP[1] > (c->ymax<<shift)) P_TOP[1] = (c->ymax<<shift);
 if(P_TOPRIGHT[0] < (c->xmin<<shift)) P_TOPRIGHT[0]= (c->xmin<<shift);
 if(P_TOPRIGHT[0] > (c->xmax<<shift)) P_TOPRIGHT[0]= (c->xmax<<shift);
@@ -627,9 +627,9 @@
 dxy = ((my4 & 1) << 1) | (mx4 & 1);
 
 if(s->no_rounding)
- s->dsp.put_no_rnd_pixels_tab[1][dxy](dest_y , ref , stride, h);
+ s->hdsp.put_no_rnd_pixels_tab[1][dxy](dest_y , ref , stride, h);
 else
- s->dsp.put_pixels_tab [1][dxy](dest_y , ref , stride, h);
+ s->hdsp.put_pixels_tab [1][dxy](dest_y , ref , stride, h);
 }
 dmin_sum+= (mv_penalty[mx4-pred_x4] + mv_penalty[my4-pred_y4])*c->mb_penalty_factor;
 }else
@@ -643,8 +643,8 @@
 my4_sum+= my4;
 }
 
- s->current_picture.f.motion_val[0][s->block_index[block]][0] = mx4;
- s->current_picture.f.motion_val[0][s->block_index[block]][1] = my4;
+ s->current_picture.motion_val[0][s->block_index[block]][0] = mx4;
+ s->current_picture.motion_val[0][s->block_index[block]][1] = my4;
 
 if(mx4 != mx || my4 != my) same=0;
 }
@@ -668,11 +668,11 @@
 offset= (s->mb_x*8 + (mx>>1)) + (s->mb_y*8 + (my>>1))*s->uvlinesize;
 
 if(s->no_rounding){
- s->dsp.put_no_rnd_pixels_tab[1][dxy](c->scratchpad , s->last_picture.f.data[1] + offset, s->uvlinesize, 8);
- s->dsp.put_no_rnd_pixels_tab[1][dxy](c->scratchpad + 8, s->last_picture.f.data[2] + offset, s->uvlinesize, 8);
+ s->hdsp.put_no_rnd_pixels_tab[1][dxy](c->scratchpad , s->last_picture.f.data[1] + offset, s->uvlinesize, 8);
+ s->hdsp.put_no_rnd_pixels_tab[1][dxy](c->scratchpad + 8, s->last_picture.f.data[2] + offset, s->uvlinesize, 8);
 }else{
- s->dsp.put_pixels_tab [1][dxy](c->scratchpad , s->last_picture.f.data[1] + offset, s->uvlinesize, 8);
- s->dsp.put_pixels_tab [1][dxy](c->scratchpad + 8, s->last_picture.f.data[2] + offset, s->uvlinesize, 8);
+ s->hdsp.put_pixels_tab [1][dxy](c->scratchpad , s->last_picture.f.data[1] + offset, s->uvlinesize, 8);
+ s->hdsp.put_pixels_tab [1][dxy](c->scratchpad + 8, s->last_picture.f.data[2] + offset, s->uvlinesize, 8);
 }
 
 dmin_sum += s->dsp.mb_cmp[1](s, s->new_picture.f.data[1] + s->mb_x*8 + s->mb_y*8*s->uvlinesize, c->scratchpad , s->uvlinesize, 8);
@@ -780,9 +780,9 @@
 dxy = ((my_i & 1) << 1) | (mx_i & 1);
 
 if(s->no_rounding){
- s->dsp.put_no_rnd_pixels_tab[size][dxy](c->scratchpad, ref , stride, h);
+ s->hdsp.put_no_rnd_pixels_tab[size][dxy](c->scratchpad, ref , stride, h);
 }else{
- s->dsp.put_pixels_tab [size][dxy](c->scratchpad, ref , stride, h);
+ s->hdsp.put_pixels_tab [size][dxy](c->scratchpad, ref , stride, h);
 }
 dmin= s->dsp.mb_cmp[size](s, c->src[block][0], c->scratchpad, stride, h);
 dmin+= (mv_penalty[mx_i-c->pred_x] + mv_penalty[my_i-c->pred_y] + 1)*c->mb_penalty_factor;
@@ -827,150 +827,24 @@
 }
 }
 
-static void clip_input_mv(MpegEncContext * s, int16_t *mv, int interlaced){
- int ymax= s->me.ymax>>interlaced;
- int ymin= s->me.ymin>>interlaced;
-
- if(mv[0] < s->me.xmin) mv[0] = s->me.xmin;
- if(mv[0] > s->me.xmax) mv[0] = s->me.xmax;
- if(mv[1] < ymin) mv[1] = ymin;
- if(mv[1] > ymax) mv[1] = ymax;
-}
-
-static inline int check_input_motion(MpegEncContext * s, int mb_x, int mb_y, int p_type){
- MotionEstContext * const c= &s->me;
- Picture *p= s->current_picture_ptr;
- int mb_xy= mb_x + mb_y*s->mb_stride;
- int xy= 2*mb_x + 2*mb_y*s->b8_stride;
- int mb_type= s->current_picture.f.mb_type[mb_xy];
- int flags= c->flags;
- int shift= (flags&FLAG_QPEL) + 1;
- int mask= (1<<shift)-1;
- int x, y, i;
- int d=0;
- me_cmp_func cmpf= s->dsp.sse[0];
- me_cmp_func chroma_cmpf= s->dsp.sse[1];
-
- if(p_type && USES_LIST(mb_type, 1)){
- av_log(c->avctx, AV_LOG_ERROR, "backward motion vector in P frame\n");
- return INT_MAX/2;
- }
- assert(IS_INTRA(mb_type) || USES_LIST(mb_type,0) || USES_LIST(mb_type,1));
-
- for(i=0; i<4; i++){
- int xy= s->block_index[i];
- clip_input_mv(s, p->f.motion_val[0][xy], !!IS_INTERLACED(mb_type));
- clip_input_mv(s, p->f.motion_val[1][xy], !!IS_INTERLACED(mb_type));
- }
-
- if(IS_INTERLACED(mb_type)){
- int xy2= xy + s->b8_stride;
- s->mb_type[mb_xy]=CANDIDATE_MB_TYPE_INTRA;
- c->stride<<=1;
- c->uvstride<<=1;
-
- if(!(s->flags & CODEC_FLAG_INTERLACED_ME)){
- av_log(c->avctx, AV_LOG_ERROR, "Interlaced macroblock selected but interlaced motion estimation disabled\n");
- return INT_MAX/2;
- }
-
- if(USES_LIST(mb_type, 0)){
- int field_select0= p->f.ref_index[0][4*mb_xy ];
- int field_select1= p->f.ref_index[0][4*mb_xy+2];
- assert(field_select0==0 ||field_select0==1);
- assert(field_select1==0 ||field_select1==1);
- init_interlaced_ref(s, 0);
-
- if(p_type){
- s->p_field_select_table[0][mb_xy]= field_select0;
- s->p_field_select_table[1][mb_xy]= field_select1;
- *(uint32_t*)s->p_field_mv_table[0][field_select0][mb_xy] = *(uint32_t*)p->f.motion_val[0][xy ];
- *(uint32_t*)s->p_field_mv_table[1][field_select1][mb_xy] = *(uint32_t*)p->f.motion_val[0][xy2];
- s->mb_type[mb_xy]=CANDIDATE_MB_TYPE_INTER_I;
- }else{
- s->b_field_select_table[0][0][mb_xy]= field_select0;
- s->b_field_select_table[0][1][mb_xy]= field_select1;
- *(uint32_t*)s->b_field_mv_table[0][0][field_select0][mb_xy] = *(uint32_t*)p->f.motion_val[0][xy ];
- *(uint32_t*)s->b_field_mv_table[0][1][field_select1][mb_xy] = *(uint32_t*)p->f.motion_val[0][xy2];
- s->mb_type[mb_xy]= CANDIDATE_MB_TYPE_FORWARD_I;
- }
-
- x = p->f.motion_val[0][xy ][0];
- y = p->f.motion_val[0][xy ][1];
- d = cmp(s, x>>shift, y>>shift, x&mask, y&mask, 0, 8, field_select0, 0, cmpf, chroma_cmpf, flags);
- x = p->f.motion_val[0][xy2][0];
- y = p->f.motion_val[0][xy2][1];
- d+= cmp(s, x>>shift, y>>shift, x&mask, y&mask, 0, 8, field_select1, 1, cmpf, chroma_cmpf, flags);
- }
- if(USES_LIST(mb_type, 1)){
- int field_select0 = p->f.ref_index[1][4 * mb_xy ];
- int field_select1 = p->f.ref_index[1][4 * mb_xy + 2];
- assert(field_select0==0 ||field_select0==1);
- assert(field_select1==0 ||field_select1==1);
- init_interlaced_ref(s, 2);
-
- s->b_field_select_table[1][0][mb_xy]= field_select0;
- s->b_field_select_table[1][1][mb_xy]= field_select1;
- *(uint32_t*)s->b_field_mv_table[1][0][field_select0][mb_xy] = *(uint32_t*)p->f.motion_val[1][xy ];
- *(uint32_t*)s->b_field_mv_table[1][1][field_select1][mb_xy] = *(uint32_t*)p->f.motion_val[1][xy2];
- if(USES_LIST(mb_type, 0)){
- s->mb_type[mb_xy]= CANDIDATE_MB_TYPE_BIDIR_I;
- }else{
- s->mb_type[mb_xy]= CANDIDATE_MB_TYPE_BACKWARD_I;
- }
-
- x = p->f.motion_val[1][xy ][0];
- y = p->f.motion_val[1][xy ][1];
- d = cmp(s, x>>shift, y>>shift, x&mask, y&mask, 0, 8, field_select0+2, 0, cmpf, chroma_cmpf, flags);
- x = p->f.motion_val[1][xy2][0];
- y = p->f.motion_val[1][xy2][1];
- d+= cmp(s, x>>shift, y>>shift, x&mask, y&mask, 0, 8, field_select1+2, 1, cmpf, chroma_cmpf, flags);
- //FIXME bidir scores
- }
- c->stride>>=1;
- c->uvstride>>=1;
- }else if(IS_8X8(mb_type)){
- if(!(s->flags & CODEC_FLAG_4MV)){
- av_log(c->avctx, AV_LOG_ERROR, "4MV macroblock selected but 4MV encoding disabled\n");
- return INT_MAX/2;
- }
- cmpf= s->dsp.sse[1];
- chroma_cmpf= s->dsp.sse[1];
- init_mv4_ref(c);
- for(i=0; i<4; i++){
- xy= s->block_index[i];
- x= p->f.motion_val[0][xy][0];
- y= p->f.motion_val[0][xy][1];
- d+= cmp(s, x>>shift, y>>shift, x&mask, y&mask, 1, 8, i, i, cmpf, chroma_cmpf, flags);
- }
- s->mb_type[mb_xy]=CANDIDATE_MB_TYPE_INTER4V;
- }else{
- if(USES_LIST(mb_type, 0)){
- if(p_type){
- *(uint32_t*)s->p_mv_table[mb_xy] = *(uint32_t*)p->f.motion_val[0][xy];
- s->mb_type[mb_xy]=CANDIDATE_MB_TYPE_INTER;
- }else if(USES_LIST(mb_type, 1)){
- *(uint32_t*)s->b_bidir_forw_mv_table[mb_xy] = *(uint32_t*)p->f.motion_val[0][xy];
- *(uint32_t*)s->b_bidir_back_mv_table[mb_xy] = *(uint32_t*)p->f.motion_val[1][xy];
- s->mb_type[mb_xy]=CANDIDATE_MB_TYPE_BIDIR;
- }else{
- *(uint32_t*)s->b_forw_mv_table[mb_xy] = *(uint32_t*)p->f.motion_val[0][xy];
- s->mb_type[mb_xy]=CANDIDATE_MB_TYPE_FORWARD;
- }
- x = p->f.motion_val[0][xy][0];
- y = p->f.motion_val[0][xy][1];
- d = cmp(s, x>>shift, y>>shift, x&mask, y&mask, 0, 16, 0, 0, cmpf, chroma_cmpf, flags);
- }else if(USES_LIST(mb_type, 1)){
- *(uint32_t*)s->b_back_mv_table[mb_xy] = *(uint32_t*)p->f.motion_val[1][xy];
- s->mb_type[mb_xy]=CANDIDATE_MB_TYPE_BACKWARD;
-
- x = p->f.motion_val[1][xy][0];
- y = p->f.motion_val[1][xy][1];
- d = cmp(s, x>>shift, y>>shift, x&mask, y&mask, 0, 16, 2, 0, cmpf, chroma_cmpf, flags);
- }else
- s->mb_type[mb_xy]=CANDIDATE_MB_TYPE_INTRA;
+static inline int get_penalty_factor(int lambda, int lambda2, int type){
+ switch(type&0xFF){
+ default:
+ case FF_CMP_SAD:
+ return lambda>>FF_LAMBDA_SHIFT;
+ case FF_CMP_DCT:
+ return (3*lambda)>>(FF_LAMBDA_SHIFT+1);
+ case FF_CMP_SATD:
+ case FF_CMP_DCT264:
+ return (2*lambda)>>FF_LAMBDA_SHIFT;
+ case FF_CMP_RD:
+ case FF_CMP_PSNR:
+ case FF_CMP_SSE:
+ case FF_CMP_NSSE:
+ return lambda2>>FF_LAMBDA_SHIFT;
+ case FF_CMP_BIT:
+ return 1;
 }
- return d;
 }
 
 void ff_estimate_p_frame_motion(MpegEncContext * s,
@@ -1009,21 +883,6 @@
 pic->mb_var [s->mb_stride * mb_y + mb_x] = (varc+128)>>8;
 c->mb_var_sum_temp += (varc+128)>>8;
 
- if(c->avctx->me_threshold){
- vard= check_input_motion(s, mb_x, mb_y, 1);
-
- if((vard+128)>>8 < c->avctx->me_threshold){
- int p_score= FFMIN(vard, varc-500+(s->lambda2>>FF_LAMBDA_SHIFT)*100);
- int i_score= varc-500+(s->lambda2>>FF_LAMBDA_SHIFT)*20;
- pic->mc_mb_var[s->mb_stride * mb_y + mb_x] = (vard+128)>>8;
- c->mc_mb_var_sum_temp += (vard+128)>>8;
- c->scene_change_score+= ff_sqrt(p_score) - ff_sqrt(i_score);
- return;
- }
- if((vard+128)>>8 < c->avctx->mb_threshold)
- mb_type= s->mb_type[mb_x + mb_y*s->mb_stride];
- }
-
 switch(s->me_method) {
 case ME_ZERO:
 default:
@@ -1037,16 +896,16 @@
 const int mot_stride = s->b8_stride;
 const int mot_xy = s->block_index[0];
 
- P_LEFT[0] = s->current_picture.f.motion_val[0][mot_xy - 1][0];
- P_LEFT[1] = s->current_picture.f.motion_val[0][mot_xy - 1][1];
+ P_LEFT[0] = s->current_picture.motion_val[0][mot_xy - 1][0];
+ P_LEFT[1] = s->current_picture.motion_val[0][mot_xy - 1][1];
 
 if(P_LEFT[0] > (c->xmax<<shift)) P_LEFT[0] = (c->xmax<<shift);
 
 if(!s->first_slice_line) {
- P_TOP[0] = s->current_picture.f.motion_val[0][mot_xy - mot_stride ][0];
- P_TOP[1] = s->current_picture.f.motion_val[0][mot_xy - mot_stride ][1];
- P_TOPRIGHT[0] = s->current_picture.f.motion_val[0][mot_xy - mot_stride + 2][0];
- P_TOPRIGHT[1] = s->current_picture.f.motion_val[0][mot_xy - mot_stride + 2][1];
+ P_TOP[0] = s->current_picture.motion_val[0][mot_xy - mot_stride ][0];
+ P_TOP[1] = s->current_picture.motion_val[0][mot_xy - mot_stride ][1];
+ P_TOPRIGHT[0] = s->current_picture.motion_val[0][mot_xy - mot_stride + 2][0];
+ P_TOPRIGHT[1] = s->current_picture.motion_val[0][mot_xy - mot_stride + 2][1];
 if(P_TOP[1] > (c->ymax<<shift)) P_TOP[1] = (c->ymax<<shift);
 if(P_TOPRIGHT[0] < (c->xmin<<shift)) P_TOPRIGHT[0]= (c->xmin<<shift);
 if(P_TOPRIGHT[1] > (c->ymax<<shift)) P_TOPRIGHT[1]= (c->ymax<<shift);
@@ -1078,7 +937,6 @@
 vard = s->dsp.sse[0](NULL, pix, ppix, s->linesize, 16);
 
 pic->mc_mb_var[s->mb_stride * mb_y + mb_x] = (vard+128)>>8;
-// pic->mb_cmp_score[s->mb_stride * mb_y + mb_x] = dmin;
 c->mc_mb_var_sum_temp += (vard+128)>>8;
 
 if(mb_type){
@@ -1157,7 +1015,6 @@
 }
 }
 
-// pic->mb_cmp_score[s->mb_stride * mb_y + mb_x] = dmin;
 set_p_mv_tables(s, mx, my, mb_type!=CANDIDATE_MB_TYPE_INTER4V);
 
 /* get intra luma score */
@@ -1180,9 +1037,9 @@
 
 if(intra_score < dmin){
 mb_type= CANDIDATE_MB_TYPE_INTRA;
- s->current_picture.f.mb_type[mb_y*s->mb_stride + mb_x] = CANDIDATE_MB_TYPE_INTRA; //FIXME cleanup
+ s->current_picture.mb_type[mb_y*s->mb_stride + mb_x] = CANDIDATE_MB_TYPE_INTRA; //FIXME cleanup
 }else
- s->current_picture.f.mb_type[mb_y*s->mb_stride + mb_x] = 0;
+ s->current_picture.mb_type[mb_y*s->mb_stride + mb_x] = 0;
 
 {
 int p_score= FFMIN(vard, varc-500+(s->lambda2>>FF_LAMBDA_SHIFT)*100);
@@ -1247,8 +1104,8 @@
 return dmin;
 }
 
-static int ff_estimate_motion_b(MpegEncContext * s,
- int mb_x, int mb_y, int16_t (*mv_table)[2], int ref_index, int f_code)
+static int estimate_motion_b(MpegEncContext *s, int mb_x, int mb_y,
+ int16_t (*mv_table)[2], int ref_index, int f_code)
 {
 MotionEstContext * const c= &s->me;
 int mx, my, dmin;
@@ -1362,14 +1219,14 @@
 src_y = motion_fy >> 1;
 
 ptr = ref_data[0] + (src_y * stride) + src_x;
- s->dsp.put_pixels_tab[size][dxy](dest_y , ptr , stride, h);
+ s->hdsp.put_pixels_tab[size][dxy](dest_y , ptr , stride, h);
 
 dxy = ((motion_by & 1) << 1) | (motion_bx & 1);
 src_x = motion_bx >> 1;
 src_y = motion_by >> 1;
 
 ptr = ref2_data[0] + (src_y * stride) + src_x;
- s->dsp.avg_pixels_tab[size][dxy](dest_y , ptr , stride, h);
+ s->hdsp.avg_pixels_tab[size][dxy](dest_y , ptr , stride, h);
 }
 
 fbmin = (mv_penalty_f[motion_fx-pred_fx] + mv_penalty_f[motion_fy-pred_fy])*c->mb_penalty_factor
@@ -1548,7 +1405,7 @@
 ymin= xmin=(-32)>>shift;
 ymax= xmax= 31>>shift;
 
- if (IS_8X8(s->next_picture.f.mb_type[mot_xy])) {
+ if (IS_8X8(s->next_picture.mb_type[mot_xy])) {
 s->mv_type= MV_TYPE_8X8;
 }else{
 s->mv_type= MV_TYPE_16X16;
@@ -1558,8 +1415,8 @@
 int index= s->block_index[i];
 int min, max;
 
- c->co_located_mv[i][0] = s->next_picture.f.motion_val[0][index][0];
- c->co_located_mv[i][1] = s->next_picture.f.motion_val[0][index][1];
+ c->co_located_mv[i][0] = s->next_picture.motion_val[0][index][0];
+ c->co_located_mv[i][1] = s->next_picture.motion_val[0][index][1];
 c->direct_basis_mv[i][0]= c->co_located_mv[i][0]*time_pb/time_pp + ((i& 1)<<(shift+3));
 c->direct_basis_mv[i][1]= c->co_located_mv[i][1]*time_pb/time_pp + ((i>>1)<<(shift+3));
 // c->direct_basis_mv[1][i][0]= c->co_located_mv[i][0]*(time_pb - time_pp)/time_pp + ((i &1)<<(shift+3);
@@ -1648,7 +1505,7 @@
 
 c->skip=0;
 
- if (s->codec_id == AV_CODEC_ID_MPEG4 && s->next_picture.f.mbskip_table[xy]) {
+ if (s->codec_id == AV_CODEC_ID_MPEG4 && s->next_picture.mbskip_table[xy]) {
 int score= direct_search(s, mb_x, mb_y); //FIXME just check 0,0
 
 score= ((unsigned)(score*score + 128*256))>>16;
@@ -1659,67 +1516,18 @@
 return;
 }
 
- if(c->avctx->me_threshold){
- int vard= check_input_motion(s, mb_x, mb_y, 0);
-
- if((vard+128)>>8 < c->avctx->me_threshold){
-// pix = c->src[0][0];
-// sum = s->dsp.pix_sum(pix, s->linesize);
-// varc = s->dsp.pix_norm1(pix, s->linesize) - (((unsigned)(sum*sum))>>8) + 500;
-
-// pic->mb_var [s->mb_stride * mb_y + mb_x] = (varc+128)>>8;
- s->current_picture.mc_mb_var[s->mb_stride * mb_y + mb_x] = (vard+128)>>8;
-/* pic->mb_mean [s->mb_stride * mb_y + mb_x] = (sum+128)>>8;
- c->mb_var_sum_temp += (varc+128)>>8;*/
- c->mc_mb_var_sum_temp += (vard+128)>>8;
-/* if (vard <= 64<<8 || vard < varc) {
- c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc);
- }else{
- c->scene_change_score+= s->qscale * s->avctx->scenechange_factor;
- }*/
- return;
- }
- if((vard+128)>>8 < c->avctx->mb_threshold){
- type= s->mb_type[mb_y*s->mb_stride + mb_x];
- if(type == CANDIDATE_MB_TYPE_DIRECT){
- direct_search(s, mb_x, mb_y);
- }
- if(type == CANDIDATE_MB_TYPE_FORWARD || type == CANDIDATE_MB_TYPE_BIDIR){
- c->skip=0;
- ff_estimate_motion_b(s, mb_x, mb_y, s->b_forw_mv_table, 0, s->f_code);
- }
- if(type == CANDIDATE_MB_TYPE_BACKWARD || type == CANDIDATE_MB_TYPE_BIDIR){
- c->skip=0;
- ff_estimate_motion_b(s, mb_x, mb_y, s->b_back_mv_table, 2, s->b_code);
- }
- if(type == CANDIDATE_MB_TYPE_FORWARD_I || type == CANDIDATE_MB_TYPE_BIDIR_I){
- c->skip=0;
- c->current_mv_penalty= c->mv_penalty[s->f_code] + MAX_MV;
- interlaced_search(s, 0,
- s->b_field_mv_table[0], s->b_field_select_table[0],
- s->b_forw_mv_table[xy][0], s->b_forw_mv_table[xy][1], 1);
- }
- if(type == CANDIDATE_MB_TYPE_BACKWARD_I || type == CANDIDATE_MB_TYPE_BIDIR_I){
- c->skip=0;
- c->current_mv_penalty= c->mv_penalty[s->b_code] + MAX_MV;
- interlaced_search(s, 2,
- s->b_field_mv_table[1], s->b_field_select_table[1],
- s->b_back_mv_table[xy][0], s->b_back_mv_table[xy][1], 1);
- }
- return;
- }
- }
-
 if (s->codec_id == AV_CODEC_ID_MPEG4)
 dmin= direct_search(s, mb_x, mb_y);
 else
 dmin= INT_MAX;
 //FIXME penalty stuff for non mpeg4
 c->skip=0;
- fmin= ff_estimate_motion_b(s, mb_x, mb_y, s->b_forw_mv_table, 0, s->f_code) + 3*penalty_factor;
+ fmin = estimate_motion_b(s, mb_x, mb_y, s->b_forw_mv_table, 0, s->f_code) +
+ 3 * penalty_factor;
 
 c->skip=0;
- bmin= ff_estimate_motion_b(s, mb_x, mb_y, s->b_back_mv_table, 2, s->b_code) + 2*penalty_factor;
+ bmin = estimate_motion_b(s, mb_x, mb_y, s->b_back_mv_table, 2, s->b_code) +
+ 2 * penalty_factor;
 av_dlog(s, " %d %d ", s->b_forw_mv_table[xy][0], s->b_forw_mv_table[xy][1]);
 
 c->skip=0;
@@ -1870,14 +1678,14 @@
 int block;
 for(block=0; block<4; block++){
 int off= (block& 1) + (block>>1)*wrap;
- int mx = s->current_picture.f.motion_val[0][ xy + off ][0];
- int my = s->current_picture.f.motion_val[0][ xy + off ][1];
+ int mx = s->current_picture.motion_val[0][ xy + off ][0];
+ int my = s->current_picture.motion_val[0][ xy + off ][1];
 
 if( mx >=range || mx <-range
 || my >=range || my <-range){
 s->mb_type[i] &= ~CANDIDATE_MB_TYPE_INTER4V;
 s->mb_type[i] |= CANDIDATE_MB_TYPE_INTRA;
- s->current_picture.f.mb_type[i] = CANDIDATE_MB_TYPE_INTRA;
+ s->current_picture.mb_type[i] = CANDIDATE_MB_TYPE_INTRA;
 }
 }
 }

libav-v9.6.tar.bz2/libavcodec/motionpixels.c -> libav-v10.1.tar.bz2/libavcodec/motionpixels.c Changed

@@ -22,6 +22,7 @@
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dsputil.h"
+#include "internal.h"
 
 #define MAX_HUFF_CODES 16
 
@@ -35,7 +36,7 @@
 
 typedef struct MotionPixelsContext {
 AVCodecContext *avctx;
- AVFrame frame;
+ AVFrame *frame;
 DSPContext dsp;
 uint8_t *changes_map;
 int offset_bits_len;
@@ -49,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;
@@ -63,6 +77,13 @@
 mp->vpt = av_mallocz(avctx->height * sizeof(YuvPixel));
 mp->hpt = av_mallocz(h4 * w4 / 16 * sizeof(YuvPixel));
 avctx->pix_fmt = AV_PIX_FMT_RGB555;
+
+ mp->frame = av_frame_alloc();
+ if (!mp->frame) {
+ mp_decode_end(avctx);
+ return AVERROR(ENOMEM);
+ }
+
 return 0;
 }
 
@@ -83,14 +104,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;
 }
 }
 }
@@ -142,7 +163,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];
 }
 
@@ -151,7 +172,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)
@@ -159,6 +180,7 @@
 int i;
 
 i = (mp->codes_count == 1) ? 0 : get_vlc2(gb, mp->vlc.table, mp->max_codes_bits, 1);
+ i = FFMIN(i, FF_ARRAY_ELEMS(mp->codes) - 1);
 return mp->codes[i].delta;
 }
 
@@ -244,13 +266,11 @@
 int buf_size = avpkt->size;
 MotionPixelsContext *mp = avctx->priv_data;
 GetBitContext gb;
- int i, count1, count2, sz;
+ int i, count1, count2, sz, ret;
 
- mp->frame.reference = 1;
- mp->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, &mp->frame)) {
+ if ((ret = ff_reget_buffer(avctx, mp->frame)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 /* le32 bitstream msb first */
@@ -276,7 +296,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;
 }
 mp_read_codes_table(mp, &gb);
@@ -295,27 +315,15 @@
 ff_free_vlc(&mp->vlc);
 
 end:
+ if ((ret = av_frame_ref(data, mp->frame)) < 0)
+ return ret;
 *got_frame = 1;
- *(AVFrame *)data = mp->frame;
 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);
- if (mp->frame.data[0])
- avctx->release_buffer(avctx, &mp->frame);
-
- return 0;
-}
-
 AVCodec ff_motionpixels_decoder = {
 .name = "motionpixels",
+ .long_name = NULL_IF_CONFIG_SMALL("Motion Pixels video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MOTIONPIXELS,
 .priv_data_size = sizeof(MotionPixelsContext),
@@ -323,5 +331,4 @@
 .close = mp_decode_end,
 .decode = mp_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Motion Pixels video"),
 };

libav-v9.6.tar.bz2/libavcodec/mpc.c -> libav-v10.1.tar.bz2/libavcodec/mpc.c Changed

libav-v9.6.tar.bz2/libavcodec/mpc.h -> libav-v10.1.tar.bz2/libavcodec/mpc.h Changed

libav-v9.6.tar.bz2/libavcodec/mpc7.c -> libav-v10.1.tar.bz2/libavcodec/mpc7.c Changed

@@ -26,6 +26,7 @@
 */
 
 #include "libavutil/channel_layout.h"
+#include "libavutil/internal.h"
 #include "libavutil/lfg.h"
 #include "avcodec.h"
 #include "get_bits.h"
@@ -64,8 +65,7 @@
 
 /* Musepack SV7 is always stereo */
 if (avctx->channels != 2) {
- av_log_ask_for_sample(avctx, "Unsupported number of channels: %d\n",
- avctx->channels);
+ avpriv_request_sample(avctx, "%d channels", avctx->channels);
 return AVERROR_PATCHWELCOME;
 }
 
@@ -138,9 +138,6 @@
 }
 vlc_initialized = 1;
 
- avcodec_get_frame_defaults(&c->frame);
- avctx->coded_frame = &c->frame;
-
 return 0;
 }
 
@@ -200,6 +197,7 @@
 static int mpc7_decode_frame(AVCodecContext * avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size;
 MPCContext *c = avctx->priv_data;
@@ -229,8 +227,8 @@
 buf_size -= 4;
 
 /* get output buffer */
- c->frame.nb_samples = last_frame ? c->lastframelen : MPC_FRAME_SIZE;
- if ((ret = ff_get_buffer(avctx, &c->frame)) < 0) {
+ frame->nb_samples = last_frame ? c->lastframelen : MPC_FRAME_SIZE;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -294,7 +292,7 @@
 for(ch = 0; ch < 2; ch++)
 idx_to_quant(c, &gb, bands[i].res[ch], c->Q[ch] + off);
 
- ff_mpc_dequantize_and_synth(c, mb, (int16_t **)c->frame.extended_data, 2);
+ ff_mpc_dequantize_and_synth(c, mb, (int16_t **)frame->extended_data, 2);
 
 bits_used = get_bits_count(&gb);
 bits_avail = buf_size * 8;
@@ -308,8 +306,7 @@
 return avpkt->size;
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = c->frame;
+ *got_frame_ptr = 1;
 
 return avpkt->size;
 }
@@ -332,6 +329,7 @@
 
 AVCodec ff_mpc7_decoder = {
 .name = "mpc7",
+ .long_name = NULL_IF_CONFIG_SMALL("Musepack SV7"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_MUSEPACK7,
 .priv_data_size = sizeof(MPCContext),
@@ -340,7 +338,6 @@
 .decode = mpc7_decode_frame,
 .flush = mpc7_decode_flush,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Musepack SV7"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
 AV_SAMPLE_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/mpc8.c -> libav-v10.1.tar.bz2/libavcodec/mpc8.c Changed

@@ -130,7 +130,7 @@
 c->maxbands = get_bits(&gb, 5) + 1;
 channels = get_bits(&gb, 4) + 1;
 if (channels > 2) {
- av_log_missing_feature(avctx, "Multichannel MPC SV8", 1);
+ avpriv_request_sample(avctx, "Multichannel MPC SV8");
 return AVERROR_PATCHWELCOME;
 }
 c->MSS = get_bits1(&gb);
@@ -230,15 +230,13 @@
 }
 vlc_initialized = 1;
 
- avcodec_get_frame_defaults(&c->frame);
- avctx->coded_frame = &c->frame;
-
 return 0;
 }
 
 static int mpc8_decode_frame(AVCodecContext * avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 MPCContext *c = avctx->priv_data;
@@ -250,8 +248,8 @@
 int last[2];
 
 /* get output buffer */
- c->frame.nb_samples = MPC_FRAME_SIZE;
- if ((res = ff_get_buffer(avctx, &c->frame)) < 0) {
+ frame->nb_samples = MPC_FRAME_SIZE;
+ if ((res = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return res;
 }
@@ -407,7 +405,7 @@
 }
 
 ff_mpc_dequantize_and_synth(c, maxband - 1,
- (int16_t **)c->frame.extended_data,
+ (int16_t **)frame->extended_data,
 avctx->channels);
 
 c->cur_frame++;
@@ -418,8 +416,7 @@
 if(c->cur_frame >= c->frames)
 c->cur_frame = 0;
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = c->frame;
+ *got_frame_ptr = 1;
 
 return c->cur_frame ? c->last_bits_used >> 3 : buf_size;
 }
@@ -432,6 +429,7 @@
 
 AVCodec ff_mpc8_decoder = {
 .name = "mpc8",
+ .long_name = NULL_IF_CONFIG_SMALL("Musepack SV8"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_MUSEPACK8,
 .priv_data_size = sizeof(MPCContext),
@@ -439,7 +437,6 @@
 .decode = mpc8_decode_frame,
 .flush = mpc8_decode_flush,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Musepack SV8"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
 AV_SAMPLE_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/mpeg12.c -> libav-v10.1.tar.bz2/libavcodec/mpeg12.c Changed

@@ -25,572 +25,42 @@
 * MPEG-1/2 decoder
 */
 
-//#define DEBUG
+#include "libavutil/attributes.h"
 #include "internal.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"
-
+#include "error_resilience.h"
 #include "mpeg12.h"
 #include "mpeg12data.h"
-#include "mpeg12decdata.h"
 #include "bytestream.h"
-#include "vdpau_internal.h"
-#include "xvmc_internal.h"
 #include "thread.h"
 
-//#undef NDEBUG
-//#include <assert.h>
-
-
-#define MV_VLC_BITS 9
-#define MBINCR_VLC_BITS 9
-#define MB_PAT_VLC_BITS 9
-#define MB_PTYPE_VLC_BITS 6
-#define MB_BTYPE_VLC_BITS 6
-
-static VLC mv_vlc;
-
-/* as H.263, but only 17 codes */
-static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred)
-{
- int code, sign, val, shift;
-
- code = get_vlc2(&s->gb, mv_vlc.table, MV_VLC_BITS, 2);
- if (code == 0) {
- return pred;
- }
- if (code < 0) {
- return 0xffff;
- }
-
- sign = get_bits1(&s->gb);
- shift = fcode - 1;
- val = code;
- if (shift) {
- val = (val - 1) << shift;
- val |= get_bits(&s->gb, shift);
- val++;
- }
- if (sign)
- val = -val;
- val += pred;
-
- /* modulo decoding */
- return sign_extend(val, 5 + shift);
-}
-
-static inline int mpeg1_decode_block_intra(MpegEncContext *s, DCTELEM *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;
- const uint16_t *quant_matrix = s->intra_matrix;
- const int qscale = s->qscale;
-
- /* DC coefficient */
- component = (n <= 3 ? 0 : n - 4 + 1);
- diff = decode_dc(&s->gb, component);
- if (diff >= 0xffff)
- return -1;
- dc = s->last_dc[component];
- dc += diff;
- s->last_dc[component] = dc;
- block[0] = dc * quant_matrix[0];
- av_dlog(s->avctx, "dc=%d diff=%d\n", dc, diff);
- i = 0;
- {
- OPEN_READER(re, &s->gb);
- /* 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);
-
- if (level == 127) {
- break;
- } else if (level != 0) {
- i += run;
- 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);
- } else {
- /* escape */
- 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);
- if (level == -128) {
- level = SHOW_UBITS(re, &s->gb, 8) - 256; LAST_SKIP_BITS(re, &s->gb, 8);
- } else if (level == 0) {
- level = SHOW_UBITS(re, &s->gb, 8) ; LAST_SKIP_BITS(re, &s->gb, 8);
- }
- i += run;
- j = scantable[i];
- if (level < 0) {
- level = -level;
- level = (level * qscale * quant_matrix[j]) >> 4;
- level = (level - 1) | 1;
- level = -level;
- } else {
- level = (level * qscale * quant_matrix[j]) >> 4;
- 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;
- }
- CLOSE_READER(re, &s->gb);
- }
- s->block_last_index[n] = i;
- return 0;
-}
-
-int ff_mpeg1_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n)
-{
- return mpeg1_decode_block_intra(s, block, n);
-}
-
-static inline int mpeg1_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n)
-{
- int level, i, j, run;
- 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;
-
- {
- 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) {
- level = (3 * qscale * quant_matrix[0]) >> 5;
- level = (level - 1) | 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)
- 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);
-
- if (level != 0) {
- i += run;
- 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);
- SKIP_BITS(re, &s->gb, 1);
- } else {
- /* escape */
- 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);
- if (level == -128) {
- 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);
- }
- i += run;
- j = scantable[i];
- if (level < 0) {
- level = -level;
- level = ((level * 2 + 1) * qscale * quant_matrix[j]) >> 5;
- level = (level - 1) | 1;
- level = -level;
- } else {
- level = ((level * 2 + 1) * qscale * quant_matrix[j]) >> 5;
- 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;
-}
-
-static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *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;
-
- {
- 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) {
- level = (3 * qscale) >> 1;
- level = (level - 1) | 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)
- 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);
-
- if (level != 0) {
- i += run;
- 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);
- SKIP_BITS(re, &s->gb, 1);
- } else {
- /* escape */
- 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);
- if (level == -128) {
- 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);
- }
- i += run;
- j = scantable[i];
- if (level < 0) {
- level = -level;
- level = ((level * 2 + 1) * qscale) >> 1;
- level = (level - 1) | 1;
- level = -level;
- } else {
- level = ((level * 2 + 1) * qscale) >> 1;
- level = (level - 1) | 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;
-}
-
-
-static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n)
-{
- int level, i, j, run;
- RLTable *rl = &ff_rl_mpeg1;
- uint8_t * const scantable = s->intra_scantable.permutated;
- const uint16_t *quant_matrix;
- const int qscale = s->qscale;
- int mismatch;
-
- mismatch = 1;
-
- {
- OPEN_READER(re, &s->gb);
- i = -1;
- if (n < 4)
- quant_matrix = s->inter_matrix;
- else
- quant_matrix = s->chroma_inter_matrix;
-
- // 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 (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)
- 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);
-
- if (level != 0) {
- i += run;
- 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);
- SKIP_BITS(re, &s->gb, 1);
- } else {
- /* escape */
- 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);
-
- i += run;
- j = scantable[i];
- if (level < 0) {
- level = ((-level * 2 + 1) * qscale * quant_matrix[j]) >> 5;
- level = -level;
- } else {
- 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)
- break;
- UPDATE_CACHE(re, &s->gb);
- }
-end:
- LAST_SKIP_BITS(re, &s->gb, 2);
- CLOSE_READER(re, &s->gb);
- }
- block[63] ^= (mismatch & 1);
-
- s->block_last_index[n] = i;
- return 0;
-}
-
-static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s,
- DCTELEM *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;
- 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) {
- 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)
- 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);
-
- if (level != 0) {
- i += run;
- j = scantable[i];
- level = ((level * 2 + 1) * qscale) >> 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);
- UPDATE_CACHE(re, &s->gb);
- level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12);
-
- i += run;
- j = scantable[i];
- if (level < 0) {
- level = ((-level * 2 + 1) * qscale) >> 1;
- level = -level;
- } else {
- level = ((level * 2 + 1) * qscale) >> 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;
-}
-
-
-static inline int mpeg2_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n)
-{
- int level, dc, diff, i, j, run;
- int component;
- RLTable *rl;
- uint8_t * const scantable = s->intra_scantable.permutated;
- const uint16_t *quant_matrix;
- const int qscale = s->qscale;
- int mismatch;
-
- /* DC coefficient */
- if (n < 4) {
- quant_matrix = s->intra_matrix;
- component = 0;
- } else {
- quant_matrix = s->chroma_intra_matrix;
- component = (n & 1) + 1;
- }
- diff = decode_dc(&s->gb, component);
- if (diff >= 0xffff)
- return -1;
- dc = s->last_dc[component];
- dc += diff;
- s->last_dc[component] = dc;
- block[0] = dc << (3 - s->intra_dc_precision);
- av_dlog(s->avctx, "dc=%d\n", block[0]);
- mismatch = block[0] ^ 1;
- i = 0;
- if (s->intra_vlc_format)
- rl = &ff_rl_mpeg2;
- else
- rl = &ff_rl_mpeg1;
-
- {
- OPEN_READER(re, &s->gb);
- /* 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);
-
- if (level == 127) {
- break;
- } else if (level != 0) {
- 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);
- LAST_SKIP_BITS(re, &s->gb, 1);
- } else {
- /* escape */
- 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);
- i += run;
- j = scantable[i];
- if (level < 0) {
- level = (-level * qscale * quant_matrix[j]) >> 4;
- level = -level;
- } else {
- 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;
- }
- CLOSE_READER(re, &s->gb);
- }
- block[63] ^= mismatch & 1;
-
- s->block_last_index[n] = i;
- return 0;
-}
-
-static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n)
-{
- int level, dc, diff, j, run;
- int component;
- RLTable *rl;
- uint8_t * 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;
- } else {
- quant_matrix = s->chroma_intra_matrix;
- component = (n & 1) + 1;
- }
- diff = decode_dc(&s->gb, component);
- if (diff >= 0xffff)
- return -1;
- dc = s->last_dc[component];
- dc += diff;
- s->last_dc[component] = dc;
- block[0] = dc << (3 - s->intra_dc_precision);
- if (s->intra_vlc_format)
- rl = &ff_rl_mpeg2;
- else
- rl = &ff_rl_mpeg1;
-
- {
- OPEN_READER(re, &s->gb);
- /* 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);
-
- if (level == 127) {
- break;
- } else if (level != 0) {
- scantable += run;
- j = *scantable;
- level = (level * qscale * quant_matrix[j]) >> 4;
- 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);
- UPDATE_CACHE(re, &s->gb);
- level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12);
- scantable += run;
- j = *scantable;
- if (level < 0) {
- level = (-level * qscale * quant_matrix[j]) >> 4;
- level = -level;
- } else {
- level = (level * qscale * quant_matrix[j]) >> 4;
- }
- }
-
- block[j] = level;
- }
- CLOSE_READER(re, &s->gb);
- }
+uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
 
- s->block_last_index[n] = scantable - s->intra_scantable.permutated;
- return 0;
-}
+static const uint8_t table_mb_ptype[7][2] = {
+ { 3, 5 }, // 0x01 MB_INTRA
+ { 1, 2 }, // 0x02 MB_PAT
+ { 1, 3 }, // 0x08 MB_FOR
+ { 1, 1 }, // 0x0A MB_FOR|MB_PAT
+ { 1, 6 }, // 0x11 MB_QUANT|MB_INTRA
+ { 1, 5 }, // 0x12 MB_QUANT|MB_PAT
+ { 2, 5 }, // 0x1A MB_QUANT|MB_FOR|MB_PAT
+};
 
-uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
+static const uint8_t table_mb_btype[11][2] = {
+ { 3, 5 }, // 0x01 MB_INTRA
+ { 2, 3 }, // 0x04 MB_BACK
+ { 3, 3 }, // 0x06 MB_BACK|MB_PAT
+ { 2, 4 }, // 0x08 MB_FOR
+ { 3, 4 }, // 0x0A MB_FOR|MB_PAT
+ { 2, 2 }, // 0x0C MB_FOR|MB_BACK
+ { 3, 2 }, // 0x0E MB_FOR|MB_BACK|MB_PAT
+ { 1, 6 }, // 0x11 MB_QUANT|MB_INTRA
+ { 2, 6 }, // 0x16 MB_QUANT|MB_BACK|MB_PAT
+ { 3, 6 }, // 0x1A MB_QUANT|MB_FOR|MB_PAT
+ { 2, 5 }, // 0x1E MB_QUANT|MB_FOR|MB_BACK|MB_PAT
+};
 
 #define INIT_2D_VLC_RL(rl, static_size)\
 {\
@@ -603,7 +73,7 @@
 init_2d_vlc_rl(&rl);\
 }
 
-static void init_2d_vlc_rl(RLTable *rl)
+static av_cold void init_2d_vlc_rl(RLTable *rl)
 {
 int i;
 
@@ -636,7 +106,7 @@
 }
 }
 
-void ff_mpeg12_common_init(MpegEncContext *s)
+av_cold void ff_mpeg12_common_init(MpegEncContext *s)
 {
 
 s->y_dc_scale_table =
@@ -656,13 +126,15 @@
 /******************************************/
 /* decoding */
 
+VLC ff_mv_vlc;
+
 VLC ff_dc_lum_vlc;
 VLC ff_dc_chroma_vlc;
 
-static VLC mbincr_vlc;
-static VLC mb_ptype_vlc;
-static VLC mb_btype_vlc;
-static VLC mb_pat_vlc;
+VLC ff_mbincr_vlc;
+VLC ff_mb_ptype_vlc;
+VLC ff_mb_btype_vlc;
+VLC ff_mb_pat_vlc;
 
 av_cold void ff_mpeg12_init_vlcs(void)
 {
@@ -677,20 +149,20 @@
 INIT_VLC_STATIC(&ff_dc_chroma_vlc, DC_VLC_BITS, 12,
 ff_mpeg12_vlc_dc_chroma_bits, 1, 1,
 ff_mpeg12_vlc_dc_chroma_code, 2, 2, 514);
- INIT_VLC_STATIC(&mv_vlc, MV_VLC_BITS, 17,
+ INIT_VLC_STATIC(&ff_mv_vlc, MV_VLC_BITS, 17,
 &ff_mpeg12_mbMotionVectorTable[0][1], 2, 1,
 &ff_mpeg12_mbMotionVectorTable[0][0], 2, 1, 518);
- INIT_VLC_STATIC(&mbincr_vlc, MBINCR_VLC_BITS, 36,
+ INIT_VLC_STATIC(&ff_mbincr_vlc, MBINCR_VLC_BITS, 36,
 &ff_mpeg12_mbAddrIncrTable[0][1], 2, 1,
 &ff_mpeg12_mbAddrIncrTable[0][0], 2, 1, 538);
- INIT_VLC_STATIC(&mb_pat_vlc, MB_PAT_VLC_BITS, 64,
+ INIT_VLC_STATIC(&ff_mb_pat_vlc, MB_PAT_VLC_BITS, 64,
 &ff_mpeg12_mbPatTable[0][1], 2, 1,
 &ff_mpeg12_mbPatTable[0][0], 2, 1, 512);
 
- INIT_VLC_STATIC(&mb_ptype_vlc, MB_PTYPE_VLC_BITS, 7,
+ INIT_VLC_STATIC(&ff_mb_ptype_vlc, MB_PTYPE_VLC_BITS, 7,
 &table_mb_ptype[0][1], 2, 1,
 &table_mb_ptype[0][0], 2, 1, 64);
- INIT_VLC_STATIC(&mb_btype_vlc, MB_BTYPE_VLC_BITS, 11,
+ INIT_VLC_STATIC(&ff_mb_btype_vlc, MB_BTYPE_VLC_BITS, 11,
 &table_mb_btype[0][1], 2, 1,
 &table_mb_btype[0][0], 2, 1, 64);
 ff_init_rl(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]);
@@ -701,1898 +173,66 @@
 }
 }
 
-static inline int get_dmv(MpegEncContext *s)
-{
- if (get_bits1(&s->gb))
- return 1 - (get_bits1(&s->gb) << 1);
- else
- return 0;
-}
-
-static inline int get_qscale(MpegEncContext *s)
-{
- int qscale = get_bits(&s->gb, 5);
- if (s->q_scale_type) {
- return non_linear_qscale[qscale];
- } else {
- return qscale << 1;
- }
-}
-
-static void exchange_uv(MpegEncContext *s)
-{
- DCTELEM (*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
-#define MT_FRAME 2
-#define MT_16X8 2
-#define MT_DMV 3
-
-static int mpeg_decode_mb(MpegEncContext *s, DCTELEM block[12][64])
+/**
+ * Find the end of the current frame in the bitstream.
+ * @return the position of the first byte of the next frame, or -1
+ */
+int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s)
 {
- int i, j, k, cbp, val, mb_type, motion_type;
- const int mb_block_count = 4 + (1 << s->chroma_format);
-
- av_dlog(s->avctx, "decode_mb: x=%d y=%d\n", s->mb_x, s->mb_y);
-
- assert(s->mb_skipped == 0);
-
- if (s->mb_skip_run-- != 0) {
- if (s->pict_type == AV_PICTURE_TYPE_P) {
- s->mb_skipped = 1;
- s->current_picture.f.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.f.mb_type[s->mb_x + s->mb_y * s->mb_stride - 1];
- else
- mb_type = s->current_picture.f.mb_type[s->mb_width + (s->mb_y - 1) * s->mb_stride - 1]; // FIXME not sure if this is allowed in MPEG at all
- if (IS_INTRA(mb_type))
- return -1;
- s->current_picture.f.mb_type[s->mb_x + s->mb_y*s->mb_stride] =
- mb_type | MB_TYPE_SKIP;
-// assert(s->current_picture.f.mb_type[s->mb_x + s->mb_y * s->mb_stride - 1] & (MB_TYPE_16x16 | MB_TYPE_16x8));
-
- if ((s->mv[0][0][0] | s->mv[0][0][1] | s->mv[1][0][0] | s->mv[1][0][1]) == 0)
- s->mb_skipped = 1;
- }
+ int i;
+ uint32_t state = pc->state;
 
+ /* EOF considered as end of frame */
+ if (buf_size == 0)
 return 0;
- }
-
- switch (s->pict_type) {
- default:
- 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);
- return -1;
- }
- mb_type = MB_TYPE_QUANT | MB_TYPE_INTRA;
- } else {
- mb_type = MB_TYPE_INTRA;
- }
- break;
- case AV_PICTURE_TYPE_P:
- mb_type = get_vlc2(&s->gb, 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);
- return -1;
- }
- mb_type = ptype2mb_type[mb_type];
- break;
- case AV_PICTURE_TYPE_B:
- mb_type = get_vlc2(&s->gb, 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);
- return -1;
- }
- mb_type = btype2mb_type[mb_type];
- break;
- }
- av_dlog(s->avctx, "mb_type=%x\n", mb_type);
-// motion_type = 0; /* avoid warning */
- if (IS_INTRA(mb_type)) {
- s->dsp.clear_blocks(s->block[0]);
-
- 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) {
- s->interlaced_dct = get_bits1(&s->gb);
- }
-
- if (IS_QUANT(mb_type))
- s->qscale = get_qscale(s);
-
- if (s->concealment_motion_vectors) {
- /* just parse them */
- if (s->picture_structure != PICT_FRAME)
- 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]);
 
- skip_bits1(&s->gb); /* marker */
- } else
- memset(s->last_mv, 0, sizeof(s->last_mv)); /* reset mv prediction */
- s->mb_intra = 1;
- // if 1, we memcpy blocks in xvmcvideo
- if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1) {
- 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++) {
- mpeg2_fast_decode_block_intra(s, *s->pblocks[i], i);
- }
- } else {
- 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++) {
- if (mpeg1_decode_block_intra(s, *s->pblocks[i], i) < 0)
- return -1;
- }
- }
- } else {
- if (mb_type & MB_TYPE_ZERO_MV) {
- assert(mb_type & MB_TYPE_CBP);
+/*
+ 0 frame start -> 1/4
+ 1 first_SEQEXT -> 0/2
+ 2 first field start -> 3/0
+ 3 second_SEQEXT -> 2/0
+ 4 searching end
+*/
 
- s->mv_dir = MV_DIR_FORWARD;
- if (s->picture_structure == PICT_FRAME) {
- if (!s->frame_pred_frame_dct)
- 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->field_select[0][0] = s->picture_structure - 1;
+ for (i = 0; i < buf_size; i++) {
+ assert(pc->frame_start_found >= 0 && pc->frame_start_found <= 4);
+ if (pc->frame_start_found & 1) {
+ if (state == EXT_START_CODE && (buf[i] & 0xF0) != 0x80)
+ pc->frame_start_found--;
+ else if (state == EXT_START_CODE + 2) {
+ if ((buf[i] & 3) == 3)
+ pc->frame_start_found = 0;
+ else
+ pc->frame_start_found = (pc->frame_start_found + 1) & 3;
 }
-
- if (IS_QUANT(mb_type))
- s->qscale = get_qscale(s);
-
- s->last_mv[0][0][0] = 0;
- 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;
+ state++;
 } else {
- assert(mb_type & MB_TYPE_L0L1);
- // FIXME decide if MBs in field pictures are MB_TYPE_INTERLACED
- /* get additional motion vector type */
- if (s->frame_pred_frame_dct)
- motion_type = MT_FRAME;
- 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);
- }
-
- if (IS_QUANT(mb_type))
- s->qscale = get_qscale(s);
-
- /* motion vectors */
- s->mv_dir = (mb_type >> 13) & 3;
- av_dlog(s->avctx, "motion_type=%d\n", motion_type);
- switch (motion_type) {
- case MT_FRAME: /* or MT_16X8 */
- if (s->picture_structure == PICT_FRAME) {
- 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]);
- /* full_pel: only for MPEG-1 */
- if (s->full_pel[i]) {
- s->mv[i][0][0] <<= 1;
- s->mv[i][0][1] <<= 1;
- }
- }
- }
- } else {
- 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)) {
- /* MT_16X8 */
- for (j = 0; j < 2; j++) {
- s->field_select[i][j] = get_bits1(&s->gb);
- for (k = 0; k < 2; k++) {
- val = mpeg_decode_motion(s, s->mpeg_f_code[i][k],
- s->last_mv[i][j][k]);
- s->last_mv[i][j][k] = val;
- s->mv[i][j][k] = val;
- }
- }
- }
- }
- }
- break;
- case MT_FIELD:
- s->mv_type = MV_TYPE_FIELD;
- if (s->picture_structure == PICT_FRAME) {
- mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED;
- for (i = 0; i < 2; i++) {
- if (USES_LIST(mb_type, i)) {
- for (j = 0; j < 2; j++) {
- s->field_select[i][j] = get_bits1(&s->gb);
- val = mpeg_decode_motion(s, s->mpeg_f_code[i][0],
- s->last_mv[i][j][0]);
- s->last_mv[i][j][0] = val;
- s->mv[i][j][0] = val;
- av_dlog(s->avctx, "fmx=%d\n", val);
- val = mpeg_decode_motion(s, s->mpeg_f_code[i][1],
- s->last_mv[i][j][1] >> 1);
- s->last_mv[i][j][1] = val << 1;
- s->mv[i][j][1] = val;
- av_dlog(s->avctx, "fmy=%d\n", val);
- }
- }
- }
- } else {
- mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED;
- for (i = 0; i < 2; i++) {
- if (USES_LIST(mb_type, i)) {
- s->field_select[i][0] = get_bits1(&s->gb);
- for (k = 0; k < 2; k++) {
- val = mpeg_decode_motion(s, s->mpeg_f_code[i][k],
- s->last_mv[i][0][k]);
- s->last_mv[i][0][k] = val;
- s->last_mv[i][1][k] = val;
- s->mv[i][0][k] = val;
- }
- }
- }
- }
- break;
- case MT_DMV:
- s->mv_type = MV_TYPE_DMV;
- for (i = 0; i < 2; i++) {
- if (USES_LIST(mb_type, i)) {
- int dmx, dmy, mx, my, m;
- const int my_shift = s->picture_structure == PICT_FRAME;
-
- mx = mpeg_decode_motion(s, s->mpeg_f_code[i][0],
- s->last_mv[i][0][0]);
- s->last_mv[i][0][0] = mx;
- s->last_mv[i][1][0] = mx;
- dmx = get_dmv(s);
- my = mpeg_decode_motion(s, s->mpeg_f_code[i][1],
- s->last_mv[i][0][1] >> my_shift);
- dmy = get_dmv(s);
-
-
- s->last_mv[i][0][1] = my << my_shift;
- s->last_mv[i][1][1] = my << my_shift;
-
- s->mv[i][0][0] = mx;
- s->mv[i][0][1] = my;
- s->mv[i][1][0] = mx; // not used
- s->mv[i][1][1] = my; // not used
-
- if (s->picture_structure == PICT_FRAME) {
- mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED;
-
- // m = 1 + 2 * s->top_field_first;
- m = s->top_field_first ? 1 : 3;
-
- /* top -> top pred */
- s->mv[i][2][0] = ((mx * m + (mx > 0)) >> 1) + dmx;
- s->mv[i][2][1] = ((my * m + (my > 0)) >> 1) + dmy - 1;
- m = 4 - m;
- s->mv[i][3][0] = ((mx * m + (mx > 0)) >> 1) + dmx;
- s->mv[i][3][1] = ((my * m + (my > 0)) >> 1) + dmy + 1;
- } else {
- mb_type |= MB_TYPE_16x16;
-
- s->mv[i][2][0] = ((mx + (mx > 0)) >> 1) + dmx;
- s->mv[i][2][1] = ((my + (my > 0)) >> 1) + dmy;
- if (s->picture_structure == PICT_TOP_FIELD)
- s->mv[i][2][1]--;
- else
- s->mv[i][2][1]++;
- }
- }
- }
- break;
- default:
- av_log(s->avctx, AV_LOG_ERROR, "00 motion_type at %d %d\n", s->mb_x, s->mb_y);
- return -1;
- }
- }
-
- s->mb_intra = 0;
- if (HAS_CBP(mb_type)) {
- s->dsp.clear_blocks(s->block[0]);
-
- cbp = get_vlc2(&s->gb, 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]);
+ i = avpriv_find_start_code(buf + i, buf + buf_size, &state) - buf - 1;
+ if (pc->frame_start_found == 0 && state >= SLICE_MIN_START_CODE && state <= SLICE_MAX_START_CODE) {
+ i++;
+ pc->frame_start_found = 4;
 }
- if (cbp <= 0) {
- av_log(s->avctx, AV_LOG_ERROR, "invalid cbp at %d %d\n", s->mb_x, s->mb_y);
- return -1;
+ if (state == SEQ_END_CODE) {
+ pc->frame_start_found = 0;
+ pc->state=-1;
+ return i+1;
 }
-
- //if 1, we memcpy blocks in xvmcvideo
- if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1) {
- ff_xvmc_pack_pblocks(s, cbp);
- if (s->swap_uv) {
- exchange_uv(s);
+ if (pc->frame_start_found == 2 && state == SEQ_START_CODE)
+ pc->frame_start_found = 0;
+ if (pc->frame_start_found < 4 && state == EXT_START_CODE)
+ pc->frame_start_found++;
+ if (pc->frame_start_found == 4 && (state & 0xFFFFFF00) == 0x100) {
+ if (state < SLICE_MIN_START_CODE || state > SLICE_MAX_START_CODE) {
+ pc->frame_start_found = 0;
+ pc->state = -1;
+ return i - 3;
 }
 }
-
- if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
- if (s->flags2 & CODEC_FLAG2_FAST) {
- for (i = 0; i < 6; i++) {
- if (cbp & 32) {
- mpeg2_fast_decode_block_non_intra(s, *s->pblocks[i], i);
- } else {
- s->block_last_index[i] = -1;
- }
- cbp += cbp;
- }
- } else {
- cbp <<= 12-mb_block_count;
-
- for (i = 0; i < mb_block_count; i++) {
- if (cbp & (1 << 11)) {
- if (mpeg2_decode_block_non_intra(s, *s->pblocks[i], i) < 0)
- return -1;
- } else {
- s->block_last_index[i] = -1;
- }
- cbp += cbp;
- }
- }
- } else {
- if (s->flags2 & CODEC_FLAG2_FAST) {
- for (i = 0; i < 6; i++) {
- if (cbp & 32) {
- mpeg1_fast_decode_block_inter(s, *s->pblocks[i], i);
- } else {
- s->block_last_index[i] = -1;
- }
- cbp += cbp;
- }
- } else {
- for (i = 0; i < 6; i++) {
- if (cbp & 32) {
- if (mpeg1_decode_block_inter(s, *s->pblocks[i], i) < 0)
- return -1;
- } else {
- s->block_last_index[i] = -1;
- }
- cbp += cbp;
- }
- }
+ if (pc->frame_start_found == 0 && s && state == PICTURE_START_CODE) {
+ ff_fetch_timestamp(s, i - 3, 1);
 }
- } else {
- for (i = 0; i < 12; i++)
- s->block_last_index[i] = -1;
 }
 }
-
- s->current_picture.f.mb_type[s->mb_x + s->mb_y * s->mb_stride] = mb_type;
-
- return 0;
-}
-
-static av_cold int mpeg_decode_init(AVCodecContext *avctx)
-{
- 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;
-
- ff_MPV_decode_defaults(s2);
-
- s->mpeg_enc_ctx.avctx = avctx;
- s->mpeg_enc_ctx.flags = avctx->flags;
- s->mpeg_enc_ctx.flags2 = avctx->flags2;
- ff_mpeg12_common_init(&s->mpeg_enc_ctx);
- ff_mpeg12_init_vlcs();
-
- s->mpeg_enc_ctx_allocated = 0;
- 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;
- if (avctx->codec->id == AV_CODEC_ID_MPEG1VIDEO)
- avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
- else
- avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
- return 0;
+ pc->state = state;
+ return END_NOT_FOUND;
 }
-
-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)
- return 0;
-
- err = ff_mpeg_update_thread_context(avctx, avctx_from);
- if (err) return err;
-
- if (!ctx->mpeg_enc_ctx_allocated)
- memcpy(s + 1, s1 + 1, sizeof(Mpeg1Context) - sizeof(MpegEncContext));
-
- if (!(s->pict_type == AV_PICTURE_TYPE_B || s->low_delay))
- s->picture_number++;
-
- return 0;
-}
-
-static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm,
- const uint8_t *new_perm)
-{
- uint16_t temp_matrix[64];
- int i;
-
- memcpy(temp_matrix, matrix, 64 * sizeof(uint16_t));
-
- for (i = 0; i < 64; i++) {
- matrix[new_perm[i]] = temp_matrix[old_perm[i]];
- }
-}
-
-static const enum AVPixelFormat pixfmt_xvmc_mpg2_420[] = {
- AV_PIX_FMT_XVMC_MPEG2_IDCT,
- AV_PIX_FMT_XVMC_MPEG2_MC,
- AV_PIX_FMT_NONE };
-
-static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx)
-{
- Mpeg1Context *s1 = avctx->priv_data;
- MpegEncContext *s = &s1->mpeg_enc_ctx;
-
- if (avctx->xvmc_acceleration)
- return avctx->get_format(avctx, pixfmt_xvmc_mpg2_420);
- else if (avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) {
- if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO)
- return AV_PIX_FMT_VDPAU_MPEG1;
- else
- return AV_PIX_FMT_VDPAU_MPEG2;
- } else {
- if (s->chroma_format < 2)
- return avctx->get_format(avctx, ff_hwaccel_pixfmt_list_420);
- else if (s->chroma_format == 2)
- return AV_PIX_FMT_YUV422P;
- else
- return AV_PIX_FMT_YUV444P;
- }
-}
-
-/* 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;
- MpegEncContext *s = &s1->mpeg_enc_ctx;
- uint8_t old_permutation[64];
-
- 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 ||
- 0)
- {
-
- if (s1->mpeg_enc_ctx_allocated) {
- ParseContext pc = s->parse_context;
- s->parse_context.buffer = 0;
- ff_MPV_common_end(s);
- s->parse_context = pc;
- }
-
- if ((s->width == 0) || (s->height == 0))
- return -2;
-
- avcodec_set_dimensions(avctx, s->width, s->height);
- avctx->bit_rate = s->bit_rate;
- s1->save_aspect_info = s->aspect_ratio_info;
- s1->save_width = s->width;
- s1->save_height = s->height;
- s1->save_progressive_seq = s->progressive_sequence;
-
- /* low_delay may be forced, in this case we will have B-frames
- * that behave like P-frames. */
- avctx->has_b_frames = !s->low_delay;
-
- if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO) {
- //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
- 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].den * s1->frame_rate_ext.den,
- 1 << 30);
- avctx->ticks_per_frame = 2;
- //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
- 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}))) {
- s->avctx->sample_aspect_ratio =
- av_div_q(ff_mpeg2_aspect[s->aspect_ratio_info],
- (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
-// 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);
- av_dlog(avctx, "B %d/%d\n", s->avctx->sample_aspect_ratio.num,
- s->avctx->sample_aspect_ratio.den);
- }
- } else {
- s->avctx->sample_aspect_ratio =
- ff_mpeg2_aspect[s->aspect_ratio_info];
- }
- } // MPEG-2
-
- avctx->pix_fmt = mpeg_get_pixelformat(avctx);
- avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt);
- // until then pix_fmt may be changed right after codec init
- if (avctx->pix_fmt == AV_PIX_FMT_XVMC_MPEG2_IDCT ||
- avctx->hwaccel ||
- s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
- if (avctx->idct_algo == FF_IDCT_AUTO)
- avctx->idct_algo = FF_IDCT_SIMPLE;
-
- /* Quantization matrices may need reordering
- * if DCT permutation is changed. */
- memcpy(old_permutation, s->dsp.idct_permutation, 64 * sizeof(uint8_t));
-
- if (ff_MPV_common_init(s) < 0)
- return -2;
-
- quant_matrix_rebuild(s->intra_matrix, old_permutation, s->dsp.idct_permutation);
- quant_matrix_rebuild(s->inter_matrix, old_permutation, s->dsp.idct_permutation);
- quant_matrix_rebuild(s->chroma_intra_matrix, old_permutation, s->dsp.idct_permutation);
- quant_matrix_rebuild(s->chroma_inter_matrix, old_permutation, s->dsp.idct_permutation);
-
- s1->mpeg_enc_ctx_allocated = 1;
- }
- return 0;
-}
-
-static int mpeg1_decode_picture(AVCodecContext *avctx,
- const uint8_t *buf, int buf_size)
-{
- 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);
-
- ref = get_bits(&s->gb, 10); /* temporal ref */
- s->pict_type = get_bits(&s->gb, 3);
- if (s->pict_type == 0 || s->pict_type > 3)
- return -1;
-
- vbv_delay = get_bits(&s->gb, 16);
- 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))
- return -1;
- s->mpeg_f_code[0][0] = f_code;
- s->mpeg_f_code[0][1] = f_code;
- }
- if (s->pict_type == AV_PICTURE_TYPE_B) {
- s->full_pel[1] = get_bits1(&s->gb);
- f_code = get_bits(&s->gb, 3);
- if (f_code == 0 && (avctx->err_recognition & AV_EF_BITSTREAM))
- return -1;
- s->mpeg_f_code[1][0] = f_code;
- s->mpeg_f_code[1][1] = f_code;
- }
- s->current_picture.f.pict_type = s->pict_type;
- 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);
-
- s->y_dc_scale = 8;
- s->c_dc_scale = 8;
- return 0;
-}
-
-static void mpeg_decode_sequence_extension(Mpeg1Context *s1)
-{
- 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->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);
- s->width |= (horiz_size_ext << 12);
- s->height |= (vert_size_ext << 12);
- bit_rate_ext = get_bits(&s->gb, 12); /* XXX: handle it */
- s->bit_rate += (bit_rate_ext << 18) * 400;
- skip_bits1(&s->gb); /* marker */
- s->avctx->rc_buffer_size += get_bits(&s->gb, 8) * 1024 * 16 << 10;
-
- s->low_delay = get_bits1(&s->gb);
- if (s->flags & CODEC_FLAG_LOW_DELAY)
- s->low_delay = 1;
-
- s1->frame_rate_ext.num = get_bits(&s->gb, 2) + 1;
- 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;
-
- if (s->avctx->debug & FF_DEBUG_PICT_INFO)
- av_log(s->avctx, AV_LOG_DEBUG, "profile: %d, level: %d vbv buffer: %d, bitrate:%d\n",
- s->avctx->profile, s->avctx->level, s->avctx->rc_buffer_size, s->bit_rate);
-
-}
-
-static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1)
-{
- MpegEncContext *s = &s1->mpeg_enc_ctx;
- int color_description, w, h;
-
- skip_bits(&s->gb, 3); /* video format */
- color_description = get_bits1(&s->gb);
- if (color_description) {
- s->avctx->color_primaries = get_bits(&s->gb, 8);
- s->avctx->color_trc = get_bits(&s->gb, 8);
- s->avctx->colorspace = get_bits(&s->gb, 8);
- }
- w = get_bits(&s->gb, 14);
- skip_bits(&s->gb, 1); //marker
- h = get_bits(&s->gb, 14);
- // remaining 3 bits are zero padding
-
- s1->pan_scan.width = 16 * w;
- s1->pan_scan.height = 16 * h;
-
- if (s->avctx->debug & FF_DEBUG_PICT_INFO)
- av_log(s->avctx, AV_LOG_DEBUG, "sde w:%d, h:%d\n", w, h);
-}
-
-static void mpeg_decode_picture_display_extension(Mpeg1Context *s1)
-{
- MpegEncContext *s = &s1->mpeg_enc_ctx;
- int i, nofco;
-
- nofco = 1;
- if (s->progressive_sequence) {
- if (s->repeat_first_field) {
- nofco++;
- if (s->top_field_first)
- nofco++;
- }
- } else {
- if (s->picture_structure == PICT_FRAME) {
- nofco++;
- if (s->repeat_first_field)
- nofco++;
- }
- }
- for (i = 0; i < nofco; i++) {
- s1->pan_scan.position[i][0] = get_sbits(&s->gb, 16);
- skip_bits(&s->gb, 1); // marker
- s1->pan_scan.position[i][1] = get_sbits(&s->gb, 16);
- skip_bits(&s->gb, 1); // marker
- }
-
- if (s->avctx->debug & FF_DEBUG_PICT_INFO)
- av_log(s->avctx, AV_LOG_DEBUG, "pde (%d,%d) (%d,%d) (%d,%d)\n",
- s1->pan_scan.position[0][0], s1->pan_scan.position[0][1],
- s1->pan_scan.position[1][0], s1->pan_scan.position[1][1],
- 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)
-{
- int i;
-
- for (i = 0; i < 64; i++) {
- int j = s->dsp.idct_permutation[ff_zigzag_direct[i]];
- int v = get_bits(&s->gb, 8);
- if (v == 0) {
- av_log(s->avctx, AV_LOG_ERROR, "matrix damaged\n");
- return -1;
- }
- if (intra && i == 0 && v != 8) {
- av_log(s->avctx, AV_LOG_ERROR, "intra matrix invalid, ignoring\n");
- v = 8; // needed by pink.mpg / issue1046
- }
- matrix0[j] = v;
- if (matrix1)
- matrix1[j] = v;
- }
- return 0;
-}
-
-static void mpeg_decode_quant_matrix_extension(MpegEncContext *s)
-{
- 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);
-}
-
-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->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");
- 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;
- else
- s->pict_type = AV_PICTURE_TYPE_P;
- } else
- s->pict_type = AV_PICTURE_TYPE_B;
- s->current_picture.f.pict_type = s->pict_type;
- s->current_picture.f.key_frame = s->pict_type == AV_PICTURE_TYPE_I;
- }
- s->intra_dc_precision = get_bits(&s->gb, 2);
- s->picture_structure = get_bits(&s->gb, 2);
- s->top_field_first = get_bits1(&s->gb);
- s->frame_pred_frame_dct = get_bits1(&s->gb);
- s->concealment_motion_vectors = get_bits1(&s->gb);
- s->q_scale_type = get_bits1(&s->gb);
- s->intra_vlc_format = get_bits1(&s->gb);
- s->alternate_scan = get_bits1(&s->gb);
- s->repeat_first_field = get_bits1(&s->gb);
- s->chroma_420_type = get_bits1(&s->gb);
- s->progressive_frame = get_bits1(&s->gb);
-
- if (s->progressive_sequence && !s->progressive_frame) {
- s->progressive_frame = 1;
- av_log(s->avctx, AV_LOG_ERROR, "interlaced frame in progressive sequence, ignoring\n");
- }
-
- if (s->picture_structure == 0 || (s->progressive_frame && s->picture_structure != PICT_FRAME)) {
- av_log(s->avctx, AV_LOG_ERROR, "picture_structure %d invalid, ignoring\n", s->picture_structure);
- s->picture_structure = PICT_FRAME;
- }
-
- if (s->progressive_sequence && !s->frame_pred_frame_dct) {
- av_log(s->avctx, AV_LOG_WARNING, "invalid frame_pred_frame_dct\n");
- }
-
- if (s->picture_structure == PICT_FRAME) {
- s->first_field = 0;
- s->v_edge_pos = 16 * s->mb_height;
- } else {
- s->first_field ^= 1;
- s->v_edge_pos = 8 * s->mb_height;
- memset(s->mbskip_table, 0, s->mb_stride * s->mb_height);
- }
-
- 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);
- } 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);
- }
-
- /* composite display not parsed */
- av_dlog(s->avctx, "intra_dc_precision=%d\n", s->intra_dc_precision);
- av_dlog(s->avctx, "picture_structure=%d\n", s->picture_structure);
- av_dlog(s->avctx, "top field first=%d\n", s->top_field_first);
- av_dlog(s->avctx, "repeat first field=%d\n", s->repeat_first_field);
- av_dlog(s->avctx, "conceal=%d\n", s->concealment_motion_vectors);
- av_dlog(s->avctx, "intra_vlc_format=%d\n", s->intra_vlc_format);
- av_dlog(s->avctx, "alternate_scan=%d\n", s->alternate_scan);
- av_dlog(s->avctx, "frame_pred_frame_dct=%d\n", s->frame_pred_frame_dct);
- av_dlog(s->avctx, "progressive_frame=%d\n", s->progressive_frame);
-}
-
-static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size)
-{
- AVCodecContext *avctx = s->avctx;
- Mpeg1Context *s1 = (Mpeg1Context*)s;
-
- /* start frame decoding */
- if (s->first_field || s->picture_structure == PICT_FRAME) {
- if (ff_MPV_frame_start(s, avctx) < 0)
- return -1;
-
- ff_er_frame_start(s);
-
- /* first check if we must repeat the frame */
- s->current_picture_ptr->f.repeat_pict = 0;
- if (s->repeat_first_field) {
- if (s->progressive_sequence) {
- if (s->top_field_first)
- s->current_picture_ptr->f.repeat_pict = 4;
- else
- s->current_picture_ptr->f.repeat_pict = 2;
- } else if (s->progressive_frame) {
- s->current_picture_ptr->f.repeat_pict = 1;
- }
- }
-
- *s->current_picture_ptr->f.pan_scan = s1->pan_scan;
-
- if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_FRAME))
- ff_thread_finish_setup(avctx);
- } else { // second field
- int i;
-
- if (!s->current_picture_ptr) {
- av_log(s->avctx, AV_LOG_ERROR, "first field missing\n");
- return -1;
- }
-
- 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");
- }
-
- 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 (avctx->hwaccel) {
- if (avctx->hwaccel->start_frame(avctx, buf, buf_size) < 0)
- 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;
-}
-
-#define DECODE_SLICE_ERROR -1
-#define DECODE_SLICE_OK 0
-
-/**
- * Decode a slice.
- * MpegEncContext.mb_y must be set to the MB row from the startcode.
- * @return DECODE_SLICE_ERROR if the slice is damaged,
- * DECODE_SLICE_OK if this slice is OK
- */
-static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
- const uint8_t **buf, int buf_size)
-{
- AVCodecContext *avctx = s->avctx;
- const int field_pic = s->picture_structure != PICT_FRAME;
-
- s->resync_mb_x =
- s->resync_mb_y = -1;
-
- assert(mb_y < s->mb_height);
-
- init_get_bits(&s->gb, *buf, buf_size * 8);
-
- ff_mpeg1_clean_buffers(s);
- s->interlaced_dct = 0;
-
- s->qscale = get_qscale(s);
-
- if (s->qscale == 0) {
- av_log(s->avctx, AV_LOG_ERROR, "qscale == 0\n");
- return -1;
- }
-
- /* extra slice info */
- while (get_bits1(&s->gb) != 0) {
- skip_bits(&s->gb, 8);
- }
-
- s->mb_x = 0;
-
- if (mb_y == 0 && s->codec_tag == AV_RL32("SLIF")) {
- skip_bits1(&s->gb);
- } else {
- while (get_bits_left(&s->gb) > 0) {
- int code = get_vlc2(&s->gb, mbincr_vlc.table, MBINCR_VLC_BITS, 2);
- if (code < 0) {
- av_log(s->avctx, AV_LOG_ERROR, "first mb_incr damaged\n");
- return -1;
- }
- if (code >= 33) {
- if (code == 33) {
- s->mb_x += 33;
- }
- /* otherwise, stuffing, nothing to do */
- } else {
- s->mb_x += code;
- break;
- }
- }
- }
-
- if (s->mb_x >= (unsigned)s->mb_width) {
- av_log(s->avctx, AV_LOG_ERROR, "initial skip overflow\n");
- return -1;
- }
-
- if (avctx->hwaccel) {
- const uint8_t *buf_end, *buf_start = *buf - 4; /* include start_code */
- int start_code = -1;
- buf_end = avpriv_mpv_find_start_code(buf_start + 2, *buf + buf_size, &start_code);
- if (buf_end < *buf + buf_size)
- buf_end -= 4;
- s->mb_y = mb_y;
- if (avctx->hwaccel->decode_slice(avctx, buf_start, buf_end - buf_start) < 0)
- return DECODE_SLICE_ERROR;
- *buf = buf_end;
- return DECODE_SLICE_OK;
- }
-
- s->resync_mb_x = s->mb_x;
- s->resync_mb_y = s->mb_y = mb_y;
- s->mb_skip_run = 0;
- ff_init_block_index(s);
-
- 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" :"");
- }
- }
-
- for (;;) {
- // If 1, we memcpy blocks in xvmcvideo.
- if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1)
- ff_xvmc_init_block(s); // set s->block
-
- if (mpeg_decode_mb(s, s->block) < 0)
- return -1;
-
- if (s->current_picture.f.motion_val[0] && !s->encoding) { // note motion_val is normally NULL unless we want to extract the MVs
- 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);
- int motion_x, motion_y, dir, i;
-
- 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)) {
- motion_x = motion_y = 0;
- } 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))*/ {
- motion_x = s->mv[dir][i][0];
- motion_y = s->mv[dir][i][1];
- }
-
- s->current_picture.f.motion_val[dir][xy ][0] = motion_x;
- s->current_picture.f.motion_val[dir][xy ][1] = motion_y;
- s->current_picture.f.motion_val[dir][xy + 1][0] = motion_x;
- s->current_picture.f.motion_val[dir][xy + 1][1] = motion_y;
- s->current_picture.f.ref_index [dir][b8_xy ] =
- s->current_picture.f.ref_index [dir][b8_xy + 1] = s->field_select[dir][i];
- assert(s->field_select[dir][i] == 0 || s->field_select[dir][i] == 1);
- }
- xy += wrap;
- b8_xy +=2;
- }
- }
-
- s->dest[0] += 16;
- s->dest[1] += 16 >> s->chroma_x_shift;
- s->dest[2] += 16 >> s->chroma_x_shift;
-
- ff_MPV_decode_mb(s, s->block);
-
- if (++s->mb_x >= s->mb_width) {
- const int mb_size = 16;
-
- ff_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_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*/;
-
- if (left < 0 || (left && show_bits(&s->gb, FFMIN(left, 23)) && !is_d10)
- || ((avctx->err_recognition & AV_EF_BUFFER) && 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;
- }
-
- ff_init_block_index(s);
- }
-
- /* skip mb handling */
- if (s->mb_skip_run == -1) {
- /* read increment again */
- s->mb_skip_run = 0;
- for (;;) {
- int code = get_vlc2(&s->gb, mbincr_vlc.table, MBINCR_VLC_BITS, 2);
- if (code < 0) {
- av_log(s->avctx, AV_LOG_ERROR, "mb incr damaged\n");
- return -1;
- }
- if (code >= 33) {
- if (code == 33) {
- s->mb_skip_run += 33;
- } else if (code == 35) {
- if (s->mb_skip_run != 0 || show_bits(&s->gb, 15) != 0) {
- av_log(s->avctx, AV_LOG_ERROR, "slice mismatch\n");
- return -1;
- }
- goto eos; /* end of slice */
- }
- /* otherwise, stuffing, nothing to do */
- } else {
- s->mb_skip_run += code;
- break;
- }
- }
- 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);
- return -1;
- }
-
- /* skip mb */
- s->mb_intra = 0;
- for (i = 0; i < 12; i++)
- s->block_last_index[i] = -1;
- if (s->picture_structure == PICT_FRAME)
- s->mv_type = MV_TYPE_16X16;
- else
- s->mv_type = MV_TYPE_FIELD;
- if (s->pict_type == AV_PICTURE_TYPE_P) {
- /* if P type, zero motion vector is implied */
- s->mv_dir = MV_DIR_FORWARD;
- s->mv[0][0][0] = s->mv[0][0][1] = 0;
- s->last_mv[0][0][0] = s->last_mv[0][0][1] = 0;
- s->last_mv[0][1][0] = s->last_mv[0][1][1] = 0;
- s->field_select[0][0] = (s->picture_structure - 1) & 1;
- } else {
- /* if B type, reuse previous vectors and directions */
- s->mv[0][0][0] = s->last_mv[0][0][0];
- s->mv[0][0][1] = s->last_mv[0][0][1];
- s->mv[1][0][0] = s->last_mv[1][0][0];
- s->mv[1][0][1] = s->last_mv[1][0][1];
- }
- }
- }
- }
-eos: // end of slice
- *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;
- const uint8_t *buf = s->gb.buffer;
- int mb_y = s->start_mb_y;
- const int field_pic = s->picture_structure != PICT_FRAME;
-
- s->error_count = (3 * (s->end_mb_y - s->start_mb_y) * s->mb_width) >> field_pic;
-
- for (;;) {
- uint32_t start_code;
- int ret;
-
- ret = mpeg_decode_slice(s, mb_y, &buf, s->gb.buffer_end - buf);
- emms_c();
- av_dlog(c, "ret:%d resync:%d/%d mb:%d/%d ts:%d/%d ec:%d\n",
- ret, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y,
- s->start_mb_y, s->end_mb_y, s->error_count);
- if (ret < 0) {
- 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, 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, 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_mpv_find_start_code(buf, s->gb.buffer_end, &start_code);
- mb_y= (start_code - SLICE_MIN_START_CODE) << field_pic;
- if (s->picture_structure == PICT_BOTTOM_FIELD)
- mb_y++;
- if (mb_y < 0 || mb_y >= s->end_mb_y)
- return -1;
- }
-}
-
-/**
- * Handle slice ends.
- * @return 1 if it seems to be the last slice
- */
-static int slice_end(AVCodecContext *avctx, AVFrame *pict)
-{
- Mpeg1Context *s1 = avctx->priv_data;
- MpegEncContext *s = &s1->mpeg_enc_ctx;
-
- if (!s1->mpeg_enc_ctx_allocated || !s->current_picture_ptr)
- return 0;
-
- 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");
- }
-
- 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) {
- /* end of image */
-
- s->current_picture_ptr->f.qscale_type = FF_QSCALE_TYPE_MPEG2;
-
- ff_er_frame_end(s);
-
- ff_MPV_frame_end(s);
-
- if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) {
- *pict = s->current_picture_ptr->f;
- ff_print_debug_info(s, pict);
- } else {
- if (avctx->active_thread_type & FF_THREAD_FRAME)
- s->picture_number++;
- /* latency of 1 frame for I- and P-frames */
- /* XXX: use another variable than picture_number */
- if (s->last_picture_ptr != NULL) {
- *pict = s->last_picture_ptr->f;
- ff_print_debug_info(s, pict);
- }
- }
-
- return 1;
- } else {
- return 0;
- }
-}
-
-static int mpeg1_decode_sequence(AVCodecContext *avctx,
- const uint8_t *buf, int buf_size)
-{
- 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);
-
- width = get_bits(&s->gb, 12);
- height = get_bits(&s->gb, 12);
- if (width <= 0 || height <= 0)
- return -1;
- s->aspect_ratio_info = get_bits(&s->gb, 4);
- if (s->aspect_ratio_info == 0) {
- av_log(avctx, AV_LOG_ERROR, "aspect ratio has forbidden 0 value\n");
- if (avctx->err_recognition & AV_EF_BITSTREAM)
- return -1;
- }
- s->frame_rate_index = get_bits(&s->gb, 4);
- if (s->frame_rate_index == 0 || s->frame_rate_index > 13)
- return -1;
- s->bit_rate = get_bits(&s->gb, 18) * 400;
- if (get_bits1(&s->gb) == 0) /* marker */
- return -1;
- s->width = width;
- s->height = height;
-
- s->avctx->rc_buffer_size = get_bits(&s->gb, 10) * 1024 * 16;
- skip_bits(&s->gb, 1);
-
- /* get matrix */
- if (get_bits1(&s->gb)) {
- load_matrix(s, s->chroma_intra_matrix, s->intra_matrix, 1);
- } else {
- for (i = 0; i < 64; i++) {
- j = s->dsp.idct_permutation[i];
- v = ff_mpeg1_default_intra_matrix[i];
- s->intra_matrix[j] = v;
- s->chroma_intra_matrix[j] = v;
- }
- }
- if (get_bits1(&s->gb)) {
- load_matrix(s, s->chroma_inter_matrix, s->inter_matrix, 0);
- } else {
- for (i = 0; i < 64; i++) {
- int j = s->dsp.idct_permutation[i];
- v = ff_mpeg1_default_non_intra_matrix[i];
- s->inter_matrix[j] = v;
- s->chroma_inter_matrix[j] = v;
- }
- }
-
- if (show_bits(&s->gb, 23) != 0) {
- av_log(s->avctx, AV_LOG_ERROR, "sequence header damaged\n");
- return -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->frame_pred_frame_dct = 1;
- s->chroma_format = 1;
- 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)
- s->low_delay = 1;
-
- if (s->avctx->debug & FF_DEBUG_PICT_INFO)
- av_log(s->avctx, AV_LOG_DEBUG, "vbv buffer: %d, bitrate:%d\n",
- s->avctx->rc_buffer_size, s->bit_rate);
-
- return 0;
-}
-
-static int vcr2_init_sequence(AVCodecContext *avctx)
-{
- Mpeg1Context *s1 = avctx->priv_data;
- MpegEncContext *s = &s1->mpeg_enc_ctx;
- int i, v;
-
- /* start new MPEG-1 context decoding */
- s->out_format = FMT_MPEG1;
- if (s1->mpeg_enc_ctx_allocated) {
- ff_MPV_common_end(s);
- }
- s->width = avctx->coded_width;
- s->height = avctx->coded_height;
- avctx->has_b_frames = 0; // true?
- s->low_delay = 1;
-
- avctx->pix_fmt = mpeg_get_pixelformat(avctx);
- avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt);
-
- if (avctx->pix_fmt == AV_PIX_FMT_XVMC_MPEG2_IDCT || avctx->hwaccel ||
- s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
- if (avctx->idct_algo == FF_IDCT_AUTO)
- avctx->idct_algo = FF_IDCT_SIMPLE;
-
- if (ff_MPV_common_init(s) < 0)
- return -1;
- 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
- s1->mpeg_enc_ctx_allocated = 1;
-
- for (i = 0; i < 64; i++) {
- int j = s->dsp.idct_permutation[i];
- v = ff_mpeg1_default_intra_matrix[i];
- s->intra_matrix[j] = v;
- s->chroma_intra_matrix[j] = v;
-
- v = ff_mpeg1_default_non_intra_matrix[i];
- s->inter_matrix[j] = v;
- s->chroma_inter_matrix[j] = v;
- }
-
- s->progressive_sequence = 1;
- s->progressive_frame = 1;
- s->picture_structure = PICT_FRAME;
- s->frame_pred_frame_dct = 1;
- s->chroma_format = 1;
- s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO;
- s1->save_width = s->width;
- s1->save_height = s->height;
- s1->save_progressive_seq = s->progressive_sequence;
- return 0;
-}
-
-
-static void mpeg_decode_user_data(AVCodecContext *avctx,
- const uint8_t *p, int buf_size)
-{
- const uint8_t *buf_end = p + buf_size;
-
- /* we parse the DTG active format information */
- if (buf_end - p >= 5 &&
- p[0] == 'D' && p[1] == 'T' && p[2] == 'G' && p[3] == '1') {
- int flags = p[4];
- p += 5;
- if (flags & 0x80) {
- /* skip event id */
- p += 2;
- }
- if (flags & 0x40) {
- if (buf_end - p < 1)
- return;
- avctx->dtg_active_format = p[0] & 0x0f;
- }
- }
-}
-
-static void mpeg_decode_gop(AVCodecContext *avctx,
- const uint8_t *buf, int buf_size)
-{
- Mpeg1Context *s1 = avctx->priv_data;
- MpegEncContext *s = &s1->mpeg_enc_ctx;
-
- int time_code_hours, time_code_minutes;
- int time_code_seconds, time_code_pictures;
- int broken_link;
-
- init_get_bits(&s->gb, buf, buf_size*8);
-
- skip_bits1(&s->gb); /* drop_frame_flag */
-
- time_code_hours = get_bits(&s->gb, 5);
- time_code_minutes = get_bits(&s->gb, 6);
- skip_bits1(&s->gb); // marker bit
- time_code_seconds = get_bits(&s->gb, 6);
- time_code_pictures = get_bits(&s->gb, 6);
-
- s1->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 = get_bits1(&s->gb);
-
- if (s->avctx->debug & FF_DEBUG_PICT_INFO)
- av_log(s->avctx, AV_LOG_DEBUG, "GOP (%2d:%02d:%02d.[%02d]) closed_gop=%d broken_link=%d\n",
- time_code_hours, time_code_minutes, time_code_seconds,
- time_code_pictures, s1->closed_gop, broken_link);
-}
-/**
- * Find the end of the current frame in the bitstream.
- * @return the position of the first byte of the next frame, or -1
- */
-int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s)
-{
- int i;
- uint32_t state = pc->state;
-
- /* EOF considered as end of frame */
- if (buf_size == 0)
- return 0;
-
-/*
- 0 frame start -> 1/4
- 1 first_SEQEXT -> 0/2
- 2 first field start -> 3/0
- 3 second_SEQEXT -> 2/0
- 4 searching end
-*/
-
- for (i = 0; i < buf_size; i++) {
- assert(pc->frame_start_found >= 0 && pc->frame_start_found <= 4);
- if (pc->frame_start_found & 1) {
- if (state == EXT_START_CODE && (buf[i] & 0xF0) != 0x80)
- pc->frame_start_found--;
- else if (state == EXT_START_CODE + 2) {
- if ((buf[i] & 3) == 3)
- pc->frame_start_found = 0;
- else
- pc->frame_start_found = (pc->frame_start_found + 1) & 3;
- }
- state++;
- } else {
- i = avpriv_mpv_find_start_code(buf + i, buf + buf_size, &state) - buf - 1;
- if (pc->frame_start_found == 0 && state >= SLICE_MIN_START_CODE && state <= SLICE_MAX_START_CODE) {
- i++;
- pc->frame_start_found = 4;
- }
- if (state == SEQ_END_CODE) {
- pc->frame_start_found = 0;
- pc->state=-1;
- return i+1;
- }
- if (pc->frame_start_found == 2 && state == SEQ_START_CODE)
- pc->frame_start_found = 0;
- if (pc->frame_start_found < 4 && state == EXT_START_CODE)
- pc->frame_start_found++;
- if (pc->frame_start_found == 4 && (state & 0xFFFFFF00) == 0x100) {
- if (state < SLICE_MIN_START_CODE || state > SLICE_MAX_START_CODE) {
- pc->frame_start_found = 0;
- pc->state = -1;
- return i - 3;
- }
- }
- if (pc->frame_start_found == 0 && s && state == PICTURE_START_CODE) {
- ff_fetch_timestamp(s, i - 3, 1);
- }
- }
- }
- pc->state = state;
- return END_NOT_FOUND;
-}
-
-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;
- const uint8_t *buf_ptr = buf;
- const uint8_t *buf_end = buf + buf_size;
- int ret, input_size;
- int last_code = 0;
-
- for (;;) {
- /* find next start code */
- uint32_t start_code = -1;
- buf_ptr = avpriv_mpv_find_start_code(buf_ptr, buf_end, &start_code);
- if (start_code > 0x1ff) {
- if (s2->pict_type != AV_PICTURE_TYPE_B || avctx->skip_frame <= AVDISCARD_DEFAULT) {
- if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_SLICE)) {
- int i;
-
- 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->error_count += s2->thread_context[i]->error_count;
- }
-
- if (CONFIG_MPEG_VDPAU_DECODER && avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
- ff_vdpau_mpeg_picture_complete(s2, buf, buf_size, s->slice_count);
-
- if (slice_end(avctx, picture)) {
- if (s2->last_picture_ptr || s2->low_delay) //FIXME merge with the stuff in mpeg_decode_slice
- *got_output = 1;
- }
- }
- s2->pict_type = 0;
- 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);
- }
-
- /* 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);
- s->sync=1;
- } else {
- 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;
- }
- break;
-
- case PICTURE_START_CODE:
- if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_SLICE) && s->slice_count) {
- int i;
-
- avctx->execute(avctx, slice_decode_thread,
- s2->thread_context, NULL,
- s->slice_count, sizeof(void*));
- for (i = 0; i < s->slice_count; i++)
- s2->error_count += s2->thread_context[i]->error_count;
- s->slice_count = 0;
- }
- 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");
- return ret;
- }
-
- /* 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;
- } else {
- 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);
-
- switch (get_bits(&s2->gb, 4)) {
- case 0x1:
- if (last_code == 0) {
- mpeg_decode_sequence_extension(s);
- } else {
- av_log(avctx, AV_LOG_ERROR, "ignoring seq ext after %X\n", last_code);
- if (avctx->err_recognition & AV_EF_EXPLODE)
- return AVERROR_INVALIDDATA;
- }
- break;
- case 0x2:
- mpeg_decode_sequence_display_extension(s);
- break;
- case 0x3:
- mpeg_decode_quant_matrix_extension(s2);
- break;
- case 0x7:
- mpeg_decode_picture_display_extension(s);
- break;
- case 0x8:
- 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);
- if (avctx->err_recognition & AV_EF_EXPLODE)
- return AVERROR_INVALIDDATA;
- }
- break;
- }
- break;
- case USER_START_CODE:
- mpeg_decode_user_data(avctx, buf_ptr, input_size);
- break;
- case GOP_START_CODE:
- if (last_code == 0) {
- s2->first_field=0;
- mpeg_decode_gop(avctx, buf_ptr, input_size);
- s->sync=1;
- } else {
- 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;
- }
- break;
- default:
- if (start_code >= SLICE_MIN_START_CODE &&
- start_code <= SLICE_MAX_START_CODE && last_code != 0) {
- const int field_pic = s2->picture_structure != PICT_FRAME;
- int mb_y = (start_code - SLICE_MIN_START_CODE) << field_pic;
- last_code = SLICE_MIN_START_CODE;
-
- if (s2->picture_structure == PICT_BOTTOM_FIELD)
- mb_y++;
-
- if (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 */
- if (s2->pict_type == AV_PICTURE_TYPE_B) {
- if (!s->closed_gop)
- break;
- }
- }
- if (s2->pict_type == AV_PICTURE_TYPE_I)
- 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. */
- if (s2->pict_type == AV_PICTURE_TYPE_P && !s->sync) 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)
- break;
-
- if (!s->mpeg_enc_ctx_allocated)
- break;
-
- if (s2->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
- if (mb_y < avctx->skip_top || mb_y >= s2->mb_height - avctx->skip_bottom)
- break;
- }
-
- if (!s2->pict_type) {
- av_log(avctx, AV_LOG_ERROR, "Missing picture start code\n");
- if (avctx->err_recognition & AV_EF_EXPLODE)
- return AVERROR_INVALIDDATA;
- break;
- }
-
- if (s2->first_slice) {
- s2->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");
- return AVERROR_INVALIDDATA;
- }
-
- if (avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) {
- s->slice_count++;
- break;
- }
-
- if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_SLICE)) {
- int threshold = (s2->mb_height * s->slice_count +
- s2->slice_context_count / 2) /
- s2->slice_context_count;
- if (threshold <= mb_y) {
- MpegEncContext *thread_context = s2->thread_context[s->slice_count];
-
- 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);
- if (ret < 0)
- return ret;
- }
- 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
- } else {
- ret = mpeg_decode_slice(s2, mb_y, &buf_ptr, input_size);
- emms_c();
-
- if (ret < 0) {
- 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, 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, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x-1, s2->mb_y, ER_AC_END | ER_DC_END | ER_MV_END);
- }
- }
- }
- break;
- }
- }
-}
-
-static int mpeg_decode_frame(AVCodecContext *avctx,
- void *data, int *got_output,
- AVPacket *avpkt)
-{
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- Mpeg1Context *s = avctx->priv_data;
- AVFrame *picture = data;
- MpegEncContext *s2 = &s->mpeg_enc_ctx;
- av_dlog(avctx, "fill_buffer\n");
-
- if (buf_size == 0 || (buf_size == 4 && AV_RB32(buf) == SEQ_END_CODE)) {
- /* special case for last picture */
- if (s2->low_delay == 0 && s2->next_picture_ptr) {
- *picture = s2->next_picture_ptr->f;
- s2->next_picture_ptr = NULL;
-
- *got_output = 1;
- }
- return buf_size;
- }
-
- if (s2->flags & CODEC_FLAG_TRUNCATED) {
- 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)
- return buf_size;
- }
-
- if (s->mpeg_enc_ctx_allocated == 0 && avctx->codec_tag == AV_RL32("VCR2"))
- vcr2_init_sequence(avctx);
-
- s->slice_count = 0;
-
- if (avctx->extradata && !s->extradata_decoded) {
- int ret = decode_chunks(avctx, picture, got_output, avctx->extradata, avctx->extradata_size);
- s->extradata_decoded = 1;
- if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE))
- return ret;
- }
-
- return decode_chunks(avctx, picture, got_output, buf, buf_size);
-}
-
-
-static void flush(AVCodecContext *avctx)
-{
- Mpeg1Context *s = avctx->priv_data;
-
- s->sync=0;
- s->closed_gop = 0;
-
- ff_mpeg_flush(avctx);
-}
-
-static int mpeg_decode_end(AVCodecContext *avctx)
-{
- Mpeg1Context *s = avctx->priv_data;
-
- if (s->mpeg_enc_ctx_allocated)
- ff_MPV_common_end(&s->mpeg_enc_ctx);
- return 0;
-}
-
-static const AVProfile mpeg2_video_profiles[] = {
- { FF_PROFILE_MPEG2_422, "4:2:2" },
- { FF_PROFILE_MPEG2_HIGH, "High" },
- { FF_PROFILE_MPEG2_SS, "Spatially Scalable" },
- { FF_PROFILE_MPEG2_SNR_SCALABLE, "SNR Scalable" },
- { FF_PROFILE_MPEG2_MAIN, "Main" },
- { FF_PROFILE_MPEG2_SIMPLE, "Simple" },
- { FF_PROFILE_RESERVED, "Reserved" },
- { FF_PROFILE_RESERVED, "Reserved" },
- { FF_PROFILE_UNKNOWN },
-};
-
-
-AVCodec ff_mpeg1video_decoder = {
- .name = "mpeg1video",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_MPEG1VIDEO,
- .priv_data_size = sizeof(Mpeg1Context),
- .init = mpeg_decode_init,
- .close = mpeg_decode_end,
- .decode = mpeg_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 |
- CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY |
- CODEC_CAP_SLICE_THREADS,
- .flush = flush,
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"),
- .update_thread_context = ONLY_IF_THREADS_ENABLED(mpeg_decode_update_thread_context)
-};
-
-AVCodec ff_mpeg2video_decoder = {
- .name = "mpeg2video",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_MPEG2VIDEO,
- .priv_data_size = sizeof(Mpeg1Context),
- .init = mpeg_decode_init,
- .close = mpeg_decode_end,
- .decode = mpeg_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 |
- CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY |
- CODEC_CAP_SLICE_THREADS,
- .flush = flush,
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"),
- .profiles = NULL_IF_CONFIG_SMALL(mpeg2_video_profiles),
-};
-
-#if CONFIG_MPEG_XVMC_DECODER
-static av_cold int mpeg_mc_decode_init(AVCodecContext *avctx)
-{
- if (avctx->active_thread_type & FF_THREAD_SLICE)
- return -1;
- if (!(avctx->slice_flags & SLICE_FLAG_CODED_ORDER))
- return -1;
- if (!(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD)) {
- av_dlog(avctx, "mpeg12.c: XvMC decoder will work better if SLICE_FLAG_ALLOW_FIELD is set\n");
- }
- mpeg_decode_init(avctx);
-
- avctx->pix_fmt = AV_PIX_FMT_XVMC_MPEG2_IDCT;
- avctx->xvmc_acceleration = 2; // 2 - the blocks are packed!
-
- return 0;
-}
-
-AVCodec ff_mpeg_xvmc_decoder = {
- .name = "mpegvideo_xvmc",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_MPEG2VIDEO_XVMC,
- .priv_data_size = sizeof(Mpeg1Context),
- .init = mpeg_mc_decode_init,
- .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,
- .flush = flush,
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-1/2 video XvMC (X-Video Motion Compensation)"),
-};
-
-#endif
-
-#if CONFIG_MPEG_VDPAU_DECODER
-AVCodec ff_mpeg_vdpau_decoder = {
- .name = "mpegvideo_vdpau",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_MPEG2VIDEO,
- .priv_data_size = sizeof(Mpeg1Context),
- .init = mpeg_decode_init,
- .close = mpeg_decode_end,
- .decode = mpeg_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED |
- CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_DELAY,
- .flush = flush,
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-1/2 video (VDPAU acceleration)"),
-};
-#endif
-
-#if CONFIG_MPEG1_VDPAU_DECODER
-AVCodec ff_mpeg1_vdpau_decoder = {
- .name = "mpeg1video_vdpau",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_MPEG1VIDEO,
- .priv_data_size = sizeof(Mpeg1Context),
- .init = mpeg_decode_init,
- .close = mpeg_decode_end,
- .decode = mpeg_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED |
- CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_DELAY,
- .flush = flush,
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video (VDPAU acceleration)"),
-};
-#endif

libav-v9.6.tar.bz2/libavcodec/mpeg12.h -> libav-v10.1.tar.bz2/libavcodec/mpeg12.h Changed

@@ -25,25 +25,21 @@
 #include "mpegvideo.h"
 
 #define DC_VLC_BITS 9
+#define MV_VLC_BITS 9
 #define TEX_VLC_BITS 9
 
+#define MBINCR_VLC_BITS 9
+#define MB_PAT_VLC_BITS 9
+#define MB_PTYPE_VLC_BITS 6
+#define MB_BTYPE_VLC_BITS 6
+
 extern VLC ff_dc_lum_vlc;
 extern VLC ff_dc_chroma_vlc;
-
-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 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?
- int closed_gop; ///< GOP is closed
- int extradata_decoded;
-} Mpeg1Context;
+extern VLC ff_mbincr_vlc;
+extern VLC ff_mb_ptype_vlc;
+extern VLC ff_mb_btype_vlc;
+extern VLC ff_mb_pat_vlc;
+extern VLC ff_mv_vlc;
 
 extern uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
 
@@ -71,6 +67,8 @@
 return diff;
 }
 
-extern int ff_mpeg1_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n);
+int ff_mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, int n);
+void ff_mpeg1_clean_buffers(MpegEncContext *s);
+int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s);
 
 #endif /* AVCODEC_MPEG12_H */

libav-v10.1.tar.bz2/libavcodec/mpeg12dec.c Added

@@ -0,0 +1,2714 @@
+/*
+ * MPEG-1/2 decoder
+ * Copyright (c) 2000, 2001 Fabrice Bellard
+ * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * MPEG-1/2 decoder
+ */
+
+#include "libavutil/attributes.h"
+#include "libavutil/internal.h"
+#include "libavutil/stereo3d.h"
+
+#include "avcodec.h"
+#include "bytestream.h"
+#include "dsputil.h"
+#include "error_resilience.h"
+#include "internal.h"
+#include "mpeg12.h"
+#include "mpeg12data.h"
+#include "mpegvideo.h"
+#include "thread.h"
+#include "version.h"
+#include "xvmc_internal.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 */
+ AVStereo3D stereo3d;
+ int has_stereo3d;
+ uint8_t *a53_caption;
+ int a53_caption_size;
+ int slice_count;
+ 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? */
+ int closed_gop; /* GOP is closed */
+ int first_slice;
+ int extradata_decoded;
+} Mpeg1Context;
+
+#define MB_TYPE_ZERO_MV 0x20000000
+
+static const uint32_t ptype2mb_type[7] = {
+ MB_TYPE_INTRA,
+ MB_TYPE_L0 | MB_TYPE_CBP | MB_TYPE_ZERO_MV | MB_TYPE_16x16,
+ MB_TYPE_L0,
+ MB_TYPE_L0 | MB_TYPE_CBP,
+ MB_TYPE_QUANT | MB_TYPE_INTRA,
+ MB_TYPE_QUANT | MB_TYPE_L0 | MB_TYPE_CBP | MB_TYPE_ZERO_MV | MB_TYPE_16x16,
+ MB_TYPE_QUANT | MB_TYPE_L0 | MB_TYPE_CBP,
+};
+
+static const uint32_t btype2mb_type[11] = {
+ MB_TYPE_INTRA,
+ MB_TYPE_L1,
+ MB_TYPE_L1 | MB_TYPE_CBP,
+ MB_TYPE_L0,
+ MB_TYPE_L0 | MB_TYPE_CBP,
+ MB_TYPE_L0L1,
+ MB_TYPE_L0L1 | MB_TYPE_CBP,
+ MB_TYPE_QUANT | MB_TYPE_INTRA,
+ MB_TYPE_QUANT | MB_TYPE_L1 | MB_TYPE_CBP,
+ MB_TYPE_QUANT | MB_TYPE_L0 | MB_TYPE_CBP,
+ MB_TYPE_QUANT | MB_TYPE_L0L1 | MB_TYPE_CBP,
+};
+
+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,
+};
+
+/* as H.263, but only 17 codes */
+static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred)
+{
+ int code, sign, val, shift;
+
+ code = get_vlc2(&s->gb, ff_mv_vlc.table, MV_VLC_BITS, 2);
+ if (code == 0)
+ return pred;
+ if (code < 0)
+ return 0xffff;
+
+ sign = get_bits1(&s->gb);
+ shift = fcode - 1;
+ val = code;
+ if (shift) {
+ val = (val - 1) << shift;
+ val |= get_bits(&s->gb, shift);
+ val++;
+ }
+ if (sign)
+ val = -val;
+ val += pred;
+
+ /* modulo decoding */
+ return sign_extend(val, 5 + shift);
+}
+
+#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;
+ const uint16_t *quant_matrix = s->intra_matrix;
+ const int qscale = s->qscale;
+
+ /* DC coefficient */
+ component = (n <= 3 ? 0 : n - 4 + 1);
+ diff = decode_dc(&s->gb, component);
+ if (diff >= 0xffff)
+ return -1;
+ dc = s->last_dc[component];
+ dc += diff;
+ s->last_dc[component] = dc;
+ block[0] = dc * quant_matrix[0];
+ av_dlog(s->avctx, "dc=%d diff=%d\n", dc, diff);
+ i = 0;
+ {
+ OPEN_READER(re, &s->gb);
+ /* 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);
+
+ if (level == 127) {
+ break;
+ } else 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);
+ } else {
+ /* escape */
+ 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);
+ if (level == -128) {
+ level = SHOW_UBITS(re, &s->gb, 8) - 256;
+ LAST_SKIP_BITS(re, &s->gb, 8);
+ } else if (level == 0) {
+ level = SHOW_UBITS(re, &s->gb, 8);
+ LAST_SKIP_BITS(re, &s->gb, 8);
+ }
+ i += run;
+ check_scantable_index(s, i);
+ j = scantable[i];
+ if (level < 0) {
+ level = -level;
+ level = (level * qscale * quant_matrix[j]) >> 4;
+ level = (level - 1) | 1;
+ level = -level;
+ } else {
+ level = (level * qscale * quant_matrix[j]) >> 4;
+ level = (level - 1) | 1;
+ }
+ }
+
+ block[j] = level;
+ }
+ CLOSE_READER(re, &s->gb);
+ }
+ s->block_last_index[n] = i;
+ return 0;
+}
+
+int ff_mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, int n)
+{
+ return mpeg1_decode_block_intra(s, block, 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;
+ const uint16_t *quant_matrix = s->inter_matrix;
+ 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) {
+ level = (3 * qscale * quant_matrix[0]) >> 5;
+ level = (level - 1) | 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)
+ 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);
+
+ 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);
+ SKIP_BITS(re, &s->gb, 1);
+ } else {
+ /* escape */
+ 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);
+ if (level == -128) {
+ 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);
+ }
+ i += run;
+ check_scantable_index(s, i);
+ j = scantable[i];
+ if (level < 0) {
+ level = -level;
+ level = ((level * 2 + 1) * qscale * quant_matrix[j]) >> 5;
+ level = (level - 1) | 1;
+ level = -level;
+ } else {
+ level = ((level * 2 + 1) * qscale * quant_matrix[j]) >> 5;
+ level = (level - 1) | 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;
+}
+
+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;
+
+ {
+ 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) {
+ level = (3 * qscale) >> 1;
+ level = (level - 1) | 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)
+ 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);
+
+ 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);
+ SKIP_BITS(re, &s->gb, 1);
+ } else {
+ /* escape */
+ 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);
+ if (level == -128) {
+ 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);
+ }
+ i += run;
+ check_scantable_index(s, i);
+ j = scantable[i];
+ if (level < 0) {
+ level = -level;
+ level = ((level * 2 + 1) * qscale) >> 1;
+ level = (level - 1) | 1;
+ level = -level;
+ } else {
+ level = ((level * 2 + 1) * qscale) >> 1;
+ level = (level - 1) | 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;
+}
+
+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;
+ const uint16_t *quant_matrix;
+ const int qscale = s->qscale;
+ int mismatch;
+
+ mismatch = 1;
+
+ {
+ OPEN_READER(re, &s->gb);
+ i = -1;
+ if (n < 4)
+ quant_matrix = s->inter_matrix;
+ else
+ quant_matrix = s->chroma_inter_matrix;
+
+ // 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 (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)
+ 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);
+
+ 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);
+ SKIP_BITS(re, &s->gb, 1);
+ } else {
+ /* escape */
+ 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);
+
+ i += run;
+ check_scantable_index(s, i);
+ j = scantable[i];
+ if (level < 0) {
+ level = ((-level * 2 + 1) * qscale * quant_matrix[j]) >> 5;
+ level = -level;
+ } else {
+ level = ((level * 2 + 1) * qscale * quant_matrix[j]) >> 5;
+ }
+ }
+
+ mismatch ^= level;
+ 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);
+ }
+ block[63] ^= (mismatch & 1);
+
+ s->block_last_index[n] = i;
+ return 0;
+}
+
+static inline int mpeg2_fast_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;
+ 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) {
+ 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)
+ 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);
+
+ if (level != 0) {
+ i += run;
+ check_scantable_index(s, i);
+ j = scantable[i];
+ level = ((level * 2 + 1) * qscale) >> 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);
+ UPDATE_CACHE(re, &s->gb);
+ 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) >> 1;
+ level = -level;
+ } else {
+ level = ((level * 2 + 1) * qscale) >> 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;
+}
+
+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;
+ const uint16_t *quant_matrix;
+ const int qscale = s->qscale;
+ int mismatch;
+
+ /* DC coefficient */
+ if (n < 4) {
+ quant_matrix = s->intra_matrix;
+ component = 0;
+ } else {
+ quant_matrix = s->chroma_intra_matrix;
+ component = (n & 1) + 1;
+ }
+ diff = decode_dc(&s->gb, component);
+ if (diff >= 0xffff)
+ return -1;
+ dc = s->last_dc[component];
+ dc += diff;
+ s->last_dc[component] = dc;
+ block[0] = dc << (3 - s->intra_dc_precision);
+ av_dlog(s->avctx, "dc=%d\n", block[0]);
+ mismatch = block[0] ^ 1;
+ i = 0;
+ if (s->intra_vlc_format)
+ rl = &ff_rl_mpeg2;
+ else
+ rl = &ff_rl_mpeg1;
+
+ {
+ OPEN_READER(re, &s->gb);
+ /* 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);
+
+ if (level == 127) {
+ break;
+ } else if (level != 0) {
+ i += run;
+ 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);
+ LAST_SKIP_BITS(re, &s->gb, 1);
+ } else {
+ /* escape */
+ 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);
+ i += run;
+ check_scantable_index(s, i);
+ j = scantable[i];
+ if (level < 0) {
+ level = (-level * qscale * quant_matrix[j]) >> 4;
+ level = -level;
+ } else {
+ level = (level * qscale * quant_matrix[j]) >> 4;
+ }
+ }
+
+ mismatch ^= level;
+ block[j] = level;
+ }
+ CLOSE_READER(re, &s->gb);
+ }
+ block[63] ^= mismatch & 1;
+
+ s->block_last_index[n] = i;
+ return 0;
+}
+
+static inline int mpeg2_fast_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;
+ const uint16_t *quant_matrix;
+ const int qscale = s->qscale;
+
+ /* DC coefficient */
+ if (n < 4) {
+ quant_matrix = s->intra_matrix;
+ component = 0;
+ } else {
+ quant_matrix = s->chroma_intra_matrix;
+ component = (n & 1) + 1;
+ }
+ diff = decode_dc(&s->gb, component);
+ if (diff >= 0xffff)
+ return -1;
+ dc = s->last_dc[component];
+ 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
+ rl = &ff_rl_mpeg1;
+
+ {
+ OPEN_READER(re, &s->gb);
+ /* 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);
+
+ if (level == 127) {
+ break;
+ } else if (level != 0) {
+ i += run;
+ 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);
+ LAST_SKIP_BITS(re, &s->gb, 1);
+ } else {
+ /* escape */
+ 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);
+ i += run;
+ check_scantable_index(s, i);
+ j = scantable[i];
+ if (level < 0) {
+ level = (-level * qscale * quant_matrix[j]) >> 4;
+ level = -level;
+ } else {
+ level = (level * qscale * quant_matrix[j]) >> 4;
+ }
+ }
+
+ block[j] = level;
+ }
+ CLOSE_READER(re, &s->gb);
+ }
+
+ s->block_last_index[n] = i;
+ return 0;
+}
+
+/******************************************/
+/* decoding */
+
+static inline int get_dmv(MpegEncContext *s)
+{
+ if (get_bits1(&s->gb))
+ return 1 - (get_bits1(&s->gb) << 1);
+ else
+ return 0;
+}
+
+static inline int get_qscale(MpegEncContext *s)
+{
+ int qscale = get_bits(&s->gb, 5);
+ if (s->q_scale_type)
+ return non_linear_qscale[qscale];
+ else
+ return qscale << 1;
+}
+
+/* motion type (for MPEG-2) */
+#define MT_FIELD 1
+#define MT_FRAME 2
+#define MT_16X8 2
+#define MT_DMV 3
+
+static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64])
+{
+ int i, j, k, cbp, val, mb_type, motion_type;
+ const int mb_block_count = 4 + (1 << s->chroma_format);
+
+ av_dlog(s->avctx, "decode_mb: x=%d y=%d\n", s->mb_x, s->mb_y);
+
+ assert(s->mb_skipped == 0);
+
+ 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;
+ } 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
+ // 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))
+ return -1;
+ s->current_picture.mb_type[s->mb_x + s->mb_y * s->mb_stride] =
+ mb_type | MB_TYPE_SKIP;
+// assert(s->current_picture.mb_type[s->mb_x + s->mb_y * s->mb_stride - 1] & (MB_TYPE_16x16 | MB_TYPE_16x8));
+
+ if ((s->mv[0][0][0] | s->mv[0][0][1] | s->mv[1][0][0] | s->mv[1][0][1]) == 0)
+ s->mb_skipped = 1;
+ }
+
+ return 0;
+ }
+
+ switch (s->pict_type) {
+ default:
+ 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);
+ return -1;
+ }
+ mb_type = MB_TYPE_QUANT | MB_TYPE_INTRA;
+ } else {
+ mb_type = MB_TYPE_INTRA;
+ }
+ break;
+ 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);
+ return -1;
+ }
+ mb_type = ptype2mb_type[mb_type];
+ break;
+ 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);
+ return -1;
+ }
+ mb_type = btype2mb_type[mb_type];
+ break;
+ }
+ av_dlog(s->avctx, "mb_type=%x\n", mb_type);
+// motion_type = 0; /* avoid warning */
+ if (IS_INTRA(mb_type)) {
+ s->dsp.clear_blocks(s->block[0]);
+
+ if (!s->chroma_y_shift)
+ s->dsp.clear_blocks(s->block[6]);
+
+ /* compute DCT type */
+ // 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);
+
+ if (s->concealment_motion_vectors) {
+ /* just parse them */
+ if (s->picture_structure != PICT_FRAME)
+ 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]);
+
+ skip_bits1(&s->gb); /* marker */
+ } else {
+ /* reset mv prediction */
+ memset(s->last_mv, 0, sizeof(s->last_mv));
+ }
+ s->mb_intra = 1;
+#if FF_API_XVMC
+FF_DISABLE_DEPRECATION_WARNINGS
+ // if 1, we memcpy blocks in xvmcvideo
+ if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1)
+ ff_xvmc_pack_pblocks(s, -1); // inter are always full blocks
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif /* FF_API_XVMC */
+
+ if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
+ if (s->flags2 & CODEC_FLAG2_FAST) {
+ 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++)
+ if (mpeg2_decode_block_intra(s, *s->pblocks[i], i) < 0)
+ return -1;
+ }
+ } else {
+ 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) {
+ assert(mb_type & MB_TYPE_CBP);
+
+ s->mv_dir = MV_DIR_FORWARD;
+ if (s->picture_structure == PICT_FRAME) {
+ if (!s->frame_pred_frame_dct)
+ 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->field_select[0][0] = s->picture_structure - 1;
+ }
+
+ if (IS_QUANT(mb_type))
+ s->qscale = get_qscale(s);
+
+ s->last_mv[0][0][0] = 0;
+ 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;
+ } else {
+ assert(mb_type & MB_TYPE_L0L1);
+ // FIXME decide if MBs in field pictures are MB_TYPE_INTERLACED
+ /* get additional motion vector type */
+ if (s->frame_pred_frame_dct) {
+ motion_type = MT_FRAME;
+ } 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);
+ }
+
+ if (IS_QUANT(mb_type))
+ s->qscale = get_qscale(s);
+
+ /* motion vectors */
+ s->mv_dir = (mb_type >> 13) & 3;
+ av_dlog(s->avctx, "motion_type=%d\n", motion_type);
+ switch (motion_type) {
+ case MT_FRAME: /* or MT_16X8 */
+ if (s->picture_structure == PICT_FRAME) {
+ 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]);
+ /* full_pel: only for MPEG-1 */
+ if (s->full_pel[i]) {
+ s->mv[i][0][0] <<= 1;
+ s->mv[i][0][1] <<= 1;
+ }
+ }
+ }
+ } else {
+ 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)) {
+ /* MT_16X8 */
+ for (j = 0; j < 2; j++) {
+ s->field_select[i][j] = get_bits1(&s->gb);
+ for (k = 0; k < 2; k++) {
+ val = mpeg_decode_motion(s, s->mpeg_f_code[i][k],
+ s->last_mv[i][j][k]);
+ s->last_mv[i][j][k] = val;
+ s->mv[i][j][k] = val;
+ }
+ }
+ }
+ }
+ }
+ break;
+ case MT_FIELD:
+ s->mv_type = MV_TYPE_FIELD;
+ if (s->picture_structure == PICT_FRAME) {
+ mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED;
+ for (i = 0; i < 2; i++) {
+ if (USES_LIST(mb_type, i)) {
+ for (j = 0; j < 2; j++) {
+ s->field_select[i][j] = get_bits1(&s->gb);
+ val = mpeg_decode_motion(s, s->mpeg_f_code[i][0],
+ s->last_mv[i][j][0]);
+ s->last_mv[i][j][0] = val;
+ s->mv[i][j][0] = val;
+ av_dlog(s->avctx, "fmx=%d\n", val);
+ val = mpeg_decode_motion(s, s->mpeg_f_code[i][1],
+ s->last_mv[i][j][1] >> 1);
+ s->last_mv[i][j][1] = val << 1;
+ s->mv[i][j][1] = val;
+ av_dlog(s->avctx, "fmy=%d\n", val);
+ }
+ }
+ }
+ } else {
+ mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED;
+ for (i = 0; i < 2; i++) {
+ if (USES_LIST(mb_type, i)) {
+ s->field_select[i][0] = get_bits1(&s->gb);
+ for (k = 0; k < 2; k++) {
+ val = mpeg_decode_motion(s, s->mpeg_f_code[i][k],
+ s->last_mv[i][0][k]);
+ s->last_mv[i][0][k] = val;
+ s->last_mv[i][1][k] = val;
+ s->mv[i][0][k] = val;
+ }
+ }
+ }
+ }
+ break;
+ case MT_DMV:
+ s->mv_type = MV_TYPE_DMV;
+ for (i = 0; i < 2; i++) {
+ if (USES_LIST(mb_type, i)) {
+ int dmx, dmy, mx, my, m;
+ const int my_shift = s->picture_structure == PICT_FRAME;
+
+ mx = mpeg_decode_motion(s, s->mpeg_f_code[i][0],
+ s->last_mv[i][0][0]);
+ s->last_mv[i][0][0] = mx;
+ s->last_mv[i][1][0] = mx;
+ dmx = get_dmv(s);
+ my = mpeg_decode_motion(s, s->mpeg_f_code[i][1],
+ s->last_mv[i][0][1] >> my_shift);
+ dmy = get_dmv(s);
+
+
+ s->last_mv[i][0][1] = my << my_shift;
+ s->last_mv[i][1][1] = my << my_shift;
+
+ s->mv[i][0][0] = mx;
+ s->mv[i][0][1] = my;
+ s->mv[i][1][0] = mx; // not used
+ s->mv[i][1][1] = my; // not used
+
+ if (s->picture_structure == PICT_FRAME) {
+ mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED;
+
+ // m = 1 + 2 * s->top_field_first;
+ m = s->top_field_first ? 1 : 3;
+
+ /* top -> top pred */
+ s->mv[i][2][0] = ((mx * m + (mx > 0)) >> 1) + dmx;
+ s->mv[i][2][1] = ((my * m + (my > 0)) >> 1) + dmy - 1;
+ m = 4 - m;
+ s->mv[i][3][0] = ((mx * m + (mx > 0)) >> 1) + dmx;
+ s->mv[i][3][1] = ((my * m + (my > 0)) >> 1) + dmy + 1;
+ } else {
+ mb_type |= MB_TYPE_16x16;
+
+ s->mv[i][2][0] = ((mx + (mx > 0)) >> 1) + dmx;
+ s->mv[i][2][1] = ((my + (my > 0)) >> 1) + dmy;
+ if (s->picture_structure == PICT_TOP_FIELD)
+ s->mv[i][2][1]--;
+ else
+ s->mv[i][2][1]++;
+ }
+ }
+ }
+ break;
+ default:
+ av_log(s->avctx, AV_LOG_ERROR,
+ "00 motion_type at %d %d\n", s->mb_x, s->mb_y);
+ return -1;
+ }
+ }
+
+ s->mb_intra = 0;
+ if (HAS_CBP(mb_type)) {
+ s->dsp.clear_blocks(s->block[0]);
+
+ 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]);
+ }
+ if (cbp <= 0) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "invalid cbp at %d %d\n", s->mb_x, s->mb_y);
+ return -1;
+ }
+
+#if FF_API_XVMC
+FF_DISABLE_DEPRECATION_WARNINGS
+ // if 1, we memcpy blocks in xvmcvideo
+ if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1)
+ ff_xvmc_pack_pblocks(s, cbp);
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif /* FF_API_XVMC */
+
+ if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
+ if (s->flags2 & CODEC_FLAG2_FAST) {
+ for (i = 0; i < 6; i++) {
+ if (cbp & 32)
+ mpeg2_fast_decode_block_non_intra(s, *s->pblocks[i], i);
+ else
+ s->block_last_index[i] = -1;
+ cbp += cbp;
+ }
+ } else {
+ cbp <<= 12 - mb_block_count;
+
+ for (i = 0; i < mb_block_count; i++) {
+ if (cbp & (1 << 11)) {
+ if (mpeg2_decode_block_non_intra(s, *s->pblocks[i], i) < 0)
+ return -1;
+ } else {
+ s->block_last_index[i] = -1;
+ }
+ cbp += cbp;
+ }
+ }
+ } else {
+ if (s->flags2 & CODEC_FLAG2_FAST) {
+ for (i = 0; i < 6; i++) {
+ if (cbp & 32)
+ mpeg1_fast_decode_block_inter(s, *s->pblocks[i], i);
+ else
+ s->block_last_index[i] = -1;
+ cbp += cbp;
+ }
+ } else {
+ for (i = 0; i < 6; i++) {
+ if (cbp & 32) {
+ if (mpeg1_decode_block_inter(s, *s->pblocks[i], i) < 0)
+ return -1;
+ } else {
+ s->block_last_index[i] = -1;
+ }
+ cbp += cbp;
+ }
+ }
+ }
+ } else {
+ for (i = 0; i < 12; i++)
+ s->block_last_index[i] = -1;
+ }
+ }
+
+ s->current_picture.mb_type[s->mb_x + s->mb_y * s->mb_stride] = mb_type;
+
+ return 0;
+}
+
+static av_cold int mpeg_decode_init(AVCodecContext *avctx)
+{
+ 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;
+
+ ff_MPV_decode_defaults(s2);
+
+ s->mpeg_enc_ctx.avctx = avctx;
+ s->mpeg_enc_ctx.flags = avctx->flags;
+ s->mpeg_enc_ctx.flags2 = avctx->flags2;
+ ff_mpeg12_common_init(&s->mpeg_enc_ctx);
+ ff_mpeg12_init_vlcs();
+
+ s->mpeg_enc_ctx_allocated = 0;
+ 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;
+ if (avctx->codec->id == AV_CODEC_ID_MPEG1VIDEO)
+ avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
+ else
+ avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
+ return 0;
+}
+
+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)
+ return 0;
+
+ err = ff_mpeg_update_thread_context(avctx, avctx_from);
+ if (err)
+ return err;
+
+ if (!ctx->mpeg_enc_ctx_allocated)
+ memcpy(s + 1, s1 + 1, sizeof(Mpeg1Context) - sizeof(MpegEncContext));
+
+ if (!(s->pict_type == AV_PICTURE_TYPE_B || s->low_delay))
+ s->picture_number++;
+
+ return 0;
+}
+
+static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm,
+ const uint8_t *new_perm)
+{
+ uint16_t temp_matrix[64];
+ int i;
+
+ memcpy(temp_matrix, matrix, 64 * sizeof(uint16_t));
+
+ for (i = 0; i < 64; i++)
+ matrix[new_perm[i]] = temp_matrix[old_perm[i]];
+}
+
+#if FF_API_XVMC
+static const enum AVPixelFormat pixfmt_xvmc_mpg2_420[] = {
+ AV_PIX_FMT_XVMC_MPEG2_IDCT,
+ AV_PIX_FMT_XVMC_MPEG2_MC,
+ AV_PIX_FMT_NONE
+};
+#endif /* FF_API_XVMC */
+
+static const enum AVPixelFormat mpeg12_hwaccel_pixfmt_list_420[] = {
+#if CONFIG_MPEG2_DXVA2_HWACCEL
+ AV_PIX_FMT_DXVA2_VLD,
+#endif
+#if CONFIG_MPEG2_VAAPI_HWACCEL
+ AV_PIX_FMT_VAAPI_VLD,
+#endif
+#if CONFIG_MPEG1_VDPAU_HWACCEL | CONFIG_MPEG2_VDPAU_HWACCEL
+ AV_PIX_FMT_VDPAU,
+#endif
+ AV_PIX_FMT_YUV420P,
+ AV_PIX_FMT_NONE
+};
+
+static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx)
+{
+ Mpeg1Context *s1 = avctx->priv_data;
+ MpegEncContext *s = &s1->mpeg_enc_ctx;
+
+#if FF_API_XVMC
+FF_DISABLE_DEPRECATION_WARNINGS
+ if (avctx->xvmc_acceleration)
+ return avctx->get_format(avctx, pixfmt_xvmc_mpg2_420);
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif /* FF_API_XVMC */
+
+ if (s->chroma_format < 2)
+ return avctx->get_format(avctx, mpeg12_hwaccel_pixfmt_list_420);
+ else if (s->chroma_format == 2)
+ return AV_PIX_FMT_YUV422P;
+ else
+ return AV_PIX_FMT_YUV444P;
+}
+
+/* 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;
+ 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 ||
+ 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 ||
+ 0) {
+ if (s1->mpeg_enc_ctx_allocated) {
+ ParseContext pc = s->parse_context;
+ s->parse_context.buffer = 0;
+ ff_MPV_common_end(s);
+ s->parse_context = pc;
+ }
+
+ if ((s->width == 0) || (s->height == 0))
+ return -2;
+
+ ret = ff_set_dimensions(avctx, s->width, s->height);
+ if (ret < 0)
+ return ret;
+
+ avctx->bit_rate = s->bit_rate;
+ s1->save_aspect_info = s->aspect_ratio_info;
+ s1->save_width = s->width;
+ s1->save_height = s->height;
+ s1->save_progressive_seq = s->progressive_sequence;
+
+ /* low_delay may be forced, in this case we will have B-frames
+ * that behave like P-frames. */
+ avctx->has_b_frames = !s->low_delay;
+
+ if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO) {
+ // 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
+ 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].den * s1->frame_rate_ext.den,
+ 1 << 30);
+ avctx->ticks_per_frame = 2;
+ // 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 */
+ 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 }))) {
+ s->avctx->sample_aspect_ratio =
+ av_div_q(ff_mpeg2_aspect[s->aspect_ratio_info],
+ (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
+// 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);
+ av_dlog(avctx, "B %d/%d\n", s->avctx->sample_aspect_ratio.num,
+ s->avctx->sample_aspect_ratio.den);
+ }
+ } else {
+ s->avctx->sample_aspect_ratio =
+ ff_mpeg2_aspect[s->aspect_ratio_info];
+ }
+ } // MPEG-2
+
+ avctx->pix_fmt = mpeg_get_pixelformat(avctx);
+ avctx->hwaccel = ff_find_hwaccel(avctx);
+ // until then pix_fmt may be changed right after codec init
+#if FF_API_XVMC
+ if ((avctx->pix_fmt == AV_PIX_FMT_XVMC_MPEG2_IDCT ||
+ avctx->hwaccel) && avctx->idct_algo == FF_IDCT_AUTO)
+#else
+ if (avctx->hwaccel && avctx->idct_algo == FF_IDCT_AUTO)
+#endif /* FF_API_XVMC */
+ avctx->idct_algo = FF_IDCT_SIMPLE;
+
+ /* Quantization matrices may need reordering
+ * if DCT permutation is changed. */
+ memcpy(old_permutation, s->dsp.idct_permutation, 64 * sizeof(uint8_t));
+
+ if (ff_MPV_common_init(s) < 0)
+ return -2;
+
+ quant_matrix_rebuild(s->intra_matrix, old_permutation, s->dsp.idct_permutation);
+ quant_matrix_rebuild(s->inter_matrix, old_permutation, s->dsp.idct_permutation);
+ quant_matrix_rebuild(s->chroma_intra_matrix, old_permutation, s->dsp.idct_permutation);
+ quant_matrix_rebuild(s->chroma_inter_matrix, old_permutation, s->dsp.idct_permutation);
+
+ s1->mpeg_enc_ctx_allocated = 1;
+ }
+ return 0;
+}
+
+static int mpeg1_decode_picture(AVCodecContext *avctx, const uint8_t *buf,
+ int buf_size)
+{
+ 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);
+
+ ref = get_bits(&s->gb, 10); /* temporal ref */
+ s->pict_type = get_bits(&s->gb, 3);
+ if (s->pict_type == 0 || s->pict_type > 3)
+ return -1;
+
+ vbv_delay = get_bits(&s->gb, 16);
+ 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))
+ return -1;
+ s->mpeg_f_code[0][0] = f_code;
+ s->mpeg_f_code[0][1] = f_code;
+ }
+ if (s->pict_type == AV_PICTURE_TYPE_B) {
+ s->full_pel[1] = get_bits1(&s->gb);
+ f_code = get_bits(&s->gb, 3);
+ if (f_code == 0 && (avctx->err_recognition & AV_EF_BITSTREAM))
+ return -1;
+ s->mpeg_f_code[1][0] = f_code;
+ s->mpeg_f_code[1][1] = f_code;
+ }
+ s->current_picture.f.pict_type = s->pict_type;
+ 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);
+
+ s->y_dc_scale = 8;
+ s->c_dc_scale = 8;
+ return 0;
+}
+
+static void mpeg_decode_sequence_extension(Mpeg1Context *s1)
+{
+ 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->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);
+ s->width |= (horiz_size_ext << 12);
+ s->height |= (vert_size_ext << 12);
+ bit_rate_ext = get_bits(&s->gb, 12); /* XXX: handle it */
+ s->bit_rate += (bit_rate_ext << 18) * 400;
+ skip_bits1(&s->gb); /* marker */
+ s->avctx->rc_buffer_size += get_bits(&s->gb, 8) * 1024 * 16 << 10;
+
+ s->low_delay = get_bits1(&s->gb);
+ if (s->flags & CODEC_FLAG_LOW_DELAY)
+ s->low_delay = 1;
+
+ s1->frame_rate_ext.num = get_bits(&s->gb, 2) + 1;
+ 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;
+
+ if (s->avctx->debug & FF_DEBUG_PICT_INFO)
+ av_log(s->avctx, AV_LOG_DEBUG,
+ "profile: %d, level: %d vbv buffer: %d, bitrate:%d\n",
+ s->avctx->profile, s->avctx->level,
+ s->avctx->rc_buffer_size, s->bit_rate);
+}
+
+static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1)
+{
+ MpegEncContext *s = &s1->mpeg_enc_ctx;
+ int color_description, w, h;
+
+ skip_bits(&s->gb, 3); /* video format */
+ color_description = get_bits1(&s->gb);
+ if (color_description) {
+ s->avctx->color_primaries = get_bits(&s->gb, 8);
+ s->avctx->color_trc = get_bits(&s->gb, 8);
+ s->avctx->colorspace = get_bits(&s->gb, 8);
+ }
+ w = get_bits(&s->gb, 14);
+ skip_bits(&s->gb, 1); // marker
+ h = get_bits(&s->gb, 14);
+ // remaining 3 bits are zero padding
+
+ s1->pan_scan.width = 16 * w;
+ s1->pan_scan.height = 16 * h;
+
+ if (s->avctx->debug & FF_DEBUG_PICT_INFO)
+ av_log(s->avctx, AV_LOG_DEBUG, "sde w:%d, h:%d\n", w, h);
+}
+
+static void mpeg_decode_picture_display_extension(Mpeg1Context *s1)
+{
+ MpegEncContext *s = &s1->mpeg_enc_ctx;
+ int i, nofco;
+
+ nofco = 1;
+ if (s->progressive_sequence) {
+ if (s->repeat_first_field) {
+ nofco++;
+ if (s->top_field_first)
+ nofco++;
+ }
+ } else {
+ if (s->picture_structure == PICT_FRAME) {
+ nofco++;
+ if (s->repeat_first_field)
+ nofco++;
+ }
+ }
+ for (i = 0; i < nofco; i++) {
+ s1->pan_scan.position[i][0] = get_sbits(&s->gb, 16);
+ skip_bits(&s->gb, 1); // marker
+ s1->pan_scan.position[i][1] = get_sbits(&s->gb, 16);
+ skip_bits(&s->gb, 1); // marker
+ }
+
+ if (s->avctx->debug & FF_DEBUG_PICT_INFO)
+ av_log(s->avctx, AV_LOG_DEBUG, "pde (%d,%d) (%d,%d) (%d,%d)\n",
+ s1->pan_scan.position[0][0], s1->pan_scan.position[0][1],
+ s1->pan_scan.position[1][0], s1->pan_scan.position[1][1],
+ 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)
+{
+ int i;
+
+ for (i = 0; i < 64; i++) {
+ int j = s->dsp.idct_permutation[ff_zigzag_direct[i]];
+ int v = get_bits(&s->gb, 8);
+ if (v == 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "matrix damaged\n");
+ return -1;
+ }
+ if (intra && i == 0 && v != 8) {
+ av_log(s->avctx, AV_LOG_ERROR, "intra matrix invalid, ignoring\n");
+ v = 8; // needed by pink.mpg / issue1046
+ }
+ matrix0[j] = v;
+ if (matrix1)
+ matrix1[j] = v;
+ }
+ return 0;
+}
+
+static void mpeg_decode_quant_matrix_extension(MpegEncContext *s)
+{
+ 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);
+}
+
+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->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");
+ 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;
+ else
+ s->pict_type = AV_PICTURE_TYPE_P;
+ } else
+ s->pict_type = AV_PICTURE_TYPE_B;
+ s->current_picture.f.pict_type = s->pict_type;
+ s->current_picture.f.key_frame = s->pict_type == AV_PICTURE_TYPE_I;
+ }
+ s->intra_dc_precision = get_bits(&s->gb, 2);
+ s->picture_structure = get_bits(&s->gb, 2);
+ s->top_field_first = get_bits1(&s->gb);
+ s->frame_pred_frame_dct = get_bits1(&s->gb);
+ s->concealment_motion_vectors = get_bits1(&s->gb);
+ s->q_scale_type = get_bits1(&s->gb);
+ s->intra_vlc_format = get_bits1(&s->gb);
+ s->alternate_scan = get_bits1(&s->gb);
+ s->repeat_first_field = get_bits1(&s->gb);
+ s->chroma_420_type = get_bits1(&s->gb);
+ s->progressive_frame = get_bits1(&s->gb);
+
+ if (s->progressive_sequence && !s->progressive_frame) {
+ s->progressive_frame = 1;
+ av_log(s->avctx, AV_LOG_ERROR,
+ "interlaced frame in progressive sequence, ignoring\n");
+ }
+
+ if (s->picture_structure == 0 ||
+ (s->progressive_frame && s->picture_structure != PICT_FRAME)) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "picture_structure %d invalid, ignoring\n",
+ s->picture_structure);
+ s->picture_structure = PICT_FRAME;
+ }
+
+ if (s->progressive_sequence && !s->frame_pred_frame_dct)
+ av_log(s->avctx, AV_LOG_WARNING, "invalid frame_pred_frame_dct\n");
+
+ if (s->picture_structure == PICT_FRAME) {
+ s->first_field = 0;
+ s->v_edge_pos = 16 * s->mb_height;
+ } else {
+ s->first_field ^= 1;
+ s->v_edge_pos = 8 * s->mb_height;
+ memset(s->mbskip_table, 0, s->mb_stride * s->mb_height);
+ }
+
+ 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);
+ } 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);
+ }
+
+ /* composite display not parsed */
+ av_dlog(s->avctx, "intra_dc_precision=%d\n", s->intra_dc_precision);
+ av_dlog(s->avctx, "picture_structure=%d\n", s->picture_structure);
+ av_dlog(s->avctx, "top field first=%d\n", s->top_field_first);
+ av_dlog(s->avctx, "repeat first field=%d\n", s->repeat_first_field);
+ av_dlog(s->avctx, "conceal=%d\n", s->concealment_motion_vectors);
+ av_dlog(s->avctx, "intra_vlc_format=%d\n", s->intra_vlc_format);
+ av_dlog(s->avctx, "alternate_scan=%d\n", s->alternate_scan);
+ av_dlog(s->avctx, "frame_pred_frame_dct=%d\n", s->frame_pred_frame_dct);
+ av_dlog(s->avctx, "progressive_frame=%d\n", s->progressive_frame);
+}
+
+static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size)
+{
+ AVCodecContext *avctx = s->avctx;
+ Mpeg1Context *s1 = (Mpeg1Context *) s;
+
+ /* start frame decoding */
+ if (s->first_field || s->picture_structure == PICT_FRAME) {
+ AVFrameSideData *pan_scan;
+
+ if (ff_MPV_frame_start(s, avctx) < 0)
+ return -1;
+
+ ff_mpeg_er_frame_start(s);
+
+ /* first check if we must repeat the frame */
+ s->current_picture_ptr->f.repeat_pict = 0;
+ if (s->repeat_first_field) {
+ if (s->progressive_sequence) {
+ if (s->top_field_first)
+ s->current_picture_ptr->f.repeat_pict = 4;
+ else
+ s->current_picture_ptr->f.repeat_pict = 2;
+ } else if (s->progressive_frame) {
+ s->current_picture_ptr->f.repeat_pict = 1;
+ }
+ }
+
+ pan_scan = av_frame_new_side_data(&s->current_picture_ptr->f,
+ AV_FRAME_DATA_PANSCAN,
+ sizeof(s1->pan_scan));
+ if (!pan_scan)
+ 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
+ int i;
+
+ if (!s->current_picture_ptr) {
+ av_log(s->avctx, AV_LOG_ERROR, "first field missing\n");
+ return -1;
+ }
+
+ 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");
+ }
+
+ 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 (avctx->hwaccel) {
+ if (avctx->hwaccel->start_frame(avctx, buf, buf_size) < 0)
+ return -1;
+ }
+
+#if FF_API_XVMC
+FF_DISABLE_DEPRECATION_WARNINGS
+// 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;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif /* FF_API_XVMC */
+
+ return 0;
+}
+
+#define DECODE_SLICE_ERROR -1
+#define DECODE_SLICE_OK 0
+
+/**
+ * Decode a slice.
+ * MpegEncContext.mb_y must be set to the MB row from the startcode.
+ * @return DECODE_SLICE_ERROR if the slice is damaged,
+ * DECODE_SLICE_OK if this slice is OK
+ */
+static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
+ const uint8_t **buf, int buf_size)
+{
+ AVCodecContext *avctx = s->avctx;
+ const int field_pic = s->picture_structure != PICT_FRAME;
+
+ s->resync_mb_x =
+ s->resync_mb_y = -1;
+
+ assert(mb_y < s->mb_height);
+
+ init_get_bits(&s->gb, *buf, buf_size * 8);
+
+ ff_mpeg1_clean_buffers(s);
+ s->interlaced_dct = 0;
+
+ s->qscale = get_qscale(s);
+
+ if (s->qscale == 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "qscale == 0\n");
+ return -1;
+ }
+
+ /* extra slice info */
+ while (get_bits1(&s->gb) != 0)
+ skip_bits(&s->gb, 8);
+
+ s->mb_x = 0;
+
+ if (mb_y == 0 && s->codec_tag == AV_RL32("SLIF")) {
+ skip_bits1(&s->gb);
+ } else {
+ while (get_bits_left(&s->gb) > 0) {
+ int code = get_vlc2(&s->gb, ff_mbincr_vlc.table,
+ MBINCR_VLC_BITS, 2);
+ if (code < 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "first mb_incr damaged\n");
+ return -1;
+ }
+ if (code >= 33) {
+ if (code == 33)
+ s->mb_x += 33;
+ /* otherwise, stuffing, nothing to do */
+ } else {
+ s->mb_x += code;
+ break;
+ }
+ }
+ }
+
+ if (s->mb_x >= (unsigned) s->mb_width) {
+ av_log(s->avctx, AV_LOG_ERROR, "initial skip overflow\n");
+ return -1;
+ }
+
+ if (avctx->hwaccel) {
+ 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);
+ if (buf_end < *buf + buf_size)
+ buf_end -= 4;
+ s->mb_y = mb_y;
+ if (avctx->hwaccel->decode_slice(avctx, buf_start, buf_end - buf_start) < 0)
+ return DECODE_SLICE_ERROR;
+ *buf = buf_end;
+ return DECODE_SLICE_OK;
+ }
+
+ s->resync_mb_x = s->mb_x;
+ s->resync_mb_y = s->mb_y = mb_y;
+ s->mb_skip_run = 0;
+ ff_init_block_index(s);
+
+ 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" : "");
+ }
+ }
+
+ for (;;) {
+#if FF_API_XVMC
+FF_DISABLE_DEPRECATION_WARNINGS
+ // If 1, we memcpy blocks in xvmcvideo.
+ if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1)
+ ff_xvmc_init_block(s); // set s->block
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif /* FF_API_XVMC */
+
+ if (mpeg_decode_mb(s, s->block) < 0)
+ return -1;
+
+ // 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);
+ int motion_x, motion_y, dir, i;
+
+ 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)) {
+ motion_x = motion_y = 0;
+ } 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)) */
+ 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 + 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 + 1] = s->field_select[dir][i];
+ assert(s->field_select[dir][i] == 0 ||
+ s->field_select[dir][i] == 1);
+ }
+ xy += wrap;
+ b8_xy += 2;
+ }
+ }
+
+ s->dest[0] += 16;
+ s->dest[1] += 16 >> s->chroma_x_shift;
+ s->dest[2] += 16 >> s->chroma_x_shift;
+
+ ff_MPV_decode_mb(s, s->block);
+
+ if (++s->mb_x >= s->mb_width) {
+ const int mb_size = 16;
+
+ 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_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 */;
+
+ if (left < 0 ||
+ (left && show_bits(&s->gb, FFMIN(left, 23)) && !is_d10) ||
+ ((avctx->err_recognition & AV_EF_BUFFER) && 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;
+ }
+
+ ff_init_block_index(s);
+ }
+
+ /* skip mb handling */
+ if (s->mb_skip_run == -1) {
+ /* read increment again */
+ s->mb_skip_run = 0;
+ for (;;) {
+ int code = get_vlc2(&s->gb, ff_mbincr_vlc.table,
+ MBINCR_VLC_BITS, 2);
+ if (code < 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "mb incr damaged\n");
+ return -1;
+ }
+ if (code >= 33) {
+ if (code == 33) {
+ s->mb_skip_run += 33;
+ } else if (code == 35) {
+ if (s->mb_skip_run != 0 || show_bits(&s->gb, 15) != 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "slice mismatch\n");
+ return -1;
+ }
+ goto eos; /* end of slice */
+ }
+ /* otherwise, stuffing, nothing to do */
+ } else {
+ s->mb_skip_run += code;
+ break;
+ }
+ }
+ 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);
+ return -1;
+ }
+
+ /* skip mb */
+ s->mb_intra = 0;
+ for (i = 0; i < 12; i++)
+ s->block_last_index[i] = -1;
+ if (s->picture_structure == PICT_FRAME)
+ s->mv_type = MV_TYPE_16X16;
+ else
+ s->mv_type = MV_TYPE_FIELD;
+ if (s->pict_type == AV_PICTURE_TYPE_P) {
+ /* if P type, zero motion vector is implied */
+ s->mv_dir = MV_DIR_FORWARD;
+ s->mv[0][0][0] = s->mv[0][0][1] = 0;
+ s->last_mv[0][0][0] = s->last_mv[0][0][1] = 0;
+ s->last_mv[0][1][0] = s->last_mv[0][1][1] = 0;
+ s->field_select[0][0] = (s->picture_structure - 1) & 1;
+ } else {
+ /* if B type, reuse previous vectors and directions */
+ s->mv[0][0][0] = s->last_mv[0][0][0];
+ s->mv[0][0][1] = s->last_mv[0][0][1];
+ s->mv[1][0][0] = s->last_mv[1][0][0];
+ s->mv[1][0][1] = s->last_mv[1][0][1];
+ }
+ }
+ }
+ }
+eos: // end of slice
+ *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;
+ const uint8_t *buf = s->gb.buffer;
+ int mb_y = s->start_mb_y;
+ const int field_pic = s->picture_structure != PICT_FRAME;
+
+ s->er.error_count = (3 * (s->end_mb_y - s->start_mb_y) * s->mb_width) >> field_pic;
+
+ for (;;) {
+ uint32_t start_code;
+ int ret;
+
+ ret = mpeg_decode_slice(s, mb_y, &buf, s->gb.buffer_end - buf);
+ emms_c();
+ av_dlog(c, "ret:%d resync:%d/%d mb:%d/%d ts:%d/%d ec:%d\n",
+ ret, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y,
+ s->start_mb_y, s->end_mb_y, s->er.error_count);
+ if (ret < 0) {
+ 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);
+ } 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);
+ }
+
+ 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) << field_pic;
+ if (s->picture_structure == PICT_BOTTOM_FIELD)
+ mb_y++;
+ if (mb_y < 0 || mb_y >= s->end_mb_y)
+ return -1;
+ }
+}
+
+/**
+ * Handle slice ends.
+ * @return 1 if it seems to be the last slice
+ */
+static int slice_end(AVCodecContext *avctx, AVFrame *pict)
+{
+ Mpeg1Context *s1 = avctx->priv_data;
+ MpegEncContext *s = &s1->mpeg_enc_ctx;
+
+ if (!s1->mpeg_enc_ctx_allocated || !s->current_picture_ptr)
+ return 0;
+
+ 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");
+ }
+
+#if FF_API_XVMC
+FF_DISABLE_DEPRECATION_WARNINGS
+ if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration)
+ ff_xvmc_field_end(s);
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif /* FF_API_XVMC */
+
+ /* end of slice reached */
+ if (/* s->mb_y << field_pic == s->mb_height && */ !s->first_field) {
+ /* end of image */
+
+ ff_er_frame_end(&s->er);
+
+ ff_MPV_frame_end(s);
+
+ if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) {
+ int ret = av_frame_ref(pict, &s->current_picture_ptr->f);
+ if (ret < 0)
+ return ret;
+ ff_print_debug_info(s, s->current_picture_ptr);
+ } else {
+ if (avctx->active_thread_type & FF_THREAD_FRAME)
+ s->picture_number++;
+ /* latency of 1 frame for I- and P-frames */
+ /* XXX: use another variable than picture_number */
+ if (s->last_picture_ptr != NULL) {
+ int ret = av_frame_ref(pict, &s->last_picture_ptr->f);
+ if (ret < 0)
+ return ret;
+ ff_print_debug_info(s, s->last_picture_ptr);
+ }
+ }
+
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
+static int mpeg1_decode_sequence(AVCodecContext *avctx,
+ const uint8_t *buf, int buf_size)
+{
+ 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);
+
+ 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");
+ if (avctx->err_recognition & AV_EF_BITSTREAM)
+ return AVERROR_INVALIDDATA;
+ }
+ s->aspect_ratio_info = get_bits(&s->gb, 4);
+ if (s->aspect_ratio_info == 0) {
+ av_log(avctx, AV_LOG_ERROR, "aspect ratio has forbidden 0 value\n");
+ if (avctx->err_recognition & AV_EF_BITSTREAM)
+ return -1;
+ }
+ s->frame_rate_index = get_bits(&s->gb, 4);
+ if (s->frame_rate_index == 0 || s->frame_rate_index > 13)
+ return -1;
+ s->bit_rate = get_bits(&s->gb, 18) * 400;
+ if (get_bits1(&s->gb) == 0) /* marker */
+ return -1;
+ s->width = width;
+ s->height = height;
+
+ s->avctx->rc_buffer_size = get_bits(&s->gb, 10) * 1024 * 16;
+ skip_bits(&s->gb, 1);
+
+ /* get matrix */
+ if (get_bits1(&s->gb)) {
+ load_matrix(s, s->chroma_intra_matrix, s->intra_matrix, 1);
+ } else {
+ for (i = 0; i < 64; i++) {
+ j = s->dsp.idct_permutation[i];
+ v = ff_mpeg1_default_intra_matrix[i];
+ s->intra_matrix[j] = v;
+ s->chroma_intra_matrix[j] = v;
+ }
+ }
+ if (get_bits1(&s->gb)) {
+ load_matrix(s, s->chroma_inter_matrix, s->inter_matrix, 0);
+ } else {
+ for (i = 0; i < 64; i++) {
+ int j = s->dsp.idct_permutation[i];
+ v = ff_mpeg1_default_non_intra_matrix[i];
+ s->inter_matrix[j] = v;
+ s->chroma_inter_matrix[j] = v;
+ }
+ }
+
+ if (show_bits(&s->gb, 23) != 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "sequence header damaged\n");
+ return -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->frame_pred_frame_dct = 1;
+ s->chroma_format = 1;
+ s->codec_id =
+ s->avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO;
+ s->out_format = FMT_MPEG1;
+ if (s->flags & CODEC_FLAG_LOW_DELAY)
+ s->low_delay = 1;
+
+ if (s->avctx->debug & FF_DEBUG_PICT_INFO)
+ av_log(s->avctx, AV_LOG_DEBUG, "vbv buffer: %d, bitrate:%d\n",
+ s->avctx->rc_buffer_size, s->bit_rate);
+
+ return 0;
+}
+
+static int vcr2_init_sequence(AVCodecContext *avctx)
+{
+ Mpeg1Context *s1 = avctx->priv_data;
+ MpegEncContext *s = &s1->mpeg_enc_ctx;
+ int i, v;
+
+ /* start new MPEG-1 context decoding */
+ s->out_format = FMT_MPEG1;
+ if (s1->mpeg_enc_ctx_allocated) {
+ ff_MPV_common_end(s);
+ }
+ s->width = avctx->coded_width;
+ s->height = avctx->coded_height;
+ avctx->has_b_frames = 0; // true?
+ s->low_delay = 1;
+
+ avctx->pix_fmt = mpeg_get_pixelformat(avctx);
+ avctx->hwaccel = ff_find_hwaccel(avctx);
+
+#if FF_API_XVMC
+ if ((avctx->pix_fmt == AV_PIX_FMT_XVMC_MPEG2_IDCT || avctx->hwaccel) &&
+ avctx->idct_algo == FF_IDCT_AUTO)
+#else
+ if (avctx->hwaccel && avctx->idct_algo == FF_IDCT_AUTO)
+#endif /* FF_API_XVMC */
+ avctx->idct_algo = FF_IDCT_SIMPLE;
+
+ if (ff_MPV_common_init(s) < 0)
+ return -1;
+ s1->mpeg_enc_ctx_allocated = 1;
+
+ for (i = 0; i < 64; i++) {
+ int j = s->dsp.idct_permutation[i];
+ v = ff_mpeg1_default_intra_matrix[i];
+ s->intra_matrix[j] = v;
+ s->chroma_intra_matrix[j] = v;
+
+ v = ff_mpeg1_default_non_intra_matrix[i];
+ s->inter_matrix[j] = v;
+ s->chroma_inter_matrix[j] = v;
+ }
+
+ s->progressive_sequence = 1;
+ s->progressive_frame = 1;
+ s->picture_structure = PICT_FRAME;
+ s->frame_pred_frame_dct = 1;
+ s->chroma_format = 1;
+ s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO;
+ s1->save_width = s->width;
+ s1->save_height = s->height;
+ s1->save_progressive_seq = s->progressive_sequence;
+ 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)
+{
+ const uint8_t *buf_end = p + buf_size;
+
+ /* we parse the DTG active format information */
+ if (buf_end - p >= 5 &&
+ p[0] == 'D' && p[1] == 'T' && p[2] == 'G' && p[3] == '1') {
+ int flags = p[4];
+ p += 5;
+ if (flags & 0x80) {
+ /* skip event id */
+ p += 2;
+ }
+ if (flags & 0x40) {
+ if (buf_end - p < 1)
+ 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;
+ }
+}
+
+static void mpeg_decode_gop(AVCodecContext *avctx,
+ const uint8_t *buf, int buf_size)
+{
+ Mpeg1Context *s1 = avctx->priv_data;
+ MpegEncContext *s = &s1->mpeg_enc_ctx;
+
+ int time_code_hours, time_code_minutes;
+ int time_code_seconds, time_code_pictures;
+ int broken_link;
+
+ init_get_bits(&s->gb, buf, buf_size * 8);
+
+ skip_bits1(&s->gb); /* drop_frame_flag */
+
+ time_code_hours = get_bits(&s->gb, 5);
+ time_code_minutes = get_bits(&s->gb, 6);
+ skip_bits1(&s->gb); // marker bit
+ time_code_seconds = get_bits(&s->gb, 6);
+ time_code_pictures = get_bits(&s->gb, 6);
+
+ s1->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 = get_bits1(&s->gb);
+
+ if (s->avctx->debug & FF_DEBUG_PICT_INFO)
+ av_log(s->avctx, AV_LOG_DEBUG,
+ "GOP (%2d:%02d:%02d.[%02d]) closed_gop=%d broken_link=%d\n",
+ time_code_hours, time_code_minutes, time_code_seconds,
+ time_code_pictures, s1->closed_gop, broken_link);
+}
+
+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;
+ const uint8_t *buf_ptr = buf;
+ const uint8_t *buf_end = buf + buf_size;
+ int ret, input_size;
+ int last_code = 0, skip_frame = 0;
+
+ for (;;) {
+ /* find next start code */
+ uint32_t start_code = -1;
+ 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) &&
+ !avctx->hwaccel) {
+ int i;
+
+ 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;
+ }
+
+ ret = slice_end(avctx, picture);
+ if (ret < 0)
+ return ret;
+ else if (ret) {
+ // FIXME: merge with the stuff in mpeg_decode_slice
+ if (s2->last_picture_ptr || s2->low_delay)
+ *got_output = 1;
+ }
+ }
+ s2->pict_type = 0;
+ 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);
+
+ /* 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);
+ s->sync = 1;
+ } else {
+ 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;
+ }
+ break;
+
+ case PICTURE_START_CODE:
+ if (s2->width <= 0 || s2->height <= 0) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid frame dimensions %dx%d.\n",
+ s2->width, s2->height);
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_SLICE) &&
+ !avctx->hwaccel && s->slice_count) {
+ int i;
+
+ avctx->execute(avctx, slice_decode_thread,
+ s2->thread_context, 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;
+ s->slice_count = 0;
+ }
+ 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");
+ return ret;
+ }
+
+ /* We have a complete image: we try to decompress it. */
+ if (mpeg1_decode_picture(avctx, buf_ptr, input_size) < 0)
+ s2->pict_type = 0;
+ s->first_slice = 1;
+ last_code = PICTURE_START_CODE;
+ } else {
+ 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);
+
+ switch (get_bits(&s2->gb, 4)) {
+ case 0x1:
+ if (last_code == 0) {
+ mpeg_decode_sequence_extension(s);
+ } else {
+ av_log(avctx, AV_LOG_ERROR,
+ "ignoring seq ext after %X\n", last_code);
+ if (avctx->err_recognition & AV_EF_EXPLODE)
+ return AVERROR_INVALIDDATA;
+ }
+ break;
+ case 0x2:
+ mpeg_decode_sequence_display_extension(s);
+ break;
+ case 0x3:
+ mpeg_decode_quant_matrix_extension(s2);
+ break;
+ case 0x7:
+ mpeg_decode_picture_display_extension(s);
+ break;
+ case 0x8:
+ 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);
+ if (avctx->err_recognition & AV_EF_EXPLODE)
+ return AVERROR_INVALIDDATA;
+ }
+ break;
+ }
+ break;
+ case USER_START_CODE:
+ mpeg_decode_user_data(avctx, buf_ptr, input_size);
+ break;
+ case GOP_START_CODE:
+ if (last_code == 0) {
+ s2->first_field = 0;
+ mpeg_decode_gop(avctx, buf_ptr, input_size);
+ s->sync = 1;
+ } else {
+ 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;
+ }
+ break;
+ default:
+ if (start_code >= SLICE_MIN_START_CODE &&
+ start_code <= SLICE_MAX_START_CODE && last_code != 0) {
+ const int field_pic = s2->picture_structure != PICT_FRAME;
+ int mb_y = (start_code - SLICE_MIN_START_CODE) << field_pic;
+ last_code = SLICE_MIN_START_CODE;
+
+ if (s2->picture_structure == PICT_BOTTOM_FIELD)
+ mb_y++;
+
+ if (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. */
+ if (s2->pict_type == AV_PICTURE_TYPE_B) {
+ if (!s->closed_gop) {
+ skip_frame = 1;
+ break;
+ }
+ }
+ }
+ if (s2->pict_type == AV_PICTURE_TYPE_I)
+ 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. */
+ 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) {
+ skip_frame = 1;
+ break;
+ }
+
+ if (!s->mpeg_enc_ctx_allocated)
+ break;
+
+ if (s2->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
+ if (mb_y < avctx->skip_top ||
+ mb_y >= s2->mb_height - avctx->skip_bottom)
+ break;
+ }
+
+ if (!s2->pict_type) {
+ av_log(avctx, AV_LOG_ERROR, "Missing picture start code\n");
+ if (avctx->err_recognition & AV_EF_EXPLODE)
+ return AVERROR_INVALIDDATA;
+ break;
+ }
+
+ 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");
+ return AVERROR_INVALIDDATA;
+ }
+
+ 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) /
+ s2->slice_context_count;
+ if (threshold <= mb_y) {
+ MpegEncContext *thread_context = s2->thread_context[s->slice_count];
+
+ 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);
+ if (ret < 0)
+ return ret;
+ }
+ 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
+ } else {
+ ret = mpeg_decode_slice(s2, mb_y, &buf_ptr, input_size);
+ emms_c();
+
+ if (ret < 0) {
+ 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);
+ } 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);
+ }
+ }
+ }
+ break;
+ }
+ }
+}
+
+static int mpeg_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_output, AVPacket *avpkt)
+{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ Mpeg1Context *s = avctx->priv_data;
+ AVFrame *picture = data;
+ MpegEncContext *s2 = &s->mpeg_enc_ctx;
+ av_dlog(avctx, "fill_buffer\n");
+
+ if (buf_size == 0 || (buf_size == 4 && AV_RB32(buf) == SEQ_END_CODE)) {
+ /* special case for last picture */
+ if (s2->low_delay == 0 && s2->next_picture_ptr) {
+ int ret = av_frame_ref(picture, &s2->next_picture_ptr->f);
+ if (ret < 0)
+ return ret;
+
+ s2->next_picture_ptr = NULL;
+
+ *got_output = 1;
+ }
+ return buf_size;
+ }
+
+ if (s2->flags & CODEC_FLAG_TRUNCATED) {
+ 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)
+ return buf_size;
+ }
+
+ if (s->mpeg_enc_ctx_allocated == 0 && avctx->codec_tag == AV_RL32("VCR2"))
+ vcr2_init_sequence(avctx);
+
+ s->slice_count = 0;
+
+ if (avctx->extradata && !s->extradata_decoded) {
+ int ret = decode_chunks(avctx, picture, got_output,
+ avctx->extradata, avctx->extradata_size);
+ s->extradata_decoded = 1;
+ if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE))
+ return ret;
+ }
+
+ return decode_chunks(avctx, picture, got_output, buf, buf_size);
+}
+
+static void flush(AVCodecContext *avctx)
+{
+ Mpeg1Context *s = avctx->priv_data;
+
+ s->sync = 0;
+ s->closed_gop = 0;
+
+ ff_mpeg_flush(avctx);
+}
+
+static av_cold int mpeg_decode_end(AVCodecContext *avctx)
+{
+ Mpeg1Context *s = avctx->priv_data;
+
+ if (s->mpeg_enc_ctx_allocated)
+ ff_MPV_common_end(&s->mpeg_enc_ctx);
+ av_freep(&s->a53_caption);
+ return 0;
+}
+
+static const AVProfile mpeg2_video_profiles[] = {
+ { FF_PROFILE_MPEG2_422, "4:2:2" },
+ { FF_PROFILE_MPEG2_HIGH, "High" },
+ { FF_PROFILE_MPEG2_SS, "Spatially Scalable" },
+ { FF_PROFILE_MPEG2_SNR_SCALABLE, "SNR Scalable" },
+ { FF_PROFILE_MPEG2_MAIN, "Main" },
+ { FF_PROFILE_MPEG2_SIMPLE, "Simple" },
+ { FF_PROFILE_RESERVED, "Reserved" },
+ { FF_PROFILE_RESERVED, "Reserved" },
+ { FF_PROFILE_UNKNOWN },
+};
+
+AVCodec ff_mpeg1video_decoder = {
+ .name = "mpeg1video",
+ .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_MPEG1VIDEO,
+ .priv_data_size = sizeof(Mpeg1Context),
+ .init = mpeg_decode_init,
+ .close = mpeg_decode_end,
+ .decode = mpeg_decode_frame,
+ .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 |
+ CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY |
+ CODEC_CAP_SLICE_THREADS,
+ .flush = flush,
+ .update_thread_context = ONLY_IF_THREADS_ENABLED(mpeg_decode_update_thread_context)
+};
+
+AVCodec ff_mpeg2video_decoder = {
+ .name = "mpeg2video",
+ .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_MPEG2VIDEO,
+ .priv_data_size = sizeof(Mpeg1Context),
+ .init = mpeg_decode_init,
+ .close = mpeg_decode_end,
+ .decode = mpeg_decode_frame,
+ .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 |
+ CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY |
+ CODEC_CAP_SLICE_THREADS,
+ .flush = flush,
+ .profiles = NULL_IF_CONFIG_SMALL(mpeg2_video_profiles),
+};
+
+#if FF_API_XVMC
+#if CONFIG_MPEG_XVMC_DECODER
+static av_cold int mpeg_mc_decode_init(AVCodecContext *avctx)
+{
+ if (avctx->active_thread_type & FF_THREAD_SLICE)
+ return -1;
+ if (!(avctx->slice_flags & SLICE_FLAG_CODED_ORDER))
+ return -1;
+ if (!(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD)) {
+ av_dlog(avctx, "mpeg12.c: XvMC decoder will work better if SLICE_FLAG_ALLOW_FIELD is set\n");
+ }
+ mpeg_decode_init(avctx);
+
+ avctx->pix_fmt = AV_PIX_FMT_XVMC_MPEG2_IDCT;
+ avctx->xvmc_acceleration = 2; // 2 - the blocks are packed!
+
+ return 0;
+}
+
+AVCodec ff_mpeg_xvmc_decoder = {
+ .name = "mpegvideo_xvmc",
+ .long_name = NULL_IF_CONFIG_SMALL("MPEG-1/2 video XvMC (X-Video Motion Compensation)"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_MPEG2VIDEO_XVMC,
+ .priv_data_size = sizeof(Mpeg1Context),
+ .init = mpeg_mc_decode_init,
+ .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,
+ .flush = flush,
+};
+
+#endif
+#endif /* FF_API_XVMC */

libav-v9.6.tar.bz2/libavcodec/mpeg12enc.c -> libav-v10.1.tar.bz2/libavcodec/mpeg12enc.c Changed

@@ -25,103 +25,102 @@
 * MPEG1/2 encoder
 */
 
+#include <stdint.h>
+
+#include "libavutil/attributes.h"
+#include "libavutil/log.h"
+#include "libavutil/opt.h"
+#include "libavutil/stereo3d.h"
+
 #include "avcodec.h"
-#include "dsputil.h"
+#include "bytestream.h"
 #include "mathops.h"
-#include "mpegvideo.h"
-
 #include "mpeg12.h"
 #include "mpeg12data.h"
-#include "bytestream.h"
+#include "mpegvideo.h"
 
-#include "libavutil/log.h"
-#include "libavutil/opt.h"
 
-static const uint8_t inv_non_linear_qscale[13] = {
- 0, 2, 4, 6, 8,
- 9,10,11,12,13,14,15,16,
+static const uint8_t inv_non_linear_qscale[] = {
+ 0, 2, 4, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16,
 };
 
-static const uint8_t svcd_scan_offset_placeholder[14] = {
- 0x10, 0x0E,
- 0x00, 0x80, 0x81,
- 0x00, 0x80, 0x81,
- 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff,
+static const uint8_t svcd_scan_offset_placeholder[] = {
+ 0x10, 0x0E, 0x00, 0x80, 0x81, 0x00, 0x80,
+ 0x81, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 };
 
-static void mpeg1_encode_block(MpegEncContext *s,
- DCTELEM *block,
- int component);
-static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code); // RAL: f_code parameter added
-
-static uint8_t mv_penalty[MAX_FCODE+1][MAX_MV*2+1];
-static uint8_t fcode_tab[MAX_MV*2+1];
+static uint8_t mv_penalty[MAX_FCODE + 1][MAX_MV * 2 + 1];
+static uint8_t fcode_tab[MAX_MV * 2 + 1];
 
-static uint8_t uni_mpeg1_ac_vlc_len [64*64*2];
-static uint8_t uni_mpeg2_ac_vlc_len [64*64*2];
+static uint8_t uni_mpeg1_ac_vlc_len[64 * 64 * 2];
+static uint8_t uni_mpeg2_ac_vlc_len[64 * 64 * 2];
 
-/* simple include everything table for dc, first byte is bits number next 3 are code*/
+/* simple include everything table for dc, first byte is bits
+ * number next 3 are code */
 static uint32_t mpeg1_lum_dc_uni[512];
 static uint32_t mpeg1_chr_dc_uni[512];
 
 static uint8_t mpeg1_index_run[2][64];
-static int8_t mpeg1_max_level[2][64];
+static int8_t mpeg1_max_level[2][64];
 
-static void init_uni_ac_vlc(RLTable *rl, uint8_t *uni_ac_vlc_len){
+static av_cold void init_uni_ac_vlc(RLTable *rl, uint8_t *uni_ac_vlc_len)
+{
 int i;
 
- for(i=0; i<128; i++){
- int level= i-64;
+ for (i = 0; i < 128; i++) {
+ int level = i - 64;
 int run;
 if (!level)
 continue;
- for(run=0; run<64; run++){
+ for (run = 0; run < 64; run++) {
 int len, code;
-
- int alevel= FFABS(level);
+ int alevel = FFABS(level);
 
 if (alevel > rl->max_level[0][run])
- code= 111; /*rl->n*/
+ code = 111; /* rl->n */
 else
- code= rl->index_run[0][run] + alevel - 1;
+ code = rl->index_run[0][run] + alevel - 1;
 
- if (code < 111 /* rl->n */) {
- /* length of vlc and sign */
- len= rl->table_vlc[code][1]+1;
+ if (code < 111) { /* rl->n */
+ /* length of VLC and sign */
+ len = rl->table_vlc[code][1] + 1;
 } else {
- len= rl->table_vlc[111/*rl->n*/][1]+6;
+ len = rl->table_vlc[111][1] + 6; /* rl->n */
 
- if (alevel < 128) {
+ if (alevel < 128)
 len += 8;
- } else {
+ else
 len += 16;
- }
 }
 
- uni_ac_vlc_len [UNI_AC_ENC_INDEX(run, i)]= len;
+ uni_ac_vlc_len[UNI_AC_ENC_INDEX(run, i)] = len;
 }
 }
 }
 
-
-static int find_frame_rate_index(MpegEncContext *s){
+static int find_frame_rate_index(MpegEncContext *s)
+{
 int i;
- int64_t dmin= INT64_MAX;
+ int64_t dmin = INT64_MAX;
 int64_t d;
 
- for(i=1;i<14;i++) {
- int64_t n0 = 1001LL / ff_mpeg12_frame_rate_tab[i].den * ff_mpeg12_frame_rate_tab[i].num * s->avctx->time_base.num;
- int64_t n1= 1001LL*s->avctx->time_base.den;
- if(s->avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL && i>=9) break;
+ for (i = 1; i < 14; i++) {
+ int64_t n0 = 1001LL / ff_mpeg12_frame_rate_tab[i].den *
+ ff_mpeg12_frame_rate_tab[i].num * s->avctx->time_base.num;
+ int64_t n1 = 1001LL * s->avctx->time_base.den;
+
+ if (s->avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL &&
+ i >= 9)
+ break;
 
 d = FFABS(n0 - n1);
- if(d < dmin){
- dmin=d;
- s->frame_rate_index= i;
+ if (d < dmin) {
+ dmin = d;
+ s->frame_rate_index = i;
 }
 }
- if(dmin)
+
+ if (dmin)
 return -1;
 else
 return 0;
@@ -131,43 +130,54 @@
 {
 MpegEncContext *s = avctx->priv_data;
 
- if(ff_MPV_encode_init(avctx) < 0)
+ if (ff_MPV_encode_init(avctx) < 0)
 return -1;
 
- if(find_frame_rate_index(s) < 0){
- if(s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL){
- av_log(avctx, AV_LOG_ERROR, "MPEG1/2 does not support %d/%d fps\n", avctx->time_base.den, avctx->time_base.num);
+ if (find_frame_rate_index(s) < 0) {
+ if (s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
+ av_log(avctx, AV_LOG_ERROR, "MPEG1/2 does not support %d/%d fps\n",
+ avctx->time_base.den, avctx->time_base.num);
 return -1;
- }else{
- av_log(avctx, AV_LOG_INFO, "MPEG1/2 does not support %d/%d fps, there may be AV sync issues\n", avctx->time_base.den, avctx->time_base.num);
+ } else {
+ av_log(avctx, AV_LOG_INFO,
+ "MPEG1/2 does not support %d/%d fps, there may be AV sync issues\n",
+ avctx->time_base.den, avctx->time_base.num);
 }
 }
 
- if(avctx->profile == FF_PROFILE_UNKNOWN){
- if(avctx->level != FF_LEVEL_UNKNOWN){
+ if (avctx->profile == FF_PROFILE_UNKNOWN) {
+ if (avctx->level != FF_LEVEL_UNKNOWN) {
 av_log(avctx, AV_LOG_ERROR, "Set profile and level\n");
 return -1;
 }
- avctx->profile = s->chroma_format == CHROMA_420 ? 4 : 0; /* Main or 4:2:2 */
+ /* Main or 4:2:2 */
+ avctx->profile = s->chroma_format == CHROMA_420 ? 4 : 0;
 }
 
- if(avctx->level == FF_LEVEL_UNKNOWN){
- if(avctx->profile == 0){ /* 4:2:2 */
- if(avctx->width <= 720 && avctx->height <= 608) avctx->level = 5; /* Main */
- else avctx->level = 2; /* High */
- }else{
- if(avctx->profile != 1 && s->chroma_format != CHROMA_420){
- av_log(avctx, AV_LOG_ERROR, "Only High(1) and 4:2:2(0) profiles support 4:2:2 color sampling\n");
+ if (avctx->level == FF_LEVEL_UNKNOWN) {
+ if (avctx->profile == 0) { /* 4:2:2 */
+ if (avctx->width <= 720 && avctx->height <= 608)
+ avctx->level = 5; /* Main */
+ else
+ avctx->level = 2; /* High */
+ } else {
+ if (avctx->profile != 1 && s->chroma_format != CHROMA_420) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Only High(1) and 4:2:2(0) profiles support 4:2:2 color sampling\n");
 return -1;
 }
- if(avctx->width <= 720 && avctx->height <= 576) avctx->level = 8; /* Main */
- else if(avctx->width <= 1440) avctx->level = 6; /* High 1440 */
- else avctx->level = 4; /* High */
+ if (avctx->width <= 720 && avctx->height <= 576)
+ avctx->level = 8; /* Main */
+ else if (avctx->width <= 1440)
+ avctx->level = 6; /* High 1440 */
+ else
+ avctx->level = 4; /* High */
 }
 }
 
 if (s->drop_frame_timecode && s->frame_rate_index != 4) {
- av_log(avctx, AV_LOG_ERROR, "Drop frame time code only allowed with 1001/30000 fps\n");
+ av_log(avctx, AV_LOG_ERROR,
+ "Drop frame time code only allowed with 1001/30000 fps\n");
 return -1;
 }
 
@@ -177,131 +187,137 @@
 static void put_header(MpegEncContext *s, int header)
 {
 avpriv_align_put_bits(&s->pb);
- put_bits(&s->pb, 16, header>>16);
+ put_bits(&s->pb, 16, header >> 16);
 put_sbits(&s->pb, 16, header);
 }
 
 /* put sequence header if needed */
 static void mpeg1_encode_sequence_header(MpegEncContext *s)
 {
- unsigned int vbv_buffer_size;
- unsigned int fps, v;
- int i;
- uint64_t time_code;
- float best_aspect_error= 1E10;
- float aspect_ratio= av_q2d(s->avctx->sample_aspect_ratio);
- int constraint_parameter_flag;
+ unsigned int vbv_buffer_size, fps, v;
+ int i, constraint_parameter_flag;
+ uint64_t time_code;
+ float best_aspect_error = 1E10;
+ float aspect_ratio = av_q2d(s->avctx->sample_aspect_ratio);
 
- if(aspect_ratio==0.0) aspect_ratio= 1.0; //pixel aspect 1:1 (VGA)
+ if (aspect_ratio == 0.0)
+ aspect_ratio = 1.0; // pixel aspect 1.1 (VGA)
 
- if (s->current_picture.f.key_frame) {
- AVRational framerate = ff_mpeg12_frame_rate_tab[s->frame_rate_index];
+ if (s->current_picture.f.key_frame) {
+ AVRational framerate = ff_mpeg12_frame_rate_tab[s->frame_rate_index];
 
- /* mpeg1 header repeated every gop */
- put_header(s, SEQ_START_CODE);
+ /* mpeg1 header repeated every gop */
+ put_header(s, SEQ_START_CODE);
 
- put_sbits(&s->pb, 12, s->width );
- put_sbits(&s->pb, 12, s->height);
+ put_sbits(&s->pb, 12, s->width);
+ put_sbits(&s->pb, 12, s->height);
 
- for(i=1; i<15; i++){
- float error= aspect_ratio;
- if(s->codec_id == AV_CODEC_ID_MPEG1VIDEO || i <=1)
- error-= 1.0/ff_mpeg1_aspect[i];
- else
- error-= av_q2d(ff_mpeg2_aspect[i])*s->height/s->width;
+ for (i = 1; i < 15; i++) {
+ float error = aspect_ratio;
+ if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO || i <= 1)
+ error -= 1.0 / ff_mpeg1_aspect[i];
+ else
+ error -= av_q2d(ff_mpeg2_aspect[i]) * s->height / s->width;
 
- error= FFABS(error);
+ error = FFABS(error);
 
- if(error < best_aspect_error){
- best_aspect_error= error;
- s->aspect_ratio_info= i;
- }
+ if (error < best_aspect_error) {
+ best_aspect_error = error;
+ s->aspect_ratio_info = i;
 }
+ }
 
- put_bits(&s->pb, 4, s->aspect_ratio_info);
- put_bits(&s->pb, 4, s->frame_rate_index);
+ put_bits(&s->pb, 4, s->aspect_ratio_info);
+ put_bits(&s->pb, 4, s->frame_rate_index);
 
- if(s->avctx->rc_max_rate){
- v = (s->avctx->rc_max_rate + 399) / 400;
- if (v > 0x3ffff && s->codec_id == AV_CODEC_ID_MPEG1VIDEO)
- v = 0x3ffff;
- }else{
- v= 0x3FFFF;
- }
+ if (s->avctx->rc_max_rate) {
+ v = (s->avctx->rc_max_rate + 399) / 400;
+ if (v > 0x3ffff && s->codec_id == AV_CODEC_ID_MPEG1VIDEO)
+ v = 0x3ffff;
+ } else {
+ v = 0x3FFFF;
+ }
 
- if(s->avctx->rc_buffer_size)
- vbv_buffer_size = s->avctx->rc_buffer_size;
- else
- /* VBV calculation: Scaled so that a VCD has the proper VBV size of 40 kilobytes */
- vbv_buffer_size = (( 20 * s->bit_rate) / (1151929 / 2)) * 8 * 1024;
- vbv_buffer_size= (vbv_buffer_size + 16383) / 16384;
-
- put_sbits(&s->pb, 18, v);
- put_bits(&s->pb, 1, 1); /* marker */
- put_sbits(&s->pb, 10, vbv_buffer_size);
-
- constraint_parameter_flag=
- s->width <= 768 && s->height <= 576 &&
- s->mb_width * s->mb_height <= 396 &&
- s->mb_width * s->mb_height * framerate.num <= framerate.den*396*25 &&
- framerate.num <= framerate.den*30 &&
- s->avctx->me_range && s->avctx->me_range < 128 &&
- vbv_buffer_size <= 20 &&
- v <= 1856000/400 &&
- s->codec_id == AV_CODEC_ID_MPEG1VIDEO;
-
- put_bits(&s->pb, 1, constraint_parameter_flag);
-
- ff_write_quant_matrix(&s->pb, s->avctx->intra_matrix);
- ff_write_quant_matrix(&s->pb, s->avctx->inter_matrix);
-
- if(s->codec_id == AV_CODEC_ID_MPEG2VIDEO){
- put_header(s, EXT_START_CODE);
- put_bits(&s->pb, 4, 1); //seq ext
-
- put_bits(&s->pb, 1, s->avctx->profile == 0); //escx 1 for 4:2:2 profile */
-
- put_bits(&s->pb, 3, s->avctx->profile); //profile
- put_bits(&s->pb, 4, s->avctx->level); //level
-
- put_bits(&s->pb, 1, s->progressive_sequence);
- put_bits(&s->pb, 2, s->chroma_format);
- put_bits(&s->pb, 2, s->width >>12);
- put_bits(&s->pb, 2, s->height>>12);
- put_bits(&s->pb, 12, v>>18); //bitrate ext
- put_bits(&s->pb, 1, 1); //marker
- put_bits(&s->pb, 8, vbv_buffer_size >>10); //vbv buffer ext
- put_bits(&s->pb, 1, s->low_delay);
- put_bits(&s->pb, 2, 0); // frame_rate_ext_n
- put_bits(&s->pb, 5, 0); // frame_rate_ext_d
- }
+ if (s->avctx->rc_buffer_size)
+ vbv_buffer_size = s->avctx->rc_buffer_size;
+ else
+ /* VBV calculation: Scaled so that a VCD has the proper
+ * VBV size of 40 kilobytes */
+ vbv_buffer_size = ((20 * s->bit_rate) / (1151929 / 2)) * 8 * 1024;
+ vbv_buffer_size = (vbv_buffer_size + 16383) / 16384;
+
+ put_sbits(&s->pb, 18, v);
+ put_bits(&s->pb, 1, 1); // marker
+ put_sbits(&s->pb, 10, vbv_buffer_size);
+
+ constraint_parameter_flag =
+ s->width <= 768 &&
+ s->height <= 576 &&
+ s->mb_width * s->mb_height <= 396 &&
+ s->mb_width * s->mb_height * framerate.num <= 396 * 25 * framerate.den &&
+ framerate.num <= framerate.den * 30 &&
+ s->avctx->me_range &&
+ s->avctx->me_range < 128 &&
+ vbv_buffer_size <= 20 &&
+ v <= 1856000 / 400 &&
+ s->codec_id == AV_CODEC_ID_MPEG1VIDEO;
+
+ put_bits(&s->pb, 1, constraint_parameter_flag);
+
+ ff_write_quant_matrix(&s->pb, s->avctx->intra_matrix);
+ ff_write_quant_matrix(&s->pb, s->avctx->inter_matrix);
+
+ if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
+ put_header(s, EXT_START_CODE);
+ put_bits(&s->pb, 4, 1); // seq ext
+
+ put_bits(&s->pb, 1, s->avctx->profile == 0); // escx 1 for 4:2:2 profile
+
+ put_bits(&s->pb, 3, s->avctx->profile); // profile
+ put_bits(&s->pb, 4, s->avctx->level); // level
+
+ put_bits(&s->pb, 1, s->progressive_sequence);
+ put_bits(&s->pb, 2, s->chroma_format);
+ put_bits(&s->pb, 2, s->width >> 12);
+ put_bits(&s->pb, 2, s->height >> 12);
+ put_bits(&s->pb, 12, v >> 18); // bitrate ext
+ put_bits(&s->pb, 1, 1); // marker
+ put_bits(&s->pb, 8, vbv_buffer_size >> 10); // vbv buffer ext
+ put_bits(&s->pb, 1, s->low_delay);
+ put_bits(&s->pb, 2, 0); // frame_rate_ext_n
+ put_bits(&s->pb, 5, 0); // frame_rate_ext_d
+ }
 
- put_header(s, GOP_START_CODE);
- put_bits(&s->pb, 1, s->drop_frame_timecode); /* drop frame flag */
- /* time code : we must convert from the real frame rate to a
- fake mpeg frame rate in case of low frame rate */
- fps = (framerate.num + framerate.den/2)/ framerate.den;
- time_code = s->current_picture_ptr->f.coded_picture_number + s->avctx->timecode_frame_start;
-
- s->gop_picture_number = s->current_picture_ptr->f.coded_picture_number;
- if (s->drop_frame_timecode) {
- /* only works for NTSC 29.97 */
- int d = time_code / 17982;
- int m = time_code % 17982;
- //if (m < 2) m += 2; /* not needed since -2,-1 / 1798 in C returns 0 */
- time_code += 18 * d + 2 * ((m - 2) / 1798);
- }
- put_bits(&s->pb, 5, (uint32_t)((time_code / (fps * 3600)) % 24));
- put_bits(&s->pb, 6, (uint32_t)((time_code / (fps * 60)) % 60));
- put_bits(&s->pb, 1, 1);
- put_bits(&s->pb, 6, (uint32_t)((time_code / fps) % 60));
- put_bits(&s->pb, 6, (uint32_t)((time_code % fps)));
- put_bits(&s->pb, 1, !!(s->flags & CODEC_FLAG_CLOSED_GOP));
- put_bits(&s->pb, 1, 0); /* broken link */
+ put_header(s, GOP_START_CODE);
+ put_bits(&s->pb, 1, s->drop_frame_timecode); // drop frame flag
+ /* time code: we must convert from the real frame rate to a
+ * fake MPEG frame rate in case of low frame rate */
+ fps = (framerate.num + framerate.den / 2) / framerate.den;
+ time_code = s->current_picture_ptr->f.coded_picture_number +
+ s->avctx->timecode_frame_start;
+
+ s->gop_picture_number = s->current_picture_ptr->f.coded_picture_number;
+ if (s->drop_frame_timecode) {
+ /* only works for NTSC 29.97 */
+ int d = time_code / 17982;
+ int m = time_code % 17982;
+ /* not needed since -2,-1 / 1798 in C returns 0 */
+ // if (m < 2)
+ // m += 2;
+ time_code += 18 * d + 2 * ((m - 2) / 1798);
 }
+ put_bits(&s->pb, 5, (uint32_t)((time_code / (fps * 3600)) % 24));
+ put_bits(&s->pb, 6, (uint32_t)((time_code / (fps * 60)) % 60));
+ put_bits(&s->pb, 1, 1);
+ put_bits(&s->pb, 6, (uint32_t)((time_code / fps) % 60));
+ put_bits(&s->pb, 6, (uint32_t)((time_code % fps)));
+ put_bits(&s->pb, 1, !!(s->flags & CODEC_FLAG_CLOSED_GOP));
+ put_bits(&s->pb, 1, 0); // broken link
+ }
 }
 
-static inline void encode_mb_skip_run(MpegEncContext *s, int run){
+static inline void encode_mb_skip_run(MpegEncContext *s, int run)
+{
 while (run >= 33) {
 put_bits(&s->pb, 11, 0x008);
 run -= 33;
@@ -312,27 +328,31 @@
 
 static av_always_inline void put_qscale(MpegEncContext *s)
 {
- if(s->q_scale_type){
- assert(s->qscale>=1 && s->qscale <=12);
+ if (s->q_scale_type) {
+ assert(s->qscale >= 1 && s->qscale <= 12);
 put_bits(&s->pb, 5, inv_non_linear_qscale[s->qscale]);
- }else{
+ } else {
 put_bits(&s->pb, 5, s->qscale);
 }
 }
 
-void ff_mpeg1_encode_slice_header(MpegEncContext *s){
+void ff_mpeg1_encode_slice_header(MpegEncContext *s)
+{
 if (s->height > 2800) {
 put_header(s, SLICE_MIN_START_CODE + (s->mb_y & 127));
- put_bits(&s->pb, 3, s->mb_y >> 7); /* slice_vertical_position_extension */
+ /* slice_vertical_position_extension */
+ put_bits(&s->pb, 3, s->mb_y >> 7);
 } else {
 put_header(s, SLICE_MIN_START_CODE + s->mb_y);
 }
 put_qscale(s);
- put_bits(&s->pb, 1, 0); /* slice extra information */
+ /* slice extra information */
+ put_bits(&s->pb, 1, 0);
 }
 
 void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
 {
+ AVFrameSideData *side_data;
 mpeg1_encode_sequence_header(s);
 
 /* mpeg1 picture header */
@@ -340,60 +360,60 @@
 /* temporal reference */
 
 // RAL: s->picture_number instead of s->fake_picture_number
- put_bits(&s->pb, 10, (s->picture_number -
- s->gop_picture_number) & 0x3ff);
+ put_bits(&s->pb, 10,
+ (s->picture_number - s->gop_picture_number) & 0x3ff);
 put_bits(&s->pb, 3, s->pict_type);
 
- s->vbv_delay_ptr= s->pb.buf + put_bits_count(&s->pb)/8;
- put_bits(&s->pb, 16, 0xFFFF); /* vbv_delay */
+ s->vbv_delay_ptr = s->pb.buf + put_bits_count(&s->pb) / 8;
+ put_bits(&s->pb, 16, 0xFFFF); /* vbv_delay */
 
- // RAL: Forward f_code also needed for B frames
- if (s->pict_type == AV_PICTURE_TYPE_P || s->pict_type == AV_PICTURE_TYPE_B) {
- put_bits(&s->pb, 1, 0); /* half pel coordinates */
- if(s->codec_id == AV_CODEC_ID_MPEG1VIDEO)
- put_bits(&s->pb, 3, s->f_code); /* forward_f_code */
+ // RAL: Forward f_code also needed for B-frames
+ if (s->pict_type == AV_PICTURE_TYPE_P ||
+ s->pict_type == AV_PICTURE_TYPE_B) {
+ put_bits(&s->pb, 1, 0); /* half pel coordinates */
+ if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO)
+ put_bits(&s->pb, 3, s->f_code); /* forward_f_code */
 else
- put_bits(&s->pb, 3, 7); /* forward_f_code */
+ put_bits(&s->pb, 3, 7); /* forward_f_code */
 }
 
- // RAL: Backward f_code necessary for B frames
+ // RAL: Backward f_code necessary for B-frames
 if (s->pict_type == AV_PICTURE_TYPE_B) {
- put_bits(&s->pb, 1, 0); /* half pel coordinates */
- if(s->codec_id == AV_CODEC_ID_MPEG1VIDEO)
- put_bits(&s->pb, 3, s->b_code); /* backward_f_code */
+ put_bits(&s->pb, 1, 0); /* half pel coordinates */
+ if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO)
+ put_bits(&s->pb, 3, s->b_code); /* backward_f_code */
 else
- put_bits(&s->pb, 3, 7); /* backward_f_code */
+ put_bits(&s->pb, 3, 7); /* backward_f_code */
 }
 
- put_bits(&s->pb, 1, 0); /* extra bit picture */
+ put_bits(&s->pb, 1, 0); /* extra bit picture */
 
 s->frame_pred_frame_dct = 1;
- if(s->codec_id == AV_CODEC_ID_MPEG2VIDEO){
+ if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
 put_header(s, EXT_START_CODE);
- put_bits(&s->pb, 4, 8); //pic ext
- if (s->pict_type == AV_PICTURE_TYPE_P || s->pict_type == AV_PICTURE_TYPE_B) {
+ put_bits(&s->pb, 4, 8); /* pic ext */
+ if (s->pict_type == AV_PICTURE_TYPE_P ||
+ s->pict_type == AV_PICTURE_TYPE_B) {
 put_bits(&s->pb, 4, s->f_code);
 put_bits(&s->pb, 4, s->f_code);
- }else{
+ } else {
 put_bits(&s->pb, 8, 255);
 }
 if (s->pict_type == AV_PICTURE_TYPE_B) {
 put_bits(&s->pb, 4, s->b_code);
 put_bits(&s->pb, 4, s->b_code);
- }else{
+ } else {
 put_bits(&s->pb, 8, 255);
 }
 put_bits(&s->pb, 2, s->intra_dc_precision);
 
 assert(s->picture_structure == PICT_FRAME);
 put_bits(&s->pb, 2, s->picture_structure);
- if (s->progressive_sequence) {
- put_bits(&s->pb, 1, 0); /* no repeat */
- } else {
+ if (s->progressive_sequence)
+ put_bits(&s->pb, 1, 0); /* no repeat */
+ else
 put_bits(&s->pb, 1, s->current_picture_ptr->f.top_field_first);
- }
- /* XXX: optimize the generation of this flag with entropy
- measures */
+ /* XXX: optimize the generation of this flag with entropy measures */
 s->frame_pred_frame_dct = s->progressive_sequence;
 
 put_bits(&s->pb, 1, s->frame_pred_frame_dct);
@@ -403,20 +423,59 @@
 put_bits(&s->pb, 1, s->alternate_scan);
 put_bits(&s->pb, 1, s->repeat_first_field);
 s->progressive_frame = s->progressive_sequence;
- put_bits(&s->pb, 1, s->chroma_format == CHROMA_420 ? s->progressive_frame : 0); /* chroma_420_type */
+ /* chroma_420_type */
+ put_bits(&s->pb, 1, s->chroma_format ==
+ CHROMA_420 ? s->progressive_frame : 0);
 put_bits(&s->pb, 1, s->progressive_frame);
- put_bits(&s->pb, 1, 0); //composite_display_flag
+ put_bits(&s->pb, 1, 0); /* composite_display_flag */
 }
 if (s->scan_offset) {
 int i;
 
 put_header(s, USER_START_CODE);
- for(i=0; i<sizeof(svcd_scan_offset_placeholder); i++){
+ 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;
+ s->mb_y = 0;
 ff_mpeg1_encode_slice_header(s);
 }
 
@@ -426,504 +485,558 @@
 put_bits(&s->pb, n, bits);
 if (!s->frame_pred_frame_dct) {
 if (has_mv)
- put_bits(&s->pb, 2, 2 - field_motion); /* motion_type: frame/field */
+ /* motion_type: frame/field */
+ put_bits(&s->pb, 2, 2 - field_motion);
 put_bits(&s->pb, 1, s->interlaced_dct);
 }
 }
 
+// RAL: Parameter added: f_or_b_code
+static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code)
+{
+ if (val == 0) {
+ /* zero vector */
+ put_bits(&s->pb,
+ ff_mpeg12_mbMotionVectorTable[0][1],
+ ff_mpeg12_mbMotionVectorTable[0][0]);
+ } else {
+ int code, sign, bits;
+ int bit_size = f_or_b_code - 1;
+ int range = 1 << bit_size;
+ /* modulo encoding */
+ val = sign_extend(val, 5 + bit_size);
+
+ if (val >= 0) {
+ val--;
+ code = (val >> bit_size) + 1;
+ bits = val & (range - 1);
+ sign = 0;
+ } else {
+ val = -val;
+ val--;
+ code = (val >> bit_size) + 1;
+ bits = val & (range - 1);
+ sign = 1;
+ }
+
+ assert(code > 0 && code <= 16);
+
+ put_bits(&s->pb,
+ ff_mpeg12_mbMotionVectorTable[code][1],
+ ff_mpeg12_mbMotionVectorTable[code][0]);
+
+ put_bits(&s->pb, 1, sign);
+ if (bit_size > 0)
+ put_bits(&s->pb, bit_size, bits);
+ }
+}
+
+static inline void encode_dc(MpegEncContext *s, int diff, int component)
+{
+ if (((unsigned) (diff + 255)) >= 511) {
+ int index;
+
+ if (diff < 0) {
+ index = av_log2_16bit(-2 * diff);
+ diff--;
+ } else {
+ index = av_log2_16bit(2 * diff);
+ }
+ if (component == 0)
+ put_bits(&s->pb,
+ ff_mpeg12_vlc_dc_lum_bits[index] + index,
+ (ff_mpeg12_vlc_dc_lum_code[index] << index) +
+ (diff & ((1 << index) - 1)));
+ else
+ put_bits(&s->pb,
+ ff_mpeg12_vlc_dc_chroma_bits[index] + index,
+ (ff_mpeg12_vlc_dc_chroma_code[index] << index) +
+ (diff & ((1 << index) - 1)));
+ } else {
+ if (component == 0)
+ put_bits(&s->pb,
+ mpeg1_lum_dc_uni[diff + 255] & 0xFF,
+ mpeg1_lum_dc_uni[diff + 255] >> 8);
+ else
+ put_bits(&s->pb,
+ mpeg1_chr_dc_uni[diff + 255] & 0xFF,
+ mpeg1_chr_dc_uni[diff + 255] >> 8);
+ }
+}
+
+static void mpeg1_encode_block(MpegEncContext *s, int16_t *block, int n)
+{
+ int alevel, level, last_non_zero, dc, diff, i, j, run, last_index, sign;
+ int code, component;
+ const uint16_t (*table_vlc)[2] = ff_rl_mpeg1.table_vlc;
+
+ last_index = s->block_last_index[n];
+
+ /* DC coef */
+ if (s->mb_intra) {
+ component = (n <= 3 ? 0 : (n & 1) + 1);
+ dc = block[0]; /* overflow is impossible */
+ diff = dc - s->last_dc[component];
+ encode_dc(s, diff, component);
+ s->last_dc[component] = dc;
+ i = 1;
+ if (s->intra_vlc_format)
+ table_vlc = ff_rl_mpeg2.table_vlc;
+ } else {
+ /* encode the first coefficient: needs to be done here because
+ * it is handled slightly differently */
+ level = block[0];
+ if (abs(level) == 1) {
+ code = ((uint32_t)level >> 31); /* the sign bit */
+ put_bits(&s->pb, 2, code | 0x02);
+ i = 1;
+ } else {
+ i = 0;
+ last_non_zero = -1;
+ goto next_coef;
+ }
+ }
+
+ /* now quantify & encode AC coefs */
+ last_non_zero = i - 1;
+
+ for (; i <= last_index; i++) {
+ j = s->intra_scantable.permutated[i];
+ level = block[j];
+
+next_coef:
+ /* encode using VLC */
+ if (level != 0) {
+ run = i - last_non_zero - 1;
+
+ alevel = level;
+ MASK_ABS(sign, alevel);
+ sign &= 1;
+
+ if (alevel <= mpeg1_max_level[0][run]) {
+ code = mpeg1_index_run[0][run] + alevel - 1;
+ /* store the VLC & sign at once */
+ put_bits(&s->pb, table_vlc[code][1] + 1,
+ (table_vlc[code][0] << 1) + sign);
+ } else {
+ /* escape seems to be pretty rare <5% so I do not optimize it */
+ put_bits(&s->pb, table_vlc[111][1], table_vlc[111][0]);
+ /* escape: only clip in this case */
+ put_bits(&s->pb, 6, run);
+ if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO) {
+ if (alevel < 128) {
+ put_sbits(&s->pb, 8, level);
+ } else {
+ if (level < 0)
+ put_bits(&s->pb, 16, 0x8001 + level + 255);
+ else
+ put_sbits(&s->pb, 16, level);
+ }
+ } else {
+ put_sbits(&s->pb, 12, level);
+ }
+ }
+ last_non_zero = i;
+ }
+ }
+ /* end of block */
+ put_bits(&s->pb, table_vlc[112][1], table_vlc[112][0]);
+}
+
 static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s,
- DCTELEM block[6][64],
- int motion_x, int motion_y,
- int mb_block_count)
+ int16_t block[6][64],
+ int motion_x, int motion_y,
+ int mb_block_count)
 {
 int i, cbp;
- const int mb_x = s->mb_x;
- const int mb_y = s->mb_y;
- const int first_mb= mb_x == s->resync_mb_x && mb_y == s->resync_mb_y;
+ const int mb_x = s->mb_x;
+ const int mb_y = s->mb_y;
+ const int first_mb = mb_x == s->resync_mb_x && mb_y == s->resync_mb_y;
 
 /* compute cbp */
 cbp = 0;
- for(i=0;i<mb_block_count;i++) {
+ for (i = 0; i < mb_block_count; i++)
 if (s->block_last_index[i] >= 0)
 cbp |= 1 << (mb_block_count - 1 - i);
- }
 
 if (cbp == 0 && !first_mb && s->mv_type == MV_TYPE_16X16 &&
- (mb_x != s->mb_width - 1 || (mb_y != s->mb_height - 1 && s->codec_id == AV_CODEC_ID_MPEG1VIDEO)) &&
+ (mb_x != s->mb_width - 1 ||
+ (mb_y != s->mb_height - 1 && s->codec_id == AV_CODEC_ID_MPEG1VIDEO)) &&
 ((s->pict_type == AV_PICTURE_TYPE_P && (motion_x | motion_y) == 0) ||
- (s->pict_type == AV_PICTURE_TYPE_B && s->mv_dir == s->last_mv_dir && (((s->mv_dir & MV_DIR_FORWARD) ? ((s->mv[0][0][0] - s->last_mv[0][0][0])|(s->mv[0][0][1] - s->last_mv[0][0][1])) : 0) |
- ((s->mv_dir & MV_DIR_BACKWARD) ? ((s->mv[1][0][0] - s->last_mv[1][0][0])|(s->mv[1][0][1] - s->last_mv[1][0][1])) : 0)) == 0))) {
+ (s->pict_type == AV_PICTURE_TYPE_B && s->mv_dir == s->last_mv_dir &&
+ (((s->mv_dir & MV_DIR_FORWARD)
+ ? ((s->mv[0][0][0] - s->last_mv[0][0][0]) |
+ (s->mv[0][0][1] - s->last_mv[0][0][1])) : 0) |
+ ((s->mv_dir & MV_DIR_BACKWARD)
+ ? ((s->mv[1][0][0] - s->last_mv[1][0][0]) |
+ (s->mv[1][0][1] - s->last_mv[1][0][1])) : 0)) == 0))) {
 s->mb_skip_run++;
 s->qscale -= s->dquant;
 s->skip_count++;
 s->misc_bits++;
 s->last_bits++;
- if(s->pict_type == AV_PICTURE_TYPE_P){
- s->last_mv[0][1][0]= s->last_mv[0][0][0]=
- s->last_mv[0][1][1]= s->last_mv[0][0][1]= 0;
+ if (s->pict_type == AV_PICTURE_TYPE_P) {
+ s->last_mv[0][0][0] =
+ s->last_mv[0][0][1] =
+ s->last_mv[0][1][0] =
+ s->last_mv[0][1][1] = 0;
 }
 } else {
- if(first_mb){
+ if (first_mb) {
 assert(s->mb_skip_run == 0);
 encode_mb_skip_run(s, s->mb_x);
- }else{
+ } else {
 encode_mb_skip_run(s, s->mb_skip_run);
 }
 
 if (s->pict_type == AV_PICTURE_TYPE_I) {
- if(s->dquant && cbp){
- put_mb_modes(s, 2, 1, 0, 0); /* macroblock_type : macroblock_quant = 1 */
+ if (s->dquant && cbp) {
+ /* macroblock_type: macroblock_quant = 1 */
+ put_mb_modes(s, 2, 1, 0, 0);
 put_qscale(s);
- }else{
- put_mb_modes(s, 1, 1, 0, 0); /* macroblock_type : macroblock_quant = 0 */
+ } else {
+ /* macroblock_type: macroblock_quant = 0 */
+ put_mb_modes(s, 1, 1, 0, 0);
 s->qscale -= s->dquant;
 }
- s->misc_bits+= get_bits_diff(s);
+ s->misc_bits += get_bits_diff(s);
 s->i_count++;
 } else if (s->mb_intra) {
- if(s->dquant && cbp){
+ if (s->dquant && cbp) {
 put_mb_modes(s, 6, 0x01, 0, 0);
 put_qscale(s);
- }else{
+ } else {
 put_mb_modes(s, 5, 0x03, 0, 0);
 s->qscale -= s->dquant;
 }
- s->misc_bits+= get_bits_diff(s);
+ s->misc_bits += get_bits_diff(s);
 s->i_count++;
 memset(s->last_mv, 0, sizeof(s->last_mv));
 } else if (s->pict_type == AV_PICTURE_TYPE_P) {
- if(s->mv_type == MV_TYPE_16X16){
+ if (s->mv_type == MV_TYPE_16X16) {
 if (cbp != 0) {
- if ((motion_x|motion_y) == 0) {
- if(s->dquant){
- put_mb_modes(s, 5, 1, 0, 0); /* macroblock_pattern & quant */
+ if ((motion_x | motion_y) == 0) {
+ if (s->dquant) {
+ /* macroblock_pattern & quant */
+ put_mb_modes(s, 5, 1, 0, 0);
 put_qscale(s);
- }else{
- put_mb_modes(s, 2, 1, 0, 0); /* macroblock_pattern only */
+ } else {
+ /* macroblock_pattern only */
+ put_mb_modes(s, 2, 1, 0, 0);
 }
- s->misc_bits+= get_bits_diff(s);
+ s->misc_bits += get_bits_diff(s);
 } else {
- if(s->dquant){
- put_mb_modes(s, 5, 2, 1, 0); /* motion + cbp */
+ if (s->dquant) {
+ put_mb_modes(s, 5, 2, 1, 0); /* motion + cbp */
 put_qscale(s);
- }else{
- put_mb_modes(s, 1, 1, 1, 0); /* motion + cbp */
+ } else {
+ put_mb_modes(s, 1, 1, 1, 0); /* motion + cbp */
 }
- s->misc_bits+= get_bits_diff(s);
- mpeg1_encode_motion(s, motion_x - s->last_mv[0][0][0], s->f_code); // RAL: f_code parameter added
- mpeg1_encode_motion(s, motion_y - s->last_mv[0][0][1], s->f_code); // RAL: f_code parameter added
- s->mv_bits+= get_bits_diff(s);
+ s->misc_bits += get_bits_diff(s);
+ // RAL: f_code parameter added
+ mpeg1_encode_motion(s,
+ motion_x - s->last_mv[0][0][0],
+ s->f_code);
+ // RAL: f_code parameter added
+ mpeg1_encode_motion(s,
+ motion_y - s->last_mv[0][0][1],
+ s->f_code);
+ s->mv_bits += get_bits_diff(s);
 }
 } else {
- put_bits(&s->pb, 3, 1); /* motion only */
+ put_bits(&s->pb, 3, 1); /* motion only */
 if (!s->frame_pred_frame_dct)
- put_bits(&s->pb, 2, 2); /* motion_type: frame */
- s->misc_bits+= get_bits_diff(s);
- mpeg1_encode_motion(s, motion_x - s->last_mv[0][0][0], s->f_code); // RAL: f_code parameter added
- mpeg1_encode_motion(s, motion_y - s->last_mv[0][0][1], s->f_code); // RAL: f_code parameter added
- s->qscale -= s->dquant;
- s->mv_bits+= get_bits_diff(s);
+ put_bits(&s->pb, 2, 2); /* motion_type: frame */
+ s->misc_bits += get_bits_diff(s);
+ // RAL: f_code parameter added
+ mpeg1_encode_motion(s,
+ motion_x - s->last_mv[0][0][0],
+ s->f_code);
+ // RAL: f_code parameter added
+ mpeg1_encode_motion(s,
+ motion_y - s->last_mv[0][0][1],
+ s->f_code);
+ s->qscale -= s->dquant;
+ s->mv_bits += get_bits_diff(s);
 }
- s->last_mv[0][1][0]= s->last_mv[0][0][0]= motion_x;
- s->last_mv[0][1][1]= s->last_mv[0][0][1]= motion_y;
- }else{
+ s->last_mv[0][1][0] = s->last_mv[0][0][0] = motion_x;
+ s->last_mv[0][1][1] = s->last_mv[0][0][1] = motion_y;
+ } else {
 assert(!s->frame_pred_frame_dct && s->mv_type == MV_TYPE_FIELD);
 
 if (cbp) {
- if(s->dquant){
- put_mb_modes(s, 5, 2, 1, 1); /* motion + cbp */
+ if (s->dquant) {
+ put_mb_modes(s, 5, 2, 1, 1); /* motion + cbp */
 put_qscale(s);
- }else{
- put_mb_modes(s, 1, 1, 1, 1); /* motion + cbp */
+ } else {
+ put_mb_modes(s, 1, 1, 1, 1); /* motion + cbp */
 }
 } else {
- put_bits(&s->pb, 3, 1); /* motion only */
- put_bits(&s->pb, 2, 1); /* motion_type: field */
+ put_bits(&s->pb, 3, 1); /* motion only */
+ put_bits(&s->pb, 2, 1); /* motion_type: field */
 s->qscale -= s->dquant;
 }
- s->misc_bits+= get_bits_diff(s);
- for(i=0; i<2; i++){
+ s->misc_bits += get_bits_diff(s);
+ for (i = 0; i < 2; i++) {
 put_bits(&s->pb, 1, s->field_select[0][i]);
- mpeg1_encode_motion(s, s->mv[0][i][0] - s->last_mv[0][i][0] , s->f_code);
- mpeg1_encode_motion(s, s->mv[0][i][1] - (s->last_mv[0][i][1]>>1), s->f_code);
- s->last_mv[0][i][0]= s->mv[0][i][0];
- s->last_mv[0][i][1]= 2*s->mv[0][i][1];
+ mpeg1_encode_motion(s,
+ s->mv[0][i][0] - s->last_mv[0][i][0],
+ s->f_code);
+ mpeg1_encode_motion(s,
+ s->mv[0][i][1] - (s->last_mv[0][i][1] >> 1),
+ s->f_code);
+ s->last_mv[0][i][0] = s->mv[0][i][0];
+ s->last_mv[0][i][1] = 2 * s->mv[0][i][1];
 }
- s->mv_bits+= get_bits_diff(s);
+ s->mv_bits += get_bits_diff(s);
 }
- if(cbp) {
+ if (cbp) {
 if (s->chroma_y_shift) {
- put_bits(&s->pb, ff_mpeg12_mbPatTable[cbp][1], ff_mpeg12_mbPatTable[cbp][0]);
+ put_bits(&s->pb,
+ ff_mpeg12_mbPatTable[cbp][1],
+ ff_mpeg12_mbPatTable[cbp][0]);
 } else {
- put_bits(&s->pb, ff_mpeg12_mbPatTable[cbp>>2][1], ff_mpeg12_mbPatTable[cbp>>2][0]);
+ put_bits(&s->pb,
+ ff_mpeg12_mbPatTable[cbp >> 2][1],
+ ff_mpeg12_mbPatTable[cbp >> 2][0]);
 put_sbits(&s->pb, 2, cbp);
 }
 }
 s->f_count++;
- } else{
- if(s->mv_type == MV_TYPE_16X16){
- if (cbp){ // With coded bloc pattern
+ } else {
+ if (s->mv_type == MV_TYPE_16X16) {
+ if (cbp) { // With coded bloc pattern
 if (s->dquant) {
- if(s->mv_dir == MV_DIR_FORWARD)
+ if (s->mv_dir == MV_DIR_FORWARD)
 put_mb_modes(s, 6, 3, 1, 0);
 else
- put_mb_modes(s, 8-s->mv_dir, 2, 1, 0);
+ put_mb_modes(s, 8 - s->mv_dir, 2, 1, 0);
 put_qscale(s);
 } else {
- put_mb_modes(s, 5-s->mv_dir, 3, 1, 0);
+ put_mb_modes(s, 5 - s->mv_dir, 3, 1, 0);
 }
- }else{ // No coded bloc pattern
- put_bits(&s->pb, 5-s->mv_dir, 2);
+ } else { // No coded bloc pattern
+ put_bits(&s->pb, 5 - s->mv_dir, 2);
 if (!s->frame_pred_frame_dct)
 put_bits(&s->pb, 2, 2); /* motion_type: frame */
 s->qscale -= s->dquant;
 }
 s->misc_bits += get_bits_diff(s);
- if (s->mv_dir&MV_DIR_FORWARD){
- mpeg1_encode_motion(s, s->mv[0][0][0] - s->last_mv[0][0][0], s->f_code);
- mpeg1_encode_motion(s, 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_dir & MV_DIR_FORWARD) {
+ mpeg1_encode_motion(s,
+ s->mv[0][0][0] - s->last_mv[0][0][0],
+ s->f_code);
+ mpeg1_encode_motion(s,
+ 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){
- mpeg1_encode_motion(s, s->mv[1][0][0] - s->last_mv[1][0][0], s->b_code);
- mpeg1_encode_motion(s, 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) {
+ mpeg1_encode_motion(s,
+ s->mv[1][0][0] - s->last_mv[1][0][0],
+ s->b_code);
+ mpeg1_encode_motion(s,
+ 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{
+ } else {
 assert(s->mv_type == MV_TYPE_FIELD);
 assert(!s->frame_pred_frame_dct);
- if (cbp){ // With coded bloc pattern
+ if (cbp) { // With coded bloc pattern
 if (s->dquant) {
- if(s->mv_dir == MV_DIR_FORWARD)
+ if (s->mv_dir == MV_DIR_FORWARD)
 put_mb_modes(s, 6, 3, 1, 1);
 else
- put_mb_modes(s, 8-s->mv_dir, 2, 1, 1);
+ put_mb_modes(s, 8 - s->mv_dir, 2, 1, 1);
 put_qscale(s);
 } else {
- put_mb_modes(s, 5-s->mv_dir, 3, 1, 1);
+ put_mb_modes(s, 5 - s->mv_dir, 3, 1, 1);
 }
- }else{ // No coded bloc pattern
- put_bits(&s->pb, 5-s->mv_dir, 2);
- put_bits(&s->pb, 2, 1); /* motion_type: field */
+ } else { // No coded bloc pattern
+ put_bits(&s->pb, 5 - s->mv_dir, 2);
+ put_bits(&s->pb, 2, 1); /* motion_type: field */
 s->qscale -= s->dquant;
 }
 s->misc_bits += get_bits_diff(s);
- if (s->mv_dir&MV_DIR_FORWARD){
- for(i=0; i<2; i++){
+ if (s->mv_dir & MV_DIR_FORWARD) {
+ for (i = 0; i < 2; i++) {
 put_bits(&s->pb, 1, s->field_select[0][i]);
- mpeg1_encode_motion(s, s->mv[0][i][0] - s->last_mv[0][i][0] , s->f_code);
- mpeg1_encode_motion(s, s->mv[0][i][1] - (s->last_mv[0][i][1]>>1), s->f_code);
- s->last_mv[0][i][0]= s->mv[0][i][0];
- s->last_mv[0][i][1]= 2*s->mv[0][i][1];
+ mpeg1_encode_motion(s,
+ s->mv[0][i][0] - s->last_mv[0][i][0],
+ s->f_code);
+ mpeg1_encode_motion(s,
+ s->mv[0][i][1] - (s->last_mv[0][i][1] >> 1),
+ 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++){
+ if (s->mv_dir & MV_DIR_BACKWARD) {
+ for (i = 0; i < 2; i++) {
 put_bits(&s->pb, 1, s->field_select[1][i]);
- mpeg1_encode_motion(s, s->mv[1][i][0] - s->last_mv[1][i][0] , s->b_code);
- mpeg1_encode_motion(s, s->mv[1][i][1] - (s->last_mv[1][i][1]>>1), s->b_code);
- s->last_mv[1][i][0]= s->mv[1][i][0];
- s->last_mv[1][i][1]= 2*s->mv[1][i][1];
+ mpeg1_encode_motion(s,
+ s->mv[1][i][0] - s->last_mv[1][i][0],
+ s->b_code);
+ mpeg1_encode_motion(s,
+ s->mv[1][i][1] - (s->last_mv[1][i][1] >> 1),
+ 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++;
 }
 }
 s->mv_bits += get_bits_diff(s);
- if(cbp) {
+ if (cbp) {
 if (s->chroma_y_shift) {
- put_bits(&s->pb, ff_mpeg12_mbPatTable[cbp][1], ff_mpeg12_mbPatTable[cbp][0]);
+ put_bits(&s->pb,
+ ff_mpeg12_mbPatTable[cbp][1],
+ ff_mpeg12_mbPatTable[cbp][0]);
 } else {
- put_bits(&s->pb, ff_mpeg12_mbPatTable[cbp>>2][1], ff_mpeg12_mbPatTable[cbp>>2][0]);
+ put_bits(&s->pb,
+ ff_mpeg12_mbPatTable[cbp >> 2][1],
+ ff_mpeg12_mbPatTable[cbp >> 2][0]);
 put_sbits(&s->pb, 2, cbp);
 }
 }
 }
- for(i=0;i<mb_block_count;i++) {
- if (cbp & (1 << (mb_block_count - 1 - i))) {
+ for (i = 0; i < mb_block_count; i++)
+ if (cbp & (1 << (mb_block_count - 1 - i)))
 mpeg1_encode_block(s, block[i], i);
- }
- }
 s->mb_skip_run = 0;
- if(s->mb_intra)
- s->i_tex_bits+= get_bits_diff(s);
+ if (s->mb_intra)
+ s->i_tex_bits += get_bits_diff(s);
 else
- s->p_tex_bits+= get_bits_diff(s);
+ s->p_tex_bits += get_bits_diff(s);
 }
 }
 
-void ff_mpeg1_encode_mb(MpegEncContext *s, DCTELEM block[6][64], int motion_x, int motion_y)
+void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[6][64],
+ int motion_x, int motion_y)
 {
- if (s->chroma_format == CHROMA_420) mpeg1_encode_mb_internal(s, block, motion_x, motion_y, 6);
- else mpeg1_encode_mb_internal(s, block, motion_x, motion_y, 8);
-}
-
-// RAL: Parameter added: f_or_b_code
-static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code)
-{
- if (val == 0) {
- /* zero vector */
- put_bits(&s->pb,
- ff_mpeg12_mbMotionVectorTable[0][1],
- ff_mpeg12_mbMotionVectorTable[0][0]);
- } else {
- int code, sign, bits;
- int bit_size = f_or_b_code - 1;
- int range = 1 << bit_size;
- /* modulo encoding */
- val = sign_extend(val, 5 + bit_size);
-
- if (val >= 0) {
- val--;
- code = (val >> bit_size) + 1;
- bits = val & (range - 1);
- sign = 0;
- } else {
- val = -val;
- val--;
- code = (val >> bit_size) + 1;
- bits = val & (range - 1);
- sign = 1;
- }
-
- assert(code > 0 && code <= 16);
-
- put_bits(&s->pb,
- ff_mpeg12_mbMotionVectorTable[code][1],
- ff_mpeg12_mbMotionVectorTable[code][0]);
-
- put_bits(&s->pb, 1, sign);
- if (bit_size > 0) {
- put_bits(&s->pb, bit_size, bits);
- }
- }
+ if (s->chroma_format == CHROMA_420)
+ mpeg1_encode_mb_internal(s, block, motion_x, motion_y, 6);
+ else
+ mpeg1_encode_mb_internal(s, block, motion_x, motion_y, 8);
 }
 
-void ff_mpeg1_encode_init(MpegEncContext *s)
+av_cold void ff_mpeg1_encode_init(MpegEncContext *s)
 {
- static int done=0;
+ static int done = 0;
 
 ff_mpeg12_common_init(s);
 
- if(!done){
+ if (!done) {
 int f_code;
 int mv;
 int i;
 
- done=1;
+ done = 1;
 ff_init_rl(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]);
 ff_init_rl(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]);
 
- for(i=0; i<64; i++)
- {
- mpeg1_max_level[0][i]= ff_rl_mpeg1.max_level[0][i];
- mpeg1_index_run[0][i]= ff_rl_mpeg1.index_run[0][i];
+ for (i = 0; i < 64; i++) {
+ mpeg1_max_level[0][i] = ff_rl_mpeg1.max_level[0][i];
+ mpeg1_index_run[0][i] = ff_rl_mpeg1.index_run[0][i];
 }
 
 init_uni_ac_vlc(&ff_rl_mpeg1, uni_mpeg1_ac_vlc_len);
- if(s->intra_vlc_format)
+ if (s->intra_vlc_format)
 init_uni_ac_vlc(&ff_rl_mpeg2, uni_mpeg2_ac_vlc_len);
 
 /* build unified dc encoding tables */
- for(i=-255; i<256; i++)
- {
- int adiff, index;
- int bits, code;
- int diff=i;
-
- adiff = FFABS(diff);
- if(diff<0) diff--;
- index = av_log2(2*adiff);
-
- bits= ff_mpeg12_vlc_dc_lum_bits[index] + index;
- code= (ff_mpeg12_vlc_dc_lum_code[index]<<index) + (diff & ((1 << index) - 1));
- mpeg1_lum_dc_uni[i+255]= bits + (code<<8);
-
- bits= ff_mpeg12_vlc_dc_chroma_bits[index] + index;
- code= (ff_mpeg12_vlc_dc_chroma_code[index]<<index) + (diff & ((1 << index) - 1));
- mpeg1_chr_dc_uni[i+255]= bits + (code<<8);
+ for (i = -255; i < 256; i++) {
+ int adiff, index;
+ int bits, code;
+ int diff = i;
+
+ adiff = FFABS(diff);
+ if (diff < 0)
+ diff--;
+ index = av_log2(2 * adiff);
+
+ bits = ff_mpeg12_vlc_dc_lum_bits[index] + index;
+ code = (ff_mpeg12_vlc_dc_lum_code[index] << index) +
+ (diff & ((1 << index) - 1));
+ mpeg1_lum_dc_uni[i + 255] = bits + (code << 8);
+
+ bits = ff_mpeg12_vlc_dc_chroma_bits[index] + index;
+ code = (ff_mpeg12_vlc_dc_chroma_code[index] << index) +
+ (diff & ((1 << index) - 1));
+ mpeg1_chr_dc_uni[i + 255] = bits + (code << 8);
 }
 
- for(f_code=1; f_code<=MAX_FCODE; f_code++){
- for(mv=-MAX_MV; mv<=MAX_MV; mv++){
+ for (f_code = 1; f_code <= MAX_FCODE; f_code++)
+ for (mv = -MAX_MV; mv <= MAX_MV; mv++) {
 int len;
 
- if(mv==0) len= ff_mpeg12_mbMotionVectorTable[0][1];
- else{
+ if (mv == 0) {
+ len = ff_mpeg12_mbMotionVectorTable[0][1];
+ } else {
 int val, bit_size, code;
 
 bit_size = f_code - 1;
 
- val=mv;
+ val = mv;
 if (val < 0)
 val = -val;
 val--;
 code = (val >> bit_size) + 1;
- if(code<17){
- len= ff_mpeg12_mbMotionVectorTable[code][1] + 1 + bit_size;
- }else{
- len= ff_mpeg12_mbMotionVectorTable[16][1] + 2 + bit_size;
- }
+ if (code < 17)
+ len = ff_mpeg12_mbMotionVectorTable[code][1] +
+ 1 + bit_size;
+ else
+ len = ff_mpeg12_mbMotionVectorTable[16][1] +
+ 2 + bit_size;
 }
 
- mv_penalty[f_code][mv+MAX_MV]= len;
+ mv_penalty[f_code][mv + MAX_MV] = len;
 }
- }
 
 
- for(f_code=MAX_FCODE; f_code>0; f_code--){
- for(mv=-(8<<f_code); mv<(8<<f_code); mv++){
- fcode_tab[mv+MAX_MV]= f_code;
- }
- }
- }
- s->me.mv_penalty= mv_penalty;
- s->fcode_tab= fcode_tab;
- if(s->codec_id == AV_CODEC_ID_MPEG1VIDEO){
- s->min_qcoeff=-255;
- s->max_qcoeff= 255;
- }else{
- s->min_qcoeff=-2047;
- s->max_qcoeff= 2047;
+ for (f_code = MAX_FCODE; f_code > 0; f_code--)
+ for (mv = -(8 << f_code); mv < (8 << f_code); mv++)
+ fcode_tab[mv + MAX_MV] = f_code;
 }
- if (s->intra_vlc_format) {
- s->intra_ac_vlc_length=
- s->intra_ac_vlc_last_length= uni_mpeg2_ac_vlc_len;
+ s->me.mv_penalty = mv_penalty;
+ s->fcode_tab = fcode_tab;
+ if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO) {
+ s->min_qcoeff = -255;
+ s->max_qcoeff = 255;
 } else {
- s->intra_ac_vlc_length=
- s->intra_ac_vlc_last_length= uni_mpeg1_ac_vlc_len;
+ s->min_qcoeff = -2047;
+ s->max_qcoeff = 2047;
 }
- s->inter_ac_vlc_length=
- s->inter_ac_vlc_last_length= uni_mpeg1_ac_vlc_len;
-}
-
-static inline void encode_dc(MpegEncContext *s, int diff, int component)
-{
- if(((unsigned) (diff+255)) >= 511){
- int index;
-
- if(diff<0){
- index= av_log2_16bit(-2*diff);
- diff--;
- }else{
- index= av_log2_16bit(2*diff);
- }
- if (component == 0) {
- put_bits(
- &s->pb,
- ff_mpeg12_vlc_dc_lum_bits[index] + index,
- (ff_mpeg12_vlc_dc_lum_code[index]<<index) + (diff & ((1 << index) - 1)));
- }else{
- put_bits(
- &s->pb,
- ff_mpeg12_vlc_dc_chroma_bits[index] + index,
- (ff_mpeg12_vlc_dc_chroma_code[index]<<index) + (diff & ((1 << index) - 1)));
- }
- }else{
- if (component == 0) {
- put_bits(
- &s->pb,
- mpeg1_lum_dc_uni[diff+255]&0xFF,
- mpeg1_lum_dc_uni[diff+255]>>8);
+ if (s->intra_vlc_format) {
+ s->intra_ac_vlc_length =
+ s->intra_ac_vlc_last_length = uni_mpeg2_ac_vlc_len;
 } else {
- put_bits(
- &s->pb,
- mpeg1_chr_dc_uni[diff+255]&0xFF,
- mpeg1_chr_dc_uni[diff+255]>>8);
+ s->intra_ac_vlc_length =
+ s->intra_ac_vlc_last_length = uni_mpeg1_ac_vlc_len;
 }
- }
-}
-
-static void mpeg1_encode_block(MpegEncContext *s,
- DCTELEM *block,
- int n)
-{
- int alevel, level, last_non_zero, dc, diff, i, j, run, last_index, sign;
- int code, component;
- const uint16_t (*table_vlc)[2] = ff_rl_mpeg1.table_vlc;
-
- last_index = s->block_last_index[n];
-
- /* DC coef */
- if (s->mb_intra) {
- component = (n <= 3 ? 0 : (n&1) + 1);
- dc = block[0]; /* overflow is impossible */
- diff = dc - s->last_dc[component];
- encode_dc(s, diff, component);
- s->last_dc[component] = dc;
- i = 1;
- if (s->intra_vlc_format)
- table_vlc = ff_rl_mpeg2.table_vlc;
- } else {
- /* encode the first coefficient : needs to be done here because
- it is handled slightly differently */
- level = block[0];
- if (abs(level) == 1) {
- code = ((uint32_t)level >> 31); /* the sign bit */
- put_bits(&s->pb, 2, code | 0x02);
- i = 1;
- } else {
- i = 0;
- last_non_zero = -1;
- goto next_coef;
- }
- }
-
- /* now quantify & encode AC coefs */
- last_non_zero = i - 1;
-
- for(;i<=last_index;i++) {
- j = s->intra_scantable.permutated[i];
- level = block[j];
- next_coef:
- /* encode using VLC */
- if (level != 0) {
- run = i - last_non_zero - 1;
-
- alevel= level;
- MASK_ABS(sign, alevel);
- sign&=1;
-
- if (alevel <= mpeg1_max_level[0][run]){
- code= mpeg1_index_run[0][run] + alevel - 1;
- /* store the vlc & sign at once */
- put_bits(&s->pb, table_vlc[code][1]+1, (table_vlc[code][0]<<1) + sign);
- } else {
- /* escape seems to be pretty rare <5% so I do not optimize it */
- put_bits(&s->pb, table_vlc[111][1], table_vlc[111][0]);
- /* escape: only clip in this case */
- put_bits(&s->pb, 6, run);
- if(s->codec_id == AV_CODEC_ID_MPEG1VIDEO){
- if (alevel < 128) {
- put_sbits(&s->pb, 8, level);
- } else {
- if (level < 0) {
- put_bits(&s->pb, 16, 0x8001 + level + 255);
- } else {
- put_sbits(&s->pb, 16, level);
- }
- }
- }else{
- put_sbits(&s->pb, 12, level);
- }
- }
- last_non_zero = i;
- }
- }
- /* end of block */
- put_bits(&s->pb, table_vlc[112][1], table_vlc[112][0]);
+ s->inter_ac_vlc_length =
+ s->inter_ac_vlc_last_length = uni_mpeg1_ac_vlc_len;
 }
 
 #define OFFSET(x) offsetof(MpegEncContext, x)
 #define VE AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM
-#define COMMON_OPTS\
- { "intra_vlc", "Use MPEG-2 intra VLC table.", OFFSET(intra_vlc_format), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE },\
- { "drop_frame_timecode", "Timecode is in drop frame format.", OFFSET(drop_frame_timecode), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE}, \
- { "scan_offset", "Reserve space for SVCD scan offset user data.", OFFSET(scan_offset), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE },
+#define COMMON_OPTS \
+ { "intra_vlc", "Use MPEG-2 intra VLC table.", \
+ OFFSET(intra_vlc_format), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, \
+ { "drop_frame_timecode", "Timecode is in drop frame format.", \
+ OFFSET(drop_frame_timecode), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, \
+ { "scan_offset", "Reserve space for SVCD scan offset user data.", \
+ OFFSET(scan_offset), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE },
 
 static const AVOption mpeg1_options[] = {
 COMMON_OPTS
@@ -933,18 +1046,18 @@
 
 static const AVOption mpeg2_options[] = {
 COMMON_OPTS
- { "non_linear_quant", "Use nonlinear quantizer.", OFFSET(q_scale_type), 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 },
+ { "non_linear_quant", "Use nonlinear quantizer.", OFFSET(q_scale_type), 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 },
 };
 
-#define mpeg12_class(x)\
-static const AVClass mpeg## x ##_class = {\
- .class_name = "mpeg" #x "video encoder",\
- .item_name = av_default_item_name,\
- .option = mpeg## x ##_options,\
- .version = LIBAVUTIL_VERSION_INT,\
+#define mpeg12_class(x) \
+static const AVClass mpeg ## x ## _class = { \
+ .class_name = "mpeg" # x "video encoder", \
+ .item_name = av_default_item_name, \
+ .option = mpeg ## x ## _options, \
+ .version = LIBAVUTIL_VERSION_INT, \
 };
 
 mpeg12_class(1)
@@ -952,6 +1065,7 @@
 
 AVCodec ff_mpeg1video_encoder = {
 .name = "mpeg1video",
+ .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MPEG1VIDEO,
 .priv_data_size = sizeof(MpegEncContext),
@@ -959,15 +1073,15 @@
 .encode2 = ff_MPV_encode_picture,
 .close = ff_MPV_encode_end,
 .supported_framerates = ff_mpeg12_frame_rate_tab + 1,
- .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,
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"),
 .priv_class = &mpeg1_class,
 };
 
 AVCodec ff_mpeg2video_encoder = {
 .name = "mpeg2video",
+ .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MPEG2VIDEO,
 .priv_data_size = sizeof(MpegEncContext),
@@ -975,10 +1089,9 @@
 .encode2 = ff_MPV_encode_picture,
 .close = ff_MPV_encode_end,
 .supported_framerates = ff_mpeg12_frame_rate_tab + 1,
- .pix_fmts = (const enum AVPixelFormat[]){
- AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_NONE
- },
+ .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
+ AV_PIX_FMT_YUV422P,
+ AV_PIX_FMT_NONE },
 .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS,
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"),
 .priv_class = &mpeg2_class,
 };

libav-v9.6.tar.bz2/libavcodec/mpeg4video.c -> libav-v10.1.tar.bz2/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.f.motion_val[0][xy][0];
- if((unsigned)(p_mx + tab_bias) < tab_size){
+ p_mx = s->next_picture.motion_val[0][xy][0];
+ 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.f.motion_val[0][xy][1];
- if((unsigned)(p_my + tab_bias) < tab_size){
+ p_my = s->next_picture.motion_val[0][xy][1];
+ 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;
- const int colocated_mb_type = s->next_picture.f.mb_type[mb_index];
+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++){
- int field_select = s->next_picture.f.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;
+ 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->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;
 }
 }

libav-v9.6.tar.bz2/libavcodec/mpeg4video.h -> libav-v10.1.tar.bz2/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,11 +59,55 @@
 #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];
 
 extern const uint16_t ff_mpeg4_intra_vlc[103][2];
+extern const int8_t ff_mpeg4_intra_level[102];
+extern const int8_t ff_mpeg4_intra_run[102];
+
 extern RLTable ff_mpeg4_rl_intra;
 
 /* Note this is identical to the intra rvlc except that it is reordered. */
@@ -83,24 +128,25 @@
 extern const uint8_t ff_mpeg4_dc_threshold[8];
 
 void ff_mpeg4_encode_mb(MpegEncContext *s,
- DCTELEM block[6][64],
+ int16_t block[6][64],
 int motion_x, int motion_y);
-void ff_mpeg4_pred_ac(MpegEncContext * s, DCTELEM *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);
+int ff_mpeg4_frame_end(AVCodecContext *avctx, const uint8_t *buf, int buf_size);
 
 /**
 *
@@ -108,8 +154,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")
@@ -117,7 +162,6 @@
 #define IS_3IV1 0
 #endif
 
-
 /**
 * Predict the dc.
 * encoding quantized level -> quantized diff
@@ -125,75 +169,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){
- 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) {
+ 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 */

libav-v9.6.tar.bz2/libavcodec/mpeg4video_parser.c -> libav-v10.1.tar.bz2/libavcodec/mpeg4video_parser.c Changed

@@ -20,6 +20,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "internal.h"
 #include "parser.h"
 #include "mpegvideo.h"
 #include "mpeg4video.h"
@@ -27,44 +28,45 @@
 
 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;
 }
 
@@ -74,24 +76,28 @@
 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;
 }
- s1->pict_type= s->pict_type;
+ s1->pict_type = s->pict_type;
 pc->first_picture = 0;
 return ret;
 }
@@ -100,38 +106,37 @@
 {
 struct Mp4vParseContext *pc = s->priv_data;
 
- pc->first_picture = 1;
- pc->enc.slice_context_count = 1;
+ pc->first_picture = 1;
+ pc->dec_ctx.m.slice_context_count = 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);
 
- *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),

libav-v9.6.tar.bz2/libavcodec/mpeg4videodec.c -> libav-v10.1.tar.bz2/libavcodec/mpeg4videodec.c Changed

@@ -20,29 +20,30 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "error_resilience.h"
+#include "internal.h"
 #include "mpegvideo.h"
 #include "mpeg4video.h"
 #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,
 };
 
 /**
@@ -50,391 +51,421 @@
 * @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, DCTELEM *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.f.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(MpegEncContext *s)
+{
+ int bits_count = get_bits_count(&s->gb);
+ int v = show_bits(&s->gb, 16);
 
- if(s->workaround_bugs&FF_BUG_NO_PADDING){
+ if (s->workaround_bugs & FF_BUG_NO_PADDING)
 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 1;
- }else{
- if(v == ff_mpeg4_resync_prefix[bits_count&7]){
+ } else {
+ if (v == ff_mpeg4_resync_prefix[bits_count & 7]) {
 int len;
- GetBitContext gb= s->gb;
+ 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;
 
- 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 1;
 }
 }
 return 0;
 }
 
-static void 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;
 
- for(i=0; i<s->num_sprite_warping_points; i++){
- int length;
- int x=0, y=0;
+ // 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 } };
 
- 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];
- } 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);
+ if (w <= 0 || h <= 0)
+ return AVERROR_INVALIDDATA;
 
- 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;
+ for (i = 0; i < ctx->num_sprite_warping_points; i++) {
+ int length;
+ int x = 0, y = 0;
 
- s->sprite_shift[0]= alpha + beta + rho - min_ab;
- s->sprite_shift[1]= alpha + beta + rho - min_ab + 2;
- break;
+ 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 (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;
 }
 
 /**
 * 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;
 }
- if(s->pict_type == AV_PICTURE_TYPE_B){
+ if (s->pict_type == AV_PICTURE_TYPE_B) {
 int mb_x = 0, mb_y = 0;
 
- while (s->next_picture.f.mbskip_table[s->mb_index2xy[mb_num]]) {
+ while (s->next_picture.mbskip_table[s->mb_index2xy[mb_num]]) {
 if (!mb_x)
- ff_thread_await_progress(&s->next_picture_ptr->f, mb_y++, 0);
+ ff_thread_await_progress(&s->next_picture_ptr->tf, mb_y++, 0);
 mb_num++;
- if (++mb_x == s->mb_width) mb_x = 0;
+ if (++mb_x == s->mb_width)
+ mb_x = 0;
 }
- if(mb_num >= s->mb_num) return -1; // slice contains just skipped MBs which where already decoded
+ if (mb_num >= s->mb_num)
+ return -1; // slice contains just skipped MBs (already decoded)
 }
 
- 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){
- mpeg4_decode_sprite_trajectory(s, &s->gb);
+ // 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");
 }
 }
 }
- //FIXME new-pred stuff
+ // FIXME new-pred stuff
 
 return 0;
 }
@@ -444,43 +475,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;
 }
@@ -491,7 +528,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;
 
@@ -499,29 +536,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){
+ if (code > 8) {
+ if (get_bits1(&s->gb) == 0) { /* marker */
+ if (s->err_recognition & AV_EF_BITSTREAM) {
 av_log(s->avctx, AV_LOG_ERROR, "dc marker bit missing\n");
 return -1;
 }
@@ -536,124 +575,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->current_picture.f.mb_type[xy] = MB_TYPE_INTRA;
- s->mb_intra = 1;
+ s->cbp_table[xy] = cbpc & 3;
+ s->current_picture.mb_type[xy] = MB_TYPE_INTRA;
+ 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.f.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.f.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.f.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.f.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){
- s->current_picture.f.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])
+ 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])
 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;
@@ -661,22 +721,30 @@
 my = ff_h263_decode_motion(s, pred_y, s->f_code);
 if (my >= 0xffff)
 return -1;
- s->current_picture.f.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.f.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.f.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;
@@ -691,7 +759,7 @@
 }
 }
 }
- s->mb_x= 0;
+ s->mb_x = 0;
 }
 
 return mb_num;
@@ -701,85 +769,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.f.mb_type[xy] |= ac_pred*MB_TYPE_ACPRED;
- }else{ /* P || S_TYPE */
- if (IS_INTRA(s->current_picture.f.mb_type[xy])) {
- int dir=0,i;
+ 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 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.f.qscale_table[xy] = s->qscale;
+ 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.f.mb_type[xy] |= ac_pred*MB_TYPE_ACPRED;
- s->pred_dir_table[xy]= dir;
- } else if (IS_SKIP(s->current_picture.f.mb_type[xy])) {
- s->current_picture.f.qscale_table[xy] = s->qscale;
- s->cbp_table[xy]= 0;
- }else{
+ 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 {
 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.f.qscale_table[xy] = s->qscale;
+ 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;
 }
@@ -788,50 +862,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, 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, 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, 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, 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, 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;
@@ -841,221 +925,242 @@
 * Decode a block.
 * @return <0 if an error occurred
 */
-static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * 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;
- int 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{
+ MpegEncContext *s = &ctx->m;
+ int level, i, last, run, qmul, qadd, dc_pred_dir;
+ 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);
-
- 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);
+ {
+ 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);
 
- level= SHOW_UBITS(re, &s->gb, 11); SKIP_CACHE(re, &s->gb, 11);
+ 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);
 
- 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);
+ 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);
 
- 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);
+ level = SHOW_UBITS(re, &s->gb, 11);
+ SKIP_CACHE(re, &s->gb, 11);
 
- 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);
+ 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);
 
- 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);
+ 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);
 
- level= SHOW_SBITS(re, &s->gb, 12); SKIP_CACHE(re, &s->gb, 12);
+ i += run + 1;
+ if (last)
+ i += 192;
+ } else {
+ int cache;
+ cache = GET_CACHE(re, &s->gb);
 
- 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 (IS_3IV1)
+ cache ^= 0xC0000000;
 
- SKIP_COUNTER(re, &s->gb, 1+12+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);
+
+ level = SHOW_SBITS(re, &s->gb, 12);
+ SKIP_CACHE(re, &s->gb, 12);
+
+ 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 (level>0) level= level * qmul + qadd;
- else level= level * qmul - qadd;
+ SKIP_COUNTER(re, &s->gb, 1 + 12 + 1);
+ }
 
- if((unsigned)(level + 2048) > 4095){
- if(s->err_recognition & AV_EF_BITSTREAM){
- 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) {
+ 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;
@@ -1065,45 +1170,47 @@
 * decode partition C of one MB.
 * @return <0 if an error occurred
 */
-static int mpeg4_decode_partitioned_mb(MpegEncContext *s, DCTELEM block[6][64])
+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.f.mb_type[xy];
- cbp = s->cbp_table[xy];
+ mb_type = s->current_picture.mb_type[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.f.qscale_table[xy] != s->qscale) {
- ff_set_qscale(s, s->current_picture.f.qscale_table[xy]);
- }
+ 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++){
- s->mv[0][i][0] = s->current_picture.f.motion_val[0][s->block_index[i]][0];
- s->mv[0][i][1] = s->current_picture.f.motion_val[0][s->block_index[i]][1];
+ 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];
 }
 s->mb_intra = IS_INTRA(mb_type);
 
 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){
- s->ac_pred = IS_ACPRED(s->current_picture.f.mb_type[xy]);
- }else if(!s->mb_intra){
-// s->mcsel= 0; //FIXME do we need to init that
+ } 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?
 
 s->mv_dir = MV_DIR_FORWARD;
 if (IS_8X8(mb_type)) {
@@ -1114,7 +1221,7 @@
 }
 } else { /* I-Frame */
 s->mb_intra = 1;
- s->ac_pred = IS_ACPRED(s->current_picture.f.mb_type[xy]);
+ s->ac_pred = IS_ACPRED(s->current_picture.mb_type[xy]);
 }
 
 if (!IS_SKIP(mb_type)) {
@@ -1122,124 +1229,139 @@
 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(s))
 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(s)) {
+ 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,
- DCTELEM 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;
 
 assert(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.f.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.f.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.f.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.f.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{
- s->current_picture.f.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0;
+ } else {
+ s->current_picture.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0;
 /* 16x16 motion prediction */
 s->mv_type = MV_TYPE_16X16;
 ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
@@ -1256,11 +1378,11 @@
 s->mv[0][0][1] = my;
 }
 } else {
- s->current_picture.f.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0;
- s->mv_type = MV_TYPE_8X8;
- for(i=0;i<4;i++) {
+ s->current_picture.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0;
+ 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;
 
@@ -1269,213 +1391,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->f, s->mb_y, 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.f.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.f.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.f.mb_type[xy] = mb_type;
+ 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)
- s->current_picture.f.mb_type[xy] = MB_TYPE_INTRA | MB_TYPE_ACPRED;
+ if (s->ac_pred)
+ s->current_picture.mb_type[xy] = MB_TYPE_INTRA | MB_TYPE_ACPRED;
 else
- s->current_picture.f.mb_type[xy] = MB_TYPE_INTRA;
+ 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){
- if(mpeg4_is_resync(s)){
- const int delta= s->mb_x + 1 == s->mb_width ? 2 : 1;
 
- if (s->pict_type == AV_PICTURE_TYPE_B && s->next_picture.f.mbskip_table[xy + delta]) {
- ff_thread_await_progress(&s->next_picture_ptr->f,
- (s->mb_x + delta >= s->mb_width) ? FFMIN(s->mb_y+1, s->mb_height-1) : s->mb_y, 0);
+end:
+ /* per-MB end of slice check */
+ if (s->codec_id == AV_CODEC_ID_MPEG4) {
+ if (mpeg4_is_resync(s)) {
+ const int delta = s->mb_x + 1 == s->mb_width ? 2 : 1;
+
+ if (s->pict_type == AV_PICTURE_TYPE_B &&
+ s->next_picture.mbskip_table[xy + delta]) {
+ 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);
 }
 
- if (s->pict_type == AV_PICTURE_TYPE_B && s->next_picture.f.mbskip_table[xy + delta])
+ if (s->pict_type == AV_PICTURE_TYPE_B &&
+ s->next_picture.mbskip_table[xy + delta])
 return SLICE_OK;
 return SLICE_END;
 }
@@ -1484,16 +1626,16 @@
 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;
 unsigned time_code = show_bits(gb, 18);
 
 if (time_code & 0x40) { /* marker_bit */
 hours = time_code >> 13;
- minutes = time_code >> 7 & 0x3f;
- seconds = time_code & 0x3f;
- s->time_base = seconds + 60*(minutes + 60*hours);
+ minutes = time_code >> 7 & 0x3f;
+ seconds = time_code & 0x3f;
+ s->time_base = seconds + 60 * (minutes + 60 * hours);
 skip_bits(gb, 20); /* time_code, closed_gov, broken_link */
 } else {
 av_log(s->avctx, AV_LOG_WARNING, "GOP header missing marker_bit\n");
@@ -1502,49 +1644,52 @@
 return 0;
 }
 
-static int mpeg4_decode_profile_level(MpegEncContext * s, GetBitContext *gb){
- int profile_and_level_indication;
+static int mpeg4_decode_profile_level(MpegEncContext *s, GetBitContext *gb)
+{
+ int profile_and_level_indication;
 
- profile_and_level_indication = get_bits(gb, 8);
+ profile_and_level_indication = get_bits(gb, 8);
 
- s->avctx->profile = (profile_and_level_indication & 0xf0) >> 4;
- s->avctx->level = (profile_and_level_indication & 0x0f);
+ s->avctx->profile = (profile_and_level_indication & 0xf0) >> 4;
+ s->avctx->level = (profile_and_level_indication & 0x0f);
 
- // for Simple profile, level 0
- if (s->avctx->profile == 0 && s->avctx->level == 8) {
- s->avctx->level = 0;
- }
+ // for Simple profile, level 0
+ if (s->avctx->profile == 0 && s->avctx->level == 8) {
+ s->avctx->level = 0;
+ }
 
- return 0;
+ 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 */
@@ -1557,273 +1702,289 @@
 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 overriden
- 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) {
 skip_bits1(gb); /* marker */
 width = get_bits(gb, 13);
 skip_bits1(gb); /* marker */
 height = get_bits(gb, 13);
 skip_bits1(gb); /* marker */
- 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 (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);
 } else {
 s->quant_precision = 5;
 }
 
 // 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_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
 }
 }
+
 return 0;
 }
 
@@ -1831,270 +1992,327 @@
 * 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) {
- av_log(s->avctx, AV_LOG_WARNING, "Invalid and inefficient vfw-avi packed B frames detected\n");
- s->showed_packed_warning=1;
+ 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_WARNING,
+ "Invalid and inefficient vfw-avi packed B frames detected\n");
+ 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;
+
+ 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 HAVE_MMX
+ if (ctx->xvid_build >= 0 &&
+ s->avctx->idct_algo == FF_IDCT_AUTO &&
+ (av_get_cpu_flags() & AV_CPU_FLAG_MMX)) {
+ s->avctx->idct_algo = FF_IDCT_XVIDMMX;
+ ff_dct_common_init(s);
 }
+#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;
 
 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;
+ 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",s->time_increment_bits);
+ av_log(s->avctx, AV_LOG_ERROR,
+ "my guess is %d bits ;)\n", 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->progressive_sequence) {
+ if (s->pp_field_time <= s->pb_field_time || s->pb_field_time <= 1)
 return FRAME_SKIPPED;
 }
 }
 
- if(s->avctx->time_base.num)
- s->current_picture_ptr->f.pts = (s->time + s->avctx->time_base.num / 2) / s->avctx->time_base.num;
- else
- s->current_picture_ptr->f.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);
-
 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->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);
+
+ 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);
-
- 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)){
- mpeg4_decode_sprite_trajectory(s, gb);
- 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");
- 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);
- }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\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);
- }
-
- 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");
+ 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);
+ } 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\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);
+ }
+
+ 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;
 }
 
 /**
@@ -2103,107 +2321,252 @@
 * 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)){
+ for (;;) {
+ if (get_bits_count(gb) >= gb->size_in_bits) {
+ if (gb->size_in_bits == 8 &&
+ (ctx->divx_version >= 0 || ctx->xvid_build >= 0)) {
 av_log(s->avctx, AV_LOG_WARNING, "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;
+
+ 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;
+
+ 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->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" : "");
+
+ return decode_vop_header(ctx, gb);
+}
+
+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+ bistream reorder stuff */
+ if (s->divx_packed) {
+ int current_pos = get_bits_count(&s->gb) >> 3;
+ int startcode_found = 0;
+
+ if (buf_size - current_pos > 5) {
+ int i;
+ for (i = current_pos; i < buf_size - 3; i++)
+ if (buf[i] == 0 &&
+ buf[i + 1] == 0 &&
+ buf[i + 2] == 1 &&
+ buf[i + 3] == 0xB6) {
+ startcode_found = 1;
+ break;
+ }
+ }
+ if (s->gb.buffer == s->bitstream_buffer && buf_size > 7 &&
+ ctx->xvid_build >= 0) { // xvid style
+ startcode_found = 1;
+ current_pos = 0;
+ }
+
+ 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;
+ }
+ }
+
+ 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;
+
+ s->shape = s1->shape;
+ s->time_increment_bits = s1->time_increment_bits;
+
+ 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;
 static int done = 0;
 
- 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;
 
 if (!done) {
@@ -2216,24 +2579,26 @@
 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);
 }
 
 s->h263_pred = 1;
- s->low_delay = 0; //default, might be overriden in the vol header during header parsing
- s->decode_mb= mpeg4_decode_mb;
- s->time_increment_bits = 4; /* default value for broken headers */
+ s->low_delay = 0; /* default, might be overriden 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;
 }
@@ -2259,9 +2624,10 @@
 
 AVCodec ff_mpeg4_decoder = {
 .name = "mpeg4",
+ .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,
@@ -2269,26 +2635,7 @@
 CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY |
 CODEC_CAP_FRAME_THREADS,
 .flush = ff_mpeg_flush,
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"),
- .pix_fmts = ff_hwaccel_pixfmt_list_420,
+ .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),
 };
-
-
-#if CONFIG_MPEG4_VDPAU_DECODER
-AVCodec ff_mpeg4_vdpau_decoder = {
- .name = "mpeg4_vdpau",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_MPEG4,
- .priv_data_size = sizeof(MpegEncContext),
- .init = decode_init,
- .close = ff_h263_decode_end,
- .decode = ff_h263_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY |
- CODEC_CAP_HWACCEL_VDPAU,
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 (VDPAU)"),
- .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_VDPAU_MPEG4,
- AV_PIX_FMT_NONE },
-};
-#endif

libav-v9.6.tar.bz2/libavcodec/mpeg4videoenc.c -> libav-v10.1.tar.bz2/libavcodec/mpeg4videoenc.c Changed

@@ -20,69 +20,73 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "libavutil/attributes.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
 #include "mpegvideo.h"
 #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, DCTELEM 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.
@@ -91,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, DCTELEM 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];
 }
 }
 }
@@ -122,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, DCTELEM 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.f.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;
 }
@@ -201,51 +209,55 @@
 /**
 * modify mb_type & qscale so that encoding is acually 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.f.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]);
@@ -257,7 +269,7 @@
 int size, v;
 /* find number of bits */
 size = 0;
- v = abs(level);
+ v = abs(level);
 while (v) {
 v >>= 1;
 size++;
@@ -282,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, DCTELEM * 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, DCTELEM * 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;
 }
@@ -368,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, DCTELEM 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, DCTELEM 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)
@@ -465,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,
- DCTELEM 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;
 }
 
- assert(s->dquant>=-2 && s->dquant<=2);
- assert((s->dquant&1)==0);
- assert(mb_type>=0);
+ assert(s->dquant >= -2 && s->dquant <= 2);
+ assert((s->dquant & 1) == 0);
+ assert(mb_type >= 0);
 
 /* nothing to do if this MB was skipped in the next P Frame */
- if (s->next_picture.f.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} */
- assert(s->dquant==0);
+ assert(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++;
 }
@@ -528,137 +558,150 @@
 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) {
 assert(s->mv_dir & MV_DIRECT);
 ff_h263_encode_motion_vector(s, motion_x, motion_y, 1);
 s->b_count++;
 s->f_count++;
- }else{
+ } else {
 assert(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;
- if(x+16 > s->width) x= s->width-16;
- if(y+16 > s->height) y= s->height-16;
+ x = s->mb_x * 16;
+ y = s->mb_y * 16;
+ if (x + 16 > s->width)
+ x = s->width - 16;
+ if (y + 16 > s->height)
+ y = s->height - 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->f.type != FF_BUFFER_TYPE_SHARED)
- b_pic+= INPLACE_OFFSET;
- 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 (!pic->shared)
+ b_pic += INPLACE_OFFSET;
+ 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;
 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++;
 }
@@ -669,162 +712,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]);
 
 assert(!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{
- assert(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 {
+ assert(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.f.motion_val[0][ s->block_index[i] ][0] - pred_x,
- s->current_picture.f.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);
 }
 }
@@ -832,25 +877,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= s->time/s->avctx->time_base.den;
+ } else {
+ s->last_time_base = s->time_base;
+ s->time_base = 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;
 
@@ -858,53 +906,54 @@
 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;
+ time = time * s->avctx->time_base.num;
 
- seconds= time/s->avctx->time_base.den;
- minutes= seconds/60; seconds %= 60;
- hours= minutes/60; minutes %= 60;
- hours%=24;
+ seconds = time / s->avctx->time_base.den;
+ minutes = seconds / 60;
+ seconds %= 60;
+ hours = minutes / 60;
+ minutes %= 60;
+ 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
 
- s->last_time_base= time / s->avctx->time_base.den;
+ s->last_time_base = time / s->avctx->time_base.den;
 
 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);
@@ -915,28 +964,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);
@@ -946,7 +998,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 */
@@ -954,15 +1006,15 @@
 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) {
 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 */
@@ -986,16 +1038,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);
 }
@@ -1003,14 +1054,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 */
 }
@@ -1019,7 +1068,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);
@@ -1027,34 +1076,34 @@
 }
 
 /* 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 */
 
- assert(s->time>=0);
- time_div= s->time/s->avctx->time_base.den;
- time_mod= s->time%s->avctx->time_base.den;
- time_incr= time_div - s->last_time_base;
+ assert(s->time >= 0);
+ time_div = s->time / s->avctx->time_base.den;
+ time_mod = s->time % s->avctx->time_base.den;
+ time_incr = time_div - s->last_time_base;
 assert(time_incr >= 0);
- while(time_incr--)
+ while (time_incr--)
 put_bits(&s->pb, 1, 1);
 
 put_bits(&s->pb, 1, 0);
@@ -1063,153 +1112,168 @@
 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 void init_uni_dc_tab(void)
+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;
 }
 }
 
-static void init_uni_mpeg4_rl_tab(RLTable *rl, uint32_t *bits_tab, uint8_t *len_tab){
+static av_cold void init_uni_mpeg4_rl_tab(RLTable *rl, uint32_t *bits_tab,
+ uint8_t *len_tab)
+{
 int slevel, run, last;
 
 assert(MAX_LEVEL >= 64);
- assert(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;
+ assert(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;
 }
 }
 }
@@ -1222,7 +1286,7 @@
 int ret;
 static int done = 0;
 
- if((ret=ff_MPV_encode_init(avctx)) < 0)
+ if ((ret = ff_MPV_encode_init(avctx)) < 0)
 return ret;
 
 if (!done) {
@@ -1236,81 +1300,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 */
 }
@@ -1318,8 +1380,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 },
 };
@@ -1333,14 +1395,14 @@
 
 AVCodec ff_mpeg4_encoder = {
 .name = "mpeg4",
+ .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MPEG4,
 .priv_data_size = sizeof(MpegEncContext),
 .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,
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"),
 .priv_class = &mpeg4enc_class,
 };

libav-v9.6.tar.bz2/libavcodec/mpegaudio_tablegen.h -> libav-v10.1.tar.bz2/libavcodec/mpegaudio_tablegen.h Changed

@@ -47,7 +47,8 @@
 double value = i / 4;
 double f, fm;
 int e, m;
- f = value * cbrtf(value) * pow(2, (i & 3) * 0.25);
+ /* cbrtf() isn't available on all systems, so we use powf(). */
+ f = value * powf(value, 1.0 / 3.0) * pow(2, (i & 3) * 0.25);
 fm = frexp(f, &e);
 m = (uint32_t)(fm * (1LL << 31) + 0.5);
 e += FRAC_BITS - 31 + 5 - 100;
@@ -58,8 +59,10 @@
 }
 for (exponent = 0; exponent < 512; exponent++) {
 for (value = 0; value < 16; value++) {
- double f = (double)value * cbrtf(value) * pow(2, (exponent - 400) * 0.25 + FRAC_BITS + 5);
- expval_table_fixed[exponent][value] = llrint(f);
+ /* cbrtf() isn't available on all systems, so we use powf(). */
+ double f = (double)value * powf(value, 1.0 / 3.0) * pow(2, (exponent - 400) * 0.25 + FRAC_BITS + 5);
+ /* llrint() isn't always available, so round and cast manually. */
+ expval_table_fixed[exponent][value] = (long long int) (f >= 0 ? floor(f + 0.5) : ceil(f - 0.5));
 expval_table_float[exponent][value] = f;
 }
 exp_table_fixed[exponent] = expval_table_fixed[exponent][1];

libav-v10.1.tar.bz2/libavcodec/mpegaudiodec_fixed.c Added

@@ -0,0 +1,120 @@
+/*
+ * Fixed-point MPEG audio decoder
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 CONFIG_FLOAT 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

libav-v9.6.tar.bz2/libavcodec/mpegaudiodec_float.c -> libav-v10.1.tar.bz2/libavcodec/mpegaudiodec_float.c Changed

@@ -19,12 +19,29 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "config.h"
+#include "libavutil/samplefmt.h"
+
 #define CONFIG_FLOAT 1
-#include "mpegaudiodec.c"
+
+#include "mpegaudio.h"
+
+#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
+
+#include "mpegaudiodec_template.c"
 
 #if CONFIG_MP1FLOAT_DECODER
 AVCodec ff_mp1float_decoder = {
 .name = "mp1float",
+ .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),
@@ -32,7 +49,6 @@
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
 .flush = flush,
- .long_name = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_FLT,
 AV_SAMPLE_FMT_NONE },
@@ -41,6 +57,7 @@
 #if CONFIG_MP2FLOAT_DECODER
 AVCodec ff_mp2float_decoder = {
 .name = "mp2float",
+ .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),
@@ -48,7 +65,6 @@
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
 .flush = flush,
- .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_FLT,
 AV_SAMPLE_FMT_NONE },
@@ -57,6 +73,7 @@
 #if CONFIG_MP3FLOAT_DECODER
 AVCodec ff_mp3float_decoder = {
 .name = "mp3float",
+ .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),
@@ -64,7 +81,6 @@
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
 .flush = flush,
- .long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_FLT,
 AV_SAMPLE_FMT_NONE },
@@ -73,6 +89,7 @@
 #if CONFIG_MP3ADUFLOAT_DECODER
 AVCodec ff_mp3adufloat_decoder = {
 .name = "mp3adufloat",
+ .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),
@@ -80,7 +97,6 @@
 .decode = decode_frame_adu,
 .capabilities = CODEC_CAP_DR1,
 .flush = flush,
- .long_name = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_FLT,
 AV_SAMPLE_FMT_NONE },
@@ -89,6 +105,7 @@
 #if CONFIG_MP3ON4FLOAT_DECODER
 AVCodec ff_mp3on4float_decoder = {
 .name = "mp3on4float",
+ .long_name = NULL_IF_CONFIG_SMALL("MP3onMP4"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_MP3ON4,
 .priv_data_size = sizeof(MP3On4DecodeContext),
@@ -97,7 +114,6 @@
 .decode = decode_frame_mp3on4,
 .capabilities = CODEC_CAP_DR1,
 .flush = flush_mp3on4,
- .long_name = NULL_IF_CONFIG_SMALL("MP3onMP4"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_NONE },
 };

libav-v10.1.tar.bz2/libavcodec/mpegaudiodec_template.c Added

@@ -0,0 +1,1948 @@
+/*
+ * MPEG Audio decoder
+ * Copyright (c) 2001, 2002 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 "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 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;
+ assert(e >= 1);
+ 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];
+ }
+ assert(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];
+ }
+ assert(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 = pow(2.0, 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;
+ assert((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)
+ 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_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_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
+#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;
+ }
+}
+
+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,
+ FFMAX(0, LAST_BUF_SIZE - s->last_buf_size));
+ assert((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 += extrasize * 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);
+
+ if (nb_frames < 0)
+ return nb_frames;
+
+ 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);
+ assert((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);
+ }
+ assert(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;
+ }
+
+ /* 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) {
+ av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ 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;
+
+ if (buf_size < HEADER_SIZE)
+ return AVERROR_INVALIDDATA;
+
+ header = AV_RB32(buf);
+ 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) {
+ 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;
+
+ 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) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ 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];
+ assert(m != NULL);
+
+ 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 */

libav-v9.6.tar.bz2/libavcodec/mpegaudiodecheader.c -> libav-v10.1.tar.bz2/libavcodec/mpegaudiodecheader.c Changed

libav-v9.6.tar.bz2/libavcodec/mpegaudiodsp.c -> libav-v10.1.tar.bz2/libavcodec/mpegaudiodsp.c Changed

libav-v9.6.tar.bz2/libavcodec/mpegaudiodsp.h -> libav-v10.1.tar.bz2/libavcodec/mpegaudiodsp.h Changed

libav-v9.6.tar.bz2/libavcodec/mpegaudiodsp_template.c -> libav-v10.1.tar.bz2/libavcodec/mpegaudiodsp_template.c Changed

libav-v9.6.tar.bz2/libavcodec/mpegaudioenc.c -> libav-v10.1.tar.bz2/libavcodec/mpegaudioenc.c Changed

@@ -35,6 +35,8 @@
 
 #include "mpegaudio.h"
 #include "mpegaudiodsp.h"
+#include "mpegaudiodata.h"
+#include "mpegaudiotab.h"
 
 /* currently, cannot change these constants (need to modify
 quantization stage) */
@@ -59,14 +61,13 @@
 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];
+ float scale_factor_inv_table[64];
+ unsigned short total_quant_bits[17]; /* total number of bits per allocation group */
 } 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;
@@ -140,25 +141,19 @@
 #if WFRAC_BITS != 16
 v = (v + (1 << (16 - WFRAC_BITS - 1))) >> (16 - WFRAC_BITS);
 #endif
- filter_bank[i] = v;
+ s->filter_bank[i] = v;
 if ((i & 63) != 0)
 v = -v;
 if (i != 0)
- filter_bank[512 - i] = v;
+ s->filter_bank[512 - i] = v;
 }
 
 for(i=0;i<64;i++) {
 v = (int)(pow(2.0, (3 - i) / 3.0) * (1 << 20));
 if (v <= 0)
 v = 1;
- scale_factor_table[i] = v;
-#ifdef USE_FLOATS
- scale_factor_inv_table[i] = pow(2.0, -(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) * pow(2.0, (i % 3) / 3.0);
-#endif
+ s->scale_factor_table[i] = v;
+ s->scale_factor_inv_table[i] = pow(2.0, -(3 - i) / 3.0) / (float)(1 << 20);
 }
 for(i=0;i<128;i++) {
 v = i - 64;
@@ -172,7 +167,7 @@
 v = 3;
 else
 v = 4;
- scale_diff_table[i] = v;
+ s->scale_diff_table[i] = v;
 }
 
 for(i=0;i<17;i++) {
@@ -181,15 +176,9 @@
 v = -v;
 else
 v = v * 3;
- total_quant_bits[i] = 12 * v;
+ s->total_quant_bits[i] = 12 * v;
 }
 
-#if FF_API_OLD_ENCODE_AUDIO
- avctx->coded_frame= avcodec_alloc_frame();
- if (!avctx->coded_frame)
- return AVERROR(ENOMEM);
-#endif
-
 return 0;
 }
 
@@ -334,7 +323,7 @@
 
 /* filter */
 p = s->samples_buf[ch] + offset;
- q = filter_bank;
+ q = s->filter_bank;
 /* maxsum = 23169 */
 for(i=0;i<64;i++) {
 sum = p[0*64] * q[0*64];
@@ -368,7 +357,8 @@
 s->samples_offset[ch] = offset;
 }
 
-static void compute_scale_factors(unsigned char scale_code[SBLIMIT],
+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)
@@ -395,7 +385,7 @@
 use at most 2 compares to find the index */
 index = (21 - n) * 3 - 3;
 if (index >= 0) {
- while (vmax <= scale_factor_table[index+1])
+ while (vmax <= s->scale_factor_table[index+1])
 index++;
 } else {
 index = 0; /* very unlikely case of overflow */
@@ -405,7 +395,7 @@
 }
 
 av_dlog(NULL, "%2d:%d in=%x %x %d\n",
- j, i, vmax, scale_factor_table[index], index);
+ j, i, vmax, s->scale_factor_table[index], index);
 /* store the scale factor */
 assert(index >=0 && index <= 63);
 sf[i] = index;
@@ -413,8 +403,8 @@
 
 /* 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];
+ 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) {
@@ -564,12 +554,12 @@
 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]];
+ incr += s->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]];
+ incr = s->total_quant_bits[alloc[b + 1]] -
+ s->total_quant_bits[alloc[b]];
 }
 
 if (current_frame_size + incr <= max_frame_size) {
@@ -678,30 +668,11 @@
 qindex = s->alloc_table[j+b];
 steps = ff_mpa_quant_steps[qindex];
 for(m=0;m<3;m++) {
+ float a;
 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
+ a = (float)sample * s->scale_factor_inv_table[s->scale_factors[ch][i][k]];
+ q[m] = (int)((a + 1.0) * steps * 0.5);
 if (q[m] >= steps)
 q[m] = steps - 1;
 assert(q[m] >= 0 && q[m] < steps);
@@ -746,7 +717,7 @@
 }
 
 for(i=0;i<s->nb_channels;i++) {
- compute_scale_factors(s->scale_code[i], s->scale_factors[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++) {
@@ -771,14 +742,6 @@
 return 0;
 }
 
-static av_cold int MPA_encode_close(AVCodecContext *avctx)
-{
-#if FF_API_OLD_ENCODE_AUDIO
- av_freep(&avctx->coded_frame);
-#endif
- return 0;
-}
-
 static const AVCodecDefault mp2_defaults[] = {
 { "b", "128k" },
 { NULL },
@@ -786,12 +749,12 @@
 
 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,
- .close = MPA_encode_close,
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
 AV_SAMPLE_FMT_NONE },
 .supported_samplerates = (const int[]){
@@ -800,6 +763,5 @@
 .channel_layouts = (const uint64_t[]){ AV_CH_LAYOUT_MONO,
 AV_CH_LAYOUT_STEREO,
 0 },
- .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
 .defaults = mp2_defaults,
 };

libav-v9.6.tar.bz2/libavcodec/mpegaudiotab.h -> libav-v10.1.tar.bz2/libavcodec/mpegaudiotab.h Changed

libav-v9.6.tar.bz2/libavcodec/mpegvideo.c -> libav-v10.1.tar.bz2/libavcodec/mpegvideo.c Changed

@@ -27,7 +27,11 @@
 * The simplest mpeg encoder (well, it was the simplest!).
 */
 
+#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 "internal.h"
@@ -39,31 +43,6 @@
 #include "thread.h"
 #include <limits.h>
 
-//#undef NDEBUG
-//#include <assert.h>
-
-static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
- DCTELEM *block, int n, int qscale);
-static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s,
- DCTELEM *block, int n, int qscale);
-static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s,
- DCTELEM *block, int n, int qscale);
-static void dct_unquantize_mpeg2_intra_bitexact(MpegEncContext *s,
- DCTELEM *block, int n, int qscale);
-static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s,
- DCTELEM *block, int n, int qscale);
-static void dct_unquantize_h263_intra_c(MpegEncContext *s,
- DCTELEM *block, int n, int qscale);
-static void dct_unquantize_h263_inter_c(MpegEncContext *s,
- DCTELEM *block, int n, int qscale);
-
-
-/* enable all paranoid tests for rounding, overflows, etc... */
-//#define PARANOID
-
-//#define DEBUG
-
-
 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,
@@ -130,51 +109,256 @@
 AV_PIX_FMT_NONE
 };
 
-const enum AVPixelFormat ff_hwaccel_pixfmt_list_420[] = {
- AV_PIX_FMT_DXVA2_VLD,
- AV_PIX_FMT_VAAPI_VLD,
- AV_PIX_FMT_VDA_VLD,
- AV_PIX_FMT_YUV420P,
- 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];
+
+ if (n < 4)
+ block[0] = block[0] * s->y_dc_scale;
+ else
+ block[0] = block[0] * 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];
 
-const uint8_t *avpriv_mpv_find_start_code(const uint8_t *restrict p,
- const uint8_t *end,
- uint32_t * restrict state)
+ 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;
+ int i, level, nCoeffs;
+ const uint16_t *quant_matrix;
 
- assert(p <= end);
- if (p >= end)
- return end;
-
- for (i = 0; i < 3; i++) {
- uint32_t tmp = *state << 8;
- *state = tmp + *(p++);
- if (tmp == 0x100 || p == end)
- return p;
- }
-
- while (p < end) {
- if (p[-1] > 1 ) p += 3;
- else if (p[-2] ) p += 2;
- else if (p[-3]|(p[-1]-1)) p++;
- else {
- p++;
- break;
+ if(s->alternate_scan) nCoeffs= 63;
+ else nCoeffs= s->block_last_index[n];
+
+ if (n < 4)
+ block[0] = block[0] * s->y_dc_scale;
+ else
+ block[0] = block[0] * 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];
+
+ if (n < 4)
+ block[0] = block[0] * s->y_dc_scale;
+ else
+ block[0] = block[0] * 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;
+ 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;
+
+ assert(s->block_last_index[n]>=0);
+
+ qmul = qscale << 1;
+
+ if (!s->h263_aic) {
+ if (n < 4)
+ block[0] = block[0] * s->y_dc_scale;
+ else
+ block[0] = block[0] * 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;
+
+ assert(s->block_last_index[n]>=0);
 
- p = FFMIN(p, end) - 4;
- *state = AV_RB32(p);
+ qadd = (qscale - 1) | 1;
+ qmul = qscale << 1;
+
+ nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
 
- return p + 4;
+ 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)
+{
+ MpegEncContext *s = opaque;
+
+ s->mv_dir = mv_dir;
+ s->mv_type = mv_type;
+ s->mb_intra = mb_intra;
+ s->mb_skipped = mb_skipped;
+ s->mb_x = mb_x;
+ s->mb_y = mb_y;
+ memcpy(s->mv, mv, sizeof(*mv));
+
+ ff_init_block_index(s);
+ ff_update_block_index(s);
+
+ s->dsp.clear_blocks(s->block[0]);
+
+ s->dest[0] = s->current_picture.f.data[0] + (s->mb_y * 16 * s->linesize) + s->mb_x * 16;
+ s->dest[1] = s->current_picture.f.data[1] + (s->mb_y * (16 >> s->chroma_y_shift) * s->uvlinesize) + s->mb_x * (16 >> s->chroma_x_shift);
+ s->dest[2] = s->current_picture.f.data[2] + (s->mb_y * (16 >> s->chroma_y_shift) * s->uvlinesize) + s->mb_x * (16 >> s->chroma_x_shift);
+
+ assert(ref == 0);
+ ff_MPV_decode_mb(s, s->block);
 }
 
 /* init common dct for both encoder and decoder */
 av_cold int ff_dct_common_init(MpegEncContext *s)
 {
 ff_dsputil_init(&s->dsp, s->avctx);
+ ff_hpeldsp_init(&s->hdsp, s->avctx->flags);
 ff_videodsp_init(&s->vdsp, s->avctx->bits_per_raw_sample);
 
 s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_c;
@@ -186,17 +370,12 @@
 s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_bitexact;
 s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c;
 
-#if ARCH_X86
- ff_MPV_common_init_x86(s);
-#elif ARCH_ALPHA
- ff_MPV_common_init_axp(s);
-#elif ARCH_ARM
- ff_MPV_common_init_arm(s);
-#elif HAVE_ALTIVEC
- ff_MPV_common_init_altivec(s);
-#elif ARCH_BFIN
- ff_MPV_common_init_bfin(s);
-#endif
+ if (ARCH_ARM)
+ ff_MPV_common_init_arm(s);
+ if (ARCH_PPC)
+ ff_MPV_common_init_ppc(s);
+ if (ARCH_X86)
+ ff_MPV_common_init_x86(s);
 
 /* load & permutate scantables
 * note: only wmv uses different ones
@@ -214,29 +393,7 @@
 return 0;
 }
 
-void ff_copy_picture(Picture *dst, Picture *src)
-{
- *dst = *src;
- dst->f.type = FF_BUFFER_TYPE_COPY;
-}
-
-/**
- * Release a frame buffer
- */
-static void free_frame_buffer(MpegEncContext *s, Picture *pic)
-{
- /* WM Image / Screen codecs allocate internal buffers with different
- * dimensions / colorspaces; ignore user-defined callbacks for these. */
- if (s->codec_id != AV_CODEC_ID_WMV3IMAGE &&
- s->codec_id != AV_CODEC_ID_VC1IMAGE &&
- s->codec_id != AV_CODEC_ID_MSS2)
- ff_thread_release_buffer(s->avctx, &pic->f);
- else
- avcodec_default_release_buffer(s->avctx, &pic->f);
- av_freep(&pic->f.hwaccel_picture_private);
-}
-
-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) + 32, 32);
 
@@ -248,7 +405,7 @@
 FF_ALLOCZ_OR_GOTO(s->avctx, s->edge_emu_buffer, alloc_size * 2 * 24,
 fail);
 
- FF_ALLOCZ_OR_GOTO(s->avctx, s->me.scratchpad, alloc_size * 2 * 16 * 2,
+ FF_ALLOCZ_OR_GOTO(s->avctx, s->me.scratchpad, alloc_size * 2 * 16 * 3,
 fail)
 s->me.temp = s->me.scratchpad;
 s->rd_scratchpad = s->me.scratchpad;
@@ -266,81 +423,176 @@
 */
 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) {
+ 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 {
+ 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.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->f.hwaccel_picture_private);
+ assert(!pic->hwaccel_picture_private);
 if (s->avctx->hwaccel->priv_data_size) {
- pic->f.hwaccel_picture_private = av_mallocz(s->avctx->hwaccel->priv_data_size);
- if (!pic->f.hwaccel_picture_private) {
+ pic->hwaccel_priv_buf = av_buffer_allocz(s->avctx->hwaccel->priv_data_size);
+ if (!pic->hwaccel_priv_buf) {
 av_log(s->avctx, AV_LOG_ERROR, "alloc_frame_buffer() failed (hwaccel private data allocation)\n");
 return -1;
 }
+ pic->hwaccel_picture_private = pic->hwaccel_priv_buf->data;
 }
 }
 
- if (s->codec_id != AV_CODEC_ID_WMV3IMAGE &&
- s->codec_id != AV_CODEC_ID_VC1IMAGE &&
- s->codec_id != AV_CODEC_ID_MSS2)
- r = ff_thread_get_buffer(s->avctx, &pic->f);
- else
- r = avcodec_default_get_buffer(s->avctx, &pic->f);
-
- if (r < 0 || !pic->f.type || !pic->f.data[0]) {
- av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (%d %d %p)\n",
- r, pic->f.type, pic->f.data[0]);
- av_freep(&pic->f.hwaccel_picture_private);
- return -1;
- }
-
 if (s->linesize && (s->linesize != pic->f.linesize[0] ||
 s->uvlinesize != pic->f.linesize[1])) {
 av_log(s->avctx, AV_LOG_ERROR,
 "get_buffer() failed (stride changed)\n");
- free_frame_buffer(s, pic);
+ ff_mpeg_unref_picture(s, pic);
 return -1;
 }
 
 if (pic->f.linesize[1] != pic->f.linesize[2]) {
 av_log(s->avctx, AV_LOG_ERROR,
 "get_buffer() failed (uv stride mismatch)\n");
- free_frame_buffer(s, pic);
+ ff_mpeg_unref_picture(s, pic);
 return -1;
 }
 
 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");
- free_frame_buffer(s, pic);
+ ff_mpeg_unref_picture(s, pic);
 return ret;
 }
 
 return 0;
 }
 
-/**
- * Allocate a Picture.
- * The pixels are allocated/set by calling get_buffer() if shared = 0
- */
-int ff_alloc_picture(MpegEncContext *s, Picture *pic, int shared)
+void ff_free_picture_tables(Picture *pic)
 {
- const int big_mb_num = s->mb_stride * (s->mb_height + 1) + 1;
+ int i;
+
+ av_buffer_unref(&pic->mb_var_buf);
+ av_buffer_unref(&pic->mc_mb_var_buf);
+ av_buffer_unref(&pic->mb_mean_buf);
+ av_buffer_unref(&pic->mbskip_table_buf);
+ av_buffer_unref(&pic->qscale_table_buf);
+ av_buffer_unref(&pic->mb_type_buf);
 
- // the + 1 is needed so memset(,,stride*height) does not sig11
+ for (i = 0; i < 2; i++) {
+ av_buffer_unref(&pic->motion_val_buf[i]);
+ av_buffer_unref(&pic->ref_index_buf[i]);
+ }
+}
 
+static int alloc_picture_tables(MpegEncContext *s, Picture *pic)
+{
+ const int big_mb_num = s->mb_stride * (s->mb_height + 1) + 1;
 const int mb_array_size = s->mb_stride * s->mb_height;
 const int b8_array_size = s->b8_stride * s->mb_height * 2;
- const int b4_array_size = s->b4_stride * s->mb_height * 4;
 int i;
- int r = -1;
+
+
+ pic->mbskip_table_buf = av_buffer_allocz(mb_array_size + 2);
+ pic->qscale_table_buf = av_buffer_allocz(big_mb_num + s->mb_stride);
+ pic->mb_type_buf = av_buffer_allocz((big_mb_num + s->mb_stride) *
+ sizeof(uint32_t));
+ if (!pic->mbskip_table_buf || !pic->qscale_table_buf || !pic->mb_type_buf)
+ return AVERROR(ENOMEM);
+
+ if (s->encoding) {
+ pic->mb_var_buf = av_buffer_allocz(mb_array_size * sizeof(int16_t));
+ pic->mc_mb_var_buf = av_buffer_allocz(mb_array_size * sizeof(int16_t));
+ pic->mb_mean_buf = av_buffer_allocz(mb_array_size);
+ if (!pic->mb_var_buf || !pic->mc_mb_var_buf || !pic->mb_mean_buf)
+ return AVERROR(ENOMEM);
+ }
+
+ if (s->out_format == FMT_H263 || s->encoding) {
+ int mv_size = 2 * (b8_array_size + 4) * sizeof(int16_t);
+ int ref_index_size = 4 * mb_array_size;
+
+ for (i = 0; mv_size && i < 2; i++) {
+ pic->motion_val_buf[i] = av_buffer_allocz(mv_size);
+ pic->ref_index_buf[i] = av_buffer_allocz(ref_index_size);
+ if (!pic->motion_val_buf[i] || !pic->ref_index_buf[i])
+ return AVERROR(ENOMEM);
+ }
+ }
+
+ return 0;
+}
+
+static int make_tables_writable(Picture *pic)
+{
+ int ret, i;
+#define MAKE_WRITABLE(table) \
+do {\
+ if (pic->table &&\
+ (ret = av_buffer_make_writable(&pic->table)) < 0)\
+ return ret;\
+} while (0)
+
+ MAKE_WRITABLE(mb_var_buf);
+ MAKE_WRITABLE(mc_mb_var_buf);
+ MAKE_WRITABLE(mb_mean_buf);
+ MAKE_WRITABLE(mbskip_table_buf);
+ MAKE_WRITABLE(qscale_table_buf);
+ MAKE_WRITABLE(mb_type_buf);
+
+ for (i = 0; i < 2; i++) {
+ MAKE_WRITABLE(motion_val_buf[i]);
+ MAKE_WRITABLE(ref_index_buf[i]);
+ }
+
+ return 0;
+}
+
+/**
+ * Allocate a Picture.
+ * The pixels are allocated/set by calling get_buffer() if shared = 0
+ */
+int ff_alloc_picture(MpegEncContext *s, Picture *pic, int shared)
+{
+ int i, ret;
 
 if (shared) {
 assert(pic->f.data[0]);
- assert(pic->f.type == 0 || pic->f.type == FF_BUFFER_TYPE_SHARED);
- pic->f.type = FF_BUFFER_TYPE_SHARED;
+ pic->shared = 1;
 } else {
- assert(!pic->f.data[0]);
+ assert(!pic->f.buf[0]);
 
 if (alloc_frame_buffer(s, pic) < 0)
 return -1;
@@ -349,104 +601,153 @@
 s->uvlinesize = pic->f.linesize[1];
 }
 
- if (pic->f.qscale_table == NULL) {
- if (s->encoding) {
- FF_ALLOCZ_OR_GOTO(s->avctx, pic->mb_var,
- mb_array_size * sizeof(int16_t), fail)
- FF_ALLOCZ_OR_GOTO(s->avctx, pic->mc_mb_var,
- mb_array_size * sizeof(int16_t), fail)
- FF_ALLOCZ_OR_GOTO(s->avctx, pic->mb_mean,
- mb_array_size * sizeof(int8_t ), fail)
- }
-
- FF_ALLOCZ_OR_GOTO(s->avctx, pic->f.mbskip_table,
- mb_array_size * sizeof(uint8_t) + 2, fail)// the + 2 is for the slice end check
- FF_ALLOCZ_OR_GOTO(s->avctx, pic->qscale_table_base,
- (big_mb_num + s->mb_stride) * sizeof(uint8_t),
- fail)
- FF_ALLOCZ_OR_GOTO(s->avctx, pic->mb_type_base,
- (big_mb_num + s->mb_stride) * sizeof(uint32_t),
- fail)
- pic->f.mb_type = pic->mb_type_base + 2 * s->mb_stride + 1;
- pic->f.qscale_table = pic->qscale_table_base + 2 * s->mb_stride + 1;
- if (s->out_format == FMT_H264) {
- for (i = 0; i < 2; i++) {
- FF_ALLOCZ_OR_GOTO(s->avctx, pic->motion_val_base[i],
- 2 * (b4_array_size + 4) * sizeof(int16_t),
- fail)
- pic->f.motion_val[i] = pic->motion_val_base[i] + 4;
- FF_ALLOCZ_OR_GOTO(s->avctx, pic->f.ref_index[i],
- 4 * mb_array_size * sizeof(uint8_t), fail)
- }
- pic->f.motion_subsample_log2 = 2;
- } else if (s->out_format == FMT_H263 || s->encoding ||
- (s->avctx->debug & FF_DEBUG_MV) || s->avctx->debug_mv) {
- for (i = 0; i < 2; i++) {
- FF_ALLOCZ_OR_GOTO(s->avctx, pic->motion_val_base[i],
- 2 * (b8_array_size + 4) * sizeof(int16_t),
- fail)
- pic->f.motion_val[i] = pic->motion_val_base[i] + 4;
- FF_ALLOCZ_OR_GOTO(s->avctx, pic->f.ref_index[i],
- 4 * mb_array_size * sizeof(uint8_t), fail)
- }
- pic->f.motion_subsample_log2 = 3;
- }
- if (s->avctx->debug&FF_DEBUG_DCT_COEFF) {
- FF_ALLOCZ_OR_GOTO(s->avctx, pic->f.dct_coeff,
- 64 * mb_array_size * sizeof(DCTELEM) * 6, fail)
- }
- pic->f.qstride = s->mb_stride;
- FF_ALLOCZ_OR_GOTO(s->avctx, pic->f.pan_scan,
- 1 * sizeof(AVPanScan), fail)
+ if (!pic->qscale_table_buf)
+ ret = alloc_picture_tables(s, pic);
+ else
+ ret = make_tables_writable(pic);
+ if (ret < 0)
+ goto fail;
+
+ if (s->encoding) {
+ pic->mb_var = (uint16_t*)pic->mb_var_buf->data;
+ pic->mc_mb_var = (uint16_t*)pic->mc_mb_var_buf->data;
+ pic->mb_mean = pic->mb_mean_buf->data;
 }
 
- pic->owner2 = s;
+ pic->mbskip_table = pic->mbskip_table_buf->data;
+ pic->qscale_table = pic->qscale_table_buf->data + 2 * s->mb_stride + 1;
+ pic->mb_type = (uint32_t*)pic->mb_type_buf->data + 2 * s->mb_stride + 1;
+
+ if (pic->motion_val_buf[0]) {
+ for (i = 0; i < 2; i++) {
+ pic->motion_val[i] = (int16_t (*)[2])pic->motion_val_buf[i]->data + 4;
+ pic->ref_index[i] = pic->ref_index_buf[i]->data;
+ }
+ }
 
 return 0;
-fail: // for the FF_ALLOCZ_OR_GOTO macro
- if (r >= 0)
- free_frame_buffer(s, pic);
- return -1;
+fail:
+ av_log(s->avctx, AV_LOG_ERROR, "Error allocating a picture.\n");
+ ff_mpeg_unref_picture(s, pic);
+ ff_free_picture_tables(pic);
+ return AVERROR(ENOMEM);
 }
 
 /**
 * Deallocate a picture.
 */
-static void free_picture(MpegEncContext *s, Picture *pic)
+void ff_mpeg_unref_picture(MpegEncContext *s, Picture *pic)
 {
- int i;
+ int off = offsetof(Picture, mb_mean) + sizeof(pic->mb_mean);
 
- if (pic->f.data[0] && pic->f.type != FF_BUFFER_TYPE_SHARED) {
- free_frame_buffer(s, pic);
+ pic->tf.f = &pic->f;
+ /* WM Image / Screen codecs allocate internal buffers with different
+ * dimensions / colorspaces; ignore user-defined callbacks for these. */
+ if (s->codec_id != AV_CODEC_ID_WMV3IMAGE &&
+ s->codec_id != AV_CODEC_ID_VC1IMAGE &&
+ s->codec_id != AV_CODEC_ID_MSS2)
+ ff_thread_release_buffer(s->avctx, &pic->tf);
+ else
+ av_frame_unref(&pic->f);
+
+ av_buffer_unref(&pic->hwaccel_priv_buf);
+
+ if (pic->needs_realloc)
+ ff_free_picture_tables(pic);
+
+ memset((uint8_t*)pic + off, 0, sizeof(*pic) - off);
+}
+
+static int update_picture_tables(Picture *dst, Picture *src)
+{
+ int i;
+
+#define UPDATE_TABLE(table)\
+do {\
+ if (src->table &&\
+ (!dst->table || dst->table->buffer != src->table->buffer)) {\
+ av_buffer_unref(&dst->table);\
+ dst->table = av_buffer_ref(src->table);\
+ if (!dst->table) {\
+ ff_free_picture_tables(dst);\
+ return AVERROR(ENOMEM);\
+ }\
+ }\
+} while (0)
+
+ UPDATE_TABLE(mb_var_buf);
+ UPDATE_TABLE(mc_mb_var_buf);
+ UPDATE_TABLE(mb_mean_buf);
+ UPDATE_TABLE(mbskip_table_buf);
+ UPDATE_TABLE(qscale_table_buf);
+ UPDATE_TABLE(mb_type_buf);
+ for (i = 0; i < 2; i++) {
+ UPDATE_TABLE(motion_val_buf[i]);
+ UPDATE_TABLE(ref_index_buf[i]);
 }
 
- av_freep(&pic->mb_var);
- av_freep(&pic->mc_mb_var);
- av_freep(&pic->mb_mean);
- av_freep(&pic->f.mbskip_table);
- av_freep(&pic->qscale_table_base);
- pic->f.qscale_table = NULL;
- av_freep(&pic->mb_type_base);
- pic->f.mb_type = NULL;
- av_freep(&pic->f.dct_coeff);
- av_freep(&pic->f.pan_scan);
- pic->f.mb_type = NULL;
+ dst->mb_var = src->mb_var;
+ dst->mc_mb_var = src->mc_mb_var;
+ dst->mb_mean = src->mb_mean;
+ dst->mbskip_table = src->mbskip_table;
+ dst->qscale_table = src->qscale_table;
+ dst->mb_type = src->mb_type;
 for (i = 0; i < 2; i++) {
- av_freep(&pic->motion_val_base[i]);
- av_freep(&pic->f.ref_index[i]);
- pic->f.motion_val[i] = NULL;
+ dst->motion_val[i] = src->motion_val[i];
+ dst->ref_index[i] = src->ref_index[i];
 }
 
- if (pic->f.type == FF_BUFFER_TYPE_SHARED) {
- for (i = 0; i < 4; i++) {
- pic->f.base[i] =
- pic->f.data[i] = NULL;
- }
- pic->f.type = 0;
+ return 0;
+}
+
+int ff_mpeg_ref_picture(MpegEncContext *s, Picture *dst, Picture *src)
+{
+ int ret;
+
+ av_assert0(!dst->f.buf[0]);
+ av_assert0(src->f.buf[0]);
+
+ src->tf.f = &src->f;
+ dst->tf.f = &dst->f;
+ ret = ff_thread_ref_frame(&dst->tf, &src->tf);
+ if (ret < 0)
+ goto fail;
+
+ ret = update_picture_tables(dst, src);
+ if (ret < 0)
+ goto fail;
+
+ if (src->hwaccel_picture_private) {
+ dst->hwaccel_priv_buf = av_buffer_ref(src->hwaccel_priv_buf);
+ if (!dst->hwaccel_priv_buf)
+ goto fail;
+ dst->hwaccel_picture_private = dst->hwaccel_priv_buf->data;
 }
+
+ dst->field_picture = src->field_picture;
+ dst->mb_var_sum = src->mb_var_sum;
+ dst->mc_mb_var_sum = src->mc_mb_var_sum;
+ dst->b_frame_score = src->b_frame_score;
+ dst->needs_realloc = src->needs_realloc;
+ dst->reference = src->reference;
+ dst->shared = src->shared;
+
+ return 0;
+fail:
+ ff_mpeg_unref_picture(s, dst);
+ 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, MpegEncContext *base)
+static int init_duplicate_context(MpegEncContext *s)
 {
 int y_size = s->b8_stride * (2 * s->mb_height + 1);
 int c_size = s->mb_stride * (s->mb_height + 1);
@@ -470,12 +771,14 @@
 2 * 64 * sizeof(int), fail)
 }
 }
- FF_ALLOCZ_OR_GOTO(s->avctx, s->blocks, 64 * 12 * 2 * sizeof(DCTELEM), fail)
+ FF_ALLOCZ_OR_GOTO(s->avctx, s->blocks, 64 * 12 * 2 * sizeof(int16_t), fail)
 s->block = s->blocks[0];
 
 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 */
@@ -550,8 +853,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;
@@ -564,7 +869,7 @@
 int ff_mpeg_update_thread_context(AVCodecContext *dst,
 const AVCodecContext *src)
 {
- int i;
+ int i, ret;
 MpegEncContext *s = dst->priv_data, *s1 = src->priv_data;
 
 if (dst == src || !s1->context_initialized)
@@ -576,8 +881,6 @@
 memcpy(s, s1, sizeof(MpegEncContext));
 
 s->avctx = dst;
- s->picture_range_start += MAX_PICTURE_COUNT;
- s->picture_range_end += MAX_PICTURE_COUNT;
 s->bitstream_buffer = NULL;
 s->bitstream_buffer_size = s->allocated_bitstream_buffer_size = 0;
 
@@ -600,15 +903,28 @@
 
 s->coded_picture_number = s1->coded_picture_number;
 s->picture_number = s1->picture_number;
- s->input_picture_number = s1->input_picture_number;
 
- memcpy(s->picture, s1->picture, s1->picture_count * sizeof(Picture));
- memcpy(&s->last_picture, &s1->last_picture,
- (char *) &s1->last_picture_ptr - (char *) &s1->last_picture);
-
- // reset s->picture[].f.extended_data to s->picture[].f.data
- for (i = 0; i < s->picture_count; i++)
- s->picture[i].f.extended_data = s->picture[i].f.data;
+ for (i = 0; i < MAX_PICTURE_COUNT; i++) {
+ ff_mpeg_unref_picture(s, &s->picture[i]);
+ if (s1->picture[i].f.buf[0] &&
+ (ret = ff_mpeg_ref_picture(s, &s->picture[i], &s1->picture[i])) < 0)
+ return ret;
+ }
+
+#define UPDATE_PICTURE(pic)\
+do {\
+ ff_mpeg_unref_picture(s, &s->pic);\
+ 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);\
+ if (ret < 0)\
+ return ret;\
+} while (0)
+
+ UPDATE_PICTURE(current_picture);
+ UPDATE_PICTURE(last_picture);
+ UPDATE_PICTURE(next_picture);
 
 s->last_picture_ptr = REBASE_PICTURE(s1->last_picture_ptr, s, s1);
 s->current_picture_ptr = REBASE_PICTURE(s1->current_picture_ptr, s, s1);
@@ -619,8 +935,9 @@
 s->workaround_bugs = s1->workaround_bugs;
 
 // 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;
@@ -646,7 +963,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);
@@ -665,10 +982,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;
@@ -691,16 +1004,10 @@
 
 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;
 
- s->picture_range_start = 0;
- s->picture_range_end = MAX_PICTURE_COUNT;
-
 s->slice_context_count = 1;
 }
 
@@ -714,6 +1021,43 @@
 ff_MPV_common_defaults(s);
 }
 
+static int init_er(MpegEncContext *s)
+{
+ ERContext *er = &s->er;
+ int mb_array_size = s->mb_height * s->mb_stride;
+ int i;
+
+ er->avctx = s->avctx;
+ er->dsp = &s->dsp;
+
+ er->mb_index2xy = s->mb_index2xy;
+ er->mb_num = s->mb_num;
+ er->mb_width = s->mb_width;
+ er->mb_height = s->mb_height;
+ er->mb_stride = s->mb_stride;
+ er->b8_stride = s->b8_stride;
+
+ er->er_temp_buffer = av_malloc(s->mb_height * s->mb_stride);
+ er->error_status_table = av_mallocz(mb_array_size);
+ if (!er->er_temp_buffer || !er->error_status_table)
+ goto fail;
+
+ er->mbskip_table = s->mbskip_table;
+ er->mbintra_table = s->mbintra_table;
+
+ for (i = 0; i < FF_ARRAY_ELEMS(s->dc_val); i++)
+ er->dc_val[i] = s->dc_val[i];
+
+ er->decode_mb = mpeg_er_decode_mb;
+ er->opaque = s;
+
+ return 0;
+fail:
+ av_freep(&er->er_temp_buffer);
+ av_freep(&er->error_status_table);
+ return AVERROR(ENOMEM);
+}
+
 /**
 * Initialize and allocates MpegEncContext fields dependent on the resolution.
 */
@@ -792,11 +1136,6 @@
 
 }
 
- FF_ALLOC_OR_GOTO(s->avctx, s->er_temp_buffer,
- mb_array_size * sizeof(uint8_t), fail);
- FF_ALLOCZ_OR_GOTO(s->avctx, s->error_status_table,
- mb_array_size * sizeof(uint8_t), fail);
-
 if (s->codec_id == AV_CODEC_ID_MPEG4 ||
 (s->flags & CODEC_FLAG_INTERLACED_ME)) {
 /* interlaced direct mode decoding tables */
@@ -854,17 +1193,7 @@
 FF_ALLOCZ_OR_GOTO(s->avctx, s->mbskip_table, mb_array_size + 2, fail);
 // Note the + 1 is for a quicker mpeg4 slice_end detection
 
- if ((s->avctx->debug & (FF_DEBUG_VIS_QP | FF_DEBUG_VIS_MB_TYPE)) ||
- s->avctx->debug_mv) {
- s->visualization_buffer[0] = av_malloc((s->mb_width * 16 +
- 2 * EDGE_WIDTH) * s->mb_height * 16 + 2 * EDGE_WIDTH);
- s->visualization_buffer[1] = av_malloc((s->mb_width * 16 +
- 2 * EDGE_WIDTH) * s->mb_height * 16 + 2 * EDGE_WIDTH);
- s->visualization_buffer[2] = av_malloc((s->mb_width * 16 +
- 2 * EDGE_WIDTH) * s->mb_height * 16 + 2 * EDGE_WIDTH);
- }
-
- return 0;
+ return init_er(s);
 fail:
 return AVERROR(ENOMEM);
 }
@@ -885,7 +1214,7 @@
 
 if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO && !s->progressive_sequence)
 s->mb_height = (s->height + 31) / 32 * 2;
- else if (s->codec_id != AV_CODEC_ID_H264)
+ else
 s->mb_height = (s->height + 15) / 16;
 
 if (s->avctx->pix_fmt == AV_PIX_FMT_NONE) {
@@ -914,53 +1243,27 @@
 s->flags = s->avctx->flags;
 s->flags2 = s->avctx->flags2;
 
- if (s->width && s->height) {
- /* set chroma shifts */
- av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt,
- &s->chroma_x_shift,
- &s->chroma_y_shift);
-
- /* convert fourcc to upper case */
- s->codec_tag = avpriv_toupper4(s->avctx->codec_tag);
+ /* set chroma shifts */
+ av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt,
+ &s->chroma_x_shift,
+ &s->chroma_y_shift);
 
- s->stream_codec_tag = avpriv_toupper4(s->avctx->stream_codec_tag);
+ /* convert fourcc to upper case */
+ s->codec_tag = avpriv_toupper4(s->avctx->codec_tag);
 
- s->avctx->coded_frame = &s->current_picture.f;
+ s->stream_codec_tag = avpriv_toupper4(s->avctx->stream_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_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_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->picture_count = MAX_PICTURE_COUNT * FFMAX(1, s->avctx->thread_count);
 FF_ALLOCZ_OR_GOTO(s->avctx, s->picture,
- s->picture_count * sizeof(Picture), fail);
- for (i = 0; i < s->picture_count; i++) {
- avcodec_get_frame_defaults(&s->picture[i].f);
+ MAX_PICTURE_COUNT * sizeof(Picture), fail);
+ for (i = 0; i < MAX_PICTURE_COUNT; i++) {
+ 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));
+ av_frame_unref(&s->next_picture.f);
+ av_frame_unref(&s->last_picture.f);
+ av_frame_unref(&s->current_picture.f);
 
 if (s->width && s->height) {
 if (init_context_frame(s))
@@ -980,7 +1283,7 @@
 }
 
 for (i = 0; i < nb_slices; i++) {
- if (init_duplicate_context(s->thread_context[i], s) < 0)
+ if (init_duplicate_context(s->thread_context[i]) < 0)
 goto fail;
 s->thread_context[i]->start_mb_y =
 (s->mb_height * (i) + nb_slices / 2) / nb_slices;
@@ -988,7 +1291,7 @@
 (s->mb_height * (i + 1) + nb_slices / 2) / nb_slices;
 }
 } else {
- if (init_duplicate_context(s, s) < 0)
+ if (init_duplicate_context(s) < 0)
 goto fail;
 s->start_mb_y = 0;
 s->end_mb_y = s->mb_height;
@@ -1045,8 +1348,8 @@
 
 av_freep(&s->mbskip_table);
 
- av_freep(&s->error_status_table);
- av_freep(&s->er_temp_buffer);
+ av_freep(&s->er.error_status_table);
+ av_freep(&s->er.er_temp_buffer);
 av_freep(&s->mb_index2xy);
 av_freep(&s->lambda_table);
 av_freep(&s->cplx_tab);
@@ -1054,9 +1357,6 @@
 
 s->linesize = s->uvlinesize = 0;
 
- for (i = 0; i < 3; i++)
- av_freep(&s->visualization_buffer[i]);
-
 return 0;
 }
 
@@ -1074,10 +1374,11 @@
 } else
 free_duplicate_context(s);
 
- free_context_frame(s);
+ if ((err = free_context_frame(s)) < 0)
+ return err;
 
 if (s->picture)
- for (i = 0; i < s->picture_count; i++) {
+ for (i = 0; i < MAX_PICTURE_COUNT; i++) {
 s->picture[i].needs_realloc = 1;
 }
 
@@ -1088,7 +1389,7 @@
 // init
 if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO && !s->progressive_sequence)
 s->mb_height = (s->height + 31) / 32 * 2;
- else if (s->codec_id != AV_CODEC_ID_H264)
+ else
 s->mb_height = (s->height + 15) / 16;
 
 if ((s->width || s->height) &&
@@ -1109,7 +1410,7 @@
 }
 
 for (i = 0; i < nb_slices; i++) {
- if (init_duplicate_context(s->thread_context[i], s) < 0)
+ if (init_duplicate_context(s->thread_context[i]) < 0)
 goto fail;
 s->thread_context[i]->start_mb_y =
 (s->mb_height * (i) + nb_slices / 2) / nb_slices;
@@ -1117,7 +1418,7 @@
 (s->mb_height * (i + 1) + nb_slices / 2) / nb_slices;
 }
 } else {
- if (init_duplicate_context(s, s) < 0)
+ if (init_duplicate_context(s) < 0)
 goto fail;
 s->start_mb_y = 0;
 s->end_mb_y = s->mb_height;
@@ -1152,29 +1453,22 @@
 av_freep(&s->bitstream_buffer);
 s->allocated_bitstream_buffer_size = 0;
 
- av_freep(&s->avctx->stats_out);
- av_freep(&s->ac_stats);
-
- 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 && !s->avctx->internal->is_copy) {
- for (i = 0; i < s->picture_count; i++) {
- free_picture(s, &s->picture[i]);
+ if (s->picture) {
+ for (i = 0; i < MAX_PICTURE_COUNT; i++) {
+ ff_free_picture_tables(&s->picture[i]);
+ ff_mpeg_unref_picture(s, &s->picture[i]);
 }
 }
 av_freep(&s->picture);
+ ff_free_picture_tables(&s->last_picture);
+ ff_mpeg_unref_picture(s, &s->last_picture);
+ ff_free_picture_tables(&s->current_picture);
+ ff_mpeg_unref_picture(s, &s->current_picture);
+ ff_free_picture_tables(&s->next_picture);
+ ff_mpeg_unref_picture(s, &s->next_picture);
 
 free_context_frame(s);
 
- if (!(s->avctx->active_thread_type & FF_THREAD_FRAME))
- avcodec_default_free_buffers(s->avctx);
-
 s->context_initialized = 0;
 s->last_picture_ptr =
 s->next_picture_ptr =
@@ -1182,8 +1476,8 @@
 s->linesize = s->uvlinesize = 0;
 }
 
-void ff_init_rl(RLTable *rl,
- uint8_t static_store[2][2 * MAX_RUN + MAX_LEVEL + 3])
+av_cold void ff_init_rl(RLTable *rl,
+ uint8_t static_store[2][2 * MAX_RUN + MAX_LEVEL + 3])
 {
 int8_t max_level[MAX_RUN + 1], max_run[MAX_LEVEL + 1];
 uint8_t index_run[MAX_RUN + 1];
@@ -1234,7 +1528,7 @@
 }
 }
 
-void ff_init_vlc_rl(RLTable *rl)
+av_cold void ff_init_vlc_rl(RLTable *rl)
 {
 int i, q;
 
@@ -1274,28 +1568,23 @@
 }
 }
 
-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 < s->picture_count; i++) {
- if (s->picture[i].f.data[0] && !s->picture[i].f.reference &&
- (!s->picture[i].owner2 || s->picture[i].owner2 == s) &&
- (remove_current || &s->picture[i] != s->current_picture_ptr)
- /* && s->picture[i].type!= FF_BUFFER_TYPE_SHARED */) {
- free_frame_buffer(s, &s->picture[i]);
- }
+ for (i = 0; i < MAX_PICTURE_COUNT; i++) {
+ if (!s->picture[i].reference)
+ ff_mpeg_unref_picture(s, &s->picture[i]);
 }
 }
 
 static inline int pic_is_unused(MpegEncContext *s, Picture *pic)
 {
- 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;
- if (pic->needs_realloc && !(pic->f.reference & DELAYED_PIC_REF))
- if (!pic->owner2 || pic->owner2 == s)
- return 1;
 return 0;
 }
 
@@ -1304,16 +1593,12 @@
 int i;
 
 if (shared) {
- for (i = s->picture_range_start; i < s->picture_range_end; i++) {
- if (s->picture[i].f.data[0] == NULL && s->picture[i].f.type == 0)
+ for (i = 0; i < MAX_PICTURE_COUNT; i++) {
+ if (s->picture[i].f.buf[0] == NULL)
 return i;
 }
 } else {
- for (i = s->picture_range_start; i < s->picture_range_end; i++) {
- if (pic_is_unused(s, &s->picture[i]) && s->picture[i].f.type != 0)
- return i; // FIXME
- }
- for (i = s->picture_range_start; i < s->picture_range_end; i++) {
+ for (i = 0; i < MAX_PICTURE_COUNT; i++) {
 if (pic_is_unused(s, &s->picture[i]))
 return i;
 }
@@ -1326,123 +1611,96 @@
 {
 int ret = find_unused_picture(s, shared);
 
- if (ret >= 0 && ret < s->picture_range_end) {
+ if (ret >= 0 && ret < MAX_PICTURE_COUNT) {
 if (s->picture[ret].needs_realloc) {
 s->picture[ret].needs_realloc = 0;
- free_picture(s, &s->picture[ret]);
- avcodec_get_frame_defaults(&s->picture[ret].f);
+ ff_free_picture_tables(&s->picture[ret]);
+ ff_mpeg_unref_picture(s, &s->picture[ret]);
 }
 }
 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)
 {
- int i;
+ int i, ret;
 Picture *pic;
 s->mb_skipped = 0;
 
 /* mark & release old frames */
- if (s->out_format != FMT_H264 || s->codec_id == AV_CODEC_ID_SVQ3) {
- 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]) {
- if (s->last_picture_ptr->owner2 == s)
- free_frame_buffer(s, s->last_picture_ptr);
- }
-
- /* release forgotten pictures */
- /* if (mpeg124/h263) */
- if (!s->encoding) {
- for (i = 0; i < s->picture_count; i++) {
- if (s->picture[i].owner2 == s && s->picture[i].f.data[0] &&
- &s->picture[i] != s->last_picture_ptr &&
- &s->picture[i] != s->next_picture_ptr &&
- s->picture[i].f.reference && !s->picture[i].needs_realloc) {
- if (!(avctx->active_thread_type & FF_THREAD_FRAME))
- av_log(avctx, AV_LOG_ERROR,
- "releasing zombie picture\n");
- free_frame_buffer(s, &s->picture[i]);
- }
- }
+ 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);
+ }
+
+ /* release forgotten pictures */
+ /* if (mpeg124/h263) */
+ 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]);
 }
 }
 
- if (!s->encoding) {
- ff_release_unused_pictures(s, 1);
+ ff_mpeg_unref_picture(s, &s->current_picture);
 
- 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];
- }
+ release_unused_pictures(s);
 
- pic->f.reference = 0;
- if (!s->droppable) {
- if (s->codec_id == AV_CODEC_ID_H264)
- pic->f.reference = s->picture_structure;
- else if (s->pict_type != AV_PICTURE_TYPE_B)
- pic->f.reference = 3;
+ 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->f.coded_picture_number = s->coded_picture_number++;
+ pic->reference = 0;
+ if (!s->droppable) {
+ if (s->pict_type != AV_PICTURE_TYPE_B)
+ pic->reference = 3;
+ }
 
- if (ff_alloc_picture(s, pic, 0) < 0)
- return -1;
+ pic->f.coded_picture_number = s->coded_picture_number++;
 
- 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;
- }
+ 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->f.pict_type = s->pict_type;
 // if (s->flags && CODEC_FLAG_QSCALE)
 // s->current_picture_ptr->quality = s->new_picture_ptr->quality;
 s->current_picture_ptr->f.key_frame = s->pict_type == AV_PICTURE_TYPE_I;
 
- ff_copy_picture(&s->current_picture, s->current_picture_ptr);
+ 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;
@@ -1456,69 +1714,93 @@
 s->current_picture_ptr ? s->current_picture_ptr->f.data[0] : NULL,
 s->pict_type, s->droppable);
 
- if (s->codec_id != AV_CODEC_ID_H264) {
- if ((s->last_picture_ptr == NULL ||
- s->last_picture_ptr->f.data[0] == NULL) &&
- (s->pict_type != AV_PICTURE_TYPE_I ||
- s->picture_structure != PICT_FRAME)) {
- if (s->pict_type != AV_PICTURE_TYPE_I)
- av_log(avctx, AV_LOG_ERROR,
- "warning: first frame is no keyframe\n");
- else if (s->picture_structure != PICT_FRAME)
- av_log(avctx, AV_LOG_INFO,
- "allocate dummy last picture for field based first keyframe\n");
-
- /* Allocate a dummy frame */
- i = ff_find_unused_picture(s, 0);
- if (i < 0) {
- av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n");
- return i;
- }
- s->last_picture_ptr = &s->picture[i];
- if (ff_alloc_picture(s, s->last_picture_ptr, 0) < 0) {
- s->last_picture_ptr = NULL;
- return -1;
- }
- ff_thread_report_progress(&s->last_picture_ptr->f, INT_MAX, 0);
- ff_thread_report_progress(&s->last_picture_ptr->f, INT_MAX, 1);
- s->last_picture_ptr->f.reference = 3;
- }
- if ((s->next_picture_ptr == NULL ||
- s->next_picture_ptr->f.data[0] == NULL) &&
- s->pict_type == AV_PICTURE_TYPE_B) {
- /* Allocate a dummy frame */
- i = ff_find_unused_picture(s, 0);
- if (i < 0) {
- av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n");
- return i;
- }
- s->next_picture_ptr = &s->picture[i];
- if (ff_alloc_picture(s, s->next_picture_ptr, 0) < 0) {
- s->next_picture_ptr = NULL;
- return -1;
- }
- ff_thread_report_progress(&s->next_picture_ptr->f, INT_MAX, 0);
- ff_thread_report_progress(&s->next_picture_ptr->f, INT_MAX, 1);
- s->next_picture_ptr->f.reference = 3;
+ if ((s->last_picture_ptr == 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_I)
+ av_log(avctx, AV_LOG_ERROR,
+ "warning: first frame is no keyframe\n");
+ else if (s->picture_structure != PICT_FRAME)
+ av_log(avctx, AV_LOG_INFO,
+ "allocate dummy last picture for field based first keyframe\n");
+
+ /* Allocate a dummy frame */
+ i = ff_find_unused_picture(s, 0);
+ if (i < 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n");
+ return i;
 }
- }
+ s->last_picture_ptr = &s->picture[i];
+
+ s->last_picture_ptr->reference = 3;
+ s->last_picture_ptr->f.pict_type = AV_PICTURE_TYPE_I;
 
- if (s->last_picture_ptr)
- ff_copy_picture(&s->last_picture, s->last_picture_ptr);
- if (s->next_picture_ptr)
- ff_copy_picture(&s->next_picture, s->next_picture_ptr);
+ 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], 0,
+ 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]);
+
+ 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.buf[0] == NULL) &&
+ s->pict_type == AV_PICTURE_TYPE_B) {
+ /* Allocate a dummy frame */
+ i = ff_find_unused_picture(s, 0);
+ if (i < 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n");
+ return i;
+ }
+ s->next_picture_ptr = &s->picture[i];
+
+ s->next_picture_ptr->reference = 3;
+ s->next_picture_ptr->f.pict_type = AV_PICTURE_TYPE_I;
 
- if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_FRAME)) {
- if (s->next_picture_ptr)
- s->next_picture_ptr->owner2 = s;
- if (s->last_picture_ptr)
- s->last_picture_ptr->owner2 = s;
+ if (ff_alloc_picture(s, s->next_picture_ptr, 0) < 0) {
+ s->next_picture_ptr = NULL;
+ return -1;
+ }
+ ff_thread_report_progress(&s->next_picture_ptr->tf, INT_MAX, 0);
+ ff_thread_report_progress(&s->next_picture_ptr->tf, INT_MAX, 1);
 }
 
- assert(s->pict_type == AV_PICTURE_TYPE_I || (s->last_picture_ptr &&
- s->last_picture_ptr->f.data[0]));
+ 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->pict_type != AV_PICTURE_TYPE_I &&
+ !(s->last_picture_ptr && s->last_picture_ptr->f.buf[0])) {
+ av_log(s, AV_LOG_ERROR,
+ "Non-reference picture received and no reference available\n");
+ return AVERROR_INVALIDDATA;
+ }
 
- if (s->picture_structure!= PICT_FRAME && s->out_format != FMT_H264) {
+ if (s->picture_structure!= PICT_FRAME) {
 int i;
 for (i = 0; i < 4; i++) {
 if (s->picture_structure == PICT_BOTTOM_FIELD) {
@@ -1547,185 +1829,44 @@
 s->dct_unquantize_inter = s->dct_unquantize_mpeg1_inter;
 }
 
- if (s->dct_error_sum) {
- assert(s->avctx->noise_reduction && s->encoding);
- update_noise_reduction(s);
- }
-
+#if FF_API_XVMC
+FF_DISABLE_DEPRECATION_WARNINGS
 if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration)
 return ff_xvmc_field_start(s, avctx);
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif /* FF_API_XVMC */
 
 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)
 {
- int i;
+#if FF_API_XVMC
+FF_DISABLE_DEPRECATION_WARNINGS
 /* 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->error_count || s->encoding) &&
- !s->avctx->hwaccel &&
- !(s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) &&
- s->unrestricted_mv &&
- s->current_picture.f.reference &&
- !s->intra_only &&
- !(s->flags & CODEC_FLAG_EMU_EDGE)) {
- 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->linesize,
- 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->uvlinesize,
- 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->uvlinesize,
- s->h_edge_pos >> hshift, s->v_edge_pos >> vshift,
- EDGE_WIDTH >> hshift, EDGE_WIDTH >> vshift,
- EDGE_TOP | EDGE_BOTTOM);
- }
+ } else
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif /* FF_API_XVMC */
 
 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;
- }
- }
- assert(i < MAX_PICTURE_COUNT);
-#endif
-
- if (s->encoding) {
- /* release non-reference frames */
- for (i = 0; i < s->picture_count; i++) {
- if (s->picture[i].f.data[0] && !s->picture[i].f.reference
- /* && s->picture[i].type != FF_BUFFER_TYPE_SHARED */) {
- free_frame_buffer(s, &s->picture[i]);
- }
- }
- }
- // 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->codec_id != AV_CODEC_ID_H264 && s->current_picture.f.reference) {
- ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX, 0);
- }
-}
-
-/**
- * Draw a line from (ex, ey) -> (sx, sy).
- * @param w width of the image
- * @param h height of the image
- * @param stride stride/linesize of the image
- * @param color color of the arrow
- */
-static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey,
- int w, int h, int stride, int color)
-{
- int x, y, fr, f;
-
- sx = av_clip(sx, 0, w - 1);
- sy = av_clip(sy, 0, h - 1);
- ex = av_clip(ex, 0, w - 1);
- ey = av_clip(ey, 0, h - 1);
-
- buf[sy * stride + sx] += color;
-
- if (FFABS(ex - sx) > FFABS(ey - sy)) {
- if (sx > ex) {
- FFSWAP(int, sx, ex);
- FFSWAP(int, sy, ey);
- }
- buf += sx + sy * stride;
- ex -= sx;
- f = ((ey - sy) << 16) / ex;
- for (x = 0; x <= ex; x++) {
- y = (x * f) >> 16;
- fr = (x * f) & 0xFFFF;
- buf[y * stride + x] += (color * (0x10000 - fr)) >> 16;
- buf[(y + 1) * stride + x] += (color * fr ) >> 16;
- }
- } else {
- if (sy > ey) {
- FFSWAP(int, sx, ex);
- FFSWAP(int, sy, ey);
- }
- buf += sx + sy * stride;
- ey -= sy;
- if (ey)
- f = ((ex - sx) << 16) / ey;
- else
- f = 0;
- for (y = 0; y = ey; y++) {
- x = (y * f) >> 16;
- fr = (y * f) & 0xFFFF;
- buf[y * stride + x] += (color * (0x10000 - fr)) >> 16;
- buf[y * stride + x + 1] += (color * fr ) >> 16;
- }
- }
-}
-
-/**
- * Draw an arrow from (ex, ey) -> (sx, sy).
- * @param w width of the image
- * @param h height of the image
- * @param stride stride/linesize of the image
- * @param color color of the arrow
- */
-static void draw_arrow(uint8_t *buf, int sx, int sy, int ex,
- int ey, int w, int h, int stride, int color)
-{
- int dx,dy;
-
- sx = av_clip(sx, -100, w + 100);
- sy = av_clip(sy, -100, h + 100);
- ex = av_clip(ex, -100, w + 100);
- ey = av_clip(ey, -100, h + 100);
-
- dx = ex - sx;
- dy = ey - sy;
-
- if (dx * dx + dy * dy > 3 * 3) {
- int rx = dx + dy;
- int ry = -dx + dy;
- int length = ff_sqrt((rx * rx + ry * ry) << 8);
-
- // FIXME subpixel accuracy
- rx = ROUNDED_DIV(rx * 3 << 4, length);
- ry = ROUNDED_DIV(ry * 3 << 4, length);
-
- draw_line(buf, sx, sy, sx + rx, sy + ry, w, h, stride, color);
- draw_line(buf, sx, sy, sx - ry, sy + rx, w, h, stride, color);
- }
- draw_line(buf, sx, sy, ex, ey, w, h, stride, color);
+ if (s->current_picture.reference)
+ ff_thread_report_progress(&s->current_picture_ptr->tf, INT_MAX, 0);
 }
 
 /**
 * Print debugging info for the given picture.
 */
-void ff_print_debug_info(MpegEncContext *s, AVFrame *pict)
+void ff_print_debug_info(MpegEncContext *s, Picture *p)
 {
- if (s->avctx->hwaccel || !pict || !pict->mb_type)
+ AVFrame *pict;
+ if (s->avctx->hwaccel || !p || !p->mb_type)
 return;
+ pict = &p->f;
 
 if (s->avctx->debug & (FF_DEBUG_SKIP | FF_DEBUG_QP | FF_DEBUG_MB_TYPE)) {
 int x,y;
@@ -1761,10 +1902,10 @@
 }
 if (s->avctx->debug & FF_DEBUG_QP) {
 av_log(s->avctx, AV_LOG_DEBUG, "%2d",
- pict->qscale_table[x + y * s->mb_stride]);
+ p->qscale_table[x + y * s->mb_stride]);
 }
 if (s->avctx->debug & FF_DEBUG_MB_TYPE) {
- int mb_type = pict->mb_type[x + y * s->mb_stride];
+ int mb_type = p->mb_type[x + y * s->mb_stride];
 // Type & MV direction
 if (IS_PCM(mb_type))
 av_log(s->avctx, AV_LOG_DEBUG, "P");
@@ -1815,215 +1956,6 @@
 av_log(s->avctx, AV_LOG_DEBUG, "\n");
 }
 }
-
- if ((s->avctx->debug & (FF_DEBUG_VIS_QP | FF_DEBUG_VIS_MB_TYPE)) ||
- (s->avctx->debug_mv)) {
- const int shift = 1 + s->quarter_sample;
- int mb_y;
- uint8_t *ptr;
- int i;
- int h_chroma_shift, v_chroma_shift, block_height;
- const int width = s->avctx->width;
- const int height = s->avctx->height;
- const int mv_sample_log2 = 4 - pict->motion_subsample_log2;
- const int mv_stride = (s->mb_width << mv_sample_log2) +
- (s->codec_id == AV_CODEC_ID_H264 ? 0 : 1);
- s->low_delay = 0; // needed to see the vectors without trashing the buffers
-
- av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt,
- &h_chroma_shift, &v_chroma_shift);
- for (i = 0; i < 3; i++) {
- memcpy(s->visualization_buffer[i], pict->data[i],
- (i == 0) ? pict->linesize[i] * height:
- pict->linesize[i] * height >> v_chroma_shift);
- pict->data[i] = s->visualization_buffer[i];
- }
- pict->type = FF_BUFFER_TYPE_COPY;
- ptr = pict->data[0];
- block_height = 16 >> v_chroma_shift;
-
- for (mb_y = 0; mb_y < s->mb_height; mb_y++) {
- int mb_x;
- for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
- const int mb_index = mb_x + mb_y * s->mb_stride;
- if ((s->avctx->debug_mv) && pict->motion_val) {
- int type;
- for (type = 0; type < 3; type++) {
- int direction = 0;
- switch (type) {
- case 0:
- if ((!(s->avctx->debug_mv & FF_DEBUG_VIS_MV_P_FOR)) ||
- (pict->pict_type!= AV_PICTURE_TYPE_P))
- continue;
- direction = 0;
- break;
- case 1:
- if ((!(s->avctx->debug_mv & FF_DEBUG_VIS_MV_B_FOR)) ||
- (pict->pict_type!= AV_PICTURE_TYPE_B))
- continue;
- direction = 0;
- break;
- case 2:
- if ((!(s->avctx->debug_mv & FF_DEBUG_VIS_MV_B_BACK)) ||
- (pict->pict_type!= AV_PICTURE_TYPE_B))
- continue;
- direction = 1;
- break;
- }
- if (!USES_LIST(pict->mb_type[mb_index], direction))
- continue;
-
- if (IS_8X8(pict->mb_type[mb_index])) {
- int i;
- for (i = 0; i < 4; i++) {
- int sx = mb_x * 16 + 4 + 8 * (i & 1);
- int sy = mb_y * 16 + 4 + 8 * (i >> 1);
- int xy = (mb_x * 2 + (i & 1) +
- (mb_y * 2 + (i >> 1)) * mv_stride) << (mv_sample_log2 - 1);
- int mx = (pict->motion_val[direction][xy][0] >> shift) + sx;
- int my = (pict->motion_val[direction][xy][1] >> shift) + sy;
- draw_arrow(ptr, sx, sy, mx, my, width,
- height, s->linesize, 100);
- }
- } else if (IS_16X8(pict->mb_type[mb_index])) {
- int i;
- for (i = 0; i < 2; i++) {
- int sx = mb_x * 16 + 8;
- int sy = mb_y * 16 + 4 + 8 * i;
- int xy = (mb_x * 2 + (mb_y * 2 + i) * mv_stride) << (mv_sample_log2 - 1);
- int mx = (pict->motion_val[direction][xy][0] >> shift);
- int my = (pict->motion_val[direction][xy][1] >> shift);
-
- if (IS_INTERLACED(pict->mb_type[mb_index]))
- my *= 2;
-
- draw_arrow(ptr, sx, sy, mx + sx, my + sy, width,
- height, s->linesize, 100);
- }
- } else if (IS_8X16(pict->mb_type[mb_index])) {
- int i;
- for (i = 0; i < 2; i++) {
- int sx = mb_x * 16 + 4 + 8 * i;
- int sy = mb_y * 16 + 8;
- int xy = (mb_x * 2 + i + mb_y * 2 * mv_stride) << (mv_sample_log2 - 1);
- int mx = pict->motion_val[direction][xy][0] >> shift;
- int my = pict->motion_val[direction][xy][1] >> shift;
-
- if (IS_INTERLACED(pict->mb_type[mb_index]))
- my *= 2;
-
- draw_arrow(ptr, sx, sy, mx + sx, my + sy, width,
- height, s->linesize, 100);
- }
- } else {
- int sx = mb_x * 16 + 8;
- int sy = mb_y * 16 + 8;
- int xy = (mb_x + mb_y * mv_stride) << mv_sample_log2;
- int mx = pict->motion_val[direction][xy][0] >> shift + sx;
- int my = pict->motion_val[direction][xy][1] >> shift + sy;
- draw_arrow(ptr, sx, sy, mx, my, width, height, s->linesize, 100);
- }
- }
- }
- if ((s->avctx->debug & FF_DEBUG_VIS_QP) && pict->motion_val) {
- uint64_t c = (pict->qscale_table[mb_index] * 128 / 31) *
- 0x0101010101010101ULL;
- int y;
- for (y = 0; y < block_height; y++) {
- *(uint64_t *)(pict->data[1] + 8 * mb_x +
- (block_height * mb_y + y) *
- pict->linesize[1]) = c;
- *(uint64_t *)(pict->data[2] + 8 * mb_x +
- (block_height * mb_y + y) *
- pict->linesize[2]) = c;
- }
- }
- if ((s->avctx->debug & FF_DEBUG_VIS_MB_TYPE) &&
- pict->motion_val) {
- int mb_type = pict->mb_type[mb_index];
- uint64_t u,v;
- int y;
-#define COLOR(theta, r) \
- u = (int)(128 + r * cos(theta * 3.141592 / 180)); \
- v = (int)(128 + r * sin(theta * 3.141592 / 180));
-
-
- u = v = 128;
- if (IS_PCM(mb_type)) {
- COLOR(120, 48)
- } else if ((IS_INTRA(mb_type) && IS_ACPRED(mb_type)) ||
- IS_INTRA16x16(mb_type)) {
- COLOR(30, 48)
- } else if (IS_INTRA4x4(mb_type)) {
- COLOR(90, 48)
- } else if (IS_DIRECT(mb_type) && IS_SKIP(mb_type)) {
- // COLOR(120, 48)
- } else if (IS_DIRECT(mb_type)) {
- COLOR(150, 48)
- } else if (IS_GMC(mb_type) && IS_SKIP(mb_type)) {
- COLOR(170, 48)
- } else if (IS_GMC(mb_type)) {
- COLOR(190, 48)
- } else if (IS_SKIP(mb_type)) {
- // COLOR(180, 48)
- } else if (!USES_LIST(mb_type, 1)) {
- COLOR(240, 48)
- } else if (!USES_LIST(mb_type, 0)) {
- COLOR(0, 48)
- } else {
- assert(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1));
- COLOR(300,48)
- }
-
- u *= 0x0101010101010101ULL;
- v *= 0x0101010101010101ULL;
- for (y = 0; y < block_height; y++) {
- *(uint64_t *)(pict->data[1] + 8 * mb_x +
- (block_height * mb_y + y) * pict->linesize[1]) = u;
- *(uint64_t *)(pict->data[2] + 8 * mb_x +
- (block_height * mb_y + y) * pict->linesize[2]) = v;
- }
-
- // segmentation
- if (IS_8X8(mb_type) || IS_16X8(mb_type)) {
- *(uint64_t *)(pict->data[0] + 16 * mb_x + 0 +
- (16 * mb_y + 8) * pict->linesize[0]) ^= 0x8080808080808080ULL;
- *(uint64_t *)(pict->data[0] + 16 * mb_x + 8 +
- (16 * mb_y + 8) * pict->linesize[0]) ^= 0x8080808080808080ULL;
- }
- if (IS_8X8(mb_type) || IS_8X16(mb_type)) {
- for (y = 0; y < 16; y++)
- pict->data[0][16 * mb_x + 8 + (16 * mb_y + y) *
- pict->linesize[0]] ^= 0x80;
- }
- if (IS_8X8(mb_type) && mv_sample_log2 >= 2) {
- int dm = 1 << (mv_sample_log2 - 2);
- for (i = 0; i < 4; i++) {
- int sx = mb_x * 16 + 8 * (i & 1);
- int sy = mb_y * 16 + 8 * (i >> 1);
- int xy = (mb_x * 2 + (i & 1) +
- (mb_y * 2 + (i >> 1)) * mv_stride) << (mv_sample_log2 - 1);
- // FIXME bidir
- int32_t *mv = (int32_t *) &pict->motion_val[0][xy];
- if (mv[0] != mv[dm] ||
- mv[dm * mv_stride] != mv[dm * (mv_stride + 1)])
- for (y = 0; y < 8; y++)
- pict->data[0][sx + 4 + (sy + y) * pict->linesize[0]] ^= 0x80;
- if (mv[0] != mv[dm * mv_stride] || mv[dm] != mv[dm * (mv_stride + 1)])
- *(uint64_t *)(pict->data[0] + sx + (sy + 4) *
- pict->linesize[0]) ^= 0x8080808080808080ULL;
- }
- }
-
- if (IS_INTERLACED(mb_type) &&
- s->codec_id == AV_CODEC_ID_H264) {
- // hmm
- }
- }
- s->mbskip_table[mb_index] = 0;
- }
- }
- }
 }
 
 /**
@@ -2066,7 +1998,7 @@
 
 /* put block[] to dest[] */
 static inline void put_dct(MpegEncContext *s,
- DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale)
+ int16_t *block, int i, uint8_t *dest, int line_size, int qscale)
 {
 s->dct_unquantize_intra(s, block, i, qscale);
 s->dsp.idct_put (dest, line_size, block);
@@ -2074,7 +2006,7 @@
 
 /* add block[] to dest[] */
 static inline void add_dct(MpegEncContext *s,
- DCTELEM *block, int i, uint8_t *dest, int line_size)
+ int16_t *block, int i, uint8_t *dest, int line_size)
 {
 if (s->block_last_index[i] >= 0) {
 s->dsp.idct_add (dest, line_size, block);
@@ -2082,7 +2014,7 @@
 }
 
 static inline void add_dequant_dct(MpegEncContext *s,
- DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale)
+ int16_t *block, int i, uint8_t *dest, int line_size, int qscale)
 {
 if (s->block_last_index[i] >= 0) {
 s->dct_unquantize_inter(s, block, i, qscale);
@@ -2135,30 +2067,33 @@
 s->interlaced_dct : true if interlaced dct used (mpeg2)
 */
 static av_always_inline
-void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64],
+void MPV_decode_mb_internal(MpegEncContext *s, int16_t block[12][64],
 int is_mpeg12)
 {
 const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
+
+#if FF_API_XVMC
+FF_DISABLE_DEPRECATION_WARNINGS
 if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration){
 ff_xvmc_decode_mb(s);//xvmc uses pblocks
 return;
 }
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif /* FF_API_XVMC */
 
 if(s->avctx->debug&FF_DEBUG_DCT_COEFF) {
- /* save DCT coefficients */
+ /* print DCT coefficients */
 int i,j;
- DCTELEM *dct = &s->current_picture.f.dct_coeff[mb_xy * 64 * 6];
 av_log(s->avctx, AV_LOG_DEBUG, "DCT coeffs of MB at %dx%d:\n", s->mb_x, s->mb_y);
 for(i=0; i<6; i++){
 for(j=0; j<64; j++){
- *dct++ = block[i][s->dsp.idct_permutation[j]];
- av_log(s->avctx, AV_LOG_DEBUG, "%5d", dct[-1]);
+ av_log(s->avctx, AV_LOG_DEBUG, "%5d", block[i][s->dsp.idct_permutation[j]]);
 }
 av_log(s->avctx, AV_LOG_DEBUG, "\n");
 }
 }
 
- s->current_picture.f.qscale_table[mb_xy] = s->qscale;
+ s->current_picture.qscale_table[mb_xy] = s->qscale;
 
 /* update DC predictors for P macroblocks */
 if (!s->mb_intra) {
@@ -2193,7 +2128,7 @@
 s->mb_skipped= 0;
 assert(s->pict_type!=AV_PICTURE_TYPE_I);
 *mbskip_ptr = 1;
- } else if(!s->current_picture.f.reference) {
+ } else if(!s->current_picture.reference) {
 *mbskip_ptr = 1;
 } else{
 *mbskip_ptr = 0; /* not skipped */
@@ -2220,12 +2155,12 @@
 
 if(HAVE_THREADS && s->avctx->active_thread_type&FF_THREAD_FRAME) {
 if (s->mv_dir & MV_DIR_FORWARD) {
- ff_thread_await_progress(&s->last_picture_ptr->f,
+ ff_thread_await_progress(&s->last_picture_ptr->tf,
 ff_MPV_lowest_referenced_row(s, 0),
 0);
 }
 if (s->mv_dir & MV_DIR_BACKWARD) {
- ff_thread_await_progress(&s->next_picture_ptr->f,
+ ff_thread_await_progress(&s->next_picture_ptr->tf,
 ff_MPV_lowest_referenced_row(s, 1),
 0);
 }
@@ -2233,13 +2168,13 @@
 
 op_qpix= s->me.qpel_put;
 if ((!s->no_rounding) || s->pict_type==AV_PICTURE_TYPE_B){
- op_pix = s->dsp.put_pixels_tab;
+ op_pix = s->hdsp.put_pixels_tab;
 }else{
- op_pix = s->dsp.put_no_rnd_pixels_tab;
+ op_pix = s->hdsp.put_no_rnd_pixels_tab;
 }
 if (s->mv_dir & MV_DIR_FORWARD) {
 ff_MPV_motion(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.f.data, op_pix, op_qpix);
- op_pix = s->dsp.avg_pixels_tab;
+ op_pix = s->hdsp.avg_pixels_tab;
 op_qpix= s->me.qpel_avg;
 }
 if (s->mv_dir & MV_DIR_BACKWARD) {
@@ -2359,14 +2294,14 @@
 }
 skip_idct:
 if(!readable){
- s->dsp.put_pixels_tab[0][0](s->dest[0], dest_y , linesize,16);
- s->dsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[1], dest_cb, uvlinesize,16 >> s->chroma_y_shift);
- s->dsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[2], dest_cr, uvlinesize,16 >> s->chroma_y_shift);
+ s->hdsp.put_pixels_tab[0][0](s->dest[0], dest_y , linesize,16);
+ s->hdsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[1], dest_cb, uvlinesize,16 >> s->chroma_y_shift);
+ s->hdsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[2], dest_cr, uvlinesize,16 >> s->chroma_y_shift);
 }
 }
 }
 
-void ff_MPV_decode_mb(MpegEncContext *s, DCTELEM block[12][64]){
+void ff_MPV_decode_mb(MpegEncContext *s, int16_t block[12][64]){
 #if !CONFIG_SMALL
 if(s->out_format == FMT_MPEG1) {
 MPV_decode_mb_internal(s, block, 1);
@@ -2378,73 +2313,62 @@
 /**
 * @param h is the normal height, this will be reduced automatically if needed for the last row
 */
-void ff_draw_horiz_band(MpegEncContext *s, int y, int h){
- const int field_pic= s->picture_structure != PICT_FRAME;
+void ff_draw_horiz_band(AVCodecContext *avctx, Picture *cur,
+ Picture *last, int y, int h, int picture_structure,
+ int first_field, int low_delay)
+{
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
+ int vshift = desc->log2_chroma_h;
+ const int field_pic = picture_structure != PICT_FRAME;
 if(field_pic){
 h <<= 1;
 y <<= 1;
 }
 
- if (!s->avctx->hwaccel
- && !(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
- && s->unrestricted_mv
- && s->current_picture.f.reference
- && !s->intra_only
- && !(s->flags&CODEC_FLAG_EMU_EDGE)) {
- const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(s->avctx->pix_fmt);
- int sides = 0, edge_h;
- int hshift = desc->log2_chroma_w;
- int vshift = desc->log2_chroma_h;
- if (y==0) sides |= EDGE_TOP;
- if (y + h >= s->v_edge_pos) sides |= EDGE_BOTTOM;
-
- edge_h= FFMIN(h, s->v_edge_pos - y);
-
- s->dsp.draw_edges(s->current_picture_ptr->f.data[0] + y *s->linesize,
- s->linesize, s->h_edge_pos, edge_h,
- EDGE_WIDTH, EDGE_WIDTH, sides);
- s->dsp.draw_edges(s->current_picture_ptr->f.data[1] + (y>>vshift)*s->uvlinesize,
- s->uvlinesize, s->h_edge_pos>>hshift, edge_h>>vshift,
- EDGE_WIDTH>>hshift, EDGE_WIDTH>>vshift, sides);
- s->dsp.draw_edges(s->current_picture_ptr->f.data[2] + (y>>vshift)*s->uvlinesize,
- s->uvlinesize, s->h_edge_pos>>hshift, edge_h>>vshift,
- EDGE_WIDTH>>hshift, EDGE_WIDTH>>vshift, sides);
- }
+ h = FFMIN(h, avctx->height - y);
 
- h= FFMIN(h, s->avctx->height - y);
+ if(field_pic && first_field && !(avctx->slice_flags&SLICE_FLAG_ALLOW_FIELD)) return;
 
- if(field_pic && s->first_field && !(s->avctx->slice_flags&SLICE_FLAG_ALLOW_FIELD)) return;
-
- if (s->avctx->draw_horiz_band) {
+ if (avctx->draw_horiz_band) {
 AVFrame *src;
 int offset[AV_NUM_DATA_POINTERS];
 int i;
 
- if(s->pict_type==AV_PICTURE_TYPE_B || s->low_delay || (s->avctx->slice_flags&SLICE_FLAG_CODED_ORDER))
- src = &s->current_picture_ptr->f;
- else if(s->last_picture_ptr)
- src = &s->last_picture_ptr->f;
+ if(cur->f.pict_type == AV_PICTURE_TYPE_B || low_delay ||
+ (avctx->slice_flags & SLICE_FLAG_CODED_ORDER))
+ src = &cur->f;
+ else if (last)
+ src = &last->f;
 else
 return;
 
- if(s->pict_type==AV_PICTURE_TYPE_B && s->picture_structure == PICT_FRAME && s->out_format != FMT_H264){
+ if (cur->f.pict_type == AV_PICTURE_TYPE_B &&
+ picture_structure == PICT_FRAME &&
+ avctx->codec_id != AV_CODEC_ID_SVQ3) {
 for (i = 0; i < AV_NUM_DATA_POINTERS; i++)
 offset[i] = 0;
 }else{
- offset[0]= y * s->linesize;
+ offset[0]= y * src->linesize[0];
 offset[1]=
- offset[2]= (y >> s->chroma_y_shift) * s->uvlinesize;
+ offset[2]= (y >> vshift) * src->linesize[1];
 for (i = 3; i < AV_NUM_DATA_POINTERS; i++)
 offset[i] = 0;
 }
 
 emms_c();
 
- s->avctx->draw_horiz_band(s->avctx, src, offset,
- y, s->picture_structure, h);
+ avctx->draw_horiz_band(avctx, src, offset,
+ y, picture_structure, h);
 }
 }
 
+void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h)
+{
+ ff_draw_horiz_band(s->avctx, &s->current_picture,
+ &s->last_picture, y, h, s->picture_structure,
+ s->first_field, s->low_delay);
+}
+
 void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename
 const int linesize = s->current_picture.f.linesize[0]; //not s->linesize as this would be wrong for field pics
 const int uvlinesize = s->current_picture.f.linesize[1];
@@ -2477,6 +2401,35 @@
 }
 }
 
+/**
+ * Permute an 8x8 block.
+ * @param block the block which will be permuted according to the given permutation vector
+ * @param permutation the permutation vector
+ * @param last the last non zero coefficient in scantable order, used to speed the permutation up
+ * @param scantable the used scantable, this is only used to speed the permutation up, the block is not
+ * (inverse) permutated to scantable order!
+ */
+void ff_block_permute(int16_t *block, uint8_t *permutation, const uint8_t *scantable, int last)
+{
+ int i;
+ int16_t temp[64];
+
+ if(last<=0) return;
+ //if(permutation[1]==1) return; //FIXME it is ok but not clean and might fail for some permutations
+
+ for(i=0; i<=last; i++){
+ const int j= scantable[i];
+ temp[j]= block[j];
+ block[j]=0;
+ }
+
+ for(i=0; i<=last; i++){
+ const int j= scantable[i];
+ const int perm_j= permutation[j];
+ block[perm_j]= temp[j];
+ }
+}
+
 void ff_mpeg_flush(AVCodecContext *avctx){
 int i;
 MpegEncContext *s = avctx->priv_data;
@@ -2484,14 +2437,14 @@
 if(s==NULL || s->picture==NULL)
 return;
 
- for(i=0; i<s->picture_count; i++){
- if (s->picture[i].f.data[0] &&
- (s->picture[i].f.type == FF_BUFFER_TYPE_INTERNAL ||
- s->picture[i].f.type == FF_BUFFER_TYPE_USER))
- free_frame_buffer(s, &s->picture[i]);
- }
+ for (i = 0; i < MAX_PICTURE_COUNT; i++)
+ ff_mpeg_unref_picture(s, &s->picture[i]);
 s->current_picture_ptr = s->last_picture_ptr = s->next_picture_ptr = NULL;
 
+ ff_mpeg_unref_picture(s, &s->current_picture);
+ ff_mpeg_unref_picture(s, &s->last_picture);
+ ff_mpeg_unref_picture(s, &s->next_picture);
+
 s->mb_x= s->mb_y= 0;
 
 s->parse_context.state= -1;
@@ -2504,224 +2457,6 @@
 s->pp_time=0;
 }
 
-static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
- DCTELEM *block, int n, int qscale)
-{
- int i, level, nCoeffs;
- const uint16_t *quant_matrix;
-
- nCoeffs= s->block_last_index[n];
-
- if (n < 4)
- block[0] = block[0] * s->y_dc_scale;
- else
- block[0] = block[0] * 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,
- DCTELEM *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,
- DCTELEM *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];
-
- if (n < 4)
- block[0] = block[0] * s->y_dc_scale;
- else
- block[0] = block[0] * 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,
- DCTELEM *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];
-
- if (n < 4)
- block[0] = block[0] * s->y_dc_scale;
- else
- block[0] = block[0] * 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;
- sum+=level;
- }
- }
- block[63]^=sum&1;
-}
-
-static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s,
- DCTELEM *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,
- DCTELEM *block, int n, int qscale)
-{
- int i, level, qmul, qadd;
- int nCoeffs;
-
- assert(s->block_last_index[n]>=0);
-
- qmul = qscale << 1;
-
- if (!s->h263_aic) {
- if (n < 4)
- block[0] = block[0] * s->y_dc_scale;
- else
- block[0] = block[0] * 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,
- DCTELEM *block, int n, int qscale)
-{
- int i, level, qmul, qadd;
- int nCoeffs;
-
- assert(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.
 */
@@ -2741,6 +2476,24 @@
 
 void ff_MPV_report_decode_progress(MpegEncContext *s)
 {
- if (s->pict_type != AV_PICTURE_TYPE_B && !s->partitioned_frame && !s->error_occurred)
- ff_thread_report_progress(&s->current_picture_ptr->f, s->mb_y, 0);
+ if (s->pict_type != AV_PICTURE_TYPE_B && !s->partitioned_frame && !s->er.error_occurred)
+ ff_thread_report_progress(&s->current_picture_ptr->tf, s->mb_y, 0);
+}
+
+#if CONFIG_ERROR_RESILIENCE
+void ff_mpeg_er_frame_start(MpegEncContext *s)
+{
+ ERContext *er = &s->er;
+
+ er->cur_pic = s->current_picture_ptr;
+ er->last_pic = s->last_picture_ptr;
+ er->next_pic = s->next_picture_ptr;
+
+ er->pp_time = s->pp_time;
+ er->pb_time = s->pb_time;
+ er->quarter_sample = s->quarter_sample;
+ er->partitioned_frame = s->partitioned_frame;
+
+ ff_er_frame_start(er);
 }
+#endif /* CONFIG_ERROR_RESILIENCE */

libav-v9.6.tar.bz2/libavcodec/mpegvideo.h -> libav-v10.1.tar.bz2/libavcodec/mpegvideo.h Changed

@@ -30,12 +30,16 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
+#include "error_resilience.h"
 #include "get_bits.h"
+#include "h263dsp.h"
+#include "hpeldsp.h"
 #include "put_bits.h"
 #include "ratecontrol.h"
 #include "parser.h"
 #include "mpeg12data.h"
 #include "rl.h"
+#include "thread.h"
 #include "videodsp.h"
 
 #include "libavutil/opt.h"
@@ -47,7 +51,6 @@
 FMT_H261,
 FMT_H263,
 FMT_MJPEG,
- FMT_H264,
 };
 
 #define MPEG_BUF_SIZE (16 * 1024)
@@ -62,6 +65,8 @@
 
 #define MAX_PICTURE_COUNT 32
 
+#define MAX_B_FRAMES 16
+
 #define ME_MAP_SIZE 64
 #define ME_MAP_SHIFT 3
 #define ME_MAP_MV_BITS 11
@@ -93,14 +98,62 @@
 */
 typedef struct Picture{
 struct AVFrame f;
+ ThreadFrame tf;
+
+ AVBufferRef *qscale_table_buf;
+ int8_t *qscale_table;
+
+ AVBufferRef *motion_val_buf[2];
+ int16_t (*motion_val[2])[2];
+
+ 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;
+
+ AVBufferRef *ref_index_buf[2];
+ int8_t *ref_index[2];
+
+ AVBufferRef *mb_var_buf;
+ uint16_t *mb_var; ///< Table for MB variances
+
+ AVBufferRef *mc_mb_var_buf;
+ uint16_t *mc_mb_var; ///< Table for motion compensated MB variances
 
+ AVBufferRef *mb_mean_buf;
+ uint8_t *mb_mean; ///< Table for MB luminance
+
+ AVBufferRef *hwaccel_priv_buf;
 /**
- * halfpel luma planes.
+ * hardware accelerator private data
 */
- uint8_t *interpolated[3];
- int8_t *qscale_table_base;
- int16_t (*motion_val_base[2])[2];
- uint32_t *mb_type_base;
+ void *hwaccel_picture_private;
+
 #define MB_TYPE_INTRA MB_TYPE_INTRA4x4 //default mb_type if there is just one type
 #define IS_INTRA4x4(a) ((a)&MB_TYPE_INTRA4x4)
 #define IS_INTRA16x16(a) ((a)&MB_TYPE_INTRA16x16)
@@ -140,13 +193,13 @@
 
 int mb_var_sum; ///< sum of MB variance for current frame
 int mc_mb_var_sum; ///< motion compensated MB variance for current frame
- uint16_t *mb_var; ///< Table for MB variances
- uint16_t *mc_mb_var; ///< Table for motion compensated MB variances
- uint8_t *mb_mean; ///< Table for MB luminance
- int32_t *mb_cmp_score; ///< Table for MB cmp scores, for mb decision FIXME remove
+
 int b_frame_score; /* */
- struct MpegEncContext *owner2; ///< pointer to the MpegEncContext that allocated this picture
 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
 } Picture;
 
 /**
@@ -250,8 +303,8 @@
 int b4_stride; ///< 4*mb_width+1 used for some 4x4 block arrays to allow simple addressing
 int h_edge_pos, v_edge_pos;///< horizontal / vertical position of the right/bottom edge (pixel replication)
 int mb_num; ///< number of MBs of a picture
- int linesize; ///< line size, in bytes, may be different from width
- int uvlinesize; ///< line size, for chroma in bytes, may be different from width
+ ptrdiff_t linesize; ///< line size, in bytes, may be different from width
+ ptrdiff_t uvlinesize; ///< line size, for chroma in bytes, may be different from width
 Picture *picture; ///< main picture buffer
 Picture **input_picture; ///< next pictures on display order for encoding
 Picture **reordered_input_picture; ///< pointer to the next pictures in codedorder for encoding
@@ -270,7 +323,7 @@
 /* WARNING: changes above this line require updates to hardcoded
 * offsets used in asm. */
 
- int64_t user_specified_pts;///< last non zero pts from AVFrame which was passed into avcodec_encode_video()
+ int64_t user_specified_pts; ///< last non-zero pts from AVFrame which was passed into avcodec_encode_video2()
 /**
 * pts difference between the first and second input frame, used for
 * calculating dts of the first frame when there's a delay */
@@ -315,9 +368,6 @@
 Picture *last_picture_ptr; ///< pointer to the previous picture.
 Picture *next_picture_ptr; ///< pointer to the next picture (for bidir pred)
 Picture *current_picture_ptr; ///< pointer to the current picture
- int picture_count; ///< number of allocated pictures (MAX_PICTURE_COUNT * avctx->thread_count)
- int picture_range_start, picture_range_end; ///< the part of picture that this context can allocate in
- uint8_t *visualization_buffer[3]; ///< temporary buffer vor MV visualization
 int last_dc[3]; ///< last DC values for MPEG1
 int16_t *dc_val_base;
 int16_t *dc_val[3]; ///< used for mpeg4 DC prediction, all 3 arrays must be continuous
@@ -359,7 +409,9 @@
 int h263_long_vectors; ///< use horrible h263v1 long vector mode
 
 DSPContext dsp; ///< pointers for accelerated dsp functions
+ 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];
@@ -489,19 +541,6 @@
 int last_bits; ///< temp var used for calculating the above vars
 
 /* error concealment / resync */
- int error_count, error_occurred;
- uint8_t *error_status_table; ///< table of the error status of each MB
-#define VP_START 1 ///< current MB is the first after a resync marker
-#define ER_AC_ERROR 2
-#define ER_DC_ERROR 4
-#define ER_MV_ERROR 8
-#define ER_AC_END 16
-#define ER_DC_END 32
-#define ER_MV_END 64
-
-#define ER_MB_ERROR (ER_AC_ERROR|ER_DC_ERROR|ER_MV_ERROR)
-#define ER_MB_END (ER_AC_END|ER_DC_END|ER_MV_END)
-
 int resync_mb_x; ///< x position of last resync marker
 int resync_mb_y; ///< y position of last resync marker
 GetBitContext last_resync_gb; ///< used to search for the next resync marker
@@ -514,7 +553,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;
@@ -530,7 +568,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
@@ -539,61 +578,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];
@@ -601,8 +609,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}
 
 /* MSMPEG4 specific */
 int mv_table_index;
@@ -628,7 +634,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. */
@@ -659,7 +664,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.
@@ -668,59 +672,62 @@
 int rtp_mode;
 
 uint8_t *ptr_lastgob;
- int swap_uv; //vcr2 codec is an MPEG-2 variant with U and V swapped
- DCTELEM (*pblocks[12])[64];
+ int16_t (*pblocks[12])[64];
 
- DCTELEM (*block)[64]; ///< points to one of the following blocks
- DCTELEM (*blocks)[8][64]; // for HQ mode we need to keep the best block
- int (*decode_mb)(struct MpegEncContext *s, DCTELEM block[6][64]); // used by some codecs to avoid a switch()
+ int16_t (*block)[64]; ///< points to one of the following blocks
+ int16_t (*blocks)[8][64]; // for HQ mode we need to keep the best block
+ int (*decode_mb)(struct MpegEncContext *s, int16_t block[6][64]); // used by some codecs to avoid a switch()
 #define SLICE_OK 0
 #define SLICE_ERROR -1
 #define SLICE_END -2 ///<end marker found
 #define SLICE_NOEND -3 ///<no end marker or error found but mb count exceeded
 
 void (*dct_unquantize_mpeg1_intra)(struct MpegEncContext *s,
- DCTELEM *block/*align 16*/, int n, int qscale);
+ int16_t *block/*align 16*/, int n, int qscale);
 void (*dct_unquantize_mpeg1_inter)(struct MpegEncContext *s,
- DCTELEM *block/*align 16*/, int n, int qscale);
+ int16_t *block/*align 16*/, int n, int qscale);
 void (*dct_unquantize_mpeg2_intra)(struct MpegEncContext *s,
- DCTELEM *block/*align 16*/, int n, int qscale);
+ int16_t *block/*align 16*/, int n, int qscale);
 void (*dct_unquantize_mpeg2_inter)(struct MpegEncContext *s,
- DCTELEM *block/*align 16*/, int n, int qscale);
+ int16_t *block/*align 16*/, int n, int qscale);
 void (*dct_unquantize_h263_intra)(struct MpegEncContext *s,
- DCTELEM *block/*align 16*/, int n, int qscale);
+ int16_t *block/*align 16*/, int n, int qscale);
 void (*dct_unquantize_h263_inter)(struct MpegEncContext *s,
- DCTELEM *block/*align 16*/, int n, int qscale);
+ int16_t *block/*align 16*/, int n, int qscale);
 void (*dct_unquantize_h261_intra)(struct MpegEncContext *s,
- DCTELEM *block/*align 16*/, int n, int qscale);
+ int16_t *block/*align 16*/, int n, int qscale);
 void (*dct_unquantize_h261_inter)(struct MpegEncContext *s,
- DCTELEM *block/*align 16*/, int n, int qscale);
+ int16_t *block/*align 16*/, int n, int qscale);
 void (*dct_unquantize_intra)(struct MpegEncContext *s, // unquantizer to use (mpeg4 can use both)
- DCTELEM *block/*align 16*/, int n, int qscale);
+ int16_t *block/*align 16*/, int n, int qscale);
 void (*dct_unquantize_inter)(struct MpegEncContext *s, // unquantizer to use (mpeg4 can use both)
- DCTELEM *block/*align 16*/, int n, int qscale);
- int (*dct_quantize)(struct MpegEncContext *s, DCTELEM *block/*align 16*/, int n, int qscale, int *overflow);
- int (*fast_dct_quantize)(struct MpegEncContext *s, DCTELEM *block/*align 16*/, int n, int qscale, int *overflow);
- void (*denoise_dct)(struct MpegEncContext *s, DCTELEM *block);
+ int16_t *block/*align 16*/, int n, int qscale);
+ int (*dct_quantize)(struct MpegEncContext *s, int16_t *block/*align 16*/, int n, int qscale, int *overflow);
+ int (*fast_dct_quantize)(struct MpegEncContext *s, int16_t *block/*align 16*/, int n, int qscale, int *overflow);
+ void (*denoise_dct)(struct MpegEncContext *s, int16_t *block);
 
 int mpv_flags; ///< flags set by private options
 int quantizer_noise_shaping;
 
- /* error resilience stuff */
- uint8_t *er_temp_buffer;
-
 /* temp buffers for rate control */
 float *cplx_tab, *bits_tab;
 
 /* flag to indicate a reinitialization is required, e.g. after
 * a frame size change */
 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) (pic ? \
- (pic >= old_ctx->picture && pic < old_ctx->picture+old_ctx->picture_count ?\
- &new_ctx->picture[pic - old_ctx->picture] : (Picture*) ((uint8_t*)pic - (uint8_t*)old_ctx + (uint8_t*)new_ctx))\
- : NULL)
+#define REBASE_PICTURE(pic, new_ctx, old_ctx) \
+ ((pic && pic >= old_ctx->picture && \
+ pic < old_ctx->picture + MAX_PICTURE_COUNT) ? \
+ &new_ctx->picture[pic - old_ctx->picture] : NULL)
 
 /* mpegvideo_enc common options */
 #define FF_MPV_FLAG_SKIP_RD 0x0001
@@ -740,7 +747,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[];
 
@@ -761,10 +770,9 @@
 
 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, DCTELEM block[12][64]);
+void ff_MPV_decode_mb(MpegEncContext *s, int16_t block[12][64]);
 int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx);
 void ff_MPV_frame_end(MpegEncContext *s);
 int ff_MPV_encode_init(AVCodecContext *avctx);
@@ -773,36 +781,32 @@
 const AVFrame *frame, int *got_packet);
 void ff_MPV_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_altivec(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(MpegEncContext *s, int y, int h);
+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);
-void ff_print_debug_info(MpegEncContext *s, AVFrame *pict);
+void ff_print_debug_info(MpegEncContext *s, Picture *p);
 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, DCTELEM *block);
+void ff_denoise_dct(MpegEncContext *s, int16_t *block);
 int ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src);
 int ff_MPV_lowest_referenced_row(MpegEncContext *s, int dir);
 void ff_MPV_report_decode_progress(MpegEncContext *s);
 int ff_mpeg_update_thread_context(AVCodecContext *dst, const AVCodecContext *src);
-const uint8_t *avpriv_mpv_find_start_code(const uint8_t *p, const uint8_t *end, uint32_t *state);
 void ff_set_qscale(MpegEncContext * s, int qscale);
 
-void ff_er_frame_start(MpegEncContext *s);
-void ff_er_frame_end(MpegEncContext *s);
-void ff_er_add_slice(MpegEncContext *s, int startx, int starty, int endx, int endy, int status);
+void ff_mpeg_er_frame_start(MpegEncContext *s);
 
 int ff_dct_common_init(MpegEncContext *s);
 void ff_convert_matrix(DSPContext *dsp, int (*qmat)[64], uint16_t (*qmat16)[2][64],
 const uint16_t *quant_matrix, int bias, int qmin, int qmax, int intra);
-int ff_dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow);
+int ff_dct_quantize_c(MpegEncContext *s, int16_t *block, int n, int qscale, int *overflow);
 
 void ff_init_block_index(MpegEncContext *s);
-void ff_copy_picture(Picture *dst, Picture *src);
 
 void ff_MPV_motion(MpegEncContext *s,
 uint8_t *dest_y, uint8_t *dest_cb,
@@ -818,7 +822,12 @@
 int ff_alloc_picture(MpegEncContext *s, Picture *pic, int shared);
 
 extern const enum AVPixelFormat ff_pixfmt_list_420[];
-extern const enum AVPixelFormat ff_hwaccel_pixfmt_list_420[];
+
+/**
+ * permute block according to permuatation.
+ * @param last last non zero element in scantable order
+ */
+void ff_block_permute(int16_t *block, uint8_t *permutation, const uint8_t *scantable, int last);
 
 static inline void ff_update_block_index(MpegEncContext *s){
 const int block_size = 8;
@@ -874,27 +883,13 @@
 
 void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number);
 void ff_mpeg1_encode_mb(MpegEncContext *s,
- DCTELEM block[6][64],
+ int16_t block[6][64],
 int motion_x, int motion_y);
 void ff_mpeg1_encode_init(MpegEncContext *s);
 void ff_mpeg1_encode_slice_header(MpegEncContext *s);
-void ff_mpeg1_clean_buffers(MpegEncContext *s);
-int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s);
 
 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];
-
-/* h261.c */
-void ff_h261_loop_filter(MpegEncContext *s);
-void ff_h261_reorder_mb_index(MpegEncContext* s);
-void ff_h261_encode_mb(MpegEncContext *s,
- DCTELEM block[6][64],
- int motion_x, int motion_y);
-void ff_h261_encode_picture_header(MpegEncContext * s, int picture_number);
-void ff_h261_encode_init(MpegEncContext *s);
-int ff_h261_get_picture_format(int width, int height);
-
 
 /* rv10.c */
 void ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number);
@@ -906,7 +901,7 @@
 void ff_msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number);
 void ff_msmpeg4_encode_ext_header(MpegEncContext * s);
 void ff_msmpeg4_encode_mb(MpegEncContext * s,
- DCTELEM block[6][64],
+ int16_t block[6][64],
 int motion_x, int motion_y);
 int ff_msmpeg4_decode_picture_header(MpegEncContext * s);
 int ff_msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size);
@@ -914,14 +909,18 @@
 void ff_msmpeg4_encode_init(MpegEncContext *s);
 int ff_wmv2_decode_picture_header(MpegEncContext * s);
 int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s);
-void ff_wmv2_add_mb(MpegEncContext *s, DCTELEM block[6][64], uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr);
+void ff_wmv2_add_mb(MpegEncContext *s, int16_t block[6][64], uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr);
 void ff_mspel_motion(MpegEncContext *s,
 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
 uint8_t **ref_picture, op_pixels_func (*pix_op)[4],
 int motion_x, int motion_y, int h);
 int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number);
 void ff_wmv2_encode_mb(MpegEncContext * s,
- DCTELEM block[6][64],
+ int16_t block[6][64],
 int motion_x, int motion_y);
 
+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 */

libav-v9.6.tar.bz2/libavcodec/mpegvideo_enc.c -> libav-v10.1.tar.bz2/libavcodec/mpegvideo_enc.c Changed

@@ -27,13 +27,20 @@
 * 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"
+#include "mpeg12.h"
 #include "mpegvideo.h"
+#include "h261.h"
 #include "h263.h"
 #include "mathops.h"
 #include "mjpegenc.h"
@@ -47,19 +54,11 @@
 #include "bytestream.h"
 #include <limits.h>
 
-//#undef NDEBUG
-//#include <assert.h>
-
 static int encode_picture(MpegEncContext *s, int picture_number);
-static int dct_quantize_refine(MpegEncContext *s, DCTELEM *block, int16_t *weight, DCTELEM *orig, int n, int qscale);
+static int dct_quantize_refine(MpegEncContext *s, int16_t *block, int16_t *weight, int16_t *orig, int n, int qscale);
 static int sse_mb(MpegEncContext *s);
-static void denoise_dct_c(MpegEncContext *s, DCTELEM *block);
-static int dct_quantize_trellis_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow);
-
-/* enable all paranoid tests for rounding, overflows, etc... */
-//#define PARANOID
-
-//#define DEBUG
+static void denoise_dct_c(MpegEncContext *s, int16_t *block);
+static int dct_quantize_trellis_c(MpegEncContext *s, int16_t *block, int n, int qscale, int *overflow);
 
 static uint8_t default_mv_penalty[MAX_FCODE + 1][MAX_MV * 2 + 1];
 static uint8_t default_fcode_tab[MAX_MV * 2 + 1];
@@ -175,7 +174,7 @@
 */
 void ff_init_qscale_tab(MpegEncContext *s)
 {
- int8_t * const qscale_table = s->current_picture.f.qscale_table;
+ int8_t * const qscale_table = s->current_picture.qscale_table;
 int i;
 
 for (i = 0; i < s->mb_num; i++) {
@@ -186,54 +185,6 @@
 }
 }
 
-static void copy_picture_attributes(MpegEncContext *s,
- AVFrame *dst,
- AVFrame *src)
-{
- int i;
-
- dst->pict_type = src->pict_type;
- dst->quality = src->quality;
- dst->coded_picture_number = src->coded_picture_number;
- dst->display_picture_number = src->display_picture_number;
- //dst->reference = src->reference;
- dst->pts = src->pts;
- dst->interlaced_frame = src->interlaced_frame;
- dst->top_field_first = src->top_field_first;
-
- if (s->avctx->me_threshold) {
- if (!src->motion_val[0])
- av_log(s->avctx, AV_LOG_ERROR, "AVFrame.motion_val not set!\n");
- if (!src->mb_type)
- av_log(s->avctx, AV_LOG_ERROR, "AVFrame.mb_type not set!\n");
- if (!src->ref_index[0])
- av_log(s->avctx, AV_LOG_ERROR, "AVFrame.ref_index not set!\n");
- if (src->motion_subsample_log2 != dst->motion_subsample_log2)
- av_log(s->avctx, AV_LOG_ERROR,
- "AVFrame.motion_subsample_log2 doesn't match! (%d!=%d)\n",
- src->motion_subsample_log2, dst->motion_subsample_log2);
-
- memcpy(dst->mb_type, src->mb_type,
- s->mb_stride * s->mb_height * sizeof(dst->mb_type[0]));
-
- for (i = 0; i < 2; i++) {
- int stride = ((16 * s->mb_width ) >>
- src->motion_subsample_log2) + 1;
- int height = ((16 * s->mb_height) >> src->motion_subsample_log2);
-
- if (src->motion_val[i] &&
- src->motion_val[i] != dst->motion_val[i]) {
- memcpy(dst->motion_val[i], src->motion_val[i],
- 2 * stride * height * sizeof(int16_t));
- }
- if (src->ref_index[i] && src->ref_index[i] != dst->ref_index[i]) {
- memcpy(dst->ref_index[i], src->ref_index[i],
- s->mb_stride * 4 * s->mb_height * sizeof(int8_t));
- }
- }
- }
-}
-
 static void update_duplicate_context_after_me(MpegEncContext *dst,
 MpegEncContext *src)
 {
@@ -267,14 +218,16 @@
 }
 s->me.mv_penalty = default_mv_penalty;
 s->fcode_tab = default_fcode_tab;
+
+ s->input_picture_number = 0;
+ s->picture_in_gop_number = 0;
 }
 
 /* init video encoder */
 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);
 
@@ -287,19 +240,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_BGRA &&
- ((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:
 if (avctx->pix_fmt != AV_PIX_FMT_YUVJ420P &&
 avctx->pix_fmt != AV_PIX_FMT_YUVJ422P &&
@@ -342,14 +282,12 @@
 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);
+ }
 s->max_b_frames = avctx->max_b_frames;
 s->codec_id = avctx->codec->id;
-#if FF_API_MPV_GLOBAL_OPTS
- if (avctx->luma_elim_threshold)
- s->luma_elim_threshold = avctx->luma_elim_threshold;
- if (avctx->chroma_elim_threshold)
- s->chroma_elim_threshold = avctx->chroma_elim_threshold;
-#endif
 s->strict_std_compliance = avctx->strict_std_compliance;
 s->quarter_sample = (avctx->flags & CODEC_FLAG_QPEL) != 0;
 s->mpeg_quant = avctx->mpeg_quant;
@@ -369,11 +307,6 @@
 /* Fixed QSCALE */
 s->fixed_qscale = !!(avctx->flags & CODEC_FLAG_QSCALE);
 
-#if FF_API_MPV_GLOBAL_OPTS
- if (s->flags & CODEC_FLAG_QP_RD)
- s->mpv_flags |= FF_MPV_FLAG_QP_RD;
-#endif
-
 s->adaptive_quant = (s->avctx->lumi_masking ||
 s->avctx->dark_masking ||
 s->avctx->temporal_cplx_masking ||
@@ -490,11 +423,6 @@
 return -1;
 }
 
-#if FF_API_MPV_GLOBAL_OPTS
- if (s->flags & CODEC_FLAG_CBP_RD)
- s->mpv_flags |= FF_MPV_FLAG_CBP_RD;
-#endif
-
 if ((s->mpv_flags & FF_MPV_FLAG_CBP_RD) && !avctx->trellis) {
 av_log(avctx, AV_LOG_ERROR, "CBP RD needs trellis quant\n");
 return -1;
@@ -561,11 +489,6 @@
 }
 
 i = (INT_MAX / 2 + 128) >> 8;
- if (avctx->me_threshold >= i) {
- av_log(avctx, AV_LOG_ERROR, "me_threshold too large, max is %d\n",
- i - 1);
- return -1;
- }
 if (avctx->mb_threshold >= i) {
 av_log(avctx, AV_LOG_ERROR, "mb_threshold too large, max is %d\n",
 i - 1);
@@ -602,9 +525,6 @@
 if (avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS)
 s->inter_quant_bias = avctx->inter_quant_bias;
 
- av_pix_fmt_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,
@@ -616,15 +536,6 @@
 }
 s->time_increment_bits = av_log2(s->avctx->time_base.den - 1) + 1;
 
-#if FF_API_MPV_GLOBAL_OPTS
- if (avctx->flags2 & CODEC_FLAG2_SKIP_RD)
- s->mpv_flags |= FF_MPV_FLAG_SKIP_RD;
- if (avctx->flags2 & CODEC_FLAG2_STRICT_GOP)
- s->mpv_flags |= FF_MPV_FLAG_STRICT_GOP;
- if (avctx->quantizer_noise_shaping)
- s->quantizer_noise_shaping = avctx->quantizer_noise_shaping;
-#endif
-
 switch (avctx->codec->id) {
 case AV_CODEC_ID_MPEG1VIDEO:
 s->out_format = FMT_MPEG1;
@@ -637,24 +548,10 @@
 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:
 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_BGRA) {
- 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 {
- 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;
@@ -789,6 +686,31 @@
 if (ARCH_X86)
 ff_MPV_encode_init_x86(s);
 
+ 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_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_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);
+ }
+
+ if (CONFIG_H263_ENCODER)
+ ff_h263dsp_init(&s->h263dsp);
 if (!s->dct_quantize)
 s->dct_quantize = ff_dct_quantize_c;
 if (!s->denoise_dct)
@@ -850,22 +772,66 @@
 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);
+
+ 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;
 }
 
@@ -907,18 +873,18 @@
 }
 
 
-static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg)
+static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg)
 {
- AVFrame *pic = NULL;
+ Picture *pic = NULL;
 int64_t pts;
- int i;
+ int i, display_picture_number = 0, ret;
 const int encoding_delay = s->max_b_frames ? s->max_b_frames :
 (s->low_delay ? 0 : 1);
 int direct = 1;
 
 if (pic_arg) {
 pts = pic_arg->pts;
- pic_arg->display_picture_number = s->input_picture_number++;
+ display_picture_number = s->input_picture_number++;
 
 if (pts != AV_NOPTS_VALUE) {
 if (s->user_specified_pts != AV_NOPTS_VALUE) {
@@ -932,7 +898,7 @@
 return -1;
 }
 
- if (!s->low_delay && pic_arg->display_picture_number == 1)
+ if (!s->low_delay && display_picture_number == 1)
 s->dts_delta = time - last;
 }
 s->user_specified_pts = pts;
@@ -944,89 +910,91 @@
 "Warning: AVFrame.pts=? trying to guess (%"PRId64")\n",
 pts);
 } else {
- pts = pic_arg->display_picture_number;
+ pts = display_picture_number;
 }
 }
 }
 
- if (pic_arg) {
- if (encoding_delay && !(s->flags & CODEC_FLAG_INPUT_PRESERVED))
- direct = 0;
- if (pic_arg->linesize[0] != s->linesize)
- direct = 0;
- if (pic_arg->linesize[1] != s->uvlinesize)
- direct = 0;
- if (pic_arg->linesize[2] != s->uvlinesize)
- direct = 0;
+ if (pic_arg) {
+ if (!pic_arg->buf[0]);
+ direct = 0;
+ if (pic_arg->linesize[0] != s->linesize)
+ direct = 0;
+ if (pic_arg->linesize[1] != s->uvlinesize)
+ direct = 0;
+ if (pic_arg->linesize[2] != s->uvlinesize)
+ direct = 0;
 
- av_dlog(s->avctx, "%d %d %d %d\n", pic_arg->linesize[0],
- pic_arg->linesize[1], s->linesize, s->uvlinesize);
+ av_dlog(s->avctx, "%d %d %td %td\n", pic_arg->linesize[0],
+ pic_arg->linesize[1], s->linesize, s->uvlinesize);
 
- if (direct) {
- i = ff_find_unused_picture(s, 1);
- if (i < 0)
- return i;
+ if (direct) {
+ i = ff_find_unused_picture(s, 1);
+ if (i < 0)
+ return i;
 
- pic = &s->picture[i].f;
- pic->reference = 3;
+ pic = &s->picture[i];
+ pic->reference = 3;
 
- for (i = 0; i < 4; i++) {
- pic->data[i] = pic_arg->data[i];
- pic->linesize[i] = pic_arg->linesize[i];
- }
- if (ff_alloc_picture(s, (Picture *) pic, 1) < 0) {
- return -1;
- }
- } else {
- i = ff_find_unused_picture(s, 0);
- if (i < 0)
- return i;
+ if ((ret = av_frame_ref(&pic->f, pic_arg)) < 0)
+ return ret;
+ if (ff_alloc_picture(s, pic, 1) < 0) {
+ return -1;
+ }
+ } else {
+ i = ff_find_unused_picture(s, 0);
+ if (i < 0)
+ return i;
 
- pic = &s->picture[i].f;
- pic->reference = 3;
+ pic = &s->picture[i];
+ pic->reference = 3;
 
- if (ff_alloc_picture(s, (Picture *) pic, 0) < 0) {
- return -1;
- }
+ if (ff_alloc_picture(s, pic, 0) < 0) {
+ return -1;
+ }
 
- if (pic->data[0] + INPLACE_OFFSET == pic_arg->data[0] &&
- pic->data[1] + INPLACE_OFFSET == pic_arg->data[1] &&
- pic->data[2] + INPLACE_OFFSET == pic_arg->data[2]) {
- // empty
- } else {
- int h_chroma_shift, v_chroma_shift;
- av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt,
- &h_chroma_shift,
- &v_chroma_shift);
-
- for (i = 0; i < 3; i++) {
- int src_stride = pic_arg->linesize[i];
- int dst_stride = i ? s->uvlinesize : s->linesize;
- int h_shift = i ? h_chroma_shift : 0;
- int v_shift = i ? v_chroma_shift : 0;
- int w = s->width >> h_shift;
- int h = s->height >> v_shift;
- uint8_t *src = pic_arg->data[i];
- uint8_t *dst = pic->data[i];
-
- if (!s->avctx->rc_buffer_size)
- dst += INPLACE_OFFSET;
-
- if (src_stride == dst_stride)
- memcpy(dst, src, src_stride * h);
- else {
- while (h--) {
- memcpy(dst, src, w);
- dst += dst_stride;
- src += src_stride;
+ if (pic->f.data[0] + INPLACE_OFFSET == pic_arg->data[0] &&
+ pic->f.data[1] + INPLACE_OFFSET == pic_arg->data[1] &&
+ pic->f.data[2] + INPLACE_OFFSET == pic_arg->data[2]) {
+ // empty
+ } else {
+ int h_chroma_shift, v_chroma_shift;
+ av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt,
+ &h_chroma_shift,
+ &v_chroma_shift);
+
+ for (i = 0; i < 3; i++) {
+ int src_stride = pic_arg->linesize[i];
+ int dst_stride = i ? s->uvlinesize : s->linesize;
+ int h_shift = i ? h_chroma_shift : 0;
+ int v_shift = i ? v_chroma_shift : 0;
+ int w = s->width >> h_shift;
+ int h = s->height >> v_shift;
+ uint8_t *src = pic_arg->data[i];
+ uint8_t *dst = pic->f.data[i];
+
+ if (!s->avctx->rc_buffer_size)
+ dst += INPLACE_OFFSET;
+
+ if (src_stride == dst_stride)
+ memcpy(dst, src, src_stride * h);
+ else {
+ while (h--) {
+ memcpy(dst, src, w);
+ dst += dst_stride;
+ src += src_stride;
+ }
 }
 }
 }
 }
+ ret = av_frame_copy_props(&pic->f, pic_arg);
+ if (ret < 0)
+ return ret;
+
+ pic->f.display_picture_number = display_picture_number;
+ pic->f.pts = pts; // we set this here to avoid modifiying pic_arg
 }
- copy_picture_attributes(s, pic, pic_arg);
- pic->pts = pts; // we set this here to avoid modifiying pic_arg
- }
 
 /* shift buffer entries */
 for (i = 1; i < MAX_PICTURE_COUNT /*s->encoding_delay + 1*/; i++)
@@ -1048,7 +1016,7 @@
 const int bw = plane ? 1 : 2;
 for (y = 0; y < s->mb_height * bw; y++) {
 for (x = 0; x < s->mb_width * bw; x++) {
- int off = p->f.type == FF_BUFFER_TYPE_SHARED ? 0 : 16;
+ int off = p->shared ? 0 : 16;
 uint8_t *dptr = p->f.data[plane] + 8 * (x + y * stride) + off;
 uint8_t *rptr = ref->f.data[plane] + 8 * (x + y * stride);
 int v = s->dsp.frame_skip_cmp[1](s, dptr, rptr, stride, 8);
@@ -1093,7 +1061,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;
@@ -1114,7 +1081,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;
@@ -1128,35 +1095,25 @@
 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;
 
- if (pre_input.f.type != FF_BUFFER_TYPE_SHARED && i) {
+ if (!pre_input.shared && i) {
 pre_input.f.data[0] += INPLACE_OFFSET;
 pre_input.f.data[1] += INPLACE_OFFSET;
 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);
 }
@@ -1170,21 +1127,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);
 }
@@ -1206,16 +1163,12 @@
 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;
 }
 
 static int select_input_picture(MpegEncContext *s)
 {
- int i;
+ int i, ret;
 
 for (i = 1; i < MAX_PICTURE_COUNT; i++)
 s->reordered_input_picture[i - 1] = s->reordered_input_picture[i];
@@ -1236,17 +1189,7 @@
 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
- if (s->input_picture[0]->f.type == FF_BUFFER_TYPE_SHARED) {
- for (i = 0; i < 4; i++)
- s->input_picture[0]->f.data[i] = NULL;
- s->input_picture[0]->f.type = 0;
- } else {
- assert(s->input_picture[0]->f.type == FF_BUFFER_TYPE_USER ||
- s->input_picture[0]->f.type == FF_BUFFER_TYPE_INTERNAL);
-
- s->avctx->release_buffer(s->avctx,
- &s->input_picture[0]->f);
- }
+ av_frame_unref(&s->input_picture[0]->f);
 
 emms_c();
 ff_vbv_update(s, 0);
@@ -1350,14 +1293,15 @@
 }
 no_output_pic:
 if (s->reordered_input_picture[0]) {
- s->reordered_input_picture[0]->f.reference =
+ s->reordered_input_picture[0]->reference =
 s->reordered_input_picture[0]->f.pict_type !=
 AV_PICTURE_TYPE_B ? 3 : 0;
 
- ff_copy_picture(&s->new_picture, s->reordered_input_picture[0]);
+ ff_mpeg_unref_picture(s, &s->new_picture);
+ if ((ret = ff_mpeg_ref_picture(s, &s->new_picture, s->reordered_input_picture[0])))
+ return ret;
 
- if (s->reordered_input_picture[0]->f.type == FF_BUFFER_TYPE_SHARED ||
- s->avctx->rc_buffer_size) {
+ if (s->reordered_input_picture[0]->shared || s->avctx->rc_buffer_size) {
 // input is a shared pix, so we can't modifiy it -> alloc a new
 // one & ensure that the shared one is reuseable
 
@@ -1367,45 +1311,175 @@
 return i;
 pic = &s->picture[i];
 
- pic->f.reference = s->reordered_input_picture[0]->f.reference;
+ pic->reference = s->reordered_input_picture[0]->reference;
 if (ff_alloc_picture(s, pic, 0) < 0) {
 return -1;
 }
 
- /* mark us unused / free shared pic */
- if (s->reordered_input_picture[0]->f.type == FF_BUFFER_TYPE_INTERNAL)
- s->avctx->release_buffer(s->avctx,
- &s->reordered_input_picture[0]->f);
- for (i = 0; i < 4; i++)
- s->reordered_input_picture[0]->f.data[i] = NULL;
- s->reordered_input_picture[0]->f.type = 0;
+ ret = av_frame_copy_props(&pic->f, &s->reordered_input_picture[0]->f);
+ if (ret < 0)
+ return ret;
 
- copy_picture_attributes(s, &pic->f,
- &s->reordered_input_picture[0]->f);
+ /* mark us unused / free shared pic */
+ av_frame_unref(&s->reordered_input_picture[0]->f);
+ s->reordered_input_picture[0]->shared = 0;
 
 s->current_picture_ptr = pic;
 } else {
 // input is not a shared pix -> reuse buffer for current_pix
-
- assert(s->reordered_input_picture[0]->f.type ==
- FF_BUFFER_TYPE_USER ||
- s->reordered_input_picture[0]->f.type ==
- FF_BUFFER_TYPE_INTERNAL);
-
 s->current_picture_ptr = s->reordered_input_picture[0];
 for (i = 0; i < 4; i++) {
 s->new_picture.f.data[i] += INPLACE_OFFSET;
 }
 }
- ff_copy_picture(&s->current_picture, s->current_picture_ptr);
+ 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;
 
 s->picture_number = s->new_picture.f.display_picture_number;
 } else {
- memset(&s->new_picture, 0, sizeof(Picture));
+ ff_mpeg_unref_picture(s, &s->new_picture);
 }
 return 0;
 }
 
+static void frame_end(MpegEncContext *s)
+{
+ int i;
+
+ 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->linesize,
+ 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->uvlinesize,
+ 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->uvlinesize,
+ 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 (s->encoding) {
+ /* release non-reference frames */
+ for (i = 0; i < MAX_PICTURE_COUNT; i++) {
+ if (!s->picture[i].reference)
+ ff_mpeg_unref_picture(s, &s->picture[i]);
+ }
+ }
+
+ 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) {
+ assert(s->avctx->noise_reduction && s->encoding);
+ update_noise_reduction(s);
+ }
+
+ return 0;
+}
+
 int ff_MPV_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
 const AVFrame *pic_arg, int *got_packet)
 {
@@ -1446,7 +1520,9 @@
 
 s->pict_type = s->new_picture.f.pict_type;
 //emms_c();
- ff_MPV_frame_start(s, avctx);
+ ret = frame_start(s);
+ if (ret < 0)
+ return ret;
 vbv_retry:
 if (encode_picture(s, s->picture_number) < 0)
 return -1;
@@ -1461,10 +1537,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;
@@ -1482,7 +1558,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 ||
@@ -1625,7 +1701,7 @@
 int score = 0;
 int run = 0;
 int i;
- DCTELEM *block = s->block[n];
+ int16_t *block = s->block[n];
 const int last_index = s->block_last_index[n];
 int skip_dc;
 
@@ -1665,7 +1741,7 @@
 s->block_last_index[n] = -1;
 }
 
-static inline void clip_coeffs(MpegEncContext *s, DCTELEM *block,
+static inline void clip_coeffs(MpegEncContext *s, int16_t *block,
 int last_index)
 {
 int i;
@@ -1729,14 +1805,14 @@
 int mb_block_count)
 {
 int16_t weight[8][64];
- DCTELEM orig[8][64];
+ int16_t orig[8][64];
 const int mb_x = s->mb_x;
 const int mb_y = s->mb_y;
 int i;
 int skip_dct[8];
 int dct_offset = s->linesize * 8; // default for progressive frames
 uint8_t *ptr_y, *ptr_cb, *ptr_cr;
- int wrap_y, wrap_c;
+ ptrdiff_t wrap_y, wrap_c;
 
 for (i = 0; i < mb_block_count; i++)
 skip_dct[i] = s->skipdct;
@@ -1749,7 +1825,7 @@
 update_qscale(s);
 
 if (!(s->mpv_flags & FF_MPV_FLAG_QP_RD)) {
- s->qscale = s->current_picture_ptr->f.qscale_table[mb_xy];
+ s->qscale = s->current_picture_ptr->qscale_table[mb_xy];
 s->dquant = s->qscale - last_qp;
 
 if (s->out_format == FMT_H263) {
@@ -1782,15 +1858,19 @@
 
 if (mb_x * 16 + 16 > s->width || mb_y * 16 + 16 > s->height) {
 uint8_t *ebuf = s->edge_emu_buffer + 32;
- s->vdsp.emulated_edge_mc(ebuf, 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, ptr_cb, wrap_c, 8,
- mb_block_height, mb_x * 8, mb_y * 8,
+ s->vdsp.emulated_edge_mc(ebuf + 18 * wrap_y, ptr_cb,
+ wrap_c, wrap_c,
+ 8, mb_block_height, mb_x * 8, mb_y * 8,
 s->width >> 1, s->height >> 1);
 ptr_cb = ebuf + 18 * wrap_y;
- s->vdsp.emulated_edge_mc(ebuf + 18 * wrap_y + 8, ptr_cr, wrap_c, 8,
- mb_block_height, mb_x * 8, mb_y * 8,
+ s->vdsp.emulated_edge_mc(ebuf + 18 * wrap_y + 8, ptr_cr,
+ wrap_c, wrap_c,
+ 8, mb_block_height, mb_x * 8, mb_y * 8,
 s->width >> 1, s->height >> 1);
 ptr_cr = ebuf + 18 * wrap_y + 8;
 }
@@ -1849,10 +1929,10 @@
 dest_cr = s->dest[2];
 
 if ((!s->no_rounding) || s->pict_type == AV_PICTURE_TYPE_B) {
- op_pix = s->dsp.put_pixels_tab;
+ op_pix = s->hdsp.put_pixels_tab;
 op_qpix = s->dsp.put_qpel_pixels_tab;
 } else {
- op_pix = s->dsp.put_no_rnd_pixels_tab;
+ op_pix = s->hdsp.put_no_rnd_pixels_tab;
 op_qpix = s->dsp.put_no_rnd_qpel_pixels_tab;
 }
 
@@ -1860,7 +1940,7 @@
 ff_MPV_motion(s, dest_y, dest_cb, dest_cr, 0,
 s->last_picture.f.data,
 op_pix, op_qpix);
- op_pix = s->dsp.avg_pixels_tab;
+ op_pix = s->hdsp.avg_pixels_tab;
 op_qpix = s->dsp.avg_qpel_pixels_tab;
 }
 if (s->mv_dir & MV_DIR_BACKWARD) {
@@ -1979,7 +2059,7 @@
 get_visual_weight(weight[7], ptr_cr + (dct_offset >> 1),
 wrap_c);
 }
- memcpy(orig[0], s->block[0], sizeof(DCTELEM) * 64 * mb_block_count);
+ memcpy(orig[0], s->block[0], sizeof(int16_t) * 64 * mb_block_count);
 }
 
 /* DCT & quantize */
@@ -2515,9 +2595,9 @@
 assert((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;
@@ -2623,8 +2703,8 @@
 s->mv_type = MV_TYPE_8X8;
 s->mb_intra= 0;
 for(i=0; i<4; i++){
- s->mv[0][i][0] = s->current_picture.f.motion_val[0][s->block_index[i]][0];
- s->mv[0][i][1] = s->current_picture.f.motion_val[0][s->block_index[i]][1];
+ 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];
 }
 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER4V, pb, pb2, tex_pb,
 &dmin, &next_block, 0, 0);
@@ -2716,7 +2796,7 @@
 if(best_s.mv_type==MV_TYPE_16X16){ //FIXME move 4mv after QPRD
 const int last_qp= backup_s.qscale;
 int qpi, qp, dc[6];
- DCTELEM ac[6][16];
+ int16_t ac[6][16];
 const int mvdir= (best_s.mv_dir&MV_DIR_BACKWARD) ? 1 : 0;
 static const int dquant_tab[4]={-1,1,-2,2};
 
@@ -2741,7 +2821,7 @@
 if(s->mb_intra && s->dc_val[0]){
 for(i=0; i<6; i++){
 dc[i]= s->dc_val[0][ s->block_index[i] ];
- memcpy(ac[i], s->ac_val[0][s->block_index[i]], sizeof(DCTELEM)*16);
+ memcpy(ac[i], s->ac_val[0][s->block_index[i]], sizeof(int16_t)*16);
 }
 }
 
@@ -2751,7 +2831,7 @@
 if(s->mb_intra && s->dc_val[0]){
 for(i=0; i<6; i++){
 s->dc_val[0][ s->block_index[i] ]= dc[i];
- memcpy(s->ac_val[0][s->block_index[i]], ac[i], sizeof(DCTELEM)*16);
+ memcpy(s->ac_val[0][s->block_index[i]], ac[i], sizeof(int16_t)*16);
 }
 }
 }
@@ -2810,7 +2890,7 @@
 }
 }
 
- s->current_picture.f.qscale_table[xy] = best_s.qscale;
+ s->current_picture.qscale_table[xy] = best_s.qscale;
 
 copy_context_after_encode(s, &best_s, -1);
 
@@ -2837,9 +2917,9 @@
 ff_h263_update_motion_val(s);
 
 if(next_block==0){ //FIXME 16 vs linesize16
- s->dsp.put_pixels_tab[0][0](s->dest[0], s->rd_scratchpad , s->linesize ,16);
- s->dsp.put_pixels_tab[1][0](s->dest[1], s->rd_scratchpad + 16*s->linesize , s->uvlinesize, 8);
- s->dsp.put_pixels_tab[1][0](s->dest[2], s->rd_scratchpad + 16*s->linesize + 8, s->uvlinesize, 8);
+ s->hdsp.put_pixels_tab[0][0](s->dest[0], s->rd_scratchpad , s->linesize ,16);
+ s->hdsp.put_pixels_tab[1][0](s->dest[1], s->rd_scratchpad + 16*s->linesize , s->uvlinesize, 8);
+ s->hdsp.put_pixels_tab[1][0](s->dest[2], s->rd_scratchpad + 16*s->linesize + 8, s->uvlinesize, 8);
 }
 
 if(s->avctx->mb_decision == FF_MB_DECISION_BITS)
@@ -2877,8 +2957,8 @@
 s->mv_type = MV_TYPE_8X8;
 s->mb_intra= 0;
 for(i=0; i<4; i++){
- s->mv[0][i][0] = s->current_picture.f.motion_val[0][s->block_index[i]][0];
- s->mv[0][i][1] = s->current_picture.f.motion_val[0][s->block_index[i]][1];
+ 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];
 }
 break;
 case CANDIDATE_MB_TYPE_DIRECT:
@@ -3035,7 +3115,7 @@
 MERGE(b_count);
 MERGE(skip_count);
 MERGE(misc_bits);
- MERGE(error_count);
+ MERGE(er.error_count);
 MERGE(padding_bug_score);
 MERGE(current_picture.f.error[0]);
 MERGE(current_picture.f.error[1]);
@@ -3162,7 +3242,7 @@
 if(s->pict_type != AV_PICTURE_TYPE_I){
 s->lambda = (s->lambda * s->avctx->me_penalty_compensation + 128)>>8;
 s->lambda2= (s->lambda2* (int64_t)s->avctx->me_penalty_compensation + 128)>>8;
- if(s->pict_type != AV_PICTURE_TYPE_B && s->avctx->me_threshold==0){
+ if (s->pict_type != AV_PICTURE_TYPE_B) {
 if((s->avctx->pre_me && s->last_non_b_pict_type==AV_PICTURE_TYPE_I) || s->avctx->pre_me==2){
 s->avctx->execute(s->avctx, pre_estimate_motion_thread, &s->thread_context[0], NULL, context_count, sizeof(void*));
 }
@@ -3282,7 +3362,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);
 break;
 case FMT_H261:
 if (CONFIG_H261_ENCODER)
@@ -3308,8 +3389,6 @@
 if (CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER)
 ff_mpeg1_encode_picture_header(s, picture_number);
 break;
- case FMT_H264:
- break;
 default:
 assert(0);
 }
@@ -3327,7 +3406,7 @@
 return 0;
 }
 
-static void denoise_dct_c(MpegEncContext *s, DCTELEM *block){
+static void denoise_dct_c(MpegEncContext *s, int16_t *block){
 const int intra= s->mb_intra;
 int i;
 
@@ -3352,7 +3431,7 @@
 }
 
 static int dct_quantize_trellis_c(MpegEncContext *s,
- DCTELEM *block, int n,
+ int16_t *block, int n,
 int qscale, int *overflow){
 const int *qmat;
 const uint8_t *scantable= s->intra_scantable.scantable;
@@ -3459,7 +3538,7 @@
 *overflow= s->max_qcoeff < max; //overflow might have happened
 
 if(last_non_zero < start_i){
- memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM));
+ memset(block + start_i, 0, (64-start_i)*sizeof(int16_t));
 return last_non_zero;
 }
 
@@ -3591,7 +3670,7 @@
 
 dc= FFABS(block[0]);
 last_non_zero= last_i - 1;
- memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM));
+ memset(block + start_i, 0, (64-start_i)*sizeof(int16_t));
 
 if(last_non_zero < start_i)
 return last_non_zero;
@@ -3666,10 +3745,10 @@
 }
 
 static int dct_quantize_refine(MpegEncContext *s, //FIXME breaks denoise?
- DCTELEM *block, int16_t *weight, DCTELEM *orig,
+ int16_t *block, int16_t *weight, int16_t *orig,
 int n, int qscale){
 int16_t rem[64];
- LOCAL_ALIGNED_16(DCTELEM, d1, [64]);
+ LOCAL_ALIGNED_16(int16_t, d1, [64]);
 const uint8_t *scantable= s->intra_scantable.scantable;
 const uint8_t *perm_scantable= s->intra_scantable.permutated;
 // unsigned int threshold1, threshold2;
@@ -4039,7 +4118,7 @@
 }
 
 int ff_dct_quantize_c(MpegEncContext *s,
- DCTELEM *block, int n,
+ int16_t *block, int n,
 int qscale, int *overflow)
 {
 int i, j, level, last_non_zero, q, start_i;
@@ -4137,6 +4216,7 @@
 
 AVCodec ff_h263_encoder = {
 .name = "h263",
+ .long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_H263,
 .priv_data_size = sizeof(MpegEncContext),
@@ -4144,7 +4224,6 @@
 .encode2 = ff_MPV_encode_picture,
 .close = ff_MPV_encode_end,
 .pix_fmts= (const enum AVPixelFormat[]){AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE},
- .long_name= NULL_IF_CONFIG_SMALL("H.263 / H.263-1996"),
 .priv_class = &h263_class,
 };
 
@@ -4165,6 +4244,7 @@
 
 AVCodec ff_h263p_encoder = {
 .name = "h263p",
+ .long_name = NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_H263P,
 .priv_data_size = sizeof(MpegEncContext),
@@ -4173,7 +4253,6 @@
 .close = ff_MPV_encode_end,
 .capabilities = CODEC_CAP_SLICE_THREADS,
 .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"),
 .priv_class = &h263p_class,
 };
 
@@ -4181,6 +4260,7 @@
 
 AVCodec ff_msmpeg4v2_encoder = {
 .name = "msmpeg4v2",
+ .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MSMPEG4V2,
 .priv_data_size = sizeof(MpegEncContext),
@@ -4188,7 +4268,6 @@
 .encode2 = ff_MPV_encode_picture,
 .close = ff_MPV_encode_end,
 .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"),
 .priv_class = &msmpeg4v2_class,
 };
 
@@ -4196,6 +4275,7 @@
 
 AVCodec ff_msmpeg4v3_encoder = {
 .name = "msmpeg4",
+ .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MSMPEG4V3,
 .priv_data_size = sizeof(MpegEncContext),
@@ -4203,7 +4283,6 @@
 .encode2 = ff_MPV_encode_picture,
 .close = ff_MPV_encode_end,
 .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"),
 .priv_class = &msmpeg4v3_class,
 };
 
@@ -4211,6 +4290,7 @@
 
 AVCodec ff_wmv1_encoder = {
 .name = "wmv1",
+ .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_WMV1,
 .priv_data_size = sizeof(MpegEncContext),
@@ -4218,6 +4298,5 @@
 .encode2 = ff_MPV_encode_picture,
 .close = ff_MPV_encode_end,
 .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"),
 .priv_class = &wmv1_class,
 };

libav-v9.6.tar.bz2/libavcodec/mpegvideo_motion.c -> libav-v10.1.tar.bz2/libavcodec/mpegvideo_motion.c Changed

@@ -22,8 +22,11 @@
 */
 
 #include <string.h>
+
+#include "libavutil/internal.h"
 #include "avcodec.h"
 #include "dsputil.h"
+#include "h261.h"
 #include "mpegvideo.h"
 #include "mjpegenc.h"
 #include "msmpeg4.h"
@@ -34,85 +37,96 @@
 uint8_t **ref_picture)
 {
 uint8_t *ptr;
- int offset, src_x, src_y, linesize, uvlinesize;
- int motion_x, motion_y;
- int emu=0;
-
- motion_x= s->sprite_offset[0][0];
- motion_y= s->sprite_offset[0][1];
- src_x = s->mb_x * 16 + (motion_x >> (s->sprite_warping_accuracy+1));
- src_y = s->mb_y * 16 + (motion_y >> (s->sprite_warping_accuracy+1));
- motion_x<<=(3-s->sprite_warping_accuracy);
- motion_y<<=(3-s->sprite_warping_accuracy);
- src_x = av_clip(src_x, -16, s->width);
+ int src_x, src_y, motion_x, motion_y;
+ ptrdiff_t offset, linesize, uvlinesize;
+ int emu = 0;
+
+ motion_x = s->sprite_offset[0][0];
+ motion_y = s->sprite_offset[0][1];
+ src_x = s->mb_x * 16 + (motion_x >> (s->sprite_warping_accuracy + 1));
+ src_y = s->mb_y * 16 + (motion_y >> (s->sprite_warping_accuracy + 1));
+ motion_x <<= (3 - s->sprite_warping_accuracy);
+ motion_y <<= (3 - s->sprite_warping_accuracy);
+ src_x = av_clip(src_x, -16, s->width);
 if (src_x == s->width)
- motion_x =0;
+ motion_x = 0;
 src_y = av_clip(src_y, -16, s->height);
 if (src_y == s->height)
- motion_y =0;
+ motion_y = 0;
 
- linesize = s->linesize;
+ linesize = s->linesize;
 uvlinesize = s->uvlinesize;
 
- ptr = ref_picture[0] + (src_y * linesize) + src_x;
+ ptr = ref_picture[0] + src_y * linesize + src_x;
 
- if(s->flags&CODEC_FLAG_EMU_EDGE){
- 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, 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, motion_x&15, motion_y&15, 128 - s->no_rounding);
- s->dsp.gmc1(dest_y+8, ptr+8, linesize, 16, motion_x&15, motion_y&15, 128 - s->no_rounding);
- }else{
+ if ((motion_x | motion_y) & 7) {
+ s->dsp.gmc1(dest_y, ptr, linesize, 16,
+ motion_x & 15, motion_y & 15, 128 - s->no_rounding);
+ s->dsp.gmc1(dest_y + 8, ptr + 8, linesize, 16,
+ motion_x & 15, motion_y & 15, 128 - s->no_rounding);
+ } else {
 int dxy;
 
- dxy= ((motion_x>>3)&1) | ((motion_y>>2)&2);
- if (s->no_rounding){
- s->dsp.put_no_rnd_pixels_tab[0][dxy](dest_y, ptr, linesize, 16);
- }else{
- s->dsp.put_pixels_tab [0][dxy](dest_y, ptr, linesize, 16);
+ dxy = ((motion_x >> 3) & 1) | ((motion_y >> 2) & 2);
+ if (s->no_rounding) {
+ s->hdsp.put_no_rnd_pixels_tab[0][dxy](dest_y, ptr, linesize, 16);
+ } else {
+ s->hdsp.put_pixels_tab[0][dxy](dest_y, ptr, linesize, 16);
 }
 }
 
- if(CONFIG_GRAY && s->flags&CODEC_FLAG_GRAY) return;
-
- motion_x= s->sprite_offset[1][0];
- motion_y= s->sprite_offset[1][1];
- src_x = s->mb_x * 8 + (motion_x >> (s->sprite_warping_accuracy+1));
- src_y = s->mb_y * 8 + (motion_y >> (s->sprite_warping_accuracy+1));
- motion_x<<=(3-s->sprite_warping_accuracy);
- motion_y<<=(3-s->sprite_warping_accuracy);
- src_x = av_clip(src_x, -8, s->width>>1);
- if (src_x == s->width>>1)
- motion_x =0;
- src_y = av_clip(src_y, -8, s->height>>1);
- if (src_y == s->height>>1)
- motion_y =0;
+ if (CONFIG_GRAY && s->flags & CODEC_FLAG_GRAY)
+ return;
+
+ motion_x = s->sprite_offset[1][0];
+ motion_y = s->sprite_offset[1][1];
+ src_x = s->mb_x * 8 + (motion_x >> (s->sprite_warping_accuracy + 1));
+ src_y = s->mb_y * 8 + (motion_y >> (s->sprite_warping_accuracy + 1));
+ motion_x <<= (3 - s->sprite_warping_accuracy);
+ motion_y <<= (3 - s->sprite_warping_accuracy);
+ src_x = av_clip(src_x, -8, s->width >> 1);
+ if (src_x == s->width >> 1)
+ motion_x = 0;
+ src_y = av_clip(src_y, -8, s->height >> 1);
+ if (src_y == s->height >> 1)
+ motion_y = 0;
 
 offset = (src_y * 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) - 9, 0)
- || (unsigned)src_y >= FFMAX((s->v_edge_pos>>1) - 9, 0)){
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer, 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;
- }
+ 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, 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);
+ 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, ptr, uvlinesize, 9, 9, src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1);
- ptr= s->edge_emu_buffer;
+ if (emu) {
+ 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;
 }
- s->dsp.gmc1(dest_cr, ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding);
-
- return;
+ s->dsp.gmc1(dest_cr, ptr, uvlinesize, 8,
+ motion_x & 15, motion_y & 15, 128 - s->no_rounding);
 }
 
 static void gmc_motion(MpegEncContext *s,
@@ -121,70 +135,72 @@
 {
 uint8_t *ptr;
 int linesize, uvlinesize;
- const int a= s->sprite_warping_accuracy;
+ const int a = s->sprite_warping_accuracy;
 int ox, oy;
 
- linesize = s->linesize;
+ linesize = s->linesize;
 uvlinesize = s->uvlinesize;
 
 ptr = ref_picture[0];
 
- ox= s->sprite_offset[0][0] + s->sprite_delta[0][0]*s->mb_x*16 + s->sprite_delta[0][1]*s->mb_y*16;
- oy= s->sprite_offset[0][1] + s->sprite_delta[1][0]*s->mb_x*16 + s->sprite_delta[1][1]*s->mb_y*16;
+ ox = s->sprite_offset[0][0] + s->sprite_delta[0][0] * s->mb_x * 16 +
+ s->sprite_delta[0][1] * s->mb_y * 16;
+ oy = s->sprite_offset[0][1] + s->sprite_delta[1][0] * s->mb_x * 16 +
+ s->sprite_delta[1][1] * s->mb_y * 16;
 
 s->dsp.gmc(dest_y, ptr, linesize, 16,
- ox,
- oy,
- s->sprite_delta[0][0], s->sprite_delta[0][1],
- s->sprite_delta[1][0], s->sprite_delta[1][1],
- a+1, (1<<(2*a+1)) - s->no_rounding,
- s->h_edge_pos, s->v_edge_pos);
- s->dsp.gmc(dest_y+8, ptr, linesize, 16,
- ox + s->sprite_delta[0][0]*8,
- oy + s->sprite_delta[1][0]*8,
- s->sprite_delta[0][0], s->sprite_delta[0][1],
- s->sprite_delta[1][0], s->sprite_delta[1][1],
- a+1, (1<<(2*a+1)) - s->no_rounding,
- s->h_edge_pos, s->v_edge_pos);
-
- if(CONFIG_GRAY && s->flags&CODEC_FLAG_GRAY) return;
-
- ox= s->sprite_offset[1][0] + s->sprite_delta[0][0]*s->mb_x*8 + s->sprite_delta[0][1]*s->mb_y*8;
- oy= s->sprite_offset[1][1] + s->sprite_delta[1][0]*s->mb_x*8 + s->sprite_delta[1][1]*s->mb_y*8;
+ ox, oy,
+ s->sprite_delta[0][0], s->sprite_delta[0][1],
+ s->sprite_delta[1][0], s->sprite_delta[1][1],
+ a + 1, (1 << (2 * a + 1)) - s->no_rounding,
+ s->h_edge_pos, s->v_edge_pos);
+ s->dsp.gmc(dest_y + 8, ptr, linesize, 16,
+ ox + s->sprite_delta[0][0] * 8,
+ oy + s->sprite_delta[1][0] * 8,
+ s->sprite_delta[0][0], s->sprite_delta[0][1],
+ s->sprite_delta[1][0], s->sprite_delta[1][1],
+ a + 1, (1 << (2 * a + 1)) - s->no_rounding,
+ s->h_edge_pos, s->v_edge_pos);
+
+ if (CONFIG_GRAY && s->flags & CODEC_FLAG_GRAY)
+ return;
+
+ ox = s->sprite_offset[1][0] + s->sprite_delta[0][0] * s->mb_x * 8 +
+ s->sprite_delta[0][1] * s->mb_y * 8;
+ oy = s->sprite_offset[1][1] + s->sprite_delta[1][0] * s->mb_x * 8 +
+ s->sprite_delta[1][1] * s->mb_y * 8;
 
 ptr = ref_picture[1];
 s->dsp.gmc(dest_cb, ptr, uvlinesize, 8,
- ox,
- oy,
- s->sprite_delta[0][0], s->sprite_delta[0][1],
- s->sprite_delta[1][0], s->sprite_delta[1][1],
- a+1, (1<<(2*a+1)) - s->no_rounding,
- s->h_edge_pos>>1, s->v_edge_pos>>1);
+ ox, oy,
+ s->sprite_delta[0][0], s->sprite_delta[0][1],
+ s->sprite_delta[1][0], s->sprite_delta[1][1],
+ a + 1, (1 << (2 * a + 1)) - s->no_rounding,
+ s->h_edge_pos >> 1, s->v_edge_pos >> 1);
 
 ptr = ref_picture[2];
 s->dsp.gmc(dest_cr, ptr, uvlinesize, 8,
- ox,
- oy,
- s->sprite_delta[0][0], s->sprite_delta[0][1],
- s->sprite_delta[1][0], s->sprite_delta[1][1],
- a+1, (1<<(2*a+1)) - s->no_rounding,
- s->h_edge_pos>>1, s->v_edge_pos>>1);
+ ox, oy,
+ s->sprite_delta[0][0], s->sprite_delta[0][1],
+ s->sprite_delta[1][0], s->sprite_delta[1][1],
+ a + 1, (1 << (2 * a + 1)) - s->no_rounding,
+ s->h_edge_pos >> 1, s->v_edge_pos >> 1);
 }
 
 static inline int hpel_motion(MpegEncContext *s,
- uint8_t *dest, uint8_t *src,
- int src_x, int src_y,
- op_pixels_func *pix_op,
- int motion_x, int motion_y)
+ uint8_t *dest, uint8_t *src,
+ int src_x, int src_y,
+ op_pixels_func *pix_op,
+ int motion_x, int motion_y)
 {
 int dxy = 0;
- int emu=0;
+ int emu = 0;
 
 src_x += motion_x >> 1;
 src_y += motion_y >> 1;
 
 /* WARNING: do no forget half pels */
- src_x = av_clip(src_x, -16, s->width); //FIXME unneeded for emu?
+ src_x = av_clip(src_x, -16, s->width); // FIXME unneeded for emu?
 if (src_x != s->width)
 dxy |= motion_x & 1;
 src_y = av_clip(src_y, -16, s->height);
@@ -192,13 +208,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, src, s->linesize, 9, 9,
- src_x, src_y, s->h_edge_pos, s->v_edge_pos);
- src= s->edge_emu_buffer;
- emu=1;
+ if (s->unrestricted_mv) {
+ 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, 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);
@@ -207,66 +226,76 @@
 
 static av_always_inline
 void mpeg_motion_internal(MpegEncContext *s,
- uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
- int field_based, int bottom_field, int field_select,
- uint8_t **ref_picture, op_pixels_func (*pix_op)[4],
- int motion_x, int motion_y, int h, int is_mpeg12, int mb_y)
+ uint8_t *dest_y,
+ uint8_t *dest_cb,
+ uint8_t *dest_cr,
+ int field_based,
+ int bottom_field,
+ int field_select,
+ uint8_t **ref_picture,
+ op_pixels_func (*pix_op)[4],
+ int motion_x,
+ int motion_y,
+ int h,
+ int is_mpeg12,
+ int mb_y)
 {
 uint8_t *ptr_y, *ptr_cb, *ptr_cr;
 int dxy, uvdxy, mx, my, src_x, src_y,
- uvsrc_x, uvsrc_y, v_edge_pos, uvlinesize, linesize;
+ uvsrc_x, uvsrc_y, v_edge_pos;
+ ptrdiff_t uvlinesize, linesize;
 
 #if 0
-if(s->quarter_sample)
-{
- motion_x>>=1;
- motion_y>>=1;
-}
+ if (s->quarter_sample) {
+ motion_x >>= 1;
+ motion_y >>= 1;
+ }
 #endif
 
 v_edge_pos = s->v_edge_pos >> field_based;
 linesize = s->current_picture.f.linesize[0] << field_based;
 uvlinesize = s->current_picture.f.linesize[1] << field_based;
 
- dxy = ((motion_y & 1) << 1) | (motion_x & 1);
- src_x = s->mb_x* 16 + (motion_x >> 1);
- src_y =( mb_y<<(4-field_based)) + (motion_y >> 1);
+ dxy = ((motion_y & 1) << 1) | (motion_x & 1);
+ src_x = s->mb_x * 16 + (motion_x >> 1);
+ src_y = (mb_y << (4 - field_based)) + (motion_y >> 1);
 
 if (!is_mpeg12 && s->out_format == FMT_H263) {
- if((s->workaround_bugs & FF_BUG_HPEL_CHROMA) && field_based){
- mx = (motion_x>>1)|(motion_x&1);
- my = motion_y >>1;
- uvdxy = ((my & 1) << 1) | (mx & 1);
- uvsrc_x = s->mb_x* 8 + (mx >> 1);
- uvsrc_y =( mb_y<<(3-field_based))+ (my >> 1);
- }else{
- uvdxy = dxy | (motion_y & 2) | ((motion_x & 2) >> 1);
- uvsrc_x = src_x>>1;
- uvsrc_y = src_y>>1;
+ if ((s->workaround_bugs & FF_BUG_HPEL_CHROMA) && field_based) {
+ mx = (motion_x >> 1) | (motion_x & 1);
+ my = motion_y >> 1;
+ uvdxy = ((my & 1) << 1) | (mx & 1);
+ uvsrc_x = s->mb_x * 8 + (mx >> 1);
+ uvsrc_y = (mb_y << (3 - field_based)) + (my >> 1);
+ } else {
+ uvdxy = dxy | (motion_y & 2) | ((motion_x & 2) >> 1);
+ uvsrc_x = src_x >> 1;
+ uvsrc_y = src_y >> 1;
 }
- }else if(!is_mpeg12 && s->out_format == FMT_H261){//even chroma mv's are full pel in H261
- mx = motion_x / 4;
- my = motion_y / 4;
- uvdxy = 0;
- uvsrc_x = s->mb_x*8 + mx;
- uvsrc_y = mb_y*8 + my;
+ // Even chroma mv's are full pel in H261
+ } else if (!is_mpeg12 && s->out_format == FMT_H261) {
+ mx = motion_x / 4;
+ my = motion_y / 4;
+ uvdxy = 0;
+ uvsrc_x = s->mb_x * 8 + mx;
+ uvsrc_y = mb_y * 8 + my;
 } else {
- if(s->chroma_y_shift){
- mx = motion_x / 2;
- my = motion_y / 2;
- uvdxy = ((my & 1) << 1) | (mx & 1);
- uvsrc_x = s->mb_x* 8 + (mx >> 1);
- uvsrc_y =( mb_y<<(3-field_based))+ (my >> 1);
+ if (s->chroma_y_shift) {
+ mx = motion_x / 2;
+ my = motion_y / 2;
+ uvdxy = ((my & 1) << 1) | (mx & 1);
+ uvsrc_x = s->mb_x * 8 + (mx >> 1);
+ uvsrc_y = (mb_y << (3 - field_based)) + (my >> 1);
 } else {
- if(s->chroma_x_shift){
- //Chroma422
- mx = motion_x / 2;
- uvdxy = ((motion_y & 1) << 1) | (mx & 1);
- uvsrc_x = s->mb_x* 8 + (mx >> 1);
+ if (s->chroma_x_shift) {
+ // Chroma422
+ mx = motion_x / 2;
+ uvdxy = ((motion_y & 1) << 1) | (mx & 1);
+ uvsrc_x = s->mb_x * 8 + (mx >> 1);
 uvsrc_y = src_y;
 } else {
- //Chroma444
- uvdxy = dxy;
+ // Chroma444
+ uvdxy = dxy;
 uvsrc_x = src_x;
 uvsrc_y = src_y;
 }
@@ -277,58 +306,63 @@
 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x;
 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x;
 
- if( (unsigned)src_x > FFMAX(s->h_edge_pos - (motion_x&1) - 16, 0)
- || (unsigned)src_y > FFMAX( v_edge_pos - (motion_y&1) - h , 0)){
- if(is_mpeg12 || s->codec_id == AV_CODEC_ID_MPEG2VIDEO ||
- s->codec_id == AV_CODEC_ID_MPEG1VIDEO){
- av_log(s->avctx,AV_LOG_DEBUG,
- "MPEG motion vector out of boundary (%d %d)\n", src_x, src_y);
- return;
- }
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr_y, 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 ,
- ptr_cb, 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,
- ptr_cr, s->uvlinesize,
- 9, 9+field_based,
- uvsrc_x, uvsrc_y<<field_based,
- s->h_edge_pos>>1, s->v_edge_pos>>1);
- ptr_cb= uvbuf;
- ptr_cr= uvbuf+16;
- }
+ if ((unsigned)src_x > FFMAX(s->h_edge_pos - (motion_x & 1) - 16, 0) ||
+ (unsigned)src_y > FFMAX(v_edge_pos - (motion_y & 1) - h, 0)) {
+ if (is_mpeg12 ||
+ s->codec_id == AV_CODEC_ID_MPEG2VIDEO ||
+ s->codec_id == AV_CODEC_ID_MPEG1VIDEO) {
+ av_log(s->avctx, AV_LOG_DEBUG,
+ "MPEG motion vector out of boundary (%d %d)\n", src_x,
+ src_y);
+ return;
+ }
+ 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, 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, 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);
+ ptr_cb = uvbuf;
+ ptr_cr = uvbuf + 16;
+ }
 }
 
- if(bottom_field){ //FIXME use this for field pix too instead of the obnoxious hack which changes picture.data
- dest_y += s->linesize;
- dest_cb+= s->uvlinesize;
- dest_cr+= s->uvlinesize;
+ /* FIXME use this for field pix too instead of the obnoxious hack which
+ * changes picture.data */
+ if (bottom_field) {
+ dest_y += s->linesize;
+ dest_cb += s->uvlinesize;
+ dest_cr += s->uvlinesize;
 }
 
- if(field_select){
- ptr_y += s->linesize;
- ptr_cb+= s->uvlinesize;
- ptr_cr+= s->uvlinesize;
+ if (field_select) {
+ ptr_y += s->linesize;
+ ptr_cb += s->uvlinesize;
+ ptr_cr += s->uvlinesize;
 }
 
 pix_op[0][dxy](dest_y, ptr_y, linesize, h);
 
- if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
+ if (!CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
 pix_op[s->chroma_x_shift][uvdxy]
- (dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift);
+ (dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift);
 pix_op[s->chroma_x_shift][uvdxy]
- (dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift);
+ (dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift);
 }
- if(!is_mpeg12 && (CONFIG_H261_ENCODER || CONFIG_H261_DECODER) &&
- s->out_format == FMT_H261){
+ if (!is_mpeg12 && (CONFIG_H261_ENCODER || CONFIG_H261_DECODER) &&
+ s->out_format == FMT_H261) {
 ff_h261_loop_filter(s);
 }
 }
@@ -340,15 +374,15 @@
 int motion_x, int motion_y, int h, int mb_y)
 {
 #if !CONFIG_SMALL
- if(s->out_format == FMT_MPEG1)
+ if (s->out_format == FMT_MPEG1)
 mpeg_motion_internal(s, dest_y, dest_cb, dest_cr, 0, 0,
- field_select, ref_picture, pix_op,
- motion_x, motion_y, h, 1, mb_y);
+ field_select, ref_picture, pix_op,
+ motion_x, motion_y, h, 1, mb_y);
 else
 #endif
 mpeg_motion_internal(s, dest_y, dest_cb, dest_cr, 0, 0,
- field_select, ref_picture, pix_op,
- motion_x, motion_y, h, 0, mb_y);
+ field_select, ref_picture, pix_op,
+ motion_x, motion_y, h, 0, mb_y);
 }
 
 static void mpeg_motion_field(MpegEncContext *s, uint8_t *dest_y,
@@ -361,23 +395,24 @@
 #if !CONFIG_SMALL
 if(s->out_format == FMT_MPEG1)
 mpeg_motion_internal(s, dest_y, dest_cb, dest_cr, 1,
- bottom_field, field_select, ref_picture, pix_op,
- motion_x, motion_y, h, 1, mb_y);
+ bottom_field, field_select, ref_picture, pix_op,
+ motion_x, motion_y, h, 1, mb_y);
 else
 #endif
 mpeg_motion_internal(s, dest_y, dest_cb, dest_cr, 1,
- bottom_field, field_select, ref_picture, pix_op,
- motion_x, motion_y, h, 0, mb_y);
+ bottom_field, field_select, ref_picture, pix_op,
+ motion_x, motion_y, h, 0, mb_y);
 }
 
-//FIXME move to dsputil, avg variant, 16x16 version
-static inline void put_obmc(uint8_t *dst, uint8_t *src[5], int stride){
+// FIXME move to dsputil, avg variant, 16x16 version
+static inline void put_obmc(uint8_t *dst, uint8_t *src[5], int stride)
+{
 int x;
- uint8_t * const top = src[1];
- uint8_t * const left = src[2];
- uint8_t * const mid = src[0];
- uint8_t * const right = src[3];
- uint8_t * const bottom= src[4];
+ uint8_t *const top = src[1];
+ uint8_t *const left = src[2];
+ uint8_t *const mid = src[0];
+ uint8_t *const right = src[3];
+ uint8_t *const bottom = src[4];
 #define OBMC_FILTER(x, t, l, m, r, b)\
 dst[x]= (t*top[x] + l*left[x] + m*mid[x] + r*right[x] + b*bottom[x] + 4)>>3
 #define OBMC_FILTER4(x, t, l, m, r, b)\
@@ -386,40 +421,40 @@
 OBMC_FILTER(x +stride, t, l, m, r, b);\
 OBMC_FILTER(x+1+stride, t, l, m, r, b);
 
- x=0;
- OBMC_FILTER (x , 2, 2, 4, 0, 0);
- OBMC_FILTER (x+1, 2, 1, 5, 0, 0);
- OBMC_FILTER4(x+2, 2, 1, 5, 0, 0);
- OBMC_FILTER4(x+4, 2, 0, 5, 1, 0);
- OBMC_FILTER (x+6, 2, 0, 5, 1, 0);
- OBMC_FILTER (x+7, 2, 0, 4, 2, 0);
- x+= stride;
- OBMC_FILTER (x , 1, 2, 5, 0, 0);
- OBMC_FILTER (x+1, 1, 2, 5, 0, 0);
- OBMC_FILTER (x+6, 1, 0, 5, 2, 0);
- OBMC_FILTER (x+7, 1, 0, 5, 2, 0);
- x+= stride;
- OBMC_FILTER4(x , 1, 2, 5, 0, 0);
- OBMC_FILTER4(x+2, 1, 1, 6, 0, 0);
- OBMC_FILTER4(x+4, 1, 0, 6, 1, 0);
- OBMC_FILTER4(x+6, 1, 0, 5, 2, 0);
- x+= 2*stride;
- OBMC_FILTER4(x , 0, 2, 5, 0, 1);
- OBMC_FILTER4(x+2, 0, 1, 6, 0, 1);
- OBMC_FILTER4(x+4, 0, 0, 6, 1, 1);
- OBMC_FILTER4(x+6, 0, 0, 5, 2, 1);
- x+= 2*stride;
- OBMC_FILTER (x , 0, 2, 5, 0, 1);
- OBMC_FILTER (x+1, 0, 2, 5, 0, 1);
- OBMC_FILTER4(x+2, 0, 1, 5, 0, 2);
- OBMC_FILTER4(x+4, 0, 0, 5, 1, 2);
- OBMC_FILTER (x+6, 0, 0, 5, 2, 1);
- OBMC_FILTER (x+7, 0, 0, 5, 2, 1);
- x+= stride;
- OBMC_FILTER (x , 0, 2, 4, 0, 2);
- OBMC_FILTER (x+1, 0, 1, 5, 0, 2);
- OBMC_FILTER (x+6, 0, 0, 5, 1, 2);
- OBMC_FILTER (x+7, 0, 0, 4, 2, 2);
+ x = 0;
+ OBMC_FILTER (x , 2, 2, 4, 0, 0);
+ OBMC_FILTER (x + 1, 2, 1, 5, 0, 0);
+ OBMC_FILTER4(x + 2, 2, 1, 5, 0, 0);
+ OBMC_FILTER4(x + 4, 2, 0, 5, 1, 0);
+ OBMC_FILTER (x + 6, 2, 0, 5, 1, 0);
+ OBMC_FILTER (x + 7, 2, 0, 4, 2, 0);
+ x += stride;
+ OBMC_FILTER (x , 1, 2, 5, 0, 0);
+ OBMC_FILTER (x + 1, 1, 2, 5, 0, 0);
+ OBMC_FILTER (x + 6, 1, 0, 5, 2, 0);
+ OBMC_FILTER (x + 7, 1, 0, 5, 2, 0);
+ x += stride;
+ OBMC_FILTER4(x , 1, 2, 5, 0, 0);
+ OBMC_FILTER4(x + 2, 1, 1, 6, 0, 0);
+ OBMC_FILTER4(x + 4, 1, 0, 6, 1, 0);
+ OBMC_FILTER4(x + 6, 1, 0, 5, 2, 0);
+ x += 2 * stride;
+ OBMC_FILTER4(x , 0, 2, 5, 0, 1);
+ OBMC_FILTER4(x + 2, 0, 1, 6, 0, 1);
+ OBMC_FILTER4(x + 4, 0, 0, 6, 1, 1);
+ OBMC_FILTER4(x + 6, 0, 0, 5, 2, 1);
+ x += 2*stride;
+ OBMC_FILTER (x , 0, 2, 5, 0, 1);
+ OBMC_FILTER (x + 1, 0, 2, 5, 0, 1);
+ OBMC_FILTER4(x + 2, 0, 1, 5, 0, 2);
+ OBMC_FILTER4(x + 4, 0, 0, 5, 1, 2);
+ OBMC_FILTER (x + 6, 0, 0, 5, 2, 1);
+ OBMC_FILTER (x + 7, 0, 0, 5, 2, 1);
+ x += stride;
+ OBMC_FILTER (x , 0, 2, 4, 0, 2);
+ OBMC_FILTER (x + 1, 0, 1, 5, 0, 2);
+ OBMC_FILTER (x + 6, 0, 0, 5, 1, 2);
+ OBMC_FILTER (x + 7, 0, 0, 4, 2, 2);
 }
 
 /* obmc for 1 8x8 luma block */
@@ -427,22 +462,21 @@
 uint8_t *dest, uint8_t *src,
 int src_x, int src_y,
 op_pixels_func *pix_op,
- int16_t mv[5][2]/* mid top left right bottom*/)
+ int16_t mv[5][2] /* mid top left right bottom */)
 #define MID 0
 {
 int i;
 uint8_t *ptr[5];
 
- assert(s->quarter_sample==0);
+ assert(s->quarter_sample == 0);
 
- for(i=0; i<5; i++){
- if(i && mv[i][0]==mv[MID][0] && mv[i][1]==mv[MID][1]){
- ptr[i]= ptr[MID];
- }else{
- ptr[i]= s->obmc_scratchpad + 8*(i&1) + s->linesize*8*(i>>1);
- hpel_motion(s, ptr[i], src,
- src_x, src_y,
- pix_op,
+ for (i = 0; i < 5; i++) {
+ if (i && mv[i][0] == mv[MID][0] && mv[i][1] == mv[MID][1]) {
+ ptr[i] = ptr[MID];
+ } else {
+ ptr[i] = s->obmc_scratchpad + 8 * (i & 1) +
+ s->linesize * 8 * (i >> 1);
+ hpel_motion(s, ptr[i], src, src_x, src_y, pix_op,
 mv[i][0], mv[i][1]);
 }
 }
@@ -451,92 +485,101 @@
 }
 
 static inline void qpel_motion(MpegEncContext *s,
- uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
- int field_based, int bottom_field, int field_select,
- uint8_t **ref_picture, op_pixels_func (*pix_op)[4],
+ uint8_t *dest_y,
+ uint8_t *dest_cb,
+ uint8_t *dest_cr,
+ int field_based, int bottom_field,
+ int field_select, uint8_t **ref_picture,
+ op_pixels_func (*pix_op)[4],
 qpel_mc_func (*qpix_op)[16],
 int motion_x, int motion_y, int h)
 {
 uint8_t *ptr_y, *ptr_cb, *ptr_cr;
- int dxy, uvdxy, mx, my, src_x, src_y, uvsrc_x, uvsrc_y, v_edge_pos, linesize, uvlinesize;
+ int dxy, uvdxy, mx, my, src_x, src_y, uvsrc_x, uvsrc_y, v_edge_pos;
+ ptrdiff_t linesize, uvlinesize;
+
+ dxy = ((motion_y & 3) << 2) | (motion_x & 3);
 
- dxy = ((motion_y & 3) << 2) | (motion_x & 3);
 src_x = s->mb_x * 16 + (motion_x >> 2);
 src_y = s->mb_y * (16 >> field_based) + (motion_y >> 2);
 
 v_edge_pos = s->v_edge_pos >> field_based;
- linesize = s->linesize << field_based;
+ linesize = s->linesize << field_based;
 uvlinesize = s->uvlinesize << field_based;
 
- if(field_based){
- mx= motion_x/2;
- my= motion_y>>1;
- }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA2){
- static const int rtab[8]= {0,0,1,1,0,0,0,1};
- mx= (motion_x>>1) + rtab[motion_x&7];
- my= (motion_y>>1) + rtab[motion_y&7];
- }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA){
- mx= (motion_x>>1)|(motion_x&1);
- my= (motion_y>>1)|(motion_y&1);
- }else{
- mx= motion_x/2;
- my= motion_y/2;
+ if (field_based) {
+ mx = motion_x / 2;
+ my = motion_y >> 1;
+ } else if (s->workaround_bugs & FF_BUG_QPEL_CHROMA2) {
+ static const int rtab[8] = { 0, 0, 1, 1, 0, 0, 0, 1 };
+ mx = (motion_x >> 1) + rtab[motion_x & 7];
+ my = (motion_y >> 1) + rtab[motion_y & 7];
+ } else if (s->workaround_bugs & FF_BUG_QPEL_CHROMA) {
+ mx = (motion_x >> 1) | (motion_x & 1);
+ my = (motion_y >> 1) | (motion_y & 1);
+ } else {
+ mx = motion_x / 2;
+ my = motion_y / 2;
 }
- mx= (mx>>1)|(mx&1);
- my= (my>>1)|(my&1);
+ mx = (mx >> 1) | (mx & 1);
+ my = (my >> 1) | (my & 1);
 
- uvdxy= (mx&1) | ((my&1)<<1);
- mx>>=1;
- my>>=1;
+ uvdxy = (mx & 1) | ((my & 1) << 1);
+ mx >>= 1;
+ my >>= 1;
 
 uvsrc_x = s->mb_x * 8 + mx;
 uvsrc_y = s->mb_y * (8 >> field_based) + my;
 
- ptr_y = ref_picture[0] + src_y * linesize + src_x;
+ ptr_y = ref_picture[0] + src_y * linesize + src_x;
 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x;
 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x;
 
- 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, ptr_y, 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, ptr_cb, 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, ptr_cr, s->uvlinesize,
- 9, 9 + field_based,
- uvsrc_x, uvsrc_y<<field_based,
- s->h_edge_pos>>1, s->v_edge_pos>>1);
- ptr_cb= uvbuf;
- ptr_cr= uvbuf + 16;
+ 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, 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, 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, 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);
+ ptr_cb = uvbuf;
+ ptr_cr = uvbuf + 16;
 }
 }
 
- if(!field_based)
+ if (!field_based)
 qpix_op[0][dxy](dest_y, ptr_y, linesize);
- else{
- if(bottom_field){
- dest_y += s->linesize;
- dest_cb+= s->uvlinesize;
- dest_cr+= s->uvlinesize;
+ else {
+ if (bottom_field) {
+ dest_y += s->linesize;
+ dest_cb += s->uvlinesize;
+ dest_cr += s->uvlinesize;
 }
 
- if(field_select){
+ if (field_select) {
 ptr_y += s->linesize;
 ptr_cb += s->uvlinesize;
 ptr_cr += s->uvlinesize;
 }
- //damn interlaced mode
- //FIXME boundary mirroring is not exactly correct here
- qpix_op[1][dxy](dest_y , ptr_y , linesize);
- qpix_op[1][dxy](dest_y+8, ptr_y+8, linesize);
+ // damn interlaced mode
+ // FIXME boundary mirroring is not exactly correct here
+ qpix_op[1][dxy](dest_y, ptr_y, linesize);
+ qpix_op[1][dxy](dest_y + 8, ptr_y + 8, linesize);
 }
- if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
+ if (!CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
 pix_op[1][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> 1);
 pix_op[1][uvdxy](dest_cb, ptr_cb, uvlinesize, h >> 1);
 }
@@ -551,15 +594,16 @@
 op_pixels_func *pix_op,
 int mx, int my)
 {
- int dxy, emu=0, src_x, src_y, offset;
 uint8_t *ptr;
+ int src_x, src_y, dxy, emu = 0;
+ ptrdiff_t offset;
 
 /* In case of 8X8, we construct a single chroma motion vector
- with a special rounding */
- mx= ff_h263_round_chroma(mx);
- my= ff_h263_round_chroma(my);
+ * with a special rounding */
+ mx = ff_h263_round_chroma(mx);
+ my = ff_h263_round_chroma(my);
 
- dxy = ((my & 1) << 1) | (mx & 1);
+ dxy = ((my & 1) << 1) | (mx & 1);
 mx >>= 1;
 my >>= 1;
 
@@ -573,39 +617,200 @@
 dxy &= ~2;
 
 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, 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;
- }
+ ptr = ref_picture[1] + offset;
+ 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, ptr, s->uvlinesize,
- 9, 9, src_x, src_y,
- s->h_edge_pos>>1, s->v_edge_pos>>1);
- ptr= s->edge_emu_buffer;
+ if (emu) {
+ 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[dxy](dest_cr, ptr, s->uvlinesize, 8);
 }
 
-static inline void prefetch_motion(MpegEncContext *s, uint8_t **pix, int dir){
+static inline void prefetch_motion(MpegEncContext *s, uint8_t **pix, int dir)
+{
 /* fetch pixels for estimated mv 4 macroblocks ahead
 * optimized for 64byte cache lines */
 const int shift = s->quarter_sample ? 2 : 1;
- const int mx= (s->mv[dir][0][0]>>shift) + 16*s->mb_x + 8;
- const int my= (s->mv[dir][0][1]>>shift) + 16*s->mb_y;
- int off= mx + (my + (s->mb_x&3)*4)*s->linesize + 64;
- s->vdsp.prefetch(pix[0]+off, s->linesize, 4);
- off= (mx>>1) + ((my>>1) + (s->mb_x&7))*s->uvlinesize + 64;
- s->vdsp.prefetch(pix[1]+off, pix[2]-pix[1], 2);
+ const int mx = (s->mv[dir][0][0] >> shift) + 16 * s->mb_x + 8;
+ const int my = (s->mv[dir][0][1] >> shift) + 16 * s->mb_y;
+ int off = mx + (my + (s->mb_x & 3) * 4) * s->linesize + 64;
+
+ s->vdsp.prefetch(pix[0] + off, s->linesize, 4);
+ off = (mx >> 1) + ((my >> 1) + (s->mb_x & 7)) * s->uvlinesize + 64;
+ s->vdsp.prefetch(pix[1] + off, pix[2] - pix[1], 2);
+}
+
+static inline void apply_obmc(MpegEncContext *s,
+ uint8_t *dest_y,
+ uint8_t *dest_cb,
+ uint8_t *dest_cr,
+ uint8_t **ref_picture,
+ op_pixels_func (*pix_op)[4])
+{
+ LOCAL_ALIGNED_8(int16_t, mv_cache, [4], [4][2]);
+ Picture *cur_frame = &s->current_picture;
+ int mb_x = s->mb_x;
+ int mb_y = s->mb_y;
+ const int xy = mb_x + mb_y * s->mb_stride;
+ const int mot_stride = s->b8_stride;
+ const int mot_xy = mb_x * 2 + mb_y * 2 * mot_stride;
+ int mx, my, i;
+
+ assert(!s->mb_skipped);
+
+ AV_COPY32(mv_cache[1][1], cur_frame->motion_val[0][mot_xy]);
+ AV_COPY32(mv_cache[1][2], cur_frame->motion_val[0][mot_xy + 1]);
+
+ AV_COPY32(mv_cache[2][1],
+ cur_frame->motion_val[0][mot_xy + mot_stride]);
+ AV_COPY32(mv_cache[2][2],
+ cur_frame->motion_val[0][mot_xy + mot_stride + 1]);
+
+ AV_COPY32(mv_cache[3][1],
+ cur_frame->motion_val[0][mot_xy + mot_stride]);
+ AV_COPY32(mv_cache[3][2],
+ cur_frame->motion_val[0][mot_xy + mot_stride + 1]);
+
+ if (mb_y == 0 || IS_INTRA(cur_frame->mb_type[xy - s->mb_stride])) {
+ AV_COPY32(mv_cache[0][1], mv_cache[1][1]);
+ AV_COPY32(mv_cache[0][2], mv_cache[1][2]);
+ } else {
+ AV_COPY32(mv_cache[0][1],
+ cur_frame->motion_val[0][mot_xy - mot_stride]);
+ AV_COPY32(mv_cache[0][2],
+ cur_frame->motion_val[0][mot_xy - mot_stride + 1]);
+ }
+
+ if (mb_x == 0 || IS_INTRA(cur_frame->mb_type[xy - 1])) {
+ AV_COPY32(mv_cache[1][0], mv_cache[1][1]);
+ AV_COPY32(mv_cache[2][0], mv_cache[2][1]);
+ } else {
+ AV_COPY32(mv_cache[1][0], cur_frame->motion_val[0][mot_xy - 1]);
+ AV_COPY32(mv_cache[2][0],
+ cur_frame->motion_val[0][mot_xy - 1 + mot_stride]);
+ }
+
+ if (mb_x + 1 >= s->mb_width || IS_INTRA(cur_frame->mb_type[xy + 1])) {
+ AV_COPY32(mv_cache[1][3], mv_cache[1][2]);
+ AV_COPY32(mv_cache[2][3], mv_cache[2][2]);
+ } else {
+ AV_COPY32(mv_cache[1][3], cur_frame->motion_val[0][mot_xy + 2]);
+ AV_COPY32(mv_cache[2][3],
+ cur_frame->motion_val[0][mot_xy + 2 + mot_stride]);
+ }
+
+ mx = 0;
+ my = 0;
+ for (i = 0; i < 4; i++) {
+ const int x = (i & 1) + 1;
+ const int y = (i >> 1) + 1;
+ int16_t mv[5][2] = {
+ { mv_cache[y][x][0], mv_cache[y][x][1] },
+ { mv_cache[y - 1][x][0], mv_cache[y - 1][x][1] },
+ { mv_cache[y][x - 1][0], mv_cache[y][x - 1][1] },
+ { mv_cache[y][x + 1][0], mv_cache[y][x + 1][1] },
+ { mv_cache[y + 1][x][0], mv_cache[y + 1][x][1] }
+ };
+ // FIXME cleanup
+ obmc_motion(s, dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize,
+ ref_picture[0],
+ mb_x * 16 + (i & 1) * 8, mb_y * 16 + (i >> 1) * 8,
+ pix_op[1],
+ mv);
+
+ mx += mv[0][0];
+ my += mv[0][1];
+ }
+ if (!CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY))
+ chroma_4mv_motion(s, dest_cb, dest_cr,
+ ref_picture, pix_op[1],
+ mx, my);
+}
+
+static inline void apply_8x8(MpegEncContext *s,
+ uint8_t *dest_y,
+ uint8_t *dest_cb,
+ uint8_t *dest_cr,
+ int dir,
+ uint8_t **ref_picture,
+ qpel_mc_func (*qpix_op)[16],
+ op_pixels_func (*pix_op)[4])
+{
+ int dxy, mx, my, src_x, src_y;
+ int i;
+ int mb_x = s->mb_x;
+ int mb_y = s->mb_y;
+ uint8_t *ptr, *dest;
+
+ mx = 0;
+ my = 0;
+ if (s->quarter_sample) {
+ for (i = 0; i < 4; i++) {
+ int motion_x = s->mv[dir][i][0];
+ int motion_y = s->mv[dir][i][1];
+
+ dxy = ((motion_y & 3) << 2) | (motion_x & 3);
+ src_x = mb_x * 16 + (motion_x >> 2) + (i & 1) * 8;
+ src_y = mb_y * 16 + (motion_y >> 2) + (i >> 1) * 8;
+
+ /* WARNING: do no forget half pels */
+ src_x = av_clip(src_x, -16, s->width);
+ if (src_x == s->width)
+ dxy &= ~3;
+ src_y = av_clip(src_y, -16, s->height);
+ if (src_y == s->height)
+ dxy &= ~12;
+
+ ptr = ref_picture[0] + (src_y * s->linesize) + (src_x);
+ 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);
+
+ mx += s->mv[dir][i][0] / 2;
+ my += s->mv[dir][i][1] / 2;
+ }
+ } else {
+ for (i = 0; i < 4; i++) {
+ hpel_motion(s,
+ dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize,
+ ref_picture[0],
+ mb_x * 16 + (i & 1) * 8,
+ mb_y * 16 + (i >> 1) * 8,
+ pix_op[1],
+ s->mv[dir][i][0],
+ s->mv[dir][i][1]);
+
+ mx += s->mv[dir][i][0];
+ my += s->mv[dir][i][1];
+ }
+ }
+
+ if (!CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY))
+ chroma_4mv_motion(s, dest_cb, dest_cr,
+ ref_picture, pix_op[1], mx, my);
 }
 
 /**
@@ -621,101 +826,36 @@
 * the motion vectors are taken from s->mv and the MV type from s->mv_type
 */
 static av_always_inline void MPV_motion_internal(MpegEncContext *s,
- uint8_t *dest_y, uint8_t *dest_cb,
- uint8_t *dest_cr, int dir,
- uint8_t **ref_picture,
- op_pixels_func (*pix_op)[4],
- qpel_mc_func (*qpix_op)[16], int is_mpeg12)
+ uint8_t *dest_y,
+ uint8_t *dest_cb,
+ uint8_t *dest_cr,
+ int dir,
+ uint8_t **ref_picture,
+ op_pixels_func (*pix_op)[4],
+ qpel_mc_func (*qpix_op)[16],
+ int is_mpeg12)
 {
- int dxy, mx, my, src_x, src_y, motion_x, motion_y;
- int mb_x, mb_y, i;
- uint8_t *ptr, *dest;
-
- mb_x = s->mb_x;
- mb_y = s->mb_y;
+ int i;
+ int mb_y = s->mb_y;
 
 prefetch_motion(s, ref_picture, dir);
 
- if(!is_mpeg12 && s->obmc && s->pict_type != AV_PICTURE_TYPE_B){
- LOCAL_ALIGNED_8(int16_t, mv_cache, [4], [4][2]);
- AVFrame *cur_frame = &s->current_picture.f;
- const int xy= s->mb_x + s->mb_y*s->mb_stride;
- const int mot_stride= s->b8_stride;
- const int mot_xy= mb_x*2 + mb_y*2*mot_stride;
-
- assert(!s->mb_skipped);
-
- AV_COPY32(mv_cache[1][1], cur_frame->motion_val[0][mot_xy ]);
- AV_COPY32(mv_cache[1][2], cur_frame->motion_val[0][mot_xy + 1]);
-
- AV_COPY32(mv_cache[2][1], cur_frame->motion_val[0][mot_xy + mot_stride ]);
- AV_COPY32(mv_cache[2][2], cur_frame->motion_val[0][mot_xy + mot_stride + 1]);
-
- AV_COPY32(mv_cache[3][1], cur_frame->motion_val[0][mot_xy + mot_stride ]);
- AV_COPY32(mv_cache[3][2], cur_frame->motion_val[0][mot_xy + mot_stride + 1]);
-
- if (mb_y == 0 || IS_INTRA(cur_frame->mb_type[xy - s->mb_stride])) {
- AV_COPY32(mv_cache[0][1], mv_cache[1][1]);
- AV_COPY32(mv_cache[0][2], mv_cache[1][2]);
- }else{
- AV_COPY32(mv_cache[0][1], cur_frame->motion_val[0][mot_xy - mot_stride ]);
- AV_COPY32(mv_cache[0][2], cur_frame->motion_val[0][mot_xy - mot_stride + 1]);
- }
-
- if (mb_x == 0 || IS_INTRA(cur_frame->mb_type[xy - 1])) {
- AV_COPY32(mv_cache[1][0], mv_cache[1][1]);
- AV_COPY32(mv_cache[2][0], mv_cache[2][1]);
- }else{
- AV_COPY32(mv_cache[1][0], cur_frame->motion_val[0][mot_xy - 1]);
- AV_COPY32(mv_cache[2][0], cur_frame->motion_val[0][mot_xy - 1 + mot_stride]);
- }
-
- if (mb_x + 1 >= s->mb_width || IS_INTRA(cur_frame->mb_type[xy + 1])) {
- AV_COPY32(mv_cache[1][3], mv_cache[1][2]);
- AV_COPY32(mv_cache[2][3], mv_cache[2][2]);
- }else{
- AV_COPY32(mv_cache[1][3], cur_frame->motion_val[0][mot_xy + 2]);
- AV_COPY32(mv_cache[2][3], cur_frame->motion_val[0][mot_xy + 2 + mot_stride]);
- }
-
- mx = 0;
- my = 0;
- for(i=0;i<4;i++) {
- const int x= (i&1)+1;
- const int y= (i>>1)+1;
- int16_t mv[5][2]= {
- {mv_cache[y][x ][0], mv_cache[y][x ][1]},
- {mv_cache[y-1][x][0], mv_cache[y-1][x][1]},
- {mv_cache[y][x-1][0], mv_cache[y][x-1][1]},
- {mv_cache[y][x+1][0], mv_cache[y][x+1][1]},
- {mv_cache[y+1][x][0], mv_cache[y+1][x][1]}};
- //FIXME cleanup
- obmc_motion(s, dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize,
- ref_picture[0],
- mb_x * 16 + (i & 1) * 8, mb_y * 16 + (i >>1) * 8,
- pix_op[1],
- mv);
-
- mx += mv[0][0];
- my += mv[0][1];
- }
- if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY))
- chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my);
-
+ if (!is_mpeg12 && s->obmc && s->pict_type != AV_PICTURE_TYPE_B) {
+ apply_obmc(s, dest_y, dest_cb, dest_cr, ref_picture, pix_op);
 return;
 }
 
- switch(s->mv_type) {
+ switch (s->mv_type) {
 case MV_TYPE_16X16:
- if(s->mcsel){
- if(s->real_sprite_warping_points==1){
+ if (s->mcsel) {
+ if (s->real_sprite_warping_points == 1) {
 gmc1_motion(s, dest_y, dest_cb, dest_cr,
 ref_picture);
- }else{
+ } else {
 gmc_motion(s, dest_y, dest_cb, dest_cr,
- ref_picture);
+ ref_picture);
 }
- }else if(!is_mpeg12 && s->quarter_sample){
+ } else if (!is_mpeg12 && s->quarter_sample) {
 qpel_motion(s, dest_y, dest_cb, dest_cr,
 0, 0, 0,
 ref_picture, pix_op, qpix_op,
@@ -723,80 +863,28 @@
 } else if (!is_mpeg12 && (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER) &&
 s->mspel && s->codec_id == AV_CODEC_ID_WMV2) {
 ff_mspel_motion(s, dest_y, dest_cb, dest_cr,
- ref_picture, pix_op,
- s->mv[dir][0][0], s->mv[dir][0][1], 16);
- }else
- {
+ ref_picture, pix_op,
+ s->mv[dir][0][0], s->mv[dir][0][1], 16);
+ } else {
 mpeg_motion(s, dest_y, dest_cb, dest_cr, 0,
 ref_picture, pix_op,
 s->mv[dir][0][0], s->mv[dir][0][1], 16, mb_y);
 }
 break;
 case MV_TYPE_8X8:
- if (!is_mpeg12) {
- mx = 0;
- my = 0;
- if(s->quarter_sample){
- for(i=0;i<4;i++) {
- motion_x = s->mv[dir][i][0];
- motion_y = s->mv[dir][i][1];
-
- dxy = ((motion_y & 3) << 2) | (motion_x & 3);
- src_x = mb_x * 16 + (motion_x >> 2) + (i & 1) * 8;
- src_y = mb_y * 16 + (motion_y >> 2) + (i >>1) * 8;
-
- /* WARNING: do no forget half pels */
- src_x = av_clip(src_x, -16, s->width);
- if (src_x == s->width)
- dxy &= ~3;
- src_y = av_clip(src_y, -16, s->height);
- if (src_y == s->height)
- 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, ptr,
- 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);
-
- mx += s->mv[dir][i][0]/2;
- my += s->mv[dir][i][1]/2;
- }
- }else{
- for(i=0;i<4;i++) {
- hpel_motion(s, dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize,
- ref_picture[0],
- mb_x * 16 + (i & 1) * 8, mb_y * 16 + (i >>1) * 8,
- pix_op[1],
- s->mv[dir][i][0], s->mv[dir][i][1]);
-
- mx += s->mv[dir][i][0];
- my += s->mv[dir][i][1];
- }
- }
-
- if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY))
- chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my);
- }
+ if (!is_mpeg12)
+ apply_8x8(s, dest_y, dest_cb, dest_cr,
+ dir, ref_picture, qpix_op, pix_op);
 break;
 case MV_TYPE_FIELD:
 if (s->picture_structure == PICT_FRAME) {
- if(!is_mpeg12 && s->quarter_sample){
- for(i=0; i<2; i++){
+ if (!is_mpeg12 && s->quarter_sample) {
+ for (i = 0; i < 2; i++)
 qpel_motion(s, dest_y, dest_cb, dest_cr,
 1, i, s->field_select[dir][i],
 ref_picture, pix_op, qpix_op,
 s->mv[dir][i][0], s->mv[dir][i][1], 8);
- }
- }else{
+ } else {
 /* top field */
 mpeg_motion_field(s, dest_y, dest_cb, dest_cr,
 0, s->field_select[dir][0],
@@ -809,66 +897,69 @@
 s->mv[dir][1][0], s->mv[dir][1][1], 8, mb_y);
 }
 } else {
- if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != AV_PICTURE_TYPE_B && !s->first_field){
+ if (s->picture_structure != s->field_select[dir][0] + 1 &&
+ s->pict_type != AV_PICTURE_TYPE_B && !s->first_field) {
 ref_picture = s->current_picture_ptr->f.data;
 }
 
 mpeg_motion(s, dest_y, dest_cb, dest_cr,
 s->field_select[dir][0],
 ref_picture, pix_op,
- s->mv[dir][0][0], s->mv[dir][0][1], 16, mb_y>>1);
+ s->mv[dir][0][0], s->mv[dir][0][1], 16, mb_y >> 1);
 }
 break;
 case MV_TYPE_16X8:
- for(i=0; i<2; i++){
- uint8_t ** ref2picture;
+ for (i = 0; i < 2; i++) {
+ uint8_t **ref2picture;
 
- if(s->picture_structure == s->field_select[dir][i] + 1
- || s->pict_type == AV_PICTURE_TYPE_B || s->first_field){
- ref2picture= ref_picture;
- }else{
+ if (s->picture_structure == s->field_select[dir][i] + 1
+ || s->pict_type == AV_PICTURE_TYPE_B || s->first_field) {
+ ref2picture = ref_picture;
+ } else {
 ref2picture = s->current_picture_ptr->f.data;
 }
 
 mpeg_motion(s, dest_y, dest_cb, dest_cr,
 s->field_select[dir][i],
 ref2picture, pix_op,
- s->mv[dir][i][0], s->mv[dir][i][1] + 16*i, 8, mb_y>>1);
+ s->mv[dir][i][0], s->mv[dir][i][1] + 16 * i,
+ 8, mb_y >> 1);
 
- dest_y += 16*s->linesize;
- dest_cb+= (16>>s->chroma_y_shift)*s->uvlinesize;
- dest_cr+= (16>>s->chroma_y_shift)*s->uvlinesize;
+ dest_y += 16 * s->linesize;
+ dest_cb += (16 >> s->chroma_y_shift) * s->uvlinesize;
+ dest_cr += (16 >> s->chroma_y_shift) * s->uvlinesize;
 }
 break;
 case MV_TYPE_DMV:
- if(s->picture_structure == PICT_FRAME){
- for(i=0; i<2; i++){
+ if (s->picture_structure == PICT_FRAME) {
+ for (i = 0; i < 2; i++) {
 int j;
- for(j=0; j<2; j++){
+ for (j = 0; j < 2; j++)
 mpeg_motion_field(s, dest_y, dest_cb, dest_cr,
- j, j^i, ref_picture, pix_op,
- s->mv[dir][2*i + j][0],
- s->mv[dir][2*i + j][1], 8, mb_y);
- }
- pix_op = s->dsp.avg_pixels_tab;
+ j, j ^ i, ref_picture, pix_op,
+ s->mv[dir][2 * i + j][0],
+ s->mv[dir][2 * i + j][1], 8, mb_y);
+ pix_op = s->hdsp.avg_pixels_tab;
 }
- }else{
- for(i=0; i<2; i++){
+ } else {
+ for (i = 0; i < 2; i++) {
 mpeg_motion(s, dest_y, dest_cb, dest_cr,
- s->picture_structure != i+1,
+ s->picture_structure != i + 1,
 ref_picture, pix_op,
- s->mv[dir][2*i][0],s->mv[dir][2*i][1],16, mb_y>>1);
+ s->mv[dir][2 * i][0], s->mv[dir][2 * i][1],
+ 16, mb_y >> 1);
 
 // after put we make avg of the same block
- pix_op=s->dsp.avg_pixels_tab;
+ pix_op = s->hdsp.avg_pixels_tab;
 
- //opposite parity is always in the same frame if this is second field
- if(!s->first_field){
+ /* opposite parity is always in the same frame if this is
+ * second field */
+ if (!s->first_field) {
 ref_picture = s->current_picture_ptr->f.data;
 }
 }
 }
- break;
+ break;
 default: assert(0);
 }
 }
@@ -881,7 +972,7 @@
 qpel_mc_func (*qpix_op)[16])
 {
 #if !CONFIG_SMALL
- if(s->out_format == FMT_MPEG1)
+ if (s->out_format == FMT_MPEG1)
 MPV_motion_internal(s, dest_y, dest_cb, dest_cr, dir,
 ref_picture, pix_op, qpix_op, 1);
 else

libav-v9.6.tar.bz2/libavcodec/mpegvideo_parser.c -> libav-v10.1.tar.bz2/libavcodec/mpegvideo_parser.c Changed

@@ -21,7 +21,8 @@
 */
 
 #include "parser.h"
-#include "mpegvideo.h"
+#include "mpeg12.h"
+#include "internal.h"
 
 struct MpvParseContext {
 ParseContext pc;
@@ -48,7 +49,7 @@
 
 while (buf < buf_end) {
 start_code= -1;
- buf= avpriv_mpv_find_start_code(buf, buf_end, &start_code);
+ buf= avpriv_find_start_code(buf, buf_end, &start_code);
 bytes_left = buf_end - buf;
 switch(start_code) {
 case PICTURE_START_CODE:
@@ -61,7 +62,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;
@@ -89,7 +90,7 @@
 pc->height |=( vert_size_ext << 12);
 avctx->bit_rate += (bit_rate_ext << 18) * 400;
 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;
@@ -113,6 +114,14 @@
 s->repeat_pict = 2;
 }
 }
+
+ if (!pc->progressive_sequence) {
+ if (top_field_first)
+ s->field_order = AV_FIELD_TT;
+ else
+ s->field_order = AV_FIELD_BB;
+ } else
+ s->field_order = AV_FIELD_PROGRESSIVE;
 }
 break;
 }

libav-v9.6.tar.bz2/libavcodec/mpegvideo_xvmc.c -> libav-v10.1.tar.bz2/libavcodec/mpegvideo_xvmc.c Changed

@@ -23,7 +23,6 @@
 #include <X11/extensions/XvMC.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 
 #undef NDEBUG
@@ -31,6 +30,9 @@
 
 #include "xvmc.h"
 #include "xvmc_internal.h"
+#include "version.h"
+
+#if FF_API_XVMC
 
 /**
 * Initialize the block field of the MpegEncContext pointer passed as
@@ -44,7 +46,7 @@
 struct xvmc_pix_fmt *render = (struct xvmc_pix_fmt*)s->current_picture.f.data[2];
 assert(render && render->xvmc_id == AV_XVMC_ID);
 
- s->block = (DCTELEM (*)[64])(render->data_blocks + render->next_free_data_block_num * 64);
+ s->block = (int16_t (*)[64])(render->data_blocks + render->next_free_data_block_num * 64);
 }
 
 /**
@@ -145,7 +147,7 @@
 assert(render);
 
 if (render->filled_mv_blocks_num > 0)
- ff_draw_horiz_band(s, 0, 0);
+ ff_mpeg_draw_horiz_band(s, 0, 0);
 }
 
 /**
@@ -179,7 +181,7 @@
 
 // Do I need to export quant when I could not perform postprocessing?
 // Anyway, it doesn't hurt.
- s->current_picture.f.qscale_table[mb_xy] = s->qscale;
+ s->current_picture.qscale_table[mb_xy] = s->qscale;
 
 // start of XVMC-specific code
 render = (struct xvmc_pix_fmt*)s->current_picture.f.data[2];
@@ -328,5 +330,7 @@
 
 
 if (render->filled_mv_blocks_num == render->allocated_mv_blocks)
- ff_draw_horiz_band(s, 0, 0);
+ ff_mpeg_draw_horiz_band(s, 0, 0);
 }
+
+#endif /* FF_API_XVMC */

libav-v10.1.tar.bz2/libavcodec/mqc.c Added

@@ -0,0 +1,115 @@
+/*
+ * MQ-coder encoder and decoder common functions
+ * Copyright (c) 2007 Kamil Nowosad
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * MQ-coder common (decoder/encoder) functions
+ * @file
+ * @author Kamil Nowosad
+ */
+
+#include <string.h>
+#include <stdint.h>
+
+#include "mqc.h"
+
+/* MQ coder context state structure */
+typedef struct MqcCxState {
+ uint16_t qe;
+ uint8_t nmps;
+ uint8_t nlps;
+ uint8_t sw;
+} MqcCxState;
+
+static const MqcCxState cx_states[47] = {
+ { 0x5601, 1, 1, 1 },
+ { 0x3401, 2, 6, 0 },
+ { 0x1801, 3, 9, 0 },
+ { 0x0AC1, 4, 12, 0 },
+ { 0x0521, 5, 29, 0 },
+ { 0x0221, 38, 33, 0 },
+ { 0x5601, 7, 6, 1 },
+ { 0x5401, 8, 14, 0 },
+ { 0x4801, 9, 14, 0 },
+ { 0x3801, 10, 14, 0 },
+ { 0x3001, 11, 17, 0 },
+ { 0x2401, 12, 18, 0 },
+ { 0x1C01, 13, 20, 0 },
+ { 0x1601, 29, 21, 0 },
+ { 0x5601, 15, 14, 1 },
+ { 0x5401, 16, 14, 0 },
+ { 0x5101, 17, 15, 0 },
+ { 0x4801, 18, 16, 0 },
+ { 0x3801, 19, 17, 0 },
+ { 0x3401, 20, 18, 0 },
+ { 0x3001, 21, 19, 0 },
+ { 0x2801, 22, 19, 0 },
+ { 0x2401, 23, 20, 0 },
+ { 0x2201, 24, 21, 0 },
+ { 0x1C01, 25, 22, 0 },
+ { 0x1801, 26, 23, 0 },
+ { 0x1601, 27, 24, 0 },
+ { 0x1401, 28, 25, 0 },
+ { 0x1201, 29, 26, 0 },
+ { 0x1101, 30, 27, 0 },
+ { 0x0AC1, 31, 28, 0 },
+ { 0x09C1, 32, 29, 0 },
+ { 0x08A1, 33, 30, 0 },
+ { 0x0521, 34, 31, 0 },
+ { 0x0441, 35, 32, 0 },
+ { 0x02A1, 36, 33, 0 },
+ { 0x0221, 37, 34, 0 },
+ { 0x0141, 38, 35, 0 },
+ { 0x0111, 39, 36, 0 },
+ { 0x0085, 40, 37, 0 },
+ { 0x0049, 41, 38, 0 },
+ { 0x0025, 42, 39, 0 },
+ { 0x0015, 43, 40, 0 },
+ { 0x0009, 44, 41, 0 },
+ { 0x0005, 45, 42, 0 },
+ { 0x0001, 45, 43, 0 },
+ { 0x5601, 46, 46, 0 }
+};
+
+uint16_t ff_mqc_qe [2 * 47];
+uint8_t ff_mqc_nlps[2 * 47];
+uint8_t ff_mqc_nmps[2 * 47];
+
+void ff_mqc_init_context_tables(void)
+{
+ int i;
+ for (i = 0; i < 47; i++) {
+ ff_mqc_qe[2 * i] =
+ ff_mqc_qe[2 * i + 1] = cx_states[i].qe;
+
+ ff_mqc_nlps[2 * i] = 2 * cx_states[i].nlps + cx_states[i].sw;
+ ff_mqc_nlps[2 * i + 1] = 2 * cx_states[i].nlps + 1 - cx_states[i].sw;
+ ff_mqc_nmps[2 * i] = 2 * cx_states[i].nmps;
+ ff_mqc_nmps[2 * i + 1] = 2 * cx_states[i].nmps + 1;
+ }
+}
+
+void ff_mqc_init_contexts(MqcState *mqc)
+{
+ memset(mqc->cx_states, 0, sizeof(mqc->cx_states));
+ mqc->cx_states[MQC_CX_UNI] = 2 * 46;
+ mqc->cx_states[MQC_CX_RL] = 2 * 3;
+ mqc->cx_states[0] = 2 * 4;
+}

libav-v10.1.tar.bz2/libavcodec/mqc.h Added

@@ -0,0 +1,78 @@
+/*
+ * MQ-coder: structures, common and decoder functions
+ * Copyright (c) 2007 Kamil Nowosad
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_MQC_H
+#define AVCODEC_MQC_H
+
+/**
+ * MQ-coder
+ * @file
+ * @author Kamil Nowosad
+ */
+
+#include <stdint.h>
+
+#define MQC_CX_UNI 17
+#define MQC_CX_RL 18
+
+extern uint16_t ff_mqc_qe[2 * 47];
+extern uint8_t ff_mqc_nlps[2 * 47];
+extern uint8_t ff_mqc_nmps[2 * 47];
+
+typedef struct MqcState {
+ uint8_t *bp, *bpstart;
+ unsigned int a;
+ unsigned int c;
+ unsigned int ct;
+ uint8_t cx_states[19];
+} MqcState;
+
+/* decoder */
+
+/**
+ * Initialize MQ-decoder.
+ * @param mqc MQ decoder state
+ * @param bp byte poiter
+ */
+void ff_mqc_initdec(MqcState *mqc, uint8_t *bp);
+
+/**
+ * MQ decoder.
+ * @param mqc MQ decoder state
+ * @param cxstate Context
+ * @return Decision (0 ot 1)
+ */
+int ff_mqc_decode(MqcState *mqc, uint8_t *cxstate);
+
+/* common */
+
+/**
+ * MQ-coder Initialize context tables (QE, NLPS, NMPS)
+ */
+void ff_mqc_init_context_tables(void);
+
+/**
+ * MQ-coder context initialisations.
+ * @param mqc MQ-coder context
+ */
+void ff_mqc_init_contexts(MqcState *mqc);
+
+#endif /* AVCODEC_MQC_H */

libav-v10.1.tar.bz2/libavcodec/mqcdec.c Added

@@ -0,0 +1,93 @@
+/*
+ * MQ-coder decoder
+ * Copyright (c) 2007 Kamil Nowosad
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * MQ-coder decoder
+ * @file
+ * @author Kamil Nowosad
+ */
+
+#include "mqc.h"
+
+static void bytein(MqcState *mqc)
+{
+ if (*mqc->bp == 0xff) {
+ if (*(mqc->bp + 1) > 0x8f)
+ mqc->c++;
+ else {
+ mqc->bp++;
+ mqc->c += 2 + 0xfe00 - (*mqc->bp << 9);
+ }
+ } else {
+ mqc->bp++;
+ mqc->c += 1 + 0xff00 - (*mqc->bp << 8);
+ }
+}
+
+static int exchange(MqcState *mqc, uint8_t *cxstate, int lps)
+{
+ int d;
+ if ((mqc->a < ff_mqc_qe[*cxstate]) ^ (!lps)) {
+ if (lps)
+ mqc->a = ff_mqc_qe[*cxstate];
+ d = *cxstate & 1;
+ *cxstate = ff_mqc_nmps[*cxstate];
+ } else {
+ if (lps)
+ mqc->a = ff_mqc_qe[*cxstate];
+ d = 1 - (*cxstate & 1);
+ *cxstate = ff_mqc_nlps[*cxstate];
+ }
+ // do RENORMD: see ISO/IEC 15444-1:2002 §C.3.3
+ do {
+ if (!(mqc->c & 0xff)) {
+ mqc->c -= 0x100;
+ bytein(mqc);
+ }
+ mqc->a += mqc->a;
+ mqc->c += mqc->c;
+ } while (!(mqc->a & 0x8000));
+ return d;
+}
+
+void ff_mqc_initdec(MqcState *mqc, uint8_t *bp)
+{
+ ff_mqc_init_contexts(mqc);
+ mqc->bp = bp;
+ mqc->c = (*mqc->bp ^ 0xff) << 16;
+ bytein(mqc);
+ mqc->c = mqc->c << 7;
+ mqc->a = 0x8000;
+}
+
+int ff_mqc_decode(MqcState *mqc, uint8_t *cxstate)
+{
+ mqc->a -= ff_mqc_qe[*cxstate];
+ if ((mqc->c >> 16) < mqc->a) {
+ if (mqc->a & 0x8000)
+ return *cxstate & 1;
+ else
+ return exchange(mqc, cxstate, 0);
+ } else {
+ mqc->c -= mqc->a << 16;
+ return exchange(mqc, cxstate, 1);
+ }
+}

libav-v9.6.tar.bz2/libavcodec/msgsmdec.c -> libav-v10.1.tar.bz2/libavcodec/msgsmdec.c Changed

libav-v9.6.tar.bz2/libavcodec/msgsmdec.h -> libav-v10.1.tar.bz2/libavcodec/msgsmdec.h Changed

libav-v9.6.tar.bz2/libavcodec/msmpeg4.c -> libav-v10.1.tar.bz2/libavcodec/msmpeg4.c Changed

@@ -44,16 +44,6 @@
 * - (encoding) select best mv table (two choices)
 * - (encoding) select best vlc/dc table
 */
-//#define DEBUG
-
-#define DC_VLC_BITS 9
-#define V2_INTRA_CBPC_VLC_BITS 3
-#define V2_MB_TYPE_VLC_BITS 7
-#define MV_VLC_BITS 9
-#define V2_MV_VLC_BITS 9
-#define TEX_VLC_BITS 9
-
-#define DEFAULT_INTER_INDEX 3
 
 /* This table is practically identical to the one from h263
 * except that it is inverted. */
@@ -187,21 +177,6 @@
 return pred;
 }
 
-static inline int msmpeg4v1_pred_dc(MpegEncContext * s, int n,
- int32_t **dc_val_ptr)
-{
- int i;
-
- if (n < 4) {
- i= 0;
- } else {
- i= n-3;
- }
-
- *dc_val_ptr= &s->last_dc[i];
- return s->last_dc[i];
-}
-
 static int get_dc(uint8_t *src, int stride, int scale)
 {
 int y;
@@ -267,10 +242,7 @@
 : "%eax", "%edx"
 );
 #else
- /* #elif ARCH_ALPHA */
- /* Divisions are extremely costly on Alpha; optimize the most
- common case. But they are costly everywhere...
- */
+ /* Divisions are costly everywhere; optimize the most common case. */
 if (scale == 8) {
 a = (a + (8 >> 1)) / 8;
 b = (b + (8 >> 1)) / 8;
@@ -363,898 +335,3 @@
 return pred;
 }
 
-/****************************************/
-/* decoding stuff */
-
-VLC ff_mb_non_intra_vlc[4];
-static VLC v2_dc_lum_vlc;
-static VLC v2_dc_chroma_vlc;
-static VLC v2_intra_cbpc_vlc;
-static VLC v2_mb_type_vlc;
-static VLC v2_mv_vlc;
-VLC ff_inter_intra_vlc;
-
-/* This is identical to h263 except that its range is multiplied by 2. */
-static int msmpeg4v2_decode_motion(MpegEncContext * s, int pred, int f_code)
-{
- int code, val, sign, shift;
-
- code = get_vlc2(&s->gb, v2_mv_vlc.table, V2_MV_VLC_BITS, 2);
- av_dlog(s, "MV code %d at %d %d pred: %d\n", code, s->mb_x,s->mb_y, pred);
- if (code < 0)
- return 0xffff;
-
- if (code == 0)
- return pred;
- sign = get_bits1(&s->gb);
- shift = f_code - 1;
- val = code;
- if (shift) {
- val = (val - 1) << shift;
- val |= get_bits(&s->gb, shift);
- val++;
- }
- if (sign)
- val = -val;
-
- val += pred;
- if (val <= -64)
- val += 64;
- else if (val >= 64)
- val -= 64;
-
- return val;
-}
-
-static int msmpeg4v12_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
-{
- int cbp, code, i;
-
- if (s->pict_type == AV_PICTURE_TYPE_P) {
- if (s->use_skip_mb_code) {
- if (get_bits1(&s->gb)) {
- /* skip mb */
- s->mb_intra = 0;
- 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->mb_skipped = 1;
- return 0;
- }
- }
-
- if(s->msmpeg4_version==2)
- code = get_vlc2(&s->gb, v2_mb_type_vlc.table, V2_MB_TYPE_VLC_BITS, 1);
- else
- code = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2);
- if(code<0 || code>7){
- av_log(s->avctx, AV_LOG_ERROR, "cbpc %d invalid at %d %d\n", code, s->mb_x, s->mb_y);
- return -1;
- }
-
- s->mb_intra = code >>2;
-
- cbp = code & 0x3;
- } else {
- s->mb_intra = 1;
- if(s->msmpeg4_version==2)
- cbp= get_vlc2(&s->gb, v2_intra_cbpc_vlc.table, V2_INTRA_CBPC_VLC_BITS, 1);
- else
- cbp= get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 1);
- if(cbp<0 || cbp>3){
- av_log(s->avctx, AV_LOG_ERROR, "cbpc %d invalid at %d %d\n", cbp, s->mb_x, s->mb_y);
- return -1;
- }
- }
-
- if (!s->mb_intra) {
- int mx, my, cbpy;
-
- 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 %d invalid at %d %d\n", cbp, s->mb_x, s->mb_y);
- return -1;
- }
-
- cbp|= cbpy<<2;
- if(s->msmpeg4_version==1 || (cbp&3) != 3) cbp^= 0x3C;
-
- ff_h263_pred_motion(s, 0, 0, &mx, &my);
- mx= msmpeg4v2_decode_motion(s, mx, 1);
- my= msmpeg4v2_decode_motion(s, my, 1);
-
- s->mv_dir = MV_DIR_FORWARD;
- s->mv_type = MV_TYPE_16X16;
- s->mv[0][0][0] = mx;
- s->mv[0][0][1] = my;
- } else {
- if(s->msmpeg4_version==2){
- s->ac_pred = get_bits1(&s->gb);
- cbp|= get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1)<<2; //FIXME check errors
- } else{
- s->ac_pred = 0;
- cbp|= get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1)<<2; //FIXME check errors
- if(s->pict_type==AV_PICTURE_TYPE_P) cbp^=0x3C;
- }
- }
-
- s->dsp.clear_blocks(s->block[0]);
- for (i = 0; i < 6; i++) {
- if (ff_msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0)
- {
- av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding block: %d x %d (%d)\n", s->mb_x, s->mb_y, i);
- return -1;
- }
- }
- return 0;
-}
-
-static int msmpeg4v34_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
-{
- int cbp, code, i;
- uint8_t *coded_val;
- uint32_t * const mb_type_ptr = &s->current_picture.f.mb_type[s->mb_x + s->mb_y*s->mb_stride];
-
- if (s->pict_type == AV_PICTURE_TYPE_P) {
- if (s->use_skip_mb_code) {
- if (get_bits1(&s->gb)) {
- /* skip mb */
- s->mb_intra = 0;
- 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->mb_skipped = 1;
- *mb_type_ptr = MB_TYPE_SKIP | MB_TYPE_L0 | MB_TYPE_16x16;
-
- return 0;
- }
- }
-
- code = get_vlc2(&s->gb, ff_mb_non_intra_vlc[DEFAULT_INTER_INDEX].table, MB_NON_INTRA_VLC_BITS, 3);
- if (code < 0)
- return -1;
- //s->mb_intra = (code & 0x40) ? 0 : 1;
- s->mb_intra = (~code & 0x40) >> 6;
-
- cbp = code & 0x3f;
- } else {
- s->mb_intra = 1;
- code = get_vlc2(&s->gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2);
- if (code < 0)
- return -1;
- /* predict coded block pattern */
- cbp = 0;
- for(i=0;i<6;i++) {
- int val = ((code >> (5 - i)) & 1);
- if (i < 4) {
- int pred = ff_msmpeg4_coded_block_pred(s, i, &coded_val);
- val = val ^ pred;
- *coded_val = val;
- }
- cbp |= val << (5 - i);
- }
- }
-
- if (!s->mb_intra) {
- int mx, my;
- if(s->per_mb_rl_table && cbp){
- s->rl_table_index = decode012(&s->gb);
- s->rl_chroma_table_index = s->rl_table_index;
- }
- ff_h263_pred_motion(s, 0, 0, &mx, &my);
- if (ff_msmpeg4_decode_motion(s, &mx, &my) < 0)
- return -1;
- s->mv_dir = MV_DIR_FORWARD;
- s->mv_type = MV_TYPE_16X16;
- s->mv[0][0][0] = mx;
- s->mv[0][0][1] = my;
- *mb_type_ptr = MB_TYPE_L0 | MB_TYPE_16x16;
- } else {
- av_dlog(s, "I at %d %d %d %06X\n", s->mb_x, s->mb_y,
- ((cbp & 3) ? 1 : 0) +((cbp & 0x3C)? 2 : 0),
- show_bits(&s->gb, 24));
- s->ac_pred = get_bits1(&s->gb);
- *mb_type_ptr = MB_TYPE_INTRA;
- if(s->inter_intra_pred){
- s->h263_aic_dir= get_vlc2(&s->gb, ff_inter_intra_vlc.table, INTER_INTRA_VLC_BITS, 1);
- av_dlog(s, "%d%d %d %d/",
- s->ac_pred, s->h263_aic_dir, s->mb_x, s->mb_y);
- }
- if(s->per_mb_rl_table && cbp){
- s->rl_table_index = decode012(&s->gb);
- s->rl_chroma_table_index = s->rl_table_index;
- }
- }
-
- s->dsp.clear_blocks(s->block[0]);
- for (i = 0; i < 6; i++) {
- if (ff_msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0)
- {
- av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding block: %d x %d (%d)\n", s->mb_x, s->mb_y, i);
- return -1;
- }
- }
-
- return 0;
-}
-
-/* init all vlc decoding tables */
-av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx)
-{
- MpegEncContext *s = avctx->priv_data;
- static int done = 0;
- int i;
- MVTable *mv;
-
- if (ff_h263_decode_init(avctx) < 0)
- return -1;
-
- ff_msmpeg4_common_init(s);
-
- if (!done) {
- done = 1;
-
- for(i=0;i<NB_RL_TABLES;i++) {
- ff_init_rl(&ff_rl_table[i], ff_static_rl_table_store[i]);
- }
- INIT_VLC_RL(ff_rl_table[0], 642);
- INIT_VLC_RL(ff_rl_table[1], 1104);
- INIT_VLC_RL(ff_rl_table[2], 554);
- INIT_VLC_RL(ff_rl_table[3], 940);
- INIT_VLC_RL(ff_rl_table[4], 962);
- INIT_VLC_RL(ff_rl_table[5], 554);
-
- mv = &ff_mv_tables[0];
- INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, mv->n + 1,
- mv->table_mv_bits, 1, 1,
- mv->table_mv_code, 2, 2, 3714);
- mv = &ff_mv_tables[1];
- INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, mv->n + 1,
- mv->table_mv_bits, 1, 1,
- mv->table_mv_code, 2, 2, 2694);
-
- INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[0], DC_VLC_BITS, 120,
- &ff_table0_dc_lum[0][1], 8, 4,
- &ff_table0_dc_lum[0][0], 8, 4, 1158);
- INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[0], DC_VLC_BITS, 120,
- &ff_table0_dc_chroma[0][1], 8, 4,
- &ff_table0_dc_chroma[0][0], 8, 4, 1118);
- INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[1], DC_VLC_BITS, 120,
- &ff_table1_dc_lum[0][1], 8, 4,
- &ff_table1_dc_lum[0][0], 8, 4, 1476);
- INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[1], DC_VLC_BITS, 120,
- &ff_table1_dc_chroma[0][1], 8, 4,
- &ff_table1_dc_chroma[0][0], 8, 4, 1216);
-
- INIT_VLC_STATIC(&v2_dc_lum_vlc, DC_VLC_BITS, 512,
- &ff_v2_dc_lum_table[0][1], 8, 4,
- &ff_v2_dc_lum_table[0][0], 8, 4, 1472);
- INIT_VLC_STATIC(&v2_dc_chroma_vlc, DC_VLC_BITS, 512,
- &ff_v2_dc_chroma_table[0][1], 8, 4,
- &ff_v2_dc_chroma_table[0][0], 8, 4, 1506);
-
- INIT_VLC_STATIC(&v2_intra_cbpc_vlc, V2_INTRA_CBPC_VLC_BITS, 4,
- &ff_v2_intra_cbpc[0][1], 2, 1,
- &ff_v2_intra_cbpc[0][0], 2, 1, 8);
- INIT_VLC_STATIC(&v2_mb_type_vlc, V2_MB_TYPE_VLC_BITS, 8,
- &ff_v2_mb_type[0][1], 2, 1,
- &ff_v2_mb_type[0][0], 2, 1, 128);
- INIT_VLC_STATIC(&v2_mv_vlc, V2_MV_VLC_BITS, 33,
- &ff_mvtab[0][1], 2, 1,
- &ff_mvtab[0][0], 2, 1, 538);
-
- INIT_VLC_STATIC(&ff_mb_non_intra_vlc[0], MB_NON_INTRA_VLC_BITS, 128,
- &ff_wmv2_inter_table[0][0][1], 8, 4,
- &ff_wmv2_inter_table[0][0][0], 8, 4, 1636);
- INIT_VLC_STATIC(&ff_mb_non_intra_vlc[1], MB_NON_INTRA_VLC_BITS, 128,
- &ff_wmv2_inter_table[1][0][1], 8, 4,
- &ff_wmv2_inter_table[1][0][0], 8, 4, 2648);
- INIT_VLC_STATIC(&ff_mb_non_intra_vlc[2], MB_NON_INTRA_VLC_BITS, 128,
- &ff_wmv2_inter_table[2][0][1], 8, 4,
- &ff_wmv2_inter_table[2][0][0], 8, 4, 1532);
- INIT_VLC_STATIC(&ff_mb_non_intra_vlc[3], MB_NON_INTRA_VLC_BITS, 128,
- &ff_wmv2_inter_table[3][0][1], 8, 4,
- &ff_wmv2_inter_table[3][0][0], 8, 4, 2488);
-
- INIT_VLC_STATIC(&ff_msmp4_mb_i_vlc, MB_INTRA_VLC_BITS, 64,
- &ff_msmp4_mb_i_table[0][1], 4, 2,
- &ff_msmp4_mb_i_table[0][0], 4, 2, 536);
-
- INIT_VLC_STATIC(&ff_inter_intra_vlc, INTER_INTRA_VLC_BITS, 4,
- &ff_table_inter_intra[0][1], 2, 1,
- &ff_table_inter_intra[0][0], 2, 1, 8);
- }
-
- switch(s->msmpeg4_version){
- case 1:
- case 2:
- s->decode_mb= msmpeg4v12_decode_mb;
- break;
- case 3:
- case 4:
- s->decode_mb= msmpeg4v34_decode_mb;
- break;
- case 5:
- if (CONFIG_WMV2_DECODER)
- s->decode_mb= ff_wmv2_decode_mb;
- case 6:
- //FIXME + TODO VC1 decode mb
- break;
- }
-
- s->slice_height= s->mb_height; //to avoid 1/0 if the first frame is not a keyframe
-
- return 0;
-}
-
-int ff_msmpeg4_decode_picture_header(MpegEncContext * s)
-{
- int code;
-
- if(s->msmpeg4_version==1){
- int start_code = get_bits_long(&s->gb, 32);
- if(start_code!=0x00000100){
- av_log(s->avctx, AV_LOG_ERROR, "invalid startcode\n");
- return -1;
- }
-
- skip_bits(&s->gb, 5); // frame number */
- }
-
- s->pict_type = get_bits(&s->gb, 2) + 1;
- if (s->pict_type != AV_PICTURE_TYPE_I &&
- s->pict_type != AV_PICTURE_TYPE_P){
- av_log(s->avctx, AV_LOG_ERROR, "invalid picture type\n");
- return -1;
- }
-#if 0
-{
- static int had_i=0;
- if(s->pict_type == AV_PICTURE_TYPE_I) had_i=1;
- if(!had_i) return -1;
-}
-#endif
- s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);
- if(s->qscale==0){
- av_log(s->avctx, AV_LOG_ERROR, "invalid qscale\n");
- return -1;
- }
-
- if (s->pict_type == AV_PICTURE_TYPE_I) {
- code = get_bits(&s->gb, 5);
- if(s->msmpeg4_version==1){
- if(code==0 || code>s->mb_height){
- av_log(s->avctx, AV_LOG_ERROR, "invalid slice height %d\n", code);
- return -1;
- }
-
- s->slice_height = code;
- }else{
- /* 0x17: one slice, 0x18: two slices, ... */
- if (code < 0x17){
- av_log(s->avctx, AV_LOG_ERROR, "error, slice code was %X\n", code);
- return -1;
- }
-
- s->slice_height = s->mb_height / (code - 0x16);
- }
-
- switch(s->msmpeg4_version){
- case 1:
- case 2:
- s->rl_chroma_table_index = 2;
- s->rl_table_index = 2;
-
- s->dc_table_index = 0; //not used
- break;
- case 3:
- s->rl_chroma_table_index = decode012(&s->gb);
- s->rl_table_index = decode012(&s->gb);
-
- s->dc_table_index = get_bits1(&s->gb);
- break;
- case 4:
- ff_msmpeg4_decode_ext_header(s, (2+5+5+17+7)/8);
-
- if(s->bit_rate > MBAC_BITRATE) s->per_mb_rl_table= get_bits1(&s->gb);
- else s->per_mb_rl_table= 0;
-
- if(!s->per_mb_rl_table){
- s->rl_chroma_table_index = decode012(&s->gb);
- s->rl_table_index = decode012(&s->gb);
- }
-
- s->dc_table_index = get_bits1(&s->gb);
- s->inter_intra_pred= 0;
- break;
- }
- s->no_rounding = 1;
- if(s->avctx->debug&FF_DEBUG_PICT_INFO)
- av_log(s->avctx, AV_LOG_DEBUG, "qscale:%d rlc:%d rl:%d dc:%d mbrl:%d slice:%d \n",
- s->qscale,
- s->rl_chroma_table_index,
- s->rl_table_index,
- s->dc_table_index,
- s->per_mb_rl_table,
- s->slice_height);
- } else {
- switch(s->msmpeg4_version){
- case 1:
- case 2:
- if(s->msmpeg4_version==1)
- s->use_skip_mb_code = 1;
- else
- s->use_skip_mb_code = get_bits1(&s->gb);
- s->rl_table_index = 2;
- s->rl_chroma_table_index = s->rl_table_index;
- s->dc_table_index = 0; //not used
- s->mv_table_index = 0;
- break;
- case 3:
- s->use_skip_mb_code = get_bits1(&s->gb);
- s->rl_table_index = decode012(&s->gb);
- s->rl_chroma_table_index = s->rl_table_index;
-
- s->dc_table_index = get_bits1(&s->gb);
-
- s->mv_table_index = get_bits1(&s->gb);
- break;
- case 4:
- s->use_skip_mb_code = get_bits1(&s->gb);
-
- if(s->bit_rate > MBAC_BITRATE) s->per_mb_rl_table= get_bits1(&s->gb);
- else s->per_mb_rl_table= 0;
-
- if(!s->per_mb_rl_table){
- s->rl_table_index = decode012(&s->gb);
- s->rl_chroma_table_index = s->rl_table_index;
- }
-
- s->dc_table_index = get_bits1(&s->gb);
-
- s->mv_table_index = get_bits1(&s->gb);
- s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE);
- break;
- }
-
- if(s->avctx->debug&FF_DEBUG_PICT_INFO)
- av_log(s->avctx, AV_LOG_DEBUG, "skip:%d rl:%d rlc:%d dc:%d mv:%d mbrl:%d qp:%d \n",
- s->use_skip_mb_code,
- s->rl_table_index,
- s->rl_chroma_table_index,
- s->dc_table_index,
- s->mv_table_index,
- s->per_mb_rl_table,
- s->qscale);
-
- if(s->flipflop_rounding){
- s->no_rounding ^= 1;
- }else{
- s->no_rounding = 0;
- }
- }
- av_dlog(s->avctx, "%d %d %d %d %d\n", s->pict_type, s->bit_rate,
- s->inter_intra_pred, s->width, s->height);
-
- s->esc3_level_length= 0;
- s->esc3_run_length= 0;
-
- return 0;
-}
-
-int ff_msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size)
-{
- int left= buf_size*8 - get_bits_count(&s->gb);
- int length= s->msmpeg4_version>=3 ? 17 : 16;
- /* the alt_bitstream reader could read over the end so we need to check it */
- if(left>=length && left<length+8)
- {
- skip_bits(&s->gb, 5); /* fps */
- s->bit_rate= get_bits(&s->gb, 11)*1024;
- if(s->msmpeg4_version>=3)
- s->flipflop_rounding= get_bits1(&s->gb);
- else
- s->flipflop_rounding= 0;
- }
- else if(left<length+8)
- {
- s->flipflop_rounding= 0;
- if(s->msmpeg4_version != 2)
- av_log(s->avctx, AV_LOG_ERROR, "ext header missing, %d left\n", left);
- }
- else
- {
- av_log(s->avctx, AV_LOG_ERROR, "I frame too long, ignoring ext header\n");
- }
-
- return 0;
-}
-
-static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
-{
- int level, pred;
-
- if(s->msmpeg4_version<=2){
- if (n < 4) {
- level = get_vlc2(&s->gb, v2_dc_lum_vlc.table, DC_VLC_BITS, 3);
- } else {
- level = get_vlc2(&s->gb, v2_dc_chroma_vlc.table, DC_VLC_BITS, 3);
- }
- if (level < 0)
- return -1;
- level-=256;
- }else{ //FIXME optimize use unified tables & index
- if (n < 4) {
- level = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
- } else {
- level = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
- }
- if (level < 0){
- av_log(s->avctx, AV_LOG_ERROR, "illegal dc vlc\n");
- return -1;
- }
-
- if (level == DC_MAX) {
- level = get_bits(&s->gb, 8);
- if (get_bits1(&s->gb))
- level = -level;
- } else if (level != 0) {
- if (get_bits1(&s->gb))
- level = -level;
- }
- }
-
- if(s->msmpeg4_version==1){
- int32_t *dc_val;
- pred = msmpeg4v1_pred_dc(s, n, &dc_val);
- level += pred;
-
- /* update predictor */
- *dc_val= level;
- }else{
- int16_t *dc_val;
- pred = ff_msmpeg4_pred_dc(s, n, &dc_val, dir_ptr);
- level += pred;
-
- /* update predictor */
- if (n < 4) {
- *dc_val = level * s->y_dc_scale;
- } else {
- *dc_val = level * s->c_dc_scale;
- }
- }
-
- return level;
-}
-
-//#define ERROR_DETAILS
-int ff_msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
- int n, int coded, const uint8_t *scan_table)
-{
- int level, i, last, run, run_diff;
- int av_uninit(dc_pred_dir);
- RLTable *rl;
- RL_VLC_ELEM *rl_vlc;
- int qmul, qadd;
-
- if (s->mb_intra) {
- qmul=1;
- qadd=0;
-
- /* DC coef */
- level = msmpeg4_decode_dc(s, n, &dc_pred_dir);
-
- if (level < 0){
- av_log(s->avctx, AV_LOG_ERROR, "dc overflow- block: %d qscale: %d//\n", n, s->qscale);
- if(s->inter_intra_pred) level=0;
- else return -1;
- }
- if (n < 4) {
- rl = &ff_rl_table[s->rl_table_index];
- if(level > 256*s->y_dc_scale){
- av_log(s->avctx, AV_LOG_ERROR, "dc overflow+ L qscale: %d//\n", s->qscale);
- if(!s->inter_intra_pred) return -1;
- }
- } else {
- rl = &ff_rl_table[3 + s->rl_chroma_table_index];
- if(level > 256*s->c_dc_scale){
- av_log(s->avctx, AV_LOG_ERROR, "dc overflow+ C qscale: %d//\n", s->qscale);
- if(!s->inter_intra_pred) return -1;
- }
- }
- block[0] = level;
-
- run_diff = s->msmpeg4_version >= 4;
- i = 0;
- if (!coded) {
- goto not_coded;
- }
- 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;
- }
- rl_vlc= rl->rl_vlc[0];
- } else {
- qmul = s->qscale << 1;
- qadd = (s->qscale - 1) | 1;
- i = -1;
- rl = &ff_rl_table[3 + s->rl_table_index];
-
- if(s->msmpeg4_version==2)
- run_diff = 0;
- else
- run_diff = 1;
-
- if (!coded) {
- s->block_last_index[n] = i;
- return 0;
- }
- if(!scan_table)
- scan_table = s->inter_scantable.permutated;
- rl_vlc= rl->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) {
- int cache;
- cache= GET_CACHE(re, &s->gb);
- /* escape */
- if (s->msmpeg4_version==1 || (cache&0x80000000)==0) {
- if (s->msmpeg4_version==1 || (cache&0x40000000)==0) {
- /* third escape */
- if(s->msmpeg4_version!=1) LAST_SKIP_BITS(re, &s->gb, 2);
- UPDATE_CACHE(re, &s->gb);
- if(s->msmpeg4_version<=3){
- last= SHOW_UBITS(re, &s->gb, 1); SKIP_CACHE(re, &s->gb, 1);
- run= SHOW_UBITS(re, &s->gb, 6); SKIP_CACHE(re, &s->gb, 6);
- level= SHOW_SBITS(re, &s->gb, 8);
- SKIP_COUNTER(re, &s->gb, 1+6+8);
- }else{
- int sign;
- last= SHOW_UBITS(re, &s->gb, 1); SKIP_BITS(re, &s->gb, 1);
- if(!s->esc3_level_length){
- int ll;
- av_dlog(s->avctx, "ESC-3 %X at %d %d\n",
- show_bits(&s->gb, 24), s->mb_x, s->mb_y);
- if(s->qscale<8){
- ll= SHOW_UBITS(re, &s->gb, 3); SKIP_BITS(re, &s->gb, 3);
- if(ll==0){
- ll= 8+SHOW_UBITS(re, &s->gb, 1); SKIP_BITS(re, &s->gb, 1);
- }
- }else{
- ll=2;
- while(ll<8 && SHOW_UBITS(re, &s->gb, 1)==0){
- ll++;
- SKIP_BITS(re, &s->gb, 1);
- }
- if(ll<8) SKIP_BITS(re, &s->gb, 1);
- }
-
- s->esc3_level_length= ll;
- s->esc3_run_length= SHOW_UBITS(re, &s->gb, 2) + 3; SKIP_BITS(re, &s->gb, 2);
- UPDATE_CACHE(re, &s->gb);
- }
- run= SHOW_UBITS(re, &s->gb, s->esc3_run_length);
- SKIP_BITS(re, &s->gb, s->esc3_run_length);
-
- sign= SHOW_UBITS(re, &s->gb, 1);
- SKIP_BITS(re, &s->gb, 1);
-
- level= SHOW_UBITS(re, &s->gb, s->esc3_level_length);
- SKIP_BITS(re, &s->gb, s->esc3_level_length);
- if(sign) level= -level;
- }
-
-#if 0 // waste of time / this will detect very few errors
- {
- const int abs_level= FFABS(level);
- const int run1= run - rl->max_run[last][abs_level] - run_diff;
- if(abs_level<=MAX_LEVEL && run<=MAX_RUN){
- if(abs_level <= rl->max_level[last][run]){
- av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, vlc encoding possible\n");
- return DECODING_AC_LOST;
- }
- 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 DECODING_AC_LOST;
- }
- 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 DECODING_AC_LOST;
- }
- }
- }
-#endif
- //level = level * qmul + (level>0) * qadd - (level<=0) * qadd ;
- if (level>0) level= level * qmul + qadd;
- else level= level * qmul - qadd;
-#if 0 // waste of time too :(
- if(level>2048 || level<-2048){
- av_log(s->avctx, AV_LOG_ERROR, "|level| overflow in 3. esc\n");
- return DECODING_AC_LOST;
- }
-#endif
- i+= run + 1;
- if(last) i+=192;
-#ifdef ERROR_DETAILS
- if(run==66)
- av_log(s->avctx, AV_LOG_ERROR, "illegal vlc code in ESC3 level=%d\n", level);
- else if((i>62 && i<192) || i>192+63)
- av_log(s->avctx, AV_LOG_ERROR, "run overflow in ESC3 i=%d run=%d level=%d\n", i, run, level);
-#endif
- } 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] + run_diff; //FIXME opt indexing
- level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
- LAST_SKIP_BITS(re, &s->gb, 1);
-#ifdef ERROR_DETAILS
- if(run==66)
- av_log(s->avctx, AV_LOG_ERROR, "illegal vlc code in ESC2 level=%d\n", level);
- else if((i>62 && i<192) || i>192+63)
- av_log(s->avctx, AV_LOG_ERROR, "run overflow in ESC2 i=%d run=%d level=%d\n", i, run, level);
-#endif
- }
- } 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);
-#ifdef ERROR_DETAILS
- if(run==66)
- av_log(s->avctx, AV_LOG_ERROR, "illegal vlc code in ESC1 level=%d\n", level);
- else if((i>62 && i<192) || i>192+63)
- av_log(s->avctx, AV_LOG_ERROR, "run overflow in ESC1 i=%d run=%d level=%d\n", i, run, level);
-#endif
- }
- } else {
- i+= run;
- level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
- LAST_SKIP_BITS(re, &s->gb, 1);
-#ifdef ERROR_DETAILS
- if(run==66)
- av_log(s->avctx, AV_LOG_ERROR, "illegal vlc code level=%d\n", level);
- else if((i>62 && i<192) || i>192+63)
- av_log(s->avctx, AV_LOG_ERROR, "run overflow i=%d run=%d level=%d\n", i, run, level);
-#endif
- }
- if (i > 62){
- i-= 192;
- if(i&(~63)){
- const int left= get_bits_left(&s->gb);
- if(((i+192 == 64 && level/qmul==-1) || !(s->err_recognition&AV_EF_BITSTREAM)) && left>=0){
- av_log(s->avctx, AV_LOG_ERROR, "ignoring overflow at %d %d\n", s->mb_x, s->mb_y);
- break;
- }else{
- 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;
- }
- CLOSE_READER(re, &s->gb);
- }
- not_coded:
- if (s->mb_intra) {
- ff_mpeg4_pred_ac(s, block, n, dc_pred_dir);
- if (s->ac_pred) {
- i = 63; /* XXX: not optimal */
- }
- }
- if(s->msmpeg4_version>=4 && i>0) i=63; //FIXME/XXX optimize
- s->block_last_index[n] = i;
-
- return 0;
-}
-
-int ff_msmpeg4_decode_motion(MpegEncContext * s,
- int *mx_ptr, int *my_ptr)
-{
- MVTable *mv;
- int code, mx, my;
-
- mv = &ff_mv_tables[s->mv_table_index];
-
- code = get_vlc2(&s->gb, mv->vlc.table, MV_VLC_BITS, 2);
- if (code < 0){
- av_log(s->avctx, AV_LOG_ERROR, "illegal MV code at %d %d\n", s->mb_x, s->mb_y);
- return -1;
- }
- if (code == mv->n) {
- mx = get_bits(&s->gb, 6);
- my = get_bits(&s->gb, 6);
- } else {
- mx = mv->table_mvx[code];
- my = mv->table_mvy[code];
- }
-
- mx += *mx_ptr - 32;
- my += *my_ptr - 32;
- /* WARNING : they do not do exactly modulo encoding */
- if (mx <= -64)
- mx += 64;
- else if (mx >= 64)
- mx -= 64;
-
- if (my <= -64)
- my += 64;
- else if (my >= 64)
- my -= 64;
- *mx_ptr = mx;
- *my_ptr = my;
- return 0;
-}
-
-AVCodec ff_msmpeg4v1_decoder = {
- .name = "msmpeg4v1",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_MSMPEG4V1,
- .priv_data_size = sizeof(MpegEncContext),
- .init = ff_msmpeg4_decode_init,
- .close = ff_h263_decode_end,
- .decode = ff_h263_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"),
- .pix_fmts = ff_pixfmt_list_420,
-};
-
-AVCodec ff_msmpeg4v2_decoder = {
- .name = "msmpeg4v2",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_MSMPEG4V2,
- .priv_data_size = sizeof(MpegEncContext),
- .init = ff_msmpeg4_decode_init,
- .close = ff_h263_decode_end,
- .decode = ff_h263_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"),
- .pix_fmts = ff_pixfmt_list_420,
-};
-
-AVCodec ff_msmpeg4v3_decoder = {
- .name = "msmpeg4",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_MSMPEG4V3,
- .priv_data_size = sizeof(MpegEncContext),
- .init = ff_msmpeg4_decode_init,
- .close = ff_h263_decode_end,
- .decode = ff_h263_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"),
- .pix_fmts = ff_pixfmt_list_420,
-};
-
-AVCodec ff_wmv1_decoder = {
- .name = "wmv1",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_WMV1,
- .priv_data_size = sizeof(MpegEncContext),
- .init = ff_msmpeg4_decode_init,
- .close = ff_h263_decode_end,
- .decode = ff_h263_decode_frame,
- .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"),
- .pix_fmts = ff_pixfmt_list_420,
-};

libav-v9.6.tar.bz2/libavcodec/msmpeg4.h -> libav-v10.1.tar.bz2/libavcodec/msmpeg4.h Changed

@@ -26,7 +26,6 @@
 
 #include "config.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "msmpeg4data.h"
 #include "put_bits.h"
@@ -45,17 +44,17 @@
 
 void ff_msmpeg4_code012(PutBitContext *pb, int n);
 void ff_msmpeg4_common_init(MpegEncContext *s);
-void ff_msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n);
+void ff_msmpeg4_encode_block(MpegEncContext * s, int16_t * block, int n);
 void ff_msmpeg4_handle_slices(MpegEncContext *s);
 void ff_msmpeg4_encode_motion(MpegEncContext * s, int mx, int my);
 int ff_msmpeg4_coded_block_pred(MpegEncContext * s, int n,
                                 uint8_t **coded_block_ptr);
 int ff_msmpeg4_decode_motion(MpegEncContext * s, int *mx_ptr, int *my_ptr);
-int ff_msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
+int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block,
                             int n, int coded, const uint8_t *scan_table);
 int ff_msmpeg4_pred_dc(MpegEncContext *s, int n,
                        int16_t **dc_val_ptr, int *dir_ptr);
-int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
+int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]);
 
 #define CONFIG_MSMPEG4_DECODER (CONFIG_MSMPEG4V1_DECODER || \
                                 CONFIG_MSMPEG4V2_DECODER || \

libav-v9.6.tar.bz2/libavcodec/msmpeg4data.c -> libav-v10.1.tar.bz2/libavcodec/msmpeg4data.c Changed

libav-v10.1.tar.bz2/libavcodec/msmpeg4dec.c Added

@@ -0,0 +1,953 @@
+/*
+ * MSMPEG4 backend for encoder and decoder
+ * Copyright (c) 2001 Fabrice Bellard
+ * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * msmpeg4v1 & v2 stuff by Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avcodec.h"
+#include "dsputil.h"
+#include "mpegvideo.h"
+#include "msmpeg4.h"
+#include "libavutil/x86/asm.h"
+#include "h263.h"
+#include "mpeg4video.h"
+#include "msmpeg4data.h"
+#include "vc1data.h"
+
+#define DC_VLC_BITS 9
+#define V2_INTRA_CBPC_VLC_BITS 3
+#define V2_MB_TYPE_VLC_BITS 7
+#define MV_VLC_BITS 9
+#define V2_MV_VLC_BITS 9
+#define TEX_VLC_BITS 9
+
+#define DEFAULT_INTER_INDEX 3
+
+static inline int msmpeg4v1_pred_dc(MpegEncContext * s, int n,
+ int32_t **dc_val_ptr)
+{
+ int i;
+
+ if (n < 4) {
+ i= 0;
+ } else {
+ i= n-3;
+ }
+
+ *dc_val_ptr= &s->last_dc[i];
+ return s->last_dc[i];
+}
+
+/****************************************/
+/* decoding stuff */
+
+VLC ff_mb_non_intra_vlc[4];
+static VLC v2_dc_lum_vlc;
+static VLC v2_dc_chroma_vlc;
+static VLC v2_intra_cbpc_vlc;
+static VLC v2_mb_type_vlc;
+static VLC v2_mv_vlc;
+VLC ff_inter_intra_vlc;
+
+/* This is identical to h263 except that its range is multiplied by 2. */
+static int msmpeg4v2_decode_motion(MpegEncContext * s, int pred, int f_code)
+{
+ int code, val, sign, shift;
+
+ code = get_vlc2(&s->gb, v2_mv_vlc.table, V2_MV_VLC_BITS, 2);
+ av_dlog(s, "MV code %d at %d %d pred: %d\n", code, s->mb_x,s->mb_y, pred);
+ if (code < 0)
+ return 0xffff;
+
+ if (code == 0)
+ return pred;
+ sign = get_bits1(&s->gb);
+ shift = f_code - 1;
+ val = code;
+ if (shift) {
+ val = (val - 1) << shift;
+ val |= get_bits(&s->gb, shift);
+ val++;
+ }
+ if (sign)
+ val = -val;
+
+ val += pred;
+ if (val <= -64)
+ val += 64;
+ else if (val >= 64)
+ val -= 64;
+
+ return val;
+}
+
+static int msmpeg4v12_decode_mb(MpegEncContext *s, int16_t block[6][64])
+{
+ int cbp, code, i;
+
+ if (s->pict_type == AV_PICTURE_TYPE_P) {
+ if (s->use_skip_mb_code) {
+ if (get_bits1(&s->gb)) {
+ /* skip mb */
+ s->mb_intra = 0;
+ 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->mb_skipped = 1;
+ return 0;
+ }
+ }
+
+ if(s->msmpeg4_version==2)
+ code = get_vlc2(&s->gb, v2_mb_type_vlc.table, V2_MB_TYPE_VLC_BITS, 1);
+ else
+ code = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2);
+ if(code<0 || code>7){
+ av_log(s->avctx, AV_LOG_ERROR, "cbpc %d invalid at %d %d\n", code, s->mb_x, s->mb_y);
+ return -1;
+ }
+
+ s->mb_intra = code >>2;
+
+ cbp = code & 0x3;
+ } else {
+ s->mb_intra = 1;
+ if(s->msmpeg4_version==2)
+ cbp= get_vlc2(&s->gb, v2_intra_cbpc_vlc.table, V2_INTRA_CBPC_VLC_BITS, 1);
+ else
+ cbp= get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 1);
+ if(cbp<0 || cbp>3){
+ av_log(s->avctx, AV_LOG_ERROR, "cbpc %d invalid at %d %d\n", cbp, s->mb_x, s->mb_y);
+ return -1;
+ }
+ }
+
+ if (!s->mb_intra) {
+ int mx, my, cbpy;
+
+ 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 %d invalid at %d %d\n", cbp, s->mb_x, s->mb_y);
+ return -1;
+ }
+
+ cbp|= cbpy<<2;
+ if(s->msmpeg4_version==1 || (cbp&3) != 3) cbp^= 0x3C;
+
+ ff_h263_pred_motion(s, 0, 0, &mx, &my);
+ mx= msmpeg4v2_decode_motion(s, mx, 1);
+ my= msmpeg4v2_decode_motion(s, my, 1);
+
+ s->mv_dir = MV_DIR_FORWARD;
+ s->mv_type = MV_TYPE_16X16;
+ s->mv[0][0][0] = mx;
+ s->mv[0][0][1] = my;
+ } else {
+ if(s->msmpeg4_version==2){
+ s->ac_pred = get_bits1(&s->gb);
+ cbp|= get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1)<<2; //FIXME check errors
+ } else{
+ s->ac_pred = 0;
+ cbp|= get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1)<<2; //FIXME check errors
+ if(s->pict_type==AV_PICTURE_TYPE_P) cbp^=0x3C;
+ }
+ }
+
+ s->dsp.clear_blocks(s->block[0]);
+ for (i = 0; i < 6; i++) {
+ if (ff_msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0)
+ {
+ av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding block: %d x %d (%d)\n", s->mb_x, s->mb_y, i);
+ return -1;
+ }
+ }
+ return 0;
+}
+
+static int msmpeg4v34_decode_mb(MpegEncContext *s, int16_t block[6][64])
+{
+ int cbp, code, i;
+ uint8_t *coded_val;
+ uint32_t * const mb_type_ptr = &s->current_picture.mb_type[s->mb_x + s->mb_y*s->mb_stride];
+
+ if (s->pict_type == AV_PICTURE_TYPE_P) {
+ if (s->use_skip_mb_code) {
+ if (get_bits1(&s->gb)) {
+ /* skip mb */
+ s->mb_intra = 0;
+ 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->mb_skipped = 1;
+ *mb_type_ptr = MB_TYPE_SKIP | MB_TYPE_L0 | MB_TYPE_16x16;
+
+ return 0;
+ }
+ }
+
+ code = get_vlc2(&s->gb, ff_mb_non_intra_vlc[DEFAULT_INTER_INDEX].table, MB_NON_INTRA_VLC_BITS, 3);
+ if (code < 0)
+ return -1;
+ //s->mb_intra = (code & 0x40) ? 0 : 1;
+ s->mb_intra = (~code & 0x40) >> 6;
+
+ cbp = code & 0x3f;
+ } else {
+ s->mb_intra = 1;
+ code = get_vlc2(&s->gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2);
+ if (code < 0)
+ return -1;
+ /* predict coded block pattern */
+ cbp = 0;
+ for(i=0;i<6;i++) {
+ int val = ((code >> (5 - i)) & 1);
+ if (i < 4) {
+ int pred = ff_msmpeg4_coded_block_pred(s, i, &coded_val);
+ val = val ^ pred;
+ *coded_val = val;
+ }
+ cbp |= val << (5 - i);
+ }
+ }
+
+ if (!s->mb_intra) {
+ int mx, my;
+ if(s->per_mb_rl_table && cbp){
+ s->rl_table_index = decode012(&s->gb);
+ s->rl_chroma_table_index = s->rl_table_index;
+ }
+ ff_h263_pred_motion(s, 0, 0, &mx, &my);
+ if (ff_msmpeg4_decode_motion(s, &mx, &my) < 0)
+ return -1;
+ s->mv_dir = MV_DIR_FORWARD;
+ s->mv_type = MV_TYPE_16X16;
+ s->mv[0][0][0] = mx;
+ s->mv[0][0][1] = my;
+ *mb_type_ptr = MB_TYPE_L0 | MB_TYPE_16x16;
+ } else {
+ av_dlog(s, "I at %d %d %d %06X\n", s->mb_x, s->mb_y,
+ ((cbp & 3) ? 1 : 0) +((cbp & 0x3C)? 2 : 0),
+ show_bits(&s->gb, 24));
+ s->ac_pred = get_bits1(&s->gb);
+ *mb_type_ptr = MB_TYPE_INTRA;
+ if(s->inter_intra_pred){
+ s->h263_aic_dir= get_vlc2(&s->gb, ff_inter_intra_vlc.table, INTER_INTRA_VLC_BITS, 1);
+ av_dlog(s, "%d%d %d %d/",
+ s->ac_pred, s->h263_aic_dir, s->mb_x, s->mb_y);
+ }
+ if(s->per_mb_rl_table && cbp){
+ s->rl_table_index = decode012(&s->gb);
+ s->rl_chroma_table_index = s->rl_table_index;
+ }
+ }
+
+ s->dsp.clear_blocks(s->block[0]);
+ for (i = 0; i < 6; i++) {
+ if (ff_msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0)
+ {
+ av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding block: %d x %d (%d)\n", s->mb_x, s->mb_y, i);
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+/* init all vlc decoding tables */
+av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx)
+{
+ MpegEncContext *s = avctx->priv_data;
+ static int done = 0;
+ int i;
+ MVTable *mv;
+
+ if (ff_h263_decode_init(avctx) < 0)
+ return -1;
+
+ ff_msmpeg4_common_init(s);
+
+ if (!done) {
+ done = 1;
+
+ for(i=0;i<NB_RL_TABLES;i++) {
+ ff_init_rl(&ff_rl_table[i], ff_static_rl_table_store[i]);
+ }
+ INIT_VLC_RL(ff_rl_table[0], 642);
+ INIT_VLC_RL(ff_rl_table[1], 1104);
+ INIT_VLC_RL(ff_rl_table[2], 554);
+ INIT_VLC_RL(ff_rl_table[3], 940);
+ INIT_VLC_RL(ff_rl_table[4], 962);
+ INIT_VLC_RL(ff_rl_table[5], 554);
+
+ mv = &ff_mv_tables[0];
+ INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, mv->n + 1,
+ mv->table_mv_bits, 1, 1,
+ mv->table_mv_code, 2, 2, 3714);
+ mv = &ff_mv_tables[1];
+ INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, mv->n + 1,
+ mv->table_mv_bits, 1, 1,
+ mv->table_mv_code, 2, 2, 2694);
+
+ INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[0], DC_VLC_BITS, 120,
+ &ff_table0_dc_lum[0][1], 8, 4,
+ &ff_table0_dc_lum[0][0], 8, 4, 1158);
+ INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[0], DC_VLC_BITS, 120,
+ &ff_table0_dc_chroma[0][1], 8, 4,
+ &ff_table0_dc_chroma[0][0], 8, 4, 1118);
+ INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[1], DC_VLC_BITS, 120,
+ &ff_table1_dc_lum[0][1], 8, 4,
+ &ff_table1_dc_lum[0][0], 8, 4, 1476);
+ INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[1], DC_VLC_BITS, 120,
+ &ff_table1_dc_chroma[0][1], 8, 4,
+ &ff_table1_dc_chroma[0][0], 8, 4, 1216);
+
+ INIT_VLC_STATIC(&v2_dc_lum_vlc, DC_VLC_BITS, 512,
+ &ff_v2_dc_lum_table[0][1], 8, 4,
+ &ff_v2_dc_lum_table[0][0], 8, 4, 1472);
+ INIT_VLC_STATIC(&v2_dc_chroma_vlc, DC_VLC_BITS, 512,
+ &ff_v2_dc_chroma_table[0][1], 8, 4,
+ &ff_v2_dc_chroma_table[0][0], 8, 4, 1506);
+
+ INIT_VLC_STATIC(&v2_intra_cbpc_vlc, V2_INTRA_CBPC_VLC_BITS, 4,
+ &ff_v2_intra_cbpc[0][1], 2, 1,
+ &ff_v2_intra_cbpc[0][0], 2, 1, 8);
+ INIT_VLC_STATIC(&v2_mb_type_vlc, V2_MB_TYPE_VLC_BITS, 8,
+ &ff_v2_mb_type[0][1], 2, 1,
+ &ff_v2_mb_type[0][0], 2, 1, 128);
+ INIT_VLC_STATIC(&v2_mv_vlc, V2_MV_VLC_BITS, 33,
+ &ff_mvtab[0][1], 2, 1,
+ &ff_mvtab[0][0], 2, 1, 538);
+
+ INIT_VLC_STATIC(&ff_mb_non_intra_vlc[0], MB_NON_INTRA_VLC_BITS, 128,
+ &ff_wmv2_inter_table[0][0][1], 8, 4,
+ &ff_wmv2_inter_table[0][0][0], 8, 4, 1636);
+ INIT_VLC_STATIC(&ff_mb_non_intra_vlc[1], MB_NON_INTRA_VLC_BITS, 128,
+ &ff_wmv2_inter_table[1][0][1], 8, 4,
+ &ff_wmv2_inter_table[1][0][0], 8, 4, 2648);
+ INIT_VLC_STATIC(&ff_mb_non_intra_vlc[2], MB_NON_INTRA_VLC_BITS, 128,
+ &ff_wmv2_inter_table[2][0][1], 8, 4,
+ &ff_wmv2_inter_table[2][0][0], 8, 4, 1532);
+ INIT_VLC_STATIC(&ff_mb_non_intra_vlc[3], MB_NON_INTRA_VLC_BITS, 128,
+ &ff_wmv2_inter_table[3][0][1], 8, 4,
+ &ff_wmv2_inter_table[3][0][0], 8, 4, 2488);
+
+ INIT_VLC_STATIC(&ff_msmp4_mb_i_vlc, MB_INTRA_VLC_BITS, 64,
+ &ff_msmp4_mb_i_table[0][1], 4, 2,
+ &ff_msmp4_mb_i_table[0][0], 4, 2, 536);
+
+ INIT_VLC_STATIC(&ff_inter_intra_vlc, INTER_INTRA_VLC_BITS, 4,
+ &ff_table_inter_intra[0][1], 2, 1,
+ &ff_table_inter_intra[0][0], 2, 1, 8);
+ }
+
+ switch(s->msmpeg4_version){
+ case 1:
+ case 2:
+ s->decode_mb= msmpeg4v12_decode_mb;
+ break;
+ case 3:
+ case 4:
+ s->decode_mb= msmpeg4v34_decode_mb;
+ break;
+ case 5:
+ if (CONFIG_WMV2_DECODER)
+ s->decode_mb= ff_wmv2_decode_mb;
+ case 6:
+ //FIXME + TODO VC1 decode mb
+ break;
+ }
+
+ s->slice_height= s->mb_height; //to avoid 1/0 if the first frame is not a keyframe
+
+ return 0;
+}
+
+int ff_msmpeg4_decode_picture_header(MpegEncContext * s)
+{
+ int code;
+
+ if(s->msmpeg4_version==1){
+ int start_code = get_bits_long(&s->gb, 32);
+ if(start_code!=0x00000100){
+ av_log(s->avctx, AV_LOG_ERROR, "invalid startcode\n");
+ return -1;
+ }
+
+ skip_bits(&s->gb, 5); // frame number */
+ }
+
+ s->pict_type = get_bits(&s->gb, 2) + 1;
+ if (s->pict_type != AV_PICTURE_TYPE_I &&
+ s->pict_type != AV_PICTURE_TYPE_P){
+ av_log(s->avctx, AV_LOG_ERROR, "invalid picture type\n");
+ return -1;
+ }
+#if 0
+{
+ static int had_i=0;
+ if(s->pict_type == AV_PICTURE_TYPE_I) had_i=1;
+ if(!had_i) return -1;
+}
+#endif
+ s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);
+ if(s->qscale==0){
+ av_log(s->avctx, AV_LOG_ERROR, "invalid qscale\n");
+ return -1;
+ }
+
+ if (s->pict_type == AV_PICTURE_TYPE_I) {
+ code = get_bits(&s->gb, 5);
+ if(s->msmpeg4_version==1){
+ if(code==0 || code>s->mb_height){
+ av_log(s->avctx, AV_LOG_ERROR, "invalid slice height %d\n", code);
+ return -1;
+ }
+
+ s->slice_height = code;
+ }else{
+ /* 0x17: one slice, 0x18: two slices, ... */
+ if (code < 0x17){
+ av_log(s->avctx, AV_LOG_ERROR, "error, slice code was %X\n", code);
+ return -1;
+ }
+
+ s->slice_height = s->mb_height / (code - 0x16);
+ }
+
+ switch(s->msmpeg4_version){
+ case 1:
+ case 2:
+ s->rl_chroma_table_index = 2;
+ s->rl_table_index = 2;
+
+ s->dc_table_index = 0; //not used
+ break;
+ case 3:
+ s->rl_chroma_table_index = decode012(&s->gb);
+ s->rl_table_index = decode012(&s->gb);
+
+ s->dc_table_index = get_bits1(&s->gb);
+ break;
+ case 4:
+ ff_msmpeg4_decode_ext_header(s, (2+5+5+17+7)/8);
+
+ if(s->bit_rate > MBAC_BITRATE) s->per_mb_rl_table= get_bits1(&s->gb);
+ else s->per_mb_rl_table= 0;
+
+ if(!s->per_mb_rl_table){
+ s->rl_chroma_table_index = decode012(&s->gb);
+ s->rl_table_index = decode012(&s->gb);
+ }
+
+ s->dc_table_index = get_bits1(&s->gb);
+ s->inter_intra_pred= 0;
+ break;
+ }
+ s->no_rounding = 1;
+ if(s->avctx->debug&FF_DEBUG_PICT_INFO)
+ av_log(s->avctx, AV_LOG_DEBUG, "qscale:%d rlc:%d rl:%d dc:%d mbrl:%d slice:%d \n",
+ s->qscale,
+ s->rl_chroma_table_index,
+ s->rl_table_index,
+ s->dc_table_index,
+ s->per_mb_rl_table,
+ s->slice_height);
+ } else {
+ switch(s->msmpeg4_version){
+ case 1:
+ case 2:
+ if(s->msmpeg4_version==1)
+ s->use_skip_mb_code = 1;
+ else
+ s->use_skip_mb_code = get_bits1(&s->gb);
+ s->rl_table_index = 2;
+ s->rl_chroma_table_index = s->rl_table_index;
+ s->dc_table_index = 0; //not used
+ s->mv_table_index = 0;
+ break;
+ case 3:
+ s->use_skip_mb_code = get_bits1(&s->gb);
+ s->rl_table_index = decode012(&s->gb);
+ s->rl_chroma_table_index = s->rl_table_index;
+
+ s->dc_table_index = get_bits1(&s->gb);
+
+ s->mv_table_index = get_bits1(&s->gb);
+ break;
+ case 4:
+ s->use_skip_mb_code = get_bits1(&s->gb);
+
+ if(s->bit_rate > MBAC_BITRATE) s->per_mb_rl_table= get_bits1(&s->gb);
+ else s->per_mb_rl_table= 0;
+
+ if(!s->per_mb_rl_table){
+ s->rl_table_index = decode012(&s->gb);
+ s->rl_chroma_table_index = s->rl_table_index;
+ }
+
+ s->dc_table_index = get_bits1(&s->gb);
+
+ s->mv_table_index = get_bits1(&s->gb);
+ s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE);
+ break;
+ }
+
+ if(s->avctx->debug&FF_DEBUG_PICT_INFO)
+ av_log(s->avctx, AV_LOG_DEBUG, "skip:%d rl:%d rlc:%d dc:%d mv:%d mbrl:%d qp:%d \n",
+ s->use_skip_mb_code,
+ s->rl_table_index,
+ s->rl_chroma_table_index,
+ s->dc_table_index,
+ s->mv_table_index,
+ s->per_mb_rl_table,
+ s->qscale);
+
+ if(s->flipflop_rounding){
+ s->no_rounding ^= 1;
+ }else{
+ s->no_rounding = 0;
+ }
+ }
+ av_dlog(s->avctx, "%d %d %d %d %d\n", s->pict_type, s->bit_rate,
+ s->inter_intra_pred, s->width, s->height);
+
+ s->esc3_level_length= 0;
+ s->esc3_run_length= 0;
+
+ return 0;
+}
+
+int ff_msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size)
+{
+ int left= buf_size*8 - get_bits_count(&s->gb);
+ int length= s->msmpeg4_version>=3 ? 17 : 16;
+ /* the alt_bitstream reader could read over the end so we need to check it */
+ if(left>=length && left<length+8)
+ {
+ skip_bits(&s->gb, 5); /* fps */
+ s->bit_rate= get_bits(&s->gb, 11)*1024;
+ if(s->msmpeg4_version>=3)
+ s->flipflop_rounding= get_bits1(&s->gb);
+ else
+ s->flipflop_rounding= 0;
+ }
+ else if(left<length+8)
+ {
+ s->flipflop_rounding= 0;
+ if(s->msmpeg4_version != 2)
+ av_log(s->avctx, AV_LOG_ERROR, "ext header missing, %d left\n", left);
+ }
+ else
+ {
+ av_log(s->avctx, AV_LOG_ERROR, "I frame too long, ignoring ext header\n");
+ }
+
+ return 0;
+}
+
+static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
+{
+ int level, pred;
+
+ if(s->msmpeg4_version<=2){
+ if (n < 4) {
+ level = get_vlc2(&s->gb, v2_dc_lum_vlc.table, DC_VLC_BITS, 3);
+ } else {
+ level = get_vlc2(&s->gb, v2_dc_chroma_vlc.table, DC_VLC_BITS, 3);
+ }
+ if (level < 0)
+ return -1;
+ level-=256;
+ }else{ //FIXME optimize use unified tables & index
+ if (n < 4) {
+ level = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
+ } else {
+ level = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
+ }
+ if (level < 0){
+ av_log(s->avctx, AV_LOG_ERROR, "illegal dc vlc\n");
+ return -1;
+ }
+
+ if (level == DC_MAX) {
+ level = get_bits(&s->gb, 8);
+ if (get_bits1(&s->gb))
+ level = -level;
+ } else if (level != 0) {
+ if (get_bits1(&s->gb))
+ level = -level;
+ }
+ }
+
+ if(s->msmpeg4_version==1){
+ int32_t *dc_val;
+ pred = msmpeg4v1_pred_dc(s, n, &dc_val);
+ level += pred;
+
+ /* update predictor */
+ *dc_val= level;
+ }else{
+ int16_t *dc_val;
+ pred = ff_msmpeg4_pred_dc(s, n, &dc_val, dir_ptr);
+ level += pred;
+
+ /* update predictor */
+ if (n < 4) {
+ *dc_val = level * s->y_dc_scale;
+ } else {
+ *dc_val = level * s->c_dc_scale;
+ }
+ }
+
+ return level;
+}
+
+//#define ERROR_DETAILS
+int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block,
+ int n, int coded, const uint8_t *scan_table)
+{
+ int level, i, last, run, run_diff;
+ int av_uninit(dc_pred_dir);
+ RLTable *rl;
+ RL_VLC_ELEM *rl_vlc;
+ int qmul, qadd;
+
+ if (s->mb_intra) {
+ qmul=1;
+ qadd=0;
+
+ /* DC coef */
+ level = msmpeg4_decode_dc(s, n, &dc_pred_dir);
+
+ if (level < 0){
+ av_log(s->avctx, AV_LOG_ERROR, "dc overflow- block: %d qscale: %d//\n", n, s->qscale);
+ if(s->inter_intra_pred) level=0;
+ else return -1;
+ }
+ if (n < 4) {
+ rl = &ff_rl_table[s->rl_table_index];
+ if(level > 256*s->y_dc_scale){
+ av_log(s->avctx, AV_LOG_ERROR, "dc overflow+ L qscale: %d//\n", s->qscale);
+ if(!s->inter_intra_pred) return -1;
+ }
+ } else {
+ rl = &ff_rl_table[3 + s->rl_chroma_table_index];
+ if(level > 256*s->c_dc_scale){
+ av_log(s->avctx, AV_LOG_ERROR, "dc overflow+ C qscale: %d//\n", s->qscale);
+ if(!s->inter_intra_pred) return -1;
+ }
+ }
+ block[0] = level;
+
+ run_diff = s->msmpeg4_version >= 4;
+ i = 0;
+ if (!coded) {
+ goto not_coded;
+ }
+ 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;
+ }
+ rl_vlc= rl->rl_vlc[0];
+ } else {
+ qmul = s->qscale << 1;
+ qadd = (s->qscale - 1) | 1;
+ i = -1;
+ rl = &ff_rl_table[3 + s->rl_table_index];
+
+ if(s->msmpeg4_version==2)
+ run_diff = 0;
+ else
+ run_diff = 1;
+
+ if (!coded) {
+ s->block_last_index[n] = i;
+ return 0;
+ }
+ if(!scan_table)
+ scan_table = s->inter_scantable.permutated;
+ rl_vlc= rl->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) {
+ int cache;
+ cache= GET_CACHE(re, &s->gb);
+ /* escape */
+ if (s->msmpeg4_version==1 || (cache&0x80000000)==0) {
+ if (s->msmpeg4_version==1 || (cache&0x40000000)==0) {
+ /* third escape */
+ if(s->msmpeg4_version!=1) LAST_SKIP_BITS(re, &s->gb, 2);
+ UPDATE_CACHE(re, &s->gb);
+ if(s->msmpeg4_version<=3){
+ last= SHOW_UBITS(re, &s->gb, 1); SKIP_CACHE(re, &s->gb, 1);
+ run= SHOW_UBITS(re, &s->gb, 6); SKIP_CACHE(re, &s->gb, 6);
+ level= SHOW_SBITS(re, &s->gb, 8);
+ SKIP_COUNTER(re, &s->gb, 1+6+8);
+ }else{
+ int sign;
+ last= SHOW_UBITS(re, &s->gb, 1); SKIP_BITS(re, &s->gb, 1);
+ if(!s->esc3_level_length){
+ int ll;
+ av_dlog(s->avctx, "ESC-3 %X at %d %d\n",
+ show_bits(&s->gb, 24), s->mb_x, s->mb_y);
+ if(s->qscale<8){
+ ll= SHOW_UBITS(re, &s->gb, 3); SKIP_BITS(re, &s->gb, 3);
+ if(ll==0){
+ ll= 8+SHOW_UBITS(re, &s->gb, 1); SKIP_BITS(re, &s->gb, 1);
+ }
+ }else{
+ ll=2;
+ while(ll<8 && SHOW_UBITS(re, &s->gb, 1)==0){
+ ll++;
+ SKIP_BITS(re, &s->gb, 1);
+ }
+ if(ll<8) SKIP_BITS(re, &s->gb, 1);
+ }
+
+ s->esc3_level_length= ll;
+ s->esc3_run_length= SHOW_UBITS(re, &s->gb, 2) + 3; SKIP_BITS(re, &s->gb, 2);
+ UPDATE_CACHE(re, &s->gb);
+ }
+ run= SHOW_UBITS(re, &s->gb, s->esc3_run_length);
+ SKIP_BITS(re, &s->gb, s->esc3_run_length);
+
+ sign= SHOW_UBITS(re, &s->gb, 1);
+ SKIP_BITS(re, &s->gb, 1);
+
+ level= SHOW_UBITS(re, &s->gb, s->esc3_level_length);
+ SKIP_BITS(re, &s->gb, s->esc3_level_length);
+ if(sign) level= -level;
+ }
+
+#if 0 // waste of time / this will detect very few errors
+ {
+ const int abs_level= FFABS(level);
+ const int run1= run - rl->max_run[last][abs_level] - run_diff;
+ if(abs_level<=MAX_LEVEL && run<=MAX_RUN){
+ if(abs_level <= rl->max_level[last][run]){
+ av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, vlc encoding possible\n");
+ return DECODING_AC_LOST;
+ }
+ 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 DECODING_AC_LOST;
+ }
+ 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 DECODING_AC_LOST;
+ }
+ }
+ }
+#endif
+ //level = level * qmul + (level>0) * qadd - (level<=0) * qadd ;
+ if (level>0) level= level * qmul + qadd;
+ else level= level * qmul - qadd;
+#if 0 // waste of time too :(
+ if(level>2048 || level<-2048){
+ av_log(s->avctx, AV_LOG_ERROR, "|level| overflow in 3. esc\n");
+ return DECODING_AC_LOST;
+ }
+#endif
+ i+= run + 1;
+ if(last) i+=192;
+#ifdef ERROR_DETAILS
+ if(run==66)
+ av_log(s->avctx, AV_LOG_ERROR, "illegal vlc code in ESC3 level=%d\n", level);
+ else if((i>62 && i<192) || i>192+63)
+ av_log(s->avctx, AV_LOG_ERROR, "run overflow in ESC3 i=%d run=%d level=%d\n", i, run, level);
+#endif
+ } 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] + run_diff; //FIXME opt indexing
+ level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
+ LAST_SKIP_BITS(re, &s->gb, 1);
+#ifdef ERROR_DETAILS
+ if(run==66)
+ av_log(s->avctx, AV_LOG_ERROR, "illegal vlc code in ESC2 level=%d\n", level);
+ else if((i>62 && i<192) || i>192+63)
+ av_log(s->avctx, AV_LOG_ERROR, "run overflow in ESC2 i=%d run=%d level=%d\n", i, run, level);
+#endif
+ }
+ } 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);
+#ifdef ERROR_DETAILS
+ if(run==66)
+ av_log(s->avctx, AV_LOG_ERROR, "illegal vlc code in ESC1 level=%d\n", level);
+ else if((i>62 && i<192) || i>192+63)
+ av_log(s->avctx, AV_LOG_ERROR, "run overflow in ESC1 i=%d run=%d level=%d\n", i, run, level);
+#endif
+ }
+ } else {
+ i+= run;
+ level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
+ LAST_SKIP_BITS(re, &s->gb, 1);
+#ifdef ERROR_DETAILS
+ if(run==66)
+ av_log(s->avctx, AV_LOG_ERROR, "illegal vlc code level=%d\n", level);
+ else if((i>62 && i<192) || i>192+63)
+ av_log(s->avctx, AV_LOG_ERROR, "run overflow i=%d run=%d level=%d\n", i, run, level);
+#endif
+ }
+ if (i > 62){
+ i-= 192;
+ if(i&(~63)){
+ const int left= get_bits_left(&s->gb);
+ if(((i+192 == 64 && level/qmul==-1) || !(s->err_recognition&AV_EF_BITSTREAM)) && left>=0){
+ av_log(s->avctx, AV_LOG_ERROR, "ignoring overflow at %d %d\n", s->mb_x, s->mb_y);
+ break;
+ }else{
+ 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;
+ }
+ CLOSE_READER(re, &s->gb);
+ }
+ not_coded:
+ if (s->mb_intra) {
+ ff_mpeg4_pred_ac(s, block, n, dc_pred_dir);
+ if (s->ac_pred) {
+ i = 63; /* XXX: not optimal */
+ }
+ }
+ if(s->msmpeg4_version>=4 && i>0) i=63; //FIXME/XXX optimize
+ s->block_last_index[n] = i;
+
+ return 0;
+}
+
+int ff_msmpeg4_decode_motion(MpegEncContext * s,
+ int *mx_ptr, int *my_ptr)
+{
+ MVTable *mv;
+ int code, mx, my;
+
+ mv = &ff_mv_tables[s->mv_table_index];
+
+ code = get_vlc2(&s->gb, mv->vlc.table, MV_VLC_BITS, 2);
+ if (code < 0){
+ av_log(s->avctx, AV_LOG_ERROR, "illegal MV code at %d %d\n", s->mb_x, s->mb_y);
+ return -1;
+ }
+ if (code == mv->n) {
+ mx = get_bits(&s->gb, 6);
+ my = get_bits(&s->gb, 6);
+ } else {
+ mx = mv->table_mvx[code];
+ my = mv->table_mvy[code];
+ }
+
+ mx += *mx_ptr - 32;
+ my += *my_ptr - 32;
+ /* WARNING : they do not do exactly modulo encoding */
+ if (mx <= -64)
+ mx += 64;
+ else if (mx >= 64)
+ mx -= 64;
+
+ if (my <= -64)
+ my += 64;
+ else if (my >= 64)
+ my -= 64;
+ *mx_ptr = mx;
+ *my_ptr = my;
+ return 0;
+}
+
+AVCodec ff_msmpeg4v1_decoder = {
+ .name = "msmpeg4v1",
+ .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_MSMPEG4V1,
+ .priv_data_size = sizeof(MpegEncContext),
+ .init = ff_msmpeg4_decode_init,
+ .close = ff_h263_decode_end,
+ .decode = ff_h263_decode_frame,
+ .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .pix_fmts = ff_pixfmt_list_420,
+};
+
+AVCodec ff_msmpeg4v2_decoder = {
+ .name = "msmpeg4v2",
+ .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_MSMPEG4V2,
+ .priv_data_size = sizeof(MpegEncContext),
+ .init = ff_msmpeg4_decode_init,
+ .close = ff_h263_decode_end,
+ .decode = ff_h263_decode_frame,
+ .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .pix_fmts = ff_pixfmt_list_420,
+};
+
+AVCodec ff_msmpeg4v3_decoder = {
+ .name = "msmpeg4",
+ .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_MSMPEG4V3,
+ .priv_data_size = sizeof(MpegEncContext),
+ .init = ff_msmpeg4_decode_init,
+ .close = ff_h263_decode_end,
+ .decode = ff_h263_decode_frame,
+ .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .pix_fmts = ff_pixfmt_list_420,
+};
+
+AVCodec ff_wmv1_decoder = {
+ .name = "wmv1",
+ .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_WMV1,
+ .priv_data_size = sizeof(MpegEncContext),
+ .init = ff_msmpeg4_decode_init,
+ .close = ff_h263_decode_end,
+ .decode = ff_h263_decode_frame,
+ .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
+ .pix_fmts = ff_pixfmt_list_420,
+};

libav-v9.6.tar.bz2/libavcodec/msmpeg4enc.c -> libav-v10.1.tar.bz2/libavcodec/msmpeg4enc.c Changed

@@ -30,6 +30,7 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "libavutil/attributes.h"
 #include "libavutil/avutil.h"
 #include "libavutil/mem.h"
 #include "mpegvideo.h"
@@ -45,7 +46,7 @@
 static uint8_t rl_length[NB_RL_TABLES][MAX_LEVEL+1][MAX_RUN+1][2];
 
 /* build the table which associate a (x,y) motion vector to a vlc */
-static void init_mv_table(MVTable *tab)
+static av_cold void init_mv_table(MVTable *tab)
 {
 int i, x, y;
 
@@ -368,7 +369,7 @@
 }
 
 void ff_msmpeg4_encode_mb(MpegEncContext * s,
- DCTELEM block[6][64],
+ int16_t block[6][64],
 int motion_x, int motion_y)
 {
 int cbp, coded_cbp, i;
@@ -569,7 +570,7 @@
 /* Encoding of a block. Very similar to MPEG4 except for a different
 escape coding (same as H263) and more vlc tables.
 */
-void ff_msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n)
+void ff_msmpeg4_encode_block(MpegEncContext * s, int16_t * block, int n)
 {
 int level, run, last, i, j, last_index;
 int last_non_zero, sign, slevel;

libav-v9.6.tar.bz2/libavcodec/msrle.c -> libav-v10.1.tar.bz2/libavcodec/msrle.c Changed

@@ -33,12 +33,12 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
+#include "internal.h"
 #include "msrledec.h"
 
 typedef struct MsrleContext {
 AVCodecContext *avctx;
- AVFrame frame;
+ AVFrame *frame;
 
 GetByteContext gb;
 const unsigned char *buf;
@@ -63,10 +63,12 @@
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "unsupported bits per sample\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- s->frame.data[0] = NULL;
+ s->frame = av_frame_alloc();
+ if (!s->frame)
+ return AVERROR(ENOMEM);
 
 return 0;
 }
@@ -79,33 +81,32 @@
 int buf_size = avpkt->size;
 MsrleContext *s = avctx->priv_data;
 int istride = FFALIGN(avctx->width*avctx->bits_per_coded_sample, 32) / 8;
+ int ret;
 
 s->buf = buf;
 s->size = buf_size;
 
- s->frame.reference = 1;
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, &s->frame)) {
+ if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 if (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 / 8;
- uint8_t *ptr = s->frame.data[0];
+ uint8_t *ptr = s->frame->data[0];
 uint8_t *buf = avpkt->data + (avctx->height-1)*istride;
 int i, j;
 
@@ -121,15 +122,17 @@
 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)
+ return ret;
+
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
 /* report that the buffer was completely consumed */
 return buf_size;
@@ -140,14 +143,14 @@
 MsrleContext *s = avctx->priv_data;
 
 /* release the last frame */
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ av_frame_free(&s->frame);
 
 return 0;
 }
 
 AVCodec ff_msrle_decoder = {
 .name = "msrle",
+ .long_name = NULL_IF_CONFIG_SMALL("Microsoft RLE"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MSRLE,
 .priv_data_size = sizeof(MsrleContext),
@@ -155,5 +158,4 @@
 .close = msrle_decode_end,
 .decode = msrle_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Microsoft RLE"),
 };

libav-v9.6.tar.bz2/libavcodec/mss1.c -> libav-v10.1.tar.bz2/libavcodec/mss1.c Changed

@@ -25,11 +25,12 @@
 */
 
 #include "avcodec.h"
+#include "internal.h"
 #include "mss12.h"
 
 typedef struct MSS1Context {
 MSS12Context ctx;
- AVFrame pic;
+ AVFrame *pic;
 SliceContext sc;
 } MSS1Context;
 
@@ -150,38 +151,37 @@
 init_get_bits(&gb, buf, buf_size * 8);
 arith_init(&acoder, &gb);
 
- ctx->pic.reference = 3;
- ctx->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_READABLE |
- FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if ((ret = avctx->reget_buffer(avctx, &ctx->pic)) < 0) {
+ if ((ret = ff_reget_buffer(avctx, ctx->pic)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
 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)
+ return ret;
 
 *got_frame = 1;
- *(AVFrame*)data = ctx->pic;
 
 /* always report that the buffer was completely consumed */
 return buf_size;
@@ -193,7 +193,10 @@
 int ret;
 
 c->ctx.avctx = avctx;
- avctx->coded_frame = &c->pic;
+
+ c->pic = av_frame_alloc();
+ if (!c->pic)
+ return AVERROR(ENOMEM);
 
 ret = ff_mss12_decode_init(&c->ctx, 0, &c->sc, NULL);
 
@@ -206,8 +209,7 @@
 {
 MSS1Context * const ctx = avctx->priv_data;
 
- if (ctx->pic.data[0])
- avctx->release_buffer(avctx, &ctx->pic);
+ av_frame_free(&ctx->pic);
 ff_mss12_decode_end(&ctx->ctx);
 
 return 0;
@@ -215,6 +217,7 @@
 
 AVCodec ff_mss1_decoder = {
 .name = "mss1",
+ .long_name = NULL_IF_CONFIG_SMALL("MS Screen 1"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MSS1,
 .priv_data_size = sizeof(MSS1Context),
@@ -222,5 +225,4 @@
 .close = mss1_decode_end,
 .decode = mss1_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("MS Screen 1"),
 };

libav-v9.6.tar.bz2/libavcodec/mss12.h -> libav-v10.1.tar.bz2/libavcodec/mss12.h Changed

libav-v9.6.tar.bz2/libavcodec/mss2.c -> libav-v10.1.tar.bz2/libavcodec/mss2.c Changed

@@ -24,6 +24,7 @@
 */
 
 #include "libavutil/avassert.h"
+#include "error_resilience.h"
 #include "internal.h"
 #include "msmpeg4data.h"
 #include "vc1.h"
@@ -33,8 +34,7 @@
 typedef struct MSS2Context {
 VC1Context v;
 int split_position;
- AVFrame pic;
- AVFrame last_pic;
+ AVFrame *last_pic;
 MSS12Context c;
 MSS2DSPContext dsp;
 SliceContext sc[2];
@@ -163,7 +163,7 @@
 
 ncol = *buf++;
 if (ncol > ctx->free_colours || buf_size < 2 + ncol * 3)
- return -1;
+ return AVERROR_INVALIDDATA;
 for (i = 0; i < ncol; i++)
 *pal++ = AV_RB24(buf + 3 * i);
 
@@ -189,7 +189,7 @@
 READ_PAIR(y, endy)
 
 if (endx >= w || endy >= h || x > endx || y > endy)
- return -1;
+ return AVERROR_INVALIDDATA;
 dst += x + stride * y;
 w = endx - x + 1;
 h = endy - y + 1;
@@ -373,21 +373,15 @@
 VC1Context *v = avctx->priv_data;
 MpegEncContext *s = &v->s;
 AVFrame *f;
+ int ret;
 
 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 -1;
- s->current_picture_ptr = &s->picture[i];
- }
-
 init_get_bits(&s->gb, buf, buf_size * 8);
 
 s->loop_filter = avctx->skip_loop_filter < AVDISCARD_ALL;
 
- if (ff_vc1_parse_frame_header(v, &s->gb) == -1) {
+ if (ff_vc1_parse_frame_header(v, &s->gb) < 0) {
 av_log(v->s.avctx, AV_LOG_ERROR, "header error\n");
 return AVERROR_INVALIDDATA;
 }
@@ -399,13 +393,13 @@
 
 avctx->pix_fmt = AV_PIX_FMT_YUV420P;
 
- if (ff_MPV_frame_start(s, avctx) < 0) {
+ if ((ret = ff_MPV_frame_start(s, avctx)) < 0) {
 av_log(v->s.avctx, AV_LOG_ERROR, "ff_MPV_frame_start error\n");
 avctx->pix_fmt = AV_PIX_FMT_RGB24;
- return -1;
+ return ret;
 }
 
- ff_er_frame_start(s);
+ ff_mpeg_er_frame_start(s);
 
 v->bits = buf_size * 8;
 
@@ -418,7 +412,7 @@
 
 ff_vc1_decode_blocks(v);
 
- ff_er_frame_end(s);
+ ff_er_frame_end(&s->er);
 
 ff_MPV_frame_end(s);
 
@@ -429,8 +423,8 @@
 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);
 } else if (v->respic)
- av_log_ask_for_sample(v->s.avctx,
- "Asymmetric WMV9 rectangle subsampling\n");
+ avpriv_request_sample(v->s.avctx,
+ "Asymmetric WMV9 rectangle subsampling");
 
 av_assert0(f->linesize[1] == f->linesize[2]);
 
@@ -468,6 +462,7 @@
 int buf_size = avpkt->size;
 MSS2Context *ctx = avctx->priv_data;
 MSS12Context *c = &ctx->c;
+ AVFrame *frame = data;
 GetBitContext gb;
 GetByteContext gB;
 ArithCoder acoder;
@@ -521,8 +516,8 @@
 return AVERROR_INVALIDDATA;
 
 avctx->pix_fmt = is_555 ? AV_PIX_FMT_RGB555 : AV_PIX_FMT_RGB24;
- if (ctx->pic.data[0] && ctx->pic.format != avctx->pix_fmt)
- avctx->release_buffer(avctx, &ctx->pic);
+ if (ctx->last_pic->format != avctx->pix_fmt)
+ av_frame_unref(ctx->last_pic);
 
 if (has_wmv9) {
 bytestream2_init(&gB, buf, buf_size + ARITH2_PADDING);
@@ -594,54 +589,37 @@
 }
 
 if (c->mvX < 0 || c->mvY < 0) {
- FFSWAP(AVFrame, ctx->pic, ctx->last_pic);
 FFSWAP(uint8_t *, c->pal_pic, c->last_pal_pic);
 
- if (ctx->pic.data[0])
- avctx->release_buffer(avctx, &ctx->pic);
-
- ctx->pic.reference = 3;
- ctx->pic.buffer_hints = FF_BUFFER_HINTS_VALID |
- FF_BUFFER_HINTS_READABLE |
- FF_BUFFER_HINTS_PRESERVE |
- FF_BUFFER_HINTS_REUSABLE;
-
- if ((ret = ff_get_buffer(avctx, &ctx->pic)) < 0) {
+ if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
 
- if (ctx->last_pic.data[0]) {
- av_assert0(ctx->pic.linesize[0] == ctx->last_pic.linesize[0]);
- c->last_rgb_pic = ctx->last_pic.data[0] +
- ctx->last_pic.linesize[0] * (avctx->height - 1);
+ if (ctx->last_pic->data[0]) {
+ av_assert0(frame->linesize[0] == ctx->last_pic->linesize[0]);
+ c->last_rgb_pic = ctx->last_pic->data[0] +
+ ctx->last_pic->linesize[0] * (avctx->height - 1);
 } else {
 av_log(avctx, AV_LOG_ERROR, "Missing keyframe\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 } else {
- if (ctx->last_pic.data[0])
- avctx->release_buffer(avctx, &ctx->last_pic);
-
- ctx->pic.reference = 3;
- ctx->pic.buffer_hints = FF_BUFFER_HINTS_VALID |
- FF_BUFFER_HINTS_READABLE |
- FF_BUFFER_HINTS_PRESERVE |
- FF_BUFFER_HINTS_REUSABLE;
-
- if ((ret = avctx->reget_buffer(avctx, &ctx->pic)) < 0) {
+ if ((ret = ff_reget_buffer(avctx, ctx->last_pic)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
 return ret;
 }
+ if ((ret = av_frame_ref(frame, ctx->last_pic)) < 0)
+ return ret;
 
 c->last_rgb_pic = NULL;
 }
- c->rgb_pic = ctx->pic.data[0] +
- ctx->pic.linesize[0] * (avctx->height - 1);
- c->rgb_stride = -ctx->pic.linesize[0];
+ c->rgb_pic = frame->data[0] +
+ frame->linesize[0] * (avctx->height - 1);
+ c->rgb_stride = -frame->linesize[0];
 
- ctx->pic.key_frame = keyframe;
- ctx->pic.pict_type = keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
+ frame->key_frame = keyframe;
+ frame->pict_type = keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
 
 if (is_555) {
 bytestream2_init(&gB, buf, buf_size);
@@ -744,8 +722,14 @@
 if (buf_size)
 av_log(avctx, AV_LOG_WARNING, "buffer not fully consumed\n");
 
+ if (c->mvX < 0 || c->mvY < 0) {
+ av_frame_unref(ctx->last_pic);
+ ret = av_frame_ref(ctx->last_pic, frame);
+ if (ret < 0)
+ return ret;
+ }
+
 *got_frame = 1;
- *(AVFrame *)data = ctx->pic;
 
 return avpkt->size;
 }
@@ -753,16 +737,12 @@
 static av_cold int wmv9_init(AVCodecContext *avctx)
 {
 VC1Context *v = avctx->priv_data;
+ int ret;
 
 v->s.avctx = avctx;
- avctx->flags |= CODEC_FLAG_EMU_EDGE;
- v->s.flags |= CODEC_FLAG_EMU_EDGE;
 
- if (avctx->idct_algo == FF_IDCT_AUTO)
- avctx->idct_algo = FF_IDCT_WMV2;
-
- if (ff_vc1_init_common(v) < 0)
- return -1;
+ if ((ret = ff_vc1_init_common(v)) < 0)
+ return ret;
 ff_vc1dsp_init(&v->vc1dsp);
 
 v->profile = PROFILE_MAIN;
@@ -790,7 +770,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;
@@ -802,9 +782,9 @@
 
 ff_vc1_init_transposed_scantables(v);
 
- if (ff_msmpeg4_decode_init(avctx) < 0 ||
- ff_vc1_decode_init_alloc_tables(v) < 0)
- return -1;
+ if ((ret = ff_msmpeg4_decode_init(avctx)) < 0 ||
+ (ret = ff_vc1_decode_init_alloc_tables(v)) < 0)
+ return ret;
 
 /* error concealment */
 v->s.me.qpel_put = v->s.dsp.put_qpel_pixels_tab;
@@ -817,10 +797,7 @@
 {
 MSS2Context *const ctx = avctx->priv_data;
 
- if (ctx->pic.data[0])
- avctx->release_buffer(avctx, &ctx->pic);
- if (ctx->last_pic.data[0])
- avctx->release_buffer(avctx, &ctx->last_pic);
+ av_frame_free(&ctx->last_pic);
 
 ff_mss12_decode_end(&ctx->c);
 av_freep(&ctx->c.pal_pic);
@@ -836,7 +813,6 @@
 MSS12Context *c = &ctx->c;
 int ret;
 c->avctx = avctx;
- avctx->coded_frame = &ctx->pic;
 if (ret = ff_mss12_decode_init(c, 1, &ctx->sc[0], &ctx->sc[1]))
 return ret;
 c->pal_stride = c->mask_stride;
@@ -855,11 +831,18 @@
 avctx->pix_fmt = c->free_colours == 127 ? AV_PIX_FMT_RGB555
 : AV_PIX_FMT_RGB24;
 
+ ctx->last_pic = av_frame_alloc();
+ if (!ctx->last_pic) {
+ mss2_decode_end(avctx);
+ return AVERROR(ENOMEM);
+ }
+
 return 0;
 }
 
 AVCodec ff_mss2_decoder = {
 .name = "mss2",
+ .long_name = NULL_IF_CONFIG_SMALL("MS Windows Media Video V9 Screen"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MSS2,
 .priv_data_size = sizeof(MSS2Context),
@@ -867,5 +850,4 @@
 .close = mss2_decode_end,
 .decode = mss2_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("MS Windows Media Video V9 Screen"),
 };

libav-v9.6.tar.bz2/libavcodec/mss2dsp.h -> libav-v10.1.tar.bz2/libavcodec/mss2dsp.h Changed

libav-v9.6.tar.bz2/libavcodec/mss3.c -> libav-v10.1.tar.bz2/libavcodec/mss3.c Changed

@@ -27,6 +27,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "dsputil.h"
+#include "internal.h"
 #include "mss34dsp.h"
 
 #define HEADER_SIZE 27
@@ -107,7 +108,7 @@
 
 typedef struct MSS3Context {
 AVCodecContext *avctx;
- AVFrame pic;
+ AVFrame *pic;
 
 int got_error;
 RangeCoder coder;
@@ -730,18 +731,16 @@
 return buf_size;
 c->got_error = 0;
 
- c->pic.reference = 3;
- c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE |
- FF_BUFFER_HINTS_REUSABLE;
- if ((ret = avctx->reget_buffer(avctx, &c->pic)) < 0) {
+ if ((ret = ff_reget_buffer(avctx, c->pic)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
 return ret;
 }
- c->pic.key_frame = keyframe;
- 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;
 if (!bytestream2_get_bytes_left(&gb)) {
+ if ((ret = av_frame_ref(data, c->pic)) < 0)
+ return ret;
 *got_frame = 1;
- *(AVFrame*)data = c->pic;
 
 return buf_size;
 }
@@ -752,9 +751,9 @@
 
 mb_width = dec_width >> 4;
 mb_height = dec_height >> 4;
- dst[0] = c->pic.data[0] + dec_x + dec_y * c->pic.linesize[0];
- dst[1] = c->pic.data[1] + dec_x / 2 + (dec_y / 2) * c->pic.linesize[1];
- dst[2] = c->pic.data[2] + dec_x / 2 + (dec_y / 2) * c->pic.linesize[2];
+ dst[0] = c->pic->data[0] + dec_x + dec_y * c->pic->linesize[0];
+ dst[1] = c->pic->data[1] + dec_x / 2 + (dec_y / 2) * c->pic->linesize[1];
+ dst[2] = c->pic->data[2] + dec_x / 2 + (dec_y / 2) * c->pic->linesize[2];
 for (y = 0; y < mb_height; y++) {
 for (x = 0; x < mb_width; x++) {
 for (i = 0; i < 3; i++) {
@@ -765,23 +764,23 @@
 case FILL_BLOCK:
 decode_fill_block(acoder, c->fill_coder + i,
 dst[i] + x * blk_size,
- c->pic.linesize[i], blk_size);
+ c->pic->linesize[i], blk_size);
 break;
 case IMAGE_BLOCK:
 decode_image_block(acoder, c->image_coder + i,
 dst[i] + x * blk_size,
- c->pic.linesize[i], blk_size);
+ c->pic->linesize[i], blk_size);
 break;
 case DCT_BLOCK:
 decode_dct_block(acoder, c->dct_coder + i,
 dst[i] + x * blk_size,
- c->pic.linesize[i], blk_size,
+ c->pic->linesize[i], blk_size,
 c->dctblock, x, y);
 break;
 case HAAR_BLOCK:
 decode_haar_block(acoder, c->haar_coder + i,
 dst[i] + x * blk_size,
- c->pic.linesize[i], blk_size,
+ c->pic->linesize[i], blk_size,
 c->hblock);
 break;
 }
@@ -793,17 +792,31 @@
 }
 }
 }
- dst[0] += c->pic.linesize[0] * 16;
- dst[1] += c->pic.linesize[1] * 8;
- dst[2] += c->pic.linesize[2] * 8;
+ dst[0] += c->pic->linesize[0] * 16;
+ dst[1] += c->pic->linesize[1] * 8;
+ dst[2] += c->pic->linesize[2] * 8;
 }
 
+ if ((ret = av_frame_ref(data, c->pic)) < 0)
+ return ret;
+
 *got_frame = 1;
- *(AVFrame*)data = c->pic;
 
 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;
@@ -835,29 +848,22 @@
 }
 }
 
+ c->pic = av_frame_alloc();
+ if (!c->pic) {
+ mss3_decode_end(avctx);
+ return AVERROR(ENOMEM);
+ }
+
 avctx->pix_fmt = AV_PIX_FMT_YUV420P;
- avctx->coded_frame = &c->pic;
 
 init_coders(c);
 
 return 0;
 }
 
-static av_cold int mss3_decode_end(AVCodecContext *avctx)
-{
- MSS3Context * const c = avctx->priv_data;
- int i;
-
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &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"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MSA1,
 .priv_data_size = sizeof(MSS3Context),
@@ -865,5 +871,4 @@
 .close = mss3_decode_end,
 .decode = mss3_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("MS ATC Screen"),
 };

libav-v9.6.tar.bz2/libavcodec/mss4.c -> libav-v10.1.tar.bz2/libavcodec/mss4.c Changed

@@ -29,6 +29,7 @@
 #include "bytestream.h"
 #include "dsputil.h"
 #include "get_bits.h"
+#include "internal.h"
 #include "mss34dsp.h"
 #include "unary.h"
 
@@ -125,8 +126,7 @@
 #define MAX_ENTRIES 162
 
 typedef struct MSS4Context {
- AVFrame pic;
- DSPContext dsp;
+ AVFrame *pic;
 
 VLC dc_vlc[2], ac_vlc[2];
 VLC vec_entry_vlc[2];
@@ -297,10 +297,10 @@
 return ret;
 c->prev_dc[0][mb_x * 2 + i] = c->dc_cache[j][LEFT];
 
- ff_mss34_dct_put(out + xpos * 8, c->pic.linesize[0],
+ ff_mss34_dct_put(out + xpos * 8, c->pic->linesize[0],
 c->block);
 }
- out += 8 * c->pic.linesize[0];
+ out += 8 * c->pic->linesize[0];
 }
 
 for (i = 1; i < 3; i++) {
@@ -320,7 +320,7 @@
 for (j = 0; j < 16; j++) {
 for (k = 0; k < 8; k++)
 AV_WN16A(out + k * 2, c->imgbuf[i][k + (j & ~1) * 4] * 0x101);
- out += c->pic.linesize[i];
+ out += c->pic->linesize[i];
 }
 }
 
@@ -481,7 +481,7 @@
 
 for (i = 0; i < 3; i++)
 for (j = 0; j < 16; j++)
- memcpy(picdst[i] + mb_x * 16 + j * ctx->pic.linesize[i],
+ memcpy(picdst[i] + mb_x * 16 + j * ctx->pic->linesize[i],
 ctx->imgbuf[i] + j * 16, 16);
 
 return 0;
@@ -554,20 +554,17 @@
 return AVERROR_INVALIDDATA;
 }
 
- c->pic.reference = 3;
- c->pic.buffer_hints = FF_BUFFER_HINTS_VALID |
- FF_BUFFER_HINTS_PRESERVE |
- FF_BUFFER_HINTS_REUSABLE;
- if ((ret = avctx->reget_buffer(avctx, &c->pic)) < 0) {
+ if ((ret = ff_reget_buffer(avctx, c->pic)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
 return ret;
 }
- c->pic.key_frame = (frame_type == INTRA_FRAME);
- c->pic.pict_type = (frame_type == INTRA_FRAME) ? AV_PICTURE_TYPE_I
+ c->pic->key_frame = (frame_type == INTRA_FRAME);
+ c->pic->pict_type = (frame_type == INTRA_FRAME) ? AV_PICTURE_TYPE_I
 : AV_PICTURE_TYPE_P;
 if (frame_type == SKIP_FRAME) {
 *got_frame = 1;
- *(AVFrame*)data = c->pic;
+ if ((ret = av_frame_ref(data, c->pic)) < 0)
+ return ret;
 
 return buf_size;
 }
@@ -582,9 +579,9 @@
 
 mb_width = FFALIGN(width, 16) >> 4;
 mb_height = FFALIGN(height, 16) >> 4;
- dst[0] = c->pic.data[0];
- dst[1] = c->pic.data[1];
- dst[2] = c->pic.data[2];
+ dst[0] = c->pic->data[0];
+ dst[1] = c->pic->data[1];
+ dst[2] = c->pic->data[2];
 
 memset(c->prev_vec, 0, sizeof(c->prev_vec));
 for (y = 0; y < mb_height; y++) {
@@ -618,17 +615,32 @@
 if (blk_type != DCT_BLOCK)
 mss4_update_dc_cache(c, x);
 }
- dst[0] += c->pic.linesize[0] * 16;
- dst[1] += c->pic.linesize[1] * 16;
- dst[2] += c->pic.linesize[2] * 16;
+ dst[0] += c->pic->linesize[0] * 16;
+ dst[1] += c->pic->linesize[1] * 16;
+ dst[2] += c->pic->linesize[2] * 16;
 }
 
+ if ((ret = av_frame_ref(data, c->pic)) < 0)
+ return ret;
+
 *got_frame = 1;
- *(AVFrame*)data = c->pic;
 
 return buf_size;
 }
 
+static av_cold int mss4_decode_end(AVCodecContext *avctx)
+{
+ MSS4Context * const c = avctx->priv_data;
+ int i;
+
+ 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;
@@ -649,28 +661,20 @@
 }
 }
 
- avctx->pix_fmt = AV_PIX_FMT_YUV444P;
- avctx->coded_frame = &c->pic;
-
- return 0;
-}
-
-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) {
+ mss4_decode_end(avctx);
+ return AVERROR(ENOMEM);
+ }
 
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
- 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;
 }
 
 AVCodec ff_mts2_decoder = {
 .name = "mts2",
+ .long_name = NULL_IF_CONFIG_SMALL("MS Expression Encoder Screen"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MTS2,
 .priv_data_size = sizeof(MSS4Context),
@@ -678,5 +682,4 @@
 .close = mss4_decode_end,
 .decode = mss4_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("MS Expression Encoder Screen"),
 };

libav-v9.6.tar.bz2/libavcodec/msvideo1.c -> libav-v10.1.tar.bz2/libavcodec/msvideo1.c Changed

@@ -34,6 +34,7 @@
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
+#include "internal.h"
 
 #define PALETTE_COUNT 256
 #define CHECK_STREAM_PTR(n) \
@@ -46,7 +47,7 @@
 typedef struct Msvideo1Context {
 
 AVCodecContext *avctx;
- AVFrame frame;
+ AVFrame *frame;
 
 const unsigned char *buf;
 int size;
@@ -71,7 +72,9 @@
 avctx->pix_fmt = AV_PIX_FMT_RGB555;
 }
 
- s->frame.data[0] = NULL;
+ s->frame = av_frame_alloc();
+ if (!s->frame)
+ return AVERROR(ENOMEM);
 
 return 0;
 }
@@ -92,8 +95,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;
@@ -173,7 +176,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)
@@ -192,8 +195,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;
@@ -292,15 +295,14 @@
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 Msvideo1Context *s = avctx->priv_data;
+ int ret;
 
 s->buf = buf;
 s->size = buf_size;
 
- s->frame.reference = 1;
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, &s->frame)) {
+ if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 if (s->mode_8bit) {
@@ -308,7 +310,7 @@
 
 if (pal) {
 memcpy(s->pal, pal, AVPALETTE_SIZE);
- s->frame.palette_has_changed = 1;
+ s->frame->palette_has_changed = 1;
 }
 }
 
@@ -317,8 +319,10 @@
 else
 msvideo1_decode_16bit(s);
 
+ if ((ret = av_frame_ref(data, s->frame)) < 0)
+ return ret;
+
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
 /* report that the buffer was completely consumed */
 return buf_size;
@@ -328,14 +332,14 @@
 {
 Msvideo1Context *s = avctx->priv_data;
 
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ av_frame_free(&s->frame);
 
 return 0;
 }
 
 AVCodec ff_msvideo1_decoder = {
 .name = "msvideo1",
+ .long_name = NULL_IF_CONFIG_SMALL("Microsoft Video 1"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_MSVIDEO1,
 .priv_data_size = sizeof(Msvideo1Context),
@@ -343,5 +347,4 @@
 .close = msvideo1_decode_end,
 .decode = msvideo1_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Microsoft Video 1"),
 };

libav-v9.6.tar.bz2/libavcodec/mxpegdec.c -> libav-v10.1.tar.bz2/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,12 +42,36 @@
 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]);
+
+ 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->picture[0].reference = s->picture[1].reference = 3;
- 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);
 }
 
@@ -167,7 +191,6 @@
 const uint8_t *unescaped_buf_ptr;
 int unescaped_buf_size;
 int start_code;
- AVFrame *picture = data;
 int ret;
 
 buf_ptr = buf;
@@ -248,9 +271,9 @@
 break;
 }
 /* use stored SOF data to allocate current picture */
- if (jpg->picture_ptr->data[0])
- avctx->release_buffer(avctx, jpg->picture_ptr);
- if (ff_get_buffer(avctx, jpg->picture_ptr) < 0) {
+ av_frame_unref(jpg->picture_ptr);
+ if (ff_get_buffer(avctx, jpg->picture_ptr,
+ AV_GET_BUFFER_FLAG_REF) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return AVERROR(ENOMEM);
 }
@@ -263,13 +286,14 @@
 }
 
 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;
 
 /* allocate dummy reference picture if needed */
 if (!reference_ptr->data[0] &&
- ff_get_buffer(avctx, reference_ptr) < 0) {
+ ff_get_buffer(avctx, reference_ptr,
+ AV_GET_BUFFER_FLAG_REF) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return AVERROR(ENOMEM);
 }
@@ -293,10 +317,13 @@
 
 the_end:
 if (jpg->got_picture) {
+ int ret = av_frame_ref(data, jpg->picture_ptr);
+ if (ret < 0)
+ return ret;
 *got_frame = 1;
- *picture = *jpg->picture_ptr;
+
 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)
@@ -309,26 +336,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) {
- if (s->picture[i].data[0])
- avctx->release_buffer(avctx, &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"),

libav-v9.6.tar.bz2/libavcodec/nellymoser.c -> libav-v10.1.tar.bz2/libavcodec/nellymoser.c Changed

libav-v9.6.tar.bz2/libavcodec/nellymoserdec.c -> libav-v10.1.tar.bz2/libavcodec/nellymoserdec.c Changed

@@ -32,10 +32,10 @@
 */
 
 #include "libavutil/channel_layout.h"
+#include "libavutil/float_dsp.h"
 #include "libavutil/lfg.h"
 #include "libavutil/random_seed.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "fft.h"
 #include "fmtconvert.h"
 #include "internal.h"
@@ -48,11 +48,10 @@
 
 typedef struct NellyMoserDecodeContext {
 AVCodecContext* avctx;
- AVFrame frame;
 AVLFG random_state;
 GetBitContext gb;
 float scale_bias;
- DSPContext dsp;
+ AVFloatDSPContext fdsp;
 FFTContext imdct_ctx;
 DECLARE_ALIGNED(32, float, imdct_buf)[2][NELLY_BUF_LEN];
 float *imdct_out;
@@ -107,7 +106,9 @@
 (NELLY_BUF_LEN - NELLY_FILL_LEN) * sizeof(float));
 
 s->imdct_ctx.imdct_half(&s->imdct_ctx, s->imdct_out, aptr);
- s->dsp.vector_fmul_window(aptr, s->imdct_prev + NELLY_BUF_LEN/2, s->imdct_out, ff_sine_128, NELLY_BUF_LEN/2);
+ s->fdsp.vector_fmul_window(aptr, s->imdct_prev + NELLY_BUF_LEN / 2,
+ s->imdct_out, ff_sine_128,
+ NELLY_BUF_LEN / 2);
 FFSWAP(float *, s->imdct_out, s->imdct_prev);
 }
 }
@@ -121,7 +122,7 @@
 av_lfg_init(&s->random_state, 0);
 ff_mdct_init(&s->imdct_ctx, 8, 1, 1.0);
 
- ff_dsputil_init(&s->dsp, avctx);
+ avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
 
 s->scale_bias = 1.0/(32768*8);
 avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
@@ -133,15 +134,13 @@
 avctx->channels = 1;
 avctx->channel_layout = AV_CH_LAYOUT_MONO;
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
 static int decode_tag(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 NellyMoserDecodeContext *s = avctx->priv_data;
@@ -166,12 +165,12 @@
 */
 
 /* get output buffer */
- s->frame.nb_samples = NELLY_SAMPLES * blocks;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = NELLY_SAMPLES * blocks;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- samples_flt = (float *)s->frame.data[0];
+ samples_flt = (float *)frame->data[0];
 
 for (i=0 ; i<blocks ; i++) {
 nelly_decode_block(s, buf, samples_flt);
@@ -179,8 +178,7 @@
 buf += NELLY_BLOCK_LEN;
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
 return buf_size;
 }
@@ -195,6 +193,7 @@
 
 AVCodec ff_nellymoser_decoder = {
 .name = "nellymoser",
+ .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_NELLYMOSER,
 .priv_data_size = sizeof(NellyMoserDecodeContext),
@@ -202,7 +201,6 @@
 .close = decode_end,
 .decode = decode_tag,
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_PARAM_CHANGE,
- .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT,
 AV_SAMPLE_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/nellymoserenc.c -> libav-v10.1.tar.bz2/libavcodec/nellymoserenc.c Changed

@@ -40,7 +40,6 @@
 #include "nellymoser.h"
 #include "avcodec.h"
 #include "audio_frame_queue.h"
-#include "dsputil.h"
 #include "fft.h"
 #include "internal.h"
 #include "sinewin.h"
@@ -55,7 +54,6 @@
 typedef struct NellyMoserEncodeContext {
 AVCodecContext *avctx;
 int last_frame;
- DSPContext dsp;
 AVFloatDSPContext fdsp;
 FFTContext mdct_ctx;
 AudioFrameQueue afq;
@@ -122,12 +120,12 @@
 float *in1 = s->buf + NELLY_BUF_LEN;
 float *in2 = s->buf + 2 * NELLY_BUF_LEN;
 
- s->fdsp.vector_fmul (s->in_buff, in0, ff_sine_128, NELLY_BUF_LEN);
- s->dsp.vector_fmul_reverse(s->in_buff + NELLY_BUF_LEN, in1, ff_sine_128, NELLY_BUF_LEN);
+ s->fdsp.vector_fmul (s->in_buff, in0, ff_sine_128, NELLY_BUF_LEN);
+ s->fdsp.vector_fmul_reverse(s->in_buff + NELLY_BUF_LEN, in1, ff_sine_128, NELLY_BUF_LEN);
 s->mdct_ctx.mdct_calc(&s->mdct_ctx, s->mdct_out, s->in_buff);
 
- s->fdsp.vector_fmul (s->in_buff, in1, ff_sine_128, NELLY_BUF_LEN);
- s->dsp.vector_fmul_reverse(s->in_buff + NELLY_BUF_LEN, in2, ff_sine_128, NELLY_BUF_LEN);
+ s->fdsp.vector_fmul (s->in_buff, in1, ff_sine_128, NELLY_BUF_LEN);
+ s->fdsp.vector_fmul_reverse(s->in_buff + NELLY_BUF_LEN, in2, ff_sine_128, NELLY_BUF_LEN);
 s->mdct_ctx.mdct_calc(&s->mdct_ctx, s->mdct_out + NELLY_BUF_LEN, s->in_buff);
 }
 
@@ -142,9 +140,6 @@
 av_free(s->path);
 }
 ff_af_queue_close(&s->afq);
-#if FF_API_OLD_ENCODE_AUDIO
- av_freep(&avctx->coded_frame);
-#endif
 
 return 0;
 }
@@ -173,7 +168,6 @@
 s->avctx = avctx;
 if ((ret = ff_mdct_init(&s->mdct_ctx, 8, 0, 32768.0)) < 0)
 goto error;
- ff_dsputil_init(&s->dsp, avctx);
 avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
 
 /* Generate overlap window */
@@ -190,14 +184,6 @@
 }
 }
 
-#if FF_API_OLD_ENCODE_AUDIO
- avctx->coded_frame = avcodec_alloc_frame();
- if (!avctx->coded_frame) {
- ret = AVERROR(ENOMEM);
- goto error;
- }
-#endif
-
 return 0;
 error:
 encode_end(avctx);
@@ -420,6 +406,7 @@
 
 AVCodec ff_nellymoser_encoder = {
 .name = "nellymoser",
+ .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_NELLYMOSER,
 .priv_data_size = sizeof(NellyMoserEncodeContext),
@@ -427,7 +414,6 @@
 .encode2 = encode_frame,
 .close = encode_end,
 .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
- .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"),
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,
 AV_SAMPLE_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/nuv.c -> libav-v10.1.tar.bz2/libavcodec/nuv.c Changed

@@ -27,11 +27,11 @@
 #include "libavutil/lzo.h"
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
-#include "dsputil.h"
+#include "internal.h"
 #include "rtjpeg.h"
 
 typedef struct {
- AVFrame pic;
+ AVFrame *pic;
 int codec_frameheader;
 int quality;
 int width, height;
@@ -87,7 +87,7 @@
 int i;
 if (size < 2 * 64 * 4) {
 av_log(avctx, AV_LOG_ERROR, "insufficient rtjpeg quant data\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 for (i = 0; i < 64; i++, buf += 4)
 c->lq[i] = AV_RL32(buf);
@@ -113,29 +113,36 @@
 int quality)
 {
 NuvContext *c = avctx->priv_data;
+ int ret;
+
 width = FFALIGN(width, 2);
 height = FFALIGN(height, 2);
 if (quality >= 0)
 get_quant_quality(c, quality);
 if (width != c->width || height != c->height) {
- if (av_image_check_size(height, width, 0, avctx) < 0)
- return 0;
+ void *ptr;
+ if ((ret = av_image_check_size(height, width, 0, avctx)) < 0)
+ return ret;
 avctx->width = c->width = width;
 avctx->height = c->height = height;
- av_fast_malloc(&c->decomp_buf, &c->decomp_size,
- c->height * c->width * 3 / 2);
- if (!c->decomp_buf) {
+ ptr = av_fast_realloc(c->decomp_buf, &c->decomp_size,
+ c->height * c->width * 3 / 2 +
+ FF_INPUT_BUFFER_PADDING_SIZE +
+ RTJPEG_HEADER_SIZE);
+ if (!ptr) {
 av_log(avctx, AV_LOG_ERROR,
 "Can't allocate decompression buffer.\n");
- return 0;
- }
+ return AVERROR(ENOMEM);
+ } else
+ c->decomp_buf = ptr;
 ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height,
 c->lq, c->cq);
+ av_frame_unref(c->pic);
 } else if (quality != c->quality)
 ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height,
 c->lq, c->cq);
 
- return 1;
+ return 0;
 }
 
 static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
@@ -146,8 +153,8 @@
 NuvContext *c = avctx->priv_data;
 AVFrame *picture = data;
 int orig_size = buf_size;
- int keyframe;
- int result;
+ int keyframe, ret;
+ int result, init_frame = !avctx->frame_number;
 enum {
 NUV_UNCOMPRESSED = '0',
 NUV_RTJPEG = '1',
@@ -159,7 +166,7 @@
 
 if (buf_size < 12) {
 av_log(avctx, AV_LOG_ERROR, "coded frame too small\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 // codec data (rtjpeg quant tables)
@@ -178,7 +185,7 @@
 
 if (buf[0] != 'V' || buf_size < 12) {
 av_log(avctx, AV_LOG_ERROR, "not a nuv video frame\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 comptype = buf[1];
 switch (comptype) {
@@ -197,11 +204,14 @@
 buf = &buf[12];
 buf_size -= 12;
 if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO) {
- int outlen = c->decomp_size, inlen = buf_size;
- if (av_lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen))
+ int outlen = c->decomp_size - FF_INPUT_BUFFER_PADDING_SIZE;
+ int inlen = buf_size;
+ if (av_lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen)) {
 av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n");
+ return AVERROR_INVALIDDATA;
+ }
 buf = c->decomp_buf;
- buf_size = c->decomp_size;
+ buf_size = outlen;
 }
 if (c->codec_frameheader) {
 int w, h, q;
@@ -213,25 +223,32 @@
 w = AV_RL16(&buf[6]);
 h = AV_RL16(&buf[8]);
 q = buf[10];
- if (!codec_reinit(avctx, w, h, q))
- return -1;
+ if ((result = codec_reinit(avctx, w, h, q)) < 0)
+ return result;
+ if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO)
+ buf = c->decomp_buf;
 buf = &buf[RTJPEG_HEADER_SIZE];
 buf_size -= RTJPEG_HEADER_SIZE;
 }
 
- if (keyframe && c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
- c->pic.reference = 3;
- c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_READABLE |
- FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- result = avctx->reget_buffer(avctx, &c->pic);
+ if (keyframe) {
+ av_frame_unref(c->pic);
+ init_frame = 1;
+ }
+
+ result = ff_reget_buffer(avctx, c->pic);
 if (result < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ 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);
 }
 
- 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:
@@ -241,27 +258,31 @@
 av_log(avctx, AV_LOG_ERROR, "uncompressed frame too short\n");
 height = buf_size / c->width / 3 * 2;
 }
- 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:
- 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 */
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "unknown compression\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- *picture = c->pic;
+ if ((result = av_frame_ref(picture, c->pic)) < 0)
+ return result;
+
 *got_frame = 1;
 return orig_size;
 }
@@ -269,8 +290,13 @@
 static av_cold int decode_init(AVCodecContext *avctx)
 {
 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;
@@ -283,8 +309,8 @@
 
 ff_dsputil_init(&c->dsp, avctx);
 
- if (!codec_reinit(avctx, avctx->width, avctx->height, -1))
- return 1;
+ if ((ret = codec_reinit(avctx, avctx->width, avctx->height, -1)) < 0)
+ return ret;
 
 return 0;
 }
@@ -294,14 +320,14 @@
 NuvContext *c = avctx->priv_data;
 
 av_freep(&c->decomp_buf);
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
+ av_frame_free(&c->pic);
 
 return 0;
 }
 
 AVCodec ff_nuv_decoder = {
 .name = "nuv",
+ .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo/RTJPEG"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_NUV,
 .priv_data_size = sizeof(NuvContext),
@@ -309,5 +335,4 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo/RTJPEG"),
 };

libav-v9.6.tar.bz2/libavcodec/options.c -> libav-v10.1.tar.bz2/libavcodec/options.c Changed

@@ -70,7 +70,7 @@
 static const AVClass av_codec_context_class = {
     .class_name              = "AVCodecContext",
     .item_name               = context_to_name,
-    .option                  = options,
+    .option                  = avcodec_options,
     .version                 = LIBAVUTIL_VERSION_INT,
     .log_level_offset_offset = offsetof(AVCodecContext, log_level_offset),
     .child_next              = codec_child_next,
@@ -88,8 +88,7 @@
     av_opt_set_defaults(s);
 
     s->time_base           = (AVRational){0,1};
-    s->get_buffer          = avcodec_default_get_buffer;
-    s->release_buffer      = avcodec_default_release_buffer;
+    s->get_buffer2         = avcodec_default_get_buffer2;
     s->get_format          = avcodec_default_get_format;
     s->execute             = avcodec_default_execute;
     s->execute2            = avcodec_default_execute2;
@@ -97,7 +96,6 @@
     s->pix_fmt             = AV_PIX_FMT_NONE;
     s->sample_fmt          = AV_SAMPLE_FMT_NONE;
 
-    s->reget_buffer        = avcodec_default_reget_buffer;
     s->reordered_opaque    = AV_NOPTS_VALUE;
     if(codec && codec->priv_data_size){
         if(!s->priv_data){
@@ -152,7 +150,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 */

libav-v9.6.tar.bz2/libavcodec/options_table.h -> libav-v10.1.tar.bz2/libavcodec/options_table.h Changed

@@ -22,6 +22,7 @@
 
 #include <float.h>
 #include <limits.h>
+#include <stdint.h>
 
 #include "libavutil/opt.h"
 #include "avcodec.h"
@@ -39,13 +40,14 @@
 
 #define AV_CODEC_DEFAULT_BITRATE 200*1000
 
-static const AVOption options[]={
+static const AVOption avcodec_options[] = {
 {"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT, {.i64 = AV_CODEC_DEFAULT_BITRATE }, INT_MIN, INT_MAX, V|A|E},
 {"bt", "Set video bitrate tolerance (in bits/s). In 1-pass mode, bitrate tolerance specifies how far "
 "ratecontrol is willing to deviate from the target average bitrate value. This is not related "
 "to minimum/maximum bitrate. Lowering tolerance too much has an adverse effect on quality.",
 OFFSET(bit_rate_tolerance), AV_OPT_TYPE_INT, {.i64 = AV_CODEC_DEFAULT_BITRATE*20 }, 1, INT_MAX, V|E},
 {"flags", NULL, OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, 0, UINT_MAX, V|A|E|D, "flags"},
+{"unaligned", "allow decoders to produce unaligned output", 0, AV_OPT_TYPE_CONST, { .i64 = CODEC_FLAG_UNALIGNED }, INT_MIN, INT_MAX, V | D, "flags" },
 {"mv4", "use four motion vectors per macroblock (MPEG-4)", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_4MV }, INT_MIN, INT_MAX, V|E, "flags"},
 {"qpel", "use 1/4-pel motion compensation", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_QPEL }, INT_MIN, INT_MAX, V|E, "flags"},
 {"loop", "use loop filter", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_LOOP_FILTER }, INT_MIN, INT_MAX, V|E, "flags"},
@@ -65,21 +67,13 @@
 {"global_header", "place global headers in extradata instead of every keyframe", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_GLOBAL_HEADER }, INT_MIN, INT_MAX, V|A|E, "flags"},
 {"bitexact", "use only bitexact functions (except (I)DCT)", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_BITEXACT }, INT_MIN, INT_MAX, A|V|S|D|E, "flags"},
 {"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"},
-#if FF_API_MPV_GLOBAL_OPTS
-{"cbp", "Deprecated, use mpegvideo private options instead", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_CBP_RD }, INT_MIN, INT_MAX, V|E, "flags"},
-{"qprd", "Deprecated, use mpegvideo private options instead", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_QP_RD }, INT_MIN, INT_MAX, V|E, "flags"},
-#endif
 {"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"},
-#if FF_API_MPV_GLOBAL_OPTS
-{"sgop", "Deprecated, use mpegvideo private options instead", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_STRICT_GOP }, INT_MIN, INT_MAX, V|E, "flags2"},
-#endif
 {"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", 1, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_IGNORE_CROP }, INT_MIN, INT_MAX, V|D, "flags2"},
 {"local_header", "place global headers at every keyframe instead of in extradata", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_LOCAL_HEADER }, INT_MIN, INT_MAX, V|E, "flags2"},
-#if FF_API_SUB_ID
-{"sub_id", NULL, OFFSET(sub_id), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
-#endif
 {"me_method", "set motion estimation method", OFFSET(me_method), AV_OPT_TYPE_INT, {.i64 = ME_EPZS }, INT_MIN, INT_MAX, V|E, "me_method"},
 {"zero", "zero motion estimation (fastest)", 0, AV_OPT_TYPE_CONST, {.i64 = ME_ZERO }, INT_MIN, INT_MAX, V|E, "me_method" },
 {"full", "full motion estimation (slowest)", 0, AV_OPT_TYPE_CONST, {.i64 = ME_FULL }, INT_MIN, INT_MAX, V|E, "me_method" },
@@ -92,7 +86,6 @@
 {"x1", "X1 motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_X1 }, INT_MIN, INT_MAX, V|E, "me_method" },
 {"hex", "hex motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_HEX }, INT_MIN, INT_MAX, V|E, "me_method" },
 {"umh", "umh motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_UMH }, INT_MIN, INT_MAX, V|E, "me_method" },
-{"iter", "iter motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_ITER }, INT_MIN, INT_MAX, V|E, "me_method" },
 {"extradata_size", NULL, OFFSET(extradata_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
 {"time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, INT_MIN, INT_MAX},
 {"g", "set the group of picture (GOP) size", OFFSET(gop_size), AV_OPT_TYPE_INT, {.i64 = 12 }, INT_MIN, INT_MAX, V|E},
@@ -109,7 +102,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, 69, 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", "use 'frames' 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},
@@ -126,12 +119,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"},
@@ -141,10 +138,6 @@
 {"dc_clip", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_DC_CLIP }, INT_MIN, INT_MAX, V|D, "bug"},
 {"ms", "work around various bugs in Microsoft's broken decoders", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_MS }, INT_MIN, INT_MAX, V|D, "bug"},
 {"trunc", "truncated frames", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_TRUNCATED}, INT_MIN, INT_MAX, V|D, "bug"},
-#if FF_API_MPV_GLOBAL_OPTS
-{"lelim", "single coefficient elimination threshold for luminance (negative values also consider DC coefficient)", OFFSET(luma_elim_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
-{"celim", "single coefficient elimination threshold for chrominance (negative values also consider DC coefficient)", OFFSET(chroma_elim_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
-#endif
 {"strict", "how strictly to follow the standards", OFFSET(strict_std_compliance), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|V|D|E, "strict"},
 {"very", "strictly conform to a older more strict version of the spec or reference software", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_VERY_STRICT }, INT_MIN, INT_MAX, V|D|E, "strict"},
 {"strict", "strictly conform to all the things in the spec no matter what the consequences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_STRICT }, INT_MIN, INT_MAX, V|D|E, "strict"},
@@ -152,7 +145,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, V|D, "err_detect"},
 {"bitstream", "detect bitstream specification deviations", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BITSTREAM }, INT_MIN, INT_MAX, V|D, "err_detect"},
 {"buffer", "detect improper bitstream length", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BUFFER }, INT_MIN, INT_MAX, V|D, "err_detect"},
@@ -194,9 +187,6 @@
 {"int", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_INT }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"simple", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLE }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"simplemmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEMMX }, INT_MIN, INT_MAX, V|E|D, "idct"},
-#if FF_API_MMI
-{"mmi", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_MMI }, INT_MIN, INT_MAX, V|E|D, "idct"},
-#endif
 {"arm", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_ARM }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"altivec", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_ALTIVEC }, INT_MIN, INT_MAX, V|E|D, "idct"},
 {"sh4", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SH4 }, INT_MIN, INT_MAX, V|E|D, "idct"},
@@ -204,9 +194,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"},
-{"h264", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_H264 }, INT_MIN, INT_MAX, V|E|D, "idct"},
-{"vp3", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_VP3 }, 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"},
@@ -226,7 +216,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"},
@@ -234,14 +226,18 @@
 {"er", "error recognition", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_ER }, INT_MIN, INT_MAX, V|D, "debug"},
 {"mmco", "memory management control operations (H.264)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_MMCO }, INT_MIN, INT_MAX, V|D, "debug"},
 {"bugs", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_BUGS }, INT_MIN, INT_MAX, V|D, "debug"},
+#if FF_API_DEBUG_MV
 {"vis_qp", "visualize quantization parameter (QP), lower QP are tinted greener", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_VIS_QP }, INT_MIN, INT_MAX, V|D, "debug"},
 {"vis_mb_type", "visualize block types", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_VIS_MB_TYPE }, INT_MIN, INT_MAX, V|D, "debug"},
+#endif
 {"buffers", "picture buffer allocations", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_BUFFERS }, INT_MIN, INT_MAX, V|D, "debug"},
 {"thread_ops", "threading operations", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_THREADS }, INT_MIN, INT_MAX, V|D, "debug"},
+#if FF_API_DEBUG_MV
 {"vismv", "visualize motion vectors (MVs)", OFFSET(debug_mv), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, V|D, "debug_mv"},
 {"pf", "forward predicted MVs of P-frames", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_VIS_MV_P_FOR }, INT_MIN, INT_MAX, V|D, "debug_mv"},
 {"bf", "forward predicted MVs of B-frames", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_VIS_MV_B_FOR }, INT_MIN, INT_MAX, V|D, "debug_mv"},
 {"bb", "backward predicted MVs of B-frames", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_VIS_MV_B_BACK }, INT_MIN, INT_MAX, V|D, "debug_mv"},
+#endif
 {"cmp", "full-pel ME compare function", OFFSET(me_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
 {"subcmp", "sub-pel ME compare function", OFFSET(me_sub_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
 {"mbcmp", "macroblock compare function", OFFSET(mb_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
@@ -261,10 +257,6 @@
 {"vsad", "sum of absolute vertical differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_VSAD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
 {"vsse", "sum of squared vertical differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_VSSE }, INT_MIN, INT_MAX, V|E, "cmp_func"},
 {"nsse", "noise preserving sum of squared differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_NSSE }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-#if CONFIG_SNOW_ENCODER
-{"w53", "5/3 wavelet, only used in snow", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_W53 }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"w97", "9/7 wavelet, only used in snow", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_W97 }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-#endif
 {"dctmax", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_DCTMAX }, INT_MIN, INT_MAX, V|E, "cmp_func"},
 {"chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_CHROMA }, INT_MIN, INT_MAX, V|E, "cmp_func"},
 {"pre_dia_size", "diamond type & size for motion estimation pre-pass", OFFSET(pre_dia_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
@@ -273,9 +265,6 @@
 {"me_range", "limit motion vectors range (1023 for DivX player)", OFFSET(me_range), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 {"ibias", "intra quant bias", OFFSET(intra_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, V|E},
 {"pbias", "inter quant bias", OFFSET(inter_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, V|E},
-#if FF_API_COLOR_TABLE_ID
-{"color_table_id", NULL, OFFSET(color_table_id), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
-#endif
 {"global_quality", NULL, OFFSET(global_quality), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E},
 {"coder", NULL, OFFSET(coder_type), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "coder"},
 {"vlc", "variable length coder / Huffman coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_VLC }, INT_MIN, INT_MAX, V|E, "coder"},
@@ -285,7 +274,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 }, INT_MIN, INT_MAX, 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"},
@@ -296,13 +287,9 @@
 {"lmax", "maximum Lagrange factor (VBR)", OFFSET(lmax), AV_OPT_TYPE_INT, {.i64 = 31*FF_QP2LAMBDA }, 0, INT_MAX, V|E},
 {"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},
-#if FF_API_INTER_THRESHOLD
-{"inter_threshold", NULL, OFFSET(inter_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
-#endif
 {"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},
-#if FF_API_MPV_GLOBAL_OPTS
-{"qns", "deprecated, use mpegvideo private options instead", OFFSET(quantizer_noise_shaping), 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|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"},
@@ -322,6 +309,8 @@
 {"aac_he_v2", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_HE_V2 }, INT_MIN, INT_MAX, A|E, "profile"},
 {"aac_ld", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_LD }, INT_MIN, INT_MAX, A|E, "profile"},
 {"aac_eld", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_ELD }, INT_MIN, INT_MAX, A|E, "profile"},
+{"mpeg2_aac_low", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG2_AAC_LOW }, INT_MIN, INT_MAX, A|E, "profile"},
+{"mpeg2_aac_he", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG2_AAC_HE }, INT_MIN, INT_MAX, A|E, "profile"},
 {"dts", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS }, INT_MIN, INT_MAX, A|E, "profile"},
 {"dts_es", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_ES }, INT_MIN, INT_MAX, A|E, "profile"},
 {"dts_96_24", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_96_24 }, INT_MIN, INT_MAX, A|E, "profile"},
@@ -352,9 +341,6 @@
 {"refs", "reference frames to consider for motion compensation", OFFSET(refs), AV_OPT_TYPE_INT, {.i64 = 1 }, INT_MIN, INT_MAX, V|E},
 {"chromaoffset", "chroma QP offset from luma", OFFSET(chromaoffset), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 {"trellis", "rate-distortion optimal quantization", OFFSET(trellis), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E},
-#if FF_API_MPV_GLOBAL_OPTS
-{"skiprd", "Deprecated, use mpegvideo private options instead", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_SKIP_RD }, INT_MIN, INT_MAX, V|E, "flags2"},
-#endif
 {"sc_factor", "multiplied by qscale for each frame and added to scene_change_score", OFFSET(scenechange_factor), AV_OPT_TYPE_INT, {.i64 = 6 }, 0, INT_MAX, V|E},
 {"mv0_threshold", NULL, OFFSET(mv0_threshold), AV_OPT_TYPE_INT, {.i64 = 256 }, 0, INT_MAX, V|E},
 {"b_sensitivity", "adjust sensitivity of b_frame_strategy 1", OFFSET(b_sensitivity), AV_OPT_TYPE_INT, {.i64 = 40 }, 1, INT_MAX, V|E},
@@ -402,6 +388,7 @@
 {"s32p", "32-bit signed integer planar", 0, AV_OPT_TYPE_CONST, {.i64 = AV_SAMPLE_FMT_S32P }, INT_MIN, INT_MAX, A|D, "request_sample_fmt"},
 {"fltp", "32-bit float planar", 0, AV_OPT_TYPE_CONST, {.i64 = AV_SAMPLE_FMT_FLTP }, INT_MIN, INT_MAX, A|D, "request_sample_fmt"},
 {"dblp", "64-bit double planar", 0, AV_OPT_TYPE_CONST, {.i64 = AV_SAMPLE_FMT_DBLP }, INT_MIN, INT_MAX, A|D, "request_sample_fmt"},
+{"refcounted_frames", NULL, OFFSET(refcounted_frames), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, A|V|D },
 {NULL},
 };

libav-v9.6.tar.bz2/libavcodec/pamenc.c -> libav-v10.1.tar.bz2/libavcodec/pamenc.c Changed

@@ -22,14 +22,12 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "internal.h"
-#include "pnm.h"
-
 
 static int pam_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 const AVFrame *pict, int *got_packet)
 {
- PNMContext *s = avctx->priv_data;
- AVFrame * const p = &s->picture;
+ uint8_t *bytestream_start, *bytestream, *bytestream_end;
+ const AVFrame * const p = pict;
 int i, h, w, n, linesize, depth, maxval, ret;
 const char *tuple_type;
 uint8_t *ptr;
@@ -41,13 +39,9 @@
 return ret;
 }
 
- *p = *pict;
- p->pict_type = AV_PICTURE_TYPE_I;
- p->key_frame = 1;
-
- 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;
 w = avctx->width;
@@ -79,10 +73,10 @@
 default:
 return -1;
 }
- 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];
@@ -94,36 +88,53 @@
 for (i = 0; i < h; i++) {
 for (j = 0; j < w; j++) {
 v = ((uint32_t *)ptr)[j];
- bytestream_put_be24(&s->bytestream, v);
- *s->bytestream++ = v >> 24;
+ bytestream_put_be24(&bytestream, v);
+ *bytestream++ = v >> 24;
 }
 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 = ff_pnm_init,
+ .init = pam_encode_init,
+ .close = pam_encode_close,
 .encode2 = pam_encode_frame,
 .pix_fmts = (const enum AVPixelFormat[]){
 AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB32, AV_PIX_FMT_GRAY8, AV_PIX_FMT_MONOWHITE,
 AV_PIX_FMT_NONE
 },
- .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"),
 };

libav-v9.6.tar.bz2/libavcodec/parser.c -> libav-v10.1.tar.bz2/libavcodec/parser.c Changed

@@ -20,16 +20,21 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include <stdint.h>
 #include <string.h>
 
-#include "parser.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)
@@ -44,10 +49,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 ||
@@ -56,7 +61,8 @@
 goto found;
 }
 return NULL;
- found:
+
+found:
 s = av_mallocz(sizeof(AVCodecParserContext));
 if (!s)
 return NULL;
@@ -76,9 +82,9 @@
 return NULL;
 }
 }
- s->fetch_timestamp=1;
- s->pict_type = AV_PICTURE_TYPE_I;
- s->key_frame = -1;
+ s->fetch_timestamp = 1;
+ s->pict_type = AV_PICTURE_TYPE_I;
+ s->key_frame = -1;
 s->convergence_duration = 0;
 s->dts_sync_point = INT_MIN;
 s->dts_ref_dts_delta = INT_MIN;
@@ -86,72 +92,70 @@
 return s;
 }
 
-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
- // 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->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)) &&
+ 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 */
@@ -159,7 +163,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;
@@ -167,32 +171,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;
 }
 }
@@ -202,7 +206,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);
@@ -210,33 +214,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)
 return AVERROR(ENOMEM);
 pc->buffer = new_buffer;
 memcpy(&pc->buffer[pc->index], *buf, *buf_size);
@@ -244,34 +248,37 @@
 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 (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 (!new_buffer)
 return AVERROR(ENOMEM);
 pc->buffer = new_buffer;
 if (next > -FF_INPUT_BUFFER_PADDING_SIZE)
 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;
@@ -284,18 +291,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;
 }

libav-v10.1.tar.bz2/libavcodec/pcm-bluray.c Added

@@ -0,0 +1,315 @@
+/*
+ * LPCM codecs for PCM format found in Blu-ray PCM streams
+ * Copyright (c) 2009, 2013 Christian Schmidt
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * PCM codec for Blu-ray PCM audio tracks
+ */
+
+#include "libavutil/channel_layout.h"
+#include "avcodec.h"
+#include "bytestream.h"
+#include "internal.h"
+
+/*
+ * Channel Mapping according to
+ * Blu-ray Disc Read-Only Format Version 1
+ * Part 3: Audio Visual Basic Specifications
+ * mono M1 X
+ * stereo L R
+ * 3/0 L R C X
+ * 2/1 L R S X
+ * 3/1 L R C S
+ * 2/2 L R LS RS
+ * 3/2 L R C LS RS X
+ * 3/2+lfe L R C LS RS lfe
+ * 3/4 L R C LS Rls Rrs RS X
+ * 3/4+lfe L R C LS Rls Rrs RS lfe
+ */
+
+/**
+ * Parse the header of a LPCM frame read from a Blu-ray MPEG-TS stream
+ * @param avctx the codec context
+ * @param header pointer to the first four bytes of the data packet
+ */
+static int pcm_bluray_parse_header(AVCodecContext *avctx,
+ const uint8_t *header)
+{
+ static const uint8_t bits_per_samples[4] = { 0, 16, 20, 24 };
+ static const uint32_t channel_layouts[16] = {
+ 0, AV_CH_LAYOUT_MONO, 0, AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_SURROUND,
+ AV_CH_LAYOUT_2_1, AV_CH_LAYOUT_4POINT0, AV_CH_LAYOUT_2_2,
+ AV_CH_LAYOUT_5POINT0, AV_CH_LAYOUT_5POINT1, AV_CH_LAYOUT_7POINT0,
+ AV_CH_LAYOUT_7POINT1, 0, 0, 0, 0
+ };
+ static const uint8_t channels[16] = {
+ 0, 1, 0, 2, 3, 3, 4, 4, 5, 6, 7, 8, 0, 0, 0, 0
+ };
+ uint8_t channel_layout = header[2] >> 4;
+
+ if (avctx->debug & FF_DEBUG_PICT_INFO)
+ av_dlog(avctx, "pcm_bluray_parse_header: header = %02x%02x%02x%02x\n",
+ header[0], header[1], header[2], header[3]);
+
+ /* get the sample depth and derive the sample format from it */
+ avctx->bits_per_coded_sample = bits_per_samples[header[3] >> 6];
+ if (!avctx->bits_per_coded_sample) {
+ av_log(avctx, AV_LOG_ERROR, "reserved sample depth (0)\n");
+ return AVERROR_INVALIDDATA;
+ }
+ avctx->sample_fmt = avctx->bits_per_coded_sample == 16 ? AV_SAMPLE_FMT_S16
+ : AV_SAMPLE_FMT_S32;
+ avctx->bits_per_raw_sample = avctx->bits_per_coded_sample;
+
+ /* get the sample rate. Not all values are used. */
+ switch (header[2] & 0x0f) {
+ case 1:
+ avctx->sample_rate = 48000;
+ break;
+ case 4:
+ avctx->sample_rate = 96000;
+ break;
+ case 5:
+ avctx->sample_rate = 192000;
+ break;
+ default:
+ avctx->sample_rate = 0;
+ av_log(avctx, AV_LOG_ERROR, "reserved sample rate (%d)\n",
+ header[2] & 0x0f);
+ return AVERROR_INVALIDDATA;
+ }
+
+ /*
+ * get the channel number (and mapping). Not all values are used.
+ * It must be noted that the number of channels in the MPEG stream can
+ * differ from the actual meaningful number, e.g. mono audio still has two
+ * channels, one being empty.
+ */
+ avctx->channel_layout = channel_layouts[channel_layout];
+ avctx->channels = channels[channel_layout];
+ if (!avctx->channels) {
+ av_log(avctx, AV_LOG_ERROR, "reserved channel configuration (%d)\n",
+ channel_layout);
+ return AVERROR_INVALIDDATA;
+ }
+
+ avctx->bit_rate = FFALIGN(avctx->channels, 2) * avctx->sample_rate *
+ avctx->bits_per_coded_sample;
+
+ if (avctx->debug & FF_DEBUG_PICT_INFO)
+ av_dlog(avctx,
+ "pcm_bluray_parse_header: %d channels, %d bits per sample, %d Hz, %d bit/s\n",
+ avctx->channels, avctx->bits_per_coded_sample,
+ avctx->sample_rate, avctx->bit_rate);
+ return 0;
+}
+
+static int pcm_bluray_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, AVPacket *avpkt)
+{
+ AVFrame *frame = data;
+ const uint8_t *src = avpkt->data;
+ int buf_size = avpkt->size;
+ GetByteContext gb;
+ int num_source_channels, channel, retval;
+ int sample_size, samples;
+ int16_t *dst16;
+ int32_t *dst32;
+
+ if (buf_size < 4) {
+ av_log(avctx, AV_LOG_ERROR, "PCM packet too small\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if ((retval = pcm_bluray_parse_header(avctx, src)))
+ return retval;
+ src += 4;
+ buf_size -= 4;
+
+ bytestream2_init(&gb, src, buf_size);
+
+ /* There's always an even number of channels in the source */
+ num_source_channels = FFALIGN(avctx->channels, 2);
+ sample_size = (num_source_channels *
+ (avctx->sample_fmt == AV_SAMPLE_FMT_S16 ? 16 : 24)) >> 3;
+ samples = buf_size / sample_size;
+
+ /* get output buffer */
+ frame->nb_samples = samples;
+ if ((retval = ff_get_buffer(avctx, frame, 0)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return retval;
+ }
+ dst16 = (int16_t *)frame->data[0];
+ dst32 = (int32_t *)frame->data[0];
+
+ if (samples) {
+ switch (avctx->channel_layout) {
+ /* cases with same number of source and coded channels */
+ case AV_CH_LAYOUT_STEREO:
+ case AV_CH_LAYOUT_4POINT0:
+ case AV_CH_LAYOUT_2_2:
+ samples *= num_source_channels;
+ if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
+#if HAVE_BIGENDIAN
+ bytestream2_get_buffer(&gb, dst16, buf_size);
+#else
+ do {
+ *dst16++ = bytestream2_get_be16u(&gb);
+ } while (--samples);
+#endif
+ } else {
+ do {
+ *dst32++ = bytestream2_get_be24u(&gb) << 8;
+ } while (--samples);
+ }
+ break;
+ /* cases where number of source channels = coded channels + 1 */
+ case AV_CH_LAYOUT_MONO:
+ case AV_CH_LAYOUT_SURROUND:
+ case AV_CH_LAYOUT_2_1:
+ case AV_CH_LAYOUT_5POINT0:
+ if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
+ do {
+#if HAVE_BIGENDIAN
+ bytestream2_get_buffer(&gb, dst16, avctx->channels * 2);
+ dst16 += avctx->channels;
+#else
+ channel = avctx->channels;
+ do {
+ *dst16++ = bytestream2_get_be16u(&gb);
+ } while (--channel);
+#endif
+ bytestream2_skip(&gb, 2);
+ } while (--samples);
+ } else {
+ do {
+ channel = avctx->channels;
+ do {
+ *dst32++ = bytestream2_get_be24u(&gb) << 8;
+ } while (--channel);
+ bytestream2_skip(&gb, 3);
+ } while (--samples);
+ }
+ break;
+ /* remapping: L, R, C, LBack, RBack, LF */
+ case AV_CH_LAYOUT_5POINT1:
+ if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
+ do {
+ dst16[0] = bytestream2_get_be16u(&gb);
+ dst16[1] = bytestream2_get_be16u(&gb);
+ dst16[2] = bytestream2_get_be16u(&gb);
+ dst16[4] = bytestream2_get_be16u(&gb);
+ dst16[5] = bytestream2_get_be16u(&gb);
+ dst16[3] = bytestream2_get_be16u(&gb);
+ dst16 += 6;
+ } while (--samples);
+ } else {
+ do {
+ dst32[0] = bytestream2_get_be24u(&gb) << 8;
+ dst32[1] = bytestream2_get_be24u(&gb) << 8;
+ dst32[2] = bytestream2_get_be24u(&gb) << 8;
+ dst32[4] = bytestream2_get_be24u(&gb) << 8;
+ dst32[5] = bytestream2_get_be24u(&gb) << 8;
+ dst32[3] = bytestream2_get_be24u(&gb) << 8;
+ dst32 += 6;
+ } while (--samples);
+ }
+ break;
+ /* remapping: L, R, C, LSide, LBack, RBack, RSide, <unused> */
+ case AV_CH_LAYOUT_7POINT0:
+ if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
+ do {
+ dst16[0] = bytestream2_get_be16u(&gb);
+ dst16[1] = bytestream2_get_be16u(&gb);
+ dst16[2] = bytestream2_get_be16u(&gb);
+ dst16[5] = bytestream2_get_be16u(&gb);
+ dst16[3] = bytestream2_get_be16u(&gb);
+ dst16[4] = bytestream2_get_be16u(&gb);
+ dst16[6] = bytestream2_get_be16u(&gb);
+ dst16 += 7;
+ bytestream2_skip(&gb, 2);
+ } while (--samples);
+ } else {
+ do {
+ dst32[0] = bytestream2_get_be24u(&gb) << 8;
+ dst32[1] = bytestream2_get_be24u(&gb) << 8;
+ dst32[2] = bytestream2_get_be24u(&gb) << 8;
+ dst32[5] = bytestream2_get_be24u(&gb) << 8;
+ dst32[3] = bytestream2_get_be24u(&gb) << 8;
+ dst32[4] = bytestream2_get_be24u(&gb) << 8;
+ dst32[6] = bytestream2_get_be24u(&gb) << 8;
+ dst32 += 7;
+ bytestream2_skip(&gb, 3);
+ } while (--samples);
+ }
+ break;
+ /* remapping: L, R, C, LSide, LBack, RBack, RSide, LF */
+ case AV_CH_LAYOUT_7POINT1:
+ if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
+ do {
+ dst16[0] = bytestream2_get_be16u(&gb);
+ dst16[1] = bytestream2_get_be16u(&gb);
+ dst16[2] = bytestream2_get_be16u(&gb);
+ dst16[6] = bytestream2_get_be16u(&gb);
+ dst16[4] = bytestream2_get_be16u(&gb);
+ dst16[5] = bytestream2_get_be16u(&gb);
+ dst16[7] = bytestream2_get_be16u(&gb);
+ dst16[3] = bytestream2_get_be16u(&gb);
+ dst16 += 8;
+ } while (--samples);
+ } else {
+ do {
+ dst32[0] = bytestream2_get_be24u(&gb) << 8;
+ dst32[1] = bytestream2_get_be24u(&gb) << 8;
+ dst32[2] = bytestream2_get_be24u(&gb) << 8;
+ dst32[6] = bytestream2_get_be24u(&gb) << 8;
+ dst32[4] = bytestream2_get_be24u(&gb) << 8;
+ dst32[5] = bytestream2_get_be24u(&gb) << 8;
+ dst32[7] = bytestream2_get_be24u(&gb) << 8;
+ dst32[3] = bytestream2_get_be24u(&gb) << 8;
+ dst32 += 8;
+ } while (--samples);
+ }
+ break;
+ }
+ }
+
+ *got_frame_ptr = 1;
+
+ retval = bytestream2_tell(&gb);
+ if (avctx->debug & FF_DEBUG_BITSTREAM)
+ av_dlog(avctx, "pcm_bluray_decode_frame: decoded %d -> %d bytes\n",
+ retval, buf_size);
+ return retval + 4;
+}
+
+AVCodec ff_pcm_bluray_decoder = {
+ .name = "pcm_bluray",
+ .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for Blu-ray media"),
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = AV_CODEC_ID_PCM_BLURAY,
+ .decode = pcm_bluray_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .sample_fmts = (const enum AVSampleFormat[]){
+ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE
+ },
+};

libav-v10.1.tar.bz2/libavcodec/pcm-dvd.c Added

@@ -0,0 +1,288 @@
+/*
+ * LPCM codecs for PCM formats found in Video DVD streams
+ * Copyright (c) 2013 Christian Schmidt
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * LPCM codecs for PCM formats found in Video DVD streams
+ */
+
+#include "avcodec.h"
+#include "bytestream.h"
+#include "internal.h"
+
+typedef struct PCMDVDContext {
+ uint32_t last_header; // Cached header to see if parsing is needed
+ int block_size; // Size of a block of samples in bytes
+ int samples_per_block; // Number of samples per channel per block
+ int groups_per_block; // Number of 20/24bit sample groups per block
+ uint8_t *extra_samples; // Pointer to leftover samples from a frame
+ int extra_sample_count; // Number of leftover samples in the buffer
+} PCMDVDContext;
+
+static av_cold int pcm_dvd_decode_init(AVCodecContext *avctx)
+{
+ PCMDVDContext *s = avctx->priv_data;
+
+ /* Invalid header to force parsing of the first header */
+ s->last_header = -1;
+ /* reserve space for 8 channels, 3 bytes/sample, 4 samples/block */
+ if (!(s->extra_samples = av_malloc(8 * 3 * 4)))
+ return AVERROR(ENOMEM);
+
+ return 0;
+}
+
+static av_cold int pcm_dvd_decode_uninit(AVCodecContext *avctx)
+{
+ PCMDVDContext *s = avctx->priv_data;
+
+ av_freep(&s->extra_samples);
+
+ return 0;
+}
+
+static int pcm_dvd_parse_header(AVCodecContext *avctx, const uint8_t *header)
+{
+ /* no traces of 44100 and 32000Hz in any commercial software or player */
+ static const uint32_t frequencies[4] = { 48000, 96000, 44100, 32000 };
+ PCMDVDContext *s = avctx->priv_data;
+ int header_int = (header[0] & 0xe0) | (header[1] << 8) | (header[2] << 16);
+
+ /* early exit if the header didn't change apart from the frame number */
+ if (s->last_header == header_int)
+ return 0;
+
+ if (avctx->debug & FF_DEBUG_PICT_INFO)
+ av_dlog(avctx, "pcm_dvd_parse_header: header = %02x%02x%02x\n",
+ header[0], header[1], header[2]);
+ /*
+ * header[0] emphasis (1), muse(1), reserved(1), frame number(5)
+ * header[1] quant (2), freq(2), reserved(1), channels(3)
+ * header[2] dynamic range control (0x80 = off)
+ */
+
+ /* Discard potentially existing leftover samples from old channel layout */
+ s->extra_sample_count = 0;
+
+ /* get the sample depth and derive the sample format from it */
+ avctx->bits_per_coded_sample = 16 + (header[1] >> 6 & 3) * 4;
+ if (avctx->bits_per_coded_sample == 28) {
+ av_log(avctx, AV_LOG_ERROR, "PCM DVD unsupported sample depth\n");
+ return AVERROR_INVALIDDATA;
+ }
+ avctx->sample_fmt = avctx->bits_per_coded_sample == 16 ? AV_SAMPLE_FMT_S16
+ : AV_SAMPLE_FMT_S32;
+ avctx->bits_per_raw_sample = avctx->bits_per_coded_sample;
+
+ /* get the sample rate */
+ avctx->sample_rate = frequencies[header[1] >> 4 & 3];
+
+ /* get the number of channels */
+ avctx->channels = 1 + (header[1] & 7);
+ /* calculate the bitrate */
+ avctx->bit_rate = avctx->channels *
+ avctx->sample_rate *
+ avctx->bits_per_coded_sample;
+
+ /* 4 samples form a group in 20/24bit PCM on DVD Video.
+ * A block is formed by the number of groups that are
+ * needed to complete a set of samples for each channel. */
+ if (avctx->bits_per_coded_sample == 16) {
+ s->samples_per_block = 1;
+ s->block_size = avctx->channels * 2;
+ } else {
+ switch (avctx->channels) {
+ case 1:
+ case 2:
+ case 4:
+ /* one group has all the samples needed */
+ s->block_size = 4 * avctx->bits_per_coded_sample / 8;
+ s->samples_per_block = 4 / avctx->channels;
+ s->groups_per_block = 1;
+ break;
+ case 8:
+ /* two groups have all the samples needed */
+ s->block_size = 8 * avctx->bits_per_coded_sample / 8;
+ s->samples_per_block = 1;
+ s->groups_per_block = 2;
+ break;
+ default:
+ /* need avctx->channels groups */
+ s->block_size = 4 * avctx->channels *
+ avctx->bits_per_coded_sample / 8;
+ s->samples_per_block = 4;
+ s->groups_per_block = avctx->channels;
+ break;
+ }
+ }
+
+ if (avctx->debug & FF_DEBUG_PICT_INFO)
+ av_dlog(avctx,
+ "pcm_dvd_parse_header: %d channels, %d bits per sample, %d Hz, %d bit/s\n",
+ avctx->channels, avctx->bits_per_coded_sample,
+ avctx->sample_rate, avctx->bit_rate);
+
+ s->last_header = header_int;
+
+ return 0;
+}
+
+static void *pcm_dvd_decode_samples(AVCodecContext *avctx, const uint8_t *src,
+ void *dst, int blocks)
+{
+ PCMDVDContext *s = avctx->priv_data;
+ int16_t *dst16 = dst;
+ int32_t *dst32 = dst;
+ GetByteContext gb;
+ int i;
+ uint8_t t;
+ int samples;
+
+ bytestream2_init(&gb, src, blocks * s->block_size);
+ switch (avctx->bits_per_coded_sample) {
+ case 16:
+#if HAVE_BIGENDIAN
+ bytestream2_get_buffer(&gb, dst16, blocks * s->block_size);
+ dst16 += blocks * s->block_size / 2;
+#else
+ samples = blocks * avctx->channels;
+ do {
+ *dst16++ = bytestream2_get_be16u(&gb);
+ } while (--samples);
+#endif
+ return dst16;
+ case 20:
+ do {
+ for (i = s->groups_per_block; i; i--) {
+ dst32[0] = bytestream2_get_be16u(&gb) << 16;
+ dst32[1] = bytestream2_get_be16u(&gb) << 16;
+ 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;
+ t = bytestream2_get_byteu(&gb);
+ *dst32++ += (t & 0xf0) << 8;
+ *dst32++ += (t & 0x0f) << 12;
+ }
+ } while (--blocks);
+ return dst32;
+ case 24:
+ do {
+ for (i = s->groups_per_block; i; i--) {
+ dst32[0] = bytestream2_get_be16u(&gb) << 16;
+ dst32[1] = bytestream2_get_be16u(&gb) << 16;
+ dst32[2] = bytestream2_get_be16u(&gb) << 16;
+ dst32[3] = bytestream2_get_be16u(&gb) << 16;
+ *dst32++ += bytestream2_get_byteu(&gb) << 8;
+ *dst32++ += bytestream2_get_byteu(&gb) << 8;
+ *dst32++ += bytestream2_get_byteu(&gb) << 8;
+ *dst32++ += bytestream2_get_byteu(&gb) << 8;
+ }
+ } while (--blocks);
+ return dst32;
+ default:
+ return NULL;
+ }
+}
+
+static int pcm_dvd_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, AVPacket *avpkt)
+{
+ AVFrame *frame = data;
+ const uint8_t *src = avpkt->data;
+ int buf_size = avpkt->size;
+ PCMDVDContext *s = avctx->priv_data;
+ int retval;
+ int blocks;
+ void *dst;
+
+ if (buf_size < 3) {
+ av_log(avctx, AV_LOG_ERROR, "PCM packet too small\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if ((retval = pcm_dvd_parse_header(avctx, src)))
+ return retval;
+ src += 3;
+ buf_size -= 3;
+
+ blocks = (buf_size + s->extra_sample_count) / s->block_size;
+
+ /* get output buffer */
+ frame->nb_samples = blocks * s->samples_per_block;
+ if ((retval = ff_get_buffer(avctx, frame, 0)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return retval;
+ }
+ dst = frame->data[0];
+
+ /* consume leftover samples from last packet */
+ if (s->extra_sample_count) {
+ int missing_samples = s->block_size - s->extra_sample_count;
+ if (buf_size >= missing_samples) {
+ memcpy(s->extra_samples + s->extra_sample_count, src,
+ missing_samples);
+ dst = pcm_dvd_decode_samples(avctx, s->extra_samples, dst, 1);
+ src += missing_samples;
+ buf_size -= missing_samples;
+ s->extra_sample_count = 0;
+ blocks--;
+ } else {
+ /* new packet still doesn't have enough samples */
+ memcpy(s->extra_samples + s->extra_sample_count, src, buf_size);
+ s->extra_sample_count += buf_size;
+ return avpkt->size;
+ }
+ }
+
+ /* decode remaining complete samples */
+ if (blocks) {
+ pcm_dvd_decode_samples(avctx, src, dst, blocks);
+ buf_size -= blocks * s->block_size;
+ }
+
+ /* store leftover samples */
+ if (buf_size) {
+ src += blocks * s->block_size;
+ memcpy(s->extra_samples, src, buf_size);
+ s->extra_sample_count = buf_size;
+ }
+
+ *got_frame_ptr = 1;
+
+ return avpkt->size;
+}
+
+AVCodec ff_pcm_dvd_decoder = {
+ .name = "pcm_dvd",
+ .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for DVD media"),
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = AV_CODEC_ID_PCM_DVD,
+ .priv_data_size = sizeof(PCMDVDContext),
+ .init = pcm_dvd_decode_init,
+ .decode = pcm_dvd_decode_frame,
+ .close = pcm_dvd_decode_uninit,
+ .capabilities = CODEC_CAP_DR1,
+ .sample_fmts = (const enum AVSampleFormat[]) {
+ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE
+ }
+};

libav-v9.6.tar.bz2/libavcodec/pcm.c -> libav-v10.1.tar.bz2/libavcodec/pcm.c Changed

@@ -48,7 +48,7 @@
 avctx->bits_per_coded_sample = av_get_bits_per_sample(avctx->codec->id);
 avctx->block_align = avctx->channels * avctx->bits_per_coded_sample / 8;
 avctx->bit_rate = avctx->block_align * avctx->sample_rate * 8;
- avctx->coded_frame = avcodec_alloc_frame();
+ avctx->coded_frame = av_frame_alloc();
 if (!avctx->coded_frame)
 return AVERROR(ENOMEM);
 
@@ -199,7 +199,6 @@
 }
 
 typedef struct PCMDecode {
- AVFrame frame;
 short table[256];
 } PCMDecode;
 
@@ -231,9 +230,6 @@
 if (avctx->sample_fmt == AV_SAMPLE_FMT_S32)
 avctx->bits_per_raw_sample = av_get_bits_per_sample(avctx->codec->id);
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
@@ -254,12 +250,37 @@
 dst += size / 8; \
 }
 
+#if HAVE_BIGENDIAN
+#define DECODE_PLANAR(size, endian, src, dst, n, shift, offset) \
+ { \
+ int av_unused n2; \
+ n /= avctx->channels; \
+ for (c = 0; c < avctx->channels; c++) { \
+ samples = frame->extended_data[c]; \
+ n2 = n; \
+ DECODE(size, endian, src, samples, n2, 0, 0) \
+ } \
+ }
+#else
+#define DECODE_PLANAR(size, endian, src, dst, n, shift, offset) \
+ { \
+ int av_unused n2; \
+ n /= avctx->channels; \
+ for (c = 0; c < avctx->channels; c++) { \
+ samples = frame->extended_data[c]; \
+ memcpy(samples, src, n * size / 8); \
+ src += n * size / 8; \
+ } \
+ }
+#endif /* HAVE_BIGENDIAN */
+
 static int pcm_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
 const uint8_t *src = avpkt->data;
 int buf_size = avpkt->size;
 PCMDecode *s = avctx->priv_data;
+ AVFrame *frame = data;
 int sample_size, c, n, ret, samples_per_block;
 uint8_t *samples;
 int32_t *dst_int32_t;
@@ -268,16 +289,7 @@
 
 /* av_get_bits_per_sample returns 0 for AV_CODEC_ID_PCM_DVD */
 samples_per_block = 1;
- if (AV_CODEC_ID_PCM_DVD == avctx->codec_id) {
- if (avctx->bits_per_coded_sample != 20 &&
- avctx->bits_per_coded_sample != 24) {
- av_log(avctx, AV_LOG_ERROR, "PCM DVD unsupported sample depth\n");
- return AVERROR(EINVAL);
- }
- /* 2 samples are interleaved per block in PCM_DVD */
- samples_per_block = 2;
- sample_size = avctx->bits_per_coded_sample * 2 / 8;
- } else if (avctx->codec_id == AV_CODEC_ID_PCM_LXF) {
+ if (avctx->codec_id == AV_CODEC_ID_PCM_LXF) {
 /* we process 40-bit blocks per channel for LXF */
 samples_per_block = 2;
 sample_size = 5;
@@ -301,12 +313,12 @@
 n = buf_size / sample_size;
 
 /* get output buffer */
- s->frame.nb_samples = n * samples_per_block / avctx->channels;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = n * samples_per_block / avctx->channels;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- samples = s->frame.data[0];
+ samples = frame->data[0];
 
 switch (avctx->codec->id) {
 case AV_CODEC_ID_PCM_U32LE:
@@ -337,21 +349,14 @@
 }
 break;
 case AV_CODEC_ID_PCM_S16LE_PLANAR:
- {
- int av_unused n2;
- n /= avctx->channels;
- for (c = 0; c < avctx->channels; c++) {
- samples = s->frame.extended_data[c];
-#if HAVE_BIGENDIAN
- n2 = n;
- DECODE(16, le16, src, samples, n2, 0, 0)
-#else
- memcpy(samples, src, n * 2);
- src += n * 2;
-#endif
- }
+ DECODE_PLANAR(16, le16, src, samples, n, 0, 0);
+ break;
+ case AV_CODEC_ID_PCM_S24LE_PLANAR:
+ DECODE_PLANAR(32, le24, src, samples, n, 8, 0);
+ break;
+ case AV_CODEC_ID_PCM_S32LE_PLANAR:
+ DECODE_PLANAR(32, le32, src, samples, n, 0, 0);
 break;
- }
 case AV_CODEC_ID_PCM_U16LE:
 DECODE(16, le16, src, samples, n, 0, 0x8000)
 break;
@@ -411,43 +416,12 @@
 samples += 2;
 }
 break;
- case AV_CODEC_ID_PCM_DVD:
- {
- const uint8_t *src8;
- dst_int32_t = (int32_t *)s->frame.data[0];
- n /= avctx->channels;
- switch (avctx->bits_per_coded_sample) {
- case 20:
- while (n--) {
- c = avctx->channels;
- src8 = src + 4 * c;
- while (c--) {
- *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8 & 0xf0) << 8);
- *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++ & 0x0f) << 12);
- }
- src = src8;
- }
- break;
- case 24:
- while (n--) {
- c = avctx->channels;
- src8 = src + 4 * c;
- while (c--) {
- *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++) << 8);
- *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++) << 8);
- }
- src = src8;
- }
- break;
- }
- break;
- }
 case AV_CODEC_ID_PCM_LXF:
 {
 int i;
 n /= avctx->channels;
 for (c = 0; c < avctx->channels; c++) {
- dst_int32_t = (int32_t *)s->frame.extended_data[c];
+ dst_int32_t = (int32_t *)frame->extended_data[c];
 for (i = 0; i < n; i++) {
 // extract low 20 bits and expand to 32 bits
 *dst_int32_t++ = (src[2] << 28) |
@@ -470,8 +444,7 @@
 return -1;
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
 return buf_size;
 }
@@ -480,6 +453,7 @@
 #define PCM_ENCODER_1(id_, sample_fmt_, name_, long_name_) \
 AVCodec ff_ ## name_ ## _encoder = { \
 .name = #name_, \
+ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
 .type = AVMEDIA_TYPE_AUDIO, \
 .id = AV_CODEC_ID_ ## id_, \
 .init = pcm_encode_init, \
@@ -488,7 +462,6 @@
 .capabilities = CODEC_CAP_VARIABLE_FRAME_SIZE, \
 .sample_fmts = (const enum AVSampleFormat[]){ sample_fmt_, \
 AV_SAMPLE_FMT_NONE }, \
- .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
 }
 
 #define PCM_ENCODER_2(cf, id, sample_fmt, name, long_name) \
@@ -502,6 +475,7 @@
 #define PCM_DECODER_1(id_, sample_fmt_, name_, long_name_) \
 AVCodec ff_ ## name_ ## _decoder = { \
 .name = #name_, \
+ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
 .type = AVMEDIA_TYPE_AUDIO, \
 .id = AV_CODEC_ID_ ## id_, \
 .priv_data_size = sizeof(PCMDecode), \
@@ -510,7 +484,6 @@
 .capabilities = CODEC_CAP_DR1, \
 .sample_fmts = (const enum AVSampleFormat[]){ sample_fmt_, \
 AV_SAMPLE_FMT_NONE }, \
- .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
 }
 
 #define PCM_DECODER_2(cf, id, sample_fmt, name, long_name) \
@@ -526,7 +499,6 @@
 
 /* Note: Do not forget to add new entries to the Makefile as well. */
 PCM_CODEC (PCM_ALAW, AV_SAMPLE_FMT_S16, pcm_alaw, "PCM A-law");
-PCM_DECODER(PCM_DVD, AV_SAMPLE_FMT_S32, pcm_dvd, "PCM signed 20|24-bit big-endian");
 PCM_CODEC (PCM_F32BE, AV_SAMPLE_FMT_FLT, pcm_f32be, "PCM 32-bit floating point big-endian");
 PCM_CODEC (PCM_F32LE, AV_SAMPLE_FMT_FLT, pcm_f32le, "PCM 32-bit floating point little-endian");
 PCM_CODEC (PCM_F64BE, AV_SAMPLE_FMT_DBL, pcm_f64be, "PCM 64-bit floating point big-endian");
@@ -540,8 +512,10 @@
 PCM_CODEC (PCM_S24BE, AV_SAMPLE_FMT_S32, pcm_s24be, "PCM signed 24-bit big-endian");
 PCM_CODEC (PCM_S24DAUD, AV_SAMPLE_FMT_S16, pcm_s24daud, "PCM D-Cinema audio signed 24-bit");
 PCM_CODEC (PCM_S24LE, AV_SAMPLE_FMT_S32, pcm_s24le, "PCM signed 24-bit little-endian");
+PCM_DECODER(PCM_S24LE_PLANAR, AV_SAMPLE_FMT_S32P,pcm_s24le_planar, "PCM signed 24-bit little-endian planar");
 PCM_CODEC (PCM_S32BE, AV_SAMPLE_FMT_S32, pcm_s32be, "PCM signed 32-bit big-endian");
 PCM_CODEC (PCM_S32LE, AV_SAMPLE_FMT_S32, pcm_s32le, "PCM signed 32-bit little-endian");
+PCM_DECODER(PCM_S32LE_PLANAR, AV_SAMPLE_FMT_S32P,pcm_s32le_planar, "PCM signed 32-bit little-endian planar");
 PCM_CODEC (PCM_U8, AV_SAMPLE_FMT_U8, pcm_u8, "PCM unsigned 8-bit");
 PCM_CODEC (PCM_U16BE, AV_SAMPLE_FMT_S16, pcm_u16be, "PCM unsigned 16-bit big-endian");
 PCM_CODEC (PCM_U16LE, AV_SAMPLE_FMT_S16, pcm_u16le, "PCM unsigned 16-bit little-endian");

libav-v9.6.tar.bz2/libavcodec/pcx.c -> libav-v10.1.tar.bz2/libavcodec/pcx.c Changed

@@ -28,36 +28,27 @@
 #include "get_bits.h"
 #include "internal.h"
 
-typedef struct PCXContext {
- AVFrame picture;
-} PCXContext;
-
-static av_cold int pcx_init(AVCodecContext *avctx) {
- PCXContext *s = avctx->priv_data;
-
- avcodec_get_frame_defaults(&s->picture);
- avctx->coded_frame= &s->picture;
-
- return 0;
-}
-
 /**
 * @return advanced src pointer
 */
-static const uint8_t *pcx_rle_decode(const uint8_t *src, uint8_t *dst,
- unsigned int bytes_per_scanline, int compressed) {
+static const uint8_t *pcx_rle_decode(const uint8_t *src,
+ const uint8_t *end,
+ uint8_t *dst,
+ unsigned int bytes_per_scanline,
+ int compressed)
+{
 unsigned int i = 0;
 unsigned char run, value;
 
 if (compressed) {
- while (i<bytes_per_scanline) {
- run = 1;
+ while (i < bytes_per_scanline && src < end) {
+ run = 1;
 value = *src++;
- if (value >= 0xc0) {
- run = value & 0x3f;
+ if (value >= 0xc0 && src < end) {
+ run = value & 0x3f;
 value = *src++;
 }
- while (i<bytes_per_scanline && run--)
+ while (i < bytes_per_scanline && run--)
 dst[i++] = value;
 }
 } else {
@@ -68,89 +59,88 @@
 return src;
 }
 
-static void pcx_palette(const uint8_t **src, uint32_t *dst, unsigned int pallen) {
+static void pcx_palette(const uint8_t **src, uint32_t *dst,
+ unsigned int pallen)
+{
 unsigned int i;
 
- for (i=0; i<pallen; i++)
+ for (i = 0; i < pallen; i++)
 *dst++ = bytestream_get_be24(src);
 if (pallen < 256)
 memset(dst, 0, (256 - pallen) * sizeof(*dst));
 }
 
 static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
- AVPacket *avpkt) {
+ AVPacket *avpkt)
+{
 const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- PCXContext * const s = avctx->priv_data;
- AVFrame *picture = data;
- AVFrame * const p = &s->picture;
+ int buf_size = avpkt->size;
+ AVFrame *const p = data;
 int compressed, xmin, ymin, xmax, ymax;
 unsigned int w, h, bits_per_pixel, bytes_per_line, nplanes, stride, y, x,
 bytes_per_scanline;
 uint8_t *ptr;
+ const uint8_t *buf_end = buf + buf_size;
 uint8_t const *bufstart = buf;
 uint8_t *scanline;
 int ret = -1;
 
 if (buf[0] != 0x0a || buf[1] > 5) {
 av_log(avctx, AV_LOG_ERROR, "this is not PCX encoded data\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 compressed = buf[2];
- xmin = AV_RL16(buf+ 4);
- ymin = AV_RL16(buf+ 6);
- xmax = AV_RL16(buf+ 8);
- ymax = AV_RL16(buf+10);
+ xmin = AV_RL16(buf + 4);
+ ymin = AV_RL16(buf + 6);
+ xmax = AV_RL16(buf + 8);
+ ymax = AV_RL16(buf + 10);
 
 if (xmax < xmin || ymax < ymin) {
 av_log(avctx, AV_LOG_ERROR, "invalid image dimensions\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 w = xmax - xmin + 1;
 h = ymax - ymin + 1;
 
 bits_per_pixel = buf[3];
- bytes_per_line = AV_RL16(buf+66);
+ bytes_per_line = AV_RL16(buf + 66);
 nplanes = buf[65];
 bytes_per_scanline = nplanes * bytes_per_line;
 
- if (bytes_per_scanline < w * bits_per_pixel * nplanes / 8) {
+ if (bytes_per_scanline < (w * bits_per_pixel * nplanes + 7) / 8 ||
+ (!compressed && bytes_per_scanline > buf_size / h)) {
 av_log(avctx, AV_LOG_ERROR, "PCX data is corrupted\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- switch ((nplanes<<8) + bits_per_pixel) {
- case 0x0308:
- avctx->pix_fmt = AV_PIX_FMT_RGB24;
- break;
- case 0x0108:
- case 0x0104:
- case 0x0102:
- case 0x0101:
- case 0x0401:
- case 0x0301:
- case 0x0201:
- avctx->pix_fmt = AV_PIX_FMT_PAL8;
- break;
- default:
- av_log(avctx, AV_LOG_ERROR, "invalid PCX file\n");
- return -1;
+ switch ((nplanes << 8) + bits_per_pixel) {
+ case 0x0308:
+ avctx->pix_fmt = AV_PIX_FMT_RGB24;
+ break;
+ case 0x0108:
+ case 0x0104:
+ case 0x0102:
+ case 0x0101:
+ case 0x0401:
+ case 0x0301:
+ case 0x0201:
+ avctx->pix_fmt = AV_PIX_FMT_PAL8;
+ break;
+ default:
+ av_log(avctx, AV_LOG_ERROR, "invalid PCX file\n");
+ return AVERROR_INVALIDDATA;
 }
 
 buf += 128;
 
- if (p->data[0])
- avctx->release_buffer(avctx, p);
+ if ((ret = ff_set_dimensions(avctx, w, h)) < 0)
+ return ret;
 
- if (av_image_check_size(w, h, 0, avctx))
- return -1;
- if (w != avctx->width || h != avctx->height)
- avcodec_set_dimensions(avctx, w, h);
- if (ff_get_buffer(avctx, p) < 0) {
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 p->pict_type = AV_PICTURE_TYPE_I;
@@ -163,23 +153,31 @@
 return AVERROR(ENOMEM);
 
 if (nplanes == 3 && bits_per_pixel == 8) {
- for (y=0; y<h; y++) {
- buf = pcx_rle_decode(buf, scanline, bytes_per_scanline, compressed);
-
- for (x=0; x<w; x++) {
- ptr[3*x ] = scanline[x ];
- ptr[3*x+1] = scanline[x+ bytes_per_line ];
- ptr[3*x+2] = scanline[x+(bytes_per_line<<1)];
+ for (y = 0; y < h; y++) {
+ buf = pcx_rle_decode(buf, buf_end,
+ scanline, bytes_per_scanline, compressed);
+
+ for (x = 0; x < w; x++) {
+ ptr[3 * x] = scanline[x];
+ ptr[3 * x + 1] = scanline[x + bytes_per_line];
+ ptr[3 * x + 2] = scanline[x + (bytes_per_line << 1)];
 }
 
 ptr += stride;
 }
-
 } else if (nplanes == 1 && bits_per_pixel == 8) {
 const uint8_t *palstart = bufstart + buf_size - 769;
 
- for (y=0; y<h; y++, ptr+=stride) {
- buf = pcx_rle_decode(buf, scanline, bytes_per_scanline, compressed);
+ if (buf_size < 769) {
+ av_log(avctx, AV_LOG_ERROR, "File is too short\n");
+ ret = avctx->err_recognition & AV_EF_EXPLODE ?
+ AVERROR_INVALIDDATA : buf_size;
+ goto end;
+ }
+
+ for (y = 0; y < h; y++, ptr += stride) {
+ buf = pcx_rle_decode(buf, buf_end,
+ scanline, bytes_per_scanline, compressed);
 memcpy(ptr, scanline, w);
 }
 
@@ -189,33 +187,35 @@
 }
 if (*buf++ != 12) {
 av_log(avctx, AV_LOG_ERROR, "expected palette after image data\n");
+ ret = avctx->err_recognition & AV_EF_EXPLODE ?
+ AVERROR_INVALIDDATA : buf_size;
 goto end;
 }
-
 } else if (nplanes == 1) { /* all packed formats, max. 16 colors */
 GetBitContext s;
 
- for (y=0; y<h; y++) {
- init_get_bits(&s, scanline, bytes_per_scanline<<3);
+ for (y = 0; y < h; y++) {
+ init_get_bits(&s, scanline, bytes_per_scanline << 3);
 
- buf = pcx_rle_decode(buf, scanline, bytes_per_scanline, compressed);
+ buf = pcx_rle_decode(buf, buf_end,
+ scanline, bytes_per_scanline, compressed);
 
- for (x=0; x<w; x++)
+ for (x = 0; x < w; x++)
 ptr[x] = get_bits(&s, bits_per_pixel);
 ptr += stride;
 }
-
 } else { /* planar, 4, 8 or 16 colors */
 int i;
 
- for (y=0; y<h; y++) {
- buf = pcx_rle_decode(buf, scanline, bytes_per_scanline, compressed);
+ for (y = 0; y < h; y++) {
+ buf = pcx_rle_decode(buf, buf_end,
+ scanline, bytes_per_scanline, compressed);
 
- for (x=0; x<w; x++) {
- int m = 0x80 >> (x&7), v = 0;
- for (i=nplanes - 1; i>=0; i--) {
+ for (x = 0; x < w; x++) {
+ int m = 0x80 >> (x & 7), v = 0;
+ for (i = nplanes - 1; i >= 0; i--) {
 v <<= 1;
- v += !!(scanline[i*bytes_per_line + (x>>3)] & m);
+ v += !!(scanline[i * bytes_per_line + (x >> 3)] & m);
 }
 ptr[x] = v;
 }
@@ -224,13 +224,12 @@
 }
 
 if (nplanes == 1 && bits_per_pixel == 8) {
- pcx_palette(&buf, (uint32_t *) p->data[1], 256);
+ pcx_palette(&buf, (uint32_t *)p->data[1], 256);
 } else if (bits_per_pixel < 8) {
- const uint8_t *palette = bufstart+16;
- pcx_palette(&palette, (uint32_t *) p->data[1], 16);
+ const uint8_t *palette = bufstart + 16;
+ pcx_palette(&palette, (uint32_t *)p->data[1], 16);
 }
 
- *picture = s->picture;
 *got_frame = 1;
 
 ret = buf - bufstart;
@@ -239,23 +238,11 @@
 return ret;
 }
 
-static av_cold int pcx_end(AVCodecContext *avctx) {
- PCXContext *s = avctx->priv_data;
-
- if(s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
-
- return 0;
-}
-
 AVCodec ff_pcx_decoder = {
- .name = "pcx",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_PCX,
- .priv_data_size = sizeof(PCXContext),
- .init = pcx_init,
- .close = pcx_end,
- .decode = pcx_decode_frame,
- .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"),
+ .name = "pcx",
+ .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_PCX,
+ .decode = pcx_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
 };

libav-v9.6.tar.bz2/libavcodec/pcxenc.c -> libav-v10.1.tar.bz2/libavcodec/pcxenc.c Changed

@@ -30,19 +30,23 @@
 #include "bytestream.h"
 #include "internal.h"
 
-typedef struct PCXContext {
- AVFrame picture;
-} PCXContext;
-
 static const uint32_t monoblack_pal[16] = { 0x000000, 0xFFFFFF };
 
 static av_cold int pcx_encode_init(AVCodecContext *avctx)
 {
- PCXContext *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;
 
- avcodec_get_frame_defaults(&s->picture);
- avctx->coded_frame = &s->picture;
+ return 0;
+}
 
+static av_cold int pcx_encode_close(AVCodecContext *avctx)
+{
+ av_frame_free(&avctx->coded_frame);
 return 0;
 }
 
@@ -99,8 +103,6 @@
 static int pcx_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 const AVFrame *frame, int *got_packet)
 {
- PCXContext *s = avctx->priv_data;
- AVFrame *const pict = &s->picture;
 const uint8_t *buf_end;
 uint8_t *buf;
 
@@ -108,10 +110,6 @@
 const uint32_t *pal = NULL;
 const uint8_t *src;
 
- *pict = *frame;
- 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;
@@ -130,7 +128,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;
@@ -172,7 +170,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,
@@ -181,7 +179,7 @@
 return -1;
 }
 buf += written;
- src += pict->linesize[0];
+ src += frame->linesize[0];
 }
 
 if (nplanes == 1 && bpp == 8) {
@@ -204,10 +202,11 @@
 
 AVCodec ff_pcx_encoder = {
 .name = "pcx",
+ .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_PCX,
- .priv_data_size = sizeof(PCXContext),
 .init = pcx_encode_init,
+ .close = pcx_encode_close,
 .encode2 = pcx_encode_frame,
 .pix_fmts = (const enum AVPixelFormat[]){
 AV_PIX_FMT_RGB24,
@@ -216,5 +215,4 @@
 AV_PIX_FMT_MONOBLACK,
 AV_PIX_FMT_NONE
 },
- .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"),
 };

libav-v9.6.tar.bz2/libavcodec/pgssubdec.c -> libav-v10.1.tar.bz2/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"
 
@@ -272,13 +274,13 @@
 * @todo TODO: Implement cropping
 * @todo TODO: Implement forcing of subtitles
 */
-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 x, y;
+ int x, y, ret;
 
 int w = bytestream_get_be16(&buf);
 int h = bytestream_get_be16(&buf);
@@ -287,8 +289,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++;
@@ -306,7 +309,7 @@
 ctx->presentation.object_number = bytestream_get_byte(&buf);
 ctx->presentation.composition_flag = 0;
 if (!ctx->presentation.object_number)
- return;
+ return 0;
 
 /*
 * Skip 3 bytes of unknown:
@@ -332,6 +335,8 @@
 /* Fill in dimensions */
 ctx->presentation.x = x;
 ctx->presentation.y = y;
+
+ return 0;
 }
 
 /**
@@ -413,7 +418,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");
 
@@ -452,7 +457,9 @@
 parse_picture_segment(avctx, buf, segment_length);
 break;
 case PRESENTATION_SEGMENT:
- parse_presentation_segment(avctx, buf, segment_length, avpkt->pts);
+ ret = parse_presentation_segment(avctx, buf, segment_length, avpkt->pts);
+ if (ret < 0)
+ return ret;
 break;
 case WINDOW_SEGMENT:
 /*
@@ -481,11 +488,11 @@
 
 AVCodec ff_pgssub_decoder = {
 .name = "pgssub",
+ .long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"),
 .type = AVMEDIA_TYPE_SUBTITLE,
 .id = AV_CODEC_ID_HDMV_PGS_SUBTITLE,
 .priv_data_size = sizeof(PGSSubContext),
 .init = init_decoder,
 .close = close_decoder,
 .decode = decode,
- .long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"),
 };

libav-v9.6.tar.bz2/libavcodec/pictordec.c -> libav-v10.1.tar.bz2/libavcodec/pictordec.c Changed

@@ -31,16 +31,16 @@
 #include "internal.h"
 
 typedef struct PicContext {
- AVFrame frame;
 int width, height;
 int nb_planes;
 GetByteContext g;
 } PicContext;
 
-static void picmemset_8bpp(PicContext *s, int value, int run, int *x, int *y)
+static void picmemset_8bpp(PicContext *s, AVFrame *frame, int value, int run,
+ int *x, int *y)
 {
 while (run > 0) {
- uint8_t *d = s->frame.data[0] + *y * s->frame.linesize[0];
+ uint8_t *d = frame->data[0] + *y * frame->linesize[0];
 if (*x + run >= s->width) {
 int n = s->width - *x;
 memset(d + *x, value, n);
@@ -57,7 +57,7 @@
 }
 }
 
-static void picmemset(PicContext *s, int value, int run,
+static void picmemset(PicContext *s, AVFrame *frame, int value, int run,
 int *x, int *y, int *plane, int bits_per_plane)
 {
 uint8_t *d;
@@ -68,7 +68,7 @@
 while (run > 0) {
 int j;
 for (j = 8-bits_per_plane; j >= 0; j -= bits_per_plane) {
- d = s->frame.data[0] + *y * s->frame.linesize[0];
+ d = frame->data[0] + *y * frame->linesize[0];
 d[*x] |= (value >> j) & mask;
 *x += 1;
 if (*x == s->width) {
@@ -102,9 +102,10 @@
 AVPacket *avpkt)
 {
 PicContext *s = avctx->priv_data;
+ AVFrame *frame = data;
 uint32_t *palette;
 int bits_per_plane, bpp, etype, esize, npal, pos_after_pal;
- int i, x, y, plane, tmp;
+ int i, x, y, plane, tmp, ret;
 
 bytestream2_init(&s->g, avpkt->data, avpkt->size);
 
@@ -122,7 +123,7 @@
 s->nb_planes = (tmp >> 4) + 1;
 bpp = bits_per_plane * s->nb_planes;
 if (bits_per_plane > 8 || bpp < 1 || bpp > 32) {
- av_log_ask_for_sample(s, "unsupported bit depth\n");
+ avpriv_request_sample(avctx, "Unsupported bit depth");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -140,23 +141,21 @@
 avctx->pix_fmt = AV_PIX_FMT_PAL8;
 
 if (s->width != avctx->width && s->height != avctx->height) {
- if (av_image_check_size(s->width, s->height, 0, avctx) < 0)
- return -1;
- avcodec_set_dimensions(avctx, s->width, s->height);
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ ret = ff_set_dimensions(avctx, s->width, s->height);
+ if (ret < 0)
+ return ret;
 }
 
- if (ff_get_buffer(avctx, &s->frame) < 0){
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
- memset(s->frame.data[0], 0, s->height * s->frame.linesize[0]);
- s->frame.pict_type = AV_PICTURE_TYPE_I;
- s->frame.palette_has_changed = 1;
+ memset(frame->data[0], 0, s->height * frame->linesize[0]);
+ frame->pict_type = AV_PICTURE_TYPE_I;
+ frame->palette_has_changed = 1;
 
 pos_after_pal = bytestream2_tell(&s->g) + esize;
- palette = (uint32_t*)s->frame.data[1];
+ palette = (uint32_t*)frame->data[1];
 if (etype == 1 && esize > 1 && bytestream2_peek_byte(&s->g) < 6) {
 int idx = bytestream2_get_byte(&s->g);
 npal = 4;
@@ -225,39 +224,30 @@
 break;
 
 if (bits_per_plane == 8) {
- picmemset_8bpp(s, val, run, &x, &y);
+ picmemset_8bpp(s, frame, val, run, &x, &y);
 if (y < 0)
- break;
+ goto finish;
 } else {
- picmemset(s, val, run, &x, &y, &plane, bits_per_plane);
+ picmemset(s, frame, val, run, &x, &y, &plane, bits_per_plane);
 }
 }
 }
 } else {
- av_log_ask_for_sample(s, "uncompressed image\n");
+ avpriv_request_sample(avctx, "Uncompressed image");
 return avpkt->size;
 }
+finish:
 
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 return avpkt->size;
 }
 
-static av_cold int decode_end(AVCodecContext *avctx)
-{
- PicContext *s = avctx->priv_data;
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
- return 0;
-}
-
 AVCodec ff_pictor_decoder = {
 .name = "pictor",
+ .long_name = NULL_IF_CONFIG_SMALL("Pictor/PC Paint"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_PICTOR,
 .priv_data_size = sizeof(PicContext),
- .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Pictor/PC Paint"),
 };

libav-v10.1.tar.bz2/libavcodec/png_parser.c Added

@@ -0,0 +1,124 @@
+/*
+ * PNG parser
+ * Copyright (c) 2009 Peter Holik
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * PNG parser
+ */
+
+#include "libavutil/intreadwrite.h"
+#include "libavutil/common.h"
+
+#include "parser.h"
+
+#define PNG_SIGNATURE UINT64_C(0x89504e470d0a1a0a)
+#define MNG_SIGNATURE UINT64_C(0x8a4d4e470d0a1a0a)
+
+typedef struct PNGParseContext {
+ ParseContext pc;
+
+ int chunk_pos; ///< position inside current chunk
+ int chunk_length; ///< length of the current chunk
+ int remaining_size; ///< remaining size of the current chunk
+} PNGParseContext;
+
+static int png_parse(AVCodecParserContext *s, AVCodecContext *avctx,
+ const uint8_t **poutbuf, int *poutbuf_size,
+ const uint8_t *buf, int buf_size)
+{
+ PNGParseContext *ppc = s->priv_data;
+ int next = END_NOT_FOUND;
+ int i = 0;
+
+ *poutbuf_size = 0;
+ if (buf_size == 0)
+ return 0;
+
+ if (!ppc->pc.frame_start_found) {
+ uint64_t state64 = ppc->pc.state64;
+ for (; i < buf_size; i++) {
+ state64 = (state64 << 8) | buf[i];
+ if (state64 == PNG_SIGNATURE ||
+ state64 == MNG_SIGNATURE) {
+ i++;
+ ppc->pc.frame_start_found = 1;
+ break;
+ }
+ }
+ 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->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->chunk_pos == 3) {
+ ppc->chunk_length = ppc->pc.state;
+ if (ppc->chunk_length > 0x7fffffff) {
+ ppc->chunk_pos = ppc->pc.frame_start_found = 0;
+ goto flush;
+ }
+ ppc->chunk_length += 4;
+ } else if (ppc->chunk_pos == 7) {
+ if (ppc->chunk_length >= buf_size - i)
+ ppc->remaining_size = ppc->chunk_length - buf_size + i + 1;
+ if (ppc->pc.state == MKBETAG('I', 'E', 'N', 'D')) {
+ if (ppc->remaining_size)
+ ppc->chunk_pos = -1;
+ else
+ next = ppc->chunk_length + i + 1;
+ break;
+ } else {
+ ppc->chunk_pos = 0;
+ if (ppc->remaining_size)
+ break;
+ else
+ i += ppc->chunk_length;
+ continue;
+ }
+ }
+ ppc->chunk_pos++;
+ }
+
+flush:
+ if (ff_combine_frame(&ppc->pc, next, &buf, &buf_size) < 0)
+ return buf_size;
+
+ ppc->chunk_pos = ppc->pc.frame_start_found = 0;
+
+ *poutbuf = buf;
+ *poutbuf_size = buf_size;
+ return next;
+}
+
+AVCodecParser ff_png_parser = {
+ .codec_ids = { AV_CODEC_ID_PNG },
+ .priv_data_size = sizeof(PNGParseContext),
+ .parser_parse = png_parse,
+ .parser_close = ff_parse_close,
+};

libav-v9.6.tar.bz2/libavcodec/pngdec.c -> libav-v10.1.tar.bz2/libavcodec/pngdec.c Changed

@@ -31,14 +31,11 @@
 
 #include <zlib.h>
 
-//#define DEBUG
-
 typedef struct PNGDecContext {
 PNGDSPContext dsp;
 
 GetByteContext gb;
- AVFrame picture1, picture2;
- AVFrame *current_picture, *last_picture;
+ AVFrame *prev;
 
 int state;
 int width, height;
@@ -86,15 +83,16 @@
 uint8_t *d;
 const uint8_t *s;
 
- mask = ff_png_pass_mask[pass];
+ mask = ff_png_pass_mask[pass];
 dsp_mask = png_pass_dsp_mask[pass];
- switch(bits_per_pixel) {
+
+ switch (bits_per_pixel) {
 case 1:
 /* we must initialize the line to zero before writing to it */
 if (pass == 0)
 memset(dst, 0, (width + 7) >> 3);
 src_x = 0;
- for(x = 0; x < width; x++) {
+ for (x = 0; x < width; x++) {
 j = (x & 7);
 if ((dsp_mask << j) & 0x80) {
 b = (src[src_x >> 3] >> (7 - (src_x & 7))) & 1;
@@ -106,10 +104,10 @@
 break;
 default:
 bpp = bits_per_pixel >> 3;
- d = dst;
- s = src;
+ d = dst;
+ s = src;
 if (color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
- for(x = 0; x < width; x++) {
+ for (x = 0; x < width; x++) {
 j = x & 7;
 if ((dsp_mask << j) & 0x80) {
 *(uint32_t *)d = (s[3] << 24) | (s[0] << 16) | (s[1] << 8) | s[2];
@@ -136,14 +134,14 @@
 void ff_add_png_paeth_prediction(uint8_t *dst, uint8_t *src, uint8_t *top, int w, int bpp)
 {
 int i;
- for(i = 0; i < w; i++) {
+ for (i = 0; i < w; i++) {
 int a, b, c, p, pa, pb, pc;
 
 a = dst[i - bpp];
 b = top[i];
 c = top[i - bpp];
 
- p = b - c;
+ p = b - c;
 pc = a - c;
 
 pa = abs(p);
@@ -195,20 +193,20 @@
 {
 int i, p, r, g, b, a;
 
- switch(filter_type) {
+ switch (filter_type) {
 case PNG_FILTER_VALUE_NONE:
 memcpy(dst, src, size);
 break;
 case PNG_FILTER_VALUE_SUB:
- for(i = 0; i < bpp; i++) {
+ for (i = 0; i < bpp; i++) {
 dst[i] = src[i];
 }
- if(bpp == 4) {
+ if (bpp == 4) {
 p = *(int*)dst;
- for(; i < size; i+=bpp) {
- int s = *(int*)(src+i);
- p = ((s&0x7f7f7f7f) + (p&0x7f7f7f7f)) ^ ((s^p)&0x80808080);
- *(int*)(dst+i) = p;
+ for (; i < size; i += bpp) {
+ int s = *(int*)(src + i);
+ p = ((s & 0x7f7f7f7f) + (p & 0x7f7f7f7f)) ^ ((s ^ p) & 0x80808080);
+ *(int*)(dst + i) = p;
 }
 } else {
 #define OP_SUB(x,s,l) x+s
@@ -219,7 +217,7 @@
 dsp->add_bytes_l2(dst, src, last, size);
 break;
 case PNG_FILTER_VALUE_AVG:
- for(i = 0; i < bpp; i++) {
+ for (i = 0; i < bpp; i++) {
 p = (last[i] >> 1);
 dst[i] = p + src[i];
 }
@@ -227,34 +225,36 @@
 UNROLL_FILTER(OP_AVG);
 break;
 case PNG_FILTER_VALUE_PAETH:
- for(i = 0; i < bpp; i++) {
+ for (i = 0; i < bpp; i++) {
 p = last[i];
 dst[i] = p + src[i];
 }
- if(bpp > 1 && size > 4) {
+ if (bpp > 1 && size > 4) {
 // would write off the end of the array if we let it process the last pixel with bpp=3
- int w = bpp==4 ? size : size-3;
- dsp->add_paeth_prediction(dst+i, src+i, last+i, w-i, bpp);
+ int w = bpp == 4 ? size : size - 3;
+ dsp->add_paeth_prediction(dst + i, src + i, last + i, w - i, bpp);
 i = w;
 }
- ff_add_png_paeth_prediction(dst+i, src+i, last+i, size-i, bpp);
+ ff_add_png_paeth_prediction(dst + i, src + i, last + i, size - i, bpp);
 break;
 }
 }
 
-static av_always_inline void convert_to_rgb32_loco(uint8_t *dst, const uint8_t *src, int width, int loco)
+static av_always_inline void convert_to_rgb32_loco(uint8_t *dst,
+ const uint8_t *src,
+ int width, int loco)
 {
 int j;
 unsigned int r, g, b, a;
 
- for(j = 0;j < width; j++) {
+ for (j = 0; j < width; j++) {
 r = src[0];
 g = src[1];
 b = src[2];
 a = src[3];
- if(loco) {
- r = (r+g)&0xff;
- b = (b+g)&0xff;
+ if (loco) {
+ r = (r + g) & 0xff;
+ b = (b + g) & 0xff;
 }
 *(uint32_t *)dst = (a << 24) | (r << 16) | (g << 8) | b;
 dst += 4;
@@ -264,7 +264,7 @@
 
 static void convert_to_rgb32(uint8_t *dst, const uint8_t *src, int width, int loco)
 {
- if(loco)
+ if (loco)
 convert_to_rgb32_loco(dst, src, width, 1);
 else
 convert_to_rgb32_loco(dst, src, width, 0);
@@ -273,10 +273,10 @@
 static void deloco_rgb24(uint8_t *dst, int size)
 {
 int i;
- for(i=0; i<size; i+=3) {
- int g = dst[i+1];
- dst[i+0] += g;
- dst[i+2] += g;
+ for (i = 0; i < size; i += 3) {
+ int g = dst[i + 1];
+ dst[i + 0] += g;
+ dst[i + 2] += g;
 }
 }
 
@@ -317,7 +317,7 @@
 }
 } else {
 got_line = 0;
- for(;;) {
+ for (;;) {
 ptr = s->image_buf + s->image_linesize * s->y;
 if ((ff_png_pass_ymask[s->pass] << (s->y & 7)) & 0x80) {
 /* if we already read one row, it is time to stop to
@@ -336,7 +336,7 @@
 }
 s->y++;
 if (s->y == s->height) {
- for(;;) {
+ for (;;) {
 if (s->pass == NB_PASSES - 1) {
 s->state |= PNG_ALLIMAGE;
 goto the_end;
@@ -362,7 +362,7 @@
 {
 int ret;
 s->zstream.avail_in = FFMIN(length, bytestream2_get_bytes_left(&s->gb));
- s->zstream.next_in = s->gb.buffer;
+ s->zstream.next_in = s->gb.buffer;
 bytestream2_skip(&s->gb, length);
 
 /* decode one line if possible */
@@ -376,7 +376,11 @@
 png_handle_row(s);
 }
 s->zstream.avail_out = s->crow_size;
- s->zstream.next_out = s->crow_buf;
+ s->zstream.next_out = s->crow_buf;
+ }
+ if (ret == Z_STREAM_END && s->zstream.avail_in > 0) {
+ av_log(NULL, AV_LOG_WARNING, "%d undecompressed bytes left in buffer\n", s->zstream.avail_in);
+ return 0;
 }
 }
 return 0;
@@ -386,19 +390,14 @@
 void *data, int *got_frame,
 AVPacket *avpkt)
 {
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
 PNGDecContext * const s = avctx->priv_data;
- AVFrame *picture = data;
- AVFrame *p;
- uint8_t *crow_buf_base = NULL;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ AVFrame *p = data;
+ uint8_t *crow_buf_base = NULL;
 uint32_t tag, length;
 int ret;
 
- FFSWAP(AVFrame *, s->current_picture, s->last_picture);
- avctx->coded_frame= s->current_picture;
- p = s->current_picture;
-
 /* check signature */
 if (buf_size < 8 ||
 memcmp(buf, ff_pngsig, 8) != 0 &&
@@ -406,17 +405,16 @@
 return -1;
 
 bytestream2_init(&s->gb, buf + 8, buf_size - 8);
- s->y=
- s->state=0;
-// memset(s, 0, sizeof(PNGDecContext));
+ s->y = s->state = 0;
+
 /* init the zlib */
 s->zstream.zalloc = ff_png_zalloc;
- s->zstream.zfree = ff_png_zfree;
+ s->zstream.zfree = ff_png_zfree;
 s->zstream.opaque = NULL;
 ret = inflateInit(&s->zstream);
 if (ret != Z_OK)
 return -1;
- for(;;) {
+ for (;;) {
 if (bytestream2_get_bytes_left(&s->gb) <= 0)
 goto fail;
 length = bytestream2_get_be32(&s->gb);
@@ -428,14 +426,14 @@
 ((tag >> 8) & 0xff),
 ((tag >> 16) & 0xff),
 ((tag >> 24) & 0xff), length);
- switch(tag) {
+ switch (tag) {
 case MKTAG('I', 'H', 'D', 'R'):
 if (length != 13)
 goto fail;
 s->width = bytestream2_get_be32(&s->gb);
 s->height = bytestream2_get_be32(&s->gb);
- if(av_image_check_size(s->width, s->height, 0, avctx)){
- s->width= s->height= 0;
+ if (av_image_check_size(s->width, s->height, 0, avctx)) {
+ s->width = s->height = 0;
 goto fail;
 }
 s->bit_depth = bytestream2_get_byte(&s->gb);
@@ -445,7 +443,8 @@
 s->interlace_type = bytestream2_get_byte(&s->gb);
 bytestream2_skip(&s->gb, 4); /* crc */
 s->state |= PNG_IHDR;
- av_dlog(avctx, "width=%d height=%d depth=%d color_type=%d compression_type=%d filter_type=%d interlace_type=%d\n",
+ av_dlog(avctx, "width=%d height=%d depth=%d color_type=%d "
+ "compression_type=%d filter_type=%d interlace_type=%d\n",
 s->width, s->height, s->bit_depth, s->color_type,
 s->compression_type, s->filter_type, s->interlace_type);
 break;
@@ -454,13 +453,13 @@
 goto fail;
 if (!(s->state & PNG_IDAT)) {
 /* init image info */
- avctx->width = s->width;
+ avctx->width = s->width;
 avctx->height = s->height;
 
- s->channels = ff_png_get_nb_channels(s->color_type);
+ s->channels = ff_png_get_nb_channels(s->color_type);
 s->bits_per_pixel = s->bit_depth * s->channels;
- s->bpp = (s->bits_per_pixel + 7) >> 3;
- s->row_size = (avctx->width * s->bits_per_pixel + 7) >> 3;
+ s->bpp = (s->bits_per_pixel + 7) >> 3;
+ s->row_size = (avctx->width * s->bits_per_pixel + 7) >> 3;
 
 if (s->bit_depth == 8 &&
 s->color_type == PNG_COLOR_TYPE_RGB) {
@@ -489,16 +488,13 @@
 } else {
 goto fail;
 }
- if(p->data[0])
- avctx->release_buffer(avctx, p);
 
- p->reference= 0;
- if(ff_get_buffer(avctx, p) < 0){
+ if (ff_get_buffer(avctx, p, AV_GET_BUFFER_FLAG_REF) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 goto fail;
 }
- p->pict_type= AV_PICTURE_TYPE_I;
- p->key_frame= 1;
+ p->pict_type = AV_PICTURE_TYPE_I;
+ p->key_frame = 1;
 p->interlaced_frame = !!s->interlace_type;
 
 /* compute the compressed row size */
@@ -513,7 +509,7 @@
 }
 av_dlog(avctx, "row_size=%d crow_size =%d\n",
 s->row_size, s->crow_size);
- s->image_buf = p->data[0];
+ s->image_buf = p->data[0];
 s->image_linesize = p->linesize[0];
 /* copy the palette if needed */
 if (s->color_type == PNG_COLOR_TYPE_PALETTE)
@@ -534,9 +530,9 @@
 goto fail;
 
 /* we want crow_buf+1 to be 16-byte aligned */
- s->crow_buf = crow_buf_base + 15;
+ s->crow_buf = crow_buf_base + 15;
 s->zstream.avail_out = s->crow_size;
- s->zstream.next_out = s->crow_buf;
+ s->zstream.next_out = s->crow_buf;
 }
 s->state |= PNG_IDAT;
 if (png_decode_idat(s, length) < 0)
@@ -551,13 +547,13 @@
 goto skip_tag;
 /* read the palette */
 n = length / 3;
- for(i=0;i<n;i++) {
+ for (i = 0; i < n; i++) {
 r = bytestream2_get_byte(&s->gb);
 g = bytestream2_get_byte(&s->gb);
 b = bytestream2_get_byte(&s->gb);
 s->palette[i] = (0xff << 24) | (r << 16) | (g << 8) | b;
 }
- for(;i<256;i++) {
+ for (; i < 256; i++) {
 s->palette[i] = (0xff << 24);
 }
 s->state |= PNG_PLTE;
@@ -573,7 +569,7 @@
 length > 256 ||
 !(s->state & PNG_PLTE))
 goto skip_tag;
- for(i=0;i<length;i++) {
+ for (i = 0; i < length; i++) {
 v = bytestream2_get_byte(&s->gb);
 s->palette[i] = (s->palette[i] & 0x00ffffff) | (v << 24);
 }
@@ -594,23 +590,26 @@
 }
 exit_loop:
 /* handle p-frames only if a predecessor frame is available */
- if(s->last_picture->data[0] != NULL) {
- if(!(avpkt->flags & AV_PKT_FLAG_KEY)) {
+ if (s->prev->data[0]) {
+ if (!(avpkt->flags & AV_PKT_FLAG_KEY)) {
 int i, j;
- uint8_t *pd = s->current_picture->data[0];
- uint8_t *pd_last = s->last_picture->data[0];
+ uint8_t *pd = p->data[0];
+ uint8_t *pd_last = s->prev->data[0];
 
- for(j=0; j < s->height; j++) {
- for(i=0; i < s->width * s->bpp; i++) {
+ for (j = 0; j < s->height; j++) {
+ for (i = 0; i < s->width * s->bpp; i++) {
 pd[i] += pd_last[i];
 }
- pd += s->image_linesize;
+ pd += s->image_linesize;
 pd_last += s->image_linesize;
 }
 }
 }
 
- *picture= *s->current_picture;
+ av_frame_unref(s->prev);
+ if ((ret = av_frame_ref(s->prev, p)) < 0)
+ goto fail;
+
 *got_frame = 1;
 
 ret = bytestream2_tell(&s->gb);
@@ -626,13 +625,14 @@
 goto the_end;
 }
 
-static av_cold int png_dec_init(AVCodecContext *avctx){
+static av_cold int png_dec_init(AVCodecContext *avctx)
+{
 PNGDecContext *s = avctx->priv_data;
 
- s->current_picture = &s->picture1;
- s->last_picture = &s->picture2;
- avcodec_get_frame_defaults(&s->picture1);
- avcodec_get_frame_defaults(&s->picture2);
+ s->prev = av_frame_alloc();
+ if (!s->prev)
+ return AVERROR(ENOMEM);
+
 ff_pngdsp_init(&s->dsp);
 
 return 0;
@@ -642,16 +642,14 @@
 {
 PNGDecContext *s = avctx->priv_data;
 
- if (s->picture1.data[0])
- avctx->release_buffer(avctx, &s->picture1);
- if (s->picture2.data[0])
- avctx->release_buffer(avctx, &s->picture2);
+ av_frame_free(&s->prev);
 
 return 0;
 }
 
 AVCodec ff_png_decoder = {
 .name = "png",
+ .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_PNG,
 .priv_data_size = sizeof(PNGDecContext),
@@ -659,5 +657,4 @@
 .close = png_dec_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
- .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"),
 };

libav-v9.6.tar.bz2/libavcodec/pngdsp.c -> libav-v10.1.tar.bz2/libavcodec/pngdsp.c Changed

libav-v9.6.tar.bz2/libavcodec/pngenc.c -> libav-v10.1.tar.bz2/libavcodec/pngenc.c Changed

@@ -29,8 +29,6 @@
 
 #include <zlib.h>
 
-//#define DEBUG
-
 #define IOBUF_SIZE 4096
 
 typedef struct PNGEncContext {
@@ -39,7 +37,6 @@
 uint8_t *bytestream;
 uint8_t *bytestream_start;
 uint8_t *bytestream_end;
- AVFrame picture;
 
 int filter_type;
 
@@ -233,7 +230,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, max_packet_size;
 int compression_level;
@@ -243,10 +240,6 @@
 uint8_t *rgba_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_RGB32:
@@ -257,6 +250,10 @@
 bit_depth = 8;
 color_type = PNG_COLOR_TYPE_RGB;
 break;
+ case AV_PIX_FMT_GRAY16BE:
+ bit_depth = 16;
+ color_type = PNG_COLOR_TYPE_GRAY;
+ break;
 case AV_PIX_FMT_GRAY8:
 bit_depth = 8;
 color_type = PNG_COLOR_TYPE_GRAY;
@@ -442,8 +439,13 @@
 static av_cold int png_enc_init(AVCodecContext *avctx){
 PNGEncContext *s = avctx->priv_data;
 
- 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);
@@ -453,16 +455,24 @@
 return 0;
 }
 
+static av_cold int png_enc_close(AVCodecContext *avctx)
+{
+ av_frame_free(&avctx->coded_frame);
+ return 0;
+}
+
 AVCodec ff_png_encoder = {
 .name = "png",
+ .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_PNG,
 .priv_data_size = sizeof(PNGEncContext),
 .init = png_enc_init,
+ .close = png_enc_close,
 .encode2 = encode_frame,
 .pix_fmts = (const enum AVPixelFormat[]){
 AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB32, AV_PIX_FMT_PAL8, AV_PIX_FMT_GRAY8,
+ AV_PIX_FMT_GRAY16BE,
 AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE
 },
- .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"),
 };

libav-v9.6.tar.bz2/libavcodec/pnm.c -> libav-v10.1.tar.bz2/libavcodec/pnm.c Changed

@@ -65,7 +65,7 @@
 pnm_get(s, buf1, sizeof(buf1));
 s->type= buf1[1]-'0';
 if(buf1[0] != 'P')
- return -1;
+ return AVERROR_INVALIDDATA;
 
 if (s->type==1 || s->type==4) {
 avctx->pix_fmt = AV_PIX_FMT_MONOWHITE;
@@ -103,12 +103,12 @@
 } else if (!strcmp(buf1, "ENDHDR")) {
 break;
 } else {
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 /* check that all tags are present */
 if (w <= 0 || h <= 0 || maxval <= 0 || depth <= 0 || tuple_type[0] == '\0' || av_image_check_size(w, h, 0, avctx))
- return -1;
+ return AVERROR_INVALIDDATA;
 
 avctx->width = w;
 avctx->height = h;
@@ -123,25 +123,25 @@
 } else {
 av_log(avctx, AV_LOG_ERROR, "16-bit components are only supported for grayscale\n");
 avctx->pix_fmt = AV_PIX_FMT_NONE;
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 } else if (depth == 4) {
 avctx->pix_fmt = AV_PIX_FMT_RGB32;
 } else {
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 return 0;
 } else {
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 pnm_get(s, buf1, sizeof(buf1));
 avctx->width = atoi(buf1);
 if (avctx->width <= 0)
- return -1;
+ return AVERROR_INVALIDDATA;
 pnm_get(s, buf1, sizeof(buf1));
 avctx->height = atoi(buf1);
 if(av_image_check_size(avctx->width, avctx->height, 0, avctx))
- return -1;
+ return AVERROR_INVALIDDATA;
 if (avctx->pix_fmt != AV_PIX_FMT_MONOWHITE) {
 pnm_get(s, buf1, sizeof(buf1));
 s->maxval = atoi(buf1);
@@ -157,43 +157,30 @@
 } else if (avctx->pix_fmt == AV_PIX_FMT_RGB24) {
 if (s->maxval > 255)
 avctx->pix_fmt = AV_PIX_FMT_RGB48BE;
+ } else if (avctx->pix_fmt == AV_PIX_FMT_YUV420P && s->maxval < 65536) {
+ if (s->maxval < 512)
+ avctx->pix_fmt = AV_PIX_FMT_YUV420P9BE;
+ else if (s->maxval < 1024)
+ avctx->pix_fmt = AV_PIX_FMT_YUV420P10BE;
+ else
+ avctx->pix_fmt = AV_PIX_FMT_YUV420P16;
 } else {
 av_log(avctx, AV_LOG_ERROR, "Unsupported pixel format\n");
 avctx->pix_fmt = AV_PIX_FMT_NONE;
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 }else
 s->maxval=1;
 /* more check if YUV420 */
- if (avctx->pix_fmt == AV_PIX_FMT_YUV420P) {
+ if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & AV_PIX_FMT_FLAG_PLANAR) {
 if ((avctx->width & 1) != 0)
- return -1;
+ return AVERROR_INVALIDDATA;
 h = (avctx->height * 2);
 if ((h % 3) != 0)
- return -1;
+ return AVERROR_INVALIDDATA;
 h /= 3;
 avctx->height = h;
 }
 return 0;
 }
-
-av_cold int ff_pnm_end(AVCodecContext *avctx)
-{
- PNMContext *s = avctx->priv_data;
-
- if (s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
-
- return 0;
-}
-
-av_cold int ff_pnm_init(AVCodecContext *avctx)
-{
- PNMContext *s = avctx->priv_data;
-
- avcodec_get_frame_defaults(&s->picture);
- avctx->coded_frame = &s->picture;
-
- return 0;
-}

libav-v9.6.tar.bz2/libavcodec/pnm.h -> libav-v10.1.tar.bz2/libavcodec/pnm.h Changed

libav-v9.6.tar.bz2/libavcodec/pnmdec.c -> libav-v10.1.tar.bz2/libavcodec/pnmdec.c Changed

@@ -32,33 +32,28 @@
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 PNMContext * const s = avctx->priv_data;
- AVFrame *picture = data;
- AVFrame * const p = &s->picture;
+ AVFrame * const p = data;
 int i, j, n, linesize, h, upgrade = 0;
 unsigned char *ptr;
- int components, sample_len;
+ int components, sample_len, ret;
 
 s->bytestream_start =
 s->bytestream = buf;
 s->bytestream_end = buf + buf_size;
 
- if (ff_pnm_decode_header(avctx, s) < 0)
- return -1;
+ if ((ret = ff_pnm_decode_header(avctx, s)) < 0)
+ return ret;
 
- if (p->data[0])
- avctx->release_buffer(avctx, p);
-
- p->reference = 0;
- if (ff_get_buffer(avctx, p) < 0) {
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 p->pict_type = AV_PICTURE_TYPE_I;
 p->key_frame = 1;
 
 switch (avctx->pix_fmt) {
 default:
- return -1;
+ return AVERROR(EINVAL);
 case AV_PIX_FMT_RGB48BE:
 n = avctx->width * 6;
 components=3;
@@ -93,7 +88,7 @@
 ptr = p->data[0];
 linesize = p->linesize[0];
 if (s->bytestream + n * avctx->height > s->bytestream_end)
- return -1;
+ return AVERROR_INVALIDDATA;
 if(s->type < 4){
 for (i=0; i<avctx->height; i++) {
 PutBitContext pb;
@@ -104,7 +99,7 @@
 while(s->bytestream < s->bytestream_end && (*s->bytestream < '0' || *s->bytestream > '9' ))
 s->bytestream++;
 if(s->bytestream >= s->bytestream_end)
- return -1;
+ return AVERROR_INVALIDDATA;
 do{
 v= 10*v + c;
 c= (*s->bytestream++) - '0';
@@ -135,14 +130,18 @@
 }
 break;
 case AV_PIX_FMT_YUV420P:
+ case AV_PIX_FMT_YUV420P9BE:
+ case AV_PIX_FMT_YUV420P10BE:
 {
 unsigned char *ptr1, *ptr2;
 
 n = avctx->width;
 ptr = p->data[0];
 linesize = p->linesize[0];
+ if (s->maxval >= 256)
+ n *= 2;
 if (s->bytestream + n * avctx->height * 3 / 2 > s->bytestream_end)
- return -1;
+ return AVERROR_INVALIDDATA;
 for (i = 0; i < avctx->height; i++) {
 memcpy(ptr, s->bytestream, n);
 s->bytestream += n;
@@ -162,11 +161,52 @@
 }
 }
 break;
+ case AV_PIX_FMT_YUV420P16:
+ {
+ uint16_t *ptr1, *ptr2;
+ const int f = (65535 * 32768 + s->maxval / 2) / s->maxval;
+ unsigned int j, v;
+
+ n = avctx->width * 2;
+ ptr = p->data[0];
+ linesize = p->linesize[0];
+ if (s->bytestream + n * avctx->height * 3 / 2 > s->bytestream_end)
+ return AVERROR_INVALIDDATA;
+ for (i = 0; i < avctx->height; i++) {
+ for (j = 0; j < n / 2; j++) {
+ v = av_be2ne16(((uint16_t *)s->bytestream)[j]);
+ ((uint16_t *)ptr)[j] = (v * f + 16384) >> 15;
+ }
+ s->bytestream += n;
+ ptr += linesize;
+ }
+ ptr1 = (uint16_t*)p->data[1];
+ ptr2 = (uint16_t*)p->data[2];
+ n >>= 1;
+ h = avctx->height >> 1;
+ for (i = 0; i < h; i++) {
+ for (j = 0; j < n / 2; j++) {
+ v = av_be2ne16(((uint16_t *)s->bytestream)[j]);
+ ptr1[j] = (v * f + 16384) >> 15;
+ }
+ s->bytestream += n;
+
+ for (j = 0; j < n / 2; j++) {
+ v = av_be2ne16(((uint16_t *)s->bytestream)[j]);
+ ptr2[j] = (v * f + 16384) >> 15;
+ }
+ s->bytestream += n;
+
+ ptr1 += p->linesize[1] / 2;
+ ptr2 += p->linesize[2] / 2;
+ }
+ }
+ break;
 case AV_PIX_FMT_RGB32:
 ptr = p->data[0];
 linesize = p->linesize[0];
 if (s->bytestream + avctx->width * avctx->height * 4 > s->bytestream_end)
- return -1;
+ return AVERROR_INVALIDDATA;
 for (i = 0; i < avctx->height; i++) {
 int j, r, g, b, a;
 
@@ -181,7 +221,6 @@
 }
 break;
 }
- *picture = s->picture;
 *got_frame = 1;
 
 return s->bytestream - s->bytestream_start;
@@ -191,69 +230,59 @@
 #if CONFIG_PGM_DECODER
 AVCodec ff_pgm_decoder = {
 .name = "pgm",
+ .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 = ff_pnm_init,
- .close = ff_pnm_end,
 .decode = pnm_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"),
 };
 #endif
 
 #if CONFIG_PGMYUV_DECODER
 AVCodec ff_pgmyuv_decoder = {
 .name = "pgmyuv",
+ .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 = ff_pnm_init,
- .close = ff_pnm_end,
 .decode = pnm_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"),
 };
 #endif
 
 #if CONFIG_PPM_DECODER
 AVCodec ff_ppm_decoder = {
 .name = "ppm",
+ .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 = ff_pnm_init,
- .close = ff_pnm_end,
 .decode = pnm_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"),
 };
 #endif
 
 #if CONFIG_PBM_DECODER
 AVCodec ff_pbm_decoder = {
 .name = "pbm",
+ .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 = ff_pnm_init,
- .close = ff_pnm_end,
 .decode = pnm_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"),
 };
 #endif
 
 #if CONFIG_PAM_DECODER
 AVCodec ff_pam_decoder = {
 .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 = ff_pnm_init,
- .close = ff_pnm_end,
 .decode = pnm_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"),
 };
 #endif

libav-v9.6.tar.bz2/libavcodec/pnmenc.c -> libav-v10.1.tar.bz2/libavcodec/pnmenc.c Changed

@@ -19,17 +19,16 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "libavutil/pixdesc.h"
 #include "avcodec.h"
 #include "bytestream.h"
 #include "internal.h"
-#include "pnm.h"
-
 
 static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 const AVFrame *pict, int *got_packet)
 {
- PNMContext *s = avctx->priv_data;
- AVFrame * const p = &s->picture;
+ uint8_t *bytestream, *bytestream_start, *bytestream_end;
+ const AVFrame * const p = pict;
 int i, h, h1, c, n, linesize, ret;
 uint8_t *ptr, *ptr1, *ptr2;
 
@@ -40,13 +39,9 @@
 return ret;
 }
 
- *p = *pict;
- p->pict_type = AV_PICTURE_TYPE_I;
- p->key_frame = 1;
-
- 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;
@@ -76,101 +71,126 @@
 n = avctx->width;
 h1 = (h * 3) / 2;
 break;
+ case AV_PIX_FMT_YUV420P16BE:
+ c = '5';
+ n = avctx->width * 2;
+ h1 = (h * 3) / 2;
+ break;
 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) {
- snprintf(s->bytestream, s->bytestream_end - s->bytestream,
- "%d\n", (avctx->pix_fmt != AV_PIX_FMT_GRAY16BE && avctx->pix_fmt != AV_PIX_FMT_RGB48BE) ? 255 : 65535);
- s->bytestream += strlen(s->bytestream);
+ int maxdepth = (1 << (av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1)) - 1;
+ snprintf(bytestream, bytestream_end - bytestream,
+ "%d\n", maxdepth);
+ 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) {
+ if (avctx->pix_fmt == AV_PIX_FMT_YUV420P || avctx->pix_fmt == AV_PIX_FMT_YUV420P16BE) {
 h >>= 1;
 n >>= 1;
 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 = {
 .name = "pgm",
+ .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 = ff_pnm_init,
+ .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
 },
- .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"),
 };
 #endif
 
 #if CONFIG_PGMYUV_ENCODER
 AVCodec ff_pgmyuv_encoder = {
 .name = "pgmyuv",
+ .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 = ff_pnm_init,
+ .init = pnm_encode_init,
+ .close = pnm_encode_close,
 .encode2 = pnm_encode_frame,
- .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"),
+ .pix_fmts = (const enum AVPixelFormat[]){
+ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P16BE, AV_PIX_FMT_NONE
+ },
 };
 #endif
 
 #if CONFIG_PPM_ENCODER
 AVCodec ff_ppm_encoder = {
 .name = "ppm",
+ .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 = ff_pnm_init,
+ .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
 },
- .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"),
 };
 #endif
 
 #if CONFIG_PBM_ENCODER
 AVCodec ff_pbm_encoder = {
 .name = "pbm",
+ .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 = ff_pnm_init,
+ .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 },
- .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"),
 };
 #endif

libav-v9.6.tar.bz2/libavcodec/ppc/Makefile -> libav-v10.1.tar.bz2/libavcodec/ppc/Makefile Changed

@@ -1,21 +1,24 @@
 OBJS                                   += ppc/dsputil_ppc.o             \
+                                          ppc/fmtconvert_altivec.o      \
                                           ppc/videodsp_ppc.o            \
 
+OBJS-$(CONFIG_FFT)                     += ppc/fft_altivec.o
+OBJS-$(CONFIG_H264CHROMA)              += ppc/h264chroma_init.o
+OBJS-$(CONFIG_H264DSP)                 += ppc/h264dsp.o
+OBJS-$(CONFIG_H264QPEL)                += ppc/h264qpel.o
+OBJS-$(CONFIG_HPELDSP)                 += ppc/hpeldsp_altivec.o
+OBJS-$(CONFIG_MPEGAUDIODSP)            += ppc/mpegaudiodsp_altivec.o
+OBJS-$(CONFIG_MPEGVIDEO)               += ppc/mpegvideo_altivec.o
+OBJS-$(CONFIG_VC1_DECODER)             += ppc/vc1dsp_altivec.o
+OBJS-$(CONFIG_VORBIS_DECODER)          += ppc/vorbisdsp_altivec.o
 OBJS-$(CONFIG_VP3DSP)                  += ppc/vp3dsp_altivec.o
-
-FFT-OBJS-$(HAVE_GNU_AS)                += ppc/fft_altivec_s.o
-ALTIVEC-OBJS-$(CONFIG_FFT)             += ppc/fft_altivec.o             \
-                                          $(FFT-OBJS-yes)
-ALTIVEC-OBJS-$(CONFIG_H264DSP)         += ppc/h264_altivec.o
-ALTIVEC-OBJS-$(CONFIG_MPEGAUDIODSP)    += ppc/mpegaudiodec_altivec.o
-ALTIVEC-OBJS-$(CONFIG_MPEGVIDEO)       += ppc/mpegvideo_altivec.o
-ALTIVEC-OBJS-$(CONFIG_VC1_DECODER)     += ppc/vc1dsp_altivec.o
-ALTIVEC-OBJS-$(CONFIG_VP8_DECODER)     += ppc/vp8dsp_altivec.o
+OBJS-$(CONFIG_VP8_DECODER)             += ppc/vp8dsp_altivec.o
 
 ALTIVEC-OBJS                           += ppc/dsputil_altivec.o         \
                                           ppc/fdct_altivec.o            \
-                                          ppc/float_altivec.o           \
-                                          ppc/fmtconvert_altivec.o      \
                                           ppc/gmc_altivec.o             \
                                           ppc/idct_altivec.o            \
                                           ppc/int_altivec.o             \
+
+FFT-OBJS-$(HAVE_GNU_AS)                += ppc/fft_altivec_s.o
+ALTIVEC-OBJS-$(CONFIG_FFT)             += $(FFT-OBJS-yes)

libav-v9.6.tar.bz2/libavcodec/ppc/dsputil_altivec.c -> libav-v10.1.tar.bz2/libavcodec/ppc/dsputil_altivec.c Changed

@@ -24,6 +24,7 @@
 #if HAVE_ALTIVEC_H
 #include <altivec.h>
 #endif
+#include "libavutil/attributes.h"
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
 #include "libavcodec/dsputil.h"
@@ -284,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);
 
@@ -366,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);
 
@@ -476,7 +477,7 @@
 return s;
 }
 
-static void get_pixels_altivec(DCTELEM *restrict block, const uint8_t *pixels, int line_size)
+static void get_pixels_altivec(int16_t *restrict block, const uint8_t *pixels, int line_size)
 {
 int i;
 vector unsigned char perm = vec_lvsl(0, pixels);
@@ -488,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
@@ -502,7 +503,7 @@
 }
 }
 
-static void diff_pixels_altivec(DCTELEM *restrict block, const uint8_t *s1,
+static void diff_pixels_altivec(int16_t *restrict block, const uint8_t *s1,
 const uint8_t *s2, int stride)
 {
 int i;
@@ -576,7 +577,7 @@
 }
 
 
-static void clear_block_altivec(DCTELEM *block) {
+static void clear_block_altivec(int16_t *block) {
 LOAD_ZERO;
 vec_st(zero_s16v, 0, block);
 vec_st(zero_s16v, 16, block);
@@ -606,354 +607,6 @@
 }
 }
 
-/* next one assumes that ((line_size % 16) == 0) */
-void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- register vector unsigned char pixelsv1, pixelsv2;
- register vector unsigned char pixelsv1B, pixelsv2B;
- register vector unsigned char pixelsv1C, pixelsv2C;
- register vector unsigned char pixelsv1D, pixelsv2D;
-
- register vector unsigned char perm = vec_lvsl(0, pixels);
- int i;
- register int line_size_2 = line_size << 1;
- register int line_size_3 = line_size + line_size_2;
- register int line_size_4 = line_size << 2;
-
-// hand-unrolling the loop by 4 gains about 15%
-// mininum execution time goes from 74 to 60 cycles
-// it's faster than -funroll-loops, but using
-// -funroll-loops w/ this is bad - 74 cycles again.
-// all this is on a 7450, tuning for the 7450
- for (i = 0; i < h; i += 4) {
- pixelsv1 = vec_ld( 0, pixels);
- pixelsv2 = vec_ld(15, pixels);
- pixelsv1B = vec_ld(line_size, pixels);
- pixelsv2B = vec_ld(15 + line_size, pixels);
- pixelsv1C = vec_ld(line_size_2, pixels);
- pixelsv2C = vec_ld(15 + line_size_2, pixels);
- pixelsv1D = vec_ld(line_size_3, pixels);
- pixelsv2D = vec_ld(15 + line_size_3, pixels);
- vec_st(vec_perm(pixelsv1, pixelsv2, perm),
- 0, (unsigned char*)block);
- vec_st(vec_perm(pixelsv1B, pixelsv2B, perm),
- line_size, (unsigned char*)block);
- vec_st(vec_perm(pixelsv1C, pixelsv2C, perm),
- line_size_2, (unsigned char*)block);
- vec_st(vec_perm(pixelsv1D, pixelsv2D, perm),
- line_size_3, (unsigned char*)block);
- pixels+=line_size_4;
- block +=line_size_4;
- }
-}
-
-/* next one assumes that ((line_size % 16) == 0) */
-#define op_avg(a,b) a = ( ((a)|(b)) - ((((a)^(b))&0xFEFEFEFEUL)>>1) )
-void ff_avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- register vector unsigned char pixelsv1, pixelsv2, pixelsv, blockv;
- register vector unsigned char perm = vec_lvsl(0, pixels);
- int i;
-
- for (i = 0; i < h; i++) {
- pixelsv1 = vec_ld( 0, pixels);
- pixelsv2 = vec_ld(16,pixels);
- blockv = vec_ld(0, block);
- pixelsv = vec_perm(pixelsv1, pixelsv2, perm);
- blockv = vec_avg(blockv,pixelsv);
- vec_st(blockv, 0, (unsigned char*)block);
- pixels+=line_size;
- block +=line_size;
- }
-}
-
-/* next one assumes that ((line_size % 8) == 0) */
-static void avg_pixels8_altivec(uint8_t * block, const uint8_t * pixels, int line_size, int h)
-{
- register vector unsigned char pixelsv1, pixelsv2, pixelsv, blockv;
- int i;
-
- for (i = 0; i < h; i++) {
- /* block is 8 bytes-aligned, so we're either in the
- left block (16 bytes-aligned) or in the right block (not) */
- int rightside = ((unsigned long)block & 0x0000000F);
-
- blockv = vec_ld(0, block);
- pixelsv1 = vec_ld( 0, pixels);
- pixelsv2 = vec_ld(16, pixels);
- pixelsv = vec_perm(pixelsv1, pixelsv2, vec_lvsl(0, pixels));
-
- if (rightside) {
- pixelsv = vec_perm(blockv, pixelsv, vcprm(0,1,s0,s1));
- } else {
- pixelsv = vec_perm(blockv, pixelsv, vcprm(s0,s1,2,3));
- }
-
- blockv = vec_avg(blockv, pixelsv);
-
- vec_st(blockv, 0, block);
-
- pixels += line_size;
- block += line_size;
- }
-}
-
-/* next one assumes that ((line_size % 8) == 0) */
-static void put_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- register int i;
- register vector unsigned char pixelsv1, pixelsv2, pixelsavg;
- register vector unsigned char blockv, temp1, temp2;
- register vector unsigned short pixelssum1, pixelssum2, temp3;
- register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0);
- register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2);
-
- temp1 = vec_ld(0, pixels);
- temp2 = vec_ld(16, pixels);
- pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(0, pixels));
- if ((((unsigned long)pixels) & 0x0000000F) == 0x0000000F) {
- pixelsv2 = temp2;
- } else {
- pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(1, pixels));
- }
- pixelsv1 = vec_mergeh(vczero, pixelsv1);
- pixelsv2 = vec_mergeh(vczero, pixelsv2);
- pixelssum1 = vec_add((vector unsigned short)pixelsv1,
- (vector unsigned short)pixelsv2);
- pixelssum1 = vec_add(pixelssum1, vctwo);
-
- for (i = 0; i < h ; i++) {
- int rightside = ((unsigned long)block & 0x0000000F);
- blockv = vec_ld(0, block);
-
- temp1 = vec_ld(line_size, pixels);
- temp2 = vec_ld(line_size + 16, pixels);
- pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(line_size, pixels));
- if (((((unsigned long)pixels) + line_size) & 0x0000000F) == 0x0000000F) {
- pixelsv2 = temp2;
- } else {
- pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(line_size + 1, pixels));
- }
-
- pixelsv1 = vec_mergeh(vczero, pixelsv1);
- pixelsv2 = vec_mergeh(vczero, pixelsv2);
- pixelssum2 = vec_add((vector unsigned short)pixelsv1,
- (vector unsigned short)pixelsv2);
- temp3 = vec_add(pixelssum1, pixelssum2);
- temp3 = vec_sra(temp3, vctwo);
- pixelssum1 = vec_add(pixelssum2, vctwo);
- pixelsavg = vec_packsu(temp3, (vector unsigned short) vczero);
-
- if (rightside) {
- blockv = vec_perm(blockv, pixelsavg, vcprm(0, 1, s0, s1));
- } else {
- blockv = vec_perm(blockv, pixelsavg, vcprm(s0, s1, 2, 3));
- }
-
- vec_st(blockv, 0, block);
-
- block += line_size;
- pixels += line_size;
- }
-}
-
-/* next one assumes that ((line_size % 8) == 0) */
-static void put_no_rnd_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- register int i;
- register vector unsigned char pixelsv1, pixelsv2, pixelsavg;
- register vector unsigned char blockv, temp1, temp2;
- register vector unsigned short pixelssum1, pixelssum2, temp3;
- register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0);
- register const vector unsigned short vcone = (const vector unsigned short)vec_splat_u16(1);
- register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2);
-
- temp1 = vec_ld(0, pixels);
- temp2 = vec_ld(16, pixels);
- pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(0, pixels));
- if ((((unsigned long)pixels) & 0x0000000F) == 0x0000000F) {
- pixelsv2 = temp2;
- } else {
- pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(1, pixels));
- }
- pixelsv1 = vec_mergeh(vczero, pixelsv1);
- pixelsv2 = vec_mergeh(vczero, pixelsv2);
- pixelssum1 = vec_add((vector unsigned short)pixelsv1,
- (vector unsigned short)pixelsv2);
- pixelssum1 = vec_add(pixelssum1, vcone);
-
- for (i = 0; i < h ; i++) {
- int rightside = ((unsigned long)block & 0x0000000F);
- blockv = vec_ld(0, block);
-
- temp1 = vec_ld(line_size, pixels);
- temp2 = vec_ld(line_size + 16, pixels);
- pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(line_size, pixels));
- if (((((unsigned long)pixels) + line_size) & 0x0000000F) == 0x0000000F) {
- pixelsv2 = temp2;
- } else {
- pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(line_size + 1, pixels));
- }
-
- pixelsv1 = vec_mergeh(vczero, pixelsv1);
- pixelsv2 = vec_mergeh(vczero, pixelsv2);
- pixelssum2 = vec_add((vector unsigned short)pixelsv1,
- (vector unsigned short)pixelsv2);
- temp3 = vec_add(pixelssum1, pixelssum2);
- temp3 = vec_sra(temp3, vctwo);
- pixelssum1 = vec_add(pixelssum2, vcone);
- pixelsavg = vec_packsu(temp3, (vector unsigned short) vczero);
-
- if (rightside) {
- blockv = vec_perm(blockv, pixelsavg, vcprm(0, 1, s0, s1));
- } else {
- blockv = vec_perm(blockv, pixelsavg, vcprm(s0, s1, 2, 3));
- }
-
- vec_st(blockv, 0, block);
-
- block += line_size;
- pixels += line_size;
- }
-}
-
-/* next one assumes that ((line_size % 16) == 0) */
-static void put_pixels16_xy2_altivec(uint8_t * block, const uint8_t * pixels, int line_size, int h)
-{
- register int i;
- register vector unsigned char pixelsv1, pixelsv2, pixelsv3, pixelsv4;
- register vector unsigned char blockv, temp1, temp2;
- register vector unsigned short temp3, temp4,
- pixelssum1, pixelssum2, pixelssum3, pixelssum4;
- register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0);
- register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2);
-
- temp1 = vec_ld(0, pixels);
- temp2 = vec_ld(16, pixels);
- pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(0, pixels));
- if ((((unsigned long)pixels) & 0x0000000F) == 0x0000000F) {
- pixelsv2 = temp2;
- } else {
- pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(1, pixels));
- }
- pixelsv3 = vec_mergel(vczero, pixelsv1);
- pixelsv4 = vec_mergel(vczero, pixelsv2);
- pixelsv1 = vec_mergeh(vczero, pixelsv1);
- pixelsv2 = vec_mergeh(vczero, pixelsv2);
- pixelssum3 = vec_add((vector unsigned short)pixelsv3,
- (vector unsigned short)pixelsv4);
- pixelssum3 = vec_add(pixelssum3, vctwo);
- pixelssum1 = vec_add((vector unsigned short)pixelsv1,
- (vector unsigned short)pixelsv2);
- pixelssum1 = vec_add(pixelssum1, vctwo);
-
- for (i = 0; i < h ; i++) {
- blockv = vec_ld(0, block);
-
- temp1 = vec_ld(line_size, pixels);
- temp2 = vec_ld(line_size + 16, pixels);
- pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(line_size, pixels));
- if (((((unsigned long)pixels) + line_size) & 0x0000000F) == 0x0000000F) {
- pixelsv2 = temp2;
- } else {
- pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(line_size + 1, pixels));
- }
-
- pixelsv3 = vec_mergel(vczero, pixelsv1);
- pixelsv4 = vec_mergel(vczero, pixelsv2);
- pixelsv1 = vec_mergeh(vczero, pixelsv1);
- pixelsv2 = vec_mergeh(vczero, pixelsv2);
-
- pixelssum4 = vec_add((vector unsigned short)pixelsv3,
- (vector unsigned short)pixelsv4);
- pixelssum2 = vec_add((vector unsigned short)pixelsv1,
- (vector unsigned short)pixelsv2);
- temp4 = vec_add(pixelssum3, pixelssum4);
- temp4 = vec_sra(temp4, vctwo);
- temp3 = vec_add(pixelssum1, pixelssum2);
- temp3 = vec_sra(temp3, vctwo);
-
- pixelssum3 = vec_add(pixelssum4, vctwo);
- pixelssum1 = vec_add(pixelssum2, vctwo);
-
- blockv = vec_packsu(temp3, temp4);
-
- vec_st(blockv, 0, block);
-
- block += line_size;
- pixels += line_size;
- }
-}
-
-/* next one assumes that ((line_size % 16) == 0) */
-static void put_no_rnd_pixels16_xy2_altivec(uint8_t * block, const uint8_t * pixels, int line_size, int h)
-{
- register int i;
- register vector unsigned char pixelsv1, pixelsv2, pixelsv3, pixelsv4;
- register vector unsigned char blockv, temp1, temp2;
- register vector unsigned short temp3, temp4,
- pixelssum1, pixelssum2, pixelssum3, pixelssum4;
- register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0);
- register const vector unsigned short vcone = (const vector unsigned short)vec_splat_u16(1);
- register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2);
-
- temp1 = vec_ld(0, pixels);
- temp2 = vec_ld(16, pixels);
- pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(0, pixels));
- if ((((unsigned long)pixels) & 0x0000000F) == 0x0000000F) {
- pixelsv2 = temp2;
- } else {
- pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(1, pixels));
- }
- pixelsv3 = vec_mergel(vczero, pixelsv1);
- pixelsv4 = vec_mergel(vczero, pixelsv2);
- pixelsv1 = vec_mergeh(vczero, pixelsv1);
- pixelsv2 = vec_mergeh(vczero, pixelsv2);
- pixelssum3 = vec_add((vector unsigned short)pixelsv3,
- (vector unsigned short)pixelsv4);
- pixelssum3 = vec_add(pixelssum3, vcone);
- pixelssum1 = vec_add((vector unsigned short)pixelsv1,
- (vector unsigned short)pixelsv2);
- pixelssum1 = vec_add(pixelssum1, vcone);
-
- for (i = 0; i < h ; i++) {
- blockv = vec_ld(0, block);
-
- temp1 = vec_ld(line_size, pixels);
- temp2 = vec_ld(line_size + 16, pixels);
- pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(line_size, pixels));
- if (((((unsigned long)pixels) + line_size) & 0x0000000F) == 0x0000000F) {
- pixelsv2 = temp2;
- } else {
- pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(line_size + 1, pixels));
- }
-
- pixelsv3 = vec_mergel(vczero, pixelsv1);
- pixelsv4 = vec_mergel(vczero, pixelsv2);
- pixelsv1 = vec_mergeh(vczero, pixelsv1);
- pixelsv2 = vec_mergeh(vczero, pixelsv2);
-
- pixelssum4 = vec_add((vector unsigned short)pixelsv3,
- (vector unsigned short)pixelsv4);
- pixelssum2 = vec_add((vector unsigned short)pixelsv1,
- (vector unsigned short)pixelsv2);
- temp4 = vec_add(pixelssum3, pixelssum4);
- temp4 = vec_sra(temp4, vctwo);
- temp3 = vec_add(pixelssum1, pixelssum2);
- temp3 = vec_sra(temp3, vctwo);
-
- pixelssum3 = vec_add(pixelssum4, vcone);
- pixelssum1 = vec_add(pixelssum2, vcone);
-
- blockv = vec_packsu(temp3, temp4);
-
- vec_st(blockv, 0, block);
-
- block += line_size;
- pixels += line_size;
- }
-}
-
 static int hadamard8_diff8x8_altivec(/*MpegEncContext*/ void *s, uint8_t *dst, uint8_t *src, int stride, int h){
 int sum;
 register const vector unsigned char vzero =
@@ -1283,93 +936,7 @@
 return score;
 }
 
-static void vorbis_inverse_coupling_altivec(float *mag, float *ang,
- int blocksize)
-{
- int i;
- vector float m, a;
- vector bool int t0, t1;
- const vector unsigned int v_31 = //XXX
- vec_add(vec_add(vec_splat_u32(15),vec_splat_u32(15)),vec_splat_u32(1));
- for (i = 0; i < blocksize; i += 4) {
- m = vec_ld(0, mag+i);
- a = vec_ld(0, ang+i);
- t0 = vec_cmple(m, (vector float)vec_splat_u32(0));
- t1 = vec_cmple(a, (vector float)vec_splat_u32(0));
- a = vec_xor(a, (vector float) vec_sl((vector unsigned int)t0, v_31));
- t0 = (vector bool int)vec_and(a, t1);
- t1 = (vector bool int)vec_andc(a, t1);
- a = vec_sub(m, (vector float)t1);
- m = vec_add(m, (vector float)t0);
- vec_stl(a, 0, ang+i);
- vec_stl(m, 0, mag+i);
- }
-}
-
-/* next one assumes that ((line_size % 8) == 0) */
-static void avg_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- register int i;
- register vector unsigned char pixelsv1, pixelsv2, pixelsavg;
- register vector unsigned char blockv, temp1, temp2, blocktemp;
- register vector unsigned short pixelssum1, pixelssum2, temp3;
-
- register const vector unsigned char vczero = (const vector unsigned char)
- vec_splat_u8(0);
- register const vector unsigned short vctwo = (const vector unsigned short)
- vec_splat_u16(2);
-
- temp1 = vec_ld(0, pixels);
- temp2 = vec_ld(16, pixels);
- pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(0, pixels));
- if ((((unsigned long)pixels) & 0x0000000F) == 0x0000000F) {
- pixelsv2 = temp2;
- } else {
- pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(1, pixels));
- }
- pixelsv1 = vec_mergeh(vczero, pixelsv1);
- pixelsv2 = vec_mergeh(vczero, pixelsv2);
- pixelssum1 = vec_add((vector unsigned short)pixelsv1,
- (vector unsigned short)pixelsv2);
- pixelssum1 = vec_add(pixelssum1, vctwo);
-
- for (i = 0; i < h ; i++) {
- int rightside = ((unsigned long)block & 0x0000000F);
- blockv = vec_ld(0, block);
-
- temp1 = vec_ld(line_size, pixels);
- temp2 = vec_ld(line_size + 16, pixels);
- pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(line_size, pixels));
- if (((((unsigned long)pixels) + line_size) & 0x0000000F) == 0x0000000F) {
- pixelsv2 = temp2;
- } else {
- pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(line_size + 1, pixels));
- }
-
- pixelsv1 = vec_mergeh(vczero, pixelsv1);
- pixelsv2 = vec_mergeh(vczero, pixelsv2);
- pixelssum2 = vec_add((vector unsigned short)pixelsv1,
- (vector unsigned short)pixelsv2);
- temp3 = vec_add(pixelssum1, pixelssum2);
- temp3 = vec_sra(temp3, vctwo);
- pixelssum1 = vec_add(pixelssum2, vctwo);
- pixelsavg = vec_packsu(temp3, (vector unsigned short) vczero);
-
- if (rightside) {
- blocktemp = vec_perm(blockv, pixelsavg, vcprm(0, 1, s0, s1));
- } else {
- blocktemp = vec_perm(blockv, pixelsavg, vcprm(s0, s1, 2, 3));
- }
-
- blockv = vec_avg(blocktemp, blockv);
- vec_st(blockv, 0, block);
-
- block += line_size;
- pixels += line_size;
- }
-}
-
-void ff_dsputil_init_altivec(DSPContext* c, AVCodecContext *avctx)
+av_cold void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx)
 {
 const int high_bit_depth = avctx->bits_per_raw_sample > 8;
 
@@ -1389,20 +956,8 @@
 if (!high_bit_depth) {
 c->get_pixels = get_pixels_altivec;
 c->clear_block = clear_block_altivec;
- c->put_pixels_tab[0][0] = ff_put_pixels16_altivec;
- /* the two functions do the same thing, so use the same code */
- c->put_no_rnd_pixels_tab[0][0] = ff_put_pixels16_altivec;
- c->avg_pixels_tab[0][0] = ff_avg_pixels16_altivec;
- c->avg_pixels_tab[1][0] = avg_pixels8_altivec;
- c->avg_pixels_tab[1][3] = avg_pixels8_xy2_altivec;
- c->put_pixels_tab[1][3] = put_pixels8_xy2_altivec;
- c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_altivec;
- c->put_pixels_tab[0][3] = put_pixels16_xy2_altivec;
- c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_altivec;
 }
 
 c->hadamard8_diff[0] = hadamard8_diff16_altivec;
 c->hadamard8_diff[1] = hadamard8_diff8x8_altivec;
- if (CONFIG_VORBIS_DECODER)
- c->vorbis_inverse_coupling = vorbis_inverse_coupling_altivec;
 }

libav-v9.6.tar.bz2/libavcodec/ppc/dsputil_altivec.h -> libav-v10.1.tar.bz2/libavcodec/ppc/dsputil_altivec.h Changed

@@ -26,9 +26,9 @@
 #include <stdint.h>
 #include "libavcodec/dsputil.h"
 
-void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h);
+void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h);
 
-void ff_avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h);
+void ff_avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h);
 
 void ff_fdct_altivec(int16_t *block);
 void ff_gmc1_altivec(uint8_t *dst, uint8_t *src, int stride, int h,
@@ -36,8 +36,6 @@
 void ff_idct_put_altivec(uint8_t *dest, int line_size, int16_t *block);
 void ff_idct_add_altivec(uint8_t *dest, int line_size, int16_t *block);
 
-void ff_dsputil_h264_init_ppc(DSPContext* c, AVCodecContext *avctx);
-
 void ff_dsputil_init_altivec(DSPContext* c, AVCodecContext *avctx);
 void ff_float_init_altivec(DSPContext* c, AVCodecContext *avctx);
 void ff_int_init_altivec(DSPContext* c, AVCodecContext *avctx);

libav-v9.6.tar.bz2/libavcodec/ppc/dsputil_ppc.c -> libav-v10.1.tar.bz2/libavcodec/ppc/dsputil_ppc.c Changed

@@ -22,9 +22,10 @@
 
 #include <string.h>
 
+#include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/mem.h"
-#include "libavcodec/dsputil.h"
+#include "libavutil/ppc/cpu.h"
 #include "dsputil_altivec.h"
 
 /* ***** WARNING ***** WARNING ***** WARNING ***** */
@@ -47,7 +48,7 @@
 see <http://developer.apple.com/technotes/tn/tn2087.html>
 and <http://developer.apple.com/technotes/tn/tn2086.html>
 */
-static void clear_blocks_dcbz32_ppc(DCTELEM *blocks)
+static void clear_blocks_dcbz32_ppc(int16_t *blocks)
 {
 register int misal = ((unsigned long)blocks & 0x00000010);
 register int i = 0;
@@ -58,7 +59,7 @@
 ((unsigned long*)blocks)[3] = 0L;
 i += 16;
 }
- for ( ; i < sizeof(DCTELEM)*6*64-31 ; i += 32) {
+ for ( ; i < sizeof(int16_t)*6*64-31 ; i += 32) {
 __asm__ volatile("dcbz %0,%1" : : "b" (blocks), "r" (i) : "memory");
 }
 if (misal) {
@@ -73,7 +74,7 @@
 /* same as above, when dcbzl clear a whole 128B cache line
 i.e. the PPC970 aka G5 */
 #if HAVE_DCBZL
-static void clear_blocks_dcbz128_ppc(DCTELEM *blocks)
+static void clear_blocks_dcbz128_ppc(int16_t *blocks)
 {
 register int misal = ((unsigned long)blocks & 0x0000007f);
 register int i = 0;
@@ -81,17 +82,17 @@
 // we could probably also optimize this case,
 // but there's not much point as the machines
 // aren't available yet (2003-06-26)
- memset(blocks, 0, sizeof(DCTELEM)*6*64);
+ memset(blocks, 0, sizeof(int16_t)*6*64);
 }
 else
- for ( ; i < sizeof(DCTELEM)*6*64 ; i += 128) {
+ for ( ; i < sizeof(int16_t)*6*64 ; i += 128) {
 __asm__ volatile("dcbzl %0,%1" : : "b" (blocks), "r" (i) : "memory");
 }
 }
 #else
-static void clear_blocks_dcbz128_ppc(DCTELEM *blocks)
+static void clear_blocks_dcbz128_ppc(int16_t *blocks)
 {
- memset(blocks, 0, sizeof(DCTELEM)*6*64);
+ memset(blocks, 0, sizeof(int16_t)*6*64);
 }
 #endif
 
@@ -137,7 +138,7 @@
 }
 #endif
 
-void ff_dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx)
+av_cold void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx)
 {
 const int high_bit_depth = avctx->bits_per_raw_sample > 8;
 
@@ -155,12 +156,8 @@
 }
 }
 
-#if HAVE_ALTIVEC
- if(CONFIG_H264_DECODER) ff_dsputil_h264_init_ppc(c, avctx);
-
- if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) {
+ if (PPC_ALTIVEC(av_get_cpu_flags())) {
 ff_dsputil_init_altivec(c, avctx);
- ff_float_init_altivec(c, avctx);
 ff_int_init_altivec(c, avctx);
 c->gmc1 = ff_gmc1_altivec;
 
@@ -182,5 +179,4 @@
 }
 
 }
-#endif /* HAVE_ALTIVEC */
 }

libav-v9.6.tar.bz2/libavcodec/ppc/fdct_altivec.c -> libav-v10.1.tar.bz2/libavcodec/ppc/fdct_altivec.c Changed

libav-v9.6.tar.bz2/libavcodec/ppc/fft_altivec.c -> libav-v10.1.tar.bz2/libavcodec/ppc/fft_altivec.c Changed

@@ -20,6 +20,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "config.h"
+#include "libavutil/cpu.h"
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
 #include "libavcodec/fft.h"
@@ -36,8 +38,8 @@
 void ff_fft_calc_altivec(FFTContext *s, FFTComplex *z);
 void ff_fft_calc_interleave_altivec(FFTContext *s, FFTComplex *z);
 
-#if HAVE_GNU_AS
-static void ff_imdct_half_altivec(FFTContext *s, FFTSample *output, const FFTSample *input)
+#if HAVE_GNU_AS && HAVE_ALTIVEC
+static void imdct_half_altivec(FFTContext *s, FFTSample *output, const FFTSample *input)
 {
 int j, k;
 int n = 1 << s->mdct_bits;
@@ -117,7 +119,7 @@
 } while(k >= 0);
 }
 
-static void ff_imdct_calc_altivec(FFTContext *s, FFTSample *output, const FFTSample *input)
+static void imdct_calc_altivec(FFTContext *s, FFTSample *output, const FFTSample *input)
 {
 int k;
 int n = 1 << s->mdct_bits;
@@ -127,7 +129,7 @@
 vec_u32 *p0 = (vec_u32*)(output+n4);
 vec_u32 *p1 = (vec_u32*)(output+n4*3);
 
- ff_imdct_half_altivec(s, output+n4, input);
+ imdct_half_altivec(s, output + n4, input);
 
 for (k = 0; k < n16; k++) {
 vec_u32 a = p0[k] ^ sign;
@@ -136,15 +138,18 @@
 p1[k] = vec_perm(b, b, vcprm(3,2,1,0));
 }
 }
-#endif /* HAVE_GNU_AS */
+#endif /* HAVE_GNU_AS && HAVE_ALTIVEC */
 
-av_cold void ff_fft_init_altivec(FFTContext *s)
+av_cold void ff_fft_init_ppc(FFTContext *s)
 {
-#if HAVE_GNU_AS
+#if HAVE_GNU_AS && HAVE_ALTIVEC
+ if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
+ return;
+
 s->fft_calc = ff_fft_calc_interleave_altivec;
 if (s->mdct_bits >= 5) {
- s->imdct_calc = ff_imdct_calc_altivec;
- s->imdct_half = ff_imdct_half_altivec;
+ s->imdct_calc = imdct_calc_altivec;
+ s->imdct_half = imdct_half_altivec;
 }
-#endif
+#endif /* HAVE_GNU_AS && HAVE_ALTIVEC */
 }

libav-v9.6.tar.bz2/libavcodec/ppc/fmtconvert_altivec.c -> libav-v10.1.tar.bz2/libavcodec/ppc/fmtconvert_altivec.c Changed

@@ -18,13 +18,17 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include "libavcodec/fmtconvert.h"
-
-#include "libavutil/ppc/util_altivec.h"
+#include "config.h"
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
 #include "libavutil/mem.h"
+#include "libavutil/ppc/util_altivec.h"
+#include "libavcodec/fmtconvert.h"
 #include "dsputil_altivec.h"
 
-static void int32_to_float_fmul_scalar_altivec(float *dst, const int *src,
+#if HAVE_ALTIVEC
+
+static void int32_to_float_fmul_scalar_altivec(float *dst, const int32_t *src,
 float mul, int len)
 {
 union {
@@ -92,8 +96,8 @@
 static void float_to_int16_stride_altivec(int16_t *dst, const float *src,
 long len, int stride)
 {
- int i, j;
- vector signed short d, s;
+ int i;
+ vector signed short d;
 
 for (i = 0; i < len - 7; i += 8) {
 d = float_to_int16_one_altivec(src + i);
@@ -155,11 +159,19 @@
 }
 }
 
-void ff_fmt_convert_init_altivec(FmtConvertContext *c, AVCodecContext *avctx)
+#endif /* HAVE_ALTIVEC */
+
+av_cold void ff_fmt_convert_init_ppc(FmtConvertContext *c,
+ AVCodecContext *avctx)
 {
+#if HAVE_ALTIVEC
+ if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
+ return;
+
 c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_altivec;
 if (!(avctx->flags & CODEC_FLAG_BITEXACT)) {
 c->float_to_int16 = float_to_int16_altivec;
 c->float_to_int16_interleave = float_to_int16_interleave_altivec;
 }
+#endif /* HAVE_ALTIVEC */
 }

libav-v9.6.tar.bz2/libavcodec/ppc/gmc_altivec.c -> libav-v10.1.tar.bz2/libavcodec/ppc/gmc_altivec.c Changed

libav-v10.1.tar.bz2/libavcodec/ppc/h264chroma_init.c Added

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2004 Romain Dolbeau <romain@dolbeau.org>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/ppc/types_altivec.h"
+#include "libavutil/ppc/util_altivec.h"
+#include "libavcodec/h264chroma.h"
+#include "dsputil_altivec.h"
+
+#if HAVE_ALTIVEC
+#define PUT_OP_U8_ALTIVEC(d, s, dst) d = s
+#define AVG_OP_U8_ALTIVEC(d, s, dst) d = vec_avg(dst, s)
+
+#define OP_U8_ALTIVEC PUT_OP_U8_ALTIVEC
+#define PREFIX_h264_chroma_mc8_altivec put_h264_chroma_mc8_altivec
+#define PREFIX_h264_chroma_mc8_num altivec_put_h264_chroma_mc8_num
+#include "h264chroma_template.c"
+#undef OP_U8_ALTIVEC
+#undef PREFIX_h264_chroma_mc8_altivec
+#undef PREFIX_h264_chroma_mc8_num
+
+#define OP_U8_ALTIVEC AVG_OP_U8_ALTIVEC
+#define PREFIX_h264_chroma_mc8_altivec avg_h264_chroma_mc8_altivec
+#define PREFIX_h264_chroma_mc8_num altivec_avg_h264_chroma_mc8_num
+#include "h264chroma_template.c"
+#undef OP_U8_ALTIVEC
+#undef PREFIX_h264_chroma_mc8_altivec
+#undef PREFIX_h264_chroma_mc8_num
+#endif /* HAVE_ALTIVEC */
+
+av_cold void ff_h264chroma_init_ppc(H264ChromaContext *c, int bit_depth)
+{
+#if HAVE_ALTIVEC
+ const int high_bit_depth = bit_depth > 8;
+
+ if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
+ return;
+
+ if (!high_bit_depth) {
+ c->put_h264_chroma_pixels_tab[0] = put_h264_chroma_mc8_altivec;
+ c->avg_h264_chroma_pixels_tab[0] = avg_h264_chroma_mc8_altivec;
+ }
+#endif /* HAVE_ALTIVEC */
+}

libav-v10.1.tar.bz2/libavcodec/ppc/h264chroma_template.c Added

@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2004 Romain Dolbeau <romain@dolbeau.org>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/mem.h"
+
+/* this code assume that stride % 16 == 0 */
+
+#define CHROMA_MC8_ALTIVEC_CORE(BIAS1, BIAS2) \
+ vsrc2ssH = (vec_s16)vec_mergeh(zero_u8v,(vec_u8)vsrc2uc);\
+ vsrc3ssH = (vec_s16)vec_mergeh(zero_u8v,(vec_u8)vsrc3uc);\
+\
+ psum = vec_mladd(vA, vsrc0ssH, BIAS1);\
+ psum = vec_mladd(vB, vsrc1ssH, psum);\
+ psum = vec_mladd(vC, vsrc2ssH, psum);\
+ psum = vec_mladd(vD, vsrc3ssH, psum);\
+ psum = BIAS2(psum);\
+ psum = vec_sr(psum, v6us);\
+\
+ vdst = vec_ld(0, dst);\
+ ppsum = (vec_u8)vec_pack(psum, psum);\
+ vfdst = vec_perm(vdst, ppsum, fperm);\
+\
+ OP_U8_ALTIVEC(fsum, vfdst, vdst);\
+\
+ vec_st(fsum, 0, dst);\
+\
+ vsrc0ssH = vsrc2ssH;\
+ vsrc1ssH = vsrc3ssH;\
+\
+ dst += stride;\
+ src += stride;
+
+#define CHROMA_MC8_ALTIVEC_CORE_SIMPLE \
+\
+ vsrc0ssH = (vec_s16)vec_mergeh(zero_u8v,(vec_u8)vsrc0uc);\
+ vsrc1ssH = (vec_s16)vec_mergeh(zero_u8v,(vec_u8)vsrc1uc);\
+\
+ psum = vec_mladd(vA, vsrc0ssH, v32ss);\
+ psum = vec_mladd(vE, vsrc1ssH, psum);\
+ psum = vec_sr(psum, v6us);\
+\
+ vdst = vec_ld(0, dst);\
+ ppsum = (vec_u8)vec_pack(psum, psum);\
+ vfdst = vec_perm(vdst, ppsum, fperm);\
+\
+ OP_U8_ALTIVEC(fsum, vfdst, vdst);\
+\
+ vec_st(fsum, 0, dst);\
+\
+ dst += stride;\
+ src += stride;
+
+#define noop(a) a
+#define add28(a) vec_add(v28ss, a)
+
+#ifdef PREFIX_h264_chroma_mc8_altivec
+static void PREFIX_h264_chroma_mc8_altivec(uint8_t * dst, uint8_t * src,
+ int stride, int h, int x, int y) {
+ DECLARE_ALIGNED(16, signed int, ABCD)[4] =
+ {((8 - x) * (8 - y)),
+ (( x) * (8 - y)),
+ ((8 - x) * ( y)),
+ (( x) * ( y))};
+ register int i;
+ vec_u8 fperm;
+ const vec_s32 vABCD = vec_ld(0, ABCD);
+ const vec_s16 vA = vec_splat((vec_s16)vABCD, 1);
+ const vec_s16 vB = vec_splat((vec_s16)vABCD, 3);
+ const vec_s16 vC = vec_splat((vec_s16)vABCD, 5);
+ const vec_s16 vD = vec_splat((vec_s16)vABCD, 7);
+ LOAD_ZERO;
+ const vec_s16 v32ss = vec_sl(vec_splat_s16(1),vec_splat_u16(5));
+ const vec_u16 v6us = vec_splat_u16(6);
+ register int loadSecond = (((unsigned long)src) % 16) <= 7 ? 0 : 1;
+ register int reallyBadAlign = (((unsigned long)src) % 16) == 15 ? 1 : 0;
+
+ vec_u8 vsrcAuc, av_uninit(vsrcBuc), vsrcperm0, vsrcperm1;
+ vec_u8 vsrc0uc, vsrc1uc;
+ vec_s16 vsrc0ssH, vsrc1ssH;
+ vec_u8 vsrcCuc, vsrc2uc, vsrc3uc;
+ vec_s16 vsrc2ssH, vsrc3ssH, psum;
+ vec_u8 vdst, ppsum, vfdst, fsum;
+
+ if (((unsigned long)dst) % 16 == 0) {
+ fperm = (vec_u8){0x10, 0x11, 0x12, 0x13,
+ 0x14, 0x15, 0x16, 0x17,
+ 0x08, 0x09, 0x0A, 0x0B,
+ 0x0C, 0x0D, 0x0E, 0x0F};
+ } else {
+ fperm = (vec_u8){0x00, 0x01, 0x02, 0x03,
+ 0x04, 0x05, 0x06, 0x07,
+ 0x18, 0x19, 0x1A, 0x1B,
+ 0x1C, 0x1D, 0x1E, 0x1F};
+ }
+
+ vsrcAuc = vec_ld(0, src);
+
+ if (loadSecond)
+ vsrcBuc = vec_ld(16, src);
+ vsrcperm0 = vec_lvsl(0, src);
+ vsrcperm1 = vec_lvsl(1, src);
+
+ vsrc0uc = vec_perm(vsrcAuc, vsrcBuc, vsrcperm0);
+ if (reallyBadAlign)
+ vsrc1uc = vsrcBuc;
+ else
+ vsrc1uc = vec_perm(vsrcAuc, vsrcBuc, vsrcperm1);
+
+ vsrc0ssH = (vec_s16)vec_mergeh(zero_u8v,(vec_u8)vsrc0uc);
+ vsrc1ssH = (vec_s16)vec_mergeh(zero_u8v,(vec_u8)vsrc1uc);
+
+ if (ABCD[3]) {
+ if (!loadSecond) {// -> !reallyBadAlign
+ for (i = 0 ; i < h ; i++) {
+ vsrcCuc = vec_ld(stride + 0, src);
+ vsrc2uc = vec_perm(vsrcCuc, vsrcCuc, vsrcperm0);
+ vsrc3uc = vec_perm(vsrcCuc, vsrcCuc, vsrcperm1);
+
+ CHROMA_MC8_ALTIVEC_CORE(v32ss, noop)
+ }
+ } else {
+ vec_u8 vsrcDuc;
+ for (i = 0 ; i < h ; i++) {
+ vsrcCuc = vec_ld(stride + 0, src);
+ vsrcDuc = vec_ld(stride + 16, src);
+ vsrc2uc = vec_perm(vsrcCuc, vsrcDuc, vsrcperm0);
+ if (reallyBadAlign)
+ vsrc3uc = vsrcDuc;
+ else
+ vsrc3uc = vec_perm(vsrcCuc, vsrcDuc, vsrcperm1);
+
+ CHROMA_MC8_ALTIVEC_CORE(v32ss, noop)
+ }
+ }
+ } else {
+ const vec_s16 vE = vec_add(vB, vC);
+ if (ABCD[2]) { // x == 0 B == 0
+ if (!loadSecond) {// -> !reallyBadAlign
+ for (i = 0 ; i < h ; i++) {
+ vsrcCuc = vec_ld(stride + 0, src);
+ vsrc1uc = vec_perm(vsrcCuc, vsrcCuc, vsrcperm0);
+ CHROMA_MC8_ALTIVEC_CORE_SIMPLE
+
+ vsrc0uc = vsrc1uc;
+ }
+ } else {
+ vec_u8 vsrcDuc;
+ for (i = 0 ; i < h ; i++) {
+ vsrcCuc = vec_ld(stride + 0, src);
+ vsrcDuc = vec_ld(stride + 15, src);
+ vsrc1uc = vec_perm(vsrcCuc, vsrcDuc, vsrcperm0);
+ CHROMA_MC8_ALTIVEC_CORE_SIMPLE
+
+ vsrc0uc = vsrc1uc;
+ }
+ }
+ } else { // y == 0 C == 0
+ if (!loadSecond) {// -> !reallyBadAlign
+ for (i = 0 ; i < h ; i++) {
+ vsrcCuc = vec_ld(0, src);
+ vsrc0uc = vec_perm(vsrcCuc, vsrcCuc, vsrcperm0);
+ vsrc1uc = vec_perm(vsrcCuc, vsrcCuc, vsrcperm1);
+
+ CHROMA_MC8_ALTIVEC_CORE_SIMPLE
+ }
+ } else {
+ vec_u8 vsrcDuc;
+ for (i = 0 ; i < h ; i++) {
+ vsrcCuc = vec_ld(0, src);
+ vsrcDuc = vec_ld(15, src);
+ vsrc0uc = vec_perm(vsrcCuc, vsrcDuc, vsrcperm0);
+ if (reallyBadAlign)
+ vsrc1uc = vsrcDuc;
+ else
+ vsrc1uc = vec_perm(vsrcCuc, vsrcDuc, vsrcperm1);
+
+ CHROMA_MC8_ALTIVEC_CORE_SIMPLE
+ }
+ }
+ }
+ }
+}
+#endif
+
+/* this code assume that stride % 16 == 0 */
+#ifdef PREFIX_no_rnd_vc1_chroma_mc8_altivec
+static void PREFIX_no_rnd_vc1_chroma_mc8_altivec(uint8_t * dst, uint8_t * src, int stride, int h, int x, int y) {
+ DECLARE_ALIGNED(16, signed int, ABCD)[4] =
+ {((8 - x) * (8 - y)),
+ (( x) * (8 - y)),
+ ((8 - x) * ( y)),
+ (( x) * ( y))};
+ register int i;
+ vec_u8 fperm;
+ const vec_s32 vABCD = vec_ld(0, ABCD);
+ const vec_s16 vA = vec_splat((vec_s16)vABCD, 1);
+ const vec_s16 vB = vec_splat((vec_s16)vABCD, 3);
+ const vec_s16 vC = vec_splat((vec_s16)vABCD, 5);
+ const vec_s16 vD = vec_splat((vec_s16)vABCD, 7);
+ LOAD_ZERO;
+ const vec_s16 v28ss = vec_sub(vec_sl(vec_splat_s16(1),vec_splat_u16(5)),vec_splat_s16(4));
+ const vec_u16 v6us = vec_splat_u16(6);
+ register int loadSecond = (((unsigned long)src) % 16) <= 7 ? 0 : 1;
+ register int reallyBadAlign = (((unsigned long)src) % 16) == 15 ? 1 : 0;
+
+ vec_u8 vsrcAuc, av_uninit(vsrcBuc), vsrcperm0, vsrcperm1;
+ vec_u8 vsrc0uc, vsrc1uc;
+ vec_s16 vsrc0ssH, vsrc1ssH;
+ vec_u8 vsrcCuc, vsrc2uc, vsrc3uc;
+ vec_s16 vsrc2ssH, vsrc3ssH, psum;
+ vec_u8 vdst, ppsum, vfdst, fsum;
+
+ if (((unsigned long)dst) % 16 == 0) {
+ fperm = (vec_u8){0x10, 0x11, 0x12, 0x13,
+ 0x14, 0x15, 0x16, 0x17,
+ 0x08, 0x09, 0x0A, 0x0B,
+ 0x0C, 0x0D, 0x0E, 0x0F};
+ } else {
+ fperm = (vec_u8){0x00, 0x01, 0x02, 0x03,
+ 0x04, 0x05, 0x06, 0x07,
+ 0x18, 0x19, 0x1A, 0x1B,
+ 0x1C, 0x1D, 0x1E, 0x1F};
+ }
+
+ vsrcAuc = vec_ld(0, src);
+
+ if (loadSecond)
+ vsrcBuc = vec_ld(16, src);
+ vsrcperm0 = vec_lvsl(0, src);
+ vsrcperm1 = vec_lvsl(1, src);
+
+ vsrc0uc = vec_perm(vsrcAuc, vsrcBuc, vsrcperm0);
+ if (reallyBadAlign)
+ vsrc1uc = vsrcBuc;
+ else
+ vsrc1uc = vec_perm(vsrcAuc, vsrcBuc, vsrcperm1);
+
+ vsrc0ssH = (vec_s16)vec_mergeh(zero_u8v, (vec_u8)vsrc0uc);
+ vsrc1ssH = (vec_s16)vec_mergeh(zero_u8v, (vec_u8)vsrc1uc);
+
+ if (!loadSecond) {// -> !reallyBadAlign
+ for (i = 0 ; i < h ; i++) {
+
+
+ vsrcCuc = vec_ld(stride + 0, src);
+
+ vsrc2uc = vec_perm(vsrcCuc, vsrcCuc, vsrcperm0);
+ vsrc3uc = vec_perm(vsrcCuc, vsrcCuc, vsrcperm1);
+
+ CHROMA_MC8_ALTIVEC_CORE(vec_splat_s16(0), add28)
+ }
+ } else {
+ vec_u8 vsrcDuc;
+ for (i = 0 ; i < h ; i++) {
+ vsrcCuc = vec_ld(stride + 0, src);
+ vsrcDuc = vec_ld(stride + 16, src);
+
+ vsrc2uc = vec_perm(vsrcCuc, vsrcDuc, vsrcperm0);
+ if (reallyBadAlign)
+ vsrc3uc = vsrcDuc;
+ else
+ vsrc3uc = vec_perm(vsrcCuc, vsrcDuc, vsrcperm1);
+
+ CHROMA_MC8_ALTIVEC_CORE(vec_splat_s16(0), add28)
+ }
+ }
+}
+#endif
+
+#undef noop
+#undef add28
+#undef CHROMA_MC8_ALTIVEC_CORE

libav-v10.1.tar.bz2/libavcodec/ppc/h264dsp.c Added

@@ -0,0 +1,770 @@
+/*
+ * Copyright (c) 2004 Romain Dolbeau <romain@dolbeau.org>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/ppc/types_altivec.h"
+#include "libavutil/ppc/util_altivec.h"
+#include "libavcodec/h264data.h"
+#include "libavcodec/h264dsp.h"
+
+#if HAVE_ALTIVEC
+
+/****************************************************************************
+ * IDCT transform:
+ ****************************************************************************/
+
+#define VEC_1D_DCT(vb0,vb1,vb2,vb3,va0,va1,va2,va3) \
+ /* 1st stage */ \
+ vz0 = vec_add(vb0,vb2); /* temp[0] = Y[0] + Y[2] */ \
+ vz1 = vec_sub(vb0,vb2); /* temp[1] = Y[0] - Y[2] */ \
+ vz2 = vec_sra(vb1,vec_splat_u16(1)); \
+ vz2 = vec_sub(vz2,vb3); /* temp[2] = Y[1].1/2 - Y[3] */ \
+ vz3 = vec_sra(vb3,vec_splat_u16(1)); \
+ vz3 = vec_add(vb1,vz3); /* temp[3] = Y[1] + Y[3].1/2 */ \
+ /* 2nd stage: output */ \
+ va0 = vec_add(vz0,vz3); /* x[0] = temp[0] + temp[3] */ \
+ va1 = vec_add(vz1,vz2); /* x[1] = temp[1] + temp[2] */ \
+ va2 = vec_sub(vz1,vz2); /* x[2] = temp[1] - temp[2] */ \
+ va3 = vec_sub(vz0,vz3) /* x[3] = temp[0] - temp[3] */
+
+#define VEC_TRANSPOSE_4(a0,a1,a2,a3,b0,b1,b2,b3) \
+ b0 = vec_mergeh( a0, a0 ); \
+ b1 = vec_mergeh( a1, a0 ); \
+ b2 = vec_mergeh( a2, a0 ); \
+ b3 = vec_mergeh( a3, a0 ); \
+ a0 = vec_mergeh( b0, b2 ); \
+ a1 = vec_mergel( b0, b2 ); \
+ a2 = vec_mergeh( b1, b3 ); \
+ a3 = vec_mergel( b1, b3 ); \
+ b0 = vec_mergeh( a0, a2 ); \
+ b1 = vec_mergel( a0, a2 ); \
+ b2 = vec_mergeh( a1, a3 ); \
+ b3 = vec_mergel( a1, a3 )
+
+#define VEC_LOAD_U8_ADD_S16_STORE_U8(va) \
+ vdst_orig = vec_ld(0, dst); \
+ vdst = vec_perm(vdst_orig, zero_u8v, vdst_mask); \
+ vdst_ss = (vec_s16) vec_mergeh(zero_u8v, vdst); \
+ va = vec_add(va, vdst_ss); \
+ va_u8 = vec_packsu(va, zero_s16v); \
+ va_u32 = vec_splat((vec_u32)va_u8, 0); \
+ vec_ste(va_u32, element, (uint32_t*)dst);
+
+static void h264_idct_add_altivec(uint8_t *dst, int16_t *block, int stride)
+{
+ vec_s16 va0, va1, va2, va3;
+ vec_s16 vz0, vz1, vz2, vz3;
+ vec_s16 vtmp0, vtmp1, vtmp2, vtmp3;
+ vec_u8 va_u8;
+ vec_u32 va_u32;
+ vec_s16 vdst_ss;
+ const vec_u16 v6us = vec_splat_u16(6);
+ vec_u8 vdst, vdst_orig;
+ vec_u8 vdst_mask = vec_lvsl(0, dst);
+ int element = ((unsigned long)dst & 0xf) >> 2;
+ LOAD_ZERO;
+
+ block[0] += 32; /* add 32 as a DC-level for rounding */
+
+ vtmp0 = vec_ld(0,block);
+ vtmp1 = vec_sld(vtmp0, vtmp0, 8);
+ vtmp2 = vec_ld(16,block);
+ vtmp3 = vec_sld(vtmp2, vtmp2, 8);
+ memset(block, 0, 16 * sizeof(int16_t));
+
+ VEC_1D_DCT(vtmp0,vtmp1,vtmp2,vtmp3,va0,va1,va2,va3);
+ VEC_TRANSPOSE_4(va0,va1,va2,va3,vtmp0,vtmp1,vtmp2,vtmp3);
+ VEC_1D_DCT(vtmp0,vtmp1,vtmp2,vtmp3,va0,va1,va2,va3);
+
+ va0 = vec_sra(va0,v6us);
+ va1 = vec_sra(va1,v6us);
+ va2 = vec_sra(va2,v6us);
+ va3 = vec_sra(va3,v6us);
+
+ VEC_LOAD_U8_ADD_S16_STORE_U8(va0);
+ dst += stride;
+ VEC_LOAD_U8_ADD_S16_STORE_U8(va1);
+ dst += stride;
+ VEC_LOAD_U8_ADD_S16_STORE_U8(va2);
+ dst += stride;
+ VEC_LOAD_U8_ADD_S16_STORE_U8(va3);
+}
+
+#define IDCT8_1D_ALTIVEC(s0, s1, s2, s3, s4, s5, s6, s7, d0, d1, d2, d3, d4, d5, d6, d7) {\
+ /* a0 = SRC(0) + SRC(4); */ \
+ vec_s16 a0v = vec_add(s0, s4); \
+ /* a2 = SRC(0) - SRC(4); */ \
+ vec_s16 a2v = vec_sub(s0, s4); \
+ /* a4 = (SRC(2)>>1) - SRC(6); */ \
+ vec_s16 a4v = vec_sub(vec_sra(s2, onev), s6); \
+ /* a6 = (SRC(6)>>1) + SRC(2); */ \
+ vec_s16 a6v = vec_add(vec_sra(s6, onev), s2); \
+ /* b0 = a0 + a6; */ \
+ vec_s16 b0v = vec_add(a0v, a6v); \
+ /* b2 = a2 + a4; */ \
+ vec_s16 b2v = vec_add(a2v, a4v); \
+ /* b4 = a2 - a4; */ \
+ vec_s16 b4v = vec_sub(a2v, a4v); \
+ /* b6 = a0 - a6; */ \
+ vec_s16 b6v = vec_sub(a0v, a6v); \
+ /* a1 = SRC(5) - SRC(3) - SRC(7) - (SRC(7)>>1); */ \
+ /* a1 = (SRC(5)-SRC(3)) - (SRC(7) + (SRC(7)>>1)); */ \
+ vec_s16 a1v = vec_sub( vec_sub(s5, s3), vec_add(s7, vec_sra(s7, onev)) ); \
+ /* a3 = SRC(7) + SRC(1) - SRC(3) - (SRC(3)>>1); */ \
+ /* a3 = (SRC(7)+SRC(1)) - (SRC(3) + (SRC(3)>>1)); */ \
+ vec_s16 a3v = vec_sub( vec_add(s7, s1), vec_add(s3, vec_sra(s3, onev)) );\
+ /* a5 = SRC(7) - SRC(1) + SRC(5) + (SRC(5)>>1); */ \
+ /* a5 = (SRC(7)-SRC(1)) + SRC(5) + (SRC(5)>>1); */ \
+ vec_s16 a5v = vec_add( vec_sub(s7, s1), vec_add(s5, vec_sra(s5, onev)) );\
+ /* a7 = SRC(5)+SRC(3) + SRC(1) + (SRC(1)>>1); */ \
+ vec_s16 a7v = vec_add( vec_add(s5, s3), vec_add(s1, vec_sra(s1, onev)) );\
+ /* b1 = (a7>>2) + a1; */ \
+ vec_s16 b1v = vec_add( vec_sra(a7v, twov), a1v); \
+ /* b3 = a3 + (a5>>2); */ \
+ vec_s16 b3v = vec_add(a3v, vec_sra(a5v, twov)); \
+ /* b5 = (a3>>2) - a5; */ \
+ vec_s16 b5v = vec_sub( vec_sra(a3v, twov), a5v); \
+ /* b7 = a7 - (a1>>2); */ \
+ vec_s16 b7v = vec_sub( a7v, vec_sra(a1v, twov)); \
+ /* DST(0, b0 + b7); */ \
+ d0 = vec_add(b0v, b7v); \
+ /* DST(1, b2 + b5); */ \
+ d1 = vec_add(b2v, b5v); \
+ /* DST(2, b4 + b3); */ \
+ d2 = vec_add(b4v, b3v); \
+ /* DST(3, b6 + b1); */ \
+ d3 = vec_add(b6v, b1v); \
+ /* DST(4, b6 - b1); */ \
+ d4 = vec_sub(b6v, b1v); \
+ /* DST(5, b4 - b3); */ \
+ d5 = vec_sub(b4v, b3v); \
+ /* DST(6, b2 - b5); */ \
+ d6 = vec_sub(b2v, b5v); \
+ /* DST(7, b0 - b7); */ \
+ d7 = vec_sub(b0v, b7v); \
+}
+
+#define ALTIVEC_STORE_SUM_CLIP(dest, idctv, perm_ldv, perm_stv, sel) { \
+ /* unaligned load */ \
+ vec_u8 hv = vec_ld( 0, dest ); \
+ vec_u8 lv = vec_ld( 7, dest ); \
+ vec_u8 dstv = vec_perm( hv, lv, (vec_u8)perm_ldv ); \
+ vec_s16 idct_sh6 = vec_sra(idctv, sixv); \
+ vec_u16 dst16 = (vec_u16)vec_mergeh(zero_u8v, dstv); \
+ vec_s16 idstsum = vec_adds(idct_sh6, (vec_s16)dst16); \
+ vec_u8 idstsum8 = vec_packsu(zero_s16v, idstsum); \
+ vec_u8 edgehv; \
+ /* unaligned store */ \
+ vec_u8 bodyv = vec_perm( idstsum8, idstsum8, perm_stv );\
+ vec_u8 edgelv = vec_perm( sel, zero_u8v, perm_stv ); \
+ lv = vec_sel( lv, bodyv, edgelv ); \
+ vec_st( lv, 7, dest ); \
+ hv = vec_ld( 0, dest ); \
+ edgehv = vec_perm( zero_u8v, sel, perm_stv ); \
+ hv = vec_sel( hv, bodyv, edgehv ); \
+ vec_st( hv, 0, dest ); \
+ }
+
+static void h264_idct8_add_altivec(uint8_t *dst, int16_t *dct, int stride)
+{
+ vec_s16 s0, s1, s2, s3, s4, s5, s6, s7;
+ vec_s16 d0, d1, d2, d3, d4, d5, d6, d7;
+ vec_s16 idct0, idct1, idct2, idct3, idct4, idct5, idct6, idct7;
+
+ vec_u8 perm_ldv = vec_lvsl(0, dst);
+ vec_u8 perm_stv = vec_lvsr(8, dst);
+
+ const vec_u16 onev = vec_splat_u16(1);
+ const vec_u16 twov = vec_splat_u16(2);
+ const vec_u16 sixv = vec_splat_u16(6);
+
+ const vec_u8 sel = (vec_u8) {0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1};
+ LOAD_ZERO;
+
+ dct[0] += 32; // rounding for the >>6 at the end
+
+ s0 = vec_ld(0x00, (int16_t*)dct);
+ s1 = vec_ld(0x10, (int16_t*)dct);
+ s2 = vec_ld(0x20, (int16_t*)dct);
+ s3 = vec_ld(0x30, (int16_t*)dct);
+ s4 = vec_ld(0x40, (int16_t*)dct);
+ s5 = vec_ld(0x50, (int16_t*)dct);
+ s6 = vec_ld(0x60, (int16_t*)dct);
+ s7 = vec_ld(0x70, (int16_t*)dct);
+ memset(dct, 0, 64 * sizeof(int16_t));
+
+ IDCT8_1D_ALTIVEC(s0, s1, s2, s3, s4, s5, s6, s7,
+ d0, d1, d2, d3, d4, d5, d6, d7);
+
+ TRANSPOSE8( d0, d1, d2, d3, d4, d5, d6, d7 );
+
+ IDCT8_1D_ALTIVEC(d0, d1, d2, d3, d4, d5, d6, d7,
+ idct0, idct1, idct2, idct3, idct4, idct5, idct6, idct7);
+
+ ALTIVEC_STORE_SUM_CLIP(&dst[0*stride], idct0, perm_ldv, perm_stv, sel);
+ ALTIVEC_STORE_SUM_CLIP(&dst[1*stride], idct1, perm_ldv, perm_stv, sel);
+ ALTIVEC_STORE_SUM_CLIP(&dst[2*stride], idct2, perm_ldv, perm_stv, sel);
+ ALTIVEC_STORE_SUM_CLIP(&dst[3*stride], idct3, perm_ldv, perm_stv, sel);
+ ALTIVEC_STORE_SUM_CLIP(&dst[4*stride], idct4, perm_ldv, perm_stv, sel);
+ ALTIVEC_STORE_SUM_CLIP(&dst[5*stride], idct5, perm_ldv, perm_stv, sel);
+ ALTIVEC_STORE_SUM_CLIP(&dst[6*stride], idct6, perm_ldv, perm_stv, sel);
+ ALTIVEC_STORE_SUM_CLIP(&dst[7*stride], idct7, perm_ldv, perm_stv, sel);
+}
+
+static av_always_inline void h264_idct_dc_add_internal(uint8_t *dst, int16_t *block, int stride, int size)
+{
+ vec_s16 dc16;
+ vec_u8 dcplus, dcminus, v0, v1, v2, v3, aligner;
+ LOAD_ZERO;
+ DECLARE_ALIGNED(16, int, dc);
+ int i;
+
+ dc = (block[0] + 32) >> 6;
+ block[0] = 0;
+ dc16 = vec_splat((vec_s16) vec_lde(0, &dc), 1);
+
+ if (size == 4)
+ dc16 = vec_sld(dc16, zero_s16v, 8);
+ dcplus = vec_packsu(dc16, zero_s16v);
+ dcminus = vec_packsu(vec_sub(zero_s16v, dc16), zero_s16v);
+
+ aligner = vec_lvsr(0, dst);
+ dcplus = vec_perm(dcplus, dcplus, aligner);
+ dcminus = vec_perm(dcminus, dcminus, aligner);
+
+ for (i = 0; i < size; i += 4) {
+ v0 = vec_ld(0, dst+0*stride);
+ v1 = vec_ld(0, dst+1*stride);
+ v2 = vec_ld(0, dst+2*stride);
+ v3 = vec_ld(0, dst+3*stride);
+
+ v0 = vec_adds(v0, dcplus);
+ v1 = vec_adds(v1, dcplus);
+ v2 = vec_adds(v2, dcplus);
+ v3 = vec_adds(v3, dcplus);
+
+ v0 = vec_subs(v0, dcminus);
+ v1 = vec_subs(v1, dcminus);
+ v2 = vec_subs(v2, dcminus);
+ v3 = vec_subs(v3, dcminus);
+
+ vec_st(v0, 0, dst+0*stride);
+ vec_st(v1, 0, dst+1*stride);
+ vec_st(v2, 0, dst+2*stride);
+ vec_st(v3, 0, dst+3*stride);
+
+ dst += 4*stride;
+ }
+}
+
+static void h264_idct_dc_add_altivec(uint8_t *dst, int16_t *block, int stride)
+{
+ h264_idct_dc_add_internal(dst, block, stride, 4);
+}
+
+static void h264_idct8_dc_add_altivec(uint8_t *dst, int16_t *block, int stride)
+{
+ h264_idct_dc_add_internal(dst, block, stride, 8);
+}
+
+static void h264_idct_add16_altivec(uint8_t *dst, const int *block_offset,
+ int16_t *block, int stride,
+ const uint8_t nnzc[15 * 8])
+{
+ int i;
+ for(i=0; i<16; i++){
+ int nnz = nnzc[ scan8[i] ];
+ if(nnz){
+ if(nnz==1 && block[i*16]) h264_idct_dc_add_altivec(dst + block_offset[i], block + i*16, stride);
+ else h264_idct_add_altivec(dst + block_offset[i], block + i*16, stride);
+ }
+ }
+}
+
+static void h264_idct_add16intra_altivec(uint8_t *dst, const int *block_offset,
+ int16_t *block, int stride,
+ const uint8_t nnzc[15 * 8])
+{
+ int i;
+ for(i=0; i<16; i++){
+ if(nnzc[ scan8[i] ]) h264_idct_add_altivec(dst + block_offset[i], block + i*16, stride);
+ else if(block[i*16]) h264_idct_dc_add_altivec(dst + block_offset[i], block + i*16, stride);
+ }
+}
+
+static void h264_idct8_add4_altivec(uint8_t *dst, const int *block_offset,
+ int16_t *block, int stride,
+ const uint8_t nnzc[15 * 8])
+{
+ int i;
+ for(i=0; i<16; i+=4){
+ int nnz = nnzc[ scan8[i] ];
+ if(nnz){
+ if(nnz==1 && block[i*16]) h264_idct8_dc_add_altivec(dst + block_offset[i], block + i*16, stride);
+ else h264_idct8_add_altivec(dst + block_offset[i], block + i*16, stride);
+ }
+ }
+}
+
+static void h264_idct_add8_altivec(uint8_t **dest, const int *block_offset,
+ int16_t *block, int stride,
+ const uint8_t nnzc[15 * 8])
+{
+ int i, j;
+ for (j = 1; j < 3; j++) {
+ for(i = j * 16; i < j * 16 + 4; i++){
+ if(nnzc[ scan8[i] ])
+ h264_idct_add_altivec(dest[j-1] + block_offset[i], block + i*16, stride);
+ else if(block[i*16])
+ h264_idct_dc_add_altivec(dest[j-1] + block_offset[i], block + i*16, stride);
+ }
+ }
+}
+
+#define transpose4x16(r0, r1, r2, r3) { \
+ register vec_u8 r4; \
+ register vec_u8 r5; \
+ register vec_u8 r6; \
+ register vec_u8 r7; \
+ \
+ r4 = vec_mergeh(r0, r2); /*0, 2 set 0*/ \
+ r5 = vec_mergel(r0, r2); /*0, 2 set 1*/ \
+ r6 = vec_mergeh(r1, r3); /*1, 3 set 0*/ \
+ r7 = vec_mergel(r1, r3); /*1, 3 set 1*/ \
+ \
+ r0 = vec_mergeh(r4, r6); /*all set 0*/ \
+ r1 = vec_mergel(r4, r6); /*all set 1*/ \
+ r2 = vec_mergeh(r5, r7); /*all set 2*/ \
+ r3 = vec_mergel(r5, r7); /*all set 3*/ \
+}
+
+static inline void write16x4(uint8_t *dst, int dst_stride,
+ register vec_u8 r0, register vec_u8 r1,
+ register vec_u8 r2, register vec_u8 r3) {
+ DECLARE_ALIGNED(16, unsigned char, result)[64];
+ uint32_t *src_int = (uint32_t *)result, *dst_int = (uint32_t *)dst;
+ int int_dst_stride = dst_stride/4;
+
+ vec_st(r0, 0, result);
+ vec_st(r1, 16, result);
+ vec_st(r2, 32, result);
+ vec_st(r3, 48, result);
+ /* FIXME: there has to be a better way!!!! */
+ *dst_int = *src_int;
+ *(dst_int+ int_dst_stride) = *(src_int + 1);
+ *(dst_int+ 2*int_dst_stride) = *(src_int + 2);
+ *(dst_int+ 3*int_dst_stride) = *(src_int + 3);
+ *(dst_int+ 4*int_dst_stride) = *(src_int + 4);
+ *(dst_int+ 5*int_dst_stride) = *(src_int + 5);
+ *(dst_int+ 6*int_dst_stride) = *(src_int + 6);
+ *(dst_int+ 7*int_dst_stride) = *(src_int + 7);
+ *(dst_int+ 8*int_dst_stride) = *(src_int + 8);
+ *(dst_int+ 9*int_dst_stride) = *(src_int + 9);
+ *(dst_int+10*int_dst_stride) = *(src_int + 10);
+ *(dst_int+11*int_dst_stride) = *(src_int + 11);
+ *(dst_int+12*int_dst_stride) = *(src_int + 12);
+ *(dst_int+13*int_dst_stride) = *(src_int + 13);
+ *(dst_int+14*int_dst_stride) = *(src_int + 14);
+ *(dst_int+15*int_dst_stride) = *(src_int + 15);
+}
+
+/** @brief performs a 6x16 transpose of data in src, and stores it to dst
+ @todo FIXME: see if we can't spare some vec_lvsl() by them factorizing
+ out of unaligned_load() */
+#define readAndTranspose16x6(src, src_stride, r8, r9, r10, r11, r12, r13) {\
+ register vec_u8 r0 = unaligned_load(0, src); \
+ register vec_u8 r1 = unaligned_load( src_stride, src); \
+ register vec_u8 r2 = unaligned_load(2* src_stride, src); \
+ register vec_u8 r3 = unaligned_load(3* src_stride, src); \
+ register vec_u8 r4 = unaligned_load(4* src_stride, src); \
+ register vec_u8 r5 = unaligned_load(5* src_stride, src); \
+ register vec_u8 r6 = unaligned_load(6* src_stride, src); \
+ register vec_u8 r7 = unaligned_load(7* src_stride, src); \
+ register vec_u8 r14 = unaligned_load(14*src_stride, src); \
+ register vec_u8 r15 = unaligned_load(15*src_stride, src); \
+ \
+ r8 = unaligned_load( 8*src_stride, src); \
+ r9 = unaligned_load( 9*src_stride, src); \
+ r10 = unaligned_load(10*src_stride, src); \
+ r11 = unaligned_load(11*src_stride, src); \
+ r12 = unaligned_load(12*src_stride, src); \
+ r13 = unaligned_load(13*src_stride, src); \
+ \
+ /*Merge first pairs*/ \
+ r0 = vec_mergeh(r0, r8); /*0, 8*/ \
+ r1 = vec_mergeh(r1, r9); /*1, 9*/ \
+ r2 = vec_mergeh(r2, r10); /*2,10*/ \
+ r3 = vec_mergeh(r3, r11); /*3,11*/ \
+ r4 = vec_mergeh(r4, r12); /*4,12*/ \
+ r5 = vec_mergeh(r5, r13); /*5,13*/ \
+ r6 = vec_mergeh(r6, r14); /*6,14*/ \
+ r7 = vec_mergeh(r7, r15); /*7,15*/ \
+ \
+ /*Merge second pairs*/ \
+ r8 = vec_mergeh(r0, r4); /*0,4, 8,12 set 0*/ \
+ r9 = vec_mergel(r0, r4); /*0,4, 8,12 set 1*/ \
+ r10 = vec_mergeh(r1, r5); /*1,5, 9,13 set 0*/ \
+ r11 = vec_mergel(r1, r5); /*1,5, 9,13 set 1*/ \
+ r12 = vec_mergeh(r2, r6); /*2,6,10,14 set 0*/ \
+ r13 = vec_mergel(r2, r6); /*2,6,10,14 set 1*/ \
+ r14 = vec_mergeh(r3, r7); /*3,7,11,15 set 0*/ \
+ r15 = vec_mergel(r3, r7); /*3,7,11,15 set 1*/ \
+ \
+ /*Third merge*/ \
+ r0 = vec_mergeh(r8, r12); /*0,2,4,6,8,10,12,14 set 0*/ \
+ r1 = vec_mergel(r8, r12); /*0,2,4,6,8,10,12,14 set 1*/ \
+ r2 = vec_mergeh(r9, r13); /*0,2,4,6,8,10,12,14 set 2*/ \
+ r4 = vec_mergeh(r10, r14); /*1,3,5,7,9,11,13,15 set 0*/ \
+ r5 = vec_mergel(r10, r14); /*1,3,5,7,9,11,13,15 set 1*/ \
+ r6 = vec_mergeh(r11, r15); /*1,3,5,7,9,11,13,15 set 2*/ \
+ /* Don't need to compute 3 and 7*/ \
+ \
+ /*Final merge*/ \
+ r8 = vec_mergeh(r0, r4); /*all set 0*/ \
+ r9 = vec_mergel(r0, r4); /*all set 1*/ \
+ r10 = vec_mergeh(r1, r5); /*all set 2*/ \
+ r11 = vec_mergel(r1, r5); /*all set 3*/ \
+ r12 = vec_mergeh(r2, r6); /*all set 4*/ \
+ r13 = vec_mergel(r2, r6); /*all set 5*/ \
+ /* Don't need to compute 14 and 15*/ \
+ \
+}
+
+// out: o = |x-y| < a
+static inline vec_u8 diff_lt_altivec ( register vec_u8 x,
+ register vec_u8 y,
+ register vec_u8 a) {
+
+ register vec_u8 diff = vec_subs(x, y);
+ register vec_u8 diffneg = vec_subs(y, x);
+ register vec_u8 o = vec_or(diff, diffneg); /* |x-y| */
+ o = (vec_u8)vec_cmplt(o, a);
+ return o;
+}
+
+static inline vec_u8 h264_deblock_mask ( register vec_u8 p0,
+ register vec_u8 p1,
+ register vec_u8 q0,
+ register vec_u8 q1,
+ register vec_u8 alpha,
+ register vec_u8 beta) {
+
+ register vec_u8 mask;
+ register vec_u8 tempmask;
+
+ mask = diff_lt_altivec(p0, q0, alpha);
+ tempmask = diff_lt_altivec(p1, p0, beta);
+ mask = vec_and(mask, tempmask);
+ tempmask = diff_lt_altivec(q1, q0, beta);
+ mask = vec_and(mask, tempmask);
+
+ return mask;
+}
+
+// out: newp1 = clip((p2 + ((p0 + q0 + 1) >> 1)) >> 1, p1-tc0, p1+tc0)
+static inline vec_u8 h264_deblock_q1(register vec_u8 p0,
+ register vec_u8 p1,
+ register vec_u8 p2,
+ register vec_u8 q0,
+ register vec_u8 tc0) {
+
+ register vec_u8 average = vec_avg(p0, q0);
+ register vec_u8 temp;
+ register vec_u8 uncliped;
+ register vec_u8 ones;
+ register vec_u8 max;
+ register vec_u8 min;
+ register vec_u8 newp1;
+
+ temp = vec_xor(average, p2);
+ average = vec_avg(average, p2); /*avg(p2, avg(p0, q0)) */
+ ones = vec_splat_u8(1);
+ temp = vec_and(temp, ones); /*(p2^avg(p0, q0)) & 1 */
+ uncliped = vec_subs(average, temp); /*(p2+((p0+q0+1)>>1))>>1 */
+ max = vec_adds(p1, tc0);
+ min = vec_subs(p1, tc0);
+ newp1 = vec_max(min, uncliped);
+ newp1 = vec_min(max, newp1);
+ return newp1;
+}
+
+#define h264_deblock_p0_q0(p0, p1, q0, q1, tc0masked) { \
+ \
+ const vec_u8 A0v = vec_sl(vec_splat_u8(10), vec_splat_u8(4)); \
+ \
+ register vec_u8 pq0bit = vec_xor(p0,q0); \
+ register vec_u8 q1minus; \
+ register vec_u8 p0minus; \
+ register vec_u8 stage1; \
+ register vec_u8 stage2; \
+ register vec_u8 vec160; \
+ register vec_u8 delta; \
+ register vec_u8 deltaneg; \
+ \
+ q1minus = vec_nor(q1, q1); /* 255 - q1 */ \
+ stage1 = vec_avg(p1, q1minus); /* (p1 - q1 + 256)>>1 */ \
+ stage2 = vec_sr(stage1, vec_splat_u8(1)); /* (p1 - q1 + 256)>>2 = 64 + (p1 - q1) >> 2 */ \
+ p0minus = vec_nor(p0, p0); /* 255 - p0 */ \
+ stage1 = vec_avg(q0, p0minus); /* (q0 - p0 + 256)>>1 */ \
+ pq0bit = vec_and(pq0bit, vec_splat_u8(1)); \
+ stage2 = vec_avg(stage2, pq0bit); /* 32 + ((q0 - p0)&1 + (p1 - q1) >> 2 + 1) >> 1 */ \
+ stage2 = vec_adds(stage2, stage1); /* 160 + ((p0 - q0) + (p1 - q1) >> 2 + 1) >> 1 */ \
+ vec160 = vec_ld(0, &A0v); \
+ deltaneg = vec_subs(vec160, stage2); /* -d */ \
+ delta = vec_subs(stage2, vec160); /* d */ \
+ deltaneg = vec_min(tc0masked, deltaneg); \
+ delta = vec_min(tc0masked, delta); \
+ p0 = vec_subs(p0, deltaneg); \
+ q0 = vec_subs(q0, delta); \
+ p0 = vec_adds(p0, delta); \
+ q0 = vec_adds(q0, deltaneg); \
+}
+
+#define h264_loop_filter_luma_altivec(p2, p1, p0, q0, q1, q2, alpha, beta, tc0) { \
+ DECLARE_ALIGNED(16, unsigned char, temp)[16]; \
+ register vec_u8 alphavec; \
+ register vec_u8 betavec; \
+ register vec_u8 mask; \
+ register vec_u8 p1mask; \
+ register vec_u8 q1mask; \
+ register vector signed char tc0vec; \
+ register vec_u8 finaltc0; \
+ register vec_u8 tc0masked; \
+ register vec_u8 newp1; \
+ register vec_u8 newq1; \
+ \
+ temp[0] = alpha; \
+ temp[1] = beta; \
+ alphavec = vec_ld(0, temp); \
+ betavec = vec_splat(alphavec, 0x1); \
+ alphavec = vec_splat(alphavec, 0x0); \
+ mask = h264_deblock_mask(p0, p1, q0, q1, alphavec, betavec); /*if in block */ \
+ \
+ AV_COPY32(temp, tc0); \
+ tc0vec = vec_ld(0, (signed char*)temp); \
+ tc0vec = vec_mergeh(tc0vec, tc0vec); \
+ tc0vec = vec_mergeh(tc0vec, tc0vec); \
+ mask = vec_and(mask, vec_cmpgt(tc0vec, vec_splat_s8(-1))); /* if tc0[i] >= 0 */ \
+ finaltc0 = vec_and((vec_u8)tc0vec, mask); /* tc = tc0 */ \
+ \
+ p1mask = diff_lt_altivec(p2, p0, betavec); \
+ p1mask = vec_and(p1mask, mask); /* if ( |p2 - p0| < beta) */ \
+ tc0masked = vec_and(p1mask, (vec_u8)tc0vec); \
+ finaltc0 = vec_sub(finaltc0, p1mask); /* tc++ */ \
+ newp1 = h264_deblock_q1(p0, p1, p2, q0, tc0masked); \
+ /*end if*/ \
+ \
+ q1mask = diff_lt_altivec(q2, q0, betavec); \
+ q1mask = vec_and(q1mask, mask); /* if ( |q2 - q0| < beta ) */\
+ tc0masked = vec_and(q1mask, (vec_u8)tc0vec); \
+ finaltc0 = vec_sub(finaltc0, q1mask); /* tc++ */ \
+ newq1 = h264_deblock_q1(p0, q1, q2, q0, tc0masked); \
+ /*end if*/ \
+ \
+ h264_deblock_p0_q0(p0, p1, q0, q1, finaltc0); \
+ p1 = newp1; \
+ q1 = newq1; \
+}
+
+static void h264_v_loop_filter_luma_altivec(uint8_t *pix, int stride, int alpha, int beta, int8_t *tc0) {
+
+ if ((tc0[0] & tc0[1] & tc0[2] & tc0[3]) >= 0) {
+ register vec_u8 p2 = vec_ld(-3*stride, pix);
+ register vec_u8 p1 = vec_ld(-2*stride, pix);
+ register vec_u8 p0 = vec_ld(-1*stride, pix);
+ register vec_u8 q0 = vec_ld(0, pix);
+ register vec_u8 q1 = vec_ld(stride, pix);
+ register vec_u8 q2 = vec_ld(2*stride, pix);
+ h264_loop_filter_luma_altivec(p2, p1, p0, q0, q1, q2, alpha, beta, tc0);
+ vec_st(p1, -2*stride, pix);
+ vec_st(p0, -1*stride, pix);
+ vec_st(q0, 0, pix);
+ vec_st(q1, stride, pix);
+ }
+}
+
+static void h264_h_loop_filter_luma_altivec(uint8_t *pix, int stride, int alpha, int beta, int8_t *tc0) {
+
+ register vec_u8 line0, line1, line2, line3, line4, line5;
+ if ((tc0[0] & tc0[1] & tc0[2] & tc0[3]) < 0)
+ return;
+ readAndTranspose16x6(pix-3, stride, line0, line1, line2, line3, line4, line5);
+ h264_loop_filter_luma_altivec(line0, line1, line2, line3, line4, line5, alpha, beta, tc0);
+ transpose4x16(line1, line2, line3, line4);
+ write16x4(pix-2, stride, line1, line2, line3, line4);
+}
+
+static av_always_inline
+void weight_h264_W_altivec(uint8_t *block, int stride, int height,
+ int log2_denom, int weight, int offset, int w)
+{
+ int y, aligned;
+ vec_u8 vblock;
+ vec_s16 vtemp, vweight, voffset, v0, v1;
+ vec_u16 vlog2_denom;
+ DECLARE_ALIGNED(16, int32_t, temp)[4];
+ LOAD_ZERO;
+
+ offset <<= log2_denom;
+ if(log2_denom) offset += 1<<(log2_denom-1);
+ temp[0] = log2_denom;
+ temp[1] = weight;
+ temp[2] = offset;
+
+ vtemp = (vec_s16)vec_ld(0, temp);
+ vlog2_denom = (vec_u16)vec_splat(vtemp, 1);
+ vweight = vec_splat(vtemp, 3);
+ voffset = vec_splat(vtemp, 5);
+ aligned = !((unsigned long)block & 0xf);
+
+ for (y = 0; y < height; y++) {
+ vblock = vec_ld(0, block);
+
+ v0 = (vec_s16)vec_mergeh(zero_u8v, vblock);
+ v1 = (vec_s16)vec_mergel(zero_u8v, vblock);
+
+ if (w == 16 || aligned) {
+ v0 = vec_mladd(v0, vweight, zero_s16v);
+ v0 = vec_adds(v0, voffset);
+ v0 = vec_sra(v0, vlog2_denom);
+ }
+ if (w == 16 || !aligned) {
+ v1 = vec_mladd(v1, vweight, zero_s16v);
+ v1 = vec_adds(v1, voffset);
+ v1 = vec_sra(v1, vlog2_denom);
+ }
+ vblock = vec_packsu(v0, v1);
+ vec_st(vblock, 0, block);
+
+ block += stride;
+ }
+}
+
+static av_always_inline
+void biweight_h264_W_altivec(uint8_t *dst, uint8_t *src, int stride, int height,
+ int log2_denom, int weightd, int weights, int offset, int w)
+{
+ int y, dst_aligned, src_aligned;
+ vec_u8 vsrc, vdst;
+ vec_s16 vtemp, vweights, vweightd, voffset, v0, v1, v2, v3;
+ vec_u16 vlog2_denom;
+ DECLARE_ALIGNED(16, int32_t, temp)[4];
+ LOAD_ZERO;
+
+ offset = ((offset + 1) | 1) << log2_denom;
+ temp[0] = log2_denom+1;
+ temp[1] = weights;
+ temp[2] = weightd;
+ temp[3] = offset;
+
+ vtemp = (vec_s16)vec_ld(0, temp);
+ vlog2_denom = (vec_u16)vec_splat(vtemp, 1);
+ vweights = vec_splat(vtemp, 3);
+ vweightd = vec_splat(vtemp, 5);
+ voffset = vec_splat(vtemp, 7);
+ dst_aligned = !((unsigned long)dst & 0xf);
+ src_aligned = !((unsigned long)src & 0xf);
+
+ for (y = 0; y < height; y++) {
+ vdst = vec_ld(0, dst);
+ vsrc = vec_ld(0, src);
+
+ v0 = (vec_s16)vec_mergeh(zero_u8v, vdst);
+ v1 = (vec_s16)vec_mergel(zero_u8v, vdst);
+ v2 = (vec_s16)vec_mergeh(zero_u8v, vsrc);
+ v3 = (vec_s16)vec_mergel(zero_u8v, vsrc);
+
+ if (w == 8) {
+ if (src_aligned)
+ v3 = v2;
+ else
+ v2 = v3;
+ }
+
+ if (w == 16 || dst_aligned) {
+ v0 = vec_mladd(v0, vweightd, zero_s16v);
+ v2 = vec_mladd(v2, vweights, zero_s16v);
+
+ v0 = vec_adds(v0, voffset);
+ v0 = vec_adds(v0, v2);
+ v0 = vec_sra(v0, vlog2_denom);
+ }
+ if (w == 16 || !dst_aligned) {
+ v1 = vec_mladd(v1, vweightd, zero_s16v);
+ v3 = vec_mladd(v3, vweights, zero_s16v);
+
+ v1 = vec_adds(v1, voffset);
+ v1 = vec_adds(v1, v3);
+ v1 = vec_sra(v1, vlog2_denom);
+ }
+ vdst = vec_packsu(v0, v1);
+ vec_st(vdst, 0, dst);
+
+ dst += stride;
+ src += stride;
+ }
+}
+
+#define H264_WEIGHT(W) \
+static void weight_h264_pixels ## W ## _altivec(uint8_t *block, int stride, int height, \
+ int log2_denom, int weight, int offset) \
+{ \
+ weight_h264_W_altivec(block, stride, height, log2_denom, weight, offset, W); \
+}\
+static void biweight_h264_pixels ## W ## _altivec(uint8_t *dst, uint8_t *src, int stride, int height, \
+ int log2_denom, int weightd, int weights, int offset) \
+{ \
+ biweight_h264_W_altivec(dst, src, stride, height, log2_denom, weightd, weights, offset, W); \
+}
+
+H264_WEIGHT(16)
+H264_WEIGHT( 8)
+#endif /* HAVE_ALTIVEC */
+
+av_cold void ff_h264dsp_init_ppc(H264DSPContext *c, const int bit_depth,
+ const int chroma_format_idc)
+{
+#if HAVE_ALTIVEC
+ if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
+ return;
+
+ if (bit_depth == 8) {
+ c->h264_idct_add = h264_idct_add_altivec;
+ if (chroma_format_idc <= 1)
+ c->h264_idct_add8 = h264_idct_add8_altivec;
+ c->h264_idct_add16 = h264_idct_add16_altivec;
+ c->h264_idct_add16intra = h264_idct_add16intra_altivec;
+ c->h264_idct_dc_add= h264_idct_dc_add_altivec;
+ c->h264_idct8_dc_add = h264_idct8_dc_add_altivec;
+ c->h264_idct8_add = h264_idct8_add_altivec;
+ c->h264_idct8_add4 = h264_idct8_add4_altivec;
+ c->h264_v_loop_filter_luma= h264_v_loop_filter_luma_altivec;
+ c->h264_h_loop_filter_luma= h264_h_loop_filter_luma_altivec;
+
+ c->weight_h264_pixels_tab[0] = weight_h264_pixels16_altivec;
+ c->weight_h264_pixels_tab[1] = weight_h264_pixels8_altivec;
+ c->biweight_h264_pixels_tab[0] = biweight_h264_pixels16_altivec;
+ c->biweight_h264_pixels_tab[1] = biweight_h264_pixels8_altivec;
+ }
+#endif /* HAVE_ALTIVEC */
+}

libav-v10.1.tar.bz2/libavcodec/ppc/h264qpel.c Added

@@ -0,0 +1,318 @@
+/*
+ * Copyright (c) 2004 Romain Dolbeau <romain@dolbeau.org>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/ppc/types_altivec.h"
+#include "libavutil/ppc/util_altivec.h"
+#include "libavcodec/h264qpel.h"
+#include "dsputil_altivec.h"
+
+#if HAVE_ALTIVEC
+
+#define PUT_OP_U8_ALTIVEC(d, s, dst) d = s
+#define AVG_OP_U8_ALTIVEC(d, s, dst) d = vec_avg(dst, s)
+
+#define OP_U8_ALTIVEC PUT_OP_U8_ALTIVEC
+#define PREFIX_h264_qpel16_h_lowpass_altivec put_h264_qpel16_h_lowpass_altivec
+#define PREFIX_h264_qpel16_h_lowpass_num altivec_put_h264_qpel16_h_lowpass_num
+#define PREFIX_h264_qpel16_v_lowpass_altivec put_h264_qpel16_v_lowpass_altivec
+#define PREFIX_h264_qpel16_v_lowpass_num altivec_put_h264_qpel16_v_lowpass_num
+#define PREFIX_h264_qpel16_hv_lowpass_altivec put_h264_qpel16_hv_lowpass_altivec
+#define PREFIX_h264_qpel16_hv_lowpass_num altivec_put_h264_qpel16_hv_lowpass_num
+#include "h264qpel_template.c"
+#undef OP_U8_ALTIVEC
+#undef PREFIX_h264_qpel16_h_lowpass_altivec
+#undef PREFIX_h264_qpel16_h_lowpass_num
+#undef PREFIX_h264_qpel16_v_lowpass_altivec
+#undef PREFIX_h264_qpel16_v_lowpass_num
+#undef PREFIX_h264_qpel16_hv_lowpass_altivec
+#undef PREFIX_h264_qpel16_hv_lowpass_num
+
+#define OP_U8_ALTIVEC AVG_OP_U8_ALTIVEC
+#define PREFIX_h264_qpel16_h_lowpass_altivec avg_h264_qpel16_h_lowpass_altivec
+#define PREFIX_h264_qpel16_h_lowpass_num altivec_avg_h264_qpel16_h_lowpass_num
+#define PREFIX_h264_qpel16_v_lowpass_altivec avg_h264_qpel16_v_lowpass_altivec
+#define PREFIX_h264_qpel16_v_lowpass_num altivec_avg_h264_qpel16_v_lowpass_num
+#define PREFIX_h264_qpel16_hv_lowpass_altivec avg_h264_qpel16_hv_lowpass_altivec
+#define PREFIX_h264_qpel16_hv_lowpass_num altivec_avg_h264_qpel16_hv_lowpass_num
+#include "h264qpel_template.c"
+#undef OP_U8_ALTIVEC
+#undef PREFIX_h264_qpel16_h_lowpass_altivec
+#undef PREFIX_h264_qpel16_h_lowpass_num
+#undef PREFIX_h264_qpel16_v_lowpass_altivec
+#undef PREFIX_h264_qpel16_v_lowpass_num
+#undef PREFIX_h264_qpel16_hv_lowpass_altivec
+#undef PREFIX_h264_qpel16_hv_lowpass_num
+
+#define H264_MC(OPNAME, SIZE, CODETYPE) \
+static void OPNAME ## h264_qpel ## SIZE ## _mc00_ ## CODETYPE (uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ ff_ ## OPNAME ## pixels ## SIZE ## _ ## CODETYPE(dst, src, stride, SIZE);\
+}\
+\
+static void OPNAME ## h264_qpel ## SIZE ## _mc10_ ## CODETYPE(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{ \
+ DECLARE_ALIGNED(16, uint8_t, half)[SIZE*SIZE];\
+ put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(half, src, SIZE, stride);\
+ OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, src, half, stride, stride, SIZE);\
+}\
+\
+static void OPNAME ## h264_qpel ## SIZE ## _mc20_ ## CODETYPE(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ OPNAME ## h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(dst, src, stride, stride);\
+}\
+\
+static void OPNAME ## h264_qpel ## SIZE ## _mc30_ ## CODETYPE(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ DECLARE_ALIGNED(16, uint8_t, half)[SIZE*SIZE];\
+ put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(half, src, SIZE, stride);\
+ OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, src+1, half, stride, stride, SIZE);\
+}\
+\
+static void OPNAME ## h264_qpel ## SIZE ## _mc01_ ## CODETYPE(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ DECLARE_ALIGNED(16, uint8_t, half)[SIZE*SIZE];\
+ put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(half, src, SIZE, stride);\
+ OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, src, half, stride, stride, SIZE);\
+}\
+\
+static void OPNAME ## h264_qpel ## SIZE ## _mc02_ ## CODETYPE(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ OPNAME ## h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(dst, src, stride, stride);\
+}\
+\
+static void OPNAME ## h264_qpel ## SIZE ## _mc03_ ## CODETYPE(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ DECLARE_ALIGNED(16, uint8_t, half)[SIZE*SIZE];\
+ put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(half, src, SIZE, stride);\
+ OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, src+stride, half, stride, stride, SIZE);\
+}\
+\
+static void OPNAME ## h264_qpel ## SIZE ## _mc11_ ## CODETYPE(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\
+ DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\
+ put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src, SIZE, stride);\
+ put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src, SIZE, stride);\
+ OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfV, stride, SIZE, SIZE);\
+}\
+\
+static void OPNAME ## h264_qpel ## SIZE ## _mc31_ ## CODETYPE(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\
+ DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\
+ put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src, SIZE, stride);\
+ put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src+1, SIZE, stride);\
+ OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfV, stride, SIZE, SIZE);\
+}\
+\
+static void OPNAME ## h264_qpel ## SIZE ## _mc13_ ## CODETYPE(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\
+ DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\
+ put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src + stride, SIZE, stride);\
+ put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src, SIZE, stride);\
+ OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfV, stride, SIZE, SIZE);\
+}\
+\
+static void OPNAME ## h264_qpel ## SIZE ## _mc33_ ## CODETYPE(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\
+ DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\
+ put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src + stride, SIZE, stride);\
+ put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src+1, SIZE, stride);\
+ OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfV, stride, SIZE, SIZE);\
+}\
+\
+static void OPNAME ## h264_qpel ## SIZE ## _mc22_ ## CODETYPE(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ DECLARE_ALIGNED(16, int16_t, tmp)[SIZE*(SIZE+8)];\
+ OPNAME ## h264_qpel ## SIZE ## _hv_lowpass_ ## CODETYPE(dst, tmp, src, stride, SIZE, stride);\
+}\
+\
+static void OPNAME ## h264_qpel ## SIZE ## _mc21_ ## CODETYPE(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\
+ DECLARE_ALIGNED(16, uint8_t, halfHV)[SIZE*SIZE];\
+ DECLARE_ALIGNED(16, int16_t, tmp)[SIZE*(SIZE+8)];\
+ put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src, SIZE, stride);\
+ put_h264_qpel ## SIZE ## _hv_lowpass_ ## CODETYPE(halfHV, tmp, src, SIZE, SIZE, stride);\
+ OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfHV, stride, SIZE, SIZE);\
+}\
+\
+static void OPNAME ## h264_qpel ## SIZE ## _mc23_ ## CODETYPE(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\
+ DECLARE_ALIGNED(16, uint8_t, halfHV)[SIZE*SIZE];\
+ DECLARE_ALIGNED(16, int16_t, tmp)[SIZE*(SIZE+8)];\
+ put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src + stride, SIZE, stride);\
+ put_h264_qpel ## SIZE ## _hv_lowpass_ ## CODETYPE(halfHV, tmp, src, SIZE, SIZE, stride);\
+ OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfHV, stride, SIZE, SIZE);\
+}\
+\
+static void OPNAME ## h264_qpel ## SIZE ## _mc12_ ## CODETYPE(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\
+ DECLARE_ALIGNED(16, uint8_t, halfHV)[SIZE*SIZE];\
+ DECLARE_ALIGNED(16, int16_t, tmp)[SIZE*(SIZE+8)];\
+ put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src, SIZE, stride);\
+ put_h264_qpel ## SIZE ## _hv_lowpass_ ## CODETYPE(halfHV, tmp, src, SIZE, SIZE, stride);\
+ OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfV, halfHV, stride, SIZE, SIZE);\
+}\
+\
+static void OPNAME ## h264_qpel ## SIZE ## _mc32_ ## CODETYPE(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
+ DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\
+ DECLARE_ALIGNED(16, uint8_t, halfHV)[SIZE*SIZE];\
+ DECLARE_ALIGNED(16, int16_t, tmp)[SIZE*(SIZE+8)];\
+ put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src+1, SIZE, stride);\
+ put_h264_qpel ## SIZE ## _hv_lowpass_ ## CODETYPE(halfHV, tmp, src, SIZE, SIZE, stride);\
+ OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfV, halfHV, stride, SIZE, SIZE);\
+}\
+
+static inline void put_pixels16_l2_altivec( uint8_t * dst, const uint8_t * src1,
+ const uint8_t * src2, int dst_stride,
+ int src_stride1, int h)
+{
+ int i;
+ vec_u8 a, b, d, tmp1, tmp2, mask, mask_, edges, align;
+
+ mask_ = vec_lvsl(0, src2);
+
+ for (i = 0; i < h; i++) {
+
+ tmp1 = vec_ld(i * src_stride1, src1);
+ mask = vec_lvsl(i * src_stride1, src1);
+ tmp2 = vec_ld(i * src_stride1 + 15, src1);
+
+ a = vec_perm(tmp1, tmp2, mask);
+
+ tmp1 = vec_ld(i * 16, src2);
+ tmp2 = vec_ld(i * 16 + 15, src2);
+
+ b = vec_perm(tmp1, tmp2, mask_);
+
+ tmp1 = vec_ld(0, dst);
+ mask = vec_lvsl(0, dst);
+ tmp2 = vec_ld(15, dst);
+
+ d = vec_avg(a, b);
+
+ edges = vec_perm(tmp2, tmp1, mask);
+
+ align = vec_lvsr(0, dst);
+
+ tmp2 = vec_perm(d, edges, align);
+ tmp1 = vec_perm(edges, d, align);
+
+ vec_st(tmp2, 15, dst);
+ vec_st(tmp1, 0 , dst);
+
+ dst += dst_stride;
+ }
+}
+
+static inline void avg_pixels16_l2_altivec( uint8_t * dst, const uint8_t * src1,
+ const uint8_t * src2, int dst_stride,
+ int src_stride1, int h)
+{
+ int i;
+ vec_u8 a, b, d, tmp1, tmp2, mask, mask_, edges, align;
+
+ mask_ = vec_lvsl(0, src2);
+
+ for (i = 0; i < h; i++) {
+
+ tmp1 = vec_ld(i * src_stride1, src1);
+ mask = vec_lvsl(i * src_stride1, src1);
+ tmp2 = vec_ld(i * src_stride1 + 15, src1);
+
+ a = vec_perm(tmp1, tmp2, mask);
+
+ tmp1 = vec_ld(i * 16, src2);
+ tmp2 = vec_ld(i * 16 + 15, src2);
+
+ b = vec_perm(tmp1, tmp2, mask_);
+
+ tmp1 = vec_ld(0, dst);
+ mask = vec_lvsl(0, dst);
+ tmp2 = vec_ld(15, dst);
+
+ d = vec_avg(vec_perm(tmp1, tmp2, mask), vec_avg(a, b));
+
+ edges = vec_perm(tmp2, tmp1, mask);
+
+ align = vec_lvsr(0, dst);
+
+ tmp2 = vec_perm(d, edges, align);
+ tmp1 = vec_perm(edges, d, align);
+
+ vec_st(tmp2, 15, dst);
+ vec_st(tmp1, 0 , dst);
+
+ dst += dst_stride;
+ }
+}
+
+/* Implemented but could be faster
+#define put_pixels16_l2_altivec(d,s1,s2,ds,s1s,h) put_pixels16_l2(d,s1,s2,ds,s1s,16,h)
+#define avg_pixels16_l2_altivec(d,s1,s2,ds,s1s,h) avg_pixels16_l2(d,s1,s2,ds,s1s,16,h)
+ */
+
+H264_MC(put_, 16, altivec)
+H264_MC(avg_, 16, altivec)
+#endif /* HAVE_ALTIVEC */
+
+av_cold void ff_h264qpel_init_ppc(H264QpelContext *c, int bit_depth)
+{
+#if HAVE_ALTIVEC
+ const int high_bit_depth = bit_depth > 8;
+
+ if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
+ return;
+
+ if (!high_bit_depth) {
+#define dspfunc(PFX, IDX, NUM) \
+ c->PFX ## _pixels_tab[IDX][ 0] = PFX ## NUM ## _mc00_altivec; \
+ c->PFX ## _pixels_tab[IDX][ 1] = PFX ## NUM ## _mc10_altivec; \
+ c->PFX ## _pixels_tab[IDX][ 2] = PFX ## NUM ## _mc20_altivec; \
+ c->PFX ## _pixels_tab[IDX][ 3] = PFX ## NUM ## _mc30_altivec; \
+ c->PFX ## _pixels_tab[IDX][ 4] = PFX ## NUM ## _mc01_altivec; \
+ c->PFX ## _pixels_tab[IDX][ 5] = PFX ## NUM ## _mc11_altivec; \
+ c->PFX ## _pixels_tab[IDX][ 6] = PFX ## NUM ## _mc21_altivec; \
+ c->PFX ## _pixels_tab[IDX][ 7] = PFX ## NUM ## _mc31_altivec; \
+ c->PFX ## _pixels_tab[IDX][ 8] = PFX ## NUM ## _mc02_altivec; \
+ c->PFX ## _pixels_tab[IDX][ 9] = PFX ## NUM ## _mc12_altivec; \
+ c->PFX ## _pixels_tab[IDX][10] = PFX ## NUM ## _mc22_altivec; \
+ c->PFX ## _pixels_tab[IDX][11] = PFX ## NUM ## _mc32_altivec; \
+ c->PFX ## _pixels_tab[IDX][12] = PFX ## NUM ## _mc03_altivec; \
+ c->PFX ## _pixels_tab[IDX][13] = PFX ## NUM ## _mc13_altivec; \
+ c->PFX ## _pixels_tab[IDX][14] = PFX ## NUM ## _mc23_altivec; \
+ c->PFX ## _pixels_tab[IDX][15] = PFX ## NUM ## _mc33_altivec
+
+ dspfunc(put_h264_qpel, 0, 16);
+ dspfunc(avg_h264_qpel, 0, 16);
+#undef dspfunc
+ }
+#endif /* HAVE_ALTIVEC */
+}

libav-v10.1.tar.bz2/libavcodec/ppc/h264qpel_template.c Added

@@ -0,0 +1,507 @@
+/*
+ * Copyright (c) 2004 Romain Dolbeau <romain@dolbeau.org>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/mem.h"
+
+#ifdef DEBUG
+#define ASSERT_ALIGNED(ptr) assert(((unsigned long)ptr&0x0000000F));
+#else
+#define ASSERT_ALIGNED(ptr) ;
+#endif
+
+/* this code assume stride % 16 == 0 */
+#ifdef PREFIX_h264_qpel16_h_lowpass_altivec
+static void PREFIX_h264_qpel16_h_lowpass_altivec(uint8_t * dst, uint8_t * src, int dstStride, int srcStride) {
+ register int i;
+
+ LOAD_ZERO;
+ const vec_u8 permM2 = vec_lvsl(-2, src);
+ const vec_u8 permM1 = vec_lvsl(-1, src);
+ const vec_u8 permP0 = vec_lvsl(+0, src);
+ const vec_u8 permP1 = vec_lvsl(+1, src);
+ const vec_u8 permP2 = vec_lvsl(+2, src);
+ const vec_u8 permP3 = vec_lvsl(+3, src);
+ const vec_s16 v5ss = vec_splat_s16(5);
+ const vec_u16 v5us = vec_splat_u16(5);
+ const vec_s16 v20ss = vec_sl(vec_splat_s16(5),vec_splat_u16(2));
+ const vec_s16 v16ss = vec_sl(vec_splat_s16(1),vec_splat_u16(4));
+
+ vec_u8 srcM2, srcM1, srcP0, srcP1, srcP2, srcP3;
+
+ register int align = ((((unsigned long)src) - 2) % 16);
+
+ vec_s16 srcP0A, srcP0B, srcP1A, srcP1B,
+ srcP2A, srcP2B, srcP3A, srcP3B,
+ srcM1A, srcM1B, srcM2A, srcM2B,
+ sum1A, sum1B, sum2A, sum2B, sum3A, sum3B,
+ pp1A, pp1B, pp2A, pp2B, pp3A, pp3B,
+ psumA, psumB, sumA, sumB;
+
+ vec_u8 sum, fsum;
+
+ for (i = 0 ; i < 16 ; i ++) {
+ vec_u8 srcR1 = vec_ld(-2, src);
+ vec_u8 srcR2 = vec_ld(14, src);
+
+ switch (align) {
+ default: {
+ srcM2 = vec_perm(srcR1, srcR2, permM2);
+ srcM1 = vec_perm(srcR1, srcR2, permM1);
+ srcP0 = vec_perm(srcR1, srcR2, permP0);
+ srcP1 = vec_perm(srcR1, srcR2, permP1);
+ srcP2 = vec_perm(srcR1, srcR2, permP2);
+ srcP3 = vec_perm(srcR1, srcR2, permP3);
+ } break;
+ case 11: {
+ srcM2 = vec_perm(srcR1, srcR2, permM2);
+ srcM1 = vec_perm(srcR1, srcR2, permM1);
+ srcP0 = vec_perm(srcR1, srcR2, permP0);
+ srcP1 = vec_perm(srcR1, srcR2, permP1);
+ srcP2 = vec_perm(srcR1, srcR2, permP2);
+ srcP3 = srcR2;
+ } break;
+ case 12: {
+ vec_u8 srcR3 = vec_ld(30, src);
+ srcM2 = vec_perm(srcR1, srcR2, permM2);
+ srcM1 = vec_perm(srcR1, srcR2, permM1);
+ srcP0 = vec_perm(srcR1, srcR2, permP0);
+ srcP1 = vec_perm(srcR1, srcR2, permP1);
+ srcP2 = srcR2;
+ srcP3 = vec_perm(srcR2, srcR3, permP3);
+ } break;
+ case 13: {
+ vec_u8 srcR3 = vec_ld(30, src);
+ srcM2 = vec_perm(srcR1, srcR2, permM2);
+ srcM1 = vec_perm(srcR1, srcR2, permM1);
+ srcP0 = vec_perm(srcR1, srcR2, permP0);
+ srcP1 = srcR2;
+ srcP2 = vec_perm(srcR2, srcR3, permP2);
+ srcP3 = vec_perm(srcR2, srcR3, permP3);
+ } break;
+ case 14: {
+ vec_u8 srcR3 = vec_ld(30, src);
+ srcM2 = vec_perm(srcR1, srcR2, permM2);
+ srcM1 = vec_perm(srcR1, srcR2, permM1);
+ srcP0 = srcR2;
+ srcP1 = vec_perm(srcR2, srcR3, permP1);
+ srcP2 = vec_perm(srcR2, srcR3, permP2);
+ srcP3 = vec_perm(srcR2, srcR3, permP3);
+ } break;
+ case 15: {
+ vec_u8 srcR3 = vec_ld(30, src);
+ srcM2 = vec_perm(srcR1, srcR2, permM2);
+ srcM1 = srcR2;
+ srcP0 = vec_perm(srcR2, srcR3, permP0);
+ srcP1 = vec_perm(srcR2, srcR3, permP1);
+ srcP2 = vec_perm(srcR2, srcR3, permP2);
+ srcP3 = vec_perm(srcR2, srcR3, permP3);
+ } break;
+ }
+
+ srcP0A = (vec_s16) vec_mergeh(zero_u8v, srcP0);
+ srcP0B = (vec_s16) vec_mergel(zero_u8v, srcP0);
+ srcP1A = (vec_s16) vec_mergeh(zero_u8v, srcP1);
+ srcP1B = (vec_s16) vec_mergel(zero_u8v, srcP1);
+
+ srcP2A = (vec_s16) vec_mergeh(zero_u8v, srcP2);
+ srcP2B = (vec_s16) vec_mergel(zero_u8v, srcP2);
+ srcP3A = (vec_s16) vec_mergeh(zero_u8v, srcP3);
+ srcP3B = (vec_s16) vec_mergel(zero_u8v, srcP3);
+
+ srcM1A = (vec_s16) vec_mergeh(zero_u8v, srcM1);
+ srcM1B = (vec_s16) vec_mergel(zero_u8v, srcM1);
+ srcM2A = (vec_s16) vec_mergeh(zero_u8v, srcM2);
+ srcM2B = (vec_s16) vec_mergel(zero_u8v, srcM2);
+
+ sum1A = vec_adds(srcP0A, srcP1A);
+ sum1B = vec_adds(srcP0B, srcP1B);
+ sum2A = vec_adds(srcM1A, srcP2A);
+ sum2B = vec_adds(srcM1B, srcP2B);
+ sum3A = vec_adds(srcM2A, srcP3A);
+ sum3B = vec_adds(srcM2B, srcP3B);
+
+ pp1A = vec_mladd(sum1A, v20ss, v16ss);
+ pp1B = vec_mladd(sum1B, v20ss, v16ss);
+
+ pp2A = vec_mladd(sum2A, v5ss, zero_s16v);
+ pp2B = vec_mladd(sum2B, v5ss, zero_s16v);
+
+ pp3A = vec_add(sum3A, pp1A);
+ pp3B = vec_add(sum3B, pp1B);
+
+ psumA = vec_sub(pp3A, pp2A);
+ psumB = vec_sub(pp3B, pp2B);
+
+ sumA = vec_sra(psumA, v5us);
+ sumB = vec_sra(psumB, v5us);
+
+ sum = vec_packsu(sumA, sumB);
+
+ ASSERT_ALIGNED(dst);
+
+ OP_U8_ALTIVEC(fsum, sum, vec_ld(0, dst));
+
+ vec_st(fsum, 0, dst);
+
+ src += srcStride;
+ dst += dstStride;
+ }
+}
+#endif
+
+/* this code assume stride % 16 == 0 */
+#ifdef PREFIX_h264_qpel16_v_lowpass_altivec
+static void PREFIX_h264_qpel16_v_lowpass_altivec(uint8_t * dst, uint8_t * src, int dstStride, int srcStride) {
+ register int i;
+
+ LOAD_ZERO;
+ const vec_u8 perm = vec_lvsl(0, src);
+ const vec_s16 v20ss = vec_sl(vec_splat_s16(5),vec_splat_u16(2));
+ const vec_u16 v5us = vec_splat_u16(5);
+ const vec_s16 v5ss = vec_splat_s16(5);
+ const vec_s16 v16ss = vec_sl(vec_splat_s16(1),vec_splat_u16(4));
+
+ uint8_t *srcbis = src - (srcStride * 2);
+
+ const vec_u8 srcM2a = vec_ld(0, srcbis);
+ const vec_u8 srcM2b = vec_ld(16, srcbis);
+ const vec_u8 srcM2 = vec_perm(srcM2a, srcM2b, perm);
+ //srcbis += srcStride;
+ const vec_u8 srcM1a = vec_ld(0, srcbis += srcStride);
+ const vec_u8 srcM1b = vec_ld(16, srcbis);
+ const vec_u8 srcM1 = vec_perm(srcM1a, srcM1b, perm);
+ //srcbis += srcStride;
+ const vec_u8 srcP0a = vec_ld(0, srcbis += srcStride);
+ const vec_u8 srcP0b = vec_ld(16, srcbis);
+ const vec_u8 srcP0 = vec_perm(srcP0a, srcP0b, perm);
+ //srcbis += srcStride;
+ const vec_u8 srcP1a = vec_ld(0, srcbis += srcStride);
+ const vec_u8 srcP1b = vec_ld(16, srcbis);
+ const vec_u8 srcP1 = vec_perm(srcP1a, srcP1b, perm);
+ //srcbis += srcStride;
+ const vec_u8 srcP2a = vec_ld(0, srcbis += srcStride);
+ const vec_u8 srcP2b = vec_ld(16, srcbis);
+ const vec_u8 srcP2 = vec_perm(srcP2a, srcP2b, perm);
+ //srcbis += srcStride;
+
+ vec_s16 srcM2ssA = (vec_s16) vec_mergeh(zero_u8v, srcM2);
+ vec_s16 srcM2ssB = (vec_s16) vec_mergel(zero_u8v, srcM2);
+ vec_s16 srcM1ssA = (vec_s16) vec_mergeh(zero_u8v, srcM1);
+ vec_s16 srcM1ssB = (vec_s16) vec_mergel(zero_u8v, srcM1);
+ vec_s16 srcP0ssA = (vec_s16) vec_mergeh(zero_u8v, srcP0);
+ vec_s16 srcP0ssB = (vec_s16) vec_mergel(zero_u8v, srcP0);
+ vec_s16 srcP1ssA = (vec_s16) vec_mergeh(zero_u8v, srcP1);
+ vec_s16 srcP1ssB = (vec_s16) vec_mergel(zero_u8v, srcP1);
+ vec_s16 srcP2ssA = (vec_s16) vec_mergeh(zero_u8v, srcP2);
+ vec_s16 srcP2ssB = (vec_s16) vec_mergel(zero_u8v, srcP2);
+
+ vec_s16 pp1A, pp1B, pp2A, pp2B, pp3A, pp3B,
+ psumA, psumB, sumA, sumB,
+ srcP3ssA, srcP3ssB,
+ sum1A, sum1B, sum2A, sum2B, sum3A, sum3B;
+
+ vec_u8 sum, fsum, srcP3a, srcP3b, srcP3;
+
+ for (i = 0 ; i < 16 ; i++) {
+ srcP3a = vec_ld(0, srcbis += srcStride);
+ srcP3b = vec_ld(16, srcbis);
+ srcP3 = vec_perm(srcP3a, srcP3b, perm);
+ srcP3ssA = (vec_s16) vec_mergeh(zero_u8v, srcP3);
+ srcP3ssB = (vec_s16) vec_mergel(zero_u8v, srcP3);
+ //srcbis += srcStride;
+
+ sum1A = vec_adds(srcP0ssA, srcP1ssA);
+ sum1B = vec_adds(srcP0ssB, srcP1ssB);
+ sum2A = vec_adds(srcM1ssA, srcP2ssA);
+ sum2B = vec_adds(srcM1ssB, srcP2ssB);
+ sum3A = vec_adds(srcM2ssA, srcP3ssA);
+ sum3B = vec_adds(srcM2ssB, srcP3ssB);
+
+ srcM2ssA = srcM1ssA;
+ srcM2ssB = srcM1ssB;
+ srcM1ssA = srcP0ssA;
+ srcM1ssB = srcP0ssB;
+ srcP0ssA = srcP1ssA;
+ srcP0ssB = srcP1ssB;
+ srcP1ssA = srcP2ssA;
+ srcP1ssB = srcP2ssB;
+ srcP2ssA = srcP3ssA;
+ srcP2ssB = srcP3ssB;
+
+ pp1A = vec_mladd(sum1A, v20ss, v16ss);
+ pp1B = vec_mladd(sum1B, v20ss, v16ss);
+
+ pp2A = vec_mladd(sum2A, v5ss, zero_s16v);
+ pp2B = vec_mladd(sum2B, v5ss, zero_s16v);
+
+ pp3A = vec_add(sum3A, pp1A);
+ pp3B = vec_add(sum3B, pp1B);
+
+ psumA = vec_sub(pp3A, pp2A);
+ psumB = vec_sub(pp3B, pp2B);
+
+ sumA = vec_sra(psumA, v5us);
+ sumB = vec_sra(psumB, v5us);
+
+ sum = vec_packsu(sumA, sumB);
+
+ ASSERT_ALIGNED(dst);
+
+ OP_U8_ALTIVEC(fsum, sum, vec_ld(0, dst));
+
+ vec_st(fsum, 0, dst);
+
+ dst += dstStride;
+ }
+}
+#endif
+
+/* this code assume stride % 16 == 0 *and* tmp is properly aligned */
+#ifdef PREFIX_h264_qpel16_hv_lowpass_altivec
+static void PREFIX_h264_qpel16_hv_lowpass_altivec(uint8_t * dst, int16_t * tmp, uint8_t * src, int dstStride, int tmpStride, int srcStride) {
+ register int i;
+ LOAD_ZERO;
+ const vec_u8 permM2 = vec_lvsl(-2, src);
+ const vec_u8 permM1 = vec_lvsl(-1, src);
+ const vec_u8 permP0 = vec_lvsl(+0, src);
+ const vec_u8 permP1 = vec_lvsl(+1, src);
+ const vec_u8 permP2 = vec_lvsl(+2, src);
+ const vec_u8 permP3 = vec_lvsl(+3, src);
+ const vec_s16 v20ss = vec_sl(vec_splat_s16(5),vec_splat_u16(2));
+ const vec_u32 v10ui = vec_splat_u32(10);
+ const vec_s16 v5ss = vec_splat_s16(5);
+ const vec_s16 v1ss = vec_splat_s16(1);
+ const vec_s32 v512si = vec_sl(vec_splat_s32(1),vec_splat_u32(9));
+ const vec_u32 v16ui = vec_sl(vec_splat_u32(1),vec_splat_u32(4));
+
+ register int align = ((((unsigned long)src) - 2) % 16);
+
+ vec_s16 srcP0A, srcP0B, srcP1A, srcP1B,
+ srcP2A, srcP2B, srcP3A, srcP3B,
+ srcM1A, srcM1B, srcM2A, srcM2B,
+ sum1A, sum1B, sum2A, sum2B, sum3A, sum3B,
+ pp1A, pp1B, pp2A, pp2B, psumA, psumB;
+
+ const vec_u8 mperm = (const vec_u8)
+ {0x00, 0x08, 0x01, 0x09, 0x02, 0x0A, 0x03, 0x0B,
+ 0x04, 0x0C, 0x05, 0x0D, 0x06, 0x0E, 0x07, 0x0F};
+ int16_t *tmpbis = tmp;
+
+ vec_s16 tmpM1ssA, tmpM1ssB, tmpM2ssA, tmpM2ssB,
+ tmpP0ssA, tmpP0ssB, tmpP1ssA, tmpP1ssB,
+ tmpP2ssA, tmpP2ssB;
+
+ vec_s32 pp1Ae, pp1Ao, pp1Be, pp1Bo, pp2Ae, pp2Ao, pp2Be, pp2Bo,
+ pp3Ae, pp3Ao, pp3Be, pp3Bo, pp1cAe, pp1cAo, pp1cBe, pp1cBo,
+ pp32Ae, pp32Ao, pp32Be, pp32Bo, sumAe, sumAo, sumBe, sumBo,
+ ssumAe, ssumAo, ssumBe, ssumBo;
+ vec_u8 fsum, sumv, sum;
+ vec_s16 ssume, ssumo;
+
+ src -= (2 * srcStride);
+ for (i = 0 ; i < 21 ; i ++) {
+ vec_u8 srcM2, srcM1, srcP0, srcP1, srcP2, srcP3;
+ vec_u8 srcR1 = vec_ld(-2, src);
+ vec_u8 srcR2 = vec_ld(14, src);
+
+ switch (align) {
+ default: {
+ srcM2 = vec_perm(srcR1, srcR2, permM2);
+ srcM1 = vec_perm(srcR1, srcR2, permM1);
+ srcP0 = vec_perm(srcR1, srcR2, permP0);
+ srcP1 = vec_perm(srcR1, srcR2, permP1);
+ srcP2 = vec_perm(srcR1, srcR2, permP2);
+ srcP3 = vec_perm(srcR1, srcR2, permP3);
+ } break;
+ case 11: {
+ srcM2 = vec_perm(srcR1, srcR2, permM2);
+ srcM1 = vec_perm(srcR1, srcR2, permM1);
+ srcP0 = vec_perm(srcR1, srcR2, permP0);
+ srcP1 = vec_perm(srcR1, srcR2, permP1);
+ srcP2 = vec_perm(srcR1, srcR2, permP2);
+ srcP3 = srcR2;
+ } break;
+ case 12: {
+ vec_u8 srcR3 = vec_ld(30, src);
+ srcM2 = vec_perm(srcR1, srcR2, permM2);
+ srcM1 = vec_perm(srcR1, srcR2, permM1);
+ srcP0 = vec_perm(srcR1, srcR2, permP0);
+ srcP1 = vec_perm(srcR1, srcR2, permP1);
+ srcP2 = srcR2;
+ srcP3 = vec_perm(srcR2, srcR3, permP3);
+ } break;
+ case 13: {
+ vec_u8 srcR3 = vec_ld(30, src);
+ srcM2 = vec_perm(srcR1, srcR2, permM2);
+ srcM1 = vec_perm(srcR1, srcR2, permM1);
+ srcP0 = vec_perm(srcR1, srcR2, permP0);
+ srcP1 = srcR2;
+ srcP2 = vec_perm(srcR2, srcR3, permP2);
+ srcP3 = vec_perm(srcR2, srcR3, permP3);
+ } break;
+ case 14: {
+ vec_u8 srcR3 = vec_ld(30, src);
+ srcM2 = vec_perm(srcR1, srcR2, permM2);
+ srcM1 = vec_perm(srcR1, srcR2, permM1);
+ srcP0 = srcR2;
+ srcP1 = vec_perm(srcR2, srcR3, permP1);
+ srcP2 = vec_perm(srcR2, srcR3, permP2);
+ srcP3 = vec_perm(srcR2, srcR3, permP3);
+ } break;
+ case 15: {
+ vec_u8 srcR3 = vec_ld(30, src);
+ srcM2 = vec_perm(srcR1, srcR2, permM2);
+ srcM1 = srcR2;
+ srcP0 = vec_perm(srcR2, srcR3, permP0);
+ srcP1 = vec_perm(srcR2, srcR3, permP1);
+ srcP2 = vec_perm(srcR2, srcR3, permP2);
+ srcP3 = vec_perm(srcR2, srcR3, permP3);
+ } break;
+ }
+
+ srcP0A = (vec_s16) vec_mergeh(zero_u8v, srcP0);
+ srcP0B = (vec_s16) vec_mergel(zero_u8v, srcP0);
+ srcP1A = (vec_s16) vec_mergeh(zero_u8v, srcP1);
+ srcP1B = (vec_s16) vec_mergel(zero_u8v, srcP1);
+
+ srcP2A = (vec_s16) vec_mergeh(zero_u8v, srcP2);
+ srcP2B = (vec_s16) vec_mergel(zero_u8v, srcP2);
+ srcP3A = (vec_s16) vec_mergeh(zero_u8v, srcP3);
+ srcP3B = (vec_s16) vec_mergel(zero_u8v, srcP3);
+
+ srcM1A = (vec_s16) vec_mergeh(zero_u8v, srcM1);
+ srcM1B = (vec_s16) vec_mergel(zero_u8v, srcM1);
+ srcM2A = (vec_s16) vec_mergeh(zero_u8v, srcM2);
+ srcM2B = (vec_s16) vec_mergel(zero_u8v, srcM2);
+
+ sum1A = vec_adds(srcP0A, srcP1A);
+ sum1B = vec_adds(srcP0B, srcP1B);
+ sum2A = vec_adds(srcM1A, srcP2A);
+ sum2B = vec_adds(srcM1B, srcP2B);
+ sum3A = vec_adds(srcM2A, srcP3A);
+ sum3B = vec_adds(srcM2B, srcP3B);
+
+ pp1A = vec_mladd(sum1A, v20ss, sum3A);
+ pp1B = vec_mladd(sum1B, v20ss, sum3B);
+
+ pp2A = vec_mladd(sum2A, v5ss, zero_s16v);
+ pp2B = vec_mladd(sum2B, v5ss, zero_s16v);
+
+ psumA = vec_sub(pp1A, pp2A);
+ psumB = vec_sub(pp1B, pp2B);
+
+ vec_st(psumA, 0, tmp);
+ vec_st(psumB, 16, tmp);
+
+ src += srcStride;
+ tmp += tmpStride; /* int16_t*, and stride is 16, so it's OK here */
+ }
+
+ tmpM2ssA = vec_ld(0, tmpbis);
+ tmpM2ssB = vec_ld(16, tmpbis);
+ tmpbis += tmpStride;
+ tmpM1ssA = vec_ld(0, tmpbis);
+ tmpM1ssB = vec_ld(16, tmpbis);
+ tmpbis += tmpStride;
+ tmpP0ssA = vec_ld(0, tmpbis);
+ tmpP0ssB = vec_ld(16, tmpbis);
+ tmpbis += tmpStride;
+ tmpP1ssA = vec_ld(0, tmpbis);
+ tmpP1ssB = vec_ld(16, tmpbis);
+ tmpbis += tmpStride;
+ tmpP2ssA = vec_ld(0, tmpbis);
+ tmpP2ssB = vec_ld(16, tmpbis);
+ tmpbis += tmpStride;
+
+ for (i = 0 ; i < 16 ; i++) {
+ const vec_s16 tmpP3ssA = vec_ld(0, tmpbis);
+ const vec_s16 tmpP3ssB = vec_ld(16, tmpbis);
+
+ const vec_s16 sum1A = vec_adds(tmpP0ssA, tmpP1ssA);
+ const vec_s16 sum1B = vec_adds(tmpP0ssB, tmpP1ssB);
+ const vec_s16 sum2A = vec_adds(tmpM1ssA, tmpP2ssA);
+ const vec_s16 sum2B = vec_adds(tmpM1ssB, tmpP2ssB);
+ const vec_s16 sum3A = vec_adds(tmpM2ssA, tmpP3ssA);
+ const vec_s16 sum3B = vec_adds(tmpM2ssB, tmpP3ssB);
+
+ tmpbis += tmpStride;
+
+ tmpM2ssA = tmpM1ssA;
+ tmpM2ssB = tmpM1ssB;
+ tmpM1ssA = tmpP0ssA;
+ tmpM1ssB = tmpP0ssB;
+ tmpP0ssA = tmpP1ssA;
+ tmpP0ssB = tmpP1ssB;
+ tmpP1ssA = tmpP2ssA;
+ tmpP1ssB = tmpP2ssB;
+ tmpP2ssA = tmpP3ssA;
+ tmpP2ssB = tmpP3ssB;
+
+ pp1Ae = vec_mule(sum1A, v20ss);
+ pp1Ao = vec_mulo(sum1A, v20ss);
+ pp1Be = vec_mule(sum1B, v20ss);
+ pp1Bo = vec_mulo(sum1B, v20ss);
+
+ pp2Ae = vec_mule(sum2A, v5ss);
+ pp2Ao = vec_mulo(sum2A, v5ss);
+ pp2Be = vec_mule(sum2B, v5ss);
+ pp2Bo = vec_mulo(sum2B, v5ss);
+
+ pp3Ae = vec_sra((vec_s32)sum3A, v16ui);
+ pp3Ao = vec_mulo(sum3A, v1ss);
+ pp3Be = vec_sra((vec_s32)sum3B, v16ui);
+ pp3Bo = vec_mulo(sum3B, v1ss);
+
+ pp1cAe = vec_add(pp1Ae, v512si);
+ pp1cAo = vec_add(pp1Ao, v512si);
+ pp1cBe = vec_add(pp1Be, v512si);
+ pp1cBo = vec_add(pp1Bo, v512si);
+
+ pp32Ae = vec_sub(pp3Ae, pp2Ae);
+ pp32Ao = vec_sub(pp3Ao, pp2Ao);
+ pp32Be = vec_sub(pp3Be, pp2Be);
+ pp32Bo = vec_sub(pp3Bo, pp2Bo);
+
+ sumAe = vec_add(pp1cAe, pp32Ae);
+ sumAo = vec_add(pp1cAo, pp32Ao);
+ sumBe = vec_add(pp1cBe, pp32Be);
+ sumBo = vec_add(pp1cBo, pp32Bo);
+
+ ssumAe = vec_sra(sumAe, v10ui);
+ ssumAo = vec_sra(sumAo, v10ui);
+ ssumBe = vec_sra(sumBe, v10ui);
+ ssumBo = vec_sra(sumBo, v10ui);
+
+ ssume = vec_packs(ssumAe, ssumBe);
+ ssumo = vec_packs(ssumAo, ssumBo);
+
+ sumv = vec_packsu(ssume, ssumo);
+ sum = vec_perm(sumv, sumv, mperm);
+
+ ASSERT_ALIGNED(dst);
+
+ OP_U8_ALTIVEC(fsum, sum, vec_ld(0, dst));
+
+ vec_st(fsum, 0, dst);
+
+ dst += dstStride;
+ }
+}
+#endif

libav-v10.1.tar.bz2/libavcodec/ppc/hpeldsp_altivec.c Added

@@ -0,0 +1,467 @@
+/*
+ * Copyright (c) 2002 Brian Foley
+ * Copyright (c) 2002 Dieter Shirley
+ * Copyright (c) 2003-2004 Romain Dolbeau <romain@dolbeau.org>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+
+#if HAVE_ALTIVEC_H
+#include <altivec.h>
+#endif
+
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/ppc/types_altivec.h"
+#include "libavutil/ppc/util_altivec.h"
+#include "libavcodec/hpeldsp.h"
+#include "dsputil_altivec.h"
+
+#if HAVE_ALTIVEC
+/* next one assumes that ((line_size % 16) == 0) */
+void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ register vector unsigned char pixelsv1, pixelsv2;
+ register vector unsigned char pixelsv1B, pixelsv2B;
+ register vector unsigned char pixelsv1C, pixelsv2C;
+ register vector unsigned char pixelsv1D, pixelsv2D;
+
+ register vector unsigned char perm = vec_lvsl(0, pixels);
+ int i;
+ register ptrdiff_t line_size_2 = line_size << 1;
+ register ptrdiff_t line_size_3 = line_size + line_size_2;
+ register ptrdiff_t line_size_4 = line_size << 2;
+
+// hand-unrolling the loop by 4 gains about 15%
+// mininum execution time goes from 74 to 60 cycles
+// it's faster than -funroll-loops, but using
+// -funroll-loops w/ this is bad - 74 cycles again.
+// all this is on a 7450, tuning for the 7450
+ for (i = 0; i < h; i += 4) {
+ pixelsv1 = vec_ld( 0, pixels);
+ pixelsv2 = vec_ld(15, pixels);
+ pixelsv1B = vec_ld(line_size, pixels);
+ pixelsv2B = vec_ld(15 + line_size, pixels);
+ pixelsv1C = vec_ld(line_size_2, pixels);
+ pixelsv2C = vec_ld(15 + line_size_2, pixels);
+ pixelsv1D = vec_ld(line_size_3, pixels);
+ pixelsv2D = vec_ld(15 + line_size_3, pixels);
+ vec_st(vec_perm(pixelsv1, pixelsv2, perm),
+ 0, (unsigned char*)block);
+ vec_st(vec_perm(pixelsv1B, pixelsv2B, perm),
+ line_size, (unsigned char*)block);
+ vec_st(vec_perm(pixelsv1C, pixelsv2C, perm),
+ line_size_2, (unsigned char*)block);
+ vec_st(vec_perm(pixelsv1D, pixelsv2D, perm),
+ line_size_3, (unsigned char*)block);
+ pixels+=line_size_4;
+ block +=line_size_4;
+ }
+}
+
+/* next one assumes that ((line_size % 16) == 0) */
+#define op_avg(a,b) a = ( ((a)|(b)) - ((((a)^(b))&0xFEFEFEFEUL)>>1) )
+void ff_avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ register vector unsigned char pixelsv1, pixelsv2, pixelsv, blockv;
+ register vector unsigned char perm = vec_lvsl(0, pixels);
+ int i;
+
+ for (i = 0; i < h; i++) {
+ pixelsv1 = vec_ld( 0, pixels);
+ pixelsv2 = vec_ld(16,pixels);
+ blockv = vec_ld(0, block);
+ pixelsv = vec_perm(pixelsv1, pixelsv2, perm);
+ blockv = vec_avg(blockv,pixelsv);
+ vec_st(blockv, 0, (unsigned char*)block);
+ pixels+=line_size;
+ block +=line_size;
+ }
+}
+
+/* next one assumes that ((line_size % 8) == 0) */
+static void avg_pixels8_altivec(uint8_t * block, const uint8_t * pixels, ptrdiff_t line_size, int h)
+{
+ register vector unsigned char pixelsv1, pixelsv2, pixelsv, blockv;
+ int i;
+
+ for (i = 0; i < h; i++) {
+ /* block is 8 bytes-aligned, so we're either in the
+ left block (16 bytes-aligned) or in the right block (not) */
+ int rightside = ((unsigned long)block & 0x0000000F);
+
+ blockv = vec_ld(0, block);
+ pixelsv1 = vec_ld( 0, pixels);
+ pixelsv2 = vec_ld(16, pixels);
+ pixelsv = vec_perm(pixelsv1, pixelsv2, vec_lvsl(0, pixels));
+
+ if (rightside) {
+ pixelsv = vec_perm(blockv, pixelsv, vcprm(0,1,s0,s1));
+ } else {
+ pixelsv = vec_perm(blockv, pixelsv, vcprm(s0,s1,2,3));
+ }
+
+ blockv = vec_avg(blockv, pixelsv);
+
+ vec_st(blockv, 0, block);
+
+ pixels += line_size;
+ block += line_size;
+ }
+}
+
+/* next one assumes that ((line_size % 8) == 0) */
+static void put_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ register int i;
+ register vector unsigned char pixelsv1, pixelsv2, pixelsavg;
+ register vector unsigned char blockv, temp1, temp2;
+ register vector unsigned short pixelssum1, pixelssum2, temp3;
+ register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0);
+ register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2);
+
+ temp1 = vec_ld(0, pixels);
+ temp2 = vec_ld(16, pixels);
+ pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(0, pixels));
+ if ((((unsigned long)pixels) & 0x0000000F) == 0x0000000F) {
+ pixelsv2 = temp2;
+ } else {
+ pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(1, pixels));
+ }
+ pixelsv1 = vec_mergeh(vczero, pixelsv1);
+ pixelsv2 = vec_mergeh(vczero, pixelsv2);
+ pixelssum1 = vec_add((vector unsigned short)pixelsv1,
+ (vector unsigned short)pixelsv2);
+ pixelssum1 = vec_add(pixelssum1, vctwo);
+
+ for (i = 0; i < h ; i++) {
+ int rightside = ((unsigned long)block & 0x0000000F);
+ blockv = vec_ld(0, block);
+
+ temp1 = vec_ld(line_size, pixels);
+ temp2 = vec_ld(line_size + 16, pixels);
+ pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(line_size, pixels));
+ if (((((unsigned long)pixels) + line_size) & 0x0000000F) == 0x0000000F) {
+ pixelsv2 = temp2;
+ } else {
+ pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(line_size + 1, pixels));
+ }
+
+ pixelsv1 = vec_mergeh(vczero, pixelsv1);
+ pixelsv2 = vec_mergeh(vczero, pixelsv2);
+ pixelssum2 = vec_add((vector unsigned short)pixelsv1,
+ (vector unsigned short)pixelsv2);
+ temp3 = vec_add(pixelssum1, pixelssum2);
+ temp3 = vec_sra(temp3, vctwo);
+ pixelssum1 = vec_add(pixelssum2, vctwo);
+ pixelsavg = vec_packsu(temp3, (vector unsigned short) vczero);
+
+ if (rightside) {
+ blockv = vec_perm(blockv, pixelsavg, vcprm(0, 1, s0, s1));
+ } else {
+ blockv = vec_perm(blockv, pixelsavg, vcprm(s0, s1, 2, 3));
+ }
+
+ vec_st(blockv, 0, block);
+
+ block += line_size;
+ pixels += line_size;
+ }
+}
+
+/* next one assumes that ((line_size % 8) == 0) */
+static void put_no_rnd_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ register int i;
+ register vector unsigned char pixelsv1, pixelsv2, pixelsavg;
+ register vector unsigned char blockv, temp1, temp2;
+ register vector unsigned short pixelssum1, pixelssum2, temp3;
+ register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0);
+ register const vector unsigned short vcone = (const vector unsigned short)vec_splat_u16(1);
+ register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2);
+
+ temp1 = vec_ld(0, pixels);
+ temp2 = vec_ld(16, pixels);
+ pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(0, pixels));
+ if ((((unsigned long)pixels) & 0x0000000F) == 0x0000000F) {
+ pixelsv2 = temp2;
+ } else {
+ pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(1, pixels));
+ }
+ pixelsv1 = vec_mergeh(vczero, pixelsv1);
+ pixelsv2 = vec_mergeh(vczero, pixelsv2);
+ pixelssum1 = vec_add((vector unsigned short)pixelsv1,
+ (vector unsigned short)pixelsv2);
+ pixelssum1 = vec_add(pixelssum1, vcone);
+
+ for (i = 0; i < h ; i++) {
+ int rightside = ((unsigned long)block & 0x0000000F);
+ blockv = vec_ld(0, block);
+
+ temp1 = vec_ld(line_size, pixels);
+ temp2 = vec_ld(line_size + 16, pixels);
+ pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(line_size, pixels));
+ if (((((unsigned long)pixels) + line_size) & 0x0000000F) == 0x0000000F) {
+ pixelsv2 = temp2;
+ } else {
+ pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(line_size + 1, pixels));
+ }
+
+ pixelsv1 = vec_mergeh(vczero, pixelsv1);
+ pixelsv2 = vec_mergeh(vczero, pixelsv2);
+ pixelssum2 = vec_add((vector unsigned short)pixelsv1,
+ (vector unsigned short)pixelsv2);
+ temp3 = vec_add(pixelssum1, pixelssum2);
+ temp3 = vec_sra(temp3, vctwo);
+ pixelssum1 = vec_add(pixelssum2, vcone);
+ pixelsavg = vec_packsu(temp3, (vector unsigned short) vczero);
+
+ if (rightside) {
+ blockv = vec_perm(blockv, pixelsavg, vcprm(0, 1, s0, s1));
+ } else {
+ blockv = vec_perm(blockv, pixelsavg, vcprm(s0, s1, 2, 3));
+ }
+
+ vec_st(blockv, 0, block);
+
+ block += line_size;
+ pixels += line_size;
+ }
+}
+
+/* next one assumes that ((line_size % 16) == 0) */
+static void put_pixels16_xy2_altivec(uint8_t * block, const uint8_t * pixels, ptrdiff_t line_size, int h)
+{
+ register int i;
+ register vector unsigned char pixelsv1, pixelsv2, pixelsv3, pixelsv4;
+ register vector unsigned char blockv, temp1, temp2;
+ register vector unsigned short temp3, temp4,
+ pixelssum1, pixelssum2, pixelssum3, pixelssum4;
+ register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0);
+ register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2);
+
+ temp1 = vec_ld(0, pixels);
+ temp2 = vec_ld(16, pixels);
+ pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(0, pixels));
+ if ((((unsigned long)pixels) & 0x0000000F) == 0x0000000F) {
+ pixelsv2 = temp2;
+ } else {
+ pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(1, pixels));
+ }
+ pixelsv3 = vec_mergel(vczero, pixelsv1);
+ pixelsv4 = vec_mergel(vczero, pixelsv2);
+ pixelsv1 = vec_mergeh(vczero, pixelsv1);
+ pixelsv2 = vec_mergeh(vczero, pixelsv2);
+ pixelssum3 = vec_add((vector unsigned short)pixelsv3,
+ (vector unsigned short)pixelsv4);
+ pixelssum3 = vec_add(pixelssum3, vctwo);
+ pixelssum1 = vec_add((vector unsigned short)pixelsv1,
+ (vector unsigned short)pixelsv2);
+ pixelssum1 = vec_add(pixelssum1, vctwo);
+
+ for (i = 0; i < h ; i++) {
+ blockv = vec_ld(0, block);
+
+ temp1 = vec_ld(line_size, pixels);
+ temp2 = vec_ld(line_size + 16, pixels);
+ pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(line_size, pixels));
+ if (((((unsigned long)pixels) + line_size) & 0x0000000F) == 0x0000000F) {
+ pixelsv2 = temp2;
+ } else {
+ pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(line_size + 1, pixels));
+ }
+
+ pixelsv3 = vec_mergel(vczero, pixelsv1);
+ pixelsv4 = vec_mergel(vczero, pixelsv2);
+ pixelsv1 = vec_mergeh(vczero, pixelsv1);
+ pixelsv2 = vec_mergeh(vczero, pixelsv2);
+
+ pixelssum4 = vec_add((vector unsigned short)pixelsv3,
+ (vector unsigned short)pixelsv4);
+ pixelssum2 = vec_add((vector unsigned short)pixelsv1,
+ (vector unsigned short)pixelsv2);
+ temp4 = vec_add(pixelssum3, pixelssum4);
+ temp4 = vec_sra(temp4, vctwo);
+ temp3 = vec_add(pixelssum1, pixelssum2);
+ temp3 = vec_sra(temp3, vctwo);
+
+ pixelssum3 = vec_add(pixelssum4, vctwo);
+ pixelssum1 = vec_add(pixelssum2, vctwo);
+
+ blockv = vec_packsu(temp3, temp4);
+
+ vec_st(blockv, 0, block);
+
+ block += line_size;
+ pixels += line_size;
+ }
+}
+
+/* next one assumes that ((line_size % 16) == 0) */
+static void put_no_rnd_pixels16_xy2_altivec(uint8_t * block, const uint8_t * pixels, ptrdiff_t line_size, int h)
+{
+ register int i;
+ register vector unsigned char pixelsv1, pixelsv2, pixelsv3, pixelsv4;
+ register vector unsigned char blockv, temp1, temp2;
+ register vector unsigned short temp3, temp4,
+ pixelssum1, pixelssum2, pixelssum3, pixelssum4;
+ register const vector unsigned char vczero = (const vector unsigned char)vec_splat_u8(0);
+ register const vector unsigned short vcone = (const vector unsigned short)vec_splat_u16(1);
+ register const vector unsigned short vctwo = (const vector unsigned short)vec_splat_u16(2);
+
+ temp1 = vec_ld(0, pixels);
+ temp2 = vec_ld(16, pixels);
+ pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(0, pixels));
+ if ((((unsigned long)pixels) & 0x0000000F) == 0x0000000F) {
+ pixelsv2 = temp2;
+ } else {
+ pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(1, pixels));
+ }
+ pixelsv3 = vec_mergel(vczero, pixelsv1);
+ pixelsv4 = vec_mergel(vczero, pixelsv2);
+ pixelsv1 = vec_mergeh(vczero, pixelsv1);
+ pixelsv2 = vec_mergeh(vczero, pixelsv2);
+ pixelssum3 = vec_add((vector unsigned short)pixelsv3,
+ (vector unsigned short)pixelsv4);
+ pixelssum3 = vec_add(pixelssum3, vcone);
+ pixelssum1 = vec_add((vector unsigned short)pixelsv1,
+ (vector unsigned short)pixelsv2);
+ pixelssum1 = vec_add(pixelssum1, vcone);
+
+ for (i = 0; i < h ; i++) {
+ blockv = vec_ld(0, block);
+
+ temp1 = vec_ld(line_size, pixels);
+ temp2 = vec_ld(line_size + 16, pixels);
+ pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(line_size, pixels));
+ if (((((unsigned long)pixels) + line_size) & 0x0000000F) == 0x0000000F) {
+ pixelsv2 = temp2;
+ } else {
+ pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(line_size + 1, pixels));
+ }
+
+ pixelsv3 = vec_mergel(vczero, pixelsv1);
+ pixelsv4 = vec_mergel(vczero, pixelsv2);
+ pixelsv1 = vec_mergeh(vczero, pixelsv1);
+ pixelsv2 = vec_mergeh(vczero, pixelsv2);
+
+ pixelssum4 = vec_add((vector unsigned short)pixelsv3,
+ (vector unsigned short)pixelsv4);
+ pixelssum2 = vec_add((vector unsigned short)pixelsv1,
+ (vector unsigned short)pixelsv2);
+ temp4 = vec_add(pixelssum3, pixelssum4);
+ temp4 = vec_sra(temp4, vctwo);
+ temp3 = vec_add(pixelssum1, pixelssum2);
+ temp3 = vec_sra(temp3, vctwo);
+
+ pixelssum3 = vec_add(pixelssum4, vcone);
+ pixelssum1 = vec_add(pixelssum2, vcone);
+
+ blockv = vec_packsu(temp3, temp4);
+
+ vec_st(blockv, 0, block);
+
+ block += line_size;
+ pixels += line_size;
+ }
+}
+
+/* next one assumes that ((line_size % 8) == 0) */
+static void avg_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ register int i;
+ register vector unsigned char pixelsv1, pixelsv2, pixelsavg;
+ register vector unsigned char blockv, temp1, temp2, blocktemp;
+ register vector unsigned short pixelssum1, pixelssum2, temp3;
+
+ register const vector unsigned char vczero = (const vector unsigned char)
+ vec_splat_u8(0);
+ register const vector unsigned short vctwo = (const vector unsigned short)
+ vec_splat_u16(2);
+
+ temp1 = vec_ld(0, pixels);
+ temp2 = vec_ld(16, pixels);
+ pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(0, pixels));
+ if ((((unsigned long)pixels) & 0x0000000F) == 0x0000000F) {
+ pixelsv2 = temp2;
+ } else {
+ pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(1, pixels));
+ }
+ pixelsv1 = vec_mergeh(vczero, pixelsv1);
+ pixelsv2 = vec_mergeh(vczero, pixelsv2);
+ pixelssum1 = vec_add((vector unsigned short)pixelsv1,
+ (vector unsigned short)pixelsv2);
+ pixelssum1 = vec_add(pixelssum1, vctwo);
+
+ for (i = 0; i < h ; i++) {
+ int rightside = ((unsigned long)block & 0x0000000F);
+ blockv = vec_ld(0, block);
+
+ temp1 = vec_ld(line_size, pixels);
+ temp2 = vec_ld(line_size + 16, pixels);
+ pixelsv1 = vec_perm(temp1, temp2, vec_lvsl(line_size, pixels));
+ if (((((unsigned long)pixels) + line_size) & 0x0000000F) == 0x0000000F) {
+ pixelsv2 = temp2;
+ } else {
+ pixelsv2 = vec_perm(temp1, temp2, vec_lvsl(line_size + 1, pixels));
+ }
+
+ pixelsv1 = vec_mergeh(vczero, pixelsv1);
+ pixelsv2 = vec_mergeh(vczero, pixelsv2);
+ pixelssum2 = vec_add((vector unsigned short)pixelsv1,
+ (vector unsigned short)pixelsv2);
+ temp3 = vec_add(pixelssum1, pixelssum2);
+ temp3 = vec_sra(temp3, vctwo);
+ pixelssum1 = vec_add(pixelssum2, vctwo);
+ pixelsavg = vec_packsu(temp3, (vector unsigned short) vczero);
+
+ if (rightside) {
+ blocktemp = vec_perm(blockv, pixelsavg, vcprm(0, 1, s0, s1));
+ } else {
+ blocktemp = vec_perm(blockv, pixelsavg, vcprm(s0, s1, 2, 3));
+ }
+
+ blockv = vec_avg(blocktemp, blockv);
+ vec_st(blockv, 0, block);
+
+ block += line_size;
+ pixels += line_size;
+ }
+}
+#endif /* HAVE_ALTIVEC */
+
+av_cold void ff_hpeldsp_init_ppc(HpelDSPContext *c, int flags)
+{
+#if HAVE_ALTIVEC
+ if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
+ return;
+
+ c->avg_pixels_tab[0][0] = ff_avg_pixels16_altivec;
+ c->avg_pixels_tab[1][0] = avg_pixels8_altivec;
+ c->avg_pixels_tab[1][3] = avg_pixels8_xy2_altivec;
+
+ c->put_pixels_tab[0][0] = ff_put_pixels16_altivec;
+ c->put_pixels_tab[1][3] = put_pixels8_xy2_altivec;
+ c->put_pixels_tab[0][3] = put_pixels16_xy2_altivec;
+
+ c->put_no_rnd_pixels_tab[0][0] = ff_put_pixels16_altivec;
+ c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_altivec;
+ c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_altivec;
+#endif /* HAVE_ALTIVEC */
+}

libav-v9.6.tar.bz2/libavcodec/ppc/idct_altivec.c -> libav-v10.1.tar.bz2/libavcodec/ppc/idct_altivec.c Changed

libav-v9.6.tar.bz2/libavcodec/ppc/int_altivec.c -> libav-v10.1.tar.bz2/libavcodec/ppc/int_altivec.c Changed

@@ -28,6 +28,7 @@
 #include <altivec.h>
 #endif
 
+#include "libavutil/attributes.h"
 #include "libavutil/ppc/types_altivec.h"
 #include "libavcodec/dsputil.h"
 
@@ -83,14 +84,12 @@
 {
 int i;
 LOAD_ZERO;
- const vec_s16 *pv;
 register vec_s16 vec1;
 register vec_s32 res = vec_splat_s32(0), t;
 int32_t ires;
 
 for(i = 0; i < order; i += 8){
- pv = (const vec_s16*)v1;
- vec1 = vec_perm(pv[0], pv[1], vec_lvsl(0, v1));
+ vec1 = vec_unaligned_load(v1);
 t = vec_msum(vec1, vec_ld(0, v2), zero_s32v);
 res = vec_sums(t, res);
 v1 += 8;
@@ -128,15 +127,15 @@
 pv1[0] = vec_mladd(t0, muls, i0);
 pv1[1] = vec_mladd(t1, muls, i1);
 pv1 += 2;
- v2 += 8;
- v3 += 8;
+ v2 += 16;
+ v3 += 16;
 } while(--order);
 res = vec_splat(vec_sums(res, zero_s32v), 3);
 vec_ste(res, 0, &ires);
 return ires;
 }
 
-void ff_int_init_altivec(DSPContext* c, AVCodecContext *avctx)
+av_cold void ff_int_init_altivec(DSPContext *c, AVCodecContext *avctx)
 {
 c->ssd_int8_vs_int16 = ssd_int8_vs_int16_altivec;
 c->scalarproduct_int16 = scalarproduct_int16_altivec;

libav-v10.1.tar.bz2/libavcodec/ppc/mpegaudiodsp_altivec.c Added

@@ -0,0 +1,141 @@
+/*
+ * Altivec optimized MP3 decoding functions
+ * Copyright (c) 2010 Vitor Sessak
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/internal.h"
+#include "libavutil/ppc/util_altivec.h"
+#include "libavcodec/mpegaudiodsp.h"
+#include "dsputil_altivec.h"
+
+#if HAVE_ALTIVEC
+
+#define MACS(rt, ra, rb) rt+=(ra)*(rb)
+#define MLSS(rt, ra, rb) rt-=(ra)*(rb)
+
+#define SUM8(op, sum, w, p) \
+{ \
+ op(sum, (w)[0 * 64], (p)[0 * 64]); \
+ op(sum, (w)[1 * 64], (p)[1 * 64]); \
+ op(sum, (w)[2 * 64], (p)[2 * 64]); \
+ op(sum, (w)[3 * 64], (p)[3 * 64]); \
+ op(sum, (w)[4 * 64], (p)[4 * 64]); \
+ op(sum, (w)[5 * 64], (p)[5 * 64]); \
+ op(sum, (w)[6 * 64], (p)[6 * 64]); \
+ op(sum, (w)[7 * 64], (p)[7 * 64]); \
+}
+
+static void apply_window(const float *buf, const float *win1,
+ const float *win2, float *sum1, float *sum2, int len)
+{
+ const vector float *win1a = (const vector float *) win1;
+ const vector float *win2a = (const vector float *) win2;
+ const vector float *bufa = (const vector float *) buf;
+ vector float *sum1a = (vector float *) sum1;
+ vector float *sum2a = (vector float *) sum2;
+ vector float av_uninit(v0), av_uninit(v4);
+ vector float v1, v2, v3;
+
+ len = len >> 2;
+
+#define MULT(a, b) \
+ { \
+ v1 = vec_ld(a, win1a); \
+ v2 = vec_ld(b, win2a); \
+ v3 = vec_ld(a, bufa); \
+ v0 = vec_madd(v3, v1, v0); \
+ v4 = vec_madd(v2, v3, v4); \
+ }
+
+ while (len--) {
+ v0 = vec_xor(v0, v0);
+ v4 = vec_xor(v4, v4);
+
+ MULT( 0, 0);
+ MULT( 256, 64);
+ MULT( 512, 128);
+ MULT( 768, 192);
+ MULT(1024, 256);
+ MULT(1280, 320);
+ MULT(1536, 384);
+ MULT(1792, 448);
+
+ vec_st(v0, 0, sum1a);
+ vec_st(v4, 0, sum2a);
+ sum1a++;
+ sum2a++;
+ win1a++;
+ win2a++;
+ bufa++;
+ }
+}
+
+static void apply_window_mp3(float *in, float *win, int *unused, float *out,
+ int incr)
+{
+ LOCAL_ALIGNED_16(float, suma, [17]);
+ LOCAL_ALIGNED_16(float, sumb, [17]);
+ LOCAL_ALIGNED_16(float, sumc, [17]);
+ LOCAL_ALIGNED_16(float, sumd, [17]);
+
+ float sum;
+ int j;
+ float *out2 = out + 32 * incr;
+
+ /* copy to avoid wrap */
+ memcpy(in + 512, in, 32 * sizeof(*in));
+
+ apply_window(in + 16, win , win + 512, suma, sumc, 16);
+ apply_window(in + 32, win + 48, win + 640, sumb, sumd, 16);
+
+ SUM8(MLSS, suma[0], win + 32, in + 48);
+
+ sumc[ 0] = 0;
+ sumb[16] = 0;
+ sumd[16] = 0;
+
+ out[0 ] = suma[ 0];
+ out += incr;
+ out2 -= incr;
+ for(j=1;j<16;j++) {
+ *out = suma[ j] - sumd[16-j];
+ *out2 = -sumb[16-j] - sumc[ j];
+ out += incr;
+ out2 -= incr;
+ }
+
+ sum = 0;
+ SUM8(MLSS, sum, win + 16 + 32, in + 32);
+ *out = sum;
+}
+
+#endif /* HAVE_ALTIVEC */
+
+av_cold void ff_mpadsp_init_ppc(MPADSPContext *s)
+{
+#if HAVE_ALTIVEC
+ if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
+ return;
+
+ s->apply_window_float = apply_window_mp3;
+#endif /* HAVE_ALTIVEC */
+}

libav-v9.6.tar.bz2/libavcodec/ppc/mpegvideo_altivec.c -> libav-v10.1.tar.bz2/libavcodec/ppc/mpegvideo_altivec.c Changed

@@ -24,18 +24,20 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include "config.h"
+#include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/mpegvideo.h"
-
 #include "dsputil_altivec.h"
 
+#if HAVE_ALTIVEC
+
 /* AltiVec version of dct_unquantize_h263
 this code assumes `block' is 16 bytes-aligned */
 static void dct_unquantize_h263_altivec(MpegEncContext *s,
- DCTELEM *block, int n, int qscale)
+ int16_t *block, int n, int qscale)
 {
 int i, level, qmul, qadd;
 int nCoeffs;
@@ -111,14 +113,18 @@
 }
 }
 
+#endif /* HAVE_ALTIVEC */
 
-void ff_MPV_common_init_altivec(MpegEncContext *s)
+av_cold void ff_MPV_common_init_ppc(MpegEncContext *s)
 {
- if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) return;
+#if HAVE_ALTIVEC
+ if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
+ return;
 
 if ((s->avctx->dct_algo == FF_DCT_AUTO) ||
- (s->avctx->dct_algo == FF_DCT_ALTIVEC)) {
+ (s->avctx->dct_algo == FF_DCT_ALTIVEC)) {
 s->dct_unquantize_h263_intra = dct_unquantize_h263_altivec;
 s->dct_unquantize_h263_inter = dct_unquantize_h263_altivec;
 }
+#endif /* HAVE_ALTIVEC */
 }

libav-v9.6.tar.bz2/libavcodec/ppc/vc1dsp_altivec.c -> libav-v10.1.tar.bz2/libavcodec/ppc/vc1dsp_altivec.c Changed

@@ -19,11 +19,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
+#include "libavutil/attributes.h"
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/vc1dsp.h"
 
+#if HAVE_ALTIVEC
+
 // main steps of 8x8 transform
 #define STEP8(s0, s1, s2, s3, s4, s5, s6, s7, vec_rnd) \
 do { \
@@ -129,7 +132,7 @@
 
 /** Do inverse transform on 8x8 block
 */
-static void vc1_inv_trans_8x8_altivec(DCTELEM block[64])
+static void vc1_inv_trans_8x8_altivec(int16_t block[64])
 {
     vector signed short src0, src1, src2, src3, src4, src5, src6, src7;
     vector signed int s0, s1, s2, s3, s4, s5, s6, s7;
@@ -224,7 +227,7 @@
 
 /** Do inverse transform on 8x4 part of block
 */
-static void vc1_inv_trans_8x4_altivec(uint8_t *dest, int stride, DCTELEM *block)
+static void vc1_inv_trans_8x4_altivec(uint8_t *dest, int stride, int16_t *block)
 {
     vector signed short src0, src1, src2, src3, src4, src5, src6, src7;
     vector signed int s0, s1, s2, s3, s4, s5, s6, s7;
@@ -325,18 +328,21 @@
 
 #define OP_U8_ALTIVEC                          PUT_OP_U8_ALTIVEC
 #define PREFIX_no_rnd_vc1_chroma_mc8_altivec   put_no_rnd_vc1_chroma_mc8_altivec
-#include "h264_altivec_template.c"
+#include "h264chroma_template.c"
 #undef OP_U8_ALTIVEC
 #undef PREFIX_no_rnd_vc1_chroma_mc8_altivec
 
 #define OP_U8_ALTIVEC                          AVG_OP_U8_ALTIVEC
 #define PREFIX_no_rnd_vc1_chroma_mc8_altivec   avg_no_rnd_vc1_chroma_mc8_altivec
-#include "h264_altivec_template.c"
+#include "h264chroma_template.c"
 #undef OP_U8_ALTIVEC
 #undef PREFIX_no_rnd_vc1_chroma_mc8_altivec
 
-void ff_vc1dsp_init_altivec(VC1DSPContext* dsp)
+#endif /* HAVE_ALTIVEC */
+
+av_cold void ff_vc1dsp_init_ppc(VC1DSPContext *dsp)
 {
+#if HAVE_ALTIVEC
     if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
         return;
 
@@ -344,4 +350,5 @@
     dsp->vc1_inv_trans_8x4 = vc1_inv_trans_8x4_altivec;
     dsp->put_no_rnd_vc1_chroma_pixels_tab[0] = put_no_rnd_vc1_chroma_mc8_altivec;
     dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = avg_no_rnd_vc1_chroma_mc8_altivec;
+#endif /* HAVE_ALTIVEC */
 }

libav-v9.6.tar.bz2/libavcodec/ppc/videodsp_ppc.c -> libav-v10.1.tar.bz2/libavcodec/ppc/videodsp_ppc.c Changed

libav-v10.1.tar.bz2/libavcodec/ppc/vorbisdsp_altivec.c Added

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2006 Luca Barbato <lu_zero@gentoo.org>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#if HAVE_ALTIVEC_H
+#include <altivec.h>
+#endif
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavcodec/vorbisdsp.h"
+
+#if HAVE_ALTIVEC
+static void vorbis_inverse_coupling_altivec(float *mag, float *ang,
+ intptr_t blocksize)
+{
+ int i;
+ vector float m, a;
+ vector bool int t0, t1;
+ const vector unsigned int v_31 = //XXX
+ vec_add(vec_add(vec_splat_u32(15),vec_splat_u32(15)),vec_splat_u32(1));
+ for (i = 0; i < blocksize; i += 4) {
+ m = vec_ld(0, mag+i);
+ a = vec_ld(0, ang+i);
+ t0 = vec_cmple(m, (vector float)vec_splat_u32(0));
+ t1 = vec_cmple(a, (vector float)vec_splat_u32(0));
+ a = vec_xor(a, (vector float) vec_sl((vector unsigned int)t0, v_31));
+ t0 = (vector bool int)vec_and(a, t1);
+ t1 = (vector bool int)vec_andc(a, t1);
+ a = vec_sub(m, (vector float)t1);
+ m = vec_add(m, (vector float)t0);
+ vec_stl(a, 0, ang+i);
+ vec_stl(m, 0, mag+i);
+ }
+}
+#endif /* HAVE_ALTIVEC */
+
+av_cold void ff_vorbisdsp_init_ppc(VorbisDSPContext *c)
+{
+#if HAVE_ALTIVEC
+ if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
+ return;
+
+ c->vorbis_inverse_coupling = vorbis_inverse_coupling_altivec;
+#endif /* HAVE_ALTIVEC */
+}

libav-v9.6.tar.bz2/libavcodec/ppc/vp3dsp_altivec.c -> libav-v10.1.tar.bz2/libavcodec/ppc/vp3dsp_altivec.c Changed

@@ -18,18 +18,18 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include <string.h>
+
 #include "config.h"
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
-#include "libavcodec/vp3dsp.h"
-
-#if HAVE_ALTIVEC
-
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
-#include "libavcodec/dsputil.h"
+#include "libavcodec/vp3dsp.h"
 #include "dsputil_altivec.h"
 
+#if HAVE_ALTIVEC
+
 static const vec_s16 constants =
 {0, 64277, 60547, 54491, 46341, 36410, 25080, 12785};
 static const vec_u8 interleave_high =
@@ -114,7 +114,7 @@
 #define ADD8(a) vec_add(a, eight)
 #define SHIFT4(a) vec_sra(a, four)
 
-static void vp3_idct_put_altivec(uint8_t *dst, int stride, DCTELEM block[64])
+static void vp3_idct_put_altivec(uint8_t *dst, int stride, int16_t block[64])
 {
 vec_u8 t;
 IDCT_START
@@ -140,9 +140,10 @@
 PUT(b5) dst += stride;
 PUT(b6) dst += stride;
 PUT(b7)
+ memset(block, 0, sizeof(*block) * 64);
 }
 
-static void vp3_idct_add_altivec(uint8_t *dst, int stride, DCTELEM block[64])
+static void vp3_idct_add_altivec(uint8_t *dst, int stride, int16_t block[64])
 {
 LOAD_ZERO;
 vec_u8 t, vdst;
@@ -171,6 +172,7 @@
 ADD(b5) dst += stride;
 ADD(b6) dst += stride;
 ADD(b7)
+ memset(block, 0, sizeof(*block) * 64);
 }
 
 #endif /* HAVE_ALTIVEC */
@@ -178,10 +180,10 @@
 av_cold void ff_vp3dsp_init_ppc(VP3DSPContext *c, int flags)
 {
 #if HAVE_ALTIVEC
- if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) {
- c->idct_put = vp3_idct_put_altivec;
- c->idct_add = vp3_idct_add_altivec;
- c->idct_perm = FF_TRANSPOSE_IDCT_PERM;
- }
+ if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
+ return;
+
+ c->idct_put = vp3_idct_put_altivec;
+ c->idct_add = vp3_idct_add_altivec;
 #endif
 }

libav-v9.6.tar.bz2/libavcodec/ppc/vp8dsp_altivec.c -> libav-v10.1.tar.bz2/libavcodec/ppc/vp8dsp_altivec.c Changed

@@ -20,6 +20,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "config.h"
 #include "libavutil/cpu.h"
 #include "libavutil/mem.h"
 #include "libavutil/ppc/types_altivec.h"
@@ -27,6 +28,7 @@
 #include "libavcodec/vp8dsp.h"
 #include "dsputil_altivec.h"
 
+#if HAVE_ALTIVEC
 #define REPT4(...) { __VA_ARGS__, __VA_ARGS__, __VA_ARGS__, __VA_ARGS__ }
 
 // h subpel filter uses msum to multiply+add 4 pixel taps at once
@@ -239,15 +241,15 @@
 }
 
 #define EPEL_HV(WIDTH, HTAPS, VTAPS) \
-static void put_vp8_epel ## WIDTH ## _h ## HTAPS ## v ## VTAPS ## _altivec(uint8_t *dst, ptrdiff_t stride, uint8_t *src, ptrdiff_t s, int h, int mx, int my) \
+static void put_vp8_epel ## WIDTH ## _h ## HTAPS ## v ## VTAPS ## _altivec(uint8_t *dst, ptrdiff_t dstride, uint8_t *src, ptrdiff_t sstride, int h, int mx, int my) \
 { \
 DECLARE_ALIGNED(16, uint8_t, tmp)[(2*WIDTH+5)*16]; \
 if (VTAPS == 6) { \
- put_vp8_epel ## WIDTH ## _h ## HTAPS ## _altivec(tmp, 16, src-2*stride, stride, h+5, mx, my); \
- put_vp8_epel ## WIDTH ## _v ## VTAPS ## _altivec(dst, stride, tmp+2*16, 16, h, mx, my); \
+ put_vp8_epel ## WIDTH ## _h ## HTAPS ## _altivec(tmp, 16, src-2*sstride, sstride, h+5, mx, my); \
+ put_vp8_epel ## WIDTH ## _v ## VTAPS ## _altivec(dst, dstride, tmp+2*16, 16, h, mx, my); \
 } else { \
- put_vp8_epel ## WIDTH ## _h ## HTAPS ## _altivec(tmp, 16, src-stride, stride, h+4, mx, my); \
- put_vp8_epel ## WIDTH ## _v ## VTAPS ## _altivec(dst, stride, tmp+16, 16, h, mx, my); \
+ put_vp8_epel ## WIDTH ## _h ## HTAPS ## _altivec(tmp, 16, src-sstride, sstride, h+4, mx, my); \
+ put_vp8_epel ## WIDTH ## _v ## VTAPS ## _altivec(dst, dstride, tmp+16, 16, h, mx, my); \
 } \
 }
 
@@ -267,13 +269,51 @@
 EPEL_HV(4, 6,4)
 EPEL_HV(4, 4,4)
 
-static void put_vp8_pixels16_altivec(uint8_t *dst, ptrdiff_t stride, uint8_t *src, ptrdiff_t s, int h, int mx, int my)
+static void put_vp8_pixels16_altivec(uint8_t *dst, ptrdiff_t dstride, uint8_t *src, ptrdiff_t sstride, int h, int mx, int my)
 {
- ff_put_pixels16_altivec(dst, src, stride, h);
+ register vector unsigned char pixelsv1, pixelsv2;
+ register vector unsigned char pixelsv1B, pixelsv2B;
+ register vector unsigned char pixelsv1C, pixelsv2C;
+ register vector unsigned char pixelsv1D, pixelsv2D;
+
+ register vector unsigned char perm = vec_lvsl(0, src);
+ int i;
+ register ptrdiff_t dstride2 = dstride << 1, sstride2 = sstride << 1;
+ register ptrdiff_t dstride3 = dstride2 + dstride, sstride3 = sstride + sstride2;
+ register ptrdiff_t dstride4 = dstride << 2, sstride4 = sstride << 2;
+
+// hand-unrolling the loop by 4 gains about 15%
+// mininum execution time goes from 74 to 60 cycles
+// it's faster than -funroll-loops, but using
+// -funroll-loops w/ this is bad - 74 cycles again.
+// all this is on a 7450, tuning for the 7450
+ for (i = 0; i < h; i += 4) {
+ pixelsv1 = vec_ld( 0, src);
+ pixelsv2 = vec_ld(15, src);
+ pixelsv1B = vec_ld(sstride, src);
+ pixelsv2B = vec_ld(15 + sstride, src);
+ pixelsv1C = vec_ld(sstride2, src);
+ pixelsv2C = vec_ld(15 + sstride2, src);
+ pixelsv1D = vec_ld(sstride3, src);
+ pixelsv2D = vec_ld(15 + sstride3, src);
+ vec_st(vec_perm(pixelsv1, pixelsv2, perm),
+ 0, (unsigned char*)dst);
+ vec_st(vec_perm(pixelsv1B, pixelsv2B, perm),
+ dstride, (unsigned char*)dst);
+ vec_st(vec_perm(pixelsv1C, pixelsv2C, perm),
+ dstride2, (unsigned char*)dst);
+ vec_st(vec_perm(pixelsv1D, pixelsv2D, perm),
+ dstride3, (unsigned char*)dst);
+ src += sstride4;
+ dst += dstride4;
+ }
 }
 
-av_cold void ff_vp8dsp_init_altivec(VP8DSPContext *c)
+#endif /* HAVE_ALTIVEC */
+
+av_cold void ff_vp8dsp_init_ppc(VP8DSPContext *c)
 {
+#if HAVE_ALTIVEC
 if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
 return;
 
@@ -301,4 +341,5 @@
 c->put_vp8_epel_pixels_tab[2][1][1] = put_vp8_epel4_h4v4_altivec;
 c->put_vp8_epel_pixels_tab[2][1][2] = put_vp8_epel4_h6v4_altivec;
 c->put_vp8_epel_pixels_tab[2][2][1] = put_vp8_epel4_h4v6_altivec;
+#endif /* HAVE_ALTIVEC */
 }

libav-v9.6.tar.bz2/libavcodec/proresdec.c -> libav-v10.1.tar.bz2/libavcodec/proresdec.c Changed

@@ -34,6 +34,7 @@
 
 #include "libavutil/intmath.h"
 #include "avcodec.h"
+#include "dsputil.h"
 #include "internal.h"
 #include "proresdata.h"
 #include "proresdsp.h"
@@ -45,14 +46,14 @@
 int x_pos, y_pos;
 int slice_width;
 int prev_slice_sf; ///< scalefactor of the previous decoded slice
- DECLARE_ALIGNED(16, DCTELEM, blocks)[8 * 4 * 64];
+ DECLARE_ALIGNED(16, int16_t, blocks)[8 * 4 * 64];
 DECLARE_ALIGNED(16, int16_t, qmat_luma_scaled)[64];
 DECLARE_ALIGNED(16, int16_t, qmat_chroma_scaled)[64];
 } ProresThreadData;
 
 typedef struct {
 ProresDSPContext dsp;
- AVFrame picture;
+ AVFrame *frame;
 ScanTable scantable;
 int scantable_type; ///< -1 = uninitialized, 0 = progressive, 1/2 = interlaced
 
@@ -87,11 +88,6 @@
 avctx->bits_per_raw_sample = PRORES_BITS_PER_SAMPLE;
 ff_proresdsp_init(&ctx->dsp);
 
- avctx->coded_frame = &ctx->picture;
- avcodec_get_frame_defaults(&ctx->picture);
- ctx->picture.type = AV_PICTURE_TYPE_I;
- ctx->picture.key_frame = 1;
-
 ctx->scantable_type = -1; // set scantable type to uninitialized
 memset(ctx->qmat_luma, 4, 64);
 memset(ctx->qmat_chroma, 4, 64);
@@ -138,12 +134,21 @@
 ctx->chroma_factor = (buf[12] >> 6) & 3;
 ctx->mb_chroma_factor = ctx->chroma_factor + 2;
 ctx->num_chroma_blocks = (1 << ctx->chroma_factor) >> 1;
+ ctx->alpha_info = buf[17] & 0xf;
+
+ if (ctx->alpha_info > 2) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid alpha mode %d\n", ctx->alpha_info);
+ return AVERROR_INVALIDDATA;
+ }
+
 switch (ctx->chroma_factor) {
 case 2:
- avctx->pix_fmt = AV_PIX_FMT_YUV422P10;
+ avctx->pix_fmt = ctx->alpha_info ? AV_PIX_FMT_YUVA422P10
+ : AV_PIX_FMT_YUV422P10;
 break;
 case 3:
- avctx->pix_fmt = AV_PIX_FMT_YUV444P10;
+ avctx->pix_fmt = ctx->alpha_info ? AV_PIX_FMT_YUVA444P10
+ : AV_PIX_FMT_YUV444P10;
 break;
 default:
 av_log(avctx, AV_LOG_ERROR,
@@ -162,20 +167,16 @@
 }
 
 if (ctx->frame_type) { /* if interlaced */
- ctx->picture.interlaced_frame = 1;
- ctx->picture.top_field_first = ctx->frame_type & 1;
+ ctx->frame->interlaced_frame = 1;
+ ctx->frame->top_field_first = ctx->frame_type & 1;
 } else {
- ctx->picture.interlaced_frame = 0;
+ ctx->frame->interlaced_frame = 0;
 }
 
 avctx->color_primaries = buf[14];
 avctx->color_trc = buf[15];
 avctx->colorspace = buf[16];
 
- ctx->alpha_info = buf[17] & 0xf;
- if (ctx->alpha_info)
- av_log_missing_feature(avctx, "Alpha channel", 0);
-
 ctx->qmat_changed = 0;
 ptr = buf + 20;
 flags = buf[19];
@@ -246,8 +247,8 @@
 
 ctx->num_x_mbs = (avctx->width + 15) >> 4;
 ctx->num_y_mbs = (avctx->height +
- (1 << (4 + ctx->picture.interlaced_frame)) - 1) >>
- (4 + ctx->picture.interlaced_frame);
+ (1 << (4 + ctx->frame->interlaced_frame)) - 1) >>
+ (4 + ctx->frame->interlaced_frame);
 
 remainder = ctx->num_x_mbs & ((1 << slice_width_factor) - 1);
 num_x_slices = (ctx->num_x_mbs >> slice_width_factor) + (remainder & 1) +
@@ -340,10 +341,10 @@
 /**
 * Decode DC coefficients for all blocks in a slice.
 */
-static inline void decode_dc_coeffs(GetBitContext *gb, DCTELEM *out,
+static inline void decode_dc_coeffs(GetBitContext *gb, int16_t *out,
 int nblocks)
 {
- DCTELEM prev_dc;
+ int16_t prev_dc;
 int i, sign;
 int16_t delta;
 unsigned int code;
@@ -368,10 +369,10 @@
 /**
 * Decode AC coefficients for all blocks in a slice.
 */
-static inline void decode_ac_coeffs(GetBitContext *gb, DCTELEM *out,
- int blocks_per_slice,
- int plane_size_factor,
- const uint8_t *scan)
+static inline int decode_ac_coeffs(GetBitContext *gb, int16_t *out,
+ int blocks_per_slice,
+ int plane_size_factor,
+ const uint8_t *scan)
 {
 int pos, block_mask, run, level, sign, run_cb_index, lev_cb_index;
 int max_coeffs, bits_left;
@@ -389,15 +390,19 @@
 
 bits_left = get_bits_left(gb);
 if (bits_left <= 0 || (bits_left <= 8 && !show_bits(gb, bits_left)))
- return;
+ return 0;
 
 run = decode_vlc_codeword(gb, ff_prores_ac_codebook[run_cb_index]);
+ if (run < 0)
+ return AVERROR_INVALIDDATA;
 
 bits_left = get_bits_left(gb);
 if (bits_left <= 0 || (bits_left <= 8 && !show_bits(gb, bits_left)))
- return;
+ return AVERROR_INVALIDDATA;
 
 level = decode_vlc_codeword(gb, ff_prores_ac_codebook[lev_cb_index]) + 1;
+ if (level < 0)
+ return AVERROR_INVALIDDATA;
 
 pos += run + 1;
 if (pos >= max_coeffs)
@@ -407,22 +412,24 @@
 out[((pos & block_mask) << 6) + scan[pos >> plane_size_factor]] =
 (level ^ sign) - sign;
 }
+
+ return 0;
 }
 
 
 /**
 * Decode a slice plane (luma or chroma).
 */
-static void decode_slice_plane(ProresContext *ctx, ProresThreadData *td,
- const uint8_t *buf,
- int data_size, uint16_t *out_ptr,
- int linesize, int mbs_per_slice,
- int blocks_per_mb, int plane_size_factor,
- const int16_t *qmat, int is_chroma)
+static int decode_slice_plane(ProresContext *ctx, ProresThreadData *td,
+ const uint8_t *buf,
+ int data_size, uint16_t *out_ptr,
+ int linesize, int mbs_per_slice,
+ int blocks_per_mb, int plane_size_factor,
+ const int16_t *qmat, int is_chroma)
 {
 GetBitContext gb;
- DCTELEM *block_ptr;
- int mb_num, blocks_per_slice;
+ int16_t *block_ptr;
+ int mb_num, blocks_per_slice, ret;
 
 blocks_per_slice = mbs_per_slice * blocks_per_mb;
 
@@ -432,8 +439,10 @@
 
 decode_dc_coeffs(&gb, td->blocks, blocks_per_slice);
 
- decode_ac_coeffs(&gb, td->blocks, blocks_per_slice,
- plane_size_factor, ctx->scantable.permutated);
+ ret = decode_ac_coeffs(&gb, td->blocks, blocks_per_slice,
+ plane_size_factor, ctx->scantable.permutated);
+ if (ret < 0)
+ return ret;
 
 /* inverse quantization, inverse transform and output */
 block_ptr = td->blocks;
@@ -467,9 +476,82 @@
 }
 }
 }
+ return 0;
 }
 
 
+static void unpack_alpha(GetBitContext *gb, uint16_t *dst, int num_coeffs,
+ const int num_bits)
+{
+ const int mask = (1 << num_bits) - 1;
+ int i, idx, val, alpha_val;
+
+ idx = 0;
+ alpha_val = mask;
+ do {
+ do {
+ if (get_bits1(gb))
+ val = get_bits(gb, num_bits);
+ else {
+ int sign;
+ val = get_bits(gb, num_bits == 16 ? 7 : 4);
+ sign = val & 1;
+ val = (val + 2) >> 1;
+ if (sign)
+ val = -val;
+ }
+ alpha_val = (alpha_val + val) & mask;
+ if (num_bits == 16)
+ dst[idx++] = alpha_val >> 6;
+ else
+ dst[idx++] = (alpha_val << 2) | (alpha_val >> 6);
+ if (idx >= num_coeffs - 1)
+ break;
+ } while (get_bits1(gb));
+ val = get_bits(gb, 4);
+ if (!val)
+ val = get_bits(gb, 11);
+ if (idx + val > num_coeffs)
+ val = num_coeffs - idx;
+ if (num_bits == 16)
+ for (i = 0; i < val; i++)
+ dst[idx++] = alpha_val >> 6;
+ else
+ for (i = 0; i < val; i++)
+ dst[idx++] = (alpha_val << 2) | (alpha_val >> 6);
+ } while (idx < num_coeffs);
+}
+
+/**
+ * Decode alpha slice plane.
+ */
+static void decode_alpha_plane(ProresContext *ctx, ProresThreadData *td,
+ const uint8_t *buf, int data_size,
+ uint16_t *out_ptr, int linesize,
+ int mbs_per_slice)
+{
+ GetBitContext gb;
+ int i;
+ uint16_t *block_ptr;
+
+ memset(td->blocks, 0, 8 * 4 * 64 * sizeof(*td->blocks));
+
+ init_get_bits(&gb, buf, data_size << 3);
+
+ if (ctx->alpha_info == 2)
+ unpack_alpha(&gb, td->blocks, mbs_per_slice * 4 * 64, 16);
+ else
+ unpack_alpha(&gb, td->blocks, mbs_per_slice * 4 * 64, 8);
+
+ block_ptr = td->blocks;
+
+ for (i = 0; i < 16; i++) {
+ memcpy(out_ptr, block_ptr, 16 * mbs_per_slice * sizeof(*out_ptr));
+ out_ptr += linesize >> 1;
+ block_ptr += 16 * mbs_per_slice;
+ }
+}
+
 static int decode_slice(AVCodecContext *avctx, void *tdata)
 {
 ProresThreadData *td = tdata;
@@ -480,11 +562,14 @@
 int slice_num = td->slice_num;
 int mbs_per_slice = td->slice_width;
 const uint8_t *buf;
- uint8_t *y_data, *u_data, *v_data;
- AVFrame *pic = avctx->coded_frame;
+ uint8_t *y_data, *u_data, *v_data, *a_data;
+ AVFrame *pic = ctx->frame;
 int i, sf, slice_width_factor;
- int slice_data_size, hdr_size, y_data_size, u_data_size, v_data_size;
- int y_linesize, u_linesize, v_linesize;
+ int slice_data_size, hdr_size;
+ int y_data_size, u_data_size, v_data_size, a_data_size;
+ int y_linesize, u_linesize, v_linesize, a_linesize;
+ int coff[4];
+ int ret;
 
 buf = ctx->slice_data[slice_num].index;
 slice_data_size = ctx->slice_data[slice_num + 1].index - buf;
@@ -494,20 +579,30 @@
 y_data = pic->data[0];
 u_data = pic->data[1];
 v_data = pic->data[2];
+ a_data = pic->data[3];
 y_linesize = pic->linesize[0];
 u_linesize = pic->linesize[1];
 v_linesize = pic->linesize[2];
+ a_linesize = pic->linesize[3];
 
 if (pic->interlaced_frame) {
 if (!(pic_num ^ pic->top_field_first)) {
 y_data += y_linesize;
 u_data += u_linesize;
 v_data += v_linesize;
+ if (a_data)
+ a_data += a_linesize;
 }
 y_linesize <<= 1;
 u_linesize <<= 1;
 v_linesize <<= 1;
+ a_linesize <<= 1;
 }
+ y_data += (mb_y_pos << 4) * y_linesize + (mb_x_pos << 5);
+ u_data += (mb_y_pos << 4) * u_linesize + (mb_x_pos << ctx->mb_chroma_factor);
+ v_data += (mb_y_pos << 4) * v_linesize + (mb_x_pos << ctx->mb_chroma_factor);
+ if (a_data)
+ a_data += (mb_y_pos << 4) * a_linesize + (mb_x_pos << 5);
 
 if (slice_data_size < 6) {
 av_log(avctx, AV_LOG_ERROR, "slice data too small\n");
@@ -516,13 +611,18 @@
 
 /* parse slice header */
 hdr_size = buf[0] >> 3;
+ coff[0] = hdr_size;
 y_data_size = AV_RB16(buf + 2);
+ coff[1] = coff[0] + y_data_size;
 u_data_size = AV_RB16(buf + 4);
- v_data_size = hdr_size > 7 ? AV_RB16(buf + 6) :
- slice_data_size - y_data_size - u_data_size - hdr_size;
-
- if (hdr_size + y_data_size + u_data_size + v_data_size > slice_data_size ||
- v_data_size < 0 || hdr_size < 6) {
+ coff[2] = coff[1] + u_data_size;
+ v_data_size = hdr_size > 7 ? AV_RB16(buf + 6) : slice_data_size - coff[2];
+ coff[3] = coff[2] + v_data_size;
+ a_data_size = slice_data_size - coff[3];
+
+ /* if V or alpha component size is negative that means that previous
+ component sizes are too large */
+ if (v_data_size < 0 || a_data_size < 0 || hdr_size < 6) {
 av_log(avctx, AV_LOG_ERROR, "invalid data size\n");
 return AVERROR_INVALIDDATA;
 }
@@ -541,28 +641,37 @@
 }
 
 /* decode luma plane */
- decode_slice_plane(ctx, td, buf + hdr_size, y_data_size,
- (uint16_t*) (y_data + (mb_y_pos << 4) * y_linesize +
- (mb_x_pos << 5)), y_linesize,
- mbs_per_slice, 4, slice_width_factor + 2,
- td->qmat_luma_scaled, 0);
+ ret = decode_slice_plane(ctx, td, buf + coff[0], y_data_size,
+ (uint16_t*) y_data, y_linesize,
+ mbs_per_slice, 4, slice_width_factor + 2,
+ td->qmat_luma_scaled, 0);
+
+ if (ret < 0)
+ return ret;
 
 /* decode U chroma plane */
- decode_slice_plane(ctx, td, buf + hdr_size + y_data_size, u_data_size,
- (uint16_t*) (u_data + (mb_y_pos << 4) * u_linesize +
- (mb_x_pos << ctx->mb_chroma_factor)),
- u_linesize, mbs_per_slice, ctx->num_chroma_blocks,
- slice_width_factor + ctx->chroma_factor - 1,
- td->qmat_chroma_scaled, 1);
+ ret = decode_slice_plane(ctx, td, buf + coff[1], u_data_size,
+ (uint16_t*) u_data, u_linesize,
+ mbs_per_slice, ctx->num_chroma_blocks,
+ slice_width_factor + ctx->chroma_factor - 1,
+ td->qmat_chroma_scaled, 1);
+ if (ret < 0)
+ return ret;
 
 /* decode V chroma plane */
- decode_slice_plane(ctx, td, buf + hdr_size + y_data_size + u_data_size,
- v_data_size,
- (uint16_t*) (v_data + (mb_y_pos << 4) * v_linesize +
- (mb_x_pos << ctx->mb_chroma_factor)),
- v_linesize, mbs_per_slice, ctx->num_chroma_blocks,
- slice_width_factor + ctx->chroma_factor - 1,
- td->qmat_chroma_scaled, 1);
+ ret = decode_slice_plane(ctx, td, buf + coff[2], v_data_size,
+ (uint16_t*) v_data, v_linesize,
+ mbs_per_slice, ctx->num_chroma_blocks,
+ slice_width_factor + ctx->chroma_factor - 1,
+ td->qmat_chroma_scaled, 1);
+ if (ret < 0)
+ return ret;
+
+ /* decode alpha plane if available */
+ if (a_data && a_data_size)
+ decode_alpha_plane(ctx, td, buf + coff[3], a_data_size,
+ (uint16_t*) a_data, a_linesize,
+ mbs_per_slice);
 
 return 0;
 }
@@ -605,11 +714,14 @@
 AVPacket *avpkt)
 {
 ProresContext *ctx = avctx->priv_data;
- AVFrame *picture = avctx->coded_frame;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 int frame_hdr_size, pic_num, pic_data_size;
 
+ ctx->frame = data;
+ ctx->frame->pict_type = AV_PICTURE_TYPE_I;
+ ctx->frame->key_frame = 1;
+
 /* check frame atom container */
 if (buf_size < 28 || buf_size < AV_RB32(buf) ||
 AV_RB32(buf + 4) != FRAME_ID) {
@@ -625,14 +737,10 @@
 
 MOVE_DATA_PTR(frame_hdr_size);
 
- if (picture->data[0])
- avctx->release_buffer(avctx, picture);
-
- picture->reference = 0;
- if (ff_get_buffer(avctx, picture) < 0)
+ if (ff_get_buffer(avctx, ctx->frame, 0) < 0)
 return -1;
 
- for (pic_num = 0; ctx->picture.interlaced_frame - pic_num + 1; pic_num++) {
+ for (pic_num = 0; ctx->frame->interlaced_frame - pic_num + 1; pic_num++) {
 pic_data_size = decode_picture_header(ctx, buf, buf_size, avctx);
 if (pic_data_size < 0)
 return AVERROR_INVALIDDATA;
@@ -643,8 +751,8 @@
 MOVE_DATA_PTR(pic_data_size);
 }
 
- *got_frame = 1;
- *(AVFrame*) data = *avctx->coded_frame;
+ ctx->frame = NULL;
+ *got_frame = 1;
 
 return avpkt->size;
 }
@@ -654,9 +762,6 @@
 {
 ProresContext *ctx = avctx->priv_data;
 
- if (ctx->picture.data[0])
- avctx->release_buffer(avctx, &ctx->picture);
-
 av_freep(&ctx->slice_data);
 
 return 0;
@@ -665,6 +770,7 @@
 
 AVCodec ff_prores_decoder = {
 .name = "prores",
+ .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_PRORES,
 .priv_data_size = sizeof(ProresContext),
@@ -672,5 +778,4 @@
 .close = decode_close,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS,
- .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)")
 };

libav-v9.6.tar.bz2/libavcodec/proresdsp.c -> libav-v10.1.tar.bz2/libavcodec/proresdsp.c Changed

@@ -20,9 +20,12 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "libavutil/attributes.h"
+#include "libavutil/common.h"
+#include "dct.h"
+#include "dsputil.h"
 #include "proresdsp.h"
 #include "simple_idct.h"
-#include "libavutil/common.h"
 
 #define BIAS (1 << (PRORES_BITS_PER_SAMPLE - 1)) ///< bias value for converting signed pixels into unsigned ones
 #define CLIP_MIN (1 << (PRORES_BITS_PER_SAMPLE - 8)) ///< minimum value for clipping resulting pixels
@@ -34,7 +37,7 @@
 /**
 * Add bias value, clamp and output pixels of a slice
 */
-static void put_pixels(uint16_t *dst, int stride, const DCTELEM *in)
+static void put_pixels(uint16_t *dst, int stride, const int16_t *in)
 {
 int x, y, src_offset, dst_offset;
 
@@ -47,7 +50,7 @@
 }
 }
 
-static void prores_idct_put_c(uint16_t *out, int linesize, DCTELEM *block, const int16_t *qmat)
+static void prores_idct_put_c(uint16_t *out, int linesize, int16_t *block, const int16_t *qmat)
 {
 ff_prores_idct(block, qmat);
 put_pixels(out, linesize >> 1, block);
@@ -55,7 +58,7 @@
 #endif
 
 #if CONFIG_PRORES_ENCODER
-static void prores_fdct_c(const uint16_t *src, int linesize, DCTELEM *block)
+static void prores_fdct_c(const uint16_t *src, int linesize, int16_t *block)
 {
 int x, y;
 const uint16_t *tsrc = src;
@@ -69,7 +72,7 @@
 }
 #endif
 
-void ff_proresdsp_init(ProresDSPContext *dsp)
+av_cold void ff_proresdsp_init(ProresDSPContext *dsp)
 {
 #if CONFIG_PRORES_DECODER
 dsp->idct_put = prores_idct_put_c;

libav-v9.6.tar.bz2/libavcodec/proresdsp.h -> libav-v10.1.tar.bz2/libavcodec/proresdsp.h Changed

libav-v9.6.tar.bz2/libavcodec/proresenc.c -> libav-v10.1.tar.bz2/libavcodec/proresenc.c Changed

@@ -21,7 +21,9 @@
 */
 
 #include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
 #include "avcodec.h"
+#include "dsputil.h"
 #include "put_bits.h"
 #include "bytestream.h"
 #include "internal.h"
@@ -33,13 +35,14 @@
 
 #define MAX_MBS_PER_SLICE 8
 
-#define MAX_PLANES 3 // should be increased to 4 when there's AV_PIX_FMT_YUV444AP10
+#define MAX_PLANES 4
 
 enum {
 PRORES_PROFILE_PROXY = 0,
 PRORES_PROFILE_LT,
 PRORES_PROFILE_STANDARD,
 PRORES_PROFILE_HQ,
+ PRORES_PROFILE_4444,
 };
 
 enum {
@@ -118,7 +121,7 @@
 int max_quant;
 int br_tab[NUM_MB_LIMITS];
 int quant;
-} prores_profile_info[4] = {
+} prores_profile_info[5] = {
 {
 .full_name = "proxy",
 .tag = MKTAG('a', 'p', 'c', 'o'),
@@ -150,8 +153,15 @@
 .max_quant = 6,
 .br_tab = { 1566, 1216, 1070, 950 },
 .quant = QUANT_MAT_HQ,
+ },
+ {
+ .full_name = "4444",
+ .tag = MKTAG('a', 'p', '4', 'h'),
+ .min_quant = 1,
+ .max_quant = 6,
+ .br_tab = { 2350, 1828, 1600, 1425 },
+ .quant = QUANT_MAT_HQ,
 }
-// for 4444 profile bitrate numbers are { 2350, 1828, 1600, 1425 }
 };
 
 #define TRELLIS_WIDTH 16
@@ -167,7 +177,7 @@
 #define MAX_STORED_Q 16
 
 typedef struct ProresThreadData {
- DECLARE_ALIGNED(16, DCTELEM, blocks)[MAX_PLANES][64 * 4 * MAX_MBS_PER_SLICE];
+ DECLARE_ALIGNED(16, int16_t, blocks)[MAX_PLANES][64 * 4 * MAX_MBS_PER_SLICE];
 DECLARE_ALIGNED(16, uint16_t, emu_buf)[16 * 16];
 int16_t custom_q[64];
 struct TrellisNode *nodes;
@@ -175,7 +185,7 @@
 
 typedef struct ProresContext {
 AVClass *class;
- DECLARE_ALIGNED(16, DCTELEM, blocks)[MAX_PLANES][64 * 4 * MAX_MBS_PER_SLICE];
+ DECLARE_ALIGNED(16, int16_t, blocks)[MAX_PLANES][64 * 4 * MAX_MBS_PER_SLICE];
 DECLARE_ALIGNED(16, uint16_t, emu_buf)[16*16];
 int16_t quants[MAX_STORED_Q][64];
 int16_t custom_q[64];
@@ -194,6 +204,7 @@
 int num_planes;
 int bits_per_mb;
 int force_quant;
+ int alpha_bits;
 
 char *vendor;
 int quant_sel;
@@ -210,7 +221,7 @@
 
 static void get_slice_data(ProresContext *ctx, const uint16_t *src,
 int linesize, int x, int y, int w, int h,
- DCTELEM *blocks, uint16_t *emu_buf,
+ int16_t *blocks, uint16_t *emu_buf,
 int mbs_per_slice, int blocks_per_mb, int is_chroma)
 {
 const uint16_t *esrc;
@@ -279,6 +290,34 @@
 }
 }
 
+static void get_alpha_data(ProresContext *ctx, const uint16_t *src,
+ int linesize, int x, int y, int w, int h,
+ int16_t *blocks, int mbs_per_slice, int abits)
+{
+ const int slice_width = 16 * mbs_per_slice;
+ int i, j, copy_w, copy_h;
+
+ copy_w = FFMIN(w - x, slice_width);
+ copy_h = FFMIN(h - y, 16);
+ for (i = 0; i < copy_h; i++) {
+ memcpy(blocks, src, copy_w * sizeof(*src));
+ if (abits == 8)
+ for (j = 0; j < copy_w; j++)
+ blocks[j] >>= 2;
+ else
+ for (j = 0; j < copy_w; j++)
+ blocks[j] = (blocks[j] << 6) | (blocks[j] >> 4);
+ for (j = copy_w; j < slice_width; j++)
+ blocks[j] = blocks[copy_w - 1];
+ blocks += slice_width;
+ src += linesize >> 1;
+ }
+ for (; i < 16; i++) {
+ memcpy(blocks, blocks - slice_width, slice_width * sizeof(*blocks));
+ blocks += slice_width;
+ }
+}
+
 /**
 * Write an unsigned rice/exp golomb codeword.
 */
@@ -314,7 +353,7 @@
 #define GET_SIGN(x) ((x) >> 31)
 #define MAKE_CODE(x) (((x) << 1) ^ GET_SIGN(x))
 
-static void encode_dcs(PutBitContext *pb, DCTELEM *blocks,
+static void encode_dcs(PutBitContext *pb, int16_t *blocks,
 int blocks_per_slice, int scale)
 {
 int i;
@@ -340,7 +379,7 @@
 }
 }
 
-static void encode_acs(PutBitContext *pb, DCTELEM *blocks,
+static void encode_acs(PutBitContext *pb, int16_t *blocks,
 int blocks_per_slice,
 int plane_size_factor,
 const uint8_t *scan, const int16_t *qmat)
@@ -376,7 +415,7 @@
 
 static int encode_slice_plane(ProresContext *ctx, PutBitContext *pb,
 const uint16_t *src, int linesize,
- int mbs_per_slice, DCTELEM *blocks,
+ int mbs_per_slice, int16_t *blocks,
 int blocks_per_mb, int plane_size_factor,
 const int16_t *qmat)
 {
@@ -393,6 +432,73 @@
 return (put_bits_count(pb) - saved_pos) >> 3;
 }
 
+static void put_alpha_diff(PutBitContext *pb, int cur, int prev, int abits)
+{
+ const int mask = (1 << abits) - 1;
+ const int dbits = (abits == 8) ? 4 : 7;
+ const int dsize = 1 << dbits - 1;
+ int diff = cur - prev;
+
+ diff &= mask;
+ if (diff >= (1 << abits) - dsize)
+ diff -= 1 << abits;
+ if (diff < -dsize || diff > dsize || !diff) {
+ put_bits(pb, 1, 1);
+ put_bits(pb, abits, diff);
+ } else {
+ put_bits(pb, 1, 0);
+ put_bits(pb, dbits - 1, FFABS(diff) - 1);
+ put_bits(pb, 1, diff < 0);
+ }
+}
+
+static void put_alpha_run(PutBitContext *pb, int run)
+{
+ if (run) {
+ put_bits(pb, 1, 0);
+ if (run < 0x10)
+ put_bits(pb, 4, run);
+ else
+ put_bits(pb, 15, run);
+ } else {
+ put_bits(pb, 1, 1);
+ }
+}
+
+// todo alpha quantisation for high quants
+static int encode_alpha_plane(ProresContext *ctx, PutBitContext *pb,
+ const uint16_t *src, int linesize,
+ int mbs_per_slice, uint16_t *blocks,
+ int quant)
+{
+ const int abits = ctx->alpha_bits;
+ const int mask = (1 << abits) - 1;
+ const int num_coeffs = mbs_per_slice * 256;
+ int saved_pos = put_bits_count(pb);
+ int prev = mask, cur;
+ int idx = 0;
+ int run = 0;
+
+ cur = blocks[idx++];
+ put_alpha_diff(pb, cur, prev, abits);
+ prev = cur;
+ do {
+ cur = blocks[idx++];
+ if (cur != prev) {
+ put_alpha_run (pb, run);
+ put_alpha_diff(pb, cur, prev, abits);
+ prev = cur;
+ run = 0;
+ } else {
+ run++;
+ }
+ } while (idx < num_coeffs);
+ if (run)
+ put_alpha_run(pb, run);
+ flush_put_bits(pb);
+ return (put_bits_count(pb) - saved_pos) >> 3;
+}
+
 static int encode_slice(AVCodecContext *avctx, const AVFrame *pic,
 PutBitContext *pb,
 int sizes[4], int x, int y, int quant,
@@ -443,14 +549,23 @@
 src = (const uint16_t*)(pic->data[i] + yp * linesize +
 line_add * pic->linesize[i]) + xp;
 
- get_slice_data(ctx, src, linesize, xp, yp,
- pwidth, avctx->height / ctx->pictures_per_frame,
- ctx->blocks[0], ctx->emu_buf,
- mbs_per_slice, num_cblocks, is_chroma);
- sizes[i] = encode_slice_plane(ctx, pb, src, linesize,
- mbs_per_slice, ctx->blocks[0],
- num_cblocks, plane_factor,
- qmat);
+ if (i < 3) {
+ get_slice_data(ctx, src, linesize, xp, yp,
+ pwidth, avctx->height / ctx->pictures_per_frame,
+ ctx->blocks[0], ctx->emu_buf,
+ mbs_per_slice, num_cblocks, is_chroma);
+ sizes[i] = encode_slice_plane(ctx, pb, src, linesize,
+ mbs_per_slice, ctx->blocks[0],
+ num_cblocks, plane_factor,
+ qmat);
+ } else {
+ get_alpha_data(ctx, src, linesize, xp, yp,
+ pwidth, avctx->height / ctx->pictures_per_frame,
+ ctx->blocks[0], mbs_per_slice, ctx->alpha_bits);
+ sizes[i] = encode_alpha_plane(ctx, pb, src, linesize,
+ mbs_per_slice, ctx->blocks[0],
+ quant);
+ }
 total_size += sizes[i];
 }
 return total_size;
@@ -478,7 +593,7 @@
 }
 }
 
-static int estimate_dcs(int *error, DCTELEM *blocks, int blocks_per_slice,
+static int estimate_dcs(int *error, int16_t *blocks, int blocks_per_slice,
 int scale)
 {
 int i;
@@ -509,7 +624,7 @@
 return bits;
 }
 
-static int estimate_acs(int *error, DCTELEM *blocks, int blocks_per_slice,
+static int estimate_acs(int *error, int16_t *blocks, int blocks_per_slice,
 int plane_size_factor,
 const uint8_t *scan, const int16_t *qmat)
 {
@@ -563,6 +678,66 @@
 return FFALIGN(bits, 8);
 }
 
+static int est_alpha_diff(int cur, int prev, int abits)
+{
+ const int mask = (1 << abits) - 1;
+ const int dbits = (abits == 8) ? 4 : 7;
+ const int dsize = 1 << dbits - 1;
+ int diff = cur - prev;
+
+ diff &= mask;
+ if (diff >= (1 << abits) - dsize)
+ diff -= 1 << abits;
+ if (diff < -dsize || diff > dsize || !diff)
+ return abits + 1;
+ else
+ return dbits + 1;
+}
+
+static int estimate_alpha_plane(ProresContext *ctx, int *error,
+ const uint16_t *src, int linesize,
+ int mbs_per_slice, int quant,
+ int16_t *blocks)
+{
+ const int abits = ctx->alpha_bits;
+ const int mask = (1 << abits) - 1;
+ const int num_coeffs = mbs_per_slice * 256;
+ int prev = mask, cur;
+ int idx = 0;
+ int run = 0;
+ int bits;
+
+ *error = 0;
+ cur = blocks[idx++];
+ bits = est_alpha_diff(cur, prev, abits);
+ prev = cur;
+ do {
+ cur = blocks[idx++];
+ if (cur != prev) {
+ if (!run)
+ bits++;
+ else if (run < 0x10)
+ bits += 4;
+ else
+ bits += 15;
+ bits += est_alpha_diff(cur, prev, abits);
+ prev = cur;
+ run = 0;
+ } else {
+ run++;
+ }
+ } while (idx < num_coeffs);
+
+ if (run) {
+ if (run < 0x10)
+ bits += 4;
+ else
+ bits += 15;
+ }
+
+ return bits;
+}
+
 static int find_slice_quant(AVCodecContext *avctx, const AVFrame *pic,
 int trellis_node, int x, int y, int mbs_per_slice,
 ProresThreadData *td)
@@ -609,10 +784,16 @@
 src = (const uint16_t*)(pic->data[i] + yp * linesize[i] +
 line_add * pic->linesize[i]) + xp;
 
- get_slice_data(ctx, src, linesize[i], xp, yp,
- pwidth, avctx->height / ctx->pictures_per_frame,
- td->blocks[i], td->emu_buf,
- mbs_per_slice, num_cblocks[i], is_chroma[i]);
+ if (i < 3) {
+ get_slice_data(ctx, src, linesize[i], xp, yp,
+ pwidth, avctx->height / ctx->pictures_per_frame,
+ td->blocks[i], td->emu_buf,
+ mbs_per_slice, num_cblocks[i], is_chroma[i]);
+ } else {
+ get_alpha_data(ctx, src, linesize[i], xp, yp,
+ pwidth, avctx->height / ctx->pictures_per_frame,
+ td->blocks[i], mbs_per_slice, ctx->alpha_bits);
+ }
 }
 
 for (q = min_quant; q < max_quant + 2; q++) {
@@ -624,13 +805,16 @@
 for (q = min_quant; q <= max_quant; q++) {
 bits = 0;
 error = 0;
- for (i = 0; i < ctx->num_planes; i++) {
+ for (i = 0; i < ctx->num_planes - !!ctx->alpha_bits; i++) {
 bits += estimate_slice_plane(ctx, &error, i,
 src, linesize[i],
 mbs_per_slice,
 num_cblocks[i], plane_factor[i],
 ctx->quants[q], td);
 }
+ if (ctx->alpha_bits)
+ bits += estimate_alpha_plane(ctx, &error, src, linesize[3],
+ mbs_per_slice, q, td->blocks[3]);
 if (bits > 65000 * 8) {
 error = SCORE_LIMIT;
 break;
@@ -653,13 +837,16 @@
 for (i = 0; i < 64; i++)
 qmat[i] = ctx->quant_mat[i] * q;
 }
- for (i = 0; i < ctx->num_planes; i++) {
+ for (i = 0; i < ctx->num_planes - !!ctx->alpha_bits; i++) {
 bits += estimate_slice_plane(ctx, &error, i,
 src, linesize[i],
 mbs_per_slice,
 num_cblocks[i], plane_factor[i],
 qmat, td);
 }
+ if (ctx->alpha_bits)
+ bits += estimate_alpha_plane(ctx, &error, src, linesize[3],
+ mbs_per_slice, q, td->blocks[3]);
 if (bits <= ctx->bits_per_mb * mbs_per_slice)
 break;
 }
@@ -781,7 +968,7 @@
 bytestream_put_byte (&buf, avctx->color_primaries);
 bytestream_put_byte (&buf, avctx->color_trc);
 bytestream_put_byte (&buf, avctx->colorspace);
- bytestream_put_byte (&buf, 0x40); // source format and alpha information
+ bytestream_put_byte (&buf, 0x40 | (ctx->alpha_bits >> 3));
 bytestream_put_byte (&buf, 0); // reserved
 if (ctx->quant_sel != QUANT_MAT_DEFAULT) {
 bytestream_put_byte (&buf, 0x03); // matrix flags - both matrices are present
@@ -888,7 +1075,7 @@
 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);
 
@@ -903,12 +1090,20 @@
 "there should be an integer power of two MBs per slice\n");
 return AVERROR(EINVAL);
 }
+ if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & AV_PIX_FMT_FLAG_ALPHA) {
+ if (ctx->alpha_bits & 7) {
+ av_log(avctx, AV_LOG_ERROR, "alpha bits should be 0, 8 or 16\n");
+ return AVERROR(EINVAL);
+ }
+ } else {
+ ctx->alpha_bits = 0;
+ }
 
 ctx->chroma_factor = avctx->pix_fmt == AV_PIX_FMT_YUV422P10
 ? CFACTOR_Y422
 : CFACTOR_Y444;
 ctx->profile_info = prores_profile_info + ctx->profile;
- ctx->num_planes = 3;
+ ctx->num_planes = 3 + !!ctx->alpha_bits;
 
 ctx->mb_width = FFALIGN(avctx->width, 16) >> 4;
 
@@ -1024,7 +1219,7 @@
 AV_OPT_TYPE_INT, { .i64 = 8 }, 1, MAX_MBS_PER_SLICE, VE },
 { "profile", NULL, OFFSET(profile), AV_OPT_TYPE_INT,
 { .i64 = PRORES_PROFILE_STANDARD },
- PRORES_PROFILE_PROXY, PRORES_PROFILE_HQ, VE, "profile" },
+ PRORES_PROFILE_PROXY, PRORES_PROFILE_4444, VE, "profile" },
 { "proxy", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PRORES_PROFILE_PROXY },
 0, 0, VE, "profile" },
 { "lt", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PRORES_PROFILE_LT },
@@ -1033,6 +1228,8 @@
 0, 0, VE, "profile" },
 { "hq", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PRORES_PROFILE_HQ },
 0, 0, VE, "profile" },
+ { "4444", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PRORES_PROFILE_4444 },
+ 0, 0, VE, "profile" },
 { "vendor", "vendor ID", OFFSET(vendor),
 AV_OPT_TYPE_STRING, { .str = "Lavc" }, CHAR_MIN, CHAR_MAX, VE },
 { "bits_per_mb", "desired bits per macroblock", OFFSET(bits_per_mb),
@@ -1051,6 +1248,8 @@
 0, 0, VE, "quant_mat" },
 { "default", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = QUANT_MAT_DEFAULT },
 0, 0, VE, "quant_mat" },
+ { "alpha_bits", "bits for alpha plane", OFFSET(alpha_bits), AV_OPT_TYPE_INT,
+ { .i64 = 16 }, 0, 16, VE },
 { NULL }
 };
 
@@ -1063,6 +1262,7 @@
 
 AVCodec ff_prores_encoder = {
 .name = "prores",
+ .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_PRORES,
 .priv_data_size = sizeof(ProresContext),
@@ -1070,9 +1270,9 @@
 .close = encode_close,
 .encode2 = encode_frame,
 .capabilities = CODEC_CAP_SLICE_THREADS,
- .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)"),
 .pix_fmts = (const enum AVPixelFormat[]) {
- AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_NONE
+ AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10,
+ AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_NONE
 },
 .priv_class = &proresenc_class,
 };

libav-v9.6.tar.bz2/libavcodec/psymodel.h -> libav-v10.1.tar.bz2/libavcodec/psymodel.h Changed

@@ -137,9 +137,9 @@
  *
  * @return zero if successful, a negative value if not
  */
-av_cold int ff_psy_init(FFPsyContext *ctx, AVCodecContext *avctx, int num_lens,
-                        const uint8_t **bands, const int* num_bands,
-                        int num_groups, const uint8_t *group_map);
+int ff_psy_init(FFPsyContext *ctx, AVCodecContext *avctx, int num_lens,
+                const uint8_t **bands, const int *num_bands,
+                int num_groups, const uint8_t *group_map);
 
 /**
  * Determine what group a channel belongs to.
@@ -156,7 +156,7 @@
  *
  * @param ctx model context
  */
-av_cold void ff_psy_end(FFPsyContext *ctx);
+void ff_psy_end(FFPsyContext *ctx);
 
 
 /**************************************************************************
@@ -168,7 +168,7 @@
 /**
  * psychoacoustic model audio preprocessing initialization
  */
-av_cold struct FFPsyPreprocessContext* ff_psy_preprocess_init(AVCodecContext *avctx);
+struct FFPsyPreprocessContext *ff_psy_preprocess_init(AVCodecContext *avctx);
 
 /**
  * Preprocess several channel in audio frame in order to compress it better.
@@ -182,6 +182,6 @@
 /**
  * Cleanup audio preprocessing module.
  */
-av_cold void ff_psy_preprocess_end(struct FFPsyPreprocessContext *ctx);
+void ff_psy_preprocess_end(struct FFPsyPreprocessContext *ctx);
 
 #endif /* AVCODEC_PSYMODEL_H */

libav-v9.6.tar.bz2/libavcodec/pthread.c -> libav-v10.1.tar.bz2/libavcodec/pthread.c Changed

@@ -29,971 +29,10 @@
 * @see doc/multithreading.txt
 */
 
-#include "config.h"
-
-#if HAVE_SCHED_GETAFFINITY
-#define _GNU_SOURCE
-#include <sched.h>
-#endif
-#if HAVE_GETPROCESSAFFINITYMASK
-#include <windows.h>
-#endif
-#if HAVE_SYSCTL
-#if HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#endif
-#if HAVE_SYSCONF
-#include <unistd.h>
-#endif
-
 #include "avcodec.h"
 #include "internal.h"
+#include "pthread_internal.h"
 #include "thread.h"
-#include "libavutil/common.h"
-
-#if HAVE_PTHREADS
-#include <pthread.h>
-#elif HAVE_W32THREADS
-#include "w32pthreads.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;
- int current_job;
- int done;
-} ThreadContext;
-
-/// Max number of frame buffers that can be allocated when using frame threads.
-#define MAX_BUFFERS (32+1)
-
-/**
- * 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).
- int allocated_buf_size; ///< Size allocated for avpkt.data
-
- 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_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[MAX_BUFFERS];
- int num_released_buffers;
-
- /**
- * Array of progress values used by ff_thread_get_buffer().
- */
- int progress[MAX_BUFFERS][2];
- uint8_t progress_used[MAX_BUFFERS];
-
- AVFrame *requested_frame; ///< AVFrame the codec passed to get_buffer()
-} 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 int get_logical_cpus(AVCodecContext *avctx)
-{
- int ret, nb_cpus = 1;
-#if HAVE_SCHED_GETAFFINITY && defined(CPU_COUNT)
- cpu_set_t cpuset;
-
- CPU_ZERO(&cpuset);
-
- ret = sched_getaffinity(0, sizeof(cpuset), &cpuset);
- if (!ret) {
- nb_cpus = CPU_COUNT(&cpuset);
- }
-#elif HAVE_GETPROCESSAFFINITYMASK
- DWORD_PTR proc_aff, sys_aff;
- ret = GetProcessAffinityMask(GetCurrentProcess(), &proc_aff, &sys_aff);
- if (ret)
- nb_cpus = av_popcount64(proc_aff);
-#elif HAVE_SYSCTL && defined(HW_NCPU)
- int mib[2] = { CTL_HW, HW_NCPU };
- size_t len = sizeof(nb_cpus);
-
- ret = sysctl(mib, 2, &nb_cpus, &len, NULL, 0);
- if (ret == -1)
- nb_cpus = 0;
-#elif HAVE_SYSCONF && defined(_SC_NPROC_ONLN)
- nb_cpus = sysconf(_SC_NPROC_ONLN);
-#elif HAVE_SYSCONF && defined(_SC_NPROCESSORS_ONLN)
- nb_cpus = sysconf(_SC_NPROCESSORS_ONLN);
-#endif
- av_log(avctx, AV_LOG_DEBUG, "detected %d logical cores\n", nb_cpus);
- return nb_cpus;
-}
-
-
-static void* attribute_align_arg worker(void *v)
-{
- AVCodecContext *avctx = v;
- ThreadContext *c = avctx->thread_opaque;
- 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);
-
- pthread_cond_wait(&c->current_job_cond, &c->current_job_lock);
- 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)
-{
- 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;
- }
- 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(AVCodecContext *avctx)
-{
- int i;
- ThreadContext *c;
- int thread_count = avctx->thread_count;
-
- if (!thread_count) {
- int nb_cpus = get_logical_cpus(avctx);
- // 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;
-}
-
-/**
- * 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;
-
- while (1) {
- if (p->state == STATE_INPUT_READY && !fctx->die) {
- pthread_mutex_lock(&p->mutex);
- while (p->state == STATE_INPUT_READY && !fctx->die)
- pthread_cond_wait(&p->input_cond, &p->mutex);
- pthread_mutex_unlock(&p->mutex);
- }
-
- if (fctx->die) break;
-
- if (!codec->update_thread_context && avctx->thread_safe_callbacks)
- ff_thread_finish_setup(avctx);
-
- pthread_mutex_lock(&p->mutex);
- 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);
-
- p->state = STATE_INPUT_READY;
-
- pthread_mutex_lock(&p->progress_mutex);
- 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;
- }
-
- if (for_user) {
- 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_buffer = src->get_buffer;
- dst->release_buffer = src->release_buffer;
-
- 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;
-
- 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
-}
-
-static void free_progress(AVFrame *f)
-{
- PerThreadContext *p = f->owner->thread_opaque;
- int *progress = f->thread_opaque;
-
- p->progress_used[(progress - p->progress[0]) / 2] = 0;
-}
-
-/// 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);
- f = &p->released_buffers[--p->num_released_buffers];
- free_progress(f);
- f->thread_opaque = NULL;
-
- f->owner->release_buffer(f->owner, 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;
- uint8_t *buf = p->avpkt.data;
-
- 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_fast_malloc(&buf, &p->allocated_buf_size, avpkt->size + FF_INPUT_BUFFER_PADDING_SIZE);
- p->avpkt = *avpkt;
- p->avpkt.data = buf;
- memcpy(buf, avpkt->data, avpkt->size);
- memset(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.
- */
-
- if (!p->avctx->thread_safe_callbacks &&
- p->avctx->get_buffer != avcodec_default_get_buffer) {
- while (p->state != STATE_SETUP_FINISHED && p->state != STATE_INPUT_READY) {
- pthread_mutex_lock(&p->progress_mutex);
- while (p->state == STATE_SETTING_UP)
- pthread_cond_wait(&p->progress_cond, &p->progress_mutex);
-
- if (p->state == STATE_GET_BUFFER) {
- p->result = ff_get_buffer(p->avctx, p->requested_frame);
- 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->delaying) {
- if (fctx->next_decoding >= (avctx->thread_count-1)) fctx->delaying = 0;
-
- *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);
- }
-
- *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(AVFrame *f, int n, int field)
-{
- PerThreadContext *p;
- int *progress = f->thread_opaque;
-
- 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(AVFrame *f, int n, int field)
-{
- PerThreadContext *p;
- int *progress = f->thread_opaque;
-
- 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;
-
- 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);
- }
- }
-}
-
-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)
- update_context_from_thread(fctx->threads->avctx, fctx->prev_thread->avctx, 0);
-
- 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);
-
- if (codec->close)
- codec->close(p->avctx);
-
- avctx->codec = NULL;
-
- release_delayed_buffers(p);
- }
-
- for (i = 0; i < thread_count; i++) {
- PerThreadContext *p = &fctx->threads[i];
-
- avcodec_default_free_buffers(p->avctx);
-
- 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_freep(&p->avpkt.data);
-
- 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 = get_logical_cpus(avctx);
- // 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;
-
- if (!pthread_create(&p->thread, NULL, frame_worker_thread, p))
- p->thread_init = 1;
- }
-
- 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;
-
- release_delayed_buffers(p);
- }
-}
-
-static int *allocate_progress(PerThreadContext *p)
-{
- int i;
-
- for (i = 0; i < MAX_BUFFERS; i++)
- if (!p->progress_used[i]) break;
-
- if (i == MAX_BUFFERS) {
- av_log(p->avctx, AV_LOG_ERROR, "allocate_progress() overflow\n");
- return NULL;
- }
-
- p->progress_used[i] = 1;
-
- return p->progress[i];
-}
-
-int ff_thread_get_buffer(AVCodecContext *avctx, AVFrame *f)
-{
- PerThreadContext *p = avctx->thread_opaque;
- int *progress, err;
-
- f->owner = avctx;
-
- if (!(avctx->active_thread_type&FF_THREAD_FRAME)) {
- f->thread_opaque = NULL;
- return ff_get_buffer(avctx, f);
- }
-
- if (p->state != STATE_SETTING_UP &&
- (avctx->codec->update_thread_context || !avctx->thread_safe_callbacks)) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() cannot be called after ff_thread_finish_setup()\n");
- return -1;
- }
-
- pthread_mutex_lock(&p->parent->buffer_mutex);
- f->thread_opaque = progress = allocate_progress(p);
-
- if (!progress) {
- pthread_mutex_unlock(&p->parent->buffer_mutex);
- return -1;
- }
-
- progress[0] =
- progress[1] = -1;
-
- if (avctx->thread_safe_callbacks ||
- avctx->get_buffer == avcodec_default_get_buffer) {
- err = ff_get_buffer(avctx, f);
- } else {
- p->requested_frame = f;
- p->state = STATE_GET_BUFFER;
- pthread_mutex_lock(&p->progress_mutex);
- pthread_cond_signal(&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 (!avctx->codec->update_thread_context)
- ff_thread_finish_setup(avctx);
- }
-
- if (err) {
- free_progress(f);
- f->thread_opaque = NULL;
- }
- pthread_mutex_unlock(&p->parent->buffer_mutex);
-
- return err;
-}
-
-void ff_thread_release_buffer(AVCodecContext *avctx, AVFrame *f)
-{
- PerThreadContext *p = avctx->thread_opaque;
- FrameThreadContext *fctx;
-
- if (!(avctx->active_thread_type&FF_THREAD_FRAME)) {
- avctx->release_buffer(avctx, f);
- return;
- }
-
- if (p->num_released_buffers >= MAX_BUFFERS) {
- av_log(p->avctx, AV_LOG_ERROR, "too many thread_release_buffer calls!\n");
- return;
- }
-
- if(avctx->debug & FF_DEBUG_BUFFERS)
- av_log(avctx, AV_LOG_DEBUG, "thread_release_buffer called on pic %p\n", f);
-
- fctx = p->parent;
- pthread_mutex_lock(&fctx->buffer_mutex);
- p->released_buffers[p->num_released_buffers++] = *f;
- pthread_mutex_unlock(&fctx->buffer_mutex);
- memset(f->data, 0, sizeof(f->data));
-}
 
 /**
 * Set the threading algorithms used.
@@ -1030,23 +69,12 @@
 
 int ff_thread_init(AVCodecContext *avctx)
 {
- if (avctx->thread_opaque) {
- av_log(avctx, AV_LOG_ERROR, "avcodec_thread_init is ignored after avcodec_open\n");
- return -1;
- }
-
-#if HAVE_W32THREADS
- w32thread_init();
-#endif
+ validate_thread_parameters(avctx);
 
- if (avctx->codec) {
- validate_thread_parameters(avctx);
-
- if (avctx->active_thread_type&FF_THREAD_SLICE)
- return thread_init(avctx);
- else if (avctx->active_thread_type&FF_THREAD_FRAME)
- return frame_thread_init(avctx);
- }
+ if (avctx->active_thread_type&FF_THREAD_SLICE)
+ return ff_slice_thread_init(avctx);
+ else if (avctx->active_thread_type&FF_THREAD_FRAME)
+ return ff_frame_thread_init(avctx);
 
 return 0;
 }
@@ -1054,7 +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);
+ ff_slice_thread_free(avctx);
 }

libav-v10.1.tar.bz2/libavcodec/pthread_frame.c Added

@@ -0,0 +1,803 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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"
+#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_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
+} 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;
+
+/**
+ * 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;
+
+ while (1) {
+ if (p->state == STATE_INPUT_READY && !fctx->die) {
+ pthread_mutex_lock(&p->mutex);
+ while (p->state == STATE_INPUT_READY && !fctx->die)
+ pthread_cond_wait(&p->input_cond, &p->mutex);
+ pthread_mutex_unlock(&p->mutex);
+ }
+
+ if (fctx->die) break;
+
+ if (!codec->update_thread_context && avctx->thread_safe_callbacks)
+ ff_thread_finish_setup(avctx);
+
+ pthread_mutex_lock(&p->mutex);
+ 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);
+
+ p->state = STATE_INPUT_READY;
+
+ pthread_mutex_lock(&p->progress_mutex);
+ 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;
+ }
+
+ if (for_user) {
+ 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->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;
+
+ 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);
+ 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 && (
+#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) {
+ pthread_mutex_lock(&p->progress_mutex);
+ while (p->state == STATE_SETTING_UP)
+ pthread_cond_wait(&p->progress_cond, &p->progress_mutex);
+
+ if (p->state == STATE_GET_BUFFER) {
+ p->result = ff_get_buffer(p->avctx, p->requested_frame, p->requested_flags);
+ 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->delaying) {
+ if (fctx->next_decoding >= (avctx->thread_count-1)) fctx->delaying = 0;
+
+ *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;
+ 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;
+ 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;
+
+ 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);
+ }
+ }
+}
+
+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)
+ update_context_from_thread(fctx->threads->avctx, fctx->prev_thread->avctx, 0);
+
+ 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);
+
+ 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_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();
+ av_log(avctx, AV_LOG_DEBUG, "detected %d logical cores\n", nb_cpus);
+ // 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);
+ 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;
+
+ if (!pthread_create(&p->thread, NULL, frame_worker_thread, p))
+ p->thread_init = 1;
+ }
+
+ 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_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags)
+{
+ PerThreadContext *p = avctx->internal->thread_ctx;
+ int err;
+
+ f->owner = avctx;
+
+ 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 || !avctx->thread_safe_callbacks)) {
+ 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 {
+ p->requested_frame = f->f;
+ p->requested_flags = flags;
+ p->state = STATE_GET_BUFFER;
+ pthread_mutex_lock(&p->progress_mutex);
+ pthread_cond_signal(&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 (!avctx->thread_safe_callbacks && !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;
+}
+
+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);
+}

libav-v10.1.tar.bz2/libavcodec/pthread_internal.h Added

@@ -0,0 +1,34 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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

libav-v10.1.tar.bz2/libavcodec/pthread_slice.c Added

@@ -0,0 +1,224 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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"
+#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;
+} 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();
+ av_log(avctx, AV_LOG_DEBUG, "detected %d logical cores\n", nb_cpus);
+ // 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;
+}

libav-v9.6.tar.bz2/libavcodec/ptx.c -> libav-v10.1.tar.bz2/libavcodec/ptx.c Changed

@@ -25,27 +25,13 @@
 #include "avcodec.h"
 #include "internal.h"
 
-typedef struct PTXContext {
- AVFrame picture;
-} PTXContext;
-
-static av_cold int ptx_init(AVCodecContext *avctx) {
- PTXContext *s = avctx->priv_data;
-
- avcodec_get_frame_defaults(&s->picture);
- avctx->coded_frame= &s->picture;
-
- return 0;
-}
-
 static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
 AVPacket *avpkt) {
 const uint8_t *buf = avpkt->data;
 const uint8_t *buf_end = avpkt->data + avpkt->size;
- PTXContext * const s = avctx->priv_data;
- AVFrame *picture = data;
- AVFrame * const p = &s->picture;
+ AVFrame * const p = data;
 unsigned int offset, w, h, y, stride, bytes_per_pixel;
+ int ret;
 uint8_t *ptr;
 
 if (buf_end - buf < 14)
@@ -56,7 +42,7 @@
 bytes_per_pixel = AV_RL16(buf+12) >> 3;
 
 if (bytes_per_pixel != 2) {
- av_log_ask_for_sample(avctx, "Image format is not RGB15.\n");
+ avpriv_request_sample(avctx, "Image format not RGB15");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -65,20 +51,16 @@
 if (buf_end - buf < offset)
 return AVERROR_INVALIDDATA;
 if (offset != 0x2c)
- av_log_ask_for_sample(avctx, "offset != 0x2c\n");
+ avpriv_request_sample(avctx, "offset != 0x2c");
 
 buf += offset;
 
- if (p->data[0])
- avctx->release_buffer(avctx, p);
+ if ((ret = ff_set_dimensions(avctx, w, h)) < 0)
+ return ret;
 
- if (av_image_check_size(w, h, 0, avctx))
- return -1;
- if (w != avctx->width || h != avctx->height)
- avcodec_set_dimensions(avctx, w, h);
- if (ff_get_buffer(avctx, p) < 0) {
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 p->pict_type = AV_PICTURE_TYPE_I;
@@ -98,7 +80,6 @@
 buf += w*bytes_per_pixel;
 }
 
- *picture = s->picture;
 *got_frame = 1;
 
 if (y < h) {
@@ -109,23 +90,11 @@
 return offset + w*h*bytes_per_pixel;
 }
 
-static av_cold int ptx_end(AVCodecContext *avctx) {
- PTXContext *s = avctx->priv_data;
-
- if(s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
-
- return 0;
-}
-
 AVCodec ff_ptx_decoder = {
 .name = "ptx",
+ .long_name = NULL_IF_CONFIG_SMALL("V.Flash PTX image"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_PTX,
- .priv_data_size = sizeof(PTXContext),
- .init = ptx_init,
- .close = ptx_end,
 .decode = ptx_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("V.Flash PTX image"),
 };

libav-v9.6.tar.bz2/libavcodec/put_bits.h -> libav-v10.1.tar.bz2/libavcodec/put_bits.h Changed

@@ -29,6 +29,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <assert.h>
+
 #include "libavutil/bswap.h"
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
@@ -49,19 +50,20 @@
 * @param buffer the buffer where to put bits
 * @param buffer_size the size in bytes of buffer
 */
-static inline void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_size)
+static inline void init_put_bits(PutBitContext *s, uint8_t *buffer,
+ int buffer_size)
 {
- if(buffer_size < 0) {
+ if (buffer_size < 0) {
 buffer_size = 0;
- buffer = NULL;
+ buffer = NULL;
 }
 
- s->size_in_bits= 8*buffer_size;
- s->buf = buffer;
- s->buf_end = s->buf + buffer_size;
- s->buf_ptr = s->buf;
- s->bit_left=32;
- s->bit_buf=0;
+ s->size_in_bits = 8 * buffer_size;
+ s->buf = buffer;
+ s->buf_end = s->buf + buffer_size;
+ s->buf_ptr = s->buf;
+ s->bit_left = 32;
+ s->bit_buf = 0;
 }
 
 /**
@@ -73,27 +75,35 @@
 }
 
 /**
+ * @return the number of bits available in the bitstream.
+ */
+static inline int put_bits_left(PutBitContext* s)
+{
+ return (s->buf_end - s->buf_ptr) * 8 - 32 + s->bit_left;
+}
+
+/**
 * Pad the end of the output stream with zeros.
 */
 static inline void flush_put_bits(PutBitContext *s)
 {
 #ifndef BITSTREAM_WRITER_LE
 if (s->bit_left < 32)
- s->bit_buf<<= s->bit_left;
+ s->bit_buf <<= s->bit_left;
 #endif
 while (s->bit_left < 32) {
 /* XXX: should test end of buffer */
 #ifdef BITSTREAM_WRITER_LE
- *s->buf_ptr++=s->bit_buf;
- s->bit_buf>>=8;
+ *s->buf_ptr++ = s->bit_buf;
+ s->bit_buf >>= 8;
 #else
- *s->buf_ptr++=s->bit_buf >> 24;
- s->bit_buf<<=8;
+ *s->buf_ptr++ = s->bit_buf >> 24;
+ s->bit_buf <<= 8;
 #endif
- s->bit_left+=8;
+ s->bit_left += 8;
 }
- s->bit_left=32;
- s->bit_buf=0;
+ s->bit_left = 32;
+ s->bit_buf = 0;
 }
 
 #ifdef BITSTREAM_WRITER_LE
@@ -111,7 +121,8 @@
 *
 * @param terminate_string 0-terminates the written string if value is 1
 */
-void avpriv_put_string(PutBitContext *pb, const char *string, int terminate_string);
+void avpriv_put_string(PutBitContext *pb, const char *string,
+ int terminate_string);
 
 /**
 * Copy the content of src to the bitstream.
@@ -132,7 +143,7 @@
 
 assert(n <= 31 && value < (1U << n));
 
- bit_buf = s->bit_buf;
+ bit_buf = s->bit_buf;
 bit_left = s->bit_left;
 
 /* XXX: optimize */
@@ -140,26 +151,26 @@
 bit_buf |= value << (32 - bit_left);
 if (n >= bit_left) {
 AV_WL32(s->buf_ptr, bit_buf);
- s->buf_ptr+=4;
- bit_buf = (bit_left==32)?0:value >> bit_left;
- bit_left+=32;
+ s->buf_ptr += 4;
+ bit_buf = (bit_left == 32) ? 0 : value >> bit_left;
+ bit_left += 32;
 }
- bit_left-=n;
+ bit_left -= n;
 #else
 if (n < bit_left) {
- bit_buf = (bit_buf<<n) | value;
- bit_left-=n;
+ bit_buf = (bit_buf << n) | value;
+ bit_left -= n;
 } else {
- bit_buf<<=bit_left;
- bit_buf |= value >> (n - bit_left);
+ bit_buf <<= bit_left;
+ bit_buf |= value >> (n - bit_left);
 AV_WB32(s->buf_ptr, bit_buf);
- s->buf_ptr+=4;
- bit_left+=32 - n;
- bit_buf = value;
+ s->buf_ptr += 4;
+ bit_left += 32 - n;
+ bit_buf = value;
 }
 #endif
 
- s->bit_buf = bit_buf;
+ s->bit_buf = bit_buf;
 s->bit_left = bit_left;
 }
 
@@ -167,7 +178,7 @@
 {
 assert(n >= 0 && n <= 31);
 
- put_bits(pb, n, value & ((1<<n)-1));
+ put_bits(pb, n, value & ((1 << n) - 1));
 }
 
 /**
@@ -190,9 +201,9 @@
 * Return the pointer to the byte where the bitstream writer will put
 * the next bit.
 */
-static inline uint8_t* put_bits_ptr(PutBitContext *s)
+static inline uint8_t *put_bits_ptr(PutBitContext *s)
 {
- return s->buf_ptr;
+ return s->buf_ptr;
 }
 
 /**
@@ -201,9 +212,9 @@
 */
 static inline void skip_put_bytes(PutBitContext *s, int n)
 {
- assert((put_bits_count(s)&7)==0);
- assert(s->bit_left==32);
- s->buf_ptr += n;
+ assert((put_bits_count(s) & 7) == 0);
+ assert(s->bit_left == 32);
+ s->buf_ptr += n;
 }
 
 /**
@@ -214,7 +225,7 @@
 static inline void skip_put_bits(PutBitContext *s, int n)
 {
 s->bit_left -= n;
- s->buf_ptr-= 4*(s->bit_left>>5);
+ s->buf_ptr -= 4 * (s->bit_left >> 5);
 s->bit_left &= 31;
 }
 
@@ -225,7 +236,7 @@
 */
 static inline void set_put_bits_buffer_size(PutBitContext *s, int size)
 {
- s->buf_end= s->buf + size;
+ s->buf_end = s->buf + size;
 }
 
 #endif /* AVCODEC_PUT_BITS_H */

libav-v9.6.tar.bz2/libavcodec/qcelpdec.c -> libav-v10.1.tar.bz2/libavcodec/qcelpdec.c Changed

@@ -30,10 +30,10 @@
 #include <stddef.h>
 
 #include "libavutil/channel_layout.h"
+#include "libavutil/float_dsp.h"
 #include "avcodec.h"
 #include "internal.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "qcelpdata.h"
 #include "celp_filters.h"
 #include "acelp_filters.h"
@@ -53,7 +53,6 @@
 } qcelp_packet_rate;
 
 typedef struct {
- AVFrame avframe;
 GetBitContext gb;
 qcelp_packet_rate bitrate;
 QCELPFrame frame; /**< unpacked data frame */
@@ -95,10 +94,7 @@
 avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
 
 for (i = 0; i < 10; i++)
- q->prev_lspf[i] = (i + 1) / 11.;
-
- avcodec_get_frame_defaults(&q->avframe);
- avctx->coded_frame = &q->avframe;
+ q->prev_lspf[i] = (i + 1) / 11.0;
 
 return 0;
 }
@@ -166,7 +162,7 @@
 } else {
 q->octave_count = 0;
 
- tmp_lspf = 0.;
+ tmp_lspf = 0.0;
 for (i = 0; i < 5; i++) {
 lspf[2 * i + 0] = tmp_lspf += qcelp_lspvq[i][q->frame.lspv[i]][0] * 0.0001;
 lspf[2 * i + 1] = tmp_lspf += qcelp_lspvq[i][q->frame.lspv[i]][1] * 0.0001;
@@ -400,12 +396,10 @@
 {
 int i;
 
- for (i = 0; i < 160; i += 40)
- ff_scale_vector_to_given_sum_of_squares(v_out + i, v_in + i,
- ff_scalarproduct_float_c(v_ref + i,
- v_ref + i,
- 40),
- 40);
+ for (i = 0; i < 160; i += 40) {
+ float res = avpriv_scalarproduct_float_c(v_ref + i, v_ref + i, 40);
+ ff_scale_vector_to_given_sum_of_squares(v_out + i, v_in + i, res, 40);
+ }
 }
 
 /**
@@ -440,7 +434,7 @@
 v_lag = memory + 143 + 40 * i - lag[i];
 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.; j < 4; j++)
+ for (j = 0, *v_out = 0.0; j < 4; j++)
 *v_out += qcelp_hammsinc_table[j] * (v_lag[j - 4] + v_lag[3 - j]);
 } else
 *v_out = *v_lag;
@@ -641,8 +635,8 @@
 return I_F_Q;
 
 if (bitrate == SILENCE) {
- //FIXME: Remove experimental warning when tested with samples.
- av_log_ask_for_sample(avctx, "'Blank frame handling is experimental.");
+ // FIXME: Remove this warning when tested with samples.
+ avpriv_request_sample(avctx, "Blank frame handling");
 }
 return bitrate;
 }
@@ -680,8 +674,9 @@
 ff_tilt_compensation(&q->postfilter_tilt_mem, 0.3, pole_out + 10, 160);
 
 ff_adaptive_gain_control(samples, pole_out + 10,
- ff_scalarproduct_float_c(q->formant_mem + 10,
- q->formant_mem + 10, 160),
+ avpriv_scalarproduct_float_c(q->formant_mem + 10,
+ q->formant_mem + 10,
+ 160),
 160, 0.9375, &q->postfilter_agc_mem);
 }
 
@@ -691,6 +686,7 @@
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 QCELPContext *q = avctx->priv_data;
+ AVFrame *frame = data;
 float *outbuffer;
 int i, ret;
 float quantized_lspf[10], lpc[10];
@@ -698,12 +694,12 @@
 float *formant_mem;
 
 /* get output buffer */
- q->avframe.nb_samples = 160;
- if ((ret = ff_get_buffer(avctx, &q->avframe)) < 0) {
+ frame->nb_samples = 160;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- outbuffer = (float *)q->avframe.data[0];
+ 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.");
@@ -786,19 +782,18 @@
 memcpy(q->prev_lspf, quantized_lspf, sizeof(q->prev_lspf));
 q->prev_bitrate = q->bitrate;
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = q->avframe;
+ *got_frame_ptr = 1;
 
 return buf_size;
 }
 
 AVCodec ff_qcelp_decoder = {
 .name = "qcelp",
+ .long_name = NULL_IF_CONFIG_SMALL("QCELP / PureVoice"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_QCELP,
 .init = qcelp_decode_init,
 .decode = qcelp_decode_frame,
 .capabilities = CODEC_CAP_DR1,
 .priv_data_size = sizeof(QCELPContext),
- .long_name = NULL_IF_CONFIG_SMALL("QCELP / PureVoice"),
 };

libav-v9.6.tar.bz2/libavcodec/qdm2.c -> libav-v10.1.tar.bz2/libavcodec/qdm2.c Changed

@@ -39,7 +39,6 @@
 #include "libavutil/channel_layout.h"
 #include "avcodec.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "rdft.h"
 #include "mpegaudiodsp.h"
@@ -130,8 +129,6 @@
 * QDM2 decoder context
 */
 typedef struct {
- AVFrame frame;
-
 /// Parameters from codec header, do not change during playback
 int nb_channels; ///< number of channels
 int channels; ///< number of channels
@@ -219,121 +216,154 @@
 0,260,566,598,894,1166,1230,1294,1678,1950,2214,2278,2310,2570,2834,3124,3448,3838,
 };
 
+static const int switchtable[23] = {
+ 0, 5, 1, 5, 5, 5, 5, 5, 2, 5, 5, 5, 5, 5, 5, 5, 3, 5, 5, 5, 5, 5, 4
+};
+
 static av_cold void qdm2_init_vlc(void)
 {
- static int vlcs_initialized = 0;
 static VLC_TYPE qdm2_table[3838][2];
 
- if (!vlcs_initialized) {
-
- vlc_tab_level.table = &qdm2_table[qdm2_vlc_offs[0]];
- vlc_tab_level.table_allocated = qdm2_vlc_offs[1] - qdm2_vlc_offs[0];
- init_vlc (&vlc_tab_level, 8, 24,
- vlc_tab_level_huffbits, 1, 1,
- vlc_tab_level_huffcodes, 2, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
-
- vlc_tab_diff.table = &qdm2_table[qdm2_vlc_offs[1]];
- vlc_tab_diff.table_allocated = qdm2_vlc_offs[2] - qdm2_vlc_offs[1];
- init_vlc (&vlc_tab_diff, 8, 37,
- vlc_tab_diff_huffbits, 1, 1,
- vlc_tab_diff_huffcodes, 2, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
-
- vlc_tab_run.table = &qdm2_table[qdm2_vlc_offs[2]];
- vlc_tab_run.table_allocated = qdm2_vlc_offs[3] - qdm2_vlc_offs[2];
- init_vlc (&vlc_tab_run, 5, 6,
- vlc_tab_run_huffbits, 1, 1,
- vlc_tab_run_huffcodes, 1, 1, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
-
- fft_level_exp_alt_vlc.table = &qdm2_table[qdm2_vlc_offs[3]];
- fft_level_exp_alt_vlc.table_allocated = qdm2_vlc_offs[4] - qdm2_vlc_offs[3];
- init_vlc (&fft_level_exp_alt_vlc, 8, 28,
- fft_level_exp_alt_huffbits, 1, 1,
- fft_level_exp_alt_huffcodes, 2, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
-
-
- fft_level_exp_vlc.table = &qdm2_table[qdm2_vlc_offs[4]];
- fft_level_exp_vlc.table_allocated = qdm2_vlc_offs[5] - qdm2_vlc_offs[4];
- init_vlc (&fft_level_exp_vlc, 8, 20,
- fft_level_exp_huffbits, 1, 1,
- fft_level_exp_huffcodes, 2, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
-
- fft_stereo_exp_vlc.table = &qdm2_table[qdm2_vlc_offs[5]];
- fft_stereo_exp_vlc.table_allocated = qdm2_vlc_offs[6] - qdm2_vlc_offs[5];
- init_vlc (&fft_stereo_exp_vlc, 6, 7,
- fft_stereo_exp_huffbits, 1, 1,
- fft_stereo_exp_huffcodes, 1, 1, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
-
- fft_stereo_phase_vlc.table = &qdm2_table[qdm2_vlc_offs[6]];
- fft_stereo_phase_vlc.table_allocated = qdm2_vlc_offs[7] - qdm2_vlc_offs[6];
- init_vlc (&fft_stereo_phase_vlc, 6, 9,
- fft_stereo_phase_huffbits, 1, 1,
- fft_stereo_phase_huffcodes, 1, 1, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
-
- vlc_tab_tone_level_idx_hi1.table = &qdm2_table[qdm2_vlc_offs[7]];
- vlc_tab_tone_level_idx_hi1.table_allocated = qdm2_vlc_offs[8] - qdm2_vlc_offs[7];
- init_vlc (&vlc_tab_tone_level_idx_hi1, 8, 20,
- vlc_tab_tone_level_idx_hi1_huffbits, 1, 1,
- vlc_tab_tone_level_idx_hi1_huffcodes, 2, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
-
- vlc_tab_tone_level_idx_mid.table = &qdm2_table[qdm2_vlc_offs[8]];
- vlc_tab_tone_level_idx_mid.table_allocated = qdm2_vlc_offs[9] - qdm2_vlc_offs[8];
- init_vlc (&vlc_tab_tone_level_idx_mid, 8, 24,
- vlc_tab_tone_level_idx_mid_huffbits, 1, 1,
- vlc_tab_tone_level_idx_mid_huffcodes, 2, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
-
- vlc_tab_tone_level_idx_hi2.table = &qdm2_table[qdm2_vlc_offs[9]];
- vlc_tab_tone_level_idx_hi2.table_allocated = qdm2_vlc_offs[10] - qdm2_vlc_offs[9];
- init_vlc (&vlc_tab_tone_level_idx_hi2, 8, 24,
- vlc_tab_tone_level_idx_hi2_huffbits, 1, 1,
- vlc_tab_tone_level_idx_hi2_huffcodes, 2, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
-
- vlc_tab_type30.table = &qdm2_table[qdm2_vlc_offs[10]];
- vlc_tab_type30.table_allocated = qdm2_vlc_offs[11] - qdm2_vlc_offs[10];
- init_vlc (&vlc_tab_type30, 6, 9,
- vlc_tab_type30_huffbits, 1, 1,
- vlc_tab_type30_huffcodes, 1, 1, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
-
- vlc_tab_type34.table = &qdm2_table[qdm2_vlc_offs[11]];
- vlc_tab_type34.table_allocated = qdm2_vlc_offs[12] - qdm2_vlc_offs[11];
- init_vlc (&vlc_tab_type34, 5, 10,
- vlc_tab_type34_huffbits, 1, 1,
- vlc_tab_type34_huffcodes, 1, 1, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
-
- vlc_tab_fft_tone_offset[0].table = &qdm2_table[qdm2_vlc_offs[12]];
- vlc_tab_fft_tone_offset[0].table_allocated = qdm2_vlc_offs[13] - qdm2_vlc_offs[12];
- init_vlc (&vlc_tab_fft_tone_offset[0], 8, 23,
- vlc_tab_fft_tone_offset_0_huffbits, 1, 1,
- vlc_tab_fft_tone_offset_0_huffcodes, 2, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
-
- vlc_tab_fft_tone_offset[1].table = &qdm2_table[qdm2_vlc_offs[13]];
- vlc_tab_fft_tone_offset[1].table_allocated = qdm2_vlc_offs[14] - qdm2_vlc_offs[13];
- init_vlc (&vlc_tab_fft_tone_offset[1], 8, 28,
- vlc_tab_fft_tone_offset_1_huffbits, 1, 1,
- vlc_tab_fft_tone_offset_1_huffcodes, 2, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
-
- vlc_tab_fft_tone_offset[2].table = &qdm2_table[qdm2_vlc_offs[14]];
- vlc_tab_fft_tone_offset[2].table_allocated = qdm2_vlc_offs[15] - qdm2_vlc_offs[14];
- init_vlc (&vlc_tab_fft_tone_offset[2], 8, 32,
- vlc_tab_fft_tone_offset_2_huffbits, 1, 1,
- vlc_tab_fft_tone_offset_2_huffcodes, 2, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
-
- vlc_tab_fft_tone_offset[3].table = &qdm2_table[qdm2_vlc_offs[15]];
- vlc_tab_fft_tone_offset[3].table_allocated = qdm2_vlc_offs[16] - qdm2_vlc_offs[15];
- init_vlc (&vlc_tab_fft_tone_offset[3], 8, 35,
- vlc_tab_fft_tone_offset_3_huffbits, 1, 1,
- vlc_tab_fft_tone_offset_3_huffcodes, 2, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
-
- vlc_tab_fft_tone_offset[4].table = &qdm2_table[qdm2_vlc_offs[16]];
- vlc_tab_fft_tone_offset[4].table_allocated = qdm2_vlc_offs[17] - qdm2_vlc_offs[16];
- init_vlc (&vlc_tab_fft_tone_offset[4], 8, 38,
- vlc_tab_fft_tone_offset_4_huffbits, 1, 1,
- vlc_tab_fft_tone_offset_4_huffcodes, 2, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
-
- vlcs_initialized=1;
- }
+ vlc_tab_level.table = &qdm2_table[qdm2_vlc_offs[0]];
+ vlc_tab_level.table_allocated = qdm2_vlc_offs[1] - qdm2_vlc_offs[0];
+ init_vlc(&vlc_tab_level, 8, 24,
+ vlc_tab_level_huffbits, 1, 1,
+ vlc_tab_level_huffcodes, 2, 2,
+ INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
+
+ vlc_tab_diff.table = &qdm2_table[qdm2_vlc_offs[1]];
+ vlc_tab_diff.table_allocated = qdm2_vlc_offs[2] - qdm2_vlc_offs[1];
+ init_vlc(&vlc_tab_diff, 8, 37,
+ vlc_tab_diff_huffbits, 1, 1,
+ vlc_tab_diff_huffcodes, 2, 2,
+ INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
+
+ vlc_tab_run.table = &qdm2_table[qdm2_vlc_offs[2]];
+ vlc_tab_run.table_allocated = qdm2_vlc_offs[3] - qdm2_vlc_offs[2];
+ init_vlc(&vlc_tab_run, 5, 6,
+ vlc_tab_run_huffbits, 1, 1,
+ vlc_tab_run_huffcodes, 1, 1,
+ INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
+
+ fft_level_exp_alt_vlc.table = &qdm2_table[qdm2_vlc_offs[3]];
+ fft_level_exp_alt_vlc.table_allocated = qdm2_vlc_offs[4] -
+ qdm2_vlc_offs[3];
+ init_vlc(&fft_level_exp_alt_vlc, 8, 28,
+ fft_level_exp_alt_huffbits, 1, 1,
+ fft_level_exp_alt_huffcodes, 2, 2,
+ INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
+
+ fft_level_exp_vlc.table = &qdm2_table[qdm2_vlc_offs[4]];
+ fft_level_exp_vlc.table_allocated = qdm2_vlc_offs[5] - qdm2_vlc_offs[4];
+ init_vlc(&fft_level_exp_vlc, 8, 20,
+ fft_level_exp_huffbits, 1, 1,
+ fft_level_exp_huffcodes, 2, 2,
+ INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
+
+ fft_stereo_exp_vlc.table = &qdm2_table[qdm2_vlc_offs[5]];
+ fft_stereo_exp_vlc.table_allocated = qdm2_vlc_offs[6] -
+ qdm2_vlc_offs[5];
+ init_vlc(&fft_stereo_exp_vlc, 6, 7,
+ fft_stereo_exp_huffbits, 1, 1,
+ fft_stereo_exp_huffcodes, 1, 1,
+ INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
+
+ fft_stereo_phase_vlc.table = &qdm2_table[qdm2_vlc_offs[6]];
+ fft_stereo_phase_vlc.table_allocated = qdm2_vlc_offs[7] -
+ qdm2_vlc_offs[6];
+ init_vlc(&fft_stereo_phase_vlc, 6, 9,
+ fft_stereo_phase_huffbits, 1, 1,
+ fft_stereo_phase_huffcodes, 1, 1,
+ INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
+
+ vlc_tab_tone_level_idx_hi1.table =
+ &qdm2_table[qdm2_vlc_offs[7]];
+ vlc_tab_tone_level_idx_hi1.table_allocated = qdm2_vlc_offs[8] -
+ qdm2_vlc_offs[7];
+ init_vlc(&vlc_tab_tone_level_idx_hi1, 8, 20,
+ vlc_tab_tone_level_idx_hi1_huffbits, 1, 1,
+ vlc_tab_tone_level_idx_hi1_huffcodes, 2, 2,
+ INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
+
+ vlc_tab_tone_level_idx_mid.table =
+ &qdm2_table[qdm2_vlc_offs[8]];
+ vlc_tab_tone_level_idx_mid.table_allocated = qdm2_vlc_offs[9] -
+ qdm2_vlc_offs[8];
+ init_vlc(&vlc_tab_tone_level_idx_mid, 8, 24,
+ vlc_tab_tone_level_idx_mid_huffbits, 1, 1,
+ vlc_tab_tone_level_idx_mid_huffcodes, 2, 2,
+ INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
+
+ vlc_tab_tone_level_idx_hi2.table =
+ &qdm2_table[qdm2_vlc_offs[9]];
+ vlc_tab_tone_level_idx_hi2.table_allocated = qdm2_vlc_offs[10] -
+ qdm2_vlc_offs[9];
+ init_vlc(&vlc_tab_tone_level_idx_hi2, 8, 24,
+ vlc_tab_tone_level_idx_hi2_huffbits, 1, 1,
+ vlc_tab_tone_level_idx_hi2_huffcodes, 2, 2,
+ INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
+
+ vlc_tab_type30.table = &qdm2_table[qdm2_vlc_offs[10]];
+ vlc_tab_type30.table_allocated = qdm2_vlc_offs[11] - qdm2_vlc_offs[10];
+ init_vlc(&vlc_tab_type30, 6, 9,
+ vlc_tab_type30_huffbits, 1, 1,
+ vlc_tab_type30_huffcodes, 1, 1,
+ INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
+
+ vlc_tab_type34.table = &qdm2_table[qdm2_vlc_offs[11]];
+ vlc_tab_type34.table_allocated = qdm2_vlc_offs[12] - qdm2_vlc_offs[11];
+ init_vlc(&vlc_tab_type34, 5, 10,
+ vlc_tab_type34_huffbits, 1, 1,
+ vlc_tab_type34_huffcodes, 1, 1,
+ INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
+
+ vlc_tab_fft_tone_offset[0].table =
+ &qdm2_table[qdm2_vlc_offs[12]];
+ vlc_tab_fft_tone_offset[0].table_allocated = qdm2_vlc_offs[13] -
+ qdm2_vlc_offs[12];
+ init_vlc(&vlc_tab_fft_tone_offset[0], 8, 23,
+ vlc_tab_fft_tone_offset_0_huffbits, 1, 1,
+ vlc_tab_fft_tone_offset_0_huffcodes, 2, 2,
+ INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
+
+ vlc_tab_fft_tone_offset[1].table =
+ &qdm2_table[qdm2_vlc_offs[13]];
+ vlc_tab_fft_tone_offset[1].table_allocated = qdm2_vlc_offs[14] -
+ qdm2_vlc_offs[13];
+ init_vlc(&vlc_tab_fft_tone_offset[1], 8, 28,
+ vlc_tab_fft_tone_offset_1_huffbits, 1, 1,
+ vlc_tab_fft_tone_offset_1_huffcodes, 2, 2,
+ INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
+
+ vlc_tab_fft_tone_offset[2].table =
+ &qdm2_table[qdm2_vlc_offs[14]];
+ vlc_tab_fft_tone_offset[2].table_allocated = qdm2_vlc_offs[15] -
+ qdm2_vlc_offs[14];
+ init_vlc(&vlc_tab_fft_tone_offset[2], 8, 32,
+ vlc_tab_fft_tone_offset_2_huffbits, 1, 1,
+ vlc_tab_fft_tone_offset_2_huffcodes, 2, 2,
+ INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
+
+ vlc_tab_fft_tone_offset[3].table =
+ &qdm2_table[qdm2_vlc_offs[15]];
+ vlc_tab_fft_tone_offset[3].table_allocated = qdm2_vlc_offs[16] -
+ qdm2_vlc_offs[15];
+ init_vlc(&vlc_tab_fft_tone_offset[3], 8, 35,
+ vlc_tab_fft_tone_offset_3_huffbits, 1, 1,
+ vlc_tab_fft_tone_offset_3_huffcodes, 2, 2,
+ INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
+
+ vlc_tab_fft_tone_offset[4].table =
+ &qdm2_table[qdm2_vlc_offs[16]];
+ vlc_tab_fft_tone_offset[4].table_allocated = qdm2_vlc_offs[17] -
+ qdm2_vlc_offs[16];
+ init_vlc(&vlc_tab_fft_tone_offset[4], 8, 38,
+ vlc_tab_fft_tone_offset_4_huffbits, 1, 1,
+ vlc_tab_fft_tone_offset_4_huffcodes, 2, 2,
+ INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
 }
 
-static int qdm2_get_vlc (GetBitContext *gb, VLC *vlc, int flag, int depth)
+static int qdm2_get_vlc(GetBitContext *gb, VLC *vlc, int flag, int depth)
 {
 int value;
 
@@ -341,29 +371,27 @@
 
 /* stage-2, 3 bits exponent escape sequence */
 if (value-- == 0)
- value = get_bits (gb, get_bits (gb, 3) + 1);
+ value = get_bits(gb, get_bits(gb, 3) + 1);
 
 /* stage-3, optional */
 if (flag) {
 int tmp = vlc_stage3_values[value];
 
 if ((value & ~3) > 0)
- tmp += get_bits (gb, (value >> 2));
+ tmp += get_bits(gb, (value >> 2));
 value = tmp;
 }
 
 return value;
 }
 
-
-static int qdm2_get_se_vlc (VLC *vlc, GetBitContext *gb, int depth)
+static int qdm2_get_se_vlc(VLC *vlc, GetBitContext *gb, int depth)
 {
- int value = qdm2_get_vlc (gb, vlc, 0, depth);
+ int value = qdm2_get_vlc(gb, vlc, 0, depth);
 
 return (value & 1) ? ((value + 1) >> 1) : -(value >> 1);
 }
 
-
 /**
 * QDM2 checksum
 *
@@ -373,49 +401,50 @@
 *
 * @return 0 if checksum is OK
 */
-static uint16_t qdm2_packet_checksum (const uint8_t *data, int length, int value) {
+static uint16_t qdm2_packet_checksum(const uint8_t *data, int length, int value)
+{
 int i;
 
- for (i=0; i < length; i++)
+ for (i = 0; i < length; i++)
 value -= data[i];
 
 return (uint16_t)(value & 0xffff);
 }
 
-
 /**
 * Fill a QDM2SubPacket structure with packet type, size, and data pointer.
 *
 * @param gb bitreader context
 * @param sub_packet packet under analysis
 */
-static void qdm2_decode_sub_packet_header (GetBitContext *gb, QDM2SubPacket *sub_packet)
+static void qdm2_decode_sub_packet_header(GetBitContext *gb,
+ QDM2SubPacket *sub_packet)
 {
- sub_packet->type = get_bits (gb, 8);
+ sub_packet->type = get_bits(gb, 8);
 
 if (sub_packet->type == 0) {
 sub_packet->size = 0;
 sub_packet->data = NULL;
 } else {
- sub_packet->size = get_bits (gb, 8);
+ sub_packet->size = get_bits(gb, 8);
 
- if (sub_packet->type & 0x80) {
- sub_packet->size <<= 8;
- sub_packet->size |= get_bits (gb, 8);
- sub_packet->type &= 0x7f;
- }
+ if (sub_packet->type & 0x80) {
+ sub_packet->size <<= 8;
+ sub_packet->size |= get_bits(gb, 8);
+ sub_packet->type &= 0x7f;
+ }
 
- if (sub_packet->type == 0x7f)
- sub_packet->type |= (get_bits (gb, 8) << 8);
+ if (sub_packet->type == 0x7f)
+ sub_packet->type |= (get_bits(gb, 8) << 8);
 
- sub_packet->data = &gb->buffer[get_bits_count(gb) / 8]; // FIXME: this depends on bitreader internal data
+ // FIXME: this depends on bitreader-internal data
+ sub_packet->data = &gb->buffer[get_bits_count(gb) / 8];
 }
 
- av_log(NULL,AV_LOG_DEBUG,"Subpacket: type=%d size=%d start_offs=%x\n",
- sub_packet->type, sub_packet->size, get_bits_count(gb) / 8);
+ av_log(NULL, AV_LOG_DEBUG, "Subpacket: type=%d size=%d start_offs=%x\n",
+ sub_packet->type, sub_packet->size, get_bits_count(gb) / 8);
 }
 
-
 /**
 * Return node pointer to first packet of requested type in list.
 *
@@ -423,7 +452,8 @@
 * @param type type of searched subpacket
 * @return node pointer for subpacket if found, else NULL
 */
-static QDM2SubPNode* qdm2_search_subpacket_type_in_list (QDM2SubPNode *list, int type)
+static QDM2SubPNode *qdm2_search_subpacket_type_in_list(QDM2SubPNode *list,
+ int type)
 {
 while (list != NULL && list->packet != NULL) {
 if (list->packet->type == type)
@@ -433,14 +463,13 @@
 return NULL;
 }
 
-
 /**
 * Replace 8 elements with their average value.
 * Called by qdm2_decode_superblock before starting subblock decoding.
 *
 * @param q context
 */
-static void average_quantized_coeffs (QDM2Context *q)
+static void average_quantized_coeffs(QDM2Context *q)
 {
 int i, j, n, ch, sum;
 
@@ -457,12 +486,11 @@
 if (sum > 0)
 sum--;
 
- for (j=0; j < 8; j++)
+ for (j = 0; j < 8; j++)
 q->quantized_coeffs[ch][i][j] = sum;
 }
 }
 
-
 /**
 * Build subband samples with noise weighted by q->tone_level.
 * Called by synthfilt_build_sb_samples.
@@ -470,7 +498,7 @@
 * @param q context
 * @param sb subband index
 */
-static void build_sb_samples_from_noise (QDM2Context *q, int sb)
+static void build_sb_samples_from_noise(QDM2Context *q, int sb)
 {
 int ch, j;
 
@@ -479,14 +507,16 @@
 if (!q->nb_channels)
 return;
 
- for (ch = 0; ch < q->nb_channels; ch++)
+ for (ch = 0; ch < q->nb_channels; ch++) {
 for (j = 0; j < 64; j++) {
- q->sb_samples[ch][j * 2][sb] = SB_DITHERING_NOISE(sb,q->noise_idx) * q->tone_level[ch][sb][j];
- q->sb_samples[ch][j * 2 + 1][sb] = SB_DITHERING_NOISE(sb,q->noise_idx) * q->tone_level[ch][sb][j];
+ q->sb_samples[ch][j * 2][sb] =
+ SB_DITHERING_NOISE(sb, q->noise_idx) * q->tone_level[ch][sb][j];
+ q->sb_samples[ch][j * 2 + 1][sb] =
+ SB_DITHERING_NOISE(sb, q->noise_idx) * q->tone_level[ch][sb][j];
 }
+ }
 }
 
-
 /**
 * Called while processing data from subpackets 11 and 12.
 * Used after making changes to coding_method array.
@@ -495,44 +525,65 @@
 * @param channels number of channels
 * @param coding_method q->coding_method[0][0][0]
 */
-static void fix_coding_method_array (int sb, int channels, sb_int8_array coding_method)
+static int fix_coding_method_array(int sb, int channels,
+ sb_int8_array coding_method)
 {
- int j,k;
+ int j, k;
 int ch;
 int run, case_val;
- static const int switchtable[23] = {0,5,1,5,5,5,5,5,2,5,5,5,5,5,5,5,3,5,5,5,5,5,4};
 
 for (ch = 0; ch < channels; ch++) {
 for (j = 0; j < 64; ) {
- if((coding_method[ch][sb][j] - 8) > 22) {
- run = 1;
+ if (coding_method[ch][sb][j] < 8)
+ return -1;
+ if ((coding_method[ch][sb][j] - 8) > 22) {
+ run = 1;
 case_val = 8;
 } else {
- switch (switchtable[coding_method[ch][sb][j]-8]) {
- case 0: run = 10; case_val = 10; break;
- case 1: run = 1; case_val = 16; break;
- case 2: run = 5; case_val = 24; break;
- case 3: run = 3; case_val = 30; break;
- case 4: run = 1; case_val = 30; break;
- case 5: run = 1; case_val = 8; break;
- default: run = 1; case_val = 8; break;
+ switch (switchtable[coding_method[ch][sb][j] - 8]) {
+ case 0: run = 10;
+ case_val = 10;
+ break;
+ case 1: run = 1;
+ case_val = 16;
+ break;
+ case 2: run = 5;
+ case_val = 24;
+ break;
+ case 3: run = 3;
+ case_val = 30;
+ break;
+ case 4: run = 1;
+ case_val = 30;
+ break;
+ case 5: run = 1;
+ case_val = 8;
+ break;
+ default: run = 1;
+ case_val = 8;
+ break;
 }
 }
- for (k = 0; k < run; k++)
- if (j + k < 128)
- if (coding_method[ch][sb + (j + k) / 64][(j + k) % 64] > coding_method[ch][sb][j])
+ for (k = 0; k < run; k++) {
+ if (j + k < 128) {
+ if (coding_method[ch][sb + (j + k) / 64][(j + k) % 64] > coding_method[ch][sb][j]) {
 if (k > 0) {
- SAMPLES_NEEDED
+ SAMPLES_NEEDED
 //not debugged, almost never used
- memset(&coding_method[ch][sb][j + k], case_val, k * sizeof(int8_t));
- memset(&coding_method[ch][sb][j + k], case_val, 3 * sizeof(int8_t));
+ memset(&coding_method[ch][sb][j + k], case_val,
+ k *sizeof(int8_t));
+ memset(&coding_method[ch][sb][j + k], case_val,
+ 3 * sizeof(int8_t));
 }
+ }
+ }
+ }
 j += run;
 }
 }
+ return 0;
 }
 
-
 /**
 * Related to synthesis filter
 * Called by process_subpacket_10
@@ -540,7 +591,7 @@
 * @param q context
 * @param flag 1 if called after getting data from subpacket 10, 0 if no subpacket 10
 */
-static void fill_tone_level_array (QDM2Context *q, int flag)
+static void fill_tone_level_array(QDM2Context *q, int flag)
 {
 int i, sb, ch, sb_used;
 int tmp, tab;
@@ -612,16 +663,14 @@
 }
 }
 }
-
- return;
 }
 
-
 /**
 * Related to synthesis filter
 * Called by process_subpacket_11
 * c is built with data from subpacket 11
- * Most of this function is used only if superblock_type_2_3 == 0, never seen it in samples
+ * Most of this function is used only if superblock_type_2_3 == 0,
+ * never seen it in samples.
 *
 * @param tone_level_idx
 * @param tone_level_idx_temp
@@ -631,9 +680,12 @@
 * @param superblocktype_2_3 flag based on superblock packet type
 * @param cm_table_select q->cm_table_select
 */
-static void fill_coding_method_array (sb_int8_array tone_level_idx, sb_int8_array tone_level_idx_temp,
- sb_int8_array coding_method, int nb_channels,
- int c, int superblocktype_2_3, int cm_table_select)
+static void fill_coding_method_array(sb_int8_array tone_level_idx,
+ sb_int8_array tone_level_idx_temp,
+ sb_int8_array coding_method,
+ int nb_channels,
+ int c, int superblocktype_2_3,
+ int cm_table_select)
 {
 int ch, sb, j;
 int tmp, acc, esp_40, comp;
@@ -739,15 +791,14 @@
 for (j = 0; j < 64; j++)
 coding_method[ch][sb][j] = coding_method_table[cm_table_select][sb];
 }
-
- return;
 }
 
-
 /**
 *
- * Called by process_subpacket_11 to process more data from subpacket 11 with sb 0-8
- * Called by process_subpacket_12 to process data from subpacket 12 with sb 8-sb_used
+ * Called by process_subpacket_11 to process more data from subpacket 11
+ * with sb 0-8.
+ * Called by process_subpacket_12 to process data from subpacket 12 with
+ * sb 8-sb_used.
 *
 * @param q context
 * @param gb bitreader context
@@ -755,10 +806,11 @@
 * @param sb_min lower subband processed (sb_min included)
 * @param sb_max higher subband processed (sb_max excluded)
 */
-static void synthfilt_build_sb_samples (QDM2Context *q, GetBitContext *gb, int length, int sb_min, int sb_max)
+static void synthfilt_build_sb_samples(QDM2Context *q, GetBitContext *gb,
+ int length, int sb_min, int sb_max)
 {
 int sb, j, k, n, ch, run, channels;
- int joined_stereo, zero_encoding, chs;
+ int joined_stereo, zero_encoding;
 int type34_first;
 float type34_div = 0;
 float type34_predictor;
@@ -767,14 +819,12 @@
 if (length == 0) {
 // If no data use noise
 for (sb=sb_min; sb < sb_max; sb++)
- build_sb_samples_from_noise (q, sb);
+ build_sb_samples_from_noise(q, sb);
 
 return;
 }
 
 for (sb = sb_min; sb < sb_max; sb++) {
- FIX_NOISE_IDX(q->noise_idx);
-
 channels = q->nb_channels;
 
 if (q->nb_channels <= 1 || sb < 12)
@@ -782,22 +832,27 @@
 else if (sb >= 24)
 joined_stereo = 1;
 else
- joined_stereo = (get_bits_left(gb) >= 1) ? get_bits1 (gb) : 0;
+ joined_stereo = (get_bits_left(gb) >= 1) ? get_bits1(gb) : 0;
 
 if (joined_stereo) {
 if (get_bits_left(gb) >= 16)
 for (j = 0; j < 16; j++)
- sign_bits[j] = get_bits1 (gb);
+ sign_bits[j] = get_bits1(gb);
 
 for (j = 0; j < 64; j++)
 if (q->coding_method[1][sb][j] > q->coding_method[0][sb][j])
 q->coding_method[0][sb][j] = q->coding_method[1][sb][j];
 
- fix_coding_method_array(sb, q->nb_channels, q->coding_method);
+ if (fix_coding_method_array(sb, q->nb_channels,
+ q->coding_method)) {
+ build_sb_samples_from_noise(q, sb);
+ continue;
+ }
 channels = 1;
 }
 
 for (ch = 0; ch < channels; ch++) {
+ FIX_NOISE_IDX(q->noise_idx);
 zero_encoding = (get_bits_left(gb) >= 1) ? get_bits1(gb) : 0;
 type34_predictor = 0.0;
 type34_first = 1;
@@ -913,16 +968,18 @@
 }
 
 if (joined_stereo) {
- float tmp[10][MPA_MAX_CHANNELS];
-
- for (k = 0; k < run; k++) {
- tmp[k][0] = samples[k];
- tmp[k][1] = (sign_bits[(j + k) / 8]) ? -samples[k] : samples[k];
+ for (k = 0; k < run && j + k < 128; k++) {
+ q->sb_samples[0][j + k][sb] =
+ q->tone_level[0][sb][(j + k) / 2] * samples[k];
+ if (q->nb_channels == 2) {
+ if (sign_bits[(j + k) / 8])
+ q->sb_samples[1][j + k][sb] =
+ q->tone_level[1][sb][(j + k) / 2] * -samples[k];
+ else
+ q->sb_samples[1][j + k][sb] =
+ q->tone_level[1][sb][(j + k) / 2] * samples[k];
+ }
 }
- for (chs = 0; chs < q->nb_channels; chs++)
- for (k = 0; k < run; k++)
- if ((j + k) < 128)
- q->sb_samples[chs][j + k][sb] = q->tone_level[chs][sb][((j + k)/2)] * tmp[k][chs];
 } else {
 for (k = 0; k < run; k++)
 if ((j + k) < 128)
@@ -935,16 +992,18 @@
 } // subband loop
 }
 
-
 /**
- * Init the first element of a channel in quantized_coeffs with data from packet 10 (quantized_coeffs[ch][0]).
- * This is similar to process_subpacket_9, but for a single channel and for element [0]
+ * Init the first element of a channel in quantized_coeffs with data
+ * from packet 10 (quantized_coeffs[ch][0]).
+ * This is similar to process_subpacket_9, but for a single channel
+ * and for element [0]
 * same VLC tables as process_subpacket_9 are used.
 *
 * @param quantized_coeffs pointer to quantized_coeffs[ch][0]
 * @param gb bitreader context
 */
-static void init_quantized_coeffs_elem0 (int8_t *quantized_coeffs, GetBitContext *gb)
+static void init_quantized_coeffs_elem0(int8_t *quantized_coeffs,
+ GetBitContext *gb)
 {
 int i, k, run, level, diff;
 
@@ -971,16 +1030,16 @@
 }
 }
 
-
 /**
 * Related to synthesis filter, process data from packet 10
 * Init part of quantized_coeffs via function init_quantized_coeffs_elem0
- * Init tone_level_idx_hi1, tone_level_idx_hi2, tone_level_idx_mid with data from packet 10
+ * Init tone_level_idx_hi1, tone_level_idx_hi2, tone_level_idx_mid with
+ * data from packet 10
 *
 * @param q context
 * @param gb bitreader context
 */
-static void init_tone_level_dequantization (QDM2Context *q, GetBitContext *gb)
+static void init_tone_level_dequantization(QDM2Context *q, GetBitContext *gb)
 {
 int sb, j, k, n, ch;
 
@@ -1043,29 +1102,29 @@
 * @param q context
 * @param node pointer to node with packet
 */
-static void process_subpacket_9 (QDM2Context *q, QDM2SubPNode *node)
+static void process_subpacket_9(QDM2Context *q, QDM2SubPNode *node)
 {
 GetBitContext gb;
 int i, j, k, n, ch, run, level, diff;
 
- init_get_bits(&gb, node->packet->data, node->packet->size*8);
+ init_get_bits(&gb, node->packet->data, node->packet->size * 8);
 
- n = coeff_per_sb_for_avg[q->coeff_per_sb_select][QDM2_SB_USED(q->sub_sampling) - 1] + 1; // same as averagesomething function
+ n = coeff_per_sb_for_avg[q->coeff_per_sb_select][QDM2_SB_USED(q->sub_sampling) - 1] + 1;
 
 for (i = 1; i < n; i++)
- for (ch=0; ch < q->nb_channels; ch++) {
+ for (ch = 0; ch < q->nb_channels; ch++) {
 level = qdm2_get_vlc(&gb, &vlc_tab_level, 0, 2);
 q->quantized_coeffs[ch][i][0] = level;
 
 for (j = 0; j < (8 - 1); ) {
- run = qdm2_get_vlc(&gb, &vlc_tab_run, 0, 1) + 1;
+ run = qdm2_get_vlc(&gb, &vlc_tab_run, 0, 1) + 1;
 diff = qdm2_get_se_vlc(&vlc_tab_diff, &gb, 2);
 
 for (k = 1; k <= run; k++)
- q->quantized_coeffs[ch][i][j + k] = (level + ((k*diff) / run));
+ q->quantized_coeffs[ch][i][j + k] = (level + ((k * diff) / run));
 
 level += diff;
- j += run;
+ j += run;
 }
 }
 
@@ -1074,14 +1133,13 @@
 q->quantized_coeffs[ch][0][i] = 0;
 }
 
-
 /**
 * Process subpacket 10 if not null, else
 *
 * @param q context
 * @param node pointer to node with packet
 */
-static void process_subpacket_10 (QDM2Context *q, QDM2SubPNode *node)
+static void process_subpacket_10(QDM2Context *q, QDM2SubPNode *node)
 {
 GetBitContext gb;
 
@@ -1094,14 +1152,13 @@
 }
 }
 
-
 /**
 * Process subpacket 11
 *
 * @param q context
 * @param node pointer to node with packet
 */
-static void process_subpacket_11 (QDM2Context *q, QDM2SubPNode *node)
+static void process_subpacket_11(QDM2Context *q, QDM2SubPNode *node)
 {
 GetBitContext gb;
 int length = 0;
@@ -1112,24 +1169,25 @@
 }
 
 if (length >= 32) {
- int c = get_bits (&gb, 13);
+ int c = get_bits(&gb, 13);
 
 if (c > 3)
- fill_coding_method_array (q->tone_level_idx, q->tone_level_idx_temp, q->coding_method,
- q->nb_channels, 8*c, q->superblocktype_2_3, q->cm_table_select);
+ fill_coding_method_array(q->tone_level_idx,
+ q->tone_level_idx_temp, q->coding_method,
+ q->nb_channels, 8 * c,
+ q->superblocktype_2_3, q->cm_table_select);
 }
 
 synthfilt_build_sb_samples(q, &gb, length, 0, 8);
 }
 
-
 /**
 * Process subpacket 12
 *
 * @param q context
 * @param node pointer to node with packet
 */
-static void process_subpacket_12 (QDM2Context *q, QDM2SubPNode *node)
+static void process_subpacket_12(QDM2Context *q, QDM2SubPNode *node)
 {
 GetBitContext gb;
 int length = 0;
@@ -1148,7 +1206,7 @@
 * @param q context
 * @param list list with synthesis filter packets (list D)
 */
-static void process_synthesis_subpackets (QDM2Context *q, QDM2SubPNode *list)
+static void process_synthesis_subpackets(QDM2Context *q, QDM2SubPNode *list)
 {
 QDM2SubPNode *nodes[4];
 
@@ -1175,13 +1233,12 @@
 process_subpacket_12(q, NULL);
 }
 
-
 /*
 * Decode superblock, fill packet lists.
 *
 * @param q context
 */
-static void qdm2_decode_super_block (QDM2Context *q)
+static void qdm2_decode_super_block(QDM2Context *q)
 {
 GetBitContext gb;
 QDM2SubPacket header, *packet;
@@ -1193,33 +1250,33 @@
 memset(q->tone_level_idx_hi2, 0, sizeof(q->tone_level_idx_hi2));
 
 q->sub_packets_B = 0;
- sub_packets_D = 0;
+ sub_packets_D = 0;
 
 average_quantized_coeffs(q); // average elements in quantized_coeffs[max_ch][10][8]
 
- init_get_bits(&gb, q->compressed_data, q->compressed_size*8);
+ init_get_bits(&gb, q->compressed_data, q->compressed_size * 8);
 qdm2_decode_sub_packet_header(&gb, &header);
 
 if (header.type < 2 || header.type >= 8) {
 q->has_errors = 1;
- av_log(NULL,AV_LOG_ERROR,"bad superblock type\n");
+ av_log(NULL, AV_LOG_ERROR, "bad superblock type\n");
 return;
 }
 
 q->superblocktype_2_3 = (header.type == 2 || header.type == 3);
- packet_bytes = (q->compressed_size - get_bits_count(&gb) / 8);
+ packet_bytes = (q->compressed_size - get_bits_count(&gb) / 8);
 
- init_get_bits(&gb, header.data, header.size*8);
+ init_get_bits(&gb, header.data, header.size * 8);
 
 if (header.type == 2 || header.type == 4 || header.type == 5) {
- int csum = 257 * get_bits(&gb, 8);
- csum += 2 * get_bits(&gb, 8);
+ int csum = 257 * get_bits(&gb, 8);
+ csum += 2 * get_bits(&gb, 8);
 
 csum = qdm2_packet_checksum(q->compressed_data, q->checksum_size, csum);
 
 if (csum != 0) {
 q->has_errors = 1;
- av_log(NULL,AV_LOG_ERROR,"bad packet checksum\n");
+ av_log(NULL, AV_LOG_ERROR, "bad packet checksum\n");
 return;
 }
 }
@@ -1245,8 +1302,8 @@
 q->sub_packet_list_A[i - 1].next = &q->sub_packet_list_A[i];
 
 /* seek to next block */
- init_get_bits(&gb, header.data, header.size*8);
- skip_bits(&gb, next_index*8);
+ init_get_bits(&gb, header.data, header.size * 8);
+ skip_bits(&gb, next_index * 8);
 
 if (next_index >= header.size)
 break;
@@ -1255,7 +1312,7 @@
 /* decode subpacket */
 packet = &q->sub_packets[i];
 qdm2_decode_sub_packet_header(&gb, packet);
- next_index = packet->size + get_bits_count(&gb) / 8;
+ next_index = packet->size + get_bits_count(&gb) / 8;
 sub_packet_size = ((packet->size > 0xff) ? 1 : 0) + packet->size + 2;
 
 if (packet->type == 0)
@@ -1288,13 +1345,13 @@
 } else if (packet->type == 15) {
 SAMPLES_NEEDED_2("packet type 15")
 return;
- } else if (packet->type >= 16 && packet->type < 48 && !fft_subpackets[packet->type - 16]) {
+ } else if (packet->type >= 16 && packet->type < 48 &&
+ !fft_subpackets[packet->type - 16]) {
 /* packets for FFT */
 QDM2_LIST_ADD(q->sub_packet_list_B, q->sub_packets_B, packet);
 }
 } // Packet bytes loop
 
-/* **************************************************************** */
 if (q->sub_packet_list_D[0].packet != NULL) {
 process_synthesis_subpackets(q, q->sub_packet_list_D);
 q->do_synth_filter = 1;
@@ -1303,49 +1360,48 @@
 process_subpacket_11(q, NULL);
 process_subpacket_12(q, NULL);
 }
-/* **************************************************************** */
 }
 
-
-static void qdm2_fft_init_coefficient (QDM2Context *q, int sub_packet,
- int offset, int duration, int channel,
- int exp, int phase)
+static void qdm2_fft_init_coefficient(QDM2Context *q, int sub_packet,
+ int offset, int duration, int channel,
+ int exp, int phase)
 {
 if (q->fft_coefs_min_index[duration] < 0)
 q->fft_coefs_min_index[duration] = q->fft_coefs_index;
 
- q->fft_coefs[q->fft_coefs_index].sub_packet = ((sub_packet >= 16) ? (sub_packet - 16) : sub_packet);
+ q->fft_coefs[q->fft_coefs_index].sub_packet =
+ ((sub_packet >= 16) ? (sub_packet - 16) : sub_packet);
 q->fft_coefs[q->fft_coefs_index].channel = channel;
- q->fft_coefs[q->fft_coefs_index].offset = offset;
- q->fft_coefs[q->fft_coefs_index].exp = exp;
- q->fft_coefs[q->fft_coefs_index].phase = phase;
+ q->fft_coefs[q->fft_coefs_index].offset = offset;
+ q->fft_coefs[q->fft_coefs_index].exp = exp;
+ q->fft_coefs[q->fft_coefs_index].phase = phase;
 q->fft_coefs_index++;
 }
 
-
-static void qdm2_fft_decode_tones (QDM2Context *q, int duration, GetBitContext *gb, int b)
+static void qdm2_fft_decode_tones(QDM2Context *q, int duration,
+ GetBitContext *gb, int b)
 {
 int channel, stereo, phase, exp;
- int local_int_4, local_int_8, stereo_phase, local_int_10;
+ int local_int_4, local_int_8, stereo_phase, local_int_10;
 int local_int_14, stereo_exp, local_int_20, local_int_28;
 int n, offset;
 
- local_int_4 = 0;
+ local_int_4 = 0;
 local_int_28 = 0;
 local_int_20 = 2;
- local_int_8 = (4 - duration);
+ local_int_8 = (4 - duration);
 local_int_10 = 1 << (q->group_order - duration - 1);
- offset = 1;
+ offset = 1;
 
 while (1) {
 if (q->superblocktype_2_3) {
 while ((n = qdm2_get_vlc(gb, &vlc_tab_fft_tone_offset[local_int_8], 1, 2)) < 2) {
 offset = 1;
 if (n == 0) {
- local_int_4 += local_int_10;
+ local_int_4 += local_int_10;
 local_int_28 += (1 << local_int_8);
 } else {
- local_int_4 += 8*local_int_10;
+ local_int_4 += 8 * local_int_10;
 local_int_28 += (8 << local_int_8);
 }
 }
@@ -1353,7 +1409,7 @@
 } else {
 offset += qdm2_get_vlc(gb, &vlc_tab_fft_tone_offset[local_int_8], 1, 2);
 while (offset >= (local_int_10 - 1)) {
- offset += (1 - (local_int_10 - 1));
+ offset += (1 - (local_int_10 - 1));
 local_int_4 += local_int_10;
 local_int_28 += (1 << local_int_8);
 }
@@ -1368,22 +1424,22 @@
 
 if (q->nb_channels > 1) {
 channel = get_bits1(gb);
- stereo = get_bits1(gb);
+ stereo = get_bits1(gb);
 } else {
 channel = 0;
- stereo = 0;
+ stereo = 0;
 }
 
- exp = qdm2_get_vlc(gb, (b ? &fft_level_exp_vlc : &fft_level_exp_alt_vlc), 0, 2);
+ exp = qdm2_get_vlc(gb, (b ? &fft_level_exp_vlc : &fft_level_exp_alt_vlc), 0, 2);
 exp += q->fft_level_exp[fft_level_index_table[local_int_14]];
- exp = (exp < 0) ? 0 : exp;
+ exp = (exp < 0) ? 0 : exp;
 
- phase = get_bits(gb, 3);
- stereo_exp = 0;
+ phase = get_bits(gb, 3);
+ stereo_exp = 0;
 stereo_phase = 0;
 
 if (stereo) {
- stereo_exp = (exp - qdm2_get_vlc(gb, &fft_stereo_exp_vlc, 0, 1));
+ stereo_exp = (exp - qdm2_get_vlc(gb, &fft_stereo_exp_vlc, 0, 1));
 stereo_phase = (phase - qdm2_get_vlc(gb, &fft_stereo_phase_vlc, 0, 1));
 if (stereo_phase < 0)
 stereo_phase += 8;
@@ -1392,17 +1448,18 @@
 if (q->frequency_range > (local_int_14 + 1)) {
 int sub_packet = (local_int_20 + local_int_28);
 
- qdm2_fft_init_coefficient(q, sub_packet, offset, duration, channel, exp, phase);
+ qdm2_fft_init_coefficient(q, sub_packet, offset, duration,
+ channel, exp, phase);
 if (stereo)
- qdm2_fft_init_coefficient(q, sub_packet, offset, duration, (1 - channel), stereo_exp, stereo_phase);
+ qdm2_fft_init_coefficient(q, sub_packet, offset, duration,
+ 1 - channel,
+ stereo_exp, stereo_phase);
 }
-
 offset++;
 }
 }
 
-
-static void qdm2_decode_fft_packets (QDM2Context *q)
+static void qdm2_decode_fft_packets(QDM2Context *q)
 {
 int i, j, min, max, value, type, unknown_flag;
 GetBitContext gb;
@@ -1412,18 +1469,18 @@
 
 /* reset minimum indexes for FFT coefficients */
 q->fft_coefs_index = 0;
- for (i=0; i < 5; i++)
+ for (i = 0; i < 5; i++)
 q->fft_coefs_min_index[i] = -1;
 
 /* process subpackets ordered by type, largest type first */
 for (i = 0, max = 256; i < q->sub_packets_B; i++) {
- QDM2SubPacket *packet= NULL;
+ QDM2SubPacket *packet = NULL;
 
 /* find subpacket with largest type less than max */
 for (j = 0, min = 0; j < q->sub_packets_B; j++) {
 value = q->sub_packet_list_B[j].packet->type;
 if (value > min && value < max) {
- min = value;
+ min = value;
 packet = q->sub_packet_list_B[j].packet;
 }
 }
@@ -1434,11 +1491,13 @@
 if (!packet)
 return;
 
- if (i == 0 && (packet->type < 16 || packet->type >= 48 || fft_subpackets[packet->type - 16]))
+ if (i == 0 &&
+ (packet->type < 16 || packet->type >= 48 ||
+ fft_subpackets[packet->type - 16]))
 return;
 
 /* decode FFT tones */
- init_get_bits (&gb, packet->data, packet->size*8);
+ init_get_bits(&gb, packet->data, packet->size * 8);
 
 if (packet->type >= 32 && packet->type < 48 && !fft_subpackets[packet->type - 16])
 unknown_flag = 1;
@@ -1453,13 +1512,13 @@
 if (duration >= 0 && duration < 4)
 qdm2_fft_decode_tones(q, duration, &gb, unknown_flag);
 } else if (type == 31) {
- for (j=0; j < 4; j++)
+ for (j = 0; j < 4; j++)
 qdm2_fft_decode_tones(q, j, &gb, unknown_flag);
 } else if (type == 46) {
- for (j=0; j < 6; j++)
+ for (j = 0; j < 6; j++)
 q->fft_level_exp[j] = get_bits(&gb, 6);
- for (j=0; j < 4; j++)
- qdm2_fft_decode_tones(q, j, &gb, unknown_flag);
+ for (j = 0; j < 4; j++)
+ qdm2_fft_decode_tones(q, j, &gb, unknown_flag);
 }
 } // Loop on B packets
 
@@ -1474,20 +1533,19 @@
 q->fft_coefs_max_index[j] = q->fft_coefs_index;
 }
 
-
-static void qdm2_fft_generate_tone (QDM2Context *q, FFTTone *tone)
+static void qdm2_fft_generate_tone(QDM2Context *q, FFTTone *tone)
 {
- float level, f[6];
- int i;
- QDM2Complex c;
- const double iscale = 2.0*M_PI / 512.0;
+ float level, f[6];
+ int i;
+ QDM2Complex c;
+ const double iscale = 2.0 * M_PI / 512.0;
 
 tone->phase += tone->phase_shift;
 
 /* calculate current level (maximum amplitude) of tone */
 level = fft_tone_envelope_table[tone->duration][tone->time_index] * tone->level;
- c.im = level * sin(tone->phase*iscale);
- c.re = level * cos(tone->phase*iscale);
+ c.im = level * sin(tone->phase * iscale);
+ c.re = level * cos(tone->phase * iscale);
 
 /* generate FFT coefficients for tone */
 if (tone->duration >= 3 || tone->cutoff >= 3) {
@@ -1497,30 +1555,31 @@
 tone->complex[1].re -= c.re;
 } else {
 f[1] = -tone->table[4];
- f[0] = tone->table[3] - tone->table[0];
- f[2] = 1.0 - tone->table[2] - tone->table[3];
- f[3] = tone->table[1] + tone->table[4] - 1.0;
- f[4] = tone->table[0] - tone->table[1];
- f[5] = tone->table[2];
+ f[0] = tone->table[3] - tone->table[0];
+ f[2] = 1.0 - tone->table[2] - tone->table[3];
+ f[3] = tone->table[1] + tone->table[4] - 1.0;
+ f[4] = tone->table[0] - tone->table[1];
+ f[5] = tone->table[2];
 for (i = 0; i < 2; i++) {
- tone->complex[fft_cutoff_index_table[tone->cutoff][i]].re += c.re * f[i];
- tone->complex[fft_cutoff_index_table[tone->cutoff][i]].im += c.im *((tone->cutoff <= i) ? -f[i] : f[i]);
+ tone->complex[fft_cutoff_index_table[tone->cutoff][i]].re +=
+ c.re * f[i];
+ tone->complex[fft_cutoff_index_table[tone->cutoff][i]].im +=
+ c.im * ((tone->cutoff <= i) ? -f[i] : f[i]);
 }
 for (i = 0; i < 4; i++) {
- tone->complex[i].re += c.re * f[i+2];
- tone->complex[i].im += c.im * f[i+2];
+ tone->complex[i].re += c.re * f[i + 2];
+ tone->complex[i].im += c.im * f[i + 2];
 }
 }
 
 /* copy the tone if it has not yet died out */
 if (++tone->time_index < ((1 << (5 - tone->duration)) - 1)) {
- memcpy(&q->fft_tones[q->fft_tone_end], tone, sizeof(FFTTone));
- q->fft_tone_end = (q->fft_tone_end + 1) % 1000;
+ memcpy(&q->fft_tones[q->fft_tone_end], tone, sizeof(FFTTone));
+ q->fft_tone_end = (q->fft_tone_end + 1) % 1000;
 }
 }
 
-
-static void qdm2_fft_tone_synthesizer (QDM2Context *q, int sub_packet)
+static void qdm2_fft_tone_synthesizer(QDM2Context *q, int sub_packet)
 {
 int i, j, ch;
 const double iscale = 0.25 * M_PI;
@@ -1591,29 +1650,27 @@
 }
 }
 
-
-static void qdm2_calculate_fft (QDM2Context *q, int channel, int sub_packet)
+static void qdm2_calculate_fft(QDM2Context *q, int channel, int sub_packet)
 {
 const float gain = (q->channels == 1 && q->nb_channels == 2) ? 0.5f : 1.0f;
- float *out = q->output_buffer + channel;
+ float *out = q->output_buffer + channel;
 int i;
 q->fft.complex[channel][0].re *= 2.0f;
- q->fft.complex[channel][0].im = 0.0f;
+ q->fft.complex[channel][0].im = 0.0f;
 q->rdft_ctx.rdft_calc(&q->rdft_ctx, (FFTSample *)q->fft.complex[channel]);
 /* add samples to output buffer */
 for (i = 0; i < FFALIGN(q->fft_size, 8); i++) {
 out[0] += q->fft.complex[channel][i].re * gain;
 out[q->channels] += q->fft.complex[channel][i].im * gain;
- out += 2 * q->channels;
+ out += 2 * q->channels;
 }
 }
 
-
 /**
 * @param q context
 * @param index subpacket number
 */
-static void qdm2_synthesis_filter (QDM2Context *q, int index)
+static void qdm2_synthesis_filter(QDM2Context *q, int index)
 {
 int i, k, ch, sb_used, sub_sampling, dither_state = 0;
 
@@ -1622,7 +1679,7 @@
 
 for (ch = 0; ch < q->channels; ch++)
 for (i = 0; i < 8; i++)
- for (k=sb_used; k < SBLIMIT; k++)
+ for (k = sb_used; k < SBLIMIT; k++)
 q->sb_samples[ch][(8 * index) + i][k] = 0;
 
 for (ch = 0; ch < q->nb_channels; ch++) {
@@ -1630,10 +1687,10 @@
 
 for (i = 0; i < 8; i++) {
 ff_mpa_synth_filter_float(&q->mpadsp,
- q->synth_buf[ch], &(q->synth_buf_offset[ch]),
- ff_mpa_synth_window_float, &dither_state,
- samples_ptr, q->nb_channels,
- q->sb_samples[ch][(8 * index) + i]);
+ q->synth_buf[ch], &(q->synth_buf_offset[ch]),
+ ff_mpa_synth_window_float, &dither_state,
+ samples_ptr, q->nb_channels,
+ q->sb_samples[ch][(8 * index) + i]);
 samples_ptr += 32 * q->nb_channels;
 }
 }
@@ -1646,29 +1703,19 @@
 q->output_buffer[q->channels * i + ch] += (1 << 23) * q->samples[q->nb_channels * sub_sampling * i + ch];
 }
 
-
 /**
 * Init static data (does not depend on specific file)
 *
 * @param q context
 */
-static av_cold void qdm2_init(QDM2Context *q) {
- static int initialized = 0;
-
- if (initialized != 0)
- return;
- initialized = 1;
-
+static av_cold void qdm2_init_static_data(AVCodec *codec) {
 qdm2_init_vlc();
 ff_mpa_synth_init_float(ff_mpa_synth_window_float);
 softclip_table_init();
 rnd_table_init();
 init_noise_samples();
-
- av_log(NULL, AV_LOG_DEBUG, "init done\n");
 }
 
-
 /**
 * Init parameters from codec extradata
 */
@@ -1718,7 +1765,7 @@
 return -1;
 }
 
- extradata = avctx->extradata;
+ extradata = avctx->extradata;
 extradata_size = avctx->extradata_size;
 
 while (extradata_size > 7) {
@@ -1846,17 +1893,11 @@
 ff_rdft_init(&s->rdft_ctx, s->fft_order, IDFT_C2R);
 ff_mpadsp_init(&s->mpadsp);
 
- qdm2_init(s);
-
 avctx->sample_fmt = AV_SAMPLE_FMT_S16;
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
-
 static av_cold int qdm2_decode_close(AVCodecContext *avctx)
 {
 QDM2Context *s = avctx->priv_data;
@@ -1866,8 +1907,7 @@
 return 0;
 }
 
-
-static int qdm2_decode (QDM2Context *q, const uint8_t *in, int16_t *out)
+static int qdm2_decode(QDM2Context *q, const uint8_t *in, int16_t *out)
 {
 int ch, i;
 const int frame_size = (q->frame_size * q->channels);
@@ -1926,10 +1966,10 @@
 return 0;
 }
 
-
 static int qdm2_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 QDM2Context *s = avctx->priv_data;
@@ -1942,12 +1982,12 @@
 return -1;
 
 /* get output buffer */
- s->frame.nb_samples = 16 * s->frame_size;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = 16 * s->frame_size;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- out = (int16_t *)s->frame.data[0];
+ out = (int16_t *)frame->data[0];
 
 for (i = 0; i < 16; i++) {
 if (qdm2_decode(s, buf, out) < 0)
@@ -1955,21 +1995,20 @@
 out += s->channels * s->frame_size;
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
 return s->checksum_size;
 }
 
-AVCodec ff_qdm2_decoder =
-{
- .name = "qdm2",
- .type = AVMEDIA_TYPE_AUDIO,
- .id = AV_CODEC_ID_QDM2,
- .priv_data_size = sizeof(QDM2Context),
- .init = qdm2_decode_init,
- .close = qdm2_decode_close,
- .decode = qdm2_decode_frame,
- .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("QDesign Music Codec 2"),
+AVCodec ff_qdm2_decoder = {
+ .name = "qdm2",
+ .long_name = NULL_IF_CONFIG_SMALL("QDesign Music Codec 2"),
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = AV_CODEC_ID_QDM2,
+ .priv_data_size = sizeof(QDM2Context),
+ .init = qdm2_decode_init,
+ .init_static_data = qdm2_init_static_data,
+ .close = qdm2_decode_close,
+ .decode = qdm2_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
 };

libav-v9.6.tar.bz2/libavcodec/qdrw.c -> libav-v10.1.tar.bz2/libavcodec/qdrw.c Changed

@@ -29,48 +29,38 @@
 #include "avcodec.h"
 #include "internal.h"
 
-typedef struct QdrawContext{
- AVCodecContext *avctx;
- AVFrame pic;
-} QdrawContext;
-
 static int decode_frame(AVCodecContext *avctx,
 void *data, int *got_frame,
 AVPacket *avpkt)
 {
- const uint8_t *buf = avpkt->data;
+ const uint8_t *buf = avpkt->data;
 const uint8_t *buf_end = avpkt->data + avpkt->size;
- int buf_size = avpkt->size;
- QdrawContext * const a = avctx->priv_data;
- AVFrame * const p = &a->pic;
+ int buf_size = avpkt->size;
+ AVFrame * const p = data;
 uint8_t* outdata;
 int colors;
- int i;
+ int i, ret;
 uint32_t *pal;
 int r, g, b;
 
- if(p->data[0])
- avctx->release_buffer(avctx, p);
-
- p->reference= 0;
- if(ff_get_buffer(avctx, p) < 0){
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
- p->pict_type= AV_PICTURE_TYPE_I;
- p->key_frame= 1;
+ p->pict_type = AV_PICTURE_TYPE_I;
+ p->key_frame = 1;
 
- outdata = a->pic.data[0];
+ outdata = p->data[0];
 
 if (buf_end - buf < 0x68 + 4)
 return AVERROR_INVALIDDATA;
- buf += 0x68; /* jump to palette */
+ buf += 0x68; /* jump to palette */
 colors = AV_RB32(buf);
- buf += 4;
+ buf += 4;
 
- if(colors < 0 || colors > 256) {
+ if (colors < 0 || colors > 256) {
 av_log(avctx, AV_LOG_ERROR, "Error color count - %i(0x%X)\n", colors, colors);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (buf_end - buf < (colors + 1) * 8)
 return AVERROR_INVALIDDATA;
@@ -106,7 +96,7 @@
 int tsize = 0;
 
 /* decode line */
- out = outdata;
+ out = outdata;
 size = AV_RB16(buf); /* size of packed line */
 buf += 2;
 if (buf_end - buf < size)
@@ -118,60 +108,46 @@
 code = *buf++;
 if (code & 0x80 ) { /* run */
 pix = *buf++;
- if ((out + (257 - code)) > (outdata + a->pic.linesize[0]))
+ if ((out + (257 - code)) > (outdata + p->linesize[0]))
 break;
 memset(out, pix, 257 - code);
- out += 257 - code;
+ out += 257 - code;
 tsize += 257 - code;
- left -= 2;
+ left -= 2;
 } else { /* copy */
- if ((out + code) > (outdata + a->pic.linesize[0]))
+ if ((out + code) > (outdata + p->linesize[0]))
 break;
 if (buf_end - buf < code + 1)
 return AVERROR_INVALIDDATA;
 memcpy(out, buf, code + 1);
- out += code + 1;
- buf += code + 1;
- left -= 2 + code;
+ out += code + 1;
+ buf += code + 1;
+ left -= 2 + code;
 tsize += code + 1;
 }
 }
 buf = next;
- outdata += a->pic.linesize[0];
+ outdata += p->linesize[0];
 }
 
 *got_frame = 1;
- *(AVFrame*)data = a->pic;
 
 return buf_size;
 }
 
-static av_cold int decode_init(AVCodecContext *avctx){
-// QdrawContext * const a = avctx->priv_data;
-
+static av_cold int decode_init(AVCodecContext *avctx)
+{
 avctx->pix_fmt= AV_PIX_FMT_PAL8;
 
 return 0;
 }
 
-static av_cold int decode_end(AVCodecContext *avctx){
- QdrawContext * const a = avctx->priv_data;
- AVFrame *pic = &a->pic;
-
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
-
- return 0;
-}
-
 AVCodec ff_qdraw_decoder = {
 .name = "qdraw",
+ .long_name = NULL_IF_CONFIG_SMALL("Apple QuickDraw"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_QDRAW,
- .priv_data_size = sizeof(QdrawContext),
 .init = decode_init,
- .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Apple QuickDraw"),
 };

libav-v9.6.tar.bz2/libavcodec/qpeg.c -> libav-v10.1.tar.bz2/libavcodec/qpeg.c Changed

@@ -26,10 +26,11 @@
 
 #include "avcodec.h"
 #include "bytestream.h"
+#include "internal.h"
 
 typedef struct QpegContext{
 AVCodecContext *avctx;
- AVFrame pic;
+ AVFrame *pic;
 uint8_t *refdata;
 uint32_t pal[256];
 GetByteContext buffer;
@@ -190,6 +191,8 @@
 filled = 0;
 dst -= stride;
 height--;
+ if (height < 0)
+ break;
 }
 }
 } else if(code >= 0xC0) { /* copy code: 0xC0..0xDF */
@@ -201,6 +204,8 @@
 filled = 0;
 dst -= stride;
 height--;
+ if (height < 0)
+ break;
 }
 }
 } else if(code >= 0x80) { /* skip code: 0x80..0xBF */
@@ -245,9 +250,9 @@
 {
 uint8_t ctable[128];
 QpegContext * const a = avctx->priv_data;
- AVFrame * const p = &a->pic;
+ AVFrame * const p = a->pic;
 uint8_t* outdata;
- int delta;
+ int delta, ret;
 const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
 
 if (avpkt->size < 0x86) {
@@ -256,59 +261,66 @@
 }
 
 bytestream2_init(&a->buffer, avpkt->data, avpkt->size);
- p->reference = 3;
- if (avctx->reget_buffer(avctx, p) < 0) {
+ if ((ret = ff_reget_buffer(avctx, p)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ 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->refdata);
+ qpeg_decode_inter(a, outdata, p->linesize[0], avctx->width, avctx->height, delta, ctable, a->refdata);
 }
 
 /* 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, p)) < 0)
+ return ret;
 
 *got_frame = 1;
- *(AVFrame*)data = a->pic;
 
 return avpkt->size;
 }
 
-static av_cold int decode_init(AVCodecContext *avctx){
+static av_cold int decode_end(AVCodecContext *avctx)
+{
 QpegContext * const a = avctx->priv_data;
 
- a->avctx = avctx;
- avctx->pix_fmt= AV_PIX_FMT_PAL8;
- a->refdata = av_malloc(avctx->width * avctx->height);
+ av_frame_free(&a->pic);
 
+ av_free(a->refdata);
 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;
 
- if(p->data[0])
- avctx->release_buffer(avctx, p);
+ a->avctx = avctx;
+ avctx->pix_fmt= AV_PIX_FMT_PAL8;
+ a->refdata = av_malloc(avctx->width * avctx->height);
+
+ a->pic = av_frame_alloc();
+ if (!a->pic) {
+ decode_end(avctx);
+ return AVERROR(ENOMEM);
+ }
 
- av_free(a->refdata);
 return 0;
 }
 
 AVCodec ff_qpeg_decoder = {
 .name = "qpeg",
+ .long_name = NULL_IF_CONFIG_SMALL("Q-team QPEG"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_QPEG,
 .priv_data_size = sizeof(QpegContext),
@@ -316,5 +328,4 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Q-team QPEG"),
 };

libav-v9.6.tar.bz2/libavcodec/qtrle.c -> libav-v10.1.tar.bz2/libavcodec/qtrle.c Changed

@@ -37,30 +37,31 @@
 
 #include "avcodec.h"
 #include "bytestream.h"
+#include "internal.h"
 
 typedef struct QtrleContext {
 AVCodecContext *avctx;
- AVFrame frame;
+ AVFrame *frame;
 
 GetByteContext g;
 uint32_t pal[256];
 } QtrleContext;
 
-#define CHECK_PIXEL_PTR(n) \
- if ((pixel_ptr + n > pixel_limit) || (pixel_ptr + n < 0)) { \
- av_log (s->avctx, AV_LOG_INFO, "Problem: pixel_ptr = %d, pixel_limit = %d\n", \
- pixel_ptr + n, pixel_limit); \
- return; \
- } \
+#define CHECK_PIXEL_PTR(n) \
+ if ((pixel_ptr + n > pixel_limit) || (pixel_ptr + n < 0)) { \
+ av_log (s->avctx, AV_LOG_ERROR, "Problem: pixel_ptr = %d, pixel_limit = %d\n",\
+ pixel_ptr + n, pixel_limit); \
+ return; \
+ } \
 
 static void qtrle_decode_1bpp(QtrleContext *s, int row_ptr, int lines_to_change)
 {
 int rle_code;
 int pixel_ptr;
- int row_inc = s->frame.linesize[0];
+ int row_inc = s->frame->linesize[0];
 unsigned char pi0, pi1; /* 2 8-pixel values */
- unsigned char *rgb = s->frame.data[0];
- int pixel_limit = s->frame.linesize[0] * s->avctx->height;
+ unsigned char *rgb = s->frame->data[0];
+ int pixel_limit = s->frame->linesize[0] * s->avctx->height;
 int skip;
 
 row_ptr -= row_inc;
@@ -109,10 +110,10 @@
 {
 int rle_code, i;
 int pixel_ptr;
- int row_inc = s->frame.linesize[0];
+ int row_inc = s->frame->linesize[0];
 unsigned char pi[16]; /* 16 palette indices */
- unsigned char *rgb = s->frame.data[0];
- int pixel_limit = s->frame.linesize[0] * s->avctx->height;
+ unsigned char *rgb = s->frame->data[0];
+ int pixel_limit = s->frame->linesize[0] * s->avctx->height;
 int num_pixels = (bpp == 4) ? 8 : 16;
 
 while (lines_to_change--) {
@@ -165,10 +166,10 @@
 {
 int rle_code;
 int pixel_ptr;
- int row_inc = s->frame.linesize[0];
+ int row_inc = s->frame->linesize[0];
 unsigned char pi1, pi2, pi3, pi4; /* 4 palette indexes */
- unsigned char *rgb = s->frame.data[0];
- int pixel_limit = s->frame.linesize[0] * s->avctx->height;
+ unsigned char *rgb = s->frame->data[0];
+ int pixel_limit = s->frame->linesize[0] * s->avctx->height;
 
 while (lines_to_change--) {
 pixel_ptr = row_ptr + (4 * (bytestream2_get_byte(&s->g) - 1));
@@ -215,10 +216,10 @@
 {
 int rle_code;
 int pixel_ptr;
- int row_inc = s->frame.linesize[0];
+ int row_inc = s->frame->linesize[0];
 unsigned short rgb16;
- unsigned char *rgb = s->frame.data[0];
- int pixel_limit = s->frame.linesize[0] * s->avctx->height;
+ unsigned char *rgb = s->frame->data[0];
+ int pixel_limit = s->frame->linesize[0] * s->avctx->height;
 
 while (lines_to_change--) {
 pixel_ptr = row_ptr + (bytestream2_get_byte(&s->g) - 1) * 2;
@@ -259,10 +260,10 @@
 {
 int rle_code;
 int pixel_ptr;
- int row_inc = s->frame.linesize[0];
+ int row_inc = s->frame->linesize[0];
 unsigned char r, g, b;
- unsigned char *rgb = s->frame.data[0];
- int pixel_limit = s->frame.linesize[0] * s->avctx->height;
+ unsigned char *rgb = s->frame->data[0];
+ int pixel_limit = s->frame->linesize[0] * s->avctx->height;
 
 while (lines_to_change--) {
 pixel_ptr = row_ptr + (bytestream2_get_byte(&s->g) - 1) * 3;
@@ -306,10 +307,10 @@
 {
 int rle_code;
 int pixel_ptr;
- int row_inc = s->frame.linesize[0];
+ int row_inc = s->frame->linesize[0];
 unsigned int argb;
- unsigned char *rgb = s->frame.data[0];
- int pixel_limit = s->frame.linesize[0] * s->avctx->height;
+ unsigned char *rgb = s->frame->data[0];
+ int pixel_limit = s->frame->linesize[0] * s->avctx->height;
 
 while (lines_to_change--) {
 pixel_ptr = row_ptr + (bytestream2_get_byte(&s->g) - 1) * 4;
@@ -384,7 +385,9 @@
 return AVERROR_INVALIDDATA;
 }
 
- s->frame.data[0] = NULL;
+ s->frame = av_frame_alloc();
+ if (!s->frame)
+ return AVERROR(ENOMEM);
 
 return 0;
 }
@@ -397,14 +400,12 @@
 int header, start_line;
 int height, row_ptr;
 int has_palette = 0;
+ int ret;
 
 bytestream2_init(&s->g, avpkt->data, avpkt->size);
- s->frame.reference = 1;
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE |
- FF_BUFFER_HINTS_REUSABLE | FF_BUFFER_HINTS_READABLE;
- if (avctx->reget_buffer(avctx, &s->frame)) {
+ if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) {
 av_log (s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 /* check if this frame is even supposed to change */
@@ -429,7 +430,7 @@
 start_line = 0;
 height = s->avctx->height;
 }
- row_ptr = s->frame.linesize[0] * start_line;
+ row_ptr = s->frame->linesize[0] * start_line;
 
 switch (avctx->bits_per_coded_sample) {
 case 1:
@@ -477,17 +478,18 @@
 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 on the way out */
- memcpy(s->frame.data[1], s->pal, AVPALETTE_SIZE);
+ memcpy(s->frame->data[1], s->pal, AVPALETTE_SIZE);
 }
 
 done:
+ if ((ret = av_frame_ref(data, s->frame)) < 0)
+ return ret;
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
 /* always report that the buffer was completely consumed */
 return avpkt->size;
@@ -497,14 +499,14 @@
 {
 QtrleContext *s = avctx->priv_data;
 
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ av_frame_free(&s->frame);
 
 return 0;
 }
 
 AVCodec ff_qtrle_decoder = {
 .name = "qtrle",
+ .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_QTRLE,
 .priv_data_size = sizeof(QtrleContext),
@@ -512,5 +514,4 @@
 .close = qtrle_decode_end,
 .decode = qtrle_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"),
 };

libav-v9.6.tar.bz2/libavcodec/qtrleenc.c -> libav-v10.1.tar.bz2/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;
@@ -60,6 +59,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;
@@ -101,7 +113,13 @@
 + 15 /* header + footer */
 + s->avctx->height*2 /* skip code+rle end */
 + s->avctx->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;
 }
 
@@ -141,7 +159,7 @@
 
 for (i = width - 1; i >= 0; i--) {
 
- 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;
@@ -245,7 +263,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->avctx->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],
@@ -283,11 +301,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_packet(pkt, s->max_buf_size)) < 0) {
 /* Upper bound check for compressed data */
 av_log(avctx, AV_LOG_ERROR, "Error getting output packet of size %d.\n", s->max_buf_size);
@@ -307,7 +323,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;
@@ -316,19 +333,9 @@
 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"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_QTRLE,
 .priv_data_size = sizeof(QtrleEncContext),
@@ -338,5 +345,4 @@
 .pix_fmts = (const enum AVPixelFormat[]){
 AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB555BE, AV_PIX_FMT_ARGB, AV_PIX_FMT_NONE
 },
- .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"),
 };

libav-v9.6.tar.bz2/libavcodec/r210dec.c -> libav-v10.1.tar.bz2/libavcodec/r210dec.c Changed

@@ -30,31 +30,25 @@
 avctx->pix_fmt = AV_PIX_FMT_RGB48;
 avctx->bits_per_raw_sample = 10;
 
- avctx->coded_frame = avcodec_alloc_frame();
-
 return 0;
 }
 
 static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
 AVPacket *avpkt)
 {
- int h, w;
- AVFrame *pic = avctx->coded_frame;
+ int h, w, ret;
+ AVFrame *pic = data;
 const uint32_t *src = (const uint32_t *)avpkt->data;
 int aligned_width = FFALIGN(avctx->width, 64);
 uint8_t *dst_line;
 
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
-
 if (avpkt->size < 4 * aligned_width * avctx->height) {
 av_log(avctx, AV_LOG_ERROR, "packet too small\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- pic->reference = 0;
- if (ff_get_buffer(avctx, pic) < 0)
- return -1;
+ if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
+ return ret;
 
 pic->pict_type = AV_PICTURE_TYPE_I;
 pic->key_frame = 1;
@@ -83,42 +77,29 @@
 }
 
 *got_frame = 1;
- *(AVFrame*)data = *avctx->coded_frame;
 
 return avpkt->size;
 }
 
-static av_cold int decode_close(AVCodecContext *avctx)
-{
- AVFrame *pic = avctx->coded_frame;
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
- av_freep(&avctx->coded_frame);
-
- return 0;
-}
-
 #if CONFIG_R210_DECODER
 AVCodec ff_r210_decoder = {
 .name = "r210",
+ .long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_R210,
 .init = decode_init,
- .close = decode_close,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"),
 };
 #endif
 #if CONFIG_R10K_DECODER
 AVCodec ff_r10k_decoder = {
 .name = "r10k",
+ .long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_R10K,
 .init = decode_init,
- .close = decode_close,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"),
 };
 #endif

libav-v9.6.tar.bz2/libavcodec/ra144.c -> libav-v10.1.tar.bz2/libavcodec/ra144.c Changed

libav-v9.6.tar.bz2/libavcodec/ra144.h -> libav-v10.1.tar.bz2/libavcodec/ra144.h Changed

libav-v9.6.tar.bz2/libavcodec/ra144dec.c -> libav-v10.1.tar.bz2/libavcodec/ra144dec.c Changed

@@ -23,7 +23,6 @@
 */
 
 #include "libavutil/channel_layout.h"
-#include "libavutil/intmath.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"
@@ -43,9 +42,6 @@
 avctx->channel_layout = AV_CH_LAYOUT_MONO;
 avctx->sample_fmt = AV_SAMPLE_FMT_S16;
 
- avcodec_get_frame_defaults(&ractx->frame);
- avctx->coded_frame = &ractx->frame;
-
 return 0;
 }
 
@@ -65,6 +61,7 @@
 static int ra144_decode_frame(AVCodecContext * avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 static const uint8_t sizes[LPC_ORDER] = {6, 5, 5, 4, 4, 3, 3, 3, 3, 2};
@@ -79,20 +76,21 @@
 RA144Context *ractx = avctx->priv_data;
 GetBitContext gb;
 
+ if (buf_size < FRAMESIZE) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Frame too small (%d bytes). Truncated file?\n", buf_size);
+ *got_frame_ptr = 0;
+ return AVERROR_INVALIDDATA;
+ }
+
 /* get output buffer */
- ractx->frame.nb_samples = NBLOCKS * BLOCKSIZE;
- if ((ret = ff_get_buffer(avctx, &ractx->frame)) < 0) {
+ frame->nb_samples = NBLOCKS * BLOCKSIZE;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- samples = (int16_t *)ractx->frame.data[0];
+ samples = (int16_t *)frame->data[0];
 
- if(buf_size < FRAMESIZE) {
- av_log(avctx, AV_LOG_ERROR,
- "Frame too small (%d bytes). Truncated file?\n", buf_size);
- *got_frame_ptr = 0;
- return buf_size;
- }
 init_get_bits(&gb, buf, FRAMESIZE * 8);
 
 for (i = 0; i < LPC_ORDER; i++)
@@ -124,19 +122,18 @@
 
 FFSWAP(unsigned int *, ractx->lpc_coef[0], ractx->lpc_coef[1]);
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = ractx->frame;
+ *got_frame_ptr = 1;
 
 return FRAMESIZE;
 }
 
 AVCodec ff_ra_144_decoder = {
 .name = "real_144",
+ .long_name = NULL_IF_CONFIG_SMALL("RealAudio 1.0 (14.4K)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_RA_144,
 .priv_data_size = sizeof(RA144Context),
 .init = ra144_decode_init,
 .decode = ra144_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("RealAudio 1.0 (14.4K)"),
 };

libav-v9.6.tar.bz2/libavcodec/ra144enc.c -> libav-v10.1.tar.bz2/libavcodec/ra144enc.c Changed

@@ -40,9 +40,6 @@
     RA144Context *ractx = avctx->priv_data;
     ff_lpc_end(&ractx->lpc_ctx);
     ff_af_queue_close(&ractx->afq);
-#if FF_API_OLD_ENCODE_AUDIO
-    av_freep(&avctx->coded_frame);
-#endif
     return 0;
 }
 
@@ -71,14 +68,6 @@
 
     ff_af_queue_init(avctx, &ractx->afq);
 
-#if FF_API_OLD_ENCODE_AUDIO
-    avctx->coded_frame = avcodec_alloc_frame();
-    if (!avctx->coded_frame) {
-        ret = AVERROR(ENOMEM);
-        goto error;
-    }
-#endif
-
     return 0;
 error:
     ra144_encode_close(avctx);
@@ -556,6 +545,7 @@
 
 AVCodec ff_ra_144_encoder = {
     .name           = "real_144",
+    .long_name      = NULL_IF_CONFIG_SMALL("RealAudio 1.0 (14.4K)"),
     .type           = AVMEDIA_TYPE_AUDIO,
     .id             = AV_CODEC_ID_RA_144,
     .priv_data_size = sizeof(RA144Context),
@@ -565,5 +555,4 @@
     .capabilities   = CODEC_CAP_DELAY | CODEC_CAP_SMALL_LAST_FRAME,
     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
                                                      AV_SAMPLE_FMT_NONE },
-    .long_name      = NULL_IF_CONFIG_SMALL("RealAudio 1.0 (14.4K)"),
 };

libav-v9.6.tar.bz2/libavcodec/ra288.c -> libav-v10.1.tar.bz2/libavcodec/ra288.c Changed

@@ -21,6 +21,7 @@
 
 #include "libavutil/channel_layout.h"
 #include "libavutil/float_dsp.h"
+#include "libavutil/internal.h"
 #include "avcodec.h"
 #include "internal.h"
 #define BITSTREAM_READER_LE
@@ -37,8 +38,6 @@
 #define RA288_BLOCKS_PER_FRAME 32
 
 typedef struct {
- AVFrame frame;
- DSPContext dsp;
 AVFloatDSPContext fdsp;
 DECLARE_ALIGNED(32, float, sp_lpc)[FFALIGN(36, 16)]; ///< LPC coefficients for speech data (spec: A)
 DECLARE_ALIGNED(32, float, gain_lpc)[FFALIGN(10, 16)]; ///< LPC coefficients for gain (spec: GB)
@@ -70,16 +69,13 @@
 
 avpriv_float_dsp_init(&ractx->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
 
- avcodec_get_frame_defaults(&ractx->frame);
- avctx->coded_frame = &ractx->frame;
-
 return 0;
 }
 
 static void convolve(float *tgt, const float *src, int len, int n)
 {
 for (; n >= 0; n--)
- tgt[n] = ff_scalarproduct_float_c(src, src - n, len);
+ tgt[n] = avpriv_scalarproduct_float_c(src, src - n, len);
 
 }
 
@@ -94,7 +90,7 @@
 memmove(ractx->sp_hist + 70, ractx->sp_hist + 75, 36*sizeof(*block));
 
 /* block 46 of G.728 spec */
- sum = 32.;
+ sum = 32.0;
 for (i=0; i < 10; i++)
 sum -= gain_block[9-i] * ractx->gain_lpc[i];
 
@@ -108,7 +104,7 @@
 for (i=0; i < 5; i++)
 buffer[i] = codetable[cb_coef][i] * sumsum;
 
- sum = ff_scalarproduct_float_c(buffer, buffer, 5) * ((1 << 24) / 5.);
+ sum = avpriv_scalarproduct_float_c(buffer, buffer, 5) * ((1 << 24) / 5.0);
 
 sum = FFMAX(sum, 1);
 
@@ -154,7 +150,7 @@
 }
 
 /* Multiply by the white noise correcting factor (WNCF). */
- *out *= 257./256.;
+ *out *= 257.0 / 256.0;
 }
 
 /**
@@ -178,6 +174,7 @@
 static int ra288_decode_frame(AVCodecContext * avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 float *out;
@@ -193,12 +190,12 @@
 }
 
 /* get output buffer */
- ractx->frame.nb_samples = RA288_BLOCK_SIZE * RA288_BLOCKS_PER_FRAME;
- if ((ret = ff_get_buffer(avctx, &ractx->frame)) < 0) {
+ frame->nb_samples = RA288_BLOCK_SIZE * RA288_BLOCKS_PER_FRAME;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- out = (float *)ractx->frame.data[0];
+ out = (float *)frame->data[0];
 
 init_get_bits(&gb, buf, avctx->block_align * 8);
 
@@ -220,19 +217,18 @@
 }
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = ractx->frame;
+ *got_frame_ptr = 1;
 
 return avctx->block_align;
 }
 
 AVCodec ff_ra_288_decoder = {
 .name = "real_288",
+ .long_name = NULL_IF_CONFIG_SMALL("RealAudio 2.0 (28.8K)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_RA_288,
 .priv_data_size = sizeof(RA288Context),
 .init = ra288_decode_init,
 .decode = ra288_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("RealAudio 2.0 (28.8K)"),
 };

libav-v9.6.tar.bz2/libavcodec/ra288.h -> libav-v10.1.tar.bz2/libavcodec/ra288.h Changed

libav-v9.6.tar.bz2/libavcodec/ralf.c -> libav-v10.1.tar.bz2/libavcodec/ralf.c Changed

@@ -26,6 +26,7 @@
 * Dedicated to the mastermind behind it, Ralph Wiggum.
 */
 
+#include "libavutil/attributes.h"
 #include "libavutil/channel_layout.h"
 #include "avcodec.h"
 #include "get_bits.h"
@@ -49,8 +50,6 @@
 #define RALF_MAX_PKT_SIZE 8192
 
 typedef struct RALFContext {
- AVFrame frame;
-
 int version;
 int max_frame_size;
 VLCSet sets[3];
@@ -74,7 +73,7 @@
 
 #define MAX_ELEMS 644 // no RALF table uses more than that
 
-static int init_ralf_vlc(VLC *vlc, const uint8_t *data, int elems)
+static av_cold int init_ralf_vlc(VLC *vlc, const uint8_t *data, int elems)
 {
 uint8_t lens[MAX_ELEMS];
 uint16_t codes[MAX_ELEMS];
@@ -138,7 +137,7 @@
 
 ctx->version = AV_RB16(avctx->extradata + 4);
 if (ctx->version != 0x103) {
- av_log_ask_for_sample(avctx, "unknown version %X\n", ctx->version);
+ avpriv_request_sample(avctx, "Unknown version %X", ctx->version);
 return AVERROR_PATCHWELCOME;
 }
 
@@ -154,9 +153,6 @@
 avctx->channel_layout = (avctx->channels == 2) ? AV_CH_LAYOUT_STEREO
 : AV_CH_LAYOUT_MONO;
 
- avcodec_get_frame_defaults(&ctx->frame);
- avctx->coded_frame = &ctx->frame;
-
 ctx->max_frame_size = AV_RB32(avctx->extradata + 16);
 if (ctx->max_frame_size > (1 << 20) || !ctx->max_frame_size) {
 av_log(avctx, AV_LOG_ERROR, "invalid frame size %d\n",
@@ -426,6 +422,7 @@
 AVPacket *avpkt)
 {
 RALFContext *ctx = avctx->priv_data;
+ AVFrame *frame = data;
 int16_t *samples0;
 int16_t *samples1;
 int ret;
@@ -463,13 +460,13 @@
 src_size = avpkt->size;
 }
 
- ctx->frame.nb_samples = ctx->max_frame_size;
- if ((ret = ff_get_buffer(avctx, &ctx->frame)) < 0) {
+ frame->nb_samples = ctx->max_frame_size;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "Me fail get_buffer()? That's unpossible!\n");
 return ret;
 }
- samples0 = (int16_t *)ctx->frame.data[0];
- samples1 = (int16_t *)ctx->frame.data[1];
+ samples0 = (int16_t *)frame->data[0];
+ samples1 = (int16_t *)frame->data[1];
 
 if (src_size < 5) {
 av_log(avctx, AV_LOG_ERROR, "too short packets are too short!\n");
@@ -511,9 +508,8 @@
 bytes_left -= ctx->block_size[i];
 }
 
- ctx->frame.nb_samples = ctx->sample_offset;
- *got_frame_ptr = ctx->sample_offset > 0;
- *(AVFrame*)data = ctx->frame;
+ frame->nb_samples = ctx->sample_offset;
+ *got_frame_ptr = ctx->sample_offset > 0;
 
 return avpkt->size;
 }
@@ -528,6 +524,7 @@
 
 AVCodec ff_ralf_decoder = {
 .name = "ralf",
+ .long_name = NULL_IF_CONFIG_SMALL("RealAudio Lossless"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_RALF,
 .priv_data_size = sizeof(RALFContext),
@@ -536,7 +533,6 @@
 .decode = decode_frame,
 .flush = decode_flush,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("RealAudio Lossless"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
 AV_SAMPLE_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/rangecoder.c -> libav-v10.1.tar.bz2/libavcodec/rangecoder.c Changed

libav-v9.6.tar.bz2/libavcodec/ratecontrol.c -> libav-v10.1.tar.bz2/libavcodec/ratecontrol.c Changed

@@ -25,9 +25,8 @@
 * Rate control for video encoders.
 */
 
-#include "libavutil/intmath.h"
+#include "libavutil/attributes.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "ratecontrol.h"
 #include "mpegvideo.h"
 #include "libavutil/eval.h"
@@ -40,34 +39,51 @@
 #endif
 
 static int init_pass2(MpegEncContext *s);
-static double get_qscale(MpegEncContext *s, RateControlEntry *rce, double rate_factor, int frame_num);
+static double get_qscale(MpegEncContext *s, RateControlEntry *rce,
+ double rate_factor, int frame_num);
 
-void ff_write_pass1_stats(MpegEncContext *s){
- 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",
- s->current_picture_ptr->f.display_picture_number, s->current_picture_ptr->f.coded_picture_number, s->pict_type,
- s->current_picture.f.quality, s->i_tex_bits, s->p_tex_bits, s->mv_bits, s->misc_bits,
- s->f_code, s->b_code, s->current_picture.mc_mb_var_sum, s->current_picture.mb_var_sum, s->i_count, s->skip_count, s->header_bits);
+void ff_write_pass1_stats(MpegEncContext *s)
+{
+ 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",
+ s->current_picture_ptr->f.display_picture_number,
+ s->current_picture_ptr->f.coded_picture_number,
+ s->pict_type,
+ s->current_picture.f.quality,
+ s->i_tex_bits,
+ s->p_tex_bits,
+ s->mv_bits,
+ s->misc_bits,
+ s->f_code,
+ s->b_code,
+ s->current_picture.mc_mb_var_sum,
+ s->current_picture.mb_var_sum,
+ s->i_count, s->skip_count,
+ s->header_bits);
 }
 
-static inline double qp2bits(RateControlEntry *rce, double qp){
- if(qp<=0.0){
+static inline double qp2bits(RateControlEntry *rce, double qp)
+{
+ if (qp <= 0.0) {
 av_log(NULL, AV_LOG_ERROR, "qp<=0.0\n");
 }
- return rce->qscale * (double)(rce->i_tex_bits + rce->p_tex_bits+1)/ qp;
+ return rce->qscale * (double)(rce->i_tex_bits + rce->p_tex_bits + 1) / qp;
 }
 
-static inline double bits2qp(RateControlEntry *rce, double bits){
- if(bits<0.9){
+static inline double bits2qp(RateControlEntry *rce, double bits)
+{
+ if (bits < 0.9) {
 av_log(NULL, AV_LOG_ERROR, "bits<0.9\n");
 }
- return rce->qscale * (double)(rce->i_tex_bits + rce->p_tex_bits+1)/ bits;
+ return rce->qscale * (double)(rce->i_tex_bits + rce->p_tex_bits + 1) / bits;
 }
 
-int ff_rate_control_init(MpegEncContext *s)
+av_cold int ff_rate_control_init(MpegEncContext *s)
 {
- RateControlContext *rcc= &s->rc_context;
+ RateControlContext *rcc = &s->rc_context;
 int i, res;
- static const char * const const_names[]={
+ static const char * const const_names[] = {
 "PI",
 "E",
 "iTex",
@@ -83,10 +99,12 @@
 "isB",
 "avgQP",
 "qComp",
-/* "lastIQP",
+#if 0
+ "lastIQP",
 "lastPQP",
 "lastBQP",
- "nextNonBQP",*/
+ "nextNonBQP",
+#endif
 "avgIITex",
 "avgPITex",
 "avgPPTex",
@@ -94,204 +112,222 @@
 "avgTex",
 NULL
 };
- static double (* const func1[])(void *, double)={
+ static double (* const func1[])(void *, double) = {
 (void *)bits2qp,
 (void *)qp2bits,
 NULL
 };
- static const char * const func1_names[]={
+ static const char * const func1_names[] = {
 "bits2qp",
 "qp2bits",
 NULL
 };
 emms_c();
 
- res = av_expr_parse(&rcc->rc_eq_eval, s->avctx->rc_eq ? s->avctx->rc_eq : "tex^qComp", const_names, func1_names, func1, NULL, NULL, 0, s->avctx);
+ res = av_expr_parse(&rcc->rc_eq_eval,
+ s->avctx->rc_eq ? s->avctx->rc_eq : "tex^qComp",
+ const_names, func1_names, func1,
+ NULL, NULL, 0, s->avctx);
 if (res < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "Error parsing rc_eq \"%s\"\n", s->avctx->rc_eq);
 return res;
 }
 
- for(i=0; i<5; i++){
- rcc->pred[i].coeff= FF_QP2LAMBDA * 7.0;
- rcc->pred[i].count= 1.0;
-
- rcc->pred[i].decay= 0.4;
- rcc->i_cplx_sum [i]=
- rcc->p_cplx_sum [i]=
- rcc->mv_bits_sum[i]=
- rcc->qscale_sum [i]=
- rcc->frame_count[i]= 1; // 1 is better because of 1/0 and such
- rcc->last_qscale_for[i]=FF_QP2LAMBDA * 5;
+ for (i = 0; i < 5; i++) {
+ rcc->pred[i].coeff = FF_QP2LAMBDA * 7.0;
+ rcc->pred[i].count = 1.0;
+ rcc->pred[i].decay = 0.4;
+
+ rcc->i_cplx_sum [i] =
+ rcc->p_cplx_sum [i] =
+ rcc->mv_bits_sum[i] =
+ rcc->qscale_sum [i] =
+ rcc->frame_count[i] = 1; // 1 is better because of 1/0 and such
+
+ rcc->last_qscale_for[i] = FF_QP2LAMBDA * 5;
 }
- rcc->buffer_index= s->avctx->rc_initial_buffer_occupancy;
+ rcc->buffer_index = s->avctx->rc_initial_buffer_occupancy;
 
- if(s->flags&CODEC_FLAG_PASS2){
+ if (s->flags & CODEC_FLAG_PASS2) {
 int i;
 char *p;
 
 /* find number of pics */
- p= s->avctx->stats_in;
- for(i=-1; p; i++){
- p= strchr(p+1, ';');
- }
- i+= s->max_b_frames;
- if(i<=0 || i>=INT_MAX / sizeof(RateControlEntry))
+ p = s->avctx->stats_in;
+ for (i = -1; p; i++)
+ p = strchr(p + 1, ';');
+ i += s->max_b_frames;
+ if (i <= 0 || i >= INT_MAX / sizeof(RateControlEntry))
 return -1;
- rcc->entry = av_mallocz(i*sizeof(RateControlEntry));
- rcc->num_entries= i;
-
- /* init all to skipped p frames (with b frames we might have a not encoded frame at the end FIXME) */
- for(i=0; i<rcc->num_entries; i++){
- RateControlEntry *rce= &rcc->entry[i];
- rce->pict_type= rce->new_pict_type=AV_PICTURE_TYPE_P;
- rce->qscale= rce->new_qscale=FF_QP2LAMBDA * 2;
- rce->misc_bits= s->mb_num + 10;
- rce->mb_var_sum= s->mb_num*100;
+ rcc->entry = av_mallocz(i * sizeof(RateControlEntry));
+ rcc->num_entries = i;
+
+ /* init all to skipped p frames
+ * (with b frames we might have a not encoded frame at the end FIXME) */
+ for (i = 0; i < rcc->num_entries; i++) {
+ RateControlEntry *rce = &rcc->entry[i];
+
+ rce->pict_type = rce->new_pict_type = AV_PICTURE_TYPE_P;
+ rce->qscale = rce->new_qscale = FF_QP2LAMBDA * 2;
+ rce->misc_bits = s->mb_num + 10;
+ rce->mb_var_sum = s->mb_num * 100;
 }
 
 /* read stats */
- p= s->avctx->stats_in;
- for(i=0; i<rcc->num_entries - s->max_b_frames; i++){
+ p = s->avctx->stats_in;
+ for (i = 0; i < rcc->num_entries - s->max_b_frames; i++) {
 RateControlEntry *rce;
 int picture_number;
 int e;
 char *next;
 
- next= strchr(p, ';');
- if(next){
- (*next)=0; //sscanf in unbelievably slow on looong strings //FIXME copy / do not write
+ next = strchr(p, ';');
+ if (next) {
+ (*next) = 0; // sscanf in unbelievably slow on looong strings // FIXME copy / do not write
 next++;
 }
- e= sscanf(p, " in:%d ", &picture_number);
+ e = sscanf(p, " in:%d ", &picture_number);
 
 assert(picture_number >= 0);
 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",
- &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, &rce->mc_mb_var_sum, &rce->mb_var_sum, &rce->i_count, &rce->skip_count, &rce->header_bits);
- if(e!=14){
- av_log(s->avctx, AV_LOG_ERROR, "statistics are damaged at line %d, parser out=%d\n", i, e);
+ 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",
+ &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,
+ &rce->mc_mb_var_sum, &rce->mb_var_sum,
+ &rce->i_count, &rce->skip_count, &rce->header_bits);
+ if (e != 14) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "statistics are damaged at line %d, parser out=%d\n",
+ i, e);
 return -1;
 }
 
- p= next;
+ p = next;
 }
 
- if(init_pass2(s) < 0) return -1;
+ if (init_pass2(s) < 0)
+ return -1;
 
- //FIXME maybe move to end
- if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) {
+ // FIXME maybe move to end
+ if ((s->flags & CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) {
 #if CONFIG_LIBXVID
 return ff_xvid_rate_control_init(s);
 #else
- av_log(s->avctx, AV_LOG_ERROR, "Xvid ratecontrol requires libavcodec compiled with Xvid support.\n");
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Xvid ratecontrol requires libavcodec compiled with Xvid support.\n");
 return -1;
 #endif
 }
 }
 
- if(!(s->flags&CODEC_FLAG_PASS2)){
+ if (!(s->flags & CODEC_FLAG_PASS2)) {
+ rcc->short_term_qsum = 0.001;
+ rcc->short_term_qcount = 0.001;
 
- rcc->short_term_qsum=0.001;
- rcc->short_term_qcount=0.001;
+ rcc->pass1_rc_eq_output_sum = 0.001;
+ rcc->pass1_wanted_bits = 0.001;
 
- rcc->pass1_rc_eq_output_sum= 0.001;
- rcc->pass1_wanted_bits=0.001;
-
- if(s->avctx->qblur > 1.0){
+ if (s->avctx->qblur > 1.0) {
 av_log(s->avctx, AV_LOG_ERROR, "qblur too large\n");
 return -1;
 }
 /* init stuff with the user specified complexity */
- if(s->avctx->rc_initial_cplx){
- for(i=0; i<60*30; i++){
- double bits= s->avctx->rc_initial_cplx * (i/10000.0 + 1.0)*s->mb_num;
+ if (s->avctx->rc_initial_cplx) {
+ for (i = 0; i < 60 * 30; i++) {
+ double bits = s->avctx->rc_initial_cplx * (i / 10000.0 + 1.0) * s->mb_num;
 RateControlEntry rce;
 
- if (i%((s->gop_size+3)/4)==0) rce.pict_type= AV_PICTURE_TYPE_I;
- else if(i%(s->max_b_frames+1)) rce.pict_type= AV_PICTURE_TYPE_B;
- else rce.pict_type= AV_PICTURE_TYPE_P;
-
- rce.new_pict_type= rce.pict_type;
- rce.mc_mb_var_sum= bits*s->mb_num/100000;
- rce.mb_var_sum = s->mb_num;
- rce.qscale = FF_QP2LAMBDA * 2;
- rce.f_code = 2;
- rce.b_code = 1;
- rce.misc_bits= 1;
-
- if(s->pict_type== AV_PICTURE_TYPE_I){
- rce.i_count = s->mb_num;
- rce.i_tex_bits= bits;
- rce.p_tex_bits= 0;
- rce.mv_bits= 0;
- }else{
- rce.i_count = 0; //FIXME we do know this approx
- rce.i_tex_bits= 0;
- rce.p_tex_bits= bits*0.9;
- rce.mv_bits= bits*0.1;
+ if (i % ((s->gop_size + 3) / 4) == 0)
+ rce.pict_type = AV_PICTURE_TYPE_I;
+ else if (i % (s->max_b_frames + 1))
+ rce.pict_type = AV_PICTURE_TYPE_B;
+ else
+ rce.pict_type = AV_PICTURE_TYPE_P;
+
+ rce.new_pict_type = rce.pict_type;
+ rce.mc_mb_var_sum = bits * s->mb_num / 100000;
+ rce.mb_var_sum = s->mb_num;
+
+ rce.qscale = FF_QP2LAMBDA * 2;
+ rce.f_code = 2;
+ rce.b_code = 1;
+ rce.misc_bits = 1;
+
+ if (s->pict_type == AV_PICTURE_TYPE_I) {
+ rce.i_count = s->mb_num;
+ rce.i_tex_bits = bits;
+ rce.p_tex_bits = 0;
+ rce.mv_bits = 0;
+ } else {
+ rce.i_count = 0; // FIXME we do know this approx
+ rce.i_tex_bits = 0;
+ rce.p_tex_bits = bits * 0.9;
+ rce.mv_bits = bits * 0.1;
 }
- rcc->i_cplx_sum [rce.pict_type] += rce.i_tex_bits*rce.qscale;
- rcc->p_cplx_sum [rce.pict_type] += rce.p_tex_bits*rce.qscale;
+ rcc->i_cplx_sum[rce.pict_type] += rce.i_tex_bits * rce.qscale;
+ rcc->p_cplx_sum[rce.pict_type] += rce.p_tex_bits * rce.qscale;
 rcc->mv_bits_sum[rce.pict_type] += rce.mv_bits;
- rcc->frame_count[rce.pict_type] ++;
+ rcc->frame_count[rce.pict_type]++;
+
+ get_qscale(s, &rce, rcc->pass1_wanted_bits / rcc->pass1_rc_eq_output_sum, i);
 
- get_qscale(s, &rce, rcc->pass1_wanted_bits/rcc->pass1_rc_eq_output_sum, i);
- rcc->pass1_wanted_bits+= s->bit_rate/(1/av_q2d(s->avctx->time_base)); //FIXME misbehaves a little for variable fps
+ // FIXME misbehaves a little for variable fps
+ rcc->pass1_wanted_bits += s->bit_rate / (1 / av_q2d(s->avctx->time_base));
 }
 }
-
 }
 
 return 0;
 }
 
-void ff_rate_control_uninit(MpegEncContext *s)
+av_cold void ff_rate_control_uninit(MpegEncContext *s)
 {
- RateControlContext *rcc= &s->rc_context;
+ RateControlContext *rcc = &s->rc_context;
 emms_c();
 
 av_expr_free(rcc->rc_eq_eval);
 av_freep(&rcc->entry);
 
 #if CONFIG_LIBXVID
- if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
+ if ((s->flags & CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
 ff_xvid_rate_control_uninit(s);
 #endif
 }
 
-int ff_vbv_update(MpegEncContext *s, int frame_size){
- RateControlContext *rcc= &s->rc_context;
- const double fps= 1/av_q2d(s->avctx->time_base);
- const int buffer_size= s->avctx->rc_buffer_size;
- const double min_rate= s->avctx->rc_min_rate/fps;
- const double max_rate= s->avctx->rc_max_rate/fps;
+int ff_vbv_update(MpegEncContext *s, int frame_size)
+{
+ RateControlContext *rcc = &s->rc_context;
+ const double fps = 1 / av_q2d(s->avctx->time_base);
+ const int buffer_size = s->avctx->rc_buffer_size;
+ const double min_rate = s->avctx->rc_min_rate / fps;
+ const double max_rate = s->avctx->rc_max_rate / fps;
 
 av_dlog(s, "%d %f %d %f %f\n",
 buffer_size, rcc->buffer_index, frame_size, min_rate, max_rate);
- if(buffer_size){
+
+ if (buffer_size) {
 int left;
 
- rcc->buffer_index-= frame_size;
- if(rcc->buffer_index < 0){
+ rcc->buffer_index -= frame_size;
+ if (rcc->buffer_index < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "rc buffer underflow\n");
- rcc->buffer_index= 0;
+ rcc->buffer_index = 0;
 }
 
- left= buffer_size - rcc->buffer_index - 1;
+ left = buffer_size - rcc->buffer_index - 1;
 rcc->buffer_index += av_clip(left, min_rate, max_rate);
 
- if(rcc->buffer_index > buffer_size){
- int stuffing= ceil((rcc->buffer_index - buffer_size)/8);
+ if (rcc->buffer_index > buffer_size) {
+ int stuffing = ceil((rcc->buffer_index - buffer_size) / 8);
 
- if(stuffing < 4 && s->codec_id == AV_CODEC_ID_MPEG4)
- stuffing=4;
- rcc->buffer_index -= 8*stuffing;
+ if (stuffing < 4 && s->codec_id == AV_CODEC_ID_MPEG4)
+ stuffing = 4;
+ rcc->buffer_index -= 8 * stuffing;
 
- if(s->avctx->debug & FF_DEBUG_RC)
+ if (s->avctx->debug & FF_DEBUG_RC)
 av_log(s->avctx, AV_LOG_DEBUG, "stuffing %d bytes\n", stuffing);
 
 return stuffing;
@@ -303,34 +339,38 @@
 /**
 * Modify the bitrate curve from pass1 for one frame.
 */
-static double get_qscale(MpegEncContext *s, RateControlEntry *rce, double rate_factor, int frame_num){
- RateControlContext *rcc= &s->rc_context;
- AVCodecContext *a= s->avctx;
+static double get_qscale(MpegEncContext *s, RateControlEntry *rce,
+ double rate_factor, int frame_num)
+{
+ RateControlContext *rcc = &s->rc_context;
+ AVCodecContext *a = s->avctx;
+ const int pict_type = rce->new_pict_type;
+ const double mb_num = s->mb_num;
 double q, bits;
- const int pict_type= rce->new_pict_type;
- const double mb_num= s->mb_num;
 int i;
 
- double const_values[]={
+ double const_values[] = {
 M_PI,
 M_E,
- rce->i_tex_bits*rce->qscale,
- rce->p_tex_bits*rce->qscale,
- (rce->i_tex_bits + rce->p_tex_bits)*(double)rce->qscale,
- rce->mv_bits/mb_num,
- rce->pict_type == AV_PICTURE_TYPE_B ? (rce->f_code + rce->b_code)*0.5 : rce->f_code,
- rce->i_count/mb_num,
- rce->mc_mb_var_sum/mb_num,
- rce->mb_var_sum/mb_num,
+ rce->i_tex_bits * rce->qscale,
+ rce->p_tex_bits * rce->qscale,
+ (rce->i_tex_bits + rce->p_tex_bits) * (double)rce->qscale,
+ rce->mv_bits / mb_num,
+ rce->pict_type == AV_PICTURE_TYPE_B ? (rce->f_code + rce->b_code) * 0.5 : rce->f_code,
+ rce->i_count / mb_num,
+ rce->mc_mb_var_sum / mb_num,
+ rce->mb_var_sum / mb_num,
 rce->pict_type == AV_PICTURE_TYPE_I,
 rce->pict_type == AV_PICTURE_TYPE_P,
 rce->pict_type == AV_PICTURE_TYPE_B,
 rcc->qscale_sum[pict_type] / (double)rcc->frame_count[pict_type],
 a->qcompress,
-/* rcc->last_qscale_for[AV_PICTURE_TYPE_I],
+#if 0
+ rcc->last_qscale_for[AV_PICTURE_TYPE_I],
 rcc->last_qscale_for[AV_PICTURE_TYPE_P],
 rcc->last_qscale_for[AV_PICTURE_TYPE_B],
- rcc->next_non_b_qscale,*/
+ rcc->next_non_b_qscale,
+#endif
 rcc->i_cplx_sum[AV_PICTURE_TYPE_I] / (double)rcc->frame_count[AV_PICTURE_TYPE_I],
 rcc->i_cplx_sum[AV_PICTURE_TYPE_P] / (double)rcc->frame_count[AV_PICTURE_TYPE_P],
 rcc->p_cplx_sum[AV_PICTURE_TYPE_P] / (double)rcc->frame_count[AV_PICTURE_TYPE_P],
@@ -345,61 +385,71 @@
 return -1;
 }
 
- rcc->pass1_rc_eq_output_sum+= bits;
- bits*=rate_factor;
- if(bits<0.0) bits=0.0;
- bits+= 1.0; //avoid 1/0 issues
+ rcc->pass1_rc_eq_output_sum += bits;
+ bits *= rate_factor;
+ if (bits < 0.0)
+ bits = 0.0;
+ bits += 1.0; // avoid 1/0 issues
 
 /* user override */
- for(i=0; i<s->avctx->rc_override_count; i++){
- RcOverride *rco= s->avctx->rc_override;
- if(rco[i].start_frame > frame_num) continue;
- if(rco[i].end_frame < frame_num) continue;
-
- if(rco[i].qscale)
- bits= qp2bits(rce, rco[i].qscale); //FIXME move at end to really force it?
+ for (i = 0; i < s->avctx->rc_override_count; i++) {
+ RcOverride *rco = s->avctx->rc_override;
+ if (rco[i].start_frame > frame_num)
+ continue;
+ if (rco[i].end_frame < frame_num)
+ continue;
+
+ if (rco[i].qscale)
+ bits = qp2bits(rce, rco[i].qscale); // FIXME move at end to really force it?
 else
- bits*= rco[i].quality_factor;
+ bits *= rco[i].quality_factor;
 }
 
- q= bits2qp(rce, bits);
+ q = bits2qp(rce, bits);
 
 /* I/B difference */
- if (pict_type==AV_PICTURE_TYPE_I && s->avctx->i_quant_factor<0.0)
- q= -q*s->avctx->i_quant_factor + s->avctx->i_quant_offset;
- else if(pict_type==AV_PICTURE_TYPE_B && s->avctx->b_quant_factor<0.0)
- q= -q*s->avctx->b_quant_factor + s->avctx->b_quant_offset;
- if(q<1) q=1;
+ if (pict_type == AV_PICTURE_TYPE_I && s->avctx->i_quant_factor < 0.0)
+ q = -q * s->avctx->i_quant_factor + s->avctx->i_quant_offset;
+ else if (pict_type == AV_PICTURE_TYPE_B && s->avctx->b_quant_factor < 0.0)
+ q = -q * s->avctx->b_quant_factor + s->avctx->b_quant_offset;
+ if (q < 1)
+ q = 1;
 
 return q;
 }
 
-static double get_diff_limited_q(MpegEncContext *s, RateControlEntry *rce, double q){
- RateControlContext *rcc= &s->rc_context;
- AVCodecContext *a= s->avctx;
- const int pict_type= rce->new_pict_type;
- const double last_p_q = rcc->last_qscale_for[AV_PICTURE_TYPE_P];
- const double last_non_b_q= rcc->last_qscale_for[rcc->last_non_b_pict_type];
-
- if (pict_type==AV_PICTURE_TYPE_I && (a->i_quant_factor>0.0 || rcc->last_non_b_pict_type==AV_PICTURE_TYPE_P))
- q= last_p_q *FFABS(a->i_quant_factor) + a->i_quant_offset;
- else if(pict_type==AV_PICTURE_TYPE_B && a->b_quant_factor>0.0)
- q= last_non_b_q* a->b_quant_factor + a->b_quant_offset;
- if(q<1) q=1;
+static double get_diff_limited_q(MpegEncContext *s, RateControlEntry *rce, double q)
+{
+ RateControlContext *rcc = &s->rc_context;
+ AVCodecContext *a = s->avctx;
+ const int pict_type = rce->new_pict_type;
+ const double last_p_q = rcc->last_qscale_for[AV_PICTURE_TYPE_P];
+ const double last_non_b_q = rcc->last_qscale_for[rcc->last_non_b_pict_type];
+
+ if (pict_type == AV_PICTURE_TYPE_I &&
+ (a->i_quant_factor > 0.0 || rcc->last_non_b_pict_type == AV_PICTURE_TYPE_P))
+ q = last_p_q * FFABS(a->i_quant_factor) + a->i_quant_offset;
+ else if (pict_type == AV_PICTURE_TYPE_B &&
+ a->b_quant_factor > 0.0)
+ q = last_non_b_q * a->b_quant_factor + a->b_quant_offset;
+ if (q < 1)
+ q = 1;
 
 /* last qscale / qdiff stuff */
- if(rcc->last_non_b_pict_type==pict_type || pict_type!=AV_PICTURE_TYPE_I){
- double last_q= rcc->last_qscale_for[pict_type];
- const int maxdiff= FF_QP2LAMBDA * a->max_qdiff;
-
- if (q > last_q + maxdiff) q= last_q + maxdiff;
- else if(q < last_q - maxdiff) q= last_q - maxdiff;
+ if (rcc->last_non_b_pict_type == pict_type || pict_type != AV_PICTURE_TYPE_I) {
+ double last_q = rcc->last_qscale_for[pict_type];
+ const int maxdiff = FF_QP2LAMBDA * a->max_qdiff;
+
+ if (q > last_q + maxdiff)
+ q = last_q + maxdiff;
+ else if (q < last_q - maxdiff)
+ q = last_q - maxdiff;
 }
 
- rcc->last_qscale_for[pict_type]= q; //Note we cannot do that after blurring
+ rcc->last_qscale_for[pict_type] = q; // Note we cannot do that after blurring
 
- if(pict_type!=AV_PICTURE_TYPE_B)
- rcc->last_non_b_pict_type= pict_type;
+ if (pict_type != AV_PICTURE_TYPE_B)
+ rcc->last_non_b_pict_type = pict_type;
 
 return q;
 }
@@ -407,239 +457,269 @@
 /**
 * Get the qmin & qmax for pict_type.
 */
-static void get_qminmax(int *qmin_ret, int *qmax_ret, MpegEncContext *s, int pict_type){
- int qmin= s->avctx->lmin;
- int qmax= s->avctx->lmax;
+static void get_qminmax(int *qmin_ret, int *qmax_ret, MpegEncContext *s, int pict_type)
+{
+ int qmin = s->avctx->lmin;
+ int qmax = s->avctx->lmax;
 
 assert(qmin <= qmax);
 
- if(pict_type==AV_PICTURE_TYPE_B){
- qmin= (int)(qmin*FFABS(s->avctx->b_quant_factor)+s->avctx->b_quant_offset + 0.5);
- qmax= (int)(qmax*FFABS(s->avctx->b_quant_factor)+s->avctx->b_quant_offset + 0.5);
- }else if(pict_type==AV_PICTURE_TYPE_I){
- qmin= (int)(qmin*FFABS(s->avctx->i_quant_factor)+s->avctx->i_quant_offset + 0.5);
- qmax= (int)(qmax*FFABS(s->avctx->i_quant_factor)+s->avctx->i_quant_offset + 0.5);
+ switch (pict_type) {
+ case AV_PICTURE_TYPE_B:
+ qmin = (int)(qmin * FFABS(s->avctx->b_quant_factor) + s->avctx->b_quant_offset + 0.5);
+ qmax = (int)(qmax * FFABS(s->avctx->b_quant_factor) + s->avctx->b_quant_offset + 0.5);
+ break;
+ case AV_PICTURE_TYPE_I:
+ qmin = (int)(qmin * FFABS(s->avctx->i_quant_factor) + s->avctx->i_quant_offset + 0.5);
+ qmax = (int)(qmax * FFABS(s->avctx->i_quant_factor) + s->avctx->i_quant_offset + 0.5);
+ break;
 }
 
- qmin= av_clip(qmin, 1, FF_LAMBDA_MAX);
- qmax= av_clip(qmax, 1, FF_LAMBDA_MAX);
+ qmin = av_clip(qmin, 1, FF_LAMBDA_MAX);
+ qmax = av_clip(qmax, 1, FF_LAMBDA_MAX);
 
- if(qmax<qmin) qmax= qmin;
+ if (qmax < qmin)
+ qmax = qmin;
 
- *qmin_ret= qmin;
- *qmax_ret= qmax;
+ *qmin_ret = qmin;
+ *qmax_ret = qmax;
 }
 
-static double modify_qscale(MpegEncContext *s, RateControlEntry *rce, double q, int frame_num){
- RateControlContext *rcc= &s->rc_context;
+static double modify_qscale(MpegEncContext *s, RateControlEntry *rce,
+ double q, int frame_num)
+{
+ RateControlContext *rcc = &s->rc_context;
+ const double buffer_size = s->avctx->rc_buffer_size;
+ const double fps = 1 / av_q2d(s->avctx->time_base);
+ const double min_rate = s->avctx->rc_min_rate / fps;
+ const double max_rate = s->avctx->rc_max_rate / fps;
+ const int pict_type = rce->new_pict_type;
 int qmin, qmax;
- const int pict_type= rce->new_pict_type;
- const double buffer_size= s->avctx->rc_buffer_size;
- const double fps= 1/av_q2d(s->avctx->time_base);
- const double min_rate= s->avctx->rc_min_rate / fps;
- const double max_rate= s->avctx->rc_max_rate / fps;
 
 get_qminmax(&qmin, &qmax, s, pict_type);
 
 /* modulation */
- if(s->avctx->rc_qmod_freq && frame_num%s->avctx->rc_qmod_freq==0 && pict_type==AV_PICTURE_TYPE_P)
- q*= s->avctx->rc_qmod_amp;
+ if (s->avctx->rc_qmod_freq &&
+ frame_num % s->avctx->rc_qmod_freq == 0 &&
+ pict_type == AV_PICTURE_TYPE_P)
+ q *= s->avctx->rc_qmod_amp;
 
 /* buffer overflow/underflow protection */
- if(buffer_size){
- double expected_size= rcc->buffer_index;
+ if (buffer_size) {
+ double expected_size = rcc->buffer_index;
 double q_limit;
 
- if(min_rate){
- double d= 2*(buffer_size - expected_size)/buffer_size;
- if(d>1.0) d=1.0;
- else if(d<0.0001) d=0.0001;
- q*= pow(d, 1.0/s->avctx->rc_buffer_aggressivity);
-
- q_limit= bits2qp(rce, FFMAX((min_rate - buffer_size + rcc->buffer_index) * s->avctx->rc_min_vbv_overflow_use, 1));
- if(q > q_limit){
- if(s->avctx->debug&FF_DEBUG_RC){
- av_log(s->avctx, AV_LOG_DEBUG, "limiting QP %f -> %f\n", q, q_limit);
- }
- q= q_limit;
+ if (min_rate) {
+ double d = 2 * (buffer_size - expected_size) / buffer_size;
+ if (d > 1.0)
+ d = 1.0;
+ else if (d < 0.0001)
+ d = 0.0001;
+ q *= pow(d, 1.0 / s->avctx->rc_buffer_aggressivity);
+
+ q_limit = bits2qp(rce,
+ FFMAX((min_rate - buffer_size + rcc->buffer_index) *
+ s->avctx->rc_min_vbv_overflow_use, 1));
+
+ if (q > q_limit) {
+ if (s->avctx->debug & FF_DEBUG_RC)
+ av_log(s->avctx, AV_LOG_DEBUG,
+ "limiting QP %f -> %f\n", q, q_limit);
+ q = q_limit;
 }
 }
 
- if(max_rate){
- double d= 2*expected_size/buffer_size;
- if(d>1.0) d=1.0;
- else if(d<0.0001) d=0.0001;
- q/= pow(d, 1.0/s->avctx->rc_buffer_aggressivity);
-
- q_limit= bits2qp(rce, FFMAX(rcc->buffer_index * s->avctx->rc_max_available_vbv_use, 1));
- if(q < q_limit){
- if(s->avctx->debug&FF_DEBUG_RC){
- av_log(s->avctx, AV_LOG_DEBUG, "limiting QP %f -> %f\n", q, q_limit);
- }
- q= q_limit;
+ if (max_rate) {
+ double d = 2 * expected_size / buffer_size;
+ if (d > 1.0)
+ d = 1.0;
+ else if (d < 0.0001)
+ d = 0.0001;
+ q /= pow(d, 1.0 / s->avctx->rc_buffer_aggressivity);
+
+ q_limit = bits2qp(rce,
+ FFMAX(rcc->buffer_index *
+ s->avctx->rc_max_available_vbv_use,
+ 1));
+ if (q < q_limit) {
+ if (s->avctx->debug & FF_DEBUG_RC)
+ av_log(s->avctx, AV_LOG_DEBUG,
+ "limiting QP %f -> %f\n", q, q_limit);
+ q = q_limit;
 }
 }
 }
 av_dlog(s, "q:%f max:%f min:%f size:%f index:%f agr:%f\n",
 q, max_rate, min_rate, buffer_size, rcc->buffer_index,
 s->avctx->rc_buffer_aggressivity);
- if(s->avctx->rc_qsquish==0.0 || qmin==qmax){
- if (q<qmin) q=qmin;
- else if(q>qmax) q=qmax;
- }else{
- double min2= log(qmin);
- double max2= log(qmax);
-
- q= log(q);
- q= (q - min2)/(max2-min2) - 0.5;
- q*= -4.0;
- q= 1.0/(1.0 + exp(q));
- q= q*(max2-min2) + min2;
-
- q= exp(q);
+ if (s->avctx->rc_qsquish == 0.0 || qmin == qmax) {
+ if (q < qmin)
+ q = qmin;
+ else if (q > qmax)
+ q = qmax;
+ } else {
+ double min2 = log(qmin);
+ double max2 = log(qmax);
+
+ q = log(q);
+ q = (q - min2) / (max2 - min2) - 0.5;
+ q *= -4.0;
+ q = 1.0 / (1.0 + exp(q));
+ q = q * (max2 - min2) + min2;
+
+ q = exp(q);
 }
 
 return q;
 }
 
-//----------------------------------
+// ----------------------------------
 // 1 Pass Code
 
 static double predict_size(Predictor *p, double q, double var)
 {
- return p->coeff*var / (q*p->count);
+ return p->coeff * var / (q * p->count);
 }
 
 static void update_predictor(Predictor *p, double q, double var, double size)
 {
- double new_coeff= size*q / (var + 1);
- if(var<10) return;
+ double new_coeff = size * q / (var + 1);
+ if (var < 10)
+ return;
 
- p->count*= p->decay;
- p->coeff*= p->decay;
+ p->count *= p->decay;
+ p->coeff *= p->decay;
 p->count++;
- p->coeff+= new_coeff;
+ p->coeff += new_coeff;
 }
 
-static void adaptive_quantization(MpegEncContext *s, double q){
+static void adaptive_quantization(MpegEncContext *s, double q)
+{
 int i;
- const float lumi_masking= s->avctx->lumi_masking / (128.0*128.0);
- const float dark_masking= s->avctx->dark_masking / (128.0*128.0);
- const float temp_cplx_masking= s->avctx->temporal_cplx_masking;
+ const float lumi_masking = s->avctx->lumi_masking / (128.0 * 128.0);
+ const float dark_masking = s->avctx->dark_masking / (128.0 * 128.0);
+ const float temp_cplx_masking = s->avctx->temporal_cplx_masking;
 const float spatial_cplx_masking = s->avctx->spatial_cplx_masking;
- const float p_masking = s->avctx->p_masking;
- const float border_masking = s->avctx->border_masking;
- float bits_sum= 0.0;
- float cplx_sum= 0.0;
- float *cplx_tab = s->cplx_tab;
- float *bits_tab = s->bits_tab;
- const int qmin= s->avctx->mb_lmin;
- const int qmax= s->avctx->mb_lmax;
- Picture * const pic= &s->current_picture;
- const int mb_width = s->mb_width;
- const int mb_height = s->mb_height;
-
- for(i=0; i<s->mb_num; i++){
- const int mb_xy= s->mb_index2xy[i];
- float temp_cplx= sqrt(pic->mc_mb_var[mb_xy]); //FIXME merge in pow()
- float spat_cplx= sqrt(pic->mb_var[mb_xy]);
- const int lumi= pic->mb_mean[mb_xy];
+ const float p_masking = s->avctx->p_masking;
+ const float border_masking = s->avctx->border_masking;
+ float bits_sum = 0.0;
+ float cplx_sum = 0.0;
+ float *cplx_tab = s->cplx_tab;
+ float *bits_tab = s->bits_tab;
+ const int qmin = s->avctx->mb_lmin;
+ const int qmax = s->avctx->mb_lmax;
+ Picture *const pic = &s->current_picture;
+ const int mb_width = s->mb_width;
+ const int mb_height = s->mb_height;
+
+ for (i = 0; i < s->mb_num; i++) {
+ const int mb_xy = s->mb_index2xy[i];
+ float temp_cplx = sqrt(pic->mc_mb_var[mb_xy]); // FIXME merge in pow()
+ float spat_cplx = sqrt(pic->mb_var[mb_xy]);
+ const int lumi = pic->mb_mean[mb_xy];
 float bits, cplx, factor;
 int mb_x = mb_xy % s->mb_stride;
 int mb_y = mb_xy / s->mb_stride;
 int mb_distance;
 float mb_factor = 0.0;
- if(spat_cplx < 4) spat_cplx= 4; //FIXME finetune
- if(temp_cplx < 4) temp_cplx= 4; //FIXME finetune
-
- if((s->mb_type[mb_xy]&CANDIDATE_MB_TYPE_INTRA)){//FIXME hq mode
- cplx= spat_cplx;
- factor= 1.0 + p_masking;
- }else{
- cplx= temp_cplx;
- factor= pow(temp_cplx, - temp_cplx_masking);
+ if (spat_cplx < 4)
+ spat_cplx = 4; // FIXME finetune
+ if (temp_cplx < 4)
+ temp_cplx = 4; // FIXME finetune
+
+ if ((s->mb_type[mb_xy] & CANDIDATE_MB_TYPE_INTRA)) { // FIXME hq mode
+ cplx = spat_cplx;
+ factor = 1.0 + p_masking;
+ } else {
+ cplx = temp_cplx;
+ factor = pow(temp_cplx, -temp_cplx_masking);
 }
- factor*=pow(spat_cplx, - spatial_cplx_masking);
+ factor *= pow(spat_cplx, -spatial_cplx_masking);
 
- if(lumi>127)
- factor*= (1.0 - (lumi-128)*(lumi-128)*lumi_masking);
+ if (lumi > 127)
+ factor *= (1.0 - (lumi - 128) * (lumi - 128) * lumi_masking);
 else
- factor*= (1.0 - (lumi-128)*(lumi-128)*dark_masking);
-
- if(mb_x < mb_width/5){
- mb_distance = mb_width/5 - mb_x;
- mb_factor = (float)mb_distance / (float)(mb_width/5);
- }else if(mb_x > 4*mb_width/5){
- mb_distance = mb_x - 4*mb_width/5;
- mb_factor = (float)mb_distance / (float)(mb_width/5);
+ factor *= (1.0 - (lumi - 128) * (lumi - 128) * dark_masking);
+
+ if (mb_x < mb_width / 5) {
+ mb_distance = mb_width / 5 - mb_x;
+ mb_factor = (float)mb_distance / (float)(mb_width / 5);
+ } else if (mb_x > 4 * mb_width / 5) {
+ mb_distance = mb_x - 4 * mb_width / 5;
+ mb_factor = (float)mb_distance / (float)(mb_width / 5);
 }
- if(mb_y < mb_height/5){
- mb_distance = mb_height/5 - mb_y;
- mb_factor = FFMAX(mb_factor, (float)mb_distance / (float)(mb_height/5));
- }else if(mb_y > 4*mb_height/5){
- mb_distance = mb_y - 4*mb_height/5;
- mb_factor = FFMAX(mb_factor, (float)mb_distance / (float)(mb_height/5));
+ if (mb_y < mb_height / 5) {
+ mb_distance = mb_height / 5 - mb_y;
+ mb_factor = FFMAX(mb_factor,
+ (float)mb_distance / (float)(mb_height / 5));
+ } else if (mb_y > 4 * mb_height / 5) {
+ mb_distance = mb_y - 4 * mb_height / 5;
+ mb_factor = FFMAX(mb_factor,
+ (float)mb_distance / (float)(mb_height / 5));
 }
 
- factor*= 1.0 - border_masking*mb_factor;
+ factor *= 1.0 - border_masking * mb_factor;
 
- if(factor<0.00001) factor= 0.00001;
+ if (factor < 0.00001)
+ factor = 0.00001;
 
- bits= cplx*factor;
- cplx_sum+= cplx;
- bits_sum+= bits;
- cplx_tab[i]= cplx;
- bits_tab[i]= bits;
+ bits = cplx * factor;
+ cplx_sum += cplx;
+ bits_sum += bits;
+ cplx_tab[i] = cplx;
+ bits_tab[i] = bits;
 }
 
 /* handle qmin/qmax clipping */
- if(s->flags&CODEC_FLAG_NORMALIZE_AQP){
- float factor= bits_sum/cplx_sum;
- for(i=0; i<s->mb_num; i++){
- float newq= q*cplx_tab[i]/bits_tab[i];
- newq*= factor;
+ if (s->flags & CODEC_FLAG_NORMALIZE_AQP) {
+ float factor = bits_sum / cplx_sum;
+ for (i = 0; i < s->mb_num; i++) {
+ float newq = q * cplx_tab[i] / bits_tab[i];
+ newq *= factor;
 
- if (newq > qmax){
+ if (newq > qmax) {
 bits_sum -= bits_tab[i];
- cplx_sum -= cplx_tab[i]*q/qmax;
- }
- else if(newq < qmin){
+ cplx_sum -= cplx_tab[i] * q / qmax;
+ } else if (newq < qmin) {
 bits_sum -= bits_tab[i];
- cplx_sum -= cplx_tab[i]*q/qmin;
+ cplx_sum -= cplx_tab[i] * q / qmin;
 }
 }
- if(bits_sum < 0.001) bits_sum= 0.001;
- if(cplx_sum < 0.001) cplx_sum= 0.001;
+ if (bits_sum < 0.001)
+ bits_sum = 0.001;
+ if (cplx_sum < 0.001)
+ cplx_sum = 0.001;
 }
 
- for(i=0; i<s->mb_num; i++){
- const int mb_xy= s->mb_index2xy[i];
- float newq= q*cplx_tab[i]/bits_tab[i];
+ for (i = 0; i < s->mb_num; i++) {
+ const int mb_xy = s->mb_index2xy[i];
+ float newq = q * cplx_tab[i] / bits_tab[i];
 int intq;
 
- if(s->flags&CODEC_FLAG_NORMALIZE_AQP){
- newq*= bits_sum/cplx_sum;
+ if (s->flags & CODEC_FLAG_NORMALIZE_AQP) {
+ newq *= bits_sum / cplx_sum;
 }
 
- intq= (int)(newq + 0.5);
+ intq = (int)(newq + 0.5);
 
- if (intq > qmax) intq= qmax;
- else if(intq < qmin) intq= qmin;
- s->lambda_table[mb_xy]= intq;
+ if (intq > qmax)
+ intq = qmax;
+ else if (intq < qmin)
+ intq = qmin;
+ s->lambda_table[mb_xy] = intq;
 }
 }
 
-void ff_get_2pass_fcode(MpegEncContext *s){
- RateControlContext *rcc= &s->rc_context;
- int picture_number= s->picture_number;
- RateControlEntry *rce;
+void ff_get_2pass_fcode(MpegEncContext *s)
+{
+ RateControlContext *rcc = &s->rc_context;
+ RateControlEntry *rce = &rcc->entry[s->picture_number];
 
- rce= &rcc->entry[picture_number];
- s->f_code= rce->f_code;
- s->b_code= rce->b_code;
+ s->f_code = rce->f_code;
+ s->b_code = rce->b_code;
 }
 
-//FIXME rd or at least approx for dquant
+// FIXME rd or at least approx for dquant
 
 float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run)
 {
@@ -649,249 +729,272 @@
 double diff;
 double short_term_q;
 double fps;
- int picture_number= s->picture_number;
+ int picture_number = s->picture_number;
 int64_t wanted_bits;
- RateControlContext *rcc= &s->rc_context;
- AVCodecContext *a= s->avctx;
+ RateControlContext *rcc = &s->rc_context;
+ AVCodecContext *a = s->avctx;
 RateControlEntry local_rce, *rce;
 double bits;
 double rate_factor;
 int var;
- const int pict_type= s->pict_type;
- Picture * const pic= &s->current_picture;
+ const int pict_type = s->pict_type;
+ Picture * const pic = &s->current_picture;
 emms_c();
 
 #if CONFIG_LIBXVID
- if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
+ if ((s->flags & CODEC_FLAG_PASS2) &&
+ s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
 return ff_xvid_rate_estimate_qscale(s, dry_run);
 #endif
 
 get_qminmax(&qmin, &qmax, s, pict_type);
 
- fps= 1/av_q2d(s->avctx->time_base);
- /* 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;
- update_predictor(&rcc->pred[s->last_pict_type], rcc->last_qscale, sqrt(last_var), s->frame_bits);
+ fps = 1 / av_q2d(s->avctx->time_base);
+ /* 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;
+ update_predictor(&rcc->pred[s->last_pict_type],
+ rcc->last_qscale,
+ sqrt(last_var), s->frame_bits);
 }
 
- if(s->flags&CODEC_FLAG_PASS2){
- assert(picture_number>=0);
- assert(picture_number<rcc->num_entries);
- rce= &rcc->entry[picture_number];
- wanted_bits= rce->expected_bits;
- }else{
+ if (s->flags & CODEC_FLAG_PASS2) {
+ assert(picture_number >= 0);
+ assert(picture_number < rcc->num_entries);
+ rce = &rcc->entry[picture_number];
+ wanted_bits = rce->expected_bits;
+ } else {
 Picture *dts_pic;
- rce= &local_rce;
+ rce = &local_rce;
 
- //FIXME add a dts field to AVFrame and ensure its set and use it here instead of reordering
- //but the reordering is simpler for now until h.264 b pyramid must be handeld
- if(s->pict_type == AV_PICTURE_TYPE_B || s->low_delay)
- dts_pic= s->current_picture_ptr;
+ /* FIXME add a dts field to AVFrame and ensure it is set and use it
+ * here instead of reordering but the reordering is simpler for now
+ * until H.264 B-pyramid must be handled. */
+ if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay)
+ dts_pic = s->current_picture_ptr;
 else
- dts_pic= s->last_picture_ptr;
+ dts_pic = s->last_picture_ptr;
 
 if (!dts_pic || dts_pic->f.pts == AV_NOPTS_VALUE)
- wanted_bits= (uint64_t)(s->bit_rate*(double)picture_number/fps);
+ wanted_bits = (uint64_t)(s->bit_rate * (double)picture_number / fps);
 else
- wanted_bits = (uint64_t)(s->bit_rate*(double)dts_pic->f.pts / fps);
+ wanted_bits = (uint64_t)(s->bit_rate * (double)dts_pic->f.pts / fps);
 }
 
- diff= s->total_bits - wanted_bits;
- br_compensation= (a->bit_rate_tolerance - diff)/a->bit_rate_tolerance;
- if(br_compensation<=0.0) br_compensation=0.001;
+ diff = s->total_bits - wanted_bits;
+ br_compensation = (a->bit_rate_tolerance - diff) / a->bit_rate_tolerance;
+ if (br_compensation <= 0.0)
+ br_compensation = 0.001;
 
- var= pict_type == AV_PICTURE_TYPE_I ? pic->mb_var_sum : pic->mc_mb_var_sum;
+ var = pict_type == AV_PICTURE_TYPE_I ? pic->mb_var_sum : pic->mc_mb_var_sum;
 
 short_term_q = 0; /* avoid warning */
- if(s->flags&CODEC_FLAG_PASS2){
- if(pict_type!=AV_PICTURE_TYPE_I)
+ if (s->flags & CODEC_FLAG_PASS2) {
+ if (pict_type != AV_PICTURE_TYPE_I)
 assert(pict_type == rce->new_pict_type);
 
- q= rce->new_qscale / br_compensation;
+ q = rce->new_qscale / br_compensation;
 av_dlog(s, "%f %f %f last:%d var:%d type:%d//\n", q, rce->new_qscale,
 br_compensation, s->frame_bits, var, pict_type);
- }else{
- rce->pict_type=
- rce->new_pict_type= pict_type;
- rce->mc_mb_var_sum= pic->mc_mb_var_sum;
- rce->mb_var_sum = pic-> mb_var_sum;
- rce->qscale = FF_QP2LAMBDA * 2;
- rce->f_code = s->f_code;
- rce->b_code = s->b_code;
- rce->misc_bits= 1;
-
- bits= predict_size(&rcc->pred[pict_type], rce->qscale, sqrt(var));
- if(pict_type== AV_PICTURE_TYPE_I){
- rce->i_count = s->mb_num;
- rce->i_tex_bits= bits;
- rce->p_tex_bits= 0;
- rce->mv_bits= 0;
- }else{
- rce->i_count = 0; //FIXME we do know this approx
- rce->i_tex_bits= 0;
- rce->p_tex_bits= bits*0.9;
-
- rce->mv_bits= bits*0.1;
+ } else {
+ rce->pict_type =
+ rce->new_pict_type = pict_type;
+ rce->mc_mb_var_sum = pic->mc_mb_var_sum;
+ rce->mb_var_sum = pic->mb_var_sum;
+ rce->qscale = FF_QP2LAMBDA * 2;
+ rce->f_code = s->f_code;
+ rce->b_code = s->b_code;
+ rce->misc_bits = 1;
+
+ bits = predict_size(&rcc->pred[pict_type], rce->qscale, sqrt(var));
+ if (pict_type == AV_PICTURE_TYPE_I) {
+ rce->i_count = s->mb_num;
+ rce->i_tex_bits = bits;
+ rce->p_tex_bits = 0;
+ rce->mv_bits = 0;
+ } else {
+ rce->i_count = 0; // FIXME we do know this approx
+ rce->i_tex_bits = 0;
+ rce->p_tex_bits = bits * 0.9;
+ rce->mv_bits = bits * 0.1;
 }
- rcc->i_cplx_sum [pict_type] += rce->i_tex_bits*rce->qscale;
- rcc->p_cplx_sum [pict_type] += rce->p_tex_bits*rce->qscale;
+ rcc->i_cplx_sum[pict_type] += rce->i_tex_bits * rce->qscale;
+ rcc->p_cplx_sum[pict_type] += rce->p_tex_bits * rce->qscale;
 rcc->mv_bits_sum[pict_type] += rce->mv_bits;
- rcc->frame_count[pict_type] ++;
+ rcc->frame_count[pict_type]++;
 
- bits= rce->i_tex_bits + rce->p_tex_bits;
- rate_factor= rcc->pass1_wanted_bits/rcc->pass1_rc_eq_output_sum * br_compensation;
+ bits = rce->i_tex_bits + rce->p_tex_bits;
+ rate_factor = rcc->pass1_wanted_bits /
+ rcc->pass1_rc_eq_output_sum * br_compensation;
 
- q= get_qscale(s, rce, rate_factor, picture_number);
+ q = get_qscale(s, rce, rate_factor, picture_number);
 if (q < 0)
 return -1;
 
- assert(q>0.0);
- q= get_diff_limited_q(s, rce, q);
- assert(q>0.0);
+ assert(q > 0.0);
+ q = get_diff_limited_q(s, rce, q);
+ assert(q > 0.0);
 
- if(pict_type==AV_PICTURE_TYPE_P || s->intra_only){ //FIXME type dependent blur like in 2-pass
- rcc->short_term_qsum*=a->qblur;
- rcc->short_term_qcount*=a->qblur;
+ // FIXME type dependent blur like in 2-pass
+ if (pict_type == AV_PICTURE_TYPE_P || s->intra_only) {
+ rcc->short_term_qsum *= a->qblur;
+ rcc->short_term_qcount *= a->qblur;
 
- rcc->short_term_qsum+= q;
+ rcc->short_term_qsum += q;
 rcc->short_term_qcount++;
- q= short_term_q= rcc->short_term_qsum/rcc->short_term_qcount;
+ q = short_term_q = rcc->short_term_qsum / rcc->short_term_qcount;
 }
- assert(q>0.0);
+ assert(q > 0.0);
 
- q= modify_qscale(s, rce, q, picture_number);
+ q = modify_qscale(s, rce, q, picture_number);
 
- rcc->pass1_wanted_bits+= s->bit_rate/fps;
+ rcc->pass1_wanted_bits += s->bit_rate / fps;
 
- assert(q>0.0);
+ assert(q > 0.0);
 }
 
- 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",
- av_get_picture_type_char(pict_type), qmin, q, qmax, picture_number, (int)wanted_bits/1000, (int)s->total_bits/1000,
- br_compensation, short_term_q, s->frame_bits, pic->mb_var_sum, pic->mc_mb_var_sum, s->bit_rate/1000, (int)fps
- );
+ 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",
+ av_get_picture_type_char(pict_type),
+ qmin, q, qmax, picture_number,
+ (int)wanted_bits / 1000, (int)s->total_bits / 1000,
+ br_compensation, short_term_q, s->frame_bits,
+ pic->mb_var_sum, pic->mc_mb_var_sum,
+ s->bit_rate / 1000, (int)fps);
 }
 
- if (q<qmin) q=qmin;
- else if(q>qmax) q=qmax;
+ if (q < qmin)
+ q = qmin;
+ else if (q > qmax)
+ q = qmax;
 
- if(s->adaptive_quant)
+ if (s->adaptive_quant)
 adaptive_quantization(s, q);
 else
- q= (int)(q + 0.5);
+ q = (int)(q + 0.5);
 
- if(!dry_run){
- rcc->last_qscale= q;
- rcc->last_mc_mb_var_sum= pic->mc_mb_var_sum;
- rcc->last_mb_var_sum= pic->mb_var_sum;
+ if (!dry_run) {
+ rcc->last_qscale = q;
+ rcc->last_mc_mb_var_sum = pic->mc_mb_var_sum;
+ rcc->last_mb_var_sum = pic->mb_var_sum;
 }
 return q;
 }
 
-//----------------------------------------------
+// ----------------------------------------------
 // 2-Pass code
 
 static int init_pass2(MpegEncContext *s)
 {
- RateControlContext *rcc= &s->rc_context;
- AVCodecContext *a= s->avctx;
+ RateControlContext *rcc = &s->rc_context;
+ AVCodecContext *a = s->avctx;
 int i, toobig;
- double fps= 1/av_q2d(s->avctx->time_base);
- double complexity[5]={0,0,0,0,0}; // approximate bits at quant=1
- uint64_t const_bits[5]={0,0,0,0,0}; // quantizer independent bits
+ double fps = 1 / av_q2d(s->avctx->time_base);
+ double complexity[5] = { 0 }; // approximate bits at quant=1
+ uint64_t const_bits[5] = { 0 }; // quantizer independent bits
 uint64_t all_const_bits;
- uint64_t all_available_bits= (uint64_t)(s->bit_rate*(double)rcc->num_entries/fps);
- double rate_factor=0;
+ uint64_t all_available_bits = (uint64_t)(s->bit_rate *
+ (double)rcc->num_entries / fps);
+ double rate_factor = 0;
 double step;
- //int last_i_frame=-10000000;
- const int filter_size= (int)(a->qblur*4) | 1;
+ const int filter_size = (int)(a->qblur * 4) | 1;
 double expected_bits;
 double *qscale, *blurred_qscale, qscale_sum;
 
 /* find complexity & const_bits & decide the pict_types */
- for(i=0; i<rcc->num_entries; i++){
- RateControlEntry *rce= &rcc->entry[i];
+ for (i = 0; i < rcc->num_entries; i++) {
+ RateControlEntry *rce = &rcc->entry[i];
 
- rce->new_pict_type= rce->pict_type;
- rcc->i_cplx_sum [rce->pict_type] += rce->i_tex_bits*rce->qscale;
- rcc->p_cplx_sum [rce->pict_type] += rce->p_tex_bits*rce->qscale;
+ rce->new_pict_type = rce->pict_type;
+ rcc->i_cplx_sum[rce->pict_type] += rce->i_tex_bits * rce->qscale;
+ rcc->p_cplx_sum[rce->pict_type] += rce->p_tex_bits * rce->qscale;
 rcc->mv_bits_sum[rce->pict_type] += rce->mv_bits;
- rcc->frame_count[rce->pict_type] ++;
+ rcc->frame_count[rce->pict_type]++;
 
- complexity[rce->new_pict_type]+= (rce->i_tex_bits+ rce->p_tex_bits)*(double)rce->qscale;
- const_bits[rce->new_pict_type]+= rce->mv_bits + rce->misc_bits;
+ complexity[rce->new_pict_type] += (rce->i_tex_bits + rce->p_tex_bits) *
+ (double)rce->qscale;
+ const_bits[rce->new_pict_type] += rce->mv_bits + rce->misc_bits;
 }
- all_const_bits= const_bits[AV_PICTURE_TYPE_I] + const_bits[AV_PICTURE_TYPE_P] + const_bits[AV_PICTURE_TYPE_B];
 
- if(all_available_bits < all_const_bits){
+ all_const_bits = const_bits[AV_PICTURE_TYPE_I] +
+ const_bits[AV_PICTURE_TYPE_P] +
+ const_bits[AV_PICTURE_TYPE_B];
+
+ if (all_available_bits < all_const_bits) {
 av_log(s->avctx, AV_LOG_ERROR, "requested bitrate is too low\n");
 return -1;
 }
 
- qscale= av_malloc(sizeof(double)*rcc->num_entries);
- blurred_qscale= av_malloc(sizeof(double)*rcc->num_entries);
+ qscale = av_malloc(sizeof(double) * rcc->num_entries);
+ blurred_qscale = av_malloc(sizeof(double) * rcc->num_entries);
 toobig = 0;
 
- for(step=256*256; step>0.0000001; step*=0.5){
- expected_bits=0;
- rate_factor+= step;
+ for (step = 256 * 256; step > 0.0000001; step *= 0.5) {
+ expected_bits = 0;
+ rate_factor += step;
 
- rcc->buffer_index= s->avctx->rc_buffer_size/2;
+ rcc->buffer_index = s->avctx->rc_buffer_size / 2;
 
 /* find qscale */
- for(i=0; i<rcc->num_entries; i++){
- RateControlEntry *rce= &rcc->entry[i];
- qscale[i]= get_qscale(s, &rcc->entry[i], rate_factor, i);
+ for (i = 0; i < rcc->num_entries; i++) {
+ RateControlEntry *rce = &rcc->entry[i];
+
+ qscale[i] = get_qscale(s, &rcc->entry[i], rate_factor, i);
 rcc->last_qscale_for[rce->pict_type] = qscale[i];
 }
- assert(filter_size%2==1);
+ assert(filter_size % 2 == 1);
 
 /* fixed I/B QP relative to P mode */
- for(i=rcc->num_entries-1; i>=0; i--){
- RateControlEntry *rce= &rcc->entry[i];
+ for (i = rcc->num_entries - 1; i >= 0; i--) {
+ RateControlEntry *rce = &rcc->entry[i];
 
- qscale[i]= get_diff_limited_q(s, rce, qscale[i]);
+ qscale[i] = get_diff_limited_q(s, rce, qscale[i]);
 }
 
 /* smooth curve */
- for(i=0; i<rcc->num_entries; i++){
- RateControlEntry *rce= &rcc->entry[i];
- const int pict_type= rce->new_pict_type;
+ for (i = 0; i < rcc->num_entries; i++) {
+ RateControlEntry *rce = &rcc->entry[i];
+ const int pict_type = rce->new_pict_type;
 int j;
- double q=0.0, sum=0.0;
-
- for(j=0; j<filter_size; j++){
- int index= i+j-filter_size/2;
- double d= index-i;
- double coeff= a->qblur==0 ? 1.0 : exp(-d*d/(a->qblur * a->qblur));
-
- if(index < 0 || index >= rcc->num_entries) continue;
- if(pict_type != rcc->entry[index].new_pict_type) continue;
- q+= qscale[index] * coeff;
- sum+= coeff;
+ double q = 0.0, sum = 0.0;
+
+ for (j = 0; j < filter_size; j++) {
+ int index = i + j - filter_size / 2;
+ double d = index - i;
+ double coeff = a->qblur == 0 ? 1.0 : exp(-d * d / (a->qblur * a->qblur));
+
+ if (index < 0 || index >= rcc->num_entries)
+ continue;
+ if (pict_type != rcc->entry[index].new_pict_type)
+ continue;
+ q += qscale[index] * coeff;
+ sum += coeff;
 }
- blurred_qscale[i]= q/sum;
+ blurred_qscale[i] = q / sum;
 }
 
 /* find expected bits */
- for(i=0; i<rcc->num_entries; i++){
- RateControlEntry *rce= &rcc->entry[i];
+ for (i = 0; i < rcc->num_entries; i++) {
+ RateControlEntry *rce = &rcc->entry[i];
 double bits;
- rce->new_qscale= modify_qscale(s, rce, blurred_qscale[i], i);
- bits= qp2bits(rce, rce->new_qscale) + rce->mv_bits + rce->misc_bits;
- bits += 8*ff_vbv_update(s, bits);
 
- rce->expected_bits= expected_bits;
- expected_bits += bits;
+ rce->new_qscale = modify_qscale(s, rce, blurred_qscale[i], i);
+
+ bits = qp2bits(rce, rce->new_qscale) + rce->mv_bits + rce->misc_bits;
+ bits += 8 * ff_vbv_update(s, bits);
+
+ rce->expected_bits = expected_bits;
+ expected_bits += bits;
 }
 
 av_dlog(s->avctx,
 "expected_bits: %f all_available_bits: %d rate_factor: %f\n",
 expected_bits, (int)all_available_bits, rate_factor);
- if(expected_bits > all_available_bits) {
- rate_factor-= step;
+ if (expected_bits > all_available_bits) {
+ rate_factor -= step;
 ++toobig;
 }
 }
@@ -900,33 +1003,34 @@
 
 /* check bitrate calculations and print info */
 qscale_sum = 0.0;
- for(i=0; i<rcc->num_entries; i++){
+ for (i = 0; i < rcc->num_entries; i++) {
 av_dlog(s, "[lavc rc] entry[%d].new_qscale = %.3f qp = %.3f\n",
 i,
 rcc->entry[i].new_qscale,
 rcc->entry[i].new_qscale / FF_QP2LAMBDA);
- qscale_sum += av_clip(rcc->entry[i].new_qscale / FF_QP2LAMBDA, s->avctx->qmin, s->avctx->qmax);
+ qscale_sum += av_clip(rcc->entry[i].new_qscale / FF_QP2LAMBDA,
+ s->avctx->qmin, s->avctx->qmax);
 }
 assert(toobig <= 40);
 av_log(s->avctx, AV_LOG_DEBUG,
- "[lavc rc] requested bitrate: %d bps expected bitrate: %d bps\n",
- s->bit_rate,
- (int)(expected_bits / ((double)all_available_bits/s->bit_rate)));
+ "[lavc rc] requested bitrate: %d bps expected bitrate: %d bps\n",
+ s->bit_rate,
+ (int)(expected_bits / ((double)all_available_bits / s->bit_rate)));
 av_log(s->avctx, AV_LOG_DEBUG,
- "[lavc rc] estimated target average qp: %.3f\n",
- (float)qscale_sum / rcc->num_entries);
+ "[lavc rc] estimated target average qp: %.3f\n",
+ (float)qscale_sum / rcc->num_entries);
 if (toobig == 0) {
 av_log(s->avctx, AV_LOG_INFO,
- "[lavc rc] Using all of requested bitrate is not "
- "necessary for this video with these parameters.\n");
+ "[lavc rc] Using all of requested bitrate is not "
+ "necessary for this video with these parameters.\n");
 } else if (toobig == 40) {
 av_log(s->avctx, AV_LOG_ERROR,
- "[lavc rc] Error: bitrate too low for this video "
- "with these parameters.\n");
+ "[lavc rc] Error: bitrate too low for this video "
+ "with these parameters.\n");
 return -1;
- } else if (fabs(expected_bits/all_available_bits - 1.0) > 0.01) {
+ } else if (fabs(expected_bits / all_available_bits - 1.0) > 0.01) {
 av_log(s->avctx, AV_LOG_ERROR,
- "[lavc rc] Error: 2pass curve failed to converge\n");
+ "[lavc rc] Error: 2pass curve failed to converge\n");
 return -1;
 }

libav-v9.6.tar.bz2/libavcodec/ratecontrol.h -> libav-v10.1.tar.bz2/libavcodec/ratecontrol.h Changed

libav-v9.6.tar.bz2/libavcodec/rawdec.c -> libav-v10.1.tar.bz2/libavcodec/rawdec.c Changed

@@ -25,17 +25,19 @@
 */
 
 #include "avcodec.h"
+#include "internal.h"
 #include "raw.h"
+#include "libavutil/buffer.h"
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/imgutils.h"
 
 typedef struct RawVideoContext {
- uint32_t palette[AVPALETTE_COUNT];
- unsigned char * buffer; /* block of memory for holding one frame */
- int length; /* number of bytes in buffer */
+ AVBufferRef *palette;
+ int frame_size; /* size of the frame in bytes */
 int flip;
- AVFrame pic; ///< AVCodecContext.coded_frame
+ int is_2_4_bpp; // 2 or 4 bpp raw in avi/mov
+ int is_yuv2;
 } RawVideoContext;
 
 static const PixelFormatTag pix_fmt_bps_avi[] = {
@@ -46,7 +48,7 @@
 { AV_PIX_FMT_RGB555, 16 },
 { AV_PIX_FMT_BGR24, 24 },
 { AV_PIX_FMT_RGB32, 32 },
- { AV_PIX_FMT_NONE, 0 },
+ { AV_PIX_FMT_NONE, 0 },
 };
 
 static const PixelFormatTag pix_fmt_bps_mov[] = {
@@ -60,10 +62,11 @@
 { AV_PIX_FMT_RGB24, 24 },
 { AV_PIX_FMT_ARGB, 32 },
 { AV_PIX_FMT_MONOWHITE,33 },
- { AV_PIX_FMT_NONE, 0 },
+ { AV_PIX_FMT_NONE, 0 },
 };
 
-static enum AVPixelFormat find_pix_fmt(const PixelFormatTag *tags, unsigned int fourcc)
+static enum AVPixelFormat find_pix_fmt(const PixelFormatTag *tags,
+ unsigned int fourcc)
 {
 while (tags->pix_fmt >= 0) {
 if (tags->fourcc == fourcc)
@@ -76,122 +79,164 @@
 static av_cold int raw_init_decoder(AVCodecContext *avctx)
 {
 RawVideoContext *context = avctx->priv_data;
+ const AVPixFmtDescriptor *desc;
 
- if (avctx->codec_tag == MKTAG('r','a','w',' '))
- avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_mov, avctx->bits_per_coded_sample);
- else if (avctx->codec_tag == MKTAG('W','R','A','W'))
- avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_avi, avctx->bits_per_coded_sample);
+ if (avctx->codec_tag == MKTAG('r', 'a', 'w', ' '))
+ avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_mov,
+ avctx->bits_per_coded_sample);
+ else if (avctx->codec_tag == MKTAG('W', 'R', 'A', 'W'))
+ avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_avi,
+ avctx->bits_per_coded_sample);
 else if (avctx->codec_tag)
 avctx->pix_fmt = find_pix_fmt(ff_raw_pix_fmt_tags, avctx->codec_tag);
 else if (avctx->pix_fmt == AV_PIX_FMT_NONE && avctx->bits_per_coded_sample)
- avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_avi, avctx->bits_per_coded_sample);
-
- avpriv_set_systematic_pal2(context->palette, avctx->pix_fmt);
- context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height);
- if((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) &&
- avctx->pix_fmt==AV_PIX_FMT_PAL8 &&
- (!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' '))){
- context->buffer = av_malloc(context->length);
- if (!context->buffer)
- return -1;
+ avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_avi,
+ avctx->bits_per_coded_sample);
+
+ desc = av_pix_fmt_desc_get(avctx->pix_fmt);
+ if (!desc) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid pixel format.\n");
+ return AVERROR(EINVAL);
+ }
+
+ if (desc->flags & (AV_PIX_FMT_FLAG_PAL | AV_PIX_FMT_FLAG_PSEUDOPAL)) {
+ context->palette = av_buffer_alloc(AVPALETTE_SIZE);
+ if (!context->palette)
+ return AVERROR(ENOMEM);
+ if (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)
+ avpriv_set_systematic_pal2((uint32_t*)context->palette->data, avctx->pix_fmt);
+ else
+ memset(context->palette->data, 0, AVPALETTE_SIZE);
 }
- context->pic.pict_type = AV_PICTURE_TYPE_I;
- context->pic.key_frame = 1;
 
- avctx->coded_frame= &context->pic;
+ context->frame_size = avpicture_get_size(avctx->pix_fmt, avctx->width,
+ avctx->height);
+ if ((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) &&
+ avctx->pix_fmt == AV_PIX_FMT_PAL8 &&
+ (!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' ')))
+ context->is_2_4_bpp = 1;
+
+ if ((avctx->extradata_size >= 9 &&
+ !memcmp(avctx->extradata + avctx->extradata_size - 9, "BottomUp", 9)) ||
+ avctx->codec_tag == MKTAG(3, 0, 0, 0) ||
+ avctx->codec_tag == MKTAG('W','R','A','W'))
+ context->flip = 1;
 
- if((avctx->extradata_size >= 9 && !memcmp(avctx->extradata + avctx->extradata_size - 9, "BottomUp", 9)) ||
- avctx->codec_tag == MKTAG(3, 0, 0, 0) || avctx->codec_tag == MKTAG('W','R','A','W'))
- context->flip=1;
+ if (avctx->codec_tag == AV_RL32("yuv2") &&
+ avctx->pix_fmt == AV_PIX_FMT_YUYV422)
+ context->is_yuv2 = 1;
 
 return 0;
 }
 
-static void flip(AVCodecContext *avctx, AVPicture * picture){
- picture->data[0] += picture->linesize[0] * (avctx->height-1);
+static void flip(AVCodecContext *avctx, AVPicture *picture)
+{
+ picture->data[0] += picture->linesize[0] * (avctx->height - 1);
 picture->linesize[0] *= -1;
 }
 
-static int raw_decode(AVCodecContext *avctx,
- void *data, int *got_frame,
- AVPacket *avpkt)
+static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
+ AVPacket *avpkt)
 {
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- RawVideoContext *context = avctx->priv_data;
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
+ RawVideoContext *context = avctx->priv_data;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ int need_copy = !avpkt->buf || context->is_2_4_bpp || context->is_yuv2;
 int res;
 
 AVFrame *frame = data;
 AVPicture *picture = data;
 
- frame->pict_type = avctx->coded_frame->pict_type;
- frame->interlaced_frame = avctx->coded_frame->interlaced_frame;
- frame->top_field_first = avctx->coded_frame->top_field_first;
+ frame->pict_type = AV_PICTURE_TYPE_I;
+ frame->key_frame = 1;
 frame->reordered_opaque = avctx->reordered_opaque;
- frame->pkt_pts = avctx->pkt->pts;
+ frame->pkt_pts = avctx->internal->pkt->pts;
 
- if(buf_size < context->length - (avctx->pix_fmt==AV_PIX_FMT_PAL8 ? 256*4 : 0))
+ if (buf_size < context->frame_size - (avctx->pix_fmt == AV_PIX_FMT_PAL8 ?
+ AVPALETTE_SIZE : 0))
 return -1;
 
+ if (need_copy)
+ frame->buf[0] = av_buffer_alloc(context->frame_size);
+ else
+ frame->buf[0] = av_buffer_ref(avpkt->buf);
+ if (!frame->buf[0])
+ return AVERROR(ENOMEM);
+
 //2bpp and 4bpp raw in avi and mov (yes this is ugly ...)
- if (context->buffer) {
+ if (context->is_2_4_bpp) {
 int i;
- uint8_t *dst = context->buffer;
- buf_size = context->length - 256*4;
- if (avctx->bits_per_coded_sample == 4){
- for(i=0; 2*i+1 < buf_size; i++){
- dst[2*i+0]= buf[i]>>4;
- dst[2*i+1]= buf[i]&15;
+ uint8_t *dst = frame->buf[0]->data;
+ buf_size = context->frame_size - AVPALETTE_SIZE;
+ if (avctx->bits_per_coded_sample == 4) {
+ for (i = 0; 2 * i + 1 < buf_size; i++) {
+ dst[2 * i + 0] = buf[i] >> 4;
+ dst[2 * i + 1] = buf[i] & 15;
 }
- } else
- for(i=0; 4*i+3 < buf_size; i++){
- dst[4*i+0]= buf[i]>>6;
- dst[4*i+1]= buf[i]>>4&3;
- dst[4*i+2]= buf[i]>>2&3;
- dst[4*i+3]= buf[i] &3;
+ } else {
+ for (i = 0; 4 * i + 3 < buf_size; i++) {
+ dst[4 * i + 0] = buf[i] >> 6;
+ dst[4 * i + 1] = buf[i] >> 4 & 3;
+ dst[4 * i + 2] = buf[i] >> 2 & 3;
+ dst[4 * i + 3] = buf[i] & 3;
 }
- buf= dst;
+ }
+ buf = dst;
+ } else if (need_copy) {
+ memcpy(frame->buf[0]->data, buf, FFMIN(buf_size, context->frame_size));
+ buf = frame->buf[0]->data;
 }
 
- if(avctx->codec_tag == MKTAG('A', 'V', '1', 'x') ||
- avctx->codec_tag == MKTAG('A', 'V', 'u', 'p'))
- buf += buf_size - context->length;
+ if (avctx->codec_tag == MKTAG('A', 'V', '1', 'x') ||
+ avctx->codec_tag == MKTAG('A', 'V', 'u', 'p'))
+ buf += buf_size - context->frame_size;
 
 if ((res = avpicture_fill(picture, buf, avctx->pix_fmt,
 avctx->width, avctx->height)) < 0)
 return res;
- if((avctx->pix_fmt==AV_PIX_FMT_PAL8 && buf_size < context->length) ||
- (desc->flags & PIX_FMT_PSEUDOPAL)) {
- frame->data[1]= context->palette;
- }
+
 if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
- const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
+ const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE,
+ NULL);
 
 if (pal) {
- memcpy(frame->data[1], pal, AVPALETTE_SIZE);
+ av_buffer_unref(&context->palette);
+ context->palette = av_buffer_alloc(AVPALETTE_SIZE);
+ if (!context->palette)
+ return AVERROR(ENOMEM);
+ memcpy(context->palette->data, pal, AVPALETTE_SIZE);
 frame->palette_has_changed = 1;
 }
 }
- if(avctx->pix_fmt==AV_PIX_FMT_BGR24 && ((frame->linesize[0]+3)&~3)*avctx->height <= buf_size)
- frame->linesize[0] = (frame->linesize[0]+3)&~3;
 
- if(context->flip)
+ if ((avctx->pix_fmt == AV_PIX_FMT_PAL8 && buf_size < context->frame_size) ||
+ (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)) {
+ frame->buf[1] = av_buffer_ref(context->palette);
+ if (!frame->buf[1])
+ return AVERROR(ENOMEM);
+ frame->data[1] = frame->buf[1]->data;
+ }
+ if (avctx->pix_fmt == AV_PIX_FMT_BGR24 &&
+ ((frame->linesize[0] + 3) & ~3) * avctx->height <= buf_size)
+ frame->linesize[0] = (frame->linesize[0] + 3) & ~3;
+
+ if (context->flip)
 flip(avctx, picture);
 
- if ( avctx->codec_tag == MKTAG('Y', 'V', '1', '2')
- || avctx->codec_tag == MKTAG('Y', 'V', '1', '6')
- || avctx->codec_tag == MKTAG('Y', 'V', '2', '4')
- || avctx->codec_tag == MKTAG('Y', 'V', 'U', '9'))
+ if (avctx->codec_tag == MKTAG('Y', 'V', '1', '2') ||
+ avctx->codec_tag == MKTAG('Y', 'V', '1', '6') ||
+ avctx->codec_tag == MKTAG('Y', 'V', '2', '4') ||
+ avctx->codec_tag == MKTAG('Y', 'V', 'U', '9'))
 FFSWAP(uint8_t *, picture->data[1], picture->data[2]);
 
- if(avctx->codec_tag == AV_RL32("yuv2") &&
- avctx->pix_fmt == AV_PIX_FMT_YUYV422) {
+ if (avctx->codec_tag == AV_RL32("yuv2") &&
+ avctx->pix_fmt == AV_PIX_FMT_YUYV422) {
 int x, y;
 uint8_t *line = picture->data[0];
- for(y = 0; y < avctx->height; y++) {
- for(x = 0; x < avctx->width; x++)
- line[2*x + 1] ^= 0x80;
+ for (y = 0; y < avctx->height; y++) {
+ for (x = 0; x < avctx->width; x++)
+ line[2 * x + 1] ^= 0x80;
 line += picture->linesize[0];
 }
 }
@@ -204,17 +249,17 @@
 {
 RawVideoContext *context = avctx->priv_data;
 
- av_freep(&context->buffer);
+ av_buffer_unref(&context->palette);
 return 0;
 }
 
 AVCodec ff_rawvideo_decoder = {
 .name = "rawvideo",
+ .long_name = NULL_IF_CONFIG_SMALL("raw video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_RAWVIDEO,
 .priv_data_size = sizeof(RawVideoContext),
 .init = raw_init_decoder,
 .close = raw_close_decoder,
 .decode = raw_decode,
- .long_name = NULL_IF_CONFIG_SMALL("raw video"),
 };

libav-v9.6.tar.bz2/libavcodec/rawenc.c -> libav-v10.1.tar.bz2/libavcodec/rawenc.c Changed

libav-v9.6.tar.bz2/libavcodec/rdft.c -> libav-v10.1.tar.bz2/libavcodec/rdft.c Changed

libav-v9.6.tar.bz2/libavcodec/rectangle.h -> libav-v10.1.tar.bz2/libavcodec/rectangle.h Changed

libav-v9.6.tar.bz2/libavcodec/rl2.c -> libav-v10.1.tar.bz2/libavcodec/rl2.c Changed

@@ -41,12 +41,11 @@
 
 typedef struct Rl2Context {
 AVCodecContext *avctx;
- AVFrame frame;
 
- unsigned short video_base; ///< initial drawing offset
- unsigned int clr_count; ///< number of used colors (currently unused)
- unsigned char* back_frame; ///< background frame
- unsigned int palette[AVPALETTE_COUNT];
+ uint16_t video_base; ///< initial drawing offset
+ uint32_t clr_count; ///< number of used colors (currently unused)
+ uint8_t *back_frame; ///< background frame
+ uint32_t palette[AVPALETTE_COUNT];
 } Rl2Context;
 
 /**
@@ -58,67 +57,68 @@
 * @param stride stride of the output buffer
 * @param video_base offset of the rle data inside the frame
 */
-static void rl2_rle_decode(Rl2Context *s,const unsigned char* in,int size,
- unsigned char* out,int stride,int video_base){
+static void rl2_rle_decode(Rl2Context *s, const uint8_t *in, int size,
+ uint8_t *out, int stride, int video_base)
+{
 int base_x = video_base % s->avctx->width;
 int base_y = video_base / s->avctx->width;
 int stride_adj = stride - s->avctx->width;
 int i;
- const unsigned char* back_frame = s->back_frame;
- const unsigned char* in_end = in + size;
- const unsigned char* out_end = out + stride * s->avctx->height;
- unsigned char* line_end;
+ const uint8_t *back_frame = s->back_frame;
+ const uint8_t *in_end = in + size;
+ const uint8_t *out_end = out + stride * s->avctx->height;
+ uint8_t *line_end;
 
 /** copy start of the background frame */
- for(i=0;i<=base_y;i++){
- if(s->back_frame)
- memcpy(out,back_frame,s->avctx->width);
- out += stride;
+ for (i = 0; i <= base_y; i++) {
+ if (s->back_frame)
+ memcpy(out, back_frame, s->avctx->width);
+ out += stride;
 back_frame += s->avctx->width;
 }
 back_frame += base_x - s->avctx->width;
- line_end = out - stride_adj;
- out += base_x - stride;
+ line_end = out - stride_adj;
+ out += base_x - stride;
 
 /** decode the variable part of the frame */
- while(in < in_end){
- unsigned char val = *in++;
- int len = 1;
- if(val >= 0x80){
- if(in >= in_end)
+ while (in < in_end) {
+ uint8_t val = *in++;
+ int len = 1;
+ if (val >= 0x80) {
+ if (in >= in_end)
 break;
 len = *in++;
- if(!len)
+ if (!len)
 break;
 }
 
- if(len >= out_end - out)
+ if (len >= out_end - out)
 break;
 
- if(s->back_frame)
+ if (s->back_frame)
 val |= 0x80;
 else
 val &= ~0x80;
 
- while(len--){
- *out++ = (val == 0x80)? *back_frame:val;
+ while (len--) {
+ *out++ = (val == 0x80) ? *back_frame : val;
 back_frame++;
- if(out == line_end){
- out += stride_adj;
+ if (out == line_end) {
+ out += stride_adj;
 line_end += stride;
- if(len >= out_end - out)
+ if (len >= out_end - out)
 break;
 }
 }
 }
 
 /** copy the rest from the background frame */
- if(s->back_frame){
- while(out < out_end){
+ if (s->back_frame) {
+ while (out < out_end) {
 memcpy(out, back_frame, line_end - out);
 back_frame += line_end - out;
- out = line_end + stride_adj;
- line_end += stride;
+ out = line_end + stride_adj;
+ line_end += stride;
 }
 }
 }
@@ -134,37 +134,38 @@
 Rl2Context *s = avctx->priv_data;
 int back_size;
 int i;
- s->avctx = avctx;
+
+ s->avctx = avctx;
 avctx->pix_fmt = AV_PIX_FMT_PAL8;
 
 /** parse extra data */
- if(!avctx->extradata || avctx->extradata_size < EXTRADATA1_SIZE){
+ if (!avctx->extradata || avctx->extradata_size < EXTRADATA1_SIZE) {
 av_log(avctx, AV_LOG_ERROR, "invalid extradata size\n");
- return -1;
+ return AVERROR(EINVAL);
 }
 
 /** get frame_offset */
 s->video_base = AV_RL16(&avctx->extradata[0]);
- s->clr_count = AV_RL32(&avctx->extradata[2]);
+ s->clr_count = AV_RL32(&avctx->extradata[2]);
 
- if(s->video_base >= avctx->width * avctx->height){
+ if (s->video_base >= avctx->width * avctx->height) {
 av_log(avctx, AV_LOG_ERROR, "invalid video_base\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 /** initialize palette */
- for(i=0;i<AVPALETTE_COUNT;i++)
+ for (i = 0; i < AVPALETTE_COUNT; i++)
 s->palette[i] = AV_RB24(&avctx->extradata[6 + i * 3]);
 
 /** decode background frame if present */
 back_size = avctx->extradata_size - EXTRADATA1_SIZE;
 
- if(back_size > 0){
- unsigned char* back_frame = av_mallocz(avctx->width*avctx->height);
- if(!back_frame)
- return -1;
- rl2_rle_decode(s,avctx->extradata + EXTRADATA1_SIZE,back_size,
- back_frame,avctx->width,0);
+ if (back_size > 0) {
+ uint8_t *back_frame = av_mallocz(avctx->width*avctx->height);
+ if (!back_frame)
+ return AVERROR(ENOMEM);
+ rl2_rle_decode(s, avctx->extradata + EXTRADATA1_SIZE, back_size,
+ back_frame, avctx->width, 0);
 s->back_frame = back_frame;
 }
 return 0;
@@ -172,31 +173,27 @@
 
 
 static int rl2_decode_frame(AVCodecContext *avctx,
- void *data, int *got_frame,
- AVPacket *avpkt)
+ void *data, int *got_frame,
+ AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
+ int ret, buf_size = avpkt->size;
 Rl2Context *s = avctx->priv_data;
 
- if(s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
-
- /** get buffer */
- s->frame.reference= 0;
- if(ff_get_buffer(avctx, &s->frame)) {
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 /** run length decode */
- rl2_rle_decode(s,buf,buf_size,s->frame.data[0],s->frame.linesize[0],s->video_base);
+ rl2_rle_decode(s, buf, buf_size, frame->data[0], frame->linesize[0],
+ s->video_base);
 
 /** make the palette available on the way out */
- memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
+ memcpy(frame->data[1], s->palette, AVPALETTE_SIZE);
 
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
 /** report that the buffer was completely consumed */
 return buf_size;
@@ -212,9 +209,6 @@
 {
 Rl2Context *s = avctx->priv_data;
 
- if(s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
-
 av_free(s->back_frame);
 
 return 0;
@@ -223,6 +217,7 @@
 
 AVCodec ff_rl2_decoder = {
 .name = "rl2",
+ .long_name = NULL_IF_CONFIG_SMALL("RL2 video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_RL2,
 .priv_data_size = sizeof(Rl2Context),
@@ -230,5 +225,4 @@
 .close = rl2_decode_end,
 .decode = rl2_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("RL2 video"),
 };

libav-v10.1.tar.bz2/libavcodec/rnd_avg.h Added

@@ -0,0 +1,54 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_RND_AVG_H
+#define AVCODEC_RND_AVG_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#define CALL_2X_PIXELS(a, b, n)\
+static void a(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h){\
+ b(block , pixels , line_size, h);\
+ b(block+n, pixels+n, line_size, h);\
+}
+
+#define BYTE_VEC32(c) ((c)*0x01010101UL)
+#define BYTE_VEC64(c) ((c)*0x0001000100010001UL)
+
+static inline uint32_t rnd_avg32(uint32_t a, uint32_t b)
+{
+ return (a | b) - (((a ^ b) & ~BYTE_VEC32(0x01)) >> 1);
+}
+
+static inline uint32_t no_rnd_avg32(uint32_t a, uint32_t b)
+{
+ return (a & b) + (((a ^ b) & ~BYTE_VEC32(0x01)) >> 1);
+}
+
+static inline uint64_t rnd_avg64(uint64_t a, uint64_t b)
+{
+ return (a | b) - (((a ^ b) & ~BYTE_VEC64(0x01)) >> 1);
+}
+
+static inline uint64_t no_rnd_avg64(uint64_t a, uint64_t b)
+{
+ return (a & b) + (((a ^ b) & ~BYTE_VEC64(0x01)) >> 1);
+}
+
+#endif /* AVCODEC_RND_AVG_H */

libav-v9.6.tar.bz2/libavcodec/roqaudioenc.c -> libav-v10.1.tar.bz2/libavcodec/roqaudioenc.c Changed

@@ -46,9 +46,6 @@
 {
     ROQDPCMContext *context = avctx->priv_data;
 
-#if FF_API_OLD_ENCODE_AUDIO
-    av_freep(&avctx->coded_frame);
-#endif
     av_freep(&context->frame_buffer);
 
     return 0;
@@ -81,14 +78,6 @@
 
     context->lastSample[0] = context->lastSample[1] = 0;
 
-#if FF_API_OLD_ENCODE_AUDIO
-    avctx->coded_frame= avcodec_alloc_frame();
-    if (!avctx->coded_frame) {
-        ret = AVERROR(ENOMEM);
-        goto error;
-    }
-#endif
-
     return 0;
 error:
     roq_dpcm_encode_close(avctx);
@@ -204,6 +193,7 @@
 
 AVCodec ff_roq_dpcm_encoder = {
     .name           = "roq_dpcm",
+    .long_name      = NULL_IF_CONFIG_SMALL("id RoQ DPCM"),
     .type           = AVMEDIA_TYPE_AUDIO,
     .id             = AV_CODEC_ID_ROQ_DPCM,
     .priv_data_size = sizeof(ROQDPCMContext),
@@ -213,5 +203,4 @@
     .capabilities   = CODEC_CAP_DELAY,
     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
                                                      AV_SAMPLE_FMT_NONE },
-    .long_name      = NULL_IF_CONFIG_SMALL("id RoQ DPCM"),
 };

libav-v9.6.tar.bz2/libavcodec/roqvideo.h -> libav-v10.1.tar.bz2/libavcodec/roqvideo.h Changed

libav-v9.6.tar.bz2/libavcodec/roqvideodec.c -> libav-v10.1.tar.bz2/libavcodec/roqvideodec.c Changed

@@ -31,6 +31,7 @@
 
 #include "avcodec.h"
 #include "bytestream.h"
+#include "internal.h"
 #include "roqvideo.h"
 
 static void roqvideo_decode_frame(RoqContext *ri)
@@ -168,8 +169,15 @@
 
 s->width = avctx->width;
 s->height = avctx->height;
- s->last_frame = &s->frames[0];
- s->current_frame = &s->frames[1];
+
+ s->last_frame = av_frame_alloc();
+ s->current_frame = av_frame_alloc();
+ if (!s->current_frame || !s->last_frame) {
+ av_frame_free(&s->current_frame);
+ av_frame_free(&s->last_frame);
+ return AVERROR(ENOMEM);
+ }
+
 avctx->pix_fmt = AV_PIX_FMT_YUV444P;
 
 return 0;
@@ -183,11 +191,11 @@
 int buf_size = avpkt->size;
 RoqContext *s = avctx->priv_data;
 int copy= !s->current_frame->data[0];
+ int ret;
 
- s->current_frame->reference = 3;
- if (avctx->reget_buffer(avctx, s->current_frame)) {
+ if ((ret = ff_reget_buffer(avctx, s->current_frame)) < 0) {
 av_log(avctx, AV_LOG_ERROR, " RoQ: get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 if(copy)
@@ -197,8 +205,9 @@
 bytestream2_init(&s->gb, buf, buf_size);
 roqvideo_decode_frame(s);
 
+ if ((ret = av_frame_ref(data, s->current_frame)) < 0)
+ return ret;
 *got_frame = 1;
- *(AVFrame*)data = *s->current_frame;
 
 /* shuffle frames */
 FFSWAP(AVFrame *, s->current_frame, s->last_frame);
@@ -210,17 +219,15 @@
 {
 RoqContext *s = avctx->priv_data;
 
- /* release the last frame */
- if (s->last_frame->data[0])
- avctx->release_buffer(avctx, s->last_frame);
- if (s->current_frame->data[0])
- avctx->release_buffer(avctx, s->current_frame);
+ av_frame_free(&s->current_frame);
+ av_frame_free(&s->last_frame);
 
 return 0;
 }
 
 AVCodec ff_roq_decoder = {
 .name = "roqvideo",
+ .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_ROQ,
 .priv_data_size = sizeof(RoqContext),
@@ -228,5 +235,4 @@
 .close = roq_decode_end,
 .decode = roq_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"),
 };

libav-v9.6.tar.bz2/libavcodec/roqvideoenc.c -> libav-v10.1.tar.bz2/libavcodec/roqvideoenc.c Changed

@@ -56,6 +56,7 @@
 
 #include <string.h>
 
+#include "libavutil/attributes.h"
 #include "roqvideo.h"
 #include "bytestream.h"
 #include "elbg.h"
@@ -936,7 +937,23 @@
 enc->framesSinceKeyframe++;
 }
 
-static int roq_encode_init(AVCodecContext *avctx)
+static av_cold int roq_encode_end(AVCodecContext *avctx)
+{
+ RoqContext *enc = avctx->priv_data;
+
+ av_frame_free(&enc->current_frame);
+ av_frame_free(&enc->last_frame);
+
+ av_free(enc->tmpData);
+ av_free(enc->this_motion4);
+ av_free(enc->last_motion4);
+ av_free(enc->this_motion8);
+ av_free(enc->last_motion8);
+
+ return 0;
+}
+
+static av_cold int roq_encode_init(AVCodecContext *avctx)
 {
 RoqContext *enc = avctx->priv_data;
 
@@ -957,8 +974,12 @@
 enc->framesSinceKeyframe = 0;
 enc->first_frame = 1;
 
- enc->last_frame = &enc->frames[0];
- enc->current_frame = &enc->frames[1];
+ enc->last_frame = av_frame_alloc();
+ enc->current_frame = av_frame_alloc();
+ if (!enc->last_frame || !enc->current_frame) {
+ roq_encode_end(avctx);
+ return AVERROR(ENOMEM);
+ }
 
 enc->tmpData = av_malloc(sizeof(RoqTempdata));
 
@@ -1033,8 +1054,8 @@
 if (enc->first_frame) {
 /* Alloc memory for the reconstruction data (we must know the stride
 for that) */
- if (ff_get_buffer(avctx, enc->current_frame) ||
- ff_get_buffer(avctx, enc->last_frame)) {
+ if (ff_get_buffer(avctx, enc->current_frame, 0) ||
+ ff_get_buffer(avctx, enc->last_frame, 0)) {
 av_log(avctx, AV_LOG_ERROR, " RoQ: get_buffer() failed\n");
 return -1;
 }
@@ -1056,24 +1077,9 @@
 return 0;
 }
 
-static int roq_encode_end(AVCodecContext *avctx)
-{
- RoqContext *enc = avctx->priv_data;
-
- avctx->release_buffer(avctx, enc->last_frame);
- avctx->release_buffer(avctx, enc->current_frame);
-
- av_free(enc->tmpData);
- av_free(enc->this_motion4);
- av_free(enc->last_motion4);
- av_free(enc->this_motion8);
- av_free(enc->last_motion8);
-
- return 0;
-}
-
 AVCodec ff_roq_encoder = {
 .name = "roqvideo",
+ .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_ROQ,
 .priv_data_size = sizeof(RoqContext),
@@ -1083,5 +1089,4 @@
 .supported_framerates = (const AVRational[]){ {30,1}, {0,0} },
 .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV444P,
 AV_PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"),
 };

libav-v9.6.tar.bz2/libavcodec/rpza.c -> libav-v10.1.tar.bz2/libavcodec/rpza.c Changed

@@ -34,22 +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() \
@@ -71,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 = 0;
@@ -90,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 */
@@ -126,6 +119,8 @@
 }
 }
 
+ n_blocks = FFMIN(n_blocks, total_blocks);
+
 switch (opcode & 0xe0) {
 
 /* Skip blocks */
@@ -137,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--) {
 block_ptr = row_ptr + pixel_ptr;
 for (pixel_y = 0; pixel_y < 4; pixel_y++) {
@@ -154,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;
@@ -184,14 +176,14 @@
 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--) {
 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++;
 }
@@ -203,16 +195,14 @@
 
 /* Fill block with 16 colors */
 case 0x00:
- if (s->size - stream_ptr < 16)
+ if (bytestream2_get_bytes_left(&s->gb) < 30)
 return;
 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++;
 }
@@ -225,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 */
 }
@@ -238,7 +228,9 @@
 s->avctx = avctx;
 avctx->pix_fmt = AV_PIX_FMT_RGB555;
 
- s->frame.data[0] = NULL;
+ s->frame = av_frame_alloc();
+ if (!s->frame)
+ return AVERROR(ENOMEM);
 
 return 0;
 }
@@ -247,41 +239,39 @@
 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);
 
- s->frame.reference = 1;
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, &s->frame)) {
+ if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 rpza_decode_stream(s);
 
+ if ((ret = av_frame_ref(data, s->frame)) < 0)
+ return ret;
+
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
 /* 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;
 
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ av_frame_free(&s->frame);
 
 return 0;
 }
 
 AVCodec ff_rpza_decoder = {
 .name = "rpza",
+ .long_name = NULL_IF_CONFIG_SMALL("QuickTime video (RPZA)"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_RPZA,
 .priv_data_size = sizeof(RpzaContext),
@@ -289,5 +279,4 @@
 .close = rpza_decode_end,
 .decode = rpza_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("QuickTime video (RPZA)"),
 };

libav-v9.6.tar.bz2/libavcodec/rtjpeg.c -> libav-v10.1.tar.bz2/libavcodec/rtjpeg.c Changed

@@ -20,7 +20,6 @@
 */
 #include "libavutil/common.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "rtjpeg.h"
 
 #define PUT_COEFF(c) \
@@ -44,7 +43,7 @@
 * aligned this could be done faster in a different way, e.g. as it is done
 * in MPlayer libmpcodecs/native/rtjpegn.c.
 */
-static inline int get_block(GetBitContext *gb, DCTELEM *block, const uint8_t *scan,
+static inline int get_block(GetBitContext *gb, int16_t *block, const uint8_t *scan,
 const uint32_t *quant) {
 int coeff, i, n;
 int8_t ac;
@@ -57,11 +56,11 @@
 // number of non-zero coefficients
 coeff = get_bits(gb, 6);
 if (get_bits_left(gb) < (coeff << 1))
- return -1;
+ return AVERROR_INVALIDDATA;
 
 // normally we would only need to clear the (63 - coeff) last values,
 // but since we do not know where they are we just clear the whole block
- memset(block, 0, 64 * sizeof(DCTELEM));
+ memset(block, 0, 64 * sizeof(int16_t));
 
 // 2 bits per coefficient
 while (coeff) {
@@ -74,7 +73,7 @@
 // 4 bits per coefficient
 ALIGN(4);
 if (get_bits_left(gb) < (coeff << 2))
- return -1;
+ return AVERROR_INVALIDDATA;
 while (coeff) {
 ac = get_sbits(gb, 4);
 if (ac == -8)
@@ -85,7 +84,7 @@
 // 8 bits per coefficient
 ALIGN(8);
 if (get_bits_left(gb) < (coeff << 3))
- return -1;
+ return AVERROR_INVALIDDATA;
 while (coeff) {
 ac = get_sbits(gb, 8);
 PUT_COEFF(ac);
@@ -108,10 +107,13 @@
 const uint8_t *buf, int buf_size) {
 GetBitContext gb;
 int w = c->w / 16, h = c->h / 16;
- int x, y;
+ int x, y, ret;
 uint8_t *y1 = f->data[0], *y2 = f->data[0] + 8 * f->linesize[0];
 uint8_t *u = f->data[1], *v = f->data[2];
- init_get_bits(&gb, buf, buf_size * 8);
+
+ if ((ret = init_get_bits8(&gb, buf, buf_size)) < 0)
+ return ret;
+
 for (y = 0; y < h; y++) {
 for (x = 0; x < w; x++) {
 #define BLOCK(quant, dst, stride) do { \
@@ -121,7 +123,7 @@
 if (res > 0) \
 c->dsp->idct_put(dst, stride, block); \
 } while (0)
- DCTELEM *block = c->block;
+ int16_t *block = c->block;
 BLOCK(c->lquant, y1, f->linesize[0]);
 y1 += 8;
 BLOCK(c->lquant, y1, f->linesize[0]);

libav-v9.6.tar.bz2/libavcodec/rtjpeg.h -> libav-v10.1.tar.bz2/libavcodec/rtjpeg.h Changed

libav-v9.6.tar.bz2/libavcodec/rv10.c -> libav-v10.1.tar.bz2/libavcodec/rv10.c Changed

@@ -27,13 +27,12 @@
 
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
-#include "dsputil.h"
+#include "error_resilience.h"
+#include "internal.h"
 #include "mpegvideo.h"
 #include "mpeg4video.h"
 #include "h263.h"
 
-//#define DEBUG
-
 #define RV_GET_MAJOR_VER(x) ((x) >> 28)
 #define RV_GET_MINOR_VER(x) (((x) >> 20) & 0xFF)
 #define RV_GET_MICRO_VER(x) (((x) >> 12) & 0xFF)
@@ -45,148 +44,144 @@
 int sub_id;
 } RVDecContext;
 
-static const uint16_t rv_lum_code[256] =
-{
- 0x3e7f, 0x0f00, 0x0f01, 0x0f02, 0x0f03, 0x0f04, 0x0f05, 0x0f06,
- 0x0f07, 0x0f08, 0x0f09, 0x0f0a, 0x0f0b, 0x0f0c, 0x0f0d, 0x0f0e,
- 0x0f0f, 0x0f10, 0x0f11, 0x0f12, 0x0f13, 0x0f14, 0x0f15, 0x0f16,
- 0x0f17, 0x0f18, 0x0f19, 0x0f1a, 0x0f1b, 0x0f1c, 0x0f1d, 0x0f1e,
- 0x0f1f, 0x0f20, 0x0f21, 0x0f22, 0x0f23, 0x0f24, 0x0f25, 0x0f26,
- 0x0f27, 0x0f28, 0x0f29, 0x0f2a, 0x0f2b, 0x0f2c, 0x0f2d, 0x0f2e,
- 0x0f2f, 0x0f30, 0x0f31, 0x0f32, 0x0f33, 0x0f34, 0x0f35, 0x0f36,
- 0x0f37, 0x0f38, 0x0f39, 0x0f3a, 0x0f3b, 0x0f3c, 0x0f3d, 0x0f3e,
- 0x0f3f, 0x0380, 0x0381, 0x0382, 0x0383, 0x0384, 0x0385, 0x0386,
- 0x0387, 0x0388, 0x0389, 0x038a, 0x038b, 0x038c, 0x038d, 0x038e,
- 0x038f, 0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396,
- 0x0397, 0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e,
- 0x039f, 0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6,
- 0x00c7, 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce,
- 0x00cf, 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056,
- 0x0057, 0x0020, 0x0021, 0x0022, 0x0023, 0x000c, 0x000d, 0x0004,
- 0x0000, 0x0005, 0x000e, 0x000f, 0x0024, 0x0025, 0x0026, 0x0027,
- 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
- 0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7,
- 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df,
- 0x03a0, 0x03a1, 0x03a2, 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7,
- 0x03a8, 0x03a9, 0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03ae, 0x03af,
- 0x03b0, 0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7,
- 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf,
- 0x0f40, 0x0f41, 0x0f42, 0x0f43, 0x0f44, 0x0f45, 0x0f46, 0x0f47,
- 0x0f48, 0x0f49, 0x0f4a, 0x0f4b, 0x0f4c, 0x0f4d, 0x0f4e, 0x0f4f,
- 0x0f50, 0x0f51, 0x0f52, 0x0f53, 0x0f54, 0x0f55, 0x0f56, 0x0f57,
- 0x0f58, 0x0f59, 0x0f5a, 0x0f5b, 0x0f5c, 0x0f5d, 0x0f5e, 0x0f5f,
- 0x0f60, 0x0f61, 0x0f62, 0x0f63, 0x0f64, 0x0f65, 0x0f66, 0x0f67,
- 0x0f68, 0x0f69, 0x0f6a, 0x0f6b, 0x0f6c, 0x0f6d, 0x0f6e, 0x0f6f,
- 0x0f70, 0x0f71, 0x0f72, 0x0f73, 0x0f74, 0x0f75, 0x0f76, 0x0f77,
- 0x0f78, 0x0f79, 0x0f7a, 0x0f7b, 0x0f7c, 0x0f7d, 0x0f7e, 0x0f7f,
+static const uint16_t rv_lum_code[256] = {
+ 0x3e7f, 0x0f00, 0x0f01, 0x0f02, 0x0f03, 0x0f04, 0x0f05, 0x0f06,
+ 0x0f07, 0x0f08, 0x0f09, 0x0f0a, 0x0f0b, 0x0f0c, 0x0f0d, 0x0f0e,
+ 0x0f0f, 0x0f10, 0x0f11, 0x0f12, 0x0f13, 0x0f14, 0x0f15, 0x0f16,
+ 0x0f17, 0x0f18, 0x0f19, 0x0f1a, 0x0f1b, 0x0f1c, 0x0f1d, 0x0f1e,
+ 0x0f1f, 0x0f20, 0x0f21, 0x0f22, 0x0f23, 0x0f24, 0x0f25, 0x0f26,
+ 0x0f27, 0x0f28, 0x0f29, 0x0f2a, 0x0f2b, 0x0f2c, 0x0f2d, 0x0f2e,
+ 0x0f2f, 0x0f30, 0x0f31, 0x0f32, 0x0f33, 0x0f34, 0x0f35, 0x0f36,
+ 0x0f37, 0x0f38, 0x0f39, 0x0f3a, 0x0f3b, 0x0f3c, 0x0f3d, 0x0f3e,
+ 0x0f3f, 0x0380, 0x0381, 0x0382, 0x0383, 0x0384, 0x0385, 0x0386,
+ 0x0387, 0x0388, 0x0389, 0x038a, 0x038b, 0x038c, 0x038d, 0x038e,
+ 0x038f, 0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396,
+ 0x0397, 0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e,
+ 0x039f, 0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6,
+ 0x00c7, 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce,
+ 0x00cf, 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056,
+ 0x0057, 0x0020, 0x0021, 0x0022, 0x0023, 0x000c, 0x000d, 0x0004,
+ 0x0000, 0x0005, 0x000e, 0x000f, 0x0024, 0x0025, 0x0026, 0x0027,
+ 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
+ 0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7,
+ 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df,
+ 0x03a0, 0x03a1, 0x03a2, 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7,
+ 0x03a8, 0x03a9, 0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03ae, 0x03af,
+ 0x03b0, 0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7,
+ 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf,
+ 0x0f40, 0x0f41, 0x0f42, 0x0f43, 0x0f44, 0x0f45, 0x0f46, 0x0f47,
+ 0x0f48, 0x0f49, 0x0f4a, 0x0f4b, 0x0f4c, 0x0f4d, 0x0f4e, 0x0f4f,
+ 0x0f50, 0x0f51, 0x0f52, 0x0f53, 0x0f54, 0x0f55, 0x0f56, 0x0f57,
+ 0x0f58, 0x0f59, 0x0f5a, 0x0f5b, 0x0f5c, 0x0f5d, 0x0f5e, 0x0f5f,
+ 0x0f60, 0x0f61, 0x0f62, 0x0f63, 0x0f64, 0x0f65, 0x0f66, 0x0f67,
+ 0x0f68, 0x0f69, 0x0f6a, 0x0f6b, 0x0f6c, 0x0f6d, 0x0f6e, 0x0f6f,
+ 0x0f70, 0x0f71, 0x0f72, 0x0f73, 0x0f74, 0x0f75, 0x0f76, 0x0f77,
+ 0x0f78, 0x0f79, 0x0f7a, 0x0f7b, 0x0f7c, 0x0f7d, 0x0f7e, 0x0f7f,
 };
 
-static const uint8_t rv_lum_bits[256] =
-{
- 14, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 7, 7, 7, 7, 7, 7, 7,
- 7, 6, 6, 6, 6, 5, 5, 4,
- 2, 4, 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,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
+static const uint8_t rv_lum_bits[256] = {
+ 14, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 10, 10, 10, 10, 10, 10, 10,
+ 10, 10, 10, 10, 10, 10, 10, 10,
+ 10, 10, 10, 10, 10, 10, 10, 10,
+ 10, 10, 10, 10, 10, 10, 10, 10,
+ 10, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 7, 7, 7, 7, 7, 7, 7,
+ 7, 6, 6, 6, 6, 5, 5, 4,
+ 2, 4, 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,
+ 10, 10, 10, 10, 10, 10, 10, 10,
+ 10, 10, 10, 10, 10, 10, 10, 10,
+ 10, 10, 10, 10, 10, 10, 10, 10,
+ 10, 10, 10, 10, 10, 10, 10, 10,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
 };
 
-static const uint16_t rv_chrom_code[256] =
-{
- 0xfe7f, 0x3f00, 0x3f01, 0x3f02, 0x3f03, 0x3f04, 0x3f05, 0x3f06,
- 0x3f07, 0x3f08, 0x3f09, 0x3f0a, 0x3f0b, 0x3f0c, 0x3f0d, 0x3f0e,
- 0x3f0f, 0x3f10, 0x3f11, 0x3f12, 0x3f13, 0x3f14, 0x3f15, 0x3f16,
- 0x3f17, 0x3f18, 0x3f19, 0x3f1a, 0x3f1b, 0x3f1c, 0x3f1d, 0x3f1e,
- 0x3f1f, 0x3f20, 0x3f21, 0x3f22, 0x3f23, 0x3f24, 0x3f25, 0x3f26,
- 0x3f27, 0x3f28, 0x3f29, 0x3f2a, 0x3f2b, 0x3f2c, 0x3f2d, 0x3f2e,
- 0x3f2f, 0x3f30, 0x3f31, 0x3f32, 0x3f33, 0x3f34, 0x3f35, 0x3f36,
- 0x3f37, 0x3f38, 0x3f39, 0x3f3a, 0x3f3b, 0x3f3c, 0x3f3d, 0x3f3e,
- 0x3f3f, 0x0f80, 0x0f81, 0x0f82, 0x0f83, 0x0f84, 0x0f85, 0x0f86,
- 0x0f87, 0x0f88, 0x0f89, 0x0f8a, 0x0f8b, 0x0f8c, 0x0f8d, 0x0f8e,
- 0x0f8f, 0x0f90, 0x0f91, 0x0f92, 0x0f93, 0x0f94, 0x0f95, 0x0f96,
- 0x0f97, 0x0f98, 0x0f99, 0x0f9a, 0x0f9b, 0x0f9c, 0x0f9d, 0x0f9e,
- 0x0f9f, 0x03c0, 0x03c1, 0x03c2, 0x03c3, 0x03c4, 0x03c5, 0x03c6,
- 0x03c7, 0x03c8, 0x03c9, 0x03ca, 0x03cb, 0x03cc, 0x03cd, 0x03ce,
- 0x03cf, 0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6,
- 0x00e7, 0x0030, 0x0031, 0x0032, 0x0033, 0x0008, 0x0009, 0x0002,
- 0x0000, 0x0003, 0x000a, 0x000b, 0x0034, 0x0035, 0x0036, 0x0037,
- 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
- 0x03d0, 0x03d1, 0x03d2, 0x03d3, 0x03d4, 0x03d5, 0x03d6, 0x03d7,
- 0x03d8, 0x03d9, 0x03da, 0x03db, 0x03dc, 0x03dd, 0x03de, 0x03df,
- 0x0fa0, 0x0fa1, 0x0fa2, 0x0fa3, 0x0fa4, 0x0fa5, 0x0fa6, 0x0fa7,
- 0x0fa8, 0x0fa9, 0x0faa, 0x0fab, 0x0fac, 0x0fad, 0x0fae, 0x0faf,
- 0x0fb0, 0x0fb1, 0x0fb2, 0x0fb3, 0x0fb4, 0x0fb5, 0x0fb6, 0x0fb7,
- 0x0fb8, 0x0fb9, 0x0fba, 0x0fbb, 0x0fbc, 0x0fbd, 0x0fbe, 0x0fbf,
- 0x3f40, 0x3f41, 0x3f42, 0x3f43, 0x3f44, 0x3f45, 0x3f46, 0x3f47,
- 0x3f48, 0x3f49, 0x3f4a, 0x3f4b, 0x3f4c, 0x3f4d, 0x3f4e, 0x3f4f,
- 0x3f50, 0x3f51, 0x3f52, 0x3f53, 0x3f54, 0x3f55, 0x3f56, 0x3f57,
- 0x3f58, 0x3f59, 0x3f5a, 0x3f5b, 0x3f5c, 0x3f5d, 0x3f5e, 0x3f5f,
- 0x3f60, 0x3f61, 0x3f62, 0x3f63, 0x3f64, 0x3f65, 0x3f66, 0x3f67,
- 0x3f68, 0x3f69, 0x3f6a, 0x3f6b, 0x3f6c, 0x3f6d, 0x3f6e, 0x3f6f,
- 0x3f70, 0x3f71, 0x3f72, 0x3f73, 0x3f74, 0x3f75, 0x3f76, 0x3f77,
- 0x3f78, 0x3f79, 0x3f7a, 0x3f7b, 0x3f7c, 0x3f7d, 0x3f7e, 0x3f7f,
+static const uint16_t rv_chrom_code[256] = {
+ 0xfe7f, 0x3f00, 0x3f01, 0x3f02, 0x3f03, 0x3f04, 0x3f05, 0x3f06,
+ 0x3f07, 0x3f08, 0x3f09, 0x3f0a, 0x3f0b, 0x3f0c, 0x3f0d, 0x3f0e,
+ 0x3f0f, 0x3f10, 0x3f11, 0x3f12, 0x3f13, 0x3f14, 0x3f15, 0x3f16,
+ 0x3f17, 0x3f18, 0x3f19, 0x3f1a, 0x3f1b, 0x3f1c, 0x3f1d, 0x3f1e,
+ 0x3f1f, 0x3f20, 0x3f21, 0x3f22, 0x3f23, 0x3f24, 0x3f25, 0x3f26,
+ 0x3f27, 0x3f28, 0x3f29, 0x3f2a, 0x3f2b, 0x3f2c, 0x3f2d, 0x3f2e,
+ 0x3f2f, 0x3f30, 0x3f31, 0x3f32, 0x3f33, 0x3f34, 0x3f35, 0x3f36,
+ 0x3f37, 0x3f38, 0x3f39, 0x3f3a, 0x3f3b, 0x3f3c, 0x3f3d, 0x3f3e,
+ 0x3f3f, 0x0f80, 0x0f81, 0x0f82, 0x0f83, 0x0f84, 0x0f85, 0x0f86,
+ 0x0f87, 0x0f88, 0x0f89, 0x0f8a, 0x0f8b, 0x0f8c, 0x0f8d, 0x0f8e,
+ 0x0f8f, 0x0f90, 0x0f91, 0x0f92, 0x0f93, 0x0f94, 0x0f95, 0x0f96,
+ 0x0f97, 0x0f98, 0x0f99, 0x0f9a, 0x0f9b, 0x0f9c, 0x0f9d, 0x0f9e,
+ 0x0f9f, 0x03c0, 0x03c1, 0x03c2, 0x03c3, 0x03c4, 0x03c5, 0x03c6,
+ 0x03c7, 0x03c8, 0x03c9, 0x03ca, 0x03cb, 0x03cc, 0x03cd, 0x03ce,
+ 0x03cf, 0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6,
+ 0x00e7, 0x0030, 0x0031, 0x0032, 0x0033, 0x0008, 0x0009, 0x0002,
+ 0x0000, 0x0003, 0x000a, 0x000b, 0x0034, 0x0035, 0x0036, 0x0037,
+ 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
+ 0x03d0, 0x03d1, 0x03d2, 0x03d3, 0x03d4, 0x03d5, 0x03d6, 0x03d7,
+ 0x03d8, 0x03d9, 0x03da, 0x03db, 0x03dc, 0x03dd, 0x03de, 0x03df,
+ 0x0fa0, 0x0fa1, 0x0fa2, 0x0fa3, 0x0fa4, 0x0fa5, 0x0fa6, 0x0fa7,
+ 0x0fa8, 0x0fa9, 0x0faa, 0x0fab, 0x0fac, 0x0fad, 0x0fae, 0x0faf,
+ 0x0fb0, 0x0fb1, 0x0fb2, 0x0fb3, 0x0fb4, 0x0fb5, 0x0fb6, 0x0fb7,
+ 0x0fb8, 0x0fb9, 0x0fba, 0x0fbb, 0x0fbc, 0x0fbd, 0x0fbe, 0x0fbf,
+ 0x3f40, 0x3f41, 0x3f42, 0x3f43, 0x3f44, 0x3f45, 0x3f46, 0x3f47,
+ 0x3f48, 0x3f49, 0x3f4a, 0x3f4b, 0x3f4c, 0x3f4d, 0x3f4e, 0x3f4f,
+ 0x3f50, 0x3f51, 0x3f52, 0x3f53, 0x3f54, 0x3f55, 0x3f56, 0x3f57,
+ 0x3f58, 0x3f59, 0x3f5a, 0x3f5b, 0x3f5c, 0x3f5d, 0x3f5e, 0x3f5f,
+ 0x3f60, 0x3f61, 0x3f62, 0x3f63, 0x3f64, 0x3f65, 0x3f66, 0x3f67,
+ 0x3f68, 0x3f69, 0x3f6a, 0x3f6b, 0x3f6c, 0x3f6d, 0x3f6e, 0x3f6f,
+ 0x3f70, 0x3f71, 0x3f72, 0x3f73, 0x3f74, 0x3f75, 0x3f76, 0x3f77,
+ 0x3f78, 0x3f79, 0x3f7a, 0x3f7b, 0x3f7c, 0x3f7d, 0x3f7e, 0x3f7f,
 };
 
-static const uint8_t rv_chrom_bits[256] =
-{
- 16, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 8, 8, 8, 8, 8, 8, 8,
- 8, 6, 6, 6, 6, 4, 4, 3,
- 2, 3, 4, 4, 6, 6, 6, 6,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 10, 10, 10,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12,
- 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14,
+static const uint8_t rv_chrom_bits[256] = {
+ 16, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 10, 10, 10, 10, 10, 10, 10,
+ 10, 10, 10, 10, 10, 10, 10, 10,
+ 10, 8, 8, 8, 8, 8, 8, 8,
+ 8, 6, 6, 6, 6, 4, 4, 3,
+ 2, 3, 4, 4, 6, 6, 6, 6,
+ 8, 8, 8, 8, 8, 8, 8, 8,
+ 10, 10, 10, 10, 10, 10, 10, 10,
+ 10, 10, 10, 10, 10, 10, 10, 10,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12,
+ 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14,
 };
 
 static VLC rv_dc_lum, rv_dc_chrom;
@@ -252,20 +247,23 @@
 s->pict_type = AV_PICTURE_TYPE_P;
 else
 s->pict_type = AV_PICTURE_TYPE_I;
- if(!marker) av_log(s->avctx, AV_LOG_ERROR, "marker missing\n");
+
+ if (!marker)
+ av_log(s->avctx, AV_LOG_ERROR, "marker missing\n");
+
 pb_frame = get_bits1(&s->gb);
 
 av_dlog(s->avctx, "pict_type=%d pb_frame=%d\n", s->pict_type, pb_frame);
 
- if (pb_frame){
- av_log(s->avctx, AV_LOG_ERROR, "pb frame not supported\n");
- return -1;
+ if (pb_frame) {
+ avpriv_request_sample(s->avctx, "pb frame");
+ return AVERROR_PATCHWELCOME;
 }
 
 s->qscale = get_bits(&s->gb, 5);
- if(s->qscale==0){
- av_log(s->avctx, AV_LOG_ERROR, "error, qscale:0\n");
- return -1;
+ if (s->qscale == 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid qscale value: 0\n");
+ return AVERROR_INVALIDDATA;
 }
 
 if (s->pict_type == AV_PICTURE_TYPE_I) {
@@ -281,14 +279,14 @@
 /* if multiple packets per frame are sent, the position at which
 to display the macroblocks is coded here */
 
- mb_xy= s->mb_x + s->mb_y*s->mb_width;
- if(show_bits(&s->gb, 12)==0 || (mb_xy && mb_xy < s->mb_num)){
- s->mb_x = get_bits(&s->gb, 6); /* mb_x */
- s->mb_y = get_bits(&s->gb, 6); /* mb_y */
+ mb_xy = s->mb_x + s->mb_y * s->mb_width;
+ if (show_bits(&s->gb, 12) == 0 || (mb_xy && mb_xy < s->mb_num)) {
+ s->mb_x = get_bits(&s->gb, 6); /* mb_x */
+ s->mb_y = get_bits(&s->gb, 6); /* mb_y */
 mb_count = get_bits(&s->gb, 12);
 } else {
- s->mb_x = 0;
- s->mb_y = 0;
+ s->mb_x = 0;
+ s->mb_y = 0;
 mb_count = s->mb_width * s->mb_height;
 }
 skip_bits(&s->gb, 3); /* ignored */
@@ -301,76 +299,79 @@
 static int rv20_decode_picture_header(RVDecContext *rv)
 {
 MpegEncContext *s = &rv->m;
- int seq, mb_pos, i;
+ int seq, mb_pos, i, ret;
 int rpr_bits;
 
- i= get_bits(&s->gb, 2);
- switch(i){
- case 0: s->pict_type= AV_PICTURE_TYPE_I; break;
- case 1: s->pict_type= AV_PICTURE_TYPE_I; break; //hmm ...
- case 2: s->pict_type= AV_PICTURE_TYPE_P; break;
- case 3: s->pict_type= AV_PICTURE_TYPE_B; break;
+ i = get_bits(&s->gb, 2);
+ switch (i) {
+ case 0: s->pict_type = AV_PICTURE_TYPE_I; break;
+ case 1: s->pict_type = AV_PICTURE_TYPE_I; break; //hmm ...
+ case 2: s->pict_type = AV_PICTURE_TYPE_P; break;
+ case 3: s->pict_type = AV_PICTURE_TYPE_B; break;
 default:
 av_log(s->avctx, AV_LOG_ERROR, "unknown frame type\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- if(s->last_picture_ptr==NULL && s->pict_type==AV_PICTURE_TYPE_B){
- av_log(s->avctx, AV_LOG_ERROR, "early B pix\n");
- return -1;
+ if (s->last_picture_ptr == NULL && s->pict_type == AV_PICTURE_TYPE_B) {
+ av_log(s->avctx, AV_LOG_ERROR, "early B-frame\n");
+ return AVERROR_INVALIDDATA;
 }
 
- if (get_bits1(&s->gb)){
+ if (get_bits1(&s->gb)) {
 av_log(s->avctx, AV_LOG_ERROR, "reserved bit set\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 s->qscale = get_bits(&s->gb, 5);
- if(s->qscale==0){
- av_log(s->avctx, AV_LOG_ERROR, "error, qscale:0\n");
- return -1;
+ if (s->qscale == 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid qscale value: 0\n");
+ return AVERROR_INVALIDDATA;
 }
 
- if(RV_GET_MINOR_VER(rv->sub_id) >= 2)
+ if (RV_GET_MINOR_VER(rv->sub_id) >= 2)
 s->loop_filter = get_bits1(&s->gb);
 
- if(RV_GET_MINOR_VER(rv->sub_id) <= 1)
+ if (RV_GET_MINOR_VER(rv->sub_id) <= 1)
 seq = get_bits(&s->gb, 8) << 7;
 else
 seq = get_bits(&s->gb, 13) << 2;
 
 rpr_bits = s->avctx->extradata[1] & 7;
- if(rpr_bits){
+ if (rpr_bits) {
 int f, new_w, new_h;
 rpr_bits = FFMIN((rpr_bits >> 1) + 1, 3);
 
 f = get_bits(&s->gb, rpr_bits);
 
- if(f){
+ if (f) {
 if (s->avctx->extradata_size < 8 + 2 * f) {
 av_log(s->avctx, AV_LOG_ERROR, "Extradata too small.\n");
 return AVERROR_INVALIDDATA;
 }
 
- new_w= 4*((uint8_t*)s->avctx->extradata)[6+2*f];
- new_h= 4*((uint8_t*)s->avctx->extradata)[7+2*f];
- }else{
- new_w= s->orig_width ;
- new_h= s->orig_height;
+ new_w = 4 * ((uint8_t*)s->avctx->extradata)[6 + 2 * f];
+ new_h = 4 * ((uint8_t*)s->avctx->extradata)[7 + 2 * f];
+ } else {
+ new_w = s->orig_width ;
+ new_h = s->orig_height;
 }
- if(new_w != s->width || new_h != s->height){
- av_log(s->avctx, AV_LOG_DEBUG, "attempting to change resolution to %dx%d\n", new_w, new_h);
- if (av_image_check_size(new_w, new_h, 0, s->avctx) < 0)
- return -1;
+ if (new_w != s->width || new_h != s->height) {
+ av_log(s->avctx, AV_LOG_DEBUG,
+ "attempting to change resolution to %dx%d\n", new_w, new_h);
 ff_MPV_common_end(s);
- 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 (ff_MPV_common_init(s) < 0)
- return -1;
+ if ((ret = ff_MPV_common_init(s)) < 0)
+ return ret;
 }
 
- if(s->avctx->debug & FF_DEBUG_PICT_INFO){
+ if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
 av_log(s->avctx, AV_LOG_DEBUG, "F %d/%d\n", f, rpr_bits);
 }
 } else if (av_image_check_size(s->width, s->height, 0, s->avctx) < 0)
@@ -378,42 +379,44 @@
 
 mb_pos = ff_h263_decode_mba(s);
 
- seq |= s->time &~0x7FFF;
- if(seq - s->time > 0x4000) seq -= 0x8000;
- if(seq - s->time < -0x4000) seq += 0x8000;
- if(seq != s->time){
- if(s->pict_type!=AV_PICTURE_TYPE_B){
- s->time= seq;
- s->pp_time= s->time - s->last_non_b_time;
- s->last_non_b_time= s->time;
- }else{
- s->time= seq;
- 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){
- av_log(s->avctx, AV_LOG_DEBUG, "messed up order, possible from seeking? skipping current b frame\n");
+ seq |= s->time & ~0x7FFF;
+ if (seq - s->time > 0x4000)
+ seq -= 0x8000;
+ if (seq - s->time < -0x4000)
+ seq += 0x8000;
+
+ if (seq != s->time) {
+ if (s->pict_type != AV_PICTURE_TYPE_B) {
+ s->time = seq;
+ s->pp_time = s->time - s->last_non_b_time;
+ s->last_non_b_time = s->time;
+ } else {
+ s->time = seq;
+ 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) {
+ av_log(s->avctx, AV_LOG_DEBUG, "messed up order, possible "
+ "from seeking? skipping current b frame\n");
 return FRAME_SKIPPED;
 }
 ff_mpeg4_init_direct_mv(s);
 }
 }
 
- s->no_rounding= get_bits1(&s->gb);
+ s->no_rounding = get_bits1(&s->gb);
 
- if(RV_GET_MINOR_VER(rv->sub_id) <= 1 && s->pict_type == AV_PICTURE_TYPE_B)
+ if (RV_GET_MINOR_VER(rv->sub_id) <= 1 && s->pict_type == AV_PICTURE_TYPE_B)
 skip_bits(&s->gb, 5); // binary decoder reads 3+2 bits here but they don't seem to be used
 
- s->f_code = 1;
+ s->f_code = 1;
 s->unrestricted_mv = 1;
- s->h263_aic= s->pict_type == AV_PICTURE_TYPE_I;
-// s->alt_inter_vlc=1;
-// s->obmc=1;
-// s->umvplus=1;
- s->modified_quant=1;
- s->loop_filter=1;
-
- if(s->avctx->debug & FF_DEBUG_PICT_INFO){
- av_log(s->avctx, AV_LOG_INFO, "num:%5d x:%2d y:%2d type:%d qscale:%2d rnd:%d\n",
- seq, s->mb_x, s->mb_y, s->pict_type, s->qscale, s->no_rounding);
+ s->h263_aic = s->pict_type == AV_PICTURE_TYPE_I;
+ s->modified_quant = 1;
+ s->loop_filter = 1;
+
+ if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
+ av_log(s->avctx, AV_LOG_INFO, "num:%5d x:%2d y:%2d type:%d qscale:%2d rnd:%d\n",
+ seq, s->mb_x, s->mb_y, s->pict_type, s->qscale, s->no_rounding);
 }
 
 assert(s->pict_type != AV_PICTURE_TYPE_B || !s->low_delay);
@@ -425,26 +428,28 @@
 {
 RVDecContext *rv = avctx->priv_data;
 MpegEncContext *s = &rv->m;
- static int done=0;
- int major_ver, minor_ver, micro_ver;
+ static int done = 0;
+ int major_ver, minor_ver, micro_ver, ret;
 
 if (avctx->extradata_size < 8) {
 av_log(avctx, AV_LOG_ERROR, "Extradata is too small.\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
+ if ((ret = av_image_check_size(avctx->coded_width,
+ avctx->coded_height, 0, avctx)) < 0)
+ return ret;
 
 ff_MPV_decode_defaults(s);
 
- s->avctx= avctx;
+ s->avctx = avctx;
 s->out_format = FMT_H263;
- s->codec_id= avctx->codec_id;
- avctx->flags |= CODEC_FLAG_EMU_EDGE;
+ s->codec_id = avctx->codec_id;
 
- s->orig_width = s->width = avctx->coded_width;
- s->orig_height= s->height = avctx->coded_height;
+ s->orig_width = s->width = avctx->coded_width;
+ s->orig_height = s->height = avctx->coded_height;
 
- s->h263_long_vectors= ((uint8_t*)avctx->extradata)[3] & 1;
- rv->sub_id = AV_RB32((uint8_t*)avctx->extradata + 4);
+ s->h263_long_vectors = ((uint8_t*)avctx->extradata)[3] & 1;
+ rv->sub_id = AV_RB32((uint8_t*)avctx->extradata + 4);
 
 major_ver = RV_GET_MAJOR_VER(rv->sub_id);
 minor_ver = RV_GET_MINOR_VER(rv->sub_id);
@@ -454,39 +459,41 @@
 switch (major_ver) {
 case 1:
 s->rv10_version = micro_ver ? 3 : 1;
- s->obmc = micro_ver == 2;
+ s->obmc = micro_ver == 2;
 break;
 case 2:
 if (minor_ver >= 2) {
- s->low_delay = 0;
+ s->low_delay = 0;
 s->avctx->has_b_frames = 1;
 }
 break;
 default:
 av_log(s->avctx, AV_LOG_ERROR, "unknown header %X\n", rv->sub_id);
- av_log_missing_feature(avctx, "RV1/2 version", 1);
+ avpriv_request_sample(avctx, "RV1/2 version");
 return AVERROR_PATCHWELCOME;
 }
 
- if(avctx->debug & FF_DEBUG_PICT_INFO){
- av_log(avctx, AV_LOG_DEBUG, "ver:%X ver0:%X\n", rv->sub_id, avctx->extradata_size >= 4 ? ((uint32_t*)avctx->extradata)[0] : -1);
+ if (avctx->debug & FF_DEBUG_PICT_INFO) {
+ av_log(avctx, AV_LOG_DEBUG, "ver:%X ver0:%X\n", rv->sub_id,
+ avctx->extradata_size >= 4 ? ((uint32_t*)avctx->extradata)[0] : -1);
 }
 
 avctx->pix_fmt = AV_PIX_FMT_YUV420P;
 
- if (ff_MPV_common_init(s) < 0)
- return -1;
+ if ((ret = ff_MPV_common_init(s)) < 0)
+ return ret;
 
- ff_h263_decode_init_vlc(s);
+ ff_h263dsp_init(&s->h263dsp);
+ ff_h263_decode_init_vlc();
 
 /* init rv vlc */
 if (!done) {
 INIT_VLC_STATIC(&rv_dc_lum, DC_VLC_BITS, 256,
- rv_lum_bits, 1, 1,
- rv_lum_code, 2, 2, 16384);
+ rv_lum_bits, 1, 1,
+ rv_lum_code, 2, 2, 16384);
 INIT_VLC_STATIC(&rv_dc_chrom, DC_VLC_BITS, 256,
- rv_chrom_bits, 1, 1,
- rv_chrom_code, 2, 2, 16388);
+ rv_chrom_bits, 1, 1,
+ rv_chrom_code, 2, 2, 16388);
 done = 1;
 }
 
@@ -502,95 +509,94 @@
 }
 
 static int rv10_decode_packet(AVCodecContext *avctx,
- const uint8_t *buf, int buf_size, int buf_size2)
+ const uint8_t *buf, int buf_size, int buf_size2)
 {
 RVDecContext *rv = avctx->priv_data;
 MpegEncContext *s = &rv->m;
- int mb_count, mb_pos, left, start_mb_x, active_bits_size;
+ int mb_count, mb_pos, left, start_mb_x, active_bits_size, ret;
 
 active_bits_size = buf_size * 8;
 init_get_bits(&s->gb, buf, FFMAX(buf_size, buf_size2) * 8);
- if(s->codec_id ==AV_CODEC_ID_RV10)
+ if (s->codec_id == AV_CODEC_ID_RV10)
 mb_count = rv10_decode_picture_header(s);
 else
 mb_count = rv20_decode_picture_header(rv);
 if (mb_count < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "HEADER ERROR\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 if (s->mb_x >= s->mb_width ||
 s->mb_y >= s->mb_height) {
 av_log(s->avctx, AV_LOG_ERROR, "POS ERROR %d %d\n", s->mb_x, s->mb_y);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 mb_pos = s->mb_y * s->mb_width + s->mb_x;
 left = s->mb_width * s->mb_height - mb_pos;
 if (mb_count > left) {
 av_log(s->avctx, AV_LOG_ERROR, "COUNT ERROR\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- if ((s->mb_x == 0 && s->mb_y == 0) || s->current_picture_ptr==NULL) {
- if(s->current_picture_ptr){ //FIXME write parser so we always have complete frames?
- ff_er_frame_end(s);
+ if ((s->mb_x == 0 && s->mb_y == 0) || s->current_picture_ptr == NULL) {
+ if (s->current_picture_ptr) { // FIXME write parser so we always have complete frames?
+ ff_er_frame_end(&s->er);
 ff_MPV_frame_end(s);
- s->mb_x= s->mb_y = s->resync_mb_x = s->resync_mb_y= 0;
+ s->mb_x = s->mb_y = s->resync_mb_x = s->resync_mb_y = 0;
 }
- if(ff_MPV_frame_start(s, avctx) < 0)
- return -1;
- ff_er_frame_start(s);
+ if ((ret = ff_MPV_frame_start(s, avctx)) < 0)
+ return ret;
+ ff_mpeg_er_frame_start(s);
 } else {
 if (s->current_picture_ptr->f.pict_type != s->pict_type) {
 av_log(s->avctx, AV_LOG_ERROR, "Slice type mismatch\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 
 av_dlog(avctx, "qscale=%d\n", s->qscale);
 
 /* default quantization values */
- if(s->codec_id== AV_CODEC_ID_RV10){
- if(s->mb_y==0) s->first_slice_line=1;
- }else{
- s->first_slice_line=1;
- s->resync_mb_x= s->mb_x;
+ if (s->codec_id == AV_CODEC_ID_RV10) {
+ if (s->mb_y == 0)
+ s->first_slice_line = 1;
+ } else {
+ s->first_slice_line = 1;
+ s->resync_mb_x = s->mb_x;
 }
- start_mb_x= s->mb_x;
- s->resync_mb_y= s->mb_y;
- if(s->h263_aic){
- s->y_dc_scale_table=
- s->c_dc_scale_table= ff_aic_dc_scale_table;
- }else{
- s->y_dc_scale_table=
- s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
+ start_mb_x = s->mb_x;
+ s->resync_mb_y = s->mb_y;
+ if (s->h263_aic) {
+ s->y_dc_scale_table = s->c_dc_scale_table = ff_aic_dc_scale_table;
+ } else {
+ s->y_dc_scale_table = s->c_dc_scale_table = ff_mpeg1_dc_scale_table;
 }
 
- if(s->modified_quant)
- s->chroma_qscale_table= ff_h263_chroma_qscale_table;
+ if (s->modified_quant)
+ s->chroma_qscale_table = ff_h263_chroma_qscale_table;
 
 ff_set_qscale(s, s->qscale);
 
 s->rv10_first_dc_coded[0] = 0;
 s->rv10_first_dc_coded[1] = 0;
 s->rv10_first_dc_coded[2] = 0;
- s->block_wrap[0]=
- s->block_wrap[1]=
- s->block_wrap[2]=
- s->block_wrap[3]= s->b8_stride;
- s->block_wrap[4]=
- s->block_wrap[5]= s->mb_stride;
+ s->block_wrap[0] =
+ s->block_wrap[1] =
+ s->block_wrap[2] =
+ s->block_wrap[3] = s->b8_stride;
+ s->block_wrap[4] =
+ s->block_wrap[5] = s->mb_stride;
 ff_init_block_index(s);
- /* decode each macroblock */
 
- for(s->mb_num_left= mb_count; s->mb_num_left>0; s->mb_num_left--) {
+ /* decode each macroblock */
+ for (s->mb_num_left = mb_count; s->mb_num_left > 0; s->mb_num_left--) {
 int ret;
 ff_update_block_index(s);
 av_dlog(avctx, "**mb x=%d y=%d\n", s->mb_x, s->mb_y);
 
- s->mv_dir = MV_DIR_FORWARD;
+ s->mv_dir = MV_DIR_FORWARD;
 s->mv_type = MV_TYPE_16X16;
- ret=ff_h263_decode_mb(s, s->block);
+ ret = ff_h263_decode_mb(s, s->block);
 
 // Repeat the slice end check from ff_h263_decode_mb with our active
 // bitstream size
@@ -608,17 +614,17 @@
 active_bits_size = buf_size2 * 8;
 av_log(avctx, AV_LOG_DEBUG, "update size from %d to %d\n",
 8 * buf_size, active_bits_size);
- ret= SLICE_OK;
+ ret = SLICE_OK;
 }
 
 if (ret == SLICE_ERROR || active_bits_size < get_bits_count(&s->gb)) {
 av_log(s->avctx, AV_LOG_ERROR, "ERROR at MB %d %d\n", s->mb_x, s->mb_y);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- if(s->pict_type != AV_PICTURE_TYPE_B)
+ if (s->pict_type != AV_PICTURE_TYPE_B)
 ff_h263_update_motion_val(s);
 ff_MPV_decode_mb(s, s->block);
- if(s->loop_filter)
+ if (s->loop_filter)
 ff_h263_loop_filter(s);
 
 if (++s->mb_x == s->mb_width) {
@@ -626,20 +632,24 @@
 s->mb_y++;
 ff_init_block_index(s);
 }
- if(s->mb_x == s->resync_mb_x)
- s->first_slice_line=0;
- if(ret == SLICE_END) break;
+ if (s->mb_x == s->resync_mb_x)
+ s->first_slice_line = 0;
+ if (ret == SLICE_END)
+ break;
 }
 
- ff_er_add_slice(s, start_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, ER_MB_END);
+ ff_er_add_slice(&s->er, start_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y,
+ ER_MB_END);
 
 return active_bits_size;
 }
 
 static int get_slice_offset(AVCodecContext *avctx, const uint8_t *buf, int n)
 {
- if(avctx->slice_count) return avctx->slice_offset[n];
- else return AV_RL32(buf + n*8);
+ if (avctx->slice_count)
+ return avctx->slice_offset[n];
+ else
+ return AV_RL32(buf + n * 8);
 }
 
 static int rv10_decode_frame(AVCodecContext *avctx,
@@ -647,10 +657,10 @@
 AVPacket *avpkt)
 {
 const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- MpegEncContext *s = avctx->priv_data;
- int i;
- AVFrame *pict = data;
+ int buf_size = avpkt->size;
+ MpegEncContext *s = avctx->priv_data;
+ AVFrame *pict = data;
+ int i, ret;
 int slice_count;
 const uint8_t *slices_hdr = NULL;
 
@@ -661,57 +671,69 @@
 return 0;
 }
 
- if(!avctx->slice_count){
+ if (!avctx->slice_count) {
 slice_count = (*buf++) + 1;
 buf_size--;
- slices_hdr = buf + 4;
- buf += 8 * slice_count;
- buf_size -= 8 * slice_count;
- if (buf_size <= 0)
+
+ if (!slice_count || buf_size <= 8 * slice_count) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid slice count: %d.\n", slice_count);
 return AVERROR_INVALIDDATA;
- }else
+ }
+
+ slices_hdr = buf + 4;
+ buf += 8 * slice_count;
+ buf_size -= 8 * slice_count;
+ } else
 slice_count = avctx->slice_count;
 
- for(i=0; i<slice_count; i++){
+ for (i = 0; i < slice_count; i++) {
 unsigned offset = get_slice_offset(avctx, slices_hdr, i);
 int size, size2;
 
 if (offset >= buf_size)
 return AVERROR_INVALIDDATA;
 
- if(i+1 == slice_count)
- size= buf_size - offset;
+ if (i + 1 == slice_count)
+ size = buf_size - offset;
 else
- size= get_slice_offset(avctx, slices_hdr, i+1) - offset;
+ size = get_slice_offset(avctx, slices_hdr, i + 1) - offset;
 
- if(i+2 >= slice_count)
- size2= buf_size - offset;
+ if (i + 2 >= slice_count)
+ size2 = buf_size - offset;
 else
- size2= get_slice_offset(avctx, slices_hdr, i+2) - offset;
+ size2 = get_slice_offset(avctx, slices_hdr, i + 2) - offset;
 
 if (size <= 0 || size2 <= 0 ||
 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++;
 }
 
- if(s->current_picture_ptr != NULL && s->mb_y>=s->mb_height){
- ff_er_frame_end(s);
+ if (s->current_picture_ptr != NULL && s->mb_y >= s->mb_height) {
+ ff_er_frame_end(&s->er);
 ff_MPV_frame_end(s);
 
 if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) {
- *pict = s->current_picture_ptr->f;
+ if ((ret = av_frame_ref(pict, &s->current_picture_ptr->f)) < 0)
+ return ret;
+ ff_print_debug_info(s, s->current_picture_ptr);
 } else if (s->last_picture_ptr != NULL) {
- *pict = s->last_picture_ptr->f;
+ if ((ret = av_frame_ref(pict, &s->last_picture_ptr->f)) < 0)
+ return ret;
+ ff_print_debug_info(s, s->last_picture_ptr);
 }
 
- if(s->last_picture_ptr || s->low_delay){
+ if (s->last_picture_ptr || s->low_delay) {
 *got_frame = 1;
- ff_print_debug_info(s, pict);
 }
- s->current_picture_ptr= NULL; // so we can detect if frame_end was not called (find some nicer solution...)
+
+ // so we can detect if frame_end was not called (find some nicer solution...)
+ s->current_picture_ptr = NULL;
 }
 
 return avpkt->size;
@@ -719,6 +741,7 @@
 
 AVCodec ff_rv10_decoder = {
 .name = "rv10",
+ .long_name = NULL_IF_CONFIG_SMALL("RealVideo 1.0"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_RV10,
 .priv_data_size = sizeof(RVDecContext),
@@ -726,12 +749,12 @@
 .close = rv10_decode_end,
 .decode = rv10_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("RealVideo 1.0"),
 .pix_fmts = ff_pixfmt_list_420,
 };
 
 AVCodec ff_rv20_decoder = {
 .name = "rv20",
+ .long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_RV20,
 .priv_data_size = sizeof(RVDecContext),
@@ -740,6 +763,5 @@
 .decode = rv10_decode_frame,
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
 .flush = ff_mpeg_flush,
- .long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"),
 .pix_fmts = ff_pixfmt_list_420,
 };

libav-v9.6.tar.bz2/libavcodec/rv10enc.c -> libav-v10.1.tar.bz2/libavcodec/rv10enc.c Changed

libav-v9.6.tar.bz2/libavcodec/rv20enc.c -> libav-v10.1.tar.bz2/libavcodec/rv20enc.c Changed

libav-v9.6.tar.bz2/libavcodec/rv30.c -> libav-v10.1.tar.bz2/libavcodec/rv30.c Changed

@@ -25,7 +25,6 @@
 */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "golomb.h"
 
@@ -35,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;
@@ -52,6 +52,13 @@
 si->pts = get_bits(gb, 13);
 rpr = get_bits(gb, r->rpr);
 if(rpr){
+ 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;
 }
@@ -120,7 +127,7 @@
 static inline void rv30_weak_loop_filter(uint8_t *src, const int step,
 const int stride, const int lim)
 {
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
 int i, diff;
 
 for(i = 0; i < 4; i++){
@@ -142,7 +149,7 @@
 
 mb_pos = row * s->mb_stride;
 for(mb_x = 0; mb_x < s->mb_width; mb_x++, mb_pos++){
- int mbtype = s->current_picture_ptr->f.mb_type[mb_pos];
+ int mbtype = s->current_picture_ptr->mb_type[mb_pos];
 if(IS_INTRA(mbtype) || IS_SEPARATE_DC(mbtype))
 r->deblock_coefs[mb_pos] = 0xFFFF;
 if(IS_INTRA(mbtype))
@@ -154,9 +161,9 @@
 */
 mb_pos = row * s->mb_stride;
 for(mb_x = 0; mb_x < s->mb_width; mb_x++, mb_pos++){
- cur_lim = rv30_loop_filt_lim[s->current_picture_ptr->f.qscale_table[mb_pos]];
+ cur_lim = rv30_loop_filt_lim[s->current_picture_ptr->qscale_table[mb_pos]];
 if(mb_x)
- left_lim = rv30_loop_filt_lim[s->current_picture_ptr->f.qscale_table[mb_pos - 1]];
+ left_lim = rv30_loop_filt_lim[s->current_picture_ptr->qscale_table[mb_pos - 1]];
 for(j = 0; j < 16; j += 4){
 Y = s->current_picture_ptr->f.data[0] + mb_x*16 + (row*16 + j) * s->linesize + 4 * !mb_x;
 for(i = !mb_x; i < 4; i++, Y += 4){
@@ -196,9 +203,9 @@
 }
 mb_pos = row * s->mb_stride;
 for(mb_x = 0; mb_x < s->mb_width; mb_x++, mb_pos++){
- cur_lim = rv30_loop_filt_lim[s->current_picture_ptr->f.qscale_table[mb_pos]];
+ cur_lim = rv30_loop_filt_lim[s->current_picture_ptr->qscale_table[mb_pos]];
 if(row)
- top_lim = rv30_loop_filt_lim[s->current_picture_ptr->f.qscale_table[mb_pos - s->mb_stride]];
+ top_lim = rv30_loop_filt_lim[s->current_picture_ptr->qscale_table[mb_pos - s->mb_stride]];
 for(j = 4*!row; j < 16; j += 4){
 Y = s->current_picture_ptr->f.data[0] + mb_x*16 + (row*16 + j) * s->linesize;
 for(i = 0; i < 4; i++, Y += 4){
@@ -244,20 +251,18 @@
 static av_cold int rv30_decode_init(AVCodecContext *avctx)
 {
 RV34DecContext *r = avctx->priv_data;
+ int ret;
 
 r->rv30 = 1;
- ff_rv34_decode_init(avctx);
+ if ((ret = ff_rv34_decode_init(avctx)) < 0)
+ return ret;
 if(avctx->extradata_size < 2){
 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);
- return AVERROR(EINVAL);
- }
+
 r->parse_slice_header = rv30_parse_slice_header;
 r->decode_intra_types = rv30_decode_intra_types;
 r->decode_mb_info = rv30_decode_mb_info;
@@ -269,6 +274,7 @@
 
 AVCodec ff_rv30_decoder = {
 .name = "rv30",
+ .long_name = NULL_IF_CONFIG_SMALL("RealVideo 3.0"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_RV30,
 .priv_data_size = sizeof(RV34DecContext),
@@ -278,7 +284,6 @@
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY |
 CODEC_CAP_FRAME_THREADS,
 .flush = ff_mpeg_flush,
- .long_name = NULL_IF_CONFIG_SMALL("RealVideo 3.0"),
 .pix_fmts = ff_pixfmt_list_420,
 .init_thread_copy = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_init_thread_copy),
 .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_update_thread_context),

libav-v9.6.tar.bz2/libavcodec/rv30dsp.c -> libav-v10.1.tar.bz2/libavcodec/rv30dsp.c Changed

@@ -25,13 +25,14 @@
 */
 
 #include "avcodec.h"
-#include "dsputil.h"
+#include "h264chroma.h"
+#include "h264qpel.h"
 #include "rv34dsp.h"
 
 #define RV30_LOWPASS(OPNAME, OP) \
 static av_unused void OPNAME ## rv30_tpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, const int C1, const int C2){\
 const int h = 8;\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
 int i;\
 for(i = 0; i < h; i++)\
 {\
@@ -50,7 +51,7 @@
 \
 static void OPNAME ## rv30_tpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, const int C1, const int C2){\
 const int w = 8;\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
 int i;\
 for(i = 0; i < w; i++)\
 {\
@@ -81,7 +82,7 @@
 static void OPNAME ## rv30_tpel8_hv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
 const int w = 8;\
 const int h = 8;\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
 int i, j;\
 for(j = 0; j < h; j++){\
 for(i = 0; i < w; i++){\
@@ -100,7 +101,7 @@
 static void OPNAME ## rv30_tpel8_hhv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
 const int w = 8;\
 const int h = 8;\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
 int i, j;\
 for(j = 0; j < h; j++){\
 for(i = 0; i < w; i++){\
@@ -119,7 +120,7 @@
 static void OPNAME ## rv30_tpel8_hvv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
 const int w = 8;\
 const int h = 8;\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
 int i, j;\
 for(j = 0; j < h; j++){\
 for(i = 0; i < w; i++){\
@@ -138,7 +139,7 @@
 static void OPNAME ## rv30_tpel8_hhvv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
 const int w = 8;\
 const int h = 8;\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
 int i, j;\
 for(j = 0; j < h; j++){\
 for(i = 0; i < w; i++){\
@@ -209,35 +210,43 @@
 \
 
 #define RV30_MC(OPNAME, SIZE) \
-static void OPNAME ## rv30_tpel ## SIZE ## _mc10_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv30_tpel ## SIZE ## _mc10_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## rv30_tpel ## SIZE ## _h_lowpass(dst, src, stride, stride, 12, 6);\
 }\
 \
-static void OPNAME ## rv30_tpel ## SIZE ## _mc20_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv30_tpel ## SIZE ## _mc20_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## rv30_tpel ## SIZE ## _h_lowpass(dst, src, stride, stride, 6, 12);\
 }\
 \
-static void OPNAME ## rv30_tpel ## SIZE ## _mc01_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv30_tpel ## SIZE ## _mc01_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## rv30_tpel ## SIZE ## _v_lowpass(dst, src, stride, stride, 12, 6);\
 }\
 \
-static void OPNAME ## rv30_tpel ## SIZE ## _mc02_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv30_tpel ## SIZE ## _mc02_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## rv30_tpel ## SIZE ## _v_lowpass(dst, src, stride, stride, 6, 12);\
 }\
 \
-static void OPNAME ## rv30_tpel ## SIZE ## _mc11_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv30_tpel ## SIZE ## _mc11_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## rv30_tpel ## SIZE ## _hv_lowpass(dst, src, stride, stride);\
 }\
 \
-static void OPNAME ## rv30_tpel ## SIZE ## _mc12_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv30_tpel ## SIZE ## _mc12_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## rv30_tpel ## SIZE ## _hvv_lowpass(dst, src, stride, stride);\
 }\
 \
-static void OPNAME ## rv30_tpel ## SIZE ## _mc21_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv30_tpel ## SIZE ## _mc21_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## rv30_tpel ## SIZE ## _hhv_lowpass(dst, src, stride, stride);\
 }\
 \
-static void OPNAME ## rv30_tpel ## SIZE ## _mc22_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv30_tpel ## SIZE ## _mc22_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## rv30_tpel ## SIZE ## _hhvv_lowpass(dst, src, stride, stride);\
 }\
 \
@@ -252,11 +261,16 @@
 RV30_MC(avg_, 8)
 RV30_MC(avg_, 16)
 
-av_cold void ff_rv30dsp_init(RV34DSPContext *c, DSPContext* dsp) {
+av_cold void ff_rv30dsp_init(RV34DSPContext *c)
+{
+ H264ChromaContext h264chroma;
+ H264QpelContext qpel;
 
- ff_rv34dsp_init(c, dsp);
+ ff_rv34dsp_init(c);
+ ff_h264chroma_init(&h264chroma, 8);
+ ff_h264qpel_init(&qpel, 8);
 
- c->put_pixels_tab[0][ 0] = dsp->put_h264_qpel_pixels_tab[0][0];
+ c->put_pixels_tab[0][ 0] = qpel.put_h264_qpel_pixels_tab[0][0];
 c->put_pixels_tab[0][ 1] = put_rv30_tpel16_mc10_c;
 c->put_pixels_tab[0][ 2] = put_rv30_tpel16_mc20_c;
 c->put_pixels_tab[0][ 4] = put_rv30_tpel16_mc01_c;
@@ -265,7 +279,7 @@
 c->put_pixels_tab[0][ 8] = put_rv30_tpel16_mc02_c;
 c->put_pixels_tab[0][ 9] = put_rv30_tpel16_mc12_c;
 c->put_pixels_tab[0][10] = put_rv30_tpel16_mc22_c;
- c->avg_pixels_tab[0][ 0] = dsp->avg_h264_qpel_pixels_tab[0][0];
+ c->avg_pixels_tab[0][ 0] = qpel.avg_h264_qpel_pixels_tab[0][0];
 c->avg_pixels_tab[0][ 1] = avg_rv30_tpel16_mc10_c;
 c->avg_pixels_tab[0][ 2] = avg_rv30_tpel16_mc20_c;
 c->avg_pixels_tab[0][ 4] = avg_rv30_tpel16_mc01_c;
@@ -274,7 +288,7 @@
 c->avg_pixels_tab[0][ 8] = avg_rv30_tpel16_mc02_c;
 c->avg_pixels_tab[0][ 9] = avg_rv30_tpel16_mc12_c;
 c->avg_pixels_tab[0][10] = avg_rv30_tpel16_mc22_c;
- c->put_pixels_tab[1][ 0] = dsp->put_h264_qpel_pixels_tab[1][0];
+ c->put_pixels_tab[1][ 0] = qpel.put_h264_qpel_pixels_tab[1][0];
 c->put_pixels_tab[1][ 1] = put_rv30_tpel8_mc10_c;
 c->put_pixels_tab[1][ 2] = put_rv30_tpel8_mc20_c;
 c->put_pixels_tab[1][ 4] = put_rv30_tpel8_mc01_c;
@@ -283,7 +297,7 @@
 c->put_pixels_tab[1][ 8] = put_rv30_tpel8_mc02_c;
 c->put_pixels_tab[1][ 9] = put_rv30_tpel8_mc12_c;
 c->put_pixels_tab[1][10] = put_rv30_tpel8_mc22_c;
- c->avg_pixels_tab[1][ 0] = dsp->avg_h264_qpel_pixels_tab[1][0];
+ c->avg_pixels_tab[1][ 0] = qpel.avg_h264_qpel_pixels_tab[1][0];
 c->avg_pixels_tab[1][ 1] = avg_rv30_tpel8_mc10_c;
 c->avg_pixels_tab[1][ 2] = avg_rv30_tpel8_mc20_c;
 c->avg_pixels_tab[1][ 4] = avg_rv30_tpel8_mc01_c;
@@ -293,8 +307,8 @@
 c->avg_pixels_tab[1][ 9] = avg_rv30_tpel8_mc12_c;
 c->avg_pixels_tab[1][10] = avg_rv30_tpel8_mc22_c;
 
- c->put_chroma_pixels_tab[0] = dsp->put_h264_chroma_pixels_tab[0];
- c->put_chroma_pixels_tab[1] = dsp->put_h264_chroma_pixels_tab[1];
- c->avg_chroma_pixels_tab[0] = dsp->avg_h264_chroma_pixels_tab[0];
- c->avg_chroma_pixels_tab[1] = dsp->avg_h264_chroma_pixels_tab[1];
+ c->put_chroma_pixels_tab[0] = h264chroma.put_h264_chroma_pixels_tab[0];
+ c->put_chroma_pixels_tab[1] = h264chroma.put_h264_chroma_pixels_tab[1];
+ c->avg_chroma_pixels_tab[0] = h264chroma.avg_h264_chroma_pixels_tab[0];
+ c->avg_chroma_pixels_tab[1] = h264chroma.avg_h264_chroma_pixels_tab[1];
 }

libav-v9.6.tar.bz2/libavcodec/rv34.c -> libav-v10.1.tar.bz2/libavcodec/rv34.c Changed

@@ -27,7 +27,7 @@
 #include "libavutil/internal.h"
 
 #include "avcodec.h"
-#include "dsputil.h"
+#include "error_resilience.h"
 #include "mpegvideo.h"
 #include "golomb.h"
 #include "internal.h"
@@ -39,8 +39,6 @@
 #include "rv34data.h"
 #include "rv34.h"
 
-//#define DEBUG
-
 static inline void ZERO8x2(void* dst, int stride)
 {
 fill_rectangle(dst, 1, 2, stride, 0, 4);
@@ -216,7 +214,7 @@
 /**
 * Get one coefficient value from the bistream and store it.
 */
-static inline void decode_coeff(DCTELEM *dst, int coef, int esc, GetBitContext *gb, VLC* vlc, int q)
+static inline void decode_coeff(int16_t *dst, int coef, int esc, GetBitContext *gb, VLC* vlc, int q)
 {
 if(coef){
 if(coef == esc){
@@ -236,7 +234,7 @@
 /**
 * Decode 2x2 subblock of coefficients.
 */
-static inline void decode_subblock(DCTELEM *dst, int code, const int is_block2, GetBitContext *gb, VLC *vlc, int q)
+static inline void decode_subblock(int16_t *dst, int code, const int is_block2, GetBitContext *gb, VLC *vlc, int q)
 {
 int flags = modulo_three_table[code];
 
@@ -254,13 +252,13 @@
 /**
 * Decode a single coefficient.
 */
-static inline void decode_subblock1(DCTELEM *dst, int code, GetBitContext *gb, VLC *vlc, int q)
+static inline void decode_subblock1(int16_t *dst, int code, GetBitContext *gb, VLC *vlc, int q)
 {
 int coeff = modulo_three_table[code] >> 6;
 decode_coeff(dst, coeff, 3, gb, vlc, q);
 }
 
-static inline void decode_subblock3(DCTELEM *dst, int code, GetBitContext *gb, VLC *vlc,
+static inline void decode_subblock3(int16_t *dst, int code, GetBitContext *gb, VLC *vlc,
 int q_dc, int q_ac1, int q_ac2)
 {
 int flags = modulo_three_table[code];
@@ -282,7 +280,7 @@
 * o--o
 */
 
-static int rv34_decode_block(DCTELEM *dst, GetBitContext *gb, RV34VLC *rvlc, int fc, int sc, int q_dc, int q_ac1, int q_ac2)
+static int rv34_decode_block(int16_t *dst, GetBitContext *gb, RV34VLC *rvlc, int fc, int sc, int q_dc, int q_ac1, int q_ac2)
 {
 int code, pattern, has_ac = 1;
 
@@ -357,7 +355,7 @@
 
 r->is16 = get_bits1(gb);
 if(r->is16){
- s->current_picture_ptr->f.mb_type[mb_pos] = MB_TYPE_INTRA16x16;
+ s->current_picture_ptr->mb_type[mb_pos] = MB_TYPE_INTRA16x16;
 r->block_type = RV34_MB_TYPE_INTRA16x16;
 t = get_bits(gb, 2);
 fill_rectangle(intra_types, 4, 4, r->intra_types_stride, t, sizeof(intra_types[0]));
@@ -367,7 +365,7 @@
 if(!get_bits1(gb))
 av_log(s->avctx, AV_LOG_ERROR, "Need DQUANT\n");
 }
- s->current_picture_ptr->f.mb_type[mb_pos] = MB_TYPE_INTRA;
+ s->current_picture_ptr->mb_type[mb_pos] = MB_TYPE_INTRA;
 r->block_type = RV34_MB_TYPE_INTRA;
 if(r->decode_intra_types(r, gb, intra_types) < 0)
 return -1;
@@ -393,7 +391,7 @@
 r->block_type = r->decode_mb_info(r);
 if(r->block_type == -1)
 return -1;
- s->current_picture_ptr->f.mb_type[mb_pos] = rv34_mb_type_to_lavc[r->block_type];
+ s->current_picture_ptr->mb_type[mb_pos] = rv34_mb_type_to_lavc[r->block_type];
 r->mb_type[mb_pos] = r->block_type;
 if(r->block_type == RV34_MB_SKIP){
 if(s->pict_type == AV_PICTURE_TYPE_P)
@@ -401,7 +399,7 @@
 if(s->pict_type == AV_PICTURE_TYPE_B)
 r->mb_type[mb_pos] = RV34_MB_B_DIRECT;
 }
- r->is16 = !!IS_INTRA16x16(s->current_picture_ptr->f.mb_type[mb_pos]);
+ r->is16 = !!IS_INTRA16x16(s->current_picture_ptr->mb_type[mb_pos]);
 rv34_decode_mv(r, r->block_type);
 if(r->block_type == RV34_MB_SKIP){
 fill_rectangle(intra_types, 4, 4, r->intra_types_stride, 0, sizeof(intra_types[0]));
@@ -410,7 +408,7 @@
 r->chroma_vlc = 1;
 r->luma_vlc = 0;
 
- if(IS_INTRA(s->current_picture_ptr->f.mb_type[mb_pos])){
+ if(IS_INTRA(s->current_picture_ptr->mb_type[mb_pos])){
 if(r->is16){
 t = get_bits(gb, 2);
 fill_rectangle(intra_types, 4, 4, r->intra_types_stride, t, sizeof(intra_types[0]));
@@ -475,27 +473,27 @@
 c_off = -1;
 
 if(avail[-1]){
- A[0] = s->current_picture_ptr->f.motion_val[0][mv_pos-1][0];
- A[1] = s->current_picture_ptr->f.motion_val[0][mv_pos-1][1];
+ A[0] = s->current_picture_ptr->motion_val[0][mv_pos-1][0];
+ A[1] = s->current_picture_ptr->motion_val[0][mv_pos-1][1];
 }
 if(avail[-4]){
- B[0] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride][0];
- B[1] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride][1];
+ B[0] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride][0];
+ B[1] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride][1];
 }else{
 B[0] = A[0];
 B[1] = A[1];
 }
 if(!avail[c_off-4]){
 if(avail[-4] && (avail[-1] || r->rv30)){
- C[0] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride-1][0];
- C[1] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride-1][1];
+ C[0] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride-1][0];
+ C[1] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride-1][1];
 }else{
 C[0] = A[0];
 C[1] = A[1];
 }
 }else{
- C[0] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride+c_off][0];
- C[1] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride+c_off][1];
+ C[0] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride+c_off][0];
+ C[1] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride+c_off][1];
 }
 mx = mid_pred(A[0], B[0], C[0]);
 my = mid_pred(A[1], B[1], C[1]);
@@ -503,8 +501,8 @@
 my += r->dmv[dmv_no][1];
 for(j = 0; j < part_sizes_h[block_type]; j++){
 for(i = 0; i < part_sizes_w[block_type]; i++){
- s->current_picture_ptr->f.motion_val[0][mv_pos + i + j*s->b8_stride][0] = mx;
- s->current_picture_ptr->f.motion_val[0][mv_pos + i + j*s->b8_stride][1] = my;
+ s->current_picture_ptr->motion_val[0][mv_pos + i + j*s->b8_stride][0] = mx;
+ s->current_picture_ptr->motion_val[0][mv_pos + i + j*s->b8_stride][1] = my;
 }
 }
 }
@@ -555,25 +553,25 @@
 int i, j;
 Picture *cur_pic = s->current_picture_ptr;
 const int mask = dir ? MB_TYPE_L1 : MB_TYPE_L0;
- int type = cur_pic->f.mb_type[mb_pos];
+ int type = cur_pic->mb_type[mb_pos];
 
 if((r->avail_cache[6-1] & type) & mask){
- A[0] = cur_pic->f.motion_val[dir][mv_pos - 1][0];
- A[1] = cur_pic->f.motion_val[dir][mv_pos - 1][1];
+ A[0] = cur_pic->motion_val[dir][mv_pos - 1][0];
+ A[1] = cur_pic->motion_val[dir][mv_pos - 1][1];
 has_A = 1;
 }
 if((r->avail_cache[6-4] & type) & mask){
- B[0] = cur_pic->f.motion_val[dir][mv_pos - s->b8_stride][0];
- B[1] = cur_pic->f.motion_val[dir][mv_pos - s->b8_stride][1];
+ B[0] = cur_pic->motion_val[dir][mv_pos - s->b8_stride][0];
+ B[1] = cur_pic->motion_val[dir][mv_pos - s->b8_stride][1];
 has_B = 1;
 }
 if(r->avail_cache[6-4] && (r->avail_cache[6-2] & type) & mask){
- C[0] = cur_pic->f.motion_val[dir][mv_pos - s->b8_stride + 2][0];
- C[1] = cur_pic->f.motion_val[dir][mv_pos - s->b8_stride + 2][1];
+ C[0] = cur_pic->motion_val[dir][mv_pos - s->b8_stride + 2][0];
+ C[1] = cur_pic->motion_val[dir][mv_pos - s->b8_stride + 2][1];
 has_C = 1;
 }else if((s->mb_x+1) == s->mb_width && (r->avail_cache[6-5] & type) & mask){
- C[0] = cur_pic->f.motion_val[dir][mv_pos - s->b8_stride - 1][0];
- C[1] = cur_pic->f.motion_val[dir][mv_pos - s->b8_stride - 1][1];
+ C[0] = cur_pic->motion_val[dir][mv_pos - s->b8_stride - 1][0];
+ C[1] = cur_pic->motion_val[dir][mv_pos - s->b8_stride - 1][1];
 has_C = 1;
 }
 
@@ -584,12 +582,12 @@
 
 for(j = 0; j < 2; j++){
 for(i = 0; i < 2; i++){
- cur_pic->f.motion_val[dir][mv_pos + i + j*s->b8_stride][0] = mx;
- cur_pic->f.motion_val[dir][mv_pos + i + j*s->b8_stride][1] = my;
+ cur_pic->motion_val[dir][mv_pos + i + j*s->b8_stride][0] = mx;
+ cur_pic->motion_val[dir][mv_pos + i + j*s->b8_stride][1] = my;
 }
 }
 if(block_type == RV34_MB_B_BACKWARD || block_type == RV34_MB_B_FORWARD){
- ZERO8x2(cur_pic->f.motion_val[!dir][mv_pos], s->b8_stride);
+ ZERO8x2(cur_pic->motion_val[!dir][mv_pos], s->b8_stride);
 }
 }
 
@@ -606,27 +604,27 @@
 int* avail = r->avail_cache + avail_indexes[0];
 
 if(avail[-1]){
- A[0] = s->current_picture_ptr->f.motion_val[0][mv_pos - 1][0];
- A[1] = s->current_picture_ptr->f.motion_val[0][mv_pos - 1][1];
+ A[0] = s->current_picture_ptr->motion_val[0][mv_pos - 1][0];
+ A[1] = s->current_picture_ptr->motion_val[0][mv_pos - 1][1];
 }
 if(avail[-4]){
- B[0] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride][0];
- B[1] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride][1];
+ B[0] = s->current_picture_ptr->motion_val[0][mv_pos - s->b8_stride][0];
+ B[1] = s->current_picture_ptr->motion_val[0][mv_pos - s->b8_stride][1];
 }else{
 B[0] = A[0];
 B[1] = A[1];
 }
 if(!avail[-4 + 2]){
 if(avail[-4] && (avail[-1])){
- C[0] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride - 1][0];
- C[1] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride - 1][1];
+ C[0] = s->current_picture_ptr->motion_val[0][mv_pos - s->b8_stride - 1][0];
+ C[1] = s->current_picture_ptr->motion_val[0][mv_pos - s->b8_stride - 1][1];
 }else{
 C[0] = A[0];
 C[1] = A[1];
 }
 }else{
- C[0] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride + 2][0];
- C[1] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride + 2][1];
+ C[0] = s->current_picture_ptr->motion_val[0][mv_pos - s->b8_stride + 2][0];
+ C[1] = s->current_picture_ptr->motion_val[0][mv_pos - s->b8_stride + 2][1];
 }
 mx = mid_pred(A[0], B[0], C[0]);
 my = mid_pred(A[1], B[1], C[1]);
@@ -635,8 +633,8 @@
 for(j = 0; j < 2; j++){
 for(i = 0; i < 2; i++){
 for(k = 0; k < 2; k++){
- s->current_picture_ptr->f.motion_val[k][mv_pos + i + j*s->b8_stride][0] = mx;
- s->current_picture_ptr->f.motion_val[k][mv_pos + i + j*s->b8_stride][1] = my;
+ s->current_picture_ptr->motion_val[k][mv_pos + i + j*s->b8_stride][0] = mx;
+ s->current_picture_ptr->motion_val[k][mv_pos + i + j*s->b8_stride][1] = my;
 }
 }
 }
@@ -674,24 +672,24 @@
 
 if(thirdpel){
 int chroma_mx, chroma_my;
- mx = (s->current_picture_ptr->f.motion_val[dir][mv_pos][0] + (3 << 24)) / 3 - (1 << 24);
- my = (s->current_picture_ptr->f.motion_val[dir][mv_pos][1] + (3 << 24)) / 3 - (1 << 24);
- lx = (s->current_picture_ptr->f.motion_val[dir][mv_pos][0] + (3 << 24)) % 3;
- ly = (s->current_picture_ptr->f.motion_val[dir][mv_pos][1] + (3 << 24)) % 3;
- chroma_mx = s->current_picture_ptr->f.motion_val[dir][mv_pos][0] / 2;
- chroma_my = s->current_picture_ptr->f.motion_val[dir][mv_pos][1] / 2;
+ mx = (s->current_picture_ptr->motion_val[dir][mv_pos][0] + (3 << 24)) / 3 - (1 << 24);
+ my = (s->current_picture_ptr->motion_val[dir][mv_pos][1] + (3 << 24)) / 3 - (1 << 24);
+ lx = (s->current_picture_ptr->motion_val[dir][mv_pos][0] + (3 << 24)) % 3;
+ ly = (s->current_picture_ptr->motion_val[dir][mv_pos][1] + (3 << 24)) % 3;
+ chroma_mx = s->current_picture_ptr->motion_val[dir][mv_pos][0] / 2;
+ chroma_my = s->current_picture_ptr->motion_val[dir][mv_pos][1] / 2;
 umx = (chroma_mx + (3 << 24)) / 3 - (1 << 24);
 umy = (chroma_my + (3 << 24)) / 3 - (1 << 24);
 uvmx = chroma_coeffs[(chroma_mx + (3 << 24)) % 3];
 uvmy = chroma_coeffs[(chroma_my + (3 << 24)) % 3];
 }else{
 int cx, cy;
- mx = s->current_picture_ptr->f.motion_val[dir][mv_pos][0] >> 2;
- my = s->current_picture_ptr->f.motion_val[dir][mv_pos][1] >> 2;
- lx = s->current_picture_ptr->f.motion_val[dir][mv_pos][0] & 3;
- ly = s->current_picture_ptr->f.motion_val[dir][mv_pos][1] & 3;
- cx = s->current_picture_ptr->f.motion_val[dir][mv_pos][0] / 2;
- cy = s->current_picture_ptr->f.motion_val[dir][mv_pos][1] / 2;
+ mx = s->current_picture_ptr->motion_val[dir][mv_pos][0] >> 2;
+ my = s->current_picture_ptr->motion_val[dir][mv_pos][1] >> 2;
+ lx = s->current_picture_ptr->motion_val[dir][mv_pos][0] & 3;
+ ly = s->current_picture_ptr->motion_val[dir][mv_pos][1] & 3;
+ cx = s->current_picture_ptr->motion_val[dir][mv_pos][0] / 2;
+ cy = s->current_picture_ptr->motion_val[dir][mv_pos][1] / 2;
 umx = cx >> 2;
 umy = cy >> 2;
 uvmx = (cx & 3) << 1;
@@ -704,7 +702,7 @@
 if (HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME)) {
 /* wait for the referenced mb row to be finished */
 int mb_row = s->mb_y + ((yoff + my + 5 + 8 * height) >> 4);
- AVFrame *f = dir ? &s->next_picture_ptr->f : &s->last_picture_ptr->f;
+ ThreadFrame *f = dir ? &s->next_picture_ptr->tf : &s->last_picture_ptr->tf;
 ff_thread_await_progress(f, mb_row, 0);
 }
 
@@ -725,12 +723,18 @@
 uint8_t *uvbuf = s->edge_emu_buffer + 22 * s->linesize;
 
 srcY -= 2 + 2*s->linesize;
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, (width<<3)+6, (height<<3)+6,
+ 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 , srcU, s->uvlinesize, (width<<2)+1, (height<<2)+1,
+ 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, srcV, s->uvlinesize, (width<<2)+1, (height<<2)+1,
+ 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;
@@ -853,11 +857,11 @@
 switch(block_type){
 case RV34_MB_TYPE_INTRA:
 case RV34_MB_TYPE_INTRA16x16:
- ZERO8x2(s->current_picture_ptr->f.motion_val[0][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], s->b8_stride);
+ ZERO8x2(s->current_picture_ptr->motion_val[0][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], s->b8_stride);
 return 0;
 case RV34_MB_SKIP:
 if(s->pict_type == AV_PICTURE_TYPE_P){
- ZERO8x2(s->current_picture_ptr->f.motion_val[0][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], s->b8_stride);
+ ZERO8x2(s->current_picture_ptr->motion_val[0][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], s->b8_stride);
 rv34_mc_1mv (r, block_type, 0, 0, 0, 2, 2, 0);
 break;
 }
@@ -865,23 +869,23 @@
 //surprisingly, it uses motion scheme from next reference frame
 /* wait for the current mb row to be finished */
 if (HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME))
- ff_thread_await_progress(&s->next_picture_ptr->f, FFMAX(0, s->mb_y-1), 0);
+ ff_thread_await_progress(&s->next_picture_ptr->tf, FFMAX(0, s->mb_y-1), 0);
 
- next_bt = s->next_picture_ptr->f.mb_type[s->mb_x + s->mb_y * s->mb_stride];
+ next_bt = s->next_picture_ptr->mb_type[s->mb_x + s->mb_y * s->mb_stride];
 if(IS_INTRA(next_bt) || IS_SKIP(next_bt)){
- ZERO8x2(s->current_picture_ptr->f.motion_val[0][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], s->b8_stride);
- ZERO8x2(s->current_picture_ptr->f.motion_val[1][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], s->b8_stride);
+ ZERO8x2(s->current_picture_ptr->motion_val[0][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], s->b8_stride);
+ ZERO8x2(s->current_picture_ptr->motion_val[1][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], s->b8_stride);
 }else
 for(j = 0; j < 2; j++)
 for(i = 0; i < 2; i++)
 for(k = 0; k < 2; k++)
 for(l = 0; l < 2; l++)
- s->current_picture_ptr->f.motion_val[l][mv_pos + i + j*s->b8_stride][k] = calc_add_mv(r, l, s->next_picture_ptr->f.motion_val[0][mv_pos + i + j*s->b8_stride][k]);
+ s->current_picture_ptr->motion_val[l][mv_pos + i + j*s->b8_stride][k] = calc_add_mv(r, l, s->next_picture_ptr->motion_val[0][mv_pos + i + j*s->b8_stride][k]);
 if(!(IS_16X8(next_bt) || IS_8X16(next_bt) || IS_8X8(next_bt))) //we can use whole macroblock MC
 rv34_mc_2mv(r, block_type);
 else
 rv34_mc_2mv_skip(r);
- ZERO8x2(s->current_picture_ptr->f.motion_val[0][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], s->b8_stride);
+ ZERO8x2(s->current_picture_ptr->motion_val[0][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], s->b8_stride);
 break;
 case RV34_MB_P_16x16:
 case RV34_MB_P_MIX16x16:
@@ -994,7 +998,7 @@
 int fc, int sc, int q_dc, int q_ac)
 {
 MpegEncContext *s = &r->s;
- DCTELEM *ptr = s->block[0];
+ int16_t *ptr = s->block[0];
 int has_ac = rv34_decode_block(ptr, &s->gb, r->cur_vlcs,
 fc, sc, q_dc, q_ac, q_ac);
 if(has_ac){
@@ -1007,13 +1011,13 @@
 
 static void rv34_output_i16x16(RV34DecContext *r, int8_t *intra_types, int cbp)
 {
- LOCAL_ALIGNED_16(DCTELEM, block16, [16]);
+ LOCAL_ALIGNED_16(int16_t, block16, [16]);
 MpegEncContext *s = &r->s;
 GetBitContext *gb = &s->gb;
 int q_dc = rv34_qscale_tab[ r->luma_dc_quant_i[s->qscale] ],
 q_ac = rv34_qscale_tab[s->qscale];
 uint8_t *dst = s->dest[0];
- DCTELEM *ptr = s->block[0];
+ int16_t *ptr = s->block[0];
 int i, j, itype, has_ac;
 
 memset(block16, 0, 16 * sizeof(*block16));
@@ -1149,7 +1153,7 @@
 MpegEncContext *s = &r->s;
 int hmvmask = 0, vmvmask = 0, i, j;
 int midx = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride;
- int16_t (*motion_val)[2] = &s->current_picture_ptr->f.motion_val[0][midx];
+ int16_t (*motion_val)[2] = &s->current_picture_ptr->motion_val[0][midx];
 for(j = 0; j < 16; j += 8){
 for(i = 0; i < 2; i++){
 if(is_mv_diff_gt_3(motion_val + i, 1))
@@ -1179,7 +1183,7 @@
 MpegEncContext *s = &r->s;
 GetBitContext *gb = &s->gb;
 uint8_t *dst = s->dest[0];
- DCTELEM *ptr = s->block[0];
+ int16_t *ptr = s->block[0];
 int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
 int cbp, cbp2;
 int q_dc, q_ac, has_ac;
@@ -1192,26 +1196,26 @@
 dist = (s->mb_x - s->resync_mb_x) + (s->mb_y - s->resync_mb_y) * s->mb_width;
 if(s->mb_x && dist)
 r->avail_cache[5] =
- r->avail_cache[9] = s->current_picture_ptr->f.mb_type[mb_pos - 1];
+ r->avail_cache[9] = s->current_picture_ptr->mb_type[mb_pos - 1];
 if(dist >= s->mb_width)
 r->avail_cache[2] =
- r->avail_cache[3] = s->current_picture_ptr->f.mb_type[mb_pos - s->mb_stride];
+ r->avail_cache[3] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride];
 if(((s->mb_x+1) < s->mb_width) && dist >= s->mb_width - 1)
- r->avail_cache[4] = s->current_picture_ptr->f.mb_type[mb_pos - s->mb_stride + 1];
+ r->avail_cache[4] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride + 1];
 if(s->mb_x && dist > s->mb_width)
- r->avail_cache[1] = s->current_picture_ptr->f.mb_type[mb_pos - s->mb_stride - 1];
+ r->avail_cache[1] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride - 1];
 
 s->qscale = r->si.quant;
 cbp = cbp2 = rv34_decode_inter_mb_header(r, intra_types);
 r->cbp_luma [mb_pos] = cbp;
 r->cbp_chroma[mb_pos] = cbp >> 16;
 r->deblock_coefs[mb_pos] = rv34_set_deblock_coef(r) | r->cbp_luma[mb_pos];
- s->current_picture_ptr->f.qscale_table[mb_pos] = s->qscale;
+ s->current_picture_ptr->qscale_table[mb_pos] = s->qscale;
 
 if(cbp == -1)
 return -1;
 
- if (IS_INTRA(s->current_picture_ptr->f.mb_type[mb_pos])){
+ if (IS_INTRA(s->current_picture_ptr->mb_type[mb_pos])){
 if(r->is16) rv34_output_i16x16(r, intra_types, cbp);
 else rv34_output_intra(r, intra_types, cbp);
 return 0;
@@ -1219,7 +1223,7 @@
 
 if(r->is16){
 // Only for RV34_MB_P_MIX16x16
- LOCAL_ALIGNED_16(DCTELEM, block16, [16]);
+ LOCAL_ALIGNED_16(int16_t, block16, [16]);
 memset(block16, 0, 16 * sizeof(*block16));
 q_dc = rv34_qscale_tab[ r->luma_dc_quant_p[s->qscale] ];
 q_ac = rv34_qscale_tab[s->qscale];
@@ -1294,21 +1298,21 @@
 dist = (s->mb_x - s->resync_mb_x) + (s->mb_y - s->resync_mb_y) * s->mb_width;
 if(s->mb_x && dist)
 r->avail_cache[5] =
- r->avail_cache[9] = s->current_picture_ptr->f.mb_type[mb_pos - 1];
+ r->avail_cache[9] = s->current_picture_ptr->mb_type[mb_pos - 1];
 if(dist >= s->mb_width)
 r->avail_cache[2] =
- r->avail_cache[3] = s->current_picture_ptr->f.mb_type[mb_pos - s->mb_stride];
+ r->avail_cache[3] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride];
 if(((s->mb_x+1) < s->mb_width) && dist >= s->mb_width - 1)
- r->avail_cache[4] = s->current_picture_ptr->f.mb_type[mb_pos - s->mb_stride + 1];
+ r->avail_cache[4] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride + 1];
 if(s->mb_x && dist > s->mb_width)
- r->avail_cache[1] = s->current_picture_ptr->f.mb_type[mb_pos - s->mb_stride - 1];
+ r->avail_cache[1] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride - 1];
 
 s->qscale = r->si.quant;
 cbp = rv34_decode_intra_mb_header(r, intra_types);
 r->cbp_luma [mb_pos] = cbp;
 r->cbp_chroma[mb_pos] = cbp >> 16;
 r->deblock_coefs[mb_pos] = 0xFFFF;
- s->current_picture_ptr->f.qscale_table[mb_pos] = s->qscale;
+ s->current_picture_ptr->qscale_table[mb_pos] = s->qscale;
 
 if(cbp == -1)
 return -1;
@@ -1429,7 +1433,7 @@
 else
 res = rv34_decode_intra_macroblock(r, r->intra_types + s->mb_x * 4 + 4);
 if(res < 0){
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, ER_MB_ERROR);
+ ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, ER_MB_ERROR);
 return -1;
 }
 if (++s->mb_x == s->mb_width) {
@@ -1444,7 +1448,7 @@
 r->loop_filter(r, s->mb_y - 2);
 
 if (HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME))
- ff_thread_report_progress(&s->current_picture_ptr->f,
+ ff_thread_report_progress(&s->current_picture_ptr->tf,
 s->mb_y - 2, 0);
 
 }
@@ -1452,7 +1456,7 @@
 s->first_slice_line=0;
 s->mb_num_left--;
 }
- ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, ER_MB_END);
+ ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, ER_MB_END);
 
 return s->mb_y == s->mb_height;
 }
@@ -1477,8 +1481,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;
@@ -1490,19 +1492,23 @@
 
 #if CONFIG_RV30_DECODER
 if (avctx->codec_id == AV_CODEC_ID_RV30)
- ff_rv30dsp_init(&r->rdsp, &r->s.dsp);
+ ff_rv30dsp_init(&r->rdsp);
 #endif
 #if CONFIG_RV40_DECODER
 if (avctx->codec_id == AV_CODEC_ID_RV40)
- ff_rv40dsp_init(&r->rdsp, &r->s.dsp);
+ ff_rv40dsp_init(&r->rdsp);
 #endif
 
- if ((ret = rv34_decoder_alloc(r)) < 0)
+ if ((ret = rv34_decoder_alloc(r)) < 0) {
+ ff_MPV_common_end(&r->s);
 return ret;
+ }
 
 if(!intra_vlcs[0].cbppattern[0].bits)
 rv34_init_tables();
 
+ avctx->internal->allocate_progress = 1;
+
 return 0;
 }
 
@@ -1517,9 +1523,12 @@
 r->tmp_b_block_base = NULL;
 if ((err = ff_MPV_common_init(&r->s)) < 0)
 return err;
- if ((err = rv34_decoder_alloc(r)) < 0)
+ if ((err = rv34_decoder_alloc(r)) < 0) {
+ ff_MPV_common_end(&r->s);
 return err;
+ }
 }
+
 return 0;
 }
 
@@ -1563,24 +1572,26 @@
 {
 RV34DecContext *r = avctx->priv_data;
 MpegEncContext *s = &r->s;
- int got_picture = 0;
+ int got_picture = 0, ret;
 
- ff_er_frame_end(s);
+ ff_er_frame_end(&s->er);
 ff_MPV_frame_end(s);
 s->mb_num_left = 0;
 
 if (HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME))
- ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX, 0);
+ ff_thread_report_progress(&s->current_picture_ptr->tf, INT_MAX, 0);
 
 if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) {
- *pict = s->current_picture_ptr->f;
+ if ((ret = av_frame_ref(pict, &s->current_picture_ptr->f)) < 0)
+ return ret;
+ ff_print_debug_info(s, s->current_picture_ptr);
 got_picture = 1;
 } else if (s->last_picture_ptr != NULL) {
- *pict = s->last_picture_ptr->f;
+ if ((ret = av_frame_ref(pict, &s->last_picture_ptr->f)) < 0)
+ return ret;
+ ff_print_debug_info(s, s->last_picture_ptr);
 got_picture = 1;
 }
- if (got_picture)
- ff_print_debug_info(s, pict);
 
 return got_picture;
 }
@@ -1595,7 +1606,7 @@
 MpegEncContext *s = &r->s;
 AVFrame *pict = data;
 SliceInfo si;
- int i;
+ int i, ret;
 int slice_count;
 const uint8_t *slices_hdr = NULL;
 int last = 0;
@@ -1604,7 +1615,8 @@
 if (buf_size == 0) {
 /* special case for last picture */
 if (s->low_delay==0 && s->next_picture_ptr) {
- *pict = s->next_picture_ptr->f;
+ if ((ret = av_frame_ref(pict, &s->next_picture_ptr->f)) < 0)
+ return ret;
 s->next_picture_ptr = NULL;
 
 *got_picture_ptr = 1;
@@ -1647,7 +1659,7 @@
 if (s->mb_num_left > 0) {
 av_log(avctx, AV_LOG_ERROR, "New frame but still %d MB left.",
 s->mb_num_left);
- ff_er_frame_end(s);
+ ff_er_frame_end(&s->er);
 ff_MPV_frame_end(s);
 }
 
@@ -1659,7 +1671,11 @@
 
 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)
@@ -1668,7 +1684,7 @@
 s->pict_type = si.type ? si.type : AV_PICTURE_TYPE_I;
 if (ff_MPV_frame_start(s, s->avctx) < 0)
 return -1;
- ff_er_frame_start(s);
+ ff_mpeg_er_frame_start(s);
 if (!r->tmp_b_block_base) {
 int i;
 
@@ -1761,16 +1777,19 @@
 if(r->loop_filter)
 r->loop_filter(r, s->mb_height - 1);
 
- *got_picture_ptr = finish_frame(avctx, pict);
+ ret = finish_frame(avctx, pict);
+ if (ret < 0)
+ return ret;
+ *got_picture_ptr = ret;
 } else if (HAVE_THREADS &&
 (s->avctx->active_thread_type & FF_THREAD_FRAME)) {
 av_log(avctx, AV_LOG_INFO, "marking unfished frame as finished\n");
 /* always mark the current frame as finished, frame-mt supports
 * only complete frames */
- ff_er_frame_end(s);
+ ff_er_frame_end(&s->er);
 ff_MPV_frame_end(s);
 s->mb_num_left = 0;
- ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX, 0);
+ ff_thread_report_progress(&s->current_picture_ptr->tf, INT_MAX, 0);
 return AVERROR_INVALIDDATA;
 }
 }

libav-v9.6.tar.bz2/libavcodec/rv34.h -> libav-v10.1.tar.bz2/libavcodec/rv34.h Changed

libav-v9.6.tar.bz2/libavcodec/rv34_parser.c -> libav-v10.1.tar.bz2/libavcodec/rv34_parser.c Changed

libav-v9.6.tar.bz2/libavcodec/rv34dsp.c -> libav-v10.1.tar.bz2/libavcodec/rv34dsp.c Changed

@@ -24,7 +24,7 @@
 * @file
 * RV30/40 decoder common dsp functions
 */
-#include "dsputil.h"
+
 #include "rv34dsp.h"
 #include "libavutil/common.h"
 
@@ -33,7 +33,7 @@
 * @{
 */
 
-static av_always_inline void rv34_row_transform(int temp[16], DCTELEM *block)
+static av_always_inline void rv34_row_transform(int temp[16], int16_t *block)
 {
 int i;
 
@@ -54,12 +54,12 @@
 * Real Video 3.0/4.0 inverse transform + sample reconstruction
 * Code is almost the same as in SVQ3, only scaling is different.
 */
-static void rv34_idct_add_c(uint8_t *dst, ptrdiff_t stride, DCTELEM *block){
+static void rv34_idct_add_c(uint8_t *dst, ptrdiff_t stride, int16_t *block){
 int temp[16];
 int i;
 
 rv34_row_transform(temp, block);
- memset(block, 0, 16*sizeof(DCTELEM));
+ memset(block, 0, 16*sizeof(int16_t));
 
 for(i = 0; i < 4; i++){
 const int z0 = 13*(temp[4*0+i] + temp[4*2+i]) + 0x200;
@@ -82,7 +82,7 @@
 * Code is almost the same as rv34_inv_transform()
 * but final coefficients are multiplied by 1.5 and have no rounding.
 */
-static void rv34_inv_transform_noround_c(DCTELEM *block){
+static void rv34_inv_transform_noround_c(int16_t *block){
 int temp[16];
 int i;
 
@@ -115,9 +115,9 @@
 }
 }
 
-static void rv34_inv_transform_dc_noround_c(DCTELEM *block)
+static void rv34_inv_transform_dc_noround_c(int16_t *block)
 {
- DCTELEM dc = (13 * 13 * 3 * block[0]) >> 11;
+ int16_t dc = (13 * 13 * 3 * block[0]) >> 11;
 int i, j;
 
 for (i = 0; i < 4; i++, block += 4)
@@ -128,7 +128,8 @@
 /** @} */ // transform
 
 
-av_cold void ff_rv34dsp_init(RV34DSPContext *c, DSPContext* dsp) {
+av_cold void ff_rv34dsp_init(RV34DSPContext *c)
+{
 c->rv34_inv_transform = rv34_inv_transform_noround_c;
 c->rv34_inv_transform_dc = rv34_inv_transform_dc_noround_c;
 
@@ -136,7 +137,7 @@
 c->rv34_idct_dc_add = rv34_idct_dc_add_c;
 
 if (ARCH_ARM)
- ff_rv34dsp_init_arm(c, dsp);
+ ff_rv34dsp_init_arm(c);
 if (ARCH_X86)
- ff_rv34dsp_init_x86(c, dsp);
+ ff_rv34dsp_init_x86(c);
 }

libav-v9.6.tar.bz2/libavcodec/rv34dsp.h -> libav-v10.1.tar.bz2/libavcodec/rv34dsp.h Changed

@@ -28,15 +28,16 @@
 #define AVCODEC_RV34DSP_H
 
 #include "dsputil.h"
+#include "h264chroma.h"
 
 typedef void (*rv40_weight_func)(uint8_t *dst/*align width (8 or 16)*/,
                                  uint8_t *src1/*align width (8 or 16)*/,
                                  uint8_t *src2/*align width (8 or 16)*/,
                                  int w1, int w2, ptrdiff_t stride);
 
-typedef void (*rv34_inv_transform_func)(DCTELEM *block);
+typedef void (*rv34_inv_transform_func)(int16_t *block);
 
-typedef void (*rv34_idct_add_func)(uint8_t *dst, ptrdiff_t stride, DCTELEM *block);
+typedef void (*rv34_idct_add_func)(uint8_t *dst, ptrdiff_t stride, int16_t *block);
 typedef void (*rv34_idct_dc_add_func)(uint8_t *dst, ptrdiff_t stride,
                                       int   dc);
 
@@ -73,14 +74,15 @@
     rv40_loop_filter_strength_func rv40_loop_filter_strength[2];
 } RV34DSPContext;
 
-void ff_rv30dsp_init(RV34DSPContext *c, DSPContext* dsp);
-void ff_rv34dsp_init(RV34DSPContext *c, DSPContext* dsp);
-void ff_rv40dsp_init(RV34DSPContext *c, DSPContext* dsp);
+void ff_rv30dsp_init(RV34DSPContext *c);
+void ff_rv34dsp_init(RV34DSPContext *c);
+void ff_rv40dsp_init(RV34DSPContext *c);
 
-void ff_rv34dsp_init_arm(RV34DSPContext *c, DSPContext *dsp);
-void ff_rv34dsp_init_x86(RV34DSPContext *c, DSPContext *dsp);
+void ff_rv34dsp_init_arm(RV34DSPContext *c);
+void ff_rv34dsp_init_x86(RV34DSPContext *c);
 
-void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp);
-void ff_rv40dsp_init_arm(RV34DSPContext *c, DSPContext *dsp);
+void ff_rv40dsp_init_aarch64(RV34DSPContext *c);
+void ff_rv40dsp_init_x86(RV34DSPContext *c);
+void ff_rv40dsp_init_arm(RV34DSPContext *c);
 
 #endif /* AVCODEC_RV34DSP_H */

libav-v9.6.tar.bz2/libavcodec/rv40.c -> libav-v10.1.tar.bz2/libavcodec/rv40.c Changed

@@ -27,7 +27,6 @@
 #include "libavutil/imgutils.h"
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "golomb.h"
 
@@ -364,7 +363,7 @@
 
 mb_pos = row * s->mb_stride;
 for(mb_x = 0; mb_x < s->mb_width; mb_x++, mb_pos++){
- int mbtype = s->current_picture_ptr->f.mb_type[mb_pos];
+ int mbtype = s->current_picture_ptr->mb_type[mb_pos];
 if(IS_INTRA(mbtype) || IS_SEPARATE_DC(mbtype))
 r->cbp_luma [mb_pos] = r->deblock_coefs[mb_pos] = 0xFFFF;
 if(IS_INTRA(mbtype))
@@ -379,7 +378,7 @@
 unsigned y_to_deblock;
 int c_to_deblock[2];
 
- q = s->current_picture_ptr->f.qscale_table[mb_pos];
+ q = s->current_picture_ptr->qscale_table[mb_pos];
 alpha = rv40_alpha_tab[q];
 beta = rv40_beta_tab [q];
 betaY = betaC = beta * 3;
@@ -394,7 +393,7 @@
 if(avail[i]){
 int pos = mb_pos + neighbour_offs_x[i] + neighbour_offs_y[i]*s->mb_stride;
 mvmasks[i] = r->deblock_coefs[pos];
- mbtype [i] = s->current_picture_ptr->f.mb_type[pos];
+ mbtype [i] = s->current_picture_ptr->mb_type[pos];
 cbp [i] = r->cbp_luma[pos];
 uvcbp[i][0] = r->cbp_chroma[pos] & 0xF;
 uvcbp[i][1] = r->cbp_chroma[pos] >> 4;
@@ -545,9 +544,11 @@
 static av_cold int rv40_decode_init(AVCodecContext *avctx)
 {
 RV34DecContext *r = avctx->priv_data;
+ int ret;
 
 r->rv30 = 0;
- ff_rv34_decode_init(avctx);
+ if ((ret = ff_rv34_decode_init(avctx)) < 0)
+ return ret;
 if(!aic_top_vlc.bits)
 rv40_init_tables();
 r->parse_slice_header = rv40_parse_slice_header;
@@ -561,6 +562,7 @@
 
 AVCodec ff_rv40_decoder = {
 .name = "rv40",
+ .long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_RV40,
 .priv_data_size = sizeof(RV34DecContext),
@@ -570,7 +572,6 @@
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY |
 CODEC_CAP_FRAME_THREADS,
 .flush = ff_mpeg_flush,
- .long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"),
 .pix_fmts = ff_pixfmt_list_420,
 .init_thread_copy = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_init_thread_copy),
 .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_update_thread_context),

libav-v9.6.tar.bz2/libavcodec/rv40dsp.c -> libav-v10.1.tar.bz2/libavcodec/rv40dsp.c Changed

@@ -25,14 +25,14 @@
 */
 
 #include "avcodec.h"
-#include "dsputil.h"
+#include "h264qpel.h"
 #include "rv34dsp.h"
 #include "libavutil/common.h"
 
 #define RV40_LOWPASS(OPNAME, OP) \
 static av_unused void OPNAME ## rv40_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,\
 const int h, const int C1, const int C2, const int SHIFT){\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
 int i;\
 for(i = 0; i < h; i++)\
 {\
@@ -51,7 +51,7 @@
 \
 static void OPNAME ## rv40_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,\
 const int w, const int C1, const int C2, const int SHIFT){\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
 int i;\
 for(i = 0; i < w; i++)\
 {\
@@ -103,72 +103,84 @@
 \
 
 #define RV40_MC(OPNAME, SIZE) \
-static void OPNAME ## rv40_qpel ## SIZE ## _mc10_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv40_qpel ## SIZE ## _mc10_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## rv40_qpel ## SIZE ## _h_lowpass(dst, src, stride, stride, SIZE, 52, 20, 6);\
 }\
 \
-static void OPNAME ## rv40_qpel ## SIZE ## _mc30_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv40_qpel ## SIZE ## _mc30_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## rv40_qpel ## SIZE ## _h_lowpass(dst, src, stride, stride, SIZE, 20, 52, 6);\
 }\
 \
-static void OPNAME ## rv40_qpel ## SIZE ## _mc01_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv40_qpel ## SIZE ## _mc01_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, src, stride, stride, SIZE, 52, 20, 6);\
 }\
 \
-static void OPNAME ## rv40_qpel ## SIZE ## _mc11_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv40_qpel ## SIZE ## _mc11_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[SIZE*(SIZE+5)];\
 uint8_t * const full_mid = full + SIZE*2;\
 put_rv40_qpel ## SIZE ## _h_lowpass(full, src - 2*stride, SIZE, stride, SIZE+5, 52, 20, 6);\
 OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, full_mid, stride, SIZE, SIZE, 52, 20, 6);\
 }\
 \
-static void OPNAME ## rv40_qpel ## SIZE ## _mc21_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv40_qpel ## SIZE ## _mc21_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[SIZE*(SIZE+5)];\
 uint8_t * const full_mid = full + SIZE*2;\
 put_rv40_qpel ## SIZE ## _h_lowpass(full, src - 2*stride, SIZE, stride, SIZE+5, 20, 20, 5);\
 OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, full_mid, stride, SIZE, SIZE, 52, 20, 6);\
 }\
 \
-static void OPNAME ## rv40_qpel ## SIZE ## _mc31_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv40_qpel ## SIZE ## _mc31_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[SIZE*(SIZE+5)];\
 uint8_t * const full_mid = full + SIZE*2;\
 put_rv40_qpel ## SIZE ## _h_lowpass(full, src - 2*stride, SIZE, stride, SIZE+5, 20, 52, 6);\
 OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, full_mid, stride, SIZE, SIZE, 52, 20, 6);\
 }\
 \
-static void OPNAME ## rv40_qpel ## SIZE ## _mc12_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv40_qpel ## SIZE ## _mc12_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[SIZE*(SIZE+5)];\
 uint8_t * const full_mid = full + SIZE*2;\
 put_rv40_qpel ## SIZE ## _h_lowpass(full, src - 2*stride, SIZE, stride, SIZE+5, 52, 20, 6);\
 OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, full_mid, stride, SIZE, SIZE, 20, 20, 5);\
 }\
 \
-static void OPNAME ## rv40_qpel ## SIZE ## _mc22_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv40_qpel ## SIZE ## _mc22_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[SIZE*(SIZE+5)];\
 uint8_t * const full_mid = full + SIZE*2;\
 put_rv40_qpel ## SIZE ## _h_lowpass(full, src - 2*stride, SIZE, stride, SIZE+5, 20, 20, 5);\
 OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, full_mid, stride, SIZE, SIZE, 20, 20, 5);\
 }\
 \
-static void OPNAME ## rv40_qpel ## SIZE ## _mc32_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv40_qpel ## SIZE ## _mc32_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[SIZE*(SIZE+5)];\
 uint8_t * const full_mid = full + SIZE*2;\
 put_rv40_qpel ## SIZE ## _h_lowpass(full, src - 2*stride, SIZE, stride, SIZE+5, 20, 52, 6);\
 OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, full_mid, stride, SIZE, SIZE, 20, 20, 5);\
 }\
 \
-static void OPNAME ## rv40_qpel ## SIZE ## _mc03_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv40_qpel ## SIZE ## _mc03_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, src, stride, stride, SIZE, 20, 52, 6);\
 }\
 \
-static void OPNAME ## rv40_qpel ## SIZE ## _mc13_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv40_qpel ## SIZE ## _mc13_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[SIZE*(SIZE+5)];\
 uint8_t * const full_mid = full + SIZE*2;\
 put_rv40_qpel ## SIZE ## _h_lowpass(full, src - 2*stride, SIZE, stride, SIZE+5, 52, 20, 6);\
 OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, full_mid, stride, SIZE, SIZE, 20, 52, 6);\
 }\
 \
-static void OPNAME ## rv40_qpel ## SIZE ## _mc23_c(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## rv40_qpel ## SIZE ## _mc23_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 uint8_t full[SIZE*(SIZE+5)];\
 uint8_t * const full_mid = full + SIZE*2;\
 put_rv40_qpel ## SIZE ## _h_lowpass(full, src - 2*stride, SIZE, stride, SIZE+5, 20, 20, 5);\
@@ -338,7 +350,7 @@
 const int lim_q1,
 const int lim_p1)
 {
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
 int i, t, u, diff;
 
 for (i = 0; i < 4; i++, src += stride) {
@@ -517,19 +529,22 @@
 return rv40_loop_filter_strength(src, 1, stride, beta, beta2, edge, p1, q1);
 }
 
-av_cold void ff_rv40dsp_init(RV34DSPContext *c, DSPContext* dsp) {
+av_cold void ff_rv40dsp_init(RV34DSPContext *c)
+{
+ H264QpelContext qpel;
 
- ff_rv34dsp_init(c, dsp);
+ ff_rv34dsp_init(c);
+ ff_h264qpel_init(&qpel, 8);
 
- c->put_pixels_tab[0][ 0] = dsp->put_h264_qpel_pixels_tab[0][0];
+ c->put_pixels_tab[0][ 0] = qpel.put_h264_qpel_pixels_tab[0][0];
 c->put_pixels_tab[0][ 1] = put_rv40_qpel16_mc10_c;
- c->put_pixels_tab[0][ 2] = dsp->put_h264_qpel_pixels_tab[0][2];
+ c->put_pixels_tab[0][ 2] = qpel.put_h264_qpel_pixels_tab[0][2];
 c->put_pixels_tab[0][ 3] = put_rv40_qpel16_mc30_c;
 c->put_pixels_tab[0][ 4] = put_rv40_qpel16_mc01_c;
 c->put_pixels_tab[0][ 5] = put_rv40_qpel16_mc11_c;
 c->put_pixels_tab[0][ 6] = put_rv40_qpel16_mc21_c;
 c->put_pixels_tab[0][ 7] = put_rv40_qpel16_mc31_c;
- c->put_pixels_tab[0][ 8] = dsp->put_h264_qpel_pixels_tab[0][8];
+ c->put_pixels_tab[0][ 8] = qpel.put_h264_qpel_pixels_tab[0][8];
 c->put_pixels_tab[0][ 9] = put_rv40_qpel16_mc12_c;
 c->put_pixels_tab[0][10] = put_rv40_qpel16_mc22_c;
 c->put_pixels_tab[0][11] = put_rv40_qpel16_mc32_c;
@@ -537,15 +552,15 @@
 c->put_pixels_tab[0][13] = put_rv40_qpel16_mc13_c;
 c->put_pixels_tab[0][14] = put_rv40_qpel16_mc23_c;
 c->put_pixels_tab[0][15] = ff_put_rv40_qpel16_mc33_c;
- c->avg_pixels_tab[0][ 0] = dsp->avg_h264_qpel_pixels_tab[0][0];
+ c->avg_pixels_tab[0][ 0] = qpel.avg_h264_qpel_pixels_tab[0][0];
 c->avg_pixels_tab[0][ 1] = avg_rv40_qpel16_mc10_c;
- c->avg_pixels_tab[0][ 2] = dsp->avg_h264_qpel_pixels_tab[0][2];
+ c->avg_pixels_tab[0][ 2] = qpel.avg_h264_qpel_pixels_tab[0][2];
 c->avg_pixels_tab[0][ 3] = avg_rv40_qpel16_mc30_c;
 c->avg_pixels_tab[0][ 4] = avg_rv40_qpel16_mc01_c;
 c->avg_pixels_tab[0][ 5] = avg_rv40_qpel16_mc11_c;
 c->avg_pixels_tab[0][ 6] = avg_rv40_qpel16_mc21_c;
 c->avg_pixels_tab[0][ 7] = avg_rv40_qpel16_mc31_c;
- c->avg_pixels_tab[0][ 8] = dsp->avg_h264_qpel_pixels_tab[0][8];
+ c->avg_pixels_tab[0][ 8] = qpel.avg_h264_qpel_pixels_tab[0][8];
 c->avg_pixels_tab[0][ 9] = avg_rv40_qpel16_mc12_c;
 c->avg_pixels_tab[0][10] = avg_rv40_qpel16_mc22_c;
 c->avg_pixels_tab[0][11] = avg_rv40_qpel16_mc32_c;
@@ -553,15 +568,15 @@
 c->avg_pixels_tab[0][13] = avg_rv40_qpel16_mc13_c;
 c->avg_pixels_tab[0][14] = avg_rv40_qpel16_mc23_c;
 c->avg_pixels_tab[0][15] = ff_avg_rv40_qpel16_mc33_c;
- c->put_pixels_tab[1][ 0] = dsp->put_h264_qpel_pixels_tab[1][0];
+ c->put_pixels_tab[1][ 0] = qpel.put_h264_qpel_pixels_tab[1][0];
 c->put_pixels_tab[1][ 1] = put_rv40_qpel8_mc10_c;
- c->put_pixels_tab[1][ 2] = dsp->put_h264_qpel_pixels_tab[1][2];
+ c->put_pixels_tab[1][ 2] = qpel.put_h264_qpel_pixels_tab[1][2];
 c->put_pixels_tab[1][ 3] = put_rv40_qpel8_mc30_c;
 c->put_pixels_tab[1][ 4] = put_rv40_qpel8_mc01_c;
 c->put_pixels_tab[1][ 5] = put_rv40_qpel8_mc11_c;
 c->put_pixels_tab[1][ 6] = put_rv40_qpel8_mc21_c;
 c->put_pixels_tab[1][ 7] = put_rv40_qpel8_mc31_c;
- c->put_pixels_tab[1][ 8] = dsp->put_h264_qpel_pixels_tab[1][8];
+ c->put_pixels_tab[1][ 8] = qpel.put_h264_qpel_pixels_tab[1][8];
 c->put_pixels_tab[1][ 9] = put_rv40_qpel8_mc12_c;
 c->put_pixels_tab[1][10] = put_rv40_qpel8_mc22_c;
 c->put_pixels_tab[1][11] = put_rv40_qpel8_mc32_c;
@@ -569,15 +584,15 @@
 c->put_pixels_tab[1][13] = put_rv40_qpel8_mc13_c;
 c->put_pixels_tab[1][14] = put_rv40_qpel8_mc23_c;
 c->put_pixels_tab[1][15] = ff_put_rv40_qpel8_mc33_c;
- c->avg_pixels_tab[1][ 0] = dsp->avg_h264_qpel_pixels_tab[1][0];
+ c->avg_pixels_tab[1][ 0] = qpel.avg_h264_qpel_pixels_tab[1][0];
 c->avg_pixels_tab[1][ 1] = avg_rv40_qpel8_mc10_c;
- c->avg_pixels_tab[1][ 2] = dsp->avg_h264_qpel_pixels_tab[1][2];
+ c->avg_pixels_tab[1][ 2] = qpel.avg_h264_qpel_pixels_tab[1][2];
 c->avg_pixels_tab[1][ 3] = avg_rv40_qpel8_mc30_c;
 c->avg_pixels_tab[1][ 4] = avg_rv40_qpel8_mc01_c;
 c->avg_pixels_tab[1][ 5] = avg_rv40_qpel8_mc11_c;
 c->avg_pixels_tab[1][ 6] = avg_rv40_qpel8_mc21_c;
 c->avg_pixels_tab[1][ 7] = avg_rv40_qpel8_mc31_c;
- c->avg_pixels_tab[1][ 8] = dsp->avg_h264_qpel_pixels_tab[1][8];
+ c->avg_pixels_tab[1][ 8] = qpel.avg_h264_qpel_pixels_tab[1][8];
 c->avg_pixels_tab[1][ 9] = avg_rv40_qpel8_mc12_c;
 c->avg_pixels_tab[1][10] = avg_rv40_qpel8_mc22_c;
 c->avg_pixels_tab[1][11] = avg_rv40_qpel8_mc32_c;
@@ -603,8 +618,10 @@
 c->rv40_loop_filter_strength[0] = rv40_h_loop_filter_strength;
 c->rv40_loop_filter_strength[1] = rv40_v_loop_filter_strength;
 
- if (ARCH_X86)
- ff_rv40dsp_init_x86(c, dsp);
+ if (ARCH_AARCH64)
+ ff_rv40dsp_init_aarch64(c);
 if (ARCH_ARM)
- ff_rv40dsp_init_arm(c, dsp);
+ ff_rv40dsp_init_arm(c);
+ if (ARCH_X86)
+ ff_rv40dsp_init_x86(c);
 }

libav-v9.6.tar.bz2/libavcodec/s302m.c -> libav-v10.1.tar.bz2/libavcodec/s302m.c Changed

@@ -28,10 +28,6 @@
 
 #define AES3_HEADER_LEN 4
 
-typedef struct S302MDecodeContext {
- AVFrame frame;
-} S302MDecodeContext;
-
 static int s302m_parse_frame_header(AVCodecContext *avctx, const uint8_t *buf,
 int buf_size)
 {
@@ -82,7 +78,7 @@
 static int s302m_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
- S302MDecodeContext *s = avctx->priv_data;
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 int block_size, ret;
@@ -96,16 +92,16 @@
 
 /* get output buffer */
 block_size = (avctx->bits_per_coded_sample + 4) / 4;
- s->frame.nb_samples = 2 * (buf_size / block_size) / avctx->channels;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = 2 * (buf_size / block_size) / avctx->channels;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
 
- buf_size = (s->frame.nb_samples * avctx->channels / 2) * block_size;
+ buf_size = (frame->nb_samples * avctx->channels / 2) * block_size;
 
 if (avctx->bits_per_coded_sample == 24) {
- uint32_t *o = (uint32_t *)s->frame.data[0];
+ uint32_t *o = (uint32_t *)frame->data[0];
 for (; buf_size > 6; buf_size -= 7) {
 *o++ = (ff_reverse[buf[2]] << 24) |
 (ff_reverse[buf[1]] << 16) |
@@ -117,7 +113,7 @@
 buf += 7;
 }
 } else if (avctx->bits_per_coded_sample == 20) {
- uint32_t *o = (uint32_t *)s->frame.data[0];
+ uint32_t *o = (uint32_t *)frame->data[0];
 for (; buf_size > 5; buf_size -= 6) {
 *o++ = (ff_reverse[buf[2] & 0xf0] << 28) |
 (ff_reverse[buf[1]] << 20) |
@@ -128,7 +124,7 @@
 buf += 6;
 }
 } else {
- uint16_t *o = (uint16_t *)s->frame.data[0];
+ uint16_t *o = (uint16_t *)frame->data[0];
 for (; buf_size > 4; buf_size -= 5) {
 *o++ = (ff_reverse[buf[1]] << 8) |
 ff_reverse[buf[0]];
@@ -139,30 +135,16 @@
 }
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
 return avpkt->size;
 }
 
-static int s302m_decode_init(AVCodecContext *avctx)
-{
- S302MDecodeContext *s = avctx->priv_data;
-
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
- return 0;
-}
-
-
 AVCodec ff_s302m_decoder = {
 .name = "s302m",
+ .long_name = NULL_IF_CONFIG_SMALL("SMPTE 302M"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_S302M,
- .priv_data_size = sizeof(S302MDecodeContext),
- .init = s302m_decode_init,
 .decode = s302m_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("SMPTE 302M"),
 };

libav-v9.6.tar.bz2/libavcodec/s3tc.c -> libav-v10.1.tar.bz2/libavcodec/s3tc.c Changed

libav-v9.6.tar.bz2/libavcodec/sbrdsp.c -> libav-v10.1.tar.bz2/libavcodec/sbrdsp.c Changed

@@ -22,6 +22,7 @@
 
 #include "config.h"
 #include "libavutil/attributes.h"
+#include "libavutil/intfloat.h"
 #include "sbrdsp.h"
 
 static void sbr_sum64x5_c(float *z)
@@ -51,37 +52,51 @@
 
 static void sbr_neg_odd_64_c(float *x)
 {
+ union av_intfloat32 *xi = (union av_intfloat32*) x;
 int i;
- for (i = 1; i < 64; i += 2)
- x[i] = -x[i];
+ for (i = 1; i < 64; i += 4) {
+ xi[i + 0].i ^= 1U << 31;
+ xi[i + 2].i ^= 1U << 31;
+ }
 }
 
 static void sbr_qmf_pre_shuffle_c(float *z)
 {
+ union av_intfloat32 *zi = (union av_intfloat32*) z;
 int k;
- z[64] = z[0];
- z[65] = z[1];
- for (k = 1; k < 32; k++) {
- z[64+2*k ] = -z[64 - k];
- z[64+2*k+1] = z[ k + 1];
+ zi[64].i = zi[0].i;
+ zi[65].i = zi[1].i;
+ for (k = 1; k < 31; k += 2) {
+ zi[64 + 2 * k + 0].i = zi[64 - k].i ^ (1U << 31);
+ zi[64 + 2 * k + 1].i = zi[ k + 1].i;
+ zi[64 + 2 * k + 2].i = zi[63 - k].i ^ (1U << 31);
+ zi[64 + 2 * k + 3].i = zi[ k + 2].i;
 }
+ zi[64 + 2 * 31 + 0].i = zi[64 - 31].i ^ (1U << 31);
+ zi[64 + 2 * 31 + 1].i = zi[31 + 1].i;
 }
 
 static void sbr_qmf_post_shuffle_c(float W[32][2], const float *z)
 {
+ const union av_intfloat32 *zi = (const union av_intfloat32*) z;
+ union av_intfloat32 *Wi = (union av_intfloat32*) W;
 int k;
- for (k = 0; k < 32; k++) {
- W[k][0] = -z[63-k];
- W[k][1] = z[k];
+ for (k = 0; k < 32; k += 2) {
+ Wi[2 * k + 0].i = zi[63 - k].i ^ (1U << 31);
+ Wi[2 * k + 1].i = zi[ k + 0].i;
+ Wi[2 * k + 2].i = zi[62 - k].i ^ (1U << 31);
+ Wi[2 * k + 3].i = zi[ k + 1].i;
 }
 }
 
 static void sbr_qmf_deint_neg_c(float *v, const float *src)
 {
+ const union av_intfloat32 *si = (const union av_intfloat32*)src;
+ union av_intfloat32 *vi = (union av_intfloat32*)v;
 int i;
 for (i = 0; i < 32; i++) {
- v[ i] = src[63 - 2*i ];
- v[63 - i] = -src[63 - 2*i - 1];
+ vi[ i].i = si[63 - 2 * i ].i;
+ vi[63 - i].i = si[63 - 2 * i - 1].i ^ (1U << 31);
 }
 }
 
@@ -122,9 +137,34 @@
 
 static void sbr_autocorrelate_c(const float x[40][2], float phi[3][2][2])
 {
+#if 0
+ /* This code is slower because it multiplies memory accesses.
+ * It is left for educational purposes and because it may offer
+ * a better reference for writing arch-specific DSP functions. */
 autocorrelate(x, phi, 0);
 autocorrelate(x, phi, 1);
 autocorrelate(x, phi, 2);
+#else
+ float real_sum2 = x[0][0] * x[2][0] + x[0][1] * x[2][1];
+ float imag_sum2 = x[0][0] * x[2][1] - x[0][1] * x[2][0];
+ float real_sum1 = 0.0f, imag_sum1 = 0.0f, real_sum0 = 0.0f;
+ int i;
+ for (i = 1; i < 38; i++) {
+ real_sum0 += x[i][0] * x[i ][0] + x[i][1] * x[i ][1];
+ real_sum1 += x[i][0] * x[i + 1][0] + x[i][1] * x[i + 1][1];
+ imag_sum1 += x[i][0] * x[i + 1][1] - x[i][1] * x[i + 1][0];
+ real_sum2 += x[i][0] * x[i + 2][0] + x[i][1] * x[i + 2][1];
+ imag_sum2 += x[i][0] * x[i + 2][1] - x[i][1] * x[i + 2][0];
+ }
+ phi[2 - 2][1][0] = real_sum2;
+ phi[2 - 2][1][1] = imag_sum2;
+ phi[2 ][1][0] = real_sum0 + x[ 0][0] * x[ 0][0] + x[ 0][1] * x[ 0][1];
+ phi[1 ][0][0] = real_sum0 + x[38][0] * x[38][0] + x[38][1] * x[38][1];
+ phi[2 - 1][1][0] = real_sum1 + x[ 0][0] * x[ 1][0] + x[ 0][1] * x[ 1][1];
+ phi[2 - 1][1][1] = imag_sum1 + x[ 0][0] * x[ 1][1] - x[ 0][1] * x[ 1][0];
+ phi[0 ][0][0] = real_sum1 + x[38][0] * x[39][0] + x[38][1] * x[39][1];
+ phi[0 ][0][1] = imag_sum1 + x[38][0] * x[39][1] - x[38][1] * x[39][0];
+#endif
 }
 
 static void sbr_hf_gen_c(float (*X_high)[2], const float (*X_low)[2],

libav-v9.6.tar.bz2/libavcodec/sgidec.c -> libav-v10.1.tar.bz2/libavcodec/sgidec.c Changed

@@ -26,7 +26,7 @@
 #include "sgi.h"
 
 typedef struct SgiState {
- AVFrame picture;
+ AVCodecContext *avctx;
 unsigned int width;
 unsigned int height;
 unsigned int depth;
@@ -39,12 +39,12 @@
 * 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, -1 if buffer overflows
 */
 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;
@@ -58,7 +58,10 @@
 }
 
 /* Check for buffer overflow. */
- if(out_buf + pixelstride * count >= out_end) return -1;
+ if (pixelstride * (count - 1) >= len) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid pixel count.\n");
+ return AVERROR_INVALIDDATA;
+ }
 
 if (pixel & 0x80) {
 while (count--) {
@@ -101,7 +104,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 + FFABS(s->linesize),
+ if (expand_rle_row(s, dest_row + z, FFABS(s->linesize) - z,
 s->depth) != s->width) {
 return AVERROR_INVALIDDATA;
 }
@@ -155,8 +158,7 @@
 AVPacket *avpkt)
 {
 SgiState *s = avctx->priv_data;
- AVFrame *picture = data;
- AVFrame *p = &s->picture;
+ AVFrame *p = data;
 unsigned int dimension, rle;
 int ret = 0;
 uint8_t *out_buf, *out_end;
@@ -202,15 +204,11 @@
 return -1;
 }
 
- if (av_image_check_size(s->width, s->height, 0, avctx))
- return -1;
- avcodec_set_dimensions(avctx, s->width, s->height);
-
- if (p->data[0])
- avctx->release_buffer(avctx, p);
+ ret = ff_set_dimensions(avctx, s->width, s->height);
+ if (ret < 0)
+ return ret;
 
- p->reference = 0;
- if (ff_get_buffer(avctx, p) < 0) {
+ if (ff_get_buffer(avctx, p, 0) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed.\n");
 return -1;
 }
@@ -232,7 +230,6 @@
 }
 
 if (ret == 0) {
- *picture = s->picture;
 *got_frame = 1;
 return avpkt->size;
 } else {
@@ -240,33 +237,22 @@
 }
 }
 
-static av_cold int sgi_init(AVCodecContext *avctx){
- SgiState *s = avctx->priv_data;
-
- avcodec_get_frame_defaults(&s->picture);
- avctx->coded_frame = &s->picture;
-
- return 0;
-}
-
-static av_cold int sgi_end(AVCodecContext *avctx)
+static av_cold int sgi_decode_init(AVCodecContext *avctx)
 {
- SgiState * const s = avctx->priv_data;
+ SgiState *s = avctx->priv_data;
 
- if (s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
+ s->avctx = avctx;
 
 return 0;
 }
 
 AVCodec ff_sgi_decoder = {
 .name = "sgi",
+ .long_name = NULL_IF_CONFIG_SMALL("SGI image"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_SGI,
 .priv_data_size = sizeof(SgiState),
- .init = sgi_init,
- .close = sgi_end,
 .decode = decode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("SGI image"),
+ .init = sgi_decode_init,
 .capabilities = CODEC_CAP_DR1,
 };

libav-v9.6.tar.bz2/libavcodec/sgienc.c -> libav-v10.1.tar.bz2/libavcodec/sgienc.c Changed

@@ -28,16 +28,11 @@
 #define SGI_SINGLE_CHAN 2
 #define SGI_MULTI_CHAN 3
 
-typedef struct SgiContext {
-    AVFrame picture;
-} SgiContext;
-
 static av_cold int encode_init(AVCodecContext *avctx)
 {
-    SgiContext *s = avctx->priv_data;
-
-    avcodec_get_frame_defaults(&s->picture);
-    avctx->coded_frame = &s->picture;
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
 
     return 0;
 }
@@ -45,16 +40,14 @@
 static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
                         const AVFrame *frame, int *got_packet)
 {
-    SgiContext *s = avctx->priv_data;
-    AVFrame * const p = &s->picture;
+    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;
     unsigned char *end_buf;
 
-    *p = *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;
 
     width  = avctx->width;
     height = avctx->height;
@@ -170,15 +163,21 @@
     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"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_SGI,
-    .priv_data_size = sizeof(SgiContext),
     .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_GRAY8, AV_PIX_FMT_NONE
     },
-    .long_name      = NULL_IF_CONFIG_SMALL("SGI image"),
 };

libav-v9.6.tar.bz2/libavcodec/sh4/Makefile -> libav-v10.1.tar.bz2/libavcodec/sh4/Makefile Changed

libav-v9.6.tar.bz2/libavcodec/sh4/dsputil_sh4.c -> libav-v10.1.tar.bz2/libavcodec/sh4/dsputil_sh4.c Changed

@@ -20,6 +20,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "libavutil/attributes.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/dsputil.h"
 #include "dsputil_sh4.h"
@@ -47,15 +48,15 @@
 fp_single_leave(fpscr);
 }
 
-static void clear_blocks_sh4(DCTELEM *blocks)
+static void clear_blocks_sh4(int16_t *blocks)
 {
- memzero_align8(blocks,sizeof(DCTELEM)*6*64);
+ memzero_align8(blocks,sizeof(int16_t)*6*64);
 }
 
-static void idct_put(uint8_t *dest, int line_size, DCTELEM *block)
+static void idct_put(uint8_t *dest, int line_size, int16_t *block)
 {
 int i;
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
 ff_idct_sh4(block);
 for(i=0;i<8;i++) {
 dest[0] = cm[block[0]];
@@ -70,10 +71,10 @@
 block+=8;
 }
 }
-static void idct_add(uint8_t *dest, int line_size, DCTELEM *block)
+static void idct_add(uint8_t *dest, int line_size, int16_t *block)
 {
 int i;
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
 ff_idct_sh4(block);
 for(i=0;i<8;i++) {
 dest[0] = cm[dest[0]+block[0]];
@@ -89,11 +90,10 @@
 }
 }
 
-void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx)
+av_cold void ff_dsputil_init_sh4(DSPContext *c, AVCodecContext *avctx)
 {
 const int idct_algo= avctx->idct_algo;
 const int high_bit_depth = avctx->bits_per_raw_sample > 8;
- ff_dsputil_init_align(c,avctx);
 
 if (!high_bit_depth)
 c->clear_blocks = clear_blocks_sh4;

libav-v9.6.tar.bz2/libavcodec/sh4/dsputil_sh4.h -> libav-v10.1.tar.bz2/libavcodec/sh4/dsputil_sh4.h Changed

libav-v9.6.tar.bz2/libavcodec/sh4/idct_sh4.c -> libav-v10.1.tar.bz2/libavcodec/sh4/idct_sh4.c Changed

libav-v9.6.tar.bz2/libavcodec/shorten.c -> libav-v10.1.tar.bz2/libavcodec/shorten.c Changed

@@ -80,7 +80,6 @@
 
 typedef struct ShortenContext {
 AVCodecContext *avctx;
- AVFrame frame;
 GetBitContext gb;
 
 int min_framesize, max_framesize;
@@ -115,17 +114,12 @@
 s->avctx = avctx;
 avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
 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)) {
@@ -139,26 +133,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;
 }
@@ -206,31 +195,38 @@
 {
 int len;
 short wave_format;
+ GetByteContext gb;
 
- if (bytestream_get_le32(&header) != MKTAG('R', 'I', 'F', 'F')) {
+ bytestream2_init(&gb, header, header_size);
+
+ if (bytestream2_get_le32(&gb) != MKTAG('R', 'I', 'F', 'F')) {
 av_log(avctx, AV_LOG_ERROR, "missing RIFF tag\n");
 return AVERROR_INVALIDDATA;
 }
 
- header += 4; /* chunk size */
+ bytestream2_skip(&gb, 4); /* chunk size */
 
- if (bytestream_get_le32(&header) != MKTAG('W', 'A', 'V', 'E')) {
+ if (bytestream2_get_le32(&gb) != MKTAG('W', 'A', 'V', 'E')) {
 av_log(avctx, AV_LOG_ERROR, "missing WAVE tag\n");
 return AVERROR_INVALIDDATA;
 }
 
- while (bytestream_get_le32(&header) != MKTAG('f', 'm', 't', ' ')) {
- len = bytestream_get_le32(&header);
- header += len;
+ while (bytestream2_get_le32(&gb) != MKTAG('f', 'm', 't', ' ')) {
+ len = bytestream2_get_le32(&gb);
+ bytestream2_skip(&gb, len);
+ if (bytestream2_get_bytes_left(&gb) < 16) {
+ av_log(avctx, AV_LOG_ERROR, "no fmt chunk found\n");
+ return AVERROR_INVALIDDATA;
+ }
 }
- len = bytestream_get_le32(&header);
+ len = bytestream2_get_le32(&gb);
 
 if (len < 16) {
 av_log(avctx, AV_LOG_ERROR, "fmt chunk was too short\n");
 return AVERROR_INVALIDDATA;
 }
 
- wave_format = bytestream_get_le16(&header);
+ wave_format = bytestream2_get_le16(&gb);
 
 switch (wave_format) {
 case WAVE_FORMAT_PCM:
@@ -240,11 +236,11 @@
 return AVERROR(ENOSYS);
 }
 
- header += 2; // skip channels (already got from shorten header)
- avctx->sample_rate = bytestream_get_le32(&header);
- header += 4; // skip bit rate (represents original uncompressed bit rate)
- header += 2; // skip block align (not needed)
- avctx->bits_per_coded_sample = bytestream_get_le16(&header);
+ bytestream2_skip(&gb, 2); // skip channels (already got from shorten header)
+ avctx->sample_rate = bytestream2_get_le32(&gb);
+ bytestream2_skip(&gb, 4); // skip bit rate (represents original uncompressed bit rate)
+ bytestream2_skip(&gb, 2); // skip block align (not needed)
+ avctx->bits_per_coded_sample = bytestream2_get_le16(&gb);
 
 if (avctx->bits_per_coded_sample != 16) {
 av_log(avctx, AV_LOG_ERROR, "unsupported number of bits per sample\n");
@@ -270,7 +266,8 @@
 }
 }
 
-static const int fixed_coeffs[3][3] = {
+static const int fixed_coeffs[][3] = {
+ { 0, 0, 0 },
 { 1, 0, 0 },
 { 2, -1, 0 },
 { 3, -3, 1 }
@@ -299,7 +296,12 @@
 } else {
 /* fixed LPC coeffs */
 pred_order = command;
- coeffs = fixed_coeffs[pred_order - 1];
+ if (pred_order >= FF_ARRAY_ELEMS(fixed_coeffs)) {
+ av_log(s->avctx, AV_LOG_ERROR, "invalid pred_order %d\n",
+ pred_order);
+ return AVERROR_INVALIDDATA;
+ }
+ coeffs = fixed_coeffs[pred_order];
 qshift = 0;
 }
 
@@ -417,6 +419,7 @@
 static int shorten_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 ShortenContext *s = avctx->priv_data;
@@ -428,7 +431,7 @@
 void *tmp_ptr;
 s->max_framesize = 1024; // should hopefully be enough for the first header
 tmp_ptr = av_fast_realloc(s->bitstream, &s->allocated_bitstream_size,
- s->max_framesize);
+ s->max_framesize + FF_INPUT_BUFFER_PADDING_SIZE);
 if (!tmp_ptr) {
 av_log(avctx, AV_LOG_ERROR, "error allocating bitstream buffer\n");
 return AVERROR(ENOMEM);
@@ -481,7 +484,7 @@
 
 s->cur_chan = 0;
 while (s->cur_chan < s->channels) {
- int cmd;
+ unsigned cmd;
 int len;
 
 if (get_bits_left(&s->gb) < 3 + FNSIZE) {
@@ -595,17 +598,16 @@
 s->cur_chan++;
 if (s->cur_chan == s->channels) {
 /* get output buffer */
- s->frame.nb_samples = s->blocksize;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = s->blocksize;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
 /* interleave output */
- output_buffer((int16_t **)s->frame.extended_data, s->channels,
+ output_buffer((int16_t **)frame->extended_data, s->channels,
 s->blocksize, s->decoded);
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 }
 }
 }
@@ -647,6 +649,7 @@
 
 AVCodec ff_shorten_decoder = {
 .name = "shorten",
+ .long_name = NULL_IF_CONFIG_SMALL("Shorten"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_SHORTEN,
 .priv_data_size = sizeof(ShortenContext),
@@ -654,7 +657,6 @@
 .close = shorten_decode_close,
 .decode = shorten_decode_frame,
 .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Shorten"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
 AV_SAMPLE_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/simple_idct.c -> libav-v10.1.tar.bz2/libavcodec/simple_idct.c Changed

@@ -27,7 +27,6 @@
 
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mathops.h"
 #include "simple_idct.h"
 
@@ -50,7 +49,7 @@
    and the butterfly must be multiplied by 0.5 * sqrt(2.0) */
 #define C_SHIFT (4+1+12)
 
-static inline void idct4col_put(uint8_t *dest, int line_size, const DCTELEM *col)
+static inline void idct4col_put(uint8_t *dest, int line_size, const int16_t *col)
 {
     int c0, c1, c2, c3, a0, a1, a2, a3;
 
@@ -86,10 +85,10 @@
 /* XXX: I think a 1.0/sqrt(2) normalization should be needed to
    compensate the extra butterfly stage - I don't have the full DV
    specification */
-void ff_simple_idct248_put(uint8_t *dest, int line_size, DCTELEM *block)
+void ff_simple_idct248_put(uint8_t *dest, int line_size, int16_t *block)
 {
     int i;
-    DCTELEM *ptr;
+    int16_t *ptr;
 
     /* butterfly */
     ptr = block;
@@ -129,7 +128,7 @@
 #define C2 C_FIX(0.2705980501)
 #define C3 C_FIX(0.5)
 #define C_SHIFT (4+1+12)
-static inline void idct4col_add(uint8_t *dest, int line_size, const DCTELEM *col)
+static inline void idct4col_add(uint8_t *dest, int line_size, const int16_t *col)
 {
     int c0, c1, c2, c3, a0, a1, a2, a3;
 
@@ -156,7 +155,7 @@
 #define R2 R_FIX(0.2705980501)
 #define R3 R_FIX(0.5)
 #define R_SHIFT 11
-static inline void idct4row(DCTELEM *row)
+static inline void idct4row(int16_t *row)
 {
     int c0, c1, c2, c3, a0, a1, a2, a3;
 
@@ -174,7 +173,7 @@
     row[3]= (c0 - c1) >> R_SHIFT;
 }
 
-void ff_simple_idct84_add(uint8_t *dest, int line_size, DCTELEM *block)
+void ff_simple_idct84_add(uint8_t *dest, int line_size, int16_t *block)
 {
     int i;
 
@@ -189,7 +188,7 @@
     }
 }
 
-void ff_simple_idct48_add(uint8_t *dest, int line_size, DCTELEM *block)
+void ff_simple_idct48_add(uint8_t *dest, int line_size, int16_t *block)
 {
     int i;
 
@@ -204,7 +203,7 @@
     }
 }
 
-void ff_simple_idct44_add(uint8_t *dest, int line_size, DCTELEM *block)
+void ff_simple_idct44_add(uint8_t *dest, int line_size, int16_t *block)
 {
     int i;
 
@@ -219,7 +218,7 @@
     }
 }
 
-void ff_prores_idct(DCTELEM *block, const int16_t *qmat)
+void ff_prores_idct(int16_t *block, const int16_t *qmat)
 {
     int i;

libav-v9.6.tar.bz2/libavcodec/simple_idct.h -> libav-v10.1.tar.bz2/libavcodec/simple_idct.h Changed

@@ -29,30 +29,29 @@
 #define AVCODEC_SIMPLE_IDCT_H
 
 #include <stdint.h>
-#include "dsputil.h"
 
-void ff_simple_idct_put_8(uint8_t *dest, int line_size, DCTELEM *block);
-void ff_simple_idct_add_8(uint8_t *dest, int line_size, DCTELEM *block);
-void ff_simple_idct_8(DCTELEM *block);
+void ff_simple_idct_put_8(uint8_t *dest, int line_size, int16_t *block);
+void ff_simple_idct_add_8(uint8_t *dest, int line_size, int16_t *block);
+void ff_simple_idct_8(int16_t *block);
 
-void ff_simple_idct_put_10(uint8_t *dest, int line_size, DCTELEM *block);
-void ff_simple_idct_add_10(uint8_t *dest, int line_size, DCTELEM *block);
-void ff_simple_idct_10(DCTELEM *block);
+void ff_simple_idct_put_10(uint8_t *dest, int line_size, int16_t *block);
+void ff_simple_idct_add_10(uint8_t *dest, int line_size, int16_t *block);
+void ff_simple_idct_10(int16_t *block);
 /**
 * Special version of ff_simple_idct_10() which does dequantization
 * and scales by a factor of 2 more between the two IDCTs to account
 * for larger scale of input coefficients.
 */
-void ff_prores_idct(DCTELEM *block, const int16_t *qmat);
+void ff_prores_idct(int16_t *block, const int16_t *qmat);
 
 void ff_simple_idct_mmx(int16_t *block);
 void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block);
 void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block);
 
-void ff_simple_idct248_put(uint8_t *dest, int line_size, DCTELEM *block);
+void ff_simple_idct248_put(uint8_t *dest, int line_size, int16_t *block);
 
-void ff_simple_idct84_add(uint8_t *dest, int line_size, DCTELEM *block);
-void ff_simple_idct48_add(uint8_t *dest, int line_size, DCTELEM *block);
-void ff_simple_idct44_add(uint8_t *dest, int line_size, DCTELEM *block);
+void ff_simple_idct84_add(uint8_t *dest, int line_size, int16_t *block);
+void ff_simple_idct48_add(uint8_t *dest, int line_size, int16_t *block);
+void ff_simple_idct44_add(uint8_t *dest, int line_size, int16_t *block);
 
 #endif /* AVCODEC_SIMPLE_IDCT_H */

libav-v9.6.tar.bz2/libavcodec/simple_idct_template.c -> libav-v10.1.tar.bz2/libavcodec/simple_idct_template.c Changed

@@ -85,7 +85,7 @@
 
 #endif
 
-static inline void FUNC(idctRowCondDC)(DCTELEM *row, int extra_shift)
+static inline void FUNC(idctRowCondDC)(int16_t *row, int extra_shift)
 {
     int a0, a1, a2, a3, b0, b1, b2, b3;
 
@@ -221,7 +221,7 @@
     } while (0)
 
 static inline void FUNC(idctSparseColPut)(pixel *dest, int line_size,
-                                          DCTELEM *col)
+                                          int16_t *col)
 {
     int a0, a1, a2, a3, b0, b1, b2, b3;
 
@@ -245,7 +245,7 @@
 }
 
 static inline void FUNC(idctSparseColAdd)(pixel *dest, int line_size,
-                                          DCTELEM *col)
+                                          int16_t *col)
 {
     int a0, a1, a2, a3, b0, b1, b2, b3;
 
@@ -268,7 +268,7 @@
     dest[0] = av_clip_pixel(dest[0] + ((a0 - b0) >> COL_SHIFT));
 }
 
-static inline void FUNC(idctSparseCol)(DCTELEM *col)
+static inline void FUNC(idctSparseCol)(int16_t *col)
 {
     int a0, a1, a2, a3, b0, b1, b2, b3;
 
@@ -284,7 +284,7 @@
     col[56] = ((a0 - b0) >> COL_SHIFT);
 }
 
-void FUNC(ff_simple_idct_put)(uint8_t *dest_, int line_size, DCTELEM *block)
+void FUNC(ff_simple_idct_put)(uint8_t *dest_, int line_size, int16_t *block)
 {
     pixel *dest = (pixel *)dest_;
     int i;
@@ -298,7 +298,7 @@
         FUNC(idctSparseColPut)(dest + i, line_size, block + i);
 }
 
-void FUNC(ff_simple_idct_add)(uint8_t *dest_, int line_size, DCTELEM *block)
+void FUNC(ff_simple_idct_add)(uint8_t *dest_, int line_size, int16_t *block)
 {
     pixel *dest = (pixel *)dest_;
     int i;
@@ -312,7 +312,7 @@
         FUNC(idctSparseColAdd)(dest + i, line_size, block + i);
 }
 
-void FUNC(ff_simple_idct)(DCTELEM *block)
+void FUNC(ff_simple_idct)(int16_t *block)
 {
     int i;

libav-v9.6.tar.bz2/libavcodec/sipr.c -> libav-v10.1.tar.bz2/libavcodec/sipr.c Changed

@@ -26,11 +26,11 @@
 #include <string.h>
 
 #include "libavutil/channel_layout.h"
+#include "libavutil/float_dsp.h"
 #include "libavutil/mathematics.h"
 #include "avcodec.h"
 #define BITSTREAM_READER_LE
 #include "get_bits.h"
-#include "dsputil.h"
 #include "internal.h"
 
 #include "lsp.h"
@@ -240,7 +240,7 @@
 float tmp1[SUBFR_SIZE+1], tmp2[LP_FILTER_ORDER+1];
 int i;
 
- tmp1[0] = 1.;
+ tmp1[0] = 1.0;
 for (i = 0; i < LP_FILTER_ORDER; i++) {
 tmp1[i+1] = Az[i] * ff_pow_0_55[i];
 tmp2[i ] = Az[i] * ff_pow_0_7 [i];
@@ -411,9 +411,10 @@
 convolute_with_sparse(fixed_vector, &fixed_cb, impulse_response,
 SUBFR_SIZE);
 
- avg_energy =
- (0.01 + ff_scalarproduct_float_c(fixed_vector, fixed_vector, SUBFR_SIZE)) /
- SUBFR_SIZE;
+ avg_energy = (0.01 + avpriv_scalarproduct_float_c(fixed_vector,
+ fixed_vector,
+ SUBFR_SIZE)) /
+ SUBFR_SIZE;
 
 ctx->past_pitch_gain = pitch_gain = gain_cb[params->gc_index[i]][0];
 
@@ -454,9 +455,9 @@
 
 if (ctx->mode == MODE_5k0) {
 for (i = 0; i < subframe_count; i++) {
- float energy = ff_scalarproduct_float_c(ctx->postfilter_syn5k0 + LP_FILTER_ORDER + i * SUBFR_SIZE,
- ctx->postfilter_syn5k0 + LP_FILTER_ORDER + i * SUBFR_SIZE,
- SUBFR_SIZE);
+ float energy = avpriv_scalarproduct_float_c(ctx->postfilter_syn5k0 + LP_FILTER_ORDER + i * SUBFR_SIZE,
+ ctx->postfilter_syn5k0 + LP_FILTER_ORDER + i * SUBFR_SIZE,
+ SUBFR_SIZE);
 ff_adaptive_gain_control(&synth[i * SUBFR_SIZE],
 &synth[i * SUBFR_SIZE], energy,
 SUBFR_SIZE, 0.9, &ctx->postfilter_agc);
@@ -515,9 +516,6 @@
 avctx->channel_layout = AV_CH_LAYOUT_MONO;
 avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
 
- avcodec_get_frame_defaults(&ctx->frame);
- avctx->coded_frame = &ctx->frame;
-
 return 0;
 }
 
@@ -525,6 +523,7 @@
 int *got_frame_ptr, AVPacket *avpkt)
 {
 SiprContext *ctx = avctx->priv_data;
+ AVFrame *frame = data;
 const uint8_t *buf=avpkt->data;
 SiprParameters parm;
 const SiprModeParam *mode_par = &modes[ctx->mode];
@@ -542,13 +541,13 @@
 }
 
 /* get output buffer */
- ctx->frame.nb_samples = mode_par->frames_per_packet * subframe_size *
- mode_par->subframe_count;
- if ((ret = ff_get_buffer(avctx, &ctx->frame)) < 0) {
+ frame->nb_samples = mode_par->frames_per_packet * subframe_size *
+ mode_par->subframe_count;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- samples = (float *)ctx->frame.data[0];
+ samples = (float *)frame->data[0];
 
 init_get_bits(&gb, buf, mode_par->bits_per_frame);
 
@@ -560,19 +559,18 @@
 samples += subframe_size * mode_par->subframe_count;
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = ctx->frame;
+ *got_frame_ptr = 1;
 
 return mode_par->bits_per_frame >> 3;
 }
 
 AVCodec ff_sipr_decoder = {
 .name = "sipr",
+ .long_name = NULL_IF_CONFIG_SMALL("RealAudio SIPR / ACELP.NET"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_SIPR,
 .priv_data_size = sizeof(SiprContext),
 .init = sipr_decoder_init,
 .decode = sipr_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("RealAudio SIPR / ACELP.NET"),
 };

libav-v9.6.tar.bz2/libavcodec/sipr.h -> libav-v10.1.tar.bz2/libavcodec/sipr.h Changed

libav-v9.6.tar.bz2/libavcodec/sipr16k.c -> libav-v10.1.tar.bz2/libavcodec/sipr16k.c Changed

@@ -24,9 +24,10 @@
 #include <math.h>
 
 #include "sipr.h"
+#include "libavutil/attributes.h"
 #include "libavutil/common.h"
+#include "libavutil/float_dsp.h"
 #include "libavutil/mathematics.h"
-#include "dsputil.h"
 #include "lsp.h"
 #include "celp_filters.h"
 #include "acelp_vectors.h"
@@ -163,11 +164,11 @@
 const float *ma_prediction_coeff,
 int subframe_size, int ma_pred_order)
 {
- mr_energy +=
- ff_scalarproduct_float_c(quant_energy, ma_prediction_coeff, ma_pred_order);
+ mr_energy += avpriv_scalarproduct_float_c(quant_energy, ma_prediction_coeff,
+ ma_pred_order);
 
 mr_energy = gain_corr_factor * exp(M_LN10 / 20. * mr_energy) /
- sqrt((0.01 + ff_scalarproduct_float_c(fc_v, fc_v, subframe_size)));
+ sqrt((0.01 + avpriv_scalarproduct_float_c(fc_v, fc_v, subframe_size)));
 return mr_energy;
 }
 
@@ -268,7 +269,7 @@
 memcpy(ctx->iir_mem, Az[1], LP_FILTER_ORDER_16k * sizeof(float));
 }
 
-void ff_sipr_init_16k(SiprContext *ctx)
+av_cold void ff_sipr_init_16k(SiprContext *ctx)
 {
 int i;

libav-v9.6.tar.bz2/libavcodec/smacker.c -> libav-v10.1.tar.bz2/libavcodec/smacker.c Changed

@@ -48,7 +48,7 @@
 */
 typedef struct SmackVContext {
 AVCodecContext *avctx;
- AVFrame pic;
+ AVFrame *pic;
 
 int *mmap_tbl, *mclr_tbl, *full_tbl, *type_tbl;
 int mmap_last[3], mclr_last[3], full_last[3], type_last[3];
@@ -200,6 +200,11 @@
 tmp2.bits = av_mallocz(256 * 4);
 tmp2.lengths = av_mallocz(256 * sizeof(int));
 tmp2.values = av_mallocz(256 * sizeof(int));
+ if (!tmp1.bits || !tmp1.lengths || !tmp1.values ||
+ !tmp2.bits || !tmp2.lengths || !tmp2.values) {
+ err = AVERROR(ENOMEM);
+ goto error;
+ }
 
 if(get_bits1(gb)) {
 smacker_decode_tree(gb, &tmp1, 0, 0);
@@ -209,7 +214,8 @@
 tmp1.bits, sizeof(uint32_t), sizeof(uint32_t), INIT_VLC_LE);
 if(res < 0) {
 av_log(smk->avctx, AV_LOG_ERROR, "Cannot build VLC table\n");
- return -1;
+ err = res;
+ goto error;
 }
 } else {
 av_log(smk->avctx, AV_LOG_ERROR, "Skipping low bytes tree\n");
@@ -222,7 +228,8 @@
 tmp2.bits, sizeof(uint32_t), sizeof(uint32_t), INIT_VLC_LE);
 if(res < 0) {
 av_log(smk->avctx, AV_LOG_ERROR, "Cannot build VLC table\n");
- return -1;
+ err = res;
+ goto error;
 }
 } else {
 av_log(smk->avctx, AV_LOG_ERROR, "Skipping high bytes tree\n");
@@ -246,10 +253,14 @@
 ctx.recode2 = tmp2.values;
 ctx.last = last;
 
- huff.length = ((size + 3) >> 2) + 3;
+ huff.length = ((size + 3) >> 2) + 4;
 huff.maxlength = 0;
 huff.current = 0;
 huff.values = av_mallocz(huff.length * sizeof(int));
+ if (!huff.values) {
+ err = AVERROR(ENOMEM);
+ goto error;
+ }
 
 if (smacker_decode_bigtree(gb, &huff, &ctx) < 0)
 err = -1;
@@ -257,9 +268,16 @@
 if(ctx.last[0] == -1) ctx.last[0] = huff.current++;
 if(ctx.last[1] == -1) ctx.last[1] = huff.current++;
 if(ctx.last[2] == -1) ctx.last[2] = huff.current++;
+ if (ctx.last[0] >= huff.length ||
+ ctx.last[1] >= huff.length ||
+ ctx.last[2] >= huff.length) {
+ av_log(smk->avctx, AV_LOG_ERROR, "Huffman codes out of range\n");
+ err = AVERROR_INVALIDDATA;
+ }
 
 *recodes = huff.values;
 
+error:
 if(vlc[0].table)
 ff_free_vlc(&vlc[0]);
 if(vlc[1].table)
@@ -288,6 +306,8 @@
 if(!get_bits1(&gb)) {
 av_log(smk->avctx, AV_LOG_INFO, "Skipping MMAP tree\n");
 smk->mmap_tbl = av_malloc(sizeof(int) * 2);
+ if (!smk->mmap_tbl)
+ return AVERROR(ENOMEM);
 smk->mmap_tbl[0] = 0;
 smk->mmap_last[0] = smk->mmap_last[1] = smk->mmap_last[2] = 1;
 } else {
@@ -297,6 +317,8 @@
 if(!get_bits1(&gb)) {
 av_log(smk->avctx, AV_LOG_INFO, "Skipping MCLR tree\n");
 smk->mclr_tbl = av_malloc(sizeof(int) * 2);
+ if (!smk->mclr_tbl)
+ return AVERROR(ENOMEM);
 smk->mclr_tbl[0] = 0;
 smk->mclr_last[0] = smk->mclr_last[1] = smk->mclr_last[2] = 1;
 } else {
@@ -306,6 +328,8 @@
 if(!get_bits1(&gb)) {
 av_log(smk->avctx, AV_LOG_INFO, "Skipping FULL tree\n");
 smk->full_tbl = av_malloc(sizeof(int) * 2);
+ if (!smk->full_tbl)
+ return AVERROR(ENOMEM);
 smk->full_tbl[0] = 0;
 smk->full_last[0] = smk->full_last[1] = smk->full_last[2] = 1;
 } else {
@@ -315,6 +339,8 @@
 if(!get_bits1(&gb)) {
 av_log(smk->avctx, AV_LOG_INFO, "Skipping TYPE tree\n");
 smk->type_tbl = av_malloc(sizeof(int) * 2);
+ if (!smk->type_tbl)
+ return AVERROR(ENOMEM);
 smk->type_tbl[0] = 0;
 smk->type_last[0] = smk->type_last[1] = smk->type_last[2] = 1;
 } else {
@@ -358,30 +384,28 @@
 GetByteContext gb2;
 GetBitContext gb;
 int blocks, blk, bw, bh;
- int i;
+ int i, ret;
 int stride;
 int flags;
 
 if (avpkt->size <= 769)
 return 0;
 
- smk->pic.reference = 1;
- smk->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if(avctx->reget_buffer(avctx, &smk->pic) < 0){
+ if ((ret = ff_reget_buffer(avctx, smk->pic)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 /* make the palette available on the way out */
- pal = (uint32_t*)smk->pic.data[1];
+ pal = (uint32_t*)smk->pic->data[1];
 bytestream2_init(&gb2, avpkt->data, avpkt->size);
 flags = bytestream2_get_byteu(&gb2);
- smk->pic.palette_has_changed = flags & 1;
- smk->pic.key_frame = !!(flags & 2);
- if(smk->pic.key_frame)
- smk->pic.pict_type = AV_PICTURE_TYPE_I;
+ smk->pic->palette_has_changed = flags & 1;
+ smk->pic->key_frame = !!(flags & 2);
+ if(smk->pic->key_frame)
+ smk->pic->pict_type = AV_PICTURE_TYPE_I;
 else
- smk->pic.pict_type = AV_PICTURE_TYPE_P;
+ smk->pic->pict_type = AV_PICTURE_TYPE_P;
 
 for(i = 0; i < 256; i++)
 *pal++ = bytestream2_get_be24u(&gb2);
@@ -396,8 +420,8 @@
 bw = avctx->width >> 2;
 bh = avctx->height >> 2;
 blocks = bw * bh;
- out = smk->pic.data[0];
- stride = smk->pic.linesize[0];
+ out = smk->pic->data[0];
+ stride = smk->pic->linesize[0];
 while(blk < blocks) {
 int type, run, mode;
 uint16_t pix;
@@ -411,7 +435,7 @@
 int hi, lo;
 clr = smk_get_code(&gb, smk->mclr_tbl, smk->mclr_last);
 map = smk_get_code(&gb, smk->mmap_tbl, smk->mmap_last);
- out = smk->pic.data[0] + (blk / bw) * (stride * 4) + (blk % bw) * 4;
+ out = smk->pic->data[0] + (blk / bw) * (stride * 4) + (blk % bw) * 4;
 hi = clr >> 8;
 lo = clr & 0xFF;
 for(i = 0; i < 4; i++) {
@@ -432,7 +456,7 @@
 else if(get_bits1(&gb)) mode = 2;
 }
 while(run-- && blk < blocks){
- out = smk->pic.data[0] + (blk / bw) * (stride * 4) + (blk % bw) * 4;
+ out = smk->pic->data[0] + (blk / bw) * (stride * 4) + (blk % bw) * 4;
 switch(mode){
 case 0:
 for(i = 0; i < 4; i++) {
@@ -484,7 +508,7 @@
 mode = type >> 8;
 while(run-- && blk < blocks){
 uint32_t col;
- out = smk->pic.data[0] + (blk / bw) * (stride * 4) + (blk % bw) * 4;
+ out = smk->pic->data[0] + (blk / bw) * (stride * 4) + (blk % bw) * 4;
 col = mode * 0x01010101;
 for(i = 0; i < 4; i++) {
 *((uint32_t*)out) = col;
@@ -497,8 +521,10 @@
 
 }
 
+ if ((ret = av_frame_ref(data, smk->pic)) < 0)
+ return ret;
+
 *got_frame = 1;
- *(AVFrame*)data = smk->pic;
 
 /* always report that the buffer was completely consumed */
 return avpkt->size;
@@ -508,6 +534,26 @@
 
 /*
 *
+ * Uninit smacker decoder
+ *
+ */
+static av_cold int decode_end(AVCodecContext *avctx)
+{
+ SmackVContext * const smk = avctx->priv_data;
+
+ av_freep(&smk->mmap_tbl);
+ av_freep(&smk->mclr_tbl);
+ av_freep(&smk->full_tbl);
+ av_freep(&smk->type_tbl);
+
+ av_frame_free(&smk->pic);
+
+ return 0;
+}
+
+
+/*
+ *
 * Init smacker decoder
 *
 */
@@ -519,6 +565,9 @@
 
 avctx->pix_fmt = AV_PIX_FMT_PAL8;
 
+ c->pic = av_frame_alloc();
+ if (!c->pic)
+ return AVERROR(ENOMEM);
 
 /* decode huffman trees from extradata */
 if(avctx->extradata_size < 16){
@@ -526,43 +575,18 @@
 return -1;
 }
 
- if (decode_header_trees(c))
+ if (decode_header_trees(c)) {
+ decode_end(avctx);
 return -1;
+ }
 
 return 0;
 }
 
 
 
-/*
- *
- * Uninit smacker decoder
- *
- */
-static av_cold int decode_end(AVCodecContext *avctx)
-{
- SmackVContext * const smk = avctx->priv_data;
-
- av_freep(&smk->mmap_tbl);
- av_freep(&smk->mclr_tbl);
- av_freep(&smk->full_tbl);
- av_freep(&smk->type_tbl);
-
- if (smk->pic.data[0])
- avctx->release_buffer(avctx, &smk->pic);
-
- return 0;
-}
-
-
-typedef struct SmackerAudioContext {
- AVFrame frame;
-} SmackerAudioContext;
-
 static av_cold int smka_decode_init(AVCodecContext *avctx)
 {
- SmackerAudioContext *s = avctx->priv_data;
-
 if (avctx->channels < 1 || avctx->channels > 2) {
 av_log(avctx, AV_LOG_ERROR, "invalid number of channels\n");
 return AVERROR(EINVAL);
@@ -570,9 +594,6 @@
 avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO;
 avctx->sample_fmt = avctx->bits_per_coded_sample == 8 ? AV_SAMPLE_FMT_U8 : AV_SAMPLE_FMT_S16;
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
@@ -582,7 +603,7 @@
 static int smka_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
- SmackerAudioContext *s = avctx->priv_data;
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 GetBitContext gb;
@@ -622,13 +643,13 @@
 }
 
 /* get output buffer */
- s->frame.nb_samples = unp_size / (avctx->channels * (bits + 1));
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = unp_size / (avctx->channels * (bits + 1));
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- samples = (int16_t *)s->frame.data[0];
- samples8 = s->frame.data[0];
+ samples = (int16_t *)frame->data[0];
+ samples8 = frame->data[0];
 
 // Initialize
 for(i = 0; i < (1 << (bits + stereo)); i++) {
@@ -638,8 +659,15 @@
 h[i].bits = av_mallocz(256 * 4);
 h[i].lengths = av_mallocz(256 * sizeof(int));
 h[i].values = av_mallocz(256 * sizeof(int));
+ if (!h[i].bits || !h[i].lengths || !h[i].values) {
+ ret = AVERROR(ENOMEM);
+ goto error;
+ }
 skip_bits1(&gb);
- smacker_decode_tree(&gb, &h[i], 0, 0);
+ if (smacker_decode_tree(&gb, &h[i], 0, 0) < 0) {
+ ret = AVERROR_INVALIDDATA;
+ goto error;
+ }
 skip_bits1(&gb);
 if(h[i].current > 1) {
 res = init_vlc(&vlc[i], SMKTREE_BITS, h[i].length,
@@ -647,10 +675,12 @@
 h[i].bits, sizeof(uint32_t), sizeof(uint32_t), INIT_VLC_LE);
 if(res < 0) {
 av_log(avctx, AV_LOG_ERROR, "Cannot build VLC table\n");
- return -1;
+ ret = AVERROR_INVALIDDATA;
+ goto error;
 }
 }
 }
+ /* this codec relies on wraparound instead of clipping audio */
 if(bits) { //decode 16-bit data
 for(i = stereo; i >= 0; i--)
 pred[i] = sign_extend(av_bswap16(get_bits(&gb, 16)), 16);
@@ -669,7 +699,7 @@
 res = 0;
 val |= h[3].values[res] << 8;
 pred[1] += sign_extend(val, 16);
- *samples++ = av_clip_int16(pred[1]);
+ *samples++ = pred[1];
 } else {
 if(vlc[0].table)
 res = get_vlc2(&gb, vlc[0].table, SMKTREE_BITS, 3);
@@ -682,7 +712,7 @@
 res = 0;
 val |= h[1].values[res] << 8;
 pred[0] += sign_extend(val, 16);
- *samples++ = av_clip_int16(pred[0]);
+ *samples++ = pred[0];
 }
 }
 } else { //8-bit data
@@ -697,18 +727,22 @@
 else
 res = 0;
 pred[1] += sign_extend(h[1].values[res], 8);
- *samples8++ = av_clip_uint8(pred[1]);
+ *samples8++ = pred[1];
 } else {
 if(vlc[0].table)
 res = get_vlc2(&gb, vlc[0].table, SMKTREE_BITS, 3);
 else
 res = 0;
 pred[0] += sign_extend(h[0].values[res], 8);
- *samples8++ = av_clip_uint8(pred[0]);
+ *samples8++ = pred[0];
 }
 }
 }
 
+ *got_frame_ptr = 1;
+ ret = buf_size;
+
+error:
 for(i = 0; i < 4; i++) {
 if(vlc[i].table)
 ff_free_vlc(&vlc[i]);
@@ -717,14 +751,12 @@
 av_free(h[i].values);
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
-
- return buf_size;
+ return ret;
 }
 
 AVCodec ff_smacker_decoder = {
 .name = "smackvid",
+ .long_name = NULL_IF_CONFIG_SMALL("Smacker video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_SMACKVIDEO,
 .priv_data_size = sizeof(SmackVContext),
@@ -732,16 +764,14 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Smacker video"),
 };
 
 AVCodec ff_smackaud_decoder = {
 .name = "smackaud",
+ .long_name = NULL_IF_CONFIG_SMALL("Smacker audio"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_SMACKAUDIO,
- .priv_data_size = sizeof(SmackerAudioContext),
 .init = smka_decode_init,
 .decode = smka_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Smacker audio"),
 };

libav-v9.6.tar.bz2/libavcodec/smc.c -> libav-v10.1.tar.bz2/libavcodec/smc.c Changed

@@ -35,6 +35,7 @@
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "bytestream.h"
+#include "internal.h"
 
 #define CPAIR 2
 #define CQUAD 4
@@ -45,7 +46,7 @@
 typedef struct SmcContext {
 
 AVCodecContext *avctx;
- AVFrame frame;
+ AVFrame *frame;
 
 GetByteContext gb;
 
@@ -80,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 = (int) (s->gb.buffer_end - s->gb.buffer_start);
@@ -91,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;
@@ -111,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);
@@ -401,7 +402,7 @@
 break;
 
 case 0xF0:
- av_log_missing_feature(s->avctx, "0xF0 opcode", 1);
+ avpriv_request_sample(s->avctx, "0xF0 opcode");
 break;
 }
 }
@@ -416,7 +417,9 @@
 s->avctx = avctx;
 avctx->pix_fmt = AV_PIX_FMT_PAL8;
 
- s->frame.data[0] = NULL;
+ s->frame = av_frame_alloc();
+ if (!s->frame)
+ return AVERROR(ENOMEM);
 
 return 0;
 }
@@ -429,26 +432,25 @@
 int buf_size = avpkt->size;
 SmcContext *s = avctx->priv_data;
 const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
+ int ret;
 
 bytestream2_init(&s->gb, buf, buf_size);
 
- s->frame.reference = 1;
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE |
- FF_BUFFER_HINTS_REUSABLE | FF_BUFFER_HINTS_READABLE;
- if (avctx->reget_buffer(avctx, &s->frame)) {
+ if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ 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;
- *(AVFrame*)data = s->frame;
+ if ((ret = av_frame_ref(data, s->frame)) < 0)
+ return ret;
 
 /* always report that the buffer was completely consumed */
 return buf_size;
@@ -458,14 +460,14 @@
 {
 SmcContext *s = avctx->priv_data;
 
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ av_frame_free(&s->frame);
 
 return 0;
 }
 
 AVCodec ff_smc_decoder = {
 .name = "smc",
+ .long_name = NULL_IF_CONFIG_SMALL("QuickTime Graphics (SMC)"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_SMC,
 .priv_data_size = sizeof(SmcContext),
@@ -473,5 +475,4 @@
 .close = smc_decode_end,
 .decode = smc_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("QuickTime Graphics (SMC)"),
 };

libav-v9.6.tar.bz2/libavcodec/sp5xdec.c -> libav-v10.1.tar.bz2/libavcodec/sp5xdec.c Changed

libav-v9.6.tar.bz2/libavcodec/sparc/Makefile -> libav-v10.1.tar.bz2/libavcodec/sparc/Makefile Changed

libav-v9.6.tar.bz2/libavcodec/sparc/dsputil_vis.c -> libav-v10.1.tar.bz2/libavcodec/sparc/dsputil_vis.c Changed

@@ -18,3993 +18,23 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-/* The *no_round* functions have been added by James A. Morrison, 2003,2004.
- The vis code from libmpeg2 was adapted for libavcodec by James A. Morrison.
- */
-
-#include "config.h"
-
-#include <inttypes.h>
-
+#include "libavutil/attributes.h"
 #include "libavcodec/dsputil.h"
-#include "libavutil/mem.h"
 #include "dsputil_vis.h"
-
 #include "vis.h"
 
-/* The trick used in some of this file is the formula from the MMX
- * motion comp code, which is:
- *
- * (x+y+1)>>1 == (x|y)-((x^y)>>1)
- *
- * This allows us to average 8 bytes at a time in a 64-bit FPU reg.
- * We avoid overflows by masking before we do the shift, and we
- * implement the shift by multiplying by 1/2 using mul8x16. So in
- * VIS this is (assume 'x' is in f0, 'y' is in f2, a repeating mask
- * of '0xfe' is in f4, a repeating mask of '0x7f' is in f6, and
- * the value 0x80808080 is in f8):
- *
- * fxor f0, f2, f10
- * fand f10, f4, f10
- * fmul8x16 f8, f10, f10
- * fand f10, f6, f10
- * for f0, f2, f12
- * fpsub16 f12, f10, f10
- */
-
-#define DUP4(x) {x, x, x, x}
-#define DUP8(x) {x, x, x, x, x, x, x, x}
-DECLARE_ALIGNED(8, static const int16_t, constants1)[] = DUP4 (1);
-DECLARE_ALIGNED(8, static const int16_t, constants2)[] = DUP4 (2);
-DECLARE_ALIGNED(8, static const int16_t, constants3)[] = DUP4 (3);
-DECLARE_ALIGNED(8, static const int16_t, constants6)[] = DUP4 (6);
-DECLARE_ALIGNED(8, static const int8_t, constants_fe)[] = DUP8 (0xfe);
-DECLARE_ALIGNED(8, static const int8_t, constants_7f)[] = DUP8 (0x7f);
-DECLARE_ALIGNED(8, static const int8_t, constants128)[] = DUP8 (128);
-DECLARE_ALIGNED(8, static const int16_t, constants256_512)[] =
- {256, 512, 256, 512};
-DECLARE_ALIGNED(8, static const int16_t, constants256_1024)[] =
- {256, 1024, 256, 1024};
-
-#define REF_0 0
-#define REF_0_1 1
-#define REF_2 2
-#define REF_2_1 3
-#define REF_4 4
-#define REF_4_1 5
-#define REF_6 6
-#define REF_6_1 7
-#define REF_S0 8
-#define REF_S0_1 9
-#define REF_S2 10
-#define REF_S2_1 11
-#define REF_S4 12
-#define REF_S4_1 13
-#define REF_S6 14
-#define REF_S6_1 15
-#define DST_0 16
-#define DST_1 17
-#define DST_2 18
-#define DST_3 19
-#define CONST_1 20
-#define CONST_2 20
-#define CONST_3 20
-#define CONST_6 20
-#define MASK_fe 20
-#define CONST_128 22
-#define CONST_256 22
-#define CONST_512 22
-#define CONST_1024 22
-#define TMP0 24
-#define TMP1 25
-#define TMP2 26
-#define TMP3 27
-#define TMP4 28
-#define TMP5 29
-#define ZERO 30
-#define MASK_7f 30
-
-#define TMP6 32
-#define TMP8 34
-#define TMP10 36
-#define TMP12 38
-#define TMP14 40
-#define TMP16 42
-#define TMP18 44
-#define TMP20 46
-#define TMP22 48
-#define TMP24 50
-#define TMP26 52
-#define TMP28 54
-#define TMP30 56
-#define TMP32 58
-
-static void MC_put_o_16_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- ref = vis_alignaddr(ref);
- do { /* 5 cycles */
- vis_ld64(ref[0], TMP0);
-
- vis_ld64_2(ref, 8, TMP2);
-
- vis_ld64_2(ref, 16, TMP4);
- ref += stride;
-
- vis_faligndata(TMP0, TMP2, REF_0);
- vis_st64(REF_0, dest[0]);
-
- vis_faligndata(TMP2, TMP4, REF_2);
- vis_st64_2(REF_2, dest, 8);
- dest += stride;
- } while (--height);
-}
-
-static void MC_put_o_8_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- ref = vis_alignaddr(ref);
- do { /* 4 cycles */
- vis_ld64(ref[0], TMP0);
-
- vis_ld64(ref[8], TMP2);
- ref += stride;
-
- /* stall */
-
- vis_faligndata(TMP0, TMP2, REF_0);
- vis_st64(REF_0, dest[0]);
- dest += stride;
- } while (--height);
-}
-
-
-static void MC_avg_o_16_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- int stride_8 = stride + 8;
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[0], TMP0);
-
- vis_ld64(ref[8], TMP2);
-
- vis_ld64(ref[16], TMP4);
-
- vis_ld64(dest[0], DST_0);
-
- vis_ld64(dest[8], DST_2);
-
- vis_ld64(constants_fe[0], MASK_fe);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64(constants_7f[0], MASK_7f);
- vis_faligndata(TMP2, TMP4, REF_2);
-
- vis_ld64(constants128[0], CONST_128);
-
- ref += stride;
- height = (height >> 1) - 1;
-
- do { /* 24 cycles */
- vis_ld64(ref[0], TMP0);
- vis_xor(DST_0, REF_0, TMP6);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_and(TMP6, MASK_fe, TMP6);
-
- vis_ld64_2(ref, 16, TMP4);
- ref += stride;
- vis_mul8x16(CONST_128, TMP6, TMP6);
- vis_xor(DST_2, REF_2, TMP8);
-
- vis_and(TMP8, MASK_fe, TMP8);
-
- vis_or(DST_0, REF_0, TMP10);
- vis_ld64_2(dest, stride, DST_0);
- vis_mul8x16(CONST_128, TMP8, TMP8);
-
- vis_or(DST_2, REF_2, TMP12);
- vis_ld64_2(dest, stride_8, DST_2);
-
- vis_ld64(ref[0], TMP14);
- vis_and(TMP6, MASK_7f, TMP6);
-
- vis_and(TMP8, MASK_7f, TMP8);
-
- vis_psub16(TMP10, TMP6, TMP6);
- vis_st64(TMP6, dest[0]);
-
- vis_psub16(TMP12, TMP8, TMP8);
- vis_st64_2(TMP8, dest, 8);
-
- dest += stride;
- vis_ld64_2(ref, 8, TMP16);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64_2(ref, 16, TMP18);
- vis_faligndata(TMP2, TMP4, REF_2);
- ref += stride;
-
- vis_xor(DST_0, REF_0, TMP20);
-
- vis_and(TMP20, MASK_fe, TMP20);
-
- vis_xor(DST_2, REF_2, TMP22);
- vis_mul8x16(CONST_128, TMP20, TMP20);
-
- vis_and(TMP22, MASK_fe, TMP22);
-
- vis_or(DST_0, REF_0, TMP24);
- vis_mul8x16(CONST_128, TMP22, TMP22);
-
- vis_or(DST_2, REF_2, TMP26);
-
- vis_ld64_2(dest, stride, DST_0);
- vis_faligndata(TMP14, TMP16, REF_0);
-
- vis_ld64_2(dest, stride_8, DST_2);
- vis_faligndata(TMP16, TMP18, REF_2);
-
- vis_and(TMP20, MASK_7f, TMP20);
-
- vis_and(TMP22, MASK_7f, TMP22);
-
- vis_psub16(TMP24, TMP20, TMP20);
- vis_st64(TMP20, dest[0]);
-
- vis_psub16(TMP26, TMP22, TMP22);
- vis_st64_2(TMP22, dest, 8);
- dest += stride;
- } while (--height);
-
- vis_ld64(ref[0], TMP0);
- vis_xor(DST_0, REF_0, TMP6);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_and(TMP6, MASK_fe, TMP6);
-
- vis_ld64_2(ref, 16, TMP4);
- vis_mul8x16(CONST_128, TMP6, TMP6);
- vis_xor(DST_2, REF_2, TMP8);
-
- vis_and(TMP8, MASK_fe, TMP8);
-
- vis_or(DST_0, REF_0, TMP10);
- vis_ld64_2(dest, stride, DST_0);
- vis_mul8x16(CONST_128, TMP8, TMP8);
-
- vis_or(DST_2, REF_2, TMP12);
- vis_ld64_2(dest, stride_8, DST_2);
-
- vis_ld64(ref[0], TMP14);
- vis_and(TMP6, MASK_7f, TMP6);
-
- vis_and(TMP8, MASK_7f, TMP8);
-
- vis_psub16(TMP10, TMP6, TMP6);
- vis_st64(TMP6, dest[0]);
-
- vis_psub16(TMP12, TMP8, TMP8);
- vis_st64_2(TMP8, dest, 8);
-
- dest += stride;
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_faligndata(TMP2, TMP4, REF_2);
-
- vis_xor(DST_0, REF_0, TMP20);
-
- vis_and(TMP20, MASK_fe, TMP20);
-
- vis_xor(DST_2, REF_2, TMP22);
- vis_mul8x16(CONST_128, TMP20, TMP20);
-
- vis_and(TMP22, MASK_fe, TMP22);
-
- vis_or(DST_0, REF_0, TMP24);
- vis_mul8x16(CONST_128, TMP22, TMP22);
-
- vis_or(DST_2, REF_2, TMP26);
-
- vis_and(TMP20, MASK_7f, TMP20);
-
- vis_and(TMP22, MASK_7f, TMP22);
-
- vis_psub16(TMP24, TMP20, TMP20);
- vis_st64(TMP20, dest[0]);
-
- vis_psub16(TMP26, TMP22, TMP22);
- vis_st64_2(TMP22, dest, 8);
-}
-
-static void MC_avg_o_8_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[0], TMP0);
-
- vis_ld64(ref[8], TMP2);
-
- vis_ld64(dest[0], DST_0);
-
- vis_ld64(constants_fe[0], MASK_fe);
-
- vis_ld64(constants_7f[0], MASK_7f);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64(constants128[0], CONST_128);
-
- ref += stride;
- height = (height >> 1) - 1;
-
- do { /* 12 cycles */
- vis_ld64(ref[0], TMP0);
- vis_xor(DST_0, REF_0, TMP4);
-
- vis_ld64(ref[8], TMP2);
- vis_and(TMP4, MASK_fe, TMP4);
-
- vis_or(DST_0, REF_0, TMP6);
- vis_ld64_2(dest, stride, DST_0);
- ref += stride;
- vis_mul8x16(CONST_128, TMP4, TMP4);
-
- vis_ld64(ref[0], TMP12);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64(ref[8], TMP2);
- vis_xor(DST_0, REF_0, TMP0);
- ref += stride;
-
- vis_and(TMP0, MASK_fe, TMP0);
-
- vis_and(TMP4, MASK_7f, TMP4);
-
- vis_psub16(TMP6, TMP4, TMP4);
- vis_st64(TMP4, dest[0]);
- dest += stride;
- vis_mul8x16(CONST_128, TMP0, TMP0);
-
- vis_or(DST_0, REF_0, TMP6);
- vis_ld64_2(dest, stride, DST_0);
-
- vis_faligndata(TMP12, TMP2, REF_0);
-
- vis_and(TMP0, MASK_7f, TMP0);
-
- vis_psub16(TMP6, TMP0, TMP4);
- vis_st64(TMP4, dest[0]);
- dest += stride;
- } while (--height);
-
- vis_ld64(ref[0], TMP0);
- vis_xor(DST_0, REF_0, TMP4);
-
- vis_ld64(ref[8], TMP2);
- vis_and(TMP4, MASK_fe, TMP4);
-
- vis_or(DST_0, REF_0, TMP6);
- vis_ld64_2(dest, stride, DST_0);
- vis_mul8x16(CONST_128, TMP4, TMP4);
-
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_xor(DST_0, REF_0, TMP0);
-
- vis_and(TMP0, MASK_fe, TMP0);
-
- vis_and(TMP4, MASK_7f, TMP4);
-
- vis_psub16(TMP6, TMP4, TMP4);
- vis_st64(TMP4, dest[0]);
- dest += stride;
- vis_mul8x16(CONST_128, TMP0, TMP0);
-
- vis_or(DST_0, REF_0, TMP6);
-
- vis_and(TMP0, MASK_7f, TMP0);
-
- vis_psub16(TMP6, TMP0, TMP4);
- vis_st64(TMP4, dest[0]);
-}
-
-static void MC_put_x_16_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- unsigned long off = (unsigned long) ref & 0x7;
- unsigned long off_plus_1 = off + 1;
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[0], TMP0);
-
- vis_ld64_2(ref, 8, TMP2);
-
- vis_ld64_2(ref, 16, TMP4);
-
- vis_ld64(constants_fe[0], MASK_fe);
-
- vis_ld64(constants_7f[0], MASK_7f);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64(constants128[0], CONST_128);
- vis_faligndata(TMP2, TMP4, REF_4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- vis_faligndata(TMP2, TMP4, REF_6);
- } else {
- vis_src1(TMP2, REF_2);
- vis_src1(TMP4, REF_6);
- }
-
- ref += stride;
- height = (height >> 1) - 1;
-
- do { /* 34 cycles */
- vis_ld64(ref[0], TMP0);
- vis_xor(REF_0, REF_2, TMP6);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_xor(REF_4, REF_6, TMP8);
-
- vis_ld64_2(ref, 16, TMP4);
- vis_and(TMP6, MASK_fe, TMP6);
- ref += stride;
-
- vis_ld64(ref[0], TMP14);
- vis_mul8x16(CONST_128, TMP6, TMP6);
- vis_and(TMP8, MASK_fe, TMP8);
-
- vis_ld64_2(ref, 8, TMP16);
- vis_mul8x16(CONST_128, TMP8, TMP8);
- vis_or(REF_0, REF_2, TMP10);
-
- vis_ld64_2(ref, 16, TMP18);
- ref += stride;
- vis_or(REF_4, REF_6, TMP12);
-
- vis_alignaddr_g0((void *)off);
-
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_faligndata(TMP2, TMP4, REF_4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- vis_faligndata(TMP2, TMP4, REF_6);
- } else {
- vis_src1(TMP2, REF_2);
- vis_src1(TMP4, REF_6);
- }
-
- vis_and(TMP6, MASK_7f, TMP6);
-
- vis_and(TMP8, MASK_7f, TMP8);
-
- vis_psub16(TMP10, TMP6, TMP6);
- vis_st64(TMP6, dest[0]);
-
- vis_psub16(TMP12, TMP8, TMP8);
- vis_st64_2(TMP8, dest, 8);
- dest += stride;
-
- vis_xor(REF_0, REF_2, TMP6);
-
- vis_xor(REF_4, REF_6, TMP8);
-
- vis_and(TMP6, MASK_fe, TMP6);
-
- vis_mul8x16(CONST_128, TMP6, TMP6);
- vis_and(TMP8, MASK_fe, TMP8);
-
- vis_mul8x16(CONST_128, TMP8, TMP8);
- vis_or(REF_0, REF_2, TMP10);
-
- vis_or(REF_4, REF_6, TMP12);
-
- vis_alignaddr_g0((void *)off);
-
- vis_faligndata(TMP14, TMP16, REF_0);
-
- vis_faligndata(TMP16, TMP18, REF_4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP14, TMP16, REF_2);
- vis_faligndata(TMP16, TMP18, REF_6);
- } else {
- vis_src1(TMP16, REF_2);
- vis_src1(TMP18, REF_6);
- }
-
- vis_and(TMP6, MASK_7f, TMP6);
-
- vis_and(TMP8, MASK_7f, TMP8);
-
- vis_psub16(TMP10, TMP6, TMP6);
- vis_st64(TMP6, dest[0]);
-
- vis_psub16(TMP12, TMP8, TMP8);
- vis_st64_2(TMP8, dest, 8);
- dest += stride;
- } while (--height);
-
- vis_ld64(ref[0], TMP0);
- vis_xor(REF_0, REF_2, TMP6);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_xor(REF_4, REF_6, TMP8);
-
- vis_ld64_2(ref, 16, TMP4);
- vis_and(TMP6, MASK_fe, TMP6);
-
- vis_mul8x16(CONST_128, TMP6, TMP6);
- vis_and(TMP8, MASK_fe, TMP8);
-
- vis_mul8x16(CONST_128, TMP8, TMP8);
- vis_or(REF_0, REF_2, TMP10);
-
- vis_or(REF_4, REF_6, TMP12);
-
- vis_alignaddr_g0((void *)off);
-
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_faligndata(TMP2, TMP4, REF_4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- vis_faligndata(TMP2, TMP4, REF_6);
- } else {
- vis_src1(TMP2, REF_2);
- vis_src1(TMP4, REF_6);
- }
-
- vis_and(TMP6, MASK_7f, TMP6);
-
- vis_and(TMP8, MASK_7f, TMP8);
-
- vis_psub16(TMP10, TMP6, TMP6);
- vis_st64(TMP6, dest[0]);
-
- vis_psub16(TMP12, TMP8, TMP8);
- vis_st64_2(TMP8, dest, 8);
- dest += stride;
-
- vis_xor(REF_0, REF_2, TMP6);
-
- vis_xor(REF_4, REF_6, TMP8);
-
- vis_and(TMP6, MASK_fe, TMP6);
-
- vis_mul8x16(CONST_128, TMP6, TMP6);
- vis_and(TMP8, MASK_fe, TMP8);
-
- vis_mul8x16(CONST_128, TMP8, TMP8);
- vis_or(REF_0, REF_2, TMP10);
-
- vis_or(REF_4, REF_6, TMP12);
-
- vis_and(TMP6, MASK_7f, TMP6);
-
- vis_and(TMP8, MASK_7f, TMP8);
-
- vis_psub16(TMP10, TMP6, TMP6);
- vis_st64(TMP6, dest[0]);
-
- vis_psub16(TMP12, TMP8, TMP8);
- vis_st64_2(TMP8, dest, 8);
-}
-
-static void MC_put_x_8_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- unsigned long off = (unsigned long) ref & 0x7;
- unsigned long off_plus_1 = off + 1;
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[0], TMP0);
-
- vis_ld64(ref[8], TMP2);
-
- vis_ld64(constants_fe[0], MASK_fe);
-
- vis_ld64(constants_7f[0], MASK_7f);
-
- vis_ld64(constants128[0], CONST_128);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- } else {
- vis_src1(TMP2, REF_2);
- }
-
- ref += stride;
- height = (height >> 1) - 1;
-
- do { /* 20 cycles */
- vis_ld64(ref[0], TMP0);
- vis_xor(REF_0, REF_2, TMP4);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_and(TMP4, MASK_fe, TMP4);
- ref += stride;
-
- vis_ld64(ref[0], TMP8);
- vis_or(REF_0, REF_2, TMP6);
- vis_mul8x16(CONST_128, TMP4, TMP4);
-
- vis_alignaddr_g0((void *)off);
-
- vis_ld64_2(ref, 8, TMP10);
- ref += stride;
- vis_faligndata(TMP0, TMP2, REF_0);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- } else {
- vis_src1(TMP2, REF_2);
- }
-
- vis_and(TMP4, MASK_7f, TMP4);
-
- vis_psub16(TMP6, TMP4, DST_0);
- vis_st64(DST_0, dest[0]);
- dest += stride;
-
- vis_xor(REF_0, REF_2, TMP12);
-
- vis_and(TMP12, MASK_fe, TMP12);
-
- vis_or(REF_0, REF_2, TMP14);
- vis_mul8x16(CONST_128, TMP12, TMP12);
-
- vis_alignaddr_g0((void *)off);
- vis_faligndata(TMP8, TMP10, REF_0);
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP8, TMP10, REF_2);
- } else {
- vis_src1(TMP10, REF_2);
- }
-
- vis_and(TMP12, MASK_7f, TMP12);
-
- vis_psub16(TMP14, TMP12, DST_0);
- vis_st64(DST_0, dest[0]);
- dest += stride;
- } while (--height);
-
- vis_ld64(ref[0], TMP0);
- vis_xor(REF_0, REF_2, TMP4);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_and(TMP4, MASK_fe, TMP4);
-
- vis_or(REF_0, REF_2, TMP6);
- vis_mul8x16(CONST_128, TMP4, TMP4);
-
- vis_alignaddr_g0((void *)off);
-
- vis_faligndata(TMP0, TMP2, REF_0);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- } else {
- vis_src1(TMP2, REF_2);
- }
-
- vis_and(TMP4, MASK_7f, TMP4);
-
- vis_psub16(TMP6, TMP4, DST_0);
- vis_st64(DST_0, dest[0]);
- dest += stride;
-
- vis_xor(REF_0, REF_2, TMP12);
-
- vis_and(TMP12, MASK_fe, TMP12);
-
- vis_or(REF_0, REF_2, TMP14);
- vis_mul8x16(CONST_128, TMP12, TMP12);
-
- vis_and(TMP12, MASK_7f, TMP12);
-
- vis_psub16(TMP14, TMP12, DST_0);
- vis_st64(DST_0, dest[0]);
- dest += stride;
-}
-
-static void MC_avg_x_16_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- unsigned long off = (unsigned long) ref & 0x7;
- unsigned long off_plus_1 = off + 1;
-
- vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
-
- vis_ld64(constants3[0], CONST_3);
- vis_fzero(ZERO);
- vis_ld64(constants256_512[0], CONST_256);
-
- ref = vis_alignaddr(ref);
- do { /* 26 cycles */
- vis_ld64(ref[0], TMP0);
-
- vis_ld64(ref[8], TMP2);
-
- vis_alignaddr_g0((void *)off);
-
- vis_ld64(ref[16], TMP4);
-
- vis_ld64(dest[0], DST_0);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64(dest[8], DST_2);
- vis_faligndata(TMP2, TMP4, REF_4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- vis_faligndata(TMP2, TMP4, REF_6);
- } else {
- vis_src1(TMP2, REF_2);
- vis_src1(TMP4, REF_6);
- }
-
- vis_mul8x16au(REF_0, CONST_256, TMP0);
-
- vis_pmerge(ZERO, REF_2, TMP4);
- vis_mul8x16au(REF_0_1, CONST_256, TMP2);
-
- vis_pmerge(ZERO, REF_2_1, TMP6);
-
- vis_padd16(TMP0, TMP4, TMP0);
-
- vis_mul8x16al(DST_0, CONST_512, TMP4);
- vis_padd16(TMP2, TMP6, TMP2);
-
- vis_mul8x16al(DST_1, CONST_512, TMP6);
-
- vis_mul8x16au(REF_6, CONST_256, TMP12);
-
- vis_padd16(TMP0, TMP4, TMP0);
- vis_mul8x16au(REF_6_1, CONST_256, TMP14);
-
- vis_padd16(TMP2, TMP6, TMP2);
- vis_mul8x16au(REF_4, CONST_256, TMP16);
-
- vis_padd16(TMP0, CONST_3, TMP8);
- vis_mul8x16au(REF_4_1, CONST_256, TMP18);
-
- vis_padd16(TMP2, CONST_3, TMP10);
- vis_pack16(TMP8, DST_0);
-
- vis_pack16(TMP10, DST_1);
- vis_padd16(TMP16, TMP12, TMP0);
-
- vis_st64(DST_0, dest[0]);
- vis_mul8x16al(DST_2, CONST_512, TMP4);
- vis_padd16(TMP18, TMP14, TMP2);
-
- vis_mul8x16al(DST_3, CONST_512, TMP6);
- vis_padd16(TMP0, CONST_3, TMP0);
-
- vis_padd16(TMP2, CONST_3, TMP2);
-
- vis_padd16(TMP0, TMP4, TMP0);
-
- vis_padd16(TMP2, TMP6, TMP2);
- vis_pack16(TMP0, DST_2);
-
- vis_pack16(TMP2, DST_3);
- vis_st64(DST_2, dest[8]);
-
- ref += stride;
- dest += stride;
- } while (--height);
-}
-
-static void MC_avg_x_8_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- unsigned long off = (unsigned long) ref & 0x7;
- unsigned long off_plus_1 = off + 1;
- int stride_times_2 = stride << 1;
-
- vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
-
- vis_ld64(constants3[0], CONST_3);
- vis_fzero(ZERO);
- vis_ld64(constants256_512[0], CONST_256);
-
- ref = vis_alignaddr(ref);
- height >>= 2;
- do { /* 47 cycles */
- vis_ld64(ref[0], TMP0);
-
- vis_ld64_2(ref, 8, TMP2);
- ref += stride;
-
- vis_alignaddr_g0((void *)off);
-
- vis_ld64(ref[0], TMP4);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64_2(ref, 8, TMP6);
- ref += stride;
-
- vis_ld64(ref[0], TMP8);
-
- vis_ld64_2(ref, 8, TMP10);
- ref += stride;
- vis_faligndata(TMP4, TMP6, REF_4);
-
- vis_ld64(ref[0], TMP12);
-
- vis_ld64_2(ref, 8, TMP14);
- ref += stride;
- vis_faligndata(TMP8, TMP10, REF_S0);
-
- vis_faligndata(TMP12, TMP14, REF_S4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
-
- vis_ld64(dest[0], DST_0);
- vis_faligndata(TMP0, TMP2, REF_2);
-
- vis_ld64_2(dest, stride, DST_2);
- vis_faligndata(TMP4, TMP6, REF_6);
-
- vis_faligndata(TMP8, TMP10, REF_S2);
-
- vis_faligndata(TMP12, TMP14, REF_S6);
- } else {
- vis_ld64(dest[0], DST_0);
- vis_src1(TMP2, REF_2);
-
- vis_ld64_2(dest, stride, DST_2);
- vis_src1(TMP6, REF_6);
-
- vis_src1(TMP10, REF_S2);
-
- vis_src1(TMP14, REF_S6);
- }
-
- vis_pmerge(ZERO, REF_0, TMP0);
- vis_mul8x16au(REF_0_1, CONST_256, TMP2);
-
- vis_pmerge(ZERO, REF_2, TMP4);
- vis_mul8x16au(REF_2_1, CONST_256, TMP6);
-
- vis_padd16(TMP0, CONST_3, TMP0);
- vis_mul8x16al(DST_0, CONST_512, TMP16);
-
- vis_padd16(TMP2, CONST_3, TMP2);
- vis_mul8x16al(DST_1, CONST_512, TMP18);
-
- vis_padd16(TMP0, TMP4, TMP0);
- vis_mul8x16au(REF_4, CONST_256, TMP8);
-
- vis_padd16(TMP2, TMP6, TMP2);
- vis_mul8x16au(REF_4_1, CONST_256, TMP10);
-
- vis_padd16(TMP0, TMP16, TMP0);
- vis_mul8x16au(REF_6, CONST_256, TMP12);
-
- vis_padd16(TMP2, TMP18, TMP2);
- vis_mul8x16au(REF_6_1, CONST_256, TMP14);
-
- vis_padd16(TMP8, CONST_3, TMP8);
- vis_mul8x16al(DST_2, CONST_512, TMP16);
-
- vis_padd16(TMP8, TMP12, TMP8);
- vis_mul8x16al(DST_3, CONST_512, TMP18);
-
- vis_padd16(TMP10, TMP14, TMP10);
- vis_pack16(TMP0, DST_0);
-
- vis_pack16(TMP2, DST_1);
- vis_st64(DST_0, dest[0]);
- dest += stride;
- vis_padd16(TMP10, CONST_3, TMP10);
-
- vis_ld64_2(dest, stride, DST_0);
- vis_padd16(TMP8, TMP16, TMP8);
-
- vis_ld64_2(dest, stride_times_2, TMP4/*DST_2*/);
- vis_padd16(TMP10, TMP18, TMP10);
- vis_pack16(TMP8, DST_2);
-
- vis_pack16(TMP10, DST_3);
- vis_st64(DST_2, dest[0]);
- dest += stride;
-
- vis_mul8x16au(REF_S0_1, CONST_256, TMP2);
- vis_pmerge(ZERO, REF_S0, TMP0);
-
- vis_pmerge(ZERO, REF_S2, TMP24);
- vis_mul8x16au(REF_S2_1, CONST_256, TMP6);
-
- vis_padd16(TMP0, CONST_3, TMP0);
- vis_mul8x16au(REF_S4, CONST_256, TMP8);
-
- vis_padd16(TMP2, CONST_3, TMP2);
- vis_mul8x16au(REF_S4_1, CONST_256, TMP10);
-
- vis_padd16(TMP0, TMP24, TMP0);
- vis_mul8x16au(REF_S6, CONST_256, TMP12);
-
- vis_padd16(TMP2, TMP6, TMP2);
- vis_mul8x16au(REF_S6_1, CONST_256, TMP14);
-
- vis_padd16(TMP8, CONST_3, TMP8);
- vis_mul8x16al(DST_0, CONST_512, TMP16);
-
- vis_padd16(TMP10, CONST_3, TMP10);
- vis_mul8x16al(DST_1, CONST_512, TMP18);
-
- vis_padd16(TMP8, TMP12, TMP8);
- vis_mul8x16al(TMP4/*DST_2*/, CONST_512, TMP20);
-
- vis_mul8x16al(TMP5/*DST_3*/, CONST_512, TMP22);
- vis_padd16(TMP0, TMP16, TMP0);
-
- vis_padd16(TMP2, TMP18, TMP2);
- vis_pack16(TMP0, DST_0);
-
- vis_padd16(TMP10, TMP14, TMP10);
- vis_pack16(TMP2, DST_1);
- vis_st64(DST_0, dest[0]);
- dest += stride;
-
- vis_padd16(TMP8, TMP20, TMP8);
-
- vis_padd16(TMP10, TMP22, TMP10);
- vis_pack16(TMP8, DST_2);
-
- vis_pack16(TMP10, DST_3);
- vis_st64(DST_2, dest[0]);
- dest += stride;
- } while (--height);
-}
-
-static void MC_put_y_16_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- ref = vis_alignaddr(ref);
- vis_ld64(ref[0], TMP0);
-
- vis_ld64_2(ref, 8, TMP2);
-
- vis_ld64_2(ref, 16, TMP4);
- ref += stride;
-
- vis_ld64(ref[0], TMP6);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64_2(ref, 8, TMP8);
- vis_faligndata(TMP2, TMP4, REF_4);
-
- vis_ld64_2(ref, 16, TMP10);
- ref += stride;
-
- vis_ld64(constants_fe[0], MASK_fe);
- vis_faligndata(TMP6, TMP8, REF_2);
-
- vis_ld64(constants_7f[0], MASK_7f);
- vis_faligndata(TMP8, TMP10, REF_6);
-
- vis_ld64(constants128[0], CONST_128);
- height = (height >> 1) - 1;
- do { /* 24 cycles */
- vis_ld64(ref[0], TMP0);
- vis_xor(REF_0, REF_2, TMP12);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_xor(REF_4, REF_6, TMP16);
-
- vis_ld64_2(ref, 16, TMP4);
- ref += stride;
- vis_or(REF_0, REF_2, TMP14);
-
- vis_ld64(ref[0], TMP6);
- vis_or(REF_4, REF_6, TMP18);
-
- vis_ld64_2(ref, 8, TMP8);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64_2(ref, 16, TMP10);
- ref += stride;
- vis_faligndata(TMP2, TMP4, REF_4);
-
- vis_and(TMP12, MASK_fe, TMP12);
-
- vis_and(TMP16, MASK_fe, TMP16);
- vis_mul8x16(CONST_128, TMP12, TMP12);
-
- vis_mul8x16(CONST_128, TMP16, TMP16);
- vis_xor(REF_0, REF_2, TMP0);
-
- vis_xor(REF_4, REF_6, TMP2);
-
- vis_or(REF_0, REF_2, TMP20);
-
- vis_and(TMP12, MASK_7f, TMP12);
-
- vis_and(TMP16, MASK_7f, TMP16);
-
- vis_psub16(TMP14, TMP12, TMP12);
- vis_st64(TMP12, dest[0]);
-
- vis_psub16(TMP18, TMP16, TMP16);
- vis_st64_2(TMP16, dest, 8);
- dest += stride;
-
- vis_or(REF_4, REF_6, TMP18);
-
- vis_and(TMP0, MASK_fe, TMP0);
-
- vis_and(TMP2, MASK_fe, TMP2);
- vis_mul8x16(CONST_128, TMP0, TMP0);
-
- vis_faligndata(TMP6, TMP8, REF_2);
- vis_mul8x16(CONST_128, TMP2, TMP2);
-
- vis_faligndata(TMP8, TMP10, REF_6);
-
- vis_and(TMP0, MASK_7f, TMP0);
-
- vis_and(TMP2, MASK_7f, TMP2);
-
- vis_psub16(TMP20, TMP0, TMP0);
- vis_st64(TMP0, dest[0]);
-
- vis_psub16(TMP18, TMP2, TMP2);
- vis_st64_2(TMP2, dest, 8);
- dest += stride;
- } while (--height);
-
- vis_ld64(ref[0], TMP0);
- vis_xor(REF_0, REF_2, TMP12);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_xor(REF_4, REF_6, TMP16);
-
- vis_ld64_2(ref, 16, TMP4);
- vis_or(REF_0, REF_2, TMP14);
-
- vis_or(REF_4, REF_6, TMP18);
-
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_faligndata(TMP2, TMP4, REF_4);
-
- vis_and(TMP12, MASK_fe, TMP12);
-
- vis_and(TMP16, MASK_fe, TMP16);
- vis_mul8x16(CONST_128, TMP12, TMP12);
-
- vis_mul8x16(CONST_128, TMP16, TMP16);
- vis_xor(REF_0, REF_2, TMP0);
-
- vis_xor(REF_4, REF_6, TMP2);
-
- vis_or(REF_0, REF_2, TMP20);
-
- vis_and(TMP12, MASK_7f, TMP12);
-
- vis_and(TMP16, MASK_7f, TMP16);
-
- vis_psub16(TMP14, TMP12, TMP12);
- vis_st64(TMP12, dest[0]);
-
- vis_psub16(TMP18, TMP16, TMP16);
- vis_st64_2(TMP16, dest, 8);
- dest += stride;
-
- vis_or(REF_4, REF_6, TMP18);
-
- vis_and(TMP0, MASK_fe, TMP0);
-
- vis_and(TMP2, MASK_fe, TMP2);
- vis_mul8x16(CONST_128, TMP0, TMP0);
-
- vis_mul8x16(CONST_128, TMP2, TMP2);
-
- vis_and(TMP0, MASK_7f, TMP0);
-
- vis_and(TMP2, MASK_7f, TMP2);
-
- vis_psub16(TMP20, TMP0, TMP0);
- vis_st64(TMP0, dest[0]);
-
- vis_psub16(TMP18, TMP2, TMP2);
- vis_st64_2(TMP2, dest, 8);
-}
-
-static void MC_put_y_8_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- ref = vis_alignaddr(ref);
- vis_ld64(ref[0], TMP0);
-
- vis_ld64_2(ref, 8, TMP2);
- ref += stride;
-
- vis_ld64(ref[0], TMP4);
-
- vis_ld64_2(ref, 8, TMP6);
- ref += stride;
-
- vis_ld64(constants_fe[0], MASK_fe);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64(constants_7f[0], MASK_7f);
- vis_faligndata(TMP4, TMP6, REF_2);
-
- vis_ld64(constants128[0], CONST_128);
- height = (height >> 1) - 1;
- do { /* 12 cycles */
- vis_ld64(ref[0], TMP0);
- vis_xor(REF_0, REF_2, TMP4);
-
- vis_ld64_2(ref, 8, TMP2);
- ref += stride;
- vis_and(TMP4, MASK_fe, TMP4);
-
- vis_or(REF_0, REF_2, TMP6);
- vis_mul8x16(CONST_128, TMP4, TMP4);
-
- vis_faligndata(TMP0, TMP2, REF_0);
- vis_ld64(ref[0], TMP0);
-
- vis_ld64_2(ref, 8, TMP2);
- ref += stride;
- vis_xor(REF_0, REF_2, TMP12);
-
- vis_and(TMP4, MASK_7f, TMP4);
-
- vis_and(TMP12, MASK_fe, TMP12);
-
- vis_mul8x16(CONST_128, TMP12, TMP12);
- vis_or(REF_0, REF_2, TMP14);
-
- vis_psub16(TMP6, TMP4, DST_0);
- vis_st64(DST_0, dest[0]);
- dest += stride;
-
- vis_faligndata(TMP0, TMP2, REF_2);
-
- vis_and(TMP12, MASK_7f, TMP12);
-
- vis_psub16(TMP14, TMP12, DST_0);
- vis_st64(DST_0, dest[0]);
- dest += stride;
- } while (--height);
-
- vis_ld64(ref[0], TMP0);
- vis_xor(REF_0, REF_2, TMP4);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_and(TMP4, MASK_fe, TMP4);
-
- vis_or(REF_0, REF_2, TMP6);
- vis_mul8x16(CONST_128, TMP4, TMP4);
-
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_xor(REF_0, REF_2, TMP12);
-
- vis_and(TMP4, MASK_7f, TMP4);
-
- vis_and(TMP12, MASK_fe, TMP12);
-
- vis_mul8x16(CONST_128, TMP12, TMP12);
- vis_or(REF_0, REF_2, TMP14);
-
- vis_psub16(TMP6, TMP4, DST_0);
- vis_st64(DST_0, dest[0]);
- dest += stride;
-
- vis_and(TMP12, MASK_7f, TMP12);
-
- vis_psub16(TMP14, TMP12, DST_0);
- vis_st64(DST_0, dest[0]);
-}
-
-static void MC_avg_y_16_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- int stride_8 = stride + 8;
- int stride_16 = stride + 16;
-
- vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[ 0], TMP0);
- vis_fzero(ZERO);
-
- vis_ld64(ref[ 8], TMP2);
-
- vis_ld64(ref[16], TMP4);
-
- vis_ld64(constants3[0], CONST_3);
- vis_faligndata(TMP0, TMP2, REF_2);
-
- vis_ld64(constants256_512[0], CONST_256);
- vis_faligndata(TMP2, TMP4, REF_6);
- height >>= 1;
-
- do { /* 31 cycles */
- vis_ld64_2(ref, stride, TMP0);
- vis_pmerge(ZERO, REF_2, TMP12);
- vis_mul8x16au(REF_2_1, CONST_256, TMP14);
-
- vis_ld64_2(ref, stride_8, TMP2);
- vis_pmerge(ZERO, REF_6, TMP16);
- vis_mul8x16au(REF_6_1, CONST_256, TMP18);
-
- vis_ld64_2(ref, stride_16, TMP4);
- ref += stride;
-
- vis_ld64(dest[0], DST_0);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64_2(dest, 8, DST_2);
- vis_faligndata(TMP2, TMP4, REF_4);
-
- vis_ld64_2(ref, stride, TMP6);
- vis_pmerge(ZERO, REF_0, TMP0);
- vis_mul8x16au(REF_0_1, CONST_256, TMP2);
-
- vis_ld64_2(ref, stride_8, TMP8);
- vis_pmerge(ZERO, REF_4, TMP4);
-
- vis_ld64_2(ref, stride_16, TMP10);
- ref += stride;
-
- vis_ld64_2(dest, stride, REF_S0/*DST_4*/);
- vis_faligndata(TMP6, TMP8, REF_2);
- vis_mul8x16au(REF_4_1, CONST_256, TMP6);
-
- vis_ld64_2(dest, stride_8, REF_S2/*DST_6*/);
- vis_faligndata(TMP8, TMP10, REF_6);
- vis_mul8x16al(DST_0, CONST_512, TMP20);
-
- vis_padd16(TMP0, CONST_3, TMP0);
- vis_mul8x16al(DST_1, CONST_512, TMP22);
-
- vis_padd16(TMP2, CONST_3, TMP2);
- vis_mul8x16al(DST_2, CONST_512, TMP24);
-
- vis_padd16(TMP4, CONST_3, TMP4);
- vis_mul8x16al(DST_3, CONST_512, TMP26);
-
- vis_padd16(TMP6, CONST_3, TMP6);
-
- vis_padd16(TMP12, TMP20, TMP12);
- vis_mul8x16al(REF_S0, CONST_512, TMP20);
-
- vis_padd16(TMP14, TMP22, TMP14);
- vis_mul8x16al(REF_S0_1, CONST_512, TMP22);
-
- vis_padd16(TMP16, TMP24, TMP16);
- vis_mul8x16al(REF_S2, CONST_512, TMP24);
-
- vis_padd16(TMP18, TMP26, TMP18);
- vis_mul8x16al(REF_S2_1, CONST_512, TMP26);
-
- vis_padd16(TMP12, TMP0, TMP12);
- vis_mul8x16au(REF_2, CONST_256, TMP28);
-
- vis_padd16(TMP14, TMP2, TMP14);
- vis_mul8x16au(REF_2_1, CONST_256, TMP30);
-
- vis_padd16(TMP16, TMP4, TMP16);
- vis_mul8x16au(REF_6, CONST_256, REF_S4);
-
- vis_padd16(TMP18, TMP6, TMP18);
- vis_mul8x16au(REF_6_1, CONST_256, REF_S6);
-
- vis_pack16(TMP12, DST_0);
- vis_padd16(TMP28, TMP0, TMP12);
-
- vis_pack16(TMP14, DST_1);
- vis_st64(DST_0, dest[0]);
- vis_padd16(TMP30, TMP2, TMP14);
-
- vis_pack16(TMP16, DST_2);
- vis_padd16(REF_S4, TMP4, TMP16);
-
- vis_pack16(TMP18, DST_3);
- vis_st64_2(DST_2, dest, 8);
- dest += stride;
- vis_padd16(REF_S6, TMP6, TMP18);
-
- vis_padd16(TMP12, TMP20, TMP12);
-
- vis_padd16(TMP14, TMP22, TMP14);
- vis_pack16(TMP12, DST_0);
-
- vis_padd16(TMP16, TMP24, TMP16);
- vis_pack16(TMP14, DST_1);
- vis_st64(DST_0, dest[0]);
-
- vis_padd16(TMP18, TMP26, TMP18);
- vis_pack16(TMP16, DST_2);
-
- vis_pack16(TMP18, DST_3);
- vis_st64_2(DST_2, dest, 8);
- dest += stride;
- } while (--height);
-}
-
-static void MC_avg_y_8_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- int stride_8 = stride + 8;
-
- vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[ 0], TMP0);
- vis_fzero(ZERO);
-
- vis_ld64(ref[ 8], TMP2);
-
- vis_ld64(constants3[0], CONST_3);
- vis_faligndata(TMP0, TMP2, REF_2);
-
- vis_ld64(constants256_512[0], CONST_256);
-
- height >>= 1;
- do { /* 20 cycles */
- vis_ld64_2(ref, stride, TMP0);
- vis_pmerge(ZERO, REF_2, TMP8);
- vis_mul8x16au(REF_2_1, CONST_256, TMP10);
-
- vis_ld64_2(ref, stride_8, TMP2);
- ref += stride;
-
- vis_ld64(dest[0], DST_0);
-
- vis_ld64_2(dest, stride, DST_2);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64_2(ref, stride, TMP4);
- vis_mul8x16al(DST_0, CONST_512, TMP16);
- vis_pmerge(ZERO, REF_0, TMP12);
-
- vis_ld64_2(ref, stride_8, TMP6);
- ref += stride;
- vis_mul8x16al(DST_1, CONST_512, TMP18);
- vis_pmerge(ZERO, REF_0_1, TMP14);
-
- vis_padd16(TMP12, CONST_3, TMP12);
- vis_mul8x16al(DST_2, CONST_512, TMP24);
-
- vis_padd16(TMP14, CONST_3, TMP14);
- vis_mul8x16al(DST_3, CONST_512, TMP26);
-
- vis_faligndata(TMP4, TMP6, REF_2);
-
- vis_padd16(TMP8, TMP12, TMP8);
-
- vis_padd16(TMP10, TMP14, TMP10);
- vis_mul8x16au(REF_2, CONST_256, TMP20);
-
- vis_padd16(TMP8, TMP16, TMP0);
- vis_mul8x16au(REF_2_1, CONST_256, TMP22);
-
- vis_padd16(TMP10, TMP18, TMP2);
- vis_pack16(TMP0, DST_0);
-
- vis_pack16(TMP2, DST_1);
- vis_st64(DST_0, dest[0]);
- dest += stride;
- vis_padd16(TMP12, TMP20, TMP12);
-
- vis_padd16(TMP14, TMP22, TMP14);
-
- vis_padd16(TMP12, TMP24, TMP0);
-
- vis_padd16(TMP14, TMP26, TMP2);
- vis_pack16(TMP0, DST_2);
-
- vis_pack16(TMP2, DST_3);
- vis_st64(DST_2, dest[0]);
- dest += stride;
- } while (--height);
-}
-
-static void MC_put_xy_16_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- unsigned long off = (unsigned long) ref & 0x7;
- unsigned long off_plus_1 = off + 1;
- int stride_8 = stride + 8;
- int stride_16 = stride + 16;
-
- vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[ 0], TMP0);
- vis_fzero(ZERO);
-
- vis_ld64(ref[ 8], TMP2);
-
- vis_ld64(ref[16], TMP4);
-
- vis_ld64(constants2[0], CONST_2);
- vis_faligndata(TMP0, TMP2, REF_S0);
-
- vis_ld64(constants256_512[0], CONST_256);
- vis_faligndata(TMP2, TMP4, REF_S4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_S2);
- vis_faligndata(TMP2, TMP4, REF_S6);
- } else {
- vis_src1(TMP2, REF_S2);
- vis_src1(TMP4, REF_S6);
- }
-
- height >>= 1;
- do {
- vis_ld64_2(ref, stride, TMP0);
- vis_mul8x16au(REF_S0, CONST_256, TMP12);
- vis_pmerge(ZERO, REF_S0_1, TMP14);
-
- vis_alignaddr_g0((void *)off);
-
- vis_ld64_2(ref, stride_8, TMP2);
- vis_mul8x16au(REF_S2, CONST_256, TMP16);
- vis_pmerge(ZERO, REF_S2_1, TMP18);
-
- vis_ld64_2(ref, stride_16, TMP4);
- ref += stride;
- vis_mul8x16au(REF_S4, CONST_256, TMP20);
- vis_pmerge(ZERO, REF_S4_1, TMP22);
-
- vis_ld64_2(ref, stride, TMP6);
- vis_mul8x16au(REF_S6, CONST_256, TMP24);
- vis_pmerge(ZERO, REF_S6_1, TMP26);
-
- vis_ld64_2(ref, stride_8, TMP8);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64_2(ref, stride_16, TMP10);
- ref += stride;
- vis_faligndata(TMP2, TMP4, REF_4);
-
- vis_faligndata(TMP6, TMP8, REF_S0);
-
- vis_faligndata(TMP8, TMP10, REF_S4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- vis_faligndata(TMP2, TMP4, REF_6);
- vis_faligndata(TMP6, TMP8, REF_S2);
- vis_faligndata(TMP8, TMP10, REF_S6);
- } else {
- vis_src1(TMP2, REF_2);
- vis_src1(TMP4, REF_6);
- vis_src1(TMP8, REF_S2);
- vis_src1(TMP10, REF_S6);
- }
-
- vis_mul8x16au(REF_0, CONST_256, TMP0);
- vis_pmerge(ZERO, REF_0_1, TMP2);
-
- vis_mul8x16au(REF_2, CONST_256, TMP4);
- vis_pmerge(ZERO, REF_2_1, TMP6);
-
- vis_padd16(TMP0, CONST_2, TMP8);
- vis_mul8x16au(REF_4, CONST_256, TMP0);
-
- vis_padd16(TMP2, CONST_2, TMP10);
- vis_mul8x16au(REF_4_1, CONST_256, TMP2);
-
- vis_padd16(TMP8, TMP4, TMP8);
- vis_mul8x16au(REF_6, CONST_256, TMP4);
-
- vis_padd16(TMP10, TMP6, TMP10);
- vis_mul8x16au(REF_6_1, CONST_256, TMP6);
-
- vis_padd16(TMP12, TMP8, TMP12);
-
- vis_padd16(TMP14, TMP10, TMP14);
-
- vis_padd16(TMP12, TMP16, TMP12);
-
- vis_padd16(TMP14, TMP18, TMP14);
- vis_pack16(TMP12, DST_0);
-
- vis_pack16(TMP14, DST_1);
- vis_st64(DST_0, dest[0]);
- vis_padd16(TMP0, CONST_2, TMP12);
-
- vis_mul8x16au(REF_S0, CONST_256, TMP0);
- vis_padd16(TMP2, CONST_2, TMP14);
-
- vis_mul8x16au(REF_S0_1, CONST_256, TMP2);
- vis_padd16(TMP12, TMP4, TMP12);
-
- vis_mul8x16au(REF_S2, CONST_256, TMP4);
- vis_padd16(TMP14, TMP6, TMP14);
-
- vis_mul8x16au(REF_S2_1, CONST_256, TMP6);
- vis_padd16(TMP20, TMP12, TMP20);
-
- vis_padd16(TMP22, TMP14, TMP22);
-
- vis_padd16(TMP20, TMP24, TMP20);
-
- vis_padd16(TMP22, TMP26, TMP22);
- vis_pack16(TMP20, DST_2);
-
- vis_pack16(TMP22, DST_3);
- vis_st64_2(DST_2, dest, 8);
- dest += stride;
- vis_padd16(TMP0, TMP4, TMP24);
-
- vis_mul8x16au(REF_S4, CONST_256, TMP0);
- vis_padd16(TMP2, TMP6, TMP26);
-
- vis_mul8x16au(REF_S4_1, CONST_256, TMP2);
- vis_padd16(TMP24, TMP8, TMP24);
-
- vis_padd16(TMP26, TMP10, TMP26);
- vis_pack16(TMP24, DST_0);
-
- vis_pack16(TMP26, DST_1);
- vis_st64(DST_0, dest[0]);
- vis_pmerge(ZERO, REF_S6, TMP4);
-
- vis_pmerge(ZERO, REF_S6_1, TMP6);
-
- vis_padd16(TMP0, TMP4, TMP0);
-
- vis_padd16(TMP2, TMP6, TMP2);
-
- vis_padd16(TMP0, TMP12, TMP0);
-
- vis_padd16(TMP2, TMP14, TMP2);
- vis_pack16(TMP0, DST_2);
-
- vis_pack16(TMP2, DST_3);
- vis_st64_2(DST_2, dest, 8);
- dest += stride;
- } while (--height);
-}
-
-static void MC_put_xy_8_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- unsigned long off = (unsigned long) ref & 0x7;
- unsigned long off_plus_1 = off + 1;
- int stride_8 = stride + 8;
-
- vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[ 0], TMP0);
- vis_fzero(ZERO);
-
- vis_ld64(ref[ 8], TMP2);
-
- vis_ld64(constants2[0], CONST_2);
-
- vis_ld64(constants256_512[0], CONST_256);
- vis_faligndata(TMP0, TMP2, REF_S0);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_S2);
- } else {
- vis_src1(TMP2, REF_S2);
- }
-
- height >>= 1;
- do { /* 26 cycles */
- vis_ld64_2(ref, stride, TMP0);
- vis_mul8x16au(REF_S0, CONST_256, TMP8);
- vis_pmerge(ZERO, REF_S2, TMP12);
-
- vis_alignaddr_g0((void *)off);
-
- vis_ld64_2(ref, stride_8, TMP2);
- ref += stride;
- vis_mul8x16au(REF_S0_1, CONST_256, TMP10);
- vis_pmerge(ZERO, REF_S2_1, TMP14);
-
- vis_ld64_2(ref, stride, TMP4);
-
- vis_ld64_2(ref, stride_8, TMP6);
- ref += stride;
- vis_faligndata(TMP0, TMP2, REF_S4);
-
- vis_pmerge(ZERO, REF_S4, TMP18);
-
- vis_pmerge(ZERO, REF_S4_1, TMP20);
-
- vis_faligndata(TMP4, TMP6, REF_S0);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_S6);
- vis_faligndata(TMP4, TMP6, REF_S2);
- } else {
- vis_src1(TMP2, REF_S6);
- vis_src1(TMP6, REF_S2);
- }
-
- vis_padd16(TMP18, CONST_2, TMP18);
- vis_mul8x16au(REF_S6, CONST_256, TMP22);
-
- vis_padd16(TMP20, CONST_2, TMP20);
- vis_mul8x16au(REF_S6_1, CONST_256, TMP24);
-
- vis_mul8x16au(REF_S0, CONST_256, TMP26);
- vis_pmerge(ZERO, REF_S0_1, TMP28);
-
- vis_mul8x16au(REF_S2, CONST_256, TMP30);
- vis_padd16(TMP18, TMP22, TMP18);
-
- vis_mul8x16au(REF_S2_1, CONST_256, TMP32);
- vis_padd16(TMP20, TMP24, TMP20);
-
- vis_padd16(TMP8, TMP18, TMP8);
-
- vis_padd16(TMP10, TMP20, TMP10);
-
- vis_padd16(TMP8, TMP12, TMP8);
-
- vis_padd16(TMP10, TMP14, TMP10);
- vis_pack16(TMP8, DST_0);
-
- vis_pack16(TMP10, DST_1);
- vis_st64(DST_0, dest[0]);
- dest += stride;
- vis_padd16(TMP18, TMP26, TMP18);
-
- vis_padd16(TMP20, TMP28, TMP20);
-
- vis_padd16(TMP18, TMP30, TMP18);
-
- vis_padd16(TMP20, TMP32, TMP20);
- vis_pack16(TMP18, DST_2);
-
- vis_pack16(TMP20, DST_3);
- vis_st64(DST_2, dest[0]);
- dest += stride;
- } while (--height);
-}
-
-static void MC_avg_xy_16_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- unsigned long off = (unsigned long) ref & 0x7;
- unsigned long off_plus_1 = off + 1;
- int stride_8 = stride + 8;
- int stride_16 = stride + 16;
-
- vis_set_gsr(4 << VIS_GSR_SCALEFACT_SHIFT);
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[ 0], TMP0);
- vis_fzero(ZERO);
-
- vis_ld64(ref[ 8], TMP2);
-
- vis_ld64(ref[16], TMP4);
-
- vis_ld64(constants6[0], CONST_6);
- vis_faligndata(TMP0, TMP2, REF_S0);
-
- vis_ld64(constants256_1024[0], CONST_256);
- vis_faligndata(TMP2, TMP4, REF_S4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_S2);
- vis_faligndata(TMP2, TMP4, REF_S6);
- } else {
- vis_src1(TMP2, REF_S2);
- vis_src1(TMP4, REF_S6);
- }
-
- height >>= 1;
- do { /* 55 cycles */
- vis_ld64_2(ref, stride, TMP0);
- vis_mul8x16au(REF_S0, CONST_256, TMP12);
- vis_pmerge(ZERO, REF_S0_1, TMP14);
-
- vis_alignaddr_g0((void *)off);
-
- vis_ld64_2(ref, stride_8, TMP2);
- vis_mul8x16au(REF_S2, CONST_256, TMP16);
- vis_pmerge(ZERO, REF_S2_1, TMP18);
-
- vis_ld64_2(ref, stride_16, TMP4);
- ref += stride;
- vis_mul8x16au(REF_S4, CONST_256, TMP20);
- vis_pmerge(ZERO, REF_S4_1, TMP22);
-
- vis_ld64_2(ref, stride, TMP6);
- vis_mul8x16au(REF_S6, CONST_256, TMP24);
- vis_pmerge(ZERO, REF_S6_1, TMP26);
-
- vis_ld64_2(ref, stride_8, TMP8);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64_2(ref, stride_16, TMP10);
- ref += stride;
- vis_faligndata(TMP2, TMP4, REF_4);
-
- vis_ld64(dest[0], DST_0);
- vis_faligndata(TMP6, TMP8, REF_S0);
-
- vis_ld64_2(dest, 8, DST_2);
- vis_faligndata(TMP8, TMP10, REF_S4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- vis_faligndata(TMP2, TMP4, REF_6);
- vis_faligndata(TMP6, TMP8, REF_S2);
- vis_faligndata(TMP8, TMP10, REF_S6);
- } else {
- vis_src1(TMP2, REF_2);
- vis_src1(TMP4, REF_6);
- vis_src1(TMP8, REF_S2);
- vis_src1(TMP10, REF_S6);
- }
-
- vis_mul8x16al(DST_0, CONST_1024, TMP30);
- vis_pmerge(ZERO, REF_0, TMP0);
-
- vis_mul8x16al(DST_1, CONST_1024, TMP32);
- vis_pmerge(ZERO, REF_0_1, TMP2);
-
- vis_mul8x16au(REF_2, CONST_256, TMP4);
- vis_pmerge(ZERO, REF_2_1, TMP6);
-
- vis_mul8x16al(DST_2, CONST_1024, REF_0);
- vis_padd16(TMP0, CONST_6, TMP0);
-
- vis_mul8x16al(DST_3, CONST_1024, REF_2);
- vis_padd16(TMP2, CONST_6, TMP2);
-
- vis_padd16(TMP0, TMP4, TMP0);
- vis_mul8x16au(REF_4, CONST_256, TMP4);
-
- vis_padd16(TMP2, TMP6, TMP2);
- vis_mul8x16au(REF_4_1, CONST_256, TMP6);
-
- vis_padd16(TMP12, TMP0, TMP12);
- vis_mul8x16au(REF_6, CONST_256, TMP8);
-
- vis_padd16(TMP14, TMP2, TMP14);
- vis_mul8x16au(REF_6_1, CONST_256, TMP10);
-
- vis_padd16(TMP12, TMP16, TMP12);
- vis_mul8x16au(REF_S0, CONST_256, REF_4);
-
- vis_padd16(TMP14, TMP18, TMP14);
- vis_mul8x16au(REF_S0_1, CONST_256, REF_6);
-
- vis_padd16(TMP12, TMP30, TMP12);
-
- vis_padd16(TMP14, TMP32, TMP14);
- vis_pack16(TMP12, DST_0);
-
- vis_pack16(TMP14, DST_1);
- vis_st64(DST_0, dest[0]);
- vis_padd16(TMP4, CONST_6, TMP4);
-
- vis_ld64_2(dest, stride, DST_0);
- vis_padd16(TMP6, CONST_6, TMP6);
- vis_mul8x16au(REF_S2, CONST_256, TMP12);
-
- vis_padd16(TMP4, TMP8, TMP4);
- vis_mul8x16au(REF_S2_1, CONST_256, TMP14);
-
- vis_padd16(TMP6, TMP10, TMP6);
-
- vis_padd16(TMP20, TMP4, TMP20);
-
- vis_padd16(TMP22, TMP6, TMP22);
-
- vis_padd16(TMP20, TMP24, TMP20);
-
- vis_padd16(TMP22, TMP26, TMP22);
-
- vis_padd16(TMP20, REF_0, TMP20);
- vis_mul8x16au(REF_S4, CONST_256, REF_0);
-
- vis_padd16(TMP22, REF_2, TMP22);
- vis_pack16(TMP20, DST_2);
-
- vis_pack16(TMP22, DST_3);
- vis_st64_2(DST_2, dest, 8);
- dest += stride;
-
- vis_ld64_2(dest, 8, DST_2);
- vis_mul8x16al(DST_0, CONST_1024, TMP30);
- vis_pmerge(ZERO, REF_S4_1, REF_2);
-
- vis_mul8x16al(DST_1, CONST_1024, TMP32);
- vis_padd16(REF_4, TMP0, TMP8);
-
- vis_mul8x16au(REF_S6, CONST_256, REF_4);
- vis_padd16(REF_6, TMP2, TMP10);
-
- vis_mul8x16au(REF_S6_1, CONST_256, REF_6);
- vis_padd16(TMP8, TMP12, TMP8);
-
- vis_padd16(TMP10, TMP14, TMP10);
-
- vis_padd16(TMP8, TMP30, TMP8);
-
- vis_padd16(TMP10, TMP32, TMP10);
- vis_pack16(TMP8, DST_0);
-
- vis_pack16(TMP10, DST_1);
- vis_st64(DST_0, dest[0]);
-
- vis_padd16(REF_0, TMP4, REF_0);
-
- vis_mul8x16al(DST_2, CONST_1024, TMP30);
- vis_padd16(REF_2, TMP6, REF_2);
-
- vis_mul8x16al(DST_3, CONST_1024, TMP32);
- vis_padd16(REF_0, REF_4, REF_0);
-
- vis_padd16(REF_2, REF_6, REF_2);
-
- vis_padd16(REF_0, TMP30, REF_0);
-
- /* stall */
-
- vis_padd16(REF_2, TMP32, REF_2);
- vis_pack16(REF_0, DST_2);
-
- vis_pack16(REF_2, DST_3);
- vis_st64_2(DST_2, dest, 8);
- dest += stride;
- } while (--height);
-}
-
-static void MC_avg_xy_8_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- unsigned long off = (unsigned long) ref & 0x7;
- unsigned long off_plus_1 = off + 1;
- int stride_8 = stride + 8;
-
- vis_set_gsr(4 << VIS_GSR_SCALEFACT_SHIFT);
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[0], TMP0);
- vis_fzero(ZERO);
-
- vis_ld64_2(ref, 8, TMP2);
-
- vis_ld64(constants6[0], CONST_6);
-
- vis_ld64(constants256_1024[0], CONST_256);
- vis_faligndata(TMP0, TMP2, REF_S0);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_S2);
- } else {
- vis_src1(TMP2, REF_S2);
- }
-
- height >>= 1;
- do { /* 31 cycles */
- vis_ld64_2(ref, stride, TMP0);
- vis_mul8x16au(REF_S0, CONST_256, TMP8);
- vis_pmerge(ZERO, REF_S0_1, TMP10);
-
- vis_ld64_2(ref, stride_8, TMP2);
- ref += stride;
- vis_mul8x16au(REF_S2, CONST_256, TMP12);
- vis_pmerge(ZERO, REF_S2_1, TMP14);
-
- vis_alignaddr_g0((void *)off);
-
- vis_ld64_2(ref, stride, TMP4);
- vis_faligndata(TMP0, TMP2, REF_S4);
-
- vis_ld64_2(ref, stride_8, TMP6);
- ref += stride;
-
- vis_ld64(dest[0], DST_0);
- vis_faligndata(TMP4, TMP6, REF_S0);
-
- vis_ld64_2(dest, stride, DST_2);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_S6);
- vis_faligndata(TMP4, TMP6, REF_S2);
- } else {
- vis_src1(TMP2, REF_S6);
- vis_src1(TMP6, REF_S2);
- }
-
- vis_mul8x16al(DST_0, CONST_1024, TMP30);
- vis_pmerge(ZERO, REF_S4, TMP22);
-
- vis_mul8x16al(DST_1, CONST_1024, TMP32);
- vis_pmerge(ZERO, REF_S4_1, TMP24);
-
- vis_mul8x16au(REF_S6, CONST_256, TMP26);
- vis_pmerge(ZERO, REF_S6_1, TMP28);
-
- vis_mul8x16au(REF_S0, CONST_256, REF_S4);
- vis_padd16(TMP22, CONST_6, TMP22);
-
- vis_mul8x16au(REF_S0_1, CONST_256, REF_S6);
- vis_padd16(TMP24, CONST_6, TMP24);
-
- vis_mul8x16al(DST_2, CONST_1024, REF_0);
- vis_padd16(TMP22, TMP26, TMP22);
-
- vis_mul8x16al(DST_3, CONST_1024, REF_2);
- vis_padd16(TMP24, TMP28, TMP24);
-
- vis_mul8x16au(REF_S2, CONST_256, TMP26);
- vis_padd16(TMP8, TMP22, TMP8);
-
- vis_mul8x16au(REF_S2_1, CONST_256, TMP28);
- vis_padd16(TMP10, TMP24, TMP10);
-
- vis_padd16(TMP8, TMP12, TMP8);
-
- vis_padd16(TMP10, TMP14, TMP10);
-
- vis_padd16(TMP8, TMP30, TMP8);
-
- vis_padd16(TMP10, TMP32, TMP10);
- vis_pack16(TMP8, DST_0);
-
- vis_pack16(TMP10, DST_1);
- vis_st64(DST_0, dest[0]);
- dest += stride;
-
- vis_padd16(REF_S4, TMP22, TMP12);
-
- vis_padd16(REF_S6, TMP24, TMP14);
-
- vis_padd16(TMP12, TMP26, TMP12);
-
- vis_padd16(TMP14, TMP28, TMP14);
-
- vis_padd16(TMP12, REF_0, TMP12);
-
- vis_padd16(TMP14, REF_2, TMP14);
- vis_pack16(TMP12, DST_2);
-
- vis_pack16(TMP14, DST_3);
- vis_st64(DST_2, dest[0]);
- dest += stride;
- } while (--height);
-}
-
-/* End of rounding code */
-
-/* Start of no rounding code */
-/* The trick used in some of this file is the formula from the MMX
- * motion comp code, which is:
- *
- * (x+y)>>1 == (x&y)+((x^y)>>1)
- *
- * This allows us to average 8 bytes at a time in a 64-bit FPU reg.
- * We avoid overflows by masking before we do the shift, and we
- * implement the shift by multiplying by 1/2 using mul8x16. So in
- * VIS this is (assume 'x' is in f0, 'y' is in f2, a repeating mask
- * of '0xfe' is in f4, a repeating mask of '0x7f' is in f6, and
- * the value 0x80808080 is in f8):
- *
- * fxor f0, f2, f10
- * fand f10, f4, f10
- * fmul8x16 f8, f10, f10
- * fand f10, f6, f10
- * fand f0, f2, f12
- * fpadd16 f12, f10, f10
- */
-
-static void MC_put_no_round_o_16_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- ref = vis_alignaddr(ref);
- do { /* 5 cycles */
- vis_ld64(ref[0], TMP0);
-
- vis_ld64_2(ref, 8, TMP2);
-
- vis_ld64_2(ref, 16, TMP4);
- ref += stride;
-
- vis_faligndata(TMP0, TMP2, REF_0);
- vis_st64(REF_0, dest[0]);
-
- vis_faligndata(TMP2, TMP4, REF_2);
- vis_st64_2(REF_2, dest, 8);
- dest += stride;
- } while (--height);
-}
-
-static void MC_put_no_round_o_8_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- ref = vis_alignaddr(ref);
- do { /* 4 cycles */
- vis_ld64(ref[0], TMP0);
-
- vis_ld64(ref[8], TMP2);
- ref += stride;
-
- /* stall */
-
- vis_faligndata(TMP0, TMP2, REF_0);
- vis_st64(REF_0, dest[0]);
- dest += stride;
- } while (--height);
-}
-
-
-static void MC_avg_no_round_o_16_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- int stride_8 = stride + 8;
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[0], TMP0);
-
- vis_ld64(ref[8], TMP2);
-
- vis_ld64(ref[16], TMP4);
-
- vis_ld64(dest[0], DST_0);
-
- vis_ld64(dest[8], DST_2);
-
- vis_ld64(constants_fe[0], MASK_fe);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64(constants_7f[0], MASK_7f);
- vis_faligndata(TMP2, TMP4, REF_2);
-
- vis_ld64(constants128[0], CONST_128);
-
- ref += stride;
- height = (height >> 1) - 1;
-
- do { /* 24 cycles */
- vis_ld64(ref[0], TMP0);
- vis_xor(DST_0, REF_0, TMP6);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_and(TMP6, MASK_fe, TMP6);
-
- vis_ld64_2(ref, 16, TMP4);
- ref += stride;
- vis_mul8x16(CONST_128, TMP6, TMP6);
- vis_xor(DST_2, REF_2, TMP8);
-
- vis_and(TMP8, MASK_fe, TMP8);
-
- vis_and(DST_0, REF_0, TMP10);
- vis_ld64_2(dest, stride, DST_0);
- vis_mul8x16(CONST_128, TMP8, TMP8);
-
- vis_and(DST_2, REF_2, TMP12);
- vis_ld64_2(dest, stride_8, DST_2);
-
- vis_ld64(ref[0], TMP14);
- vis_and(TMP6, MASK_7f, TMP6);
-
- vis_and(TMP8, MASK_7f, TMP8);
-
- vis_padd16(TMP10, TMP6, TMP6);
- vis_st64(TMP6, dest[0]);
-
- vis_padd16(TMP12, TMP8, TMP8);
- vis_st64_2(TMP8, dest, 8);
-
- dest += stride;
- vis_ld64_2(ref, 8, TMP16);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64_2(ref, 16, TMP18);
- vis_faligndata(TMP2, TMP4, REF_2);
- ref += stride;
-
- vis_xor(DST_0, REF_0, TMP20);
-
- vis_and(TMP20, MASK_fe, TMP20);
-
- vis_xor(DST_2, REF_2, TMP22);
- vis_mul8x16(CONST_128, TMP20, TMP20);
-
- vis_and(TMP22, MASK_fe, TMP22);
-
- vis_and(DST_0, REF_0, TMP24);
- vis_mul8x16(CONST_128, TMP22, TMP22);
-
- vis_and(DST_2, REF_2, TMP26);
-
- vis_ld64_2(dest, stride, DST_0);
- vis_faligndata(TMP14, TMP16, REF_0);
-
- vis_ld64_2(dest, stride_8, DST_2);
- vis_faligndata(TMP16, TMP18, REF_2);
-
- vis_and(TMP20, MASK_7f, TMP20);
-
- vis_and(TMP22, MASK_7f, TMP22);
-
- vis_padd16(TMP24, TMP20, TMP20);
- vis_st64(TMP20, dest[0]);
-
- vis_padd16(TMP26, TMP22, TMP22);
- vis_st64_2(TMP22, dest, 8);
- dest += stride;
- } while (--height);
-
- vis_ld64(ref[0], TMP0);
- vis_xor(DST_0, REF_0, TMP6);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_and(TMP6, MASK_fe, TMP6);
-
- vis_ld64_2(ref, 16, TMP4);
- vis_mul8x16(CONST_128, TMP6, TMP6);
- vis_xor(DST_2, REF_2, TMP8);
-
- vis_and(TMP8, MASK_fe, TMP8);
-
- vis_and(DST_0, REF_0, TMP10);
- vis_ld64_2(dest, stride, DST_0);
- vis_mul8x16(CONST_128, TMP8, TMP8);
-
- vis_and(DST_2, REF_2, TMP12);
- vis_ld64_2(dest, stride_8, DST_2);
-
- vis_ld64(ref[0], TMP14);
- vis_and(TMP6, MASK_7f, TMP6);
-
- vis_and(TMP8, MASK_7f, TMP8);
-
- vis_padd16(TMP10, TMP6, TMP6);
- vis_st64(TMP6, dest[0]);
-
- vis_padd16(TMP12, TMP8, TMP8);
- vis_st64_2(TMP8, dest, 8);
-
- dest += stride;
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_faligndata(TMP2, TMP4, REF_2);
-
- vis_xor(DST_0, REF_0, TMP20);
-
- vis_and(TMP20, MASK_fe, TMP20);
-
- vis_xor(DST_2, REF_2, TMP22);
- vis_mul8x16(CONST_128, TMP20, TMP20);
-
- vis_and(TMP22, MASK_fe, TMP22);
-
- vis_and(DST_0, REF_0, TMP24);
- vis_mul8x16(CONST_128, TMP22, TMP22);
-
- vis_and(DST_2, REF_2, TMP26);
-
- vis_and(TMP20, MASK_7f, TMP20);
-
- vis_and(TMP22, MASK_7f, TMP22);
-
- vis_padd16(TMP24, TMP20, TMP20);
- vis_st64(TMP20, dest[0]);
-
- vis_padd16(TMP26, TMP22, TMP22);
- vis_st64_2(TMP22, dest, 8);
-}
-
-static void MC_avg_no_round_o_8_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[0], TMP0);
-
- vis_ld64(ref[8], TMP2);
-
- vis_ld64(dest[0], DST_0);
-
- vis_ld64(constants_fe[0], MASK_fe);
-
- vis_ld64(constants_7f[0], MASK_7f);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64(constants128[0], CONST_128);
-
- ref += stride;
- height = (height >> 1) - 1;
-
- do { /* 12 cycles */
- vis_ld64(ref[0], TMP0);
- vis_xor(DST_0, REF_0, TMP4);
-
- vis_ld64(ref[8], TMP2);
- vis_and(TMP4, MASK_fe, TMP4);
-
- vis_and(DST_0, REF_0, TMP6);
- vis_ld64_2(dest, stride, DST_0);
- ref += stride;
- vis_mul8x16(CONST_128, TMP4, TMP4);
-
- vis_ld64(ref[0], TMP12);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64(ref[8], TMP2);
- vis_xor(DST_0, REF_0, TMP0);
- ref += stride;
-
- vis_and(TMP0, MASK_fe, TMP0);
-
- vis_and(TMP4, MASK_7f, TMP4);
-
- vis_padd16(TMP6, TMP4, TMP4);
- vis_st64(TMP4, dest[0]);
- dest += stride;
- vis_mul8x16(CONST_128, TMP0, TMP0);
-
- vis_and(DST_0, REF_0, TMP6);
- vis_ld64_2(dest, stride, DST_0);
-
- vis_faligndata(TMP12, TMP2, REF_0);
-
- vis_and(TMP0, MASK_7f, TMP0);
-
- vis_padd16(TMP6, TMP0, TMP4);
- vis_st64(TMP4, dest[0]);
- dest += stride;
- } while (--height);
-
- vis_ld64(ref[0], TMP0);
- vis_xor(DST_0, REF_0, TMP4);
-
- vis_ld64(ref[8], TMP2);
- vis_and(TMP4, MASK_fe, TMP4);
-
- vis_and(DST_0, REF_0, TMP6);
- vis_ld64_2(dest, stride, DST_0);
- vis_mul8x16(CONST_128, TMP4, TMP4);
-
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_xor(DST_0, REF_0, TMP0);
-
- vis_and(TMP0, MASK_fe, TMP0);
-
- vis_and(TMP4, MASK_7f, TMP4);
-
- vis_padd16(TMP6, TMP4, TMP4);
- vis_st64(TMP4, dest[0]);
- dest += stride;
- vis_mul8x16(CONST_128, TMP0, TMP0);
-
- vis_and(DST_0, REF_0, TMP6);
-
- vis_and(TMP0, MASK_7f, TMP0);
-
- vis_padd16(TMP6, TMP0, TMP4);
- vis_st64(TMP4, dest[0]);
-}
-
-static void MC_put_no_round_x_16_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- unsigned long off = (unsigned long) ref & 0x7;
- unsigned long off_plus_1 = off + 1;
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[0], TMP0);
-
- vis_ld64_2(ref, 8, TMP2);
-
- vis_ld64_2(ref, 16, TMP4);
-
- vis_ld64(constants_fe[0], MASK_fe);
-
- vis_ld64(constants_7f[0], MASK_7f);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64(constants128[0], CONST_128);
- vis_faligndata(TMP2, TMP4, REF_4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- vis_faligndata(TMP2, TMP4, REF_6);
- } else {
- vis_src1(TMP2, REF_2);
- vis_src1(TMP4, REF_6);
- }
-
- ref += stride;
- height = (height >> 1) - 1;
-
- do { /* 34 cycles */
- vis_ld64(ref[0], TMP0);
- vis_xor(REF_0, REF_2, TMP6);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_xor(REF_4, REF_6, TMP8);
-
- vis_ld64_2(ref, 16, TMP4);
- vis_and(TMP6, MASK_fe, TMP6);
- ref += stride;
-
- vis_ld64(ref[0], TMP14);
- vis_mul8x16(CONST_128, TMP6, TMP6);
- vis_and(TMP8, MASK_fe, TMP8);
-
- vis_ld64_2(ref, 8, TMP16);
- vis_mul8x16(CONST_128, TMP8, TMP8);
- vis_and(REF_0, REF_2, TMP10);
-
- vis_ld64_2(ref, 16, TMP18);
- ref += stride;
- vis_and(REF_4, REF_6, TMP12);
-
- vis_alignaddr_g0((void *)off);
-
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_faligndata(TMP2, TMP4, REF_4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- vis_faligndata(TMP2, TMP4, REF_6);
- } else {
- vis_src1(TMP2, REF_2);
- vis_src1(TMP4, REF_6);
- }
-
- vis_and(TMP6, MASK_7f, TMP6);
-
- vis_and(TMP8, MASK_7f, TMP8);
-
- vis_padd16(TMP10, TMP6, TMP6);
- vis_st64(TMP6, dest[0]);
-
- vis_padd16(TMP12, TMP8, TMP8);
- vis_st64_2(TMP8, dest, 8);
- dest += stride;
-
- vis_xor(REF_0, REF_2, TMP6);
-
- vis_xor(REF_4, REF_6, TMP8);
-
- vis_and(TMP6, MASK_fe, TMP6);
-
- vis_mul8x16(CONST_128, TMP6, TMP6);
- vis_and(TMP8, MASK_fe, TMP8);
-
- vis_mul8x16(CONST_128, TMP8, TMP8);
- vis_and(REF_0, REF_2, TMP10);
-
- vis_and(REF_4, REF_6, TMP12);
-
- vis_alignaddr_g0((void *)off);
-
- vis_faligndata(TMP14, TMP16, REF_0);
-
- vis_faligndata(TMP16, TMP18, REF_4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP14, TMP16, REF_2);
- vis_faligndata(TMP16, TMP18, REF_6);
- } else {
- vis_src1(TMP16, REF_2);
- vis_src1(TMP18, REF_6);
- }
-
- vis_and(TMP6, MASK_7f, TMP6);
-
- vis_and(TMP8, MASK_7f, TMP8);
-
- vis_padd16(TMP10, TMP6, TMP6);
- vis_st64(TMP6, dest[0]);
-
- vis_padd16(TMP12, TMP8, TMP8);
- vis_st64_2(TMP8, dest, 8);
- dest += stride;
- } while (--height);
-
- vis_ld64(ref[0], TMP0);
- vis_xor(REF_0, REF_2, TMP6);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_xor(REF_4, REF_6, TMP8);
-
- vis_ld64_2(ref, 16, TMP4);
- vis_and(TMP6, MASK_fe, TMP6);
-
- vis_mul8x16(CONST_128, TMP6, TMP6);
- vis_and(TMP8, MASK_fe, TMP8);
-
- vis_mul8x16(CONST_128, TMP8, TMP8);
- vis_and(REF_0, REF_2, TMP10);
-
- vis_and(REF_4, REF_6, TMP12);
-
- vis_alignaddr_g0((void *)off);
-
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_faligndata(TMP2, TMP4, REF_4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- vis_faligndata(TMP2, TMP4, REF_6);
- } else {
- vis_src1(TMP2, REF_2);
- vis_src1(TMP4, REF_6);
- }
-
- vis_and(TMP6, MASK_7f, TMP6);
-
- vis_and(TMP8, MASK_7f, TMP8);
-
- vis_padd16(TMP10, TMP6, TMP6);
- vis_st64(TMP6, dest[0]);
-
- vis_padd16(TMP12, TMP8, TMP8);
- vis_st64_2(TMP8, dest, 8);
- dest += stride;
-
- vis_xor(REF_0, REF_2, TMP6);
-
- vis_xor(REF_4, REF_6, TMP8);
-
- vis_and(TMP6, MASK_fe, TMP6);
-
- vis_mul8x16(CONST_128, TMP6, TMP6);
- vis_and(TMP8, MASK_fe, TMP8);
-
- vis_mul8x16(CONST_128, TMP8, TMP8);
- vis_and(REF_0, REF_2, TMP10);
-
- vis_and(REF_4, REF_6, TMP12);
-
- vis_and(TMP6, MASK_7f, TMP6);
-
- vis_and(TMP8, MASK_7f, TMP8);
-
- vis_padd16(TMP10, TMP6, TMP6);
- vis_st64(TMP6, dest[0]);
-
- vis_padd16(TMP12, TMP8, TMP8);
- vis_st64_2(TMP8, dest, 8);
-}
-
-static void MC_put_no_round_x_8_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- unsigned long off = (unsigned long) ref & 0x7;
- unsigned long off_plus_1 = off + 1;
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[0], TMP0);
-
- vis_ld64(ref[8], TMP2);
-
- vis_ld64(constants_fe[0], MASK_fe);
-
- vis_ld64(constants_7f[0], MASK_7f);
-
- vis_ld64(constants128[0], CONST_128);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- } else {
- vis_src1(TMP2, REF_2);
- }
-
- ref += stride;
- height = (height >> 1) - 1;
-
- do { /* 20 cycles */
- vis_ld64(ref[0], TMP0);
- vis_xor(REF_0, REF_2, TMP4);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_and(TMP4, MASK_fe, TMP4);
- ref += stride;
-
- vis_ld64(ref[0], TMP8);
- vis_and(REF_0, REF_2, TMP6);
- vis_mul8x16(CONST_128, TMP4, TMP4);
-
- vis_alignaddr_g0((void *)off);
-
- vis_ld64_2(ref, 8, TMP10);
- ref += stride;
- vis_faligndata(TMP0, TMP2, REF_0);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- } else {
- vis_src1(TMP2, REF_2);
- }
-
- vis_and(TMP4, MASK_7f, TMP4);
-
- vis_padd16(TMP6, TMP4, DST_0);
- vis_st64(DST_0, dest[0]);
- dest += stride;
-
- vis_xor(REF_0, REF_2, TMP12);
-
- vis_and(TMP12, MASK_fe, TMP12);
-
- vis_and(REF_0, REF_2, TMP14);
- vis_mul8x16(CONST_128, TMP12, TMP12);
-
- vis_alignaddr_g0((void *)off);
- vis_faligndata(TMP8, TMP10, REF_0);
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP8, TMP10, REF_2);
- } else {
- vis_src1(TMP10, REF_2);
- }
-
- vis_and(TMP12, MASK_7f, TMP12);
-
- vis_padd16(TMP14, TMP12, DST_0);
- vis_st64(DST_0, dest[0]);
- dest += stride;
- } while (--height);
-
- vis_ld64(ref[0], TMP0);
- vis_xor(REF_0, REF_2, TMP4);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_and(TMP4, MASK_fe, TMP4);
-
- vis_and(REF_0, REF_2, TMP6);
- vis_mul8x16(CONST_128, TMP4, TMP4);
-
- vis_alignaddr_g0((void *)off);
-
- vis_faligndata(TMP0, TMP2, REF_0);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- } else {
- vis_src1(TMP2, REF_2);
- }
-
- vis_and(TMP4, MASK_7f, TMP4);
-
- vis_padd16(TMP6, TMP4, DST_0);
- vis_st64(DST_0, dest[0]);
- dest += stride;
-
- vis_xor(REF_0, REF_2, TMP12);
-
- vis_and(TMP12, MASK_fe, TMP12);
-
- vis_and(REF_0, REF_2, TMP14);
- vis_mul8x16(CONST_128, TMP12, TMP12);
-
- vis_and(TMP12, MASK_7f, TMP12);
-
- vis_padd16(TMP14, TMP12, DST_0);
- vis_st64(DST_0, dest[0]);
- dest += stride;
-}
-
-static void MC_avg_no_round_x_16_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- unsigned long off = (unsigned long) ref & 0x7;
- unsigned long off_plus_1 = off + 1;
-
- vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
-
- vis_ld64(constants3[0], CONST_3);
- vis_fzero(ZERO);
- vis_ld64(constants256_512[0], CONST_256);
-
- ref = vis_alignaddr(ref);
- do { /* 26 cycles */
- vis_ld64(ref[0], TMP0);
-
- vis_ld64(ref[8], TMP2);
-
- vis_alignaddr_g0((void *)off);
-
- vis_ld64(ref[16], TMP4);
-
- vis_ld64(dest[0], DST_0);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64(dest[8], DST_2);
- vis_faligndata(TMP2, TMP4, REF_4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- vis_faligndata(TMP2, TMP4, REF_6);
- } else {
- vis_src1(TMP2, REF_2);
- vis_src1(TMP4, REF_6);
- }
-
- vis_mul8x16au(REF_0, CONST_256, TMP0);
-
- vis_pmerge(ZERO, REF_2, TMP4);
- vis_mul8x16au(REF_0_1, CONST_256, TMP2);
-
- vis_pmerge(ZERO, REF_2_1, TMP6);
-
- vis_padd16(TMP0, TMP4, TMP0);
-
- vis_mul8x16al(DST_0, CONST_512, TMP4);
- vis_padd16(TMP2, TMP6, TMP2);
-
- vis_mul8x16al(DST_1, CONST_512, TMP6);
-
- vis_mul8x16au(REF_6, CONST_256, TMP12);
-
- vis_padd16(TMP0, TMP4, TMP0);
- vis_mul8x16au(REF_6_1, CONST_256, TMP14);
-
- vis_padd16(TMP2, TMP6, TMP2);
- vis_mul8x16au(REF_4, CONST_256, TMP16);
-
- vis_padd16(TMP0, CONST_3, TMP8);
- vis_mul8x16au(REF_4_1, CONST_256, TMP18);
-
- vis_padd16(TMP2, CONST_3, TMP10);
- vis_pack16(TMP8, DST_0);
-
- vis_pack16(TMP10, DST_1);
- vis_padd16(TMP16, TMP12, TMP0);
-
- vis_st64(DST_0, dest[0]);
- vis_mul8x16al(DST_2, CONST_512, TMP4);
- vis_padd16(TMP18, TMP14, TMP2);
-
- vis_mul8x16al(DST_3, CONST_512, TMP6);
- vis_padd16(TMP0, CONST_3, TMP0);
-
- vis_padd16(TMP2, CONST_3, TMP2);
-
- vis_padd16(TMP0, TMP4, TMP0);
-
- vis_padd16(TMP2, TMP6, TMP2);
- vis_pack16(TMP0, DST_2);
-
- vis_pack16(TMP2, DST_3);
- vis_st64(DST_2, dest[8]);
-
- ref += stride;
- dest += stride;
- } while (--height);
-}
-
-static void MC_avg_no_round_x_8_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- unsigned long off = (unsigned long) ref & 0x7;
- unsigned long off_plus_1 = off + 1;
- int stride_times_2 = stride << 1;
-
- vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
-
- vis_ld64(constants3[0], CONST_3);
- vis_fzero(ZERO);
- vis_ld64(constants256_512[0], CONST_256);
-
- ref = vis_alignaddr(ref);
- height >>= 2;
- do { /* 47 cycles */
- vis_ld64(ref[0], TMP0);
-
- vis_ld64_2(ref, 8, TMP2);
- ref += stride;
-
- vis_alignaddr_g0((void *)off);
-
- vis_ld64(ref[0], TMP4);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64_2(ref, 8, TMP6);
- ref += stride;
-
- vis_ld64(ref[0], TMP8);
-
- vis_ld64_2(ref, 8, TMP10);
- ref += stride;
- vis_faligndata(TMP4, TMP6, REF_4);
-
- vis_ld64(ref[0], TMP12);
-
- vis_ld64_2(ref, 8, TMP14);
- ref += stride;
- vis_faligndata(TMP8, TMP10, REF_S0);
-
- vis_faligndata(TMP12, TMP14, REF_S4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
-
- vis_ld64(dest[0], DST_0);
- vis_faligndata(TMP0, TMP2, REF_2);
-
- vis_ld64_2(dest, stride, DST_2);
- vis_faligndata(TMP4, TMP6, REF_6);
-
- vis_faligndata(TMP8, TMP10, REF_S2);
-
- vis_faligndata(TMP12, TMP14, REF_S6);
- } else {
- vis_ld64(dest[0], DST_0);
- vis_src1(TMP2, REF_2);
-
- vis_ld64_2(dest, stride, DST_2);
- vis_src1(TMP6, REF_6);
-
- vis_src1(TMP10, REF_S2);
-
- vis_src1(TMP14, REF_S6);
- }
-
- vis_pmerge(ZERO, REF_0, TMP0);
- vis_mul8x16au(REF_0_1, CONST_256, TMP2);
-
- vis_pmerge(ZERO, REF_2, TMP4);
- vis_mul8x16au(REF_2_1, CONST_256, TMP6);
-
- vis_padd16(TMP0, CONST_3, TMP0);
- vis_mul8x16al(DST_0, CONST_512, TMP16);
-
- vis_padd16(TMP2, CONST_3, TMP2);
- vis_mul8x16al(DST_1, CONST_512, TMP18);
-
- vis_padd16(TMP0, TMP4, TMP0);
- vis_mul8x16au(REF_4, CONST_256, TMP8);
-
- vis_padd16(TMP2, TMP6, TMP2);
- vis_mul8x16au(REF_4_1, CONST_256, TMP10);
-
- vis_padd16(TMP0, TMP16, TMP0);
- vis_mul8x16au(REF_6, CONST_256, TMP12);
-
- vis_padd16(TMP2, TMP18, TMP2);
- vis_mul8x16au(REF_6_1, CONST_256, TMP14);
-
- vis_padd16(TMP8, CONST_3, TMP8);
- vis_mul8x16al(DST_2, CONST_512, TMP16);
-
- vis_padd16(TMP8, TMP12, TMP8);
- vis_mul8x16al(DST_3, CONST_512, TMP18);
-
- vis_padd16(TMP10, TMP14, TMP10);
- vis_pack16(TMP0, DST_0);
-
- vis_pack16(TMP2, DST_1);
- vis_st64(DST_0, dest[0]);
- dest += stride;
- vis_padd16(TMP10, CONST_3, TMP10);
-
- vis_ld64_2(dest, stride, DST_0);
- vis_padd16(TMP8, TMP16, TMP8);
-
- vis_ld64_2(dest, stride_times_2, TMP4/*DST_2*/);
- vis_padd16(TMP10, TMP18, TMP10);
- vis_pack16(TMP8, DST_2);
-
- vis_pack16(TMP10, DST_3);
- vis_st64(DST_2, dest[0]);
- dest += stride;
-
- vis_mul8x16au(REF_S0_1, CONST_256, TMP2);
- vis_pmerge(ZERO, REF_S0, TMP0);
-
- vis_pmerge(ZERO, REF_S2, TMP24);
- vis_mul8x16au(REF_S2_1, CONST_256, TMP6);
-
- vis_padd16(TMP0, CONST_3, TMP0);
- vis_mul8x16au(REF_S4, CONST_256, TMP8);
-
- vis_padd16(TMP2, CONST_3, TMP2);
- vis_mul8x16au(REF_S4_1, CONST_256, TMP10);
-
- vis_padd16(TMP0, TMP24, TMP0);
- vis_mul8x16au(REF_S6, CONST_256, TMP12);
-
- vis_padd16(TMP2, TMP6, TMP2);
- vis_mul8x16au(REF_S6_1, CONST_256, TMP14);
-
- vis_padd16(TMP8, CONST_3, TMP8);
- vis_mul8x16al(DST_0, CONST_512, TMP16);
-
- vis_padd16(TMP10, CONST_3, TMP10);
- vis_mul8x16al(DST_1, CONST_512, TMP18);
-
- vis_padd16(TMP8, TMP12, TMP8);
- vis_mul8x16al(TMP4/*DST_2*/, CONST_512, TMP20);
-
- vis_mul8x16al(TMP5/*DST_3*/, CONST_512, TMP22);
- vis_padd16(TMP0, TMP16, TMP0);
-
- vis_padd16(TMP2, TMP18, TMP2);
- vis_pack16(TMP0, DST_0);
-
- vis_padd16(TMP10, TMP14, TMP10);
- vis_pack16(TMP2, DST_1);
- vis_st64(DST_0, dest[0]);
- dest += stride;
-
- vis_padd16(TMP8, TMP20, TMP8);
-
- vis_padd16(TMP10, TMP22, TMP10);
- vis_pack16(TMP8, DST_2);
-
- vis_pack16(TMP10, DST_3);
- vis_st64(DST_2, dest[0]);
- dest += stride;
- } while (--height);
-}
-
-static void MC_put_no_round_y_16_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- ref = vis_alignaddr(ref);
- vis_ld64(ref[0], TMP0);
-
- vis_ld64_2(ref, 8, TMP2);
-
- vis_ld64_2(ref, 16, TMP4);
- ref += stride;
-
- vis_ld64(ref[0], TMP6);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64_2(ref, 8, TMP8);
- vis_faligndata(TMP2, TMP4, REF_4);
-
- vis_ld64_2(ref, 16, TMP10);
- ref += stride;
-
- vis_ld64(constants_fe[0], MASK_fe);
- vis_faligndata(TMP6, TMP8, REF_2);
-
- vis_ld64(constants_7f[0], MASK_7f);
- vis_faligndata(TMP8, TMP10, REF_6);
-
- vis_ld64(constants128[0], CONST_128);
- height = (height >> 1) - 1;
- do { /* 24 cycles */
- vis_ld64(ref[0], TMP0);
- vis_xor(REF_0, REF_2, TMP12);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_xor(REF_4, REF_6, TMP16);
-
- vis_ld64_2(ref, 16, TMP4);
- ref += stride;
- vis_and(REF_0, REF_2, TMP14);
-
- vis_ld64(ref[0], TMP6);
- vis_and(REF_4, REF_6, TMP18);
-
- vis_ld64_2(ref, 8, TMP8);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64_2(ref, 16, TMP10);
- ref += stride;
- vis_faligndata(TMP2, TMP4, REF_4);
-
- vis_and(TMP12, MASK_fe, TMP12);
-
- vis_and(TMP16, MASK_fe, TMP16);
- vis_mul8x16(CONST_128, TMP12, TMP12);
-
- vis_mul8x16(CONST_128, TMP16, TMP16);
- vis_xor(REF_0, REF_2, TMP0);
-
- vis_xor(REF_4, REF_6, TMP2);
-
- vis_and(REF_0, REF_2, TMP20);
-
- vis_and(TMP12, MASK_7f, TMP12);
-
- vis_and(TMP16, MASK_7f, TMP16);
-
- vis_padd16(TMP14, TMP12, TMP12);
- vis_st64(TMP12, dest[0]);
-
- vis_padd16(TMP18, TMP16, TMP16);
- vis_st64_2(TMP16, dest, 8);
- dest += stride;
-
- vis_and(REF_4, REF_6, TMP18);
-
- vis_and(TMP0, MASK_fe, TMP0);
-
- vis_and(TMP2, MASK_fe, TMP2);
- vis_mul8x16(CONST_128, TMP0, TMP0);
-
- vis_faligndata(TMP6, TMP8, REF_2);
- vis_mul8x16(CONST_128, TMP2, TMP2);
-
- vis_faligndata(TMP8, TMP10, REF_6);
-
- vis_and(TMP0, MASK_7f, TMP0);
-
- vis_and(TMP2, MASK_7f, TMP2);
-
- vis_padd16(TMP20, TMP0, TMP0);
- vis_st64(TMP0, dest[0]);
-
- vis_padd16(TMP18, TMP2, TMP2);
- vis_st64_2(TMP2, dest, 8);
- dest += stride;
- } while (--height);
-
- vis_ld64(ref[0], TMP0);
- vis_xor(REF_0, REF_2, TMP12);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_xor(REF_4, REF_6, TMP16);
-
- vis_ld64_2(ref, 16, TMP4);
- vis_and(REF_0, REF_2, TMP14);
-
- vis_and(REF_4, REF_6, TMP18);
-
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_faligndata(TMP2, TMP4, REF_4);
-
- vis_and(TMP12, MASK_fe, TMP12);
-
- vis_and(TMP16, MASK_fe, TMP16);
- vis_mul8x16(CONST_128, TMP12, TMP12);
-
- vis_mul8x16(CONST_128, TMP16, TMP16);
- vis_xor(REF_0, REF_2, TMP0);
-
- vis_xor(REF_4, REF_6, TMP2);
-
- vis_and(REF_0, REF_2, TMP20);
-
- vis_and(TMP12, MASK_7f, TMP12);
-
- vis_and(TMP16, MASK_7f, TMP16);
-
- vis_padd16(TMP14, TMP12, TMP12);
- vis_st64(TMP12, dest[0]);
-
- vis_padd16(TMP18, TMP16, TMP16);
- vis_st64_2(TMP16, dest, 8);
- dest += stride;
-
- vis_and(REF_4, REF_6, TMP18);
-
- vis_and(TMP0, MASK_fe, TMP0);
-
- vis_and(TMP2, MASK_fe, TMP2);
- vis_mul8x16(CONST_128, TMP0, TMP0);
-
- vis_mul8x16(CONST_128, TMP2, TMP2);
-
- vis_and(TMP0, MASK_7f, TMP0);
-
- vis_and(TMP2, MASK_7f, TMP2);
-
- vis_padd16(TMP20, TMP0, TMP0);
- vis_st64(TMP0, dest[0]);
-
- vis_padd16(TMP18, TMP2, TMP2);
- vis_st64_2(TMP2, dest, 8);
-}
-
-static void MC_put_no_round_y_8_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- ref = vis_alignaddr(ref);
- vis_ld64(ref[0], TMP0);
-
- vis_ld64_2(ref, 8, TMP2);
- ref += stride;
-
- vis_ld64(ref[0], TMP4);
-
- vis_ld64_2(ref, 8, TMP6);
- ref += stride;
-
- vis_ld64(constants_fe[0], MASK_fe);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64(constants_7f[0], MASK_7f);
- vis_faligndata(TMP4, TMP6, REF_2);
-
- vis_ld64(constants128[0], CONST_128);
- height = (height >> 1) - 1;
- do { /* 12 cycles */
- vis_ld64(ref[0], TMP0);
- vis_xor(REF_0, REF_2, TMP4);
-
- vis_ld64_2(ref, 8, TMP2);
- ref += stride;
- vis_and(TMP4, MASK_fe, TMP4);
-
- vis_and(REF_0, REF_2, TMP6);
- vis_mul8x16(CONST_128, TMP4, TMP4);
-
- vis_faligndata(TMP0, TMP2, REF_0);
- vis_ld64(ref[0], TMP0);
-
- vis_ld64_2(ref, 8, TMP2);
- ref += stride;
- vis_xor(REF_0, REF_2, TMP12);
-
- vis_and(TMP4, MASK_7f, TMP4);
-
- vis_and(TMP12, MASK_fe, TMP12);
-
- vis_mul8x16(CONST_128, TMP12, TMP12);
- vis_and(REF_0, REF_2, TMP14);
-
- vis_padd16(TMP6, TMP4, DST_0);
- vis_st64(DST_0, dest[0]);
- dest += stride;
-
- vis_faligndata(TMP0, TMP2, REF_2);
-
- vis_and(TMP12, MASK_7f, TMP12);
-
- vis_padd16(TMP14, TMP12, DST_0);
- vis_st64(DST_0, dest[0]);
- dest += stride;
- } while (--height);
-
- vis_ld64(ref[0], TMP0);
- vis_xor(REF_0, REF_2, TMP4);
-
- vis_ld64_2(ref, 8, TMP2);
- vis_and(TMP4, MASK_fe, TMP4);
-
- vis_and(REF_0, REF_2, TMP6);
- vis_mul8x16(CONST_128, TMP4, TMP4);
-
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_xor(REF_0, REF_2, TMP12);
-
- vis_and(TMP4, MASK_7f, TMP4);
-
- vis_and(TMP12, MASK_fe, TMP12);
-
- vis_mul8x16(CONST_128, TMP12, TMP12);
- vis_and(REF_0, REF_2, TMP14);
-
- vis_padd16(TMP6, TMP4, DST_0);
- vis_st64(DST_0, dest[0]);
- dest += stride;
-
- vis_and(TMP12, MASK_7f, TMP12);
-
- vis_padd16(TMP14, TMP12, DST_0);
- vis_st64(DST_0, dest[0]);
-}
-
-static void MC_avg_no_round_y_16_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- int stride_8 = stride + 8;
- int stride_16 = stride + 16;
-
- vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[ 0], TMP0);
- vis_fzero(ZERO);
-
- vis_ld64(ref[ 8], TMP2);
-
- vis_ld64(ref[16], TMP4);
-
- vis_ld64(constants3[0], CONST_3);
- vis_faligndata(TMP0, TMP2, REF_2);
-
- vis_ld64(constants256_512[0], CONST_256);
- vis_faligndata(TMP2, TMP4, REF_6);
- height >>= 1;
-
- do { /* 31 cycles */
- vis_ld64_2(ref, stride, TMP0);
- vis_pmerge(ZERO, REF_2, TMP12);
- vis_mul8x16au(REF_2_1, CONST_256, TMP14);
-
- vis_ld64_2(ref, stride_8, TMP2);
- vis_pmerge(ZERO, REF_6, TMP16);
- vis_mul8x16au(REF_6_1, CONST_256, TMP18);
-
- vis_ld64_2(ref, stride_16, TMP4);
- ref += stride;
-
- vis_ld64(dest[0], DST_0);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64_2(dest, 8, DST_2);
- vis_faligndata(TMP2, TMP4, REF_4);
-
- vis_ld64_2(ref, stride, TMP6);
- vis_pmerge(ZERO, REF_0, TMP0);
- vis_mul8x16au(REF_0_1, CONST_256, TMP2);
-
- vis_ld64_2(ref, stride_8, TMP8);
- vis_pmerge(ZERO, REF_4, TMP4);
-
- vis_ld64_2(ref, stride_16, TMP10);
- ref += stride;
-
- vis_ld64_2(dest, stride, REF_S0/*DST_4*/);
- vis_faligndata(TMP6, TMP8, REF_2);
- vis_mul8x16au(REF_4_1, CONST_256, TMP6);
-
- vis_ld64_2(dest, stride_8, REF_S2/*DST_6*/);
- vis_faligndata(TMP8, TMP10, REF_6);
- vis_mul8x16al(DST_0, CONST_512, TMP20);
-
- vis_padd16(TMP0, CONST_3, TMP0);
- vis_mul8x16al(DST_1, CONST_512, TMP22);
-
- vis_padd16(TMP2, CONST_3, TMP2);
- vis_mul8x16al(DST_2, CONST_512, TMP24);
-
- vis_padd16(TMP4, CONST_3, TMP4);
- vis_mul8x16al(DST_3, CONST_512, TMP26);
-
- vis_padd16(TMP6, CONST_3, TMP6);
-
- vis_padd16(TMP12, TMP20, TMP12);
- vis_mul8x16al(REF_S0, CONST_512, TMP20);
-
- vis_padd16(TMP14, TMP22, TMP14);
- vis_mul8x16al(REF_S0_1, CONST_512, TMP22);
-
- vis_padd16(TMP16, TMP24, TMP16);
- vis_mul8x16al(REF_S2, CONST_512, TMP24);
-
- vis_padd16(TMP18, TMP26, TMP18);
- vis_mul8x16al(REF_S2_1, CONST_512, TMP26);
-
- vis_padd16(TMP12, TMP0, TMP12);
- vis_mul8x16au(REF_2, CONST_256, TMP28);
-
- vis_padd16(TMP14, TMP2, TMP14);
- vis_mul8x16au(REF_2_1, CONST_256, TMP30);
-
- vis_padd16(TMP16, TMP4, TMP16);
- vis_mul8x16au(REF_6, CONST_256, REF_S4);
-
- vis_padd16(TMP18, TMP6, TMP18);
- vis_mul8x16au(REF_6_1, CONST_256, REF_S6);
-
- vis_pack16(TMP12, DST_0);
- vis_padd16(TMP28, TMP0, TMP12);
-
- vis_pack16(TMP14, DST_1);
- vis_st64(DST_0, dest[0]);
- vis_padd16(TMP30, TMP2, TMP14);
-
- vis_pack16(TMP16, DST_2);
- vis_padd16(REF_S4, TMP4, TMP16);
-
- vis_pack16(TMP18, DST_3);
- vis_st64_2(DST_2, dest, 8);
- dest += stride;
- vis_padd16(REF_S6, TMP6, TMP18);
-
- vis_padd16(TMP12, TMP20, TMP12);
-
- vis_padd16(TMP14, TMP22, TMP14);
- vis_pack16(TMP12, DST_0);
-
- vis_padd16(TMP16, TMP24, TMP16);
- vis_pack16(TMP14, DST_1);
- vis_st64(DST_0, dest[0]);
-
- vis_padd16(TMP18, TMP26, TMP18);
- vis_pack16(TMP16, DST_2);
-
- vis_pack16(TMP18, DST_3);
- vis_st64_2(DST_2, dest, 8);
- dest += stride;
- } while (--height);
-}
-
-static void MC_avg_no_round_y_8_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- int stride_8 = stride + 8;
-
- vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[ 0], TMP0);
- vis_fzero(ZERO);
-
- vis_ld64(ref[ 8], TMP2);
-
- vis_ld64(constants3[0], CONST_3);
- vis_faligndata(TMP0, TMP2, REF_2);
-
- vis_ld64(constants256_512[0], CONST_256);
-
- height >>= 1;
- do { /* 20 cycles */
- vis_ld64_2(ref, stride, TMP0);
- vis_pmerge(ZERO, REF_2, TMP8);
- vis_mul8x16au(REF_2_1, CONST_256, TMP10);
-
- vis_ld64_2(ref, stride_8, TMP2);
- ref += stride;
-
- vis_ld64(dest[0], DST_0);
-
- vis_ld64_2(dest, stride, DST_2);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64_2(ref, stride, TMP4);
- vis_mul8x16al(DST_0, CONST_512, TMP16);
- vis_pmerge(ZERO, REF_0, TMP12);
-
- vis_ld64_2(ref, stride_8, TMP6);
- ref += stride;
- vis_mul8x16al(DST_1, CONST_512, TMP18);
- vis_pmerge(ZERO, REF_0_1, TMP14);
-
- vis_padd16(TMP12, CONST_3, TMP12);
- vis_mul8x16al(DST_2, CONST_512, TMP24);
-
- vis_padd16(TMP14, CONST_3, TMP14);
- vis_mul8x16al(DST_3, CONST_512, TMP26);
-
- vis_faligndata(TMP4, TMP6, REF_2);
-
- vis_padd16(TMP8, TMP12, TMP8);
-
- vis_padd16(TMP10, TMP14, TMP10);
- vis_mul8x16au(REF_2, CONST_256, TMP20);
-
- vis_padd16(TMP8, TMP16, TMP0);
- vis_mul8x16au(REF_2_1, CONST_256, TMP22);
-
- vis_padd16(TMP10, TMP18, TMP2);
- vis_pack16(TMP0, DST_0);
-
- vis_pack16(TMP2, DST_1);
- vis_st64(DST_0, dest[0]);
- dest += stride;
- vis_padd16(TMP12, TMP20, TMP12);
-
- vis_padd16(TMP14, TMP22, TMP14);
-
- vis_padd16(TMP12, TMP24, TMP0);
-
- vis_padd16(TMP14, TMP26, TMP2);
- vis_pack16(TMP0, DST_2);
-
- vis_pack16(TMP2, DST_3);
- vis_st64(DST_2, dest[0]);
- dest += stride;
- } while (--height);
-}
-
-static void MC_put_no_round_xy_16_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- unsigned long off = (unsigned long) ref & 0x7;
- unsigned long off_plus_1 = off + 1;
- int stride_8 = stride + 8;
- int stride_16 = stride + 16;
-
- vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[ 0], TMP0);
- vis_fzero(ZERO);
-
- vis_ld64(ref[ 8], TMP2);
-
- vis_ld64(ref[16], TMP4);
-
- vis_ld64(constants1[0], CONST_1);
- vis_faligndata(TMP0, TMP2, REF_S0);
-
- vis_ld64(constants256_512[0], CONST_256);
- vis_faligndata(TMP2, TMP4, REF_S4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_S2);
- vis_faligndata(TMP2, TMP4, REF_S6);
- } else {
- vis_src1(TMP2, REF_S2);
- vis_src1(TMP4, REF_S6);
- }
-
- height >>= 1;
- do {
- vis_ld64_2(ref, stride, TMP0);
- vis_mul8x16au(REF_S0, CONST_256, TMP12);
- vis_pmerge(ZERO, REF_S0_1, TMP14);
-
- vis_alignaddr_g0((void *)off);
-
- vis_ld64_2(ref, stride_8, TMP2);
- vis_mul8x16au(REF_S2, CONST_256, TMP16);
- vis_pmerge(ZERO, REF_S2_1, TMP18);
-
- vis_ld64_2(ref, stride_16, TMP4);
- ref += stride;
- vis_mul8x16au(REF_S4, CONST_256, TMP20);
- vis_pmerge(ZERO, REF_S4_1, TMP22);
-
- vis_ld64_2(ref, stride, TMP6);
- vis_mul8x16au(REF_S6, CONST_256, TMP24);
- vis_pmerge(ZERO, REF_S6_1, TMP26);
-
- vis_ld64_2(ref, stride_8, TMP8);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64_2(ref, stride_16, TMP10);
- ref += stride;
- vis_faligndata(TMP2, TMP4, REF_4);
-
- vis_faligndata(TMP6, TMP8, REF_S0);
-
- vis_faligndata(TMP8, TMP10, REF_S4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- vis_faligndata(TMP2, TMP4, REF_6);
- vis_faligndata(TMP6, TMP8, REF_S2);
- vis_faligndata(TMP8, TMP10, REF_S6);
- } else {
- vis_src1(TMP2, REF_2);
- vis_src1(TMP4, REF_6);
- vis_src1(TMP8, REF_S2);
- vis_src1(TMP10, REF_S6);
- }
-
- vis_mul8x16au(REF_0, CONST_256, TMP0);
- vis_pmerge(ZERO, REF_0_1, TMP2);
-
- vis_mul8x16au(REF_2, CONST_256, TMP4);
- vis_pmerge(ZERO, REF_2_1, TMP6);
-
- vis_padd16(TMP0, CONST_2, TMP8);
- vis_mul8x16au(REF_4, CONST_256, TMP0);
-
- vis_padd16(TMP2, CONST_1, TMP10);
- vis_mul8x16au(REF_4_1, CONST_256, TMP2);
-
- vis_padd16(TMP8, TMP4, TMP8);
- vis_mul8x16au(REF_6, CONST_256, TMP4);
-
- vis_padd16(TMP10, TMP6, TMP10);
- vis_mul8x16au(REF_6_1, CONST_256, TMP6);
-
- vis_padd16(TMP12, TMP8, TMP12);
-
- vis_padd16(TMP14, TMP10, TMP14);
-
- vis_padd16(TMP12, TMP16, TMP12);
-
- vis_padd16(TMP14, TMP18, TMP14);
- vis_pack16(TMP12, DST_0);
-
- vis_pack16(TMP14, DST_1);
- vis_st64(DST_0, dest[0]);
- vis_padd16(TMP0, CONST_1, TMP12);
-
- vis_mul8x16au(REF_S0, CONST_256, TMP0);
- vis_padd16(TMP2, CONST_1, TMP14);
-
- vis_mul8x16au(REF_S0_1, CONST_256, TMP2);
- vis_padd16(TMP12, TMP4, TMP12);
-
- vis_mul8x16au(REF_S2, CONST_256, TMP4);
- vis_padd16(TMP14, TMP6, TMP14);
-
- vis_mul8x16au(REF_S2_1, CONST_256, TMP6);
- vis_padd16(TMP20, TMP12, TMP20);
-
- vis_padd16(TMP22, TMP14, TMP22);
-
- vis_padd16(TMP20, TMP24, TMP20);
-
- vis_padd16(TMP22, TMP26, TMP22);
- vis_pack16(TMP20, DST_2);
-
- vis_pack16(TMP22, DST_3);
- vis_st64_2(DST_2, dest, 8);
- dest += stride;
- vis_padd16(TMP0, TMP4, TMP24);
-
- vis_mul8x16au(REF_S4, CONST_256, TMP0);
- vis_padd16(TMP2, TMP6, TMP26);
-
- vis_mul8x16au(REF_S4_1, CONST_256, TMP2);
- vis_padd16(TMP24, TMP8, TMP24);
-
- vis_padd16(TMP26, TMP10, TMP26);
- vis_pack16(TMP24, DST_0);
-
- vis_pack16(TMP26, DST_1);
- vis_st64(DST_0, dest[0]);
- vis_pmerge(ZERO, REF_S6, TMP4);
-
- vis_pmerge(ZERO, REF_S6_1, TMP6);
-
- vis_padd16(TMP0, TMP4, TMP0);
-
- vis_padd16(TMP2, TMP6, TMP2);
-
- vis_padd16(TMP0, TMP12, TMP0);
-
- vis_padd16(TMP2, TMP14, TMP2);
- vis_pack16(TMP0, DST_2);
-
- vis_pack16(TMP2, DST_3);
- vis_st64_2(DST_2, dest, 8);
- dest += stride;
- } while (--height);
-}
-
-static void MC_put_no_round_xy_8_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- unsigned long off = (unsigned long) ref & 0x7;
- unsigned long off_plus_1 = off + 1;
- int stride_8 = stride + 8;
-
- vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[ 0], TMP0);
- vis_fzero(ZERO);
-
- vis_ld64(ref[ 8], TMP2);
-
- vis_ld64(constants1[0], CONST_1);
-
- vis_ld64(constants256_512[0], CONST_256);
- vis_faligndata(TMP0, TMP2, REF_S0);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_S2);
- } else {
- vis_src1(TMP2, REF_S2);
- }
-
- height >>= 1;
- do { /* 26 cycles */
- vis_ld64_2(ref, stride, TMP0);
- vis_mul8x16au(REF_S0, CONST_256, TMP8);
- vis_pmerge(ZERO, REF_S2, TMP12);
-
- vis_alignaddr_g0((void *)off);
-
- vis_ld64_2(ref, stride_8, TMP2);
- ref += stride;
- vis_mul8x16au(REF_S0_1, CONST_256, TMP10);
- vis_pmerge(ZERO, REF_S2_1, TMP14);
-
- vis_ld64_2(ref, stride, TMP4);
-
- vis_ld64_2(ref, stride_8, TMP6);
- ref += stride;
- vis_faligndata(TMP0, TMP2, REF_S4);
-
- vis_pmerge(ZERO, REF_S4, TMP18);
-
- vis_pmerge(ZERO, REF_S4_1, TMP20);
-
- vis_faligndata(TMP4, TMP6, REF_S0);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_S6);
- vis_faligndata(TMP4, TMP6, REF_S2);
- } else {
- vis_src1(TMP2, REF_S6);
- vis_src1(TMP6, REF_S2);
- }
-
- vis_padd16(TMP18, CONST_1, TMP18);
- vis_mul8x16au(REF_S6, CONST_256, TMP22);
-
- vis_padd16(TMP20, CONST_1, TMP20);
- vis_mul8x16au(REF_S6_1, CONST_256, TMP24);
-
- vis_mul8x16au(REF_S0, CONST_256, TMP26);
- vis_pmerge(ZERO, REF_S0_1, TMP28);
-
- vis_mul8x16au(REF_S2, CONST_256, TMP30);
- vis_padd16(TMP18, TMP22, TMP18);
-
- vis_mul8x16au(REF_S2_1, CONST_256, TMP32);
- vis_padd16(TMP20, TMP24, TMP20);
-
- vis_padd16(TMP8, TMP18, TMP8);
-
- vis_padd16(TMP10, TMP20, TMP10);
-
- vis_padd16(TMP8, TMP12, TMP8);
-
- vis_padd16(TMP10, TMP14, TMP10);
- vis_pack16(TMP8, DST_0);
-
- vis_pack16(TMP10, DST_1);
- vis_st64(DST_0, dest[0]);
- dest += stride;
- vis_padd16(TMP18, TMP26, TMP18);
-
- vis_padd16(TMP20, TMP28, TMP20);
-
- vis_padd16(TMP18, TMP30, TMP18);
-
- vis_padd16(TMP20, TMP32, TMP20);
- vis_pack16(TMP18, DST_2);
-
- vis_pack16(TMP20, DST_3);
- vis_st64(DST_2, dest[0]);
- dest += stride;
- } while (--height);
-}
-
-static void MC_avg_no_round_xy_16_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- unsigned long off = (unsigned long) ref & 0x7;
- unsigned long off_plus_1 = off + 1;
- int stride_8 = stride + 8;
- int stride_16 = stride + 16;
-
- vis_set_gsr(4 << VIS_GSR_SCALEFACT_SHIFT);
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[ 0], TMP0);
- vis_fzero(ZERO);
-
- vis_ld64(ref[ 8], TMP2);
-
- vis_ld64(ref[16], TMP4);
-
- vis_ld64(constants6[0], CONST_6);
- vis_faligndata(TMP0, TMP2, REF_S0);
-
- vis_ld64(constants256_1024[0], CONST_256);
- vis_faligndata(TMP2, TMP4, REF_S4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_S2);
- vis_faligndata(TMP2, TMP4, REF_S6);
- } else {
- vis_src1(TMP2, REF_S2);
- vis_src1(TMP4, REF_S6);
- }
-
- height >>= 1;
- do { /* 55 cycles */
- vis_ld64_2(ref, stride, TMP0);
- vis_mul8x16au(REF_S0, CONST_256, TMP12);
- vis_pmerge(ZERO, REF_S0_1, TMP14);
-
- vis_alignaddr_g0((void *)off);
-
- vis_ld64_2(ref, stride_8, TMP2);
- vis_mul8x16au(REF_S2, CONST_256, TMP16);
- vis_pmerge(ZERO, REF_S2_1, TMP18);
-
- vis_ld64_2(ref, stride_16, TMP4);
- ref += stride;
- vis_mul8x16au(REF_S4, CONST_256, TMP20);
- vis_pmerge(ZERO, REF_S4_1, TMP22);
-
- vis_ld64_2(ref, stride, TMP6);
- vis_mul8x16au(REF_S6, CONST_256, TMP24);
- vis_pmerge(ZERO, REF_S6_1, TMP26);
-
- vis_ld64_2(ref, stride_8, TMP8);
- vis_faligndata(TMP0, TMP2, REF_0);
-
- vis_ld64_2(ref, stride_16, TMP10);
- ref += stride;
- vis_faligndata(TMP2, TMP4, REF_4);
-
- vis_ld64(dest[0], DST_0);
- vis_faligndata(TMP6, TMP8, REF_S0);
-
- vis_ld64_2(dest, 8, DST_2);
- vis_faligndata(TMP8, TMP10, REF_S4);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_2);
- vis_faligndata(TMP2, TMP4, REF_6);
- vis_faligndata(TMP6, TMP8, REF_S2);
- vis_faligndata(TMP8, TMP10, REF_S6);
- } else {
- vis_src1(TMP2, REF_2);
- vis_src1(TMP4, REF_6);
- vis_src1(TMP8, REF_S2);
- vis_src1(TMP10, REF_S6);
- }
-
- vis_mul8x16al(DST_0, CONST_1024, TMP30);
- vis_pmerge(ZERO, REF_0, TMP0);
-
- vis_mul8x16al(DST_1, CONST_1024, TMP32);
- vis_pmerge(ZERO, REF_0_1, TMP2);
-
- vis_mul8x16au(REF_2, CONST_256, TMP4);
- vis_pmerge(ZERO, REF_2_1, TMP6);
-
- vis_mul8x16al(DST_2, CONST_1024, REF_0);
- vis_padd16(TMP0, CONST_6, TMP0);
-
- vis_mul8x16al(DST_3, CONST_1024, REF_2);
- vis_padd16(TMP2, CONST_6, TMP2);
-
- vis_padd16(TMP0, TMP4, TMP0);
- vis_mul8x16au(REF_4, CONST_256, TMP4);
-
- vis_padd16(TMP2, TMP6, TMP2);
- vis_mul8x16au(REF_4_1, CONST_256, TMP6);
-
- vis_padd16(TMP12, TMP0, TMP12);
- vis_mul8x16au(REF_6, CONST_256, TMP8);
-
- vis_padd16(TMP14, TMP2, TMP14);
- vis_mul8x16au(REF_6_1, CONST_256, TMP10);
-
- vis_padd16(TMP12, TMP16, TMP12);
- vis_mul8x16au(REF_S0, CONST_256, REF_4);
-
- vis_padd16(TMP14, TMP18, TMP14);
- vis_mul8x16au(REF_S0_1, CONST_256, REF_6);
-
- vis_padd16(TMP12, TMP30, TMP12);
-
- vis_padd16(TMP14, TMP32, TMP14);
- vis_pack16(TMP12, DST_0);
-
- vis_pack16(TMP14, DST_1);
- vis_st64(DST_0, dest[0]);
- vis_padd16(TMP4, CONST_6, TMP4);
-
- vis_ld64_2(dest, stride, DST_0);
- vis_padd16(TMP6, CONST_6, TMP6);
- vis_mul8x16au(REF_S2, CONST_256, TMP12);
-
- vis_padd16(TMP4, TMP8, TMP4);
- vis_mul8x16au(REF_S2_1, CONST_256, TMP14);
-
- vis_padd16(TMP6, TMP10, TMP6);
-
- vis_padd16(TMP20, TMP4, TMP20);
-
- vis_padd16(TMP22, TMP6, TMP22);
-
- vis_padd16(TMP20, TMP24, TMP20);
-
- vis_padd16(TMP22, TMP26, TMP22);
-
- vis_padd16(TMP20, REF_0, TMP20);
- vis_mul8x16au(REF_S4, CONST_256, REF_0);
-
- vis_padd16(TMP22, REF_2, TMP22);
- vis_pack16(TMP20, DST_2);
-
- vis_pack16(TMP22, DST_3);
- vis_st64_2(DST_2, dest, 8);
- dest += stride;
-
- vis_ld64_2(dest, 8, DST_2);
- vis_mul8x16al(DST_0, CONST_1024, TMP30);
- vis_pmerge(ZERO, REF_S4_1, REF_2);
-
- vis_mul8x16al(DST_1, CONST_1024, TMP32);
- vis_padd16(REF_4, TMP0, TMP8);
-
- vis_mul8x16au(REF_S6, CONST_256, REF_4);
- vis_padd16(REF_6, TMP2, TMP10);
-
- vis_mul8x16au(REF_S6_1, CONST_256, REF_6);
- vis_padd16(TMP8, TMP12, TMP8);
-
- vis_padd16(TMP10, TMP14, TMP10);
-
- vis_padd16(TMP8, TMP30, TMP8);
-
- vis_padd16(TMP10, TMP32, TMP10);
- vis_pack16(TMP8, DST_0);
-
- vis_pack16(TMP10, DST_1);
- vis_st64(DST_0, dest[0]);
-
- vis_padd16(REF_0, TMP4, REF_0);
-
- vis_mul8x16al(DST_2, CONST_1024, TMP30);
- vis_padd16(REF_2, TMP6, REF_2);
-
- vis_mul8x16al(DST_3, CONST_1024, TMP32);
- vis_padd16(REF_0, REF_4, REF_0);
-
- vis_padd16(REF_2, REF_6, REF_2);
-
- vis_padd16(REF_0, TMP30, REF_0);
-
- /* stall */
-
- vis_padd16(REF_2, TMP32, REF_2);
- vis_pack16(REF_0, DST_2);
-
- vis_pack16(REF_2, DST_3);
- vis_st64_2(DST_2, dest, 8);
- dest += stride;
- } while (--height);
-}
-
-static void MC_avg_no_round_xy_8_vis (uint8_t * dest, const uint8_t * ref,
- const int stride, int height)
-{
- unsigned long off = (unsigned long) ref & 0x7;
- unsigned long off_plus_1 = off + 1;
- int stride_8 = stride + 8;
-
- vis_set_gsr(4 << VIS_GSR_SCALEFACT_SHIFT);
-
- ref = vis_alignaddr(ref);
-
- vis_ld64(ref[0], TMP0);
- vis_fzero(ZERO);
-
- vis_ld64_2(ref, 8, TMP2);
-
- vis_ld64(constants6[0], CONST_6);
-
- vis_ld64(constants256_1024[0], CONST_256);
- vis_faligndata(TMP0, TMP2, REF_S0);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_S2);
- } else {
- vis_src1(TMP2, REF_S2);
- }
-
- height >>= 1;
- do { /* 31 cycles */
- vis_ld64_2(ref, stride, TMP0);
- vis_mul8x16au(REF_S0, CONST_256, TMP8);
- vis_pmerge(ZERO, REF_S0_1, TMP10);
-
- vis_ld64_2(ref, stride_8, TMP2);
- ref += stride;
- vis_mul8x16au(REF_S2, CONST_256, TMP12);
- vis_pmerge(ZERO, REF_S2_1, TMP14);
-
- vis_alignaddr_g0((void *)off);
-
- vis_ld64_2(ref, stride, TMP4);
- vis_faligndata(TMP0, TMP2, REF_S4);
-
- vis_ld64_2(ref, stride_8, TMP6);
- ref += stride;
-
- vis_ld64(dest[0], DST_0);
- vis_faligndata(TMP4, TMP6, REF_S0);
-
- vis_ld64_2(dest, stride, DST_2);
-
- if (off != 0x7) {
- vis_alignaddr_g0((void *)off_plus_1);
- vis_faligndata(TMP0, TMP2, REF_S6);
- vis_faligndata(TMP4, TMP6, REF_S2);
- } else {
- vis_src1(TMP2, REF_S6);
- vis_src1(TMP6, REF_S2);
- }
-
- vis_mul8x16al(DST_0, CONST_1024, TMP30);
- vis_pmerge(ZERO, REF_S4, TMP22);
-
- vis_mul8x16al(DST_1, CONST_1024, TMP32);
- vis_pmerge(ZERO, REF_S4_1, TMP24);
-
- vis_mul8x16au(REF_S6, CONST_256, TMP26);
- vis_pmerge(ZERO, REF_S6_1, TMP28);
-
- vis_mul8x16au(REF_S0, CONST_256, REF_S4);
- vis_padd16(TMP22, CONST_6, TMP22);
-
- vis_mul8x16au(REF_S0_1, CONST_256, REF_S6);
- vis_padd16(TMP24, CONST_6, TMP24);
-
- vis_mul8x16al(DST_2, CONST_1024, REF_0);
- vis_padd16(TMP22, TMP26, TMP22);
-
- vis_mul8x16al(DST_3, CONST_1024, REF_2);
- vis_padd16(TMP24, TMP28, TMP24);
-
- vis_mul8x16au(REF_S2, CONST_256, TMP26);
- vis_padd16(TMP8, TMP22, TMP8);
-
- vis_mul8x16au(REF_S2_1, CONST_256, TMP28);
- vis_padd16(TMP10, TMP24, TMP10);
-
- vis_padd16(TMP8, TMP12, TMP8);
-
- vis_padd16(TMP10, TMP14, TMP10);
-
- vis_padd16(TMP8, TMP30, TMP8);
-
- vis_padd16(TMP10, TMP32, TMP10);
- vis_pack16(TMP8, DST_0);
-
- vis_pack16(TMP10, DST_1);
- vis_st64(DST_0, dest[0]);
- dest += stride;
-
- vis_padd16(REF_S4, TMP22, TMP12);
-
- vis_padd16(REF_S6, TMP24, TMP14);
-
- vis_padd16(TMP12, TMP26, TMP12);
-
- vis_padd16(TMP14, TMP28, TMP14);
-
- vis_padd16(TMP12, REF_0, TMP12);
-
- vis_padd16(TMP14, REF_2, TMP14);
- vis_pack16(TMP12, DST_2);
-
- vis_pack16(TMP14, DST_3);
- vis_st64(DST_2, dest[0]);
- dest += stride;
- } while (--height);
-}
-
-/* End of no rounding code */
-
-#define ACCEL_SPARC_VIS 1
-#define ACCEL_SPARC_VIS2 2
-
-static int vis_level(void)
-{
- int accel = 0;
- accel |= ACCEL_SPARC_VIS;
- accel |= ACCEL_SPARC_VIS2;
- return accel;
-}
-
-/* libavcodec initialization code */
-void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx)
+av_cold void ff_dsputil_init_vis(DSPContext *c, AVCodecContext *avctx)
 {
 /* VIS-specific optimizations */
 int accel = vis_level ();
 const int high_bit_depth = avctx->bits_per_raw_sample > 8;
 
- if (accel & ACCEL_SPARC_VIS) {
- if (avctx->bits_per_raw_sample <= 8 &&
- avctx->idct_algo == FF_IDCT_SIMPLEVIS) {
+ if (accel & ACCEL_SPARC_VIS && !high_bit_depth) {
+ if (avctx->idct_algo == FF_IDCT_SIMPLEVIS) {
 c->idct_put = ff_simple_idct_put_vis;
 c->idct_add = ff_simple_idct_add_vis;
 c->idct = ff_simple_idct_vis;
 c->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
 }
-
- if (!high_bit_depth) {
- c->put_pixels_tab[0][0] = MC_put_o_16_vis;
- c->put_pixels_tab[0][1] = MC_put_x_16_vis;
- c->put_pixels_tab[0][2] = MC_put_y_16_vis;
- c->put_pixels_tab[0][3] = MC_put_xy_16_vis;
-
- c->put_pixels_tab[1][0] = MC_put_o_8_vis;
- c->put_pixels_tab[1][1] = MC_put_x_8_vis;
- c->put_pixels_tab[1][2] = MC_put_y_8_vis;
- c->put_pixels_tab[1][3] = MC_put_xy_8_vis;
-
- c->avg_pixels_tab[0][0] = MC_avg_o_16_vis;
- c->avg_pixels_tab[0][1] = MC_avg_x_16_vis;
- c->avg_pixels_tab[0][2] = MC_avg_y_16_vis;
- c->avg_pixels_tab[0][3] = MC_avg_xy_16_vis;
-
- c->avg_pixels_tab[1][0] = MC_avg_o_8_vis;
- c->avg_pixels_tab[1][1] = MC_avg_x_8_vis;
- c->avg_pixels_tab[1][2] = MC_avg_y_8_vis;
- c->avg_pixels_tab[1][3] = MC_avg_xy_8_vis;
-
- c->put_no_rnd_pixels_tab[0][0] = MC_put_no_round_o_16_vis;
- c->put_no_rnd_pixels_tab[0][1] = MC_put_no_round_x_16_vis;
- c->put_no_rnd_pixels_tab[0][2] = MC_put_no_round_y_16_vis;
- c->put_no_rnd_pixels_tab[0][3] = MC_put_no_round_xy_16_vis;
-
- c->put_no_rnd_pixels_tab[1][0] = MC_put_no_round_o_8_vis;
- c->put_no_rnd_pixels_tab[1][1] = MC_put_no_round_x_8_vis;
- c->put_no_rnd_pixels_tab[1][2] = MC_put_no_round_y_8_vis;
- c->put_no_rnd_pixels_tab[1][3] = MC_put_no_round_xy_8_vis;
-
- c->avg_no_rnd_pixels_tab[0][0] = MC_avg_no_round_o_16_vis;
- c->avg_no_rnd_pixels_tab[0][1] = MC_avg_no_round_x_16_vis;
- c->avg_no_rnd_pixels_tab[0][2] = MC_avg_no_round_y_16_vis;
- c->avg_no_rnd_pixels_tab[0][3] = MC_avg_no_round_xy_16_vis;
-
- c->avg_no_rnd_pixels_tab[1][0] = MC_avg_no_round_o_8_vis;
- c->avg_no_rnd_pixels_tab[1][1] = MC_avg_no_round_x_8_vis;
- c->avg_no_rnd_pixels_tab[1][2] = MC_avg_no_round_y_8_vis;
- c->avg_no_rnd_pixels_tab[1][3] = MC_avg_no_round_xy_8_vis;
- }
 }
 }

libav-v9.6.tar.bz2/libavcodec/sparc/dsputil_vis.h -> libav-v10.1.tar.bz2/libavcodec/sparc/dsputil_vis.h Changed

libav-v10.1.tar.bz2/libavcodec/sparc/hpeldsp_vis.c Added

@@ -0,0 +1,3524 @@
+/*
+ * Copyright (C) 2003 David S. Miller <davem@redhat.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/* The *no_round* functions have been added by James A. Morrison, 2003,2004.
+ The vis code from libmpeg2 was adapted for libavcodec by James A. Morrison.
+ */
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "libavutil/attributes.h"
+#include "libavutil/mem.h"
+#include "libavcodec/hpeldsp.h"
+#include "vis.h"
+
+/* The trick used in some of this file is the formula from the MMX
+ * motion comp code, which is:
+ *
+ * (x+y+1)>>1 == (x|y)-((x^y)>>1)
+ *
+ * This allows us to average 8 bytes at a time in a 64-bit FPU reg.
+ * We avoid overflows by masking before we do the shift, and we
+ * implement the shift by multiplying by 1/2 using mul8x16. So in
+ * VIS this is (assume 'x' is in f0, 'y' is in f2, a repeating mask
+ * of '0xfe' is in f4, a repeating mask of '0x7f' is in f6, and
+ * the value 0x80808080 is in f8):
+ *
+ * fxor f0, f2, f10
+ * fand f10, f4, f10
+ * fmul8x16 f8, f10, f10
+ * fand f10, f6, f10
+ * for f0, f2, f12
+ * fpsub16 f12, f10, f10
+ */
+
+#define DUP4(x) {x, x, x, x}
+#define DUP8(x) {x, x, x, x, x, x, x, x}
+DECLARE_ALIGNED(8, static const int16_t, constants1)[] = DUP4 (1);
+DECLARE_ALIGNED(8, static const int16_t, constants2)[] = DUP4 (2);
+DECLARE_ALIGNED(8, static const int16_t, constants3)[] = DUP4 (3);
+DECLARE_ALIGNED(8, static const int16_t, constants6)[] = DUP4 (6);
+DECLARE_ALIGNED(8, static const int8_t, constants_fe)[] = DUP8 (0xfe);
+DECLARE_ALIGNED(8, static const int8_t, constants_7f)[] = DUP8 (0x7f);
+DECLARE_ALIGNED(8, static const int8_t, constants128)[] = DUP8 (128);
+DECLARE_ALIGNED(8, static const int16_t, constants256_512)[] =
+ {256, 512, 256, 512};
+DECLARE_ALIGNED(8, static const int16_t, constants256_1024)[] =
+ {256, 1024, 256, 1024};
+
+#define REF_0 0
+#define REF_0_1 1
+#define REF_2 2
+#define REF_2_1 3
+#define REF_4 4
+#define REF_4_1 5
+#define REF_6 6
+#define REF_6_1 7
+#define REF_S0 8
+#define REF_S0_1 9
+#define REF_S2 10
+#define REF_S2_1 11
+#define REF_S4 12
+#define REF_S4_1 13
+#define REF_S6 14
+#define REF_S6_1 15
+#define DST_0 16
+#define DST_1 17
+#define DST_2 18
+#define DST_3 19
+#define CONST_1 20
+#define CONST_2 20
+#define CONST_3 20
+#define CONST_6 20
+#define MASK_fe 20
+#define CONST_128 22
+#define CONST_256 22
+#define CONST_512 22
+#define CONST_1024 22
+#define TMP0 24
+#define TMP1 25
+#define TMP2 26
+#define TMP3 27
+#define TMP4 28
+#define TMP5 29
+#define ZERO 30
+#define MASK_7f 30
+
+#define TMP6 32
+#define TMP8 34
+#define TMP10 36
+#define TMP12 38
+#define TMP14 40
+#define TMP16 42
+#define TMP18 44
+#define TMP20 46
+#define TMP22 48
+#define TMP24 50
+#define TMP26 52
+#define TMP28 54
+#define TMP30 56
+#define TMP32 58
+
+static void MC_put_o_16_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ ref = vis_alignaddr(ref);
+ do { /* 5 cycles */
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64_2(ref, 8, TMP2);
+
+ vis_ld64_2(ref, 16, TMP4);
+ ref += stride;
+
+ vis_faligndata(TMP0, TMP2, REF_0);
+ vis_st64(REF_0, dest[0]);
+
+ vis_faligndata(TMP2, TMP4, REF_2);
+ vis_st64_2(REF_2, dest, 8);
+ dest += stride;
+ } while (--height);
+}
+
+static void MC_put_o_8_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ ref = vis_alignaddr(ref);
+ do { /* 4 cycles */
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64(ref[8], TMP2);
+ ref += stride;
+
+ /* stall */
+
+ vis_faligndata(TMP0, TMP2, REF_0);
+ vis_st64(REF_0, dest[0]);
+ dest += stride;
+ } while (--height);
+}
+
+
+static void MC_avg_o_16_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ int stride_8 = stride + 8;
+
+ ref = vis_alignaddr(ref);
+
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64(ref[8], TMP2);
+
+ vis_ld64(ref[16], TMP4);
+
+ vis_ld64(dest[0], DST_0);
+
+ vis_ld64(dest[8], DST_2);
+
+ vis_ld64(constants_fe[0], MASK_fe);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64(constants_7f[0], MASK_7f);
+ vis_faligndata(TMP2, TMP4, REF_2);
+
+ vis_ld64(constants128[0], CONST_128);
+
+ ref += stride;
+ height = (height >> 1) - 1;
+
+ do { /* 24 cycles */
+ vis_ld64(ref[0], TMP0);
+ vis_xor(DST_0, REF_0, TMP6);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_and(TMP6, MASK_fe, TMP6);
+
+ vis_ld64_2(ref, 16, TMP4);
+ ref += stride;
+ vis_mul8x16(CONST_128, TMP6, TMP6);
+ vis_xor(DST_2, REF_2, TMP8);
+
+ vis_and(TMP8, MASK_fe, TMP8);
+
+ vis_or(DST_0, REF_0, TMP10);
+ vis_ld64_2(dest, stride, DST_0);
+ vis_mul8x16(CONST_128, TMP8, TMP8);
+
+ vis_or(DST_2, REF_2, TMP12);
+ vis_ld64_2(dest, stride_8, DST_2);
+
+ vis_ld64(ref[0], TMP14);
+ vis_and(TMP6, MASK_7f, TMP6);
+
+ vis_and(TMP8, MASK_7f, TMP8);
+
+ vis_psub16(TMP10, TMP6, TMP6);
+ vis_st64(TMP6, dest[0]);
+
+ vis_psub16(TMP12, TMP8, TMP8);
+ vis_st64_2(TMP8, dest, 8);
+
+ dest += stride;
+ vis_ld64_2(ref, 8, TMP16);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64_2(ref, 16, TMP18);
+ vis_faligndata(TMP2, TMP4, REF_2);
+ ref += stride;
+
+ vis_xor(DST_0, REF_0, TMP20);
+
+ vis_and(TMP20, MASK_fe, TMP20);
+
+ vis_xor(DST_2, REF_2, TMP22);
+ vis_mul8x16(CONST_128, TMP20, TMP20);
+
+ vis_and(TMP22, MASK_fe, TMP22);
+
+ vis_or(DST_0, REF_0, TMP24);
+ vis_mul8x16(CONST_128, TMP22, TMP22);
+
+ vis_or(DST_2, REF_2, TMP26);
+
+ vis_ld64_2(dest, stride, DST_0);
+ vis_faligndata(TMP14, TMP16, REF_0);
+
+ vis_ld64_2(dest, stride_8, DST_2);
+ vis_faligndata(TMP16, TMP18, REF_2);
+
+ vis_and(TMP20, MASK_7f, TMP20);
+
+ vis_and(TMP22, MASK_7f, TMP22);
+
+ vis_psub16(TMP24, TMP20, TMP20);
+ vis_st64(TMP20, dest[0]);
+
+ vis_psub16(TMP26, TMP22, TMP22);
+ vis_st64_2(TMP22, dest, 8);
+ dest += stride;
+ } while (--height);
+
+ vis_ld64(ref[0], TMP0);
+ vis_xor(DST_0, REF_0, TMP6);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_and(TMP6, MASK_fe, TMP6);
+
+ vis_ld64_2(ref, 16, TMP4);
+ vis_mul8x16(CONST_128, TMP6, TMP6);
+ vis_xor(DST_2, REF_2, TMP8);
+
+ vis_and(TMP8, MASK_fe, TMP8);
+
+ vis_or(DST_0, REF_0, TMP10);
+ vis_ld64_2(dest, stride, DST_0);
+ vis_mul8x16(CONST_128, TMP8, TMP8);
+
+ vis_or(DST_2, REF_2, TMP12);
+ vis_ld64_2(dest, stride_8, DST_2);
+
+ vis_ld64(ref[0], TMP14);
+ vis_and(TMP6, MASK_7f, TMP6);
+
+ vis_and(TMP8, MASK_7f, TMP8);
+
+ vis_psub16(TMP10, TMP6, TMP6);
+ vis_st64(TMP6, dest[0]);
+
+ vis_psub16(TMP12, TMP8, TMP8);
+ vis_st64_2(TMP8, dest, 8);
+
+ dest += stride;
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_faligndata(TMP2, TMP4, REF_2);
+
+ vis_xor(DST_0, REF_0, TMP20);
+
+ vis_and(TMP20, MASK_fe, TMP20);
+
+ vis_xor(DST_2, REF_2, TMP22);
+ vis_mul8x16(CONST_128, TMP20, TMP20);
+
+ vis_and(TMP22, MASK_fe, TMP22);
+
+ vis_or(DST_0, REF_0, TMP24);
+ vis_mul8x16(CONST_128, TMP22, TMP22);
+
+ vis_or(DST_2, REF_2, TMP26);
+
+ vis_and(TMP20, MASK_7f, TMP20);
+
+ vis_and(TMP22, MASK_7f, TMP22);
+
+ vis_psub16(TMP24, TMP20, TMP20);
+ vis_st64(TMP20, dest[0]);
+
+ vis_psub16(TMP26, TMP22, TMP22);
+ vis_st64_2(TMP22, dest, 8);
+}
+
+static void MC_avg_o_8_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ ref = vis_alignaddr(ref);
+
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64(ref[8], TMP2);
+
+ vis_ld64(dest[0], DST_0);
+
+ vis_ld64(constants_fe[0], MASK_fe);
+
+ vis_ld64(constants_7f[0], MASK_7f);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64(constants128[0], CONST_128);
+
+ ref += stride;
+ height = (height >> 1) - 1;
+
+ do { /* 12 cycles */
+ vis_ld64(ref[0], TMP0);
+ vis_xor(DST_0, REF_0, TMP4);
+
+ vis_ld64(ref[8], TMP2);
+ vis_and(TMP4, MASK_fe, TMP4);
+
+ vis_or(DST_0, REF_0, TMP6);
+ vis_ld64_2(dest, stride, DST_0);
+ ref += stride;
+ vis_mul8x16(CONST_128, TMP4, TMP4);
+
+ vis_ld64(ref[0], TMP12);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64(ref[8], TMP2);
+ vis_xor(DST_0, REF_0, TMP0);
+ ref += stride;
+
+ vis_and(TMP0, MASK_fe, TMP0);
+
+ vis_and(TMP4, MASK_7f, TMP4);
+
+ vis_psub16(TMP6, TMP4, TMP4);
+ vis_st64(TMP4, dest[0]);
+ dest += stride;
+ vis_mul8x16(CONST_128, TMP0, TMP0);
+
+ vis_or(DST_0, REF_0, TMP6);
+ vis_ld64_2(dest, stride, DST_0);
+
+ vis_faligndata(TMP12, TMP2, REF_0);
+
+ vis_and(TMP0, MASK_7f, TMP0);
+
+ vis_psub16(TMP6, TMP0, TMP4);
+ vis_st64(TMP4, dest[0]);
+ dest += stride;
+ } while (--height);
+
+ vis_ld64(ref[0], TMP0);
+ vis_xor(DST_0, REF_0, TMP4);
+
+ vis_ld64(ref[8], TMP2);
+ vis_and(TMP4, MASK_fe, TMP4);
+
+ vis_or(DST_0, REF_0, TMP6);
+ vis_ld64_2(dest, stride, DST_0);
+ vis_mul8x16(CONST_128, TMP4, TMP4);
+
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_xor(DST_0, REF_0, TMP0);
+
+ vis_and(TMP0, MASK_fe, TMP0);
+
+ vis_and(TMP4, MASK_7f, TMP4);
+
+ vis_psub16(TMP6, TMP4, TMP4);
+ vis_st64(TMP4, dest[0]);
+ dest += stride;
+ vis_mul8x16(CONST_128, TMP0, TMP0);
+
+ vis_or(DST_0, REF_0, TMP6);
+
+ vis_and(TMP0, MASK_7f, TMP0);
+
+ vis_psub16(TMP6, TMP0, TMP4);
+ vis_st64(TMP4, dest[0]);
+}
+
+static void MC_put_x_16_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ unsigned long off = (unsigned long) ref & 0x7;
+ unsigned long off_plus_1 = off + 1;
+
+ ref = vis_alignaddr(ref);
+
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64_2(ref, 8, TMP2);
+
+ vis_ld64_2(ref, 16, TMP4);
+
+ vis_ld64(constants_fe[0], MASK_fe);
+
+ vis_ld64(constants_7f[0], MASK_7f);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64(constants128[0], CONST_128);
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ vis_faligndata(TMP2, TMP4, REF_6);
+ } else {
+ vis_src1(TMP2, REF_2);
+ vis_src1(TMP4, REF_6);
+ }
+
+ ref += stride;
+ height = (height >> 1) - 1;
+
+ do { /* 34 cycles */
+ vis_ld64(ref[0], TMP0);
+ vis_xor(REF_0, REF_2, TMP6);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_xor(REF_4, REF_6, TMP8);
+
+ vis_ld64_2(ref, 16, TMP4);
+ vis_and(TMP6, MASK_fe, TMP6);
+ ref += stride;
+
+ vis_ld64(ref[0], TMP14);
+ vis_mul8x16(CONST_128, TMP6, TMP6);
+ vis_and(TMP8, MASK_fe, TMP8);
+
+ vis_ld64_2(ref, 8, TMP16);
+ vis_mul8x16(CONST_128, TMP8, TMP8);
+ vis_or(REF_0, REF_2, TMP10);
+
+ vis_ld64_2(ref, 16, TMP18);
+ ref += stride;
+ vis_or(REF_4, REF_6, TMP12);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ vis_faligndata(TMP2, TMP4, REF_6);
+ } else {
+ vis_src1(TMP2, REF_2);
+ vis_src1(TMP4, REF_6);
+ }
+
+ vis_and(TMP6, MASK_7f, TMP6);
+
+ vis_and(TMP8, MASK_7f, TMP8);
+
+ vis_psub16(TMP10, TMP6, TMP6);
+ vis_st64(TMP6, dest[0]);
+
+ vis_psub16(TMP12, TMP8, TMP8);
+ vis_st64_2(TMP8, dest, 8);
+ dest += stride;
+
+ vis_xor(REF_0, REF_2, TMP6);
+
+ vis_xor(REF_4, REF_6, TMP8);
+
+ vis_and(TMP6, MASK_fe, TMP6);
+
+ vis_mul8x16(CONST_128, TMP6, TMP6);
+ vis_and(TMP8, MASK_fe, TMP8);
+
+ vis_mul8x16(CONST_128, TMP8, TMP8);
+ vis_or(REF_0, REF_2, TMP10);
+
+ vis_or(REF_4, REF_6, TMP12);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_faligndata(TMP14, TMP16, REF_0);
+
+ vis_faligndata(TMP16, TMP18, REF_4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP14, TMP16, REF_2);
+ vis_faligndata(TMP16, TMP18, REF_6);
+ } else {
+ vis_src1(TMP16, REF_2);
+ vis_src1(TMP18, REF_6);
+ }
+
+ vis_and(TMP6, MASK_7f, TMP6);
+
+ vis_and(TMP8, MASK_7f, TMP8);
+
+ vis_psub16(TMP10, TMP6, TMP6);
+ vis_st64(TMP6, dest[0]);
+
+ vis_psub16(TMP12, TMP8, TMP8);
+ vis_st64_2(TMP8, dest, 8);
+ dest += stride;
+ } while (--height);
+
+ vis_ld64(ref[0], TMP0);
+ vis_xor(REF_0, REF_2, TMP6);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_xor(REF_4, REF_6, TMP8);
+
+ vis_ld64_2(ref, 16, TMP4);
+ vis_and(TMP6, MASK_fe, TMP6);
+
+ vis_mul8x16(CONST_128, TMP6, TMP6);
+ vis_and(TMP8, MASK_fe, TMP8);
+
+ vis_mul8x16(CONST_128, TMP8, TMP8);
+ vis_or(REF_0, REF_2, TMP10);
+
+ vis_or(REF_4, REF_6, TMP12);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ vis_faligndata(TMP2, TMP4, REF_6);
+ } else {
+ vis_src1(TMP2, REF_2);
+ vis_src1(TMP4, REF_6);
+ }
+
+ vis_and(TMP6, MASK_7f, TMP6);
+
+ vis_and(TMP8, MASK_7f, TMP8);
+
+ vis_psub16(TMP10, TMP6, TMP6);
+ vis_st64(TMP6, dest[0]);
+
+ vis_psub16(TMP12, TMP8, TMP8);
+ vis_st64_2(TMP8, dest, 8);
+ dest += stride;
+
+ vis_xor(REF_0, REF_2, TMP6);
+
+ vis_xor(REF_4, REF_6, TMP8);
+
+ vis_and(TMP6, MASK_fe, TMP6);
+
+ vis_mul8x16(CONST_128, TMP6, TMP6);
+ vis_and(TMP8, MASK_fe, TMP8);
+
+ vis_mul8x16(CONST_128, TMP8, TMP8);
+ vis_or(REF_0, REF_2, TMP10);
+
+ vis_or(REF_4, REF_6, TMP12);
+
+ vis_and(TMP6, MASK_7f, TMP6);
+
+ vis_and(TMP8, MASK_7f, TMP8);
+
+ vis_psub16(TMP10, TMP6, TMP6);
+ vis_st64(TMP6, dest[0]);
+
+ vis_psub16(TMP12, TMP8, TMP8);
+ vis_st64_2(TMP8, dest, 8);
+}
+
+static void MC_put_x_8_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ unsigned long off = (unsigned long) ref & 0x7;
+ unsigned long off_plus_1 = off + 1;
+
+ ref = vis_alignaddr(ref);
+
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64(ref[8], TMP2);
+
+ vis_ld64(constants_fe[0], MASK_fe);
+
+ vis_ld64(constants_7f[0], MASK_7f);
+
+ vis_ld64(constants128[0], CONST_128);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ } else {
+ vis_src1(TMP2, REF_2);
+ }
+
+ ref += stride;
+ height = (height >> 1) - 1;
+
+ do { /* 20 cycles */
+ vis_ld64(ref[0], TMP0);
+ vis_xor(REF_0, REF_2, TMP4);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_and(TMP4, MASK_fe, TMP4);
+ ref += stride;
+
+ vis_ld64(ref[0], TMP8);
+ vis_or(REF_0, REF_2, TMP6);
+ vis_mul8x16(CONST_128, TMP4, TMP4);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_ld64_2(ref, 8, TMP10);
+ ref += stride;
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ } else {
+ vis_src1(TMP2, REF_2);
+ }
+
+ vis_and(TMP4, MASK_7f, TMP4);
+
+ vis_psub16(TMP6, TMP4, DST_0);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+
+ vis_xor(REF_0, REF_2, TMP12);
+
+ vis_and(TMP12, MASK_fe, TMP12);
+
+ vis_or(REF_0, REF_2, TMP14);
+ vis_mul8x16(CONST_128, TMP12, TMP12);
+
+ vis_alignaddr_g0((void *)off);
+ vis_faligndata(TMP8, TMP10, REF_0);
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP8, TMP10, REF_2);
+ } else {
+ vis_src1(TMP10, REF_2);
+ }
+
+ vis_and(TMP12, MASK_7f, TMP12);
+
+ vis_psub16(TMP14, TMP12, DST_0);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+ } while (--height);
+
+ vis_ld64(ref[0], TMP0);
+ vis_xor(REF_0, REF_2, TMP4);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_and(TMP4, MASK_fe, TMP4);
+
+ vis_or(REF_0, REF_2, TMP6);
+ vis_mul8x16(CONST_128, TMP4, TMP4);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ } else {
+ vis_src1(TMP2, REF_2);
+ }
+
+ vis_and(TMP4, MASK_7f, TMP4);
+
+ vis_psub16(TMP6, TMP4, DST_0);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+
+ vis_xor(REF_0, REF_2, TMP12);
+
+ vis_and(TMP12, MASK_fe, TMP12);
+
+ vis_or(REF_0, REF_2, TMP14);
+ vis_mul8x16(CONST_128, TMP12, TMP12);
+
+ vis_and(TMP12, MASK_7f, TMP12);
+
+ vis_psub16(TMP14, TMP12, DST_0);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+}
+
+static void MC_avg_x_16_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ unsigned long off = (unsigned long) ref & 0x7;
+ unsigned long off_plus_1 = off + 1;
+
+ vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
+
+ vis_ld64(constants3[0], CONST_3);
+ vis_fzero(ZERO);
+ vis_ld64(constants256_512[0], CONST_256);
+
+ ref = vis_alignaddr(ref);
+ do { /* 26 cycles */
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64(ref[8], TMP2);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_ld64(ref[16], TMP4);
+
+ vis_ld64(dest[0], DST_0);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64(dest[8], DST_2);
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ vis_faligndata(TMP2, TMP4, REF_6);
+ } else {
+ vis_src1(TMP2, REF_2);
+ vis_src1(TMP4, REF_6);
+ }
+
+ vis_mul8x16au(REF_0, CONST_256, TMP0);
+
+ vis_pmerge(ZERO, REF_2, TMP4);
+ vis_mul8x16au(REF_0_1, CONST_256, TMP2);
+
+ vis_pmerge(ZERO, REF_2_1, TMP6);
+
+ vis_padd16(TMP0, TMP4, TMP0);
+
+ vis_mul8x16al(DST_0, CONST_512, TMP4);
+ vis_padd16(TMP2, TMP6, TMP2);
+
+ vis_mul8x16al(DST_1, CONST_512, TMP6);
+
+ vis_mul8x16au(REF_6, CONST_256, TMP12);
+
+ vis_padd16(TMP0, TMP4, TMP0);
+ vis_mul8x16au(REF_6_1, CONST_256, TMP14);
+
+ vis_padd16(TMP2, TMP6, TMP2);
+ vis_mul8x16au(REF_4, CONST_256, TMP16);
+
+ vis_padd16(TMP0, CONST_3, TMP8);
+ vis_mul8x16au(REF_4_1, CONST_256, TMP18);
+
+ vis_padd16(TMP2, CONST_3, TMP10);
+ vis_pack16(TMP8, DST_0);
+
+ vis_pack16(TMP10, DST_1);
+ vis_padd16(TMP16, TMP12, TMP0);
+
+ vis_st64(DST_0, dest[0]);
+ vis_mul8x16al(DST_2, CONST_512, TMP4);
+ vis_padd16(TMP18, TMP14, TMP2);
+
+ vis_mul8x16al(DST_3, CONST_512, TMP6);
+ vis_padd16(TMP0, CONST_3, TMP0);
+
+ vis_padd16(TMP2, CONST_3, TMP2);
+
+ vis_padd16(TMP0, TMP4, TMP0);
+
+ vis_padd16(TMP2, TMP6, TMP2);
+ vis_pack16(TMP0, DST_2);
+
+ vis_pack16(TMP2, DST_3);
+ vis_st64(DST_2, dest[8]);
+
+ ref += stride;
+ dest += stride;
+ } while (--height);
+}
+
+static void MC_avg_x_8_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ unsigned long off = (unsigned long) ref & 0x7;
+ unsigned long off_plus_1 = off + 1;
+ int stride_times_2 = stride << 1;
+
+ vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
+
+ vis_ld64(constants3[0], CONST_3);
+ vis_fzero(ZERO);
+ vis_ld64(constants256_512[0], CONST_256);
+
+ ref = vis_alignaddr(ref);
+ height >>= 2;
+ do { /* 47 cycles */
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64_2(ref, 8, TMP2);
+ ref += stride;
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_ld64(ref[0], TMP4);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64_2(ref, 8, TMP6);
+ ref += stride;
+
+ vis_ld64(ref[0], TMP8);
+
+ vis_ld64_2(ref, 8, TMP10);
+ ref += stride;
+ vis_faligndata(TMP4, TMP6, REF_4);
+
+ vis_ld64(ref[0], TMP12);
+
+ vis_ld64_2(ref, 8, TMP14);
+ ref += stride;
+ vis_faligndata(TMP8, TMP10, REF_S0);
+
+ vis_faligndata(TMP12, TMP14, REF_S4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+
+ vis_ld64(dest[0], DST_0);
+ vis_faligndata(TMP0, TMP2, REF_2);
+
+ vis_ld64_2(dest, stride, DST_2);
+ vis_faligndata(TMP4, TMP6, REF_6);
+
+ vis_faligndata(TMP8, TMP10, REF_S2);
+
+ vis_faligndata(TMP12, TMP14, REF_S6);
+ } else {
+ vis_ld64(dest[0], DST_0);
+ vis_src1(TMP2, REF_2);
+
+ vis_ld64_2(dest, stride, DST_2);
+ vis_src1(TMP6, REF_6);
+
+ vis_src1(TMP10, REF_S2);
+
+ vis_src1(TMP14, REF_S6);
+ }
+
+ vis_pmerge(ZERO, REF_0, TMP0);
+ vis_mul8x16au(REF_0_1, CONST_256, TMP2);
+
+ vis_pmerge(ZERO, REF_2, TMP4);
+ vis_mul8x16au(REF_2_1, CONST_256, TMP6);
+
+ vis_padd16(TMP0, CONST_3, TMP0);
+ vis_mul8x16al(DST_0, CONST_512, TMP16);
+
+ vis_padd16(TMP2, CONST_3, TMP2);
+ vis_mul8x16al(DST_1, CONST_512, TMP18);
+
+ vis_padd16(TMP0, TMP4, TMP0);
+ vis_mul8x16au(REF_4, CONST_256, TMP8);
+
+ vis_padd16(TMP2, TMP6, TMP2);
+ vis_mul8x16au(REF_4_1, CONST_256, TMP10);
+
+ vis_padd16(TMP0, TMP16, TMP0);
+ vis_mul8x16au(REF_6, CONST_256, TMP12);
+
+ vis_padd16(TMP2, TMP18, TMP2);
+ vis_mul8x16au(REF_6_1, CONST_256, TMP14);
+
+ vis_padd16(TMP8, CONST_3, TMP8);
+ vis_mul8x16al(DST_2, CONST_512, TMP16);
+
+ vis_padd16(TMP8, TMP12, TMP8);
+ vis_mul8x16al(DST_3, CONST_512, TMP18);
+
+ vis_padd16(TMP10, TMP14, TMP10);
+ vis_pack16(TMP0, DST_0);
+
+ vis_pack16(TMP2, DST_1);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+ vis_padd16(TMP10, CONST_3, TMP10);
+
+ vis_ld64_2(dest, stride, DST_0);
+ vis_padd16(TMP8, TMP16, TMP8);
+
+ vis_ld64_2(dest, stride_times_2, TMP4/*DST_2*/);
+ vis_padd16(TMP10, TMP18, TMP10);
+ vis_pack16(TMP8, DST_2);
+
+ vis_pack16(TMP10, DST_3);
+ vis_st64(DST_2, dest[0]);
+ dest += stride;
+
+ vis_mul8x16au(REF_S0_1, CONST_256, TMP2);
+ vis_pmerge(ZERO, REF_S0, TMP0);
+
+ vis_pmerge(ZERO, REF_S2, TMP24);
+ vis_mul8x16au(REF_S2_1, CONST_256, TMP6);
+
+ vis_padd16(TMP0, CONST_3, TMP0);
+ vis_mul8x16au(REF_S4, CONST_256, TMP8);
+
+ vis_padd16(TMP2, CONST_3, TMP2);
+ vis_mul8x16au(REF_S4_1, CONST_256, TMP10);
+
+ vis_padd16(TMP0, TMP24, TMP0);
+ vis_mul8x16au(REF_S6, CONST_256, TMP12);
+
+ vis_padd16(TMP2, TMP6, TMP2);
+ vis_mul8x16au(REF_S6_1, CONST_256, TMP14);
+
+ vis_padd16(TMP8, CONST_3, TMP8);
+ vis_mul8x16al(DST_0, CONST_512, TMP16);
+
+ vis_padd16(TMP10, CONST_3, TMP10);
+ vis_mul8x16al(DST_1, CONST_512, TMP18);
+
+ vis_padd16(TMP8, TMP12, TMP8);
+ vis_mul8x16al(TMP4/*DST_2*/, CONST_512, TMP20);
+
+ vis_mul8x16al(TMP5/*DST_3*/, CONST_512, TMP22);
+ vis_padd16(TMP0, TMP16, TMP0);
+
+ vis_padd16(TMP2, TMP18, TMP2);
+ vis_pack16(TMP0, DST_0);
+
+ vis_padd16(TMP10, TMP14, TMP10);
+ vis_pack16(TMP2, DST_1);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+
+ vis_padd16(TMP8, TMP20, TMP8);
+
+ vis_padd16(TMP10, TMP22, TMP10);
+ vis_pack16(TMP8, DST_2);
+
+ vis_pack16(TMP10, DST_3);
+ vis_st64(DST_2, dest[0]);
+ dest += stride;
+ } while (--height);
+}
+
+static void MC_put_y_16_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ ref = vis_alignaddr(ref);
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64_2(ref, 8, TMP2);
+
+ vis_ld64_2(ref, 16, TMP4);
+ ref += stride;
+
+ vis_ld64(ref[0], TMP6);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64_2(ref, 8, TMP8);
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ vis_ld64_2(ref, 16, TMP10);
+ ref += stride;
+
+ vis_ld64(constants_fe[0], MASK_fe);
+ vis_faligndata(TMP6, TMP8, REF_2);
+
+ vis_ld64(constants_7f[0], MASK_7f);
+ vis_faligndata(TMP8, TMP10, REF_6);
+
+ vis_ld64(constants128[0], CONST_128);
+ height = (height >> 1) - 1;
+ do { /* 24 cycles */
+ vis_ld64(ref[0], TMP0);
+ vis_xor(REF_0, REF_2, TMP12);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_xor(REF_4, REF_6, TMP16);
+
+ vis_ld64_2(ref, 16, TMP4);
+ ref += stride;
+ vis_or(REF_0, REF_2, TMP14);
+
+ vis_ld64(ref[0], TMP6);
+ vis_or(REF_4, REF_6, TMP18);
+
+ vis_ld64_2(ref, 8, TMP8);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64_2(ref, 16, TMP10);
+ ref += stride;
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ vis_and(TMP12, MASK_fe, TMP12);
+
+ vis_and(TMP16, MASK_fe, TMP16);
+ vis_mul8x16(CONST_128, TMP12, TMP12);
+
+ vis_mul8x16(CONST_128, TMP16, TMP16);
+ vis_xor(REF_0, REF_2, TMP0);
+
+ vis_xor(REF_4, REF_6, TMP2);
+
+ vis_or(REF_0, REF_2, TMP20);
+
+ vis_and(TMP12, MASK_7f, TMP12);
+
+ vis_and(TMP16, MASK_7f, TMP16);
+
+ vis_psub16(TMP14, TMP12, TMP12);
+ vis_st64(TMP12, dest[0]);
+
+ vis_psub16(TMP18, TMP16, TMP16);
+ vis_st64_2(TMP16, dest, 8);
+ dest += stride;
+
+ vis_or(REF_4, REF_6, TMP18);
+
+ vis_and(TMP0, MASK_fe, TMP0);
+
+ vis_and(TMP2, MASK_fe, TMP2);
+ vis_mul8x16(CONST_128, TMP0, TMP0);
+
+ vis_faligndata(TMP6, TMP8, REF_2);
+ vis_mul8x16(CONST_128, TMP2, TMP2);
+
+ vis_faligndata(TMP8, TMP10, REF_6);
+
+ vis_and(TMP0, MASK_7f, TMP0);
+
+ vis_and(TMP2, MASK_7f, TMP2);
+
+ vis_psub16(TMP20, TMP0, TMP0);
+ vis_st64(TMP0, dest[0]);
+
+ vis_psub16(TMP18, TMP2, TMP2);
+ vis_st64_2(TMP2, dest, 8);
+ dest += stride;
+ } while (--height);
+
+ vis_ld64(ref[0], TMP0);
+ vis_xor(REF_0, REF_2, TMP12);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_xor(REF_4, REF_6, TMP16);
+
+ vis_ld64_2(ref, 16, TMP4);
+ vis_or(REF_0, REF_2, TMP14);
+
+ vis_or(REF_4, REF_6, TMP18);
+
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ vis_and(TMP12, MASK_fe, TMP12);
+
+ vis_and(TMP16, MASK_fe, TMP16);
+ vis_mul8x16(CONST_128, TMP12, TMP12);
+
+ vis_mul8x16(CONST_128, TMP16, TMP16);
+ vis_xor(REF_0, REF_2, TMP0);
+
+ vis_xor(REF_4, REF_6, TMP2);
+
+ vis_or(REF_0, REF_2, TMP20);
+
+ vis_and(TMP12, MASK_7f, TMP12);
+
+ vis_and(TMP16, MASK_7f, TMP16);
+
+ vis_psub16(TMP14, TMP12, TMP12);
+ vis_st64(TMP12, dest[0]);
+
+ vis_psub16(TMP18, TMP16, TMP16);
+ vis_st64_2(TMP16, dest, 8);
+ dest += stride;
+
+ vis_or(REF_4, REF_6, TMP18);
+
+ vis_and(TMP0, MASK_fe, TMP0);
+
+ vis_and(TMP2, MASK_fe, TMP2);
+ vis_mul8x16(CONST_128, TMP0, TMP0);
+
+ vis_mul8x16(CONST_128, TMP2, TMP2);
+
+ vis_and(TMP0, MASK_7f, TMP0);
+
+ vis_and(TMP2, MASK_7f, TMP2);
+
+ vis_psub16(TMP20, TMP0, TMP0);
+ vis_st64(TMP0, dest[0]);
+
+ vis_psub16(TMP18, TMP2, TMP2);
+ vis_st64_2(TMP2, dest, 8);
+}
+
+static void MC_put_y_8_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ ref = vis_alignaddr(ref);
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64_2(ref, 8, TMP2);
+ ref += stride;
+
+ vis_ld64(ref[0], TMP4);
+
+ vis_ld64_2(ref, 8, TMP6);
+ ref += stride;
+
+ vis_ld64(constants_fe[0], MASK_fe);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64(constants_7f[0], MASK_7f);
+ vis_faligndata(TMP4, TMP6, REF_2);
+
+ vis_ld64(constants128[0], CONST_128);
+ height = (height >> 1) - 1;
+ do { /* 12 cycles */
+ vis_ld64(ref[0], TMP0);
+ vis_xor(REF_0, REF_2, TMP4);
+
+ vis_ld64_2(ref, 8, TMP2);
+ ref += stride;
+ vis_and(TMP4, MASK_fe, TMP4);
+
+ vis_or(REF_0, REF_2, TMP6);
+ vis_mul8x16(CONST_128, TMP4, TMP4);
+
+ vis_faligndata(TMP0, TMP2, REF_0);
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64_2(ref, 8, TMP2);
+ ref += stride;
+ vis_xor(REF_0, REF_2, TMP12);
+
+ vis_and(TMP4, MASK_7f, TMP4);
+
+ vis_and(TMP12, MASK_fe, TMP12);
+
+ vis_mul8x16(CONST_128, TMP12, TMP12);
+ vis_or(REF_0, REF_2, TMP14);
+
+ vis_psub16(TMP6, TMP4, DST_0);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+
+ vis_faligndata(TMP0, TMP2, REF_2);
+
+ vis_and(TMP12, MASK_7f, TMP12);
+
+ vis_psub16(TMP14, TMP12, DST_0);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+ } while (--height);
+
+ vis_ld64(ref[0], TMP0);
+ vis_xor(REF_0, REF_2, TMP4);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_and(TMP4, MASK_fe, TMP4);
+
+ vis_or(REF_0, REF_2, TMP6);
+ vis_mul8x16(CONST_128, TMP4, TMP4);
+
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_xor(REF_0, REF_2, TMP12);
+
+ vis_and(TMP4, MASK_7f, TMP4);
+
+ vis_and(TMP12, MASK_fe, TMP12);
+
+ vis_mul8x16(CONST_128, TMP12, TMP12);
+ vis_or(REF_0, REF_2, TMP14);
+
+ vis_psub16(TMP6, TMP4, DST_0);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+
+ vis_and(TMP12, MASK_7f, TMP12);
+
+ vis_psub16(TMP14, TMP12, DST_0);
+ vis_st64(DST_0, dest[0]);
+}
+
+static void MC_avg_y_16_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ int stride_8 = stride + 8;
+ int stride_16 = stride + 16;
+
+ vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
+
+ ref = vis_alignaddr(ref);
+
+ vis_ld64(ref[ 0], TMP0);
+ vis_fzero(ZERO);
+
+ vis_ld64(ref[ 8], TMP2);
+
+ vis_ld64(ref[16], TMP4);
+
+ vis_ld64(constants3[0], CONST_3);
+ vis_faligndata(TMP0, TMP2, REF_2);
+
+ vis_ld64(constants256_512[0], CONST_256);
+ vis_faligndata(TMP2, TMP4, REF_6);
+ height >>= 1;
+
+ do { /* 31 cycles */
+ vis_ld64_2(ref, stride, TMP0);
+ vis_pmerge(ZERO, REF_2, TMP12);
+ vis_mul8x16au(REF_2_1, CONST_256, TMP14);
+
+ vis_ld64_2(ref, stride_8, TMP2);
+ vis_pmerge(ZERO, REF_6, TMP16);
+ vis_mul8x16au(REF_6_1, CONST_256, TMP18);
+
+ vis_ld64_2(ref, stride_16, TMP4);
+ ref += stride;
+
+ vis_ld64(dest[0], DST_0);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64_2(dest, 8, DST_2);
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ vis_ld64_2(ref, stride, TMP6);
+ vis_pmerge(ZERO, REF_0, TMP0);
+ vis_mul8x16au(REF_0_1, CONST_256, TMP2);
+
+ vis_ld64_2(ref, stride_8, TMP8);
+ vis_pmerge(ZERO, REF_4, TMP4);
+
+ vis_ld64_2(ref, stride_16, TMP10);
+ ref += stride;
+
+ vis_ld64_2(dest, stride, REF_S0/*DST_4*/);
+ vis_faligndata(TMP6, TMP8, REF_2);
+ vis_mul8x16au(REF_4_1, CONST_256, TMP6);
+
+ vis_ld64_2(dest, stride_8, REF_S2/*DST_6*/);
+ vis_faligndata(TMP8, TMP10, REF_6);
+ vis_mul8x16al(DST_0, CONST_512, TMP20);
+
+ vis_padd16(TMP0, CONST_3, TMP0);
+ vis_mul8x16al(DST_1, CONST_512, TMP22);
+
+ vis_padd16(TMP2, CONST_3, TMP2);
+ vis_mul8x16al(DST_2, CONST_512, TMP24);
+
+ vis_padd16(TMP4, CONST_3, TMP4);
+ vis_mul8x16al(DST_3, CONST_512, TMP26);
+
+ vis_padd16(TMP6, CONST_3, TMP6);
+
+ vis_padd16(TMP12, TMP20, TMP12);
+ vis_mul8x16al(REF_S0, CONST_512, TMP20);
+
+ vis_padd16(TMP14, TMP22, TMP14);
+ vis_mul8x16al(REF_S0_1, CONST_512, TMP22);
+
+ vis_padd16(TMP16, TMP24, TMP16);
+ vis_mul8x16al(REF_S2, CONST_512, TMP24);
+
+ vis_padd16(TMP18, TMP26, TMP18);
+ vis_mul8x16al(REF_S2_1, CONST_512, TMP26);
+
+ vis_padd16(TMP12, TMP0, TMP12);
+ vis_mul8x16au(REF_2, CONST_256, TMP28);
+
+ vis_padd16(TMP14, TMP2, TMP14);
+ vis_mul8x16au(REF_2_1, CONST_256, TMP30);
+
+ vis_padd16(TMP16, TMP4, TMP16);
+ vis_mul8x16au(REF_6, CONST_256, REF_S4);
+
+ vis_padd16(TMP18, TMP6, TMP18);
+ vis_mul8x16au(REF_6_1, CONST_256, REF_S6);
+
+ vis_pack16(TMP12, DST_0);
+ vis_padd16(TMP28, TMP0, TMP12);
+
+ vis_pack16(TMP14, DST_1);
+ vis_st64(DST_0, dest[0]);
+ vis_padd16(TMP30, TMP2, TMP14);
+
+ vis_pack16(TMP16, DST_2);
+ vis_padd16(REF_S4, TMP4, TMP16);
+
+ vis_pack16(TMP18, DST_3);
+ vis_st64_2(DST_2, dest, 8);
+ dest += stride;
+ vis_padd16(REF_S6, TMP6, TMP18);
+
+ vis_padd16(TMP12, TMP20, TMP12);
+
+ vis_padd16(TMP14, TMP22, TMP14);
+ vis_pack16(TMP12, DST_0);
+
+ vis_padd16(TMP16, TMP24, TMP16);
+ vis_pack16(TMP14, DST_1);
+ vis_st64(DST_0, dest[0]);
+
+ vis_padd16(TMP18, TMP26, TMP18);
+ vis_pack16(TMP16, DST_2);
+
+ vis_pack16(TMP18, DST_3);
+ vis_st64_2(DST_2, dest, 8);
+ dest += stride;
+ } while (--height);
+}
+
+static void MC_avg_y_8_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ int stride_8 = stride + 8;
+
+ vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
+
+ ref = vis_alignaddr(ref);
+
+ vis_ld64(ref[ 0], TMP0);
+ vis_fzero(ZERO);
+
+ vis_ld64(ref[ 8], TMP2);
+
+ vis_ld64(constants3[0], CONST_3);
+ vis_faligndata(TMP0, TMP2, REF_2);
+
+ vis_ld64(constants256_512[0], CONST_256);
+
+ height >>= 1;
+ do { /* 20 cycles */
+ vis_ld64_2(ref, stride, TMP0);
+ vis_pmerge(ZERO, REF_2, TMP8);
+ vis_mul8x16au(REF_2_1, CONST_256, TMP10);
+
+ vis_ld64_2(ref, stride_8, TMP2);
+ ref += stride;
+
+ vis_ld64(dest[0], DST_0);
+
+ vis_ld64_2(dest, stride, DST_2);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64_2(ref, stride, TMP4);
+ vis_mul8x16al(DST_0, CONST_512, TMP16);
+ vis_pmerge(ZERO, REF_0, TMP12);
+
+ vis_ld64_2(ref, stride_8, TMP6);
+ ref += stride;
+ vis_mul8x16al(DST_1, CONST_512, TMP18);
+ vis_pmerge(ZERO, REF_0_1, TMP14);
+
+ vis_padd16(TMP12, CONST_3, TMP12);
+ vis_mul8x16al(DST_2, CONST_512, TMP24);
+
+ vis_padd16(TMP14, CONST_3, TMP14);
+ vis_mul8x16al(DST_3, CONST_512, TMP26);
+
+ vis_faligndata(TMP4, TMP6, REF_2);
+
+ vis_padd16(TMP8, TMP12, TMP8);
+
+ vis_padd16(TMP10, TMP14, TMP10);
+ vis_mul8x16au(REF_2, CONST_256, TMP20);
+
+ vis_padd16(TMP8, TMP16, TMP0);
+ vis_mul8x16au(REF_2_1, CONST_256, TMP22);
+
+ vis_padd16(TMP10, TMP18, TMP2);
+ vis_pack16(TMP0, DST_0);
+
+ vis_pack16(TMP2, DST_1);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+ vis_padd16(TMP12, TMP20, TMP12);
+
+ vis_padd16(TMP14, TMP22, TMP14);
+
+ vis_padd16(TMP12, TMP24, TMP0);
+
+ vis_padd16(TMP14, TMP26, TMP2);
+ vis_pack16(TMP0, DST_2);
+
+ vis_pack16(TMP2, DST_3);
+ vis_st64(DST_2, dest[0]);
+ dest += stride;
+ } while (--height);
+}
+
+static void MC_put_xy_16_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ unsigned long off = (unsigned long) ref & 0x7;
+ unsigned long off_plus_1 = off + 1;
+ int stride_8 = stride + 8;
+ int stride_16 = stride + 16;
+
+ vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
+
+ ref = vis_alignaddr(ref);
+
+ vis_ld64(ref[ 0], TMP0);
+ vis_fzero(ZERO);
+
+ vis_ld64(ref[ 8], TMP2);
+
+ vis_ld64(ref[16], TMP4);
+
+ vis_ld64(constants2[0], CONST_2);
+ vis_faligndata(TMP0, TMP2, REF_S0);
+
+ vis_ld64(constants256_512[0], CONST_256);
+ vis_faligndata(TMP2, TMP4, REF_S4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_S2);
+ vis_faligndata(TMP2, TMP4, REF_S6);
+ } else {
+ vis_src1(TMP2, REF_S2);
+ vis_src1(TMP4, REF_S6);
+ }
+
+ height >>= 1;
+ do {
+ vis_ld64_2(ref, stride, TMP0);
+ vis_mul8x16au(REF_S0, CONST_256, TMP12);
+ vis_pmerge(ZERO, REF_S0_1, TMP14);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_ld64_2(ref, stride_8, TMP2);
+ vis_mul8x16au(REF_S2, CONST_256, TMP16);
+ vis_pmerge(ZERO, REF_S2_1, TMP18);
+
+ vis_ld64_2(ref, stride_16, TMP4);
+ ref += stride;
+ vis_mul8x16au(REF_S4, CONST_256, TMP20);
+ vis_pmerge(ZERO, REF_S4_1, TMP22);
+
+ vis_ld64_2(ref, stride, TMP6);
+ vis_mul8x16au(REF_S6, CONST_256, TMP24);
+ vis_pmerge(ZERO, REF_S6_1, TMP26);
+
+ vis_ld64_2(ref, stride_8, TMP8);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64_2(ref, stride_16, TMP10);
+ ref += stride;
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ vis_faligndata(TMP6, TMP8, REF_S0);
+
+ vis_faligndata(TMP8, TMP10, REF_S4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ vis_faligndata(TMP2, TMP4, REF_6);
+ vis_faligndata(TMP6, TMP8, REF_S2);
+ vis_faligndata(TMP8, TMP10, REF_S6);
+ } else {
+ vis_src1(TMP2, REF_2);
+ vis_src1(TMP4, REF_6);
+ vis_src1(TMP8, REF_S2);
+ vis_src1(TMP10, REF_S6);
+ }
+
+ vis_mul8x16au(REF_0, CONST_256, TMP0);
+ vis_pmerge(ZERO, REF_0_1, TMP2);
+
+ vis_mul8x16au(REF_2, CONST_256, TMP4);
+ vis_pmerge(ZERO, REF_2_1, TMP6);
+
+ vis_padd16(TMP0, CONST_2, TMP8);
+ vis_mul8x16au(REF_4, CONST_256, TMP0);
+
+ vis_padd16(TMP2, CONST_2, TMP10);
+ vis_mul8x16au(REF_4_1, CONST_256, TMP2);
+
+ vis_padd16(TMP8, TMP4, TMP8);
+ vis_mul8x16au(REF_6, CONST_256, TMP4);
+
+ vis_padd16(TMP10, TMP6, TMP10);
+ vis_mul8x16au(REF_6_1, CONST_256, TMP6);
+
+ vis_padd16(TMP12, TMP8, TMP12);
+
+ vis_padd16(TMP14, TMP10, TMP14);
+
+ vis_padd16(TMP12, TMP16, TMP12);
+
+ vis_padd16(TMP14, TMP18, TMP14);
+ vis_pack16(TMP12, DST_0);
+
+ vis_pack16(TMP14, DST_1);
+ vis_st64(DST_0, dest[0]);
+ vis_padd16(TMP0, CONST_2, TMP12);
+
+ vis_mul8x16au(REF_S0, CONST_256, TMP0);
+ vis_padd16(TMP2, CONST_2, TMP14);
+
+ vis_mul8x16au(REF_S0_1, CONST_256, TMP2);
+ vis_padd16(TMP12, TMP4, TMP12);
+
+ vis_mul8x16au(REF_S2, CONST_256, TMP4);
+ vis_padd16(TMP14, TMP6, TMP14);
+
+ vis_mul8x16au(REF_S2_1, CONST_256, TMP6);
+ vis_padd16(TMP20, TMP12, TMP20);
+
+ vis_padd16(TMP22, TMP14, TMP22);
+
+ vis_padd16(TMP20, TMP24, TMP20);
+
+ vis_padd16(TMP22, TMP26, TMP22);
+ vis_pack16(TMP20, DST_2);
+
+ vis_pack16(TMP22, DST_3);
+ vis_st64_2(DST_2, dest, 8);
+ dest += stride;
+ vis_padd16(TMP0, TMP4, TMP24);
+
+ vis_mul8x16au(REF_S4, CONST_256, TMP0);
+ vis_padd16(TMP2, TMP6, TMP26);
+
+ vis_mul8x16au(REF_S4_1, CONST_256, TMP2);
+ vis_padd16(TMP24, TMP8, TMP24);
+
+ vis_padd16(TMP26, TMP10, TMP26);
+ vis_pack16(TMP24, DST_0);
+
+ vis_pack16(TMP26, DST_1);
+ vis_st64(DST_0, dest[0]);
+ vis_pmerge(ZERO, REF_S6, TMP4);
+
+ vis_pmerge(ZERO, REF_S6_1, TMP6);
+
+ vis_padd16(TMP0, TMP4, TMP0);
+
+ vis_padd16(TMP2, TMP6, TMP2);
+
+ vis_padd16(TMP0, TMP12, TMP0);
+
+ vis_padd16(TMP2, TMP14, TMP2);
+ vis_pack16(TMP0, DST_2);
+
+ vis_pack16(TMP2, DST_3);
+ vis_st64_2(DST_2, dest, 8);
+ dest += stride;
+ } while (--height);
+}
+
+static void MC_put_xy_8_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ unsigned long off = (unsigned long) ref & 0x7;
+ unsigned long off_plus_1 = off + 1;
+ int stride_8 = stride + 8;
+
+ vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
+
+ ref = vis_alignaddr(ref);
+
+ vis_ld64(ref[ 0], TMP0);
+ vis_fzero(ZERO);
+
+ vis_ld64(ref[ 8], TMP2);
+
+ vis_ld64(constants2[0], CONST_2);
+
+ vis_ld64(constants256_512[0], CONST_256);
+ vis_faligndata(TMP0, TMP2, REF_S0);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_S2);
+ } else {
+ vis_src1(TMP2, REF_S2);
+ }
+
+ height >>= 1;
+ do { /* 26 cycles */
+ vis_ld64_2(ref, stride, TMP0);
+ vis_mul8x16au(REF_S0, CONST_256, TMP8);
+ vis_pmerge(ZERO, REF_S2, TMP12);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_ld64_2(ref, stride_8, TMP2);
+ ref += stride;
+ vis_mul8x16au(REF_S0_1, CONST_256, TMP10);
+ vis_pmerge(ZERO, REF_S2_1, TMP14);
+
+ vis_ld64_2(ref, stride, TMP4);
+
+ vis_ld64_2(ref, stride_8, TMP6);
+ ref += stride;
+ vis_faligndata(TMP0, TMP2, REF_S4);
+
+ vis_pmerge(ZERO, REF_S4, TMP18);
+
+ vis_pmerge(ZERO, REF_S4_1, TMP20);
+
+ vis_faligndata(TMP4, TMP6, REF_S0);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_S6);
+ vis_faligndata(TMP4, TMP6, REF_S2);
+ } else {
+ vis_src1(TMP2, REF_S6);
+ vis_src1(TMP6, REF_S2);
+ }
+
+ vis_padd16(TMP18, CONST_2, TMP18);
+ vis_mul8x16au(REF_S6, CONST_256, TMP22);
+
+ vis_padd16(TMP20, CONST_2, TMP20);
+ vis_mul8x16au(REF_S6_1, CONST_256, TMP24);
+
+ vis_mul8x16au(REF_S0, CONST_256, TMP26);
+ vis_pmerge(ZERO, REF_S0_1, TMP28);
+
+ vis_mul8x16au(REF_S2, CONST_256, TMP30);
+ vis_padd16(TMP18, TMP22, TMP18);
+
+ vis_mul8x16au(REF_S2_1, CONST_256, TMP32);
+ vis_padd16(TMP20, TMP24, TMP20);
+
+ vis_padd16(TMP8, TMP18, TMP8);
+
+ vis_padd16(TMP10, TMP20, TMP10);
+
+ vis_padd16(TMP8, TMP12, TMP8);
+
+ vis_padd16(TMP10, TMP14, TMP10);
+ vis_pack16(TMP8, DST_0);
+
+ vis_pack16(TMP10, DST_1);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+ vis_padd16(TMP18, TMP26, TMP18);
+
+ vis_padd16(TMP20, TMP28, TMP20);
+
+ vis_padd16(TMP18, TMP30, TMP18);
+
+ vis_padd16(TMP20, TMP32, TMP20);
+ vis_pack16(TMP18, DST_2);
+
+ vis_pack16(TMP20, DST_3);
+ vis_st64(DST_2, dest[0]);
+ dest += stride;
+ } while (--height);
+}
+
+static void MC_avg_xy_16_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ unsigned long off = (unsigned long) ref & 0x7;
+ unsigned long off_plus_1 = off + 1;
+ int stride_8 = stride + 8;
+ int stride_16 = stride + 16;
+
+ vis_set_gsr(4 << VIS_GSR_SCALEFACT_SHIFT);
+
+ ref = vis_alignaddr(ref);
+
+ vis_ld64(ref[ 0], TMP0);
+ vis_fzero(ZERO);
+
+ vis_ld64(ref[ 8], TMP2);
+
+ vis_ld64(ref[16], TMP4);
+
+ vis_ld64(constants6[0], CONST_6);
+ vis_faligndata(TMP0, TMP2, REF_S0);
+
+ vis_ld64(constants256_1024[0], CONST_256);
+ vis_faligndata(TMP2, TMP4, REF_S4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_S2);
+ vis_faligndata(TMP2, TMP4, REF_S6);
+ } else {
+ vis_src1(TMP2, REF_S2);
+ vis_src1(TMP4, REF_S6);
+ }
+
+ height >>= 1;
+ do { /* 55 cycles */
+ vis_ld64_2(ref, stride, TMP0);
+ vis_mul8x16au(REF_S0, CONST_256, TMP12);
+ vis_pmerge(ZERO, REF_S0_1, TMP14);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_ld64_2(ref, stride_8, TMP2);
+ vis_mul8x16au(REF_S2, CONST_256, TMP16);
+ vis_pmerge(ZERO, REF_S2_1, TMP18);
+
+ vis_ld64_2(ref, stride_16, TMP4);
+ ref += stride;
+ vis_mul8x16au(REF_S4, CONST_256, TMP20);
+ vis_pmerge(ZERO, REF_S4_1, TMP22);
+
+ vis_ld64_2(ref, stride, TMP6);
+ vis_mul8x16au(REF_S6, CONST_256, TMP24);
+ vis_pmerge(ZERO, REF_S6_1, TMP26);
+
+ vis_ld64_2(ref, stride_8, TMP8);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64_2(ref, stride_16, TMP10);
+ ref += stride;
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ vis_ld64(dest[0], DST_0);
+ vis_faligndata(TMP6, TMP8, REF_S0);
+
+ vis_ld64_2(dest, 8, DST_2);
+ vis_faligndata(TMP8, TMP10, REF_S4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ vis_faligndata(TMP2, TMP4, REF_6);
+ vis_faligndata(TMP6, TMP8, REF_S2);
+ vis_faligndata(TMP8, TMP10, REF_S6);
+ } else {
+ vis_src1(TMP2, REF_2);
+ vis_src1(TMP4, REF_6);
+ vis_src1(TMP8, REF_S2);
+ vis_src1(TMP10, REF_S6);
+ }
+
+ vis_mul8x16al(DST_0, CONST_1024, TMP30);
+ vis_pmerge(ZERO, REF_0, TMP0);
+
+ vis_mul8x16al(DST_1, CONST_1024, TMP32);
+ vis_pmerge(ZERO, REF_0_1, TMP2);
+
+ vis_mul8x16au(REF_2, CONST_256, TMP4);
+ vis_pmerge(ZERO, REF_2_1, TMP6);
+
+ vis_mul8x16al(DST_2, CONST_1024, REF_0);
+ vis_padd16(TMP0, CONST_6, TMP0);
+
+ vis_mul8x16al(DST_3, CONST_1024, REF_2);
+ vis_padd16(TMP2, CONST_6, TMP2);
+
+ vis_padd16(TMP0, TMP4, TMP0);
+ vis_mul8x16au(REF_4, CONST_256, TMP4);
+
+ vis_padd16(TMP2, TMP6, TMP2);
+ vis_mul8x16au(REF_4_1, CONST_256, TMP6);
+
+ vis_padd16(TMP12, TMP0, TMP12);
+ vis_mul8x16au(REF_6, CONST_256, TMP8);
+
+ vis_padd16(TMP14, TMP2, TMP14);
+ vis_mul8x16au(REF_6_1, CONST_256, TMP10);
+
+ vis_padd16(TMP12, TMP16, TMP12);
+ vis_mul8x16au(REF_S0, CONST_256, REF_4);
+
+ vis_padd16(TMP14, TMP18, TMP14);
+ vis_mul8x16au(REF_S0_1, CONST_256, REF_6);
+
+ vis_padd16(TMP12, TMP30, TMP12);
+
+ vis_padd16(TMP14, TMP32, TMP14);
+ vis_pack16(TMP12, DST_0);
+
+ vis_pack16(TMP14, DST_1);
+ vis_st64(DST_0, dest[0]);
+ vis_padd16(TMP4, CONST_6, TMP4);
+
+ vis_ld64_2(dest, stride, DST_0);
+ vis_padd16(TMP6, CONST_6, TMP6);
+ vis_mul8x16au(REF_S2, CONST_256, TMP12);
+
+ vis_padd16(TMP4, TMP8, TMP4);
+ vis_mul8x16au(REF_S2_1, CONST_256, TMP14);
+
+ vis_padd16(TMP6, TMP10, TMP6);
+
+ vis_padd16(TMP20, TMP4, TMP20);
+
+ vis_padd16(TMP22, TMP6, TMP22);
+
+ vis_padd16(TMP20, TMP24, TMP20);
+
+ vis_padd16(TMP22, TMP26, TMP22);
+
+ vis_padd16(TMP20, REF_0, TMP20);
+ vis_mul8x16au(REF_S4, CONST_256, REF_0);
+
+ vis_padd16(TMP22, REF_2, TMP22);
+ vis_pack16(TMP20, DST_2);
+
+ vis_pack16(TMP22, DST_3);
+ vis_st64_2(DST_2, dest, 8);
+ dest += stride;
+
+ vis_ld64_2(dest, 8, DST_2);
+ vis_mul8x16al(DST_0, CONST_1024, TMP30);
+ vis_pmerge(ZERO, REF_S4_1, REF_2);
+
+ vis_mul8x16al(DST_1, CONST_1024, TMP32);
+ vis_padd16(REF_4, TMP0, TMP8);
+
+ vis_mul8x16au(REF_S6, CONST_256, REF_4);
+ vis_padd16(REF_6, TMP2, TMP10);
+
+ vis_mul8x16au(REF_S6_1, CONST_256, REF_6);
+ vis_padd16(TMP8, TMP12, TMP8);
+
+ vis_padd16(TMP10, TMP14, TMP10);
+
+ vis_padd16(TMP8, TMP30, TMP8);
+
+ vis_padd16(TMP10, TMP32, TMP10);
+ vis_pack16(TMP8, DST_0);
+
+ vis_pack16(TMP10, DST_1);
+ vis_st64(DST_0, dest[0]);
+
+ vis_padd16(REF_0, TMP4, REF_0);
+
+ vis_mul8x16al(DST_2, CONST_1024, TMP30);
+ vis_padd16(REF_2, TMP6, REF_2);
+
+ vis_mul8x16al(DST_3, CONST_1024, TMP32);
+ vis_padd16(REF_0, REF_4, REF_0);
+
+ vis_padd16(REF_2, REF_6, REF_2);
+
+ vis_padd16(REF_0, TMP30, REF_0);
+
+ /* stall */
+
+ vis_padd16(REF_2, TMP32, REF_2);
+ vis_pack16(REF_0, DST_2);
+
+ vis_pack16(REF_2, DST_3);
+ vis_st64_2(DST_2, dest, 8);
+ dest += stride;
+ } while (--height);
+}
+
+static void MC_avg_xy_8_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ unsigned long off = (unsigned long) ref & 0x7;
+ unsigned long off_plus_1 = off + 1;
+ int stride_8 = stride + 8;
+
+ vis_set_gsr(4 << VIS_GSR_SCALEFACT_SHIFT);
+
+ ref = vis_alignaddr(ref);
+
+ vis_ld64(ref[0], TMP0);
+ vis_fzero(ZERO);
+
+ vis_ld64_2(ref, 8, TMP2);
+
+ vis_ld64(constants6[0], CONST_6);
+
+ vis_ld64(constants256_1024[0], CONST_256);
+ vis_faligndata(TMP0, TMP2, REF_S0);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_S2);
+ } else {
+ vis_src1(TMP2, REF_S2);
+ }
+
+ height >>= 1;
+ do { /* 31 cycles */
+ vis_ld64_2(ref, stride, TMP0);
+ vis_mul8x16au(REF_S0, CONST_256, TMP8);
+ vis_pmerge(ZERO, REF_S0_1, TMP10);
+
+ vis_ld64_2(ref, stride_8, TMP2);
+ ref += stride;
+ vis_mul8x16au(REF_S2, CONST_256, TMP12);
+ vis_pmerge(ZERO, REF_S2_1, TMP14);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_ld64_2(ref, stride, TMP4);
+ vis_faligndata(TMP0, TMP2, REF_S4);
+
+ vis_ld64_2(ref, stride_8, TMP6);
+ ref += stride;
+
+ vis_ld64(dest[0], DST_0);
+ vis_faligndata(TMP4, TMP6, REF_S0);
+
+ vis_ld64_2(dest, stride, DST_2);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_S6);
+ vis_faligndata(TMP4, TMP6, REF_S2);
+ } else {
+ vis_src1(TMP2, REF_S6);
+ vis_src1(TMP6, REF_S2);
+ }
+
+ vis_mul8x16al(DST_0, CONST_1024, TMP30);
+ vis_pmerge(ZERO, REF_S4, TMP22);
+
+ vis_mul8x16al(DST_1, CONST_1024, TMP32);
+ vis_pmerge(ZERO, REF_S4_1, TMP24);
+
+ vis_mul8x16au(REF_S6, CONST_256, TMP26);
+ vis_pmerge(ZERO, REF_S6_1, TMP28);
+
+ vis_mul8x16au(REF_S0, CONST_256, REF_S4);
+ vis_padd16(TMP22, CONST_6, TMP22);
+
+ vis_mul8x16au(REF_S0_1, CONST_256, REF_S6);
+ vis_padd16(TMP24, CONST_6, TMP24);
+
+ vis_mul8x16al(DST_2, CONST_1024, REF_0);
+ vis_padd16(TMP22, TMP26, TMP22);
+
+ vis_mul8x16al(DST_3, CONST_1024, REF_2);
+ vis_padd16(TMP24, TMP28, TMP24);
+
+ vis_mul8x16au(REF_S2, CONST_256, TMP26);
+ vis_padd16(TMP8, TMP22, TMP8);
+
+ vis_mul8x16au(REF_S2_1, CONST_256, TMP28);
+ vis_padd16(TMP10, TMP24, TMP10);
+
+ vis_padd16(TMP8, TMP12, TMP8);
+
+ vis_padd16(TMP10, TMP14, TMP10);
+
+ vis_padd16(TMP8, TMP30, TMP8);
+
+ vis_padd16(TMP10, TMP32, TMP10);
+ vis_pack16(TMP8, DST_0);
+
+ vis_pack16(TMP10, DST_1);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+
+ vis_padd16(REF_S4, TMP22, TMP12);
+
+ vis_padd16(REF_S6, TMP24, TMP14);
+
+ vis_padd16(TMP12, TMP26, TMP12);
+
+ vis_padd16(TMP14, TMP28, TMP14);
+
+ vis_padd16(TMP12, REF_0, TMP12);
+
+ vis_padd16(TMP14, REF_2, TMP14);
+ vis_pack16(TMP12, DST_2);
+
+ vis_pack16(TMP14, DST_3);
+ vis_st64(DST_2, dest[0]);
+ dest += stride;
+ } while (--height);
+}
+
+/* End of rounding code */
+
+/* Start of no rounding code */
+/* The trick used in some of this file is the formula from the MMX
+ * motion comp code, which is:
+ *
+ * (x+y)>>1 == (x&y)+((x^y)>>1)
+ *
+ * This allows us to average 8 bytes at a time in a 64-bit FPU reg.
+ * We avoid overflows by masking before we do the shift, and we
+ * implement the shift by multiplying by 1/2 using mul8x16. So in
+ * VIS this is (assume 'x' is in f0, 'y' is in f2, a repeating mask
+ * of '0xfe' is in f4, a repeating mask of '0x7f' is in f6, and
+ * the value 0x80808080 is in f8):
+ *
+ * fxor f0, f2, f10
+ * fand f10, f4, f10
+ * fmul8x16 f8, f10, f10
+ * fand f10, f6, f10
+ * fand f0, f2, f12
+ * fpadd16 f12, f10, f10
+ */
+
+static void MC_put_no_round_o_16_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ ref = vis_alignaddr(ref);
+ do { /* 5 cycles */
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64_2(ref, 8, TMP2);
+
+ vis_ld64_2(ref, 16, TMP4);
+ ref += stride;
+
+ vis_faligndata(TMP0, TMP2, REF_0);
+ vis_st64(REF_0, dest[0]);
+
+ vis_faligndata(TMP2, TMP4, REF_2);
+ vis_st64_2(REF_2, dest, 8);
+ dest += stride;
+ } while (--height);
+}
+
+static void MC_put_no_round_o_8_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ ref = vis_alignaddr(ref);
+ do { /* 4 cycles */
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64(ref[8], TMP2);
+ ref += stride;
+
+ /* stall */
+
+ vis_faligndata(TMP0, TMP2, REF_0);
+ vis_st64(REF_0, dest[0]);
+ dest += stride;
+ } while (--height);
+}
+
+
+static void MC_avg_no_round_o_16_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ int stride_8 = stride + 8;
+
+ ref = vis_alignaddr(ref);
+
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64(ref[8], TMP2);
+
+ vis_ld64(ref[16], TMP4);
+
+ vis_ld64(dest[0], DST_0);
+
+ vis_ld64(dest[8], DST_2);
+
+ vis_ld64(constants_fe[0], MASK_fe);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64(constants_7f[0], MASK_7f);
+ vis_faligndata(TMP2, TMP4, REF_2);
+
+ vis_ld64(constants128[0], CONST_128);
+
+ ref += stride;
+ height = (height >> 1) - 1;
+
+ do { /* 24 cycles */
+ vis_ld64(ref[0], TMP0);
+ vis_xor(DST_0, REF_0, TMP6);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_and(TMP6, MASK_fe, TMP6);
+
+ vis_ld64_2(ref, 16, TMP4);
+ ref += stride;
+ vis_mul8x16(CONST_128, TMP6, TMP6);
+ vis_xor(DST_2, REF_2, TMP8);
+
+ vis_and(TMP8, MASK_fe, TMP8);
+
+ vis_and(DST_0, REF_0, TMP10);
+ vis_ld64_2(dest, stride, DST_0);
+ vis_mul8x16(CONST_128, TMP8, TMP8);
+
+ vis_and(DST_2, REF_2, TMP12);
+ vis_ld64_2(dest, stride_8, DST_2);
+
+ vis_ld64(ref[0], TMP14);
+ vis_and(TMP6, MASK_7f, TMP6);
+
+ vis_and(TMP8, MASK_7f, TMP8);
+
+ vis_padd16(TMP10, TMP6, TMP6);
+ vis_st64(TMP6, dest[0]);
+
+ vis_padd16(TMP12, TMP8, TMP8);
+ vis_st64_2(TMP8, dest, 8);
+
+ dest += stride;
+ vis_ld64_2(ref, 8, TMP16);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64_2(ref, 16, TMP18);
+ vis_faligndata(TMP2, TMP4, REF_2);
+ ref += stride;
+
+ vis_xor(DST_0, REF_0, TMP20);
+
+ vis_and(TMP20, MASK_fe, TMP20);
+
+ vis_xor(DST_2, REF_2, TMP22);
+ vis_mul8x16(CONST_128, TMP20, TMP20);
+
+ vis_and(TMP22, MASK_fe, TMP22);
+
+ vis_and(DST_0, REF_0, TMP24);
+ vis_mul8x16(CONST_128, TMP22, TMP22);
+
+ vis_and(DST_2, REF_2, TMP26);
+
+ vis_ld64_2(dest, stride, DST_0);
+ vis_faligndata(TMP14, TMP16, REF_0);
+
+ vis_ld64_2(dest, stride_8, DST_2);
+ vis_faligndata(TMP16, TMP18, REF_2);
+
+ vis_and(TMP20, MASK_7f, TMP20);
+
+ vis_and(TMP22, MASK_7f, TMP22);
+
+ vis_padd16(TMP24, TMP20, TMP20);
+ vis_st64(TMP20, dest[0]);
+
+ vis_padd16(TMP26, TMP22, TMP22);
+ vis_st64_2(TMP22, dest, 8);
+ dest += stride;
+ } while (--height);
+
+ vis_ld64(ref[0], TMP0);
+ vis_xor(DST_0, REF_0, TMP6);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_and(TMP6, MASK_fe, TMP6);
+
+ vis_ld64_2(ref, 16, TMP4);
+ vis_mul8x16(CONST_128, TMP6, TMP6);
+ vis_xor(DST_2, REF_2, TMP8);
+
+ vis_and(TMP8, MASK_fe, TMP8);
+
+ vis_and(DST_0, REF_0, TMP10);
+ vis_ld64_2(dest, stride, DST_0);
+ vis_mul8x16(CONST_128, TMP8, TMP8);
+
+ vis_and(DST_2, REF_2, TMP12);
+ vis_ld64_2(dest, stride_8, DST_2);
+
+ vis_ld64(ref[0], TMP14);
+ vis_and(TMP6, MASK_7f, TMP6);
+
+ vis_and(TMP8, MASK_7f, TMP8);
+
+ vis_padd16(TMP10, TMP6, TMP6);
+ vis_st64(TMP6, dest[0]);
+
+ vis_padd16(TMP12, TMP8, TMP8);
+ vis_st64_2(TMP8, dest, 8);
+
+ dest += stride;
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_faligndata(TMP2, TMP4, REF_2);
+
+ vis_xor(DST_0, REF_0, TMP20);
+
+ vis_and(TMP20, MASK_fe, TMP20);
+
+ vis_xor(DST_2, REF_2, TMP22);
+ vis_mul8x16(CONST_128, TMP20, TMP20);
+
+ vis_and(TMP22, MASK_fe, TMP22);
+
+ vis_and(DST_0, REF_0, TMP24);
+ vis_mul8x16(CONST_128, TMP22, TMP22);
+
+ vis_and(DST_2, REF_2, TMP26);
+
+ vis_and(TMP20, MASK_7f, TMP20);
+
+ vis_and(TMP22, MASK_7f, TMP22);
+
+ vis_padd16(TMP24, TMP20, TMP20);
+ vis_st64(TMP20, dest[0]);
+
+ vis_padd16(TMP26, TMP22, TMP22);
+ vis_st64_2(TMP22, dest, 8);
+}
+
+static void MC_put_no_round_x_16_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ unsigned long off = (unsigned long) ref & 0x7;
+ unsigned long off_plus_1 = off + 1;
+
+ ref = vis_alignaddr(ref);
+
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64_2(ref, 8, TMP2);
+
+ vis_ld64_2(ref, 16, TMP4);
+
+ vis_ld64(constants_fe[0], MASK_fe);
+
+ vis_ld64(constants_7f[0], MASK_7f);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64(constants128[0], CONST_128);
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ vis_faligndata(TMP2, TMP4, REF_6);
+ } else {
+ vis_src1(TMP2, REF_2);
+ vis_src1(TMP4, REF_6);
+ }
+
+ ref += stride;
+ height = (height >> 1) - 1;
+
+ do { /* 34 cycles */
+ vis_ld64(ref[0], TMP0);
+ vis_xor(REF_0, REF_2, TMP6);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_xor(REF_4, REF_6, TMP8);
+
+ vis_ld64_2(ref, 16, TMP4);
+ vis_and(TMP6, MASK_fe, TMP6);
+ ref += stride;
+
+ vis_ld64(ref[0], TMP14);
+ vis_mul8x16(CONST_128, TMP6, TMP6);
+ vis_and(TMP8, MASK_fe, TMP8);
+
+ vis_ld64_2(ref, 8, TMP16);
+ vis_mul8x16(CONST_128, TMP8, TMP8);
+ vis_and(REF_0, REF_2, TMP10);
+
+ vis_ld64_2(ref, 16, TMP18);
+ ref += stride;
+ vis_and(REF_4, REF_6, TMP12);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ vis_faligndata(TMP2, TMP4, REF_6);
+ } else {
+ vis_src1(TMP2, REF_2);
+ vis_src1(TMP4, REF_6);
+ }
+
+ vis_and(TMP6, MASK_7f, TMP6);
+
+ vis_and(TMP8, MASK_7f, TMP8);
+
+ vis_padd16(TMP10, TMP6, TMP6);
+ vis_st64(TMP6, dest[0]);
+
+ vis_padd16(TMP12, TMP8, TMP8);
+ vis_st64_2(TMP8, dest, 8);
+ dest += stride;
+
+ vis_xor(REF_0, REF_2, TMP6);
+
+ vis_xor(REF_4, REF_6, TMP8);
+
+ vis_and(TMP6, MASK_fe, TMP6);
+
+ vis_mul8x16(CONST_128, TMP6, TMP6);
+ vis_and(TMP8, MASK_fe, TMP8);
+
+ vis_mul8x16(CONST_128, TMP8, TMP8);
+ vis_and(REF_0, REF_2, TMP10);
+
+ vis_and(REF_4, REF_6, TMP12);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_faligndata(TMP14, TMP16, REF_0);
+
+ vis_faligndata(TMP16, TMP18, REF_4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP14, TMP16, REF_2);
+ vis_faligndata(TMP16, TMP18, REF_6);
+ } else {
+ vis_src1(TMP16, REF_2);
+ vis_src1(TMP18, REF_6);
+ }
+
+ vis_and(TMP6, MASK_7f, TMP6);
+
+ vis_and(TMP8, MASK_7f, TMP8);
+
+ vis_padd16(TMP10, TMP6, TMP6);
+ vis_st64(TMP6, dest[0]);
+
+ vis_padd16(TMP12, TMP8, TMP8);
+ vis_st64_2(TMP8, dest, 8);
+ dest += stride;
+ } while (--height);
+
+ vis_ld64(ref[0], TMP0);
+ vis_xor(REF_0, REF_2, TMP6);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_xor(REF_4, REF_6, TMP8);
+
+ vis_ld64_2(ref, 16, TMP4);
+ vis_and(TMP6, MASK_fe, TMP6);
+
+ vis_mul8x16(CONST_128, TMP6, TMP6);
+ vis_and(TMP8, MASK_fe, TMP8);
+
+ vis_mul8x16(CONST_128, TMP8, TMP8);
+ vis_and(REF_0, REF_2, TMP10);
+
+ vis_and(REF_4, REF_6, TMP12);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ vis_faligndata(TMP2, TMP4, REF_6);
+ } else {
+ vis_src1(TMP2, REF_2);
+ vis_src1(TMP4, REF_6);
+ }
+
+ vis_and(TMP6, MASK_7f, TMP6);
+
+ vis_and(TMP8, MASK_7f, TMP8);
+
+ vis_padd16(TMP10, TMP6, TMP6);
+ vis_st64(TMP6, dest[0]);
+
+ vis_padd16(TMP12, TMP8, TMP8);
+ vis_st64_2(TMP8, dest, 8);
+ dest += stride;
+
+ vis_xor(REF_0, REF_2, TMP6);
+
+ vis_xor(REF_4, REF_6, TMP8);
+
+ vis_and(TMP6, MASK_fe, TMP6);
+
+ vis_mul8x16(CONST_128, TMP6, TMP6);
+ vis_and(TMP8, MASK_fe, TMP8);
+
+ vis_mul8x16(CONST_128, TMP8, TMP8);
+ vis_and(REF_0, REF_2, TMP10);
+
+ vis_and(REF_4, REF_6, TMP12);
+
+ vis_and(TMP6, MASK_7f, TMP6);
+
+ vis_and(TMP8, MASK_7f, TMP8);
+
+ vis_padd16(TMP10, TMP6, TMP6);
+ vis_st64(TMP6, dest[0]);
+
+ vis_padd16(TMP12, TMP8, TMP8);
+ vis_st64_2(TMP8, dest, 8);
+}
+
+static void MC_put_no_round_x_8_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ unsigned long off = (unsigned long) ref & 0x7;
+ unsigned long off_plus_1 = off + 1;
+
+ ref = vis_alignaddr(ref);
+
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64(ref[8], TMP2);
+
+ vis_ld64(constants_fe[0], MASK_fe);
+
+ vis_ld64(constants_7f[0], MASK_7f);
+
+ vis_ld64(constants128[0], CONST_128);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ } else {
+ vis_src1(TMP2, REF_2);
+ }
+
+ ref += stride;
+ height = (height >> 1) - 1;
+
+ do { /* 20 cycles */
+ vis_ld64(ref[0], TMP0);
+ vis_xor(REF_0, REF_2, TMP4);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_and(TMP4, MASK_fe, TMP4);
+ ref += stride;
+
+ vis_ld64(ref[0], TMP8);
+ vis_and(REF_0, REF_2, TMP6);
+ vis_mul8x16(CONST_128, TMP4, TMP4);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_ld64_2(ref, 8, TMP10);
+ ref += stride;
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ } else {
+ vis_src1(TMP2, REF_2);
+ }
+
+ vis_and(TMP4, MASK_7f, TMP4);
+
+ vis_padd16(TMP6, TMP4, DST_0);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+
+ vis_xor(REF_0, REF_2, TMP12);
+
+ vis_and(TMP12, MASK_fe, TMP12);
+
+ vis_and(REF_0, REF_2, TMP14);
+ vis_mul8x16(CONST_128, TMP12, TMP12);
+
+ vis_alignaddr_g0((void *)off);
+ vis_faligndata(TMP8, TMP10, REF_0);
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP8, TMP10, REF_2);
+ } else {
+ vis_src1(TMP10, REF_2);
+ }
+
+ vis_and(TMP12, MASK_7f, TMP12);
+
+ vis_padd16(TMP14, TMP12, DST_0);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+ } while (--height);
+
+ vis_ld64(ref[0], TMP0);
+ vis_xor(REF_0, REF_2, TMP4);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_and(TMP4, MASK_fe, TMP4);
+
+ vis_and(REF_0, REF_2, TMP6);
+ vis_mul8x16(CONST_128, TMP4, TMP4);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ } else {
+ vis_src1(TMP2, REF_2);
+ }
+
+ vis_and(TMP4, MASK_7f, TMP4);
+
+ vis_padd16(TMP6, TMP4, DST_0);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+
+ vis_xor(REF_0, REF_2, TMP12);
+
+ vis_and(TMP12, MASK_fe, TMP12);
+
+ vis_and(REF_0, REF_2, TMP14);
+ vis_mul8x16(CONST_128, TMP12, TMP12);
+
+ vis_and(TMP12, MASK_7f, TMP12);
+
+ vis_padd16(TMP14, TMP12, DST_0);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+}
+
+static void MC_avg_no_round_x_16_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ unsigned long off = (unsigned long) ref & 0x7;
+ unsigned long off_plus_1 = off + 1;
+
+ vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
+
+ vis_ld64(constants3[0], CONST_3);
+ vis_fzero(ZERO);
+ vis_ld64(constants256_512[0], CONST_256);
+
+ ref = vis_alignaddr(ref);
+ do { /* 26 cycles */
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64(ref[8], TMP2);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_ld64(ref[16], TMP4);
+
+ vis_ld64(dest[0], DST_0);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64(dest[8], DST_2);
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ vis_faligndata(TMP2, TMP4, REF_6);
+ } else {
+ vis_src1(TMP2, REF_2);
+ vis_src1(TMP4, REF_6);
+ }
+
+ vis_mul8x16au(REF_0, CONST_256, TMP0);
+
+ vis_pmerge(ZERO, REF_2, TMP4);
+ vis_mul8x16au(REF_0_1, CONST_256, TMP2);
+
+ vis_pmerge(ZERO, REF_2_1, TMP6);
+
+ vis_padd16(TMP0, TMP4, TMP0);
+
+ vis_mul8x16al(DST_0, CONST_512, TMP4);
+ vis_padd16(TMP2, TMP6, TMP2);
+
+ vis_mul8x16al(DST_1, CONST_512, TMP6);
+
+ vis_mul8x16au(REF_6, CONST_256, TMP12);
+
+ vis_padd16(TMP0, TMP4, TMP0);
+ vis_mul8x16au(REF_6_1, CONST_256, TMP14);
+
+ vis_padd16(TMP2, TMP6, TMP2);
+ vis_mul8x16au(REF_4, CONST_256, TMP16);
+
+ vis_padd16(TMP0, CONST_3, TMP8);
+ vis_mul8x16au(REF_4_1, CONST_256, TMP18);
+
+ vis_padd16(TMP2, CONST_3, TMP10);
+ vis_pack16(TMP8, DST_0);
+
+ vis_pack16(TMP10, DST_1);
+ vis_padd16(TMP16, TMP12, TMP0);
+
+ vis_st64(DST_0, dest[0]);
+ vis_mul8x16al(DST_2, CONST_512, TMP4);
+ vis_padd16(TMP18, TMP14, TMP2);
+
+ vis_mul8x16al(DST_3, CONST_512, TMP6);
+ vis_padd16(TMP0, CONST_3, TMP0);
+
+ vis_padd16(TMP2, CONST_3, TMP2);
+
+ vis_padd16(TMP0, TMP4, TMP0);
+
+ vis_padd16(TMP2, TMP6, TMP2);
+ vis_pack16(TMP0, DST_2);
+
+ vis_pack16(TMP2, DST_3);
+ vis_st64(DST_2, dest[8]);
+
+ ref += stride;
+ dest += stride;
+ } while (--height);
+}
+
+static void MC_put_no_round_y_16_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ ref = vis_alignaddr(ref);
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64_2(ref, 8, TMP2);
+
+ vis_ld64_2(ref, 16, TMP4);
+ ref += stride;
+
+ vis_ld64(ref[0], TMP6);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64_2(ref, 8, TMP8);
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ vis_ld64_2(ref, 16, TMP10);
+ ref += stride;
+
+ vis_ld64(constants_fe[0], MASK_fe);
+ vis_faligndata(TMP6, TMP8, REF_2);
+
+ vis_ld64(constants_7f[0], MASK_7f);
+ vis_faligndata(TMP8, TMP10, REF_6);
+
+ vis_ld64(constants128[0], CONST_128);
+ height = (height >> 1) - 1;
+ do { /* 24 cycles */
+ vis_ld64(ref[0], TMP0);
+ vis_xor(REF_0, REF_2, TMP12);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_xor(REF_4, REF_6, TMP16);
+
+ vis_ld64_2(ref, 16, TMP4);
+ ref += stride;
+ vis_and(REF_0, REF_2, TMP14);
+
+ vis_ld64(ref[0], TMP6);
+ vis_and(REF_4, REF_6, TMP18);
+
+ vis_ld64_2(ref, 8, TMP8);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64_2(ref, 16, TMP10);
+ ref += stride;
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ vis_and(TMP12, MASK_fe, TMP12);
+
+ vis_and(TMP16, MASK_fe, TMP16);
+ vis_mul8x16(CONST_128, TMP12, TMP12);
+
+ vis_mul8x16(CONST_128, TMP16, TMP16);
+ vis_xor(REF_0, REF_2, TMP0);
+
+ vis_xor(REF_4, REF_6, TMP2);
+
+ vis_and(REF_0, REF_2, TMP20);
+
+ vis_and(TMP12, MASK_7f, TMP12);
+
+ vis_and(TMP16, MASK_7f, TMP16);
+
+ vis_padd16(TMP14, TMP12, TMP12);
+ vis_st64(TMP12, dest[0]);
+
+ vis_padd16(TMP18, TMP16, TMP16);
+ vis_st64_2(TMP16, dest, 8);
+ dest += stride;
+
+ vis_and(REF_4, REF_6, TMP18);
+
+ vis_and(TMP0, MASK_fe, TMP0);
+
+ vis_and(TMP2, MASK_fe, TMP2);
+ vis_mul8x16(CONST_128, TMP0, TMP0);
+
+ vis_faligndata(TMP6, TMP8, REF_2);
+ vis_mul8x16(CONST_128, TMP2, TMP2);
+
+ vis_faligndata(TMP8, TMP10, REF_6);
+
+ vis_and(TMP0, MASK_7f, TMP0);
+
+ vis_and(TMP2, MASK_7f, TMP2);
+
+ vis_padd16(TMP20, TMP0, TMP0);
+ vis_st64(TMP0, dest[0]);
+
+ vis_padd16(TMP18, TMP2, TMP2);
+ vis_st64_2(TMP2, dest, 8);
+ dest += stride;
+ } while (--height);
+
+ vis_ld64(ref[0], TMP0);
+ vis_xor(REF_0, REF_2, TMP12);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_xor(REF_4, REF_6, TMP16);
+
+ vis_ld64_2(ref, 16, TMP4);
+ vis_and(REF_0, REF_2, TMP14);
+
+ vis_and(REF_4, REF_6, TMP18);
+
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ vis_and(TMP12, MASK_fe, TMP12);
+
+ vis_and(TMP16, MASK_fe, TMP16);
+ vis_mul8x16(CONST_128, TMP12, TMP12);
+
+ vis_mul8x16(CONST_128, TMP16, TMP16);
+ vis_xor(REF_0, REF_2, TMP0);
+
+ vis_xor(REF_4, REF_6, TMP2);
+
+ vis_and(REF_0, REF_2, TMP20);
+
+ vis_and(TMP12, MASK_7f, TMP12);
+
+ vis_and(TMP16, MASK_7f, TMP16);
+
+ vis_padd16(TMP14, TMP12, TMP12);
+ vis_st64(TMP12, dest[0]);
+
+ vis_padd16(TMP18, TMP16, TMP16);
+ vis_st64_2(TMP16, dest, 8);
+ dest += stride;
+
+ vis_and(REF_4, REF_6, TMP18);
+
+ vis_and(TMP0, MASK_fe, TMP0);
+
+ vis_and(TMP2, MASK_fe, TMP2);
+ vis_mul8x16(CONST_128, TMP0, TMP0);
+
+ vis_mul8x16(CONST_128, TMP2, TMP2);
+
+ vis_and(TMP0, MASK_7f, TMP0);
+
+ vis_and(TMP2, MASK_7f, TMP2);
+
+ vis_padd16(TMP20, TMP0, TMP0);
+ vis_st64(TMP0, dest[0]);
+
+ vis_padd16(TMP18, TMP2, TMP2);
+ vis_st64_2(TMP2, dest, 8);
+}
+
+static void MC_put_no_round_y_8_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ ref = vis_alignaddr(ref);
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64_2(ref, 8, TMP2);
+ ref += stride;
+
+ vis_ld64(ref[0], TMP4);
+
+ vis_ld64_2(ref, 8, TMP6);
+ ref += stride;
+
+ vis_ld64(constants_fe[0], MASK_fe);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64(constants_7f[0], MASK_7f);
+ vis_faligndata(TMP4, TMP6, REF_2);
+
+ vis_ld64(constants128[0], CONST_128);
+ height = (height >> 1) - 1;
+ do { /* 12 cycles */
+ vis_ld64(ref[0], TMP0);
+ vis_xor(REF_0, REF_2, TMP4);
+
+ vis_ld64_2(ref, 8, TMP2);
+ ref += stride;
+ vis_and(TMP4, MASK_fe, TMP4);
+
+ vis_and(REF_0, REF_2, TMP6);
+ vis_mul8x16(CONST_128, TMP4, TMP4);
+
+ vis_faligndata(TMP0, TMP2, REF_0);
+ vis_ld64(ref[0], TMP0);
+
+ vis_ld64_2(ref, 8, TMP2);
+ ref += stride;
+ vis_xor(REF_0, REF_2, TMP12);
+
+ vis_and(TMP4, MASK_7f, TMP4);
+
+ vis_and(TMP12, MASK_fe, TMP12);
+
+ vis_mul8x16(CONST_128, TMP12, TMP12);
+ vis_and(REF_0, REF_2, TMP14);
+
+ vis_padd16(TMP6, TMP4, DST_0);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+
+ vis_faligndata(TMP0, TMP2, REF_2);
+
+ vis_and(TMP12, MASK_7f, TMP12);
+
+ vis_padd16(TMP14, TMP12, DST_0);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+ } while (--height);
+
+ vis_ld64(ref[0], TMP0);
+ vis_xor(REF_0, REF_2, TMP4);
+
+ vis_ld64_2(ref, 8, TMP2);
+ vis_and(TMP4, MASK_fe, TMP4);
+
+ vis_and(REF_0, REF_2, TMP6);
+ vis_mul8x16(CONST_128, TMP4, TMP4);
+
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_xor(REF_0, REF_2, TMP12);
+
+ vis_and(TMP4, MASK_7f, TMP4);
+
+ vis_and(TMP12, MASK_fe, TMP12);
+
+ vis_mul8x16(CONST_128, TMP12, TMP12);
+ vis_and(REF_0, REF_2, TMP14);
+
+ vis_padd16(TMP6, TMP4, DST_0);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+
+ vis_and(TMP12, MASK_7f, TMP12);
+
+ vis_padd16(TMP14, TMP12, DST_0);
+ vis_st64(DST_0, dest[0]);
+}
+
+static void MC_avg_no_round_y_16_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ int stride_8 = stride + 8;
+ int stride_16 = stride + 16;
+
+ vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
+
+ ref = vis_alignaddr(ref);
+
+ vis_ld64(ref[ 0], TMP0);
+ vis_fzero(ZERO);
+
+ vis_ld64(ref[ 8], TMP2);
+
+ vis_ld64(ref[16], TMP4);
+
+ vis_ld64(constants3[0], CONST_3);
+ vis_faligndata(TMP0, TMP2, REF_2);
+
+ vis_ld64(constants256_512[0], CONST_256);
+ vis_faligndata(TMP2, TMP4, REF_6);
+ height >>= 1;
+
+ do { /* 31 cycles */
+ vis_ld64_2(ref, stride, TMP0);
+ vis_pmerge(ZERO, REF_2, TMP12);
+ vis_mul8x16au(REF_2_1, CONST_256, TMP14);
+
+ vis_ld64_2(ref, stride_8, TMP2);
+ vis_pmerge(ZERO, REF_6, TMP16);
+ vis_mul8x16au(REF_6_1, CONST_256, TMP18);
+
+ vis_ld64_2(ref, stride_16, TMP4);
+ ref += stride;
+
+ vis_ld64(dest[0], DST_0);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64_2(dest, 8, DST_2);
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ vis_ld64_2(ref, stride, TMP6);
+ vis_pmerge(ZERO, REF_0, TMP0);
+ vis_mul8x16au(REF_0_1, CONST_256, TMP2);
+
+ vis_ld64_2(ref, stride_8, TMP8);
+ vis_pmerge(ZERO, REF_4, TMP4);
+
+ vis_ld64_2(ref, stride_16, TMP10);
+ ref += stride;
+
+ vis_ld64_2(dest, stride, REF_S0/*DST_4*/);
+ vis_faligndata(TMP6, TMP8, REF_2);
+ vis_mul8x16au(REF_4_1, CONST_256, TMP6);
+
+ vis_ld64_2(dest, stride_8, REF_S2/*DST_6*/);
+ vis_faligndata(TMP8, TMP10, REF_6);
+ vis_mul8x16al(DST_0, CONST_512, TMP20);
+
+ vis_padd16(TMP0, CONST_3, TMP0);
+ vis_mul8x16al(DST_1, CONST_512, TMP22);
+
+ vis_padd16(TMP2, CONST_3, TMP2);
+ vis_mul8x16al(DST_2, CONST_512, TMP24);
+
+ vis_padd16(TMP4, CONST_3, TMP4);
+ vis_mul8x16al(DST_3, CONST_512, TMP26);
+
+ vis_padd16(TMP6, CONST_3, TMP6);
+
+ vis_padd16(TMP12, TMP20, TMP12);
+ vis_mul8x16al(REF_S0, CONST_512, TMP20);
+
+ vis_padd16(TMP14, TMP22, TMP14);
+ vis_mul8x16al(REF_S0_1, CONST_512, TMP22);
+
+ vis_padd16(TMP16, TMP24, TMP16);
+ vis_mul8x16al(REF_S2, CONST_512, TMP24);
+
+ vis_padd16(TMP18, TMP26, TMP18);
+ vis_mul8x16al(REF_S2_1, CONST_512, TMP26);
+
+ vis_padd16(TMP12, TMP0, TMP12);
+ vis_mul8x16au(REF_2, CONST_256, TMP28);
+
+ vis_padd16(TMP14, TMP2, TMP14);
+ vis_mul8x16au(REF_2_1, CONST_256, TMP30);
+
+ vis_padd16(TMP16, TMP4, TMP16);
+ vis_mul8x16au(REF_6, CONST_256, REF_S4);
+
+ vis_padd16(TMP18, TMP6, TMP18);
+ vis_mul8x16au(REF_6_1, CONST_256, REF_S6);
+
+ vis_pack16(TMP12, DST_0);
+ vis_padd16(TMP28, TMP0, TMP12);
+
+ vis_pack16(TMP14, DST_1);
+ vis_st64(DST_0, dest[0]);
+ vis_padd16(TMP30, TMP2, TMP14);
+
+ vis_pack16(TMP16, DST_2);
+ vis_padd16(REF_S4, TMP4, TMP16);
+
+ vis_pack16(TMP18, DST_3);
+ vis_st64_2(DST_2, dest, 8);
+ dest += stride;
+ vis_padd16(REF_S6, TMP6, TMP18);
+
+ vis_padd16(TMP12, TMP20, TMP12);
+
+ vis_padd16(TMP14, TMP22, TMP14);
+ vis_pack16(TMP12, DST_0);
+
+ vis_padd16(TMP16, TMP24, TMP16);
+ vis_pack16(TMP14, DST_1);
+ vis_st64(DST_0, dest[0]);
+
+ vis_padd16(TMP18, TMP26, TMP18);
+ vis_pack16(TMP16, DST_2);
+
+ vis_pack16(TMP18, DST_3);
+ vis_st64_2(DST_2, dest, 8);
+ dest += stride;
+ } while (--height);
+}
+
+static void MC_put_no_round_xy_16_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ unsigned long off = (unsigned long) ref & 0x7;
+ unsigned long off_plus_1 = off + 1;
+ int stride_8 = stride + 8;
+ int stride_16 = stride + 16;
+
+ vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
+
+ ref = vis_alignaddr(ref);
+
+ vis_ld64(ref[ 0], TMP0);
+ vis_fzero(ZERO);
+
+ vis_ld64(ref[ 8], TMP2);
+
+ vis_ld64(ref[16], TMP4);
+
+ vis_ld64(constants1[0], CONST_1);
+ vis_faligndata(TMP0, TMP2, REF_S0);
+
+ vis_ld64(constants256_512[0], CONST_256);
+ vis_faligndata(TMP2, TMP4, REF_S4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_S2);
+ vis_faligndata(TMP2, TMP4, REF_S6);
+ } else {
+ vis_src1(TMP2, REF_S2);
+ vis_src1(TMP4, REF_S6);
+ }
+
+ height >>= 1;
+ do {
+ vis_ld64_2(ref, stride, TMP0);
+ vis_mul8x16au(REF_S0, CONST_256, TMP12);
+ vis_pmerge(ZERO, REF_S0_1, TMP14);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_ld64_2(ref, stride_8, TMP2);
+ vis_mul8x16au(REF_S2, CONST_256, TMP16);
+ vis_pmerge(ZERO, REF_S2_1, TMP18);
+
+ vis_ld64_2(ref, stride_16, TMP4);
+ ref += stride;
+ vis_mul8x16au(REF_S4, CONST_256, TMP20);
+ vis_pmerge(ZERO, REF_S4_1, TMP22);
+
+ vis_ld64_2(ref, stride, TMP6);
+ vis_mul8x16au(REF_S6, CONST_256, TMP24);
+ vis_pmerge(ZERO, REF_S6_1, TMP26);
+
+ vis_ld64_2(ref, stride_8, TMP8);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64_2(ref, stride_16, TMP10);
+ ref += stride;
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ vis_faligndata(TMP6, TMP8, REF_S0);
+
+ vis_faligndata(TMP8, TMP10, REF_S4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ vis_faligndata(TMP2, TMP4, REF_6);
+ vis_faligndata(TMP6, TMP8, REF_S2);
+ vis_faligndata(TMP8, TMP10, REF_S6);
+ } else {
+ vis_src1(TMP2, REF_2);
+ vis_src1(TMP4, REF_6);
+ vis_src1(TMP8, REF_S2);
+ vis_src1(TMP10, REF_S6);
+ }
+
+ vis_mul8x16au(REF_0, CONST_256, TMP0);
+ vis_pmerge(ZERO, REF_0_1, TMP2);
+
+ vis_mul8x16au(REF_2, CONST_256, TMP4);
+ vis_pmerge(ZERO, REF_2_1, TMP6);
+
+ vis_padd16(TMP0, CONST_2, TMP8);
+ vis_mul8x16au(REF_4, CONST_256, TMP0);
+
+ vis_padd16(TMP2, CONST_1, TMP10);
+ vis_mul8x16au(REF_4_1, CONST_256, TMP2);
+
+ vis_padd16(TMP8, TMP4, TMP8);
+ vis_mul8x16au(REF_6, CONST_256, TMP4);
+
+ vis_padd16(TMP10, TMP6, TMP10);
+ vis_mul8x16au(REF_6_1, CONST_256, TMP6);
+
+ vis_padd16(TMP12, TMP8, TMP12);
+
+ vis_padd16(TMP14, TMP10, TMP14);
+
+ vis_padd16(TMP12, TMP16, TMP12);
+
+ vis_padd16(TMP14, TMP18, TMP14);
+ vis_pack16(TMP12, DST_0);
+
+ vis_pack16(TMP14, DST_1);
+ vis_st64(DST_0, dest[0]);
+ vis_padd16(TMP0, CONST_1, TMP12);
+
+ vis_mul8x16au(REF_S0, CONST_256, TMP0);
+ vis_padd16(TMP2, CONST_1, TMP14);
+
+ vis_mul8x16au(REF_S0_1, CONST_256, TMP2);
+ vis_padd16(TMP12, TMP4, TMP12);
+
+ vis_mul8x16au(REF_S2, CONST_256, TMP4);
+ vis_padd16(TMP14, TMP6, TMP14);
+
+ vis_mul8x16au(REF_S2_1, CONST_256, TMP6);
+ vis_padd16(TMP20, TMP12, TMP20);
+
+ vis_padd16(TMP22, TMP14, TMP22);
+
+ vis_padd16(TMP20, TMP24, TMP20);
+
+ vis_padd16(TMP22, TMP26, TMP22);
+ vis_pack16(TMP20, DST_2);
+
+ vis_pack16(TMP22, DST_3);
+ vis_st64_2(DST_2, dest, 8);
+ dest += stride;
+ vis_padd16(TMP0, TMP4, TMP24);
+
+ vis_mul8x16au(REF_S4, CONST_256, TMP0);
+ vis_padd16(TMP2, TMP6, TMP26);
+
+ vis_mul8x16au(REF_S4_1, CONST_256, TMP2);
+ vis_padd16(TMP24, TMP8, TMP24);
+
+ vis_padd16(TMP26, TMP10, TMP26);
+ vis_pack16(TMP24, DST_0);
+
+ vis_pack16(TMP26, DST_1);
+ vis_st64(DST_0, dest[0]);
+ vis_pmerge(ZERO, REF_S6, TMP4);
+
+ vis_pmerge(ZERO, REF_S6_1, TMP6);
+
+ vis_padd16(TMP0, TMP4, TMP0);
+
+ vis_padd16(TMP2, TMP6, TMP2);
+
+ vis_padd16(TMP0, TMP12, TMP0);
+
+ vis_padd16(TMP2, TMP14, TMP2);
+ vis_pack16(TMP0, DST_2);
+
+ vis_pack16(TMP2, DST_3);
+ vis_st64_2(DST_2, dest, 8);
+ dest += stride;
+ } while (--height);
+}
+
+static void MC_put_no_round_xy_8_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ unsigned long off = (unsigned long) ref & 0x7;
+ unsigned long off_plus_1 = off + 1;
+ int stride_8 = stride + 8;
+
+ vis_set_gsr(5 << VIS_GSR_SCALEFACT_SHIFT);
+
+ ref = vis_alignaddr(ref);
+
+ vis_ld64(ref[ 0], TMP0);
+ vis_fzero(ZERO);
+
+ vis_ld64(ref[ 8], TMP2);
+
+ vis_ld64(constants1[0], CONST_1);
+
+ vis_ld64(constants256_512[0], CONST_256);
+ vis_faligndata(TMP0, TMP2, REF_S0);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_S2);
+ } else {
+ vis_src1(TMP2, REF_S2);
+ }
+
+ height >>= 1;
+ do { /* 26 cycles */
+ vis_ld64_2(ref, stride, TMP0);
+ vis_mul8x16au(REF_S0, CONST_256, TMP8);
+ vis_pmerge(ZERO, REF_S2, TMP12);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_ld64_2(ref, stride_8, TMP2);
+ ref += stride;
+ vis_mul8x16au(REF_S0_1, CONST_256, TMP10);
+ vis_pmerge(ZERO, REF_S2_1, TMP14);
+
+ vis_ld64_2(ref, stride, TMP4);
+
+ vis_ld64_2(ref, stride_8, TMP6);
+ ref += stride;
+ vis_faligndata(TMP0, TMP2, REF_S4);
+
+ vis_pmerge(ZERO, REF_S4, TMP18);
+
+ vis_pmerge(ZERO, REF_S4_1, TMP20);
+
+ vis_faligndata(TMP4, TMP6, REF_S0);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_S6);
+ vis_faligndata(TMP4, TMP6, REF_S2);
+ } else {
+ vis_src1(TMP2, REF_S6);
+ vis_src1(TMP6, REF_S2);
+ }
+
+ vis_padd16(TMP18, CONST_1, TMP18);
+ vis_mul8x16au(REF_S6, CONST_256, TMP22);
+
+ vis_padd16(TMP20, CONST_1, TMP20);
+ vis_mul8x16au(REF_S6_1, CONST_256, TMP24);
+
+ vis_mul8x16au(REF_S0, CONST_256, TMP26);
+ vis_pmerge(ZERO, REF_S0_1, TMP28);
+
+ vis_mul8x16au(REF_S2, CONST_256, TMP30);
+ vis_padd16(TMP18, TMP22, TMP18);
+
+ vis_mul8x16au(REF_S2_1, CONST_256, TMP32);
+ vis_padd16(TMP20, TMP24, TMP20);
+
+ vis_padd16(TMP8, TMP18, TMP8);
+
+ vis_padd16(TMP10, TMP20, TMP10);
+
+ vis_padd16(TMP8, TMP12, TMP8);
+
+ vis_padd16(TMP10, TMP14, TMP10);
+ vis_pack16(TMP8, DST_0);
+
+ vis_pack16(TMP10, DST_1);
+ vis_st64(DST_0, dest[0]);
+ dest += stride;
+ vis_padd16(TMP18, TMP26, TMP18);
+
+ vis_padd16(TMP20, TMP28, TMP20);
+
+ vis_padd16(TMP18, TMP30, TMP18);
+
+ vis_padd16(TMP20, TMP32, TMP20);
+ vis_pack16(TMP18, DST_2);
+
+ vis_pack16(TMP20, DST_3);
+ vis_st64(DST_2, dest[0]);
+ dest += stride;
+ } while (--height);
+}
+
+static void MC_avg_no_round_xy_16_vis (uint8_t * dest, const uint8_t * ref,
+ const ptrdiff_t stride, int height)
+{
+ unsigned long off = (unsigned long) ref & 0x7;
+ unsigned long off_plus_1 = off + 1;
+ int stride_8 = stride + 8;
+ int stride_16 = stride + 16;
+
+ vis_set_gsr(4 << VIS_GSR_SCALEFACT_SHIFT);
+
+ ref = vis_alignaddr(ref);
+
+ vis_ld64(ref[ 0], TMP0);
+ vis_fzero(ZERO);
+
+ vis_ld64(ref[ 8], TMP2);
+
+ vis_ld64(ref[16], TMP4);
+
+ vis_ld64(constants6[0], CONST_6);
+ vis_faligndata(TMP0, TMP2, REF_S0);
+
+ vis_ld64(constants256_1024[0], CONST_256);
+ vis_faligndata(TMP2, TMP4, REF_S4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_S2);
+ vis_faligndata(TMP2, TMP4, REF_S6);
+ } else {
+ vis_src1(TMP2, REF_S2);
+ vis_src1(TMP4, REF_S6);
+ }
+
+ height >>= 1;
+ do { /* 55 cycles */
+ vis_ld64_2(ref, stride, TMP0);
+ vis_mul8x16au(REF_S0, CONST_256, TMP12);
+ vis_pmerge(ZERO, REF_S0_1, TMP14);
+
+ vis_alignaddr_g0((void *)off);
+
+ vis_ld64_2(ref, stride_8, TMP2);
+ vis_mul8x16au(REF_S2, CONST_256, TMP16);
+ vis_pmerge(ZERO, REF_S2_1, TMP18);
+
+ vis_ld64_2(ref, stride_16, TMP4);
+ ref += stride;
+ vis_mul8x16au(REF_S4, CONST_256, TMP20);
+ vis_pmerge(ZERO, REF_S4_1, TMP22);
+
+ vis_ld64_2(ref, stride, TMP6);
+ vis_mul8x16au(REF_S6, CONST_256, TMP24);
+ vis_pmerge(ZERO, REF_S6_1, TMP26);
+
+ vis_ld64_2(ref, stride_8, TMP8);
+ vis_faligndata(TMP0, TMP2, REF_0);
+
+ vis_ld64_2(ref, stride_16, TMP10);
+ ref += stride;
+ vis_faligndata(TMP2, TMP4, REF_4);
+
+ vis_ld64(dest[0], DST_0);
+ vis_faligndata(TMP6, TMP8, REF_S0);
+
+ vis_ld64_2(dest, 8, DST_2);
+ vis_faligndata(TMP8, TMP10, REF_S4);
+
+ if (off != 0x7) {
+ vis_alignaddr_g0((void *)off_plus_1);
+ vis_faligndata(TMP0, TMP2, REF_2);
+ vis_faligndata(TMP2, TMP4, REF_6);
+ vis_faligndata(TMP6, TMP8, REF_S2);
+ vis_faligndata(TMP8, TMP10, REF_S6);
+ } else {
+ vis_src1(TMP2, REF_2);
+ vis_src1(TMP4, REF_6);
+ vis_src1(TMP8, REF_S2);
+ vis_src1(TMP10, REF_S6);
+ }
+
+ vis_mul8x16al(DST_0, CONST_1024, TMP30);
+ vis_pmerge(ZERO, REF_0, TMP0);
+
+ vis_mul8x16al(DST_1, CONST_1024, TMP32);
+ vis_pmerge(ZERO, REF_0_1, TMP2);
+
+ vis_mul8x16au(REF_2, CONST_256, TMP4);
+ vis_pmerge(ZERO, REF_2_1, TMP6);
+
+ vis_mul8x16al(DST_2, CONST_1024, REF_0);
+ vis_padd16(TMP0, CONST_6, TMP0);
+
+ vis_mul8x16al(DST_3, CONST_1024, REF_2);
+ vis_padd16(TMP2, CONST_6, TMP2);
+
+ vis_padd16(TMP0, TMP4, TMP0);
+ vis_mul8x16au(REF_4, CONST_256, TMP4);
+
+ vis_padd16(TMP2, TMP6, TMP2);
+ vis_mul8x16au(REF_4_1, CONST_256, TMP6);
+
+ vis_padd16(TMP12, TMP0, TMP12);
+ vis_mul8x16au(REF_6, CONST_256, TMP8);
+
+ vis_padd16(TMP14, TMP2, TMP14);
+ vis_mul8x16au(REF_6_1, CONST_256, TMP10);
+
+ vis_padd16(TMP12, TMP16, TMP12);
+ vis_mul8x16au(REF_S0, CONST_256, REF_4);
+
+ vis_padd16(TMP14, TMP18, TMP14);
+ vis_mul8x16au(REF_S0_1, CONST_256, REF_6);
+
+ vis_padd16(TMP12, TMP30, TMP12);
+
+ vis_padd16(TMP14, TMP32, TMP14);
+ vis_pack16(TMP12, DST_0);
+
+ vis_pack16(TMP14, DST_1);
+ vis_st64(DST_0, dest[0]);
+ vis_padd16(TMP4, CONST_6, TMP4);
+
+ vis_ld64_2(dest, stride, DST_0);
+ vis_padd16(TMP6, CONST_6, TMP6);
+ vis_mul8x16au(REF_S2, CONST_256, TMP12);
+
+ vis_padd16(TMP4, TMP8, TMP4);
+ vis_mul8x16au(REF_S2_1, CONST_256, TMP14);
+
+ vis_padd16(TMP6, TMP10, TMP6);
+
+ vis_padd16(TMP20, TMP4, TMP20);
+
+ vis_padd16(TMP22, TMP6, TMP22);
+
+ vis_padd16(TMP20, TMP24, TMP20);
+
+ vis_padd16(TMP22, TMP26, TMP22);
+
+ vis_padd16(TMP20, REF_0, TMP20);
+ vis_mul8x16au(REF_S4, CONST_256, REF_0);
+
+ vis_padd16(TMP22, REF_2, TMP22);
+ vis_pack16(TMP20, DST_2);
+
+ vis_pack16(TMP22, DST_3);
+ vis_st64_2(DST_2, dest, 8);
+ dest += stride;
+
+ vis_ld64_2(dest, 8, DST_2);
+ vis_mul8x16al(DST_0, CONST_1024, TMP30);
+ vis_pmerge(ZERO, REF_S4_1, REF_2);
+
+ vis_mul8x16al(DST_1, CONST_1024, TMP32);
+ vis_padd16(REF_4, TMP0, TMP8);
+
+ vis_mul8x16au(REF_S6, CONST_256, REF_4);
+ vis_padd16(REF_6, TMP2, TMP10);
+
+ vis_mul8x16au(REF_S6_1, CONST_256, REF_6);
+ vis_padd16(TMP8, TMP12, TMP8);
+
+ vis_padd16(TMP10, TMP14, TMP10);
+
+ vis_padd16(TMP8, TMP30, TMP8);
+
+ vis_padd16(TMP10, TMP32, TMP10);
+ vis_pack16(TMP8, DST_0);
+
+ vis_pack16(TMP10, DST_1);
+ vis_st64(DST_0, dest[0]);
+
+ vis_padd16(REF_0, TMP4, REF_0);
+
+ vis_mul8x16al(DST_2, CONST_1024, TMP30);
+ vis_padd16(REF_2, TMP6, REF_2);
+
+ vis_mul8x16al(DST_3, CONST_1024, TMP32);
+ vis_padd16(REF_0, REF_4, REF_0);
+
+ vis_padd16(REF_2, REF_6, REF_2);
+
+ vis_padd16(REF_0, TMP30, REF_0);
+
+ /* stall */
+
+ vis_padd16(REF_2, TMP32, REF_2);
+ vis_pack16(REF_0, DST_2);
+
+ vis_pack16(REF_2, DST_3);
+ vis_st64_2(DST_2, dest, 8);
+ dest += stride;
+ } while (--height);
+}
+
+/* End of no rounding code */
+
+av_cold void ff_hpeldsp_init_vis(HpelDSPContext *c, int flags)
+{
+ /* VIS-specific optimizations */
+ int accel = vis_level ();
+
+ if (accel & ACCEL_SPARC_VIS) {
+ c->put_pixels_tab[0][0] = MC_put_o_16_vis;
+ c->put_pixels_tab[0][1] = MC_put_x_16_vis;
+ c->put_pixels_tab[0][2] = MC_put_y_16_vis;
+ c->put_pixels_tab[0][3] = MC_put_xy_16_vis;
+
+ c->put_pixels_tab[1][0] = MC_put_o_8_vis;
+ c->put_pixels_tab[1][1] = MC_put_x_8_vis;
+ c->put_pixels_tab[1][2] = MC_put_y_8_vis;
+ c->put_pixels_tab[1][3] = MC_put_xy_8_vis;
+
+ c->avg_pixels_tab[0][0] = MC_avg_o_16_vis;
+ c->avg_pixels_tab[0][1] = MC_avg_x_16_vis;
+ c->avg_pixels_tab[0][2] = MC_avg_y_16_vis;
+ c->avg_pixels_tab[0][3] = MC_avg_xy_16_vis;
+
+ c->avg_pixels_tab[1][0] = MC_avg_o_8_vis;
+ c->avg_pixels_tab[1][1] = MC_avg_x_8_vis;
+ c->avg_pixels_tab[1][2] = MC_avg_y_8_vis;
+ c->avg_pixels_tab[1][3] = MC_avg_xy_8_vis;
+
+ c->put_no_rnd_pixels_tab[0][0] = MC_put_no_round_o_16_vis;
+ c->put_no_rnd_pixels_tab[0][1] = MC_put_no_round_x_16_vis;
+ c->put_no_rnd_pixels_tab[0][2] = MC_put_no_round_y_16_vis;
+ c->put_no_rnd_pixels_tab[0][3] = MC_put_no_round_xy_16_vis;
+
+ c->put_no_rnd_pixels_tab[1][0] = MC_put_no_round_o_8_vis;
+ c->put_no_rnd_pixels_tab[1][1] = MC_put_no_round_x_8_vis;
+ c->put_no_rnd_pixels_tab[1][2] = MC_put_no_round_y_8_vis;
+ c->put_no_rnd_pixels_tab[1][3] = MC_put_no_round_xy_8_vis;
+
+ c->avg_no_rnd_pixels_tab[0] = MC_avg_no_round_o_16_vis;
+ c->avg_no_rnd_pixels_tab[1] = MC_avg_no_round_x_16_vis;
+ c->avg_no_rnd_pixels_tab[2] = MC_avg_no_round_y_16_vis;
+ c->avg_no_rnd_pixels_tab[3] = MC_avg_no_round_xy_16_vis;
+ }
+}

libav-v9.6.tar.bz2/libavcodec/sparc/simple_idct_vis.c -> libav-v10.1.tar.bz2/libavcodec/sparc/simple_idct_vis.c Changed

libav-v9.6.tar.bz2/libavcodec/sparc/vis.h -> libav-v10.1.tar.bz2/libavcodec/sparc/vis.h Changed

@@ -42,6 +42,17 @@
 #ifndef AVCODEC_SPARC_VIS_H
 #define AVCODEC_SPARC_VIS_H
 
+#define ACCEL_SPARC_VIS 1
+#define ACCEL_SPARC_VIS2 2
+
+static inline int vis_level(void)
+{
+ int accel = 0;
+ accel |= ACCEL_SPARC_VIS;
+ accel |= ACCEL_SPARC_VIS2;
+ return accel;
+}
+
 #define vis_opc_base ((0x1 << 31) | (0x36 << 19))
 #define vis_opf(X) ((X) << 5)
 #define vis_sreg(X) (X)
@@ -139,12 +150,9 @@
 #define vis_m2r_2(op,mem1,mem2,rd) \
 __asm__ volatile (#op "\t[%0 + %1], %%f" #rd : : "r" (mem1), "r" (mem2) )
 
-static inline void vis_set_gsr(unsigned int _val)
+static inline void vis_set_gsr(unsigned int val)
 {
- register unsigned int val __asm__("g1");
-
- val = _val;
- __asm__ volatile(".word 0xa7804000"
+ __asm__ volatile("mov %0,%%asr19"
 : : "r" (val));
 }
 
@@ -162,32 +170,6 @@
 #define vis_st64(rs1,mem) vis_r2m(std, rs1, mem)
 #define vis_st64_2(rs1,mem1,mem2) vis_r2m_2(std, rs1, mem1, mem2)
 
-#define vis_ldblk(mem, rd) \
-do { register void *__mem __asm__("g1"); \
- __mem = &(mem); \
- __asm__ volatile(".word 0xc1985e00 | %1" \
- : \
- : "r" (__mem), \
- "i" (vis_rd_d(rd)) \
- : "memory"); \
-} while (0)
-
-#define vis_stblk(rd, mem) \
-do { register void *__mem __asm__("g1"); \
- __mem = &(mem); \
- __asm__ volatile(".word 0xc1b85e00 | %1" \
- : \
- : "r" (__mem), \
- "i" (vis_rd_d(rd)) \
- : "memory"); \
-} while (0)
-
-#define vis_membar_storestore() \
- __asm__ volatile(".word 0x8143e008" : : : "memory")
-
-#define vis_membar_sync() \
- __asm__ volatile(".word 0x8143e040" : : : "memory")
-
 /* 16 and 32 bit partitioned addition and subtraction. The normal
 * versions perform 4 16-bit or 2 32-bit additions or subtractions.
 * The 's' versions perform 2 16-bit or 1 32-bit additions or
@@ -223,68 +205,19 @@
 
 /* Alignment instructions. */
 
-static inline const void *vis_alignaddr(const void *_ptr)
+static inline const void *vis_alignaddr(const void *ptr)
 {
- register const void *ptr __asm__("g1");
-
- ptr = _ptr;
-
- __asm__ volatile(".word %2"
+ __asm__ volatile("alignaddr %0, %%g0, %0"
 : "=&r" (ptr)
- : "0" (ptr),
- "i" (vis_opc_base | vis_opf(0x18) |
- vis_rs1_s(1) |
- vis_rs2_s(0) |
- vis_rd_s(1)));
+ : "0" (ptr));
 
 return ptr;
 }
 
-static inline void vis_alignaddr_g0(void *_ptr)
+static inline void vis_alignaddr_g0(void *ptr)
 {
- register void *ptr __asm__("g1");
-
- ptr = _ptr;
-
- __asm__ volatile(".word %2"
- : "=&r" (ptr)
- : "0" (ptr),
- "i" (vis_opc_base | vis_opf(0x18) |
- vis_rs1_s(1) |
- vis_rs2_s(0) |
- vis_rd_s(0)));
-}
-
-static inline void *vis_alignaddrl(void *_ptr)
-{
- register void *ptr __asm__("g1");
-
- ptr = _ptr;
-
- __asm__ volatile(".word %2"
- : "=&r" (ptr)
- : "0" (ptr),
- "i" (vis_opc_base | vis_opf(0x19) |
- vis_rs1_s(1) |
- vis_rs2_s(0) |
- vis_rd_s(1)));
-
- return ptr;
-}
-
-static inline void vis_alignaddrl_g0(void *_ptr)
-{
- register void *ptr __asm__("g1");
-
- ptr = _ptr;
-
- __asm__ volatile(".word %2"
- : "=&r" (ptr)
- : "0" (ptr),
- "i" (vis_opc_base | vis_opf(0x19) |
- vis_rs1_s(1) |
- vis_rs2_s(0) |
- vis_rd_s(0)));
+ __asm__ volatile("alignaddr %0, %%g0, %%g0"
+ : : "r" (ptr));
 }
 
 #define vis_faligndata(rs1,rs2,rd) vis_dd2d(0x48, rs1, rs2, rd)

libav-v9.6.tar.bz2/libavcodec/sunrast.c -> libav-v10.1.tar.bz2/libavcodec/sunrast.c Changed

@@ -26,27 +26,12 @@
 #include "internal.h"
 #include "sunrast.h"
 
-typedef struct SUNRASTContext {
- AVFrame picture;
-} SUNRASTContext;
-
-static av_cold int sunrast_init(AVCodecContext *avctx) {
- SUNRASTContext *s = avctx->priv_data;
-
- avcodec_get_frame_defaults(&s->picture);
- avctx->coded_frame = &s->picture;
-
- return 0;
-}
-
 static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame, AVPacket *avpkt)
 {
 const uint8_t *buf = avpkt->data;
 const uint8_t *buf_end = avpkt->data + avpkt->size;
- SUNRASTContext * const s = avctx->priv_data;
- AVFrame *picture = data;
- AVFrame * const p = &s->picture;
+ AVFrame * const p = data;
 unsigned int w, h, depth, type, maptype, maplength, stride, x, y, len, alen;
 uint8_t *ptr;
 const uint8_t *bufstart = buf;
@@ -69,19 +54,15 @@
 buf += 32;
 
 if (type == RT_FORMAT_TIFF || type == RT_FORMAT_IFF || type == RT_EXPERIMENTAL) {
- av_log_ask_for_sample(avctx, "unsupported (compression) type\n");
+ avpriv_request_sample(avctx, "TIFF/IFF/EXPERIMENTAL (compression) type");
 return AVERROR_PATCHWELCOME;
 }
 if (type > RT_FORMAT_IFF) {
 av_log(avctx, AV_LOG_ERROR, "invalid (compression) type\n");
 return AVERROR_INVALIDDATA;
 }
- if (av_image_check_size(w, h, 0, avctx)) {
- av_log(avctx, AV_LOG_ERROR, "invalid image size\n");
- return AVERROR_INVALIDDATA;
- }
 if (maptype == RMT_RAW) {
- av_log_ask_for_sample(avctx, "unsupported colormap type\n");
+ avpriv_request_sample(avctx, "Unknown colormap type");
 return AVERROR_PATCHWELCOME;
 }
 if (maptype > RMT_RAW) {
@@ -105,12 +86,11 @@
 return AVERROR_INVALIDDATA;
 }
 
- if (p->data[0])
- avctx->release_buffer(avctx, p);
+ ret = ff_set_dimensions(avctx, w, h);
+ if (ret < 0)
+ return ret;
 
- if (w != avctx->width || h != avctx->height)
- avcodec_set_dimensions(avctx, w, h);
- if ((ret = ff_get_buffer(avctx, p)) < 0) {
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -181,29 +161,16 @@
 }
 }
 
- *picture = s->picture;
 *got_frame = 1;
 
 return buf - bufstart;
 }
 
-static av_cold int sunrast_end(AVCodecContext *avctx) {
- SUNRASTContext *s = avctx->priv_data;
-
- if(s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
-
- return 0;
-}
-
 AVCodec ff_sunrast_decoder = {
 .name = "sunrast",
+ .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_SUNRAST,
- .priv_data_size = sizeof(SUNRASTContext),
- .init = sunrast_init,
- .close = sunrast_end,
 .decode = sunrast_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"),
 };

libav-v9.6.tar.bz2/libavcodec/sunrastenc.c -> libav-v10.1.tar.bz2/libavcodec/sunrastenc.c Changed

@@ -25,7 +25,6 @@
 #include "sunrast.h"
 
 typedef struct SUNRASTContext {
- AVFrame picture;
 PutByteContext p;
 int depth; ///< depth of pixel
 int length; ///< length (bytes) of image
@@ -154,7 +153,10 @@
 return AVERROR(EINVAL);
 }
 
- avctx->coded_frame = &s->picture;
+ 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;
 s->maptype = RMT_NONE;
@@ -207,6 +209,12 @@
 return 0;
 }
 
+static av_cold int sunrast_encode_close(AVCodecContext *avctx)
+{
+ av_frame_free(&avctx->coded_frame);
+ return 0;
+}
+
 static const AVCodecDefault sunrast_defaults[] = {
 { "coder", "rle" },
 { NULL },
@@ -214,10 +222,12 @@
 
 AVCodec ff_sunrast_encoder = {
 .name = "sunrast",
+ .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_SUNRAST,
 .priv_data_size = sizeof(SUNRASTContext),
 .init = sunrast_encode_init,
+ .close = sunrast_encode_close,
 .encode2 = sunrast_encode_frame,
 .defaults = sunrast_defaults,
 .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24,
@@ -225,5 +235,4 @@
 AV_PIX_FMT_GRAY8,
 AV_PIX_FMT_MONOWHITE,
 AV_PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"),
 };

libav-v9.6.tar.bz2/libavcodec/svq1.c -> libav-v10.1.tar.bz2/libavcodec/svq1.c Changed

libav-v9.6.tar.bz2/libavcodec/svq1.h -> libav-v10.1.tar.bz2/libavcodec/svq1.h Changed

libav-v9.6.tar.bz2/libavcodec/svq1dec.c -> libav-v10.1.tar.bz2/libavcodec/svq1dec.c Changed

@@ -33,8 +33,9 @@
 */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "get_bits.h"
+#include "h263.h"
+#include "hpeldsp.h"
 #include "internal.h"
 #include "mathops.h"
 #include "svq1.h"
@@ -42,8 +43,6 @@
 #undef NDEBUG
 #include <assert.h>
 
-extern const uint8_t ff_mvtab[33][2];
-
 static VLC svq1_block_type;
 static VLC svq1_motion_component;
 static VLC svq1_intra_multistage[6];
@@ -58,9 +57,9 @@
 } svq1_pmv;
 
 typedef struct SVQ1Context {
- DSPContext dsp;
+ HpelDSPContext hdsp;
 GetBitContext gb;
- AVFrame *cur, *prev;
+ AVFrame *prev;
 int width;
 int height;
 int frame_code;
@@ -320,7 +319,7 @@
 }
 }
 
-static int svq1_motion_inter_block(DSPContext *dsp, GetBitContext *bitbuf,
+static int svq1_motion_inter_block(HpelDSPContext *hdsp, GetBitContext *bitbuf,
 uint8_t *current, uint8_t *previous,
 int pitch, svq1_pmv *motion, int x, int y,
 int width, int height)
@@ -359,12 +358,12 @@
 src = &previous[(x + (mv.x >> 1)) + (y + (mv.y >> 1)) * pitch];
 dst = current;
 
- dsp->put_pixels_tab[0][(mv.y & 1) << 1 | (mv.x & 1)](dst, src, pitch, 16);
+ hdsp->put_pixels_tab[0][(mv.y & 1) << 1 | (mv.x & 1)](dst, src, pitch, 16);
 
 return 0;
 }
 
-static int svq1_motion_inter_4v_block(DSPContext *dsp, GetBitContext *bitbuf,
+static int svq1_motion_inter_4v_block(HpelDSPContext *hdsp, GetBitContext *bitbuf,
 uint8_t *current, uint8_t *previous,
 int pitch, svq1_pmv *motion, int x, int y,
 int width, int height)
@@ -433,7 +432,7 @@
 src = &previous[(x + (mvx >> 1)) + (y + (mvy >> 1)) * pitch];
 dst = current;
 
- dsp->put_pixels_tab[1][((mvy & 1) << 1) | (mvx & 1)](dst, src, pitch, 8);
+ hdsp->put_pixels_tab[1][((mvy & 1) << 1) | (mvx & 1)](dst, src, pitch, 8);
 
 /* select next block */
 if (i & 1)
@@ -445,7 +444,7 @@
 return 0;
 }
 
-static int svq1_decode_delta_block(AVCodecContext *avctx, DSPContext *dsp,
+static int svq1_decode_delta_block(AVCodecContext *avctx, HpelDSPContext *hdsp,
 GetBitContext *bitbuf,
 uint8_t *current, uint8_t *previous,
 int pitch, svq1_pmv *motion, int x, int y,
@@ -473,7 +472,7 @@
 break;
 
 case SVQ1_BLOCK_INTER:
- result = svq1_motion_inter_block(dsp, bitbuf, current, previous,
+ result = svq1_motion_inter_block(hdsp, bitbuf, current, previous,
 pitch, motion, x, y, width, height);
 
 if (result != 0) {
@@ -484,7 +483,7 @@
 break;
 
 case SVQ1_BLOCK_INTER_4V:
- result = svq1_motion_inter_4v_block(dsp, bitbuf, current, previous,
+ result = svq1_motion_inter_4v_block(hdsp, bitbuf, current, previous,
 pitch, motion, x, y, width, height);
 
 if (result != 0) {
@@ -578,8 +577,8 @@
 return AVERROR_INVALIDDATA;
 } else {
 /* get width, height from table */
- s->width = ff_svq1_frame_size_table[frame_size_code].width;
- s->height = ff_svq1_frame_size_table[frame_size_code].height;
+ s->width = ff_svq1_frame_size_table[frame_size_code][0];
+ s->height = ff_svq1_frame_size_table[frame_size_code][1];
 }
 }
 
@@ -611,14 +610,11 @@
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 SVQ1Context *s = avctx->priv_data;
- AVFrame *cur = s->cur;
+ AVFrame *cur = data;
 uint8_t *current;
 int result, i, x, y, width, height;
 svq1_pmv *pmv;
 
- if (cur->data[0])
- avctx->release_buffer(avctx, cur);
-
 /* initialize bit buffer */
 init_get_bits(&s->gb, buf, buf_size * 8);
 
@@ -642,7 +638,10 @@
 av_dlog(avctx, "Error in svq1_decode_frame_header %i\n", result);
 return result;
 }
- avcodec_set_dimensions(avctx, s->width, s->height);
+
+ result = ff_set_dimensions(avctx, s->width, s->height);
+ if (result < 0)
+ return result;
 
 if ((avctx->skip_frame >= AVDISCARD_NONREF && s->nonref) ||
 (avctx->skip_frame >= AVDISCARD_NONKEY &&
@@ -650,7 +649,7 @@
 avctx->skip_frame >= AVDISCARD_ALL)
 return buf_size;
 
- result = ff_get_buffer(avctx, cur);
+ result = ff_get_buffer(avctx, cur, s->nonref ? 0 : AV_GET_BUFFER_FLAG_REF);
 if (result < 0)
 return result;
 
@@ -702,7 +701,7 @@
 
 for (y = 0; y < height; y += 16) {
 for (x = 0; x < width; x += 16) {
- result = svq1_decode_delta_block(avctx, &s->dsp,
+ result = svq1_decode_delta_block(avctx, &s->hdsp,
 &s->gb, &current[x],
 previous, linesize,
 pmv, x, y, width, height);
@@ -722,9 +721,12 @@
 }
 }
 
- *(AVFrame*)data = *cur;
- if (!s->nonref)
- FFSWAP(AVFrame*, s->cur, s->prev);
+ if (!s->nonref) {
+ av_frame_unref(s->prev);
+ result = av_frame_ref(s->prev, cur);
+ if (result < 0)
+ goto err;
+ }
 
 *got_frame = 1;
 result = buf_size;
@@ -740,19 +742,15 @@
 int i;
 int offset = 0;
 
- s->cur = avcodec_alloc_frame();
- s->prev = avcodec_alloc_frame();
- if (!s->cur || !s->prev) {
- avcodec_free_frame(&s->cur);
- avcodec_free_frame(&s->prev);
+ s->prev = av_frame_alloc();
+ if (!s->prev)
 return AVERROR(ENOMEM);
- }
 
 s->width = avctx->width + 3 & ~3;
 s->height = avctx->height + 3 & ~3;
 avctx->pix_fmt = AV_PIX_FMT_YUV410P;
 
- ff_dsputil_init(&s->dsp, avctx);
+ ff_hpeldsp_init(&s->hdsp, avctx->flags);
 
 INIT_VLC_STATIC(&svq1_block_type, 2, 4,
 &ff_svq1_block_type_vlc[0][1], 2, 1,
@@ -797,12 +795,7 @@
 {
 SVQ1Context *s = avctx->priv_data;
 
- if (s->cur->data[0])
- avctx->release_buffer(avctx, s->cur);
- if (s->prev->data[0])
- avctx->release_buffer(avctx, s->prev);
- avcodec_free_frame(&s->cur);
- avcodec_free_frame(&s->prev);
+ av_frame_free(&s->prev);
 
 return 0;
 }
@@ -811,14 +804,12 @@
 {
 SVQ1Context *s = avctx->priv_data;
 
- if (s->cur->data[0])
- avctx->release_buffer(avctx, s->cur);
- if (s->prev->data[0])
- avctx->release_buffer(avctx, s->prev);
+ av_frame_unref(s->prev);
 }
 
 AVCodec ff_svq1_decoder = {
 .name = "svq1",
+ .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_SVQ1,
 .priv_data_size = sizeof(SVQ1Context),
@@ -829,5 +820,4 @@
 .flush = svq1_flush,
 .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV410P,
 AV_PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"),
 };

libav-v9.6.tar.bz2/libavcodec/svq1enc.c -> libav-v10.1.tar.bz2/libavcodec/svq1enc.c Changed

@@ -28,6 +28,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
+#include "hpeldsp.h"
 #include "mpegvideo.h"
 #include "h263.h"
 #include "internal.h"
@@ -44,9 +45,9 @@
 MpegEncContext m;
 AVCodecContext *avctx;
 DSPContext dsp;
- AVFrame picture;
- AVFrame current_picture;
- AVFrame last_picture;
+ HpelDSPContext hdsp;
+ AVFrame *current_picture;
+ AVFrame *last_picture;
 PutBitContext pb;
 GetBitContext gb;
 
@@ -263,13 +264,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 */
@@ -280,7 +282,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;
@@ -296,13 +298,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;
@@ -325,9 +327,9 @@
 s->m.current_picture.mb_mean = (uint8_t *)s->dummy;
 s->m.current_picture.mb_var = (uint16_t *)s->dummy;
 s->m.current_picture.mc_mb_var = (uint16_t *)s->dummy;
- s->m.current_picture.f.mb_type = s->dummy;
+ s->m.current_picture.mb_type = s->dummy;
 
- s->m.current_picture.f.motion_val[0] = s->motion_val8[plane] + 2;
+ s->m.current_picture.motion_val[0] = s->motion_val8[plane] + 2;
 s->m.p_mv_table = s->motion_val16[plane] +
 s->m.mb_stride + 1;
 s->m.dsp = s->dsp; // move
@@ -395,13 +397,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;
@@ -417,7 +419,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;
@@ -445,10 +447,10 @@
 
 dxy = (mx & 1) + 2 * (my & 1);
 
- s->dsp.put_pixels_tab[0][dxy](temp + 16,
- ref + (mx >> 1) +
- stride * (my >> 1),
- stride, 16);
+ s->hdsp.put_pixels_tab[0][dxy](temp + 16,
+ ref + (mx >> 1) +
+ stride * (my >> 1),
+ stride, 16);
 
 score[1] += encode_block(s, src + 16 * x, temp + 16,
 decoded, stride, 5, 64, lambda, 0);
@@ -460,7 +462,7 @@
 score[2] += vlc[1] * lambda;
 if (score[2] < score[best] && mx == 0 && my == 0) {
 best = 2;
- s->dsp.put_pixels_tab[0][0](decoded, ref, stride, 16);
+ s->hdsp.put_pixels_tab[0][0](decoded, ref, stride, 16);
 for (i = 0; i < 6; i++)
 count[2][i] = 0;
 put_bits(&s->pb, vlc[1], vlc[0]);
@@ -490,19 +492,55 @@
 avpriv_copy_bits(&s->pb, reorder_buffer[best][i],
 count[best][i]);
 if (best == 0)
- s->dsp.put_pixels_tab[0][0](decoded, temp, stride, 16);
+ s->hdsp.put_pixels_tab[0][0](decoded, temp, stride, 16);
 }
 s->m.first_slice_line = 0;
 }
 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);
- avctx->coded_frame = &s->picture;
+ ff_hpeldsp_init(&s->hdsp, avctx->flags);
+
+ 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;
@@ -534,13 +572,12 @@
 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 (!pkt->data &&
 (ret = av_new_packet(pkt, s->y_block_width * s->y_block_height *
- MAX_MB_BYTES * 3 + FF_MIN_BUFFER_SIZE) < 0)) {
+ MAX_MB_BYTES * 3 + FF_MIN_BUFFER_SIZE)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n");
 return ret;
 }
@@ -550,33 +587,31 @@
 return -1;
 }
 
- if (!s->current_picture.data[0]) {
- ff_get_buffer(avctx, &s->current_picture);
- ff_get_buffer(avctx, &s->last_picture);
- s->scratchbuf = av_malloc(s->current_picture.linesize[0] * 16 * 2);
+ if (!s->current_picture->data[0]) {
+ ff_get_buffer(avctx, s->current_picture, 0);
+ ff_get_buffer(avctx, s->last_picture, 0);
+ s->scratchbuf = av_malloc(s->current_picture->linesize[0] * 16 * 2);
 }
 
- temp = s->current_picture;
- s->current_picture = s->last_picture;
- 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);
@@ -593,39 +628,15 @@
 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]);
- }
-
- return 0;
-}
-
 AVCodec ff_svq1_encoder = {
 .name = "svq1",
+ .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_SVQ1,
 .priv_data_size = sizeof(SVQ1Context),
 .init = svq1_encode_init,
 .encode2 = svq1_encode_frame,
 .close = svq1_encode_end,
- .pix_fmts = (const enum PixelFormat[]) { AV_PIX_FMT_YUV410P,
- AV_PIX_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"),
+ .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV410P,
+ AV_PIX_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/svq3.c -> libav-v10.1.tar.bz2/libavcodec/svq3.c Changed

@@ -39,8 +39,9 @@
 * correctly decodes this file:
 * http://samples.libav.org/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov
 */
+
+#include "libavutil/attributes.h"
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h264.h"
@@ -49,14 +50,15 @@
 
 #include "h264_mvpred.h"
 #include "golomb.h"
+#include "hpeldsp.h"
 #include "rectangle.h"
-#include "vdpau_internal.h"
 
 #if CONFIG_ZLIB
 #include <zlib.h>
 #endif
 
 #include "svq1.h"
+#include "svq3.h"
 
 /**
 * @file
@@ -65,11 +67,20 @@
 
 typedef struct {
 H264Context h;
+ HpelDSPContext hdsp;
+ Picture *cur_pic;
+ Picture *next_pic;
+ Picture *last_pic;
 int halfpel_flag;
 int thirdpel_flag;
 int unknown_flag;
 int next_slice_index;
 uint32_t watermark_key;
+ int adaptive_quant;
+ int next_p_frame_damaged;
+ int h_edge_pos;
+ int v_edge_pos;
+ int last_frame_output;
 } SVQ3Context;
 
 #define FULLPEL_MODE 1
@@ -93,6 +104,13 @@
 0 + 3 * 4, 1 + 3 * 4, 2 + 3 * 4, 3 + 3 * 4,
 };
 
+static const uint8_t luma_dc_zigzag_scan[16] = {
+ 0 * 16 + 0 * 64, 1 * 16 + 0 * 64, 2 * 16 + 0 * 64, 0 * 16 + 2 * 64,
+ 3 * 16 + 0 * 64, 0 * 16 + 1 * 64, 1 * 16 + 1 * 64, 2 * 16 + 1 * 64,
+ 1 * 16 + 2 * 64, 2 * 16 + 2 * 64, 3 * 16 + 2 * 64, 0 * 16 + 3 * 64,
+ 3 * 16 + 1 * 64, 1 * 16 + 3 * 64, 2 * 16 + 3 * 64, 3 * 16 + 3 * 64,
+};
+
 static const uint8_t svq3_pred_0[25][2] = {
 { 0, 0 },
 { 1, 0 }, { 0, 1 },
@@ -137,7 +155,7 @@
 61694, 68745, 77615, 89113, 100253, 109366, 126635, 141533
 };
 
-void ff_svq3_luma_dc_dequant_idct_c(DCTELEM *output, DCTELEM *input, int qp)
+void ff_svq3_luma_dc_dequant_idct_c(int16_t *output, int16_t *input, int qp)
 {
 const int qmul = svq3_dequant_coeff[qp];
 #define stride 16
@@ -172,7 +190,7 @@
 }
 #undef stride
 
-void ff_svq3_add_idct_c(uint8_t *dst, DCTELEM *block,
+void ff_svq3_add_idct_c(uint8_t *dst, int16_t *block,
 int stride, int qp, int dc)
 {
 const int qmul = svq3_dequant_coeff[qp];
@@ -208,9 +226,11 @@
 dst[i + stride * 2] = av_clip_uint8(dst[i + stride * 2] + ((z1 - z2) * qmul + rr >> 20));
 dst[i + stride * 3] = av_clip_uint8(dst[i + stride * 3] + ((z0 - z3) * qmul + rr >> 20));
 }
+
+ memset(block, 0, 16 * sizeof(int16_t));
 }
 
-static inline int svq3_decode_block(GetBitContext *gb, DCTELEM *block,
+static inline int svq3_decode_block(GetBitContext *gb, int16_t *block,
 int index, const int type)
 {
 static const uint8_t *const scan_patterns[4] =
@@ -266,12 +286,13 @@
 return 0;
 }
 
-static inline void svq3_mc_dir_part(MpegEncContext *s,
+static inline void svq3_mc_dir_part(SVQ3Context *s,
 int x, int y, int width, int height,
 int mx, int my, int dxy,
 int thirdpel, int dir, int avg)
 {
- const Picture *pic = (dir == 0) ? &s->last_picture : &s->next_picture;
+ H264Context *h = &s->h;
+ const Picture *pic = (dir == 0) ? s->last_pic : s->next_pic;
 uint8_t *src, *dest;
 int i, emu = 0;
 int blocksize = 2 - (width >> 3); // 16->0, 8->1, 4->2
@@ -281,33 +302,32 @@
 
 if (mx < 0 || mx >= s->h_edge_pos - width - 1 ||
 my < 0 || my >= s->v_edge_pos - height - 1) {
- if ((s->flags & CODEC_FLAG_EMU_EDGE))
- emu = 1;
-
+ emu = 1;
 mx = av_clip(mx, -16, s->h_edge_pos - width + 15);
 my = av_clip(my, -16, s->v_edge_pos - height + 15);
 }
 
 /* form component predictions */
- dest = s->current_picture.f.data[0] + x + y * s->linesize;
- src = pic->f.data[0] + mx + my * s->linesize;
+ dest = h->cur_pic.f.data[0] + x + y * h->linesize;
+ src = pic->f.data[0] + mx + my * h->linesize;
 
 if (emu) {
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src, s->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 = s->edge_emu_buffer;
+ src = h->edge_emu_buffer;
 }
 if (thirdpel)
- (avg ? s->dsp.avg_tpel_pixels_tab
- : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->linesize,
+ (avg ? h->dsp.avg_tpel_pixels_tab
+ : h->dsp.put_tpel_pixels_tab)[dxy](dest, src, h->linesize,
 width, height);
 else
- (avg ? s->dsp.avg_pixels_tab
- : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->linesize,
- height);
+ (avg ? s->hdsp.avg_pixels_tab
+ : s->hdsp.put_pixels_tab)[blocksize][dxy](dest, src, h->linesize,
+ height);
 
- if (!(s->flags & CODEC_FLAG_GRAY)) {
+ if (!(h->flags & CODEC_FLAG_GRAY)) {
 mx = mx + (mx < (int) x) >> 1;
 my = my + (my < (int) y) >> 1;
 width = width >> 1;
@@ -315,35 +335,36 @@
 blocksize++;
 
 for (i = 1; i < 3; i++) {
- dest = s->current_picture.f.data[i] + (x >> 1) + (y >> 1) * s->uvlinesize;
- src = pic->f.data[i] + mx + my * s->uvlinesize;
+ dest = h->cur_pic.f.data[i] + (x >> 1) + (y >> 1) * h->uvlinesize;
+ src = pic->f.data[i] + mx + my * h->uvlinesize;
 
 if (emu) {
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src, s->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);
- src = s->edge_emu_buffer;
+ src = h->edge_emu_buffer;
 }
 if (thirdpel)
- (avg ? s->dsp.avg_tpel_pixels_tab
- : s->dsp.put_tpel_pixels_tab)[dxy](dest, src,
- s->uvlinesize,
+ (avg ? h->dsp.avg_tpel_pixels_tab
+ : h->dsp.put_tpel_pixels_tab)[dxy](dest, src,
+ h->uvlinesize,
 width, height);
 else
- (avg ? s->dsp.avg_pixels_tab
- : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src,
- s->uvlinesize,
- height);
+ (avg ? s->hdsp.avg_pixels_tab
+ : s->hdsp.put_pixels_tab)[blocksize][dxy](dest, src,
+ h->uvlinesize,
+ height);
 }
 }
 }
 
-static inline int svq3_mc_dir(H264Context *h, int size, int mode,
+static inline int svq3_mc_dir(SVQ3Context *s, int size, int mode,
 int dir, int avg)
 {
 int i, j, k, mx, my, dx, dy, x, y;
- MpegEncContext *const s = (MpegEncContext *)h;
+ H264Context *h = &s->h;
 const int part_width = ((size & 5) == 4) ? 4 : 16 >> (size & 1);
 const int part_height = 16 >> ((unsigned)(size + 1) / 3);
 const int extra_width = (mode == PREDICT_MODE) ? -16 * 6 : 0;
@@ -352,19 +373,19 @@
 
 for (i = 0; i < 16; i += part_height)
 for (j = 0; j < 16; j += part_width) {
- const int b_xy = (4 * s->mb_x + (j >> 2)) +
- (4 * s->mb_y + (i >> 2)) * h->b_stride;
+ const int b_xy = (4 * h->mb_x + (j >> 2)) +
+ (4 * h->mb_y + (i >> 2)) * h->b_stride;
 int dxy;
- x = 16 * s->mb_x + j;
- y = 16 * s->mb_y + i;
+ x = 16 * h->mb_x + j;
+ y = 16 * h->mb_y + i;
 k = (j >> 2 & 1) + (i >> 1 & 2) +
 (j >> 1 & 4) + (i & 8);
 
 if (mode != PREDICT_MODE) {
 pred_motion(h, k, part_width >> 2, dir, 1, &mx, &my);
 } else {
- mx = s->next_picture.f.motion_val[0][b_xy][0] << 1;
- my = s->next_picture.f.motion_val[0][b_xy][1] << 1;
+ mx = s->next_pic->motion_val[0][b_xy][0] << 1;
+ my = s->next_pic->motion_val[0][b_xy][1] << 1;
 
 if (dir == 0) {
 mx = mx * h->frame_num_offset /
@@ -387,11 +408,11 @@
 if (mode == PREDICT_MODE) {
 dx = dy = 0;
 } else {
- dy = svq3_get_se_golomb(&s->gb);
- dx = svq3_get_se_golomb(&s->gb);
+ dy = svq3_get_se_golomb(&h->gb);
+ dx = svq3_get_se_golomb(&h->gb);
 
 if (dx == INVALID_VLC || dy == INVALID_VLC) {
- av_log(h->s.avctx, AV_LOG_ERROR, "invalid MV vlc\n");
+ av_log(h->avctx, AV_LOG_ERROR, "invalid MV vlc\n");
 return -1;
 }
 }
@@ -445,7 +466,7 @@
 }
 
 /* write back motion vectors */
- fill_rectangle(s->current_picture.f.motion_val[dir][b_xy],
+ fill_rectangle(h->cur_pic.motion_val[dir][b_xy],
 part_width >> 2, part_height >> 2, h->b_stride,
 pack16to32(mx, my), 4);
 }
@@ -453,46 +474,45 @@
 return 0;
 }
 
-static int svq3_decode_mb(SVQ3Context *svq3, unsigned int mb_type)
+static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
 {
- H264Context *h = &svq3->h;
+ H264Context *h = &s->h;
 int i, j, k, m, dir, mode;
 int cbp = 0;
 uint32_t vlc;
 int8_t *top, *left;
- MpegEncContext *const s = (MpegEncContext *)h;
 const int mb_xy = h->mb_xy;
- const int b_xy = 4 * s->mb_x + 4 * s->mb_y * h->b_stride;
+ const int b_xy = 4 * h->mb_x + 4 * h->mb_y * h->b_stride;
 
- h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF;
- h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF;
+ h->top_samples_available = (h->mb_y == 0) ? 0x33FF : 0xFFFF;
+ h->left_samples_available = (h->mb_x == 0) ? 0x5F5F : 0xFFFF;
 h->topright_samples_available = 0xFFFF;
 
 if (mb_type == 0) { /* SKIP */
- if (s->pict_type == AV_PICTURE_TYPE_P ||
- s->next_picture.f.mb_type[mb_xy] == -1) {
- svq3_mc_dir_part(s, 16 * s->mb_x, 16 * s->mb_y, 16, 16,
+ if (h->pict_type == AV_PICTURE_TYPE_P ||
+ s->next_pic->mb_type[mb_xy] == -1) {
+ svq3_mc_dir_part(s, 16 * h->mb_x, 16 * h->mb_y, 16, 16,
 0, 0, 0, 0, 0, 0);
 
- if (s->pict_type == AV_PICTURE_TYPE_B)
- svq3_mc_dir_part(s, 16 * s->mb_x, 16 * s->mb_y, 16, 16,
+ if (h->pict_type == AV_PICTURE_TYPE_B)
+ svq3_mc_dir_part(s, 16 * h->mb_x, 16 * h->mb_y, 16, 16,
 0, 0, 0, 0, 1, 1);
 
 mb_type = MB_TYPE_SKIP;
 } else {
- mb_type = FFMIN(s->next_picture.f.mb_type[mb_xy], 6);
- if (svq3_mc_dir(h, mb_type, PREDICT_MODE, 0, 0) < 0)
+ mb_type = FFMIN(s->next_pic->mb_type[mb_xy], 6);
+ if (svq3_mc_dir(s, mb_type, PREDICT_MODE, 0, 0) < 0)
 return -1;
- if (svq3_mc_dir(h, mb_type, PREDICT_MODE, 1, 1) < 0)
+ if (svq3_mc_dir(s, mb_type, PREDICT_MODE, 1, 1) < 0)
 return -1;
 
 mb_type = MB_TYPE_16x16;
 }
 } else if (mb_type < 8) { /* INTER */
- if (svq3->thirdpel_flag && svq3->halfpel_flag == !get_bits1(&s->gb))
+ if (s->thirdpel_flag && s->halfpel_flag == !get_bits1(&h->gb))
 mode = THIRDPEL_MODE;
- else if (svq3->halfpel_flag &&
- svq3->thirdpel_flag == !get_bits1(&s->gb))
+ else if (s->halfpel_flag &&
+ s->thirdpel_flag == !get_bits1(&h->gb))
 mode = HALFPEL_MODE;
 else
 mode = FULLPEL_MODE;
@@ -507,63 +527,63 @@
 */
 
 for (m = 0; m < 2; m++) {
- if (s->mb_x > 0 && h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1] + 6] != -1) {
+ if (h->mb_x > 0 && h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1] + 6] != -1) {
 for (i = 0; i < 4; i++)
 AV_COPY32(h->mv_cache[m][scan8[0] - 1 + i * 8],
- s->current_picture.f.motion_val[m][b_xy - 1 + i * h->b_stride]);
+ h->cur_pic.motion_val[m][b_xy - 1 + i * h->b_stride]);
 } else {
 for (i = 0; i < 4; i++)
 AV_ZERO32(h->mv_cache[m][scan8[0] - 1 + i * 8]);
 }
- if (s->mb_y > 0) {
+ if (h->mb_y > 0) {
 memcpy(h->mv_cache[m][scan8[0] - 1 * 8],
- s->current_picture.f.motion_val[m][b_xy - h->b_stride],
+ h->cur_pic.motion_val[m][b_xy - h->b_stride],
 4 * 2 * sizeof(int16_t));
 memset(&h->ref_cache[m][scan8[0] - 1 * 8],
- (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1, 4);
+ (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1, 4);
 
- if (s->mb_x < s->mb_width - 1) {
+ if (h->mb_x < h->mb_width - 1) {
 AV_COPY32(h->mv_cache[m][scan8[0] + 4 - 1 * 8],
- s->current_picture.f.motion_val[m][b_xy - h->b_stride + 4]);
+ h->cur_pic.motion_val[m][b_xy - h->b_stride + 4]);
 h->ref_cache[m][scan8[0] + 4 - 1 * 8] =
- (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride + 1] + 6] == -1 ||
- h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1;
+ (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride + 1] + 6] == -1 ||
+ h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1;
 } else
 h->ref_cache[m][scan8[0] + 4 - 1 * 8] = PART_NOT_AVAILABLE;
- if (s->mb_x > 0) {
+ if (h->mb_x > 0) {
 AV_COPY32(h->mv_cache[m][scan8[0] - 1 - 1 * 8],
- s->current_picture.f.motion_val[m][b_xy - h->b_stride - 1]);
+ h->cur_pic.motion_val[m][b_xy - h->b_stride - 1]);
 h->ref_cache[m][scan8[0] - 1 - 1 * 8] =
- (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride - 1] + 3] == -1) ? PART_NOT_AVAILABLE : 1;
+ (h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride - 1] + 3] == -1) ? PART_NOT_AVAILABLE : 1;
 } else
 h->ref_cache[m][scan8[0] - 1 - 1 * 8] = PART_NOT_AVAILABLE;
 } else
 memset(&h->ref_cache[m][scan8[0] - 1 * 8 - 1],
 PART_NOT_AVAILABLE, 8);
 
- if (s->pict_type != AV_PICTURE_TYPE_B)
+ if (h->pict_type != AV_PICTURE_TYPE_B)
 break;
 }
 
 /* decode motion vector(s) and form prediction(s) */
- if (s->pict_type == AV_PICTURE_TYPE_P) {
- if (svq3_mc_dir(h, mb_type - 1, mode, 0, 0) < 0)
+ if (h->pict_type == AV_PICTURE_TYPE_P) {
+ if (svq3_mc_dir(s, mb_type - 1, mode, 0, 0) < 0)
 return -1;
 } else { /* AV_PICTURE_TYPE_B */
 if (mb_type != 2) {
- if (svq3_mc_dir(h, 0, mode, 0, 0) < 0)
+ if (svq3_mc_dir(s, 0, mode, 0, 0) < 0)
 return -1;
 } else {
 for (i = 0; i < 4; i++)
- memset(s->current_picture.f.motion_val[0][b_xy + i * h->b_stride],
+ memset(h->cur_pic.motion_val[0][b_xy + i * h->b_stride],
 0, 4 * 2 * sizeof(int16_t));
 }
 if (mb_type != 1) {
- if (svq3_mc_dir(h, 0, mode, 1, mb_type == 3) < 0)
+ if (svq3_mc_dir(s, 0, mode, 1, mb_type == 3) < 0)
 return -1;
 } else {
 for (i = 0; i < 4; i++)
- memset(s->current_picture.f.motion_val[1][b_xy + i * h->b_stride],
+ memset(h->cur_pic.motion_val[1][b_xy + i * h->b_stride],
 0, 4 * 2 * sizeof(int16_t));
 }
 }
@@ -573,17 +593,17 @@
 memset(h->intra4x4_pred_mode_cache, -1, 8 * 5 * sizeof(int8_t));
 
 if (mb_type == 8) {
- if (s->mb_x > 0) {
+ if (h->mb_x > 0) {
 for (i = 0; i < 4; i++)
 h->intra4x4_pred_mode_cache[scan8[0] - 1 + i * 8] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1] + 6 - i];
 if (h->intra4x4_pred_mode_cache[scan8[0] - 1] == -1)
 h->left_samples_available = 0x5F5F;
 }
- if (s->mb_y > 0) {
- h->intra4x4_pred_mode_cache[4 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride] + 0];
- h->intra4x4_pred_mode_cache[5 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride] + 1];
- h->intra4x4_pred_mode_cache[6 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride] + 2];
- h->intra4x4_pred_mode_cache[7 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride] + 3];
+ if (h->mb_y > 0) {
+ h->intra4x4_pred_mode_cache[4 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 0];
+ h->intra4x4_pred_mode_cache[5 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 1];
+ h->intra4x4_pred_mode_cache[6 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 2];
+ h->intra4x4_pred_mode_cache[7 + 8 * 0] = h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 3];
 
 if (h->intra4x4_pred_mode_cache[4 + 8 * 0] == -1)
 h->top_samples_available = 0x33FF;
@@ -591,10 +611,10 @@
 
 /* decode prediction codes for luma blocks */
 for (i = 0; i < 16; i += 2) {
- vlc = svq3_get_ue_golomb(&s->gb);
+ vlc = svq3_get_ue_golomb(&h->gb);
 
 if (vlc >= 25) {
- av_log(h->s.avctx, AV_LOG_ERROR, "luma prediction:%d\n", vlc);
+ av_log(h->avctx, AV_LOG_ERROR, "luma prediction:%d\n", vlc);
 return -1;
 }
 
@@ -605,7 +625,7 @@
 left[2] = svq3_pred_1[top[1] + 1][left[1] + 1][svq3_pred_0[vlc][1]];
 
 if (left[1] == -1 || left[2] == -1) {
- av_log(h->s.avctx, AV_LOG_ERROR, "weird prediction\n");
+ av_log(h->avctx, AV_LOG_ERROR, "weird prediction\n");
 return -1;
 }
 }
@@ -619,8 +639,8 @@
 if (mb_type == 8) {
 ff_h264_check_intra4x4_pred_mode(h);
 
- h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF;
- h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF;
+ h->top_samples_available = (h->mb_y == 0) ? 0x33FF : 0xFFFF;
+ h->left_samples_available = (h->mb_x == 0) ? 0x5F5F : 0xFFFF;
 } else {
 for (i = 0; i < 4; i++)
 memset(&h->intra4x4_pred_mode_cache[scan8[0] + 8 * i], DC_128_PRED, 4);
@@ -634,38 +654,36 @@
 dir = i_mb_type_info[mb_type - 8].pred_mode;
 dir = (dir >> 1) ^ 3 * (dir & 1) ^ 1;
 
- if ((h->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, dir, 0)) == -1) {
- av_log(h->s.avctx, AV_LOG_ERROR, "check_intra_pred_mode = -1\n");
- return -1;
+ if ((h->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, dir, 0)) < 0) {
+ av_log(h->avctx, AV_LOG_ERROR, "ff_h264_check_intra_pred_mode < 0\n");
+ return h->intra16x16_pred_mode;
 }
 
 cbp = i_mb_type_info[mb_type - 8].cbp;
 mb_type = MB_TYPE_INTRA16x16;
 }
 
- if (!IS_INTER(mb_type) && s->pict_type != AV_PICTURE_TYPE_I) {
+ if (!IS_INTER(mb_type) && h->pict_type != AV_PICTURE_TYPE_I) {
 for (i = 0; i < 4; i++)
- memset(s->current_picture.f.motion_val[0][b_xy + i * h->b_stride],
+ memset(h->cur_pic.motion_val[0][b_xy + i * h->b_stride],
 0, 4 * 2 * sizeof(int16_t));
- if (s->pict_type == AV_PICTURE_TYPE_B) {
+ if (h->pict_type == AV_PICTURE_TYPE_B) {
 for (i = 0; i < 4; i++)
- memset(s->current_picture.f.motion_val[1][b_xy + i * h->b_stride],
+ memset(h->cur_pic.motion_val[1][b_xy + i * h->b_stride],
 0, 4 * 2 * sizeof(int16_t));
 }
 }
 if (!IS_INTRA4x4(mb_type)) {
 memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy], DC_PRED, 8);
 }
- if (!IS_SKIP(mb_type) || s->pict_type == AV_PICTURE_TYPE_B) {
+ if (!IS_SKIP(mb_type) || h->pict_type == AV_PICTURE_TYPE_B) {
 memset(h->non_zero_count_cache + 8, 0, 14 * 8 * sizeof(uint8_t));
- s->dsp.clear_blocks(h->mb + 0);
- s->dsp.clear_blocks(h->mb + 384);
 }
 
 if (!IS_INTRA16x16(mb_type) &&
- (!IS_SKIP(mb_type) || s->pict_type == AV_PICTURE_TYPE_B)) {
- if ((vlc = svq3_get_ue_golomb(&s->gb)) >= 48) {
- av_log(h->s.avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc);
+ (!IS_SKIP(mb_type) || h->pict_type == AV_PICTURE_TYPE_B)) {
+ if ((vlc = svq3_get_ue_golomb(&h->gb)) >= 48) {
+ av_log(h->avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc);
 return -1;
 }
 
@@ -673,19 +691,19 @@
 : golomb_to_inter_cbp[vlc];
 }
 if (IS_INTRA16x16(mb_type) ||
- (s->pict_type != AV_PICTURE_TYPE_I && s->adaptive_quant && cbp)) {
- s->qscale += svq3_get_se_golomb(&s->gb);
+ (h->pict_type != AV_PICTURE_TYPE_I && s->adaptive_quant && cbp)) {
+ h->qscale += svq3_get_se_golomb(&h->gb);
 
- if (s->qscale > 31u) {
- av_log(h->s.avctx, AV_LOG_ERROR, "qscale:%d\n", s->qscale);
+ if (h->qscale > 31u) {
+ av_log(h->avctx, AV_LOG_ERROR, "qscale:%d\n", h->qscale);
 return -1;
 }
 }
 if (IS_INTRA16x16(mb_type)) {
 AV_ZERO128(h->mb_luma_dc[0] + 0);
 AV_ZERO128(h->mb_luma_dc[0] + 8);
- if (svq3_decode_block(&s->gb, h->mb_luma_dc[0], 0, 1)) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ if (svq3_decode_block(&h->gb, h->mb_luma_dc[0], 0, 1)) {
+ av_log(h->avctx, AV_LOG_ERROR,
 "error while decoding intra luma dc\n");
 return -1;
 }
@@ -693,7 +711,7 @@
 
 if (cbp) {
 const int index = IS_INTRA16x16(mb_type) ? 1 : 0;
- const int type = ((s->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1);
+ const int type = ((h->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1);
 
 for (i = 0; i < 4; i++)
 if ((cbp & (1 << i))) {
@@ -703,8 +721,8 @@
 : (4 * i + j);
 h->non_zero_count_cache[scan8[k]] = 1;
 
- if (svq3_decode_block(&s->gb, &h->mb[16 * k], index, type)) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ if (svq3_decode_block(&h->gb, &h->mb[16 * k], index, type)) {
+ av_log(h->avctx, AV_LOG_ERROR,
 "error while decoding block\n");
 return -1;
 }
@@ -713,8 +731,8 @@
 
 if ((cbp & 0x30)) {
 for (i = 1; i < 3; ++i)
- if (svq3_decode_block(&s->gb, &h->mb[16 * 16 * i], 0, 3)) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ if (svq3_decode_block(&h->gb, &h->mb[16 * 16 * i], 0, 3)) {
+ av_log(h->avctx, AV_LOG_ERROR,
 "error while decoding chroma dc block\n");
 return -1;
 }
@@ -725,8 +743,8 @@
 k = 16 * i + j;
 h->non_zero_count_cache[scan8[k]] = 1;
 
- if (svq3_decode_block(&s->gb, &h->mb[16 * k], 1, 1)) {
- av_log(h->s.avctx, AV_LOG_ERROR,
+ if (svq3_decode_block(&h->gb, &h->mb[16 * k], 1, 1)) {
+ av_log(h->avctx, AV_LOG_ERROR,
 "error while decoding chroma ac block\n");
 return -1;
 }
@@ -737,7 +755,7 @@
 }
 
 h->cbp = cbp;
- s->current_picture.f.mb_type[mb_xy] = mb_type;
+ h->cur_pic.mb_type[mb_xy] = mb_type;
 
 if (IS_INTRA(mb_type))
 h->chroma_pred_mode = ff_h264_check_intra_pred_mode(h, DC_PRED8x8, 1);
@@ -747,14 +765,13 @@
 
 static int svq3_decode_slice_header(AVCodecContext *avctx)
 {
- SVQ3Context *svq3 = avctx->priv_data;
- H264Context *h = &svq3->h;
- MpegEncContext *s = &h->s;
+ SVQ3Context *s = avctx->priv_data;
+ H264Context *h = &s->h;
 const int mb_xy = h->mb_xy;
 int i, header;
 unsigned slice_id;
 
- header = get_bits(&s->gb, 8);
+ header = get_bits(&h->gb, 8);
 
 if (((header & 0x9F) != 1 && (header & 0x9F) != 2) || (header & 0x60) == 0) {
 /* TODO: what? */
@@ -763,75 +780,75 @@
 } else {
 int length = header >> 5 & 3;
 
- svq3->next_slice_index = get_bits_count(&s->gb) +
- 8 * show_bits(&s->gb, 8 * length) +
- 8 * length;
+ s->next_slice_index = get_bits_count(&h->gb) +
+ 8 * show_bits(&h->gb, 8 * length) +
+ 8 * length;
 
- if (svq3->next_slice_index > s->gb.size_in_bits) {
+ if (s->next_slice_index > h->gb.size_in_bits) {
 av_log(avctx, AV_LOG_ERROR, "slice after bitstream end\n");
 return -1;
 }
 
- s->gb.size_in_bits = svq3->next_slice_index - 8 * (length - 1);
- skip_bits(&s->gb, 8);
+ h->gb.size_in_bits = s->next_slice_index - 8 * (length - 1);
+ skip_bits(&h->gb, 8);
 
- if (svq3->watermark_key) {
- uint32_t header = AV_RL32(&s->gb.buffer[(get_bits_count(&s->gb) >> 3) + 1]);
- AV_WL32(&s->gb.buffer[(get_bits_count(&s->gb) >> 3) + 1],
- header ^ svq3->watermark_key);
+ if (s->watermark_key) {
+ uint32_t header = AV_RL32(&h->gb.buffer[(get_bits_count(&h->gb) >> 3) + 1]);
+ AV_WL32(&h->gb.buffer[(get_bits_count(&h->gb) >> 3) + 1],
+ header ^ s->watermark_key);
 }
 if (length > 0) {
- memcpy((uint8_t *) &s->gb.buffer[get_bits_count(&s->gb) >> 3],
- &s->gb.buffer[s->gb.size_in_bits >> 3], length - 1);
+ memcpy((uint8_t *) &h->gb.buffer[get_bits_count(&h->gb) >> 3],
+ &h->gb.buffer[h->gb.size_in_bits >> 3], length - 1);
 }
- skip_bits_long(&s->gb, 0);
+ skip_bits_long(&h->gb, 0);
 }
 
- if ((slice_id = svq3_get_ue_golomb(&s->gb)) >= 3) {
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal slice type %d \n", slice_id);
+ if ((slice_id = svq3_get_ue_golomb(&h->gb)) >= 3) {
+ av_log(h->avctx, AV_LOG_ERROR, "illegal slice type %d \n", slice_id);
 return -1;
 }
 
 h->slice_type = golomb_to_pict_type[slice_id];
 
 if ((header & 0x9F) == 2) {
- i = (s->mb_num < 64) ? 6 : (1 + av_log2(s->mb_num - 1));
- s->mb_skip_run = get_bits(&s->gb, i) -
- (s->mb_y * s->mb_width + s->mb_x);
+ i = (h->mb_num < 64) ? 6 : (1 + av_log2(h->mb_num - 1));
+ h->mb_skip_run = get_bits(&h->gb, i) -
+ (h->mb_y * h->mb_width + h->mb_x);
 } else {
- skip_bits1(&s->gb);
- s->mb_skip_run = 0;
+ skip_bits1(&h->gb);
+ h->mb_skip_run = 0;
 }
 
- h->slice_num = get_bits(&s->gb, 8);
- s->qscale = get_bits(&s->gb, 5);
- s->adaptive_quant = get_bits1(&s->gb);
+ h->slice_num = get_bits(&h->gb, 8);
+ h->qscale = get_bits(&h->gb, 5);
+ s->adaptive_quant = get_bits1(&h->gb);
 
 /* unknown fields */
- skip_bits1(&s->gb);
+ skip_bits1(&h->gb);
 
- if (svq3->unknown_flag)
- skip_bits1(&s->gb);
+ if (s->unknown_flag)
+ skip_bits1(&h->gb);
 
- skip_bits1(&s->gb);
- skip_bits(&s->gb, 2);
+ skip_bits1(&h->gb);
+ skip_bits(&h->gb, 2);
 
- while (get_bits1(&s->gb))
- skip_bits(&s->gb, 8);
+ while (get_bits1(&h->gb))
+ skip_bits(&h->gb, 8);
 
 /* reset intra predictors and invalidate motion vector references */
- if (s->mb_x > 0) {
+ if (h->mb_x > 0) {
 memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy - 1] + 3,
 -1, 4 * sizeof(int8_t));
- memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy - s->mb_x],
- -1, 8 * sizeof(int8_t) * s->mb_x);
+ memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy - h->mb_x],
+ -1, 8 * sizeof(int8_t) * h->mb_x);
 }
- if (s->mb_y > 0) {
- memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy - s->mb_stride],
- -1, 8 * sizeof(int8_t) * (s->mb_width - s->mb_x));
+ if (h->mb_y > 0) {
+ memset(h->intra4x4_pred_mode + h->mb2br_xy[mb_xy - h->mb_stride],
+ -1, 8 * sizeof(int8_t) * (h->mb_width - h->mb_x));
 
- if (s->mb_x > 0)
- h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - s->mb_stride - 1] + 3] = -1;
+ if (h->mb_x > 0)
+ h->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride - 1] + 3] = -1;
 }
 
 return 0;
@@ -839,237 +856,358 @@
 
 static av_cold int svq3_decode_init(AVCodecContext *avctx)
 {
- SVQ3Context *svq3 = avctx->priv_data;
- H264Context *h = &svq3->h;
- MpegEncContext *s = &h->s;
+ SVQ3Context *s = avctx->priv_data;
+ H264Context *h = &s->h;
 int m;
 unsigned char *extradata;
 unsigned char *extradata_end;
 unsigned int size;
 int marker_found = 0;
 
+ 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);
+ }
+
 if (ff_h264_decode_init(avctx) < 0)
 return -1;
 
- s->flags = avctx->flags;
- s->flags2 = avctx->flags2;
- s->unrestricted_mv = 1;
+ ff_hpeldsp_init(&s->hdsp, avctx->flags);
+ h->flags = avctx->flags;
 h->is_complex = 1;
+ h->picture_structure = PICT_FRAME;
 avctx->pix_fmt = avctx->codec->pix_fmts[0];
 
- if (!s->context_initialized) {
- h->chroma_qp[0] = h->chroma_qp[1] = 4;
-
- svq3->halfpel_flag = 1;
- svq3->thirdpel_flag = 1;
- svq3->unknown_flag = 0;
-
- /* prowl for the "SEQH" marker in the extradata */
- extradata = (unsigned char *)avctx->extradata;
- extradata_end = avctx->extradata + avctx->extradata_size;
- if (extradata) {
- for (m = 0; m + 8 < avctx->extradata_size; m++) {
- if (!memcmp(extradata, "SEQH", 4)) {
- marker_found = 1;
- break;
- }
- extradata++;
- }
- }
+ h->chroma_qp[0] = h->chroma_qp[1] = 4;
+ h->chroma_x_shift = h->chroma_y_shift = 1;
 
- /* if a match was found, parse the extra data */
- if (marker_found) {
- GetBitContext gb;
- int frame_size_code;
-
- size = AV_RB32(&extradata[4]);
- if (size > extradata_end - extradata - 8)
- return AVERROR_INVALIDDATA;
- init_get_bits(&gb, extradata + 8, size * 8);
-
- /* 'frame size code' and optional 'width, height' */
- frame_size_code = get_bits(&gb, 3);
- switch (frame_size_code) {
- case 0:
- avctx->width = 160;
- avctx->height = 120;
- break;
- case 1:
- avctx->width = 128;
- avctx->height = 96;
- break;
- case 2:
- avctx->width = 176;
- avctx->height = 144;
- break;
- case 3:
- avctx->width = 352;
- avctx->height = 288;
- break;
- case 4:
- avctx->width = 704;
- avctx->height = 576;
- break;
- case 5:
- avctx->width = 240;
- avctx->height = 180;
- break;
- case 6:
- avctx->width = 320;
- avctx->height = 240;
- break;
- case 7:
- avctx->width = get_bits(&gb, 12);
- avctx->height = get_bits(&gb, 12);
+ s->halfpel_flag = 1;
+ s->thirdpel_flag = 1;
+ s->unknown_flag = 0;
+
+ /* prowl for the "SEQH" marker in the extradata */
+ extradata = (unsigned char *)avctx->extradata;
+ extradata_end = avctx->extradata + avctx->extradata_size;
+ if (extradata) {
+ for (m = 0; m + 8 < avctx->extradata_size; m++) {
+ if (!memcmp(extradata, "SEQH", 4)) {
+ marker_found = 1;
 break;
 }
+ extradata++;
+ }
+ }
 
- svq3->halfpel_flag = get_bits1(&gb);
- svq3->thirdpel_flag = get_bits1(&gb);
+ /* if a match was found, parse the extra data */
+ if (marker_found) {
+ GetBitContext gb;
+ int frame_size_code;
+
+ size = AV_RB32(&extradata[4]);
+ if (size > extradata_end - extradata - 8)
+ return AVERROR_INVALIDDATA;
+ init_get_bits(&gb, extradata + 8, size * 8);
+
+ /* 'frame size code' and optional 'width, height' */
+ frame_size_code = get_bits(&gb, 3);
+ switch (frame_size_code) {
+ case 0:
+ avctx->width = 160;
+ avctx->height = 120;
+ break;
+ case 1:
+ avctx->width = 128;
+ avctx->height = 96;
+ break;
+ case 2:
+ avctx->width = 176;
+ avctx->height = 144;
+ break;
+ case 3:
+ avctx->width = 352;
+ avctx->height = 288;
+ break;
+ case 4:
+ avctx->width = 704;
+ avctx->height = 576;
+ break;
+ case 5:
+ avctx->width = 240;
+ avctx->height = 180;
+ break;
+ case 6:
+ avctx->width = 320;
+ avctx->height = 240;
+ break;
+ case 7:
+ avctx->width = get_bits(&gb, 12);
+ avctx->height = get_bits(&gb, 12);
+ break;
+ }
+
+ s->halfpel_flag = get_bits1(&gb);
+ s->thirdpel_flag = get_bits1(&gb);
 
- /* unknown fields */
- skip_bits1(&gb);
- skip_bits1(&gb);
- skip_bits1(&gb);
- skip_bits1(&gb);
+ /* unknown fields */
+ skip_bits1(&gb);
+ skip_bits1(&gb);
+ skip_bits1(&gb);
+ skip_bits1(&gb);
 
- s->low_delay = get_bits1(&gb);
+ h->low_delay = get_bits1(&gb);
 
- /* unknown field */
- skip_bits1(&gb);
+ /* unknown field */
+ skip_bits1(&gb);
 
- while (get_bits1(&gb))
- skip_bits(&gb, 8);
+ while (get_bits1(&gb))
+ skip_bits(&gb, 8);
 
- svq3->unknown_flag = get_bits1(&gb);
- avctx->has_b_frames = !s->low_delay;
- if (svq3->unknown_flag) {
+ s->unknown_flag = get_bits1(&gb);
+ avctx->has_b_frames = !h->low_delay;
+ if (s->unknown_flag) {
 #if CONFIG_ZLIB
- unsigned watermark_width = svq3_get_ue_golomb(&gb);
- unsigned watermark_height = svq3_get_ue_golomb(&gb);
- int u1 = svq3_get_ue_golomb(&gb);
- int u2 = get_bits(&gb, 8);
- int u3 = get_bits(&gb, 2);
- int u4 = svq3_get_ue_golomb(&gb);
- unsigned long buf_len = watermark_width *
- watermark_height * 4;
- int offset = get_bits_count(&gb) + 7 >> 3;
- uint8_t *buf;
-
- if ((uint64_t)watermark_width * 4 > UINT_MAX / watermark_height)
- return -1;
+ unsigned watermark_width = svq3_get_ue_golomb(&gb);
+ unsigned watermark_height = svq3_get_ue_golomb(&gb);
+ int u1 = svq3_get_ue_golomb(&gb);
+ int u2 = get_bits(&gb, 8);
+ int u3 = get_bits(&gb, 2);
+ int u4 = svq3_get_ue_golomb(&gb);
+ unsigned long buf_len = watermark_width *
+ watermark_height * 4;
+ int offset = get_bits_count(&gb) + 7 >> 3;
+ uint8_t *buf;
+
+ if (watermark_height > 0 &&
+ (uint64_t)watermark_width * 4 > UINT_MAX / watermark_height)
+ return -1;
 
- buf = av_malloc(buf_len);
- av_log(avctx, AV_LOG_DEBUG, "watermark size: %dx%d\n",
- watermark_width, watermark_height);
- av_log(avctx, AV_LOG_DEBUG,
- "u1: %x u2: %x u3: %x compressed data size: %d offset: %d\n",
- u1, u2, u3, u4, offset);
- if (uncompress(buf, &buf_len, extradata + 8 + offset,
- size - offset) != Z_OK) {
- av_log(avctx, AV_LOG_ERROR,
- "could not uncompress watermark logo\n");
- av_free(buf);
- return -1;
- }
- svq3->watermark_key = ff_svq1_packet_checksum(buf, buf_len, 0);
- svq3->watermark_key = svq3->watermark_key << 16 |
- svq3->watermark_key;
- av_log(avctx, AV_LOG_DEBUG,
- "watermark key %#x\n", svq3->watermark_key);
- av_free(buf);
-#else
+ buf = av_malloc(buf_len);
+ av_log(avctx, AV_LOG_DEBUG, "watermark size: %dx%d\n",
+ watermark_width, watermark_height);
+ av_log(avctx, AV_LOG_DEBUG,
+ "u1: %x u2: %x u3: %x compressed data size: %d offset: %d\n",
+ u1, u2, u3, u4, offset);
+ if (uncompress(buf, &buf_len, extradata + 8 + offset,
+ size - offset) != Z_OK) {
 av_log(avctx, AV_LOG_ERROR,
- "this svq3 file contains watermark which need zlib support compiled in\n");
+ "could not uncompress watermark logo\n");
+ av_free(buf);
 return -1;
-#endif
 }
+ s->watermark_key = ff_svq1_packet_checksum(buf, buf_len, 0);
+ s->watermark_key = s->watermark_key << 16 | s->watermark_key;
+ av_log(avctx, AV_LOG_DEBUG,
+ "watermark key %#x\n", s->watermark_key);
+ av_free(buf);
+#else
+ av_log(avctx, AV_LOG_ERROR,
+ "this svq3 file contains watermark which need zlib support compiled in\n");
+ return -1;
+#endif
 }
+ }
 
- s->width = avctx->width;
- s->height = avctx->height;
+ h->width = avctx->width;
+ h->height = avctx->height;
+ h->mb_width = (h->width + 15) / 16;
+ h->mb_height = (h->height + 15) / 16;
+ h->mb_stride = h->mb_width + 1;
+ h->mb_num = h->mb_width * h->mb_height;
+ h->b_stride = 4 * h->mb_width;
+ s->h_edge_pos = h->mb_width * 16;
+ s->v_edge_pos = h->mb_height * 16;
+
+ if (ff_h264_alloc_tables(h) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "svq3 memory allocation failed\n");
+ return AVERROR(ENOMEM);
+ }
 
- if (ff_MPV_common_init(s) < 0)
- return -1;
+ return 0;
+}
 
- h->b_stride = 4 * s->mb_width;
+static void free_picture(AVCodecContext *avctx, Picture *pic)
+{
+ int i;
+ for (i = 0; i < 2; i++) {
+ av_buffer_unref(&pic->motion_val_buf[i]);
+ av_buffer_unref(&pic->ref_index_buf[i]);
+ }
+ av_buffer_unref(&pic->mb_type_buf);
 
- if (ff_h264_alloc_tables(h) < 0) {
- av_log(avctx, AV_LOG_ERROR, "svq3 memory allocation failed\n");
+ av_frame_unref(&pic->f);
+}
+
+static int get_buffer(AVCodecContext *avctx, Picture *pic)
+{
+ SVQ3Context *s = avctx->priv_data;
+ H264Context *h = &s->h;
+ const int big_mb_num = h->mb_stride * (h->mb_height + 1) + 1;
+ const int mb_array_size = h->mb_stride * h->mb_height;
+ const int b4_stride = h->mb_width * 4 + 1;
+ const int b4_array_size = b4_stride * h->mb_height * 4;
+ int ret;
+
+ if (!pic->motion_val_buf[0]) {
+ int i;
+
+ pic->mb_type_buf = av_buffer_allocz((big_mb_num + h->mb_stride) * sizeof(uint32_t));
+ if (!pic->mb_type_buf)
 return AVERROR(ENOMEM);
+ pic->mb_type = (uint32_t*)pic->mb_type_buf->data + 2 * h->mb_stride + 1;
+
+ for (i = 0; i < 2; i++) {
+ pic->motion_val_buf[i] = av_buffer_allocz(2 * (b4_array_size + 4) * sizeof(int16_t));
+ pic->ref_index_buf[i] = av_buffer_allocz(4 * mb_array_size);
+ if (!pic->motion_val_buf[i] || !pic->ref_index_buf[i]) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+
+ pic->motion_val[i] = (int16_t (*)[2])pic->motion_val_buf[i]->data + 4;
+ pic->ref_index[i] = pic->ref_index_buf[i]->data;
 }
 }
+ pic->reference = !(h->pict_type == AV_PICTURE_TYPE_B);
+
+ ret = ff_get_buffer(avctx, &pic->f,
+ pic->reference ? AV_GET_BUFFER_FLAG_REF : 0);
+ if (ret < 0)
+ goto fail;
+
+ if (!h->edge_emu_buffer) {
+ h->edge_emu_buffer = av_mallocz(pic->f.linesize[0] * 17);
+ if (!h->edge_emu_buffer)
+ return AVERROR(ENOMEM);
+ }
+
+ h->linesize = pic->f.linesize[0];
+ h->uvlinesize = pic->f.linesize[1];
 
 return 0;
+fail:
+ free_picture(avctx, pic);
+ return ret;
 }
 
 static int svq3_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame, AVPacket *avpkt)
 {
 const uint8_t *buf = avpkt->data;
- SVQ3Context *svq3 = avctx->priv_data;
- H264Context *h = &svq3->h;
- MpegEncContext *s = &h->s;
+ SVQ3Context *s = avctx->priv_data;
+ H264Context *h = &s->h;
 int buf_size = avpkt->size;
- int m;
+ int ret, m, i;
 
 /* special case for last picture */
 if (buf_size == 0) {
- if (s->next_picture_ptr && !s->low_delay) {
- *(AVFrame *) data = s->next_picture.f;
- s->next_picture_ptr = NULL;
+ if (s->next_pic->f.data[0] && !h->low_delay && !s->last_frame_output) {
+ ret = av_frame_ref(data, &s->next_pic->f);
+ if (ret < 0)
+ return ret;
+ s->last_frame_output = 1;
 *got_frame = 1;
 }
 return 0;
 }
 
- init_get_bits(&s->gb, buf, 8 * buf_size);
+ init_get_bits(&h->gb, buf, 8 * buf_size);
 
- s->mb_x = s->mb_y = h->mb_xy = 0;
+ h->mb_x = h->mb_y = h->mb_xy = 0;
 
 if (svq3_decode_slice_header(avctx))
 return -1;
 
- s->pict_type = h->slice_type;
- s->picture_number = h->slice_num;
+ h->pict_type = h->slice_type;
 
- if (avctx->debug & FF_DEBUG_PICT_INFO)
- av_log(h->s.avctx, AV_LOG_DEBUG,
- "%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n",
- av_get_picture_type_char(s->pict_type),
- svq3->halfpel_flag, svq3->thirdpel_flag,
- s->adaptive_quant, s->qscale, h->slice_num);
+ if (h->pict_type != AV_PICTURE_TYPE_B)
+ FFSWAP(Picture*, s->next_pic, s->last_pic);
+
+ av_frame_unref(&s->cur_pic->f);
 
 /* 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);
+ s->cur_pic->f.pict_type = h->pict_type;
+ s->cur_pic->f.key_frame = (h->pict_type == AV_PICTURE_TYPE_I);
+
+ ret = get_buffer(avctx, s->cur_pic);
+ if (ret < 0)
+ return ret;
+
+ h->cur_pic_ptr = s->cur_pic;
+ av_frame_unref(&h->cur_pic.f);
+ h->cur_pic = *s->cur_pic;
+ ret = av_frame_ref(&h->cur_pic.f, &s->cur_pic->f);
+ if (ret < 0)
+ return ret;
+
+ for (i = 0; i < 16; i++) {
+ h->block_offset[i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 4 * h->linesize * ((scan8[i] - scan8[0]) >> 3);
+ h->block_offset[48 + i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 8 * h->linesize * ((scan8[i] - scan8[0]) >> 3);
+ }
+ for (i = 0; i < 16; i++) {
+ h->block_offset[16 + i] =
+ h->block_offset[32 + i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 4 * h->uvlinesize * ((scan8[i] - scan8[0]) >> 3);
+ h->block_offset[48 + 16 + i] =
+ h->block_offset[48 + 32 + i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 8 * h->uvlinesize * ((scan8[i] - scan8[0]) >> 3);
+ }
 
- /* Skip B-frames if we do not have reference frames. */
- if (s->last_picture_ptr == NULL && s->pict_type == AV_PICTURE_TYPE_B)
- return 0;
- if (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type == AV_PICTURE_TYPE_B ||
- avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type != AV_PICTURE_TYPE_I ||
+ 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");
+ ret = get_buffer(avctx, s->last_pic);
+ if (ret < 0)
+ return ret;
+ memset(s->last_pic->f.data[0], 0, avctx->height * s->last_pic->f.linesize[0]);
+ memset(s->last_pic->f.data[1], 0x80, (avctx->height / 2) *
+ s->last_pic->f.linesize[1]);
+ memset(s->last_pic->f.data[2], 0x80, (avctx->height / 2) *
+ s->last_pic->f.linesize[2]);
+ }
+
+ if (h->pict_type == AV_PICTURE_TYPE_B && !s->next_pic->f.data[0]) {
+ av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n");
+ ret = get_buffer(avctx, s->next_pic);
+ if (ret < 0)
+ return ret;
+ memset(s->next_pic->f.data[0], 0, avctx->height * s->next_pic->f.linesize[0]);
+ memset(s->next_pic->f.data[1], 0x80, (avctx->height / 2) *
+ s->next_pic->f.linesize[1]);
+ memset(s->next_pic->f.data[2], 0x80, (avctx->height / 2) *
+ s->next_pic->f.linesize[2]);
+ }
+ }
+
+ if (avctx->debug & FF_DEBUG_PICT_INFO)
+ av_log(h->avctx, AV_LOG_DEBUG,
+ "%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n",
+ av_get_picture_type_char(h->pict_type),
+ s->halfpel_flag, s->thirdpel_flag,
+ s->adaptive_quant, h->qscale, h->slice_num);
+
+ if (avctx->skip_frame >= AVDISCARD_NONREF && h->pict_type == AV_PICTURE_TYPE_B ||
+ avctx->skip_frame >= AVDISCARD_NONKEY && h->pict_type != AV_PICTURE_TYPE_I ||
 avctx->skip_frame >= AVDISCARD_ALL)
 return 0;
 
 if (s->next_p_frame_damaged) {
- if (s->pict_type == AV_PICTURE_TYPE_B)
+ if (h->pict_type == AV_PICTURE_TYPE_B)
 return 0;
 else
 s->next_p_frame_damaged = 0;
 }
 
- if (ff_h264_frame_start(h) < 0)
- return -1;
-
- if (s->pict_type == AV_PICTURE_TYPE_B) {
+ if (h->pict_type == AV_PICTURE_TYPE_B) {
 h->frame_num_offset = h->slice_num - h->prev_frame_num;
 
 if (h->frame_num_offset < 0)
 h->frame_num_offset += 256;
 if (h->frame_num_offset == 0 ||
 h->frame_num_offset >= h->prev_frame_num_offset) {
- av_log(h->s.avctx, AV_LOG_ERROR, "error in B-frame picture id\n");
+ av_log(h->avctx, AV_LOG_ERROR, "error in B-frame picture id\n");
 return -1;
 }
 } else {
@@ -1092,16 +1230,16 @@
 }
 }
 
- for (s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
- for (s->mb_x = 0; s->mb_x < s->mb_width; s->mb_x++) {
+ for (h->mb_y = 0; h->mb_y < h->mb_height; h->mb_y++) {
+ for (h->mb_x = 0; h->mb_x < h->mb_width; h->mb_x++) {
 unsigned mb_type;
- h->mb_xy = s->mb_x + s->mb_y * s->mb_stride;
+ h->mb_xy = h->mb_x + h->mb_y * h->mb_stride;
 
- if ((get_bits_count(&s->gb) + 7) >= s->gb.size_in_bits &&
- ((get_bits_count(&s->gb) & 7) == 0 ||
- show_bits(&s->gb, -get_bits_count(&s->gb) & 7) == 0)) {
- skip_bits(&s->gb, svq3->next_slice_index - get_bits_count(&s->gb));
- s->gb.size_in_bits = 8 * buf_size;
+ if ((get_bits_count(&h->gb) + 7) >= h->gb.size_in_bits &&
+ ((get_bits_count(&h->gb) & 7) == 0 ||
+ show_bits(&h->gb, -get_bits_count(&h->gb) & 7) == 0)) {
+ skip_bits(&h->gb, s->next_slice_index - get_bits_count(&h->gb));
+ h->gb.size_in_bits = 8 * buf_size;
 
 if (svq3_decode_slice_header(avctx))
 return -1;
@@ -1109,58 +1247,74 @@
 /* TODO: support s->mb_skip_run */
 }
 
- mb_type = svq3_get_ue_golomb(&s->gb);
+ mb_type = svq3_get_ue_golomb(&h->gb);
 
- if (s->pict_type == AV_PICTURE_TYPE_I)
+ if (h->pict_type == AV_PICTURE_TYPE_I)
 mb_type += 8;
- else if (s->pict_type == AV_PICTURE_TYPE_B && mb_type >= 4)
+ else if (h->pict_type == AV_PICTURE_TYPE_B && mb_type >= 4)
 mb_type += 4;
- if (mb_type > 33 || svq3_decode_mb(svq3, mb_type)) {
- av_log(h->s.avctx, AV_LOG_ERROR,
- "error while decoding MB %d %d\n", s->mb_x, s->mb_y);
+ if (mb_type > 33 || svq3_decode_mb(s, mb_type)) {
+ av_log(h->avctx, AV_LOG_ERROR,
+ "error while decoding MB %d %d\n", h->mb_x, h->mb_y);
 return -1;
 }
 
 if (mb_type != 0)
 ff_h264_hl_decode_mb(h);
 
- if (s->pict_type != AV_PICTURE_TYPE_B && !s->low_delay)
- s->current_picture.f.mb_type[s->mb_x + s->mb_y * s->mb_stride] =
- (s->pict_type == AV_PICTURE_TYPE_P && mb_type < 8) ? (mb_type - 1) : -1;
+ if (h->pict_type != AV_PICTURE_TYPE_B && !h->low_delay)
+ h->cur_pic.mb_type[h->mb_x + h->mb_y * h->mb_stride] =
+ (h->pict_type == AV_PICTURE_TYPE_P && mb_type < 8) ? (mb_type - 1) : -1;
 }
 
- ff_draw_horiz_band(s, 16 * s->mb_y, 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);
 }
 
- ff_MPV_frame_end(s);
-
- if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay)
- *(AVFrame *)data = s->current_picture.f;
- else
- *(AVFrame *)data = s->last_picture.f;
+ if (h->pict_type == AV_PICTURE_TYPE_B || h->low_delay)
+ ret = av_frame_ref(data, &s->cur_pic->f);
+ else if (s->last_pic->f.data[0])
+ ret = av_frame_ref(data, &s->last_pic->f);
+ if (ret < 0)
+ return ret;
 
 /* Do not output the last pic after seeking. */
- if (s->last_picture_ptr || s->low_delay)
+ if (s->last_pic->f.data[0] || h->low_delay)
 *got_frame = 1;
 
+ if (h->pict_type != AV_PICTURE_TYPE_B) {
+ FFSWAP(Picture*, s->cur_pic, s->next_pic);
+ } else {
+ av_frame_unref(&s->cur_pic->f);
+ }
+
 return buf_size;
 }
 
-static int svq3_decode_end(AVCodecContext *avctx)
+static av_cold int svq3_decode_end(AVCodecContext *avctx)
 {
- SVQ3Context *svq3 = avctx->priv_data;
- H264Context *h = &svq3->h;
- MpegEncContext *s = &h->s;
+ SVQ3Context *s = avctx->priv_data;
+ H264Context *h = &s->h;
 
- ff_h264_free_context(h);
+ free_picture(avctx, s->cur_pic);
+ free_picture(avctx, s->next_pic);
+ free_picture(avctx, s->last_pic);
+ av_freep(&s->cur_pic);
+ av_freep(&s->next_pic);
+ av_freep(&s->last_pic);
+
+ av_frame_unref(&h->cur_pic.f);
 
- ff_MPV_common_end(s);
+ ff_h264_free_context(h);
 
 return 0;
 }
 
 AVCodec ff_svq3_decoder = {
 .name = "svq3",
+ .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3 / Sorenson Video 3 / SVQ3"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_SVQ3,
 .priv_data_size = sizeof(SVQ3Context),
@@ -1170,7 +1324,6 @@
 .capabilities = CODEC_CAP_DRAW_HORIZ_BAND |
 CODEC_CAP_DR1 |
 CODEC_CAP_DELAY,
- .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3 / Sorenson Video 3 / SVQ3"),
 .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUVJ420P,
 AV_PIX_FMT_NONE},
 };

libav-v10.1.tar.bz2/libavcodec/svq3.h Added

@@ -0,0 +1,27 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_SVQ3_H
+#define AVCODEC_SVQ3_H
+
+#include <stdint.h>
+
+void ff_svq3_luma_dc_dequant_idct_c(int16_t *output, int16_t *input, int qp);
+void ff_svq3_add_idct_c(uint8_t *dst, int16_t *block, int stride, int qp, int dc);
+
+#endif /* AVCODEC_SVQ3_H */

libav-v9.6.tar.bz2/libavcodec/tableprint.h -> libav-v10.1.tar.bz2/libavcodec/tableprint.h Changed

@@ -71,10 +71,20 @@
 void write_float_2d_array   (const void *, int, int);
 /** @} */ // end of printfuncs group
 
+/*
+ * MSVC doesn't have %zu, since it was introduced in C99,
+ * but has its own %Iu for printing size_t values.
+ */
+#if defined(_MSC_VER)
+#define FMT "Iu"
+#else
+#define FMT "zu"
+#endif
+
 #define WRITE_ARRAY(prefix, type, name)                 \
     do {                                                \
         const size_t array_size = FF_ARRAY_ELEMS(name); \
-        printf(prefix" "#type" "#name"[%zu] = {\n",     \
+        printf(prefix" "#type" "#name"[%"FMT"] = {\n",  \
                array_size);                             \
         write_##type##_array(name, array_size);         \
         printf("};\n");                                 \
@@ -84,7 +94,7 @@
     do {                                                                \
         const size_t array_size1 = FF_ARRAY_ELEMS(name);                \
         const size_t array_size2 = FF_ARRAY_ELEMS(name[0]);             \
-        printf(prefix" "#type" "#name"[%zu][%zu] = {\n",                \
+        printf(prefix" "#type" "#name"[%"FMT"][%"FMT"] = {\n",          \
                array_size1, array_size2 );                              \
         write_##type##_2d_array(name, array_size1, array_size2);        \
         printf("};\n");                                                 \

libav-v9.6.tar.bz2/libavcodec/takdec.c -> libav-v10.1.tar.bz2/libavcodec/takdec.c Changed

@@ -25,6 +25,7 @@
 * @author Paul B Mahol
 */
 
+#include "libavutil/internal.h"
 #include "libavutil/samplefmt.h"
 #include "tak.h"
 #include "avcodec.h"
@@ -44,7 +45,6 @@
 
 typedef struct TAKDecContext {
 AVCodecContext *avctx; // parent AVCodecContext
- AVFrame frame; // AVFrame for decoded output
 DSPContext dsp;
 TAKStreamInfo ti;
 GetBitContext gb; // bitstream reader initialized to start at the current frame
@@ -175,8 +175,6 @@
 ff_dsputil_init(&s->dsp, avctx);
 
 s->avctx = avctx;
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
 
 set_sample_rate_params(avctx);
 
@@ -674,6 +672,7 @@
 int *got_frame_ptr, AVPacket *pkt)
 {
 TAKDecContext *s = avctx->priv_data;
+ AVFrame *frame = data;
 GetBitContext *gb = &s->gb;
 int chan, i, ret, hsize;
 
@@ -686,7 +685,7 @@
 return ret;
 
 if (s->ti.flags & TAK_FRAME_FLAG_HAS_METADATA) {
- av_log_missing_feature(avctx, "frame metadata", 1);
+ avpriv_request_sample(avctx, "Frame metadata");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -694,7 +693,8 @@
 if (avctx->err_recognition & AV_EF_CRCCHECK) {
 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;
 }
 }
 
@@ -740,8 +740,8 @@
 s->nb_samples = s->ti.last_frame_samples ? s->ti.last_frame_samples
 : s->ti.frame_samples;
 
- s->frame.nb_samples = s->nb_samples;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0)
+ frame->nb_samples = s->nb_samples;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
 return ret;
 
 if (avctx->bits_per_coded_sample <= 16) {
@@ -758,7 +758,7 @@
 return ret;
 } else {
 for (chan = 0; chan < avctx->channels; chan++)
- s->decoded[chan] = (int32_t *)s->frame.extended_data[chan];
+ s->decoded[chan] = (int32_t *)frame->extended_data[chan];
 }
 
 if (s->nb_samples < 16) {
@@ -868,7 +868,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;
 }
 }
 
@@ -876,7 +877,7 @@
 switch (avctx->sample_fmt) {
 case AV_SAMPLE_FMT_U8P:
 for (chan = 0; chan < avctx->channels; chan++) {
- uint8_t *samples = (uint8_t *)s->frame.extended_data[chan];
+ uint8_t *samples = (uint8_t *)frame->extended_data[chan];
 int32_t *decoded = s->decoded[chan];
 for (i = 0; i < s->nb_samples; i++)
 samples[i] = decoded[i] + 0x80;
@@ -884,7 +885,7 @@
 break;
 case AV_SAMPLE_FMT_S16P:
 for (chan = 0; chan < avctx->channels; chan++) {
- int16_t *samples = (int16_t *)s->frame.extended_data[chan];
+ int16_t *samples = (int16_t *)frame->extended_data[chan];
 int32_t *decoded = s->decoded[chan];
 for (i = 0; i < s->nb_samples; i++)
 samples[i] = decoded[i];
@@ -892,15 +893,14 @@
 break;
 case AV_SAMPLE_FMT_S32P:
 for (chan = 0; chan < avctx->channels; chan++) {
- int32_t *samples = (int32_t *)s->frame.extended_data[chan];
+ int32_t *samples = (int32_t *)frame->extended_data[chan];
 for (i = 0; i < s->nb_samples; i++)
 samples[i] <<= 8;
 }
 break;
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
 return pkt->size;
 }
@@ -917,6 +917,7 @@
 
 AVCodec ff_tak_decoder = {
 .name = "tak",
+ .long_name = NULL_IF_CONFIG_SMALL("TAK (Tom's lossless Audio Kompressor)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_TAK,
 .priv_data_size = sizeof(TAKDecContext),
@@ -925,7 +926,6 @@
 .close = tak_decode_close,
 .decode = tak_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("TAK (Tom's lossless Audio Kompressor)"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P,
 AV_SAMPLE_FMT_S16P,
 AV_SAMPLE_FMT_S32P,

libav-v9.6.tar.bz2/libavcodec/targa.c -> libav-v10.1.tar.bz2/libavcodec/targa.c Changed

@@ -27,7 +27,6 @@
 #include "targa.h"
 
 typedef struct TargaContext {
- AVFrame picture;
 GetByteContext gb;
 
 int color_type;
@@ -99,11 +98,10 @@
 AVPacket *avpkt)
 {
 TargaContext * const s = avctx->priv_data;
- AVFrame *picture = data;
- AVFrame * const p = &s->picture;
+ AVFrame * const p = data;
 uint8_t *dst;
 int stride;
- int idlen, compr, y, w, h, bpp, flags;
+ int idlen, compr, y, w, h, bpp, flags, ret;
 int first_clr, colors, csize;
 
 bytestream2_init(&s->gb, avpkt->data, avpkt->size);
@@ -141,19 +139,15 @@
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "Bit depth %i is not supported\n", bpp);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- if(s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
+ if ((ret = ff_set_dimensions(avctx, w, h)) < 0)
+ return ret;
 
- if(av_image_check_size(w, h, 0, avctx))
- return -1;
- if(w != avctx->width || h != avctx->height)
- avcodec_set_dimensions(avctx, w, h);
- if(ff_get_buffer(avctx, p) < 0){
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0){
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 if(flags & 0x20){
 dst = p->data[0];
@@ -167,7 +161,7 @@
 int pal_size, pal_sample_size;
 if((colors + first_clr) > 256){
 av_log(avctx, AV_LOG_ERROR, "Incorrect palette: %i colors with offset %i\n", colors, first_clr);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 switch (csize) {
 case 24: pal_sample_size = 3; break;
@@ -175,7 +169,7 @@
 case 15: pal_sample_size = 2; break;
 default:
 av_log(avctx, AV_LOG_ERROR, "Palette entry size %i bits is not supported\n", csize);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 pal_size = colors * pal_sample_size;
 if(avctx->pix_fmt != AV_PIX_FMT_PAL8)//should not occur but skip palette anyway
@@ -232,38 +226,17 @@
 }
 }
 
- *picture = s->picture;
 *got_frame = 1;
 
 return avpkt->size;
 }
 
-static av_cold int targa_init(AVCodecContext *avctx){
- TargaContext *s = avctx->priv_data;
-
- avcodec_get_frame_defaults(&s->picture);
- avctx->coded_frame = &s->picture;
-
- return 0;
-}
-
-static av_cold int targa_end(AVCodecContext *avctx){
- TargaContext *s = avctx->priv_data;
-
- if(s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
-
- return 0;
-}
-
 AVCodec ff_targa_decoder = {
 .name = "targa",
+ .long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_TARGA,
 .priv_data_size = sizeof(TargaContext),
- .init = targa_init,
- .close = targa_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"),
 };

libav-v9.6.tar.bz2/libavcodec/targaenc.c -> libav-v10.1.tar.bz2/libavcodec/targaenc.c Changed

@@ -29,10 +29,6 @@
 #include "rle.h"
 #include "targa.h"
 
-typedef struct TargaContext {
-    AVFrame picture;
-} TargaContext;
-
 /**
  * RLE compress the image, with maximum size of out_size
  * @param outbuf Output buffer
@@ -154,26 +150,32 @@
 
 static av_cold int targa_encode_init(AVCodecContext *avctx)
 {
-    TargaContext *s = avctx->priv_data;
+    avctx->coded_frame = av_frame_alloc();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
 
-    avcodec_get_frame_defaults(&s->picture);
-    s->picture.key_frame= 1;
-    s->picture.pict_type = AV_PICTURE_TYPE_I;
-    avctx->coded_frame= &s->picture;
+    avctx->coded_frame->key_frame = 1;
+    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
 
     return 0;
 }
 
+static av_cold int targa_encode_close(AVCodecContext *avctx)
+{
+    av_frame_free(&avctx->coded_frame);
+    return 0;
+}
+
 AVCodec ff_targa_encoder = {
     .name           = "targa",
+    .long_name      = NULL_IF_CONFIG_SMALL("Truevision Targa image"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_TARGA,
-    .priv_data_size = sizeof(TargaContext),
     .init           = targa_encode_init,
+    .close          = targa_encode_close,
     .encode2        = targa_encode_frame,
     .pix_fmts       = (const enum AVPixelFormat[]){
         AV_PIX_FMT_BGR24, AV_PIX_FMT_BGRA, AV_PIX_FMT_RGB555LE, AV_PIX_FMT_GRAY8,
         AV_PIX_FMT_NONE
     },
-    .long_name= NULL_IF_CONFIG_SMALL("Truevision Targa image"),
 };

libav-v9.6.tar.bz2/libavcodec/thread.h -> libav-v10.1.tar.bz2/libavcodec/thread.h Changed

@@ -27,9 +27,19 @@
 #ifndef AVCODEC_THREAD_H
 #define AVCODEC_THREAD_H
 
+#include "libavutil/buffer.h"
+
 #include "config.h"
 #include "avcodec.h"
 
+typedef struct ThreadFrame {
+    AVFrame *f;
+    AVCodecContext *owner;
+    // progress->data is an array of 2 ints holding progress for top/bottom
+    // fields
+    AVBufferRef *progress;
+} ThreadFrame;
+
 /**
  * Wait for decoding threads to finish and reset internal state.
  * Called by avcodec_flush_buffers().
@@ -71,7 +81,7 @@
  * @param field The field being decoded, for field-picture codecs.
  * 0 for top field or frame pictures, 1 for bottom field.
  */
-void ff_thread_report_progress(AVFrame *f, int progress, int field);
+void ff_thread_report_progress(ThreadFrame *f, int progress, int field);
 
 /**
  * Wait for earlier decoding threads to finish reference pictures.
@@ -85,7 +95,7 @@
  * @param field The field being referenced, for field-picture codecs.
  * 0 for top field or frame pictures, 1 for bottom field.
  */
-void ff_thread_await_progress(AVFrame *f, int progress, int field);
+void ff_thread_await_progress(ThreadFrame *f, int progress, int field);
 
 /**
  * Wrapper around get_buffer() for frame-multithreaded codecs.
@@ -95,7 +105,7 @@
  * @param avctx The current context.
  * @param f The frame to write into.
  */
-int ff_thread_get_buffer(AVCodecContext *avctx, AVFrame *f);
+int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags);
 
 /**
  * Wrapper around release_buffer() frame-for multithreaded codecs.
@@ -108,7 +118,9 @@
  * @param avctx The current context.
  * @param f The picture being released.
  */
-void ff_thread_release_buffer(AVCodecContext *avctx, AVFrame *f);
+void ff_thread_release_buffer(AVCodecContext *avctx, ThreadFrame *f);
+
+int ff_thread_ref_frame(ThreadFrame *dst, ThreadFrame *src);
 
 int ff_thread_init(AVCodecContext *s);
 void ff_thread_free(AVCodecContext *s);

libav-v9.6.tar.bz2/libavcodec/tiertexseqv.c -> libav-v10.1.tar.bz2/libavcodec/tiertexseqv.c Changed

@@ -27,11 +27,12 @@
 #include "avcodec.h"
 #define BITSTREAM_READER_LE
 #include "get_bits.h"
+#include "internal.h"
 
 
 typedef struct SeqVideoContext {
 AVCodecContext *avctx;
- AVFrame frame;
+ AVFrame *frame;
 } SeqVideoContext;
 
 
@@ -92,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;
@@ -116,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];
 }
 }
 
@@ -136,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;
@@ -153,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));
 
@@ -172,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++) {
@@ -180,7 +181,7 @@
 c[j] = (*data << 2) | (*data >> 4);
 palette[i] = AV_RB24(c);
 }
- seq->frame.palette_has_changed = 1;
+ seq->frame->palette_has_changed = 1;
 }
 
 if (flags & 2) {
@@ -189,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:
@@ -216,7 +217,9 @@
 seq->avctx = avctx;
 avctx->pix_fmt = AV_PIX_FMT_PAL8;
 
- seq->frame.data[0] = NULL;
+ seq->frame = av_frame_alloc();
+ if (!seq->frame)
+ return AVERROR(ENOMEM);
 
 return 0;
 }
@@ -227,21 +230,21 @@
 {
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
+ int ret;
 
 SeqVideoContext *seq = avctx->priv_data;
 
- seq->frame.reference = 1;
- seq->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, &seq->frame)) {
+ if ((ret = ff_reget_buffer(avctx, seq->frame)) < 0) {
 av_log(seq->avctx, AV_LOG_ERROR, "tiertexseqvideo: reget_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 if (seqvideo_decode(seq, buf, buf_size))
 return AVERROR_INVALIDDATA;
 
+ if ((ret = av_frame_ref(data, seq->frame)) < 0)
+ return ret;
 *got_frame = 1;
- *(AVFrame *)data = seq->frame;
 
 return buf_size;
 }
@@ -250,14 +253,14 @@
 {
 SeqVideoContext *seq = avctx->priv_data;
 
- if (seq->frame.data[0])
- avctx->release_buffer(avctx, &seq->frame);
+ av_frame_free(&seq->frame);
 
 return 0;
 }
 
 AVCodec ff_tiertexseqvideo_decoder = {
 .name = "tiertexseqvideo",
+ .long_name = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_TIERTEXSEQVIDEO,
 .priv_data_size = sizeof(SeqVideoContext),
@@ -265,5 +268,4 @@
 .close = seqvideo_decode_end,
 .decode = seqvideo_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ video"),
 };

libav-v9.6.tar.bz2/libavcodec/tiff.c -> libav-v10.1.tar.bz2/libavcodec/tiff.c Changed

@@ -25,23 +25,23 @@
 * @author Konstantin Shishkov
 */
 
-#include "avcodec.h"
 #include "config.h"
 #if CONFIG_ZLIB
 #include <zlib.h>
 #endif
-#include "lzw.h"
-#include "tiff.h"
-#include "faxcompr.h"
-#include "internal.h"
-#include "mathops.h"
+
 #include "libavutil/attributes.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/imgutils.h"
+#include "avcodec.h"
+#include "faxcompr.h"
+#include "internal.h"
+#include "lzw.h"
+#include "mathops.h"
+#include "tiff.h"
 
 typedef struct TiffContext {
 AVCodecContext *avctx;
- AVFrame picture;
 
 int width, height;
 unsigned int bpp, bppcount;
@@ -79,10 +79,14 @@
 static unsigned tget(const uint8_t **p, int type, int le)
 {
 switch (type) {
- case TIFF_BYTE : return *(*p)++;
- case TIFF_SHORT: return tget_short(p, le);
- case TIFF_LONG : return tget_long(p, le);
- default : return UINT_MAX;
+ case TIFF_BYTE:
+ return *(*p)++;
+ case TIFF_SHORT:
+ return tget_short(p, le);
+ case TIFF_LONG:
+ return tget_long(p, le);
+ default:
+ return UINT_MAX;
 }
 }
 
@@ -93,11 +97,11 @@
 z_stream zstream = { 0 };
 int zret;
 
- zstream.next_in = src;
- zstream.avail_in = size;
- zstream.next_out = dst;
+ zstream.next_in = src;
+ zstream.avail_in = size;
+ zstream.next_out = dst;
 zstream.avail_out = *len;
- zret = inflateInit(&zstream);
+ zret = inflateInit(&zstream);
 if (zret != Z_OK) {
 av_log(NULL, AV_LOG_ERROR, "Inflate init error: %d\n", zret);
 return zret;
@@ -107,90 +111,103 @@
 *len = zstream.total_out;
 return zret == Z_STREAM_END ? Z_OK : zret;
 }
+
+static int tiff_unpack_zlib(TiffContext *s, uint8_t *dst, int stride,
+ const uint8_t *src, int size,
+ int width, int lines)
+{
+ uint8_t *zbuf;
+ unsigned long outlen;
+ int ret, line;
+ outlen = width * lines;
+ zbuf = av_malloc(outlen);
+ if (!zbuf)
+ return AVERROR(ENOMEM);
+ ret = tiff_uncompress(zbuf, &outlen, src, size);
+ if (ret != Z_OK) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Uncompressing failed (%lu of %lu) with error %d\n", outlen,
+ (unsigned long)width * lines, ret);
+ av_free(zbuf);
+ return AVERROR_UNKNOWN;
+ }
+ src = zbuf;
+ for (line = 0; line < lines; line++) {
+ memcpy(dst, src, width);
+ dst += stride;
+ src += width;
+ }
+ av_free(zbuf);
+ return 0;
+}
 #endif
 
+
+static int tiff_unpack_fax(TiffContext *s, uint8_t *dst, int stride,
+ const uint8_t *src, int size, int lines)
+{
+ int i, ret = 0;
+ uint8_t *src2 = av_malloc((unsigned)size +
+ FF_INPUT_BUFFER_PADDING_SIZE);
+
+ if (!src2) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Error allocating temporary buffer\n");
+ return AVERROR(ENOMEM);
+ }
+ if (s->fax_opts & 2) {
+ avpriv_request_sample(s->avctx, "Uncompressed fax mode");
+ av_free(src2);
+ return AVERROR_PATCHWELCOME;
+ }
+ if (!s->fill_order) {
+ memcpy(src2, src, size);
+ } else {
+ for (i = 0; i < size; i++)
+ src2[i] = ff_reverse[src[i]];
+ }
+ memset(src2 + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+ ret = ff_ccitt_unpack(s->avctx, src2, size, dst, lines, stride,
+ s->compr, s->fax_opts);
+ av_free(src2);
+ return ret;
+}
+
 static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
 const uint8_t *src, int size, int lines)
 {
- int c, line, pixels, code;
+ int c, line, pixels, code, ret;
 const uint8_t *ssrc = src;
- int width = ((s->width * s->bpp) + 7) >> 3;
+ int width = ((s->width * s->bpp) + 7) >> 3;
 
 if (size <= 0)
 return AVERROR_INVALIDDATA;
 
-#if CONFIG_ZLIB
 if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE) {
- uint8_t *zbuf;
- unsigned long outlen;
- int ret;
- outlen = width * lines;
- zbuf = av_malloc(outlen);
- if (!zbuf)
- return AVERROR(ENOMEM);
- ret = tiff_uncompress(zbuf, &outlen, src, size);
- if (ret != Z_OK) {
- av_log(s->avctx, AV_LOG_ERROR,
- "Uncompressing failed (%lu of %lu) with error %d\n", outlen,
- (unsigned long)width * lines, ret);
- av_free(zbuf);
- return -1;
- }
- src = zbuf;
- for (line = 0; line < lines; line++) {
- memcpy(dst, src, width);
- dst += stride;
- src += width;
- }
- av_free(zbuf);
- return 0;
- }
+#if CONFIG_ZLIB
+ return tiff_unpack_zlib(s, dst, stride, src, size, width, lines);
+#else
+ av_log(s->avctx, AV_LOG_ERROR,
+ "zlib support not enabled, "
+ "deflate compression not supported\n");
+ return AVERROR(ENOSYS);
 #endif
+ }
 if (s->compr == TIFF_LZW) {
- if (ff_lzw_decode_init(s->lzw, 8, src, size, FF_LZW_TIFF) < 0) {
+ if ((ret = ff_lzw_decode_init(s->lzw, 8, src, size, FF_LZW_TIFF)) < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "Error initializing LZW decoder\n");
- return -1;
+ return ret;
 }
 }
- if (s->compr == TIFF_CCITT_RLE || s->compr == TIFF_G3
- || s->compr == TIFF_G4) {
- int i, ret = 0;
- uint8_t *src2 = av_malloc((unsigned)size +
- FF_INPUT_BUFFER_PADDING_SIZE);
-
- if (!src2) {
- av_log(s->avctx, AV_LOG_ERROR,
- "Error allocating temporary buffer\n");
- return AVERROR(ENOMEM);
- }
- if (s->fax_opts & 2) {
- av_log(s->avctx, AV_LOG_ERROR,
- "Uncompressed fax mode is not supported (yet)\n");
- av_free(src2);
- return -1;
- }
- if (!s->fill_order) {
- memcpy(src2, src, size);
- } else {
- for (i = 0; i < size; i++)
- src2[i] = ff_reverse[src[i]];
- }
- memset(src2 + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
- switch (s->compr) {
- case TIFF_CCITT_RLE:
- case TIFF_G3:
- case TIFF_G4:
- ret = ff_ccitt_unpack(s->avctx, src2, size, dst, lines, stride,
- s->compr, s->fax_opts);
- break;
- }
- av_free(src2);
- return ret;
+ if (s->compr == TIFF_CCITT_RLE ||
+ s->compr == TIFF_G3 ||
+ s->compr == TIFF_G4) {
+ return tiff_unpack_fax(s, dst, stride, src, size, lines);
 }
 for (line = 0; line < lines; line++) {
 if (src - ssrc > size) {
 av_log(s->avctx, AV_LOG_ERROR, "Source data overread\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 switch (s->compr) {
 case TIFF_RAW:
@@ -207,23 +224,26 @@
 break;
 case TIFF_PACKBITS:
 for (pixels = 0; pixels < width;) {
- code = (int8_t) * src++;
+ if (ssrc + size - src < 2)
+ return AVERROR_INVALIDDATA;
+ code = (int8_t) *src++;
 if (code >= 0) {
 code++;
- if (pixels + code > width) {
+ if (pixels + code > width ||
+ ssrc + size - src < code) {
 av_log(s->avctx, AV_LOG_ERROR,
 "Copy went out of bounds\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 memcpy(dst + pixels, src, code);
- src += code;
+ src += code;
 pixels += code;
 } else if (code != -128) { // -127..-1
 code = (-code) + 1;
 if (pixels + code > width) {
 av_log(s->avctx, AV_LOG_ERROR,
 "Run went out of bounds\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 c = *src++;
 memset(dst + pixels, c, code);
@@ -236,7 +256,7 @@
 if (pixels < width) {
 av_log(s->avctx, AV_LOG_ERROR, "Decoded only %i bytes of %i\n",
 pixels, width);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 break;
 }
@@ -245,7 +265,7 @@
 return 0;
 }
 
-static int init_image(TiffContext *s)
+static int init_image(TiffContext *s, AVFrame *frame)
 {
 int i, ret;
 uint32_t *pal;
@@ -276,22 +296,20 @@
 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 (s->picture.data[0])
- s->avctx->release_buffer(s->avctx, &s->picture);
- if ((ret = ff_get_buffer(s->avctx, &s->picture)) < 0) {
+ if ((ret = ff_get_buffer(s->avctx, frame, 0)) < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
 if (s->avctx->pix_fmt == AV_PIX_FMT_PAL8) {
 if (s->palette_is_set) {
- memcpy(s->picture.data[1], s->palette, sizeof(s->palette));
+ memcpy(frame->data[1], s->palette, sizeof(s->palette));
 } else {
 /* make default grayscale pal */
- pal = (uint32_t *) s->picture.data[1];
+ pal = (uint32_t *) frame->data[1];
 for (i = 0; i < 256; i++)
 pal[i] = i * 0x010101;
 }
@@ -308,11 +326,11 @@
 const uint8_t *rp, *gp, *bp;
 
 if (end_buf - buf < 12)
- return -1;
- tag = tget_short(&buf, s->le);
- type = tget_short(&buf, s->le);
+ return AVERROR_INVALIDDATA;
+ tag = tget_short(&buf, s->le);
+ type = tget_short(&buf, s->le);
 count = tget_long(&buf, s->le);
- off = tget_long(&buf, s->le);
+ off = tget_long(&buf, s->le);
 
 if (type == 0 || type >= FF_ARRAY_ELEMS(type_sizes)) {
 av_log(s->avctx, AV_LOG_DEBUG, "Unknown tiff type (%u) encountered\n",
@@ -324,13 +342,13 @@
 switch (type) {
 case TIFF_BYTE:
 case TIFF_SHORT:
- buf -= 4;
+ buf -= 4;
 value = tget(&buf, type, s->le);
- buf = NULL;
+ buf = NULL;
 break;
 case TIFF_LONG:
 value = off;
- buf = NULL;
+ buf = NULL;
 break;
 case TIFF_STRING:
 if (count <= 4) {
@@ -339,20 +357,19 @@
 }
 default:
 value = UINT_MAX;
- buf = start + off;
+ buf = start + off;
 }
 } else {
- if (count <= 4 && type_sizes[type] * count <= 4) {
+ if (count <= 4 && type_sizes[type] * count <= 4)
 buf -= 4;
- } else {
+ else
 buf = start + off;
- }
 }
 
 if (buf && (buf < start || buf > end_buf)) {
 av_log(s->avctx, AV_LOG_ERROR,
 "Tag referencing position outside the image\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 switch (tag) {
@@ -368,7 +385,7 @@
 av_log(s->avctx, AV_LOG_ERROR,
 "This format is not supported (bpp=%d, %d components)\n",
 s->bpp, count);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (count == 1)
 s->bpp = value;
@@ -400,7 +417,7 @@
 s->bppcount = value;
 break;
 case TIFF_COMPR:
- s->compr = value;
+ s->compr = value;
 s->predictor = 0;
 switch (s->compr) {
 case TIFF_RAW:
@@ -418,17 +435,16 @@
 break;
 #else
 av_log(s->avctx, AV_LOG_ERROR, "Deflate: ZLib not compiled in\n");
- return -1;
+ return AVERROR(ENOSYS);
 #endif
 case TIFF_JPEG:
 case TIFF_NEWJPEG:
- av_log(s->avctx, AV_LOG_ERROR,
- "JPEG compression is not supported\n");
- return -1;
+ avpriv_report_missing_feature(s->avctx, "JPEG compression");
+ return AVERROR_PATCHWELCOME;
 default:
 av_log(s->avctx, AV_LOG_ERROR, "Unknown compression method %i\n",
 s->compr);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 break;
 case TIFF_ROWSPERSTRIP:
@@ -437,14 +453,14 @@
 if (value < 1) {
 av_log(s->avctx, AV_LOG_ERROR,
 "Incorrect value of rows per strip\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 s->rps = value;
 break;
 case TIFF_STRIP_OFFS:
 if (count == 1) {
 s->stripdata = NULL;
- s->stripoff = value;
+ s->stripoff = value;
 } else
 s->stripdata = start + off;
 s->strips = count;
@@ -454,14 +470,14 @@
 if (s->stripdata > end_buf) {
 av_log(s->avctx, AV_LOG_ERROR,
 "Tag referencing position outside the image\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 break;
 case TIFF_STRIP_SIZE:
 if (count == 1) {
 s->stripsizes = NULL;
- s->stripsize = value;
- s->strips = 1;
+ s->stripsize = value;
+ s->strips = 1;
 } else {
 s->stripsizes = start + off;
 }
@@ -470,7 +486,7 @@
 if (s->stripsizes > end_buf) {
 av_log(s->avctx, AV_LOG_ERROR,
 "Tag referencing position outside the image\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 break;
 case TIFF_PREDICTOR:
@@ -490,7 +506,7 @@
 default:
 av_log(s->avctx, AV_LOG_ERROR, "Color mode %d is not supported\n",
 value);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 break;
 case TIFF_FILL_ORDER:
@@ -505,23 +521,23 @@
 pal = (uint32_t *) s->palette;
 off = type_sizes[type];
 if (count / 3 > 256 || end_buf - buf < count / 3 * off * 3)
- return -1;
- rp = buf;
- gp = buf + count / 3 * off;
- bp = buf + count / 3 * off * 2;
+ return AVERROR_INVALIDDATA;
+ rp = buf;
+ gp = buf + count / 3 * off;
+ bp = buf + count / 3 * off * 2;
 off = (type_sizes[type] - 1) << 3;
 for (i = 0; i < count / 3; i++) {
- j = (tget(&rp, type, s->le) >> off) << 16;
- j |= (tget(&gp, type, s->le) >> off) << 8;
- j |= tget(&bp, type, s->le) >> off;
+ j = (tget(&rp, type, s->le) >> off) << 16;
+ j |= (tget(&gp, type, s->le) >> off) << 8;
+ j |= tget(&bp, type, s->le) >> off;
 pal[i] = j;
 }
 s->palette_is_set = 1;
 break;
 case TIFF_PLANAR:
 if (value == 2) {
- av_log(s->avctx, AV_LOG_ERROR, "Planar format is not supported\n");
- return -1;
+ avpriv_report_missing_feature(s->avctx, "Planar format");
+ return AVERROR_PATCHWELCOME;
 }
 break;
 case TIFF_T4OPTIONS:
@@ -533,8 +549,12 @@
 s->fax_opts = value;
 break;
 default:
- av_log(s->avctx, AV_LOG_DEBUG, "Unknown or unsupported tag %d/0X%0X\n",
- tag, tag);
+ if (s->avctx->err_recognition & AV_EF_EXPLODE) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Unknown or unsupported tag %d/0X%0X\n",
+ tag, tag);
+ return AVERROR_INVALIDDATA;
+ }
 }
 return 0;
 }
@@ -543,22 +563,20 @@
 void *data, int *got_frame, AVPacket *avpkt)
 {
 const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
+ int buf_size = avpkt->size;
 TiffContext *const s = avctx->priv_data;
- AVFrame *picture = data;
- AVFrame *const p = &s->picture;
+ AVFrame *const p = data;
 const uint8_t *orig_buf = buf, *end_buf = buf + buf_size;
 unsigned off;
 int id, le, ret;
- int i, j, entries;
- int stride;
+ int i, j, entries, stride;
 unsigned soff, ssize;
 uint8_t *dst;
 
- //parse image header
+ // parse image header
 if (end_buf - buf < 8)
 return AVERROR_INVALIDDATA;
- id = AV_RL16(buf);
+ id = AV_RL16(buf);
 buf += 2;
 if (id == 0x4949)
 le = 1;
@@ -566,18 +584,18 @@
 le = 0;
 else {
 av_log(avctx, AV_LOG_ERROR, "TIFF header not found\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- s->le = le;
- s->invert = 0;
- s->compr = TIFF_RAW;
+ s->le = le;
+ s->invert = 0;
+ s->compr = TIFF_RAW;
 s->fill_order = 0;
 // As TIFF 6.0 specification puts it "An arbitrary but carefully chosen number
 // that further identifies the file as a TIFF file"
 if (tget_short(&buf, le) != 42) {
 av_log(avctx, AV_LOG_ERROR,
 "The answer to life, universe and everything is not correct!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 // Reset these pointers so we can tell if they were set this frame
 s->stripsizes = s->stripdata = NULL;
@@ -587,19 +605,19 @@
 av_log(avctx, AV_LOG_ERROR, "IFD offset is greater than image size\n");
 return AVERROR_INVALIDDATA;
 }
- buf = orig_buf + off;
+ buf = orig_buf + off;
 entries = tget_short(&buf, le);
 for (i = 0; i < entries; i++) {
- if (tiff_decode_tag(s, orig_buf, buf, end_buf) < 0)
- return -1;
+ if ((ret = tiff_decode_tag(s, orig_buf, buf, end_buf)) < 0)
+ return ret;
 buf += 12;
 }
 if (!s->stripdata && !s->stripoff) {
 av_log(avctx, AV_LOG_ERROR, "Image data is missing\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 /* now we have the data and may start decoding */
- if ((ret = init_image(s)) < 0)
+ if ((ret = init_image(s, p)) < 0)
 return ret;
 
 if (s->strips == 1 && !s->stripsize) {
@@ -607,7 +625,7 @@
 s->stripsize = buf_size - s->stripoff;
 }
 stride = p->linesize[0];
- dst = p->data[0];
+ dst = p->data[0];
 for (i = 0; i < s->height; i += s->rps) {
 if (s->stripsizes) {
 if (s->stripsizes >= end_buf)
@@ -625,16 +643,19 @@
 
 if (soff > buf_size || ssize > buf_size - soff) {
 av_log(avctx, AV_LOG_ERROR, "Invalid strip size/offset\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- if (tiff_unpack_strip(s, dst, stride, orig_buf + soff, ssize,
- FFMIN(s->rps, s->height - i)) < 0)
+ if ((ret = tiff_unpack_strip(s, dst, stride, orig_buf + soff, ssize,
+ FFMIN(s->rps, s->height - i))) < 0) {
+ if (avctx->err_recognition & AV_EF_EXPLODE)
+ return ret;
 break;
+ }
 dst += s->rps * stride;
 }
 if (s->predictor == 2) {
- dst = p->data[0];
- soff = s->bpp >> 3;
+ dst = p->data[0];
+ soff = s->bpp >> 3;
 ssize = s->width * soff;
 for (i = 0; i < s->height; i++) {
 for (j = soff; j < ssize; j++)
@@ -647,14 +668,13 @@
 uint8_t *src;
 int j;
 
- src = s->picture.data[0];
+ src = p->data[0];
 for (j = 0; j < s->height; j++) {
- for (i = 0; i < s->picture.linesize[0]; i++)
+ for (i = 0; i < p->linesize[0]; i++)
 src[i] = 255 - src[i];
- src += s->picture.linesize[0];
+ src += p->linesize[0];
 }
 }
- *picture = s->picture;
 *got_frame = 1;
 
 return buf_size;
@@ -664,11 +684,9 @@
 {
 TiffContext *s = avctx->priv_data;
 
- s->width = 0;
+ s->width = 0;
 s->height = 0;
- s->avctx = avctx;
- avcodec_get_frame_defaults(&s->picture);
- avctx->coded_frame = &s->picture;
+ s->avctx = avctx;
 ff_lzw_decode_open(&s->lzw);
 ff_ccitt_unpack_init();
 
@@ -680,13 +698,12 @@
 TiffContext *const s = avctx->priv_data;
 
 ff_lzw_decode_close(&s->lzw);
- if (s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
 return 0;
 }
 
 AVCodec ff_tiff_decoder = {
 .name = "tiff",
+ .long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_TIFF,
 .priv_data_size = sizeof(TiffContext),
@@ -694,5 +711,4 @@
 .close = tiff_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
 };

libav-v9.6.tar.bz2/libavcodec/tiff.h -> libav-v10.1.tar.bz2/libavcodec/tiff.h Changed

@@ -31,37 +31,37 @@
 #include <stdint.h>
 
 /** abridged list of TIFF tags */
-enum TiffTags{
- TIFF_SUBFILE = 0xfe,
- TIFF_WIDTH = 0x100,
+enum TiffTags {
+ TIFF_SUBFILE = 0xfe,
+ TIFF_WIDTH = 0x100,
 TIFF_HEIGHT,
 TIFF_BPP,
 TIFF_COMPR,
- TIFF_INVERT = 0x106,
- TIFF_FILL_ORDER = 0x10A,
- TIFF_STRIP_OFFS = 0x111,
- TIFF_SAMPLES_PER_PIXEL = 0x115,
- TIFF_ROWSPERSTRIP = 0x116,
+ TIFF_INVERT = 0x106,
+ TIFF_FILL_ORDER = 0x10A,
+ TIFF_STRIP_OFFS = 0x111,
+ TIFF_SAMPLES_PER_PIXEL = 0x115,
+ TIFF_ROWSPERSTRIP = 0x116,
 TIFF_STRIP_SIZE,
- TIFF_XRES = 0x11A,
- TIFF_YRES = 0x11B,
- TIFF_PLANAR = 0x11C,
- TIFF_XPOS = 0x11E,
- TIFF_YPOS = 0x11F,
- TIFF_T4OPTIONS = 0x124,
+ TIFF_XRES = 0x11A,
+ TIFF_YRES = 0x11B,
+ TIFF_PLANAR = 0x11C,
+ TIFF_XPOS = 0x11E,
+ TIFF_YPOS = 0x11F,
+ TIFF_T4OPTIONS = 0x124,
 TIFF_T6OPTIONS,
- TIFF_RES_UNIT = 0x128,
- TIFF_SOFTWARE_NAME = 0x131,
- TIFF_PREDICTOR = 0x13D,
- TIFF_PAL = 0x140,
+ TIFF_RES_UNIT = 0x128,
+ TIFF_SOFTWARE_NAME = 0x131,
+ TIFF_PREDICTOR = 0x13D,
+ TIFF_PAL = 0x140,
 TIFF_YCBCR_COEFFICIENTS = 0x211,
- TIFF_YCBCR_SUBSAMPLING = 0x212,
- TIFF_YCBCR_POSITIONING = 0x213,
- TIFF_REFERENCE_BW = 0x214,
+ TIFF_YCBCR_SUBSAMPLING = 0x212,
+ TIFF_YCBCR_POSITIONING = 0x213,
+ TIFF_REFERENCE_BW = 0x214,
 };
 
 /** list of TIFF compression types */
-enum TiffCompr{
+enum TiffCompr {
 TIFF_RAW = 1,
 TIFF_CCITT_RLE,
 TIFF_G3,
@@ -71,10 +71,10 @@
 TIFF_NEWJPEG,
 TIFF_ADOBE_DEFLATE,
 TIFF_PACKBITS = 0x8005,
- TIFF_DEFLATE = 0x80B2
+ TIFF_DEFLATE = 0x80B2
 };
 
-enum TiffTypes{
+enum TiffTypes {
 TIFF_BYTE = 1,
 TIFF_STRING,
 TIFF_SHORT,

libav-v9.6.tar.bz2/libavcodec/tiffenc.c -> libav-v10.1.tar.bz2/libavcodec/tiffenc.c Changed

@@ -25,20 +25,20 @@
 * @author Bartlomiej Wolowiec
 */
 
-#include "libavutil/log.h"
-#include "libavutil/opt.h"
-#include "libavutil/pixdesc.h"
-
-#include "avcodec.h"
 #include "config.h"
 #if CONFIG_ZLIB
 #include <zlib.h>
 #endif
+
+#include "libavutil/log.h"
+#include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
+#include "avcodec.h"
 #include "bytestream.h"
-#include "tiff.h"
-#include "rle.h"
 #include "lzw.h"
 #include "put_bits.h"
+#include "rle.h"
+#include "tiff.h"
 
 #define TIFF_MAX_ENTRY 32
 
@@ -48,27 +48,25 @@
 };
 
 typedef struct TiffEncoderContext {
- AVClass *class; ///< for private options
+ AVClass *class; ///< for private options
 AVCodecContext *avctx;
- AVFrame picture;
-
- int width; ///< picture width
- int height; ///< picture height
- unsigned int bpp; ///< bits per pixel
- int compr; ///< compression level
- int bpp_tab_size; ///< bpp_tab size
- int photometric_interpretation; ///< photometric interpretation
- int strips; ///< number of strips
- int rps; ///< row per strip
- uint8_t entries[TIFF_MAX_ENTRY*12]; ///< entires in header
- int num_entries; ///< number of entires
- uint8_t **buf; ///< actual position in buffer
- uint8_t *buf_start; ///< pointer to first byte in buffer
- int buf_size; ///< buffer size
- uint16_t subsampling[2]; ///< YUV subsampling factors
- struct LZWEncodeState *lzws; ///< LZW Encode state
-} TiffEncoderContext;
 
+ int width; ///< picture width
+ int height; ///< picture height
+ unsigned int bpp; ///< bits per pixel
+ int compr; ///< compression level
+ int bpp_tab_size; ///< bpp_tab size
+ int photometric_interpretation; ///< photometric interpretation
+ int strips; ///< number of strips
+ int rps; ///< row per strip
+ uint8_t entries[TIFF_MAX_ENTRY * 12]; ///< entries in header
+ int num_entries; ///< number of entries
+ uint8_t **buf; ///< actual position in buffer
+ uint8_t *buf_start; ///< pointer to first byte in buffer
+ int buf_size; ///< buffer size
+ uint16_t subsampling[2]; ///< YUV subsampling factors
+ struct LZWEncodeState *lzws; ///< LZW encode state
+} TiffEncoderContext;
 
 /**
 * Check free space in buffer
@@ -76,7 +74,7 @@
 * @param need Needed bytes
 * @return 0 - ok, 1 - no free space
 */
-static inline int check_size(TiffEncoderContext * s, uint64_t need)
+static inline int check_size(TiffEncoderContext *s, uint64_t need)
 {
 if (s->buf_size < *s->buf - s->buf_start + need) {
 *s->buf = s->buf_start + s->buf_size + 1;
@@ -95,12 +93,12 @@
 * @param type Type of values
 * @param flip =0 - normal copy, >0 - flip
 */
-static void tnput(uint8_t ** p, int n, const uint8_t * val, enum TiffTypes type,
+static void tnput(uint8_t **p, int n, const uint8_t *val, enum TiffTypes type,
 int flip)
 {
 int i;
 #if HAVE_BIGENDIAN
- flip ^= ((int[]) {0, 0, 0, 1, 3, 3})[type];
+ flip ^= ((int[]) { 0, 0, 0, 1, 3, 3 })[type];
 #endif
 for (i = 0; i < n * type_sizes2[type]; i++)
 *(*p)++ = val[i ^ flip];
@@ -114,9 +112,8 @@
 * @param count The number of values
 * @param ptr_val Pointer to values
 */
-static void add_entry(TiffEncoderContext * s,
- enum TiffTags tag, enum TiffTypes type, int count,
- const void *ptr_val)
+static void add_entry(TiffEncoderContext *s, enum TiffTags tag,
+ enum TiffTypes type, int count, const void *ptr_val)
 {
 uint8_t *entries_ptr = s->entries + 12 * s->num_entries;
 
@@ -137,10 +134,11 @@
 s->num_entries++;
 }
 
-static void add_entry1(TiffEncoderContext * s,
- enum TiffTags tag, enum TiffTypes type, int val){
- uint16_t w = val;
- uint32_t dw= val;
+static void add_entry1(TiffEncoderContext *s,
+ enum TiffTags tag, enum TiffTypes type, int val)
+{
+ uint16_t w = val;
+ uint32_t dw = val;
 add_entry(s, tag, type, 1, type == TIFF_SHORT ? (void *)&w : (void *)&dw);
 }
 
@@ -154,22 +152,21 @@
 * @param compr Compression method
 * @return Number of output bytes. If an output error is encountered, -1 returned
 */
-static int encode_strip(TiffEncoderContext * s, const int8_t * src,
- uint8_t * dst, int n, int compr)
+static int encode_strip(TiffEncoderContext *s, const int8_t *src,
+ uint8_t *dst, int n, int compr)
 {
-
 switch (compr) {
 #if CONFIG_ZLIB
 case TIFF_DEFLATE:
 case TIFF_ADOBE_DEFLATE:
- {
- unsigned long zlen = s->buf_size - (*s->buf - s->buf_start);
- if (compress(dst, &zlen, src, n) != Z_OK) {
- av_log(s->avctx, AV_LOG_ERROR, "Compressing failed\n");
- return -1;
- }
- return zlen;
+ {
+ unsigned long zlen = s->buf_size - (*s->buf - s->buf_start);
+ if (compress(dst, &zlen, src, n) != Z_OK) {
+ av_log(s->avctx, AV_LOG_ERROR, "Compressing failed\n");
+ return -1;
 }
+ return zlen;
+ }
 #endif
 case TIFF_RAW:
 if (check_size(s, n))
@@ -177,7 +174,8 @@
 memcpy(dst, src, n);
 return n;
 case TIFF_PACKBITS:
- return ff_rle_encode(dst, s->buf_size - (*s->buf - s->buf_start), src, 1, n, 2, 0xff, -1, 0);
+ return ff_rle_encode(dst, s->buf_size - (*s->buf - s->buf_start),
+ src, 1, n, 2, 0xff, -1, 0);
 case TIFF_LZW:
 return ff_lzw_encode(s->lzws, src, n);
 default:
@@ -185,14 +183,14 @@
 }
 }
 
-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;
+ int w = (s->width - 1) / s->subsampling[0] + 1;
 uint8_t *pu = &p->data[1][lnum / s->subsampling[1] * p->linesize[1]];
 uint8_t *pv = &p->data[2][lnum / s->subsampling[1] * p->linesize[2]];
- for (i = 0; i < w; i++){
+ for (i = 0; i < w; i++) {
 for (j = 0; j < s->subsampling[1]; j++)
 for (k = 0; k < s->subsampling[0]; k++)
 *dst++ = p->data[0][(lnum + j) * p->linesize[0] +
@@ -202,35 +200,30 @@
 }
 }
 
-static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
+static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 const AVFrame *pict, int *got_packet)
 {
 TiffEncoderContext *s = avctx->priv_data;
- AVFrame *const p = &s->picture;
+ const AVFrame *const p = pict;
 int i;
 uint8_t *ptr;
 uint8_t *offset;
 uint32_t strips;
- uint32_t *strip_sizes = NULL;
+ uint32_t *strip_sizes = NULL;
 uint32_t *strip_offsets = NULL;
 int bytes_per_row;
- uint32_t res[2] = { 72, 1 }; // image resolution (72/1)
+ uint32_t res[2] = { 72, 1 }; // image resolution (72/1)
 uint16_t bpp_tab[] = { 8, 8, 8, 8 };
 int ret;
 int is_yuv = 0;
 uint8_t *yuv_line = NULL;
 int shift_h, shift_v;
- const AVPixFmtDescriptor* pfd;
+ const AVPixFmtDescriptor *pfd;
 
 s->avctx = avctx;
 
- *p = *pict;
- p->pict_type = AV_PICTURE_TYPE_I;
- p->key_frame = 1;
- avctx->coded_frame= &s->picture;
-
- s->width = avctx->width;
- s->height = avctx->height;
+ s->width = avctx->width;
+ s->height = avctx->height;
 s->subsampling[0] = 1;
 s->subsampling[1] = 1;
 
@@ -240,43 +233,40 @@
 case AV_PIX_FMT_RGB24:
 case AV_PIX_FMT_GRAY8:
 case AV_PIX_FMT_PAL8:
- pfd = av_pix_fmt_desc_get(avctx->pix_fmt);
+ pfd = av_pix_fmt_desc_get(avctx->pix_fmt);
 s->bpp = av_get_bits_per_pixel(pfd);
- if (pfd->flags & PIX_FMT_PAL) {
+ if (pfd->flags & AV_PIX_FMT_FLAG_PAL)
 s->photometric_interpretation = 3;
- } else if (pfd->flags & PIX_FMT_RGB) {
+ else if (pfd->flags & AV_PIX_FMT_FLAG_RGB)
 s->photometric_interpretation = 2;
- } else {
+ else
 s->photometric_interpretation = 1;
- }
 s->bpp_tab_size = pfd->nb_components;
- for (i = 0; i < s->bpp_tab_size; i++) {
+ for (i = 0; i < s->bpp_tab_size; i++)
 bpp_tab[i] = s->bpp / s->bpp_tab_size;
- }
 break;
 case AV_PIX_FMT_MONOBLACK:
- s->bpp = 1;
+ s->bpp = 1;
 s->photometric_interpretation = 1;
- s->bpp_tab_size = 0;
+ s->bpp_tab_size = 0;
 break;
 case AV_PIX_FMT_MONOWHITE:
- s->bpp = 1;
+ s->bpp = 1;
 s->photometric_interpretation = 0;
- s->bpp_tab_size = 0;
+ s->bpp_tab_size = 0;
 break;
 case AV_PIX_FMT_YUV420P:
 case AV_PIX_FMT_YUV422P:
 case AV_PIX_FMT_YUV444P:
 case AV_PIX_FMT_YUV410P:
 case AV_PIX_FMT_YUV411P:
+ av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &shift_h, &shift_v);
 s->photometric_interpretation = 6;
- av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt,
- &shift_h, &shift_v);
- s->bpp = 8 + (16 >> (shift_h + shift_v));
- s->subsampling[0] = 1 << shift_h;
- s->subsampling[1] = 1 << shift_v;
- s->bpp_tab_size = 3;
- is_yuv = 1;
+ s->bpp = 8 + (16 >> (shift_h + shift_v));
+ s->subsampling[0] = 1 << shift_h;
+ s->subsampling[1] = 1 << shift_v;
+ s->bpp_tab_size = 3;
+ is_yuv = 1;
 break;
 default:
 av_log(s->avctx, AV_LOG_ERROR,
@@ -284,18 +274,23 @@
 return -1;
 }
 
- if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE || s->compr == TIFF_LZW)
- //best choose for DEFLATE
+ if (s->compr == TIFF_DEFLATE ||
+ s->compr == TIFF_ADOBE_DEFLATE ||
+ s->compr == TIFF_LZW)
+ // best choice for DEFLATE
 s->rps = s->height;
 else
- s->rps = FFMAX(8192 / (((s->width * s->bpp) >> 3) + 1), 1); // suggest size of strip
- s->rps = ((s->rps - 1) / s->subsampling[1] + 1) * s->subsampling[1]; // round rps up
+ // suggest size of strip
+ s->rps = FFMAX(8192 / (((s->width * s->bpp) >> 3) + 1), 1);
+ // round rps up
+ s->rps = ((s->rps - 1) / s->subsampling[1] + 1) * s->subsampling[1];
 
 strips = (s->height - 1) / s->rps + 1;
 
 if (!pkt->data &&
- (ret = av_new_packet(pkt, avctx->width * avctx->height * s->bpp * 2 +
- avctx->height * 4 + FF_MIN_BUFFER_SIZE)) < 0) {
+ (ret = av_new_packet(pkt,
+ avctx->width * avctx->height * s->bpp * 2 +
+ avctx->height * 4 + FF_MIN_BUFFER_SIZE)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n");
 return ret;
 }
@@ -314,18 +309,18 @@
 offset = ptr;
 bytestream_put_le32(&ptr, 0);
 
- strip_sizes = av_mallocz(sizeof(*strip_sizes) * strips);
+ strip_sizes = av_mallocz(sizeof(*strip_sizes) * strips);
 strip_offsets = av_mallocz(sizeof(*strip_offsets) * strips);
 if (!strip_sizes || !strip_offsets) {
 ret = AVERROR(ENOMEM);
 goto fail;
 }
 
- bytes_per_row = (((s->width - 1)/s->subsampling[0] + 1) * s->bpp
- * s->subsampling[0] * s->subsampling[1] + 7) >> 3;
- if (is_yuv){
+ bytes_per_row = (((s->width - 1) / s->subsampling[0] + 1) * s->bpp *
+ s->subsampling[0] * s->subsampling[1] + 7) >> 3;
+ if (is_yuv) {
 yuv_line = av_malloc(bytes_per_row);
- if (yuv_line == NULL){
+ if (yuv_line == NULL) {
 av_log(s->avctx, AV_LOG_ERROR, "Not enough memory\n");
 ret = AVERROR(ENOMEM);
 goto fail;
@@ -345,14 +340,13 @@
 goto fail;
 }
 strip_offsets[0] = ptr - pkt->data;
- zn = 0;
+ zn = 0;
 for (j = 0; j < s->rps; j++) {
- if (is_yuv){
- pack_yuv(s, yuv_line, j);
+ if (is_yuv) {
+ pack_yuv(s, p, yuv_line, j);
 memcpy(zbuf + zn, yuv_line, bytes_per_row);
 j += s->subsampling[1] - 1;
- }
- else
+ } else
 memcpy(zbuf + j * bytes_per_row,
 p->data[0] + j * p->linesize[0], bytes_per_row);
 zn += bytes_per_row;
@@ -363,93 +357,93 @@
 av_log(s->avctx, AV_LOG_ERROR, "Encode strip failed\n");
 goto fail;
 }
- ptr += ret;
+ ptr += ret;
 strip_sizes[0] = ptr - pkt->data - strip_offsets[0];
 } else
 #endif
- {
- if (s->compr == TIFF_LZW) {
- s->lzws = av_malloc(ff_lzw_encode_state_size);
- if (!s->lzws) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
+ if (s->compr == TIFF_LZW) {
+ s->lzws = av_malloc(ff_lzw_encode_state_size);
+ if (!s->lzws) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
 }
- for (i = 0; i < s->height; i++) {
- if (strip_sizes[i / s->rps] == 0) {
- if(s->compr == TIFF_LZW){
- ff_lzw_encode_init(s->lzws, ptr, s->buf_size - (*s->buf - s->buf_start),
- 12, FF_LZW_TIFF, put_bits);
- }
- strip_offsets[i / s->rps] = ptr - pkt->data;
- }
- if (is_yuv){
- pack_yuv(s, yuv_line, i);
- ret = encode_strip(s, yuv_line, ptr, bytes_per_row, s->compr);
- i += s->subsampling[1] - 1;
- }
- else
- ret = encode_strip(s, p->data[0] + i * p->linesize[0],
- ptr, bytes_per_row, s->compr);
- if (ret < 0) {
- av_log(s->avctx, AV_LOG_ERROR, "Encode strip failed\n");
- goto fail;
- }
- strip_sizes[i / s->rps] += ret;
- ptr += ret;
- if(s->compr == TIFF_LZW && (i==s->height-1 || i%s->rps == s->rps-1)){
- ret = ff_lzw_encode_flush(s->lzws, flush_put_bits);
- strip_sizes[(i / s->rps )] += ret ;
- ptr += ret;
+ }
+ for (i = 0; i < s->height; i++) {
+ if (strip_sizes[i / s->rps] == 0) {
+ if (s->compr == TIFF_LZW) {
+ ff_lzw_encode_init(s->lzws, ptr,
+ s->buf_size - (*s->buf - s->buf_start),
+ 12, FF_LZW_TIFF, put_bits);
 }
+ strip_offsets[i / s->rps] = ptr - pkt->data;
+ }
+ if (is_yuv) {
+ pack_yuv(s, p, yuv_line, i);
+ ret = encode_strip(s, yuv_line, ptr, bytes_per_row, s->compr);
+ i += s->subsampling[1] - 1;
+ } else
+ ret = encode_strip(s, p->data[0] + i * p->linesize[0],
+ ptr, bytes_per_row, s->compr);
+ if (ret < 0) {
+ av_log(s->avctx, AV_LOG_ERROR, "Encode strip failed\n");
+ goto fail;
+ }
+ strip_sizes[i / s->rps] += ret;
+ ptr += ret;
+ if (s->compr == TIFF_LZW &&
+ (i == s->height - 1 || i % s->rps == s->rps - 1)) {
+ ret = ff_lzw_encode_flush(s->lzws, flush_put_bits);
+ strip_sizes[(i / s->rps)] += ret;
+ ptr += ret;
 }
- if(s->compr == TIFF_LZW)
- av_free(s->lzws);
 }
+ if (s->compr == TIFF_LZW)
+ av_free(s->lzws);
 
 s->num_entries = 0;
 
- add_entry1(s,TIFF_SUBFILE, TIFF_LONG, 0);
- add_entry1(s,TIFF_WIDTH, TIFF_LONG, s->width);
- add_entry1(s,TIFF_HEIGHT, TIFF_LONG, s->height);
+ add_entry1(s, TIFF_SUBFILE, TIFF_LONG, 0);
+ add_entry1(s, TIFF_WIDTH, TIFF_LONG, s->width);
+ add_entry1(s, TIFF_HEIGHT, TIFF_LONG, s->height);
 
 if (s->bpp_tab_size)
- add_entry(s, TIFF_BPP, TIFF_SHORT, s->bpp_tab_size, bpp_tab);
+ add_entry(s, TIFF_BPP, TIFF_SHORT, s->bpp_tab_size, bpp_tab);
 
- add_entry1(s,TIFF_COMPR, TIFF_SHORT, s->compr);
- add_entry1(s,TIFF_INVERT, TIFF_SHORT, s->photometric_interpretation);
- add_entry(s, TIFF_STRIP_OFFS, TIFF_LONG, strips, strip_offsets);
+ add_entry1(s, TIFF_COMPR, TIFF_SHORT, s->compr);
+ add_entry1(s, TIFF_INVERT, TIFF_SHORT, s->photometric_interpretation);
+ add_entry(s, TIFF_STRIP_OFFS, TIFF_LONG, strips, strip_offsets);
 
 if (s->bpp_tab_size)
- add_entry1(s,TIFF_SAMPLES_PER_PIXEL, TIFF_SHORT, s->bpp_tab_size);
+ add_entry1(s, TIFF_SAMPLES_PER_PIXEL, TIFF_SHORT, s->bpp_tab_size);
 
- add_entry1(s,TIFF_ROWSPERSTRIP, TIFF_LONG, s->rps);
- add_entry(s, TIFF_STRIP_SIZE, TIFF_LONG, strips, strip_sizes);
- add_entry(s, TIFF_XRES, TIFF_RATIONAL, 1, res);
- add_entry(s, TIFF_YRES, TIFF_RATIONAL, 1, res);
- add_entry1(s,TIFF_RES_UNIT, TIFF_SHORT, 2);
+ add_entry1(s, TIFF_ROWSPERSTRIP, TIFF_LONG, s->rps);
+ add_entry(s, TIFF_STRIP_SIZE, TIFF_LONG, strips, strip_sizes);
+ add_entry(s, TIFF_XRES, TIFF_RATIONAL, 1, res);
+ add_entry(s, TIFF_YRES, TIFF_RATIONAL, 1, res);
+ add_entry1(s, TIFF_RES_UNIT, TIFF_SHORT, 2);
 
- if(!(avctx->flags & CODEC_FLAG_BITEXACT))
- add_entry(s, TIFF_SOFTWARE_NAME, TIFF_STRING,
- strlen(LIBAVCODEC_IDENT) + 1, LIBAVCODEC_IDENT);
+ if (!(avctx->flags & CODEC_FLAG_BITEXACT))
+ add_entry(s, TIFF_SOFTWARE_NAME, TIFF_STRING,
+ strlen(LIBAVCODEC_IDENT) + 1, LIBAVCODEC_IDENT);
 
 if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
 uint16_t pal[256 * 3];
 for (i = 0; i < 256; i++) {
 uint32_t rgb = *(uint32_t *) (p->data[1] + i * 4);
 pal[i] = ((rgb >> 16) & 0xff) * 257;
- pal[i + 256] = ((rgb >> 8 ) & 0xff) * 257;
- pal[i + 512] = ( rgb & 0xff) * 257;
+ pal[i + 256] = ((rgb >> 8) & 0xff) * 257;
+ pal[i + 512] = (rgb & 0xff) * 257;
 }
 add_entry(s, TIFF_PAL, TIFF_SHORT, 256 * 3, pal);
 }
- if (is_yuv){
+ if (is_yuv) {
 /** according to CCIR Recommendation 601.1 */
- uint32_t refbw[12] = {15, 1, 235, 1, 128, 1, 240, 1, 128, 1, 240, 1};
+ uint32_t refbw[12] = { 15, 1, 235, 1, 128, 1, 240, 1, 128, 1, 240, 1 };
 add_entry(s, TIFF_YCBCR_SUBSAMPLING, TIFF_SHORT, 2, s->subsampling);
 add_entry(s, TIFF_REFERENCE_BW, TIFF_RATIONAL, 6, refbw);
 }
- bytestream_put_le32(&offset, ptr - pkt->data); // write offset to dir
+ // write offset to dir
+ bytestream_put_le32(&offset, ptr - pkt->data);
 
 if (check_size(s, 6 + s->num_entries * 12)) {
 ret = AVERROR(EINVAL);
@@ -470,15 +464,33 @@
 return ret;
 }
 
+static av_cold int 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 encode_close(AVCodecContext *avctx)
+{
+ av_frame_free(&avctx->coded_frame);
+ return 0;
+}
+
 #define OFFSET(x) offsetof(TiffEncoderContext, x)
 #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption options[] = {
- { "compression_algo", NULL, OFFSET(compr), AV_OPT_TYPE_INT, {.i64 = TIFF_PACKBITS}, TIFF_RAW, TIFF_DEFLATE, VE, "compression_algo" },
- { "packbits", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = TIFF_PACKBITS}, 0, 0, VE, "compression_algo" },
- { "raw", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = TIFF_RAW}, 0, 0, VE, "compression_algo" },
- { "lzw", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = TIFF_LZW}, 0, 0, VE, "compression_algo" },
+ { "compression_algo", NULL, OFFSET(compr), AV_OPT_TYPE_INT, { .i64 = TIFF_PACKBITS }, TIFF_RAW, TIFF_DEFLATE, VE, "compression_algo" },
+ { "packbits", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_PACKBITS }, 0, 0, VE, "compression_algo" },
+ { "raw", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_RAW }, 0, 0, VE, "compression_algo" },
+ { "lzw", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_LZW }, 0, 0, VE, "compression_algo" },
 #if CONFIG_ZLIB
- { "deflate", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = TIFF_DEFLATE}, 0, 0, VE, "compression_algo" },
+ { "deflate", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_DEFLATE }, 0, 0, VE, "compression_algo" },
 #endif
 { NULL },
 };
@@ -492,9 +504,12 @@
 
 AVCodec ff_tiff_encoder = {
 .name = "tiff",
+ .long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_TIFF,
 .priv_data_size = sizeof(TiffEncoderContext),
+ .init = encode_init,
+ .close = encode_close,
 .encode2 = encode_frame,
 .pix_fmts = (const enum AVPixelFormat[]) {
 AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB48LE, AV_PIX_FMT_PAL8,
@@ -504,6 +519,5 @@
 AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P,
 AV_PIX_FMT_NONE
 },
- .long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
 .priv_class = &tiffenc_class,
 };

libav-v9.6.tar.bz2/libavcodec/tmv.c -> libav-v10.1.tar.bz2/libavcodec/tmv.c Changed

@@ -34,55 +34,49 @@
 
 #include "cga_data.h"
 
-typedef struct TMVContext {
- AVFrame pic;
-} TMVContext;
-
 static int tmv_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame, AVPacket *avpkt)
 {
- TMVContext *tmv = avctx->priv_data;
+ AVFrame *frame = data;
 const uint8_t *src = avpkt->data;
 uint8_t *dst;
 unsigned char_cols = avctx->width >> 3;
 unsigned char_rows = avctx->height >> 3;
 unsigned x, y, fg, bg, c;
+ int ret;
 
- if (tmv->pic.data[0])
- avctx->release_buffer(avctx, &tmv->pic);
-
- if (ff_get_buffer(avctx, &tmv->pic) < 0) {
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 if (avpkt->size < 2*char_rows*char_cols) {
 av_log(avctx, AV_LOG_ERROR,
 "Input buffer too small, truncated sample?\n");
 *got_frame = 0;
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- tmv->pic.pict_type = AV_PICTURE_TYPE_I;
- tmv->pic.key_frame = 1;
- dst = tmv->pic.data[0];
+ frame->pict_type = AV_PICTURE_TYPE_I;
+ frame->key_frame = 1;
+ dst = frame->data[0];
 
- tmv->pic.palette_has_changed = 1;
- memcpy(tmv->pic.data[1], ff_cga_palette, 16 * 4);
+ frame->palette_has_changed = 1;
+ memcpy(frame->data[1], ff_cga_palette, 16 * 4);
 
 for (y = 0; y < char_rows; y++) {
 for (x = 0; x < char_cols; x++) {
 c = *src++;
 bg = *src >> 4;
 fg = *src++ & 0xF;
- ff_draw_pc_font(dst + x * 8, tmv->pic.linesize[0],
+ ff_draw_pc_font(dst + x * 8, frame->linesize[0],
 ff_cga_font, 8, c, fg, bg);
 }
- dst += tmv->pic.linesize[0] * 8;
+ dst += frame->linesize[0] * 8;
 }
 
 *got_frame = 1;
- *(AVFrame *)data = tmv->pic;
+
 return avpkt->size;
 }
 
@@ -92,24 +86,12 @@
 return 0;
 }
 
-static av_cold int tmv_decode_close(AVCodecContext *avctx)
-{
- TMVContext *tmv = avctx->priv_data;
-
- if (tmv->pic.data[0])
- avctx->release_buffer(avctx, &tmv->pic);
-
- return 0;
-}
-
 AVCodec ff_tmv_decoder = {
 .name = "tmv",
+ .long_name = NULL_IF_CONFIG_SMALL("8088flex TMV"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_TMV,
- .priv_data_size = sizeof(TMVContext),
 .init = tmv_decode_init,
- .close = tmv_decode_close,
 .decode = tmv_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("8088flex TMV"),
 };

libav-v9.6.tar.bz2/libavcodec/truemotion1.c -> libav-v10.1.tar.bz2/libavcodec/truemotion1.c Changed

@@ -34,16 +34,17 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
+#include "internal.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
 
 #include "truemotion1data.h"
 
 typedef struct TrueMotion1Context {
 AVCodecContext *avctx;
- AVFrame frame;
+ AVFrame *frame;
 
 const uint8_t *buf;
 int size;
@@ -308,7 +309,7 @@
 * there was an error while decoding the header */
 static int truemotion1_decode_header(TrueMotion1Context *s)
 {
- int i;
+ int i, ret;
 int width_shift = 0;
 int new_pix_fmt;
 struct frame_header header;
@@ -319,7 +320,12 @@
 if (s->buf[0] < 0x10)
 {
 av_log(s->avctx, AV_LOG_ERROR, "invalid header size (%d)\n", s->buf[0]);
- return -1;
+ 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 */
@@ -343,7 +349,7 @@
 if (header.header_type > 3)
 {
 av_log(s->avctx, AV_LOG_ERROR, "invalid header type (%d)\n", header.header_type);
- return -1;
+ return AVERROR_INVALIDDATA;
 } else if ((header.header_type == 2) || (header.header_type == 3)) {
 s->flags = header.flags;
 if (!(s->flags & FLAG_INTERFRAME))
@@ -354,7 +360,7 @@
 s->flags = FLAG_KEYFRAME;
 
 if (s->flags & FLAG_SPRITE) {
- av_log_ask_for_sample(s->avctx, "SPRITE frame found.\n");
+ avpriv_request_sample(s->avctx, "Frame with sprite");
 /* FIXME header.width, height, xoffset and yoffset aren't initialized */
 return AVERROR_PATCHWELCOME;
 } else {
@@ -364,14 +370,14 @@
 if ((s->w < 213) && (s->h >= 176))
 {
 s->flags |= FLAG_INTERPOLATED;
- av_log_ask_for_sample(s->avctx, "INTERPOLATION selected.\n");
+ avpriv_request_sample(s->avctx, "Interpolated frame");
 }
 }
 }
 
 if (header.compression >= 17) {
 av_log(s->avctx, AV_LOG_ERROR, "invalid compression type (%d)\n", header.compression);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 if ((header.deltaset != s->last_deltaset) ||
@@ -385,7 +391,7 @@
 sel_vector_table = tables[header.vectable - 1];
 else {
 av_log(s->avctx, AV_LOG_ERROR, "invalid vector table id (%d)\n", header.vectable);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 
@@ -396,16 +402,16 @@
 new_pix_fmt = AV_PIX_FMT_RGB555; // RGB565 is supported as well
 
 s->w >>= width_shift;
- if (av_image_check_size(s->w, s->h, 0, s->avctx) < 0)
- return -1;
 
 if (s->w != s->avctx->width || s->h != s->avctx->height ||
 new_pix_fmt != s->avctx->pix_fmt) {
- if (s->frame.data[0])
- s->avctx->release_buffer(s->avctx, &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));
 }
 
@@ -468,7 +474,9 @@
 // else
 // avctx->pix_fmt = AV_PIX_FMT_RGB555;
 
- s->frame.data[0] = NULL;
+ 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 */
@@ -512,6 +520,15 @@
 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() \
 predictor_pair = s->c_predictor_table[index]; \
 horiz_pred += (predictor_pair >> 1); \
@@ -524,10 +541,10 @@
 if (predictor_pair & 1) \
 GET_NEXT_INDEX() \
 else \
- index++; \
+ INC_INDEX; \
 } \
 } else \
- index++;
+ INC_INDEX;
 
 #define APPLY_C_PREDICTOR_24() \
 predictor_pair = s->c_predictor_table[index]; \
@@ -541,10 +558,10 @@
 if (predictor_pair & 1) \
 GET_NEXT_INDEX() \
 else \
- index++; \
+ INC_INDEX; \
 } \
 } else \
- index++;
+ INC_INDEX;
 
 
 #define APPLY_Y_PREDICTOR() \
@@ -559,10 +576,10 @@
 if (predictor_pair & 1) \
 GET_NEXT_INDEX() \
 else \
- index++; \
+ INC_INDEX; \
 } \
 } else \
- index++;
+ INC_INDEX;
 
 #define APPLY_Y_PREDICTOR_24() \
 predictor_pair = s->y_predictor_table[index]; \
@@ -576,10 +593,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; \
@@ -593,7 +610,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 */
@@ -707,7 +724,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];
 }
 }
 
@@ -719,7 +736,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 */
@@ -833,7 +850,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];
 }
 }
 
@@ -843,21 +860,18 @@
 AVPacket *avpkt)
 {
 const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
+ int ret, buf_size = avpkt->size;
 TrueMotion1Context *s = avctx->priv_data;
 
 s->buf = buf;
 s->size = buf_size;
 
- if (truemotion1_decode_header(s) == -1)
- return -1;
+ if ((ret = truemotion1_decode_header(s)) < 0)
+ return ret;
 
- s->frame.reference = 1;
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID |
- FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, &s->frame) < 0) {
+ if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 if (compression_types[s->compression].algorithm == ALGO_RGB24H) {
@@ -866,8 +880,10 @@
 truemotion1_decode_16bit(s);
 }
 
+ if ((ret = av_frame_ref(data, s->frame)) < 0)
+ return ret;
+
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
 /* report that the buffer was completely consumed */
 return buf_size;
@@ -877,9 +893,7 @@
 {
 TrueMotion1Context *s = avctx->priv_data;
 
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
-
+ av_frame_free(&s->frame);
 av_free(s->vert_pred);
 
 return 0;
@@ -887,6 +901,7 @@
 
 AVCodec ff_truemotion1_decoder = {
 .name = "truemotion1",
+ .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 1.0"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_TRUEMOTION1,
 .priv_data_size = sizeof(TrueMotion1Context),
@@ -894,5 +909,4 @@
 .close = truemotion1_decode_end,
 .decode = truemotion1_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 1.0"),
 };

libav-v9.6.tar.bz2/libavcodec/truemotion2.c -> libav-v10.1.tar.bz2/libavcodec/truemotion2.c Changed

@@ -28,19 +28,37 @@
 #include "bytestream.h"
 #include "get_bits.h"
 #include "dsputil.h"
+#include "internal.h"
 
 #define TM2_ESCAPE 0x80000000
 #define TM2_DELTAS 64
+
 /* Huffman-coded streams of different types of blocks */
-enum TM2_STREAMS{ TM2_C_HI = 0, TM2_C_LO, TM2_L_HI, TM2_L_LO,
- TM2_UPD, TM2_MOT, TM2_TYPE, TM2_NUM_STREAMS};
+enum TM2_STREAMS {
+ TM2_C_HI = 0,
+ TM2_C_LO,
+ TM2_L_HI,
+ TM2_L_LO,
+ TM2_UPD,
+ TM2_MOT,
+ TM2_TYPE,
+ TM2_NUM_STREAMS
+};
+
 /* Block types */
-enum TM2_BLOCKS{ TM2_HI_RES = 0, TM2_MED_RES, TM2_LOW_RES, TM2_NULL_RES,
- TM2_UPDATE, TM2_STILL, TM2_MOTION};
+enum TM2_BLOCKS {
+ TM2_HI_RES = 0,
+ TM2_MED_RES,
+ TM2_LOW_RES,
+ TM2_NULL_RES,
+ TM2_UPDATE,
+ TM2_STILL,
+ TM2_MOTION
+};
 
-typedef struct TM2Context{
+typedef struct TM2Context {
 AVCodecContext *avctx;
- AVFrame pic;
+ AVFrame *pic;
 
 GetBitContext gb;
 DSPContext dsp;
@@ -66,7 +84,7 @@
 /**
 * Huffman codes for each of streams
 */
-typedef struct TM2Codes{
+typedef struct TM2Codes {
 VLC vlc; ///< table for Libav bitstream reader
 int bits;
 int *recode; ///< table for converting from code indexes to values
@@ -76,7 +94,7 @@
 /**
 * structure for gathering Huffman codes information
 */
-typedef struct TM2Huff{
+typedef struct TM2Huff {
 int val_bits; ///< length of literal
 int max_bits; ///< maximum length of code
 int min_bits; ///< minimum length of code
@@ -90,18 +108,20 @@
 
 static int tm2_read_tree(TM2Context *ctx, uint32_t prefix, int length, TM2Huff *huff)
 {
- if(length > huff->max_bits) {
- av_log(ctx->avctx, AV_LOG_ERROR, "Tree exceeded its given depth (%i)\n", huff->max_bits);
- return -1;
+ int ret;
+ if (length > huff->max_bits) {
+ av_log(ctx->avctx, AV_LOG_ERROR, "Tree exceeded its given depth (%i)\n",
+ huff->max_bits);
+ return AVERROR_INVALIDDATA;
 }
 
- if(!get_bits1(&ctx->gb)) { /* literal */
+ if (!get_bits1(&ctx->gb)) { /* literal */
 if (length == 0) {
 length = 1;
 }
- if(huff->num >= huff->max_num) {
+ if (huff->num >= huff->max_num) {
 av_log(ctx->avctx, AV_LOG_DEBUG, "Too many literals\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 huff->nums[huff->num] = get_bits_long(&ctx->gb, huff->val_bits);
 huff->bits[huff->num] = prefix;
@@ -109,10 +129,10 @@
 huff->num++;
 return 0;
 } else { /* non-terminal node */
- if(tm2_read_tree(ctx, prefix << 1, length + 1, huff) == -1)
- return -1;
- if(tm2_read_tree(ctx, (prefix << 1) | 1, length + 1, huff) == -1)
- return -1;
+ if ((ret = tm2_read_tree(ctx, prefix << 1, length + 1, huff)) < 0)
+ return ret;
+ if ((ret = tm2_read_tree(ctx, (prefix << 1) | 1, length + 1, huff)) < 0)
+ return ret;
 }
 return 0;
 }
@@ -125,56 +145,53 @@
 huff.val_bits = get_bits(&ctx->gb, 5);
 huff.max_bits = get_bits(&ctx->gb, 5);
 huff.min_bits = get_bits(&ctx->gb, 5);
- huff.nodes = get_bits_long(&ctx->gb, 17);
- huff.num = 0;
+ huff.nodes = get_bits_long(&ctx->gb, 17);
+ huff.num = 0;
 
 /* check for correct codes parameters */
- if((huff.val_bits < 1) || (huff.val_bits > 32) ||
- (huff.max_bits < 0) || (huff.max_bits > 25)) {
- av_log(ctx->avctx, AV_LOG_ERROR, "Incorrect tree parameters - literal length: %i, max code length: %i\n",
- huff.val_bits, huff.max_bits);
- return -1;
+ if ((huff.val_bits < 1) || (huff.val_bits > 32) ||
+ (huff.max_bits < 0) || (huff.max_bits > 25)) {
+ av_log(ctx->avctx, AV_LOG_ERROR, "Incorrect tree parameters - literal "
+ "length: %i, max code length: %i\n", huff.val_bits, huff.max_bits);
+ return AVERROR_INVALIDDATA;
 }
- if((huff.nodes <= 0) || (huff.nodes > 0x10000)) {
- av_log(ctx->avctx, AV_LOG_ERROR, "Incorrect number of Huffman tree nodes: %i\n", huff.nodes);
- return -1;
+ if ((huff.nodes <= 0) || (huff.nodes > 0x10000)) {
+ av_log(ctx->avctx, AV_LOG_ERROR, "Incorrect number of Huffman tree "
+ "nodes: %i\n", huff.nodes);
+ return AVERROR_INVALIDDATA;
 }
 /* one-node tree */
- if(huff.max_bits == 0)
+ if (huff.max_bits == 0)
 huff.max_bits = 1;
 
 /* allocate space for codes - it is exactly ceil(nodes / 2) entries */
 huff.max_num = (huff.nodes + 1) >> 1;
- huff.nums = av_mallocz(huff.max_num * sizeof(int));
- huff.bits = av_mallocz(huff.max_num * sizeof(uint32_t));
- huff.lens = av_mallocz(huff.max_num * sizeof(int));
+ huff.nums = av_mallocz(huff.max_num * sizeof(int));
+ huff.bits = av_mallocz(huff.max_num * sizeof(uint32_t));
+ huff.lens = av_mallocz(huff.max_num * sizeof(int));
 
- if(tm2_read_tree(ctx, 0, 0, &huff) == -1)
- res = -1;
+ res = tm2_read_tree(ctx, 0, 0, &huff);
 
- if(huff.num != huff.max_num) {
+ if (huff.num != huff.max_num) {
 av_log(ctx->avctx, AV_LOG_ERROR, "Got less codes than expected: %i of %i\n",
 huff.num, huff.max_num);
- res = -1;
+ res = AVERROR_INVALIDDATA;
 }
 
 /* convert codes to vlc_table */
- if(res != -1) {
+ if (res >= 0) {
 int i;
 
 res = init_vlc(&code->vlc, huff.max_bits, huff.max_num,
- huff.lens, sizeof(int), sizeof(int),
- huff.bits, sizeof(uint32_t), sizeof(uint32_t), 0);
- if(res < 0) {
+ huff.lens, sizeof(int), sizeof(int),
+ huff.bits, sizeof(uint32_t), sizeof(uint32_t), 0);
+ if (res < 0)
 av_log(ctx->avctx, AV_LOG_ERROR, "Cannot build VLC table\n");
- res = -1;
- } else
- res = 0;
- if(res != -1) {
+ else {
 code->bits = huff.max_bits;
 code->length = huff.max_num;
 code->recode = av_malloc(code->length * sizeof(int));
- for(i = 0; i < code->length; i++)
+ for (i = 0; i < code->length; i++)
 code->recode[i] = huff.nums[i];
 }
 }
@@ -189,7 +206,7 @@
 static void tm2_free_codes(TM2Codes *code)
 {
 av_free(code->recode);
- if(code->vlc.table)
+ if (code->vlc.table)
 ff_free_vlc(&code->vlc);
 }
 
@@ -209,7 +226,7 @@
 
 switch (magic) {
 case TM2_OLD_HEADER_MAGIC:
- av_log_missing_feature(ctx->avctx, "TM2 old header", 1);
+ avpriv_request_sample(ctx->avctx, "Old TM2 header");
 return 0;
 case TM2_NEW_HEADER_MAGIC:
 return 0;
@@ -219,26 +236,27 @@
 }
 }
 
-static int tm2_read_deltas(TM2Context *ctx, int stream_id) {
+static int tm2_read_deltas(TM2Context *ctx, int stream_id)
+{
 int d, mb;
 int i, v;
 
- d = get_bits(&ctx->gb, 9);
+ d = get_bits(&ctx->gb, 9);
 mb = get_bits(&ctx->gb, 5);
 
- if((d < 1) || (d > TM2_DELTAS) || (mb < 1) || (mb > 32)) {
+ if ((d < 1) || (d > TM2_DELTAS) || (mb < 1) || (mb > 32)) {
 av_log(ctx->avctx, AV_LOG_ERROR, "Incorrect delta table: %i deltas x %i bits\n", d, mb);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- for(i = 0; i < d; i++) {
+ for (i = 0; i < d; i++) {
 v = get_bits_long(&ctx->gb, mb);
- if(v & (1 << (mb - 1)))
+ if (v & (1 << (mb - 1)))
 ctx->deltas[stream_id][i] = v - (1 << mb);
 else
 ctx->deltas[stream_id][i] = v;
 }
- for(; i < TM2_DELTAS; i++)
+ for (; i < TM2_DELTAS; i++)
 ctx->deltas[stream_id][i] = 0;
 
 return 0;
@@ -246,7 +264,7 @@
 
 static int tm2_read_stream(TM2Context *ctx, const uint8_t *buf, int stream_id, int buf_size)
 {
- int i;
+ int i, ret;
 int skip = 0;
 int len, toks, pos;
 TM2Codes codes;
@@ -257,33 +275,33 @@
 len = bytestream2_get_be32(&gb);
 skip = len * 4 + 4;
 
- if(len == 0)
+ if (len == 0)
 return 4;
 
 if (len >= INT_MAX/4-1 || len < 0 || len > buf_size) {
 av_log(ctx->avctx, AV_LOG_ERROR, "Error, invalid stream size.\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 toks = bytestream2_get_be32(&gb);
- if(toks & 1) {
+ if (toks & 1) {
 len = bytestream2_get_be32(&gb);
- if(len == TM2_ESCAPE) {
+ if (len == TM2_ESCAPE) {
 len = bytestream2_get_be32(&gb);
 }
- if(len > 0) {
+ if (len > 0) {
 pos = bytestream2_tell(&gb);
 if (skip <= pos)
- return -1;
+ return AVERROR_INVALIDDATA;
 init_get_bits(&ctx->gb, buf + pos, (skip - pos) * 8);
- if(tm2_read_deltas(ctx, stream_id) == -1)
- return -1;
+ if ((ret = tm2_read_deltas(ctx, stream_id)) < 0)
+ return ret;
 bytestream2_skip(&gb, ((get_bits_count(&ctx->gb) + 31) >> 5) << 2);
 }
 }
 /* skip unused fields */
 len = bytestream2_get_be32(&gb);
- if(len == TM2_ESCAPE) { /* some unknown length - could be escaped too */
+ if (len == TM2_ESCAPE) { /* some unknown length - could be escaped too */
 bytestream2_skip(&gb, 8); /* unused by decoder */
 } else {
 bytestream2_skip(&gb, 4); /* unused by decoder */
@@ -291,31 +309,31 @@
 
 pos = bytestream2_tell(&gb);
 if (skip <= pos)
- return -1;
+ return AVERROR_INVALIDDATA;
 init_get_bits(&ctx->gb, buf + pos, (skip - pos) * 8);
- if(tm2_build_huff_table(ctx, &codes) == -1)
- return -1;
+ if ((ret = tm2_build_huff_table(ctx, &codes)) < 0)
+ return ret;
 bytestream2_skip(&gb, ((get_bits_count(&ctx->gb) + 31) >> 5) << 2);
 
 toks >>= 1;
 /* check if we have sane number of tokens */
- if((toks < 0) || (toks > 0xFFFFFF)){
+ if ((toks < 0) || (toks > 0xFFFFFF)) {
 av_log(ctx->avctx, AV_LOG_ERROR, "Incorrect number of tokens: %i\n", toks);
 tm2_free_codes(&codes);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- ctx->tokens[stream_id] = av_realloc(ctx->tokens[stream_id], toks * sizeof(int));
+ ctx->tokens[stream_id] = av_realloc(ctx->tokens[stream_id], toks * sizeof(int));
 ctx->tok_lens[stream_id] = toks;
 len = bytestream2_get_be32(&gb);
- if(len > 0) {
+ if (len > 0) {
 pos = bytestream2_tell(&gb);
 if (skip <= pos)
- return -1;
+ return AVERROR_INVALIDDATA;
 init_get_bits(&ctx->gb, buf + pos, (skip - pos) * 8);
- for(i = 0; i < toks; i++) {
+ for (i = 0; i < toks; i++) {
 if (get_bits_left(&ctx->gb) <= 0) {
 av_log(ctx->avctx, AV_LOG_ERROR, "Incorrect number of tokens: %i\n", toks);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 ctx->tokens[stream_id][i] = tm2_get_token(&ctx->gb, &codes);
 if (stream_id <= TM2_MOT && ctx->tokens[stream_id][i] >= TM2_DELTAS) {
@@ -325,7 +343,7 @@
 }
 }
 } else {
- for(i = 0; i < toks; i++) {
+ for (i = 0; i < toks; i++) {
 ctx->tokens[stream_id][i] = codes.recode[0];
 if (stream_id <= TM2_MOT && ctx->tokens[stream_id][i] >= TM2_DELTAS) {
 av_log(ctx->avctx, AV_LOG_ERROR, "Invalid delta token index %d for type %d, n=%d\n",
@@ -339,12 +357,13 @@
 return skip;
 }
 
-static inline int GET_TOK(TM2Context *ctx,int type) {
- if(ctx->tok_ptrs[type] >= ctx->tok_lens[type]) {
+static inline int GET_TOK(TM2Context *ctx,int type)
+{
+ if (ctx->tok_ptrs[type] >= ctx->tok_lens[type]) {
 av_log(ctx->avctx, AV_LOG_ERROR, "Read token from stream %i out of bounds (%i>=%i)\n", type, ctx->tok_ptrs[type], ctx->tok_lens[type]);
 return 0;
 }
- if(type <= TM2_MOT)
+ if (type <= TM2_MOT)
 return ctx->deltas[type][ctx->tokens[type][ctx->tok_ptrs[type]++]];
 return ctx->tokens[type][ctx->tok_ptrs[type]++];
 }
@@ -391,15 +410,15 @@
 int ct, d;
 int i, j;
 
- for(j = 0; j < 4; j++){
+ for (j = 0; j < 4; j++){
 ct = ctx->D[j];
- for(i = 0; i < 4; i++){
- d = deltas[i + j * 4];
- ct += d;
+ for (i = 0; i < 4; i++){
+ d = deltas[i + j * 4];
+ ct += d;
 last[i] += ct;
- Y[i] = av_clip_uint8(last[i]);
+ Y[i] = av_clip_uint8(last[i]);
 }
- Y += stride;
+ Y += stride;
 ctx->D[j] = ct;
 }
 }
@@ -407,11 +426,11 @@
 static inline void tm2_high_chroma(int *data, int stride, int *last, int *CD, int *deltas)
 {
 int i, j;
- for(j = 0; j < 2; j++){
- for(i = 0; i < 2; i++){
- CD[j] += deltas[i + j * 2];
+ for (j = 0; j < 2; j++) {
+ for (i = 0; i < 2; i++) {
+ CD[j] += deltas[i + j * 2];
 last[i] += CD[j];
- data[i] = last[i];
+ data[i] = last[i];
 }
 data += stride;
 }
@@ -423,14 +442,14 @@
 int l;
 int prev;
 
- if(bx > 0)
+ if (bx > 0)
 prev = clast[-3];
 else
 prev = 0;
- t = (CD[0] + CD[1]) >> 1;
- l = (prev - CD[0] - CD[1] + clast[1]) >> 1;
- CD[1] = CD[0] + CD[1] - t;
- CD[0] = t;
+ t = (CD[0] + CD[1]) >> 1;
+ l = (prev - CD[0] - CD[1] + clast[1]) >> 1;
+ CD[1] = CD[0] + CD[1] - t;
+ CD[0] = t;
 clast[0] = l;
 
 tm2_high_chroma(data, stride, clast, CD, deltas);
@@ -443,15 +462,15 @@
 TM2_INIT_POINTERS();
 
 /* hi-res chroma */
- for(i = 0; i < 4; i++) {
- deltas[i] = GET_TOK(ctx, TM2_C_HI);
+ for (i = 0; i < 4; i++) {
+ deltas[i] = GET_TOK(ctx, TM2_C_HI);
 deltas[i + 4] = GET_TOK(ctx, TM2_C_HI);
 }
- tm2_high_chroma(U, Ustride, clast, ctx->CD, deltas);
+ tm2_high_chroma(U, Ustride, clast, ctx->CD, deltas);
 tm2_high_chroma(V, Vstride, clast + 2, ctx->CD + 2, deltas + 4);
 
 /* hi-res luma */
- for(i = 0; i < 16; i++)
+ for (i = 0; i < 16; i++)
 deltas[i] = GET_TOK(ctx, TM2_L_HI);
 
 tm2_apply_deltas(ctx, Y, Ystride, deltas, last);
@@ -473,7 +492,7 @@
 tm2_low_chroma(V, Vstride, clast + 2, ctx->CD + 2, deltas, bx);
 
 /* hi-res luma */
- for(i = 0; i < 16; i++)
+ for (i = 0; i < 16; i++)
 deltas[i] = GET_TOK(ctx, TM2_L_HI);
 
 tm2_apply_deltas(ctx, Y, Ystride, deltas, last);
@@ -496,7 +515,7 @@
 tm2_low_chroma(V, Vstride, clast + 2, ctx->CD + 2, deltas, bx);
 
 /* low-res luma */
- for(i = 0; i < 16; i++)
+ for (i = 0; i < 16; i++)
 deltas[i] = 0;
 
 deltas[ 0] = GET_TOK(ctx, TM2_L_LO);
@@ -504,7 +523,7 @@
 deltas[ 8] = GET_TOK(ctx, TM2_L_LO);
 deltas[10] = GET_TOK(ctx, TM2_L_LO);
 
- if(bx > 0)
+ if (bx > 0)
 last[0] = (last[-1] - ctx->D[0] - ctx->D[1] - ctx->D[2] - ctx->D[3] + last[1]) >> 1;
 else
 last[0] = (last[1] - ctx->D[0] - ctx->D[1] - ctx->D[2] - ctx->D[3])>> 1;
@@ -536,18 +555,18 @@
 tm2_low_chroma(V, Vstride, clast + 2, ctx->CD + 2, deltas, bx);
 
 /* null luma */
- for(i = 0; i < 16; i++)
+ for (i = 0; i < 16; i++)
 deltas[i] = 0;
 
 ct = ctx->D[0] + ctx->D[1] + ctx->D[2] + ctx->D[3];
 
- if(bx > 0)
+ if (bx > 0)
 left = last[-1] - ct;
 else
 left = 0;
 
- right = last[3];
- diff = right - left;
+ right = last[3];
+ diff = right - left;
 last[0] = left + (diff >> 2);
 last[1] = left + (diff >> 1);
 last[2] = right - (diff >> 2);
@@ -556,11 +575,11 @@
 int tp = left;
 
 ctx->D[0] = (tp + (ct >> 2)) - left;
- left += ctx->D[0];
+ left += ctx->D[0];
 ctx->D[1] = (tp + (ct >> 1)) - left;
- left += ctx->D[1];
+ left += ctx->D[1];
 ctx->D[2] = ((tp + ct) - (ct >> 2)) - left;
- left += ctx->D[2];
+ left += ctx->D[2];
 ctx->D[3] = (tp + ct) - left;
 }
 tm2_apply_deltas(ctx, Y, Ystride, deltas, last);
@@ -572,12 +591,12 @@
 TM2_INIT_POINTERS_2();
 
 /* update chroma */
- for(j = 0; j < 2; j++){
- for(i = 0; i < 2; i++){
+ for (j = 0; j < 2; j++) {
+ for (i = 0; i < 2; i++){
 U[i] = Uo[i];
 V[i] = Vo[i];
 }
- U += Ustride; V += Vstride;
+ U += Ustride; V += Vstride;
 Uo += oUstride; Vo += oVstride;
 }
 U -= Ustride * 2;
@@ -591,12 +610,12 @@
 ctx->D[2] = Yo[3 + oYstride * 2] - Yo[3 + oYstride];
 ctx->D[3] = Yo[3 + oYstride * 3] - Yo[3 + oYstride * 2];
 
- for(j = 0; j < 4; j++){
- for(i = 0; i < 4; i++){
- Y[i] = Yo[i];
+ for (j = 0; j < 4; j++) {
+ for (i = 0; i < 4; i++) {
+ Y[i] = Yo[i];
 last[i] = Yo[i];
 }
- Y += Ystride;
+ Y += Ystride;
 Yo += oYstride;
 }
 }
@@ -608,13 +627,15 @@
 TM2_INIT_POINTERS_2();
 
 /* update chroma */
- for(j = 0; j < 2; j++){
- for(i = 0; i < 2; i++){
+ for (j = 0; j < 2; j++) {
+ for (i = 0; i < 2; i++) {
 U[i] = Uo[i] + GET_TOK(ctx, TM2_UPD);
 V[i] = Vo[i] + GET_TOK(ctx, TM2_UPD);
 }
- U += Ustride; V += Vstride;
- Uo += oUstride; Vo += oVstride;
+ U += Ustride;
+ V += Vstride;
+ Uo += oUstride;
+ Vo += oVstride;
 }
 U -= Ustride * 2;
 V -= Vstride * 2;
@@ -627,14 +648,14 @@
 ctx->D[2] = Yo[3 + oYstride * 2] - Yo[3 + oYstride];
 ctx->D[3] = Yo[3 + oYstride * 3] - Yo[3 + oYstride * 2];
 
- for(j = 0; j < 4; j++){
+ for (j = 0; j < 4; j++) {
 d = last[3];
- for(i = 0; i < 4; i++){
- Y[i] = Yo[i] + GET_TOK(ctx, TM2_UPD);
+ for (i = 0; i < 4; i++) {
+ Y[i] = Yo[i] + GET_TOK(ctx, TM2_UPD);
 last[i] = Y[i];
 }
 ctx->D[j] = last[3] - d;
- Y += Ystride;
+ Y += Ystride;
 Yo += oYstride;
 }
 }
@@ -655,13 +676,15 @@
 Vo += (my >> 1) * oVstride + (mx >> 1);
 
 /* copy chroma */
- for(j = 0; j < 2; j++){
- for(i = 0; i < 2; i++){
+ for (j = 0; j < 2; j++) {
+ for (i = 0; i < 2; i++) {
 U[i] = Uo[i];
 V[i] = Vo[i];
 }
- U += Ustride; V += Vstride;
- Uo += oUstride; Vo += oVstride;
+ U += Ustride;
+ V += Vstride;
+ Uo += oUstride;
+ Vo += oVstride;
 }
 U -= Ustride * 2;
 V -= Vstride * 2;
@@ -669,11 +692,11 @@
 TM2_RECALC_BLOCK(V, Vstride, (clast + 2), (ctx->CD + 2));
 
 /* copy luma */
- for(j = 0; j < 4; j++){
- for(i = 0; i < 4; i++){
+ for (j = 0; j < 4; j++) {
+ for (i = 0; i < 4; i++) {
 Y[i] = Yo[i];
 }
- Y += Ystride;
+ Y += Ystride;
 Yo += oYstride;
 }
 /* calculate deltas */
@@ -682,7 +705,7 @@
 ctx->D[1] = Y[3 + Ystride] - Y[3];
 ctx->D[2] = Y[3 + Ystride * 2] - Y[3 + Ystride];
 ctx->D[3] = Y[3 + Ystride * 3] - Y[3 + Ystride * 2];
- for(i = 0; i < 4; i++)
+ for (i = 0; i < 4; i++)
 last[i] = Y[i + Ystride * 3];
 }
 
@@ -695,21 +718,21 @@
 int *Y, *U, *V;
 uint8_t *dst;
 
- for(i = 0; i < TM2_NUM_STREAMS; i++)
+ for (i = 0; i < TM2_NUM_STREAMS; i++)
 ctx->tok_ptrs[i] = 0;
 
- if (ctx->tok_lens[TM2_TYPE]<bw*bh){
+ if (ctx->tok_lens[TM2_TYPE]<bw*bh) {
 av_log(ctx->avctx,AV_LOG_ERROR,"Got %i tokens for %i blocks\n",ctx->tok_lens[TM2_TYPE],bw*bh);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 memset(ctx->last, 0, 4 * bw * sizeof(int));
 memset(ctx->clast, 0, 4 * bw * sizeof(int));
 
- for(j = 0; j < bh; j++) {
+ for (j = 0; j < bh; j++) {
 memset(ctx->D, 0, 4 * sizeof(int));
 memset(ctx->CD, 0, 4 * sizeof(int));
- for(i = 0; i < bw; i++) {
+ for (i = 0; i < bw; i++) {
 type = GET_TOK(ctx, TM2_TYPE);
 switch(type) {
 case TM2_HI_RES:
@@ -747,8 +770,8 @@
 U = (ctx->cur?ctx->U2:ctx->U1);
 V = (ctx->cur?ctx->V2:ctx->V1);
 dst = p->data[0];
- for(j = 0; j < h; j++){
- for(i = 0; i < w; i++){
+ for (j = 0; j < h; j++) {
+ for (i = 0; i < w; i++) {
 int y = Y[i], u = U[i >> 1], v = V[i >> 1];
 dst[3*i+0] = av_clip_uint8(y + v);
 dst[3*i+1] = av_clip_uint8(y);
@@ -812,24 +835,24 @@
 void *data, int *got_frame,
 AVPacket *avpkt)
 {
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size & ~3;
 TM2Context * const l = avctx->priv_data;
- AVFrame * const p = &l->pic;
- int i, offset = TM2_HEADER_SIZE, t, ret;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size & ~3;
+ AVFrame * const p = l->pic;
+ int offset = TM2_HEADER_SIZE;
+ int i, t, ret;
 uint8_t *swbuf;
 
 swbuf = av_malloc(buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
- if(!swbuf){
+ if (!swbuf) {
 av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer\n");
- return -1;
+ return AVERROR(ENOMEM);
 }
- p->reference = 1;
- p->buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if(avctx->reget_buffer(avctx, p) < 0){
+
+ if ((ret = ff_reget_buffer(avctx, p)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 av_free(swbuf);
- return -1;
+ return ret;
 }
 
 l->dsp.bswap_buf((uint32_t*)swbuf, (const uint32_t*)buf, buf_size >> 2);
@@ -839,52 +862,56 @@
 return ret;
 }
 
- for(i = 0; i < TM2_NUM_STREAMS; i++){
+ for (i = 0; i < TM2_NUM_STREAMS; i++) {
 if (offset >= buf_size) {
 av_free(swbuf);
 return AVERROR_INVALIDDATA;
 }
 t = tm2_read_stream(l, swbuf + offset, tm2_stream_order[i],
 buf_size - offset);
- if(t < 0){
+ if (t < 0) {
 av_free(swbuf);
 return t;
 }
 offset += t;
 }
 p->key_frame = tm2_decode_blocks(l, p);
- if(p->key_frame)
+ if (p->key_frame)
 p->pict_type = AV_PICTURE_TYPE_I;
 else
 p->pict_type = AV_PICTURE_TYPE_P;
 
 l->cur = !l->cur;
 *got_frame = 1;
- *(AVFrame*)data = l->pic;
+ ret = av_frame_ref(data, l->pic);
 av_free(swbuf);
 
- return buf_size;
+ return (ret < 0) ? ret : buf_size;
 }
 
-static av_cold int decode_init(AVCodecContext *avctx){
+static av_cold int decode_init(AVCodecContext *avctx)
+{
 TM2Context * const l = avctx->priv_data;
 int i, w = avctx->width, h = avctx->height;
 
- if((avctx->width & 3) || (avctx->height & 3)){
+ if ((avctx->width & 3) || (avctx->height & 3)) {
 av_log(avctx, AV_LOG_ERROR, "Width and height must be multiple of 4\n");
- return -1;
+ return AVERROR(EINVAL);
 }
 
- l->avctx = avctx;
- l->pic.data[0]=NULL;
+ l->avctx = avctx;
 avctx->pix_fmt = AV_PIX_FMT_BGR24;
 
+ l->pic = av_frame_alloc();
+ if (!l->pic)
+ return AVERROR(ENOMEM);
+
 ff_dsputil_init(&l->dsp, avctx);
 
 l->last = av_malloc(4 * sizeof(*l->last) * (w >> 2));
 l->clast = av_malloc(4 * sizeof(*l->clast) * (w >> 2));
 
- for(i = 0; i < TM2_NUM_STREAMS; i++) {
+ for (i = 0; i < TM2_NUM_STREAMS; i++) {
 l->tokens[i] = NULL;
 l->tok_lens[i] = 0;
 }
@@ -905,14 +932,14 @@
 if (!l->Y1_base || !l->Y2_base || !l->U1_base ||
 !l->V1_base || !l->U2_base || !l->V2_base ||
 !l->last || !l->clast) {
- av_freep(l->Y1_base);
- av_freep(l->Y2_base);
- av_freep(l->U1_base);
- av_freep(l->U2_base);
- av_freep(l->V1_base);
- av_freep(l->V2_base);
- av_freep(l->last);
- av_freep(l->clast);
+ av_freep(&l->Y1_base);
+ av_freep(&l->Y2_base);
+ av_freep(&l->U1_base);
+ av_freep(&l->U2_base);
+ av_freep(&l->V1_base);
+ av_freep(&l->V2_base);
+ av_freep(&l->last);
+ av_freep(&l->clast);
 return AVERROR(ENOMEM);
 }
 l->Y1 = l->Y1_base + l->y_stride * 4 + 4;
@@ -925,16 +952,16 @@
 return 0;
 }
 
-static av_cold int decode_end(AVCodecContext *avctx){
+static av_cold int decode_end(AVCodecContext *avctx)
+{
 TM2Context * const l = avctx->priv_data;
- AVFrame *pic = &l->pic;
 int i;
 
 av_free(l->last);
 av_free(l->clast);
- for(i = 0; i < TM2_NUM_STREAMS; i++)
+ for (i = 0; i < TM2_NUM_STREAMS; i++)
 av_free(l->tokens[i]);
- if(l->Y1){
+ if (l->Y1) {
 av_free(l->Y1_base);
 av_free(l->U1_base);
 av_free(l->V1_base);
@@ -943,14 +970,14 @@
 av_free(l->V2_base);
 }
 
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
+ av_frame_free(&l->pic);
 
 return 0;
 }
 
 AVCodec ff_truemotion2_decoder = {
 .name = "truemotion2",
+ .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_TRUEMOTION2,
 .priv_data_size = sizeof(TM2Context),
@@ -958,5 +985,4 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0"),
 };

libav-v9.6.tar.bz2/libavcodec/truespeech.c -> libav-v10.1.tar.bz2/libavcodec/truespeech.c Changed

@@ -36,7 +36,6 @@
 * TrueSpeech decoder context
 */
 typedef struct {
- AVFrame frame;
 DSPContext dsp;
 /* input data */
 DECLARE_ALIGNED(16, uint8_t, buffer)[32];
@@ -64,7 +63,7 @@
 TSContext *c = avctx->priv_data;
 
 if (avctx->channels != 1) {
- av_log_ask_for_sample(avctx, "Unsupported channel count: %d\n", avctx->channels);
+ avpriv_request_sample(avctx, "Channel count %d", avctx->channels);
 return AVERROR_PATCHWELCOME;
 }
 
@@ -73,9 +72,6 @@
 
 ff_dsputil_init(&c->dsp, avctx);
 
- avcodec_get_frame_defaults(&c->frame);
- avctx->coded_frame = &c->frame;
-
 return 0;
 }
 
@@ -310,6 +306,7 @@
 static int truespeech_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 TSContext *c = avctx->priv_data;
@@ -327,12 +324,12 @@
 }
 
 /* get output buffer */
- c->frame.nb_samples = iterations * 240;
- if ((ret = ff_get_buffer(avctx, &c->frame)) < 0) {
+ frame->nb_samples = iterations * 240;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- samples = (int16_t *)c->frame.data[0];
+ samples = (int16_t *)frame->data[0];
 
 memset(samples, 0, iterations * 240 * sizeof(*samples));
 
@@ -354,19 +351,18 @@
 truespeech_save_prevvec(c);
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = c->frame;
+ *got_frame_ptr = 1;
 
 return buf_size;
 }
 
 AVCodec ff_truespeech_decoder = {
 .name = "truespeech",
+ .long_name = NULL_IF_CONFIG_SMALL("DSP Group TrueSpeech"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_TRUESPEECH,
 .priv_data_size = sizeof(TSContext),
 .init = truespeech_decode_init,
 .decode = truespeech_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("DSP Group TrueSpeech"),
 };

libav-v9.6.tar.bz2/libavcodec/tscc.c -> libav-v10.1.tar.bz2/libavcodec/tscc.c Changed

@@ -44,14 +44,9 @@
 
 #include <zlib.h>
 
-
-/*
- * Decoder context
- */
 typedef struct TsccContext {
 
 AVCodecContext *avctx;
- AVFrame pic;
 
 // Bits per pixel
 int bpp;
@@ -66,11 +61,6 @@
 uint32_t pal[256];
 } CamtasiaContext;
 
-/*
- *
- * Decode a frame
- *
- */
 static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
 AVPacket *avpkt)
 {
@@ -78,23 +68,19 @@
 int buf_size = avpkt->size;
 CamtasiaContext * const c = avctx->priv_data;
 const unsigned char *encoded = buf;
+ AVFrame *frame = data;
 int zret; // Zlib return code
- int len = buf_size;
-
- if(c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
+ int ret, len = buf_size;
 
- c->pic.reference = 1;
- c->pic.buffer_hints = FF_BUFFER_HINTS_VALID;
- if(ff_get_buffer(avctx, &c->pic) < 0){
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0){
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 zret = inflateReset(&c->zstream);
 if (zret != Z_OK) {
 av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret);
- return -1;
+ return AVERROR_UNKNOWN;
 }
 c->zstream.next_in = encoded;
 c->zstream.avail_in = len;
@@ -104,14 +90,14 @@
 // Z_DATA_ERROR means empty picture
 if ((zret != Z_OK) && (zret != Z_STREAM_END) && (zret != Z_DATA_ERROR)) {
 av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", zret);
- return -1;
+ return AVERROR_UNKNOWN;
 }
 
 
 if (zret != Z_DATA_ERROR) {
 bytestream2_init(&c->gb, c->decomp_buf,
 c->decomp_size - c->zstream.avail_out);
- ff_msrle_decode(avctx, (AVPicture*)&c->pic, c->bpp, &c->gb);
+ ff_msrle_decode(avctx, (AVPicture*)frame, c->bpp, &c->gb);
 }
 
 /* make the palette available on the way out */
@@ -119,26 +105,18 @@
 const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
 
 if (pal) {
- c->pic.palette_has_changed = 1;
+ frame->palette_has_changed = 1;
 memcpy(c->pal, pal, AVPALETTE_SIZE);
 }
- memcpy(c->pic.data[1], c->pal, AVPALETTE_SIZE);
+ memcpy(frame->data[1], c->pal, AVPALETTE_SIZE);
 }
 
 *got_frame = 1;
- *(AVFrame*)data = c->pic;
 
 /* always report that the buffer was completely consumed */
 return buf_size;
 }
 
-
-
-/*
- *
- * Init tscc decoder
- *
- */
 static av_cold int decode_init(AVCodecContext *avctx)
 {
 CamtasiaContext * const c = avctx->priv_data;
@@ -158,7 +136,7 @@
 break;
 case 32: avctx->pix_fmt = AV_PIX_FMT_RGB32; break;
 default: av_log(avctx, AV_LOG_ERROR, "Camtasia error: unknown depth %i bpp\n", avctx->bits_per_coded_sample);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 c->bpp = avctx->bits_per_coded_sample;
 // buffer size for RLE 'best' case when 2-byte code precedes each pixel and there may be padding after it too
@@ -168,7 +146,7 @@
 if (c->decomp_size) {
 if ((c->decomp_buf = av_malloc(c->decomp_size)) == NULL) {
 av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n");
- return 1;
+ return AVERROR(ENOMEM);
 }
 }
 
@@ -178,27 +156,18 @@
 zret = inflateInit(&c->zstream);
 if (zret != Z_OK) {
 av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret);
- return 1;
+ return AVERROR_UNKNOWN;
 }
 
 return 0;
 }
 
-
-
-/*
- *
- * Uninit tscc decoder
- *
- */
 static av_cold int decode_end(AVCodecContext *avctx)
 {
 CamtasiaContext * const c = avctx->priv_data;
 
 av_freep(&c->decomp_buf);
 
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
 inflateEnd(&c->zstream);
 
 return 0;
@@ -206,6 +175,7 @@
 
 AVCodec ff_tscc_decoder = {
 .name = "camtasia",
+ .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Capture Codec"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_TSCC,
 .priv_data_size = sizeof(CamtasiaContext),
@@ -213,5 +183,4 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Capture Codec"),
 };

libav-v9.6.tar.bz2/libavcodec/tscc2.c -> libav-v10.1.tar.bz2/libavcodec/tscc2.c Changed

@@ -28,11 +28,12 @@
 #include "avcodec.h"
 #include "get_bits.h"
 #include "bytestream.h"
+#include "internal.h"
 #include "tscc2data.h"
 
 typedef struct TSCC2Context {
 AVCodecContext *avctx;
- AVFrame pic;
+ AVFrame *pic;
 int mb_width, mb_height;
 uint8_t *slice_quants;
 int quant[2];
@@ -199,9 +200,9 @@
 if (q == 0 || q == 3) // skip block
 continue;
 for (i = 0; i < 3; i++) {
- off = mb_x * 16 + mb_y * 8 * c->pic.linesize[i];
+ off = mb_x * 16 + mb_y * 8 * c->pic->linesize[i];
 ret = tscc2_decode_mb(c, c->q[q - 1], c->quant[q - 1] - 2,
- c->pic.data[i] + off, c->pic.linesize[i], i);
+ c->pic->data[i] + off, c->pic->linesize[i], i);
 if (ret)
 return ret;
 }
@@ -229,17 +230,15 @@
 return AVERROR_INVALIDDATA;
 }
 
- c->pic.reference = 3;
- c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE |
- FF_BUFFER_HINTS_REUSABLE;
- if ((ret = avctx->reget_buffer(avctx, &c->pic)) < 0) {
+ if ((ret = ff_reget_buffer(avctx, c->pic)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
 return ret;
 }
 
 if (frame_type == 0) {
 *got_frame = 1;
- *(AVFrame*)data = c->pic;
+ if ((ret = av_frame_ref(data, c->pic)) < 0)
+ return ret;
 
 return buf_size;
 }
@@ -323,12 +322,24 @@
 }
 
 *got_frame = 1;
- *(AVFrame*)data = c->pic;
+ if ((ret = av_frame_ref(data, c->pic)) < 0)
+ return ret;
 
 /* always report that the buffer was completely consumed */
 return buf_size;
 }
 
+static av_cold int tscc2_decode_end(AVCodecContext *avctx)
+{
+ TSCC2Context * const c = avctx->priv_data;
+
+ av_frame_free(&c->pic);
+ av_freep(&c->slice_quants);
+ free_vlcs(c);
+
+ return 0;
+}
+
 static av_cold int tscc2_decode_init(AVCodecContext *avctx)
 {
 TSCC2Context * const c = avctx->priv_data;
@@ -352,25 +363,18 @@
 return AVERROR(ENOMEM);
 }
 
- avctx->coded_frame = &c->pic;
-
- return 0;
-}
-
-static av_cold int tscc2_decode_end(AVCodecContext *avctx)
-{
- TSCC2Context * const c = avctx->priv_data;
-
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
- av_freep(&c->slice_quants);
- free_vlcs(c);
+ c->pic = av_frame_alloc();
+ if (!c->pic) {
+ tscc2_decode_end(avctx);
+ return AVERROR(ENOMEM);
+ }
 
 return 0;
 }
 
 AVCodec ff_tscc2_decoder = {
 .name = "tscc2",
+ .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Codec 2"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_TSCC2,
 .priv_data_size = sizeof(TSCC2Context),
@@ -378,5 +382,4 @@
 .close = tscc2_decode_end,
 .decode = tscc2_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Codec 2"),
 };

libav-v9.6.tar.bz2/libavcodec/tta.c -> libav-v10.1.tar.bz2/libavcodec/tta.c Changed

@@ -28,7 +28,6 @@
 */
 
 #define BITSTREAM_READER_LE
-//#define DEBUG
 #include <limits.h>
 #include "avcodec.h"
 #include "get_bits.h"
@@ -58,7 +57,6 @@
 
 typedef struct TTAContext {
 AVCodecContext *avctx;
- AVFrame frame;
 GetBitContext gb;
 const AVCRC *crc_table;
 
@@ -223,7 +221,7 @@
 return -1;
 }
 if (s->format == FORMAT_ENCRYPTED) {
- av_log_missing_feature(s->avctx, "Encrypted TTA", 0);
+ avpriv_report_missing_feature(s->avctx, "Encrypted TTA");
 return AVERROR_PATCHWELCOME;
 }
 avctx->channels = s->channels = get_bits(&s->gb, 16);
@@ -277,7 +275,8 @@
 avctx->extradata_size - 26 < total_frames * 4)
 av_log(avctx, AV_LOG_WARNING, "Seek table missing or too small\n");
 else if (avctx->err_recognition & AV_EF_CRCCHECK) {
- if (tta_check_crc(s, avctx->extradata + 22, total_frames * 4))
+ int ret = tta_check_crc(s, avctx->extradata + 22, total_frames * 4);
+ if (ret < 0 && avctx->err_recognition & AV_EF_EXPLODE)
 return AVERROR_INVALIDDATA;
 }
 skip_bits_long(&s->gb, 32 * total_frames);
@@ -303,15 +302,13 @@
 return -1;
 }
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
 static int tta_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 TTAContext *s = avctx->priv_data;
@@ -320,22 +317,23 @@
 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;
 }
 
 init_get_bits(&s->gb, buf, buf_size*8);
 
 /* get output buffer */
- s->frame.nb_samples = framelen;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = framelen;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
 
 // decode directly to output buffer for 24-bit sample format
 if (s->bps == 3)
- s->decode_buffer = (int32_t *)s->frame.data[0];
+ s->decode_buffer = (int32_t *)frame->data[0];
 
 // init per channel states
 for (i = 0; i < s->channels; i++) {
@@ -424,7 +422,7 @@
 i++;
 // check for last frame
 if (i == s->last_frame_length && get_bits_left(&s->gb) / 8 == 4) {
- s->frame.nb_samples = framelen = s->last_frame_length;
+ frame->nb_samples = framelen = s->last_frame_length;
 break;
 }
 }
@@ -439,20 +437,19 @@
 
 // convert to output buffer
 if (s->bps == 2) {
- int16_t *samples = (int16_t *)s->frame.data[0];
+ int16_t *samples = (int16_t *)frame->data[0];
 for (p = s->decode_buffer; p < s->decode_buffer + (framelen * s->channels); p++)
 *samples++ = *p;
 } else {
 // shift samples for 24-bit sample format
- int32_t *samples = (int32_t *)s->frame.data[0];
+ int32_t *samples = (int32_t *)frame->data[0];
 for (i = 0; i < framelen * s->channels; i++)
 *samples++ <<= 8;
 // reset decode buffer
 s->decode_buffer = NULL;
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
 return buf_size;
 error:
@@ -473,6 +470,7 @@
 
 AVCodec ff_tta_decoder = {
 .name = "tta",
+ .long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_TTA,
 .priv_data_size = sizeof(TTAContext),
@@ -480,5 +478,4 @@
 .close = tta_decode_close,
 .decode = tta_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"),
 };

libav-v9.6.tar.bz2/libavcodec/twinvq.c -> libav-v10.1.tar.bz2/libavcodec/twinvq.c Changed

@@ -19,222 +19,23 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include <math.h>
+#include <stdint.h>
+
 #include "libavutil/channel_layout.h"
 #include "libavutil/float_dsp.h"
 #include "avcodec.h"
-#include "get_bits.h"
-#include "dsputil.h"
 #include "fft.h"
 #include "internal.h"
 #include "lsp.h"
 #include "sinewin.h"
-
-#include <math.h>
-#include <stdint.h>
-
-#include "twinvq_data.h"
-
-enum FrameType {
- FT_SHORT = 0, ///< Short frame (divided in n sub-blocks)
- FT_MEDIUM, ///< Medium frame (divided in m<n sub-blocks)
- FT_LONG, ///< Long frame (single sub-block + PPC)
- FT_PPC, ///< Periodic Peak Component (part of the long frame)
-};
-
-/**
- * Parameters and tables that are different for each frame type
- */
-struct FrameMode {
- uint8_t sub; ///< Number subblocks in each frame
- const uint16_t *bark_tab;
-
- /** number of distinct bark scale envelope values */
- uint8_t bark_env_size;
-
- const int16_t *bark_cb; ///< codebook for the bark scale envelope (BSE)
- uint8_t bark_n_coef;///< number of BSE CB coefficients to read
- uint8_t bark_n_bit; ///< number of bits of the BSE coefs
-
- //@{
- /** main codebooks for spectrum data */
- const int16_t *cb0;
- const int16_t *cb1;
- //@}
-
- uint8_t cb_len_read; ///< number of spectrum coefficients to read
-};
-
-/**
- * Parameters and tables that are different for every combination of
- * bitrate/sample rate
- */
-typedef struct {
- struct FrameMode fmode[3]; ///< frame type-dependant parameters
-
- uint16_t size; ///< frame size in samples
- uint8_t n_lsp; ///< number of lsp coefficients
- const float *lspcodebook;
-
- /* number of bits of the different LSP CB coefficients */
- uint8_t lsp_bit0;
- uint8_t lsp_bit1;
- uint8_t lsp_bit2;
-
- uint8_t lsp_split; ///< number of CB entries for the LSP decoding
- const int16_t *ppc_shape_cb; ///< PPC shape CB
-
- /** number of the bits for the PPC period value */
- uint8_t ppc_period_bit;
-
- uint8_t ppc_shape_bit; ///< number of bits of the PPC shape CB coeffs
- uint8_t ppc_shape_len; ///< size of PPC shape CB
- uint8_t pgain_bit; ///< bits for PPC gain
-
- /** constant for peak period to peak width conversion */
- uint16_t peak_per2wid;
-} ModeTab;
-
-static const ModeTab mode_08_08 = {
- {
- { 8, bark_tab_s08_64, 10, tab.fcb08s , 1, 5, tab.cb0808s0, tab.cb0808s1, 18},
- { 2, bark_tab_m08_256, 20, tab.fcb08m , 2, 5, tab.cb0808m0, tab.cb0808m1, 16},
- { 1, bark_tab_l08_512, 30, tab.fcb08l , 3, 6, tab.cb0808l0, tab.cb0808l1, 17}
- },
- 512 , 12, tab.lsp08, 1, 5, 3, 3, tab.shape08 , 8, 28, 20, 6, 40
-};
-
-static const ModeTab mode_11_08 = {
- {
- { 8, bark_tab_s11_64, 10, tab.fcb11s , 1, 5, tab.cb1108s0, tab.cb1108s1, 29},
- { 2, bark_tab_m11_256, 20, tab.fcb11m , 2, 5, tab.cb1108m0, tab.cb1108m1, 24},
- { 1, bark_tab_l11_512, 30, tab.fcb11l , 3, 6, tab.cb1108l0, tab.cb1108l1, 27}
- },
- 512 , 16, tab.lsp11, 1, 6, 4, 3, tab.shape11 , 9, 36, 30, 7, 90
-};
-
-static const ModeTab mode_11_10 = {
- {
- { 8, bark_tab_s11_64, 10, tab.fcb11s , 1, 5, tab.cb1110s0, tab.cb1110s1, 21},
- { 2, bark_tab_m11_256, 20, tab.fcb11m , 2, 5, tab.cb1110m0, tab.cb1110m1, 18},
- { 1, bark_tab_l11_512, 30, tab.fcb11l , 3, 6, tab.cb1110l0, tab.cb1110l1, 20}
- },
- 512 , 16, tab.lsp11, 1, 6, 4, 3, tab.shape11 , 9, 36, 30, 7, 90
-};
-
-static const ModeTab mode_16_16 = {
- {
- { 8, bark_tab_s16_128, 10, tab.fcb16s , 1, 5, tab.cb1616s0, tab.cb1616s1, 16},
- { 2, bark_tab_m16_512, 20, tab.fcb16m , 2, 5, tab.cb1616m0, tab.cb1616m1, 15},
- { 1, bark_tab_l16_1024,30, tab.fcb16l , 3, 6, tab.cb1616l0, tab.cb1616l1, 16}
- },
- 1024, 16, tab.lsp16, 1, 6, 4, 3, tab.shape16 , 9, 56, 60, 7, 180
-};
-
-static const ModeTab mode_22_20 = {
- {
- { 8, bark_tab_s22_128, 10, tab.fcb22s_1, 1, 6, tab.cb2220s0, tab.cb2220s1, 18},
- { 2, bark_tab_m22_512, 20, tab.fcb22m_1, 2, 6, tab.cb2220m0, tab.cb2220m1, 17},
- { 1, bark_tab_l22_1024,32, tab.fcb22l_1, 4, 6, tab.cb2220l0, tab.cb2220l1, 18}
- },
- 1024, 16, tab.lsp22_1, 1, 6, 4, 3, tab.shape22_1, 9, 56, 36, 7, 144
-};
-
-static const ModeTab mode_22_24 = {
- {
- { 8, bark_tab_s22_128, 10, tab.fcb22s_1, 1, 6, tab.cb2224s0, tab.cb2224s1, 15},
- { 2, bark_tab_m22_512, 20, tab.fcb22m_1, 2, 6, tab.cb2224m0, tab.cb2224m1, 14},
- { 1, bark_tab_l22_1024,32, tab.fcb22l_1, 4, 6, tab.cb2224l0, tab.cb2224l1, 15}
- },
- 1024, 16, tab.lsp22_1, 1, 6, 4, 3, tab.shape22_1, 9, 56, 36, 7, 144
-};
-
-static const ModeTab mode_22_32 = {
- {
- { 4, bark_tab_s22_128, 10, tab.fcb22s_2, 1, 6, tab.cb2232s0, tab.cb2232s1, 11},
- { 2, bark_tab_m22_256, 20, tab.fcb22m_2, 2, 6, tab.cb2232m0, tab.cb2232m1, 11},
- { 1, bark_tab_l22_512, 32, tab.fcb22l_2, 4, 6, tab.cb2232l0, tab.cb2232l1, 12}
- },
- 512 , 16, tab.lsp22_2, 1, 6, 4, 4, tab.shape22_2, 9, 56, 36, 7, 72
-};
-
-static const ModeTab mode_44_40 = {
- {
- {16, bark_tab_s44_128, 10, tab.fcb44s , 1, 6, tab.cb4440s0, tab.cb4440s1, 18},
- { 4, bark_tab_m44_512, 20, tab.fcb44m , 2, 6, tab.cb4440m0, tab.cb4440m1, 17},
- { 1, bark_tab_l44_2048,40, tab.fcb44l , 4, 6, tab.cb4440l0, tab.cb4440l1, 17}
- },
- 2048, 20, tab.lsp44, 1, 6, 4, 4, tab.shape44 , 9, 84, 54, 7, 432
-};
-
-static const ModeTab mode_44_48 = {
- {
- {16, bark_tab_s44_128, 10, tab.fcb44s , 1, 6, tab.cb4448s0, tab.cb4448s1, 15},
- { 4, bark_tab_m44_512, 20, tab.fcb44m , 2, 6, tab.cb4448m0, tab.cb4448m1, 14},
- { 1, bark_tab_l44_2048,40, tab.fcb44l , 4, 6, tab.cb4448l0, tab.cb4448l1, 14}
- },
- 2048, 20, tab.lsp44, 1, 6, 4, 4, tab.shape44 , 9, 84, 54, 7, 432
-};
-
-typedef struct TwinContext {
- AVCodecContext *avctx;
- AVFrame frame;
- DSPContext dsp;
- AVFloatDSPContext fdsp;
- FFTContext mdct_ctx[3];
-
- const ModeTab *mtab;
-
- // history
- float lsp_hist[2][20]; ///< LSP coefficients of the last frame
- float bark_hist[3][2][40]; ///< BSE coefficients of last frame
-
- // bitstream parameters
- int16_t permut[4][4096];
- uint8_t length[4][2]; ///< main codebook stride
- uint8_t length_change[4];
- uint8_t bits_main_spec[2][4][2]; ///< bits for the main codebook
- int bits_main_spec_change[4];
- int n_div[4];
-
- float *spectrum;
- float *curr_frame; ///< non-interleaved output
- float *prev_frame; ///< non-interleaved previous frame
- int last_block_pos[2];
- int discarded_packets;
-
- float *cos_tabs[3];
-
- // scratch buffers
- float *tmp_buf;
-} TwinContext;
-
-#define PPC_SHAPE_CB_SIZE 64
-#define PPC_SHAPE_LEN_MAX 60
-#define SUB_AMP_MAX 4500.0
-#define MULAW_MU 100.0
-#define GAIN_BITS 8
-#define AMP_MAX 13000.0
-#define SUB_GAIN_BITS 5
-#define WINDOW_TYPE_BITS 4
-#define PGAIN_MU 200
-#define LSP_COEFS_MAX 20
-#define LSP_SPLIT_MAX 4
-#define CHANNELS_MAX 2
-#define SUBBLOCKS_MAX 16
-#define BARK_N_COEF_MAX 4
-
-/** @note not speed critical, hence not optimized */
-static void memset_float(float *buf, float val, int size)
-{
- while (size--)
- *buf++ = val;
-}
+#include "twinvq.h"
 
 /**
 * Evaluate a single LPC amplitude spectrum envelope coefficient from the line
 * spectrum pairs.
 *
- * @param lsp a vector of the cosinus of the LSP values
+ * @param lsp a vector of the cosine of the LSP values
 * @param cos_val cos(PI*i/N) where i is the index of the LPC amplitude
 * @param order the order of the LSP (and the size of the *lsp buffer). Must
 * be a multiple of four.
@@ -245,17 +46,17 @@
 static float eval_lpc_spectrum(const float *lsp, float cos_val, int order)
 {
 int j;
- float p = 0.5f;
- float q = 0.5f;
- float two_cos_w = 2.0f*cos_val;
+ float p = 0.5f;
+ float q = 0.5f;
+ float two_cos_w = 2.0f * cos_val;
 
- for (j = 0; j + 1 < order; j += 2*2) {
+ for (j = 0; j + 1 < order; j += 2 * 2) {
 // Unroll the loop once since order is a multiple of four
- q *= lsp[j ] - two_cos_w;
- p *= lsp[j+1] - two_cos_w;
+ q *= lsp[j] - two_cos_w;
+ p *= lsp[j + 1] - two_cos_w;
 
- q *= lsp[j+2] - two_cos_w;
- p *= lsp[j+3] - two_cos_w;
+ q *= lsp[j + 2] - two_cos_w;
+ p *= lsp[j + 3] - two_cos_w;
 }
 
 p *= p * (2.0f - two_cos_w);
@@ -267,34 +68,34 @@
 /**
 * Evaluate the LPC amplitude spectrum envelope from the line spectrum pairs.
 */
-static void eval_lpcenv(TwinContext *tctx, const float *cos_vals, float *lpc)
+static void eval_lpcenv(TwinVQContext *tctx, const float *cos_vals, float *lpc)
 {
 int i;
- const ModeTab *mtab = tctx->mtab;
- int size_s = mtab->size / mtab->fmode[FT_SHORT].sub;
+ const TwinVQModeTab *mtab = tctx->mtab;
+ int size_s = mtab->size / mtab->fmode[TWINVQ_FT_SHORT].sub;
 
- for (i = 0; i < size_s/2; i++) {
+ for (i = 0; i < size_s / 2; i++) {
 float cos_i = tctx->cos_tabs[0][i];
- lpc[i] = eval_lpc_spectrum(cos_vals, cos_i, mtab->n_lsp);
- lpc[size_s-i-1] = eval_lpc_spectrum(cos_vals, -cos_i, mtab->n_lsp);
+ lpc[i] = eval_lpc_spectrum(cos_vals, cos_i, mtab->n_lsp);
+ lpc[size_s - i - 1] = eval_lpc_spectrum(cos_vals, -cos_i, mtab->n_lsp);
 }
 }
 
 static void interpolate(float *out, float v1, float v2, int size)
 {
 int i;
- float step = (v1 - v2)/(size + 1);
+ float step = (v1 - v2) / (size + 1);
 
 for (i = 0; i < size; i++) {
- v2 += step;
+ v2 += step;
 out[i] = v2;
 }
 }
 
 static inline float get_cos(int idx, int part, const float *cos_tab, int size)
 {
- return part ? -cos_tab[size - idx - 1] :
- cos_tab[ idx ];
+ return part ? -cos_tab[size - idx - 1]
+ : cos_tab[idx];
 }
 
 /**
@@ -306,19 +107,19 @@
 * unexplained condition.
 *
 * @param step the size of a block "siiiibiiii"
- * @param in the cosinus of the LSP data
- * @param part is 0 for 0...PI (positive cossinus values) and 1 for PI...2PI
- (negative cossinus values)
+ * @param in the cosine of the LSP data
+ * @param part is 0 for 0...PI (positive cosine values) and 1 for PI...2PI
+ * (negative cosine values)
 * @param size the size of the whole output
 */
-static inline void eval_lpcenv_or_interp(TwinContext *tctx,
- enum FrameType ftype,
+static inline void eval_lpcenv_or_interp(TwinVQContext *tctx,
+ enum TwinVQFrameType ftype,
 float *out, const float *in,
 int size, int step, int part)
 {
 int i;
- const ModeTab *mtab = tctx->mtab;
- const float *cos_tab = tctx->cos_tabs[ftype];
+ const TwinVQModeTab *mtab = tctx->mtab;
+ const float *cos_tab = tctx->cos_tabs[ftype];
 
 // Fill the 's'
 for (i = 0; i < size; i += step)
@@ -328,33 +129,39 @@
 mtab->n_lsp);
 
 // Fill the 'iiiibiiii'
- for (i = step; i <= size - 2*step; i += step) {
- if (out[i + step] + out[i - step] > 1.95*out[i] ||
- out[i + step] >= out[i - step]) {
- interpolate(out + i - step + 1, out[i], out[i-step], step - 1);
+ for (i = step; i <= size - 2 * step; i += step) {
+ if (out[i + step] + out[i - step] > 1.95 * out[i] ||
+ out[i + step] >= out[i - step]) {
+ interpolate(out + i - step + 1, out[i], out[i - step], step - 1);
 } else {
- out[i - step/2] =
+ out[i - step / 2] =
 eval_lpc_spectrum(in,
- get_cos(i-step/2, part, cos_tab, size),
+ get_cos(i - step / 2, part, cos_tab, size),
 mtab->n_lsp);
- interpolate(out + i - step + 1, out[i-step/2], out[i-step ], step/2 - 1);
- interpolate(out + i - step/2 + 1, out[i ], out[i-step/2], step/2 - 1);
+ interpolate(out + i - step + 1, out[i - step / 2],
+ out[i - step], step / 2 - 1);
+ interpolate(out + i - step / 2 + 1, out[i],
+ out[i - step / 2], step / 2 - 1);
 }
 }
 
- interpolate(out + size - 2*step + 1, out[size-step], out[size - 2*step], step - 1);
+ interpolate(out + size - 2 * step + 1, out[size - step],
+ out[size - 2 * step], step - 1);
 }
 
-static void eval_lpcenv_2parts(TwinContext *tctx, enum FrameType ftype,
+static void eval_lpcenv_2parts(TwinVQContext *tctx, enum TwinVQFrameType ftype,
 const float *buf, float *lpc,
 int size, int step)
 {
- eval_lpcenv_or_interp(tctx, ftype, lpc , buf, size/2, step, 0);
- eval_lpcenv_or_interp(tctx, ftype, lpc + size/2, buf, size/2, 2*step, 1);
+ eval_lpcenv_or_interp(tctx, ftype, lpc, buf, size / 2, step, 0);
+ eval_lpcenv_or_interp(tctx, ftype, lpc + size / 2, buf, size / 2,
+ 2 * step, 1);
 
- interpolate(lpc+size/2-step+1, lpc[size/2], lpc[size/2-step], step);
+ interpolate(lpc + size / 2 - step + 1, lpc[size / 2],
+ lpc[size / 2 - step], step);
 
- memset_float(lpc + size - 2*step + 1, lpc[size - 2*step], 2*step - 1);
+ twinvq_memset_float(lpc + size - 2 * step + 1, lpc[size - 2 * step],
+ 2 * step - 1);
 }
 
 /**
@@ -362,8 +169,8 @@
 * bitstream, sum the corresponding vectors and write the result to *out
 * after permutation.
 */
-static void dequant(TwinContext *tctx, GetBitContext *gb, float *out,
- enum FrameType ftype,
+static void dequant(TwinVQContext *tctx, const uint8_t *cb_bits, float *out,
+ enum TwinVQFrameType ftype,
 const int16_t *cb0, const int16_t *cb1, int cb_len)
 {
 int pos = 0;
@@ -378,156 +185,58 @@
 int bitstream_second_part = (i >= tctx->bits_main_spec_change[ftype]);
 
 int bits = tctx->bits_main_spec[0][ftype][bitstream_second_part];
+ tmp0 = *cb_bits++;
 if (bits == 7) {
- if (get_bits1(gb))
+ if (tmp0 & 0x40)
 sign0 = -1;
- bits = 6;
+ tmp0 &= 0x3F;
 }
- tmp0 = get_bits(gb, bits);
 
 bits = tctx->bits_main_spec[1][ftype][bitstream_second_part];
-
+ tmp1 = *cb_bits++;
 if (bits == 7) {
- if (get_bits1(gb))
+ if (tmp1 & 0x40)
 sign1 = -1;
-
- bits = 6;
+ tmp1 &= 0x3F;
 }
- tmp1 = get_bits(gb, bits);
 
- tab0 = cb0 + tmp0*cb_len;
- tab1 = cb1 + tmp1*cb_len;
+ tab0 = cb0 + tmp0 * cb_len;
+ tab1 = cb1 + tmp1 * cb_len;
 
 for (j = 0; j < length; j++)
- out[tctx->permut[ftype][pos+j]] = sign0*tab0[j] + sign1*tab1[j];
+ out[tctx->permut[ftype][pos + j]] = sign0 * tab0[j] +
+ sign1 * tab1[j];
 
 pos += length;
 }
-
-}
-
-static inline float mulawinv(float y, float clip, float mu)
-{
- y = av_clipf(y/clip, -1, 1);
- return clip * FFSIGN(y) * (exp(log(1+mu) * fabs(y)) - 1) / mu;
-}
-
-/**
- * Evaluate a*b/400 rounded to the nearest integer. When, for example,
- * a*b == 200 and the nearest integer is ill-defined, use a table to emulate
- * the following broken float-based implementation used by the binary decoder:
- *
- * @code
- * static int very_broken_op(int a, int b)
- * {
- * static float test; // Ugh, force gcc to do the division first...
- *
- * test = a/400.;
- * return b * test + 0.5;
- * }
- * @endcode
- *
- * @note if this function is replaced by just ROUNDED_DIV(a*b,400.), the stddev
- * between the original file (before encoding with Yamaha encoder) and the
- * decoded output increases, which leads one to believe that the encoder expects
- * exactly this broken calculation.
- */
-static int very_broken_op(int a, int b)
-{
- int x = a*b + 200;
- int size;
- const uint8_t *rtab;
-
- if (x%400 || b%5)
- return x/400;
-
- x /= 400;
-
- size = tabs[b/5].size;
- rtab = tabs[b/5].tab;
- return x - rtab[size*av_log2(2*(x - 1)/size)+(x - 1)%size];
-}
-
-/**
- * Sum to data a periodic peak of a given period, width and shape.
- *
- * @param period the period of the peak divised by 400.0
- */
-static void add_peak(int period, int width, const float *shape,
- float ppc_gain, float *speech, int len)
-{
- int i, j;
-
- const float *shape_end = shape + len;
- int center;
-
- // First peak centered around zero
- for (i = 0; i < width/2; i++)
- speech[i] += ppc_gain * *shape++;
-
- for (i = 1; i < ROUNDED_DIV(len,width) ; i++) {
- center = very_broken_op(period, i);
- for (j = -width/2; j < (width+1)/2; j++)
- speech[j+center] += ppc_gain * *shape++;
- }
-
- // For the last block, be careful not to go beyond the end of the buffer
- center = very_broken_op(period, i);
- for (j = -width/2; j < (width + 1)/2 && shape < shape_end; j++)
- speech[j+center] += ppc_gain * *shape++;
-}
-
-static void decode_ppc(TwinContext *tctx, int period_coef, const float *shape,
- float ppc_gain, float *speech)
-{
- const ModeTab *mtab = tctx->mtab;
- int isampf = tctx->avctx->sample_rate/1000;
- int ibps = tctx->avctx->bit_rate/(1000 * tctx->avctx->channels);
- int min_period = ROUNDED_DIV( 40*2*mtab->size, isampf);
- int max_period = ROUNDED_DIV(6*40*2*mtab->size, isampf);
- int period_range = max_period - min_period;
-
- // This is actually the period multiplied by 400. It is just linearly coded
- // between its maximum and minimum value.
- int period = min_period +
- ROUNDED_DIV(period_coef*period_range, (1 << mtab->ppc_period_bit) - 1);
- int width;
-
- if (isampf == 22 && ibps == 32) {
- // For some unknown reason, NTT decided to code this case differently...
- width = ROUNDED_DIV((period + 800)* mtab->peak_per2wid, 400*mtab->size);
- } else
- width = (period )* mtab->peak_per2wid/(400*mtab->size);
-
- add_peak(period, width, shape, ppc_gain, speech, mtab->ppc_shape_len);
 }
 
-static void dec_gain(TwinContext *tctx, GetBitContext *gb, enum FrameType ftype,
- float *out)
+static void dec_gain(TwinVQContext *tctx,
+ enum TwinVQFrameType ftype, float *out)
 {
- const ModeTab *mtab = tctx->mtab;
+ const TwinVQModeTab *mtab = tctx->mtab;
+ const TwinVQFrameData *bits = &tctx->bits[tctx->cur_frame];
 int i, j;
- int sub = mtab->fmode[ftype].sub;
- float step = AMP_MAX / ((1 << GAIN_BITS) - 1);
- float sub_step = SUB_AMP_MAX / ((1 << SUB_GAIN_BITS) - 1);
+ int sub = mtab->fmode[ftype].sub;
+ float step = TWINVQ_AMP_MAX / ((1 << TWINVQ_GAIN_BITS) - 1);
+ float sub_step = TWINVQ_SUB_AMP_MAX / ((1 << TWINVQ_SUB_GAIN_BITS) - 1);
 
- if (ftype == FT_LONG) {
+ if (ftype == TWINVQ_FT_LONG) {
 for (i = 0; i < tctx->avctx->channels; i++)
- out[i] = (1./(1<<13)) *
- mulawinv(step * 0.5 + step * get_bits(gb, GAIN_BITS),
- AMP_MAX, MULAW_MU);
+ out[i] = (1.0 / (1 << 13)) *
+ twinvq_mulawinv(step * 0.5 + step * bits->gain_bits[i],
+ TWINVQ_AMP_MAX, TWINVQ_MULAW_MU);
 } else {
 for (i = 0; i < tctx->avctx->channels; i++) {
- float val = (1./(1<<23)) *
- mulawinv(step * 0.5 + step * get_bits(gb, GAIN_BITS),
- AMP_MAX, MULAW_MU);
-
- for (j = 0; j < sub; j++) {
- out[i*sub + j] =
- val*mulawinv(sub_step* 0.5 +
- sub_step* get_bits(gb, SUB_GAIN_BITS),
- SUB_AMP_MAX, MULAW_MU);
- }
+ float val = (1.0 / (1 << 23)) *
+ twinvq_mulawinv(step * 0.5 + step * bits->gain_bits[i],
+ TWINVQ_AMP_MAX, TWINVQ_MULAW_MU);
+
+ for (j = 0; j < sub; j++)
+ out[i * sub + j] =
+ val * twinvq_mulawinv(sub_step * 0.5 +
+ sub_step * bits->sub_gain_bits[i * sub + j],
+ TWINVQ_SUB_AMP_MAX, TWINVQ_MULAW_MU);
 }
 }
 }
@@ -543,23 +252,23 @@
 int i;
 float min_dist2 = min_dist * 0.5;
 for (i = 1; i < order; i++)
- if (lsp[i] - lsp[i-1] < min_dist) {
- float avg = (lsp[i] + lsp[i-1]) * 0.5;
+ if (lsp[i] - lsp[i - 1] < min_dist) {
+ float avg = (lsp[i] + lsp[i - 1]) * 0.5;
 
- lsp[i-1] = avg - min_dist2;
- lsp[i ] = avg + min_dist2;
+ lsp[i - 1] = avg - min_dist2;
+ lsp[i] = avg + min_dist2;
 }
 }
 
-static void decode_lsp(TwinContext *tctx, int lpc_idx1, uint8_t *lpc_idx2,
+static void decode_lsp(TwinVQContext *tctx, int lpc_idx1, uint8_t *lpc_idx2,
 int lpc_hist_idx, float *lsp, float *hist)
 {
- const ModeTab *mtab = tctx->mtab;
+ const TwinVQModeTab *mtab = tctx->mtab;
 int i, j;
 
- const float *cb = mtab->lspcodebook;
- const float *cb2 = cb + (1 << mtab->lsp_bit1)*mtab->n_lsp;
- const float *cb3 = cb2 + (1 << mtab->lsp_bit2)*mtab->n_lsp;
+ const float *cb = mtab->lspcodebook;
+ const float *cb2 = cb + (1 << mtab->lsp_bit1) * mtab->n_lsp;
+ const float *cb3 = cb2 + (1 << mtab->lsp_bit2) * mtab->n_lsp;
 
 const int8_t funny_rounding[4] = {
 -2,
@@ -570,17 +279,18 @@
 
 j = 0;
 for (i = 0; i < mtab->lsp_split; i++) {
- int chunk_end = ((i + 1)*mtab->n_lsp + funny_rounding[i])/mtab->lsp_split;
+ int chunk_end = ((i + 1) * mtab->n_lsp + funny_rounding[i]) /
+ mtab->lsp_split;
 for (; j < chunk_end; j++)
- lsp[j] = cb [lpc_idx1 * mtab->n_lsp + j] +
+ lsp[j] = cb[lpc_idx1 * mtab->n_lsp + j] +
 cb2[lpc_idx2[i] * mtab->n_lsp + j];
 }
 
 rearrange_lsp(mtab->n_lsp, lsp, 0.0001);
 
 for (i = 0; i < mtab->n_lsp; i++) {
- float tmp1 = 1. - cb3[lpc_hist_idx*mtab->n_lsp + i];
- float tmp2 = hist[i] * cb3[lpc_hist_idx*mtab->n_lsp + i];
+ float tmp1 = 1.0 - cb3[lpc_hist_idx * mtab->n_lsp + i];
+ float tmp2 = hist[i] * cb3[lpc_hist_idx * mtab->n_lsp + i];
 hist[i] = lsp[i];
 lsp[i] = lsp[i] * tmp1 + tmp2;
 }
@@ -590,97 +300,94 @@
 ff_sort_nearly_sorted_floats(lsp, mtab->n_lsp);
 }
 
-static void dec_lpc_spectrum_inv(TwinContext *tctx, float *lsp,
- enum FrameType ftype, float *lpc)
+static void dec_lpc_spectrum_inv(TwinVQContext *tctx, float *lsp,
+ enum TwinVQFrameType ftype, float *lpc)
 {
 int i;
 int size = tctx->mtab->size / tctx->mtab->fmode[ftype].sub;
 
 for (i = 0; i < tctx->mtab->n_lsp; i++)
- lsp[i] = 2*cos(lsp[i]);
+ lsp[i] = 2 * cos(lsp[i]);
 
 switch (ftype) {
- case FT_LONG:
+ case TWINVQ_FT_LONG:
 eval_lpcenv_2parts(tctx, ftype, lsp, lpc, size, 8);
 break;
- case FT_MEDIUM:
+ case TWINVQ_FT_MEDIUM:
 eval_lpcenv_2parts(tctx, ftype, lsp, lpc, size, 2);
 break;
- case FT_SHORT:
+ case TWINVQ_FT_SHORT:
 eval_lpcenv(tctx, lsp, lpc);
 break;
 }
 }
 
-static void imdct_and_window(TwinContext *tctx, enum FrameType ftype, int wtype,
- float *in, float *prev, int ch)
+static const uint8_t wtype_to_wsize[] = { 0, 0, 2, 2, 2, 1, 0, 1, 1 };
+
+static void imdct_and_window(TwinVQContext *tctx, enum TwinVQFrameType ftype,
+ int wtype, float *in, float *prev, int ch)
 {
 FFTContext *mdct = &tctx->mdct_ctx[ftype];
- const ModeTab *mtab = tctx->mtab;
+ const TwinVQModeTab *mtab = tctx->mtab;
 int bsize = mtab->size / mtab->fmode[ftype].sub;
 int size = mtab->size;
 float *buf1 = tctx->tmp_buf;
- int j;
- int wsize; // Window size
- float *out = tctx->curr_frame + 2*ch*mtab->size;
+ int j, first_wsize, wsize; // Window size
+ float *out = tctx->curr_frame + 2 * ch * mtab->size;
 float *out2 = out;
 float *prev_buf;
- int first_wsize;
-
- static const uint8_t wtype_to_wsize[] = {0, 0, 2, 2, 2, 1, 0, 1, 1};
 int types_sizes[] = {
- mtab->size / mtab->fmode[FT_LONG ].sub,
- mtab->size / mtab->fmode[FT_MEDIUM].sub,
- mtab->size / (2*mtab->fmode[FT_SHORT ].sub),
+ mtab->size / mtab->fmode[TWINVQ_FT_LONG].sub,
+ mtab->size / mtab->fmode[TWINVQ_FT_MEDIUM].sub,
+ mtab->size / (mtab->fmode[TWINVQ_FT_SHORT].sub * 2),
 };
 
- wsize = types_sizes[wtype_to_wsize[wtype]];
+ wsize = types_sizes[wtype_to_wsize[wtype]];
 first_wsize = wsize;
- prev_buf = prev + (size - bsize)/2;
+ prev_buf = prev + (size - bsize) / 2;
 
 for (j = 0; j < mtab->fmode[ftype].sub; j++) {
- int sub_wtype = ftype == FT_MEDIUM ? 8 : wtype;
+ int sub_wtype = ftype == TWINVQ_FT_MEDIUM ? 8 : wtype;
 
 if (!j && wtype == 4)
 sub_wtype = 4;
- else if (j == mtab->fmode[ftype].sub-1 && wtype == 7)
+ else if (j == mtab->fmode[ftype].sub - 1 && wtype == 7)
 sub_wtype = 7;
 
 wsize = types_sizes[wtype_to_wsize[sub_wtype]];
 
- mdct->imdct_half(mdct, buf1 + bsize*j, in + bsize*j);
+ mdct->imdct_half(mdct, buf1 + bsize * j, in + bsize * j);
 
- tctx->dsp.vector_fmul_window(out2,
- prev_buf + (bsize-wsize)/2,
- buf1 + bsize*j,
- ff_sine_windows[av_log2(wsize)],
- wsize/2);
+ tctx->fdsp.vector_fmul_window(out2, prev_buf + (bsize - wsize) / 2,
+ buf1 + bsize * j,
+ ff_sine_windows[av_log2(wsize)],
+ wsize / 2);
 out2 += wsize;
 
- memcpy(out2, buf1 + bsize*j + wsize/2, (bsize - wsize/2)*sizeof(float));
+ memcpy(out2, buf1 + bsize * j + wsize / 2,
+ (bsize - wsize / 2) * sizeof(float));
 
- out2 += ftype == FT_MEDIUM ? (bsize-wsize)/2 : bsize - wsize;
+ out2 += ftype == TWINVQ_FT_MEDIUM ? (bsize - wsize) / 2 : bsize - wsize;
 
- prev_buf = buf1 + bsize*j + bsize/2;
+ prev_buf = buf1 + bsize * j + bsize / 2;
 }
 
- tctx->last_block_pos[ch] = (size + first_wsize)/2;
+ tctx->last_block_pos[ch] = (size + first_wsize) / 2;
 }
 
-static void imdct_output(TwinContext *tctx, enum FrameType ftype, int wtype,
- float **out)
+static void imdct_output(TwinVQContext *tctx, enum TwinVQFrameType ftype,
+ int wtype, float **out, int offset)
 {
- const ModeTab *mtab = tctx->mtab;
- int size1, size2;
- float *prev_buf = tctx->prev_frame + tctx->last_block_pos[0];
- int i;
+ 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++) {
+ for (i = 0; i < tctx->avctx->channels; i++)
 imdct_and_window(tctx, ftype, wtype,
- tctx->spectrum + i*mtab->size,
- prev_buf + 2*i*mtab->size,
+ tctx->spectrum + i * mtab->size,
+ prev_buf + 2 * i * mtab->size,
 i);
- }
 
 if (!out)
 return;
@@ -688,118 +395,68 @@
 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->dsp.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);
 }
 }
 
-static void dec_bark_env(TwinContext *tctx, const uint8_t *in, int use_hist,
- int ch, float *out, float gain, enum FrameType ftype)
-{
- const ModeTab *mtab = tctx->mtab;
- int i,j;
- float *hist = tctx->bark_hist[ftype][ch];
- float val = ((const float []) {0.4, 0.35, 0.28})[ftype];
- int bark_n_coef = mtab->fmode[ftype].bark_n_coef;
- int fw_cb_len = mtab->fmode[ftype].bark_env_size / bark_n_coef;
- int idx = 0;
-
- for (i = 0; i < fw_cb_len; i++)
- for (j = 0; j < bark_n_coef; j++, idx++) {
- float tmp2 =
- mtab->fmode[ftype].bark_cb[fw_cb_len*in[j] + i] * (1./4096);
- float st = use_hist ?
- (1. - val) * tmp2 + val*hist[idx] + 1. : tmp2 + 1.;
-
- hist[idx] = tmp2;
- if (st < -1.) st = 1.;
-
- memset_float(out, st * gain, mtab->fmode[ftype].bark_tab[idx]);
- out += mtab->fmode[ftype].bark_tab[idx];
- }
-
-}
-
-static void read_and_decode_spectrum(TwinContext *tctx, GetBitContext *gb,
- float *out, enum FrameType ftype)
+static void read_and_decode_spectrum(TwinVQContext *tctx, float *out,
+ enum TwinVQFrameType ftype)
 {
- const ModeTab *mtab = tctx->mtab;
- int channels = tctx->avctx->channels;
- int sub = mtab->fmode[ftype].sub;
+ const TwinVQModeTab *mtab = tctx->mtab;
+ TwinVQFrameData *bits = &tctx->bits[tctx->cur_frame];
+ int channels = tctx->avctx->channels;
+ int sub = mtab->fmode[ftype].sub;
 int block_size = mtab->size / sub;
- float gain[CHANNELS_MAX*SUBBLOCKS_MAX];
- float ppc_shape[PPC_SHAPE_LEN_MAX * CHANNELS_MAX * 4];
- uint8_t bark1[CHANNELS_MAX][SUBBLOCKS_MAX][BARK_N_COEF_MAX];
- uint8_t bark_use_hist[CHANNELS_MAX][SUBBLOCKS_MAX];
-
- uint8_t lpc_idx1[CHANNELS_MAX];
- uint8_t lpc_idx2[CHANNELS_MAX][LSP_SPLIT_MAX];
- uint8_t lpc_hist_idx[CHANNELS_MAX];
+ float gain[TWINVQ_CHANNELS_MAX * TWINVQ_SUBBLOCKS_MAX];
+ float ppc_shape[TWINVQ_PPC_SHAPE_LEN_MAX * TWINVQ_CHANNELS_MAX * 4];
 
- int i, j, k;
+ int i, j;
 
- dequant(tctx, gb, out, ftype,
+ dequant(tctx, bits->main_coeffs, out, ftype,
 mtab->fmode[ftype].cb0, mtab->fmode[ftype].cb1,
 mtab->fmode[ftype].cb_len_read);
 
- for (i = 0; i < channels; i++)
- for (j = 0; j < sub; j++)
- for (k = 0; k < mtab->fmode[ftype].bark_n_coef; k++)
- bark1[i][j][k] =
- get_bits(gb, mtab->fmode[ftype].bark_n_bit);
-
- for (i = 0; i < channels; i++)
- for (j = 0; j < sub; j++)
- bark_use_hist[i][j] = get_bits1(gb);
-
- dec_gain(tctx, gb, ftype, gain);
-
- for (i = 0; i < channels; i++) {
- lpc_hist_idx[i] = get_bits(gb, tctx->mtab->lsp_bit0);
- lpc_idx1 [i] = get_bits(gb, tctx->mtab->lsp_bit1);
-
- for (j = 0; j < tctx->mtab->lsp_split; j++)
- lpc_idx2[i][j] = get_bits(gb, tctx->mtab->lsp_bit2);
- }
+ dec_gain(tctx, ftype, gain);
 
- if (ftype == FT_LONG) {
- int cb_len_p = (tctx->n_div[3] + mtab->ppc_shape_len*channels - 1)/
- tctx->n_div[3];
- dequant(tctx, gb, ppc_shape, FT_PPC, mtab->ppc_shape_cb,
- mtab->ppc_shape_cb + cb_len_p*PPC_SHAPE_CB_SIZE, cb_len_p);
+ if (ftype == TWINVQ_FT_LONG) {
+ int cb_len_p = (tctx->n_div[3] + mtab->ppc_shape_len * channels - 1) /
+ tctx->n_div[3];
+ dequant(tctx, bits->ppc_coeffs, ppc_shape,
+ TWINVQ_FT_PPC, mtab->ppc_shape_cb,
+ mtab->ppc_shape_cb + cb_len_p * TWINVQ_PPC_SHAPE_CB_SIZE,
+ cb_len_p);
 }
 
 for (i = 0; i < channels; i++) {
 float *chunk = out + mtab->size * i;
- float lsp[LSP_COEFS_MAX];
+ float lsp[TWINVQ_LSP_COEFS_MAX];
 
 for (j = 0; j < sub; j++) {
- dec_bark_env(tctx, bark1[i][j], bark_use_hist[i][j], i,
- tctx->tmp_buf, gain[sub*i+j], ftype);
+ tctx->dec_bark_env(tctx, bits->bark1[i][j],
+ bits->bark_use_hist[i][j], i,
+ tctx->tmp_buf, gain[sub * i + j], ftype);
 
- tctx->fdsp.vector_fmul(chunk + block_size*j, chunk + block_size*j,
+ tctx->fdsp.vector_fmul(chunk + block_size * j,
+ chunk + block_size * j,
 tctx->tmp_buf, block_size);
-
 }
 
- if (ftype == FT_LONG) {
- float pgain_step = 25000. / ((1 << mtab->pgain_bit) - 1);
- int p_coef = get_bits(gb, tctx->mtab->ppc_period_bit);
- int g_coef = get_bits(gb, tctx->mtab->pgain_bit);
- float v = 1./8192*
- mulawinv(pgain_step*g_coef+ pgain_step/2, 25000., PGAIN_MU);
+ if (ftype == TWINVQ_FT_LONG)
+ tctx->decode_ppc(tctx, bits->p_coef[i], bits->g_coef[i],
+ ppc_shape + i * mtab->ppc_shape_len, chunk);
 
- decode_ppc(tctx, p_coef, ppc_shape + i*mtab->ppc_shape_len, v,
- chunk);
- }
-
- decode_lsp(tctx, lpc_idx1[i], lpc_idx2[i], lpc_hist_idx[i], lsp,
- tctx->lsp_hist[i]);
+ decode_lsp(tctx, bits->lpc_idx1[i], bits->lpc_idx2[i],
+ bits->lpc_hist_idx[i], lsp, tctx->lsp_hist[i]);
 
 dec_lpc_spectrum_inv(tctx, lsp, ftype, tctx->tmp_buf);
 
@@ -810,54 +467,53 @@
 }
 }
 
-static int twin_decode_frame(AVCodecContext * avctx, void *data,
- int *got_frame_ptr, AVPacket *avpkt)
+const enum TwinVQFrameType ff_twinvq_wtype_to_ftype_table[] = {
+ TWINVQ_FT_LONG, TWINVQ_FT_LONG, TWINVQ_FT_SHORT, TWINVQ_FT_LONG,
+ TWINVQ_FT_MEDIUM, TWINVQ_FT_LONG, TWINVQ_FT_LONG, TWINVQ_FT_MEDIUM,
+ TWINVQ_FT_MEDIUM
+};
+
+int ff_twinvq_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- TwinContext *tctx = avctx->priv_data;
- GetBitContext gb;
- const ModeTab *mtab = tctx->mtab;
+ int buf_size = avpkt->size;
+ TwinVQContext *tctx = avctx->priv_data;
+ const TwinVQModeTab *mtab = tctx->mtab;
 float **out = NULL;
- enum FrameType ftype;
- int window_type, ret;
- static const enum FrameType wtype_to_ftype_table[] = {
- FT_LONG, FT_LONG, FT_SHORT, FT_LONG,
- FT_MEDIUM, FT_LONG, FT_LONG, FT_MEDIUM, FT_MEDIUM
- };
-
- if (buf_size*8 < avctx->bit_rate*mtab->size/avctx->sample_rate + 8) {
- av_log(avctx, AV_LOG_ERROR,
- "Frame too small (%d bytes). Truncated file?\n", buf_size);
- return AVERROR(EINVAL);
- }
+ int ret;
 
 /* get output buffer */
 if (tctx->discarded_packets >= 2) {
- tctx->frame.nb_samples = mtab->size;
- if ((ret = ff_get_buffer(avctx, &tctx->frame)) < 0) {
+ frame->nb_samples = mtab->size * tctx->frames_per_packet;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- out = (float **)tctx->frame.extended_data;
+ out = (float **)frame->extended_data;
 }
 
- init_get_bits(&gb, buf, buf_size * 8);
- skip_bits(&gb, get_bits(&gb, 8));
- window_type = get_bits(&gb, WINDOW_TYPE_BITS);
-
- if (window_type > 8) {
- av_log(avctx, AV_LOG_ERROR, "Invalid window type, broken sample?\n");
- return -1;
+ if (buf_size < avctx->block_align) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Frame too small (%d bytes). Truncated file?\n", buf_size);
+ return AVERROR(EINVAL);
 }
 
- ftype = wtype_to_ftype_table[window_type];
+ if ((ret = tctx->read_bitstream(avctx, tctx, buf, buf_size)) < 0)
+ return ret;
 
- read_and_decode_spectrum(tctx, &gb, tctx->spectrum, 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, ftype, 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++;
@@ -865,28 +521,30 @@
 return buf_size;
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = tctx->frame;;
+ *got_frame_ptr = 1;
 
- return buf_size;
+ // VQF can deliver packets 1 byte greater than block align
+ if (buf_size == avctx->block_align + 1)
+ return buf_size;
+ return avctx->block_align;
 }
 
 /**
 * Init IMDCT and windowing tables
 */
-static av_cold int init_mdct_win(TwinContext *tctx)
+static av_cold int init_mdct_win(TwinVQContext *tctx)
 {
 int i, j, ret;
- const ModeTab *mtab = tctx->mtab;
- int size_s = mtab->size / mtab->fmode[FT_SHORT].sub;
- int size_m = mtab->size / mtab->fmode[FT_MEDIUM].sub;
+ const TwinVQModeTab *mtab = tctx->mtab;
+ int size_s = mtab->size / mtab->fmode[TWINVQ_FT_SHORT].sub;
+ int size_m = mtab->size / mtab->fmode[TWINVQ_FT_MEDIUM].sub;
 int channels = tctx->avctx->channels;
- float norm = channels == 1 ? 2. : 1.;
+ float norm = channels == 1 ? 2.0 : 1.0;
 
 for (i = 0; i < 3; i++) {
- int bsize = tctx->mtab->size/tctx->mtab->fmode[i].sub;
+ int bsize = tctx->mtab->size / tctx->mtab->fmode[i].sub;
 if ((ret = ff_mdct_init(&tctx->mdct_ctx[i], av_log2(bsize) + 1, 1,
- -sqrt(norm/bsize) / (1<<15))))
+ -sqrt(norm / bsize) / (1 << 15))))
 return ret;
 }
 
@@ -904,23 +562,23 @@
 alloc_fail);
 
 for (i = 0; i < 3; i++) {
- int m = 4*mtab->size/mtab->fmode[i].sub;
- double freq = 2*M_PI/m;
+ int m = 4 * mtab->size / mtab->fmode[i].sub;
+ double freq = 2 * M_PI / m;
 FF_ALLOC_OR_GOTO(tctx->avctx, tctx->cos_tabs[i],
 (m / 4) * sizeof(*tctx->cos_tabs[i]), alloc_fail);
 
- for (j = 0; j <= m/8; j++)
- tctx->cos_tabs[i][j] = cos((2*j + 1)*freq);
- for (j = 1; j < m/8; j++)
- tctx->cos_tabs[i][m/4-j] = tctx->cos_tabs[i][j];
+ for (j = 0; j <= m / 8; j++)
+ tctx->cos_tabs[i][j] = cos((2 * j + 1) * freq);
+ for (j = 1; j < m / 8; j++)
+ tctx->cos_tabs[i][m / 4 - j] = tctx->cos_tabs[i][j];
 }
 
-
 ff_init_ff_sine_windows(av_log2(size_m));
- ff_init_ff_sine_windows(av_log2(size_s/2));
+ ff_init_ff_sine_windows(av_log2(size_s / 2));
 ff_init_ff_sine_windows(av_log2(mtab->size));
 
 return 0;
+
 alloc_fail:
 return AVERROR(ENOMEM);
 }
@@ -934,26 +592,25 @@
 static void permutate_in_line(int16_t *tab, int num_vect, int num_blocks,
 int block_size,
 const uint8_t line_len[2], int length_div,
- enum FrameType ftype)
-
+ enum TwinVQFrameType ftype)
 {
- int i,j;
+ int i, j;
 
 for (i = 0; i < line_len[0]; i++) {
 int shift;
 
- if (num_blocks == 1 ||
- (ftype == FT_LONG && num_vect % num_blocks) ||
- (ftype != FT_LONG && num_vect & 1 ) ||
+ if (num_blocks == 1 ||
+ (ftype == TWINVQ_FT_LONG && num_vect % num_blocks) ||
+ (ftype != TWINVQ_FT_LONG && num_vect & 1) ||
 i == line_len[1]) {
 shift = 0;
- } else if (ftype == FT_LONG) {
+ } else if (ftype == TWINVQ_FT_LONG) {
 shift = i;
 } else
- shift = i*i;
+ shift = i * i;
 
- for (j = 0; j < num_vect && (j+num_vect*i < block_size*num_blocks); j++)
- tab[i*num_vect+j] = i*num_vect + (j + shift) % num_vect;
+ for (j = 0; j < num_vect && (j + num_vect * i < block_size * num_blocks); j++)
+ tab[i * num_vect + j] = i * num_vect + (j + shift) % num_vect;
 }
 }
 
@@ -975,31 +632,32 @@
 static void transpose_perm(int16_t *out, int16_t *in, int num_vect,
 const uint8_t line_len[2], int length_div)
 {
- int i,j;
- int cont= 0;
+ int i, j;
+ int cont = 0;
+
 for (i = 0; i < num_vect; i++)
 for (j = 0; j < line_len[i >= length_div]; j++)
- out[cont++] = in[j*num_vect + i];
+ out[cont++] = in[j * num_vect + i];
 }
 
 static void linear_perm(int16_t *out, int16_t *in, int n_blocks, int size)
 {
- int block_size = size/n_blocks;
+ int block_size = size / n_blocks;
 int i;
 
 for (i = 0; i < size; i++)
 out[i] = block_size * (in[i] % n_blocks) + in[i] / n_blocks;
 }
 
-static av_cold void construct_perm_table(TwinContext *tctx,enum FrameType ftype)
+static av_cold void construct_perm_table(TwinVQContext *tctx,
+ enum TwinVQFrameType ftype)
 {
- int block_size;
- const ModeTab *mtab = tctx->mtab;
- int size;
- int16_t *tmp_perm = (int16_t *) tctx->tmp_buf;
+ int block_size, size;
+ const TwinVQModeTab *mtab = tctx->mtab;
+ int16_t *tmp_perm = (int16_t *)tctx->tmp_buf;
 
- if (ftype == FT_PPC) {
- size = tctx->avctx->channels;
+ if (ftype == TWINVQ_FT_PPC) {
+ size = tctx->avctx->channels;
 block_size = mtab->ppc_shape_len;
 } else {
 size = tctx->avctx->channels * mtab->fmode[ftype].sub;
@@ -1014,81 +672,87 @@
 tctx->length[ftype], tctx->length_change[ftype]);
 
 linear_perm(tctx->permut[ftype], tctx->permut[ftype], size,
- size*block_size);
+ size * block_size);
 }
 
-static av_cold void init_bitstream_params(TwinContext *tctx)
+static av_cold void init_bitstream_params(TwinVQContext *tctx)
 {
- const ModeTab *mtab = tctx->mtab;
- int n_ch = tctx->avctx->channels;
- int total_fr_bits = tctx->avctx->bit_rate*mtab->size/
- tctx->avctx->sample_rate;
+ const TwinVQModeTab *mtab = tctx->mtab;
+ int n_ch = tctx->avctx->channels;
+ int total_fr_bits = tctx->avctx->bit_rate * mtab->size /
+ tctx->avctx->sample_rate;
 
- int lsp_bits_per_block = n_ch*(mtab->lsp_bit0 + mtab->lsp_bit1 +
- mtab->lsp_split*mtab->lsp_bit2);
+ int lsp_bits_per_block = n_ch * (mtab->lsp_bit0 + mtab->lsp_bit1 +
+ mtab->lsp_split * mtab->lsp_bit2);
 
- int ppc_bits = n_ch*(mtab->pgain_bit + mtab->ppc_shape_bit +
- mtab->ppc_period_bit);
+ int ppc_bits = n_ch * (mtab->pgain_bit + mtab->ppc_shape_bit +
+ mtab->ppc_period_bit);
 
- int bsize_no_main_cb[3];
- int bse_bits[3];
- int i;
- enum FrameType frametype;
+ int bsize_no_main_cb[3], bse_bits[3], i;
+ enum TwinVQFrameType frametype;
 
 for (i = 0; i < 3; i++)
 // +1 for history usage switch
 bse_bits[i] = n_ch *
- (mtab->fmode[i].bark_n_coef * mtab->fmode[i].bark_n_bit + 1);
+ (mtab->fmode[i].bark_n_coef *
+ mtab->fmode[i].bark_n_bit + 1);
 
 bsize_no_main_cb[2] = bse_bits[2] + lsp_bits_per_block + ppc_bits +
- WINDOW_TYPE_BITS + n_ch*GAIN_BITS;
+ TWINVQ_WINDOW_TYPE_BITS + n_ch * TWINVQ_GAIN_BITS;
 
 for (i = 0; i < 2; i++)
 bsize_no_main_cb[i] =
- lsp_bits_per_block + n_ch*GAIN_BITS + WINDOW_TYPE_BITS +
- mtab->fmode[i].sub*(bse_bits[i] + n_ch*SUB_GAIN_BITS);
+ lsp_bits_per_block + n_ch * TWINVQ_GAIN_BITS +
+ TWINVQ_WINDOW_TYPE_BITS +
+ mtab->fmode[i].sub * (bse_bits[i] + n_ch * TWINVQ_SUB_GAIN_BITS);
+
+ if (tctx->codec == TWINVQ_CODEC_METASOUND && !tctx->is_6kbps) {
+ bsize_no_main_cb[1] += 2;
+ bsize_no_main_cb[2] += 2;
+ }
 
 // The remaining bits are all used for the main spectrum coefficients
 for (i = 0; i < 4; i++) {
- int bit_size;
- int vect_size;
+ int bit_size, vect_size;
 int rounded_up, rounded_down, num_rounded_down, num_rounded_up;
 if (i == 3) {
 bit_size = n_ch * mtab->ppc_shape_bit;
 vect_size = n_ch * mtab->ppc_shape_len;
 } else {
- bit_size = total_fr_bits - bsize_no_main_cb[i];
+ bit_size = total_fr_bits - bsize_no_main_cb[i];
 vect_size = n_ch * mtab->size;
 }
 
 tctx->n_div[i] = (bit_size + 13) / 14;
 
- rounded_up = (bit_size + tctx->n_div[i] - 1)/tctx->n_div[i];
- rounded_down = (bit_size )/tctx->n_div[i];
- num_rounded_down = rounded_up * tctx->n_div[i] - bit_size;
- num_rounded_up = tctx->n_div[i] - num_rounded_down;
- tctx->bits_main_spec[0][i][0] = (rounded_up + 1)/2;
- tctx->bits_main_spec[1][i][0] = (rounded_up )/2;
- tctx->bits_main_spec[0][i][1] = (rounded_down + 1)/2;
- tctx->bits_main_spec[1][i][1] = (rounded_down )/2;
+ rounded_up = (bit_size + tctx->n_div[i] - 1) /
+ tctx->n_div[i];
+ rounded_down = (bit_size) / tctx->n_div[i];
+ num_rounded_down = rounded_up * tctx->n_div[i] - bit_size;
+ num_rounded_up = tctx->n_div[i] - num_rounded_down;
+ tctx->bits_main_spec[0][i][0] = (rounded_up + 1) / 2;
+ tctx->bits_main_spec[1][i][0] = rounded_up / 2;
+ tctx->bits_main_spec[0][i][1] = (rounded_down + 1) / 2;
+ tctx->bits_main_spec[1][i][1] = rounded_down / 2;
 tctx->bits_main_spec_change[i] = num_rounded_up;
 
- rounded_up = (vect_size + tctx->n_div[i] - 1)/tctx->n_div[i];
- rounded_down = (vect_size )/tctx->n_div[i];
- num_rounded_down = rounded_up * tctx->n_div[i] - vect_size;
- num_rounded_up = tctx->n_div[i] - num_rounded_down;
- tctx->length[i][0] = rounded_up;
- tctx->length[i][1] = rounded_down;
+ rounded_up = (vect_size + tctx->n_div[i] - 1) /
+ tctx->n_div[i];
+ rounded_down = (vect_size) / tctx->n_div[i];
+ num_rounded_down = rounded_up * tctx->n_div[i] - vect_size;
+ num_rounded_up = tctx->n_div[i] - num_rounded_down;
+ tctx->length[i][0] = rounded_up;
+ tctx->length[i][1] = rounded_down;
 tctx->length_change[i] = num_rounded_up;
 }
 
- for (frametype = FT_SHORT; frametype <= FT_PPC; frametype++)
+ for (frametype = TWINVQ_FT_SHORT; frametype <= TWINVQ_FT_PPC; frametype++)
 construct_perm_table(tctx, frametype);
 }
 
-static av_cold int twin_decode_close(AVCodecContext *avctx)
+av_cold int ff_twinvq_decode_close(AVCodecContext *avctx)
 {
- TwinContext *tctx = avctx->priv_data;
+ TwinVQContext *tctx = avctx->priv_data;
 int i;
 
 for (i = 0; i < 3; i++) {
@@ -1096,7 +760,6 @@
 av_free(tctx->cos_tabs[i]);
 }
 
-
 av_free(tctx->curr_frame);
 av_free(tctx->spectrum);
 av_free(tctx->prev_frame);
@@ -1105,86 +768,38 @@
 return 0;
 }
 
-static av_cold int twin_decode_init(AVCodecContext *avctx)
+av_cold int ff_twinvq_decode_init(AVCodecContext *avctx)
 {
 int ret;
- TwinContext *tctx = avctx->priv_data;
- int isampf, ibps;
+ TwinVQContext *tctx = avctx->priv_data;
 
 tctx->avctx = avctx;
 avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
 
- if (!avctx->extradata || avctx->extradata_size < 12) {
- av_log(avctx, AV_LOG_ERROR, "Missing or incomplete extradata\n");
+ 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;
 }
- avctx->channels = AV_RB32(avctx->extradata ) + 1;
- avctx->bit_rate = AV_RB32(avctx->extradata + 4) * 1000;
- isampf = AV_RB32(avctx->extradata + 8);
-
- if (isampf < 8 || isampf > 44) {
- av_log(avctx, AV_LOG_ERROR, "Unsupported sample rate\n");
+ 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;
 }
- switch (isampf) {
- case 44: avctx->sample_rate = 44100; break;
- case 22: avctx->sample_rate = 22050; break;
- case 11: avctx->sample_rate = 11025; break;
- default: avctx->sample_rate = isampf * 1000; break;
- }
-
- if (avctx->channels <= 0 || avctx->channels > CHANNELS_MAX) {
- av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels: %i\n",
- avctx->channels);
- return -1;
- }
- avctx->channel_layout = avctx->channels == 1 ? AV_CH_LAYOUT_MONO :
- AV_CH_LAYOUT_STEREO;
-
- ibps = avctx->bit_rate / (1000 * avctx->channels);
-
- switch ((isampf << 8) + ibps) {
- case (8 <<8) + 8: tctx->mtab = &mode_08_08; break;
- case (11<<8) + 8: tctx->mtab = &mode_11_08; break;
- case (11<<8) + 10: tctx->mtab = &mode_11_10; break;
- case (16<<8) + 16: tctx->mtab = &mode_16_16; break;
- case (22<<8) + 20: tctx->mtab = &mode_22_20; break;
- case (22<<8) + 24: tctx->mtab = &mode_22_24; break;
- case (22<<8) + 32: tctx->mtab = &mode_22_32; break;
- case (44<<8) + 40: tctx->mtab = &mode_44_40; break;
- case (44<<8) + 48: tctx->mtab = &mode_44_48; break;
- default:
- av_log(avctx, AV_LOG_ERROR, "This version does not support %d kHz - %d kbit/s/ch mode.\n", isampf, isampf);
- return -1;
- }
 
- ff_dsputil_init(&tctx->dsp, avctx);
 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");
- twin_decode_close(avctx);
+ ff_twinvq_decode_close(avctx);
 return ret;
 }
 init_bitstream_params(tctx);
 
- memset_float(tctx->bark_hist[0][0], 0.1, FF_ARRAY_ELEMS(tctx->bark_hist));
-
- avcodec_get_frame_defaults(&tctx->frame);
- avctx->coded_frame = &tctx->frame;
+ twinvq_memset_float(tctx->bark_hist[0][0], 0.1,
+ FF_ARRAY_ELEMS(tctx->bark_hist));
 
 return 0;
 }
-
-AVCodec ff_twinvq_decoder = {
- .name = "twinvq",
- .type = AVMEDIA_TYPE_AUDIO,
- .id = AV_CODEC_ID_TWINVQ,
- .priv_data_size = sizeof(TwinContext),
- .init = twin_decode_init,
- .close = twin_decode_close,
- .decode = twin_decode_frame,
- .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("VQF TwinVQ"),
- .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
- AV_SAMPLE_FMT_NONE },
-};

libav-v10.1.tar.bz2/libavcodec/twinvq.h Added

@@ -0,0 +1,203 @@
+/*
+ * TwinVQ decoder
+ * Copyright (c) 2009 Vitor Sessak
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_TWINVQ_H
+#define AVCODEC_TWINVQ_H
+
+#include <math.h>
+#include <stdint.h>
+
+#include "libavutil/common.h"
+#include "libavutil/float_dsp.h"
+#include "avcodec.h"
+#include "fft.h"
+#include "internal.h"
+
+enum TwinVQCodec {
+ TWINVQ_CODEC_VQF,
+ TWINVQ_CODEC_METASOUND,
+};
+
+enum TwinVQFrameType {
+ TWINVQ_FT_SHORT = 0, ///< Short frame (divided in n sub-blocks)
+ TWINVQ_FT_MEDIUM, ///< Medium frame (divided in m<n sub-blocks)
+ TWINVQ_FT_LONG, ///< Long frame (single sub-block + PPC)
+ TWINVQ_FT_PPC, ///< Periodic Peak Component (part of the long frame)
+};
+
+#define TWINVQ_PPC_SHAPE_CB_SIZE 64
+#define TWINVQ_PPC_SHAPE_LEN_MAX 60
+#define TWINVQ_SUB_AMP_MAX 4500.0
+#define TWINVQ_MULAW_MU 100.0
+#define TWINVQ_GAIN_BITS 8
+#define TWINVQ_AMP_MAX 13000.0
+#define TWINVQ_SUB_GAIN_BITS 5
+#define TWINVQ_WINDOW_TYPE_BITS 4
+#define TWINVQ_PGAIN_MU 200
+#define TWINVQ_LSP_COEFS_MAX 20
+#define TWINVQ_LSP_SPLIT_MAX 4
+#define TWINVQ_CHANNELS_MAX 2
+#define TWINVQ_SUBBLOCKS_MAX 16
+#define TWINVQ_BARK_N_COEF_MAX 4
+
+#define TWINVQ_MAX_FRAMES_PER_PACKET 2
+
+/**
+ * Parameters and tables that are different for each frame type
+ */
+struct TwinVQFrameMode {
+ uint8_t sub; ///< Number subblocks in each frame
+ const uint16_t *bark_tab;
+
+ /** number of distinct bark scale envelope values */
+ uint8_t bark_env_size;
+
+ const int16_t *bark_cb; ///< codebook for the bark scale envelope (BSE)
+ uint8_t bark_n_coef;///< number of BSE CB coefficients to read
+ uint8_t bark_n_bit; ///< number of bits of the BSE coefs
+
+ //@{
+ /** main codebooks for spectrum data */
+ const int16_t *cb0;
+ const int16_t *cb1;
+ //@}
+
+ uint8_t cb_len_read; ///< number of spectrum coefficients to read
+};
+
+typedef struct TwinVQFrameData {
+ int window_type;
+ enum TwinVQFrameType ftype;
+
+ uint8_t main_coeffs[1024];
+ uint8_t ppc_coeffs[TWINVQ_PPC_SHAPE_LEN_MAX];
+
+ uint8_t gain_bits[TWINVQ_CHANNELS_MAX];
+ uint8_t sub_gain_bits[TWINVQ_CHANNELS_MAX * TWINVQ_SUBBLOCKS_MAX];
+
+ uint8_t bark1[TWINVQ_CHANNELS_MAX][TWINVQ_SUBBLOCKS_MAX][TWINVQ_BARK_N_COEF_MAX];
+ uint8_t bark_use_hist[TWINVQ_CHANNELS_MAX][TWINVQ_SUBBLOCKS_MAX];
+
+ uint8_t lpc_idx1[TWINVQ_CHANNELS_MAX];
+ uint8_t lpc_idx2[TWINVQ_CHANNELS_MAX][TWINVQ_LSP_SPLIT_MAX];
+ uint8_t lpc_hist_idx[TWINVQ_CHANNELS_MAX];
+
+ int p_coef[TWINVQ_CHANNELS_MAX];
+ int g_coef[TWINVQ_CHANNELS_MAX];
+} TwinVQFrameData;
+
+/**
+ * Parameters and tables that are different for every combination of
+ * bitrate/sample rate
+ */
+typedef struct TwinVQModeTab {
+ struct TwinVQFrameMode fmode[3]; ///< frame type-dependant parameters
+
+ uint16_t size; ///< frame size in samples
+ uint8_t n_lsp; ///< number of lsp coefficients
+ const float *lspcodebook;
+
+ /* number of bits of the different LSP CB coefficients */
+ uint8_t lsp_bit0;
+ uint8_t lsp_bit1;
+ uint8_t lsp_bit2;
+
+ uint8_t lsp_split; ///< number of CB entries for the LSP decoding
+ const int16_t *ppc_shape_cb; ///< PPC shape CB
+
+ /** number of the bits for the PPC period value */
+ uint8_t ppc_period_bit;
+
+ uint8_t ppc_shape_bit; ///< number of bits of the PPC shape CB coeffs
+ uint8_t ppc_shape_len; ///< size of PPC shape CB
+ uint8_t pgain_bit; ///< bits for PPC gain
+
+ /** constant for peak period to peak width conversion */
+ uint16_t peak_per2wid;
+} TwinVQModeTab;
+
+typedef struct TwinVQContext {
+ AVCodecContext *avctx;
+ AVFloatDSPContext fdsp;
+ FFTContext mdct_ctx[3];
+
+ const TwinVQModeTab *mtab;
+
+ int is_6kbps;
+
+ // history
+ float lsp_hist[2][20]; ///< LSP coefficients of the last frame
+ float bark_hist[3][2][40]; ///< BSE coefficients of last frame
+
+ // bitstream parameters
+ int16_t permut[4][4096];
+ uint8_t length[4][2]; ///< main codebook stride
+ uint8_t length_change[4];
+ uint8_t bits_main_spec[2][4][2]; ///< bits for the main codebook
+ int bits_main_spec_change[4];
+ int n_div[4];
+
+ float *spectrum;
+ float *curr_frame; ///< non-interleaved output
+ float *prev_frame; ///< non-interleaved previous frame
+ int last_block_pos[2];
+ int discarded_packets;
+
+ float *cos_tabs[3];
+
+ // scratch buffers
+ float *tmp_buf;
+
+ int frame_size, frames_per_packet, cur_frame;
+ TwinVQFrameData bits[TWINVQ_MAX_FRAMES_PER_PACKET];
+
+ enum TwinVQCodec codec;
+
+ int (*read_bitstream)(AVCodecContext *avctx, struct TwinVQContext *tctx,
+ const uint8_t *buf, int buf_size);
+ void (*dec_bark_env)(struct TwinVQContext *tctx, const uint8_t *in,
+ int use_hist, int ch, float *out, float gain,
+ enum TwinVQFrameType ftype);
+ void (*decode_ppc)(struct TwinVQContext *tctx, int period_coef, int g_coef,
+ const float *shape, float *speech);
+} TwinVQContext;
+
+extern const enum TwinVQFrameType ff_twinvq_wtype_to_ftype_table[];
+
+/** @note not speed critical, hence not optimized */
+static inline void twinvq_memset_float(float *buf, float val, int size)
+{
+ while (size--)
+ *buf++ = val;
+}
+
+static inline float twinvq_mulawinv(float y, float clip, float mu)
+{
+ y = av_clipf(y / clip, -1, 1);
+ return clip * FFSIGN(y) * (exp(log(1 + mu) * fabs(y)) - 1) / mu;
+}
+
+int ff_twinvq_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, AVPacket *avpkt);
+av_cold int ff_twinvq_decode_close(AVCodecContext *avctx);
+av_cold int ff_twinvq_decode_init(AVCodecContext *avctx);
+
+#endif /* AVCODEC_TWINVQ_DATA_H */

libav-v9.6.tar.bz2/libavcodec/twinvq_data.h -> libav-v10.1.tar.bz2/libavcodec/twinvq_data.h Changed

@@ -39,95 +39,94 @@
  * for some slightly nonconventional bark-scale function
  */
 static const uint16_t bark_tab_l08_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
+     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_l11_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
+     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_l16_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
+     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_l22_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
+      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_l22_512[] = {
-    3,     3,     3,     4,     3,     3,     4,     3,     4,     4,
-    4,     5,     4,     5,     6,     6,     7,     7,     8,     9,
-   10,    12,    14,    16,    20,    22,    28,    34,    42,    53,
-   71,    95
+     3,  3,  3,  4,  3,  3,  4,  3,  4,  4,
+     4,  5,  4,  5,  6,  6,  7,  7,  8,  9,
+    10, 12, 14, 16, 20, 22, 28, 34, 42, 53,
+    71, 95
 };
 
 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,    64,    79,    98,   123,   161,   220,   320,   512
+     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, 64, 79, 98, 123, 161, 220, 320, 512
 };
 
 static const uint16_t bark_tab_m08_256[] = {
-    6,     5,     6,     6,     6,     6,     7,     7,     8,     8,
-    9,    10,    11,    13,    15,    18,    20,    25,    31,    39
+    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_m11_256[] = {
-    4,     5,     4,     5,     5,     5,     6,     5,     7,     7,
-    8,     9,    10,    12,    15,    17,    22,    28,    35,    47
+    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_m16_512[] = {
-    7,     6,     7,     7,     7,     8,     9,     9,    10,    11,
-   14,    15,    18,    22,    27,    34,    44,    59,    81,   117
+     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_m22_256[] = {
-    3,     2,     3,     2,     3,     3,     4,     3,     4,     5,
-    5,     7,     8,     9,    13,    16,    22,    30,    44,    70
+    3, 2, 3, 2,  3,  3,  4,  3,  4,  5,
+    5, 7, 8, 9, 13, 16, 22, 30, 44, 70
 };
 
 static const uint16_t bark_tab_m22_512[] = {
-    5,     5,     5,     6,     5,     7,     6,     7,     9,     9,
-   11,    13,    15,    20,    24,    33,    43,    61,    88,   140
+     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_m44_512[] = {
-    3,     2,     3,     3,     3,     4,     3,     5,     4,     6,
-    7,     8,    10,    14,    18,    25,    36,    55,    95,   208
+    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_s08_64[] = {
-    3,     3,     3,     3,     4,     5,     6,     8,    12,    17
+    3, 3, 3, 3, 4, 5, 6, 8, 12, 17
 };
 
 static const uint16_t bark_tab_s11_64[] = {
-    2,     3,     2,     3,     3,     4,     6,     8,    12,    21
+    2, 3, 2, 3, 3, 4, 6, 8, 12, 21
 };
 
 static const uint16_t bark_tab_s16_128[] = {
-    3,     4,     4,     4,     5,     7,    10,    16,    26,    49
+    3, 4, 4, 4, 5, 7, 10, 16, 26, 49
 };
 
 static const uint16_t bark_tab_s22_128[] = {
-    3,     2,     3,     4,     4,     6,     9,    14,    26,    57
+    3, 2, 3, 4, 4, 6, 9, 14, 26, 57
 };
 
 static const uint16_t bark_tab_s44_128[] = {
-    1,     2,     1,     2,     3,     4,     6,    10,    23,    76
+    1, 2, 1, 2, 3, 4, 6, 10, 23, 76
 };
 
-
 /**
  * TwinVQ codebooks. They are coded in a struct so we can use code such as
  *
@@ -10991,147 +10990,155 @@
     },
 };
 
-
 static const uint8_t tab7[][35] = {
-    {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,0,0,0,0,0,1,0,0,0},
-    {0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0},
-    {0,0,0,1,0,0,0,0,0,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,0},
-    {0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0},
-    {0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0},
-    {0,0,0,1,0,0,0,0,0,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,0},
-    {0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0},
-    {0,0,1,0,1,0,0,1,0,1,0,0,1,0,1,0,0,1,0,1,0,0,1,0,1,0,0,1,0,1,0,0,1,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,0,0,0,1,0,0,0,0,0,0,0,0},
-    {0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,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, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1,
+      0, 0, 0 },
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+      0, 0, 0 },
+    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 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, 0 },
+    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1,
+      0, 0, 0 },
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+      0, 0, 0 },
+    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 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, 0 },
+    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0 },
+    { 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0,
+      0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0,
+      1, 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, 0, 0, 0, 1, 0, 0, 0, 0, 0,
+      0, 0, 0 },
+    { 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0 }
 };
 
 static const uint8_t tab8[][5] = {
-    {0, 0, 0, 1, 1},
-    {0, 1, 0, 0, 1},
-    {1, 1, 0, 0, 0},
-    {1, 0, 0, 1, 0},
-    {0, 0, 0, 1, 1},
-    {0, 1, 0, 0, 1},
-    {1, 1, 0, 0, 0},
-    {1, 0, 0, 1, 0},
-    {0, 0, 0, 1, 1},
-    {0, 1, 0, 0, 1},
-    {1, 1, 0, 0, 0},
-    {0, 0, 0, 0, 0},
-    {0, 1, 0, 1, 0}
+    { 0, 0, 0, 1, 1 },
+    { 0, 1, 0, 0, 1 },
+    { 1, 1, 0, 0, 0 },
+    { 1, 0, 0, 1, 0 },
+    { 0, 0, 0, 1, 1 },
+    { 0, 1, 0, 0, 1 },
+    { 1, 1, 0, 0, 0 },
+    { 1, 0, 0, 1, 0 },
+    { 0, 0, 0, 1, 1 },
+    { 0, 1, 0, 0, 1 },
+    { 1, 1, 0, 0, 0 },
+    { 0, 0, 0, 0, 0 },
+    { 0, 1, 0, 1, 0 }
 };
 
 static const uint8_t tab9[][45] = {
-    {
-     0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0
-    },{
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 1, 0, 0, 0, 0
-    },{
-     0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0
-    },{
-     0, 0, 0, 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, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-     0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0
-    },{
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 1, 0, 0, 0, 0
-    },{
-     0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0
-    },{
-     0, 0, 0, 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, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },{
-     0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1,
-     1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0
-    },{
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
-     0, 0, 0, 0, 1, 0, 0, 1, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 1, 0, 0, 0, 0 },
+    { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { 0, 0, 0, 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, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 1, 0, 0, 0, 0 },
+    { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { 0, 0, 0, 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, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1,
+      1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0 },
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-static const uint8_t tab10[][25] =
-{
-    {1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0},
-    {1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0},
-    {1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0},
-    {1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},
-    {0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1},
-    {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1},
-    {1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0},
-    {0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1}
+static const uint8_t tab10[][25] = {
+    { 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0,
+      0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0 },
+    { 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0,
+      0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 },
+    { 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
+      0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0 },
+    { 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,
+      0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 },
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+    { 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
+      0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1 },
+    { 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1,
+      0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1 },
+    { 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1,
+      0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0 },
+    { 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0,
+      0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1 }
 };
 
 static const uint8_t tab11[][55] = {
-    {
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 1, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0
-    },{
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
-    },{
-        0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    },{
-        0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
-    },{
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
-    },{
-        0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    },{
-        0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    },{
-        0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        1, 0, 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, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0 },
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, },
+    { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
+    { 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, },
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, },
+    { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
+    { 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
+    { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, }
 };
 
 static const uint8_t tab12[][15] = {
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0},
-    {0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
-    {0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0},
-    {0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
-    {0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0},
-    {0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1},
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0 },
+    { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+    { 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0 },
+    { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+    { 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0 },
+    { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1 },
 };
 
 static const struct {
     int size;
     const uint8_t *tab;
 } tabs[] = {
-    {0 , NULL},
-    {5 , &tab8 [0][0]},{5 , &tab8 [0][0]}, {15, &tab12[0][0]},
-    {5 , &tab8 [0][0]},{25, &tab10[0][0]}, {15, &tab12[0][0]},
-    {35, &tab7 [0][0]},{5 , &tab8 [0][0]}, {45, &tab9 [0][0]},
-    {25, &tab10[0][0]},{55, &tab11[0][0]}, {15, &tab12[0][0]}
+    {  0, NULL         },
+    {  5, &tab8[0][0]  }, {  5, &tab8[0][0]  }, { 15, &tab12[0][0] },
+    {  5, &tab8[0][0]  }, { 25, &tab10[0][0] }, { 15, &tab12[0][0] },
+    { 35, &tab7[0][0]  }, {  5, &tab8[0][0]  }, { 45, &tab9[0][0]  },
+    { 25, &tab10[0][0] }, { 55, &tab11[0][0] }, { 15, &tab12[0][0] }
 };
 
 #endif /* AVCODEC_TWINVQ_DATA_H */

libav-v10.1.tar.bz2/libavcodec/twinvqdec.c Added

@@ -0,0 +1,427 @@
+/*
+ * TwinVQ decoder
+ * Copyright (c) 2009 Vitor Sessak
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <math.h>
+#include <stdint.h>
+
+#include "libavutil/channel_layout.h"
+#include "avcodec.h"
+#include "get_bits.h"
+#include "internal.h"
+#include "twinvq.h"
+#include "twinvq_data.h"
+
+static const TwinVQModeTab mode_08_08 = {
+ {
+ { 8, bark_tab_s08_64, 10, tab.fcb08s, 1, 5, tab.cb0808s0, tab.cb0808s1, 18 },
+ { 2, bark_tab_m08_256, 20, tab.fcb08m, 2, 5, tab.cb0808m0, tab.cb0808m1, 16 },
+ { 1, bark_tab_l08_512, 30, tab.fcb08l, 3, 6, tab.cb0808l0, tab.cb0808l1, 17 }
+ },
+ 512, 12, tab.lsp08, 1, 5, 3, 3, tab.shape08, 8, 28, 20, 6, 40
+};
+
+static const TwinVQModeTab mode_11_08 = {
+ {
+ { 8, bark_tab_s11_64, 10, tab.fcb11s, 1, 5, tab.cb1108s0, tab.cb1108s1, 29 },
+ { 2, bark_tab_m11_256, 20, tab.fcb11m, 2, 5, tab.cb1108m0, tab.cb1108m1, 24 },
+ { 1, bark_tab_l11_512, 30, tab.fcb11l, 3, 6, tab.cb1108l0, tab.cb1108l1, 27 }
+ },
+ 512, 16, tab.lsp11, 1, 6, 4, 3, tab.shape11, 9, 36, 30, 7, 90
+};
+
+static const TwinVQModeTab mode_11_10 = {
+ {
+ { 8, bark_tab_s11_64, 10, tab.fcb11s, 1, 5, tab.cb1110s0, tab.cb1110s1, 21 },
+ { 2, bark_tab_m11_256, 20, tab.fcb11m, 2, 5, tab.cb1110m0, tab.cb1110m1, 18 },
+ { 1, bark_tab_l11_512, 30, tab.fcb11l, 3, 6, tab.cb1110l0, tab.cb1110l1, 20 }
+ },
+ 512, 16, tab.lsp11, 1, 6, 4, 3, tab.shape11, 9, 36, 30, 7, 90
+};
+
+static const TwinVQModeTab mode_16_16 = {
+ {
+ { 8, bark_tab_s16_128, 10, tab.fcb16s, 1, 5, tab.cb1616s0, tab.cb1616s1, 16 },
+ { 2, bark_tab_m16_512, 20, tab.fcb16m, 2, 5, tab.cb1616m0, tab.cb1616m1, 15 },
+ { 1, bark_tab_l16_1024, 30, tab.fcb16l, 3, 6, tab.cb1616l0, tab.cb1616l1, 16 }
+ },
+ 1024, 16, tab.lsp16, 1, 6, 4, 3, tab.shape16, 9, 56, 60, 7, 180
+};
+
+static const TwinVQModeTab mode_22_20 = {
+ {
+ { 8, bark_tab_s22_128, 10, tab.fcb22s_1, 1, 6, tab.cb2220s0, tab.cb2220s1, 18 },
+ { 2, bark_tab_m22_512, 20, tab.fcb22m_1, 2, 6, tab.cb2220m0, tab.cb2220m1, 17 },
+ { 1, bark_tab_l22_1024, 32, tab.fcb22l_1, 4, 6, tab.cb2220l0, tab.cb2220l1, 18 }
+ },
+ 1024, 16, tab.lsp22_1, 1, 6, 4, 3, tab.shape22_1, 9, 56, 36, 7, 144
+};
+
+static const TwinVQModeTab mode_22_24 = {
+ {
+ { 8, bark_tab_s22_128, 10, tab.fcb22s_1, 1, 6, tab.cb2224s0, tab.cb2224s1, 15 },
+ { 2, bark_tab_m22_512, 20, tab.fcb22m_1, 2, 6, tab.cb2224m0, tab.cb2224m1, 14 },
+ { 1, bark_tab_l22_1024, 32, tab.fcb22l_1, 4, 6, tab.cb2224l0, tab.cb2224l1, 15 }
+ },
+ 1024, 16, tab.lsp22_1, 1, 6, 4, 3, tab.shape22_1, 9, 56, 36, 7, 144
+};
+
+static const TwinVQModeTab mode_22_32 = {
+ {
+ { 4, bark_tab_s22_128, 10, tab.fcb22s_2, 1, 6, tab.cb2232s0, tab.cb2232s1, 11 },
+ { 2, bark_tab_m22_256, 20, tab.fcb22m_2, 2, 6, tab.cb2232m0, tab.cb2232m1, 11 },
+ { 1, bark_tab_l22_512, 32, tab.fcb22l_2, 4, 6, tab.cb2232l0, tab.cb2232l1, 12 }
+ },
+ 512, 16, tab.lsp22_2, 1, 6, 4, 4, tab.shape22_2, 9, 56, 36, 7, 72
+};
+
+static const TwinVQModeTab mode_44_40 = {
+ {
+ { 16, bark_tab_s44_128, 10, tab.fcb44s, 1, 6, tab.cb4440s0, tab.cb4440s1, 18 },
+ { 4, bark_tab_m44_512, 20, tab.fcb44m, 2, 6, tab.cb4440m0, tab.cb4440m1, 17 },
+ { 1, bark_tab_l44_2048, 40, tab.fcb44l, 4, 6, tab.cb4440l0, tab.cb4440l1, 17 }
+ },
+ 2048, 20, tab.lsp44, 1, 6, 4, 4, tab.shape44, 9, 84, 54, 7, 432
+};
+
+static const TwinVQModeTab mode_44_48 = {
+ {
+ { 16, bark_tab_s44_128, 10, tab.fcb44s, 1, 6, tab.cb4448s0, tab.cb4448s1, 15 },
+ { 4, bark_tab_m44_512, 20, tab.fcb44m, 2, 6, tab.cb4448m0, tab.cb4448m1, 14 },
+ { 1, bark_tab_l44_2048, 40, tab.fcb44l, 4, 6, tab.cb4448l0, tab.cb4448l1, 14 }
+ },
+ 2048, 20, tab.lsp44, 1, 6, 4, 4, tab.shape44, 9, 84, 54, 7, 432
+};
+
+/**
+ * Evaluate a * b / 400 rounded to the nearest integer. When, for example,
+ * a * b == 200 and the nearest integer is ill-defined, use a table to emulate
+ * the following broken float-based implementation used by the binary decoder:
+ *
+ * @code
+ * static int very_broken_op(int a, int b)
+ * {
+ * static float test; // Ugh, force gcc to do the division first...
+ *
+ * test = a / 400.0;
+ * return b * test + 0.5;
+ * }
+ * @endcode
+ *
+ * @note if this function is replaced by just ROUNDED_DIV(a * b, 400.0), the
+ * stddev between the original file (before encoding with Yamaha encoder) and
+ * the decoded output increases, which leads one to believe that the encoder
+ * expects exactly this broken calculation.
+ */
+static int very_broken_op(int a, int b)
+{
+ int x = a * b + 200;
+ int size;
+ const uint8_t *rtab;
+
+ if (x % 400 || b % 5)
+ return x / 400;
+
+ x /= 400;
+
+ size = tabs[b / 5].size;
+ rtab = tabs[b / 5].tab;
+ return x - rtab[size * av_log2(2 * (x - 1) / size) + (x - 1) % size];
+}
+
+/**
+ * Sum to data a periodic peak of a given period, width and shape.
+ *
+ * @param period the period of the peak divised by 400.0
+ */
+static void add_peak(int period, int width, const float *shape,
+ float ppc_gain, float *speech, int len)
+{
+ int i, j;
+
+ const float *shape_end = shape + len;
+ int center;
+
+ // First peak centered around zero
+ for (i = 0; i < width / 2; i++)
+ speech[i] += ppc_gain * *shape++;
+
+ for (i = 1; i < ROUNDED_DIV(len, width); i++) {
+ center = very_broken_op(period, i);
+ for (j = -width / 2; j < (width + 1) / 2; j++)
+ speech[j + center] += ppc_gain * *shape++;
+ }
+
+ // For the last block, be careful not to go beyond the end of the buffer
+ center = very_broken_op(period, i);
+ for (j = -width / 2; j < (width + 1) / 2 && shape < shape_end; j++)
+ speech[j + center] += ppc_gain * *shape++;
+}
+
+static void decode_ppc(TwinVQContext *tctx, int period_coef, int g_coef,
+ const float *shape, float *speech)
+{
+ const TwinVQModeTab *mtab = tctx->mtab;
+ int isampf = tctx->avctx->sample_rate / 1000;
+ int ibps = tctx->avctx->bit_rate / (1000 * tctx->avctx->channels);
+ int min_period = ROUNDED_DIV(40 * 2 * mtab->size, isampf);
+ int max_period = ROUNDED_DIV(40 * 2 * mtab->size * 6, isampf);
+ int period_range = max_period - min_period;
+ float pgain_step = 25000.0 / ((1 << mtab->pgain_bit) - 1);
+ float ppc_gain = 1.0 / 8192 *
+ twinvq_mulawinv(pgain_step * g_coef +
+ pgain_step / 2,
+ 25000.0, TWINVQ_PGAIN_MU);
+
+ // This is actually the period multiplied by 400. It is just linearly coded
+ // between its maximum and minimum value.
+ int period = min_period +
+ ROUNDED_DIV(period_coef * period_range,
+ (1 << mtab->ppc_period_bit) - 1);
+ int width;
+
+ if (isampf == 22 && ibps == 32) {
+ // For some unknown reason, NTT decided to code this case differently...
+ width = ROUNDED_DIV((period + 800) * mtab->peak_per2wid,
+ 400 * mtab->size);
+ } else
+ width = period * mtab->peak_per2wid / (400 * mtab->size);
+
+ add_peak(period, width, shape, ppc_gain, speech, mtab->ppc_shape_len);
+}
+
+static void dec_bark_env(TwinVQContext *tctx, const uint8_t *in, int use_hist,
+ int ch, float *out, float gain,
+ enum TwinVQFrameType ftype)
+{
+ const TwinVQModeTab *mtab = tctx->mtab;
+ int i, j;
+ float *hist = tctx->bark_hist[ftype][ch];
+ float val = ((const float []) { 0.4, 0.35, 0.28 })[ftype];
+ int bark_n_coef = mtab->fmode[ftype].bark_n_coef;
+ int fw_cb_len = mtab->fmode[ftype].bark_env_size / bark_n_coef;
+ int idx = 0;
+
+ for (i = 0; i < fw_cb_len; i++)
+ for (j = 0; j < bark_n_coef; j++, idx++) {
+ float tmp2 = mtab->fmode[ftype].bark_cb[fw_cb_len * in[j] + i] *
+ (1.0 / 4096);
+ float st = use_hist ? (1.0 - val) * tmp2 + val * hist[idx] + 1.0
+ : tmp2 + 1.0;
+
+ hist[idx] = tmp2;
+ if (st < -1.0)
+ st = 1.0;
+
+ twinvq_memset_float(out, st * gain, mtab->fmode[ftype].bark_tab[idx]);
+ out += mtab->fmode[ftype].bark_tab[idx];
+ }
+}
+
+static void read_cb_data(TwinVQContext *tctx, GetBitContext *gb,
+ uint8_t *dst, enum TwinVQFrameType ftype)
+{
+ int i;
+
+ for (i = 0; i < tctx->n_div[ftype]; i++) {
+ int bs_second_part = (i >= tctx->bits_main_spec_change[ftype]);
+
+ *dst++ = get_bits(gb, tctx->bits_main_spec[0][ftype][bs_second_part]);
+ *dst++ = get_bits(gb, tctx->bits_main_spec[1][ftype][bs_second_part]);
+ }
+}
+
+static int twinvq_read_bitstream(AVCodecContext *avctx, TwinVQContext *tctx,
+ const uint8_t *buf, int buf_size)
+{
+ TwinVQFrameData *bits = &tctx->bits[0];
+ const TwinVQModeTab *mtab = tctx->mtab;
+ int channels = tctx->avctx->channels;
+ int sub;
+ GetBitContext gb;
+ int i, j, k;
+
+ init_get_bits(&gb, buf, buf_size * 8);
+ skip_bits(&gb, get_bits(&gb, 8));
+
+ bits->window_type = get_bits(&gb, TWINVQ_WINDOW_TYPE_BITS);
+
+ if (bits->window_type > 8) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid window type, broken sample?\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ bits->ftype = ff_twinvq_wtype_to_ftype_table[tctx->bits[0].window_type];
+
+ sub = mtab->fmode[bits->ftype].sub;
+
+ read_cb_data(tctx, &gb, bits->main_coeffs, bits->ftype);
+
+ 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);
+
+ for (i = 0; i < channels; i++)
+ for (j = 0; j < sub; j++)
+ 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 (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);
+ }
+ }
+
+ return 0;
+}
+
+static av_cold int twinvq_decode_init(AVCodecContext *avctx)
+{
+ int isampf, ibps;
+ TwinVQContext *tctx = avctx->priv_data;
+
+ if (!avctx->extradata || avctx->extradata_size < 12) {
+ av_log(avctx, AV_LOG_ERROR, "Missing or incomplete extradata\n");
+ return AVERROR_INVALIDDATA;
+ }
+ avctx->channels = AV_RB32(avctx->extradata) + 1;
+ avctx->bit_rate = AV_RB32(avctx->extradata + 4) * 1000;
+ isampf = AV_RB32(avctx->extradata + 8);
+
+ if (isampf < 8 || isampf > 44) {
+ av_log(avctx, AV_LOG_ERROR, "Unsupported sample rate\n");
+ return AVERROR_INVALIDDATA;
+ }
+ switch (isampf) {
+ case 44:
+ avctx->sample_rate = 44100;
+ break;
+ case 22:
+ avctx->sample_rate = 22050;
+ break;
+ case 11:
+ avctx->sample_rate = 11025;
+ break;
+ default:
+ avctx->sample_rate = isampf * 1000;
+ break;
+ }
+
+ if (avctx->channels <= 0 || avctx->channels > TWINVQ_CHANNELS_MAX) {
+ av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels: %i\n",
+ avctx->channels);
+ return -1;
+ }
+ avctx->channel_layout = avctx->channels == 1 ? AV_CH_LAYOUT_MONO
+ : AV_CH_LAYOUT_STEREO;
+
+ ibps = avctx->bit_rate / (1000 * avctx->channels);
+ if (ibps < 8 || ibps > 48) {
+ av_log(avctx, AV_LOG_ERROR, "Bad bitrate per channel value %d\n", ibps);
+ return AVERROR_INVALIDDATA;
+ }
+
+ switch ((isampf << 8) + ibps) {
+ case (8 << 8) + 8:
+ tctx->mtab = &mode_08_08;
+ break;
+ case (11 << 8) + 8:
+ tctx->mtab = &mode_11_08;
+ break;
+ case (11 << 8) + 10:
+ tctx->mtab = &mode_11_10;
+ break;
+ case (16 << 8) + 16:
+ tctx->mtab = &mode_16_16;
+ break;
+ case (22 << 8) + 20:
+ tctx->mtab = &mode_22_20;
+ break;
+ case (22 << 8) + 24:
+ tctx->mtab = &mode_22_24;
+ break;
+ case (22 << 8) + 32:
+ tctx->mtab = &mode_22_32;
+ break;
+ case (44 << 8) + 40:
+ tctx->mtab = &mode_44_40;
+ break;
+ case (44 << 8) + 48:
+ tctx->mtab = &mode_44_48;
+ break;
+ default:
+ av_log(avctx, AV_LOG_ERROR,
+ "This version does not support %d kHz - %d kbit/s/ch mode.\n",
+ isampf, isampf);
+ return -1;
+ }
+
+ 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);
+}
+
+AVCodec ff_twinvq_decoder = {
+ .name = "twinvq",
+ .long_name = NULL_IF_CONFIG_SMALL("VQF TwinVQ"),
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = AV_CODEC_ID_TWINVQ,
+ .priv_data_size = sizeof(TwinVQContext),
+ .init = twinvq_decode_init,
+ .close = ff_twinvq_decode_close,
+ .decode = ff_twinvq_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
+ AV_SAMPLE_FMT_NONE },
+};

libav-v9.6.tar.bz2/libavcodec/txd.c -> libav-v10.1.tar.bz2/libavcodec/txd.c Changed

@@ -28,29 +28,15 @@
 #include "internal.h"
 #include "s3tc.h"
 
-typedef struct TXDContext {
- AVFrame picture;
-} TXDContext;
-
-static av_cold int txd_init(AVCodecContext *avctx) {
- TXDContext *s = avctx->priv_data;
-
- avcodec_get_frame_defaults(&s->picture);
- avctx->coded_frame = &s->picture;
-
- return 0;
-}
-
 static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
 AVPacket *avpkt) {
- TXDContext * const s = avctx->priv_data;
 GetByteContext gb;
- AVFrame *picture = data;
- AVFrame * const p = &s->picture;
+ AVFrame * const p = data;
 unsigned int version, w, h, d3d_format, depth, stride, flags;
 unsigned int y, v;
 uint8_t *ptr;
 uint32_t *pal;
+ int ret;
 
 bytestream2_init(&gb, avpkt->data, avpkt->size);
 version = bytestream2_get_le32(&gb);
@@ -65,7 +51,7 @@
 if (version < 8 || version > 9) {
 av_log(avctx, AV_LOG_ERROR, "texture data version %i is unsupported\n",
 version);
- return -1;
+ return AVERROR_PATCHWELCOME;
 }
 
 if (depth == 8) {
@@ -74,19 +60,15 @@
 avctx->pix_fmt = AV_PIX_FMT_RGB32;
 } else {
 av_log(avctx, AV_LOG_ERROR, "depth of %i is unsupported\n", depth);
- return -1;
+ return AVERROR_PATCHWELCOME;
 }
 
- if (p->data[0])
- avctx->release_buffer(avctx, p);
+ if ((ret = ff_set_dimensions(avctx, w, h)) < 0)
+ return ret;
 
- if (av_image_check_size(w, h, 0, avctx))
- return -1;
- if (w != avctx->width || h != avctx->height)
- avcodec_set_dimensions(avctx, w, h);
- if (ff_get_buffer(avctx, p) < 0) {
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 p->pict_type = AV_PICTURE_TYPE_I;
@@ -134,33 +116,20 @@
 }
 }
 
- *picture = s->picture;
 *got_frame = 1;
 
 return avpkt->size;
 
 unsupported:
 av_log(avctx, AV_LOG_ERROR, "unsupported d3d format (%08x)\n", d3d_format);
- return -1;
-}
-
-static av_cold int txd_end(AVCodecContext *avctx) {
- TXDContext *s = avctx->priv_data;
-
- if (s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
-
- return 0;
+ return AVERROR_PATCHWELCOME;
 }
 
 AVCodec ff_txd_decoder = {
 .name = "txd",
+ .long_name = NULL_IF_CONFIG_SMALL("Renderware TXD (TeXture Dictionary) image"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_TXD,
- .priv_data_size = sizeof(TXDContext),
- .init = txd_init,
- .close = txd_end,
 .decode = txd_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Renderware TXD (TeXture Dictionary) image"),
 };

libav-v9.6.tar.bz2/libavcodec/ulti.c -> libav-v10.1.tar.bz2/libavcodec/ulti.c Changed

@@ -30,13 +30,14 @@
 
 #include "avcodec.h"
 #include "bytestream.h"
+#include "internal.h"
 
 #include "ulti_cb.h"
 
 typedef struct UltimotionDecodeContext {
 AVCodecContext *avctx;
 int width, height, blocks;
- AVFrame frame;
+ AVFrame *frame;
 const uint8_t *ulti_codebook;
 GetByteContext gb;
 } UltimotionDecodeContext;
@@ -50,18 +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;
 s->ulti_codebook = ulti_codebook;
 
+ 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;
 
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
+ av_frame_free(&s->frame);
 
 return 0;
 }
@@ -221,15 +223,13 @@
 int blocks = 0;
 int done = 0;
 int x = 0, y = 0;
- int i;
+ int i, ret;
 int skip;
 int tmp;
 
- s->frame.reference = 1;
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, &s->frame) < 0) {
+ if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 bytestream2_init(&s->gb, buf, buf_size);
@@ -370,7 +370,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;
@@ -382,20 +382,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;
@@ -407,7 +407,8 @@
 }
 
 *got_frame = 1;
- *(AVFrame*)data= s->frame;
+ if ((ret = av_frame_ref(data, s->frame)) < 0)
+ return ret;
 
 return buf_size;
 
@@ -419,6 +420,7 @@
 
 AVCodec ff_ulti_decoder = {
 .name = "ultimotion",
+ .long_name = NULL_IF_CONFIG_SMALL("IBM UltiMotion"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_ULTI,
 .priv_data_size = sizeof(UltimotionDecodeContext),
@@ -426,5 +428,4 @@
 .close = ulti_decode_end,
 .decode = ulti_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("IBM UltiMotion"),
 };

libav-v9.6.tar.bz2/libavcodec/utils.c -> libav-v10.1.tar.bz2/libavcodec/utils.c Changed

@@ -25,10 +25,14 @@
 * utils.
 */
 
+#include "config.h"
+#include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/crc.h"
+#include "libavutil/frame.h"
+#include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/imgutils.h"
@@ -40,47 +44,28 @@
 #include "thread.h"
 #include "internal.h"
 #include "bytestream.h"
+#include "version.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include <limits.h>
 #include <float.h>
 
 static int volatile entangled_thread_counter = 0;
-static int (*ff_lockmgr_cb)(void **mutex, enum AVLockOp op);
+static int (*lockmgr_cb)(void **mutex, enum AVLockOp op);
 static void *codec_mutex;
 static void *avformat_mutex;
 
-void *av_fast_realloc(void *ptr, unsigned int *size, size_t 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), "LIBAVCODEC_55")
 {
- 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;
+ return av_fast_realloc(ptr, size, min_size);
 }
 
-void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size)
+FF_SYMVER(void, av_fast_malloc, (void *ptr, unsigned int *size, size_t min_size), "LIBAVCODEC_55")
 {
- void **p = ptr;
- if (min_size < *size)
- return;
- min_size = FFMAX(17 * min_size / 16 + 32, min_size);
- av_free(*p);
- *p = av_malloc(min_size);
- if (!*p)
- min_size = 0;
- *size = min_size;
+ av_fast_malloc(ptr, size, min_size);
 }
+#endif
 
 void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size)
 {
@@ -106,7 +91,7 @@
 return first_avcodec;
 }
 
-static void avcodec_init(void)
+static av_cold void avcodec_init(void)
 {
 static int initialized = 0;
 
@@ -114,7 +99,8 @@
 return;
 initialized = 1;
 
- ff_dsputil_static_init();
+ if (CONFIG_DSPUTIL)
+ ff_dsputil_static_init();
 }
 
 int av_codec_is_encoder(const AVCodec *codec)
@@ -127,7 +113,7 @@
 return codec && codec->decode;
 }
 
-void avcodec_register(AVCodec *codec)
+av_cold void avcodec_register(AVCodec *codec)
 {
 AVCodec **p;
 avcodec_init();
@@ -141,20 +127,57 @@
 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)
 {
- s->coded_width = width;
- s->coded_height = height;
- s->width = width;
- s->height = height;
+ ff_set_dimensions(s, width, height);
 }
+#endif
 
-#define INTERNAL_BUFFER_SIZE (32 + 1)
+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->width = s->coded_width = width;
+ s->height = s->coded_height = height;
+
+ return ret;
+}
+
+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;
+}
+
+#if HAVE_NEON || ARCH_PPC || HAVE_MMX
+# define STRIDE_ALIGN 16
+#else
+# define STRIDE_ALIGN 8
+#endif
 
 void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
 int linesize_align[AV_NUM_DATA_POINTERS])
@@ -189,10 +212,14 @@
 case AV_PIX_FMT_YUV422P9BE:
 case AV_PIX_FMT_YUV422P10LE:
 case AV_PIX_FMT_YUV422P10BE:
+ case AV_PIX_FMT_YUVA422P10LE:
+ case AV_PIX_FMT_YUVA422P10BE:
 case AV_PIX_FMT_YUV444P9LE:
 case AV_PIX_FMT_YUV444P9BE:
 case AV_PIX_FMT_YUV444P10LE:
 case AV_PIX_FMT_YUV444P10BE:
+ case AV_PIX_FMT_YUVA444P10LE:
+ case AV_PIX_FMT_YUVA444P10BE:
 case AV_PIX_FMT_GBRP9LE:
 case AV_PIX_FMT_GBRP9BE:
 case AV_PIX_FMT_GBRP10LE:
@@ -297,87 +324,26 @@
 return ret;
 }
 
-static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame)
-{
- AVCodecInternal *avci = avctx->internal;
- int buf_size, ret;
-
- av_freep(&avci->audio_data);
- buf_size = av_samples_get_buffer_size(NULL, avctx->channels,
- frame->nb_samples, avctx->sample_fmt,
- 0);
- if (buf_size < 0)
- return AVERROR(EINVAL);
-
- frame->data[0] = av_mallocz(buf_size);
- if (!frame->data[0])
- return AVERROR(ENOMEM);
-
- ret = avcodec_fill_audio_frame(frame, avctx->channels, avctx->sample_fmt,
- frame->data[0], buf_size, 0);
- if (ret < 0) {
- av_freep(&frame->data[0]);
- return ret;
- }
-
- avci->audio_data = frame->data[0];
- if (avctx->debug & FF_DEBUG_BUFFERS)
- av_log(avctx, AV_LOG_DEBUG, "default_get_buffer called on frame %p, "
- "internal audio buffer used\n", frame);
-
- return 0;
-}
-
-static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
+static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame)
 {
- int i;
- int w = s->width;
- int h = s->height;
- InternalBuffer *buf;
- AVCodecInternal *avci = s->internal;
+ FramePool *pool = avctx->internal->pool;
+ int i, ret;
 
- if (pic->data[0] != NULL) {
- av_log(s, AV_LOG_ERROR, "pic->data[0]!=NULL in avcodec_default_get_buffer\n");
- return -1;
- }
- if (avci->buffer_count >= INTERNAL_BUFFER_SIZE) {
- av_log(s, AV_LOG_ERROR, "buffer_count overflow (missing release_buffer?)\n");
- return -1;
- }
-
- if (av_image_check_size(w, h, 0, s))
- return -1;
-
- if (!avci->buffer) {
- avci->buffer = av_mallocz((INTERNAL_BUFFER_SIZE + 1) *
- sizeof(InternalBuffer));
- }
-
- buf = &avci->buffer[avci->buffer_count];
-
- if (buf->base[0] && (buf->width != w || buf->height != h || buf->pix_fmt != s->pix_fmt)) {
- for (i = 0; i < AV_NUM_DATA_POINTERS; i++) {
- av_freep(&buf->base[i]);
- buf->data[i] = NULL;
- }
- }
-
- if (!buf->base[0]) {
- int h_chroma_shift, v_chroma_shift;
- int size[4] = { 0 };
- int tmpsize;
- int unaligned;
+ switch (avctx->codec_type) {
+ case AVMEDIA_TYPE_VIDEO: {
 AVPicture picture;
- int stride_align[AV_NUM_DATA_POINTERS];
- const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(s->pix_fmt);
- const int pixel_size = desc->comp[0].step_minus1 + 1;
+ int size[4] = { 0 };
+ int w = frame->width;
+ int h = frame->height;
+ int tmpsize, unaligned;
 
- av_pix_fmt_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift,
- &v_chroma_shift);
+ if (pool->format == frame->format &&
+ pool->width == frame->width && pool->height == frame->height)
+ return 0;
 
- avcodec_align_dimensions2(s, &w, &h, stride_align);
+ avcodec_align_dimensions2(avctx, &w, &h, pool->stride_align);
 
- if (!(s->flags & CODEC_FLAG_EMU_EDGE)) {
+ if (!(avctx->flags & CODEC_FLAG_EMU_EDGE)) {
 w += EDGE_WIDTH * 2;
 h += EDGE_WIDTH * 2;
 }
@@ -385,16 +351,17 @@
 do {
 // NOTE: do not align linesizes individually, this breaks e.g. assumptions
 // that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2
- av_image_fill_linesizes(picture.linesize, s->pix_fmt, w);
+ av_image_fill_linesizes(picture.linesize, avctx->pix_fmt, w);
 // increase alignment of w for next try (rhs gives the lowest bit set in w)
 w += w & ~(w - 1);
 
 unaligned = 0;
 for (i = 0; i < 4; i++)
- unaligned |= picture.linesize[i] % stride_align[i];
+ unaligned |= picture.linesize[i] % pool->stride_align[i];
 } while (unaligned);
 
- tmpsize = av_image_fill_pointers(picture.data, s->pix_fmt, h, NULL, picture.linesize);
+ tmpsize = av_image_fill_pointers(picture.data, avctx->pix_fmt, h,
+ NULL, picture.linesize);
 if (tmpsize < 0)
 return -1;
 
@@ -402,55 +369,171 @@
 size[i] = picture.data[i + 1] - picture.data[i];
 size[i] = tmpsize - (picture.data[i] - picture.data[0]);
 
- memset(buf->base, 0, sizeof(buf->base));
- memset(buf->data, 0, sizeof(buf->data));
+ for (i = 0; i < 4; i++) {
+ av_buffer_pool_uninit(&pool->pools[i]);
+ pool->linesize[i] = picture.linesize[i];
+ if (size[i]) {
+ pool->pools[i] = av_buffer_pool_init(size[i] + 16, NULL);
+ if (!pool->pools[i]) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ }
+ }
+ pool->format = frame->format;
+ pool->width = frame->width;
+ pool->height = frame->height;
+
+ break;
+ }
+ case AVMEDIA_TYPE_AUDIO: {
+ int ch = av_get_channel_layout_nb_channels(frame->channel_layout);
+ int planar = av_sample_fmt_is_planar(frame->format);
+ int planes = planar ? ch : 1;
+
+ if (pool->format == frame->format && pool->planes == planes &&
+ pool->channels == ch && frame->nb_samples == pool->samples)
+ return 0;
+
+ av_buffer_pool_uninit(&pool->pools[0]);
+ ret = av_samples_get_buffer_size(&pool->linesize[0], ch,
+ frame->nb_samples, frame->format, 0);
+ if (ret < 0)
+ goto fail;
+
+ pool->pools[0] = av_buffer_pool_init(pool->linesize[0], NULL);
+ if (!pool->pools[0]) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
 
- for (i = 0; i < 4 && size[i]; i++) {
- const int h_shift = i == 0 ? 0 : h_chroma_shift;
- const int v_shift = i == 0 ? 0 : v_chroma_shift;
+ pool->format = frame->format;
+ pool->planes = planes;
+ pool->channels = ch;
+ pool->samples = frame->nb_samples;
+ break;
+ }
+ default: av_assert0(0);
+ }
+ return 0;
+fail:
+ for (i = 0; i < 4; i++)
+ av_buffer_pool_uninit(&pool->pools[i]);
+ pool->format = -1;
+ pool->planes = pool->channels = pool->samples = 0;
+ pool->width = pool->height = 0;
+ return ret;
+}
 
- buf->linesize[i] = picture.linesize[i];
+static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame)
+{
+ FramePool *pool = avctx->internal->pool;
+ int planes = pool->planes;
+ int i;
 
- buf->base[i] = av_malloc(size[i] + 16); //FIXME 16
- if (buf->base[i] == NULL)
- return -1;
- memset(buf->base[i], 128, size[i]);
+ frame->linesize[0] = pool->linesize[0];
 
- // no edge if EDGE EMU or not planar YUV
- if ((s->flags & CODEC_FLAG_EMU_EDGE) || !size[2])
- buf->data[i] = buf->base[i];
- else
- buf->data[i] = buf->base[i] + FFALIGN((buf->linesize[i] * EDGE_WIDTH >> v_shift) + (pixel_size * EDGE_WIDTH >> h_shift), stride_align[i]);
- }
- for (; i < AV_NUM_DATA_POINTERS; i++) {
- buf->base[i] = buf->data[i] = NULL;
- buf->linesize[i] = 0;
+ if (planes > AV_NUM_DATA_POINTERS) {
+ frame->extended_data = av_mallocz(planes * sizeof(*frame->extended_data));
+ frame->nb_extended_buf = planes - AV_NUM_DATA_POINTERS;
+ frame->extended_buf = av_mallocz(frame->nb_extended_buf *
+ sizeof(*frame->extended_buf));
+ if (!frame->extended_data || !frame->extended_buf) {
+ av_freep(&frame->extended_data);
+ av_freep(&frame->extended_buf);
+ return AVERROR(ENOMEM);
 }
- if (size[1] && !size[2])
- avpriv_set_systematic_pal2((uint32_t *)buf->data[1], s->pix_fmt);
- buf->width = s->width;
- buf->height = s->height;
- buf->pix_fmt = s->pix_fmt;
+ } else
+ frame->extended_data = frame->data;
+
+ for (i = 0; i < FFMIN(planes, AV_NUM_DATA_POINTERS); i++) {
+ frame->buf[i] = av_buffer_pool_get(pool->pools[0]);
+ if (!frame->buf[i])
+ goto fail;
+ frame->extended_data[i] = frame->data[i] = frame->buf[i]->data;
+ }
+ for (i = 0; i < frame->nb_extended_buf; i++) {
+ frame->extended_buf[i] = av_buffer_pool_get(pool->pools[0]);
+ if (!frame->extended_buf[i])
+ goto fail;
+ frame->extended_data[i + AV_NUM_DATA_POINTERS] = frame->extended_buf[i]->data;
 }
 
- for (i = 0; i < AV_NUM_DATA_POINTERS; i++) {
- pic->base[i] = buf->base[i];
- pic->data[i] = buf->data[i];
- pic->linesize[i] = buf->linesize[i];
+ if (avctx->debug & FF_DEBUG_BUFFERS)
+ av_log(avctx, AV_LOG_DEBUG, "default_get_buffer called on frame %p", frame);
+
+ return 0;
+fail:
+ av_frame_unref(frame);
+ return AVERROR(ENOMEM);
+}
+
+static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
+{
+ FramePool *pool = s->internal->pool;
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pic->format);
+ int pixel_size = desc->comp[0].step_minus1 + 1;
+ int h_chroma_shift, v_chroma_shift;
+ int i;
+
+ if (pic->data[0] != NULL) {
+ av_log(s, AV_LOG_ERROR, "pic->data[0]!=NULL in avcodec_default_get_buffer\n");
+ return -1;
 }
+
+ memset(pic->data, 0, sizeof(pic->data));
 pic->extended_data = pic->data;
- avci->buffer_count++;
+
+ av_pix_fmt_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift);
+
+ for (i = 0; i < 4 && pool->pools[i]; i++) {
+ const int h_shift = i == 0 ? 0 : h_chroma_shift;
+ const int v_shift = i == 0 ? 0 : v_chroma_shift;
+
+ pic->linesize[i] = pool->linesize[i];
+
+ pic->buf[i] = av_buffer_pool_get(pool->pools[i]);
+ if (!pic->buf[i])
+ goto fail;
+
+ // no edge if EDGE EMU or not planar YUV
+ if ((s->flags & CODEC_FLAG_EMU_EDGE) || !pool->pools[2])
+ pic->data[i] = pic->buf[i]->data;
+ else {
+ pic->data[i] = pic->buf[i]->data +
+ FFALIGN((pic->linesize[i] * EDGE_WIDTH >> v_shift) +
+ (pixel_size * EDGE_WIDTH >> h_shift), pool->stride_align[i]);
+ }
+ }
+ for (; i < AV_NUM_DATA_POINTERS; i++) {
+ pic->data[i] = NULL;
+ pic->linesize[i] = 0;
+ }
+ if (pic->data[1] && !pic->data[2])
+ avpriv_set_systematic_pal2((uint32_t *)pic->data[1], s->pix_fmt);
 
 if (s->debug & FF_DEBUG_BUFFERS)
- av_log(s, AV_LOG_DEBUG, "default_get_buffer called on pic %p, %d "
- "buffers used\n", pic, avci->buffer_count);
+ av_log(s, AV_LOG_DEBUG, "default_get_buffer called on pic %p\n", pic);
 
 return 0;
+fail:
+ av_frame_unref(pic);
+ return AVERROR(ENOMEM);
 }
 
-int avcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame)
+int avcodec_default_get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags)
 {
+ int ret;
+
+ if ((ret = update_frame_pool(avctx, frame)) < 0)
+ return ret;
+
+#if FF_API_GET_BUFFER
+FF_DISABLE_DEPRECATION_WARNINGS
 frame->type = FF_BUFFER_TYPE_INTERNAL;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
 switch (avctx->codec_type) {
 case AVMEDIA_TYPE_VIDEO:
 return video_get_buffer(avctx, frame);
@@ -461,107 +544,259 @@
 }
 }
 
-int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame)
+#if FF_API_GET_BUFFER
+FF_DISABLE_DEPRECATION_WARNINGS
+int avcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame)
+{
+ return avcodec_default_get_buffer2(avctx, frame, 0);
+}
+
+typedef struct CompatReleaseBufPriv {
+ AVCodecContext avctx;
+ AVFrame frame;
+} CompatReleaseBufPriv;
+
+static void compat_free_buffer(void *opaque, uint8_t *data)
+{
+ CompatReleaseBufPriv *priv = opaque;
+ if (priv->avctx.release_buffer)
+ priv->avctx.release_buffer(&priv->avctx, &priv->frame);
+ av_freep(&priv);
+}
+
+static void compat_release_buffer(void *opaque, uint8_t *data)
+{
+ AVBufferRef *buf = opaque;
+ av_buffer_unref(&buf);
+}
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
+int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags)
 {
+ int override_dimensions = 1;
+ int ret;
+
 switch (avctx->codec_type) {
 case AVMEDIA_TYPE_VIDEO:
- frame->width = avctx->width;
- frame->height = avctx->height;
- frame->format = avctx->pix_fmt;
- frame->sample_aspect_ratio = avctx->sample_aspect_ratio;
+ if (frame->width <= 0 || frame->height <= 0) {
+ frame->width = FFMAX(avctx->width, avctx->coded_width);
+ frame->height = FFMAX(avctx->height, avctx->coded_height);
+ override_dimensions = 0;
+ }
+ if (frame->format < 0)
+ frame->format = avctx->pix_fmt;
+ if (!frame->sample_aspect_ratio.num)
+ frame->sample_aspect_ratio = avctx->sample_aspect_ratio;
+
+ if ((ret = av_image_check_size(avctx->width, avctx->height, 0, avctx)) < 0)
+ return ret;
 break;
 case AVMEDIA_TYPE_AUDIO:
- frame->sample_rate = avctx->sample_rate;
- frame->format = avctx->sample_fmt;
- frame->channel_layout = avctx->channel_layout;
+ if (!frame->sample_rate)
+ frame->sample_rate = avctx->sample_rate;
+ if (frame->format < 0)
+ frame->format = avctx->sample_fmt;
+ if (!frame->channel_layout) {
+ if (avctx->channel_layout) {
+ if (av_get_channel_layout_nb_channels(avctx->channel_layout) !=
+ avctx->channels) {
+ av_log(avctx, AV_LOG_ERROR, "Inconsistent channel "
+ "configuration.\n");
+ return AVERROR(EINVAL);
+ }
+
+ frame->channel_layout = avctx->channel_layout;
+ } else {
+ if (avctx->channels > FF_SANE_NB_CHANNELS) {
+ av_log(avctx, AV_LOG_ERROR, "Too many channels: %d.\n",
+ avctx->channels);
+ return AVERROR(ENOSYS);
+ }
+
+ frame->channel_layout = av_get_default_channel_layout(avctx->channels);
+ if (!frame->channel_layout)
+ frame->channel_layout = (1ULL << avctx->channels) - 1;
+ }
+ }
 break;
 default: return AVERROR(EINVAL);
 }
 
- frame->pkt_pts = avctx->pkt ? avctx->pkt->pts : AV_NOPTS_VALUE;
+ frame->pkt_pts = avctx->internal->pkt ? avctx->internal->pkt->pts : AV_NOPTS_VALUE;
 frame->reordered_opaque = avctx->reordered_opaque;
 
- return avctx->get_buffer(avctx, frame);
-}
+#if FF_API_GET_BUFFER
+FF_DISABLE_DEPRECATION_WARNINGS
+ /*
+ * Wrap an old get_buffer()-allocated buffer in an bunch of AVBuffers.
+ * We wrap each plane in its own AVBuffer. Each of those has a reference to
+ * a dummy AVBuffer as its private data, unreffing it on free.
+ * When all the planes are freed, the dummy buffer's free callback calls
+ * release_buffer().
+ */
+ if (avctx->get_buffer) {
+ CompatReleaseBufPriv *priv = NULL;
+ AVBufferRef *dummy_buf = NULL;
+ int planes, i, ret;
 
-void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic)
-{
- int i;
- InternalBuffer *buf, *last;
- AVCodecInternal *avci = s->internal;
+ if (flags & AV_GET_BUFFER_FLAG_REF)
+ frame->reference = 1;
+
+ ret = avctx->get_buffer(avctx, frame);
+ if (ret < 0)
+ return ret;
+
+ /* return if the buffers are already set up
+ * this would happen e.g. when a custom get_buffer() calls
+ * avcodec_default_get_buffer
+ */
+ if (frame->buf[0])
+ return 0;
+
+ priv = av_mallocz(sizeof(*priv));
+ if (!priv) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ priv->avctx = *avctx;
+ priv->frame = *frame;
+
+ dummy_buf = av_buffer_create(NULL, 0, compat_free_buffer, priv, 0);
+ if (!dummy_buf) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+
+#define WRAP_PLANE(ref_out, data, data_size) \
+do { \
+ AVBufferRef *dummy_ref = av_buffer_ref(dummy_buf); \
+ if (!dummy_ref) { \
+ ret = AVERROR(ENOMEM); \
+ goto fail; \
+ } \
+ ref_out = av_buffer_create(data, data_size, compat_release_buffer, \
+ dummy_ref, 0); \
+ if (!ref_out) { \
+ av_frame_unref(frame); \
+ ret = AVERROR(ENOMEM); \
+ goto fail; \
+ } \
+} while (0)
+
+ if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
+
+ planes = av_pix_fmt_count_planes(frame->format);
+ /* workaround for AVHWAccel plane count of 0, buf[0] is used as
+ check for allocated buffers: make libavcodec happy */
+ if (desc && desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
+ planes = 1;
+ if (!desc || planes <= 0) {
+ ret = AVERROR(EINVAL);
+ goto fail;
+ }
 
- assert(s->codec_type == AVMEDIA_TYPE_VIDEO);
+ for (i = 0; i < planes; i++) {
+ int v_shift = (i == 1 || i == 2) ? desc->log2_chroma_h : 0;
+ int plane_size = (frame->height >> v_shift) * frame->linesize[i];
 
- assert(pic->type == FF_BUFFER_TYPE_INTERNAL);
- assert(avci->buffer_count);
+ WRAP_PLANE(frame->buf[i], frame->data[i], plane_size);
+ }
+ } else {
+ int planar = av_sample_fmt_is_planar(frame->format);
+ planes = planar ? avctx->channels : 1;
+
+ if (planes > FF_ARRAY_ELEMS(frame->buf)) {
+ frame->nb_extended_buf = planes - FF_ARRAY_ELEMS(frame->buf);
+ frame->extended_buf = av_malloc(sizeof(*frame->extended_buf) *
+ frame->nb_extended_buf);
+ if (!frame->extended_buf) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ }
+
+ for (i = 0; i < FFMIN(planes, FF_ARRAY_ELEMS(frame->buf)); i++)
+ WRAP_PLANE(frame->buf[i], frame->extended_data[i], frame->linesize[0]);
 
- if (avci->buffer) {
- buf = NULL; /* avoids warning */
- for (i = 0; i < avci->buffer_count; i++) { //just 3-5 checks so is not worth to optimize
- buf = &avci->buffer[i];
- if (buf->data[0] == pic->data[0])
- break;
+ for (i = 0; i < frame->nb_extended_buf; i++)
+ WRAP_PLANE(frame->extended_buf[i],
+ frame->extended_data[i + FF_ARRAY_ELEMS(frame->buf)],
+ frame->linesize[0]);
 }
- assert(i < avci->buffer_count);
- avci->buffer_count--;
- last = &avci->buffer[avci->buffer_count];
 
- if (buf != last)
- FFSWAP(InternalBuffer, *buf, *last);
+ av_buffer_unref(&dummy_buf);
+
+ frame->width = avctx->width;
+ frame->height = avctx->height;
+
+ return 0;
+
+fail:
+ avctx->release_buffer(avctx, frame);
+ av_freep(&priv);
+ av_buffer_unref(&dummy_buf);
+ return ret;
 }
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
 
- for (i = 0; i < AV_NUM_DATA_POINTERS; i++)
- pic->data[i] = NULL;
-// pic->base[i]=NULL;
+ ret = avctx->get_buffer2(avctx, frame, flags);
 
- if (s->debug & FF_DEBUG_BUFFERS)
- av_log(s, AV_LOG_DEBUG, "default_release_buffer called on pic %p, %d "
- "buffers used\n", pic, avci->buffer_count);
+ if (avctx->codec_type == AVMEDIA_TYPE_VIDEO && !override_dimensions) {
+ frame->width = avctx->width;
+ frame->height = avctx->height;
+ }
+
+ return ret;
 }
 
-int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic)
+int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame)
 {
- AVFrame temp_pic;
- int i;
+ AVFrame tmp;
+ int ret;
 
- assert(s->codec_type == AVMEDIA_TYPE_VIDEO);
+ av_assert0(avctx->codec_type == AVMEDIA_TYPE_VIDEO);
 
- /* If no picture return a new buffer */
- if (pic->data[0] == NULL) {
- /* We will copy from buffer, so must be readable */
- pic->buffer_hints |= FF_BUFFER_HINTS_READABLE;
- return ff_get_buffer(s, pic);
+ if (!frame->data[0])
+ return ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF);
+
+ 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;
 }
 
- assert(s->pix_fmt == pic->format);
+ av_frame_move_ref(&tmp, frame);
 
- /* If internal buffer type return the same buffer */
- if (pic->type == FF_BUFFER_TYPE_INTERNAL) {
- if (s->pkt)
- pic->pkt_pts = s->pkt->pts;
- else
- pic->pkt_pts = AV_NOPTS_VALUE;
- pic->reordered_opaque = s->reordered_opaque;
- return 0;
+ ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF);
+ if (ret < 0) {
+ av_frame_unref(&tmp);
+ return ret;
 }
 
- /*
- * Not internal type and reget_buffer not overridden, emulate cr buffer
- */
- temp_pic = *pic;
- for (i = 0; i < AV_NUM_DATA_POINTERS; i++)
- pic->data[i] = pic->base[i] = NULL;
- pic->opaque = NULL;
- /* Allocate new frame */
- if (ff_get_buffer(s, pic))
- return -1;
- /* Copy image data from old buffer to new buffer */
- av_picture_copy((AVPicture *)pic, (AVPicture *)&temp_pic, s->pix_fmt, s->width,
- s->height);
- s->release_buffer(s, &temp_pic); // Release old frame
+ av_image_copy(frame->data, frame->linesize, tmp.data, tmp.linesize,
+ frame->format, frame->width, frame->height);
+
+ av_frame_unref(&tmp);
+
 return 0;
 }
 
+#if FF_API_GET_BUFFER
+void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic)
+{
+ av_frame_unref(pic);
+}
+
+int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic)
+{
+ av_assert0(0);
+ return AVERROR_BUG;
+}
+#endif
+
 int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2), void *arg, int *ret, int count, int size)
 {
 int i;
@@ -589,7 +824,7 @@
 static int is_hwaccel_pix_fmt(enum AVPixelFormat pix_fmt)
 {
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
- return desc->flags & PIX_FMT_HWACCEL;
+ return desc->flags & AV_PIX_FMT_FLAG_HWACCEL;
 }
 
 enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat *fmt)
@@ -599,6 +834,7 @@
 return fmt[0];
 }
 
+#if FF_API_AVFRAME_LAVC
 void avcodec_get_frame_defaults(AVFrame *frame)
 {
 if (frame->extended_data != frame->data)
@@ -620,25 +856,18 @@
 if (frame == NULL)
 return NULL;
 
+FF_DISABLE_DEPRECATION_WARNINGS
 avcodec_get_frame_defaults(frame);
+FF_ENABLE_DEPRECATION_WARNINGS
 
 return frame;
 }
 
 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
 
 int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options)
 {
@@ -667,8 +896,8 @@
 av_dict_copy(&tmp, *options, 0);
 
 /* If there is a user-supplied mutex locking routine, call it. */
- if (ff_lockmgr_cb) {
- if ((*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN))
+ if (lockmgr_cb) {
+ if ((*lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN))
 return -1;
 }
 
@@ -685,6 +914,18 @@
 goto end;
 }
 
+ avctx->internal->pool = av_mallocz(sizeof(*avctx->internal->pool));
+ if (!avctx->internal->pool) {
+ ret = AVERROR(ENOMEM);
+ 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);
@@ -705,16 +946,18 @@
 if ((ret = av_opt_set_dict(avctx, &tmp)) < 0)
 goto free_and_end;
 
- if (avctx->coded_width && avctx->coded_height)
- avcodec_set_dimensions(avctx, avctx->coded_width, avctx->coded_height);
+ if (avctx->coded_width && avctx->coded_height && !avctx->width && !avctx->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,
@@ -753,7 +996,7 @@
 avctx->time_base.den = avctx->sample_rate;
 }
 
- if (HAVE_THREADS && !avctx->thread_opaque) {
+ if (HAVE_THREADS) {
 ret = ff_thread_init(avctx);
 if (ret < 0) {
 goto free_and_end;
@@ -858,8 +1101,8 @@
 entangled_thread_counter--;
 
 /* Release any user-supplied mutex. */
- if (ff_lockmgr_cb) {
- (*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_RELEASE);
+ if (lockmgr_cb) {
+ (*lockmgr_cb)(&codec_mutex, AV_LOCK_RELEASE);
 }
 if (options) {
 av_dict_free(options);
@@ -870,6 +1113,10 @@
 free_and_end:
 av_dict_free(&tmp);
 av_freep(&avctx->priv_data);
+ if (avctx->internal) {
+ av_frame_free(&avctx->internal->to_free);
+ av_freep(&avctx->internal->pool);
+ }
 av_freep(&avctx->internal);
 avctx->codec = NULL;
 goto end;
@@ -881,13 +1128,23 @@
 return AVERROR(EINVAL);
 
 if (avpkt->data) {
+ AVBufferRef *buf = avpkt->buf;
+#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
 void *destruct = avpkt->destruct;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
 
 if (avpkt->size < size)
 return AVERROR(EINVAL);
 
 av_init_packet(avpkt);
+#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
 avpkt->destruct = destruct;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+ avpkt->buf = buf;
 avpkt->size = size;
 return 0;
 } else {
@@ -901,26 +1158,22 @@
 static int pad_last_frame(AVCodecContext *s, AVFrame **dst, const AVFrame *src)
 {
 AVFrame *frame = NULL;
- uint8_t *buf = NULL;
 int ret;
 
- if (!(frame = avcodec_alloc_frame()))
+ if (!(frame = av_frame_alloc()))
 return AVERROR(ENOMEM);
- *frame = *src;
 
- if ((ret = av_samples_get_buffer_size(&frame->linesize[0], s->channels,
- s->frame_size, s->sample_fmt, 0)) < 0)
+ frame->format = src->format;
+ frame->channel_layout = src->channel_layout;
+ frame->nb_samples = s->frame_size;
+ ret = av_frame_get_buffer(frame, 32);
+ if (ret < 0)
 goto fail;
 
- if (!(buf = av_malloc(ret))) {
- ret = AVERROR(ENOMEM);
+ ret = av_frame_copy_props(frame, src);
+ if (ret < 0)
 goto fail;
- }
 
- frame->nb_samples = s->frame_size;
- if ((ret = avcodec_fill_audio_frame(frame, s->channels, s->sample_fmt,
- buf, ret, 0)) < 0)
- goto fail;
 if ((ret = av_samples_copy(frame->extended_data, src->extended_data, 0, 0,
 src->nb_samples, s->channels, s->sample_fmt)) < 0)
 goto fail;
@@ -934,10 +1187,7 @@
 return 0;
 
 fail:
- if (frame->extended_data != frame->data)
- av_freep(&frame->extended_data);
- av_freep(&buf);
- av_freep(&frame);
+ av_frame_free(&frame);
 return ret;
 }
 
@@ -1014,9 +1264,9 @@
 }
 
 if (!user_packet && avpkt->size) {
- uint8_t *new_data = av_realloc(avpkt->data, avpkt->size);
- if (new_data)
- avpkt->data = new_data;
+ ret = av_buffer_realloc(&avpkt->buf, avpkt->size);
+ if (ret >= 0)
+ avpkt->data = avpkt->buf->data;
 }
 
 avctx->frame_number++;
@@ -1034,133 +1284,11 @@
 avpkt->flags |= AV_PKT_FLAG_KEY;
 
 end:
- if (padded_frame) {
- av_freep(&padded_frame->data[0]);
- if (padded_frame->extended_data != padded_frame->data)
- av_freep(&padded_frame->extended_data);
- av_freep(&padded_frame);
- }
+ av_frame_free(&padded_frame);
 
 return ret;
 }
 
-#if FF_API_OLD_ENCODE_AUDIO
-int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx,
- uint8_t *buf, int buf_size,
- const short *samples)
-{
- AVPacket pkt;
- AVFrame frame0 = { { 0 } };
- AVFrame *frame;
- int ret, samples_size, got_packet;
-
- av_init_packet(&pkt);
- pkt.data = buf;
- pkt.size = buf_size;
-
- if (samples) {
- frame = &frame0;
- avcodec_get_frame_defaults(frame);
-
- if (avctx->frame_size) {
- frame->nb_samples = avctx->frame_size;
- } else {
- /* if frame_size is not set, the number of samples must be
- * calculated from the buffer size */
- int64_t nb_samples;
- if (!av_get_bits_per_sample(avctx->codec_id)) {
- av_log(avctx, AV_LOG_ERROR, "avcodec_encode_audio() does not "
- "support this codec\n");
- 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)
- return AVERROR(EINVAL);
- frame->nb_samples = nb_samples;
- }
-
- /* it is assumed that the samples buffer is large enough based on the
- * relevant parameters */
- samples_size = av_samples_get_buffer_size(NULL, avctx->channels,
- frame->nb_samples,
- avctx->sample_fmt, 1);
- if ((ret = avcodec_fill_audio_frame(frame, avctx->channels,
- avctx->sample_fmt,
- (const uint8_t *)samples,
- samples_size, 1)))
- return ret;
-
- /* fabricate frame pts from sample count.
- * this is needed because the avcodec_encode_audio() API does not have
- * a way for the user to provide pts */
- frame->pts = ff_samples_to_time_base(avctx,
- avctx->internal->sample_count);
- avctx->internal->sample_count += frame->nb_samples;
- } else {
- frame = NULL;
- }
-
- got_packet = 0;
- ret = avcodec_encode_audio2(avctx, &pkt, frame, &got_packet);
- if (!ret && got_packet && avctx->coded_frame) {
- avctx->coded_frame->pts = pkt.pts;
- avctx->coded_frame->key_frame = !!(pkt.flags & AV_PKT_FLAG_KEY);
- }
- /* free any side data since we cannot return it */
- if (pkt.side_data_elems > 0) {
- int i;
- for (i = 0; i < pkt.side_data_elems; i++)
- av_free(pkt.side_data[i].data);
- av_freep(&pkt.side_data);
- pkt.side_data_elems = 0;
- }
-
- if (frame && frame->extended_data != frame->data)
- av_free(frame->extended_data);
-
- return ret ? ret : pkt.size;
-}
-
-#endif
-
-#if FF_API_OLD_ENCODE_VIDEO
-int attribute_align_arg avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
- const AVFrame *pict)
-{
- AVPacket pkt;
- int ret, got_packet = 0;
-
- if (buf_size < FF_MIN_BUFFER_SIZE) {
- av_log(avctx, AV_LOG_ERROR, "buffer smaller than minimum size\n");
- return -1;
- }
-
- av_init_packet(&pkt);
- pkt.data = buf;
- pkt.size = buf_size;
-
- ret = avcodec_encode_video2(avctx, &pkt, pict, &got_packet);
- if (!ret && got_packet && avctx->coded_frame) {
- avctx->coded_frame->pts = pkt.pts;
- avctx->coded_frame->key_frame = !!(pkt.flags & AV_PKT_FLAG_KEY);
- }
-
- /* free any side data since we cannot return it */
- if (pkt.side_data_elems > 0) {
- int i;
- for (i = 0; i < pkt.side_data_elems; i++)
- av_free(pkt.side_data[i].data);
- av_freep(&pkt.side_data);
- pkt.side_data_elems = 0;
- }
-
- return ret ? ret : pkt.size;
-}
-
-#endif
-
 int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
 AVPacket *avpkt,
 const AVFrame *frame,
@@ -1191,9 +1319,9 @@
 avpkt->pts = avpkt->dts = frame->pts;
 
 if (!user_packet && avpkt->size) {
- uint8_t *new_data = av_realloc(avpkt->data, avpkt->size);
- if (new_data)
- avpkt->data = new_data;
+ ret = av_buffer_realloc(&avpkt->buf, avpkt->size);
+ if (ret >= 0)
+ avpkt->data = avpkt->buf->data;
 }
 
 avctx->frame_number++;
@@ -1221,62 +1349,128 @@
 return ret;
 }
 
-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 unrefcount_frame(AVCodecInternal *avci, AVFrame *frame)
+{
+ int 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_get_channel_layout_nb_channels(avci->to_free->channel_layout);
+ 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;
+
+ return 0;
 }
 
 int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
 int *got_picture_ptr,
 AVPacket *avpkt)
 {
+ AVCodecInternal *avci = avctx->internal;
 int ret;
 
 *got_picture_ptr = 0;
 if ((avctx->coded_width || avctx->coded_height) && av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx))
 return -1;
 
- avctx->pkt = avpkt;
- apply_param_change(avctx, avpkt);
+ avctx->internal->pkt = avpkt;
+ ret = apply_param_change(avctx, avpkt);
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Error applying parameter changes.\n");
+ if (avctx->err_recognition & AV_EF_EXPLODE)
+ return ret;
+ }
 
- avcodec_get_frame_defaults(picture);
+ av_frame_unref(picture);
 
 if ((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size || (avctx->active_thread_type & FF_THREAD_FRAME)) {
 if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME)
@@ -1297,86 +1491,47 @@
 
 emms_c(); //needed to avoid an emms_c() call before every return;
 
- if (*got_picture_ptr)
+ if (*got_picture_ptr) {
+ if (!avctx->refcounted_frames) {
+ int err = unrefcount_frame(avci, picture);
+ if (err < 0)
+ return err;
+ }
+
 avctx->frame_number++;
+ } 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;
-
- return ret;
-}
-
-#if FF_API_OLD_DECODE_AUDIO
-int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
- int *frame_size_ptr,
- AVPacket *avpkt)
-{
- AVFrame frame = { { 0 } };
- int ret, got_frame = 0;
-
- 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");
- av_log(avctx, AV_LOG_ERROR, "Please port your application to "
- "avcodec_decode_audio4()\n");
- avctx->get_buffer = avcodec_default_get_buffer;
- }
-
- 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,
- 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);
- return AVERROR(EINVAL);
- }
-
- 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);
- out += plane_size;
- }
- }
- *frame_size_ptr = data_size;
- } else {
- *frame_size_ptr = 0;
- }
 return ret;
 }
 
-#endif
-
 int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx,
 AVFrame *frame,
 int *got_frame_ptr,
 AVPacket *avpkt)
 {
- int planar, channels;
+ AVCodecInternal *avci = avctx->internal;
 int ret = 0;
 
 *got_frame_ptr = 0;
 
- avctx->pkt = avpkt;
+ avctx->internal->pkt = avpkt;
 
 if (!avpkt->data && avpkt->size) {
 av_log(avctx, AV_LOG_ERROR, "invalid packet: NULL data, size != 0\n");
 return AVERROR(EINVAL);
 }
 
- apply_param_change(avctx, avpkt);
+ ret = apply_param_change(avctx, avpkt);
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Error applying parameter changes.\n");
+ if (avctx->err_recognition & AV_EF_EXPLODE)
+ return ret;
+ }
 
- avcodec_get_frame_defaults(frame);
+ av_frame_unref(frame);
 
 if ((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size) {
 ret = avctx->codec->decode(avctx, frame, got_frame_ptr, avpkt);
@@ -1385,16 +1540,16 @@
 frame->pkt_dts = avpkt->dts;
 if (frame->format == AV_SAMPLE_FMT_NONE)
 frame->format = avctx->sample_fmt;
- }
+
+ if (!avctx->refcounted_frames) {
+ int err = unrefcount_frame(avci, frame);
+ if (err < 0)
+ return err;
+ }
+ } 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 */
- planar = av_sample_fmt_is_planar(frame->format);
- channels = av_get_channel_layout_nb_channels(frame->channel_layout);
- if (!(planar && channels > AV_NUM_DATA_POINTERS))
- frame->extended_data = frame->data;
 
 return ret;
 }
@@ -1405,7 +1560,7 @@
 {
 int ret;
 
- avctx->pkt = avpkt;
+ avctx->internal->pkt = avpkt;
 *got_sub_ptr = 0;
 ret = avctx->codec->decode(avctx, sub, got_sub_ptr, avpkt);
 if (*got_sub_ptr)
@@ -1435,8 +1590,8 @@
 av_cold int avcodec_close(AVCodecContext *avctx)
 {
 /* If there is a user-supplied mutex locking routine, call it. */
- if (ff_lockmgr_cb) {
- if ((*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN))
+ if (lockmgr_cb) {
+ if ((*lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN))
 return -1;
 }
 
@@ -1448,12 +1603,17 @@
 }
 
 if (avcodec_is_open(avctx)) {
- if (HAVE_THREADS && avctx->thread_opaque)
+ FramePool *pool = avctx->internal->pool;
+ int i;
+ if (HAVE_THREADS && avctx->internal->thread_ctx)
 ff_thread_free(avctx);
 if (avctx->codec && avctx->codec->close)
 avctx->codec->close(avctx);
- avcodec_default_free_buffers(avctx);
 avctx->coded_frame = NULL;
+ 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);
 av_freep(&avctx->internal);
 }
 
@@ -1468,8 +1628,8 @@
 entangled_thread_counter--;
 
 /* Release any user-supplied mutex. */
- if (ff_lockmgr_cb) {
- (*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_RELEASE);
+ if (lockmgr_cb) {
+ (*lockmgr_cb)(&codec_mutex, AV_LOCK_RELEASE);
 }
 return 0;
 }
@@ -1556,9 +1716,14 @@
 {
 int i, len, ret = 0;
 
+#define TAG_PRINT(x) \
+ (((x) >= '0' && (x) <= '9') || \
+ ((x) >= 'a' && (x) <= 'z') || ((x) >= 'A' && (x) <= 'Z') || \
+ ((x) == '.' || (x) == ' '))
+
 for (i = 0; i < 4; i++) {
 len = snprintf(buf, buf_size,
- isprint(codec_tag & 0xFF) ? "%c" : "[%d]", codec_tag & 0xFF);
+ TAG_PRINT(codec_tag & 0xFF) ? "%c" : "[%d]", codec_tag & 0xFF);
 buf += len;
 buf_size = buf_size > len ? buf_size - len : 0;
 ret += len;
@@ -1720,49 +1885,9 @@
 ff_thread_flush(avctx);
 else if (avctx->codec->flush)
 avctx->codec->flush(avctx);
-}
-
-static void video_free_buffers(AVCodecContext *s)
-{
- AVCodecInternal *avci = s->internal;
- int i, j;
-
- if (!avci->buffer)
- return;
-
- if (avci->buffer_count)
- av_log(s, AV_LOG_WARNING, "Found %i unreleased buffers!\n",
- avci->buffer_count);
- for (i = 0; i < INTERNAL_BUFFER_SIZE; i++) {
- InternalBuffer *buf = &avci->buffer[i];
- for (j = 0; j < 4; j++) {
- av_freep(&buf->base[j]);
- buf->data[j] = NULL;
- }
- }
- av_freep(&avci->buffer);
-
- avci->buffer_count = 0;
-}
-
-static void audio_free_buffers(AVCodecContext *avctx)
-{
- AVCodecInternal *avci = avctx->internal;
- av_freep(&avci->audio_data);
-}
 
-void avcodec_default_free_buffers(AVCodecContext *avctx)
-{
- switch (avctx->codec_type) {
- case AVMEDIA_TYPE_VIDEO:
- video_free_buffers(avctx);
- break;
- case AVMEDIA_TYPE_AUDIO:
- audio_free_buffers(avctx);
- break;
- default:
- break;
- }
+ if (!avctx->refcounted_frames)
+ av_frame_unref(avctx->internal->to_free);
 }
 
 int av_get_exact_bits_per_sample(enum AVCodecID codec_id)
@@ -1790,11 +1915,13 @@
 case AV_CODEC_ID_PCM_S24DAUD:
 case AV_CODEC_ID_PCM_S24BE:
 case AV_CODEC_ID_PCM_S24LE:
+ case AV_CODEC_ID_PCM_S24LE_PLANAR:
 case AV_CODEC_ID_PCM_U24BE:
 case AV_CODEC_ID_PCM_U24LE:
 return 24;
 case AV_CODEC_ID_PCM_S32BE:
 case AV_CODEC_ID_PCM_S32LE:
+ case AV_CODEC_ID_PCM_S32LE_PLANAR:
 case AV_CODEC_ID_PCM_U32BE:
 case AV_CODEC_ID_PCM_U32LE:
 case AV_CODEC_ID_PCM_F32BE:
@@ -2002,6 +2129,8 @@
 return i;
 }
 
+#if FF_API_MISSING_SAMPLE
+FF_DISABLE_DEPRECATION_WARNINGS
 void av_log_missing_feature(void *avc, const char *feature, int want_sample)
 {
 av_log(avc, AV_LOG_WARNING, "%s is not implemented. Update your Libav "
@@ -2026,6 +2155,8 @@
 
 va_end(argument_list);
 }
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif /* FF_API_MISSING_SAMPLE */
 
 static AVHWAccel *first_hwaccel = NULL;
 
@@ -2043,8 +2174,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)))
@@ -2056,19 +2190,19 @@
 
 int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op))
 {
- if (ff_lockmgr_cb) {
- if (ff_lockmgr_cb(&codec_mutex, AV_LOCK_DESTROY))
+ if (lockmgr_cb) {
+ if (lockmgr_cb(&codec_mutex, AV_LOCK_DESTROY))
 return -1;
- if (ff_lockmgr_cb(&avformat_mutex, AV_LOCK_DESTROY))
+ if (lockmgr_cb(&avformat_mutex, AV_LOCK_DESTROY))
 return -1;
 }
 
- ff_lockmgr_cb = cb;
+ lockmgr_cb = cb;
 
- if (ff_lockmgr_cb) {
- if (ff_lockmgr_cb(&codec_mutex, AV_LOCK_CREATE))
+ if (lockmgr_cb) {
+ if (lockmgr_cb(&codec_mutex, AV_LOCK_CREATE))
 return -1;
- if (ff_lockmgr_cb(&avformat_mutex, AV_LOCK_CREATE))
+ if (lockmgr_cb(&avformat_mutex, AV_LOCK_CREATE))
 return -1;
 }
 return 0;
@@ -2076,8 +2210,8 @@
 
 int avpriv_lock_avformat(void)
 {
- if (ff_lockmgr_cb) {
- if ((*ff_lockmgr_cb)(&avformat_mutex, AV_LOCK_OBTAIN))
+ if (lockmgr_cb) {
+ if ((*lockmgr_cb)(&avformat_mutex, AV_LOCK_OBTAIN))
 return -1;
 }
 return 0;
@@ -2085,8 +2219,8 @@
 
 int avpriv_unlock_avformat(void)
 {
- if (ff_lockmgr_cb) {
- if ((*ff_lockmgr_cb)(&avformat_mutex, AV_LOCK_RELEASE))
+ if (lockmgr_cb) {
+ if ((*lockmgr_cb)(&avformat_mutex, AV_LOCK_RELEASE))
 return -1;
 }
 return 0;
@@ -2094,34 +2228,53 @@
 
 unsigned int avpriv_toupper4(unsigned int x)
 {
- return toupper(x & 0xFF)
- + (toupper((x >> 8) & 0xFF) << 8)
- + (toupper((x >> 16) & 0xFF) << 16)
- + (toupper((x >> 24) & 0xFF) << 24);
+ return av_toupper(x & 0xFF) +
+ (av_toupper((x >> 8) & 0xFF) << 8) +
+ (av_toupper((x >> 16) & 0xFF) << 16) +
+ (av_toupper((x >> 24) & 0xFF) << 24);
+}
+
+int ff_thread_ref_frame(ThreadFrame *dst, ThreadFrame *src)
+{
+ int ret;
+
+ dst->owner = src->owner;
+
+ ret = av_frame_ref(dst->f, src->f);
+ if (ret < 0)
+ return ret;
+
+ if (src->progress &&
+ !(dst->progress = av_buffer_ref(src->progress))) {
+ ff_thread_release_buffer(dst->owner, dst);
+ return AVERROR(ENOMEM);
+ }
+
+ return 0;
 }
 
 #if !HAVE_THREADS
 
-int ff_thread_get_buffer(AVCodecContext *avctx, AVFrame *f)
+int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags)
 {
 f->owner = avctx;
- return ff_get_buffer(avctx, f);
+ return ff_get_buffer(avctx, f->f, flags);
 }
 
-void ff_thread_release_buffer(AVCodecContext *avctx, AVFrame *f)
+void ff_thread_release_buffer(AVCodecContext *avctx, ThreadFrame *f)
 {
- f->owner->release_buffer(f->owner, f);
+ av_frame_unref(f->f);
 }
 
 void ff_thread_finish_setup(AVCodecContext *avctx)
 {
 }
 
-void ff_thread_report_progress(AVFrame *f, int progress, int field)
+void ff_thread_report_progress(ThreadFrame *f, int progress, int field)
 {
 }
 
-void ff_thread_await_progress(AVFrame *f, int progress, int field)
+void ff_thread_await_progress(ThreadFrame *f, int progress, int field)
 {
 }
 
@@ -2145,3 +2298,36 @@
 {
 return !!s->internal;
 }
+
+const uint8_t *avpriv_find_start_code(const uint8_t *restrict p,
+ const uint8_t *end,
+ uint32_t * restrict state)
+{
+ int i;
+
+ assert(p <= end);
+ if (p >= end)
+ return end;
+
+ for (i = 0; i < 3; i++) {
+ uint32_t tmp = *state << 8;
+ *state = tmp + *(p++);
+ if (tmp == 0x100 || p == end)
+ return p;
+ }
+
+ while (p < end) {
+ if (p[-1] > 1 ) p += 3;
+ else if (p[-2] ) p += 2;
+ else if (p[-3]|(p[-1]-1)) p++;
+ else {
+ p++;
+ break;
+ }
+ }
+
+ p = FFMIN(p, end) - 4;
+ *state = AV_RB32(p);
+
+ return p + 4;
+}

libav-v9.6.tar.bz2/libavcodec/utvideo.h -> libav-v10.1.tar.bz2/libavcodec/utvideo.h Changed

libav-v9.6.tar.bz2/libavcodec/utvideodec.c -> libav-v10.1.tar.bz2/libavcodec/utvideodec.c Changed

@@ -331,13 +331,9 @@
 int plane_size, max_slice_size = 0, slice_start, slice_end, slice_size;
 int ret;
 GetByteContext gb;
+ ThreadFrame frame = { .f = data };
 
- if (c->pic.data[0])
- ff_thread_release_buffer(avctx, &c->pic);
-
- c->pic.reference = 1;
- c->pic.buffer_hints = FF_BUFFER_HINTS_VALID;
- if ((ret = ff_thread_get_buffer(avctx, &c->pic)) < 0) {
+ if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -380,7 +376,7 @@
 c->frame_pred = (c->frame_info >> 8) & 3;
 
 if (c->frame_pred == PRED_GRADIENT) {
- av_log_ask_for_sample(avctx, "Frame uses gradient prediction\n");
+ avpriv_request_sample(avctx, "Frame with gradient prediction");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -396,42 +392,42 @@
 case AV_PIX_FMT_RGB24:
 case AV_PIX_FMT_RGBA:
 for (i = 0; i < c->planes; i++) {
- ret = decode_plane(c, i, c->pic.data[0] + ff_ut_rgb_order[i],
- c->planes, c->pic.linesize[0], avctx->width,
+ ret = decode_plane(c, i, frame.f->data[0] + ff_ut_rgb_order[i],
+ c->planes, frame.f->linesize[0], avctx->width,
 avctx->height, plane_start[i],
 c->frame_pred == PRED_LEFT);
 if (ret)
 return ret;
 if (c->frame_pred == PRED_MEDIAN) {
 if (!c->interlaced) {
- restore_median(c->pic.data[0] + ff_ut_rgb_order[i],
- c->planes, c->pic.linesize[0], avctx->width,
+ restore_median(frame.f->data[0] + ff_ut_rgb_order[i],
+ c->planes, frame.f->linesize[0], avctx->width,
 avctx->height, c->slices, 0);
 } else {
- restore_median_il(c->pic.data[0] + ff_ut_rgb_order[i],
- c->planes, c->pic.linesize[0],
+ restore_median_il(frame.f->data[0] + ff_ut_rgb_order[i],
+ c->planes, frame.f->linesize[0],
 avctx->width, avctx->height, c->slices,
 0);
 }
 }
 }
- restore_rgb_planes(c->pic.data[0], c->planes, c->pic.linesize[0],
+ restore_rgb_planes(frame.f->data[0], c->planes, frame.f->linesize[0],
 avctx->width, avctx->height);
 break;
 case AV_PIX_FMT_YUV420P:
 for (i = 0; i < 3; i++) {
- ret = decode_plane(c, i, c->pic.data[i], 1, c->pic.linesize[i],
+ ret = decode_plane(c, i, frame.f->data[i], 1, frame.f->linesize[i],
 avctx->width >> !!i, avctx->height >> !!i,
 plane_start[i], c->frame_pred == PRED_LEFT);
 if (ret)
 return ret;
 if (c->frame_pred == PRED_MEDIAN) {
 if (!c->interlaced) {
- restore_median(c->pic.data[i], 1, c->pic.linesize[i],
+ restore_median(frame.f->data[i], 1, frame.f->linesize[i],
 avctx->width >> !!i, avctx->height >> !!i,
 c->slices, !i);
 } else {
- restore_median_il(c->pic.data[i], 1, c->pic.linesize[i],
+ restore_median_il(frame.f->data[i], 1, frame.f->linesize[i],
 avctx->width >> !!i,
 avctx->height >> !!i,
 c->slices, !i);
@@ -441,18 +437,18 @@
 break;
 case AV_PIX_FMT_YUV422P:
 for (i = 0; i < 3; i++) {
- ret = decode_plane(c, i, c->pic.data[i], 1, c->pic.linesize[i],
+ ret = decode_plane(c, i, frame.f->data[i], 1, frame.f->linesize[i],
 avctx->width >> !!i, avctx->height,
 plane_start[i], c->frame_pred == PRED_LEFT);
 if (ret)
 return ret;
 if (c->frame_pred == PRED_MEDIAN) {
 if (!c->interlaced) {
- restore_median(c->pic.data[i], 1, c->pic.linesize[i],
+ restore_median(frame.f->data[i], 1, frame.f->linesize[i],
 avctx->width >> !!i, avctx->height,
 c->slices, 0);
 } else {
- restore_median_il(c->pic.data[i], 1, c->pic.linesize[i],
+ restore_median_il(frame.f->data[i], 1, frame.f->linesize[i],
 avctx->width >> !!i, avctx->height,
 c->slices, 0);
 }
@@ -461,12 +457,11 @@
 break;
 }
 
- c->pic.key_frame = 1;
- c->pic.pict_type = AV_PICTURE_TYPE_I;
- c->pic.interlaced_frame = !!c->interlaced;
+ frame.f->key_frame = 1;
+ frame.f->pict_type = AV_PICTURE_TYPE_I;
+ frame.f->interlaced_frame = !!c->interlaced;
 
- *got_frame = 1;
- *(AVFrame*)data = c->pic;
+ *got_frame = 1;
 
 /* always report that the buffer was completely consumed */
 return buf_size;
@@ -496,7 +491,7 @@
 c->flags = AV_RL32(avctx->extradata + 12);
 
 if (c->frame_info_size != 4)
- av_log_ask_for_sample(avctx, "Frame info is not 4 bytes\n");
+ avpriv_request_sample(avctx, "Frame info not 4 bytes");
 av_log(avctx, AV_LOG_DEBUG, "Encoding parameters %08X\n", c->flags);
 c->slices = (c->flags >> 24) + 1;
 c->compression = c->flags & 1;
@@ -516,10 +511,22 @@
 case MKTAG('U', 'L', 'Y', '0'):
 c->planes = 3;
 avctx->pix_fmt = AV_PIX_FMT_YUV420P;
+ avctx->colorspace = AVCOL_SPC_BT470BG;
 break;
 case MKTAG('U', 'L', 'Y', '2'):
 c->planes = 3;
 avctx->pix_fmt = AV_PIX_FMT_YUV422P;
+ avctx->colorspace = AVCOL_SPC_BT470BG;
+ break;
+ case MKTAG('U', 'L', 'H', '0'):
+ c->planes = 3;
+ avctx->pix_fmt = AV_PIX_FMT_YUV420P;
+ avctx->colorspace = AVCOL_SPC_BT709;
+ break;
+ case MKTAG('U', 'L', 'H', '2'):
+ c->planes = 3;
+ avctx->pix_fmt = AV_PIX_FMT_YUV422P;
+ avctx->colorspace = AVCOL_SPC_BT709;
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "Unknown Ut Video FOURCC provided (%08X)\n",
@@ -534,9 +541,6 @@
 {
 UtvideoContext * const c = avctx->priv_data;
 
- if (c->pic.data[0])
- ff_thread_release_buffer(avctx, &c->pic);
-
 av_freep(&c->slice_bits);
 
 return 0;
@@ -544,6 +548,7 @@
 
 AVCodec ff_utvideo_decoder = {
 .name = "utvideo",
+ .long_name = NULL_IF_CONFIG_SMALL("Ut Video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_UTVIDEO,
 .priv_data_size = sizeof(UtvideoContext),
@@ -551,5 +556,4 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
- .long_name = NULL_IF_CONFIG_SMALL("Ut Video"),
 };

libav-v9.6.tar.bz2/libavcodec/utvideoenc.c -> libav-v10.1.tar.bz2/libavcodec/utvideoenc.c Changed

@@ -24,6 +24,7 @@
 * Ut Video encoder
 */
 
+#include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "internal.h"
@@ -57,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;
@@ -82,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:
@@ -92,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:
@@ -125,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");
@@ -174,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;
@@ -230,20 +267,6 @@
 }
 }
 
-/* Write data to a plane, no prediction applied */
-static void write_plane(uint8_t *src, uint8_t *dst, int stride,
- int width, int height)
-{
- int i, j;
-
- for (j = 0; j < height; j++) {
- for (i = 0; i < width; i++)
- *dst++ = src[i];
-
- src += stride;
- }
-}
-
 /* Write data to a plane with left prediction */
 static void left_predict(uint8_t *src, uint8_t *dst, int stride,
 int width, int height)
@@ -383,8 +406,9 @@
 for (i = 0; i < c->slices; i++) {
 sstart = send;
 send = height * (i + 1) / c->slices;
- write_plane(src + sstart * stride, dst + sstart * width,
- stride, width, send - sstart);
+ av_image_copy_plane(dst + sstart * width, width,
+ src + sstart * stride, stride,
+ width, send - sstart);
 }
 break;
 case PRED_LEFT:
@@ -598,7 +622,6 @@
 * At least currently Ut Video is IDR only.
 * Set flags accordingly.
 */
- avctx->coded_frame->reference = 0;
 avctx->coded_frame->key_frame = 1;
 avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
 
@@ -613,6 +636,7 @@
 
 AVCodec ff_utvideo_encoder = {
 .name = "utvideo",
+ .long_name = NULL_IF_CONFIG_SMALL("Ut Video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_UTVIDEO,
 .priv_data_size = sizeof(UtvideoContext),
@@ -623,5 +647,4 @@
 AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_YUV422P,
 AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE
 },
- .long_name = NULL_IF_CONFIG_SMALL("Ut Video"),
 };

libav-v9.6.tar.bz2/libavcodec/v210dec.c -> libav-v10.1.tar.bz2/libavcodec/v210dec.c Changed

@@ -31,39 +31,31 @@
 {
 if (avctx->width & 1) {
 av_log(avctx, AV_LOG_ERROR, "v210 needs even width\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 avctx->pix_fmt = AV_PIX_FMT_YUV422P10;
 avctx->bits_per_raw_sample = 10;
 
- avctx->coded_frame = avcodec_alloc_frame();
- if (!avctx->coded_frame)
- return AVERROR(ENOMEM);
-
 return 0;
 }
 
 static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
 AVPacket *avpkt)
 {
- int h, w;
- AVFrame *pic = avctx->coded_frame;
+ int h, w, ret;
+ AVFrame *pic = data;
 const uint8_t *psrc = avpkt->data;
 uint16_t *y, *u, *v;
 int aligned_width = ((avctx->width + 47) / 48) * 48;
 int stride = aligned_width * 8 / 3;
 
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
-
 if (avpkt->size < stride * avctx->height) {
 av_log(avctx, AV_LOG_ERROR, "packet too small\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- pic->reference = 0;
- if (ff_get_buffer(avctx, pic) < 0)
- return -1;
+ if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
+ return ret;
 
 y = (uint16_t*)pic->data[0];
 u = (uint16_t*)pic->data[1];
@@ -110,28 +102,16 @@
 }
 
 *got_frame = 1;
- *(AVFrame*)data = *avctx->coded_frame;
 
 return avpkt->size;
 }
 
-static av_cold int decode_close(AVCodecContext *avctx)
-{
- AVFrame *pic = avctx->coded_frame;
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
- av_freep(&avctx->coded_frame);
-
- return 0;
-}
-
 AVCodec ff_v210_decoder = {
 .name = "v210",
+ .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_V210,
 .init = decode_init,
- .close = decode_close,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"),
 };

libav-v9.6.tar.bz2/libavcodec/v210enc.c -> libav-v10.1.tar.bz2/libavcodec/v210enc.c Changed

libav-v9.6.tar.bz2/libavcodec/v210x.c -> libav-v10.1.tar.bz2/libavcodec/v210x.c Changed

@@ -26,14 +26,12 @@
 
 static av_cold int decode_init(AVCodecContext *avctx)
 {
- if(avctx->width & 1){
+ if (avctx->width & 1) {
 av_log(avctx, AV_LOG_ERROR, "v210x needs even width\n");
- return -1;
+ return AVERROR(EINVAL);
 }
- avctx->pix_fmt = AV_PIX_FMT_YUV422P16;
- avctx->bits_per_raw_sample= 10;
-
- avctx->coded_frame= avcodec_alloc_frame();
+ avctx->pix_fmt = AV_PIX_FMT_YUV422P16;
+ avctx->bits_per_raw_sample = 10;
 
 return 0;
 }
@@ -41,108 +39,93 @@
 static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
 AVPacket *avpkt)
 {
- int y=0;
- int width= avctx->width;
- AVFrame *pic= avctx->coded_frame;
- const uint32_t *src= (const uint32_t *)avpkt->data;
+ const uint32_t *src = (const uint32_t *)avpkt->data;
+ AVFrame *pic = data;
+ int width = avctx->width;
+ int y = 0;
 uint16_t *ydst, *udst, *vdst, *yend;
+ int ret;
 
- if(pic->data[0])
- avctx->release_buffer(avctx, pic);
-
- if(avpkt->size < avctx->width * avctx->height * 8 / 3){
+ if (avpkt->size < avctx->width * avctx->height * 8 / 3) {
 av_log(avctx, AV_LOG_ERROR, "Packet too small\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- if(avpkt->size > avctx->width * avctx->height * 8 / 3){
- av_log_ask_for_sample(avctx, "Probably padded data\n");
+ if (avpkt->size > avctx->width * avctx->height * 8 / 3) {
+ avpriv_request_sample(avctx, "(Probably) padded data");
 }
 
- pic->reference= 0;
- if(ff_get_buffer(avctx, pic) < 0)
- return -1;
-
- ydst= (uint16_t *)pic->data[0];
- udst= (uint16_t *)pic->data[1];
- vdst= (uint16_t *)pic->data[2];
- yend= ydst + width;
- pic->pict_type= AV_PICTURE_TYPE_I;
- pic->key_frame= 1;
-
- for(;;){
- uint32_t v= av_be2ne32(*src++);
- *udst++= (v>>16) & 0xFFC0;
- *ydst++= (v>>6 ) & 0xFFC0;
- *vdst++= (v<<4 ) & 0xFFC0;
-
- v= av_be2ne32(*src++);
- *ydst++= (v>>16) & 0xFFC0;
-
- if(ydst >= yend){
- ydst+= pic->linesize[0]/2 - width;
- udst+= pic->linesize[1]/2 - width/2;
- vdst+= pic->linesize[2]/2 - width/2;
- yend= ydst + width;
- if(++y >= avctx->height)
+ if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
+ return ret;
+
+ ydst = (uint16_t *)pic->data[0];
+ udst = (uint16_t *)pic->data[1];
+ vdst = (uint16_t *)pic->data[2];
+ yend = ydst + width;
+ pic->pict_type = AV_PICTURE_TYPE_I;
+ pic->key_frame = 1;
+
+ for (;;) {
+ uint32_t v = av_be2ne32(*src++);
+ *udst++ = (v >> 16) & 0xFFC0;
+ *ydst++ = (v >> 6 ) & 0xFFC0;
+ *vdst++ = (v << 4 ) & 0xFFC0;
+
+ v = av_be2ne32(*src++);
+ *ydst++ = (v >> 16) & 0xFFC0;
+
+ if (ydst >= yend) {
+ ydst += pic->linesize[0] / 2 - width;
+ udst += pic->linesize[1] / 2 - width / 2;
+ vdst += pic->linesize[2] / 2 - width / 2;
+ yend = ydst + width;
+ if (++y >= avctx->height)
 break;
 }
 
- *udst++= (v>>6 ) & 0xFFC0;
- *ydst++= (v<<4 ) & 0xFFC0;
+ *udst++ = (v >> 6 ) & 0xFFC0;
+ *ydst++ = (v << 4 ) & 0xFFC0;
 
- v= av_be2ne32(*src++);
- *vdst++= (v>>16) & 0xFFC0;
- *ydst++= (v>>6 ) & 0xFFC0;
+ v = av_be2ne32(*src++);
+ *vdst++ = (v >> 16) & 0xFFC0;
+ *ydst++ = (v >> 6 ) & 0xFFC0;
 
- if(ydst >= yend){
- ydst+= pic->linesize[0]/2 - width;
- udst+= pic->linesize[1]/2 - width/2;
- vdst+= pic->linesize[2]/2 - width/2;
- yend= ydst + width;
- if(++y >= avctx->height)
+ if (ydst >= yend) {
+ ydst += pic->linesize[0] / 2 - width;
+ udst += pic->linesize[1] / 2 - width / 2;
+ vdst += pic->linesize[2] / 2 - width / 2;
+ yend = ydst + width;
+ if (++y >= avctx->height)
 break;
 }
 
- *udst++= (v<<4 ) & 0xFFC0;
-
- v= av_be2ne32(*src++);
- *ydst++= (v>>16) & 0xFFC0;
- *vdst++= (v>>6 ) & 0xFFC0;
- *ydst++= (v<<4 ) & 0xFFC0;
- if(ydst >= yend){
- ydst+= pic->linesize[0]/2 - width;
- udst+= pic->linesize[1]/2 - width/2;
- vdst+= pic->linesize[2]/2 - width/2;
- yend= ydst + width;
- if(++y >= avctx->height)
+ *udst++ = (v << 4 ) & 0xFFC0;
+
+ v = av_be2ne32(*src++);
+ *ydst++ = (v >> 16) & 0xFFC0;
+ *vdst++ = (v >> 6 ) & 0xFFC0;
+ *ydst++ = (v << 4 ) & 0xFFC0;
+ if (ydst >= yend) {
+ ydst += pic->linesize[0] / 2 - width;
+ udst += pic->linesize[1] / 2 - width / 2;
+ vdst += pic->linesize[2] / 2 - width / 2;
+ yend = ydst + width;
+ if (++y >= avctx->height)
 break;
 }
 }
 
 *got_frame = 1;
- *(AVFrame*)data= *avctx->coded_frame;
 
 return avpkt->size;
 }
 
-static av_cold int decode_close(AVCodecContext *avctx)
-{
- AVFrame *pic = avctx->coded_frame;
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
- av_freep(&avctx->coded_frame);
-
- return 0;
-}
-
 AVCodec ff_v210x_decoder = {
 .name = "v210x",
+ .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_V210X,
 .init = decode_init,
- .close = decode_close,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"),
 };

libav-v9.6.tar.bz2/libavcodec/v410dec.c -> libav-v10.1.tar.bz2/libavcodec/v410dec.c Changed

@@ -39,36 +39,24 @@
 }
 }
 
- avctx->coded_frame = avcodec_alloc_frame();
-
- if (!avctx->coded_frame) {
- av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n");
- return AVERROR(ENOMEM);
- }
-
 return 0;
 }
 
 static int v410_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame, AVPacket *avpkt)
 {
- AVFrame *pic = avctx->coded_frame;
+ AVFrame *pic = data;
 uint8_t *src = avpkt->data;
 uint16_t *y, *u, *v;
 uint32_t val;
 int i, j;
 
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
-
 if (avpkt->size < 4 * avctx->height * avctx->width) {
 av_log(avctx, AV_LOG_ERROR, "Insufficient input data.\n");
 return AVERROR(EINVAL);
 }
 
- pic->reference = 0;
-
- if (ff_get_buffer(avctx, pic) < 0) {
+ if (ff_get_buffer(avctx, pic, 0) < 0) {
 av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
 return AVERROR(ENOMEM);
 }
@@ -97,28 +85,16 @@
 }
 
 *got_frame = 1;
- *(AVFrame *)data = *pic;
 
 return avpkt->size;
 }
 
-static av_cold int v410_decode_close(AVCodecContext *avctx)
-{
- if (avctx->coded_frame->data[0])
- avctx->release_buffer(avctx, avctx->coded_frame);
-
- av_freep(&avctx->coded_frame);
-
- return 0;
-}
-
 AVCodec ff_v410_decoder = {
 .name = "v410",
+ .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_V410,
 .init = v410_decode_init,
 .decode = v410_decode_frame,
- .close = v410_decode_close,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"),
 };

libav-v9.6.tar.bz2/libavcodec/v410enc.c -> libav-v10.1.tar.bz2/libavcodec/v410enc.c Changed

libav-v9.6.tar.bz2/libavcodec/vaapi.c -> libav-v10.1.tar.bz2/libavcodec/vaapi.c Changed

@@ -21,6 +21,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "h264.h"
 #include "vaapi_internal.h"
 
 /**
@@ -40,7 +41,7 @@
 }
 }
 
-static int render_picture(struct vaapi_context *vactx, VASurfaceID surface)
+int ff_vaapi_render_picture(struct vaapi_context *vactx, VASurfaceID surface)
 {
 VABufferID va_buffers[3];
 unsigned int n_va_buffers = 0;
@@ -77,7 +78,7 @@
 return 0;
 }
 
-static int commit_slices(struct vaapi_context *vactx)
+int ff_vaapi_commit_slices(struct vaapi_context *vactx)
 {
 VABufferID *slice_buf_ids;
 VABufferID slice_param_buf_id, slice_data_buf_id;
@@ -152,7 +153,7 @@
 if (!vactx->slice_data)
 vactx->slice_data = buffer;
 if (vactx->slice_data + vactx->slice_data_size != buffer) {
- if (commit_slices(vactx) < 0)
+ if (ff_vaapi_commit_slices(vactx) < 0)
 return NULL;
 vactx->slice_data = buffer;
 }
@@ -175,23 +176,12 @@
 return slice_param;
 }
 
-int ff_vaapi_common_end_frame(MpegEncContext *s)
+void ff_vaapi_common_end_frame(AVCodecContext *avctx)
 {
- struct vaapi_context * const vactx = s->avctx->hwaccel_context;
- int ret = -1;
+ struct vaapi_context * const vactx = avctx->hwaccel_context;
 
- av_dlog(s->avctx, "ff_vaapi_common_end_frame()\n");
+ av_dlog(avctx, "ff_vaapi_common_end_frame()\n");
 
- if (commit_slices(vactx) < 0)
- goto done;
- if (vactx->n_slice_buf_ids > 0) {
- if (render_picture(vactx, ff_vaapi_get_surface_id(s->current_picture_ptr)) < 0)
- goto done;
- ff_draw_horiz_band(s, 0, s->avctx->height);
- }
- ret = 0;
-
-done:
 destroy_buffers(vactx->display, &vactx->pic_param_buf_id, 1);
 destroy_buffers(vactx->display, &vactx->iq_matrix_buf_id, 1);
 destroy_buffers(vactx->display, &vactx->bitplane_buf_id, 1);
@@ -202,6 +192,27 @@
 vactx->slice_buf_ids_alloc = 0;
 vactx->slice_count = 0;
 vactx->slice_params_alloc = 0;
+}
+
+int ff_vaapi_mpeg_end_frame(AVCodecContext *avctx)
+{
+ struct vaapi_context * const vactx = avctx->hwaccel_context;
+ MpegEncContext *s = avctx->priv_data;
+ int ret;
+
+ ret = ff_vaapi_commit_slices(vactx);
+ if (ret < 0)
+ goto finish;
+
+ ret = ff_vaapi_render_picture(vactx,
+ ff_vaapi_get_surface_id(s->current_picture_ptr));
+ if (ret < 0)
+ goto finish;
+
+ ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
+
+finish:
+ ff_vaapi_common_end_frame(avctx);
 return ret;
 }

libav-v9.6.tar.bz2/libavcodec/vaapi_h264.c -> libav-v10.1.tar.bz2/libavcodec/vaapi_h264.c Changed

@@ -55,7 +55,7 @@
 int pic_structure)
 {
 if (pic_structure == 0)
- pic_structure = pic->f.reference;
+ pic_structure = pic->reference;
 pic_structure &= PICT_FRAME; /* PICT_TOP_FIELD|PICT_BOTTOM_FIELD */
 
 va_pic->picture_id = ff_vaapi_get_surface_id(pic);
@@ -64,7 +64,7 @@
 va_pic->flags = 0;
 if (pic_structure != PICT_FRAME)
 va_pic->flags |= (pic_structure & PICT_TOP_FIELD) ? VA_PICTURE_H264_TOP_FIELD : VA_PICTURE_H264_BOTTOM_FIELD;
- if (pic->f.reference)
+ if (pic->reference)
 va_pic->flags |= pic->long_ref ? VA_PICTURE_H264_LONG_TERM_REFERENCE : VA_PICTURE_H264_SHORT_TERM_REFERENCE;
 
 va_pic->TopFieldOrderCnt = 0;
@@ -134,13 +134,13 @@
 
 for (i = 0; i < h->short_ref_count; i++) {
 Picture * const pic = h->short_ref[i];
- if (pic && pic->f.reference && dpb_add(&dpb, pic) < 0)
+ if (pic && pic->reference && dpb_add(&dpb, pic) < 0)
 return -1;
 }
 
 for (i = 0; i < 16; i++) {
 Picture * const pic = h->long_ref[i];
- if (pic && pic->f.reference && dpb_add(&dpb, pic) < 0)
+ if (pic && pic->reference && dpb_add(&dpb, pic) < 0)
 return -1;
 }
 return 0;
@@ -160,7 +160,7 @@
 {
 unsigned int i, n = 0;
 for (i = 0; i < ref_count; i++)
- if (ref_list[i].f.reference)
+ if (ref_list[i].reference)
 fill_vaapi_pic(&RefPicList[n++], &ref_list[i], 0);
 
 for (; n < 32; n++)
@@ -219,17 +219,16 @@
 }
 
 /** Initialize and start decoding a frame with VA API. */
-static int start_frame(AVCodecContext *avctx,
- av_unused const uint8_t *buffer,
- av_unused uint32_t size)
+static int vaapi_h264_start_frame(AVCodecContext *avctx,
+ av_unused const uint8_t *buffer,
+ av_unused uint32_t size)
 {
 H264Context * const h = avctx->priv_data;
- MpegEncContext * const s = &h->s;
 struct vaapi_context * const vactx = avctx->hwaccel_context;
 VAPictureParameterBufferH264 *pic_param;
 VAIQMatrixBufferH264 *iq_matrix;
 
- av_dlog(avctx, "start_frame()\n");
+ av_dlog(avctx, "vaapi_h264_start_frame()\n");
 
 vactx->slice_param_size = sizeof(VASliceParameterBufferH264);
 
@@ -237,11 +236,11 @@
 pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferH264));
 if (!pic_param)
 return -1;
- fill_vaapi_pic(&pic_param->CurrPic, s->current_picture_ptr, s->picture_structure);
+ fill_vaapi_pic(&pic_param->CurrPic, h->cur_pic_ptr, h->picture_structure);
 if (fill_vaapi_ReferenceFrames(pic_param, h) < 0)
 return -1;
- pic_param->picture_width_in_mbs_minus1 = s->mb_width - 1;
- pic_param->picture_height_in_mbs_minus1 = s->mb_height - 1;
+ pic_param->picture_width_in_mbs_minus1 = h->mb_width - 1;
+ pic_param->picture_height_in_mbs_minus1 = h->mb_height - 1;
 pic_param->bit_depth_luma_minus8 = h->sps.bit_depth_luma - 8;
 pic_param->bit_depth_chroma_minus8 = h->sps.bit_depth_chroma - 8;
 pic_param->num_ref_frames = h->sps.ref_frame_count;
@@ -269,7 +268,7 @@
 pic_param->pic_fields.bits.weighted_pred_flag = h->pps.weighted_pred;
 pic_param->pic_fields.bits.weighted_bipred_idc = h->pps.weighted_bipred_idc;
 pic_param->pic_fields.bits.transform_8x8_mode_flag = h->pps.transform_8x8_mode;
- pic_param->pic_fields.bits.field_pic_flag = s->picture_structure != PICT_FRAME;
+ pic_param->pic_fields.bits.field_pic_flag = h->picture_structure != PICT_FRAME;
 pic_param->pic_fields.bits.constrained_intra_pred_flag = h->pps.constrained_intra_pred;
 pic_param->pic_fields.bits.pic_order_present_flag = h->pps.pic_order_present;
 pic_param->pic_fields.bits.deblocking_filter_control_present_flag = h->pps.deblocking_filter_parameters_present;
@@ -287,37 +286,51 @@
 }
 
 /** End a hardware decoding based frame. */
-static int end_frame(AVCodecContext *avctx)
+static int vaapi_h264_end_frame(AVCodecContext *avctx)
 {
+ struct vaapi_context * const vactx = avctx->hwaccel_context;
 H264Context * const h = avctx->priv_data;
+ int ret;
+
+ av_dlog(avctx, "vaapi_h264_end_frame()\n");
+ ret = ff_vaapi_commit_slices(vactx);
+ if (ret < 0)
+ goto finish;
+
+ ret = ff_vaapi_render_picture(vactx, ff_vaapi_get_surface_id(h->cur_pic_ptr));
+ if (ret < 0)
+ goto finish;
+
+ ff_h264_draw_horiz_band(h, 0, h->avctx->height);
 
- av_dlog(avctx, "end_frame()\n");
- return ff_vaapi_common_end_frame(&h->s);
+finish:
+ ff_vaapi_common_end_frame(avctx);
+ return ret;
 }
 
 /** Decode the given H.264 slice with VA API. */
-static int decode_slice(AVCodecContext *avctx,
- const uint8_t *buffer,
- uint32_t size)
+static int vaapi_h264_decode_slice(AVCodecContext *avctx,
+ const uint8_t *buffer,
+ uint32_t size)
 {
 H264Context * const h = avctx->priv_data;
- MpegEncContext * const s = &h->s;
 VASliceParameterBufferH264 *slice_param;
 
- av_dlog(avctx, "decode_slice(): buffer %p, size %d\n", buffer, size);
+ av_dlog(avctx, "vaapi_h264_decode_slice(): buffer %p, size %d\n",
+ buffer, size);
 
 /* Fill in VASliceParameterBufferH264. */
 slice_param = (VASliceParameterBufferH264 *)ff_vaapi_alloc_slice(avctx->hwaccel_context, buffer, size);
 if (!slice_param)
 return -1;
- slice_param->slice_data_bit_offset = get_bits_count(&h->s.gb) + 8; /* bit buffer started beyond nal_unit_type */
- slice_param->first_mb_in_slice = (s->mb_y >> FIELD_OR_MBAFF_PICTURE) * s->mb_width + s->mb_x;
+ slice_param->slice_data_bit_offset = get_bits_count(&h->gb) + 8; /* bit buffer started beyond nal_unit_type */
+ slice_param->first_mb_in_slice = (h->mb_y >> FIELD_OR_MBAFF_PICTURE(h)) * h->mb_width + h->mb_x;
 slice_param->slice_type = ff_h264_get_slice_type(h);
 slice_param->direct_spatial_mv_pred_flag = h->slice_type == AV_PICTURE_TYPE_B ? h->direct_spatial_mv_pred : 0;
 slice_param->num_ref_idx_l0_active_minus1 = h->list_count > 0 ? h->ref_count[0] - 1 : 0;
 slice_param->num_ref_idx_l1_active_minus1 = h->list_count > 1 ? h->ref_count[1] - 1 : 0;
 slice_param->cabac_init_idc = h->cabac_init_idc;
- slice_param->slice_qp_delta = s->qscale - h->pps.init_qp;
+ slice_param->slice_qp_delta = h->qscale - h->pps.init_qp;
 slice_param->disable_deblocking_filter_idc = h->deblocking_filter < 2 ? !h->deblocking_filter : h->deblocking_filter;
 slice_param->slice_alpha_c0_offset_div2 = h->slice_alpha_c0_offset / 2 - 26;
 slice_param->slice_beta_offset_div2 = h->slice_beta_offset / 2 - 26;
@@ -341,7 +354,7 @@
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_H264,
 .pix_fmt = AV_PIX_FMT_VAAPI_VLD,
- .start_frame = start_frame,
- .end_frame = end_frame,
- .decode_slice = decode_slice,
+ .start_frame = vaapi_h264_start_frame,
+ .end_frame = vaapi_h264_end_frame,
+ .decode_slice = vaapi_h264_decode_slice,
 };

libav-v9.6.tar.bz2/libavcodec/vaapi_internal.h -> libav-v10.1.tar.bz2/libavcodec/vaapi_internal.h Changed

libav-v9.6.tar.bz2/libavcodec/vaapi_mpeg2.c -> libav-v10.1.tar.bz2/libavcodec/vaapi_mpeg2.c Changed

libav-v9.6.tar.bz2/libavcodec/vaapi_mpeg4.c -> libav-v10.1.tar.bz2/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;
@@ -115,11 +117,6 @@
 return 0;
 }
 
-static int vaapi_mpeg4_end_frame(AVCodecContext *avctx)
-{
- return ff_vaapi_common_end_frame(avctx->priv_data);
-}
-
 static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size)
 {
 MpegEncContext * const s = avctx->priv_data;
@@ -156,7 +153,7 @@
 .id = AV_CODEC_ID_MPEG4,
 .pix_fmt = AV_PIX_FMT_VAAPI_VLD,
 .start_frame = vaapi_mpeg4_start_frame,
- .end_frame = vaapi_mpeg4_end_frame,
+ .end_frame = ff_vaapi_mpeg_end_frame,
 .decode_slice = vaapi_mpeg4_decode_slice,
 };
 #endif
@@ -168,7 +165,7 @@
 .id = AV_CODEC_ID_H263,
 .pix_fmt = AV_PIX_FMT_VAAPI_VLD,
 .start_frame = vaapi_mpeg4_start_frame,
- .end_frame = vaapi_mpeg4_end_frame,
+ .end_frame = ff_vaapi_mpeg_end_frame,
 .decode_slice = vaapi_mpeg4_decode_slice,
 };
 #endif

libav-v9.6.tar.bz2/libavcodec/vaapi_vc1.c -> libav-v10.1.tar.bz2/libavcodec/vaapi_vc1.c Changed

@@ -169,7 +169,7 @@
     pic_param->sequence_fields.bits.psf                             = v->psf;
     pic_param->sequence_fields.bits.multires                        = v->multires;
     pic_param->sequence_fields.bits.overlap                         = v->overlap;
-    pic_param->sequence_fields.bits.syncmarker                      = s->resync_marker;
+    pic_param->sequence_fields.bits.syncmarker                      = v->resync_marker;
     pic_param->sequence_fields.bits.rangered                        = v->rangered;
     pic_param->sequence_fields.bits.max_b_frames                    = s->avctx->max_b_frames;
 #if VA_CHECK_VERSION(0,32,0)
@@ -310,13 +310,6 @@
     return 0;
 }
 
-static int vaapi_vc1_end_frame(AVCodecContext *avctx)
-{
-    VC1Context * const v = avctx->priv_data;
-
-    return ff_vaapi_common_end_frame(&v->s);
-}
-
 static int vaapi_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size)
 {
     VC1Context * const v = avctx->priv_data;
@@ -347,7 +340,7 @@
     .id             = AV_CODEC_ID_WMV3,
     .pix_fmt        = AV_PIX_FMT_VAAPI_VLD,
     .start_frame    = vaapi_vc1_start_frame,
-    .end_frame      = vaapi_vc1_end_frame,
+    .end_frame      = ff_vaapi_mpeg_end_frame,
     .decode_slice   = vaapi_vc1_decode_slice,
 };
 #endif
@@ -358,6 +351,6 @@
     .id             = AV_CODEC_ID_VC1,
     .pix_fmt        = AV_PIX_FMT_VAAPI_VLD,
     .start_frame    = vaapi_vc1_start_frame,
-    .end_frame      = vaapi_vc1_end_frame,
+    .end_frame      = ff_vaapi_mpeg_end_frame,
     .decode_slice   = vaapi_vc1_decode_slice,
 };

libav-v9.6.tar.bz2/libavcodec/vb.c -> libav-v10.1.tar.bz2/libavcodec/vb.c Changed

@@ -31,7 +31,7 @@
 #include "bytestream.h"
 #include "internal.h"
 
-enum VBFlags{
+enum VBFlags {
 VB_HAS_GMC = 0x01,
 VB_HAS_AUDIO = 0x04,
 VB_HAS_VIDEO = 0x08,
@@ -41,7 +41,6 @@
 
 typedef struct VBDecContext {
 AVCodecContext *avctx;
- AVFrame pic;
 
 uint8_t *frame, *prev_frame;
 uint32_t pal[AVPALETTE_COUNT];
@@ -64,16 +63,16 @@
 int start, size, i;
 
 start = bytestream2_get_byte(&c->stream);
- size = (bytestream2_get_byte(&c->stream) - 1) & 0xFF;
- if(start + size > 255){
+ size = (bytestream2_get_byte(&c->stream) - 1) & 0xFF;
+ if (start + size > 255) {
 av_log(c->avctx, AV_LOG_ERROR, "Palette change runs beyond entry 256\n");
 return;
 }
- if(size*3+2 > data_size){
+ if (size*3+2 > data_size) {
 av_log(c->avctx, AV_LOG_ERROR, "Palette data runs beyond chunk size\n");
 return;
 }
- for(i = start; i <= start + size; i++)
+ for (i = start; i <= start + size; i++)
 c->pal[i] = bytestream2_get_be24(&c->stream);
 }
 
@@ -97,42 +96,42 @@
 int pattype, pattern;
 const int width = c->avctx->width;
 uint8_t *pstart = c->prev_frame;
- uint8_t *pend = c->prev_frame + width*c->avctx->height;
+ uint8_t *pend = c->prev_frame + width*c->avctx->height;
 
 g = c->stream;
 
 prev = c->prev_frame + offset;
- cur = c->frame;
+ cur = c->frame;
 
 blocks = (c->avctx->width >> 2) * (c->avctx->height >> 2);
- blk2 = 0;
- for(blk = 0; blk < blocks; blk++){
- if(!(blk & 3)) {
+ blk2 = 0;
+ for (blk = 0; blk < blocks; blk++) {
+ if (!(blk & 3)) {
 blocktypes = bytestream2_get_byte(&g);
 }
- switch(blocktypes & 0xC0){
+ switch (blocktypes & 0xC0) {
 case 0x00: //skip
- for(y = 0; y < 4; y++)
- if(check_line(prev + y*width, pstart, pend))
+ for (y = 0; y < 4; y++)
+ if (check_line(prev + y*width, pstart, pend))
 memcpy(cur + y*width, prev + y*width, 4);
 else
 memset(cur + y*width, 0, 4);
 break;
 case 0x40:
 t = bytestream2_get_byte(&g);
- if(!t){ //raw block
+ if (!t) { //raw block
 if (bytestream2_get_bytes_left(&g) < 16) {
 av_log(c->avctx, AV_LOG_ERROR, "Insufficient data\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- for(y = 0; y < 4; y++)
+ for (y = 0; y < 4; y++)
 bytestream2_get_buffer(&g, cur + y * width, 4);
- }else{ // motion compensation
+ } else { // motion compensation
 x = ((t & 0xF)^8) - 8;
 y = ((t >> 4) ^8) - 8;
 t = x + y*width;
- for(y = 0; y < 4; y++)
- if(check_line(prev + t + y*width, pstart, pend))
+ for (y = 0; y < 4; y++)
+ if (check_line(prev + t + y*width, pstart, pend))
 memcpy(cur + y*width, prev + t + y*width, 4);
 else
 memset(cur + y*width, 0, 4);
@@ -140,35 +139,35 @@
 break;
 case 0x80: // fill
 t = bytestream2_get_byte(&g);
- for(y = 0; y < 4; y++)
+ for (y = 0; y < 4; y++)
 memset(cur + y*width, t, 4);
 break;
 case 0xC0: // pattern fill
- t = bytestream2_get_byte(&g);
+ t = bytestream2_get_byte(&g);
 pattype = t >> 6;
 pattern = vb_patterns[t & 0x3F];
- switch(pattype){
+ switch (pattype) {
 case 0:
 a = bytestream2_get_byte(&g);
 b = bytestream2_get_byte(&g);
- for(y = 0; y < 4; y++)
- for(x = 0; x < 4; x++, pattern >>= 1)
+ for (y = 0; y < 4; y++)
+ for (x = 0; x < 4; x++, pattern >>= 1)
 cur[x + y*width] = (pattern & 1) ? b : a;
 break;
 case 1:
 pattern = ~pattern;
 case 2:
 a = bytestream2_get_byte(&g);
- for(y = 0; y < 4; y++)
- for(x = 0; x < 4; x++, pattern >>= 1)
- if(pattern & 1 && check_pixel(prev + x + y*width, pstart, pend))
+ for (y = 0; y < 4; y++)
+ for (x = 0; x < 4; x++, pattern >>= 1)
+ if (pattern & 1 && check_pixel(prev + x + y*width, pstart, pend))
 cur[x + y*width] = prev[x + y*width];
 else
 cur[x + y*width] = a;
 break;
 case 3:
- av_log(c->avctx, AV_LOG_ERROR, "Invalid opcode seen @%d\n",blk);
- return -1;
+ av_log(c->avctx, AV_LOG_ERROR, "Invalid opcode seen @%d\n", blk);
+ return AVERROR_INVALIDDATA;
 }
 break;
 }
@@ -176,8 +175,8 @@
 cur += 4;
 prev += 4;
 blk2++;
- if(blk2 == (width >> 2)){
- blk2 = 0;
+ if (blk2 == (width >> 2)) {
+ blk2 = 0;
 cur += width * 3;
 prev += width * 3;
 }
@@ -189,55 +188,52 @@
 AVPacket *avpkt)
 {
 VBDecContext * const c = avctx->priv_data;
+ AVFrame *frame = data;
 uint8_t *outptr, *srcptr;
- int i, j;
+ int i, j, ret;
 int flags;
 uint32_t size;
 int offset = 0;
 
 bytestream2_init(&c->stream, avpkt->data, avpkt->size);
 
- if(c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
- c->pic.reference = 1;
- if(ff_get_buffer(avctx, &c->pic) < 0){
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
 flags = bytestream2_get_le16(&c->stream);
 
- if(flags & VB_HAS_GMC){
+ if (flags & VB_HAS_GMC) {
 i = (int16_t)bytestream2_get_le16(&c->stream);
 j = (int16_t)bytestream2_get_le16(&c->stream);
 offset = i + j * avctx->width;
 }
- if(flags & VB_HAS_VIDEO){
+ if (flags & VB_HAS_VIDEO) {
 size = bytestream2_get_le32(&c->stream);
 vb_decode_framedata(c, offset);
 bytestream2_skip(&c->stream, size - 4);
 }
- if(flags & VB_HAS_PALETTE){
+ if (flags & VB_HAS_PALETTE) {
 size = bytestream2_get_le32(&c->stream);
 vb_decode_palette(c, size);
 }
 
- memcpy(c->pic.data[1], c->pal, AVPALETTE_SIZE);
- c->pic.palette_has_changed = flags & VB_HAS_PALETTE;
+ memcpy(frame->data[1], c->pal, AVPALETTE_SIZE);
+ frame->palette_has_changed = flags & VB_HAS_PALETTE;
 
- outptr = c->pic.data[0];
+ outptr = frame->data[0];
 srcptr = c->frame;
 
- for(i = 0; i < avctx->height; i++){
+ for (i = 0; i < avctx->height; i++) {
 memcpy(outptr, srcptr, avctx->width);
 srcptr += avctx->width;
- outptr += c->pic.linesize[0];
+ outptr += frame->linesize[0];
 }
 
 FFSWAP(uint8_t*, c->frame, c->prev_frame);
 
 *got_frame = 1;
- *(AVFrame*)data = c->pic;
 
 /* always report that the buffer was completely consumed */
 return avpkt->size;
@@ -247,7 +243,7 @@
 {
 VBDecContext * const c = avctx->priv_data;
 
- c->avctx = avctx;
+ c->avctx = avctx;
 avctx->pix_fmt = AV_PIX_FMT_PAL8;
 
 c->frame = av_mallocz(avctx->width * avctx->height);
@@ -262,20 +258,18 @@
 
 av_freep(&c->frame);
 av_freep(&c->prev_frame);
- if(c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
 
 return 0;
 }
 
 AVCodec ff_vb_decoder = {
 .name = "vb",
+ .long_name = NULL_IF_CONFIG_SMALL("Beam Software VB"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_VB,
 .priv_data_size = sizeof(VBDecContext),
 .init = decode_init,
 .close = decode_end,
 .decode = decode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("Beam Software VB"),
 .capabilities = CODEC_CAP_DR1,
 };

libav-v9.6.tar.bz2/libavcodec/vble.c -> libav-v10.1.tar.bz2/libavcodec/vble.c Changed

@@ -84,10 +84,10 @@
 return 0;
 }
 
-static void vble_restore_plane(VBLEContext *ctx, int plane, int offset,
- int width, int height)
+static void vble_restore_plane(VBLEContext *ctx, AVFrame *pic,
+ int plane, int offset,
+ int width, int height)
 {
- AVFrame *pic = ctx->avctx->coded_frame;
 uint8_t *dst = pic->data[plane];
 uint8_t *val = ctx->val + offset;
 int stride = pic->linesize[plane];
@@ -116,21 +116,15 @@
 AVPacket *avpkt)
 {
 VBLEContext *ctx = avctx->priv_data;
- AVFrame *pic = avctx->coded_frame;
+ AVFrame *pic = data;
 GetBitContext gb;
 const uint8_t *src = avpkt->data;
 int version;
 int offset = 0;
 int width_uv = avctx->width / 2, height_uv = avctx->height / 2;
 
- pic->reference = 0;
-
- /* Clear buffer if need be */
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
-
 /* Allocate buffer */
- if (ff_get_buffer(avctx, pic) < 0) {
+ if (ff_get_buffer(avctx, pic, 0) < 0) {
 av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
 return AVERROR(ENOMEM);
 }
@@ -154,19 +148,18 @@
 }
 
 /* Restore planes. Should be almost identical to Huffyuv's. */
- vble_restore_plane(ctx, 0, offset, avctx->width, avctx->height);
+ vble_restore_plane(ctx, pic, 0, offset, avctx->width, avctx->height);
 
 /* Chroma */
 if (!(ctx->avctx->flags & CODEC_FLAG_GRAY)) {
 offset += avctx->width * avctx->height;
- vble_restore_plane(ctx, 1, offset, width_uv, height_uv);
+ vble_restore_plane(ctx, pic, 1, offset, width_uv, height_uv);
 
 offset += width_uv * height_uv;
- vble_restore_plane(ctx, 2, offset, width_uv, height_uv);
+ vble_restore_plane(ctx, pic, 2, offset, width_uv, height_uv);
 }
 
 *got_frame = 1;
- *(AVFrame *)data = *pic;
 
 return avpkt->size;
 }
@@ -174,12 +167,6 @@
 static av_cold int vble_decode_close(AVCodecContext *avctx)
 {
 VBLEContext *ctx = avctx->priv_data;
- AVFrame *pic = avctx->coded_frame;
-
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
-
- av_freep(&avctx->coded_frame);
 av_freep(&ctx->val);
 
 return 0;
@@ -195,12 +182,6 @@
 
 avctx->pix_fmt = AV_PIX_FMT_YUV420P;
 avctx->bits_per_raw_sample = 8;
- avctx->coded_frame = avcodec_alloc_frame();
-
- if (!avctx->coded_frame) {
- av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n");
- return AVERROR(ENOMEM);
- }
 
 ctx->size = avpicture_get_size(avctx->pix_fmt,
 avctx->width, avctx->height);
@@ -218,6 +199,7 @@
 
 AVCodec ff_vble_decoder = {
 .name = "vble",
+ .long_name = NULL_IF_CONFIG_SMALL("VBLE Lossless Codec"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_VBLE,
 .priv_data_size = sizeof(VBLEContext),
@@ -225,5 +207,4 @@
 .close = vble_decode_close,
 .decode = vble_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("VBLE Lossless Codec"),
 };

libav-v9.6.tar.bz2/libavcodec/vc1.c -> libav-v10.1.tar.bz2/libavcodec/vc1.c Changed

@@ -27,8 +27,8 @@
 *
 */
 
+#include "libavutil/attributes.h"
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "vc1.h"
@@ -367,7 +367,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,
@@ -408,7 +408,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;
 }
@@ -570,6 +570,56 @@
 return 0;
 }
 
+/* fill lookup tables for intensity compensation */
+#define INIT_LUT(lumscale, lumshift, luty, lutuv, chain) do { \
+ int scale, shift, i; \
+ if (!lumscale) { \
+ scale = -64; \
+ shift = (255 - lumshift * 2) << 6; \
+ if (lumshift > 31) \
+ shift += 128 << 6; \
+ } else { \
+ scale = lumscale + 32; \
+ if (lumshift > 31) \
+ shift = (lumshift - 64) << 6; \
+ else \
+ shift = lumshift << 6; \
+ } \
+ for (i = 0; i < 256; i++) { \
+ int iy = chain ? luty[i] : i; \
+ int iu = chain ? lutuv[i] : i; \
+ luty[i] = av_clip_uint8((scale * iy + shift + 32) >> 6); \
+ lutuv[i] = av_clip_uint8((scale * (iu - 128) + 128*64 + 32) >> 6);\
+ } \
+ } while(0)
+
+static void rotate_luts(VC1Context *v)
+{
+#define ROTATE(DEF, L, N, C, A) do { \
+ if (v->s.pict_type == AV_PICTURE_TYPE_BI || v->s.pict_type == AV_PICTURE_TYPE_B) { \
+ C = A; \
+ } else { \
+ DEF; \
+ 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(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;
+ if (v->curr_luty == v->next_luty) {
+ // If we just initialized next_lut, clear next_use_ic to match.
+ v->next_use_ic = 0;
+ }
+}
+
 int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
 {
 int pqindex, lowquant, status;
@@ -656,8 +706,8 @@
 (v->s.pict_type == AV_PICTURE_TYPE_P) ? 'P' : ((v->s.pict_type == AV_PICTURE_TYPE_I) ? 'I' : 'B'),
 pqindex, v->pq, v->halfpq, v->rangeredfrm);
 
- if (v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_P)
- v->use_ic = 0;
+ if (v->first_pic_header_flag)
+ rotate_luts(v);
 
 switch (v->s.pict_type) {
 case AV_PICTURE_TYPE_P:
@@ -668,28 +718,13 @@
 lowquant = (v->pq > 12) ? 0 : 1;
 v->mv_mode = ff_vc1_mv_pmode_table[lowquant][get_unary(gb, 1, 4)];
 if (v->mv_mode == MV_PMODE_INTENSITY_COMP) {
- int scale, shift, i;
 v->mv_mode2 = ff_vc1_mv_pmode_table2[lowquant][get_unary(gb, 1, 3)];
 v->lumscale = get_bits(gb, 6);
 v->lumshift = get_bits(gb, 6);
- v->use_ic = 1;
+ v->last_use_ic = 1;
 /* fill lookup tables for intensity compensation */
- if (!v->lumscale) {
- scale = -64;
- shift = (255 - v->lumshift * 2) << 6;
- if (v->lumshift > 31)
- shift += 128 << 6;
- } else {
- scale = v->lumscale + 32;
- if (v->lumshift > 31)
- shift = (v->lumshift - 64) << 6;
- else
- shift = v->lumshift << 6;
- }
- for (i = 0; i < 256; i++) {
- v->luty[i] = av_clip_uint8((scale * i + shift + 32) >> 6);
- v->lutuv[i] = av_clip_uint8((scale * (i - 128) + 128*64 + 32) >> 6);
- }
+ INIT_LUT(v->lumscale, v->lumshift, v->last_luty[0], v->last_lutuv[0], 1);
+ INIT_LUT(v->lumscale, v->lumshift, v->last_luty[1], v->last_lutuv[1], 1);
 }
 v->qs_last = v->s.quarter_sample;
 if (v->mv_mode == MV_PMODE_1MV_HPEL || v->mv_mode == MV_PMODE_1MV_HPEL_BILIN)
@@ -800,32 +835,14 @@
 return 0;
 }
 
-/* fill lookup tables for intensity compensation */
-#define INIT_LUT(lumscale, lumshift, luty, lutuv) \
- if (!lumscale) { \
- scale = -64; \
- shift = (255 - lumshift * 2) << 6; \
- if (lumshift > 31) \
- shift += 128 << 6; \
- } else { \
- scale = lumscale + 32; \
- if (lumshift > 31) \
- shift = (lumshift - 64) << 6; \
- else \
- shift = lumshift << 6; \
- } \
- for (i = 0; i < 256; i++) { \
- luty[i] = av_clip_uint8((scale * i + shift + 32) >> 6); \
- lutuv[i] = av_clip_uint8((scale * (i - 128) + 128*64 + 32) >> 6); \
- }
-
 int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
 {
 int pqindex, lowquant;
 int status;
 int mbmodetab, imvtab, icbptab, twomvbptab, fourmvbptab; /* useful only for debugging */
- int scale, shift, i; /* for initializing LUT for intensity compensation */
+ int field_mode, fcm;
 
+ v->numref = 0;
 v->p_frame_skipped = 0;
 if (v->second_field) {
 v->s.pict_type = (v->fptype & 1) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
@@ -836,26 +853,29 @@
 goto parse_common_info;
 }
 
- v->field_mode = 0;
+ field_mode = 0;
 if (v->interlace) {
- v->fcm = decode012(gb);
- if (v->fcm) {
- if (v->fcm == ILACE_FIELD)
- v->field_mode = 1;
- if (!v->warn_interlaced++)
- av_log(v->s.avctx, AV_LOG_ERROR,
- "Interlaced frames/fields support is incomplete\n");
+ fcm = decode012(gb);
+ if (fcm) {
+ if (fcm == ILACE_FIELD)
+ field_mode = 1;
 }
 } else {
- v->fcm = PROGRESSIVE;
+ fcm = PROGRESSIVE;
 }
+ if (!v->first_pic_header_flag && v->field_mode != field_mode)
+ return AVERROR_INVALIDDATA;
+ v->field_mode = field_mode;
+ v->fcm = fcm;
 
 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;
@@ -886,7 +906,7 @@
 }
 }
 if (v->panscanflag) {
- av_log_missing_feature(v->s.avctx, "Pan-scan", 0);
+ avpriv_report_missing_feature(v->s.avctx, "Pan-scan");
 //...
 }
 if (v->p_frame_skipped) {
@@ -952,12 +972,12 @@
 if (v->postprocflag)
 v->postproc = get_bits(gb, 2);
 
- if (v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_P)
- v->use_ic = 0;
-
 if (v->parse_only)
 return 0;
 
+ if (v->first_pic_header_flag)
+ rotate_luts(v);
+
 switch (v->s.pict_type) {
 case AV_PICTURE_TYPE_I:
 case AV_PICTURE_TYPE_BI:
@@ -1008,7 +1028,9 @@
 if (v->intcomp) {
 v->lumscale = get_bits(gb, 6);
 v->lumshift = get_bits(gb, 6);
- INIT_LUT(v->lumscale, v->lumshift, v->luty, v->lutuv);
+ INIT_LUT(v->lumscale, v->lumshift, v->last_luty[0], v->last_lutuv[0], 1);
+ INIT_LUT(v->lumscale, v->lumshift, v->last_luty[1], v->last_lutuv[1], 1);
+ v->last_use_ic = 1;
 }
 status = bitplane_decoding(v->s.mbskip_table, &v->skip_is_raw, v);
 av_log(v->s.avctx, AV_LOG_DEBUG, "SKIPMB plane encoding: "
@@ -1051,17 +1073,38 @@
 int mvmode2;
 mvmode2 = get_unary(gb, 1, 3);
 v->mv_mode2 = ff_vc1_mv_pmode_table2[lowquant][mvmode2];
- if (v->field_mode)
- v->intcompfield = decode210(gb);
- v->lumscale = get_bits(gb, 6);
- v->lumshift = get_bits(gb, 6);
- INIT_LUT(v->lumscale, v->lumshift, v->luty, v->lutuv);
- if ((v->field_mode) && !v->intcompfield) {
+ if (v->field_mode) {
+ v->intcompfield = decode210(gb) ^ 3;
+ } else
+ v->intcompfield = 3;
+
+ v->lumscale2 = v->lumscale = 32;
+ v->lumshift2 = v->lumshift = 0;
+ if (v->intcompfield & 1) {
+ v->lumscale = get_bits(gb, 6);
+ v->lumshift = get_bits(gb, 6);
+ }
+ if ((v->intcompfield & 2) && v->field_mode) {
 v->lumscale2 = get_bits(gb, 6);
 v->lumshift2 = get_bits(gb, 6);
- INIT_LUT(v->lumscale2, v->lumshift2, v->luty2, v->lutuv2);
+ } else if(!v->field_mode) {
+ v->lumscale2 = v->lumscale;
+ v->lumshift2 = v->lumshift;
+ }
+ if (v->field_mode && v->second_field) {
+ if (v->cur_field_type) {
+ INIT_LUT(v->lumscale , v->lumshift , v->curr_luty[v->cur_field_type^1], v->curr_lutuv[v->cur_field_type^1], 0);
+ INIT_LUT(v->lumscale2, v->lumshift2, v->last_luty[v->cur_field_type ], v->last_lutuv[v->cur_field_type ], 1);
+ } else {
+ 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;
+ } 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);
 }
- v->use_ic = 1;
+ v->last_use_ic = 1;
 }
 v->qs_last = v->s.quarter_sample;
 if (v->mv_mode == MV_PMODE_1MV_HPEL || v->mv_mode == MV_PMODE_1MV_HPEL_BILIN)
@@ -1138,9 +1181,13 @@
 }
 break;
 case AV_PICTURE_TYPE_B:
- // TODO: implement interlaced frame B picture decoding
- if (v->fcm == ILACE_FRAME)
- return -1;
+ 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 (v->bfraction == 0) {
+ return -1;
+ }
+ }
 if (v->extended_mv)
 v->mvrange = get_unary(gb, 0, 3);
 else
@@ -1186,6 +1233,38 @@
 v->fourmvbp_vlc = &ff_vc1_4mv_block_pattern_vlc[fourmvbptab];
 }
 v->numref = 1; // interlaced field B pictures are always 2-ref
+ } else if (v->fcm == ILACE_FRAME) {
+ if (v->extended_dmv)
+ v->dmvrange = get_unary(gb, 0, 3);
+ if (get_bits1(gb)) /* intcomp - present but shall always be 0 */
+ av_log(v->s.avctx, AV_LOG_WARNING, "Intensity compensation set for B picture\n");
+ v->intcomp = 0;
+ v->mv_mode = MV_PMODE_1MV;
+ v->fourmvswitch = 0;
+ v->qs_last = v->s.quarter_sample;
+ v->s.quarter_sample = 1;
+ v->s.mspel = 1;
+ status = bitplane_decoding(v->direct_mb_plane, &v->dmb_is_raw, v);
+ if (status < 0)
+ return -1;
+ av_log(v->s.avctx, AV_LOG_DEBUG, "MB Direct Type plane encoding: "
+ "Imode: %i, Invert: %i\n", status>>1, status&1);
+ status = bitplane_decoding(v->s.mbskip_table, &v->skip_is_raw, v);
+ if (status < 0)
+ return -1;
+ av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: "
+ "Imode: %i, Invert: %i\n", status>>1, status&1);
+ mbmodetab = get_bits(gb, 2);
+ v->mbmode_vlc = &ff_vc1_intfr_non4mv_mbmode_vlc[mbmodetab];
+ imvtab = get_bits(gb, 2);
+ v->imv_vlc = &ff_vc1_1ref_mvdata_vlc[imvtab];
+ // interlaced p/b-picture cbpcy range is [1, 63]
+ icbptab = get_bits(gb, 3);
+ v->cbpcy_vlc = &ff_vc1_icbpcy_vlc[icbptab];
+ twomvbptab = get_bits(gb, 2);
+ v->twomvbp_vlc = &ff_vc1_2mv_block_pattern_vlc[twomvbptab];
+ fourmvbptab = get_bits(gb, 2);
+ v->fourmvbp_vlc = &ff_vc1_4mv_block_pattern_vlc[fourmvbptab];
 } else {
 v->mv_mode = get_bits1(gb) ? MV_PMODE_1MV : MV_PMODE_1MV_HPEL_BILIN;
 v->qs_last = v->s.quarter_sample;
@@ -1485,7 +1564,7 @@
 * @param v The VC1Context to initialize
 * @return Status
 */
-int ff_vc1_init_common(VC1Context *v)
+av_cold int ff_vc1_init_common(VC1Context *v)
 {
 static int done = 0;
 int i = 0;

libav-v9.6.tar.bz2/libavcodec/vc1.h -> libav-v10.1.tar.bz2/libavcodec/vc1.h Changed

@@ -24,6 +24,7 @@
 #define AVCODEC_VC1_H
 
 #include "avcodec.h"
+#include "h264chroma.h"
 #include "mpegvideo.h"
 #include "intrax8.h"
 #include "vc1dsp.h"
@@ -181,6 +182,7 @@
 typedef struct VC1Context{
 MpegEncContext s;
 IntraX8Context x8;
+ H264ChromaContext h264chroma;
 VC1DSPContext vc1dsp;
 
 int bits;
@@ -296,8 +298,11 @@
 int dmb_is_raw; ///< direct mb plane is raw
 int fmb_is_raw; ///< forward mb plane is raw
 int skip_is_raw; ///< skip mb plane is not coded
- uint8_t luty[256], lutuv[256]; ///< lookup tables used for intensity compensation
- int use_ic; ///< use intensity compensation in B-frames
+ uint8_t last_luty[2][256], last_lutuv[2][256]; ///< lookup tables used for intensity compensation
+ 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 rnd; ///< rounding control
 
 /** Frame decoding info for S/M profiles only */
@@ -340,7 +345,6 @@
 int intcomp;
 uint8_t lumscale2; ///< for interlaced field P picture
 uint8_t lumshift2;
- uint8_t luty2[256], lutuv2[256]; // lookup tables used for intensity compensation
 VLC* mbmode_vlc;
 VLC* imv_vlc;
 VLC* twomvbp_vlc;
@@ -352,7 +356,6 @@
 int8_t zzi_8x8[64];
 uint8_t *blk_mv_type_base, *blk_mv_type; ///< 0: frame MV, 1: field MV (interlaced frame)
 uint8_t *mv_f_base, *mv_f[2]; ///< 0: MV obtained from same field, 1: opposite field
- uint8_t *mv_f_last_base, *mv_f_last[2];
 uint8_t *mv_f_next_base, *mv_f_next[2];
 int field_mode; ///< 1 for interlaced field pictures
 int fptype;
@@ -370,13 +373,14 @@
 int qs_last; ///< if qpel has been used in the previous (tr.) picture
 int bmvtype;
 int frfd, brfd; ///< reference frame distance (forward or backward)
+ int first_pic_header_flag;
 int pic_header_flag;
 
 /** Frame decoding info for sprite modes */
 //@{
 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
 //@}
@@ -385,7 +389,7 @@
 int bi_type;
 int x8_type;
 
- DCTELEM (*block)[6][64];
+ int16_t (*block)[6][64];
 int n_allocated_blks, cur_blk_idx, left_blk_idx, topleft_blk_idx, top_blk_idx;
 uint32_t *cbp_base, *cbp;
 uint8_t *is_intra_base, *is_intra;
@@ -397,8 +401,7 @@
 int end_mb_x; ///< Horizontal macroblock limit (used only by mss2)
 
 int parse_only; ///< Context is used within parser
-
- int warn_interlaced;
+ int resync_marker; ///< could this stream contain resync markers
 } VC1Context;
 
 /** Find VC-1 marker in buffer
@@ -453,9 +456,9 @@
 int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext *gb);
 int ff_vc1_init_common(VC1Context *v);
 
-av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v);
-av_cold void ff_vc1_init_transposed_scantables(VC1Context *v);
-av_cold int ff_vc1_decode_end(AVCodecContext *avctx);
+int ff_vc1_decode_init_alloc_tables(VC1Context *v);
+void ff_vc1_init_transposed_scantables(VC1Context *v);
+int ff_vc1_decode_end(AVCodecContext *avctx);
 void ff_vc1_decode_blocks(VC1Context *v);
 
 #endif /* AVCODEC_VC1_H */

libav-v9.6.tar.bz2/libavcodec/vc1_parser.c -> libav-v10.1.tar.bz2/libavcodec/vc1_parser.c Changed

libav-v9.6.tar.bz2/libavcodec/vc1dec.c -> libav-v10.1.tar.bz2/libavcodec/vc1dec.c Changed

@@ -27,17 +27,17 @@
 */
 
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
+#include "error_resilience.h"
 #include "mpegvideo.h"
 #include "h263.h"
+#include "h264chroma.h"
 #include "vc1.h"
 #include "vc1data.h"
 #include "vc1acdata.h"
 #include "msmpeg4data.h"
 #include "unary.h"
 #include "mathops.h"
-#include "vdpau_internal.h"
 
 #undef NDEBUG
 #include <assert.h>
@@ -72,6 +72,16 @@
 };
 /** @} */ //imode defines
 
+static void init_block_index(VC1Context *v)
+{
+ MpegEncContext *s = &v->s;
+ ff_init_block_index(s);
+ if (v->field_mode && !(v->second_field ^ v->tff)) {
+ s->dest[0] += s->current_picture_ptr->f.linesize[0];
+ s->dest[1] += s->current_picture_ptr->f.linesize[1];
+ s->dest[2] += s->current_picture_ptr->f.linesize[2];
+ }
+}
 
 /** @} */ //Bitplane group
 
@@ -79,7 +89,7 @@
 {
 MpegEncContext *s = &v->s;
 int topleft_mb_pos, top_mb_pos;
- int stride_y, fieldtx;
+ int stride_y, fieldtx = 0;
 int v_dist;
 
 /* The put pixels loop is always one MB row behind the decoding loop,
@@ -92,7 +102,8 @@
 if (!s->first_slice_line) {
 if (s->mb_x) {
 topleft_mb_pos = (s->mb_y - 1) * s->mb_stride + s->mb_x - 1;
- fieldtx = v->fieldtx_plane[topleft_mb_pos];
+ if (v->fcm == ILACE_FRAME)
+ fieldtx = v->fieldtx_plane[topleft_mb_pos];
 stride_y = s->linesize << fieldtx;
 v_dist = (16 - fieldtx) >> (fieldtx == 0);
 s->dsp.put_signed_pixels_clamped(v->block[v->topleft_blk_idx][0],
@@ -116,7 +127,8 @@
 }
 if (s->mb_x == s->mb_width - 1) {
 top_mb_pos = (s->mb_y - 1) * s->mb_stride + s->mb_x;
- fieldtx = v->fieldtx_plane[top_mb_pos];
+ if (v->fcm == ILACE_FRAME)
+ fieldtx = v->fieldtx_plane[top_mb_pos];
 stride_y = s->linesize << fieldtx;
 v_dist = fieldtx ? 15 : 8;
 s->dsp.put_signed_pixels_clamped(v->block[v->top_blk_idx][0],
@@ -330,11 +342,13 @@
 static void vc1_mc_1mv(VC1Context *v, int dir)
 {
 MpegEncContext *s = &v->s;
- DSPContext *dsp = &v->s.dsp;
+ H264ChromaContext *h264chroma = &v->h264chroma;
 uint8_t *srcY, *srcU, *srcV;
 int dxy, mx, my, uvmx, uvmy, src_x, src_y, uvsrc_x, uvsrc_y;
- int off, off_uv;
 int v_edge_pos = s->v_edge_pos >> v->field_mode;
+ int i;
+ uint8_t (*luty)[256], (*lutuv)[256];
+ int use_ic;
 
 if ((!v->field_mode ||
 (v->ref_field_type[dir] == 1 && v->cur_field_type == 1)) &&
@@ -346,8 +360,10 @@
 
 // store motion vectors for further use in B frames
 if (s->pict_type == AV_PICTURE_TYPE_P) {
- s->current_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][0] = mx;
- s->current_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][1] = my;
+ for (i = 0; i < 4; i++) {
+ s->current_picture.motion_val[1][s->block_index[i] + v->blocks_off][0] = mx;
+ s->current_picture.motion_val[1][s->block_index[i] + v->blocks_off][1] = my;
+ }
 }
 
 uvmx = (mx + ((mx & 3) == 3)) >> 1;
@@ -366,32 +382,34 @@
 uvmx = uvmx + ((uvmx < 0) ? (uvmx & 1) : -(uvmx & 1));
 uvmy = uvmy + ((uvmy < 0) ? (uvmy & 1) : -(uvmy & 1));
 }
- if (v->field_mode) { // interlaced field picture
- if (!dir) {
- if ((v->cur_field_type != v->ref_field_type[dir]) && v->cur_field_type) {
- srcY = s->current_picture.f.data[0];
- srcU = s->current_picture.f.data[1];
- srcV = s->current_picture.f.data[2];
- } else {
- srcY = s->last_picture.f.data[0];
- srcU = s->last_picture.f.data[1];
- srcV = s->last_picture.f.data[2];
- }
+ if (!dir) {
+ if (v->field_mode && (v->cur_field_type != v->ref_field_type[dir]) && v->second_field) {
+ srcY = s->current_picture.f.data[0];
+ srcU = s->current_picture.f.data[1];
+ srcV = s->current_picture.f.data[2];
+ luty = v->curr_luty;
+ lutuv = v->curr_lutuv;
+ use_ic = v->curr_use_ic;
 } else {
- srcY = s->next_picture.f.data[0];
- srcU = s->next_picture.f.data[1];
- srcV = s->next_picture.f.data[2];
- }
- } else {
- if (!dir) {
 srcY = s->last_picture.f.data[0];
 srcU = s->last_picture.f.data[1];
 srcV = s->last_picture.f.data[2];
- } else {
- srcY = s->next_picture.f.data[0];
- srcU = s->next_picture.f.data[1];
- srcV = s->next_picture.f.data[2];
+ luty = v->last_luty;
+ lutuv = v->last_lutuv;
+ use_ic = v->last_use_ic;
 }
+ } else {
+ srcY = s->next_picture.f.data[0];
+ srcU = s->next_picture.f.data[1];
+ srcV = s->next_picture.f.data[2];
+ luty = v->next_luty;
+ lutuv = v->next_lutuv;
+ use_ic = v->next_use_ic;
+ }
+
+ if (!srcY || !srcU) {
+ av_log(v->s.avctx, AV_LOG_ERROR, "Referenced frame missing.\n");
+ return;
 }
 
 src_x = s->mb_x * 16 + (mx >> 2);
@@ -427,21 +445,26 @@
 srcV = s->edge_emu_buffer + 18 * s->linesize;
 }
 
- if (v->rangeredfrm || (v->mv_mode == MV_PMODE_INTENSITY_COMP)
+ if (v->rangeredfrm || use_ic
 || s->h_edge_pos < 22 || v_edge_pos < 22
 || (unsigned)(src_x - s->mspel) > s->h_edge_pos - (mx&3) - 16 - s->mspel * 3
 || (unsigned)(src_y - 1) > v_edge_pos - (my&3) - 16 - 3) {
 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, 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 , srcU, s->uvlinesize, 8 + 1, 8 + 1,
+ 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, srcV, s->uvlinesize, 8 + 1, 8 + 1,
+ 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;
@@ -468,22 +491,24 @@
 }
 }
 /* if we deal with intensity compensation we need to scale source blocks */
- if (v->mv_mode == MV_PMODE_INTENSITY_COMP) {
+ if (use_ic) {
 int i, j;
 uint8_t *src, *src2;
 
 src = srcY;
 for (j = 0; j < 17 + s->mspel * 2; j++) {
+ int f = v->field_mode ? v->ref_field_type[dir] : ((j + src_y - s->mspel) & 1) ;
 for (i = 0; i < 17 + s->mspel * 2; i++)
- src[i] = v->luty[src[i]];
+ src[i] = luty[f][src[i]];
 src += s->linesize;
 }
 src = srcU;
 src2 = srcV;
 for (j = 0; j < 9; j++) {
+ int f = v->field_mode ? v->ref_field_type[dir] : ((j + uvsrc_y) & 1);
 for (i = 0; i < 9; i++) {
- src[i] = v->lutuv[src[i]];
- src2[i] = v->lutuv[src2[i]];
+ src[i] = lutuv[f][src[i]];
+ src2[i] = lutuv[f][src2[i]];
 }
 src += s->uvlinesize;
 src2 += s->uvlinesize;
@@ -492,26 +517,19 @@
 srcY += s->mspel * (1 + s->linesize);
 }
 
- if (v->field_mode && v->cur_field_type) {
- off = s->current_picture_ptr->f.linesize[0];
- off_uv = s->current_picture_ptr->f.linesize[1];
- } else {
- off = 0;
- off_uv = 0;
- }
 if (s->mspel) {
 dxy = ((my & 3) << 2) | (mx & 3);
- v->vc1dsp.put_vc1_mspel_pixels_tab[dxy](s->dest[0] + off , srcY , s->linesize, v->rnd);
- v->vc1dsp.put_vc1_mspel_pixels_tab[dxy](s->dest[0] + off + 8, srcY + 8, s->linesize, v->rnd);
+ v->vc1dsp.put_vc1_mspel_pixels_tab[dxy](s->dest[0] , srcY , s->linesize, v->rnd);
+ v->vc1dsp.put_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8, srcY + 8, s->linesize, v->rnd);
 srcY += s->linesize * 8;
- v->vc1dsp.put_vc1_mspel_pixels_tab[dxy](s->dest[0] + off + 8 * s->linesize , srcY , s->linesize, v->rnd);
- v->vc1dsp.put_vc1_mspel_pixels_tab[dxy](s->dest[0] + off + 8 * s->linesize + 8, srcY + 8, s->linesize, v->rnd);
+ v->vc1dsp.put_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8 * s->linesize , srcY , s->linesize, v->rnd);
+ v->vc1dsp.put_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8 * s->linesize + 8, srcY + 8, s->linesize, v->rnd);
 } else { // hpel mc - always used for luma
 dxy = (my & 2) | ((mx & 2) >> 1);
 if (!v->rnd)
- dsp->put_pixels_tab[0][dxy](s->dest[0] + off, srcY, s->linesize, 16);
+ s->hdsp.put_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize, 16);
 else
- dsp->put_no_rnd_pixels_tab[0][dxy](s->dest[0] + off, srcY, s->linesize, 16);
+ s->hdsp.put_no_rnd_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize, 16);
 }
 
 if (s->flags & CODEC_FLAG_GRAY) return;
@@ -519,11 +537,11 @@
 uvmx = (uvmx & 3) << 1;
 uvmy = (uvmy & 3) << 1;
 if (!v->rnd) {
- dsp->put_h264_chroma_pixels_tab[0](s->dest[1] + off_uv, srcU, s->uvlinesize, 8, uvmx, uvmy);
- dsp->put_h264_chroma_pixels_tab[0](s->dest[2] + off_uv, srcV, s->uvlinesize, 8, uvmx, uvmy);
+ h264chroma->put_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
+ h264chroma->put_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
 } else {
- v->vc1dsp.put_no_rnd_vc1_chroma_pixels_tab[0](s->dest[1] + off_uv, srcU, s->uvlinesize, 8, uvmx, uvmy);
- v->vc1dsp.put_no_rnd_vc1_chroma_pixels_tab[0](s->dest[2] + off_uv, srcV, s->uvlinesize, 8, uvmx, uvmy);
+ v->vc1dsp.put_no_rnd_vc1_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
+ v->vc1dsp.put_no_rnd_vc1_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
 }
 }
 
@@ -540,15 +558,16 @@
 
 /** Do motion compensation for 4-MV macroblock - luminance block
 */
-static void vc1_mc_4mv_luma(VC1Context *v, int n, int dir)
+static void vc1_mc_4mv_luma(VC1Context *v, int n, int dir, int avg)
 {
 MpegEncContext *s = &v->s;
- DSPContext *dsp = &v->s.dsp;
 uint8_t *srcY;
 int dxy, mx, my, src_x, src_y;
 int off;
 int fieldmv = (v->fcm == ILACE_FRAME) ? v->blk_mv_type[s->block_index[n]] : 0;
 int v_edge_pos = s->v_edge_pos >> v->field_mode;
+ uint8_t (*luty)[256];
+ int use_ic;
 
 if ((!v->field_mode ||
 (v->ref_field_type[dir] == 1 && v->cur_field_type == 1)) &&
@@ -559,15 +578,25 @@
 my = s->mv[dir][n][1];
 
 if (!dir) {
- if (v->field_mode) {
- if ((v->cur_field_type != v->ref_field_type[dir]) && v->cur_field_type)
- srcY = s->current_picture.f.data[0];
- else
- srcY = s->last_picture.f.data[0];
- } else
+ 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;
+ } else {
 srcY = s->last_picture.f.data[0];
- } else
+ luty = v->last_luty;
+ use_ic = v->last_use_ic;
+ }
+ } else {
 srcY = s->next_picture.f.data[0];
+ luty = v->next_luty;
+ use_ic = v->next_use_ic;
+ }
+
+ if (!srcY) {
+ av_log(v->s.avctx, AV_LOG_ERROR, "Referenced frame missing.\n");
+ return;
+ }
 
 if (v->field_mode) {
 if (v->cur_field_type != v->ref_field_type[dir])
@@ -602,8 +631,8 @@
 ty = (chosen_mv[f][0][1] + chosen_mv[f][1][1]) / 2;
 break;
 }
- s->current_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][0] = tx;
- s->current_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][1] = ty;
+ s->current_picture.motion_val[1][s->block_index[0] + v->blocks_off][0] = tx;
+ s->current_picture.motion_val[1][s->block_index[0] + v->blocks_off][1] = ty;
 for (k = 0; k < 4; k++)
 v->mv_f[1][s->block_index[k] + v->blocks_off] = f;
 }
@@ -612,6 +641,10 @@
 int qx, qy;
 int width = s->avctx->coded_width;
 int height = s->avctx->coded_height >> 1;
+ if (s->pict_type == AV_PICTURE_TYPE_P) {
+ s->current_picture.motion_val[1][s->block_index[n] + v->blocks_off][0] = mx;
+ s->current_picture.motion_val[1][s->block_index[n] + v->blocks_off][1] = my;
+ }
 qx = (s->mb_x * 16) + (mx >> 2);
 qy = (s->mb_y * 8) + (my >> 3);
 
@@ -629,8 +662,6 @@
 off = ((n > 1) ? s->linesize : 0) + (n & 1) * 8;
 else
 off = s->linesize * 4 * (n & 2) + (n & 1) * 8;
- if (v->field_mode && v->cur_field_type)
- off += s->current_picture_ptr->f.linesize[0];
 
 src_x = s->mb_x * 16 + (n & 1) * 8 + (mx >> 2);
 if (!fieldmv)
@@ -661,13 +692,14 @@
 v_edge_pos--;
 if (fieldmv && (src_y & 1) && src_y < 4)
 src_y--;
- if (v->rangeredfrm || (v->mv_mode == MV_PMODE_INTENSITY_COMP)
+ if (v->rangeredfrm || use_ic
 || s->h_edge_pos < 13 || v_edge_pos < 23
 || (unsigned)(src_x - s->mspel) > s->h_edge_pos - (mx & 3) - 8 - s->mspel * 2
 || (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, 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);
@@ -685,14 +717,15 @@
 }
 }
 /* if we deal with intensity compensation we need to scale source blocks */
- if (v->mv_mode == MV_PMODE_INTENSITY_COMP) {
+ if (use_ic) {
 int i, j;
 uint8_t *src;
 
 src = srcY;
 for (j = 0; j < 9 + s->mspel * 2; j++) {
+ int f = v->field_mode ? v->ref_field_type[dir] : (((j<<fieldmv)+src_y - (s->mspel << fieldmv)) & 1);
 for (i = 0; i < 9 + s->mspel * 2; i++)
- src[i] = v->luty[src[i]];
+ src[i] = luty[f][src[i]];
 src += s->linesize << fieldmv;
 }
 }
@@ -701,13 +734,16 @@
 
 if (s->mspel) {
 dxy = ((my & 3) << 2) | (mx & 3);
- v->vc1dsp.put_vc1_mspel_pixels_tab[dxy](s->dest[0] + off, srcY, s->linesize << fieldmv, v->rnd);
+ if (avg)
+ v->vc1dsp.avg_vc1_mspel_pixels_tab[dxy](s->dest[0] + off, srcY, s->linesize << fieldmv, v->rnd);
+ else
+ v->vc1dsp.put_vc1_mspel_pixels_tab[dxy](s->dest[0] + off, srcY, s->linesize << fieldmv, v->rnd);
 } else { // hpel mc - always used for luma
 dxy = (my & 2) | ((mx & 2) >> 1);
 if (!v->rnd)
- dsp->put_pixels_tab[1][dxy](s->dest[0] + off, srcY, s->linesize, 8);
+ s->hdsp.put_pixels_tab[1][dxy](s->dest[0] + off, srcY, s->linesize, 8);
 else
- dsp->put_no_rnd_pixels_tab[1][dxy](s->dest[0] + off, srcY, s->linesize, 8);
+ s->hdsp.put_no_rnd_pixels_tab[1][dxy](s->dest[0] + off, srcY, s->linesize, 8);
 }
 }
 
@@ -769,14 +805,16 @@
 static void vc1_mc_4mv_chroma(VC1Context *v, int dir)
 {
 MpegEncContext *s = &v->s;
- DSPContext *dsp = &v->s.dsp;
+ H264ChromaContext *h264chroma = &v->h264chroma;
 uint8_t *srcU, *srcV;
 int uvmx, uvmy, uvsrc_x, uvsrc_y;
 int k, tx = 0, ty = 0;
 int mvx[4], mvy[4], intra[4], mv_f[4];
 int valid_count;
- int chroma_ref_type = v->cur_field_type, off = 0;
+ int chroma_ref_type = v->cur_field_type;
 int v_edge_pos = s->v_edge_pos >> v->field_mode;
+ uint8_t (*lutuv)[256];
+ int use_ic;
 
 if (!v->field_mode && !v->s.last_picture.f.data[0])
 return;
@@ -796,8 +834,8 @@
 valid_count = get_chroma_mv(mvx, mvy, intra, 0, &tx, &ty);
 chroma_ref_type = v->reffield;
 if (!valid_count) {
- s->current_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][0] = 0;
- s->current_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][1] = 0;
+ s->current_picture.motion_val[1][s->block_index[0] + v->blocks_off][0] = 0;
+ s->current_picture.motion_val[1][s->block_index[0] + v->blocks_off][1] = 0;
 v->luma_mv[s->mb_x][0] = v->luma_mv[s->mb_x][1] = 0;
 return; //no need to do MC for intra blocks
 }
@@ -811,8 +849,8 @@
 }
 if (v->field_mode && chroma_ref_type == 1 && v->cur_field_type == 1 && !v->s.last_picture.f.data[0])
 return;
- s->current_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][0] = tx;
- s->current_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][1] = ty;
+ s->current_picture.motion_val[1][s->block_index[0] + v->blocks_off][0] = tx;
+ s->current_picture.motion_val[1][s->block_index[0] + v->blocks_off][1] = ty;
 uvmx = (tx + ((tx & 3) == 3)) >> 1;
 uvmy = (ty + ((ty & 3) == 3)) >> 1;
 
@@ -839,39 +877,49 @@
 }
 
 if (!dir) {
- if (v->field_mode) {
- if ((v->cur_field_type != chroma_ref_type) && v->cur_field_type) {
- srcU = s->current_picture.f.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x;
- srcV = s->current_picture.f.data[2] + uvsrc_y * s->uvlinesize + uvsrc_x;
- } else {
- srcU = s->last_picture.f.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x;
- srcV = s->last_picture.f.data[2] + uvsrc_y * s->uvlinesize + uvsrc_x;
- }
+ if (v->field_mode && (v->cur_field_type != chroma_ref_type) && v->second_field) {
+ srcU = s->current_picture.f.data[1];
+ srcV = s->current_picture.f.data[2];
+ lutuv = v->curr_lutuv;
+ use_ic = v->curr_use_ic;
 } else {
- srcU = s->last_picture.f.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x;
- srcV = s->last_picture.f.data[2] + uvsrc_y * s->uvlinesize + uvsrc_x;
+ srcU = s->last_picture.f.data[1];
+ srcV = s->last_picture.f.data[2];
+ lutuv = v->last_lutuv;
+ use_ic = v->last_use_ic;
 }
 } else {
- srcU = s->next_picture.f.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x;
- srcV = s->next_picture.f.data[2] + uvsrc_y * s->uvlinesize + uvsrc_x;
+ srcU = s->next_picture.f.data[1];
+ srcV = s->next_picture.f.data[2];
+ lutuv = v->next_lutuv;
+ use_ic = v->next_use_ic;
 }
 
+ if (!srcU) {
+ av_log(v->s.avctx, AV_LOG_ERROR, "Referenced frame missing.\n");
+ return;
+ }
+
+ srcU += uvsrc_y * s->uvlinesize + uvsrc_x;
+ srcV += uvsrc_y * s->uvlinesize + uvsrc_x;
+
 if (v->field_mode) {
 if (chroma_ref_type) {
 srcU += s->current_picture_ptr->f.linesize[1];
 srcV += s->current_picture_ptr->f.linesize[2];
 }
- off = v->cur_field_type ? s->current_picture_ptr->f.linesize[1] : 0;
 }
 
- if (v->rangeredfrm || (v->mv_mode == MV_PMODE_INTENSITY_COMP)
+ if (v->rangeredfrm || use_ic
 || 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 , srcU, s->uvlinesize,
+ 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, srcV, s->uvlinesize,
+ 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;
@@ -894,16 +942,17 @@
 }
 }
 /* if we deal with intensity compensation we need to scale source blocks */
- if (v->mv_mode == MV_PMODE_INTENSITY_COMP) {
+ if (use_ic) {
 int i, j;
 uint8_t *src, *src2;
 
 src = srcU;
 src2 = srcV;
 for (j = 0; j < 9; j++) {
+ int f = v->field_mode ? chroma_ref_type : ((j + uvsrc_y) & 1);
 for (i = 0; i < 9; i++) {
- src[i] = v->lutuv[src[i]];
- src2[i] = v->lutuv[src2[i]];
+ src[i] = lutuv[f][src[i]];
+ src2[i] = lutuv[f][src2[i]];
 }
 src += s->uvlinesize;
 src2 += s->uvlinesize;
@@ -915,20 +964,20 @@
 uvmx = (uvmx & 3) << 1;
 uvmy = (uvmy & 3) << 1;
 if (!v->rnd) {
- dsp->put_h264_chroma_pixels_tab[0](s->dest[1] + off, srcU, s->uvlinesize, 8, uvmx, uvmy);
- dsp->put_h264_chroma_pixels_tab[0](s->dest[2] + off, srcV, s->uvlinesize, 8, uvmx, uvmy);
+ h264chroma->put_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
+ h264chroma->put_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
 } else {
- v->vc1dsp.put_no_rnd_vc1_chroma_pixels_tab[0](s->dest[1] + off, srcU, s->uvlinesize, 8, uvmx, uvmy);
- v->vc1dsp.put_no_rnd_vc1_chroma_pixels_tab[0](s->dest[2] + off, srcV, s->uvlinesize, 8, uvmx, uvmy);
+ v->vc1dsp.put_no_rnd_vc1_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
+ v->vc1dsp.put_no_rnd_vc1_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
 }
 }
 
-/** Do motion compensation for 4-MV field chroma macroblock (both U and V)
+/** Do motion compensation for 4-MV interlaced frame chroma macroblock (both U and V)
 */
-static void vc1_mc_4mv_chroma4(VC1Context *v)
+static void vc1_mc_4mv_chroma4(VC1Context *v, int dir, int dir2, int avg)
 {
 MpegEncContext *s = &v->s;
- DSPContext *dsp = &v->s.dsp;
+ H264ChromaContext *h264chroma = &v->h264chroma;
 uint8_t *srcU, *srcV;
 int uvsrc_x, uvsrc_y;
 int uvmx_field[4], uvmy_field[4];
@@ -937,16 +986,17 @@
 static const int s_rndtblfield[16] = { 0, 0, 1, 2, 4, 4, 5, 6, 2, 2, 3, 8, 6, 6, 7, 12 };
 int v_dist = fieldmv ? 1 : 4; // vertical offset for lower sub-blocks
 int v_edge_pos = s->v_edge_pos >> 1;
+ int use_ic;
+ uint8_t (*lutuv)[256];
 
- if (!v->s.last_picture.f.data[0])
- return;
 if (s->flags & CODEC_FLAG_GRAY)
 return;
 
 for (i = 0; i < 4; i++) {
- tx = s->mv[0][i][0];
+ int d = i < 2 ? dir: dir2;
+ tx = s->mv[d][i][0];
 uvmx_field[i] = (tx + ((tx & 3) == 3)) >> 1;
- ty = s->mv[0][i][1];
+ ty = s->mv[d][i][1];
 if (fieldmv)
 uvmy_field[i] = (ty >> 4) * 8 + s_rndtblfield[ty & 0xF];
 else
@@ -960,8 +1010,17 @@
 // FIXME: implement proper pull-back (see vc1cropmv.c, vc1CROPMV_ChromaPullBack())
 uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1);
 uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1);
- srcU = s->last_picture.f.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x;
- srcV = s->last_picture.f.data[2] + uvsrc_y * s->uvlinesize + uvsrc_x;
+ if (i < 2 ? dir : dir2) {
+ srcU = s->next_picture.f.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x;
+ srcV = s->next_picture.f.data[2] + uvsrc_y * s->uvlinesize + uvsrc_x;
+ lutuv = v->next_lutuv;
+ use_ic = v->next_use_ic;
+ } else {
+ srcU = s->last_picture.f.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x;
+ srcV = s->last_picture.f.data[2] + uvsrc_y * s->uvlinesize + uvsrc_x;
+ lutuv = v->last_lutuv;
+ use_ic = v->last_use_ic;
+ }
 uvmx_field[i] = (uvmx_field[i] & 3) << 1;
 uvmy_field[i] = (uvmy_field[i] & 3) << 1;
 
@@ -969,42 +1028,55 @@
 v_edge_pos--;
 if (fieldmv && (uvsrc_y & 1) && uvsrc_y < 2)
 uvsrc_y--;
- if ((v->mv_mode == MV_PMODE_INTENSITY_COMP)
+ if (use_ic
 || 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, srcU, s->uvlinesize,
+ 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->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;
 
 /* if we deal with intensity compensation we need to scale source blocks */
- if (v->mv_mode == MV_PMODE_INTENSITY_COMP) {
+ if (use_ic) {
 int i, j;
 uint8_t *src, *src2;
 
 src = srcU;
 src2 = srcV;
 for (j = 0; j < 5; j++) {
+ int f = (uvsrc_y + (j << fieldmv)) & 1;
 for (i = 0; i < 5; i++) {
- src[i] = v->lutuv[src[i]];
- src2[i] = v->lutuv[src2[i]];
+ src[i] = lutuv[f][src[i]];
+ src2[i] = lutuv[f][src2[i]];
 }
- src += s->uvlinesize << 1;
- src2 += s->uvlinesize << 1;
+ src += s->uvlinesize << fieldmv;
+ src2 += s->uvlinesize << fieldmv;
 }
 }
 }
- if (!v->rnd) {
- dsp->put_h264_chroma_pixels_tab[1](s->dest[1] + off, srcU, s->uvlinesize << fieldmv, 4, uvmx_field[i], uvmy_field[i]);
- dsp->put_h264_chroma_pixels_tab[1](s->dest[2] + off, srcV, s->uvlinesize << fieldmv, 4, uvmx_field[i], uvmy_field[i]);
+ if (avg) {
+ if (!v->rnd) {
+ h264chroma->avg_h264_chroma_pixels_tab[1](s->dest[1] + off, srcU, s->uvlinesize << fieldmv, 4, uvmx_field[i], uvmy_field[i]);
+ h264chroma->avg_h264_chroma_pixels_tab[1](s->dest[2] + off, srcV, s->uvlinesize << fieldmv, 4, uvmx_field[i], uvmy_field[i]);
+ } else {
+ v->vc1dsp.avg_no_rnd_vc1_chroma_pixels_tab[1](s->dest[1] + off, srcU, s->uvlinesize << fieldmv, 4, uvmx_field[i], uvmy_field[i]);
+ v->vc1dsp.avg_no_rnd_vc1_chroma_pixels_tab[1](s->dest[2] + off, srcV, s->uvlinesize << fieldmv, 4, uvmx_field[i], uvmy_field[i]);
+ }
 } else {
- v->vc1dsp.put_no_rnd_vc1_chroma_pixels_tab[1](s->dest[1] + off, srcU, s->uvlinesize << fieldmv, 4, uvmx_field[i], uvmy_field[i]);
- v->vc1dsp.put_no_rnd_vc1_chroma_pixels_tab[1](s->dest[2] + off, srcV, s->uvlinesize << fieldmv, 4, uvmx_field[i], uvmy_field[i]);
+ if (!v->rnd) {
+ h264chroma->put_h264_chroma_pixels_tab[1](s->dest[1] + off, srcU, s->uvlinesize << fieldmv, 4, uvmx_field[i], uvmy_field[i]);
+ h264chroma->put_h264_chroma_pixels_tab[1](s->dest[2] + off, srcV, s->uvlinesize << fieldmv, 4, uvmx_field[i], uvmy_field[i]);
+ } else {
+ v->vc1dsp.put_no_rnd_vc1_chroma_pixels_tab[1](s->dest[1] + off, srcU, s->uvlinesize << fieldmv, 4, uvmx_field[i], uvmy_field[i]);
+ v->vc1dsp.put_no_rnd_vc1_chroma_pixels_tab[1](s->dest[2] + off, srcV, s->uvlinesize << fieldmv, 4, uvmx_field[i], uvmy_field[i]);
+ }
 }
 }
 }
@@ -1374,30 +1446,30 @@
 xy = s->block_index[n];
 
 if (s->mb_intra) {
- s->mv[0][n][0] = s->current_picture.f.motion_val[0][xy + v->blocks_off][0] = 0;
- s->mv[0][n][1] = s->current_picture.f.motion_val[0][xy + v->blocks_off][1] = 0;
- s->current_picture.f.motion_val[1][xy + v->blocks_off][0] = 0;
- s->current_picture.f.motion_val[1][xy + v->blocks_off][1] = 0;
+ s->mv[0][n][0] = s->current_picture.motion_val[0][xy + v->blocks_off][0] = 0;
+ s->mv[0][n][1] = s->current_picture.motion_val[0][xy + v->blocks_off][1] = 0;
+ s->current_picture.motion_val[1][xy + v->blocks_off][0] = 0;
+ s->current_picture.motion_val[1][xy + v->blocks_off][1] = 0;
 if (mv1) { /* duplicate motion data for 1-MV block */
- s->current_picture.f.motion_val[0][xy + 1 + v->blocks_off][0] = 0;
- s->current_picture.f.motion_val[0][xy + 1 + v->blocks_off][1] = 0;
- s->current_picture.f.motion_val[0][xy + wrap + v->blocks_off][0] = 0;
- s->current_picture.f.motion_val[0][xy + wrap + v->blocks_off][1] = 0;
- s->current_picture.f.motion_val[0][xy + wrap + 1 + v->blocks_off][0] = 0;
- s->current_picture.f.motion_val[0][xy + wrap + 1 + v->blocks_off][1] = 0;
+ s->current_picture.motion_val[0][xy + 1 + v->blocks_off][0] = 0;
+ s->current_picture.motion_val[0][xy + 1 + v->blocks_off][1] = 0;
+ s->current_picture.motion_val[0][xy + wrap + v->blocks_off][0] = 0;
+ s->current_picture.motion_val[0][xy + wrap + v->blocks_off][1] = 0;
+ s->current_picture.motion_val[0][xy + wrap + 1 + v->blocks_off][0] = 0;
+ s->current_picture.motion_val[0][xy + wrap + 1 + v->blocks_off][1] = 0;
 v->luma_mv[s->mb_x][0] = v->luma_mv[s->mb_x][1] = 0;
- s->current_picture.f.motion_val[1][xy + 1 + v->blocks_off][0] = 0;
- s->current_picture.f.motion_val[1][xy + 1 + v->blocks_off][1] = 0;
- s->current_picture.f.motion_val[1][xy + wrap][0] = 0;
- s->current_picture.f.motion_val[1][xy + wrap + v->blocks_off][1] = 0;
- s->current_picture.f.motion_val[1][xy + wrap + 1 + v->blocks_off][0] = 0;
- s->current_picture.f.motion_val[1][xy + wrap + 1 + v->blocks_off][1] = 0;
+ s->current_picture.motion_val[1][xy + 1 + v->blocks_off][0] = 0;
+ s->current_picture.motion_val[1][xy + 1 + v->blocks_off][1] = 0;
+ s->current_picture.motion_val[1][xy + wrap][0] = 0;
+ s->current_picture.motion_val[1][xy + wrap + v->blocks_off][1] = 0;
+ s->current_picture.motion_val[1][xy + wrap + 1 + v->blocks_off][0] = 0;
+ s->current_picture.motion_val[1][xy + wrap + 1 + v->blocks_off][1] = 0;
 }
 return;
 }
 
- C = s->current_picture.f.motion_val[dir][xy - 1 + v->blocks_off];
- A = s->current_picture.f.motion_val[dir][xy - wrap + v->blocks_off];
+ C = s->current_picture.motion_val[dir][xy - 1 + v->blocks_off];
+ A = s->current_picture.motion_val[dir][xy - wrap + v->blocks_off];
 if (mv1) {
 if (v->field_mode && mixedmv_pic)
 off = (s->mb_x == (s->mb_width - 1)) ? -2 : 2;
@@ -1419,7 +1491,7 @@
 off = -1;
 }
 }
- B = s->current_picture.f.motion_val[dir][xy - wrap + off + v->blocks_off];
+ B = s->current_picture.motion_val[dir][xy - wrap + off + v->blocks_off];
 
 a_valid = !s->first_slice_line || (n == 2 || n == 3);
 b_valid = a_valid && (s->mb_width > 1);
@@ -1582,15 +1654,15 @@
 if (v->field_mode && v->cur_field_type && v->ref_field_type[dir] == 0)
 y_bias = 1;
 /* store MV using signed modulus of MV range defined in 4.11 */
- s->mv[dir][n][0] = s->current_picture.f.motion_val[dir][xy + v->blocks_off][0] = ((px + dmv_x + r_x) & ((r_x << 1) - 1)) - r_x;
- s->mv[dir][n][1] = s->current_picture.f.motion_val[dir][xy + v->blocks_off][1] = ((py + dmv_y + r_y - y_bias) & ((r_y << 1) - 1)) - r_y + y_bias;
+ s->mv[dir][n][0] = s->current_picture.motion_val[dir][xy + v->blocks_off][0] = ((px + dmv_x + r_x) & ((r_x << 1) - 1)) - r_x;
+ s->mv[dir][n][1] = s->current_picture.motion_val[dir][xy + v->blocks_off][1] = ((py + dmv_y + r_y - y_bias) & ((r_y << 1) - 1)) - r_y + y_bias;
 if (mv1) { /* duplicate motion data for 1-MV block */
- s->current_picture.f.motion_val[dir][xy + 1 + v->blocks_off][0] = s->current_picture.f.motion_val[dir][xy + v->blocks_off][0];
- s->current_picture.f.motion_val[dir][xy + 1 + v->blocks_off][1] = s->current_picture.f.motion_val[dir][xy + v->blocks_off][1];
- s->current_picture.f.motion_val[dir][xy + wrap + v->blocks_off][0] = s->current_picture.f.motion_val[dir][xy + v->blocks_off][0];
- s->current_picture.f.motion_val[dir][xy + wrap + v->blocks_off][1] = s->current_picture.f.motion_val[dir][xy + v->blocks_off][1];
- s->current_picture.f.motion_val[dir][xy + wrap + 1 + v->blocks_off][0] = s->current_picture.f.motion_val[dir][xy + v->blocks_off][0];
- s->current_picture.f.motion_val[dir][xy + wrap + 1 + v->blocks_off][1] = s->current_picture.f.motion_val[dir][xy + v->blocks_off][1];
+ s->current_picture.motion_val[dir][xy + 1 + v->blocks_off][0] = s->current_picture.motion_val[dir][xy + v->blocks_off][0];
+ s->current_picture.motion_val[dir][xy + 1 + v->blocks_off][1] = s->current_picture.motion_val[dir][xy + v->blocks_off][1];
+ s->current_picture.motion_val[dir][xy + wrap + v->blocks_off][0] = s->current_picture.motion_val[dir][xy + v->blocks_off][0];
+ s->current_picture.motion_val[dir][xy + wrap + v->blocks_off][1] = s->current_picture.motion_val[dir][xy + v->blocks_off][1];
+ s->current_picture.motion_val[dir][xy + wrap + 1 + v->blocks_off][0] = s->current_picture.motion_val[dir][xy + v->blocks_off][0];
+ s->current_picture.motion_val[dir][xy + wrap + 1 + v->blocks_off][1] = s->current_picture.motion_val[dir][xy + v->blocks_off][1];
 v->mv_f[dir][xy + 1 + v->blocks_off] = v->mv_f[dir][xy + v->blocks_off];
 v->mv_f[dir][xy + wrap + v->blocks_off] = v->mv_f[dir][xy + wrap + 1 + v->blocks_off] = v->mv_f[dir][xy + v->blocks_off];
 }
@@ -1599,7 +1671,7 @@
 /** Predict and set motion vector for interlaced frame picture MBs
 */
 static inline void vc1_pred_mv_intfr(VC1Context *v, int n, int dmv_x, int dmv_y,
- int mvn, int r_x, int r_y, uint8_t* is_intra)
+ int mvn, int r_x, int r_y, uint8_t* is_intra, int dir)
 {
 MpegEncContext *s = &v->s;
 int xy, wrap, off = 0;
@@ -1614,24 +1686,24 @@
 xy = s->block_index[n];
 
 if (s->mb_intra) {
- s->mv[0][n][0] = s->current_picture.f.motion_val[0][xy][0] = 0;
- s->mv[0][n][1] = s->current_picture.f.motion_val[0][xy][1] = 0;
- s->current_picture.f.motion_val[1][xy][0] = 0;
- s->current_picture.f.motion_val[1][xy][1] = 0;
+ s->mv[0][n][0] = s->current_picture.motion_val[0][xy][0] = 0;
+ s->mv[0][n][1] = s->current_picture.motion_val[0][xy][1] = 0;
+ s->current_picture.motion_val[1][xy][0] = 0;
+ s->current_picture.motion_val[1][xy][1] = 0;
 if (mvn == 1) { /* duplicate motion data for 1-MV block */
- s->current_picture.f.motion_val[0][xy + 1][0] = 0;
- s->current_picture.f.motion_val[0][xy + 1][1] = 0;
- s->current_picture.f.motion_val[0][xy + wrap][0] = 0;
- s->current_picture.f.motion_val[0][xy + wrap][1] = 0;
- s->current_picture.f.motion_val[0][xy + wrap + 1][0] = 0;
- s->current_picture.f.motion_val[0][xy + wrap + 1][1] = 0;
+ s->current_picture.motion_val[0][xy + 1][0] = 0;
+ s->current_picture.motion_val[0][xy + 1][1] = 0;
+ s->current_picture.motion_val[0][xy + wrap][0] = 0;
+ s->current_picture.motion_val[0][xy + wrap][1] = 0;
+ s->current_picture.motion_val[0][xy + wrap + 1][0] = 0;
+ s->current_picture.motion_val[0][xy + wrap + 1][1] = 0;
 v->luma_mv[s->mb_x][0] = v->luma_mv[s->mb_x][1] = 0;
- s->current_picture.f.motion_val[1][xy + 1][0] = 0;
- s->current_picture.f.motion_val[1][xy + 1][1] = 0;
- s->current_picture.f.motion_val[1][xy + wrap][0] = 0;
- s->current_picture.f.motion_val[1][xy + wrap][1] = 0;
- s->current_picture.f.motion_val[1][xy + wrap + 1][0] = 0;
- s->current_picture.f.motion_val[1][xy + wrap + 1][1] = 0;
+ s->current_picture.motion_val[1][xy + 1][0] = 0;
+ s->current_picture.motion_val[1][xy + 1][1] = 0;
+ s->current_picture.motion_val[1][xy + wrap][0] = 0;
+ s->current_picture.motion_val[1][xy + wrap][1] = 0;
+ s->current_picture.motion_val[1][xy + wrap + 1][0] = 0;
+ s->current_picture.motion_val[1][xy + wrap + 1][1] = 0;
 }
 return;
 }
@@ -1641,14 +1713,14 @@
 if (s->mb_x || (n == 1) || (n == 3)) {
 if ((v->blk_mv_type[xy]) // current block (MB) has a field MV
 || (!v->blk_mv_type[xy] && !v->blk_mv_type[xy - 1])) { // or both have frame MV
- A[0] = s->current_picture.f.motion_val[0][xy - 1][0];
- A[1] = s->current_picture.f.motion_val[0][xy - 1][1];
+ A[0] = s->current_picture.motion_val[dir][xy - 1][0];
+ A[1] = s->current_picture.motion_val[dir][xy - 1][1];
 a_valid = 1;
 } else { // current block has frame mv and cand. has field MV (so average)
- A[0] = (s->current_picture.f.motion_val[0][xy - 1][0]
- + s->current_picture.f.motion_val[0][xy - 1 + off * wrap][0] + 1) >> 1;
- A[1] = (s->current_picture.f.motion_val[0][xy - 1][1]
- + s->current_picture.f.motion_val[0][xy - 1 + off * wrap][1] + 1) >> 1;
+ A[0] = (s->current_picture.motion_val[dir][xy - 1][0]
+ + s->current_picture.motion_val[dir][xy - 1 + off * wrap][0] + 1) >> 1;
+ A[1] = (s->current_picture.motion_val[dir][xy - 1][1]
+ + s->current_picture.motion_val[dir][xy - 1 + off * wrap][1] + 1) >> 1;
 a_valid = 1;
 }
 if (!(n & 1) && v->is_intra[s->mb_x - 1]) {
@@ -1668,11 +1740,11 @@
 if (v->blk_mv_type[pos_b] && v->blk_mv_type[xy]) {
 n_adj = (n & 2) | (n & 1);
 }
- B[0] = s->current_picture.f.motion_val[0][s->block_index[n_adj] - 2 * wrap][0];
- B[1] = s->current_picture.f.motion_val[0][s->block_index[n_adj] - 2 * wrap][1];
+ B[0] = s->current_picture.motion_val[dir][s->block_index[n_adj] - 2 * wrap][0];
+ B[1] = s->current_picture.motion_val[dir][s->block_index[n_adj] - 2 * wrap][1];
 if (v->blk_mv_type[pos_b] && !v->blk_mv_type[xy]) {
- B[0] = (B[0] + s->current_picture.f.motion_val[0][s->block_index[n_adj ^ 2] - 2 * wrap][0] + 1) >> 1;
- B[1] = (B[1] + s->current_picture.f.motion_val[0][s->block_index[n_adj ^ 2] - 2 * wrap][1] + 1) >> 1;
+ B[0] = (B[0] + s->current_picture.motion_val[dir][s->block_index[n_adj ^ 2] - 2 * wrap][0] + 1) >> 1;
+ B[1] = (B[1] + s->current_picture.motion_val[dir][s->block_index[n_adj ^ 2] - 2 * wrap][1] + 1) >> 1;
 }
 }
 if (s->mb_width > 1) {
@@ -1683,11 +1755,11 @@
 if (v->blk_mv_type[pos_c] && v->blk_mv_type[xy]) {
 n_adj = n & 2;
 }
- C[0] = s->current_picture.f.motion_val[0][s->block_index[n_adj] - 2 * wrap + 2][0];
- C[1] = s->current_picture.f.motion_val[0][s->block_index[n_adj] - 2 * wrap + 2][1];
+ C[0] = s->current_picture.motion_val[dir][s->block_index[n_adj] - 2 * wrap + 2][0];
+ C[1] = s->current_picture.motion_val[dir][s->block_index[n_adj] - 2 * wrap + 2][1];
 if (v->blk_mv_type[pos_c] && !v->blk_mv_type[xy]) {
- C[0] = (1 + C[0] + (s->current_picture.f.motion_val[0][s->block_index[n_adj ^ 2] - 2 * wrap + 2][0])) >> 1;
- C[1] = (1 + C[1] + (s->current_picture.f.motion_val[0][s->block_index[n_adj ^ 2] - 2 * wrap + 2][1])) >> 1;
+ C[0] = (1 + C[0] + (s->current_picture.motion_val[dir][s->block_index[n_adj ^ 2] - 2 * wrap + 2][0])) >> 1;
+ C[1] = (1 + C[1] + (s->current_picture.motion_val[dir][s->block_index[n_adj ^ 2] - 2 * wrap + 2][1])) >> 1;
 }
 if (s->mb_x == s->mb_width - 1) {
 if (!v->is_intra[s->mb_x - s->mb_stride - 1]) {
@@ -1697,11 +1769,11 @@
 if (v->blk_mv_type[pos_c] && v->blk_mv_type[xy]) {
 n_adj = n | 1;
 }
- C[0] = s->current_picture.f.motion_val[0][s->block_index[n_adj] - 2 * wrap - 2][0];
- C[1] = s->current_picture.f.motion_val[0][s->block_index[n_adj] - 2 * wrap - 2][1];
+ C[0] = s->current_picture.motion_val[dir][s->block_index[n_adj] - 2 * wrap - 2][0];
+ C[1] = s->current_picture.motion_val[dir][s->block_index[n_adj] - 2 * wrap - 2][1];
 if (v->blk_mv_type[pos_c] && !v->blk_mv_type[xy]) {
- C[0] = (1 + C[0] + s->current_picture.f.motion_val[0][s->block_index[1] - 2 * wrap - 2][0]) >> 1;
- C[1] = (1 + C[1] + s->current_picture.f.motion_val[0][s->block_index[1] - 2 * wrap - 2][1]) >> 1;
+ C[0] = (1 + C[0] + s->current_picture.motion_val[dir][s->block_index[1] - 2 * wrap - 2][0]) >> 1;
+ C[1] = (1 + C[1] + s->current_picture.motion_val[dir][s->block_index[1] - 2 * wrap - 2][1]) >> 1;
 }
 } else
 c_valid = 0;
@@ -1712,12 +1784,12 @@
 } else {
 pos_b = s->block_index[1];
 b_valid = 1;
- B[0] = s->current_picture.f.motion_val[0][pos_b][0];
- B[1] = s->current_picture.f.motion_val[0][pos_b][1];
+ B[0] = s->current_picture.motion_val[dir][pos_b][0];
+ B[1] = s->current_picture.motion_val[dir][pos_b][1];
 pos_c = s->block_index[0];
 c_valid = 1;
- C[0] = s->current_picture.f.motion_val[0][pos_c][0];
- C[1] = s->current_picture.f.motion_val[0][pos_c][1];
+ C[0] = s->current_picture.motion_val[dir][pos_c][0];
+ C[1] = s->current_picture.motion_val[dir][pos_c][1];
 }
 
 total_valid = a_valid + b_valid + c_valid;
@@ -1805,20 +1877,20 @@
 }
 
 /* store MV using signed modulus of MV range defined in 4.11 */
- s->mv[0][n][0] = s->current_picture.f.motion_val[0][xy][0] = ((px + dmv_x + r_x) & ((r_x << 1) - 1)) - r_x;
- s->mv[0][n][1] = s->current_picture.f.motion_val[0][xy][1] = ((py + dmv_y + r_y) & ((r_y << 1) - 1)) - r_y;
+ s->mv[dir][n][0] = s->current_picture.motion_val[dir][xy][0] = ((px + dmv_x + r_x) & ((r_x << 1) - 1)) - r_x;
+ s->mv[dir][n][1] = s->current_picture.motion_val[dir][xy][1] = ((py + dmv_y + r_y) & ((r_y << 1) - 1)) - r_y;
 if (mvn == 1) { /* duplicate motion data for 1-MV block */
- s->current_picture.f.motion_val[0][xy + 1 ][0] = s->current_picture.f.motion_val[0][xy][0];
- s->current_picture.f.motion_val[0][xy + 1 ][1] = s->current_picture.f.motion_val[0][xy][1];
- s->current_picture.f.motion_val[0][xy + wrap ][0] = s->current_picture.f.motion_val[0][xy][0];
- s->current_picture.f.motion_val[0][xy + wrap ][1] = s->current_picture.f.motion_val[0][xy][1];
- s->current_picture.f.motion_val[0][xy + wrap + 1][0] = s->current_picture.f.motion_val[0][xy][0];
- s->current_picture.f.motion_val[0][xy + wrap + 1][1] = s->current_picture.f.motion_val[0][xy][1];
+ s->current_picture.motion_val[dir][xy + 1 ][0] = s->current_picture.motion_val[dir][xy][0];
+ s->current_picture.motion_val[dir][xy + 1 ][1] = s->current_picture.motion_val[dir][xy][1];
+ s->current_picture.motion_val[dir][xy + wrap ][0] = s->current_picture.motion_val[dir][xy][0];
+ s->current_picture.motion_val[dir][xy + wrap ][1] = s->current_picture.motion_val[dir][xy][1];
+ s->current_picture.motion_val[dir][xy + wrap + 1][0] = s->current_picture.motion_val[dir][xy][0];
+ s->current_picture.motion_val[dir][xy + wrap + 1][1] = s->current_picture.motion_val[dir][xy][1];
 } else if (mvn == 2) { /* duplicate motion data for 2-Field MV block */
- s->current_picture.f.motion_val[0][xy + 1][0] = s->current_picture.f.motion_val[0][xy][0];
- s->current_picture.f.motion_val[0][xy + 1][1] = s->current_picture.f.motion_val[0][xy][1];
- s->mv[0][n + 1][0] = s->mv[0][n][0];
- s->mv[0][n + 1][1] = s->mv[0][n][1];
+ s->current_picture.motion_val[dir][xy + 1][0] = s->current_picture.motion_val[dir][xy][0];
+ s->current_picture.motion_val[dir][xy + 1][1] = s->current_picture.motion_val[dir][xy][1];
+ s->mv[dir][n + 1][0] = s->mv[dir][n][0];
+ s->mv[dir][n + 1][1] = s->mv[dir][n][1];
 }
 }
 
@@ -1827,11 +1899,12 @@
 static void vc1_interp_mc(VC1Context *v)
 {
 MpegEncContext *s = &v->s;
- DSPContext *dsp = &v->s.dsp;
+ H264ChromaContext *h264chroma = &v->h264chroma;
 uint8_t *srcY, *srcU, *srcV;
 int dxy, mx, my, uvmx, uvmy, src_x, src_y, uvsrc_x, uvsrc_y;
 int off, off_uv;
 int v_edge_pos = s->v_edge_pos >> v->field_mode;
+ int use_ic = v->next_use_ic;
 
 if (!v->field_mode && !v->s.next_picture.f.data[0])
 return;
@@ -1886,20 +1959,25 @@
 srcV = s->edge_emu_buffer + 18 * s->linesize;
 }
 
- if (v->rangeredfrm || s->h_edge_pos < 22 || v_edge_pos < 22
+ if (v->rangeredfrm || s->h_edge_pos < 22 || v_edge_pos < 22 || use_ic
 || (unsigned)(src_x - 1) > s->h_edge_pos - (mx & 3) - 16 - 3
 || (unsigned)(src_y - 1) > v_edge_pos - (my & 3) - 16 - 3) {
 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, 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 , srcU, s->uvlinesize, 8 + 1, 8 + 1,
+ 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, srcV, s->uvlinesize, 8 + 1, 8 + 1,
+ 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;
@@ -1925,16 +2003,37 @@
 src2 += s->uvlinesize;
 }
 }
+
+ if (use_ic) {
+ uint8_t (*luty )[256] = v->next_luty;
+ uint8_t (*lutuv)[256] = v->next_lutuv;
+ int i, j;
+ uint8_t *src, *src2;
+
+ src = srcY;
+ for (j = 0; j < 17 + s->mspel * 2; j++) {
+ int f = v->field_mode ? v->ref_field_type[1] : ((j+src_y - s->mspel) & 1);
+ for (i = 0; i < 17 + s->mspel * 2; i++)
+ src[i] = luty[f][src[i]];
+ src += s->linesize;
+ }
+ src = srcU;
+ src2 = srcV;
+ for (j = 0; j < 9; j++) {
+ int f = v->field_mode ? v->ref_field_type[1] : ((j+uvsrc_y) & 1);
+ for (i = 0; i < 9; i++) {
+ src[i] = lutuv[f][src[i]];
+ src2[i] = lutuv[f][src2[i]];
+ }
+ src += s->uvlinesize;
+ src2 += s->uvlinesize;
+ }
+ }
 srcY += s->mspel * (1 + s->linesize);
 }
 
- if (v->field_mode && v->cur_field_type) {
- off = s->current_picture_ptr->f.linesize[0];
- off_uv = s->current_picture_ptr->f.linesize[1];
- } else {
- off = 0;
- off_uv = 0;
- }
+ off = 0;
+ off_uv = 0;
 
 if (s->mspel) {
 dxy = ((my & 3) << 2) | (mx & 3);
@@ -1947,9 +2046,9 @@
 dxy = (my & 2) | ((mx & 2) >> 1);
 
 if (!v->rnd)
- dsp->avg_pixels_tab[0][dxy](s->dest[0] + off, srcY, s->linesize, 16);
+ s->hdsp.avg_pixels_tab[0][dxy](s->dest[0] + off, srcY, s->linesize, 16);
 else
- dsp->avg_no_rnd_pixels_tab[0][dxy](s->dest[0] + off, srcY, s->linesize, 16);
+ s->hdsp.avg_no_rnd_pixels_tab[dxy](s->dest[0] + off, srcY, s->linesize, 16);
 }
 
 if (s->flags & CODEC_FLAG_GRAY) return;
@@ -1957,8 +2056,8 @@
 uvmx = (uvmx & 3) << 1;
 uvmy = (uvmy & 3) << 1;
 if (!v->rnd) {
- dsp->avg_h264_chroma_pixels_tab[0](s->dest[1] + off_uv, srcU, s->uvlinesize, 8, uvmx, uvmy);
- dsp->avg_h264_chroma_pixels_tab[0](s->dest[2] + off_uv, srcV, s->uvlinesize, 8, uvmx, uvmy);
+ h264chroma->avg_h264_chroma_pixels_tab[0](s->dest[1] + off_uv, srcU, s->uvlinesize, 8, uvmx, uvmy);
+ h264chroma->avg_h264_chroma_pixels_tab[0](s->dest[2] + off_uv, srcV, s->uvlinesize, 8, uvmx, uvmy);
 } else {
 v->vc1dsp.avg_no_rnd_vc1_chroma_pixels_tab[0](s->dest[1] + off_uv, srcU, s->uvlinesize, 8, uvmx, uvmy);
 v->vc1dsp.avg_no_rnd_vc1_chroma_pixels_tab[0](s->dest[2] + off_uv, srcV, s->uvlinesize, 8, uvmx, uvmy);
@@ -1989,30 +2088,18 @@
 static inline void vc1_b_mc(VC1Context *v, int dmv_x[2], int dmv_y[2],
 int direct, int mode)
 {
- if (v->use_ic) {
- v->mv_mode2 = v->mv_mode;
- v->mv_mode = MV_PMODE_INTENSITY_COMP;
- }
 if (direct) {
 vc1_mc_1mv(v, 0);
 vc1_interp_mc(v);
- if (v->use_ic)
- v->mv_mode = v->mv_mode2;
 return;
 }
 if (mode == BMV_TYPE_INTERPOLATED) {
 vc1_mc_1mv(v, 0);
 vc1_interp_mc(v);
- if (v->use_ic)
- v->mv_mode = v->mv_mode2;
 return;
 }
 
- if (v->use_ic && (mode == BMV_TYPE_BACKWARD))
- v->mv_mode = v->mv_mode2;
 vc1_mc_1mv(v, (mode == BMV_TYPE_BACKWARD));
- if (v->use_ic)
- v->mv_mode = v->mv_mode2;
 }
 
 static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2],
@@ -2038,17 +2125,17 @@
 xy = s->block_index[0];
 
 if (s->mb_intra) {
- s->current_picture.f.motion_val[0][xy + v->blocks_off][0] =
- s->current_picture.f.motion_val[0][xy + v->blocks_off][1] =
- s->current_picture.f.motion_val[1][xy + v->blocks_off][0] =
- s->current_picture.f.motion_val[1][xy + v->blocks_off][1] = 0;
+ 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;
 return;
 }
 if (!v->field_mode) {
- s->mv[0][0][0] = scale_mv(s->next_picture.f.motion_val[1][xy][0], v->bfraction, 0, s->quarter_sample);
- s->mv[0][0][1] = scale_mv(s->next_picture.f.motion_val[1][xy][1], v->bfraction, 0, s->quarter_sample);
- s->mv[1][0][0] = scale_mv(s->next_picture.f.motion_val[1][xy][0], v->bfraction, 1, s->quarter_sample);
- s->mv[1][0][1] = scale_mv(s->next_picture.f.motion_val[1][xy][1], v->bfraction, 1, s->quarter_sample);
+ 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);
+ s->mv[1][0][1] = scale_mv(s->next_picture.motion_val[1][xy][1], v->bfraction, 1, s->quarter_sample);
 
 /* Pullback predicted motion vectors as specified in 8.4.5.4 */
 s->mv[0][0][0] = av_clip(s->mv[0][0][0], -60 - (s->mb_x << 6), (s->mb_width << 6) - 4 - (s->mb_x << 6));
@@ -2057,18 +2144,18 @@
 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.f.motion_val[0][xy + v->blocks_off][0] = s->mv[0][0][0];
- s->current_picture.f.motion_val[0][xy + v->blocks_off][1] = s->mv[0][0][1];
- s->current_picture.f.motion_val[1][xy + v->blocks_off][0] = s->mv[1][0][0];
- s->current_picture.f.motion_val[1][xy + v->blocks_off][1] = s->mv[1][0][1];
+ 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];
 return;
 }
 
 if ((mvtype == BMV_TYPE_FORWARD) || (mvtype == BMV_TYPE_INTERPOLATED)) {
- C = s->current_picture.f.motion_val[0][xy - 2];
- A = s->current_picture.f.motion_val[0][xy - wrap * 2];
+ C = s->current_picture.motion_val[0][xy - 2];
+ A = s->current_picture.motion_val[0][xy - wrap * 2];
 off = (s->mb_x == (s->mb_width - 1)) ? -2 : 2;
- B = s->current_picture.f.motion_val[0][xy - wrap * 2 + off];
+ B = s->current_picture.motion_val[0][xy - wrap * 2 + off];
 
 if (!s->mb_x) C[0] = C[1] = 0;
 if (!s->first_slice_line) { // predictor A is not out of bounds
@@ -2143,10 +2230,10 @@
 s->mv[0][0][1] = ((py + dmv_y[0] + r_y) & ((r_y << 1) - 1)) - r_y;
 }
 if ((mvtype == BMV_TYPE_BACKWARD) || (mvtype == BMV_TYPE_INTERPOLATED)) {
- C = s->current_picture.f.motion_val[1][xy - 2];
- A = s->current_picture.f.motion_val[1][xy - wrap * 2];
+ C = s->current_picture.motion_val[1][xy - 2];
+ A = s->current_picture.motion_val[1][xy - wrap * 2];
 off = (s->mb_x == (s->mb_width - 1)) ? -2 : 2;
- B = s->current_picture.f.motion_val[1][xy - wrap * 2 + off];
+ B = s->current_picture.motion_val[1][xy - wrap * 2 + off];
 
 if (!s->mb_x)
 C[0] = C[1] = 0;
@@ -2222,10 +2309,10 @@
 s->mv[1][0][0] = ((px + dmv_x[1] + r_x) & ((r_x << 1) - 1)) - r_x;
 s->mv[1][0][1] = ((py + dmv_y[1] + r_y) & ((r_y << 1) - 1)) - r_y;
 }
- s->current_picture.f.motion_val[0][xy][0] = s->mv[0][0][0];
- s->current_picture.f.motion_val[0][xy][1] = s->mv[0][0][1];
- s->current_picture.f.motion_val[1][xy][0] = s->mv[1][0][0];
- s->current_picture.f.motion_val[1][xy][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];
 }
 
 static inline void vc1_pred_b_mv_intfi(VC1Context *v, int n, int *dmv_x, int *dmv_y, int mv1, int *pred_flag)
@@ -2236,14 +2323,14 @@
 
 if (v->bmvtype == BMV_TYPE_DIRECT) {
 int total_opp, k, f;
- if (s->next_picture.f.mb_type[mb_pos + v->mb_off] != MB_TYPE_INTRA) {
- s->mv[0][0][0] = scale_mv(s->next_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][0],
+ if (s->next_picture.mb_type[mb_pos + v->mb_off] != MB_TYPE_INTRA) {
+ s->mv[0][0][0] = scale_mv(s->next_picture.motion_val[1][s->block_index[0] + v->blocks_off][0],
 v->bfraction, 0, s->quarter_sample);
- s->mv[0][0][1] = scale_mv(s->next_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][1],
+ s->mv[0][0][1] = scale_mv(s->next_picture.motion_val[1][s->block_index[0] + v->blocks_off][1],
 v->bfraction, 0, s->quarter_sample);
- s->mv[1][0][0] = scale_mv(s->next_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][0],
+ s->mv[1][0][0] = scale_mv(s->next_picture.motion_val[1][s->block_index[0] + v->blocks_off][0],
 v->bfraction, 1, s->quarter_sample);
- s->mv[1][0][1] = scale_mv(s->next_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][1],
+ s->mv[1][0][1] = scale_mv(s->next_picture.motion_val[1][s->block_index[0] + v->blocks_off][1],
 v->bfraction, 1, s->quarter_sample);
 
 total_opp = v->mv_f_next[0][s->block_index[0] + v->blocks_off]
@@ -2258,10 +2345,10 @@
 }
 v->ref_field_type[0] = v->ref_field_type[1] = v->cur_field_type ^ f;
 for (k = 0; k < 4; k++) {
- s->current_picture.f.motion_val[0][s->block_index[k] + v->blocks_off][0] = s->mv[0][0][0];
- s->current_picture.f.motion_val[0][s->block_index[k] + v->blocks_off][1] = s->mv[0][0][1];
- s->current_picture.f.motion_val[1][s->block_index[k] + v->blocks_off][0] = s->mv[1][0][0];
- s->current_picture.f.motion_val[1][s->block_index[k] + v->blocks_off][1] = s->mv[1][0][1];
+ s->current_picture.motion_val[0][s->block_index[k] + v->blocks_off][0] = s->mv[0][0][0];
+ s->current_picture.motion_val[0][s->block_index[k] + v->blocks_off][1] = s->mv[0][0][1];
+ s->current_picture.motion_val[1][s->block_index[k] + v->blocks_off][0] = s->mv[1][0][0];
+ s->current_picture.motion_val[1][s->block_index[k] + v->blocks_off][1] = s->mv[1][0][1];
 v->mv_f[0][s->block_index[k] + v->blocks_off] = f;
 v->mv_f[1][s->block_index[k] + v->blocks_off] = f;
 }
@@ -2379,17 +2466,17 @@
 b = dc_val[ - 1 - wrap];
 a = dc_val[ - wrap];
 /* scale predictors if needed */
- q1 = s->current_picture.f.qscale_table[mb_pos];
+ q1 = s->current_picture.qscale_table[mb_pos];
 dqscale_index = s->y_dc_scale_table[q1] - 1;
 if (dqscale_index < 0)
 return 0;
 if (c_avail && (n != 1 && n != 3)) {
- q2 = s->current_picture.f.qscale_table[mb_pos - 1];
+ q2 = s->current_picture.qscale_table[mb_pos - 1];
 if (q2 && q2 != q1)
 c = (c * s->y_dc_scale_table[q2] * ff_vc1_dqscale[dqscale_index] + 0x20000) >> 18;
 }
 if (a_avail && (n != 2 && n != 3)) {
- q2 = s->current_picture.f.qscale_table[mb_pos - s->mb_stride];
+ q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride];
 if (q2 && q2 != q1)
 a = (a * s->y_dc_scale_table[q2] * ff_vc1_dqscale[dqscale_index] + 0x20000) >> 18;
 }
@@ -2399,7 +2486,7 @@
 off--;
 if (n != 2)
 off -= s->mb_stride;
- q2 = s->current_picture.f.qscale_table[off];
+ q2 = s->current_picture.qscale_table[off];
 if (q2 && q2 != q1)
 b = (b * s->y_dc_scale_table[q2] * ff_vc1_dqscale[dqscale_index] + 0x20000) >> 18;
 }
@@ -2538,7 +2625,7 @@
 * @param coded are AC coeffs present or not
 * @param codingset set of VLC to decode data
 */
-static int vc1_decode_i_block(VC1Context *v, DCTELEM block[64], int n,
+static int vc1_decode_i_block(VC1Context *v, int16_t block[64], int n,
 int coded, int codingset)
 {
 GetBitContext *gb = &v->s.gb;
@@ -2701,7 +2788,7 @@
 * @param codingset set of VLC to decode data
 * @param mquant quantizer value for this macroblock
 */
-static int vc1_decode_i_block_adv(VC1Context *v, DCTELEM block[64], int n,
+static int vc1_decode_i_block_adv(VC1Context *v, int16_t block[64], int n,
 int coded, int codingset, int mquant)
 {
 GetBitContext *gb = &v->s.gb;
@@ -2770,11 +2857,11 @@
 else // top
 ac_val -= 16 * s->block_wrap[n];
 
- q1 = s->current_picture.f.qscale_table[mb_pos];
+ q1 = s->current_picture.qscale_table[mb_pos];
 if ( dc_pred_dir && c_avail && mb_pos)
- q2 = s->current_picture.f.qscale_table[mb_pos - 1];
+ q2 = s->current_picture.qscale_table[mb_pos - 1];
 if (!dc_pred_dir && a_avail && mb_pos >= s->mb_stride)
- q2 = s->current_picture.f.qscale_table[mb_pos - s->mb_stride];
+ q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride];
 if ( dc_pred_dir && n == 1)
 q2 = q1;
 if (!dc_pred_dir && n == 2)
@@ -2913,7 +3000,7 @@
 * @param mquant block quantizer
 * @param codingset set of VLC to decode data
 */
-static int vc1_decode_intra_block(VC1Context *v, DCTELEM block[64], int n,
+static int vc1_decode_intra_block(VC1Context *v, int16_t block[64], int n,
 int coded, int mquant, int codingset)
 {
 GetBitContext *gb = &v->s.gb;
@@ -2993,11 +3080,11 @@
 else //top
 ac_val -= 16 * s->block_wrap[n];
 
- q1 = s->current_picture.f.qscale_table[mb_pos];
+ q1 = s->current_picture.qscale_table[mb_pos];
 if (dc_pred_dir && c_avail && mb_pos)
- q2 = s->current_picture.f.qscale_table[mb_pos - 1];
+ q2 = s->current_picture.qscale_table[mb_pos - 1];
 if (!dc_pred_dir && a_avail && mb_pos >= s->mb_stride)
- q2 = s->current_picture.f.qscale_table[mb_pos - s->mb_stride];
+ q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride];
 if ( dc_pred_dir && n == 1)
 q2 = q1;
 if (!dc_pred_dir && n == 2)
@@ -3123,7 +3210,7 @@
 
 /** Decode P block
 */
-static int vc1_decode_p_block(VC1Context *v, DCTELEM block[64], int n,
+static int vc1_decode_p_block(VC1Context *v, int16_t block[64], int n,
 int mquant, int ttmb, int first_block,
 uint8_t *dst, int linesize, int skip_block,
 int *ttmb_out)
@@ -3315,7 +3402,7 @@
 bottom_is_intra = (block_num < 2) ? (mb_is_intra >> ((block_num + 2) * 4))
 : (v->is_intra[s->mb_x] >> ((block_num - 2) * 4));
 mv_stride = s->b8_stride;
- mv = &s->current_picture.f.motion_val[0][s->block_index[block_num] - 2 * mv_stride];
+ mv = &s->current_picture.motion_val[0][s->block_index[block_num] - 2 * mv_stride];
 }
 
 if (bottom_is_intra & 1 || block_is_intra & 1 ||
@@ -3377,7 +3464,7 @@
 : (mb_cbp >> ((block_num + 1) * 4));
 right_is_intra = (block_num & 1) ? (v->is_intra[s->mb_x - s->mb_stride] >> ((block_num - 1) * 4))
 : (mb_is_intra >> ((block_num + 1) * 4));
- mv = &s->current_picture.f.motion_val[0][s->block_index[block_num] - s->b8_stride * 2 - 2];
+ mv = &s->current_picture.motion_val[0][s->block_index[block_num] - s->b8_stride * 2 - 2];
 }
 if (block_is_intra & 1 || right_is_intra & 1 || mv[0][0] != mv[1][0] || mv[0][1] != mv[1][1]) {
 v->vc1dsp.vc1_h_loop_filter8(dst, linesize, v->pq);
@@ -3471,10 +3558,10 @@
 GET_MVDATA(dmv_x, dmv_y);
 
 if (s->mb_intra) {
- s->current_picture.f.motion_val[1][s->block_index[0]][0] = 0;
- s->current_picture.f.motion_val[1][s->block_index[0]][1] = 0;
+ s->current_picture.motion_val[1][s->block_index[0]][0] = 0;
+ s->current_picture.motion_val[1][s->block_index[0]][1] = 0;
 }
- s->current_picture.f.mb_type[mb_pos] = s->mb_intra ? MB_TYPE_INTRA : MB_TYPE_16x16;
+ s->current_picture.mb_type[mb_pos] = s->mb_intra ? MB_TYPE_INTRA : MB_TYPE_16x16;
 vc1_pred_mv(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0], 0, 0);
 
 /* FIXME Set DC val for inter block ? */
@@ -3491,7 +3578,7 @@
 mquant = v->pq;
 cbp = 0;
 }
- s->current_picture.f.qscale_table[mb_pos] = mquant;
+ s->current_picture.qscale_table[mb_pos] = mquant;
 
 if (!v->ttmbf && !s->mb_intra && mb_has_coeffs)
 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table,
@@ -3545,8 +3632,8 @@
 v->mb_type[0][s->block_index[i]] = 0;
 s->dc_val[0][s->block_index[i]] = 0;
 }
- s->current_picture.f.mb_type[mb_pos] = MB_TYPE_SKIP;
- s->current_picture.f.qscale_table[mb_pos] = 0;
+ s->current_picture.mb_type[mb_pos] = MB_TYPE_SKIP;
+ s->current_picture.qscale_table[mb_pos] = 0;
 vc1_pred_mv(v, 0, 0, 0, 1, v->range_x, v->range_y, v->mb_type[0], 0, 0);
 vc1_mc_1mv(v, 0);
 }
@@ -3569,7 +3656,7 @@
 }
 vc1_pred_mv(v, i, dmv_x, dmv_y, 0, v->range_x, v->range_y, v->mb_type[0], 0, 0);
 if (!s->mb_intra)
- vc1_mc_4mv_luma(v, i, 0);
+ vc1_mc_4mv_luma(v, i, 0, 0);
 intra_count += s->mb_intra;
 is_intra[i] = s->mb_intra;
 is_coded[i] = mb_has_coeffs;
@@ -3589,7 +3676,7 @@
 if (!intra_count && !coded_inter)
 goto end;
 GET_MQUANT();
- s->current_picture.f.qscale_table[mb_pos] = mquant;
+ s->current_picture.qscale_table[mb_pos] = mquant;
 /* test if block is intra and has pred */
 {
 int intrapred = 0;
@@ -3652,17 +3739,17 @@
 }
 } else { // skipped MB
 s->mb_intra = 0;
- s->current_picture.f.qscale_table[mb_pos] = 0;
+ s->current_picture.qscale_table[mb_pos] = 0;
 for (i = 0; i < 6; i++) {
 v->mb_type[0][s->block_index[i]] = 0;
 s->dc_val[0][s->block_index[i]] = 0;
 }
 for (i = 0; i < 4; i++) {
 vc1_pred_mv(v, i, 0, 0, 0, v->range_x, v->range_y, v->mb_type[0], 0, 0);
- vc1_mc_4mv_luma(v, i, 0);
+ vc1_mc_4mv_luma(v, i, 0, 0);
 }
 vc1_mc_4mv_chroma(v, 0);
- s->current_picture.f.qscale_table[mb_pos] = 0;
+ s->current_picture.qscale_table[mb_pos] = 0;
 }
 }
 end:
@@ -3737,9 +3824,11 @@
 break;
 }
 if (ff_vc1_mbmode_intfrp[v->fourmvswitch][idx_mbmode][0] == MV_PMODE_INTFR_INTRA) { // intra MB
- s->current_picture.f.motion_val[1][s->block_index[0]][0] = 0;
- s->current_picture.f.motion_val[1][s->block_index[0]][1] = 0;
- s->current_picture.f.mb_type[mb_pos] = MB_TYPE_INTRA;
+ for (i = 0; i < 4; i++) {
+ s->current_picture.motion_val[1][s->block_index[i]][0] = 0;
+ s->current_picture.motion_val[1][s->block_index[i]][1] = 0;
+ }
+ s->current_picture.mb_type[mb_pos] = MB_TYPE_INTRA;
 s->mb_intra = v->is_intra[s->mb_x] = 1;
 for (i = 0; i < 6; i++)
 v->mb_type[0][s->block_index[i]] = 1;
@@ -3749,7 +3838,7 @@
 cbp = 1 + get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2);
 v->s.ac_pred = v->acpred_plane[mb_pos] = get_bits1(gb);
 GET_MQUANT();
- s->current_picture.f.qscale_table[mb_pos] = mquant;
+ s->current_picture.qscale_table[mb_pos] = mquant;
 /* Set DC scale - y and c use the same (not sure if necessary here) */
 s->y_dc_scale = s->y_dc_scale_table[mquant];
 s->c_dc_scale = s->c_dc_scale_table[mquant];
@@ -3807,10 +3896,10 @@
 if (val) {
 get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0);
 }
- vc1_pred_mv_intfr(v, i, dmv_x, dmv_y, 0, v->range_x, v->range_y, v->mb_type[0]);
- vc1_mc_4mv_luma(v, i, 0);
+ vc1_pred_mv_intfr(v, i, dmv_x, dmv_y, 0, v->range_x, v->range_y, v->mb_type[0], 0);
+ vc1_mc_4mv_luma(v, i, 0, 0);
 } else if (i == 4) {
- vc1_mc_4mv_chroma4(v);
+ vc1_mc_4mv_chroma4(v, 0, 0, 0);
 }
 }
 } else if (twomv) {
@@ -3819,29 +3908,29 @@
 if (mvbp & 2) {
 get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0);
 }
- vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0]);
- vc1_mc_4mv_luma(v, 0, 0);
- vc1_mc_4mv_luma(v, 1, 0);
+ vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0], 0);
+ vc1_mc_4mv_luma(v, 0, 0, 0);
+ vc1_mc_4mv_luma(v, 1, 0, 0);
 dmv_x = dmv_y = 0;
 if (mvbp & 1) {
 get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0);
 }
- vc1_pred_mv_intfr(v, 2, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0]);
- vc1_mc_4mv_luma(v, 2, 0);
- vc1_mc_4mv_luma(v, 3, 0);
- vc1_mc_4mv_chroma4(v);
+ vc1_pred_mv_intfr(v, 2, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0], 0);
+ vc1_mc_4mv_luma(v, 2, 0, 0);
+ vc1_mc_4mv_luma(v, 3, 0, 0);
+ vc1_mc_4mv_chroma4(v, 0, 0, 0);
 } else {
 mvbp = ff_vc1_mbmode_intfrp[v->fourmvswitch][idx_mbmode][2];
 dmv_x = dmv_y = 0;
 if (mvbp) {
 get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0);
 }
- vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0]);
+ vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0], 0);
 vc1_mc_1mv(v, 0);
 }
 if (cbp)
 GET_MQUANT(); // p. 227
- s->current_picture.f.qscale_table[mb_pos] = mquant;
+ s->current_picture.qscale_table[mb_pos] = mquant;
 if (!v->ttmbf && cbp)
 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2);
 for (i = 0; i < 6; i++) {
@@ -3870,13 +3959,13 @@
 v->mb_type[0][s->block_index[i]] = 0;
 s->dc_val[0][s->block_index[i]] = 0;
 }
- s->current_picture.f.mb_type[mb_pos] = MB_TYPE_SKIP;
- s->current_picture.f.qscale_table[mb_pos] = 0;
+ s->current_picture.mb_type[mb_pos] = MB_TYPE_SKIP;
+ s->current_picture.qscale_table[mb_pos] = 0;
 v->blk_mv_type[s->block_index[0]] = 0;
 v->blk_mv_type[s->block_index[1]] = 0;
 v->blk_mv_type[s->block_index[2]] = 0;
 v->blk_mv_type[s->block_index[3]] = 0;
- vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, v->mb_type[0]);
+ vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, v->mb_type[0], 0);
 vc1_mc_1mv(v, 0);
 }
 if (s->mb_x == s->mb_width - 1)
@@ -3908,11 +3997,11 @@
 idx_mbmode = get_vlc2(gb, v->mbmode_vlc->table, VC1_IF_MBMODE_VLC_BITS, 2);
 if (idx_mbmode <= 1) { // intra MB
 s->mb_intra = v->is_intra[s->mb_x] = 1;
- s->current_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][0] = 0;
- s->current_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][1] = 0;
- s->current_picture.f.mb_type[mb_pos + v->mb_off] = MB_TYPE_INTRA;
+ s->current_picture.motion_val[1][s->block_index[0] + v->blocks_off][0] = 0;
+ s->current_picture.motion_val[1][s->block_index[0] + v->blocks_off][1] = 0;
+ s->current_picture.mb_type[mb_pos + v->mb_off] = MB_TYPE_INTRA;
 GET_MQUANT();
- s->current_picture.f.qscale_table[mb_pos] = mquant;
+ s->current_picture.qscale_table[mb_pos] = mquant;
 /* Set DC scale - y and c use the same (not sure if necessary here) */
 s->y_dc_scale = s->y_dc_scale_table[mquant];
 s->c_dc_scale = s->c_dc_scale_table[mquant];
@@ -3938,13 +4027,12 @@
 continue;
 v->vc1dsp.vc1_inv_trans_8x8(s->block[i]);
 off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize);
- off += v->cur_field_type ? ((i & 4) ? s->current_picture_ptr->f.linesize[1] : s->current_picture_ptr->f.linesize[0]) : 0;
 s->dsp.put_signed_pixels_clamped(s->block[i], s->dest[dst_idx] + off, (i & 4) ? s->uvlinesize : s->linesize);
 // TODO: loop filter
 }
 } else {
 s->mb_intra = v->is_intra[s->mb_x] = 0;
- s->current_picture.f.mb_type[mb_pos + v->mb_off] = MB_TYPE_16x16;
+ s->current_picture.mb_type[mb_pos + v->mb_off] = MB_TYPE_16x16;
 for (i = 0; i < 6; i++) v->mb_type[0][s->block_index[i]] = 0;
 if (idx_mbmode <= 5) { // 1-MV
 dmv_x = dmv_y = pred_flag = 0;
@@ -3964,7 +4052,7 @@
 get_mvdata_interlaced(v, &dmv_x, &dmv_y, &pred_flag);
 }
 vc1_pred_mv(v, i, dmv_x, dmv_y, 0, v->range_x, v->range_y, v->mb_type[0], pred_flag, 0);
- vc1_mc_4mv_luma(v, i, 0);
+ vc1_mc_4mv_luma(v, i, 0, 0);
 } else if (i == 4)
 vc1_mc_4mv_chroma(v, 0);
 }
@@ -3975,7 +4063,7 @@
 if (cbp) {
 GET_MQUANT();
 }
- s->current_picture.f.qscale_table[mb_pos] = mquant;
+ s->current_picture.qscale_table[mb_pos] = mquant;
 if (!v->ttmbf && cbp) {
 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2);
 }
@@ -3985,8 +4073,6 @@
 dst_idx += i >> 2;
 val = ((cbp >> (5 - i)) & 1);
 off = (i & 4) ? 0 : (i & 1) * 8 + (i & 2) * 4 * s->linesize;
- if (v->cur_field_type)
- off += (i & 4) ? s->current_picture_ptr->f.linesize[1] : s->current_picture_ptr->f.linesize[0];
 if (val) {
 pat = vc1_decode_p_block(v, s->block[i], i, mquant, ttmb,
 first_block, s->dest[dst_idx] + off,
@@ -4041,7 +4127,7 @@
 v->mb_type[0][s->block_index[i]] = 0;
 s->dc_val[0][s->block_index[i]] = 0;
 }
- s->current_picture.f.qscale_table[mb_pos] = 0;
+ s->current_picture.qscale_table[mb_pos] = 0;
 
 if (!direct) {
 if (!skipped) {
@@ -4078,7 +4164,7 @@
 cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2);
 GET_MQUANT();
 s->mb_intra = 0;
- s->current_picture.f.qscale_table[mb_pos] = mquant;
+ s->current_picture.qscale_table[mb_pos] = mquant;
 if (!v->ttmbf)
 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2);
 dmv_x[0] = dmv_y[0] = dmv_x[1] = dmv_y[1] = 0;
@@ -4093,7 +4179,7 @@
 }
 if (s->mb_intra && !mb_has_coeffs) {
 GET_MQUANT();
- s->current_picture.f.qscale_table[mb_pos] = mquant;
+ s->current_picture.qscale_table[mb_pos] = mquant;
 s->ac_pred = get_bits1(gb);
 cbp = 0;
 vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype);
@@ -4115,7 +4201,7 @@
 s->ac_pred = get_bits1(gb);
 cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2);
 GET_MQUANT();
- s->current_picture.f.qscale_table[mb_pos] = mquant;
+ s->current_picture.qscale_table[mb_pos] = mquant;
 if (!v->ttmbf && !s->mb_intra && mb_has_coeffs)
 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2);
 }
@@ -4182,11 +4268,11 @@
 idx_mbmode = get_vlc2(gb, v->mbmode_vlc->table, VC1_IF_MBMODE_VLC_BITS, 2);
 if (idx_mbmode <= 1) { // intra MB
 s->mb_intra = v->is_intra[s->mb_x] = 1;
- s->current_picture.f.motion_val[1][s->block_index[0]][0] = 0;
- s->current_picture.f.motion_val[1][s->block_index[0]][1] = 0;
- s->current_picture.f.mb_type[mb_pos + v->mb_off] = MB_TYPE_INTRA;
+ s->current_picture.motion_val[1][s->block_index[0]][0] = 0;
+ s->current_picture.motion_val[1][s->block_index[0]][1] = 0;
+ s->current_picture.mb_type[mb_pos + v->mb_off] = MB_TYPE_INTRA;
 GET_MQUANT();
- s->current_picture.f.qscale_table[mb_pos] = mquant;
+ s->current_picture.qscale_table[mb_pos] = mquant;
 /* Set DC scale - y and c use the same (not sure if necessary here) */
 s->y_dc_scale = s->y_dc_scale_table[mquant];
 s->c_dc_scale = s->c_dc_scale_table[mquant];
@@ -4215,13 +4301,12 @@
 for (j = 0; j < 64; j++)
 s->block[i][j] <<= 1;
 off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize);
- off += v->cur_field_type ? ((i & 4) ? s->current_picture_ptr->f.linesize[1] : s->current_picture_ptr->f.linesize[0]) : 0;
 s->dsp.put_signed_pixels_clamped(s->block[i], s->dest[dst_idx] + off, (i & 4) ? s->uvlinesize : s->linesize);
 // TODO: yet to perform loop filter
 }
 } else {
 s->mb_intra = v->is_intra[s->mb_x] = 0;
- s->current_picture.f.mb_type[mb_pos + v->mb_off] = MB_TYPE_16x16;
+ s->current_picture.mb_type[mb_pos + v->mb_off] = MB_TYPE_16x16;
 for (i = 0; i < 6; i++) v->mb_type[0][s->block_index[i]] = 0;
 if (v->fmb_is_raw)
 fwd = v->forward_mb_plane[mb_pos] = get_bits1(gb);
@@ -4276,7 +4361,7 @@
 &pred_flag[bmvtype == BMV_TYPE_BACKWARD]);
 }
 vc1_pred_b_mv_intfi(v, i, dmv_x, dmv_y, 0, pred_flag);
- vc1_mc_4mv_luma(v, i, bmvtype == BMV_TYPE_BACKWARD);
+ vc1_mc_4mv_luma(v, i, bmvtype == BMV_TYPE_BACKWARD, 0);
 } else if (i == 4)
 vc1_mc_4mv_chroma(v, bmvtype == BMV_TYPE_BACKWARD);
 }
@@ -4287,7 +4372,7 @@
 if (cbp) {
 GET_MQUANT();
 }
- s->current_picture.f.qscale_table[mb_pos] = mquant;
+ s->current_picture.qscale_table[mb_pos] = mquant;
 if (!v->ttmbf && cbp) {
 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2);
 }
@@ -4297,8 +4382,6 @@
 dst_idx += i >> 2;
 val = ((cbp >> (5 - i)) & 1);
 off = (i & 4) ? 0 : (i & 1) * 8 + (i & 2) * 4 * s->linesize;
- if (v->cur_field_type)
- off += (i & 4) ? s->current_picture_ptr->f.linesize[1] : s->current_picture_ptr->f.linesize[0];
 if (val) {
 vc1_decode_p_block(v, s->block[i], i, mquant, ttmb,
 first_block, s->dest[dst_idx] + off,
@@ -4312,6 +4395,350 @@
 }
 }
 
+/** Decode one B-frame MB (in interlaced frame B picture)
+ */
+static int vc1_decode_b_mb_intfr(VC1Context *v)
+{
+ MpegEncContext *s = &v->s;
+ GetBitContext *gb = &s->gb;
+ int i, j;
+ int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
+ int cbp = 0; /* cbp decoding stuff */
+ int mqdiff, mquant; /* MB quantization */
+ int ttmb = v->ttfrm; /* MB Transform type */
+ int mvsw = 0; /* motion vector switch */
+ int mb_has_coeffs = 1; /* last_flag */
+ int dmv_x, dmv_y; /* Differential MV components */
+ int val; /* temp value */
+ int first_block = 1;
+ int dst_idx, off;
+ int skipped, direct, twomv = 0;
+ int block_cbp = 0, pat, block_tt = 0;
+ int idx_mbmode = 0, mvbp;
+ int stride_y, fieldtx;
+ int bmvtype = BMV_TYPE_BACKWARD;
+ int dir, dir2;
+
+ mquant = v->pq; /* Lossy initialization */
+ s->mb_intra = 0;
+ if (v->skip_is_raw)
+ skipped = get_bits1(gb);
+ else
+ skipped = v->s.mbskip_table[mb_pos];
+
+ if (!skipped) {
+ idx_mbmode = get_vlc2(gb, v->mbmode_vlc->table, VC1_INTFR_NON4MV_MBMODE_VLC_BITS, 2);
+ if (ff_vc1_mbmode_intfrp[0][idx_mbmode][0] == MV_PMODE_INTFR_2MV_FIELD) {
+ twomv = 1;
+ v->blk_mv_type[s->block_index[0]] = 1;
+ v->blk_mv_type[s->block_index[1]] = 1;
+ v->blk_mv_type[s->block_index[2]] = 1;
+ v->blk_mv_type[s->block_index[3]] = 1;
+ } else {
+ v->blk_mv_type[s->block_index[0]] = 0;
+ v->blk_mv_type[s->block_index[1]] = 0;
+ v->blk_mv_type[s->block_index[2]] = 0;
+ v->blk_mv_type[s->block_index[3]] = 0;
+ }
+ }
+
+ if (v->dmb_is_raw)
+ direct = get_bits1(gb);
+ else
+ direct = v->direct_mb_plane[mb_pos];
+
+ if (direct) {
+ 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);
+ s->mv[1][0][1] = s->current_picture.motion_val[1][s->block_index[0]][1] = scale_mv(s->next_picture.motion_val[1][s->block_index[0]][1], v->bfraction, 1, s->quarter_sample);
+
+ if (twomv) {
+ s->mv[0][2][0] = s->current_picture.motion_val[0][s->block_index[2]][0] = scale_mv(s->next_picture.motion_val[1][s->block_index[2]][0], v->bfraction, 0, s->quarter_sample);
+ s->mv[0][2][1] = s->current_picture.motion_val[0][s->block_index[2]][1] = scale_mv(s->next_picture.motion_val[1][s->block_index[2]][1], v->bfraction, 0, s->quarter_sample);
+ s->mv[1][2][0] = s->current_picture.motion_val[1][s->block_index[2]][0] = scale_mv(s->next_picture.motion_val[1][s->block_index[2]][0], v->bfraction, 1, s->quarter_sample);
+ s->mv[1][2][1] = s->current_picture.motion_val[1][s->block_index[2]][1] = scale_mv(s->next_picture.motion_val[1][s->block_index[2]][1], v->bfraction, 1, s->quarter_sample);
+
+ for (i = 1; i < 4; i += 2) {
+ s->mv[0][i][0] = s->current_picture.motion_val[0][s->block_index[i]][0] = s->mv[0][i-1][0];
+ s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1] = s->mv[0][i-1][1];
+ s->mv[1][i][0] = s->current_picture.motion_val[1][s->block_index[i]][0] = s->mv[1][i-1][0];
+ s->mv[1][i][1] = s->current_picture.motion_val[1][s->block_index[i]][1] = s->mv[1][i-1][1];
+ }
+ } else {
+ for (i = 1; i < 4; i++) {
+ s->mv[0][i][0] = s->current_picture.motion_val[0][s->block_index[i]][0] = s->mv[0][0][0];
+ s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1] = s->mv[0][0][1];
+ s->mv[1][i][0] = s->current_picture.motion_val[1][s->block_index[i]][0] = s->mv[1][0][0];
+ s->mv[1][i][1] = s->current_picture.motion_val[1][s->block_index[i]][1] = s->mv[1][0][1];
+ }
+ }
+ }
+
+ if (ff_vc1_mbmode_intfrp[0][idx_mbmode][0] == MV_PMODE_INTFR_INTRA) { // intra MB
+ for (i = 0; i < 4; i++) {
+ s->mv[0][i][0] = s->current_picture.motion_val[0][s->block_index[i]][0] = 0;
+ s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1] = 0;
+ s->mv[1][i][0] = s->current_picture.motion_val[1][s->block_index[i]][0] = 0;
+ s->mv[1][i][1] = s->current_picture.motion_val[1][s->block_index[i]][1] = 0;
+ }
+ s->current_picture.mb_type[mb_pos] = MB_TYPE_INTRA;
+ s->mb_intra = v->is_intra[s->mb_x] = 1;
+ for (i = 0; i < 6; i++)
+ v->mb_type[0][s->block_index[i]] = 1;
+ fieldtx = v->fieldtx_plane[mb_pos] = get_bits1(gb);
+ mb_has_coeffs = get_bits1(gb);
+ if (mb_has_coeffs)
+ cbp = 1 + get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2);
+ v->s.ac_pred = v->acpred_plane[mb_pos] = get_bits1(gb);
+ GET_MQUANT();
+ s->current_picture.qscale_table[mb_pos] = mquant;
+ /* Set DC scale - y and c use the same (not sure if necessary here) */
+ s->y_dc_scale = s->y_dc_scale_table[mquant];
+ s->c_dc_scale = s->c_dc_scale_table[mquant];
+ dst_idx = 0;
+ for (i = 0; i < 6; i++) {
+ s->dc_val[0][s->block_index[i]] = 0;
+ dst_idx += i >> 2;
+ val = ((cbp >> (5 - i)) & 1);
+ v->mb_type[0][s->block_index[i]] = s->mb_intra;
+ v->a_avail = v->c_avail = 0;
+ if (i == 2 || i == 3 || !s->first_slice_line)
+ v->a_avail = v->mb_type[0][s->block_index[i] - s->block_wrap[i]];
+ if (i == 1 || i == 3 || s->mb_x)
+ v->c_avail = v->mb_type[0][s->block_index[i] - 1];
+
+ vc1_decode_intra_block(v, s->block[i], i, val, mquant,
+ (i & 4) ? v->codingset2 : v->codingset);
+ if (i > 3 && (s->flags & CODEC_FLAG_GRAY))
+ continue;
+ v->vc1dsp.vc1_inv_trans_8x8(s->block[i]);
+ if (i < 4) {
+ stride_y = s->linesize << fieldtx;
+ off = (fieldtx) ? ((i & 1) * 8) + ((i & 2) >> 1) * s->linesize : (i & 1) * 8 + 4 * (i & 2) * s->linesize;
+ } else {
+ stride_y = s->uvlinesize;
+ off = 0;
+ }
+ s->dsp.put_signed_pixels_clamped(s->block[i], s->dest[dst_idx] + off, stride_y);
+ }
+ } else {
+ s->mb_intra = v->is_intra[s->mb_x] = 0;
+ if (!direct) {
+ if (skipped || !s->mb_intra) {
+ bmvtype = decode012(gb);
+ switch (bmvtype) {
+ case 0:
+ bmvtype = (v->bfraction >= (B_FRACTION_DEN/2)) ? BMV_TYPE_BACKWARD : BMV_TYPE_FORWARD;
+ break;
+ case 1:
+ bmvtype = (v->bfraction >= (B_FRACTION_DEN/2)) ? BMV_TYPE_FORWARD : BMV_TYPE_BACKWARD;
+ break;
+ case 2:
+ bmvtype = BMV_TYPE_INTERPOLATED;
+ }
+ }
+
+ if (twomv && bmvtype != BMV_TYPE_INTERPOLATED)
+ mvsw = get_bits1(gb);
+ }
+
+ if (!skipped) { // inter MB
+ mb_has_coeffs = ff_vc1_mbmode_intfrp[0][idx_mbmode][3];
+ if (mb_has_coeffs)
+ cbp = 1 + get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2);
+ if (!direct) {
+ if (bmvtype == BMV_TYPE_INTERPOLATED & twomv) {
+ v->fourmvbp = get_vlc2(gb, v->fourmvbp_vlc->table, VC1_4MV_BLOCK_PATTERN_VLC_BITS, 1);
+ } else if (bmvtype == BMV_TYPE_INTERPOLATED | twomv) {
+ v->twomvbp = get_vlc2(gb, v->twomvbp_vlc->table, VC1_2MV_BLOCK_PATTERN_VLC_BITS, 1);
+ }
+ }
+
+ for (i = 0; i < 6; i++)
+ v->mb_type[0][s->block_index[i]] = 0;
+ fieldtx = v->fieldtx_plane[mb_pos] = ff_vc1_mbmode_intfrp[0][idx_mbmode][1];
+ /* for all motion vector read MVDATA and motion compensate each block */
+ dst_idx = 0;
+ if (direct) {
+ if (twomv) {
+ for (i = 0; i < 4; i++) {
+ vc1_mc_4mv_luma(v, i, 0, 0);
+ vc1_mc_4mv_luma(v, i, 1, 1);
+ }
+ vc1_mc_4mv_chroma4(v, 0, 0, 0);
+ vc1_mc_4mv_chroma4(v, 1, 1, 1);
+ } else {
+ vc1_mc_1mv(v, 0);
+ vc1_interp_mc(v);
+ }
+ } else if (twomv && bmvtype == BMV_TYPE_INTERPOLATED) {
+ mvbp = v->fourmvbp;
+ for (i = 0; i < 4; i++) {
+ dir = i==1 || i==3;
+ dmv_x = dmv_y = 0;
+ val = ((mvbp >> (3 - i)) & 1);
+ if (val)
+ get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0);
+ j = i > 1 ? 2 : 0;
+ vc1_pred_mv_intfr(v, j, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0], dir);
+ vc1_mc_4mv_luma(v, j, dir, dir);
+ vc1_mc_4mv_luma(v, j+1, dir, dir);
+ }
+
+ vc1_mc_4mv_chroma4(v, 0, 0, 0);
+ vc1_mc_4mv_chroma4(v, 1, 1, 1);
+ } else if (bmvtype == BMV_TYPE_INTERPOLATED) {
+ mvbp = v->twomvbp;
+ dmv_x = dmv_y = 0;
+ if (mvbp & 2)
+ get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0);
+
+ vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0], 0);
+ vc1_mc_1mv(v, 0);
+
+ dmv_x = dmv_y = 0;
+ if (mvbp & 1)
+ get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0);
+
+ vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0], 1);
+ vc1_interp_mc(v);
+ } else if (twomv) {
+ dir = bmvtype == BMV_TYPE_BACKWARD;
+ dir2 = dir;
+ if (mvsw)
+ dir2 = !dir;
+ mvbp = v->twomvbp;
+ dmv_x = dmv_y = 0;
+ if (mvbp & 2)
+ get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0);
+ vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0], dir);
+
+ dmv_x = dmv_y = 0;
+ if (mvbp & 1)
+ get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0);
+ vc1_pred_mv_intfr(v, 2, dmv_x, dmv_y, 2, v->range_x, v->range_y, v->mb_type[0], dir2);
+
+ if (mvsw) {
+ for (i = 0; i < 2; i++) {
+ s->mv[dir][i+2][0] = s->mv[dir][i][0] = s->current_picture.motion_val[dir][s->block_index[i+2]][0] = s->current_picture.motion_val[dir][s->block_index[i]][0];
+ s->mv[dir][i+2][1] = s->mv[dir][i][1] = s->current_picture.motion_val[dir][s->block_index[i+2]][1] = s->current_picture.motion_val[dir][s->block_index[i]][1];
+ s->mv[dir2][i+2][0] = s->mv[dir2][i][0] = s->current_picture.motion_val[dir2][s->block_index[i]][0] = s->current_picture.motion_val[dir2][s->block_index[i+2]][0];
+ s->mv[dir2][i+2][1] = s->mv[dir2][i][1] = s->current_picture.motion_val[dir2][s->block_index[i]][1] = s->current_picture.motion_val[dir2][s->block_index[i+2]][1];
+ }
+ } else {
+ vc1_pred_mv_intfr(v, 0, 0, 0, 2, v->range_x, v->range_y, v->mb_type[0], !dir);
+ vc1_pred_mv_intfr(v, 2, 0, 0, 2, v->range_x, v->range_y, v->mb_type[0], !dir);
+ }
+
+ vc1_mc_4mv_luma(v, 0, dir, 0);
+ vc1_mc_4mv_luma(v, 1, dir, 0);
+ vc1_mc_4mv_luma(v, 2, dir2, 0);
+ vc1_mc_4mv_luma(v, 3, dir2, 0);
+ vc1_mc_4mv_chroma4(v, dir, dir2, 0);
+ } else {
+ dir = bmvtype == BMV_TYPE_BACKWARD;
+
+ mvbp = ff_vc1_mbmode_intfrp[0][idx_mbmode][2];
+ dmv_x = dmv_y = 0;
+ if (mvbp)
+ get_mvdata_interlaced(v, &dmv_x, &dmv_y, 0);
+
+ vc1_pred_mv_intfr(v, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0], dir);
+ v->blk_mv_type[s->block_index[0]] = 1;
+ v->blk_mv_type[s->block_index[1]] = 1;
+ v->blk_mv_type[s->block_index[2]] = 1;
+ v->blk_mv_type[s->block_index[3]] = 1;
+ vc1_pred_mv_intfr(v, 0, 0, 0, 2, v->range_x, v->range_y, 0, !dir);
+ for (i = 0; i < 2; i++) {
+ s->mv[!dir][i+2][0] = s->mv[!dir][i][0] = s->current_picture.motion_val[!dir][s->block_index[i+2]][0] = s->current_picture.motion_val[!dir][s->block_index[i]][0];
+ s->mv[!dir][i+2][1] = s->mv[!dir][i][1] = s->current_picture.motion_val[!dir][s->block_index[i+2]][1] = s->current_picture.motion_val[!dir][s->block_index[i]][1];
+ }
+ vc1_mc_1mv(v, dir);
+ }
+
+ if (cbp)
+ GET_MQUANT(); // p. 227
+ s->current_picture.qscale_table[mb_pos] = mquant;
+ if (!v->ttmbf && cbp)
+ ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2);
+ for (i = 0; i < 6; i++) {
+ s->dc_val[0][s->block_index[i]] = 0;
+ dst_idx += i >> 2;
+ val = ((cbp >> (5 - i)) & 1);
+ if (!fieldtx)
+ off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize);
+ else
+ off = (i & 4) ? 0 : ((i & 1) * 8 + ((i > 1) * s->linesize));
+ if (val) {
+ pat = vc1_decode_p_block(v, s->block[i], i, mquant, ttmb,
+ first_block, s->dest[dst_idx] + off,
+ (i & 4) ? s->uvlinesize : (s->linesize << fieldtx),
+ (i & 4) && (s->flags & CODEC_FLAG_GRAY), &block_tt);
+ block_cbp |= pat << (i << 2);
+ if (!v->ttmbf && ttmb < 8)
+ ttmb = -1;
+ first_block = 0;
+ }
+ }
+
+ } else { // skipped
+ dir = 0;
+ for (i = 0; i < 6; i++) {
+ v->mb_type[0][s->block_index[i]] = 0;
+ s->dc_val[0][s->block_index[i]] = 0;
+ }
+ s->current_picture.mb_type[mb_pos] = MB_TYPE_SKIP;
+ s->current_picture.qscale_table[mb_pos] = 0;
+ v->blk_mv_type[s->block_index[0]] = 0;
+ v->blk_mv_type[s->block_index[1]] = 0;
+ v->blk_mv_type[s->block_index[2]] = 0;
+ v->blk_mv_type[s->block_index[3]] = 0;
+
+ if (!direct) {
+ if (bmvtype == BMV_TYPE_INTERPOLATED) {
+ vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, v->mb_type[0], 0);
+ vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, v->mb_type[0], 1);
+ } else {
+ dir = bmvtype == BMV_TYPE_BACKWARD;
+ vc1_pred_mv_intfr(v, 0, 0, 0, 1, v->range_x, v->range_y, v->mb_type[0], dir);
+ if (mvsw) {
+ int dir2 = dir;
+ if (mvsw)
+ dir2 = !dir;
+ for (i = 0; i < 2; i++) {
+ s->mv[dir][i+2][0] = s->mv[dir][i][0] = s->current_picture.motion_val[dir][s->block_index[i+2]][0] = s->current_picture.motion_val[dir][s->block_index[i]][0];
+ s->mv[dir][i+2][1] = s->mv[dir][i][1] = s->current_picture.motion_val[dir][s->block_index[i+2]][1] = s->current_picture.motion_val[dir][s->block_index[i]][1];
+ s->mv[dir2][i+2][0] = s->mv[dir2][i][0] = s->current_picture.motion_val[dir2][s->block_index[i]][0] = s->current_picture.motion_val[dir2][s->block_index[i+2]][0];
+ s->mv[dir2][i+2][1] = s->mv[dir2][i][1] = s->current_picture.motion_val[dir2][s->block_index[i]][1] = s->current_picture.motion_val[dir2][s->block_index[i+2]][1];
+ }
+ } else {
+ v->blk_mv_type[s->block_index[0]] = 1;
+ v->blk_mv_type[s->block_index[1]] = 1;
+ v->blk_mv_type[s->block_index[2]] = 1;
+ v->blk_mv_type[s->block_index[3]] = 1;
+ vc1_pred_mv_intfr(v, 0, 0, 0, 2, v->range_x, v->range_y, 0, !dir);
+ for (i = 0; i < 2; i++) {
+ s->mv[!dir][i+2][0] = s->mv[!dir][i][0] = s->current_picture.motion_val[!dir][s->block_index[i+2]][0] = s->current_picture.motion_val[!dir][s->block_index[i]][0];
+ s->mv[!dir][i+2][1] = s->mv[!dir][i][1] = s->current_picture.motion_val[!dir][s->block_index[i+2]][1] = s->current_picture.motion_val[!dir][s->block_index[i]][1];
+ }
+ }
+ }
+ }
+
+ vc1_mc_1mv(v, dir);
+ if (direct || bmvtype == BMV_TYPE_INTERPOLATED) {
+ vc1_interp_mc(v);
+ }
+ }
+ }
+ if (s->mb_x == s->mb_width - 1)
+ memmove(v->is_intra_base, v->is_intra, sizeof(v->is_intra_base[0]) * s->mb_stride);
+ v->cbp[s->mb_x] = block_cbp;
+ v->ttblk[s->mb_x] = block_tt;
+ return 0;
+}
+
 /** Decode blocks of I-frame
 */
 static void vc1_decode_i_blocks(VC1Context *v)
@@ -4357,7 +4784,7 @@
 s->first_slice_line = 1;
 for (s->mb_y = 0; s->mb_y < s->end_mb_y; s->mb_y++) {
 s->mb_x = 0;
- ff_init_block_index(s);
+ init_block_index(v);
 for (; s->mb_x < v->end_mb_x; s->mb_x++) {
 uint8_t *dst[6];
 ff_update_block_index(s);
@@ -4369,10 +4796,10 @@
 dst[5] = s->dest[2];
 s->dsp.clear_blocks(s->block[0]);
 mb_pos = s->mb_x + s->mb_y * s->mb_width;
- s->current_picture.f.mb_type[mb_pos] = MB_TYPE_INTRA;
- s->current_picture.f.qscale_table[mb_pos] = v->pq;
- s->current_picture.f.motion_val[1][s->block_index[0]][0] = 0;
- s->current_picture.f.motion_val[1][s->block_index[0]][1] = 0;
+ s->current_picture.mb_type[mb_pos] = MB_TYPE_INTRA;
+ s->current_picture.qscale_table[mb_pos] = v->pq;
+ s->current_picture.motion_val[1][s->block_index[0]][0] = 0;
+ s->current_picture.motion_val[1][s->block_index[0]][1] = 0;
 
 // do actual MB decoding and displaying
 cbp = get_vlc2(&v->s.gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2);
@@ -4431,25 +4858,25 @@
 if (v->s.loop_filter) vc1_loop_filter_iblk(v, v->pq);
 
 if (get_bits_count(&s->gb) > v->bits) {
- ff_er_add_slice(s, 0, 0, s->mb_x, s->mb_y, ER_MB_ERROR);
+ ff_er_add_slice(&s->er, 0, 0, s->mb_x, s->mb_y, ER_MB_ERROR);
 av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i\n",
 get_bits_count(&s->gb), v->bits);
 return;
 }
 }
 if (!v->s.loop_filter)
- ff_draw_horiz_band(s, s->mb_y * 16, 16);
+ ff_mpeg_draw_horiz_band(s, s->mb_y * 16, 16);
 else if (s->mb_y)
- ff_draw_horiz_band(s, (s->mb_y - 1) * 16, 16);
+ ff_mpeg_draw_horiz_band(s, (s->mb_y - 1) * 16, 16);
 
 s->first_slice_line = 0;
 }
 if (v->s.loop_filter)
- ff_draw_horiz_band(s, (s->end_mb_y - 1) * 16, 16);
+ ff_mpeg_draw_horiz_band(s, (s->end_mb_y - 1) * 16, 16);
 
 /* This is intentionally mb_height and not end_mb_y - unlike in advanced
 * profile, these only differ are when decoding MSS2 rectangles. */
- ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, ER_MB_END);
+ ff_er_add_slice(&s->er, 0, 0, s->mb_width - 1, s->mb_height - 1, ER_MB_END);
 }
 
 /** Decode blocks of I-frame for advanced profile
@@ -4497,21 +4924,21 @@
 s->mb_y = s->start_mb_y;
 if (s->start_mb_y) {
 s->mb_x = 0;
- ff_init_block_index(s);
+ init_block_index(v);
 memset(&s->coded_block[s->block_index[0] - s->b8_stride], 0,
 (1 + s->b8_stride) * sizeof(*s->coded_block));
 }
 for (; s->mb_y < s->end_mb_y; s->mb_y++) {
 s->mb_x = 0;
- ff_init_block_index(s);
+ init_block_index(v);
 for (;s->mb_x < s->mb_width; s->mb_x++) {
- DCTELEM (*block)[64] = v->block[v->cur_blk_idx];
+ int16_t (*block)[64] = v->block[v->cur_blk_idx];
 ff_update_block_index(s);
 s->dsp.clear_blocks(block[0]);
 mb_pos = s->mb_x + s->mb_y * s->mb_stride;
- s->current_picture.f.mb_type[mb_pos + v->mb_off] = MB_TYPE_INTRA;
- s->current_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][0] = 0;
- s->current_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][1] = 0;
+ s->current_picture.mb_type[mb_pos + v->mb_off] = MB_TYPE_INTRA;
+ s->current_picture.motion_val[1][s->block_index[0] + v->blocks_off][0] = 0;
+ s->current_picture.motion_val[1][s->block_index[0] + v->blocks_off][1] = 0;
 
 // do actual MB decoding and displaying
 if (v->fieldtx_is_raw)
@@ -4527,7 +4954,7 @@
 
 GET_MQUANT();
 
- s->current_picture.f.qscale_table[mb_pos] = mquant;
+ s->current_picture.qscale_table[mb_pos] = mquant;
 /* Set DC scale - y and c use the same */
 s->y_dc_scale = s->y_dc_scale_table[mquant];
 s->c_dc_scale = s->c_dc_scale_table[mquant];
@@ -4559,22 +4986,23 @@
 
 if (get_bits_count(&s->gb) > v->bits) {
 // TODO: may need modification to handle slice coding
- ff_er_add_slice(s, 0, s->start_mb_y, s->mb_x, s->mb_y, ER_MB_ERROR);
+ ff_er_add_slice(&s->er, 0, s->start_mb_y, s->mb_x, s->mb_y, ER_MB_ERROR);
 av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i\n",
 get_bits_count(&s->gb), v->bits);
 return;
 }
 }
 if (!v->s.loop_filter)
- ff_draw_horiz_band(s, s->mb_y * 16, 16);
+ ff_mpeg_draw_horiz_band(s, s->mb_y * 16, 16);
 else if (s->mb_y)
- ff_draw_horiz_band(s, (s->mb_y-1) * 16, 16);
+ ff_mpeg_draw_horiz_band(s, (s->mb_y-1) * 16, 16);
 s->first_slice_line = 0;
 }
 
 /* raw bottom MB row */
 s->mb_x = 0;
- ff_init_block_index(s);
+ init_block_index(v);
+
 for (;s->mb_x < s->mb_width; s->mb_x++) {
 ff_update_block_index(s);
 vc1_put_signed_blocks_clamped(v);
@@ -4582,8 +5010,8 @@
 vc1_loop_filter_iblk_delayed(v, v->pq);
 }
 if (v->s.loop_filter)
- ff_draw_horiz_band(s, (s->end_mb_y-1)*16, 16);
- ff_er_add_slice(s, 0, s->start_mb_y << v->field_mode, s->mb_width - 1,
+ ff_mpeg_draw_horiz_band(s, (s->end_mb_y-1)*16, 16);
+ ff_er_add_slice(&s->er, 0, s->start_mb_y << v->field_mode, s->mb_width - 1,
 (s->end_mb_y << v->field_mode) - 1, ER_MB_END);
 }
 
@@ -4617,12 +5045,13 @@
 break;
 }
 
- apply_loop_filter = s->loop_filter && !(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY);
+ apply_loop_filter = s->loop_filter && !(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY) &&
+ v->fcm == PROGRESSIVE;
 s->first_slice_line = 1;
 memset(v->cbp_base, 0, sizeof(v->cbp_base[0])*2*s->mb_stride);
 for (s->mb_y = s->start_mb_y; s->mb_y < s->end_mb_y; s->mb_y++) {
 s->mb_x = 0;
- ff_init_block_index(s);
+ init_block_index(v);
 for (; s->mb_x < s->mb_width; s->mb_x++) {
 ff_update_block_index(s);
 
@@ -4631,11 +5060,11 @@
 else if (v->fcm == ILACE_FRAME)
 vc1_decode_p_mb_intfr(v);
 else vc1_decode_p_mb(v);
- if (s->mb_y != s->start_mb_y && apply_loop_filter && v->fcm == PROGRESSIVE)
+ if (s->mb_y != s->start_mb_y && apply_loop_filter)
 vc1_apply_p_loop_filter(v);
 if (get_bits_count(&s->gb) > v->bits || get_bits_count(&s->gb) < 0) {
 // TODO: may need modification to handle slice coding
- ff_er_add_slice(s, 0, s->start_mb_y, s->mb_x, s->mb_y, ER_MB_ERROR);
+ ff_er_add_slice(&s->er, 0, s->start_mb_y, s->mb_x, s->mb_y, ER_MB_ERROR);
 av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i at %ix%i\n",
 get_bits_count(&s->gb), v->bits, s->mb_x, s->mb_y);
 return;
@@ -4645,20 +5074,20 @@
 memmove(v->ttblk_base, v->ttblk, sizeof(v->ttblk_base[0]) * s->mb_stride);
 memmove(v->is_intra_base, v->is_intra, sizeof(v->is_intra_base[0]) * s->mb_stride);
 memmove(v->luma_mv_base, v->luma_mv, sizeof(v->luma_mv_base[0]) * s->mb_stride);
- if (s->mb_y != s->start_mb_y) ff_draw_horiz_band(s, (s->mb_y - 1) * 16, 16);
+ if (s->mb_y != s->start_mb_y) ff_mpeg_draw_horiz_band(s, (s->mb_y - 1) * 16, 16);
 s->first_slice_line = 0;
 }
 if (apply_loop_filter) {
 s->mb_x = 0;
- ff_init_block_index(s);
+ init_block_index(v);
 for (; s->mb_x < s->mb_width; s->mb_x++) {
 ff_update_block_index(s);
 vc1_apply_p_loop_filter(v);
 }
 }
 if (s->end_mb_y >= s->start_mb_y)
- ff_draw_horiz_band(s, (s->end_mb_y - 1) * 16, 16);
- ff_er_add_slice(s, 0, s->start_mb_y << v->field_mode, s->mb_width - 1,
+ ff_mpeg_draw_horiz_band(s, (s->end_mb_y - 1) * 16, 16);
+ ff_er_add_slice(&s->er, 0, s->start_mb_y << v->field_mode, s->mb_width - 1,
 (s->end_mb_y << v->field_mode) - 1, ER_MB_END);
 }
 
@@ -4694,17 +5123,19 @@
 s->first_slice_line = 1;
 for (s->mb_y = s->start_mb_y; s->mb_y < s->end_mb_y; s->mb_y++) {
 s->mb_x = 0;
- ff_init_block_index(s);
+ init_block_index(v);
 for (; s->mb_x < s->mb_width; s->mb_x++) {
 ff_update_block_index(s);
 
 if (v->fcm == ILACE_FIELD)
 vc1_decode_b_mb_intfi(v);
+ else if (v->fcm == ILACE_FRAME)
+ vc1_decode_b_mb_intfr(v);
 else
 vc1_decode_b_mb(v);
 if (get_bits_count(&s->gb) > v->bits || get_bits_count(&s->gb) < 0) {
 // TODO: may need modification to handle slice coding
- ff_er_add_slice(s, 0, s->start_mb_y, s->mb_x, s->mb_y, ER_MB_ERROR);
+ ff_er_add_slice(&s->er, 0, s->start_mb_y, s->mb_x, s->mb_y, ER_MB_ERROR);
 av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i at %ix%i\n",
 get_bits_count(&s->gb), v->bits, s->mb_x, s->mb_y);
 return;
@@ -4712,14 +5143,14 @@
 if (v->s.loop_filter) vc1_loop_filter_iblk(v, v->pq);
 }
 if (!v->s.loop_filter)
- ff_draw_horiz_band(s, s->mb_y * 16, 16);
+ ff_mpeg_draw_horiz_band(s, s->mb_y * 16, 16);
 else if (s->mb_y)
- ff_draw_horiz_band(s, (s->mb_y - 1) * 16, 16);
+ ff_mpeg_draw_horiz_band(s, (s->mb_y - 1) * 16, 16);
 s->first_slice_line = 0;
 }
 if (v->s.loop_filter)
- ff_draw_horiz_band(s, (s->end_mb_y - 1) * 16, 16);
- ff_er_add_slice(s, 0, s->start_mb_y << v->field_mode, s->mb_width - 1,
+ ff_mpeg_draw_horiz_band(s, (s->end_mb_y - 1) * 16, 16);
+ ff_er_add_slice(&s->er, 0, s->start_mb_y << v->field_mode, s->mb_width - 1,
 (s->end_mb_y << v->field_mode) - 1, ER_MB_END);
 }
 
@@ -4727,16 +5158,19 @@
 {
 MpegEncContext *s = &v->s;
 
- ff_er_add_slice(s, 0, s->start_mb_y, s->mb_width - 1, s->end_mb_y - 1, ER_MB_END);
+ if (!v->s.last_picture.f.data[0])
+ return;
+
+ ff_er_add_slice(&s->er, 0, s->start_mb_y, s->mb_width - 1, s->end_mb_y - 1, ER_MB_END);
 s->first_slice_line = 1;
 for (s->mb_y = s->start_mb_y; s->mb_y < s->end_mb_y; s->mb_y++) {
 s->mb_x = 0;
- ff_init_block_index(s);
+ init_block_index(v);
 ff_update_block_index(s);
 memcpy(s->dest[0], s->last_picture.f.data[0] + s->mb_y * 16 * s->linesize, s->linesize * 16);
 memcpy(s->dest[1], s->last_picture.f.data[1] + s->mb_y * 8 * s->uvlinesize, s->uvlinesize * 8);
 memcpy(s->dest[2], s->last_picture.f.data[2] + s->mb_y * 8 * s->uvlinesize, s->uvlinesize * 8);
- ff_draw_horiz_band(s, s->mb_y * 16, 16);
+ ff_mpeg_draw_horiz_band(s, s->mb_y * 16, 16);
 s->first_slice_line = 0;
 }
 s->pict_type = AV_PICTURE_TYPE_P;
@@ -4847,7 +5281,7 @@
 for (sprite = 0; sprite <= v->two_sprites; sprite++) {
 vc1_sprite_parse_transform(gb, sd->coefs[sprite]);
 if (sd->coefs[sprite][1] || sd->coefs[sprite][3])
- av_log_ask_for_sample(avctx, "Rotation coefficients are not zero");
+ avpriv_request_sample(avctx, "Non-zero rotation coefficients");
 av_log(avctx, AV_LOG_DEBUG, sprite ? "S2:" : "S1:");
 for (i = 0; i < 7; i++)
 av_log(avctx, AV_LOG_DEBUG, " %d.%.3d",
@@ -4930,8 +5364,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];
@@ -5021,12 +5455,8 @@
 v->two_sprites = 0;
 }
 
- if (v->sprite_output_frame.data[0])
- avctx->release_buffer(avctx, &v->sprite_output_frame);
-
- v->sprite_output_frame.buffer_hints = FF_BUFFER_HINTS_VALID;
- v->sprite_output_frame.reference = 0;
- if (ff_get_buffer(avctx, &v->sprite_output_frame) < 0) {
+ av_frame_unref(v->sprite_output_frame);
+ if (ff_get_buffer(avctx, v->sprite_output_frame, 0) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return -1;
 }
@@ -5060,14 +5490,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);
@@ -5081,23 +5512,20 @@
 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_last_base = av_mallocz(2 * (s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2));
- v->mv_f_last[0] = v->mv_f_last_base + s->b8_stride + 1;
- v->mv_f_last[1] = v->mv_f_last[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) {
@@ -5116,8 +5544,19 @@
 
 if (!v->mv_type_mb_plane || !v->direct_mb_plane || !v->acpred_plane || !v->over_flags_plane ||
 !v->block || !v->cbp_base || !v->ttblk_base || !v->is_intra_base || !v->luma_mv_base ||
- !v->mb_type_base)
- return -1;
+ !v->mb_type_base) {
+ av_freep(&v->mv_type_mb_plane);
+ av_freep(&v->direct_mb_plane);
+ av_freep(&v->acpred_plane);
+ av_freep(&v->over_flags_plane);
+ av_freep(&v->block);
+ av_freep(&v->cbp_base);
+ av_freep(&v->ttblk_base);
+ av_freep(&v->is_intra_base);
+ av_freep(&v->luma_mv_base);
+ av_freep(&v->mb_type_base);
+ return AVERROR(ENOMEM);
+ }
 
 return 0;
 }
@@ -5157,17 +5596,12 @@
 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 (avctx->idct_algo == FF_IDCT_AUTO) {
- avctx->idct_algo = FF_IDCT_WMV2;
- }
 
 if (ff_vc1_init_common(v) < 0)
 return -1;
+ ff_h264chroma_init(&v->h264chroma, 8);
 ff_vc1dsp_init(&v->vc1dsp);
 
 if (avctx->codec_id == AV_CODEC_ID_WMV3 || avctx->codec_id == AV_CODEC_ID_WMV3IMAGE) {
@@ -5235,9 +5669,13 @@
 av_log(avctx, AV_LOG_ERROR, "Incomplete extradata\n");
 return -1;
 }
- v->res_sprite = (avctx->codec_tag == MKTAG('W','V','P','2'));
+ 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;
@@ -5279,9 +5717,8 @@
 VC1Context *v = avctx->priv_data;
 int i;
 
- if ((avctx->codec_id == AV_CODEC_ID_WMV3IMAGE || avctx->codec_id == AV_CODEC_ID_VC1IMAGE)
- && v->sprite_output_frame.data[0])
- avctx->release_buffer(avctx, &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]);
 av_freep(&v->hrd_rate);
@@ -5296,7 +5733,6 @@
 av_freep(&v->mb_type_base);
 av_freep(&v->blk_mv_type_base);
 av_freep(&v->mv_f_base);
- av_freep(&v->mv_f_last_base);
 av_freep(&v->mv_f_next_base);
 av_freep(&v->block);
 av_freep(&v->cbp_base);
@@ -5315,7 +5751,7 @@
 int *got_frame, AVPacket *avpkt)
 {
 const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size, n_slices = 0, i;
+ int buf_size = avpkt->size, n_slices = 0, i, ret;
 VC1Context *v = avctx->priv_data;
 MpegEncContext *s = &v->s;
 AVFrame *pict = data;
@@ -5332,7 +5768,8 @@
 if (buf_size == 0 || (buf_size == 4 && AV_RB32(buf) == VC1_CODE_ENDOFSEQ)) {
 /* special case for last picture */
 if (s->low_delay == 0 && s->next_picture_ptr) {
- *pict = s->next_picture_ptr->f;
+ if ((ret = av_frame_ref(pict, &s->next_picture_ptr->f)) < 0)
+ return ret;
 s->next_picture_ptr = NULL;
 
 *got_frame = 1;
@@ -5341,13 +5778,6 @@
 return 0;
 }
 
- if (s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) {
- if (v->profile < PROFILE_ADVANCED)
- avctx->pix_fmt = AV_PIX_FMT_VDPAU_WMV3;
- else
- avctx->pix_fmt = AV_PIX_FMT_VDPAU_VC1;
- }
-
 //for advanced profile we may need to parse and unescape data
 if (avctx->codec_id == AV_CODEC_ID_VC1 || avctx->codec_id == AV_CODEC_ID_VC1IMAGE) {
 int buf_size2 = 0;
@@ -5364,8 +5794,7 @@
 if (size <= 0) continue;
 switch (AV_RB32(start)) {
 case VC1_CODE_FRAME:
- if (avctx->hwaccel ||
- s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
+ if (avctx->hwaccel)
 buf_start = start;
 buf_size2 = vc1_unescape_buffer(start + 4, size, buf2);
 break;
@@ -5469,8 +5898,12 @@
 }
 
 if (!s->context_initialized) {
- if (ff_msmpeg4_decode_init(avctx) < 0 || ff_vc1_decode_init_alloc_tables(v) < 0)
+ if (ff_msmpeg4_decode_init(avctx) < 0)
 goto err;
+ if (ff_vc1_decode_init_alloc_tables(v) < 0) {
+ ff_MPV_common_end(s);
+ goto err;
+ }
 
 s->low_delay = !avctx->has_b_frames || v->res_sprite;
 
@@ -5480,26 +5913,19 @@
 }
 }
 
- /* 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;
 if (v->profile < PROFILE_ADVANCED) {
- if (ff_vc1_parse_frame_header(v, &s->gb) == -1) {
+ if (ff_vc1_parse_frame_header(v, &s->gb) < 0) {
 goto err;
 }
 } else {
- if (ff_vc1_parse_frame_header_adv(v, &s->gb) == -1) {
+ if (ff_vc1_parse_frame_header_adv(v, &s->gb) < 0) {
 goto err;
 }
 }
+ v->first_pic_header_flag = 0;
 
 if ((avctx->codec_id == AV_CODEC_ID_WMV3IMAGE || avctx->codec_id == AV_CODEC_ID_VC1IMAGE)
 && s->pict_type != AV_PICTURE_TYPE_I) {
@@ -5507,18 +5933,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;
@@ -5544,13 +5958,22 @@
 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;
+ }
+
 s->me.qpel_put = s->dsp.put_qpel_pixels_tab;
 s->me.qpel_avg = s->dsp.avg_qpel_pixels_tab;
 
- if ((CONFIG_VC1_VDPAU_DECODER)
- &&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
- ff_vdpau_vc1_decode_picture(s, buf_start, (buf + buf_size) - buf_start);
- else if (avctx->hwaccel) {
+ if (avctx->hwaccel) {
 if (avctx->hwaccel->start_frame(avctx, buf, buf_size) < 0)
 goto err;
 if (avctx->hwaccel->decode_slice(avctx, buf_start, (buf + buf_size) - buf_start) < 0)
@@ -5558,27 +5981,26 @@
 if (avctx->hwaccel->end_frame(avctx) < 0)
 goto err;
 } else {
- ff_er_frame_start(s);
+ int header_ret = 0;
+
+ ff_mpeg_er_frame_start(s);
 
 v->bits = buf_size * 8;
 v->end_mb_x = s->mb_width;
 if (v->field_mode) {
- uint8_t *tmp[2];
 s->current_picture.f.linesize[0] <<= 1;
 s->current_picture.f.linesize[1] <<= 1;
 s->current_picture.f.linesize[2] <<= 1;
 s->linesize <<= 1;
 s->uvlinesize <<= 1;
- tmp[0] = v->mv_f_last[0];
- tmp[1] = v->mv_f_last[1];
- v->mv_f_last[0] = v->mv_f_next[0];
- v->mv_f_last[1] = v->mv_f_next[1];
- v->mv_f_next[0] = v->mv_f[0];
- v->mv_f_next[1] = v->mv_f[1];
- v->mv_f[0] = tmp[0];
- v->mv_f[1] = tmp[1];
 }
 mb_height = s->mb_height >> v->field_mode;
+
+ if (!mb_height) {
+ av_log(v->s.avctx, AV_LOG_ERROR, "Invalid mb_height.\n");
+ goto err;
+ }
+
 for (i = 0; i <= n_slices; i++) {
 if (i > 0 && slices[i - 1].mby_start >= mb_height) {
 if (v->field_mode <= 0) {
@@ -5598,18 +6020,24 @@
 if (i) {
 v->pic_header_flag = 0;
 if (v->field_mode && i == n_slices1 + 2) {
- if (ff_vc1_parse_frame_header_adv(v, &s->gb) < 0) {
+ if ((header_ret = ff_vc1_parse_frame_header_adv(v, &s->gb)) < 0) {
 av_log(v->s.avctx, AV_LOG_ERROR, "Field header damaged\n");
+ if (avctx->err_recognition & AV_EF_EXPLODE)
+ goto err;
 continue;
 }
 } else if (get_bits1(&s->gb)) {
 v->pic_header_flag = 1;
- if (ff_vc1_parse_frame_header_adv(v, &s->gb) < 0) {
+ if ((header_ret = ff_vc1_parse_frame_header_adv(v, &s->gb)) < 0) {
 av_log(v->s.avctx, AV_LOG_ERROR, "Slice header damaged\n");
+ if (avctx->err_recognition & AV_EF_EXPLODE)
+ goto err;
 continue;
 }
 }
 }
+ if (header_ret < 0)
+ continue;
 s->start_mb_y = (i == 0) ? 0 : FFMAX(0, slices[i-1].mby_start % mb_height);
 if (!v->field_mode || v->second_field)
 s->end_mb_y = (i == n_slices ) ? mb_height : FFMIN(mb_height, slices[i].mby_start % mb_height);
@@ -5621,21 +6049,22 @@
 }
 if (v->field_mode) {
 v->second_field = 0;
- if (s->pict_type == AV_PICTURE_TYPE_B) {
- memcpy(v->mv_f_base, v->mv_f_next_base,
- 2 * (s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2));
- }
 s->current_picture.f.linesize[0] >>= 1;
 s->current_picture.f.linesize[1] >>= 1;
 s->current_picture.f.linesize[2] >>= 1;
 s->linesize >>= 1;
 s->uvlinesize >>= 1;
+ if (v->s.pict_type != AV_PICTURE_TYPE_BI && v->s.pict_type != AV_PICTURE_TYPE_B) {
+ FFSWAP(uint8_t *, v->mv_f_next[0], v->mv_f[0]);
+ FFSWAP(uint8_t *, v->mv_f_next[1], v->mv_f[1]);
+ }
 }
 av_dlog(s->avctx, "Consumed %i/%i bits\n",
 get_bits_count(&s->gb), s->gb.size_in_bits);
 // if (get_bits_count(&s->gb) > buf_size * 8)
 // return -1;
- ff_er_frame_end(s);
+ if (!v->field_mode)
+ ff_er_frame_end(&s->er);
 }
 
 ff_MPV_frame_end(s);
@@ -5650,17 +6079,20 @@
 if (vc1_decode_sprites(v, &s->gb))
 goto err;
 #endif
- *pict = v->sprite_output_frame;
+ if ((ret = av_frame_ref(pict, v->sprite_output_frame)) < 0)
+ goto err;
 *got_frame = 1;
 } else {
 if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) {
- *pict = s->current_picture_ptr->f;
+ if ((ret = av_frame_ref(pict, &s->current_picture_ptr->f)) < 0)
+ goto err;
+ ff_print_debug_info(s, s->current_picture_ptr);
+ *got_frame = 1;
 } else if (s->last_picture_ptr != NULL) {
- *pict = s->last_picture_ptr->f;
- }
- if (s->last_picture_ptr || s->low_delay) {
+ if ((ret = av_frame_ref(pict, &s->last_picture_ptr->f)) < 0)
+ goto err;
+ ff_print_debug_info(s, s->last_picture_ptr);
 *got_frame = 1;
- ff_print_debug_info(s, pict);
 }
 }
 
@@ -5688,8 +6120,23 @@
 { FF_PROFILE_UNKNOWN },
 };
 
+static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = {
+#if CONFIG_DXVA2
+ AV_PIX_FMT_DXVA2_VLD,
+#endif
+#if CONFIG_VAAPI
+ AV_PIX_FMT_VAAPI_VLD,
+#endif
+#if CONFIG_VDPAU
+ AV_PIX_FMT_VDPAU,
+#endif
+ AV_PIX_FMT_YUV420P,
+ AV_PIX_FMT_NONE
+};
+
 AVCodec ff_vc1_decoder = {
 .name = "vc1",
+ .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_VC1,
 .priv_data_size = sizeof(VC1Context),
@@ -5698,14 +6145,14 @@
 .decode = vc1_decode_frame,
 .flush = ff_mpeg_flush,
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
- .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"),
- .pix_fmts = ff_hwaccel_pixfmt_list_420,
+ .pix_fmts = vc1_hwaccel_pixfmt_list_420,
 .profiles = NULL_IF_CONFIG_SMALL(profiles)
 };
 
 #if CONFIG_WMV3_DECODER
 AVCodec ff_wmv3_decoder = {
 .name = "wmv3",
+ .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_WMV3,
 .priv_data_size = sizeof(VC1Context),
@@ -5714,40 +6161,7 @@
 .decode = vc1_decode_frame,
 .flush = ff_mpeg_flush,
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
- .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"),
- .pix_fmts = ff_hwaccel_pixfmt_list_420,
- .profiles = NULL_IF_CONFIG_SMALL(profiles)
-};
-#endif
-
-#if CONFIG_WMV3_VDPAU_DECODER
-AVCodec ff_wmv3_vdpau_decoder = {
- .name = "wmv3_vdpau",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_WMV3,
- .priv_data_size = sizeof(VC1Context),
- .init = vc1_decode_init,
- .close = ff_vc1_decode_end,
- .decode = vc1_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU,
- .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 VDPAU"),
- .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_VDPAU_WMV3, AV_PIX_FMT_NONE },
- .profiles = NULL_IF_CONFIG_SMALL(profiles)
-};
-#endif
-
-#if CONFIG_VC1_VDPAU_DECODER
-AVCodec ff_vc1_vdpau_decoder = {
- .name = "vc1_vdpau",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_VC1,
- .priv_data_size = sizeof(VC1Context),
- .init = vc1_decode_init,
- .close = ff_vc1_decode_end,
- .decode = vc1_decode_frame,
- .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU,
- .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1 VDPAU"),
- .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_VDPAU_VC1, AV_PIX_FMT_NONE },
+ .pix_fmts = vc1_hwaccel_pixfmt_list_420,
 .profiles = NULL_IF_CONFIG_SMALL(profiles)
 };
 #endif
@@ -5755,6 +6169,7 @@
 #if CONFIG_WMV3IMAGE_DECODER
 AVCodec ff_wmv3image_decoder = {
 .name = "wmv3image",
+ .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 Image"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_WMV3IMAGE,
 .priv_data_size = sizeof(VC1Context),
@@ -5763,7 +6178,6 @@
 .decode = vc1_decode_frame,
 .capabilities = CODEC_CAP_DR1,
 .flush = vc1_sprite_flush,
- .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 Image"),
 .pix_fmts = ff_pixfmt_list_420
 };
 #endif
@@ -5771,6 +6185,7 @@
 #if CONFIG_VC1IMAGE_DECODER
 AVCodec ff_vc1image_decoder = {
 .name = "vc1image",
+ .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 Image v2"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_VC1IMAGE,
 .priv_data_size = sizeof(VC1Context),
@@ -5779,7 +6194,6 @@
 .decode = vc1_decode_frame,
 .capabilities = CODEC_CAP_DR1,
 .flush = vc1_sprite_flush,
- .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 Image v2"),
 .pix_fmts = ff_pixfmt_list_420
 };
 #endif

libav-v9.6.tar.bz2/libavcodec/vc1dsp.c -> libav-v10.1.tar.bz2/libavcodec/vc1dsp.c Changed

@@ -20,76 +20,74 @@
 */
 
 /**
-* @file
+ * @file
 * VC-1 and WMV3 decoder
 *
 */
 
-#include "vc1dsp.h"
 #include "libavutil/common.h"
+#include "h264chroma.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(DCTELEM *top, DCTELEM *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;
 
@@ -105,17 +103,17 @@
 }
 }
 
-static void vc1_h_s_overlap_c(DCTELEM *left, DCTELEM *right)
+static void vc1_h_s_overlap_c(int16_t *left, int16_t *right)
 {
 int i;
 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;
 
@@ -125,9 +123,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;
 }
 }
 
@@ -139,31 +137,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;
 }
@@ -181,17 +186,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;
 }
@@ -227,15 +233,16 @@
 vc1_loop_filter(src, stride, 1, 16, pq);
 }
 
-/** Do inverse transform on 8x8 block
-*/
-static void vc1_inv_trans_8x8_dc_c(uint8_t *dest, int linesize, DCTELEM *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);
@@ -248,15 +255,15 @@
 }
 }
 
-static void vc1_inv_trans_8x8_c(DCTELEM block[64])
+static void vc1_inv_trans_8x8_c(int16_t block[64])
 {
 int i;
- register int t1,t2,t3,t4,t5,t6,t7,t8;
- DCTELEM *src, *dst, temp[64];
+ 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];
@@ -287,7 +294,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];
@@ -317,15 +324,16 @@
 }
 }
 
-/** Do inverse transform on 8x4 part of block
-*/
-static void vc1_inv_trans_8x4_dc_c(uint8_t *dest, int linesize, DCTELEM *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);
@@ -338,15 +346,16 @@
 }
 }
 
-static void vc1_inv_trans_8x4_c(uint8_t *dest, int linesize, DCTELEM *block)
+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;
- DCTELEM *src, *dst;
+ 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];
@@ -376,31 +385,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
-*/
-static void vc1_inv_trans_4x8_dc_c(uint8_t *dest, int linesize, DCTELEM *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);
@@ -409,15 +419,16 @@
 }
 }
 
-static void vc1_inv_trans_4x8_c(uint8_t *dest, int linesize, DCTELEM *block)
+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;
- DCTELEM *src, *dst;
+ 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];
@@ -433,7 +444,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];
@@ -449,29 +460,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
-*/
-static void vc1_inv_trans_4x4_dc_c(uint8_t *dest, int linesize, DCTELEM *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);
@@ -480,15 +492,15 @@
 }
 }
 
-static void vc1_inv_trans_4x4_c(uint8_t *dest, int linesize, DCTELEM *block)
+static void vc1_inv_trans_4x4_c(uint8_t *dest, int linesize, int16_t *block)
 {
 int i;
- register int t1,t2,t3,t4;
- DCTELEM *src, *dst;
+ 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];
@@ -504,117 +516,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, OPNAME)\
-static av_always_inline void OPNAME ## vc1_mspel_mc(uint8_t *dst, const uint8_t *src, int 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, OPNAME) \
+static av_always_inline void OPNAME ## vc1_mspel_mc(uint8_t *dst, \
+ const uint8_t *src, \
+ int 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; \
+ } \
 }
 
 #define op_put(a, b) a = av_clip_uint8(b)
@@ -625,12 +648,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, int 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, int 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)
@@ -652,90 +681,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;
 
- assert(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;
+ assert(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;
 
- assert(x<8 && y<8 && x>=0 && y>=0);
+ assert(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;
 
- assert(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;
+ assert(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);
+ int i;
+
+ assert(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 += 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--) {
@@ -756,61 +823,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] = ff_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] = ff_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;
@@ -818,16 +904,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] = ff_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] = ff_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;
@@ -835,20 +921,25 @@
 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
-
- if (HAVE_ALTIVEC)
- ff_vc1dsp_init_altivec(dsp);
+#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)
 ff_vc1dsp_init_x86(dsp);
 }

libav-v9.6.tar.bz2/libavcodec/vc1dsp.h -> libav-v10.1.tar.bz2/libavcodec/vc1dsp.h Changed

@@ -29,21 +29,23 @@
 #define AVCODEC_VC1DSP_H
 
 #include "dsputil.h"
+#include "hpeldsp.h"
+#include "h264chroma.h"
 
 typedef struct VC1DSPContext {
     /* vc1 functions */
-    void (*vc1_inv_trans_8x8)(DCTELEM *b);
-    void (*vc1_inv_trans_8x4)(uint8_t *dest, int line_size, DCTELEM *block);
-    void (*vc1_inv_trans_4x8)(uint8_t *dest, int line_size, DCTELEM *block);
-    void (*vc1_inv_trans_4x4)(uint8_t *dest, int line_size, DCTELEM *block);
-    void (*vc1_inv_trans_8x8_dc)(uint8_t *dest, int line_size, DCTELEM *block);
-    void (*vc1_inv_trans_8x4_dc)(uint8_t *dest, int line_size, DCTELEM *block);
-    void (*vc1_inv_trans_4x8_dc)(uint8_t *dest, int line_size, DCTELEM *block);
-    void (*vc1_inv_trans_4x4_dc)(uint8_t *dest, int line_size, DCTELEM *block);
+    void (*vc1_inv_trans_8x8)(int16_t *b);
+    void (*vc1_inv_trans_8x4)(uint8_t *dest, int line_size, int16_t *block);
+    void (*vc1_inv_trans_4x8)(uint8_t *dest, int line_size, int16_t *block);
+    void (*vc1_inv_trans_4x4)(uint8_t *dest, int line_size, int16_t *block);
+    void (*vc1_inv_trans_8x8_dc)(uint8_t *dest, int line_size, int16_t *block);
+    void (*vc1_inv_trans_8x4_dc)(uint8_t *dest, int line_size, int16_t *block);
+    void (*vc1_inv_trans_4x8_dc)(uint8_t *dest, int line_size, int16_t *block);
+    void (*vc1_inv_trans_4x4_dc)(uint8_t *dest, int line_size, int16_t *block);
     void (*vc1_v_overlap)(uint8_t *src, int stride);
     void (*vc1_h_overlap)(uint8_t *src, int stride);
-    void (*vc1_v_s_overlap)(DCTELEM *top,  DCTELEM *bottom);
-    void (*vc1_h_s_overlap)(DCTELEM *left, DCTELEM *right);
+    void (*vc1_v_s_overlap)(int16_t *top,  int16_t *bottom);
+    void (*vc1_h_s_overlap)(int16_t *left, int16_t *right);
     void (*vc1_v_loop_filter4)(uint8_t *src, int stride, int pq);
     void (*vc1_h_loop_filter4)(uint8_t *src, int stride, int pq);
     void (*vc1_v_loop_filter8)(uint8_t *src, int stride, int pq);
@@ -73,7 +75,9 @@
 } VC1DSPContext;
 
 void ff_vc1dsp_init(VC1DSPContext* c);
-void ff_vc1dsp_init_altivec(VC1DSPContext* c);
+void ff_vc1dsp_init_aarch64(VC1DSPContext* dsp);
+void ff_vc1dsp_init_arm(VC1DSPContext* dsp);
+void ff_vc1dsp_init_ppc(VC1DSPContext *c);
 void ff_vc1dsp_init_x86(VC1DSPContext* dsp);
 
 #endif /* AVCODEC_VC1DSP_H */

libav-v9.6.tar.bz2/libavcodec/vcr1.c -> libav-v10.1.tar.bz2/libavcodec/vcr1.c Changed

@@ -25,40 +25,22 @@
 */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "libavutil/internal.h"
 
 typedef struct VCR1Context {
- AVFrame picture;
 int delta[16];
 int offset[4];
 } VCR1Context;
 
-static av_cold int vcr1_common_init(AVCodecContext *avctx)
-{
- VCR1Context *const a = avctx->priv_data;
-
- avctx->coded_frame = &a->picture;
-
- return 0;
-}
-
 static av_cold int vcr1_decode_init(AVCodecContext *avctx)
 {
- vcr1_common_init(avctx);
-
 avctx->pix_fmt = AV_PIX_FMT_YUV410P;
 
- return 0;
-}
-
-static av_cold int vcr1_decode_end(AVCodecContext *avctx)
-{
- VCR1Context *s = avctx->priv_data;
-
- if (s->picture.data[0])
- avctx->release_buffer(avctx, &s->picture);
+ if (avctx->width & 7) {
+ av_log(avctx, AV_LOG_ERROR, "Width %d is not divisble by 8.\n", avctx->width);
+ return AVERROR_INVALIDDATA;
+ }
 
 return 0;
 }
@@ -69,37 +51,40 @@
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 VCR1Context *const a = avctx->priv_data;
- AVFrame *picture = data;
- AVFrame *const p = &a->picture;
+ AVFrame *const p = data;
 const uint8_t *bytestream = buf;
- int i, x, y;
+ int i, x, y, ret;
 
- if (p->data[0])
- avctx->release_buffer(avctx, p);
-
- p->reference = 0;
- if (ff_get_buffer(avctx, p) < 0) {
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
 }
 p->pict_type = AV_PICTURE_TYPE_I;
 p->key_frame = 1;
 
+ if (buf_size < 32)
+ goto packet_small;
+
 for (i = 0; i < 16; i++) {
 a->delta[i] = *bytestream++;
 bytestream++;
+ buf_size--;
 }
 
 for (y = 0; y < avctx->height; y++) {
 int offset;
- uint8_t *luma = &a->picture.data[0][y * a->picture.linesize[0]];
+ uint8_t *luma = &p->data[0][y * p->linesize[0]];
 
 if ((y & 3) == 0) {
- uint8_t *cb = &a->picture.data[1][(y >> 2) * a->picture.linesize[1]];
- uint8_t *cr = &a->picture.data[2][(y >> 2) * a->picture.linesize[2]];
+ uint8_t *cb = &p->data[1][(y >> 2) * p->linesize[1]];
+ uint8_t *cr = &p->data[2][(y >> 2) * p->linesize[2]];
+
+ if (buf_size < 4 + avctx->width)
+ goto packet_small;
 
 for (i = 0; i < 4; i++)
 a->offset[i] = *bytestream++;
+ buf_size -= 4;
 
 offset = a->offset[0] - a->delta[bytestream[2] & 0xF];
 for (x = 0; x < avctx->width; x += 4) {
@@ -113,8 +98,12 @@
 *cr++ = bytestream[1];
 
 bytestream += 4;
+ buf_size -= 4;
 }
 } else {
+ if (buf_size < avctx->width / 2)
+ goto packet_small;
+
 offset = a->offset[y & 3] - a->delta[bytestream[2] & 0xF];
 
 for (x = 0; x < avctx->width; x += 8) {
@@ -128,63 +117,26 @@
 luma[7] = offset += a->delta[bytestream[1] >> 4];
 luma += 8;
 bytestream += 4;
+ buf_size -= 4;
 }
 }
 }
 
- *picture = a->picture;
 *got_frame = 1;
 
 return buf_size;
+packet_small:
+ av_log(avctx, AV_LOG_ERROR, "Input packet too small.\n");
+ return AVERROR_INVALIDDATA;
 }
 
 AVCodec ff_vcr1_decoder = {
 .name = "vcr1",
+ .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_VCR1,
 .priv_data_size = sizeof(VCR1Context),
 .init = vcr1_decode_init,
- .close = vcr1_decode_end,
 .decode = vcr1_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
-};
-
-/* Disable the encoder. */
-#undef CONFIG_VCR1_ENCODER
-#define CONFIG_VCR1_ENCODER 0
-
-#if CONFIG_VCR1_ENCODER
-
-#include "put_bits.h"
-
-static int vcr1_encode_frame(AVCodecContext *avctx, unsigned char *buf,
- int buf_size, void *data)
-{
- VCR1Context *const a = avctx->priv_data;
- AVFrame *pict = data;
- AVFrame *const p = &a->picture;
- int size;
-
- *p = *pict;
- p->pict_type = AV_PICTURE_TYPE_I;
- p->key_frame = 1;
-
- avpriv_align_put_bits(&a->pb);
- flush_put_bits(&a->pb);
-
- size = put_bits_count(&a->pb) / 32;
-
- return size * 4;
-}
-
-AVCodec ff_vcr1_encoder = {
- .name = "vcr1",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_VCR1,
- .priv_data_size = sizeof(VCR1Context),
- .init = vcr1_common_init,
- .encode = vcr1_encode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
 };
-#endif /* CONFIG_VCR1_ENCODER */

libav-v9.6.tar.bz2/libavcodec/vda.h -> libav-v10.1.tar.bz2/libavcodec/vda.h Changed

@@ -31,10 +31,6 @@
 
 #include "libavcodec/version.h"
 
-#if FF_API_VDA_ASYNC
-#include <pthread.h>
-#endif
-
 #include <stdint.h>
 
 // emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
@@ -52,39 +48,6 @@
 * @{
 */
 
-#if FF_API_VDA_ASYNC
-/**
- * This structure is used to store decoded frame information and data.
- *
- * @deprecated Use synchronous decoding mode.
- */
-typedef struct vda_frame {
- /**
- * The PTS of the frame.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- int64_t pts;
-
- /**
- * The CoreVideo buffer that contains the decoded data.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- CVPixelBufferRef cv_buffer;
-
- /**
- * A pointer to the next frame.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- struct vda_frame *next_frame;
-} vda_frame;
-#endif
-
 /**
 * This structure is used to provide the necessary configurations and data
 * to the VDA Libav HWAccel implementation.
@@ -116,28 +79,6 @@
 */
 int use_sync_decoding;
 
-#if FF_API_VDA_ASYNC
- /**
- * VDA frames queue ordered by presentation timestamp.
- *
- * @deprecated Use synchronous decoding mode.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- vda_frame *queue;
-
- /**
- * Mutex for locking queue operations.
- *
- * @deprecated Use synchronous decoding mode.
- *
- * - encoding: unused
- * - decoding: Set/Unset by libavcodec.
- */
- pthread_mutex_t queue_mutex;
-#endif
-
 /**
 * The frame width.
 *
@@ -194,22 +135,6 @@
 /** Destroy the video decoder. */
 int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
 
-#if FF_API_VDA_ASYNC
-/**
- * Return the top frame of the queue.
- *
- * @deprecated Use synchronous decoding mode.
- */
-vda_frame *ff_vda_queue_pop(struct vda_context *vda_ctx);
-
-/**
- * Release the given frame.
- *
- * @deprecated Use synchronous decoding mode.
- */
-void ff_vda_release_vda_frame(vda_frame *frame);
-#endif
-
 /**
 * @}
 */

libav-v9.6.tar.bz2/libavcodec/vda_h264.c -> libav-v10.1.tar.bz2/libavcodec/vda_h264.c Changed

@@ -28,101 +28,6 @@
 #include "h264.h"
 #include "vda.h"
 
-#if FF_API_VDA_ASYNC
-#include <CoreFoundation/CFDictionary.h>
-
-/* helper to create a dictionary according to the given pts */
-static CFDictionaryRef vda_dictionary_with_pts(int64_t i_pts)
-{
- CFStringRef key = CFSTR("FF_VDA_DECODER_PTS_KEY");
- CFNumberRef value = CFNumberCreate(kCFAllocatorDefault,
- kCFNumberSInt64Type, &i_pts);
- CFDictionaryRef user_info = CFDictionaryCreate(kCFAllocatorDefault,
- (const void **)&key,
- (const void **)&value,
- 1,
- &kCFTypeDictionaryKeyCallBacks,
- &kCFTypeDictionaryValueCallBacks);
- CFRelease(value);
- return user_info;
-}
-
-/* helper to retrieve the pts from the given dictionary */
-static int64_t vda_pts_from_dictionary(CFDictionaryRef user_info)
-{
- CFNumberRef pts;
- int64_t outValue = 0;
-
- if (!user_info)
- return 0;
-
- pts = CFDictionaryGetValue(user_info, CFSTR("FF_VDA_DECODER_PTS_KEY"));
-
- if (pts)
- CFNumberGetValue(pts, kCFNumberSInt64Type, &outValue);
-
- return outValue;
-}
-
-/* Remove and release all frames from the queue. */
-static void vda_clear_queue(struct vda_context *vda_ctx)
-{
- vda_frame *top_frame;
-
- pthread_mutex_lock(&vda_ctx->queue_mutex);
-
- while (vda_ctx->queue) {
- top_frame = vda_ctx->queue;
- vda_ctx->queue = top_frame->next_frame;
- ff_vda_release_vda_frame(top_frame);
- }
-
- pthread_mutex_unlock(&vda_ctx->queue_mutex);
-}
-
-static int vda_decoder_decode(struct vda_context *vda_ctx,
- uint8_t *bitstream,
- int bitstream_size,
- int64_t frame_pts)
-{
- OSStatus status = kVDADecoderNoErr;
- CFDictionaryRef user_info;
- CFDataRef coded_frame;
-
- coded_frame = CFDataCreate(kCFAllocatorDefault, bitstream, bitstream_size);
- user_info = vda_dictionary_with_pts(frame_pts);
- status = VDADecoderDecode(vda_ctx->decoder, 0, coded_frame, user_info);
-
- CFRelease(user_info);
- CFRelease(coded_frame);
-
- return status;
-}
-
-vda_frame *ff_vda_queue_pop(struct vda_context *vda_ctx)
-{
- vda_frame *top_frame;
-
- if (!vda_ctx->queue)
- return NULL;
-
- pthread_mutex_lock(&vda_ctx->queue_mutex);
- top_frame = vda_ctx->queue;
- vda_ctx->queue = top_frame->next_frame;
- pthread_mutex_unlock(&vda_ctx->queue_mutex);
-
- return top_frame;
-}
-
-void ff_vda_release_vda_frame(vda_frame *frame)
-{
- if (frame) {
- CVPixelBufferRelease(frame->cv_buffer);
- av_freep(&frame);
- }
-}
-#endif
-
 /* Decoder callback that adds the VDA frame to the queue in display order. */
 static void vda_decoder_callback(void *vda_hw_ctx,
 CFDictionaryRef user_info,
@@ -138,42 +43,7 @@
 if (vda_ctx->cv_pix_fmt_type != CVPixelBufferGetPixelFormatType(image_buffer))
 return;
 
- if (vda_ctx->use_sync_decoding) {
- vda_ctx->cv_buffer = CVPixelBufferRetain(image_buffer);
- } else {
- vda_frame *new_frame;
- vda_frame *queue_walker;
-
- if (!(new_frame = av_mallocz(sizeof(*new_frame))))
- return;
- new_frame->next_frame = NULL;
- new_frame->cv_buffer = CVPixelBufferRetain(image_buffer);
- new_frame->pts = vda_pts_from_dictionary(user_info);
-
- pthread_mutex_lock(&vda_ctx->queue_mutex);
-
- queue_walker = vda_ctx->queue;
-
- if (!queue_walker || new_frame->pts < queue_walker->pts) {
- /* we have an empty queue, or this frame earlier than the current queue head */
- new_frame->next_frame = queue_walker;
- vda_ctx->queue = new_frame;
- } else {
- /* walk the queue and insert this frame where it belongs in display order */
- vda_frame *next_frame;
- while (1) {
- next_frame = queue_walker->next_frame;
- if (!next_frame || new_frame->pts < next_frame->pts) {
- new_frame->next_frame = next_frame;
- queue_walker->next_frame = new_frame;
- break;
- }
- queue_walker = next_frame;
- }
- }
-
- pthread_mutex_unlock(&vda_ctx->queue_mutex);
- }
+ vda_ctx->cv_buffer = CVPixelBufferRetain(image_buffer);
 }
 
 static int vda_sync_decode(struct vda_context *vda_ctx)
@@ -197,9 +67,9 @@
 }
 
 
-static int start_frame(AVCodecContext *avctx,
- av_unused const uint8_t *buffer,
- av_unused uint32_t size)
+static int vda_h264_start_frame(AVCodecContext *avctx,
+ av_unused const uint8_t *buffer,
+ av_unused uint32_t size)
 {
 struct vda_context *vda_ctx = avctx->hwaccel_context;
 
@@ -211,9 +81,9 @@
 return 0;
 }
 
-static int decode_slice(AVCodecContext *avctx,
- const uint8_t *buffer,
- uint32_t size)
+static int vda_h264_decode_slice(AVCodecContext *avctx,
+ const uint8_t *buffer,
+ uint32_t size)
 {
 struct vda_context *vda_ctx = avctx->hwaccel_context;
 void *tmp;
@@ -237,24 +107,18 @@
 return 0;
 }
 
-static int end_frame(AVCodecContext *avctx)
+static int vda_h264_end_frame(AVCodecContext *avctx)
 {
 H264Context *h = avctx->priv_data;
 struct vda_context *vda_ctx = avctx->hwaccel_context;
- AVFrame *frame = &h->s.current_picture_ptr->f;
+ AVFrame *frame = &h->cur_pic_ptr->f;
 int status;
 
 if (!vda_ctx->decoder || !vda_ctx->priv_bitstream)
 return -1;
 
- if (vda_ctx->use_sync_decoding) {
- status = vda_sync_decode(vda_ctx);
- frame->data[3] = (void*)vda_ctx->cv_buffer;
- } else {
- status = vda_decoder_decode(vda_ctx, vda_ctx->priv_bitstream,
- vda_ctx->priv_bitstream_size,
- frame->reordered_opaque);
- }
+ status = vda_sync_decode(vda_ctx);
+ frame->data[3] = (void*)vda_ctx->cv_buffer;
 
 if (status)
 av_log(avctx, AV_LOG_ERROR, "Failed to decode frame (%d)\n", status);
@@ -276,10 +140,6 @@
 CFMutableDictionaryRef io_surface_properties;
 CFNumberRef cv_pix_fmt;
 
-#if FF_API_VDA_ASYNC
- pthread_mutex_init(&vda_ctx->queue_mutex, NULL);
-#endif
-
 /* Each VCL NAL in the bistream sent to the decoder
 * is preceded by a 4 bytes length header.
 * Change the avcC atom header if needed, to signal headers of 4 bytes. */
@@ -357,11 +217,6 @@
 if (vda_ctx->decoder)
 status = VDADecoderDestroy(vda_ctx->decoder);
 
-#if FF_API_VDA_ASYNC
- vda_clear_queue(vda_ctx);
- pthread_mutex_destroy(&vda_ctx->queue_mutex);
-#endif
-
 av_freep(&vda_ctx->priv_bitstream);
 
 return status;
@@ -372,7 +227,7 @@
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_H264,
 .pix_fmt = AV_PIX_FMT_VDA_VLD,
- .start_frame = start_frame,
- .decode_slice = decode_slice,
- .end_frame = end_frame,
+ .start_frame = vda_h264_start_frame,
+ .decode_slice = vda_h264_decode_slice,
+ .end_frame = vda_h264_end_frame,
 };

libav-v9.6.tar.bz2/libavcodec/vdpau.c -> libav-v10.1.tar.bz2/libavcodec/vdpau.c Changed

@@ -38,336 +38,104 @@
 * @{
 */
 
-void ff_vdpau_h264_set_reference_frames(MpegEncContext *s)
+int ff_vdpau_common_start_frame(Picture *pic,
+ av_unused const uint8_t *buffer,
+ av_unused uint32_t size)
 {
- H264Context *h = s->avctx->priv_data;
- struct vdpau_render_state *render, *render_ref;
- VdpReferenceFrameH264 *rf, *rf2;
- Picture *pic;
- int i, list, pic_frame_idx;
+ struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private;
 
- render = (struct vdpau_render_state *)s->current_picture_ptr->f.data[0];
- assert(render);
-
- rf = &render->info.h264.referenceFrames[0];
-#define H264_RF_COUNT FF_ARRAY_ELEMS(render->info.h264.referenceFrames)
-
- for (list = 0; list < 2; ++list) {
- Picture **lp = list ? h->long_ref : h->short_ref;
- int ls = list ? 16 : h->short_ref_count;
-
- for (i = 0; i < ls; ++i) {
- pic = lp[i];
- if (!pic || !pic->f.reference)
- continue;
- pic_frame_idx = pic->long_ref ? pic->pic_id : pic->frame_num;
-
- render_ref = (struct vdpau_render_state *)pic->f.data[0];
- assert(render_ref);
-
- rf2 = &render->info.h264.referenceFrames[0];
- while (rf2 != rf) {
- if (
- (rf2->surface == render_ref->surface)
- && (rf2->is_long_term == pic->long_ref)
- && (rf2->frame_idx == pic_frame_idx)
- )
- break;
- ++rf2;
- }
- if (rf2 != rf) {
- rf2->top_is_reference |= (pic->f.reference & PICT_TOP_FIELD) ? VDP_TRUE : VDP_FALSE;
- rf2->bottom_is_reference |= (pic->f.reference & PICT_BOTTOM_FIELD) ? VDP_TRUE : VDP_FALSE;
- continue;
- }
-
- if (rf >= &render->info.h264.referenceFrames[H264_RF_COUNT])
- continue;
-
- rf->surface = render_ref->surface;
- rf->is_long_term = pic->long_ref;
- rf->top_is_reference = (pic->f.reference & PICT_TOP_FIELD) ? VDP_TRUE : VDP_FALSE;
- rf->bottom_is_reference = (pic->f.reference & PICT_BOTTOM_FIELD) ? VDP_TRUE : VDP_FALSE;
- rf->field_order_cnt[0] = pic->field_poc[0];
- rf->field_order_cnt[1] = pic->field_poc[1];
- rf->frame_idx = pic_frame_idx;
-
- ++rf;
- }
- }
-
- for (; rf < &render->info.h264.referenceFrames[H264_RF_COUNT]; ++rf) {
- rf->surface = VDP_INVALID_HANDLE;
- rf->is_long_term = 0;
- rf->top_is_reference = 0;
- rf->bottom_is_reference = 0;
- rf->field_order_cnt[0] = 0;
- rf->field_order_cnt[1] = 0;
- rf->frame_idx = 0;
- }
+ pic_ctx->bitstream_buffers_allocated = 0;
+ pic_ctx->bitstream_buffers_used = 0;
+ pic_ctx->bitstream_buffers = NULL;
+ return 0;
 }
 
-void ff_vdpau_add_data_chunk(MpegEncContext *s,
- const uint8_t *buf, int buf_size)
+#if CONFIG_H263_VDPAU_HWACCEL || CONFIG_MPEG1_VDPAU_HWACCEL || \
+ CONFIG_MPEG2_VDPAU_HWACCEL || CONFIG_MPEG4_VDPAU_HWACCEL || \
+ CONFIG_VC1_VDPAU_HWACCEL || CONFIG_WMV3_VDPAU_HWACCEL
+int ff_vdpau_mpeg_end_frame(AVCodecContext *avctx)
 {
- struct vdpau_render_state *render;
+ AVVDPAUContext *hwctx = avctx->hwaccel_context;
+ MpegEncContext *s = avctx->priv_data;
+ Picture *pic = s->current_picture_ptr;
+ struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private;
+ VdpVideoSurface surf = ff_vdpau_get_surface_id(pic);
 
- render = (struct vdpau_render_state *)s->current_picture_ptr->f.data[0];
- assert(render);
+ hwctx->render(hwctx->decoder, surf, (void *)&pic_ctx->info,
+ pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers);
 
- render->bitstream_buffers= av_fast_realloc(
- render->bitstream_buffers,
- &render->bitstream_buffers_allocated,
- sizeof(*render->bitstream_buffers)*(render->bitstream_buffers_used + 1)
- );
+ ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
+ av_freep(&pic_ctx->bitstream_buffers);
 
- render->bitstream_buffers[render->bitstream_buffers_used].struct_version = VDP_BITSTREAM_BUFFER_VERSION;
- render->bitstream_buffers[render->bitstream_buffers_used].bitstream = buf;
- render->bitstream_buffers[render->bitstream_buffers_used].bitstream_bytes = buf_size;
- render->bitstream_buffers_used++;
+ return 0;
 }
+#endif
 
-void ff_vdpau_h264_picture_start(MpegEncContext *s)
+int ff_vdpau_add_buffer(Picture *pic, const uint8_t *buf, uint32_t size)
 {
- H264Context *h = s->avctx->priv_data;
- struct vdpau_render_state *render;
- int i;
-
- render = (struct vdpau_render_state *)s->current_picture_ptr->f.data[0];
- assert(render);
-
- for (i = 0; i < 2; ++i) {
- int foc = s->current_picture_ptr->field_poc[i];
- if (foc == INT_MAX)
- foc = 0;
- render->info.h264.field_order_cnt[i] = foc;
- }
-
- render->info.h264.frame_num = h->frame_num;
-}
-
-void ff_vdpau_h264_picture_complete(MpegEncContext *s)
-{
- H264Context *h = s->avctx->priv_data;
- struct vdpau_render_state *render;
-
- render = (struct vdpau_render_state *)s->current_picture_ptr->f.data[0];
- assert(render);
-
- render->info.h264.slice_count = h->slice_num;
- if (render->info.h264.slice_count < 1)
- return;
-
- render->info.h264.is_reference = (s->current_picture_ptr->f.reference & 3) ? VDP_TRUE : VDP_FALSE;
- render->info.h264.field_pic_flag = s->picture_structure != PICT_FRAME;
- render->info.h264.bottom_field_flag = s->picture_structure == PICT_BOTTOM_FIELD;
- render->info.h264.num_ref_frames = h->sps.ref_frame_count;
- render->info.h264.mb_adaptive_frame_field_flag = h->sps.mb_aff && !render->info.h264.field_pic_flag;
- render->info.h264.constrained_intra_pred_flag = h->pps.constrained_intra_pred;
- render->info.h264.weighted_pred_flag = h->pps.weighted_pred;
- render->info.h264.weighted_bipred_idc = h->pps.weighted_bipred_idc;
- render->info.h264.frame_mbs_only_flag = h->sps.frame_mbs_only_flag;
- render->info.h264.transform_8x8_mode_flag = h->pps.transform_8x8_mode;
- render->info.h264.chroma_qp_index_offset = h->pps.chroma_qp_index_offset[0];
- render->info.h264.second_chroma_qp_index_offset = h->pps.chroma_qp_index_offset[1];
- render->info.h264.pic_init_qp_minus26 = h->pps.init_qp - 26;
- render->info.h264.num_ref_idx_l0_active_minus1 = h->pps.ref_count[0] - 1;
- render->info.h264.num_ref_idx_l1_active_minus1 = h->pps.ref_count[1] - 1;
- render->info.h264.log2_max_frame_num_minus4 = h->sps.log2_max_frame_num - 4;
- render->info.h264.pic_order_cnt_type = h->sps.poc_type;
- render->info.h264.log2_max_pic_order_cnt_lsb_minus4 = h->sps.poc_type ? 0 : h->sps.log2_max_poc_lsb - 4;
- render->info.h264.delta_pic_order_always_zero_flag = h->sps.delta_pic_order_always_zero_flag;
- render->info.h264.direct_8x8_inference_flag = h->sps.direct_8x8_inference_flag;
- render->info.h264.entropy_coding_mode_flag = h->pps.cabac;
- render->info.h264.pic_order_present_flag = h->pps.pic_order_present;
- render->info.h264.deblocking_filter_control_present_flag = h->pps.deblocking_filter_parameters_present;
- render->info.h264.redundant_pic_cnt_present_flag = h->pps.redundant_pic_cnt_present;
- memcpy(render->info.h264.scaling_lists_4x4, h->pps.scaling_matrix4, sizeof(render->info.h264.scaling_lists_4x4));
- memcpy(render->info.h264.scaling_lists_8x8[0], h->pps.scaling_matrix8[0], sizeof(render->info.h264.scaling_lists_8x8[0]));
- memcpy(render->info.h264.scaling_lists_8x8[1], h->pps.scaling_matrix8[3], sizeof(render->info.h264.scaling_lists_8x8[0]));
-
- ff_draw_horiz_band(s, 0, s->avctx->height);
- render->bitstream_buffers_used = 0;
-}
-
-void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf,
- int buf_size, int slice_count)
-{
- struct vdpau_render_state *render, *last, *next;
- int i;
-
- if (!s->current_picture_ptr) return;
+ struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private;
+ VdpBitstreamBuffer *buffers = pic_ctx->bitstream_buffers;
 
- render = (struct vdpau_render_state *)s->current_picture_ptr->f.data[0];
- assert(render);
+ buffers = av_fast_realloc(buffers, &pic_ctx->bitstream_buffers_allocated,
+ (pic_ctx->bitstream_buffers_used + 1) * sizeof(*buffers));
+ if (!buffers)
+ return AVERROR(ENOMEM);
 
- /* fill VdpPictureInfoMPEG1Or2 struct */
- render->info.mpeg.picture_structure = s->picture_structure;
- render->info.mpeg.picture_coding_type = s->pict_type;
- render->info.mpeg.intra_dc_precision = s->intra_dc_precision;
- render->info.mpeg.frame_pred_frame_dct = s->frame_pred_frame_dct;
- render->info.mpeg.concealment_motion_vectors = s->concealment_motion_vectors;
- render->info.mpeg.intra_vlc_format = s->intra_vlc_format;
- render->info.mpeg.alternate_scan = s->alternate_scan;
- render->info.mpeg.q_scale_type = s->q_scale_type;
- render->info.mpeg.top_field_first = s->top_field_first;
- render->info.mpeg.full_pel_forward_vector = s->full_pel[0]; // MPEG-1 only. Set 0 for MPEG-2
- render->info.mpeg.full_pel_backward_vector = s->full_pel[1]; // MPEG-1 only. Set 0 for MPEG-2
- render->info.mpeg.f_code[0][0] = s->mpeg_f_code[0][0]; // For MPEG-1 fill both horiz. & vert.
- render->info.mpeg.f_code[0][1] = s->mpeg_f_code[0][1];
- render->info.mpeg.f_code[1][0] = s->mpeg_f_code[1][0];
- render->info.mpeg.f_code[1][1] = s->mpeg_f_code[1][1];
- for (i = 0; i < 64; ++i) {
- render->info.mpeg.intra_quantizer_matrix[i] = s->intra_matrix[i];
- render->info.mpeg.non_intra_quantizer_matrix[i] = s->inter_matrix[i];
- }
-
- render->info.mpeg.forward_reference = VDP_INVALID_HANDLE;
- render->info.mpeg.backward_reference = VDP_INVALID_HANDLE;
-
- switch(s->pict_type){
- case AV_PICTURE_TYPE_B:
- next = (struct vdpau_render_state *)s->next_picture.f.data[0];
- assert(next);
- render->info.mpeg.backward_reference = next->surface;
- // no return here, going to set forward prediction
- case AV_PICTURE_TYPE_P:
- last = (struct vdpau_render_state *)s->last_picture.f.data[0];
- if (!last) // FIXME: Does this test make sense?
- last = render; // predict second field from the first
- render->info.mpeg.forward_reference = last->surface;
- }
+ pic_ctx->bitstream_buffers = buffers;
+ buffers += pic_ctx->bitstream_buffers_used++;
 
- ff_vdpau_add_data_chunk(s, buf, buf_size);
-
- render->info.mpeg.slice_count = slice_count;
-
- if (slice_count)
- ff_draw_horiz_band(s, 0, s->avctx->height);
- render->bitstream_buffers_used = 0;
+ buffers->struct_version = VDP_BITSTREAM_BUFFER_VERSION;
+ buffers->bitstream = buf;
+ buffers->bitstream_bytes = size;
+ return 0;
 }
 
-void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf,
- int buf_size)
+int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile)
 {
- VC1Context *v = s->avctx->priv_data;
- struct vdpau_render_state *render, *last, *next;
-
- render = (struct vdpau_render_state *)s->current_picture.f.data[0];
- assert(render);
-
- /* fill LvPictureInfoVC1 struct */
- render->info.vc1.frame_coding_mode = v->fcm;
- render->info.vc1.postprocflag = v->postprocflag;
- render->info.vc1.pulldown = v->broadcast;
- render->info.vc1.interlace = v->interlace;
- render->info.vc1.tfcntrflag = v->tfcntrflag;
- render->info.vc1.finterpflag = v->finterpflag;
- render->info.vc1.psf = v->psf;
- render->info.vc1.dquant = v->dquant;
- render->info.vc1.panscan_flag = v->panscanflag;
- render->info.vc1.refdist_flag = v->refdist_flag;
- render->info.vc1.quantizer = v->quantizer_mode;
- render->info.vc1.extended_mv = v->extended_mv;
- render->info.vc1.extended_dmv = v->extended_dmv;
- render->info.vc1.overlap = v->overlap;
- render->info.vc1.vstransform = v->vstransform;
- render->info.vc1.loopfilter = v->s.loop_filter;
- render->info.vc1.fastuvmc = v->fastuvmc;
- render->info.vc1.range_mapy_flag = v->range_mapy_flag;
- render->info.vc1.range_mapy = v->range_mapy;
- render->info.vc1.range_mapuv_flag = v->range_mapuv_flag;
- 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.rangered = v->rangered | (v->rangeredfrm << 1);
- render->info.vc1.maxbframes = v->s.max_b_frames;
-
- render->info.vc1.deblockEnable = v->postprocflag & 1;
- render->info.vc1.pquant = v->pq;
-
- render->info.vc1.forward_reference = VDP_INVALID_HANDLE;
- render->info.vc1.backward_reference = VDP_INVALID_HANDLE;
-
- if (v->bi_type)
- render->info.vc1.picture_type = 4;
- else
- render->info.vc1.picture_type = s->pict_type - 1 + s->pict_type / 3;
-
- switch(s->pict_type){
- case AV_PICTURE_TYPE_B:
- next = (struct vdpau_render_state *)s->next_picture.f.data[0];
- assert(next);
- render->info.vc1.backward_reference = next->surface;
- // no break here, going to set forward prediction
- case AV_PICTURE_TYPE_P:
- last = (struct vdpau_render_state *)s->last_picture.f.data[0];
- if (!last) // FIXME: Does this test make sense?
- last = render; // predict second field from the first
- render->info.vc1.forward_reference = last->surface;
+#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);
+ }
 }
-
- ff_vdpau_add_data_chunk(s, buf, buf_size);
-
- render->info.vc1.slice_count = 1;
-
- ff_draw_horiz_band(s, 0, s->avctx->height);
- render->bitstream_buffers_used = 0;
+ return AVERROR(EINVAL);
 }
 
-void ff_vdpau_mpeg4_decode_picture(MpegEncContext *s, const uint8_t *buf,
- int buf_size)
+AVVDPAUContext *av_vdpau_alloc_context(void)
 {
- struct vdpau_render_state *render, *last, *next;
- int i;
-
- if (!s->current_picture_ptr) return;
-
- render = (struct vdpau_render_state *)s->current_picture_ptr->f.data[0];
- assert(render);
-
- /* fill VdpPictureInfoMPEG4Part2 struct */
- render->info.mpeg4.trd[0] = s->pp_time;
- render->info.mpeg4.trb[0] = s->pb_time;
- render->info.mpeg4.trd[1] = s->pp_field_time >> 1;
- render->info.mpeg4.trb[1] = s->pb_field_time >> 1;
- render->info.mpeg4.vop_time_increment_resolution = s->avctx->time_base.den;
- 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.interlaced = !s->progressive_sequence;
- render->info.mpeg4.quant_type = s->mpeg_quant;
- render->info.mpeg4.quarter_sample = s->quarter_sample;
- render->info.mpeg4.short_video_header = s->avctx->codec->id == AV_CODEC_ID_H263;
- render->info.mpeg4.rounding_control = s->no_rounding;
- render->info.mpeg4.alternate_vertical_scan_flag = s->alternate_scan;
- render->info.mpeg4.top_field_first = s->top_field_first;
- for (i = 0; i < 64; ++i) {
- render->info.mpeg4.intra_quantizer_matrix[i] = s->intra_matrix[i];
- render->info.mpeg4.non_intra_quantizer_matrix[i] = s->inter_matrix[i];
- }
- render->info.mpeg4.forward_reference = VDP_INVALID_HANDLE;
- render->info.mpeg4.backward_reference = VDP_INVALID_HANDLE;
-
- switch (s->pict_type) {
- case AV_PICTURE_TYPE_B:
- next = (struct vdpau_render_state *)s->next_picture.f.data[0];
- assert(next);
- render->info.mpeg4.backward_reference = next->surface;
- render->info.mpeg4.vop_coding_type = 2;
- // no break here, going to set forward prediction
- case AV_PICTURE_TYPE_P:
- last = (struct vdpau_render_state *)s->last_picture.f.data[0];
- assert(last);
- render->info.mpeg4.forward_reference = last->surface;
- }
-
- ff_vdpau_add_data_chunk(s, buf, buf_size);
-
- ff_draw_horiz_band(s, 0, s->avctx->height);
- render->bitstream_buffers_used = 0;
+ return av_mallocz(sizeof(AVVDPAUContext));
 }
 
 /* @}*/

libav-v9.6.tar.bz2/libavcodec/vdpau.h -> libav-v10.1.tar.bz2/libavcodec/vdpau.h Changed

@@ -52,6 +52,105 @@
 #include <vdpau/vdpau.h>
 #include <vdpau/vdpau_x11.h>
 
+#include "libavutil/attributes.h"
+
+#include "avcodec.h"
+#include "version.h"
+
+#if FF_API_BUFS_VDPAU
+union AVVDPAUPictureInfo {
+ VdpPictureInfoH264 h264;
+ VdpPictureInfoMPEG1Or2 mpeg;
+ VdpPictureInfoVC1 vc1;
+ VdpPictureInfoMPEG4Part2 mpeg4;
+};
+#endif
+
+/**
+ * This structure is used to share data between the libavcodec library and
+ * the client video application.
+ * The user shall zero-allocate the structure and make it available as
+ * AVCodecContext.hwaccel_context. Members can be set by the user once
+ * 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 {
+ /**
+ * VDPAU decoder handle
+ *
+ * Set by user.
+ */
+ VdpDecoder decoder;
+
+ /**
+ * VDPAU decoder render callback
+ *
+ * Set by the user.
+ */
+ VdpDecoderRender *render;
+
+#if FF_API_BUFS_VDPAU
+ /**
+ * VDPAU picture information
+ *
+ * Set by libavcodec.
+ */
+ attribute_deprecated
+ union AVVDPAUPictureInfo info;
+
+ /**
+ * Allocated size of the bitstream_buffers table.
+ *
+ * Set by libavcodec.
+ */
+ attribute_deprecated
+ int bitstream_buffers_allocated;
+
+ /**
+ * Useful bitstream buffers in the bitstream buffers table.
+ *
+ * Set by libavcodec.
+ */
+ attribute_deprecated
+ int bitstream_buffers_used;
+
+ /**
+ * Table of bitstream buffers.
+ * The user is responsible for freeing this buffer using av_freep().
+ *
+ * Set by libavcodec.
+ */
+ attribute_deprecated
+ VdpBitstreamBuffer *bitstream_buffers;
+#endif
+} AVVDPAUContext;
+
+/**
+ * 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
 
@@ -74,12 +173,7 @@
 int state; ///< Holds FF_VDPAU_STATE_* values.
 
 /** picture parameter information for all supported codecs */
- union VdpPictureInfo {
- VdpPictureInfoH264 h264;
- VdpPictureInfoMPEG1Or2 mpeg;
- VdpPictureInfoVC1 vc1;
- VdpPictureInfoMPEG4Part2 mpeg4;
- } info;
+ union AVVDPAUPictureInfo info;
 
 /** Describe size/location of the compressed video data.
 Set to 0 when freeing bitstream_buffers. */
@@ -88,6 +182,7 @@
 /** The user is responsible for freeing this buffer using av_freep(). */
 VdpBitstreamBuffer *bitstream_buffers;
 };
+#endif
 
 /* @}*/

libav-v10.1.tar.bz2/libavcodec/vdpau_h264.c Added

@@ -0,0 +1,215 @@
+/*
+ * MPEG-4 Part 10 / AVC / H.264 HW decode acceleration through VDPAU
+ *
+ * Copyright (c) 2008 NVIDIA
+ * Copyright (c) 2013 Rémi Denis-Courmont
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <vdpau/vdpau.h>
+
+#include "avcodec.h"
+#include "h264.h"
+#include "vdpau.h"
+#include "vdpau_internal.h"
+
+static int32_t h264_foc(int foc)
+{
+ if (foc == INT_MAX)
+ foc = 0;
+ return foc;
+}
+
+static void vdpau_h264_clear_rf(VdpReferenceFrameH264 *rf)
+{
+ rf->surface = VDP_INVALID_HANDLE;
+ rf->is_long_term = VDP_FALSE;
+ rf->top_is_reference = VDP_FALSE;
+ rf->bottom_is_reference = VDP_FALSE;
+ rf->field_order_cnt[0] = 0;
+ rf->field_order_cnt[1] = 0;
+ rf->frame_idx = 0;
+}
+
+static void vdpau_h264_set_rf(VdpReferenceFrameH264 *rf, Picture *pic,
+ int pic_structure)
+{
+ VdpVideoSurface surface = ff_vdpau_get_surface_id(pic);
+
+ if (pic_structure == 0)
+ pic_structure = pic->reference;
+
+ rf->surface = surface;
+ rf->is_long_term = pic->reference && pic->long_ref;
+ rf->top_is_reference = (pic_structure & PICT_TOP_FIELD) != 0;
+ rf->bottom_is_reference = (pic_structure & PICT_BOTTOM_FIELD) != 0;
+ rf->field_order_cnt[0] = h264_foc(pic->field_poc[0]);
+ rf->field_order_cnt[1] = h264_foc(pic->field_poc[1]);
+ rf->frame_idx = pic->long_ref ? pic->pic_id : pic->frame_num;
+}
+
+static void vdpau_h264_set_reference_frames(AVCodecContext *avctx)
+{
+ H264Context * const h = avctx->priv_data;
+ struct vdpau_picture_context *pic_ctx = h->cur_pic_ptr->hwaccel_picture_private;
+ VdpPictureInfoH264 *info = &pic_ctx->info.h264;
+ int list;
+
+ VdpReferenceFrameH264 *rf = &info->referenceFrames[0];
+#define H264_RF_COUNT FF_ARRAY_ELEMS(info->referenceFrames)
+
+ for (list = 0; list < 2; ++list) {
+ Picture **lp = list ? h->long_ref : h->short_ref;
+ int i, ls = list ? 16 : h->short_ref_count;
+
+ for (i = 0; i < ls; ++i) {
+ Picture *pic = lp[i];
+ VdpReferenceFrameH264 *rf2;
+ VdpVideoSurface surface_ref;
+ int pic_frame_idx;
+
+ if (!pic || !pic->reference)
+ continue;
+ pic_frame_idx = pic->long_ref ? pic->pic_id : pic->frame_num;
+ surface_ref = ff_vdpau_get_surface_id(pic);
+
+ rf2 = &info->referenceFrames[0];
+ while (rf2 != rf) {
+ if ((rf2->surface == surface_ref) &&
+ (rf2->is_long_term == pic->long_ref) &&
+ (rf2->frame_idx == pic_frame_idx))
+ break;
+ ++rf2;
+ }
+ if (rf2 != rf) {
+ rf2->top_is_reference |= (pic->reference & PICT_TOP_FIELD) ? VDP_TRUE : VDP_FALSE;
+ rf2->bottom_is_reference |= (pic->reference & PICT_BOTTOM_FIELD) ? VDP_TRUE : VDP_FALSE;
+ continue;
+ }
+
+ if (rf >= &info->referenceFrames[H264_RF_COUNT])
+ continue;
+
+ vdpau_h264_set_rf(rf, pic, pic->reference);
+ ++rf;
+ }
+ }
+
+ for (; rf < &info->referenceFrames[H264_RF_COUNT]; ++rf)
+ vdpau_h264_clear_rf(rf);
+}
+
+static int vdpau_h264_start_frame(AVCodecContext *avctx,
+ const uint8_t *buffer, uint32_t size)
+{
+ H264Context * const h = avctx->priv_data;
+ Picture *pic = h->cur_pic_ptr;
+ struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private;
+ VdpPictureInfoH264 *info = &pic_ctx->info.h264;
+
+ /* init VdpPictureInfoH264 */
+ info->slice_count = 0;
+ info->field_order_cnt[0] = h264_foc(pic->field_poc[0]);
+ info->field_order_cnt[1] = h264_foc(pic->field_poc[1]);
+ info->is_reference = h->nal_ref_idc != 0;
+ info->frame_num = h->frame_num;
+ info->field_pic_flag = h->picture_structure != PICT_FRAME;
+ info->bottom_field_flag = h->picture_structure == PICT_BOTTOM_FIELD;
+ info->num_ref_frames = h->sps.ref_frame_count;
+ info->mb_adaptive_frame_field_flag = h->sps.mb_aff && !info->field_pic_flag;
+ info->constrained_intra_pred_flag = h->pps.constrained_intra_pred;
+ info->weighted_pred_flag = h->pps.weighted_pred;
+ info->weighted_bipred_idc = h->pps.weighted_bipred_idc;
+ info->frame_mbs_only_flag = h->sps.frame_mbs_only_flag;
+ info->transform_8x8_mode_flag = h->pps.transform_8x8_mode;
+ info->chroma_qp_index_offset = h->pps.chroma_qp_index_offset[0];
+ info->second_chroma_qp_index_offset = h->pps.chroma_qp_index_offset[1];
+ info->pic_init_qp_minus26 = h->pps.init_qp - 26;
+ info->num_ref_idx_l0_active_minus1 = h->pps.ref_count[0] - 1;
+ info->num_ref_idx_l1_active_minus1 = h->pps.ref_count[1] - 1;
+ info->log2_max_frame_num_minus4 = h->sps.log2_max_frame_num - 4;
+ info->pic_order_cnt_type = h->sps.poc_type;
+ info->log2_max_pic_order_cnt_lsb_minus4 = h->sps.poc_type ? 0 : h->sps.log2_max_poc_lsb - 4;
+ info->delta_pic_order_always_zero_flag = h->sps.delta_pic_order_always_zero_flag;
+ info->direct_8x8_inference_flag = h->sps.direct_8x8_inference_flag;
+ info->entropy_coding_mode_flag = h->pps.cabac;
+ info->pic_order_present_flag = h->pps.pic_order_present;
+ info->deblocking_filter_control_present_flag = h->pps.deblocking_filter_parameters_present;
+ info->redundant_pic_cnt_present_flag = h->pps.redundant_pic_cnt_present;
+
+ memcpy(info->scaling_lists_4x4, h->pps.scaling_matrix4,
+ sizeof(info->scaling_lists_4x4));
+ memcpy(info->scaling_lists_8x8[0], h->pps.scaling_matrix8[0],
+ sizeof(info->scaling_lists_8x8[0]));
+ memcpy(info->scaling_lists_8x8[1], h->pps.scaling_matrix8[3],
+ sizeof(info->scaling_lists_8x8[1]));
+
+ vdpau_h264_set_reference_frames(avctx);
+
+ return ff_vdpau_common_start_frame(pic, buffer, size);
+}
+
+static const uint8_t start_code_prefix[3] = { 0x00, 0x00, 0x01 };
+
+static int vdpau_h264_decode_slice(AVCodecContext *avctx,
+ const uint8_t *buffer, uint32_t size)
+{
+ H264Context *h = avctx->priv_data;
+ Picture *pic = h->cur_pic_ptr;
+ struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private;
+ int val;
+
+ val = ff_vdpau_add_buffer(pic, start_code_prefix, 3);
+ if (val)
+ return val;
+
+ val = ff_vdpau_add_buffer(pic, buffer, size);
+ if (val)
+ return val;
+
+ pic_ctx->info.h264.slice_count++;
+ return 0;
+}
+
+static int vdpau_h264_end_frame(AVCodecContext *avctx)
+{
+ AVVDPAUContext *hwctx = avctx->hwaccel_context;
+ H264Context *h = avctx->priv_data;
+ Picture *pic = h->cur_pic_ptr;
+ struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private;
+ VdpVideoSurface surf = ff_vdpau_get_surface_id(pic);
+
+ hwctx->render(hwctx->decoder, surf, (void *)&pic_ctx->info,
+ pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers);
+
+ ff_h264_draw_horiz_band(h, 0, h->avctx->height);
+ av_freep(&pic_ctx->bitstream_buffers);
+
+ return 0;
+}
+
+AVHWAccel ff_h264_vdpau_hwaccel = {
+ .name = "h264_vdpau",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_H264,
+ .pix_fmt = AV_PIX_FMT_VDPAU,
+ .start_frame = vdpau_h264_start_frame,
+ .end_frame = vdpau_h264_end_frame,
+ .decode_slice = vdpau_h264_decode_slice,
+ .priv_data_size = sizeof(struct vdpau_picture_context),
+};

libav-v9.6.tar.bz2/libavcodec/vdpau_internal.h -> libav-v10.1.tar.bz2/libavcodec/vdpau_internal.h Changed

@@ -25,22 +25,54 @@
 #define AVCODEC_VDPAU_INTERNAL_H
 
 #include <stdint.h>
+#include <vdpau/vdpau.h>
+
+#include "avcodec.h"
 #include "mpegvideo.h"
+#include "version.h"
+
+/** Extract VdpVideoSurface from a Picture */
+static inline uintptr_t ff_vdpau_get_surface_id(Picture *pic)
+{
+ return (uintptr_t)pic->f.data[3];
+}
+
+#if !FF_API_BUFS_VDPAU
+union AVVDPAUPictureInfo {
+ VdpPictureInfoH264 h264;
+ VdpPictureInfoMPEG1Or2 mpeg;
+ VdpPictureInfoVC1 vc1;
+ VdpPictureInfoMPEG4Part2 mpeg4;
+};
+#else
+#include "vdpau.h"
+#endif
 
-void ff_vdpau_add_data_chunk(MpegEncContext *s, const uint8_t *buf,
- int buf_size);
+struct vdpau_picture_context {
+ /**
+ * VDPAU picture information.
+ */
+ union AVVDPAUPictureInfo info;
 
-void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf,
- int buf_size, int slice_count);
+ /**
+ * Allocated size of the bitstream_buffers table.
+ */
+ int bitstream_buffers_allocated;
 
-void ff_vdpau_h264_picture_start(MpegEncContext *s);
-void ff_vdpau_h264_set_reference_frames(MpegEncContext *s);
-void ff_vdpau_h264_picture_complete(MpegEncContext *s);
+ /**
+ * Useful bitstream buffers in the bitstream buffers table.
+ */
+ int bitstream_buffers_used;
 
-void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf,
- int buf_size);
+ /**
+ * Table of bitstream buffers.
+ */
+ VdpBitstreamBuffer *bitstream_buffers;
+};
 
-void ff_vdpau_mpeg4_decode_picture(MpegEncContext *s, const uint8_t *buf,
- int buf_size);
+int ff_vdpau_common_start_frame(Picture *pic,
+ const uint8_t *buffer, uint32_t size);
+int ff_vdpau_mpeg_end_frame(AVCodecContext *avctx);
+int ff_vdpau_add_buffer(Picture *pic, const uint8_t *buf, uint32_t buf_size);
 
 #endif /* AVCODEC_VDPAU_INTERNAL_H */

libav-v10.1.tar.bz2/libavcodec/vdpau_mpeg12.c Added

@@ -0,0 +1,121 @@
+/*
+ * MPEG-1/2 HW decode acceleration through VDPAU
+ *
+ * Copyright (c) 2008 NVIDIA
+ * Copyright (c) 2013 Rémi Denis-Courmont
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <vdpau/vdpau.h>
+
+#include "avcodec.h"
+#include "vdpau.h"
+#include "vdpau_internal.h"
+
+static int vdpau_mpeg_start_frame(AVCodecContext *avctx,
+ const uint8_t *buffer, uint32_t size)
+{
+ MpegEncContext * const s = avctx->priv_data;
+ Picture *pic = s->current_picture_ptr;
+ struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private;
+ VdpPictureInfoMPEG1Or2 *info = &pic_ctx->info.mpeg;
+ VdpVideoSurface ref;
+ int i;
+
+ /* fill VdpPictureInfoMPEG1Or2 struct */
+ info->forward_reference = VDP_INVALID_HANDLE;
+ info->backward_reference = VDP_INVALID_HANDLE;
+
+ switch (s->pict_type) {
+ case AV_PICTURE_TYPE_B:
+ ref = ff_vdpau_get_surface_id(&s->next_picture);
+ assert(ref != VDP_INVALID_HANDLE);
+ info->backward_reference = ref;
+ /* fall through to forward prediction */
+ case AV_PICTURE_TYPE_P:
+ ref = ff_vdpau_get_surface_id(&s->last_picture);
+ info->forward_reference = ref;
+ }
+
+ info->slice_count = 0;
+ info->picture_structure = s->picture_structure;
+ info->picture_coding_type = s->pict_type;
+ info->intra_dc_precision = s->intra_dc_precision;
+ info->frame_pred_frame_dct = s->frame_pred_frame_dct;
+ info->concealment_motion_vectors = s->concealment_motion_vectors;
+ info->intra_vlc_format = s->intra_vlc_format;
+ info->alternate_scan = s->alternate_scan;
+ info->q_scale_type = s->q_scale_type;
+ info->top_field_first = s->top_field_first;
+ // Both for MPEG-1 only, zero for MPEG-2:
+ info->full_pel_forward_vector = s->full_pel[0];
+ info->full_pel_backward_vector = s->full_pel[1];
+ // For MPEG-1 fill both horizontal & vertical:
+ info->f_code[0][0] = s->mpeg_f_code[0][0];
+ info->f_code[0][1] = s->mpeg_f_code[0][1];
+ info->f_code[1][0] = s->mpeg_f_code[1][0];
+ info->f_code[1][1] = s->mpeg_f_code[1][1];
+ for (i = 0; i < 64; ++i) {
+ info->intra_quantizer_matrix[i] = s->intra_matrix[i];
+ info->non_intra_quantizer_matrix[i] = s->inter_matrix[i];
+ }
+
+ return ff_vdpau_common_start_frame(pic, buffer, size);
+}
+
+static int vdpau_mpeg_decode_slice(AVCodecContext *avctx,
+ const uint8_t *buffer, uint32_t size)
+{
+ MpegEncContext * const s = avctx->priv_data;
+ Picture *pic = s->current_picture_ptr;
+ struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private;
+ int val;
+
+ val = ff_vdpau_add_buffer(pic, buffer, size);
+ if (val < 0)
+ return val;
+
+ pic_ctx->info.mpeg.slice_count++;
+ return 0;
+}
+
+#if CONFIG_MPEG1_VDPAU_HWACCEL
+AVHWAccel ff_mpeg1_vdpau_hwaccel = {
+ .name = "mpeg1_vdpau",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_MPEG1VIDEO,
+ .pix_fmt = AV_PIX_FMT_VDPAU,
+ .start_frame = vdpau_mpeg_start_frame,
+ .end_frame = ff_vdpau_mpeg_end_frame,
+ .decode_slice = vdpau_mpeg_decode_slice,
+ .priv_data_size = sizeof(struct vdpau_picture_context),
+};
+#endif
+
+#if CONFIG_MPEG2_VDPAU_HWACCEL
+AVHWAccel ff_mpeg2_vdpau_hwaccel = {
+ .name = "mpeg2_vdpau",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_MPEG2VIDEO,
+ .pix_fmt = AV_PIX_FMT_VDPAU,
+ .start_frame = vdpau_mpeg_start_frame,
+ .end_frame = ff_vdpau_mpeg_end_frame,
+ .decode_slice = vdpau_mpeg_decode_slice,
+ .priv_data_size = sizeof(struct vdpau_picture_context),
+};
+#endif

libav-v10.1.tar.bz2/libavcodec/vdpau_mpeg4.c Added

@@ -0,0 +1,115 @@
+/*
+ * MPEG-4 Part 2 / H.263 decode acceleration through VDPAU
+ *
+ * Copyright (c) 2008 NVIDIA
+ * Copyright (c) 2013 Rémi Denis-Courmont
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#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)
+{
+ 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;
+ VdpVideoSurface ref;
+ int i;
+
+ /* fill VdpPictureInfoMPEG4Part2 struct */
+ info->forward_reference = VDP_INVALID_HANDLE;
+ info->backward_reference = VDP_INVALID_HANDLE;
+ info->vop_coding_type = 0;
+
+ switch (s->pict_type) {
+ case AV_PICTURE_TYPE_B:
+ ref = ff_vdpau_get_surface_id(&s->next_picture);
+ assert(ref != VDP_INVALID_HANDLE);
+ info->backward_reference = ref;
+ info->vop_coding_type = 2;
+ /* fall-through */
+ case AV_PICTURE_TYPE_P:
+ ref = ff_vdpau_get_surface_id(&s->last_picture);
+ assert(ref != VDP_INVALID_HANDLE);
+ info->forward_reference = ref;
+ }
+
+ info->trd[0] = s->pp_time;
+ info->trb[0] = s->pb_time;
+ info->trd[1] = s->pp_field_time >> 1;
+ info->trb[1] = s->pb_field_time >> 1;
+ 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 = !ctx->resync_marker;
+ info->interlaced = !s->progressive_sequence;
+ info->quant_type = s->mpeg_quant;
+ info->quarter_sample = s->quarter_sample;
+ info->short_video_header = avctx->codec->id == AV_CODEC_ID_H263;
+ info->rounding_control = s->no_rounding;
+ info->alternate_vertical_scan_flag = s->alternate_scan;
+ info->top_field_first = s->top_field_first;
+ for (i = 0; i < 64; ++i) {
+ info->intra_quantizer_matrix[i] = s->intra_matrix[i];
+ info->non_intra_quantizer_matrix[i] = s->inter_matrix[i];
+ }
+
+ ff_vdpau_common_start_frame(pic, buffer, size);
+ return ff_vdpau_add_buffer(pic, buffer, size);
+}
+
+static int vdpau_mpeg4_decode_slice(av_unused AVCodecContext *avctx,
+ av_unused const uint8_t *buffer,
+ av_unused uint32_t size)
+{
+ return 0;
+}
+
+#if CONFIG_H263_VDPAU_HWACCEL
+AVHWAccel ff_h263_vdpau_hwaccel = {
+ .name = "h263_vdpau",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_H263,
+ .pix_fmt = AV_PIX_FMT_VDPAU,
+ .start_frame = vdpau_mpeg4_start_frame,
+ .end_frame = ff_vdpau_mpeg_end_frame,
+ .decode_slice = vdpau_mpeg4_decode_slice,
+ .priv_data_size = sizeof(struct vdpau_picture_context),
+};
+#endif
+
+#if CONFIG_MPEG4_VDPAU_HWACCEL
+AVHWAccel ff_mpeg4_vdpau_hwaccel = {
+ .name = "mpeg4_vdpau",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_MPEG4,
+ .pix_fmt = AV_PIX_FMT_VDPAU,
+ .start_frame = vdpau_mpeg4_start_frame,
+ .end_frame = ff_vdpau_mpeg_end_frame,
+ .decode_slice = vdpau_mpeg4_decode_slice,
+ .priv_data_size = sizeof(struct vdpau_picture_context),
+};
+#endif

libav-v10.1.tar.bz2/libavcodec/vdpau_vc1.c Added

@@ -0,0 +1,134 @@
+/*
+ * VC-1 decode acceleration through VDPAU
+ *
+ * Copyright (c) 2008 NVIDIA
+ * Copyright (c) 2013 Rémi Denis-Courmont
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <vdpau/vdpau.h>
+
+#include "avcodec.h"
+#include "vc1.h"
+#include "vdpau.h"
+#include "vdpau_internal.h"
+
+static int vdpau_vc1_start_frame(AVCodecContext *avctx,
+ const uint8_t *buffer, uint32_t size)
+{
+ VC1Context * const v = avctx->priv_data;
+ MpegEncContext * const s = &v->s;
+ Picture *pic = s->current_picture_ptr;
+ struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private;
+ VdpPictureInfoVC1 *info = &pic_ctx->info.vc1;
+ VdpVideoSurface ref;
+
+ /* fill LvPictureInfoVC1 struct */
+ info->forward_reference = VDP_INVALID_HANDLE;
+ info->backward_reference = VDP_INVALID_HANDLE;
+
+ switch (s->pict_type) {
+ case AV_PICTURE_TYPE_B:
+ ref = ff_vdpau_get_surface_id(&s->next_picture);
+ assert(ref != VDP_INVALID_HANDLE);
+ info->backward_reference = ref;
+ /* fall-through */
+ case AV_PICTURE_TYPE_P:
+ ref = ff_vdpau_get_surface_id(&s->last_picture);
+ assert(ref != VDP_INVALID_HANDLE);
+ info->forward_reference = ref;
+ }
+
+ info->slice_count = 0;
+ if (v->bi_type)
+ info->picture_type = 4;
+ else
+ info->picture_type = s->pict_type - 1 + s->pict_type / 3;
+
+ info->frame_coding_mode = v->fcm ? (v->fcm + 1) : 0;
+ info->postprocflag = v->postprocflag;
+ info->pulldown = v->broadcast;
+ info->interlace = v->interlace;
+ info->tfcntrflag = v->tfcntrflag;
+ info->finterpflag = v->finterpflag;
+ info->psf = v->psf;
+ info->dquant = v->dquant;
+ info->panscan_flag = v->panscanflag;
+ info->refdist_flag = v->refdist_flag;
+ info->quantizer = v->quantizer_mode;
+ info->extended_mv = v->extended_mv;
+ info->extended_dmv = v->extended_dmv;
+ info->overlap = v->overlap;
+ info->vstransform = v->vstransform;
+ info->loopfilter = v->s.loop_filter;
+ info->fastuvmc = v->fastuvmc;
+ info->range_mapy_flag = v->range_mapy_flag;
+ info->range_mapy = v->range_mapy;
+ info->range_mapuv_flag = v->range_mapuv_flag;
+ info->range_mapuv = v->range_mapuv;
+ /* Specific to simple/main profile only */
+ info->multires = v->multires;
+ info->syncmarker = v->resync_marker;
+ info->rangered = v->rangered | (v->rangeredfrm << 1);
+ info->maxbframes = v->s.max_b_frames;
+ info->deblockEnable = v->postprocflag & 1;
+ info->pquant = v->pq;
+
+ return ff_vdpau_common_start_frame(pic, buffer, size);
+}
+
+static int vdpau_vc1_decode_slice(AVCodecContext *avctx,
+ const uint8_t *buffer, uint32_t size)
+{
+ VC1Context * const v = avctx->priv_data;
+ MpegEncContext * const s = &v->s;
+ Picture *pic = s->current_picture_ptr;
+ struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private;
+ int val;
+
+ val = ff_vdpau_add_buffer(pic, buffer, size);
+ if (val < 0)
+ return val;
+
+ pic_ctx->info.vc1.slice_count++;
+ return 0;
+}
+
+#if CONFIG_WMV3_VDPAU_HWACCEL
+AVHWAccel ff_wmv3_vdpau_hwaccel = {
+ .name = "wm3_vdpau",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_WMV3,
+ .pix_fmt = AV_PIX_FMT_VDPAU,
+ .start_frame = vdpau_vc1_start_frame,
+ .end_frame = ff_vdpau_mpeg_end_frame,
+ .decode_slice = vdpau_vc1_decode_slice,
+ .priv_data_size = sizeof(struct vdpau_picture_context),
+};
+#endif
+
+AVHWAccel ff_vc1_vdpau_hwaccel = {
+ .name = "vc1_vdpau",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_VC1,
+ .pix_fmt = AV_PIX_FMT_VDPAU,
+ .start_frame = vdpau_vc1_start_frame,
+ .end_frame = ff_vdpau_mpeg_end_frame,
+ .decode_slice = vdpau_vc1_decode_slice,
+ .priv_data_size = sizeof(struct vdpau_picture_context),
+};

libav-v9.6.tar.bz2/libavcodec/version.h -> libav-v10.1.tar.bz2/libavcodec/version.h Changed

@@ -26,9 +26,11 @@
 * Libavcodec version macros.
 */
 
-#define LIBAVCODEC_VERSION_MAJOR 54
-#define LIBAVCODEC_VERSION_MINOR 35
-#define LIBAVCODEC_VERSION_MICRO 0
+#include "libavutil/version.h"
+
+#define LIBAVCODEC_VERSION_MAJOR 55
+#define LIBAVCODEC_VERSION_MINOR 34
+#define LIBAVCODEC_VERSION_MICRO 1
 
 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
 LIBAVCODEC_VERSION_MINOR, \
@@ -47,49 +49,79 @@
 */
 
 #ifndef FF_API_REQUEST_CHANNELS
-#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
+#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_DEINTERLACE
+#define FF_API_DEINTERLACE (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_DESTRUCT_PACKET
+#define FF_API_DESTRUCT_PACKET (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_GET_BUFFER
+#define FF_API_GET_BUFFER (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_MISSING_SAMPLE
+#define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_LOWRES
+#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_CAP_VDPAU
+#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#ifndef FF_API_BUFS_VDPAU
+#define FF_API_BUFS_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+#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_OLD_DECODE_AUDIO
-#define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_AC_VLC
+#define FF_API_AC_VLC (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_OLD_ENCODE_AUDIO
-#define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_OLD_MSMPEG4
+#define FF_API_OLD_MSMPEG4 (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_OLD_ENCODE_VIDEO
-#define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_ASPECT_EXTENDED
+#define FF_API_ASPECT_EXTENDED (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_MPV_GLOBAL_OPTS
-#define FF_API_MPV_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_THREAD_OPAQUE
+#define FF_API_THREAD_OPAQUE (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_COLOR_TABLE_ID
-#define FF_API_COLOR_TABLE_ID (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_CODEC_PKT
+#define FF_API_CODEC_PKT (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_INTER_THRESHOLD
-#define FF_API_INTER_THRESHOLD (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_ARCH_ALPHA
+#define FF_API_ARCH_ALPHA (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_SUB_ID
-#define FF_API_SUB_ID (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_XVMC
+#define FF_API_XVMC (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_DSP_MASK
-#define FF_API_DSP_MASK (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_ERROR_RATE
+#define FF_API_ERROR_RATE (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_FIND_BEST_PIX_FMT
-#define FF_API_FIND_BEST_PIX_FMT (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_QSCALE_TYPE
+#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_CODEC_ID
-#define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_MB_TYPE
+#define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_VDA_ASYNC
-#define FF_API_VDA_ASYNC (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_MAX_BFRAMES
+#define FF_API_MAX_BFRAMES (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_AVCODEC_RESAMPLE
-#define FF_API_AVCODEC_RESAMPLE (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_FAST_MALLOC
+#define FF_API_FAST_MALLOC (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_LIBMPEG2
-#define FF_API_LIBMPEG2 (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_NEG_LINESIZES
+#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_MMI
-#define FF_API_MMI (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_EMU_EDGE
+#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
 
 #endif /* AVCODEC_VERSION_H */

libav-v9.6.tar.bz2/libavcodec/videodsp.c -> libav-v10.1.tar.bz2/libavcodec/videodsp.c Changed

libav-v9.6.tar.bz2/libavcodec/videodsp.h -> libav-v10.1.tar.bz2/libavcodec/videodsp.h Changed

@@ -36,8 +36,10 @@
      *
      * @param buf destination buffer
      * @param src source buffer
-     * @param linesize number of bytes between 2 vertically adjacent samples
-     *                 in both the source and destination buffers
+     * @param buf_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
@@ -48,15 +50,17 @@
      * @param h height of the source buffer
      */
     void (*emulated_edge_mc)(uint8_t *buf, const uint8_t *src,
-                             ptrdiff_t linesize, int block_w, int block_h,
+                             ptrdiff_t buf_linesize,
+                             ptrdiff_t src_linesize,
+                             int block_w, int block_h,
                              int src_x, int src_y, int w, int h);
 
     /**
      * Prefetch memory into cache (if supported by hardware).
      *
-     * @buf pointer to buffer to prefetch memory from
-     * @stride distance between two lines of buf (in bytes)
-     * @h number of lines to prefetch
+     * @param buf    pointer to buffer to prefetch memory from
+     * @param stride distance between two lines of buf (in bytes)
+     * @param h      number of lines to prefetch
      */
     void (*prefetch)(uint8_t *buf, ptrdiff_t stride, int h);
 } VideoDSPContext;

libav-v9.6.tar.bz2/libavcodec/videodsp_template.c -> libav-v10.1.tar.bz2/libavcodec/videodsp_template.c Changed

@@ -22,7 +22,8 @@
 #include "bit_depth_template.c"
 
 static void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src,
- ptrdiff_t linesize,
+ ptrdiff_t buf_linesize,
+ ptrdiff_t src_linesize,
 int block_w, int block_h,
 int src_x, int src_y, int w, int h)
 {
@@ -30,10 +31,10 @@
 int start_y, start_x, end_y, end_x;
 
 if (src_y >= h) {
- src += (h - 1 - src_y) * linesize;
+ src += (h - 1 - src_y) * src_linesize;
 src_y = h - 1;
 } else if (src_y <= -block_h) {
- src += (1 - block_h - src_y) * linesize;
+ src += (1 - block_h - src_y) * src_linesize;
 src_y = 1 - block_h;
 }
 if (src_x >= w) {
@@ -52,30 +53,30 @@
 assert(start_x < end_x && block_w);
 
 w = end_x - start_x;
- src += start_y * linesize + 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 += linesize;
+ buf += buf_linesize;
 }
 
 // copy existing part
 for (; y < end_y; y++) {
 memcpy(buf, src, w * sizeof(pixel));
- src += linesize;
- buf += linesize;
+ src += src_linesize;
+ buf += buf_linesize;
 }
 
 // bottom
- src -= linesize;
+ src -= src_linesize;
 for (; y < block_h; y++) {
 memcpy(buf, src, w * sizeof(pixel));
- buf += linesize;
+ buf += buf_linesize;
 }
 
- buf -= block_h * linesize + start_x * sizeof(pixel);
+ buf -= block_h * buf_linesize + start_x * sizeof(pixel);
 while (block_h--) {
 pixel *bufp = (pixel *) buf;
 
@@ -88,6 +89,6 @@
 for (x = end_x; x < block_w; x++) {
 bufp[x] = bufp[end_x - 1];
 }
- buf += linesize;
+ buf += buf_linesize;
 }
 }

libav-v9.6.tar.bz2/libavcodec/vmdav.c -> libav-v10.1.tar.bz2/libavcodec/vmdav.c Changed

@@ -48,6 +48,7 @@
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "internal.h"
+#include "bytestream.h"
 
 #define VMD_HEADER_SIZE 0x330
 #define PALETTE_COUNT 256
@@ -59,8 +60,7 @@
 typedef struct VmdVideoContext {
 
 AVCodecContext *avctx;
- AVFrame frame;
- AVFrame prev_frame;
+ AVFrame *prev_frame;
 
 const unsigned char *buf;
 int size;
@@ -78,8 +78,6 @@
 static void lz_unpack(const unsigned char *src, int src_len,
 unsigned char *dest, int dest_len)
 {
- const unsigned char *s;
- unsigned int s_len;
 unsigned char *d;
 unsigned char *d_end;
 unsigned char queue[QUEUE_SIZE];
@@ -90,18 +88,17 @@
 unsigned int speclen;
 unsigned char tag;
 unsigned int i, j;
+ GetByteContext gb;
 
- s = src;
- s_len = src_len;
+ bytestream2_init(&gb, src, src_len);
 d = dest;
 d_end = d + dest_len;
- dataleft = AV_RL32(s);
- s += 4; s_len -= 4;
+ dataleft = bytestream2_get_le32(&gb);
 memset(queue, 0x20, QUEUE_SIZE);
- if (s_len < 4)
+ if (bytestream2_get_bytes_left(&gb) < 4)
 return;
- if (AV_RL32(s) == 0x56781234) {
- s += 4; s_len -= 4;
+ if (bytestream2_peek_le32(&gb) == 0x56781234) {
+ bytestream2_get_le32(&gb);
 qpos = 0x111;
 speclen = 0xF + 3;
 } else {
@@ -109,40 +106,32 @@
 speclen = 100; /* no speclen */
 }
 
- while (dataleft > 0 && s_len > 0) {
- tag = *s++; s_len--;
+ while (dataleft > 0 && bytestream2_get_bytes_left(&gb) > 0) {
+ tag = bytestream2_get_byteu(&gb);
 if ((tag == 0xFF) && (dataleft > 8)) {
- if (d + 8 > d_end || s_len < 8)
+ if (d + 8 > d_end || bytestream2_get_bytes_left(&gb) < 8)
 return;
 for (i = 0; i < 8; i++) {
- queue[qpos++] = *d++ = *s++;
+ queue[qpos++] = *d++ = bytestream2_get_byteu(&gb);
 qpos &= QUEUE_MASK;
 }
- s_len -= 8;
 dataleft -= 8;
 } else {
 for (i = 0; i < 8; i++) {
 if (dataleft == 0)
 break;
 if (tag & 0x01) {
- if (d + 1 > d_end || s_len < 1)
+ if (d + 1 > d_end || bytestream2_get_bytes_left(&gb) < 1)
 return;
- queue[qpos++] = *d++ = *s++;
+ queue[qpos++] = *d++ = bytestream2_get_byte(&gb);
 qpos &= QUEUE_MASK;
 dataleft--;
- s_len--;
 } else {
- if (s_len < 2)
- return;
- chainofs = *s++;
- chainofs |= ((*s & 0xF0) << 4);
- chainlen = (*s++ & 0x0F) + 3;
- s_len -= 2;
+ chainofs = bytestream2_get_byte(&gb);
+ chainofs |= ((bytestream2_peek_byte(&gb) & 0xF0) << 4);
+ chainlen = (bytestream2_get_byte(&gb) & 0x0F) + 3;
 if (chainlen == speclen) {
- if (s_len < 1)
- return;
- chainlen = *s++ + 0xF + 3;
- s_len--;
+ chainlen = bytestream2_get_byte(&gb) + 0xF + 3;
 }
 if (d + chainlen > d_end)
 return;
@@ -162,62 +151,55 @@
 static int rle_unpack(const unsigned char *src, unsigned char *dest,
 int src_count, int src_size, int dest_len)
 {
- const unsigned char *ps;
 unsigned char *pd;
- int i, l;
+ int i, l, used = 0;
 unsigned char *dest_end = dest + dest_len;
+ GetByteContext gb;
+ uint16_t run_val;
 
- ps = src;
+ bytestream2_init(&gb, src, src_size);
 pd = dest;
 if (src_count & 1) {
- if (src_size < 1)
+ if (bytestream2_get_bytes_left(&gb) < 1)
 return 0;
- *pd++ = *ps++;
- src_size--;
+ *pd++ = bytestream2_get_byteu(&gb);
+ used++;
 }
 
- src_count >>= 1;
- i = 0;
 do {
- if (src_size < 1)
+ if (bytestream2_get_bytes_left(&gb) < 1)
 break;
- l = *ps++;
- src_size--;
+ l = bytestream2_get_byteu(&gb);
 if (l & 0x80) {
 l = (l & 0x7F) * 2;
- if (pd + l > dest_end || src_size < l)
- return ps - src;
- memcpy(pd, ps, l);
- ps += l;
- src_size -= l;
+ if (pd + l > dest_end || bytestream2_get_bytes_left(&gb) < l)
+ return bytestream2_tell(&gb);
+ bytestream2_get_buffer(&gb, pd, l);
 pd += l;
 } else {
- if (pd + i > dest_end || src_size < 2)
- return ps - src;
+ if (pd + l > dest_end || bytestream2_get_bytes_left(&gb) < 2)
+ return bytestream2_tell(&gb);
+ run_val = bytestream2_get_ne16(&gb);
 for (i = 0; i < l; i++) {
- *pd++ = ps[0];
- *pd++ = ps[1];
+ AV_WN16(pd, run_val);
+ pd += 2;
 }
- ps += 2;
- src_size -= 2;
+ l *= 2;
 }
- i += l;
- } while (i < src_count);
+ used += l;
+ } while (used < src_count);
 
- return ps - src;
+ return bytestream2_tell(&gb);
 }
 
-static void vmd_decode(VmdVideoContext *s)
+static int vmd_decode(VmdVideoContext *s, AVFrame *frame)
 {
 int i;
 unsigned int *palette32;
 unsigned char r, g, b;
 
- /* point to the start of the encoded data */
- const unsigned char *p = s->buf + 16;
+ GetByteContext gb;
 
- const unsigned char *pb;
- unsigned int pb_size;
 unsigned char meth;
 unsigned char *dp; /* pointer to current frame */
 unsigned char *pp; /* pointer to previous frame */
@@ -234,13 +216,21 @@
 if (frame_x < 0 || frame_width < 0 ||
 frame_x >= s->avctx->width ||
 frame_width > s->avctx->width ||
- frame_x + frame_width > s->avctx->width)
- return;
+ frame_x + frame_width > s->avctx->width) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Invalid horizontal range %d-%d\n",
+ frame_x, frame_width);
+ return AVERROR_INVALIDDATA;
+ }
 if (frame_y < 0 || frame_height < 0 ||
 frame_y >= s->avctx->height ||
 frame_height > s->avctx->height ||
- frame_y + frame_height > s->avctx->height)
- return;
+ frame_y + frame_height > s->avctx->height) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Invalid vertical range %d-%d\n",
+ frame_x, frame_width);
+ return AVERROR_INVALIDDATA;
+ }
 
 if ((frame_width == s->avctx->width && frame_height == s->avctx->height) &&
 (frame_x || frame_y)) {
@@ -253,130 +243,143 @@
 
 /* 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(s->frame.data[0], s->prev_frame.data[0],
- s->avctx->height * s->frame.linesize[0]);
+ memcpy(frame->data[0], s->prev_frame->data[0],
+ s->avctx->height * frame->linesize[0]);
 }
 
 /* check if there is a new palette */
+ bytestream2_init(&gb, s->buf + 16, s->size - 16);
 if (s->buf[15] & 0x02) {
- p += 2;
+ bytestream2_skip(&gb, 2);
 palette32 = (unsigned int *)s->palette;
- for (i = 0; i < PALETTE_COUNT; i++) {
- r = *p++ * 4;
- g = *p++ * 4;
- b = *p++ * 4;
- palette32[i] = (r << 16) | (g << 8) | (b);
+ if (bytestream2_get_bytes_left(&gb) >= PALETTE_COUNT * 3) {
+ for (i = 0; i < PALETTE_COUNT; i++) {
+ r = bytestream2_get_byteu(&gb) * 4;
+ g = bytestream2_get_byteu(&gb) * 4;
+ b = bytestream2_get_byteu(&gb) * 4;
+ palette32[i] = (r << 16) | (g << 8) | (b);
+ }
+ } else {
+ av_log(s->avctx, AV_LOG_ERROR, "Incomplete palette\n");
+ return AVERROR_INVALIDDATA;
 }
- s->size -= (256 * 3 + 2);
+ s->size -= PALETTE_COUNT * 3 + 2;
 }
- if (s->size > 0) {
- /* originally UnpackFrame in VAG's code */
- pb = p;
- pb_size = s->buf + s->size - pb;
- if (pb_size < 1)
- return;
- meth = *pb++; pb_size--;
- if (meth & 0x80) {
- lz_unpack(pb, pb_size,
- s->unpack_buffer, s->unpack_buffer_size);
- meth &= 0x7F;
- pb = s->unpack_buffer;
- pb_size = s->unpack_buffer_size;
+
+ if (!s->size)
+ return 0;
+
+ /* originally UnpackFrame in VAG's code */
+ if (bytestream2_get_bytes_left(&gb) < 1)
+ return AVERROR_INVALIDDATA;
+ meth = bytestream2_get_byteu(&gb);
+ if (meth & 0x80) {
+ 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);
+ meth &= 0x7F;
+ bytestream2_init(&gb, s->unpack_buffer, s->unpack_buffer_size);
+ }
 
- dp = &s->frame.data[0][frame_y * s->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++) {
- ofs = 0;
- do {
- if (pb_size < 1)
- return;
- len = *pb++;
- pb_size--;
- if (len & 0x80) {
- len = (len & 0x7F) + 1;
- if (ofs + len > frame_width || pb_size < len)
- return;
- memcpy(&dp[ofs], pb, len);
- pb += len;
- pb_size -= len;
- ofs += len;
- } else {
- /* interframe pixel copy */
- if (ofs + len + 1 > frame_width || !s->prev_frame.data[0])
- return;
- memcpy(&dp[ofs], &pp[ofs], len + 1);
- ofs += len + 1;
- }
- } while (ofs < frame_width);
- if (ofs > frame_width) {
- av_log(s->avctx, AV_LOG_ERROR, "VMD video: offset > width (%d > %d)\n",
- ofs, frame_width);
- break;
+ 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];
+ switch (meth) {
+ case 1:
+ for (i = 0; i < frame_height; i++) {
+ ofs = 0;
+ do {
+ len = bytestream2_get_byte(&gb);
+ if (len & 0x80) {
+ len = (len & 0x7F) + 1;
+ if (ofs + len > frame_width ||
+ bytestream2_get_bytes_left(&gb) < len)
+ return AVERROR_INVALIDDATA;
+ bytestream2_get_buffer(&gb, &dp[ofs], len);
+ ofs += len;
+ } else {
+ /* interframe pixel copy */
+ if (ofs + len + 1 > frame_width || !s->prev_frame->data[0])
+ return AVERROR_INVALIDDATA;
+ memcpy(&dp[ofs], &pp[ofs], len + 1);
+ ofs += len + 1;
 }
- dp += s->frame.linesize[0];
- pp += s->prev_frame.linesize[0];
+ } while (ofs < frame_width);
+ if (ofs > frame_width) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "VMD video: offset > width (%d > %d)\n",
+ ofs, frame_width);
+ return AVERROR_INVALIDDATA;
 }
- break;
-
- case 2:
- for (i = 0; i < frame_height; i++) {
- if (pb_size < frame_width)
- return;
- memcpy(dp, pb, frame_width);
- pb += frame_width;
- pb_size -= frame_width;
- dp += s->frame.linesize[0];
- pp += s->prev_frame.linesize[0];
- }
- break;
+ dp += frame->linesize[0];
+ pp += s->prev_frame->linesize[0];
+ }
+ break;
 
- case 3:
- for (i = 0; i < frame_height; i++) {
- ofs = 0;
- do {
- if (pb_size < 1)
- return;
- len = *pb++;
- pb_size--;
- if (len & 0x80) {
- len = (len & 0x7F) + 1;
- if (pb_size < 1)
- return;
- if (*pb++ == 0xFF)
- len = rle_unpack(pb, &dp[ofs], len, pb_size, frame_width - ofs);
- else {
- if (pb_size < len)
- return;
- memcpy(&dp[ofs], pb, len);
- }
- pb += len;
- pb_size -= 1 + len;
- ofs += len;
+ case 2:
+ for (i = 0; i < frame_height; i++) {
+ bytestream2_get_buffer(&gb, dp, frame_width);
+ dp += frame->linesize[0];
+ pp += s->prev_frame->linesize[0];
+ }
+ break;
+
+ case 3:
+ for (i = 0; i < frame_height; i++) {
+ ofs = 0;
+ do {
+ len = bytestream2_get_byte(&gb);
+ if (len & 0x80) {
+ len = (len & 0x7F) + 1;
+ if (bytestream2_peek_byte(&gb) == 0xFF) {
+ int slen = len;
+ bytestream2_get_byte(&gb);
+ len = rle_unpack(gb.buffer, &dp[ofs],
+ len, bytestream2_get_bytes_left(&gb),
+ frame_width - ofs);
+ ofs += slen;
+ bytestream2_skip(&gb, len);
 } else {
- /* interframe pixel copy */
- if (ofs + len + 1 > frame_width || !s->prev_frame.data[0])
- return;
- memcpy(&dp[ofs], &pp[ofs], len + 1);
- ofs += len + 1;
+ bytestream2_get_buffer(&gb, &dp[ofs], len);
+ ofs += len;
 }
- } while (ofs < frame_width);
- if (ofs > frame_width) {
- av_log(s->avctx, AV_LOG_ERROR, "VMD video: offset > width (%d > %d)\n",
- ofs, frame_width);
+ } else {
+ /* interframe pixel copy */
+ if (ofs + len + 1 > frame_width || !s->prev_frame->data[0])
+ return AVERROR_INVALIDDATA;
+ memcpy(&dp[ofs], &pp[ofs], len + 1);
+ ofs += len + 1;
 }
- dp += s->frame.linesize[0];
- pp += s->prev_frame.linesize[0];
+ } while (ofs < frame_width);
+ if (ofs > frame_width) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "VMD video: offset > width (%d > %d)\n",
+ ofs, frame_width);
+ return AVERROR_INVALIDDATA;
 }
- break;
+ dp += 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_free(s->unpack_buffer);
+
+ return 0;
 }
 
 static av_cold int vmdvideo_decode_init(AVCodecContext *avctx)
@@ -401,9 +404,11 @@
 vmd_header = (unsigned char *)avctx->extradata;
 
 s->unpack_buffer_size = AV_RL32(&vmd_header[800]);
- s->unpack_buffer = av_malloc(s->unpack_buffer_size);
- if (!s->unpack_buffer)
- return -1;
+ if (s->unpack_buffer_size) {
+ s->unpack_buffer = av_malloc(s->unpack_buffer_size);
+ if (!s->unpack_buffer)
+ return AVERROR(ENOMEM);
+ }
 
 /* load up the initial palette */
 raw_palette = &vmd_header[28];
@@ -415,6 +420,12 @@
 palette32[i] = (r << 16) | (g << 8) | (b);
 }
 
+ s->prev_frame = av_frame_alloc();
+ if (!s->prev_frame) {
+ vmdvideo_decode_end(avctx);
+ return AVERROR(ENOMEM);
+ }
+
 return 0;
 }
 
@@ -425,47 +436,37 @@
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 VmdVideoContext *s = avctx->priv_data;
+ AVFrame *frame = data;
+ int ret;
 
 s->buf = buf;
 s->size = buf_size;
 
 if (buf_size < 16)
- return buf_size;
+ return AVERROR_INVALIDDATA;
 
- s->frame.reference = 1;
- if (ff_get_buffer(avctx, &s->frame)) {
+ if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "VMD Video: get_buffer() failed\n");
- return -1;
+ return ret;
 }
 
- vmd_decode(s);
+ if ((ret = vmd_decode(s, frame)) < 0)
+ return ret;
 
 /* make the palette available on the way out */
- memcpy(s->frame.data[1], s->palette, PALETTE_COUNT * 4);
+ memcpy(frame->data[1], s->palette, PALETTE_COUNT * 4);
 
 /* shuffle frames */
- FFSWAP(AVFrame, s->frame, s->prev_frame);
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
+ av_frame_unref(s->prev_frame);
+ if ((ret = av_frame_ref(s->prev_frame, frame)) < 0)
+ return ret;
 
 *got_frame = 1;
- *(AVFrame*)data = s->prev_frame;
 
 /* report that the buffer was completely consumed */
 return buf_size;
 }
 
-static av_cold int vmdvideo_decode_end(AVCodecContext *avctx)
-{
- VmdVideoContext *s = avctx->priv_data;
-
- if (s->prev_frame.data[0])
- avctx->release_buffer(avctx, &s->prev_frame);
- av_free(s->unpack_buffer);
-
- return 0;
-}
-
 
 /*
 * Audio Decoder
@@ -476,7 +477,6 @@
 #define BLOCK_TYPE_SILENCE 3
 
 typedef struct VmdAudioContext {
- AVFrame frame;
 int out_bps;
 int chunk_size;
 } VmdAudioContext;
@@ -521,9 +521,6 @@
 
 s->chunk_size = avctx->block_align + avctx->channels * (s->out_bps == 2);
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 av_log(avctx, AV_LOG_DEBUG, "%d channels, %d bits/sample, "
 "block align = %d, sample rate = %d\n",
 avctx->channels, avctx->bits_per_coded_sample, avctx->block_align,
@@ -564,6 +561,7 @@
 static int vmdaudio_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 const uint8_t *buf_end;
 int buf_size = avpkt->size;
@@ -607,18 +605,23 @@
 /* ensure output buffer is large enough */
 audio_chunks = buf_size / s->chunk_size;
 
+ /* drop incomplete chunks */
+ buf_size = audio_chunks * s->chunk_size;
+
 /* get output buffer */
- s->frame.nb_samples = ((silent_chunks + audio_chunks) * avctx->block_align) / avctx->channels;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = ((silent_chunks + audio_chunks) * avctx->block_align) /
+ avctx->channels;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- output_samples_u8 = s->frame.data[0];
- output_samples_s16 = (int16_t *)s->frame.data[0];
+ output_samples_u8 = frame->data[0];
+ output_samples_s16 = (int16_t *)frame->data[0];
 
 /* decode silent chunks */
 if (silent_chunks > 0) {
- int silent_size = avctx->block_align * silent_chunks;
+ int silent_size = FFMIN(avctx->block_align * silent_chunks,
+ frame->nb_samples * avctx->channels);
 if (s->out_bps == 2) {
 memset(output_samples_s16, 0x00, silent_size * 2);
 output_samples_s16 += silent_size;
@@ -630,7 +633,7 @@
 
 /* decode audio chunks */
 if (audio_chunks > 0) {
- buf_end = buf + buf_size;
+ buf_end = buf + (buf_size & ~(avctx->channels > 1));
 while (buf + s->chunk_size <= buf_end) {
 if (s->out_bps == 2) {
 decode_audio_s16(output_samples_s16, buf, s->chunk_size,
@@ -644,8 +647,7 @@
 }
 }
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
 return avpkt->size;
 }
@@ -657,6 +659,7 @@
 
 AVCodec ff_vmdvideo_decoder = {
 .name = "vmdvideo",
+ .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_VMDVIDEO,
 .priv_data_size = sizeof(VmdVideoContext),
@@ -664,16 +667,15 @@
 .close = vmdvideo_decode_end,
 .decode = vmdvideo_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD video"),
 };
 
 AVCodec ff_vmdaudio_decoder = {
 .name = "vmdaudio",
+ .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD audio"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_VMDAUDIO,
 .priv_data_size = sizeof(VmdAudioContext),
 .init = vmdaudio_decode_init,
 .decode = vmdaudio_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD audio"),
 };

libav-v9.6.tar.bz2/libavcodec/vmnc.c -> libav-v10.1.tar.bz2/libavcodec/vmnc.c Changed

@@ -31,6 +31,8 @@
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
+#include "internal.h"
+#include "bytestream.h"
 
 enum EncTypes {
 MAGIC_WMVd = 0x574D5664,
@@ -55,62 +57,73 @@
 */
 typedef struct VmncContext {
 AVCodecContext *avctx;
- AVFrame pic;
+ AVFrame *pic;
 
 int bpp;
 int bpp2;
 int bigendian;
 uint8_t pal[768];
 int width, height;
+ GetByteContext gb;
 
 /* cursor data */
 int cur_w, cur_h;
 int cur_x, cur_y;
 int cur_hx, cur_hy;
- uint8_t* curbits, *curmask;
- uint8_t* screendta;
+ uint8_t *curbits, *curmask;
+ uint8_t *screendta;
 } VmncContext;
 
 /* read pixel value from stream */
-static av_always_inline int vmnc_get_pixel(const uint8_t* buf, int bpp, int be) {
- switch(bpp * 2 + be) {
+static av_always_inline int vmnc_get_pixel(GetByteContext *gb, int bpp, int be)
+{
+ switch (bpp * 2 + be) {
 case 2:
- case 3: return *buf;
- case 4: return AV_RL16(buf);
- case 5: return AV_RB16(buf);
- case 8: return AV_RL32(buf);
- case 9: return AV_RB32(buf);
+ case 3:
+ return bytestream2_get_byte(gb);
+ case 4:
+ return bytestream2_get_le16(gb);
+ case 5:
+ return bytestream2_get_be16(gb);
+ case 8:
+ return bytestream2_get_le32(gb);
+ case 9:
+ return bytestream2_get_be32(gb);
 default: return 0;
 }
 }
 
-static void load_cursor(VmncContext *c, const uint8_t *src)
+static void load_cursor(VmncContext *c)
 {
 int i, j, p;
- const int bpp = c->bpp2;
- uint8_t *dst8 = c->curbits;
- uint16_t *dst16 = (uint16_t*)c->curbits;
- uint32_t *dst32 = (uint32_t*)c->curbits;
-
- for(j = 0; j < c->cur_h; j++) {
- for(i = 0; i < c->cur_w; i++) {
- p = vmnc_get_pixel(src, bpp, c->bigendian);
- src += bpp;
- if(bpp == 1) *dst8++ = p;
- if(bpp == 2) *dst16++ = p;
- if(bpp == 4) *dst32++ = p;
+ const int bpp = c->bpp2;
+ uint8_t *dst8 = c->curbits;
+ uint16_t *dst16 = (uint16_t *)c->curbits;
+ uint32_t *dst32 = (uint32_t *)c->curbits;
+
+ for (j = 0; j < c->cur_h; j++) {
+ for (i = 0; i < c->cur_w; i++) {
+ p = vmnc_get_pixel(&c->gb, bpp, c->bigendian);
+ if (bpp == 1)
+ *dst8++ = p;
+ if (bpp == 2)
+ *dst16++ = p;
+ if (bpp == 4)
+ *dst32++ = p;
 }
 }
- dst8 = c->curmask;
+ dst8 = c->curmask;
 dst16 = (uint16_t*)c->curmask;
 dst32 = (uint32_t*)c->curmask;
- for(j = 0; j < c->cur_h; j++) {
- for(i = 0; i < c->cur_w; i++) {
- p = vmnc_get_pixel(src, bpp, c->bigendian);
- src += bpp;
- if(bpp == 1) *dst8++ = p;
- if(bpp == 2) *dst16++ = p;
- if(bpp == 4) *dst32++ = p;
+ for (j = 0; j < c->cur_h; j++) {
+ for (i = 0; i < c->cur_w; i++) {
+ p = vmnc_get_pixel(&c->gb, bpp, c->bigendian);
+ if (bpp == 1)
+ *dst8++ = p;
+ if (bpp == 2)
+ *dst16++ = p;
+ if (bpp == 4)
+ *dst32++ = p;
 }
 }
 }
@@ -120,96 +133,100 @@
 int i, j;
 int w, h, x, y;
 w = c->cur_w;
- if(c->width < c->cur_x + c->cur_w) w = c->width - c->cur_x;
+ if (c->width < c->cur_x + c->cur_w)
+ w = c->width - c->cur_x;
 h = c->cur_h;
- if(c->height < c->cur_y + c->cur_h) h = c->height - c->cur_y;
+ if (c->height < c->cur_y + c->cur_h)
+ h = c->height - c->cur_y;
 x = c->cur_x;
 y = c->cur_y;
- if(x < 0) {
+ if (x < 0) {
 w += x;
- x = 0;
+ x = 0;
 }
- if(y < 0) {
+ if (y < 0) {
 h += y;
- y = 0;
+ y = 0;
 }
 
- if((w < 1) || (h < 1)) return;
+ if ((w < 1) || (h < 1))
+ return;
 dst += x * c->bpp2 + y * stride;
 
- if(c->bpp2 == 1) {
- uint8_t* cd = c->curbits, *msk = c->curmask;
- for(j = 0; j < h; j++) {
- for(i = 0; i < w; i++)
+ if (c->bpp2 == 1) {
+ uint8_t *cd = c->curbits, *msk = c->curmask;
+ for (j = 0; j < h; j++) {
+ for (i = 0; i < w; i++)
 dst[i] = (dst[i] & cd[i]) ^ msk[i];
 msk += c->cur_w;
- cd += c->cur_w;
+ cd += c->cur_w;
 dst += stride;
 }
- } else if(c->bpp2 == 2) {
- uint16_t* cd = (uint16_t*)c->curbits, *msk = (uint16_t*)c->curmask;
- uint16_t* dst2;
- for(j = 0; j < h; j++) {
+ } else if (c->bpp2 == 2) {
+ uint16_t *cd = (uint16_t*)c->curbits, *msk = (uint16_t*)c->curmask;
+ uint16_t *dst2;
+ for (j = 0; j < h; j++) {
 dst2 = (uint16_t*)dst;
- for(i = 0; i < w; i++)
+ for (i = 0; i < w; i++)
 dst2[i] = (dst2[i] & cd[i]) ^ msk[i];
 msk += c->cur_w;
- cd += c->cur_w;
+ cd += c->cur_w;
 dst += stride;
 }
- } else if(c->bpp2 == 4) {
- uint32_t* cd = (uint32_t*)c->curbits, *msk = (uint32_t*)c->curmask;
- uint32_t* dst2;
- for(j = 0; j < h; j++) {
+ } else if (c->bpp2 == 4) {
+ uint32_t *cd = (uint32_t*)c->curbits, *msk = (uint32_t*)c->curmask;
+ uint32_t *dst2;
+ for (j = 0; j < h; j++) {
 dst2 = (uint32_t*)dst;
- for(i = 0; i < w; i++)
+ for (i = 0; i < w; i++)
 dst2[i] = (dst2[i] & cd[i]) ^ msk[i];
 msk += c->cur_w;
- cd += c->cur_w;
+ cd += c->cur_w;
 dst += stride;
 }
 }
 }
 
 /* fill rectangle with given color */
-static av_always_inline void paint_rect(uint8_t *dst, int dx, int dy, int w, int h, int color, int bpp, int stride)
+static av_always_inline void paint_rect(uint8_t *dst, int dx, int dy,
+ int w, int h, int color,
+ int bpp, int stride)
 {
 int i, j;
 dst += dx * bpp + dy * stride;
- if(bpp == 1){
- for(j = 0; j < h; j++) {
+ if (bpp == 1) {
+ for (j = 0; j < h; j++) {
 memset(dst, color, w);
 dst += stride;
 }
- }else if(bpp == 2){
- uint16_t* dst2;
- for(j = 0; j < h; j++) {
+ } else if (bpp == 2) {
+ uint16_t *dst2;
+ for (j = 0; j < h; j++) {
 dst2 = (uint16_t*)dst;
- for(i = 0; i < w; i++) {
+ for (i = 0; i < w; i++)
 *dst2++ = color;
- }
 dst += stride;
 }
- }else if(bpp == 4){
- uint32_t* dst2;
- for(j = 0; j < h; j++) {
+ } else if (bpp == 4) {
+ uint32_t *dst2;
+ for (j = 0; j < h; j++) {
 dst2 = (uint32_t*)dst;
- for(i = 0; i < w; i++) {
+ for (i = 0; i < w; i++)
 dst2[i] = color;
- }
 dst += stride;
 }
 }
 }
 
-static av_always_inline void paint_raw(uint8_t *dst, int w, int h, const uint8_t* src, int bpp, int be, int stride)
+static av_always_inline void paint_raw(uint8_t *dst, int w, int h,
+ GetByteContext *gb, int bpp,
+ int be, int stride)
 {
 int i, j, p;
- for(j = 0; j < h; j++) {
- for(i = 0; i < w; i++) {
- p = vmnc_get_pixel(src, bpp, be);
- src += bpp;
- switch(bpp){
+ for (j = 0; j < h; j++) {
+ for (i = 0; i < w; i++) {
+ p = vmnc_get_pixel(gb, bpp, be);
+ switch (bpp) {
 case 1:
 dst[i] = p;
 break;
@@ -225,255 +242,282 @@
 }
 }
 
-static int decode_hextile(VmncContext *c, uint8_t* dst, const uint8_t* src, int ssize, int w, int h, int stride)
+static int decode_hextile(VmncContext *c, uint8_t* dst, GetByteContext *gb,
+ int w, int h, int stride)
 {
 int i, j, k;
 int bg = 0, fg = 0, rects, color, flags, xy, wh;
 const int bpp = c->bpp2;
 uint8_t *dst2;
 int bw = 16, bh = 16;
- const uint8_t *ssrc=src;
 
- for(j = 0; j < h; j += 16) {
+ for (j = 0; j < h; j += 16) {
 dst2 = dst;
- bw = 16;
- if(j + 16 > h) bh = h - j;
- for(i = 0; i < w; i += 16, dst2 += 16 * bpp) {
- if(src - ssrc >= ssize) {
+ bw = 16;
+ if (j + 16 > h)
+ bh = h - j;
+ for (i = 0; i < w; i += 16, dst2 += 16 * bpp) {
+ if (bytestream2_get_bytes_left(gb) <= 0) {
 av_log(c->avctx, AV_LOG_ERROR, "Premature end of data!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- if(i + 16 > w) bw = w - i;
- flags = *src++;
- if(flags & HT_RAW) {
- if(src - ssrc > ssize - bw * bh * bpp) {
+ if (i + 16 > w)
+ bw = w - i;
+ flags = bytestream2_get_byte(gb);
+ if (flags & HT_RAW) {
+ if (bytestream2_get_bytes_left(gb) < bw * bh * bpp) {
 av_log(c->avctx, AV_LOG_ERROR, "Premature end of data!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- paint_raw(dst2, bw, bh, src, bpp, c->bigendian, stride);
- src += bw * bh * bpp;
+ paint_raw(dst2, bw, bh, gb, bpp, c->bigendian, stride);
 } else {
- if(flags & HT_BKG) {
- bg = vmnc_get_pixel(src, bpp, c->bigendian); src += bpp;
- }
- if(flags & HT_FG) {
- fg = vmnc_get_pixel(src, bpp, c->bigendian); src += bpp;
- }
+ if (flags & HT_BKG)
+ bg = vmnc_get_pixel(gb, bpp, c->bigendian);
+ if (flags & HT_FG)
+ fg = vmnc_get_pixel(gb, bpp, c->bigendian);
 rects = 0;
- if(flags & HT_SUB)
- rects = *src++;
+ if (flags & HT_SUB)
+ rects = bytestream2_get_byte(gb);
 color = !!(flags & HT_CLR);
 
 paint_rect(dst2, 0, 0, bw, bh, bg, bpp, stride);
 
- if(src - ssrc > ssize - rects * (color * bpp + 2)) {
+ if (bytestream2_get_bytes_left(gb) < rects * (color * bpp + 2)) {
 av_log(c->avctx, AV_LOG_ERROR, "Premature end of data!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- for(k = 0; k < rects; k++) {
- if(color) {
- fg = vmnc_get_pixel(src, bpp, c->bigendian); src += bpp;
- }
- xy = *src++;
- wh = *src++;
- paint_rect(dst2, xy >> 4, xy & 0xF, (wh>>4)+1, (wh & 0xF)+1, fg, bpp, stride);
+ for (k = 0; k < rects; k++) {
+ if (color)
+ fg = vmnc_get_pixel(gb, bpp, c->bigendian);
+ xy = bytestream2_get_byte(gb);
+ wh = bytestream2_get_byte(gb);
+ paint_rect(dst2, xy >> 4, xy & 0xF,
+ (wh>>4)+1, (wh & 0xF)+1, fg, bpp, stride);
 }
 }
 }
 dst += stride * 16;
 }
- return src - ssrc;
+ return 0;
+}
+
+static void reset_buffers(VmncContext *c)
+{
+ av_freep(&c->curbits);
+ av_freep(&c->curmask);
+ av_freep(&c->screendta);
+ c->cur_w = c->cur_h = 0;
 }
 
 static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
 AVPacket *avpkt)
 {
 const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
+ int buf_size = avpkt->size;
 VmncContext * const c = avctx->priv_data;
+ GetByteContext *gb = &c->gb;
 uint8_t *outptr;
- const uint8_t *src = buf;
- int dx, dy, w, h, depth, enc, chunks, res, size_left;
+ int dx, dy, w, h, depth, enc, chunks, res, size_left, ret;
 
- c->pic.reference = 1;
- c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if(avctx->reget_buffer(avctx, &c->pic) < 0){
+ if ((ret = ff_reget_buffer(avctx, c->pic)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
- return -1;
+ return ret;
 }
 
- c->pic.key_frame = 0;
- c->pic.pict_type = AV_PICTURE_TYPE_P;
+ bytestream2_init(gb, buf, buf_size);
+
+ c->pic->key_frame = 0;
+ c->pic->pict_type = AV_PICTURE_TYPE_P;
 
- //restore screen after cursor
- if(c->screendta) {
+ // restore screen after cursor
+ if (c->screendta) {
 int i;
 w = c->cur_w;
- if(c->width < c->cur_x + w) w = c->width - c->cur_x;
+ if (c->width < c->cur_x + w)
+ w = c->width - c->cur_x;
 h = c->cur_h;
- if(c->height < c->cur_y + h) h = c->height - c->cur_y;
+ if (c->height < c->cur_y + h)
+ h = c->height - c->cur_y;
 dx = c->cur_x;
- if(dx < 0) {
+ if (dx < 0) {
 w += dx;
 dx = 0;
 }
 dy = c->cur_y;
- if(dy < 0) {
+ if (dy < 0) {
 h += dy;
 dy = 0;
 }
- if((w > 0) && (h > 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 += c->pic.linesize[0];
+ if ((w > 0) && (h > 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 += c->pic->linesize[0];
 }
 }
 }
- src += 2;
- chunks = AV_RB16(src); src += 2;
- while(chunks--) {
- dx = AV_RB16(src); src += 2;
- dy = AV_RB16(src); src += 2;
- w = AV_RB16(src); src += 2;
- h = AV_RB16(src); src += 2;
- enc = AV_RB32(src); src += 4;
- outptr = c->pic.data[0] + dx * c->bpp2 + dy * c->pic.linesize[0];
- size_left = buf_size - (src - buf);
- switch(enc) {
+ bytestream2_skip(gb, 2);
+ chunks = bytestream2_get_be16(gb);
+ while (chunks--) {
+ dx = bytestream2_get_be16(gb);
+ dy = bytestream2_get_be16(gb);
+ w = bytestream2_get_be16(gb);
+ h = bytestream2_get_be16(gb);
+ enc = bytestream2_get_be32(gb);
+ 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
- if(size_left < 2 + w * h * c->bpp2 * 2) {
- av_log(avctx, AV_LOG_ERROR, "Premature end of data! (need %i got %i)\n", 2 + w * h * c->bpp2 * 2, size_left);
- return -1;
+ if (size_left < 2 + w * h * c->bpp2 * 2) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Premature end of data! (need %i got %i)\n",
+ 2 + w * h * c->bpp2 * 2, size_left);
+ return AVERROR_INVALIDDATA;
 }
- src += 2;
- c->cur_w = w;
- c->cur_h = h;
+ bytestream2_skip(gb, 2);
+ c->cur_w = w;
+ c->cur_h = h;
 c->cur_hx = dx;
 c->cur_hy = dy;
- if((c->cur_hx > c->cur_w) || (c->cur_hy > c->cur_h)) {
- av_log(avctx, AV_LOG_ERROR, "Cursor hot spot is not in image: %ix%i of %ix%i cursor size\n", c->cur_hx, c->cur_hy, c->cur_w, c->cur_h);
+ if ((c->cur_hx > c->cur_w) || (c->cur_hy > c->cur_h)) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Cursor hot spot is not in image: "
+ "%ix%i of %ix%i cursor size\n",
+ c->cur_hx, c->cur_hy, c->cur_w, c->cur_h);
 c->cur_hx = c->cur_hy = 0;
 }
- c->curbits = av_realloc(c->curbits, c->cur_w * c->cur_h * c->bpp2);
- c->curmask = av_realloc(c->curmask, c->cur_w * c->cur_h * c->bpp2);
- c->screendta = av_realloc(c->screendta, c->cur_w * c->cur_h * c->bpp2);
- load_cursor(c, src);
- src += w * h * c->bpp2 * 2;
+ if (c->cur_w * c->cur_h >= INT_MAX / c->bpp2) {
+ reset_buffers(c);
+ return AVERROR(EINVAL);
+ } else {
+ int screen_size = c->cur_w * c->cur_h * c->bpp2;
+ if ((ret = av_reallocp(&c->curbits, screen_size)) < 0 ||
+ (ret = av_reallocp(&c->curmask, screen_size)) < 0 ||
+ (ret = av_reallocp(&c->screendta, screen_size)) < 0) {
+ reset_buffers(c);
+ return ret;
+ }
+ }
+ load_cursor(c);
 break;
 case MAGIC_WMVe: // unknown
- src += 2;
+ bytestream2_skip(gb, 2);
 break;
 case MAGIC_WMVf: // update cursor position
 c->cur_x = dx - c->cur_hx;
 c->cur_y = dy - c->cur_hy;
 break;
 case MAGIC_WMVg: // unknown
- src += 10;
+ bytestream2_skip(gb, 10);
 break;
 case MAGIC_WMVh: // unknown
- src += 4;
+ bytestream2_skip(gb, 4);
 break;
 case MAGIC_WMVi: // ServerInitialization struct
- c->pic.key_frame = 1;
- c->pic.pict_type = AV_PICTURE_TYPE_I;
- depth = *src++;
- if(depth != c->bpp) {
- av_log(avctx, AV_LOG_INFO, "Depth mismatch. Container %i bpp, Frame data: %i bpp\n", c->bpp, depth);
+ 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,
+ "Depth mismatch. Container %i bpp, "
+ "Frame data: %i bpp\n",
+ c->bpp, depth);
 }
- src++;
- c->bigendian = *src++;
- if(c->bigendian & (~1)) {
- av_log(avctx, AV_LOG_INFO, "Invalid header: bigendian flag = %i\n", c->bigendian);
- return -1;
+ bytestream2_skip(gb, 1);
+ c->bigendian = bytestream2_get_byte(gb);
+ if (c->bigendian & (~1)) {
+ av_log(avctx, AV_LOG_INFO,
+ "Invalid header: bigendian flag = %i\n", c->bigendian);
+ return AVERROR_INVALIDDATA;
 }
 //skip the rest of pixel format data
- src += 13;
+ bytestream2_skip(gb, 13);
 break;
 case MAGIC_WMVj: // unknown
- src += 2;
+ bytestream2_skip(gb, 2);
 break;
 case 0x00000000: // raw rectangle data
- if((dx + w > c->width) || (dy + h > c->height)) {
- av_log(avctx, AV_LOG_ERROR, "Incorrect frame size: %ix%i+%ix%i of %ix%i\n", w, h, dx, dy, c->width, c->height);
- return -1;
+ if ((dx + w > c->width) || (dy + h > c->height)) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Incorrect frame size: %ix%i+%ix%i of %ix%i\n",
+ w, h, dx, dy, c->width, c->height);
+ return AVERROR_INVALIDDATA;
 }
- if(size_left < w * h * c->bpp2) {
- av_log(avctx, AV_LOG_ERROR, "Premature end of data! (need %i got %i)\n", w * h * c->bpp2, size_left);
- return -1;
+ if (size_left < w * h * c->bpp2) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Premature end of data! (need %i got %i)\n",
+ w * h * c->bpp2, size_left);
+ return AVERROR_INVALIDDATA;
 }
- paint_raw(outptr, w, h, src, c->bpp2, c->bigendian, c->pic.linesize[0]);
- src += w * h * c->bpp2;
+ paint_raw(outptr, w, h, gb, c->bpp2, c->bigendian,
+ c->pic->linesize[0]);
 break;
 case 0x00000005: // HexTile encoded rectangle
- if((dx + w > c->width) || (dy + h > c->height)) {
- av_log(avctx, AV_LOG_ERROR, "Incorrect frame size: %ix%i+%ix%i of %ix%i\n", w, h, dx, dy, c->width, c->height);
- return -1;
+ if ((dx + w > c->width) || (dy + h > c->height)) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Incorrect frame size: %ix%i+%ix%i of %ix%i\n",
+ w, h, dx, dy, c->width, c->height);
+ return AVERROR_INVALIDDATA;
 }
- res = decode_hextile(c, outptr, src, size_left, w, h, c->pic.linesize[0]);
- if(res < 0)
- return -1;
- src += res;
+ res = decode_hextile(c, outptr, gb, w, h, c->pic->linesize[0]);
+ if (res < 0)
+ return res;
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "Unsupported block type 0x%08X\n", enc);
 chunks = 0; // leave chunks decoding loop
 }
 }
- if(c->screendta){
+ if (c->screendta) {
 int i;
- //save screen data before painting cursor
+ // save screen data before painting cursor
 w = c->cur_w;
- if(c->width < c->cur_x + w) w = c->width - c->cur_x;
+ if (c->width < c->cur_x + w)
+ w = c->width - c->cur_x;
 h = c->cur_h;
- if(c->height < c->cur_y + h) h = c->height - c->cur_y;
+ if (c->height < c->cur_y + h)
+ h = c->height - c->cur_y;
 dx = c->cur_x;
- if(dx < 0) {
+ if (dx < 0) {
 w += dx;
 dx = 0;
 }
 dy = c->cur_y;
- if(dy < 0) {
+ if (dy < 0) {
 h += dy;
 dy = 0;
 }
- if((w > 0) && (h > 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 += c->pic.linesize[0];
+ if ((w > 0) && (h > 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 += c->pic->linesize[0];
 }
- outptr = c->pic.data[0];
- put_cursor(outptr, c->pic.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;
- *(AVFrame*)data = c->pic;
+ *got_frame = 1;
+ if ((ret = av_frame_ref(data, c->pic)) < 0)
+ return ret;
 
 /* always report that the buffer was completely consumed */
 return buf_size;
 }
 
-
-
-/*
- *
- * Init VMnc decoder
- *
- */
 static av_cold int decode_init(AVCodecContext *avctx)
 {
 VmncContext * const c = avctx->priv_data;
 
- c->avctx = avctx;
-
- c->width = avctx->width;
+ c->avctx = avctx;
+ c->width = avctx->width;
 c->height = avctx->height;
+ c->bpp = avctx->bits_per_coded_sample;
+ c->bpp2 = c->bpp / 8;
 
- c->bpp = avctx->bits_per_coded_sample;
- c->bpp2 = c->bpp/8;
-
- switch(c->bpp){
+ switch (c->bpp) {
 case 8:
 avctx->pix_fmt = AV_PIX_FMT_PAL8;
 break;
@@ -488,22 +532,18 @@
 return AVERROR_INVALIDDATA;
 }
 
+ c->pic = av_frame_alloc();
+ if (!c->pic)
+ return AVERROR(ENOMEM);
+
 return 0;
 }
 
-
-
-/*
- *
- * Uninit VMnc decoder
- *
- */
 static av_cold int decode_end(AVCodecContext *avctx)
 {
 VmncContext * const c = avctx->priv_data;
 
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
+ av_frame_free(&c->pic);
 
 av_free(c->curbits);
 av_free(c->curmask);
@@ -513,6 +553,7 @@
 
 AVCodec ff_vmnc_decoder = {
 .name = "vmnc",
+ .long_name = NULL_IF_CONFIG_SMALL("VMware Screen Codec / VMware Video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_VMNC,
 .priv_data_size = sizeof(VmncContext),
@@ -520,5 +561,4 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("VMware Screen Codec / VMware Video"),
 };

libav-v9.6.tar.bz2/libavcodec/vorbis.c -> libav-v10.1.tar.bz2/libavcodec/vorbis.c Changed

libav-v9.6.tar.bz2/libavcodec/vorbis.h -> libav-v10.1.tar.bz2/libavcodec/vorbis.h Changed

libav-v9.6.tar.bz2/libavcodec/vorbis_data.c -> libav-v10.1.tar.bz2/libavcodec/vorbis_data.c Changed

libav-v9.6.tar.bz2/libavcodec/vorbis_parser.c -> libav-v10.1.tar.bz2/libavcodec/vorbis_parser.c Changed

libav-v9.6.tar.bz2/libavcodec/vorbisdec.c -> libav-v10.1.tar.bz2/libavcodec/vorbisdec.c Changed

@@ -29,12 +29,12 @@
 #include "libavutil/float_dsp.h"
 #include "avcodec.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "fft.h"
 #include "fmtconvert.h"
 #include "internal.h"
 
 #include "vorbis.h"
+#include "vorbisdsp.h"
 #include "xiph.h"
 
 #define V_NB_BITS 8
@@ -42,9 +42,6 @@
 #define V_MAX_VLCS (1 << 16)
 #define V_MAX_PARTITIONS (1 << 20)
 
-#undef NDEBUG
-#include <assert.h>
-
 typedef struct {
 uint8_t dimensions;
 uint8_t lookup_type;
@@ -122,10 +119,9 @@
 } vorbis_mode;
 
 typedef struct vorbis_context_s {
- AVCodecContext *avccontext;
- AVFrame frame;
+ AVCodecContext *avctx;
 GetBitContext gb;
- DSPContext dsp;
+ VorbisDSPContext dsp;
 AVFloatDSPContext fdsp;
 FmtConvertContext fmt_conv;
 
@@ -163,7 +159,7 @@
 static const char idx_err_str[] = "Index value %d out of range (0 - %d) for %s at %s:%i\n";
 #define VALIDATE_INDEX(idx, limit) \
 if (idx >= limit) {\
- av_log(vc->avccontext, AV_LOG_ERROR,\
+ av_log(vc->avctx, AV_LOG_ERROR,\
 idx_err_str,\
 (int)(idx), (int)(limit - 1), #idx, __FILE__, __LINE__);\
 return AVERROR_INVALIDDATA;\
@@ -234,10 +230,10 @@
 static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc)
 {
 unsigned cb;
- uint8_t *tmp_vlc_bits;
- uint32_t *tmp_vlc_codes;
+ uint8_t *tmp_vlc_bits = NULL;
+ uint32_t *tmp_vlc_codes = NULL;
 GetBitContext *gb = &vc->gb;
- uint16_t *codebook_multiplicands;
+ uint16_t *codebook_multiplicands = NULL;
 int ret = 0;
 
 vc->codebook_count = get_bits(gb, 8) + 1;
@@ -248,6 +244,11 @@
 tmp_vlc_bits = av_mallocz(V_MAX_VLCS * sizeof(*tmp_vlc_bits));
 tmp_vlc_codes = av_mallocz(V_MAX_VLCS * sizeof(*tmp_vlc_codes));
 codebook_multiplicands = av_malloc(V_MAX_VLCS * sizeof(*codebook_multiplicands));
+ if (!vc->codebooks ||
+ !tmp_vlc_bits || !tmp_vlc_codes || !codebook_multiplicands) {
+ ret = AVERROR(ENOMEM);
+ goto error;
+ }
 
 for (cb = 0; cb < vc->codebook_count; ++cb) {
 vorbis_codebook *codebook_setup = &vc->codebooks[cb];
@@ -256,7 +257,7 @@
 av_dlog(NULL, " %u. Codebook\n", cb);
 
 if (get_bits(gb, 24) != 0x564342) {
- av_log(vc->avccontext, AV_LOG_ERROR,
+ av_log(vc->avctx, AV_LOG_ERROR,
 " %u. Codebook setup data corrupt.\n", cb);
 ret = AVERROR_INVALIDDATA;
 goto error;
@@ -264,7 +265,7 @@
 
 codebook_setup->dimensions=get_bits(gb, 16);
 if (codebook_setup->dimensions > 16 || codebook_setup->dimensions == 0) {
- av_log(vc->avccontext, AV_LOG_ERROR,
+ av_log(vc->avctx, AV_LOG_ERROR,
 " %u. Codebook's dimension is invalid (%d).\n",
 cb, codebook_setup->dimensions);
 ret = AVERROR_INVALIDDATA;
@@ -272,7 +273,7 @@
 }
 entries = get_bits(gb, 24);
 if (entries > V_MAX_VLCS) {
- av_log(vc->avccontext, AV_LOG_ERROR,
+ av_log(vc->avctx, AV_LOG_ERROR,
 " %u. Codebook has too many entries (%u).\n",
 cb, entries);
 ret = AVERROR_INVALIDDATA;
@@ -332,7 +333,7 @@
 current_entry+=number;
 }
 if (current_entry>used_entries) {
- av_log(vc->avccontext, AV_LOG_ERROR, " More codelengths than codes in codebook. \n");
+ av_log(vc->avctx, AV_LOG_ERROR, " More codelengths than codes in codebook. \n");
 ret = AVERROR_INVALIDDATA;
 goto error;
 }
@@ -379,7 +380,7 @@
 float last = 0.0;
 unsigned lookup_offset = i;
 
- av_dlog(vc->avccontext, "Lookup offset %u ,", i);
+ av_dlog(vc->avctx, "Lookup offset %u ,", i);
 
 for (k = 0; k < dim; ++k) {
 unsigned multiplicand_offset = lookup_offset % codebook_lookup_values;
@@ -390,30 +391,30 @@
 }
 tmp_vlc_bits[j] = tmp_vlc_bits[i];
 
- av_dlog(vc->avccontext, "real lookup offset %u, vector: ", j);
+ av_dlog(vc->avctx, "real lookup offset %u, vector: ", j);
 for (k = 0; k < dim; ++k)
- av_dlog(vc->avccontext, " %f ",
+ av_dlog(vc->avctx, " %f ",
 codebook_setup->codevectors[j * dim + k]);
- av_dlog(vc->avccontext, "\n");
+ av_dlog(vc->avctx, "\n");
 
 ++j;
 }
 }
 if (j != used_entries) {
- av_log(vc->avccontext, AV_LOG_ERROR, "Bug in codevector vector building code. \n");
+ av_log(vc->avctx, AV_LOG_ERROR, "Bug in codevector vector building code. \n");
 ret = AVERROR_INVALIDDATA;
 goto error;
 }
 entries = used_entries;
 } else if (codebook_setup->lookup_type >= 2) {
- av_log(vc->avccontext, AV_LOG_ERROR, "Codebook lookup type not supported. \n");
+ av_log(vc->avctx, AV_LOG_ERROR, "Codebook lookup type not supported. \n");
 ret = AVERROR_INVALIDDATA;
 goto error;
 }
 
 // Initialize VLC table
 if (ff_vorbis_len2vlc(tmp_vlc_bits, tmp_vlc_codes, entries)) {
- av_log(vc->avccontext, AV_LOG_ERROR, " Invalid code lengths while generating vlcs. \n");
+ av_log(vc->avctx, AV_LOG_ERROR, " Invalid code lengths while generating vlcs. \n");
 ret = AVERROR_INVALIDDATA;
 goto error;
 }
@@ -434,7 +435,7 @@
 sizeof(*tmp_vlc_bits), tmp_vlc_codes,
 sizeof(*tmp_vlc_codes), sizeof(*tmp_vlc_codes),
 INIT_VLC_LE))) {
- av_log(vc->avccontext, AV_LOG_ERROR, " Error generating vlc tables. \n");
+ av_log(vc->avctx, AV_LOG_ERROR, " Error generating vlc tables. \n");
 goto error;
 }
 }
@@ -466,7 +467,7 @@
 vorbis_time_count, vorbis_tdtransform);
 
 if (vorbis_tdtransform) {
- av_log(vc->avccontext, AV_LOG_ERROR, "Vorbis time domain transform data nonzero. \n");
+ av_log(vc->avctx, AV_LOG_ERROR, "Vorbis time domain transform data nonzero. \n");
 return AVERROR_INVALIDDATA;
 }
 }
@@ -477,17 +478,19 @@
 
 static int vorbis_floor0_decode(vorbis_context *vc,
 vorbis_floor_data *vfu, float *vec);
-static void create_map(vorbis_context *vc, unsigned floor_number);
+static int create_map(vorbis_context *vc, unsigned floor_number);
 static int vorbis_floor1_decode(vorbis_context *vc,
 vorbis_floor_data *vfu, float *vec);
 static int vorbis_parse_setup_hdr_floors(vorbis_context *vc)
 {
 GetBitContext *gb = &vc->gb;
- int i,j,k;
+ int i, j, k, ret;
 
 vc->floor_count = get_bits(gb, 6) + 1;
 
 vc->floors = av_mallocz(vc->floor_count * sizeof(*vc->floors));
+ if (!vc->floors)
+ return AVERROR(ENOMEM);
 
 for (i = 0; i < vc->floor_count; ++i) {
 vorbis_floor *floor_setup = &vc->floors[i];
@@ -551,12 +554,13 @@
 
 floor_setup->data.t1.list = av_mallocz(floor_setup->data.t1.x_list_dim *
 sizeof(*floor_setup->data.t1.list));
-
+ if (!floor_setup->data.t1.list)
+ return AVERROR(ENOMEM);
 
 rangebits = get_bits(gb, 4);
 rangemax = (1 << rangebits);
 if (rangemax > vc->blocksize[1] / 2) {
- av_log(vc->avccontext, AV_LOG_ERROR,
+ av_log(vc->avctx, AV_LOG_ERROR,
 "Floor value is too large for blocksize: %u (%"PRIu32")\n",
 rangemax, vc->blocksize[1] / 2);
 return AVERROR_INVALIDDATA;
@@ -574,7 +578,7 @@
 }
 
 // Precalculate order of x coordinates - needed for decode
- if (ff_vorbis_ready_floor1_list(vc->avccontext,
+ if (ff_vorbis_ready_floor1_list(vc->avctx,
 floor_setup->data.t1.list,
 floor_setup->data.t1.x_list_dim)) {
 return AVERROR_INVALIDDATA;
@@ -586,19 +590,17 @@
 
 floor_setup->data.t0.order = get_bits(gb, 8);
 if (!floor_setup->data.t0.order) {
- av_log(vc->avccontext, AV_LOG_ERROR,
- "Floor 0 order is 0.\n");
+ av_log(vc->avctx, AV_LOG_ERROR, "Floor 0 order is 0.\n");
 return AVERROR_INVALIDDATA;
 }
 floor_setup->data.t0.rate = get_bits(gb, 16);
 if (!floor_setup->data.t0.rate) {
- av_log(vc->avccontext, AV_LOG_ERROR,
- "Floor 0 rate is 0.\n");
+ av_log(vc->avctx, AV_LOG_ERROR, "Floor 0 rate is 0.\n");
 return AVERROR_INVALIDDATA;
 }
 floor_setup->data.t0.bark_map_size = get_bits(gb, 16);
- if (floor_setup->data.t0.bark_map_size == 0) {
- av_log(vc->avccontext, AV_LOG_ERROR,
+ if (!floor_setup->data.t0.bark_map_size) {
+ av_log(vc->avctx, AV_LOG_ERROR,
 "Floor 0 bark map size is 0.\n");
 return AVERROR_INVALIDDATA;
 }
@@ -623,7 +625,8 @@
 }
 }
 
- create_map(vc, i);
+ if ((ret = create_map(vc, i)) < 0)
+ return ret;
 
 /* codebook dim is for padding if codebook dim doesn't *
 * divide order+1 then we need to read more data */
@@ -654,7 +657,7 @@
 }
 }
 } else {
- av_log(vc->avccontext, AV_LOG_ERROR, "Invalid floor type!\n");
+ av_log(vc->avctx, AV_LOG_ERROR, "Invalid floor type!\n");
 return AVERROR_INVALIDDATA;
 }
 }
@@ -670,6 +673,8 @@
 
 vc->residue_count = get_bits(gb, 6)+1;
 vc->residues = av_mallocz(vc->residue_count * sizeof(*vc->residues));
+ if (!vc->residues)
+ return AVERROR(ENOMEM);
 
 av_dlog(NULL, " There are %d residues. \n", vc->residue_count);
 
@@ -687,9 +692,9 @@
 res_setup->partition_size = get_bits(gb, 24) + 1;
 /* Validations to prevent a buffer overflow later. */
 if (res_setup->begin>res_setup->end ||
- res_setup->end > (res_setup->type == 2 ? vc->avccontext->channels : 1) * vc->blocksize[1] / 2 ||
+ res_setup->end > (res_setup->type == 2 ? vc->avctx->channels : 1) * vc->blocksize[1] / 2 ||
 (res_setup->end-res_setup->begin) / res_setup->partition_size > V_MAX_PARTITIONS) {
- av_log(vc->avccontext, AV_LOG_ERROR,
+ av_log(vc->avctx, AV_LOG_ERROR,
 "partition out of bounds: type, begin, end, size, blocksize: %"PRIu16", %"PRIu32", %"PRIu32", %u, %"PRIu32"\n",
 res_setup->type, res_setup->begin, res_setup->end,
 res_setup->partition_size, vc->blocksize[1] / 2);
@@ -750,6 +755,8 @@
 
 vc->mapping_count = get_bits(gb, 6)+1;
 vc->mappings = av_mallocz(vc->mapping_count * sizeof(*vc->mappings));
+ if (!vc->mappings)
+ return AVERROR(ENOMEM);
 
 av_dlog(NULL, " There are %d mappings. \n", vc->mapping_count);
 
@@ -757,7 +764,7 @@
 vorbis_mapping *mapping_setup = &vc->mappings[i];
 
 if (get_bits(gb, 16)) {
- av_log(vc->avccontext, AV_LOG_ERROR, "Other mappings than type 0 are not compliant with the Vorbis I specification. \n");
+ av_log(vc->avctx, AV_LOG_ERROR, "Other mappings than type 0 are not compliant with the Vorbis I specification. \n");
 return AVERROR_INVALIDDATA;
 }
 if (get_bits1(gb)) {
@@ -772,6 +779,9 @@
 sizeof(*mapping_setup->magnitude));
 mapping_setup->angle = av_mallocz(mapping_setup->coupling_steps *
 sizeof(*mapping_setup->angle));
+ if (!mapping_setup->angle || !mapping_setup->magnitude)
+ return AVERROR(ENOMEM);
+
 for (j = 0; j < mapping_setup->coupling_steps; ++j) {
 GET_VALIDATED_INDEX(mapping_setup->magnitude[j], ilog(vc->audio_channels - 1), vc->audio_channels)
 GET_VALIDATED_INDEX(mapping_setup->angle[j], ilog(vc->audio_channels - 1), vc->audio_channels)
@@ -784,13 +794,16 @@
 i, mapping_setup->coupling_steps);
 
 if (get_bits(gb, 2)) {
- av_log(vc->avccontext, AV_LOG_ERROR, "%u. mapping setup data invalid.\n", i);
+ av_log(vc->avctx, AV_LOG_ERROR, "%u. mapping setup data invalid.\n", i);
 return AVERROR_INVALIDDATA; // following spec.
 }
 
 if (mapping_setup->submaps>1) {
 mapping_setup->mux = av_mallocz(vc->audio_channels *
 sizeof(*mapping_setup->mux));
+ if (!mapping_setup->mux)
+ return AVERROR(ENOMEM);
+
 for (j = 0; j < vc->audio_channels; ++j)
 mapping_setup->mux[j] = get_bits(gb, 4);
 }
@@ -810,7 +823,7 @@
 
 // Process modes part
 
-static void create_map(vorbis_context *vc, unsigned floor_number)
+static int create_map(vorbis_context *vc, unsigned floor_number)
 {
 vorbis_floor *floors = vc->floors;
 vorbis_floor0 *vf;
@@ -822,6 +835,8 @@
 n = vc->blocksize[blockflag] / 2;
 floors[floor_number].data.t0.map[blockflag] =
 av_malloc((n + 1) * sizeof(int32_t)); // n + sentinel
+ if (!floors[floor_number].data.t0.map[blockflag])
+ return AVERROR(ENOMEM);
 
 map = floors[floor_number].data.t0.map[blockflag];
 vf = &floors[floor_number].data.t0;
@@ -839,6 +854,8 @@
 for (idx = 0; idx <= n; ++idx) {
 av_dlog(NULL, "floor0 map: map at pos %d is %d\n", idx, map[idx]);
 }
+
+ return 0;
 }
 
 static int vorbis_parse_setup_hdr_modes(vorbis_context *vc)
@@ -848,6 +865,8 @@
 
 vc->mode_count = get_bits(gb, 6) + 1;
 vc->modes = av_mallocz(vc->mode_count * sizeof(*vc->modes));
+ if (!vc->modes)
+ return AVERROR(ENOMEM);
 
 av_dlog(NULL, " There are %d modes.\n", vc->mode_count);
 
@@ -876,36 +895,36 @@
 if ((get_bits(gb, 8) != 'v') || (get_bits(gb, 8) != 'o') ||
 (get_bits(gb, 8) != 'r') || (get_bits(gb, 8) != 'b') ||
 (get_bits(gb, 8) != 'i') || (get_bits(gb, 8) != 's')) {
- av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (no vorbis signature). \n");
+ av_log(vc->avctx, AV_LOG_ERROR, " Vorbis setup header packet corrupt (no vorbis signature). \n");
 return AVERROR_INVALIDDATA;
 }
 
 if ((ret = vorbis_parse_setup_hdr_codebooks(vc))) {
- av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (codebooks). \n");
+ av_log(vc->avctx, AV_LOG_ERROR, " Vorbis setup header packet corrupt (codebooks). \n");
 return ret;
 }
 if ((ret = vorbis_parse_setup_hdr_tdtransforms(vc))) {
- av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (time domain transforms). \n");
+ av_log(vc->avctx, AV_LOG_ERROR, " Vorbis setup header packet corrupt (time domain transforms). \n");
 return ret;
 }
 if ((ret = vorbis_parse_setup_hdr_floors(vc))) {
- av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (floors). \n");
+ av_log(vc->avctx, AV_LOG_ERROR, " Vorbis setup header packet corrupt (floors). \n");
 return ret;
 }
 if ((ret = vorbis_parse_setup_hdr_residues(vc))) {
- av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (residues). \n");
+ av_log(vc->avctx, AV_LOG_ERROR, " Vorbis setup header packet corrupt (residues). \n");
 return ret;
 }
 if ((ret = vorbis_parse_setup_hdr_mappings(vc))) {
- av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (mappings). \n");
+ av_log(vc->avctx, AV_LOG_ERROR, " Vorbis setup header packet corrupt (mappings). \n");
 return ret;
 }
 if ((ret = vorbis_parse_setup_hdr_modes(vc))) {
- av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (modes). \n");
+ av_log(vc->avctx, AV_LOG_ERROR, " Vorbis setup header packet corrupt (modes). \n");
 return ret;
 }
 if (!get_bits1(gb)) {
- av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (framing flag). \n");
+ av_log(vc->avctx, AV_LOG_ERROR, " Vorbis setup header packet corrupt (framing flag). \n");
 return AVERROR_INVALIDDATA; // framing flag bit unset error
 }
 
@@ -922,19 +941,19 @@
 if ((get_bits(gb, 8) != 'v') || (get_bits(gb, 8) != 'o') ||
 (get_bits(gb, 8) != 'r') || (get_bits(gb, 8) != 'b') ||
 (get_bits(gb, 8) != 'i') || (get_bits(gb, 8) != 's')) {
- av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (no vorbis signature). \n");
+ av_log(vc->avctx, AV_LOG_ERROR, " Vorbis id header packet corrupt (no vorbis signature). \n");
 return AVERROR_INVALIDDATA;
 }
 
 vc->version = get_bits_long(gb, 32); //FIXME check 0
 vc->audio_channels = get_bits(gb, 8);
 if (vc->audio_channels <= 0) {
- av_log(vc->avccontext, AV_LOG_ERROR, "Invalid number of channels\n");
+ av_log(vc->avctx, AV_LOG_ERROR, "Invalid number of channels\n");
 return AVERROR_INVALIDDATA;
 }
 vc->audio_samplerate = get_bits_long(gb, 32);
 if (vc->audio_samplerate <= 0) {
- av_log(vc->avccontext, AV_LOG_ERROR, "Invalid samplerate\n");
+ av_log(vc->avctx, AV_LOG_ERROR, "Invalid samplerate\n");
 return AVERROR_INVALIDDATA;
 }
 vc->bitrate_maximum = get_bits_long(gb, 32);
@@ -945,19 +964,22 @@
 vc->blocksize[0] = (1 << bl0);
 vc->blocksize[1] = (1 << bl1);
 if (bl0 > 13 || bl0 < 6 || bl1 > 13 || bl1 < 6 || bl1 < bl0) {
- av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (illegal blocksize). \n");
+ av_log(vc->avctx, AV_LOG_ERROR, " Vorbis id header packet corrupt (illegal blocksize). \n");
 return AVERROR_INVALIDDATA;
 }
 vc->win[0] = ff_vorbis_vwin[bl0 - 6];
 vc->win[1] = ff_vorbis_vwin[bl1 - 6];
 
 if ((get_bits1(gb)) == 0) {
- av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (framing flag not set). \n");
+ av_log(vc->avctx, AV_LOG_ERROR, " Vorbis id header packet corrupt (framing flag not set). \n");
 return AVERROR_INVALIDDATA;
 }
 
 vc->channel_residues = av_malloc((vc->blocksize[1] / 2) * vc->audio_channels * sizeof(*vc->channel_residues));
 vc->saved = av_mallocz((vc->blocksize[1] / 4) * vc->audio_channels * sizeof(*vc->saved));
+ if (!vc->channel_residues || !vc->saved)
+ return AVERROR(ENOMEM);
+
 vc->previous_window = 0;
 
 ff_mdct_init(&vc->mdct[0], bl0, 1, -1.0);
@@ -978,41 +1000,41 @@
 
 // Process the extradata using the functions above (identification header, setup header)
 
-static av_cold int vorbis_decode_init(AVCodecContext *avccontext)
+static av_cold int vorbis_decode_init(AVCodecContext *avctx)
 {
- vorbis_context *vc = avccontext->priv_data;
- uint8_t *headers = avccontext->extradata;
- int headers_len = avccontext->extradata_size;
+ vorbis_context *vc = avctx->priv_data;
+ uint8_t *headers = avctx->extradata;
+ int headers_len = avctx->extradata_size;
 uint8_t *header_start[3];
 int header_len[3];
 GetBitContext *gb = &vc->gb;
 int hdr_type, ret;
 
- vc->avccontext = avccontext;
- ff_dsputil_init(&vc->dsp, avccontext);
- avpriv_float_dsp_init(&vc->fdsp, avccontext->flags & CODEC_FLAG_BITEXACT);
- ff_fmt_convert_init(&vc->fmt_conv, avccontext);
+ vc->avctx = avctx;
+ ff_vorbisdsp_init(&vc->dsp);
+ avpriv_float_dsp_init(&vc->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
+ ff_fmt_convert_init(&vc->fmt_conv, avctx);
 
- avccontext->sample_fmt = AV_SAMPLE_FMT_FLTP;
+ avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
 
 if (!headers_len) {
- av_log(avccontext, AV_LOG_ERROR, "Extradata missing.\n");
+ av_log(avctx, AV_LOG_ERROR, "Extradata missing.\n");
 return AVERROR_INVALIDDATA;
 }
 
 if ((ret = avpriv_split_xiph_headers(headers, headers_len, 30, header_start, header_len)) < 0) {
- av_log(avccontext, AV_LOG_ERROR, "Extradata corrupt.\n");
+ av_log(avctx, AV_LOG_ERROR, "Extradata corrupt.\n");
 return ret;
 }
 
 init_get_bits(gb, header_start[0], header_len[0]*8);
 hdr_type = get_bits(gb, 8);
 if (hdr_type != 1) {
- av_log(avccontext, AV_LOG_ERROR, "First header is not the id header.\n");
+ av_log(avctx, AV_LOG_ERROR, "First header is not the id header.\n");
 return AVERROR_INVALIDDATA;
 }
 if ((ret = vorbis_parse_id_hdr(vc))) {
- av_log(avccontext, AV_LOG_ERROR, "Id header corrupt.\n");
+ av_log(avctx, AV_LOG_ERROR, "Id header corrupt.\n");
 vorbis_free(vc);
 return ret;
 }
@@ -1020,26 +1042,23 @@
 init_get_bits(gb, header_start[2], header_len[2]*8);
 hdr_type = get_bits(gb, 8);
 if (hdr_type != 5) {
- av_log(avccontext, AV_LOG_ERROR, "Third header is not the setup header.\n");
+ av_log(avctx, AV_LOG_ERROR, "Third header is not the setup header.\n");
 vorbis_free(vc);
 return AVERROR_INVALIDDATA;
 }
 if ((ret = vorbis_parse_setup_hdr(vc))) {
- av_log(avccontext, AV_LOG_ERROR, "Setup header corrupt.\n");
+ av_log(avctx, AV_LOG_ERROR, "Setup header corrupt.\n");
 vorbis_free(vc);
 return ret;
 }
 
 if (vc->audio_channels > 8)
- avccontext->channel_layout = 0;
+ avctx->channel_layout = 0;
 else
- avccontext->channel_layout = ff_vorbis_channel_layouts[vc->audio_channels - 1];
+ avctx->channel_layout = ff_vorbis_channel_layouts[vc->audio_channels - 1];
 
- avccontext->channels = vc->audio_channels;
- avccontext->sample_rate = vc->audio_samplerate;
-
- avcodec_get_frame_defaults(&vc->frame);
- avccontext->coded_frame = &vc->frame;
+ avctx->channels = vc->audio_channels;
+ avctx->sample_rate = vc->audio_samplerate;
 
 return 0;
 }
@@ -1067,8 +1086,7 @@
 
 book_idx = get_bits(&vc->gb, ilog(vf->num_books));
 if (book_idx >= vf->num_books) {
- av_log(vc->avccontext, AV_LOG_ERROR,
- "floor0 dec: booknumber too high!\n");
+ av_log(vc->avctx, AV_LOG_ERROR, "floor0 dec: booknumber too high!\n");
 book_idx = 0;
 }
 av_dlog(NULL, "floor0 dec: booknumber: %u\n", book_idx);
@@ -1281,6 +1299,45 @@
 return 0;
 }
 
+static av_always_inline int setup_classifs(vorbis_context *vc,
+ vorbis_residue *vr,
+ uint8_t *do_not_decode,
+ unsigned ch_used,
+ int partition_count)
+{
+ int p, j, i;
+ unsigned c_p_c = vc->codebooks[vr->classbook].dimensions;
+ unsigned inverse_class = ff_inverse[vr->classifications];
+ unsigned temp, temp2;
+ for (p = 0, j = 0; j < ch_used; ++j) {
+ if (!do_not_decode[j]) {
+ temp = get_vlc2(&vc->gb, vc->codebooks[vr->classbook].vlc.table,
+ vc->codebooks[vr->classbook].nb_bits, 3);
+
+ av_dlog(NULL, "Classword: %u\n", temp);
+
+ if (temp <= 65536) {
+ for (i = partition_count + c_p_c - 1; i >= partition_count; i--) {
+ temp2 = (((uint64_t)temp) * inverse_class) >> 32;
+
+ if (i < vr->ptns_to_read)
+ vr->classifs[p + i] = temp - temp2 * vr->classifications;
+ temp = temp2;
+ }
+ } else {
+ for (i = partition_count + c_p_c - 1; i >= partition_count; i--) {
+ temp2 = temp / vr->classifications;
+
+ if (i < vr->ptns_to_read)
+ vr->classifs[p + i] = temp - temp2 * vr->classifications;
+ temp = temp2;
+ }
+ }
+ }
+ p += vr->ptns_to_read;
+ }
+ return 0;
+}
 // Read and decode residue
 
 static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc,
@@ -1294,10 +1351,10 @@
 {
 GetBitContext *gb = &vc->gb;
 unsigned c_p_c = vc->codebooks[vr->classbook].dimensions;
- unsigned ptns_to_read = vr->ptns_to_read;
 uint8_t *classifs = vr->classifs;
 unsigned pass, ch_used, i, j, k, l;
 unsigned max_output = (ch - 1) * vlen;
+ int ptns_to_read = vr->ptns_to_read;
 
 if (vr_type == 2) {
 for (j = 1; j < ch; ++j)
@@ -1312,38 +1369,19 @@
 }
 
 if (max_output > ch_left * vlen) {
- av_log(vc->avccontext, AV_LOG_ERROR, "Insufficient output buffer\n");
- return -1;
+ av_log(vc->avctx, AV_LOG_ERROR, "Insufficient output buffer\n");
+ return AVERROR_INVALIDDATA;
 }
 
 av_dlog(NULL, " residue type 0/1/2 decode begin, ch: %d cpc %d \n", ch, c_p_c);
 
 for (pass = 0; pass <= vr->maxpass; ++pass) { // FIXME OPTIMIZE?
- uint16_t voffset, partition_count, j_times_ptns_to_read;
+ int voffset, partition_count, j_times_ptns_to_read;
 
 voffset = vr->begin;
 for (partition_count = 0; partition_count < ptns_to_read;) { // SPEC error
 if (!pass) {
- unsigned inverse_class = ff_inverse[vr->classifications];
- for (j_times_ptns_to_read = 0, j = 0; j < ch_used; ++j) {
- if (!do_not_decode[j]) {
- unsigned temp = get_vlc2(gb, vc->codebooks[vr->classbook].vlc.table,
- vc->codebooks[vr->classbook].nb_bits, 3);
-
- av_dlog(NULL, "Classword: %u\n", temp);
-
- assert(vr->classifications > 1 && temp <= 65536); //needed for inverse[]
- for (i = 0; i < c_p_c; ++i) {
- unsigned temp2;
-
- temp2 = (((uint64_t)temp) * inverse_class) >> 32;
- if (partition_count + c_p_c - 1 - i < ptns_to_read)
- classifs[j_times_ptns_to_read + partition_count + c_p_c - 1 - i] = temp - temp2 * vr->classifications;
- temp = temp2;
- }
- }
- j_times_ptns_to_read += ptns_to_read;
- }
+ setup_classifs(vc, vr, do_not_decode, ch_used, partition_count);
 }
 for (i = 0; (i < c_p_c) && (partition_count < ptns_to_read); ++i) {
 for (j_times_ptns_to_read = 0, j = 0; j < ch_used; ++j) {
@@ -1456,12 +1494,12 @@
 else if (vr->type == 0)
 return vorbis_residue_decode_internal(vc, vr, ch, do_not_decode, vec, vlen, ch_left, 0);
 else {
- av_log(vc->avccontext, AV_LOG_ERROR, " Invalid residue type while residue decode?! \n");
+ av_log(vc->avctx, AV_LOG_ERROR, " Invalid residue type while residue decode?! \n");
 return AVERROR_INVALIDDATA;
 }
 }
 
-void ff_vorbis_inverse_coupling(float *mag, float *ang, int blocksize)
+void ff_vorbis_inverse_coupling(float *mag, float *ang, intptr_t blocksize)
 {
 int i;
 for (i = 0; i < blocksize; i++) {
@@ -1505,7 +1543,7 @@
 unsigned vlen;
 
 if (get_bits1(gb)) {
- av_log(vc->avccontext, AV_LOG_ERROR, "Not a Vorbis I audio packet.\n");
+ av_log(vc->avctx, AV_LOG_ERROR, "Not a Vorbis I audio packet.\n");
 return AVERROR_INVALIDDATA; // packet type not audio
 }
 
@@ -1546,7 +1584,7 @@
 ret = floor->decode(vc, &floor->data, floor_ptr[i]);
 
 if (ret < 0) {
- av_log(vc->avccontext, AV_LOG_ERROR, "Invalid codebook in vorbis_floor_decode.\n");
+ av_log(vc->avctx, AV_LOG_ERROR, "Invalid codebook in vorbis_floor_decode.\n");
 return AVERROR_INVALIDDATA;
 }
 no_residue[i] = ret;
@@ -1582,8 +1620,8 @@
 }
 residue = &vc->residues[mapping->submap_residue[i]];
 if (ch_left < ch) {
- av_log(vc->avccontext, AV_LOG_ERROR, "Too many channels in vorbis_floor_decode.\n");
- return -1;
+ av_log(vc->avctx, AV_LOG_ERROR, "Too many channels in vorbis_floor_decode.\n");
+ return AVERROR_INVALIDDATA;
 }
 if (ch) {
 ret = vorbis_residue_decode(vc, residue, ch, do_not_decode, ch_res_ptr, vlen, ch_left);
@@ -1631,13 +1669,13 @@
 const float *win = vc->win[blockflag & previous_window];
 
 if (blockflag == previous_window) {
- vc->dsp.vector_fmul_window(ret, saved, buf, win, blocksize / 4);
+ vc->fdsp.vector_fmul_window(ret, saved, buf, win, blocksize / 4);
 } else if (blockflag > previous_window) {
- vc->dsp.vector_fmul_window(ret, saved, buf, win, bs0 / 4);
+ vc->fdsp.vector_fmul_window(ret, saved, buf, win, bs0 / 4);
 memcpy(ret+bs0/2, buf+bs0/4, ((bs1-bs0)/4) * sizeof(float));
 } else {
 memcpy(ret, saved, ((bs1 - bs0) / 4) * sizeof(float));
- vc->dsp.vector_fmul_window(ret + (bs1 - bs0) / 4, saved + (bs1 - bs0) / 4, buf, win, bs0 / 4);
+ vc->fdsp.vector_fmul_window(ret + (bs1 - bs0) / 4, saved + (bs1 - bs0) / 4, buf, win, bs0 / 4);
 }
 memcpy(saved, buf + blocksize / 4, blocksize / 4 * sizeof(float));
 }
@@ -1648,12 +1686,13 @@
 
 // Return the decoded audio packet through the standard api
 
-static int vorbis_decode_frame(AVCodecContext *avccontext, void *data,
+static int vorbis_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
- vorbis_context *vc = avccontext->priv_data;
+ vorbis_context *vc = avctx->priv_data;
+ AVFrame *frame = data;
 GetBitContext *gb = &vc->gb;
 float *channel_ptrs[255];
 int i, len, ret;
@@ -1661,19 +1700,19 @@
 av_dlog(NULL, "packet length %d \n", buf_size);
 
 /* get output buffer */
- vc->frame.nb_samples = vc->blocksize[1] / 2;
- if ((ret = ff_get_buffer(avccontext, &vc->frame)) < 0) {
- av_log(avccontext, AV_LOG_ERROR, "get_buffer() failed\n");
+ frame->nb_samples = vc->blocksize[1] / 2;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
 
 if (vc->audio_channels > 8) {
 for (i = 0; i < vc->audio_channels; i++)
- channel_ptrs[i] = (float *)vc->frame.extended_data[i];
+ channel_ptrs[i] = (float *)frame->extended_data[i];
 } else {
 for (i = 0; i < vc->audio_channels; i++) {
 int ch = ff_vorbis_channel_layout_offsets[vc->audio_channels - 1][i];
- channel_ptrs[ch] = (float *)vc->frame.extended_data[i];
+ channel_ptrs[ch] = (float *)frame->extended_data[i];
 }
 }
 
@@ -1685,33 +1724,33 @@
 if (!vc->first_frame) {
 vc->first_frame = 1;
 *got_frame_ptr = 0;
+ av_frame_unref(frame);
 return buf_size;
 }
 
 av_dlog(NULL, "parsed %d bytes %d bits, returned %d samples (*ch*bits) \n",
 get_bits_count(gb) / 8, get_bits_count(gb) % 8, len);
 
- vc->frame.nb_samples = len;
- *got_frame_ptr = 1;
- *(AVFrame *)data = vc->frame;
+ frame->nb_samples = len;
+ *got_frame_ptr = 1;
 
 return buf_size;
 }
 
 // Close decoder
 
-static av_cold int vorbis_decode_close(AVCodecContext *avccontext)
+static av_cold int vorbis_decode_close(AVCodecContext *avctx)
 {
- vorbis_context *vc = avccontext->priv_data;
+ vorbis_context *vc = avctx->priv_data;
 
 vorbis_free(vc);
 
 return 0;
 }
 
-static av_cold void vorbis_decode_flush(AVCodecContext *avccontext)
+static av_cold void vorbis_decode_flush(AVCodecContext *avctx)
 {
- vorbis_context *vc = avccontext->priv_data;
+ vorbis_context *vc = avctx->priv_data;
 
 if (vc->saved) {
 memset(vc->saved, 0, (vc->blocksize[1] / 4) * vc->audio_channels *
@@ -1722,6 +1761,7 @@
 
 AVCodec ff_vorbis_decoder = {
 .name = "vorbis",
+ .long_name = NULL_IF_CONFIG_SMALL("Vorbis"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_VORBIS,
 .priv_data_size = sizeof(vorbis_context),
@@ -1730,7 +1770,6 @@
 .decode = vorbis_decode_frame,
 .flush = vorbis_decode_flush,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Vorbis"),
 .channel_layouts = ff_vorbis_channel_layouts,
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_NONE },

libav-v10.1.tar.bz2/libavcodec/vorbisdsp.c Added

@@ -0,0 +1,34 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "libavutil/attributes.h"
+#include "vorbisdsp.h"
+#include "vorbis.h"
+
+av_cold void ff_vorbisdsp_init(VorbisDSPContext *dsp)
+{
+    dsp->vorbis_inverse_coupling = ff_vorbis_inverse_coupling;
+
+    if (ARCH_ARM)
+        ff_vorbisdsp_init_arm(dsp);
+    if (ARCH_PPC)
+        ff_vorbisdsp_init_ppc(dsp);
+    if (ARCH_X86)
+        ff_vorbisdsp_init_x86(dsp);
+}

libav-v10.1.tar.bz2/libavcodec/vorbisdsp.h Added

@@ -0,0 +1,37 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VORBISDSP_H
+#define AVCODEC_VORBISDSP_H
+
+#include <stdint.h>
+
+typedef struct VorbisDSPContext {
+ /* assume len is a multiple of 4, and arrays are 16-byte aligned */
+ void (*vorbis_inverse_coupling)(float *mag, float *ang,
+ intptr_t blocksize);
+} VorbisDSPContext;
+
+void ff_vorbisdsp_init(VorbisDSPContext *dsp);
+
+/* for internal use only */
+void ff_vorbisdsp_init_x86(VorbisDSPContext *dsp);
+void ff_vorbisdsp_init_arm(VorbisDSPContext *dsp);
+void ff_vorbisdsp_init_ppc(VorbisDSPContext *dsp);
+
+#endif /* AVCODEC_VORBISDSP_H */

libav-v9.6.tar.bz2/libavcodec/vorbisenc.c -> libav-v10.1.tar.bz2/libavcodec/vorbisenc.c Changed

@@ -26,7 +26,6 @@
 
 #include <float.h>
 #include "avcodec.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "fft.h"
 #include "vorbis.h"
@@ -190,7 +189,7 @@
 cb->pow2[i] += cb->dimensions[i * cb->ndimensions + j] * cb->dimensions[i * cb->ndimensions + j];
 div *= vals;
 }
- cb->pow2[i] /= 2.;
+ cb->pow2[i] /= 2.0;
 }
 }
 return 0;
@@ -236,15 +235,15 @@
 }
 
 static int create_vorbis_context(vorbis_enc_context *venc,
- AVCodecContext *avccontext)
+ AVCodecContext *avctx)
 {
 vorbis_enc_floor *fc;
 vorbis_enc_residue *rc;
 vorbis_enc_mapping *mc;
 int i, book, ret;
 
- venc->channels = avccontext->channels;
- venc->sample_rate = avccontext->sample_rate;
+ venc->channels = avctx->channels;
+ venc->sample_rate = avctx->sample_rate;
 venc->log2_blocksize[0] = venc->log2_blocksize[1] = 11;
 
 venc->ncodebooks = FF_ARRAY_ELEMS(cvectors);
@@ -340,7 +339,7 @@
 };
 fc->list[i].x = a[i - 2];
 }
- if (ff_vorbis_ready_floor1_list(avccontext, fc->list, fc->values))
+ if (ff_vorbis_ready_floor1_list(avctx, fc->list, fc->values))
 return AVERROR_BUG;
 
 venc->nresidues = 1;
@@ -729,7 +728,7 @@
 {
 int range = 255 / fc->multiplier + 1;
 int i;
- float tot_average = 0.;
+ float tot_average = 0.0;
 float averages[MAX_FLOOR_VALUES];
 for (i = 0; i < fc->values; i++) {
 averages[i] = get_floor_average(fc, coeffs, i);
@@ -882,7 +881,7 @@
 assert(rc->type == 2);
 assert(real_ch == 2);
 for (p = 0; p < partitions; p++) {
- float max1 = 0., max2 = 0.;
+ float max1 = 0.0, max2 = 0.0;
 int s = rc->begin + p * psize;
 for (k = s; k < s + psize; k += 2) {
 max1 = FFMAX(max1, fabs(coeffs[ k / real_ch]));
@@ -969,7 +968,7 @@
 int i, channel;
 const float * win = venc->win[0];
 int window_len = 1 << (venc->log2_blocksize[0] - 1);
- float n = (float)(1 << venc->log2_blocksize[0]) / 4.;
+ float n = (float)(1 << venc->log2_blocksize[0]) / 4.0;
 // FIXME use dsp
 
 if (!venc->have_saved && !samples)
@@ -1015,10 +1014,10 @@
 }
 
 
-static int vorbis_encode_frame(AVCodecContext *avccontext, AVPacket *avpkt,
+static int vorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
 const AVFrame *frame, int *got_packet_ptr)
 {
- vorbis_enc_context *venc = avccontext->priv_data;
+ vorbis_enc_context *venc = avctx->priv_data;
 float **audio = frame ? (float **)frame->extended_data : NULL;
 int samples = frame ? frame->nb_samples : 0;
 vorbis_enc_mode *mode;
@@ -1031,14 +1030,14 @@
 samples = 1 << (venc->log2_blocksize[0] - 1);
 
 if ((ret = ff_alloc_packet(avpkt, 8192))) {
- av_log(avccontext, AV_LOG_ERROR, "Error getting output packet\n");
+ av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n");
 return ret;
 }
 
 init_put_bits(&pb, avpkt->data, avpkt->size);
 
 if (pb.size_in_bits - put_bits_count(&pb) < 1 + ilog(venc->nmodes - 1)) {
- av_log(avccontext, AV_LOG_ERROR, "output buffer is too small\n");
+ av_log(avctx, AV_LOG_ERROR, "output buffer is too small\n");
 return AVERROR(EINVAL);
 }
 
@@ -1058,7 +1057,7 @@
 uint16_t posts[MAX_FLOOR_VALUES];
 floor_fit(venc, fc, &venc->coeffs[i * samples], posts, samples);
 if (floor_encode(venc, fc, &pb, posts, &venc->floor[i * samples], samples)) {
- av_log(avccontext, AV_LOG_ERROR, "output buffer is too small\n");
+ av_log(avctx, AV_LOG_ERROR, "output buffer is too small\n");
 return AVERROR(EINVAL);
 }
 }
@@ -1082,17 +1081,17 @@
 
 if (residue_encode(venc, &venc->residues[mapping->residue[mapping->mux[0]]],
 &pb, venc->coeffs, samples, venc->channels)) {
- av_log(avccontext, AV_LOG_ERROR, "output buffer is too small\n");
+ av_log(avctx, AV_LOG_ERROR, "output buffer is too small\n");
 return AVERROR(EINVAL);
 }
 
 flush_put_bits(&pb);
 avpkt->size = put_bits_count(&pb) >> 3;
 
- avpkt->duration = ff_samples_to_time_base(avccontext, avccontext->frame_size);
+ avpkt->duration = ff_samples_to_time_base(avctx, avctx->frame_size);
 if (frame)
 if (frame->pts != AV_NOPTS_VALUE)
- avpkt->pts = ff_samples_to_time_base(avccontext, frame->pts);
+ avpkt->pts = ff_samples_to_time_base(avctx, frame->pts);
 else
 avpkt->pts = venc->next_pts;
 if (avpkt->pts != AV_NOPTS_VALUE)
@@ -1103,9 +1102,9 @@
 }
 
 
-static av_cold int vorbis_encode_close(AVCodecContext *avccontext)
+static av_cold int vorbis_encode_close(AVCodecContext *avctx)
 {
- vorbis_enc_context *venc = avccontext->priv_data;
+ vorbis_enc_context *venc = avctx->priv_data;
 int i;
 
 if (venc->codebooks)
@@ -1157,56 +1156,46 @@
 ff_mdct_end(&venc->mdct[0]);
 ff_mdct_end(&venc->mdct[1]);
 
-#if FF_API_OLD_ENCODE_AUDIO
- av_freep(&avccontext->coded_frame);
-#endif
- av_freep(&avccontext->extradata);
+ av_freep(&avctx->extradata);
 
 return 0 ;
 }
 
-static av_cold int vorbis_encode_init(AVCodecContext *avccontext)
+static av_cold int vorbis_encode_init(AVCodecContext *avctx)
 {
- vorbis_enc_context *venc = avccontext->priv_data;
+ vorbis_enc_context *venc = avctx->priv_data;
 int ret;
 
- if (avccontext->channels != 2) {
- av_log(avccontext, AV_LOG_ERROR, "Current Libav Vorbis encoder only supports 2 channels.\n");
+ if (avctx->channels != 2) {
+ av_log(avctx, AV_LOG_ERROR, "Current Libav Vorbis encoder only supports 2 channels.\n");
 return -1;
 }
 
- if ((ret = create_vorbis_context(venc, avccontext)) < 0)
+ if ((ret = create_vorbis_context(venc, avctx)) < 0)
 goto error;
 
- avccontext->bit_rate = 0;
- if (avccontext->flags & CODEC_FLAG_QSCALE)
- venc->quality = avccontext->global_quality / (float)FF_QP2LAMBDA;
+ avctx->bit_rate = 0;
+ if (avctx->flags & CODEC_FLAG_QSCALE)
+ venc->quality = avctx->global_quality / (float)FF_QP2LAMBDA;
 else
 venc->quality = 3.0;
 venc->quality *= venc->quality;
 
- if ((ret = put_main_header(venc, (uint8_t**)&avccontext->extradata)) < 0)
+ if ((ret = put_main_header(venc, (uint8_t**)&avctx->extradata)) < 0)
 goto error;
- avccontext->extradata_size = ret;
+ avctx->extradata_size = ret;
 
- avccontext->frame_size = 1 << (venc->log2_blocksize[0] - 1);
-
-#if FF_API_OLD_ENCODE_AUDIO
- avccontext->coded_frame = avcodec_alloc_frame();
- if (!avccontext->coded_frame) {
- ret = AVERROR(ENOMEM);
- goto error;
- }
-#endif
+ avctx->frame_size = 1 << (venc->log2_blocksize[0] - 1);
 
 return 0;
 error:
- vorbis_encode_close(avccontext);
+ vorbis_encode_close(avctx);
 return ret;
 }
 
 AVCodec ff_vorbis_encoder = {
 .name = "vorbis",
+ .long_name = NULL_IF_CONFIG_SMALL("Vorbis"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_VORBIS,
 .priv_data_size = sizeof(vorbis_enc_context),
@@ -1216,5 +1205,4 @@
 .capabilities = CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL,
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("Vorbis"),
 };

libav-v9.6.tar.bz2/libavcodec/vp3.c -> libav-v10.1.tar.bz2/libavcodec/vp3.c Changed

@@ -38,6 +38,7 @@
 #include "internal.h"
 #include "dsputil.h"
 #include "get_bits.h"
+#include "hpeldsp.h"
 #include "videodsp.h"
 #include "vp3data.h"
 #include "vp3dsp.h"
@@ -131,13 +132,16 @@
 int version;
 int width, height;
 int chroma_x_shift, chroma_y_shift;
- AVFrame golden_frame;
- AVFrame last_frame;
- AVFrame current_frame;
+ ThreadFrame golden_frame;
+ ThreadFrame last_frame;
+ ThreadFrame current_frame;
 int keyframe;
- DSPContext dsp;
+ uint8_t idct_permutation[64];
+ uint8_t idct_scantable[64];
+ HpelDSPContext hdsp;
 VideoDSPContext vdsp;
 VP3DSPContext vp3dsp;
+ DECLARE_ALIGNED(16, int16_t, block)[64];
 int flipped_image;
 int last_slice_end;
 int skip_loop_filter;
@@ -171,8 +175,6 @@
 
 int8_t (*motion_val[2])[2];
 
- ScanTable scantable;
-
 /* tables */
 uint16_t coded_dc_scale_factor[64];
 uint32_t coded_ac_scale_factor[64];
@@ -260,19 +262,11 @@
 {
 Vp3DecodeContext *s = avctx->priv_data;
 
- if (s->golden_frame.data[0]) {
- if (s->golden_frame.data[0] == s->last_frame.data[0])
- memset(&s->last_frame, 0, sizeof(AVFrame));
- if (s->current_frame.data[0] == s->golden_frame.data[0])
- memset(&s->current_frame, 0, sizeof(AVFrame));
+ if (s->golden_frame.f)
 ff_thread_release_buffer(avctx, &s->golden_frame);
- }
- if (s->last_frame.data[0]) {
- if (s->current_frame.data[0] == s->last_frame.data[0])
- memset(&s->current_frame, 0, sizeof(AVFrame));
+ if (s->last_frame.f)
 ff_thread_release_buffer(avctx, &s->last_frame);
- }
- if (s->current_frame.data[0])
+ if (s->current_frame.f)
 ff_thread_release_buffer(avctx, &s->current_frame);
 }
 
@@ -291,6 +285,12 @@
 av_freep(&s->motion_val[1]);
 av_freep(&s->edge_emu_buffer);
 
+ /* release all frames */
+ vp3_decode_flush(avctx);
+ av_frame_free(&s->current_frame.f);
+ av_frame_free(&s->last_frame.f);
+ av_frame_free(&s->golden_frame.f);
+
 if (avctx->internal->is_copy)
 return 0;
 
@@ -307,8 +307,6 @@
 ff_free_vlc(&s->mode_code_vlc);
 ff_free_vlc(&s->motion_vector_vlc);
 
- /* release all frames */
- vp3_decode_flush(avctx);
 
 return 0;
 }
@@ -377,7 +375,8 @@
 int qmin= 8<<(inter + !i);
 int qscale= i ? ac_scale_factor : dc_scale_factor;
 
- s->qmat[qpi][inter][plane][s->dsp.idct_permutation[i]]= av_clip((qscale * coeff)/100 * 4, qmin, 4096);
+ s->qmat[qpi][inter][plane][s->idct_permutation[i]] =
+ av_clip((qscale * coeff) / 100 * 4, qmin, 4096);
 }
 // all DC coefficients use the same quant so as not to interfere with DC prediction
 s->qmat[qpi][inter][plane][0] = s->qmat[0][inter][plane][0];
@@ -919,7 +918,7 @@
 int i, j = 0;
 int token;
 int zero_run = 0;
- DCTELEM coeff = 0;
+ int16_t coeff = 0;
 int bits_to_get;
 int blocks_ended;
 int coeff_i = 0;
@@ -1289,8 +1288,8 @@
 int width = s->fragment_width[!!plane];
 int height = s->fragment_height[!!plane];
 int fragment = s->fragment_start [plane] + ystart * width;
- int stride = s->current_frame.linesize[plane];
- uint8_t *plane_data = s->current_frame.data [plane];
+ ptrdiff_t stride = s->current_frame.f->linesize[plane];
+ uint8_t *plane_data = s->current_frame.f->data [plane];
 if (!s->flipped_image) stride = -stride;
 plane_data += s->data_offset[plane] + 8*ystart*stride;
 
@@ -1349,10 +1348,10 @@
 * for the next block in coding order
 */
 static inline int vp3_dequant(Vp3DecodeContext *s, Vp3Fragment *frag,
- int plane, int inter, DCTELEM block[64])
+ int plane, int inter, int16_t block[64])
 {
 int16_t *dequantizer = s->qmat[frag->qpi][inter][plane];
- uint8_t *perm = s->scantable.permutated;
+ uint8_t *perm = s->idct_scantable;
 int i = 0;
 
 do {
@@ -1419,14 +1418,14 @@
 }
 
 cy = y >> s->chroma_y_shift;
- offset[0] = s->current_frame.linesize[0]*y;
- offset[1] = s->current_frame.linesize[1]*cy;
- offset[2] = s->current_frame.linesize[2]*cy;
+ offset[0] = s->current_frame.f->linesize[0]*y;
+ offset[1] = s->current_frame.f->linesize[1]*cy;
+ offset[2] = s->current_frame.f->linesize[2]*cy;
 for (i = 3; i < AV_NUM_DATA_POINTERS; i++)
 offset[i] = 0;
 
 emms_c();
- s->avctx->draw_horiz_band(s->avctx, &s->current_frame, offset, y, 3, h);
+ s->avctx->draw_horiz_band(s->avctx, s->current_frame.f, offset, y, 3, h);
 }
 
 /**
@@ -1435,7 +1434,7 @@
 */
 static void await_reference_row(Vp3DecodeContext *s, Vp3Fragment *fragment, int motion_y, int y)
 {
- AVFrame *ref_frame;
+ ThreadFrame *ref_frame;
 int ref_row;
 int border = motion_y&1;
 
@@ -1458,7 +1457,7 @@
 static void render_slice(Vp3DecodeContext *s, int slice)
 {
 int x, y, i, j, fragment;
- LOCAL_ALIGNED_16(DCTELEM, block, [64]);
+ int16_t *block = s->block;
 int motion_x = 0xdeadbeef, motion_y = 0xdeadbeef;
 int motion_halfpel_index;
 uint8_t *motion_source;
@@ -1468,10 +1467,10 @@
 return;
 
 for (plane = 0; plane < 3; plane++) {
- uint8_t *output_plane = s->current_frame.data [plane] + s->data_offset[plane];
- uint8_t * last_plane = s-> last_frame.data [plane] + s->data_offset[plane];
- uint8_t *golden_plane = s-> golden_frame.data [plane] + s->data_offset[plane];
- int stride = s->current_frame.linesize[plane];
+ uint8_t *output_plane = s->current_frame.f->data [plane] + s->data_offset[plane];
+ uint8_t * last_plane = s-> last_frame.f->data [plane] + s->data_offset[plane];
+ uint8_t *golden_plane = s-> golden_frame.f->data [plane] + s->data_offset[plane];
+ ptrdiff_t stride = s->current_frame.f->linesize[plane];
 int plane_width = s->width >> (plane && s->chroma_x_shift);
 int plane_height = s->height >> (plane && s->chroma_y_shift);
 int8_t (*motion_val)[2] = s->motion_val[!!plane];
@@ -1544,7 +1543,11 @@
 uint8_t *temp= s->edge_emu_buffer;
 if(stride<0) temp -= 8*stride;
 
- s->vdsp.emulated_edge_mc(temp, motion_source, stride, 9, 9, src_x, src_y, plane_width, plane_height);
+ s->vdsp.emulated_edge_mc(temp, motion_source,
+ stride, stride,
+ 9, 9, src_x, src_y,
+ plane_width,
+ plane_height);
 motion_source= temp;
 }
 }
@@ -1558,12 +1561,12 @@
 VP3 source but this would be slower as
 put_no_rnd_pixels_tab is better optimzed */
 if(motion_halfpel_index != 3){
- s->dsp.put_no_rnd_pixels_tab[1][motion_halfpel_index](
+ s->hdsp.put_no_rnd_pixels_tab[1][motion_halfpel_index](
 output_plane + first_pixel,
 motion_source, stride, 8);
 }else{
 int d= (motion_x ^ motion_y)>>31; // d is 0 if motion_x and _y have the same sign, else -1
- s->dsp.put_no_rnd_pixels_l2[1](
+ s->vp3dsp.put_no_rnd_pixels_l2(
 output_plane + first_pixel,
 motion_source - d,
 motion_source + stride + 1 + d,
@@ -1571,8 +1574,6 @@
 }
 }
 
- s->dsp.clear_block(block);
-
 /* invert DCT and place (or add) in final output */
 
 if (s->all_fragments[i].coding_method == MODE_INTRA) {
@@ -1600,7 +1601,7 @@
 } else {
 
 /* copy directly from the previous frame */
- s->dsp.put_pixels_tab[1][0](
+ s->hdsp.put_pixels_tab[1][0](
 output_plane + first_pixel,
 last_plane + first_pixel,
 stride, 8);
@@ -1658,14 +1659,36 @@
 return 0;
 }
 
+static av_cold int init_frames(Vp3DecodeContext *s)
+{
+ s->current_frame.f = av_frame_alloc();
+ s->last_frame.f = av_frame_alloc();
+ s->golden_frame.f = av_frame_alloc();
+
+ if (!s->current_frame.f || !s->last_frame.f || !s->golden_frame.f) {
+ av_frame_free(&s->current_frame.f);
+ av_frame_free(&s->last_frame.f);
+ av_frame_free(&s->golden_frame.f);
+ return AVERROR(ENOMEM);
+ }
+
+ return 0;
+}
+
 static av_cold int vp3_decode_init(AVCodecContext *avctx)
 {
 Vp3DecodeContext *s = avctx->priv_data;
- int i, inter, plane;
+ int i, inter, plane, ret;
 int c_width;
 int c_height;
 int y_fragment_count, c_fragment_count;
 
+ ret = init_frames(s);
+ if (ret < 0)
+ return ret;
+
+ avctx->internal->allocate_progress = 1;
+
 if (avctx->codec_tag == MKTAG('V','P','3','0'))
 s->version = 0;
 else
@@ -1677,12 +1700,16 @@
 if (avctx->pix_fmt == AV_PIX_FMT_NONE)
 avctx->pix_fmt = AV_PIX_FMT_YUV420P;
 avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
- ff_dsputil_init(&s->dsp, avctx);
+ ff_hpeldsp_init(&s->hdsp, avctx->flags | CODEC_FLAG_BITEXACT);
 ff_videodsp_init(&s->vdsp, 8);
 ff_vp3dsp_init(&s->vp3dsp, avctx->flags);
 
- ff_init_scantable_permutation(s->dsp.idct_permutation, s->vp3dsp.idct_perm);
- ff_init_scantable(s->dsp.idct_permutation, &s->scantable, ff_zigzag_direct);
+ 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
+ }
 
 /* initialize to an impossible value which will force a recalculation
 * in the first frame decode */
@@ -1822,12 +1849,6 @@
 &motion_vector_vlc_table[0][1], 2, 1,
 &motion_vector_vlc_table[0][0], 2, 1, 0);
 
- for (i = 0; i < 3; i++) {
- s->current_frame.data[i] = NULL;
- s->last_frame.data[i] = NULL;
- s->golden_frame.data[i] = NULL;
- }
-
 return allocate_tables(avctx);
 
 vlc_fail:
@@ -1836,26 +1857,44 @@
 }
 
 /// Release and shuffle frames after decode finishes
-static void update_frames(AVCodecContext *avctx)
+static int update_frames(AVCodecContext *avctx)
 {
 Vp3DecodeContext *s = avctx->priv_data;
+ int ret = 0;
 
- /* release the last frame, if it is allocated and if it is not the
- * golden frame */
- if (s->last_frame.data[0] && s->last_frame.type != FF_BUFFER_TYPE_COPY)
- ff_thread_release_buffer(avctx, &s->last_frame);
 
 /* shuffle frames (last = current) */
- s->last_frame= s->current_frame;
+ ff_thread_release_buffer(avctx, &s->last_frame);
+ ret = ff_thread_ref_frame(&s->last_frame, &s->current_frame);
+ if (ret < 0)
+ goto fail;
 
 if (s->keyframe) {
- if (s->golden_frame.data[0])
- ff_thread_release_buffer(avctx, &s->golden_frame);
- s->golden_frame = s->current_frame;
- s->last_frame.type = FF_BUFFER_TYPE_COPY;
+ ff_thread_release_buffer(avctx, &s->golden_frame);
+ ret = ff_thread_ref_frame(&s->golden_frame, &s->current_frame);
 }
 
- s->current_frame.data[0]= NULL; /* ensure that we catch any access to this released frame */
+fail:
+ ff_thread_release_buffer(avctx, &s->current_frame);
+ return ret;
+}
+
+static int ref_frame(Vp3DecodeContext *s, ThreadFrame *dst, ThreadFrame *src)
+{
+ ff_thread_release_buffer(s->avctx, dst);
+ if (src->f->data[0])
+ return ff_thread_ref_frame(dst, src);
+ return 0;
+}
+
+static int ref_frames(Vp3DecodeContext *dst, Vp3DecodeContext *src)
+{
+ int ret;
+ if ((ret = ref_frame(dst, &dst->current_frame, &src->current_frame)) < 0 ||
+ (ret = ref_frame(dst, &dst->golden_frame, &src->golden_frame)) < 0 ||
+ (ret = ref_frame(dst, &dst->last_frame, &src->last_frame)) < 0)
+ return ret;
+ return 0;
 }
 
 static int vp3_update_thread_context(AVCodecContext *dst, const AVCodecContext *src)
@@ -1865,17 +1904,17 @@
 
 #define copy_fields(to, from, start_field, end_field) memcpy(&to->start_field, &from->start_field, (char*)&to->end_field - (char*)&to->start_field)
 
- if (!s1->current_frame.data[0]
+ if (!s1->current_frame.f->data[0]
 ||s->width != s1->width
 ||s->height!= s1->height) {
 if (s != s1)
- copy_fields(s, s1, golden_frame, current_frame);
+ ref_frames(s, s1);
 return -1;
 }
 
 if (s != s1) {
 // init tables if the first frame hasn't been decoded
- if (!s->current_frame.data[0]) {
+ if (!s->current_frame.f->data[0]) {
 int y_fragment_count, c_fragment_count;
 s->avctx = dst;
 err = allocate_tables(dst);
@@ -1888,7 +1927,10 @@
 }
 
 // copy previous frame data
- copy_fields(s, s1, golden_frame, dsp);
+ if ((err = ref_frames(s, s1)) < 0)
+ return err;
+
+ s->keyframe = s1->keyframe;
 
 // copy qscale data if necessary
 for (i = 0; i < 3; i++) {
@@ -1906,9 +1948,7 @@
 #undef copy_fields
 }
 
- update_frames(dst);
-
- return 0;
+ return update_frames(dst);
 }
 
 static int vp3_decode_frame(AVCodecContext *avctx,
@@ -1919,7 +1959,7 @@
 int buf_size = avpkt->size;
 Vp3DecodeContext *s = avctx->priv_data;
 GetBitContext gb;
- int i;
+ int i, ret;
 
 init_get_bits(&gb, buf, buf_size * 8);
 
@@ -1961,15 +2001,14 @@
 if (avctx->skip_frame >= AVDISCARD_NONKEY && !s->keyframe)
 return buf_size;
 
- s->current_frame.reference = 3;
- s->current_frame.pict_type = s->keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
- if (ff_thread_get_buffer(avctx, &s->current_frame) < 0) {
+ s->current_frame.f->pict_type = s->keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
+ if (ff_thread_get_buffer(avctx, &s->current_frame, AV_GET_BUFFER_FLAG_REF) < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 goto error;
 }
 
 if (!s->edge_emu_buffer)
- s->edge_emu_buffer = av_malloc(9*FFABS(s->current_frame.linesize[0]));
+ s->edge_emu_buffer = av_malloc(9*FFABS(s->current_frame.f->linesize[0]));
 
 if (s->keyframe) {
 if (!s->theora)
@@ -1990,17 +2029,17 @@
 skip_bits(&gb, 2); /* reserved? */
 }
 } else {
- if (!s->golden_frame.data[0]) {
+ if (!s->golden_frame.f->data[0]) {
 av_log(s->avctx, AV_LOG_WARNING, "vp3: first frame not a keyframe\n");
 
- s->golden_frame.reference = 3;
- s->golden_frame.pict_type = AV_PICTURE_TYPE_I;
- if (ff_thread_get_buffer(avctx, &s->golden_frame) < 0) {
+ s->golden_frame.f->pict_type = AV_PICTURE_TYPE_I;
+ if (ff_thread_get_buffer(avctx, &s->golden_frame, AV_GET_BUFFER_FLAG_REF) < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 goto error;
 }
- s->last_frame = s->golden_frame;
- s->last_frame.type = FF_BUFFER_TYPE_COPY;
+ ff_thread_release_buffer(avctx, &s->last_frame);
+ if ((ret = ff_thread_ref_frame(&s->last_frame, &s->golden_frame)) < 0)
+ goto error;
 ff_thread_report_progress(&s->last_frame, INT_MAX, 0);
 }
 }
@@ -2034,7 +2073,7 @@
 if (s->flipped_image)
 s->data_offset[i] = 0;
 else
- s->data_offset[i] = (height-1) * s->current_frame.linesize[i];
+ s->data_offset[i] = (height-1) * s->current_frame.f->linesize[i];
 }
 
 s->last_slice_end = 0;
@@ -2048,11 +2087,15 @@
 }
 vp3_draw_horiz_band(s, s->avctx->height);
 
+ if ((ret = av_frame_ref(data, s->current_frame.f)) < 0)
+ return ret;
 *got_frame = 1;
- *(AVFrame*)data= s->current_frame;
 
- if (!HAVE_THREADS || !(s->avctx->active_thread_type&FF_THREAD_FRAME))
- update_frames(avctx);
+ if (!HAVE_THREADS || !(s->avctx->active_thread_type&FF_THREAD_FRAME)) {
+ ret = update_frames(avctx);
+ if (ret < 0)
+ return ret;
+ }
 
 return buf_size;
 
@@ -2060,7 +2103,7 @@
 ff_thread_report_progress(&s->current_frame, INT_MAX, 0);
 
 if (!HAVE_THREADS || !(s->avctx->active_thread_type&FF_THREAD_FRAME))
- avctx->release_buffer(avctx, &s->current_frame);
+ av_frame_unref(s->current_frame.f);
 
 return -1;
 }
@@ -2114,7 +2157,7 @@
 s->motion_val[1] = NULL;
 s->edge_emu_buffer = NULL;
 
- return 0;
+ return init_frames(s);
 }
 
 #if CONFIG_THEORA_DECODER
@@ -2127,6 +2170,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);
@@ -2143,12 +2187,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);
@@ -2160,6 +2198,10 @@
 fps.num = get_bits_long(gb, 32);
 fps.den = get_bits_long(gb, 32);
 if (fps.num && fps.den) {
+ if (fps.num < 0 || fps.den < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid framerate\n");
+ return AVERROR_INVALIDDATA;
+ }
 av_reduce(&avctx->time_base.num, &avctx->time_base.den,
 fps.den, fps.num, 1<<30);
 }
@@ -2191,9 +2233,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;
@@ -2382,6 +2426,7 @@
 
 AVCodec ff_theora_decoder = {
 .name = "theora",
+ .long_name = NULL_IF_CONFIG_SMALL("Theora"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_THEORA,
 .priv_data_size = sizeof(Vp3DecodeContext),
@@ -2391,7 +2436,6 @@
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND |
 CODEC_CAP_FRAME_THREADS,
 .flush = vp3_decode_flush,
- .long_name = NULL_IF_CONFIG_SMALL("Theora"),
 .init_thread_copy = ONLY_IF_THREADS_ENABLED(vp3_init_thread_copy),
 .update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context)
 };
@@ -2399,6 +2443,7 @@
 
 AVCodec ff_vp3_decoder = {
 .name = "vp3",
+ .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_VP3,
 .priv_data_size = sizeof(Vp3DecodeContext),
@@ -2408,7 +2453,6 @@
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND |
 CODEC_CAP_FRAME_THREADS,
 .flush = vp3_decode_flush,
- .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"),
 .init_thread_copy = ONLY_IF_THREADS_ENABLED(vp3_init_thread_copy),
 .update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context),
 };

libav-v9.6.tar.bz2/libavcodec/vp3dsp.c -> libav-v10.1.tar.bz2/libavcodec/vp3dsp.c Changed

@@ -28,6 +28,7 @@
 #include "libavutil/common.h"
 #include "avcodec.h"
 #include "dsputil.h"
+#include "rnd_avg.h"
 #include "vp3dsp.h"
 
 #define IdctAdjustBeforeShift 8
@@ -53,11 +54,12 @@
 /* Inverse DCT on the rows now */
 for (i = 0; i < 8; i++) {
 /* Check for non-zero values */
- if ( ip[0] | ip[1] | ip[2] | ip[3] | ip[4] | ip[5] | ip[6] | ip[7] ) {
- A = M(xC1S7, ip[1]) + M(xC7S1, ip[7]);
- B = M(xC7S1, ip[1]) - M(xC1S7, ip[7]);
- C = M(xC3S5, ip[3]) + M(xC5S3, ip[5]);
- D = M(xC3S5, ip[5]) - M(xC5S3, ip[3]);
+ if ( ip[0 * 8] | ip[1 * 8] | ip[2 * 8] | ip[3 * 8] |
+ ip[4 * 8] | ip[5 * 8] | ip[6 * 8] | ip[7 * 8] ) {
+ A = M(xC1S7, ip[1 * 8]) + M(xC7S1, ip[7 * 8]);
+ B = M(xC7S1, ip[1 * 8]) - M(xC1S7, ip[7 * 8]);
+ C = M(xC3S5, ip[3 * 8]) + M(xC5S3, ip[5 * 8]);
+ D = M(xC3S5, ip[5 * 8]) - M(xC5S3, ip[3 * 8]);
 
 Ad = M(xC4S4, (A - C));
 Bd = M(xC4S4, (B - D));
@@ -65,11 +67,11 @@
 Cd = A + C;
 Dd = B + D;
 
- E = M(xC4S4, (ip[0] + ip[4]));
- F = M(xC4S4, (ip[0] - ip[4]));
+ E = M(xC4S4, (ip[0 * 8] + ip[4 * 8]));
+ F = M(xC4S4, (ip[0 * 8] - ip[4 * 8]));
 
- G = M(xC2S6, ip[2]) + M(xC6S2, ip[6]);
- H = M(xC6S2, ip[2]) - M(xC2S6, ip[6]);
+ G = M(xC2S6, ip[2 * 8]) + M(xC6S2, ip[6 * 8]);
+ H = M(xC6S2, ip[2 * 8]) - M(xC2S6, ip[6 * 8]);
 
 Ed = E - G;
 Gd = E + G;
@@ -81,33 +83,33 @@
 Hd = Bd + H;
 
 /* Final sequence of operations over-write original inputs. */
- ip[0] = Gd + Cd ;
- ip[7] = Gd - Cd ;
+ ip[0 * 8] = Gd + Cd ;
+ ip[7 * 8] = Gd - Cd ;
 
- ip[1] = Add + Hd;
- ip[2] = Add - Hd;
+ ip[1 * 8] = Add + Hd;
+ ip[2 * 8] = Add - Hd;
 
- ip[3] = Ed + Dd ;
- ip[4] = Ed - Dd ;
+ ip[3 * 8] = Ed + Dd ;
+ ip[4 * 8] = Ed - Dd ;
 
- ip[5] = Fd + Bdd;
- ip[6] = Fd - Bdd;
+ ip[5 * 8] = Fd + Bdd;
+ ip[6 * 8] = Fd - Bdd;
 }
 
- ip += 8; /* next row */
+ ip += 1; /* next row */
 }
 
 ip = input;
 
 for ( i = 0; i < 8; i++) {
 /* Check for non-zero values (bitwise or faster than ||) */
- if ( ip[1 * 8] | ip[2 * 8] | ip[3 * 8] |
- ip[4 * 8] | ip[5 * 8] | ip[6 * 8] | ip[7 * 8] ) {
+ if ( ip[1] | ip[2] | ip[3] |
+ ip[4] | ip[5] | ip[6] | ip[7] ) {
 
- A = M(xC1S7, ip[1*8]) + M(xC7S1, ip[7*8]);
- B = M(xC7S1, ip[1*8]) - M(xC1S7, ip[7*8]);
- C = M(xC3S5, ip[3*8]) + M(xC5S3, ip[5*8]);
- D = M(xC3S5, ip[5*8]) - M(xC5S3, ip[3*8]);
+ A = M(xC1S7, ip[1]) + M(xC7S1, ip[7]);
+ B = M(xC7S1, ip[1]) - M(xC1S7, ip[7]);
+ C = M(xC3S5, ip[3]) + M(xC5S3, ip[5]);
+ D = M(xC3S5, ip[5]) - M(xC5S3, ip[3]);
 
 Ad = M(xC4S4, (A - C));
 Bd = M(xC4S4, (B - D));
@@ -115,16 +117,16 @@
 Cd = A + C;
 Dd = B + D;
 
- E = M(xC4S4, (ip[0*8] + ip[4*8])) + 8;
- F = M(xC4S4, (ip[0*8] - ip[4*8])) + 8;
+ E = M(xC4S4, (ip[0] + ip[4])) + 8;
+ F = M(xC4S4, (ip[0] - ip[4])) + 8;
 
 if(type==1){ //HACK
 E += 16*128;
 F += 16*128;
 }
 
- G = M(xC2S6, ip[2*8]) + M(xC6S2, ip[6*8]);
- H = M(xC6S2, ip[2*8]) - M(xC2S6, ip[6*8]);
+ G = M(xC2S6, ip[2]) + M(xC6S2, ip[6]);
+ H = M(xC6S2, ip[2]) - M(xC2S6, ip[6]);
 
 Ed = E - G;
 Gd = E + G;
@@ -136,19 +138,7 @@
 Hd = Bd + H;
 
 /* Final sequence of operations over-write original inputs. */
- if(type==0){
- ip[0*8] = (Gd + Cd ) >> 4;
- ip[7*8] = (Gd - Cd ) >> 4;
-
- ip[1*8] = (Add + Hd ) >> 4;
- ip[2*8] = (Add - Hd ) >> 4;
-
- ip[3*8] = (Ed + Dd ) >> 4;
- ip[4*8] = (Ed - Dd ) >> 4;
-
- ip[5*8] = (Fd + Bdd ) >> 4;
- ip[6*8] = (Fd - Bdd ) >> 4;
- }else if(type==1){
+ if (type == 1) {
 dst[0*stride] = av_clip_uint8((Gd + Cd ) >> 4);
 dst[7*stride] = av_clip_uint8((Gd - Cd ) >> 4);
 
@@ -175,16 +165,7 @@
 }
 
 } else {
- if(type==0){
- ip[0*8] =
- ip[1*8] =
- ip[2*8] =
- ip[3*8] =
- ip[4*8] =
- ip[5*8] =
- ip[6*8] =
- ip[7*8] = ((xC4S4 * ip[0*8] + (IdctAdjustBeforeShift<<16))>>20);
- }else if(type==1){
+ if (type == 1) {
 dst[0*stride]=
 dst[1*stride]=
 dst[2*stride]=
@@ -192,10 +173,10 @@
 dst[4*stride]=
 dst[5*stride]=
 dst[6*stride]=
- dst[7*stride]= av_clip_uint8(128 + ((xC4S4 * ip[0*8] + (IdctAdjustBeforeShift<<16))>>20));
+ dst[7*stride]= av_clip_uint8(128 + ((xC4S4 * ip[0] + (IdctAdjustBeforeShift<<16))>>20));
 }else{
- if(ip[0*8]){
- int v= ((xC4S4 * ip[0*8] + (IdctAdjustBeforeShift<<16))>>20);
+ if(ip[0]){
+ int v= ((xC4S4 * ip[0] + (IdctAdjustBeforeShift<<16))>>20);
 dst[0*stride] = av_clip_uint8(dst[0*stride] + v);
 dst[1*stride] = av_clip_uint8(dst[1*stride] + v);
 dst[2*stride] = av_clip_uint8(dst[2*stride] + v);
@@ -208,21 +189,28 @@
 }
 }
 
- ip++; /* next column */
+ ip += 8; /* next column */
 dst++;
 }
 }
 
-static void vp3_idct_put_c(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/){
+static void vp3_idct_put_c(uint8_t *dest/*align 8*/, int line_size,
+ int16_t *block/*align 16*/)
+{
 idct(dest, line_size, block, 1);
+ memset(block, 0, sizeof(*block) * 64);
 }
 
-static void vp3_idct_add_c(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/){
+static void vp3_idct_add_c(uint8_t *dest/*align 8*/, int line_size,
+ int16_t *block/*align 16*/)
+{
 idct(dest, line_size, block, 2);
+ memset(block, 0, sizeof(*block) * 64);
 }
 
 static void vp3_idct_dc_add_c(uint8_t *dest/*align 8*/, int line_size,
- const DCTELEM *block/*align 16*/){
+ int16_t *block/*align 16*/)
+{
 int i, dc = (block[0] + 15) >> 5;
 
 for(i = 0; i < 8; i++){
@@ -236,6 +224,7 @@
 dest[7] = av_clip_uint8(dest[7] + dc);
 dest += line_size;
 }
+ block[0] = 0;
 }
 
 static void vp3_v_loop_filter_c(uint8_t *first_pixel, int stride,
@@ -271,18 +260,37 @@
 }
 }
 
+static void put_no_rnd_pixels_l2(uint8_t *dst, const uint8_t *src1,
+ const uint8_t *src2, ptrdiff_t stride, int h)
+{
+ int i;
+
+ for (i = 0; i < h; i++) {
+ uint32_t a, b;
+
+ a = AV_RN32(&src1[i * stride]);
+ b = AV_RN32(&src2[i * stride]);
+ AV_WN32A(&dst[i * stride], no_rnd_avg32(a, b));
+ a = AV_RN32(&src1[i * stride + 4]);
+ b = AV_RN32(&src2[i * stride + 4]);
+ AV_WN32A(&dst[i * stride + 4], no_rnd_avg32(a, b));
+ }
+}
+
 av_cold void ff_vp3dsp_init(VP3DSPContext *c, int flags)
 {
+ c->put_no_rnd_pixels_l2 = put_no_rnd_pixels_l2;
+
 c->idct_put = vp3_idct_put_c;
 c->idct_add = vp3_idct_add_c;
 c->idct_dc_add = vp3_idct_dc_add_c;
 c->v_loop_filter = vp3_v_loop_filter_c;
 c->h_loop_filter = vp3_h_loop_filter_c;
 
- c->idct_perm = FF_NO_IDCT_PERM;
-
 if (ARCH_ARM)
 ff_vp3dsp_init_arm(c, flags);
+ if (ARCH_BFIN)
+ ff_vp3dsp_init_bfin(c, flags);
 if (ARCH_PPC)
 ff_vp3dsp_init_ppc(c, flags);
 if (ARCH_X86)

libav-v9.6.tar.bz2/libavcodec/vp3dsp.h -> libav-v10.1.tar.bz2/libavcodec/vp3dsp.h Changed

@@ -19,21 +19,35 @@
 #ifndef AVCODEC_VP3DSP_H
 #define AVCODEC_VP3DSP_H
 
+#include <stddef.h>
 #include <stdint.h>
-#include "dsputil.h"
 
 typedef struct VP3DSPContext {
- void (*idct_put)(uint8_t *dest, int line_size, DCTELEM *block);
- void (*idct_add)(uint8_t *dest, int line_size, DCTELEM *block);
- void (*idct_dc_add)(uint8_t *dest, int line_size, const DCTELEM *block);
+ /**
+ * Copy 8xH pixels from source to destination buffer using a bilinear
+ * filter with no rounding (i.e. *dst = (*a + *b) >> 1).
+ *
+ * @param dst destination buffer, aligned by 8
+ * @param a first source buffer, no alignment
+ * @param b second source buffer, no alignment
+ * @param stride distance between two lines in source/dest buffers
+ * @param h height
+ */
+ void (*put_no_rnd_pixels_l2)(uint8_t *dst,
+ const uint8_t *a,
+ const uint8_t *b,
+ ptrdiff_t stride, int h);
+
+ void (*idct_put)(uint8_t *dest, int line_size, int16_t *block);
+ void (*idct_add)(uint8_t *dest, int line_size, int16_t *block);
+ void (*idct_dc_add)(uint8_t *dest, int line_size, int16_t *block);
 void (*v_loop_filter)(uint8_t *src, int stride, int *bounding_values);
 void (*h_loop_filter)(uint8_t *src, int stride, int *bounding_values);
-
- int idct_perm;
 } VP3DSPContext;
 
 void ff_vp3dsp_init(VP3DSPContext *c, int flags);
 void ff_vp3dsp_init_arm(VP3DSPContext *c, int flags);
+void ff_vp3dsp_init_bfin(VP3DSPContext *c, int flags);
 void ff_vp3dsp_init_ppc(VP3DSPContext *c, int flags);
 void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags);

libav-v9.6.tar.bz2/libavcodec/vp5.c -> libav-v10.1.tar.bz2/libavcodec/vp5.c Changed

@@ -27,8 +27,8 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "get_bits.h"
+#include "internal.h"
 
 #include "vp56.h"
 #include "vp56data.h"
@@ -42,10 +42,10 @@
 int rows, cols;
 
 ff_vp56_init_range_decoder(&s->c, buf, buf_size);
- s->framep[VP56_FRAME_CURRENT]->key_frame = !vp56_rac_get(c);
+ s->frames[VP56_FRAME_CURRENT]->key_frame = !vp56_rac_get(c);
 vp56_rac_get(c);
 ff_vp56_init_dequant(s, vp56_rac_gets(c, 6));
- if (s->framep[VP56_FRAME_CURRENT]->key_frame)
+ if (s->frames[VP56_FRAME_CURRENT]->key_frame)
 {
 vp56_rac_gets(c, 8);
 if(vp56_rac_gets(c, 5) > 5)
@@ -68,7 +68,9 @@
 if (!s->macroblocks || /* first frame */
 16*cols != s->avctx->coded_width ||
 16*rows != s->avctx->coded_height) {
- 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;
 return VP56_SIZE_CHANGE;
 }
 } else if (!s->macroblocks)
@@ -139,7 +141,7 @@
 if (vp56_rac_get_prob(c, vp5_dccv_pct[pt][node])) {
 def_prob[node] = vp56_rac_gets_nn(c, 7);
 model->coeff_dccv[pt][node] = def_prob[node];
- } else if (s->framep[VP56_FRAME_CURRENT]->key_frame) {
+ } else if (s->frames[VP56_FRAME_CURRENT]->key_frame) {
 model->coeff_dccv[pt][node] = def_prob[node];
 }
 
@@ -150,7 +152,7 @@
 if (vp56_rac_get_prob(c, vp5_ract_pct[ct][pt][cg][node])) {
 def_prob[node] = vp56_rac_gets_nn(c, 7);
 model->coeff_ract[pt][ct][cg][node] = def_prob[node];
- } else if (s->framep[VP56_FRAME_CURRENT]->key_frame) {
+ } else if (s->frames[VP56_FRAME_CURRENT]->key_frame) {
 model->coeff_ract[pt][ct][cg][node] = def_prob[node];
 }
 
@@ -174,7 +176,7 @@
 {
 VP56RangeCoder *c = &s->c;
 VP56Model *model = s->modelp;
- uint8_t *permute = s->scantable.permutated;
+ uint8_t *permute = s->idct_scantable;
 uint8_t *model1, *model2;
 int coeff, sign, coeff_idx;
 int b, i, cg, idx, ctx, ctx_last;
@@ -265,8 +267,10 @@
 static av_cold int vp5_decode_init(AVCodecContext *avctx)
 {
 VP56Context *s = avctx->priv_data;
+ int ret;
 
- ff_vp56_init(avctx, 1, 0);
+ if ((ret = ff_vp56_init(avctx, 1, 0)) < 0)
+ return ret;
 s->vp56_coord_div = vp5_coord_div;
 s->parse_vector_adjustment = vp5_parse_vector_adjustment;
 s->parse_coeff = vp5_parse_coeff;
@@ -280,6 +284,7 @@
 
 AVCodec ff_vp5_decoder = {
 .name = "vp5",
+ .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_VP5,
 .priv_data_size = sizeof(VP56Context),
@@ -287,5 +292,4 @@
 .close = ff_vp56_free,
 .decode = ff_vp56_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"),
 };

libav-v9.6.tar.bz2/libavcodec/vp56.c -> libav-v10.1.tar.bz2/libavcodec/vp56.c Changed

@@ -26,7 +26,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "internal.h"
-
+#include "h264chroma.h"
 #include "vp56.h"
 #include "vp56data.h"
 
@@ -34,9 +34,8 @@
 void ff_vp56_init_dequant(VP56Context *s, int quantizer)
 {
 s->quantizer = quantizer;
- s->dequant_dc = vp56_dc_dequant[quantizer] << 2;
- s->dequant_ac = vp56_ac_dequant[quantizer] << 2;
- memset(s->qscale_table, quantizer, s->mb_width);
+ s->dequant_dc = ff_vp56_dc_dequant[quantizer] << 2;
+ s->dequant_ac = ff_vp56_ac_dequant[quantizer] << 2;
 }
 
 static int vp56_get_vectors_predictors(VP56Context *s, int row, int col,
@@ -48,14 +47,14 @@
 VP56mv mvp;
 
 for (pos=0; pos<12; pos++) {
- mvp.x = col + vp56_candidate_predictor_pos[pos][0];
- mvp.y = row + vp56_candidate_predictor_pos[pos][1];
+ mvp.x = col + ff_vp56_candidate_predictor_pos[pos][0];
+ mvp.y = row + ff_vp56_candidate_predictor_pos[pos][1];
 if (mvp.x < 0 || mvp.x >= s->mb_width ||
 mvp.y < 0 || mvp.y >= s->mb_height)
 continue;
 offset = mvp.x + s->mb_width*mvp.y;
 
- if (vp56_reference_frame[s->macroblocks[offset].type] != ref_frame)
+ if (ff_vp56_reference_frame[s->macroblocks[offset].type] != ref_frame)
 continue;
 if ((s->macroblocks[offset].mv.x == vect[0].x &&
 s->macroblocks[offset].mv.y == vect[0].y) ||
@@ -87,7 +86,7 @@
 if (vp56_rac_get_prob(c, 174)) {
 int idx = vp56_rac_gets(c, 4);
 memcpy(model->mb_types_stats[ctx],
- vp56_pre_def_mb_type_stats[idx][ctx],
+ ff_vp56_pre_def_mb_type_stats[idx][ctx],
 sizeof(model->mb_types_stats[ctx]));
 }
 if (vp56_rac_get_prob(c, 254)) {
@@ -96,8 +95,8 @@
 if (vp56_rac_get_prob(c, 205)) {
 int delta, sign = vp56_rac_get(c);
 
- delta = vp56_rac_get_tree(c, vp56_pmbtm_tree,
- vp56_mb_type_model_model);
+ delta = vp56_rac_get_tree(c, ff_vp56_pmbtm_tree,
+ ff_vp56_mb_type_model_model);
 if (!delta)
 delta = 4 * vp56_rac_gets(c, 7);
 model->mb_types_stats[ctx][type][i] += (delta ^ -sign) + sign;
@@ -157,7 +156,7 @@
 if (vp56_rac_get_prob(c, mb_type_model[0]))
 return prev_type;
 else
- return vp56_rac_get_tree(c, vp56_pmbt_tree, mb_type_model);
+ return vp56_rac_get_tree(c, ff_vp56_pmbt_tree, mb_type_model);
 }
 
 static void vp56_decode_4mv(VP56Context *s, int row, int col)
@@ -264,7 +263,7 @@
 
 static void vp56_add_predictors_dc(VP56Context *s, VP56Frame ref_frame)
 {
- int idx = s->scantable.permutated[0];
+ int idx = s->idct_scantable[0];
 int b;
 
 for (b=0; b<6; b++) {
@@ -304,17 +303,17 @@
 }
 
 static void vp56_deblock_filter(VP56Context *s, uint8_t *yuv,
- int stride, int dx, int dy)
+ ptrdiff_t stride, int dx, int dy)
 {
- int t = vp56_filter_threshold[s->quantizer];
+ int t = ff_vp56_filter_threshold[s->quantizer];
 if (dx) s->vp56dsp.edge_filter_hor(yuv + 10-dx , stride, t);
 if (dy) s->vp56dsp.edge_filter_ver(yuv + stride*(10-dy), stride, t);
 }
 
 static void vp56_mc(VP56Context *s, int b, int plane, uint8_t *src,
- int stride, int x, int y)
+ ptrdiff_t stride, int x, int y)
 {
- uint8_t *dst=s->framep[VP56_FRAME_CURRENT]->data[plane]+s->block_offset[b];
+ uint8_t *dst = s->frames[VP56_FRAME_CURRENT]->data[plane] + s->block_offset[b];
 uint8_t *src_block;
 int src_offset;
 int overlap_offset = 0;
@@ -325,7 +324,7 @@
 
 if (s->avctx->skip_loop_filter >= AVDISCARD_ALL ||
 (s->avctx->skip_loop_filter >= AVDISCARD_NONKEY
- && !s->framep[VP56_FRAME_CURRENT]->key_frame))
+ && !s->frames[VP56_FRAME_CURRENT]->key_frame))
 deblock_filtering = 0;
 
 dx = s->mv[b].x / s->vp56_coord_div[b];
@@ -342,7 +341,8 @@
 y<0 || y+12>=s->plane_height[plane]) {
 s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
 src + s->block_offset[b] + (dy-2)*stride + (dx-2),
- stride, 12, 12, x, y,
+ stride, stride,
+ 12, 12, x, y,
 s->plane_width[plane],
 s->plane_height[plane]);
 src_block = s->edge_emu_buffer;
@@ -350,9 +350,9 @@
 } else if (deblock_filtering) {
 /* only need a 12x12 block, but there is no such dsp function, */
 /* so copy a 16x12 block */
- s->dsp.put_pixels_tab[0][0](s->edge_emu_buffer,
- src + s->block_offset[b] + (dy-2)*stride + (dx-2),
- stride, 12);
+ s->hdsp.put_pixels_tab[0][0](s->edge_emu_buffer,
+ src + s->block_offset[b] + (dy-2)*stride + (dx-2),
+ stride, 12);
 src_block = s->edge_emu_buffer;
 src_offset = 2 + 2*stride;
 } else {
@@ -373,11 +373,11 @@
 s->filter(s, dst, src_block, src_offset, src_offset+overlap_offset,
 stride, s->mv[b], mask, s->filter_selection, b<4);
 else
- s->dsp.put_no_rnd_pixels_l2[1](dst, src_block+src_offset,
+ s->vp3dsp.put_no_rnd_pixels_l2(dst, src_block+src_offset,
 src_block+src_offset+overlap_offset,
 stride, 8);
 } else {
- s->dsp.put_pixels_tab[1][0](dst, src_block+src_offset, stride, 8);
+ s->hdsp.put_pixels_tab[1][0](dst, src_block+src_offset, stride, 8);
 }
 }
 
@@ -388,20 +388,18 @@
 VP56Frame ref_frame;
 int b, ab, b_max, plane, off;
 
- if (s->framep[VP56_FRAME_CURRENT]->key_frame)
+ if (s->frames[VP56_FRAME_CURRENT]->key_frame)
 mb_type = VP56_MB_INTRA;
 else
 mb_type = vp56_decode_mv(s, row, col);
- ref_frame = vp56_reference_frame[mb_type];
-
- s->dsp.clear_blocks(*s->block_coeff);
+ ref_frame = ff_vp56_reference_frame[mb_type];
 
 s->parse_coeff(s);
 
 vp56_add_predictors_dc(s, ref_frame);
 
- frame_current = s->framep[VP56_FRAME_CURRENT];
- frame_ref = s->framep[ref_frame];
+ frame_current = s->frames[VP56_FRAME_CURRENT];
+ frame_ref = s->frames[ref_frame];
 if (mb_type != VP56_MB_INTRA && !frame_ref->data[0])
 return;
 
@@ -422,9 +420,9 @@
 for (b=0; b<b_max; b++) {
 plane = ff_vp56_b2p[b+ab];
 off = s->block_offset[b];
- s->dsp.put_pixels_tab[1][0](frame_current->data[plane] + off,
- frame_ref->data[plane] + off,
- s->stride[plane], 8);
+ s->hdsp.put_pixels_tab[1][0](frame_current->data[plane] + off,
+ frame_ref->data[plane] + off,
+ s->stride[plane], 8);
 s->vp3dsp.idct_add(frame_current->data[plane] + off,
 s->stride[plane], s->block_coeff[b]);
 }
@@ -448,12 +446,17 @@
 }
 break;
 }
+
+ if (is_alpha) {
+ s->block_coeff[4][0] = 0;
+ s->block_coeff[5][0] = 0;
+ }
 }
 
 static int vp56_size_changed(AVCodecContext *avctx)
 {
 VP56Context *s = avctx->priv_data;
- int stride = s->framep[VP56_FRAME_CURRENT]->linesize[0];
+ int stride = s->frames[VP56_FRAME_CURRENT]->linesize[0];
 int i;
 
 s->plane_width[0] = s->plane_width[3] = avctx->coded_width;
@@ -462,18 +465,17 @@
 s->plane_height[1] = s->plane_height[2] = avctx->coded_height/2;
 
 for (i=0; i<4; i++)
- s->stride[i] = s->flip * s->framep[VP56_FRAME_CURRENT]->linesize[i];
+ s->stride[i] = s->flip * s->frames[VP56_FRAME_CURRENT]->linesize[i];
 
 s->mb_width = (avctx->coded_width +15) / 16;
 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;
 }
 
- s->qscale_table = av_realloc(s->qscale_table, s->mb_width);
 s->above_blocks = av_realloc(s->above_blocks,
 (4*s->mb_width+6) * sizeof(*s->above_blocks));
 s->macroblocks = av_realloc(s->macroblocks,
@@ -492,9 +494,10 @@
 {
 const uint8_t *buf = avpkt->data;
 VP56Context *s = avctx->priv_data;
- AVFrame *const p = s->framep[VP56_FRAME_CURRENT];
+ AVFrame *const p = s->frames[VP56_FRAME_CURRENT];
 int remaining_buf_size = avpkt->size;
 int is_alpha, av_uninit(alpha_offset);
+ int res;
 
 if (s->has_alpha) {
 if (remaining_buf_size < 3)
@@ -507,44 +510,39 @@
 
 for (is_alpha=0; is_alpha < 1+s->has_alpha; is_alpha++) {
 int mb_row, mb_col, mb_row_flip, mb_offset = 0;
- int block, y, uv, stride_y, stride_uv;
+ int block, y, uv;
+ ptrdiff_t stride_y, stride_uv;
 int golden_frame = 0;
- int res;
 
 s->modelp = &s->models[is_alpha];
 
 res = s->parse_header(s, buf, remaining_buf_size, &golden_frame);
 if (res < 0) {
 int i;
- for (i = 0; i < 4; i++) {
- if (s->frames[i].data[0])
- avctx->release_buffer(avctx, &s->frames[i]);
- }
+ for (i = 0; i < 4; i++)
+ av_frame_unref(s->frames[i]);
 return res;
 }
 
 if (res == VP56_SIZE_CHANGE) {
 int i;
- for (i = 0; i < 4; i++) {
- if (s->frames[i].data[0])
- avctx->release_buffer(avctx, &s->frames[i]);
- }
+ for (i = 0; i < 4; i++)
+ av_frame_unref(s->frames[i]);
 if (is_alpha) {
- avcodec_set_dimensions(avctx, 0, 0);
+ ff_set_dimensions(avctx, 0, 0);
 return -1;
 }
 }
 
 if (!is_alpha) {
- p->reference = 1;
- if (ff_get_buffer(avctx, p) < 0) {
+ if (ff_get_buffer(avctx, p, AV_GET_BUFFER_FLAG_REF) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return -1;
 }
 
 if (res == VP56_SIZE_CHANGE)
 if (vp56_size_changed(avctx)) {
- avctx->release_buffer(avctx, p);
+ av_frame_unref(p);
 return -1;
 }
 }
@@ -628,44 +626,31 @@
 
 next:
 if (p->key_frame || golden_frame) {
- if (s->framep[VP56_FRAME_GOLDEN]->data[0] &&
- s->framep[VP56_FRAME_GOLDEN] != s->framep[VP56_FRAME_GOLDEN2])
- avctx->release_buffer(avctx, s->framep[VP56_FRAME_GOLDEN]);
- s->framep[VP56_FRAME_GOLDEN] = p;
+ av_frame_unref(s->frames[VP56_FRAME_GOLDEN]);
+ if ((res = av_frame_ref(s->frames[VP56_FRAME_GOLDEN], p)) < 0)
+ return res;
 }
 
 if (s->has_alpha) {
- FFSWAP(AVFrame *, s->framep[VP56_FRAME_GOLDEN],
- s->framep[VP56_FRAME_GOLDEN2]);
+ FFSWAP(AVFrame *, s->frames[VP56_FRAME_GOLDEN],
+ s->frames[VP56_FRAME_GOLDEN2]);
 buf += alpha_offset;
 remaining_buf_size -= alpha_offset;
 }
 }
 
- if (s->framep[VP56_FRAME_PREVIOUS] == s->framep[VP56_FRAME_GOLDEN] ||
- s->framep[VP56_FRAME_PREVIOUS] == s->framep[VP56_FRAME_GOLDEN2]) {
- if (s->framep[VP56_FRAME_UNUSED] != s->framep[VP56_FRAME_GOLDEN] &&
- s->framep[VP56_FRAME_UNUSED] != s->framep[VP56_FRAME_GOLDEN2])
- FFSWAP(AVFrame *, s->framep[VP56_FRAME_PREVIOUS],
- s->framep[VP56_FRAME_UNUSED]);
- else
- FFSWAP(AVFrame *, s->framep[VP56_FRAME_PREVIOUS],
- s->framep[VP56_FRAME_UNUSED2]);
- } else if (s->framep[VP56_FRAME_PREVIOUS]->data[0])
- avctx->release_buffer(avctx, s->framep[VP56_FRAME_PREVIOUS]);
- FFSWAP(AVFrame *, s->framep[VP56_FRAME_CURRENT],
- s->framep[VP56_FRAME_PREVIOUS]);
-
- p->qstride = 0;
- p->qscale_table = s->qscale_table;
- p->qscale_type = FF_QSCALE_TYPE_VP56;
- *(AVFrame*)data = *p;
+ av_frame_unref(s->frames[VP56_FRAME_PREVIOUS]);
+ FFSWAP(AVFrame *, s->frames[VP56_FRAME_CURRENT],
+ s->frames[VP56_FRAME_PREVIOUS]);
+
+ if ((res = av_frame_ref(data, p)) < 0)
+ return res;
 *got_frame = 1;
 
 return avpkt->size;
 }
 
-av_cold void ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha)
+av_cold int ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha)
 {
 VP56Context *s = avctx->priv_data;
 int i;
@@ -673,17 +658,24 @@
 s->avctx = avctx;
 avctx->pix_fmt = has_alpha ? AV_PIX_FMT_YUVA420P : AV_PIX_FMT_YUV420P;
 
- ff_dsputil_init(&s->dsp, avctx);
+ ff_h264chroma_init(&s->h264chroma, 8);
+ ff_hpeldsp_init(&s->hdsp, avctx->flags);
 ff_videodsp_init(&s->vdsp, 8);
 ff_vp3dsp_init(&s->vp3dsp, avctx->flags);
 ff_vp56dsp_init(&s->vp56dsp, avctx->codec->id);
- ff_init_scantable_permutation(s->dsp.idct_permutation, s->vp3dsp.idct_perm);
- ff_init_scantable(s->dsp.idct_permutation, &s->scantable,ff_zigzag_direct);
+ 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
+ }
 
- for (i=0; i<4; i++)
- s->framep[i] = &s->frames[i];
- s->framep[VP56_FRAME_UNUSED] = s->framep[VP56_FRAME_GOLDEN];
- s->framep[VP56_FRAME_UNUSED2] = s->framep[VP56_FRAME_GOLDEN2];
+ for (i = 0; i < FF_ARRAY_ELEMS(s->frames); i++) {
+ s->frames[i] = av_frame_alloc();
+ if (!s->frames[i]) {
+ ff_vp56_free(avctx);
+ return AVERROR(ENOMEM);
+ }
+ }
 s->edge_emu_buffer_alloc = NULL;
 
 s->above_blocks = NULL;
@@ -703,21 +695,21 @@
 s->frbi = 0;
 s->srbi = 2;
 }
+
+ return 0;
 }
 
 av_cold int ff_vp56_free(AVCodecContext *avctx)
 {
 VP56Context *s = avctx->priv_data;
+ int i;
 
- av_freep(&s->qscale_table);
 av_freep(&s->above_blocks);
 av_freep(&s->macroblocks);
 av_freep(&s->edge_emu_buffer_alloc);
- if (s->framep[VP56_FRAME_GOLDEN]->data[0])
- avctx->release_buffer(avctx, s->framep[VP56_FRAME_GOLDEN]);
- if (s->framep[VP56_FRAME_GOLDEN2]->data[0])
- avctx->release_buffer(avctx, s->framep[VP56_FRAME_GOLDEN2]);
- if (s->framep[VP56_FRAME_PREVIOUS]->data[0])
- avctx->release_buffer(avctx, s->framep[VP56_FRAME_PREVIOUS]);
+
+ for (i = 0; i < FF_ARRAY_ELEMS(s->frames); i++)
+ av_frame_free(&s->frames[i]);
+
 return 0;
 }

libav-v9.6.tar.bz2/libavcodec/vp56.h -> libav-v10.1.tar.bz2/libavcodec/vp56.h Changed

@@ -26,16 +26,43 @@
 #ifndef AVCODEC_VP56_H
 #define AVCODEC_VP56_H
 
-#include "vp56data.h"
 #include "dsputil.h"
 #include "get_bits.h"
+#include "hpeldsp.h"
 #include "bytestream.h"
+#include "h264chroma.h"
 #include "videodsp.h"
 #include "vp3dsp.h"
 #include "vp56dsp.h"
 
 typedef struct vp56_context VP56Context;
 
+typedef enum {
+ VP56_FRAME_NONE =-1,
+ VP56_FRAME_CURRENT = 0,
+ VP56_FRAME_PREVIOUS = 1,
+ VP56_FRAME_GOLDEN = 2,
+ VP56_FRAME_GOLDEN2 = 3,
+} VP56Frame;
+
+typedef enum {
+ VP56_MB_INTER_NOVEC_PF = 0, /**< Inter MB, no vector, from previous frame */
+ VP56_MB_INTRA = 1, /**< Intra MB */
+ VP56_MB_INTER_DELTA_PF = 2, /**< Inter MB, above/left vector + delta, from previous frame */
+ VP56_MB_INTER_V1_PF = 3, /**< Inter MB, first vector, from previous frame */
+ VP56_MB_INTER_V2_PF = 4, /**< Inter MB, second vector, from previous frame */
+ VP56_MB_INTER_NOVEC_GF = 5, /**< Inter MB, no vector, from golden frame */
+ VP56_MB_INTER_DELTA_GF = 6, /**< Inter MB, above/left vector + delta, from golden frame */
+ VP56_MB_INTER_4V = 7, /**< Inter MB, 4 vectors, from previous frame */
+ VP56_MB_INTER_V1_GF = 8, /**< Inter MB, first vector, from golden frame */
+ VP56_MB_INTER_V2_GF = 9, /**< Inter MB, second vector, from golden frame */
+} VP56mb;
+
+typedef struct VP56Tree {
+ int8_t val;
+ int8_t prob_idx;
+} VP56Tree;
+
 typedef struct VP56mv {
 DECLARE_ALIGNED(4, int16_t, x);
 int16_t y;
@@ -67,7 +94,7 @@
 typedef struct VP56RefDc {
 uint8_t not_null_dc;
 VP56Frame ref_frame;
- DCTELEM dc_coeff;
+ int16_t dc_coeff;
 } VP56RefDc;
 
 typedef struct VP56Macroblock {
@@ -94,13 +121,13 @@
 
 struct vp56_context {
 AVCodecContext *avctx;
- DSPContext dsp;
+ H264ChromaContext h264chroma;
+ HpelDSPContext hdsp;
 VideoDSPContext vdsp;
 VP3DSPContext vp3dsp;
 VP56DSPContext vp56dsp;
- ScanTable scantable;
- AVFrame frames[4];
- AVFrame *framep[6];
+ uint8_t idct_scantable[64];
+ AVFrame *frames[4];
 uint8_t *edge_emu_buffer_alloc;
 uint8_t *edge_emu_buffer;
 VP56RangeCoder c;
@@ -118,18 +145,17 @@
 int quantizer;
 uint16_t dequant_dc;
 uint16_t dequant_ac;
- int8_t *qscale_table;
 
 /* DC predictors management */
 VP56RefDc *above_blocks;
 VP56RefDc left_block[4];
 int above_block_idx[6];
- DCTELEM prev_dc[3][3]; /* [plan][ref_frame] */
+ int16_t prev_dc[3][3]; /* [plan][ref_frame] */
 
 /* blocks / macroblock */
 VP56mb mb_type;
 VP56Macroblock *macroblocks;
- DECLARE_ALIGNED(16, DCTELEM, block_coeff)[6][64];
+ DECLARE_ALIGNED(16, int16_t, block_coeff)[6][64];
 
 /* motion vectors */
 VP56mv mv[6]; /* vectors for each block in MB */
@@ -177,7 +203,7 @@
 };
 
 
-void ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha);
+int ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha);
 int ff_vp56_free(AVCodecContext *avctx);
 void ff_vp56_init_dequant(VP56Context *s, int quantizer);
 int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,

libav-v9.6.tar.bz2/libavcodec/vp56data.c -> libav-v10.1.tar.bz2/libavcodec/vp56data.c Changed

@@ -66,3 +66,189 @@
 
 const uint8_t ff_vp56_coeff_bias[] = { 0, 1, 2, 3, 4, 5, 7, 11, 19, 35, 67 };
 const uint8_t ff_vp56_coeff_bit_length[] = { 0, 1, 2, 3, 4, 10 };
+
+const VP56Frame ff_vp56_reference_frame[] = {
+    VP56_FRAME_PREVIOUS,  /* VP56_MB_INTER_NOVEC_PF */
+    VP56_FRAME_CURRENT,   /* VP56_MB_INTRA */
+    VP56_FRAME_PREVIOUS,  /* VP56_MB_INTER_DELTA_PF */
+    VP56_FRAME_PREVIOUS,  /* VP56_MB_INTER_V1_PF */
+    VP56_FRAME_PREVIOUS,  /* VP56_MB_INTER_V2_PF */
+    VP56_FRAME_GOLDEN,    /* VP56_MB_INTER_NOVEC_GF */
+    VP56_FRAME_GOLDEN,    /* VP56_MB_INTER_DELTA_GF */
+    VP56_FRAME_PREVIOUS,  /* VP56_MB_INTER_4V */
+    VP56_FRAME_GOLDEN,    /* VP56_MB_INTER_V1_GF */
+    VP56_FRAME_GOLDEN,    /* VP56_MB_INTER_V2_GF */
+};
+
+const uint8_t ff_vp56_ac_dequant[64] = {
+    94, 92, 90, 88, 86, 82, 78, 74,
+    70, 66, 62, 58, 54, 53, 52, 51,
+    50, 49, 48, 47, 46, 45, 44, 43,
+    42, 40, 39, 37, 36, 35, 34, 33,
+    32, 31, 30, 29, 28, 27, 26, 25,
+    24, 23, 22, 21, 20, 19, 18, 17,
+    16, 15, 14, 13, 12, 11, 10,  9,
+     8,  7,  6,  5,  4,  3,  2,  1,
+};
+
+const uint8_t ff_vp56_dc_dequant[64] = {
+    47, 47, 47, 47, 45, 43, 43, 43,
+    43, 43, 42, 41, 41, 40, 40, 40,
+    40, 35, 35, 35, 35, 33, 33, 33,
+    33, 32, 32, 32, 27, 27, 26, 26,
+    25, 25, 24, 24, 23, 23, 19, 19,
+    19, 19, 18, 18, 17, 16, 16, 16,
+    16, 16, 15, 11, 11, 11, 10, 10,
+     9,  8,  7,  5,  3,  3,  2,  2,
+};
+
+const uint8_t ff_vp56_pre_def_mb_type_stats[16][3][10][2] = {
+  { { {   9, 15 }, {  32, 25 }, {  7,  19 }, {   9, 21 }, {  1, 12 },
+      {  14, 12 }, {   3, 18 }, { 14,  23 }, {   3, 10 }, {  0,  4 }, },
+    { {  41, 22 }, {   1,  0 }, {  1,  31 }, {   0,  0 }, {  0,  0 },
+      {   0,  1 }, {   1,  7 }, {  0,   1 }, {  98, 25 }, {  4, 10 }, },
+    { {   2,  3 }, {   2,  3 }, {  0,   2 }, {   0,  2 }, {  0,  0 },
+      {  11,  4 }, {   1,  4 }, {  0,   2 }, {   3,  2 }, {  0,  4 }, }, },
+  { { {  48, 39 }, {   1,  2 }, { 11,  27 }, {  29, 44 }, {  7, 27 },
+      {   1,  4 }, {   0,  3 }, {  1,   6 }, {   1,  2 }, {  0,  0 }, },
+    { { 123, 37 }, {   6,  4 }, {  1,  27 }, {   0,  0 }, {  0,  0 },
+      {   5,  8 }, {   1,  7 }, {  0,   1 }, {  12, 10 }, {  0,  2 }, },
+    { {  49, 46 }, {   3,  4 }, {  7,  31 }, {  42, 41 }, {  0,  0 },
+      {   2,  6 }, {   1,  7 }, {  1,   4 }, {   2,  4 }, {  0,  1 }, }, },
+  { { {  21, 32 }, {   1,  2 }, {  4,  10 }, {  32, 43 }, {  6, 23 },
+      {   2,  3 }, {   1, 19 }, {  1,   6 }, {  12, 21 }, {  0,  7 }, },
+    { {  26, 14 }, {  14, 12 }, {  0,  24 }, {   0,  0 }, {  0,  0 },
+      {  55, 17 }, {   1,  9 }, {  0,  36 }, {   5,  7 }, {  1,  3 }, },
+    { {  26, 25 }, {   1,  1 }, {  2,  10 }, {  67, 39 }, {  0,  0 },
+      {   1,  1 }, {   0, 14 }, {  0,   2 }, {  31, 26 }, {  1,  6 }, }, },
+  { { {  69, 83 }, {   0,  0 }, {  0,   2 }, {  10, 29 }, {  3, 12 },
+      {   0,  1 }, {   0,  3 }, {  0,   3 }, {   2,  2 }, {  0,  0 }, },
+    { { 209,  5 }, {   0,  0 }, {  0,  27 }, {   0,  0 }, {  0,  0 },
+      {   0,  1 }, {   0,  1 }, {  0,   1 }, {   0,  0 }, {  0,  0 }, },
+    { { 103, 46 }, {   1,  2 }, {  2,  10 }, {  33, 42 }, {  0,  0 },
+      {   1,  4 }, {   0,  3 }, {  0,   1 }, {   1,  3 }, {  0,  0 }, }, },
+  { { {  11, 20 }, {   1,  4 }, { 18,  36 }, {  43, 48 }, { 13, 35 },
+      {   0,  2 }, {   0,  5 }, {  3,  12 }, {   1,  2 }, {  0,  0 }, },
+    { {   2,  5 }, {   4,  5 }, {  0, 121 }, {   0,  0 }, {  0,  0 },
+      {   0,  3 }, {   2,  4 }, {  1,   4 }, {   2,  2 }, {  0,  1 }, },
+    { {  14, 31 }, {   9, 13 }, { 14,  54 }, {  22, 29 }, {  0,  0 },
+      {   2,  6 }, {   4, 18 }, {  6,  13 }, {   1,  5 }, {  0,  1 }, }, },
+  { { {  70, 44 }, {   0,  1 }, {  2,  10 }, {  37, 46 }, {  8, 26 },
+      {   0,  2 }, {   0,  2 }, {  0,   2 }, {   0,  1 }, {  0,  0 }, },
+    { { 175,  5 }, {   0,  1 }, {  0,  48 }, {   0,  0 }, {  0,  0 },
+      {   0,  2 }, {   0,  1 }, {  0,   2 }, {   0,  1 }, {  0,  0 }, },
+    { {  85, 39 }, {   0,  0 }, {  1,   9 }, {  69, 40 }, {  0,  0 },
+      {   0,  1 }, {   0,  3 }, {  0,   1 }, {   2,  3 }, {  0,  0 }, }, },
+  { { {   8, 15 }, {   0,  1 }, {  8,  21 }, {  74, 53 }, { 22, 42 },
+      {   0,  1 }, {   0,  2 }, {  0,   3 }, {   1,  2 }, {  0,  0 }, },
+    { {  83,  5 }, {   2,  3 }, {  0, 102 }, {   0,  0 }, {  0,  0 },
+      {   1,  3 }, {   0,  2 }, {  0,   1 }, {   0,  0 }, {  0,  0 }, },
+    { {  31, 28 }, {   0,  0 }, {  3,  14 }, { 130, 34 }, {  0,  0 },
+      {   0,  1 }, {   0,  3 }, {  0,   1 }, {   3,  3 }, {  0,  1 }, }, },
+  { { { 141, 42 }, {   0,  0 }, {  1,   4 }, {  11, 24 }, {  1, 11 },
+      {   0,  1 }, {   0,  1 }, {  0,   2 }, {   0,  0 }, {  0,  0 }, },
+    { { 233,  6 }, {   0,  0 }, {  0,   8 }, {   0,  0 }, {  0,  0 },
+      {   0,  1 }, {   0,  1 }, {  0,   0 }, {   0,  1 }, {  0,  0 }, },
+    { { 171, 25 }, {   0,  0 }, {  1,   5 }, {  25, 21 }, {  0,  0 },
+      {   0,  1 }, {   0,  1 }, {  0,   0 }, {   0,  0 }, {  0,  0 }, }, },
+  { { {   8, 19 }, {   4, 10 }, { 24,  45 }, {  21, 37 }, {  9, 29 },
+      {   0,  3 }, {   1,  7 }, { 11,  25 }, {   0,  2 }, {  0,  1 }, },
+    { {  34, 16 }, { 112, 21 }, {  1,  28 }, {   0,  0 }, {  0,  0 },
+      {   6,  8 }, {   1,  7 }, {  0,   3 }, {   2,  5 }, {  0,  2 }, },
+    { {  17, 21 }, {  68, 29 }, {  6,  15 }, {  13, 22 }, {  0,  0 },
+      {   6, 12 }, {   3, 14 }, {  4,  10 }, {   1,  7 }, {  0,  3 }, }, },
+  { { {  46, 42 }, {   0,  1 }, {  2,  10 }, {  54, 51 }, { 10, 30 },
+      {   0,  2 }, {   0,  2 }, {  0,   1 }, {   0,  1 }, {  0,  0 }, },
+    { { 159, 35 }, {   2,  2 }, {  0,  25 }, {   0,  0 }, {  0,  0 },
+      {   3,  6 }, {   0,  5 }, {  0,   1 }, {   4,  4 }, {  0,  1 }, },
+    { {  51, 39 }, {   0,  1 }, {  2,  12 }, {  91, 44 }, {  0,  0 },
+      {   0,  2 }, {   0,  3 }, {  0,   1 }, {   2,  3 }, {  0,  1 }, }, },
+  { { {  28, 32 }, {   0,  0 }, {  3,  10 }, {  75, 51 }, { 14, 33 },
+      {   0,  1 }, {   0,  2 }, {  0,   1 }, {   1,  2 }, {  0,  0 }, },
+    { {  75, 39 }, {   5,  7 }, {  2,  48 }, {   0,  0 }, {  0,  0 },
+      {   3, 11 }, {   2, 16 }, {  1,   4 }, {   7, 10 }, {  0,  2 }, },
+    { {  81, 25 }, {   0,  0 }, {  2,   9 }, { 106, 26 }, {  0,  0 },
+      {   0,  1 }, {   0,  1 }, {  0,   1 }, {   1,  1 }, {  0,  0 }, }, },
+  { { { 100, 46 }, {   0,  1 }, {  3,   9 }, {  21, 37 }, {  5, 20 },
+      {   0,  1 }, {   0,  2 }, {  1,   2 }, {   0,  1 }, {  0,  0 }, },
+    { { 212, 21 }, {   0,  1 }, {  0,   9 }, {   0,  0 }, {  0,  0 },
+      {   1,  2 }, {   0,  2 }, {  0,   0 }, {   2,  2 }, {  0,  0 }, },
+    { { 140, 37 }, {   0,  1 }, {  1,   8 }, {  24, 33 }, {  0,  0 },
+      {   1,  2 }, {   0,  2 }, {  0,   1 }, {   1,  2 }, {  0,  0 }, }, },
+  { { {  27, 29 }, {   0,  1 }, {  9,  25 }, {  53, 51 }, { 12, 34 },
+      {   0,  1 }, {   0,  3 }, {  1,   5 }, {   0,  2 }, {  0,  0 }, },
+    { {   4,  2 }, {   0,  0 }, {  0, 172 }, {   0,  0 }, {  0,  0 },
+      {   0,  1 }, {   0,  2 }, {  0,   0 }, {   2,  0 }, {  0,  0 }, },
+    { {  14, 23 }, {   1,  3 }, { 11,  53 }, {  90, 31 }, {  0,  0 },
+      {   0,  3 }, {   1,  5 }, {  2,   6 }, {   1,  2 }, {  0,  0 }, }, },
+  { { {  80, 38 }, {   0,  0 }, {  1,   4 }, {  69, 33 }, {  5, 16 },
+      {   0,  1 }, {   0,  1 }, {  0,   0 }, {   0,  1 }, {  0,  0 }, },
+    { { 187, 22 }, {   1,  1 }, {  0,  17 }, {   0,  0 }, {  0,  0 },
+      {   3,  6 }, {   0,  4 }, {  0,   1 }, {   4,  4 }, {  0,  1 }, },
+    { { 123, 29 }, {   0,  0 }, {  1,   7 }, {  57, 30 }, {  0,  0 },
+      {   0,  1 }, {   0,  1 }, {  0,   1 }, {   0,  1 }, {  0,  0 }, }, },
+  { { {  16, 20 }, {   0,  0 }, {  2,   8 }, { 104, 49 }, { 15, 33 },
+      {   0,  1 }, {   0,  1 }, {  0,   1 }, {   1,  1 }, {  0,  0 }, },
+    { { 133,  6 }, {   1,  2 }, {  1,  70 }, {   0,  0 }, {  0,  0 },
+      {   0,  2 }, {   0,  4 }, {  0,   3 }, {   1,  1 }, {  0,  0 }, },
+    { {  13, 14 }, {   0,  0 }, {  4,  20 }, { 175, 20 }, {  0,  0 },
+      {   0,  1 }, {   0,  1 }, {  0,   1 }, {   1,  1 }, {  0,  0 }, }, },
+  { { { 194, 16 }, {   0,  0 }, {  1,   1 }, {   1,  9 }, {  1,  3 },
+      {   0,  0 }, {   0,  1 }, {  0,   1 }, {   0,  0 }, {  0,  0 }, },
+    { { 251,  1 }, {   0,  0 }, {  0,   2 }, {   0,  0 }, {  0,  0 },
+      {   0,  0 }, {   0,  0 }, {  0,   0 }, {   0,  0 }, {  0,  0 }, },
+    { { 202, 23 }, {   0,  0 }, {  1,   3 }, {   2,  9 }, {  0,  0 },
+      {   0,  1 }, {   0,  1 }, {  0,   1 }, {   0,  0 }, {  0,  0 }, }, },
+};
+
+const uint8_t ff_vp56_filter_threshold[] = {
+    14, 14, 13, 13, 12, 12, 10, 10,
+    10, 10,  8,  8,  8,  8,  8,  8,
+     8,  8,  8,  8,  8,  8,  8,  8,
+     8,  8,  8,  8,  8,  8,  8,  8,
+     8,  8,  8,  8,  7,  7,  7,  7,
+     7,  7,  6,  6,  6,  6,  6,  6,
+     5,  5,  5,  5,  4,  4,  4,  4,
+     4,  4,  4,  3,  3,  3,  3,  2,
+};
+
+const uint8_t ff_vp56_mb_type_model_model[] = {
+    171, 83, 199, 140, 125, 104,
+};
+
+const VP56Tree ff_vp56_pmbtm_tree[] = {
+    { 4, 0},
+    { 2, 1}, {-8}, {-4},
+    { 8, 2},
+    { 6, 3},
+    { 4, 4},
+    { 2, 5}, {-24}, {-20}, {-16}, {-12}, {-0},
+};
+
+const VP56Tree ff_vp56_pmbt_tree[] = {
+    { 8, 1},
+    { 4, 2},
+    { 2, 4}, {-VP56_MB_INTER_NOVEC_PF}, {-VP56_MB_INTER_DELTA_PF},
+    { 2, 5}, {-VP56_MB_INTER_V1_PF},    {-VP56_MB_INTER_V2_PF},
+    { 4, 3},
+    { 2, 6}, {-VP56_MB_INTRA},          {-VP56_MB_INTER_4V},
+    { 4, 7},
+    { 2, 8}, {-VP56_MB_INTER_NOVEC_GF}, {-VP56_MB_INTER_DELTA_GF},
+    { 2, 9}, {-VP56_MB_INTER_V1_GF},    {-VP56_MB_INTER_V2_GF},
+};
+
+/* relative pos of surrounding blocks, from closest to farthest */
+const int8_t ff_vp56_candidate_predictor_pos[12][2] = {
+    {  0, -1 },
+    { -1,  0 },
+    { -1, -1 },
+    {  1, -1 },
+    {  0, -2 },
+    { -2,  0 },
+    { -2, -1 },
+    { -1, -2 },
+    {  1, -2 },
+    {  2, -1 },
+    { -2, -2 },
+    {  2, -2 },
+};

libav-v9.6.tar.bz2/libavcodec/vp56data.h -> libav-v10.1.tar.bz2/libavcodec/vp56data.h Changed

@@ -27,34 +27,7 @@
 #define AVCODEC_VP56DATA_H
 
 #include "libavutil/common.h"
-
-typedef enum {
- VP56_FRAME_NONE =-1,
- VP56_FRAME_CURRENT = 0,
- VP56_FRAME_PREVIOUS = 1,
- VP56_FRAME_GOLDEN = 2,
- VP56_FRAME_GOLDEN2 = 3,
- VP56_FRAME_UNUSED = 4,
- VP56_FRAME_UNUSED2 = 5,
-} VP56Frame;
-
-typedef enum {
- VP56_MB_INTER_NOVEC_PF = 0, /**< Inter MB, no vector, from previous frame */
- VP56_MB_INTRA = 1, /**< Intra MB */
- VP56_MB_INTER_DELTA_PF = 2, /**< Inter MB, above/left vector + delta, from previous frame */
- VP56_MB_INTER_V1_PF = 3, /**< Inter MB, first vector, from previous frame */
- VP56_MB_INTER_V2_PF = 4, /**< Inter MB, second vector, from previous frame */
- VP56_MB_INTER_NOVEC_GF = 5, /**< Inter MB, no vector, from golden frame */
- VP56_MB_INTER_DELTA_GF = 6, /**< Inter MB, above/left vector + delta, from golden frame */
- VP56_MB_INTER_4V = 7, /**< Inter MB, 4 vectors, from previous frame */
- VP56_MB_INTER_V1_GF = 8, /**< Inter MB, first vector, from golden frame */
- VP56_MB_INTER_V2_GF = 9, /**< Inter MB, second vector, from golden frame */
-} VP56mb;
-
-typedef struct VP56Tree {
- int8_t val;
- int8_t prob_idx;
-} VP56Tree;
+#include "vp56.h"
 
 extern const uint8_t ff_vp56_b2p[];
 extern const uint8_t ff_vp56_b6to4[];
@@ -65,190 +38,14 @@
 extern const uint8_t ff_vp56_coeff_bias[];
 extern const uint8_t ff_vp56_coeff_bit_length[];
 
-static const VP56Frame vp56_reference_frame[] = {
- VP56_FRAME_PREVIOUS, /* VP56_MB_INTER_NOVEC_PF */
- VP56_FRAME_CURRENT, /* VP56_MB_INTRA */
- VP56_FRAME_PREVIOUS, /* VP56_MB_INTER_DELTA_PF */
- VP56_FRAME_PREVIOUS, /* VP56_MB_INTER_V1_PF */
- VP56_FRAME_PREVIOUS, /* VP56_MB_INTER_V2_PF */
- VP56_FRAME_GOLDEN, /* VP56_MB_INTER_NOVEC_GF */
- VP56_FRAME_GOLDEN, /* VP56_MB_INTER_DELTA_GF */
- VP56_FRAME_PREVIOUS, /* VP56_MB_INTER_4V */
- VP56_FRAME_GOLDEN, /* VP56_MB_INTER_V1_GF */
- VP56_FRAME_GOLDEN, /* VP56_MB_INTER_V2_GF */
-};
-
-static const uint8_t vp56_ac_dequant[64] = {
- 94, 92, 90, 88, 86, 82, 78, 74,
- 70, 66, 62, 58, 54, 53, 52, 51,
- 50, 49, 48, 47, 46, 45, 44, 43,
- 42, 40, 39, 37, 36, 35, 34, 33,
- 32, 31, 30, 29, 28, 27, 26, 25,
- 24, 23, 22, 21, 20, 19, 18, 17,
- 16, 15, 14, 13, 12, 11, 10, 9,
- 8, 7, 6, 5, 4, 3, 2, 1,
-};
-
-static const uint8_t vp56_dc_dequant[64] = {
- 47, 47, 47, 47, 45, 43, 43, 43,
- 43, 43, 42, 41, 41, 40, 40, 40,
- 40, 35, 35, 35, 35, 33, 33, 33,
- 33, 32, 32, 32, 27, 27, 26, 26,
- 25, 25, 24, 24, 23, 23, 19, 19,
- 19, 19, 18, 18, 17, 16, 16, 16,
- 16, 16, 15, 11, 11, 11, 10, 10,
- 9, 8, 7, 5, 3, 3, 2, 2,
-};
-
-static const uint8_t vp56_pre_def_mb_type_stats[16][3][10][2] = {
- { { { 9, 15 }, { 32, 25 }, { 7, 19 }, { 9, 21 }, { 1, 12 },
- { 14, 12 }, { 3, 18 }, { 14, 23 }, { 3, 10 }, { 0, 4 }, },
- { { 41, 22 }, { 1, 0 }, { 1, 31 }, { 0, 0 }, { 0, 0 },
- { 0, 1 }, { 1, 7 }, { 0, 1 }, { 98, 25 }, { 4, 10 }, },
- { { 2, 3 }, { 2, 3 }, { 0, 2 }, { 0, 2 }, { 0, 0 },
- { 11, 4 }, { 1, 4 }, { 0, 2 }, { 3, 2 }, { 0, 4 }, }, },
- { { { 48, 39 }, { 1, 2 }, { 11, 27 }, { 29, 44 }, { 7, 27 },
- { 1, 4 }, { 0, 3 }, { 1, 6 }, { 1, 2 }, { 0, 0 }, },
- { { 123, 37 }, { 6, 4 }, { 1, 27 }, { 0, 0 }, { 0, 0 },
- { 5, 8 }, { 1, 7 }, { 0, 1 }, { 12, 10 }, { 0, 2 }, },
- { { 49, 46 }, { 3, 4 }, { 7, 31 }, { 42, 41 }, { 0, 0 },
- { 2, 6 }, { 1, 7 }, { 1, 4 }, { 2, 4 }, { 0, 1 }, }, },
- { { { 21, 32 }, { 1, 2 }, { 4, 10 }, { 32, 43 }, { 6, 23 },
- { 2, 3 }, { 1, 19 }, { 1, 6 }, { 12, 21 }, { 0, 7 }, },
- { { 26, 14 }, { 14, 12 }, { 0, 24 }, { 0, 0 }, { 0, 0 },
- { 55, 17 }, { 1, 9 }, { 0, 36 }, { 5, 7 }, { 1, 3 }, },
- { { 26, 25 }, { 1, 1 }, { 2, 10 }, { 67, 39 }, { 0, 0 },
- { 1, 1 }, { 0, 14 }, { 0, 2 }, { 31, 26 }, { 1, 6 }, }, },
- { { { 69, 83 }, { 0, 0 }, { 0, 2 }, { 10, 29 }, { 3, 12 },
- { 0, 1 }, { 0, 3 }, { 0, 3 }, { 2, 2 }, { 0, 0 }, },
- { { 209, 5 }, { 0, 0 }, { 0, 27 }, { 0, 0 }, { 0, 0 },
- { 0, 1 }, { 0, 1 }, { 0, 1 }, { 0, 0 }, { 0, 0 }, },
- { { 103, 46 }, { 1, 2 }, { 2, 10 }, { 33, 42 }, { 0, 0 },
- { 1, 4 }, { 0, 3 }, { 0, 1 }, { 1, 3 }, { 0, 0 }, }, },
- { { { 11, 20 }, { 1, 4 }, { 18, 36 }, { 43, 48 }, { 13, 35 },
- { 0, 2 }, { 0, 5 }, { 3, 12 }, { 1, 2 }, { 0, 0 }, },
- { { 2, 5 }, { 4, 5 }, { 0, 121 }, { 0, 0 }, { 0, 0 },
- { 0, 3 }, { 2, 4 }, { 1, 4 }, { 2, 2 }, { 0, 1 }, },
- { { 14, 31 }, { 9, 13 }, { 14, 54 }, { 22, 29 }, { 0, 0 },
- { 2, 6 }, { 4, 18 }, { 6, 13 }, { 1, 5 }, { 0, 1 }, }, },
- { { { 70, 44 }, { 0, 1 }, { 2, 10 }, { 37, 46 }, { 8, 26 },
- { 0, 2 }, { 0, 2 }, { 0, 2 }, { 0, 1 }, { 0, 0 }, },
- { { 175, 5 }, { 0, 1 }, { 0, 48 }, { 0, 0 }, { 0, 0 },
- { 0, 2 }, { 0, 1 }, { 0, 2 }, { 0, 1 }, { 0, 0 }, },
- { { 85, 39 }, { 0, 0 }, { 1, 9 }, { 69, 40 }, { 0, 0 },
- { 0, 1 }, { 0, 3 }, { 0, 1 }, { 2, 3 }, { 0, 0 }, }, },
- { { { 8, 15 }, { 0, 1 }, { 8, 21 }, { 74, 53 }, { 22, 42 },
- { 0, 1 }, { 0, 2 }, { 0, 3 }, { 1, 2 }, { 0, 0 }, },
- { { 83, 5 }, { 2, 3 }, { 0, 102 }, { 0, 0 }, { 0, 0 },
- { 1, 3 }, { 0, 2 }, { 0, 1 }, { 0, 0 }, { 0, 0 }, },
- { { 31, 28 }, { 0, 0 }, { 3, 14 }, { 130, 34 }, { 0, 0 },
- { 0, 1 }, { 0, 3 }, { 0, 1 }, { 3, 3 }, { 0, 1 }, }, },
- { { { 141, 42 }, { 0, 0 }, { 1, 4 }, { 11, 24 }, { 1, 11 },
- { 0, 1 }, { 0, 1 }, { 0, 2 }, { 0, 0 }, { 0, 0 }, },
- { { 233, 6 }, { 0, 0 }, { 0, 8 }, { 0, 0 }, { 0, 0 },
- { 0, 1 }, { 0, 1 }, { 0, 0 }, { 0, 1 }, { 0, 0 }, },
- { { 171, 25 }, { 0, 0 }, { 1, 5 }, { 25, 21 }, { 0, 0 },
- { 0, 1 }, { 0, 1 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, }, },
- { { { 8, 19 }, { 4, 10 }, { 24, 45 }, { 21, 37 }, { 9, 29 },
- { 0, 3 }, { 1, 7 }, { 11, 25 }, { 0, 2 }, { 0, 1 }, },
- { { 34, 16 }, { 112, 21 }, { 1, 28 }, { 0, 0 }, { 0, 0 },
- { 6, 8 }, { 1, 7 }, { 0, 3 }, { 2, 5 }, { 0, 2 }, },
- { { 17, 21 }, { 68, 29 }, { 6, 15 }, { 13, 22 }, { 0, 0 },
- { 6, 12 }, { 3, 14 }, { 4, 10 }, { 1, 7 }, { 0, 3 }, }, },
- { { { 46, 42 }, { 0, 1 }, { 2, 10 }, { 54, 51 }, { 10, 30 },
- { 0, 2 }, { 0, 2 }, { 0, 1 }, { 0, 1 }, { 0, 0 }, },
- { { 159, 35 }, { 2, 2 }, { 0, 25 }, { 0, 0 }, { 0, 0 },
- { 3, 6 }, { 0, 5 }, { 0, 1 }, { 4, 4 }, { 0, 1 }, },
- { { 51, 39 }, { 0, 1 }, { 2, 12 }, { 91, 44 }, { 0, 0 },
- { 0, 2 }, { 0, 3 }, { 0, 1 }, { 2, 3 }, { 0, 1 }, }, },
- { { { 28, 32 }, { 0, 0 }, { 3, 10 }, { 75, 51 }, { 14, 33 },
- { 0, 1 }, { 0, 2 }, { 0, 1 }, { 1, 2 }, { 0, 0 }, },
- { { 75, 39 }, { 5, 7 }, { 2, 48 }, { 0, 0 }, { 0, 0 },
- { 3, 11 }, { 2, 16 }, { 1, 4 }, { 7, 10 }, { 0, 2 }, },
- { { 81, 25 }, { 0, 0 }, { 2, 9 }, { 106, 26 }, { 0, 0 },
- { 0, 1 }, { 0, 1 }, { 0, 1 }, { 1, 1 }, { 0, 0 }, }, },
- { { { 100, 46 }, { 0, 1 }, { 3, 9 }, { 21, 37 }, { 5, 20 },
- { 0, 1 }, { 0, 2 }, { 1, 2 }, { 0, 1 }, { 0, 0 }, },
- { { 212, 21 }, { 0, 1 }, { 0, 9 }, { 0, 0 }, { 0, 0 },
- { 1, 2 }, { 0, 2 }, { 0, 0 }, { 2, 2 }, { 0, 0 }, },
- { { 140, 37 }, { 0, 1 }, { 1, 8 }, { 24, 33 }, { 0, 0 },
- { 1, 2 }, { 0, 2 }, { 0, 1 }, { 1, 2 }, { 0, 0 }, }, },
- { { { 27, 29 }, { 0, 1 }, { 9, 25 }, { 53, 51 }, { 12, 34 },
- { 0, 1 }, { 0, 3 }, { 1, 5 }, { 0, 2 }, { 0, 0 }, },
- { { 4, 2 }, { 0, 0 }, { 0, 172 }, { 0, 0 }, { 0, 0 },
- { 0, 1 }, { 0, 2 }, { 0, 0 }, { 2, 0 }, { 0, 0 }, },
- { { 14, 23 }, { 1, 3 }, { 11, 53 }, { 90, 31 }, { 0, 0 },
- { 0, 3 }, { 1, 5 }, { 2, 6 }, { 1, 2 }, { 0, 0 }, }, },
- { { { 80, 38 }, { 0, 0 }, { 1, 4 }, { 69, 33 }, { 5, 16 },
- { 0, 1 }, { 0, 1 }, { 0, 0 }, { 0, 1 }, { 0, 0 }, },
- { { 187, 22 }, { 1, 1 }, { 0, 17 }, { 0, 0 }, { 0, 0 },
- { 3, 6 }, { 0, 4 }, { 0, 1 }, { 4, 4 }, { 0, 1 }, },
- { { 123, 29 }, { 0, 0 }, { 1, 7 }, { 57, 30 }, { 0, 0 },
- { 0, 1 }, { 0, 1 }, { 0, 1 }, { 0, 1 }, { 0, 0 }, }, },
- { { { 16, 20 }, { 0, 0 }, { 2, 8 }, { 104, 49 }, { 15, 33 },
- { 0, 1 }, { 0, 1 }, { 0, 1 }, { 1, 1 }, { 0, 0 }, },
- { { 133, 6 }, { 1, 2 }, { 1, 70 }, { 0, 0 }, { 0, 0 },
- { 0, 2 }, { 0, 4 }, { 0, 3 }, { 1, 1 }, { 0, 0 }, },
- { { 13, 14 }, { 0, 0 }, { 4, 20 }, { 175, 20 }, { 0, 0 },
- { 0, 1 }, { 0, 1 }, { 0, 1 }, { 1, 1 }, { 0, 0 }, }, },
- { { { 194, 16 }, { 0, 0 }, { 1, 1 }, { 1, 9 }, { 1, 3 },
- { 0, 0 }, { 0, 1 }, { 0, 1 }, { 0, 0 }, { 0, 0 }, },
- { { 251, 1 }, { 0, 0 }, { 0, 2 }, { 0, 0 }, { 0, 0 },
- { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, },
- { { 202, 23 }, { 0, 0 }, { 1, 3 }, { 2, 9 }, { 0, 0 },
- { 0, 1 }, { 0, 1 }, { 0, 1 }, { 0, 0 }, { 0, 0 }, }, },
-};
-
-static const uint8_t vp56_filter_threshold[] = {
- 14, 14, 13, 13, 12, 12, 10, 10,
- 10, 10, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 7, 7, 7, 7,
- 7, 7, 6, 6, 6, 6, 6, 6,
- 5, 5, 5, 5, 4, 4, 4, 4,
- 4, 4, 4, 3, 3, 3, 3, 2,
-};
-
-static const uint8_t vp56_mb_type_model_model[] = {
- 171, 83, 199, 140, 125, 104,
-};
-
-static const VP56Tree vp56_pmbtm_tree[] = {
- { 4, 0},
- { 2, 1}, {-8}, {-4},
- { 8, 2},
- { 6, 3},
- { 4, 4},
- { 2, 5}, {-24}, {-20}, {-16}, {-12}, {-0},
-};
-
-static const VP56Tree vp56_pmbt_tree[] = {
- { 8, 1},
- { 4, 2},
- { 2, 4}, {-VP56_MB_INTER_NOVEC_PF}, {-VP56_MB_INTER_DELTA_PF},
- { 2, 5}, {-VP56_MB_INTER_V1_PF}, {-VP56_MB_INTER_V2_PF},
- { 4, 3},
- { 2, 6}, {-VP56_MB_INTRA}, {-VP56_MB_INTER_4V},
- { 4, 7},
- { 2, 8}, {-VP56_MB_INTER_NOVEC_GF}, {-VP56_MB_INTER_DELTA_GF},
- { 2, 9}, {-VP56_MB_INTER_V1_GF}, {-VP56_MB_INTER_V2_GF},
-};
-
-/* relative pos of surrounding blocks, from closest to farthest */
-static const int8_t vp56_candidate_predictor_pos[12][2] = {
- { 0, -1 },
- { -1, 0 },
- { -1, -1 },
- { 1, -1 },
- { 0, -2 },
- { -2, 0 },
- { -2, -1 },
- { -1, -2 },
- { 1, -2 },
- { 2, -1 },
- { -2, -2 },
- { 2, -2 },
-};
+extern const VP56Frame ff_vp56_reference_frame[];
+extern const uint8_t ff_vp56_ac_dequant[64];
+extern const uint8_t ff_vp56_dc_dequant[64];
+extern const uint8_t ff_vp56_pre_def_mb_type_stats[16][3][10][2];
+extern const uint8_t ff_vp56_filter_threshold[];
+extern const uint8_t ff_vp56_mb_type_model_model[];
+extern const VP56Tree ff_vp56_pmbtm_tree[];
+extern const VP56Tree ff_vp56_pmbt_tree[];
+extern const int8_t ff_vp56_candidate_predictor_pos[12][2];
 
 #endif /* AVCODEC_VP56DATA_H */

libav-v9.6.tar.bz2/libavcodec/vp56dsp.c -> libav-v10.1.tar.bz2/libavcodec/vp56dsp.c Changed

libav-v9.6.tar.bz2/libavcodec/vp56dsp.h -> libav-v10.1.tar.bz2/libavcodec/vp56dsp.h Changed

libav-v9.6.tar.bz2/libavcodec/vp6.c -> libav-v10.1.tar.bz2/libavcodec/vp6.c Changed

@@ -30,9 +30,9 @@
 #include <stdlib.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "get_bits.h"
 #include "huffman.h"
+#include "internal.h"
 
 #include "vp56.h"
 #include "vp56data.h"
@@ -55,16 +55,16 @@
 int res = 0;
 int separated_coeff = buf[0] & 1;
 
- s->framep[VP56_FRAME_CURRENT]->key_frame = !(buf[0] & 0x80);
+ s->frames[VP56_FRAME_CURRENT]->key_frame = !(buf[0] & 0x80);
 ff_vp56_init_dequant(s, (buf[0] >> 1) & 0x3F);
 
- if (s->framep[VP56_FRAME_CURRENT]->key_frame) {
+ if (s->frames[VP56_FRAME_CURRENT]->key_frame) {
 sub_version = buf[1] >> 3;
 if (sub_version > 8)
 return AVERROR_INVALIDDATA;
 s->filter_header = buf[1] & 0x06;
 if (buf[1] & 1) {
- av_log_missing_feature(s->avctx, "Interlacing", 0);
+ avpriv_report_missing_feature(s->avctx, "Interlacing");
 return AVERROR_PATCHWELCOME;
 }
 if (separated_coeff || !s->filter_header) {
@@ -85,10 +85,23 @@
 if (!s->macroblocks || /* first frame */
 16*cols != s->avctx->coded_width ||
 16*rows != s->avctx->coded_height) {
- avcodec_set_dimensions(s->avctx, 16*cols, 16*rows);
- if (s->avctx->extradata_size == 1) {
- s->avctx->width -= s->avctx->extradata[0] >> 4;
- s->avctx->height -= s->avctx->extradata[0] & 0x0F;
+ if (s->avctx->extradata_size == 0 &&
+ FFALIGN(s->avctx->width, 16) == 16 * cols &&
+ FFALIGN(s->avctx->height, 16) == 16 * rows) {
+ // We assume this is properly signalled container cropping,
+ // in an F4V file. Just set the coded_width/height, don't
+ // touch the cropped ones.
+ s->avctx->coded_width = 16 * cols;
+ s->avctx->coded_height = 16 * rows;
+ } else {
+ 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;
+ }
 }
 res = VP56_SIZE_CHANGE;
 }
@@ -144,8 +157,8 @@
 buf += coeff_offset;
 buf_size -= coeff_offset;
 if (buf_size < 0) {
- if (s->framep[VP56_FRAME_CURRENT]->key_frame)
- avcodec_set_dimensions(s->avctx, 0, 0);
+ if (s->frames[VP56_FRAME_CURRENT]->key_frame)
+ ff_set_dimensions(s->avctx, 0, 0);
 return AVERROR_INVALIDDATA;
 }
 if (s->use_huffman) {
@@ -259,7 +272,7 @@
 if (vp56_rac_get_prob(c, vp6_dccv_pct[pt][node])) {
 def_prob[node] = vp56_rac_gets_nn(c, 7);
 model->coeff_dccv[pt][node] = def_prob[node];
- } else if (s->framep[VP56_FRAME_CURRENT]->key_frame) {
+ } else if (s->frames[VP56_FRAME_CURRENT]->key_frame) {
 model->coeff_dccv[pt][node] = def_prob[node];
 }
 
@@ -282,7 +295,7 @@
 if (vp56_rac_get_prob(c, vp6_ract_pct[ct][pt][cg][node])) {
 def_prob[node] = vp56_rac_gets_nn(c, 7);
 model->coeff_ract[pt][ct][cg][node] = def_prob[node];
- } else if (s->framep[VP56_FRAME_CURRENT]->key_frame) {
+ } else if (s->frames[VP56_FRAME_CURRENT]->key_frame) {
 model->coeff_ract[pt][ct][cg][node] = def_prob[node];
 }
 
@@ -369,7 +382,7 @@
 static void vp6_parse_coeff_huffman(VP56Context *s)
 {
 VP56Model *model = s->modelp;
- uint8_t *permute = s->scantable.permutated;
+ uint8_t *permute = s->idct_scantable;
 VLC *vlc_coeff;
 int coeff, sign, coeff_idx;
 int b, cg, idx;
@@ -429,7 +442,7 @@
 {
 VP56RangeCoder *c = s->ccp;
 VP56Model *model = s->modelp;
- uint8_t *permute = s->scantable.permutated;
+ uint8_t *permute = s->idct_scantable;
 uint8_t *model1, *model2, *model3;
 int coeff, sign, coeff_idx;
 int b, i, cg, idx, ctx;
@@ -536,8 +549,8 @@
 int stride, int h_weight, int v_weight)
 {
 uint8_t *tmp = s->edge_emu_buffer+16;
- s->dsp.put_h264_chroma_pixels_tab[0](tmp, src, stride, 9, h_weight, 0);
- s->dsp.put_h264_chroma_pixels_tab[0](dst, tmp, stride, 8, 0, v_weight);
+ s->h264chroma.put_h264_chroma_pixels_tab[0](tmp, src, stride, 9, h_weight, 0);
+ s->h264chroma.put_h264_chroma_pixels_tab[0](dst, tmp, stride, 8, 0, v_weight);
 }
 
 static void vp6_filter(VP56Context *s, uint8_t *dst, uint8_t *src,
@@ -583,7 +596,7 @@
 }
 } else {
 if (!x8 || !y8) {
- s->dsp.put_h264_chroma_pixels_tab[0](dst, src+offset1, stride, 8, x8, y8);
+ s->h264chroma.put_h264_chroma_pixels_tab[0](dst, src + offset1, stride, 8, x8, y8);
 } else {
 vp6_filter_diag2(s, dst, src+offset1 + ((mv.x^mv.y)>>31), stride, x8, y8);
 }
@@ -593,9 +606,12 @@
 static av_cold int vp6_decode_init(AVCodecContext *avctx)
 {
 VP56Context *s = avctx->priv_data;
+ int ret;
+
+ if ((ret = ff_vp56_init(avctx, avctx->codec->id == AV_CODEC_ID_VP6,
+ avctx->codec->id == AV_CODEC_ID_VP6A)) < 0)
+ return ret;
 
- ff_vp56_init(avctx, avctx->codec->id == AV_CODEC_ID_VP6,
- avctx->codec->id == AV_CODEC_ID_VP6A);
 s->vp56_coord_div = vp6_coord_div;
 s->parse_vector_adjustment = vp6_parse_vector_adjustment;
 s->filter = vp6_filter;
@@ -626,6 +642,7 @@
 
 AVCodec ff_vp6_decoder = {
 .name = "vp6",
+ .long_name = NULL_IF_CONFIG_SMALL("On2 VP6"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_VP6,
 .priv_data_size = sizeof(VP56Context),
@@ -633,12 +650,12 @@
 .close = vp6_decode_free,
 .decode = ff_vp56_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("On2 VP6"),
 };
 
 /* flash version, not flipped upside-down */
 AVCodec ff_vp6f_decoder = {
 .name = "vp6f",
+ .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version)"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_VP6F,
 .priv_data_size = sizeof(VP56Context),
@@ -646,12 +663,12 @@
 .close = vp6_decode_free,
 .decode = ff_vp56_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version)"),
 };
 
 /* flash version, not flipped upside-down, with alpha channel */
 AVCodec ff_vp6a_decoder = {
 .name = "vp6a",
+ .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_VP6A,
 .priv_data_size = sizeof(VP56Context),
@@ -659,5 +676,4 @@
 .close = vp6_decode_free,
 .decode = ff_vp56_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"),
 };

libav-v9.6.tar.bz2/libavcodec/vp6data.h -> libav-v10.1.tar.bz2/libavcodec/vp6data.h Changed

libav-v9.6.tar.bz2/libavcodec/vp8.c -> libav-v10.1.tar.bz2/libavcodec/vp8.c Changed

@@ -45,7 +45,6 @@
 pthread_mutex_destroy(&s->thread_data[i].lock);
 #endif
 av_freep(&s->thread_data[i].filter_strength);
- av_freep(&s->thread_data[i].edge_emu_buffer);
 }
 av_freep(&s->thread_data);
 av_freep(&s->macroblocks_base);
@@ -56,79 +55,73 @@
 s->macroblocks = NULL;
 }
 
-static int vp8_alloc_frame(VP8Context *s, AVFrame *f)
+static int vp8_alloc_frame(VP8Context *s, VP8Frame *f, int ref)
 {
 int ret;
- if ((ret = ff_thread_get_buffer(s->avctx, f)) < 0)
+ if ((ret = ff_thread_get_buffer(s->avctx, &f->tf,
+ ref ? AV_GET_BUFFER_FLAG_REF : 0)) < 0)
 return ret;
- if (s->num_maps_to_be_freed && !s->maps_are_invalid) {
- f->ref_index[0] = s->segmentation_maps[--s->num_maps_to_be_freed];
- } else if (!(f->ref_index[0] = av_mallocz(s->mb_width * s->mb_height))) {
- ff_thread_release_buffer(s->avctx, f);
+ if (!(f->seg_map = av_buffer_allocz(s->mb_width * s->mb_height))) {
+ ff_thread_release_buffer(s->avctx, &f->tf);
 return AVERROR(ENOMEM);
 }
 return 0;
 }
 
-static void vp8_release_frame(VP8Context *s, AVFrame *f, int prefer_delayed_free, int can_direct_free)
+static void vp8_release_frame(VP8Context *s, VP8Frame *f)
 {
- if (f->ref_index[0]) {
- if (prefer_delayed_free) {
- /* Upon a size change, we want to free the maps but other threads may still
- * be using them, so queue them. Upon a seek, all threads are inactive so
- * we want to cache one to prevent re-allocation in the next decoding
- * iteration, but the rest we can free directly. */
- int max_queued_maps = can_direct_free ? 1 : FF_ARRAY_ELEMS(s->segmentation_maps);
- if (s->num_maps_to_be_freed < max_queued_maps) {
- s->segmentation_maps[s->num_maps_to_be_freed++] = f->ref_index[0];
- } else if (can_direct_free) /* vp8_decode_flush(), but our queue is full */ {
- av_free(f->ref_index[0]);
- } /* else: MEMLEAK (should never happen, but better that than crash) */
- f->ref_index[0] = NULL;
- } else /* vp8_decode_free() */ {
- av_free(f->ref_index[0]);
- }
+ av_buffer_unref(&f->seg_map);
+ ff_thread_release_buffer(s->avctx, &f->tf);
+}
+
+static int vp8_ref_frame(VP8Context *s, VP8Frame *dst, VP8Frame *src)
+{
+ int ret;
+
+ vp8_release_frame(s, dst);
+
+ if ((ret = ff_thread_ref_frame(&dst->tf, &src->tf)) < 0)
+ return ret;
+ if (src->seg_map &&
+ !(dst->seg_map = av_buffer_ref(src->seg_map))) {
+ vp8_release_frame(s, dst);
+ return AVERROR(ENOMEM);
 }
- ff_thread_release_buffer(s->avctx, f);
+
+ return 0;
 }
 
-static void vp8_decode_flush_impl(AVCodecContext *avctx,
- int prefer_delayed_free, int can_direct_free, int free_mem)
+
+static void vp8_decode_flush_impl(AVCodecContext *avctx, int free_mem)
 {
 VP8Context *s = avctx->priv_data;
 int i;
 
- if (!avctx->internal->is_copy) {
- for (i = 0; i < 5; i++)
- if (s->frames[i].data[0])
- vp8_release_frame(s, &s->frames[i], prefer_delayed_free, can_direct_free);
- }
+ for (i = 0; i < FF_ARRAY_ELEMS(s->frames); i++)
+ vp8_release_frame(s, &s->frames[i]);
 memset(s->framep, 0, sizeof(s->framep));
 
- if (free_mem) {
+ if (free_mem)
 free_buffers(s);
- s->maps_are_invalid = 1;
- }
 }
 
 static void vp8_decode_flush(AVCodecContext *avctx)
 {
- vp8_decode_flush_impl(avctx, 1, 1, 0);
+ vp8_decode_flush_impl(avctx, 0);
 }
 
 static int update_dimensions(VP8Context *s, int width, int height)
 {
 AVCodecContext *avctx = s->avctx;
- int i;
+ int i, ret;
 
 if (width != s->avctx->width ||
 height != s->avctx->height) {
- if (av_image_check_size(width, height, 0, s->avctx))
- return AVERROR_INVALIDDATA;
+ vp8_decode_flush_impl(s->avctx, 1);
 
- vp8_decode_flush_impl(s->avctx, 1, 0, 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;
@@ -346,7 +339,7 @@
 buf_size -= 7;
 
 if (hscale || vscale)
- av_log_missing_feature(s->avctx, "Upscaling", 1);
+ avpriv_request_sample(s->avctx, "Upscaling");
 
 s->update_golden = s->update_altref = VP56_FRAME_CURRENT;
 for (i = 0; i < 4; i++)
@@ -764,7 +757,7 @@
 * @return 0 if no coeffs were decoded
 * otherwise, the index of the last coeff decoded plus one
 */
-static int decode_block_coeffs_internal(VP56RangeCoder *r, DCTELEM block[16],
+static int decode_block_coeffs_internal(VP56RangeCoder *r, int16_t block[16],
 uint8_t probs[16][3][NUM_DCT_TOKENS-1],
 int i, uint8_t *token_prob, int16_t qmul[2])
 {
@@ -832,7 +825,7 @@
 * otherwise, the index of the last coeff decoded plus one
 */
 static av_always_inline
-int decode_block_coeffs(VP56RangeCoder *c, DCTELEM block[16],
+int decode_block_coeffs(VP56RangeCoder *c, int16_t block[16],
 uint8_t probs[16][3][NUM_DCT_TOKENS-1],
 int i, int zero_nhood, int16_t qmul[2])
 {
@@ -966,16 +959,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) {
@@ -1039,23 +1022,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];
@@ -1068,7 +1046,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;
@@ -1084,41 +1062,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) {
@@ -1143,15 +1117,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);
@@ -1182,14 +1152,15 @@
 */
 static av_always_inline
 void vp8_mc_luma(VP8Context *s, VP8ThreadData *td, uint8_t *dst,
- AVFrame *ref, const VP56mv *mv,
+ ThreadFrame *ref, const VP56mv *mv,
 int x_off, int y_off, int block_w, int block_h,
- int width, int height, int linesize,
+ int width, int height, ptrdiff_t linesize,
 vp8_mc_func mc_func[3][3])
 {
- uint8_t *src = ref->data[0];
+ uint8_t *src = ref->f->data[0];
 
 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];
@@ -1202,12 +1173,15 @@
 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, 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 + linesize * my_idx;
+ 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, linesize, block_h, mx, my);
+ mc_func[my_idx][mx_idx](dst, linesize, src, src_linesize, block_h, mx, my);
 } else {
 ff_thread_await_progress(ref, (3 + y_off + block_h) >> 4, 0);
 mc_func[0][0](dst, linesize, src + y_off * linesize + x_off, linesize, block_h, 0, 0);
@@ -1233,11 +1207,11 @@
 */
 static av_always_inline
 void vp8_mc_chroma(VP8Context *s, VP8ThreadData *td, uint8_t *dst1, uint8_t *dst2,
- AVFrame *ref, const VP56mv *mv, int x_off, int y_off,
- int block_w, int block_h, int width, int height, int linesize,
+ ThreadFrame *ref, const VP56mv *mv, int x_off, int y_off,
+ int block_w, int block_h, int width, int height, ptrdiff_t linesize,
 vp8_mc_func mc_func[3][3])
 {
- uint8_t *src1 = ref->data[1], *src2 = ref->data[2];
+ uint8_t *src1 = ref->f->data[1], *src2 = ref->f->data[2];
 
 if (AV_RN32A(mv)) {
 int mx = mv->x&7, mx_idx = subpel_idx[0][mx];
@@ -1252,17 +1226,21 @@
 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, 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 + linesize * my_idx;
- mc_func[my_idx][mx_idx](dst1, linesize, src1, linesize, 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, 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 + linesize * my_idx;
- mc_func[my_idx][mx_idx](dst2, linesize, src2, linesize, 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);
@@ -1276,7 +1254,7 @@
 
 static av_always_inline
 void vp8_mc_part(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3],
- AVFrame *ref_frame, int x_off, int y_off,
+ ThreadFrame *ref_frame, int x_off, int y_off,
 int bx_off, int by_off,
 int block_w, int block_h,
 int width, int height, VP56mv *mv)
@@ -1314,7 +1292,7 @@
 int x_off = mb_x << 4, y_off = mb_y << 4;
 int mx = (mb->mv.x>>2) + x_off + 8;
 int my = (mb->mv.y>>2) + y_off;
- uint8_t **src= s->framep[ref]->data;
+ uint8_t **src= s->framep[ref]->tf.f->data;
 int off= mx + (my + (mb_x&3)*4)*s->linesize + 64;
 /* For threading, a ff_thread_await_progress here might be useful, but
 * it actually slows down the decoder. Since a bad prefetch doesn't
@@ -1334,7 +1312,7 @@
 {
 int x_off = mb_x << 4, y_off = mb_y << 4;
 int width = 16*s->mb_width, height = 16*s->mb_height;
- AVFrame *ref = s->framep[mb->ref_frame];
+ ThreadFrame *ref = &s->framep[mb->ref_frame]->tf;
 VP56mv *bmv = mb->bmv;
 
 switch (mb->partitioning) {
@@ -1593,17 +1571,9 @@
 }
 }
 
-static void release_queued_segmaps(VP8Context *s, int is_close)
-{
- int leave_behind = is_close ? 0 : !s->maps_are_invalid;
- while (s->num_maps_to_be_freed > leave_behind)
- av_freep(&s->segmentation_maps[--s->num_maps_to_be_freed]);
- s->maps_are_invalid = 0;
-}
-
 #define MARGIN (16 << 2)
-static void vp8_decode_mv_mb_modes(AVCodecContext *avctx, AVFrame *curframe,
- AVFrame *prev_frame)
+static void vp8_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe,
+ VP8Frame *prev_frame)
 {
 VP8Context *s = avctx->priv_data;
 int mb_x, mb_y;
@@ -1621,8 +1591,9 @@
 for (mb_x = 0; mb_x < s->mb_width; mb_x++, mb_xy++, mb++) {
 if (mb_y == 0)
 AV_WN32A((mb-s->mb_width-1)->intra4x4_pred_mode_top, DC_PRED*0x01010101);
- decode_mb_mode(s, mb, mb_x, mb_y, curframe->ref_index[0] + mb_xy,
- prev_frame && prev_frame->ref_index[0] ? prev_frame->ref_index[0] + mb_xy : NULL, 1);
+ decode_mb_mode(s, mb, mb_x, mb_y, curframe->seg_map->data + mb_xy,
+ prev_frame && prev_frame->seg_map ?
+ prev_frame->seg_map->data + mb_xy : NULL, 1);
 s->mv_min.x -= 64;
 s->mv_max.x -= 64;
 }
@@ -1674,15 +1645,15 @@
 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;
- AVFrame *curframe = s->curframe, *prev_frame = s->prev_frame;
+ VP8Frame *curframe = s->curframe, *prev_frame = s->prev_frame;
 VP56RangeCoder *c = &s->coeff_partition[mb_y & (s->num_coeff_partitions-1)];
 VP8Macroblock *mb;
 uint8_t *dst[3] = {
- curframe->data[0] + 16*mb_y*s->linesize,
- curframe->data[1] + 8*mb_y*s->uvlinesize,
- curframe->data[2] + 8*mb_y*s->uvlinesize
+ curframe->tf.f->data[0] + 16*mb_y*s->linesize,
+ curframe->tf.f->data[1] + 8*mb_y*s->uvlinesize,
+ curframe->tf.f->data[2] + 8*mb_y*s->uvlinesize
 };
 if (mb_y == 0) prev_td = td;
 else prev_td = &s->thread_data[(jobnr + num_jobs - 1)%num_jobs];
@@ -1691,21 +1662,17 @@
 if (s->mb_layout == 1)
 mb = s->macroblocks_base + ((s->mb_width+1)*(mb_y + 1) + 1);
 else {
+ // Make sure the previous frame has read its segmentation map,
+ // if we re-use the same map.
+ if (prev_frame && s->segmentation.enabled &&
+ !s->segmentation.update_map)
+ ff_thread_await_progress(&prev_frame->tf, mb_y, 0);
 mb = s->macroblocks + (s->mb_height - mb_y - 1)*2;
 memset(mb - 1, 0, sizeof(*mb)); // zero left macroblock
 AV_WN32A(s->intra4x4_pred_mode_left, DC_PRED*0x01010101);
 }
 
 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->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;
@@ -1724,8 +1691,9 @@
 s->vdsp.prefetch(dst[1] + (mb_x&7)*s->uvlinesize + 64, dst[2] - dst[1], 2);
 
 if (!s->mb_layout)
- decode_mb_mode(s, mb, mb_x, mb_y, curframe->ref_index[0] + mb_xy,
- prev_frame && prev_frame->ref_index[0] ? prev_frame->ref_index[0] + mb_xy : NULL, 0);
+ decode_mb_mode(s, mb, mb_x, mb_y, curframe->seg_map->data + mb_xy,
+ prev_frame && prev_frame->seg_map ?
+ prev_frame->seg_map->data + mb_xy : NULL, 0);
 
 prefetch_motion(s, mb, mb_x, mb_y, mb_xy, VP56_FRAME_PREVIOUS);
 
@@ -1784,7 +1752,7 @@
 VP8Context *s = avctx->priv_data;
 VP8ThreadData *td = &s->thread_data[threadnr];
 int mb_x, mb_y = td->thread_mb_pos>>16, num_jobs = s->num_jobs;
- AVFrame *curframe = s->curframe;
+ AVFrame *curframe = s->curframe->tf.f;
 VP8Macroblock *mb;
 VP8ThreadData *prev_td, *next_td;
 uint8_t *dst[3] = {
@@ -1838,7 +1806,7 @@
 VP8Context *s = avctx->priv_data;
 VP8ThreadData *td = &s->thread_data[jobnr];
 VP8ThreadData *next_td = NULL, *prev_td = NULL;
- AVFrame *curframe = s->curframe;
+ VP8Frame *curframe = s->curframe;
 int mb_y, num_jobs = s->num_jobs;
 td->thread_nr = threadnr;
 for (mb_y = jobnr; mb_y < s->mb_height; mb_y += num_jobs) {
@@ -1853,21 +1821,19 @@
 s->mv_max.y -= 64;
 
 if (avctx->active_thread_type == FF_THREAD_FRAME)
- ff_thread_report_progress(curframe, mb_y, 0);
+ ff_thread_report_progress(&curframe->tf, mb_y, 0);
 }
 
 return 0;
 }
 
-static int vp8_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
- AVPacket *avpkt)
+int ff_vp8_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
+ AVPacket *avpkt)
 {
 VP8Context *s = avctx->priv_data;
 int ret, i, referenced, num_jobs;
 enum AVDiscard skip_thresh;
- AVFrame *av_uninit(curframe), *prev_frame;
-
- release_queued_segmaps(s, 0);
+ VP8Frame *av_uninit(curframe), *prev_frame;
 
 if ((ret = decode_frame_header(s, avpkt->data, avpkt->size)) < 0)
 goto err;
@@ -1889,12 +1855,12 @@
 
 // release no longer referenced frames
 for (i = 0; i < 5; i++)
- if (s->frames[i].data[0] &&
+ if (s->frames[i].tf.f->data[0] &&
 &s->frames[i] != prev_frame &&
 &s->frames[i] != s->framep[VP56_FRAME_PREVIOUS] &&
 &s->frames[i] != s->framep[VP56_FRAME_GOLDEN] &&
 &s->frames[i] != s->framep[VP56_FRAME_GOLDEN2])
- vp8_release_frame(s, &s->frames[i], 1, 0);
+ vp8_release_frame(s, &s->frames[i]);
 
 // find a free buffer
 for (i = 0; i < 5; i++)
@@ -1909,8 +1875,8 @@
 av_log(avctx, AV_LOG_FATAL, "Ran out of free frames!\n");
 abort();
 }
- if (curframe->data[0])
- vp8_release_frame(s, curframe, 1, 0);
+ if (curframe->tf.f->data[0])
+ vp8_release_frame(s, curframe);
 
 // Given that arithmetic probabilities are updated every frame, it's quite likely
 // that the values we have on a random interframe are complete junk if we didn't
@@ -1923,10 +1889,9 @@
 goto err;
 }
 
- curframe->key_frame = s->keyframe;
- curframe->pict_type = s->keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
- curframe->reference = referenced ? 3 : 0;
- if ((ret = vp8_alloc_frame(s, curframe))) {
+ curframe->tf.f->key_frame = s->keyframe;
+ curframe->tf.f->pict_type = s->keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
+ if ((ret = vp8_alloc_frame(s, curframe, referenced))) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed!\n");
 goto err;
 }
@@ -1951,12 +1916,8 @@
 
 ff_thread_finish_setup(avctx);
 
- s->linesize = curframe->linesize[0];
- s->uvlinesize = curframe->linesize[1];
-
- if (!s->thread_data[0].edge_emu_buffer)
- for (i = 0; i < MAX_THREADS; i++)
- s->thread_data[i].edge_emu_buffer = av_malloc(21*s->linesize);
+ s->linesize = curframe->tf.f->linesize[0];
+ s->uvlinesize = curframe->tf.f->linesize[1];
 
 memset(s->top_nnz, 0, s->mb_width*sizeof(*s->top_nnz));
 /* Zero macroblock structures for top/top-left prediction from outside the frame. */
@@ -1965,22 +1926,17 @@
 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));
 
 
- // Make sure the previous frame has read its segmentation map,
- // if we re-use the same map.
- if (prev_frame && s->segmentation.enabled && !s->segmentation.update_map)
- ff_thread_await_progress(prev_frame, 1, 0);
-
- if (s->mb_layout == 1)
+ if (s->mb_layout == 1) {
+ // Make sure the previous frame has read its segmentation map,
+ // if we re-use the same map.
+ if (prev_frame && s->segmentation.enabled &&
+ !s->segmentation.update_map)
+ ff_thread_await_progress(&prev_frame->tf, 1, 0);
 vp8_decode_mv_mb_modes(avctx, curframe, prev_frame);
+ }
 
 if (avctx->active_thread_type == FF_THREAD_FRAME)
 num_jobs = 1;
@@ -1997,7 +1953,7 @@
 }
 avctx->execute2(avctx, vp8_decode_mb_row_sliced, s->thread_data, NULL, num_jobs);
 
- ff_thread_report_progress(curframe, INT_MAX, 0);
+ ff_thread_report_progress(&curframe->tf, INT_MAX, 0);
 memcpy(&s->framep[0], &s->next_framep[0], sizeof(s->framep[0]) * 4);
 
 skip_decode:
@@ -2007,7 +1963,8 @@
 s->prob[0] = s->prob[1];
 
 if (!s->invisible) {
- *(AVFrame*)data = *curframe;
+ if ((ret = av_frame_ref(data, curframe->tf.f)) < 0)
+ return ret;
 *got_frame = 1;
 }
 
@@ -2017,33 +1974,62 @@
 return ret;
 }
 
-static av_cold int vp8_decode_init(AVCodecContext *avctx)
+av_cold int ff_vp8_decode_free(AVCodecContext *avctx)
+{
+ VP8Context *s = avctx->priv_data;
+ int i;
+
+ vp8_decode_flush_impl(avctx, 1);
+ for (i = 0; i < FF_ARRAY_ELEMS(s->frames); i++)
+ av_frame_free(&s->frames[i].tf.f);
+
+ return 0;
+}
+
+static av_cold int vp8_init_frames(VP8Context *s)
+{
+ int i;
+ for (i = 0; i < FF_ARRAY_ELEMS(s->frames); i++) {
+ s->frames[i].tf.f = av_frame_alloc();
+ if (!s->frames[i].tf.f)
+ return AVERROR(ENOMEM);
+ }
+ return 0;
+}
+
+av_cold int ff_vp8_decode_init(AVCodecContext *avctx)
 {
 VP8Context *s = avctx->priv_data;
+ int ret;
 
 s->avctx = avctx;
 avctx->pix_fmt = AV_PIX_FMT_YUV420P;
+ avctx->internal->allocate_progress = 1;
 
 ff_videodsp_init(&s->vdsp, 8);
 ff_h264_pred_init(&s->hpc, AV_CODEC_ID_VP8, 8, 1);
 ff_vp8dsp_init(&s->vp8dsp);
 
- return 0;
-}
+ if ((ret = vp8_init_frames(s)) < 0) {
+ ff_vp8_decode_free(avctx);
+ return ret;
+ }
 
-static av_cold int vp8_decode_free(AVCodecContext *avctx)
-{
- vp8_decode_flush_impl(avctx, 0, 1, 1);
- release_queued_segmaps(avctx->priv_data, 1);
 return 0;
 }
 
 static av_cold int vp8_decode_init_thread_copy(AVCodecContext *avctx)
 {
 VP8Context *s = avctx->priv_data;
+ int ret;
 
 s->avctx = avctx;
 
+ if ((ret = vp8_init_frames(s)) < 0) {
+ ff_vp8_decode_free(avctx);
+ return ret;
+ }
+
 return 0;
 }
 
@@ -2053,11 +2039,11 @@
 static int vp8_decode_update_thread_context(AVCodecContext *dst, const AVCodecContext *src)
 {
 VP8Context *s = dst->priv_data, *s_src = src->priv_data;
+ int i;
 
 if (s->macroblocks_base &&
 (s_src->mb_width != s->mb_width || s_src->mb_height != s->mb_height)) {
 free_buffers(s);
- s->maps_are_invalid = 1;
 s->mb_width = s_src->mb_width;
 s->mb_height = s_src->mb_height;
 }
@@ -2067,7 +2053,14 @@
 s->lf_delta = s_src->lf_delta;
 memcpy(s->sign_bias, s_src->sign_bias, sizeof(s->sign_bias));
 
- memcpy(&s->frames, &s_src->frames, sizeof(s->frames));
+ for (i = 0; i < FF_ARRAY_ELEMS(s_src->frames); i++) {
+ if (s_src->frames[i].tf.f->data[0]) {
+ int ret = vp8_ref_frame(s, &s->frames[i], &s_src->frames[i]);
+ if (ret < 0)
+ return ret;
+ }
+ }
+
 s->framep[0] = REBASE(s_src->next_framep[0]);
 s->framep[1] = REBASE(s_src->next_framep[1]);
 s->framep[2] = REBASE(s_src->next_framep[2]);
@@ -2078,15 +2071,15 @@
 
 AVCodec ff_vp8_decoder = {
 .name = "vp8",
+ .long_name = NULL_IF_CONFIG_SMALL("On2 VP8"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_VP8,
 .priv_data_size = sizeof(VP8Context),
- .init = vp8_decode_init,
- .close = vp8_decode_free,
- .decode = vp8_decode_frame,
+ .init = ff_vp8_decode_init,
+ .close = ff_vp8_decode_free,
+ .decode = ff_vp8_decode_frame,
 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS | CODEC_CAP_SLICE_THREADS,
 .flush = vp8_decode_flush,
- .long_name = NULL_IF_CONFIG_SMALL("On2 VP8"),
 .init_thread_copy = ONLY_IF_THREADS_ENABLED(vp8_decode_init_thread_copy),
 .update_thread_context = ONLY_IF_THREADS_ENABLED(vp8_decode_update_thread_context),
 };

libav-v9.6.tar.bz2/libavcodec/vp8.h -> libav-v10.1.tar.bz2/libavcodec/vp8.h Changed

@@ -26,14 +26,16 @@
 #ifndef AVCODEC_VP8_H
 #define AVCODEC_VP8_H
 
+#include "libavutil/buffer.h"
+
 #include "vp56.h"
-#include "vp56data.h"
 #include "vp8dsp.h"
 #include "h264pred.h"
+#include "thread.h"
 #if HAVE_PTHREADS
 #include <pthread.h>
 #elif HAVE_W32THREADS
-#include "w32pthreads.h"
+#include "compat/w32pthreads.h"
 #endif
 
 #define VP8_MAX_QUANT 127
@@ -94,8 +96,8 @@
 } VP8Macroblock;
 
 typedef struct VP8ThreadData {
- DECLARE_ALIGNED(16, DCTELEM, block)[6][4][16];
- DECLARE_ALIGNED(16, DCTELEM, block_dc)[16];
+ DECLARE_ALIGNED(16, int16_t, block)[6][4][16];
+ DECLARE_ALIGNED(16, int16_t, block_dc)[16];
 /**
 * This is the index plus one of the last non-zero coeff
 * for each of the blocks in the current macroblock.
@@ -118,18 +120,25 @@
 #endif
 int thread_mb_pos; // (mb_y << 16) | (mb_x & 0xFFFF)
 int wait_mb_pos; // What the current thread is waiting on.
- uint8_t *edge_emu_buffer;
+
+#define EDGE_EMU_LINESIZE 32
+ DECLARE_ALIGNED(16, uint8_t, edge_emu_buffer)[21 * EDGE_EMU_LINESIZE];
 VP8FilterStrength *filter_strength;
 } VP8ThreadData;
 
+typedef struct VP8Frame {
+ ThreadFrame tf;
+ AVBufferRef *seg_map;
+} VP8Frame;
+
 #define MAX_THREADS 8
 typedef struct VP8Context {
 VP8ThreadData *thread_data;
 AVCodecContext *avctx;
- AVFrame *framep[4];
- AVFrame *next_framep[4];
- AVFrame *curframe;
- AVFrame *prev_frame;
+ VP8Frame *framep[4];
+ VP8Frame *next_framep[4];
+ VP8Frame *curframe;
+ VP8Frame *prev_frame;
 
 uint16_t mb_width; /* number of horizontal MB */
 uint16_t mb_height; /* number of vertical MB */
@@ -251,17 +260,8 @@
 VP8DSPContext vp8dsp;
 H264PredContext hpc;
 vp8_mc_func put_pixels_tab[3][3][3];
- AVFrame frames[5];
+ VP8Frame frames[5];
 
- /**
- * A list of segmentation_map buffers that are to be free()'ed in
- * the next decoding iteration. We can't free() them right away
- * because the map may still be used by subsequent decoding threads.
- * Unused if frame threading is off.
- */
- uint8_t *segmentation_maps[5];
- int num_maps_to_be_freed;
- int maps_are_invalid;
 int num_jobs;
 /**
 * This describes the macroblock memory layout.
@@ -271,4 +271,11 @@
 int mb_layout;
 } VP8Context;
 
+int ff_vp8_decode_init(AVCodecContext *avctx);
+
+int ff_vp8_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
+ AVPacket *avpkt);
+
+int ff_vp8_decode_free(AVCodecContext *avctx);
+
 #endif /* AVCODEC_VP8_H */

libav-v9.6.tar.bz2/libavcodec/vp8dsp.c -> libav-v10.1.tar.bz2/libavcodec/vp8dsp.c Changed

@@ -29,7 +29,7 @@
 #include "libavutil/common.h"
 
 // TODO: Maybe add dequant
-static void vp8_luma_dc_wht_c(DCTELEM block[4][4][16], DCTELEM dc[16])
+static void vp8_luma_dc_wht_c(int16_t block[4][4][16], int16_t dc[16])
 {
 int i, t0, t1, t2, t3;
 
@@ -62,7 +62,7 @@
 }
 }
 
-static void vp8_luma_dc_wht_dc_c(DCTELEM block[4][4][16], DCTELEM dc[16])
+static void vp8_luma_dc_wht_dc_c(int16_t block[4][4][16], int16_t dc[16])
 {
 int i, val = (dc[0] + 3) >> 3;
 dc[0] = 0;
@@ -78,10 +78,10 @@
 #define MUL_20091(a) ((((a)*20091) >> 16) + (a))
 #define MUL_35468(a) (((a)*35468) >> 16)
 
-static void vp8_idct_add_c(uint8_t *dst, DCTELEM block[16], ptrdiff_t stride)
+static void vp8_idct_add_c(uint8_t *dst, int16_t block[16], ptrdiff_t stride)
 {
 int i, t0, t1, t2, t3;
- DCTELEM tmp[16];
+ int16_t tmp[16];
 
 for (i = 0; i < 4; i++) {
 t0 = block[0*4+i] + block[2*4+i];
@@ -113,7 +113,7 @@
 }
 }
 
-static void vp8_idct_dc_add_c(uint8_t *dst, DCTELEM block[16], ptrdiff_t stride)
+static void vp8_idct_dc_add_c(uint8_t *dst, int16_t block[16], ptrdiff_t stride)
 {
 int i, dc = (block[0] + 4) >> 3;
 block[0] = 0;
@@ -127,7 +127,7 @@
 }
 }
 
-static void vp8_idct_dc_add4uv_c(uint8_t *dst, DCTELEM block[4][16], ptrdiff_t stride)
+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);
@@ -135,7 +135,7 @@
 vp8_idct_dc_add_c(dst+stride*4+4, block[3], stride);
 }
 
-static void vp8_idct_dc_add4y_c(uint8_t *dst, DCTELEM block[4][16], ptrdiff_t 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);
@@ -160,7 +160,7 @@
 {
 LOAD_PIXELS
 int a, f1, f2;
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
 
 a = 3*(q0 - p0);
 
@@ -215,7 +215,7 @@
 static av_always_inline void filter_mbedge(uint8_t *p, ptrdiff_t stride)
 {
 int a0, a1, a2, w;
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
 
 LOAD_PIXELS
 
@@ -337,7 +337,7 @@
 static void put_vp8_epel ## SIZE ## _h ## TAPS ## _c(uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, int h, int mx, int my) \
 { \
 const uint8_t *filter = subpel_filters[mx-1]; \
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \
 int x, y; \
 \
 for (y = 0; y < h; y++) { \
@@ -351,7 +351,7 @@
 static void put_vp8_epel ## SIZE ## _v ## TAPS ## _c(uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, int h, int mx, int my) \
 { \
 const uint8_t *filter = subpel_filters[my-1]; \
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \
 int x, y; \
 \
 for (y = 0; y < h; y++) { \
@@ -365,7 +365,7 @@
 static void put_vp8_epel ## SIZE ## _h ## HTAPS ## v ## VTAPS ## _c(uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, int h, int mx, int my) \
 { \
 const uint8_t *filter = subpel_filters[mx-1]; \
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \
+ const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \
 int x, y; \
 uint8_t tmp_array[(2*SIZE+VTAPS-1)*SIZE]; \
 uint8_t *tmp = tmp_array; \
@@ -415,7 +415,7 @@
 VP8_EPEL_HV(4, 6, 6)
 
 #define VP8_BILINEAR(SIZE) \
-static void put_vp8_bilinear ## SIZE ## _h_c(uint8_t *dst, ptrdiff_t stride, uint8_t *src, ptrdiff_t s2, int h, int mx, int my) \
+static void put_vp8_bilinear ## SIZE ## _h_c(uint8_t *dst, ptrdiff_t dstride, uint8_t *src, ptrdiff_t sstride, int h, int mx, int my) \
 { \
 int a = 8-mx, b = mx; \
 int x, y; \
@@ -423,24 +423,24 @@
 for (y = 0; y < h; y++) { \
 for (x = 0; x < SIZE; x++) \
 dst[x] = (a*src[x] + b*src[x+1] + 4) >> 3; \
- dst += stride; \
- src += stride; \
+ dst += dstride; \
+ src += sstride; \
 } \
 } \
-static void put_vp8_bilinear ## SIZE ## _v_c(uint8_t *dst, ptrdiff_t stride, uint8_t *src, ptrdiff_t s2, int h, int mx, int my) \
+static void put_vp8_bilinear ## SIZE ## _v_c(uint8_t *dst, ptrdiff_t dstride, uint8_t *src, ptrdiff_t sstride, int h, int mx, int my) \
 { \
 int c = 8-my, d = my; \
 int x, y; \
 \
 for (y = 0; y < h; y++) { \
 for (x = 0; x < SIZE; x++) \
- dst[x] = (c*src[x] + d*src[x+stride] + 4) >> 3; \
- dst += stride; \
- src += stride; \
+ dst[x] = (c*src[x] + d*src[x+sstride] + 4) >> 3; \
+ dst += dstride; \
+ src += sstride; \
 } \
 } \
 \
-static void put_vp8_bilinear ## SIZE ## _hv_c(uint8_t *dst, ptrdiff_t stride, uint8_t *src, ptrdiff_t s2, int h, int mx, int my) \
+static void put_vp8_bilinear ## SIZE ## _hv_c(uint8_t *dst, ptrdiff_t dstride, uint8_t *src, ptrdiff_t sstride, int h, int mx, int my) \
 { \
 int a = 8-mx, b = mx; \
 int c = 8-my, d = my; \
@@ -452,7 +452,7 @@
 for (x = 0; x < SIZE; x++) \
 tmp[x] = (a*src[x] + b*src[x+1] + 4) >> 3; \
 tmp += SIZE; \
- src += stride; \
+ src += sstride; \
 } \
 \
 tmp = tmp_array; \
@@ -460,7 +460,7 @@
 for (y = 0; y < h; y++) { \
 for (x = 0; x < SIZE; x++) \
 dst[x] = (c*tmp[x] + d*tmp[x+SIZE] + 4) >> 3; \
- dst += stride; \
+ dst += dstride; \
 tmp += SIZE; \
 } \
 }
@@ -521,10 +521,10 @@
 VP8_BILINEAR_MC_FUNC(1, 8);
 VP8_BILINEAR_MC_FUNC(2, 4);
 
- if (ARCH_X86)
- ff_vp8dsp_init_x86(dsp);
- if (HAVE_ALTIVEC)
- ff_vp8dsp_init_altivec(dsp);
 if (ARCH_ARM)
 ff_vp8dsp_init_arm(dsp);
+ if (ARCH_PPC)
+ ff_vp8dsp_init_ppc(dsp);
+ if (ARCH_X86)
+ ff_vp8dsp_init_x86(dsp);
 }

libav-v9.6.tar.bz2/libavcodec/vp8dsp.h -> libav-v10.1.tar.bz2/libavcodec/vp8dsp.h Changed

@@ -27,20 +27,21 @@
 #ifndef AVCODEC_VP8DSP_H
 #define AVCODEC_VP8DSP_H
 
-#include "dsputil.h"
+#include <stddef.h>
+#include <stdint.h>
 
 typedef void (*vp8_mc_func)(uint8_t *dst/*align 8*/, ptrdiff_t dstStride,
 uint8_t *src/*align 1*/, ptrdiff_t srcStride,
 int h, int x, int y);
 
 typedef struct VP8DSPContext {
- void (*vp8_luma_dc_wht)(DCTELEM block[4][4][16], DCTELEM dc[16]);
- void (*vp8_luma_dc_wht_dc)(DCTELEM block[4][4][16], DCTELEM dc[16]);
- void (*vp8_idct_add)(uint8_t *dst, DCTELEM block[16], ptrdiff_t stride);
- void (*vp8_idct_dc_add)(uint8_t *dst, DCTELEM block[16], ptrdiff_t stride);
- void (*vp8_idct_dc_add4y)(uint8_t *dst, DCTELEM block[4][16],
+ void (*vp8_luma_dc_wht)(int16_t block[4][4][16], int16_t dc[16]);
+ void (*vp8_luma_dc_wht_dc)(int16_t block[4][4][16], int16_t dc[16]);
+ void (*vp8_idct_add)(uint8_t *dst, int16_t block[16], ptrdiff_t stride);
+ void (*vp8_idct_dc_add)(uint8_t *dst, int16_t block[16], ptrdiff_t stride);
+ void (*vp8_idct_dc_add4y)(uint8_t *dst, int16_t block[4][16],
 ptrdiff_t stride);
- void (*vp8_idct_dc_add4uv)(uint8_t *dst, DCTELEM block[4][16],
+ void (*vp8_idct_dc_add4uv)(uint8_t *dst, int16_t block[4][16],
 ptrdiff_t stride);
 
 // loop filter applied to edges between macroblocks
@@ -89,7 +90,7 @@
 
 void ff_vp8dsp_init(VP8DSPContext *c);
 void ff_vp8dsp_init_x86(VP8DSPContext *c);
-void ff_vp8dsp_init_altivec(VP8DSPContext *c);
 void ff_vp8dsp_init_arm(VP8DSPContext *c);
+void ff_vp8dsp_init_ppc(VP8DSPContext *c);
 
 #endif /* AVCODEC_VP8DSP_H */

libav-v10.1.tar.bz2/libavcodec/vp9.c Added

@@ -0,0 +1,1279 @@
+/*
+ * VP9 compatible video decoder
+ *
+ * Copyright (C) 2013 Ronald S. Bultje <rsbultje gmail com>
+ * Copyright (C) 2013 Clément Bœsch 
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/avassert.h"
+
+#include "avcodec.h"
+#include "get_bits.h"
+#include "internal.h"
+#include "videodsp.h"
+#include "vp56.h"
+#include "vp9.h"
+#include "vp9data.h"
+
+#define VP9_SYNCCODE 0x498342
+#define MAX_PROB 255
+
+static void vp9_decode_flush(AVCodecContext *avctx)
+{
+ VP9Context *s = avctx->priv_data;
+ int i;
+
+ for (i = 0; i < FF_ARRAY_ELEMS(s->refs); i++)
+ av_frame_unref(s->refs[i]);
+}
+
+static int update_size(AVCodecContext *avctx, int w, int h)
+{
+ VP9Context *s = avctx->priv_data;
+ uint8_t *p;
+
+ if (s->above_partition_ctx && w == avctx->width && h == avctx->height)
+ return 0;
+
+ vp9_decode_flush(avctx);
+
+ if (w <= 0 || h <= 0)
+ return AVERROR_INVALIDDATA;
+
+ avctx->width = w;
+ avctx->height = h;
+ s->sb_cols = (w + 63) >> 6;
+ s->sb_rows = (h + 63) >> 6;
+ s->cols = (w + 7) >> 3;
+ 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)));
+ if (!p)
+ return AVERROR(ENOMEM);
+ 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, VP9Filter *, 1);
+ assign(s->above_mv_ctx, VP56mv(*)[2], 16);
+ assign(s->segmentation_map, uint8_t *, 64 * s->sb_rows);
+ assign(s->mv[0], VP9MVRefPair *, 64 * s->sb_rows);
+ assign(s->mv[1], VP9MVRefPair *, 64 * s->sb_rows);
+#undef assign
+
+ return 0;
+}
+
+// The sign bit is at the end, not the start, of a bit sequence
+static av_always_inline int get_bits_with_sign(GetBitContext *gb, int n)
+{
+ int v = get_bits(gb, n);
+ return get_bits1(gb) ? -v : v;
+}
+
+static av_always_inline int inv_recenter_nonneg(int v, int m)
+{
+ if (v > 2 * m)
+ return v;
+ if (v & 1)
+ return m - ((v + 1) >> 1);
+ return m + (v >> 1);
+}
+
+// differential forward probability updates
+static int update_prob(VP56RangeCoder *c, int p)
+{
+ static const int inv_map_table[MAX_PROB - 1] = {
+ 7, 20, 33, 46, 59, 72, 85, 98, 111, 124, 137, 150, 163, 176,
+ 189, 202, 215, 228, 241, 254, 1, 2, 3, 4, 5, 6, 8, 9,
+ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, 57, 58, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
+ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 99, 100,
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 112, 113, 114, 115,
+ 116, 117, 118, 119, 120, 121, 122, 123, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133, 134, 135, 136, 138, 139, 140, 141, 142, 143, 144, 145,
+ 146, 147, 148, 149, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160,
+ 161, 162, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+ 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 190, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 203, 204, 205, 206,
+ 207, 208, 209, 210, 211, 212, 213, 214, 216, 217, 218, 219, 220, 221,
+ 222, 223, 224, 225, 226, 227, 229, 230, 231, 232, 233, 234, 235, 236,
+ 237, 238, 239, 240, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+ 252, 253,
+ };
+ int d;
+
+ /* This code is trying to do a differential probability update. For a
+ * current probability A in the range [1, 255], the difference to a new
+ * probability of any value can be expressed differentially as 1-A, 255-A
+ * where some part of this (absolute range) exists both in positive as
+ * well as the negative part, whereas another part only exists in one
+ * half. We're trying to code this shared part differentially, i.e.
+ * times two where the value of the lowest bit specifies the sign, and
+ * the single part is then coded on top of this. This absolute difference
+ * then again has a value of [0, 254], but a bigger value in this range
+ * indicates that we're further away from the original value A, so we
+ * can code this as a VLC code, since higher values are increasingly
+ * unlikely. The first 20 values in inv_map_table[] allow 'cheap, rough'
+ * updates vs. the 'fine, exact' updates further down the range, which
+ * adds one extra dimension to this differential update model. */
+
+ if (!vp8_rac_get(c)) {
+ d = vp8_rac_get_uint(c, 4) + 0;
+ } else if (!vp8_rac_get(c)) {
+ d = vp8_rac_get_uint(c, 4) + 16;
+ } else if (!vp8_rac_get(c)) {
+ d = vp8_rac_get_uint(c, 5) + 32;
+ } else {
+ d = vp8_rac_get_uint(c, 7);
+ if (d >= 65) {
+ d = (d << 1) - 65 + vp8_rac_get(c);
+ d = av_clip(d, 0, MAX_PROB - 65 - 1);
+ }
+ d += 64;
+ }
+
+ return p <= 128
+ ? 1 + inv_recenter_nonneg(inv_map_table[d], p - 1)
+ : 255 - inv_recenter_nonneg(inv_map_table[d], 255 - p);
+}
+
+static int decode_frame_header(AVCodecContext *avctx,
+ const uint8_t *data, int size, int *ref)
+{
+ VP9Context *s = avctx->priv_data;
+ int c, i, j, k, l, m, n, w, h, max, size2, ret, sharp;
+ int last_invisible;
+ const uint8_t *data2;
+
+ /* general header */
+ if ((ret = init_get_bits8(&s->gb, data, size)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Failed to initialize bitstream reader\n");
+ return ret;
+ }
+ if (get_bits(&s->gb, 2) != 0x2) { // frame marker
+ av_log(avctx, AV_LOG_ERROR, "Invalid frame marker\n");
+ return AVERROR_INVALIDDATA;
+ }
+ s->profile = get_bits1(&s->gb);
+ if (get_bits1(&s->gb)) { // reserved bit
+ av_log(avctx, AV_LOG_ERROR, "Reserved bit should be zero\n");
+ return AVERROR_INVALIDDATA;
+ }
+ if (get_bits1(&s->gb)) {
+ *ref = get_bits(&s->gb, 3);
+ return 0;
+ }
+
+ s->last_keyframe = s->keyframe;
+ s->keyframe = !get_bits1(&s->gb);
+
+ 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 && !last_invisible;
+
+ if (s->keyframe) {
+ if (get_bits_long(&s->gb, 24) != VP9_SYNCCODE) { // synccode
+ av_log(avctx, AV_LOG_ERROR, "Invalid sync code\n");
+ return AVERROR_INVALIDDATA;
+ }
+ s->colorspace = get_bits(&s->gb, 3);
+ if (s->colorspace == 7) { // RGB = profile 1
+ av_log(avctx, AV_LOG_ERROR, "RGB not supported in profile 0\n");
+ return AVERROR_INVALIDDATA;
+ }
+ s->fullrange = get_bits1(&s->gb);
+ // for profile 1, here follows the subsampling bits
+ s->refreshrefmask = 0xff;
+ w = get_bits(&s->gb, 16) + 1;
+ h = get_bits(&s->gb, 16) + 1;
+ if (get_bits1(&s->gb)) // display size
+ skip_bits(&s->gb, 32);
+ } else {
+ s->intraonly = s->invisible ? get_bits1(&s->gb) : 0;
+ s->resetctx = s->errorres ? 0 : get_bits(&s->gb, 2);
+ if (s->intraonly) {
+ if (get_bits_long(&s->gb, 24) != VP9_SYNCCODE) { // synccode
+ av_log(avctx, AV_LOG_ERROR, "Invalid sync code\n");
+ return AVERROR_INVALIDDATA;
+ }
+ s->refreshrefmask = get_bits(&s->gb, 8);
+ w = get_bits(&s->gb, 16) + 1;
+ h = get_bits(&s->gb, 16) + 1;
+ if (get_bits1(&s->gb)) // display size
+ skip_bits(&s->gb, 32);
+ } else {
+ s->refreshrefmask = get_bits(&s->gb, 8);
+ s->refidx[0] = get_bits(&s->gb, 3);
+ s->signbias[0] = get_bits1(&s->gb);
+ s->refidx[1] = get_bits(&s->gb, 3);
+ 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]]->buf[0] ||
+ !s->refs[s->refidx[1]]->buf[0] ||
+ !s->refs[s->refidx[2]]->buf[0]) {
+ av_log(avctx, 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;
+ } else if (get_bits1(&s->gb)) {
+ w = s->refs[s->refidx[1]]->width;
+ h = s->refs[s->refidx[1]]->height;
+ } else if (get_bits1(&s->gb)) {
+ w = s->refs[s->refidx[2]]->width;
+ h = s->refs[s->refidx[2]]->height;
+ } else {
+ w = get_bits(&s->gb, 16) + 1;
+ h = get_bits(&s->gb, 16) + 1;
+ }
+ if (get_bits1(&s->gb)) // display size
+ skip_bits(&s->gb, 32);
+ s->highprecisionmvs = get_bits1(&s->gb);
+ s->filtermode = get_bits1(&s->gb) ? FILTER_SWITCHABLE :
+ get_bits(&s->gb, 2);
+ s->allowcompinter = s->signbias[0] != s->signbias[1] ||
+ s->signbias[0] != s->signbias[2];
+ if (s->allowcompinter) {
+ if (s->signbias[0] == s->signbias[1]) {
+ s->fixcompref = 2;
+ s->varcompref[0] = 0;
+ s->varcompref[1] = 1;
+ } else if (s->signbias[0] == s->signbias[2]) {
+ s->fixcompref = 1;
+ s->varcompref[0] = 0;
+ s->varcompref[1] = 2;
+ } else {
+ s->fixcompref = 0;
+ s->varcompref[0] = 1;
+ s->varcompref[1] = 2;
+ }
+ }
+ }
+ }
+
+ s->refreshctx = s->errorres ? 0 : get_bits1(&s->gb);
+ s->parallelmode = s->errorres ? 1 : get_bits1(&s->gb);
+ s->framectxid = c = get_bits(&s->gb, 2);
+
+ /* loopfilter header data */
+ s->filter.level = get_bits(&s->gb, 6);
+ sharp = get_bits(&s->gb, 3);
+ /* If sharpness changed, reinit lim/mblim LUTs. if it didn't change,
+ * keep the old cache values since they are still valid. */
+ if (s->filter.sharpness != sharp)
+ memset(s->filter.lim_lut, 0, sizeof(s->filter.lim_lut));
+ s->filter.sharpness = sharp;
+ if ((s->lf_delta.enabled = get_bits1(&s->gb))) {
+ if (get_bits1(&s->gb)) {
+ for (i = 0; i < 4; i++)
+ if (get_bits1(&s->gb))
+ s->lf_delta.ref[i] = get_bits_with_sign(&s->gb, 6);
+ for (i = 0; i < 2; i++)
+ if (get_bits1(&s->gb))
+ s->lf_delta.mode[i] = get_bits_with_sign(&s->gb, 6);
+ }
+ } else {
+ memset(&s->lf_delta, 0, sizeof(s->lf_delta));
+ }
+
+ /* quantization header data */
+ s->yac_qi = get_bits(&s->gb, 8);
+ s->ydc_qdelta = get_bits1(&s->gb) ? get_bits_with_sign(&s->gb, 4) : 0;
+ s->uvdc_qdelta = get_bits1(&s->gb) ? get_bits_with_sign(&s->gb, 4) : 0;
+ s->uvac_qdelta = get_bits1(&s->gb) ? get_bits_with_sign(&s->gb, 4) : 0;
+ s->lossless = s->yac_qi == 0 && s->ydc_qdelta == 0 &&
+ s->uvdc_qdelta == 0 && s->uvac_qdelta == 0;
+
+ /* segmentation header info */
+ if ((s->segmentation.enabled = get_bits1(&s->gb))) {
+ if ((s->segmentation.update_map = get_bits1(&s->gb))) {
+ 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)))
+ for (i = 0; i < 3; i++)
+ s->prob.segpred[i] = get_bits1(&s->gb) ?
+ get_bits(&s->gb, 8) : 255;
+ }
+
+ if (get_bits1(&s->gb)) {
+ s->segmentation.absolute_vals = get_bits1(&s->gb);
+ for (i = 0; i < 8; i++) {
+ if ((s->segmentation.feat[i].q_enabled = get_bits1(&s->gb)))
+ s->segmentation.feat[i].q_val = get_bits_with_sign(&s->gb, 8);
+ if ((s->segmentation.feat[i].lf_enabled = get_bits1(&s->gb)))
+ s->segmentation.feat[i].lf_val = get_bits_with_sign(&s->gb, 6);
+ if ((s->segmentation.feat[i].ref_enabled = get_bits1(&s->gb)))
+ s->segmentation.feat[i].ref_val = get_bits(&s->gb, 2);
+ s->segmentation.feat[i].skip_enabled = get_bits1(&s->gb);
+ }
+ }
+ } else {
+ s->segmentation.feat[0].q_enabled = 0;
+ s->segmentation.feat[0].lf_enabled = 0;
+ s->segmentation.feat[0].skip_enabled = 0;
+ s->segmentation.feat[0].ref_enabled = 0;
+ }
+
+ // set qmul[] based on Y/UV, AC/DC and segmentation Q idx deltas
+ for (i = 0; i < (s->segmentation.enabled ? 8 : 1); i++) {
+ int qyac, qydc, quvac, quvdc, lflvl, sh;
+
+ if (s->segmentation.feat[i].q_enabled) {
+ if (s->segmentation.absolute_vals)
+ qyac = s->segmentation.feat[i].q_val;
+ else
+ qyac = s->yac_qi + s->segmentation.feat[i].q_val;
+ } else {
+ qyac = s->yac_qi;
+ }
+ qydc = av_clip_uintp2(qyac + s->ydc_qdelta, 8);
+ quvdc = av_clip_uintp2(qyac + s->uvdc_qdelta, 8);
+ quvac = av_clip_uintp2(qyac + s->uvac_qdelta, 8);
+ qyac = av_clip_uintp2(qyac, 8);
+
+ s->segmentation.feat[i].qmul[0][0] = ff_vp9_dc_qlookup[qydc];
+ s->segmentation.feat[i].qmul[0][1] = ff_vp9_ac_qlookup[qyac];
+ s->segmentation.feat[i].qmul[1][0] = ff_vp9_dc_qlookup[quvdc];
+ s->segmentation.feat[i].qmul[1][1] = ff_vp9_ac_qlookup[quvac];
+
+ sh = s->filter.level >= 32;
+ if (s->segmentation.feat[i].lf_enabled) {
+ if (s->segmentation.absolute_vals)
+ lflvl = s->segmentation.feat[i].lf_val;
+ else
+ lflvl = s->filter.level + s->segmentation.feat[i].lf_val;
+ } else {
+ lflvl = s->filter.level;
+ }
+ s->segmentation.feat[i].lflvl[0][0] =
+ s->segmentation.feat[i].lflvl[0][1] =
+ av_clip_uintp2(lflvl + (s->lf_delta.ref[0] << sh), 6);
+ for (j = 1; j < 4; j++) {
+ s->segmentation.feat[i].lflvl[j][0] =
+ av_clip_uintp2(lflvl + ((s->lf_delta.ref[j] +
+ s->lf_delta.mode[0]) << sh), 6);
+ s->segmentation.feat[i].lflvl[j][1] =
+ av_clip_uintp2(lflvl + ((s->lf_delta.ref[j] +
+ s->lf_delta.mode[1]) << sh), 6);
+ }
+ }
+
+ /* tiling info */
+ if ((ret = update_size(avctx, w, h)) < 0) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Failed to initialize decoder for %dx%d\n", w, h);
+ return ret;
+ }
+ for (s->tiling.log2_tile_cols = 0;
+ (s->sb_cols >> s->tiling.log2_tile_cols) > 64;
+ s->tiling.log2_tile_cols++) ;
+ for (max = 0; (s->sb_cols >> max) >= 4; max++) ;
+ max = FFMAX(0, max - 1);
+ while (max > s->tiling.log2_tile_cols) {
+ if (get_bits1(&s->gb))
+ s->tiling.log2_tile_cols++;
+ else
+ break;
+ }
+ s->tiling.log2_tile_rows = decode012(&s->gb);
+ s->tiling.tile_rows = 1 << s->tiling.log2_tile_rows;
+ if (s->tiling.tile_cols != (1 << s->tiling.log2_tile_cols)) {
+ s->tiling.tile_cols = 1 << s->tiling.log2_tile_cols;
+ s->c_b = av_fast_realloc(s->c_b, &s->c_b_size,
+ sizeof(VP56RangeCoder) *
+ s->tiling.tile_cols);
+ if (!s->c_b) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Ran out of memory during range coder init\n");
+ return AVERROR(ENOMEM);
+ }
+ }
+
+ if (s->keyframe || s->errorres || s->intraonly) {
+ s->prob_ctx[0].p =
+ s->prob_ctx[1].p =
+ s->prob_ctx[2].p =
+ s->prob_ctx[3].p = ff_vp9_default_probs;
+ memcpy(s->prob_ctx[0].coef, ff_vp9_default_coef_probs,
+ sizeof(ff_vp9_default_coef_probs));
+ memcpy(s->prob_ctx[1].coef, ff_vp9_default_coef_probs,
+ sizeof(ff_vp9_default_coef_probs));
+ memcpy(s->prob_ctx[2].coef, ff_vp9_default_coef_probs,
+ sizeof(ff_vp9_default_coef_probs));
+ memcpy(s->prob_ctx[3].coef, ff_vp9_default_coef_probs,
+ sizeof(ff_vp9_default_coef_probs));
+ }
+
+ // next 16 bits is size of the rest of the header (arith-coded)
+ size2 = get_bits(&s->gb, 16);
+ data2 = align_get_bits(&s->gb);
+ if (size2 > size - (data2 - data)) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid compressed header size\n");
+ return AVERROR_INVALIDDATA;
+ }
+ ff_vp56_init_range_decoder(&s->c, data2, size2);
+ if (vp56_rac_get_prob_branchy(&s->c, 128)) { // marker bit
+ av_log(avctx, AV_LOG_ERROR, "Marker bit was set\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (s->keyframe || s->intraonly)
+ memset(s->counts.coef, 0,
+ sizeof(s->counts.coef) + sizeof(s->counts.eob));
+ else
+ memset(&s->counts, 0, sizeof(s->counts));
+
+ /* FIXME is it faster to not copy here, but do it down in the fw updates
+ * as explicit copies if the fw update is missing (and skip the copy upon
+ * fw update)? */
+ s->prob.p = s->prob_ctx[c].p;
+
+ // txfm updates
+ if (s->lossless) {
+ s->txfmmode = TX_4X4;
+ } else {
+ s->txfmmode = vp8_rac_get_uint(&s->c, 2);
+ if (s->txfmmode == 3)
+ s->txfmmode += vp8_rac_get(&s->c);
+
+ if (s->txfmmode == TX_SWITCHABLE) {
+ for (i = 0; i < 2; i++)
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.tx8p[i] = update_prob(&s->c, s->prob.p.tx8p[i]);
+ for (i = 0; i < 2; i++)
+ for (j = 0; j < 2; j++)
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.tx16p[i][j] =
+ update_prob(&s->c, s->prob.p.tx16p[i][j]);
+ for (i = 0; i < 2; i++)
+ for (j = 0; j < 3; j++)
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.tx32p[i][j] =
+ update_prob(&s->c, s->prob.p.tx32p[i][j]);
+ }
+ }
+
+ // coef updates
+ for (i = 0; i < 4; i++) {
+ uint8_t (*ref)[2][6][6][3] = s->prob_ctx[c].coef[i];
+ if (vp8_rac_get(&s->c)) {
+ for (j = 0; j < 2; j++)
+ for (k = 0; k < 2; k++)
+ for (l = 0; l < 6; l++)
+ for (m = 0; m < 6; m++) {
+ uint8_t *p = s->prob.coef[i][j][k][l][m];
+ uint8_t *r = ref[j][k][l][m];
+ if (m >= 3 && l == 0) // dc only has 3 pt
+ break;
+ for (n = 0; n < 3; n++) {
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ p[n] = update_prob(&s->c, r[n]);
+ else
+ p[n] = r[n];
+ }
+ p[3] = 0;
+ }
+ } else {
+ for (j = 0; j < 2; j++)
+ for (k = 0; k < 2; k++)
+ for (l = 0; l < 6; l++)
+ for (m = 0; m < 6; m++) {
+ uint8_t *p = s->prob.coef[i][j][k][l][m];
+ uint8_t *r = ref[j][k][l][m];
+ if (m > 3 && l == 0) // dc only has 3 pt
+ break;
+ memcpy(p, r, 3);
+ p[3] = 0;
+ }
+ }
+ if (s->txfmmode == i)
+ break;
+ }
+
+ // mode updates
+ for (i = 0; i < 3; i++)
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.skip[i] = update_prob(&s->c, s->prob.p.skip[i]);
+ if (!s->keyframe && !s->intraonly) {
+ for (i = 0; i < 7; i++)
+ for (j = 0; j < 3; j++)
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.mv_mode[i][j] =
+ update_prob(&s->c, s->prob.p.mv_mode[i][j]);
+
+ if (s->filtermode == FILTER_SWITCHABLE)
+ for (i = 0; i < 4; i++)
+ for (j = 0; j < 2; j++)
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.filter[i][j] =
+ update_prob(&s->c, s->prob.p.filter[i][j]);
+
+ for (i = 0; i < 4; i++)
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.intra[i] = update_prob(&s->c, s->prob.p.intra[i]);
+
+ if (s->allowcompinter) {
+ s->comppredmode = vp8_rac_get(&s->c);
+ if (s->comppredmode)
+ s->comppredmode += vp8_rac_get(&s->c);
+ if (s->comppredmode == PRED_SWITCHABLE)
+ for (i = 0; i < 5; i++)
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.comp[i] =
+ update_prob(&s->c, s->prob.p.comp[i]);
+ } else {
+ s->comppredmode = PRED_SINGLEREF;
+ }
+
+ if (s->comppredmode != PRED_COMPREF) {
+ for (i = 0; i < 5; i++) {
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.single_ref[i][0] =
+ update_prob(&s->c, s->prob.p.single_ref[i][0]);
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.single_ref[i][1] =
+ update_prob(&s->c, s->prob.p.single_ref[i][1]);
+ }
+ }
+
+ if (s->comppredmode != PRED_SINGLEREF) {
+ for (i = 0; i < 5; i++)
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.comp_ref[i] =
+ update_prob(&s->c, s->prob.p.comp_ref[i]);
+ }
+
+ for (i = 0; i < 4; i++)
+ for (j = 0; j < 9; j++)
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.y_mode[i][j] =
+ update_prob(&s->c, s->prob.p.y_mode[i][j]);
+
+ for (i = 0; i < 4; i++)
+ for (j = 0; j < 4; j++)
+ for (k = 0; k < 3; k++)
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.partition[3 - i][j][k] =
+ update_prob(&s->c,
+ s->prob.p.partition[3 - i][j][k]);
+
+ // mv fields don't use the update_prob subexp model for some reason
+ for (i = 0; i < 3; i++)
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.mv_joint[i] = (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+
+ for (i = 0; i < 2; i++) {
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.mv_comp[i].sign =
+ (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+
+ for (j = 0; j < 10; j++)
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.mv_comp[i].classes[j] =
+ (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.mv_comp[i].class0 =
+ (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+
+ for (j = 0; j < 10; j++)
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.mv_comp[i].bits[j] =
+ (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+ }
+
+ for (i = 0; i < 2; i++) {
+ for (j = 0; j < 2; j++)
+ for (k = 0; k < 3; k++)
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.mv_comp[i].class0_fp[j][k] =
+ (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+
+ for (j = 0; j < 3; j++)
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.mv_comp[i].fp[j] =
+ (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+ }
+
+ if (s->highprecisionmvs) {
+ for (i = 0; i < 2; i++) {
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.mv_comp[i].class0_hp =
+ (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+
+ if (vp56_rac_get_prob_branchy(&s->c, 252))
+ s->prob.p.mv_comp[i].hp =
+ (vp8_rac_get_uint(&s->c, 7) << 1) | 1;
+ }
+ }
+ }
+
+ return (data2 - data) + size2;
+}
+
+static int decode_subblock(AVCodecContext *avctx, int row, int col,
+ VP9Filter *lflvl,
+ ptrdiff_t yoff, ptrdiff_t uvoff, enum BlockLevel bl)
+{
+ VP9Context *s = avctx->priv_data;
+ int c = ((s->above_partition_ctx[col] >> (3 - bl)) & 1) |
+ (((s->left_partition_ctx[row & 0x7] >> (3 - bl)) & 1) << 1);
+ int ret;
+ const uint8_t *p = s->keyframe ? ff_vp9_default_kf_partition_probs[bl][c]
+ : s->prob.p.partition[bl][c];
+ enum BlockPartition bp;
+ ptrdiff_t hbs = 4 >> bl;
+
+ if (bl == BL_8X8) {
+ bp = vp8_rac_get_tree(&s->c, ff_vp9_partition_tree, p);
+ ret = ff_vp9_decode_block(avctx, row, col, lflvl, yoff, uvoff, bl, bp);
+ } else if (col + hbs < s->cols) {
+ if (row + hbs < s->rows) {
+ bp = vp8_rac_get_tree(&s->c, ff_vp9_partition_tree, p);
+ switch (bp) {
+ case PARTITION_NONE:
+ ret = ff_vp9_decode_block(avctx, row, col, lflvl, yoff, uvoff,
+ bl, bp);
+ break;
+ case PARTITION_H:
+ ret = ff_vp9_decode_block(avctx, row, col, lflvl, yoff, uvoff,
+ bl, bp);
+ if (!ret) {
+ yoff += hbs * 8 * s->cur_frame->linesize[0];
+ uvoff += hbs * 4 * s->cur_frame->linesize[1];
+ ret = ff_vp9_decode_block(avctx, row + hbs, col, lflvl,
+ yoff, uvoff, bl, bp);
+ }
+ break;
+ case PARTITION_V:
+ ret = ff_vp9_decode_block(avctx, row, col, lflvl, yoff, uvoff,
+ bl, bp);
+ if (!ret) {
+ yoff += hbs * 8;
+ uvoff += hbs * 4;
+ ret = ff_vp9_decode_block(avctx, row, col + hbs, lflvl,
+ yoff, uvoff, bl, bp);
+ }
+ break;
+ case PARTITION_SPLIT:
+ ret = decode_subblock(avctx, row, col, lflvl,
+ yoff, uvoff, bl + 1);
+ if (!ret) {
+ ret = decode_subblock(avctx, row, col + hbs, lflvl,
+ yoff + 8 * hbs, uvoff + 4 * hbs,
+ bl + 1);
+ if (!ret) {
+ yoff += hbs * 8 * s->cur_frame->linesize[0];
+ uvoff += hbs * 4 * s->cur_frame->linesize[1];
+ ret = decode_subblock(avctx, row + hbs, col, lflvl,
+ yoff, uvoff, bl + 1);
+ if (!ret) {
+ ret = decode_subblock(avctx, row + hbs, col + hbs,
+ lflvl, yoff + 8 * hbs,
+ uvoff + 4 * hbs, bl + 1);
+ }
+ }
+ }
+ break;
+ default:
+ av_log(avctx, AV_LOG_ERROR, "Unexpected partition %d.", bp);
+ return AVERROR_INVALIDDATA;
+ }
+ } else if (vp56_rac_get_prob_branchy(&s->c, p[1])) {
+ bp = PARTITION_SPLIT;
+ ret = decode_subblock(avctx, row, col, lflvl, yoff, uvoff, bl + 1);
+ if (!ret)
+ ret = decode_subblock(avctx, row, col + hbs, lflvl,
+ yoff + 8 * hbs, uvoff + 4 * hbs, bl + 1);
+ } else {
+ bp = PARTITION_H;
+ ret = ff_vp9_decode_block(avctx, row, col, lflvl, yoff, uvoff,
+ bl, bp);
+ }
+ } else if (row + hbs < s->rows) {
+ if (vp56_rac_get_prob_branchy(&s->c, p[2])) {
+ bp = PARTITION_SPLIT;
+ ret = decode_subblock(avctx, row, col, lflvl, yoff, uvoff, bl + 1);
+ if (!ret) {
+ yoff += hbs * 8 * s->cur_frame->linesize[0];
+ uvoff += hbs * 4 * s->cur_frame->linesize[1];
+ ret = decode_subblock(avctx, row + hbs, col, lflvl,
+ yoff, uvoff, bl + 1);
+ }
+ } else {
+ bp = PARTITION_V;
+ ret = ff_vp9_decode_block(avctx, row, col, lflvl, yoff, uvoff,
+ bl, bp);
+ }
+ } else {
+ bp = PARTITION_SPLIT;
+ ret = decode_subblock(avctx, row, col, lflvl, yoff, uvoff, bl + 1);
+ }
+ s->counts.partition[bl][c][bp]++;
+
+ return ret;
+}
+
+static void loopfilter_subblock(AVCodecContext *avctx, VP9Filter *lflvl,
+ int row, int col,
+ ptrdiff_t yoff, ptrdiff_t uvoff)
+{
+ VP9Context *s = avctx->priv_data;
+ uint8_t *dst = s->cur_frame->data[0] + yoff, *lvl = lflvl->level;
+ ptrdiff_t ls_y = s->cur_frame->linesize[0], ls_uv = s->cur_frame->linesize[1];
+ int y, x, p;
+
+ /* FIXME: In how far can we interleave the v/h loopfilter calls? E.g.
+ * if you think of them as acting on a 8x8 block max, we can interleave
+ * each v/h within the single x loop, but that only works if we work on
+ * 8 pixel blocks, and we won't always do that (we want at least 16px
+ * to use SSE2 optimizations, perhaps 32 for AVX2). */
+
+ // filter edges between columns, Y plane (e.g. block1 | block2)
+ for (y = 0; y < 8; y += 2, dst += 16 * ls_y, lvl += 16) {
+ uint8_t *ptr = dst, *l = lvl, *hmask1 = lflvl->mask[0][0][y];
+ uint8_t *hmask2 = lflvl->mask[0][0][y + 1];
+ unsigned hm1 = hmask1[0] | hmask1[1] | hmask1[2], hm13 = hmask1[3];
+ unsigned hm2 = hmask2[1] | hmask2[2], hm23 = hmask2[3];
+ unsigned hm = hm1 | hm2 | hm13 | hm23;
+
+ for (x = 1; hm & ~(x - 1); x <<= 1, ptr += 8, l++) {
+ if (hm1 & x) {
+ int L = *l, H = L >> 4;
+ int E = s->filter.mblim_lut[L], I = s->filter.lim_lut[L];
+
+ if (col || x > 1) {
+ if (hmask1[0] & x) {
+ if (hmask2[0] & x) {
+ av_assert2(l[8] == L);
+ s->dsp.loop_filter_16[0](ptr, ls_y, E, I, H);
+ } else {
+ s->dsp.loop_filter_8[2][0](ptr, ls_y, E, I, H);
+ }
+ } else if (hm2 & x) {
+ L = l[8];
+ H |= (L >> 4) << 8;
+ E |= s->filter.mblim_lut[L] << 8;
+ I |= s->filter.lim_lut[L] << 8;
+ s->dsp.loop_filter_mix2[!!(hmask1[1] & x)]
+ [!!(hmask2[1] & x)]
+ [0](ptr, ls_y, E, I, H);
+ } else {
+ s->dsp.loop_filter_8[!!(hmask1[1] & x)]
+ [0](ptr, ls_y, E, I, H);
+ }
+ }
+ } else if (hm2 & x) {
+ int L = l[8], H = L >> 4;
+ int E = s->filter.mblim_lut[L], I = s->filter.lim_lut[L];
+
+ if (col || x > 1) {
+ s->dsp.loop_filter_8[!!(hmask2[1] & x)]
+ [0](ptr + 8 * ls_y, ls_y, E, I, H);
+ }
+ }
+ if (hm13 & x) {
+ int L = *l, H = L >> 4;
+ int E = s->filter.mblim_lut[L], I = s->filter.lim_lut[L];
+
+ if (hm23 & x) {
+ L = l[8];
+ H |= (L >> 4) << 8;
+ E |= s->filter.mblim_lut[L] << 8;
+ I |= s->filter.lim_lut[L] << 8;
+ s->dsp.loop_filter_mix2[0][0][0](ptr + 4, ls_y, E, I, H);
+ } else {
+ s->dsp.loop_filter_8[0][0](ptr + 4, ls_y, E, I, H);
+ }
+ } else if (hm23 & x) {
+ int L = l[8], H = L >> 4;
+ int E = s->filter.mblim_lut[L], I = s->filter.lim_lut[L];
+
+ s->dsp.loop_filter_8[0][0](ptr + 8 * ls_y + 4, ls_y, E, I, H);
+ }
+ }
+ }
+
+ // block1
+ // filter edges between rows, Y plane (e.g. ------)
+ // block2
+ dst = s->cur_frame->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];
+ unsigned vm = vmask[0] | vmask[1] | vmask[2], vm3 = vmask[3];
+
+ for (x = 1; vm & ~(x - 1); x <<= 2, ptr += 16, l += 2) {
+ if (row || y) {
+ if (vm & x) {
+ int L = *l, H = L >> 4;
+ int E = s->filter.mblim_lut[L], I = s->filter.lim_lut[L];
+
+ if (vmask[0] & x) {
+ if (vmask[0] & (x << 1)) {
+ av_assert2(l[1] == L);
+ s->dsp.loop_filter_16[1](ptr, ls_y, E, I, H);
+ } else {
+ s->dsp.loop_filter_8[2][1](ptr, ls_y, E, I, H);
+ }
+ } else if (vm & (x << 1)) {
+ L = l[1];
+ H |= (L >> 4) << 8;
+ E |= s->filter.mblim_lut[L] << 8;
+ I |= s->filter.lim_lut[L] << 8;
+ s->dsp.loop_filter_mix2[!!(vmask[1] & x)]
+ [!!(vmask[1] & (x << 1))]
+ [1](ptr, ls_y, E, I, H);
+ } else {
+ s->dsp.loop_filter_8[!!(vmask[1] & x)]
+ [1](ptr, ls_y, E, I, H);
+ }
+ } else if (vm & (x << 1)) {
+ int L = l[1], H = L >> 4;
+ int E = s->filter.mblim_lut[L], I = s->filter.lim_lut[L];
+
+ s->dsp.loop_filter_8[!!(vmask[1] & (x << 1))]
+ [1](ptr + 8, ls_y, E, I, H);
+ }
+ }
+ if (vm3 & x) {
+ int L = *l, H = L >> 4;
+ int E = s->filter.mblim_lut[L], I = s->filter.lim_lut[L];
+
+ if (vm3 & (x << 1)) {
+ L = l[1];
+ H |= (L >> 4) << 8;
+ E |= s->filter.mblim_lut[L] << 8;
+ I |= s->filter.lim_lut[L] << 8;
+ s->dsp.loop_filter_mix2[0][0][1](ptr + ls_y * 4, ls_y, E, I, H);
+ } else {
+ s->dsp.loop_filter_8[0][1](ptr + ls_y * 4, ls_y, E, I, H);
+ }
+ } else if (vm3 & (x << 1)) {
+ int L = l[1], H = L >> 4;
+ int E = s->filter.mblim_lut[L], I = s->filter.lim_lut[L];
+
+ s->dsp.loop_filter_8[0][1](ptr + ls_y * 4 + 8, ls_y, E, I, H);
+ }
+ }
+ }
+
+ // same principle but for U/V planes
+ for (p = 0; p < 2; p++) {
+ lvl = lflvl->level;
+ dst = s->cur_frame->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];
+ unsigned hm1 = hmask1[0] | hmask1[1] | hmask1[2];
+ unsigned hm2 = hmask2[1] | hmask2[2], hm = hm1 | hm2;
+
+ for (x = 1; hm & ~(x - 1); x <<= 1, ptr += 4) {
+ if (col || x > 1) {
+ if (hm1 & x) {
+ int L = *l, H = L >> 4;
+ int E = s->filter.mblim_lut[L];
+ int I = s->filter.lim_lut[L];
+
+ if (hmask1[0] & x) {
+ if (hmask2[0] & x) {
+ av_assert2(l[16] == L);
+ s->dsp.loop_filter_16[0](ptr, ls_uv, E, I, H);
+ } else {
+ s->dsp.loop_filter_8[2][0](ptr, ls_uv, E, I, H);
+ }
+ } else if (hm2 & x) {
+ L = l[16];
+ H |= (L >> 4) << 8;
+ E |= s->filter.mblim_lut[L] << 8;
+ I |= s->filter.lim_lut[L] << 8;
+ s->dsp.loop_filter_mix2[!!(hmask1[1] & x)]
+ [!!(hmask2[1] & x)]
+ [0](ptr, ls_uv, E, I, H);
+ } else {
+ s->dsp.loop_filter_8[!!(hmask1[1] & x)]
+ [0](ptr, ls_uv, E, I, H);
+ }
+ } else if (hm2 & x) {
+ int L = l[16], H = L >> 4;
+ int E = s->filter.mblim_lut[L];
+ int I = s->filter.lim_lut[L];
+
+ s->dsp.loop_filter_8[!!(hmask2[1] & x)]
+ [0](ptr + 8 * ls_uv, ls_uv, E, I, H);
+ }
+ }
+ if (x & 0xAA)
+ l += 2;
+ }
+ }
+ lvl = lflvl->level;
+ dst = s->cur_frame->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];
+
+ for (x = 1; vm & ~(x - 1); x <<= 4, ptr += 16, l += 4) {
+ if (row || y) {
+ if (vm & x) {
+ int L = *l, H = L >> 4;
+ int E = s->filter.mblim_lut[L];
+ int I = s->filter.lim_lut[L];
+
+ if (vmask[0] & x) {
+ if (vmask[0] & (x << 2)) {
+ av_assert2(l[2] == L);
+ s->dsp.loop_filter_16[1](ptr, ls_uv, E, I, H);
+ } else {
+ s->dsp.loop_filter_8[2][1](ptr, ls_uv, E, I, H);
+ }
+ } else if (vm & (x << 2)) {
+ L = l[2];
+ H |= (L >> 4) << 8;
+ E |= s->filter.mblim_lut[L] << 8;
+ I |= s->filter.lim_lut[L] << 8;
+ s->dsp.loop_filter_mix2[!!(vmask[1] & x)]
+ [!!(vmask[1] & (x << 2))]
+ [1](ptr, ls_uv, E, I, H);
+ } else {
+ s->dsp.loop_filter_8[!!(vmask[1] & x)]
+ [1](ptr, ls_uv, E, I, H);
+ }
+ } else if (vm & (x << 2)) {
+ int L = l[2], H = L >> 4;
+ int E = s->filter.mblim_lut[L];
+ int I = s->filter.lim_lut[L];
+
+ s->dsp.loop_filter_8[!!(vmask[1] & (x << 2))]
+ [1](ptr + 8, ls_uv, E, I, H);
+ }
+ }
+ }
+ if (y & 1)
+ lvl += 16;
+ }
+ }
+}
+
+static void set_tile_offset(int *start, int *end, int idx, int log2_n, int n)
+{
+ int sb_start = (idx * n) >> log2_n;
+ int sb_end = ((idx + 1) * n) >> log2_n;
+ *start = FFMIN(sb_start, n) << 3;
+ *end = FFMIN(sb_end, n) << 3;
+}
+
+static int vp9_decode_frame(AVCodecContext *avctx, AVFrame *frame,
+ int *got_frame, const uint8_t *data, int size)
+{
+ VP9Context *s = avctx->priv_data;
+ int ret, tile_row, tile_col, i, ref = -1, row, col;
+ ptrdiff_t yoff = 0, uvoff = 0;
+
+ ret = decode_frame_header(avctx, data, size, &ref);
+ if (ret < 0) {
+ return ret;
+ } else if (!ret) {
+ if (!s->refs[ref]->buf[0]) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Requested reference %d not available\n", ref);
+ return AVERROR_INVALIDDATA;
+ }
+
+ ret = av_frame_ref(frame, s->refs[ref]);
+ if (ret < 0)
+ return ret;
+ *got_frame = 1;
+ return 0;
+ }
+ data += ret;
+ size -= ret;
+
+ s->cur_frame = frame;
+
+ av_frame_unref(s->cur_frame);
+ if ((ret = ff_get_buffer(avctx, s->cur_frame,
+ s->refreshrefmask ? AV_GET_BUFFER_FLAG_REF : 0)) < 0)
+ return ret;
+ s->cur_frame->key_frame = s->keyframe;
+ s->cur_frame->pict_type = s->keyframe ? AV_PICTURE_TYPE_I
+ : AV_PICTURE_TYPE_P;
+
+ // main tile decode loop
+ memset(s->above_partition_ctx, 0, s->cols);
+ memset(s->above_skip_ctx, 0, s->cols);
+ if (s->keyframe || s->intraonly)
+ memset(s->above_mode_ctx, DC_PRED, s->cols * 2);
+ else
+ memset(s->above_mode_ctx, NEARESTMV, s->cols);
+ memset(s->above_y_nnz_ctx, 0, s->sb_cols * 16);
+ 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++) {
+ int64_t 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;
+ }
+
+ for (row = s->tiling.tile_row_start;
+ row < s->tiling.tile_row_end;
+ row += 8, yoff += s->cur_frame->linesize[0] * 64,
+ uvoff += s->cur_frame->linesize[1] * 32) {
+ VP9Filter *lflvl = 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);
+ 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++) {
+ // FIXME integrate with lf code (i.e. zero after each
+ // use, similar to invtxfm coefficients, or similar)
+ memset(lflvl->mask, 0, sizeof(lflvl->mask));
+
+ if ((ret = decode_subblock(avctx, row, col, lflvl,
+ yoff2, uvoff2, BL_64X64)) < 0)
+ return ret;
+ }
+ 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->cur_frame->data[0] + yoff +
+ 63 * s->cur_frame->linesize[0],
+ 8 * s->cols);
+ memcpy(s->intra_pred_data[1],
+ s->cur_frame->data[1] + uvoff +
+ 31 * s->cur_frame->linesize[1],
+ 4 * s->cols);
+ memcpy(s->intra_pred_data[2],
+ s->cur_frame->data[2] + uvoff +
+ 31 * s->cur_frame->linesize[2],
+ 4 * s->cols);
+ }
+
+ // loopfilter one row
+ if (s->filter.level) {
+ yoff2 = yoff;
+ uvoff2 = uvoff;
+ lflvl = s->lflvl;
+ for (col = 0; col < s->cols;
+ col += 8, yoff2 += 64, uvoff2 += 32, lflvl++)
+ loopfilter_subblock(avctx, lflvl, row, col, yoff2, uvoff2);
+ }
+ }
+ }
+
+ // bw adaptivity (or in case of parallel decoding mode, fw adaptivity
+ // probability maintenance between frames)
+ if (s->refreshctx) {
+ if (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;
+ } else {
+ ff_vp9_adapt_probs(s);
+ }
+ }
+ FFSWAP(VP9MVRefPair *, s->mv[0], s->mv[1]);
+
+ // ref frame setup
+ for (i = 0; i < 8; i++)
+ if (s->refreshrefmask & (1 << i)) {
+ av_frame_unref(s->refs[i]);
+ ret = av_frame_ref(s->refs[i], s->cur_frame);
+ if (ret < 0)
+ return ret;
+ }
+
+ if (s->invisible)
+ av_frame_unref(s->cur_frame);
+ else
+ *got_frame = 1;
+
+ return 0;
+}
+
+static int vp9_decode_packet(AVCodecContext *avctx, void *frame,
+ int *got_frame, AVPacket *avpkt)
+{
+ const uint8_t *data = avpkt->data;
+ int size = avpkt->size;
+ int marker, ret;
+
+ /* Read superframe index - this is a collection of individual frames
+ * that together lead to one visible frame */
+ marker = data[size - 1];
+ if ((marker & 0xe0) == 0xc0) {
+ int nbytes = 1 + ((marker >> 3) & 0x3);
+ int n_frames = 1 + (marker & 0x7);
+ int idx_sz = 2 + n_frames * nbytes;
+
+ if (size >= idx_sz && data[size - idx_sz] == marker) {
+ const uint8_t *idx = data + size + 1 - idx_sz;
+
+ while (n_frames--) {
+ unsigned sz = AV_RL32(idx);
+
+ if (nbytes < 4)
+ sz &= (1 << (8 * nbytes)) - 1;
+ idx += nbytes;
+
+ if (sz > size) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Superframe packet size too big: %u > %d\n",
+ sz, size);
+ return AVERROR_INVALIDDATA;
+ }
+
+ ret = vp9_decode_frame(avctx, frame, got_frame, data, sz);
+ if (ret < 0)
+ return ret;
+ data += sz;
+ size -= sz;
+ }
+ return 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 ((ret = vp9_decode_frame(avctx, frame, got_frame, data, size)) < 0)
+ return ret;
+ return size;
+}
+
+static av_cold int vp9_decode_free(AVCodecContext *avctx)
+{
+ VP9Context *s = avctx->priv_data;
+ int i;
+
+ for (i = 0; i < FF_ARRAY_ELEMS(s->refs); i++)
+ av_frame_free(&s->refs[i]);
+
+ av_freep(&s->c_b);
+ av_freep(&s->above_partition_ctx);
+
+ return 0;
+}
+
+static av_cold int vp9_decode_init(AVCodecContext *avctx)
+{
+ VP9Context *s = avctx->priv_data;
+ int i;
+
+ avctx->pix_fmt = AV_PIX_FMT_YUV420P;
+
+ ff_vp9dsp_init(&s->dsp);
+ ff_videodsp_init(&s->vdsp, 8);
+
+ for (i = 0; i < FF_ARRAY_ELEMS(s->refs); i++) {
+ s->refs[i] = av_frame_alloc();
+ if (!s->refs[i]) {
+ vp9_decode_free(avctx);
+ return AVERROR(ENOMEM);
+ }
+ }
+
+ s->filter.sharpness = -1;
+
+ 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,
+ .decode = vp9_decode_packet,
+ .flush = vp9_decode_flush,
+ .close = vp9_decode_free,
+ .capabilities = CODEC_CAP_DR1,
+};

libav-v10.1.tar.bz2/libavcodec/vp9.h Added

@@ -0,0 +1,419 @@
+/*
+ * VP9 compatible video decoder
+ *
+ * Copyright (C) 2013 Ronald S. Bultje <rsbultje gmail com>
+ * Copyright (C) 2013 Clément Bœsch 
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VP9_H
+#define AVCODEC_VP9_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "libavutil/internal.h"
+
+#include "avcodec.h"
+#include "vp56.h"
+
+enum TxfmMode {
+ TX_4X4,
+ TX_8X8,
+ TX_16X16,
+ TX_32X32,
+ N_TXFM_SIZES,
+ TX_SWITCHABLE = N_TXFM_SIZES,
+ N_TXFM_MODES
+};
+
+enum TxfmType {
+ DCT_DCT,
+ DCT_ADST,
+ ADST_DCT,
+ ADST_ADST,
+ N_TXFM_TYPES
+};
+
+enum IntraPredMode {
+ VERT_PRED,
+ HOR_PRED,
+ DC_PRED,
+ DIAG_DOWN_LEFT_PRED,
+ DIAG_DOWN_RIGHT_PRED,
+ VERT_RIGHT_PRED,
+ HOR_DOWN_PRED,
+ VERT_LEFT_PRED,
+ HOR_UP_PRED,
+ TM_VP8_PRED,
+ LEFT_DC_PRED,
+ TOP_DC_PRED,
+ DC_128_PRED,
+ DC_127_PRED,
+ DC_129_PRED,
+ N_INTRA_PRED_MODES
+};
+
+enum FilterMode {
+ FILTER_8TAP_SMOOTH,
+ FILTER_8TAP_REGULAR,
+ FILTER_8TAP_SHARP,
+ FILTER_BILINEAR,
+ FILTER_SWITCHABLE,
+};
+
+enum BlockPartition {
+ PARTITION_NONE, // [ ] <-.
+ PARTITION_H, // [-] |
+ PARTITION_V, // [|] |
+ PARTITION_SPLIT, // [+] --'
+};
+
+enum InterPredMode {
+ NEARESTMV = 10,
+ NEARMV = 11,
+ ZEROMV = 12,
+ NEWMV = 13,
+};
+
+enum MVJoint {
+ MV_JOINT_ZERO,
+ MV_JOINT_H,
+ MV_JOINT_V,
+ MV_JOINT_HV,
+};
+
+typedef struct ProbContext {
+ uint8_t y_mode[4][9];
+ uint8_t uv_mode[10][9];
+ uint8_t filter[4][2];
+ uint8_t mv_mode[7][3];
+ uint8_t intra[4];
+ uint8_t comp[5];
+ uint8_t single_ref[5][2];
+ uint8_t comp_ref[5];
+ uint8_t tx32p[2][3];
+ uint8_t tx16p[2][2];
+ uint8_t tx8p[2];
+ uint8_t skip[3];
+ uint8_t mv_joint[3];
+ struct {
+ uint8_t sign;
+ uint8_t classes[10];
+ uint8_t class0;
+ uint8_t bits[10];
+ uint8_t class0_fp[2][3];
+ uint8_t fp[3];
+ uint8_t class0_hp;
+ uint8_t hp;
+ } mv_comp[2];
+ uint8_t partition[4][4][3];
+} ProbContext;
+
+typedef void (*vp9_mc_func)(uint8_t *dst, const uint8_t *ref,
+ ptrdiff_t dst_stride,
+ ptrdiff_t ref_stride,
+ int h, int mx, int my);
+
+typedef struct VP9DSPContext {
+ /*
+ * dimension 1: 0=4x4, 1=8x8, 2=16x16, 3=32x32
+ * dimension 2: intra prediction modes
+ *
+ * dst/left/top is aligned by transform-size (i.e. 4, 8, 16 or 32 pixels)
+ * stride is aligned by 16 pixels
+ * top[-1] is top/left; top[4,7] is top-right for 4x4
+ */
+ // FIXME(rbultje) maybe replace left/top pointers with HAVE_TOP/
+ // HAVE_LEFT/HAVE_TOPRIGHT flags instead, and then handle it in-place?
+ // also needs to fit in with what h264/vp8/etc do
+ void (*intra_pred[N_TXFM_SIZES][N_INTRA_PRED_MODES])(uint8_t *dst,
+ ptrdiff_t stride,
+ const uint8_t *left,
+ const uint8_t *top);
+
+ /*
+ * dimension 1: 0=4x4, 1=8x8, 2=16x16, 3=32x32, 4=lossless (3-4=dct only)
+ * dimension 2: 0=dct/dct, 1=dct/adst, 2=adst/dct, 3=adst/adst
+ *
+ * dst is aligned by transform-size (i.e. 4, 8, 16 or 32 pixels)
+ * stride is aligned by 16 pixels
+ * block is 16-byte aligned
+ * eob indicates the position (+1) of the last non-zero coefficient,
+ * in scan-order. This can be used to write faster versions, e.g. a
+ * dc-only 4x4/8x8/16x16/32x32, or a 4x4-only (eob<10) 8x8/16x16/32x32,
+ * etc.
+ */
+ // FIXME also write idct_add_block() versions for whole (inter) pred
+ // blocks, so we can do 2 4x4s at once
+ void (*itxfm_add[N_TXFM_SIZES + 1][N_TXFM_TYPES])(uint8_t *dst,
+ ptrdiff_t stride,
+ int16_t *block, int eob);
+
+ /*
+ * dimension 1: width of filter (0=4, 1=8, 2=16)
+ * dimension 2: 0=col-edge filter (h), 1=row-edge filter (v)
+ *
+ * dst/stride are aligned by 8
+ */
+ void (*loop_filter_8[3][2])(uint8_t *dst, ptrdiff_t stride,
+ int mb_lim, int lim, int hev_thr);
+
+ /*
+ * dimension 1: 0=col-edge filter (h), 1=row-edge filter (v)
+ *
+ * The width of filter is assumed to be 16; dst/stride are aligned by 16
+ */
+ void (*loop_filter_16[2])(uint8_t *dst, ptrdiff_t stride,
+ int mb_lim, int lim, int hev_thr);
+
+ /*
+ * dimension 1/2: width of filter (0=4, 1=8) for each filter half
+ * dimension 3: 0=col-edge filter (h), 1=row-edge filter (v)
+ *
+ * dst/stride are aligned by operation size
+ * this basically calls loop_filter[d1][d3][0](), followed by
+ * loop_filter[d2][d3][0]() on the next 8 pixels
+ * mb_lim/lim/hev_thr contain two values in the lowest two bytes of the
+ * integer.
+ */
+ // FIXME perhaps a mix4 that operates on 32px (for AVX2)
+ void (*loop_filter_mix2[2][2][2])(uint8_t *dst, ptrdiff_t stride,
+ int mb_lim, int lim, int hev_thr);
+
+ /*
+ * dimension 1: hsize (0: 64, 1: 32, 2: 16, 3: 8, 4: 4)
+ * dimension 2: filter type (0: smooth, 1: regular, 2: sharp, 3: bilin)
+ * dimension 3: averaging type (0: put, 1: avg)
+ * dimension 4: x subpel interpolation (0: none, 1: 8tap/bilin)
+ * dimension 5: y subpel interpolation (1: none, 1: 8tap/bilin)
+ *
+ * dst/stride are aligned by hsize
+ */
+ vp9_mc_func mc[5][4][2][2][2];
+} VP9DSPContext;
+
+enum CompPredMode {
+ PRED_SINGLEREF,
+ PRED_COMPREF,
+ PRED_SWITCHABLE,
+};
+
+typedef struct VP9MVRefPair {
+ VP56mv mv[2];
+ int8_t ref[2];
+} VP9MVRefPair;
+
+typedef struct VP9Filter {
+ uint8_t level[8 * 8];
+ uint8_t /* bit=col */ mask[2 /* 0=y, 1=uv */][2 /* 0=col, 1=row */]
+ [8 /* rows */][4 /* 0=16, 1=8, 2=4, 3=inner4 */];
+} VP9Filter;
+
+enum BlockLevel {
+ BL_64X64,
+ BL_32X32,
+ BL_16X16,
+ BL_8X8,
+};
+
+enum BlockSize {
+ BS_64x64,
+ BS_64x32,
+ BS_32x64,
+ BS_32x32,
+ BS_32x16,
+ BS_16x32,
+ BS_16x16,
+ BS_16x8,
+ BS_8x16,
+ BS_8x8,
+ BS_8x4,
+ BS_4x8,
+ BS_4x4,
+ N_BS_SIZES,
+};
+
+typedef struct VP9Block {
+ uint8_t seg_id, intra, comp, ref[2], mode[4], uvmode, skip;
+ enum FilterMode filter;
+ 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;
+} VP9Block;
+
+typedef struct VP9Context {
+ VP9DSPContext dsp;
+ VideoDSPContext vdsp;
+ GetBitContext gb;
+ VP56RangeCoder c;
+ VP56RangeCoder *c_b;
+ unsigned c_b_size;
+ VP9Block b;
+
+ // bitstream header
+ uint8_t profile;
+ uint8_t keyframe, last_keyframe;
+ uint8_t invisible;
+ uint8_t use_last_frame_mvs;
+ uint8_t errorres;
+ uint8_t colorspace;
+ uint8_t fullrange;
+ uint8_t intraonly;
+ uint8_t resetctx;
+ uint8_t refreshrefmask;
+ uint8_t highprecisionmvs;
+ enum FilterMode filtermode;
+ uint8_t allowcompinter;
+ uint8_t fixcompref;
+ uint8_t refreshctx;
+ uint8_t parallelmode;
+ uint8_t framectxid;
+ uint8_t refidx[3];
+ uint8_t signbias[3];
+ uint8_t varcompref[2];
+ AVFrame *refs[8];
+ AVFrame *cur_frame;
+
+ struct {
+ uint8_t level;
+ int8_t sharpness;
+ uint8_t lim_lut[64];
+ uint8_t mblim_lut[64];
+ } filter;
+ struct {
+ uint8_t enabled;
+ int8_t mode[2];
+ int8_t ref[4];
+ } lf_delta;
+ uint8_t yac_qi;
+ int8_t ydc_qdelta, uvdc_qdelta, uvac_qdelta;
+ uint8_t lossless;
+ struct {
+ uint8_t enabled;
+ uint8_t temporal;
+ uint8_t absolute_vals;
+ uint8_t update_map;
+ struct {
+ uint8_t q_enabled;
+ uint8_t lf_enabled;
+ uint8_t ref_enabled;
+ uint8_t skip_enabled;
+ uint8_t ref_val;
+ int16_t q_val;
+ int8_t lf_val;
+ int16_t qmul[2][2];
+ uint8_t lflvl[4][2];
+ } feat[8];
+ } segmentation;
+ struct {
+ unsigned log2_tile_cols, log2_tile_rows;
+ unsigned tile_cols, tile_rows;
+ unsigned tile_row_start, tile_row_end, tile_col_start, tile_col_end;
+ } tiling;
+ unsigned sb_cols, sb_rows, rows, cols;
+ struct {
+ ProbContext p;
+ uint8_t coef[4][2][2][6][6][3];
+ } prob_ctx[4];
+ struct {
+ ProbContext p;
+ uint8_t coef[4][2][2][6][6][11];
+ uint8_t seg[7];
+ uint8_t segpred[3];
+ } prob;
+ struct {
+ unsigned y_mode[4][10];
+ unsigned uv_mode[10][10];
+ unsigned filter[4][3];
+ unsigned mv_mode[7][4];
+ unsigned intra[4][2];
+ unsigned comp[5][2];
+ unsigned single_ref[5][2][2];
+ unsigned comp_ref[5][2];
+ unsigned tx32p[2][4];
+ unsigned tx16p[2][3];
+ unsigned tx8p[2][2];
+ unsigned skip[3][2];
+ unsigned mv_joint[4];
+ struct {
+ unsigned sign[2];
+ unsigned classes[11];
+ unsigned class0[2];
+ unsigned bits[10][2];
+ unsigned class0_fp[2][4];
+ unsigned fp[4];
+ unsigned class0_hp[2];
+ unsigned hp[2];
+ } mv_comp[2];
+ unsigned partition[4][4][4];
+ unsigned coef[4][2][2][6][6][3];
+ unsigned eob[4][2][2][6][6][2];
+ } counts;
+ enum TxfmMode txfmmode;
+ 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;
+ // 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];
+
+ // whole-frame cache
+ uint8_t *intra_pred_data[3];
+ uint8_t *segmentation_map;
+ VP9MVRefPair *mv[2];
+ 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;
+ DECLARE_ALIGNED(32, uint8_t, tmp_y)[64 * 64];
+ DECLARE_ALIGNED(32, uint8_t, tmp_uv)[2][32 * 32];
+} VP9Context;
+
+void ff_vp9dsp_init(VP9DSPContext *dsp);
+
+void ff_vp9dsp_init_x86(VP9DSPContext *dsp);
+
+void ff_vp9_fill_mv(VP9Context *s, VP56mv *mv, int mode, int sb);
+
+void ff_vp9_adapt_probs(VP9Context *s);
+
+int ff_vp9_decode_block(AVCodecContext *avctx, int row, int col,
+ VP9Filter *lflvl, ptrdiff_t yoff, ptrdiff_t uvoff,
+ enum BlockLevel bl, enum BlockPartition bp);
+
+#endif /* AVCODEC_VP9_H */

libav-v10.1.tar.bz2/libavcodec/vp9block.c Added

@@ -0,0 +1,1684 @@
+/*
+ * VP9 compatible video decoder
+ *
+ * Copyright (C) 2013 Ronald S. Bultje <rsbultje gmail com>
+ * Copyright (C) 2013 Clément Bœsch 
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/avassert.h"
+
+#include "avcodec.h"
+#include "get_bits.h"
+#include "internal.h"
+#include "videodsp.h"
+#include "vp56.h"
+#include "vp9.h"
+#include "vp9data.h"
+
+static const uint8_t bwh_tab[2][N_BS_SIZES][2] = {
+ {
+ { 16, 16 }, { 16, 8 }, { 8, 16 }, { 8, 8 }, { 8, 4 }, { 4, 8 },
+ { 4, 4 }, { 4, 2 }, { 2, 4 }, { 2, 2 }, { 2, 1 }, { 1, 2 }, { 1, 1 },
+ }, {
+ { 8, 8 }, { 8, 4 }, { 4, 8 }, { 4, 4 }, { 4, 2 }, { 2, 4 },
+ { 2, 2 }, { 2, 1 }, { 1, 2 }, { 1, 1 }, { 1, 1 }, { 1, 1 }, { 1, 1 },
+ }
+};
+
+// differential forward probability updates
+static void decode_mode(VP9Context *s, VP9Block *const b)
+{
+ static const uint8_t left_ctx[N_BS_SIZES] = {
+ 0x0, 0x8, 0x0, 0x8, 0xc, 0x8, 0xc, 0xe, 0xc, 0xe, 0xf, 0xe, 0xf
+ };
+ static const uint8_t above_ctx[N_BS_SIZES] = {
+ 0x0, 0x0, 0x8, 0x8, 0x8, 0xc, 0xc, 0xc, 0xe, 0xe, 0xe, 0xf, 0xf
+ };
+ static const uint8_t max_tx_for_bl_bp[N_BS_SIZES] = {
+ TX_32X32, TX_32X32, TX_32X32, TX_32X32, TX_16X16, TX_16X16,
+ TX_16X16, TX_8X8, TX_8X8, TX_8X8, TX_4X4, TX_4X4, TX_4X4
+ };
+ int row = b->row, col = b->col, row7 = b->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]);
+ int have_a = row > 0, have_l = col > s->tiling.tile_col_start;
+ int y;
+
+ 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, ff_vp9_segmentation_tree, s->prob.seg) : 0;
+ } 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;
+
+ 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]);
+ b->seg_id = pred;
+
+ memset(&s->above_segpred_ctx[col], 1, w4);
+ memset(&s->left_segpred_ctx[row7], 1, h4);
+ } else {
+ b->seg_id = vp8_rac_get_tree(&s->c, ff_vp9_segmentation_tree,
+ s->prob.seg);
+
+ 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);
+ }
+
+ b->skip = s->segmentation.enabled &&
+ s->segmentation.feat[b->seg_id].skip_enabled;
+ if (!b->skip) {
+ int c = s->left_skip_ctx[row7] + s->above_skip_ctx[col];
+ b->skip = vp56_rac_get_prob(&s->c, s->prob.p.skip[c]);
+ s->counts.skip[c][b->skip]++;
+ }
+
+ if (s->keyframe || s->intraonly) {
+ b->intra = 1;
+ } else if (s->segmentation.feat[b->seg_id].ref_enabled) {
+ b->intra = !s->segmentation.feat[b->seg_id].ref_val;
+ } else {
+ int c, bit;
+
+ if (have_a && have_l) {
+ c = s->above_intra_ctx[col] + s->left_intra_ctx[row7];
+ c += (c == 2);
+ } else {
+ c = have_a ? 2 * s->above_intra_ctx[col] :
+ have_l ? 2 * s->left_intra_ctx[row7] : 0;
+ }
+ bit = vp56_rac_get_prob(&s->c, s->prob.p.intra[c]);
+ s->counts.intra[c][bit]++;
+ b->intra = !bit;
+ }
+
+ if ((b->intra || !b->skip) && s->txfmmode == TX_SWITCHABLE) {
+ int c;
+ if (have_a) {
+ if (have_l) {
+ c = (s->above_skip_ctx[col] ? max_tx :
+ s->above_txfm_ctx[col]) +
+ (s->left_skip_ctx[row7] ? max_tx :
+ s->left_txfm_ctx[row7]) > max_tx;
+ } else {
+ c = s->above_skip_ctx[col] ? 1 :
+ (s->above_txfm_ctx[col] * 2 > max_tx);
+ }
+ } else if (have_l) {
+ c = s->left_skip_ctx[row7] ? 1 :
+ (s->left_txfm_ctx[row7] * 2 > max_tx);
+ } else {
+ c = 1;
+ }
+ switch (max_tx) {
+ case TX_32X32:
+ b->tx = vp56_rac_get_prob(&s->c, s->prob.p.tx32p[c][0]);
+ if (b->tx) {
+ b->tx += vp56_rac_get_prob(&s->c, s->prob.p.tx32p[c][1]);
+ if (b->tx == 2)
+ b->tx += vp56_rac_get_prob(&s->c, s->prob.p.tx32p[c][2]);
+ }
+ s->counts.tx32p[c][b->tx]++;
+ break;
+ case TX_16X16:
+ b->tx = vp56_rac_get_prob(&s->c, s->prob.p.tx16p[c][0]);
+ if (b->tx)
+ b->tx += vp56_rac_get_prob(&s->c, s->prob.p.tx16p[c][1]);
+ s->counts.tx16p[c][b->tx]++;
+ break;
+ case TX_8X8:
+ b->tx = vp56_rac_get_prob(&s->c, s->prob.p.tx8p[c]);
+ s->counts.tx8p[c][b->tx]++;
+ break;
+ case TX_4X4:
+ b->tx = TX_4X4;
+ break;
+ }
+ } else {
+ b->tx = FFMIN(max_tx, s->txfmmode);
+ }
+
+ if (s->keyframe || s->intraonly) {
+ uint8_t *a = &s->above_mode_ctx[col * 2];
+ uint8_t *l = &s->left_mode_ctx[(row7) << 1];
+
+ b->comp = 0;
+ if (b->bs > BS_8x8) {
+ // FIXME the memory storage intermediates here aren't really
+ // necessary, they're just there to make the code slightly
+ // simpler for now
+ b->mode[0] =
+ a[0] = vp8_rac_get_tree(&s->c, ff_vp9_intramode_tree,
+ ff_vp9_default_kf_ymode_probs[a[0]][l[0]]);
+ if (b->bs != BS_8x4) {
+ b->mode[1] = vp8_rac_get_tree(&s->c, ff_vp9_intramode_tree,
+ ff_vp9_default_kf_ymode_probs[a[1]][b->mode[0]]);
+ l[0] =
+ a[1] = b->mode[1];
+ } else {
+ l[0] =
+ a[1] =
+ b->mode[1] = b->mode[0];
+ }
+ if (b->bs != BS_4x8) {
+ b->mode[2] =
+ a[0] = vp8_rac_get_tree(&s->c, ff_vp9_intramode_tree,
+ ff_vp9_default_kf_ymode_probs[a[0]][l[1]]);
+ if (b->bs != BS_8x4) {
+ b->mode[3] = vp8_rac_get_tree(&s->c, ff_vp9_intramode_tree,
+ ff_vp9_default_kf_ymode_probs[a[1]][b->mode[2]]);
+ l[1] =
+ a[1] = b->mode[3];
+ } else {
+ l[1] =
+ a[1] =
+ b->mode[3] = b->mode[2];
+ }
+ } else {
+ b->mode[2] = b->mode[0];
+ l[1] =
+ a[1] =
+ b->mode[3] = b->mode[1];
+ }
+ } else {
+ b->mode[0] = vp8_rac_get_tree(&s->c, ff_vp9_intramode_tree,
+ ff_vp9_default_kf_ymode_probs[*a][*l]);
+ b->mode[3] =
+ b->mode[2] =
+ b->mode[1] = b->mode[0];
+ // FIXME this can probably be optimized
+ memset(a, b->mode[0], bwh_tab[0][b->bs][0]);
+ memset(l, b->mode[0], bwh_tab[0][b->bs][1]);
+ }
+ b->uvmode = vp8_rac_get_tree(&s->c, ff_vp9_intramode_tree,
+ ff_vp9_default_kf_uvmode_probs[b->mode[3]]);
+ } else if (b->intra) {
+ b->comp = 0;
+ if (b->bs > BS_8x8) {
+ b->mode[0] = vp8_rac_get_tree(&s->c, ff_vp9_intramode_tree,
+ s->prob.p.y_mode[0]);
+ s->counts.y_mode[0][b->mode[0]]++;
+ if (b->bs != BS_8x4) {
+ b->mode[1] = vp8_rac_get_tree(&s->c, ff_vp9_intramode_tree,
+ s->prob.p.y_mode[0]);
+ s->counts.y_mode[0][b->mode[1]]++;
+ } else {
+ b->mode[1] = b->mode[0];
+ }
+ if (b->bs != BS_4x8) {
+ b->mode[2] = vp8_rac_get_tree(&s->c, ff_vp9_intramode_tree,
+ s->prob.p.y_mode[0]);
+ s->counts.y_mode[0][b->mode[2]]++;
+ if (b->bs != BS_8x4) {
+ b->mode[3] = vp8_rac_get_tree(&s->c, ff_vp9_intramode_tree,
+ s->prob.p.y_mode[0]);
+ s->counts.y_mode[0][b->mode[3]]++;
+ } else {
+ b->mode[3] = b->mode[2];
+ }
+ } else {
+ b->mode[2] = b->mode[0];
+ b->mode[3] = b->mode[1];
+ }
+ } else {
+ static const uint8_t size_group[10] = {
+ 3, 3, 3, 3, 2, 2, 2, 1, 1, 1
+ };
+ int sz = size_group[b->bs];
+
+ b->mode[0] = vp8_rac_get_tree(&s->c, ff_vp9_intramode_tree,
+ s->prob.p.y_mode[sz]);
+ b->mode[1] =
+ b->mode[2] =
+ b->mode[3] = b->mode[0];
+ s->counts.y_mode[sz][b->mode[3]]++;
+ }
+ b->uvmode = vp8_rac_get_tree(&s->c, ff_vp9_intramode_tree,
+ s->prob.p.uv_mode[b->mode[3]]);
+ s->counts.uv_mode[b->mode[3]][b->uvmode]++;
+ } else {
+ static const uint8_t inter_mode_ctx_lut[14][14] = {
+ { 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5 },
+ { 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5 },
+ { 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5 },
+ { 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5 },
+ { 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5 },
+ { 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5 },
+ { 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5 },
+ { 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5 },
+ { 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5 },
+ { 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5 },
+ { 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 2, 2, 1, 3 },
+ { 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 2, 2, 1, 3 },
+ { 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 1, 1, 0, 3 },
+ { 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 3, 3, 3, 4 },
+ };
+
+ if (s->segmentation.feat[b->seg_id].ref_enabled) {
+ av_assert2(s->segmentation.feat[b->seg_id].ref_val != 0);
+ b->comp = 0;
+ b->ref[0] = s->segmentation.feat[b->seg_id].ref_val - 1;
+ } else {
+ // read comp_pred flag
+ if (s->comppredmode != PRED_SWITCHABLE) {
+ b->comp = s->comppredmode == PRED_COMPREF;
+ } else {
+ int c;
+
+ // FIXME add intra as ref=0xff (or -1) to make these easier?
+ if (have_a) {
+ if (have_l) {
+ if (s->above_comp_ctx[col] && s->left_comp_ctx[row7]) {
+ c = 4;
+ } else if (s->above_comp_ctx[col]) {
+ c = 2 + (s->left_intra_ctx[row7] ||
+ s->left_ref_ctx[row7] == s->fixcompref);
+ } else if (s->left_comp_ctx[row7]) {
+ c = 2 + (s->above_intra_ctx[col] ||
+ s->above_ref_ctx[col] == s->fixcompref);
+ } else {
+ c = (!s->above_intra_ctx[col] &&
+ s->above_ref_ctx[col] == s->fixcompref) ^
+ (!s->left_intra_ctx[row7] &&
+ s->left_ref_ctx[row & 7] == s->fixcompref);
+ }
+ } else {
+ c = s->above_comp_ctx[col] ? 3 :
+ (!s->above_intra_ctx[col] && s->above_ref_ctx[col] == s->fixcompref);
+ }
+ } else if (have_l) {
+ c = s->left_comp_ctx[row7] ? 3 :
+ (!s->left_intra_ctx[row7] && s->left_ref_ctx[row7] == s->fixcompref);
+ } else {
+ c = 1;
+ }
+ b->comp = vp56_rac_get_prob(&s->c, s->prob.p.comp[c]);
+ s->counts.comp[c][b->comp]++;
+ }
+
+ // read actual references
+ // FIXME probably cache a few variables here to prevent repetitive
+ // memory accesses below
+ if (b->comp) { /* two references */
+ int fix_idx = s->signbias[s->fixcompref], var_idx = !fix_idx, c, bit;
+
+ b->ref[fix_idx] = s->fixcompref;
+ // FIXME can this codeblob be replaced by some sort of LUT?
+ if (have_a) {
+ if (have_l) {
+ if (s->above_intra_ctx[col]) {
+ if (s->left_intra_ctx[row7]) {
+ c = 2;
+ } else {
+ c = 1 + 2 * (s->left_ref_ctx[row7] != s->varcompref[1]);
+ }
+ } else if (s->left_intra_ctx[row7]) {
+ c = 1 + 2 * (s->above_ref_ctx[col] != s->varcompref[1]);
+ } else {
+ int refl = s->left_ref_ctx[row7], refa = s->above_ref_ctx[col];
+
+ if (refl == refa && refa == s->varcompref[1]) {
+ c = 0;
+ } else if (!s->left_comp_ctx[row7] && !s->above_comp_ctx[col]) {
+ if ((refa == s->fixcompref && refl == s->varcompref[0]) ||
+ (refl == s->fixcompref && refa == s->varcompref[0])) {
+ c = 4;
+ } else {
+ c = (refa == refl) ? 3 : 1;
+ }
+ } else if (!s->left_comp_ctx[row7]) {
+ if (refa == s->varcompref[1] && refl != s->varcompref[1]) {
+ c = 1;
+ } else {
+ c = (refl == s->varcompref[1] &&
+ refa != s->varcompref[1]) ? 2 : 4;
+ }
+ } else if (!s->above_comp_ctx[col]) {
+ if (refl == s->varcompref[1] && refa != s->varcompref[1]) {
+ c = 1;
+ } else {
+ c = (refa == s->varcompref[1] &&
+ refl != s->varcompref[1]) ? 2 : 4;
+ }
+ } else {
+ c = (refl == refa) ? 4 : 2;
+ }
+ }
+ } else {
+ if (s->above_intra_ctx[col]) {
+ c = 2;
+ } else if (s->above_comp_ctx[col]) {
+ c = 4 * (s->above_ref_ctx[col] != s->varcompref[1]);
+ } else {
+ c = 3 * (s->above_ref_ctx[col] != s->varcompref[1]);
+ }
+ }
+ } else if (have_l) {
+ if (s->left_intra_ctx[row7]) {
+ c = 2;
+ } else if (s->left_comp_ctx[row7]) {
+ c = 4 * (s->left_ref_ctx[row7] != s->varcompref[1]);
+ } else {
+ c = 3 * (s->left_ref_ctx[row7] != s->varcompref[1]);
+ }
+ } else {
+ c = 2;
+ }
+ bit = vp56_rac_get_prob(&s->c, s->prob.p.comp_ref[c]);
+ b->ref[var_idx] = s->varcompref[bit];
+ s->counts.comp_ref[c][bit]++;
+ } else { /* single reference */
+ int bit, c;
+
+ if (have_a && !s->above_intra_ctx[col]) {
+ if (have_l && !s->left_intra_ctx[row7]) {
+ if (s->left_comp_ctx[row7]) {
+ if (s->above_comp_ctx[col]) {
+ c = 1 + (!s->fixcompref || !s->left_ref_ctx[row7] ||
+ !s->above_ref_ctx[col]);
+ } else {
+ c = (3 * !s->above_ref_ctx[col]) +
+ (!s->fixcompref || !s->left_ref_ctx[row7]);
+ }
+ } else if (s->above_comp_ctx[col]) {
+ c = (3 * !s->left_ref_ctx[row7]) +
+ (!s->fixcompref || !s->above_ref_ctx[col]);
+ } else {
+ c = 2 * !s->left_ref_ctx[row7] + 2 * !s->above_ref_ctx[col];
+ }
+ } else if (s->above_intra_ctx[col]) {
+ c = 2;
+ } else if (s->above_comp_ctx[col]) {
+ c = 1 + (!s->fixcompref || !s->above_ref_ctx[col]);
+ } else {
+ c = 4 * (!s->above_ref_ctx[col]);
+ }
+ } else if (have_l && !s->left_intra_ctx[row7]) {
+ if (s->left_intra_ctx[row7]) {
+ c = 2;
+ } else if (s->left_comp_ctx[row7]) {
+ c = 1 + (!s->fixcompref || !s->left_ref_ctx[row7]);
+ } else {
+ c = 4 * (!s->left_ref_ctx[row7]);
+ }
+ } else {
+ c = 2;
+ }
+ bit = vp56_rac_get_prob(&s->c, s->prob.p.single_ref[c][0]);
+ s->counts.single_ref[c][0][bit]++;
+ if (!bit) {
+ b->ref[0] = 0;
+ } else {
+ // FIXME can this codeblob be replaced by some sort of LUT?
+ if (have_a) {
+ if (have_l) {
+ if (s->left_intra_ctx[row7]) {
+ if (s->above_intra_ctx[col]) {
+ c = 2;
+ } else if (s->above_comp_ctx[col]) {
+ c = 1 + 2 * (s->fixcompref == 1 ||
+ s->above_ref_ctx[col] == 1);
+ } else if (!s->above_ref_ctx[col]) {
+ c = 3;
+ } else {
+ c = 4 * (s->above_ref_ctx[col] == 1);
+ }
+ } else if (s->above_intra_ctx[col]) {
+ if (s->left_intra_ctx[row7]) {
+ c = 2;
+ } else if (s->left_comp_ctx[row7]) {
+ c = 1 + 2 * (s->fixcompref == 1 ||
+ s->left_ref_ctx[row7] == 1);
+ } else if (!s->left_ref_ctx[row7]) {
+ c = 3;
+ } else {
+ c = 4 * (s->left_ref_ctx[row7] == 1);
+ }
+ } else if (s->above_comp_ctx[col]) {
+ if (s->left_comp_ctx[row7]) {
+ if (s->left_ref_ctx[row7] == s->above_ref_ctx[col]) {
+ c = 3 * (s->fixcompref == 1 ||
+ s->left_ref_ctx[row7] == 1);
+ } else {
+ c = 2;
+ }
+ } else if (!s->left_ref_ctx[row7]) {
+ c = 1 + 2 * (s->fixcompref == 1 ||
+ s->above_ref_ctx[col] == 1);
+ } else {
+ c = 3 * (s->left_ref_ctx[row7] == 1) +
+ (s->fixcompref == 1 || s->above_ref_ctx[col] == 1);
+ }
+ } else if (s->left_comp_ctx[row7]) {
+ if (!s->above_ref_ctx[col]) {
+ c = 1 + 2 * (s->fixcompref == 1 ||
+ s->left_ref_ctx[row7] == 1);
+ } else {
+ c = 3 * (s->above_ref_ctx[col] == 1) +
+ (s->fixcompref == 1 || s->left_ref_ctx[row7] == 1);
+ }
+ } else if (!s->above_ref_ctx[col]) {
+ if (!s->left_ref_ctx[row7]) {
+ c = 3;
+ } else {
+ c = 4 * (s->left_ref_ctx[row7] == 1);
+ }
+ } else if (!s->left_ref_ctx[row7]) {
+ c = 4 * (s->above_ref_ctx[col] == 1);
+ } else {
+ c = 2 * (s->left_ref_ctx[row7] == 1) +
+ 2 * (s->above_ref_ctx[col] == 1);
+ }
+ } else {
+ if (s->above_intra_ctx[col] ||
+ (!s->above_comp_ctx[col] && !s->above_ref_ctx[col])) {
+ c = 2;
+ } else if (s->above_comp_ctx[col]) {
+ c = 3 * (s->fixcompref == 1 || s->above_ref_ctx[col] == 1);
+ } else {
+ c = 4 * (s->above_ref_ctx[col] == 1);
+ }
+ }
+ } else if (have_l) {
+ if (s->left_intra_ctx[row7] ||
+ (!s->left_comp_ctx[row7] && !s->left_ref_ctx[row7])) {
+ c = 2;
+ } else if (s->left_comp_ctx[row7]) {
+ c = 3 * (s->fixcompref == 1 || s->left_ref_ctx[row7] == 1);
+ } else {
+ c = 4 * (s->left_ref_ctx[row7] == 1);
+ }
+ } else {
+ c = 2;
+ }
+ bit = vp56_rac_get_prob(&s->c, s->prob.p.single_ref[c][1]);
+ s->counts.single_ref[c][1][bit]++;
+ b->ref[0] = 1 + bit;
+ }
+ }
+ }
+
+ if (b->bs <= BS_8x8) {
+ if (s->segmentation.feat[b->seg_id].skip_enabled) {
+ b->mode[0] =
+ b->mode[1] =
+ b->mode[2] =
+ b->mode[3] = ZEROMV;
+ } else {
+ static const uint8_t off[10] = {
+ 3, 0, 0, 1, 0, 0, 0, 0, 0, 0
+ };
+
+ // FIXME this needs to use the LUT tables from find_ref_mvs
+ // because not all are -1,0/0,-1
+ int c = inter_mode_ctx_lut[s->above_mode_ctx[col + off[b->bs]]]
+ [s->left_mode_ctx[row7 + off[b->bs]]];
+
+ b->mode[0] = vp8_rac_get_tree(&s->c, ff_vp9_inter_mode_tree,
+ s->prob.p.mv_mode[c]);
+ b->mode[1] =
+ b->mode[2] =
+ b->mode[3] = b->mode[0];
+ s->counts.mv_mode[c][b->mode[0] - 10]++;
+ }
+ }
+
+ if (s->filtermode == FILTER_SWITCHABLE) {
+ int c;
+
+ if (have_a && s->above_mode_ctx[col] >= NEARESTMV) {
+ if (have_l && s->left_mode_ctx[row7] >= NEARESTMV) {
+ c = s->above_filter_ctx[col] == s->left_filter_ctx[row7] ?
+ s->left_filter_ctx[row7] : 3;
+ } else {
+ c = s->above_filter_ctx[col];
+ }
+ } else if (have_l && s->left_mode_ctx[row7] >= NEARESTMV) {
+ c = s->left_filter_ctx[row7];
+ } else {
+ c = 3;
+ }
+
+ b->filter = vp8_rac_get_tree(&s->c, ff_vp9_filter_tree,
+ s->prob.p.filter[c]);
+ s->counts.filter[c][b->filter]++;
+ } else {
+ b->filter = s->filtermode;
+ }
+
+ if (b->bs > BS_8x8) {
+ int c = inter_mode_ctx_lut[s->above_mode_ctx[col]][s->left_mode_ctx[row7]];
+
+ b->mode[0] = vp8_rac_get_tree(&s->c, ff_vp9_inter_mode_tree,
+ s->prob.p.mv_mode[c]);
+ s->counts.mv_mode[c][b->mode[0] - 10]++;
+ ff_vp9_fill_mv(s, b->mv[0], b->mode[0], 0);
+
+ if (b->bs != BS_8x4) {
+ b->mode[1] = vp8_rac_get_tree(&s->c, ff_vp9_inter_mode_tree,
+ s->prob.p.mv_mode[c]);
+ s->counts.mv_mode[c][b->mode[1] - 10]++;
+ ff_vp9_fill_mv(s, b->mv[1], b->mode[1], 1);
+ } else {
+ b->mode[1] = b->mode[0];
+ AV_COPY32(&b->mv[1][0], &b->mv[0][0]);
+ AV_COPY32(&b->mv[1][1], &b->mv[0][1]);
+ }
+
+ if (b->bs != BS_4x8) {
+ b->mode[2] = vp8_rac_get_tree(&s->c, ff_vp9_inter_mode_tree,
+ s->prob.p.mv_mode[c]);
+ s->counts.mv_mode[c][b->mode[2] - 10]++;
+ ff_vp9_fill_mv(s, b->mv[2], b->mode[2], 2);
+
+ if (b->bs != BS_8x4) {
+ b->mode[3] = vp8_rac_get_tree(&s->c, ff_vp9_inter_mode_tree,
+ s->prob.p.mv_mode[c]);
+ s->counts.mv_mode[c][b->mode[3] - 10]++;
+ ff_vp9_fill_mv(s, b->mv[3], b->mode[3], 3);
+ } else {
+ b->mode[3] = b->mode[2];
+ AV_COPY32(&b->mv[3][0], &b->mv[2][0]);
+ AV_COPY32(&b->mv[3][1], &b->mv[2][1]);
+ }
+ } else {
+ b->mode[2] = b->mode[0];
+ AV_COPY32(&b->mv[2][0], &b->mv[0][0]);
+ AV_COPY32(&b->mv[2][1], &b->mv[0][1]);
+ b->mode[3] = b->mode[1];
+ AV_COPY32(&b->mv[3][0], &b->mv[1][0]);
+ AV_COPY32(&b->mv[3][1], &b->mv[1][1]);
+ }
+ } else {
+ ff_vp9_fill_mv(s, b->mv[0], b->mode[0], -1);
+ AV_COPY32(&b->mv[1][0], &b->mv[0][0]);
+ AV_COPY32(&b->mv[2][0], &b->mv[0][0]);
+ AV_COPY32(&b->mv[3][0], &b->mv[0][0]);
+ AV_COPY32(&b->mv[1][1], &b->mv[0][1]);
+ AV_COPY32(&b->mv[2][1], &b->mv[0][1]);
+ AV_COPY32(&b->mv[3][1], &b->mv[0][1]);
+ }
+ }
+
+ // 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 = ff_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]);
+
+ AV_COPY32(&s->left_mv_ctx[row7 * 2 + 0][0], &b->mv[1][0]);
+ AV_COPY32(&s->left_mv_ctx[row7 * 2 + 0][1], &b->mv[1][1]);
+ AV_WN32A(&s->left_mv_ctx[row7 * 2 + 1][0], mv0);
+ AV_WN32A(&s->left_mv_ctx[row7 * 2 + 1][1], mv1);
+ AV_COPY32(&s->above_mv_ctx[col * 2 + 0][0], &b->mv[2][0]);
+ AV_COPY32(&s->above_mv_ctx[col * 2 + 0][1], &b->mv[2][1]);
+ AV_WN32A(&s->above_mv_ctx[col * 2 + 1][0], mv0);
+ AV_WN32A(&s->above_mv_ctx[col * 2 + 1][1], mv1);
+ } else {
+ int n, mv0 = AV_RN32A(&b->mv[3][0]), mv1 = AV_RN32A(&b->mv[3][1]);
+
+ for (n = 0; n < w4 * 2; n++) {
+ AV_WN32A(&s->above_mv_ctx[col * 2 + n][0], mv0);
+ AV_WN32A(&s->above_mv_ctx[col * 2 + n][1], mv1);
+ }
+ for (n = 0; n < h4 * 2; n++) {
+ AV_WN32A(&s->left_mv_ctx[row7 * 2 + n][0], mv0);
+ 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;
+
+ if (b->intra) {
+ for (x = 0; x < w4; x++) {
+ s->mv[0][o + x].ref[0] =
+ s->mv[0][o + 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]);
+ }
+ } 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]);
+ }
+ }
+ }
+}
+
+// FIXME remove tx argument, and merge cnt/eob arguments?
+static int decode_block_coeffs(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)
+{
+ int i = 0, band = 0, band_left = band_counts[band];
+ uint8_t *tp = p[0][nnz];
+ uint8_t cache[1024];
+
+ do {
+ int val, rc;
+
+ val = vp56_rac_get_prob_branchy(c, tp[0]); // eob
+ eob[band][nnz][val]++;
+ if (!val)
+ break;
+
+skip_eob:
+ if (!vp56_rac_get_prob_branchy(c, tp[1])) { // zero
+ cnt[band][nnz][0]++;
+ if (!--band_left)
+ band_left = band_counts[++band];
+ cache[scan[i]] = 0;
+ nnz = (1 + cache[nb[i][0]] + cache[nb[i][1]]) >> 1;
+ tp = p[band][nnz];
+ if (++i == n_coeffs)
+ break; //invalid input; blocks should end with EOB
+ goto skip_eob;
+ }
+
+ rc = scan[i];
+ if (!vp56_rac_get_prob_branchy(c, tp[2])) { // one
+ cnt[band][nnz][1]++;
+ val = 1;
+ cache[rc] = 1;
+ } else {
+ // fill in p[3-10] (model fill) - only once per frame for each pos
+ if (!tp[3])
+ memcpy(&tp[3], ff_vp9_model_pareto8[tp[2]], 8);
+
+ cnt[band][nnz][2]++;
+ if (!vp56_rac_get_prob_branchy(c, tp[3])) { // 2, 3, 4
+ if (!vp56_rac_get_prob_branchy(c, tp[4])) {
+ cache[rc] = val = 2;
+ } else {
+ val = 3 + vp56_rac_get_prob(c, tp[5]);
+ cache[rc] = 3;
+ }
+ } else if (!vp56_rac_get_prob_branchy(c, tp[6])) { // cat1/2
+ cache[rc] = 4;
+ if (!vp56_rac_get_prob_branchy(c, tp[7])) {
+ val = vp56_rac_get_prob(c, 159) + 5;
+ } else {
+ val = (vp56_rac_get_prob(c, 165) << 1) + 7;
+ 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 = (vp56_rac_get_prob(c, 173) << 2) + 11;
+ val += (vp56_rac_get_prob(c, 148) << 1);
+ val += vp56_rac_get_prob(c, 140);
+ } else {
+ val = (vp56_rac_get_prob(c, 176) << 3) + 19;
+ 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 = (vp56_rac_get_prob(c, 180) << 4) + 35;
+ 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 = (vp56_rac_get_prob(c, 254) << 13) + 67;
+ 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
+ coef[rc] = ((vp8_rac_get(c) ? -val : val) * qmul[!!i]) / 2;
+ else
+ coef[rc] = (vp8_rac_get(c) ? -val : val) * qmul[!!i];
+ nnz = (1 + cache[nb[i][0]] + cache[nb[i][1]]) >> 1;
+ tp = p[band][nnz];
+ } while (++i < n_coeffs);
+
+ return i;
+}
+
+static int decode_coeffs(AVCodecContext *avctx)
+{
+ VP9Context *s = avctx->priv_data;
+ VP9Block *const b = &s->b;
+ int row = b->row, col = b->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), ret;
+ int16_t (*qmul)[2] = s->segmentation.feat[b->seg_id].qmul;
+ int tx = 4 * s->lossless + b->tx;
+ const int16_t **yscans = ff_vp9_scans[tx];
+ const int16_t (**ynbs)[2] = ff_vp9_scans_nb[tx];
+ const int16_t *uvscan = ff_vp9_scans[b->uvtx][DCT_DCT];
+ const int16_t (*uvnb)[2] = ff_vp9_scans_nb[b->uvtx][DCT_DCT];
+ uint8_t *a = &s->above_y_nnz_ctx[col * 2];
+ uint8_t *l = &s->left_y_nnz_ctx[(row & 7) << 1];
+ static const int16_t band_counts[4][8] = {
+ { 1, 2, 3, 4, 3, 16 - 13, 0 },
+ { 1, 2, 3, 4, 11, 64 - 21, 0 },
+ { 1, 2, 3, 4, 11, 256 - 21, 0 },
+ { 1, 2, 3, 4, 11, 1024 - 21, 0 },
+ };
+ 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];
+ }
+ for (n = 0, y = 0; y < end_y; y += step1d) {
+ for (x = 0; x < end_x; x += step1d, n += step) {
+ enum TxfmType txtp = ff_vp9_intra_txfm_type[b->mode[b->tx == TX_4X4 &&
+ b->bs > BS_8x8 ?
+ n : 0]];
+ int nnz = a[x] + l[y];
+ if ((ret = decode_block_coeffs(&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 ret;
+ a[x] = l[y] = !!ret;
+ if (b->tx > TX_8X8)
+ AV_WN16A(&s->eob[n], ret);
+ else
+ s->eob[n] = ret;
+ }
+ }
+ 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));
+ }
+
+ p = s->prob.coef[b->uvtx][1 /* uv */][!b->intra];
+ c = s->counts.coef[b->uvtx][1 /* uv */][!b->intra];
+ e = s->counts.eob[b->uvtx][1 /* uv */][!b->intra];
+ w4 >>= 1;
+ h4 >>= 1;
+ end_x >>= 1;
+ end_y >>= 1;
+ 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 ((ret = decode_block_coeffs(&s->c, s->uvblock[pl] + 16 * n,
+ 16 * uvstep, b->uvtx, c, e, p,
+ nnz, uvscan, uvnb,
+ uv_band_counts, qmul[1])) < 0)
+ return ret;
+ a[x] = l[y] = !!ret;
+ if (b->uvtx > TX_8X8)
+ AV_WN16A(&s->uveob[pl][n], ret);
+ else
+ s->uveob[pl][n] = ret;
+ }
+ }
+ 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));
+ }
+ }
+
+ return 0;
+}
+
+static av_always_inline int check_intra_mode(VP9Context *s, int mode,
+ uint8_t **a,
+ uint8_t *dst_edge,
+ ptrdiff_t stride_edge,
+ uint8_t *dst_inner,
+ ptrdiff_t stride_inner,
+ uint8_t *l, int col, int x, int w,
+ int row, int y, enum TxfmMode tx,
+ int p)
+{
+ int have_top = row > 0 || y > 0;
+ int have_left = col > s->tiling.tile_col_start || x > 0;
+ int have_right = x < w - 1;
+ static const uint8_t mode_conv[10][2 /* have_left */][2 /* have_top */] = {
+ [VERT_PRED] = { { DC_127_PRED, VERT_PRED },
+ { DC_127_PRED, VERT_PRED } },
+ [HOR_PRED] = { { DC_129_PRED, DC_129_PRED },
+ { HOR_PRED, HOR_PRED } },
+ [DC_PRED] = { { DC_128_PRED, TOP_DC_PRED },
+ { LEFT_DC_PRED, DC_PRED } },
+ [DIAG_DOWN_LEFT_PRED] = { { DC_127_PRED, DIAG_DOWN_LEFT_PRED },
+ { DC_127_PRED, DIAG_DOWN_LEFT_PRED } },
+ [DIAG_DOWN_RIGHT_PRED] = { { DIAG_DOWN_RIGHT_PRED, DIAG_DOWN_RIGHT_PRED },
+ { DIAG_DOWN_RIGHT_PRED, DIAG_DOWN_RIGHT_PRED } },
+ [VERT_RIGHT_PRED] = { { VERT_RIGHT_PRED, VERT_RIGHT_PRED },
+ { VERT_RIGHT_PRED, VERT_RIGHT_PRED } },
+ [HOR_DOWN_PRED] = { { HOR_DOWN_PRED, HOR_DOWN_PRED },
+ { HOR_DOWN_PRED, HOR_DOWN_PRED } },
+ [VERT_LEFT_PRED] = { { DC_127_PRED, VERT_LEFT_PRED },
+ { DC_127_PRED, VERT_LEFT_PRED } },
+ [HOR_UP_PRED] = { { DC_129_PRED, DC_129_PRED },
+ { HOR_UP_PRED, HOR_UP_PRED } },
+ [TM_VP8_PRED] = { { DC_129_PRED, VERT_PRED },
+ { HOR_PRED, TM_VP8_PRED } },
+ };
+ static const struct {
+ uint8_t needs_left:1;
+ uint8_t needs_top:1;
+ uint8_t needs_topleft:1;
+ uint8_t needs_topright:1;
+ } edges[N_INTRA_PRED_MODES] = {
+ [VERT_PRED] = { .needs_top = 1 },
+ [HOR_PRED] = { .needs_left = 1 },
+ [DC_PRED] = { .needs_top = 1, .needs_left = 1 },
+ [DIAG_DOWN_LEFT_PRED] = { .needs_top = 1, .needs_topright = 1 },
+ [DIAG_DOWN_RIGHT_PRED] = { .needs_left = 1, .needs_top = 1,
+ .needs_topleft = 1 },
+ [VERT_RIGHT_PRED] = { .needs_left = 1, .needs_top = 1,
+ .needs_topleft = 1 },
+ [HOR_DOWN_PRED] = { .needs_left = 1, .needs_top = 1,
+ .needs_topleft = 1 },
+ [VERT_LEFT_PRED] = { .needs_top = 1, .needs_topright = 1 },
+ [HOR_UP_PRED] = { .needs_left = 1 },
+ [TM_VP8_PRED] = { .needs_left = 1, .needs_top = 1,
+ .needs_topleft = 1 },
+ [LEFT_DC_PRED] = { .needs_left = 1 },
+ [TOP_DC_PRED] = { .needs_top = 1 },
+ [DC_128_PRED] = { 0 },
+ [DC_127_PRED] = { 0 },
+ [DC_129_PRED] = { 0 }
+ };
+
+ av_assert2(mode >= 0 && mode < 10);
+ mode = mode_conv[mode][have_left][have_top];
+ if (edges[mode].needs_top) {
+ uint8_t *top = NULL, *topleft = NULL;
+ int n_px_need = 4 << tx, n_px_have = (((s->cols - col) << !p) - x) * 4;
+ int n_px_need_tr = 0;
+
+ if (tx == TX_4X4 && edges[mode].needs_topright && have_right)
+ n_px_need_tr = 4;
+
+ // if top of sb64-row, use s->intra_pred_data[] instead of
+ // dst[-stride] for intra prediction (it contains pre- instead of
+ // post-loopfilter data)
+ if (have_top) {
+ top = !(row & 7) && !y ?
+ s->intra_pred_data[p] + col * (8 >> !!p) + x * 4 :
+ y == 0 ? &dst_edge[-stride_edge] : &dst_inner[-stride_inner];
+ if (have_left)
+ topleft = !(row & 7) && !y ?
+ s->intra_pred_data[p] + col * (8 >> !!p) + x * 4 :
+ y == 0 || x == 0 ? &dst_edge[-stride_edge] :
+ &dst_inner[-stride_inner];
+ }
+
+ if (have_top &&
+ (!edges[mode].needs_topleft || (have_left && top == topleft)) &&
+ (tx != TX_4X4 || !edges[mode].needs_topright || have_right) &&
+ n_px_need + n_px_need_tr <= n_px_have) {
+ *a = top;
+ } else {
+ if (have_top) {
+ if (n_px_need <= n_px_have) {
+ memcpy(*a, top, n_px_need);
+ } else {
+ memcpy(*a, top, n_px_have);
+ memset(&(*a)[n_px_have], (*a)[n_px_have - 1],
+ n_px_need - n_px_have);
+ }
+ } else {
+ memset(*a, 127, n_px_need);
+ }
+ if (edges[mode].needs_topleft) {
+ if (have_left && have_top)
+ (*a)[-1] = topleft[-1];
+ else
+ (*a)[-1] = have_top ? 129 : 127;
+ }
+ if (tx == TX_4X4 && edges[mode].needs_topright) {
+ if (have_top && have_right &&
+ n_px_need + n_px_need_tr <= n_px_have) {
+ memcpy(&(*a)[4], &top[4], 4);
+ } else {
+ memset(&(*a)[4], (*a)[3], 4);
+ }
+ }
+ }
+ }
+ if (edges[mode].needs_left) {
+ if (have_left) {
+ int i;
+ int n_px_need = 4 << tx;
+ int n_px_have = (((s->rows - row) << !p) - y) * 4;
+ uint8_t *dst = x == 0 ? dst_edge : dst_inner;
+ ptrdiff_t stride = x == 0 ? stride_edge : stride_inner;
+
+ if (n_px_need <= n_px_have) {
+ for (i = 0; i < n_px_need; i++)
+ l[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);
+ }
+ } else {
+ memset(l, 129, 4 << tx);
+ }
+ }
+
+ return mode;
+}
+
+static void intra_recon(AVCodecContext *avctx, ptrdiff_t y_off, ptrdiff_t uv_off)
+{
+ VP9Context *s = avctx->priv_data;
+ VP9Block *const b = &s->b;
+ int row = b->row, col = b->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->cur_frame->data[0] + y_off;
+
+ for (n = 0, y = 0; y < end_y; y += step1d) {
+ uint8_t *ptr = dst, *ptr_r = dst_r;
+ for (x = 0; x < end_x;
+ x += step1d, ptr += 4 * step1d, 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];
+ enum TxfmType txtp = ff_vp9_intra_txfm_type[mode];
+ int eob = b->tx > TX_8X8 ? AV_RN16A(&s->eob[n]) : s->eob[n];
+
+ mode = check_intra_mode(s, mode, &a, ptr_r,
+ s->cur_frame->linesize[0],
+ ptr, b->y_stride, l,
+ col, x, w4, row, y, b->tx, 0);
+ s->dsp.intra_pred[b->tx][mode](ptr, b->y_stride, l, a);
+ if (eob)
+ s->dsp.itxfm_add[tx][txtp](ptr, b->y_stride,
+ s->block + 16 * n, eob);
+ }
+ dst_r += 4 * s->cur_frame->linesize[0] * step1d;
+ dst += 4 * b->y_stride * step1d;
+ }
+
+ // U/V
+ h4 >>= 1;
+ w4 >>= 1;
+ end_x >>= 1;
+ end_y >>= 1;
+ step = 1 << (b->uvtx * 2);
+ for (p = 0; p < 2; p++) {
+ dst = b->dst[1 + p];
+ dst_r = s->cur_frame->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];
+ int eob = b->uvtx > TX_8X8 ? AV_RN16A(&s->uveob[p][n])
+ : s->uveob[p][n];
+
+ mode = check_intra_mode(s, mode, &a, ptr_r,
+ s->cur_frame->linesize[1],
+ ptr, b->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);
+ if (eob)
+ s->dsp.itxfm_add[uvtx][DCT_DCT](ptr, b->uv_stride,
+ s->uvblock[p] + 16 * n,
+ eob);
+ }
+ dst_r += 4 * uvstep1d * s->cur_frame->linesize[1];
+ dst += 4 * uvstep1d * b->uv_stride;
+ }
+ }
+}
+
+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,
+ ptrdiff_t y, ptrdiff_t x,
+ const VP56mv *mv,
+ int bw, int bh, int w, int h)
+{
+ int mx = mv->x, my = mv->y;
+
+ y += my >> 3;
+ x += mx >> 3;
+ ref += y * ref_stride + x;
+ mx &= 7;
+ my &= 7;
+ // FIXME bilinear filter only needs 0/1 pixels, not 3/4
+ 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,
+ ref - !!my * 3 * ref_stride - !!mx * 3,
+ 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;
+ ref_stride = 80;
+ }
+ mc[!!mx][!!my](dst, ref, dst_stride, ref_stride, bh, mx << 1, my << 1);
+}
+
+static av_always_inline void mc_chroma_dir(VP9Context *s, vp9_mc_func(*mc)[2],
+ uint8_t *dst_u, uint8_t *dst_v,
+ ptrdiff_t dst_stride,
+ const uint8_t *ref_u,
+ ptrdiff_t src_stride_u,
+ const uint8_t *ref_v,
+ ptrdiff_t src_stride_v,
+ ptrdiff_t y, ptrdiff_t x,
+ const VP56mv *mv,
+ int bw, int bh, int w, int h)
+{
+ int mx = mv->x, my = mv->y;
+
+ y += my >> 4;
+ x += mx >> 4;
+ ref_u += y * src_stride_u + x;
+ ref_v += y * src_stride_v + x;
+ mx &= 15;
+ my &= 15;
+ // FIXME bilinear filter only needs 0/1 pixels, not 3/4
+ 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,
+ 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, ref_u, dst_stride, 80, bh, mx, my);
+
+ 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;
+ mc[!!mx][!!my](dst_v, ref_v, dst_stride, 80, bh, mx, my);
+ } else {
+ mc[!!mx][!!my](dst_u, ref_u, dst_stride, src_stride_u, bh, mx, my);
+ mc[!!mx][!!my](dst_v, ref_v, dst_stride, src_stride_v, bh, mx, my);
+ }
+}
+
+static int inter_recon(AVCodecContext *avctx)
+{
+ static const uint8_t bwlog_tab[2][N_BS_SIZES] = {
+ { 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4 },
+ { 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4 },
+ };
+ VP9Context *s = avctx->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 = avctx->width, h = avctx->height;
+ ptrdiff_t ls_y = b->y_stride, ls_uv = b->uv_stride;
+
+ if (!ref1->data[0] || (b->comp && !ref2->data[0]))
+ return AVERROR_INVALIDDATA;
+
+ // 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],
+ 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);
+
+ 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],
+ 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);
+ }
+ } 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);
+
+ 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);
+ }
+ } 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],
+ 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);
+ 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);
+
+ 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],
+ 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);
+ 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);
+ }
+ }
+ } else {
+ int bwl = bwlog_tab[0][b->bs];
+ int bw = bwh_tab[0][b->bs][0] * 4;
+ int 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);
+
+ 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);
+ }
+
+ // uv inter pred
+ {
+ int bwl = bwlog_tab[1][b->bs];
+ 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;
+ 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);
+ } else {
+ mvuv = b->mv[0][0];
+ }
+
+ mc_chroma_dir(s, s->dsp.mc[bwl][b->filter][0],
+ b->dst[1], b->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);
+
+ if (b->comp) {
+ if (b->bs > BS_8x8) {
+ mvuv.x = ROUNDED_DIV(b->mv[0][1].x + b->mv[1][1].x +
+ b->mv[2][1].x + b->mv[3][1].x, 4);
+ mvuv.y = ROUNDED_DIV(b->mv[0][1].y + b->mv[1][1].y +
+ b->mv[2][1].y + b->mv[3][1].y, 4);
+ } else {
+ mvuv = b->mv[0][1];
+ }
+ mc_chroma_dir(s, s->dsp.mc[bwl][b->filter][1],
+ b->dst[1], b->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);
+ }
+ }
+
+ if (!b->skip) {
+ /* mostly copied intra_reconn() */
+
+ 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];
+
+ // y itxfm add
+ for (n = 0, y = 0; y < end_y; y += step1d) {
+ uint8_t *ptr = dst;
+ for (x = 0; x < end_x; x += step1d, ptr += 4 * step1d, n += step) {
+ 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->block + 16 * n, eob);
+ }
+ dst += 4 * b->y_stride * step1d;
+ }
+
+ // uv itxfm add
+ h4 >>= 1;
+ w4 >>= 1;
+ end_x >>= 1;
+ end_y >>= 1;
+ step = 1 << (b->uvtx * 2);
+ for (p = 0; p < 2; p++) {
+ dst = b->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->uvblock[p] + 16 * n, eob);
+ }
+ dst += 4 * uvstep1d * b->uv_stride;
+ }
+ }
+ }
+ return 0;
+}
+
+static av_always_inline void mask_edges(VP9Filter *lflvl, int is_uv,
+ int row_and_7, int col_and_7,
+ int w, int h, int col_end, int row_end,
+ enum TxfmMode tx, int skip_inter)
+{
+ // FIXME I'm pretty sure all loops can be replaced by a single LUT if
+ // we make VP9Filter.mask uint64_t (i.e. row/col all single variable)
+ // and make the LUT 5-indexed (bl, bp, is_uv, tx and row/col), and then
+ // use row_and_7/col_and_7 as shifts (1*col_and_7+8*row_and_7)
+
+ // the intended behaviour of the vp9 loopfilter is to work on 8-pixel
+ // edges. This means that for UV, we work on two subsampled blocks at
+ // a time, and we only use the topleft block's mode information to set
+ // things like block strength. Thus, for any block size smaller than
+ // 16x16, ignore the odd portion of the block.
+ if (tx == TX_4X4 && is_uv) {
+ if (h == 1) {
+ if (row_and_7 & 1)
+ return;
+ if (!row_end)
+ h += 1;
+ }
+ if (w == 1) {
+ if (col_and_7 & 1)
+ return;
+ if (!col_end)
+ w += 1;
+ }
+ }
+
+ if (tx == TX_4X4 && !skip_inter) {
+ int t = 1 << col_and_7, m_col = (t << w) - t, y;
+ int m_col_odd = (t << (w - 1)) - t;
+
+ // on 32-px edges, use the 8-px wide loopfilter; else, use 4-px wide
+ if (is_uv) {
+ int m_row_8 = m_col & 0x01, m_row_4 = m_col - m_row_8;
+
+ for (y = row_and_7; y < h + row_and_7; y++) {
+ int col_mask_id = 2 - !(y & 7);
+
+ lflvl->mask[is_uv][0][y][1] |= m_row_8;
+ lflvl->mask[is_uv][0][y][2] |= m_row_4;
+ // for odd lines, if the odd col is not being filtered,
+ // skip odd row also:
+ // .---. <-- a
+ // | |
+ // |___| <-- b
+ // ^ ^
+ // c d
+ //
+ // if a/c are even row/col and b/d are odd, and d is skipped,
+ // e.g. right edge of size-66x66.webm, then skip b also (bug)
+ if ((col_end & 1) && (y & 1)) {
+ lflvl->mask[is_uv][1][y][col_mask_id] |= m_col_odd;
+ } else {
+ lflvl->mask[is_uv][1][y][col_mask_id] |= m_col;
+ }
+ }
+ } else {
+ int m_row_8 = m_col & 0x11, m_row_4 = m_col - m_row_8;
+
+ for (y = row_and_7; y < h + row_and_7; y++) {
+ int col_mask_id = 2 - !(y & 3);
+
+ lflvl->mask[is_uv][0][y][1] |= m_row_8; // row edge
+ lflvl->mask[is_uv][0][y][2] |= m_row_4;
+ lflvl->mask[is_uv][1][y][col_mask_id] |= m_col; // col edge
+ lflvl->mask[is_uv][0][y][3] |= m_col;
+ lflvl->mask[is_uv][1][y][3] |= m_col;
+ }
+ }
+ } else {
+ int y, t = 1 << col_and_7, m_col = (t << w) - t;
+
+ if (!skip_inter) {
+ int mask_id = (tx == TX_8X8);
+ int l2 = tx + is_uv - 1, step1d = 1 << l2;
+ static const unsigned masks[4] = { 0xff, 0x55, 0x11, 0x01 };
+ int m_row = m_col & masks[l2];
+
+ // at odd UV col/row edges tx16/tx32 loopfilter edges, force
+ // 8wd loopfilter to prevent going off the visible edge.
+ if (is_uv && tx > TX_8X8 && (w ^ (w - 1)) == 1) {
+ int m_row_16 = ((t << (w - 1)) - t) & masks[l2];
+ int m_row_8 = m_row - m_row_16;
+
+ for (y = row_and_7; y < h + row_and_7; y++) {
+ lflvl->mask[is_uv][0][y][0] |= m_row_16;
+ lflvl->mask[is_uv][0][y][1] |= m_row_8;
+ }
+ } else {
+ for (y = row_and_7; y < h + row_and_7; y++)
+ lflvl->mask[is_uv][0][y][mask_id] |= m_row;
+ }
+
+ if (is_uv && tx > TX_8X8 && (h ^ (h - 1)) == 1) {
+ for (y = row_and_7; y < h + row_and_7 - 1; y += step1d)
+ lflvl->mask[is_uv][1][y][0] |= m_col;
+ if (y - row_and_7 == h - 1)
+ lflvl->mask[is_uv][1][y][1] |= m_col;
+ } else {
+ for (y = row_and_7; y < h + row_and_7; y += step1d)
+ lflvl->mask[is_uv][1][y][mask_id] |= m_col;
+ }
+ } else if (tx != TX_4X4) {
+ int mask_id;
+
+ mask_id = (tx == TX_8X8) || (is_uv && h == 1);
+ lflvl->mask[is_uv][1][row_and_7][mask_id] |= m_col;
+ mask_id = (tx == TX_8X8) || (is_uv && w == 1);
+ for (y = row_and_7; y < h + row_and_7; y++)
+ lflvl->mask[is_uv][0][y][mask_id] |= t;
+ } else if (is_uv) {
+ int t8 = t & 0x01, t4 = t - t8;
+
+ for (y = row_and_7; y < h + row_and_7; y++) {
+ lflvl->mask[is_uv][0][y][2] |= t4;
+ lflvl->mask[is_uv][0][y][1] |= t8;
+ }
+ lflvl->mask[is_uv][1][row_and_7][2 - !(row_and_7 & 7)] |= m_col;
+ } else {
+ int t8 = t & 0x11, t4 = t - t8;
+
+ for (y = row_and_7; y < h + row_and_7; y++) {
+ lflvl->mask[is_uv][0][y][2] |= t4;
+ lflvl->mask[is_uv][0][y][1] |= t8;
+ }
+ lflvl->mask[is_uv][1][row_and_7][2 - !(row_and_7 & 3)] |= m_col;
+ }
+ }
+}
+
+int ff_vp9_decode_block(AVCodecContext *avctx, int row, int col,
+ VP9Filter *lflvl, ptrdiff_t yoff, ptrdiff_t uvoff,
+ enum BlockLevel bl, enum BlockPartition bp)
+{
+ VP9Context *s = avctx->priv_data;
+ VP9Block *const b = &s->b;
+ enum BlockSize bs = bl * 3 + bp;
+ int ret, y, w4 = bwh_tab[1][bs][0], h4 = bwh_tab[1][bs][1], lvl;
+ int emu[2];
+
+ b->row = row;
+ b->row7 = row & 7;
+ b->col = col;
+ b->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(s, b);
+ b->uvtx = b->tx - (w4 * 2 == (1 << b->tx) || h4 * 2 == (1 << b->tx));
+
+ if (!b->skip) {
+ if ((ret = decode_coeffs(avctx)) < 0)
+ return ret;
+ } else {
+ int pl;
+
+ 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);
+ }
+ }
+
+ /* 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->cur_frame->linesize[0] ||
+ (row + h4) > s->rows;
+ emu[1] = (col + w4) * 4 > s->cur_frame->linesize[1] ||
+ (row + h4) > s->rows;
+ if (emu[0]) {
+ b->dst[0] = s->tmp_y;
+ b->y_stride = 64;
+ } else {
+ b->dst[0] = s->cur_frame->data[0] + yoff;
+ b->y_stride = s->cur_frame->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->cur_frame->data[1] + uvoff;
+ b->dst[2] = s->cur_frame->data[2] + uvoff;
+ b->uv_stride = s->cur_frame->linesize[1];
+ }
+ if (b->intra) {
+ intra_recon(avctx, yoff, uvoff);
+ } else {
+ if ((ret = inter_recon(avctx)) < 0)
+ return ret;
+ }
+ if (emu[0]) {
+ int w = FFMIN(s->cols - col, w4) * 8;
+ int h = FFMIN(s->rows - row, h4) * 8;
+ int n, o = 0;
+
+ for (n = 0; o < w; n++) {
+ int bw = 64 >> n;
+
+ av_assert2(n <= 4);
+ if (w & bw) {
+ s->dsp.mc[n][0][0][0][0](s->cur_frame->data[0] + yoff + o,
+ s->tmp_y + o,
+ s->cur_frame->linesize[0],
+ 64, h, 0, 0);
+ o += bw;
+ }
+ }
+ }
+ if (emu[1]) {
+ int w = FFMIN(s->cols - col, w4) * 4;
+ int h = FFMIN(s->rows - row, h4) * 4;
+ int n, o = 0;
+
+ for (n = 1; o < w; n++) {
+ int bw = 64 >> n;
+
+ av_assert2(n <= 4);
+ if (w & bw) {
+ s->dsp.mc[n][0][0][0][0](s->cur_frame->data[1] + uvoff + o,
+ s->tmp_uv[0] + o,
+ s->cur_frame->linesize[1],
+ 32, h, 0, 0);
+ s->dsp.mc[n][0][0][0][0](s->cur_frame->data[2] + uvoff + o,
+ s->tmp_uv[1] + o,
+ s->cur_frame->linesize[2],
+ 32, h, 0, 0);
+ o += bw;
+ }
+ }
+ }
+
+ // pick filter level and find edges to apply filter to
+ if (s->filter.level &&
+ (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);
+ int y_end = FFMIN(s->rows - row, h4);
+ int skip_inter = !b->intra && b->skip;
+
+ 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,
+ 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);
+
+ if (!s->filter.lim_lut[lvl]) {
+ int sharp = s->filter.sharpness;
+ int limit = lvl;
+
+ if (sharp > 0) {
+ limit >>= (sharp + 3) >> 2;
+ limit = FFMIN(limit, 9 - sharp);
+ }
+ limit = FFMAX(limit, 1);
+
+ s->filter.lim_lut[lvl] = limit;
+ s->filter.mblim_lut[lvl] = 2 * (lvl + 2) + limit;
+ }
+ }
+
+ return 0;
+}

libav-v10.1.tar.bz2/libavcodec/vp9data.c Added

@@ -0,0 +1,2133 @@
+/*
+ * Copyright (C) 2013 Ronald S. Bultje <rsbultje gmail com>
+ * Copyright (C) 2013 Clément Bœsch 
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "vp9.h"
+#include "vp9data.h"
+
+const int8_t ff_vp9_partition_tree[3][2] = {
+ { -PARTITION_NONE, 1 }, // '0'
+ { -PARTITION_H, 2 }, // '10'
+ { -PARTITION_V, -PARTITION_SPLIT }, // '110', '111'
+};
+
+const uint8_t ff_vp9_default_kf_partition_probs[4][4][3] = {
+ { /* 64x64 -> 32x32 */
+ { 174, 35, 49 } /* a/l both not split */,
+ { 68, 11, 27 } /* a split, l not split */,
+ { 57, 15, 9 } /* l split, a not split */,
+ { 12, 3, 3 } /* a/l both split */
+ }, { /* 32x32 -> 16x16 */
+ { 150, 40, 39 } /* a/l both not split */,
+ { 78, 12, 26 } /* a split, l not split */,
+ { 67, 33, 11 } /* l split, a not split */,
+ { 24, 7, 5 } /* a/l both split */,
+ }, { /* 16x16 -> 8x8 */
+ { 149, 53, 53 } /* a/l both not split */,
+ { 94, 20, 48 } /* a split, l not split */,
+ { 83, 53, 24 } /* l split, a not split */,
+ { 52, 18, 18 } /* a/l both split */,
+ }, { /* 8x8 -> 4x4 */
+ { 158, 97, 94 } /* a/l both not split */,
+ { 93, 24, 99 } /* a split, l not split */,
+ { 85, 119, 44 } /* l split, a not split */,
+ { 62, 59, 67 } /* a/l both split */,
+ },
+};
+
+const int8_t ff_vp9_segmentation_tree[7][2] = {
+ { 1, 2 },
+ { 3, 4 },
+ { 5, 6 },
+ { -0, -1 }, // '00x'
+ { -2, -3 }, // '01x'
+ { -4, -5 }, // '10x'
+ { -6, -7 }, // '11x'
+};
+
+const int8_t ff_vp9_intramode_tree[9][2] = {
+ { -DC_PRED, 1 }, // '0'
+ { -TM_VP8_PRED, 2 }, // '10'
+ { -VERT_PRED, 3 }, // '110'
+ { 4, 6 },
+ { -HOR_PRED, 5 }, // '11100'
+ { -DIAG_DOWN_RIGHT_PRED, -VERT_RIGHT_PRED }, // '11101x'
+ { -DIAG_DOWN_LEFT_PRED, 7 }, // '11110'
+ { -VERT_LEFT_PRED, 8 }, // '111110'
+ { -HOR_DOWN_PRED, -HOR_UP_PRED }, // '111111x'
+};
+
+const uint8_t ff_vp9_default_kf_ymode_probs[10][10][9] = {
+ { /* above = v */
+ { 43, 46, 168, 134, 107, 128, 69, 142, 92 } /* left = v */,
+ { 44, 29, 68, 159, 201, 177, 50, 57, 77 } /* left = h */,
+ { 63, 36, 126, 146, 123, 158, 60, 90, 96 } /* left = dc */,
+ { 58, 38, 76, 114, 97, 172, 78, 133, 92 } /* left = d45 */,
+ { 46, 41, 76, 140, 63, 184, 69, 112, 57 } /* left = d135 */,
+ { 38, 32, 85, 140, 46, 112, 54, 151, 133 } /* left = d117 */,
+ { 39, 27, 61, 131, 110, 175, 44, 75, 136 } /* left = d153 */,
+ { 47, 35, 80, 100, 74, 143, 64, 163, 74 } /* left = d63 */,
+ { 52, 30, 74, 113, 130, 175, 51, 64, 58 } /* left = d27 */,
+ { 36, 61, 116, 114, 128, 162, 80, 125, 82 } /* left = tm */
+ }, { /* above = h */
+ { 55, 44, 68, 166, 179, 192, 57, 57, 108 } /* left = v */,
+ { 42, 26, 11, 199, 241, 228, 23, 15, 85 } /* left = h */,
+ { 82, 26, 26, 171, 208, 204, 44, 32, 105 } /* left = dc */,
+ { 68, 42, 19, 131, 160, 199, 55, 52, 83 } /* left = d45 */,
+ { 58, 50, 25, 139, 115, 232, 39, 52, 118 } /* left = d135 */,
+ { 50, 35, 33, 153, 104, 162, 64, 59, 131 } /* left = d117 */,
+ { 44, 24, 16, 150, 177, 202, 33, 19, 156 } /* left = d153 */,
+ { 53, 49, 21, 110, 116, 168, 59, 80, 76 } /* left = d63 */,
+ { 55, 27, 12, 153, 203, 218, 26, 27, 49 } /* left = d27 */,
+ { 38, 72, 19, 168, 203, 212, 50, 50, 107 } /* left = tm */
+ }, { /* above = dc */
+ { 92, 45, 102, 136, 116, 180, 74, 90, 100 } /* left = v */,
+ { 73, 32, 19, 187, 222, 215, 46, 34, 100 } /* left = h */,
+ { 137, 30, 42, 148, 151, 207, 70, 52, 91 } /* left = dc */,
+ { 91, 30, 32, 116, 121, 186, 93, 86, 94 } /* left = d45 */,
+ { 72, 35, 36, 149, 68, 206, 68, 63, 105 } /* left = d135 */,
+ { 73, 31, 28, 138, 57, 124, 55, 122, 151 } /* left = d117 */,
+ { 67, 23, 21, 140, 126, 197, 40, 37, 171 } /* left = d153 */,
+ { 74, 32, 27, 107, 86, 160, 63, 134, 102 } /* left = d63 */,
+ { 86, 27, 28, 128, 154, 212, 45, 43, 53 } /* left = d27 */,
+ { 59, 67, 44, 140, 161, 202, 78, 67, 119 } /* left = tm */
+ }, { /* above = d45 */
+ { 59, 38, 83, 112, 103, 162, 98, 136, 90 } /* left = v */,
+ { 62, 30, 23, 158, 200, 207, 59, 57, 50 } /* left = h */,
+ { 103, 26, 36, 129, 132, 201, 83, 80, 93 } /* left = dc */,
+ { 67, 30, 29, 84, 86, 191, 102, 91, 59 } /* left = d45 */,
+ { 60, 32, 33, 112, 71, 220, 64, 89, 104 } /* left = d135 */,
+ { 53, 26, 34, 130, 56, 149, 84, 120, 103 } /* left = d117 */,
+ { 53, 21, 23, 133, 109, 210, 56, 77, 172 } /* left = d153 */,
+ { 61, 29, 29, 93, 97, 165, 83, 175, 162 } /* left = d63 */,
+ { 77, 19, 29, 112, 142, 228, 55, 66, 36 } /* left = d27 */,
+ { 47, 47, 43, 114, 137, 181, 100, 99, 95 } /* left = tm */
+ }, { /* above = d135 */
+ { 53, 40, 55, 139, 69, 183, 61, 80, 110 } /* left = v */,
+ { 40, 29, 19, 161, 180, 207, 43, 24, 91 } /* left = h */,
+ { 69, 23, 29, 128, 83, 199, 46, 44, 101 } /* left = dc */,
+ { 60, 34, 19, 105, 61, 198, 53, 64, 89 } /* left = d45 */,
+ { 52, 31, 22, 158, 40, 209, 58, 62, 89 } /* left = d135 */,
+ { 44, 31, 29, 147, 46, 158, 56, 102, 198 } /* left = d117 */,
+ { 35, 19, 12, 135, 87, 209, 41, 45, 167 } /* left = d153 */,
+ { 51, 38, 25, 113, 58, 164, 70, 93, 97 } /* left = d63 */,
+ { 55, 25, 21, 118, 95, 215, 38, 39, 66 } /* left = d27 */,
+ { 47, 54, 34, 146, 108, 203, 72, 103, 151 } /* left = tm */
+ }, { /* above = d117 */
+ { 46, 27, 80, 150, 55, 124, 55, 121, 135 } /* left = v */,
+ { 36, 23, 27, 165, 149, 166, 54, 64, 118 } /* left = h */,
+ { 64, 19, 37, 156, 66, 138, 49, 95, 133 } /* left = dc */,
+ { 53, 21, 36, 131, 63, 163, 60, 109, 81 } /* left = d45 */,
+ { 40, 26, 35, 154, 40, 185, 51, 97, 123 } /* left = d135 */,
+ { 35, 19, 34, 179, 19, 97, 48, 129, 124 } /* left = d117 */,
+ { 36, 20, 26, 136, 62, 164, 33, 77, 154 } /* left = d153 */,
+ { 45, 26, 28, 129, 45, 129, 49, 147, 123 } /* left = d63 */,
+ { 45, 18, 32, 130, 90, 157, 40, 79, 91 } /* left = d27 */,
+ { 38, 44, 51, 136, 74, 162, 57, 97, 121 } /* left = tm */
+ }, { /* above = d153 */
+ { 56, 39, 58, 133, 117, 173, 48, 53, 187 } /* left = v */,
+ { 35, 21, 12, 161, 212, 207, 20, 23, 145 } /* left = h */,
+ { 75, 17, 22, 136, 138, 185, 32, 34, 166 } /* left = dc */,
+ { 56, 29, 19, 117, 109, 181, 55, 68, 112 } /* left = d45 */,
+ { 47, 29, 17, 153, 64, 220, 59, 51, 114 } /* left = d135 */,
+ { 46, 16, 24, 136, 76, 147, 41, 64, 172 } /* left = d117 */,
+ { 34, 17, 11, 108, 152, 187, 13, 15, 209 } /* left = d153 */,
+ { 55, 30, 18, 122, 79, 179, 44, 88, 116 } /* left = d63 */,
+ { 51, 24, 14, 115, 133, 209, 32, 26, 104 } /* left = d27 */,
+ { 37, 49, 25, 129, 168, 164, 41, 54, 148 } /* left = tm */
+ }, { /* above = d63 */
+ { 48, 34, 86, 101, 92, 146, 78, 179, 134 } /* left = v */,
+ { 47, 22, 24, 138, 187, 178, 68, 69, 59 } /* left = h */,
+ { 78, 23, 39, 111, 117, 170, 74, 124, 94 } /* left = dc */,
+ { 56, 25, 33, 105, 112, 187, 95, 177, 129 } /* left = d45 */,
+ { 48, 31, 27, 114, 63, 183, 82, 116, 56 } /* left = d135 */,
+ { 43, 28, 37, 121, 63, 123, 61, 192, 169 } /* left = d117 */,
+ { 42, 17, 24, 109, 97, 177, 56, 76, 122 } /* left = d153 */,
+ { 46, 23, 32, 74, 86, 150, 67, 183, 88 } /* left = d63 */,
+ { 58, 18, 28, 105, 139, 182, 70, 92, 63 } /* left = d27 */,
+ { 36, 38, 48, 92, 122, 165, 88, 137, 91 } /* left = tm */
+ }, { /* above = d27 */
+ { 62, 44, 61, 123, 105, 189, 48, 57, 64 } /* left = v */,
+ { 47, 25, 17, 175, 222, 220, 24, 30, 86 } /* left = h */,
+ { 82, 22, 32, 127, 143, 213, 39, 41, 70 } /* left = dc */,
+ { 68, 36, 17, 106, 102, 206, 59, 74, 74 } /* left = d45 */,
+ { 57, 39, 23, 151, 68, 216, 55, 63, 58 } /* left = d135 */,
+ { 49, 30, 35, 141, 70, 168, 82, 40, 115 } /* left = d117 */,
+ { 51, 25, 15, 136, 129, 202, 38, 35, 139 } /* left = d153 */,
+ { 59, 39, 19, 114, 75, 180, 77, 104, 42 } /* left = d63 */,
+ { 68, 26, 16, 111, 141, 215, 29, 28, 28 } /* left = d27 */,
+ { 40, 61, 26, 126, 152, 206, 61, 59, 93 } /* left = tm */
+ }, { /* above = tm */
+ { 44, 78, 115, 132, 119, 173, 71, 112, 93 } /* left = v */,
+ { 39, 38, 21, 184, 227, 206, 42, 32, 64 } /* left = h */,
+ { 65, 70, 60, 155, 159, 199, 61, 60, 81 } /* left = dc */,
+ { 58, 47, 36, 124, 137, 193, 80, 82, 78 } /* left = d45 */,
+ { 49, 50, 35, 144, 95, 205, 63, 78, 59 } /* left = d135 */,
+ { 41, 53, 52, 148, 71, 142, 65, 128, 51 } /* left = d117 */,
+ { 40, 36, 28, 143, 143, 202, 40, 55, 137 } /* left = d153 */,
+ { 42, 44, 44, 104, 105, 164, 64, 130, 80 } /* left = d63 */,
+ { 52, 34, 29, 129, 183, 227, 42, 35, 43 } /* left = d27 */,
+ { 43, 81, 53, 140, 169, 204, 68, 84, 72 } /* left = tm */
+ }
+};
+
+const uint8_t ff_vp9_default_kf_uvmode_probs[10][9] = {
+ { 118, 15, 123, 148, 131, 101, 44, 93, 131 } /* y = v */,
+ { 113, 12, 23, 188, 226, 142, 26, 32, 125 } /* y = h */,
+ { 144, 11, 54, 157, 195, 130, 46, 58, 108 } /* y = dc */,
+ { 120, 11, 50, 123, 163, 135, 64, 77, 103 } /* y = d45 */,
+ { 113, 9, 36, 155, 111, 157, 32, 44, 161 } /* y = d135 */,
+ { 116, 9, 55, 176, 76, 96, 37, 61, 149 } /* y = d117 */,
+ { 115, 9, 28, 141, 161, 167, 21, 25, 193 } /* y = d153 */,
+ { 116, 12, 64, 120, 140, 125, 49, 115, 121 } /* y = d63 */,
+ { 120, 12, 32, 145, 195, 142, 32, 38, 86 } /* y = d27 */,
+ { 102, 19, 66, 162, 182, 122, 35, 59, 128 } /* y = tm */
+};
+
+const int8_t ff_vp9_inter_mode_tree[3][2] = {
+ { -ZEROMV, 1 }, // '0'
+ { -NEARESTMV, 2 }, // '10'
+ { -NEARMV, -NEWMV }, // '11x'
+};
+
+const int8_t ff_vp9_filter_tree[2][2] = {
+ { -0, 1 }, // '0'
+ { -1, -2 }, // '1x'
+};
+
+const enum FilterMode ff_vp9_filter_lut[3] = {
+ FILTER_8TAP_REGULAR,
+ FILTER_8TAP_SMOOTH,
+ FILTER_8TAP_SHARP,
+};
+
+const int16_t ff_vp9_dc_qlookup[256] = {
+ 4, 8, 8, 9, 10, 11, 12, 12,
+ 13, 14, 15, 16, 17, 18, 19, 19,
+ 20, 21, 22, 23, 24, 25, 26, 26,
+ 27, 28, 29, 30, 31, 32, 32, 33,
+ 34, 35, 36, 37, 38, 38, 39, 40,
+ 41, 42, 43, 43, 44, 45, 46, 47,
+ 48, 48, 49, 50, 51, 52, 53, 53,
+ 54, 55, 56, 57, 57, 58, 59, 60,
+ 61, 62, 62, 63, 64, 65, 66, 66,
+ 67, 68, 69, 70, 70, 71, 72, 73,
+ 74, 74, 75, 76, 77, 78, 78, 79,
+ 80, 81, 81, 82, 83, 84, 85, 85,
+ 87, 88, 90, 92, 93, 95, 96, 98,
+ 99, 101, 102, 104, 105, 107, 108, 110,
+ 111, 113, 114, 116, 117, 118, 120, 121,
+ 123, 125, 127, 129, 131, 134, 136, 138,
+ 140, 142, 144, 146, 148, 150, 152, 154,
+ 156, 158, 161, 164, 166, 169, 172, 174,
+ 177, 180, 182, 185, 187, 190, 192, 195,
+ 199, 202, 205, 208, 211, 214, 217, 220,
+ 223, 226, 230, 233, 237, 240, 243, 247,
+ 250, 253, 257, 261, 265, 269, 272, 276,
+ 280, 284, 288, 292, 296, 300, 304, 309,
+ 313, 317, 322, 326, 330, 335, 340, 344,
+ 349, 354, 359, 364, 369, 374, 379, 384,
+ 389, 395, 400, 406, 411, 417, 423, 429,
+ 435, 441, 447, 454, 461, 467, 475, 482,
+ 489, 497, 505, 513, 522, 530, 539, 549,
+ 559, 569, 579, 590, 602, 614, 626, 640,
+ 654, 668, 684, 700, 717, 736, 755, 775,
+ 796, 819, 843, 869, 896, 925, 955, 988,
+ 1022, 1058, 1098, 1139, 1184, 1232, 1282, 1336,
+};
+
+const int16_t ff_vp9_ac_qlookup[256] = {
+ 4, 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,
+ 104, 106, 108, 110, 112, 114, 116, 118,
+ 120, 122, 124, 126, 128, 130, 132, 134,
+ 136, 138, 140, 142, 144, 146, 148, 150,
+ 152, 155, 158, 161, 164, 167, 170, 173,
+ 176, 179, 182, 185, 188, 191, 194, 197,
+ 200, 203, 207, 211, 215, 219, 223, 227,
+ 231, 235, 239, 243, 247, 251, 255, 260,
+ 265, 270, 275, 280, 285, 290, 295, 300,
+ 305, 311, 317, 323, 329, 335, 341, 347,
+ 353, 359, 366, 373, 380, 387, 394, 401,
+ 408, 416, 424, 432, 440, 448, 456, 465,
+ 474, 483, 492, 501, 510, 520, 530, 540,
+ 550, 560, 571, 582, 593, 604, 615, 627,
+ 639, 651, 663, 676, 689, 702, 715, 729,
+ 743, 757, 771, 786, 801, 816, 832, 848,
+ 864, 881, 898, 915, 933, 951, 969, 988,
+ 1007, 1026, 1046, 1066, 1087, 1108, 1129, 1151,
+ 1173, 1196, 1219, 1243, 1267, 1292, 1317, 1343,
+ 1369, 1396, 1423, 1451, 1479, 1508, 1537, 1567,
+ 1597, 1628, 1660, 1692, 1725, 1759, 1793, 1828,
+};
+
+const enum TxfmType ff_vp9_intra_txfm_type[14] = {
+ [VERT_PRED] = ADST_DCT,
+ [HOR_PRED] = DCT_ADST,
+ [DC_PRED] = DCT_DCT,
+ [DIAG_DOWN_LEFT_PRED] = DCT_DCT,
+ [DIAG_DOWN_RIGHT_PRED] = ADST_ADST,
+ [VERT_RIGHT_PRED] = ADST_DCT,
+ [HOR_DOWN_PRED] = DCT_ADST,
+ [VERT_LEFT_PRED] = ADST_DCT,
+ [HOR_UP_PRED] = DCT_ADST,
+ [TM_VP8_PRED] = ADST_ADST,
+ [NEARESTMV] = DCT_DCT,
+ [NEARMV] = DCT_DCT,
+ [ZEROMV] = DCT_DCT,
+ [NEWMV] = DCT_DCT,
+};
+
+const int16_t ff_vp9_default_scan_4x4[16] = {
+ 0, 1, 4, 5,
+ 2, 8, 3, 6,
+ 12, 9, 7, 10,
+ 13, 11, 14, 15,
+};
+
+const int16_t ff_vp9_col_scan_4x4[16] = {
+ 0, 1, 2, 4,
+ 3, 5, 6, 8,
+ 7, 9, 10, 12,
+ 13, 11, 14, 15,
+};
+
+const int16_t ff_vp9_row_scan_4x4[16] = {
+ 0, 4, 1, 8,
+ 5, 12, 9, 2,
+ 6, 13, 3, 10,
+ 7, 14, 11, 15,
+};
+
+const int16_t ff_vp9_default_scan_8x8[64] = {
+ 0, 1, 8, 2, 9, 16, 10, 3,
+ 17, 24, 18, 11, 4, 25, 32, 19,
+ 12, 26, 5, 33, 20, 27, 40, 13,
+ 34, 6, 41, 28, 21, 35, 42, 48,
+ 14, 7, 36, 29, 43, 56, 49, 22,
+ 15, 37, 50, 44, 57, 30, 23, 51,
+ 45, 58, 38, 31, 52, 59, 39, 46,
+ 53, 60, 47, 54, 61, 55, 62, 63,
+};
+
+const int16_t ff_vp9_col_scan_8x8[64] = {
+ 0, 1, 2, 8, 3, 9, 4, 10,
+ 16, 5, 11, 17, 12, 18, 6, 24,
+ 19, 13, 25, 7, 26, 20, 32, 14,
+ 27, 21, 33, 28, 34, 15, 22, 35,
+ 40, 29, 41, 36, 23, 30, 42, 37,
+ 48, 43, 31, 44, 49, 38, 50, 56,
+ 45, 39, 51, 57, 52, 46, 58, 53,
+ 59, 47, 60, 54, 61, 55, 62, 63,
+};
+
+const int16_t ff_vp9_row_scan_8x8[64] = {
+ 0, 8, 16, 1, 9, 24, 2, 17,
+ 32, 10, 25, 3, 40, 18, 11, 33,
+ 26, 19, 4, 48, 41, 34, 12, 27,
+ 56, 20, 5, 42, 35, 13, 49, 28,
+ 6, 21, 43, 36, 14, 50, 29, 57,
+ 7, 44, 22, 37, 51, 15, 58, 30,
+ 23, 45, 52, 38, 59, 31, 46, 53,
+ 39, 60, 47, 61, 54, 62, 55, 63,
+};
+
+const int16_t ff_vp9_default_scan_16x16[256] = {
+ 0, 1, 16, 2, 17, 32, 3, 18, 33, 48, 4, 34, 19, 49, 20, 5,
+ 35, 64, 50, 36, 65, 21, 6, 51, 80, 66, 37, 22, 52, 7, 81, 67,
+ 38, 82, 53, 23, 96, 68, 8, 83, 97, 54, 39, 69, 112, 24, 98, 84,
+ 70, 55, 9, 40, 85, 99, 113, 128, 25, 114, 100, 71, 86, 56, 10, 41,
+ 115, 101, 129, 116, 72, 87, 26, 130, 144, 102, 57, 11, 42, 117, 131, 145,
+ 88, 103, 27, 73, 132, 118, 146, 58, 160, 12, 43, 133, 147, 104, 89, 119,
+ 161, 74, 148, 134, 28, 162, 59, 13, 176, 120, 149, 90, 135, 105, 163, 44,
+ 75, 177, 164, 29, 150, 121, 136, 178, 165, 14, 106, 60, 91, 151, 45, 179,
+ 192, 137, 166, 122, 76, 180, 152, 30, 61, 15, 107, 167, 181, 193, 92, 208,
+ 46, 138, 123, 153, 194, 77, 168, 182, 31, 195, 209, 183, 108, 139, 62, 154,
+ 47, 196, 93, 169, 210, 197, 224, 124, 184, 211, 78, 109, 170, 155, 63, 198,
+ 212, 185, 225, 240, 140, 94, 199, 125, 79, 213, 226, 171, 186, 156, 214, 200,
+ 110, 227, 141, 95, 241, 215, 228, 201, 126, 242, 187, 172, 157, 229, 111, 216,
+ 243, 142, 202, 230, 127, 217, 244, 173, 188, 231, 158, 203, 143, 245, 218, 232,
+ 189, 246, 159, 174, 233, 247, 219, 204, 175, 190, 248, 234, 205, 220, 249, 191,
+ 235, 221, 250, 206, 222, 251, 236, 207, 237, 223, 252, 238, 253, 239, 254, 255,
+};
+
+const int16_t ff_vp9_col_scan_16x16[256] = {
+ 0, 1, 2, 3, 16, 4, 17, 5, 18, 6, 19, 32, 20, 7, 33, 21,
+ 34, 8, 35, 22, 48, 36, 9, 49, 23, 50, 37, 10, 38, 51, 24, 64,
+ 52, 11, 65, 39, 25, 53, 66, 54, 40, 67, 12, 80, 26, 68, 55, 81,
+ 41, 69, 13, 27, 82, 56, 70, 83, 42, 14, 84, 96, 71, 28, 57, 85,
+ 97, 15, 72, 98, 43, 86, 58, 99, 29, 87, 100, 112, 73, 44, 101, 59,
+ 30, 113, 88, 114, 74, 128, 102, 45, 31, 115, 60, 103, 89, 116, 75, 129,
+ 117, 46, 104, 90, 61, 130, 118, 131, 132, 105, 76, 47, 119, 144, 91, 62,
+ 133, 106, 145, 120, 146, 134, 77, 147, 121, 92, 135, 148, 63, 107, 136, 122,
+ 93, 149, 160, 78, 150, 137, 108, 161, 162, 151, 123, 79, 138, 163, 152, 94,
+ 164, 109, 165, 153, 124, 139, 176, 166, 95, 177, 167, 110, 154, 178, 125, 179,
+ 140, 168, 155, 111, 180, 192, 181, 169, 141, 126, 182, 193, 194, 156, 183, 170,
+ 195, 127, 142, 196, 184, 208, 197, 157, 171, 143, 185, 198, 209, 199, 210, 172,
+ 158, 186, 211, 224, 212, 200, 240, 159, 213, 225, 187, 201, 173, 226, 214, 215,
+ 227, 202, 228, 188, 241, 216, 174, 229, 242, 203, 243, 217, 230, 175, 189, 244,
+ 231, 204, 218, 232, 245, 219, 246, 190, 233, 205, 191, 247, 234, 248, 220, 206,
+ 249, 235, 221, 207, 250, 236, 222, 251, 223, 237, 238, 252, 239, 253, 254, 255,
+};
+
+const int16_t ff_vp9_row_scan_16x16[256] = {
+ 0, 16, 32, 1, 48, 17, 64, 33, 2, 80, 18, 49, 96, 34, 3, 65,
+ 19, 112, 50, 81, 35, 4, 128, 66, 20, 97, 51, 82, 5, 144, 36, 67,
+ 113, 98, 21, 52, 160, 83, 129, 37, 68, 6, 114, 176, 99, 53, 22, 84,
+ 145, 38, 69, 130, 7, 115, 192, 100, 54, 23, 85, 161, 146, 131, 39, 70,
+ 208, 116, 8, 101, 177, 55, 86, 24, 162, 147, 132, 71, 224, 117, 40, 102,
+ 9, 148, 56, 87, 193, 163, 240, 133, 178, 25, 118, 72, 41, 103, 164, 10,
+ 149, 88, 134, 209, 179, 57, 119, 194, 26, 73, 165, 150, 104, 42, 135, 11,
+ 180, 120, 89, 225, 195, 58, 27, 210, 151, 181, 166, 74, 43, 105, 12, 136,
+ 90, 59, 241, 121, 28, 196, 167, 211, 152, 44, 182, 137, 75, 13, 226, 106,
+ 122, 60, 197, 91, 168, 29, 183, 153, 14, 76, 212, 138, 45, 107, 15, 198,
+ 92, 227, 169, 30, 123, 154, 61, 242, 184, 213, 139, 46, 77, 31, 108, 170,
+ 199, 185, 124, 228, 93, 155, 214, 62, 140, 243, 78, 47, 200, 109, 186, 171,
+ 201, 94, 63, 215, 229, 156, 79, 125, 141, 110, 216, 187, 172, 244, 202, 230,
+ 217, 95, 157, 126, 245, 111, 142, 231, 188, 127, 158, 218, 173, 232, 246, 233,
+ 203, 143, 247, 174, 189, 159, 219, 204, 248, 234, 249, 175, 190, 220, 205, 250,
+ 235, 191, 221, 251, 236, 206, 252, 222, 207, 237, 223, 253, 238, 254, 239, 255,
+};
+
+const int16_t ff_vp9_default_scan_32x32[1024] = {
+ 0, 1, 32, 2, 33, 64, 3, 34, 65, 4, 96, 35, 66, 5, 36, 97,
+ 67, 128, 98, 68, 37, 6, 129, 99, 7, 160, 69, 38, 130, 100, 161, 131,
+ 39, 70, 8, 101, 162, 132, 192, 71, 40, 9, 102, 163, 133, 193, 72, 224,
+ 103, 41, 164, 10, 194, 134, 165, 73, 104, 135, 225, 42, 195, 11, 256, 166,
+ 226, 196, 74, 105, 136, 43, 12, 167, 197, 227, 257, 75, 106, 137, 228, 44,
+ 198, 168, 258, 288, 13, 229, 76, 107, 199, 138, 259, 169, 289, 45, 230, 260,
+ 200, 108, 14, 170, 139, 320, 290, 77, 231, 261, 46, 201, 140, 291, 109, 232,
+ 321, 262, 171, 78, 292, 15, 322, 202, 263, 352, 172, 293, 233, 141, 323, 110,
+ 47, 203, 264, 234, 294, 353, 324, 16, 79, 204, 265, 295, 325, 173, 354, 142,
+ 235, 384, 48, 296, 111, 266, 355, 326, 80, 17, 205, 236, 174, 356, 385, 327,
+ 143, 297, 267, 357, 386, 112, 49, 328, 298, 206, 416, 237, 358, 387, 81, 175,
+ 18, 329, 359, 388, 299, 330, 389, 113, 417, 238, 360, 50, 207, 418, 390, 331,
+ 19, 448, 361, 82, 419, 391, 239, 51, 362, 420, 114, 449, 480, 421, 83, 363,
+ 450, 422, 512, 451, 423, 115, 452, 481, 453, 482, 454, 544, 483, 455, 513, 484,
+ 514, 485, 515, 486, 545, 576, 487, 546, 547, 608, 577, 578, 579, 609, 610, 611,
+ 20, 144, 268, 392, 516, 640, 21, 52, 145, 176, 269, 300, 393, 424, 517, 548,
+ 641, 672, 22, 53, 84, 146, 177, 208, 270, 301, 332, 394, 425, 456, 518, 549,
+ 580, 642, 673, 704, 23, 54, 85, 116, 147, 178, 209, 240, 271, 302, 333, 364,
+ 395, 426, 457, 488, 519, 550, 581, 612, 643, 674, 705, 736, 55, 86, 117, 179,
+ 210, 241, 303, 334, 365, 427, 458, 489, 551, 582, 613, 675, 706, 737, 87, 118,
+ 211, 242, 335, 366, 459, 490, 583, 614, 707, 738, 119, 243, 367, 491, 615, 739,
+ 24, 148, 272, 396, 520, 644, 768, 25, 56, 149, 180, 273, 304, 397, 428, 521,
+ 552, 645, 676, 769, 800, 26, 57, 88, 150, 181, 212, 274, 305, 336, 398, 429,
+ 460, 522, 553, 584, 646, 677, 708, 770, 801, 832, 27, 58, 89, 120, 151, 182,
+ 213, 244, 275, 306, 337, 368, 399, 430, 461, 492, 523, 554, 585, 616, 647, 678,
+ 709, 740, 771, 802, 833, 864, 59, 90, 121, 183, 214, 245, 307, 338, 369, 431,
+ 462, 493, 555, 586, 617, 679, 710, 741, 803, 834, 865, 91, 122, 215, 246, 339,
+ 370, 463, 494, 587, 618, 711, 742, 835, 866, 123, 247, 371, 495, 619, 743, 867,
+ 28, 152, 276, 400, 524, 648, 772, 896, 29, 60, 153, 184, 277, 308, 401, 432,
+ 525, 556, 649, 680, 773, 804, 897, 928, 30, 61, 92, 154, 185, 216, 278, 309,
+ 340, 402, 433, 464, 526, 557, 588, 650, 681, 712, 774, 805, 836, 898, 929, 960,
+ 31, 62, 93, 124, 155, 186, 217, 248, 279, 310, 341, 372, 403, 434, 465, 496,
+ 527, 558, 589, 620, 651, 682, 713, 744, 775, 806, 837, 868, 899, 930, 961, 992,
+ 63, 94, 125, 187, 218, 249, 311, 342, 373, 435, 466, 497, 559, 590, 621, 683,
+ 714, 745, 807, 838, 869, 931, 962, 993, 95, 126, 219, 250, 343, 374, 467, 498,
+ 591, 622, 715, 746, 839, 870, 963, 994, 127, 251, 375, 499, 623, 747, 871, 995,
+ 156, 280, 404, 528, 652, 776, 900, 157, 188, 281, 312, 405, 436, 529, 560, 653,
+ 684, 777, 808, 901, 932, 158, 189, 220, 282, 313, 344, 406, 437, 468, 530, 561,
+ 592, 654, 685, 716, 778, 809, 840, 902, 933, 964, 159, 190, 221, 252, 283, 314,
+ 345, 376, 407, 438, 469, 500, 531, 562, 593, 624, 655, 686, 717, 748, 779, 810,
+ 841, 872, 903, 934, 965, 996, 191, 222, 253, 315, 346, 377, 439, 470, 501, 563,
+ 594, 625, 687, 718, 749, 811, 842, 873, 935, 966, 997, 223, 254, 347, 378, 471,
+ 502, 595, 626, 719, 750, 843, 874, 967, 998, 255, 379, 503, 627, 751, 875, 999,
+ 284, 408, 532, 656, 780, 904, 285, 316, 409, 440, 533, 564, 657, 688, 781, 812,
+ 905, 936, 286, 317, 348, 410, 441, 472, 534, 565, 596, 658, 689, 720, 782, 813,
+ 844, 906, 937, 968, 287, 318, 349, 380, 411, 442, 473, 504, 535, 566, 597, 628,
+ 659, 690, 721, 752, 783, 814, 845, 876, 907, 938, 969, 1000, 319, 350, 381, 443,
+ 474, 505, 567, 598, 629, 691, 722, 753, 815, 846, 877, 939, 970, 1001, 351, 382,
+ 475, 506, 599, 630, 723, 754, 847, 878, 971, 1002, 383, 507, 631, 755, 879, 1003,
+ 412, 536, 660, 784, 908, 413, 444, 537, 568, 661, 692, 785, 816, 909, 940, 414,
+ 445, 476, 538, 569, 600, 662, 693, 724, 786, 817, 848, 910, 941, 972, 415, 446,
+ 477, 508, 539, 570, 601, 632, 663, 694, 725, 756, 787, 818, 849, 880, 911, 942,
+ 973, 1004, 447, 478, 509, 571, 602, 633, 695, 726, 757, 819, 850, 881, 943, 974,
+ 1005, 479, 510, 603, 634, 727, 758, 851, 882, 975, 1006, 511, 635, 759, 883, 1007,
+ 540, 664, 788, 912, 541, 572, 665, 696, 789, 820, 913, 944, 542, 573, 604, 666,
+ 697, 728, 790, 821, 852, 914, 945, 976, 543, 574, 605, 636, 667, 698, 729, 760,
+ 791, 822, 853, 884, 915, 946, 977, 1008, 575, 606, 637, 699, 730, 761, 823, 854,
+ 885, 947, 978, 1009, 607, 638, 731, 762, 855, 886, 979, 1010, 639, 763, 887, 1011,
+ 668, 792, 916, 669, 700, 793, 824, 917, 948, 670, 701, 732, 794, 825, 856, 918,
+ 949, 980, 671, 702, 733, 764, 795, 826, 857, 888, 919, 950, 981, 1012, 703, 734,
+ 765, 827, 858, 889, 951, 982, 1013, 735, 766, 859, 890, 983, 1014, 767, 891, 1015,
+ 796, 920, 797, 828, 921, 952, 798, 829, 860, 922, 953, 984, 799, 830, 861, 892,
+ 923, 954, 985, 1016, 831, 862, 893, 955, 986, 1017, 863, 894, 987, 1018, 895, 1019,
+ 924, 925, 956, 926, 957, 988, 927, 958, 989, 1020, 959, 990, 1021, 991, 1022, 1023,
+};
+
+const int16_t *ff_vp9_scans[5][4] = {
+ {
+ ff_vp9_default_scan_4x4, ff_vp9_col_scan_4x4,
+ ff_vp9_row_scan_4x4, ff_vp9_default_scan_4x4
+ }, {
+ ff_vp9_default_scan_8x8, ff_vp9_col_scan_8x8,
+ ff_vp9_row_scan_8x8, ff_vp9_default_scan_8x8
+ }, {
+ ff_vp9_default_scan_16x16, ff_vp9_col_scan_16x16,
+ ff_vp9_row_scan_16x16, ff_vp9_default_scan_16x16
+ }, {
+ ff_vp9_default_scan_32x32, ff_vp9_default_scan_32x32,
+ ff_vp9_default_scan_32x32, ff_vp9_default_scan_32x32
+ }, { // lossless
+ ff_vp9_default_scan_4x4, ff_vp9_default_scan_4x4,
+ ff_vp9_default_scan_4x4, ff_vp9_default_scan_4x4
+ }
+};
+
+const int16_t ff_vp9_default_scan_4x4_nb[16][2] = {
+ { 0, 0 }, { 0, 0 }, { 4, 1 }, { 1, 1 },
+ { 4, 4 }, { 2, 2 }, { 5, 2 }, { 8, 8 },
+ { 8, 5 }, { 6, 3 }, { 9, 6 }, { 12, 9 },
+ { 10, 7 }, { 13, 10 }, { 14, 11 }, { 0, 0 },
+};
+
+const int16_t ff_vp9_col_scan_4x4_nb[16][2] = {
+ { 0, 0 }, { 1, 1 }, { 0, 0 }, { 2, 2 },
+ { 4, 4 }, { 5, 5 }, { 4, 4 }, { 6, 6 },
+ { 8, 8 }, { 9, 9 }, { 8, 8 }, { 12, 12 },
+ { 10, 10 }, { 13, 13 }, { 14, 14 }, { 0, 0 },
+};
+
+const int16_t ff_vp9_row_scan_4x4_nb[16][2] = {
+ { 0, 0 }, { 0, 0 }, { 4, 4 }, { 1, 1 },
+ { 8, 8 }, { 5, 5 }, { 1, 1 }, { 2, 2 },
+ { 9, 9 }, { 2, 2 }, { 6, 6 }, { 3, 3 },
+ { 10, 10 }, { 7, 7 }, { 11, 11 }, { 0, 0 },
+};
+
+const int16_t ff_vp9_default_scan_8x8_nb[64][2] = {
+ { 0, 0 }, { 0, 0 }, { 1, 1 }, { 8, 1 },
+ { 8, 8 }, { 9, 2 }, { 2, 2 }, { 16, 9 },
+ { 16, 16 }, { 17, 10 }, { 10, 3 }, { 3, 3 },
+ { 24, 17 }, { 24, 24 }, { 18, 11 }, { 11, 4 },
+ { 25, 18 }, { 4, 4 }, { 32, 25 }, { 19, 12 },
+ { 26, 19 }, { 32, 32 }, { 12, 5 }, { 33, 26 },
+ { 5, 5 }, { 40, 33 }, { 27, 20 }, { 20, 13 },
+ { 34, 27 }, { 41, 34 }, { 40, 40 }, { 13, 6 },
+ { 6, 6 }, { 35, 28 }, { 28, 21 }, { 42, 35 },
+ { 48, 48 }, { 48, 41 }, { 21, 14 }, { 14, 7 },
+ { 36, 29 }, { 49, 42 }, { 43, 36 }, { 56, 49 },
+ { 29, 22 }, { 22, 15 }, { 50, 43 }, { 44, 37 },
+ { 57, 50 }, { 37, 30 }, { 30, 23 }, { 51, 44 },
+ { 58, 51 }, { 38, 31 }, { 45, 38 }, { 52, 45 },
+ { 59, 52 }, { 46, 39 }, { 53, 46 }, { 60, 53 },
+ { 54, 47 }, { 61, 54 }, { 62, 55 }, { 0, 0 },
+};
+
+const int16_t ff_vp9_col_scan_8x8_nb[64][2] = {
+ { 0, 0 }, { 1, 1 }, { 0, 0 }, { 2, 2 },
+ { 8, 8 }, { 3, 3 }, { 9, 9 }, { 8, 8 },
+ { 4, 4 }, { 10, 10 }, { 16, 16 }, { 11, 11 },
+ { 17, 17 }, { 5, 5 }, { 16, 16 }, { 18, 18 },
+ { 12, 12 }, { 24, 24 }, { 6, 6 }, { 25, 25 },
+ { 19, 19 }, { 24, 24 }, { 13, 13 }, { 26, 26 },
+ { 20, 20 }, { 32, 32 }, { 27, 27 }, { 33, 33 },
+ { 14, 14 }, { 21, 21 }, { 34, 34 }, { 32, 32 },
+ { 28, 28 }, { 40, 40 }, { 35, 35 }, { 22, 22 },
+ { 29, 29 }, { 41, 41 }, { 36, 36 }, { 40, 40 },
+ { 42, 42 }, { 30, 30 }, { 43, 43 }, { 48, 48 },
+ { 37, 37 }, { 49, 49 }, { 48, 48 }, { 44, 44 },
+ { 38, 38 }, { 50, 50 }, { 56, 56 }, { 51, 51 },
+ { 45, 45 }, { 57, 57 }, { 52, 52 }, { 58, 58 },
+ { 46, 46 }, { 59, 59 }, { 53, 53 }, { 60, 60 },
+ { 54, 54 }, { 61, 61 }, { 62, 62 }, { 0, 0 },
+};
+
+const int16_t ff_vp9_row_scan_8x8_nb[64][2] = {
+ { 0, 0 }, { 8, 8 }, { 0, 0 }, { 1, 1 },
+ { 16, 16 }, { 1, 1 }, { 9, 9 }, { 24, 24 },
+ { 2, 2 }, { 17, 17 }, { 2, 2 }, { 32, 32 },
+ { 10, 10 }, { 3, 3 }, { 25, 25 }, { 18, 18 },
+ { 11, 11 }, { 3, 3 }, { 40, 40 }, { 33, 33 },
+ { 26, 26 }, { 4, 4 }, { 19, 19 }, { 48, 48 },
+ { 12, 12 }, { 4, 4 }, { 34, 34 }, { 27, 27 },
+ { 5, 5 }, { 41, 41 }, { 20, 20 }, { 5, 5 },
+ { 13, 13 }, { 35, 35 }, { 28, 28 }, { 6, 6 },
+ { 42, 42 }, { 21, 21 }, { 49, 49 }, { 6, 6 },
+ { 36, 36 }, { 14, 14 }, { 29, 29 }, { 43, 43 },
+ { 7, 7 }, { 50, 50 }, { 22, 22 }, { 15, 15 },
+ { 37, 37 }, { 44, 44 }, { 30, 30 }, { 51, 51 },
+ { 23, 23 }, { 38, 38 }, { 45, 45 }, { 31, 31 },
+ { 52, 52 }, { 39, 39 }, { 53, 53 }, { 46, 46 },
+ { 54, 54 }, { 47, 47 }, { 55, 55 }, { 0, 0 },
+};
+
+const int16_t ff_vp9_default_scan_16x16_nb[256][2] = {
+ { 0, 0 }, { 0, 0 }, { 1, 1 }, { 16, 1 },
+ { 16, 16 }, { 2, 2 }, { 17, 2 }, { 32, 17 },
+ { 32, 32 }, { 3, 3 }, { 33, 18 }, { 18, 3 },
+ { 48, 33 }, { 19, 4 }, { 4, 4 }, { 34, 19 },
+ { 48, 48 }, { 49, 34 }, { 35, 20 }, { 64, 49 },
+ { 20, 5 }, { 5, 5 }, { 50, 35 }, { 64, 64 },
+ { 65, 50 }, { 36, 21 }, { 21, 6 }, { 51, 36 },
+ { 6, 6 }, { 80, 65 }, { 66, 51 }, { 37, 22 },
+ { 81, 66 }, { 52, 37 }, { 22, 7 }, { 80, 80 },
+ { 67, 52 }, { 7, 7 }, { 82, 67 }, { 96, 81 },
+ { 53, 38 }, { 38, 23 }, { 68, 53 }, { 96, 96 },
+ { 23, 8 }, { 97, 82 }, { 83, 68 }, { 69, 54 },
+ { 54, 39 }, { 8, 8 }, { 39, 24 }, { 84, 69 },
+ { 98, 83 }, { 112, 97 }, { 112, 112 }, { 24, 9 },
+ { 113, 98 }, { 99, 84 }, { 70, 55 }, { 85, 70 },
+ { 55, 40 }, { 9, 9 }, { 40, 25 }, { 114, 99 },
+ { 100, 85 }, { 128, 113 }, { 115, 100 }, { 71, 56 },
+ { 86, 71 }, { 25, 10 }, { 129, 114 }, { 128, 128 },
+ { 101, 86 }, { 56, 41 }, { 10, 10 }, { 41, 26 },
+ { 116, 101 }, { 130, 115 }, { 144, 129 }, { 87, 72 },
+ { 102, 87 }, { 26, 11 }, { 72, 57 }, { 131, 116 },
+ { 117, 102 }, { 145, 130 }, { 57, 42 }, { 144, 144 },
+ { 11, 11 }, { 42, 27 }, { 132, 117 }, { 146, 131 },
+ { 103, 88 }, { 88, 73 }, { 118, 103 }, { 160, 145 },
+ { 73, 58 }, { 147, 132 }, { 133, 118 }, { 27, 12 },
+ { 161, 146 }, { 58, 43 }, { 12, 12 }, { 160, 160 },
+ { 119, 104 }, { 148, 133 }, { 89, 74 }, { 134, 119 },
+ { 104, 89 }, { 162, 147 }, { 43, 28 }, { 74, 59 },
+ { 176, 161 }, { 163, 148 }, { 28, 13 }, { 149, 134 },
+ { 120, 105 }, { 135, 120 }, { 177, 162 }, { 164, 149 },
+ { 13, 13 }, { 105, 90 }, { 59, 44 }, { 90, 75 },
+ { 150, 135 }, { 44, 29 }, { 178, 163 }, { 176, 176 },
+ { 136, 121 }, { 165, 150 }, { 121, 106 }, { 75, 60 },
+ { 179, 164 }, { 151, 136 }, { 29, 14 }, { 60, 45 },
+ { 14, 14 }, { 106, 91 }, { 166, 151 }, { 180, 165 },
+ { 192, 177 }, { 91, 76 }, { 192, 192 }, { 45, 30 },
+ { 137, 122 }, { 122, 107 }, { 152, 137 }, { 193, 178 },
+ { 76, 61 }, { 167, 152 }, { 181, 166 }, { 30, 15 },
+ { 194, 179 }, { 208, 193 }, { 182, 167 }, { 107, 92 },
+ { 138, 123 }, { 61, 46 }, { 153, 138 }, { 46, 31 },
+ { 195, 180 }, { 92, 77 }, { 168, 153 }, { 209, 194 },
+ { 196, 181 }, { 208, 208 }, { 123, 108 }, { 183, 168 },
+ { 210, 195 }, { 77, 62 }, { 108, 93 }, { 169, 154 },
+ { 154, 139 }, { 62, 47 }, { 197, 182 }, { 211, 196 },
+ { 184, 169 }, { 224, 209 }, { 224, 224 }, { 139, 124 },
+ { 93, 78 }, { 198, 183 }, { 124, 109 }, { 78, 63 },
+ { 212, 197 }, { 225, 210 }, { 170, 155 }, { 185, 170 },
+ { 155, 140 }, { 213, 198 }, { 199, 184 }, { 109, 94 },
+ { 226, 211 }, { 140, 125 }, { 94, 79 }, { 240, 225 },
+ { 214, 199 }, { 227, 212 }, { 200, 185 }, { 125, 110 },
+ { 241, 226 }, { 186, 171 }, { 171, 156 }, { 156, 141 },
+ { 228, 213 }, { 110, 95 }, { 215, 200 }, { 242, 227 },
+ { 141, 126 }, { 201, 186 }, { 229, 214 }, { 126, 111 },
+ { 216, 201 }, { 243, 228 }, { 172, 157 }, { 187, 172 },
+ { 230, 215 }, { 157, 142 }, { 202, 187 }, { 142, 127 },
+ { 244, 229 }, { 217, 202 }, { 231, 216 }, { 188, 173 },
+ { 245, 230 }, { 158, 143 }, { 173, 158 }, { 232, 217 },
+ { 246, 231 }, { 218, 203 }, { 203, 188 }, { 174, 159 },
+ { 189, 174 }, { 247, 232 }, { 233, 218 }, { 204, 189 },
+ { 219, 204 }, { 248, 233 }, { 190, 175 }, { 234, 219 },
+ { 220, 205 }, { 249, 234 }, { 205, 190 }, { 221, 206 },
+ { 250, 235 }, { 235, 220 }, { 206, 191 }, { 236, 221 },
+ { 222, 207 }, { 251, 236 }, { 237, 222 }, { 252, 237 },
+ { 238, 223 }, { 253, 238 }, { 254, 239 }, { 0, 0 },
+};
+
+const int16_t ff_vp9_col_scan_16x16_nb[256][2] = {
+ { 0, 0 }, { 1, 1 }, { 2, 2 }, { 0, 0 },
+ { 3, 3 }, { 16, 16 }, { 4, 4 }, { 17, 17 },
+ { 5, 5 }, { 18, 18 }, { 16, 16 }, { 19, 19 },
+ { 6, 6 }, { 32, 32 }, { 20, 20 }, { 33, 33 },
+ { 7, 7 }, { 34, 34 }, { 21, 21 }, { 32, 32 },
+ { 35, 35 }, { 8, 8 }, { 48, 48 }, { 22, 22 },
+ { 49, 49 }, { 36, 36 }, { 9, 9 }, { 37, 37 },
+ { 50, 50 }, { 23, 23 }, { 48, 48 }, { 51, 51 },
+ { 10, 10 }, { 64, 64 }, { 38, 38 }, { 24, 24 },
+ { 52, 52 }, { 65, 65 }, { 53, 53 }, { 39, 39 },
+ { 66, 66 }, { 11, 11 }, { 64, 64 }, { 25, 25 },
+ { 67, 67 }, { 54, 54 }, { 80, 80 }, { 40, 40 },
+ { 68, 68 }, { 12, 12 }, { 26, 26 }, { 81, 81 },
+ { 55, 55 }, { 69, 69 }, { 82, 82 }, { 41, 41 },
+ { 13, 13 }, { 83, 83 }, { 80, 80 }, { 70, 70 },
+ { 27, 27 }, { 56, 56 }, { 84, 84 }, { 96, 96 },
+ { 14, 14 }, { 71, 71 }, { 97, 97 }, { 42, 42 },
+ { 85, 85 }, { 57, 57 }, { 98, 98 }, { 28, 28 },
+ { 86, 86 }, { 99, 99 }, { 96, 96 }, { 72, 72 },
+ { 43, 43 }, { 100, 100 }, { 58, 58 }, { 29, 29 },
+ { 112, 112 }, { 87, 87 }, { 113, 113 }, { 73, 73 },
+ { 112, 112 }, { 101, 101 }, { 44, 44 }, { 30, 30 },
+ { 114, 114 }, { 59, 59 }, { 102, 102 }, { 88, 88 },
+ { 115, 115 }, { 74, 74 }, { 128, 128 }, { 116, 116 },
+ { 45, 45 }, { 103, 103 }, { 89, 89 }, { 60, 60 },
+ { 129, 129 }, { 117, 117 }, { 130, 130 }, { 131, 131 },
+ { 104, 104 }, { 75, 75 }, { 46, 46 }, { 118, 118 },
+ { 128, 128 }, { 90, 90 }, { 61, 61 }, { 132, 132 },
+ { 105, 105 }, { 144, 144 }, { 119, 119 }, { 145, 145 },
+ { 133, 133 }, { 76, 76 }, { 146, 146 }, { 120, 120 },
+ { 91, 91 }, { 134, 134 }, { 147, 147 }, { 62, 62 },
+ { 106, 106 }, { 135, 135 }, { 121, 121 }, { 92, 92 },
+ { 148, 148 }, { 144, 144 }, { 77, 77 }, { 149, 149 },
+ { 136, 136 }, { 107, 107 }, { 160, 160 }, { 161, 161 },
+ { 150, 150 }, { 122, 122 }, { 78, 78 }, { 137, 137 },
+ { 162, 162 }, { 151, 151 }, { 93, 93 }, { 163, 163 },
+ { 108, 108 }, { 164, 164 }, { 152, 152 }, { 123, 123 },
+ { 138, 138 }, { 160, 160 }, { 165, 165 }, { 94, 94 },
+ { 176, 176 }, { 166, 166 }, { 109, 109 }, { 153, 153 },
+ { 177, 177 }, { 124, 124 }, { 178, 178 }, { 139, 139 },
+ { 167, 167 }, { 154, 154 }, { 110, 110 }, { 179, 179 },
+ { 176, 176 }, { 180, 180 }, { 168, 168 }, { 140, 140 },
+ { 125, 125 }, { 181, 181 }, { 192, 192 }, { 193, 193 },
+ { 155, 155 }, { 182, 182 }, { 169, 169 }, { 194, 194 },
+ { 126, 126 }, { 141, 141 }, { 195, 195 }, { 183, 183 },
+ { 192, 192 }, { 196, 196 }, { 156, 156 }, { 170, 170 },
+ { 142, 142 }, { 184, 184 }, { 197, 197 }, { 208, 208 },
+ { 198, 198 }, { 209, 209 }, { 171, 171 }, { 157, 157 },
+ { 185, 185 }, { 210, 210 }, { 208, 208 }, { 211, 211 },
+ { 199, 199 }, { 224, 224 }, { 158, 158 }, { 212, 212 },
+ { 224, 224 }, { 186, 186 }, { 200, 200 }, { 172, 172 },
+ { 225, 225 }, { 213, 213 }, { 214, 214 }, { 226, 226 },
+ { 201, 201 }, { 227, 227 }, { 187, 187 }, { 240, 240 },
+ { 215, 215 }, { 173, 173 }, { 228, 228 }, { 241, 241 },
+ { 202, 202 }, { 242, 242 }, { 216, 216 }, { 229, 229 },
+ { 174, 174 }, { 188, 188 }, { 243, 243 }, { 230, 230 },
+ { 203, 203 }, { 217, 217 }, { 231, 231 }, { 244, 244 },
+ { 218, 218 }, { 245, 245 }, { 189, 189 }, { 232, 232 },
+ { 204, 204 }, { 190, 190 }, { 246, 246 }, { 233, 233 },
+ { 247, 247 }, { 219, 219 }, { 205, 205 }, { 248, 248 },
+ { 234, 234 }, { 220, 220 }, { 206, 206 }, { 249, 249 },
+ { 235, 235 }, { 221, 221 }, { 250, 250 }, { 222, 222 },
+ { 236, 236 }, { 237, 237 }, { 251, 251 }, { 238, 238 },
+ { 252, 252 }, { 253, 253 }, { 254, 254 }, { 0, 0 },
+};
+
+const int16_t ff_vp9_row_scan_16x16_nb[256][2] = {
+ { 0, 0 }, { 16, 16 }, { 0, 0 }, { 32, 32 },
+ { 1, 1 }, { 48, 48 }, { 17, 17 }, { 1, 1 },
+ { 64, 64 }, { 2, 2 }, { 33, 33 }, { 80, 80 },
+ { 18, 18 }, { 2, 2 }, { 49, 49 }, { 3, 3 },
+ { 96, 96 }, { 34, 34 }, { 65, 65 }, { 19, 19 },
+ { 3, 3 }, { 112, 112 }, { 50, 50 }, { 4, 4 },
+ { 81, 81 }, { 35, 35 }, { 66, 66 }, { 4, 4 },
+ { 128, 128 }, { 20, 20 }, { 51, 51 }, { 97, 97 },
+ { 82, 82 }, { 5, 5 }, { 36, 36 }, { 144, 144 },
+ { 67, 67 }, { 113, 113 }, { 21, 21 }, { 52, 52 },
+ { 5, 5 }, { 98, 98 }, { 160, 160 }, { 83, 83 },
+ { 37, 37 }, { 6, 6 }, { 68, 68 }, { 129, 129 },
+ { 22, 22 }, { 53, 53 }, { 114, 114 }, { 6, 6 },
+ { 99, 99 }, { 176, 176 }, { 84, 84 }, { 38, 38 },
+ { 7, 7 }, { 69, 69 }, { 145, 145 }, { 130, 130 },
+ { 115, 115 }, { 23, 23 }, { 54, 54 }, { 192, 192 },
+ { 100, 100 }, { 7, 7 }, { 85, 85 }, { 161, 161 },
+ { 39, 39 }, { 70, 70 }, { 8, 8 }, { 146, 146 },
+ { 131, 131 }, { 116, 116 }, { 55, 55 }, { 208, 208 },
+ { 101, 101 }, { 24, 24 }, { 86, 86 }, { 8, 8 },
+ { 132, 132 }, { 40, 40 }, { 71, 71 }, { 177, 177 },
+ { 147, 147 }, { 224, 224 }, { 117, 117 }, { 162, 162 },
+ { 9, 9 }, { 102, 102 }, { 56, 56 }, { 25, 25 },
+ { 87, 87 }, { 148, 148 }, { 9, 9 }, { 133, 133 },
+ { 72, 72 }, { 118, 118 }, { 193, 193 }, { 163, 163 },
+ { 41, 41 }, { 103, 103 }, { 178, 178 }, { 10, 10 },
+ { 57, 57 }, { 149, 149 }, { 134, 134 }, { 88, 88 },
+ { 26, 26 }, { 119, 119 }, { 10, 10 }, { 164, 164 },
+ { 104, 104 }, { 73, 73 }, { 209, 209 }, { 179, 179 },
+ { 42, 42 }, { 11, 11 }, { 194, 194 }, { 135, 135 },
+ { 165, 165 }, { 150, 150 }, { 58, 58 }, { 27, 27 },
+ { 89, 89 }, { 11, 11 }, { 120, 120 }, { 74, 74 },
+ { 43, 43 }, { 225, 225 }, { 105, 105 }, { 12, 12 },
+ { 180, 180 }, { 151, 151 }, { 195, 195 }, { 136, 136 },
+ { 28, 28 }, { 166, 166 }, { 121, 121 }, { 59, 59 },
+ { 12, 12 }, { 210, 210 }, { 90, 90 }, { 106, 106 },
+ { 44, 44 }, { 181, 181 }, { 75, 75 }, { 152, 152 },
+ { 13, 13 }, { 167, 167 }, { 137, 137 }, { 13, 13 },
+ { 60, 60 }, { 196, 196 }, { 122, 122 }, { 29, 29 },
+ { 91, 91 }, { 14, 14 }, { 182, 182 }, { 76, 76 },
+ { 211, 211 }, { 153, 153 }, { 14, 14 }, { 107, 107 },
+ { 138, 138 }, { 45, 45 }, { 226, 226 }, { 168, 168 },
+ { 197, 197 }, { 123, 123 }, { 30, 30 }, { 61, 61 },
+ { 15, 15 }, { 92, 92 }, { 154, 154 }, { 183, 183 },
+ { 169, 169 }, { 108, 108 }, { 212, 212 }, { 77, 77 },
+ { 139, 139 }, { 198, 198 }, { 46, 46 }, { 124, 124 },
+ { 227, 227 }, { 62, 62 }, { 31, 31 }, { 184, 184 },
+ { 93, 93 }, { 170, 170 }, { 155, 155 }, { 185, 185 },
+ { 78, 78 }, { 47, 47 }, { 199, 199 }, { 213, 213 },
+ { 140, 140 }, { 63, 63 }, { 109, 109 }, { 125, 125 },
+ { 94, 94 }, { 200, 200 }, { 171, 171 }, { 156, 156 },
+ { 228, 228 }, { 186, 186 }, { 214, 214 }, { 201, 201 },
+ { 79, 79 }, { 141, 141 }, { 110, 110 }, { 229, 229 },
+ { 95, 95 }, { 126, 126 }, { 215, 215 }, { 172, 172 },
+ { 111, 111 }, { 142, 142 }, { 202, 202 }, { 157, 157 },
+ { 216, 216 }, { 230, 230 }, { 217, 217 }, { 187, 187 },
+ { 127, 127 }, { 231, 231 }, { 158, 158 }, { 173, 173 },
+ { 143, 143 }, { 203, 203 }, { 188, 188 }, { 232, 232 },
+ { 218, 218 }, { 233, 233 }, { 159, 159 }, { 174, 174 },
+ { 204, 204 }, { 189, 189 }, { 234, 234 }, { 219, 219 },
+ { 175, 175 }, { 205, 205 }, { 235, 235 }, { 220, 220 },
+ { 190, 190 }, { 236, 236 }, { 206, 206 }, { 191, 191 },
+ { 221, 221 }, { 207, 207 }, { 237, 237 }, { 222, 222 },
+ { 238, 238 }, { 223, 223 }, { 239, 239 }, { 0, 0 },
+};
+
+const int16_t ff_vp9_default_scan_32x32_nb[1024][2] = {
+ { 0, 0 }, { 0, 0 }, { 1, 1 }, { 32, 1 },
+ { 32, 32 }, { 2, 2 }, { 33, 2 }, { 64, 33 },
+ { 3, 3 }, { 64, 64 }, { 34, 3 }, { 65, 34 },
+ { 4, 4 }, { 35, 4 }, { 96, 65 }, { 66, 35 },
+ { 96, 96 }, { 97, 66 }, { 67, 36 }, { 36, 5 },
+ { 5, 5 }, { 128, 97 }, { 98, 67 }, { 6, 6 },
+ { 128, 128 }, { 68, 37 }, { 37, 6 }, { 129, 98 },
+ { 99, 68 }, { 160, 129 }, { 130, 99 }, { 38, 7 },
+ { 69, 38 }, { 7, 7 }, { 100, 69 }, { 161, 130 },
+ { 131, 100 }, { 160, 160 }, { 70, 39 }, { 39, 8 },
+ { 8, 8 }, { 101, 70 }, { 162, 131 }, { 132, 101 },
+ { 192, 161 }, { 71, 40 }, { 192, 192 }, { 102, 71 },
+ { 40, 9 }, { 163, 132 }, { 9, 9 }, { 193, 162 },
+ { 133, 102 }, { 164, 133 }, { 72, 41 }, { 103, 72 },
+ { 134, 103 }, { 224, 193 }, { 41, 10 }, { 194, 163 },
+ { 10, 10 }, { 224, 224 }, { 165, 134 }, { 225, 194 },
+ { 195, 164 }, { 73, 42 }, { 104, 73 }, { 135, 104 },
+ { 42, 11 }, { 11, 11 }, { 166, 135 }, { 196, 165 },
+ { 226, 195 }, { 256, 225 }, { 74, 43 }, { 105, 74 },
+ { 136, 105 }, { 227, 196 }, { 43, 12 }, { 197, 166 },
+ { 167, 136 }, { 257, 226 }, { 256, 256 }, { 12, 12 },
+ { 228, 197 }, { 75, 44 }, { 106, 75 }, { 198, 167 },
+ { 137, 106 }, { 258, 227 }, { 168, 137 }, { 288, 257 },
+ { 44, 13 }, { 229, 198 }, { 259, 228 }, { 199, 168 },
+ { 107, 76 }, { 13, 13 }, { 169, 138 }, { 138, 107 },
+ { 288, 288 }, { 289, 258 }, { 76, 45 }, { 230, 199 },
+ { 260, 229 }, { 45, 14 }, { 200, 169 }, { 139, 108 },
+ { 290, 259 }, { 108, 77 }, { 231, 200 }, { 320, 289 },
+ { 261, 230 }, { 170, 139 }, { 77, 46 }, { 291, 260 },
+ { 14, 14 }, { 321, 290 }, { 201, 170 }, { 262, 231 },
+ { 320, 320 }, { 171, 140 }, { 292, 261 }, { 232, 201 },
+ { 140, 109 }, { 322, 291 }, { 109, 78 }, { 46, 15 },
+ { 202, 171 }, { 263, 232 }, { 233, 202 }, { 293, 262 },
+ { 352, 321 }, { 323, 292 }, { 15, 15 }, { 78, 47 },
+ { 203, 172 }, { 264, 233 }, { 294, 263 }, { 324, 293 },
+ { 172, 141 }, { 353, 322 }, { 141, 110 }, { 234, 203 },
+ { 352, 352 }, { 47, 16 }, { 295, 264 }, { 110, 79 },
+ { 265, 234 }, { 354, 323 }, { 325, 294 }, { 79, 48 },
+ { 16, 16 }, { 204, 173 }, { 235, 204 }, { 173, 142 },
+ { 355, 324 }, { 384, 353 }, { 326, 295 }, { 142, 111 },
+ { 296, 265 }, { 266, 235 }, { 356, 325 }, { 385, 354 },
+ { 111, 80 }, { 48, 17 }, { 327, 296 }, { 297, 266 },
+ { 205, 174 }, { 384, 384 }, { 236, 205 }, { 357, 326 },
+ { 386, 355 }, { 80, 49 }, { 174, 143 }, { 17, 17 },
+ { 328, 297 }, { 358, 327 }, { 387, 356 }, { 298, 267 },
+ { 329, 298 }, { 388, 357 }, { 112, 81 }, { 416, 385 },
+ { 237, 206 }, { 359, 328 }, { 49, 18 }, { 206, 175 },
+ { 417, 386 }, { 389, 358 }, { 330, 299 }, { 18, 18 },
+ { 416, 416 }, { 360, 329 }, { 81, 50 }, { 418, 387 },
+ { 390, 359 }, { 238, 207 }, { 50, 19 }, { 361, 330 },
+ { 419, 388 }, { 113, 82 }, { 448, 417 }, { 448, 448 },
+ { 420, 389 }, { 82, 51 }, { 362, 331 }, { 449, 418 },
+ { 421, 390 }, { 480, 480 }, { 450, 419 }, { 422, 391 },
+ { 114, 83 }, { 451, 420 }, { 480, 449 }, { 452, 421 },
+ { 481, 450 }, { 453, 422 }, { 512, 512 }, { 482, 451 },
+ { 454, 423 }, { 512, 481 }, { 483, 452 }, { 513, 482 },
+ { 484, 453 }, { 514, 483 }, { 485, 454 }, { 544, 513 },
+ { 544, 544 }, { 486, 455 }, { 545, 514 }, { 546, 515 },
+ { 576, 576 }, { 576, 545 }, { 577, 546 }, { 578, 547 },
+ { 608, 577 }, { 609, 578 }, { 610, 579 }, { 19, 19 },
+ { 143, 112 }, { 267, 236 }, { 391, 360 }, { 515, 484 },
+ { 608, 608 }, { 20, 20 }, { 51, 20 }, { 144, 113 },
+ { 175, 144 }, { 268, 237 }, { 299, 268 }, { 392, 361 },
+ { 423, 392 }, { 516, 485 }, { 547, 516 }, { 640, 609 },
+ { 640, 640 }, { 21, 21 }, { 52, 21 }, { 83, 52 },
+ { 145, 114 }, { 176, 145 }, { 207, 176 }, { 269, 238 },
+ { 300, 269 }, { 331, 300 }, { 393, 362 }, { 424, 393 },
+ { 455, 424 }, { 517, 486 }, { 548, 517 }, { 579, 548 },
+ { 641, 610 }, { 672, 641 }, { 672, 672 }, { 22, 22 },
+ { 53, 22 }, { 84, 53 }, { 115, 84 }, { 146, 115 },
+ { 177, 146 }, { 208, 177 }, { 239, 208 }, { 270, 239 },
+ { 301, 270 }, { 332, 301 }, { 363, 332 }, { 394, 363 },
+ { 425, 394 }, { 456, 425 }, { 487, 456 }, { 518, 487 },
+ { 549, 518 }, { 580, 549 }, { 611, 580 }, { 642, 611 },
+ { 673, 642 }, { 704, 673 }, { 704, 704 }, { 54, 23 },
+ { 85, 54 }, { 116, 85 }, { 178, 147 }, { 209, 178 },
+ { 240, 209 }, { 302, 271 }, { 333, 302 }, { 364, 333 },
+ { 426, 395 }, { 457, 426 }, { 488, 457 }, { 550, 519 },
+ { 581, 550 }, { 612, 581 }, { 674, 643 }, { 705, 674 },
+ { 736, 705 }, { 86, 55 }, { 117, 86 }, { 210, 179 },
+ { 241, 210 }, { 334, 303 }, { 365, 334 }, { 458, 427 },
+ { 489, 458 }, { 582, 551 }, { 613, 582 }, { 706, 675 },
+ { 737, 706 }, { 118, 87 }, { 242, 211 }, { 366, 335 },
+ { 490, 459 }, { 614, 583 }, { 738, 707 }, { 23, 23 },
+ { 147, 116 }, { 271, 240 }, { 395, 364 }, { 519, 488 },
+ { 643, 612 }, { 736, 736 }, { 24, 24 }, { 55, 24 },
+ { 148, 117 }, { 179, 148 }, { 272, 241 }, { 303, 272 },
+ { 396, 365 }, { 427, 396 }, { 520, 489 }, { 551, 520 },
+ { 644, 613 }, { 675, 644 }, { 768, 737 }, { 768, 768 },
+ { 25, 25 }, { 56, 25 }, { 87, 56 }, { 149, 118 },
+ { 180, 149 }, { 211, 180 }, { 273, 242 }, { 304, 273 },
+ { 335, 304 }, { 397, 366 }, { 428, 397 }, { 459, 428 },
+ { 521, 490 }, { 552, 521 }, { 583, 552 }, { 645, 614 },
+ { 676, 645 }, { 707, 676 }, { 769, 738 }, { 800, 769 },
+ { 800, 800 }, { 26, 26 }, { 57, 26 }, { 88, 57 },
+ { 119, 88 }, { 150, 119 }, { 181, 150 }, { 212, 181 },
+ { 243, 212 }, { 274, 243 }, { 305, 274 }, { 336, 305 },
+ { 367, 336 }, { 398, 367 }, { 429, 398 }, { 460, 429 },
+ { 491, 460 }, { 522, 491 }, { 553, 522 }, { 584, 553 },
+ { 615, 584 }, { 646, 615 }, { 677, 646 }, { 708, 677 },
+ { 739, 708 }, { 770, 739 }, { 801, 770 }, { 832, 801 },
+ { 832, 832 }, { 58, 27 }, { 89, 58 }, { 120, 89 },
+ { 182, 151 }, { 213, 182 }, { 244, 213 }, { 306, 275 },
+ { 337, 306 }, { 368, 337 }, { 430, 399 }, { 461, 430 },
+ { 492, 461 }, { 554, 523 }, { 585, 554 }, { 616, 585 },
+ { 678, 647 }, { 709, 678 }, { 740, 709 }, { 802, 771 },
+ { 833, 802 }, { 864, 833 }, { 90, 59 }, { 121, 90 },
+ { 214, 183 }, { 245, 214 }, { 338, 307 }, { 369, 338 },
+ { 462, 431 }, { 493, 462 }, { 586, 555 }, { 617, 586 },
+ { 710, 679 }, { 741, 710 }, { 834, 803 }, { 865, 834 },
+ { 122, 91 }, { 246, 215 }, { 370, 339 }, { 494, 463 },
+ { 618, 587 }, { 742, 711 }, { 866, 835 }, { 27, 27 },
+ { 151, 120 }, { 275, 244 }, { 399, 368 }, { 523, 492 },
+ { 647, 616 }, { 771, 740 }, { 864, 864 }, { 28, 28 },
+ { 59, 28 }, { 152, 121 }, { 183, 152 }, { 276, 245 },
+ { 307, 276 }, { 400, 369 }, { 431, 400 }, { 524, 493 },
+ { 555, 524 }, { 648, 617 }, { 679, 648 }, { 772, 741 },
+ { 803, 772 }, { 896, 865 }, { 896, 896 }, { 29, 29 },
+ { 60, 29 }, { 91, 60 }, { 153, 122 }, { 184, 153 },
+ { 215, 184 }, { 277, 246 }, { 308, 277 }, { 339, 308 },
+ { 401, 370 }, { 432, 401 }, { 463, 432 }, { 525, 494 },
+ { 556, 525 }, { 587, 556 }, { 649, 618 }, { 680, 649 },
+ { 711, 680 }, { 773, 742 }, { 804, 773 }, { 835, 804 },
+ { 897, 866 }, { 928, 897 }, { 928, 928 }, { 30, 30 },
+ { 61, 30 }, { 92, 61 }, { 123, 92 }, { 154, 123 },
+ { 185, 154 }, { 216, 185 }, { 247, 216 }, { 278, 247 },
+ { 309, 278 }, { 340, 309 }, { 371, 340 }, { 402, 371 },
+ { 433, 402 }, { 464, 433 }, { 495, 464 }, { 526, 495 },
+ { 557, 526 }, { 588, 557 }, { 619, 588 }, { 650, 619 },
+ { 681, 650 }, { 712, 681 }, { 743, 712 }, { 774, 743 },
+ { 805, 774 }, { 836, 805 }, { 867, 836 }, { 898, 867 },
+ { 929, 898 }, { 960, 929 }, { 960, 960 }, { 62, 31 },
+ { 93, 62 }, { 124, 93 }, { 186, 155 }, { 217, 186 },
+ { 248, 217 }, { 310, 279 }, { 341, 310 }, { 372, 341 },
+ { 434, 403 }, { 465, 434 }, { 496, 465 }, { 558, 527 },
+ { 589, 558 }, { 620, 589 }, { 682, 651 }, { 713, 682 },
+ { 744, 713 }, { 806, 775 }, { 837, 806 }, { 868, 837 },
+ { 930, 899 }, { 961, 930 }, { 992, 961 }, { 94, 63 },
+ { 125, 94 }, { 218, 187 }, { 249, 218 }, { 342, 311 },
+ { 373, 342 }, { 466, 435 }, { 497, 466 }, { 590, 559 },
+ { 621, 590 }, { 714, 683 }, { 745, 714 }, { 838, 807 },
+ { 869, 838 }, { 962, 931 }, { 993, 962 }, { 126, 95 },
+ { 250, 219 }, { 374, 343 }, { 498, 467 }, { 622, 591 },
+ { 746, 715 }, { 870, 839 }, { 994, 963 }, { 155, 124 },
+ { 279, 248 }, { 403, 372 }, { 527, 496 }, { 651, 620 },
+ { 775, 744 }, { 899, 868 }, { 156, 125 }, { 187, 156 },
+ { 280, 249 }, { 311, 280 }, { 404, 373 }, { 435, 404 },
+ { 528, 497 }, { 559, 528 }, { 652, 621 }, { 683, 652 },
+ { 776, 745 }, { 807, 776 }, { 900, 869 }, { 931, 900 },
+ { 157, 126 }, { 188, 157 }, { 219, 188 }, { 281, 250 },
+ { 312, 281 }, { 343, 312 }, { 405, 374 }, { 436, 405 },
+ { 467, 436 }, { 529, 498 }, { 560, 529 }, { 591, 560 },
+ { 653, 622 }, { 684, 653 }, { 715, 684 }, { 777, 746 },
+ { 808, 777 }, { 839, 808 }, { 901, 870 }, { 932, 901 },
+ { 963, 932 }, { 158, 127 }, { 189, 158 }, { 220, 189 },
+ { 251, 220 }, { 282, 251 }, { 313, 282 }, { 344, 313 },
+ { 375, 344 }, { 406, 375 }, { 437, 406 }, { 468, 437 },
+ { 499, 468 }, { 530, 499 }, { 561, 530 }, { 592, 561 },
+ { 623, 592 }, { 654, 623 }, { 685, 654 }, { 716, 685 },
+ { 747, 716 }, { 778, 747 }, { 809, 778 }, { 840, 809 },
+ { 871, 840 }, { 902, 871 }, { 933, 902 }, { 964, 933 },
+ { 995, 964 }, { 190, 159 }, { 221, 190 }, { 252, 221 },
+ { 314, 283 }, { 345, 314 }, { 376, 345 }, { 438, 407 },
+ { 469, 438 }, { 500, 469 }, { 562, 531 }, { 593, 562 },
+ { 624, 593 }, { 686, 655 }, { 717, 686 }, { 748, 717 },
+ { 810, 779 }, { 841, 810 }, { 872, 841 }, { 934, 903 },
+ { 965, 934 }, { 996, 965 }, { 222, 191 }, { 253, 222 },
+ { 346, 315 }, { 377, 346 }, { 470, 439 }, { 501, 470 },
+ { 594, 563 }, { 625, 594 }, { 718, 687 }, { 749, 718 },
+ { 842, 811 }, { 873, 842 }, { 966, 935 }, { 997, 966 },
+ { 254, 223 }, { 378, 347 }, { 502, 471 }, { 626, 595 },
+ { 750, 719 }, { 874, 843 }, { 998, 967 }, { 283, 252 },
+ { 407, 376 }, { 531, 500 }, { 655, 624 }, { 779, 748 },
+ { 903, 872 }, { 284, 253 }, { 315, 284 }, { 408, 377 },
+ { 439, 408 }, { 532, 501 }, { 563, 532 }, { 656, 625 },
+ { 687, 656 }, { 780, 749 }, { 811, 780 }, { 904, 873 },
+ { 935, 904 }, { 285, 254 }, { 316, 285 }, { 347, 316 },
+ { 409, 378 }, { 440, 409 }, { 471, 440 }, { 533, 502 },
+ { 564, 533 }, { 595, 564 }, { 657, 626 }, { 688, 657 },
+ { 719, 688 }, { 781, 750 }, { 812, 781 }, { 843, 812 },
+ { 905, 874 }, { 936, 905 }, { 967, 936 }, { 286, 255 },
+ { 317, 286 }, { 348, 317 }, { 379, 348 }, { 410, 379 },
+ { 441, 410 }, { 472, 441 }, { 503, 472 }, { 534, 503 },
+ { 565, 534 }, { 596, 565 }, { 627, 596 }, { 658, 627 },
+ { 689, 658 }, { 720, 689 }, { 751, 720 }, { 782, 751 },
+ { 813, 782 }, { 844, 813 }, { 875, 844 }, { 906, 875 },
+ { 937, 906 }, { 968, 937 }, { 999, 968 }, { 318, 287 },
+ { 349, 318 }, { 380, 349 }, { 442, 411 }, { 473, 442 },
+ { 504, 473 }, { 566, 535 }, { 597, 566 }, { 628, 597 },
+ { 690, 659 }, { 721, 690 }, { 752, 721 }, { 814, 783 },
+ { 845, 814 }, { 876, 845 }, { 938, 907 }, { 969, 938 },
+ { 1000, 969 }, { 350, 319 }, { 381, 350 }, { 474, 443 },
+ { 505, 474 }, { 598, 567 }, { 629, 598 }, { 722, 691 },
+ { 753, 722 }, { 846, 815 }, { 877, 846 }, { 970, 939 },
+ { 1001, 970 }, { 382, 351 }, { 506, 475 }, { 630, 599 },
+ { 754, 723 }, { 878, 847 }, { 1002, 971 }, { 411, 380 },
+ { 535, 504 }, { 659, 628 }, { 783, 752 }, { 907, 876 },
+ { 412, 381 }, { 443, 412 }, { 536, 505 }, { 567, 536 },
+ { 660, 629 }, { 691, 660 }, { 784, 753 }, { 815, 784 },
+ { 908, 877 }, { 939, 908 }, { 413, 382 }, { 444, 413 },
+ { 475, 444 }, { 537, 506 }, { 568, 537 }, { 599, 568 },
+ { 661, 630 }, { 692, 661 }, { 723, 692 }, { 785, 754 },
+ { 816, 785 }, { 847, 816 }, { 909, 878 }, { 940, 909 },
+ { 971, 940 }, { 414, 383 }, { 445, 414 }, { 476, 445 },
+ { 507, 476 }, { 538, 507 }, { 569, 538 }, { 600, 569 },
+ { 631, 600 }, { 662, 631 }, { 693, 662 }, { 724, 693 },
+ { 755, 724 }, { 786, 755 }, { 817, 786 }, { 848, 817 },
+ { 879, 848 }, { 910, 879 }, { 941, 910 }, { 972, 941 },
+ { 1003, 972 }, { 446, 415 }, { 477, 446 }, { 508, 477 },
+ { 570, 539 }, { 601, 570 }, { 632, 601 }, { 694, 663 },
+ { 725, 694 }, { 756, 725 }, { 818, 787 }, { 849, 818 },
+ { 880, 849 }, { 942, 911 }, { 973, 942 }, { 1004, 973 },
+ { 478, 447 }, { 509, 478 }, { 602, 571 }, { 633, 602 },
+ { 726, 695 }, { 757, 726 }, { 850, 819 }, { 881, 850 },
+ { 974, 943 }, { 1005, 974 }, { 510, 479 }, { 634, 603 },
+ { 758, 727 }, { 882, 851 }, { 1006, 975 }, { 539, 508 },
+ { 663, 632 }, { 787, 756 }, { 911, 880 }, { 540, 509 },
+ { 571, 540 }, { 664, 633 }, { 695, 664 }, { 788, 757 },
+ { 819, 788 }, { 912, 881 }, { 943, 912 }, { 541, 510 },
+ { 572, 541 }, { 603, 572 }, { 665, 634 }, { 696, 665 },
+ { 727, 696 }, { 789, 758 }, { 820, 789 }, { 851, 820 },
+ { 913, 882 }, { 944, 913 }, { 975, 944 }, { 542, 511 },
+ { 573, 542 }, { 604, 573 }, { 635, 604 }, { 666, 635 },
+ { 697, 666 }, { 728, 697 }, { 759, 728 }, { 790, 759 },
+ { 821, 790 }, { 852, 821 }, { 883, 852 }, { 914, 883 },
+ { 945, 914 }, { 976, 945 }, { 1007, 976 }, { 574, 543 },
+ { 605, 574 }, { 636, 605 }, { 698, 667 }, { 729, 698 },
+ { 760, 729 }, { 822, 791 }, { 853, 822 }, { 884, 853 },
+ { 946, 915 }, { 977, 946 }, { 1008, 977 }, { 606, 575 },
+ { 637, 606 }, { 730, 699 }, { 761, 730 }, { 854, 823 },
+ { 885, 854 }, { 978, 947 }, { 1009, 978 }, { 638, 607 },
+ { 762, 731 }, { 886, 855 }, { 1010, 979 }, { 667, 636 },
+ { 791, 760 }, { 915, 884 }, { 668, 637 }, { 699, 668 },
+ { 792, 761 }, { 823, 792 }, { 916, 885 }, { 947, 916 },
+ { 669, 638 }, { 700, 669 }, { 731, 700 }, { 793, 762 },
+ { 824, 793 }, { 855, 824 }, { 917, 886 }, { 948, 917 },
+ { 979, 948 }, { 670, 639 }, { 701, 670 }, { 732, 701 },
+ { 763, 732 }, { 794, 763 }, { 825, 794 }, { 856, 825 },
+ { 887, 856 }, { 918, 887 }, { 949, 918 }, { 980, 949 },
+ { 1011, 980 }, { 702, 671 }, { 733, 702 }, { 764, 733 },
+ { 826, 795 }, { 857, 826 }, { 888, 857 }, { 950, 919 },
+ { 981, 950 }, { 1012, 981 }, { 734, 703 }, { 765, 734 },
+ { 858, 827 }, { 889, 858 }, { 982, 951 }, { 1013, 982 },
+ { 766, 735 }, { 890, 859 }, { 1014, 983 }, { 795, 764 },
+ { 919, 888 }, { 796, 765 }, { 827, 796 }, { 920, 889 },
+ { 951, 920 }, { 797, 766 }, { 828, 797 }, { 859, 828 },
+ { 921, 890 }, { 952, 921 }, { 983, 952 }, { 798, 767 },
+ { 829, 798 }, { 860, 829 }, { 891, 860 }, { 922, 891 },
+ { 953, 922 }, { 984, 953 }, { 1015, 984 }, { 830, 799 },
+ { 861, 830 }, { 892, 861 }, { 954, 923 }, { 985, 954 },
+ { 1016, 985 }, { 862, 831 }, { 893, 862 }, { 986, 955 },
+ { 1017, 986 }, { 894, 863 }, { 1018, 987 }, { 923, 892 },
+ { 924, 893 }, { 955, 924 }, { 925, 894 }, { 956, 925 },
+ { 987, 956 }, { 926, 895 }, { 957, 926 }, { 988, 957 },
+ { 1019, 988 }, { 958, 927 }, { 989, 958 }, { 1020, 989 },
+ { 990, 959 }, { 1021, 990 }, { 1022, 991 }, { 0, 0 },
+};
+
+const int16_t (*ff_vp9_scans_nb[5][4])[2] = {
+ {
+ ff_vp9_default_scan_4x4_nb, ff_vp9_col_scan_4x4_nb,
+ ff_vp9_row_scan_4x4_nb, ff_vp9_default_scan_4x4_nb
+ }, {
+ ff_vp9_default_scan_8x8_nb, ff_vp9_col_scan_8x8_nb,
+ ff_vp9_row_scan_8x8_nb, ff_vp9_default_scan_8x8_nb
+ }, {
+ ff_vp9_default_scan_16x16_nb, ff_vp9_col_scan_16x16_nb,
+ ff_vp9_row_scan_16x16_nb, ff_vp9_default_scan_16x16_nb
+ }, {
+ ff_vp9_default_scan_32x32_nb, ff_vp9_default_scan_32x32_nb,
+ ff_vp9_default_scan_32x32_nb, ff_vp9_default_scan_32x32_nb
+ }, { // lossless
+ ff_vp9_default_scan_4x4_nb, ff_vp9_default_scan_4x4_nb,
+ ff_vp9_default_scan_4x4_nb, ff_vp9_default_scan_4x4_nb
+ }
+};
+
+const uint8_t ff_vp9_model_pareto8[256][8] = {
+ { 6, 86, 128, 11, 87, 42, 91, 52 },
+ { 3, 86, 128, 6, 86, 23, 88, 29 },
+ { 6, 86, 128, 11, 87, 42, 91, 52 },
+ { 9, 86, 129, 17, 88, 61, 94, 76 },
+ { 12, 86, 129, 22, 88, 77, 97, 93 },
+ { 15, 87, 129, 28, 89, 93, 100, 110 },
+ { 17, 87, 129, 33, 90, 105, 103, 123 },
+ { 20, 88, 130, 38, 91, 118, 106, 136 },
+ { 23, 88, 130, 43, 91, 128, 108, 146 },
+ { 26, 89, 131, 48, 92, 139, 111, 156 },
+ { 28, 89, 131, 53, 93, 147, 114, 163 },
+ { 31, 90, 131, 58, 94, 156, 117, 171 },
+ { 34, 90, 131, 62, 94, 163, 119, 177 },
+ { 37, 90, 132, 66, 95, 171, 122, 184 },
+ { 39, 90, 132, 70, 96, 177, 124, 189 },
+ { 42, 91, 132, 75, 97, 183, 127, 194 },
+ { 44, 91, 132, 79, 97, 188, 129, 198 },
+ { 47, 92, 133, 83, 98, 193, 132, 202 },
+ { 49, 92, 133, 86, 99, 197, 134, 205 },
+ { 52, 93, 133, 90, 100, 201, 137, 208 },
+ { 54, 93, 133, 94, 100, 204, 139, 211 },
+ { 57, 94, 134, 98, 101, 208, 142, 214 },
+ { 59, 94, 134, 101, 102, 211, 144, 216 },
+ { 62, 94, 135, 105, 103, 214, 146, 218 },
+ { 64, 94, 135, 108, 103, 216, 148, 220 },
+ { 66, 95, 135, 111, 104, 219, 151, 222 },
+ { 68, 95, 135, 114, 105, 221, 153, 223 },
+ { 71, 96, 136, 117, 106, 224, 155, 225 },
+ { 73, 96, 136, 120, 106, 225, 157, 226 },
+ { 76, 97, 136, 123, 107, 227, 159, 228 },
+ { 78, 97, 136, 126, 108, 229, 160, 229 },
+ { 80, 98, 137, 129, 109, 231, 162, 231 },
+ { 82, 98, 137, 131, 109, 232, 164, 232 },
+ { 84, 98, 138, 134, 110, 234, 166, 233 },
+ { 86, 98, 138, 137, 111, 235, 168, 234 },
+ { 89, 99, 138, 140, 112, 236, 170, 235 },
+ { 91, 99, 138, 142, 112, 237, 171, 235 },
+ { 93, 100, 139, 145, 113, 238, 173, 236 },
+ { 95, 100, 139, 147, 114, 239, 174, 237 },
+ { 97, 101, 140, 149, 115, 240, 176, 238 },
+ { 99, 101, 140, 151, 115, 241, 177, 238 },
+ { 101, 102, 140, 154, 116, 242, 179, 239 },
+ { 103, 102, 140, 156, 117, 242, 180, 239 },
+ { 105, 103, 141, 158, 118, 243, 182, 240 },
+ { 107, 103, 141, 160, 118, 243, 183, 240 },
+ { 109, 104, 141, 162, 119, 244, 185, 241 },
+ { 111, 104, 141, 164, 119, 244, 186, 241 },
+ { 113, 104, 142, 166, 120, 245, 187, 242 },
+ { 114, 104, 142, 168, 121, 245, 188, 242 },
+ { 116, 105, 143, 170, 122, 246, 190, 243 },
+ { 118, 105, 143, 171, 122, 246, 191, 243 },
+ { 120, 106, 143, 173, 123, 247, 192, 244 },
+ { 121, 106, 143, 175, 124, 247, 193, 244 },
+ { 123, 107, 144, 177, 125, 248, 195, 244 },
+ { 125, 107, 144, 178, 125, 248, 196, 244 },
+ { 127, 108, 145, 180, 126, 249, 197, 245 },
+ { 128, 108, 145, 181, 127, 249, 198, 245 },
+ { 130, 109, 145, 183, 128, 249, 199, 245 },
+ { 132, 109, 145, 184, 128, 249, 200, 245 },
+ { 134, 110, 146, 186, 129, 250, 201, 246 },
+ { 135, 110, 146, 187, 130, 250, 202, 246 },
+ { 137, 111, 147, 189, 131, 251, 203, 246 },
+ { 138, 111, 147, 190, 131, 251, 204, 246 },
+ { 140, 112, 147, 192, 132, 251, 205, 247 },
+ { 141, 112, 147, 193, 132, 251, 206, 247 },
+ { 143, 113, 148, 194, 133, 251, 207, 247 },
+ { 144, 113, 148, 195, 134, 251, 207, 247 },
+ { 146, 114, 149, 197, 135, 252, 208, 248 },
+ { 147, 114, 149, 198, 135, 252, 209, 248 },
+ { 149, 115, 149, 199, 136, 252, 210, 248 },
+ { 150, 115, 149, 200, 137, 252, 210, 248 },
+ { 152, 115, 150, 201, 138, 252, 211, 248 },
+ { 153, 115, 150, 202, 138, 252, 212, 248 },
+ { 155, 116, 151, 204, 139, 253, 213, 249 },
+ { 156, 116, 151, 205, 139, 253, 213, 249 },
+ { 158, 117, 151, 206, 140, 253, 214, 249 },
+ { 159, 117, 151, 207, 141, 253, 215, 249 },
+ { 161, 118, 152, 208, 142, 253, 216, 249 },
+ { 162, 118, 152, 209, 142, 253, 216, 249 },
+ { 163, 119, 153, 210, 143, 253, 217, 249 },
+ { 164, 119, 153, 211, 143, 253, 217, 249 },
+ { 166, 120, 153, 212, 144, 254, 218, 250 },
+ { 167, 120, 153, 212, 145, 254, 219, 250 },
+ { 168, 121, 154, 213, 146, 254, 220, 250 },
+ { 169, 121, 154, 214, 146, 254, 220, 250 },
+ { 171, 122, 155, 215, 147, 254, 221, 250 },
+ { 172, 122, 155, 216, 147, 254, 221, 250 },
+ { 173, 123, 155, 217, 148, 254, 222, 250 },
+ { 174, 123, 155, 217, 149, 254, 222, 250 },
+ { 176, 124, 156, 218, 150, 254, 223, 250 },
+ { 177, 124, 156, 219, 150, 254, 223, 250 },
+ { 178, 125, 157, 220, 151, 254, 224, 251 },
+ { 179, 125, 157, 220, 151, 254, 224, 251 },
+ { 180, 126, 157, 221, 152, 254, 225, 251 },
+ { 181, 126, 157, 221, 152, 254, 225, 251 },
+ { 183, 127, 158, 222, 153, 254, 226, 251 },
+ { 184, 127, 158, 223, 154, 254, 226, 251 },
+ { 185, 128, 159, 224, 155, 255, 227, 251 },
+ { 186, 128, 159, 224, 155, 255, 227, 251 },
+ { 187, 129, 160, 225, 156, 255, 228, 251 },
+ { 188, 130, 160, 225, 156, 255, 228, 251 },
+ { 189, 131, 160, 226, 157, 255, 228, 251 },
+ { 190, 131, 160, 226, 158, 255, 228, 251 },
+ { 191, 132, 161, 227, 159, 255, 229, 251 },
+ { 192, 132, 161, 227, 159, 255, 229, 251 },
+ { 193, 133, 162, 228, 160, 255, 230, 252 },
+ { 194, 133, 162, 229, 160, 255, 230, 252 },
+ { 195, 134, 163, 230, 161, 255, 231, 252 },
+ { 196, 134, 163, 230, 161, 255, 231, 252 },
+ { 197, 135, 163, 231, 162, 255, 231, 252 },
+ { 198, 135, 163, 231, 162, 255, 231, 252 },
+ { 199, 136, 164, 232, 163, 255, 232, 252 },
+ { 200, 136, 164, 232, 164, 255, 232, 252 },
+ { 201, 137, 165, 233, 165, 255, 233, 252 },
+ { 201, 137, 165, 233, 165, 255, 233, 252 },
+ { 202, 138, 166, 233, 166, 255, 233, 252 },
+ { 203, 138, 166, 233, 166, 255, 233, 252 },
+ { 204, 139, 166, 234, 167, 255, 234, 252 },
+ { 205, 139, 166, 234, 167, 255, 234, 252 },
+ { 206, 140, 167, 235, 168, 255, 235, 252 },
+ { 206, 140, 167, 235, 168, 255, 235, 252 },
+ { 207, 141, 168, 236, 169, 255, 235, 252 },
+ { 208, 141, 168, 236, 170, 255, 235, 252 },
+ { 209, 142, 169, 237, 171, 255, 236, 252 },
+ { 209, 143, 169, 237, 171, 255, 236, 252 },
+ { 210, 144, 169, 237, 172, 255, 236, 252 },
+ { 211, 144, 169, 237, 172, 255, 236, 252 },
+ { 212, 145, 170, 238, 173, 255, 237, 252 },
+ { 213, 145, 170, 238, 173, 255, 237, 252 },
+ { 214, 146, 171, 239, 174, 255, 237, 253 },
+ { 214, 146, 171, 239, 174, 255, 237, 253 },
+ { 215, 147, 172, 240, 175, 255, 238, 253 },
+ { 215, 147, 172, 240, 175, 255, 238, 253 },
+ { 216, 148, 173, 240, 176, 255, 238, 253 },
+ { 217, 148, 173, 240, 176, 255, 238, 253 },
+ { 218, 149, 173, 241, 177, 255, 239, 253 },
+ { 218, 149, 173, 241, 178, 255, 239, 253 },
+ { 219, 150, 174, 241, 179, 255, 239, 253 },
+ { 219, 151, 174, 241, 179, 255, 239, 253 },
+ { 220, 152, 175, 242, 180, 255, 240, 253 },
+ { 221, 152, 175, 242, 180, 255, 240, 253 },
+ { 222, 153, 176, 242, 181, 255, 240, 253 },
+ { 222, 153, 176, 242, 181, 255, 240, 253 },
+ { 223, 154, 177, 243, 182, 255, 240, 253 },
+ { 223, 154, 177, 243, 182, 255, 240, 253 },
+ { 224, 155, 178, 244, 183, 255, 241, 253 },
+ { 224, 155, 178, 244, 183, 255, 241, 253 },
+ { 225, 156, 178, 244, 184, 255, 241, 253 },
+ { 225, 157, 178, 244, 184, 255, 241, 253 },
+ { 226, 158, 179, 244, 185, 255, 242, 253 },
+ { 227, 158, 179, 244, 185, 255, 242, 253 },
+ { 228, 159, 180, 245, 186, 255, 242, 253 },
+ { 228, 159, 180, 245, 186, 255, 242, 253 },
+ { 229, 160, 181, 245, 187, 255, 242, 253 },
+ { 229, 160, 181, 245, 187, 255, 242, 253 },
+ { 230, 161, 182, 246, 188, 255, 243, 253 },
+ { 230, 162, 182, 246, 188, 255, 243, 253 },
+ { 231, 163, 183, 246, 189, 255, 243, 253 },
+ { 231, 163, 183, 246, 189, 255, 243, 253 },
+ { 232, 164, 184, 247, 190, 255, 243, 253 },
+ { 232, 164, 184, 247, 190, 255, 243, 253 },
+ { 233, 165, 185, 247, 191, 255, 244, 253 },
+ { 233, 165, 185, 247, 191, 255, 244, 253 },
+ { 234, 166, 185, 247, 192, 255, 244, 253 },
+ { 234, 167, 185, 247, 192, 255, 244, 253 },
+ { 235, 168, 186, 248, 193, 255, 244, 253 },
+ { 235, 168, 186, 248, 193, 255, 244, 253 },
+ { 236, 169, 187, 248, 194, 255, 244, 253 },
+ { 236, 169, 187, 248, 194, 255, 244, 253 },
+ { 236, 170, 188, 248, 195, 255, 245, 253 },
+ { 236, 170, 188, 248, 195, 255, 245, 253 },
+ { 237, 171, 189, 249, 196, 255, 245, 254 },
+ { 237, 172, 189, 249, 196, 255, 245, 254 },
+ { 238, 173, 190, 249, 197, 255, 245, 254 },
+ { 238, 173, 190, 249, 197, 255, 245, 254 },
+ { 239, 174, 191, 249, 198, 255, 245, 254 },
+ { 239, 174, 191, 249, 198, 255, 245, 254 },
+ { 240, 175, 192, 249, 199, 255, 246, 254 },
+ { 240, 176, 192, 249, 199, 255, 246, 254 },
+ { 240, 177, 193, 250, 200, 255, 246, 254 },
+ { 240, 177, 193, 250, 200, 255, 246, 254 },
+ { 241, 178, 194, 250, 201, 255, 246, 254 },
+ { 241, 178, 194, 250, 201, 255, 246, 254 },
+ { 242, 179, 195, 250, 202, 255, 246, 254 },
+ { 242, 180, 195, 250, 202, 255, 246, 254 },
+ { 242, 181, 196, 250, 203, 255, 247, 254 },
+ { 242, 181, 196, 250, 203, 255, 247, 254 },
+ { 243, 182, 197, 251, 204, 255, 247, 254 },
+ { 243, 183, 197, 251, 204, 255, 247, 254 },
+ { 244, 184, 198, 251, 205, 255, 247, 254 },
+ { 244, 184, 198, 251, 205, 255, 247, 254 },
+ { 244, 185, 199, 251, 206, 255, 247, 254 },
+ { 244, 185, 199, 251, 206, 255, 247, 254 },
+ { 245, 186, 200, 251, 207, 255, 247, 254 },
+ { 245, 187, 200, 251, 207, 255, 247, 254 },
+ { 246, 188, 201, 252, 207, 255, 248, 254 },
+ { 246, 188, 201, 252, 207, 255, 248, 254 },
+ { 246, 189, 202, 252, 208, 255, 248, 254 },
+ { 246, 190, 202, 252, 208, 255, 248, 254 },
+ { 247, 191, 203, 252, 209, 255, 248, 254 },
+ { 247, 191, 203, 252, 209, 255, 248, 254 },
+ { 247, 192, 204, 252, 210, 255, 248, 254 },
+ { 247, 193, 204, 252, 210, 255, 248, 254 },
+ { 248, 194, 205, 252, 211, 255, 248, 254 },
+ { 248, 194, 205, 252, 211, 255, 248, 254 },
+ { 248, 195, 206, 252, 212, 255, 249, 254 },
+ { 248, 196, 206, 252, 212, 255, 249, 254 },
+ { 249, 197, 207, 253, 213, 255, 249, 254 },
+ { 249, 197, 207, 253, 213, 255, 249, 254 },
+ { 249, 198, 208, 253, 214, 255, 249, 254 },
+ { 249, 199, 209, 253, 214, 255, 249, 254 },
+ { 250, 200, 210, 253, 215, 255, 249, 254 },
+ { 250, 200, 210, 253, 215, 255, 249, 254 },
+ { 250, 201, 211, 253, 215, 255, 249, 254 },
+ { 250, 202, 211, 253, 215, 255, 249, 254 },
+ { 250, 203, 212, 253, 216, 255, 249, 254 },
+ { 250, 203, 212, 253, 216, 255, 249, 254 },
+ { 251, 204, 213, 253, 217, 255, 250, 254 },
+ { 251, 205, 213, 253, 217, 255, 250, 254 },
+ { 251, 206, 214, 254, 218, 255, 250, 254 },
+ { 251, 206, 215, 254, 218, 255, 250, 254 },
+ { 252, 207, 216, 254, 219, 255, 250, 254 },
+ { 252, 208, 216, 254, 219, 255, 250, 254 },
+ { 252, 209, 217, 254, 220, 255, 250, 254 },
+ { 252, 210, 217, 254, 220, 255, 250, 254 },
+ { 252, 211, 218, 254, 221, 255, 250, 254 },
+ { 252, 212, 218, 254, 221, 255, 250, 254 },
+ { 253, 213, 219, 254, 222, 255, 250, 254 },
+ { 253, 213, 220, 254, 222, 255, 250, 254 },
+ { 253, 214, 221, 254, 223, 255, 250, 254 },
+ { 253, 215, 221, 254, 223, 255, 250, 254 },
+ { 253, 216, 222, 254, 224, 255, 251, 254 },
+ { 253, 217, 223, 254, 224, 255, 251, 254 },
+ { 253, 218, 224, 254, 225, 255, 251, 254 },
+ { 253, 219, 224, 254, 225, 255, 251, 254 },
+ { 254, 220, 225, 254, 225, 255, 251, 254 },
+ { 254, 221, 226, 254, 225, 255, 251, 254 },
+ { 254, 222, 227, 255, 226, 255, 251, 254 },
+ { 254, 223, 227, 255, 226, 255, 251, 254 },
+ { 254, 224, 228, 255, 227, 255, 251, 254 },
+ { 254, 225, 229, 255, 227, 255, 251, 254 },
+ { 254, 226, 230, 255, 228, 255, 251, 254 },
+ { 254, 227, 230, 255, 229, 255, 251, 254 },
+ { 255, 228, 231, 255, 230, 255, 251, 254 },
+ { 255, 229, 232, 255, 230, 255, 251, 254 },
+ { 255, 230, 233, 255, 231, 255, 252, 254 },
+ { 255, 231, 234, 255, 231, 255, 252, 254 },
+ { 255, 232, 235, 255, 232, 255, 252, 254 },
+ { 255, 233, 236, 255, 232, 255, 252, 254 },
+ { 255, 235, 237, 255, 233, 255, 252, 254 },
+ { 255, 236, 238, 255, 234, 255, 252, 254 },
+ { 255, 238, 240, 255, 235, 255, 252, 255 },
+ { 255, 239, 241, 255, 235, 255, 252, 254 },
+ { 255, 241, 243, 255, 236, 255, 252, 254 },
+ { 255, 243, 245, 255, 237, 255, 252, 254 },
+ { 255, 246, 247, 255, 239, 255, 253, 255 },
+};
+
+const ProbContext ff_vp9_default_probs = {
+ { /* y_mode */
+ { 65, 32, 18, 144, 162, 194, 41, 51, 98 } /* bsize < 8x8 */,
+ { 132, 68, 18, 165, 217, 196, 45, 40, 78 } /* bsize < 16x16 */,
+ { 173, 80, 19, 176, 240, 193, 64, 35, 46 } /* bsize < 32x32 */,
+ { 221, 135, 38, 194, 248, 121, 96, 85, 29 } /* bsize >= 32x32 */
+ }, { /* uv_mode */
+ { 48, 12, 154, 155, 139, 90, 34, 117, 119 } /* y = v */,
+ { 67, 6, 25, 204, 243, 158, 13, 21, 96 } /* y = h */,
+ { 120, 7, 76, 176, 208, 126, 28, 54, 103 } /* y = dc */,
+ { 97, 5, 44, 131, 176, 139, 48, 68, 97 } /* y = d45 */,
+ { 83, 5, 42, 156, 111, 152, 26, 49, 152 } /* y = d135 */,
+ { 80, 5, 58, 178, 74, 83, 33, 62, 145 } /* y = d117 */,
+ { 86, 5, 32, 154, 192, 168, 14, 22, 163 } /* y = d153 */,
+ { 77, 7, 64, 116, 132, 122, 37, 126, 120 } /* y = d63 */,
+ { 85, 5, 32, 156, 216, 148, 19, 29, 73 } /* y = d27 */,
+ { 101, 21, 107, 181, 192, 103, 19, 67, 125 } /* y = tm */
+ }, { /* filter */
+ { 235, 162, },
+ { 36, 255, },
+ { 34, 3, },
+ { 149, 144, },
+ }, { /* mv_mode */
+ { 2, 173, 34 }, // 0 = both zero mv
+ { 7, 145, 85 }, // 1 = one zero mv + one a predicted mv
+ { 7, 166, 63 }, // 2 = two predicted mvs
+ { 7, 94, 66 }, // 3 = one predicted/zero and one new mv
+ { 8, 64, 46 }, // 4 = two new mvs
+ { 17, 81, 31 }, // 5 = one intra neighbor + x
+ { 25, 29, 30 }, // 6 = two intra neighbors
+ }, { /* intra */
+ 9, 102, 187, 225
+ }, { /* comp */
+ 239, 183, 119, 96, 41
+ }, { /* single_ref */
+ { 33, 16 },
+ { 77, 74 },
+ { 142, 142 },
+ { 172, 170 },
+ { 238, 247 }
+ }, { /* comp_ref */
+ 50, 126, 123, 221, 226
+ }, { /* tx32p */
+ { 3, 136, 37, },
+ { 5, 52, 13, },
+ }, { /* tx16p */
+ { 20, 152, },
+ { 15, 101, },
+ }, { /* tx8p */
+ 100, 66
+ }, { /* skip */
+ 192, 128, 64
+ }, { /* mv_joint */
+ 32, 64, 96
+ }, {
+ { /* mv vertical component */
+ 128, /* sign */
+ { 224, 144, 192, 168, 192, 176, 192, 198, 198, 245 }, /* class */
+ 216, /* class0 */
+ { 136, 140, 148, 160, 176, 192, 224, 234, 234, 240 }, /* bits */
+ { /* class0_fp */
+ { 128, 128, 64 },
+ { 96, 112, 64 }
+ },
+ { 64, 96, 64 }, /* fp */
+ 160, /* class0_hp bit */
+ 128, /* hp */
+ }, { /* mv horizontal component */
+ 128, /* sign */
+ { 216, 128, 176, 160, 176, 176, 192, 198, 198, 208 }, /* class */
+ 208, /* class0 */
+ { 136, 140, 148, 160, 176, 192, 224, 234, 234, 240 }, /* bits */
+ { /* class0_fp */
+ { 128, 128, 64 },
+ { 96, 112, 64 }
+ },
+ { 64, 96, 64 }, /* fp */
+ 160, /* class0_hp bit */
+ 128, /* hp */
+ }
+ }, { /* partition */
+ { /* 64x64 -> 32x32 */
+ { 222, 34, 30 } /* a/l both not split */,
+ { 72, 16, 44 } /* a split, l not split */,
+ { 58, 32, 12 } /* l split, a not split */,
+ { 10, 7, 6 } /* a/l both split */,
+ }, { /* 32x32 -> 16x16 */
+ { 177, 58, 59 } /* a/l both not split */,
+ { 68, 26, 63 } /* a split, l not split */,
+ { 52, 79, 25 } /* l split, a not split */,
+ { 17, 14, 12 } /* a/l both split */,
+ }, { /* 16x16 -> 8x8 */
+ { 174, 73, 87 } /* a/l both not split */,
+ { 92, 41, 83 } /* a split, l not split */,
+ { 82, 99, 50 } /* l split, a not split */,
+ { 53, 39, 39 } /* a/l both split */,
+ }, { /* 8x8 -> 4x4 */
+ { 199, 122, 141 } /* a/l both not split */,
+ { 147, 63, 159 } /* a split, l not split */,
+ { 148, 133, 118 } /* l split, a not split */,
+ { 121, 104, 114 } /* a/l both split */,
+ }
+ },
+};
+
+const uint8_t ff_vp9_default_coef_probs[4][2][2][6][6][3] = {
+ { /* tx = 4x4 */
+ { /* block Type 0 */
+ { /* Intra */
+ { /* Coeff Band 0 */
+ { 195, 29, 183 },
+ { 84, 49, 136 },
+ { 8, 42, 71 }
+ }, { /* Coeff Band 1 */
+ { 31, 107, 169 },
+ { 35, 99, 159 },
+ { 17, 82, 140 },
+ { 8, 66, 114 },
+ { 2, 44, 76 },
+ { 1, 19, 32 }
+ }, { /* Coeff Band 2 */
+ { 40, 132, 201 },
+ { 29, 114, 187 },
+ { 13, 91, 157 },
+ { 7, 75, 127 },
+ { 3, 58, 95 },
+ { 1, 28, 47 }
+ }, { /* Coeff Band 3 */
+ { 69, 142, 221 },
+ { 42, 122, 201 },
+ { 15, 91, 159 },
+ { 6, 67, 121 },
+ { 1, 42, 77 },
+ { 1, 17, 31 }
+ }, { /* Coeff Band 4 */
+ { 102, 148, 228 },
+ { 67, 117, 204 },
+ { 17, 82, 154 },
+ { 6, 59, 114 },
+ { 2, 39, 75 },
+ { 1, 15, 29 }
+ }, { /* Coeff Band 5 */
+ { 156, 57, 233 },
+ { 119, 57, 212 },
+ { 58, 48, 163 },
+ { 29, 40, 124 },
+ { 12, 30, 81 },
+ { 3, 12, 31 }
+ }
+ }, { /* Inter */
+ { /* Coeff Band 0 */
+ { 191, 107, 226 },
+ { 124, 117, 204 },
+ { 25, 99, 155 }
+ }, { /* Coeff Band 1 */
+ { 29, 148, 210 },
+ { 37, 126, 194 },
+ { 8, 93, 157 },
+ { 2, 68, 118 },
+ { 1, 39, 69 },
+ { 1, 17, 33 }
+ }, { /* Coeff Band 2 */
+ { 41, 151, 213 },
+ { 27, 123, 193 },
+ { 3, 82, 144 },
+ { 1, 58, 105 },
+ { 1, 32, 60 },
+ { 1, 13, 26 }
+ }, { /* Coeff Band 3 */
+ { 59, 159, 220 },
+ { 23, 126, 198 },
+ { 4, 88, 151 },
+ { 1, 66, 114 },
+ { 1, 38, 71 },
+ { 1, 18, 34 }
+ }, { /* Coeff Band 4 */
+ { 114, 136, 232 },
+ { 51, 114, 207 },
+ { 11, 83, 155 },
+ { 3, 56, 105 },
+ { 1, 33, 65 },
+ { 1, 17, 34 }
+ }, { /* Coeff Band 5 */
+ { 149, 65, 234 },
+ { 121, 57, 215 },
+ { 61, 49, 166 },
+ { 28, 36, 114 },
+ { 12, 25, 76 },
+ { 3, 16, 42 }
+ }
+ }
+ }, { /* block Type 1 */
+ { /* Intra */
+ { /* Coeff Band 0 */
+ { 214, 49, 220 },
+ { 132, 63, 188 },
+ { 42, 65, 137 }
+ }, { /* Coeff Band 1 */
+ { 85, 137, 221 },
+ { 104, 131, 216 },
+ { 49, 111, 192 },
+ { 21, 87, 155 },
+ { 2, 49, 87 },
+ { 1, 16, 28 }
+ }, { /* Coeff Band 2 */
+ { 89, 163, 230 },
+ { 90, 137, 220 },
+ { 29, 100, 183 },
+ { 10, 70, 135 },
+ { 2, 42, 81 },
+ { 1, 17, 33 }
+ }, { /* Coeff Band 3 */
+ { 108, 167, 237 },
+ { 55, 133, 222 },
+ { 15, 97, 179 },
+ { 4, 72, 135 },
+ { 1, 45, 85 },
+ { 1, 19, 38 }
+ }, { /* Coeff Band 4 */
+ { 124, 146, 240 },
+ { 66, 124, 224 },
+ { 17, 88, 175 },
+ { 4, 58, 122 },
+ { 1, 36, 75 },
+ { 1, 18, 37 }
+ }, { /* Coeff Band 5 */
+ { 141, 79, 241 },
+ { 126, 70, 227 },
+ { 66, 58, 182 },
+ { 30, 44, 136 },
+ { 12, 34, 96 },
+ { 2, 20, 47 }
+ }
+ }, { /* Inter */
+ { /* Coeff Band 0 */
+ { 229, 99, 249 },
+ { 143, 111, 235 },
+ { 46, 109, 192 }
+ }, { /* Coeff Band 1 */
+ { 82, 158, 236 },
+ { 94, 146, 224 },
+ { 25, 117, 191 },
+ { 9, 87, 149 },
+ { 3, 56, 99 },
+ { 1, 33, 57 }
+ }, { /* Coeff Band 2 */
+ { 83, 167, 237 },
+ { 68, 145, 222 },
+ { 10, 103, 177 },
+ { 2, 72, 131 },
+ { 1, 41, 79 },
+ { 1, 20, 39 }
+ }, { /* Coeff Band 3 */
+ { 99, 167, 239 },
+ { 47, 141, 224 },
+ { 10, 104, 178 },
+ { 2, 73, 133 },
+ { 1, 44, 85 },
+ { 1, 22, 47 }
+ }, { /* Coeff Band 4 */
+ { 127, 145, 243 },
+ { 71, 129, 228 },
+ { 17, 93, 177 },
+ { 3, 61, 124 },
+ { 1, 41, 84 },
+ { 1, 21, 52 }
+ }, { /* Coeff Band 5 */
+ { 157, 78, 244 },
+ { 140, 72, 231 },
+ { 69, 58, 184 },
+ { 31, 44, 137 },
+ { 14, 38, 105 },
+ { 8, 23, 61 }
+ }
+ }
+ }
+ }, { /* tx = 8x8 */
+ { /* block Type 0 */
+ { /* Intra */
+ { /* Coeff Band 0 */
+ { 125, 34, 187 },
+ { 52, 41, 133 },
+ { 6, 31, 56 }
+ }, { /* Coeff Band 1 */
+ { 37, 109, 153 },
+ { 51, 102, 147 },
+ { 23, 87, 128 },
+ { 8, 67, 101 },
+ { 1, 41, 63 },
+ { 1, 19, 29 }
+ }, { /* Coeff Band 2 */
+ { 31, 154, 185 },
+ { 17, 127, 175 },
+ { 6, 96, 145 },
+ { 2, 73, 114 },
+ { 1, 51, 82 },
+ { 1, 28, 45 }
+ }, { /* Coeff Band 3 */
+ { 23, 163, 200 },
+ { 10, 131, 185 },
+ { 2, 93, 148 },
+ { 1, 67, 111 },
+ { 1, 41, 69 },
+ { 1, 14, 24 }
+ }, { /* Coeff Band 4 */
+ { 29, 176, 217 },
+ { 12, 145, 201 },
+ { 3, 101, 156 },
+ { 1, 69, 111 },
+ { 1, 39, 63 },
+ { 1, 14, 23 }
+ }, { /* Coeff Band 5 */
+ { 57, 192, 233 },
+ { 25, 154, 215 },
+ { 6, 109, 167 },
+ { 3, 78, 118 },
+ { 1, 48, 69 },
+ { 1, 21, 29 }
+ }
+ }, { /* Inter */
+ { /* Coeff Band 0 */
+ { 202, 105, 245 },
+ { 108, 106, 216 },
+ { 18, 90, 144 }
+ }, { /* Coeff Band 1 */
+ { 33, 172, 219 },
+ { 64, 149, 206 },
+ { 14, 117, 177 },
+ { 5, 90, 141 },
+ { 2, 61, 95 },
+ { 1, 37, 57 }
+ }, { /* Coeff Band 2 */
+ { 33, 179, 220 },
+ { 11, 140, 198 },
+ { 1, 89, 148 },
+ { 1, 60, 104 },
+ { 1, 33, 57 },
+ { 1, 12, 21 }
+ }, { /* Coeff Band 3 */
+ { 30, 181, 221 },
+ { 8, 141, 198 },
+ { 1, 87, 145 },
+ { 1, 58, 100 },
+ { 1, 31, 55 },
+ { 1, 12, 20 }
+ }, { /* Coeff Band 4 */
+ { 32, 186, 224 },
+ { 7, 142, 198 },
+ { 1, 86, 143 },
+ { 1, 58, 100 },
+ { 1, 31, 55 },
+ { 1, 12, 22 }
+ }, { /* Coeff Band 5 */
+ { 57, 192, 227 },
+ { 20, 143, 204 },
+ { 3, 96, 154 },
+ { 1, 68, 112 },
+ { 1, 42, 69 },
+ { 1, 19, 32 }
+ }
+ }
+ }, { /* block Type 1 */
+ { /* Intra */
+ { /* Coeff Band 0 */
+ { 212, 35, 215 },
+ { 113, 47, 169 },
+ { 29, 48, 105 }
+ }, { /* Coeff Band 1 */
+ { 74, 129, 203 },
+ { 106, 120, 203 },
+ { 49, 107, 178 },
+ { 19, 84, 144 },
+ { 4, 50, 84 },
+ { 1, 15, 25 }
+ }, { /* Coeff Band 2 */
+ { 71, 172, 217 },
+ { 44, 141, 209 },
+ { 15, 102, 173 },
+ { 6, 76, 133 },
+ { 2, 51, 89 },
+ { 1, 24, 42 }
+ }, { /* Coeff Band 3 */
+ { 64, 185, 231 },
+ { 31, 148, 216 },
+ { 8, 103, 175 },
+ { 3, 74, 131 },
+ { 1, 46, 81 },
+ { 1, 18, 30 }
+ }, { /* Coeff Band 4 */
+ { 65, 196, 235 },
+ { 25, 157, 221 },
+ { 5, 105, 174 },
+ { 1, 67, 120 },
+ { 1, 38, 69 },
+ { 1, 15, 30 }
+ }, { /* Coeff Band 5 */
+ { 65, 204, 238 },
+ { 30, 156, 224 },
+ { 7, 107, 177 },
+ { 2, 70, 124 },
+ { 1, 42, 73 },
+ { 1, 18, 34 }
+ }
+ }, { /* Inter */
+ { /* Coeff Band 0 */
+ { 225, 86, 251 },
+ { 144, 104, 235 },
+ { 42, 99, 181 }
+ }, { /* Coeff Band 1 */
+ { 85, 175, 239 },
+ { 112, 165, 229 },
+ { 29, 136, 200 },
+ { 12, 103, 162 },
+ { 6, 77, 123 },
+ { 2, 53, 84 }
+ }, { /* Coeff Band 2 */
+ { 75, 183, 239 },
+ { 30, 155, 221 },
+ { 3, 106, 171 },
+ { 1, 74, 128 },
+ { 1, 44, 76 },
+ { 1, 17, 28 }
+ }, { /* Coeff Band 3 */
+ { 73, 185, 240 },
+ { 27, 159, 222 },
+ { 2, 107, 172 },
+ { 1, 75, 127 },
+ { 1, 42, 73 },
+ { 1, 17, 29 }
+ }, { /* Coeff Band 4 */
+ { 62, 190, 238 },
+ { 21, 159, 222 },
+ { 2, 107, 172 },
+ { 1, 72, 122 },
+ { 1, 40, 71 },
+ { 1, 18, 32 }
+ }, { /* Coeff Band 5 */
+ { 61, 199, 240 },
+ { 27, 161, 226 },
+ { 4, 113, 180 },
+ { 1, 76, 129 },
+ { 1, 46, 80 },
+ { 1, 23, 41 }
+ }
+ }
+ }
+ }, { /* tx = 16x16 */
+ { /* block Type 0 */
+ { /* Intra */
+ { /* Coeff Band 0 */
+ { 7, 27, 153 },
+ { 5, 30, 95 },
+ { 1, 16, 30 }
+ }, { /* Coeff Band 1 */
+ { 50, 75, 127 },
+ { 57, 75, 124 },
+ { 27, 67, 108 },
+ { 10, 54, 86 },
+ { 1, 33, 52 },
+ { 1, 12, 18 }
+ }, { /* Coeff Band 2 */
+ { 43, 125, 151 },
+ { 26, 108, 148 },
+ { 7, 83, 122 },
+ { 2, 59, 89 },
+ { 1, 38, 60 },
+ { 1, 17, 27 }
+ }, { /* Coeff Band 3 */
+ { 23, 144, 163 },
+ { 13, 112, 154 },
+ { 2, 75, 117 },
+ { 1, 50, 81 },
+ { 1, 31, 51 },
+ { 1, 14, 23 }
+ }, { /* Coeff Band 4 */
+ { 18, 162, 185 },
+ { 6, 123, 171 },
+ { 1, 78, 125 },
+ { 1, 51, 86 },
+ { 1, 31, 54 },
+ { 1, 14, 23 }
+ }, { /* Coeff Band 5 */
+ { 15, 199, 227 },
+ { 3, 150, 204 },
+ { 1, 91, 146 },
+ { 1, 55, 95 },
+ { 1, 30, 53 },
+ { 1, 11, 20 }
+ }
+ }, { /* Inter */
+ { /* Coeff Band 0 */
+ { 19, 55, 240 },
+ { 19, 59, 196 },
+ { 3, 52, 105 }
+ }, { /* Coeff Band 1 */
+ { 41, 166, 207 },
+ { 104, 153, 199 },
+ { 31, 123, 181 },
+ { 14, 101, 152 },
+ { 5, 72, 106 },
+ { 1, 36, 52 }
+ }, { /* Coeff Band 2 */
+ { 35, 176, 211 },
+ { 12, 131, 190 },
+ { 2, 88, 144 },
+ { 1, 60, 101 },
+ { 1, 36, 60 },
+ { 1, 16, 28 }
+ }, { /* Coeff Band 3 */
+ { 28, 183, 213 },
+ { 8, 134, 191 },
+ { 1, 86, 142 },
+ { 1, 56, 96 },
+ { 1, 30, 53 },
+ { 1, 12, 20 }
+ }, { /* Coeff Band 4 */
+ { 20, 190, 215 },
+ { 4, 135, 192 },
+ { 1, 84, 139 },
+ { 1, 53, 91 },
+ { 1, 28, 49 },
+ { 1, 11, 20 }
+ }, { /* Coeff Band 5 */
+ { 13, 196, 216 },
+ { 2, 137, 192 },
+ { 1, 86, 143 },
+ { 1, 57, 99 },
+ { 1, 32, 56 },
+ { 1, 13, 24 }
+ }
+ }
+ }, { /* block Type 1 */
+ { /* Intra */
+ { /* Coeff Band 0 */
+ { 211, 29, 217 },
+ { 96, 47, 156 },
+ { 22, 43, 87 }
+ }, { /* Coeff Band 1 */
+ { 78, 120, 193 },
+ { 111, 116, 186 },
+ { 46, 102, 164 },
+ { 15, 80, 128 },
+ { 2, 49, 76 },
+ { 1, 18, 28 }
+ }, { /* Coeff Band 2 */
+ { 71, 161, 203 },
+ { 42, 132, 192 },
+ { 10, 98, 150 },
+ { 3, 69, 109 },
+ { 1, 44, 70 },
+ { 1, 18, 29 }
+ }, { /* Coeff Band 3 */
+ { 57, 186, 211 },
+ { 30, 140, 196 },
+ { 4, 93, 146 },
+ { 1, 62, 102 },
+ { 1, 38, 65 },
+ { 1, 16, 27 }
+ }, { /* Coeff Band 4 */
+ { 47, 199, 217 },
+ { 14, 145, 196 },
+ { 1, 88, 142 },
+ { 1, 57, 98 },
+ { 1, 36, 62 },
+ { 1, 15, 26 }
+ }, { /* Coeff Band 5 */
+ { 26, 219, 229 },
+ { 5, 155, 207 },
+ { 1, 94, 151 },
+ { 1, 60, 104 },
+ { 1, 36, 62 },
+ { 1, 16, 28 }
+ }
+ }, { /* Inter */
+ { /* Coeff Band 0 */
+ { 233, 29, 248 },
+ { 146, 47, 220 },
+ { 43, 52, 140 }
+ }, { /* Coeff Band 1 */
+ { 100, 163, 232 },
+ { 179, 161, 222 },
+ { 63, 142, 204 },
+ { 37, 113, 174 },
+ { 26, 89, 137 },
+ { 18, 68, 97 }
+ }, { /* Coeff Band 2 */
+ { 85, 181, 230 },
+ { 32, 146, 209 },
+ { 7, 100, 164 },
+ { 3, 71, 121 },
+ { 1, 45, 77 },
+ { 1, 18, 30 }
+ }, { /* Coeff Band 3 */
+ { 65, 187, 230 },
+ { 20, 148, 207 },
+ { 2, 97, 159 },
+ { 1, 68, 116 },
+ { 1, 40, 70 },
+ { 1, 14, 29 }
+ }, { /* Coeff Band 4 */
+ { 40, 194, 227 },
+ { 8, 147, 204 },
+ { 1, 94, 155 },
+ { 1, 65, 112 },
+ { 1, 39, 66 },
+ { 1, 14, 26 }
+ }, { /* Coeff Band 5 */
+ { 16, 208, 228 },
+ { 3, 151, 207 },
+ { 1, 98, 160 },
+ { 1, 67, 117 },
+ { 1, 41, 74 },
+ { 1, 17, 31 }
+ }
+ }
+ }
+ }, { /* tx = 32x32 */
+ { /* block Type 0 */
+ { /* Intra */
+ { /* Coeff Band 0 */
+ { 17, 38, 140 },
+ { 7, 34, 80 },
+ { 1, 17, 29 }
+ }, { /* Coeff Band 1 */
+ { 37, 75, 128 },
+ { 41, 76, 128 },
+ { 26, 66, 116 },
+ { 12, 52, 94 },
+ { 2, 32, 55 },
+ { 1, 10, 16 }
+ }, { /* Coeff Band 2 */
+ { 50, 127, 154 },
+ { 37, 109, 152 },
+ { 16, 82, 121 },
+ { 5, 59, 85 },
+ { 1, 35, 54 },
+ { 1, 13, 20 }
+ }, { /* Coeff Band 3 */
+ { 40, 142, 167 },
+ { 17, 110, 157 },
+ { 2, 71, 112 },
+ { 1, 44, 72 },
+ { 1, 27, 45 },
+ { 1, 11, 17 }
+ }, { /* Coeff Band 4 */
+ { 30, 175, 188 },
+ { 9, 124, 169 },
+ { 1, 74, 116 },
+ { 1, 48, 78 },
+ { 1, 30, 49 },
+ { 1, 11, 18 }
+ }, { /* Coeff Band 5 */
+ { 10, 222, 223 },
+ { 2, 150, 194 },
+ { 1, 83, 128 },
+ { 1, 48, 79 },
+ { 1, 27, 45 },
+ { 1, 11, 17 }
+ }
+ }, { /* Inter */
+ { /* Coeff Band 0 */
+ { 36, 41, 235 },
+ { 29, 36, 193 },
+ { 10, 27, 111 }
+ }, { /* Coeff Band 1 */
+ { 85, 165, 222 },
+ { 177, 162, 215 },
+ { 110, 135, 195 },
+ { 57, 113, 168 },
+ { 23, 83, 120 },
+ { 10, 49, 61 }
+ }, { /* Coeff Band 2 */
+ { 85, 190, 223 },
+ { 36, 139, 200 },
+ { 5, 90, 146 },
+ { 1, 60, 103 },
+ { 1, 38, 65 },
+ { 1, 18, 30 }
+ }, { /* Coeff Band 3 */
+ { 72, 202, 223 },
+ { 23, 141, 199 },
+ { 2, 86, 140 },
+ { 1, 56, 97 },
+ { 1, 36, 61 },
+ { 1, 16, 27 }
+ }, { /* Coeff Band 4 */
+ { 55, 218, 225 },
+ { 13, 145, 200 },
+ { 1, 86, 141 },
+ { 1, 57, 99 },
+ { 1, 35, 61 },
+ { 1, 13, 22 }
+ }, { /* Coeff Band 5 */
+ { 15, 235, 212 },
+ { 1, 132, 184 },
+ { 1, 84, 139 },
+ { 1, 57, 97 },
+ { 1, 34, 56 },
+ { 1, 14, 23 }
+ }
+ }
+ }, { /* block Type 1 */
+ { /* Intra */
+ { /* Coeff Band 0 */
+ { 181, 21, 201 },
+ { 61, 37, 123 },
+ { 10, 38, 71 }
+ }, { /* Coeff Band 1 */
+ { 47, 106, 172 },
+ { 95, 104, 173 },
+ { 42, 93, 159 },
+ { 18, 77, 131 },
+ { 4, 50, 81 },
+ { 1, 17, 23 }
+ }, { /* Coeff Band 2 */
+ { 62, 147, 199 },
+ { 44, 130, 189 },
+ { 28, 102, 154 },
+ { 18, 75, 115 },
+ { 2, 44, 65 },
+ { 1, 12, 19 }
+ }, { /* Coeff Band 3 */
+ { 55, 153, 210 },
+ { 24, 130, 194 },
+ { 3, 93, 146 },
+ { 1, 61, 97 },
+ { 1, 31, 50 },
+ { 1, 10, 16 }
+ }, { /* Coeff Band 4 */
+ { 49, 186, 223 },
+ { 17, 148, 204 },
+ { 1, 96, 142 },
+ { 1, 53, 83 },
+ { 1, 26, 44 },
+ { 1, 11, 17 }
+ }, { /* Coeff Band 5 */
+ { 13, 217, 212 },
+ { 2, 136, 180 },
+ { 1, 78, 124 },
+ { 1, 50, 83 },
+ { 1, 29, 49 },
+ { 1, 14, 23 }
+ }
+ }, { /* Inter */
+ { /* Coeff Band 0 */
+ { 197, 13, 247 },
+ { 82, 17, 222 },
+ { 25, 17, 162 }
+ }, { /* Coeff Band 1 */
+ { 126, 186, 247 },
+ { 234, 191, 243 },
+ { 176, 177, 234 },
+ { 104, 158, 220 },
+ { 66, 128, 186 },
+ { 55, 90, 137 }
+ }, { /* Coeff Band 2 */
+ { 111, 197, 242 },
+ { 46, 158, 219 },
+ { 9, 104, 171 },
+ { 2, 65, 125 },
+ { 1, 44, 80 },
+ { 1, 17, 91 }
+ }, { /* Coeff Band 3 */
+ { 104, 208, 245 },
+ { 39, 168, 224 },
+ { 3, 109, 162 },
+ { 1, 79, 124 },
+ { 1, 50, 102 },
+ { 1, 43, 102 }
+ }, { /* Coeff Band 4 */
+ { 84, 220, 246 },
+ { 31, 177, 231 },
+ { 2, 115, 180 },
+ { 1, 79, 134 },
+ { 1, 55, 77 },
+ { 1, 60, 79 }
+ }, { /* Coeff Band 5 */
+ { 43, 243, 240 },
+ { 8, 180, 217 },
+ { 1, 115, 166 },
+ { 1, 84, 121 },
+ { 1, 51, 67 },
+ { 1, 16, 6 }
+ }
+ }
+ }
+ }
+};
+
+const int8_t ff_vp9_mv_joint_tree[3][2] = {
+ { -MV_JOINT_ZERO, 1 }, // '0'
+ { -MV_JOINT_H, 2 }, // '10'
+ { -MV_JOINT_V, -MV_JOINT_HV }, // '11x'
+};
+
+const int8_t ff_vp9_mv_class_tree[10][2] = {
+ { -0, 1 }, // '0'
+ { -1, 2 }, // '10'
+ { 3, 4 },
+ { -2, -3 }, // '110x'
+ { 5, 6 },
+ { -4, -5 }, // '1110x'
+ { -6, 7 }, // '11110'
+ { 8, 9 },
+ { -7, -8 }, // '111110x'
+ { -9, -10 }, // '111111x'
+};
+
+const int8_t ff_vp9_mv_fp_tree[3][2] = {
+ { -0, 1 }, // '0'
+ { -1, 2 }, // '10'
+ { -2, -3 }, // '11x'
+};

libav-v10.1.tar.bz2/libavcodec/vp9data.h Added

@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2013 Ronald S. Bultje <rsbultje gmail com>
+ * Copyright (C) 2013 Clément Bœsch 
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VP9DATA_H
+#define AVCODEC_VP9DATA_H
+
+#include <stdint.h>
+
+#include "vp9.h"
+
+extern const int8_t ff_vp9_partition_tree[3][2];
+extern const uint8_t ff_vp9_default_kf_partition_probs[4][4][3];
+extern const int8_t ff_vp9_segmentation_tree[7][2];
+extern const int8_t ff_vp9_intramode_tree[9][2];
+extern const uint8_t ff_vp9_default_kf_ymode_probs[10][10][9];
+extern const uint8_t ff_vp9_default_kf_uvmode_probs[10][9];
+extern const int8_t ff_vp9_inter_mode_tree[3][2];
+extern const int8_t ff_vp9_filter_tree[2][2];
+extern const enum FilterMode ff_vp9_filter_lut[3];
+extern const int16_t ff_vp9_dc_qlookup[256];
+extern const int16_t ff_vp9_ac_qlookup[256];
+extern const enum TxfmType ff_vp9_intra_txfm_type[14];
+extern const int16_t ff_vp9_default_scan_4x4[16];
+extern const int16_t ff_vp9_col_scan_4x4[16];
+extern const int16_t ff_vp9_row_scan_4x4[16];
+extern const int16_t ff_vp9_default_scan_8x8[64];
+extern const int16_t ff_vp9_col_scan_8x8[64];
+extern const int16_t ff_vp9_row_scan_8x8[64];
+extern const int16_t ff_vp9_default_scan_16x16[256];
+extern const int16_t ff_vp9_col_scan_16x16[256];
+extern const int16_t ff_vp9_row_scan_16x16[256];
+extern const int16_t ff_vp9_default_scan_32x32[1024];
+extern const int16_t *ff_vp9_scans[5][4];
+extern const int16_t ff_vp9_default_scan_4x4_nb[16][2];
+extern const int16_t ff_vp9_col_scan_4x4_nb[16][2];
+extern const int16_t ff_vp9_row_scan_4x4_nb[16][2];
+extern const int16_t ff_vp9_default_scan_8x8_nb[64][2];
+extern const int16_t ff_vp9_col_scan_8x8_nb[64][2];
+extern const int16_t ff_vp9_row_scan_8x8_nb[64][2];
+extern const int16_t ff_vp9_default_scan_16x16_nb[256][2];
+extern const int16_t ff_vp9_col_scan_16x16_nb[256][2];
+extern const int16_t ff_vp9_row_scan_16x16_nb[256][2];
+extern const int16_t ff_vp9_default_scan_32x32_nb[1024][2];
+extern const int16_t (*ff_vp9_scans_nb[5][4])[2];
+extern const uint8_t ff_vp9_model_pareto8[256][8];
+extern const ProbContext ff_vp9_default_probs;
+extern const uint8_t ff_vp9_default_coef_probs[4][2][2][6][6][3];
+extern const int8_t ff_vp9_mv_joint_tree[3][2];
+extern const int8_t ff_vp9_mv_class_tree[10][2];
+extern const int8_t ff_vp9_mv_fp_tree[3][2];
+
+#endif /* AVCODEC_VP9DATA_H */

libav-v10.1.tar.bz2/libavcodec/vp9dsp.c Added

@@ -0,0 +1,2174 @@
+/*
+ * VP9 compatible video decoder
+ *
+ * Copyright (C) 2013 Ronald S. Bultje <rsbultje gmail com>
+ * Copyright (C) 2013 Clément Bœsch 
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 "rnd_avg.h"
+#include "vp9.h"
+
+// FIXME see whether we can merge parts of this (perhaps at least 4x4 and 8x8)
+// back with h264pred.[ch]
+
+static void vert_4x4_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ unsigned p4 = AV_RN32A(top);
+
+ AV_WN32A(dst + stride * 0, p4);
+ AV_WN32A(dst + stride * 1, p4);
+ AV_WN32A(dst + stride * 2, p4);
+ AV_WN32A(dst + stride * 3, p4);
+}
+
+static void vert_8x8_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ uint64_t p8 = AV_RN64A(top);
+ int y;
+
+ for (y = 0; y < 8; y++) {
+ AV_WN64A(dst, p8);
+ dst += stride;
+ }
+}
+
+static void vert_16x16_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ uint64_t p8a = AV_RN64A(top + 0), p8b = AV_RN64A(top + 8);
+ int y;
+
+ for (y = 0; y < 16; y++) {
+ AV_WN64A(dst + 0, p8a);
+ AV_WN64A(dst + 8, p8b);
+ dst += stride;
+ }
+}
+
+static void vert_32x32_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ uint64_t p8a = AV_RN64A(top + 0), p8b = AV_RN64A(top + 8),
+ p8c = AV_RN64A(top + 16), p8d = AV_RN64A(top + 24);
+ int y;
+
+ for (y = 0; y < 32; y++) {
+ AV_WN64A(dst + 0, p8a);
+ AV_WN64A(dst + 8, p8b);
+ AV_WN64A(dst + 16, p8c);
+ AV_WN64A(dst + 24, p8d);
+ dst += stride;
+ }
+}
+
+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);
+}
+
+static void hor_8x8_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int y;
+
+ for (y = 0; y < 8; y++) {
+ AV_WN64A(dst, left[y] * 0x0101010101010101ULL);
+ dst += stride;
+ }
+}
+
+static void hor_16x16_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int y;
+
+ for (y = 0; y < 16; y++) {
+ uint64_t p8 = left[y] * 0x0101010101010101ULL;
+
+ AV_WN64A(dst + 0, p8);
+ AV_WN64A(dst + 8, p8);
+ dst += stride;
+ }
+}
+
+static void hor_32x32_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int y;
+
+ for (y = 0; y < 32; y++) {
+ uint64_t p8 = left[y] * 0x0101010101010101ULL;
+
+ AV_WN64A(dst + 0, p8);
+ AV_WN64A(dst + 8, p8);
+ AV_WN64A(dst + 16, p8);
+ AV_WN64A(dst + 24, p8);
+ dst += stride;
+ }
+}
+
+static void tm_4x4_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int y, tl = top[-1];
+
+ for (y = 0; y < 4; y++) {
+ int l_m_tl = left[y] - tl;
+
+ dst[0] = av_clip_uint8(top[0] + l_m_tl);
+ dst[1] = av_clip_uint8(top[1] + l_m_tl);
+ dst[2] = av_clip_uint8(top[2] + l_m_tl);
+ dst[3] = av_clip_uint8(top[3] + l_m_tl);
+ dst += stride;
+ }
+}
+
+static void tm_8x8_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int y, tl = top[-1];
+
+ for (y = 0; y < 8; y++) {
+ int l_m_tl = left[y] - tl;
+
+ dst[0] = av_clip_uint8(top[0] + l_m_tl);
+ dst[1] = av_clip_uint8(top[1] + l_m_tl);
+ dst[2] = av_clip_uint8(top[2] + l_m_tl);
+ dst[3] = av_clip_uint8(top[3] + l_m_tl);
+ dst[4] = av_clip_uint8(top[4] + l_m_tl);
+ dst[5] = av_clip_uint8(top[5] + l_m_tl);
+ dst[6] = av_clip_uint8(top[6] + l_m_tl);
+ dst[7] = av_clip_uint8(top[7] + l_m_tl);
+ dst += stride;
+ }
+}
+
+static void tm_16x16_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int y, tl = top[-1];
+
+ for (y = 0; y < 16; y++) {
+ int l_m_tl = left[y] - tl;
+
+ dst[0] = av_clip_uint8(top[0] + l_m_tl);
+ dst[1] = av_clip_uint8(top[1] + l_m_tl);
+ dst[2] = av_clip_uint8(top[2] + l_m_tl);
+ dst[3] = av_clip_uint8(top[3] + l_m_tl);
+ dst[4] = av_clip_uint8(top[4] + l_m_tl);
+ dst[5] = av_clip_uint8(top[5] + l_m_tl);
+ dst[6] = av_clip_uint8(top[6] + l_m_tl);
+ dst[7] = av_clip_uint8(top[7] + l_m_tl);
+ dst[8] = av_clip_uint8(top[8] + l_m_tl);
+ dst[9] = av_clip_uint8(top[9] + l_m_tl);
+ dst[10] = av_clip_uint8(top[10] + l_m_tl);
+ dst[11] = av_clip_uint8(top[11] + l_m_tl);
+ dst[12] = av_clip_uint8(top[12] + l_m_tl);
+ dst[13] = av_clip_uint8(top[13] + l_m_tl);
+ dst[14] = av_clip_uint8(top[14] + l_m_tl);
+ dst[15] = av_clip_uint8(top[15] + l_m_tl);
+ dst += stride;
+ }
+}
+
+static void tm_32x32_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int y, tl = top[-1];
+
+ for (y = 0; y < 32; y++) {
+ int l_m_tl = left[y] - tl;
+
+ dst[0] = av_clip_uint8(top[0] + l_m_tl);
+ dst[1] = av_clip_uint8(top[1] + l_m_tl);
+ dst[2] = av_clip_uint8(top[2] + l_m_tl);
+ dst[3] = av_clip_uint8(top[3] + l_m_tl);
+ dst[4] = av_clip_uint8(top[4] + l_m_tl);
+ dst[5] = av_clip_uint8(top[5] + l_m_tl);
+ dst[6] = av_clip_uint8(top[6] + l_m_tl);
+ dst[7] = av_clip_uint8(top[7] + l_m_tl);
+ dst[8] = av_clip_uint8(top[8] + l_m_tl);
+ dst[9] = av_clip_uint8(top[9] + l_m_tl);
+ dst[10] = av_clip_uint8(top[10] + l_m_tl);
+ dst[11] = av_clip_uint8(top[11] + l_m_tl);
+ dst[12] = av_clip_uint8(top[12] + l_m_tl);
+ dst[13] = av_clip_uint8(top[13] + l_m_tl);
+ dst[14] = av_clip_uint8(top[14] + l_m_tl);
+ dst[15] = av_clip_uint8(top[15] + l_m_tl);
+ dst[16] = av_clip_uint8(top[16] + l_m_tl);
+ dst[17] = av_clip_uint8(top[17] + l_m_tl);
+ dst[18] = av_clip_uint8(top[18] + l_m_tl);
+ dst[19] = av_clip_uint8(top[19] + l_m_tl);
+ dst[20] = av_clip_uint8(top[20] + l_m_tl);
+ dst[21] = av_clip_uint8(top[21] + l_m_tl);
+ dst[22] = av_clip_uint8(top[22] + l_m_tl);
+ dst[23] = av_clip_uint8(top[23] + l_m_tl);
+ dst[24] = av_clip_uint8(top[24] + l_m_tl);
+ dst[25] = av_clip_uint8(top[25] + l_m_tl);
+ dst[26] = av_clip_uint8(top[26] + l_m_tl);
+ dst[27] = av_clip_uint8(top[27] + l_m_tl);
+ dst[28] = av_clip_uint8(top[28] + l_m_tl);
+ dst[29] = av_clip_uint8(top[29] + l_m_tl);
+ dst[30] = av_clip_uint8(top[30] + l_m_tl);
+ dst[31] = av_clip_uint8(top[31] + l_m_tl);
+ dst += stride;
+ }
+}
+
+static void dc_4x4_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ unsigned dc = 0x01010101U *
+ ((left[0] + left[1] + left[2] + left[3] +
+ top[0] + top[1] + top[2] + top[3] + 4) >> 3);
+
+ AV_WN32A(dst + stride * 0, dc);
+ AV_WN32A(dst + stride * 1, dc);
+ AV_WN32A(dst + stride * 2, dc);
+ AV_WN32A(dst + stride * 3, dc);
+}
+
+static void dc_8x8_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ uint64_t dc = 0x0101010101010101ULL *
+ ((left[0] + left[1] + left[2] + left[3] +
+ left[4] + left[5] + left[6] + left[7] +
+ top[0] + top[1] + top[2] + top[3] +
+ top[4] + top[5] + top[6] + top[7] + 8) >> 4);
+ int y;
+
+ for (y = 0; y < 8; y++) {
+ AV_WN64A(dst, dc);
+ dst += stride;
+ }
+}
+
+static void dc_16x16_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ uint64_t dc = 0x0101010101010101ULL *
+ ((left[0] + left[1] + left[2] + left[3] +
+ left[4] + left[5] + left[6] + left[7] +
+ left[8] + left[9] + left[10] + left[11] +
+ left[12] + left[13] + left[14] + left[15] +
+ top[0] + top[1] + top[2] + top[3] +
+ top[4] + top[5] + top[6] + top[7] +
+ top[8] + top[9] + top[10] + top[11] +
+ top[12] + top[13] + top[14] + top[15] + 16) >> 5);
+ int y;
+
+ for (y = 0; y < 16; y++) {
+ AV_WN64A(dst + 0, dc);
+ AV_WN64A(dst + 8, dc);
+ dst += stride;
+ }
+}
+
+static void dc_32x32_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ uint64_t dc = 0x0101010101010101ULL *
+ ((left[0] + left[1] + left[2] + left[3] +
+ left[4] + left[5] + left[6] + left[7] +
+ left[8] + left[9] + left[10] + left[11] +
+ left[12] + left[13] + left[14] + left[15] +
+ left[16] + left[17] + left[18] + left[19] +
+ left[20] + left[21] + left[22] + left[23] +
+ left[24] + left[25] + left[26] + left[27] +
+ left[28] + left[29] + left[30] + left[31] +
+ top[0] + top[1] + top[2] + top[3] +
+ top[4] + top[5] + top[6] + top[7] +
+ top[8] + top[9] + top[10] + top[11] +
+ top[12] + top[13] + top[14] + top[15] +
+ top[16] + top[17] + top[18] + top[19] +
+ top[20] + top[21] + top[22] + top[23] +
+ top[24] + top[25] + top[26] + top[27] +
+ top[28] + top[29] + top[30] + top[31] + 32) >> 6);
+ int y;
+
+ for (y = 0; y < 32; y++) {
+ AV_WN64A(dst + 0, dc);
+ AV_WN64A(dst + 8, dc);
+ AV_WN64A(dst + 16, dc);
+ AV_WN64A(dst + 24, dc);
+ dst += stride;
+ }
+}
+
+static void dc_left_4x4_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ unsigned dc = 0x01010101U *
+ ((left[0] + left[1] + left[2] + left[3] + 2) >> 2);
+
+ AV_WN32A(dst + stride * 0, dc);
+ AV_WN32A(dst + stride * 1, dc);
+ AV_WN32A(dst + stride * 2, dc);
+ AV_WN32A(dst + stride * 3, dc);
+}
+
+static void dc_left_8x8_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ uint64_t dc = 0x0101010101010101ULL *
+ ((left[0] + left[1] + left[2] + left[3] +
+ left[4] + left[5] + left[6] + left[7] + 4) >> 3);
+ int y;
+
+ for (y = 0; y < 8; y++) {
+ AV_WN64A(dst, dc);
+ dst += stride;
+ }
+}
+
+static void dc_left_16x16_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ uint64_t dc = 0x0101010101010101ULL *
+ ((left[0] + left[1] + left[2] + left[3] +
+ left[4] + left[5] + left[6] + left[7] +
+ left[8] + left[9] + left[10] + left[11] +
+ left[12] + left[13] + left[14] + left[15] + 8) >> 4);
+ int y;
+
+ for (y = 0; y < 16; y++) {
+ AV_WN64A(dst + 0, dc);
+ AV_WN64A(dst + 8, dc);
+ dst += stride;
+ }
+}
+
+static void dc_left_32x32_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ uint64_t dc = 0x0101010101010101ULL *
+ ((left[0] + left[1] + left[2] + left[3] +
+ left[4] + left[5] + left[6] + left[7] +
+ left[8] + left[9] + left[10] + left[11] +
+ left[12] + left[13] + left[14] + left[15] +
+ left[16] + left[17] + left[18] + left[19] +
+ left[20] + left[21] + left[22] + left[23] +
+ left[24] + left[25] + left[26] + left[27] +
+ left[28] + left[29] + left[30] + left[31] + 16) >> 5);
+ int y;
+
+ for (y = 0; y < 32; y++) {
+ AV_WN64A(dst + 0, dc);
+ AV_WN64A(dst + 8, dc);
+ AV_WN64A(dst + 16, dc);
+ AV_WN64A(dst + 24, dc);
+ dst += stride;
+ }
+}
+
+static void dc_top_4x4_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ unsigned dc = 0x01010101U * ((top[0] + top[1] + top[2] + top[3] + 2) >> 2);
+
+ AV_WN32A(dst + stride * 0, dc);
+ AV_WN32A(dst + stride * 1, dc);
+ AV_WN32A(dst + stride * 2, dc);
+ AV_WN32A(dst + stride * 3, dc);
+}
+
+static void dc_top_8x8_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ uint64_t dc = 0x0101010101010101ULL *
+ ((top[0] + top[1] + top[2] + top[3] +
+ top[4] + top[5] + top[6] + top[7] + 4) >> 3);
+ int y;
+
+ for (y = 0; y < 8; y++) {
+ AV_WN64A(dst, dc);
+ dst += stride;
+ }
+}
+
+static void dc_top_16x16_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ uint64_t dc = 0x0101010101010101ULL *
+ ((top[0] + top[1] + top[2] + top[3] +
+ top[4] + top[5] + top[6] + top[7] +
+ top[8] + top[9] + top[10] + top[11] +
+ top[12] + top[13] + top[14] + top[15] + 8) >> 4);
+ int y;
+
+ for (y = 0; y < 16; y++) {
+ AV_WN64A(dst + 0, dc);
+ AV_WN64A(dst + 8, dc);
+ dst += stride;
+ }
+}
+
+static void dc_top_32x32_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ uint64_t dc = 0x0101010101010101ULL *
+ ((top[0] + top[1] + top[2] + top[3] +
+ top[4] + top[5] + top[6] + top[7] +
+ top[8] + top[9] + top[10] + top[11] +
+ top[12] + top[13] + top[14] + top[15] +
+ top[16] + top[17] + top[18] + top[19] +
+ top[20] + top[21] + top[22] + top[23] +
+ top[24] + top[25] + top[26] + top[27] +
+ top[28] + top[29] + top[30] + top[31] + 16) >> 5);
+ int y;
+
+ for (y = 0; y < 32; y++) {
+ AV_WN64A(dst + 0, dc);
+ AV_WN64A(dst + 8, dc);
+ AV_WN64A(dst + 16, dc);
+ AV_WN64A(dst + 24, dc);
+ dst += stride;
+ }
+}
+
+static void dc_128_4x4_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ AV_WN32A(dst + stride * 0, 0x80808080U);
+ AV_WN32A(dst + stride * 1, 0x80808080U);
+ AV_WN32A(dst + stride * 2, 0x80808080U);
+ AV_WN32A(dst + stride * 3, 0x80808080U);
+}
+
+static void dc_128_8x8_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int y;
+
+ for (y = 0; y < 8; y++) {
+ AV_WN64A(dst, 0x8080808080808080ULL);
+ dst += stride;
+ }
+}
+
+static void dc_128_16x16_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int y;
+
+ for (y = 0; y < 16; y++) {
+ AV_WN64A(dst + 0, 0x8080808080808080ULL);
+ AV_WN64A(dst + 8, 0x8080808080808080ULL);
+ dst += stride;
+ }
+}
+
+static void dc_128_32x32_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int y;
+
+ for (y = 0; y < 32; y++) {
+ AV_WN64A(dst + 0, 0x8080808080808080ULL);
+ AV_WN64A(dst + 8, 0x8080808080808080ULL);
+ AV_WN64A(dst + 16, 0x8080808080808080ULL);
+ AV_WN64A(dst + 24, 0x8080808080808080ULL);
+ dst += stride;
+ }
+}
+
+static void dc_127_4x4_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ AV_WN32A(dst + stride * 0, 0x7F7F7F7FU);
+ AV_WN32A(dst + stride * 1, 0x7F7F7F7FU);
+ AV_WN32A(dst + stride * 2, 0x7F7F7F7FU);
+ AV_WN32A(dst + stride * 3, 0x7F7F7F7FU);
+}
+
+static void dc_127_8x8_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int y;
+
+ for (y = 0; y < 8; y++) {
+ AV_WN64A(dst, 0x7F7F7F7F7F7F7F7FULL);
+ dst += stride;
+ }
+}
+
+static void dc_127_16x16_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int y;
+
+ for (y = 0; y < 16; y++) {
+ AV_WN64A(dst + 0, 0x7F7F7F7F7F7F7F7FULL);
+ AV_WN64A(dst + 8, 0x7F7F7F7F7F7F7F7FULL);
+ dst += stride;
+ }
+}
+
+static void dc_127_32x32_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int y;
+
+ for (y = 0; y < 32; y++) {
+ AV_WN64A(dst + 0, 0x7F7F7F7F7F7F7F7FULL);
+ AV_WN64A(dst + 8, 0x7F7F7F7F7F7F7F7FULL);
+ AV_WN64A(dst + 16, 0x7F7F7F7F7F7F7F7FULL);
+ AV_WN64A(dst + 24, 0x7F7F7F7F7F7F7F7FULL);
+ dst += stride;
+ }
+}
+
+static void dc_129_4x4_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ AV_WN32A(dst + stride * 0, 0x81818181U);
+ AV_WN32A(dst + stride * 1, 0x81818181U);
+ AV_WN32A(dst + stride * 2, 0x81818181U);
+ AV_WN32A(dst + stride * 3, 0x81818181U);
+}
+
+static void dc_129_8x8_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int y;
+
+ for (y = 0; y < 8; y++) {
+ AV_WN64A(dst, 0x8181818181818181ULL);
+ dst += stride;
+ }
+}
+
+static void dc_129_16x16_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int y;
+
+ for (y = 0; y < 16; y++) {
+ AV_WN64A(dst + 0, 0x8181818181818181ULL);
+ AV_WN64A(dst + 8, 0x8181818181818181ULL);
+ dst += stride;
+ }
+}
+
+static void dc_129_32x32_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int y;
+
+ for (y = 0; y < 32; y++) {
+ AV_WN64A(dst + 0, 0x8181818181818181ULL);
+ AV_WN64A(dst + 8, 0x8181818181818181ULL);
+ AV_WN64A(dst + 16, 0x8181818181818181ULL);
+ AV_WN64A(dst + 24, 0x8181818181818181ULL);
+ dst += stride;
+ }
+}
+
+#define DST(x, y) dst[(x) + (y) * stride]
+
+static void diag_downleft_4x4_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int a0 = top[0], a1 = top[1], a2 = top[2], a3 = top[3],
+ a4 = top[4], a5 = top[5], a6 = top[6], a7 = top[7];
+
+ DST(0, 0) = (a0 + a1 * 2 + a2 + 2) >> 2;
+ DST(1, 0) =
+ DST(0, 1) = (a1 + a2 * 2 + a3 + 2) >> 2;
+ DST(2, 0) =
+ DST(1, 1) =
+ DST(0, 2) = (a2 + a3 * 2 + a4 + 2) >> 2;
+ DST(3, 0) =
+ DST(2, 1) =
+ DST(1, 2) =
+ DST(0, 3) = (a3 + a4 * 2 + a5 + 2) >> 2;
+ DST(3, 1) =
+ DST(2, 2) =
+ DST(1, 3) = (a4 + a5 * 2 + a6 + 2) >> 2;
+ DST(3, 2) =
+ DST(2, 3) = (a5 + a6 * 2 + a7 + 2) >> 2;
+ DST(3, 3) = a7; // note: this is different from vp8 and such
+}
+
+#define def_diag_downleft(size) \
+static void diag_downleft_ ## size ## x ## size ## _c(uint8_t *dst, \
+ ptrdiff_t stride, \
+ const uint8_t *left, \
+ const uint8_t *top) \
+{ \
+ int i, j; \
+ uint8_t v[size - 1]; \
+ \
+ for (i = 0; i < size - 2; i++) \
+ v[i] = (top[i] + top[i + 1] * 2 + top[i + 2] + 2) >> 2; \
+ v[size - 2] = (top[size - 2] + top[size - 1] * 3 + 2) >> 2; \
+ \
+ for (j = 0; j < size; j++) { \
+ memcpy(dst + j * stride, v + j, size - 1 - j); \
+ memset(dst + j * stride + size - 1 - j, top[size - 1], j + 1); \
+ } \
+}
+
+def_diag_downleft(8)
+def_diag_downleft(16)
+def_diag_downleft(32)
+
+static void diag_downright_4x4_c(uint8_t *dst, ptrdiff_t stride,
+ 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];
+
+ DST(0, 3) = (l1 + l2 * 2 + l3 + 2) >> 2;
+ DST(0, 2) =
+ DST(1, 3) = (l0 + l1 * 2 + l2 + 2) >> 2;
+ DST(0, 1) =
+ DST(1, 2) =
+ DST(2, 3) = (tl + l0 * 2 + l1 + 2) >> 2;
+ DST(0, 0) =
+ DST(1, 1) =
+ DST(2, 2) =
+ DST(3, 3) = (l0 + tl * 2 + a0 + 2) >> 2;
+ DST(1, 0) =
+ DST(2, 1) =
+ DST(3, 2) = (tl + a0 * 2 + a1 + 2) >> 2;
+ DST(2, 0) =
+ DST(3, 1) = (a0 + a1 * 2 + a2 + 2) >> 2;
+ DST(3, 0) = (a1 + a2 * 2 + a3 + 2) >> 2;
+}
+
+#define def_diag_downright(size) \
+static void diag_downright_ ## size ## x ## size ## _c(uint8_t *dst, \
+ ptrdiff_t stride, \
+ const uint8_t *left, \
+ const uint8_t *top) \
+{ \
+ int i, j; \
+ 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[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] = (top[-1] + top[0] * 2 + top[1] + 2) >> 2; \
+ \
+ for (j = 0; j < size; j++) \
+ memcpy(dst + j * stride, v + size - 1 - j, size); \
+}
+
+def_diag_downright(8)
+def_diag_downright(16)
+def_diag_downright(32)
+
+static void vert_right_4x4_c(uint8_t *dst, ptrdiff_t stride,
+ 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];
+
+ DST(0, 3) = (l0 + l1 * 2 + l2 + 2) >> 2;
+ DST(0, 2) = (tl + l0 * 2 + l1 + 2) >> 2;
+ DST(0, 0) =
+ DST(1, 2) = (tl + a0 + 1) >> 1;
+ DST(0, 1) =
+ DST(1, 3) = (l0 + tl * 2 + a0 + 2) >> 2;
+ DST(1, 0) =
+ DST(2, 2) = (a0 + a1 + 1) >> 1;
+ DST(1, 1) =
+ DST(2, 3) = (tl + a0 * 2 + a1 + 2) >> 2;
+ DST(2, 0) =
+ DST(3, 2) = (a1 + a2 + 1) >> 1;
+ DST(2, 1) =
+ DST(3, 3) = (a0 + a1 * 2 + a2 + 2) >> 2;
+ DST(3, 0) = (a2 + a3 + 1) >> 1;
+ DST(3, 1) = (a1 + a2 * 2 + a3 + 2) >> 2;
+}
+
+#define def_vert_right(size) \
+static void vert_right_ ## size ## x ## size ## _c(uint8_t *dst, \
+ ptrdiff_t stride, \
+ const uint8_t *left, \
+ const uint8_t *top) \
+{ \
+ int i, j; \
+ 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[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; \
+ \
+ ve[size / 2 - 1] = (top[-1] + top[0] + 1) >> 1; \
+ vo[size / 2 - 1] = (left[0] + 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; \
+ } \
+ \
+ for (j = 0; j < size / 2; j++) { \
+ memcpy(dst + j * 2 * stride, ve + size / 2 - 1 - j, size); \
+ memcpy(dst + (j * 2 + 1) * stride, vo + size / 2 - 1 - j, size); \
+ } \
+}
+
+def_vert_right(8)
+def_vert_right(16)
+def_vert_right(32)
+
+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],
+ tl = top[-1], a0 = top[0], a1 = top[1], a2 = top[2];
+
+ DST(2, 0) = (tl + a0 * 2 + a1 + 2) >> 2;
+ DST(3, 0) = (a0 + a1 * 2 + a2 + 2) >> 2;
+ DST(0, 0) =
+ DST(2, 1) = (tl + l0 + 1) >> 1;
+ DST(1, 0) =
+ DST(3, 1) = (a0 + tl * 2 + l0 + 2) >> 2;
+ DST(0, 1) =
+ DST(2, 2) = (l0 + l1 + 1) >> 1;
+ DST(1, 1) =
+ DST(3, 2) = (tl + l0 * 2 + l1 + 2) >> 2;
+ DST(0, 2) =
+ DST(2, 3) = (l1 + l2 + 1) >> 1;
+ DST(1, 2) =
+ DST(3, 3) = (l0 + l1 * 2 + l2 + 2) >> 2;
+ DST(0, 3) = (l2 + l3 + 1) >> 1;
+ DST(1, 3) = (l1 + l2 * 2 + l3 + 2) >> 2;
+}
+
+#define def_hor_down(size) \
+static void hor_down_ ## size ## x ## size ## _c(uint8_t *dst, \
+ ptrdiff_t stride, \
+ const uint8_t *left, \
+ const uint8_t *top) \
+{ \
+ int i, j; \
+ 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[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; \
+ \
+ for (j = 0; j < size; j++) \
+ memcpy(dst + j * stride, v + size * 2 - 2 - j * 2, size); \
+}
+
+def_hor_down(8)
+def_hor_down(16)
+def_hor_down(32)
+
+static void vert_left_4x4_c(uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top)
+{
+ int a0 = top[0], a1 = top[1], a2 = top[2], a3 = top[3],
+ a4 = top[4], a5 = top[5], a6 = top[6];
+
+ DST(0, 0) = (a0 + a1 + 1) >> 1;
+ DST(0, 1) = (a0 + a1 * 2 + a2 + 2) >> 2;
+ DST(1, 0) =
+ DST(0, 2) = (a1 + a2 + 1) >> 1;
+ DST(1, 1) =
+ DST(0, 3) = (a1 + a2 * 2 + a3 + 2) >> 2;
+ DST(2, 0) =
+ DST(1, 2) = (a2 + a3 + 1) >> 1;
+ DST(2, 1) =
+ DST(1, 3) = (a2 + a3 * 2 + a4 + 2) >> 2;
+ DST(3, 0) =
+ DST(2, 2) = (a3 + a4 + 1) >> 1;
+ DST(3, 1) =
+ DST(2, 3) = (a3 + a4 * 2 + a5 + 2) >> 2;
+ DST(3, 2) = (a4 + a5 + 1) >> 1;
+ DST(3, 3) = (a4 + a5 * 2 + a6 + 2) >> 2;
+}
+
+#define def_vert_left(size) \
+static void vert_left_ ## size ## x ## size ## _c(uint8_t *dst, \
+ ptrdiff_t stride, \
+ const uint8_t *left, \
+ const uint8_t *top) \
+{ \
+ int i, j; \
+ uint8_t ve[size - 1], vo[size - 1]; \
+ \
+ for (i = 0; i < size - 2; i++) { \
+ ve[i] = (top[i] + top[i + 1] + 1) >> 1; \
+ vo[i] = (top[i] + top[i + 1] * 2 + top[i + 2] + 2) >> 2; \
+ } \
+ ve[size - 2] = (top[size - 2] + top[size - 1] + 1) >> 1; \
+ vo[size - 2] = (top[size - 2] + top[size - 1] * 3 + 2) >> 2; \
+ \
+ for (j = 0; j < size / 2; j++) { \
+ memcpy(dst + j * 2 * stride, ve + j, size - (j + 1)); \
+ memset(dst + j * 2 * stride + size - j - 1, \
+ top[size - 1], j + 1); \
+ memcpy(dst + (j * 2 + 1) * stride, vo + j, size - (j + 1)); \
+ memset(dst + (j * 2 + 1) * stride + size - j - 1, \
+ top[size - 1], j + 1); \
+ } \
+}
+
+def_vert_left(8)
+def_vert_left(16)
+def_vert_left(32)
+
+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];
+
+ DST(0, 0) = (l0 + l1 + 1) >> 1;
+ DST(1, 0) = (l0 + l1 * 2 + l2 + 2) >> 2;
+ DST(0, 1) =
+ DST(2, 0) = (l1 + l2 + 1) >> 1;
+ DST(1, 1) =
+ DST(3, 0) = (l1 + l2 * 2 + l3 + 2) >> 2;
+ DST(0, 2) =
+ DST(2, 1) = (l2 + l3 + 1) >> 1;
+ DST(1, 2) =
+ DST(3, 1) = (l2 + l3 * 3 + 2) >> 2;
+ DST(0, 3) =
+ DST(1, 3) =
+ DST(2, 2) =
+ DST(2, 3) =
+ DST(3, 2) =
+ DST(3, 3) = l3;
+}
+
+#define def_hor_up(size) \
+static void hor_up_ ## size ## x ## size ## _c(uint8_t *dst, \
+ ptrdiff_t stride, \
+ const uint8_t *left, \
+ const uint8_t *top) \
+{ \
+ int i, j; \
+ 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[size * 2 - 4] = (left[size - 2] + left[size - 1] + 1) >> 1; \
+ v[size * 2 - 3] = (left[size - 2] + left[size - 1] * 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], \
+ 2 + j * 2 - size); \
+ } \
+}
+
+def_hor_up(8)
+def_hor_up(16)
+def_hor_up(32)
+
+#undef DST
+
+static av_cold void vp9dsp_intrapred_init(VP9DSPContext *dsp)
+{
+#define init_intra_pred(tx, sz) \
+ dsp->intra_pred[tx][VERT_PRED] = vert_ ## sz ## _c; \
+ dsp->intra_pred[tx][HOR_PRED] = hor_ ## sz ## _c; \
+ dsp->intra_pred[tx][DC_PRED] = dc_ ## sz ## _c; \
+ dsp->intra_pred[tx][DIAG_DOWN_LEFT_PRED] = diag_downleft_ ## sz ## _c; \
+ dsp->intra_pred[tx][DIAG_DOWN_RIGHT_PRED] = diag_downright_ ## sz ## _c; \
+ dsp->intra_pred[tx][VERT_RIGHT_PRED] = vert_right_ ## sz ## _c; \
+ dsp->intra_pred[tx][HOR_DOWN_PRED] = hor_down_ ## sz ## _c; \
+ dsp->intra_pred[tx][VERT_LEFT_PRED] = vert_left_ ## sz ## _c; \
+ dsp->intra_pred[tx][HOR_UP_PRED] = hor_up_ ## sz ## _c; \
+ dsp->intra_pred[tx][TM_VP8_PRED] = tm_ ## sz ## _c; \
+ dsp->intra_pred[tx][LEFT_DC_PRED] = dc_left_ ## sz ## _c; \
+ dsp->intra_pred[tx][TOP_DC_PRED] = dc_top_ ## sz ## _c; \
+ dsp->intra_pred[tx][DC_128_PRED] = dc_128_ ## sz ## _c; \
+ dsp->intra_pred[tx][DC_127_PRED] = dc_127_ ## sz ## _c; \
+ dsp->intra_pred[tx][DC_129_PRED] = dc_129_ ## sz ## _c
+
+ init_intra_pred(TX_4X4, 4x4);
+ init_intra_pred(TX_8X8, 8x8);
+ init_intra_pred(TX_16X16, 16x16);
+ init_intra_pred(TX_32X32, 32x32);
+
+#undef init_intra_pred
+}
+
+#define itxfm_wrapper(type_a, type_b, sz, bits) \
+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]; \
+ for (i = 0; i < sz; i++) \
+ type_a ## sz ## _1d(tmp + i * sz, block + i, sz, 0); \
+ memset(block, 0, sz * sz * sizeof(*block)); \
+ for (i = 0; i < sz; i++) { \
+ type_b ## sz ## _1d(out, tmp + i, sz, 1); \
+ for (j = 0; j < sz; j++) \
+ dst[j * stride] = \
+ av_clip_uint8(dst[j * stride] + \
+ (bits ? (out[j] + (1 << (bits - 1))) >> bits \
+ : out[j])); \
+ dst++; \
+ } \
+}
+
+#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)
+
+#define IN(x) in[x * stride]
+
+static av_always_inline void idct4_1d(int16_t *out, const int16_t *in,
+ ptrdiff_t stride, int pass)
+{
+ int t0, t1, t2, t3;
+
+ t0 = ((IN(0) + IN(2)) * 11585 + (1 << 13)) >> 14;
+ t1 = ((IN(0) - IN(2)) * 11585 + (1 << 13)) >> 14;
+ t2 = (IN(1) * 6270 - IN(3) * 15137 + (1 << 13)) >> 14;
+ t3 = (IN(1) * 15137 + IN(3) * 6270 + (1 << 13)) >> 14;
+
+ out[0] = t0 + t3;
+ out[1] = t1 + t2;
+ out[2] = t1 - t2;
+ out[3] = t0 - t3;
+}
+
+static av_always_inline void iadst4_1d(int16_t *out, const int16_t *in,
+ ptrdiff_t stride, int pass)
+{
+ int t0, t1, t2, t3;
+
+ t0 = 5283 * IN(0) + 15212 * IN(2) + 9929 * IN(3);
+ t1 = 9929 * IN(0) - 5283 * IN(2) - 15212 * IN(3);
+ t2 = 13377 * (IN(0) - IN(2) + IN(3));
+ t3 = 13377 * IN(1);
+
+ out[0] = (t0 + t3 + (1 << 13)) >> 14;
+ out[1] = (t1 + t3 + (1 << 13)) >> 14;
+ out[2] = (t2 + (1 << 13)) >> 14;
+ out[3] = (t0 + t1 - t3 + (1 << 13)) >> 14;
+}
+
+itxfm_wrap(4, 4)
+
+static av_always_inline void idct8_1d(int16_t *out, const int16_t *in,
+ ptrdiff_t stride, int pass)
+{
+ int t0, t0a, t1, t1a, t2, t2a, t3, t3a, t4, t4a, t5, t5a, t6, t6a, t7, t7a;
+
+ t0a = ((IN(0) + IN(4)) * 11585 + (1 << 13)) >> 14;
+ t1a = ((IN(0) - IN(4)) * 11585 + (1 << 13)) >> 14;
+ t2a = (IN(2) * 6270 - IN(6) * 15137 + (1 << 13)) >> 14;
+ t3a = (IN(2) * 15137 + IN(6) * 6270 + (1 << 13)) >> 14;
+ t4a = (IN(1) * 3196 - IN(7) * 16069 + (1 << 13)) >> 14;
+ t5a = (IN(5) * 13623 - IN(3) * 9102 + (1 << 13)) >> 14;
+ t6a = (IN(5) * 9102 + IN(3) * 13623 + (1 << 13)) >> 14;
+ t7a = (IN(1) * 16069 + IN(7) * 3196 + (1 << 13)) >> 14;
+
+ t0 = t0a + t3a;
+ t1 = t1a + t2a;
+ t2 = t1a - t2a;
+ t3 = t0a - t3a;
+ t4 = t4a + t5a;
+ t5a = t4a - t5a;
+ t7 = t7a + t6a;
+ t6a = t7a - t6a;
+
+ t5 = ((t6a - t5a) * 11585 + (1 << 13)) >> 14;
+ t6 = ((t6a + t5a) * 11585 + (1 << 13)) >> 14;
+
+ out[0] = t0 + t7;
+ out[1] = t1 + t6;
+ out[2] = t2 + t5;
+ out[3] = t3 + t4;
+ out[4] = t3 - t4;
+ out[5] = t2 - t5;
+ out[6] = t1 - t6;
+ out[7] = t0 - t7;
+}
+
+static av_always_inline void iadst8_1d(int16_t *out, const int16_t *in,
+ ptrdiff_t stride, int pass)
+{
+ int t0, t0a, t1, t1a, t2, t2a, t3, t3a, t4, t4a, t5, t5a, t6, t6a, t7, t7a;
+
+ t0a = 16305 * IN(7) + 1606 * IN(0);
+ t1a = 1606 * IN(7) - 16305 * IN(0);
+ t2a = 14449 * IN(5) + 7723 * IN(2);
+ t3a = 7723 * IN(5) - 14449 * IN(2);
+ t4a = 10394 * IN(3) + 12665 * IN(4);
+ t5a = 12665 * IN(3) - 10394 * IN(4);
+ t6a = 4756 * IN(1) + 15679 * IN(6);
+ t7a = 15679 * IN(1) - 4756 * IN(6);
+
+ t0 = (t0a + t4a + (1 << 13)) >> 14;
+ t1 = (t1a + t5a + (1 << 13)) >> 14;
+ t2 = (t2a + t6a + (1 << 13)) >> 14;
+ t3 = (t3a + t7a + (1 << 13)) >> 14;
+ t4 = (t0a - t4a + (1 << 13)) >> 14;
+ t5 = (t1a - t5a + (1 << 13)) >> 14;
+ t6 = (t2a - t6a + (1 << 13)) >> 14;
+ t7 = (t3a - t7a + (1 << 13)) >> 14;
+
+ t4a = 15137 * t4 + 6270 * t5;
+ t5a = 6270 * t4 - 15137 * t5;
+ t6a = 15137 * t7 - 6270 * t6;
+ t7a = 6270 * t7 + 15137 * t6;
+
+ out[0] = t0 + t2;
+ out[7] = -(t1 + t3);
+ t2 = t0 - t2;
+ t3 = t1 - t3;
+
+ out[1] = -((t4a + t6a + (1 << 13)) >> 14);
+ out[6] = (t5a + t7a + (1 << 13)) >> 14;
+ t6 = (t4a - t6a + (1 << 13)) >> 14;
+ t7 = (t5a - t7a + (1 << 13)) >> 14;
+
+ out[3] = -(((t2 + t3) * 11585 + (1 << 13)) >> 14);
+ out[4] = ((t2 - t3) * 11585 + (1 << 13)) >> 14;
+ out[2] = ((t6 + t7) * 11585 + (1 << 13)) >> 14;
+ out[5] = -(((t6 - t7) * 11585 + (1 << 13)) >> 14);
+}
+
+itxfm_wrap(8, 5)
+
+static av_always_inline void idct16_1d(int16_t *out, const int16_t *in,
+ ptrdiff_t stride, int pass)
+{
+ int t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15;
+ int t0a, t1a, t2a, t3a, t4a, t5a, t6a, t7a;
+ int t8a, t9a, t10a, t11a, t12a, t13a, t14a, t15a;
+
+ t0a = ((IN(0) + IN(8)) * 11585 + (1 << 13)) >> 14;
+ t1a = ((IN(0) - IN(8)) * 11585 + (1 << 13)) >> 14;
+ t2a = (IN(4) * 6270 - IN(12) * 15137 + (1 << 13)) >> 14;
+ t3a = (IN(4) * 15137 + IN(12) * 6270 + (1 << 13)) >> 14;
+ t4a = (IN(2) * 3196 - IN(14) * 16069 + (1 << 13)) >> 14;
+ t7a = (IN(2) * 16069 + IN(14) * 3196 + (1 << 13)) >> 14;
+ t5a = (IN(10) * 13623 - IN(6) * 9102 + (1 << 13)) >> 14;
+ t6a = (IN(10) * 9102 + IN(6) * 13623 + (1 << 13)) >> 14;
+ t8a = (IN(1) * 1606 - IN(15) * 16305 + (1 << 13)) >> 14;
+ t15a = (IN(1) * 16305 + IN(15) * 1606 + (1 << 13)) >> 14;
+ t9a = (IN(9) * 12665 - IN(7) * 10394 + (1 << 13)) >> 14;
+ t14a = (IN(9) * 10394 + IN(7) * 12665 + (1 << 13)) >> 14;
+ t10a = (IN(5) * 7723 - IN(11) * 14449 + (1 << 13)) >> 14;
+ t13a = (IN(5) * 14449 + IN(11) * 7723 + (1 << 13)) >> 14;
+ t11a = (IN(13) * 15679 - IN(3) * 4756 + (1 << 13)) >> 14;
+ t12a = (IN(13) * 4756 + IN(3) * 15679 + (1 << 13)) >> 14;
+
+ t0 = t0a + t3a;
+ t1 = t1a + t2a;
+ t2 = t1a - t2a;
+ t3 = t0a - t3a;
+ t4 = t4a + t5a;
+ t5 = t4a - t5a;
+ t6 = t7a - t6a;
+ t7 = t7a + t6a;
+ t8 = t8a + t9a;
+ t9 = t8a - t9a;
+ t10 = t11a - t10a;
+ t11 = t11a + t10a;
+ t12 = t12a + t13a;
+ t13 = t12a - t13a;
+ t14 = t15a - t14a;
+ t15 = t15a + t14a;
+
+ t5a = ((t6 - t5) * 11585 + (1 << 13)) >> 14;
+ t6a = ((t6 + t5) * 11585 + (1 << 13)) >> 14;
+ t9a = (t14 * 6270 - t9 * 15137 + (1 << 13)) >> 14;
+ t14a = (t14 * 15137 + t9 * 6270 + (1 << 13)) >> 14;
+ t10a = (-(t13 * 15137 + t10 * 6270) + (1 << 13)) >> 14;
+ t13a = (t13 * 6270 - t10 * 15137 + (1 << 13)) >> 14;
+
+ t0a = t0 + t7;
+ t1a = t1 + t6a;
+ t2a = t2 + t5a;
+ t3a = t3 + t4;
+ t4 = t3 - t4;
+ t5 = t2 - t5a;
+ t6 = t1 - t6a;
+ t7 = t0 - t7;
+ t8a = t8 + t11;
+ t9 = t9a + t10a;
+ t10 = t9a - t10a;
+ t11a = t8 - t11;
+ t12a = t15 - t12;
+ t13 = t14a - t13a;
+ t14 = t14a + t13a;
+ t15a = t15 + t12;
+
+ t10a = ((t13 - t10) * 11585 + (1 << 13)) >> 14;
+ t13a = ((t13 + t10) * 11585 + (1 << 13)) >> 14;
+ t11 = ((t12a - t11a) * 11585 + (1 << 13)) >> 14;
+ t12 = ((t12a + t11a) * 11585 + (1 << 13)) >> 14;
+
+ out[0] = t0a + t15a;
+ out[1] = t1a + t14;
+ out[2] = t2a + t13a;
+ out[3] = t3a + t12;
+ out[4] = t4 + t11;
+ out[5] = t5 + t10a;
+ out[6] = t6 + t9;
+ out[7] = t7 + t8a;
+ out[8] = t7 - t8a;
+ out[9] = t6 - t9;
+ out[10] = t5 - t10a;
+ out[11] = t4 - t11;
+ out[12] = t3a - t12;
+ out[13] = t2a - t13a;
+ out[14] = t1a - t14;
+ out[15] = t0a - t15a;
+}
+
+static av_always_inline void iadst16_1d(int16_t *out, const int16_t *in,
+ ptrdiff_t stride, int pass)
+{
+ int t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15;
+ int t0a, t1a, t2a, t3a, t4a, t5a, t6a, t7a;
+ int t8a, t9a, t10a, t11a, t12a, t13a, t14a, t15a;
+
+ t0 = IN(15) * 16364 + IN(0) * 804;
+ t1 = IN(15) * 804 - IN(0) * 16364;
+ t2 = IN(13) * 15893 + IN(2) * 3981;
+ t3 = IN(13) * 3981 - IN(2) * 15893;
+ t4 = IN(11) * 14811 + IN(4) * 7005;
+ t5 = IN(11) * 7005 - IN(4) * 14811;
+ t6 = IN(9) * 13160 + IN(6) * 9760;
+ t7 = IN(9) * 9760 - IN(6) * 13160;
+ t8 = IN(7) * 11003 + IN(8) * 12140;
+ t9 = IN(7) * 12140 - IN(8) * 11003;
+ t10 = IN(5) * 8423 + IN(10) * 14053;
+ t11 = IN(5) * 14053 - IN(10) * 8423;
+ t12 = IN(3) * 5520 + IN(12) * 15426;
+ t13 = IN(3) * 15426 - IN(12) * 5520;
+ t14 = IN(1) * 2404 + IN(14) * 16207;
+ t15 = IN(1) * 16207 - IN(14) * 2404;
+
+ t0a = (t0 + t8 + (1 << 13)) >> 14;
+ t1a = (t1 + t9 + (1 << 13)) >> 14;
+ t2a = (t2 + t10 + (1 << 13)) >> 14;
+ t3a = (t3 + t11 + (1 << 13)) >> 14;
+ t4a = (t4 + t12 + (1 << 13)) >> 14;
+ t5a = (t5 + t13 + (1 << 13)) >> 14;
+ t6a = (t6 + t14 + (1 << 13)) >> 14;
+ t7a = (t7 + t15 + (1 << 13)) >> 14;
+ t8a = (t0 - t8 + (1 << 13)) >> 14;
+ t9a = (t1 - t9 + (1 << 13)) >> 14;
+ t10a = (t2 - t10 + (1 << 13)) >> 14;
+ t11a = (t3 - t11 + (1 << 13)) >> 14;
+ t12a = (t4 - t12 + (1 << 13)) >> 14;
+ t13a = (t5 - t13 + (1 << 13)) >> 14;
+ t14a = (t6 - t14 + (1 << 13)) >> 14;
+ t15a = (t7 - t15 + (1 << 13)) >> 14;
+
+ t8 = t8a * 16069 + t9a * 3196;
+ t9 = t8a * 3196 - t9a * 16069;
+ t10 = t10a * 9102 + t11a * 13623;
+ t11 = t10a * 13623 - t11a * 9102;
+ t12 = t13a * 16069 - t12a * 3196;
+ t13 = t13a * 3196 + t12a * 16069;
+ t14 = t15a * 9102 - t14a * 13623;
+ t15 = t15a * 13623 + t14a * 9102;
+
+ t0 = t0a + t4a;
+ t1 = t1a + t5a;
+ t2 = t2a + t6a;
+ t3 = t3a + t7a;
+ t4 = t0a - t4a;
+ t5 = t1a - t5a;
+ t6 = t2a - t6a;
+ t7 = t3a - t7a;
+ t8a = (t8 + t12 + (1 << 13)) >> 14;
+ t9a = (t9 + t13 + (1 << 13)) >> 14;
+ t10a = (t10 + t14 + (1 << 13)) >> 14;
+ t11a = (t11 + t15 + (1 << 13)) >> 14;
+ t12a = (t8 - t12 + (1 << 13)) >> 14;
+ t13a = (t9 - t13 + (1 << 13)) >> 14;
+ t14a = (t10 - t14 + (1 << 13)) >> 14;
+ t15a = (t11 - t15 + (1 << 13)) >> 14;
+
+ t4a = t4 * 15137 + t5 * 6270;
+ t5a = t4 * 6270 - t5 * 15137;
+ t6a = t7 * 15137 - t6 * 6270;
+ t7a = t7 * 6270 + t6 * 15137;
+ t12 = t12a * 15137 + t13a * 6270;
+ t13 = t12a * 6270 - t13a * 15137;
+ t14 = t15a * 15137 - t14a * 6270;
+ t15 = t15a * 6270 + t14a * 15137;
+
+ out[0] = t0 + t2;
+ out[15] = -(t1 + t3);
+ t2a = t0 - t2;
+ t3a = t1 - t3;
+ out[3] = -((t4a + t6a + (1 << 13)) >> 14);
+ out[12] = (t5a + t7a + (1 << 13)) >> 14;
+ t6 = (t4a - t6a + (1 << 13)) >> 14;
+ t7 = (t5a - t7a + (1 << 13)) >> 14;
+ out[1] = -(t8a + t10a);
+ out[14] = t9a + t11a;
+ t10 = t8a - t10a;
+ t11 = t9a - t11a;
+ out[2] = (t12 + t14 + (1 << 13)) >> 14;
+ out[13] = -((t13 + t15 + (1 << 13)) >> 14);
+ t14a = (t12 - t14 + (1 << 13)) >> 14;
+ t15a = (t13 - t15 + (1 << 13)) >> 14;
+
+ out[7] = ((t2a + t3a) * -11585 + (1 << 13)) >> 14;
+ out[8] = ((t2a - t3a) * 11585 + (1 << 13)) >> 14;
+ out[4] = ((t7 + t6) * 11585 + (1 << 13)) >> 14;
+ out[11] = ((t7 - t6) * 11585 + (1 << 13)) >> 14;
+ out[6] = ((t11 + t10) * 11585 + (1 << 13)) >> 14;
+ out[9] = ((t11 - t10) * 11585 + (1 << 13)) >> 14;
+ out[5] = ((t14a + t15a) * -11585 + (1 << 13)) >> 14;
+ out[10] = ((t14a - t15a) * 11585 + (1 << 13)) >> 14;
+}
+
+itxfm_wrap(16, 6)
+
+static av_always_inline void idct32_1d(int16_t *out, const int16_t *in,
+ ptrdiff_t stride, int pass)
+{
+ int t0a = ((IN(0) + IN(16)) * 11585 + (1 << 13)) >> 14;
+ int t1a = ((IN(0) - IN(16)) * 11585 + (1 << 13)) >> 14;
+ int t2a = (IN(8) * 6270 - IN(24) * 15137 + (1 << 13)) >> 14;
+ int t3a = (IN(8) * 15137 + IN(24) * 6270 + (1 << 13)) >> 14;
+ int t4a = (IN(4) * 3196 - IN(28) * 16069 + (1 << 13)) >> 14;
+ int t7a = (IN(4) * 16069 + IN(28) * 3196 + (1 << 13)) >> 14;
+ int t5a = (IN(20) * 13623 - IN(12) * 9102 + (1 << 13)) >> 14;
+ int t6a = (IN(20) * 9102 + IN(12) * 13623 + (1 << 13)) >> 14;
+ int t8a = (IN(2) * 1606 - IN(30) * 16305 + (1 << 13)) >> 14;
+ int t15a = (IN(2) * 16305 + IN(30) * 1606 + (1 << 13)) >> 14;
+ int t9a = (IN(18) * 12665 - IN(14) * 10394 + (1 << 13)) >> 14;
+ int t14a = (IN(18) * 10394 + IN(14) * 12665 + (1 << 13)) >> 14;
+ int t10a = (IN(10) * 7723 - IN(22) * 14449 + (1 << 13)) >> 14;
+ int t13a = (IN(10) * 14449 + IN(22) * 7723 + (1 << 13)) >> 14;
+ int t11a = (IN(26) * 15679 - IN(6) * 4756 + (1 << 13)) >> 14;
+ int t12a = (IN(26) * 4756 + IN(6) * 15679 + (1 << 13)) >> 14;
+ int t16a = (IN(1) * 804 - IN(31) * 16364 + (1 << 13)) >> 14;
+ int t31a = (IN(1) * 16364 + IN(31) * 804 + (1 << 13)) >> 14;
+ int t17a = (IN(17) * 12140 - IN(15) * 11003 + (1 << 13)) >> 14;
+ int t30a = (IN(17) * 11003 + IN(15) * 12140 + (1 << 13)) >> 14;
+ int t18a = (IN(9) * 7005 - IN(23) * 14811 + (1 << 13)) >> 14;
+ int t29a = (IN(9) * 14811 + IN(23) * 7005 + (1 << 13)) >> 14;
+ int t19a = (IN(25) * 15426 - IN(7) * 5520 + (1 << 13)) >> 14;
+ int t28a = (IN(25) * 5520 + IN(7) * 15426 + (1 << 13)) >> 14;
+ int t20a = (IN(5) * 3981 - IN(27) * 15893 + (1 << 13)) >> 14;
+ int t27a = (IN(5) * 15893 + IN(27) * 3981 + (1 << 13)) >> 14;
+ int t21a = (IN(21) * 14053 - IN(11) * 8423 + (1 << 13)) >> 14;
+ int t26a = (IN(21) * 8423 + IN(11) * 14053 + (1 << 13)) >> 14;
+ int t22a = (IN(13) * 9760 - IN(19) * 13160 + (1 << 13)) >> 14;
+ int t25a = (IN(13) * 13160 + IN(19) * 9760 + (1 << 13)) >> 14;
+ int t23a = (IN(29) * 16207 - IN(3) * 2404 + (1 << 13)) >> 14;
+ int t24a = (IN(29) * 2404 + IN(3) * 16207 + (1 << 13)) >> 14;
+
+ int t0 = t0a + t3a;
+ int t1 = t1a + t2a;
+ int t2 = t1a - t2a;
+ int t3 = t0a - t3a;
+ int t4 = t4a + t5a;
+ int t5 = t4a - t5a;
+ int t6 = t7a - t6a;
+ int t7 = t7a + t6a;
+ int t8 = t8a + t9a;
+ int t9 = t8a - t9a;
+ int t10 = t11a - t10a;
+ int t11 = t11a + t10a;
+ int t12 = t12a + t13a;
+ int t13 = t12a - t13a;
+ int t14 = t15a - t14a;
+ int t15 = t15a + t14a;
+ int t16 = t16a + t17a;
+ int t17 = t16a - t17a;
+ int t18 = t19a - t18a;
+ int t19 = t19a + t18a;
+ int t20 = t20a + t21a;
+ int t21 = t20a - t21a;
+ int t22 = t23a - t22a;
+ int t23 = t23a + t22a;
+ int t24 = t24a + t25a;
+ int t25 = t24a - t25a;
+ int t26 = t27a - t26a;
+ int t27 = t27a + t26a;
+ int t28 = t28a + t29a;
+ int t29 = t28a - t29a;
+ int t30 = t31a - t30a;
+ int t31 = t31a + t30a;
+
+ t5a = ((t6 - t5) * 11585 + (1 << 13)) >> 14;
+ t6a = ((t6 + t5) * 11585 + (1 << 13)) >> 14;
+ t9a = (t14 * 6270 - t9 * 15137 + (1 << 13)) >> 14;
+ t14a = (t14 * 15137 + t9 * 6270 + (1 << 13)) >> 14;
+ t10a = (-(t13 * 15137 + t10 * 6270) + (1 << 13)) >> 14;
+ t13a = (t13 * 6270 - t10 * 15137 + (1 << 13)) >> 14;
+ t17a = (t30 * 3196 - t17 * 16069 + (1 << 13)) >> 14;
+ t30a = (t30 * 16069 + t17 * 3196 + (1 << 13)) >> 14;
+ t18a = (-(t29 * 16069 + t18 * 3196) + (1 << 13)) >> 14;
+ t29a = (t29 * 3196 - t18 * 16069 + (1 << 13)) >> 14;
+ t21a = (t26 * 13623 - t21 * 9102 + (1 << 13)) >> 14;
+ t26a = (t26 * 9102 + t21 * 13623 + (1 << 13)) >> 14;
+ t22a = (-(t25 * 9102 + t22 * 13623) + (1 << 13)) >> 14;
+ t25a = (t25 * 13623 - t22 * 9102 + (1 << 13)) >> 14;
+
+ t0a = t0 + t7;
+ t1a = t1 + t6a;
+ t2a = t2 + t5a;
+ t3a = t3 + t4;
+ t4a = t3 - t4;
+ t5 = t2 - t5a;
+ t6 = t1 - t6a;
+ t7a = t0 - t7;
+ t8a = t8 + t11;
+ t9 = t9a + t10a;
+ t10 = t9a - t10a;
+ t11a = t8 - t11;
+ t12a = t15 - t12;
+ t13 = t14a - t13a;
+ t14 = t14a + t13a;
+ t15a = t15 + t12;
+ t16a = t16 + t19;
+ t17 = t17a + t18a;
+ t18 = t17a - t18a;
+ t19a = t16 - t19;
+ t20a = t23 - t20;
+ t21 = t22a - t21a;
+ t22 = t22a + t21a;
+ t23a = t23 + t20;
+ t24a = t24 + t27;
+ t25 = t25a + t26a;
+ t26 = t25a - t26a;
+ t27a = t24 - t27;
+ t28a = t31 - t28;
+ t29 = t30a - t29a;
+ t30 = t30a + t29a;
+ t31a = t31 + t28;
+
+ t10a = ((t13 - t10) * 11585 + (1 << 13)) >> 14;
+ t13a = ((t13 + t10) * 11585 + (1 << 13)) >> 14;
+ t11 = ((t12a - t11a) * 11585 + (1 << 13)) >> 14;
+ t12 = ((t12a + t11a) * 11585 + (1 << 13)) >> 14;
+ t18a = (t29 * 6270 - t18 * 15137 + (1 << 13)) >> 14;
+ t29a = (t29 * 15137 + t18 * 6270 + (1 << 13)) >> 14;
+ t19 = (t28a * 6270 - t19a * 15137 + (1 << 13)) >> 14;
+ t28 = (t28a * 15137 + t19a * 6270 + (1 << 13)) >> 14;
+ t20 = (-(t27a * 15137 + t20a * 6270) + (1 << 13)) >> 14;
+ t27 = (t27a * 6270 - t20a * 15137 + (1 << 13)) >> 14;
+ t21a = (-(t26 * 15137 + t21 * 6270) + (1 << 13)) >> 14;
+ t26a = (t26 * 6270 - t21 * 15137 + (1 << 13)) >> 14;
+
+ t0 = t0a + t15a;
+ t1 = t1a + t14;
+ t2 = t2a + t13a;
+ t3 = t3a + t12;
+ t4 = t4a + t11;
+ t5a = t5 + t10a;
+ t6a = t6 + t9;
+ t7 = t7a + t8a;
+ t8 = t7a - t8a;
+ t9a = t6 - t9;
+ t10 = t5 - t10a;
+ t11a = t4a - t11;
+ t12a = t3a - t12;
+ t13 = t2a - t13a;
+ t14a = t1a - t14;
+ t15 = t0a - t15a;
+ t16 = t16a + t23a;
+ t17a = t17 + t22;
+ t18 = t18a + t21a;
+ t19a = t19 + t20;
+ t20a = t19 - t20;
+ t21 = t18a - t21a;
+ t22a = t17 - t22;
+ t23 = t16a - t23a;
+ t24 = t31a - t24a;
+ t25a = t30 - t25;
+ t26 = t29a - t26a;
+ t27a = t28 - t27;
+ t28a = t28 + t27;
+ t29 = t29a + t26a;
+ t30a = t30 + t25;
+ t31 = t31a + t24a;
+
+ t20 = ((t27a - t20a) * 11585 + (1 << 13)) >> 14;
+ t27 = ((t27a + t20a) * 11585 + (1 << 13)) >> 14;
+ t21a = ((t26 - t21) * 11585 + (1 << 13)) >> 14;
+ t26a = ((t26 + t21) * 11585 + (1 << 13)) >> 14;
+ t22 = ((t25a - t22a) * 11585 + (1 << 13)) >> 14;
+ t25 = ((t25a + t22a) * 11585 + (1 << 13)) >> 14;
+ t23a = ((t24 - t23) * 11585 + (1 << 13)) >> 14;
+ t24a = ((t24 + t23) * 11585 + (1 << 13)) >> 14;
+
+ out[0] = t0 + t31;
+ out[1] = t1 + t30a;
+ out[2] = t2 + t29;
+ out[3] = t3 + t28a;
+ out[4] = t4 + t27;
+ out[5] = t5a + t26a;
+ out[6] = t6a + t25;
+ out[7] = t7 + t24a;
+ out[8] = t8 + t23a;
+ out[9] = t9a + t22;
+ out[10] = t10 + t21a;
+ out[11] = t11a + t20;
+ out[12] = t12a + t19a;
+ out[13] = t13 + t18;
+ out[14] = t14a + t17a;
+ out[15] = t15 + t16;
+ out[16] = t15 - t16;
+ out[17] = t14a - t17a;
+ out[18] = t13 - t18;
+ out[19] = t12a - t19a;
+ out[20] = t11a - t20;
+ out[21] = t10 - t21a;
+ out[22] = t9a - t22;
+ out[23] = t8 - t23a;
+ out[24] = t7 - t24a;
+ out[25] = t6a - t25;
+ out[26] = t5a - t26a;
+ out[27] = t4 - t27;
+ out[28] = t3 - t28a;
+ out[29] = t2 - t29;
+ out[30] = t1 - t30a;
+ out[31] = t0 - t31;
+}
+
+itxfm_wrapper(idct, idct, 32, 6)
+
+static av_always_inline void iwht4_1d(int16_t *out, const int16_t *in,
+ ptrdiff_t stride, int pass)
+{
+ int t0, t1, t2, t3, t4;
+
+ if (pass == 0) {
+ t0 = IN(0) >> 2;
+ t1 = IN(3) >> 2;
+ t2 = IN(1) >> 2;
+ t3 = IN(2) >> 2;
+ } else {
+ t0 = IN(0);
+ t1 = IN(3);
+ t2 = IN(1);
+ t3 = IN(2);
+ }
+
+ t0 += t2;
+ t3 -= t1;
+ t4 = (t0 - t3) >> 1;
+ t1 = t4 - t1;
+ t2 = t4 - t2;
+ t0 -= t1;
+ t3 += t2;
+
+ out[0] = t0;
+ out[1] = t1;
+ out[2] = t2;
+ out[3] = t3;
+}
+
+itxfm_wrapper(iwht, iwht, 4, 0)
+
+#undef IN
+#undef itxfm_wrapper
+#undef itxfm_wrap
+
+static av_cold void vp9dsp_itxfm_init(VP9DSPContext *dsp)
+{
+#define init_itxfm(tx, sz) \
+ dsp->itxfm_add[tx][DCT_DCT] = idct_idct_ ## sz ## _add_c; \
+ dsp->itxfm_add[tx][DCT_ADST] = iadst_idct_ ## sz ## _add_c; \
+ dsp->itxfm_add[tx][ADST_DCT] = idct_iadst_ ## sz ## _add_c; \
+ dsp->itxfm_add[tx][ADST_ADST] = iadst_iadst_ ## sz ## _add_c
+
+#define init_idct(tx, nm) \
+ dsp->itxfm_add[tx][DCT_DCT] = \
+ dsp->itxfm_add[tx][ADST_DCT] = \
+ dsp->itxfm_add[tx][DCT_ADST] = \
+ dsp->itxfm_add[tx][ADST_ADST] = nm ## _add_c
+
+ init_itxfm(TX_4X4, 4x4);
+ init_itxfm(TX_8X8, 8x8);
+ init_itxfm(TX_16X16, 16x16);
+ init_idct(TX_32X32, idct_idct_32x32);
+ init_idct(4 /* lossless */, iwht_iwht_4x4);
+
+#undef init_itxfm
+#undef init_idct
+}
+
+static av_always_inline void loop_filter(uint8_t *dst, ptrdiff_t stride,
+ int E, int I, int H,
+ ptrdiff_t stridea, ptrdiff_t strideb,
+ int wd)
+{
+ int i;
+
+ for (i = 0; i < 8; i++, dst += stridea) {
+ int p7, p6, p5, p4;
+ int p3 = dst[strideb * -4], p2 = dst[strideb * -3];
+ int p1 = dst[strideb * -2], p0 = dst[strideb * -1];
+ int q0 = dst[strideb * +0], q1 = dst[strideb * +1];
+ int q2 = dst[strideb * +2], q3 = dst[strideb * +3];
+ int q4, q5, q6, q7;
+ int fm = FFABS(p3 - p2) <= I && FFABS(p2 - p1) <= I &&
+ FFABS(p1 - p0) <= I && FFABS(q1 - q0) <= I &&
+ FFABS(q2 - q1) <= I && FFABS(q3 - q2) <= I &&
+ FFABS(p0 - q0) * 2 + (FFABS(p1 - q1) >> 1) <= E;
+ int flat8out, flat8in;
+
+ if (!fm)
+ continue;
+
+ if (wd >= 16) {
+ p7 = dst[strideb * -8];
+ p6 = dst[strideb * -7];
+ p5 = dst[strideb * -6];
+ p4 = dst[strideb * -5];
+ q4 = dst[strideb * +4];
+ q5 = dst[strideb * +5];
+ q6 = dst[strideb * +6];
+ q7 = dst[strideb * +7];
+
+ flat8out = FFABS(p7 - p0) <= 1 && FFABS(p6 - p0) <= 1 &&
+ FFABS(p5 - p0) <= 1 && FFABS(p4 - p0) <= 1 &&
+ FFABS(q4 - q0) <= 1 && FFABS(q5 - q0) <= 1 &&
+ FFABS(q6 - q0) <= 1 && FFABS(q7 - q0) <= 1;
+ }
+
+ if (wd >= 8)
+ flat8in = FFABS(p3 - p0) <= 1 && FFABS(p2 - p0) <= 1 &&
+ FFABS(p1 - p0) <= 1 && FFABS(q1 - q0) <= 1 &&
+ FFABS(q2 - q0) <= 1 && FFABS(q3 - q0) <= 1;
+
+ if (wd >= 16 && flat8out && flat8in) {
+ dst[strideb * -7] = (p7 + p7 + p7 + p7 + p7 + p7 + p7 + p6 * 2 +
+ p5 + p4 + p3 + p2 + p1 + p0 + q0 + 8) >> 4;
+ dst[strideb * -6] = (p7 + p7 + p7 + p7 + p7 + p7 + p6 + p5 * 2 +
+ p4 + p3 + p2 + p1 + p0 + q0 + q1 + 8) >> 4;
+ dst[strideb * -5] = (p7 + p7 + p7 + p7 + p7 + p6 + p5 + p4 * 2 +
+ p3 + p2 + p1 + p0 + q0 + q1 + q2 + 8) >> 4;
+ dst[strideb * -4] = (p7 + p7 + p7 + p7 + p6 + p5 + p4 + p3 * 2 +
+ p2 + p1 + p0 + q0 + q1 + q2 + q3 + 8) >> 4;
+ dst[strideb * -3] = (p7 + p7 + p7 + p6 + p5 + p4 + p3 + p2 * 2 +
+ p1 + p0 + q0 + q1 + q2 + q3 + q4 + 8) >> 4;
+ dst[strideb * -2] = (p7 + p7 + p6 + p5 + p4 + p3 + p2 + p1 * 2 +
+ p0 + q0 + q1 + q2 + q3 + q4 + q5 + 8) >> 4;
+ dst[strideb * -1] = (p7 + p6 + p5 + p4 + p3 + p2 + p1 + p0 * 2 +
+ q0 + q1 + q2 + q3 + q4 + q5 + q6 + 8) >> 4;
+ dst[strideb * +0] = (p6 + p5 + p4 + p3 + p2 + p1 + p0 + q0 * 2 +
+ q1 + q2 + q3 + q4 + q5 + q6 + q7 + 8) >> 4;
+ dst[strideb * +1] = (p5 + p4 + p3 + p2 + p1 + p0 + q0 + q1 * 2 +
+ q2 + q3 + q4 + q5 + q6 + q7 + q7 + 8) >> 4;
+ dst[strideb * +2] = (p4 + p3 + p2 + p1 + p0 + q0 + q1 + q2 * 2 +
+ q3 + q4 + q5 + q6 + q7 + q7 + q7 + 8) >> 4;
+ dst[strideb * +3] = (p3 + p2 + p1 + p0 + q0 + q1 + q2 + q3 * 2 +
+ q4 + q5 + q6 + q7 + q7 + q7 + q7 + 8) >> 4;
+ dst[strideb * +4] = (p2 + p1 + p0 + q0 + q1 + q2 + q3 + q4 * 2 +
+ q5 + q6 + q7 + q7 + q7 + q7 + q7 + 8) >> 4;
+ dst[strideb * +5] = (p1 + p0 + q0 + q1 + q2 + q3 + q4 + q5 * 2 +
+ q6 + q7 + q7 + q7 + q7 + q7 + q7 + 8) >> 4;
+ dst[strideb * +6] = (p0 + q0 + q1 + q2 + q3 + q4 + q5 + q6 * 2 +
+ q7 + q7 + q7 + q7 + q7 + q7 + q7 + 8) >> 4;
+ } else if (wd >= 8 && flat8in) {
+ dst[strideb * -3] = (p3 + p3 + p3 + 2 * p2 + p1 + p0 + q0 + 4) >> 3;
+ dst[strideb * -2] = (p3 + p3 + p2 + 2 * p1 + p0 + q0 + q1 + 4) >> 3;
+ dst[strideb * -1] = (p3 + p2 + p1 + 2 * p0 + q0 + q1 + q2 + 4) >> 3;
+ dst[strideb * +0] = (p2 + p1 + p0 + 2 * q0 + q1 + q2 + q3 + 4) >> 3;
+ dst[strideb * +1] = (p1 + p0 + q0 + 2 * q1 + q2 + q3 + q3 + 4) >> 3;
+ dst[strideb * +2] = (p0 + q0 + q1 + 2 * q2 + q3 + q3 + q3 + 4) >> 3;
+ } else {
+ int hev = FFABS(p1 - p0) > H || FFABS(q1 - q0) > H;
+
+ if (hev) {
+ int f = av_clip_int8(3 * (q0 - p0) + av_clip_int8(p1 - q1));
+ int f1 = FFMIN(f + 4, 127) >> 3;
+ int f2 = FFMIN(f + 3, 127) >> 3;
+
+ dst[strideb * -1] = av_clip_uint8(p0 + f2);
+ dst[strideb * +0] = av_clip_uint8(q0 - f1);
+ } else {
+ int f = av_clip_int8(3 * (q0 - p0));
+ int f1 = FFMIN(f + 4, 127) >> 3;
+ int f2 = FFMIN(f + 3, 127) >> 3;
+
+ dst[strideb * -1] = av_clip_uint8(p0 + f2);
+ dst[strideb * +0] = av_clip_uint8(q0 - f1);
+
+ f = (f1 + 1) >> 1;
+ dst[strideb * -2] = av_clip_uint8(p1 + f);
+ dst[strideb * +1] = av_clip_uint8(q1 - f);
+ }
+ }
+ }
+}
+
+#define lf_8_fn(dir, wd, stridea, strideb) \
+static void loop_filter_ ## dir ## _ ## wd ## _8_c(uint8_t *dst, \
+ ptrdiff_t stride, \
+ int E, int I, int H) \
+{ \
+ loop_filter(dst, stride, E, I, H, stridea, strideb, wd); \
+}
+
+#define lf_8_fns(wd) \
+ lf_8_fn(h, wd, stride, 1) \
+ lf_8_fn(v, wd, 1, stride)
+
+lf_8_fns(4)
+lf_8_fns(8)
+lf_8_fns(16)
+
+#undef lf_8_fn
+#undef lf_8_fns
+
+#define lf_16_fn(dir, stridea) \
+static void loop_filter_ ## dir ## _16_16_c(uint8_t *dst, \
+ ptrdiff_t stride, \
+ int E, int I, int H) \
+{ \
+ loop_filter_ ## dir ## _16_8_c(dst, stride, E, I, H); \
+ loop_filter_ ## dir ## _16_8_c(dst + 8 * stridea, stride, E, I, H); \
+}
+
+lf_16_fn(h, stride)
+lf_16_fn(v, 1)
+
+#undef lf_16_fn
+
+#define lf_mix_fn(dir, wd1, wd2, stridea) \
+static void loop_filter_ ## dir ## _ ## wd1 ## wd2 ## _16_c(uint8_t *dst, \
+ ptrdiff_t stride, \
+ int E, int I, \
+ int H) \
+{ \
+ loop_filter_ ## dir ## _ ## wd1 ## _8_c(dst, stride, E & 0xff, \
+ I & 0xff, H & 0xff); \
+ loop_filter_ ## dir ## _ ## wd2 ## _8_c(dst + 8 * stridea, stride, \
+ E >> 8, I >> 8, H >> 8); \
+}
+
+#define lf_mix_fns(wd1, wd2) \
+ lf_mix_fn(h, wd1, wd2, stride) \
+ lf_mix_fn(v, wd1, wd2, 1)
+
+lf_mix_fns(4, 4)
+lf_mix_fns(4, 8)
+lf_mix_fns(8, 4)
+lf_mix_fns(8, 8)
+
+#undef lf_mix_fn
+#undef lf_mix_fns
+
+static av_cold void vp9dsp_loopfilter_init(VP9DSPContext *dsp)
+{
+ dsp->loop_filter_8[0][0] = loop_filter_h_4_8_c;
+ dsp->loop_filter_8[0][1] = loop_filter_v_4_8_c;
+ dsp->loop_filter_8[1][0] = loop_filter_h_8_8_c;
+ dsp->loop_filter_8[1][1] = loop_filter_v_8_8_c;
+ dsp->loop_filter_8[2][0] = loop_filter_h_16_8_c;
+ dsp->loop_filter_8[2][1] = loop_filter_v_16_8_c;
+
+ dsp->loop_filter_16[0] = loop_filter_h_16_16_c;
+ dsp->loop_filter_16[1] = loop_filter_v_16_16_c;
+
+ dsp->loop_filter_mix2[0][0][0] = loop_filter_h_44_16_c;
+ dsp->loop_filter_mix2[0][0][1] = loop_filter_v_44_16_c;
+ dsp->loop_filter_mix2[0][1][0] = loop_filter_h_48_16_c;
+ dsp->loop_filter_mix2[0][1][1] = loop_filter_v_48_16_c;
+ dsp->loop_filter_mix2[1][0][0] = loop_filter_h_84_16_c;
+ dsp->loop_filter_mix2[1][0][1] = loop_filter_v_84_16_c;
+ dsp->loop_filter_mix2[1][1][0] = loop_filter_h_88_16_c;
+ dsp->loop_filter_mix2[1][1][1] = loop_filter_v_88_16_c;
+}
+
+static av_always_inline void copy_c(uint8_t *dst, const uint8_t *src,
+ ptrdiff_t dst_stride,
+ ptrdiff_t src_stride,
+ int w, int h)
+{
+ do {
+ memcpy(dst, src, w);
+
+ dst += dst_stride;
+ src += src_stride;
+ } while (--h);
+}
+
+static av_always_inline void avg_c(uint8_t *dst, const uint8_t *src,
+ ptrdiff_t dst_stride,
+ ptrdiff_t src_stride,
+ int w, int h)
+{
+ do {
+ int x;
+
+ for (x = 0; x < w; x += 4)
+ AV_WN32A(&dst[x], rnd_avg32(AV_RN32A(&dst[x]), AV_RN32(&src[x])));
+
+ dst += dst_stride;
+ src += src_stride;
+ } while (--h);
+}
+
+#define fpel_fn(type, sz) \
+static void type ## sz ## _c(uint8_t *dst, const uint8_t *src, \
+ ptrdiff_t dst_stride, \
+ ptrdiff_t src_stride, \
+ int h, int mx, int my) \
+{ \
+ type ## _c(dst, src, dst_stride, src_stride, sz, h); \
+}
+
+#define copy_avg_fn(sz) \
+ fpel_fn(copy, sz) \
+ fpel_fn(avg, sz)
+
+copy_avg_fn(64)
+copy_avg_fn(32)
+copy_avg_fn(16)
+copy_avg_fn(8)
+copy_avg_fn(4)
+
+#undef fpel_fn
+#undef copy_avg_fn
+
+static const int8_t vp9_subpel_filters[3][15][8] = {
+ [FILTER_8TAP_REGULAR] = {
+ { 0, 1, -5, 126, 8, -3, 1, 0 },
+ { -1, 3, -10, 122, 18, -6, 2, 0 },
+ { -1, 4, -13, 118, 27, -9, 3, -1 },
+ { -1, 4, -16, 112, 37, -11, 4, -1 },
+ { -1, 5, -18, 105, 48, -14, 4, -1 },
+ { -1, 5, -19, 97, 58, -16, 5, -1 },
+ { -1, 6, -19, 88, 68, -18, 5, -1 },
+ { -1, 6, -19, 78, 78, -19, 6, -1 },
+ { -1, 5, -18, 68, 88, -19, 6, -1 },
+ { -1, 5, -16, 58, 97, -19, 5, -1 },
+ { -1, 4, -14, 48, 105, -18, 5, -1 },
+ { -1, 4, -11, 37, 112, -16, 4, -1 },
+ { -1, 3, -9, 27, 118, -13, 4, -1 },
+ { 0, 2, -6, 18, 122, -10, 3, -1 },
+ { 0, 1, -3, 8, 126, -5, 1, 0 },
+ }, [FILTER_8TAP_SHARP] = {
+ { -1, 3, -7, 127, 8, -3, 1, 0 },
+ { -2, 5, -13, 125, 17, -6, 3, -1 },
+ { -3, 7, -17, 121, 27, -10, 5, -2 },
+ { -4, 9, -20, 115, 37, -13, 6, -2 },
+ { -4, 10, -23, 108, 48, -16, 8, -3 },
+ { -4, 10, -24, 100, 59, -19, 9, -3 },
+ { -4, 11, -24, 90, 70, -21, 10, -4 },
+ { -4, 11, -23, 80, 80, -23, 11, -4 },
+ { -4, 10, -21, 70, 90, -24, 11, -4 },
+ { -3, 9, -19, 59, 100, -24, 10, -4 },
+ { -3, 8, -16, 48, 108, -23, 10, -4 },
+ { -2, 6, -13, 37, 115, -20, 9, -4 },
+ { -2, 5, -10, 27, 121, -17, 7, -3 },
+ { -1, 3, -6, 17, 125, -13, 5, -2 },
+ { 0, 1, -3, 8, 127, -7, 3, -1 },
+ }, [FILTER_8TAP_SMOOTH] = {
+ { -3, -1, 32, 64, 38, 1, -3, 0 },
+ { -2, -2, 29, 63, 41, 2, -3, 0 },
+ { -2, -2, 26, 63, 43, 4, -4, 0 },
+ { -2, -3, 24, 62, 46, 5, -4, 0 },
+ { -2, -3, 21, 60, 49, 7, -4, 0 },
+ { -1, -4, 18, 59, 51, 9, -4, 0 },
+ { -1, -4, 16, 57, 53, 12, -4, -1 },
+ { -1, -4, 14, 55, 55, 14, -4, -1 },
+ { -1, -4, 12, 53, 57, 16, -4, -1 },
+ { 0, -4, 9, 51, 59, 18, -4, -1 },
+ { 0, -4, 7, 49, 60, 21, -3, -2 },
+ { 0, -4, 5, 46, 62, 24, -3, -2 },
+ { 0, -4, 4, 43, 63, 26, -2, -2 },
+ { 0, -3, 2, 41, 63, 29, -2, -2 },
+ { 0, -3, 1, 38, 64, 32, -1, -3 },
+ }
+};
+
+#define FILTER_8TAP(src, x, F, stride) \
+ av_clip_uint8((F[0] * src[x + -3 * stride] + \
+ F[1] * src[x + -2 * stride] + \
+ F[2] * src[x + -1 * stride] + \
+ F[3] * src[x + +0 * stride] + \
+ F[4] * src[x + +1 * stride] + \
+ F[5] * src[x + +2 * stride] + \
+ F[6] * src[x + +3 * stride] + \
+ F[7] * src[x + +4 * stride] + 64) >> 7)
+
+static av_always_inline void do_8tap_1d_c(uint8_t *dst, const uint8_t *src,
+ ptrdiff_t dst_stride,
+ ptrdiff_t src_stride,
+ int w, int h, ptrdiff_t ds,
+ const int8_t *filter, int avg)
+{
+ do {
+ int x;
+
+ for (x = 0; x < w; x++)
+ if (avg)
+ dst[x] = (dst[x] + FILTER_8TAP(src, x, filter, ds) + 1) >> 1;
+ else
+ dst[x] = FILTER_8TAP(src, x, filter, ds);
+
+ dst += dst_stride;
+ src += src_stride;
+ } while (--h);
+}
+
+#define filter_8tap_1d_fn(opn, opa, dir, ds) \
+static av_noinline void opn ## _8tap_1d_ ## dir ## _c(uint8_t *dst, \
+ const uint8_t *src, \
+ ptrdiff_t dst_stride, \
+ ptrdiff_t src_stride, \
+ int w, int h, \
+ const int8_t *filter) \
+{ \
+ do_8tap_1d_c(dst, src, dst_stride, src_stride, w, h, ds, filter, opa); \
+}
+
+filter_8tap_1d_fn(put, 0, v, src_stride)
+filter_8tap_1d_fn(put, 0, h, 1)
+filter_8tap_1d_fn(avg, 1, v, src_stride)
+filter_8tap_1d_fn(avg, 1, h, 1)
+
+#undef filter_8tap_1d_fn
+
+static av_always_inline void do_8tap_2d_c(uint8_t *dst, const uint8_t *src,
+ ptrdiff_t dst_stride,
+ ptrdiff_t src_stride,
+ int w, int h, const int8_t *filterx,
+ const int8_t *filtery, int avg)
+{
+ int tmp_h = h + 7;
+ uint8_t tmp[64 * 71], *tmp_ptr = tmp;
+
+ src -= src_stride * 3;
+ do {
+ int x;
+
+ for (x = 0; x < w; x++)
+ tmp_ptr[x] = FILTER_8TAP(src, x, filterx, 1);
+
+ tmp_ptr += 64;
+ src += src_stride;
+ } while (--tmp_h);
+
+ tmp_ptr = tmp + 64 * 3;
+ do {
+ int x;
+
+ for (x = 0; x < w; x++)
+ if (avg)
+ dst[x] = (dst[x] + FILTER_8TAP(tmp_ptr, x, filtery, 64) + 1) >> 1;
+ else
+ dst[x] = FILTER_8TAP(tmp_ptr, x, filtery, 64);
+
+ tmp_ptr += 64;
+ dst += dst_stride;
+ } while (--h);
+}
+
+#define filter_8tap_2d_fn(opn, opa) \
+static av_noinline void opn ## _8tap_2d_hv_c(uint8_t *dst, \
+ const uint8_t *src, \
+ ptrdiff_t dst_stride, \
+ ptrdiff_t src_stride, \
+ int w, int h, \
+ const int8_t *filterx, \
+ const int8_t *filtery) \
+{ \
+ do_8tap_2d_c(dst, src, dst_stride, src_stride, \
+ w, h, filterx, filtery, opa); \
+}
+
+filter_8tap_2d_fn(put, 0)
+filter_8tap_2d_fn(avg, 1)
+
+#undef filter_8tap_2d_fn
+
+#undef FILTER_8TAP
+
+#define filter_fn_1d(sz, dir, dir_m, type, type_idx, avg) \
+static void \
+avg ## _8tap_ ## type ## _ ## sz ## dir ## _c(uint8_t *dst, \
+ const uint8_t *src, \
+ ptrdiff_t dst_stride, \
+ ptrdiff_t src_stride, \
+ int h, int mx, int my) \
+{ \
+ avg ## _8tap_1d_ ## dir ## _c(dst, src, dst_stride, src_stride, sz, h, \
+ vp9_subpel_filters[type_idx][dir_m - 1]); \
+}
+
+#define filter_fn_2d(sz, type, type_idx, avg) \
+static void avg ## _8tap_ ## type ## _ ## sz ## hv_c(uint8_t *dst, \
+ const uint8_t *src, \
+ ptrdiff_t dst_stride, \
+ ptrdiff_t src_stride, \
+ int h, int mx, int my) \
+{ \
+ avg ## _8tap_2d_hv_c(dst, src, dst_stride, src_stride, sz, h, \
+ vp9_subpel_filters[type_idx][mx - 1], \
+ vp9_subpel_filters[type_idx][my - 1]); \
+}
+
+#define FILTER_BILIN(src, x, mxy, stride) \
+ (src[x] + ((mxy * (src[x + stride] - src[x]) + 8) >> 4))
+
+static av_always_inline void do_bilin_1d_c(uint8_t *dst,
+ const uint8_t *src,
+ ptrdiff_t dst_stride,
+ ptrdiff_t src_stride,
+ int w, int h, ptrdiff_t ds,
+ int mxy, int avg)
+{
+ do {
+ int x;
+
+ for (x = 0; x < w; x++)
+ if (avg)
+ dst[x] = (dst[x] + FILTER_BILIN(src, x, mxy, ds) + 1) >> 1;
+ else
+ dst[x] = FILTER_BILIN(src, x, mxy, ds);
+
+ dst += dst_stride;
+ src += src_stride;
+ } while (--h);
+}
+
+#define bilin_1d_fn(opn, opa, dir, ds) \
+static av_noinline void opn ## _bilin_1d_ ## dir ## _c(uint8_t *dst, \
+ const uint8_t *src, \
+ ptrdiff_t dst_stride, \
+ ptrdiff_t src_stride, \
+ int w, int h, int mxy) \
+{ \
+ do_bilin_1d_c(dst, src, dst_stride, src_stride, w, h, ds, mxy, opa); \
+}
+
+bilin_1d_fn(put, 0, v, src_stride)
+bilin_1d_fn(put, 0, h, 1)
+bilin_1d_fn(avg, 1, v, src_stride)
+bilin_1d_fn(avg, 1, h, 1)
+
+#undef bilin_1d_fn
+
+static av_always_inline void do_bilin_2d_c(uint8_t *dst,
+ const uint8_t *src,
+ ptrdiff_t dst_stride,
+ ptrdiff_t src_stride,
+ int w, int h, int mx, int my,
+ int avg)
+{
+ uint8_t tmp[64 * 65], *tmp_ptr = tmp;
+ int tmp_h = h + 1;
+
+ do {
+ int x;
+
+ for (x = 0; x < w; x++)
+ tmp_ptr[x] = FILTER_BILIN(src, x, mx, 1);
+
+ tmp_ptr += 64;
+ src += src_stride;
+ } while (--tmp_h);
+
+ tmp_ptr = tmp;
+ do {
+ int x;
+
+ for (x = 0; x < w; x++)
+ if (avg)
+ dst[x] = (dst[x] + FILTER_BILIN(tmp_ptr, x, my, 64) + 1) >> 1;
+ else
+ dst[x] = FILTER_BILIN(tmp_ptr, x, my, 64);
+
+ tmp_ptr += 64;
+ dst += dst_stride;
+ } while (--h);
+}
+
+#define bilin_2d_fn(opn, opa) \
+static av_noinline void opn ## _bilin_2d_hv_c(uint8_t *dst, \
+ const uint8_t *src, \
+ ptrdiff_t dst_stride, \
+ ptrdiff_t src_stride, \
+ int w, int h, \
+ int mx, int my) \
+{ \
+ do_bilin_2d_c(dst, src, dst_stride, src_stride, w, h, mx, my, opa); \
+}
+
+bilin_2d_fn(put, 0)
+bilin_2d_fn(avg, 1)
+
+#undef bilin_2d_fn
+
+#undef FILTER_BILIN
+
+#define bilinf_fn_1d(sz, dir, dir_m, avg) \
+static void avg ## _bilin_ ## sz ## dir ## _c(uint8_t *dst, \
+ const uint8_t *src, \
+ ptrdiff_t dst_stride, \
+ ptrdiff_t src_stride, \
+ int h, int mx, int my) \
+{ \
+ avg ## _bilin_1d_ ## dir ## _c(dst, src, dst_stride, src_stride, \
+ sz, h, dir_m); \
+}
+
+#define bilinf_fn_2d(sz, avg) \
+static void avg ## _bilin_ ## sz ## hv_c(uint8_t *dst, \
+ const uint8_t *src, \
+ ptrdiff_t dst_stride, \
+ ptrdiff_t src_stride, \
+ int h, int mx, int my) \
+{ \
+ avg ## _bilin_2d_hv_c(dst, src, dst_stride, src_stride, \
+ sz, h, mx, my); \
+}
+
+#define filter_fn(sz, avg) \
+ filter_fn_1d(sz, h, mx, regular, FILTER_8TAP_REGULAR, avg) \
+ filter_fn_1d(sz, v, my, regular, FILTER_8TAP_REGULAR, avg) \
+ filter_fn_2d(sz, regular, FILTER_8TAP_REGULAR, avg) \
+ filter_fn_1d(sz, h, mx, smooth, FILTER_8TAP_SMOOTH, avg) \
+ filter_fn_1d(sz, v, my, smooth, FILTER_8TAP_SMOOTH, avg) \
+ filter_fn_2d(sz, smooth, FILTER_8TAP_SMOOTH, avg) \
+ filter_fn_1d(sz, h, mx, sharp, FILTER_8TAP_SHARP, avg) \
+ filter_fn_1d(sz, v, my, sharp, FILTER_8TAP_SHARP, avg) \
+ filter_fn_2d(sz, sharp, FILTER_8TAP_SHARP, avg) \
+ bilinf_fn_1d(sz, h, mx, avg) \
+ bilinf_fn_1d(sz, v, my, avg) \
+ bilinf_fn_2d(sz, avg)
+
+#define filter_fn_set(avg) \
+ filter_fn(64, avg) \
+ filter_fn(32, avg) \
+ filter_fn(16, avg) \
+ filter_fn(8, avg) \
+ filter_fn(4, avg)
+
+filter_fn_set(put)
+filter_fn_set(avg)
+
+#undef filter_fn
+#undef filter_fn_set
+#undef filter_fn_1d
+#undef filter_fn_2d
+#undef bilinf_fn_1d
+#undef bilinf_fn_2d
+
+static av_cold void vp9dsp_mc_init(VP9DSPContext *dsp)
+{
+#define init_fpel(idx1, idx2, sz, type) \
+ dsp->mc[idx1][FILTER_8TAP_SMOOTH][idx2][0][0] = type ## sz ## _c; \
+ dsp->mc[idx1][FILTER_8TAP_REGULAR][idx2][0][0] = type ## sz ## _c; \
+ dsp->mc[idx1][FILTER_8TAP_SHARP][idx2][0][0] = type ## sz ## _c; \
+ dsp->mc[idx1][FILTER_BILINEAR][idx2][0][0] = type ## sz ## _c
+
+#define init_copy_avg(idx, sz) \
+ init_fpel(idx, 0, sz, copy); \
+ init_fpel(idx, 1, sz, avg)
+
+ init_copy_avg(0, 64);
+ init_copy_avg(1, 32);
+ init_copy_avg(2, 16);
+ init_copy_avg(3, 8);
+ init_copy_avg(4, 4);
+
+#undef init_copy_avg
+#undef init_fpel
+
+#define init_subpel1(idx1, idx2, idxh, idxv, sz, dir, type) \
+ dsp->mc[idx1][FILTER_8TAP_SMOOTH][idx2][idxh][idxv] = type ## _8tap_smooth_ ## sz ## dir ## _c; \
+ dsp->mc[idx1][FILTER_8TAP_REGULAR][idx2][idxh][idxv] = type ## _8tap_regular_ ## sz ## dir ## _c; \
+ dsp->mc[idx1][FILTER_8TAP_SHARP][idx2][idxh][idxv] = type ## _8tap_sharp_ ## sz ## dir ## _c; \
+ dsp->mc[idx1][FILTER_BILINEAR][idx2][idxh][idxv] = type ## _bilin_ ## sz ## dir ## _c
+
+#define init_subpel2(idx, idxh, idxv, dir, type) \
+ init_subpel1(0, idx, idxh, idxv, 64, dir, type); \
+ init_subpel1(1, idx, idxh, idxv, 32, dir, type); \
+ init_subpel1(2, idx, idxh, idxv, 16, dir, type); \
+ init_subpel1(3, idx, idxh, idxv, 8, dir, type); \
+ init_subpel1(4, idx, idxh, idxv, 4, dir, type)
+
+#define init_subpel3(idx, type) \
+ init_subpel2(idx, 1, 1, hv, type); \
+ init_subpel2(idx, 0, 1, v, type); \
+ init_subpel2(idx, 1, 0, h, type)
+
+ init_subpel3(0, put);
+ init_subpel3(1, avg);
+
+#undef init_subpel1
+#undef init_subpel2
+#undef init_subpel3
+}
+
+av_cold void ff_vp9dsp_init(VP9DSPContext *dsp)
+{
+ vp9dsp_intrapred_init(dsp);
+ vp9dsp_itxfm_init(dsp);
+ vp9dsp_loopfilter_init(dsp);
+ vp9dsp_mc_init(dsp);
+
+ if (ARCH_X86)
+ ff_vp9dsp_init_x86(dsp);
+}

libav-v10.1.tar.bz2/libavcodec/vp9mvs.c Added

@@ -0,0 +1,352 @@
+/*
+ * VP9 compatible video decoder
+ *
+ * Copyright (C) 2013 Ronald S. Bultje <rsbultje gmail com>
+ * Copyright (C) 2013 Clément Bœsch 
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "internal.h"
+#include "vp56.h"
+#include "vp9.h"
+#include "vp9data.h"
+
+static av_always_inline void clamp_mv(VP56mv *dst, const VP56mv *src,
+ VP9Context *s)
+{
+ dst->x = av_clip(src->x, s->min_mv.x, s->max_mv.x);
+ dst->y = av_clip(src->y, s->min_mv.y, s->max_mv.y);
+}
+
+static void find_ref_mvs(VP9Context *s,
+ VP56mv *pmv, int ref, int z, int idx, int sb)
+{
+ static const int8_t mv_ref_blk_off[N_BS_SIZES][8][2] = {
+ [BS_64x64] = { { 3, -1 }, { -1, 3 }, { 4, -1 }, { -1, 4 },
+ { -1, -1 }, { 0, -1 }, { -1, 0 }, { 6, -1 } },
+ [BS_64x32] = { { 0, -1 }, { -1, 0 }, { 4, -1 }, { -1, 2 },
+ { -1, -1 }, { 0, -3 }, { -3, 0 }, { 2, -1 } },
+ [BS_32x64] = { { -1, 0 }, { 0, -1 }, { -1, 4 }, { 2, -1 },
+ { -1, -1 }, { -3, 0 }, { 0, -3 }, { -1, 2 } },
+ [BS_32x32] = { { 1, -1 }, { -1, 1 }, { 2, -1 }, { -1, 2 },
+ { -1, -1 }, { 0, -3 }, { -3, 0 }, { -3, -3 } },
+ [BS_32x16] = { { 0, -1 }, { -1, 0 }, { 2, -1 }, { -1, -1 },
+ { -1, 1 }, { 0, -3 }, { -3, 0 }, { -3, -3 } },
+ [BS_16x32] = { { -1, 0 }, { 0, -1 }, { -1, 2 }, { -1, -1 },
+ { 1, -1 }, { -3, 0 }, { 0, -3 }, { -3, -3 } },
+ [BS_16x16] = { { 0, -1 }, { -1, 0 }, { 1, -1 }, { -1, 1 },
+ { -1, -1 }, { 0, -3 }, { -3, 0 }, { -3, -3 } },
+ [BS_16x8] = { { 0, -1 }, { -1, 0 }, { 1, -1 }, { -1, -1 },
+ { 0, -2 }, { -2, 0 }, { -2, -1 }, { -1, -2 } },
+ [BS_8x16] = { { -1, 0 }, { 0, -1 }, { -1, 1 }, { -1, -1 },
+ { -2, 0 }, { 0, -2 }, { -1, -2 }, { -2, -1 } },
+ [BS_8x8] = { { 0, -1 }, { -1, 0 }, { -1, -1 }, { 0, -2 },
+ { -2, 0 }, { -1, -2 }, { -2, -1 }, { -2, -2 } },
+ [BS_8x4] = { { 0, -1 }, { -1, 0 }, { -1, -1 }, { 0, -2 },
+ { -2, 0 }, { -1, -2 }, { -2, -1 }, { -2, -2 } },
+ [BS_4x8] = { { 0, -1 }, { -1, 0 }, { -1, -1 }, { 0, -2 },
+ { -2, 0 }, { -1, -2 }, { -2, -1 }, { -2, -2 } },
+ [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;
+ const int8_t (*p)[2] = mv_ref_blk_off[b->bs];
+#define INVALID_MV 0x80008000U
+ uint32_t mem = INVALID_MV;
+ int i;
+
+#define RETURN_DIRECT_MV(mv) \
+ do { \
+ uint32_t m = AV_RN32A(&mv); \
+ if (!idx) { \
+ AV_WN32A(pmv, m); \
+ return; \
+ } else if (mem == INVALID_MV) { \
+ mem = m; \
+ } else if (m != mem) { \
+ AV_WN32A(pmv, m); \
+ return; \
+ } \
+ } while (0)
+
+ if (sb >= 0) {
+ if (sb == 2 || sb == 1) {
+ RETURN_DIRECT_MV(b->mv[0][z]);
+ } else if (sb == 3) {
+ RETURN_DIRECT_MV(b->mv[2][z]);
+ RETURN_DIRECT_MV(b->mv[1][z]);
+ RETURN_DIRECT_MV(b->mv[0][z]);
+ }
+
+#define RETURN_MV(mv) \
+ do { \
+ if (sb > 0) { \
+ VP56mv tmp; \
+ uint32_t m; \
+ clamp_mv(&tmp, &mv, s); \
+ m = AV_RN32A(&tmp); \
+ if (!idx) { \
+ AV_WN32A(pmv, m); \
+ return; \
+ } else if (mem == INVALID_MV) { \
+ mem = m; \
+ } else if (m != mem) { \
+ AV_WN32A(pmv, m); \
+ return; \
+ } \
+ } else { \
+ uint32_t m = AV_RN32A(&mv); \
+ if (!idx) { \
+ clamp_mv(pmv, &mv, s); \
+ return; \
+ } else if (mem == INVALID_MV) { \
+ mem = m; \
+ } else if (m != mem) { \
+ clamp_mv(pmv, &mv, s); \
+ return; \
+ } \
+ } \
+ } while (0)
+
+ if (row > 0) {
+ VP9MVRefPair *mv = &s->mv[0][(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)
+ RETURN_MV(s->above_mv_ctx[2 * col + (sb & 1)][1]);
+ }
+ if (col > s->tiling.tile_col_start) {
+ VP9MVRefPair *mv = &s->mv[0][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)
+ RETURN_MV(s->left_mv_ctx[2 * row7 + (sb >> 1)][1]);
+ }
+ i = 2;
+ } else {
+ i = 0;
+ }
+
+ // previously coded MVs in the neighborhood, using same reference frame
+ for (; i < 8; i++) {
+ 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) {
+ VP9MVRefPair *mv = &s->mv[0][r * s->sb_cols * 8 + c];
+
+ if (mv->ref[0] == ref)
+ RETURN_MV(mv->mv[0]);
+ else if (mv->ref[1] == ref)
+ RETURN_MV(mv->mv[1]);
+ }
+ }
+
+ // MV at this position in previous frame, using same reference frame
+ if (s->use_last_frame_mvs) {
+ VP9MVRefPair *mv = &s->mv[1][row * s->sb_cols * 8 + col];
+
+ if (mv->ref[0] == ref)
+ RETURN_MV(mv->mv[0]);
+ else if (mv->ref[1] == ref)
+ RETURN_MV(mv->mv[1]);
+ }
+
+#define RETURN_SCALE_MV(mv, scale) \
+ do { \
+ if (scale) { \
+ VP56mv mv_temp = { -mv.x, -mv.y }; \
+ RETURN_MV(mv_temp); \
+ } else { \
+ RETURN_MV(mv); \
+ } \
+ } while (0)
+
+ // previously coded MVs in the neighborhood, using different reference frame
+ for (i = 0; i < 8; i++) {
+ 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) {
+ VP9MVRefPair *mv = &s->mv[0][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 &&
+ // 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]);
+ }
+ }
+ }
+
+ // MV at this position in previous frame, using different reference frame
+ if (s->use_last_frame_mvs) {
+ VP9MVRefPair *mv = &s->mv[1][row * s->sb_cols * 8 + col];
+
+ 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 &&
+ // 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]);
+ }
+ }
+
+ AV_ZERO32(pmv);
+#undef INVALID_MV
+#undef RETURN_MV
+#undef RETURN_SCALE_MV
+}
+
+static av_always_inline int read_mv_component(VP9Context *s, int idx, int hp)
+{
+ int bit, sign = vp56_rac_get_prob(&s->c, s->prob.p.mv_comp[idx].sign);
+ int n, c = vp8_rac_get_tree(&s->c, ff_vp9_mv_class_tree,
+ s->prob.p.mv_comp[idx].classes);
+
+ s->counts.mv_comp[idx].sign[sign]++;
+ s->counts.mv_comp[idx].classes[c]++;
+ if (c) {
+ int m;
+
+ for (n = 0, m = 0; m < c; m++) {
+ bit = vp56_rac_get_prob(&s->c, s->prob.p.mv_comp[idx].bits[m]);
+ n |= bit << m;
+ s->counts.mv_comp[idx].bits[m][bit]++;
+ }
+ n <<= 3;
+ bit = vp8_rac_get_tree(&s->c, ff_vp9_mv_fp_tree,
+ s->prob.p.mv_comp[idx].fp);
+ n |= bit << 1;
+ s->counts.mv_comp[idx].fp[bit]++;
+ if (hp) {
+ bit = vp56_rac_get_prob(&s->c, s->prob.p.mv_comp[idx].hp);
+ s->counts.mv_comp[idx].hp[bit]++;
+ n |= bit;
+ } else {
+ n |= 1;
+ // bug in libvpx - we count for bw entropy purposes even if the
+ // bit wasn't coded
+ s->counts.mv_comp[idx].hp[1]++;
+ }
+ n += 8 << c;
+ } else {
+ n = vp56_rac_get_prob(&s->c, s->prob.p.mv_comp[idx].class0);
+ s->counts.mv_comp[idx].class0[n]++;
+ bit = vp8_rac_get_tree(&s->c, ff_vp9_mv_fp_tree,
+ s->prob.p.mv_comp[idx].class0_fp[n]);
+ s->counts.mv_comp[idx].class0_fp[n][bit]++;
+ n = (n << 3) | (bit << 1);
+ if (hp) {
+ bit = vp56_rac_get_prob(&s->c, s->prob.p.mv_comp[idx].class0_hp);
+ s->counts.mv_comp[idx].class0_hp[bit]++;
+ n |= bit;
+ } else {
+ n |= 1;
+ // bug in libvpx - we count for bw entropy purposes even if the
+ // bit wasn't coded
+ s->counts.mv_comp[idx].class0_hp[1]++;
+ }
+ }
+
+ return sign ? -(n + 1) : (n + 1);
+}
+
+void ff_vp9_fill_mv(VP9Context *s, VP56mv *mv, int mode, int sb)
+{
+ VP9Block *const b = &s->b;
+
+ if (mode == ZEROMV) {
+ memset(mv, 0, sizeof(*mv) * 2);
+ } else {
+ int hp;
+
+ // FIXME cache this value and reuse for other subblocks
+ find_ref_mvs(s, &mv[0], b->ref[0], 0, mode == NEARMV,
+ mode == NEWMV ? -1 : sb);
+ // FIXME maybe move this code into find_ref_mvs()
+ if ((mode == NEWMV || sb == -1) &&
+ !(hp = s->highprecisionmvs &&
+ abs(mv[0].x) < 64 && abs(mv[0].y) < 64)) {
+ if (mv[0].y & 1) {
+ if (mv[0].y < 0)
+ mv[0].y++;
+ else
+ mv[0].y--;
+ }
+ if (mv[0].x & 1) {
+ if (mv[0].x < 0)
+ mv[0].x++;
+ else
+ mv[0].x--;
+ }
+ }
+ if (mode == NEWMV) {
+ enum MVJoint j = vp8_rac_get_tree(&s->c, ff_vp9_mv_joint_tree,
+ s->prob.p.mv_joint);
+
+ s->counts.mv_joint[j]++;
+ if (j >= MV_JOINT_V)
+ mv[0].y += read_mv_component(s, 0, hp);
+ if (j & 1)
+ mv[0].x += read_mv_component(s, 1, hp);
+ }
+
+ if (b->comp) {
+ // FIXME cache this value and reuse for other subblocks
+ find_ref_mvs(s, &mv[1], b->ref[1], 1, mode == NEARMV,
+ mode == NEWMV ? -1 : sb);
+ if ((mode == NEWMV || sb == -1) &&
+ !(hp = s->highprecisionmvs &&
+ abs(mv[1].x) < 64 && abs(mv[1].y) < 64)) {
+ if (mv[1].y & 1) {
+ if (mv[1].y < 0)
+ mv[1].y++;
+ else
+ mv[1].y--;
+ }
+ if (mv[1].x & 1) {
+ if (mv[1].x < 0)
+ mv[1].x++;
+ else
+ mv[1].x--;
+ }
+ }
+ if (mode == NEWMV) {
+ enum MVJoint j = vp8_rac_get_tree(&s->c, ff_vp9_mv_joint_tree,
+ s->prob.p.mv_joint);
+
+ s->counts.mv_joint[j]++;
+ if (j >= MV_JOINT_V)
+ mv[1].y += read_mv_component(s, 0, hp);
+ if (j & 1)
+ mv[1].x += read_mv_component(s, 1, hp);
+ }
+ }
+ }
+}

libav-v10.1.tar.bz2/libavcodec/vp9prob.c Added

@@ -0,0 +1,274 @@
+/*
+ * VP9 compatible video decoder
+ *
+ * Copyright (C) 2013 Ronald S. Bultje <rsbultje gmail com>
+ * Copyright (C) 2013 Clément Bœsch 
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "vp56.h"
+#include "vp9.h"
+#include "vp9data.h"
+
+static av_always_inline void adapt_prob(uint8_t *p, unsigned ct0, unsigned ct1,
+ int max_count, int update_factor)
+{
+ unsigned ct = ct0 + ct1, p2, p1;
+
+ if (!ct)
+ return;
+
+ p1 = *p;
+ p2 = ((ct0 << 8) + (ct >> 1)) / ct;
+ p2 = av_clip(p2, 1, 255);
+ ct = FFMIN(ct, max_count);
+ update_factor = FASTDIV(update_factor * ct, max_count);
+
+ // (p1 * (256 - update_factor) + p2 * update_factor + 128) >> 8
+ *p = p1 + (((p2 - p1) * update_factor + 128) >> 8);
+}
+
+void ff_vp9_adapt_probs(VP9Context *s)
+{
+ int i, j, k, l, m;
+ ProbContext *p = &s->prob_ctx[s->framectxid].p;
+ int uf = (s->keyframe || s->intraonly || !s->last_keyframe) ? 112 : 128;
+
+ // coefficients
+ 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++) {
+ uint8_t *pp = s->prob_ctx[s->framectxid].coef[i][j][k][l][m];
+ unsigned *e = s->counts.eob[i][j][k][l][m];
+ unsigned *c = s->counts.coef[i][j][k][l][m];
+
+ if (l == 0 && m >= 3) // dc only has 3 pt
+ break;
+
+ adapt_prob(&pp[0], e[0], e[1], 24, uf);
+ adapt_prob(&pp[1], c[0], c[1] + c[2], 24, uf);
+ adapt_prob(&pp[2], c[1], c[2], 24, uf);
+ }
+
+ if (s->keyframe || s->intraonly) {
+ memcpy(p->skip, s->prob.p.skip, sizeof(p->skip));
+ memcpy(p->tx32p, s->prob.p.tx32p, sizeof(p->tx32p));
+ memcpy(p->tx16p, s->prob.p.tx16p, sizeof(p->tx16p));
+ memcpy(p->tx8p, s->prob.p.tx8p, sizeof(p->tx8p));
+ return;
+ }
+
+ // skip flag
+ for (i = 0; i < 3; i++)
+ adapt_prob(&p->skip[i], s->counts.skip[i][0],
+ s->counts.skip[i][1], 20, 128);
+
+ // intra/inter flag
+ for (i = 0; i < 4; i++)
+ adapt_prob(&p->intra[i], s->counts.intra[i][0],
+ s->counts.intra[i][1], 20, 128);
+
+ // comppred flag
+ if (s->comppredmode == PRED_SWITCHABLE) {
+ for (i = 0; i < 5; i++)
+ adapt_prob(&p->comp[i], s->counts.comp[i][0],
+ s->counts.comp[i][1], 20, 128);
+ }
+
+ // reference frames
+ if (s->comppredmode != PRED_SINGLEREF) {
+ for (i = 0; i < 5; i++)
+ adapt_prob(&p->comp_ref[i], s->counts.comp_ref[i][0],
+ s->counts.comp_ref[i][1], 20, 128);
+ }
+
+ if (s->comppredmode != PRED_COMPREF) {
+ for (i = 0; i < 5; i++) {
+ uint8_t *pp = p->single_ref[i];
+ unsigned (*c)[2] = s->counts.single_ref[i];
+
+ adapt_prob(&pp[0], c[0][0], c[0][1], 20, 128);
+ adapt_prob(&pp[1], c[1][0], c[1][1], 20, 128);
+ }
+ }
+
+ // block partitioning
+ for (i = 0; i < 4; i++)
+ for (j = 0; j < 4; j++) {
+ uint8_t *pp = p->partition[i][j];
+ unsigned *c = s->counts.partition[i][j];
+
+ adapt_prob(&pp[0], c[0], c[1] + c[2] + c[3], 20, 128);
+ adapt_prob(&pp[1], c[1], c[2] + c[3], 20, 128);
+ adapt_prob(&pp[2], c[2], c[3], 20, 128);
+ }
+
+ // tx size
+ if (s->txfmmode == TX_SWITCHABLE) {
+ for (i = 0; i < 2; i++) {
+ unsigned *c16 = s->counts.tx16p[i], *c32 = s->counts.tx32p[i];
+
+ adapt_prob(&p->tx8p[i], s->counts.tx8p[i][0],
+ s->counts.tx8p[i][1], 20, 128);
+ adapt_prob(&p->tx16p[i][0], c16[0], c16[1] + c16[2], 20, 128);
+ adapt_prob(&p->tx16p[i][1], c16[1], c16[2], 20, 128);
+ adapt_prob(&p->tx32p[i][0], c32[0], c32[1] + c32[2] + c32[3], 20, 128);
+ adapt_prob(&p->tx32p[i][1], c32[1], c32[2] + c32[3], 20, 128);
+ adapt_prob(&p->tx32p[i][2], c32[2], c32[3], 20, 128);
+ }
+ }
+
+ // interpolation filter
+ if (s->filtermode == FILTER_SWITCHABLE) {
+ for (i = 0; i < 4; i++) {
+ uint8_t *pp = p->filter[i];
+ unsigned *c = s->counts.filter[i];
+
+ adapt_prob(&pp[0], c[0], c[1] + c[2], 20, 128);
+ adapt_prob(&pp[1], c[1], c[2], 20, 128);
+ }
+ }
+
+ // inter modes
+ for (i = 0; i < 7; i++) {
+ uint8_t *pp = p->mv_mode[i];
+ unsigned *c = s->counts.mv_mode[i];
+
+ adapt_prob(&pp[0], c[2], c[1] + c[0] + c[3], 20, 128);
+ adapt_prob(&pp[1], c[0], c[1] + c[3], 20, 128);
+ adapt_prob(&pp[2], c[1], c[3], 20, 128);
+ }
+
+ // mv joints
+ {
+ uint8_t *pp = p->mv_joint;
+ unsigned *c = s->counts.mv_joint;
+
+ adapt_prob(&pp[0], c[0], c[1] + c[2] + c[3], 20, 128);
+ adapt_prob(&pp[1], c[1], c[2] + c[3], 20, 128);
+ adapt_prob(&pp[2], c[2], c[3], 20, 128);
+ }
+
+ // mv components
+ for (i = 0; i < 2; i++) {
+ uint8_t *pp;
+ unsigned *c, (*c2)[2], sum;
+
+ adapt_prob(&p->mv_comp[i].sign, s->counts.mv_comp[i].sign[0],
+ s->counts.mv_comp[i].sign[1], 20, 128);
+
+ pp = p->mv_comp[i].classes;
+ c = s->counts.mv_comp[i].classes;
+ sum = c[1] + c[2] + c[3] + c[4] + c[5] +
+ c[6] + c[7] + c[8] + c[9] + c[10];
+ adapt_prob(&pp[0], c[0], sum, 20, 128);
+ sum -= c[1];
+ adapt_prob(&pp[1], c[1], sum, 20, 128);
+ sum -= c[2] + c[3];
+ adapt_prob(&pp[2], c[2] + c[3], sum, 20, 128);
+ adapt_prob(&pp[3], c[2], c[3], 20, 128);
+ sum -= c[4] + c[5];
+ adapt_prob(&pp[4], c[4] + c[5], sum, 20, 128);
+ adapt_prob(&pp[5], c[4], c[5], 20, 128);
+ sum -= c[6];
+ adapt_prob(&pp[6], c[6], sum, 20, 128);
+ adapt_prob(&pp[7], c[7] + c[8], c[9] + c[10], 20, 128);
+ adapt_prob(&pp[8], c[7], c[8], 20, 128);
+ adapt_prob(&pp[9], c[9], c[10], 20, 128);
+
+ adapt_prob(&p->mv_comp[i].class0, s->counts.mv_comp[i].class0[0],
+ s->counts.mv_comp[i].class0[1], 20, 128);
+ pp = p->mv_comp[i].bits;
+ c2 = s->counts.mv_comp[i].bits;
+ for (j = 0; j < 10; j++)
+ adapt_prob(&pp[j], c2[j][0], c2[j][1], 20, 128);
+
+ for (j = 0; j < 2; j++) {
+ pp = p->mv_comp[i].class0_fp[j];
+ c = s->counts.mv_comp[i].class0_fp[j];
+ adapt_prob(&pp[0], c[0], c[1] + c[2] + c[3], 20, 128);
+ adapt_prob(&pp[1], c[1], c[2] + c[3], 20, 128);
+ adapt_prob(&pp[2], c[2], c[3], 20, 128);
+ }
+ pp = p->mv_comp[i].fp;
+ c = s->counts.mv_comp[i].fp;
+ adapt_prob(&pp[0], c[0], c[1] + c[2] + c[3], 20, 128);
+ adapt_prob(&pp[1], c[1], c[2] + c[3], 20, 128);
+ adapt_prob(&pp[2], c[2], c[3], 20, 128);
+
+ if (s->highprecisionmvs) {
+ adapt_prob(&p->mv_comp[i].class0_hp,
+ s->counts.mv_comp[i].class0_hp[0],
+ s->counts.mv_comp[i].class0_hp[1], 20, 128);
+ adapt_prob(&p->mv_comp[i].hp, s->counts.mv_comp[i].hp[0],
+ s->counts.mv_comp[i].hp[1], 20, 128);
+ }
+ }
+
+ // y intra modes
+ for (i = 0; i < 4; i++) {
+ uint8_t *pp = p->y_mode[i];
+ unsigned *c = s->counts.y_mode[i], sum, s2;
+
+ sum = c[0] + c[1] + c[3] + c[4] + c[5] + c[6] + c[7] + c[8] + c[9];
+ adapt_prob(&pp[0], c[DC_PRED], sum, 20, 128);
+ sum -= c[TM_VP8_PRED];
+ adapt_prob(&pp[1], c[TM_VP8_PRED], sum, 20, 128);
+ sum -= c[VERT_PRED];
+ adapt_prob(&pp[2], c[VERT_PRED], sum, 20, 128);
+ s2 = c[HOR_PRED] + c[DIAG_DOWN_RIGHT_PRED] + c[VERT_RIGHT_PRED];
+ sum -= s2;
+ adapt_prob(&pp[3], s2, sum, 20, 128);
+ s2 -= c[HOR_PRED];
+ adapt_prob(&pp[4], c[HOR_PRED], s2, 20, 128);
+ adapt_prob(&pp[5], c[DIAG_DOWN_RIGHT_PRED], c[VERT_RIGHT_PRED],
+ 20, 128);
+ sum -= c[DIAG_DOWN_LEFT_PRED];
+ adapt_prob(&pp[6], c[DIAG_DOWN_LEFT_PRED], sum, 20, 128);
+ sum -= c[VERT_LEFT_PRED];
+ adapt_prob(&pp[7], c[VERT_LEFT_PRED], sum, 20, 128);
+ adapt_prob(&pp[8], c[HOR_DOWN_PRED], c[HOR_UP_PRED], 20, 128);
+ }
+
+ // uv intra modes
+ for (i = 0; i < 10; i++) {
+ uint8_t *pp = p->uv_mode[i];
+ unsigned *c = s->counts.uv_mode[i], sum, s2;
+
+ sum = c[0] + c[1] + c[3] + c[4] + c[5] + c[6] + c[7] + c[8] + c[9];
+ adapt_prob(&pp[0], c[DC_PRED], sum, 20, 128);
+ sum -= c[TM_VP8_PRED];
+ adapt_prob(&pp[1], c[TM_VP8_PRED], sum, 20, 128);
+ sum -= c[VERT_PRED];
+ adapt_prob(&pp[2], c[VERT_PRED], sum, 20, 128);
+ s2 = c[HOR_PRED] + c[DIAG_DOWN_RIGHT_PRED] + c[VERT_RIGHT_PRED];
+ sum -= s2;
+ adapt_prob(&pp[3], s2, sum, 20, 128);
+ s2 -= c[HOR_PRED];
+ adapt_prob(&pp[4], c[HOR_PRED], s2, 20, 128);
+ adapt_prob(&pp[5], c[DIAG_DOWN_RIGHT_PRED], c[VERT_RIGHT_PRED],
+ 20, 128);
+ sum -= c[DIAG_DOWN_LEFT_PRED];
+ adapt_prob(&pp[6], c[DIAG_DOWN_LEFT_PRED], sum, 20, 128);
+ sum -= c[VERT_LEFT_PRED];
+ adapt_prob(&pp[7], c[VERT_LEFT_PRED], sum, 20, 128);
+ adapt_prob(&pp[8], c[HOR_DOWN_PRED], c[HOR_UP_PRED], 20, 128);
+ }
+}

libav-v9.6.tar.bz2/libavcodec/vqavideo.c -> libav-v10.1.tar.bz2/libavcodec/vqavideo.c Changed

@@ -94,7 +94,6 @@
 typedef struct VqaContext {
 
 AVCodecContext *avctx;
- AVFrame frame;
 GetByteContext gb;
 
 uint32_t palette[PALETTE_COUNT];
@@ -122,7 +121,7 @@
 static av_cold int vqa_decode_init(AVCodecContext *avctx)
 {
 VqaContext *s = avctx->priv_data;
- int i, j, codebook_index;
+ int i, j, codebook_index, ret;
 
 s->avctx = avctx;
 avctx->pix_fmt = AV_PIX_FMT_PAL8;
@@ -130,16 +129,27 @@
 /* make sure the extradata made it */
 if (s->avctx->extradata_size != VQA_HEADER_SIZE) {
 av_log(s->avctx, AV_LOG_ERROR, " VQA video: expected extradata size of %d\n", VQA_HEADER_SIZE);
- return -1;
+ return AVERROR(EINVAL);
 }
 
 /* load up the VQA parameters from the header */
 s->vqa_version = s->avctx->extradata[0];
+ switch (s->vqa_version) {
+ case 1:
+ case 2:
+ break;
+ case 3:
+ avpriv_report_missing_feature(avctx, "VQA Version %d", s->vqa_version);
+ return AVERROR_PATCHWELCOME;
+ default:
+ avpriv_request_sample(avctx, "VQA Version %i", s->vqa_version);
+ return AVERROR_PATCHWELCOME;
+ }
 s->width = AV_RL16(&s->avctx->extradata[6]);
 s->height = AV_RL16(&s->avctx->extradata[8]);
- if(av_image_check_size(s->width, s->height, 0, avctx)){
+ if ((ret = av_image_check_size(s->width, s->height, 0, avctx)) < 0) {
 s->width= s->height= 0;
- return -1;
+ return ret;
 }
 s->vector_width = s->avctx->extradata[10];
 s->vector_height = s->avctx->extradata[11];
@@ -149,7 +159,7 @@
 if ((s->vector_width != 4) ||
 ((s->vector_height != 2) && (s->vector_height != 4))) {
 /* return without further initialization */
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 if (s->width & (s->vector_width - 1) ||
@@ -188,8 +198,6 @@
 }
 s->next_codebook_buffer_index = 0;
 
- s->frame.data[0] = NULL;
-
 return 0;
 fail:
 av_freep(&s->codebook);
@@ -303,7 +311,7 @@
 return 0; // let's display what we decoded anyway
 }
 
-static int vqa_decode_chunk(VqaContext *s)
+static int vqa_decode_chunk(VqaContext *s, AVFrame *frame)
 {
 unsigned int chunk_type;
 unsigned int chunk_size;
@@ -471,7 +479,7 @@
 index_shift = 3;
 for (y = 0; y < s->height; y += s->vector_height) {
 for (x = 0; x < s->width; x += 4, lobytes++, hibytes++) {
- pixel_ptr = y * s->frame.linesize[0] + x;
+ pixel_ptr = y * frame->linesize[0] + x;
 
 /* get the vector index, the method for which varies according to
 * VQA file version */
@@ -486,11 +494,11 @@
 /* uniform color fill - a quick hack */
 if (hibyte == 0xFF) {
 while (lines--) {
- s->frame.data[0][pixel_ptr + 0] = 255 - lobyte;
- s->frame.data[0][pixel_ptr + 1] = 255 - lobyte;
- s->frame.data[0][pixel_ptr + 2] = 255 - lobyte;
- s->frame.data[0][pixel_ptr + 3] = 255 - lobyte;
- pixel_ptr += s->frame.linesize[0];
+ frame->data[0][pixel_ptr + 0] = 255 - lobyte;
+ frame->data[0][pixel_ptr + 1] = 255 - lobyte;
+ frame->data[0][pixel_ptr + 2] = 255 - lobyte;
+ frame->data[0][pixel_ptr + 3] = 255 - lobyte;
+ pixel_ptr += frame->linesize[0];
 }
 lines=0;
 }
@@ -511,11 +519,11 @@
 }
 
 while (lines--) {
- s->frame.data[0][pixel_ptr + 0] = s->codebook[vector_index++];
- s->frame.data[0][pixel_ptr + 1] = s->codebook[vector_index++];
- s->frame.data[0][pixel_ptr + 2] = s->codebook[vector_index++];
- s->frame.data[0][pixel_ptr + 3] = s->codebook[vector_index++];
- pixel_ptr += s->frame.linesize[0];
+ frame->data[0][pixel_ptr + 0] = s->codebook[vector_index++];
+ frame->data[0][pixel_ptr + 1] = s->codebook[vector_index++];
+ frame->data[0][pixel_ptr + 2] = s->codebook[vector_index++];
+ frame->data[0][pixel_ptr + 3] = s->codebook[vector_index++];
+ pixel_ptr += frame->linesize[0];
 }
 }
 }
@@ -596,26 +604,23 @@
 AVPacket *avpkt)
 {
 VqaContext *s = avctx->priv_data;
+ AVFrame *frame = data;
 int res;
 
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
-
- if (ff_get_buffer(avctx, &s->frame)) {
+ if ((res = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(s->avctx, AV_LOG_ERROR, " VQA Video: get_buffer() failed\n");
- return -1;
+ return res;
 }
 
 bytestream2_init(&s->gb, avpkt->data, avpkt->size);
- if ((res = vqa_decode_chunk(s)) < 0)
+ if ((res = vqa_decode_chunk(s, frame)) < 0)
 return res;
 
 /* make the palette available on the way out */
- memcpy(s->frame.data[1], s->palette, PALETTE_COUNT * 4);
- s->frame.palette_has_changed = 1;
+ memcpy(frame->data[1], s->palette, PALETTE_COUNT * 4);
+ frame->palette_has_changed = 1;
 
 *got_frame = 1;
- *(AVFrame*)data = s->frame;
 
 /* report that the buffer was completely consumed */
 return avpkt->size;
@@ -629,14 +634,12 @@
 av_freep(&s->next_codebook_buffer);
 av_freep(&s->decode_buffer);
 
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
-
 return 0;
 }
 
 AVCodec ff_vqa_decoder = {
 .name = "vqavideo",
+ .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios VQA (Vector Quantized Animation) video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_WS_VQA,
 .priv_data_size = sizeof(VqaContext),
@@ -644,5 +647,4 @@
 .close = vqa_decode_end,
 .decode = vqa_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios VQA (Vector Quantized Animation) video"),
 };

libav-v9.6.tar.bz2/libavcodec/wavpack.c -> libav-v10.1.tar.bz2/libavcodec/wavpack.c Changed

@@ -26,12 +26,15 @@
 #include "get_bits.h"
 #include "internal.h"
 #include "unary.h"
+#include "bytestream.h"
 
 /**
 * @file
 * WavPack lossless audio decoder
 */
 
+#define WV_HEADER_SIZE 32
+
 #define WV_MONO 0x00000004
 #define WV_JOINT_STEREO 0x00000010
 #define WV_FALSE_STEREO 0x40000000
@@ -40,6 +43,10 @@
 #define WV_HYBRID_SHAPE 0x00000008
 #define WV_HYBRID_BITRATE 0x00000200
 #define WV_HYBRID_BALANCE 0x00000400
+#define WV_INITIAL_BLOCK 0x00000800
+#define WV_FINAL_BLOCK 0x00001000
+
+#define WV_SINGLE_BLOCK (WV_INITIAL_BLOCK | WV_FINAL_BLOCK)
 
 #define WV_FLT_SHIFT_ONES 0x01
 #define WV_FLT_SHIFT_SAME 0x02
@@ -48,7 +55,7 @@
 #define WV_FLT_ZERO_SIGN 0x10
 
 enum WP_ID_Flags {
- WP_IDF_MASK = 0x1F,
+ WP_IDF_MASK = 0x3F,
 WP_IDF_IGNORE = 0x20,
 WP_IDF_ODD = 0x40,
 WP_IDF_LONG = 0x80
@@ -68,7 +75,8 @@
 WP_ID_DATA,
 WP_ID_CORR,
 WP_ID_EXTRABITS,
- WP_ID_CHANINFO
+ WP_ID_CHANINFO,
+ WP_ID_SAMPLE_RATE = 0x27,
 };
 
 typedef struct SavedContext {
@@ -127,20 +135,22 @@
 
 typedef struct WavpackContext {
 AVCodecContext *avctx;
- AVFrame frame;
 
 WavpackFrameContext *fdec[WV_MAX_FRAME_DECODERS];
 int fdec_num;
 
- int multichannel;
- int mkv_mode;
 int block;
 int samples;
 int ch_offset;
 } WavpackContext;
 
+static const int wv_rates[16] = {
+ 6000, 8000, 9600, 11025, 12000, 16000, 22050, 24000,
+ 32000, 44100, 48000, 64000, 88200, 96000, 192000, 0
+};
+
 // exponent table copied from WavPack source
-static const uint8_t wp_exp2_table [256] = {
+static const uint8_t wp_exp2_table[256] = {
 0x00, 0x01, 0x01, 0x02, 0x03, 0x03, 0x04, 0x05, 0x06, 0x06, 0x07, 0x08, 0x08, 0x09, 0x0a, 0x0b,
 0x0b, 0x0c, 0x0d, 0x0e, 0x0e, 0x0f, 0x10, 0x10, 0x11, 0x12, 0x13, 0x13, 0x14, 0x15, 0x16, 0x16,
 0x17, 0x18, 0x19, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1d, 0x1e, 0x1f, 0x20, 0x20, 0x21, 0x22, 0x23,
@@ -187,9 +197,9 @@
 neg = 1;
 }
 
- res = wp_exp2_table[val & 0xFF] | 0x100;
+ res = wp_exp2_table[val & 0xFF] | 0x100;
 val >>= 8;
- res = (val > 9) ? (res << (val - 9)) : (res >> (9 - val));
+ res = (val > 9) ? (res << (val - 9)) : (res >> (9 - val));
 return neg ? -res : res;
 }
 
@@ -230,15 +240,14 @@
 } \
 }
 
-
 static av_always_inline int get_tail(GetBitContext *gb, int k)
 {
 int p, e, res;
 
 if (k < 1)
 return 0;
- p = av_log2(k);
- e = (1 << (p + 1)) - k - 1;
+ p = av_log2(k);
+ e = (1 << (p + 1)) - k - 1;
 res = p ? get_bits(gb, p) : 0;
 if (res >= e)
 res = (res << 1) - e + get_bits1(gb);
@@ -251,8 +260,8 @@
 
 for (i = 0; i <= ctx->stereo_in; i++) {
 ctx->ch[i].bitrate_acc += ctx->ch[i].bitrate_delta;
- br[i] = ctx->ch[i].bitrate_acc >> 16;
- sl[i] = LEVEL_DECAY(ctx->ch[i].slow_level);
+ br[i] = ctx->ch[i].bitrate_acc >> 16;
+ sl[i] = LEVEL_DECAY(ctx->ch[i].slow_level);
 }
 if (ctx->stereo_in && ctx->hybrid_bitrate) {
 int balance = (sl[1] - sl[0] + br[1] + 1) >> 1;
@@ -261,7 +270,7 @@
 br[0] = 0;
 } else if (-balance > br[0]) {
 br[0] <<= 1;
- br[1] = 0;
+ br[1] = 0;
 } else {
 br[1] = br[0] + balance;
 br[0] = br[0] - balance;
@@ -301,7 +310,7 @@
 if (t >= 2) {
 if (get_bits_left(gb) < t - 1)
 goto error;
- t = get_bits(gb, t - 1) | (1 << (t-1));
+ t = get_bits(gb, t - 1) | (1 << (t - 1));
 } else {
 if (get_bits_left(gb) < 0)
 goto error;
@@ -317,7 +326,7 @@
 }
 
 if (ctx->zero) {
- t = 0;
+ t = 0;
 ctx->zero = 0;
 } else {
 t = get_unary_0_33(gb);
@@ -338,10 +347,10 @@
 
 if (ctx->one) {
 ctx->one = t & 1;
- t = (t >> 1) + 1;
+ t = (t >> 1) + 1;
 } else {
 ctx->one = t & 1;
- t >>= 1;
+ t >>= 1;
 }
 ctx->zero = !ctx->one;
 }
@@ -404,11 +413,12 @@
 {
 int bit;
 
- if (s->extra_bits){
+ if (s->extra_bits) {
 S <<= s->extra_bits;
 
- if (s->got_extra_bits && get_bits_left(&s->gb_extra_bits) >= s->extra_bits) {
- S |= get_bits(&s->gb_extra_bits, s->extra_bits);
+ if (s->got_extra_bits &&
+ get_bits_left(&s->gb_extra_bits) >= s->extra_bits) {
+ S |= get_bits(&s->gb_extra_bits, s->extra_bits);
 *crc = *crc * 9 + (S & 0xffff) * 3 + ((unsigned)S >> 16);
 }
 }
@@ -441,7 +451,7 @@
 }
 
 if (S) {
- S <<= s->float_shift;
+ S <<= s->float_shift;
 sign = S < 0;
 if (sign)
 S = -S;
@@ -461,7 +471,8 @@
 if (shift) {
 S <<= shift;
 if ((s->float_flag & WV_FLT_SHIFT_ONES) ||
- (s->got_extra_bits && (s->float_flag & WV_FLT_SHIFT_SAME) &&
+ (s->got_extra_bits &&
+ (s->float_flag & WV_FLT_SHIFT_SAME) &&
 get_bits1(&s->gb_extra_bits))) {
 S |= (1 << shift) - 1;
 } else if (s->got_extra_bits &&
@@ -475,7 +486,7 @@
 S &= 0x7fffff;
 } else {
 sign = 0;
- exp = 0;
+ exp = 0;
 if (s->got_extra_bits && (s->float_flag & WV_FLT_ZERO_SENT)) {
 if (get_bits1(&s->gb_extra_bits)) {
 S = get_bits(&s->gb_extra_bits, 23);
@@ -497,7 +508,7 @@
 
 static void wv_reset_saved_context(WavpackFrameContext *s)
 {
- s->pos = 0;
+ s->pos = 0;
 s->sc.crc = s->extra_sc.crc = 0xFFFFFFFF;
 }
 
@@ -517,18 +528,20 @@
 }
 
 static inline int wv_unpack_stereo(WavpackFrameContext *s, GetBitContext *gb,
- void *dst, const int type)
+ void *dst_l, void *dst_r, const int type)
 {
 int i, j, count = 0;
 int last, t;
 int A, B, L, L2, R, R2;
- int pos = s->pos;
- uint32_t crc = s->sc.crc;
+ int pos = s->pos;
+ uint32_t crc = s->sc.crc;
 uint32_t crc_extra_bits = s->extra_sc.crc;
- int16_t *dst16 = dst;
- int32_t *dst32 = dst;
- float *dstfl = dst;
- const int channel_pad = s->avctx->channels - 2;
+ int16_t *dst16_l = dst_l;
+ int16_t *dst16_r = dst_r;
+ int32_t *dst32_l = dst_l;
+ int32_t *dst32_r = dst_r;
+ float *dstfl_l = dst_l;
+ float *dstfl_r = dst_r;
 
 s->one = s->zero = s->zeroes = 0;
 do {
@@ -551,39 +564,41 @@
 }
 s->decorr[i].samplesA[1] = s->decorr[i].samplesA[0];
 s->decorr[i].samplesB[1] = s->decorr[i].samplesB[0];
- j = 0;
+ j = 0;
 } else {
 A = s->decorr[i].samplesA[pos];
 B = s->decorr[i].samplesB[pos];
 j = (pos + t) & 7;
 }
- if (type != AV_SAMPLE_FMT_S16) {
+ if (type != AV_SAMPLE_FMT_S16P) {
 L2 = L + ((s->decorr[i].weightA * (int64_t)A + 512) >> 10);
 R2 = R + ((s->decorr[i].weightB * (int64_t)B + 512) >> 10);
 } else {
 L2 = L + ((s->decorr[i].weightA * A + 512) >> 10);
 R2 = R + ((s->decorr[i].weightB * B + 512) >> 10);
 }
- if (A && L) s->decorr[i].weightA -= ((((L ^ A) >> 30) & 2) - 1) * s->decorr[i].delta;
- if (B && R) s->decorr[i].weightB -= ((((R ^ B) >> 30) & 2) - 1) * s->decorr[i].delta;
+ if (A && L)
+ s->decorr[i].weightA -= ((((L ^ A) >> 30) & 2) - 1) * s->decorr[i].delta;
+ if (B && R)
+ s->decorr[i].weightB -= ((((R ^ B) >> 30) & 2) - 1) * s->decorr[i].delta;
 s->decorr[i].samplesA[j] = L = L2;
 s->decorr[i].samplesB[j] = R = R2;
 } else if (t == -1) {
- if (type != AV_SAMPLE_FMT_S16)
+ if (type != AV_SAMPLE_FMT_S16P)
 L2 = L + ((s->decorr[i].weightA * (int64_t)s->decorr[i].samplesA[0] + 512) >> 10);
 else
 L2 = L + ((s->decorr[i].weightA * s->decorr[i].samplesA[0] + 512) >> 10);
 UPDATE_WEIGHT_CLIP(s->decorr[i].weightA, s->decorr[i].delta, s->decorr[i].samplesA[0], L);
 L = L2;
- if (type != AV_SAMPLE_FMT_S16)
+ if (type != AV_SAMPLE_FMT_S16P)
 R2 = R + ((s->decorr[i].weightB * (int64_t)L2 + 512) >> 10);
 else
 R2 = R + ((s->decorr[i].weightB * L2 + 512) >> 10);
 UPDATE_WEIGHT_CLIP(s->decorr[i].weightB, s->decorr[i].delta, L2, R);
- R = R2;
+ R = R2;
 s->decorr[i].samplesA[0] = R;
 } else {
- if (type != AV_SAMPLE_FMT_S16)
+ if (type != AV_SAMPLE_FMT_S16P)
 R2 = R + ((s->decorr[i].weightB * (int64_t)s->decorr[i].samplesB[0] + 512) >> 10);
 else
 R2 = R + ((s->decorr[i].weightB * s->decorr[i].samplesB[0] + 512) >> 10);
@@ -591,16 +606,16 @@
 R = R2;
 
 if (t == -3) {
- R2 = s->decorr[i].samplesA[0];
+ R2 = s->decorr[i].samplesA[0];
 s->decorr[i].samplesA[0] = R;
 }
 
- if (type != AV_SAMPLE_FMT_S16)
+ if (type != AV_SAMPLE_FMT_S16P)
 L2 = L + ((s->decorr[i].weightA * (int64_t)R2 + 512) >> 10);
 else
 L2 = L + ((s->decorr[i].weightA * R2 + 512) >> 10);
 UPDATE_WEIGHT_CLIP(s->decorr[i].weightA, s->decorr[i].delta, R2, L);
- L = L2;
+ L = L2;
 s->decorr[i].samplesB[0] = L;
 }
 }
@@ -609,18 +624,15 @@
 L += (R -= (L >> 1));
 crc = (crc * 3 + L) * 3 + R;
 
- if (type == AV_SAMPLE_FMT_FLT) {
- *dstfl++ = wv_get_value_float(s, &crc_extra_bits, L);
- *dstfl++ = wv_get_value_float(s, &crc_extra_bits, R);
- dstfl += channel_pad;
- } else if (type == AV_SAMPLE_FMT_S32) {
- *dst32++ = wv_get_value_integer(s, &crc_extra_bits, L);
- *dst32++ = wv_get_value_integer(s, &crc_extra_bits, R);
- dst32 += channel_pad;
+ if (type == AV_SAMPLE_FMT_FLTP) {
+ *dstfl_l++ = wv_get_value_float(s, &crc_extra_bits, L);
+ *dstfl_r++ = wv_get_value_float(s, &crc_extra_bits, R);
+ } else if (type == AV_SAMPLE_FMT_S32P) {
+ *dst32_l++ = wv_get_value_integer(s, &crc_extra_bits, L);
+ *dst32_r++ = wv_get_value_integer(s, &crc_extra_bits, R);
 } else {
- *dst16++ = wv_get_value_integer(s, &crc_extra_bits, L);
- *dst16++ = wv_get_value_integer(s, &crc_extra_bits, R);
- dst16 += channel_pad;
+ *dst16_l++ = wv_get_value_integer(s, &crc_extra_bits, L);
+ *dst16_r++ = wv_get_value_integer(s, &crc_extra_bits, R);
 }
 count++;
 } while (!last && count < s->samples);
@@ -630,7 +642,7 @@
 wv_check_crc(s, crc, crc_extra_bits))
 return AVERROR_INVALIDDATA;
 
- return count * 2;
+ return 0;
 }
 
 static inline int wv_unpack_mono(WavpackFrameContext *s, GetBitContext *gb,
@@ -639,13 +651,12 @@
 int i, j, count = 0;
 int last, t;
 int A, S, T;
- int pos = s->pos;
- uint32_t crc = s->sc.crc;
- uint32_t crc_extra_bits = s->extra_sc.crc;
- int16_t *dst16 = dst;
- int32_t *dst32 = dst;
- float *dstfl = dst;
- const int channel_stride = s->avctx->channels;
+ int pos = s->pos;
+ uint32_t crc = s->sc.crc;
+ uint32_t crc_extra_bits = s->extra_sc.crc;
+ int16_t *dst16 = dst;
+ int32_t *dst32 = dst;
+ float *dstfl = dst;
 
 s->one = s->zero = s->zeroes = 0;
 do {
@@ -661,12 +672,12 @@
 else
 A = (3 * s->decorr[i].samplesA[0] - s->decorr[i].samplesA[1]) >> 1;
 s->decorr[i].samplesA[1] = s->decorr[i].samplesA[0];
- j = 0;
+ j = 0;
 } else {
 A = s->decorr[i].samplesA[pos];
 j = (pos + t) & 7;
 }
- if (type != AV_SAMPLE_FMT_S16)
+ if (type != AV_SAMPLE_FMT_S16P)
 S = T + ((s->decorr[i].weightA * (int64_t)A + 512) >> 10);
 else
 S = T + ((s->decorr[i].weightA * A + 512) >> 10);
@@ -677,30 +688,28 @@
 pos = (pos + 1) & 7;
 crc = crc * 3 + S;
 
- if (type == AV_SAMPLE_FMT_FLT) {
- *dstfl = wv_get_value_float(s, &crc_extra_bits, S);
- dstfl += channel_stride;
- } else if (type == AV_SAMPLE_FMT_S32) {
- *dst32 = wv_get_value_integer(s, &crc_extra_bits, S);
- dst32 += channel_stride;
+ if (type == AV_SAMPLE_FMT_FLTP) {
+ *dstfl++ = wv_get_value_float(s, &crc_extra_bits, S);
+ } else if (type == AV_SAMPLE_FMT_S32P) {
+ *dst32++ = wv_get_value_integer(s, &crc_extra_bits, S);
 } else {
- *dst16 = wv_get_value_integer(s, &crc_extra_bits, S);
- dst16 += channel_stride;
+ *dst16++ = wv_get_value_integer(s, &crc_extra_bits, S);
 }
 count++;
 } 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 (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 count;
+ return 0;
 }
 
 static av_cold int wv_alloc_frame_context(WavpackContext *c)
 {
-
 if (c->fdec_num == WV_MAX_FRAME_DECODERS)
 return -1;
 
@@ -719,29 +728,9 @@
 WavpackContext *s = avctx->priv_data;
 
 s->avctx = avctx;
- if (avctx->bits_per_coded_sample <= 16)
- avctx->sample_fmt = AV_SAMPLE_FMT_S16;
- else
- avctx->sample_fmt = AV_SAMPLE_FMT_S32;
- if (avctx->channels <= 2 && !avctx->channel_layout)
- avctx->channel_layout = (avctx->channels == 2) ? AV_CH_LAYOUT_STEREO :
- AV_CH_LAYOUT_MONO;
-
- s->multichannel = avctx->channels > 2;
- /* lavf demuxer does not provide extradata, Matroska stores 0x403
- there, use this to detect decoding mode for multichannel */
- s->mkv_mode = 0;
- if (s->multichannel && avctx->extradata && avctx->extradata_size == 2) {
- int ver = AV_RL16(avctx->extradata);
- if (ver >= 0x402 && ver <= 0x410)
- s->mkv_mode = 1;
- }
 
 s->fdec_num = 0;
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
@@ -758,55 +747,49 @@
 }
 
 static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
- void *data, int *got_frame_ptr,
- const uint8_t *buf, int buf_size)
+ AVFrame *frame, const uint8_t *buf, int buf_size)
 {
 WavpackContext *wc = avctx->priv_data;
 WavpackFrameContext *s;
- void *samples = data;
- int samplecount;
+ GetByteContext gb;
+ void *samples_l, *samples_r;
+ int ret;
 int got_terms = 0, got_weights = 0, got_samples = 0,
 got_entropy = 0, got_bs = 0, got_float = 0, got_hybrid = 0;
- const uint8_t *orig_buf = buf;
- const uint8_t *buf_end = buf + buf_size;
 int i, j, id, size, ssize, weights, t;
- int bpp, chan, chmask, orig_bpp;
-
- if (buf_size == 0) {
- *got_frame_ptr = 0;
- return 0;
- }
+ int bpp, chan = 0, chmask = 0, orig_bpp, sample_rate = 0;
+ int multiblock;
 
 if (block_no >= wc->fdec_num && wv_alloc_frame_context(wc) < 0) {
 av_log(avctx, AV_LOG_ERROR, "Error creating frame decode context\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 s = wc->fdec[block_no];
 if (!s) {
- av_log(avctx, AV_LOG_ERROR, "Context for block %d is not present\n", block_no);
- return -1;
+ av_log(avctx, AV_LOG_ERROR, "Context for block %d is not present\n",
+ block_no);
+ return AVERROR_INVALIDDATA;
 }
 
 memset(s->decorr, 0, MAX_TERMS * sizeof(Decorr));
 memset(s->ch, 0, sizeof(s->ch));
- s->extra_bits = 0;
- s->and = s->or = s->shift = 0;
+ s->extra_bits = 0;
+ s->and = s->or = s->shift = 0;
 s->got_extra_bits = 0;
 
- if (!wc->mkv_mode) {
- s->samples = AV_RL32(buf); buf += 4;
- if (!s->samples) {
- *got_frame_ptr = 0;
- return 0;
- }
- } else {
- s->samples = wc->samples;
+ bytestream2_init(&gb, buf, buf_size);
+
+ s->samples = bytestream2_get_le32(&gb);
+ if (s->samples != wc->samples) {
+ av_log(avctx, AV_LOG_ERROR, "Mismatching number of samples in "
+ "a sequence: %d and %d\n", wc->samples, s->samples);
+ return AVERROR_INVALIDDATA;
 }
- s->frame_flags = AV_RL32(buf); buf += 4;
- bpp = av_get_bytes_per_sample(avctx->sample_fmt);
- samples = (uint8_t*)samples + bpp * wc->ch_offset;
- orig_bpp = ((s->frame_flags & 0x03) + 1) << 3;
+ s->frame_flags = bytestream2_get_le32(&gb);
+ bpp = av_get_bytes_per_sample(avctx->sample_fmt);
+ orig_bpp = ((s->frame_flags & 0x03) + 1) << 3;
+ multiblock = (s->frame_flags & WV_SINGLE_BLOCK) != WV_SINGLE_BLOCK;
 
 s->stereo = !(s->frame_flags & WV_MONO);
 s->stereo_in = (s->frame_flags & WV_FALSE_STEREO) ? 0 : s->stereo;
@@ -814,51 +797,45 @@
 s->hybrid = s->frame_flags & WV_HYBRID_MODE;
 s->hybrid_bitrate = s->frame_flags & WV_HYBRID_BITRATE;
 s->post_shift = bpp * 8 - orig_bpp + ((s->frame_flags >> 13) & 0x1f);
- s->hybrid_maxclip = (( 1LL << (orig_bpp - 1)) - 1);
+ s->hybrid_maxclip = ((1LL << (orig_bpp - 1)) - 1);
 s->hybrid_minclip = ((-1LL << (orig_bpp - 1)));
- s->CRC = AV_RL32(buf); buf += 4;
- if (wc->mkv_mode)
- buf += 4; //skip block size;
-
- wc->ch_offset += 1 + s->stereo;
+ s->CRC = bytestream2_get_le32(&gb);
 
 // parse metadata blocks
- while (buf < buf_end) {
- id = *buf++;
- size = *buf++;
+ while (bytestream2_get_bytes_left(&gb)) {
+ id = bytestream2_get_byte(&gb);
+ size = bytestream2_get_byte(&gb);
 if (id & WP_IDF_LONG) {
- size |= (*buf++) << 8;
- size |= (*buf++) << 16;
+ size |= (bytestream2_get_byte(&gb)) << 8;
+ size |= (bytestream2_get_byte(&gb)) << 16;
 }
 size <<= 1; // size is specified in words
- ssize = size;
+ ssize = size;
 if (id & WP_IDF_ODD)
 size--;
 if (size < 0) {
- av_log(avctx, AV_LOG_ERROR, "Got incorrect block %02X with size %i\n", id, size);
+ av_log(avctx, AV_LOG_ERROR,
+ "Got incorrect block %02X with size %i\n", id, size);
 break;
 }
- if (buf + ssize > buf_end) {
- av_log(avctx, AV_LOG_ERROR, "Block size %i is out of bounds\n", size);
+ if (bytestream2_get_bytes_left(&gb) < ssize) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Block size %i is out of bounds\n", size);
 break;
 }
- if (id & WP_IDF_IGNORE) {
- buf += ssize;
- continue;
- }
 switch (id & WP_IDF_MASK) {
 case WP_ID_DECTERMS:
 if (size > MAX_TERMS) {
 av_log(avctx, AV_LOG_ERROR, "Too many decorrelation terms\n");
 s->terms = 0;
- buf += ssize;
+ bytestream2_skip(&gb, ssize);
 continue;
 }
 s->terms = size;
 for (i = 0; i < s->terms; i++) {
- s->decorr[s->terms - i - 1].value = (*buf & 0x1F) - 5;
- s->decorr[s->terms - i - 1].delta = *buf >> 5;
- buf++;
+ uint8_t val = bytestream2_get_byte(&gb);
+ s->decorr[s->terms - i - 1].value = (val & 0x1F) - 5;
+ s->decorr[s->terms - i - 1].delta = val >> 5;
 }
 got_terms = 1;
 break;
@@ -870,21 +847,21 @@
 weights = size >> s->stereo_in;
 if (weights > MAX_TERMS || weights > s->terms) {
 av_log(avctx, AV_LOG_ERROR, "Too many decorrelation weights\n");
- buf += ssize;
+ bytestream2_skip(&gb, ssize);
 continue;
 }
 for (i = 0; i < weights; i++) {
- t = (int8_t)(*buf++);
+ t = (int8_t)bytestream2_get_byte(&gb);
 s->decorr[s->terms - i - 1].weightA = t << 3;
 if (s->decorr[s->terms - i - 1].weightA > 0)
 s->decorr[s->terms - i - 1].weightA +=
- (s->decorr[s->terms - i - 1].weightA + 64) >> 7;
+ (s->decorr[s->terms - i - 1].weightA + 64) >> 7;
 if (s->stereo_in) {
- t = (int8_t)(*buf++);
+ t = (int8_t)bytestream2_get_byte(&gb);
 s->decorr[s->terms - i - 1].weightB = t << 3;
 if (s->decorr[s->terms - i - 1].weightB > 0)
 s->decorr[s->terms - i - 1].weightB +=
- (s->decorr[s->terms - i - 1].weightB + 64) >> 7;
+ (s->decorr[s->terms - i - 1].weightB + 64) >> 7;
 }
 }
 got_weights = 1;
@@ -897,23 +874,32 @@
 t = 0;
 for (i = s->terms - 1; (i >= 0) && (t < size); i--) {
 if (s->decorr[i].value > 8) {
- s->decorr[i].samplesA[0] = wp_exp2(AV_RL16(buf)); buf += 2;
- s->decorr[i].samplesA[1] = wp_exp2(AV_RL16(buf)); buf += 2;
+ s->decorr[i].samplesA[0] =
+ wp_exp2(bytestream2_get_le16(&gb));
+ s->decorr[i].samplesA[1] =
+ wp_exp2(bytestream2_get_le16(&gb));
+
 if (s->stereo_in) {
- s->decorr[i].samplesB[0] = wp_exp2(AV_RL16(buf)); buf += 2;
- s->decorr[i].samplesB[1] = wp_exp2(AV_RL16(buf)); buf += 2;
- t += 4;
+ s->decorr[i].samplesB[0] =
+ wp_exp2(bytestream2_get_le16(&gb));
+ s->decorr[i].samplesB[1] =
+ wp_exp2(bytestream2_get_le16(&gb));
+ t += 4;
 }
 t += 4;
 } else if (s->decorr[i].value < 0) {
- s->decorr[i].samplesA[0] = wp_exp2(AV_RL16(buf)); buf += 2;
- s->decorr[i].samplesB[0] = wp_exp2(AV_RL16(buf)); buf += 2;
- t += 4;
+ s->decorr[i].samplesA[0] =
+ wp_exp2(bytestream2_get_le16(&gb));
+ s->decorr[i].samplesB[0] =
+ wp_exp2(bytestream2_get_le16(&gb));
+ t += 4;
 } else {
 for (j = 0; j < s->decorr[i].value; j++) {
- s->decorr[i].samplesA[j] = wp_exp2(AV_RL16(buf)); buf += 2;
+ s->decorr[i].samplesA[j] =
+ wp_exp2(bytestream2_get_le16(&gb));
 if (s->stereo_in) {
- s->decorr[i].samplesB[j] = wp_exp2(AV_RL16(buf)); buf += 2;
+ s->decorr[i].samplesB[j] =
+ wp_exp2(bytestream2_get_le16(&gb));
 }
 }
 t += s->decorr[i].value * 2 * (s->stereo_in + 1);
@@ -923,36 +909,33 @@
 break;
 case WP_ID_ENTROPY:
 if (size != 6 * (s->stereo_in + 1)) {
- av_log(avctx, AV_LOG_ERROR, "Entropy vars size should be %i, "
- "got %i", 6 * (s->stereo_in + 1), size);
- buf += ssize;
+ av_log(avctx, AV_LOG_ERROR,
+ "Entropy vars size should be %i, got %i",
+ 6 * (s->stereo_in + 1), size);
+ bytestream2_skip(&gb, ssize);
 continue;
 }
- for (j = 0; j <= s->stereo_in; j++) {
+ for (j = 0; j <= s->stereo_in; j++)
 for (i = 0; i < 3; i++) {
- s->ch[j].median[i] = wp_exp2(AV_RL16(buf));
- buf += 2;
+ s->ch[j].median[i] = wp_exp2(bytestream2_get_le16(&gb));
 }
- }
 got_entropy = 1;
 break;
 case WP_ID_HYBRID:
 if (s->hybrid_bitrate) {
 for (i = 0; i <= s->stereo_in; i++) {
- s->ch[i].slow_level = wp_exp2(AV_RL16(buf));
- buf += 2;
- size -= 2;
+ s->ch[i].slow_level = wp_exp2(bytestream2_get_le16(&gb));
+ size -= 2;
 }
 }
 for (i = 0; i < (s->stereo_in + 1); i++) {
- s->ch[i].bitrate_acc = AV_RL16(buf) << 16;
- buf += 2;
- size -= 2;
+ s->ch[i].bitrate_acc = bytestream2_get_le16(&gb) << 16;
+ size -= 2;
 }
 if (size > 0) {
 for (i = 0; i < (s->stereo_in + 1); i++) {
- s->ch[i].bitrate_delta = wp_exp2((int16_t)AV_RL16(buf));
- buf += 2;
+ s->ch[i].bitrate_delta =
+ wp_exp2((int16_t)bytestream2_get_le16(&gb));
 }
 } else {
 for (i = 0; i < (s->stereo_in + 1); i++)
@@ -960,82 +943,96 @@
 }
 got_hybrid = 1;
 break;
- case WP_ID_INT32INFO:
+ case WP_ID_INT32INFO: {
+ uint8_t val[4];
 if (size != 4) {
- av_log(avctx, AV_LOG_ERROR, "Invalid INT32INFO, size = %i, sent_bits = %i\n", size, *buf);
- buf += ssize;
+ av_log(avctx, AV_LOG_ERROR,
+ "Invalid INT32INFO, size = %i\n",
+ size);
+ bytestream2_skip(&gb, ssize - 4);
 continue;
 }
- if (buf[0])
- s->extra_bits = buf[0];
- else if (buf[1])
- s->shift = buf[1];
- else if (buf[2]){
- s->and = s->or = 1;
- s->shift = buf[2];
- } else if(buf[3]) {
+ bytestream2_get_buffer(&gb, val, 4);
+ if (val[0]) {
+ s->extra_bits = val[0];
+ } else if (val[1]) {
+ s->shift = val[1];
+ } else if (val[2]) {
+ s->and = s->or = 1;
+ s->shift = val[2];
+ } else if (val[3]) {
 s->and = 1;
- s->shift = buf[3];
+ s->shift = val[3];
 }
 /* original WavPack decoder forces 32-bit lossy sound to be treated
- * as 24-bit one in order to have proper clipping
- */
+ * as 24-bit one in order to have proper clipping */
 if (s->hybrid && bpp == 4 && s->post_shift < 8 && s->shift > 8) {
- s->post_shift += 8;
- s->shift -= 8;
+ s->post_shift += 8;
+ s->shift -= 8;
 s->hybrid_maxclip >>= 8;
 s->hybrid_minclip >>= 8;
 }
- buf += 4;
 break;
+ }
 case WP_ID_FLOATINFO:
 if (size != 4) {
- av_log(avctx, AV_LOG_ERROR, "Invalid FLOATINFO, size = %i\n", size);
- buf += ssize;
+ av_log(avctx, AV_LOG_ERROR,
+ "Invalid FLOATINFO, size = %i\n", size);
+ bytestream2_skip(&gb, ssize);
 continue;
 }
- s->float_flag = buf[0];
- s->float_shift = buf[1];
- s->float_max_exp = buf[2];
- buf += 4;
- got_float = 1;
+ s->float_flag = bytestream2_get_byte(&gb);
+ s->float_shift = bytestream2_get_byte(&gb);
+ s->float_max_exp = bytestream2_get_byte(&gb);
+ got_float = 1;
+ bytestream2_skip(&gb, 1);
 break;
 case WP_ID_DATA:
- s->sc.offset = buf - orig_buf;
+ s->sc.offset = bytestream2_tell(&gb);
 s->sc.size = size * 8;
- init_get_bits(&s->gb, buf, size * 8);
+ init_get_bits(&s->gb, gb.buffer, size * 8);
 s->data_size = size * 8;
- buf += size;
- got_bs = 1;
+ bytestream2_skip(&gb, size);
+ got_bs = 1;
 break;
 case WP_ID_EXTRABITS:
 if (size <= 4) {
 av_log(avctx, AV_LOG_ERROR, "Invalid EXTRABITS, size = %i\n",
 size);
- buf += size;
+ bytestream2_skip(&gb, size);
 continue;
 }
- s->extra_sc.offset = buf - orig_buf;
+ s->extra_sc.offset = bytestream2_tell(&gb);
 s->extra_sc.size = size * 8;
- init_get_bits(&s->gb_extra_bits, buf, size * 8);
- s->crc_extra_bits = get_bits_long(&s->gb_extra_bits, 32);
- buf += size;
- s->got_extra_bits = 1;
+ init_get_bits(&s->gb_extra_bits, gb.buffer, size * 8);
+ s->crc_extra_bits = get_bits_long(&s->gb_extra_bits, 32);
+ bytestream2_skip(&gb, size);
+ s->got_extra_bits = 1;
 break;
 case WP_ID_CHANINFO:
 if (size <= 1) {
- av_log(avctx, AV_LOG_ERROR, "Insufficient channel information\n");
- return -1;
+ av_log(avctx, AV_LOG_ERROR,
+ "Insufficient channel information\n");
+ return AVERROR_INVALIDDATA;
 }
- chan = *buf++;
+ chan = bytestream2_get_byte(&gb);
 switch (size - 2) {
- case 0: chmask = *buf; break;
- case 1: chmask = AV_RL16(buf); break;
- case 2: chmask = AV_RL24(buf); break;
- case 3: chmask = AV_RL32(buf); break;
+ case 0:
+ chmask = bytestream2_get_byte(&gb);
+ break;
+ case 1:
+ chmask = bytestream2_get_le16(&gb);
+ break;
+ case 2:
+ chmask = bytestream2_get_le24(&gb);
+ break;
+ case 3:
+ chmask = bytestream2_get_le32(&gb);;
+ break;
 case 5:
- chan |= (buf[1] & 0xF) << 8;
- chmask = AV_RL24(buf + 2);
+ bytestream2_skip(&gb, 1);
+ chan |= (bytestream2_get_byte(&gb) & 0xF) << 8;
+ chmask = bytestream2_get_le16(&gb);
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "Invalid channel info size %d\n",
@@ -1043,52 +1040,50 @@
 chan = avctx->channels;
 chmask = avctx->channel_layout;
 }
- if (chan != avctx->channels) {
- av_log(avctx, AV_LOG_ERROR, "Block reports total %d channels, "
- "decoder believes it's %d channels\n", chan,
- avctx->channels);
- return -1;
+ break;
+ case WP_ID_SAMPLE_RATE:
+ if (size != 3) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid custom sample rate.\n");
+ return AVERROR_INVALIDDATA;
 }
- if (!avctx->channel_layout)
- avctx->channel_layout = chmask;
- buf += size - 1;
+ sample_rate = bytestream2_get_le24(&gb);
 break;
 default:
- buf += size;
+ bytestream2_skip(&gb, size);
 }
 if (id & WP_IDF_ODD)
- buf++;
+ bytestream2_skip(&gb, 1);
 }
 
 if (!got_terms) {
 av_log(avctx, AV_LOG_ERROR, "No block with decorrelation terms\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (!got_weights) {
 av_log(avctx, AV_LOG_ERROR, "No block with decorrelation weights\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (!got_samples) {
 av_log(avctx, AV_LOG_ERROR, "No block with decorrelation samples\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (!got_entropy) {
 av_log(avctx, AV_LOG_ERROR, "No block with entropy info\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (s->hybrid && !got_hybrid) {
 av_log(avctx, AV_LOG_ERROR, "Hybrid config not found\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (!got_bs) {
 av_log(avctx, AV_LOG_ERROR, "Packed samples not found\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- if (!got_float && avctx->sample_fmt == AV_SAMPLE_FMT_FLT) {
+ if (!got_float && avctx->sample_fmt == AV_SAMPLE_FMT_FLTP) {
 av_log(avctx, AV_LOG_ERROR, "Float information not found\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- if (s->got_extra_bits && avctx->sample_fmt != AV_SAMPLE_FMT_FLT) {
+ if (s->got_extra_bits && avctx->sample_fmt != AV_SAMPLE_FMT_FLTP) {
 const int size = get_bits_left(&s->gb_extra_bits);
 const int wanted = s->samples * s->extra_bits << s->stereo_in;
 if (size < wanted) {
@@ -1097,64 +1092,61 @@
 }
 }
 
- if (s->stereo_in) {
- if (avctx->sample_fmt == AV_SAMPLE_FMT_S16)
- samplecount = wv_unpack_stereo(s, &s->gb, samples, AV_SAMPLE_FMT_S16);
- else if (avctx->sample_fmt == AV_SAMPLE_FMT_S32)
- samplecount = wv_unpack_stereo(s, &s->gb, samples, AV_SAMPLE_FMT_S32);
- else
- samplecount = wv_unpack_stereo(s, &s->gb, samples, AV_SAMPLE_FMT_FLT);
-
- if (samplecount < 0)
- return -1;
-
- samplecount >>= 1;
- } else {
- const int channel_stride = avctx->channels;
-
- if (avctx->sample_fmt == AV_SAMPLE_FMT_S16)
- samplecount = wv_unpack_mono(s, &s->gb, samples, AV_SAMPLE_FMT_S16);
- else if (avctx->sample_fmt == AV_SAMPLE_FMT_S32)
- samplecount = wv_unpack_mono(s, &s->gb, samples, AV_SAMPLE_FMT_S32);
- else
- samplecount = wv_unpack_mono(s, &s->gb, samples, AV_SAMPLE_FMT_FLT);
-
- if (samplecount < 0)
- return -1;
-
- if (s->stereo && avctx->sample_fmt == AV_SAMPLE_FMT_S16) {
- int16_t *dst = (int16_t*)samples + 1;
- int16_t *src = (int16_t*)samples;
- int cnt = samplecount;
- while (cnt--) {
- *dst = *src;
- src += channel_stride;
- dst += channel_stride;
- }
- } else if (s->stereo && avctx->sample_fmt == AV_SAMPLE_FMT_S32) {
- int32_t *dst = (int32_t*)samples + 1;
- int32_t *src = (int32_t*)samples;
- int cnt = samplecount;
- while (cnt--) {
- *dst = *src;
- src += channel_stride;
- dst += channel_stride;
- }
- } else if (s->stereo) {
- float *dst = (float*)samples + 1;
- float *src = (float*)samples;
- int cnt = samplecount;
- while (cnt--) {
- *dst = *src;
- src += channel_stride;
- dst += channel_stride;
+ if (!wc->ch_offset) {
+ int sr = (s->frame_flags >> 23) & 0xf;
+ if (sr == 0xf) {
+ if (!sample_rate) {
+ av_log(avctx, AV_LOG_ERROR, "Custom sample rate missing.\n");
+ return AVERROR_INVALIDDATA;
 }
+ avctx->sample_rate = sample_rate;
+ } else
+ avctx->sample_rate = wv_rates[sr];
+
+ if (multiblock) {
+ if (chan)
+ avctx->channels = chan;
+ if (chmask)
+ avctx->channel_layout = chmask;
+ } else {
+ avctx->channels = s->stereo ? 2 : 1;
+ avctx->channel_layout = s->stereo ? AV_CH_LAYOUT_STEREO :
+ AV_CH_LAYOUT_MONO;
+ }
+
+ /* get output buffer */
+ frame->nb_samples = s->samples;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
 }
 }
 
- *got_frame_ptr = 1;
+ if (wc->ch_offset + s->stereo >= avctx->channels) {
+ av_log(avctx, AV_LOG_WARNING, "Too many channels coded in a packet.\n");
+ return (avctx->err_recognition & AV_EF_EXPLODE) ? AVERROR_INVALIDDATA : 0;
+ }
+
+ samples_l = frame->extended_data[wc->ch_offset];
+ if (s->stereo)
+ samples_r = frame->extended_data[wc->ch_offset + 1];
+
+ wc->ch_offset += 1 + s->stereo;
 
- return samplecount * bpp;
+ if (s->stereo_in) {
+ ret = wv_unpack_stereo(s, &s->gb, samples_l, samples_r, avctx->sample_fmt);
+ if (ret < 0)
+ return ret;
+ } else {
+ ret = wv_unpack_mono(s, &s->gb, samples_l, avctx->sample_fmt);
+ if (ret < 0)
+ return ret;
+
+ if (s->stereo)
+ memcpy(samples_r, samples_l, bpp * s->samples);
+ }
+
+ return 0;
 }
 
 static void wavpack_decode_flush(AVCodecContext *avctx)
@@ -1172,83 +1164,69 @@
 WavpackContext *s = avctx->priv_data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
+ AVFrame *frame = data;
 int frame_size, ret, frame_flags;
- int samplecount = 0;
+
+ if (avpkt->size <= WV_HEADER_SIZE)
+ return AVERROR_INVALIDDATA;
 
 s->block = 0;
 s->ch_offset = 0;
 
 /* determine number of samples */
- if (s->mkv_mode) {
- s->samples = AV_RL32(buf); buf += 4;
- frame_flags = AV_RL32(buf);
- } else {
- if (s->multichannel) {
- s->samples = AV_RL32(buf + 4);
- frame_flags = AV_RL32(buf + 8);
- } else {
- s->samples = AV_RL32(buf);
- frame_flags = AV_RL32(buf + 4);
- }
- }
+ s->samples = AV_RL32(buf + 20);
+ frame_flags = AV_RL32(buf + 24);
 if (s->samples <= 0) {
 av_log(avctx, AV_LOG_ERROR, "Invalid number of samples: %d\n",
 s->samples);
- return AVERROR(EINVAL);
+ return AVERROR_INVALIDDATA;
 }
 
 if (frame_flags & 0x80) {
- avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
+ avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
 } else if ((frame_flags & 0x03) <= 1) {
- avctx->sample_fmt = AV_SAMPLE_FMT_S16;
+ avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
 } else {
- avctx->sample_fmt = AV_SAMPLE_FMT_S32;
+ avctx->sample_fmt = AV_SAMPLE_FMT_S32P;
 avctx->bits_per_raw_sample = ((frame_flags & 0x03) + 1) << 3;
 }
 
- /* get output buffer */
- s->frame.nb_samples = s->samples;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return ret;
- }
-
 while (buf_size > 0) {
- if (!s->multichannel) {
- frame_size = buf_size;
- } else {
- if (!s->mkv_mode) {
- frame_size = AV_RL32(buf) - 12; buf += 4; buf_size -= 4;
- } else {
- if (buf_size < 12) //MKV files can have zero flags after last block
- break;
- frame_size = AV_RL32(buf + 8) + 12;
- }
- }
- if (frame_size < 0 || frame_size > buf_size) {
- av_log(avctx, AV_LOG_ERROR, "Block %d has invalid size (size %d "
- "vs. %d bytes left)\n", s->block, frame_size, buf_size);
+ if (buf_size <= WV_HEADER_SIZE)
+ break;
+ frame_size = AV_RL32(buf + 4) - 12;
+ buf += 20;
+ buf_size -= 20;
+ if (frame_size <= 0 || frame_size > buf_size) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Block %d has invalid size (size %d vs. %d bytes left)\n",
+ s->block, frame_size, buf_size);
 wavpack_decode_flush(avctx);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
- if ((samplecount = wavpack_decode_block(avctx, s->block,
- s->frame.data[0], got_frame_ptr,
- buf, frame_size)) < 0) {
+ if ((ret = wavpack_decode_block(avctx, s->block,
+ frame, buf, frame_size)) < 0) {
 wavpack_decode_flush(avctx);
- return -1;
+ return ret;
 }
 s->block++;
- buf += frame_size; buf_size -= frame_size;
+ buf += frame_size;
+ buf_size -= frame_size;
 }
 
- if (*got_frame_ptr)
- *(AVFrame *)data = s->frame;
+ if (s->ch_offset != avctx->channels) {
+ av_log(avctx, AV_LOG_ERROR, "Not enough channels coded in a packet.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ *got_frame_ptr = 1;
 
 return avpkt->size;
 }
 
 AVCodec ff_wavpack_decoder = {
 .name = "wavpack",
+ .long_name = NULL_IF_CONFIG_SMALL("WavPack"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_WAVPACK,
 .priv_data_size = sizeof(WavpackContext),
@@ -1256,6 +1234,5 @@
 .close = wavpack_decode_end,
 .decode = wavpack_decode_frame,
 .flush = wavpack_decode_flush,
- .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("WavPack"),
+ .capabilities = CODEC_CAP_DR1,
 };

libav-v10.1.tar.bz2/libavcodec/webp.c Added

@@ -0,0 +1,1467 @@
+/*
+ * WebP (.webp) image decoder
+ * Copyright (c) 2013 Aneesh Dogra <aneesh@sugarlabs.org>
+ * Copyright (c) 2013 Justin Ruggles <justin.ruggles@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * WebP image decoder
+ *
+ * @author Aneesh Dogra <aneesh@sugarlabs.org>
+ * Container and Lossy decoding
+ *
+ * @author Justin Ruggles <justin.ruggles@gmail.com>
+ * Lossless decoder
+ * Compressed alpha for lossy
+ *
+ * Unimplemented:
+ * - Animation
+ * - ICC profile
+ * - Exif and XMP metadata
+ */
+
+#define BITSTREAM_READER_LE
+#include "libavutil/imgutils.h"
+#include "avcodec.h"
+#include "bytestream.h"
+#include "internal.h"
+#include "get_bits.h"
+#include "thread.h"
+#include "vp8.h"
+
+#define VP8X_FLAG_ANIMATION 0x02
+#define VP8X_FLAG_XMP_METADATA 0x04
+#define VP8X_FLAG_EXIF_METADATA 0x08
+#define VP8X_FLAG_ALPHA 0x10
+#define VP8X_FLAG_ICC 0x20
+
+#define MAX_PALETTE_SIZE 256
+#define MAX_CACHE_BITS 11
+#define NUM_CODE_LENGTH_CODES 19
+#define HUFFMAN_CODES_PER_META_CODE 5
+#define NUM_LITERAL_CODES 256
+#define NUM_LENGTH_CODES 24
+#define NUM_DISTANCE_CODES 40
+#define NUM_SHORT_DISTANCES 120
+#define MAX_HUFFMAN_CODE_LENGTH 15
+
+static const uint16_t alphabet_sizes[HUFFMAN_CODES_PER_META_CODE] = {
+ NUM_LITERAL_CODES + NUM_LENGTH_CODES,
+ NUM_LITERAL_CODES, NUM_LITERAL_CODES, NUM_LITERAL_CODES,
+ NUM_DISTANCE_CODES
+};
+
+static const uint8_t code_length_code_order[NUM_CODE_LENGTH_CODES] = {
+ 17, 18, 0, 1, 2, 3, 4, 5, 16, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+};
+
+static const int8_t lz77_distance_offsets[NUM_SHORT_DISTANCES][2] = {
+ { 0, 1 }, { 1, 0 }, { 1, 1 }, { -1, 1 }, { 0, 2 }, { 2, 0 }, { 1, 2 }, { -1, 2 },
+ { 2, 1 }, { -2, 1 }, { 2, 2 }, { -2, 2 }, { 0, 3 }, { 3, 0 }, { 1, 3 }, { -1, 3 },
+ { 3, 1 }, { -3, 1 }, { 2, 3 }, { -2, 3 }, { 3, 2 }, { -3, 2 }, { 0, 4 }, { 4, 0 },
+ { 1, 4 }, { -1, 4 }, { 4, 1 }, { -4, 1 }, { 3, 3 }, { -3, 3 }, { 2, 4 }, { -2, 4 },
+ { 4, 2 }, { -4, 2 }, { 0, 5 }, { 3, 4 }, { -3, 4 }, { 4, 3 }, { -4, 3 }, { 5, 0 },
+ { 1, 5 }, { -1, 5 }, { 5, 1 }, { -5, 1 }, { 2, 5 }, { -2, 5 }, { 5, 2 }, { -5, 2 },
+ { 4, 4 }, { -4, 4 }, { 3, 5 }, { -3, 5 }, { 5, 3 }, { -5, 3 }, { 0, 6 }, { 6, 0 },
+ { 1, 6 }, { -1, 6 }, { 6, 1 }, { -6, 1 }, { 2, 6 }, { -2, 6 }, { 6, 2 }, { -6, 2 },
+ { 4, 5 }, { -4, 5 }, { 5, 4 }, { -5, 4 }, { 3, 6 }, { -3, 6 }, { 6, 3 }, { -6, 3 },
+ { 0, 7 }, { 7, 0 }, { 1, 7 }, { -1, 7 }, { 5, 5 }, { -5, 5 }, { 7, 1 }, { -7, 1 },
+ { 4, 6 }, { -4, 6 }, { 6, 4 }, { -6, 4 }, { 2, 7 }, { -2, 7 }, { 7, 2 }, { -7, 2 },
+ { 3, 7 }, { -3, 7 }, { 7, 3 }, { -7, 3 }, { 5, 6 }, { -5, 6 }, { 6, 5 }, { -6, 5 },
+ { 8, 0 }, { 4, 7 }, { -4, 7 }, { 7, 4 }, { -7, 4 }, { 8, 1 }, { 8, 2 }, { 6, 6 },
+ { -6, 6 }, { 8, 3 }, { 5, 7 }, { -5, 7 }, { 7, 5 }, { -7, 5 }, { 8, 4 }, { 6, 7 },
+ { -6, 7 }, { 7, 6 }, { -7, 6 }, { 8, 5 }, { 7, 7 }, { -7, 7 }, { 8, 6 }, { 8, 7 }
+};
+
+enum AlphaCompression {
+ ALPHA_COMPRESSION_NONE,
+ ALPHA_COMPRESSION_VP8L,
+};
+
+enum AlphaFilter {
+ ALPHA_FILTER_NONE,
+ ALPHA_FILTER_HORIZONTAL,
+ ALPHA_FILTER_VERTICAL,
+ ALPHA_FILTER_GRADIENT,
+};
+
+enum TransformType {
+ PREDICTOR_TRANSFORM = 0,
+ COLOR_TRANSFORM = 1,
+ SUBTRACT_GREEN = 2,
+ COLOR_INDEXING_TRANSFORM = 3,
+};
+
+enum PredictionMode {
+ PRED_MODE_BLACK,
+ PRED_MODE_L,
+ PRED_MODE_T,
+ PRED_MODE_TR,
+ PRED_MODE_TL,
+ PRED_MODE_AVG_T_AVG_L_TR,
+ PRED_MODE_AVG_L_TL,
+ PRED_MODE_AVG_L_T,
+ PRED_MODE_AVG_TL_T,
+ PRED_MODE_AVG_T_TR,
+ PRED_MODE_AVG_AVG_L_TL_AVG_T_TR,
+ PRED_MODE_SELECT,
+ PRED_MODE_ADD_SUBTRACT_FULL,
+ PRED_MODE_ADD_SUBTRACT_HALF,
+};
+
+enum HuffmanIndex {
+ HUFF_IDX_GREEN = 0,
+ HUFF_IDX_RED = 1,
+ HUFF_IDX_BLUE = 2,
+ HUFF_IDX_ALPHA = 3,
+ HUFF_IDX_DIST = 4
+};
+
+/* The structure of WebP lossless is an optional series of transformation data,
+ * followed by the primary image. The primary image also optionally contains
+ * an entropy group mapping if there are multiple entropy groups. There is a
+ * basic image type called an "entropy coded image" that is used for all of
+ * these. The type of each entropy coded image is referred to by the
+ * specification as its role. */
+enum ImageRole {
+ /* Primary Image: Stores the actual pixels of the image. */
+ IMAGE_ROLE_ARGB,
+
+ /* Entropy Image: Defines which Huffman group to use for different areas of
+ * the primary image. */
+ IMAGE_ROLE_ENTROPY,
+
+ /* Predictors: Defines which predictor type to use for different areas of
+ * the primary image. */
+ IMAGE_ROLE_PREDICTOR,
+
+ /* Color Transform Data: Defines the color transformation for different
+ * areas of the primary image. */
+ IMAGE_ROLE_COLOR_TRANSFORM,
+
+ /* Color Index: Stored as an image of height == 1. */
+ IMAGE_ROLE_COLOR_INDEXING,
+
+ IMAGE_ROLE_NB,
+};
+
+typedef struct HuffReader {
+ VLC vlc; /* Huffman decoder context */
+ int simple; /* whether to use simple mode */
+ int nb_symbols; /* number of coded symbols */
+ uint16_t simple_symbols[2]; /* symbols for simple mode */
+} HuffReader;
+
+typedef struct ImageContext {
+ enum ImageRole role; /* role of this image */
+ AVFrame *frame; /* AVFrame for data */
+ int color_cache_bits; /* color cache size, log2 */
+ uint32_t *color_cache; /* color cache data */
+ int nb_huffman_groups; /* number of huffman groups */
+ HuffReader *huffman_groups; /* reader for each huffman group */
+ int size_reduction; /* relative size compared to primary image, log2 */
+ int is_alpha_primary;
+} ImageContext;
+
+typedef struct WebPContext {
+ VP8Context v; /* VP8 Context used for lossy decoding */
+ GetBitContext gb; /* bitstream reader for main image chunk */
+ AVFrame *alpha_frame; /* AVFrame for alpha data decompressed from VP8L */
+ AVCodecContext *avctx; /* parent AVCodecContext */
+ int initialized; /* set once the VP8 context is initialized */
+ int has_alpha; /* has a separate alpha chunk */
+ enum AlphaCompression alpha_compression; /* compression type for alpha chunk */
+ 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 width; /* image width */
+ int height; /* image height */
+ int lossless; /* indicates lossless or lossy */
+
+ int nb_transforms; /* number of transforms */
+ enum TransformType transforms[4]; /* transformations used in the image, in order */
+ int reduced_width; /* reduced width for index image, if applicable */
+ int nb_huffman_groups; /* number of huffman groups in the primary image */
+ ImageContext image[IMAGE_ROLE_NB]; /* image context for each role */
+} WebPContext;
+
+#define GET_PIXEL(frame, x, y) \
+ ((frame)->data[0] + (y) * frame->linesize[0] + 4 * (x))
+
+#define GET_PIXEL_COMP(frame, x, y, c) \
+ (*((frame)->data[0] + (y) * frame->linesize[0] + 4 * (x) + c))
+
+static void image_ctx_free(ImageContext *img)
+{
+ int i, j;
+
+ av_free(img->color_cache);
+ if (img->role != IMAGE_ROLE_ARGB && !img->is_alpha_primary)
+ av_frame_free(&img->frame);
+ if (img->huffman_groups) {
+ for (i = 0; i < img->nb_huffman_groups; i++) {
+ for (j = 0; j < HUFFMAN_CODES_PER_META_CODE; j++)
+ ff_free_vlc(&img->huffman_groups[i * HUFFMAN_CODES_PER_META_CODE + j].vlc);
+ }
+ av_free(img->huffman_groups);
+ }
+ memset(img, 0, sizeof(*img));
+}
+
+
+/* Differs from get_vlc2() in the following ways:
+ * - codes are bit-reversed
+ * - assumes 8-bit table to make reversal simpler
+ * - assumes max depth of 2 since the max code length for WebP is 15
+ */
+static av_always_inline int webp_get_vlc(GetBitContext *gb, VLC_TYPE (*table)[2])
+{
+ int n, nb_bits;
+ unsigned int index;
+ int code;
+
+ OPEN_READER(re, gb);
+ UPDATE_CACHE(re, gb);
+
+ index = SHOW_UBITS(re, gb, 8);
+ index = ff_reverse[index];
+ code = table[index][0];
+ n = table[index][1];
+
+ if (n < 0) {
+ LAST_SKIP_BITS(re, gb, 8);
+ UPDATE_CACHE(re, gb);
+
+ nb_bits = -n;
+
+ index = SHOW_UBITS(re, gb, nb_bits);
+ index = (ff_reverse[index] >> (8 - nb_bits)) + code;
+ code = table[index][0];
+ n = table[index][1];
+ }
+ SKIP_BITS(re, gb, n);
+
+ CLOSE_READER(re, gb);
+
+ return code;
+}
+
+static int huff_reader_get_symbol(HuffReader *r, GetBitContext *gb)
+{
+ if (r->simple) {
+ if (r->nb_symbols == 1)
+ return r->simple_symbols[0];
+ else
+ return r->simple_symbols[get_bits1(gb)];
+ } else
+ return webp_get_vlc(gb, r->vlc.table);
+}
+
+static int huff_reader_build_canonical(HuffReader *r, int *code_lengths,
+ int alphabet_size)
+{
+ 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]);
+
+ if (max_code_length == 0 || max_code_length > MAX_HUFFMAN_CODE_LENGTH)
+ return AVERROR(EINVAL);
+
+ codes = av_malloc(alphabet_size * sizeof(*codes));
+ if (!codes)
+ return AVERROR(ENOMEM);
+
+ code = 0;
+ r->nb_symbols = 0;
+ for (len = 1; len <= max_code_length; len++) {
+ for (sym = 0; sym < alphabet_size; sym++) {
+ if (code_lengths[sym] != len)
+ continue;
+ codes[sym] = code++;
+ r->nb_symbols++;
+ }
+ code <<= 1;
+ }
+ if (!r->nb_symbols) {
+ av_free(codes);
+ return AVERROR_INVALIDDATA;
+ }
+
+ ret = init_vlc(&r->vlc, 8, alphabet_size,
+ code_lengths, sizeof(*code_lengths), sizeof(*code_lengths),
+ codes, sizeof(*codes), sizeof(*codes), 0);
+ if (ret < 0) {
+ av_free(codes);
+ return ret;
+ }
+ r->simple = 0;
+
+ av_free(codes);
+ return 0;
+}
+
+static void read_huffman_code_simple(WebPContext *s, HuffReader *hc)
+{
+ hc->nb_symbols = get_bits1(&s->gb) + 1;
+
+ if (get_bits1(&s->gb))
+ hc->simple_symbols[0] = get_bits(&s->gb, 8);
+ else
+ hc->simple_symbols[0] = get_bits1(&s->gb);
+
+ if (hc->nb_symbols == 2)
+ hc->simple_symbols[1] = get_bits(&s->gb, 8);
+
+ hc->simple = 1;
+}
+
+static int read_huffman_code_normal(WebPContext *s, HuffReader *hc,
+ int alphabet_size)
+{
+ HuffReader code_len_hc = { { 0 }, 0, 0, { 0 } };
+ int *code_lengths = NULL;
+ int code_length_code_lengths[NUM_CODE_LENGTH_CODES] = { 0 };
+ int i, symbol, max_symbol, prev_code_len, ret;
+ int num_codes = 4 + get_bits(&s->gb, 4);
+
+ if (num_codes > NUM_CODE_LENGTH_CODES)
+ return AVERROR_INVALIDDATA;
+
+ for (i = 0; i < num_codes; i++)
+ code_length_code_lengths[code_length_code_order[i]] = get_bits(&s->gb, 3);
+
+ ret = huff_reader_build_canonical(&code_len_hc, code_length_code_lengths,
+ NUM_CODE_LENGTH_CODES);
+ if (ret < 0)
+ goto finish;
+
+ code_lengths = av_mallocz_array(alphabet_size, sizeof(*code_lengths));
+ if (!code_lengths) {
+ ret = AVERROR(ENOMEM);
+ goto finish;
+ }
+
+ if (get_bits1(&s->gb)) {
+ int bits = 2 + 2 * get_bits(&s->gb, 3);
+ max_symbol = 2 + get_bits(&s->gb, bits);
+ if (max_symbol > alphabet_size) {
+ av_log(s->avctx, AV_LOG_ERROR, "max symbol %d > alphabet size %d\n",
+ max_symbol, alphabet_size);
+ ret = AVERROR_INVALIDDATA;
+ goto finish;
+ }
+ } else {
+ max_symbol = alphabet_size;
+ }
+
+ prev_code_len = 8;
+ symbol = 0;
+ while (symbol < alphabet_size) {
+ int code_len;
+
+ if (!max_symbol--)
+ break;
+ code_len = huff_reader_get_symbol(&code_len_hc, &s->gb);
+ if (code_len < 16) {
+ /* Code length code [0..15] indicates literal code lengths. */
+ code_lengths[symbol++] = code_len;
+ if (code_len)
+ prev_code_len = code_len;
+ } else {
+ int repeat = 0, length = 0;
+ switch (code_len) {
+ case 16:
+ /* Code 16 repeats the previous non-zero value [3..6] times,
+ * i.e., 3 + ReadBits(2) times. If code 16 is used before a
+ * non-zero value has been emitted, a value of 8 is repeated. */
+ repeat = 3 + get_bits(&s->gb, 2);
+ length = prev_code_len;
+ break;
+ case 17:
+ /* Code 17 emits a streak of zeros [3..10], i.e.,
+ * 3 + ReadBits(3) times. */
+ repeat = 3 + get_bits(&s->gb, 3);
+ break;
+ case 18:
+ /* Code 18 emits a streak of zeros of length [11..138], i.e.,
+ * 11 + ReadBits(7) times. */
+ repeat = 11 + get_bits(&s->gb, 7);
+ break;
+ }
+ if (symbol + repeat > alphabet_size) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "invalid symbol %d + repeat %d > alphabet size %d\n",
+ symbol, repeat, alphabet_size);
+ ret = AVERROR_INVALIDDATA;
+ goto finish;
+ }
+ while (repeat-- > 0)
+ code_lengths[symbol++] = length;
+ }
+ }
+
+ ret = huff_reader_build_canonical(hc, code_lengths, alphabet_size);
+
+finish:
+ ff_free_vlc(&code_len_hc.vlc);
+ av_free(code_lengths);
+ return ret;
+}
+
+static int decode_entropy_coded_image(WebPContext *s, enum ImageRole role,
+ int w, int h);
+
+#define PARSE_BLOCK_SIZE(w, h) do { \
+ block_bits = get_bits(&s->gb, 3) + 2; \
+ blocks_w = FFALIGN((w), 1 << block_bits) >> block_bits; \
+ blocks_h = FFALIGN((h), 1 << block_bits) >> block_bits; \
+} while (0)
+
+static int decode_entropy_image(WebPContext *s)
+{
+ ImageContext *img;
+ int ret, block_bits, width, blocks_w, blocks_h, x, y, max;
+
+ width = s->width;
+ if (s->reduced_width > 0)
+ width = s->reduced_width;
+
+ PARSE_BLOCK_SIZE(width, s->height);
+
+ ret = decode_entropy_coded_image(s, IMAGE_ROLE_ENTROPY, blocks_w, blocks_h);
+ if (ret < 0)
+ return ret;
+
+ img = &s->image[IMAGE_ROLE_ENTROPY];
+ img->size_reduction = block_bits;
+
+ /* the number of huffman groups is determined by the maximum group number
+ * coded in the entropy image */
+ max = 0;
+ for (y = 0; y < img->frame->height; y++) {
+ for (x = 0; x < img->frame->width; x++) {
+ int p = GET_PIXEL_COMP(img->frame, x, y, 2);
+ max = FFMAX(max, p);
+ }
+ }
+ s->nb_huffman_groups = max + 1;
+
+ return 0;
+}
+
+static int parse_transform_predictor(WebPContext *s)
+{
+ int block_bits, blocks_w, blocks_h, ret;
+
+ PARSE_BLOCK_SIZE(s->width, s->height);
+
+ ret = decode_entropy_coded_image(s, IMAGE_ROLE_PREDICTOR, blocks_w,
+ blocks_h);
+ if (ret < 0)
+ return ret;
+
+ s->image[IMAGE_ROLE_PREDICTOR].size_reduction = block_bits;
+
+ return 0;
+}
+
+static int parse_transform_color(WebPContext *s)
+{
+ int block_bits, blocks_w, blocks_h, ret;
+
+ PARSE_BLOCK_SIZE(s->width, s->height);
+
+ ret = decode_entropy_coded_image(s, IMAGE_ROLE_COLOR_TRANSFORM, blocks_w,
+ blocks_h);
+ if (ret < 0)
+ return ret;
+
+ s->image[IMAGE_ROLE_COLOR_TRANSFORM].size_reduction = block_bits;
+
+ return 0;
+}
+
+static int parse_transform_color_indexing(WebPContext *s)
+{
+ ImageContext *img;
+ int width_bits, index_size, ret, x;
+ uint8_t *ct;
+
+ index_size = get_bits(&s->gb, 8) + 1;
+
+ if (index_size <= 2)
+ width_bits = 3;
+ else if (index_size <= 4)
+ width_bits = 2;
+ else if (index_size <= 16)
+ width_bits = 1;
+ else
+ width_bits = 0;
+
+ ret = decode_entropy_coded_image(s, IMAGE_ROLE_COLOR_INDEXING,
+ index_size, 1);
+ if (ret < 0)
+ return ret;
+
+ img = &s->image[IMAGE_ROLE_COLOR_INDEXING];
+ img->size_reduction = width_bits;
+ if (width_bits > 0)
+ s->reduced_width = (s->width + ((1 << width_bits) - 1)) >> width_bits;
+
+ /* color index values are delta-coded */
+ ct = img->frame->data[0] + 4;
+ for (x = 4; x < img->frame->width * 4; x++, ct++)
+ ct[0] += ct[-4];
+
+ return 0;
+}
+
+static HuffReader *get_huffman_group(WebPContext *s, ImageContext *img,
+ int x, int y)
+{
+ ImageContext *gimg = &s->image[IMAGE_ROLE_ENTROPY];
+ int group = 0;
+
+ if (gimg->size_reduction > 0) {
+ int group_x = x >> gimg->size_reduction;
+ int group_y = y >> gimg->size_reduction;
+ group = GET_PIXEL_COMP(gimg->frame, group_x, group_y, 2);
+ }
+
+ return &img->huffman_groups[group * HUFFMAN_CODES_PER_META_CODE];
+}
+
+static av_always_inline void color_cache_put(ImageContext *img, uint32_t c)
+{
+ uint32_t cache_idx = (0x1E35A7BD * c) >> (32 - img->color_cache_bits);
+ img->color_cache[cache_idx] = c;
+}
+
+static int decode_entropy_coded_image(WebPContext *s, enum ImageRole role,
+ int w, int h)
+{
+ ImageContext *img;
+ HuffReader *hg;
+ int i, j, ret, x, y, width;
+
+ img = &s->image[role];
+ img->role = role;
+
+ if (!img->frame) {
+ img->frame = av_frame_alloc();
+ if (!img->frame)
+ return AVERROR(ENOMEM);
+ }
+
+ img->frame->format = AV_PIX_FMT_ARGB;
+ img->frame->width = w;
+ img->frame->height = h;
+
+ if (role == IMAGE_ROLE_ARGB && !img->is_alpha_primary) {
+ ThreadFrame pt = { .f = img->frame };
+ ret = ff_thread_get_buffer(s->avctx, &pt, 0);
+ } else
+ ret = av_frame_get_buffer(img->frame, 1);
+ if (ret < 0)
+ return ret;
+
+ if (get_bits1(&s->gb)) {
+ img->color_cache_bits = get_bits(&s->gb, 4);
+ if (img->color_cache_bits < 1 || img->color_cache_bits > 11) {
+ av_log(s->avctx, AV_LOG_ERROR, "invalid color cache bits: %d\n",
+ img->color_cache_bits);
+ return AVERROR_INVALIDDATA;
+ }
+ img->color_cache = av_mallocz_array(1 << img->color_cache_bits,
+ sizeof(*img->color_cache));
+ if (!img->color_cache)
+ return AVERROR(ENOMEM);
+ } else {
+ img->color_cache_bits = 0;
+ }
+
+ img->nb_huffman_groups = 1;
+ if (role == IMAGE_ROLE_ARGB && get_bits1(&s->gb)) {
+ ret = decode_entropy_image(s);
+ if (ret < 0)
+ return ret;
+ img->nb_huffman_groups = s->nb_huffman_groups;
+ }
+ img->huffman_groups = av_mallocz_array(img->nb_huffman_groups *
+ HUFFMAN_CODES_PER_META_CODE,
+ sizeof(*img->huffman_groups));
+ if (!img->huffman_groups)
+ return AVERROR(ENOMEM);
+
+ for (i = 0; i < img->nb_huffman_groups; i++) {
+ hg = &img->huffman_groups[i * HUFFMAN_CODES_PER_META_CODE];
+ for (j = 0; j < HUFFMAN_CODES_PER_META_CODE; j++) {
+ int alphabet_size = alphabet_sizes[j];
+ if (!j && img->color_cache_bits > 0)
+ alphabet_size += 1 << img->color_cache_bits;
+
+ if (get_bits1(&s->gb)) {
+ read_huffman_code_simple(s, &hg[j]);
+ } else {
+ ret = read_huffman_code_normal(s, &hg[j], alphabet_size);
+ if (ret < 0)
+ return ret;
+ }
+ }
+ }
+
+ width = img->frame->width;
+ if (role == IMAGE_ROLE_ARGB && s->reduced_width > 0)
+ width = s->reduced_width;
+
+ x = 0; y = 0;
+ while (y < img->frame->height) {
+ int v;
+
+ hg = get_huffman_group(s, img, x, y);
+ v = huff_reader_get_symbol(&hg[HUFF_IDX_GREEN], &s->gb);
+ if (v < NUM_LITERAL_CODES) {
+ /* literal pixel values */
+ uint8_t *p = GET_PIXEL(img->frame, x, y);
+ p[2] = v;
+ p[1] = huff_reader_get_symbol(&hg[HUFF_IDX_RED], &s->gb);
+ p[3] = huff_reader_get_symbol(&hg[HUFF_IDX_BLUE], &s->gb);
+ p[0] = huff_reader_get_symbol(&hg[HUFF_IDX_ALPHA], &s->gb);
+ if (img->color_cache_bits)
+ color_cache_put(img, AV_RB32(p));
+ x++;
+ if (x == width) {
+ x = 0;
+ y++;
+ }
+ } else if (v < NUM_LITERAL_CODES + NUM_LENGTH_CODES) {
+ /* LZ77 backwards mapping */
+ int prefix_code, length, distance, ref_x, ref_y;
+
+ /* parse length and distance */
+ prefix_code = v - NUM_LITERAL_CODES;
+ if (prefix_code < 4) {
+ length = prefix_code + 1;
+ } else {
+ int extra_bits = (prefix_code - 2) >> 1;
+ int offset = 2 + (prefix_code & 1) << extra_bits;
+ length = offset + get_bits(&s->gb, extra_bits) + 1;
+ }
+ prefix_code = huff_reader_get_symbol(&hg[HUFF_IDX_DIST], &s->gb);
+ if (prefix_code < 4) {
+ distance = prefix_code + 1;
+ } else {
+ int extra_bits = prefix_code - 2 >> 1;
+ int offset = 2 + (prefix_code & 1) << extra_bits;
+ distance = offset + get_bits(&s->gb, extra_bits) + 1;
+ }
+
+ /* find reference location */
+ if (distance <= NUM_SHORT_DISTANCES) {
+ int xi = lz77_distance_offsets[distance - 1][0];
+ int yi = lz77_distance_offsets[distance - 1][1];
+ distance = FFMAX(1, xi + yi * width);
+ } else {
+ distance -= NUM_SHORT_DISTANCES;
+ }
+ ref_x = x;
+ ref_y = y;
+ if (distance <= x) {
+ ref_x -= distance;
+ distance = 0;
+ } else {
+ ref_x = 0;
+ distance -= x;
+ }
+ while (distance >= width) {
+ ref_y--;
+ distance -= width;
+ }
+ if (distance > 0) {
+ ref_x = width - distance;
+ ref_y--;
+ }
+ ref_x = FFMAX(0, ref_x);
+ ref_y = FFMAX(0, ref_y);
+
+ /* copy pixels
+ * source and dest regions can overlap and wrap lines, so just
+ * copy per-pixel */
+ for (i = 0; i < length; i++) {
+ uint8_t *p_ref = GET_PIXEL(img->frame, ref_x, ref_y);
+ uint8_t *p = GET_PIXEL(img->frame, x, y);
+
+ AV_COPY32(p, p_ref);
+ if (img->color_cache_bits)
+ color_cache_put(img, AV_RB32(p));
+ x++;
+ ref_x++;
+ if (x == width) {
+ x = 0;
+ y++;
+ }
+ if (ref_x == width) {
+ ref_x = 0;
+ ref_y++;
+ }
+ if (y == img->frame->height || ref_y == img->frame->height)
+ break;
+ }
+ } else {
+ /* read from color cache */
+ uint8_t *p = GET_PIXEL(img->frame, x, y);
+ int cache_idx = v - (NUM_LITERAL_CODES + NUM_LENGTH_CODES);
+
+ if (!img->color_cache_bits) {
+ av_log(s->avctx, AV_LOG_ERROR, "color cache not found\n");
+ return AVERROR_INVALIDDATA;
+ }
+ if (cache_idx >= 1 << img->color_cache_bits) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "color cache index out-of-bounds\n");
+ return AVERROR_INVALIDDATA;
+ }
+ AV_WB32(p, img->color_cache[cache_idx]);
+ x++;
+ if (x == width) {
+ x = 0;
+ y++;
+ }
+ }
+ }
+
+ return 0;
+}
+
+/* PRED_MODE_BLACK */
+static void inv_predict_0(uint8_t *p, const uint8_t *p_l, const uint8_t *p_tl,
+ const uint8_t *p_t, const uint8_t *p_tr)
+{
+ AV_WB32(p, 0xFF000000);
+}
+
+/* PRED_MODE_L */
+static void inv_predict_1(uint8_t *p, const uint8_t *p_l, const uint8_t *p_tl,
+ const uint8_t *p_t, const uint8_t *p_tr)
+{
+ AV_COPY32(p, p_l);
+}
+
+/* PRED_MODE_T */
+static void inv_predict_2(uint8_t *p, const uint8_t *p_l, const uint8_t *p_tl,
+ const uint8_t *p_t, const uint8_t *p_tr)
+{
+ AV_COPY32(p, p_t);
+}
+
+/* PRED_MODE_TR */
+static void inv_predict_3(uint8_t *p, const uint8_t *p_l, const uint8_t *p_tl,
+ const uint8_t *p_t, const uint8_t *p_tr)
+{
+ AV_COPY32(p, p_tr);
+}
+
+/* PRED_MODE_TL */
+static void inv_predict_4(uint8_t *p, const uint8_t *p_l, const uint8_t *p_tl,
+ const uint8_t *p_t, const uint8_t *p_tr)
+{
+ AV_COPY32(p, p_tl);
+}
+
+/* PRED_MODE_AVG_T_AVG_L_TR */
+static void inv_predict_5(uint8_t *p, const uint8_t *p_l, const uint8_t *p_tl,
+ const uint8_t *p_t, const uint8_t *p_tr)
+{
+ p[0] = p_t[0] + (p_l[0] + p_tr[0] >> 1) >> 1;
+ p[1] = p_t[1] + (p_l[1] + p_tr[1] >> 1) >> 1;
+ p[2] = p_t[2] + (p_l[2] + p_tr[2] >> 1) >> 1;
+ p[3] = p_t[3] + (p_l[3] + p_tr[3] >> 1) >> 1;
+}
+
+/* PRED_MODE_AVG_L_TL */
+static void inv_predict_6(uint8_t *p, const uint8_t *p_l, const uint8_t *p_tl,
+ const uint8_t *p_t, const uint8_t *p_tr)
+{
+ p[0] = p_l[0] + p_tl[0] >> 1;
+ p[1] = p_l[1] + p_tl[1] >> 1;
+ p[2] = p_l[2] + p_tl[2] >> 1;
+ p[3] = p_l[3] + p_tl[3] >> 1;
+}
+
+/* PRED_MODE_AVG_L_T */
+static void inv_predict_7(uint8_t *p, const uint8_t *p_l, const uint8_t *p_tl,
+ const uint8_t *p_t, const uint8_t *p_tr)
+{
+ p[0] = p_l[0] + p_t[0] >> 1;
+ p[1] = p_l[1] + p_t[1] >> 1;
+ p[2] = p_l[2] + p_t[2] >> 1;
+ p[3] = p_l[3] + p_t[3] >> 1;
+}
+
+/* PRED_MODE_AVG_TL_T */
+static void inv_predict_8(uint8_t *p, const uint8_t *p_l, const uint8_t *p_tl,
+ const uint8_t *p_t, const uint8_t *p_tr)
+{
+ p[0] = p_tl[0] + p_t[0] >> 1;
+ p[1] = p_tl[1] + p_t[1] >> 1;
+ p[2] = p_tl[2] + p_t[2] >> 1;
+ p[3] = p_tl[3] + p_t[3] >> 1;
+}
+
+/* PRED_MODE_AVG_T_TR */
+static void inv_predict_9(uint8_t *p, const uint8_t *p_l, const uint8_t *p_tl,
+ const uint8_t *p_t, const uint8_t *p_tr)
+{
+ p[0] = p_t[0] + p_tr[0] >> 1;
+ p[1] = p_t[1] + p_tr[1] >> 1;
+ p[2] = p_t[2] + p_tr[2] >> 1;
+ p[3] = p_t[3] + p_tr[3] >> 1;
+}
+
+/* PRED_MODE_AVG_AVG_L_TL_AVG_T_TR */
+static void inv_predict_10(uint8_t *p, const uint8_t *p_l, const uint8_t *p_tl,
+ const uint8_t *p_t, const uint8_t *p_tr)
+{
+ p[0] = (p_l[0] + p_tl[0] >> 1) + (p_t[0] + p_tr[0] >> 1) >> 1;
+ p[1] = (p_l[1] + p_tl[1] >> 1) + (p_t[1] + p_tr[1] >> 1) >> 1;
+ p[2] = (p_l[2] + p_tl[2] >> 1) + (p_t[2] + p_tr[2] >> 1) >> 1;
+ p[3] = (p_l[3] + p_tl[3] >> 1) + (p_t[3] + p_tr[3] >> 1) >> 1;
+}
+
+/* PRED_MODE_SELECT */
+static void inv_predict_11(uint8_t *p, const uint8_t *p_l, const uint8_t *p_tl,
+ const uint8_t *p_t, const uint8_t *p_tr)
+{
+ int diff = (FFABS(p_l[0] - p_tl[0]) - FFABS(p_t[0] - p_tl[0])) +
+ (FFABS(p_l[1] - p_tl[1]) - FFABS(p_t[1] - p_tl[1])) +
+ (FFABS(p_l[2] - p_tl[2]) - FFABS(p_t[2] - p_tl[2])) +
+ (FFABS(p_l[3] - p_tl[3]) - FFABS(p_t[3] - p_tl[3]));
+ if (diff <= 0)
+ AV_COPY32(p, p_t);
+ else
+ AV_COPY32(p, p_l);
+}
+
+/* PRED_MODE_ADD_SUBTRACT_FULL */
+static void inv_predict_12(uint8_t *p, const uint8_t *p_l, const uint8_t *p_tl,
+ const uint8_t *p_t, const uint8_t *p_tr)
+{
+ p[0] = av_clip_uint8(p_l[0] + p_t[0] - p_tl[0]);
+ p[1] = av_clip_uint8(p_l[1] + p_t[1] - p_tl[1]);
+ p[2] = av_clip_uint8(p_l[2] + p_t[2] - p_tl[2]);
+ p[3] = av_clip_uint8(p_l[3] + p_t[3] - p_tl[3]);
+}
+
+static av_always_inline uint8_t clamp_add_subtract_half(int a, int b, int c)
+{
+ int d = a + b >> 1;
+ return av_clip_uint8(d + (d - c) / 2);
+}
+
+/* PRED_MODE_ADD_SUBTRACT_HALF */
+static void inv_predict_13(uint8_t *p, const uint8_t *p_l, const uint8_t *p_tl,
+ const uint8_t *p_t, const uint8_t *p_tr)
+{
+ p[0] = clamp_add_subtract_half(p_l[0], p_t[0], p_tl[0]);
+ p[1] = clamp_add_subtract_half(p_l[1], p_t[1], p_tl[1]);
+ p[2] = clamp_add_subtract_half(p_l[2], p_t[2], p_tl[2]);
+ p[3] = clamp_add_subtract_half(p_l[3], p_t[3], p_tl[3]);
+}
+
+typedef void (*inv_predict_func)(uint8_t *p, const uint8_t *p_l,
+ const uint8_t *p_tl, const uint8_t *p_t,
+ const uint8_t *p_tr);
+
+static const inv_predict_func inverse_predict[14] = {
+ inv_predict_0, inv_predict_1, inv_predict_2, inv_predict_3,
+ inv_predict_4, inv_predict_5, inv_predict_6, inv_predict_7,
+ inv_predict_8, inv_predict_9, inv_predict_10, inv_predict_11,
+ inv_predict_12, inv_predict_13,
+};
+
+static void inverse_prediction(AVFrame *frame, enum PredictionMode m, int x, int y)
+{
+ uint8_t *dec, *p_l, *p_tl, *p_t, *p_tr;
+ uint8_t p[4];
+
+ dec = GET_PIXEL(frame, x, y);
+ p_l = GET_PIXEL(frame, x - 1, y);
+ p_tl = GET_PIXEL(frame, x - 1, y - 1);
+ p_t = GET_PIXEL(frame, x, y - 1);
+ if (x == frame->width - 1)
+ p_tr = GET_PIXEL(frame, 0, y);
+ else
+ p_tr = GET_PIXEL(frame, x + 1, y - 1);
+
+ inverse_predict[m](p, p_l, p_tl, p_t, p_tr);
+
+ dec[0] += p[0];
+ dec[1] += p[1];
+ dec[2] += p[2];
+ dec[3] += p[3];
+}
+
+static int apply_predictor_transform(WebPContext *s)
+{
+ ImageContext *img = &s->image[IMAGE_ROLE_ARGB];
+ ImageContext *pimg = &s->image[IMAGE_ROLE_PREDICTOR];
+ int x, y;
+
+ for (y = 0; y < img->frame->height; y++) {
+ for (x = 0; x < img->frame->width; x++) {
+ int tx = x >> pimg->size_reduction;
+ int ty = y >> pimg->size_reduction;
+ enum PredictionMode m = GET_PIXEL_COMP(pimg->frame, tx, ty, 2);
+
+ if (x == 0) {
+ if (y == 0)
+ m = PRED_MODE_BLACK;
+ else
+ m = PRED_MODE_T;
+ } else if (y == 0)
+ m = PRED_MODE_L;
+
+ if (m > 13) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "invalid predictor mode: %d\n", m);
+ return AVERROR_INVALIDDATA;
+ }
+ inverse_prediction(img->frame, m, x, y);
+ }
+ }
+ return 0;
+}
+
+static av_always_inline uint8_t color_transform_delta(uint8_t color_pred,
+ uint8_t color)
+{
+ return (int)ff_u8_to_s8(color_pred) * ff_u8_to_s8(color) >> 5;
+}
+
+static int apply_color_transform(WebPContext *s)
+{
+ ImageContext *img, *cimg;
+ int x, y, cx, cy;
+ uint8_t *p, *cp;
+
+ img = &s->image[IMAGE_ROLE_ARGB];
+ cimg = &s->image[IMAGE_ROLE_COLOR_TRANSFORM];
+
+ for (y = 0; y < img->frame->height; y++) {
+ for (x = 0; x < img->frame->width; x++) {
+ cx = x >> cimg->size_reduction;
+ cy = y >> cimg->size_reduction;
+ cp = GET_PIXEL(cimg->frame, cx, cy);
+ p = GET_PIXEL(img->frame, x, y);
+
+ p[1] += color_transform_delta(cp[3], p[2]);
+ p[3] += color_transform_delta(cp[2], p[2]) +
+ color_transform_delta(cp[1], p[1]);
+ }
+ }
+ return 0;
+}
+
+static int apply_subtract_green_transform(WebPContext *s)
+{
+ int x, y;
+ ImageContext *img = &s->image[IMAGE_ROLE_ARGB];
+
+ for (y = 0; y < img->frame->height; y++) {
+ for (x = 0; x < img->frame->width; x++) {
+ uint8_t *p = GET_PIXEL(img->frame, x, y);
+ p[1] += p[2];
+ p[3] += p[2];
+ }
+ }
+ return 0;
+}
+
+static int apply_color_indexing_transform(WebPContext *s)
+{
+ ImageContext *img;
+ ImageContext *pal;
+ int i, x, y;
+ uint8_t *p, *pi;
+
+ img = &s->image[IMAGE_ROLE_ARGB];
+ pal = &s->image[IMAGE_ROLE_COLOR_INDEXING];
+
+ if (pal->size_reduction > 0) {
+ GetBitContext gb_g;
+ uint8_t *line;
+ int pixel_bits = 8 >> pal->size_reduction;
+
+ line = av_malloc(img->frame->linesize[0]);
+ if (!line)
+ return AVERROR(ENOMEM);
+
+ for (y = 0; y < img->frame->height; y++) {
+ p = GET_PIXEL(img->frame, 0, y);
+ memcpy(line, p, img->frame->linesize[0]);
+ init_get_bits(&gb_g, line, img->frame->linesize[0] * 8);
+ skip_bits(&gb_g, 16);
+ i = 0;
+ for (x = 0; x < img->frame->width; x++) {
+ p = GET_PIXEL(img->frame, x, y);
+ p[2] = get_bits(&gb_g, pixel_bits);
+ i++;
+ if (i == 1 << pal->size_reduction) {
+ skip_bits(&gb_g, 24);
+ i = 0;
+ }
+ }
+ }
+ av_free(line);
+ }
+
+ for (y = 0; y < img->frame->height; y++) {
+ for (x = 0; x < img->frame->width; x++) {
+ p = GET_PIXEL(img->frame, x, y);
+ i = p[2];
+ if (i >= pal->frame->width) {
+ av_log(s->avctx, AV_LOG_ERROR, "invalid palette index %d\n", i);
+ return AVERROR_INVALIDDATA;
+ }
+ pi = GET_PIXEL(pal->frame, i, 0);
+ AV_COPY32(p, pi);
+ }
+ }
+
+ return 0;
+}
+
+static int vp8_lossless_decode_frame(AVCodecContext *avctx, AVFrame *p,
+ int *got_frame, uint8_t *data_start,
+ unsigned int data_size, int is_alpha_chunk)
+{
+ WebPContext *s = avctx->priv_data;
+ int w, h, ret, i;
+
+ if (!is_alpha_chunk) {
+ s->lossless = 1;
+ avctx->pix_fmt = AV_PIX_FMT_ARGB;
+ }
+
+ ret = init_get_bits(&s->gb, data_start, data_size * 8);
+ if (ret < 0)
+ return ret;
+
+ if (!is_alpha_chunk) {
+ if (get_bits(&s->gb, 8) != 0x2F) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid WebP Lossless signature\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ w = get_bits(&s->gb, 14) + 1;
+ h = get_bits(&s->gb, 14) + 1;
+ if (s->width && s->width != w) {
+ av_log(avctx, AV_LOG_WARNING, "Width mismatch. %d != %d\n",
+ s->width, w);
+ }
+ s->width = w;
+ if (s->height && s->height != h) {
+ av_log(avctx, AV_LOG_WARNING, "Height mismatch. %d != %d\n",
+ s->width, w);
+ }
+ s->height = h;
+
+ ret = ff_set_dimensions(avctx, s->width, s->height);
+ if (ret < 0)
+ return ret;
+
+ s->has_alpha = get_bits1(&s->gb);
+
+ if (get_bits(&s->gb, 3) != 0x0) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid WebP Lossless version\n");
+ return AVERROR_INVALIDDATA;
+ }
+ } else {
+ if (!s->width || !s->height)
+ return AVERROR_BUG;
+ w = s->width;
+ h = s->height;
+ }
+
+ /* parse transformations */
+ s->nb_transforms = 0;
+ s->reduced_width = 0;
+ while (get_bits1(&s->gb)) {
+ enum TransformType transform = get_bits(&s->gb, 2);
+ s->transforms[s->nb_transforms++] = transform;
+ switch (transform) {
+ case PREDICTOR_TRANSFORM:
+ ret = parse_transform_predictor(s);
+ break;
+ case COLOR_TRANSFORM:
+ ret = parse_transform_color(s);
+ break;
+ case COLOR_INDEXING_TRANSFORM:
+ ret = parse_transform_color_indexing(s);
+ break;
+ }
+ if (ret < 0)
+ goto free_and_return;
+ }
+
+ /* decode primary image */
+ s->image[IMAGE_ROLE_ARGB].frame = p;
+ 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)
+ goto free_and_return;
+
+ /* apply transformations */
+ for (i = s->nb_transforms - 1; i >= 0; i--) {
+ switch (s->transforms[i]) {
+ case PREDICTOR_TRANSFORM:
+ ret = apply_predictor_transform(s);
+ break;
+ case COLOR_TRANSFORM:
+ ret = apply_color_transform(s);
+ break;
+ case SUBTRACT_GREEN:
+ ret = apply_subtract_green_transform(s);
+ break;
+ case COLOR_INDEXING_TRANSFORM:
+ ret = apply_color_indexing_transform(s);
+ break;
+ }
+ if (ret < 0)
+ goto free_and_return;
+ }
+
+ *got_frame = 1;
+ p->pict_type = AV_PICTURE_TYPE_I;
+ p->key_frame = 1;
+ ret = data_size;
+
+free_and_return:
+ for (i = 0; i < IMAGE_ROLE_NB; i++)
+ image_ctx_free(&s->image[i]);
+
+ return ret;
+}
+
+static void alpha_inverse_prediction(AVFrame *frame, enum AlphaFilter m)
+{
+ int x, y, ls;
+ uint8_t *dec;
+
+ ls = frame->linesize[3];
+
+ /* filter first row using horizontal filter */
+ dec = frame->data[3] + 1;
+ for (x = 1; x < frame->width; x++, dec++)
+ *dec += *(dec - 1);
+
+ /* filter first column using vertical filter */
+ dec = frame->data[3] + ls;
+ for (y = 1; y < frame->height; y++, dec += ls)
+ *dec += *(dec - ls);
+
+ /* filter the rest using the specified filter */
+ switch (m) {
+ case ALPHA_FILTER_HORIZONTAL:
+ for (y = 1; y < frame->height; y++) {
+ dec = frame->data[3] + y * ls + 1;
+ for (x = 1; x < frame->width; x++, dec++)
+ *dec += *(dec - 1);
+ }
+ break;
+ case ALPHA_FILTER_VERTICAL:
+ for (y = 1; y < frame->height; y++) {
+ dec = frame->data[3] + y * ls + 1;
+ for (x = 1; x < frame->width; x++, dec++)
+ *dec += *(dec - ls);
+ }
+ break;
+ case ALPHA_FILTER_GRADIENT:
+ for (y = 1; y < frame->height; y++) {
+ dec = frame->data[3] + y * ls + 1;
+ for (x = 1; x < frame->width; x++, dec++)
+ dec[0] += av_clip_uint8(*(dec - 1) + *(dec - ls) - *(dec - ls - 1));
+ }
+ break;
+ }
+}
+
+static int vp8_lossy_decode_alpha(AVCodecContext *avctx, AVFrame *p,
+ uint8_t *data_start,
+ unsigned int data_size)
+{
+ WebPContext *s = avctx->priv_data;
+ int x, y, ret;
+
+ if (s->alpha_compression == ALPHA_COMPRESSION_NONE) {
+ GetByteContext gb;
+
+ bytestream2_init(&gb, data_start, data_size);
+ for (y = 0; y < s->height; y++)
+ bytestream2_get_buffer(&gb, p->data[3] + p->linesize[3] * y,
+ s->width);
+ } else if (s->alpha_compression == ALPHA_COMPRESSION_VP8L) {
+ uint8_t *ap, *pp;
+ int alpha_got_frame = 0;
+
+ s->alpha_frame = av_frame_alloc();
+ if (!s->alpha_frame)
+ return AVERROR(ENOMEM);
+
+ ret = vp8_lossless_decode_frame(avctx, s->alpha_frame, &alpha_got_frame,
+ data_start, data_size, 1);
+ if (ret < 0) {
+ av_frame_free(&s->alpha_frame);
+ return ret;
+ }
+ if (!alpha_got_frame) {
+ av_frame_free(&s->alpha_frame);
+ return AVERROR_INVALIDDATA;
+ }
+
+ /* copy green component of alpha image to alpha plane of primary image */
+ for (y = 0; y < s->height; y++) {
+ ap = GET_PIXEL(s->alpha_frame, 0, y) + 2;
+ pp = p->data[3] + p->linesize[3] * y;
+ for (x = 0; x < s->width; x++) {
+ *pp = *ap;
+ pp++;
+ ap += 4;
+ }
+ }
+ av_frame_free(&s->alpha_frame);
+ }
+
+ /* apply alpha filtering */
+ if (s->alpha_filter)
+ alpha_inverse_prediction(p, s->alpha_filter);
+
+ return 0;
+}
+
+static int vp8_lossy_decode_frame(AVCodecContext *avctx, AVFrame *p,
+ int *got_frame, uint8_t *data_start,
+ unsigned int data_size)
+{
+ WebPContext *s = avctx->priv_data;
+ AVPacket pkt;
+ int ret;
+
+ if (!s->initialized) {
+ ff_vp8_decode_init(avctx);
+ s->initialized = 1;
+ if (s->has_alpha)
+ avctx->pix_fmt = AV_PIX_FMT_YUVA420P;
+ }
+ s->lossless = 0;
+
+ if (data_size > INT_MAX) {
+ av_log(avctx, AV_LOG_ERROR, "unsupported chunk size\n");
+ return AVERROR_PATCHWELCOME;
+ }
+
+ av_init_packet(&pkt);
+ pkt.data = data_start;
+ pkt.size = data_size;
+
+ ret = ff_vp8_decode_frame(avctx, p, got_frame, &pkt);
+ if (s->has_alpha) {
+ ret = vp8_lossy_decode_alpha(avctx, p, s->alpha_data,
+ s->alpha_data_size);
+ if (ret < 0)
+ return ret;
+ }
+ return ret;
+}
+
+static int webp_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
+ AVPacket *avpkt)
+{
+ AVFrame * const p = data;
+ WebPContext *s = avctx->priv_data;
+ GetByteContext gb;
+ int ret;
+ uint32_t chunk_type, chunk_size;
+ int vp8x_flags = 0;
+
+ s->avctx = avctx;
+ s->width = 0;
+ s->height = 0;
+ *got_frame = 0;
+ s->has_alpha = 0;
+ bytestream2_init(&gb, avpkt->data, avpkt->size);
+
+ if (bytestream2_get_bytes_left(&gb) < 12)
+ return AVERROR_INVALIDDATA;
+
+ if (bytestream2_get_le32(&gb) != MKTAG('R', 'I', 'F', 'F')) {
+ av_log(avctx, AV_LOG_ERROR, "missing RIFF tag\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ chunk_size = bytestream2_get_le32(&gb);
+ if (bytestream2_get_bytes_left(&gb) < chunk_size)
+ return AVERROR_INVALIDDATA;
+
+ if (bytestream2_get_le32(&gb) != MKTAG('W', 'E', 'B', 'P')) {
+ av_log(avctx, AV_LOG_ERROR, "missing WEBP tag\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ while (bytestream2_get_bytes_left(&gb) > 0) {
+ char chunk_str[5] = { 0 };
+
+ chunk_type = bytestream2_get_le32(&gb);
+ chunk_size = bytestream2_get_le32(&gb);
+ if (chunk_size == UINT32_MAX)
+ return AVERROR_INVALIDDATA;
+ chunk_size += chunk_size & 1;
+
+ if (bytestream2_get_bytes_left(&gb) < chunk_size)
+ return AVERROR_INVALIDDATA;
+
+ switch (chunk_type) {
+ case MKTAG('V', 'P', '8', ' '):
+ if (!*got_frame) {
+ ret = vp8_lossy_decode_frame(avctx, p, got_frame,
+ avpkt->data + bytestream2_tell(&gb),
+ chunk_size);
+ if (ret < 0)
+ return ret;
+ }
+ bytestream2_skip(&gb, chunk_size);
+ break;
+ case MKTAG('V', 'P', '8', 'L'):
+ if (!*got_frame) {
+ ret = vp8_lossless_decode_frame(avctx, p, got_frame,
+ avpkt->data + bytestream2_tell(&gb),
+ chunk_size, 0);
+ if (ret < 0)
+ return ret;
+ }
+ bytestream2_skip(&gb, chunk_size);
+ break;
+ case MKTAG('V', 'P', '8', 'X'):
+ vp8x_flags = bytestream2_get_byte(&gb);
+ bytestream2_skip(&gb, 3);
+ s->width = bytestream2_get_le24(&gb) + 1;
+ s->height = bytestream2_get_le24(&gb) + 1;
+ ret = av_image_check_size(s->width, s->height, 0, avctx);
+ if (ret < 0)
+ return ret;
+ break;
+ case MKTAG('A', 'L', 'P', 'H'): {
+ int alpha_header, filter_m, compression;
+
+ if (!(vp8x_flags & VP8X_FLAG_ALPHA)) {
+ av_log(avctx, AV_LOG_WARNING,
+ "ALPHA chunk present, but alpha bit not set in the "
+ "VP8X header\n");
+ }
+ if (chunk_size == 0) {
+ av_log(avctx, AV_LOG_ERROR, "invalid ALPHA chunk size\n");
+ return AVERROR_INVALIDDATA;
+ }
+ alpha_header = bytestream2_get_byte(&gb);
+ s->alpha_data = avpkt->data + bytestream2_tell(&gb);
+ s->alpha_data_size = chunk_size - 1;
+ bytestream2_skip(&gb, s->alpha_data_size);
+
+ filter_m = (alpha_header >> 2) & 0x03;
+ compression = alpha_header & 0x03;
+
+ if (compression > ALPHA_COMPRESSION_VP8L) {
+ av_log(avctx, AV_LOG_VERBOSE,
+ "skipping unsupported ALPHA chunk\n");
+ } else {
+ s->has_alpha = 1;
+ s->alpha_compression = compression;
+ s->alpha_filter = filter_m;
+ }
+
+ 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",
+ chunk_str);
+ bytestream2_skip(&gb, chunk_size);
+ break;
+ default:
+ AV_WL32(chunk_str, chunk_type);
+ av_log(avctx, AV_LOG_VERBOSE, "skipping unknown chunk: %s\n",
+ chunk_str);
+ bytestream2_skip(&gb, chunk_size);
+ break;
+ }
+ }
+
+ if (!*got_frame) {
+ av_log(avctx, AV_LOG_ERROR, "image data not found\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ return avpkt->size;
+}
+
+static av_cold int webp_decode_close(AVCodecContext *avctx)
+{
+ WebPContext *s = avctx->priv_data;
+
+ if (s->initialized)
+ return ff_vp8_decode_free(avctx);
+
+ return 0;
+}
+
+AVCodec ff_webp_decoder = {
+ .name = "webp",
+ .long_name = NULL_IF_CONFIG_SMALL("WebP image"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_WEBP,
+ .priv_data_size = sizeof(WebPContext),
+ .decode = webp_decode_frame,
+ .close = webp_decode_close,
+ .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
+};

libav-v9.6.tar.bz2/libavcodec/wma.c -> libav-v10.1.tar.bz2/libavcodec/wma.c Changed

@@ -19,6 +19,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "libavutil/attributes.h"
 #include "avcodec.h"
 #include "sinewin.h"
 #include "wma.h"
@@ -30,9 +31,9 @@
 
 /* XXX: use same run/length optimization as mpeg decoders */
 //FIXME maybe split decode / encode or pass flag
-static void init_coef_vlc(VLC *vlc, uint16_t **prun_table,
- float **plevel_table, uint16_t **pint_table,
- const CoefVLCTable *vlc_table)
+static av_cold void init_coef_vlc(VLC *vlc, uint16_t **prun_table,
+ float **plevel_table, uint16_t **pint_table,
+ const CoefVLCTable *vlc_table)
 {
 int n = vlc_table->n;
 const uint8_t *table_bits = vlc_table->huffbits;
@@ -68,7 +69,7 @@
 av_free(level_table);
 }
 
-int ff_wma_init(AVCodecContext *avctx, int flags2)
+av_cold int ff_wma_init(AVCodecContext *avctx, int flags2)
 {
 WMACodecContext *s = avctx->priv_data;
 int i;
@@ -82,7 +83,6 @@
 || avctx->bit_rate <= 0)
 return -1;
 
- ff_dsputil_init(&s->dsp, avctx);
 ff_fmt_convert_init(&s->fmt_conv, avctx);
 avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
 
@@ -304,7 +304,7 @@
 }
 #endif
 
- /* init MDCT windows : simple sinus window */
+ /* init MDCT windows : simple sine window */
 for (i = 0; i < s->nb_block_sizes; i++) {
 ff_init_ff_sine_windows(s->frame_len_bits - i);
 s->windows[i] = ff_sine_windows[s->frame_len_bits - i];

libav-v9.6.tar.bz2/libavcodec/wma.h -> libav-v10.1.tar.bz2/libavcodec/wma.h Changed

libav-v9.6.tar.bz2/libavcodec/wma_common.h -> libav-v10.1.tar.bz2/libavcodec/wma_common.h Changed

libav-v9.6.tar.bz2/libavcodec/wmadec.c -> libav-v10.1.tar.bz2/libavcodec/wmadec.c Changed

@@ -33,6 +33,7 @@
 * should be 4 extra bytes for v1 data and 6 extra bytes for v2 data.
 */
 
+#include "libavutil/attributes.h"
 #include "avcodec.h"
 #include "internal.h"
 #include "wma.h"
@@ -66,7 +67,7 @@
 }
 #endif
 
-static int wma_decode_init(AVCodecContext * avctx)
+static av_cold int wma_decode_init(AVCodecContext * avctx)
 {
 WMACodecContext *s = avctx->priv_data;
 int i, flags2;
@@ -115,9 +116,6 @@
 
 avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
@@ -146,7 +144,7 @@
 return s->lsp_pow_e_table[e] * (a + b * t.f);
 }
 
-static void wma_lsp_to_curve_init(WMACodecContext *s, int frame_len)
+static av_cold void wma_lsp_to_curve_init(WMACodecContext *s, int frame_len)
 {
 float wdel, a, b;
 int i, e, m;
@@ -384,16 +382,16 @@
 block_len = s->block_len;
 bsize = s->frame_len_bits - s->block_len_bits;
 
- s->dsp.vector_fmul_add(out, in, s->windows[bsize],
- out, block_len);
+ s->fdsp.vector_fmul_add(out, in, s->windows[bsize],
+ out, block_len);
 
 } else {
 block_len = 1 << s->prev_block_len_bits;
 n = (s->block_len - block_len) / 2;
 bsize = s->frame_len_bits - s->prev_block_len_bits;
 
- s->dsp.vector_fmul_add(out+n, in+n, s->windows[bsize],
- out+n, block_len);
+ s->fdsp.vector_fmul_add(out+n, in+n, s->windows[bsize],
+ out+n, block_len);
 
 memcpy(out+n+block_len, in+n+block_len, n*sizeof(float));
 }
@@ -406,7 +404,7 @@
 block_len = s->block_len;
 bsize = s->frame_len_bits - s->block_len_bits;
 
- s->dsp.vector_fmul_reverse(out, in, s->windows[bsize], block_len);
+ s->fdsp.vector_fmul_reverse(out, in, s->windows[bsize], block_len);
 
 } else {
 block_len = 1 << s->next_block_len_bits;
@@ -415,7 +413,7 @@
 
 memcpy(out, in, n*sizeof(float));
 
- s->dsp.vector_fmul_reverse(out+n, in+n, s->windows[bsize], block_len);
+ s->fdsp.vector_fmul_reverse(out+n, in+n, s->windows[bsize], block_len);
 
 memset(out+n+block_len, 0, n*sizeof(float));
 }
@@ -724,7 +722,7 @@
 s->channel_coded[0] = 1;
 }
 
- s->dsp.butterflies_float(s->coefs[0], s->coefs[1], s->block_len);
+ s->fdsp.butterflies_float(s->coefs[0], s->coefs[1], s->block_len);
 }
 
 next:
@@ -793,6 +791,7 @@
 static int wma_decode_superframe(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 WMACodecContext *s = avctx->priv_data;
@@ -826,12 +825,12 @@
 }
 
 /* get output buffer */
- s->frame.nb_samples = nb_frames * s->frame_len;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = nb_frames * s->frame_len;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- samples = (float **)s->frame.extended_data;
+ samples = (float **)frame->extended_data;
 samples_offset = 0;
 
 if (s->use_bit_reservoir) {
@@ -910,8 +909,7 @@
 s->frame_len_bits, s->block_len_bits, s->frame_len, s->block_len,
 (int8_t *)samples - (int8_t *)data, avctx->block_align);
 
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 
 return avctx->block_align;
 fail:
@@ -930,6 +928,7 @@
 
 AVCodec ff_wmav1_decoder = {
 .name = "wmav1",
+ .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_WMAV1,
 .priv_data_size = sizeof(WMACodecContext),
@@ -938,13 +937,13 @@
 .decode = wma_decode_superframe,
 .flush = flush,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_NONE },
 };
 
 AVCodec ff_wmav2_decoder = {
 .name = "wmav2",
+ .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_WMAV2,
 .priv_data_size = sizeof(WMACodecContext),
@@ -953,7 +952,6 @@
 .decode = wma_decode_superframe,
 .flush = flush,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/wmaenc.c -> libav-v10.1.tar.bz2/libavcodec/wmaenc.c Changed

@@ -19,6 +19,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "libavutil/attributes.h"
 #include "avcodec.h"
 #include "internal.h"
 #include "wma.h"
@@ -27,7 +28,8 @@
 #include <assert.h>
 
 
-static int encode_init(AVCodecContext * avctx){
+static av_cold int encode_init(AVCodecContext *avctx)
+{
 WMACodecContext *s = avctx->priv_data;
 int i, flags1, flags2, block_align;
 uint8_t *extradata;
@@ -88,11 +90,6 @@
 s->frame_len;
 avctx->frame_size = avctx->delay = s->frame_len;
 
-#if FF_API_OLD_ENCODE_AUDIO
- avctx->coded_frame = &s->frame;
- avcodec_get_frame_defaults(avctx->coded_frame);
-#endif
-
 return 0;
 }
 
@@ -112,7 +109,7 @@
 for (ch = 0; ch < avctx->channels; ch++) {
 memcpy(s->output, s->frame_out[ch], window_len * sizeof(*s->output));
 s->fdsp.vector_fmul_scalar(s->frame_out[ch], audio[ch], n, len);
- s->dsp.vector_fmul_reverse(&s->output[window_len], s->frame_out[ch], win, len);
+ s->fdsp.vector_fmul_reverse(&s->output[window_len], s->frame_out[ch], win, len);
 s->fdsp.vector_fmul(s->frame_out[ch], s->frame_out[ch], win, len);
 mdct->mdct_calc(mdct, s->coefs[ch], s->output);
 }
@@ -420,6 +417,7 @@
 
 AVCodec ff_wmav1_encoder = {
 .name = "wmav1",
+ .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_WMAV1,
 .priv_data_size = sizeof(WMACodecContext),
@@ -428,11 +426,11 @@
 .close = ff_wma_end,
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"),
 };
 
 AVCodec ff_wmav2_encoder = {
 .name = "wmav2",
+ .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_WMAV2,
 .priv_data_size = sizeof(WMACodecContext),
@@ -441,5 +439,4 @@
 .close = ff_wma_end,
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"),
 };

libav-v9.6.tar.bz2/libavcodec/wmalosslessdec.c -> libav-v10.1.tar.bz2/libavcodec/wmalosslessdec.c Changed

@@ -66,7 +66,7 @@
 typedef struct WmallDecodeCtx {
 /* generic decoder variables */
 AVCodecContext *avctx;
- AVFrame frame;
+ AVFrame *frame;
 uint8_t frame_data[MAX_FRAMESIZE + FF_INPUT_BUFFER_PADDING_SIZE]; ///< compressed frame data
 PutBitContext pb; ///< context for filling the frame_data buffer
 
@@ -189,7 +189,7 @@
 avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
 else if (s->bits_per_sample == 24) {
 avctx->sample_fmt = AV_SAMPLE_FMT_S32P;
- av_log_missing_feature(avctx, "Bit-depth higher than 16", 0);
+ avpriv_report_missing_feature(avctx, "Bit-depth higher than 16");
 return AVERROR_PATCHWELCOME;
 } else {
 av_log(avctx, AV_LOG_ERROR, "Unknown bit-depth: %d\n",
@@ -202,7 +202,7 @@
 av_dlog(avctx, "\n");
 
 } else {
- av_log_ask_for_sample(avctx, "Unsupported extradata size\n");
+ avpriv_request_sample(avctx, "Unsupported extradata size");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -256,12 +256,15 @@
 s->num_channels);
 return AVERROR_INVALIDDATA;
 } else if (s->num_channels > WMALL_MAX_CHANNELS) {
- av_log_ask_for_sample(avctx, "unsupported number of channels\n");
+ avpriv_request_sample(avctx,
+ "More than %d channels", WMALL_MAX_CHANNELS);
 return AVERROR_PATCHWELCOME;
 }
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
+ s->frame = av_frame_alloc();
+ if (!s->frame)
+ return AVERROR(ENOMEM);
+
 avctx->channel_layout = channel_mask;
 return 0;
 }
@@ -885,7 +888,7 @@
 
 s->do_arith_coding = get_bits1(&s->gb);
 if (s->do_arith_coding) {
- av_log_missing_feature(s->avctx, "Arithmetic coding", 1);
+ avpriv_request_sample(s->avctx, "Arithmetic coding");
 return AVERROR_PATCHWELCOME;
 }
 s->do_ac_filter = get_bits1(&s->gb);
@@ -907,7 +910,7 @@
 } else if (!s->cdlms[0][0].order) {
 av_log(s->avctx, AV_LOG_DEBUG,
 "Waiting for seekable tile\n");
- s->frame.nb_samples = 0;
+ av_frame_unref(s->frame);
 return -1;
 }
 
@@ -925,8 +928,8 @@
 s->do_lpc = get_bits1(&s->gb);
 if (s->do_lpc) {
 decode_lpc(s);
- av_log_ask_for_sample(s->avctx, "Inverse LPC filter not "
- "implemented. Expect wrong output.\n");
+ avpriv_request_sample(s->avctx, "Expect wrong output since "
+ "inverse LPC filter");
 }
 } else
 s->do_lpc = 0;
@@ -1014,8 +1017,8 @@
 GetBitContext* gb = &s->gb;
 int more_frames = 0, len = 0, i, ret;
 
- s->frame.nb_samples = s->samples_per_frame;
- if ((ret = ff_get_buffer(s->avctx, &s->frame)) < 0) {
+ s->frame->nb_samples = s->samples_per_frame;
+ if ((ret = ff_get_buffer(s->avctx, s->frame, 0)) < 0) {
 /* return an error if no frame could be decoded at all */
 av_log(s->avctx, AV_LOG_ERROR,
 "not enough space for the output samples\n");
@@ -1023,8 +1026,8 @@
 return ret;
 }
 for (i = 0; i < s->num_channels; i++) {
- s->samples_16[i] = (int16_t *)s->frame.extended_data[i];
- s->samples_32[i] = (int32_t *)s->frame.extended_data[i];
+ s->samples_16[i] = (int16_t *)s->frame->extended_data[i];
+ s->samples_32[i] = (int32_t *)s->frame->extended_data[i];
 }
 
 /* get frame length */
@@ -1137,7 +1140,7 @@
 buflen = (s->num_saved_bits + len + 8) >> 3;
 
 if (len <= 0 || buflen > MAX_FRAMESIZE) {
- av_log_ask_for_sample(s->avctx, "input buffer too small\n");
+ avpriv_request_sample(s->avctx, "Too small input buffer");
 s->packet_loss = 1;
 return;
 }
@@ -1171,7 +1174,7 @@
 int buf_size = avpkt->size;
 int num_bits_prev_frame, packet_sequence_number, spliced_packet;
 
- s->frame.nb_samples = 0;
+ s->frame->nb_samples = 0;
 
 if (s->packet_done || s->packet_loss) {
 s->packet_done = 0;
@@ -1190,7 +1193,7 @@
 skip_bits(gb, 1); // Skip seekable_frame_in_packet, currently ununused
 spliced_packet = get_bits1(gb);
 if (spliced_packet)
- av_log_missing_feature(avctx, "Bitstream splicing", 1);
+ avpriv_request_sample(avctx, "Bitstream splicing");
 
 /* get number of bits that need to be added to the previous frame */
 num_bits_prev_frame = get_bits(gb, s->log2_frame_size);
@@ -1264,8 +1267,9 @@
 save_bits(s, gb, remaining_bits(s, gb), 0);
 }
 
- *(AVFrame *)data = s->frame;
- *got_frame_ptr = s->frame.nb_samples > 0;
+ *got_frame_ptr = s->frame->nb_samples > 0;
+ av_frame_move_ref(data, s->frame);
+
 s->packet_offset = get_bits_count(gb) & 7;
 
 return (s->packet_loss) ? AVERROR_INVALIDDATA : get_bits_count(gb) >> 3;
@@ -1280,20 +1284,30 @@
 s->frame_offset = 0;
 s->next_packet_start = 0;
 s->cdlms[0][0].order = 0;
- s->frame.nb_samples = 0;
+ s->frame->nb_samples = 0;
 init_put_bits(&s->pb, s->frame_data, MAX_FRAMESIZE);
 }
 
+static av_cold int decode_close(AVCodecContext *avctx)
+{
+ WmallDecodeCtx *s = avctx->priv_data;
+
+ av_frame_free(&s->frame);
+
+ return 0;
+}
+
 AVCodec ff_wmalossless_decoder = {
 .name = "wmalossless",
+ .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Lossless"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_WMALOSSLESS,
 .priv_data_size = sizeof(WmallDecodeCtx),
 .init = decode_init,
+ .close = decode_close,
 .decode = decode_packet,
 .flush = flush,
 .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1 | CODEC_CAP_DELAY,
- .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Lossless"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
 AV_SAMPLE_FMT_S32P,
 AV_SAMPLE_FMT_NONE },

libav-v9.6.tar.bz2/libavcodec/wmaprodec.c -> libav-v10.1.tar.bz2/libavcodec/wmaprodec.c Changed

@@ -94,7 +94,6 @@
 #include "get_bits.h"
 #include "put_bits.h"
 #include "wmaprodata.h"
-#include "dsputil.h"
 #include "sinewin.h"
 #include "wma.h"
 #include "wma_common.h"
@@ -107,6 +106,7 @@
 
 #define WMAPRO_BLOCK_MIN_BITS 6 ///< log2 of min block size
 #define WMAPRO_BLOCK_MAX_BITS 13 ///< log2 of max block size
+#define WMAPRO_BLOCK_MIN_SIZE (1 << WMAPRO_BLOCK_MIN_BITS) ///< minimum block size
 #define WMAPRO_BLOCK_MAX_SIZE (1 << WMAPRO_BLOCK_MAX_BITS) ///< maximum block size
 #define WMAPRO_BLOCK_SIZES (WMAPRO_BLOCK_MAX_BITS - WMAPRO_BLOCK_MIN_BITS + 1) ///< possible block sizes
 
@@ -125,7 +125,7 @@
 static VLC vec2_vlc; ///< 2 coefficients per symbol
 static VLC vec1_vlc; ///< 1 coefficient per symbol
 static VLC coef_vlc[2]; ///< coefficient run length vlc codes
-static float sin64[33]; ///< sinus table for decorrelation
+static float sin64[33]; ///< sine table for decorrelation
 
 /**
 * @brief frame specific decoder context for a single channel
@@ -169,8 +169,6 @@
 typedef struct WMAProDecodeCtx {
 /* generic decoder variables */
 AVCodecContext* avctx; ///< codec context for av_log
- AVFrame frame; ///< AVFrame for decoded output
- DSPContext dsp; ///< accelerated DSP functions
 AVFloatDSPContext fdsp;
 uint8_t frame_data[MAX_FRAMESIZE +
 FF_INPUT_BUFFER_PADDING_SIZE];///< compressed frame data
@@ -286,7 +284,6 @@
 }
 
 s->avctx = avctx;
- ff_dsputil_init(&s->dsp, avctx);
 avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
 
 init_put_bits(&s->pb, s->frame_data, MAX_FRAMESIZE);
@@ -303,7 +300,7 @@
 av_dlog(avctx, "\n");
 
 } else {
- av_log_ask_for_sample(avctx, "Unknown extradata size\n");
+ avpriv_request_sample(avctx, "Unknown extradata size");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -318,7 +315,7 @@
 /** get frame len */
 bits = ff_wma_get_frame_len_bits(avctx->sample_rate, 3, s->decode_flags);
 if (bits > WMAPRO_BLOCK_MAX_BITS) {
- av_log_missing_feature(avctx, "14-bits block sizes", 1);
+ avpriv_request_sample(avctx, "14-bit block sizes");
 return AVERROR_PATCHWELCOME;
 }
 s->samples_per_frame = 1 << bits;
@@ -340,6 +337,12 @@
 return AVERROR_INVALIDDATA;
 }
 
+ if (s->min_samples_per_subframe < WMAPRO_BLOCK_MIN_SIZE) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid minimum block size %i\n",
+ s->max_num_subframes);
+ return AVERROR_INVALIDDATA;
+ }
+
 if (s->avctx->sample_rate <= 0) {
 av_log(avctx, AV_LOG_ERROR, "invalid sample rate\n");
 return AVERROR_INVALIDDATA;
@@ -350,7 +353,8 @@
 avctx->channels);
 return AVERROR_INVALIDDATA;
 } else if (avctx->channels > WMAPRO_MAX_CHANNELS) {
- av_log_ask_for_sample(avctx, "unsupported number of channels\n");
+ avpriv_request_sample(avctx,
+ "More than %d channels", WMAPRO_MAX_CHANNELS);
 return AVERROR_PATCHWELCOME;
 }
 
@@ -432,7 +436,8 @@
 for (x = 0; x < num_possible_block_sizes; x++) {
 int v = 0;
 while (s->sfb_offsets[x][v + 1] << x < offset)
- ++v;
+ if (++v >= MAX_BANDS)
+ return AVERROR_INVALIDDATA;
 s->sf_offsets[i][x][b] = v;
 }
 }
@@ -444,7 +449,7 @@
 1.0 / (1 << (WMAPRO_BLOCK_MIN_BITS + i - 1))
 / (1 << (s->bits_per_sample - 1)));
 
- /** init MDCT windows: simple sinus window */
+ /** init MDCT windows: simple sine window */
 for (i = 0; i < WMAPRO_BLOCK_SIZES; i++) {
 const int win_idx = WMAPRO_BLOCK_MAX_BITS - i;
 ff_init_ff_sine_windows(win_idx);
@@ -468,9 +473,6 @@
 
 avctx->channel_layout = channel_mask;
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
@@ -683,8 +685,8 @@
 int remaining_channels = s->channels_for_cur_subframe;
 
 if (get_bits1(&s->gb)) {
- av_log_ask_for_sample(s->avctx,
- "unsupported channel transform bit\n");
+ avpriv_request_sample(s->avctx,
+ "Channel transform bit");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -720,8 +722,9 @@
 if (chgroup->num_channels == 2) {
 if (get_bits1(&s->gb)) {
 if (get_bits1(&s->gb)) {
- av_log_ask_for_sample(s->avctx,
- "unsupported channel transform type\n");
+ avpriv_request_sample(s->avctx,
+ "Unknown channel transform type");
+ return AVERROR_PATCHWELCOME;
 }
 } else {
 chgroup->transform = 1;
@@ -746,8 +749,8 @@
 } else {
 /** FIXME: more than 6 coupled channels not supported */
 if (chgroup->num_channels > 6) {
- av_log_ask_for_sample(s->avctx,
- "coupled channels > 6\n");
+ avpriv_request_sample(s->avctx,
+ "Coupled channels > 6");
 } else {
 memcpy(chgroup->decorrelation_matrix,
 default_decorrelation[chgroup->num_channels],
@@ -1051,8 +1054,8 @@
 
 winlen >>= 1;
 
- s->dsp.vector_fmul_window(start, start, start + winlen,
- window, winlen);
+ s->fdsp.vector_fmul_window(start, start, start + winlen,
+ window, winlen);
 
 s->channel[c].prev_block_len = s->subframe_len;
 }
@@ -1124,11 +1127,12 @@
 cur_subwoofer_cutoff = s->subwoofer_cutoffs[s->table_idx];
 
 /** configure the decoder for the current subframe */
+ offset += s->samples_per_frame >> 1;
+
 for (i = 0; i < s->channels_for_cur_subframe; i++) {
 int c = s->channel_indexes_for_cur_subframe[i];
 
- s->channel[c].coeffs = &s->channel[c].out[(s->samples_per_frame >> 1)
- + offset];
+ s->channel[c].coeffs = &s->channel[c].out[offset];
 }
 
 s->subframe_len = subframe_len;
@@ -1154,7 +1158,7 @@
 
 /** no idea for what the following bit is used */
 if (get_bits1(&s->gb)) {
- av_log_ask_for_sample(s->avctx, "reserved bit set\n");
+ avpriv_request_sample(s->avctx, "Reserved bit");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -1179,7 +1183,7 @@
 for (i = 0; i < s->channels_for_cur_subframe; i++) {
 int c = s->channel_indexes_for_cur_subframe[i];
 int num_vec_coeffs = get_bits(&s->gb, num_bits) << 2;
- if (num_vec_coeffs > WMAPRO_BLOCK_MAX_SIZE) {
+ if (num_vec_coeffs + offset > FF_ARRAY_ELEMS(s->channel[c].out)) {
 av_log(s->avctx, AV_LOG_ERROR, "num_vec_coeffs %d is too large\n", num_vec_coeffs);
 return AVERROR_INVALIDDATA;
 }
@@ -1300,7 +1304,7 @@
 *@return 0 if the trailer bit indicates that this is the last frame,
 * 1 if there are additional frames
 */
-static int decode_frame(WMAProDecodeCtx *s, int *got_frame_ptr)
+static int decode_frame(WMAProDecodeCtx *s, AVFrame *frame, int *got_frame_ptr)
 {
 AVCodecContext *avctx = s->avctx;
 GetBitContext* gb = &s->gb;
@@ -1373,8 +1377,8 @@
 }
 
 /* get output buffer */
- s->frame.nb_samples = s->samples_per_frame;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = s->samples_per_frame;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 s->packet_loss = 1;
 return 0;
@@ -1382,7 +1386,7 @@
 
 /** copy samples to the output buffer */
 for (i = 0; i < avctx->channels; i++)
- memcpy(s->frame.extended_data[i], s->channel[i].out,
+ memcpy(frame->extended_data[i], s->channel[i].out,
 s->samples_per_frame * sizeof(*s->channel[i].out));
 
 for (i = 0; i < avctx->channels; i++) {
@@ -1395,6 +1399,7 @@
 if (s->skip_frame) {
 s->skip_frame = 0;
 *got_frame_ptr = 0;
+ av_frame_unref(frame);
 } else {
 *got_frame_ptr = 1;
 }
@@ -1459,7 +1464,15 @@
 buflen = (s->num_saved_bits + len + 8) >> 3;
 
 if (len <= 0 || buflen > MAX_FRAMESIZE) {
- av_log_ask_for_sample(s->avctx, "input buffer too small\n");
+ avpriv_request_sample(s->avctx, "Too small input buffer");
+ s->packet_loss = 1;
+ return;
+ }
+
+ if (len > put_bits_left(&s->pb)) {
+ av_log(s->avctx, AV_LOG_ERROR,
+ "Cannot append %d bits, only %d bits available.\n",
+ len, put_bits_left(&s->pb));
 s->packet_loss = 1;
 return;
 }
@@ -1553,7 +1566,7 @@
 
 /** decode the cross packet frame if it is valid */
 if (!s->packet_loss)
- decode_frame(s, got_frame_ptr);
+ decode_frame(s, data, got_frame_ptr);
 } else if (s->num_saved_bits - s->frame_offset) {
 av_dlog(avctx, "ignoring %x previously saved bits\n",
 s->num_saved_bits - s->frame_offset);
@@ -1576,7 +1589,7 @@
 (frame_size = show_bits(gb, s->log2_frame_size)) &&
 frame_size <= remaining_bits(s, gb)) {
 save_bits(s, gb, frame_size, 0);
- s->packet_done = !decode_frame(s, got_frame_ptr);
+ s->packet_done = !decode_frame(s, data, got_frame_ptr);
 } else if (!s->len_prefix
 && s->num_saved_bits > get_bits_count(&s->gb)) {
 /** when the frames do not have a length prefix, we don't know
@@ -1586,7 +1599,7 @@
 therefore we save the incoming packet first, then we append
 the "previous frame" data from the next packet so that
 we get a buffer that only contains full frames */
- s->packet_done = !decode_frame(s, got_frame_ptr);
+ s->packet_done = !decode_frame(s, data, got_frame_ptr);
 } else
 s->packet_done = 1;
 }
@@ -1602,9 +1615,6 @@
 if (s->packet_loss)
 return AVERROR_INVALIDDATA;
 
- if (*got_frame_ptr)
- *(AVFrame *)data = s->frame;
-
 return get_bits_count(gb) >> 3;
 }
 
@@ -1630,6 +1640,7 @@
 */
 AVCodec ff_wmapro_decoder = {
 .name = "wmapro",
+ .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 9 Professional"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_WMAPRO,
 .priv_data_size = sizeof(WMAProDecodeCtx),
@@ -1638,7 +1649,6 @@
 .decode = decode_packet,
 .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
 .flush = flush,
- .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 9 Professional"),
 .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
 AV_SAMPLE_FMT_NONE },
 };

libav-v9.6.tar.bz2/libavcodec/wmavoice.c -> libav-v10.1.tar.bz2/libavcodec/wmavoice.c Changed

@@ -30,8 +30,8 @@
 #include <math.h>
 
 #include "libavutil/channel_layout.h"
+#include "libavutil/float_dsp.h"
 #include "libavutil/mem.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "internal.h"
 #include "get_bits.h"
@@ -136,7 +136,6 @@
 * @name Global values specified in the stream header / extradata or used all over.
 * @{
 */
- AVFrame frame;
 GetBitContext gb; ///< packet bitreader. During decoder init,
 ///< it contains the extradata from the
 ///< demuxer. During decoding, it contains
@@ -306,6 +305,20 @@
 */
 static av_cold int decode_vbmtree(GetBitContext *gb, int8_t vbm_tree[25])
 {
+ int cntr[8] = { 0 }, n, res;
+
+ memset(vbm_tree, 0xff, sizeof(vbm_tree[0]) * 25);
+ for (n = 0; n < 17; n++) {
+ res = get_bits(gb, 3);
+ if (cntr[res] > 3) // should be >= 3 + (res == 7))
+ return -1;
+ vbm_tree[res * 3 + cntr[res]++] = n;
+ }
+ return 0;
+}
+
+static av_cold void wmavoice_init_static_data(AVCodec *codec)
+{
 static const uint8_t bits[] = {
 2, 2, 2, 4, 4, 4,
 6, 6, 6, 8, 8, 8,
@@ -321,18 +334,9 @@
 0x0ffc, 0x0ffd, 0x0ffe, // 1111111111+00/01/10
 0x3ffc, 0x3ffd, 0x3ffe, 0x3fff // 111111111111+xx
 };
- int cntr[8] = { 0 }, n, res;
 
- memset(vbm_tree, 0xff, sizeof(vbm_tree[0]) * 25);
- for (n = 0; n < 17; n++) {
- res = get_bits(gb, 3);
- if (cntr[res] > 3) // should be >= 3 + (res == 7))
- return -1;
- vbm_tree[res * 3 + cntr[res]++] = n;
- }
 INIT_VLC_STATIC(&frame_type_vlc, VLC_NBITS, sizeof(bits),
 bits, 1, 1, codes, 2, 2, 132);
- return 0;
 }
 
 /**
@@ -355,7 +359,7 @@
 av_log(ctx, AV_LOG_ERROR,
 "Invalid extradata size %d (should be 46)\n",
 ctx->extradata_size);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 flags = AV_RL32(ctx->extradata + 18);
 s->spillover_bitsize = 3 + av_ceil_log2(ctx->block_align);
@@ -378,7 +382,7 @@
 av_log(ctx, AV_LOG_ERROR,
 "Invalid denoise filter strength %d (max=11)\n",
 s->denoise_strength);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 s->denoise_tilt_corr = !!(flags & 0x40);
 s->dc_level = (flags >> 7) & 0xF;
@@ -400,7 +404,7 @@
 init_get_bits(&s->gb, ctx->extradata + 22, (ctx->extradata_size - 22) << 3);
 if (decode_vbmtree(&s->gb, s->vbm_tree) < 0) {
 av_log(ctx, AV_LOG_ERROR, "Invalid VBM tree; broken extradata?\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 s->min_pitch_val = ((ctx->sample_rate << 8) / 400 + 50) >> 8;
@@ -408,7 +412,7 @@
 pitch_range = s->max_pitch_val - s->min_pitch_val;
 if (pitch_range <= 0) {
 av_log(ctx, AV_LOG_ERROR, "Invalid pitch range; broken extradata?\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 s->pitch_nbits = av_ceil_log2(pitch_range);
 s->last_pitch_val = 40;
@@ -423,7 +427,7 @@
 "Unsupported samplerate %d (min=%d, max=%d)\n",
 ctx->sample_rate, min_sr, max_sr); // 322-22097 Hz
 
- return -1;
+ return AVERROR(ENOSYS);
 }
 
 s->block_conv_table[0] = s->min_pitch_val;
@@ -433,7 +437,7 @@
 s->block_delta_pitch_hrange = (pitch_range >> 3) & ~0xF;
 if (s->block_delta_pitch_hrange <= 0) {
 av_log(ctx, AV_LOG_ERROR, "Invalid delta pitch hrange; broken extradata?\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 s->block_delta_pitch_nbits = 1 + av_ceil_log2(s->block_delta_pitch_hrange);
 s->block_pitch_range = s->block_conv_table[2] +
@@ -445,9 +449,6 @@
 ctx->channel_layout = AV_CH_LAYOUT_MONO;
 ctx->sample_fmt = AV_SAMPLE_FMT_FLT;
 
- avcodec_get_frame_defaults(&s->frame);
- ctx->coded_frame = &s->frame;
-
 return 0;
 }
 
@@ -523,7 +524,7 @@
 
 /* find best fitting point in history */
 do {
- dot = ff_scalarproduct_float_c(in, ptr, size);
+ dot = avpriv_scalarproduct_float_c(in, ptr, size);
 if (dot > optimal_gain) {
 optimal_gain = dot;
 best_hist_ptr = ptr;
@@ -532,7 +533,7 @@
 
 if (optimal_gain <= 0)
 return -1;
- dot = ff_scalarproduct_float_c(best_hist_ptr, best_hist_ptr, size);
+ dot = avpriv_scalarproduct_float_c(best_hist_ptr, best_hist_ptr, size);
 if (dot <= 0) // would be 1.0
 return -1;
 
@@ -562,8 +563,8 @@
 {
 float rh0, rh1;
 
- rh0 = 1.0 + ff_scalarproduct_float_c(lpcs, lpcs, n_lpcs);
- rh1 = lpcs[0] + ff_scalarproduct_float_c(lpcs, &lpcs[1], n_lpcs - 1);
+ rh0 = 1.0 + avpriv_scalarproduct_float_c(lpcs, lpcs, n_lpcs);
+ rh1 = lpcs[0] + avpriv_scalarproduct_float_c(lpcs, &lpcs[1], n_lpcs - 1);
 
 return rh1 / rh0;
 }
@@ -611,7 +612,7 @@
 
 /* 70.57 =~ 1/log10(1.0331663) */
 idx = (pwr * gain_mul - 0.0295) * 70.570526123;
- if (idx > 127) { // fallback if index falls outside table range
+ if (idx > 127) { // fall back if index falls outside table range
 coeffs[n] = wmavoice_energy_table[127] *
 powf(1.0331663, idx - 127);
 } else
@@ -619,7 +620,7 @@
 }
 
 /* calculate the Hilbert transform of the gains, which we do (since this
- * is a sinus input) by doing a phase shift (in theory, H(sin())=cos()).
+ * is a sine input) by doing a phase shift (in theory, H(sin())=cos()).
 * Hilbert_Transform(RDFT(x)) = Laplace_Transform(x), which calculates the
 * "moment" of the LPCs in this filter. */
 s->dct.dct_calc(&s->dct, lpcs);
@@ -656,7 +657,8 @@
 -1.8 * tilt_factor(coeffs, remainder - 1),
 coeffs, remainder);
 }
- sq = (1.0 / 64.0) * sqrtf(1 / ff_scalarproduct_float_c(coeffs, coeffs, remainder));
+ sq = (1.0 / 64.0) * sqrtf(1 / avpriv_scalarproduct_float_c(coeffs, coeffs,
+ remainder));
 for (n = 0; n < remainder; n++)
 coeffs[n] *= sq;
 }
@@ -1050,9 +1052,10 @@
 * @param gb bit I/O context
 * @param block_idx block index in frame [0, 1]
 * @param fcb structure containing fixed codebook vector info
+ * @return -1 on error, 0 otherwise
 */
-static void aw_pulse_set2(WMAVoiceContext *s, GetBitContext *gb,
- int block_idx, AMRFixed *fcb)
+static int aw_pulse_set2(WMAVoiceContext *s, GetBitContext *gb,
+ int block_idx, AMRFixed *fcb)
 {
 uint16_t use_mask_mem[9]; // only 5 are used, rest is padding
 uint16_t *use_mask = use_mask_mem + 2;
@@ -1114,7 +1117,7 @@
 else if (use_mask[2]) idx = 0x2F;
 else if (use_mask[3]) idx = 0x3F;
 else if (use_mask[4]) idx = 0x4F;
- else return;
+ else return -1;
 idx -= av_log2_16bit(use_mask[idx >> 4]);
 }
 if (use_mask[idx >> 4] & (0x8000 >> (idx & 15))) {
@@ -1131,6 +1134,7 @@
 /* set offset for next block, relative to start of that block */
 n = (MAX_FRAMESIZE / 2 - start_off) % fcb->pitch_lag;
 s->aw_next_pulse_off_cache = n ? fcb->pitch_lag - n : 0;
+ return 0;
 }
 
 /**
@@ -1293,7 +1297,18 @@
 * (fixed) codebook pulses of the speech signal. */
 if (frame_desc->fcb_type == FCB_TYPE_AW_PULSES) {
 aw_pulse_set1(s, gb, block_idx, &fcb);
- aw_pulse_set2(s, gb, block_idx, &fcb);
+ if (aw_pulse_set2(s, gb, block_idx, &fcb)) {
+ /* Conceal the block with silence and return.
+ * Skip the correct amount of bits to read the next
+ * block from the correct offset. */
+ int r_idx = pRNG(s->frame_cntr, block_idx, size);
+
+ for (n = 0; n < size; n++)
+ excitation[n] =
+ wmavoice_std_codebook[r_idx + n] * s->silence_gain;
+ skip_bits(gb, 7 + 1);
+ return;
+ }
 } else /* FCB_TYPE_EXC_PULSES */ {
 int offset_nbits = 5 - frame_desc->log_n_blocks;
 
@@ -1320,7 +1335,8 @@
 /* Calculate gain for adaptive & fixed codebook signal.
 * see ff_amr_set_fixed_gain(). */
 idx = get_bits(gb, 7);
- fcb_gain = expf(ff_scalarproduct_float_c(s->gain_pred_err, gain_coeff, 6) -
+ fcb_gain = expf(avpriv_scalarproduct_float_c(s->gain_pred_err,
+ gain_coeff, 6) -
 5.2409161640 + wmavoice_gain_codebook_fcb[idx]);
 acb_gain = wmavoice_gain_codebook_acb[idx];
 pred_err = av_clipf(wmavoice_gain_codebook_fcb[idx],
@@ -1449,7 +1465,7 @@
 if (bd_idx < 0) {
 av_log(ctx, AV_LOG_ERROR,
 "Invalid frame type VLC code, skipping\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 block_nsamples = MAX_FRAMESIZE / frame_descs[bd_idx].n_blocks;
@@ -1646,7 +1662,7 @@
 * does not modify the state of the bitreader; it
 * only uses it to copy the current stream position
 * @param s WMA Voice decoding context private data
- * @return -1 if unsupported, 1 on not enough bits or 0 if OK.
+ * @return < 0 on error, 1 on not enough bits or 0 if OK.
 */
 static int check_bits_for_superframe(GetBitContext *orig_gb,
 WMAVoiceContext *s)
@@ -1664,7 +1680,7 @@
 if (get_bits_left(gb) < 14)
 return 1;
 if (!get_bits1(gb))
- return -1; // WMAPro-in-WMAVoice superframe
+ return AVERROR(ENOSYS); // WMAPro-in-WMAVoice superframe
 if (get_bits1(gb)) skip_bits(gb, 12); // number of samples in superframe
 if (s->has_residual_lsps) { // residual LSPs (for all frames)
 if (get_bits_left(gb) < s->sframe_lsp_bitsize)
@@ -1682,7 +1698,7 @@
 }
 bd_idx = s->vbm_tree[get_vlc2(gb, frame_type_vlc.table, 6, 3)];
 if (bd_idx < 0)
- return -1; // invalid frame type VLC code
+ return AVERROR_INVALIDDATA; // invalid frame type VLC code
 frame_desc = &frame_descs[bd_idx];
 if (frame_desc->acb_type == ACB_TYPE_ASYMMETRIC) {
 if (get_bits_left(gb) < s->pitch_nbits)
@@ -1733,7 +1749,8 @@
 * @return 0 on success, <0 on error or 1 if there was not enough data to
 * fully parse the superframe
 */
-static int synth_superframe(AVCodecContext *ctx, int *got_frame_ptr)
+static int synth_superframe(AVCodecContext *ctx, AVFrame *frame,
+ int *got_frame_ptr)
 {
 WMAVoiceContext *s = ctx->priv_data;
 GetBitContext *gb = &s->gb, s_gb;
@@ -1759,14 +1776,15 @@
 if ((res = check_bits_for_superframe(gb, s)) == 1) {
 *got_frame_ptr = 0;
 return 1;
- }
+ } else if (res < 0)
+ return res;
 
 /* First bit is speech/music bit, it differentiates between WMAVoice
 * speech samples (the actual codec) and WMAVoice music samples, which
 * are really WMAPro-in-WMAVoice-superframes. I've never seen those in
 * the wild yet. */
 if (!get_bits1(gb)) {
- av_log_missing_feature(ctx, "WMAPro-in-WMAVoice", 1);
+ avpriv_request_sample(ctx, "WMAPro-in-WMAVoice");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -1776,7 +1794,7 @@
 av_log(ctx, AV_LOG_ERROR,
 "Superframe encodes >480 samples (%d), not allowed\n",
 n_samples);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 /* Parse LSPs, if global for the superframe (can also be per-frame). */
@@ -1801,13 +1819,13 @@
 }
 
 /* get output buffer */
- s->frame.nb_samples = 480;
- if ((res = ff_get_buffer(ctx, &s->frame)) < 0) {
+ frame->nb_samples = 480;
+ if ((res = ff_get_buffer(ctx, frame, 0)) < 0) {
 av_log(ctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return res;
 }
- s->frame.nb_samples = n_samples;
- samples = (float *)s->frame.data[0];
+ frame->nb_samples = n_samples;
+ samples = (float *)frame->data[0];
 
 /* Parse frames, optionally preceded by per-frame (independent) LSPs. */
 for (n = 0; n < 3; n++) {
@@ -1964,11 +1982,10 @@
 copy_bits(&s->pb, avpkt->data, size, gb, s->spillover_nbits);
 flush_put_bits(&s->pb);
 s->sframe_cache_size += s->spillover_nbits;
- if ((res = synth_superframe(ctx, got_frame_ptr)) == 0 &&
+ if ((res = synth_superframe(ctx, data, got_frame_ptr)) == 0 &&
 *got_frame_ptr) {
 cnt += s->spillover_nbits;
 s->skip_bits_next = cnt & 7;
- *(AVFrame *)data = s->frame;
 return cnt >> 3;
 } else
 skip_bits_long (gb, s->spillover_nbits - cnt +
@@ -1983,12 +2000,11 @@
 s->sframe_cache_size = 0;
 s->skip_bits_next = 0;
 pos = get_bits_left(gb);
- if ((res = synth_superframe(ctx, got_frame_ptr)) < 0) {
+ if ((res = synth_superframe(ctx, data, got_frame_ptr)) < 0) {
 return res;
 } else if (*got_frame_ptr) {
 int cnt = get_bits_count(gb);
 s->skip_bits_next = cnt & 7;
- *(AVFrame *)data = s->frame;
 return cnt >> 3;
 } else if ((s->sframe_cache_size = pos) > 0) {
 /* rewind bit reader to start of last (incomplete) superframe... */
@@ -2049,14 +2065,15 @@
 }
 
 AVCodec ff_wmavoice_decoder = {
- .name = "wmavoice",
- .type = AVMEDIA_TYPE_AUDIO,
- .id = AV_CODEC_ID_WMAVOICE,
- .priv_data_size = sizeof(WMAVoiceContext),
- .init = wmavoice_decode_init,
- .close = wmavoice_decode_end,
- .decode = wmavoice_decode_packet,
- .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
- .flush = wmavoice_flush,
- .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Voice"),
+ .name = "wmavoice",
+ .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Voice"),
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = AV_CODEC_ID_WMAVOICE,
+ .priv_data_size = sizeof(WMAVoiceContext),
+ .init = wmavoice_decode_init,
+ .init_static_data = wmavoice_init_static_data,
+ .close = wmavoice_decode_end,
+ .decode = wmavoice_decode_packet,
+ .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
+ .flush = wmavoice_flush,
 };

libav-v9.6.tar.bz2/libavcodec/wmv2.c -> libav-v10.1.tar.bz2/libavcodec/wmv2.c Changed

@@ -28,17 +28,34 @@
 av_cold void ff_wmv2_common_init(Wmv2Context * w){
 MpegEncContext * const s= &w->s;
 
- ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[0], ff_wmv2_scantableA);
- ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[1], ff_wmv2_scantableB);
+ ff_wmv2dsp_init(&w->wdsp);
+ s->dsp.idct_permutation_type = w->wdsp.idct_perm;
+ ff_init_scantable_permutation(s->dsp.idct_permutation,
+ w->wdsp.idct_perm);
+ ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[0],
+ ff_wmv2_scantableA);
+ ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[1],
+ ff_wmv2_scantableB);
+ ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable,
+ ff_wmv1_scantable[1]);
+ ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable,
+ ff_wmv1_scantable[2]);
+ ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable,
+ ff_wmv1_scantable[3]);
+ ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable,
+ ff_wmv1_scantable[0]);
+ s->dsp.idct_put = w->wdsp.idct_put;
+ s->dsp.idct_add = w->wdsp.idct_add;
+ s->dsp.idct = NULL;
 }
 
-static void wmv2_add_block(Wmv2Context *w, DCTELEM *block1, uint8_t *dst, int stride, int n){
+static void wmv2_add_block(Wmv2Context *w, int16_t *block1, uint8_t *dst, int stride, int n){
 MpegEncContext * const s= &w->s;
 
 if (s->block_last_index[n] >= 0) {
 switch(w->abt_type_table[n]){
 case 0:
- s->dsp.idct_add (dst, stride, block1);
+ w->wdsp.idct_add(dst, stride, block1);
 break;
 case 1:
 ff_simple_idct84_add(dst , stride, block1);
@@ -56,7 +73,7 @@
 }
 }
 
-void ff_wmv2_add_mb(MpegEncContext *s, DCTELEM block1[6][64], uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr){
+void ff_wmv2_add_mb(MpegEncContext *s, int16_t block1[6][64], uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr){
 Wmv2Context * const w= (Wmv2Context*)s;
 
 wmv2_add_block(w, block1[0], dest_y , s->linesize, 0);
@@ -77,7 +94,8 @@
 {
 Wmv2Context * const w= (Wmv2Context*)s;
 uint8_t *ptr;
- int dxy, offset, mx, my, src_x, src_y, v_edge_pos, linesize, uvlinesize;
+ int dxy, offset, mx, my, src_x, src_y, v_edge_pos;
+ ptrdiff_t linesize, uvlinesize;
 int emu=0;
 
 dxy = ((motion_y & 1) << 1) | (motion_x & 1);
@@ -99,14 +117,16 @@
 uvlinesize = s->uvlinesize;
 ptr = ref_picture[0] + (src_y * linesize) + src_x;
 
- if(s->flags&CODEC_FLAG_EMU_EDGE){
- 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, 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);
@@ -143,16 +163,22 @@
 offset = (src_y * uvlinesize) + src_x;
 ptr = ref_picture[1] + offset;
 if(emu){
- s->vdsp.emulated_edge_mc(s->edge_emu_buffer, 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, 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);

libav-v9.6.tar.bz2/libavcodec/wmv2.h -> libav-v10.1.tar.bz2/libavcodec/wmv2.h Changed

libav-v9.6.tar.bz2/libavcodec/wmv2dec.c -> libav-v10.1.tar.bz2/libavcodec/wmv2dec.c Changed

@@ -19,7 +19,6 @@
 */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "h263.h"
 #include "mathops.h"
@@ -32,7 +31,7 @@
 static void parse_mb_skip(Wmv2Context * w){
 int mb_x, mb_y;
 MpegEncContext * const s= &w->s;
- uint32_t * const mb_type = s->current_picture_ptr->f.mb_type;
+ uint32_t * const mb_type = s->current_picture_ptr->mb_type;
 
 w->skip_type= get_bits(&s->gb, 2);
 switch(w->skip_type){
@@ -255,11 +254,11 @@
 wrap = s->b8_stride;
 xy = s->block_index[0];
 
- mot_val = s->current_picture.f.motion_val[0][xy];
+ mot_val = s->current_picture.motion_val[0][xy];
 
- A = s->current_picture.f.motion_val[0][xy - 1];
- B = s->current_picture.f.motion_val[0][xy - wrap];
- C = s->current_picture.f.motion_val[0][xy + 2 - wrap];
+ A = s->current_picture.motion_val[0][xy - 1];
+ B = s->current_picture.motion_val[0][xy - wrap];
+ C = s->current_picture.motion_val[0][xy + 2 - wrap];
 
 if(s->mb_x && !s->first_slice_line && !s->mspel && w->top_left_mv_flag)
 diff= FFMAX(FFABS(A[0] - B[0]), FFABS(A[1] - B[1]));
@@ -291,7 +290,7 @@
 return mot_val;
 }
 
-static inline int wmv2_decode_inter_block(Wmv2Context *w, DCTELEM *block, int n, int cbp){
+static inline int wmv2_decode_inter_block(Wmv2Context *w, int16_t *block, int n, int cbp){
 MpegEncContext * const s= &w->s;
 static const int sub_cbp_table[3]= {2,3,1};
 int sub_cbp;
@@ -331,7 +330,7 @@
 }
 
 
-int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
+int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64])
 {
 Wmv2Context * const w= (Wmv2Context*)s;
 int cbp, code, i;
@@ -340,7 +339,7 @@
 if(w->j_type) return 0;
 
 if (s->pict_type == AV_PICTURE_TYPE_P) {
- if (IS_SKIP(s->current_picture.f.mb_type[s->mb_y * s->mb_stride + s->mb_x])) {
+ if (IS_SKIP(s->current_picture.mb_type[s->mb_y * s->mb_stride + s->mb_x])) {
 /* skip mb */
 s->mb_intra = 0;
 for(i=0;i<6;i++)
@@ -447,10 +446,6 @@
 static av_cold int wmv2_decode_init(AVCodecContext *avctx){
 Wmv2Context * const w= avctx->priv_data;
 
- if(avctx->idct_algo==FF_IDCT_AUTO){
- avctx->idct_algo=FF_IDCT_WMV2;
- }
-
 if(ff_msmpeg4_decode_init(avctx) < 0)
 return -1;
 
@@ -471,6 +466,7 @@
 
 AVCodec ff_wmv2_decoder = {
 .name = "wmv2",
+ .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_WMV2,
 .priv_data_size = sizeof(Wmv2Context),
@@ -478,6 +474,5 @@
 .close = wmv2_decode_end,
 .decode = ff_h263_decode_frame,
 .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"),
 .pix_fmts = ff_pixfmt_list_420,
 };

libav-v10.1.tar.bz2/libavcodec/wmv2dsp.c Added

@@ -0,0 +1,146 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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/common.h"
+#include "avcodec.h"
+#include "dsputil.h"
+#include "wmv2dsp.h"
+
+#define W0 2048
+#define W1 2841 /* 2048*sqrt (2)*cos (1*pi/16) */
+#define W2 2676 /* 2048*sqrt (2)*cos (2*pi/16) */
+#define W3 2408 /* 2048*sqrt (2)*cos (3*pi/16) */
+#define W4 2048 /* 2048*sqrt (2)*cos (4*pi/16) */
+#define W5 1609 /* 2048*sqrt (2)*cos (5*pi/16) */
+#define W6 1108 /* 2048*sqrt (2)*cos (6*pi/16) */
+#define W7 565 /* 2048*sqrt (2)*cos (7*pi/16) */
+
+static void wmv2_idct_row(short * b)
+{
+ int s1, s2;
+ int a0, a1, a2, a3, a4, a5, a6, a7;
+
+ /* step 1 */
+ a1 = W1 * b[1] + W7 * b[7];
+ a7 = W7 * b[1] - W1 * b[7];
+ a5 = W5 * b[5] + W3 * b[3];
+ a3 = W3 * b[5] - W5 * b[3];
+ a2 = W2 * b[2] + W6 * b[6];
+ a6 = W6 * b[2] - W2 * b[6];
+ a0 = W0 * b[0] + W0 * b[4];
+ a4 = W0 * b[0] - W0 * b[4];
+
+ /* step 2 */
+ s1 = (181 * (a1 - a5 + a7 - a3) + 128) >> 8; // 1, 3, 5, 7
+ s2 = (181 * (a1 - a5 - a7 + a3) + 128) >> 8;
+
+ /* step 3 */
+ b[0] = (a0 + a2 + a1 + a5 + (1 << 7)) >> 8;
+ b[1] = (a4 + a6 + s1 + (1 << 7)) >> 8;
+ b[2] = (a4 - a6 + s2 + (1 << 7)) >> 8;
+ b[3] = (a0 - a2 + a7 + a3 + (1 << 7)) >> 8;
+ b[4] = (a0 - a2 - a7 - a3 + (1 << 7)) >> 8;
+ b[5] = (a4 - a6 - s2 + (1 << 7)) >> 8;
+ b[6] = (a4 + a6 - s1 + (1 << 7)) >> 8;
+ b[7] = (a0 + a2 - a1 - a5 + (1 << 7)) >> 8;
+}
+
+static void wmv2_idct_col(short * b)
+{
+ int s1, s2;
+ int a0, a1, a2, a3, a4, a5, a6, a7;
+
+ /* step 1, with extended precision */
+ a1 = (W1 * b[8 * 1] + W7 * b[8 * 7] + 4) >> 3;
+ a7 = (W7 * b[8 * 1] - W1 * b[8 * 7] + 4) >> 3;
+ a5 = (W5 * b[8 * 5] + W3 * b[8 * 3] + 4) >> 3;
+ a3 = (W3 * b[8 * 5] - W5 * b[8 * 3] + 4) >> 3;
+ a2 = (W2 * b[8 * 2] + W6 * b[8 * 6] + 4) >> 3;
+ a6 = (W6 * b[8 * 2] - W2 * b[8 * 6] + 4) >> 3;
+ a0 = (W0 * b[8 * 0] + W0 * b[8 * 4] ) >> 3;
+ a4 = (W0 * b[8 * 0] - W0 * b[8 * 4] ) >> 3;
+
+ /* step 2 */
+ s1 = (181 * (a1 - a5 + a7 - a3) + 128) >> 8;
+ s2 = (181 * (a1 - a5 - a7 + a3) + 128) >> 8;
+
+ /* step 3 */
+ b[8 * 0] = (a0 + a2 + a1 + a5 + (1 << 13)) >> 14;
+ b[8 * 1] = (a4 + a6 + s1 + (1 << 13)) >> 14;
+ b[8 * 2] = (a4 - a6 + s2 + (1 << 13)) >> 14;
+ b[8 * 3] = (a0 - a2 + a7 + a3 + (1 << 13)) >> 14;
+
+ b[8 * 4] = (a0 - a2 - a7 - a3 + (1 << 13)) >> 14;
+ b[8 * 5] = (a4 - a6 - s2 + (1 << 13)) >> 14;
+ b[8 * 6] = (a4 + a6 - s1 + (1 << 13)) >> 14;
+ b[8 * 7] = (a0 + a2 - a1 - a5 + (1 << 13)) >> 14;
+}
+
+static void wmv2_idct_add_c(uint8_t *dest, int line_size, int16_t *block)
+{
+ int i;
+
+ for (i = 0; i < 64; i += 8)
+ wmv2_idct_row(block + i);
+ for (i = 0; i < 8; i++)
+ wmv2_idct_col(block + i);
+
+ for (i = 0; i < 8; i++) {
+ dest[0] = av_clip_uint8(dest[0] + block[0]);
+ dest[1] = av_clip_uint8(dest[1] + block[1]);
+ dest[2] = av_clip_uint8(dest[2] + block[2]);
+ dest[3] = av_clip_uint8(dest[3] + block[3]);
+ dest[4] = av_clip_uint8(dest[4] + block[4]);
+ dest[5] = av_clip_uint8(dest[5] + block[5]);
+ dest[6] = av_clip_uint8(dest[6] + block[6]);
+ dest[7] = av_clip_uint8(dest[7] + block[7]);
+ dest += line_size;
+ block += 8;
+ }
+}
+
+static void wmv2_idct_put_c(uint8_t *dest, int line_size, int16_t *block)
+{
+ int i;
+
+ for (i = 0; i < 64; i += 8)
+ wmv2_idct_row(block + i);
+ for (i = 0; i < 8; i++)
+ wmv2_idct_col(block + i);
+
+ for (i = 0; i < 8; i++) {
+ dest[0] = av_clip_uint8(block[0]);
+ dest[1] = av_clip_uint8(block[1]);
+ dest[2] = av_clip_uint8(block[2]);
+ dest[3] = av_clip_uint8(block[3]);
+ dest[4] = av_clip_uint8(block[4]);
+ dest[5] = av_clip_uint8(block[5]);
+ dest[6] = av_clip_uint8(block[6]);
+ dest[7] = av_clip_uint8(block[7]);
+ dest += line_size;
+ block += 8;
+ }
+}
+
+av_cold void ff_wmv2dsp_init(WMV2DSPContext *c)
+{
+ c->idct_add = wmv2_idct_add_c;
+ c->idct_put = wmv2_idct_put_c;
+ c->idct_perm = FF_NO_IDCT_PERM;
+}

libav-v10.1.tar.bz2/libavcodec/wmv2dsp.h Added

@@ -0,0 +1,33 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_WMV2DSP_H
+#define AVCODEC_WMV2DSP_H
+
+#include <stdint.h>
+
+typedef struct WMV2DSPContext {
+ void (*idct_add)(uint8_t *dest, int line_size, int16_t *block);
+ void (*idct_put)(uint8_t *dest, int line_size, int16_t *block);
+
+ int idct_perm;
+} WMV2DSPContext;
+
+void ff_wmv2dsp_init(WMV2DSPContext *c);
+
+#endif /* AVCODEC_WMV2DSP_H */

libav-v9.6.tar.bz2/libavcodec/wmv2enc.c -> libav-v10.1.tar.bz2/libavcodec/wmv2enc.c Changed

@@ -19,7 +19,6 @@
  */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "msmpeg4.h"
 #include "msmpeg4data.h"
@@ -148,7 +147,7 @@
  * useless M$ crap features. It is duplicated here in case someone wants
  * to add support for these crap features. */
 void ff_wmv2_encode_mb(MpegEncContext * s,
-                       DCTELEM block[6][64],
+                       int16_t block[6][64],
                        int motion_x, int motion_y)
 {
     Wmv2Context * const w= (Wmv2Context*)s;
@@ -213,6 +212,7 @@
 
 AVCodec ff_wmv2_encoder = {
     .name           = "wmv2",
+    .long_name      = NULL_IF_CONFIG_SMALL("Windows Media Video 8"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_WMV2,
     .priv_data_size = sizeof(Wmv2Context),
@@ -220,5 +220,4 @@
     .encode2        = ff_MPV_encode_picture,
     .close          = ff_MPV_encode_end,
     .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
-    .long_name      = NULL_IF_CONFIG_SMALL("Windows Media Video 8"),
 };

libav-v9.6.tar.bz2/libavcodec/wnv1.c -> libav-v10.1.tar.bz2/libavcodec/wnv1.c Changed

@@ -32,7 +32,6 @@
 
 typedef struct WNV1Context {
 AVCodecContext *avctx;
- AVFrame pic;
 
 int shift;
 GetBitContext gb;
@@ -65,26 +64,27 @@
 WNV1Context * const l = avctx->priv_data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
- AVFrame * const p = &l->pic;
+ AVFrame * const p = data;
 unsigned char *Y,*U,*V;
- int i, j;
+ int i, j, ret;
 int prev_y = 0, prev_u = 0, prev_v = 0;
 uint8_t *rbuf;
 
+ if (buf_size < 8) {
+ av_log(avctx, AV_LOG_ERROR, "Packet is too short\n");
+ return AVERROR_INVALIDDATA;
+ }
+
 rbuf = av_malloc(buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
 if (!rbuf) {
 av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer\n");
- return -1;
+ return AVERROR(ENOMEM);
 }
 
- if (p->data[0])
- avctx->release_buffer(avctx, p);
-
- p->reference = 0;
- if(ff_get_buffer(avctx, p) < 0){
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 av_free(rbuf);
- return -1;
+ return ret;
 }
 p->key_frame = 1;
 
@@ -97,12 +97,14 @@
 else {
 l->shift = 8 - (buf[2] >> 4);
 if (l->shift > 4) {
- av_log_ask_for_sample(avctx, "Unknown WNV1 frame header value %i\n",
+ avpriv_request_sample(avctx,
+ "Unknown WNV1 frame header value %i",
 buf[2] >> 4);
 l->shift = 4;
 }
 if (l->shift < 1) {
- av_log_ask_for_sample(avctx, "Unknown WNV1 frame header value %i\n",
+ avpriv_request_sample(avctx,
+ "Unknown WNV1 frame header value %i",
 buf[2] >> 4);
 l->shift = 1;
 }
@@ -125,7 +127,6 @@
 
 
 *got_frame = 1;
- *(AVFrame*)data = l->pic;
 av_free(rbuf);
 
 return buf_size;
@@ -148,25 +149,13 @@
 return 0;
 }
 
-static av_cold int decode_end(AVCodecContext *avctx)
-{
- WNV1Context * const l = avctx->priv_data;
- AVFrame *pic = &l->pic;
-
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
-
- return 0;
-}
-
 AVCodec ff_wnv1_decoder = {
 .name = "wnv1",
+ .long_name = NULL_IF_CONFIG_SMALL("Winnov WNV1"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_WNV1,
 .priv_data_size = sizeof(WNV1Context),
 .init = decode_init,
- .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Winnov WNV1"),
 };

libav-v9.6.tar.bz2/libavcodec/ws-snd1.c -> libav-v10.1.tar.bz2/libavcodec/ws-snd1.c Changed

@@ -41,28 +41,19 @@
 0, 1, 2, 3, 4, 5, 6, 8
 };
 
-typedef struct WSSndContext {
- AVFrame frame;
-} WSSndContext;
-
 static av_cold int ws_snd_decode_init(AVCodecContext *avctx)
 {
- WSSndContext *s = avctx->priv_data;
-
 avctx->channels = 1;
 avctx->channel_layout = AV_CH_LAYOUT_MONO;
 avctx->sample_fmt = AV_SAMPLE_FMT_U8;
 
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
 return 0;
 }
 
 static int ws_snd_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame_ptr, AVPacket *avpkt)
 {
- WSSndContext *s = avctx->priv_data;
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int buf_size = avpkt->size;
 
@@ -89,18 +80,17 @@
 }
 
 /* get output buffer */
- s->frame.nb_samples = out_size;
- if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = out_size;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- samples = s->frame.data[0];
+ samples = frame->data[0];
 samples_end = samples + out_size;
 
 if (in_size == out_size) {
 memcpy(samples, buf, out_size);
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
 return buf_size;
 }
 
@@ -176,20 +166,18 @@
 }
 }
 
- s->frame.nb_samples = samples - s->frame.data[0];
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ frame->nb_samples = samples - frame->data[0];
+ *got_frame_ptr = 1;
 
 return buf_size;
 }
 
 AVCodec ff_ws_snd1_decoder = {
 .name = "ws_snd1",
+ .long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"),
 .type = AVMEDIA_TYPE_AUDIO,
 .id = AV_CODEC_ID_WESTWOOD_SND1,
- .priv_data_size = sizeof(WSSndContext),
 .init = ws_snd_decode_init,
 .decode = ws_snd_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"),
 };

libav-v9.6.tar.bz2/libavcodec/x86/Makefile -> libav-v10.1.tar.bz2/libavcodec/x86/Makefile Changed

@@ -1,15 +1,27 @@
-OBJS                                   += x86/fmtconvert_init.o
+OBJS                                   += x86/constants.o               \
+                                          x86/fmtconvert_init.o         \
 
 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            \
+                                          x86/dsputil_x86.o
+OBJS-$(CONFIG_ENCODERS)                += x86/dsputilenc_mmx.o          \
+                                          x86/fdct.o                    \
+                                          x86/motion_est.o
 OBJS-$(CONFIG_FFT)                     += x86/fft_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_LPC)                     += x86/lpc.o
 OBJS-$(CONFIG_MLP_DECODER)             += x86/mlpdsp.o
-OBJS-$(CONFIG_MPEGAUDIODSP)            += x86/mpegaudiodec.o
+OBJS-$(CONFIG_MPEGAUDIODSP)            += x86/mpegaudiodsp.o
 OBJS-$(CONFIG_MPEGVIDEO)               += x86/mpegvideo.o
 OBJS-$(CONFIG_MPEGVIDEOENC)            += x86/mpegvideoenc.o
 OBJS-$(CONFIG_PNG_DECODER)             += x86/pngdsp_init.o
@@ -20,28 +32,38 @@
 OBJS-$(CONFIG_TRUEHD_DECODER)          += x86/mlpdsp.o
 OBJS-$(CONFIG_VC1_DECODER)             += x86/vc1dsp_init.o
 OBJS-$(CONFIG_VIDEODSP)                += x86/videodsp_init.o
+OBJS-$(CONFIG_VORBIS_DECODER)          += x86/vorbisdsp_init.o
 OBJS-$(CONFIG_VP3DSP)                  += x86/vp3dsp_init.o
-OBJS-$(CONFIG_VP5_DECODER)             += x86/vp56dsp_init.o
-OBJS-$(CONFIG_VP6_DECODER)             += x86/vp56dsp_init.o
+OBJS-$(CONFIG_VP6_DECODER)             += x86/vp6dsp_init.o
 OBJS-$(CONFIG_VP8_DECODER)             += x86/vp8dsp_init.o
+OBJS-$(CONFIG_VP9_DECODER)             += x86/vp9dsp_init.o
 OBJS-$(CONFIG_XMM_CLOBBER_TEST)        += x86/w64xmmtest.o
 
-MMX-OBJS                               += x86/dsputil_mmx.o             \
-                                          x86/fdct.o                    \
+MMX-OBJS-$(CONFIG_DSPUTIL)             += x86/dsputil_mmx.o             \
+                                          x86/fpel_mmx.o                \
                                           x86/idct_mmx_xvid.o           \
                                           x86/idct_sse2_xvid.o          \
-                                          x86/simple_idct.o             \
-
-MMX-OBJS-$(CONFIG_DWT)                 += x86/snowdsp.o
-MMX-OBJS-$(CONFIG_ENCODERS)            += x86/dsputilenc_mmx.o          \
-                                          x86/motion_est.o
+                                          x86/rnd_mmx.o                 \
+                                          x86/simple_idct.o
+MMX-OBJS-$(CONFIG_HPELDSP)             += x86/fpel_mmx.o                \
+                                          x86/hpeldsp_mmx.o             \
+                                          x86/rnd_mmx.o
 MMX-OBJS-$(CONFIG_VC1_DECODER)         += x86/vc1dsp_mmx.o
 
+YASM-OBJS                              += x86/deinterlace.o             \
+                                          x86/fmtconvert.o              \
+
 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_DSPUTIL)            += x86/dsputil.o                 \
+                                          x86/fpel.o                    \
+                                          x86/mpeg4qpel.o               \
+                                          x86/qpel.o
 YASM-OBJS-$(CONFIG_ENCODERS)           += x86/dsputilenc.o
 YASM-OBJS-$(CONFIG_FFT)                += x86/fft.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            \
@@ -53,7 +75,11 @@
 YASM-OBJS-$(CONFIG_H264PRED)           += x86/h264_intrapred.o          \
                                           x86/h264_intrapred_10bit.o
 YASM-OBJS-$(CONFIG_H264QPEL)           += x86/h264_qpel_8bit.o          \
-                                          x86/h264_qpel_10bit.o
+                                          x86/h264_qpel_10bit.o         \
+                                          x86/fpel.o                    \
+                                          x86/qpel.o
+YASM-OBJS-$(CONFIG_HPELDSP)            += x86/fpel.o                    \
+                                          x86/hpeldsp.o
 YASM-OBJS-$(CONFIG_MPEGAUDIODSP)       += x86/imdct36.o
 YASM-OBJS-$(CONFIG_PNG_DECODER)        += x86/pngdsp.o
 YASM-OBJS-$(CONFIG_PRORES_DECODER)     += x86/proresdsp.o
@@ -62,10 +88,9 @@
                                           x86/rv40dsp.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/vp56dsp.o
-YASM-OBJS-$(CONFIG_VP8_DECODER)        += x86/vp8dsp.o
-
-YASM-OBJS                              += x86/dsputil.o                 \
-                                          x86/deinterlace.o             \
-                                          x86/fmtconvert.o              \
+YASM-OBJS-$(CONFIG_VP6_DECODER)        += x86/vp6dsp.o
+YASM-OBJS-$(CONFIG_VP8_DECODER)        += x86/vp8dsp.o                  \
+                                          x86/vp8dsp_loopfilter.o
+YASM-OBJS-$(CONFIG_VP9_DECODER)        += x86/vp9dsp.o

libav-v9.6.tar.bz2/libavcodec/x86/ac3dsp.asm -> libav-v10.1.tar.bz2/libavcodec/x86/ac3dsp.asm Changed

@@ -151,15 +151,12 @@
 %endmacro
 
 INIT_MMX mmx
-%define ABS2 ABS2_MMX
 AC3_MAX_MSB_ABS_INT16 or_abs
 INIT_MMX mmxext
-%define ABS2 ABS2_MMXEXT
 AC3_MAX_MSB_ABS_INT16 min_max
 INIT_XMM sse2
 AC3_MAX_MSB_ABS_INT16 min_max
 INIT_XMM ssse3
-%define ABS2 ABS2_SSSE3
 AC3_MAX_MSB_ABS_INT16 or_abs
 
 ;-----------------------------------------------------------------------------
@@ -382,42 +379,6 @@
 %endif
 %endmacro
 
-%if HAVE_AMD3DNOW_EXTERNAL
-INIT_MMX 3dnow
-cglobal ac3_extract_exponents, 3, 3, 0, exp, coef, len
-    add      expq, lenq
-    lea     coefq, [coefq+4*lenq]
-    neg      lenq
-    movq       m3, [pd_1]
-    movq       m4, [pd_151]
-.loop:
-    movq       m0, [coefq+4*lenq  ]
-    movq       m1, [coefq+4*lenq+8]
-    PABSD      m0, m2
-    PABSD      m1, m2
-    pslld      m0, 1
-    por        m0, m3
-    pi2fd      m2, m0
-    psrld      m2, 23
-    movq       m0, m4
-    psubd      m0, m2
-    pslld      m1, 1
-    por        m1, m3
-    pi2fd      m2, m1
-    psrld      m2, 23
-    movq       m1, m4
-    psubd      m1, m2
-    packssdw   m0, m0
-    packuswb   m0, m0
-    packssdw   m1, m1
-    packuswb   m1, m1
-    punpcklwd  m0, m1
-    movd  [expq+lenq], m0
-    add      lenq, 4
-    jl .loop
-    REP_RET
-%endif
-
 %macro AC3_EXTRACT_EXPONENTS 0
 cglobal ac3_extract_exponents, 3, 3, 4, exp, coef, len
     add     expq, lenq

libav-v9.6.tar.bz2/libavcodec/x86/ac3dsp_init.c -> libav-v10.1.tar.bz2/libavcodec/x86/ac3dsp_init.c Changed

@@ -19,37 +19,51 @@
  * 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"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "libavcodec/ac3.h"
 #include "libavcodec/ac3dsp.h"
 
-extern void ff_ac3_exponent_min_mmx   (uint8_t *exp, int num_reuse_blocks, int nb_coefs);
-extern void ff_ac3_exponent_min_mmxext(uint8_t *exp, int num_reuse_blocks, int nb_coefs);
-extern void ff_ac3_exponent_min_sse2  (uint8_t *exp, int num_reuse_blocks, int nb_coefs);
+void ff_ac3_exponent_min_mmx   (uint8_t *exp, int num_reuse_blocks, int nb_coefs);
+void ff_ac3_exponent_min_mmxext(uint8_t *exp, int num_reuse_blocks, int nb_coefs);
+void ff_ac3_exponent_min_sse2  (uint8_t *exp, int num_reuse_blocks, int nb_coefs);
 
-extern int ff_ac3_max_msb_abs_int16_mmx  (const int16_t *src, int len);
-extern int ff_ac3_max_msb_abs_int16_mmxext(const int16_t *src, int len);
-extern int ff_ac3_max_msb_abs_int16_sse2 (const int16_t *src, int len);
-extern int ff_ac3_max_msb_abs_int16_ssse3(const int16_t *src, int len);
+int ff_ac3_max_msb_abs_int16_mmx  (const int16_t *src, int len);
+int ff_ac3_max_msb_abs_int16_mmxext(const int16_t *src, int len);
+int ff_ac3_max_msb_abs_int16_sse2 (const int16_t *src, int len);
+int ff_ac3_max_msb_abs_int16_ssse3(const int16_t *src, int len);
 
-extern void ff_ac3_lshift_int16_mmx (int16_t *src, unsigned int len, unsigned int shift);
-extern void ff_ac3_lshift_int16_sse2(int16_t *src, unsigned int len, unsigned int shift);
+void ff_ac3_lshift_int16_mmx (int16_t *src, unsigned int len, unsigned int shift);
+void ff_ac3_lshift_int16_sse2(int16_t *src, unsigned int len, unsigned int shift);
 
-extern void ff_ac3_rshift_int32_mmx (int32_t *src, unsigned int len, unsigned int shift);
-extern void ff_ac3_rshift_int32_sse2(int32_t *src, unsigned int len, unsigned int shift);
+void ff_ac3_rshift_int32_mmx (int32_t *src, unsigned int len, unsigned int shift);
+void ff_ac3_rshift_int32_sse2(int32_t *src, unsigned int len, unsigned int shift);
 
-extern void ff_float_to_fixed24_3dnow(int32_t *dst, const float *src, unsigned int len);
-extern void ff_float_to_fixed24_sse  (int32_t *dst, const float *src, unsigned int len);
-extern void ff_float_to_fixed24_sse2 (int32_t *dst, const float *src, unsigned int len);
+void ff_float_to_fixed24_3dnow(int32_t *dst, const float *src, unsigned int len);
+void ff_float_to_fixed24_sse  (int32_t *dst, const float *src, unsigned int len);
+void ff_float_to_fixed24_sse2 (int32_t *dst, const float *src, unsigned int len);
 
-extern int ff_ac3_compute_mantissa_size_sse2(uint16_t mant_cnt[6][16]);
+int ff_ac3_compute_mantissa_size_sse2(uint16_t mant_cnt[6][16]);
 
-extern void ff_ac3_extract_exponents_3dnow(uint8_t *exp, int32_t *coef, int nb_coefs);
-extern void ff_ac3_extract_exponents_sse2 (uint8_t *exp, int32_t *coef, int nb_coefs);
-extern void ff_ac3_extract_exponents_ssse3(uint8_t *exp, int32_t *coef, int nb_coefs);
+void ff_ac3_extract_exponents_3dnow(uint8_t *exp, int32_t *coef, int nb_coefs);
+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 HAVE_SSE_INLINE && HAVE_7REGS
 
@@ -180,47 +194,59 @@
 
 av_cold void ff_ac3dsp_init_x86(AC3DSPContext *c, int bit_exact)
 {
-    int mm_flags = av_get_cpu_flags();
+    int cpu_flags = av_get_cpu_flags();
 
-    if (EXTERNAL_MMX(mm_flags)) {
+    if (EXTERNAL_MMX(cpu_flags)) {
         c->ac3_exponent_min = ff_ac3_exponent_min_mmx;
         c->ac3_max_msb_abs_int16 = ff_ac3_max_msb_abs_int16_mmx;
         c->ac3_lshift_int16 = ff_ac3_lshift_int16_mmx;
         c->ac3_rshift_int32 = ff_ac3_rshift_int32_mmx;
     }
-    if (EXTERNAL_AMD3DNOW(mm_flags)) {
-        c->extract_exponents = ff_ac3_extract_exponents_3dnow;
+    if (EXTERNAL_AMD3DNOW(cpu_flags)) {
         if (!bit_exact) {
             c->float_to_fixed24 = ff_float_to_fixed24_3dnow;
         }
     }
-    if (EXTERNAL_MMXEXT(mm_flags)) {
+    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(mm_flags)) {
+    if (EXTERNAL_SSE(cpu_flags)) {
         c->float_to_fixed24 = ff_float_to_fixed24_sse;
     }
-    if (EXTERNAL_SSE2(mm_flags)) {
+    if (EXTERNAL_SSE2(cpu_flags)) {
         c->ac3_exponent_min = ff_ac3_exponent_min_sse2;
         c->ac3_max_msb_abs_int16 = ff_ac3_max_msb_abs_int16_sse2;
         c->float_to_fixed24 = ff_float_to_fixed24_sse2;
         c->compute_mantissa_size = ff_ac3_compute_mantissa_size_sse2;
         c->extract_exponents = ff_ac3_extract_exponents_sse2;
-        if (!(mm_flags & AV_CPU_FLAG_SSE2SLOW)) {
+        if (!(cpu_flags & AV_CPU_FLAG_SSE2SLOW)) {
             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(mm_flags)) {
+    if (EXTERNAL_SSSE3(cpu_flags)) {
         c->ac3_max_msb_abs_int16 = ff_ac3_max_msb_abs_int16_ssse3;
-        if (!(mm_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;
         }
     }
 
 #if HAVE_SSE_INLINE && HAVE_7REGS
-    if (INLINE_SSE(mm_flags)) {
+    if (INLINE_SSE(cpu_flags)) {
         c->downmix = ac3_downmix_sse;
     }
 #endif

libav-v9.6.tar.bz2/libavcodec/x86/cabac.h -> libav-v10.1.tar.bz2/libavcodec/x86/cabac.h Changed

@@ -229,5 +229,45 @@
     return val;
 }
 
+#define get_cabac_bypass get_cabac_bypass_x86
+static av_always_inline int get_cabac_bypass_x86(CABACContext *c)
+{
+    x86_reg tmp;
+    int res;
+    __asm__ volatile(
+        "movl        %c6(%2), %k1       \n\t"
+        "movl        %c3(%2), %%eax     \n\t"
+        "shl             $17, %k1       \n\t"
+        "add           %%eax, %%eax     \n\t"
+        "sub             %k1, %%eax     \n\t"
+        "cltd                           \n\t"
+        "and           %%edx, %k1       \n\t"
+        "add             %k1, %%eax     \n\t"
+        "inc           %%edx            \n\t"
+        "test           %%ax, %%ax      \n\t"
+        "jnz              1f            \n\t"
+        "mov         %c4(%2), %1        \n\t"
+        "subl        $0xFFFF, %%eax     \n\t"
+        "movzwl         (%1), %%ecx     \n\t"
+        "bswap         %%ecx            \n\t"
+        "shrl            $15, %%ecx     \n\t"
+        "addl          %%ecx, %%eax     \n\t"
+        "cmp         %c5(%2), %1        \n\t"
+        "jge              1f            \n\t"
+        "add"OPSIZE"      $2, %c4(%2)   \n\t"
+        "1:                             \n\t"
+        "movl          %%eax, %c3(%2)   \n\t"
+
+        : "=&d"(res), "=&r"(tmp)
+        : "r"(c),
+          "i"(offsetof(CABACContext, low)),
+          "i"(offsetof(CABACContext, bytestream)),
+          "i"(offsetof(CABACContext, bytestream_end)),
+          "i"(offsetof(CABACContext, range))
+        : "%eax", "%ecx", "memory"
+    );
+    return res;
+}
+
 #endif /* HAVE_INLINE_ASM */
 #endif /* AVCODEC_X86_CABAC_H */

libav-v9.6.tar.bz2/libavcodec/x86/cavsdsp.c -> libav-v10.1.tar.bz2/libavcodec/x86/cavsdsp.c Changed

@@ -22,16 +22,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/attributes.h"
 #include "libavutil/common.h"
 #include "libavutil/cpu.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/cavsdsp.h"
-#include "dsputil_mmx.h"
+#include "constants.h"
+#include "dsputil_x86.h"
 #include "config.h"
 
-#if (HAVE_MMXEXT_INLINE || HAVE_AMD3DNOW_INLINE)
+#if HAVE_MMX_INLINE
 
 /* in/out: mma=mma+mmb, mmb=mmb-mma */
 #define SUMSUB_BA( a, b ) \
@@ -122,6 +123,17 @@
     );
 }
 
+#define SBUTTERFLY(a,b,t,n,m)\
+    "mov" #m " " #a ", " #t "         \n\t" /* abcd */\
+    "punpckl" #n " " #b ", " #a "     \n\t" /* aebf */\
+    "punpckh" #n " " #b ", " #t "     \n\t" /* cgdh */\
+
+#define TRANSPOSE4(a,b,c,d,t)\
+    SBUTTERFLY(a,b,t,wd,q) /* a=aebf t=cgdh */\
+    SBUTTERFLY(c,d,b,wd,q) /* c=imjn b=kolp */\
+    SBUTTERFLY(a,c,d,dq,q) /* a=aeim d=bfjn */\
+    SBUTTERFLY(t,b,c,dq,q) /* t=cgko c=dhlp */
+
 static void cavs_idct8_add_mmx(uint8_t *dst, int16_t *block, int stride)
 {
     int i;
@@ -187,6 +199,10 @@
     ff_add_pixels_clamped_mmx(b2, dst, stride);
 }
 
+#endif /* HAVE_MMX_INLINE */
+
+#if (HAVE_MMXEXT_INLINE || HAVE_AMD3DNOW_INLINE)
+
 /*****************************************************************************
  *
  * motion compensation
@@ -409,19 +425,23 @@
 }\
 
 #define CAVS_MC(OPNAME, SIZE, MMX) \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc20_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc20_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
     OPNAME ## cavs_qpel ## SIZE ## _h_ ## MMX(dst, src, stride, stride);\
 }\
 \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc01_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc01_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
     OPNAME ## cavs_qpel ## SIZE ## _v1_ ## MMX(dst, src, stride, stride);\
 }\
 \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc02_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc02_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
     OPNAME ## cavs_qpel ## SIZE ## _v2_ ## MMX(dst, src, stride, stride);\
 }\
 \
-static void ff_ ## OPNAME ## cavs_qpel ## SIZE ## _mc03_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## cavs_qpel ## SIZE ## _mc03_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
     OPNAME ## cavs_qpel ## SIZE ## _v3_ ## MMX(dst, src, stride, stride);\
 }\
 
@@ -437,6 +457,50 @@
 
 #endif /* (HAVE_MMXEXT_INLINE || HAVE_AMD3DNOW_INLINE) */
 
+#if HAVE_MMX_INLINE
+static void put_cavs_qpel8_mc00_mmx(uint8_t *dst, uint8_t *src,
+                                    ptrdiff_t stride)
+{
+    ff_put_pixels8_mmx(dst, src, stride, 8);
+}
+
+static void avg_cavs_qpel8_mc00_mmx(uint8_t *dst, uint8_t *src,
+                                    ptrdiff_t stride)
+{
+    ff_avg_pixels8_mmx(dst, src, stride, 8);
+}
+
+static void put_cavs_qpel16_mc00_mmx(uint8_t *dst, uint8_t *src,
+                                     ptrdiff_t stride)
+{
+    ff_put_pixels16_mmx(dst, src, stride, 16);
+}
+
+static void avg_cavs_qpel16_mc00_mmx(uint8_t *dst, uint8_t *src,
+                                     ptrdiff_t stride)
+{
+    ff_avg_pixels16_mmx(dst, src, stride, 16);
+}
+
+static av_cold void cavsdsp_init_mmx(CAVSDSPContext *c,
+                                     AVCodecContext *avctx)
+{
+    c->put_cavs_qpel_pixels_tab[0][0] = put_cavs_qpel16_mc00_mmx;
+    c->put_cavs_qpel_pixels_tab[1][0] = put_cavs_qpel8_mc00_mmx;
+    c->avg_cavs_qpel_pixels_tab[0][0] = avg_cavs_qpel16_mc00_mmx;
+    c->avg_cavs_qpel_pixels_tab[1][0] = avg_cavs_qpel8_mc00_mmx;
+
+    c->cavs_idct8_add = cavs_idct8_add_mmx;
+    c->idct_perm      = FF_TRANSPOSE_IDCT_PERM;
+}
+#endif /* HAVE_MMX_INLINE */
+
+#define DSPFUNC(PFX, IDX, NUM, EXT)                                                       \
+    c->PFX ## _cavs_qpel_pixels_tab[IDX][ 2] = PFX ## _cavs_qpel ## NUM ## _mc20_ ## EXT; \
+    c->PFX ## _cavs_qpel_pixels_tab[IDX][ 4] = PFX ## _cavs_qpel ## NUM ## _mc01_ ## EXT; \
+    c->PFX ## _cavs_qpel_pixels_tab[IDX][ 8] = PFX ## _cavs_qpel ## NUM ## _mc02_ ## EXT; \
+    c->PFX ## _cavs_qpel_pixels_tab[IDX][12] = PFX ## _cavs_qpel ## NUM ## _mc03_ ## EXT; \
+
 #if HAVE_MMXEXT_INLINE
 QPEL_CAVS(put_,        PUT_OP, mmxext)
 QPEL_CAVS(avg_, AVG_MMXEXT_OP, mmxext)
@@ -446,22 +510,13 @@
 CAVS_MC(avg_,  8, mmxext)
 CAVS_MC(avg_, 16, mmxext)
 
-static void ff_cavsdsp_init_mmxext(CAVSDSPContext *c, AVCodecContext *avctx)
+static av_cold void cavsdsp_init_mmxext(CAVSDSPContext *c,
+                                        AVCodecContext *avctx)
 {
-#define dspfunc(PFX, IDX, NUM) \
-    c->PFX ## _pixels_tab[IDX][ 0] = ff_ ## PFX ## NUM ## _mc00_mmxext; \
-    c->PFX ## _pixels_tab[IDX][ 2] = ff_ ## PFX ## NUM ## _mc20_mmxext; \
-    c->PFX ## _pixels_tab[IDX][ 4] = ff_ ## PFX ## NUM ## _mc01_mmxext; \
-    c->PFX ## _pixels_tab[IDX][ 8] = ff_ ## PFX ## NUM ## _mc02_mmxext; \
-    c->PFX ## _pixels_tab[IDX][12] = ff_ ## PFX ## NUM ## _mc03_mmxext; \
-
-    dspfunc(put_cavs_qpel, 0, 16);
-    dspfunc(put_cavs_qpel, 1, 8);
-    dspfunc(avg_cavs_qpel, 0, 16);
-    dspfunc(avg_cavs_qpel, 1, 8);
-#undef dspfunc
-    c->cavs_idct8_add = cavs_idct8_add_mmx;
-    c->idct_perm = FF_TRANSPOSE_IDCT_PERM;
+    DSPFUNC(put, 0, 16, mmxext);
+    DSPFUNC(put, 1,  8, mmxext);
+    DSPFUNC(avg, 0, 16, mmxext);
+    DSPFUNC(avg, 1,  8, mmxext);
 }
 #endif /* HAVE_MMXEXT_INLINE */
 
@@ -474,32 +529,30 @@
 CAVS_MC(avg_, 8, 3dnow)
 CAVS_MC(avg_, 16,3dnow)
 
-static void ff_cavsdsp_init_3dnow(CAVSDSPContext* c, AVCodecContext *avctx) {
-#define dspfunc(PFX, IDX, NUM) \
-    c->PFX ## _pixels_tab[IDX][ 0] = ff_ ## PFX ## NUM ## _mc00_mmxext; \
-    c->PFX ## _pixels_tab[IDX][ 2] = ff_ ## PFX ## NUM ## _mc20_3dnow; \
-    c->PFX ## _pixels_tab[IDX][ 4] = ff_ ## PFX ## NUM ## _mc01_3dnow; \
-    c->PFX ## _pixels_tab[IDX][ 8] = ff_ ## PFX ## NUM ## _mc02_3dnow; \
-    c->PFX ## _pixels_tab[IDX][12] = ff_ ## PFX ## NUM ## _mc03_3dnow; \
-
-    dspfunc(put_cavs_qpel, 0, 16);
-    dspfunc(put_cavs_qpel, 1, 8);
-    dspfunc(avg_cavs_qpel, 0, 16);
-    dspfunc(avg_cavs_qpel, 1, 8);
-#undef dspfunc
-    c->cavs_idct8_add = cavs_idct8_add_mmx;
-    c->idct_perm = FF_TRANSPOSE_IDCT_PERM;
+static av_cold void cavsdsp_init_3dnow(CAVSDSPContext *c,
+                                       AVCodecContext *avctx)
+{
+    DSPFUNC(put, 0, 16, 3dnow);
+    DSPFUNC(put, 1,  8, 3dnow);
+    DSPFUNC(avg, 0, 16, 3dnow);
+    DSPFUNC(avg, 1,  8, 3dnow);
 }
 #endif /* HAVE_AMD3DNOW_INLINE */
 
 av_cold void ff_cavsdsp_init_x86(CAVSDSPContext *c, AVCodecContext *avctx)
 {
-    int mm_flags = av_get_cpu_flags();
+#if HAVE_MMX_INLINE
+    int cpu_flags = av_get_cpu_flags();
 
-#if HAVE_MMXEXT_INLINE
-    if (mm_flags & AV_CPU_FLAG_MMXEXT) ff_cavsdsp_init_mmxext(c, avctx);
-#endif /* HAVE_MMXEXT_INLINE */
+    if (INLINE_MMX(cpu_flags))
+        cavsdsp_init_mmx(c, avctx);
+#endif /* HAVE_MMX_INLINE */
 #if HAVE_AMD3DNOW_INLINE
-    if (mm_flags & AV_CPU_FLAG_3DNOW) ff_cavsdsp_init_3dnow(c, avctx);
+    if (INLINE_AMD3DNOW(cpu_flags))
+        cavsdsp_init_3dnow(c, avctx);
 #endif /* HAVE_AMD3DNOW_INLINE */
+#if HAVE_MMXEXT_INLINE
+    if (INLINE_MMXEXT(cpu_flags))
+        cavsdsp_init_mmxext(c, avctx);
+#endif /* HAVE_MMXEXT_INLINE */
 }

libav-v10.1.tar.bz2/libavcodec/x86/constants.c Added

@@ -0,0 +1,53 @@
+/*
+ * MMX/SSE constants used across x86 dsp optimizations.
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/mem.h"
+#include "libavutil/x86/asm.h" // for xmm_reg
+#include "constants.h"
+
+DECLARE_ALIGNED(8,  const uint64_t, ff_wtwo) = 0x0002000200020002ULL;
+
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_1)    = { 0x0001000100010001ULL, 0x0001000100010001ULL };
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_2)    = { 0x0002000200020002ULL, 0x0002000200020002ULL };
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_3)    = { 0x0003000300030003ULL, 0x0003000300030003ULL };
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_4)    = { 0x0004000400040004ULL, 0x0004000400040004ULL };
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_5)    = { 0x0005000500050005ULL, 0x0005000500050005ULL };
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_8)    = { 0x0008000800080008ULL, 0x0008000800080008ULL };
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_9)    = { 0x0009000900090009ULL, 0x0009000900090009ULL };
+DECLARE_ALIGNED(8,  const uint64_t, ff_pw_15)   =   0x000F000F000F000FULL;
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_16)   = { 0x0010001000100010ULL, 0x0010001000100010ULL };
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_17)   = { 0x0011001100110011ULL, 0x0011001100110011ULL };
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_18)   = { 0x0012001200120012ULL, 0x0012001200120012ULL };
+DECLARE_ALIGNED(8,  const uint64_t, ff_pw_20)   =   0x0014001400140014ULL;
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_32)   = { 0x0020002000200020ULL, 0x0020002000200020ULL };
+DECLARE_ALIGNED(8,  const uint64_t, ff_pw_42)   =   0x002A002A002A002AULL;
+DECLARE_ALIGNED(8,  const uint64_t, ff_pw_53)   =   0x0035003500350035ULL;
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_64)   = { 0x0040004000400040ULL, 0x0040004000400040ULL };
+DECLARE_ALIGNED(8,  const uint64_t, ff_pw_96)   =   0x0060006000600060ULL;
+DECLARE_ALIGNED(8,  const uint64_t, ff_pw_128)  =   0x0080008000800080ULL;
+DECLARE_ALIGNED(8,  const uint64_t, ff_pw_255)  =   0x00ff00ff00ff00ffULL;
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_512)  = { 0x0200020002000200ULL, 0x0200020002000200ULL };
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_1019) = { 0x03FB03FB03FB03FBULL, 0x03FB03FB03FB03FBULL };
+
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pb_0)    = { 0x0000000000000000ULL, 0x0000000000000000ULL };
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pb_1)    = { 0x0101010101010101ULL, 0x0101010101010101ULL };
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pb_3)    = { 0x0303030303030303ULL, 0x0303030303030303ULL };
+DECLARE_ALIGNED(16, const xmm_reg,  ff_pb_80)   = { 0x8080808080808080ULL, 0x8080808080808080ULL };
+DECLARE_ALIGNED(8,  const uint64_t, ff_pb_FC)   =   0xFCFCFCFCFCFCFCFCULL;

libav-v10.1.tar.bz2/libavcodec/x86/constants.h Added

@@ -0,0 +1,51 @@
+/*
+ * MMX/SSE constants used across x86 dsp optimizations.
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_X86_CONSTANTS_H
+#define AVCODEC_X86_CONSTANTS_H
+
+#include <stdint.h>
+
+#include "libavutil/x86/asm.h"
+
+extern const uint64_t ff_wtwo;
+
+extern const xmm_reg ff_pw_3;
+extern const xmm_reg ff_pw_4;
+extern const xmm_reg ff_pw_5;
+extern const xmm_reg ff_pw_8;
+extern const uint64_t ff_pw_15;
+extern const xmm_reg ff_pw_16;
+extern const xmm_reg ff_pw_18;
+extern const uint64_t ff_pw_20;
+extern const xmm_reg ff_pw_32;
+extern const uint64_t ff_pw_42;
+extern const uint64_t ff_pw_53;
+extern const xmm_reg ff_pw_64;
+extern const uint64_t ff_pw_96;
+extern const uint64_t ff_pw_128;
+extern const uint64_t ff_pw_255;
+
+extern const xmm_reg ff_pb_1;
+extern const xmm_reg ff_pb_3;
+extern const xmm_reg ff_pb_F8;
+extern const uint64_t ff_pb_FC;
+
+#endif /* AVCODEC_X86_CONSTANTS_H */

libav-v10.1.tar.bz2/libavcodec/x86/dca.h Added

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2012-2014 Christophe Gisquet <christophe.gisquet@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 */

libav-v10.1.tar.bz2/libavcodec/x86/dcadsp.asm Added

@@ -0,0 +1,90 @@
+;******************************************************************************
+;* SSE-optimized functions for the DCA decoder
+;* Copyright (C) 2012-2014 Christophe Gisquet <christophe.gisquet@gmail.com>
+;*
+;* This file is part of Libav.
+;*
+;* Libav 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.
+;*
+;* Libav 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 Libav; 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 int8x8_fmul_int32_sse2(float *dst, const int8_t *src, int scale)
+%macro INT8X8_FMUL_INT32 0
+cglobal int8x8_fmul_int32, 3,3,5, dst, src, scale
+ cvtsi2ss m0, scalem
+ mulss m0, [pf_inv16]
+ shufps m0, m0, 0
+%if cpuflag(sse2)
+%if cpuflag(sse4)
+ pmovsxbd m1, [srcq+0]
+ pmovsxbd m2, [srcq+4]
+%else
+ movq m1, [srcq]
+ 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+0]
+ movd mm1, [srcq+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
+ emms
+ shufps m1, m3, q1010
+ shufps m2, m4, q1010
+%endif
+ mulps m1, m0
+ mulps m2, m0
+ mova [dstq+ 0], m1
+ mova [dstq+16], m2
+ REP_RET
+%endmacro
+
+%if ARCH_X86_32
+INIT_XMM sse
+INT8X8_FMUL_INT32
+%endif
+
+INIT_XMM sse2
+INT8X8_FMUL_INT32
+
+INIT_XMM sse4
+INT8X8_FMUL_INT32

libav-v10.1.tar.bz2/libavcodec/x86/dcadsp_init.c Added

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2012-2014 Christophe Gisquet <christophe.gisquet@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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_int8x8_fmul_int32_sse(float *dst, const int8_t *src, int scale);
+void ff_int8x8_fmul_int32_sse2(float *dst, const int8_t *src, int scale);
+void ff_int8x8_fmul_int32_sse4(float *dst, const int8_t *src, int scale);
+
+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->int8x8_fmul_int32 = ff_int8x8_fmul_int32_sse;
+#endif
+ }
+
+ if (EXTERNAL_SSE2(cpu_flags)) {
+ s->int8x8_fmul_int32 = ff_int8x8_fmul_int32_sse2;
+ }
+
+ if (EXTERNAL_SSE4(cpu_flags)) {
+ s->int8x8_fmul_int32 = ff_int8x8_fmul_int32_sse4;
+ }
+}

libav-v10.1.tar.bz2/libavcodec/x86/dct_init.c Added

@@ -0,0 +1,39 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/x86/cpu.h"
+#include "libavcodec/dct.h"
+
+void ff_dct32_float_sse(FFTSample *out, const FFTSample *in);
+void ff_dct32_float_sse2(FFTSample *out, const FFTSample *in);
+void ff_dct32_float_avx(FFTSample *out, const FFTSample *in);
+
+av_cold void ff_dct_init_x86(DCTContext *s)
+{
+    int cpu_flags = av_get_cpu_flags();
+
+    if (EXTERNAL_SSE(cpu_flags))
+        s->dct32 = ff_dct32_float_sse;
+    if (EXTERNAL_SSE2(cpu_flags))
+        s->dct32 = ff_dct32_float_sse2;
+    if (EXTERNAL_AVX(cpu_flags))
+        s->dct32 = ff_dct32_float_avx;
+}

libav-v9.6.tar.bz2/libavcodec/x86/dnxhdenc.c -> libav-v10.1.tar.bz2/libavcodec/x86/dnxhdenc.c Changed

libav-v9.6.tar.bz2/libavcodec/x86/dsputil.asm -> libav-v10.1.tar.bz2/libavcodec/x86/dsputil.asm Changed

@@ -463,32 +463,6 @@
 .src_unaligned:
     ADD_HFYU_LEFT_LOOP 0, 0
 
-
-; float scalarproduct_float_sse(const float *v1, const float *v2, int len)
-INIT_XMM sse
-cglobal scalarproduct_float, 3,3,2, v1, v2, offset
-    neg offsetq
-    shl offsetq, 2
-    sub v1q, offsetq
-    sub v2q, offsetq
-    xorps xmm0, xmm0
-    .loop:
-        movaps   xmm1, [v1q+offsetq]
-        mulps    xmm1, [v2q+offsetq]
-        addps    xmm0, xmm1
-        add      offsetq, 16
-        js       .loop
-    movhlps xmm1, xmm0
-    addps   xmm0, xmm1
-    movss   xmm1, xmm0
-    shufps  xmm0, xmm0, 1
-    addss   xmm0, xmm1
-%if ARCH_X86_64 == 0
-    movss   r0m,  xmm0
-    fld     dword r0m
-%endif
-    RET
-
 ;-----------------------------------------------------------------------------
 ; void ff_vector_clip_int32(int32_t *dst, const int32_t *src, int32_t min,
 ;                           int32_t max, unsigned int len)
@@ -567,115 +541,6 @@
 VECTOR_CLIP_INT32 6, 1, 0, 0
 %endif
 
-;-----------------------------------------------------------------------------
-; void vector_fmul_reverse(float *dst, const float *src0, const float *src1,
-;                          int len)
-;-----------------------------------------------------------------------------
-%macro VECTOR_FMUL_REVERSE 0
-cglobal vector_fmul_reverse, 4,4,2, dst, src0, src1, len
-    lea       lenq, [lend*4 - 2*mmsize]
-ALIGN 16
-.loop:
-%if cpuflag(avx)
-    vmovaps     xmm0, [src1q + 16]
-    vinsertf128 m0, m0, [src1q], 1
-    vshufps     m0, m0, m0, q0123
-    vmovaps     xmm1, [src1q + mmsize + 16]
-    vinsertf128 m1, m1, [src1q + mmsize], 1
-    vshufps     m1, m1, m1, q0123
-%else
-    mova    m0, [src1q]
-    mova    m1, [src1q + mmsize]
-    shufps  m0, m0, q0123
-    shufps  m1, m1, q0123
-%endif
-    mulps   m0, m0, [src0q + lenq + mmsize]
-    mulps   m1, m1, [src0q + lenq]
-    mova    [dstq + lenq + mmsize], m0
-    mova    [dstq + lenq], m1
-    add     src1q, 2*mmsize
-    sub     lenq,  2*mmsize
-    jge     .loop
-    REP_RET
-%endmacro
-
-INIT_XMM sse
-VECTOR_FMUL_REVERSE
-INIT_YMM avx
-VECTOR_FMUL_REVERSE
-
-;-----------------------------------------------------------------------------
-; vector_fmul_add(float *dst, const float *src0, const float *src1,
-;                 const float *src2, int len)
-;-----------------------------------------------------------------------------
-%macro VECTOR_FMUL_ADD 0
-cglobal vector_fmul_add, 5,5,2, dst, src0, src1, src2, len
-    lea       lenq, [lend*4 - 2*mmsize]
-ALIGN 16
-.loop:
-    mova    m0,   [src0q + lenq]
-    mova    m1,   [src0q + lenq + mmsize]
-    mulps   m0, m0, [src1q + lenq]
-    mulps   m1, m1, [src1q + lenq + mmsize]
-    addps   m0, m0, [src2q + lenq]
-    addps   m1, m1, [src2q + lenq + mmsize]
-    mova    [dstq + lenq], m0
-    mova    [dstq + lenq + mmsize], m1
-
-    sub     lenq,   2*mmsize
-    jge     .loop
-    REP_RET
-%endmacro
-
-INIT_XMM sse
-VECTOR_FMUL_ADD
-INIT_YMM avx
-VECTOR_FMUL_ADD
-
-;-----------------------------------------------------------------------------
-; void ff_butterflies_float_interleave(float *dst, const float *src0,
-;                                      const float *src1, int len);
-;-----------------------------------------------------------------------------
-
-%macro BUTTERFLIES_FLOAT_INTERLEAVE 0
-cglobal butterflies_float_interleave, 4,4,3, dst, src0, src1, len
-%if ARCH_X86_64
-    movsxd    lenq, lend
-%endif
-    test      lenq, lenq
-    jz .end
-    shl       lenq, 2
-    lea      src0q, [src0q +   lenq]
-    lea      src1q, [src1q +   lenq]
-    lea       dstq, [ dstq + 2*lenq]
-    neg       lenq
-.loop:
-    mova        m0, [src0q + lenq]
-    mova        m1, [src1q + lenq]
-    subps       m2, m0, m1
-    addps       m0, m0, m1
-    unpcklps    m1, m0, m2
-    unpckhps    m0, m0, m2
-%if cpuflag(avx)
-    vextractf128 [dstq + 2*lenq     ], m1, 0
-    vextractf128 [dstq + 2*lenq + 16], m0, 0
-    vextractf128 [dstq + 2*lenq + 32], m1, 1
-    vextractf128 [dstq + 2*lenq + 48], m0, 1
-%else
-    mova [dstq + 2*lenq         ], m1
-    mova [dstq + 2*lenq + mmsize], m0
-%endif
-    add       lenq, mmsize
-    jl .loop
-.end:
-    REP_RET
-%endmacro
-
-INIT_XMM sse
-BUTTERFLIES_FLOAT_INTERLEAVE
-INIT_YMM avx
-BUTTERFLIES_FLOAT_INTERLEAVE
-
 ; %1 = aligned/unaligned
 %macro BSWAP_LOOPS  1
     mov      r3, r2
@@ -687,8 +552,8 @@
 %if cpuflag(ssse3)
     pshufb   m0, m2
     pshufb   m1, m2
-    mova     [r0 +  0], m0
-    mova     [r0 + 16], m1
+    mov%1    [r0 +  0], m0
+    mov%1    [r0 + 16], m1
 %else
     pshuflw  m0, m0, 10110001b
     pshuflw  m1, m1, 10110001b
@@ -702,8 +567,8 @@
     psrlw    m3, 8
     por      m2, m0
     por      m3, m1
-    mova     [r0 +  0], m2
-    mova     [r0 + 16], m3
+    mov%1    [r0 +  0], m2
+    mov%1    [r0 + 16], m3
 %endif
     add      r0, 32
     add      r1, 32
@@ -716,7 +581,7 @@
     mov%1    m0, [r1]
 %if cpuflag(ssse3)
     pshufb   m0, m2
-    mova     [r0], m0
+    mov%1    [r0], m0
 %else
     pshuflw  m0, m0, 10110001b
     pshufhw  m0, m0, 10110001b
@@ -724,7 +589,7 @@
     psllw    m0, 8
     psrlw    m2, 8
     por      m2, m0
-    mova     [r0], m2
+    mov%1    [r0], m2
 %endif
     add      r1, 16
     add      r0, 16
@@ -783,234 +648,3 @@
 
 INIT_XMM ssse3
 BSWAP32_BUF
-
-%macro op_avgh 3
-    movh   %3, %2
-    pavgb  %1, %3
-    movh   %2, %1
-%endmacro
-
-%macro op_avg 2
-    pavgb  %1, %2
-    mova   %2, %1
-%endmacro
-
-%macro op_puth 2-3
-    movh   %2, %1
-%endmacro
-
-%macro op_put 2
-    mova   %2, %1
-%endmacro
-
-; void pixels4_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
-%macro PIXELS4_L2 1
-%define OP op_%1h
-cglobal %1_pixels4_l2, 6,6
-    movsxdifnidn r3, r3d
-    movsxdifnidn r4, r4d
-    test        r5d, 1
-    je        .loop
-    movd         m0, [r1]
-    movd         m1, [r2]
-    add          r1, r4
-    add          r2, 4
-    pavgb        m0, m1
-    OP           m0, [r0], m3
-    add          r0, r3
-    dec         r5d
-.loop:
-    mova         m0, [r1]
-    mova         m1, [r1+r4]
-    lea          r1, [r1+2*r4]
-    pavgb        m0, [r2]
-    pavgb        m1, [r2+4]
-    OP           m0, [r0], m3
-    OP           m1, [r0+r3], m3
-    lea          r0, [r0+2*r3]
-    mova         m0, [r1]
-    mova         m1, [r1+r4]
-    lea          r1, [r1+2*r4]
-    pavgb        m0, [r2+8]
-    pavgb        m1, [r2+12]
-    OP           m0, [r0], m3
-    OP           m1, [r0+r3], m3
-    lea          r0, [r0+2*r3]
-    add          r2, 16
-    sub         r5d, 4
-    jne       .loop
-    REP_RET
-%endmacro
-
-INIT_MMX mmxext
-PIXELS4_L2 put
-PIXELS4_L2 avg
-
-; void pixels8_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
-%macro PIXELS8_L2 1
-%define OP op_%1
-cglobal %1_pixels8_l2, 6,6
-    movsxdifnidn r3, r3d
-    movsxdifnidn r4, r4d
-    test        r5d, 1
-    je        .loop
-    mova         m0, [r1]
-    mova         m1, [r2]
-    add          r1, r4
-    add          r2, 8
-    pavgb        m0, m1
-    OP           m0, [r0]
-    add          r0, r3
-    dec         r5d
-.loop:
-    mova         m0, [r1]
-    mova         m1, [r1+r4]
-    lea          r1, [r1+2*r4]
-    pavgb        m0, [r2]
-    pavgb        m1, [r2+8]
-    OP           m0, [r0]
-    OP           m1, [r0+r3]
-    lea          r0, [r0+2*r3]
-    mova         m0, [r1]
-    mova         m1, [r1+r4]
-    lea          r1, [r1+2*r4]
-    pavgb        m0, [r2+16]
-    pavgb        m1, [r2+24]
-    OP           m0, [r0]
-    OP           m1, [r0+r3]
-    lea          r0, [r0+2*r3]
-    add          r2, 32
-    sub         r5d, 4
-    jne       .loop
-    REP_RET
-%endmacro
-
-INIT_MMX mmxext
-PIXELS8_L2 put
-PIXELS8_L2 avg
-
-; void pixels16_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
-%macro PIXELS16_L2 1
-%define OP op_%1
-cglobal %1_pixels16_l2, 6,6
-    movsxdifnidn r3, r3d
-    movsxdifnidn r4, r4d
-    test        r5d, 1
-    je        .loop
-    mova         m0, [r1]
-    mova         m1, [r1+8]
-    pavgb        m0, [r2]
-    pavgb        m1, [r2+8]
-    add          r1, r4
-    add          r2, 16
-    OP           m0, [r0]
-    OP           m1, [r0+8]
-    add          r0, r3
-    dec         r5d
-.loop:
-    mova         m0, [r1]
-    mova         m1, [r1+8]
-    add          r1, r4
-    pavgb        m0, [r2]
-    pavgb        m1, [r2+8]
-    OP           m0, [r0]
-    OP           m1, [r0+8]
-    add          r0, r3
-    mova         m0, [r1]
-    mova         m1, [r1+8]
-    add          r1, r4
-    pavgb        m0, [r2+16]
-    pavgb        m1, [r2+24]
-    OP           m0, [r0]
-    OP           m1, [r0+8]
-    add          r0, r3
-    add          r2, 32
-    sub         r5d, 2
-    jne       .loop
-    REP_RET
-%endmacro
-
-INIT_MMX mmxext
-PIXELS16_L2 put
-PIXELS16_L2 avg
-
-INIT_MMX mmxext
-; void pixels(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-%macro PIXELS48 2
-%if %2 == 4
-%define OP movh
-%else
-%define OP mova
-%endif
-cglobal %1_pixels%2, 4,5
-    movsxdifnidn r2, r2d
-    lea          r4, [r2*3]
-.loop:
-    OP           m0, [r1]
-    OP           m1, [r1+r2]
-    OP           m2, [r1+r2*2]
-    OP           m3, [r1+r4]
-    lea          r1, [r1+r2*4]
-%ifidn %1, avg
-    pavgb        m0, [r0]
-    pavgb        m1, [r0+r2]
-    pavgb        m2, [r0+r2*2]
-    pavgb        m3, [r0+r4]
-%endif
-    OP         [r0], m0
-    OP      [r0+r2], m1
-    OP    [r0+r2*2], m2
-    OP      [r0+r4], m3
-    sub         r3d, 4
-    lea          r0, [r0+r2*4]
-    jne       .loop
-    RET
-%endmacro
-
-PIXELS48 put, 4
-PIXELS48 avg, 4
-PIXELS48 put, 8
-PIXELS48 avg, 8
-
-INIT_XMM sse2
-; void put_pixels16_sse2(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-cglobal put_pixels16, 4,5,4
-    movsxdifnidn r2, r2d
-    lea          r4, [r2*3]
-.loop:
-    movu         m0, [r1]
-    movu         m1, [r1+r2]
-    movu         m2, [r1+r2*2]
-    movu         m3, [r1+r4]
-    lea          r1, [r1+r2*4]
-    mova       [r0], m0
-    mova    [r0+r2], m1
-    mova  [r0+r2*2], m2
-    mova    [r0+r4], m3
-    sub         r3d, 4
-    lea          r0, [r0+r2*4]
-    jnz       .loop
-    REP_RET
-
-; void avg_pixels16_sse2(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-cglobal avg_pixels16, 4,5,4
-    movsxdifnidn r2, r2d
-    lea          r4, [r2*3]
-.loop:
-    movu         m0, [r1]
-    movu         m1, [r1+r2]
-    movu         m2, [r1+r2*2]
-    movu         m3, [r1+r4]
-    lea          r1, [r1+r2*4]
-    pavgb        m0, [r0]
-    pavgb        m1, [r0+r2]
-    pavgb        m2, [r0+r2*2]
-    pavgb        m3, [r0+r4]
-    mova       [r0], m0
-    mova    [r0+r2], m1
-    mova  [r0+r2*2], m2
-    mova    [r0+r4], m3
-    sub         r3d, 4
-    lea          r0, [r0+r2*4]
-    jnz       .loop
-    REP_RET

libav-v10.1.tar.bz2/libavcodec/x86/dsputil_init.c Added

@@ -0,0 +1,690 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#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"
+
+void ff_put_pixels8_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2,
+                              int dstStride, int src1Stride, int h);
+void ff_put_no_rnd_pixels8_l2_mmxext(uint8_t *dst, uint8_t *src1,
+                                     uint8_t *src2, int dstStride,
+                                     int src1Stride, int h);
+void ff_avg_pixels8_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2,
+                              int dstStride, int src1Stride, int h);
+void ff_put_pixels16_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2,
+                               int dstStride, int src1Stride, int h);
+void ff_avg_pixels16_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2,
+                               int dstStride, int src1Stride, int h);
+void ff_put_no_rnd_pixels16_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2,
+                                      int dstStride, int src1Stride, int h);
+void ff_put_mpeg4_qpel16_h_lowpass_mmxext(uint8_t *dst, uint8_t *src,
+                                         int dstStride, int srcStride, int h);
+void ff_avg_mpeg4_qpel16_h_lowpass_mmxext(uint8_t *dst, uint8_t *src,
+                                         int dstStride, int srcStride, int h);
+void ff_put_no_rnd_mpeg4_qpel16_h_lowpass_mmxext(uint8_t *dst, uint8_t *src,
+                                                 int dstStride, int srcStride,
+                                                 int h);
+void ff_put_mpeg4_qpel8_h_lowpass_mmxext(uint8_t *dst, uint8_t *src,
+                                        int dstStride, int srcStride, int h);
+void ff_avg_mpeg4_qpel8_h_lowpass_mmxext(uint8_t *dst, uint8_t *src,
+                                        int dstStride, int srcStride, int h);
+void ff_put_no_rnd_mpeg4_qpel8_h_lowpass_mmxext(uint8_t *dst, uint8_t *src,
+                                                int dstStride, int srcStride,
+                                                int h);
+void ff_put_mpeg4_qpel16_v_lowpass_mmxext(uint8_t *dst, uint8_t *src,
+                                         int dstStride, int srcStride);
+void ff_avg_mpeg4_qpel16_v_lowpass_mmxext(uint8_t *dst, uint8_t *src,
+                                         int dstStride, int srcStride);
+void ff_put_no_rnd_mpeg4_qpel16_v_lowpass_mmxext(uint8_t *dst, uint8_t *src,
+                                                 int dstStride, int srcStride);
+void ff_put_mpeg4_qpel8_v_lowpass_mmxext(uint8_t *dst, uint8_t *src,
+                                        int dstStride, int srcStride);
+void ff_avg_mpeg4_qpel8_v_lowpass_mmxext(uint8_t *dst, uint8_t *src,
+                                        int dstStride, int srcStride);
+void ff_put_no_rnd_mpeg4_qpel8_v_lowpass_mmxext(uint8_t *dst, uint8_t *src,
+                                                int dstStride, int srcStride);
+#define ff_put_no_rnd_pixels16_mmxext ff_put_pixels16_mmxext
+#define ff_put_no_rnd_pixels8_mmxext ff_put_pixels8_mmxext
+
+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,
+                                    int order);
+int32_t ff_scalarproduct_and_madd_int16_mmxext(int16_t *v1, const int16_t *v2,
+                                               const int16_t *v3,
+                                               int order, int mul);
+int32_t ff_scalarproduct_and_madd_int16_sse2(int16_t *v1, const int16_t *v2,
+                                             const int16_t *v3,
+                                             int order, int mul);
+int32_t ff_scalarproduct_and_madd_int16_ssse3(int16_t *v1, const int16_t *v2,
+                                              const int16_t *v3,
+                                              int order, int mul);
+
+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);
+
+void ff_add_hfyu_median_prediction_mmxext(uint8_t *dst, const uint8_t *top,
+                                          const uint8_t *diff, int w,
+                                          int *left, int *left_top);
+int  ff_add_hfyu_left_prediction_ssse3(uint8_t *dst, const uint8_t *src,
+                                       int w, int left);
+int  ff_add_hfyu_left_prediction_sse4(uint8_t *dst, const uint8_t *src,
+                                      int w, int left);
+
+void ff_vector_clip_int32_mmx     (int32_t *dst, const int32_t *src,
+                                   int32_t min, int32_t max, unsigned int len);
+void ff_vector_clip_int32_sse2    (int32_t *dst, const int32_t *src,
+                                   int32_t min, int32_t max, unsigned int len);
+void ff_vector_clip_int32_int_sse2(int32_t *dst, const int32_t *src,
+                                   int32_t min, int32_t max, unsigned int len);
+void ff_vector_clip_int32_sse4    (int32_t *dst, const int32_t *src,
+                                   int32_t min, int32_t max, unsigned int len);
+
+#if HAVE_YASM
+
+PIXELS16(static, ff_avg, , , _mmxext)
+PIXELS16(static, ff_put, , , _mmxext)
+
+#define QPEL_OP(OPNAME, RND, MMX)                                       \
+static void OPNAME ## qpel8_mc00_ ## MMX (uint8_t *dst, uint8_t *src,   \
+                                          ptrdiff_t stride)             \
+{                                                                       \
+    ff_ ## OPNAME ## pixels8_ ## MMX(dst, src, stride, 8);              \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel8_mc10_ ## MMX(uint8_t *dst, uint8_t *src,    \
+                                         ptrdiff_t stride)              \
+{                                                                       \
+    uint64_t temp[8];                                                   \
+    uint8_t * const half = (uint8_t*)temp;                              \
+    ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(half, src, 8,        \
+                                                   stride, 8);          \
+    ff_ ## OPNAME ## pixels8_l2_ ## MMX(dst, src, half,                 \
+                                        stride, stride, 8);             \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel8_mc20_ ## MMX(uint8_t *dst, uint8_t *src,    \
+                                         ptrdiff_t stride)              \
+{                                                                       \
+    ff_ ## OPNAME ## mpeg4_qpel8_h_lowpass_ ## MMX(dst, src, stride,    \
+                                                   stride, 8);          \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel8_mc30_ ## MMX(uint8_t *dst, uint8_t *src,    \
+                                         ptrdiff_t stride)              \
+{                                                                       \
+    uint64_t temp[8];                                                   \
+    uint8_t * const half = (uint8_t*)temp;                              \
+    ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(half, src, 8,        \
+                                                   stride, 8);          \
+    ff_ ## OPNAME ## pixels8_l2_ ## MMX(dst, src + 1, half, stride,     \
+                                        stride, 8);                     \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel8_mc01_ ## MMX(uint8_t *dst, uint8_t *src,    \
+                                         ptrdiff_t stride)              \
+{                                                                       \
+    uint64_t temp[8];                                                   \
+    uint8_t * const half = (uint8_t*)temp;                              \
+    ff_put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(half, src,           \
+                                                   8, stride);          \
+    ff_ ## OPNAME ## pixels8_l2_ ## MMX(dst, src, half,                 \
+                                        stride, stride, 8);             \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel8_mc02_ ## MMX(uint8_t *dst, uint8_t *src,    \
+                                         ptrdiff_t stride)              \
+{                                                                       \
+    ff_ ## OPNAME ## mpeg4_qpel8_v_lowpass_ ## MMX(dst, src,            \
+                                                   stride, stride);     \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel8_mc03_ ## MMX(uint8_t *dst, uint8_t *src,    \
+                                         ptrdiff_t stride)              \
+{                                                                       \
+    uint64_t temp[8];                                                   \
+    uint8_t * const half = (uint8_t*)temp;                              \
+    ff_put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(half, src,           \
+                                                   8, stride);          \
+    ff_ ## OPNAME ## pixels8_l2_ ## MMX(dst, src + stride, half, stride,\
+                                        stride, 8);                     \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel8_mc11_ ## MMX(uint8_t *dst, uint8_t *src,    \
+                                         ptrdiff_t stride)              \
+{                                                                       \
+    uint64_t half[8 + 9];                                               \
+    uint8_t * const halfH  = ((uint8_t*)half) + 64;                     \
+    uint8_t * const halfHV = ((uint8_t*)half);                          \
+    ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8,       \
+                                                   stride, 9);          \
+    ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src, halfH, 8,           \
+                                        stride, 9);                     \
+    ff_put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8);\
+    ff_ ## OPNAME ## pixels8_l2_ ## MMX(dst, halfH, halfHV,             \
+                                        stride, 8, 8);                  \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel8_mc31_ ## MMX(uint8_t *dst, uint8_t *src,    \
+                                         ptrdiff_t stride)              \
+{                                                                       \
+    uint64_t half[8 + 9];                                               \
+    uint8_t * const halfH  = ((uint8_t*)half) + 64;                     \
+    uint8_t * const halfHV = ((uint8_t*)half);                          \
+    ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8,       \
+                                                   stride, 9);          \
+    ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src + 1, halfH, 8,       \
+                                        stride, 9);                     \
+    ff_put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8);\
+    ff_ ## OPNAME ## pixels8_l2_ ## MMX(dst, halfH, halfHV,             \
+                                        stride, 8, 8);                  \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel8_mc13_ ## MMX(uint8_t *dst, uint8_t *src,    \
+                                         ptrdiff_t stride)              \
+{                                                                       \
+    uint64_t half[8 + 9];                                               \
+    uint8_t * const halfH  = ((uint8_t*)half) + 64;                     \
+    uint8_t * const halfHV = ((uint8_t*)half);                          \
+    ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8,       \
+                                                   stride, 9);          \
+    ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src, halfH, 8,           \
+                                        stride, 9);                     \
+    ff_put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8);\
+    ff_ ## OPNAME ## pixels8_l2_ ## MMX(dst, halfH + 8, halfHV,         \
+                                        stride, 8, 8);                  \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel8_mc33_ ## MMX(uint8_t *dst, uint8_t *src,    \
+                                         ptrdiff_t stride)              \
+{                                                                       \
+    uint64_t half[8 + 9];                                               \
+    uint8_t * const halfH  = ((uint8_t*)half) + 64;                     \
+    uint8_t * const halfHV = ((uint8_t*)half);                          \
+    ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8,       \
+                                                   stride, 9);          \
+    ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src + 1, halfH, 8,       \
+                                        stride, 9);                     \
+    ff_put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8);\
+    ff_ ## OPNAME ## pixels8_l2_ ## MMX(dst, halfH + 8, halfHV,         \
+                                        stride, 8, 8);                  \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel8_mc21_ ## MMX(uint8_t *dst, uint8_t *src,    \
+                                         ptrdiff_t stride)              \
+{                                                                       \
+    uint64_t half[8 + 9];                                               \
+    uint8_t * const halfH  = ((uint8_t*)half) + 64;                     \
+    uint8_t * const halfHV = ((uint8_t*)half);                          \
+    ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8,       \
+                                                   stride, 9);          \
+    ff_put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8);\
+    ff_ ## OPNAME ## pixels8_l2_ ## MMX(dst, halfH, halfHV,             \
+                                        stride, 8, 8);                  \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel8_mc23_ ## MMX(uint8_t *dst, uint8_t *src,    \
+                                         ptrdiff_t stride)              \
+{                                                                       \
+    uint64_t half[8 + 9];                                               \
+    uint8_t * const halfH  = ((uint8_t*)half) + 64;                     \
+    uint8_t * const halfHV = ((uint8_t*)half);                          \
+    ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8,       \
+                                                   stride, 9);          \
+    ff_put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8);\
+    ff_ ## OPNAME ## pixels8_l2_ ## MMX(dst, halfH + 8, halfHV,         \
+                                        stride, 8, 8);                  \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel8_mc12_ ## MMX(uint8_t *dst, uint8_t *src,    \
+                                         ptrdiff_t stride)              \
+{                                                                       \
+    uint64_t half[8 + 9];                                               \
+    uint8_t * const halfH = ((uint8_t*)half);                           \
+    ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8,       \
+                                                   stride, 9);          \
+    ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src, halfH,              \
+                                        8, stride, 9);                  \
+    ff_ ## OPNAME ## mpeg4_qpel8_v_lowpass_ ## MMX(dst, halfH,          \
+                                                   stride, 8);          \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel8_mc32_ ## MMX(uint8_t *dst, uint8_t *src,    \
+                                         ptrdiff_t stride)              \
+{                                                                       \
+    uint64_t half[8 + 9];                                               \
+    uint8_t * const halfH = ((uint8_t*)half);                           \
+    ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8,       \
+                                                   stride, 9);          \
+    ff_put ## RND ## pixels8_l2_ ## MMX(halfH, src + 1, halfH, 8,       \
+                                        stride, 9);                     \
+    ff_ ## OPNAME ## mpeg4_qpel8_v_lowpass_ ## MMX(dst, halfH,          \
+                                                   stride, 8);          \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel8_mc22_ ## MMX(uint8_t *dst, uint8_t *src,    \
+                                         ptrdiff_t stride)              \
+{                                                                       \
+    uint64_t half[9];                                                   \
+    uint8_t * const halfH = ((uint8_t*)half);                           \
+    ff_put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8,       \
+                                                   stride, 9);          \
+    ff_ ## OPNAME ## mpeg4_qpel8_v_lowpass_ ## MMX(dst, halfH,          \
+                                                   stride, 8);          \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel16_mc00_ ## MMX (uint8_t *dst, uint8_t *src,  \
+                                           ptrdiff_t stride)            \
+{                                                                       \
+    ff_ ## OPNAME ## pixels16_ ## MMX(dst, src, stride, 16);            \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel16_mc10_ ## MMX(uint8_t *dst, uint8_t *src,   \
+                                          ptrdiff_t stride)             \
+{                                                                       \
+    uint64_t temp[32];                                                  \
+    uint8_t * const half = (uint8_t*)temp;                              \
+    ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(half, src, 16,      \
+                                                    stride, 16);        \
+    ff_ ## OPNAME ## pixels16_l2_ ## MMX(dst, src, half, stride,        \
+                                         stride, 16);                   \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel16_mc20_ ## MMX(uint8_t *dst, uint8_t *src,   \
+                                          ptrdiff_t stride)             \
+{                                                                       \
+    ff_ ## OPNAME ## mpeg4_qpel16_h_lowpass_ ## MMX(dst, src,           \
+                                                    stride, stride, 16);\
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel16_mc30_ ## MMX(uint8_t *dst, uint8_t *src,   \
+                                          ptrdiff_t stride)             \
+{                                                                       \
+    uint64_t temp[32];                                                  \
+    uint8_t * const half = (uint8_t*)temp;                              \
+    ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(half, src, 16,      \
+                                                    stride, 16);        \
+    ff_ ## OPNAME ## pixels16_l2_ ## MMX(dst, src + 1, half,            \
+                                         stride, stride, 16);           \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel16_mc01_ ## MMX(uint8_t *dst, uint8_t *src,   \
+                                          ptrdiff_t stride)             \
+{                                                                       \
+    uint64_t temp[32];                                                  \
+    uint8_t * const half = (uint8_t*)temp;                              \
+    ff_put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(half, src, 16,      \
+                                                    stride);            \
+    ff_ ## OPNAME ## pixels16_l2_ ## MMX(dst, src, half, stride,        \
+                                         stride, 16);                   \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel16_mc02_ ## MMX(uint8_t *dst, uint8_t *src,   \
+                                          ptrdiff_t stride)             \
+{                                                                       \
+    ff_ ## OPNAME ## mpeg4_qpel16_v_lowpass_ ## MMX(dst, src,           \
+                                                    stride, stride);    \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel16_mc03_ ## MMX(uint8_t *dst, uint8_t *src,   \
+                                          ptrdiff_t stride)             \
+{                                                                       \
+    uint64_t temp[32];                                                  \
+    uint8_t * const half = (uint8_t*)temp;                              \
+    ff_put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(half, src, 16,      \
+                                                    stride);            \
+    ff_ ## OPNAME ## pixels16_l2_ ## MMX(dst, src+stride, half,         \
+                                         stride, stride, 16);           \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel16_mc11_ ## MMX(uint8_t *dst, uint8_t *src,   \
+                                          ptrdiff_t stride)             \
+{                                                                       \
+    uint64_t half[16 * 2 + 17 * 2];                                     \
+    uint8_t * const halfH  = ((uint8_t*)half) + 256;                    \
+    uint8_t * const halfHV = ((uint8_t*)half);                          \
+    ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16,     \
+                                                    stride, 17);        \
+    ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src, halfH, 16,         \
+                                         stride, 17);                   \
+    ff_put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH,      \
+                                                    16, 16);            \
+    ff_ ## OPNAME ## pixels16_l2_ ## MMX(dst, halfH, halfHV,            \
+                                         stride, 16, 16);               \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel16_mc31_ ## MMX(uint8_t *dst, uint8_t *src,   \
+                                          ptrdiff_t stride)             \
+{                                                                       \
+    uint64_t half[16 * 2 + 17 * 2];                                     \
+    uint8_t * const halfH  = ((uint8_t*)half) + 256;                    \
+    uint8_t * const halfHV = ((uint8_t*)half);                          \
+    ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16,     \
+                                                    stride, 17);        \
+    ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src + 1, halfH, 16,     \
+                                         stride, 17);                   \
+    ff_put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH,      \
+                                                    16, 16);            \
+    ff_ ## OPNAME ## pixels16_l2_ ## MMX(dst, halfH, halfHV,            \
+                                         stride, 16, 16);               \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel16_mc13_ ## MMX(uint8_t *dst, uint8_t *src,   \
+                                          ptrdiff_t stride)             \
+{                                                                       \
+    uint64_t half[16 * 2 + 17 * 2];                                     \
+    uint8_t * const halfH  = ((uint8_t*)half) + 256;                    \
+    uint8_t * const halfHV = ((uint8_t*)half);                          \
+    ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16,     \
+                                                    stride, 17);        \
+    ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src, halfH, 16,         \
+                                         stride, 17);                   \
+    ff_put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH,      \
+                                                    16, 16);            \
+    ff_ ## OPNAME ## pixels16_l2_ ## MMX(dst, halfH + 16, halfHV,       \
+                                         stride, 16, 16);               \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel16_mc33_ ## MMX(uint8_t *dst, uint8_t *src,   \
+                                          ptrdiff_t stride)             \
+{                                                                       \
+    uint64_t half[16 * 2 + 17 * 2];                                     \
+    uint8_t * const halfH  = ((uint8_t*)half) + 256;                    \
+    uint8_t * const halfHV = ((uint8_t*)half);                          \
+    ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16,     \
+                                                    stride, 17);        \
+    ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src + 1, halfH, 16,     \
+                                         stride, 17);                   \
+    ff_put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH,      \
+                                                    16, 16);            \
+    ff_ ## OPNAME ## pixels16_l2_ ## MMX(dst, halfH + 16, halfHV,       \
+                                         stride, 16, 16);               \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel16_mc21_ ## MMX(uint8_t *dst, uint8_t *src,   \
+                                          ptrdiff_t stride)             \
+{                                                                       \
+    uint64_t half[16 * 2 + 17 * 2];                                     \
+    uint8_t * const halfH  = ((uint8_t*)half) + 256;                    \
+    uint8_t * const halfHV = ((uint8_t*)half);                          \
+    ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16,     \
+                                                    stride, 17);        \
+    ff_put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH,      \
+                                                    16, 16);            \
+    ff_ ## OPNAME ## pixels16_l2_ ## MMX(dst, halfH, halfHV,            \
+                                         stride, 16, 16);               \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel16_mc23_ ## MMX(uint8_t *dst, uint8_t *src,   \
+                                          ptrdiff_t stride)             \
+{                                                                       \
+    uint64_t half[16 * 2 + 17 * 2];                                     \
+    uint8_t * const halfH  = ((uint8_t*)half) + 256;                    \
+    uint8_t * const halfHV = ((uint8_t*)half);                          \
+    ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16,     \
+                                                    stride, 17);        \
+    ff_put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH,      \
+                                                    16, 16);            \
+    ff_ ## OPNAME ## pixels16_l2_ ## MMX(dst, halfH + 16, halfHV,       \
+                                         stride, 16, 16);               \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel16_mc12_ ## MMX(uint8_t *dst, uint8_t *src,   \
+                                          ptrdiff_t stride)             \
+{                                                                       \
+    uint64_t half[17 * 2];                                              \
+    uint8_t * const halfH = ((uint8_t*)half);                           \
+    ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16,     \
+                                                    stride, 17);        \
+    ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src, halfH, 16,         \
+                                         stride, 17);                   \
+    ff_ ## OPNAME ## mpeg4_qpel16_v_lowpass_ ## MMX(dst, halfH,         \
+                                                    stride, 16);        \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel16_mc32_ ## MMX(uint8_t *dst, uint8_t *src,   \
+                                          ptrdiff_t stride)             \
+{                                                                       \
+    uint64_t half[17 * 2];                                              \
+    uint8_t * const halfH = ((uint8_t*)half);                           \
+    ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16,     \
+                                                    stride, 17);        \
+    ff_put ## RND ## pixels16_l2_ ## MMX(halfH, src + 1, halfH, 16,     \
+                                         stride, 17);                   \
+    ff_ ## OPNAME ## mpeg4_qpel16_v_lowpass_ ## MMX(dst, halfH,         \
+                                                    stride, 16);        \
+}                                                                       \
+                                                                        \
+static void OPNAME ## qpel16_mc22_ ## MMX(uint8_t *dst, uint8_t *src,   \
+                                          ptrdiff_t stride)             \
+{                                                                       \
+    uint64_t half[17 * 2];                                              \
+    uint8_t * const halfH = ((uint8_t*)half);                           \
+    ff_put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16,     \
+                                                    stride, 17);        \
+    ff_ ## OPNAME ## mpeg4_qpel16_v_lowpass_ ## MMX(dst, halfH,         \
+                                                    stride, 16);        \
+}
+
+QPEL_OP(put_,        _,        mmxext)
+QPEL_OP(avg_,        _,        mmxext)
+QPEL_OP(put_no_rnd_, _no_rnd_, mmxext)
+#endif /* HAVE_YASM */
+
+#define SET_QPEL_FUNCS(PFX, IDX, SIZE, CPU, PREFIX)                          \
+    do {                                                                     \
+    c->PFX ## _pixels_tab[IDX][ 0] = PREFIX ## PFX ## SIZE ## _mc00_ ## CPU; \
+    c->PFX ## _pixels_tab[IDX][ 1] = PREFIX ## PFX ## SIZE ## _mc10_ ## CPU; \
+    c->PFX ## _pixels_tab[IDX][ 2] = PREFIX ## PFX ## SIZE ## _mc20_ ## CPU; \
+    c->PFX ## _pixels_tab[IDX][ 3] = PREFIX ## PFX ## SIZE ## _mc30_ ## CPU; \
+    c->PFX ## _pixels_tab[IDX][ 4] = PREFIX ## PFX ## SIZE ## _mc01_ ## CPU; \
+    c->PFX ## _pixels_tab[IDX][ 5] = PREFIX ## PFX ## SIZE ## _mc11_ ## CPU; \
+    c->PFX ## _pixels_tab[IDX][ 6] = PREFIX ## PFX ## SIZE ## _mc21_ ## CPU; \
+    c->PFX ## _pixels_tab[IDX][ 7] = PREFIX ## PFX ## SIZE ## _mc31_ ## CPU; \
+    c->PFX ## _pixels_tab[IDX][ 8] = PREFIX ## PFX ## SIZE ## _mc02_ ## CPU; \
+    c->PFX ## _pixels_tab[IDX][ 9] = PREFIX ## PFX ## SIZE ## _mc12_ ## CPU; \
+    c->PFX ## _pixels_tab[IDX][10] = PREFIX ## PFX ## SIZE ## _mc22_ ## CPU; \
+    c->PFX ## _pixels_tab[IDX][11] = PREFIX ## PFX ## SIZE ## _mc32_ ## CPU; \
+    c->PFX ## _pixels_tab[IDX][12] = PREFIX ## PFX ## SIZE ## _mc03_ ## CPU; \
+    c->PFX ## _pixels_tab[IDX][13] = PREFIX ## PFX ## SIZE ## _mc13_ ## CPU; \
+    c->PFX ## _pixels_tab[IDX][14] = PREFIX ## PFX ## SIZE ## _mc23_ ## CPU; \
+    c->PFX ## _pixels_tab[IDX][15] = PREFIX ## PFX ## SIZE ## _mc33_ ## CPU; \
+    } while (0)
+
+static av_cold void dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx,
+                                     int cpu_flags)
+{
+#if HAVE_MMX_INLINE
+    const int high_bit_depth = avctx->bits_per_raw_sample > 8;
+
+    c->put_pixels_clamped        = ff_put_pixels_clamped_mmx;
+    c->put_signed_pixels_clamped = ff_put_signed_pixels_clamped_mmx;
+    c->add_pixels_clamped        = ff_add_pixels_clamped_mmx;
+
+    if (!high_bit_depth) {
+        c->clear_block  = ff_clear_block_mmx;
+        c->clear_blocks = ff_clear_blocks_mmx;
+        c->draw_edges   = ff_draw_edges_mmx;
+
+        switch (avctx->idct_algo) {
+        case FF_IDCT_AUTO:
+        case FF_IDCT_SIMPLEMMX:
+            c->idct_put              = ff_simple_idct_put_mmx;
+            c->idct_add              = ff_simple_idct_add_mmx;
+            c->idct                  = ff_simple_idct_mmx;
+            c->idct_permutation_type = FF_SIMPLE_IDCT_PERM;
+            break;
+        case FF_IDCT_XVIDMMX:
+            c->idct_put              = ff_idct_xvid_mmx_put;
+            c->idct_add              = ff_idct_xvid_mmx_add;
+            c->idct                  = ff_idct_xvid_mmx;
+            break;
+        }
+    }
+
+    c->gmc = ff_gmc_mmx;
+
+    c->add_bytes = ff_add_bytes_mmx;
+#endif /* HAVE_MMX_INLINE */
+
+#if HAVE_MMX_EXTERNAL
+    c->vector_clip_int32 = ff_vector_clip_int32_mmx;
+#endif /* HAVE_MMX_EXTERNAL */
+}
+
+static av_cold void dsputil_init_mmxext(DSPContext *c, AVCodecContext *avctx,
+                                        int cpu_flags)
+{
+#if HAVE_MMXEXT_INLINE
+    const int high_bit_depth = avctx->bits_per_raw_sample > 8;
+
+    if (!high_bit_depth && avctx->idct_algo == FF_IDCT_XVIDMMX) {
+        c->idct_put = ff_idct_xvid_mmxext_put;
+        c->idct_add = ff_idct_xvid_mmxext_add;
+        c->idct     = ff_idct_xvid_mmxext;
+    }
+#endif /* HAVE_MMXEXT_INLINE */
+
+#if HAVE_MMXEXT_EXTERNAL
+    SET_QPEL_FUNCS(avg_qpel,        0, 16, mmxext, );
+    SET_QPEL_FUNCS(avg_qpel,        1,  8, mmxext, );
+
+    SET_QPEL_FUNCS(put_qpel,        0, 16, mmxext, );
+    SET_QPEL_FUNCS(put_qpel,        1,  8, mmxext, );
+    SET_QPEL_FUNCS(put_no_rnd_qpel, 0, 16, mmxext, );
+    SET_QPEL_FUNCS(put_no_rnd_qpel, 1,  8, mmxext, );
+
+    /* slower than cmov version on AMD */
+    if (!(cpu_flags & AV_CPU_FLAG_3DNOW))
+        c->add_hfyu_median_prediction = ff_add_hfyu_median_prediction_mmxext;
+
+    c->scalarproduct_int16          = ff_scalarproduct_int16_mmxext;
+    c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_mmxext;
+#endif /* HAVE_MMXEXT_EXTERNAL */
+}
+
+static av_cold void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx,
+                                     int cpu_flags)
+{
+#if HAVE_SSE_INLINE
+    const int high_bit_depth = avctx->bits_per_raw_sample > 8;
+
+    c->vector_clipf = ff_vector_clipf_sse;
+
+#if FF_API_XVMC
+FF_DISABLE_DEPRECATION_WARNINGS
+    /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */
+    if (CONFIG_MPEG_XVMC_DECODER && avctx->xvmc_acceleration > 1)
+        return;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif /* FF_API_XVMC */
+
+    if (!high_bit_depth) {
+        c->clear_block  = ff_clear_block_sse;
+        c->clear_blocks = ff_clear_blocks_sse;
+    }
+#endif /* HAVE_SSE_INLINE */
+}
+
+static av_cold void dsputil_init_sse2(DSPContext *c, AVCodecContext *avctx,
+                                      int cpu_flags)
+{
+#if HAVE_SSE2_INLINE
+    const int high_bit_depth = avctx->bits_per_raw_sample > 8;
+
+    if (!high_bit_depth && avctx->idct_algo == FF_IDCT_XVIDMMX) {
+        c->idct_put              = ff_idct_xvid_sse2_put;
+        c->idct_add              = ff_idct_xvid_sse2_add;
+        c->idct                  = ff_idct_xvid_sse2;
+        c->idct_permutation_type = FF_SSE2_IDCT_PERM;
+    }
+#endif /* HAVE_SSE2_INLINE */
+
+#if HAVE_SSE2_EXTERNAL
+    c->scalarproduct_int16          = ff_scalarproduct_int16_sse2;
+    c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_sse2;
+    if (cpu_flags & AV_CPU_FLAG_ATOM) {
+        c->vector_clip_int32 = ff_vector_clip_int32_int_sse2;
+    } else {
+        c->vector_clip_int32 = ff_vector_clip_int32_sse2;
+    }
+    c->bswap_buf = ff_bswap32_buf_sse2;
+#endif /* HAVE_SSE2_EXTERNAL */
+}
+
+static av_cold void dsputil_init_ssse3(DSPContext *c, AVCodecContext *avctx,
+                                       int cpu_flags)
+{
+#if HAVE_SSSE3_EXTERNAL
+    c->add_hfyu_left_prediction = ff_add_hfyu_left_prediction_ssse3;
+    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_SSE42 | AV_CPU_FLAG_3DNOW))) // cachesplit
+        c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_ssse3;
+    c->bswap_buf = ff_bswap32_buf_ssse3;
+#endif /* HAVE_SSSE3_EXTERNAL */
+}
+
+static av_cold void dsputil_init_sse4(DSPContext *c, AVCodecContext *avctx,
+                                      int cpu_flags)
+{
+#if HAVE_SSE4_EXTERNAL
+    c->vector_clip_int32 = ff_vector_clip_int32_sse4;
+#endif /* HAVE_SSE4_EXTERNAL */
+}
+
+av_cold void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx)
+{
+    int cpu_flags = av_get_cpu_flags();
+
+#if HAVE_7REGS && HAVE_INLINE_ASM
+    if (cpu_flags & AV_CPU_FLAG_CMOV)
+        c->add_hfyu_median_prediction = ff_add_hfyu_median_prediction_cmov;
+#endif
+
+    if (X86_MMX(cpu_flags))
+        dsputil_init_mmx(c, avctx, cpu_flags);
+
+    if (X86_MMXEXT(cpu_flags))
+        dsputil_init_mmxext(c, avctx, cpu_flags);
+
+    if (X86_SSE(cpu_flags))
+        dsputil_init_sse(c, avctx, cpu_flags);
+
+    if (X86_SSE2(cpu_flags))
+        dsputil_init_sse2(c, avctx, cpu_flags);
+
+    if (EXTERNAL_SSSE3(cpu_flags))
+        dsputil_init_ssse3(c, avctx, cpu_flags);
+
+    if (EXTERNAL_SSE4(cpu_flags))
+        dsputil_init_sse4(c, avctx, cpu_flags);
+
+    if (CONFIG_ENCODERS)
+        ff_dsputilenc_init_mmx(c, avctx);
+}

libav-v9.6.tar.bz2/libavcodec/x86/dsputil_mmx.c -> libav-v10.1.tar.bz2/libavcodec/x86/dsputil_mmx.c Changed

@@ -22,220 +22,18 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "config.h"
 #include "libavutil/cpu.h"
 #include "libavutil/x86/asm.h"
-#include "libavcodec/dsputil.h"
-#include "libavcodec/h264dsp.h"
-#include "libavcodec/mpegvideo.h"
-#include "libavcodec/simple_idct.h"
-#include "dsputil_mmx.h"
-#include "idct_xvid.h"
-
-//#undef NDEBUG
-//#include <assert.h>
-
-/* pixel operations */
-DECLARE_ALIGNED(8, const uint64_t, ff_bone) = 0x0101010101010101ULL;
-DECLARE_ALIGNED(8, const uint64_t, ff_wtwo) = 0x0002000200020002ULL;
-
-DECLARE_ALIGNED(16, const uint64_t, ff_pdw_80000000)[2] =
- { 0x8000000080000000ULL, 0x8000000080000000ULL };
-
-DECLARE_ALIGNED(16, const xmm_reg, ff_pw_1) = { 0x0001000100010001ULL, 0x0001000100010001ULL };
-DECLARE_ALIGNED(16, const xmm_reg, ff_pw_2) = { 0x0002000200020002ULL, 0x0002000200020002ULL };
-DECLARE_ALIGNED(16, const xmm_reg, ff_pw_3) = { 0x0003000300030003ULL, 0x0003000300030003ULL };
-DECLARE_ALIGNED(16, const xmm_reg, ff_pw_4) = { 0x0004000400040004ULL, 0x0004000400040004ULL };
-DECLARE_ALIGNED(16, const xmm_reg, ff_pw_5) = { 0x0005000500050005ULL, 0x0005000500050005ULL };
-DECLARE_ALIGNED(16, const xmm_reg, ff_pw_8) = { 0x0008000800080008ULL, 0x0008000800080008ULL };
-DECLARE_ALIGNED(16, const xmm_reg, ff_pw_9) = { 0x0009000900090009ULL, 0x0009000900090009ULL };
-DECLARE_ALIGNED(8, const uint64_t, ff_pw_15) = 0x000F000F000F000FULL;
-DECLARE_ALIGNED(16, const xmm_reg, ff_pw_16) = { 0x0010001000100010ULL, 0x0010001000100010ULL };
-DECLARE_ALIGNED(16, const xmm_reg, ff_pw_17) = { 0x0011001100110011ULL, 0x0011001100110011ULL };
-DECLARE_ALIGNED(16, const xmm_reg, ff_pw_18) = { 0x0012001200120012ULL, 0x0012001200120012ULL };
-DECLARE_ALIGNED(8, const uint64_t, ff_pw_20) = 0x0014001400140014ULL;
-DECLARE_ALIGNED(16, const xmm_reg, ff_pw_27) = { 0x001B001B001B001BULL, 0x001B001B001B001BULL };
-DECLARE_ALIGNED(16, const xmm_reg, ff_pw_28) = { 0x001C001C001C001CULL, 0x001C001C001C001CULL };
-DECLARE_ALIGNED(16, const xmm_reg, ff_pw_32) = { 0x0020002000200020ULL, 0x0020002000200020ULL };
-DECLARE_ALIGNED(8, const uint64_t, ff_pw_42) = 0x002A002A002A002AULL;
-DECLARE_ALIGNED(8, const uint64_t, ff_pw_53) = 0x0035003500350035ULL;
-DECLARE_ALIGNED(16, const xmm_reg, ff_pw_63) = { 0x003F003F003F003FULL, 0x003F003F003F003FULL };
-DECLARE_ALIGNED(16, const xmm_reg, ff_pw_64) = { 0x0040004000400040ULL, 0x0040004000400040ULL };
-DECLARE_ALIGNED(8, const uint64_t, ff_pw_96) = 0x0060006000600060ULL;
-DECLARE_ALIGNED(8, const uint64_t, ff_pw_128) = 0x0080008000800080ULL;
-DECLARE_ALIGNED(8, const uint64_t, ff_pw_255) = 0x00ff00ff00ff00ffULL;
-DECLARE_ALIGNED(16, const xmm_reg, ff_pw_512) = { 0x0200020002000200ULL, 0x0200020002000200ULL };
-DECLARE_ALIGNED(16, const xmm_reg, ff_pw_1019) = { 0x03FB03FB03FB03FBULL, 0x03FB03FB03FB03FBULL };
-
-DECLARE_ALIGNED(16, const xmm_reg, ff_pb_0) = { 0x0000000000000000ULL, 0x0000000000000000ULL };
-DECLARE_ALIGNED(16, const xmm_reg, ff_pb_1) = { 0x0101010101010101ULL, 0x0101010101010101ULL };
-DECLARE_ALIGNED(16, const xmm_reg, ff_pb_3) = { 0x0303030303030303ULL, 0x0303030303030303ULL };
-DECLARE_ALIGNED(16, const xmm_reg, ff_pb_4) = { 0x0404040404040404ULL, 0x0404040404040404ULL };
-DECLARE_ALIGNED(8, const uint64_t, ff_pb_7) = 0x0707070707070707ULL;
-DECLARE_ALIGNED(8, const uint64_t, ff_pb_1F) = 0x1F1F1F1F1F1F1F1FULL;
-DECLARE_ALIGNED(8, const uint64_t, ff_pb_3F) = 0x3F3F3F3F3F3F3F3FULL;
-DECLARE_ALIGNED(16, const xmm_reg, ff_pb_80) = { 0x8080808080808080ULL, 0x8080808080808080ULL };
-DECLARE_ALIGNED(8, const uint64_t, ff_pb_81) = 0x8181818181818181ULL;
-DECLARE_ALIGNED(16, const xmm_reg, ff_pb_A1) = { 0xA1A1A1A1A1A1A1A1ULL, 0xA1A1A1A1A1A1A1A1ULL };
-DECLARE_ALIGNED(16, const xmm_reg, ff_pb_F8) = { 0xF8F8F8F8F8F8F8F8ULL, 0xF8F8F8F8F8F8F8F8ULL };
-DECLARE_ALIGNED(8, const uint64_t, ff_pb_FC) = 0xFCFCFCFCFCFCFCFCULL;
-DECLARE_ALIGNED(16, const xmm_reg, ff_pb_FE) = { 0xFEFEFEFEFEFEFEFEULL, 0xFEFEFEFEFEFEFEFEULL };
-
-DECLARE_ALIGNED(16, const double, ff_pd_1)[2] = { 1.0, 1.0 };
-DECLARE_ALIGNED(16, const double, ff_pd_2)[2] = { 2.0, 2.0 };
+#include "constants.h"
+#include "dsputil_x86.h"
 
 #if HAVE_INLINE_ASM
 
-#define JUMPALIGN() __asm__ volatile (".p2align 3"::)
-#define MOVQ_ZERO(regd) __asm__ volatile ("pxor %%"#regd", %%"#regd ::)
-
-#define MOVQ_BFE(regd) \
- __asm__ volatile ( \
- "pcmpeqd %%"#regd", %%"#regd" \n\t" \
- "paddb %%"#regd", %%"#regd" \n\t" ::)
-
-#ifndef PIC
-#define MOVQ_BONE(regd) __asm__ volatile ("movq %0, %%"#regd" \n\t" :: "m"(ff_bone))
-#define MOVQ_WTWO(regd) __asm__ volatile ("movq %0, %%"#regd" \n\t" :: "m"(ff_wtwo))
-#else
-// for shared library it's better to use this way for accessing constants
-// pcmpeqd -> -1
-#define MOVQ_BONE(regd) \
- __asm__ volatile ( \
- "pcmpeqd %%"#regd", %%"#regd" \n\t" \
- "psrlw $15, %%"#regd" \n\t" \
- "packuswb %%"#regd", %%"#regd" \n\t" ::)
-
-#define MOVQ_WTWO(regd) \
- __asm__ volatile ( \
- "pcmpeqd %%"#regd", %%"#regd" \n\t" \
- "psrlw $15, %%"#regd" \n\t" \
- "psllw $1, %%"#regd" \n\t"::)
-
-#endif
-
-// using regr as temporary and for the output result
-// first argument is unmodifed and second is trashed
-// regfe is supposed to contain 0xfefefefefefefefe
-#define PAVGB_MMX_NO_RND(rega, regb, regr, regfe) \
- "movq "#rega", "#regr" \n\t" \
- "pand "#regb", "#regr" \n\t" \
- "pxor "#rega", "#regb" \n\t" \
- "pand "#regfe", "#regb" \n\t" \
- "psrlq $1, "#regb" \n\t" \
- "paddb "#regb", "#regr" \n\t"
-
-#define PAVGB_MMX(rega, regb, regr, regfe) \
- "movq "#rega", "#regr" \n\t" \
- "por "#regb", "#regr" \n\t" \
- "pxor "#rega", "#regb" \n\t" \
- "pand "#regfe", "#regb" \n\t" \
- "psrlq $1, "#regb" \n\t" \
- "psubb "#regb", "#regr" \n\t"
-
-// mm6 is supposed to contain 0xfefefefefefefefe
-#define PAVGBP_MMX_NO_RND(rega, regb, regr, regc, regd, regp) \
- "movq "#rega", "#regr" \n\t" \
- "movq "#regc", "#regp" \n\t" \
- "pand "#regb", "#regr" \n\t" \
- "pand "#regd", "#regp" \n\t" \
- "pxor "#rega", "#regb" \n\t" \
- "pxor "#regc", "#regd" \n\t" \
- "pand %%mm6, "#regb" \n\t" \
- "pand %%mm6, "#regd" \n\t" \
- "psrlq $1, "#regb" \n\t" \
- "psrlq $1, "#regd" \n\t" \
- "paddb "#regb", "#regr" \n\t" \
- "paddb "#regd", "#regp" \n\t"
-
-#define PAVGBP_MMX(rega, regb, regr, regc, regd, regp) \
- "movq "#rega", "#regr" \n\t" \
- "movq "#regc", "#regp" \n\t" \
- "por "#regb", "#regr" \n\t" \
- "por "#regd", "#regp" \n\t" \
- "pxor "#rega", "#regb" \n\t" \
- "pxor "#regc", "#regd" \n\t" \
- "pand %%mm6, "#regb" \n\t" \
- "pand %%mm6, "#regd" \n\t" \
- "psrlq $1, "#regd" \n\t" \
- "psrlq $1, "#regb" \n\t" \
- "psubb "#regb", "#regr" \n\t" \
- "psubb "#regd", "#regp" \n\t"
-
-/***********************************/
-/* MMX no rounding */
-#define DEF(x, y) x ## _no_rnd_ ## y ## _mmx
-#define SET_RND MOVQ_WONE
-#define PAVGBP(a, b, c, d, e, f) PAVGBP_MMX_NO_RND(a, b, c, d, e, f)
-#define PAVGB(a, b, c, e) PAVGB_MMX_NO_RND(a, b, c, e)
-#define OP_AVG(a, b, c, e) PAVGB_MMX(a, b, c, e)
-
-#include "dsputil_rnd_template.c"
-
-#undef DEF
-#undef SET_RND
-#undef PAVGBP
-#undef PAVGB
-/***********************************/
-/* MMX rounding */
-
-#define DEF(x, y) x ## _ ## y ## _mmx
-#define SET_RND MOVQ_WTWO
-#define PAVGBP(a, b, c, d, e, f) PAVGBP_MMX(a, b, c, d, e, f)
-#define PAVGB(a, b, c, e) PAVGB_MMX(a, b, c, e)
-
-#include "dsputil_rnd_template.c"
-
-#undef DEF
-#undef SET_RND
-#undef PAVGBP
-#undef PAVGB
-#undef OP_AVG
-
-/***********************************/
-/* 3Dnow specific */
-
-#define DEF(x) x ## _3dnow
-#define PAVGB "pavgusb"
-#define OP_AVG PAVGB
-#define SKIP_FOR_3DNOW
-
-#include "dsputil_avg_template.c"
-
-#undef DEF
-#undef PAVGB
-#undef OP_AVG
-#undef SKIP_FOR_3DNOW
-
-/***********************************/
-/* MMXEXT specific */
-
-#define DEF(x) x ## _mmxext
-
-/* Introduced only in MMXEXT set */
-#define PAVGB "pavgb"
-#define OP_AVG PAVGB
-
-#include "dsputil_avg_template.c"
-
-#undef DEF
-#undef PAVGB
-#undef OP_AVG
-
-#define put_no_rnd_pixels16_mmx put_pixels16_mmx
-#define put_no_rnd_pixels8_mmx put_pixels8_mmx
-#define put_pixels16_mmxext put_pixels16_mmx
-#define put_pixels8_mmxext put_pixels8_mmx
-#define put_pixels4_mmxext put_pixels4_mmx
-#define put_no_rnd_pixels16_mmxext put_no_rnd_pixels16_mmx
-#define put_no_rnd_pixels8_mmxext put_no_rnd_pixels8_mmx
-
-/***********************************/
-/* standard MMX */
-
-void ff_put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels,
+void ff_put_pixels_clamped_mmx(const int16_t *block, uint8_t *pixels,
 int line_size)
 {
- const DCTELEM *p;
+ const int16_t *p;
 uint8_t *pix;
 
 /* read the pixels */
@@ -307,7 +105,7 @@
 "movq %%mm3, (%0, %3, 2) \n\t" \
 "movq %%mm4, (%0, %1) \n\t"
 
-void ff_put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels,
+void ff_put_signed_pixels_clamped_mmx(const int16_t *block, uint8_t *pixels,
 int line_size)
 {
 x86_reg line_skip = line_size;
@@ -324,10 +122,10 @@
 : "memory");
 }
 
-void ff_add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels,
+void ff_add_pixels_clamped_mmx(const int16_t *block, uint8_t *pixels,
 int line_size)
 {
- const DCTELEM *p;
+ const int16_t *p;
 uint8_t *pix;
 int i;
 
@@ -366,70 +164,8 @@
 } while (--i);
 }
 
-static void put_pixels8_mmx(uint8_t *block, const uint8_t *pixels,
- int line_size, int h)
-{
- __asm__ volatile (
- "lea (%3, %3), %%"REG_a" \n\t"
- ".p2align 3 \n\t"
- "1: \n\t"
- "movq (%1 ), %%mm0 \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- "movq %%mm0, (%2) \n\t"
- "movq %%mm1, (%2, %3) \n\t"
- "add %%"REG_a", %1 \n\t"
- "add %%"REG_a", %2 \n\t"
- "movq (%1 ), %%mm0 \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- "movq %%mm0, (%2) \n\t"
- "movq %%mm1, (%2, %3) \n\t"
- "add %%"REG_a", %1 \n\t"
- "add %%"REG_a", %2 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
- : "+g"(h), "+r"(pixels), "+r"(block)
- : "r"((x86_reg)line_size)
- : "%"REG_a, "memory"
- );
-}
-
-static void put_pixels16_mmx(uint8_t *block, const uint8_t *pixels,
- int line_size, int h)
-{
- __asm__ volatile (
- "lea (%3, %3), %%"REG_a" \n\t"
- ".p2align 3 \n\t"
- "1: \n\t"
- "movq (%1 ), %%mm0 \n\t"
- "movq 8(%1 ), %%mm4 \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- "movq 8(%1, %3), %%mm5 \n\t"
- "movq %%mm0, (%2) \n\t"
- "movq %%mm4, 8(%2) \n\t"
- "movq %%mm1, (%2, %3) \n\t"
- "movq %%mm5, 8(%2, %3) \n\t"
- "add %%"REG_a", %1 \n\t"
- "add %%"REG_a", %2 \n\t"
- "movq (%1 ), %%mm0 \n\t"
- "movq 8(%1 ), %%mm4 \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- "movq 8(%1, %3), %%mm5 \n\t"
- "movq %%mm0, (%2) \n\t"
- "movq %%mm4, 8(%2) \n\t"
- "movq %%mm1, (%2, %3) \n\t"
- "movq %%mm5, 8(%2, %3) \n\t"
- "add %%"REG_a", %1 \n\t"
- "add %%"REG_a", %2 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
- : "+g"(h), "+r"(pixels), "+r"(block)
- : "r"((x86_reg)line_size)
- : "%"REG_a, "memory"
- );
-}
-
 #define CLEAR_BLOCKS(name, n) \
-static void name(DCTELEM *blocks) \
+void name(int16_t *blocks) \
 { \
 __asm__ volatile ( \
 "pxor %%mm7, %%mm7 \n\t" \
@@ -446,10 +182,10 @@
 : "%"REG_a \
 ); \
 }
-CLEAR_BLOCKS(clear_blocks_mmx, 6)
-CLEAR_BLOCKS(clear_block_mmx, 1)
+CLEAR_BLOCKS(ff_clear_blocks_mmx, 6)
+CLEAR_BLOCKS(ff_clear_block_mmx, 1)
 
-static void clear_block_sse(DCTELEM *block)
+void ff_clear_block_sse(int16_t *block)
 {
 __asm__ volatile (
 "xorps %%xmm0, %%xmm0 \n"
@@ -466,7 +202,7 @@
 );
 }
 
-static void clear_blocks_sse(DCTELEM *blocks)
+void ff_clear_blocks_sse(int16_t *blocks)
 {
 __asm__ volatile (
 "xorps %%xmm0, %%xmm0 \n"
@@ -488,7 +224,7 @@
 );
 }
 
-static void add_bytes_mmx(uint8_t *dst, uint8_t *src, int w)
+void ff_add_bytes_mmx(uint8_t *dst, uint8_t *src, int w)
 {
 x86_reg i = 0;
 __asm__ volatile (
@@ -513,222 +249,10 @@
 dst[i + 0] += src[i + 0];
 }
 
-#if HAVE_7REGS
-static void add_hfyu_median_prediction_cmov(uint8_t *dst, const uint8_t *top,
- const uint8_t *diff, int w,
- int *left, int *left_top)
-{
- x86_reg w2 = -w;
- x86_reg x;
- int l = *left & 0xff;
- int tl = *left_top & 0xff;
- int t;
- __asm__ volatile (
- "mov %7, %3 \n"
- "1: \n"
- "movzbl (%3, %4), %2 \n"
- "mov %2, %k3 \n"
- "sub %b1, %b3 \n"
- "add %b0, %b3 \n"
- "mov %2, %1 \n"
- "cmp %0, %2 \n"
- "cmovg %0, %2 \n"
- "cmovg %1, %0 \n"
- "cmp %k3, %0 \n"
- "cmovg %k3, %0 \n"
- "mov %7, %3 \n"
- "cmp %2, %0 \n"
- "cmovl %2, %0 \n"
- "add (%6, %4), %b0 \n"
- "mov %b0, (%5, %4) \n"
- "inc %4 \n"
- "jl 1b \n"
- : "+&q"(l), "+&q"(tl), "=&r"(t), "=&q"(x), "+&r"(w2)
- : "r"(dst + w), "r"(diff + w), "rm"(top + w)
- );
- *left = l;
- *left_top = tl;
-}
-#endif
-
-static inline void transpose4x4(uint8_t *dst, uint8_t *src, x86_reg dst_stride, x86_reg src_stride){
- __asm__ volatile( //FIXME could save 1 instruction if done as 8x4 ...
- "movd (%1), %%mm0 \n\t"
- "add %3, %1 \n\t"
- "movd (%1), %%mm1 \n\t"
- "movd (%1,%3,1), %%mm2 \n\t"
- "movd (%1,%3,2), %%mm3 \n\t"
- "punpcklbw %%mm1, %%mm0 \n\t"
- "punpcklbw %%mm3, %%mm2 \n\t"
- "movq %%mm0, %%mm1 \n\t"
- "punpcklwd %%mm2, %%mm0 \n\t"
- "punpckhwd %%mm2, %%mm1 \n\t"
- "movd %%mm0, (%0) \n\t"
- "add %2, %0 \n\t"
- "punpckhdq %%mm0, %%mm0 \n\t"
- "movd %%mm0, (%0) \n\t"
- "movd %%mm1, (%0,%2,1) \n\t"
- "punpckhdq %%mm1, %%mm1 \n\t"
- "movd %%mm1, (%0,%2,2) \n\t"
-
- : "+&r" (dst),
- "+&r" (src)
- : "r" (dst_stride),
- "r" (src_stride)
- : "memory"
- );
-}
-
-#define H263_LOOP_FILTER \
- "pxor %%mm7, %%mm7 \n\t" \
- "movq %0, %%mm0 \n\t" \
- "movq %0, %%mm1 \n\t" \
- "movq %3, %%mm2 \n\t" \
- "movq %3, %%mm3 \n\t" \
- "punpcklbw %%mm7, %%mm0 \n\t" \
- "punpckhbw %%mm7, %%mm1 \n\t" \
- "punpcklbw %%mm7, %%mm2 \n\t" \
- "punpckhbw %%mm7, %%mm3 \n\t" \
- "psubw %%mm2, %%mm0 \n\t" \
- "psubw %%mm3, %%mm1 \n\t" \
- "movq %1, %%mm2 \n\t" \
- "movq %1, %%mm3 \n\t" \
- "movq %2, %%mm4 \n\t" \
- "movq %2, %%mm5 \n\t" \
- "punpcklbw %%mm7, %%mm2 \n\t" \
- "punpckhbw %%mm7, %%mm3 \n\t" \
- "punpcklbw %%mm7, %%mm4 \n\t" \
- "punpckhbw %%mm7, %%mm5 \n\t" \
- "psubw %%mm2, %%mm4 \n\t" \
- "psubw %%mm3, %%mm5 \n\t" \
- "psllw $2, %%mm4 \n\t" \
- "psllw $2, %%mm5 \n\t" \
- "paddw %%mm0, %%mm4 \n\t" \
- "paddw %%mm1, %%mm5 \n\t" \
- "pxor %%mm6, %%mm6 \n\t" \
- "pcmpgtw %%mm4, %%mm6 \n\t" \
- "pcmpgtw %%mm5, %%mm7 \n\t" \
- "pxor %%mm6, %%mm4 \n\t" \
- "pxor %%mm7, %%mm5 \n\t" \
- "psubw %%mm6, %%mm4 \n\t" \
- "psubw %%mm7, %%mm5 \n\t" \
- "psrlw $3, %%mm4 \n\t" \
- "psrlw $3, %%mm5 \n\t" \
- "packuswb %%mm5, %%mm4 \n\t" \
- "packsswb %%mm7, %%mm6 \n\t" \
- "pxor %%mm7, %%mm7 \n\t" \
- "movd %4, %%mm2 \n\t" \
- "punpcklbw %%mm2, %%mm2 \n\t" \
- "punpcklbw %%mm2, %%mm2 \n\t" \
- "punpcklbw %%mm2, %%mm2 \n\t" \
- "psubusb %%mm4, %%mm2 \n\t" \
- "movq %%mm2, %%mm3 \n\t" \
- "psubusb %%mm4, %%mm3 \n\t" \
- "psubb %%mm3, %%mm2 \n\t" \
- "movq %1, %%mm3 \n\t" \
- "movq %2, %%mm4 \n\t" \
- "pxor %%mm6, %%mm3 \n\t" \
- "pxor %%mm6, %%mm4 \n\t" \
- "paddusb %%mm2, %%mm3 \n\t" \
- "psubusb %%mm2, %%mm4 \n\t" \
- "pxor %%mm6, %%mm3 \n\t" \
- "pxor %%mm6, %%mm4 \n\t" \
- "paddusb %%mm2, %%mm2 \n\t" \
- "packsswb %%mm1, %%mm0 \n\t" \
- "pcmpgtb %%mm0, %%mm7 \n\t" \
- "pxor %%mm7, %%mm0 \n\t" \
- "psubb %%mm7, %%mm0 \n\t" \
- "movq %%mm0, %%mm1 \n\t" \
- "psubusb %%mm2, %%mm0 \n\t" \
- "psubb %%mm0, %%mm1 \n\t" \
- "pand %5, %%mm1 \n\t" \
- "psrlw $2, %%mm1 \n\t" \
- "pxor %%mm7, %%mm1 \n\t" \
- "psubb %%mm7, %%mm1 \n\t" \
- "movq %0, %%mm5 \n\t" \
- "movq %3, %%mm6 \n\t" \
- "psubb %%mm1, %%mm5 \n\t" \
- "paddb %%mm1, %%mm6 \n\t"
-
-static void h263_v_loop_filter_mmx(uint8_t *src, int stride, int qscale)
-{
- if (CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
- const int strength = ff_h263_loop_filter_strength[qscale];
-
- __asm__ volatile (
- H263_LOOP_FILTER
-
- "movq %%mm3, %1 \n\t"
- "movq %%mm4, %2 \n\t"
- "movq %%mm5, %0 \n\t"
- "movq %%mm6, %3 \n\t"
- : "+m"(*(uint64_t*)(src - 2 * stride)),
- "+m"(*(uint64_t*)(src - 1 * stride)),
- "+m"(*(uint64_t*)(src + 0 * stride)),
- "+m"(*(uint64_t*)(src + 1 * stride))
- : "g"(2 * strength), "m"(ff_pb_FC)
- );
- }
-}
-
-static void h263_h_loop_filter_mmx(uint8_t *src, int stride, int qscale)
-{
- if (CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
- const int strength = ff_h263_loop_filter_strength[qscale];
- DECLARE_ALIGNED(8, uint64_t, temp)[4];
- uint8_t *btemp = (uint8_t*)temp;
-
- src -= 2;
-
- transpose4x4(btemp, src, 8, stride);
- transpose4x4(btemp + 4, src + 4 * stride, 8, stride);
- __asm__ volatile (
- H263_LOOP_FILTER // 5 3 4 6
-
- : "+m"(temp[0]),
- "+m"(temp[1]),
- "+m"(temp[2]),
- "+m"(temp[3])
- : "g"(2 * strength), "m"(ff_pb_FC)
- );
-
- __asm__ volatile (
- "movq %%mm5, %%mm1 \n\t"
- "movq %%mm4, %%mm0 \n\t"
- "punpcklbw %%mm3, %%mm5 \n\t"
- "punpcklbw %%mm6, %%mm4 \n\t"
- "punpckhbw %%mm3, %%mm1 \n\t"
- "punpckhbw %%mm6, %%mm0 \n\t"
- "movq %%mm5, %%mm3 \n\t"
- "movq %%mm1, %%mm6 \n\t"
- "punpcklwd %%mm4, %%mm5 \n\t"
- "punpcklwd %%mm0, %%mm1 \n\t"
- "punpckhwd %%mm4, %%mm3 \n\t"
- "punpckhwd %%mm0, %%mm6 \n\t"
- "movd %%mm5, (%0) \n\t"
- "punpckhdq %%mm5, %%mm5 \n\t"
- "movd %%mm5, (%0, %2) \n\t"
- "movd %%mm3, (%0, %2, 2) \n\t"
- "punpckhdq %%mm3, %%mm3 \n\t"
- "movd %%mm3, (%0, %3) \n\t"
- "movd %%mm1, (%1) \n\t"
- "punpckhdq %%mm1, %%mm1 \n\t"
- "movd %%mm1, (%1, %2) \n\t"
- "movd %%mm6, (%1, %2, 2) \n\t"
- "punpckhdq %%mm6, %%mm6 \n\t"
- "movd %%mm6, (%1, %3) \n\t"
- :: "r"(src),
- "r"(src + 4 * stride),
- "r"((x86_reg)stride),
- "r"((x86_reg)(3 * stride))
- );
- }
-}
-
 /* Draw the edges of width 'w' of an image of size width, height
 * this MMX version can only handle w == 8 || w == 16. */
-static void draw_edges_mmx(uint8_t *buf, int wrap, int width, int height,
- int w, int h, int sides)
+void ff_draw_edges_mmx(uint8_t *buf, int wrap, int width, int height,
+ int w, int h, int sides)
 {
 uint8_t *ptr, *last_line;
 int i;
@@ -821,824 +345,10 @@
 }
 }
 
-#define QPEL_V_LOW(m3, m4, m5, m6, pw_20, pw_3, rnd, \
- in0, in1, in2, in7, out, OP) \
- "paddw "#m4", "#m3" \n\t" /* x1 */ \
- "movq "MANGLE(ff_pw_20)", %%mm4 \n\t" /* 20 */ \
- "pmullw "#m3", %%mm4 \n\t" /* 20x1 */ \
- "movq "#in7", "#m3" \n\t" /* d */ \
- "movq "#in0", %%mm5 \n\t" /* D */ \
- "paddw "#m3", %%mm5 \n\t" /* x4 */ \
- "psubw %%mm5, %%mm4 \n\t" /* 20x1 - x4 */ \
- "movq "#in1", %%mm5 \n\t" /* C */ \
- "movq "#in2", %%mm6 \n\t" /* B */ \
- "paddw "#m6", %%mm5 \n\t" /* x3 */ \
- "paddw "#m5", %%mm6 \n\t" /* x2 */ \
- "paddw %%mm6, %%mm6 \n\t" /* 2x2 */ \
- "psubw %%mm6, %%mm5 \n\t" /* -2x2 + x3 */ \
- "pmullw "MANGLE(ff_pw_3)", %%mm5 \n\t" /* -6x2 + 3x3 */ \
- "paddw "#rnd", %%mm4 \n\t" /* x2 */ \
- "paddw %%mm4, %%mm5 \n\t" /* 20x1 - 6x2 + 3x3 - x4 */ \
- "psraw $5, %%mm5 \n\t" \
- "packuswb %%mm5, %%mm5 \n\t" \
- OP(%%mm5, out, %%mm7, d)
-
-#define QPEL_BASE(OPNAME, ROUNDER, RND, OP_MMXEXT) \
-static void OPNAME ## mpeg4_qpel16_h_lowpass_mmxext(uint8_t *dst, \
- uint8_t *src, \
- int dstStride, \
- int srcStride, \
- int h) \
-{ \
- uint64_t temp; \
- \
- __asm__ volatile ( \
- "pxor %%mm7, %%mm7 \n\t" \
- "1: \n\t" \
- "movq (%0), %%mm0 \n\t" /* ABCDEFGH */ \
- "movq %%mm0, %%mm1 \n\t" /* ABCDEFGH */ \
- "movq %%mm0, %%mm2 \n\t" /* ABCDEFGH */ \
- "punpcklbw %%mm7, %%mm0 \n\t" /* 0A0B0C0D */ \
- "punpckhbw %%mm7, %%mm1 \n\t" /* 0E0F0G0H */ \
- "pshufw $0x90, %%mm0, %%mm5 \n\t" /* 0A0A0B0C */ \
- "pshufw $0x41, %%mm0, %%mm6 \n\t" /* 0B0A0A0B */ \
- "movq %%mm2, %%mm3 \n\t" /* ABCDEFGH */ \
- "movq %%mm2, %%mm4 \n\t" /* ABCDEFGH */ \
- "psllq $8, %%mm2 \n\t" /* 0ABCDEFG */ \
- "psllq $16, %%mm3 \n\t" /* 00ABCDEF */ \
- "psllq $24, %%mm4 \n\t" /* 000ABCDE */ \
- "punpckhbw %%mm7, %%mm2 \n\t" /* 0D0E0F0G */ \
- "punpckhbw %%mm7, %%mm3 \n\t" /* 0C0D0E0F */ \
- "punpckhbw %%mm7, %%mm4 \n\t" /* 0B0C0D0E */ \
- "paddw %%mm3, %%mm5 \n\t" /* b */ \
- "paddw %%mm2, %%mm6 \n\t" /* c */ \
- "paddw %%mm5, %%mm5 \n\t" /* 2b */ \
- "psubw %%mm5, %%mm6 \n\t" /* c - 2b */ \
- "pshufw $0x06, %%mm0, %%mm5 \n\t" /* 0C0B0A0A */ \
- "pmullw "MANGLE(ff_pw_3)", %%mm6 \n\t" /* 3c - 6b */ \
- "paddw %%mm4, %%mm0 \n\t" /* a */ \
- "paddw %%mm1, %%mm5 \n\t" /* d */ \
- "pmullw "MANGLE(ff_pw_20)", %%mm0 \n\t" /* 20a */ \
- "psubw %%mm5, %%mm0 \n\t" /* 20a - d */ \
- "paddw %6, %%mm6 \n\t" \
- "paddw %%mm6, %%mm0 \n\t" /* 20a - 6b + 3c - d */ \
- "psraw $5, %%mm0 \n\t" \
- "movq %%mm0, %5 \n\t" \
- /* mm1 = EFGH, mm2 = DEFG, mm3 = CDEF, mm4 = BCDE, mm7 = 0 */ \
- \
- "movq 5(%0), %%mm0 \n\t" /* FGHIJKLM */ \
- "movq %%mm0, %%mm5 \n\t" /* FGHIJKLM */ \
- "movq %%mm0, %%mm6 \n\t" /* FGHIJKLM */ \
- "psrlq $8, %%mm0 \n\t" /* GHIJKLM0 */ \
- "psrlq $16, %%mm5 \n\t" /* HIJKLM00 */ \
- "punpcklbw %%mm7, %%mm0 \n\t" /* 0G0H0I0J */ \
- "punpcklbw %%mm7, %%mm5 \n\t" /* 0H0I0J0K */ \
- "paddw %%mm0, %%mm2 \n\t" /* b */ \
- "paddw %%mm5, %%mm3 \n\t" /* c */ \
- "paddw %%mm2, %%mm2 \n\t" /* 2b */ \
- "psubw %%mm2, %%mm3 \n\t" /* c - 2b */ \
- "movq %%mm6, %%mm2 \n\t" /* FGHIJKLM */ \
- "psrlq $24, %%mm6 \n\t" /* IJKLM000 */ \
- "punpcklbw %%mm7, %%mm2 \n\t" /* 0F0G0H0I */ \
- "punpcklbw %%mm7, %%mm6 \n\t" /* 0I0J0K0L */ \
- "pmullw "MANGLE(ff_pw_3)", %%mm3 \n\t" /* 3c - 6b */ \
- "paddw %%mm2, %%mm1 \n\t" /* a */ \
- "paddw %%mm6, %%mm4 \n\t" /* d */ \
- "pmullw "MANGLE(ff_pw_20)", %%mm1 \n\t" /* 20a */ \
- "psubw %%mm4, %%mm3 \n\t" /* - 6b +3c - d */ \
- "paddw %6, %%mm1 \n\t" \
- "paddw %%mm1, %%mm3 \n\t" /* 20a - 6b +3c - d */ \
- "psraw $5, %%mm3 \n\t" \
- "movq %5, %%mm1 \n\t" \
- "packuswb %%mm3, %%mm1 \n\t" \
- OP_MMXEXT(%%mm1, (%1), %%mm4, q) \
- /* mm0 = GHIJ, mm2 = FGHI, mm5 = HIJK, mm6 = IJKL, mm7 = 0 */ \
- \
- "movq 9(%0), %%mm1 \n\t" /* JKLMNOPQ */ \
- "movq %%mm1, %%mm4 \n\t" /* JKLMNOPQ */ \
- "movq %%mm1, %%mm3 \n\t" /* JKLMNOPQ */ \
- "psrlq $8, %%mm1 \n\t" /* KLMNOPQ0 */ \
- "psrlq $16, %%mm4 \n\t" /* LMNOPQ00 */ \
- "punpcklbw %%mm7, %%mm1 \n\t" /* 0K0L0M0N */ \
- "punpcklbw %%mm7, %%mm4 \n\t" /* 0L0M0N0O */ \
- "paddw %%mm1, %%mm5 \n\t" /* b */ \
- "paddw %%mm4, %%mm0 \n\t" /* c */ \
- "paddw %%mm5, %%mm5 \n\t" /* 2b */ \
- "psubw %%mm5, %%mm0 \n\t" /* c - 2b */ \
- "movq %%mm3, %%mm5 \n\t" /* JKLMNOPQ */ \
- "psrlq $24, %%mm3 \n\t" /* MNOPQ000 */ \
- "pmullw "MANGLE(ff_pw_3)", %%mm0 \n\t" /* 3c - 6b */ \
- "punpcklbw %%mm7, %%mm3 \n\t" /* 0M0N0O0P */ \
- "paddw %%mm3, %%mm2 \n\t" /* d */ \
- "psubw %%mm2, %%mm0 \n\t" /* -6b + 3c - d */ \
- "movq %%mm5, %%mm2 \n\t" /* JKLMNOPQ */ \
- "punpcklbw %%mm7, %%mm2 \n\t" /* 0J0K0L0M */ \
- "punpckhbw %%mm7, %%mm5 \n\t" /* 0N0O0P0Q */ \
- "paddw %%mm2, %%mm6 \n\t" /* a */ \
- "pmullw "MANGLE(ff_pw_20)", %%mm6 \n\t" /* 20a */ \
- "paddw %6, %%mm0 \n\t" \
- "paddw %%mm6, %%mm0 \n\t" /* 20a - 6b + 3c - d */ \
- "psraw $5, %%mm0 \n\t" \
- /* mm1 = KLMN, mm2 = JKLM, mm3 = MNOP, */ \
- /* mm4 = LMNO, mm5 = NOPQ mm7 = 0 */ \
- \
- "paddw %%mm5, %%mm3 \n\t" /* a */ \
- "pshufw $0xF9, %%mm5, %%mm6 \n\t" /* 0O0P0Q0Q */ \
- "paddw %%mm4, %%mm6 \n\t" /* b */ \
- "pshufw $0xBE, %%mm5, %%mm4 \n\t" /* 0P0Q0Q0P */ \
- "pshufw $0x6F, %%mm5, %%mm5 \n\t" /* 0Q0Q0P0O */ \
- "paddw %%mm1, %%mm4 \n\t" /* c */ \
- "paddw %%mm2, %%mm5 \n\t" /* d */ \
- "paddw %%mm6, %%mm6 \n\t" /* 2b */ \
- "psubw %%mm6, %%mm4 \n\t" /* c - 2b */ \
- "pmullw "MANGLE(ff_pw_20)", %%mm3 \n\t" /* 20a */ \
- "pmullw "MANGLE(ff_pw_3)", %%mm4 \n\t" /* 3c - 6b */ \
- "psubw %%mm5, %%mm3 \n\t" /* -6b + 3c - d */ \
- "paddw %6, %%mm4 \n\t" \
- "paddw %%mm3, %%mm4 \n\t" /* 20a - 6b + 3c - d */ \
- "psraw $5, %%mm4 \n\t" \
- "packuswb %%mm4, %%mm0 \n\t" \
- OP_MMXEXT(%%mm0, 8(%1), %%mm4, q) \
- \
- "add %3, %0 \n\t" \
- "add %4, %1 \n\t" \
- "decl %2 \n\t" \
- "jnz 1b \n\t" \
- : "+a"(src), "+c"(dst), "+D"(h) \
- : "d"((x86_reg)srcStride), "S"((x86_reg)dstStride), \
- /* "m"(ff_pw_20), "m"(ff_pw_3), */ "m"(temp), "m"(ROUNDER) \
- : "memory" \
- ); \
-} \
- \
-static void OPNAME ## mpeg4_qpel8_h_lowpass_mmxext(uint8_t *dst, \
- uint8_t *src, \
- int dstStride, \
- int srcStride, \
- int h) \
-{ \
- __asm__ volatile ( \
- "pxor %%mm7, %%mm7 \n\t" \
- "1: \n\t" \
- "movq (%0), %%mm0 \n\t" /* ABCDEFGH */ \
- "movq %%mm0, %%mm1 \n\t" /* ABCDEFGH */ \
- "movq %%mm0, %%mm2 \n\t" /* ABCDEFGH */ \
- "punpcklbw %%mm7, %%mm0 \n\t" /* 0A0B0C0D */ \
- "punpckhbw %%mm7, %%mm1 \n\t" /* 0E0F0G0H */ \
- "pshufw $0x90, %%mm0, %%mm5 \n\t" /* 0A0A0B0C */ \
- "pshufw $0x41, %%mm0, %%mm6 \n\t" /* 0B0A0A0B */ \
- "movq %%mm2, %%mm3 \n\t" /* ABCDEFGH */ \
- "movq %%mm2, %%mm4 \n\t" /* ABCDEFGH */ \
- "psllq $8, %%mm2 \n\t" /* 0ABCDEFG */ \
- "psllq $16, %%mm3 \n\t" /* 00ABCDEF */ \
- "psllq $24, %%mm4 \n\t" /* 000ABCDE */ \
- "punpckhbw %%mm7, %%mm2 \n\t" /* 0D0E0F0G */ \
- "punpckhbw %%mm7, %%mm3 \n\t" /* 0C0D0E0F */ \
- "punpckhbw %%mm7, %%mm4 \n\t" /* 0B0C0D0E */ \
- "paddw %%mm3, %%mm5 \n\t" /* b */ \
- "paddw %%mm2, %%mm6 \n\t" /* c */ \
- "paddw %%mm5, %%mm5 \n\t" /* 2b */ \
- "psubw %%mm5, %%mm6 \n\t" /* c - 2b */ \
- "pshufw $0x06, %%mm0, %%mm5 \n\t" /* 0C0B0A0A */ \
- "pmullw "MANGLE(ff_pw_3)", %%mm6 \n\t" /* 3c - 6b */ \
- "paddw %%mm4, %%mm0 \n\t" /* a */ \
- "paddw %%mm1, %%mm5 \n\t" /* d */ \
- "pmullw "MANGLE(ff_pw_20)", %%mm0 \n\t" /* 20a */ \
- "psubw %%mm5, %%mm0 \n\t" /* 20a - d */ \
- "paddw %5, %%mm6 \n\t" \
- "paddw %%mm6, %%mm0 \n\t" /* 20a - 6b + 3c - d */ \
- "psraw $5, %%mm0 \n\t" \
- /* mm1 = EFGH, mm2 = DEFG, mm3 = CDEF, mm4 = BCDE, mm7 = 0 */ \
- \
- "movd 5(%0), %%mm5 \n\t" /* FGHI */ \
- "punpcklbw %%mm7, %%mm5 \n\t" /* 0F0G0H0I */ \
- "pshufw $0xF9, %%mm5, %%mm6 \n\t" /* 0G0H0I0I */ \
- "paddw %%mm5, %%mm1 \n\t" /* a */ \
- "paddw %%mm6, %%mm2 \n\t" /* b */ \
- "pshufw $0xBE, %%mm5, %%mm6 \n\t" /* 0H0I0I0H */ \
- "pshufw $0x6F, %%mm5, %%mm5 \n\t" /* 0I0I0H0G */ \
- "paddw %%mm6, %%mm3 \n\t" /* c */ \
- "paddw %%mm5, %%mm4 \n\t" /* d */ \
- "paddw %%mm2, %%mm2 \n\t" /* 2b */ \
- "psubw %%mm2, %%mm3 \n\t" /* c - 2b */ \
- "pmullw "MANGLE(ff_pw_20)", %%mm1 \n\t" /* 20a */ \
- "pmullw "MANGLE(ff_pw_3)", %%mm3 \n\t" /* 3c - 6b */ \
- "psubw %%mm4, %%mm3 \n\t" /* -6b + 3c - d */ \
- "paddw %5, %%mm1 \n\t" \
- "paddw %%mm1, %%mm3 \n\t" /* 20a - 6b + 3c - d */ \
- "psraw $5, %%mm3 \n\t" \
- "packuswb %%mm3, %%mm0 \n\t" \
- OP_MMXEXT(%%mm0, (%1), %%mm4, q) \
- \
- "add %3, %0 \n\t" \
- "add %4, %1 \n\t" \
- "decl %2 \n\t" \
- "jnz 1b \n\t" \
- : "+a"(src), "+c"(dst), "+d"(h) \
- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), \
- /* "m"(ff_pw_20), "m"(ff_pw_3), */ "m"(ROUNDER) \
- : "memory" \
- ); \
-}
-
-#define QPEL_OP(OPNAME, ROUNDER, RND, OP, MMX) \
-static void OPNAME ## mpeg4_qpel16_v_lowpass_ ## MMX(uint8_t *dst, \
- uint8_t *src, \
- int dstStride, \
- int srcStride) \
-{ \
- uint64_t temp[17 * 4]; \
- uint64_t *temp_ptr = temp; \
- int count = 17; \
- \
- /* FIXME unroll */ \
- __asm__ volatile ( \
- "pxor %%mm7, %%mm7 \n\t" \
- "1: \n\t" \
- "movq (%0), %%mm0 \n\t" \
- "movq (%0), %%mm1 \n\t" \
- "movq 8(%0), %%mm2 \n\t" \
- "movq 8(%0), %%mm3 \n\t" \
- "punpcklbw %%mm7, %%mm0 \n\t" \
- "punpckhbw %%mm7, %%mm1 \n\t" \
- "punpcklbw %%mm7, %%mm2 \n\t" \
- "punpckhbw %%mm7, %%mm3 \n\t" \
- "movq %%mm0, (%1) \n\t" \
- "movq %%mm1, 17 * 8(%1) \n\t" \
- "movq %%mm2, 2 * 17 * 8(%1) \n\t" \
- "movq %%mm3, 3 * 17 * 8(%1) \n\t" \
- "add $8, %1 \n\t" \
- "add %3, %0 \n\t" \
- "decl %2 \n\t" \
- "jnz 1b \n\t" \
- : "+r"(src), "+r"(temp_ptr), "+r"(count) \
- : "r"((x86_reg)srcStride) \
- : "memory" \
- ); \
- \
- temp_ptr = temp; \
- count = 4; \
- \
- /* FIXME reorder for speed */ \
- __asm__ volatile ( \
- /* "pxor %%mm7, %%mm7 \n\t" */ \
- "1: \n\t" \
- "movq (%0), %%mm0 \n\t" \
- "movq 8(%0), %%mm1 \n\t" \
- "movq 16(%0), %%mm2 \n\t" \
- "movq 24(%0), %%mm3 \n\t" \
- QPEL_V_LOW(%%mm0, %%mm1, %%mm2, %%mm3, %5, %6, %5, 16(%0), 8(%0), (%0), 32(%0), (%1), OP) \
- QPEL_V_LOW(%%mm1, %%mm2, %%mm3, %%mm0, %5, %6, %5, 8(%0), (%0), (%0), 40(%0), (%1, %3), OP) \
- "add %4, %1 \n\t" \
- QPEL_V_LOW(%%mm2, %%mm3, %%mm0, %%mm1, %5, %6, %5, (%0), (%0), 8(%0), 48(%0), (%1), OP) \
- \
- QPEL_V_LOW(%%mm3, %%mm0, %%mm1, %%mm2, %5, %6, %5, (%0), 8(%0), 16(%0), 56(%0), (%1, %3), OP) \
- "add %4, %1 \n\t" \
- QPEL_V_LOW(%%mm0, %%mm1, %%mm2, %%mm3, %5, %6, %5, 8(%0), 16(%0), 24(%0), 64(%0), (%1), OP) \
- QPEL_V_LOW(%%mm1, %%mm2, %%mm3, %%mm0, %5, %6, %5, 16(%0), 24(%0), 32(%0), 72(%0), (%1, %3), OP) \
- "add %4, %1 \n\t" \
- QPEL_V_LOW(%%mm2, %%mm3, %%mm0, %%mm1, %5, %6, %5, 24(%0), 32(%0), 40(%0), 80(%0), (%1), OP) \
- QPEL_V_LOW(%%mm3, %%mm0, %%mm1, %%mm2, %5, %6, %5, 32(%0), 40(%0), 48(%0), 88(%0), (%1, %3), OP) \
- "add %4, %1 \n\t" \
- QPEL_V_LOW(%%mm0, %%mm1, %%mm2, %%mm3, %5, %6, %5, 40(%0), 48(%0), 56(%0), 96(%0), (%1), OP) \
- QPEL_V_LOW(%%mm1, %%mm2, %%mm3, %%mm0, %5, %6, %5, 48(%0), 56(%0), 64(%0), 104(%0), (%1, %3), OP) \
- "add %4, %1 \n\t" \
- QPEL_V_LOW(%%mm2, %%mm3, %%mm0, %%mm1, %5, %6, %5, 56(%0), 64(%0), 72(%0), 112(%0), (%1), OP) \
- QPEL_V_LOW(%%mm3, %%mm0, %%mm1, %%mm2, %5, %6, %5, 64(%0), 72(%0), 80(%0), 120(%0), (%1, %3), OP) \
- "add %4, %1 \n\t" \
- QPEL_V_LOW(%%mm0, %%mm1, %%mm2, %%mm3, %5, %6, %5, 72(%0), 80(%0), 88(%0), 128(%0), (%1), OP) \
- \
- QPEL_V_LOW(%%mm1, %%mm2, %%mm3, %%mm0, %5, %6, %5, 80(%0), 88(%0), 96(%0), 128(%0), (%1, %3), OP) \
- "add %4, %1 \n\t" \
- QPEL_V_LOW(%%mm2, %%mm3, %%mm0, %%mm1, %5, %6, %5, 88(%0), 96(%0), 104(%0), 120(%0), (%1), OP) \
- QPEL_V_LOW(%%mm3, %%mm0, %%mm1, %%mm2, %5, %6, %5, 96(%0), 104(%0), 112(%0), 112(%0), (%1, %3), OP) \
- \
- "add $136, %0 \n\t" \
- "add %6, %1 \n\t" \
- "decl %2 \n\t" \
- "jnz 1b \n\t" \
- \
- : "+r"(temp_ptr), "+r"(dst), "+g"(count) \
- : "r"((x86_reg)dstStride), "r"(2 * (x86_reg)dstStride), \
- /* "m"(ff_pw_20), "m"(ff_pw_3), */ "m"(ROUNDER), \
- "g"(4 - 14 * (x86_reg)dstStride) \
- : "memory" \
- ); \
-} \
- \
-static void OPNAME ## mpeg4_qpel8_v_lowpass_ ## MMX(uint8_t *dst, \
- uint8_t *src, \
- int dstStride, \
- int srcStride) \
-{ \
- uint64_t temp[9 * 2]; \
- uint64_t *temp_ptr = temp; \
- int count = 9; \
- \
- /* FIXME unroll */ \
- __asm__ volatile ( \
- "pxor %%mm7, %%mm7 \n\t" \
- "1: \n\t" \
- "movq (%0), %%mm0 \n\t" \
- "movq (%0), %%mm1 \n\t" \
- "punpcklbw %%mm7, %%mm0 \n\t" \
- "punpckhbw %%mm7, %%mm1 \n\t" \
- "movq %%mm0, (%1) \n\t" \
- "movq %%mm1, 9*8(%1) \n\t" \
- "add $8, %1 \n\t" \
- "add %3, %0 \n\t" \
- "decl %2 \n\t" \
- "jnz 1b \n\t" \
- : "+r"(src), "+r"(temp_ptr), "+r"(count) \
- : "r"((x86_reg)srcStride) \
- : "memory" \
- ); \
- \
- temp_ptr = temp; \
- count = 2; \
- \
- /* FIXME reorder for speed */ \
- __asm__ volatile ( \
- /* "pxor %%mm7, %%mm7 \n\t" */ \
- "1: \n\t" \
- "movq (%0), %%mm0 \n\t" \
- "movq 8(%0), %%mm1 \n\t" \
- "movq 16(%0), %%mm2 \n\t" \
- "movq 24(%0), %%mm3 \n\t" \
- QPEL_V_LOW(%%mm0, %%mm1, %%mm2, %%mm3, %5, %6, %5, 16(%0), 8(%0), (%0), 32(%0), (%1), OP) \
- QPEL_V_LOW(%%mm1, %%mm2, %%mm3, %%mm0, %5, %6, %5, 8(%0), (%0), (%0), 40(%0), (%1, %3), OP) \
- "add %4, %1 \n\t" \
- QPEL_V_LOW(%%mm2, %%mm3, %%mm0, %%mm1, %5, %6, %5, (%0), (%0), 8(%0), 48(%0), (%1), OP) \
- \
- QPEL_V_LOW(%%mm3, %%mm0, %%mm1, %%mm2, %5, %6, %5, (%0), 8(%0), 16(%0), 56(%0), (%1, %3), OP) \
- "add %4, %1 \n\t" \
- QPEL_V_LOW(%%mm0, %%mm1, %%mm2, %%mm3, %5, %6, %5, 8(%0), 16(%0), 24(%0), 64(%0), (%1), OP) \
- \
- QPEL_V_LOW(%%mm1, %%mm2, %%mm3, %%mm0, %5, %6, %5, 16(%0), 24(%0), 32(%0), 64(%0), (%1, %3), OP) \
- "add %4, %1 \n\t" \
- QPEL_V_LOW(%%mm2, %%mm3, %%mm0, %%mm1, %5, %6, %5, 24(%0), 32(%0), 40(%0), 56(%0), (%1), OP) \
- QPEL_V_LOW(%%mm3, %%mm0, %%mm1, %%mm2, %5, %6, %5, 32(%0), 40(%0), 48(%0), 48(%0), (%1, %3), OP) \
- \
- "add $72, %0 \n\t" \
- "add %6, %1 \n\t" \
- "decl %2 \n\t" \
- "jnz 1b \n\t" \
- \
- : "+r"(temp_ptr), "+r"(dst), "+g"(count) \
- : "r"((x86_reg)dstStride), "r"(2 * (x86_reg)dstStride), \
- /* "m"(ff_pw_20), "m"(ff_pw_3), */ "m"(ROUNDER), \
- "g"(4 - 6 * (x86_reg)dstStride) \
- : "memory" \
- ); \
-} \
- \
-static void OPNAME ## qpel8_mc00_ ## MMX (uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- OPNAME ## pixels8_ ## MMX(dst, src, stride, 8); \
-} \
- \
-static void OPNAME ## qpel8_mc10_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t temp[8]; \
- uint8_t * const half = (uint8_t*)temp; \
- put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(half, src, 8, \
- stride, 8); \
- OPNAME ## pixels8_l2_ ## MMX(dst, src, half, stride, stride, 8); \
-} \
- \
-static void OPNAME ## qpel8_mc20_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- OPNAME ## mpeg4_qpel8_h_lowpass_ ## MMX(dst, src, stride, \
- stride, 8); \
-} \
- \
-static void OPNAME ## qpel8_mc30_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t temp[8]; \
- uint8_t * const half = (uint8_t*)temp; \
- put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(half, src, 8, \
- stride, 8); \
- OPNAME ## pixels8_l2_ ## MMX(dst, src + 1, half, stride, \
- stride, 8); \
-} \
- \
-static void OPNAME ## qpel8_mc01_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t temp[8]; \
- uint8_t * const half = (uint8_t*)temp; \
- put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(half, src, 8, stride); \
- OPNAME ## pixels8_l2_ ## MMX(dst, src, half, stride, stride, 8); \
-} \
- \
-static void OPNAME ## qpel8_mc02_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- OPNAME ## mpeg4_qpel8_v_lowpass_ ## MMX(dst, src, stride, stride); \
-} \
- \
-static void OPNAME ## qpel8_mc03_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t temp[8]; \
- uint8_t * const half = (uint8_t*)temp; \
- put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(half, src, 8, stride); \
- OPNAME ## pixels8_l2_ ## MMX(dst, src + stride, half, stride, \
- stride, 8); \
-} \
- \
-static void OPNAME ## qpel8_mc11_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[8 + 9]; \
- uint8_t * const halfH = ((uint8_t*)half) + 64; \
- uint8_t * const halfHV = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
- stride, 9); \
- put ## RND ## pixels8_l2_ ## MMX(halfH, src, halfH, 8, stride, 9); \
- put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8); \
- OPNAME ## pixels8_l2_ ## MMX(dst, halfH, halfHV, stride, 8, 8); \
-} \
- \
-static void OPNAME ## qpel8_mc31_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[8 + 9]; \
- uint8_t * const halfH = ((uint8_t*)half) + 64; \
- uint8_t * const halfHV = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
- stride, 9); \
- put ## RND ## pixels8_l2_ ## MMX(halfH, src + 1, halfH, 8, \
- stride, 9); \
- put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8); \
- OPNAME ## pixels8_l2_ ## MMX(dst, halfH, halfHV, stride, 8, 8); \
-} \
- \
-static void OPNAME ## qpel8_mc13_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[8 + 9]; \
- uint8_t * const halfH = ((uint8_t*)half) + 64; \
- uint8_t * const halfHV = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
- stride, 9); \
- put ## RND ## pixels8_l2_ ## MMX(halfH, src, halfH, 8, stride, 9); \
- put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8); \
- OPNAME ## pixels8_l2_ ## MMX(dst, halfH + 8, halfHV, stride, 8, 8); \
-} \
- \
-static void OPNAME ## qpel8_mc33_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[8 + 9]; \
- uint8_t * const halfH = ((uint8_t*)half) + 64; \
- uint8_t * const halfHV = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
- stride, 9); \
- put ## RND ## pixels8_l2_ ## MMX(halfH, src + 1, halfH, 8, \
- stride, 9); \
- put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8); \
- OPNAME ## pixels8_l2_ ## MMX(dst, halfH + 8, halfHV, stride, 8, 8); \
-} \
- \
-static void OPNAME ## qpel8_mc21_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[8 + 9]; \
- uint8_t * const halfH = ((uint8_t*)half) + 64; \
- uint8_t * const halfHV = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
- stride, 9); \
- put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8); \
- OPNAME ## pixels8_l2_ ## MMX(dst, halfH, halfHV, stride, 8, 8); \
-} \
- \
-static void OPNAME ## qpel8_mc23_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[8 + 9]; \
- uint8_t * const halfH = ((uint8_t*)half) + 64; \
- uint8_t * const halfHV = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
- stride, 9); \
- put ## RND ## mpeg4_qpel8_v_lowpass_ ## MMX(halfHV, halfH, 8, 8); \
- OPNAME ## pixels8_l2_ ## MMX(dst, halfH + 8, halfHV, stride, 8, 8); \
-} \
- \
-static void OPNAME ## qpel8_mc12_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[8 + 9]; \
- uint8_t * const halfH = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
- stride, 9); \
- put ## RND ## pixels8_l2_ ## MMX(halfH, src, halfH, 8, stride, 9); \
- OPNAME ## mpeg4_qpel8_v_lowpass_ ## MMX(dst, halfH, stride, 8); \
-} \
- \
-static void OPNAME ## qpel8_mc32_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[8 + 9]; \
- uint8_t * const halfH = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
- stride, 9); \
- put ## RND ## pixels8_l2_ ## MMX(halfH, src + 1, halfH, 8, \
- stride, 9); \
- OPNAME ## mpeg4_qpel8_v_lowpass_ ## MMX(dst, halfH, stride, 8); \
-} \
- \
-static void OPNAME ## qpel8_mc22_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[9]; \
- uint8_t * const halfH = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel8_h_lowpass_ ## MMX(halfH, src, 8, \
- stride, 9); \
- OPNAME ## mpeg4_qpel8_v_lowpass_ ## MMX(dst, halfH, stride, 8); \
-} \
- \
-static void OPNAME ## qpel16_mc00_ ## MMX (uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- OPNAME ## pixels16_ ## MMX(dst, src, stride, 16); \
-} \
- \
-static void OPNAME ## qpel16_mc10_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t temp[32]; \
- uint8_t * const half = (uint8_t*)temp; \
- put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(half, src, 16, \
- stride, 16); \
- OPNAME ## pixels16_l2_ ## MMX(dst, src, half, stride, stride, 16); \
-} \
- \
-static void OPNAME ## qpel16_mc20_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- OPNAME ## mpeg4_qpel16_h_lowpass_ ## MMX(dst, src, \
- stride, stride, 16); \
-} \
- \
-static void OPNAME ## qpel16_mc30_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t temp[32]; \
- uint8_t * const half = (uint8_t*)temp; \
- put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(half, src, 16, \
- stride, 16); \
- OPNAME ## pixels16_l2_ ## MMX(dst, src + 1, half, \
- stride, stride, 16); \
-} \
- \
-static void OPNAME ## qpel16_mc01_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t temp[32]; \
- uint8_t * const half = (uint8_t*)temp; \
- put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(half, src, 16, \
- stride); \
- OPNAME ## pixels16_l2_ ## MMX(dst, src, half, stride, stride, 16); \
-} \
- \
-static void OPNAME ## qpel16_mc02_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- OPNAME ## mpeg4_qpel16_v_lowpass_ ## MMX(dst, src, stride, stride); \
-} \
- \
-static void OPNAME ## qpel16_mc03_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t temp[32]; \
- uint8_t * const half = (uint8_t*)temp; \
- put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(half, src, 16, \
- stride); \
- OPNAME ## pixels16_l2_ ## MMX(dst, src+stride, half, \
- stride, stride, 16); \
-} \
- \
-static void OPNAME ## qpel16_mc11_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[16 * 2 + 17 * 2]; \
- uint8_t * const halfH = ((uint8_t*)half) + 256; \
- uint8_t * const halfHV = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
- stride, 17); \
- put ## RND ## pixels16_l2_ ## MMX(halfH, src, halfH, 16, \
- stride, 17); \
- put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH, \
- 16, 16); \
- OPNAME ## pixels16_l2_ ## MMX(dst, halfH, halfHV, stride, 16, 16); \
-} \
- \
-static void OPNAME ## qpel16_mc31_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[16 * 2 + 17 * 2]; \
- uint8_t * const halfH = ((uint8_t*)half) + 256; \
- uint8_t * const halfHV = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
- stride, 17); \
- put ## RND ## pixels16_l2_ ## MMX(halfH, src + 1, halfH, 16, \
- stride, 17); \
- put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH, \
- 16, 16); \
- OPNAME ## pixels16_l2_ ## MMX(dst, halfH, halfHV, stride, 16, 16); \
-} \
- \
-static void OPNAME ## qpel16_mc13_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[16 * 2 + 17 * 2]; \
- uint8_t * const halfH = ((uint8_t*)half) + 256; \
- uint8_t * const halfHV = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
- stride, 17); \
- put ## RND ## pixels16_l2_ ## MMX(halfH, src, halfH, 16, \
- stride, 17); \
- put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH, \
- 16, 16); \
- OPNAME ## pixels16_l2_ ## MMX(dst, halfH + 16, halfHV, stride, \
- 16, 16); \
-} \
- \
-static void OPNAME ## qpel16_mc33_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[16 * 2 + 17 * 2]; \
- uint8_t * const halfH = ((uint8_t*)half) + 256; \
- uint8_t * const halfHV = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
- stride, 17); \
- put ## RND ## pixels16_l2_ ## MMX(halfH, src + 1, halfH, 16, \
- stride, 17); \
- put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH, \
- 16, 16); \
- OPNAME ## pixels16_l2_ ## MMX(dst, halfH + 16, halfHV, stride, \
- 16, 16); \
-} \
- \
-static void OPNAME ## qpel16_mc21_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[16 * 2 + 17 * 2]; \
- uint8_t * const halfH = ((uint8_t*)half) + 256; \
- uint8_t * const halfHV = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
- stride, 17); \
- put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH, \
- 16, 16); \
- OPNAME ## pixels16_l2_ ## MMX(dst, halfH, halfHV, stride, 16, 16); \
-} \
- \
-static void OPNAME ## qpel16_mc23_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[16 * 2 + 17 * 2]; \
- uint8_t * const halfH = ((uint8_t*)half) + 256; \
- uint8_t * const halfHV = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
- stride, 17); \
- put ## RND ## mpeg4_qpel16_v_lowpass_ ## MMX(halfHV, halfH, \
- 16, 16); \
- OPNAME ## pixels16_l2_ ## MMX(dst, halfH + 16, halfHV, stride, \
- 16, 16); \
-} \
- \
-static void OPNAME ## qpel16_mc12_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[17 * 2]; \
- uint8_t * const halfH = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
- stride, 17); \
- put ## RND ## pixels16_l2_ ## MMX(halfH, src, halfH, 16, \
- stride, 17); \
- OPNAME ## mpeg4_qpel16_v_lowpass_ ## MMX(dst, halfH, stride, 16); \
-} \
- \
-static void OPNAME ## qpel16_mc32_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[17 * 2]; \
- uint8_t * const halfH = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
- stride, 17); \
- put ## RND ## pixels16_l2_ ## MMX(halfH, src + 1, halfH, 16, \
- stride, 17); \
- OPNAME ## mpeg4_qpel16_v_lowpass_ ## MMX(dst, halfH, stride, 16); \
-} \
- \
-static void OPNAME ## qpel16_mc22_ ## MMX(uint8_t *dst, uint8_t *src, \
- int stride) \
-{ \
- uint64_t half[17 * 2]; \
- uint8_t * const halfH = ((uint8_t*)half); \
- put ## RND ## mpeg4_qpel16_h_lowpass_ ## MMX(halfH, src, 16, \
- stride, 17); \
- OPNAME ## mpeg4_qpel16_v_lowpass_ ## MMX(dst, halfH, stride, 16); \
-}
-
-#define PUT_OP(a, b, temp, size) \
- "mov"#size" "#a", "#b" \n\t"
-
-#define AVG_MMXEXT_OP(a, b, temp, size) \
- "mov"#size" "#b", "#temp" \n\t" \
- "pavgb "#temp", "#a" \n\t" \
- "mov"#size" "#a", "#b" \n\t"
-
-QPEL_BASE(put_, ff_pw_16, _, PUT_OP)
-QPEL_BASE(avg_, ff_pw_16, _, AVG_MMXEXT_OP)
-QPEL_BASE(put_no_rnd_, ff_pw_15, _no_rnd_, PUT_OP)
-QPEL_OP(put_, ff_pw_16, _, PUT_OP, mmxext)
-QPEL_OP(avg_, ff_pw_16, _, AVG_MMXEXT_OP, mmxext)
-QPEL_OP(put_no_rnd_, ff_pw_15, _no_rnd_, PUT_OP, mmxext)
-
-/***********************************/
-/* bilinear qpel: not compliant to any spec, only for -lavdopts fast */
-
-#define QPEL_2TAP_XY(OPNAME, SIZE, MMX, XY, HPEL) \
-static void OPNAME ## 2tap_qpel ## SIZE ## _mc ## XY ## _ ## MMX(uint8_t *dst, \
- uint8_t *src, \
- int stride) \
-{ \
- OPNAME ## pixels ## SIZE ## HPEL(dst, src, stride, SIZE); \
-}
-
-#define QPEL_2TAP_L3(OPNAME, SIZE, MMX, XY, S0, S1, S2) \
-static void OPNAME ## 2tap_qpel ## SIZE ## _mc ## XY ## _ ## MMX(uint8_t *dst, \
- uint8_t *src, \
- int stride) \
-{ \
- OPNAME ## 2tap_qpel ## SIZE ## _l3_ ## MMX(dst, src + S0, stride, SIZE, \
- S1, S2); \
-}
-
-#define QPEL_2TAP(OPNAME, SIZE, MMX) \
-QPEL_2TAP_XY(OPNAME, SIZE, MMX, 20, _x2_ ## MMX) \
-QPEL_2TAP_XY(OPNAME, SIZE, MMX, 02, _y2_ ## MMX) \
-QPEL_2TAP_XY(OPNAME, SIZE, MMX, 22, _xy2_mmx) \
-static const qpel_mc_func OPNAME ## 2tap_qpel ## SIZE ## _mc00_ ## MMX = \
- OPNAME ## qpel ## SIZE ## _mc00_ ## MMX; \
-static const qpel_mc_func OPNAME ## 2tap_qpel ## SIZE ## _mc21_ ## MMX = \
- OPNAME ## 2tap_qpel ## SIZE ## _mc20_ ## MMX; \
-static const qpel_mc_func OPNAME ## 2tap_qpel ## SIZE ## _mc12_ ## MMX = \
- OPNAME ## 2tap_qpel ## SIZE ## _mc02_ ## MMX; \
-static void OPNAME ## 2tap_qpel ## SIZE ## _mc32_ ## MMX(uint8_t *dst, \
- uint8_t *src, \
- int stride) \
-{ \
- OPNAME ## pixels ## SIZE ## _y2_ ## MMX(dst, src + 1, stride, SIZE); \
-} \
-static void OPNAME ## 2tap_qpel ## SIZE ## _mc23_ ## MMX(uint8_t *dst, \
- uint8_t *src, \
- int stride) \
-{ \
- OPNAME ## pixels ## SIZE ## _x2_ ## MMX(dst, src + stride, \
- stride, SIZE); \
-} \
-QPEL_2TAP_L3(OPNAME, SIZE, MMX, 10, 0, 1, 0) \
-QPEL_2TAP_L3(OPNAME, SIZE, MMX, 30, 1, -1, 0) \
-QPEL_2TAP_L3(OPNAME, SIZE, MMX, 01, 0, stride, 0) \
-QPEL_2TAP_L3(OPNAME, SIZE, MMX, 03, stride, -stride, 0) \
-QPEL_2TAP_L3(OPNAME, SIZE, MMX, 11, 0, stride, 1) \
-QPEL_2TAP_L3(OPNAME, SIZE, MMX, 31, 1, stride, -1) \
-QPEL_2TAP_L3(OPNAME, SIZE, MMX, 13, stride, -stride, 1) \
-QPEL_2TAP_L3(OPNAME, SIZE, MMX, 33, stride + 1, -stride, -1) \
-
-QPEL_2TAP(put_, 16, mmxext)
-QPEL_2TAP(avg_, 16, mmxext)
-QPEL_2TAP(put_, 8, mmxext)
-QPEL_2TAP(avg_, 8, mmxext)
-
-void ff_put_rv40_qpel8_mc33_mmx(uint8_t *dst, uint8_t *src, int stride)
-{
- put_pixels8_xy2_mmx(dst, src, stride, 8);
-}
-void ff_put_rv40_qpel16_mc33_mmx(uint8_t *dst, uint8_t *src, int stride)
-{
- put_pixels16_xy2_mmx(dst, src, stride, 16);
-}
-void ff_avg_rv40_qpel8_mc33_mmx(uint8_t *dst, uint8_t *src, int stride)
-{
- avg_pixels8_xy2_mmx(dst, src, stride, 8);
-}
-void ff_avg_rv40_qpel16_mc33_mmx(uint8_t *dst, uint8_t *src, int stride)
-{
- avg_pixels16_xy2_mmx(dst, src, stride, 16);
-}
-
-static void gmc_mmx(uint8_t *dst, uint8_t *src,
- int stride, int h, int ox, int oy,
- int dxx, int dxy, int dyx, int dyy,
- int shift, int r, int width, int height)
+void ff_gmc_mmx(uint8_t *dst, uint8_t *src,
+ int stride, int h, int ox, int oy,
+ int dxx, int dxy, int dyx, int dyy,
+ int shift, int r, int width, int height)
 {
 const int w = 8;
 const int ix = ox >> (16 + shift);
@@ -1750,216 +460,9 @@
 src += 4 - h * stride;
 }
 }
-#endif /* HAVE_INLINE_ASM */
-
-#include "h264_qpel.c"
-
-void ff_put_h264_chroma_mc8_rnd_mmx (uint8_t *dst, uint8_t *src,
- int stride, int h, int x, int y);
-void ff_avg_h264_chroma_mc8_rnd_mmxext(uint8_t *dst, uint8_t *src,
- int stride, int h, int x, int y);
-void ff_avg_h264_chroma_mc8_rnd_3dnow(uint8_t *dst, uint8_t *src,
- int stride, int h, int x, int y);
-
-void ff_put_h264_chroma_mc4_mmx (uint8_t *dst, uint8_t *src,
- int stride, int h, int x, int y);
-void ff_avg_h264_chroma_mc4_mmxext (uint8_t *dst, uint8_t *src,
- int stride, int h, int x, int y);
-void ff_avg_h264_chroma_mc4_3dnow (uint8_t *dst, uint8_t *src,
- int stride, int h, int x, int y);
-
-void ff_put_h264_chroma_mc2_mmxext (uint8_t *dst, uint8_t *src,
- int stride, int h, int x, int y);
-void ff_avg_h264_chroma_mc2_mmxext (uint8_t *dst, uint8_t *src,
- int stride, int h, int x, int y);
-
-void ff_put_h264_chroma_mc8_rnd_ssse3(uint8_t *dst, uint8_t *src,
- int stride, int h, int x, int y);
-void ff_put_h264_chroma_mc4_ssse3 (uint8_t *dst, uint8_t *src,
- int stride, int h, int x, int y);
-
-void ff_avg_h264_chroma_mc8_rnd_ssse3(uint8_t *dst, uint8_t *src,
- int stride, int h, int x, int y);
-void ff_avg_h264_chroma_mc4_ssse3 (uint8_t *dst, uint8_t *src,
- int stride, int h, int x, int y);
-
-#define CHROMA_MC(OP, NUM, DEPTH, OPT) \
-void ff_ ## OP ## _h264_chroma_mc ## NUM ## _ ## DEPTH ## _ ## OPT \
- (uint8_t *dst, uint8_t *src, \
- int stride, int h, int x, int y);
-
-CHROMA_MC(put, 2, 10, mmxext)
-CHROMA_MC(avg, 2, 10, mmxext)
-CHROMA_MC(put, 4, 10, mmxext)
-CHROMA_MC(avg, 4, 10, mmxext)
-CHROMA_MC(put, 8, 10, sse2)
-CHROMA_MC(avg, 8, 10, sse2)
-CHROMA_MC(put, 8, 10, avx)
-CHROMA_MC(avg, 8, 10, avx)
-
-#if HAVE_INLINE_ASM
-
-/* CAVS-specific */
-void ff_put_cavs_qpel8_mc00_mmxext(uint8_t *dst, uint8_t *src, int stride)
-{
- put_pixels8_mmx(dst, src, stride, 8);
-}
-
-void ff_avg_cavs_qpel8_mc00_mmxext(uint8_t *dst, uint8_t *src, int stride)
-{
- avg_pixels8_mmx(dst, src, stride, 8);
-}
 
-void ff_put_cavs_qpel16_mc00_mmxext(uint8_t *dst, uint8_t *src, int stride)
-{
- put_pixels16_mmx(dst, src, stride, 16);
-}
-
-void ff_avg_cavs_qpel16_mc00_mmxext(uint8_t *dst, uint8_t *src, int stride)
-{
- avg_pixels16_mmx(dst, src, stride, 16);
-}
-
-/* VC-1-specific */
-void ff_put_vc1_mspel_mc00_mmx(uint8_t *dst, const uint8_t *src,
- int stride, int rnd)
-{
- put_pixels8_mmx(dst, src, stride, 8);
-}
-
-void ff_avg_vc1_mspel_mc00_mmxext(uint8_t *dst, const uint8_t *src,
- int stride, int rnd)
-{
- avg_pixels8_mmxext(dst, src, stride, 8);
-}
-
-static void vorbis_inverse_coupling_3dnow(float *mag, float *ang, int blocksize)
-{
- int i;
- __asm__ volatile ("pxor %%mm7, %%mm7":);
- for (i = 0; i < blocksize; i += 2) {
- __asm__ volatile (
- "movq %0, %%mm0 \n\t"
- "movq %1, %%mm1 \n\t"
- "movq %%mm0, %%mm2 \n\t"
- "movq %%mm1, %%mm3 \n\t"
- "pfcmpge %%mm7, %%mm2 \n\t" // m <= 0.0
- "pfcmpge %%mm7, %%mm3 \n\t" // a <= 0.0
- "pslld $31, %%mm2 \n\t" // keep only the sign bit
- "pxor %%mm2, %%mm1 \n\t"
- "movq %%mm3, %%mm4 \n\t"
- "pand %%mm1, %%mm3 \n\t"
- "pandn %%mm1, %%mm4 \n\t"
- "pfadd %%mm0, %%mm3 \n\t" // a = m + ((a < 0) & (a ^ sign(m)))
- "pfsub %%mm4, %%mm0 \n\t" // m = m + ((a > 0) & (a ^ sign(m)))
- "movq %%mm3, %1 \n\t"
- "movq %%mm0, %0 \n\t"
- : "+m"(mag[i]), "+m"(ang[i])
- :: "memory"
- );
- }
- __asm__ volatile ("femms");
-}
-
-static void vorbis_inverse_coupling_sse(float *mag, float *ang, int blocksize)
-{
- int i;
-
- __asm__ volatile (
- "movaps %0, %%xmm5 \n\t"
- :: "m"(ff_pdw_80000000[0])
- );
- for (i = 0; i < blocksize; i += 4) {
- __asm__ volatile (
- "movaps %0, %%xmm0 \n\t"
- "movaps %1, %%xmm1 \n\t"
- "xorps %%xmm2, %%xmm2 \n\t"
- "xorps %%xmm3, %%xmm3 \n\t"
- "cmpleps %%xmm0, %%xmm2 \n\t" // m <= 0.0
- "cmpleps %%xmm1, %%xmm3 \n\t" // a <= 0.0
- "andps %%xmm5, %%xmm2 \n\t" // keep only the sign bit
- "xorps %%xmm2, %%xmm1 \n\t"
- "movaps %%xmm3, %%xmm4 \n\t"
- "andps %%xmm1, %%xmm3 \n\t"
- "andnps %%xmm1, %%xmm4 \n\t"
- "addps %%xmm0, %%xmm3 \n\t" // a = m + ((a < 0) & (a ^ sign(m)))
- "subps %%xmm4, %%xmm0 \n\t" // m = m + ((a > 0) & (a ^ sign(m)))
- "movaps %%xmm3, %1 \n\t"
- "movaps %%xmm0, %0 \n\t"
- : "+m"(mag[i]), "+m"(ang[i])
- :: "memory"
- );
- }
-}
-
-#if HAVE_6REGS
-static void vector_fmul_window_3dnowext(float *dst, const float *src0,
- const float *src1, const float *win,
- int len)
-{
- x86_reg i = -len * 4;
- x86_reg j = len * 4 - 8;
- __asm__ volatile (
- "1: \n"
- "pswapd (%5, %1), %%mm1 \n"
- "movq (%5, %0), %%mm0 \n"
- "pswapd (%4, %1), %%mm5 \n"
- "movq (%3, %0), %%mm4 \n"
- "movq %%mm0, %%mm2 \n"
- "movq %%mm1, %%mm3 \n"
- "pfmul %%mm4, %%mm2 \n" // src0[len + i] * win[len + i]
- "pfmul %%mm5, %%mm3 \n" // src1[j] * win[len + j]
- "pfmul %%mm4, %%mm1 \n" // src0[len + i] * win[len + j]
- "pfmul %%mm5, %%mm0 \n" // src1[j] * win[len + i]
- "pfadd %%mm3, %%mm2 \n"
- "pfsub %%mm0, %%mm1 \n"
- "pswapd %%mm2, %%mm2 \n"
- "movq %%mm1, (%2, %0) \n"
- "movq %%mm2, (%2, %1) \n"
- "sub $8, %1 \n"
- "add $8, %0 \n"
- "jl 1b \n"
- "femms \n"
- : "+r"(i), "+r"(j)
- : "r"(dst + len), "r"(src0 + len), "r"(src1), "r"(win + len)
- );
-}
-
-static void vector_fmul_window_sse(float *dst, const float *src0,
- const float *src1, const float *win, int len)
-{
- x86_reg i = -len * 4;
- x86_reg j = len * 4 - 16;
- __asm__ volatile (
- "1: \n"
- "movaps (%5, %1), %%xmm1 \n"
- "movaps (%5, %0), %%xmm0 \n"
- "movaps (%4, %1), %%xmm5 \n"
- "movaps (%3, %0), %%xmm4 \n"
- "shufps $0x1b, %%xmm1, %%xmm1 \n"
- "shufps $0x1b, %%xmm5, %%xmm5 \n"
- "movaps %%xmm0, %%xmm2 \n"
- "movaps %%xmm1, %%xmm3 \n"
- "mulps %%xmm4, %%xmm2 \n" // src0[len + i] * win[len + i]
- "mulps %%xmm5, %%xmm3 \n" // src1[j] * win[len + j]
- "mulps %%xmm4, %%xmm1 \n" // src0[len + i] * win[len + j]
- "mulps %%xmm5, %%xmm0 \n" // src1[j] * win[len + i]
- "addps %%xmm3, %%xmm2 \n"
- "subps %%xmm0, %%xmm1 \n"
- "shufps $0x1b, %%xmm2, %%xmm2 \n"
- "movaps %%xmm1, (%2, %0) \n"
- "movaps %%xmm2, (%2, %1) \n"
- "sub $16, %1 \n"
- "add $16, %0 \n"
- "jl 1b \n"
- : "+r"(i), "+r"(j)
- : "r"(dst + len), "r"(src0 + len), "r"(src1), "r"(win + len)
- );
-}
-#endif /* HAVE_6REGS */
-
-static void vector_clipf_sse(float *dst, const float *src,
- float min, float max, int len)
+void ff_vector_clipf_sse(float *dst, const float *src,
+ float min, float max, int len)
 {
 x86_reg i = (len - 16) * 4;
 __asm__ volatile (
@@ -1993,561 +496,3 @@
 }
 
 #endif /* HAVE_INLINE_ASM */
-
-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,
- int order);
-int32_t ff_scalarproduct_and_madd_int16_mmxext(int16_t *v1, const int16_t *v2,
- const int16_t *v3,
- int order, int mul);
-int32_t ff_scalarproduct_and_madd_int16_sse2(int16_t *v1, const int16_t *v2,
- const int16_t *v3,
- int order, int mul);
-int32_t ff_scalarproduct_and_madd_int16_ssse3(int16_t *v1, const int16_t *v2,
- 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);
-
-void ff_add_hfyu_median_prediction_mmxext(uint8_t *dst, const uint8_t *top,
- const uint8_t *diff, int w,
- int *left, int *left_top);
-int ff_add_hfyu_left_prediction_ssse3(uint8_t *dst, const uint8_t *src,
- int w, int left);
-int ff_add_hfyu_left_prediction_sse4(uint8_t *dst, const uint8_t *src,
- int w, int left);
-
-float ff_scalarproduct_float_sse(const float *v1, const float *v2, int order);
-
-void ff_vector_fmul_reverse_sse(float *dst, const float *src0,
- const float *src1, int len);
-void ff_vector_fmul_reverse_avx(float *dst, const float *src0,
- const float *src1, int len);
-
-void ff_vector_fmul_add_sse(float *dst, const float *src0, const float *src1,
- const float *src2, int len);
-void ff_vector_fmul_add_avx(float *dst, const float *src0, const float *src1,
- const float *src2, int len);
-
-void ff_vector_clip_int32_mmx (int32_t *dst, const int32_t *src,
- int32_t min, int32_t max, unsigned int len);
-void ff_vector_clip_int32_sse2 (int32_t *dst, const int32_t *src,
- int32_t min, int32_t max, unsigned int len);
-void ff_vector_clip_int32_int_sse2(int32_t *dst, const int32_t *src,
- int32_t min, int32_t max, unsigned int len);
-void ff_vector_clip_int32_sse4 (int32_t *dst, const int32_t *src,
- int32_t min, int32_t max, unsigned int len);
-
-extern void ff_butterflies_float_interleave_sse(float *dst, const float *src0,
- const float *src1, int len);
-extern void ff_butterflies_float_interleave_avx(float *dst, const float *src0,
- const float *src1, int len);
-
-#define SET_QPEL_FUNCS(PFX, IDX, SIZE, CPU, PREFIX) \
- do { \
- c->PFX ## _pixels_tab[IDX][ 0] = PREFIX ## PFX ## SIZE ## _mc00_ ## CPU; \
- c->PFX ## _pixels_tab[IDX][ 1] = PREFIX ## PFX ## SIZE ## _mc10_ ## CPU; \
- c->PFX ## _pixels_tab[IDX][ 2] = PREFIX ## PFX ## SIZE ## _mc20_ ## CPU; \
- c->PFX ## _pixels_tab[IDX][ 3] = PREFIX ## PFX ## SIZE ## _mc30_ ## CPU; \
- c->PFX ## _pixels_tab[IDX][ 4] = PREFIX ## PFX ## SIZE ## _mc01_ ## CPU; \
- c->PFX ## _pixels_tab[IDX][ 5] = PREFIX ## PFX ## SIZE ## _mc11_ ## CPU; \
- c->PFX ## _pixels_tab[IDX][ 6] = PREFIX ## PFX ## SIZE ## _mc21_ ## CPU; \
- c->PFX ## _pixels_tab[IDX][ 7] = PREFIX ## PFX ## SIZE ## _mc31_ ## CPU; \
- c->PFX ## _pixels_tab[IDX][ 8] = PREFIX ## PFX ## SIZE ## _mc02_ ## CPU; \
- c->PFX ## _pixels_tab[IDX][ 9] = PREFIX ## PFX ## SIZE ## _mc12_ ## CPU; \
- c->PFX ## _pixels_tab[IDX][10] = PREFIX ## PFX ## SIZE ## _mc22_ ## CPU; \
- c->PFX ## _pixels_tab[IDX][11] = PREFIX ## PFX ## SIZE ## _mc32_ ## CPU; \
- c->PFX ## _pixels_tab[IDX][12] = PREFIX ## PFX ## SIZE ## _mc03_ ## CPU; \
- c->PFX ## _pixels_tab[IDX][13] = PREFIX ## PFX ## SIZE ## _mc13_ ## CPU; \
- c->PFX ## _pixels_tab[IDX][14] = PREFIX ## PFX ## SIZE ## _mc23_ ## CPU; \
- c->PFX ## _pixels_tab[IDX][15] = PREFIX ## PFX ## SIZE ## _mc33_ ## CPU; \
- } while (0)
-
-#define SET_HPEL_FUNCS(PFX, IDX, SIZE, CPU) \
- do { \
- c->PFX ## _pixels_tab[IDX][0] = PFX ## _pixels ## SIZE ## _ ## CPU; \
- c->PFX ## _pixels_tab[IDX][1] = PFX ## _pixels ## SIZE ## _x2_ ## CPU; \
- c->PFX ## _pixels_tab[IDX][2] = PFX ## _pixels ## SIZE ## _y2_ ## CPU; \
- c->PFX ## _pixels_tab[IDX][3] = PFX ## _pixels ## SIZE ## _xy2_ ## CPU; \
- } while (0)
-
-#define H264_QPEL_FUNCS(x, y, CPU) \
- do { \
- c->put_h264_qpel_pixels_tab[0][x + y * 4] = put_h264_qpel16_mc ## x ## y ## _ ## CPU; \
- c->put_h264_qpel_pixels_tab[1][x + y * 4] = put_h264_qpel8_mc ## x ## y ## _ ## CPU; \
- c->avg_h264_qpel_pixels_tab[0][x + y * 4] = avg_h264_qpel16_mc ## x ## y ## _ ## CPU; \
- c->avg_h264_qpel_pixels_tab[1][x + y * 4] = avg_h264_qpel8_mc ## x ## y ## _ ## CPU; \
- } while (0)
-
-#define H264_QPEL_FUNCS_10(x, y, CPU) \
- do { \
- c->put_h264_qpel_pixels_tab[0][x + y * 4] = ff_put_h264_qpel16_mc ## x ## y ## _10_ ## CPU; \
- c->put_h264_qpel_pixels_tab[1][x + y * 4] = ff_put_h264_qpel8_mc ## x ## y ## _10_ ## CPU; \
- c->avg_h264_qpel_pixels_tab[0][x + y * 4] = ff_avg_h264_qpel16_mc ## x ## y ## _10_ ## CPU; \
- c->avg_h264_qpel_pixels_tab[1][x + y * 4] = ff_avg_h264_qpel8_mc ## x ## y ## _10_ ## CPU; \
- } while (0)
-
-static void dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx, int mm_flags)
-{
- const int high_bit_depth = avctx->bits_per_raw_sample > 8;
-
-#if HAVE_INLINE_ASM
- c->put_pixels_clamped = ff_put_pixels_clamped_mmx;
- c->put_signed_pixels_clamped = ff_put_signed_pixels_clamped_mmx;
- c->add_pixels_clamped = ff_add_pixels_clamped_mmx;
-
- if (!high_bit_depth) {
- c->clear_block = clear_block_mmx;
- c->clear_blocks = clear_blocks_mmx;
- c->draw_edges = draw_edges_mmx;
-
- SET_HPEL_FUNCS(put, 0, 16, mmx);
- SET_HPEL_FUNCS(put_no_rnd, 0, 16, mmx);
- SET_HPEL_FUNCS(avg, 0, 16, mmx);
- SET_HPEL_FUNCS(avg_no_rnd, 0, 16, mmx);
- SET_HPEL_FUNCS(put, 1, 8, mmx);
- SET_HPEL_FUNCS(put_no_rnd, 1, 8, mmx);
- SET_HPEL_FUNCS(avg, 1, 8, mmx);
- SET_HPEL_FUNCS(avg_no_rnd, 1, 8, mmx);
-
- switch (avctx->idct_algo) {
- case FF_IDCT_AUTO:
- case FF_IDCT_SIMPLEMMX:
- c->idct_put = ff_simple_idct_put_mmx;
- c->idct_add = ff_simple_idct_add_mmx;
- c->idct = ff_simple_idct_mmx;
- c->idct_permutation_type = FF_SIMPLE_IDCT_PERM;
- break;
- case FF_IDCT_XVIDMMX:
- c->idct_put = ff_idct_xvid_mmx_put;
- c->idct_add = ff_idct_xvid_mmx_add;
- c->idct = ff_idct_xvid_mmx;
- break;
- }
- }
-
- c->gmc = gmc_mmx;
-
- c->add_bytes = add_bytes_mmx;
-
- if (CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
- c->h263_v_loop_filter = h263_v_loop_filter_mmx;
- c->h263_h_loop_filter = h263_h_loop_filter_mmx;
- }
-#endif /* HAVE_INLINE_ASM */
-
-#if HAVE_YASM
- if (!high_bit_depth && CONFIG_H264CHROMA) {
- c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_rnd_mmx;
- c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_mmx;
- }
-
- c->vector_clip_int32 = ff_vector_clip_int32_mmx;
-#endif
-
-}
-
-static void dsputil_init_mmxext(DSPContext *c, AVCodecContext *avctx,
- int mm_flags)
-{
- const int bit_depth = avctx->bits_per_raw_sample;
- const int high_bit_depth = bit_depth > 8;
-
-#if HAVE_INLINE_ASM
- SET_QPEL_FUNCS(avg_qpel, 0, 16, mmxext, );
- SET_QPEL_FUNCS(avg_qpel, 1, 8, mmxext, );
- SET_QPEL_FUNCS(avg_2tap_qpel, 0, 16, mmxext, );
- SET_QPEL_FUNCS(avg_2tap_qpel, 1, 8, mmxext, );
-
- SET_QPEL_FUNCS(put_qpel, 0, 16, mmxext, );
- SET_QPEL_FUNCS(put_qpel, 1, 8, mmxext, );
- SET_QPEL_FUNCS(put_2tap_qpel, 0, 16, mmxext, );
- SET_QPEL_FUNCS(put_2tap_qpel, 1, 8, mmxext, );
- SET_QPEL_FUNCS(put_no_rnd_qpel, 0, 16, mmxext, );
- SET_QPEL_FUNCS(put_no_rnd_qpel, 1, 8, mmxext, );
-
- if (!high_bit_depth) {
- c->put_pixels_tab[0][1] = put_pixels16_x2_mmxext;
- c->put_pixels_tab[0][2] = put_pixels16_y2_mmxext;
-
- c->avg_pixels_tab[0][0] = avg_pixels16_mmxext;
- c->avg_pixels_tab[0][1] = avg_pixels16_x2_mmxext;
- c->avg_pixels_tab[0][2] = avg_pixels16_y2_mmxext;
-
- c->put_pixels_tab[1][1] = put_pixels8_x2_mmxext;
- c->put_pixels_tab[1][2] = put_pixels8_y2_mmxext;
-
- c->avg_pixels_tab[1][0] = avg_pixels8_mmxext;
- c->avg_pixels_tab[1][1] = avg_pixels8_x2_mmxext;
- c->avg_pixels_tab[1][2] = avg_pixels8_y2_mmxext;
- }
-
- if (!(avctx->flags & CODEC_FLAG_BITEXACT)) {
- if (!high_bit_depth) {
- c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_mmxext;
- c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_mmxext;
- c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_mmxext;
- c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_mmxext;
-
- c->avg_pixels_tab[0][3] = avg_pixels16_xy2_mmxext;
- c->avg_pixels_tab[1][3] = avg_pixels8_xy2_mmxext;
- }
- }
-
- if (!high_bit_depth && avctx->idct_algo == FF_IDCT_XVIDMMX) {
- c->idct_put = ff_idct_xvid_mmxext_put;
- c->idct_add = ff_idct_xvid_mmxext_add;
- c->idct = ff_idct_xvid_mmxext;
- }
-
- if (CONFIG_VP3_DECODER && (avctx->codec_id == AV_CODEC_ID_VP3 ||
- avctx->codec_id == AV_CODEC_ID_THEORA)) {
- c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_exact_mmxext;
- c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_exact_mmxext;
- }
-#endif /* HAVE_INLINE_ASM */
-
-#if HAVE_MMXEXT_EXTERNAL
- if (CONFIG_H264QPEL) {
- if (!high_bit_depth) {
- SET_QPEL_FUNCS(put_h264_qpel, 0, 16, mmxext, );
- SET_QPEL_FUNCS(put_h264_qpel, 1, 8, mmxext, );
- SET_QPEL_FUNCS(put_h264_qpel, 2, 4, mmxext, );
- SET_QPEL_FUNCS(avg_h264_qpel, 0, 16, mmxext, );
- SET_QPEL_FUNCS(avg_h264_qpel, 1, 8, mmxext, );
- SET_QPEL_FUNCS(avg_h264_qpel, 2, 4, mmxext, );
- } else if (bit_depth == 10) {
-#if !ARCH_X86_64
- SET_QPEL_FUNCS(avg_h264_qpel, 0, 16, 10_mmxext, ff_);
- SET_QPEL_FUNCS(put_h264_qpel, 0, 16, 10_mmxext, ff_);
- SET_QPEL_FUNCS(put_h264_qpel, 1, 8, 10_mmxext, ff_);
- SET_QPEL_FUNCS(avg_h264_qpel, 1, 8, 10_mmxext, ff_);
-#endif
- SET_QPEL_FUNCS(put_h264_qpel, 2, 4, 10_mmxext, ff_);
- SET_QPEL_FUNCS(avg_h264_qpel, 2, 4, 10_mmxext, ff_);
- }
- }
-
- if (!high_bit_depth && CONFIG_H264CHROMA) {
- c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_rnd_mmxext;
- c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_mmxext;
- c->avg_h264_chroma_pixels_tab[2] = ff_avg_h264_chroma_mc2_mmxext;
- c->put_h264_chroma_pixels_tab[2] = ff_put_h264_chroma_mc2_mmxext;
- }
- if (bit_depth == 10 && CONFIG_H264CHROMA) {
- c->put_h264_chroma_pixels_tab[2] = ff_put_h264_chroma_mc2_10_mmxext;
- c->avg_h264_chroma_pixels_tab[2] = ff_avg_h264_chroma_mc2_10_mmxext;
- c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_10_mmxext;
- c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_10_mmxext;
- }
-
- /* slower than cmov version on AMD */
- if (!(mm_flags & AV_CPU_FLAG_3DNOW))
- c->add_hfyu_median_prediction = ff_add_hfyu_median_prediction_mmxext;
-
- 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 */
-}
-
-static void dsputil_init_3dnow(DSPContext *c, AVCodecContext *avctx,
- int mm_flags)
-{
- const int high_bit_depth = avctx->bits_per_raw_sample > 8;
-
-#if HAVE_INLINE_ASM
- if (!high_bit_depth) {
- c->put_pixels_tab[0][1] = put_pixels16_x2_3dnow;
- c->put_pixels_tab[0][2] = put_pixels16_y2_3dnow;
-
- c->avg_pixels_tab[0][0] = avg_pixels16_3dnow;
- c->avg_pixels_tab[0][1] = avg_pixels16_x2_3dnow;
- c->avg_pixels_tab[0][2] = avg_pixels16_y2_3dnow;
-
- c->put_pixels_tab[1][1] = put_pixels8_x2_3dnow;
- c->put_pixels_tab[1][2] = put_pixels8_y2_3dnow;
-
- c->avg_pixels_tab[1][0] = avg_pixels8_3dnow;
- c->avg_pixels_tab[1][1] = avg_pixels8_x2_3dnow;
- c->avg_pixels_tab[1][2] = avg_pixels8_y2_3dnow;
-
- if (!(avctx->flags & CODEC_FLAG_BITEXACT)){
- c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_3dnow;
- c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_3dnow;
- c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_3dnow;
- c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_3dnow;
-
- c->avg_pixels_tab[0][3] = avg_pixels16_xy2_3dnow;
- c->avg_pixels_tab[1][3] = avg_pixels8_xy2_3dnow;
- }
- }
-
- if (CONFIG_VP3_DECODER && (avctx->codec_id == AV_CODEC_ID_VP3 ||
- avctx->codec_id == AV_CODEC_ID_THEORA)) {
- c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_exact_3dnow;
- c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_exact_3dnow;
- }
-
- c->vorbis_inverse_coupling = vorbis_inverse_coupling_3dnow;
-#endif /* HAVE_INLINE_ASM */
-
-#if HAVE_YASM
- if (!high_bit_depth && CONFIG_H264CHROMA) {
- c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_rnd_3dnow;
- c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_3dnow;
- }
-#endif /* HAVE_YASM */
-}
-
-static void dsputil_init_3dnowext(DSPContext *c, AVCodecContext *avctx,
- int mm_flags)
-{
-#if HAVE_AMD3DNOWEXT_INLINE && HAVE_6REGS
- c->vector_fmul_window = vector_fmul_window_3dnowext;
-#endif
-}
-
-static void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx, int mm_flags)
-{
- const int high_bit_depth = avctx->bits_per_raw_sample > 8;
-
-#if HAVE_INLINE_ASM
- if (!high_bit_depth) {
- if (!(CONFIG_MPEG_XVMC_DECODER && avctx->xvmc_acceleration > 1)) {
- /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */
- c->clear_block = clear_block_sse;
- c->clear_blocks = clear_blocks_sse;
- }
- }
-
- c->vorbis_inverse_coupling = vorbis_inverse_coupling_sse;
-
-#if HAVE_6REGS
- c->vector_fmul_window = vector_fmul_window_sse;
-#endif
-
- c->vector_clipf = vector_clipf_sse;
-#endif /* HAVE_INLINE_ASM */
-
-#if HAVE_YASM
- c->vector_fmul_reverse = ff_vector_fmul_reverse_sse;
- c->vector_fmul_add = ff_vector_fmul_add_sse;
-
- c->scalarproduct_float = ff_scalarproduct_float_sse;
- c->butterflies_float_interleave = ff_butterflies_float_interleave_sse;
-#endif /* HAVE_YASM */
-}
-
-static void dsputil_init_sse2(DSPContext *c, AVCodecContext *avctx,
- int mm_flags)
-{
- const int bit_depth = avctx->bits_per_raw_sample;
- const int high_bit_depth = bit_depth > 8;
-
-#if HAVE_SSE2_INLINE
- if (!high_bit_depth && avctx->idct_algo == FF_IDCT_XVIDMMX) {
- c->idct_put = ff_idct_xvid_sse2_put;
- c->idct_add = ff_idct_xvid_sse2_add;
- c->idct = ff_idct_xvid_sse2;
- c->idct_permutation_type = FF_SSE2_IDCT_PERM;
- }
-#endif /* HAVE_SSE2_INLINE */
-
-#if HAVE_SSE2_EXTERNAL
- if (!(mm_flags & AV_CPU_FLAG_SSE2SLOW)) {
- // these functions are slower than mmx on AMD, but faster on Intel
- if (!high_bit_depth) {
- c->put_pixels_tab[0][0] = ff_put_pixels16_sse2;
- c->put_no_rnd_pixels_tab[0][0] = ff_put_pixels16_sse2;
- c->avg_pixels_tab[0][0] = ff_avg_pixels16_sse2;
- if (CONFIG_H264QPEL)
- H264_QPEL_FUNCS(0, 0, sse2);
- }
- }
-
- if (!high_bit_depth && CONFIG_H264QPEL) {
- H264_QPEL_FUNCS(0, 1, sse2);
- H264_QPEL_FUNCS(0, 2, sse2);
- H264_QPEL_FUNCS(0, 3, sse2);
- H264_QPEL_FUNCS(1, 1, sse2);
- H264_QPEL_FUNCS(1, 2, sse2);
- H264_QPEL_FUNCS(1, 3, sse2);
- H264_QPEL_FUNCS(2, 1, sse2);
- H264_QPEL_FUNCS(2, 2, sse2);
- H264_QPEL_FUNCS(2, 3, sse2);
- H264_QPEL_FUNCS(3, 1, sse2);
- H264_QPEL_FUNCS(3, 2, sse2);
- H264_QPEL_FUNCS(3, 3, sse2);
- }
-
- if (bit_depth == 10) {
- if (CONFIG_H264QPEL) {
- SET_QPEL_FUNCS(put_h264_qpel, 0, 16, 10_sse2, ff_);
- SET_QPEL_FUNCS(put_h264_qpel, 1, 8, 10_sse2, ff_);
- SET_QPEL_FUNCS(avg_h264_qpel, 0, 16, 10_sse2, ff_);
- SET_QPEL_FUNCS(avg_h264_qpel, 1, 8, 10_sse2, ff_);
- H264_QPEL_FUNCS_10(1, 0, sse2_cache64);
- H264_QPEL_FUNCS_10(2, 0, sse2_cache64);
- H264_QPEL_FUNCS_10(3, 0, sse2_cache64);
- }
- if (CONFIG_H264CHROMA) {
- c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_10_sse2;
- c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_10_sse2;
- }
- }
-
- c->scalarproduct_int16 = ff_scalarproduct_int16_sse2;
- c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_sse2;
- if (mm_flags & AV_CPU_FLAG_ATOM) {
- c->vector_clip_int32 = ff_vector_clip_int32_int_sse2;
- } 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 (!(mm_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 */
-}
-
-static void dsputil_init_ssse3(DSPContext *c, AVCodecContext *avctx,
- int mm_flags)
-{
-#if HAVE_SSSE3_EXTERNAL
- const int high_bit_depth = avctx->bits_per_raw_sample > 8;
- const int bit_depth = avctx->bits_per_raw_sample;
-
- if (!high_bit_depth && CONFIG_H264QPEL) {
- H264_QPEL_FUNCS(1, 0, ssse3);
- H264_QPEL_FUNCS(1, 1, ssse3);
- H264_QPEL_FUNCS(1, 2, ssse3);
- H264_QPEL_FUNCS(1, 3, ssse3);
- H264_QPEL_FUNCS(2, 0, ssse3);
- H264_QPEL_FUNCS(2, 1, ssse3);
- H264_QPEL_FUNCS(2, 2, ssse3);
- H264_QPEL_FUNCS(2, 3, ssse3);
- H264_QPEL_FUNCS(3, 0, ssse3);
- H264_QPEL_FUNCS(3, 1, ssse3);
- H264_QPEL_FUNCS(3, 2, ssse3);
- H264_QPEL_FUNCS(3, 3, ssse3);
- }
- if (bit_depth == 10 && CONFIG_H264QPEL) {
- H264_QPEL_FUNCS_10(1, 0, ssse3_cache64);
- H264_QPEL_FUNCS_10(2, 0, ssse3_cache64);
- H264_QPEL_FUNCS_10(3, 0, ssse3_cache64);
- }
- if (!high_bit_depth && CONFIG_H264CHROMA) {
- c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_rnd_ssse3;
- c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_rnd_ssse3;
- c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_ssse3;
- c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_ssse3;
- }
- c->add_hfyu_left_prediction = ff_add_hfyu_left_prediction_ssse3;
- if (mm_flags & AV_CPU_FLAG_SSE4) // not really sse4, just slow on Conroe
- c->add_hfyu_left_prediction = ff_add_hfyu_left_prediction_sse4;
-
- if (mm_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 (!(mm_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;
-#endif /* HAVE_SSSE3_EXTERNAL */
-}
-
-static void dsputil_init_sse4(DSPContext *c, AVCodecContext *avctx,
- int mm_flags)
-{
-#if HAVE_SSE4_EXTERNAL
- c->vector_clip_int32 = ff_vector_clip_int32_sse4;
-#endif /* HAVE_SSE4_EXTERNAL */
-}
-
-static void dsputil_init_avx(DSPContext *c, AVCodecContext *avctx, int mm_flags)
-{
-#if HAVE_AVX_EXTERNAL
- const int bit_depth = avctx->bits_per_raw_sample;
-
- if (bit_depth == 10) {
- // AVX implies !cache64.
- // TODO: Port cache(32|64) detection from x264.
- if (CONFIG_H264QPEL) {
- H264_QPEL_FUNCS_10(1, 0, sse2);
- H264_QPEL_FUNCS_10(2, 0, sse2);
- H264_QPEL_FUNCS_10(3, 0, sse2);
- }
-
- if (CONFIG_H264CHROMA) {
- c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_10_avx;
- c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_10_avx;
- }
- }
- c->butterflies_float_interleave = ff_butterflies_float_interleave_avx;
- c->vector_fmul_reverse = ff_vector_fmul_reverse_avx;
- c->vector_fmul_add = ff_vector_fmul_add_avx;
-#endif /* HAVE_AVX_EXTERNAL */
-}
-
-void ff_dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx)
-{
- int mm_flags = av_get_cpu_flags();
-
-#if HAVE_7REGS && HAVE_INLINE_ASM
- if (mm_flags & AV_CPU_FLAG_CMOV)
- c->add_hfyu_median_prediction = add_hfyu_median_prediction_cmov;
-#endif
-
- if (mm_flags & AV_CPU_FLAG_MMX)
- dsputil_init_mmx(c, avctx, mm_flags);
-
- if (mm_flags & AV_CPU_FLAG_MMXEXT)
- dsputil_init_mmxext(c, avctx, mm_flags);
-
- if (mm_flags & AV_CPU_FLAG_3DNOW)
- dsputil_init_3dnow(c, avctx, mm_flags);
-
- if (mm_flags & AV_CPU_FLAG_3DNOWEXT)
- dsputil_init_3dnowext(c, avctx, mm_flags);
-
- if (mm_flags & AV_CPU_FLAG_SSE)
- dsputil_init_sse(c, avctx, mm_flags);
-
- if (mm_flags & AV_CPU_FLAG_SSE2)
- dsputil_init_sse2(c, avctx, mm_flags);
-
- if (mm_flags & AV_CPU_FLAG_SSSE3)
- dsputil_init_ssse3(c, avctx, mm_flags);
-
- if (mm_flags & AV_CPU_FLAG_SSE4)
- dsputil_init_sse4(c, avctx, mm_flags);
-
- if (mm_flags & AV_CPU_FLAG_AVX)
- dsputil_init_avx(c, avctx, mm_flags);
-
- if (CONFIG_ENCODERS)
- ff_dsputilenc_init_mmx(c, avctx);
-}

libav-v10.1.tar.bz2/libavcodec/x86/dsputil_x86.c Added

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2009 Loren Merritt <lorenm@u.washington.edu>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "libavutil/x86/asm.h"
+#include "dsputil_x86.h"
+
+#if HAVE_INLINE_ASM
+
+#if HAVE_7REGS
+void ff_add_hfyu_median_prediction_cmov(uint8_t *dst, const uint8_t *top,
+ const uint8_t *diff, int w,
+ int *left, int *left_top)
+{
+ x86_reg w2 = -w;
+ x86_reg x;
+ int l = *left & 0xff;
+ int tl = *left_top & 0xff;
+ int t;
+ __asm__ volatile (
+ "mov %7, %3 \n"
+ "1: \n"
+ "movzbl (%3, %4), %2 \n"
+ "mov %2, %k3 \n"
+ "sub %b1, %b3 \n"
+ "add %b0, %b3 \n"
+ "mov %2, %1 \n"
+ "cmp %0, %2 \n"
+ "cmovg %0, %2 \n"
+ "cmovg %1, %0 \n"
+ "cmp %k3, %0 \n"
+ "cmovg %k3, %0 \n"
+ "mov %7, %3 \n"
+ "cmp %2, %0 \n"
+ "cmovl %2, %0 \n"
+ "add (%6, %4), %b0 \n"
+ "mov %b0, (%5, %4) \n"
+ "inc %4 \n"
+ "jl 1b \n"
+ : "+&q"(l), "+&q"(tl), "=&r"(t), "=&q"(x), "+&r"(w2)
+ : "r"(dst + w), "r"(diff + w), "rm"(top + w)
+ );
+ *left = l;
+ *left_top = tl;
+}
+#endif
+
+#endif /* HAVE_INLINE_ASM */

libav-v10.1.tar.bz2/libavcodec/x86/dsputil_x86.h Added

@@ -0,0 +1,189 @@
+/*
+ * MMX optimized DSP utils
+ * Copyright (c) 2007 Aurelien Jacobs <aurel@gnuage.org>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_X86_DSPUTIL_X86_H
+#define AVCODEC_X86_DSPUTIL_X86_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "libavcodec/dsputil.h"
+#include "libavutil/x86/asm.h"
+#include "constants.h"
+
+#define MOVQ_WONE(regd) \
+ __asm__ volatile ( \
+ "pcmpeqd %%" #regd ", %%" #regd " \n\t" \
+ "psrlw $15, %%" #regd ::)
+
+#define JUMPALIGN() __asm__ volatile (".p2align 3"::)
+#define MOVQ_ZERO(regd) __asm__ volatile ("pxor %%"#regd", %%"#regd ::)
+
+#define MOVQ_BFE(regd) \
+ __asm__ volatile ( \
+ "pcmpeqd %%"#regd", %%"#regd" \n\t" \
+ "paddb %%"#regd", %%"#regd" \n\t" ::)
+
+#ifndef PIC
+#define MOVQ_WTWO(regd) __asm__ volatile ("movq %0, %%"#regd" \n\t" :: "m"(ff_wtwo))
+#else
+// for shared library it's better to use this way for accessing constants
+// pcmpeqd -> -1
+#define MOVQ_WTWO(regd) \
+ __asm__ volatile ( \
+ "pcmpeqd %%"#regd", %%"#regd" \n\t" \
+ "psrlw $15, %%"#regd" \n\t" \
+ "psllw $1, %%"#regd" \n\t"::)
+
+#endif
+
+// using regr as temporary and for the output result
+// first argument is unmodifed and second is trashed
+// regfe is supposed to contain 0xfefefefefefefefe
+#define PAVGB_MMX_NO_RND(rega, regb, regr, regfe) \
+ "movq "#rega", "#regr" \n\t" \
+ "pand "#regb", "#regr" \n\t" \
+ "pxor "#rega", "#regb" \n\t" \
+ "pand "#regfe", "#regb" \n\t" \
+ "psrlq $1, "#regb" \n\t" \
+ "paddb "#regb", "#regr" \n\t"
+
+#define PAVGB_MMX(rega, regb, regr, regfe) \
+ "movq "#rega", "#regr" \n\t" \
+ "por "#regb", "#regr" \n\t" \
+ "pxor "#rega", "#regb" \n\t" \
+ "pand "#regfe", "#regb" \n\t" \
+ "psrlq $1, "#regb" \n\t" \
+ "psubb "#regb", "#regr" \n\t"
+
+// mm6 is supposed to contain 0xfefefefefefefefe
+#define PAVGBP_MMX_NO_RND(rega, regb, regr, regc, regd, regp) \
+ "movq "#rega", "#regr" \n\t" \
+ "movq "#regc", "#regp" \n\t" \
+ "pand "#regb", "#regr" \n\t" \
+ "pand "#regd", "#regp" \n\t" \
+ "pxor "#rega", "#regb" \n\t" \
+ "pxor "#regc", "#regd" \n\t" \
+ "pand %%mm6, "#regb" \n\t" \
+ "pand %%mm6, "#regd" \n\t" \
+ "psrlq $1, "#regb" \n\t" \
+ "psrlq $1, "#regd" \n\t" \
+ "paddb "#regb", "#regr" \n\t" \
+ "paddb "#regd", "#regp" \n\t"
+
+#define PAVGBP_MMX(rega, regb, regr, regc, regd, regp) \
+ "movq "#rega", "#regr" \n\t" \
+ "movq "#regc", "#regp" \n\t" \
+ "por "#regb", "#regr" \n\t" \
+ "por "#regd", "#regp" \n\t" \
+ "pxor "#rega", "#regb" \n\t" \
+ "pxor "#regc", "#regd" \n\t" \
+ "pand %%mm6, "#regb" \n\t" \
+ "pand %%mm6, "#regd" \n\t" \
+ "psrlq $1, "#regd" \n\t" \
+ "psrlq $1, "#regb" \n\t" \
+ "psubb "#regb", "#regr" \n\t" \
+ "psubb "#regd", "#regp" \n\t"
+
+void ff_dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx);
+void ff_dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx);
+
+void ff_add_pixels_clamped_mmx(const int16_t *block, uint8_t *pixels, int line_size);
+void ff_put_pixels_clamped_mmx(const int16_t *block, uint8_t *pixels, int line_size);
+void ff_put_signed_pixels_clamped_mmx(const int16_t *block, uint8_t *pixels, int line_size);
+
+void ff_clear_block_mmx(int16_t *block);
+void ff_clear_block_sse(int16_t *block);
+void ff_clear_blocks_mmx(int16_t *blocks);
+void ff_clear_blocks_sse(int16_t *blocks);
+
+void ff_add_bytes_mmx(uint8_t *dst, uint8_t *src, int w);
+
+void ff_add_hfyu_median_prediction_cmov(uint8_t *dst, const uint8_t *top,
+ const uint8_t *diff, int w,
+ int *left, int *left_top);
+
+void ff_draw_edges_mmx(uint8_t *buf, int wrap, int width, int height,
+ int w, int h, int sides);
+
+void ff_gmc_mmx(uint8_t *dst, uint8_t *src,
+ int stride, int h, int ox, int oy,
+ int dxx, int dxy, int dyx, int dyy,
+ int shift, int r, int width, int height);
+
+void ff_vector_clipf_sse(float *dst, const float *src,
+ float min, float max, int len);
+
+void ff_avg_pixels8_mmx(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_avg_pixels16_mmx(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_pixels8_mmx(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_pixels16_mmx(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_avg_pixels8_mmxext(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_pixels8_mmxext(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_avg_pixels16_sse2(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_pixels16_sse2(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+
+void ff_avg_pixels8_x2_mmx(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+
+void ff_avg_pixels8_xy2_mmx(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_avg_pixels16_xy2_mmx(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+
+void ff_put_pixels8_xy2_mmx(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_pixels16_xy2_mmx(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+
+void ff_deinterlace_line_mmx(uint8_t *dst,
+ const uint8_t *lum_m4, const uint8_t *lum_m3,
+ const uint8_t *lum_m2, const uint8_t *lum_m1,
+ const uint8_t *lum,
+ int size);
+
+void ff_deinterlace_line_inplace_mmx(const uint8_t *lum_m4,
+ const uint8_t *lum_m3,
+ const uint8_t *lum_m2,
+ const uint8_t *lum_m1,
+ const uint8_t *lum, int size);
+
+#define PIXELS16(STATIC, PFX1, PFX2, TYPE, CPUEXT) \
+STATIC void PFX1 ## _pixels16 ## TYPE ## CPUEXT(uint8_t *block, \
+ const uint8_t *pixels, \
+ ptrdiff_t line_size, \
+ int h) \
+{ \
+ PFX2 ## PFX1 ## _pixels8 ## TYPE ## CPUEXT(block, pixels, \
+ line_size, h); \
+ PFX2 ## PFX1 ## _pixels8 ## TYPE ## CPUEXT(block + 8, pixels + 8, \
+ line_size, h); \
+}
+
+#endif /* AVCODEC_X86_DSPUTIL_X86_H */

libav-v9.6.tar.bz2/libavcodec/x86/dsputilenc.asm -> libav-v10.1.tar.bz2/libavcodec/x86/dsputilenc.asm Changed

@@ -257,15 +257,12 @@
 %endmacro
 
 INIT_MMX mmx
-%define ABS1 ABS1_MMX
 HADAMARD8_DIFF
 
 INIT_MMX mmxext
-%define ABS1 ABS1_MMXEXT
 HADAMARD8_DIFF
 
 INIT_XMM sse2
-%define ABS2 ABS2_MMXEXT
 %if ARCH_X86_64
 %define ABS_SUM_8x8 ABS_SUM_8x8_64
 %else
@@ -274,7 +271,6 @@
 HADAMARD8_DIFF 10
 
 INIT_XMM ssse3
-%define ABS2        ABS2_SSSE3
 %define ABS_SUM_8x8 ABS_SUM_8x8_64
 HADAMARD8_DIFF 9
 
@@ -337,3 +333,155 @@
     paddd     m7, m1
     movd     eax, m7         ; return value
     RET
+
+INIT_MMX mmx
+; get_pixels_mmx(int16_t *block, const uint8_t *pixels, int line_size)
+cglobal get_pixels, 3,4
+    movsxdifnidn r2, r2d
+    add          r0, 128
+    mov          r3, -128
+    pxor         m7, m7
+.loop:
+    mova         m0, [r1]
+    mova         m2, [r1+r2]
+    mova         m1, m0
+    mova         m3, m2
+    punpcklbw    m0, m7
+    punpckhbw    m1, m7
+    punpcklbw    m2, m7
+    punpckhbw    m3, m7
+    mova [r0+r3+ 0], m0
+    mova [r0+r3+ 8], m1
+    mova [r0+r3+16], m2
+    mova [r0+r3+24], m3
+    lea          r1, [r1+r2*2]
+    add          r3, 32
+    js .loop
+    REP_RET
+
+INIT_XMM sse2
+cglobal get_pixels, 3, 4
+    movsxdifnidn r2, r2d
+    lea          r3, [r2*3]
+    pxor         m4, m4
+    movh         m0, [r1]
+    movh         m1, [r1+r2]
+    movh         m2, [r1+r2*2]
+    movh         m3, [r1+r3]
+    lea          r1, [r1+r2*4]
+    punpcklbw    m0, m4
+    punpcklbw    m1, m4
+    punpcklbw    m2, m4
+    punpcklbw    m3, m4
+    mova       [r0], m0
+    mova  [r0+0x10], m1
+    mova  [r0+0x20], m2
+    mova  [r0+0x30], m3
+    movh         m0, [r1]
+    movh         m1, [r1+r2*1]
+    movh         m2, [r1+r2*2]
+    movh         m3, [r1+r3]
+    punpcklbw    m0, m4
+    punpcklbw    m1, m4
+    punpcklbw    m2, m4
+    punpcklbw    m3, m4
+    mova  [r0+0x40], m0
+    mova  [r0+0x50], m1
+    mova  [r0+0x60], m2
+    mova  [r0+0x70], m3
+    RET
+
+INIT_MMX mmx
+; diff_pixels_mmx(int16_t *block, const uint8_t *s1, const unint8_t *s2, stride)
+cglobal diff_pixels, 4,5
+    movsxdifnidn r3, r3d
+    pxor         m7, m7
+    add          r0,  128
+    mov          r4, -128
+.loop:
+    mova         m0, [r1]
+    mova         m2, [r2]
+    mova         m1, m0
+    mova         m3, m2
+    punpcklbw    m0, m7
+    punpckhbw    m1, m7
+    punpcklbw    m2, m7
+    punpckhbw    m3, m7
+    psubw        m0, m2
+    psubw        m1, m3
+    mova  [r0+r4+0], m0
+    mova  [r0+r4+8], m1
+    add          r1, r3
+    add          r2, r3
+    add          r4, 16
+    jne .loop
+    REP_RET
+
+INIT_MMX mmx
+; pix_sum16_mmx(uint8_t * pix, int line_size)
+cglobal pix_sum16, 2, 3
+    movsxdifnidn r1, r1d
+    mov          r2, r1
+    neg          r2
+    shl          r2, 4
+    sub          r0, r2
+    pxor         m7, m7
+    pxor         m6, m6
+.loop:
+    mova         m0, [r0+r2+0]
+    mova         m1, [r0+r2+0]
+    mova         m2, [r0+r2+8]
+    mova         m3, [r0+r2+8]
+    punpcklbw    m0, m7
+    punpckhbw    m1, m7
+    punpcklbw    m2, m7
+    punpckhbw    m3, m7
+    paddw        m1, m0
+    paddw        m3, m2
+    paddw        m3, m1
+    paddw        m6, m3
+    add          r2, r1
+    js .loop
+    mova         m5, m6
+    psrlq        m6, 32
+    paddw        m6, m5
+    mova         m5, m6
+    psrlq        m6, 16
+    paddw        m6, m5
+    movd        eax, m6
+    and         eax, 0xffff
+    RET
+
+INIT_MMX mmx
+; pix_norm1_mmx(uint8_t *pix, int line_size)
+cglobal pix_norm1, 2, 4
+    movsxdifnidn r1, r1d
+    mov          r2, 16
+    pxor         m0, m0
+    pxor         m7, m7
+.loop:
+    mova         m2, [r0+0]
+    mova         m3, [r0+8]
+    mova         m1, m2
+    punpckhbw    m1, m0
+    punpcklbw    m2, m0
+    mova         m4, m3
+    punpckhbw    m3, m0
+    punpcklbw    m4, m0
+    pmaddwd      m1, m1
+    pmaddwd      m2, m2
+    pmaddwd      m3, m3
+    pmaddwd      m4, m4
+    paddd        m2, m1
+    paddd        m4, m3
+    paddd        m7, m2
+    add          r0, r1
+    paddd        m7, m4
+    dec r2
+    jne .loop
+    mova         m1, m7
+    psrlq        m7, 32
+    paddd        m1, m7
+    movd        eax, m1
+    RET
+

libav-v9.6.tar.bz2/libavcodec/x86/dsputilenc_mmx.c -> libav-v10.1.tar.bz2/libavcodec/x86/dsputilenc_mmx.c Changed

@@ -3,6 +3,8 @@
 * Copyright (c) 2000, 2001 Fabrice Bellard
 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
 *
+ * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
+ *
 * This file is part of Libav.
 *
 * Libav is free software; you can redistribute it and/or
@@ -18,193 +20,26 @@
 * You should have received a copy of the GNU Lesser General Public
 * License along with Libav; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
 */
 
+#include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
+#include "libavcodec/dct.h"
 #include "libavcodec/dsputil.h"
 #include "libavcodec/mpegvideo.h"
 #include "libavcodec/mathops.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
+void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, int line_size);
+void ff_get_pixels_sse2(int16_t *block, const uint8_t *pixels, int line_size);
+void ff_diff_pixels_mmx(int16_t *block, const uint8_t *s1, const uint8_t *s2, int stride);
+int ff_pix_sum16_mmx(uint8_t * pix, int line_size);
+int ff_pix_norm1_mmx(uint8_t *pix, int line_size);
 
 #if HAVE_INLINE_ASM
 
-static void get_pixels_mmx(DCTELEM *block, const uint8_t *pixels, int line_size)
-{
- __asm__ volatile(
- "mov $-128, %%"REG_a" \n\t"
- "pxor %%mm7, %%mm7 \n\t"
- ".p2align 4 \n\t"
- "1: \n\t"
- "movq (%0), %%mm0 \n\t"
- "movq (%0, %2), %%mm2 \n\t"
- "movq %%mm0, %%mm1 \n\t"
- "movq %%mm2, %%mm3 \n\t"
- "punpcklbw %%mm7, %%mm0 \n\t"
- "punpckhbw %%mm7, %%mm1 \n\t"
- "punpcklbw %%mm7, %%mm2 \n\t"
- "punpckhbw %%mm7, %%mm3 \n\t"
- "movq %%mm0, (%1, %%"REG_a") \n\t"
- "movq %%mm1, 8(%1, %%"REG_a") \n\t"
- "movq %%mm2, 16(%1, %%"REG_a") \n\t"
- "movq %%mm3, 24(%1, %%"REG_a") \n\t"
- "add %3, %0 \n\t"
- "add $32, %%"REG_a" \n\t"
- "js 1b \n\t"
- : "+r" (pixels)
- : "r" (block+64), "r" ((x86_reg)line_size), "r" ((x86_reg)line_size*2)
- : "%"REG_a
- );
-}
-
-static void get_pixels_sse2(DCTELEM *block, const uint8_t *pixels, int line_size)
-{
- __asm__ volatile(
- "pxor %%xmm4, %%xmm4 \n\t"
- "movq (%0), %%xmm0 \n\t"
- "movq (%0, %2), %%xmm1 \n\t"
- "movq (%0, %2,2), %%xmm2 \n\t"
- "movq (%0, %3), %%xmm3 \n\t"
- "lea (%0,%2,4), %0 \n\t"
- "punpcklbw %%xmm4, %%xmm0 \n\t"
- "punpcklbw %%xmm4, %%xmm1 \n\t"
- "punpcklbw %%xmm4, %%xmm2 \n\t"
- "punpcklbw %%xmm4, %%xmm3 \n\t"
- "movdqa %%xmm0, (%1) \n\t"
- "movdqa %%xmm1, 16(%1) \n\t"
- "movdqa %%xmm2, 32(%1) \n\t"
- "movdqa %%xmm3, 48(%1) \n\t"
- "movq (%0), %%xmm0 \n\t"
- "movq (%0, %2), %%xmm1 \n\t"
- "movq (%0, %2,2), %%xmm2 \n\t"
- "movq (%0, %3), %%xmm3 \n\t"
- "punpcklbw %%xmm4, %%xmm0 \n\t"
- "punpcklbw %%xmm4, %%xmm1 \n\t"
- "punpcklbw %%xmm4, %%xmm2 \n\t"
- "punpcklbw %%xmm4, %%xmm3 \n\t"
- "movdqa %%xmm0, 64(%1) \n\t"
- "movdqa %%xmm1, 80(%1) \n\t"
- "movdqa %%xmm2, 96(%1) \n\t"
- "movdqa %%xmm3, 112(%1) \n\t"
- : "+r" (pixels)
- : "r" (block), "r" ((x86_reg)line_size), "r" ((x86_reg)line_size*3)
- );
-}
-
-static inline void diff_pixels_mmx(DCTELEM *block, const uint8_t *s1, const uint8_t *s2, int stride)
-{
- __asm__ volatile(
- "pxor %%mm7, %%mm7 \n\t"
- "mov $-128, %%"REG_a" \n\t"
- ".p2align 4 \n\t"
- "1: \n\t"
- "movq (%0), %%mm0 \n\t"
- "movq (%1), %%mm2 \n\t"
- "movq %%mm0, %%mm1 \n\t"
- "movq %%mm2, %%mm3 \n\t"
- "punpcklbw %%mm7, %%mm0 \n\t"
- "punpckhbw %%mm7, %%mm1 \n\t"
- "punpcklbw %%mm7, %%mm2 \n\t"
- "punpckhbw %%mm7, %%mm3 \n\t"
- "psubw %%mm2, %%mm0 \n\t"
- "psubw %%mm3, %%mm1 \n\t"
- "movq %%mm0, (%2, %%"REG_a") \n\t"
- "movq %%mm1, 8(%2, %%"REG_a") \n\t"
- "add %3, %0 \n\t"
- "add %3, %1 \n\t"
- "add $16, %%"REG_a" \n\t"
- "jnz 1b \n\t"
- : "+r" (s1), "+r" (s2)
- : "r" (block+64), "r" ((x86_reg)stride)
- : "%"REG_a
- );
-}
-
-static int pix_sum16_mmx(uint8_t * pix, int line_size){
- const int h=16;
- int sum;
- x86_reg index= -line_size*h;
-
- __asm__ volatile(
- "pxor %%mm7, %%mm7 \n\t"
- "pxor %%mm6, %%mm6 \n\t"
- "1: \n\t"
- "movq (%2, %1), %%mm0 \n\t"
- "movq (%2, %1), %%mm1 \n\t"
- "movq 8(%2, %1), %%mm2 \n\t"
- "movq 8(%2, %1), %%mm3 \n\t"
- "punpcklbw %%mm7, %%mm0 \n\t"
- "punpckhbw %%mm7, %%mm1 \n\t"
- "punpcklbw %%mm7, %%mm2 \n\t"
- "punpckhbw %%mm7, %%mm3 \n\t"
- "paddw %%mm0, %%mm1 \n\t"
- "paddw %%mm2, %%mm3 \n\t"
- "paddw %%mm1, %%mm3 \n\t"
- "paddw %%mm3, %%mm6 \n\t"
- "add %3, %1 \n\t"
- " js 1b \n\t"
- "movq %%mm6, %%mm5 \n\t"
- "psrlq $32, %%mm6 \n\t"
- "paddw %%mm5, %%mm6 \n\t"
- "movq %%mm6, %%mm5 \n\t"
- "psrlq $16, %%mm6 \n\t"
- "paddw %%mm5, %%mm6 \n\t"
- "movd %%mm6, %0 \n\t"
- "andl $0xFFFF, %0 \n\t"
- : "=&r" (sum), "+r" (index)
- : "r" (pix - index), "r" ((x86_reg)line_size)
- );
-
- return sum;
-}
-
-static int pix_norm1_mmx(uint8_t *pix, int line_size) {
- int tmp;
- __asm__ volatile (
- "movl $16,%%ecx\n"
- "pxor %%mm0,%%mm0\n"
- "pxor %%mm7,%%mm7\n"
- "1:\n"
- "movq (%0),%%mm2\n" /* mm2 = pix[0-7] */
- "movq 8(%0),%%mm3\n" /* mm3 = pix[8-15] */
-
- "movq %%mm2,%%mm1\n" /* mm1 = mm2 = pix[0-7] */
-
- "punpckhbw %%mm0,%%mm1\n" /* mm1 = [pix4-7] */
- "punpcklbw %%mm0,%%mm2\n" /* mm2 = [pix0-3] */
-
- "movq %%mm3,%%mm4\n" /* mm4 = mm3 = pix[8-15] */
- "punpckhbw %%mm0,%%mm3\n" /* mm3 = [pix12-15] */
- "punpcklbw %%mm0,%%mm4\n" /* mm4 = [pix8-11] */
-
- "pmaddwd %%mm1,%%mm1\n" /* mm1 = (pix0^2+pix1^2,pix2^2+pix3^2) */
- "pmaddwd %%mm2,%%mm2\n" /* mm2 = (pix4^2+pix5^2,pix6^2+pix7^2) */
-
- "pmaddwd %%mm3,%%mm3\n"
- "pmaddwd %%mm4,%%mm4\n"
-
- "paddd %%mm1,%%mm2\n" /* mm2 = (pix0^2+pix1^2+pix4^2+pix5^2,
- pix2^2+pix3^2+pix6^2+pix7^2) */
- "paddd %%mm3,%%mm4\n"
- "paddd %%mm2,%%mm7\n"
-
- "add %2, %0\n"
- "paddd %%mm4,%%mm7\n"
- "dec %%ecx\n"
- "jnz 1b\n"
-
- "movq %%mm7,%%mm1\n"
- "psrlq $32, %%mm7\n" /* shift hi dword to lo */
- "paddd %%mm7,%%mm1\n"
- "movd %%mm1,%1\n"
- : "+r" (pix), "=r"(tmp) : "r" ((x86_reg)line_size) : "%ecx" );
- return tmp;
-}
-
 static int sse8_mmx(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h) {
 int tmp;
 __asm__ volatile (
@@ -964,7 +799,7 @@
 HSUM(%%xmm0, %%xmm1, %0)
 
 #define DCT_SAD_FUNC(cpu) \
-static int sum_abs_dctelem_##cpu(DCTELEM *block){\
+static int sum_abs_dctelem_##cpu(int16_t *block){\
 int sum;\
 __asm__ volatile(\
 DCT_SAD\
@@ -1108,35 +943,36 @@
 hadamard_func(sse2)
 hadamard_func(ssse3)
 
-void ff_dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx)
+av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx)
 {
- int mm_flags = av_get_cpu_flags();
+ int cpu_flags = av_get_cpu_flags();
+ const int dct_algo = avctx->dct_algo;
 
-#if HAVE_INLINE_ASM
+#if HAVE_YASM
 int bit_depth = avctx->bits_per_raw_sample;
 
- if (mm_flags & AV_CPU_FLAG_MMX) {
- const int dct_algo = avctx->dct_algo;
- if (avctx->bits_per_raw_sample <= 8 &&
- (dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX)) {
- if(mm_flags & AV_CPU_FLAG_SSE2){
- c->fdct = ff_fdct_sse2;
- } else if (mm_flags & AV_CPU_FLAG_MMXEXT) {
- c->fdct = ff_fdct_mmxext;
- }else{
- c->fdct = ff_fdct_mmx;
- }
- }
+ if (EXTERNAL_MMX(cpu_flags)) {
+ if (bit_depth <= 8)
+ c->get_pixels = ff_get_pixels_mmx;
+ c->diff_pixels = ff_diff_pixels_mmx;
+ c->pix_sum = ff_pix_sum16_mmx;
 
+ c->pix_norm1 = ff_pix_norm1_mmx;
+ }
+ if (EXTERNAL_SSE2(cpu_flags))
 if (bit_depth <= 8)
- c->get_pixels = get_pixels_mmx;
- c->diff_pixels = diff_pixels_mmx;
- c->pix_sum = pix_sum16_mmx;
+ c->get_pixels = ff_get_pixels_sse2;
+#endif /* HAVE_YASM */
+
+#if HAVE_INLINE_ASM
+ if (INLINE_MMX(cpu_flags)) {
+ if (avctx->bits_per_raw_sample <= 8 &&
+ (dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX))
+ c->fdct = ff_fdct_mmx;
 
 c->diff_bytes= diff_bytes_mmx;
 c->sum_abs_dctelem= sum_abs_dctelem_mmx;
 
- c->pix_norm1 = pix_norm1_mmx;
 c->sse[0] = sse16_mmx;
 c->sse[1] = sse8_mmx;
 c->vsad[4]= vsad_intra16_mmx;
@@ -1153,65 +989,71 @@
 c->add_8x8basis= add_8x8basis_mmx;
 
 c->ssd_int8_vs_int16 = ssd_int8_vs_int16_mmx;
+ }
+
+ if (INLINE_AMD3DNOW(cpu_flags)) {
+ if (!(avctx->flags & CODEC_FLAG_BITEXACT)) {
+ c->try_8x8basis = try_8x8basis_3dnow;
+ }
+ c->add_8x8basis = add_8x8basis_3dnow;
+ }
 
- if (mm_flags & AV_CPU_FLAG_MMXEXT) {
- c->sum_abs_dctelem = sum_abs_dctelem_mmxext;
- c->vsad[4] = vsad_intra16_mmxext;
+ if (INLINE_MMXEXT(cpu_flags)) {
+ if (avctx->bits_per_raw_sample <= 8 &&
+ (dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX))
+ c->fdct = ff_fdct_mmxext;
 
- if(!(avctx->flags & CODEC_FLAG_BITEXACT)){
- c->vsad[0] = vsad16_mmxext;
- }
+ c->sum_abs_dctelem = sum_abs_dctelem_mmxext;
+ c->vsad[4] = vsad_intra16_mmxext;
 
- c->sub_hfyu_median_prediction = sub_hfyu_median_prediction_mmxext;
+ if (!(avctx->flags & CODEC_FLAG_BITEXACT)){
+ c->vsad[0] = vsad16_mmxext;
 }
 
- if(mm_flags & AV_CPU_FLAG_SSE2){
- if (bit_depth <= 8)
- c->get_pixels = get_pixels_sse2;
- c->sum_abs_dctelem= sum_abs_dctelem_sse2;
- }
+ c->sub_hfyu_median_prediction = sub_hfyu_median_prediction_mmxext;
+ }
 
-#if HAVE_SSSE3_INLINE
- if(mm_flags & AV_CPU_FLAG_SSSE3){
- if(!(avctx->flags & CODEC_FLAG_BITEXACT)){
- c->try_8x8basis= try_8x8basis_ssse3;
- }
- c->add_8x8basis= add_8x8basis_ssse3;
- c->sum_abs_dctelem= sum_abs_dctelem_ssse3;
- }
-#endif
+ if (INLINE_SSE2(cpu_flags)) {
+ if (avctx->bits_per_raw_sample <= 8 &&
+ (dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX))
+ c->fdct = ff_fdct_sse2;
 
- if(mm_flags & AV_CPU_FLAG_3DNOW){
- if(!(avctx->flags & CODEC_FLAG_BITEXACT)){
- c->try_8x8basis= try_8x8basis_3dnow;
- }
- c->add_8x8basis= add_8x8basis_3dnow;
+ c->sum_abs_dctelem= sum_abs_dctelem_sse2;
+ }
+
+#if HAVE_SSSE3_INLINE
+ if (INLINE_SSSE3(cpu_flags)) {
+ if (!(avctx->flags & CODEC_FLAG_BITEXACT)) {
+ c->try_8x8basis = try_8x8basis_ssse3;
 }
+ c->add_8x8basis = add_8x8basis_ssse3;
+ c->sum_abs_dctelem = sum_abs_dctelem_ssse3;
 }
+#endif
 #endif /* HAVE_INLINE_ASM */
 
- if (EXTERNAL_MMX(mm_flags)) {
+ if (EXTERNAL_MMX(cpu_flags)) {
 c->hadamard8_diff[0] = ff_hadamard8_diff16_mmx;
 c->hadamard8_diff[1] = ff_hadamard8_diff_mmx;
+ }
 
- if (EXTERNAL_MMXEXT(mm_flags)) {
- c->hadamard8_diff[0] = ff_hadamard8_diff16_mmxext;
- c->hadamard8_diff[1] = ff_hadamard8_diff_mmxext;
- }
+ if (EXTERNAL_MMXEXT(cpu_flags)) {
+ c->hadamard8_diff[0] = ff_hadamard8_diff16_mmxext;
+ c->hadamard8_diff[1] = ff_hadamard8_diff_mmxext;
+ }
 
- if (EXTERNAL_SSE2(mm_flags)) {
- c->sse[0] = ff_sse16_sse2;
+ if (EXTERNAL_SSE2(cpu_flags)) {
+ c->sse[0] = ff_sse16_sse2;
 
 #if HAVE_ALIGNED_STACK
- c->hadamard8_diff[0] = ff_hadamard8_diff16_sse2;
- c->hadamard8_diff[1] = ff_hadamard8_diff_sse2;
+ c->hadamard8_diff[0] = ff_hadamard8_diff16_sse2;
+ c->hadamard8_diff[1] = ff_hadamard8_diff_sse2;
 #endif
- }
+ }
 
- if (EXTERNAL_SSSE3(mm_flags) && HAVE_ALIGNED_STACK) {
- c->hadamard8_diff[0] = ff_hadamard8_diff16_ssse3;
- c->hadamard8_diff[1] = ff_hadamard8_diff_ssse3;
- }
+ if (EXTERNAL_SSSE3(cpu_flags) && HAVE_ALIGNED_STACK) {
+ c->hadamard8_diff[0] = ff_hadamard8_diff16_ssse3;
+ c->hadamard8_diff[1] = ff_hadamard8_diff_ssse3;
 }
 
 ff_dsputil_init_pix_mmx(c, avctx);

libav-v9.6.tar.bz2/libavcodec/x86/fdct.c -> libav-v10.1.tar.bz2/libavcodec/x86/fdct.c Changed

libav-v9.6.tar.bz2/libavcodec/x86/fft.asm -> libav-v10.1.tar.bz2/libavcodec/x86/fft.asm Changed

libav-v9.6.tar.bz2/libavcodec/x86/fft.h -> libav-v10.1.tar.bz2/libavcodec/x86/fft.h Changed

libav-v9.6.tar.bz2/libavcodec/x86/fft_init.c -> libav-v10.1.tar.bz2/libavcodec/x86/fft_init.c Changed

@@ -16,30 +16,31 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
+#include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/x86/cpu.h"
-#include "libavcodec/dsputil.h"
-#include "libavcodec/dct.h"
 #include "fft.h"
 
 av_cold void ff_fft_init_x86(FFTContext *s)
 {
-    int has_vectors = av_get_cpu_flags();
+    int cpu_flags = av_get_cpu_flags();
+
 #if ARCH_X86_32
-    if (EXTERNAL_AMD3DNOW(has_vectors)) {
+    if (EXTERNAL_AMD3DNOW(cpu_flags)) {
         /* 3DNow! for K6-2/3 */
         s->imdct_calc = ff_imdct_calc_3dnow;
         s->imdct_half = ff_imdct_half_3dnow;
         s->fft_calc   = ff_fft_calc_3dnow;
     }
-    if (EXTERNAL_AMD3DNOWEXT(has_vectors)) {
+    if (EXTERNAL_AMD3DNOWEXT(cpu_flags)) {
         /* 3DNowEx for K7 */
         s->imdct_calc = ff_imdct_calc_3dnowext;
         s->imdct_half = ff_imdct_half_3dnowext;
         s->fft_calc   = ff_fft_calc_3dnowext;
     }
 #endif
-    if (EXTERNAL_SSE(has_vectors)) {
+    if (EXTERNAL_SSE(cpu_flags)) {
         /* SSE for P3/P4/K8 */
         s->imdct_calc  = ff_imdct_calc_sse;
         s->imdct_half  = ff_imdct_half_sse;
@@ -47,23 +48,10 @@
         s->fft_calc    = ff_fft_calc_sse;
         s->fft_permutation = FF_FFT_PERM_SWAP_LSBS;
     }
-    if (EXTERNAL_AVX(has_vectors) && s->nbits >= 5) {
+    if (EXTERNAL_AVX(cpu_flags) && s->nbits >= 5) {
         /* AVX for SB */
         s->imdct_half      = ff_imdct_half_avx;
         s->fft_calc        = ff_fft_calc_avx;
         s->fft_permutation = FF_FFT_PERM_AVX;
     }
 }
-
-#if CONFIG_DCT
-av_cold void ff_dct_init_x86(DCTContext *s)
-{
-    int has_vectors = av_get_cpu_flags();
-    if (EXTERNAL_SSE(has_vectors))
-        s->dct32 = ff_dct32_float_sse;
-    if (EXTERNAL_SSE2(has_vectors))
-        s->dct32 = ff_dct32_float_sse2;
-    if (EXTERNAL_AVX(has_vectors))
-        s->dct32 = ff_dct32_float_avx;
-}
-#endif

libav-v9.6.tar.bz2/libavcodec/x86/fmtconvert.asm -> libav-v10.1.tar.bz2/libavcodec/x86/fmtconvert.asm Changed

libav-v9.6.tar.bz2/libavcodec/x86/fmtconvert_init.c -> libav-v10.1.tar.bz2/libavcodec/x86/fmtconvert_init.c Changed

libav-v10.1.tar.bz2/libavcodec/x86/fpel.asm Added

@@ -0,0 +1,106 @@
+;******************************************************************************
+;* MMX optimized DSP utils
+;* Copyright (c) 2008 Loren Merritt
+;* Copyright (c) 2003-2013 Michael Niedermayer
+;* Copyright (c) 2013 Daniel Kang
+;*
+;* This file is part of Libav.
+;*
+;* Libav 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.
+;*
+;* Libav 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 Libav; 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
+
+INIT_MMX mmxext
+; void pixels(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+%macro PIXELS48 2
+%if %2 == 4
+%define OP movh
+%else
+%define OP mova
+%endif
+cglobal %1_pixels%2, 4,5
+    movsxdifnidn r2, r2d
+    lea          r4, [r2*3]
+.loop:
+    OP           m0, [r1]
+    OP           m1, [r1+r2]
+    OP           m2, [r1+r2*2]
+    OP           m3, [r1+r4]
+    lea          r1, [r1+r2*4]
+%ifidn %1, avg
+    pavgb        m0, [r0]
+    pavgb        m1, [r0+r2]
+    pavgb        m2, [r0+r2*2]
+    pavgb        m3, [r0+r4]
+%endif
+    OP         [r0], m0
+    OP      [r0+r2], m1
+    OP    [r0+r2*2], m2
+    OP      [r0+r4], m3
+    sub         r3d, 4
+    lea          r0, [r0+r2*4]
+    jne       .loop
+    RET
+%endmacro
+
+PIXELS48 put, 4
+PIXELS48 avg, 4
+PIXELS48 put, 8
+PIXELS48 avg, 8
+
+
+INIT_XMM sse2
+; void put_pixels16_sse2(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+cglobal put_pixels16, 4,5,4
+    lea          r4, [r2*3]
+.loop:
+    movu         m0, [r1]
+    movu         m1, [r1+r2]
+    movu         m2, [r1+r2*2]
+    movu         m3, [r1+r4]
+    lea          r1, [r1+r2*4]
+    mova       [r0], m0
+    mova    [r0+r2], m1
+    mova  [r0+r2*2], m2
+    mova    [r0+r4], m3
+    sub         r3d, 4
+    lea          r0, [r0+r2*4]
+    jnz       .loop
+    REP_RET
+
+; void avg_pixels16_sse2(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+cglobal avg_pixels16, 4,5,4
+    lea          r4, [r2*3]
+.loop:
+    movu         m0, [r1]
+    movu         m1, [r1+r2]
+    movu         m2, [r1+r2*2]
+    movu         m3, [r1+r4]
+    lea          r1, [r1+r2*4]
+    pavgb        m0, [r0]
+    pavgb        m1, [r0+r2]
+    pavgb        m2, [r0+r2*2]
+    pavgb        m3, [r0+r4]
+    mova       [r0], m0
+    mova    [r0+r2], m1
+    mova  [r0+r2*2], m2
+    mova    [r0+r4], m3
+    sub         r3d, 4
+    lea          r0, [r0+r2*4]
+    jnz       .loop
+    REP_RET

libav-v10.1.tar.bz2/libavcodec/x86/fpel_mmx.c Added

@@ -0,0 +1,139 @@
+/*
+ * MMX-optimized avg/put pixel routines
+ *
+ * Copyright (c) 2000, 2001 Fabrice Bellard
+ * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 "dsputil_x86.h"
+
+#if HAVE_MMX_INLINE
+
+// in case more speed is needed - unrolling would certainly help
+void ff_avg_pixels8_mmx(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h)
+{
+ MOVQ_BFE(mm6);
+ JUMPALIGN();
+ do {
+ __asm__ volatile(
+ "movq %0, %%mm0 \n\t"
+ "movq %1, %%mm1 \n\t"
+ PAVGB_MMX(%%mm0, %%mm1, %%mm2, %%mm6)
+ "movq %%mm2, %0 \n\t"
+ :"+m"(*block)
+ :"m"(*pixels)
+ :"memory");
+ pixels += line_size;
+ block += line_size;
+ }
+ while (--h);
+}
+
+void ff_avg_pixels16_mmx(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h)
+{
+ MOVQ_BFE(mm6);
+ JUMPALIGN();
+ do {
+ __asm__ volatile(
+ "movq %0, %%mm0 \n\t"
+ "movq %1, %%mm1 \n\t"
+ PAVGB_MMX(%%mm0, %%mm1, %%mm2, %%mm6)
+ "movq %%mm2, %0 \n\t"
+ "movq 8%0, %%mm0 \n\t"
+ "movq 8%1, %%mm1 \n\t"
+ PAVGB_MMX(%%mm0, %%mm1, %%mm2, %%mm6)
+ "movq %%mm2, 8%0 \n\t"
+ :"+m"(*block)
+ :"m"(*pixels)
+ :"memory");
+ pixels += line_size;
+ block += line_size;
+ }
+ while (--h);
+}
+
+void ff_put_pixels8_mmx(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h)
+{
+ __asm__ volatile (
+ "lea (%3, %3), %%"REG_a" \n\t"
+ ".p2align 3 \n\t"
+ "1: \n\t"
+ "movq (%1 ), %%mm0 \n\t"
+ "movq (%1, %3), %%mm1 \n\t"
+ "movq %%mm0, (%2) \n\t"
+ "movq %%mm1, (%2, %3) \n\t"
+ "add %%"REG_a", %1 \n\t"
+ "add %%"REG_a", %2 \n\t"
+ "movq (%1 ), %%mm0 \n\t"
+ "movq (%1, %3), %%mm1 \n\t"
+ "movq %%mm0, (%2) \n\t"
+ "movq %%mm1, (%2, %3) \n\t"
+ "add %%"REG_a", %1 \n\t"
+ "add %%"REG_a", %2 \n\t"
+ "subl $4, %0 \n\t"
+ "jnz 1b \n\t"
+ : "+g"(h), "+r"(pixels), "+r"(block)
+ : "r"((x86_reg)line_size)
+ : "%"REG_a, "memory"
+ );
+}
+
+void ff_put_pixels16_mmx(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h)
+{
+ __asm__ volatile (
+ "lea (%3, %3), %%"REG_a" \n\t"
+ ".p2align 3 \n\t"
+ "1: \n\t"
+ "movq (%1 ), %%mm0 \n\t"
+ "movq 8(%1 ), %%mm4 \n\t"
+ "movq (%1, %3), %%mm1 \n\t"
+ "movq 8(%1, %3), %%mm5 \n\t"
+ "movq %%mm0, (%2) \n\t"
+ "movq %%mm4, 8(%2) \n\t"
+ "movq %%mm1, (%2, %3) \n\t"
+ "movq %%mm5, 8(%2, %3) \n\t"
+ "add %%"REG_a", %1 \n\t"
+ "add %%"REG_a", %2 \n\t"
+ "movq (%1 ), %%mm0 \n\t"
+ "movq 8(%1 ), %%mm4 \n\t"
+ "movq (%1, %3), %%mm1 \n\t"
+ "movq 8(%1, %3), %%mm5 \n\t"
+ "movq %%mm0, (%2) \n\t"
+ "movq %%mm4, 8(%2) \n\t"
+ "movq %%mm1, (%2, %3) \n\t"
+ "movq %%mm5, 8(%2, %3) \n\t"
+ "add %%"REG_a", %1 \n\t"
+ "add %%"REG_a", %2 \n\t"
+ "subl $4, %0 \n\t"
+ "jnz 1b \n\t"
+ : "+g"(h), "+r"(pixels), "+r"(block)
+ : "r"((x86_reg)line_size)
+ : "%"REG_a, "memory"
+ );
+}
+
+#endif /* HAVE_MMX_INLINE */

libav-v10.1.tar.bz2/libavcodec/x86/h263_loopfilter.asm Added

@@ -0,0 +1,187 @@
+;******************************************************************************
+;* MMX-optimized H.263 loop filter
+;*
+;* This file is part of Libav.
+;*
+;* Libav 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.
+;*
+;* Libav 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 Libav; 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
+cextern pb_FC
+cextern h263_loop_filter_strength
+
+SECTION_TEXT
+
+%macro H263_LOOP_FILTER 5
+    pxor         m7, m7
+    mova         m0, [%1]
+    mova         m1, [%1]
+    mova         m2, [%4]
+    mova         m3, [%4]
+    punpcklbw    m0, m7
+    punpckhbw    m1, m7
+    punpcklbw    m2, m7
+    punpckhbw    m3, m7
+    psubw        m0, m2
+    psubw        m1, m3
+    mova         m2, [%2]
+    mova         m3, [%2]
+    mova         m4, [%3]
+    mova         m5, [%3]
+    punpcklbw    m2, m7
+    punpckhbw    m3, m7
+    punpcklbw    m4, m7
+    punpckhbw    m5, m7
+    psubw        m4, m2
+    psubw        m5, m3
+    psllw        m4, 2
+    psllw        m5, 2
+    paddw        m4, m0
+    paddw        m5, m1
+    pxor         m6, m6
+    pcmpgtw      m6, m4
+    pcmpgtw      m7, m5
+    pxor         m4, m6
+    pxor         m5, m7
+    psubw        m4, m6
+    psubw        m5, m7
+    psrlw        m4, 3
+    psrlw        m5, 3
+    packuswb     m4, m5
+    packsswb     m6, m7
+    pxor         m7, m7
+    movd         m2, %5
+    punpcklbw    m2, m2
+    punpcklbw    m2, m2
+    punpcklbw    m2, m2
+    psubusb      m2, m4
+    mova         m3, m2
+    psubusb      m3, m4
+    psubb        m2, m3
+    mova         m3, [%2]
+    mova         m4, [%3]
+    pxor         m3, m6
+    pxor         m4, m6
+    paddusb      m3, m2
+    psubusb      m4, m2
+    pxor         m3, m6
+    pxor         m4, m6
+    paddusb      m2, m2
+    packsswb     m0, m1
+    pcmpgtb      m7, m0
+    pxor         m0, m7
+    psubb        m0, m7
+    mova         m1, m0
+    psubusb      m0, m2
+    psubb        m1, m0
+    pand         m1, [pb_FC]
+    psrlw        m1, 2
+    pxor         m1, m7
+    psubb        m1, m7
+    mova         m5, [%1]
+    mova         m6, [%4]
+    psubb        m5, m1
+    paddb        m6, m1
+%endmacro
+
+INIT_MMX mmx
+; void h263_v_loop_filter(uint8_t *src, int stride, int qscale)
+cglobal h263_v_loop_filter, 3,5
+    movsxdifnidn r1, r1d
+    movsxdifnidn r2, r2d
+
+    lea          r4, [h263_loop_filter_strength]
+    movzx       r3d, BYTE [r4+r2]
+    movsx        r2, r3b
+    shl          r2, 1
+
+    mov          r3, r0
+    sub          r3, r1
+    mov          r4, r3
+    sub          r4, r1
+    H263_LOOP_FILTER r4, r3, r0, r0+r1, r2d
+
+    mova       [r3], m3
+    mova       [r0], m4
+    mova       [r4], m5
+    mova    [r0+r1], m6
+    RET
+
+%macro TRANSPOSE4X4 2
+    movd      m0, [%1]
+    movd      m1, [%1+r1]
+    movd      m2, [%1+r1*2]
+    movd      m3, [%1+r3]
+    punpcklbw m0, m1
+    punpcklbw m2, m3
+    mova      m1, m0
+    punpcklwd m0, m2
+    punpckhwd m1, m2
+    movd [%2+ 0], m0
+    punpckhdq m0, m0
+    movd [%2+ 8], m0
+    movd [%2+16], m1
+    punpckhdq m1, m1
+    movd [%2+24], m1
+%endmacro
+
+
+; void h263_h_loop_filter(uint8_t *src, int stride, int qscale)
+INIT_MMX mmx
+cglobal h263_h_loop_filter, 3,5,0,32
+    movsxdifnidn r1, r1d
+    movsxdifnidn r2, r2d
+
+    lea          r4, [h263_loop_filter_strength]
+    movzx       r3d, BYTE [r4+r2]
+    movsx        r2, r3b
+    shl          r2, 1
+
+    sub          r0, 2
+    lea          r3, [r1*3]
+
+    TRANSPOSE4X4 r0, rsp
+    lea          r4, [r0+r1*4]
+    TRANSPOSE4X4 r4, rsp+4
+
+    H263_LOOP_FILTER rsp, rsp+8, rsp+16, rsp+24, r2d
+
+    mova         m1, m5
+    mova         m0, m4
+    punpcklbw    m5, m3
+    punpcklbw    m4, m6
+    punpckhbw    m1, m3
+    punpckhbw    m0, m6
+    mova         m3, m5
+    mova         m6, m1
+    punpcklwd    m5, m4
+    punpcklwd    m1, m0
+    punpckhwd    m3, m4
+    punpckhwd    m6, m0
+    movd       [r0], m5
+    punpckhdq    m5, m5
+    movd  [r0+r1*1], m5
+    movd  [r0+r1*2], m3
+    punpckhdq    m3, m3
+    movd    [r0+r3], m3
+    movd       [r4], m1
+    punpckhdq    m1, m1
+    movd  [r4+r1*1], m1
+    movd  [r4+r1*2], m6
+    punpckhdq    m6, m6
+    movd    [r4+r3], m6
+    RET

libav-v10.1.tar.bz2/libavcodec/x86/h263dsp_init.c Added

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2013 Diego Biurrun <diego@biurrun.de>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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;
+ }
+}

libav-v9.6.tar.bz2/libavcodec/x86/h264_chromamc.asm -> libav-v10.1.tar.bz2/libavcodec/x86/h264_chromamc.asm Changed

@@ -60,7 +60,7 @@
 cextern pw_3
 cextern pw_4
 cextern pw_8
-cextern pw_28
+pw_28: times 8 dw 28
 cextern pw_32
 cextern pw_64
 
@@ -427,11 +427,11 @@
 %macro NOTHING 2-3
 %endmacro
 %macro DIRECT_AVG 2
-    PAVG          %1, %2
+    PAVGB         %1, %2
 %endmacro
 %macro COPY_AVG 3
     movd          %2, %3
-    PAVG          %1, %2
+    PAVGB         %1, %2
 %endmacro
 
 INIT_MMX mmx
@@ -448,7 +448,6 @@
 
 %define CHROMAMC_AVG  DIRECT_AVG
 %define CHROMAMC_AVG4 COPY_AVG
-%define PAVG          pavgb
 chroma_mc8_mmx_func avg, h264, _rnd
 chroma_mc8_mmx_func avg, vc1,  _nornd
 chroma_mc8_mmx_func avg, rv40
@@ -456,7 +455,6 @@
 chroma_mc4_mmx_func avg, rv40
 chroma_mc2_mmx_func avg, h264
 
-%define PAVG          pavgusb
 INIT_MMX 3dnow
 chroma_mc8_mmx_func avg, h264, _rnd
 chroma_mc8_mmx_func avg, vc1,  _nornd
@@ -673,7 +671,6 @@
 chroma_mc4_ssse3_func put, h264
 
 %define CHROMAMC_AVG DIRECT_AVG
-%define PAVG         pavgb
 INIT_XMM ssse3
 chroma_mc8_ssse3_func avg, h264, _rnd
 chroma_mc8_ssse3_func avg, vc1,  _nornd

libav-v9.6.tar.bz2/libavcodec/x86/h264_deblock.asm -> libav-v10.1.tar.bz2/libavcodec/x86/h264_deblock.asm Changed

@@ -28,6 +28,7 @@
 
 SECTION_RODATA
 
+pb_A1: times 16 db 0xA1
 pb_3_1: times 4 db 3, 1
 
 SECTION .text
@@ -35,7 +36,6 @@
 cextern pb_0
 cextern pb_1
 cextern pb_3
-cextern pb_A1
 
 ; expands to [base],...,[base+7*stride]
 %define PASS8ROWS(base, base3, stride, stride3) \
@@ -331,16 +331,14 @@
 ; void deblock_h_luma( uint8_t *pix, int stride, int alpha, int beta, int8_t *tc0 )
 ;-----------------------------------------------------------------------------
 INIT_MMX cpuname
-cglobal deblock_h_luma_8, 5,9
+cglobal deblock_h_luma_8, 5,9,0,0x60+16*WIN64
     movsxd r7,  r1d
     lea    r8,  [r7+r7*2]
     lea    r6,  [r0-4]
     lea    r5,  [r0-4+r8]
 %if WIN64
-    sub    rsp, 0x98
-    %define pix_tmp rsp+0x30
+    %define pix_tmp rsp+0x30 ; shadow space + r4
 %else
-    sub    rsp, 0x68
     %define pix_tmp rsp
 %endif
 
@@ -379,11 +377,6 @@
     movq   m3, [pix_tmp+0x40]
     TRANSPOSE8x4B_STORE  PASS8ROWS(r6, r5, r7, r8)
 
-%if WIN64
-    add    rsp, 0x98
-%else
-    add    rsp, 0x68
-%endif
     RET
 %endmacro
 
@@ -704,13 +697,16 @@
 ;-----------------------------------------------------------------------------
 ; void deblock_h_luma_intra( uint8_t *pix, int stride, int alpha, int beta )
 ;-----------------------------------------------------------------------------
-cglobal deblock_h_luma_intra_8, 4,9
+cglobal deblock_h_luma_intra_8, 4,9,0,0x80
     movsxd r7,  r1d
     lea    r8,  [r7*3]
     lea    r6,  [r0-4]
     lea    r5,  [r0-4+r8]
-    sub    rsp, 0x88
+%if WIN64
+    %define pix_tmp rsp+0x20 ; shadow space
+%else
     %define pix_tmp rsp
+%endif
 
     ; transpose 8x16 -> tmp space
     TRANSPOSE8x8_MEM  PASS8ROWS(r6, r5, r7, r8), PASS8ROWS(pix_tmp, pix_tmp+0x30, 0x10, 0x30)
@@ -730,7 +726,6 @@
     sub    r5,  r7
     shr    r7,  3
     TRANSPOSE8x8_MEM  PASS8ROWS(pix_tmp, pix_tmp+0x30, 0x10, 0x30), PASS8ROWS(r6, r5, r7, r8)
-    add    rsp, 0x88
     RET
 %else
 cglobal deblock_h_luma_intra_8, 2,4,8,0x80

libav-v9.6.tar.bz2/libavcodec/x86/h264_idct.asm -> libav-v10.1.tar.bz2/libavcodec/x86/h264_idct.asm Changed

@@ -30,7 +30,6 @@
 
 SECTION_RODATA
 
-; FIXME this table is a duplicate from h264data.h, and will be removed once the tables from, h264 have been split
 scan8_mem: db  4+ 1*8, 5+ 1*8, 4+ 2*8, 5+ 2*8
            db  6+ 1*8, 7+ 1*8, 6+ 2*8, 7+ 2*8
            db  4+ 3*8, 5+ 3*8, 4+ 4*8, 5+ 4*8
@@ -70,6 +69,10 @@
     paddw        m0, m6
     IDCT4_1D      w, 0, 1, 2, 3, 4, 5
     pxor         m7, m7
+    movq    [%2+ 0], m7
+    movq    [%2+ 8], m7
+    movq    [%2+16], m7
+    movq    [%2+24], m7
 
     STORE_DIFFx2 m0, m1, m4, m5, m7, 6, %1, %3
     lea          %1, [%1+%3*2]
@@ -77,7 +80,7 @@
 %endmacro
 
 INIT_MMX mmx
-; ff_h264_idct_add_mmx(uint8_t *dst, int16_t *block, int stride)
+; ff_h264_idct_add_8_mmx(uint8_t *dst, int16_t *block, int stride)
 cglobal h264_idct_add_8, 3, 3, 0
     IDCT4_ADD    r0, r1, r2
     RET
@@ -161,13 +164,31 @@
 %endmacro
 
 ; %1=uint8_t *dst, %2=int16_t *block, %3=int stride
-%macro IDCT8_ADD_MMX_END 3
+%macro IDCT8_ADD_MMX_END 3-4
     IDCT8_1D_FULL %2
     mova    [%2   ], m5
     mova    [%2+16], m6
     mova    [%2+32], m7
 
     pxor         m7, m7
+%if %0 == 4
+    movq   [%4+  0], m7
+    movq   [%4+  8], m7
+    movq   [%4+ 16], m7
+    movq   [%4+ 24], m7
+    movq   [%4+ 32], m7
+    movq   [%4+ 40], m7
+    movq   [%4+ 48], m7
+    movq   [%4+ 56], m7
+    movq   [%4+ 64], m7
+    movq   [%4+ 72], m7
+    movq   [%4+ 80], m7
+    movq   [%4+ 88], m7
+    movq   [%4+ 96], m7
+    movq   [%4+104], m7
+    movq   [%4+112], m7
+    movq   [%4+120], m7
+%endif
     STORE_DIFFx2 m0, m1, m5, m6, m7, 6, %1, %3
     lea          %1, [%1+%3*2]
     STORE_DIFFx2 m2, m3, m5, m6, m7, 6, %1, %3
@@ -181,7 +202,7 @@
 %endmacro
 
 INIT_MMX mmx
-; ff_h264_idct8_add_mmx(uint8_t *dst, int16_t *block, int stride)
+; ff_h264_idct8_add_8_mmx(uint8_t *dst, int16_t *block, int stride)
 cglobal h264_idct8_add_8, 3, 4, 0
     %assign pad 128+4-(stack_offset&7)
     SUB         rsp, pad
@@ -190,7 +211,7 @@
     IDCT8_ADD_MMX_START r1  , rsp
     IDCT8_ADD_MMX_START r1+8, rsp+64
     lea          r3, [r0+4]
-    IDCT8_ADD_MMX_END   r0  , rsp,   r2
+    IDCT8_ADD_MMX_END   r0  , rsp,   r2, r1
     IDCT8_ADD_MMX_END   r3  , rsp+8, r2
 
     ADD         rsp, pad
@@ -233,6 +254,14 @@
     SWAP          0, 8
     SWAP          1, 9
 %endif
+    mova   [%2+  0], m7
+    mova   [%2+ 16], m7
+    mova   [%2+ 32], m7
+    mova   [%2+ 48], m7
+    mova   [%2+ 64], m7
+    mova   [%2+ 80], m7
+    mova   [%2+ 96], m7
+    mova   [%2+112], m7
     lea          %1, [%1+%3*4]
     STORE_DIFF   m4, m6, m7, [%1     ]
     STORE_DIFF   m5, m6, m7, [%1+%3  ]
@@ -241,24 +270,16 @@
 %endmacro
 
 INIT_XMM sse2
-; ff_h264_idct8_add_sse2(uint8_t *dst, int16_t *block, int stride)
+; ff_h264_idct8_add_8_sse2(uint8_t *dst, int16_t *block, int stride)
 cglobal h264_idct8_add_8, 3, 4, 10
     IDCT8_ADD_SSE r0, r1, r2, r3
     RET
 
-%macro DC_ADD_MMXEXT_INIT 2-3
-%if %0 == 2
-    movsx        %1, word [%1]
+%macro DC_ADD_MMXEXT_INIT 2
     add          %1, 32
     sar          %1, 6
     movd         m0, %1d
     lea          %1, [%2*3]
-%else
-    add          %3, 32
-    sar          %3, 6
-    movd         m0, %3d
-    lea          %3, [%2*3]
-%endif
     pshufw       m0, m0, 0
     pxor         m1, m1
     psubw        m1, m0
@@ -286,23 +307,50 @@
 %endmacro
 
 INIT_MMX mmxext
-; ff_h264_idct_dc_add_mmxext(uint8_t *dst, int16_t *block, int stride)
-cglobal h264_idct_dc_add_8, 3, 3, 0
-    DC_ADD_MMXEXT_INIT r1, r2
-    DC_ADD_MMXEXT_OP movh, r0, r2, r1
+; ff_h264_idct_dc_add_8_mmxext(uint8_t *dst, int16_t *block, int stride)
+%if ARCH_X86_64
+cglobal h264_idct_dc_add_8, 3, 4, 0
+    movsx        r3, word [r1]
+    mov  dword [r1], 0
+    DC_ADD_MMXEXT_INIT r3, r2
+    DC_ADD_MMXEXT_OP movh, r0, r2, r3
     RET
 
-; ff_h264_idct8_dc_add_mmxext(uint8_t *dst, int16_t *block, int stride)
-cglobal h264_idct8_dc_add_8, 3, 3, 0
-    DC_ADD_MMXEXT_INIT r1, r2
-    DC_ADD_MMXEXT_OP mova, r0, r2, r1
+; ff_h264_idct8_dc_add_8_mmxext(uint8_t *dst, int16_t *block, int stride)
+cglobal h264_idct8_dc_add_8, 3, 4, 0
+    movsx        r3, word [r1]
+    mov  dword [r1], 0
+    DC_ADD_MMXEXT_INIT r3, r2
+    DC_ADD_MMXEXT_OP mova, r0, r2, r3
     lea          r0, [r0+r2*4]
-    DC_ADD_MMXEXT_OP mova, r0, r2, r1
+    DC_ADD_MMXEXT_OP mova, r0, r2, r3
     RET
+%else
+; ff_h264_idct_dc_add_8_mmxext(uint8_t *dst, int16_t *block, int stride)
+cglobal h264_idct_dc_add_8, 2, 3, 0
+    movsx        r2, word [r1]
+    mov  dword [r1], 0
+    mov          r1, r2m
+    DC_ADD_MMXEXT_INIT r2, r1
+    DC_ADD_MMXEXT_OP movh, r0, r1, r2
+    RET
+
+; ff_h264_idct8_dc_add_8_mmxext(uint8_t *dst, int16_t *block, int stride)
+cglobal h264_idct8_dc_add_8, 2, 3, 0
+    movsx        r2, word [r1]
+    mov  dword [r1], 0
+    mov          r1, r2m
+    DC_ADD_MMXEXT_INIT r2, r1
+    DC_ADD_MMXEXT_OP mova, r0, r1, r2
+    lea          r0, [r0+r1*4]
+    DC_ADD_MMXEXT_OP mova, r0, r1, r2
+    RET
+%endif
 
 INIT_MMX mmx
-; ff_h264_idct_add16_mmx(uint8_t *dst, const int *block_offset,
-;             DCTELEM *block, int stride, const uint8_t nnzc[6*8])
+; ff_h264_idct_add16_8_mmx(uint8_t *dst, const int *block_offset,
+;                          int16_t *block, int stride,
+;                          const uint8_t nnzc[6 * 8])
 cglobal h264_idct_add16_8, 5, 7 + npicregs, 0, dst, block_offset, block, stride, nnzc, cntr, coeff, picreg
     xor          r5, r5
 %ifdef PIC
@@ -323,8 +371,9 @@
     jl .nextblock
     REP_RET
 
-; ff_h264_idct8_add4_mmx(uint8_t *dst, const int *block_offset,
-;                        DCTELEM *block, int stride, const uint8_t nnzc[6*8])
+; ff_h264_idct8_add4_8_mmx(uint8_t *dst, const int *block_offset,
+;                          int16_t *block, int stride,
+;                          const uint8_t nnzc[6 * 8])
 cglobal h264_idct8_add4_8, 5, 7 + npicregs, 0, dst, block_offset, block, stride, nnzc, cntr, coeff, picreg
     %assign pad 128+4-(stack_offset&7)
     SUB         rsp, pad
@@ -343,7 +392,7 @@
     add   word [r2], 32
     IDCT8_ADD_MMX_START r2  , rsp
     IDCT8_ADD_MMX_START r2+8, rsp+64
-    IDCT8_ADD_MMX_END   r6  , rsp,   r3
+    IDCT8_ADD_MMX_END   r6  , rsp,   r3, r2
     mov         r6d, dword [r1+r5*4]
     lea          r6, [r0+r6+4]
     IDCT8_ADD_MMX_END   r6  , rsp+8, r3
@@ -356,8 +405,9 @@
     RET
 
 INIT_MMX mmxext
-; ff_h264_idct_add16_mmxext(uint8_t *dst, const int *block_offset,
-;                           DCTELEM *block, int stride, const uint8_t nnzc[6*8])
+; ff_h264_idct_add16_8_mmxext(uint8_t *dst, const int *block_offset,
+;                             int16_t *block, int stride,
+;                             const uint8_t nnzc[6 * 8])
 cglobal h264_idct_add16_8, 5, 8 + npicregs, 0, dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg
     xor          r5, r5
 %ifdef PIC
@@ -373,7 +423,8 @@
     movsx        r6, word [r2]
     test         r6, r6
     jz .no_dc
-    DC_ADD_MMXEXT_INIT r2, r3, r6
+    mov   word [r2], 0
+    DC_ADD_MMXEXT_INIT r6, r3
 %if ARCH_X86_64 == 0
 %define dst2q r1
 %define dst2d r1d
@@ -401,8 +452,9 @@
     REP_RET
 
 INIT_MMX mmx
-; ff_h264_idct_add16intra_mmx(uint8_t *dst, const int *block_offset,
-;                             DCTELEM *block, int stride, const uint8_t nnzc[6*8])
+; ff_h264_idct_add16intra_8_mmx(uint8_t *dst, const int *block_offset,
+;                               int16_t *block, int stride,
+;                               const uint8_t nnzc[6 * 8])
 cglobal h264_idct_add16intra_8, 5, 7 + npicregs, 0, dst, block_offset, block, stride, nnzc, cntr, coeff, picreg
     xor          r5, r5
 %ifdef PIC
@@ -425,9 +477,9 @@
     REP_RET
 
 INIT_MMX mmxext
-; ff_h264_idct_add16intra_mmxext(uint8_t *dst, const int *block_offset,
-;                                DCTELEM *block, int stride,
-;                                const uint8_t nnzc[6*8])
+; ff_h264_idct_add16intra_8_mmxext(uint8_t *dst, const int *block_offset,
+;                                  int16_t *block, int stride,
+;                                  const uint8_t nnzc[6 * 8])
 cglobal h264_idct_add16intra_8, 5, 8 + npicregs, 0, dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg
     xor          r5, r5
 %ifdef PIC
@@ -450,7 +502,8 @@
     movsx        r6, word [r2]
     test         r6, r6
     jz .skipblock
-    DC_ADD_MMXEXT_INIT r2, r3, r6
+    mov   word [r2], 0
+    DC_ADD_MMXEXT_INIT r6, r3
 %if ARCH_X86_64 == 0
 %define dst2q r1
 %define dst2d r1d
@@ -468,9 +521,9 @@
     jl .nextblock
     REP_RET
 
-; ff_h264_idct8_add4_mmxext(uint8_t *dst, const int *block_offset,
-;                           DCTELEM *block, int stride,
-;                           const uint8_t nnzc[6*8])
+; ff_h264_idct8_add4_8_mmxext(uint8_t *dst, const int *block_offset,
+;                             int16_t *block, int stride,
+;                             const uint8_t nnzc[6 * 8])
 cglobal h264_idct8_add4_8, 5, 8 + npicregs, 0, dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg
     %assign pad 128+4-(stack_offset&7)
     SUB         rsp, pad
@@ -489,7 +542,8 @@
     movsx        r6, word [r2]
     test         r6, r6
     jz .no_dc
-    DC_ADD_MMXEXT_INIT r2, r3, r6
+    mov   word [r2], 0
+    DC_ADD_MMXEXT_INIT r6, r3
 %if ARCH_X86_64 == 0
 %define dst2q r1
 %define dst2d r1d
@@ -515,7 +569,7 @@
     add   word [r2], 32
     IDCT8_ADD_MMX_START r2  , rsp
     IDCT8_ADD_MMX_START r2+8, rsp+64
-    IDCT8_ADD_MMX_END   r6  , rsp,   r3
+    IDCT8_ADD_MMX_END   r6  , rsp,   r3, r2
     mov         r6d, dword [r1+r5*4]
     lea          r6, [r0+r6+4]
     IDCT8_ADD_MMX_END   r6  , rsp+8, r3
@@ -529,8 +583,9 @@
     RET
 
 INIT_XMM sse2
-; ff_h264_idct8_add4_sse2(uint8_t *dst, const int *block_offset,
-;                         DCTELEM *block, int stride, const uint8_t nnzc[6*8])
+; ff_h264_idct8_add4_8_sse2(uint8_t *dst, const int *block_offset,
+;                           int16_t *block, int stride,
+;                           const uint8_t nnzc[6 * 8])
 cglobal h264_idct8_add4_8, 5, 8 + npicregs, 10, dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg
     xor          r5, r5
 %ifdef PIC
@@ -547,7 +602,8 @@
     test         r6, r6
     jz .no_dc
 INIT_MMX cpuname
-    DC_ADD_MMXEXT_INIT r2, r3, r6
+    mov   word [r2], 0
+    DC_ADD_MMXEXT_INIT r6, r3
 %if ARCH_X86_64 == 0
 %define dst2q r1
 %define dst2d r1d
@@ -604,8 +660,8 @@
     jnz .nextblock
     rep ret
 
-; ff_h264_idct_add8_mmx(uint8_t **dest, const int *block_offset,
-;                       DCTELEM *block, int stride, const uint8_t nnzc[6*8])
+; ff_h264_idct_add8_8_mmx(uint8_t **dest, const int *block_offset,
+;                         int16_t *block, int stride, const uint8_t nnzc[6 * 8])
 cglobal h264_idct_add8_8, 5, 8 + npicregs, 0, dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg
     mov          r5, 16
     add          r2, 512
@@ -650,7 +706,8 @@
     movsx        r6, word [r2]
     test         r6, r6
     jz .skipblock
-    DC_ADD_MMXEXT_INIT r2, r3, r6
+    mov   word [r2], 0
+    DC_ADD_MMXEXT_INIT r6, r3
 %if ARCH_X86_64
     mov         r0d, dword [r1+r5*4]
     add          r0, [dst2q]
@@ -668,8 +725,9 @@
     rep ret
 
 INIT_MMX mmxext
-; ff_h264_idct_add8_mmxext(uint8_t **dest, const int *block_offset,
-;                          DCTELEM *block, int stride, const uint8_t nnzc[6*8])
+; ff_h264_idct_add8_8_mmxext(uint8_t **dest, const int *block_offset,
+;                            int16_t *block, int stride,
+;                            const uint8_t nnzc[6 * 8])
 cglobal h264_idct_add8_8, 5, 8 + npicregs, 0, dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg
     mov          r5, 16
     add          r2, 512
@@ -693,7 +751,9 @@
 ; r0 = uint8_t *dst, r2 = int16_t *block, r3 = int stride, r6=clobbered
 h264_idct_dc_add8_mmxext:
     movd         m0, [r2   ]          ;  0 0 X D
+    mov word [r2+ 0], 0
     punpcklwd    m0, [r2+32]          ;  x X d D
+    mov word [r2+32], 0
     paddsw       m0, [pw_32]
     psraw        m0, 6
     punpcklwd    m0, m0               ;  d d D D
@@ -723,6 +783,10 @@
     paddw m0, [pw_32]
     IDCT4_1D w,0,1,2,3,4,5
     pxor  m7, m7
+    mova [r2+ 0], m7
+    mova [r2+16], m7
+    mova [r2+32], m7
+    mova [r2+48], m7
     STORE_DIFFx2 m0, m1, m4, m5, m7, 6, r0, r3
     lea   r0, [r0+r3*2]
     STORE_DIFFx2 m2, m3, m4, m5, m7, 6, r0, r3
@@ -745,8 +809,9 @@
 %endif
 %endmacro
 
-; ff_h264_idct_add16_sse2(uint8_t *dst, const int *block_offset,
-;                         DCTELEM *block, int stride, const uint8_t nnzc[6*8])
+; ff_h264_idct_add16_8_sse2(uint8_t *dst, const int *block_offset,
+;                           int16_t *block, int stride,
+;                           const uint8_t nnzc[6 * 8])
 cglobal h264_idct_add16_8, 5, 5 + ARCH_X86_64, 8
 %if ARCH_X86_64
     mov         r5, r0
@@ -792,8 +857,9 @@
 %endif
 %endmacro
 
-; ff_h264_idct_add16intra_sse2(uint8_t *dst, const int *block_offset,
-;                              DCTELEM *block, int stride, const uint8_t nnzc[6*8])
+; ff_h264_idct_add16intra_8_sse2(uint8_t *dst, const int *block_offset,
+;                                int16_t *block, int stride,
+;                                const uint8_t nnzc[6 * 8])
 cglobal h264_idct_add16intra_8, 5, 7 + ARCH_X86_64, 8
 %if ARCH_X86_64
     mov         r7, r0
@@ -843,8 +909,9 @@
 %endif
 %endmacro
 
-; ff_h264_idct_add8_sse2(uint8_t **dest, const int *block_offset,
-;                        DCTELEM *block, int stride, const uint8_t nnzc[6*8])
+; ff_h264_idct_add8_8_sse2(uint8_t **dest, const int *block_offset,
+;                          int16_t *block, int stride,
+;                          const uint8_t nnzc[6 * 8])
 cglobal h264_idct_add8_8, 5, 7 + ARCH_X86_64, 8
     add          r2, 512
 %if ARCH_X86_64
@@ -861,7 +928,7 @@
     add8_sse2_cycle 3, 0x64
     RET
 
-;void ff_h264_luma_dc_dequant_idct_mmx(DCTELEM *output, DCTELEM *input, int qmul)
+;void ff_h264_luma_dc_dequant_idct_mmx(int16_t *output, int16_t *input, int qmul)
 
 %macro WALSH4_1D 5
     SUMSUB_BADC w, %4, %3, %2, %1, %5

libav-v9.6.tar.bz2/libavcodec/x86/h264_idct_10bit.asm -> libav-v10.1.tar.bz2/libavcodec/x86/h264_idct_10bit.asm Changed

@@ -66,6 +66,10 @@
     paddd m0, [pd_32]
     IDCT4_1D d,0,1,2,3,4,5
     pxor  m5, m5
+    mova [%2+ 0], m5
+    mova [%2+16], m5
+    mova [%2+32], m5
+    mova [%2+48], m5
     STORE_DIFFx2 m0, m1, m4, m5, %1, %3
     lea   %1, [%1+%3*2]
     STORE_DIFFx2 m2, m3, m4, m5, %1, %3
@@ -98,6 +102,10 @@
     paddd m0, [pd_32]
     IDCT4_1D d,0,1,2,3,4,5
     pxor  m5, m5
+    mova  [r2+ 0], m5
+    mova  [r2+16], m5
+    mova  [r2+32], m5
+    mova  [r2+48], m5
     STORE_DIFFx2 m0, m1, m4, m5, r5, r3
     lea   r5, [r5+r3*2]
     STORE_DIFFx2 m2, m3, m4, m5, r5, r3
@@ -181,6 +189,7 @@
 INIT_MMX mmxext
 cglobal h264_idct_dc_add_10,3,3
     movd      m0, [r1]
+    mov dword [r1], 0
     paddd     m0, [pd_32]
     psrad     m0, 6
     lea       r1, [r2*3]
@@ -193,11 +202,11 @@
 ; void h264_idct8_dc_add(pixel *dst, dctcoef *block, int stride)
 ;-----------------------------------------------------------------------------
 %macro IDCT8_DC_ADD 0
-cglobal h264_idct8_dc_add_10,3,3,7
-    mov      r1d, [r1]
-    add       r1, 32
-    sar       r1, 6
-    movd      m0, r1d
+cglobal h264_idct8_dc_add_10,3,4,7
+    movd      m0, [r1]
+    mov dword[r1], 0
+    paddd     m0, [pd_32]
+    psrad     m0, 6
     lea       r1, [r2*3]
     SPLATW    m0, m0, 0
     mova      m6, [pw_pixel_max]
@@ -247,6 +256,8 @@
     add       r5, r0
     movq      m0, [r2+ 0]
     movhps    m0, [r2+64]
+    mov dword [r2+ 0], 0
+    mov dword [r2+64], 0
     paddd     m0, [pd_32]
     psrad     m0, 6
     pshufhw   m0, m0, 0
@@ -461,6 +472,22 @@
     packssdw      m8, m0
     paddsw        m8, [r0]
     pxor          m0, m0
+    mova    [r1+  0], m0
+    mova    [r1+ 16], m0
+    mova    [r1+ 32], m0
+    mova    [r1+ 48], m0
+    mova    [r1+ 64], m0
+    mova    [r1+ 80], m0
+    mova    [r1+ 96], m0
+    mova    [r1+112], m0
+    mova    [r1+128], m0
+    mova    [r1+144], m0
+    mova    [r1+160], m0
+    mova    [r1+176], m0
+    mova    [r1+192], m0
+    mova    [r1+208], m0
+    mova    [r1+224], m0
+    mova    [r1+240], m0
     CLIPW         m8, m0, [pw_pixel_max]
     mova        [r0], m8
     mova          m8, [pw_pixel_max]
@@ -480,6 +507,22 @@
     lea           r3, [r0+8]
     IDCT8_ADD_SSE_END r0, rsp,    r2
     IDCT8_ADD_SSE_END r3, rsp+16, r2
+    mova    [r1+  0], m7
+    mova    [r1+ 16], m7
+    mova    [r1+ 32], m7
+    mova    [r1+ 48], m7
+    mova    [r1+ 64], m7
+    mova    [r1+ 80], m7
+    mova    [r1+ 96], m7
+    mova    [r1+112], m7
+    mova    [r1+128], m7
+    mova    [r1+144], m7
+    mova    [r1+160], m7
+    mova    [r1+176], m7
+    mova    [r1+192], m7
+    mova    [r1+208], m7
+    mova    [r1+224], m7
+    mova    [r1+240], m7
 %endif ; ARCH_X86_64
 
     add          rsp, pad

libav-v9.6.tar.bz2/libavcodec/x86/h264_intrapred_init.c -> libav-v10.1.tar.bz2/libavcodec/x86/h264_intrapred_init.c Changed

@@ -18,8 +18,10 @@
 * 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/avcodec.h"
 #include "libavcodec/h264pred.h"
 
 #define PRED4x4(TYPE, DEPTH, OPT) \
@@ -179,15 +181,17 @@
 PRED4x4(tm_vp8, 8, ssse3)
 PRED4x4(vertical_vp8, 8, mmxext)
 
-void ff_h264_pred_init_x86(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc)
+av_cold void ff_h264_pred_init_x86(H264PredContext *h, int codec_id,
+ const int bit_depth,
+ const int chroma_format_idc)
 {
- int mm_flags = av_get_cpu_flags();
+ int cpu_flags = av_get_cpu_flags();
 
 if (bit_depth == 8) {
- if (EXTERNAL_MMX(mm_flags)) {
+ 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;
 }
@@ -196,10 +200,10 @@
 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 (mm_flags & AV_CPU_FLAG_CMOV)
+ if (cpu_flags & AV_CPU_FLAG_CMOV)
 h->pred16x16[PLANE_PRED8x8] = ff_pred16x16_plane_svq3_8_mmx;
 } else if (codec_id == AV_CODEC_ID_RV40) {
 h->pred16x16[PLANE_PRED8x8] = ff_pred16x16_plane_rv40_8_mmx;
@@ -209,10 +213,10 @@
 }
 }
 
- if (EXTERNAL_MMXEXT(mm_flags)) {
+ 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;
@@ -237,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;
 }
@@ -249,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;
@@ -261,11 +265,11 @@
 }
 }
 
- if (EXTERNAL_SSE(mm_flags)) {
+ if (EXTERNAL_SSE(cpu_flags)) {
 h->pred16x16[VERT_PRED8x8] = ff_pred16x16_vertical_8_sse;
 }
 
- if (EXTERNAL_SSE2(mm_flags)) {
+ if (EXTERNAL_SSE2(cpu_flags)) {
 h->pred16x16[DC_PRED8x8 ] = ff_pred16x16_dc_8_sse2;
 h->pred8x8l [DIAG_DOWN_LEFT_PRED ] = ff_pred8x8l_down_left_8_sse2;
 h->pred8x8l [DIAG_DOWN_RIGHT_PRED ] = ff_pred8x8l_down_right_8_sse2;
@@ -276,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;
@@ -288,10 +292,10 @@
 }
 }
 
- if (EXTERNAL_SSSE3(mm_flags)) {
+ 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;
@@ -307,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;
@@ -319,11 +323,11 @@
 }
 }
 } else if (bit_depth == 10) {
- if (EXTERNAL_MMXEXT(mm_flags)) {
+ if (EXTERNAL_MMXEXT(cpu_flags)) {
 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;
@@ -335,14 +339,14 @@
 h->pred16x16[VERT_PRED8x8 ] = ff_pred16x16_vertical_10_mmxext;
 h->pred16x16[HOR_PRED8x8 ] = ff_pred16x16_horizontal_10_mmxext;
 }
- if (EXTERNAL_SSE2(mm_flags)) {
+ if (EXTERNAL_SSE2(cpu_flags)) {
 h->pred4x4[DIAG_DOWN_LEFT_PRED ] = ff_pred4x4_down_left_10_sse2;
 h->pred4x4[DIAG_DOWN_RIGHT_PRED] = ff_pred4x4_down_right_10_sse2;
 h->pred4x4[VERT_LEFT_PRED ] = ff_pred4x4_vertical_left_10_sse2;
 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;
@@ -367,7 +371,7 @@
 h->pred16x16[VERT_PRED8x8 ] = ff_pred16x16_vertical_10_sse2;
 h->pred16x16[HOR_PRED8x8 ] = ff_pred16x16_horizontal_10_sse2;
 }
- if (EXTERNAL_SSSE3(mm_flags)) {
+ if (EXTERNAL_SSSE3(cpu_flags)) {
 h->pred4x4[DIAG_DOWN_RIGHT_PRED] = ff_pred4x4_down_right_10_ssse3;
 h->pred4x4[VERT_RIGHT_PRED ] = ff_pred4x4_vertical_right_10_ssse3;
 h->pred4x4[HOR_DOWN_PRED ] = ff_pred4x4_horizontal_down_10_ssse3;
@@ -378,7 +382,7 @@
 h->pred8x8l[VERT_RIGHT_PRED ] = ff_pred8x8l_vertical_right_10_ssse3;
 h->pred8x8l[HOR_UP_PRED ] = ff_pred8x8l_horizontal_up_10_ssse3;
 }
- if (EXTERNAL_AVX(mm_flags)) {
+ if (EXTERNAL_AVX(cpu_flags)) {
 h->pred4x4[DIAG_DOWN_LEFT_PRED ] = ff_pred4x4_down_left_10_avx;
 h->pred4x4[DIAG_DOWN_RIGHT_PRED] = ff_pred4x4_down_right_10_avx;
 h->pred4x4[VERT_LEFT_PRED ] = ff_pred4x4_vertical_left_10_avx;

libav-v9.6.tar.bz2/libavcodec/x86/h264_qpel.c -> libav-v10.1.tar.bz2/libavcodec/x86/h264_qpel.c Changed

@@ -19,29 +19,19 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/x86/asm.h"
-#include "libavcodec/dsputil.h"
+#include "libavutil/x86/cpu.h"
+#include "libavcodec/h264qpel.h"
 #include "libavcodec/mpegvideo.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_YASM
-void ff_put_pixels4_mmxext(uint8_t *block, const uint8_t *pixels, int line_size, int h);
-void ff_avg_pixels4_mmxext(uint8_t *block, const uint8_t *pixels, int line_size, int h);
-void ff_put_pixels8_mmxext(uint8_t *block, const uint8_t *pixels, int line_size, int h);
-void ff_avg_pixels8_mmxext(uint8_t *block, const uint8_t *pixels, int line_size, int h);
-static void ff_put_pixels16_mmxext(uint8_t *block, const uint8_t *pixels,
- int line_size, int h)
-{
- ff_put_pixels8_mmxext(block, pixels, line_size, h);
- ff_put_pixels8_mmxext(block + 8, pixels + 8, line_size, h);
-}
-static void ff_avg_pixels16_mmxext(uint8_t *block, const uint8_t *pixels,
- int line_size, int h)
-{
- ff_avg_pixels8_mmxext(block, pixels, line_size, h);
- ff_avg_pixels8_mmxext(block + 8, pixels + 8, line_size, h);
-}
+void ff_put_pixels4_mmxext(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_avg_pixels4_mmxext(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
 void ff_put_pixels4_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2,
 int dstStride, int src1Stride, int h);
 void ff_avg_pixels4_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2,
@@ -54,15 +44,14 @@
 int dstStride, int src1Stride, int h);
 void ff_avg_pixels16_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2,
 int dstStride, int src1Stride, int h);
-void ff_put_pixels16_sse2(uint8_t *block, const uint8_t *pixels,
- int line_size, int h);
-void ff_avg_pixels16_sse2(uint8_t *block, const uint8_t *pixels,
- int line_size, int h);
 #define ff_put_pixels8_l2_sse2 ff_put_pixels8_l2_mmxext
 #define ff_avg_pixels8_l2_sse2 ff_avg_pixels8_l2_mmxext
 #define ff_put_pixels16_l2_sse2 ff_put_pixels16_l2_mmxext
 #define ff_avg_pixels16_l2_sse2 ff_avg_pixels16_l2_mmxext
 
+PIXELS16(static, ff_avg, , , _mmxext)
+PIXELS16(static, ff_put, , , _mmxext)
+
 #define DEF_QPEL(OPNAME)\
 void ff_ ## OPNAME ## _h264_qpel4_h_lowpass_mmxext(uint8_t *dst, uint8_t *src, int dstStride, int srcStride);\
 void ff_ ## OPNAME ## _h264_qpel8_h_lowpass_mmxext(uint8_t *dst, uint8_t *src, int dstStride, int srcStride);\
@@ -208,7 +197,12 @@
 ff_ ## OPNAME ## h264_qpel8or16_v_lowpass_ ## MMX(dst+8, src+8, dstStride, srcStride, 16);\
 }
 
-static av_always_inline void ff_put_h264_qpel8or16_hv1_lowpass_sse2(int16_t *tmp, uint8_t *src, int tmpStride, int srcStride, int size){
+static av_always_inline void put_h264_qpel8or16_hv1_lowpass_sse2(int16_t *tmp,
+ uint8_t *src,
+ int tmpStride,
+ int srcStride,
+ int size)
+{
 int w = (size+8)>>3;
 src -= 2*srcStride+2;
 while(w--){
@@ -220,7 +214,7 @@
 
 #define QPEL_H264_HV_XMM(OPNAME, OP, MMX)\
 static av_always_inline void ff_ ## OPNAME ## h264_qpel8or16_hv_lowpass_ ## MMX(uint8_t *dst, int16_t *tmp, uint8_t *src, int dstStride, int tmpStride, int srcStride, int size){\
- ff_put_h264_qpel8or16_hv1_lowpass_sse2(tmp, src, tmpStride, srcStride, size);\
+ put_h264_qpel8or16_hv1_lowpass_sse2(tmp, src, tmpStride, srcStride, size);\
 ff_ ## OPNAME ## h264_qpel8or16_hv2_lowpass_ ## MMX(dst, tmp, dstStride, tmpStride, size);\
 }\
 static av_always_inline void ff_ ## OPNAME ## h264_qpel8_hv_lowpass_ ## MMX(uint8_t *dst, int16_t *tmp, uint8_t *src, int dstStride, int tmpStride, int srcStride){\
@@ -249,81 +243,98 @@
 H264_MC_H(OPNAME, SIZE, MMX, ALIGN)\
 H264_MC_HV(OPNAME, SIZE, MMX, ALIGN)\
 
-static void put_h264_qpel16_mc00_sse2 (uint8_t *dst, uint8_t *src, int stride){
+static void put_h264_qpel16_mc00_sse2 (uint8_t *dst, uint8_t *src,
+ ptrdiff_t stride)
+{
 ff_put_pixels16_sse2(dst, src, stride, 16);
 }
-static void avg_h264_qpel16_mc00_sse2 (uint8_t *dst, uint8_t *src, int stride){
+static void avg_h264_qpel16_mc00_sse2 (uint8_t *dst, uint8_t *src,
+ ptrdiff_t stride)
+{
 ff_avg_pixels16_sse2(dst, src, stride, 16);
 }
 #define put_h264_qpel8_mc00_sse2 put_h264_qpel8_mc00_mmxext
 #define avg_h264_qpel8_mc00_sse2 avg_h264_qpel8_mc00_mmxext
 
 #define H264_MC_C(OPNAME, SIZE, MMX, ALIGN) \
-static void OPNAME ## h264_qpel ## SIZE ## _mc00_ ## MMX (uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## h264_qpel ## SIZE ## _mc00_ ## MMX (uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 ff_ ## OPNAME ## pixels ## SIZE ## _ ## MMX(dst, src, stride, SIZE);\
 }\
 
 #define H264_MC_H(OPNAME, SIZE, MMX, ALIGN) \
-static void OPNAME ## h264_qpel ## SIZE ## _mc10_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## h264_qpel ## SIZE ## _mc10_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 ff_ ## OPNAME ## h264_qpel ## SIZE ## _h_lowpass_l2_ ## MMX(dst, src, src, stride, stride);\
 }\
 \
-static void OPNAME ## h264_qpel ## SIZE ## _mc20_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## h264_qpel ## SIZE ## _mc20_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 ff_ ## OPNAME ## h264_qpel ## SIZE ## _h_lowpass_ ## MMX(dst, src, stride, stride);\
 }\
 \
-static void OPNAME ## h264_qpel ## SIZE ## _mc30_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## h264_qpel ## SIZE ## _mc30_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 ff_ ## OPNAME ## h264_qpel ## SIZE ## _h_lowpass_l2_ ## MMX(dst, src, src+1, stride, stride);\
 }\
 
 #define H264_MC_V(OPNAME, SIZE, MMX, ALIGN) \
-static void OPNAME ## h264_qpel ## SIZE ## _mc01_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## h264_qpel ## SIZE ## _mc01_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 DECLARE_ALIGNED(ALIGN, uint8_t, temp)[SIZE*SIZE];\
 ff_put_h264_qpel ## SIZE ## _v_lowpass_ ## MMX(temp, src, SIZE, stride);\
 ff_ ## OPNAME ## pixels ## SIZE ## _l2_ ## MMX(dst, src, temp, stride, stride, SIZE);\
 }\
 \
-static void OPNAME ## h264_qpel ## SIZE ## _mc02_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## h264_qpel ## SIZE ## _mc02_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 ff_ ## OPNAME ## h264_qpel ## SIZE ## _v_lowpass_ ## MMX(dst, src, stride, stride);\
 }\
 \
-static void OPNAME ## h264_qpel ## SIZE ## _mc03_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## h264_qpel ## SIZE ## _mc03_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 DECLARE_ALIGNED(ALIGN, uint8_t, temp)[SIZE*SIZE];\
 ff_put_h264_qpel ## SIZE ## _v_lowpass_ ## MMX(temp, src, SIZE, stride);\
 ff_ ## OPNAME ## pixels ## SIZE ## _l2_ ## MMX(dst, src+stride, temp, stride, stride, SIZE);\
 }\
 
 #define H264_MC_HV(OPNAME, SIZE, MMX, ALIGN) \
-static void OPNAME ## h264_qpel ## SIZE ## _mc11_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## h264_qpel ## SIZE ## _mc11_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 DECLARE_ALIGNED(ALIGN, uint8_t, temp)[SIZE*SIZE];\
 ff_put_h264_qpel ## SIZE ## _v_lowpass_ ## MMX(temp, src, SIZE, stride);\
 ff_ ## OPNAME ## h264_qpel ## SIZE ## _h_lowpass_l2_ ## MMX(dst, src, temp, stride, SIZE);\
 }\
 \
-static void OPNAME ## h264_qpel ## SIZE ## _mc31_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## h264_qpel ## SIZE ## _mc31_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 DECLARE_ALIGNED(ALIGN, uint8_t, temp)[SIZE*SIZE];\
 ff_put_h264_qpel ## SIZE ## _v_lowpass_ ## MMX(temp, src+1, SIZE, stride);\
 ff_ ## OPNAME ## h264_qpel ## SIZE ## _h_lowpass_l2_ ## MMX(dst, src, temp, stride, SIZE);\
 }\
 \
-static void OPNAME ## h264_qpel ## SIZE ## _mc13_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## h264_qpel ## SIZE ## _mc13_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 DECLARE_ALIGNED(ALIGN, uint8_t, temp)[SIZE*SIZE];\
 ff_put_h264_qpel ## SIZE ## _v_lowpass_ ## MMX(temp, src, SIZE, stride);\
 ff_ ## OPNAME ## h264_qpel ## SIZE ## _h_lowpass_l2_ ## MMX(dst, src+stride, temp, stride, SIZE);\
 }\
 \
-static void OPNAME ## h264_qpel ## SIZE ## _mc33_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## h264_qpel ## SIZE ## _mc33_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 DECLARE_ALIGNED(ALIGN, uint8_t, temp)[SIZE*SIZE];\
 ff_put_h264_qpel ## SIZE ## _v_lowpass_ ## MMX(temp, src+1, SIZE, stride);\
 ff_ ## OPNAME ## h264_qpel ## SIZE ## _h_lowpass_l2_ ## MMX(dst, src+stride, temp, stride, SIZE);\
 }\
 \
-static void OPNAME ## h264_qpel ## SIZE ## _mc22_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## h264_qpel ## SIZE ## _mc22_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 DECLARE_ALIGNED(ALIGN, uint16_t, temp)[SIZE*(SIZE<8?12:24)];\
 ff_ ## OPNAME ## h264_qpel ## SIZE ## _hv_lowpass_ ## MMX(dst, temp, src, stride, SIZE, stride);\
 }\
 \
-static void OPNAME ## h264_qpel ## SIZE ## _mc21_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## h264_qpel ## SIZE ## _mc21_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 DECLARE_ALIGNED(ALIGN, uint8_t, temp)[SIZE*(SIZE<8?12:24)*2 + SIZE*SIZE];\
 uint8_t * const halfHV= temp;\
 int16_t * const halfV= (int16_t*)(temp + SIZE*SIZE);\
@@ -332,7 +343,8 @@
 ff_ ## OPNAME ## h264_qpel ## SIZE ## _h_lowpass_l2_ ## MMX(dst, src, halfHV, stride, SIZE);\
 }\
 \
-static void OPNAME ## h264_qpel ## SIZE ## _mc23_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## h264_qpel ## SIZE ## _mc23_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 DECLARE_ALIGNED(ALIGN, uint8_t, temp)[SIZE*(SIZE<8?12:24)*2 + SIZE*SIZE];\
 uint8_t * const halfHV= temp;\
 int16_t * const halfV= (int16_t*)(temp + SIZE*SIZE);\
@@ -341,7 +353,8 @@
 ff_ ## OPNAME ## h264_qpel ## SIZE ## _h_lowpass_l2_ ## MMX(dst, src+stride, halfHV, stride, SIZE);\
 }\
 \
-static void OPNAME ## h264_qpel ## SIZE ## _mc12_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## h264_qpel ## SIZE ## _mc12_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 DECLARE_ALIGNED(ALIGN, uint8_t, temp)[SIZE*(SIZE<8?12:24)*2 + SIZE*SIZE];\
 uint8_t * const halfHV= temp;\
 int16_t * const halfV= (int16_t*)(temp + SIZE*SIZE);\
@@ -350,7 +363,8 @@
 ff_ ## OPNAME ## pixels ## SIZE ## _l2_shift5_mmxext(dst, halfV+2, halfHV, stride, SIZE, SIZE);\
 }\
 \
-static void OPNAME ## h264_qpel ## SIZE ## _mc32_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+static void OPNAME ## h264_qpel ## SIZE ## _mc32_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
+{\
 DECLARE_ALIGNED(ALIGN, uint8_t, temp)[SIZE*(SIZE<8?12:24)*2 + SIZE*SIZE];\
 uint8_t * const halfHV= temp;\
 int16_t * const halfV= (int16_t*)(temp + SIZE*SIZE);\
@@ -373,8 +387,6 @@
 QPEL(avg_, 8, XMM, 16)\
 QPEL(avg_, 16,XMM, 16)\
 
-#undef PAVGB
-#define PAVGB "pavgb"
 QPEL_H264(put_, PUT_OP, mmxext)
 QPEL_H264(avg_, AVG_MMXEXT_OP, mmxext)
 QPEL_H264_V_XMM(put_, PUT_OP, sse2)
@@ -385,7 +397,6 @@
 QPEL_H264_H_XMM(avg_,AVG_MMXEXT_OP, ssse3)
 QPEL_H264_HV_XMM(put_, PUT_OP, ssse3)
 QPEL_H264_HV_XMM(avg_,AVG_MMXEXT_OP, ssse3)
-#undef PAVGB
 
 H264_MC_4816(mmxext)
 H264_MC_816(H264_MC_V, sse2)
@@ -397,7 +408,7 @@
 //10bit
 #define LUMA_MC_OP(OP, NUM, DEPTH, TYPE, OPT) \
 void ff_ ## OP ## _h264_qpel ## NUM ## _ ## TYPE ## _ ## DEPTH ## _ ## OPT \
- (uint8_t *dst, uint8_t *src, int stride);
+ (uint8_t *dst, uint8_t *src, ptrdiff_t stride);
 
 #define LUMA_MC_ALL(DEPTH, TYPE, OPT) \
 LUMA_MC_OP(put, 4, DEPTH, TYPE, OPT) \
@@ -454,7 +465,7 @@
 LUMA_MC_816(10, mc33, sse2)
 
 #define QPEL16_OPMC(OP, MC, MMX)\
-void ff_ ## OP ## _h264_qpel16_ ## MC ## _10_ ## MMX(uint8_t *dst, uint8_t *src, int stride){\
+void ff_ ## OP ## _h264_qpel16_ ## MC ## _10_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride){\
 ff_ ## OP ## _h264_qpel8_ ## MC ## _10_ ## MMX(dst , src , stride);\
 ff_ ## OP ## _h264_qpel8_ ## MC ## _10_ ## MMX(dst+16, src+16, stride);\
 src += 8*stride;\
@@ -490,3 +501,134 @@
 #endif
 
 #endif /* HAVE_YASM */
+
+#define SET_QPEL_FUNCS(PFX, IDX, SIZE, CPU, PREFIX) \
+ do { \
+ c->PFX ## _pixels_tab[IDX][ 0] = PREFIX ## PFX ## SIZE ## _mc00_ ## CPU; \
+ c->PFX ## _pixels_tab[IDX][ 1] = PREFIX ## PFX ## SIZE ## _mc10_ ## CPU; \
+ c->PFX ## _pixels_tab[IDX][ 2] = PREFIX ## PFX ## SIZE ## _mc20_ ## CPU; \
+ c->PFX ## _pixels_tab[IDX][ 3] = PREFIX ## PFX ## SIZE ## _mc30_ ## CPU; \
+ c->PFX ## _pixels_tab[IDX][ 4] = PREFIX ## PFX ## SIZE ## _mc01_ ## CPU; \
+ c->PFX ## _pixels_tab[IDX][ 5] = PREFIX ## PFX ## SIZE ## _mc11_ ## CPU; \
+ c->PFX ## _pixels_tab[IDX][ 6] = PREFIX ## PFX ## SIZE ## _mc21_ ## CPU; \
+ c->PFX ## _pixels_tab[IDX][ 7] = PREFIX ## PFX ## SIZE ## _mc31_ ## CPU; \
+ c->PFX ## _pixels_tab[IDX][ 8] = PREFIX ## PFX ## SIZE ## _mc02_ ## CPU; \
+ c->PFX ## _pixels_tab[IDX][ 9] = PREFIX ## PFX ## SIZE ## _mc12_ ## CPU; \
+ c->PFX ## _pixels_tab[IDX][10] = PREFIX ## PFX ## SIZE ## _mc22_ ## CPU; \
+ c->PFX ## _pixels_tab[IDX][11] = PREFIX ## PFX ## SIZE ## _mc32_ ## CPU; \
+ c->PFX ## _pixels_tab[IDX][12] = PREFIX ## PFX ## SIZE ## _mc03_ ## CPU; \
+ c->PFX ## _pixels_tab[IDX][13] = PREFIX ## PFX ## SIZE ## _mc13_ ## CPU; \
+ c->PFX ## _pixels_tab[IDX][14] = PREFIX ## PFX ## SIZE ## _mc23_ ## CPU; \
+ c->PFX ## _pixels_tab[IDX][15] = PREFIX ## PFX ## SIZE ## _mc33_ ## CPU; \
+ } while (0)
+
+#define H264_QPEL_FUNCS(x, y, CPU) \
+ do { \
+ c->put_h264_qpel_pixels_tab[0][x + y * 4] = put_h264_qpel16_mc ## x ## y ## _ ## CPU; \
+ c->put_h264_qpel_pixels_tab[1][x + y * 4] = put_h264_qpel8_mc ## x ## y ## _ ## CPU; \
+ c->avg_h264_qpel_pixels_tab[0][x + y * 4] = avg_h264_qpel16_mc ## x ## y ## _ ## CPU; \
+ c->avg_h264_qpel_pixels_tab[1][x + y * 4] = avg_h264_qpel8_mc ## x ## y ## _ ## CPU; \
+ } while (0)
+
+#define H264_QPEL_FUNCS_10(x, y, CPU) \
+ do { \
+ c->put_h264_qpel_pixels_tab[0][x + y * 4] = ff_put_h264_qpel16_mc ## x ## y ## _10_ ## CPU; \
+ c->put_h264_qpel_pixels_tab[1][x + y * 4] = ff_put_h264_qpel8_mc ## x ## y ## _10_ ## CPU; \
+ c->avg_h264_qpel_pixels_tab[0][x + y * 4] = ff_avg_h264_qpel16_mc ## x ## y ## _10_ ## CPU; \
+ c->avg_h264_qpel_pixels_tab[1][x + y * 4] = ff_avg_h264_qpel8_mc ## x ## y ## _10_ ## CPU; \
+ } while (0)
+
+av_cold void ff_h264qpel_init_x86(H264QpelContext *c, int bit_depth)
+{
+#if HAVE_YASM
+ int high_bit_depth = bit_depth > 8;
+ int cpu_flags = av_get_cpu_flags();
+
+ if (EXTERNAL_MMXEXT(cpu_flags)) {
+ if (!high_bit_depth) {
+ SET_QPEL_FUNCS(put_h264_qpel, 0, 16, mmxext, );
+ SET_QPEL_FUNCS(put_h264_qpel, 1, 8, mmxext, );
+ SET_QPEL_FUNCS(put_h264_qpel, 2, 4, mmxext, );
+ SET_QPEL_FUNCS(avg_h264_qpel, 0, 16, mmxext, );
+ SET_QPEL_FUNCS(avg_h264_qpel, 1, 8, mmxext, );
+ SET_QPEL_FUNCS(avg_h264_qpel, 2, 4, mmxext, );
+ } else if (bit_depth == 10) {
+#if ARCH_X86_32
+ SET_QPEL_FUNCS(avg_h264_qpel, 0, 16, 10_mmxext, ff_);
+ SET_QPEL_FUNCS(put_h264_qpel, 0, 16, 10_mmxext, ff_);
+ SET_QPEL_FUNCS(put_h264_qpel, 1, 8, 10_mmxext, ff_);
+ SET_QPEL_FUNCS(avg_h264_qpel, 1, 8, 10_mmxext, ff_);
+#endif
+ SET_QPEL_FUNCS(put_h264_qpel, 2, 4, 10_mmxext, ff_);
+ SET_QPEL_FUNCS(avg_h264_qpel, 2, 4, 10_mmxext, ff_);
+ }
+ }
+
+ if (EXTERNAL_SSE2(cpu_flags)) {
+ if (!(cpu_flags & AV_CPU_FLAG_SSE2SLOW) && !high_bit_depth) {
+ // these functions are slower than mmx on AMD, but faster on Intel
+ H264_QPEL_FUNCS(0, 0, sse2);
+ }
+
+ if (!high_bit_depth) {
+ H264_QPEL_FUNCS(0, 1, sse2);
+ H264_QPEL_FUNCS(0, 2, sse2);
+ H264_QPEL_FUNCS(0, 3, sse2);
+ H264_QPEL_FUNCS(1, 1, sse2);
+ H264_QPEL_FUNCS(1, 2, sse2);
+ H264_QPEL_FUNCS(1, 3, sse2);
+ H264_QPEL_FUNCS(2, 1, sse2);
+ H264_QPEL_FUNCS(2, 2, sse2);
+ H264_QPEL_FUNCS(2, 3, sse2);
+ H264_QPEL_FUNCS(3, 1, sse2);
+ H264_QPEL_FUNCS(3, 2, sse2);
+ H264_QPEL_FUNCS(3, 3, sse2);
+ }
+
+ if (bit_depth == 10) {
+ SET_QPEL_FUNCS(put_h264_qpel, 0, 16, 10_sse2, ff_);
+ SET_QPEL_FUNCS(put_h264_qpel, 1, 8, 10_sse2, ff_);
+ SET_QPEL_FUNCS(avg_h264_qpel, 0, 16, 10_sse2, ff_);
+ SET_QPEL_FUNCS(avg_h264_qpel, 1, 8, 10_sse2, ff_);
+ H264_QPEL_FUNCS_10(1, 0, sse2_cache64);
+ H264_QPEL_FUNCS_10(2, 0, sse2_cache64);
+ H264_QPEL_FUNCS_10(3, 0, sse2_cache64);
+ }
+ }
+
+ if (EXTERNAL_SSSE3(cpu_flags)) {
+ if (!high_bit_depth) {
+ H264_QPEL_FUNCS(1, 0, ssse3);
+ H264_QPEL_FUNCS(1, 1, ssse3);
+ H264_QPEL_FUNCS(1, 2, ssse3);
+ H264_QPEL_FUNCS(1, 3, ssse3);
+ H264_QPEL_FUNCS(2, 0, ssse3);
+ H264_QPEL_FUNCS(2, 1, ssse3);
+ H264_QPEL_FUNCS(2, 2, ssse3);
+ H264_QPEL_FUNCS(2, 3, ssse3);
+ H264_QPEL_FUNCS(3, 0, ssse3);
+ H264_QPEL_FUNCS(3, 1, ssse3);
+ H264_QPEL_FUNCS(3, 2, ssse3);
+ H264_QPEL_FUNCS(3, 3, ssse3);
+ }
+
+ if (bit_depth == 10) {
+ H264_QPEL_FUNCS_10(1, 0, ssse3_cache64);
+ H264_QPEL_FUNCS_10(2, 0, ssse3_cache64);
+ H264_QPEL_FUNCS_10(3, 0, ssse3_cache64);
+ }
+ }
+
+ if (EXTERNAL_AVX(cpu_flags)) {
+ /* AVX implies 64 byte cache lines without the need to avoid unaligned
+ * memory accesses that cross the boundary between two cache lines.
+ * TODO: Port X264_CPU_CACHELINE_32/64 detection from x264 to avoid
+ * having to treat SSE2 functions with such properties as AVX. */
+ if (bit_depth == 10) {
+ H264_QPEL_FUNCS_10(1, 0, sse2);
+ H264_QPEL_FUNCS_10(2, 0, sse2);
+ H264_QPEL_FUNCS_10(3, 0, sse2);
+ }
+ }
+#endif
+}

libav-v10.1.tar.bz2/libavcodec/x86/h264chroma_init.c Added

@@ -0,0 +1,119 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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/x86/cpu.h"
+#include "libavcodec/h264chroma.h"
+
+void ff_put_h264_chroma_mc8_rnd_mmx (uint8_t *dst, uint8_t *src,
+ int stride, int h, int x, int y);
+void ff_avg_h264_chroma_mc8_rnd_mmxext(uint8_t *dst, uint8_t *src,
+ int stride, int h, int x, int y);
+void ff_avg_h264_chroma_mc8_rnd_3dnow(uint8_t *dst, uint8_t *src,
+ int stride, int h, int x, int y);
+
+void ff_put_h264_chroma_mc4_mmx (uint8_t *dst, uint8_t *src,
+ int stride, int h, int x, int y);
+void ff_avg_h264_chroma_mc4_mmxext (uint8_t *dst, uint8_t *src,
+ int stride, int h, int x, int y);
+void ff_avg_h264_chroma_mc4_3dnow (uint8_t *dst, uint8_t *src,
+ int stride, int h, int x, int y);
+
+void ff_put_h264_chroma_mc2_mmxext (uint8_t *dst, uint8_t *src,
+ int stride, int h, int x, int y);
+void ff_avg_h264_chroma_mc2_mmxext (uint8_t *dst, uint8_t *src,
+ int stride, int h, int x, int y);
+
+void ff_put_h264_chroma_mc8_rnd_ssse3(uint8_t *dst, uint8_t *src,
+ int stride, int h, int x, int y);
+void ff_put_h264_chroma_mc4_ssse3 (uint8_t *dst, uint8_t *src,
+ int stride, int h, int x, int y);
+
+void ff_avg_h264_chroma_mc8_rnd_ssse3(uint8_t *dst, uint8_t *src,
+ int stride, int h, int x, int y);
+void ff_avg_h264_chroma_mc4_ssse3 (uint8_t *dst, uint8_t *src,
+ int stride, int h, int x, int y);
+
+#define CHROMA_MC(OP, NUM, DEPTH, OPT) \
+void ff_ ## OP ## _h264_chroma_mc ## NUM ## _ ## DEPTH ## _ ## OPT \
+ (uint8_t *dst, uint8_t *src, \
+ int stride, int h, int x, int y);
+
+CHROMA_MC(put, 2, 10, mmxext)
+CHROMA_MC(avg, 2, 10, mmxext)
+CHROMA_MC(put, 4, 10, mmxext)
+CHROMA_MC(avg, 4, 10, mmxext)
+CHROMA_MC(put, 8, 10, sse2)
+CHROMA_MC(avg, 8, 10, sse2)
+CHROMA_MC(put, 8, 10, avx)
+CHROMA_MC(avg, 8, 10, avx)
+
+av_cold void ff_h264chroma_init_x86(H264ChromaContext *c, int bit_depth)
+{
+#if HAVE_YASM
+ int high_bit_depth = bit_depth > 8;
+ int cpu_flags = av_get_cpu_flags();
+
+ if (EXTERNAL_MMX(cpu_flags) && !high_bit_depth) {
+ c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_rnd_mmx;
+ c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_mmx;
+ }
+
+ if (EXTERNAL_AMD3DNOW(cpu_flags) && !high_bit_depth) {
+ c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_rnd_3dnow;
+ c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_3dnow;
+ }
+
+ if (EXTERNAL_MMXEXT(cpu_flags) && !high_bit_depth) {
+ c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_rnd_mmxext;
+ c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_mmxext;
+ c->avg_h264_chroma_pixels_tab[2] = ff_avg_h264_chroma_mc2_mmxext;
+ c->put_h264_chroma_pixels_tab[2] = ff_put_h264_chroma_mc2_mmxext;
+ }
+
+ if (EXTERNAL_MMXEXT(cpu_flags) && bit_depth > 8 && bit_depth <= 10) {
+ c->put_h264_chroma_pixels_tab[2] = ff_put_h264_chroma_mc2_10_mmxext;
+ c->avg_h264_chroma_pixels_tab[2] = ff_avg_h264_chroma_mc2_10_mmxext;
+ c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_10_mmxext;
+ c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_10_mmxext;
+ }
+
+ if (EXTERNAL_SSE2(cpu_flags) && bit_depth > 8 && bit_depth <= 10) {
+ c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_10_sse2;
+ c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_10_sse2;
+ }
+
+ if (EXTERNAL_SSSE3(cpu_flags) && !high_bit_depth) {
+ c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_rnd_ssse3;
+ c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_rnd_ssse3;
+ c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_ssse3;
+ c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_ssse3;
+ }
+
+ if (EXTERNAL_AVX(cpu_flags) && bit_depth > 8 && bit_depth <= 10) {
+ // AVX implies !cache64.
+ // TODO: Port cache(32|64) detection from x264.
+ c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_10_avx;
+ c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_10_avx;
+ }
+#endif
+}

libav-v9.6.tar.bz2/libavcodec/x86/h264dsp_init.c -> libav-v10.1.tar.bz2/libavcodec/x86/h264dsp_init.c Changed

@@ -18,11 +18,12 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/h264dsp.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 /***********************************/
 /* IDCT */
@@ -48,7 +49,7 @@
 #define IDCT_ADD_REP_FUNC(NUM, REP, DEPTH, OPT) \
 void ff_h264_idct ## NUM ## _add ## REP ## _ ## DEPTH ## _ ## OPT \
 (uint8_t *dst, const int *block_offset, \
- DCTELEM *block, int stride, const uint8_t nnzc[6 * 8]);
+ int16_t *block, int stride, const uint8_t nnzc[6 * 8]);
 
 IDCT_ADD_REP_FUNC(8, 4, 8, mmx)
 IDCT_ADD_REP_FUNC(8, 4, 8, mmxext)
@@ -70,7 +71,7 @@
 #define IDCT_ADD_REP_FUNC2(NUM, REP, DEPTH, OPT) \
 void ff_h264_idct ## NUM ## _add ## REP ## _ ## DEPTH ## _ ## OPT \
 (uint8_t **dst, const int *block_offset, \
- DCTELEM *block, int stride, const uint8_t nnzc[6 * 8]);
+ int16_t *block, int stride, const uint8_t nnzc[6 * 8]);
 
 IDCT_ADD_REP_FUNC2(, 8, 8, mmx)
 IDCT_ADD_REP_FUNC2(, 8, 8, mmxext)
@@ -78,8 +79,8 @@
 IDCT_ADD_REP_FUNC2(, 8, 10, sse2)
 IDCT_ADD_REP_FUNC2(, 8, 10, avx)
 
-void ff_h264_luma_dc_dequant_idct_mmx(DCTELEM *output, DCTELEM *input, int qmul);
-void ff_h264_luma_dc_dequant_idct_sse2(DCTELEM *output, DCTELEM *input, int qmul);
+void ff_h264_luma_dc_dequant_idct_mmx(int16_t *output, int16_t *input, int qmul);
+void ff_h264_luma_dc_dequant_idct_sse2(int16_t *output, int16_t *input, int qmul);
 
 /***********************************/
 /* deblocking */
@@ -131,8 +132,8 @@
 
 #if ARCH_X86_32 && HAVE_MMXEXT_EXTERNAL
 LF_FUNC(v8, luma, 8, mmxext)
-static void ff_deblock_v_luma_8_mmxext(uint8_t *pix, int stride, int alpha,
- int beta, int8_t *tc0)
+static void deblock_v_luma_8_mmxext(uint8_t *pix, int stride, int alpha,
+ int beta, int8_t *tc0)
 {
 if ((tc0[0] & tc0[1]) >= 0)
 ff_deblock_v8_luma_8_mmxext(pix + 0, stride, alpha, beta, tc0);
@@ -140,8 +141,8 @@
 ff_deblock_v8_luma_8_mmxext(pix + 8, stride, alpha, beta, tc0 + 2);
 }
 LF_IFUNC(v8, luma_intra, 8, mmxext)
-static void ff_deblock_v_luma_intra_8_mmxext(uint8_t *pix, int stride,
- int alpha, int beta)
+static void deblock_v_luma_intra_8_mmxext(uint8_t *pix, int stride,
+ int alpha, int beta)
 {
 ff_deblock_v8_luma_intra_8_mmxext(pix + 0, stride, alpha, beta);
 ff_deblock_v8_luma_intra_8_mmxext(pix + 8, stride, alpha, beta);
@@ -207,16 +208,16 @@
 H264_BIWEIGHT_10_SSE(8, 10)
 H264_BIWEIGHT_10_SSE(4, 10)
 
-void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth,
- const int chroma_format_idc)
+av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth,
+ const int chroma_format_idc)
 {
- int mm_flags = av_get_cpu_flags();
+ int cpu_flags = av_get_cpu_flags();
 
- if (chroma_format_idc == 1 && EXTERNAL_MMXEXT(mm_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) {
- if (EXTERNAL_MMX(mm_flags)) {
+ if (EXTERNAL_MMX(cpu_flags)) {
 c->h264_idct_dc_add =
 c->h264_idct_add = ff_h264_idct_add_8_mmx;
 c->h264_idct8_dc_add =
@@ -224,149 +225,145 @@
 
 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 (mm_flags & AV_CPU_FLAG_CMOV)
+ if (cpu_flags & AV_CPU_FLAG_CMOV)
 c->h264_luma_dc_dequant_idct = ff_h264_luma_dc_dequant_idct_mmx;
-
- if (EXTERNAL_MMXEXT(mm_flags)) {
- c->h264_idct_dc_add = ff_h264_idct_dc_add_8_mmxext;
- 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)
- 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) {
- 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;
- }
+ }
+ if (EXTERNAL_MMXEXT(cpu_flags)) {
+ c->h264_idct_dc_add = ff_h264_idct_dc_add_8_mmxext;
+ 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)
+ 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) {
+ 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;
+ }
 #if ARCH_X86_32 && HAVE_MMXEXT_EXTERNAL
- c->h264_v_loop_filter_luma = ff_deblock_v_luma_8_mmxext;
- c->h264_h_loop_filter_luma = ff_deblock_h_luma_8_mmxext;
- c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_8_mmxext;
- c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_8_mmxext;
+ c->h264_v_loop_filter_luma = deblock_v_luma_8_mmxext;
+ c->h264_h_loop_filter_luma = ff_deblock_h_luma_8_mmxext;
+ c->h264_v_loop_filter_luma_intra = deblock_v_luma_intra_8_mmxext;
+ c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_8_mmxext;
 #endif /* ARCH_X86_32 && HAVE_MMXEXT_EXTERNAL */
- c->weight_h264_pixels_tab[0] = ff_h264_weight_16_mmxext;
- c->weight_h264_pixels_tab[1] = ff_h264_weight_8_mmxext;
- c->weight_h264_pixels_tab[2] = ff_h264_weight_4_mmxext;
-
- c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_mmxext;
- c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_mmxext;
- c->biweight_h264_pixels_tab[2] = ff_h264_biweight_4_mmxext;
-
- if (EXTERNAL_SSE2(mm_flags)) {
- c->h264_idct8_add = ff_h264_idct8_add_8_sse2;
-
- 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)
- 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;
-
- c->weight_h264_pixels_tab[0] = ff_h264_weight_16_sse2;
- c->weight_h264_pixels_tab[1] = ff_h264_weight_8_sse2;
-
- c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_sse2;
- c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_sse2;
-
- c->h264_v_loop_filter_luma = ff_deblock_v_luma_8_sse2;
- c->h264_h_loop_filter_luma = ff_deblock_h_luma_8_sse2;
- c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_8_sse2;
- c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_8_sse2;
- }
- if (EXTERNAL_SSSE3(mm_flags)) {
- c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_ssse3;
- c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_ssse3;
- }
- if (EXTERNAL_AVX(mm_flags)) {
- c->h264_v_loop_filter_luma = ff_deblock_v_luma_8_avx;
- c->h264_h_loop_filter_luma = ff_deblock_h_luma_8_avx;
- c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_8_avx;
- c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_8_avx;
- }
- }
+ c->weight_h264_pixels_tab[0] = ff_h264_weight_16_mmxext;
+ c->weight_h264_pixels_tab[1] = ff_h264_weight_8_mmxext;
+ c->weight_h264_pixels_tab[2] = ff_h264_weight_4_mmxext;
+
+ c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_mmxext;
+ c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_mmxext;
+ c->biweight_h264_pixels_tab[2] = ff_h264_biweight_4_mmxext;
+ }
+ if (EXTERNAL_SSE2(cpu_flags)) {
+ c->h264_idct8_add = ff_h264_idct8_add_8_sse2;
+
+ 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)
+ 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;
+
+ c->weight_h264_pixels_tab[0] = ff_h264_weight_16_sse2;
+ c->weight_h264_pixels_tab[1] = ff_h264_weight_8_sse2;
+
+ c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_sse2;
+ c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_sse2;
+
+ c->h264_v_loop_filter_luma = ff_deblock_v_luma_8_sse2;
+ c->h264_h_loop_filter_luma = ff_deblock_h_luma_8_sse2;
+ c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_8_sse2;
+ c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_8_sse2;
+ }
+ if (EXTERNAL_SSSE3(cpu_flags)) {
+ c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_ssse3;
+ c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_ssse3;
+ }
+ if (EXTERNAL_AVX(cpu_flags)) {
+ c->h264_v_loop_filter_luma = ff_deblock_v_luma_8_avx;
+ c->h264_h_loop_filter_luma = ff_deblock_h_luma_8_avx;
+ c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_8_avx;
+ c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_8_avx;
 }
 } else if (bit_depth == 10) {
- if (EXTERNAL_MMX(mm_flags)) {
- if (EXTERNAL_MMXEXT(mm_flags)) {
+ if (EXTERNAL_MMXEXT(cpu_flags)) {
 #if ARCH_X86_32
- c->h264_v_loop_filter_chroma = ff_deblock_v_chroma_10_mmxext;
- c->h264_v_loop_filter_chroma_intra = ff_deblock_v_chroma_intra_10_mmxext;
- c->h264_v_loop_filter_luma = ff_deblock_v_luma_10_mmxext;
- c->h264_h_loop_filter_luma = ff_deblock_h_luma_10_mmxext;
- c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_10_mmxext;
- c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_10_mmxext;
+ c->h264_v_loop_filter_chroma = ff_deblock_v_chroma_10_mmxext;
+ c->h264_v_loop_filter_chroma_intra = ff_deblock_v_chroma_intra_10_mmxext;
+ c->h264_v_loop_filter_luma = ff_deblock_v_luma_10_mmxext;
+ c->h264_h_loop_filter_luma = ff_deblock_h_luma_10_mmxext;
+ c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_10_mmxext;
+ c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_10_mmxext;
 #endif /* ARCH_X86_32 */
- c->h264_idct_dc_add = ff_h264_idct_dc_add_10_mmxext;
- if (EXTERNAL_SSE2(mm_flags)) {
- c->h264_idct_add = ff_h264_idct_add_10_sse2;
- 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)
- c->h264_idct_add8 = ff_h264_idct_add8_10_sse2;
- c->h264_idct_add16intra = ff_h264_idct_add16intra_10_sse2;
+ c->h264_idct_dc_add = ff_h264_idct_dc_add_10_mmxext;
+ }
+ if (EXTERNAL_SSE2(cpu_flags)) {
+ c->h264_idct_add = ff_h264_idct_add_10_sse2;
+ 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)
+ c->h264_idct_add8 = ff_h264_idct_add8_10_sse2;
+ c->h264_idct_add16intra = ff_h264_idct_add16intra_10_sse2;
 #if HAVE_ALIGNED_STACK
- c->h264_idct8_add = ff_h264_idct8_add_10_sse2;
- c->h264_idct8_add4 = ff_h264_idct8_add4_10_sse2;
+ c->h264_idct8_add = ff_h264_idct8_add_10_sse2;
+ c->h264_idct8_add4 = ff_h264_idct8_add4_10_sse2;
 #endif /* HAVE_ALIGNED_STACK */
 
- c->weight_h264_pixels_tab[0] = ff_h264_weight_16_10_sse2;
- c->weight_h264_pixels_tab[1] = ff_h264_weight_8_10_sse2;
- c->weight_h264_pixels_tab[2] = ff_h264_weight_4_10_sse2;
+ c->weight_h264_pixels_tab[0] = ff_h264_weight_16_10_sse2;
+ c->weight_h264_pixels_tab[1] = ff_h264_weight_8_10_sse2;
+ c->weight_h264_pixels_tab[2] = ff_h264_weight_4_10_sse2;
 
- c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_10_sse2;
- c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_10_sse2;
- c->biweight_h264_pixels_tab[2] = ff_h264_biweight_4_10_sse2;
+ c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_10_sse2;
+ c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_10_sse2;
+ c->biweight_h264_pixels_tab[2] = ff_h264_biweight_4_10_sse2;
 
- c->h264_v_loop_filter_chroma = ff_deblock_v_chroma_10_sse2;
- c->h264_v_loop_filter_chroma_intra = ff_deblock_v_chroma_intra_10_sse2;
+ c->h264_v_loop_filter_chroma = ff_deblock_v_chroma_10_sse2;
+ c->h264_v_loop_filter_chroma_intra = ff_deblock_v_chroma_intra_10_sse2;
 #if HAVE_ALIGNED_STACK
- c->h264_v_loop_filter_luma = ff_deblock_v_luma_10_sse2;
- c->h264_h_loop_filter_luma = ff_deblock_h_luma_10_sse2;
- c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_10_sse2;
- c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_10_sse2;
+ c->h264_v_loop_filter_luma = ff_deblock_v_luma_10_sse2;
+ c->h264_h_loop_filter_luma = ff_deblock_h_luma_10_sse2;
+ c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_10_sse2;
+ c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_10_sse2;
 #endif /* HAVE_ALIGNED_STACK */
- }
- if (EXTERNAL_SSE4(mm_flags)) {
- c->weight_h264_pixels_tab[0] = ff_h264_weight_16_10_sse4;
- c->weight_h264_pixels_tab[1] = ff_h264_weight_8_10_sse4;
- c->weight_h264_pixels_tab[2] = ff_h264_weight_4_10_sse4;
-
- c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_10_sse4;
- c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_10_sse4;
- c->biweight_h264_pixels_tab[2] = ff_h264_biweight_4_10_sse4;
- }
- if (EXTERNAL_AVX(mm_flags)) {
- c->h264_idct_dc_add =
- c->h264_idct_add = ff_h264_idct_add_10_avx;
- 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)
- c->h264_idct_add8 = ff_h264_idct_add8_10_avx;
- c->h264_idct_add16intra = ff_h264_idct_add16intra_10_avx;
+ }
+ if (EXTERNAL_SSE4(cpu_flags)) {
+ c->weight_h264_pixels_tab[0] = ff_h264_weight_16_10_sse4;
+ c->weight_h264_pixels_tab[1] = ff_h264_weight_8_10_sse4;
+ c->weight_h264_pixels_tab[2] = ff_h264_weight_4_10_sse4;
+
+ c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_10_sse4;
+ c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_10_sse4;
+ c->biweight_h264_pixels_tab[2] = ff_h264_biweight_4_10_sse4;
+ }
+ if (EXTERNAL_AVX(cpu_flags)) {
+ c->h264_idct_dc_add =
+ c->h264_idct_add = ff_h264_idct_add_10_avx;
+ 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)
+ c->h264_idct_add8 = ff_h264_idct_add8_10_avx;
+ c->h264_idct_add16intra = ff_h264_idct_add16intra_10_avx;
 #if HAVE_ALIGNED_STACK
- c->h264_idct8_add = ff_h264_idct8_add_10_avx;
- c->h264_idct8_add4 = ff_h264_idct8_add4_10_avx;
+ c->h264_idct8_add = ff_h264_idct8_add_10_avx;
+ c->h264_idct8_add4 = ff_h264_idct8_add4_10_avx;
 #endif /* HAVE_ALIGNED_STACK */
 
- c->h264_v_loop_filter_chroma = ff_deblock_v_chroma_10_avx;
- c->h264_v_loop_filter_chroma_intra = ff_deblock_v_chroma_intra_10_avx;
+ c->h264_v_loop_filter_chroma = ff_deblock_v_chroma_10_avx;
+ c->h264_v_loop_filter_chroma_intra = ff_deblock_v_chroma_intra_10_avx;
 #if HAVE_ALIGNED_STACK
- c->h264_v_loop_filter_luma = ff_deblock_v_luma_10_avx;
- c->h264_h_loop_filter_luma = ff_deblock_h_luma_10_avx;
- c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_10_avx;
- c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_10_avx;
+ c->h264_v_loop_filter_luma = ff_deblock_v_luma_10_avx;
+ c->h264_h_loop_filter_luma = ff_deblock_h_luma_10_avx;
+ c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_10_avx;
+ c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_10_avx;
 #endif /* HAVE_ALIGNED_STACK */
- }
- }
 }
 }
 }

libav-v10.1.tar.bz2/libavcodec/x86/hpeldsp.asm Added

@@ -0,0 +1,454 @@
+;******************************************************************************
+;* MMX optimized hpel functions
+;*
+;* This file is part of Libav.
+;*
+;* Libav 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.
+;*
+;* Libav 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 Libav; 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
+cextern pb_1
+
+SECTION_TEXT
+
+; put_pixels8_x2(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+%macro PUT_PIXELS8_X2 0
+cglobal put_pixels8_x2, 4,5
+    lea          r4, [r2*2]
+.loop:
+    mova         m0, [r1]
+    mova         m1, [r1+r2]
+    PAVGB        m0, [r1+1]
+    PAVGB        m1, [r1+r2+1]
+    mova       [r0], m0
+    mova    [r0+r2], m1
+    add          r1, r4
+    add          r0, r4
+    mova         m0, [r1]
+    mova         m1, [r1+r2]
+    PAVGB        m0, [r1+1]
+    PAVGB        m1, [r1+r2+1]
+    add          r1, r4
+    mova       [r0], m0
+    mova    [r0+r2], m1
+    add          r0, r4
+    sub         r3d, 4
+    jne .loop
+    REP_RET
+%endmacro
+
+INIT_MMX mmxext
+PUT_PIXELS8_X2
+INIT_MMX 3dnow
+PUT_PIXELS8_X2
+
+
+; put_pixels16_x2(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+%macro PUT_PIXELS_16 0
+cglobal put_pixels16_x2, 4,5
+    lea          r4, [r2*2]
+.loop:
+    mova         m0, [r1]
+    mova         m1, [r1+r2]
+    mova         m2, [r1+8]
+    mova         m3, [r1+r2+8]
+    PAVGB        m0, [r1+1]
+    PAVGB        m1, [r1+r2+1]
+    PAVGB        m2, [r1+9]
+    PAVGB        m3, [r1+r2+9]
+    mova       [r0], m0
+    mova    [r0+r2], m1
+    mova     [r0+8], m2
+    mova  [r0+r2+8], m3
+    add          r1, r4
+    add          r0, r4
+    mova         m0, [r1]
+    mova         m1, [r1+r2]
+    mova         m2, [r1+8]
+    mova         m3, [r1+r2+8]
+    PAVGB        m0, [r1+1]
+    PAVGB        m1, [r1+r2+1]
+    PAVGB        m2, [r1+9]
+    PAVGB        m3, [r1+r2+9]
+    add          r1, r4
+    mova       [r0], m0
+    mova    [r0+r2], m1
+    mova     [r0+8], m2
+    mova  [r0+r2+8], m3
+    add          r0, r4
+    sub         r3d, 4
+    jne .loop
+    REP_RET
+%endmacro
+
+INIT_MMX mmxext
+PUT_PIXELS_16
+INIT_MMX 3dnow
+PUT_PIXELS_16
+
+
+; put_no_rnd_pixels8_x2(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+%macro PUT_NO_RND_PIXELS8_X2 0
+cglobal put_no_rnd_pixels8_x2, 4,5
+    mova         m6, [pb_1]
+    lea          r4, [r2*2]
+.loop:
+    mova         m0, [r1]
+    mova         m2, [r1+r2]
+    mova         m1, [r1+1]
+    mova         m3, [r1+r2+1]
+    add          r1, r4
+    psubusb      m0, m6
+    psubusb      m2, m6
+    PAVGB        m0, m1
+    PAVGB        m2, m3
+    mova       [r0], m0
+    mova    [r0+r2], m2
+    mova         m0, [r1]
+    mova         m1, [r1+1]
+    mova         m2, [r1+r2]
+    mova         m3, [r1+r2+1]
+    add          r0, r4
+    add          r1, r4
+    psubusb      m0, m6
+    psubusb      m2, m6
+    PAVGB        m0, m1
+    PAVGB        m2, m3
+    mova       [r0], m0
+    mova    [r0+r2], m2
+    add          r0, r4
+    sub         r3d, 4
+    jne .loop
+    REP_RET
+%endmacro
+
+INIT_MMX mmxext
+PUT_NO_RND_PIXELS8_X2
+INIT_MMX 3dnow
+PUT_NO_RND_PIXELS8_X2
+
+
+; put_no_rnd_pixels8_x2_exact(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+%macro PUT_NO_RND_PIXELS8_X2_EXACT 0
+cglobal put_no_rnd_pixels8_x2_exact, 4,5
+    lea          r4, [r2*3]
+    pcmpeqb      m6, m6
+.loop:
+    mova         m0, [r1]
+    mova         m2, [r1+r2]
+    mova         m1, [r1+1]
+    mova         m3, [r1+r2+1]
+    pxor         m0, m6
+    pxor         m2, m6
+    pxor         m1, m6
+    pxor         m3, m6
+    PAVGB        m0, m1
+    PAVGB        m2, m3
+    pxor         m0, m6
+    pxor         m2, m6
+    mova       [r0], m0
+    mova    [r0+r2], m2
+    mova         m0, [r1+r2*2]
+    mova         m1, [r1+r2*2+1]
+    mova         m2, [r1+r4]
+    mova         m3, [r1+r4+1]
+    pxor         m0, m6
+    pxor         m1, m6
+    pxor         m2, m6
+    pxor         m3, m6
+    PAVGB        m0, m1
+    PAVGB        m2, m3
+    pxor         m0, m6
+    pxor         m2, m6
+    mova  [r0+r2*2], m0
+    mova    [r0+r4], m2
+    lea          r1, [r1+r2*4]
+    lea          r0, [r0+r2*4]
+    sub         r3d, 4
+    jg .loop
+    REP_RET
+%endmacro
+
+INIT_MMX mmxext
+PUT_NO_RND_PIXELS8_X2_EXACT
+INIT_MMX 3dnow
+PUT_NO_RND_PIXELS8_X2_EXACT
+
+
+; put_pixels8_y2(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+%macro PUT_PIXELS8_Y2 0
+cglobal put_pixels8_y2, 4,5
+    lea          r4, [r2*2]
+    mova         m0, [r1]
+    sub          r0, r2
+.loop:
+    mova         m1, [r1+r2]
+    mova         m2, [r1+r4]
+    add          r1, r4
+    PAVGB        m0, m1
+    PAVGB        m1, m2
+    mova    [r0+r2], m0
+    mova    [r0+r4], m1
+    mova         m1, [r1+r2]
+    mova         m0, [r1+r4]
+    add          r0, r4
+    add          r1, r4
+    PAVGB        m2, m1
+    PAVGB        m1, m0
+    mova    [r0+r2], m2
+    mova    [r0+r4], m1
+    add          r0, r4
+    sub         r3d, 4
+    jne .loop
+    REP_RET
+%endmacro
+
+INIT_MMX mmxext
+PUT_PIXELS8_Y2
+INIT_MMX 3dnow
+PUT_PIXELS8_Y2
+
+
+; put_no_rnd_pixels8_y2(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+%macro PUT_NO_RND_PIXELS8_Y2 0
+cglobal put_no_rnd_pixels8_y2, 4,5
+    mova         m6, [pb_1]
+    lea          r4, [r2+r2]
+    mova         m0, [r1]
+    sub          r0, r2
+.loop:
+    mova         m1, [r1+r2]
+    mova         m2, [r1+r4]
+    add          r1, r4
+    psubusb      m1, m6
+    PAVGB        m0, m1
+    PAVGB        m1, m2
+    mova    [r0+r2], m0
+    mova    [r0+r4], m1
+    mova         m1, [r1+r2]
+    mova         m0, [r1+r4]
+    add          r0, r4
+    add          r1, r4
+    psubusb      m1, m6
+    PAVGB        m2, m1
+    PAVGB        m1, m0
+    mova    [r0+r2], m2
+    mova    [r0+r4], m1
+    add          r0, r4
+    sub         r3d, 4
+    jne .loop
+    REP_RET
+%endmacro
+
+INIT_MMX mmxext
+PUT_NO_RND_PIXELS8_Y2
+INIT_MMX 3dnow
+PUT_NO_RND_PIXELS8_Y2
+
+
+; put_no_rnd_pixels8_y2_exact(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+%macro PUT_NO_RND_PIXELS8_Y2_EXACT 0
+cglobal put_no_rnd_pixels8_y2_exact, 4,5
+    lea          r4, [r2*3]
+    mova         m0, [r1]
+    pcmpeqb      m6, m6
+    add          r1, r2
+    pxor         m0, m6
+.loop:
+    mova         m1, [r1]
+    mova         m2, [r1+r2]
+    pxor         m1, m6
+    pxor         m2, m6
+    PAVGB        m0, m1
+    PAVGB        m1, m2
+    pxor         m0, m6
+    pxor         m1, m6
+    mova       [r0], m0
+    mova    [r0+r2], m1
+    mova         m1, [r1+r2*2]
+    mova         m0, [r1+r4]
+    pxor         m1, m6
+    pxor         m0, m6
+    PAVGB        m2, m1
+    PAVGB        m1, m0
+    pxor         m2, m6
+    pxor         m1, m6
+    mova  [r0+r2*2], m2
+    mova    [r0+r4], m1
+    lea          r1, [r1+r2*4]
+    lea          r0, [r0+r2*4]
+    sub         r3d, 4
+    jg .loop
+    REP_RET
+%endmacro
+
+INIT_MMX mmxext
+PUT_NO_RND_PIXELS8_Y2_EXACT
+INIT_MMX 3dnow
+PUT_NO_RND_PIXELS8_Y2_EXACT
+
+
+; avg_pixels8(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+%macro AVG_PIXELS8 0
+cglobal avg_pixels8, 4,5
+    lea          r4, [r2*2]
+.loop:
+    mova         m0, [r0]
+    mova         m1, [r0+r2]
+    PAVGB        m0, [r1]
+    PAVGB        m1, [r1+r2]
+    mova       [r0], m0
+    mova    [r0+r2], m1
+    add          r1, r4
+    add          r0, r4
+    mova         m0, [r0]
+    mova         m1, [r0+r2]
+    PAVGB        m0, [r1]
+    PAVGB        m1, [r1+r2]
+    add          r1, r4
+    mova       [r0], m0
+    mova    [r0+r2], m1
+    add          r0, r4
+    sub         r3d, 4
+    jne .loop
+    REP_RET
+%endmacro
+
+INIT_MMX 3dnow
+AVG_PIXELS8
+
+
+; avg_pixels8_x2(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+%macro AVG_PIXELS8_X2 0
+cglobal avg_pixels8_x2, 4,5
+    lea          r4, [r2*2]
+.loop:
+    mova         m0, [r1]
+    mova         m2, [r1+r2]
+    PAVGB        m0, [r1+1]
+    PAVGB        m2, [r1+r2+1]
+    PAVGB        m0, [r0]
+    PAVGB        m2, [r0+r2]
+    add          r1, r4
+    mova       [r0], m0
+    mova    [r0+r2], m2
+    mova         m0, [r1]
+    mova         m2, [r1+r2]
+    PAVGB        m0, [r1+1]
+    PAVGB        m2, [r1+r2+1]
+    add          r0, r4
+    add          r1, r4
+    PAVGB        m0, [r0]
+    PAVGB        m2, [r0+r2]
+    mova       [r0], m0
+    mova    [r0+r2], m2
+    add          r0, r4
+    sub         r3d, 4
+    jne .loop
+    REP_RET
+%endmacro
+
+INIT_MMX mmxext
+AVG_PIXELS8_X2
+INIT_MMX 3dnow
+AVG_PIXELS8_X2
+
+
+; avg_pixels8_y2(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+%macro AVG_PIXELS8_Y2 0
+cglobal avg_pixels8_y2, 4,5
+    lea          r4, [r2*2]
+    mova         m0, [r1]
+    sub          r0, r2
+.loop:
+    mova         m1, [r1+r2]
+    mova         m2, [r1+r4]
+    add          r1, r4
+    PAVGB        m0, m1
+    PAVGB        m1, m2
+    mova         m3, [r0+r2]
+    mova         m4, [r0+r4]
+    PAVGB        m0, m3
+    PAVGB        m1, m4
+    mova    [r0+r2], m0
+    mova    [r0+r4], m1
+    mova         m1, [r1+r2]
+    mova         m0, [r1+r4]
+    PAVGB        m2, m1
+    PAVGB        m1, m0
+    add          r0, r4
+    add          r1, r4
+    mova         m3, [r0+r2]
+    mova         m4, [r0+r4]
+    PAVGB        m2, m3
+    PAVGB        m1, m4
+    mova    [r0+r2], m2
+    mova    [r0+r4], m1
+    add          r0, r4
+    sub         r3d, 4
+    jne .loop
+    REP_RET
+%endmacro
+
+INIT_MMX mmxext
+AVG_PIXELS8_Y2
+INIT_MMX 3dnow
+AVG_PIXELS8_Y2
+
+
+; avg_pixels8_xy2(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+%macro AVG_PIXELS8_XY2 0
+cglobal avg_pixels8_xy2, 4,5
+    mova         m6, [pb_1]
+    lea          r4, [r2*2]
+    mova         m0, [r1]
+    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]
+    add          r1, r4
+    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]
+    add          r0, r4
+    add          r1, r4
+    PAVGB        m2, m1
+    PAVGB        m1, m0
+    PAVGB        m2, [r0]
+    PAVGB        m1, [r0+r2]
+    mova       [r0], m2
+    mova    [r0+r2], m1
+    add          r0, r4
+    sub         r3d, 4
+    jne .loop
+    REP_RET
+%endmacro
+
+INIT_MMX mmxext
+AVG_PIXELS8_XY2
+INIT_MMX 3dnow
+AVG_PIXELS8_XY2

libav-v10.1.tar.bz2/libavcodec/x86/hpeldsp_init.c Added

@@ -0,0 +1,270 @@
+/*
+ * MMX optimized DSP utils
+ * Copyright (c) 2000, 2001 Fabrice Bellard
+ * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
+ */
+
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/x86/asm.h"
+#include "libavutil/x86/cpu.h"
+#include "libavcodec/hpeldsp.h"
+#include "dsputil_x86.h"
+
+void ff_put_pixels8_x2_mmxext(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_pixels8_x2_3dnow(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_pixels16_x2_mmxext(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_pixels16_x2_3dnow(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_no_rnd_pixels8_x2_mmxext(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_no_rnd_pixels8_x2_3dnow(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_no_rnd_pixels8_x2_exact_mmxext(uint8_t *block,
+ const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_no_rnd_pixels8_x2_exact_3dnow(uint8_t *block,
+ const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_pixels8_y2_mmxext(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_pixels8_y2_3dnow(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_no_rnd_pixels8_y2_mmxext(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_no_rnd_pixels8_y2_3dnow(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_no_rnd_pixels8_y2_exact_mmxext(uint8_t *block,
+ const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_put_no_rnd_pixels8_y2_exact_3dnow(uint8_t *block,
+ const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_avg_pixels8_3dnow(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_avg_pixels8_x2_mmxext(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_avg_pixels8_x2_3dnow(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_avg_pixels8_y2_mmxext(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_avg_pixels8_y2_3dnow(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_avg_pixels8_xy2_mmxext(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+void ff_avg_pixels8_xy2_3dnow(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h);
+
+#define avg_pixels8_mmx ff_avg_pixels8_mmx
+#define avg_pixels8_x2_mmx ff_avg_pixels8_x2_mmx
+#define avg_pixels16_mmx ff_avg_pixels16_mmx
+#define avg_pixels8_xy2_mmx ff_avg_pixels8_xy2_mmx
+#define avg_pixels16_xy2_mmx ff_avg_pixels16_xy2_mmx
+#define put_pixels8_mmx ff_put_pixels8_mmx
+#define put_pixels16_mmx ff_put_pixels16_mmx
+#define put_pixels8_xy2_mmx ff_put_pixels8_xy2_mmx
+#define put_pixels16_xy2_mmx ff_put_pixels16_xy2_mmx
+#define avg_no_rnd_pixels16_mmx ff_avg_pixels16_mmx
+#define put_no_rnd_pixels8_mmx ff_put_pixels8_mmx
+#define put_no_rnd_pixels16_mmx ff_put_pixels16_mmx
+
+#if HAVE_INLINE_ASM
+
+/***********************************/
+/* MMX no rounding */
+#define DEF(x, y) x ## _no_rnd_ ## y ## _mmx
+#define SET_RND MOVQ_WONE
+#define PAVGBP(a, b, c, d, e, f) PAVGBP_MMX_NO_RND(a, b, c, d, e, f)
+#define PAVGB(a, b, c, e) PAVGB_MMX_NO_RND(a, b, c, e)
+#define STATIC static
+
+#include "rnd_template.c"
+#include "hpeldsp_rnd_template.c"
+
+#undef DEF
+#undef SET_RND
+#undef PAVGBP
+#undef PAVGB
+#undef STATIC
+
+PIXELS16(static, avg_no_rnd, , _y2, _mmx)
+PIXELS16(static, put_no_rnd, , _y2, _mmx)
+
+PIXELS16(static, avg_no_rnd, , _xy2, _mmx)
+PIXELS16(static, put_no_rnd, , _xy2, _mmx)
+
+/***********************************/
+/* MMX rounding */
+
+#define DEF(x, y) x ## _ ## y ## _mmx
+#define SET_RND MOVQ_WTWO
+#define PAVGBP(a, b, c, d, e, f) PAVGBP_MMX(a, b, c, d, e, f)
+#define PAVGB(a, b, c, e) PAVGB_MMX(a, b, c, e)
+
+#include "hpeldsp_rnd_template.c"
+
+#undef DEF
+#undef SET_RND
+#undef PAVGBP
+#undef PAVGB
+
+PIXELS16(static, avg, , _y2, _mmx)
+PIXELS16(static, put, , _y2, _mmx)
+
+#endif /* HAVE_INLINE_ASM */
+
+
+#if HAVE_YASM
+
+#define HPELDSP_AVG_PIXELS16(CPUEXT) \
+ PIXELS16(static, put_no_rnd, ff_, _x2, CPUEXT) \
+ PIXELS16(static, put, ff_, _y2, CPUEXT) \
+ PIXELS16(static, put_no_rnd, ff_, _y2, CPUEXT) \
+ PIXELS16(static, avg, ff_, , CPUEXT) \
+ PIXELS16(static, avg, ff_, _x2, CPUEXT) \
+ PIXELS16(static, avg, ff_, _y2, CPUEXT) \
+ PIXELS16(static, avg, ff_, _xy2, CPUEXT)
+
+HPELDSP_AVG_PIXELS16(_3dnow)
+HPELDSP_AVG_PIXELS16(_mmxext)
+
+#endif /* HAVE_YASM */
+
+#define SET_HPEL_FUNCS(PFX, IDX, SIZE, CPU) \
+ do { \
+ c->PFX ## _pixels_tab IDX [0] = PFX ## _pixels ## SIZE ## _ ## CPU; \
+ c->PFX ## _pixels_tab IDX [1] = PFX ## _pixels ## SIZE ## _x2_ ## CPU; \
+ c->PFX ## _pixels_tab IDX [2] = PFX ## _pixels ## SIZE ## _y2_ ## CPU; \
+ c->PFX ## _pixels_tab IDX [3] = PFX ## _pixels ## SIZE ## _xy2_ ## CPU; \
+ } while (0)
+
+static void hpeldsp_init_mmx(HpelDSPContext *c, int flags, int cpu_flags)
+{
+#if HAVE_MMX_INLINE
+ SET_HPEL_FUNCS(put, [0], 16, mmx);
+ SET_HPEL_FUNCS(put_no_rnd, [0], 16, mmx);
+ SET_HPEL_FUNCS(avg, [0], 16, mmx);
+ SET_HPEL_FUNCS(avg_no_rnd, , 16, mmx);
+ SET_HPEL_FUNCS(put, [1], 8, mmx);
+ SET_HPEL_FUNCS(put_no_rnd, [1], 8, mmx);
+ SET_HPEL_FUNCS(avg, [1], 8, mmx);
+#endif /* HAVE_MMX_INLINE */
+}
+
+static void hpeldsp_init_mmxext(HpelDSPContext *c, int flags, int cpu_flags)
+{
+#if HAVE_MMXEXT_EXTERNAL
+ c->put_pixels_tab[0][1] = ff_put_pixels16_x2_mmxext;
+ c->put_pixels_tab[0][2] = put_pixels16_y2_mmxext;
+
+ c->avg_pixels_tab[0][0] = avg_pixels16_mmxext;
+ c->avg_pixels_tab[0][1] = avg_pixels16_x2_mmxext;
+ c->avg_pixels_tab[0][2] = avg_pixels16_y2_mmxext;
+
+ c->put_pixels_tab[1][1] = ff_put_pixels8_x2_mmxext;
+ c->put_pixels_tab[1][2] = ff_put_pixels8_y2_mmxext;
+
+ c->avg_pixels_tab[1][0] = ff_avg_pixels8_mmxext;
+ c->avg_pixels_tab[1][1] = ff_avg_pixels8_x2_mmxext;
+ c->avg_pixels_tab[1][2] = ff_avg_pixels8_y2_mmxext;
+
+ if (!(flags & CODEC_FLAG_BITEXACT)) {
+ c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_mmxext;
+ c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_mmxext;
+ c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_mmxext;
+ c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_mmxext;
+
+ c->avg_pixels_tab[0][3] = avg_pixels16_xy2_mmxext;
+ c->avg_pixels_tab[1][3] = ff_avg_pixels8_xy2_mmxext;
+ }
+
+ if (flags & CODEC_FLAG_BITEXACT && CONFIG_VP3_DECODER) {
+ c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_exact_mmxext;
+ c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_exact_mmxext;
+ }
+#endif /* HAVE_MMXEXT_EXTERNAL */
+}
+
+static void hpeldsp_init_3dnow(HpelDSPContext *c, int flags, int cpu_flags)
+{
+#if HAVE_AMD3DNOW_EXTERNAL
+ c->put_pixels_tab[0][1] = ff_put_pixels16_x2_3dnow;
+ c->put_pixels_tab[0][2] = put_pixels16_y2_3dnow;
+
+ c->avg_pixels_tab[0][0] = avg_pixels16_3dnow;
+ c->avg_pixels_tab[0][1] = avg_pixels16_x2_3dnow;
+ c->avg_pixels_tab[0][2] = avg_pixels16_y2_3dnow;
+
+ c->put_pixels_tab[1][1] = ff_put_pixels8_x2_3dnow;
+ c->put_pixels_tab[1][2] = ff_put_pixels8_y2_3dnow;
+
+ c->avg_pixels_tab[1][0] = ff_avg_pixels8_3dnow;
+ c->avg_pixels_tab[1][1] = ff_avg_pixels8_x2_3dnow;
+ c->avg_pixels_tab[1][2] = ff_avg_pixels8_y2_3dnow;
+
+ if (!(flags & CODEC_FLAG_BITEXACT)){
+ c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_3dnow;
+ c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_3dnow;
+ c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_3dnow;
+ c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_3dnow;
+
+ c->avg_pixels_tab[0][3] = avg_pixels16_xy2_3dnow;
+ c->avg_pixels_tab[1][3] = ff_avg_pixels8_xy2_3dnow;
+ }
+
+ if (flags & CODEC_FLAG_BITEXACT && CONFIG_VP3_DECODER) {
+ c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_exact_3dnow;
+ c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_exact_3dnow;
+ }
+#endif /* HAVE_AMD3DNOW_EXTERNAL */
+}
+
+static void hpeldsp_init_sse2(HpelDSPContext *c, int flags, int cpu_flags)
+{
+#if HAVE_SSE2_EXTERNAL
+ if (!(cpu_flags & AV_CPU_FLAG_SSE2SLOW)) {
+ // these functions are slower than mmx on AMD, but faster on Intel
+ c->put_pixels_tab[0][0] = ff_put_pixels16_sse2;
+ c->put_no_rnd_pixels_tab[0][0] = ff_put_pixels16_sse2;
+ c->avg_pixels_tab[0][0] = ff_avg_pixels16_sse2;
+ }
+#endif /* HAVE_SSE2_EXTERNAL */
+}
+
+av_cold void ff_hpeldsp_init_x86(HpelDSPContext *c, int flags)
+{
+ int cpu_flags = av_get_cpu_flags();
+
+ if (INLINE_MMX(cpu_flags))
+ hpeldsp_init_mmx(c, flags, cpu_flags);
+
+ if (EXTERNAL_AMD3DNOW(cpu_flags))
+ hpeldsp_init_3dnow(c, flags, cpu_flags);
+
+ if (EXTERNAL_MMXEXT(cpu_flags))
+ hpeldsp_init_mmxext(c, flags, cpu_flags);
+
+ if (EXTERNAL_SSE2(cpu_flags))
+ hpeldsp_init_sse2(c, flags, cpu_flags);
+}

libav-v10.1.tar.bz2/libavcodec/x86/hpeldsp_mmx.c Added

@@ -0,0 +1,52 @@
+/*
+ * MMX-optimized avg/put pixel routines
+ *
+ * Copyright (c) 2001 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 "dsputil_x86.h"
+
+#if HAVE_MMX_INLINE
+
+void ff_avg_pixels8_x2_mmx(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h)
+{
+ MOVQ_BFE(mm6);
+ JUMPALIGN();
+ do {
+ __asm__ volatile(
+ "movq %1, %%mm0 \n\t"
+ "movq 1%1, %%mm1 \n\t"
+ "movq %0, %%mm3 \n\t"
+ PAVGB_MMX(%%mm0, %%mm1, %%mm2, %%mm6)
+ PAVGB_MMX(%%mm3, %%mm2, %%mm0, %%mm6)
+ "movq %%mm0, %0 \n\t"
+ :"+m"(*block)
+ :"m"(*pixels)
+ :"memory");
+ pixels += line_size;
+ block += line_size;
+ } while (--h);
+}
+
+#endif /* HAVE_MMX_INLINE */

libav-v10.1.tar.bz2/libavcodec/x86/hpeldsp_rnd_template.c Added

@@ -0,0 +1,198 @@
+/*
+ * DSP utils mmx functions are compiled twice for rnd/no_rnd
+ * Copyright (c) 2000, 2001 Fabrice Bellard
+ * Copyright (c) 2003-2004 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
+ * mostly rewritten by Michael Niedermayer <michaelni@gmx.at>
+ * and improved by Zdenek Kabelac <kabi@users.sf.net>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+// put_pixels
+static void DEF(put, pixels8_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ MOVQ_BFE(mm6);
+ __asm__ volatile(
+ "lea (%3, %3), %%"REG_a" \n\t"
+ ".p2align 3 \n\t"
+ "1: \n\t"
+ "movq (%1), %%mm0 \n\t"
+ "movq 1(%1), %%mm1 \n\t"
+ "movq (%1, %3), %%mm2 \n\t"
+ "movq 1(%1, %3), %%mm3 \n\t"
+ PAVGBP(%%mm0, %%mm1, %%mm4, %%mm2, %%mm3, %%mm5)
+ "movq %%mm4, (%2) \n\t"
+ "movq %%mm5, (%2, %3) \n\t"
+ "add %%"REG_a", %1 \n\t"
+ "add %%"REG_a", %2 \n\t"
+ "movq (%1), %%mm0 \n\t"
+ "movq 1(%1), %%mm1 \n\t"
+ "movq (%1, %3), %%mm2 \n\t"
+ "movq 1(%1, %3), %%mm3 \n\t"
+ PAVGBP(%%mm0, %%mm1, %%mm4, %%mm2, %%mm3, %%mm5)
+ "movq %%mm4, (%2) \n\t"
+ "movq %%mm5, (%2, %3) \n\t"
+ "add %%"REG_a", %1 \n\t"
+ "add %%"REG_a", %2 \n\t"
+ "subl $4, %0 \n\t"
+ "jnz 1b \n\t"
+ :"+g"(h), "+S"(pixels), "+D"(block)
+ :"r"((x86_reg)line_size)
+ :REG_a, "memory");
+}
+
+static void DEF(put, pixels16_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ MOVQ_BFE(mm6);
+ __asm__ volatile(
+ "lea (%3, %3), %%"REG_a" \n\t"
+ ".p2align 3 \n\t"
+ "1: \n\t"
+ "movq (%1), %%mm0 \n\t"
+ "movq 1(%1), %%mm1 \n\t"
+ "movq (%1, %3), %%mm2 \n\t"
+ "movq 1(%1, %3), %%mm3 \n\t"
+ PAVGBP(%%mm0, %%mm1, %%mm4, %%mm2, %%mm3, %%mm5)
+ "movq %%mm4, (%2) \n\t"
+ "movq %%mm5, (%2, %3) \n\t"
+ "movq 8(%1), %%mm0 \n\t"
+ "movq 9(%1), %%mm1 \n\t"
+ "movq 8(%1, %3), %%mm2 \n\t"
+ "movq 9(%1, %3), %%mm3 \n\t"
+ PAVGBP(%%mm0, %%mm1, %%mm4, %%mm2, %%mm3, %%mm5)
+ "movq %%mm4, 8(%2) \n\t"
+ "movq %%mm5, 8(%2, %3) \n\t"
+ "add %%"REG_a", %1 \n\t"
+ "add %%"REG_a", %2 \n\t"
+ "movq (%1), %%mm0 \n\t"
+ "movq 1(%1), %%mm1 \n\t"
+ "movq (%1, %3), %%mm2 \n\t"
+ "movq 1(%1, %3), %%mm3 \n\t"
+ PAVGBP(%%mm0, %%mm1, %%mm4, %%mm2, %%mm3, %%mm5)
+ "movq %%mm4, (%2) \n\t"
+ "movq %%mm5, (%2, %3) \n\t"
+ "movq 8(%1), %%mm0 \n\t"
+ "movq 9(%1), %%mm1 \n\t"
+ "movq 8(%1, %3), %%mm2 \n\t"
+ "movq 9(%1, %3), %%mm3 \n\t"
+ PAVGBP(%%mm0, %%mm1, %%mm4, %%mm2, %%mm3, %%mm5)
+ "movq %%mm4, 8(%2) \n\t"
+ "movq %%mm5, 8(%2, %3) \n\t"
+ "add %%"REG_a", %1 \n\t"
+ "add %%"REG_a", %2 \n\t"
+ "subl $4, %0 \n\t"
+ "jnz 1b \n\t"
+ :"+g"(h), "+S"(pixels), "+D"(block)
+ :"r"((x86_reg)line_size)
+ :REG_a, "memory");
+}
+
+static void DEF(put, pixels8_y2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ MOVQ_BFE(mm6);
+ __asm__ volatile(
+ "lea (%3, %3), %%"REG_a" \n\t"
+ "movq (%1), %%mm0 \n\t"
+ ".p2align 3 \n\t"
+ "1: \n\t"
+ "movq (%1, %3), %%mm1 \n\t"
+ "movq (%1, %%"REG_a"),%%mm2 \n\t"
+ PAVGBP(%%mm1, %%mm0, %%mm4, %%mm2, %%mm1, %%mm5)
+ "movq %%mm4, (%2) \n\t"
+ "movq %%mm5, (%2, %3) \n\t"
+ "add %%"REG_a", %1 \n\t"
+ "add %%"REG_a", %2 \n\t"
+ "movq (%1, %3), %%mm1 \n\t"
+ "movq (%1, %%"REG_a"),%%mm0 \n\t"
+ PAVGBP(%%mm1, %%mm2, %%mm4, %%mm0, %%mm1, %%mm5)
+ "movq %%mm4, (%2) \n\t"
+ "movq %%mm5, (%2, %3) \n\t"
+ "add %%"REG_a", %1 \n\t"
+ "add %%"REG_a", %2 \n\t"
+ "subl $4, %0 \n\t"
+ "jnz 1b \n\t"
+ :"+g"(h), "+S"(pixels), "+D"(block)
+ :"r"((x86_reg)line_size)
+ :REG_a, "memory");
+}
+
+static void DEF(avg, pixels16_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ MOVQ_BFE(mm6);
+ JUMPALIGN();
+ do {
+ __asm__ volatile(
+ "movq %1, %%mm0 \n\t"
+ "movq 1%1, %%mm1 \n\t"
+ "movq %0, %%mm3 \n\t"
+ PAVGB(%%mm0, %%mm1, %%mm2, %%mm6)
+ PAVGB_MMX(%%mm3, %%mm2, %%mm0, %%mm6)
+ "movq %%mm0, %0 \n\t"
+ "movq 8%1, %%mm0 \n\t"
+ "movq 9%1, %%mm1 \n\t"
+ "movq 8%0, %%mm3 \n\t"
+ PAVGB(%%mm0, %%mm1, %%mm2, %%mm6)
+ PAVGB_MMX(%%mm3, %%mm2, %%mm0, %%mm6)
+ "movq %%mm0, 8%0 \n\t"
+ :"+m"(*block)
+ :"m"(*pixels)
+ :"memory");
+ pixels += line_size;
+ block += line_size;
+ } while (--h);
+}
+
+static void DEF(avg, pixels8_y2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
+{
+ MOVQ_BFE(mm6);
+ __asm__ volatile(
+ "lea (%3, %3), %%"REG_a" \n\t"
+ "movq (%1), %%mm0 \n\t"
+ ".p2align 3 \n\t"
+ "1: \n\t"
+ "movq (%1, %3), %%mm1 \n\t"
+ "movq (%1, %%"REG_a"), %%mm2 \n\t"
+ PAVGBP(%%mm1, %%mm0, %%mm4, %%mm2, %%mm1, %%mm5)
+ "movq (%2), %%mm3 \n\t"
+ PAVGB_MMX(%%mm3, %%mm4, %%mm0, %%mm6)
+ "movq (%2, %3), %%mm3 \n\t"
+ PAVGB_MMX(%%mm3, %%mm5, %%mm1, %%mm6)
+ "movq %%mm0, (%2) \n\t"
+ "movq %%mm1, (%2, %3) \n\t"
+ "add %%"REG_a", %1 \n\t"
+ "add %%"REG_a", %2 \n\t"
+
+ "movq (%1, %3), %%mm1 \n\t"
+ "movq (%1, %%"REG_a"), %%mm0 \n\t"
+ PAVGBP(%%mm1, %%mm2, %%mm4, %%mm0, %%mm1, %%mm5)
+ "movq (%2), %%mm3 \n\t"
+ PAVGB_MMX(%%mm3, %%mm4, %%mm2, %%mm6)
+ "movq (%2, %3), %%mm3 \n\t"
+ PAVGB_MMX(%%mm3, %%mm5, %%mm1, %%mm6)
+ "movq %%mm2, (%2) \n\t"
+ "movq %%mm1, (%2, %3) \n\t"
+ "add %%"REG_a", %1 \n\t"
+ "add %%"REG_a", %2 \n\t"
+
+ "subl $4, %0 \n\t"
+ "jnz 1b \n\t"
+ :"+g"(h), "+S"(pixels), "+D"(block)
+ :"r"((x86_reg)line_size)
+ :REG_a, "memory");
+}

libav-v9.6.tar.bz2/libavcodec/x86/idct_mmx_xvid.c -> libav-v10.1.tar.bz2/libavcodec/x86/idct_mmx_xvid.c Changed

@@ -44,10 +44,10 @@
 #include "config.h"
 #include "libavcodec/avcodec.h"
 #include "libavutil/mem.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "idct_xvid.h"
 
-#if HAVE_INLINE_ASM
+#if HAVE_MMX_INLINE
 
 //=============================================================================
 // Macros and other preprocessor constants
@@ -507,6 +507,22 @@
     :: "r"(block), "r"(rounder_0), "r"(tab_i_04_mmx), "r"(tg_1_16));
 }
 
+void ff_idct_xvid_mmx_put(uint8_t *dest, int line_size, int16_t *block)
+{
+    ff_idct_xvid_mmx(block);
+    ff_put_pixels_clamped_mmx(block, dest, line_size);
+}
+
+void ff_idct_xvid_mmx_add(uint8_t *dest, int line_size, int16_t *block)
+{
+    ff_idct_xvid_mmx(block);
+    ff_add_pixels_clamped_mmx(block, dest, line_size);
+}
+
+#endif /* HAVE_MMX_INLINE */
+
+#if HAVE_MMXEXT_INLINE
+
 //-----------------------------------------------------------------------------
 // void idct_xmm(uint16_t block[64]);
 //-----------------------------------------------------------------------------
@@ -531,28 +547,16 @@
     :: "r"(block), "r"(rounder_0), "r"(tab_i_04_xmm), "r"(tg_1_16));
 }
 
-void ff_idct_xvid_mmx_put(uint8_t *dest, int line_size, DCTELEM *block)
-{
-    ff_idct_xvid_mmx(block);
-    ff_put_pixels_clamped_mmx(block, dest, line_size);
-}
-
-void ff_idct_xvid_mmx_add(uint8_t *dest, int line_size, DCTELEM *block)
-{
-    ff_idct_xvid_mmx(block);
-    ff_add_pixels_clamped_mmx(block, dest, line_size);
-}
-
-void ff_idct_xvid_mmxext_put(uint8_t *dest, int line_size, DCTELEM *block)
+void ff_idct_xvid_mmxext_put(uint8_t *dest, int line_size, int16_t *block)
 {
     ff_idct_xvid_mmxext(block);
     ff_put_pixels_clamped_mmx(block, dest, line_size);
 }
 
-void ff_idct_xvid_mmxext_add(uint8_t *dest, int line_size, DCTELEM *block)
+void ff_idct_xvid_mmxext_add(uint8_t *dest, int line_size, int16_t *block)
 {
     ff_idct_xvid_mmxext(block);
     ff_add_pixels_clamped_mmx(block, dest, line_size);
 }
 
-#endif /* HAVE_INLINE_ASM */
+#endif /* HAVE_MMXEXT_INLINE */

libav-v9.6.tar.bz2/libavcodec/x86/idct_sse2_xvid.c -> libav-v10.1.tar.bz2/libavcodec/x86/idct_sse2_xvid.c Changed

libav-v9.6.tar.bz2/libavcodec/x86/idct_xvid.h -> libav-v10.1.tar.bz2/libavcodec/x86/idct_xvid.h Changed

libav-v9.6.tar.bz2/libavcodec/x86/lpc.c -> libav-v10.1.tar.bz2/libavcodec/x86/lpc.c Changed

@@ -19,11 +19,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/x86/asm.h"
+#include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem.h"
+#include "libavutil/x86/asm.h"
+#include "libavutil/x86/cpu.h"
 #include "libavcodec/lpc.h"
 
+DECLARE_ASM_CONST(16, double, pd_1)[2] = { 1.0, 1.0 };
+DECLARE_ASM_CONST(16, double, pd_2)[2] = { 2.0, 2.0 };
+
 #if HAVE_SSE2_INLINE
 
 static void lpc_apply_welch_window_sse2(const int32_t *data, int len,
@@ -35,8 +41,8 @@
     x86_reg j =  n2*sizeof(int32_t);
     __asm__ volatile(
         "movsd   %4,     %%xmm7                \n\t"
-        "movapd  "MANGLE(ff_pd_1)", %%xmm6     \n\t"
-        "movapd  "MANGLE(ff_pd_2)", %%xmm5     \n\t"
+        "movapd  "MANGLE(pd_1)", %%xmm6        \n\t"
+        "movapd  "MANGLE(pd_2)", %%xmm5        \n\t"
         "movlhps %%xmm7, %%xmm7                \n\t"
         "subpd   %%xmm5, %%xmm7                \n\t"
         "addsd   %%xmm6, %%xmm7                \n\t"
@@ -85,9 +91,9 @@
         x86_reg i = -len*sizeof(double);
         if(j == lag-2) {
             __asm__ volatile(
-                "movsd    "MANGLE(ff_pd_1)", %%xmm0 \n\t"
-                "movsd    "MANGLE(ff_pd_1)", %%xmm1 \n\t"
-                "movsd    "MANGLE(ff_pd_1)", %%xmm2 \n\t"
+                "movsd    "MANGLE(pd_1)", %%xmm0    \n\t"
+                "movsd    "MANGLE(pd_1)", %%xmm1    \n\t"
+                "movsd    "MANGLE(pd_1)", %%xmm2    \n\t"
                 "1:                                 \n\t"
                 "movapd   (%2,%0), %%xmm3           \n\t"
                 "movupd -8(%3,%0), %%xmm4           \n\t"
@@ -115,8 +121,8 @@
             );
         } else {
             __asm__ volatile(
-                "movsd    "MANGLE(ff_pd_1)", %%xmm0 \n\t"
-                "movsd    "MANGLE(ff_pd_1)", %%xmm1 \n\t"
+                "movsd    "MANGLE(pd_1)", %%xmm0    \n\t"
+                "movsd    "MANGLE(pd_1)", %%xmm1    \n\t"
                 "1:                                 \n\t"
                 "movapd   (%3,%0), %%xmm3           \n\t"
                 "movupd -8(%4,%0), %%xmm4           \n\t"
@@ -144,9 +150,9 @@
 av_cold void ff_lpc_init_x86(LPCContext *c)
 {
 #if HAVE_SSE2_INLINE
-    int mm_flags = av_get_cpu_flags();
+    int cpu_flags = av_get_cpu_flags();
 
-    if (mm_flags & (AV_CPU_FLAG_SSE2|AV_CPU_FLAG_SSE2SLOW)) {
+    if (INLINE_SSE2(cpu_flags) && (cpu_flags & AV_CPU_FLAG_SSE2SLOW)) {
         c->lpc_apply_welch_window = lpc_apply_welch_window_sse2;
         c->lpc_compute_autocorr   = lpc_compute_autocorr_sse2;
     }

libav-v9.6.tar.bz2/libavcodec/x86/mathops.h -> libav-v10.1.tar.bz2/libavcodec/x86/mathops.h Changed

libav-v9.6.tar.bz2/libavcodec/x86/mlpdsp.c -> libav-v10.1.tar.bz2/libavcodec/x86/mlpdsp.c Changed

libav-v9.6.tar.bz2/libavcodec/x86/motion_est.c -> libav-v10.1.tar.bz2/libavcodec/x86/motion_est.c Changed

@@ -22,11 +22,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/attributes.h"
 #include "libavutil/internal.h"
 #include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
-#include "libavcodec/dsputil.h"
-#include "dsputil_mmx.h"
+#include "libavutil/x86/cpu.h"
+#include "dsputil_x86.h"
 
 #if HAVE_INLINE_ASM
 
@@ -432,12 +433,12 @@
 
 #endif /* HAVE_INLINE_ASM */
 
-void ff_dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx)
+av_cold void ff_dsputil_init_pix_mmx(DSPContext *c, AVCodecContext *avctx)
 {
 #if HAVE_INLINE_ASM
-    int mm_flags = av_get_cpu_flags();
+    int cpu_flags = av_get_cpu_flags();
 
-    if (mm_flags & AV_CPU_FLAG_MMX) {
+    if (INLINE_MMX(cpu_flags)) {
         c->pix_abs[0][0] = sad16_mmx;
         c->pix_abs[0][1] = sad16_x2_mmx;
         c->pix_abs[0][2] = sad16_y2_mmx;
@@ -450,7 +451,7 @@
         c->sad[0]= sad16_mmx;
         c->sad[1]= sad8_mmx;
     }
-    if (mm_flags & AV_CPU_FLAG_MMXEXT) {
+    if (INLINE_MMXEXT(cpu_flags)) {
         c->pix_abs[0][0] = sad16_mmxext;
         c->pix_abs[1][0] = sad8_mmxext;
 
@@ -466,7 +467,7 @@
             c->pix_abs[1][3] = sad8_xy2_mmxext;
         }
     }
-    if ((mm_flags & AV_CPU_FLAG_SSE2) && !(mm_flags & AV_CPU_FLAG_3DNOW) && avctx->codec_id != AV_CODEC_ID_SNOW) {
+    if (INLINE_SSE2(cpu_flags) && !(cpu_flags & AV_CPU_FLAG_3DNOW)) {
         c->sad[0]= sad16_sse2;
     }
 #endif /* HAVE_INLINE_ASM */

libav-v10.1.tar.bz2/libavcodec/x86/mpeg4qpel.asm Added

@@ -0,0 +1,558 @@
+;******************************************************************************
+;* mpeg4 qpel
+;* Copyright (c) 2008 Loren Merritt
+;*
+;* This file is part of Libav.
+;*
+;* Libav 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.
+;*
+;* Libav 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 Libav; 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
+cextern pb_1
+cextern pw_3
+cextern pw_15
+cextern pw_16
+cextern pw_20
+
+
+SECTION_TEXT
+
+; put_no_rnd_pixels8_l2(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
+%macro PUT_NO_RND_PIXELS8_L2 0
+cglobal put_no_rnd_pixels8_l2, 6,6
+    movsxdifnidn r4, r4d
+    movsxdifnidn r3, r3d
+    pcmpeqb      m6, m6
+    test        r5d, 1
+    je .loop
+    mova         m0, [r1]
+    mova         m1, [r2]
+    add          r1, r4
+    add          r2, 8
+    pxor         m0, m6
+    pxor         m1, m6
+    PAVGB        m0, m1
+    pxor         m0, m6
+    mova       [r0], m0
+    add          r0, r3
+    dec r5d
+.loop:
+    mova         m0, [r1]
+    add          r1, r4
+    mova         m1, [r1]
+    add          r1, r4
+    mova         m2, [r2]
+    mova         m3, [r2+8]
+    pxor         m0, m6
+    pxor         m1, m6
+    pxor         m2, m6
+    pxor         m3, m6
+    PAVGB        m0, m2
+    PAVGB        m1, m3
+    pxor         m0, m6
+    pxor         m1, m6
+    mova       [r0], m0
+    add          r0, r3
+    mova       [r0], m1
+    add          r0, r3
+    mova         m0, [r1]
+    add          r1, r4
+    mova         m1, [r1]
+    add          r1, r4
+    mova         m2, [r2+16]
+    mova         m3, [r2+24]
+    pxor         m0, m6
+    pxor         m1, m6
+    pxor         m2, m6
+    pxor         m3, m6
+    PAVGB        m0, m2
+    PAVGB        m1, m3
+    pxor         m0, m6
+    pxor         m1, m6
+    mova       [r0], m0
+    add          r0, r3
+    mova       [r0], m1
+    add          r0, r3
+    add          r2, 32
+    sub         r5d, 4
+    jne .loop
+    REP_RET
+%endmacro
+
+INIT_MMX mmxext
+PUT_NO_RND_PIXELS8_L2
+
+
+; put_no_rnd_pixels16_l2(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
+%macro PUT_NO_RND_PIXELS16_l2 0
+cglobal put_no_rnd_pixels16_l2, 6,6
+    movsxdifnidn r3, r3d
+    movsxdifnidn r4, r4d
+    pcmpeqb      m6, m6
+    test        r5d, 1
+    je .loop
+    mova         m0, [r1]
+    mova         m1, [r1+8]
+    mova         m2, [r2]
+    mova         m3, [r2+8]
+    pxor         m0, m6
+    pxor         m1, m6
+    pxor         m2, m6
+    pxor         m3, m6
+    PAVGB        m0, m2
+    PAVGB        m1, m3
+    pxor         m0, m6
+    pxor         m1, m6
+    add          r1, r4
+    add          r2, 16
+    mova       [r0], m0
+    mova     [r0+8], m1
+    add          r0, r3
+    dec r5d
+.loop:
+    mova         m0, [r1]
+    mova         m1, [r1+8]
+    add          r1, r4
+    mova         m2, [r2]
+    mova         m3, [r2+8]
+    pxor         m0, m6
+    pxor         m1, m6
+    pxor         m2, m6
+    pxor         m3, m6
+    PAVGB        m0, m2
+    PAVGB        m1, m3
+    pxor         m0, m6
+    pxor         m1, m6
+    mova       [r0], m0
+    mova     [r0+8], m1
+    add          r0, r3
+    mova         m0, [r1]
+    mova         m1, [r1+8]
+    add          r1, r4
+    mova         m2, [r2+16]
+    mova         m3, [r2+24]
+    pxor         m0, m6
+    pxor         m1, m6
+    pxor         m2, m6
+    pxor         m3, m6
+    PAVGB        m0, m2
+    PAVGB        m1, m3
+    pxor         m0, m6
+    pxor         m1, m6
+    mova       [r0], m0
+    mova     [r0+8], m1
+    add          r0, r3
+    add          r2, 32
+    sub         r5d, 2
+    jne .loop
+    REP_RET
+%endmacro
+
+INIT_MMX mmxext
+PUT_NO_RND_PIXELS16_l2
+INIT_MMX 3dnow
+PUT_NO_RND_PIXELS16_l2
+
+%macro MPEG4_QPEL16_H_LOWPASS 1
+cglobal %1_mpeg4_qpel16_h_lowpass, 5, 5, 0, 16
+    movsxdifnidn r2, r2d
+    movsxdifnidn r3, r3d
+    pxor         m7, m7
+.loop:
+    mova         m0, [r1]
+    mova         m1, m0
+    mova         m2, m0
+    punpcklbw    m0, m7
+    punpckhbw    m1, m7
+    pshufw       m5, m0, 0x90
+    pshufw       m6, m0, 0x41
+    mova         m3, m2
+    mova         m4, m2
+    psllq        m2, 8
+    psllq        m3, 16
+    psllq        m4, 24
+    punpckhbw    m2, m7
+    punpckhbw    m3, m7
+    punpckhbw    m4, m7
+    paddw        m5, m3
+    paddw        m6, m2
+    paddw        m5, m5
+    psubw        m6, m5
+    pshufw       m5, m0, 6
+    pmullw       m6, [pw_3]
+    paddw        m0, m4
+    paddw        m5, m1
+    pmullw       m0, [pw_20]
+    psubw        m0, m5
+    paddw        m6, [PW_ROUND]
+    paddw        m0, m6
+    psraw        m0, 5
+    mova    [rsp+8], m0
+    mova         m0, [r1+5]
+    mova         m5, m0
+    mova         m6, m0
+    psrlq        m0, 8
+    psrlq        m5, 16
+    punpcklbw    m0, m7
+    punpcklbw    m5, m7
+    paddw        m2, m0
+    paddw        m3, m5
+    paddw        m2, m2
+    psubw        m3, m2
+    mova         m2, m6
+    psrlq        m6, 24
+    punpcklbw    m2, m7
+    punpcklbw    m6, m7
+    pmullw       m3, [pw_3]
+    paddw        m1, m2
+    paddw        m4, m6
+    pmullw       m1, [pw_20]
+    psubw        m3, m4
+    paddw        m1, [PW_ROUND]
+    paddw        m3, m1
+    psraw        m3, 5
+    mova         m1, [rsp+8]
+    packuswb     m1, m3
+    OP_MOV     [r0], m1, m4
+    mova         m1, [r1+9]
+    mova         m4, m1
+    mova         m3, m1
+    psrlq        m1, 8
+    psrlq        m4, 16
+    punpcklbw    m1, m7
+    punpcklbw    m4, m7
+    paddw        m5, m1
+    paddw        m0, m4
+    paddw        m5, m5
+    psubw        m0, m5
+    mova         m5, m3
+    psrlq        m3, 24
+    pmullw       m0, [pw_3]
+    punpcklbw    m3, m7
+    paddw        m2, m3
+    psubw        m0, m2
+    mova         m2, m5
+    punpcklbw    m2, m7
+    punpckhbw    m5, m7
+    paddw        m6, m2
+    pmullw       m6, [pw_20]
+    paddw        m0, [PW_ROUND]
+    paddw        m0, m6
+    psraw        m0, 5
+    paddw        m3, m5
+    pshufw       m6, m5, 0xf9
+    paddw        m6, m4
+    pshufw       m4, m5, 0xbe
+    pshufw       m5, m5, 0x6f
+    paddw        m4, m1
+    paddw        m5, m2
+    paddw        m6, m6
+    psubw        m4, m6
+    pmullw       m3, [pw_20]
+    pmullw       m4, [pw_3]
+    psubw        m3, m5
+    paddw        m4, [PW_ROUND]
+    paddw        m4, m3
+    psraw        m4, 5
+    packuswb     m0, m4
+    OP_MOV   [r0+8], m0, m4
+    add          r1, r3
+    add          r0, r2
+    dec r4d
+    jne .loop
+    REP_RET
+%endmacro
+
+%macro PUT_OP 2-3
+    mova %1, %2
+%endmacro
+
+%macro AVG_OP 2-3
+    mova  %3, %1
+    pavgb %2, %3
+    mova  %1, %2
+%endmacro
+
+INIT_MMX mmxext
+%define PW_ROUND pw_16
+%define OP_MOV PUT_OP
+MPEG4_QPEL16_H_LOWPASS put
+%define PW_ROUND pw_16
+%define OP_MOV AVG_OP
+MPEG4_QPEL16_H_LOWPASS avg
+%define PW_ROUND pw_15
+%define OP_MOV PUT_OP
+MPEG4_QPEL16_H_LOWPASS put_no_rnd
+
+
+
+%macro MPEG4_QPEL8_H_LOWPASS 1
+cglobal %1_mpeg4_qpel8_h_lowpass, 5, 5, 0, 8
+    movsxdifnidn r2, r2d
+    movsxdifnidn r3, r3d
+    pxor         m7, m7
+.loop:
+    mova         m0, [r1]
+    mova         m1, m0
+    mova         m2, m0
+    punpcklbw    m0, m7
+    punpckhbw    m1, m7
+    pshufw       m5, m0, 0x90
+    pshufw       m6, m0, 0x41
+    mova         m3, m2
+    mova         m4, m2
+    psllq        m2, 8
+    psllq        m3, 16
+    psllq        m4, 24
+    punpckhbw    m2, m7
+    punpckhbw    m3, m7
+    punpckhbw    m4, m7
+    paddw        m5, m3
+    paddw        m6, m2
+    paddw        m5, m5
+    psubw        m6, m5
+    pshufw       m5, m0, 0x6
+    pmullw       m6, [pw_3]
+    paddw        m0, m4
+    paddw        m5, m1
+    pmullw       m0, [pw_20]
+    psubw        m0, m5
+    paddw        m6, [PW_ROUND]
+    paddw        m0, m6
+    psraw        m0, 5
+    movh         m5, [r1+5]
+    punpcklbw    m5, m7
+    pshufw       m6, m5, 0xf9
+    paddw        m1, m5
+    paddw        m2, m6
+    pshufw       m6, m5, 0xbe
+    pshufw       m5, m5, 0x6f
+    paddw        m3, m6
+    paddw        m4, m5
+    paddw        m2, m2
+    psubw        m3, m2
+    pmullw       m1, [pw_20]
+    pmullw       m3, [pw_3]
+    psubw        m3, m4
+    paddw        m1, [PW_ROUND]
+    paddw        m3, m1
+    psraw        m3, 5
+    packuswb     m0, m3
+    OP_MOV     [r0], m0, m4
+    add          r1, r3
+    add          r0, r2
+    dec r4d
+    jne .loop
+    REP_RET
+%endmacro
+
+INIT_MMX mmxext
+%define PW_ROUND pw_16
+%define OP_MOV PUT_OP
+MPEG4_QPEL8_H_LOWPASS put
+%define PW_ROUND pw_16
+%define OP_MOV AVG_OP
+MPEG4_QPEL8_H_LOWPASS avg
+%define PW_ROUND pw_15
+%define OP_MOV PUT_OP
+MPEG4_QPEL8_H_LOWPASS put_no_rnd
+
+
+
+%macro QPEL_V_LOW 5
+    paddw      m0, m1
+    mova       m4, [pw_20]
+    pmullw     m4, m0
+    mova       m0, %4
+    mova       m5, %1
+    paddw      m5, m0
+    psubw      m4, m5
+    mova       m5, %2
+    mova       m6, %3
+    paddw      m5, m3
+    paddw      m6, m2
+    paddw      m6, m6
+    psubw      m5, m6
+    pmullw     m5, [pw_3]
+    paddw      m4, [PW_ROUND]
+    paddw      m5, m4
+    psraw      m5, 5
+    packuswb   m5, m5
+    OP_MOV     %5, m5, m7
+    SWAP 0,1,2,3
+%endmacro
+
+%macro MPEG4_QPEL16_V_LOWPASS 1
+cglobal %1_mpeg4_qpel16_v_lowpass, 4, 6, 0, 544
+    movsxdifnidn r2, r2d
+    movsxdifnidn r3, r3d
+
+    mov         r4d, 17
+    mov          r5, rsp
+    pxor         m7, m7
+.looph:
+    mova         m0, [r1]
+    mova         m1, [r1]
+    mova         m2, [r1+8]
+    mova         m3, [r1+8]
+    punpcklbw    m0, m7
+    punpckhbw    m1, m7
+    punpcklbw    m2, m7
+    punpckhbw    m3, m7
+    mova       [r5], m0
+    mova  [r5+0x88], m1
+    mova [r5+0x110], m2
+    mova [r5+0x198], m3
+    add          r5, 8
+    add          r1, r3
+    dec r4d
+    jne .looph
+
+
+    ; NOTE: r1 CHANGES VALUES: r1 -> 4 - 14*dstStride
+    mov         r4d, 4
+    mov          r1, 4
+    neg          r2
+    lea          r1, [r1+r2*8]
+    lea          r1, [r1+r2*4]
+    lea          r1, [r1+r2*2]
+    neg          r2
+    mov          r5, rsp
+.loopv:
+    pxor         m7, m7
+    mova         m0, [r5+ 0x0]
+    mova         m1, [r5+ 0x8]
+    mova         m2, [r5+0x10]
+    mova         m3, [r5+0x18]
+    QPEL_V_LOW [r5+0x10], [r5+ 0x8], [r5+ 0x0], [r5+0x20], [r0]
+    QPEL_V_LOW [r5+ 0x8], [r5+ 0x0], [r5+ 0x0], [r5+0x28], [r0+r2]
+    lea    r0, [r0+r2*2]
+    QPEL_V_LOW [r5+ 0x0], [r5+ 0x0], [r5+ 0x8], [r5+0x30], [r0]
+    QPEL_V_LOW [r5+ 0x0], [r5+ 0x8], [r5+0x10], [r5+0x38], [r0+r2]
+    lea    r0, [r0+r2*2]
+    QPEL_V_LOW [r5+ 0x8], [r5+0x10], [r5+0x18], [r5+0x40], [r0]
+    QPEL_V_LOW [r5+0x10], [r5+0x18], [r5+0x20], [r5+0x48], [r0+r2]
+    lea    r0, [r0+r2*2]
+    QPEL_V_LOW [r5+0x18], [r5+0x20], [r5+0x28], [r5+0x50], [r0]
+    QPEL_V_LOW [r5+0x20], [r5+0x28], [r5+0x30], [r5+0x58], [r0+r2]
+    lea    r0, [r0+r2*2]
+    QPEL_V_LOW [r5+0x28], [r5+0x30], [r5+0x38], [r5+0x60], [r0]
+    QPEL_V_LOW [r5+0x30], [r5+0x38], [r5+0x40], [r5+0x68], [r0+r2]
+    lea    r0, [r0+r2*2]
+    QPEL_V_LOW [r5+0x38], [r5+0x40], [r5+0x48], [r5+0x70], [r0]
+    QPEL_V_LOW [r5+0x40], [r5+0x48], [r5+0x50], [r5+0x78], [r0+r2]
+    lea    r0, [r0+r2*2]
+    QPEL_V_LOW [r5+0x48], [r5+0x50], [r5+0x58], [r5+0x80], [r0]
+    QPEL_V_LOW [r5+0x50], [r5+0x58], [r5+0x60], [r5+0x80], [r0+r2]
+    lea    r0, [r0+r2*2]
+    QPEL_V_LOW [r5+0x58], [r5+0x60], [r5+0x68], [r5+0x78], [r0]
+    QPEL_V_LOW [r5+0x60], [r5+0x68], [r5+0x70], [r5+0x70], [r0+r2]
+
+    add    r5, 0x88
+    add    r0, r1
+    dec r4d
+    jne .loopv
+    REP_RET
+%endmacro
+
+%macro PUT_OPH 2-3
+    movh %1, %2
+%endmacro
+
+%macro AVG_OPH 2-3
+    movh  %3, %1
+    pavgb %2, %3
+    movh  %1, %2
+%endmacro
+
+INIT_MMX mmxext
+%define PW_ROUND pw_16
+%define OP_MOV PUT_OPH
+MPEG4_QPEL16_V_LOWPASS put
+%define PW_ROUND pw_16
+%define OP_MOV AVG_OPH
+MPEG4_QPEL16_V_LOWPASS avg
+%define PW_ROUND pw_15
+%define OP_MOV PUT_OPH
+MPEG4_QPEL16_V_LOWPASS put_no_rnd
+
+
+
+%macro MPEG4_QPEL8_V_LOWPASS 1
+cglobal %1_mpeg4_qpel8_v_lowpass, 4, 6, 0, 288
+    movsxdifnidn r2, r2d
+    movsxdifnidn r3, r3d
+
+    mov         r4d, 9
+    mov          r5, rsp
+    pxor         m7, m7
+.looph:
+    mova         m0, [r1]
+    mova         m1, [r1]
+    punpcklbw    m0, m7
+    punpckhbw    m1, m7
+    mova       [r5], m0
+    mova  [r5+0x48], m1
+    add          r5, 8
+    add          r1, r3
+    dec r4d
+    jne .looph
+
+
+    ; NOTE: r1 CHANGES VALUES: r1 -> 4 - 6*dstStride
+    mov         r4d, 2
+    mov          r1, 4
+    neg          r2
+    lea          r1, [r1+r2*4]
+    lea          r1, [r1+r2*2]
+    neg          r2
+    mov          r5, rsp
+.loopv:
+    pxor         m7, m7
+    mova         m0, [r5+ 0x0]
+    mova         m1, [r5+ 0x8]
+    mova         m2, [r5+0x10]
+    mova         m3, [r5+0x18]
+    QPEL_V_LOW [r5+0x10], [r5+ 0x8], [r5+ 0x0], [r5+0x20], [r0]
+    QPEL_V_LOW [r5+ 0x8], [r5+ 0x0], [r5+ 0x0], [r5+0x28], [r0+r2]
+    lea    r0, [r0+r2*2]
+    QPEL_V_LOW [r5+ 0x0], [r5+ 0x0], [r5+ 0x8], [r5+0x30], [r0]
+    QPEL_V_LOW [r5+ 0x0], [r5+ 0x8], [r5+0x10], [r5+0x38], [r0+r2]
+    lea    r0, [r0+r2*2]
+    QPEL_V_LOW [r5+ 0x8], [r5+0x10], [r5+0x18], [r5+0x40], [r0]
+    QPEL_V_LOW [r5+0x10], [r5+0x18], [r5+0x20], [r5+0x40], [r0+r2]
+    lea    r0, [r0+r2*2]
+    QPEL_V_LOW [r5+0x18], [r5+0x20], [r5+0x28], [r5+0x38], [r0]
+    QPEL_V_LOW [r5+0x20], [r5+0x28], [r5+0x30], [r5+0x30], [r0+r2]
+
+    add    r5, 0x48
+    add    r0, r1
+    dec r4d
+    jne .loopv
+    REP_RET
+%endmacro
+
+INIT_MMX mmxext
+%define PW_ROUND pw_16
+%define OP_MOV PUT_OPH
+MPEG4_QPEL8_V_LOWPASS put
+%define PW_ROUND pw_16
+%define OP_MOV AVG_OPH
+MPEG4_QPEL8_V_LOWPASS avg
+%define PW_ROUND pw_15
+%define OP_MOV PUT_OPH
+MPEG4_QPEL8_V_LOWPASS put_no_rnd

libav-v10.1.tar.bz2/libavcodec/x86/mpegaudiodsp.c Added

@@ -0,0 +1,268 @@
+/*
+ * MMX optimized MP3 decoding functions
+ * Copyright (c) 2010 Vitor Sessak
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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/internal.h"
+#include "libavutil/x86/asm.h"
+#include "libavutil/x86/cpu.h"
+#include "libavcodec/mpegaudiodsp.h"
+
+void ff_imdct36_float_sse(float *out, float *buf, float *in, float *win);
+void ff_imdct36_float_sse2(float *out, float *buf, float *in, float *win);
+void ff_imdct36_float_sse3(float *out, float *buf, float *in, float *win);
+void ff_imdct36_float_ssse3(float *out, float *buf, float *in, float *win);
+void ff_imdct36_float_avx(float *out, float *buf, float *in, float *win);
+void ff_four_imdct36_float_sse(float *out, float *buf, float *in, float *win,
+ float *tmpbuf);
+void ff_four_imdct36_float_avx(float *out, float *buf, float *in, float *win,
+ float *tmpbuf);
+
+DECLARE_ALIGNED(16, static float, mdct_win_sse)[2][4][4*40];
+
+#if HAVE_SSE2_INLINE
+
+#define MACS(rt, ra, rb) rt+=(ra)*(rb)
+#define MLSS(rt, ra, rb) rt-=(ra)*(rb)
+
+#define SUM8(op, sum, w, p) \
+{ \
+ op(sum, (w)[0 * 64], (p)[0 * 64]); \
+ op(sum, (w)[1 * 64], (p)[1 * 64]); \
+ op(sum, (w)[2 * 64], (p)[2 * 64]); \
+ op(sum, (w)[3 * 64], (p)[3 * 64]); \
+ op(sum, (w)[4 * 64], (p)[4 * 64]); \
+ op(sum, (w)[5 * 64], (p)[5 * 64]); \
+ op(sum, (w)[6 * 64], (p)[6 * 64]); \
+ op(sum, (w)[7 * 64], (p)[7 * 64]); \
+}
+
+static void apply_window(const float *buf, const float *win1,
+ const float *win2, float *sum1, float *sum2, int len)
+{
+ x86_reg count = - 4*len;
+ const float *win1a = win1+len;
+ const float *win2a = win2+len;
+ const float *bufa = buf+len;
+ float *sum1a = sum1+len;
+ float *sum2a = sum2+len;
+
+
+#define MULT(a, b) \
+ "movaps " #a "(%1,%0), %%xmm1 \n\t" \
+ "movaps " #a "(%3,%0), %%xmm2 \n\t" \
+ "mulps %%xmm2, %%xmm1 \n\t" \
+ "subps %%xmm1, %%xmm0 \n\t" \
+ "mulps " #b "(%2,%0), %%xmm2 \n\t" \
+ "subps %%xmm2, %%xmm4 \n\t" \
+
+ __asm__ volatile(
+ "1: \n\t"
+ "xorps %%xmm0, %%xmm0 \n\t"
+ "xorps %%xmm4, %%xmm4 \n\t"
+
+ MULT( 0, 0)
+ MULT( 256, 64)
+ MULT( 512, 128)
+ MULT( 768, 192)
+ MULT(1024, 256)
+ MULT(1280, 320)
+ MULT(1536, 384)
+ MULT(1792, 448)
+
+ "movaps %%xmm0, (%4,%0) \n\t"
+ "movaps %%xmm4, (%5,%0) \n\t"
+ "add $16, %0 \n\t"
+ "jl 1b \n\t"
+ :"+&r"(count)
+ :"r"(win1a), "r"(win2a), "r"(bufa), "r"(sum1a), "r"(sum2a)
+ );
+
+#undef MULT
+}
+
+static void apply_window_mp3(float *in, float *win, int *unused, float *out,
+ int incr)
+{
+ LOCAL_ALIGNED_16(float, suma, [17]);
+ LOCAL_ALIGNED_16(float, sumb, [17]);
+ LOCAL_ALIGNED_16(float, sumc, [17]);
+ LOCAL_ALIGNED_16(float, sumd, [17]);
+
+ float sum;
+
+ /* copy to avoid wrap */
+ __asm__ volatile(
+ "movaps 0(%0), %%xmm0 \n\t" \
+ "movaps 16(%0), %%xmm1 \n\t" \
+ "movaps 32(%0), %%xmm2 \n\t" \
+ "movaps 48(%0), %%xmm3 \n\t" \
+ "movaps %%xmm0, 0(%1) \n\t" \
+ "movaps %%xmm1, 16(%1) \n\t" \
+ "movaps %%xmm2, 32(%1) \n\t" \
+ "movaps %%xmm3, 48(%1) \n\t" \
+ "movaps 64(%0), %%xmm0 \n\t" \
+ "movaps 80(%0), %%xmm1 \n\t" \
+ "movaps 96(%0), %%xmm2 \n\t" \
+ "movaps 112(%0), %%xmm3 \n\t" \
+ "movaps %%xmm0, 64(%1) \n\t" \
+ "movaps %%xmm1, 80(%1) \n\t" \
+ "movaps %%xmm2, 96(%1) \n\t" \
+ "movaps %%xmm3, 112(%1) \n\t"
+ ::"r"(in), "r"(in+512)
+ :"memory"
+ );
+
+ apply_window(in + 16, win , win + 512, suma, sumc, 16);
+ apply_window(in + 32, win + 48, win + 640, sumb, sumd, 16);
+
+ SUM8(MACS, suma[0], win + 32, in + 48);
+
+ sumc[ 0] = 0;
+ sumb[16] = 0;
+ sumd[16] = 0;
+
+#define SUMS(suma, sumb, sumc, sumd, out1, out2) \
+ "movups " #sumd "(%4), %%xmm0 \n\t" \
+ "shufps $0x1b, %%xmm0, %%xmm0 \n\t" \
+ "subps " #suma "(%1), %%xmm0 \n\t" \
+ "movaps %%xmm0," #out1 "(%0) \n\t" \
+\
+ "movups " #sumc "(%3), %%xmm0 \n\t" \
+ "shufps $0x1b, %%xmm0, %%xmm0 \n\t" \
+ "addps " #sumb "(%2), %%xmm0 \n\t" \
+ "movaps %%xmm0," #out2 "(%0) \n\t"
+
+ if (incr == 1) {
+ __asm__ volatile(
+ SUMS( 0, 48, 4, 52, 0, 112)
+ SUMS(16, 32, 20, 36, 16, 96)
+ SUMS(32, 16, 36, 20, 32, 80)
+ SUMS(48, 0, 52, 4, 48, 64)
+
+ :"+&r"(out)
+ :"r"(&suma[0]), "r"(&sumb[0]), "r"(&sumc[0]), "r"(&sumd[0])
+ :"memory"
+ );
+ out += 16*incr;
+ } else {
+ int j;
+ float *out2 = out + 32 * incr;
+ out[0 ] = -suma[ 0];
+ out += incr;
+ out2 -= incr;
+ for(j=1;j<16;j++) {
+ *out = -suma[ j] + sumd[16-j];
+ *out2 = sumb[16-j] + sumc[ j];
+ out += incr;
+ out2 -= incr;
+ }
+ }
+
+ sum = 0;
+ SUM8(MLSS, sum, win + 16 + 32, in + 32);
+ *out = sum;
+}
+
+#endif /* HAVE_SSE2_INLINE */
+
+#if HAVE_YASM
+#define DECL_IMDCT_BLOCKS(CPU1, CPU2) \
+static void imdct36_blocks_ ## CPU1(float *out, float *buf, float *in, \
+ int count, int switch_point, int block_type) \
+{ \
+ int align_end = count - (count & 3); \
+ int j; \
+ for (j = 0; j < align_end; j+= 4) { \
+ LOCAL_ALIGNED_16(float, tmpbuf, [1024]); \
+ float *win = mdct_win_sse[switch_point && j < 4][block_type]; \
+ /* apply window & overlap with previous buffer */ \
+ \
+ /* select window */ \
+ ff_four_imdct36_float_ ## CPU2(out, buf, in, win, tmpbuf); \
+ in += 4*18; \
+ buf += 4*18; \
+ out += 4; \
+ } \
+ for (; j < count; j++) { \
+ /* apply window & overlap with previous buffer */ \
+ \
+ /* select window */ \
+ int win_idx = (switch_point && j < 2) ? 0 : block_type; \
+ float *win = ff_mdct_win_float[win_idx + (4 & -(j & 1))]; \
+ \
+ ff_imdct36_float_ ## CPU1(out, buf, in, win); \
+ \
+ in += 18; \
+ buf++; \
+ out++; \
+ } \
+}
+
+DECL_IMDCT_BLOCKS(sse,sse)
+DECL_IMDCT_BLOCKS(sse2,sse)
+DECL_IMDCT_BLOCKS(sse3,sse)
+DECL_IMDCT_BLOCKS(ssse3,sse)
+DECL_IMDCT_BLOCKS(avx,avx)
+#endif /* HAVE_YASM */
+
+av_cold void ff_mpadsp_init_x86(MPADSPContext *s)
+{
+ int cpu_flags = av_get_cpu_flags();
+
+ int i, j;
+ for (j = 0; j < 4; j++) {
+ for (i = 0; i < 40; i ++) {
+ mdct_win_sse[0][j][4*i ] = ff_mdct_win_float[j ][i];
+ mdct_win_sse[0][j][4*i + 1] = ff_mdct_win_float[j + 4][i];
+ mdct_win_sse[0][j][4*i + 2] = ff_mdct_win_float[j ][i];
+ mdct_win_sse[0][j][4*i + 3] = ff_mdct_win_float[j + 4][i];
+ mdct_win_sse[1][j][4*i ] = ff_mdct_win_float[0 ][i];
+ mdct_win_sse[1][j][4*i + 1] = ff_mdct_win_float[4 ][i];
+ mdct_win_sse[1][j][4*i + 2] = ff_mdct_win_float[j ][i];
+ mdct_win_sse[1][j][4*i + 3] = ff_mdct_win_float[j + 4][i];
+ }
+ }
+
+#if HAVE_SSE2_INLINE
+ if (INLINE_SSE2(cpu_flags)) {
+ s->apply_window_float = apply_window_mp3;
+ }
+#endif /* HAVE_SSE2_INLINE */
+
+#if HAVE_YASM
+ if (EXTERNAL_SSE(cpu_flags)) {
+ s->imdct36_blocks_float = imdct36_blocks_sse;
+ }
+ if (EXTERNAL_SSE2(cpu_flags)) {
+ s->imdct36_blocks_float = imdct36_blocks_sse2;
+ }
+ if (EXTERNAL_SSE3(cpu_flags)) {
+ s->imdct36_blocks_float = imdct36_blocks_sse3;
+ }
+ if (EXTERNAL_SSSE3(cpu_flags)) {
+ s->imdct36_blocks_float = imdct36_blocks_ssse3;
+ }
+ if (EXTERNAL_AVX(cpu_flags)) {
+ s->imdct36_blocks_float = imdct36_blocks_avx;
+ }
+#endif /* HAVE_YASM */
+}

libav-v9.6.tar.bz2/libavcodec/x86/mpegvideo.c -> libav-v10.1.tar.bz2/libavcodec/x86/mpegvideo.c Changed

@@ -19,17 +19,18 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/x86/asm.h"
+#include "libavutil/x86/cpu.h"
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/mpegvideo.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_INLINE_ASM
 
 static void dct_unquantize_h263_intra_mmx(MpegEncContext *s,
- DCTELEM *block, int n, int qscale)
+ int16_t *block, int n, int qscale)
 {
 x86_reg level, qmul, qadd, nCoeffs;
 
@@ -104,7 +105,7 @@
 
 
 static void dct_unquantize_h263_inter_mmx(MpegEncContext *s,
- DCTELEM *block, int n, int qscale)
+ int16_t *block, int n, int qscale)
 {
 x86_reg qmul, qadd, nCoeffs;
 
@@ -164,38 +165,8 @@
 );
 }
 
-
-/*
- NK:
- Note: looking at PARANOID:
- "enable all paranoid tests for rounding, overflows, etc..."
-
-#ifdef PARANOID
- if (level < -2048 || level > 2047)
- fprintf(stderr, "unquant error %d %d\n", i, level);
-#endif
- We can suppose that result of two multiplications can't be greater than 0xFFFF
- i.e. is 16-bit, so we use here only PMULLW instruction and can avoid
- a complex multiplication.
-=====================================================
- Full formula for multiplication of 2 integer numbers
- which are represent as high:low words:
- input: value1 = high1:low1
- value2 = high2:low2
- output: value3 = value1*value2
- value3=high3:low3 (on overflow: modulus 2^32 wrap-around)
- this mean that for 0x123456 * 0x123456 correct result is 0x766cb0ce4
- but this algorithm will compute only 0x66cb0ce4
- this limited by 16-bit size of operands
- ---------------------------------
- tlow1 = high1*low2
- tlow2 = high2*low1
- tlow1 = tlow1 + tlow2
- high3:low3 = low1*low2
- high3 += tlow1
-*/
 static void dct_unquantize_mpeg1_intra_mmx(MpegEncContext *s,
- DCTELEM *block, int n, int qscale)
+ int16_t *block, int n, int qscale)
 {
 x86_reg nCoeffs;
 const uint16_t *quant_matrix;
@@ -264,7 +235,7 @@
 }
 
 static void dct_unquantize_mpeg1_inter_mmx(MpegEncContext *s,
- DCTELEM *block, int n, int qscale)
+ int16_t *block, int n, int qscale)
 {
 x86_reg nCoeffs;
 const uint16_t *quant_matrix;
@@ -330,7 +301,7 @@
 }
 
 static void dct_unquantize_mpeg2_intra_mmx(MpegEncContext *s,
- DCTELEM *block, int n, int qscale)
+ int16_t *block, int n, int qscale)
 {
 x86_reg nCoeffs;
 const uint16_t *quant_matrix;
@@ -396,7 +367,7 @@
 }
 
 static void dct_unquantize_mpeg2_inter_mmx(MpegEncContext *s,
- DCTELEM *block, int n, int qscale)
+ int16_t *block, int n, int qscale)
 {
 x86_reg nCoeffs;
 const uint16_t *quant_matrix;
@@ -472,124 +443,14 @@
 );
 }
 
-static void denoise_dct_mmx(MpegEncContext *s, DCTELEM *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, DCTELEM *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 */
 
-void ff_MPV_common_init_x86(MpegEncContext *s)
+av_cold void ff_MPV_common_init_x86(MpegEncContext *s)
 {
 #if HAVE_INLINE_ASM
- int mm_flags = av_get_cpu_flags();
+ int cpu_flags = av_get_cpu_flags();
 
- if (mm_flags & AV_CPU_FLAG_MMX) {
+ if (INLINE_MMX(cpu_flags)) {
 s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_mmx;
 s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_mmx;
 s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_mmx;
@@ -597,12 +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;
-
- if (mm_flags & AV_CPU_FLAG_SSE2) {
- s->denoise_dct= denoise_dct_sse2;
- } else {
- s->denoise_dct= denoise_dct_mmx;
- }
 }
 #endif /* HAVE_INLINE_ASM */
 }

libav-v9.6.tar.bz2/libavcodec/x86/mpegvideoenc.c -> libav-v10.1.tar.bz2/libavcodec/x86/mpegvideoenc.c Changed

@@ -19,15 +19,17 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
+#include "libavcodec/dct.h"
 #include "libavcodec/mpegvideo.h"
-#include "dsputil_mmx.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
@@ -80,26 +82,146 @@
 #include "mpegvideoenc_template.c"
 #endif /* HAVE_SSSE3_INLINE */
 
-void ff_MPV_encode_init_x86(MpegEncContext *s)
+#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_MPV_encode_init_x86(MpegEncContext *s)
 {
- int mm_flags = av_get_cpu_flags();
 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
- if (INLINE_MMX(mm_flags))
+ int cpu_flags = av_get_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(mm_flags))
+ if (INLINE_MMXEXT(cpu_flags))
 s->dct_quantize = dct_quantize_MMXEXT;
 #endif
 #if HAVE_SSE2_INLINE
- if (INLINE_SSE2(mm_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(mm_flags))
+ if (INLINE_SSSE3(cpu_flags))
 s->dct_quantize = dct_quantize_SSSE3;
 #endif
 }

libav-v9.6.tar.bz2/libavcodec/x86/mpegvideoenc_template.c -> libav-v10.1.tar.bz2/libavcodec/x86/mpegvideoenc_template.c Changed

@@ -92,7 +92,7 @@
 #endif
 
 static int RENAME(dct_quantize)(MpegEncContext *s,
-                            DCTELEM *block, int n,
+                            int16_t *block, int n,
                             int qscale, int *overflow)
 {
     x86_reg last_non_zero_p1;
@@ -168,7 +168,7 @@
             "movzb %%al, %%"REG_a"              \n\t" // last_non_zero_p1
             : "+a" (last_non_zero_p1)
             : "r" (block+64), "r" (qmat), "r" (bias),
-              "r" (ff_inv_zigzag_direct16+64), "r" (temp_block+64)
+              "r" (inv_zigzag_direct16 + 64), "r" (temp_block + 64)
               XMM_CLOBBERS_ONLY("%xmm0", "%xmm1", "%xmm2", "%xmm3",
                                 "%xmm4", "%xmm5", "%xmm6", "%xmm7")
         );
@@ -202,7 +202,7 @@
             "movzb %%al, %%"REG_a"              \n\t" // last_non_zero_p1
             : "+a" (last_non_zero_p1)
             : "r" (block+64), "r" (qmat+64), "r" (bias+64),
-              "r" (ff_inv_zigzag_direct16+64), "r" (temp_block+64)
+              "r" (inv_zigzag_direct16 + 64), "r" (temp_block + 64)
               XMM_CLOBBERS_ONLY("%xmm0", "%xmm1", "%xmm2", "%xmm3",
                                 "%xmm4", "%xmm5", "%xmm6", "%xmm7")
         );

libav-v9.6.tar.bz2/libavcodec/x86/pngdsp_init.c -> libav-v10.1.tar.bz2/libavcodec/x86/pngdsp_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/common.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/pngdsp.h"
@@ -32,18 +33,18 @@
 void ff_add_bytes_l2_sse2(uint8_t *dst, uint8_t *src1,
                           uint8_t *src2, int w);
 
-void ff_pngdsp_init_x86(PNGDSPContext *dsp)
+av_cold void ff_pngdsp_init_x86(PNGDSPContext *dsp)
 {
-    int flags = av_get_cpu_flags();
+    int cpu_flags = av_get_cpu_flags();
 
 #if ARCH_X86_32
-    if (EXTERNAL_MMX(flags))
+    if (EXTERNAL_MMX(cpu_flags))
         dsp->add_bytes_l2         = ff_add_bytes_l2_mmx;
 #endif
-    if (EXTERNAL_MMXEXT(flags))
+    if (EXTERNAL_MMXEXT(cpu_flags))
         dsp->add_paeth_prediction = ff_add_png_paeth_prediction_mmxext;
-    if (EXTERNAL_SSE2(flags))
+    if (EXTERNAL_SSE2(cpu_flags))
         dsp->add_bytes_l2         = ff_add_bytes_l2_sse2;
-    if (EXTERNAL_SSSE3(flags))
+    if (EXTERNAL_SSSE3(cpu_flags))
         dsp->add_paeth_prediction = ff_add_png_paeth_prediction_ssse3;
 }

libav-v9.6.tar.bz2/libavcodec/x86/proresdsp.asm -> libav-v10.1.tar.bz2/libavcodec/x86/proresdsp.asm Changed

libav-v9.6.tar.bz2/libavcodec/x86/proresdsp_init.c -> libav-v10.1.tar.bz2/libavcodec/x86/proresdsp_init.c Changed

@@ -20,32 +20,34 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/attributes.h"
 #include "libavutil/x86/cpu.h"
+#include "libavcodec/dsputil.h"
 #include "libavcodec/proresdsp.h"
 
 void ff_prores_idct_put_10_sse2(uint16_t *dst, int linesize,
-                                DCTELEM *block, const int16_t *qmat);
+                                int16_t *block, const int16_t *qmat);
 void ff_prores_idct_put_10_sse4(uint16_t *dst, int linesize,
-                                DCTELEM *block, const int16_t *qmat);
+                                int16_t *block, const int16_t *qmat);
 void ff_prores_idct_put_10_avx (uint16_t *dst, int linesize,
-                                DCTELEM *block, const int16_t *qmat);
+                                int16_t *block, const int16_t *qmat);
 
-void ff_proresdsp_x86_init(ProresDSPContext *dsp)
+av_cold void ff_proresdsp_x86_init(ProresDSPContext *dsp)
 {
 #if ARCH_X86_64
-    int flags = av_get_cpu_flags();
+    int cpu_flags = av_get_cpu_flags();
 
-    if (EXTERNAL_SSE2(flags)) {
+    if (EXTERNAL_SSE2(cpu_flags)) {
         dsp->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
         dsp->idct_put = ff_prores_idct_put_10_sse2;
     }
 
-    if (EXTERNAL_SSE4(flags)) {
+    if (EXTERNAL_SSE4(cpu_flags)) {
         dsp->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
         dsp->idct_put = ff_prores_idct_put_10_sse4;
     }
 
-    if (EXTERNAL_AVX(flags)) {
+    if (EXTERNAL_AVX(cpu_flags)) {
         dsp->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
         dsp->idct_put = ff_prores_idct_put_10_avx;
     }

libav-v10.1.tar.bz2/libavcodec/x86/qpel.asm Added

@@ -0,0 +1,176 @@
+;******************************************************************************
+;* MMX optimized DSP utils
+;* Copyright (c) 2008 Loren Merritt
+;* Copyright (c) 2003-2013 Michael Niedermayer
+;* Copyright (c) 2013 Daniel Kang
+;*
+;* This file is part of Libav.
+;*
+;* Libav 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.
+;*
+;* Libav 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 Libav; 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 op_avgh 3
+    movh   %3, %2
+    pavgb  %1, %3
+    movh   %2, %1
+%endmacro
+
+%macro op_avg 2
+    pavgb  %1, %2
+    mova   %2, %1
+%endmacro
+
+%macro op_puth 2-3
+    movh   %2, %1
+%endmacro
+
+%macro op_put 2
+    mova   %2, %1
+%endmacro
+
+; void pixels4_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
+%macro PIXELS4_L2 1
+%define OP op_%1h
+cglobal %1_pixels4_l2, 6,6
+    movsxdifnidn r3, r3d
+    movsxdifnidn r4, r4d
+    test        r5d, 1
+    je        .loop
+    movd         m0, [r1]
+    movd         m1, [r2]
+    add          r1, r4
+    add          r2, 4
+    pavgb        m0, m1
+    OP           m0, [r0], m3
+    add          r0, r3
+    dec         r5d
+.loop:
+    mova         m0, [r1]
+    mova         m1, [r1+r4]
+    lea          r1, [r1+2*r4]
+    pavgb        m0, [r2]
+    pavgb        m1, [r2+4]
+    OP           m0, [r0], m3
+    OP           m1, [r0+r3], m3
+    lea          r0, [r0+2*r3]
+    mova         m0, [r1]
+    mova         m1, [r1+r4]
+    lea          r1, [r1+2*r4]
+    pavgb        m0, [r2+8]
+    pavgb        m1, [r2+12]
+    OP           m0, [r0], m3
+    OP           m1, [r0+r3], m3
+    lea          r0, [r0+2*r3]
+    add          r2, 16
+    sub         r5d, 4
+    jne       .loop
+    REP_RET
+%endmacro
+
+INIT_MMX mmxext
+PIXELS4_L2 put
+PIXELS4_L2 avg
+
+; void pixels8_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
+%macro PIXELS8_L2 1
+%define OP op_%1
+cglobal %1_pixels8_l2, 6,6
+    movsxdifnidn r3, r3d
+    movsxdifnidn r4, r4d
+    test        r5d, 1
+    je        .loop
+    mova         m0, [r1]
+    mova         m1, [r2]
+    add          r1, r4
+    add          r2, 8
+    pavgb        m0, m1
+    OP           m0, [r0]
+    add          r0, r3
+    dec         r5d
+.loop:
+    mova         m0, [r1]
+    mova         m1, [r1+r4]
+    lea          r1, [r1+2*r4]
+    pavgb        m0, [r2]
+    pavgb        m1, [r2+8]
+    OP           m0, [r0]
+    OP           m1, [r0+r3]
+    lea          r0, [r0+2*r3]
+    mova         m0, [r1]
+    mova         m1, [r1+r4]
+    lea          r1, [r1+2*r4]
+    pavgb        m0, [r2+16]
+    pavgb        m1, [r2+24]
+    OP           m0, [r0]
+    OP           m1, [r0+r3]
+    lea          r0, [r0+2*r3]
+    add          r2, 32
+    sub         r5d, 4
+    jne       .loop
+    REP_RET
+%endmacro
+
+INIT_MMX mmxext
+PIXELS8_L2 put
+PIXELS8_L2 avg
+
+; void pixels16_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
+%macro PIXELS16_L2 1
+%define OP op_%1
+cglobal %1_pixels16_l2, 6,6
+    movsxdifnidn r3, r3d
+    movsxdifnidn r4, r4d
+    test        r5d, 1
+    je        .loop
+    mova         m0, [r1]
+    mova         m1, [r1+8]
+    pavgb        m0, [r2]
+    pavgb        m1, [r2+8]
+    add          r1, r4
+    add          r2, 16
+    OP           m0, [r0]
+    OP           m1, [r0+8]
+    add          r0, r3
+    dec         r5d
+.loop:
+    mova         m0, [r1]
+    mova         m1, [r1+8]
+    add          r1, r4
+    pavgb        m0, [r2]
+    pavgb        m1, [r2+8]
+    OP           m0, [r0]
+    OP           m1, [r0+8]
+    add          r0, r3
+    mova         m0, [r1]
+    mova         m1, [r1+8]
+    add          r1, r4
+    pavgb        m0, [r2+16]
+    pavgb        m1, [r2+24]
+    OP           m0, [r0]
+    OP           m1, [r0+8]
+    add          r0, r3
+    add          r2, 32
+    sub         r5d, 2
+    jne       .loop
+    REP_RET
+%endmacro
+
+INIT_MMX mmxext
+PIXELS16_L2 put
+PIXELS16_L2 avg

libav-v10.1.tar.bz2/libavcodec/x86/rnd_mmx.c Added

@@ -0,0 +1,35 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "dsputil_x86.h"
+
+#if HAVE_INLINE_ASM
+
+#define DEF(x, y) ff_ ## x ## _ ## y ## _mmx
+#define SET_RND  MOVQ_WTWO
+#define PAVGBP(a, b, c, d, e, f)        PAVGBP_MMX(a, b, c, d, e, f)
+#define PAVGB(a, b, c, e)               PAVGB_MMX(a, b, c, e)
+#define STATIC
+
+#include "rnd_template.c"
+
+PIXELS16(, ff_avg, , _xy2, _mmx)
+PIXELS16(, ff_put, , _xy2, _mmx)
+
+#endif /* HAVE_INLINE_ASM */

libav-v10.1.tar.bz2/libavcodec/x86/rnd_template.c Added

@@ -0,0 +1,173 @@
+/*
+ * DSP utils mmx functions are compiled twice for rnd/no_rnd
+ * Copyright (c) 2000, 2001 Fabrice Bellard
+ * Copyright (c) 2003-2004 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
+ * mostly rewritten by Michael Niedermayer <michaelni@gmx.at>
+ * and improved by Zdenek Kabelac <kabi@users.sf.net>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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>
+
+// put_pixels
+STATIC void DEF(put, pixels8_xy2)(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h)
+{
+ MOVQ_ZERO(mm7);
+ SET_RND(mm6); // =2 for rnd and =1 for no_rnd version
+ __asm__ volatile(
+ "movq (%1), %%mm0 \n\t"
+ "movq 1(%1), %%mm4 \n\t"
+ "movq %%mm0, %%mm1 \n\t"
+ "movq %%mm4, %%mm5 \n\t"
+ "punpcklbw %%mm7, %%mm0 \n\t"
+ "punpcklbw %%mm7, %%mm4 \n\t"
+ "punpckhbw %%mm7, %%mm1 \n\t"
+ "punpckhbw %%mm7, %%mm5 \n\t"
+ "paddusw %%mm0, %%mm4 \n\t"
+ "paddusw %%mm1, %%mm5 \n\t"
+ "xor %%"REG_a", %%"REG_a" \n\t"
+ "add %3, %1 \n\t"
+ ".p2align 3 \n\t"
+ "1: \n\t"
+ "movq (%1, %%"REG_a"), %%mm0 \n\t"
+ "movq 1(%1, %%"REG_a"), %%mm2 \n\t"
+ "movq %%mm0, %%mm1 \n\t"
+ "movq %%mm2, %%mm3 \n\t"
+ "punpcklbw %%mm7, %%mm0 \n\t"
+ "punpcklbw %%mm7, %%mm2 \n\t"
+ "punpckhbw %%mm7, %%mm1 \n\t"
+ "punpckhbw %%mm7, %%mm3 \n\t"
+ "paddusw %%mm2, %%mm0 \n\t"
+ "paddusw %%mm3, %%mm1 \n\t"
+ "paddusw %%mm6, %%mm4 \n\t"
+ "paddusw %%mm6, %%mm5 \n\t"
+ "paddusw %%mm0, %%mm4 \n\t"
+ "paddusw %%mm1, %%mm5 \n\t"
+ "psrlw $2, %%mm4 \n\t"
+ "psrlw $2, %%mm5 \n\t"
+ "packuswb %%mm5, %%mm4 \n\t"
+ "movq %%mm4, (%2, %%"REG_a") \n\t"
+ "add %3, %%"REG_a" \n\t"
+
+ "movq (%1, %%"REG_a"), %%mm2 \n\t" // 0 <-> 2 1 <-> 3
+ "movq 1(%1, %%"REG_a"), %%mm4 \n\t"
+ "movq %%mm2, %%mm3 \n\t"
+ "movq %%mm4, %%mm5 \n\t"
+ "punpcklbw %%mm7, %%mm2 \n\t"
+ "punpcklbw %%mm7, %%mm4 \n\t"
+ "punpckhbw %%mm7, %%mm3 \n\t"
+ "punpckhbw %%mm7, %%mm5 \n\t"
+ "paddusw %%mm2, %%mm4 \n\t"
+ "paddusw %%mm3, %%mm5 \n\t"
+ "paddusw %%mm6, %%mm0 \n\t"
+ "paddusw %%mm6, %%mm1 \n\t"
+ "paddusw %%mm4, %%mm0 \n\t"
+ "paddusw %%mm5, %%mm1 \n\t"
+ "psrlw $2, %%mm0 \n\t"
+ "psrlw $2, %%mm1 \n\t"
+ "packuswb %%mm1, %%mm0 \n\t"
+ "movq %%mm0, (%2, %%"REG_a") \n\t"
+ "add %3, %%"REG_a" \n\t"
+
+ "subl $2, %0 \n\t"
+ "jnz 1b \n\t"
+ :"+g"(h), "+S"(pixels)
+ :"D"(block), "r"((x86_reg)line_size)
+ :REG_a, "memory");
+}
+
+// avg_pixels
+// this routine is 'slightly' suboptimal but mostly unused
+STATIC void DEF(avg, pixels8_xy2)(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h)
+{
+ MOVQ_ZERO(mm7);
+ SET_RND(mm6); // =2 for rnd and =1 for no_rnd version
+ __asm__ volatile(
+ "movq (%1), %%mm0 \n\t"
+ "movq 1(%1), %%mm4 \n\t"
+ "movq %%mm0, %%mm1 \n\t"
+ "movq %%mm4, %%mm5 \n\t"
+ "punpcklbw %%mm7, %%mm0 \n\t"
+ "punpcklbw %%mm7, %%mm4 \n\t"
+ "punpckhbw %%mm7, %%mm1 \n\t"
+ "punpckhbw %%mm7, %%mm5 \n\t"
+ "paddusw %%mm0, %%mm4 \n\t"
+ "paddusw %%mm1, %%mm5 \n\t"
+ "xor %%"REG_a", %%"REG_a" \n\t"
+ "add %3, %1 \n\t"
+ ".p2align 3 \n\t"
+ "1: \n\t"
+ "movq (%1, %%"REG_a"), %%mm0 \n\t"
+ "movq 1(%1, %%"REG_a"), %%mm2 \n\t"
+ "movq %%mm0, %%mm1 \n\t"
+ "movq %%mm2, %%mm3 \n\t"
+ "punpcklbw %%mm7, %%mm0 \n\t"
+ "punpcklbw %%mm7, %%mm2 \n\t"
+ "punpckhbw %%mm7, %%mm1 \n\t"
+ "punpckhbw %%mm7, %%mm3 \n\t"
+ "paddusw %%mm2, %%mm0 \n\t"
+ "paddusw %%mm3, %%mm1 \n\t"
+ "paddusw %%mm6, %%mm4 \n\t"
+ "paddusw %%mm6, %%mm5 \n\t"
+ "paddusw %%mm0, %%mm4 \n\t"
+ "paddusw %%mm1, %%mm5 \n\t"
+ "psrlw $2, %%mm4 \n\t"
+ "psrlw $2, %%mm5 \n\t"
+ "movq (%2, %%"REG_a"), %%mm3 \n\t"
+ "packuswb %%mm5, %%mm4 \n\t"
+ "pcmpeqd %%mm2, %%mm2 \n\t"
+ "paddb %%mm2, %%mm2 \n\t"
+ PAVGB_MMX(%%mm3, %%mm4, %%mm5, %%mm2)
+ "movq %%mm5, (%2, %%"REG_a") \n\t"
+ "add %3, %%"REG_a" \n\t"
+
+ "movq (%1, %%"REG_a"), %%mm2 \n\t" // 0 <-> 2 1 <-> 3
+ "movq 1(%1, %%"REG_a"), %%mm4 \n\t"
+ "movq %%mm2, %%mm3 \n\t"
+ "movq %%mm4, %%mm5 \n\t"
+ "punpcklbw %%mm7, %%mm2 \n\t"
+ "punpcklbw %%mm7, %%mm4 \n\t"
+ "punpckhbw %%mm7, %%mm3 \n\t"
+ "punpckhbw %%mm7, %%mm5 \n\t"
+ "paddusw %%mm2, %%mm4 \n\t"
+ "paddusw %%mm3, %%mm5 \n\t"
+ "paddusw %%mm6, %%mm0 \n\t"
+ "paddusw %%mm6, %%mm1 \n\t"
+ "paddusw %%mm4, %%mm0 \n\t"
+ "paddusw %%mm5, %%mm1 \n\t"
+ "psrlw $2, %%mm0 \n\t"
+ "psrlw $2, %%mm1 \n\t"
+ "movq (%2, %%"REG_a"), %%mm3 \n\t"
+ "packuswb %%mm1, %%mm0 \n\t"
+ "pcmpeqd %%mm2, %%mm2 \n\t"
+ "paddb %%mm2, %%mm2 \n\t"
+ PAVGB_MMX(%%mm3, %%mm0, %%mm1, %%mm2)
+ "movq %%mm1, (%2, %%"REG_a") \n\t"
+ "add %3, %%"REG_a" \n\t"
+
+ "subl $2, %0 \n\t"
+ "jnz 1b \n\t"
+ :"+g"(h), "+S"(pixels)
+ :"D"(block), "r"((x86_reg)line_size)
+ :REG_a, "memory");
+}

libav-v9.6.tar.bz2/libavcodec/x86/rv34dsp.asm -> libav-v10.1.tar.bz2/libavcodec/x86/rv34dsp.asm Changed

libav-v9.6.tar.bz2/libavcodec/x86/rv34dsp_init.c -> libav-v10.1.tar.bz2/libavcodec/x86/rv34dsp_init.c Changed

@@ -19,28 +19,28 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/rv34dsp.h"
 
-void ff_rv34_idct_dc_mmxext(DCTELEM *block);
-void ff_rv34_idct_dc_noround_mmxext(DCTELEM *block);
+void ff_rv34_idct_dc_mmxext(int16_t *block);
+void ff_rv34_idct_dc_noround_mmxext(int16_t *block);
 void ff_rv34_idct_dc_add_mmx(uint8_t *dst, ptrdiff_t stride, int dc);
 void ff_rv34_idct_dc_add_sse4(uint8_t *dst, ptrdiff_t stride, int dc);
-void ff_rv34_idct_add_mmxext(uint8_t *dst, ptrdiff_t stride, DCTELEM *block);
+void ff_rv34_idct_add_mmxext(uint8_t *dst, ptrdiff_t stride, int16_t *block);
 
-av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c, DSPContext *dsp)
+av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c)
 {
-    int mm_flags = av_get_cpu_flags();
+    int cpu_flags = av_get_cpu_flags();
 
-    if (EXTERNAL_MMX(mm_flags))
+    if (EXTERNAL_MMX(cpu_flags))
         c->rv34_idct_dc_add = ff_rv34_idct_dc_add_mmx;
-    if (EXTERNAL_MMXEXT(mm_flags)) {
+    if (EXTERNAL_MMXEXT(cpu_flags)) {
         c->rv34_inv_transform_dc = ff_rv34_idct_dc_noround_mmxext;
         c->rv34_idct_add         = ff_rv34_idct_add_mmxext;
     }
-    if (EXTERNAL_SSE4(mm_flags))
+    if (EXTERNAL_SSE4(cpu_flags))
         c->rv34_idct_dc_add = ff_rv34_idct_dc_add_sse4;
 }

libav-v9.6.tar.bz2/libavcodec/x86/rv40dsp.asm -> libav-v10.1.tar.bz2/libavcodec/x86/rv40dsp.asm Changed

libav-v9.6.tar.bz2/libavcodec/x86/rv40dsp_init.c -> libav-v10.1.tar.bz2/libavcodec/x86/rv40dsp_init.c Changed

@@ -27,9 +27,10 @@
  */
 
 #include "libavcodec/rv34dsp.h"
+#include "libavutil/attributes.h"
 #include "libavutil/mem.h"
 #include "libavutil/x86/cpu.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_YASM
 void ff_put_rv40_chroma_mc8_mmx  (uint8_t *dst, uint8_t *src,
@@ -70,7 +71,7 @@
 #define QPEL_FUNC_DECL(OP, SIZE, PH, PV, OPT)                           \
 static void OP ## rv40_qpel ##SIZE ##_mc ##PH ##PV ##OPT(uint8_t *dst,  \
                                                          uint8_t *src,  \
-                                                         int stride)    \
+                                                         ptrdiff_t stride)  \
 {                                                                       \
     int i;                                                              \
     if (PH && PV) {                                                     \
@@ -187,25 +188,58 @@
 
 #endif /* HAVE_YASM */
 
-void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp)
+#if HAVE_MMX_INLINE
+static void put_rv40_qpel8_mc33_mmx(uint8_t *dst, uint8_t *src,
+                                    ptrdiff_t stride)
 {
-#if HAVE_YASM
-    int mm_flags = av_get_cpu_flags();
+    ff_put_pixels8_xy2_mmx(dst, src, stride, 8);
+}
+static void put_rv40_qpel16_mc33_mmx(uint8_t *dst, uint8_t *src,
+                                     ptrdiff_t stride)
+{
+    ff_put_pixels16_xy2_mmx(dst, src, stride, 16);
+}
+static void avg_rv40_qpel8_mc33_mmx(uint8_t *dst, uint8_t *src,
+                                    ptrdiff_t stride)
+{
+    ff_avg_pixels8_xy2_mmx(dst, src, stride, 8);
+}
+static void avg_rv40_qpel16_mc33_mmx(uint8_t *dst, uint8_t *src,
+                                     ptrdiff_t stride)
+{
+    ff_avg_pixels16_xy2_mmx(dst, src, stride, 16);
+}
+#endif /* HAVE_MMX_INLINE */
+
+av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c)
+{
+    int cpu_flags = av_get_cpu_flags();
 
-    if (EXTERNAL_MMX(mm_flags)) {
-        c->put_chroma_pixels_tab[0] = ff_put_rv40_chroma_mc8_mmx;
-        c->put_chroma_pixels_tab[1] = ff_put_rv40_chroma_mc4_mmx;
 #if HAVE_MMX_INLINE
-        c->put_pixels_tab[0][15] = ff_put_rv40_qpel16_mc33_mmx;
-        c->put_pixels_tab[1][15] = ff_put_rv40_qpel8_mc33_mmx;
-        c->avg_pixels_tab[0][15] = ff_avg_rv40_qpel16_mc33_mmx;
-        c->avg_pixels_tab[1][15] = ff_avg_rv40_qpel8_mc33_mmx;
+    if (INLINE_MMX(cpu_flags)) {
+        c->put_pixels_tab[0][15] = put_rv40_qpel16_mc33_mmx;
+        c->put_pixels_tab[1][15] = put_rv40_qpel8_mc33_mmx;
+        c->avg_pixels_tab[0][15] = avg_rv40_qpel16_mc33_mmx;
+        c->avg_pixels_tab[1][15] = avg_rv40_qpel8_mc33_mmx;
+    }
 #endif /* HAVE_MMX_INLINE */
+
+#if HAVE_YASM
+    if (EXTERNAL_MMX(cpu_flags)) {
+        c->put_chroma_pixels_tab[0] = ff_put_rv40_chroma_mc8_mmx;
+        c->put_chroma_pixels_tab[1] = ff_put_rv40_chroma_mc4_mmx;
 #if ARCH_X86_32
         QPEL_MC_SET(put_, _mmx)
 #endif
     }
-    if (EXTERNAL_MMXEXT(mm_flags)) {
+    if (EXTERNAL_AMD3DNOW(cpu_flags)) {
+        c->avg_chroma_pixels_tab[0] = ff_avg_rv40_chroma_mc8_3dnow;
+        c->avg_chroma_pixels_tab[1] = ff_avg_rv40_chroma_mc4_3dnow;
+#if ARCH_X86_32
+        QPEL_MC_SET(avg_, _3dnow)
+#endif
+    }
+    if (EXTERNAL_MMXEXT(cpu_flags)) {
         c->avg_chroma_pixels_tab[0]     = ff_avg_rv40_chroma_mc8_mmxext;
         c->avg_chroma_pixels_tab[1]     = ff_avg_rv40_chroma_mc4_mmxext;
         c->rv40_weight_pixels_tab[0][0] = ff_rv40_weight_func_rnd_16_mmxext;
@@ -215,14 +249,8 @@
 #if ARCH_X86_32
         QPEL_MC_SET(avg_, _mmxext)
 #endif
-    } else if (EXTERNAL_AMD3DNOW(mm_flags)) {
-        c->avg_chroma_pixels_tab[0] = ff_avg_rv40_chroma_mc8_3dnow;
-        c->avg_chroma_pixels_tab[1] = ff_avg_rv40_chroma_mc4_3dnow;
-#if ARCH_X86_32
-        QPEL_MC_SET(avg_, _3dnow)
-#endif
     }
-    if (EXTERNAL_SSE2(mm_flags)) {
+    if (EXTERNAL_SSE2(cpu_flags)) {
         c->rv40_weight_pixels_tab[0][0] = ff_rv40_weight_func_rnd_16_sse2;
         c->rv40_weight_pixels_tab[0][1] = ff_rv40_weight_func_rnd_8_sse2;
         c->rv40_weight_pixels_tab[1][0] = ff_rv40_weight_func_nornd_16_sse2;
@@ -230,7 +258,7 @@
         QPEL_MC_SET(put_, _sse2)
         QPEL_MC_SET(avg_, _sse2)
     }
-    if (EXTERNAL_SSSE3(mm_flags)) {
+    if (EXTERNAL_SSSE3(cpu_flags)) {
         c->rv40_weight_pixels_tab[0][0] = ff_rv40_weight_func_rnd_16_ssse3;
         c->rv40_weight_pixels_tab[0][1] = ff_rv40_weight_func_rnd_8_ssse3;
         c->rv40_weight_pixels_tab[1][0] = ff_rv40_weight_func_nornd_16_ssse3;

libav-v9.6.tar.bz2/libavcodec/x86/sbrdsp.asm -> libav-v10.1.tar.bz2/libavcodec/x86/sbrdsp.asm Changed

@@ -24,6 +24,8 @@
 SECTION_RODATA
 ; mask equivalent for multiply by -1.0 1.0
 ps_mask times 2 dd 1<<31, 0
+ps_mask2 times 2 dd 0, 1<<31
+ps_neg times 4 dd 1<<31
 
 SECTION_TEXT
 
@@ -181,3 +183,123 @@
 add start, 16
 jnz .loop2
 RET
+
+cglobal sbr_sum64x5, 1,2,4,z
+ lea r1q, [zq+ 256]
+.loop:
+ mova m0, [zq+ 0]
+ mova m2, [zq+ 16]
+ mova m1, [zq+ 256]
+ mova m3, [zq+ 272]
+ addps m0, [zq+ 512]
+ addps m2, [zq+ 528]
+ addps m1, [zq+ 768]
+ addps m3, [zq+ 784]
+ addps m0, [zq+1024]
+ addps m2, [zq+1040]
+ addps m0, m1
+ addps m2, m3
+ mova [zq], m0
+ mova [zq+16], m2
+ add zq, 32
+ cmp zq, r1q
+ jne .loop
+ REP_RET
+
+INIT_XMM sse
+cglobal sbr_qmf_post_shuffle, 2,3,4,W,z
+ lea r2q, [zq + (64-4)*4]
+ mova m3, [ps_neg]
+.loop:
+ mova m1, [zq]
+ xorps m0, m3, [r2q]
+ shufps m0, m0, m0, q0123
+ unpcklps m2, m0, m1
+ unpckhps m0, m0, m1
+ mova [Wq + 0], m2
+ mova [Wq + 16], m0
+ add Wq, 32
+ sub r2q, 16
+ add zq, 16
+ cmp zq, r2q
+ jl .loop
+ REP_RET
+
+INIT_XMM sse
+cglobal sbr_neg_odd_64, 1,2,4,z
+ lea r1q, [zq+256]
+.loop:
+ mova m0, [zq+ 0]
+ mova m1, [zq+16]
+ mova m2, [zq+32]
+ mova m3, [zq+48]
+ xorps m0, [ps_mask2]
+ xorps m1, [ps_mask2]
+ xorps m2, [ps_mask2]
+ xorps m3, [ps_mask2]
+ mova [zq+ 0], m0
+ mova [zq+16], m1
+ mova [zq+32], m2
+ mova [zq+48], m3
+ add zq, 64
+ cmp zq, r1q
+ jne .loop
+ REP_RET
+
+INIT_XMM sse2
+; sbr_qmf_deint_bfly(float *v, const float *src0, const float *src1)
+cglobal sbr_qmf_deint_bfly, 3,5,8, v,src0,src1,vrev,c
+ mov cq, 64*4-2*mmsize
+ lea vrevq, [vq + 64*4]
+.loop:
+ mova m0, [src0q+cq]
+ mova m1, [src1q]
+ mova m2, [src0q+cq+mmsize]
+ mova m3, [src1q+mmsize]
+ pshufd m4, m0, q0123
+ pshufd m5, m1, q0123
+ pshufd m6, m2, q0123
+ pshufd m7, m3, q0123
+ addps m3, m4
+ subps m0, m7
+ addps m1, m6
+ subps m2, m5
+ mova [vrevq], m1
+ mova [vrevq+mmsize], m3
+ mova [vq+cq], m0
+ mova [vq+cq+mmsize], m2
+ add src1q, 2*mmsize
+ add vrevq, 2*mmsize
+ sub cq, 2*mmsize
+ jge .loop
+ REP_RET
+
+INIT_XMM sse2
+cglobal sbr_qmf_pre_shuffle, 1,4,6,z
+%define OFFSET (32*4-2*mmsize)
+ mov r3q, OFFSET
+ lea r1q, [zq + (32+1)*4]
+ lea r2q, [zq + 64*4]
+ mova m5, [ps_neg]
+.loop:
+ movu m0, [r1q]
+ movu m2, [r1q + mmsize]
+ movu m1, [zq + r3q + 4 + mmsize]
+ movu m3, [zq + r3q + 4]
+
+ pxor m2, m5
+ pxor m0, m5
+ pshufd m2, m2, q0123
+ pshufd m0, m0, q0123
+ SBUTTERFLY dq, 2, 3, 4
+ SBUTTERFLY dq, 0, 1, 4
+ mova [r2q + 2*r3q + 0*mmsize], m2
+ mova [r2q + 2*r3q + 1*mmsize], m3
+ mova [r2q + 2*r3q + 2*mmsize], m0
+ mova [r2q + 2*r3q + 3*mmsize], m1
+ add r1q, 2*mmsize
+ sub r3q, 2*mmsize
+ jge .loop
+ movq m2, [zq]
+ movq [r2q], m2
+ REP_RET

libav-v9.6.tar.bz2/libavcodec/x86/sbrdsp_init.c -> libav-v10.1.tar.bz2/libavcodec/x86/sbrdsp_init.c Changed

@@ -20,24 +20,38 @@
  */
 
 #include "config.h"
+#include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/sbrdsp.h"
 
 float ff_sbr_sum_square_sse(float (*x)[2], int n);
+void ff_sbr_sum64x5_sse(float *z);
 void ff_sbr_hf_g_filt_sse(float (*Y)[2], const float (*X_high)[40][2],
                           const float *g_filt, int m_max, intptr_t ixh);
 void ff_sbr_hf_gen_sse(float (*X_high)[2], const float (*X_low)[2],
                        const float alpha0[2], const float alpha1[2],
                        float bw, int start, int end);
+void ff_sbr_neg_odd_64_sse(float *z);
+void ff_sbr_qmf_post_shuffle_sse(float W[32][2], const float *z);
+void ff_sbr_qmf_deint_bfly_sse2(float *v, const float *src0, const float *src1);
+void ff_sbr_qmf_pre_shuffle_sse2(float *z);
 
-void ff_sbrdsp_init_x86(SBRDSPContext *s)
+av_cold void ff_sbrdsp_init_x86(SBRDSPContext *s)
 {
-    int mm_flags = av_get_cpu_flags();
+    int cpu_flags = av_get_cpu_flags();
 
-    if (EXTERNAL_SSE(mm_flags)) {
+    if (EXTERNAL_SSE(cpu_flags)) {
+        s->neg_odd_64 = ff_sbr_neg_odd_64_sse;
         s->sum_square = ff_sbr_sum_square_sse;
+        s->sum64x5    = ff_sbr_sum64x5_sse;
         s->hf_g_filt  = ff_sbr_hf_g_filt_sse;
         s->hf_gen     = ff_sbr_hf_gen_sse;
+        s->qmf_post_shuffle = ff_sbr_qmf_post_shuffle_sse;
+    }
+
+    if (EXTERNAL_SSE2(cpu_flags)) {
+        s->qmf_deint_bfly   = ff_sbr_qmf_deint_bfly_sse2;
+        s->qmf_pre_shuffle  = ff_sbr_qmf_pre_shuffle_sse2;
     }
 }

libav-v9.6.tar.bz2/libavcodec/x86/simple_idct.c -> libav-v10.1.tar.bz2/libavcodec/x86/simple_idct.c Changed

libav-v9.6.tar.bz2/libavcodec/x86/vc1dsp_init.c -> libav-v10.1.tar.bz2/libavcodec/x86/vc1dsp_init.c Changed

@@ -24,9 +24,11 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/vc1dsp.h"
+#include "dsputil_x86.h"
 #include "vc1dsp.h"
 #include "config.h"
 
@@ -60,6 +62,12 @@
     ff_vc1_h_loop_filter8_sse4(src,          stride, pq);
     ff_vc1_h_loop_filter8_sse4(src+8*stride, stride, pq);
 }
+
+static void avg_vc1_mspel_mc00_mmxext(uint8_t *dst, const uint8_t *src,
+                                      ptrdiff_t stride, int rnd)
+{
+    ff_avg_pixels8_mmxext(dst, src, stride, 8);
+}
 #endif /* HAVE_YASM */
 
 void ff_put_vc1_chroma_mc8_nornd_mmx  (uint8_t *dst, uint8_t *src,
@@ -76,12 +84,12 @@
 
 av_cold void ff_vc1dsp_init_x86(VC1DSPContext *dsp)
 {
-    int mm_flags = av_get_cpu_flags();
+    int cpu_flags = av_get_cpu_flags();
 
-    if (INLINE_MMX(mm_flags))
+    if (INLINE_MMX(cpu_flags))
         ff_vc1dsp_init_mmx(dsp);
 
-    if (INLINE_MMXEXT(mm_flags))
+    if (INLINE_MMXEXT(cpu_flags))
         ff_vc1dsp_init_mmxext(dsp);
 
 #define ASSIGN_LF(EXT) \
@@ -93,29 +101,30 @@
         dsp->vc1_h_loop_filter16 = vc1_h_loop_filter16_ ## EXT
 
 #if HAVE_YASM
-    if (mm_flags & AV_CPU_FLAG_MMX) {
+    if (EXTERNAL_MMX(cpu_flags)) {
         dsp->put_no_rnd_vc1_chroma_pixels_tab[0] = ff_put_vc1_chroma_mc8_nornd_mmx;
     }
-
-    if (mm_flags & AV_CPU_FLAG_MMXEXT) {
-        ASSIGN_LF(mmxext);
-        dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = ff_avg_vc1_chroma_mc8_nornd_mmxext;
-    } else if (mm_flags & AV_CPU_FLAG_3DNOW) {
+    if (EXTERNAL_AMD3DNOW(cpu_flags)) {
         dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = ff_avg_vc1_chroma_mc8_nornd_3dnow;
     }
+    if (EXTERNAL_MMXEXT(cpu_flags)) {
+        ASSIGN_LF(mmxext);
+        dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = ff_avg_vc1_chroma_mc8_nornd_mmxext;
 
-    if (mm_flags & AV_CPU_FLAG_SSE2) {
+        dsp->avg_vc1_mspel_pixels_tab[0]         = avg_vc1_mspel_mc00_mmxext;
+    }
+    if (EXTERNAL_SSE2(cpu_flags)) {
         dsp->vc1_v_loop_filter8  = ff_vc1_v_loop_filter8_sse2;
         dsp->vc1_h_loop_filter8  = ff_vc1_h_loop_filter8_sse2;
         dsp->vc1_v_loop_filter16 = vc1_v_loop_filter16_sse2;
         dsp->vc1_h_loop_filter16 = vc1_h_loop_filter16_sse2;
     }
-    if (mm_flags & AV_CPU_FLAG_SSSE3) {
+    if (EXTERNAL_SSSE3(cpu_flags)) {
         ASSIGN_LF(ssse3);
         dsp->put_no_rnd_vc1_chroma_pixels_tab[0] = ff_put_vc1_chroma_mc8_nornd_ssse3;
         dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = ff_avg_vc1_chroma_mc8_nornd_ssse3;
     }
-    if (mm_flags & AV_CPU_FLAG_SSE4) {
+    if (EXTERNAL_SSE4(cpu_flags)) {
         dsp->vc1_h_loop_filter8  = ff_vc1_h_loop_filter8_sse4;
         dsp->vc1_h_loop_filter16 = vc1_h_loop_filter16_sse4;
     }

libav-v9.6.tar.bz2/libavcodec/x86/vc1dsp_mmx.c -> libav-v10.1.tar.bz2/libavcodec/x86/vc1dsp_mmx.c Changed

@@ -29,9 +29,9 @@
 #include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
-#include "libavcodec/dsputil.h"
-#include "dsputil_mmx.h"
 #include "libavcodec/vc1dsp.h"
+#include "constants.h"
+#include "dsputil_x86.h"
 #include "vc1dsp.h"
 
 #if HAVE_INLINE_ASM
@@ -464,12 +464,17 @@
 
 /** Macro to ease bicubic filter interpolation functions declarations */
 #define DECLARE_FUNCTION(a, b)                                          \
-static void put_vc1_mspel_mc ## a ## b ## _mmx(uint8_t *dst, const uint8_t *src, int stride, int rnd) { \
+static void put_vc1_mspel_mc ## a ## b ## _mmx(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 ## _mmxext(uint8_t *dst,         \
                                                   const uint8_t *src,   \
-                                                  int stride, int rnd)  \
+                                                  ptrdiff_t stride,     \
+                                                  int rnd)              \
 {                                                                       \
      avg_vc1_mspel_mc(dst, src, stride, a, b, rnd);                     \
 }
@@ -494,7 +499,7 @@
 DECLARE_FUNCTION(3, 3)
 
 static void vc1_inv_trans_4x4_dc_mmxext(uint8_t *dest, int linesize,
-                                        DCTELEM *block)
+                                        int16_t *block)
 {
     int dc = block[0];
     dc = (17 * dc +  4) >> 3;
@@ -533,7 +538,7 @@
 }
 
 static void vc1_inv_trans_4x8_dc_mmxext(uint8_t *dest, int linesize,
-                                        DCTELEM *block)
+                                        int16_t *block)
 {
     int dc = block[0];
     dc = (17 * dc +  4) >> 3;
@@ -595,7 +600,7 @@
 }
 
 static void vc1_inv_trans_8x4_dc_mmxext(uint8_t *dest, int linesize,
-                                        DCTELEM *block)
+                                        int16_t *block)
 {
     int dc = block[0];
     dc = ( 3 * dc +  1) >> 1;
@@ -634,7 +639,7 @@
 }
 
 static void vc1_inv_trans_8x8_dc_mmxext(uint8_t *dest, int linesize,
-                                        DCTELEM *block)
+                                        int16_t *block)
 {
     int dc = block[0];
     dc = (3 * dc +  1) >> 1;
@@ -695,54 +700,59 @@
     );
 }
 
+static void put_vc1_mspel_mc00_mmx(uint8_t *dst, const uint8_t *src,
+                                   ptrdiff_t stride, int rnd)
+{
+    ff_put_pixels8_mmx(dst, src, stride, 8);
+}
+
 av_cold void ff_vc1dsp_init_mmx(VC1DSPContext *dsp)
 {
-        dsp->put_vc1_mspel_pixels_tab[ 0] = ff_put_vc1_mspel_mc00_mmx;
-        dsp->put_vc1_mspel_pixels_tab[ 4] = put_vc1_mspel_mc01_mmx;
-        dsp->put_vc1_mspel_pixels_tab[ 8] = put_vc1_mspel_mc02_mmx;
-        dsp->put_vc1_mspel_pixels_tab[12] = put_vc1_mspel_mc03_mmx;
-
-        dsp->put_vc1_mspel_pixels_tab[ 1] = put_vc1_mspel_mc10_mmx;
-        dsp->put_vc1_mspel_pixels_tab[ 5] = put_vc1_mspel_mc11_mmx;
-        dsp->put_vc1_mspel_pixels_tab[ 9] = put_vc1_mspel_mc12_mmx;
-        dsp->put_vc1_mspel_pixels_tab[13] = put_vc1_mspel_mc13_mmx;
-
-        dsp->put_vc1_mspel_pixels_tab[ 2] = put_vc1_mspel_mc20_mmx;
-        dsp->put_vc1_mspel_pixels_tab[ 6] = put_vc1_mspel_mc21_mmx;
-        dsp->put_vc1_mspel_pixels_tab[10] = put_vc1_mspel_mc22_mmx;
-        dsp->put_vc1_mspel_pixels_tab[14] = put_vc1_mspel_mc23_mmx;
-
-        dsp->put_vc1_mspel_pixels_tab[ 3] = put_vc1_mspel_mc30_mmx;
-        dsp->put_vc1_mspel_pixels_tab[ 7] = put_vc1_mspel_mc31_mmx;
-        dsp->put_vc1_mspel_pixels_tab[11] = put_vc1_mspel_mc32_mmx;
-        dsp->put_vc1_mspel_pixels_tab[15] = put_vc1_mspel_mc33_mmx;
+    dsp->put_vc1_mspel_pixels_tab[ 0] = put_vc1_mspel_mc00_mmx;
+    dsp->put_vc1_mspel_pixels_tab[ 4] = put_vc1_mspel_mc01_mmx;
+    dsp->put_vc1_mspel_pixels_tab[ 8] = put_vc1_mspel_mc02_mmx;
+    dsp->put_vc1_mspel_pixels_tab[12] = put_vc1_mspel_mc03_mmx;
+
+    dsp->put_vc1_mspel_pixels_tab[ 1] = put_vc1_mspel_mc10_mmx;
+    dsp->put_vc1_mspel_pixels_tab[ 5] = put_vc1_mspel_mc11_mmx;
+    dsp->put_vc1_mspel_pixels_tab[ 9] = put_vc1_mspel_mc12_mmx;
+    dsp->put_vc1_mspel_pixels_tab[13] = put_vc1_mspel_mc13_mmx;
+
+    dsp->put_vc1_mspel_pixels_tab[ 2] = put_vc1_mspel_mc20_mmx;
+    dsp->put_vc1_mspel_pixels_tab[ 6] = put_vc1_mspel_mc21_mmx;
+    dsp->put_vc1_mspel_pixels_tab[10] = put_vc1_mspel_mc22_mmx;
+    dsp->put_vc1_mspel_pixels_tab[14] = put_vc1_mspel_mc23_mmx;
+
+    dsp->put_vc1_mspel_pixels_tab[ 3] = put_vc1_mspel_mc30_mmx;
+    dsp->put_vc1_mspel_pixels_tab[ 7] = put_vc1_mspel_mc31_mmx;
+    dsp->put_vc1_mspel_pixels_tab[11] = put_vc1_mspel_mc32_mmx;
+    dsp->put_vc1_mspel_pixels_tab[15] = put_vc1_mspel_mc33_mmx;
 }
 
 av_cold void ff_vc1dsp_init_mmxext(VC1DSPContext *dsp)
 {
-        dsp->avg_vc1_mspel_pixels_tab[ 0] = ff_avg_vc1_mspel_mc00_mmxext;
-        dsp->avg_vc1_mspel_pixels_tab[ 4] = avg_vc1_mspel_mc01_mmxext;
-        dsp->avg_vc1_mspel_pixels_tab[ 8] = avg_vc1_mspel_mc02_mmxext;
-        dsp->avg_vc1_mspel_pixels_tab[12] = avg_vc1_mspel_mc03_mmxext;
-
-        dsp->avg_vc1_mspel_pixels_tab[ 1] = avg_vc1_mspel_mc10_mmxext;
-        dsp->avg_vc1_mspel_pixels_tab[ 5] = avg_vc1_mspel_mc11_mmxext;
-        dsp->avg_vc1_mspel_pixels_tab[ 9] = avg_vc1_mspel_mc12_mmxext;
-        dsp->avg_vc1_mspel_pixels_tab[13] = avg_vc1_mspel_mc13_mmxext;
-
-        dsp->avg_vc1_mspel_pixels_tab[ 2] = avg_vc1_mspel_mc20_mmxext;
-        dsp->avg_vc1_mspel_pixels_tab[ 6] = avg_vc1_mspel_mc21_mmxext;
-        dsp->avg_vc1_mspel_pixels_tab[10] = avg_vc1_mspel_mc22_mmxext;
-        dsp->avg_vc1_mspel_pixels_tab[14] = avg_vc1_mspel_mc23_mmxext;
-
-        dsp->avg_vc1_mspel_pixels_tab[ 3] = avg_vc1_mspel_mc30_mmxext;
-        dsp->avg_vc1_mspel_pixels_tab[ 7] = avg_vc1_mspel_mc31_mmxext;
-        dsp->avg_vc1_mspel_pixels_tab[11] = avg_vc1_mspel_mc32_mmxext;
-        dsp->avg_vc1_mspel_pixels_tab[15] = avg_vc1_mspel_mc33_mmxext;
-
-        dsp->vc1_inv_trans_8x8_dc = vc1_inv_trans_8x8_dc_mmxext;
-        dsp->vc1_inv_trans_4x8_dc = vc1_inv_trans_4x8_dc_mmxext;
-        dsp->vc1_inv_trans_8x4_dc = vc1_inv_trans_8x4_dc_mmxext;
-        dsp->vc1_inv_trans_4x4_dc = vc1_inv_trans_4x4_dc_mmxext;
+    dsp->avg_vc1_mspel_pixels_tab[ 4] = avg_vc1_mspel_mc01_mmxext;
+    dsp->avg_vc1_mspel_pixels_tab[ 8] = avg_vc1_mspel_mc02_mmxext;
+    dsp->avg_vc1_mspel_pixels_tab[12] = avg_vc1_mspel_mc03_mmxext;
+
+    dsp->avg_vc1_mspel_pixels_tab[ 1] = avg_vc1_mspel_mc10_mmxext;
+    dsp->avg_vc1_mspel_pixels_tab[ 5] = avg_vc1_mspel_mc11_mmxext;
+    dsp->avg_vc1_mspel_pixels_tab[ 9] = avg_vc1_mspel_mc12_mmxext;
+    dsp->avg_vc1_mspel_pixels_tab[13] = avg_vc1_mspel_mc13_mmxext;
+
+    dsp->avg_vc1_mspel_pixels_tab[ 2] = avg_vc1_mspel_mc20_mmxext;
+    dsp->avg_vc1_mspel_pixels_tab[ 6] = avg_vc1_mspel_mc21_mmxext;
+    dsp->avg_vc1_mspel_pixels_tab[10] = avg_vc1_mspel_mc22_mmxext;
+    dsp->avg_vc1_mspel_pixels_tab[14] = avg_vc1_mspel_mc23_mmxext;
+
+    dsp->avg_vc1_mspel_pixels_tab[ 3] = avg_vc1_mspel_mc30_mmxext;
+    dsp->avg_vc1_mspel_pixels_tab[ 7] = avg_vc1_mspel_mc31_mmxext;
+    dsp->avg_vc1_mspel_pixels_tab[11] = avg_vc1_mspel_mc32_mmxext;
+    dsp->avg_vc1_mspel_pixels_tab[15] = avg_vc1_mspel_mc33_mmxext;
+
+    dsp->vc1_inv_trans_8x8_dc = vc1_inv_trans_8x8_dc_mmxext;
+    dsp->vc1_inv_trans_4x8_dc = vc1_inv_trans_4x8_dc_mmxext;
+    dsp->vc1_inv_trans_8x4_dc = vc1_inv_trans_8x4_dc_mmxext;
+    dsp->vc1_inv_trans_4x4_dc = vc1_inv_trans_4x4_dc_mmxext;
 }
 #endif /* HAVE_INLINE_ASM */

libav-v9.6.tar.bz2/libavcodec/x86/videodsp.asm -> libav-v10.1.tar.bz2/libavcodec/x86/videodsp.asm Changed

@@ -23,576 +23,408 @@
 
 SECTION .text
 
-; extern void ff_emu_edge_core(uint8_t *buf, const uint8_t *src, x86_reg linesize,
-; x86_reg start_y, x86_reg end_y, x86_reg block_h,
-; x86_reg start_x, x86_reg end_x, x86_reg block_w);
-;
-; The actual function itself is below. It basically wraps a very simple
-; w = end_x - start_x
-; if (w) {
-; if (w > 22) {
-; jump to the slow loop functions
-; } else {
-; jump to the fast loop functions
-; }
-; }
-;
-; ... and then the same for left/right extend also. See below for loop
-; function implementations. Fast are fixed-width, slow is variable-width
-
-%macro EMU_EDGE_FUNC 0
-%if ARCH_X86_64
-%define w_reg r7
-cglobal emu_edge_core, 6, 9, 1
- mov r8, r5 ; save block_h
-%else
-%define w_reg r6
-cglobal emu_edge_core, 2, 7, 0
- mov r4, r4m ; end_y
- mov r5, r5m ; block_h
-%endif
+; slow vertical extension loop function. Works with variable-width, and
+; does per-line reading/writing of source data
+
+%macro V_COPY_ROW 2 ; type (top/body/bottom), h
+.%1_y_loop: ; do {
+ mov wq, r7mp ; initialize w (r7mp = wmp)
+.%1_x_loop: ; do {
+ movu m0, [srcq+wq] ; m0 = read($mmsize)
+ movu [dstq+wq], m0 ; write(m0, $mmsize)
+ add wq, mmsize ; w -= $mmsize
+ cmp wq, -mmsize ; } while (w > $mmsize);
+ jl .%1_x_loop
+ movu m0, [srcq-mmsize] ; m0 = read($mmsize)
+ movu [dstq-mmsize], m0 ; write(m0, $mmsize)
+%ifidn %1, body ; if ($type == body) {
+ add srcq, src_strideq ; src += src_stride
+%endif ; }
+ add dstq, dst_strideq ; dst += dst_stride
+ dec %2 ; } while (--$h);
+ jnz .%1_y_loop
+%endmacro
 
- ; start with vertical extend (top/bottom) and body pixel copy
- mov w_reg, r7m
- sub w_reg, r6m ; w = start_x - end_x
- sub r5, r4
+%macro vvar_fn 0
+; .----. <- zero
+; | | <- top is copied from first line in body of source
+; |----| <- start_y
+; | | <- body is copied verbatim (line-by-line) from source
+; |----| <- end_y
+; | | <- bottom is copied from last line in body of source
+; '----' <- bh
 %if ARCH_X86_64
- sub r4, r3
-%else
- sub r4, dword r3m
+cglobal emu_edge_vvar, 7, 8, 1, dst, src, dst_stride, src_stride, \
+ start_y, end_y, bh, w
+%else ; x86-32
+cglobal emu_edge_vvar, 1, 6, 1, dst, src, start_y, end_y, bh, w
+%define src_strideq r3mp
+%define dst_strideq r2mp
+ mov srcq, r1mp
+ mov start_yq, r4mp
+ mov end_yq, r5mp
+ mov bhq, r6mp
 %endif
- cmp w_reg, 22
- jg .slow_v_extend_loop
+ sub bhq, end_yq ; bh -= end_q
+ sub end_yq, start_yq ; end_q -= start_q
+ add srcq, r7mp ; (r7mp = wmp)
+ add dstq, r7mp ; (r7mp = wmp)
+ neg r7mp ; (r7mp = wmp)
+ test start_yq, start_yq ; if (start_q) {
+ jz .body
+ V_COPY_ROW top, start_yq ; v_copy_row(top, start_yq)
+.body: ; }
+ V_COPY_ROW body, end_yq ; v_copy_row(body, end_yq)
+ test bhq, bhq ; if (bh) {
+ jz .end
+ sub srcq, src_strideq ; src -= src_stride
+ V_COPY_ROW bottom, bhq ; v_copy_row(bottom, bh)
+.end: ; }
+ RET
+%endmacro
+
 %if ARCH_X86_32
- mov r2, r2m ; linesize
-%endif
- sal w_reg, 7 ; w * 128
-%ifdef PIC
- lea rax, [.emuedge_v_extend_1 - (.emuedge_v_extend_2 - .emuedge_v_extend_1)]
- add w_reg, rax
-%else
- lea w_reg, [.emuedge_v_extend_1 - (.emuedge_v_extend_2 - .emuedge_v_extend_1)+w_reg]
+INIT_MMX mmx
+vvar_fn
 %endif
- call w_reg ; fast top extend, body copy and bottom extend
-.v_extend_end:
 
- ; horizontal extend (left/right)
- mov w_reg, r6m ; start_x
- sub r0, w_reg
-%if ARCH_X86_64
- mov r3, r0 ; backup of buf+block_h*linesize
- mov r5, r8
-%else
- mov r0m, r0 ; backup of buf+block_h*linesize
- mov r5, r5m
-%endif
- test w_reg, w_reg
- jz .right_extend
- cmp w_reg, 22
- jg .slow_left_extend_loop
- mov r1, w_reg
- dec w_reg
- ; FIXME we can do a if size == 1 here if that makes any speed difference, test me
- sar w_reg, 1
- sal w_reg, 6
- ; r0=buf+block_h*linesize,r7(64)/r6(32)=start_x offset for funcs
- ; r6(rax)/r3(ebx)=val,r2=linesize,r1=start_x,r5=block_h
-%ifdef PIC
- lea rax, [.emuedge_extend_left_2]
- add w_reg, rax
-%else
- lea w_reg, [.emuedge_extend_left_2+w_reg]
-%endif
- call w_reg
+INIT_XMM sse
+vvar_fn
+
+%macro hvar_fn 0
+cglobal emu_edge_hvar, 5, 6, 1, dst, dst_stride, start_x, n_words, h, w
+ lea dstq, [dstq+n_wordsq*2]
+ neg n_wordsq
+ lea start_xq, [start_xq+n_wordsq*2]
+.y_loop: ; do {
+ ; FIXME also write a ssse3 version using pshufb
+ movzx wd, byte [dstq+start_xq] ; w = read(1)
+ imul wd, 0x01010101 ; w *= 0x01010101
+ movd m0, wd
+ mov wq, n_wordsq ; initialize w
+%if cpuflag(sse2)
+ pshufd m0, m0, q0000 ; splat
+%else ; mmx
+ punpckldq m0, m0 ; splat
+%endif ; mmx/sse
+.x_loop: ; do {
+ movu [dstq+wq*2], m0 ; write($reg, $mmsize)
+ add wq, mmsize/2 ; w -= $mmsize/2
+ cmp wq, -mmsize/2 ; } while (w > $mmsize/2)
+ jl .x_loop
+ movu [dstq-mmsize], m0 ; write($reg, $mmsize)
+ add dstq, dst_strideq ; dst += dst_stride
+ dec hq ; } while (h--)
+ jnz .y_loop
+ RET
+%endmacro
 
- ; now r3(64)/r0(32)=buf,r2=linesize,r8/r5=block_h,r6/r3=val, r7/r6=end_x, r1=block_w
-.right_extend:
 %if ARCH_X86_32
- mov r0, r0m
- mov r5, r5m
-%endif
- mov w_reg, r7m ; end_x
- mov r1, r8m ; block_w
- mov r4, r1
- sub r1, w_reg
- jz .h_extend_end ; if (end_x == block_w) goto h_extend_end
- cmp r1, 22
- jg .slow_right_extend_loop
- dec r1
- ; FIXME we can do a if size == 1 here if that makes any speed difference, test me
- sar r1, 1
- sal r1, 6
-%ifdef PIC
- lea rax, [.emuedge_extend_right_2]
- add r1, rax
-%else
- lea r1, [.emuedge_extend_right_2+r1]
+INIT_MMX mmx
+hvar_fn
 %endif
- call r1
-.h_extend_end:
- RET
 
-%if ARCH_X86_64
-%define vall al
-%define valh ah
-%define valw ax
-%define valw2 r7w
-%define valw3 r3w
-%if WIN64
-%define valw4 r7w
-%else ; unix64
-%define valw4 r3w
-%endif
-%define vald eax
-%else
-%define vall bl
-%define valh bh
-%define valw bx
-%define valw2 r6w
-%define valw3 valw2
-%define valw4 valw3
-%define vald ebx
-%define stack_offset 0x14
-%endif
-
-%endmacro
+INIT_XMM sse2
+hvar_fn
 
 ; macro to read/write a horizontal number of pixels (%2) to/from registers
-; on x86-64, - fills xmm0-15 for consecutive sets of 16 pixels
-; - if (%2 & 15 == 8) fills the last 8 bytes into rax
-; - else if (%2 & 8) fills 8 bytes into mm0
-; - if (%2 & 7 == 4) fills the last 4 bytes into rax
-; - else if (%2 & 4) fills 4 bytes into mm0-1
-; - if (%2 & 3 == 3) fills 2 bytes into r7/r3, and 1 into eax
-; (note that we're using r3 for body/bottom because it's a shorter
-; opcode, and then the loop fits in 128 bytes)
-; - else fills remaining bytes into rax
-; on x86-32, - fills mm0-7 for consecutive sets of 8 pixels
-; - if (%2 & 7 == 4) fills 4 bytes into ebx
-; - else if (%2 & 4) fills 4 bytes into mm0-7
-; - if (%2 & 3 == 3) fills 2 bytes into r6, and 1 into ebx
-; - else fills remaining bytes into ebx
+; on sse, - fills xmm0-15 for consecutive sets of 16 pixels
+; - if (%2 & 8) fills 8 bytes into xmm$next
+; - if (%2 & 4) fills 4 bytes into xmm$next
+; - if (%2 & 3) fills 1, 2 or 4 bytes in eax
+; on mmx, - fills mm0-7 for consecutive sets of 8 pixels
+; - if (%2 & 4) fills 4 bytes into mm$next
+; - if (%2 & 3) fills 1, 2 or 4 bytes in eax
 ; writing data out is in the same way
 %macro READ_NUM_BYTES 2
-%assign %%src_off 0 ; offset in source buffer
-%assign %%smidx 0 ; mmx register idx
-%assign %%sxidx 0 ; xmm register idx
-
-%if cpuflag(sse)
-%rep %2/16
- movups xmm %+ %%sxidx, [r1+%%src_off]
-%assign %%src_off %%src_off+16
-%assign %%sxidx %%sxidx+1
-%endrep ; %2/16
+%assign %%off 0 ; offset in source buffer
+%assign %%mmx_idx 0 ; mmx register index
+%assign %%xmm_idx 0 ; xmm register index
+
+%rep %2/mmsize
+%if mmsize == 16
+ movu xmm %+ %%xmm_idx, [srcq+%%off]
+%assign %%xmm_idx %%xmm_idx+1
+%else ; mmx
+ movu mm %+ %%mmx_idx, [srcq+%%off]
+%assign %%mmx_idx %%mmx_idx+1
+%endif
+%assign %%off %%off+mmsize
+%endrep ; %2/mmsize
+
+%if mmsize == 16
+%if (%2-%%off) >= 8
+%if %2 > 16 && (%2-%%off) > 8
+ movu xmm %+ %%xmm_idx, [srcq+%2-16]
+%assign %%xmm_idx %%xmm_idx+1
+%assign %%off %2
+%else
+ movq mm %+ %%mmx_idx, [srcq+%%off]
+%assign %%mmx_idx %%mmx_idx+1
+%assign %%off %%off+8
+%endif
+%endif ; (%2-%%off) >= 8
 %endif
 
-%if ARCH_X86_64
-%if (%2-%%src_off) == 8
- mov rax, [r1+%%src_off]
-%assign %%src_off %%src_off+8
-%endif ; (%2-%%src_off) == 8
-%endif ; x86-64
-
-%rep (%2-%%src_off)/8
- movq mm %+ %%smidx, [r1+%%src_off]
-%assign %%src_off %%src_off+8
-%assign %%smidx %%smidx+1
-%endrep ; (%2-%%dst_off)/8
-
-%if (%2-%%src_off) == 4
- mov vald, [r1+%%src_off]
-%elif (%2-%%src_off) & 4
- movd mm %+ %%smidx, [r1+%%src_off]
-%assign %%src_off %%src_off+4
-%endif ; (%2-%%src_off) ==/& 4
-
-%if (%2-%%src_off) == 1
- mov vall, [r1+%%src_off]
-%elif (%2-%%src_off) == 2
- mov valw, [r1+%%src_off]
-%elif (%2-%%src_off) == 3
-%ifidn %1, top
- mov valw2, [r1+%%src_off]
+%if (%2-%%off) >= 4
+%if %2 > 8 && (%2-%%off) > 4
+ movq mm %+ %%mmx_idx, [srcq+%2-8]
+%assign %%off %2
+%else
+ movd mm %+ %%mmx_idx, [srcq+%%off]
+%assign %%off %%off+4
+%endif
+%assign %%mmx_idx %%mmx_idx+1
+%endif ; (%2-%%off) >= 4
+
+%if (%2-%%off) >= 1
+%if %2 >= 4
+ movd mm %+ %%mmx_idx, [srcq+%2-4]
+%elif (%2-%%off) == 1
+ mov valb, [srcq+%2-1]
+%elif (%2-%%off) == 2
+ mov valw, [srcq+%2-2]
 %elifidn %1, body
- mov valw3, [r1+%%src_off]
-%elifidn %1, bottom
- mov valw4, [r1+%%src_off]
-%endif ; %1 ==/!= top
- mov vall, [r1+%%src_off+2]
-%endif ; (%2-%%src_off) == 1/2/3
+ mov vald, [srcq+%2-3]
+%else
+ movd mm %+ %%mmx_idx, [srcq+%2-3]
+%endif
+%endif ; (%2-%%off) >= 1
 %endmacro ; READ_NUM_BYTES
 
 %macro WRITE_NUM_BYTES 2
-%assign %%dst_off 0 ; offset in destination buffer
-%assign %%dmidx 0 ; mmx register idx
-%assign %%dxidx 0 ; xmm register idx
-
-%if cpuflag(sse)
-%rep %2/16
- movups [r0+%%dst_off], xmm %+ %%dxidx
-%assign %%dst_off %%dst_off+16
-%assign %%dxidx %%dxidx+1
-%endrep ; %2/16
+%assign %%off 0 ; offset in destination buffer
+%assign %%mmx_idx 0 ; mmx register index
+%assign %%xmm_idx 0 ; xmm register index
+
+%rep %2/mmsize
+%if mmsize == 16
+ movu [dstq+%%off], xmm %+ %%xmm_idx
+%assign %%xmm_idx %%xmm_idx+1
+%else ; mmx
+ movu [dstq+%%off], mm %+ %%mmx_idx
+%assign %%mmx_idx %%mmx_idx+1
+%endif
+%assign %%off %%off+mmsize
+%endrep ; %2/mmsize
+
+%if mmsize == 16
+%if (%2-%%off) >= 8
+%if %2 > 16 && (%2-%%off) > 8
+ movu [dstq+%2-16], xmm %+ %%xmm_idx
+%assign %%xmm_idx %%xmm_idx+1
+%assign %%off %2
+%else
+ movq [dstq+%%off], mm %+ %%mmx_idx
+%assign %%mmx_idx %%mmx_idx+1
+%assign %%off %%off+8
+%endif
+%endif ; (%2-%%off) >= 8
 %endif
 
-%if ARCH_X86_64
-%if (%2-%%dst_off) == 8
- mov [r0+%%dst_off], rax
-%assign %%dst_off %%dst_off+8
-%endif ; (%2-%%dst_off) == 8
-%endif ; x86-64
-
-%rep (%2-%%dst_off)/8
- movq [r0+%%dst_off], mm %+ %%dmidx
-%assign %%dst_off %%dst_off+8
-%assign %%dmidx %%dmidx+1
-%endrep ; (%2-%%dst_off)/8
-
-%if (%2-%%dst_off) == 4
- mov [r0+%%dst_off], vald
-%elif (%2-%%dst_off) & 4
- movd [r0+%%dst_off], mm %+ %%dmidx
-%assign %%dst_off %%dst_off+4
-%endif ; (%2-%%dst_off) ==/& 4
-
-%if (%2-%%dst_off) == 1
- mov [r0+%%dst_off], vall
-%elif (%2-%%dst_off) == 2
- mov [r0+%%dst_off], valw
-%elif (%2-%%dst_off) == 3
-%ifidn %1, top
- mov [r0+%%dst_off], valw2
+%if (%2-%%off) >= 4
+%if %2 > 8 && (%2-%%off) > 4
+ movq [dstq+%2-8], mm %+ %%mmx_idx
+%assign %%off %2
+%else
+ movd [dstq+%%off], mm %+ %%mmx_idx
+%assign %%off %%off+4
+%endif
+%assign %%mmx_idx %%mmx_idx+1
+%endif ; (%2-%%off) >= 4
+
+%if (%2-%%off) >= 1
+%if %2 >= 4
+ movd [dstq+%2-4], mm %+ %%mmx_idx
+%elif (%2-%%off) == 1
+ mov [dstq+%2-1], valb
+%elif (%2-%%off) == 2
+ mov [dstq+%2-2], valw
 %elifidn %1, body
- mov [r0+%%dst_off], valw3
-%elifidn %1, bottom
- mov [r0+%%dst_off], valw4
-%endif ; %1 ==/!= top
- mov [r0+%%dst_off+2], vall
-%endif ; (%2-%%dst_off) == 1/2/3
+ mov [dstq+%2-3], valw
+ shr vald, 16
+ mov [dstq+%2-1], valb
+%else
+ movd vald, mm %+ %%mmx_idx
+ mov [dstq+%2-3], valw
+ shr vald, 16
+ mov [dstq+%2-1], valb
+%endif
+%endif ; (%2-%%off) >= 1
 %endmacro ; WRITE_NUM_BYTES
 
 ; vertical top/bottom extend and body copy fast loops
 ; these are function pointers to set-width line copy functions, i.e.
 ; they read a fixed number of pixels into set registers, and write
 ; those out into the destination buffer
-; r0=buf,r1=src,r2=linesize,r3(64)/r3m(32)=start_x,r4=end_y,r5=block_h
-; r6(eax/64)/r3(ebx/32)=val_reg
-%macro VERTICAL_EXTEND 0
-%assign %%n 1
-%rep 22
-ALIGN 128
-.emuedge_v_extend_ %+ %%n:
- ; extend pixels above body
+%macro VERTICAL_EXTEND 2
+%assign %%n %1
+%rep 1+%2-%1
+%if %%n <= 3
 %if ARCH_X86_64
- test r3 , r3 ; if (!start_y)
- jz .emuedge_copy_body_ %+ %%n %+ _loop ; goto body
-%else ; ARCH_X86_32
- cmp dword r3m, 0
- je .emuedge_copy_body_ %+ %%n %+ _loop
-%endif ; ARCH_X86_64/32
- READ_NUM_BYTES top, %%n ; read bytes
-.emuedge_extend_top_ %+ %%n %+ _loop: ; do {
- WRITE_NUM_BYTES top, %%n ; write bytes
- add r0 , r2 ; dst += linesize
+cglobal emu_edge_vfix %+ %%n, 6, 8, 0, dst, src, dst_stride, src_stride, \
+ start_y, end_y, val, bh
+ mov bhq, r6mp ; r6mp = bhmp
+%else ; x86-32
+cglobal emu_edge_vfix %+ %%n, 0, 6, 0, val, dst, src, start_y, end_y, bh
+ mov dstq, r0mp
+ mov srcq, r1mp
+ mov start_yq, r4mp
+ mov end_yq, r5mp
+ mov bhq, r6mp
+%define dst_strideq r2mp
+%define src_strideq r3mp
+%endif ; x86-64/32
+%else
 %if ARCH_X86_64
- dec r3d
-%else ; ARCH_X86_32
- dec dword r3m
-%endif ; ARCH_X86_64/32
- jnz .emuedge_extend_top_ %+ %%n %+ _loop ; } while (--start_y)
+cglobal emu_edge_vfix %+ %%n, 7, 7, 1, dst, src, dst_stride, src_stride, \
+ start_y, end_y, bh
+%else ; x86-32
+cglobal emu_edge_vfix %+ %%n, 1, 5, 1, dst, src, start_y, end_y, bh
+ mov srcq, r1mp
+ mov start_yq, r4mp
+ mov end_yq, r5mp
+ mov bhq, r6mp
+%define dst_strideq r2mp
+%define src_strideq r3mp
+%endif ; x86-64/32
+%endif
+ ; FIXME move this to c wrapper?
+ sub bhq, end_yq ; bh -= end_y
+ sub end_yq, start_yq ; end_y -= start_y
+
+ ; extend pixels above body
+ test start_yq, start_yq ; if (start_y) {
+ jz .body_loop
+ READ_NUM_BYTES top, %%n ; $variable_regs = read($n)
+.top_loop: ; do {
+ WRITE_NUM_BYTES top, %%n ; write($variable_regs, $n)
+ add dstq, dst_strideq ; dst += linesize
+ dec start_yq ; } while (--start_y)
+ jnz .top_loop ; }
 
 ; copy body pixels
-.emuedge_copy_body_ %+ %%n %+ _loop: ; do {
- READ_NUM_BYTES body, %%n ; read bytes
- WRITE_NUM_BYTES body, %%n ; write bytes
- add r0 , r2 ; dst += linesize
- add r1 , r2 ; src += linesize
- dec r4d
- jnz .emuedge_copy_body_ %+ %%n %+ _loop ; } while (--end_y)
+.body_loop: ; do {
+ READ_NUM_BYTES body, %%n ; $variable_regs = read($n)
+ WRITE_NUM_BYTES body, %%n ; write($variable_regs, $n)
+ add dstq, dst_strideq ; dst += dst_stride
+ add srcq, src_strideq ; src += src_stride
+ dec end_yq ; } while (--end_y)
+ jnz .body_loop
 
 ; copy bottom pixels
- test r5 , r5 ; if (!block_h)
- jz .emuedge_v_extend_end_ %+ %%n ; goto end
- sub r1 , r2 ; src -= linesize
- READ_NUM_BYTES bottom, %%n ; read bytes
-.emuedge_extend_bottom_ %+ %%n %+ _loop: ; do {
- WRITE_NUM_BYTES bottom, %%n ; write bytes
- add r0 , r2 ; dst += linesize
- dec r5d
- jnz .emuedge_extend_bottom_ %+ %%n %+ _loop ; } while (--block_h)
-
-.emuedge_v_extend_end_ %+ %%n:
-%if ARCH_X86_64
- ret
-%else ; ARCH_X86_32
- rep ret
-%endif ; ARCH_X86_64/32
+ test bhq, bhq ; if (block_h) {
+ jz .end
+ sub srcq, src_strideq ; src -= linesize
+ READ_NUM_BYTES bottom, %%n ; $variable_regs = read($n)
+.bottom_loop: ; do {
+ WRITE_NUM_BYTES bottom, %%n ; write($variable_regs, $n)
+ add dstq, dst_strideq ; dst += linesize
+ dec bhq ; } while (--bh)
+ jnz .bottom_loop ; }
+
+.end:
+ RET
 %assign %%n %%n+1
-%endrep
-%endmacro VERTICAL_EXTEND
+%endrep ; 1+%2-%1
+%endmacro ; VERTICAL_EXTEND
+
+INIT_MMX mmx
+VERTICAL_EXTEND 1, 15
+%if ARCH_X86_32
+VERTICAL_EXTEND 16, 22
+%endif
+
+INIT_XMM sse
+VERTICAL_EXTEND 16, 22
 
 ; left/right (horizontal) fast extend functions
 ; these are essentially identical to the vertical extend ones above,
 ; just left/right separated because number of pixels to extend is
 ; obviously not the same on both sides.
-; for reading, pixels are placed in eax (x86-64) or ebx (x86-64) in the
-; lowest two bytes of the register (so val*0x0101), and are splatted
-; into each byte of mm0 as well if n_pixels >= 8
 
 %macro READ_V_PIXEL 2
- mov vall, %2
- mov valh, vall
-%if %1 >= 8
- movd mm0, vald
-%if cpuflag(mmxext)
- pshufw mm0, mm0, 0
-%else ; mmx
- punpcklwd mm0, mm0
- punpckldq mm0, mm0
-%endif ; sse
-%endif ; %1 >= 8
-%endmacro
-
-%macro WRITE_V_PIXEL 2
-%assign %%dst_off 0
-%rep %1/8
- movq [%2+%%dst_off], mm0
-%assign %%dst_off %%dst_off+8
-%endrep
-%if %1 & 4
+%if %1 == 2
+ movzx valw, byte %2
+ imul valw, 0x0101
+%else
+ movzx vald, byte %2
+ imul vald, 0x01010101
 %if %1 >= 8
- movd [%2+%%dst_off], mm0
-%else ; %1 < 8
- mov [%2+%%dst_off] , valw
- mov [%2+%%dst_off+2], valw
-%endif ; %1 >=/< 8
-%assign %%dst_off %%dst_off+4
-%endif ; %1 & 4
-%if %1&2
- mov [%2+%%dst_off], valw
-%endif ; %1 & 2
-%endmacro
-
-; r0=buf+block_h*linesize, r1=start_x, r2=linesize, r5=block_h, r6/r3=val
-%macro LEFT_EXTEND 0
-%assign %%n 2
-%rep 11
-ALIGN 64
-.emuedge_extend_left_ %+ %%n: ; do {
- sub r0, r2 ; dst -= linesize
- READ_V_PIXEL %%n, [r0+r1] ; read pixels
- WRITE_V_PIXEL %%n, r0 ; write pixels
- dec r5
- jnz .emuedge_extend_left_ %+ %%n ; } while (--block_h)
-%if ARCH_X86_64
- ret
-%else ; ARCH_X86_32
- rep ret
-%endif ; ARCH_X86_64/32
-%assign %%n %%n+2
-%endrep
-%endmacro ; LEFT_EXTEND
-
-; r3/r0=buf+block_h*linesize, r2=linesize, r8/r5=block_h, r0/r6=end_x, r6/r3=val
-%macro RIGHT_EXTEND 0
-%assign %%n 2
-%rep 11
-ALIGN 64
-.emuedge_extend_right_ %+ %%n: ; do {
-%if ARCH_X86_64
- sub r3, r2 ; dst -= linesize
- READ_V_PIXEL %%n, [r3+w_reg-1] ; read pixels
- WRITE_V_PIXEL %%n, r3+r4-%%n ; write pixels
- dec r8
-%else ; ARCH_X86_32
- sub r0, r2 ; dst -= linesize
- READ_V_PIXEL %%n, [r0+w_reg-1] ; read pixels
- WRITE_V_PIXEL %%n, r0+r4-%%n ; write pixels
- dec r5
-%endif ; ARCH_X86_64/32
- jnz .emuedge_extend_right_ %+ %%n ; } while (--block_h)
-%if ARCH_X86_64
- ret
-%else ; ARCH_X86_32
- rep ret
-%endif ; ARCH_X86_64/32
-%assign %%n %%n+2
-%endrep
-
-%if ARCH_X86_32
-%define stack_offset 0x10
-%endif
-%endmacro ; RIGHT_EXTEND
-
-; below follow the "slow" copy/extend functions, these act on a non-fixed
-; width specified in a register, and run a loop to copy the full amount
-; of bytes. They are optimized for copying of large amounts of pixels per
-; line, so they unconditionally splat data into mm registers to copy 8
-; bytes per loop iteration. It could be considered to use xmm for x86-64
-; also, but I haven't optimized this as much (i.e. FIXME)
-%macro V_COPY_NPX 4-5
-%if %0 == 4
- test w_reg, %4
- jz .%1_skip_%4_px
-%else ; %0 == 5
-.%1_%4_px_loop:
+ movd m0, vald
+%if mmsize == 16
+ pshufd m0, m0, q0000
+%else
+ punpckldq m0, m0
 %endif
- %3 %2, [r1+cnt_reg]
- %3 [r0+cnt_reg], %2
- add cnt_reg, %4
-%if %0 == 5
- sub w_reg, %4
- test w_reg, %5
- jnz .%1_%4_px_loop
+%endif ; %1 >= 8
 %endif
-.%1_skip_%4_px:
-%endmacro
+%endmacro ; READ_V_PIXEL
 
-%macro V_COPY_ROW 2
-%ifidn %1, bottom
- sub r1, linesize
+%macro WRITE_V_PIXEL 2
+%assign %%off 0
+%rep %1/mmsize
+ movu [%2+%%off], m0
+%assign %%off %%off+mmsize
+%endrep ; %1/mmsize
+
+%if mmsize == 16
+%if %1-%%off >= 8
+%if %1 > 16 && %1-%%off > 8
+ movu [%2+%1-16], m0
+%assign %%off %1
+%else
+ movq [%2+%%off], m0
+%assign %%off %%off+8
 %endif
-.%1_copy_loop:
- xor cnt_reg, cnt_reg
-%if notcpuflag(sse)
-%define linesize r2m
- V_COPY_NPX %1, mm0, movq, 8, 0xFFFFFFF8
-%else ; sse
- V_COPY_NPX %1, xmm0, movups, 16, 0xFFFFFFF0
-%if ARCH_X86_64
-%define linesize r2
- V_COPY_NPX %1, rax , mov, 8
-%else ; ARCH_X86_32
-%define linesize r2m
- V_COPY_NPX %1, mm0, movq, 8
-%endif ; ARCH_X86_64/32
-%endif ; sse
- V_COPY_NPX %1, vald, mov, 4
- V_COPY_NPX %1, valw, mov, 2
- V_COPY_NPX %1, vall, mov, 1
- mov w_reg, cnt_reg
-%ifidn %1, body
- add r1, linesize
+%endif ; %1-%%off >= 8
 %endif
- add r0, linesize
- dec %2
- jnz .%1_copy_loop
-%endmacro
 
-%macro SLOW_V_EXTEND 0
-.slow_v_extend_loop:
-; r0=buf,r1=src,r2(64)/r2m(32)=linesize,r3(64)/r3m(32)=start_x,r4=end_y,r5=block_h
-; r8(64)/r3(later-64)/r2(32)=cnt_reg,r6(64)/r3(32)=val_reg,r7(64)/r6(32)=w=end_x-start_x
-%if ARCH_X86_64
- push r8 ; save old value of block_h
- test r3, r3
-%define cnt_reg r8
- jz .do_body_copy ; if (!start_y) goto do_body_copy
- V_COPY_ROW top, r3
+%if %1-%%off >= 4
+%if %1 > 8 && %1-%%off > 4
+ movq [%2+%1-8], m0
+%assign %%off %1
+%elif %1 >= 8 && %1-%%off >= 4
+ movd [%2+%%off], m0
+%assign %%off %%off+4
 %else
- cmp dword r3m, 0
-%define cnt_reg r2
- je .do_body_copy ; if (!start_y) goto do_body_copy
- V_COPY_ROW top, dword r3m
+ mov [%2+%%off], vald
+%assign %%off %%off+4
 %endif
+%endif ; %1-%%off >= 4
 
-.do_body_copy:
- V_COPY_ROW body, r4
-
-%if ARCH_X86_64
- pop r8 ; restore old value of block_h
-%define cnt_reg r3
-%endif
- test r5, r5
-%if ARCH_X86_64
- jz .v_extend_end
+%if %1-%%off >= 2
+%if %1 >= 8
+ movd [%2+%1-4], m0
 %else
- jz .skip_bottom_extend
+ mov [%2+%%off], valw
 %endif
- V_COPY_ROW bottom, r5
-%if ARCH_X86_32
-.skip_bottom_extend:
- mov r2, r2m
-%endif
- jmp .v_extend_end
-%endmacro
+%endif ; (%1-%%off)/2
+%endmacro ; WRITE_V_PIXEL
+
+%macro H_EXTEND 2
+%assign %%n %1
+%rep 1+(%2-%1)/2
+cglobal emu_edge_hfix %+ %%n, 4, 5, 1, dst, dst_stride, start_x, bh, val
+.loop_y: ; do {
+ READ_V_PIXEL %%n, [dstq+start_xq] ; $variable_regs = read($n)
+ WRITE_V_PIXEL %%n, dstq ; write($variable_regs, $n)
+ add dstq, dst_strideq ; dst += dst_stride
+ dec bhq ; } while (--bh)
+ jnz .loop_y
+ RET
+%assign %%n %%n+2
+%endrep ; 1+(%2-%1)/2
+%endmacro ; H_EXTEND
 
-%macro SLOW_LEFT_EXTEND 0
-.slow_left_extend_loop:
-; r0=buf+block_h*linesize,r2=linesize,r6(64)/r3(32)=val,r5=block_h,r4=cntr,r7/r6=start_x
- mov r4, 8
- sub r0, linesize
- READ_V_PIXEL 8, [r0+w_reg]
-.left_extend_8px_loop:
- movq [r0+r4-8], mm0
- add r4, 8
- cmp r4, w_reg
- jle .left_extend_8px_loop
- sub r4, 8
- cmp r4, w_reg
- jge .left_extend_loop_end
-.left_extend_2px_loop:
- mov [r0+r4], valw
- add r4, 2
- cmp r4, w_reg
- jl .left_extend_2px_loop
-.left_extend_loop_end:
- dec r5
- jnz .slow_left_extend_loop
+INIT_MMX mmx
+H_EXTEND 2, 14
 %if ARCH_X86_32
- mov r2, r2m
-%endif
- jmp .right_extend
-%endmacro
-
-%macro SLOW_RIGHT_EXTEND 0
-.slow_right_extend_loop:
-; r3(64)/r0(32)=buf+block_h*linesize,r2=linesize,r4=block_w,r8(64)/r5(32)=block_h,
-; r7(64)/r6(32)=end_x,r6/r3=val,r1=cntr
-%if ARCH_X86_64
-%define buf_reg r3
-%define bh_reg r8
-%else
-%define buf_reg r0
-%define bh_reg r5
+H_EXTEND 16, 22
 %endif
- lea r1, [r4-8]
- sub buf_reg, linesize
- READ_V_PIXEL 8, [buf_reg+w_reg-1]
-.right_extend_8px_loop:
- movq [buf_reg+r1], mm0
- sub r1, 8
- cmp r1, w_reg
- jge .right_extend_8px_loop
- add r1, 8
- cmp r1, w_reg
- je .right_extend_loop_end
-.right_extend_2px_loop:
- sub r1, 2
- mov [buf_reg+r1], valw
- cmp r1, w_reg
- jg .right_extend_2px_loop
-.right_extend_loop_end:
- dec bh_reg
- jnz .slow_right_extend_loop
- jmp .h_extend_end
-%endmacro
-
-%macro emu_edge 1
-INIT_XMM %1
-EMU_EDGE_FUNC
-VERTICAL_EXTEND
-LEFT_EXTEND
-RIGHT_EXTEND
-SLOW_V_EXTEND
-SLOW_LEFT_EXTEND
-SLOW_RIGHT_EXTEND
-%endmacro
 
-emu_edge sse
-%if ARCH_X86_32
-emu_edge mmx
-%endif
+INIT_XMM sse2
+H_EXTEND 16, 22
 
 %macro PREFETCH_FN 1
 cglobal prefetch, 3, 3, 0, buf, stride, h

libav-v9.6.tar.bz2/libavcodec/x86/videodsp_init.c -> libav-v10.1.tar.bz2/libavcodec/x86/videodsp_init.c Changed

@@ -19,36 +19,136 @@
 */
 
 #include "config.h"
+#include "libavutil/attributes.h"
 #include "libavutil/common.h"
 #include "libavutil/cpu.h"
 #include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
+#include "libavutil/x86/cpu.h"
 #include "libavcodec/videodsp.h"
 
 #if HAVE_YASM
-typedef void emu_edge_core_func(uint8_t *buf, const uint8_t *src,
- x86_reg linesize, x86_reg start_y,
- x86_reg end_y, x86_reg block_h,
- x86_reg start_x, x86_reg end_x,
- x86_reg block_w);
-extern emu_edge_core_func ff_emu_edge_core_mmx;
-extern emu_edge_core_func ff_emu_edge_core_sse;
-
-static av_always_inline void emulated_edge_mc(uint8_t *buf, const uint8_t *src,
- ptrdiff_t linesize,
- int block_w, int block_h,
- int src_x, int src_y,
- int w, int h,
- emu_edge_core_func *core_fn)
+typedef void emu_edge_vfix_func(uint8_t *dst, const uint8_t *src,
+ x86_reg dst_stride, x86_reg src_stride,
+ x86_reg start_y, x86_reg end_y, x86_reg bh);
+typedef void emu_edge_vvar_func(uint8_t *dst, const uint8_t *src,
+ x86_reg dst_stride, x86_reg src_stride,
+ x86_reg start_y, x86_reg end_y, x86_reg bh,
+ x86_reg w);
+
+extern emu_edge_vfix_func ff_emu_edge_vfix1_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix2_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix3_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix4_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix5_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix6_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix7_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix8_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix9_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix10_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix11_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix12_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix13_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix14_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix15_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix16_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix17_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix18_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix19_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix20_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix21_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix22_mmx;
+#if ARCH_X86_32
+static emu_edge_vfix_func *vfixtbl_mmx[22] = {
+ &ff_emu_edge_vfix1_mmx, &ff_emu_edge_vfix2_mmx, &ff_emu_edge_vfix3_mmx,
+ &ff_emu_edge_vfix4_mmx, &ff_emu_edge_vfix5_mmx, &ff_emu_edge_vfix6_mmx,
+ &ff_emu_edge_vfix7_mmx, &ff_emu_edge_vfix8_mmx, &ff_emu_edge_vfix9_mmx,
+ &ff_emu_edge_vfix10_mmx, &ff_emu_edge_vfix11_mmx, &ff_emu_edge_vfix12_mmx,
+ &ff_emu_edge_vfix13_mmx, &ff_emu_edge_vfix14_mmx, &ff_emu_edge_vfix15_mmx,
+ &ff_emu_edge_vfix16_mmx, &ff_emu_edge_vfix17_mmx, &ff_emu_edge_vfix18_mmx,
+ &ff_emu_edge_vfix19_mmx, &ff_emu_edge_vfix20_mmx, &ff_emu_edge_vfix21_mmx,
+ &ff_emu_edge_vfix22_mmx
+};
+#endif
+extern emu_edge_vvar_func ff_emu_edge_vvar_mmx;
+extern emu_edge_vfix_func ff_emu_edge_vfix16_sse;
+extern emu_edge_vfix_func ff_emu_edge_vfix17_sse;
+extern emu_edge_vfix_func ff_emu_edge_vfix18_sse;
+extern emu_edge_vfix_func ff_emu_edge_vfix19_sse;
+extern emu_edge_vfix_func ff_emu_edge_vfix20_sse;
+extern emu_edge_vfix_func ff_emu_edge_vfix21_sse;
+extern emu_edge_vfix_func ff_emu_edge_vfix22_sse;
+static emu_edge_vfix_func *vfixtbl_sse[22] = {
+ ff_emu_edge_vfix1_mmx, ff_emu_edge_vfix2_mmx, ff_emu_edge_vfix3_mmx,
+ ff_emu_edge_vfix4_mmx, ff_emu_edge_vfix5_mmx, ff_emu_edge_vfix6_mmx,
+ ff_emu_edge_vfix7_mmx, ff_emu_edge_vfix8_mmx, ff_emu_edge_vfix9_mmx,
+ ff_emu_edge_vfix10_mmx, ff_emu_edge_vfix11_mmx, ff_emu_edge_vfix12_mmx,
+ ff_emu_edge_vfix13_mmx, ff_emu_edge_vfix14_mmx, ff_emu_edge_vfix15_mmx,
+ ff_emu_edge_vfix16_sse, ff_emu_edge_vfix17_sse, ff_emu_edge_vfix18_sse,
+ ff_emu_edge_vfix19_sse, ff_emu_edge_vfix20_sse, ff_emu_edge_vfix21_sse,
+ ff_emu_edge_vfix22_sse
+};
+extern emu_edge_vvar_func ff_emu_edge_vvar_sse;
+
+typedef void emu_edge_hfix_func(uint8_t *dst, x86_reg dst_stride,
+ x86_reg start_x, x86_reg bh);
+typedef void emu_edge_hvar_func(uint8_t *dst, x86_reg dst_stride,
+ x86_reg start_x, x86_reg n_words, x86_reg bh);
+
+extern emu_edge_hfix_func ff_emu_edge_hfix2_mmx;
+extern emu_edge_hfix_func ff_emu_edge_hfix4_mmx;
+extern emu_edge_hfix_func ff_emu_edge_hfix6_mmx;
+extern emu_edge_hfix_func ff_emu_edge_hfix8_mmx;
+extern emu_edge_hfix_func ff_emu_edge_hfix10_mmx;
+extern emu_edge_hfix_func ff_emu_edge_hfix12_mmx;
+extern emu_edge_hfix_func ff_emu_edge_hfix14_mmx;
+extern emu_edge_hfix_func ff_emu_edge_hfix16_mmx;
+extern emu_edge_hfix_func ff_emu_edge_hfix18_mmx;
+extern emu_edge_hfix_func ff_emu_edge_hfix20_mmx;
+extern emu_edge_hfix_func ff_emu_edge_hfix22_mmx;
+#if ARCH_X86_32
+static emu_edge_hfix_func *hfixtbl_mmx[11] = {
+ ff_emu_edge_hfix2_mmx, ff_emu_edge_hfix4_mmx, ff_emu_edge_hfix6_mmx,
+ ff_emu_edge_hfix8_mmx, ff_emu_edge_hfix10_mmx, ff_emu_edge_hfix12_mmx,
+ ff_emu_edge_hfix14_mmx, ff_emu_edge_hfix16_mmx, ff_emu_edge_hfix18_mmx,
+ ff_emu_edge_hfix20_mmx, ff_emu_edge_hfix22_mmx
+};
+#endif
+extern emu_edge_hvar_func ff_emu_edge_hvar_mmx;
+extern emu_edge_hfix_func ff_emu_edge_hfix16_sse2;
+extern emu_edge_hfix_func ff_emu_edge_hfix18_sse2;
+extern emu_edge_hfix_func ff_emu_edge_hfix20_sse2;
+extern emu_edge_hfix_func ff_emu_edge_hfix22_sse2;
+static emu_edge_hfix_func *hfixtbl_sse2[11] = {
+ ff_emu_edge_hfix2_mmx, ff_emu_edge_hfix4_mmx, ff_emu_edge_hfix6_mmx,
+ ff_emu_edge_hfix8_mmx, ff_emu_edge_hfix10_mmx, ff_emu_edge_hfix12_mmx,
+ ff_emu_edge_hfix14_mmx, ff_emu_edge_hfix16_sse2, ff_emu_edge_hfix18_sse2,
+ ff_emu_edge_hfix20_sse2, ff_emu_edge_hfix22_sse2
+};
+extern emu_edge_hvar_func ff_emu_edge_hvar_sse2;
+
+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,
+ emu_edge_vfix_func **vfix_tbl,
+ emu_edge_vvar_func *v_extend_var,
+ emu_edge_hfix_func **hfix_tbl,
+ emu_edge_hvar_func *h_extend_var)
 {
- int start_y, start_x, end_y, end_x, src_y_add = 0;
+ x86_reg start_y, start_x, end_y, end_x, src_y_add = 0, p;
+
+ if (!w || !h)
+ return;
 
 if (src_y >= h) {
- src_y_add = h - 1 - src_y;
- src_y = h - 1;
+ src -= src_y * src_stride;
+ src_y = src_y_add = h - 1;
 } else if (src_y <= -block_h) {
- src_y_add = 1 - block_h - src_y;
- src_y = 1 - block_h;
+ src -= src_y*src_stride;
+ src_y = src_y_add = 1 - block_h;
 }
 if (src_x >= w) {
 src += w - 1 - src_x;
@@ -66,54 +166,103 @@
 assert(start_y < end_y && block_h > 0);
 
 // fill in the to-be-copied part plus all above/below
- src += (src_y_add + start_y) * linesize + start_x;
- buf += start_x;
- core_fn(buf, src, linesize, start_y, end_y,
- block_h, start_x, end_x, block_w);
+ src += (src_y_add + start_y) * src_stride + start_x;
+ w = end_x - start_x;
+ if (w <= 22) {
+ vfix_tbl[w - 1](dst + start_x, src,
+ dst_stride, src_stride,
+ start_y, end_y, block_h);
+ } else {
+ v_extend_var(dst + start_x, src, dst_stride, src_stride,
+ start_y, end_y, block_h, w);
+ }
+
+ // fill left
+ if (start_x) {
+ if (start_x <= 22) {
+ hfix_tbl[(start_x - 1) >> 1](dst, dst_stride, start_x, block_h);
+ } else {
+ h_extend_var(dst, dst_stride,
+ start_x, (start_x + 1) >> 1, block_h);
+ }
+ }
+
+ // fill right
+ p = block_w - end_x;
+ if (p) {
+ if (p <= 22) {
+ hfix_tbl[(p - 1) >> 1](dst + end_x - (p & 1), dst_stride,
+ -!(p & 1), block_h);
+ } else {
+ h_extend_var(dst + end_x - (p & 1), dst_stride,
+ -!(p & 1), (p + 1) >> 1, block_h);
+ }
+ }
 }
 
 #if ARCH_X86_32
 static av_noinline void emulated_edge_mc_mmx(uint8_t *buf, const uint8_t *src,
- ptrdiff_t linesize,
+ 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, src, linesize, block_w, block_h, src_x, src_y,
- w, h, &ff_emu_edge_core_mmx);
+ 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);
 }
-#endif
 
-static av_noinline void emulated_edge_mc_sse(uint8_t *buf, const uint8_t *src,
- ptrdiff_t linesize,
+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, src, linesize, block_w, block_h, src_x, src_y,
- w, h, &ff_emu_edge_core_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_mmx, &ff_emu_edge_hvar_mmx);
+}
+#endif
+
+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)
+{
+ 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 */
 
 void ff_prefetch_mmxext(uint8_t *buf, ptrdiff_t stride, int h);
 void ff_prefetch_3dnow(uint8_t *buf, ptrdiff_t stride, int h);
 
-void ff_videodsp_init_x86(VideoDSPContext *ctx, int bpc)
+av_cold void ff_videodsp_init_x86(VideoDSPContext *ctx, int bpc)
 {
 #if HAVE_YASM
- int mm_flags = av_get_cpu_flags();
+ int cpu_flags = av_get_cpu_flags();
 
 #if ARCH_X86_32
- if (bpc <= 8 && mm_flags & AV_CPU_FLAG_MMX) {
+ if (EXTERNAL_MMX(cpu_flags) && bpc <= 8) {
 ctx->emulated_edge_mc = emulated_edge_mc_mmx;
 }
- if (mm_flags & AV_CPU_FLAG_3DNOW) {
+ if (EXTERNAL_AMD3DNOW(cpu_flags)) {
 ctx->prefetch = ff_prefetch_3dnow;
 }
 #endif /* ARCH_X86_32 */
- if (mm_flags & AV_CPU_FLAG_MMXEXT) {
+ if (EXTERNAL_MMXEXT(cpu_flags)) {
 ctx->prefetch = ff_prefetch_mmxext;
 }
- if (bpc <= 8 && mm_flags & AV_CPU_FLAG_SSE) {
+#if ARCH_X86_32
+ if (EXTERNAL_SSE(cpu_flags) && bpc <= 8) {
 ctx->emulated_edge_mc = emulated_edge_mc_sse;
 }
+#endif /* ARCH_X86_32 */
+ if (EXTERNAL_SSE2(cpu_flags) && bpc <= 8) {
+ ctx->emulated_edge_mc = emulated_edge_mc_sse2;
+ }
 #endif /* HAVE_YASM */
 }

libav-v10.1.tar.bz2/libavcodec/x86/vorbisdsp.asm Added

@@ -0,0 +1,83 @@
+;******************************************************************************
+;* Vorbis x86 optimizations
+;* Copyright (C) 2006 Loren Merritt <lorenm@u.washington.edu>
+;*
+;* This file is part of Libav.
+;*
+;* Libav 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.
+;*
+;* Libav 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 Libav; 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
+
+pdw_80000000: times 4 dd 0x80000000
+
+SECTION .text
+
+%if ARCH_X86_32
+INIT_MMX 3dnow
+cglobal vorbis_inverse_coupling, 3, 3, 6, mag, ang, block_size
+ pxor m7, m7
+ lea magq, [magq+block_sizeq*4]
+ lea angq, [angq+block_sizeq*4]
+ neg block_sizeq
+.loop:
+ mova m0, [magq+block_sizeq*4]
+ mova m1, [angq+block_sizeq*4]
+ mova m2, m0
+ mova m3, m1
+ pfcmpge m2, m7 ; m <= 0.0
+ pfcmpge m3, m7 ; a <= 0.0
+ pslld m2, 31 ; keep only the sign bit
+ pxor m1, m2
+ mova m4, m3
+ pand m3, m1
+ pandn m4, m1
+ pfadd m3, m0 ; a = m + ((a < 0) & (a ^ sign(m)))
+ pfsub m0, m4 ; m = m + ((a > 0) & (a ^ sign(m)))
+ mova [angq+block_sizeq*4], m3
+ mova [magq+block_sizeq*4], m0
+ add block_sizeq, 2
+ jl .loop
+ femms
+ RET
+%endif
+
+INIT_XMM sse
+cglobal vorbis_inverse_coupling, 3, 4, 6, mag, ang, block_size, cntr
+ mova m5, [pdw_80000000]
+ xor cntrq, cntrq
+align 16
+.loop:
+ mova m0, [magq+cntrq*4]
+ mova m1, [angq+cntrq*4]
+ xorps m2, m2
+ xorps m3, m3
+ cmpleps m2, m0 ; m <= 0.0
+ cmpleps m3, m1 ; a <= 0.0
+ andps m2, m5 ; keep only the sign bit
+ xorps m1, m2
+ mova m4, m3
+ andps m3, m1
+ andnps m4, m1
+ addps m3, m0 ; a = m + ((a < 0) & (a ^ sign(m)))
+ subps m0, m4 ; m = m + ((a > 0) & (a ^ sign(m)))
+ mova [angq+cntrq*4], m3
+ mova [magq+cntrq*4], m0
+ add cntrq, 4
+ cmp cntrq, block_sizeq
+ jl .loop
+ RET

libav-v10.1.tar.bz2/libavcodec/x86/vorbisdsp_init.c Added

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2006 Loren Merritt <lorenm@u.washington.edu>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/x86/cpu.h"
+#include "libavcodec/vorbisdsp.h"
+
+void ff_vorbis_inverse_coupling_3dnow(float *mag, float *ang,
+ intptr_t blocksize);
+void ff_vorbis_inverse_coupling_sse(float *mag, float *ang,
+ intptr_t blocksize);
+
+av_cold void ff_vorbisdsp_init_x86(VorbisDSPContext *dsp)
+{
+#if HAVE_YASM
+ int cpu_flags = av_get_cpu_flags();
+
+#if ARCH_X86_32
+ if (EXTERNAL_AMD3DNOW(cpu_flags))
+ dsp->vorbis_inverse_coupling = ff_vorbis_inverse_coupling_3dnow;
+#endif /* ARCH_X86_32 */
+ if (EXTERNAL_SSE(cpu_flags))
+ dsp->vorbis_inverse_coupling = ff_vorbis_inverse_coupling_sse;
+#endif /* HAVE_YASM */
+}

libav-v9.6.tar.bz2/libavcodec/x86/vp3dsp.asm -> libav-v10.1.tar.bz2/libavcodec/x86/vp3dsp.asm Changed

@@ -33,12 +33,13 @@
                times 8 dw 25080
                times 8 dw 12785
 
+pb_7:  times 8 db 0x07
+pb_1F: times 8 db 0x1f
+pb_81: times 8 db 0x81
+
 cextern pb_1
 cextern pb_3
-cextern pb_7
-cextern pb_1F
 cextern pb_80
-cextern pb_81
 
 cextern pw_8
 
@@ -500,22 +501,22 @@
 
     ; at this point, function has completed dequantization + dezigzag +
     ; partial transposition; now do the idct itself
-%define I(x) [%1+16* x     ]
-%define J(x) [%1+16*(x-4)+8]
+%define I(x) [%1+16*x]
+%define J(x) [%1+16*x]
     RowIDCT
     Transpose
 
-%define I(x) [%1+16* x   +64]
-%define J(x) [%1+16*(x-4)+72]
+%define I(x) [%1+16*x+8]
+%define J(x) [%1+16*x+8]
     RowIDCT
     Transpose
 
-%define I(x) [%1+16*x]
-%define J(x) [%1+16*x]
+%define I(x) [%1+16* x]
+%define J(x) [%1+16*(x-4)+8]
     ColumnIDCT
 
-%define I(x) [%1+16*x+8]
-%define J(x) [%1+16*x+8]
+%define I(x) [%1+16* x   +64]
+%define J(x) [%1+16*(x-4)+72]
     ColumnIDCT
 %endif ; mmsize == 16/8
 %endmacro
@@ -533,10 +534,17 @@
     mova          m1, [r2+mmsize*2+%%i]
     mova          m2, [r2+mmsize*4+%%i]
     mova          m3, [r2+mmsize*6+%%i]
+%if mmsize == 8
+    packsswb      m0, [r2+mmsize*8+%%i]
+    packsswb      m1, [r2+mmsize*10+%%i]
+    packsswb      m2, [r2+mmsize*12+%%i]
+    packsswb      m3, [r2+mmsize*14+%%i]
+%else
     packsswb      m0, [r2+mmsize*1+%%i]
     packsswb      m1, [r2+mmsize*3+%%i]
     packsswb      m2, [r2+mmsize*5+%%i]
     packsswb      m3, [r2+mmsize*7+%%i]
+%endif
     paddb         m0, m4
     paddb         m1, m4
     paddb         m2, m4
@@ -560,49 +568,95 @@
     movq   [r0+r1*2], m3
     movhps [r0+r3  ], m3
 %endif
-%assign %%i %%i+64
+%assign %%i %%i+8
+%endrep
+
+    pxor          m0, m0
+%assign %%offset 0
+%rep 128/mmsize
+    mova [r2+%%offset], m0
+%assign %%offset %%offset+mmsize
 %endrep
     RET
 
 cglobal vp3_idct_add, 3, 4, 9
     VP3_IDCT      r2
 
-    mov           r3, 4
-    pxor          m4, m4
     movsxdifnidn  r1, r1d
-.loop:
+    lea           r3, [r1*3]
+    pxor          m4, m4
+%if mmsize == 16
+%assign %%i 0
+%rep 2
     movq          m0, [r0]
     movq          m1, [r0+r1]
-%if mmsize == 8
-    mova          m2, m0
-    mova          m3, m1
-%endif
+    movq          m2, [r0+r1*2]
+    movq          m3, [r0+r3]
     punpcklbw     m0, m4
     punpcklbw     m1, m4
-%if mmsize == 8
-    punpckhbw     m2, m4
-    punpckhbw     m3, m4
-%endif
-    paddsw        m0, [r2+ 0]
-    paddsw        m1, [r2+16]
-%if mmsize == 8
-    paddsw        m2, [r2+ 8]
-    paddsw        m3, [r2+24]
-    packuswb      m0, m2
-    packuswb      m1, m3
-%else ; mmsize == 16
+    punpcklbw     m2, m4
+    punpcklbw     m3, m4
+    paddsw        m0, [r2+ 0+%%i]
+    paddsw        m1, [r2+16+%%i]
+    paddsw        m2, [r2+32+%%i]
+    paddsw        m3, [r2+48+%%i]
     packuswb      m0, m1
+    packuswb      m2, m3
+    movq   [r0     ], m0
+    movhps [r0+r1  ], m0
+    movq   [r0+r1*2], m2
+    movhps [r0+r3  ], m2
+%if %%i == 0
+    lea           r0, [r0+r1*4]
 %endif
-    movq     [r0   ], m0
-%if mmsize == 8
-    movq     [r0+r1], m1
-%else ; mmsize == 16
-    movhps   [r0+r1], m0
+%assign %%i %%i+64
+%endrep
+%else
+%assign %%i 0
+%rep 2
+    movq          m0, [r0]
+    movq          m1, [r0+r1]
+    movq          m2, [r0+r1*2]
+    movq          m3, [r0+r3]
+    movq          m5, m0
+    movq          m6, m1
+    movq          m7, m2
+    punpcklbw     m0, m4
+    punpcklbw     m1, m4
+    punpcklbw     m2, m4
+    punpckhbw     m5, m4
+    punpckhbw     m6, m4
+    punpckhbw     m7, m4
+    paddsw        m0, [r2+ 0+%%i]
+    paddsw        m1, [r2+16+%%i]
+    paddsw        m2, [r2+32+%%i]
+    paddsw        m5, [r2+64+%%i]
+    paddsw        m6, [r2+80+%%i]
+    paddsw        m7, [r2+96+%%i]
+    packuswb      m0, m5
+    movq          m5, m3
+    punpcklbw     m3, m4
+    punpckhbw     m5, m4
+    packuswb      m1, m6
+    paddsw        m3, [r2+48+%%i]
+    paddsw        m5, [r2+112+%%i]
+    packuswb      m2, m7
+    packuswb      m3, m5
+    movq   [r0     ], m0
+    movq   [r0+r1  ], m1
+    movq   [r0+r1*2], m2
+    movq   [r0+r3  ], m3
+%if %%i == 0
+    lea           r0, [r0+r1*4]
+%endif
+%assign %%i %%i+8
+%endrep
 %endif
-    lea           r0, [r0+r1*2]
-    add           r2, 32
-    dec           r3
-    jg .loop
+%assign %%i 0
+%rep 128/mmsize
+    mova    [r2+%%i], m4
+%assign %%i %%i+mmsize
+%endrep
     RET
 %endmacro
 
@@ -620,7 +674,7 @@
     paddusb       m2, m0
     movq          m4, [r0+r1*2]
     paddusb       m3, m0
-    movq          m5, [r0+r3  ]
+    movq          m5, [r0+r2  ]
     paddusb       m4, m0
     paddusb       m5, m0
     psubusb       m2, m1
@@ -630,7 +684,7 @@
     movq   [r0+r1  ], m3
     psubusb       m5, m1
     movq   [r0+r1*2], m4
-    movq   [r0+r3  ], m5
+    movq   [r0+r2  ], m5
 %endmacro
 
 INIT_MMX mmxext
@@ -638,11 +692,12 @@
 %if ARCH_X86_64
     movsxd        r1, r1d
 %endif
-    lea           r3, [r1*3]
-    movsx         r2, word [r2]
-    add           r2, 15
-    sar           r2, 5
-    movd          m0, r2d
+    movsx         r3, word [r2]
+    mov    word [r2], 0
+    lea           r2, [r1*3]
+    add           r3, 15
+    sar           r3, 5
+    movd          m0, r3d
     pshufw        m0, m0, 0x0
     pxor          m1, m1
     psubw         m1, m0

libav-v9.6.tar.bz2/libavcodec/x86/vp3dsp_init.c -> libav-v10.1.tar.bz2/libavcodec/x86/vp3dsp_init.c Changed

@@ -22,17 +22,18 @@
 #include "libavutil/cpu.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
 #include "libavcodec/vp3dsp.h"
 #include "config.h"
 
-void ff_vp3_idct_put_mmx(uint8_t *dest, int line_size, DCTELEM *block);
-void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block);
+void ff_vp3_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block);
+void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block);
 
-void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block);
-void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, DCTELEM *block);
+void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, int16_t *block);
+void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, int16_t *block);
 
 void ff_vp3_idct_dc_add_mmxext(uint8_t *dest, int line_size,
-                               const DCTELEM *block);
+                               int16_t *block);
 
 void ff_vp3_v_loop_filter_mmxext(uint8_t *src, int stride,
                                  int *bounding_values);
@@ -41,17 +42,16 @@
 
 av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags)
 {
-    int cpuflags = av_get_cpu_flags();
+    int cpu_flags = av_get_cpu_flags();
 
 #if ARCH_X86_32
-    if (EXTERNAL_MMX(cpuflags)) {
+    if (EXTERNAL_MMX(cpu_flags)) {
         c->idct_put  = ff_vp3_idct_put_mmx;
         c->idct_add  = ff_vp3_idct_add_mmx;
-        c->idct_perm = FF_PARTTRANS_IDCT_PERM;
     }
 #endif
 
-    if (EXTERNAL_MMXEXT(cpuflags)) {
+    if (EXTERNAL_MMXEXT(cpu_flags)) {
         c->idct_dc_add = ff_vp3_idct_dc_add_mmxext;
 
         if (!(flags & CODEC_FLAG_BITEXACT)) {
@@ -60,9 +60,8 @@
         }
     }
 
-    if (EXTERNAL_SSE2(cpuflags)) {
+    if (EXTERNAL_SSE2(cpu_flags)) {
         c->idct_put  = ff_vp3_idct_put_sse2;
         c->idct_add  = ff_vp3_idct_add_sse2;
-        c->idct_perm = FF_TRANSPOSE_IDCT_PERM;
     }
 }

libav-v10.1.tar.bz2/libavcodec/x86/vp6dsp.asm Changed

libav-v10.1.tar.bz2/libavcodec/x86/vp6dsp_init.c Added

@@ -0,0 +1,46 @@
+/*
+ * VP6 MMX/SSE2 optimizations
+ * Copyright (C) 2009 Sebastien Lucas <sebastien.lucas@gmail.com>
+ * Copyright (C) 2009 Zuxy Meng <zuxy.meng@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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/asm.h"
+#include "libavutil/x86/cpu.h"
+#include "libavcodec/vp56dsp.h"
+
+void ff_vp6_filter_diag4_mmx(uint8_t *dst, uint8_t *src, int stride,
+ const int16_t *h_weights,const int16_t *v_weights);
+void ff_vp6_filter_diag4_sse2(uint8_t *dst, uint8_t *src, int stride,
+ const int16_t *h_weights,const int16_t *v_weights);
+
+av_cold void ff_vp6dsp_init_x86(VP56DSPContext* c, enum AVCodecID codec)
+{
+ int cpu_flags = av_get_cpu_flags();
+
+#if ARCH_X86_32
+ if (EXTERNAL_MMX(cpu_flags)) {
+ c->vp6_filter_diag4 = ff_vp6_filter_diag4_mmx;
+ }
+#endif
+ if (EXTERNAL_SSE2(cpu_flags)) {
+ c->vp6_filter_diag4 = ff_vp6_filter_diag4_sse2;
+ }
+}

libav-v9.6.tar.bz2/libavcodec/x86/vp8dsp.asm -> libav-v10.1.tar.bz2/libavcodec/x86/vp8dsp.asm Changed

@@ -143,28 +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_256: times 8 dw 256
-
+pw_256: times 8 dw 256
 pw_20091: times 4 dw 20091
 pw_17734: times 4 dw 17734
 
-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 pb_4
-cextern pw_9
-cextern pw_18
-cextern pw_27
-cextern pw_63
 cextern pw_64
-cextern pb_80
-cextern pb_F8
-cextern pb_FE
 
 SECTION .text
 
@@ -899,7 +884,7 @@
 REP_RET
 
 ;-----------------------------------------------------------------------------
-; void vp8_idct_dc_add_<opt>(uint8_t *dst, DCTELEM block[16], int stride);
+; void vp8_idct_dc_add_<opt>(uint8_t *dst, int16_t block[16], int stride);
 ;-----------------------------------------------------------------------------
 
 %macro ADD_DC 4
@@ -977,7 +962,7 @@
 RET
 
 ;-----------------------------------------------------------------------------
-; void vp8_idct_dc_add4y_<opt>(uint8_t *dst, DCTELEM block[4][16], int stride);
+; void vp8_idct_dc_add4y_<opt>(uint8_t *dst, int16_t block[4][16], int stride);
 ;-----------------------------------------------------------------------------
 
 %if ARCH_X86_32
@@ -1050,7 +1035,7 @@
 RET
 
 ;-----------------------------------------------------------------------------
-; void vp8_idct_dc_add4uv_<opt>(uint8_t *dst, DCTELEM block[4][16], int stride);
+; void vp8_idct_dc_add4uv_<opt>(uint8_t *dst, int16_t block[4][16], int stride);
 ;-----------------------------------------------------------------------------
 
 INIT_MMX mmx
@@ -1092,7 +1077,7 @@
 RET
 
 ;-----------------------------------------------------------------------------
-; void vp8_idct_add_<opt>(uint8_t *dst, DCTELEM block[16], int stride);
+; void vp8_idct_add_<opt>(uint8_t *dst, int16_t block[16], int stride);
 ;-----------------------------------------------------------------------------
 
 ; calculate %1=mul_35468(%1)-mul_20091(%2); %2=mul_20091(%1)+mul_35468(%2)
@@ -1172,7 +1157,7 @@
 VP8_IDCT_ADD
 
 ;-----------------------------------------------------------------------------
-; void vp8_luma_dc_wht_mmxext(DCTELEM block[4][4][16], DCTELEM dc[16])
+; void vp8_luma_dc_wht_mmxext(int16_t block[4][4][16], int16_t dc[16])
 ;-----------------------------------------------------------------------------
 
 %macro SCATTER_WHT 3
@@ -1238,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

libav-v9.6.tar.bz2/libavcodec/x86/vp8dsp_init.c -> libav-v10.1.tar.bz2/libavcodec/x86/vp8dsp_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/vp8dsp.h"
 
 #if HAVE_YASM
@@ -30,93 +32,93 @@
 /*
  * MC functions
  */
-extern void ff_put_vp8_epel4_h4_mmxext(uint8_t *dst, ptrdiff_t dststride,
-                                       uint8_t *src, ptrdiff_t srcstride,
-                                       int height, int mx, int my);
-extern void ff_put_vp8_epel4_h6_mmxext(uint8_t *dst, ptrdiff_t dststride,
-                                       uint8_t *src, ptrdiff_t srcstride,
-                                       int height, int mx, int my);
-extern void ff_put_vp8_epel4_v4_mmxext(uint8_t *dst, ptrdiff_t dststride,
-                                       uint8_t *src, ptrdiff_t srcstride,
-                                       int height, int mx, int my);
-extern void ff_put_vp8_epel4_v6_mmxext(uint8_t *dst, ptrdiff_t dststride,
-                                       uint8_t *src, ptrdiff_t srcstride,
-                                       int height, int mx, int my);
-
-extern void ff_put_vp8_epel8_h4_sse2  (uint8_t *dst, ptrdiff_t dststride,
-                                       uint8_t *src, ptrdiff_t srcstride,
-                                       int height, int mx, int my);
-extern void ff_put_vp8_epel8_h6_sse2  (uint8_t *dst, ptrdiff_t dststride,
-                                       uint8_t *src, ptrdiff_t srcstride,
-                                       int height, int mx, int my);
-extern void ff_put_vp8_epel8_v4_sse2  (uint8_t *dst, ptrdiff_t dststride,
-                                       uint8_t *src, ptrdiff_t srcstride,
-                                       int height, int mx, int my);
-extern void ff_put_vp8_epel8_v6_sse2  (uint8_t *dst, ptrdiff_t dststride,
-                                       uint8_t *src, ptrdiff_t srcstride,
-                                       int height, int mx, int my);
-
-extern void ff_put_vp8_epel4_h4_ssse3 (uint8_t *dst, ptrdiff_t dststride,
-                                       uint8_t *src, ptrdiff_t srcstride,
-                                       int height, int mx, int my);
-extern void ff_put_vp8_epel4_h6_ssse3 (uint8_t *dst, ptrdiff_t dststride,
-                                       uint8_t *src, ptrdiff_t srcstride,
-                                       int height, int mx, int my);
-extern void ff_put_vp8_epel4_v4_ssse3 (uint8_t *dst, ptrdiff_t dststride,
-                                       uint8_t *src, ptrdiff_t srcstride,
-                                       int height, int mx, int my);
-extern void ff_put_vp8_epel4_v6_ssse3 (uint8_t *dst, ptrdiff_t dststride,
-                                       uint8_t *src, ptrdiff_t srcstride,
-                                       int height, int mx, int my);
-extern void ff_put_vp8_epel8_h4_ssse3 (uint8_t *dst, ptrdiff_t dststride,
-                                       uint8_t *src, ptrdiff_t srcstride,
-                                       int height, int mx, int my);
-extern void ff_put_vp8_epel8_h6_ssse3 (uint8_t *dst, ptrdiff_t dststride,
-                                       uint8_t *src, ptrdiff_t srcstride,
-                                       int height, int mx, int my);
-extern void ff_put_vp8_epel8_v4_ssse3 (uint8_t *dst, ptrdiff_t dststride,
-                                       uint8_t *src, ptrdiff_t srcstride,
-                                       int height, int mx, int my);
-extern void ff_put_vp8_epel8_v6_ssse3 (uint8_t *dst, ptrdiff_t dststride,
-                                       uint8_t *src, ptrdiff_t srcstride,
-                                       int height, int mx, int my);
-
-extern void ff_put_vp8_bilinear4_h_mmxext(uint8_t *dst, ptrdiff_t dststride,
-                                          uint8_t *src, ptrdiff_t srcstride,
-                                          int height, int mx, int my);
-extern void ff_put_vp8_bilinear8_h_sse2  (uint8_t *dst, ptrdiff_t dststride,
-                                          uint8_t *src, ptrdiff_t srcstride,
-                                          int height, int mx, int my);
-extern void ff_put_vp8_bilinear4_h_ssse3 (uint8_t *dst, ptrdiff_t dststride,
-                                          uint8_t *src, ptrdiff_t srcstride,
-                                          int height, int mx, int my);
-extern void ff_put_vp8_bilinear8_h_ssse3 (uint8_t *dst, ptrdiff_t dststride,
-                                          uint8_t *src, ptrdiff_t srcstride,
-                                          int height, int mx, int my);
-
-extern void ff_put_vp8_bilinear4_v_mmxext(uint8_t *dst, ptrdiff_t dststride,
-                                          uint8_t *src, ptrdiff_t srcstride,
-                                          int height, int mx, int my);
-extern void ff_put_vp8_bilinear8_v_sse2  (uint8_t *dst, ptrdiff_t dststride,
-                                          uint8_t *src, ptrdiff_t srcstride,
-                                          int height, int mx, int my);
-extern void ff_put_vp8_bilinear4_v_ssse3 (uint8_t *dst, ptrdiff_t dststride,
-                                          uint8_t *src, ptrdiff_t srcstride,
-                                          int height, int mx, int my);
-extern void ff_put_vp8_bilinear8_v_ssse3 (uint8_t *dst, ptrdiff_t dststride,
-                                          uint8_t *src, ptrdiff_t srcstride,
-                                          int height, int mx, int my);
-
-
-extern void ff_put_vp8_pixels8_mmx (uint8_t *dst, ptrdiff_t dststride,
-                                    uint8_t *src, ptrdiff_t srcstride,
-                                    int height, int mx, int my);
-extern void ff_put_vp8_pixels16_mmx(uint8_t *dst, ptrdiff_t dststride,
-                                    uint8_t *src, ptrdiff_t srcstride,
-                                    int height, int mx, int my);
-extern void ff_put_vp8_pixels16_sse(uint8_t *dst, ptrdiff_t dststride,
-                                    uint8_t *src, ptrdiff_t srcstride,
-                                    int height, int mx, int my);
+void ff_put_vp8_epel4_h4_mmxext(uint8_t *dst, ptrdiff_t dststride,
+                                uint8_t *src, ptrdiff_t srcstride,
+                                int height, int mx, int my);
+void ff_put_vp8_epel4_h6_mmxext(uint8_t *dst, ptrdiff_t dststride,
+                                uint8_t *src, ptrdiff_t srcstride,
+                                int height, int mx, int my);
+void ff_put_vp8_epel4_v4_mmxext(uint8_t *dst, ptrdiff_t dststride,
+                                uint8_t *src, ptrdiff_t srcstride,
+                                int height, int mx, int my);
+void ff_put_vp8_epel4_v6_mmxext(uint8_t *dst, ptrdiff_t dststride,
+                                uint8_t *src, ptrdiff_t srcstride,
+                                int height, int mx, int my);
+
+void ff_put_vp8_epel8_h4_sse2  (uint8_t *dst, ptrdiff_t dststride,
+                                uint8_t *src, ptrdiff_t srcstride,
+                                int height, int mx, int my);
+void ff_put_vp8_epel8_h6_sse2  (uint8_t *dst, ptrdiff_t dststride,
+                                uint8_t *src, ptrdiff_t srcstride,
+                                int height, int mx, int my);
+void ff_put_vp8_epel8_v4_sse2  (uint8_t *dst, ptrdiff_t dststride,
+                                uint8_t *src, ptrdiff_t srcstride,
+                                int height, int mx, int my);
+void ff_put_vp8_epel8_v6_sse2  (uint8_t *dst, ptrdiff_t dststride,
+                                uint8_t *src, ptrdiff_t srcstride,
+                                int height, int mx, int my);
+
+void ff_put_vp8_epel4_h4_ssse3 (uint8_t *dst, ptrdiff_t dststride,
+                                uint8_t *src, ptrdiff_t srcstride,
+                                int height, int mx, int my);
+void ff_put_vp8_epel4_h6_ssse3 (uint8_t *dst, ptrdiff_t dststride,
+                                uint8_t *src, ptrdiff_t srcstride,
+                                int height, int mx, int my);
+void ff_put_vp8_epel4_v4_ssse3 (uint8_t *dst, ptrdiff_t dststride,
+                                uint8_t *src, ptrdiff_t srcstride,
+                                int height, int mx, int my);
+void ff_put_vp8_epel4_v6_ssse3 (uint8_t *dst, ptrdiff_t dststride,
+                                uint8_t *src, ptrdiff_t srcstride,
+                                int height, int mx, int my);
+void ff_put_vp8_epel8_h4_ssse3 (uint8_t *dst, ptrdiff_t dststride,
+                                uint8_t *src, ptrdiff_t srcstride,
+                                int height, int mx, int my);
+void ff_put_vp8_epel8_h6_ssse3 (uint8_t *dst, ptrdiff_t dststride,
+                                uint8_t *src, ptrdiff_t srcstride,
+                                int height, int mx, int my);
+void ff_put_vp8_epel8_v4_ssse3 (uint8_t *dst, ptrdiff_t dststride,
+                                uint8_t *src, ptrdiff_t srcstride,
+                                int height, int mx, int my);
+void ff_put_vp8_epel8_v6_ssse3 (uint8_t *dst, ptrdiff_t dststride,
+                                uint8_t *src, ptrdiff_t srcstride,
+                                int height, int mx, int my);
+
+void ff_put_vp8_bilinear4_h_mmxext(uint8_t *dst, ptrdiff_t dststride,
+                                   uint8_t *src, ptrdiff_t srcstride,
+                                   int height, int mx, int my);
+void ff_put_vp8_bilinear8_h_sse2  (uint8_t *dst, ptrdiff_t dststride,
+                                   uint8_t *src, ptrdiff_t srcstride,
+                                   int height, int mx, int my);
+void ff_put_vp8_bilinear4_h_ssse3 (uint8_t *dst, ptrdiff_t dststride,
+                                   uint8_t *src, ptrdiff_t srcstride,
+                                   int height, int mx, int my);
+void ff_put_vp8_bilinear8_h_ssse3 (uint8_t *dst, ptrdiff_t dststride,
+                                   uint8_t *src, ptrdiff_t srcstride,
+                                   int height, int mx, int my);
+
+void ff_put_vp8_bilinear4_v_mmxext(uint8_t *dst, ptrdiff_t dststride,
+                                   uint8_t *src, ptrdiff_t srcstride,
+                                   int height, int mx, int my);
+void ff_put_vp8_bilinear8_v_sse2  (uint8_t *dst, ptrdiff_t dststride,
+                                   uint8_t *src, ptrdiff_t srcstride,
+                                   int height, int mx, int my);
+void ff_put_vp8_bilinear4_v_ssse3 (uint8_t *dst, ptrdiff_t dststride,
+                                   uint8_t *src, ptrdiff_t srcstride,
+                                   int height, int mx, int my);
+void ff_put_vp8_bilinear8_v_ssse3 (uint8_t *dst, ptrdiff_t dststride,
+                                   uint8_t *src, ptrdiff_t srcstride,
+                                   int height, int mx, int my);
+
+
+void ff_put_vp8_pixels8_mmx (uint8_t *dst, ptrdiff_t dststride,
+                             uint8_t *src, ptrdiff_t srcstride,
+                             int height, int mx, int my);
+void ff_put_vp8_pixels16_mmx(uint8_t *dst, ptrdiff_t dststride,
+                             uint8_t *src, ptrdiff_t srcstride,
+                             int height, int mx, int my);
+void ff_put_vp8_pixels16_sse(uint8_t *dst, ptrdiff_t dststride,
+                             uint8_t *src, ptrdiff_t srcstride,
+                             int height, int mx, int my);
 
 #define TAP_W16(OPT, FILTERTYPE, TAPTYPE) \
 static void ff_put_vp8_ ## FILTERTYPE ## 16_ ## TAPTYPE ## _ ## OPT( \
@@ -230,58 +232,56 @@
 HVBILIN(ssse3, 8,  8, 16)
 HVBILIN(ssse3, 8, 16, 16)
 
-extern void ff_vp8_idct_dc_add_mmx(uint8_t *dst, DCTELEM block[16],
-                                   ptrdiff_t stride);
-extern void ff_vp8_idct_dc_add_sse4(uint8_t *dst, DCTELEM block[16],
-                                    ptrdiff_t stride);
-extern void ff_vp8_idct_dc_add4y_mmx(uint8_t *dst, DCTELEM block[4][16],
-                                      ptrdiff_t stride);
-extern void ff_vp8_idct_dc_add4y_sse2(uint8_t *dst, DCTELEM block[4][16],
-                                      ptrdiff_t stride);
-extern void ff_vp8_idct_dc_add4uv_mmx(uint8_t *dst, DCTELEM block[2][16],
-                                      ptrdiff_t stride);
-extern void ff_vp8_luma_dc_wht_mmx(DCTELEM block[4][4][16], DCTELEM dc[16]);
-extern void ff_vp8_luma_dc_wht_sse(DCTELEM block[4][4][16], DCTELEM dc[16]);
-extern void ff_vp8_idct_add_mmx(uint8_t *dst, DCTELEM block[16],
-                                ptrdiff_t stride);
-extern void ff_vp8_idct_add_sse(uint8_t *dst, DCTELEM block[16],
-                                ptrdiff_t stride);
-
-#define DECLARE_LOOP_FILTER(NAME)\
-extern void ff_vp8_v_loop_filter_simple_ ## NAME(uint8_t *dst, \
-                                                 ptrdiff_t stride, \
-                                                 int flim);\
-extern void ff_vp8_h_loop_filter_simple_ ## NAME(uint8_t *dst, \
-                                                 ptrdiff_t stride, \
-                                                 int flim);\
-extern void ff_vp8_v_loop_filter16y_inner_ ## NAME (uint8_t *dst, \
-                                                     ptrdiff_t stride,\
-                                                    int e, int i, int hvt);\
-extern void ff_vp8_h_loop_filter16y_inner_ ## NAME (uint8_t *dst, \
-                                                    ptrdiff_t stride,\
-                                                    int e, int i, int hvt);\
-extern void ff_vp8_v_loop_filter8uv_inner_ ## NAME (uint8_t *dstU, \
-                                                    uint8_t *dstV,\
-                                                    ptrdiff_t s, \
-                                                    int e, int i, int hvt);\
-extern void ff_vp8_h_loop_filter8uv_inner_ ## NAME (uint8_t *dstU, \
-                                                    uint8_t *dstV,\
-                                                    ptrdiff_t s, \
-                                                    int e, int i, int hvt);\
-extern void ff_vp8_v_loop_filter16y_mbedge_ ## NAME(uint8_t *dst, \
-                                                    ptrdiff_t stride,\
-                                                    int e, int i, int hvt);\
-extern void ff_vp8_h_loop_filter16y_mbedge_ ## NAME(uint8_t *dst, \
-                                                    ptrdiff_t stride,\
-                                                    int e, int i, int hvt);\
-extern void ff_vp8_v_loop_filter8uv_mbedge_ ## NAME(uint8_t *dstU, \
-                                                    uint8_t *dstV,\
-                                                    ptrdiff_t s, \
-                                                    int e, int i, int hvt);\
-extern void ff_vp8_h_loop_filter8uv_mbedge_ ## NAME(uint8_t *dstU, \
-                                                    uint8_t *dstV,\
-                                                    ptrdiff_t s, \
-                                                    int e, int i, int hvt);
+void ff_vp8_idct_dc_add_mmx(uint8_t *dst, int16_t block[16],
+                            ptrdiff_t stride);
+void ff_vp8_idct_dc_add_sse4(uint8_t *dst, int16_t block[16],
+                             ptrdiff_t stride);
+void ff_vp8_idct_dc_add4y_mmx(uint8_t *dst, int16_t block[4][16],
+                               ptrdiff_t stride);
+void ff_vp8_idct_dc_add4y_sse2(uint8_t *dst, int16_t block[4][16],
+                               ptrdiff_t stride);
+void ff_vp8_idct_dc_add4uv_mmx(uint8_t *dst, int16_t block[2][16],
+                               ptrdiff_t stride);
+void ff_vp8_luma_dc_wht_mmx(int16_t block[4][4][16], int16_t dc[16]);
+void ff_vp8_luma_dc_wht_sse(int16_t block[4][4][16], int16_t dc[16]);
+void ff_vp8_idct_add_mmx(uint8_t *dst, int16_t block[16], ptrdiff_t stride);
+void ff_vp8_idct_add_sse(uint8_t *dst, int16_t block[16], ptrdiff_t stride);
+
+#define DECLARE_LOOP_FILTER(NAME)                                       \
+void ff_vp8_v_loop_filter_simple_ ## NAME(uint8_t *dst,                 \
+                                          ptrdiff_t stride,             \
+                                          int flim);                    \
+void ff_vp8_h_loop_filter_simple_ ## NAME(uint8_t *dst,                 \
+                                          ptrdiff_t stride,             \
+                                          int flim);                    \
+void ff_vp8_v_loop_filter16y_inner_ ## NAME (uint8_t *dst,              \
+                                             ptrdiff_t stride,          \
+                                             int e, int i, int hvt);    \
+void ff_vp8_h_loop_filter16y_inner_ ## NAME (uint8_t *dst,              \
+                                             ptrdiff_t stride,          \
+                                             int e, int i, int hvt);    \
+void ff_vp8_v_loop_filter8uv_inner_ ## NAME (uint8_t *dstU,             \
+                                             uint8_t *dstV,             \
+                                             ptrdiff_t s,               \
+                                             int e, int i, int hvt);    \
+void ff_vp8_h_loop_filter8uv_inner_ ## NAME (uint8_t *dstU,             \
+                                             uint8_t *dstV,             \
+                                             ptrdiff_t s,               \
+                                             int e, int i, int hvt);    \
+void ff_vp8_v_loop_filter16y_mbedge_ ## NAME(uint8_t *dst,              \
+                                             ptrdiff_t stride,          \
+                                             int e, int i, int hvt);    \
+void ff_vp8_h_loop_filter16y_mbedge_ ## NAME(uint8_t *dst,              \
+                                             ptrdiff_t stride,          \
+                                             int e, int i, int hvt);    \
+void ff_vp8_v_loop_filter8uv_mbedge_ ## NAME(uint8_t *dstU,             \
+                                             uint8_t *dstV,             \
+                                             ptrdiff_t s,               \
+                                             int e, int i, int hvt);    \
+void ff_vp8_h_loop_filter8uv_mbedge_ ## NAME(uint8_t *dstU,             \
+                                             uint8_t *dstV,             \
+                                             ptrdiff_t s,               \
+                                             int e, int i, int hvt);
 
 DECLARE_LOOP_FILTER(mmx)
 DECLARE_LOOP_FILTER(mmxext)
@@ -318,9 +318,9 @@
 av_cold void ff_vp8dsp_init_x86(VP8DSPContext* c)
 {
 #if HAVE_YASM
-    int mm_flags = av_get_cpu_flags();
+    int cpu_flags = av_get_cpu_flags();
 
-    if (mm_flags & AV_CPU_FLAG_MMX) {
+    if (EXTERNAL_MMX(cpu_flags)) {
         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
@@ -351,7 +351,7 @@
 
     /* note that 4-tap width=16 functions are missing because w=16
      * is only used for luma, and luma is always a copy or sixtap. */
-    if (mm_flags & AV_CPU_FLAG_MMXEXT) {
+    if (EXTERNAL_MMXEXT(cpu_flags)) {
         VP8_MC_FUNC(2, 4, mmxext);
         VP8_BILINEAR_MC_FUNC(2, 4, mmxext);
 #if ARCH_X86_32
@@ -375,14 +375,14 @@
 #endif
     }
 
-    if (mm_flags & AV_CPU_FLAG_SSE) {
+    if (EXTERNAL_SSE(cpu_flags)) {
         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;
     }
 
-    if (mm_flags & (AV_CPU_FLAG_SSE2|AV_CPU_FLAG_SSE2SLOW)) {
+    if (EXTERNAL_SSE2(cpu_flags) && (cpu_flags & AV_CPU_FLAG_SSE2SLOW)) {
         VP8_LUMA_MC_FUNC(0, 16, sse2);
         VP8_MC_FUNC(1, 8, sse2);
         VP8_BILINEAR_MC_FUNC(0, 16, sse2);
@@ -397,7 +397,7 @@
         c->vp8_v_loop_filter8uv       = ff_vp8_v_loop_filter8uv_mbedge_sse2;
     }
 
-    if (mm_flags & AV_CPU_FLAG_SSE2) {
+    if (EXTERNAL_SSE2(cpu_flags)) {
         c->vp8_idct_dc_add4y          = ff_vp8_idct_dc_add4y_sse2;
 
         c->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter_simple_sse2;
@@ -409,7 +409,7 @@
         c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_sse2;
     }
 
-    if (mm_flags & AV_CPU_FLAG_SSSE3) {
+    if (EXTERNAL_SSSE3(cpu_flags)) {
         VP8_LUMA_MC_FUNC(0, 16, ssse3);
         VP8_MC_FUNC(1, 8, ssse3);
         VP8_MC_FUNC(2, 4, ssse3);
@@ -431,7 +431,7 @@
         c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_ssse3;
     }
 
-    if (mm_flags & AV_CPU_FLAG_SSE4) {
+    if (EXTERNAL_SSE4(cpu_flags)) {
         c->vp8_idct_dc_add                  = ff_vp8_idct_dc_add_sse4;
 
         c->vp8_h_loop_filter_simple   = ff_vp8_h_loop_filter_simple_sse4;

libav-v10.1.tar.bz2/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 Libav.
+;*
+;* Libav 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.
+;*
+;* Libav 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 Libav; 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

libav-v10.1.tar.bz2/libavcodec/x86/vp9dsp.asm Added

@@ -0,0 +1,277 @@
+;******************************************************************************
+;* VP9 SIMD optimizations
+;*
+;* Copyright (c) 2013 Ronald S. Bultje <rsbultje gmail com>
+;*
+;* This file is part of Libav.
+;*
+;* Libav 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.
+;*
+;* Libav 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 Libav; 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, src, dstride, 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, src, dstride, sstride, h, filtery, src4, sstride3
+%else
+cglobal %1_8tap_1d_v_ %+ %%px, 4, 7, 11, dst, src, dstride, 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, src, dstride, sstride, h, dstride3, sstride3
+ lea sstride3q, [sstrideq*3]
+ lea dstride3q, [dstrideq*3]
+%else
+cglobal %1%2, 5, 5, 4, dst, src, dstride, 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

libav-v10.1.tar.bz2/libavcodec/x86/vp9dsp_init.c Added

@@ -0,0 +1,246 @@
+/*
+ * VP9 SIMD optimizations
+ *
+ * Copyright (c) 2013 Ronald S. Bultje <rsbultje@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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/internal.h"
+#include "libavutil/mem.h"
+#include "libavutil/x86/asm.h"
+#include "libavutil/x86/cpu.h"
+#include "libavcodec/vp9.h"
+
+#if HAVE_YASM
+
+#define fpel_func(avg, sz, opt) \
+void ff_ ## avg ## sz ## _ ## opt(uint8_t *dst, const uint8_t *src, \
+ ptrdiff_t dst_stride, \
+ ptrdiff_t src_stride, \
+ int h, int mx, int my)
+
+fpel_func(put, 4, mmx);
+fpel_func(put, 8, mmx);
+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, 16, sse2);
+fpel_func(avg, 32, sse2);
+fpel_func(avg, 64, sse2);
+#undef fpel_func
+
+#define mc_func(avg, sz, dir, opt) \
+void \
+ff_ ## avg ## _8tap_1d_ ## dir ## _ ## sz ## _ ## opt(uint8_t *dst, \
+ const uint8_t *src, \
+ ptrdiff_t dst_stride, \
+ ptrdiff_t src_stride, \
+ int h, \
+ const int8_t (*filter)[16])
+
+#define mc_funcs(sz) \
+ mc_func(put, sz, h, ssse3); \
+ mc_func(avg, sz, h, ssse3); \
+ mc_func(put, sz, v, ssse3); \
+ mc_func(avg, sz, v, ssse3)
+
+mc_funcs(4);
+mc_funcs(8);
+
+#undef mc_funcs
+#undef mc_func
+
+#define mc_rep_func(avg, sz, hsz, dir, opt) \
+static av_always_inline void \
+ff_ ## avg ## _8tap_1d_ ## dir ## _ ## sz ## _ ## opt(uint8_t *dst, \
+ const uint8_t *src, \
+ ptrdiff_t dst_stride, \
+ ptrdiff_t src_stride, \
+ int h, \
+ const int8_t (*filter)[16]) \
+{ \
+ ff_ ## avg ## _8tap_1d_ ## dir ## _ ## hsz ## _ ## opt(dst, src, \
+ dst_stride, \
+ src_stride, \
+ h, \
+ filter); \
+ ff_ ## avg ## _8tap_1d_ ## dir ## _ ## hsz ## _ ## opt(dst + hsz, \
+ src + hsz, \
+ dst_stride, \
+ src_stride, \
+ h, filter); \
+}
+
+#define mc_rep_funcs(sz, hsz) \
+ mc_rep_func(put, sz, hsz, h, ssse3); \
+ mc_rep_func(avg, sz, hsz, h, ssse3); \
+ mc_rep_func(put, sz, hsz, v, ssse3); \
+ mc_rep_func(avg, sz, hsz, v, ssse3)
+
+mc_rep_funcs(16, 8);
+mc_rep_funcs(32, 16);
+mc_rep_funcs(64, 32);
+
+#undef mc_rep_funcs
+#undef mc_rep_func
+
+extern const int8_t ff_filters_ssse3[3][15][4][16];
+
+#define filter_8tap_2d_fn(op, sz, f, fname) \
+static void \
+op ## _8tap_ ## fname ## _ ## sz ## hv_ssse3(uint8_t *dst, \
+ const uint8_t *src, \
+ ptrdiff_t dst_stride, \
+ ptrdiff_t src_stride, \
+ int h, int mx, int my) \
+{ \
+ LOCAL_ALIGNED_16(uint8_t, temp, [71 * 64]); \
+ ff_put_8tap_1d_h_ ## sz ## _ssse3(temp, src - 3 * src_stride, \
+ 64, src_stride, \
+ h + 7, \
+ ff_filters_ssse3[f][mx - 1]); \
+ ff_ ## op ## _8tap_1d_v_ ## sz ## _ssse3(dst, temp + 3 * 64, \
+ dst_stride, 64, \
+ h, \
+ ff_filters_ssse3[f][my - 1]); \
+}
+
+#define filters_8tap_2d_fn(op, sz) \
+ filter_8tap_2d_fn(op, sz, FILTER_8TAP_REGULAR, regular) \
+ filter_8tap_2d_fn(op, sz, FILTER_8TAP_SHARP, sharp) \
+ filter_8tap_2d_fn(op, sz, FILTER_8TAP_SMOOTH, smooth)
+
+#define filters_8tap_2d_fn2(op) \
+ filters_8tap_2d_fn(op, 64) \
+ filters_8tap_2d_fn(op, 32) \
+ filters_8tap_2d_fn(op, 16) \
+ filters_8tap_2d_fn(op, 8) \
+ filters_8tap_2d_fn(op, 4)
+
+filters_8tap_2d_fn2(put)
+filters_8tap_2d_fn2(avg)
+
+#undef filters_8tap_2d_fn2
+#undef filters_8tap_2d_fn
+#undef filter_8tap_2d_fn
+
+#define filter_8tap_1d_fn(op, sz, f, fname, dir, dvar) \
+static void \
+op ## _8tap_ ## fname ## _ ## sz ## dir ## _ssse3(uint8_t *dst, \
+ const uint8_t *src, \
+ ptrdiff_t dst_stride, \
+ ptrdiff_t src_stride, \
+ int h, int mx, \
+ int my) \
+{ \
+ ff_ ## op ## _8tap_1d_ ## dir ## _ ## sz ## _ssse3(dst, src, \
+ dst_stride, \
+ src_stride, h, \
+ ff_filters_ssse3[f][dvar - 1]); \
+}
+
+#define filters_8tap_1d_fn(op, sz, dir, dvar) \
+ filter_8tap_1d_fn(op, sz, FILTER_8TAP_REGULAR, regular, dir, dvar) \
+ filter_8tap_1d_fn(op, sz, FILTER_8TAP_SHARP, sharp, dir, dvar) \
+ filter_8tap_1d_fn(op, sz, FILTER_8TAP_SMOOTH, smooth, dir, dvar)
+
+#define filters_8tap_1d_fn2(op, sz) \
+ filters_8tap_1d_fn(op, sz, h, mx) \
+ filters_8tap_1d_fn(op, sz, v, my)
+
+#define filters_8tap_1d_fn3(op) \
+ filters_8tap_1d_fn2(op, 64) \
+ filters_8tap_1d_fn2(op, 32) \
+ filters_8tap_1d_fn2(op, 16) \
+ filters_8tap_1d_fn2(op, 8) \
+ filters_8tap_1d_fn2(op, 4)
+
+filters_8tap_1d_fn3(put)
+filters_8tap_1d_fn3(avg)
+
+#undef filters_8tap_1d_fn
+#undef filters_8tap_1d_fn2
+#undef filters_8tap_1d_fn3
+#undef filter_8tap_1d_fn
+
+#endif /* HAVE_YASM */
+
+av_cold void ff_vp9dsp_init_x86(VP9DSPContext *dsp)
+{
+#if HAVE_YASM
+ int cpu_flags = av_get_cpu_flags();
+
+#define init_fpel(idx1, idx2, sz, type, opt) \
+ dsp->mc[idx1][FILTER_8TAP_SMOOTH ][idx2][0][0] = \
+ dsp->mc[idx1][FILTER_8TAP_REGULAR][idx2][0][0] = \
+ 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; \
+ dsp->mc[idx1][FILTER_8TAP_SHARP][idx2][idxh][idxv] = type ## _8tap_sharp_ ## sz ## dir ## _ ## opt
+
+#define init_subpel2(idx, idxh, idxv, dir, type, opt) \
+ init_subpel1(0, idx, idxh, idxv, 64, dir, type, opt); \
+ init_subpel1(1, idx, idxh, idxv, 32, dir, type, opt); \
+ init_subpel1(2, idx, idxh, idxv, 16, dir, type, opt); \
+ init_subpel1(3, idx, idxh, idxv, 8, dir, type, opt); \
+ init_subpel1(4, idx, idxh, idxv, 4, dir, type, opt)
+
+#define init_subpel3(idx, type, opt) \
+ init_subpel2(idx, 1, 1, hv, type, opt); \
+ init_subpel2(idx, 0, 1, v, type, opt); \
+ init_subpel2(idx, 1, 0, h, type, opt)
+
+ if (EXTERNAL_MMX(cpu_flags)) {
+ init_fpel(4, 0, 4, put, mmx);
+ init_fpel(3, 0, 8, put, mmx);
+ }
+
+ 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 (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);
+ }
+
+ if (EXTERNAL_SSSE3(cpu_flags)) {
+ init_subpel3(0, put, ssse3);
+ init_subpel3(1, avg, ssse3);
+ }
+
+#undef init_fpel
+#undef init_subpel1
+#undef init_subpel2
+#undef init_subpel3
+
+#endif /* HAVE_YASM */
+}

libav-v9.6.tar.bz2/libavcodec/x86/w64xmmtest.c -> libav-v10.1.tar.bz2/libavcodec/x86/w64xmmtest.c Changed

libav-v9.6.tar.bz2/libavcodec/xan.c -> libav-v10.1.tar.bz2/libavcodec/xan.c Changed

@@ -52,8 +52,7 @@
 typedef struct XanContext {
 
 AVCodecContext *avctx;
- AVFrame last_frame;
- AVFrame current_frame;
+ AVFrame *last_frame;
 
 const unsigned char *buf;
 int size;
@@ -72,6 +71,19 @@
 
 } XanContext;
 
+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)
 {
 XanContext *s = avctx->priv_data;
@@ -92,6 +104,12 @@
 return AVERROR(ENOMEM);
 }
 
+ s->last_frame = av_frame_alloc();
+ if (!s->last_frame) {
+ xan_decode_end(avctx);
+ return AVERROR(ENOMEM);
+ }
+
 return 0;
 }
 
@@ -104,6 +122,7 @@
 int ptr_len = src_len - 1 - byte*2;
 unsigned char val = ival;
 unsigned char *dest_end = dest + dest_len;
+ unsigned char *dest_start = dest;
 GetBitContext gb;
 
 if (ptr_len < 0)
@@ -114,18 +133,18 @@
 while (val != 0x16) {
 unsigned idx = val - 0x17 + get_bits1(&gb) * byte;
 if (idx >= 2 * byte)
- return -1;
+ return AVERROR_INVALIDDATA;
 val = src[idx];
 
 if (val < 0x16) {
 if (dest >= dest_end)
- return 0;
+ return dest_len;
 *dest++ = val;
 val = ival;
 }
 }
 
- return 0;
+ return dest - dest_start;
 }
 
 /**
@@ -140,51 +159,54 @@
 int size;
 unsigned char *dest_org = dest;
 unsigned char *dest_end = dest + dest_len;
- const unsigned char *src_end = src + src_len;
+ GetByteContext ctx;
 
- while (dest < dest_end && src < src_end) {
- opcode = *src++;
+ bytestream2_init(&ctx, src, src_len);
+ while (dest < dest_end && bytestream2_get_bytes_left(&ctx)) {
+ opcode = bytestream2_get_byte(&ctx);
 
 if (opcode < 0xe0) {
 int size2, back;
 if ((opcode & 0x80) == 0) {
 size = opcode & 3;
 
- back = ((opcode & 0x60) << 3) + *src++ + 1;
+ back = ((opcode & 0x60) << 3) + bytestream2_get_byte(&ctx) + 1;
 size2 = ((opcode & 0x1c) >> 2) + 3;
 } else if ((opcode & 0x40) == 0) {
- size = *src >> 6;
+ size = bytestream2_peek_byte(&ctx) >> 6;
 
- back = (bytestream_get_be16(&src) & 0x3fff) + 1;
+ back = (bytestream2_get_be16(&ctx) & 0x3fff) + 1;
 size2 = (opcode & 0x3f) + 4;
 } else {
 size = opcode & 3;
 
- back = ((opcode & 0x10) << 12) + bytestream_get_be16(&src) + 1;
- size2 = ((opcode & 0x0c) << 6) + *src++ + 5;
+ back = ((opcode & 0x10) << 12) + bytestream2_get_be16(&ctx) + 1;
+ size2 = ((opcode & 0x0c) << 6) + bytestream2_get_byte(&ctx) + 5;
 }
 
 if (dest_end - dest < size + size2 ||
 dest + size - dest_org < back ||
- src_end - src < size)
+ bytestream2_get_bytes_left(&ctx) < size)
 return;
- memcpy(dest, src, size); dest += size; src += size;
+ bytestream2_get_buffer(&ctx, dest, size);
+ dest += size;
 av_memcpy_backptr(dest, back, size2);
 dest += size2;
 } else {
 int finish = opcode >= 0xfc;
 size = finish ? opcode & 3 : ((opcode & 0x1f) << 2) + 4;
 
- if (dest_end - dest < size || src_end - src < size)
+ if (dest_end - dest < size || bytestream2_get_bytes_left(&ctx) < size)
 return;
- memcpy(dest, src, size); dest += size; src += size;
+ bytestream2_get_buffer(&ctx, dest, size);
+ dest += size;
 if (finish)
 return;
 }
 }
 }
 
-static inline void xan_wc3_output_pixel_run(XanContext *s,
+static inline void xan_wc3_output_pixel_run(XanContext *s, AVFrame *frame,
 const unsigned char *pixel_buffer, int x, int y, int pixel_count)
 {
 int stride;
@@ -194,8 +216,8 @@
 int width = s->avctx->width;
 unsigned char *palette_plane;
 
- palette_plane = s->current_frame.data[0];
- stride = s->current_frame.linesize[0];
+ palette_plane = frame->data[0];
+ stride = frame->linesize[0];
 line_inc = stride - width;
 index = y * stride + x;
 current_x = x;
@@ -214,7 +236,8 @@
 }
 }
 
-static inline void xan_wc3_copy_pixel_run(XanContext *s, int x, int y,
+static inline void xan_wc3_copy_pixel_run(XanContext *s, AVFrame *frame,
+ int x, int y,
 int pixel_count, int motion_x,
 int motion_y)
 {
@@ -229,11 +252,11 @@
 x + motion_x < 0 || x + motion_x >= s->avctx->width)
 return;
 
- palette_plane = s->current_frame.data[0];
- prev_palette_plane = s->last_frame.data[0];
+ palette_plane = frame->data[0];
+ prev_palette_plane = s->last_frame->data[0];
 if (!prev_palette_plane)
 prev_palette_plane = palette_plane;
- stride = s->current_frame.linesize[0];
+ stride = frame->linesize[0];
 line_inc = stride - width;
 curframe_index = y * stride + x;
 curframe_x = x;
@@ -265,7 +288,8 @@
 }
 }
 
-static int xan_wc3_decode_frame(XanContext *s) {
+static int xan_wc3_decode_frame(XanContext *s, AVFrame *frame)
+{
 
 int width = s->avctx->width;
 int height = s->avctx->height;
@@ -274,7 +298,7 @@
 unsigned char flag = 0;
 int size = 0;
 int motion_x, motion_y;
- int x, y;
+ int x, y, ret;
 
 unsigned char *opcode_buffer = s->buffer1;
 unsigned char *opcode_buffer_end = s->buffer1 + s->buffer1_size;
@@ -283,8 +307,8 @@
 
 /* pointers to segments inside the compressed chunk */
 const unsigned char *huffman_segment;
- const unsigned char *size_segment;
- const unsigned char *vector_segment;
+ GetByteContext size_segment;
+ GetByteContext vector_segment;
 const unsigned char *imagedata_segment;
 int huffman_offset, size_offset, vector_offset, imagedata_offset,
 imagedata_size;
@@ -304,13 +328,14 @@
 return AVERROR_INVALIDDATA;
 
 huffman_segment = s->buf + huffman_offset;
- size_segment = s->buf + size_offset;
- vector_segment = s->buf + vector_offset;
+ bytestream2_init(&size_segment, s->buf + size_offset, s->size - size_offset);
+ bytestream2_init(&vector_segment, s->buf + vector_offset, s->size - vector_offset);
 imagedata_segment = s->buf + imagedata_offset;
 
- if (xan_huffman_decode(opcode_buffer, opcode_buffer_size,
- huffman_segment, s->size - huffman_offset) < 0)
+ if ((ret = xan_huffman_decode(opcode_buffer, opcode_buffer_size,
+ huffman_segment, s->size - huffman_offset)) < 0)
 return AVERROR_INVALIDDATA;
+ opcode_buffer_end = opcode_buffer + ret;
 
 if (imagedata_segment[0] == 2) {
 xan_unpack(s->buffer2, s->buffer2_size,
@@ -357,19 +382,17 @@
 
 case 9:
 case 19:
- size = *size_segment++;
+ size = bytestream2_get_byte(&size_segment);
 break;
 
 case 10:
 case 20:
- size = AV_RB16(&size_segment[0]);
- size_segment += 2;
+ size = bytestream2_get_be16(&size_segment);
 break;
 
 case 11:
 case 21:
- size = AV_RB24(size_segment);
- size_segment += 3;
+ size = bytestream2_get_be24(&size_segment);
 break;
 }
 
@@ -380,23 +403,23 @@
 flag ^= 1;
 if (flag) {
 /* run of (size) pixels is unchanged from last frame */
- xan_wc3_copy_pixel_run(s, x, y, size, 0, 0);
+ xan_wc3_copy_pixel_run(s, frame, x, y, size, 0, 0);
 } else {
 /* output a run of pixels from imagedata_buffer */
 if (imagedata_size < size)
 break;
- xan_wc3_output_pixel_run(s, imagedata_buffer, x, y, size);
+ xan_wc3_output_pixel_run(s, frame, imagedata_buffer, x, y, size);
 imagedata_buffer += size;
 imagedata_size -= size;
 }
 } else {
 /* run-based motion compensation from last frame */
- motion_x = sign_extend(*vector_segment >> 4, 4);
- motion_y = sign_extend(*vector_segment & 0xF, 4);
- vector_segment++;
+ uint8_t vector = bytestream2_get_byte(&vector_segment);
+ motion_x = sign_extend(vector >> 4, 4);
+ motion_y = sign_extend(vector & 0xF, 4);
 
 /* copy a run of pixels from the previous frame */
- xan_wc3_copy_pixel_run(s, x, y, size, motion_x, motion_y);
+ xan_wc3_copy_pixel_run(s, frame, x, y, size, motion_x, motion_y);
 
 flag = 0;
 }
@@ -496,20 +519,22 @@
 void *data, int *got_frame,
 AVPacket *avpkt)
 {
+ AVFrame *frame = data;
 const uint8_t *buf = avpkt->data;
 int ret, buf_size = avpkt->size;
 XanContext *s = avctx->priv_data;
- const uint8_t *buf_end = buf + buf_size;
+ GetByteContext ctx;
 int tag = 0;
 
- while (buf_end - buf > 8 && tag != VGA__TAG) {
+ bytestream2_init(&ctx, buf, buf_size);
+ while (bytestream2_get_bytes_left(&ctx) > 8 && tag != VGA__TAG) {
 unsigned *tmpptr;
 uint32_t new_pal;
 int size;
 int i;
- tag = bytestream_get_le32(&buf);
- size = bytestream_get_be32(&buf);
- size = FFMIN(size, buf_end - buf);
+ tag = bytestream2_get_le32(&ctx);
+ size = bytestream2_get_be32(&ctx);
+ size = FFMIN(size, bytestream2_get_bytes_left(&ctx));
 switch (tag) {
 case PALT_TAG:
 if (size < PALETTE_SIZE)
@@ -524,13 +549,13 @@
 tmpptr += s->palettes_count * AVPALETTE_COUNT;
 for (i = 0; i < PALETTE_COUNT; i++) {
 #if RUNTIME_GAMMA
- int r = gamma_corr(*buf++);
- int g = gamma_corr(*buf++);
- int b = gamma_corr(*buf++);
+ int r = gamma_corr(bytestream2_get_byteu(&ctx));
+ int g = gamma_corr(bytestream2_get_byteu(&ctx));
+ int b = gamma_corr(bytestream2_get_byteu(&ctx));
 #else
- int r = gamma_lookup[*buf++];
- int g = gamma_lookup[*buf++];
- int b = gamma_lookup[*buf++];
+ int r = gamma_lookup[bytestream2_get_byteu(&ctx)];
+ int g = gamma_lookup[bytestream2_get_byteu(&ctx)];
+ int b = gamma_lookup[bytestream2_get_byteu(&ctx)];
 #endif
 *tmpptr++ = (r << 16) | (g << 8) | b;
 }
@@ -539,7 +564,7 @@
 case SHOT_TAG:
 if (size < 4)
 return AVERROR_INVALIDDATA;
- new_pal = bytestream_get_le32(&buf);
+ new_pal = bytestream2_get_le32(&ctx);
 if (new_pal < s->palettes_count) {
 s->cur_palette = new_pal;
 } else
@@ -548,68 +573,47 @@
 case VGA__TAG:
 break;
 default:
- buf += size;
+ bytestream2_skip(&ctx, size);
 break;
 }
 }
- buf_size = buf_end - buf;
+ buf_size = bytestream2_get_bytes_left(&ctx);
 
 if (s->palettes_count <= 0) {
 av_log(s->avctx, AV_LOG_ERROR, "No palette found\n");
 return AVERROR_INVALIDDATA;
 }
 
- if ((ret = ff_get_buffer(avctx, &s->current_frame))) {
+ if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF))) {
 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
- s->current_frame.reference = 3;
 
 if (!s->frame_size)
- s->frame_size = s->current_frame.linesize[0] * s->avctx->height;
+ s->frame_size = frame->linesize[0] * s->avctx->height;
 
- memcpy(s->current_frame.data[1],
+ memcpy(frame->data[1],
 s->palettes + s->cur_palette * AVPALETTE_COUNT, AVPALETTE_SIZE);
 
- s->buf = buf;
+ s->buf = ctx.buffer;
 s->size = buf_size;
 
- if (xan_wc3_decode_frame(s) < 0)
+ if (xan_wc3_decode_frame(s, frame) < 0)
 return AVERROR_INVALIDDATA;
 
- /* release the last frame if it is allocated */
- if (s->last_frame.data[0])
- avctx->release_buffer(avctx, &s->last_frame);
+ av_frame_unref(s->last_frame);
+ if ((ret = av_frame_ref(s->last_frame, frame)) < 0)
+ return ret;
 
 *got_frame = 1;
- *(AVFrame*)data = s->current_frame;
-
- /* shuffle frames */
- FFSWAP(AVFrame, s->current_frame, s->last_frame);
 
 /* always report that the buffer was completely consumed */
 return buf_size;
 }
 
-static av_cold int xan_decode_end(AVCodecContext *avctx)
-{
- XanContext *s = avctx->priv_data;
-
- /* release the frames */
- if (s->last_frame.data[0])
- avctx->release_buffer(avctx, &s->last_frame);
- if (s->current_frame.data[0])
- avctx->release_buffer(avctx, &s->current_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"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_XAN_WC3,
 .priv_data_size = sizeof(XanContext),
@@ -617,5 +621,4 @@
 .close = xan_decode_end,
 .decode = xan_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Wing Commander III / Xan"),
 };

libav-v9.6.tar.bz2/libavcodec/xbmenc.c -> libav-v10.1.tar.bz2/libavcodec/xbmenc.c Changed

libav-v9.6.tar.bz2/libavcodec/xl.c -> libav-v10.1.tar.bz2/libavcodec/xl.c Changed

@@ -29,80 +29,76 @@
 #include "avcodec.h"
 #include "internal.h"
 
-typedef struct VideoXLContext{
- AVCodecContext *avctx;
- AVFrame pic;
-} VideoXLContext;
-
 static const int xl_table[32] = {
 0, 1, 2, 3, 4, 5, 6, 7,
 8, 9, 12, 15, 20, 25, 34, 46,
 64, 82, 94, 103, 108, 113, 116, 119,
- 120, 121, 122, 123, 124, 125, 126, 127};
+ 120, 121, 122, 123, 124, 125, 126, 127
+};
 
 static int decode_frame(AVCodecContext *avctx,
 void *data, int *got_frame,
 AVPacket *avpkt)
 {
 const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- VideoXLContext * const a = avctx->priv_data;
- AVFrame * const p = &a->pic;
+ int buf_size = avpkt->size;
+ AVFrame *const p = data;
 uint8_t *Y, *U, *V;
- int i, j;
+ int i, j, ret;
 int stride;
 uint32_t val;
 int y0, y1, y2, y3 = 0, c0 = 0, c1 = 0;
 
- if(p->data[0])
- avctx->release_buffer(avctx, p);
-
- p->reference = 0;
- if(ff_get_buffer(avctx, p) < 0){
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ if (avctx->width % 4) {
+ av_log(avctx, AV_LOG_ERROR, "Width not a multiple of 4.\n");
+ return AVERROR_INVALIDDATA;
 }
- p->pict_type= AV_PICTURE_TYPE_I;
- p->key_frame= 1;
-
- Y = a->pic.data[0];
- U = a->pic.data[1];
- V = a->pic.data[2];
-
- stride = avctx->width - 4;
 
 if (buf_size < avctx->width * avctx->height) {
 av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");
 return AVERROR_INVALIDDATA;
 }
 
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
+ }
+ p->pict_type = AV_PICTURE_TYPE_I;
+ p->key_frame = 1;
+
+ Y = p->data[0];
+ U = p->data[1];
+ V = p->data[2];
+
+ stride = avctx->width - 4;
+
 for (i = 0; i < avctx->height; i++) {
 /* lines are stored in reversed order */
 buf += stride;
 
 for (j = 0; j < avctx->width; j += 4) {
 /* value is stored in LE dword with word swapped */
- val = AV_RL32(buf);
+ val = AV_RL32(buf);
 buf -= 4;
- val = ((val >> 16) & 0xFFFF) | ((val & 0xFFFF) << 16);
+ val = ((val >> 16) & 0xFFFF) | ((val & 0xFFFF) << 16);
 
- if(!j)
+ if (!j)
 y0 = (val & 0x1F) << 2;
 else
 y0 = y3 + xl_table[val & 0x1F];
 val >>= 5;
- y1 = y0 + xl_table[val & 0x1F];
+ y1 = y0 + xl_table[val & 0x1F];
 val >>= 5;
- y2 = y1 + xl_table[val & 0x1F];
+ y2 = y1 + xl_table[val & 0x1F];
 val >>= 6; /* align to word */
- y3 = y2 + xl_table[val & 0x1F];
+ y3 = y2 + xl_table[val & 0x1F];
 val >>= 5;
- if(!j)
+ if (!j)
 c0 = (val & 0x1F) << 2;
 else
 c0 += xl_table[val & 0x1F];
 val >>= 5;
- if(!j)
+ if (!j)
 c1 = (val & 0x1F) << 2;
 else
 c1 += xl_table[val & 0x1F];
@@ -117,43 +113,29 @@
 }
 
 buf += avctx->width + 4;
- Y += a->pic.linesize[0];
- U += a->pic.linesize[1];
- V += a->pic.linesize[2];
+ Y += p->linesize[0];
+ U += p->linesize[1];
+ V += p->linesize[2];
 }
 
 *got_frame = 1;
- *(AVFrame*)data = a->pic;
 
 return buf_size;
 }
 
-static av_cold int decode_init(AVCodecContext *avctx){
-// VideoXLContext * const a = avctx->priv_data;
-
- avctx->pix_fmt= AV_PIX_FMT_YUV411P;
-
- return 0;
-}
-
-static av_cold int decode_end(AVCodecContext *avctx){
- VideoXLContext * const a = avctx->priv_data;
- AVFrame *pic = &a->pic;
-
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
+static av_cold int decode_init(AVCodecContext *avctx)
+{
+ avctx->pix_fmt = AV_PIX_FMT_YUV411P;
 
 return 0;
 }
 
 AVCodec ff_xl_decoder = {
- .name = "xl",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_VIXL,
- .priv_data_size = sizeof(VideoXLContext),
- .init = decode_init,
- .close = decode_end,
- .decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"),
+ .name = "xl",
+ .long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_VIXL,
+ .init = decode_init,
+ .decode = decode_frame,
+ .capabilities = CODEC_CAP_DR1,
 };

libav-v9.6.tar.bz2/libavcodec/xsubdec.c -> libav-v10.1.tar.bz2/libavcodec/xsubdec.c Changed

libav-v9.6.tar.bz2/libavcodec/xsubenc.c -> libav-v10.1.tar.bz2/libavcodec/xsubenc.c Changed

libav-v9.6.tar.bz2/libavcodec/xvmc.h -> libav-v10.1.tar.bz2/libavcodec/xvmc.h Changed

libav-v9.6.tar.bz2/libavcodec/xvmc_internal.h -> libav-v10.1.tar.bz2/libavcodec/xvmc_internal.h Changed

libav-v9.6.tar.bz2/libavcodec/xwddec.c -> libav-v10.1.tar.bz2/libavcodec/xwddec.c Changed

@@ -26,19 +26,10 @@
 #include "internal.h"
 #include "xwd.h"
 
-static av_cold int xwd_decode_init(AVCodecContext *avctx)
-{
- avctx->coded_frame = avcodec_alloc_frame();
- if (!avctx->coded_frame)
- return AVERROR(ENOMEM);
-
- return 0;
-}
-
 static int xwd_decode_frame(AVCodecContext *avctx, void *data,
 int *got_frame, AVPacket *avpkt)
 {
- AVFrame *p = avctx->coded_frame;
+ AVFrame *p = data;
 const uint8_t *buf = avpkt->data;
 int i, ret, buf_size = avpkt->size;
 uint32_t version, header_size, vclass, ncolors;
@@ -101,7 +92,7 @@
 }
 
 if (xoffset) {
- av_log_ask_for_sample(avctx, "unsupported xoffset %d\n", xoffset);
+ avpriv_request_sample(avctx, "xoffset %d", xoffset);
 return AVERROR_PATCHWELCOME;
 }
 
@@ -201,15 +192,13 @@
 }
 
 if (avctx->pix_fmt == AV_PIX_FMT_NONE) {
- av_log_ask_for_sample(avctx, "unknown file: bpp %d, pixdepth %d, vclass %d\n", bpp, pixdepth, vclass);
+ avpriv_request_sample(avctx,
+ "Unknown file: bpp %d, pixdepth %d, vclass %d",
+ bpp, pixdepth, vclass);
 return AVERROR_PATCHWELCOME;
 }
 
- if (p->data[0])
- avctx->release_buffer(avctx, p);
-
- p->reference = 0;
- if ((ret = ff_get_buffer(avctx, p)) < 0) {
+ if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -243,28 +232,15 @@
 }
 
 *got_frame = 1;
- *(AVFrame *)data = *p;
 
 return buf_size;
 }
 
-static av_cold int xwd_decode_close(AVCodecContext *avctx)
-{
- if (avctx->coded_frame->data[0])
- avctx->release_buffer(avctx, avctx->coded_frame);
-
- av_freep(&avctx->coded_frame);
-
- return 0;
-}
-
 AVCodec ff_xwd_decoder = {
 .name = "xwd",
+ .long_name = NULL_IF_CONFIG_SMALL("XWD (X Window Dump) image"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_XWD,
- .init = xwd_decode_init,
- .close = xwd_decode_close,
 .decode = xwd_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("XWD (X Window Dump) image"),
 };

libav-v9.6.tar.bz2/libavcodec/xwdenc.c -> libav-v10.1.tar.bz2/libavcodec/xwdenc.c Changed

@@ -32,7 +32,7 @@
 
 static av_cold int xwd_encode_init(AVCodecContext *avctx)
 {
-    avctx->coded_frame = avcodec_alloc_frame();
+    avctx->coded_frame = av_frame_alloc();
     if (!avctx->coded_frame)
         return AVERROR(ENOMEM);
 
@@ -51,7 +51,7 @@
     uint8_t *ptr, *buf;
 
     pixdepth = av_get_bits_per_pixel(desc);
-    if (desc->flags & PIX_FMT_BE)
+    if (desc->flags & AV_PIX_FMT_FLAG_BE)
         be = 1;
     switch (pix_fmt) {
     case AV_PIX_FMT_ARGB:
@@ -222,6 +222,7 @@
 
 AVCodec ff_xwd_encoder = {
     .name         = "xwd",
+    .long_name    = NULL_IF_CONFIG_SMALL("XWD (X Window Dump) image"),
     .type         = AVMEDIA_TYPE_VIDEO,
     .id           = AV_CODEC_ID_XWD,
     .init         = xwd_encode_init,
@@ -248,5 +249,4 @@
                                                  AV_PIX_FMT_PAL8,
                                                  AV_PIX_FMT_MONOWHITE,
                                                  AV_PIX_FMT_NONE },
-    .long_name    = NULL_IF_CONFIG_SMALL("XWD (X Window Dump) image"),
 };

libav-v9.6.tar.bz2/libavcodec/xxan.c -> libav-v10.1.tar.bz2/libavcodec/xxan.c Changed

@@ -26,10 +26,11 @@
 #include "bytestream.h"
 #define BITSTREAM_READER_LE
 #include "get_bits.h"
+#include "internal.h"
 
 typedef struct XanContext {
 AVCodecContext *avctx;
- AVFrame pic;
+ AVFrame *pic;
 
 uint8_t *y_buffer;
 uint8_t *scratch_buffer;
@@ -37,6 +38,18 @@
 GetByteContext gb;
 } XanContext;
 
+static av_cold int xan_decode_end(AVCodecContext *avctx)
+{
+ XanContext *s = avctx->priv_data;
+
+ av_frame_free(&s->pic);
+
+ av_freep(&s->y_buffer);
+ av_freep(&s->scratch_buffer);
+
+ return 0;
+}
+
 static av_cold int xan_decode_init(AVCodecContext *avctx)
 {
 XanContext *s = avctx->priv_data;
@@ -49,6 +62,10 @@
 av_log(avctx, AV_LOG_ERROR, "Invalid frame height: %d.\n", avctx->height);
 return AVERROR(EINVAL);
 }
+ if (avctx->width & 1) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid frame width: %d.\n", avctx->width);
+ return AVERROR(EINVAL);
+ }
 
 s->buffer_size = avctx->width * avctx->height;
 s->y_buffer = av_malloc(s->buffer_size);
@@ -60,6 +77,12 @@
 return AVERROR(ENOMEM);
 }
 
+ s->pic = av_frame_alloc();
+ if (!s->pic) {
+ xan_decode_end(avctx);
+ return AVERROR(ENOMEM);
+ }
+
 return 0;
 }
 
@@ -138,7 +161,7 @@
 }
 if (dest + size + size2 > dest_end ||
 dest - orig_dest + size < back)
- return -1;
+ return AVERROR_INVALIDDATA;
 bytestream2_get_buffer(&s->gb, dest, size);
 dest += size;
 av_memcpy_backptr(dest, back, size2);
@@ -148,7 +171,7 @@
 
 size = finish ? opcode & 3 : ((opcode & 0x1f) << 2) + 4;
 if (dest_end - dest < size)
- return -1;
+ return AVERROR_INVALIDDATA;
 bytestream2_get_buffer(&s->gb, dest, size);
 dest += size;
 if (finish)
@@ -172,7 +195,7 @@
 return 0;
 if (chroma_off + 4 >= bytestream2_get_bytes_left(&s->gb)) {
 av_log(avctx, AV_LOG_ERROR, "Invalid chroma block position\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 bytestream2_seek(&s->gb, chroma_off + 4, SEEK_SET);
 mode = bytestream2_get_le16(&s->gb);
@@ -183,7 +206,7 @@
 
 if (offset >= bytestream2_get_bytes_left(&s->gb)) {
 av_log(avctx, AV_LOG_ERROR, "Invalid chroma block offset\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 bytestream2_skip(&s->gb, offset);
@@ -191,11 +214,11 @@
 dec_size = xan_unpack(s, s->scratch_buffer, s->buffer_size);
 if (dec_size < 0) {
 av_log(avctx, AV_LOG_ERROR, "Chroma unpacking failed\n");
- return -1;
+ return dec_size;
 }
 
- U = s->pic.data[1];
- V = s->pic.data[2];
+ U = s->pic->data[1];
+ V = s->pic->data[2];
 src = s->scratch_buffer;
 src_end = src + dec_size;
 if (mode) {
@@ -212,16 +235,16 @@
 if (src == src_end)
 return 0;
 }
- U += s->pic.linesize[1];
- V += s->pic.linesize[2];
+ U += s->pic->linesize[1];
+ V += s->pic->linesize[2];
 }
 if (avctx->height & 1) {
- memcpy(U, U - s->pic.linesize[1], avctx->width >> 1);
- memcpy(V, V - s->pic.linesize[2], avctx->width >> 1);
+ memcpy(U, U - s->pic->linesize[1], avctx->width >> 1);
+ memcpy(V, V - s->pic->linesize[2], avctx->width >> 1);
 }
 } else {
- uint8_t *U2 = U + s->pic.linesize[1];
- uint8_t *V2 = V + s->pic.linesize[2];
+ uint8_t *U2 = U + s->pic->linesize[1];
+ uint8_t *V2 = V + s->pic->linesize[2];
 
 for (j = 0; j < avctx->height >> 2; j++) {
 for (i = 0; i < avctx->width >> 1; i += 2) {
@@ -234,16 +257,16 @@
 V[i] = V[i+1] = V2[i] = V2[i+1] = vval | (vval >> 5);
 }
 }
- U += s->pic.linesize[1] * 2;
- V += s->pic.linesize[2] * 2;
- U2 += s->pic.linesize[1] * 2;
- V2 += s->pic.linesize[2] * 2;
+ U += s->pic->linesize[1] * 2;
+ V += s->pic->linesize[2] * 2;
+ U2 += s->pic->linesize[1] * 2;
+ V2 += s->pic->linesize[2] * 2;
 }
 if (avctx->height & 3) {
 int lines = ((avctx->height + 1) >> 1) - (avctx->height >> 2) * 2;
 
- memcpy(U, U - lines * s->pic.linesize[1], lines * s->pic.linesize[1]);
- memcpy(V, V - lines * s->pic.linesize[2], lines * s->pic.linesize[2]);
+ memcpy(U, U - lines * s->pic->linesize[1], lines * s->pic->linesize[1]);
+ memcpy(V, V - lines * s->pic->linesize[2], lines * s->pic->linesize[2]);
 }
 }
 
@@ -315,12 +338,12 @@
 }
 
 src = s->y_buffer;
- ybuf = s->pic.data[0];
+ ybuf = s->pic->data[0];
 for (j = 0; j < avctx->height; j++) {
 for (i = 0; i < avctx->width; i++)
 ybuf[i] = (src[i] << 2) | (src[i] >> 3);
 src += avctx->width;
- ybuf += s->pic.linesize[0];
+ ybuf += s->pic->linesize[0];
 }
 
 return 0;
@@ -360,12 +383,12 @@
 }
 
 src = s->y_buffer;
- ybuf = s->pic.data[0];
+ ybuf = s->pic->data[0];
 for (j = 0; j < avctx->height; j++) {
 for (i = 0; i < avctx->width; i++)
 ybuf[i] = (src[i] << 2) | (src[i] >> 3);
 src += avctx->width;
- ybuf += s->pic.linesize[0];
+ ybuf += s->pic->linesize[0];
 }
 
 return 0;
@@ -379,11 +402,7 @@
 int ftype;
 int ret;
 
- s->pic.reference = 1;
- s->pic.buffer_hints = FF_BUFFER_HINTS_VALID |
- FF_BUFFER_HINTS_PRESERVE |
- FF_BUFFER_HINTS_REUSABLE;
- if ((ret = avctx->reget_buffer(avctx, &s->pic))) {
+ if ((ret = ff_reget_buffer(avctx, s->pic))) {
 av_log(s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
 return ret;
 }
@@ -399,32 +418,22 @@
 break;
 default:
 av_log(avctx, AV_LOG_ERROR, "Unknown frame type %d\n", ftype);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 if (ret)
 return ret;
 
+ if ((ret = av_frame_ref(data, s->pic)) < 0)
+ return ret;
+
 *got_frame = 1;
- *(AVFrame*)data = s->pic;
 
 return avpkt->size;
 }
 
-static av_cold int xan_decode_end(AVCodecContext *avctx)
-{
- XanContext *s = avctx->priv_data;
-
- if (s->pic.data[0])
- avctx->release_buffer(avctx, &s->pic);
-
- av_freep(&s->y_buffer);
- av_freep(&s->scratch_buffer);
-
- return 0;
-}
-
 AVCodec ff_xan_wc4_decoder = {
 .name = "xan_wc4",
+ .long_name = NULL_IF_CONFIG_SMALL("Wing Commander IV / Xxan"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_XAN_WC4,
 .priv_data_size = sizeof(XanContext),
@@ -432,5 +441,4 @@
 .close = xan_decode_end,
 .decode = xan_decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Wing Commander IV / Xxan"),
 };

libav-v9.6.tar.bz2/libavcodec/yop.c -> libav-v10.1.tar.bz2/libavcodec/yop.c Changed

@@ -30,7 +30,6 @@
 #include "internal.h"
 
 typedef struct YopDecContext {
- AVFrame frame;
 AVCodecContext *avctx;
 
 int num_pal_colors;
@@ -87,7 +86,7 @@
 if (avctx->width & 1 || avctx->height & 1 ||
 av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0) {
 av_log(avctx, AV_LOG_ERROR, "YOP has invalid dimensions\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 if (avctx->extradata_size < 3) {
@@ -111,30 +110,22 @@
 return 0;
 }
 
-static av_cold int yop_decode_close(AVCodecContext *avctx)
-{
- YopDecContext *s = avctx->priv_data;
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
- return 0;
-}
-
 /**
 * Paint a macroblock using the pattern in paint_lut.
 * @param s codec context
 * @param tag the tag that was in the nibble
 */
-static int yop_paint_block(YopDecContext *s, int tag)
+static int yop_paint_block(YopDecContext *s, int linesize, int tag)
 {
 if (s->src_end - s->srcptr < paint_lut[tag][3]) {
 av_log(s->avctx, AV_LOG_ERROR, "Packet too small.\n");
 return AVERROR_INVALIDDATA;
 }
 
- s->dstptr[0] = s->srcptr[0];
- s->dstptr[1] = s->srcptr[paint_lut[tag][0]];
- s->dstptr[s->frame.linesize[0]] = s->srcptr[paint_lut[tag][1]];
- s->dstptr[s->frame.linesize[0] + 1] = s->srcptr[paint_lut[tag][2]];
+ s->dstptr[0] = s->srcptr[0];
+ s->dstptr[1] = s->srcptr[paint_lut[tag][0]];
+ s->dstptr[linesize] = s->srcptr[paint_lut[tag][1]];
+ s->dstptr[linesize + 1] = s->srcptr[paint_lut[tag][2]];
 
 // The number of src bytes consumed is in the last part of the lut entry.
 s->srcptr += paint_lut[tag][3];
@@ -145,23 +136,23 @@
 * Copy a previously painted macroblock to the current_block.
 * @param copy_tag the tag that was in the nibble
 */
-static int yop_copy_previous_block(YopDecContext *s, int copy_tag)
+static int yop_copy_previous_block(YopDecContext *s, int linesize, int copy_tag)
 {
 uint8_t *bufptr;
 
 // Calculate position for the copy source
 bufptr = s->dstptr + motion_vector[copy_tag][0] +
- s->frame.linesize[0] * motion_vector[copy_tag][1];
+ linesize * motion_vector[copy_tag][1];
 if (bufptr < s->dstbuf) {
 av_log(s->avctx, AV_LOG_ERROR,
 "YOP: cannot decode, file probably corrupt\n");
 return AVERROR_INVALIDDATA;
 }
 
- s->dstptr[0] = bufptr[0];
- s->dstptr[1] = bufptr[1];
- s->dstptr[s->frame.linesize[0]] = bufptr[s->frame.linesize[0]];
- s->dstptr[s->frame.linesize[0] + 1] = bufptr[s->frame.linesize[0] + 1];
+ s->dstptr[0] = bufptr[0];
+ s->dstptr[1] = bufptr[1];
+ s->dstptr[linesize] = bufptr[linesize];
+ s->dstptr[linesize + 1] = bufptr[linesize + 1];
 
 return 0;
 }
@@ -188,6 +179,7 @@
 AVPacket *avpkt)
 {
 YopDecContext *s = avctx->priv_data;
+ AVFrame *frame = data;
 int tag, firstcolor, is_odd_frame;
 int ret, i, x, y;
 uint32_t *palette;
@@ -197,31 +189,31 @@
 return AVERROR_INVALIDDATA;
 }
 
- if (s->frame.data[0])
- avctx->release_buffer(avctx, &s->frame);
-
- ret = ff_get_buffer(avctx, &s->frame);
+ ret = ff_get_buffer(avctx, frame, 0);
 if (ret < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
 
- s->dstbuf = s->frame.data[0];
- s->dstptr = s->frame.data[0];
+ if (!avctx->frame_number)
+ memset(frame->data[1], 0, AVPALETTE_SIZE);
+
+ s->dstbuf = frame->data[0];
+ s->dstptr = frame->data[0];
 s->srcptr = avpkt->data + 4;
 s->src_end = avpkt->data + avpkt->size;
 s->low_nibble = NULL;
 
 is_odd_frame = avpkt->data[0];
 firstcolor = s->first_color[is_odd_frame];
- palette = (uint32_t *)s->frame.data[1];
+ palette = (uint32_t *)frame->data[1];
 
 for (i = 0; i < s->num_pal_colors; i++, s->srcptr += 3)
 palette[i + firstcolor] = (s->srcptr[0] << 18) |
 (s->srcptr[1] << 10) |
 (s->srcptr[2] << 2);
 
- s->frame.palette_has_changed = 1;
+ frame->palette_has_changed = 1;
 
 for (y = 0; y < avctx->height; y += 2) {
 for (x = 0; x < avctx->width; x += 2) {
@@ -233,35 +225,31 @@
 tag = yop_get_next_nibble(s);
 
 if (tag != 0xf) {
- ret = yop_paint_block(s, tag);
+ ret = yop_paint_block(s, frame->linesize[0], tag);
 if (ret < 0)
 return ret;
 } else {
 tag = yop_get_next_nibble(s);
- ret = yop_copy_previous_block(s, tag);
- if (ret < 0) {
- avctx->release_buffer(avctx, &s->frame);
+ ret = yop_copy_previous_block(s, frame->linesize[0], tag);
+ if (ret < 0)
 return ret;
- }
 }
 s->dstptr += 2;
 }
- s->dstptr += 2*s->frame.linesize[0] - x;
+ s->dstptr += 2*frame->linesize[0] - x;
 }
 
 *got_frame = 1;
- *(AVFrame *) data = s->frame;
 return avpkt->size;
 }
 
 AVCodec ff_yop_decoder = {
 .name = "yop",
+ .long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_YOP,
 .priv_data_size = sizeof(YopDecContext),
 .init = yop_decode_init,
- .close = yop_decode_close,
 .decode = yop_decode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Video"),
 .capabilities = CODEC_CAP_DR1,
 };

libav-v9.6.tar.bz2/libavcodec/zerocodec.c -> libav-v10.1.tar.bz2/libavcodec/zerocodec.c Changed

@@ -23,7 +23,7 @@
 #include "libavutil/common.h"
 
 typedef struct {
- AVFrame previous_frame;
+ AVFrame *previous_frame;
 z_stream zstream;
 } ZeroCodecContext;
 
@@ -31,14 +31,12 @@
 int *got_frame, AVPacket *avpkt)
 {
 ZeroCodecContext *zc = avctx->priv_data;
- AVFrame *pic = avctx->coded_frame;
- AVFrame *prev_pic = &zc->previous_frame;
+ AVFrame *pic = data;
+ AVFrame *prev_pic = zc->previous_frame;
 z_stream *zstream = &zc->zstream;
 uint8_t *prev = prev_pic->data[0];
 uint8_t *dst;
- int i, j, zret;
-
- pic->reference = 3;
+ int i, j, zret, ret;
 
 if (avpkt->flags & AV_PKT_FLAG_KEY) {
 pic->key_frame = 1;
@@ -61,7 +59,7 @@
 return AVERROR_INVALIDDATA;
 }
 
- if (ff_get_buffer(avctx, pic) < 0) {
+ if (ff_get_buffer(avctx, pic, AV_GET_BUFFER_FLAG_REF) < 0) {
 av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
 return AVERROR(ENOMEM);
 }
@@ -82,7 +80,6 @@
 
 zret = inflate(zstream, Z_SYNC_FLUSH);
 if (zret != Z_OK && zret != Z_STREAM_END) {
- avctx->release_buffer(avctx, pic);
 av_log(avctx, AV_LOG_ERROR,
 "Inflate failed with return code: %d.\n", zret);
 return AVERROR_INVALIDDATA;
@@ -96,16 +93,11 @@
 dst -= pic->linesize[0];
 }
 
- /* Release the previous buffer if need be */
- if (prev_pic->data[0])
- avctx->release_buffer(avctx, prev_pic);
+ av_frame_unref(zc->previous_frame);
+ if ((ret = av_frame_ref(zc->previous_frame, pic)) < 0)
+ return ret;
 
 *got_frame = 1;
- *(AVFrame *)data = *pic;
-
- /* Store the previous frame for use later.
- * FFSWAP ensures that e.g. pic->data is NULLed. */
- FFSWAP(AVFrame, *pic, *prev_pic);
 
 return avpkt->size;
 }
@@ -113,15 +105,10 @@
 static av_cold int zerocodec_decode_close(AVCodecContext *avctx)
 {
 ZeroCodecContext *zc = avctx->priv_data;
- AVFrame *prev_pic = &zc->previous_frame;
-
- inflateEnd(&zc->zstream);
 
- /* Release last frame */
- if (prev_pic->data[0])
- avctx->release_buffer(avctx, prev_pic);
+ av_frame_free(&zc->previous_frame);
 
- av_freep(&avctx->coded_frame);
+ inflateEnd(&zc->zstream);
 
 return 0;
 }
@@ -145,9 +132,8 @@
 return AVERROR(ENOMEM);
 }
 
- avctx->coded_frame = avcodec_alloc_frame();
- if (!avctx->coded_frame) {
- av_log(avctx, AV_LOG_ERROR, "Could not allocate frame buffer.\n");
+ zc->previous_frame = av_frame_alloc();
+ if (!zc->previous_frame) {
 zerocodec_decode_close(avctx);
 return AVERROR(ENOMEM);
 }
@@ -158,11 +144,11 @@
 AVCodec ff_zerocodec_decoder = {
 .type = AVMEDIA_TYPE_VIDEO,
 .name = "zerocodec",
+ .long_name = NULL_IF_CONFIG_SMALL("ZeroCodec Lossless Video"),
 .id = AV_CODEC_ID_ZEROCODEC,
 .priv_data_size = sizeof(ZeroCodecContext),
 .init = zerocodec_decode_init,
 .decode = zerocodec_decode_frame,
 .close = zerocodec_decode_close,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("ZeroCodec Lossless Video"),
 };

libav-v9.6.tar.bz2/libavcodec/zmbv.c -> libav-v10.1.tar.bz2/libavcodec/zmbv.c Changed

@@ -54,7 +54,6 @@
 */
 typedef struct ZmbvContext {
 AVCodecContext *avctx;
- AVFrame pic;
 
 int bpp;
 unsigned int decomp_size;
@@ -400,6 +399,7 @@
 
 static int 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;
 ZmbvContext * const c = avctx->priv_data;
@@ -408,12 +408,7 @@
 int hi_ver, lo_ver, ret;
 uint8_t *tmp;
 
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
-
- c->pic.reference = 1;
- c->pic.buffer_hints = FF_BUFFER_HINTS_VALID;
- if ((ret = ff_get_buffer(avctx, &c->pic)) < 0) {
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 return ret;
 }
@@ -437,18 +432,15 @@
 "Flags=%X ver=%i.%i comp=%i fmt=%i blk=%ix%i\n",
 c->flags,hi_ver,lo_ver,c->comp,c->fmt,c->bw,c->bh);
 if (hi_ver != 0 || lo_ver != 1) {
- av_log_ask_for_sample(avctx, "Unsupported version %i.%i\n",
- hi_ver, lo_ver);
+ avpriv_request_sample(avctx, "Version %i.%i", hi_ver, lo_ver);
 return AVERROR_PATCHWELCOME;
 }
 if (c->bw == 0 || c->bh == 0) {
- av_log_ask_for_sample(avctx, "Unsupported block size %ix%i\n",
- c->bw, c->bh);
+ avpriv_request_sample(avctx, "Block size %ix%i", c->bw, c->bh);
 return AVERROR_PATCHWELCOME;
 }
 if (c->comp != 0 && c->comp != 1) {
- av_log_ask_for_sample(avctx, "Unsupported compression type %i\n",
- c->comp);
+ avpriv_request_sample(avctx, "Compression type %i", c->comp);
 return AVERROR_PATCHWELCOME;
 }
 
@@ -479,15 +471,14 @@
 default:
 c->decode_intra = NULL;
 c->decode_xor = NULL;
- av_log_ask_for_sample(avctx, "Unsupported (for now) format %i\n",
- c->fmt);
+ avpriv_request_sample(avctx, "Format %i", c->fmt);
 return AVERROR_PATCHWELCOME;
 }
 
 zret = inflateReset(&c->zstream);
 if (zret != Z_OK) {
 av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret);
- return -1;
+ return AVERROR_UNKNOWN;
 }
 
 tmp = av_realloc(c->cur, avctx->width * avctx->height * (c->bpp / 8));
@@ -508,8 +499,11 @@
 }
 
 if (c->comp == 0) { //Uncompressed data
+ if (c->decomp_size < len) {
+ av_log(avctx, AV_LOG_ERROR, "Buffer too small\n");
+ return AVERROR_INVALIDDATA;
+ }
 memcpy(c->decomp_buf, buf, len);
- c->decomp_size = 1;
 } else { // ZLIB-compressed data
 c->zstream.total_in = c->zstream.total_out = 0;
 c->zstream.next_in = buf;
@@ -524,12 +518,12 @@
 c->decomp_len = c->zstream.total_out;
 }
 if (c->flags & ZMBV_KEYFRAME) {
- c->pic.key_frame = 1;
- c->pic.pict_type = AV_PICTURE_TYPE_I;
+ frame->key_frame = 1;
+ frame->pict_type = AV_PICTURE_TYPE_I;
 c->decode_intra(c);
 } else {
- c->pic.key_frame = 0;
- c->pic.pict_type = AV_PICTURE_TYPE_P;
+ frame->key_frame = 0;
+ frame->pict_type = AV_PICTURE_TYPE_P;
 if (c->decomp_len)
 c->decode_xor(c);
 }
@@ -539,7 +533,7 @@
 uint8_t *out, *src;
 int i, j;
 
- out = c->pic.data[0];
+ out = frame->data[0];
 src = c->cur;
 switch (c->fmt) {
 case ZMBV_FMT_8BPP:
@@ -550,7 +544,7 @@
 out[i * 3 + 2] = c->pal[(*src) * 3 + 2];
 src++;
 }
- out += c->pic.linesize[0];
+ out += frame->linesize[0];
 }
 break;
 case ZMBV_FMT_15BPP:
@@ -562,7 +556,7 @@
 out[i * 3 + 1] = (tmp & 0x03E0) >> 2;
 out[i * 3 + 2] = (tmp & 0x001F) << 3;
 }
- out += c->pic.linesize[0];
+ out += frame->linesize[0];
 }
 break;
 case ZMBV_FMT_16BPP:
@@ -574,7 +568,7 @@
 out[i * 3 + 1] = (tmp & 0x07E0) >> 3;
 out[i * 3 + 2] = (tmp & 0x001F) << 3;
 }
- out += c->pic.linesize[0];
+ out += frame->linesize[0];
 }
 break;
 #ifdef ZMBV_ENABLE_24BPP
@@ -582,7 +576,7 @@
 for (j = 0; j < c->height; j++) {
 memcpy(out, src, c->width * 3);
 src += c->width * 3;
- out += c->pic.linesize[0];
+ out += frame->linesize[0];
 }
 break;
 #endif //ZMBV_ENABLE_24BPP
@@ -593,7 +587,7 @@
 src += 4;
 AV_WB24(out+(i*3), tmp);
 }
- out += c->pic.linesize[0];
+ out += frame->linesize[0];
 }
 break;
 default:
@@ -602,7 +596,6 @@
 FFSWAP(uint8_t *, c->cur, c->prev);
 }
 *got_frame = 1;
- *(AVFrame*)data = c->pic;
 
 /* always report that the buffer was completely consumed */
 return buf_size;
@@ -641,7 +634,7 @@
 zret = inflateInit(&c->zstream);
 if (zret != Z_OK) {
 av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret);
- return -1;
+ return AVERROR_UNKNOWN;
 }
 
 return 0;
@@ -653,8 +646,6 @@
 
 av_freep(&c->decomp_buf);
 
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
 inflateEnd(&c->zstream);
 av_freep(&c->cur);
 av_freep(&c->prev);
@@ -664,6 +655,7 @@
 
 AVCodec ff_zmbv_decoder = {
 .name = "zmbv",
+ .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"),
 .type = AVMEDIA_TYPE_VIDEO,
 .id = AV_CODEC_ID_ZMBV,
 .priv_data_size = sizeof(ZmbvContext),
@@ -671,5 +663,4 @@
 .close = decode_end,
 .decode = decode_frame,
 .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"),
 };

libav-v9.6.tar.bz2/libavcodec/zmbvenc.c -> libav-v10.1.tar.bz2/libavcodec/zmbvenc.c Changed

@@ -44,7 +44,6 @@
  */
 typedef struct ZmbvEncContext {
     AVCodecContext *avctx;
-    AVFrame pic;
 
     int range;
     uint8_t *comp_buf, *work_buf;
@@ -121,7 +120,7 @@
                         const AVFrame *pict, int *got_packet)
 {
     ZmbvEncContext * const c = avctx->priv_data;
-    AVFrame * const p = &c->pic;
+    const AVFrame * const p = pict;
     uint8_t *src, *prev, *buf;
     uint32_t *palptr;
     int keyframe, chpal;
@@ -134,9 +133,8 @@
     c->curfrm++;
     if(c->curfrm == c->keyint)
         c->curfrm = 0;
-    *p = *pict;
-    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];
@@ -253,6 +251,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
@@ -314,31 +326,18 @@
         return -1;
     }
 
-    avctx->coded_frame = &c->pic;
-
-    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;
 }
 
 AVCodec ff_zmbv_encoder = {
     .name           = "zmbv",
+    .long_name      = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_ZMBV,
     .priv_data_size = sizeof(ZmbvEncContext),
@@ -346,5 +345,4 @@
     .encode2        = encode_frame,
     .close          = encode_end,
     .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_PAL8, AV_PIX_FMT_NONE },
-    .long_name      = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"),
 };

libav-v9.6.tar.bz2/libavdevice/Makefile -> libav-v10.1.tar.bz2/libavdevice/Makefile Changed

libav-v9.6.tar.bz2/libavdevice/alsa-audio-dec.c -> libav-v10.1.tar.bz2/libavdevice/alsa-audio-dec.c Changed

libav-v9.6.tar.bz2/libavdevice/bktr.c -> libav-v10.1.tar.bz2/libavdevice/bktr.c Changed

libav-v9.6.tar.bz2/libavdevice/dv1394.c -> libav-v10.1.tar.bz2/libavdevice/dv1394.c Changed

libav-v9.6.tar.bz2/libavdevice/fbdev.c -> libav-v10.1.tar.bz2/libavdevice/fbdev.c Changed

libav-v10.1.tar.bz2/libavdevice/file_open.c Added

libav-v9.6.tar.bz2/libavdevice/jack_audio.c -> libav-v10.1.tar.bz2/libavdevice/jack_audio.c Changed

libav-v9.6.tar.bz2/libavdevice/oss_audio.c -> libav-v10.1.tar.bz2/libavdevice/oss_audio.c Changed

libav-v9.6.tar.bz2/libavdevice/sndio_dec.c -> libav-v10.1.tar.bz2/libavdevice/sndio_dec.c Changed

libav-v9.6.tar.bz2/libavdevice/timefilter.c -> libav-v10.1.tar.bz2/libavdevice/timefilter.c Changed

@@ -41,7 +41,11 @@
 double feedback2_factor,
 double feedback3_factor)
 {
- TimeFilter *self = av_mallocz(sizeof(TimeFilter));
+ TimeFilter *self = av_mallocz(sizeof(TimeFilter));
+
+ if (!self)
+ return NULL;
+
 self->clock_period = clock_period;
 self->feedback2_factor = feedback2_factor;
 self->feedback3_factor = feedback3_factor;
@@ -105,6 +109,10 @@
 for (par1 = bestpar1 * 0.8; par1 <= bestpar1 * 1.21; par1 += bestpar1 * 0.05) {
 double error = 0;
 TimeFilter *tf = ff_timefilter_new(1, par0, par1);
+ if (!tf) {
+ printf("Could not allocate memory for timefilter.\n");
+ exit(1);
+ }
 for (i = 0; i < SAMPLES; i++) {
 double filtered;
 filtered = ff_timefilter_update(tf, samples[i], 1);

libav-v9.6.tar.bz2/libavdevice/timefilter.h -> libav-v10.1.tar.bz2/libavdevice/timefilter.h Changed

libav-v9.6.tar.bz2/libavdevice/v4l2.c -> libav-v10.1.tar.bz2/libavdevice/v4l2.c Changed

@@ -42,7 +42,10 @@
 #else
 #include <linux/videodev2.h>
 #endif
+#include "libavutil/atomic.h"
+#include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/internal.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
@@ -67,6 +70,7 @@
 int top_field_first;
 
 int buffers;
+ volatile int buffers_queued;
 void **buf_start;
 unsigned int *buf_len;
 char *standard;
@@ -79,6 +83,7 @@
 };
 
 struct buff_data {
+ struct video_data *s;
 int index;
 int fd;
 };
@@ -119,7 +124,7 @@
 flags |= O_NONBLOCK;
 }
 
- fd = open(ctx->filename, flags, 0);
+ fd = avpriv_open(ctx->filename, flags);
 if (fd < 0) {
 err = errno;
 
@@ -405,14 +410,19 @@
 return 0;
 }
 
-static void mmap_release_buffer(AVPacket *pkt)
+#if FF_API_DESTRUCT_PACKET
+static void dummy_release_buffer(AVPacket *pkt)
+{
+ av_assert0(0);
+}
+#endif
+
+static void mmap_release_buffer(void *opaque, uint8_t *data)
 {
 struct v4l2_buffer buf = { 0 };
 int res, fd;
- struct buff_data *buf_descriptor = pkt->priv;
-
- if (pkt->data == NULL)
- return;
+ struct buff_data *buf_descriptor = opaque;
+ struct video_data *s = buf_descriptor->s;
 
 buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 buf.memory = V4L2_MEMORY_MMAP;
@@ -424,9 +434,7 @@
 if (res < 0)
 av_log(NULL, AV_LOG_ERROR, "ioctl(VIDIOC_QBUF): %s\n",
 strerror(errno));
-
- pkt->data = NULL;
- pkt->size = 0;
+ avpriv_atomic_int_add_and_fetch(&s->buffers_queued, 1);
 }
 
 static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt)
@@ -436,7 +444,6 @@
 .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
 .memory = V4L2_MEMORY_MMAP
 };
- struct buff_data *buf_descriptor;
 struct pollfd p = { .fd = s->fd, .events = POLLIN };
 int res;
 
@@ -460,7 +467,15 @@
 
 return AVERROR(errno);
 }
- assert (buf.index < s->buffers);
+
+ if (buf.index >= s->buffers) {
+ av_log(ctx, AV_LOG_ERROR, "Invalid buffer index received.\n");
+ return AVERROR(EINVAL);
+ }
+ avpriv_atomic_int_add_and_fetch(&s->buffers_queued, -1);
+ // always keep at least one buffer queued
+ av_assert0(avpriv_atomic_int_get(&s->buffers_queued) >= 1);
+
 if (s->frame_size > 0 && buf.bytesused != s->frame_size) {
 av_log(ctx, AV_LOG_ERROR,
 "The v4l2 frame is %d bytes, but %d bytes are expected\n",
@@ -470,23 +485,55 @@
 }
 
 /* Image is at s->buff_start[buf.index] */
- pkt->data= s->buf_start[buf.index];
- pkt->size = buf.bytesused;
- pkt->pts = buf.timestamp.tv_sec * INT64_C(1000000) + buf.timestamp.tv_usec;
- pkt->destruct = mmap_release_buffer;
- buf_descriptor = av_malloc(sizeof(struct buff_data));
- if (buf_descriptor == NULL) {
- /* Something went wrong... Since av_malloc() failed, we cannot even
- * allocate a buffer for memcopying into it
- */
- av_log(ctx, AV_LOG_ERROR, "Failed to allocate a buffer descriptor\n");
+ if (avpriv_atomic_int_get(&s->buffers_queued) == FFMAX(s->buffers / 8, 1)) {
+ /* when we start getting low on queued buffers, fall back on copying data */
+ res = av_new_packet(pkt, buf.bytesused);
+ if (res < 0) {
+ av_log(ctx, AV_LOG_ERROR, "Error allocating a packet.\n");
+ return res;
+ }
+ memcpy(pkt->data, s->buf_start[buf.index], buf.bytesused);
+
 res = ioctl(s->fd, VIDIOC_QBUF, &buf);
+ if (res < 0) {
+ av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QBUF)\n");
+ av_free_packet(pkt);
+ return AVERROR(errno);
+ }
+ avpriv_atomic_int_add_and_fetch(&s->buffers_queued, 1);
+ } else {
+ struct buff_data *buf_descriptor;
+
+ pkt->data = s->buf_start[buf.index];
+ pkt->size = buf.bytesused;
+#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
+ pkt->destruct = dummy_release_buffer;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
 
- return AVERROR(ENOMEM);
+ buf_descriptor = av_malloc(sizeof(struct buff_data));
+ if (buf_descriptor == NULL) {
+ /* Something went wrong... Since av_malloc() failed, we cannot even
+ * allocate a buffer for memcpying into it
+ */
+ av_log(ctx, AV_LOG_ERROR, "Failed to allocate a buffer descriptor\n");
+ res = ioctl(s->fd, VIDIOC_QBUF, &buf);
+
+ return AVERROR(ENOMEM);
+ }
+ buf_descriptor->fd = s->fd;
+ buf_descriptor->index = buf.index;
+ buf_descriptor->s = s;
+
+ pkt->buf = av_buffer_create(pkt->data, pkt->size, mmap_release_buffer,
+ buf_descriptor, 0);
+ if (!pkt->buf) {
+ av_freep(&buf_descriptor);
+ return AVERROR(ENOMEM);
+ }
 }
- buf_descriptor->fd = s->fd;
- buf_descriptor->index = buf.index;
- pkt->priv = buf_descriptor;
+ pkt->pts = buf.timestamp.tv_sec * INT64_C(1000000) + buf.timestamp.tv_usec;
 
 return s->buf_len[buf.index];
 }
@@ -512,6 +559,7 @@
 return AVERROR(errno);
 }
 }
+ s->buffers_queued = s->buffers;
 
 type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 res = ioctl(s->fd, VIDIOC_STREAMON, &type);
@@ -634,11 +682,11 @@
 return AVERROR(errno);
 }
 }
- s1->streams[0]->codec->time_base.den = tpf->denominator;
- s1->streams[0]->codec->time_base.num = tpf->numerator;
+ s1->streams[0]->avg_frame_rate.num = tpf->denominator;
+ s1->streams[0]->avg_frame_rate.den = tpf->numerator;
 
 s->timeout = 100 +
- av_rescale_q(1, s1->streams[0]->codec->time_base,
+ av_rescale_q(1, s1->streams[0]->avg_frame_rate,
 (AVRational){1, 1000});
 
 return 0;
@@ -687,21 +735,16 @@
 enum AVPixelFormat pix_fmt = AV_PIX_FMT_NONE;
 
 st = avformat_new_stream(s1, NULL);
- if (!st) {
- res = AVERROR(ENOMEM);
- goto out;
- }
+ if (!st)
+ return AVERROR(ENOMEM);
 
 s->fd = device_open(s1);
- if (s->fd < 0) {
- res = s->fd;
- goto out;
- }
+ if (s->fd < 0)
+ return s->fd;
 
 if (s->list_format) {
 list_formats(s1, s->fd, s->list_format);
- res = AVERROR_EXIT;
- goto out;
+ return AVERROR_EXIT;
 }
 
 avpriv_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */
@@ -710,7 +753,7 @@
 (res = av_parse_video_size(&s->width, &s->height, s->video_size)) < 0) {
 av_log(s1, AV_LOG_ERROR, "Could not parse video size '%s'.\n",
 s->video_size);
- goto out;
+ return res;
 }
 
 if (s->pixel_format) {
@@ -725,8 +768,7 @@
 av_log(s1, AV_LOG_ERROR, "No such input format: %s.\n",
 s->pixel_format);
 
- res = AVERROR(EINVAL);
- goto out;
+ return AVERROR(EINVAL);
 }
 }
 
@@ -739,8 +781,7 @@
 if (ioctl(s->fd, VIDIOC_G_FMT, &fmt) < 0) {
 av_log(s1, AV_LOG_ERROR, "ioctl(VIDIOC_G_FMT): %s\n",
 strerror(errno));
- res = AVERROR(errno);
- goto out;
+ return AVERROR(errno);
 }
 
 s->width = fmt.fmt.pix.width;
@@ -756,17 +797,16 @@
 "codec_id %d, pix_fmt %d.\n", s1->video_codec_id, pix_fmt);
 close(s->fd);
 
- res = AVERROR(EIO);
- goto out;
+ return AVERROR(EIO);
 }
 
 if ((res = av_image_check_size(s->width, s->height, 0, s1) < 0))
- goto out;
+ return res;
 
 s->frame_format = desired_format;
 
 if ((res = v4l2_set_parameters(s1) < 0))
- goto out;
+ return res;
 
 st->codec->pix_fmt = fmt_v4l2ff(desired_format, codec_id);
 s->frame_size =
@@ -775,7 +815,7 @@
 if ((res = mmap_init(s1)) ||
 (res = mmap_start(s1)) < 0) {
 close(s->fd);
- goto out;
+ return res;
 }
 
 s->top_field_first = first_field(s->fd);
@@ -787,10 +827,9 @@
 avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt);
 st->codec->width = s->width;
 st->codec->height = s->height;
- st->codec->bit_rate = s->frame_size * 1/av_q2d(st->codec->time_base) * 8;
+ st->codec->bit_rate = s->frame_size * av_q2d(st->avg_frame_rate) * 8;
 
-out:
- return res;
+ return 0;
 }
 
 static int v4l2_read_packet(AVFormatContext *s1, AVPacket *pkt)
@@ -816,6 +855,10 @@
 {
 struct video_data *s = s1->priv_data;
 
+ if (avpriv_atomic_int_get(&s->buffers_queued) != s->buffers)
+ av_log(s1, AV_LOG_WARNING, "Some buffers are still owned by the caller on "
+ "close.\n");
+
 mmap_close(s);
 
 close(s->fd);

libav-v9.6.tar.bz2/libavdevice/version.h -> libav-v10.1.tar.bz2/libavdevice/version.h Changed

libav-v9.6.tar.bz2/libavfilter/Makefile -> libav-v10.1.tar.bz2/libavfilter/Makefile Changed

@@ -27,11 +27,14 @@
 OBJS-$(CONFIG_AFORMAT_FILTER)                += af_aformat.o
 OBJS-$(CONFIG_AMIX_FILTER)                   += af_amix.o
 OBJS-$(CONFIG_ANULL_FILTER)                  += af_anull.o
+OBJS-$(CONFIG_ASETPTS_FILTER)                += setpts.o
 OBJS-$(CONFIG_ASHOWINFO_FILTER)              += af_ashowinfo.o
 OBJS-$(CONFIG_ASPLIT_FILTER)                 += split.o
 OBJS-$(CONFIG_ASYNCTS_FILTER)                += af_asyncts.o
+OBJS-$(CONFIG_ATRIM_FILTER)                  += trim.o
 OBJS-$(CONFIG_CHANNELMAP_FILTER)             += af_channelmap.o
 OBJS-$(CONFIG_CHANNELSPLIT_FILTER)           += af_channelsplit.o
+OBJS-$(CONFIG_COMPAND_FILTER)                += af_compand.o
 OBJS-$(CONFIG_JOIN_FILTER)                   += af_join.o
 OBJS-$(CONFIG_RESAMPLE_FILTER)               += af_resample.o
 OBJS-$(CONFIG_VOLUME_FILTER)                 += af_volume.o
@@ -52,10 +55,12 @@
 OBJS-$(CONFIG_FIELDORDER_FILTER)             += vf_fieldorder.o
 OBJS-$(CONFIG_FORMAT_FILTER)                 += vf_format.o
 OBJS-$(CONFIG_FPS_FILTER)                    += vf_fps.o
+OBJS-$(CONFIG_FRAMEPACK_FILTER)              += vf_framepack.o
 OBJS-$(CONFIG_FREI0R_FILTER)                 += vf_frei0r.o
 OBJS-$(CONFIG_GRADFUN_FILTER)                += vf_gradfun.o
 OBJS-$(CONFIG_HFLIP_FILTER)                  += vf_hflip.o
 OBJS-$(CONFIG_HQDN3D_FILTER)                 += vf_hqdn3d.o
+OBJS-$(CONFIG_INTERLACE_FILTER)              += vf_interlace.o
 OBJS-$(CONFIG_LUT_FILTER)                    += vf_lut.o
 OBJS-$(CONFIG_LUTRGB_FILTER)                 += vf_lut.o
 OBJS-$(CONFIG_LUTYUV_FILTER)                 += vf_lut.o
@@ -69,12 +74,13 @@
 OBJS-$(CONFIG_SCALE_FILTER)                  += vf_scale.o
 OBJS-$(CONFIG_SELECT_FILTER)                 += vf_select.o
 OBJS-$(CONFIG_SETDAR_FILTER)                 += vf_aspect.o
-OBJS-$(CONFIG_SETPTS_FILTER)                 += vf_setpts.o
+OBJS-$(CONFIG_SETPTS_FILTER)                 += setpts.o
 OBJS-$(CONFIG_SETSAR_FILTER)                 += vf_aspect.o
 OBJS-$(CONFIG_SETTB_FILTER)                  += vf_settb.o
 OBJS-$(CONFIG_SHOWINFO_FILTER)               += vf_showinfo.o
 OBJS-$(CONFIG_SPLIT_FILTER)                  += split.o
 OBJS-$(CONFIG_TRANSPOSE_FILTER)              += vf_transpose.o
+OBJS-$(CONFIG_TRIM_FILTER)                   += trim.o
 OBJS-$(CONFIG_UNSHARP_FILTER)                += vf_unsharp.o
 OBJS-$(CONFIG_VFLIP_FILTER)                  += vf_vflip.o
 OBJS-$(CONFIG_YADIF_FILTER)                  += vf_yadif.o
@@ -88,5 +94,7 @@
 
 OBJS-$(CONFIG_NULLSINK_FILTER)               += vsink_nullsink.o
 
+OBJS-$(HAVE_THREADS)                         += pthread.o
+
 TOOLS     = graph2dot
 TESTPROGS = filtfmts

libav-v9.6.tar.bz2/libavfilter/af_aformat.c -> libav-v10.1.tar.bz2/libavfilter/af_aformat.c Changed

@@ -63,17 +63,24 @@
 
 #define PARSE_FORMATS(str, type, list, add_to_list, get_fmt, none, desc) \
 do { \
- char *next, *cur = str; \
+ char *next, *cur = str, sep; \
+ \
+ if (str && strchr(str, ',')) { \
+ av_log(ctx, AV_LOG_WARNING, "This syntax is deprecated, use '|' to "\
+ "separate %s.\n", desc); \
+ sep = ','; \
+ } else \
+ sep = '|'; \
+ \
 while (cur) { \
 type fmt; \
- next = strchr(cur, ','); \
+ next = strchr(cur, sep); \
 if (next) \
 *next++ = 0; \
 \
 if ((fmt = get_fmt(cur)) == none) { \
 av_log(ctx, AV_LOG_ERROR, "Error parsing " desc ": %s.\n", cur);\
- ret = AVERROR(EINVAL); \
- goto fail; \
+ return AVERROR(EINVAL); \
 } \
 add_to_list(&list, fmt); \
 \
@@ -87,23 +94,9 @@
 return FFMAX(ret, 0);
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
 AFormatContext *s = ctx->priv;
- int ret;
-
- if (!args) {
- av_log(ctx, AV_LOG_ERROR, "No parameters supplied.\n");
- return AVERROR(EINVAL);
- }
-
- s->class = &aformat_class;
- av_opt_set_defaults(s);
-
- if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", args);
- return ret;
- }
 
 PARSE_FORMATS(s->formats_str, enum AVSampleFormat, s->formats,
 ff_add_format, av_get_sample_fmt, AV_SAMPLE_FMT_NONE, "sample format");
@@ -113,9 +106,7 @@
 ff_add_channel_layout, av_get_channel_layout, 0,
 "channel layout");
 
-fail:
- av_opt_free(s);
- return ret;
+ return 0;
 }
 
 static int query_formats(AVFilterContext *ctx)
@@ -123,7 +114,7 @@
 AFormatContext *s = ctx->priv;
 
 ff_set_common_formats(ctx, s->formats ? s->formats :
- ff_all_formats(AVMEDIA_TYPE_AUDIO));
+ ff_all_formats(AVMEDIA_TYPE_AUDIO));
 ff_set_common_samplerates(ctx, s->sample_rates ? s->sample_rates :
 ff_all_samplerates());
 ff_set_common_channel_layouts(ctx, s->channel_layouts ? s->channel_layouts :
@@ -148,12 +139,13 @@
 { NULL }
 };
 
-AVFilter avfilter_af_aformat = {
+AVFilter ff_af_aformat = {
 .name = "aformat",
 .description = NULL_IF_CONFIG_SMALL("Convert the input audio to one of the specified formats."),
 .init = init,
 .query_formats = query_formats,
 .priv_size = sizeof(AFormatContext),
+ .priv_class = &aformat_class,
 
 .inputs = avfilter_af_aformat_inputs,
 .outputs = avfilter_af_aformat_outputs,

libav-v9.6.tar.bz2/libavfilter/af_amix.c -> libav-v10.1.tar.bz2/libavfilter/af_amix.c Changed

@@ -28,6 +28,7 @@
 * output.
 */
 
+#include "libavutil/attributes.h"
 #include "libavutil/audio_fifo.h"
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
@@ -275,18 +276,18 @@
 {
 AVFilterContext *ctx = outlink->src;
 MixContext *s = ctx->priv;
- AVFilterBufferRef *out_buf, *in_buf;
+ AVFrame *out_buf, *in_buf;
 int i;
 
 calculate_scales(s, nb_samples);
 
- out_buf = ff_get_audio_buffer(outlink, AV_PERM_WRITE, nb_samples);
+ out_buf = ff_get_audio_buffer(outlink, nb_samples);
 if (!out_buf)
 return AVERROR(ENOMEM);
 
- in_buf = ff_get_audio_buffer(outlink, AV_PERM_WRITE, nb_samples);
+ in_buf = ff_get_audio_buffer(outlink, nb_samples);
 if (!in_buf) {
- avfilter_unref_buffer(out_buf);
+ av_frame_free(&out_buf);
 return AVERROR(ENOMEM);
 }
 
@@ -308,7 +309,7 @@
 }
 }
 }
- avfilter_unref_buffer(in_buf);
+ av_frame_free(&in_buf);
 
 out_buf->pts = s->next_pts;
 if (s->next_pts != AV_NOPTS_VALUE)
@@ -455,7 +456,7 @@
 return output_frame(outlink, available_samples);
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
+static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
 {
 AVFilterContext *ctx = inlink->dst;
 MixContext *s = ctx->priv;
@@ -474,33 +475,24 @@
 if (i == 0) {
 int64_t pts = av_rescale_q(buf->pts, inlink->time_base,
 outlink->time_base);
- ret = frame_list_add_frame(s->frame_list, buf->audio->nb_samples, pts);
+ ret = frame_list_add_frame(s->frame_list, buf->nb_samples, pts);
 if (ret < 0)
 goto fail;
 }
 
 ret = av_audio_fifo_write(s->fifos[i], (void **)buf->extended_data,
- buf->audio->nb_samples);
+ buf->nb_samples);
 
 fail:
- avfilter_unref_buffer(buf);
+ av_frame_free(&buf);
 
 return ret;
 }
 
-static int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
 MixContext *s = ctx->priv;
- int i, ret;
-
- s->class = &amix_class;
- av_opt_set_defaults(s);
-
- if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", args);
- return ret;
- }
- av_opt_free(s);
+ int i;
 
 for (i = 0; i < s->nb_inputs; i++) {
 char name[32];
@@ -519,7 +511,7 @@
 return 0;
 }
 
-static void uninit(AVFilterContext *ctx)
+static av_cold void uninit(AVFilterContext *ctx)
 {
 int i;
 MixContext *s = ctx->priv;
@@ -559,10 +551,11 @@
 { NULL }
 };
 
-AVFilter avfilter_af_amix = {
+AVFilter ff_af_amix = {
 .name = "amix",
 .description = NULL_IF_CONFIG_SMALL("Audio mixing."),
 .priv_size = sizeof(MixContext),
+ .priv_class = &amix_class,
 
 .init = init,
 .uninit = uninit,
@@ -570,4 +563,6 @@
 
 .inputs = NULL,
 .outputs = avfilter_af_amix_outputs,
+
+ .flags = AVFILTER_FLAG_DYNAMIC_INPUTS,
 };

libav-v9.6.tar.bz2/libavfilter/af_anull.c -> libav-v10.1.tar.bz2/libavfilter/af_anull.c Changed

libav-v9.6.tar.bz2/libavfilter/af_ashowinfo.c -> libav-v10.1.tar.bz2/libavfilter/af_ashowinfo.c Changed

@@ -27,6 +27,7 @@
 #include <stddef.h>
 
 #include "libavutil/adler32.h"
+#include "libavutil/attributes.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/mem.h"
@@ -59,22 +60,22 @@
 return 0;
 }
 
-static void uninit(AVFilterContext *ctx)
+static av_cold void uninit(AVFilterContext *ctx)
 {
 AShowInfoContext *s = ctx->priv;
 av_freep(&s->plane_checksums);
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
+static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
 {
 AVFilterContext *ctx = inlink->dst;
 AShowInfoContext *s = ctx->priv;
 char chlayout_str[128];
 uint32_t checksum = 0;
- int channels = av_get_channel_layout_nb_channels(buf->audio->channel_layout);
+ int channels = av_get_channel_layout_nb_channels(buf->channel_layout);
 int planar = av_sample_fmt_is_planar(buf->format);
 int block_align = av_get_bytes_per_sample(buf->format) * (planar ? 1 : channels);
- int data_size = buf->audio->nb_samples * block_align;
+ int data_size = buf->nb_samples * block_align;
 int planes = planar ? channels : 1;
 int i;
 
@@ -87,7 +88,7 @@
 }
 
 av_get_channel_layout_string(chlayout_str, sizeof(chlayout_str), -1,
- buf->audio->channel_layout);
+ buf->channel_layout);
 
 av_log(ctx, AV_LOG_INFO,
 "n:%"PRIu64" pts:%"PRId64" pts_time:%f "
@@ -95,7 +96,7 @@
 "checksum:%08X ",
 s->frame, buf->pts, buf->pts * av_q2d(inlink->time_base),
 av_get_sample_fmt_name(buf->format), chlayout_str,
- buf->audio->sample_rate, buf->audio->nb_samples,
+ buf->sample_rate, buf->nb_samples,
 checksum);
 
 av_log(ctx, AV_LOG_INFO, "plane_checksums: [ ");
@@ -114,7 +115,6 @@
 .get_audio_buffer = ff_null_get_audio_buffer,
 .config_props = config_input,
 .filter_frame = filter_frame,
- .min_perms = AV_PERM_READ,
 },
 { NULL },
 };
@@ -127,7 +127,7 @@
 { NULL },
 };
 
-AVFilter avfilter_af_ashowinfo = {
+AVFilter ff_af_ashowinfo = {
 .name = "ashowinfo",
 .description = NULL_IF_CONFIG_SMALL("Show textual information for each audio frame."),
 .priv_size = sizeof(AShowInfoContext),

libav-v9.6.tar.bz2/libavfilter/af_asyncts.c -> libav-v10.1.tar.bz2/libavfilter/af_asyncts.c Changed

@@ -16,7 +16,10 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include <stdint.h>
+
 #include "libavresample/avresample.h"
+#include "libavutil/attributes.h"
 #include "libavutil/audio_fifo.h"
 #include "libavutil/common.h"
 #include "libavutil/mathematics.h"
@@ -35,6 +38,7 @@
 int min_delta; ///< pad/trim min threshold in samples
 int first_frame; ///< 1 until filter_frame() has processed at least 1 frame with a pts != AV_NOPTS_VALUE
 int64_t first_pts; ///< user-specified first expected pts, in samples
+ int comp; ///< current resample compensation
 
 /* options */
 int resample;
@@ -63,19 +67,9 @@
 .version = LIBAVUTIL_VERSION_INT,
 };
 
-static int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
 ASyncContext *s = ctx->priv;
- int ret;
-
- s->class = &async_class;
- av_opt_set_defaults(s);
-
- if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", args);
- return ret;
- }
- av_opt_free(s);
 
 s->pts = AV_NOPTS_VALUE;
 s->first_frame = 1;
@@ -83,7 +77,7 @@
 return 0;
 }
 
-static void uninit(AVFilterContext *ctx)
+static av_cold void uninit(AVFilterContext *ctx)
 {
 ASyncContext *s = ctx->priv;
 
@@ -158,14 +152,13 @@
 handle_trimming(ctx);
 
 if (nb_samples = get_delay(s)) {
- AVFilterBufferRef *buf = ff_get_audio_buffer(link, AV_PERM_WRITE,
- nb_samples);
+ AVFrame *buf = ff_get_audio_buffer(link, nb_samples);
 if (!buf)
 return AVERROR(ENOMEM);
 ret = avresample_convert(s->avr, buf->extended_data,
 buf->linesize[0], nb_samples, NULL, 0, 0);
 if (ret <= 0) {
- avfilter_unref_bufferp(&buf);
+ av_frame_free(&buf);
 return (ret < 0) ? ret : AVERROR_EOF;
 }
 
@@ -177,24 +170,25 @@
 return ret;
 }
 
-static int write_to_fifo(ASyncContext *s, AVFilterBufferRef *buf)
+static int write_to_fifo(ASyncContext *s, AVFrame *buf)
 {
 int ret = avresample_convert(s->avr, NULL, 0, 0, buf->extended_data,
- buf->linesize[0], buf->audio->nb_samples);
- avfilter_unref_buffer(buf);
+ buf->linesize[0], buf->nb_samples);
+ av_frame_free(&buf);
 return ret;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
+static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
 {
 AVFilterContext *ctx = inlink->dst;
 ASyncContext *s = ctx->priv;
 AVFilterLink *outlink = ctx->outputs[0];
- int nb_channels = av_get_channel_layout_nb_channels(buf->audio->channel_layout);
+ int nb_channels = av_get_channel_layout_nb_channels(buf->channel_layout);
 int64_t pts = (buf->pts == AV_NOPTS_VALUE) ? buf->pts :
 av_rescale_q(buf->pts, inlink->time_base, outlink->time_base);
 int out_size, ret;
 int64_t delta;
+ int64_t new_pts;
 
 /* buffer data until we get the next timestamp */
 if (s->pts == AV_NOPTS_VALUE || pts == AV_NOPTS_VALUE) {
@@ -221,16 +215,24 @@
 out_size = av_clipl_int32((int64_t)out_size + delta);
 } else {
 if (s->resample) {
- int comp = av_clip(delta, -s->max_comp, s->max_comp);
- av_log(ctx, AV_LOG_VERBOSE, "Compensating %d samples per second.\n", comp);
- avresample_set_compensation(s->avr, comp, inlink->sample_rate);
+ // adjust the compensation if delta is non-zero
+ int delay = get_delay(s);
+ int comp = s->comp + av_clip(delta * inlink->sample_rate / delay,
+ -s->max_comp, s->max_comp);
+ if (comp != s->comp) {
+ av_log(ctx, AV_LOG_VERBOSE, "Compensating %d samples per second.\n", comp);
+ if (avresample_set_compensation(s->avr, comp, inlink->sample_rate) == 0) {
+ s->comp = comp;
+ }
+ }
 }
+ // adjust PTS to avoid monotonicity errors with input PTS jitter
+ pts -= delta;
 delta = 0;
 }
 
 if (out_size > 0) {
- AVFilterBufferRef *buf_out = ff_get_audio_buffer(outlink, AV_PERM_WRITE,
- out_size);
+ AVFrame *buf_out = ff_get_audio_buffer(outlink, out_size);
 if (!buf_out) {
 ret = AVERROR(ENOMEM);
 goto fail;
@@ -275,13 +277,21 @@
 /* drain any remaining buffered data */
 avresample_read(s->avr, NULL, avresample_available(s->avr));
 
- s->pts = pts - avresample_get_delay(s->avr);
- ret = avresample_convert(s->avr, NULL, 0, 0, buf->extended_data,
- buf->linesize[0], buf->audio->nb_samples);
+ new_pts = pts - avresample_get_delay(s->avr);
+ /* check for s->pts monotonicity */
+ if (new_pts > s->pts) {
+ s->pts = new_pts;
+ ret = avresample_convert(s->avr, NULL, 0, 0, buf->extended_data,
+ buf->linesize[0], buf->nb_samples);
+ } else {
+ av_log(ctx, AV_LOG_WARNING, "Non-monotonous timestamps, dropping "
+ "whole buffer.\n");
+ ret = 0;
+ }
 
 s->first_frame = 0;
 fail:
- avfilter_unref_buffer(buf);
+ av_frame_free(&buf);
 
 return ret;
 }
@@ -305,7 +315,7 @@
 { NULL }
 };
 
-AVFilter avfilter_af_asyncts = {
+AVFilter ff_af_asyncts = {
 .name = "asyncts",
 .description = NULL_IF_CONFIG_SMALL("Sync audio data to timestamps"),
 
@@ -313,6 +323,7 @@
 .uninit = uninit,
 
 .priv_size = sizeof(ASyncContext),
+ .priv_class = &async_class,
 
 .inputs = avfilter_af_asyncts_inputs,
 .outputs = avfilter_af_asyncts_outputs,

libav-v9.6.tar.bz2/libavfilter/af_channelmap.c -> libav-v10.1.tar.bz2/libavfilter/af_channelmap.c Changed

@@ -119,30 +119,16 @@
 return 0;
 }
 
-static av_cold int channelmap_init(AVFilterContext *ctx, const char *args)
+static av_cold int channelmap_init(AVFilterContext *ctx)
 {
 ChannelMapContext *s = ctx->priv;
- int ret;
- char *mapping;
+ char *mapping, separator = '|';
 int map_entries = 0;
 char buf[256];
 enum MappingMode mode;
 uint64_t out_ch_mask = 0;
 int i;
 
- if (!args) {
- av_log(ctx, AV_LOG_ERROR, "No parameters supplied.\n");
- return AVERROR(EINVAL);
- }
-
- s->class = &channelmap_class;
- av_opt_set_defaults(s);
-
- if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", args);
- return ret;
- }
-
 mapping = s->mapping_str;
 
 if (!mapping) {
@@ -150,36 +136,42 @@
 } else {
 char *dash = strchr(mapping, '-');
 if (!dash) { // short mapping
- if (isdigit(*mapping))
+ if (av_isdigit(*mapping))
 mode = MAP_ONE_INT;
 else
 mode = MAP_ONE_STR;
- } else if (isdigit(*mapping)) {
- if (isdigit(*(dash+1)))
+ } else if (av_isdigit(*mapping)) {
+ if (av_isdigit(*(dash+1)))
 mode = MAP_PAIR_INT_INT;
 else
 mode = MAP_PAIR_INT_STR;
 } else {
- if (isdigit(*(dash+1)))
+ if (av_isdigit(*(dash+1)))
 mode = MAP_PAIR_STR_INT;
 else
 mode = MAP_PAIR_STR_STR;
 }
+#if FF_API_OLD_FILTER_OPTS
+ if (strchr(mapping, ',')) {
+ av_log(ctx, AV_LOG_WARNING, "This syntax is deprecated, use "
+ "'|' to separate the mappings.\n");
+ separator = ',';
+ }
+#endif
 }
 
 if (mode != MAP_NONE) {
- char *comma = mapping;
+ char *sep = mapping;
 map_entries = 1;
- while ((comma = strchr(comma, ','))) {
- if (*++comma) // Allow trailing comma
+ while ((sep = strchr(sep, separator))) {
+ if (*++sep) // Allow trailing comma
 map_entries++;
 }
 }
 
 if (map_entries > MAX_CH) {
 av_log(ctx, AV_LOG_ERROR, "Too many channels mapped: '%d'.\n", map_entries);
- ret = AVERROR(EINVAL);
- goto fail;
+ return AVERROR(EINVAL);
 }
 
 for (i = 0; i < map_entries; i++) {
@@ -188,40 +180,36 @@
 static const char err[] = "Failed to parse channel map\n";
 switch (mode) {
 case MAP_ONE_INT:
- if (get_channel_idx(&mapping, &in_ch_idx, ',', MAX_CH) < 0) {
- ret = AVERROR(EINVAL);
+ if (get_channel_idx(&mapping, &in_ch_idx, separator, MAX_CH) < 0) {
 av_log(ctx, AV_LOG_ERROR, err);
- goto fail;
+ return AVERROR(EINVAL);
 }
 s->map[i].in_channel_idx = in_ch_idx;
 s->map[i].out_channel_idx = i;
 break;
 case MAP_ONE_STR:
- if (!get_channel(&mapping, &in_ch, ',')) {
+ if (get_channel(&mapping, &in_ch, separator) < 0) {
 av_log(ctx, AV_LOG_ERROR, err);
- ret = AVERROR(EINVAL);
- goto fail;
+ return AVERROR(EINVAL);
 }
 s->map[i].in_channel = in_ch;
 s->map[i].out_channel_idx = i;
 break;
 case MAP_PAIR_INT_INT:
 if (get_channel_idx(&mapping, &in_ch_idx, '-', MAX_CH) < 0 ||
- get_channel_idx(&mapping, &out_ch_idx, ',', MAX_CH) < 0) {
+ get_channel_idx(&mapping, &out_ch_idx, separator, MAX_CH) < 0) {
 av_log(ctx, AV_LOG_ERROR, err);
- ret = AVERROR(EINVAL);
- goto fail;
+ return AVERROR(EINVAL);
 }
 s->map[i].in_channel_idx = in_ch_idx;
 s->map[i].out_channel_idx = out_ch_idx;
 break;
 case MAP_PAIR_INT_STR:
 if (get_channel_idx(&mapping, &in_ch_idx, '-', MAX_CH) < 0 ||
- get_channel(&mapping, &out_ch, ',') < 0 ||
+ get_channel(&mapping, &out_ch, separator) < 0 ||
 out_ch & out_ch_mask) {
 av_log(ctx, AV_LOG_ERROR, err);
- ret = AVERROR(EINVAL);
- goto fail;
+ return AVERROR(EINVAL);
 }
 s->map[i].in_channel_idx = in_ch_idx;
 s->map[i].out_channel = out_ch;
@@ -229,21 +217,19 @@
 break;
 case MAP_PAIR_STR_INT:
 if (get_channel(&mapping, &in_ch, '-') < 0 ||
- get_channel_idx(&mapping, &out_ch_idx, ',', MAX_CH) < 0) {
+ get_channel_idx(&mapping, &out_ch_idx, separator, MAX_CH) < 0) {
 av_log(ctx, AV_LOG_ERROR, err);
- ret = AVERROR(EINVAL);
- goto fail;
+ return AVERROR(EINVAL);
 }
 s->map[i].in_channel = in_ch;
 s->map[i].out_channel_idx = out_ch_idx;
 break;
 case MAP_PAIR_STR_STR:
 if (get_channel(&mapping, &in_ch, '-') < 0 ||
- get_channel(&mapping, &out_ch, ',') < 0 ||
+ get_channel(&mapping, &out_ch, separator) < 0 ||
 out_ch & out_ch_mask) {
 av_log(ctx, AV_LOG_ERROR, err);
- ret = AVERROR(EINVAL);
- goto fail;
+ return AVERROR(EINVAL);
 }
 s->map[i].in_channel = in_ch;
 s->map[i].out_channel = out_ch;
@@ -261,8 +247,7 @@
 if ((fmt = av_get_channel_layout(s->channel_layout_str)) == 0) {
 av_log(ctx, AV_LOG_ERROR, "Error parsing channel layout: '%s'.\n",
 s->channel_layout_str);
- ret = AVERROR(EINVAL);
- goto fail;
+ return AVERROR(EINVAL);
 }
 if (mode == MAP_NONE) {
 int i;
@@ -276,17 +261,21 @@
 av_log(ctx, AV_LOG_ERROR,
 "Output channel layout '%s' does not match the list of channel mapped: '%s'.\n",
 s->channel_layout_str, buf);
- ret = AVERROR(EINVAL);
- goto fail;
+ return AVERROR(EINVAL);
 } else if (s->nch != av_get_channel_layout_nb_channels(fmt)) {
 av_log(ctx, AV_LOG_ERROR,
 "Output channel layout %s does not match the number of channels mapped %d.\n",
 s->channel_layout_str, s->nch);
- ret = AVERROR(EINVAL);
- goto fail;
+ return AVERROR(EINVAL);
 }
 s->output_layout = fmt;
 }
+ if (!s->output_layout) {
+ av_log(ctx, AV_LOG_ERROR, "Output channel layout is not set and "
+ "cannot be guessed from the maps.\n");
+ return AVERROR(EINVAL);
+ }
+
 ff_add_channel_layout(&s->channel_layouts, s->output_layout);
 
 if (mode == MAP_PAIR_INT_STR || mode == MAP_PAIR_STR_STR) {
@@ -296,9 +285,7 @@
 }
 }
 
-fail:
- av_opt_free(s);
- return ret;
+ return 0;
 }
 
 static int channelmap_query_formats(AVFilterContext *ctx)
@@ -313,7 +300,7 @@
 return 0;
 }
 
-static int channelmap_filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
+static int channelmap_filter_frame(AVFilterLink *inlink, AVFrame *buf)
 {
 AVFilterContext *ctx = inlink->dst;
 AVFilterLink *outlink = ctx->outputs[0];
@@ -331,7 +318,7 @@
 uint8_t **new_extended_data =
 av_mallocz(nch_out * sizeof(*buf->extended_data));
 if (!new_extended_data) {
- avfilter_unref_buffer(buf);
+ av_frame_free(&buf);
 return AVERROR(ENOMEM);
 }
 if (buf->extended_data == buf->data) {
@@ -368,24 +355,25 @@
 char layout_name[256];
 
 for (i = 0; i < s->nch; i++) {
+ struct ChannelMap *m = &s->map[i];
+
 if (s->mode == MAP_PAIR_STR_INT || s->mode == MAP_PAIR_STR_STR) {
- s->map[i].in_channel_idx = av_get_channel_layout_channel_index(
- inlink->channel_layout, s->map[i].in_channel);
+ m->in_channel_idx = av_get_channel_layout_channel_index(
+ inlink->channel_layout, m->in_channel);
 }
 
- if (s->map[i].in_channel_idx < 0 ||
- s->map[i].in_channel_idx >= nb_channels) {
+ if (m->in_channel_idx < 0 || m->in_channel_idx >= nb_channels) {
 av_get_channel_layout_string(layout_name, sizeof(layout_name),
 0, inlink->channel_layout);
- if (s->map[i].in_channel) {
- channel_name = av_get_channel_name(s->map[i].in_channel);
+ if (m->in_channel) {
+ channel_name = av_get_channel_name(m->in_channel);
 av_log(ctx, AV_LOG_ERROR,
 "input channel '%s' not available from input layout '%s'\n",
 channel_name, layout_name);
 } else {
 av_log(ctx, AV_LOG_ERROR,
 "input channel #%d not available from input layout '%s'\n",
- s->map[i].in_channel_idx, layout_name);
+ m->in_channel_idx, layout_name);
 }
 err = AVERROR(EINVAL);
 }
@@ -412,12 +400,13 @@
 { NULL }
 };
 
-AVFilter avfilter_af_channelmap = {
+AVFilter ff_af_channelmap = {
 .name = "channelmap",
 .description = NULL_IF_CONFIG_SMALL("Remap audio channels."),
 .init = channelmap_init,
 .query_formats = channelmap_query_formats,
 .priv_size = sizeof(ChannelMapContext),
+ .priv_class = &channelmap_class,
 
 .inputs = avfilter_af_channelmap_inputs,
 .outputs = avfilter_af_channelmap_outputs,

libav-v9.6.tar.bz2/libavfilter/af_channelsplit.c -> libav-v10.1.tar.bz2/libavfilter/af_channelsplit.c Changed

@@ -23,6 +23,7 @@
 * Split an audio stream into per-channel streams.
 */
 
+#include "libavutil/attributes.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/internal.h"
 #include "libavutil/opt.h"
@@ -53,18 +54,12 @@
 .version = LIBAVUTIL_VERSION_INT,
 };
 
-static int init(AVFilterContext *ctx, const char *arg)
+static av_cold int init(AVFilterContext *ctx)
 {
 ChannelSplitContext *s = ctx->priv;
 int nb_channels;
 int ret = 0, i;
 
- s->class = &channelsplit_class;
- av_opt_set_defaults(s);
- if ((ret = av_set_options_string(s, arg, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", arg);
- return ret;
- }
 if (!(s->channel_layout = av_get_channel_layout(s->channel_layout_str))) {
 av_log(ctx, AV_LOG_ERROR, "Error parsing channel layout '%s'.\n",
 s->channel_layout_str);
@@ -84,7 +79,6 @@
 }
 
 fail:
- av_opt_free(s);
 return ret;
 }
 
@@ -111,13 +105,13 @@
 return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
+static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
 {
 AVFilterContext *ctx = inlink->dst;
 int i, ret = 0;
 
 for (i = 0; i < ctx->nb_outputs; i++) {
- AVFilterBufferRef *buf_out = avfilter_ref_buffer(buf, ~AV_PERM_WRITE);
+ AVFrame *buf_out = av_frame_clone(buf);
 
 if (!buf_out) {
 ret = AVERROR(ENOMEM);
@@ -125,14 +119,14 @@
 }
 
 buf_out->data[0] = buf_out->extended_data[0] = buf_out->extended_data[i];
- buf_out->audio->channel_layout =
- av_channel_layout_extract_channel(buf->audio->channel_layout, i);
+ buf_out->channel_layout =
+ av_channel_layout_extract_channel(buf->channel_layout, i);
 
 ret = ff_filter_frame(ctx->outputs[i], buf_out);
 if (ret < 0)
 break;
 }
- avfilter_unref_buffer(buf);
+ av_frame_free(&buf);
 return ret;
 }
 
@@ -145,14 +139,17 @@
 { NULL }
 };
 
-AVFilter avfilter_af_channelsplit = {
+AVFilter ff_af_channelsplit = {
 .name = "channelsplit",
 .description = NULL_IF_CONFIG_SMALL("Split audio into per-channel streams"),
 .priv_size = sizeof(ChannelSplitContext),
+ .priv_class = &channelsplit_class,
 
 .init = init,
 .query_formats = query_formats,
 
 .inputs = avfilter_af_channelsplit_inputs,
 .outputs = NULL,
+
+ .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS,
 };

libav-v10.1.tar.bz2/libavfilter/af_compand.c Added

@@ -0,0 +1,603 @@
+/*
+ * Copyright (c) 1999 Chris Bagwell
+ * 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 libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * audio compand filter
+ */
+
+#include <string.h>
+
+#include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
+#include "libavutil/common.h"
+#include "libavutil/mathematics.h"
+#include "libavutil/mem.h"
+#include "libavutil/opt.h"
+#include "audio.h"
+#include "avfilter.h"
+#include "formats.h"
+#include "internal.h"
+
+typedef struct ChanParam {
+ float attack;
+ float decay;
+ float volume;
+} ChanParam;
+
+typedef struct CompandSegment {
+ float x, y;
+ float a, b;
+} CompandSegment;
+
+typedef struct CompandContext {
+ const AVClass *class;
+ int nb_channels;
+ int nb_segments;
+ char *attacks, *decays, *points;
+ CompandSegment *segments;
+ ChanParam *channels;
+ float in_min_lin;
+ float out_min_lin;
+ double curve_dB;
+ double gain_dB;
+ double initial_volume;
+ double delay;
+ AVFrame *delay_frame;
+ int delay_samples;
+ int delay_count;
+ int delay_index;
+ int64_t pts;
+
+ int (*compand)(AVFilterContext *ctx, AVFrame *frame);
+} CompandContext;
+
+#define OFFSET(x) offsetof(CompandContext, x)
+#define A AV_OPT_FLAG_AUDIO_PARAM
+
+static const AVOption compand_options[] = {
+ { "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 }
+};
+
+static const AVClass compand_class = {
+ .class_name = "compand filter",
+ .item_name = av_default_item_name,
+ .option = compand_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+static av_cold int init(AVFilterContext *ctx)
+{
+ CompandContext *s = ctx->priv;
+ s->pts = AV_NOPTS_VALUE;
+ return 0;
+}
+
+static av_cold void uninit(AVFilterContext *ctx)
+{
+ CompandContext *s = ctx->priv;
+
+ av_freep(&s->channels);
+ av_freep(&s->segments);
+ av_frame_free(&s->delay_frame);
+}
+
+static int query_formats(AVFilterContext *ctx)
+{
+ AVFilterChannelLayouts *layouts;
+ AVFilterFormats *formats;
+ static const enum AVSampleFormat sample_fmts[] = {
+ AV_SAMPLE_FMT_FLTP,
+ AV_SAMPLE_FMT_NONE
+ };
+
+ layouts = ff_all_channel_layouts();
+ if (!layouts)
+ return AVERROR(ENOMEM);
+ ff_set_common_channel_layouts(ctx, 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 void count_items(char *item_str, int *nb_items)
+{
+ char *p;
+
+ *nb_items = 1;
+ for (p = item_str; *p; p++) {
+ if (*p == '|')
+ (*nb_items)++;
+ }
+}
+
+static void update_volume(ChanParam *cp, float in)
+{
+ float delta = in - cp->volume;
+
+ if (delta > 0.0)
+ cp->volume += delta * cp->attack;
+ else
+ cp->volume += delta * cp->decay;
+}
+
+static float get_volume(CompandContext *s, float in_lin)
+{
+ CompandSegment *cs;
+ float in_log, out_log;
+ int i;
+
+ if (in_lin < s->in_min_lin)
+ return s->out_min_lin;
+
+ in_log = logf(in_lin);
+
+ for (i = 1; i < s->nb_segments; i++)
+ if (in_log <= s->segments[i].x)
+ break;
+ cs = &s->segments[i - 1];
+ in_log -= cs->x;
+ out_log = cs->y + in_log * (cs->a * in_log + cs->b);
+
+ return expf(out_log);
+}
+
+static int compand_nodelay(AVFilterContext *ctx, AVFrame *frame)
+{
+ CompandContext *s = ctx->priv;
+ AVFilterLink *inlink = ctx->inputs[0];
+ const int channels = s->nb_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) {
+ av_frame_free(&frame);
+ return AVERROR(ENOMEM);
+ }
+ 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++) {
+ const float *src = (float *)frame->extended_data[chan];
+ float *dst = (float *)out_frame->extended_data[chan];
+ ChanParam *cp = &s->channels[chan];
+
+ for (i = 0; i < nb_samples; i++) {
+ update_volume(cp, fabs(src[i]));
+
+ dst[i] = av_clipf(src[i] * get_volume(s, cp->volume), -1.0f, 1.0f);
+ }
+ }
+
+ if (frame != out_frame)
+ av_frame_free(&frame);
+
+ return ff_filter_frame(ctx->outputs[0], out_frame);
+}
+
+#define MOD(a, b) (((a) >= (b)) ? (a) - (b) : (a))
+
+static int compand_delay(AVFilterContext *ctx, AVFrame *frame)
+{
+ CompandContext *s = ctx->priv;
+ AVFilterLink *inlink = ctx->inputs[0];
+ const int channels = s->nb_channels;
+ const int nb_samples = frame->nb_samples;
+ int chan, i, dindex = 0, oindex, count = 0;
+ AVFrame *out_frame = NULL;
+ int err;
+
+ if (s->pts == AV_NOPTS_VALUE) {
+ s->pts = (frame->pts == AV_NOPTS_VALUE) ? 0 : frame->pts;
+ }
+
+ for (chan = 0; chan < channels; chan++) {
+ AVFrame *delay_frame = s->delay_frame;
+ const float *src = (float *)frame->extended_data[chan];
+ float *dbuf = (float *)delay_frame->extended_data[chan];
+ ChanParam *cp = &s->channels[chan];
+ float *dst;
+
+ count = s->delay_count;
+ dindex = s->delay_index;
+ for (i = 0, oindex = 0; i < nb_samples; i++) {
+ const float in = src[i];
+ update_volume(cp, fabs(in));
+
+ if (count >= s->delay_samples) {
+ if (!out_frame) {
+ out_frame = ff_get_audio_buffer(inlink, nb_samples - i);
+ if (!out_frame) {
+ av_frame_free(&frame);
+ return AVERROR(ENOMEM);
+ }
+ 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);
+ }
+
+ dst = (float *)out_frame->extended_data[chan];
+ dst[oindex++] = av_clipf(dbuf[dindex] *
+ get_volume(s, cp->volume), -1.0f, 1.0f);
+ } else {
+ count++;
+ }
+
+ dbuf[dindex] = in;
+ dindex = MOD(dindex + 1, s->delay_samples);
+ }
+ }
+
+ s->delay_count = count;
+ s->delay_index = dindex;
+
+ av_frame_free(&frame);
+ return out_frame ? ff_filter_frame(ctx->outputs[0], out_frame) : 0;
+}
+
+static int compand_drain(AVFilterLink *outlink)
+{
+ AVFilterContext *ctx = outlink->src;
+ CompandContext *s = ctx->priv;
+ const int channels = s->nb_channels;
+ AVFrame *frame = NULL;
+ int chan, i, dindex;
+
+ /* 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);
+
+ for (chan = 0; chan < channels; chan++) {
+ AVFrame *delay_frame = s->delay_frame;
+ float *dbuf = (float *)delay_frame->extended_data[chan];
+ float *dst = (float *)frame->extended_data[chan];
+ ChanParam *cp = &s->channels[chan];
+
+ dindex = s->delay_index;
+ for (i = 0; i < frame->nb_samples; i++) {
+ dst[i] = av_clipf(dbuf[dindex] * get_volume(s, cp->volume),
+ -1.0f, 1.0f);
+ dindex = MOD(dindex + 1, s->delay_samples);
+ }
+ }
+ s->delay_count -= frame->nb_samples;
+ s->delay_index = dindex;
+
+ return ff_filter_frame(outlink, frame);
+}
+
+static int config_output(AVFilterLink *outlink)
+{
+ AVFilterContext *ctx = outlink->src;
+ CompandContext *s = ctx->priv;
+ const int sample_rate = outlink->sample_rate;
+ double radius = s->curve_dB * M_LN10 / 20.0;
+ const char *p;
+ const int channels =
+ av_get_channel_layout_nb_channels(outlink->channel_layout);
+ int nb_attacks, nb_decays, nb_points;
+ 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 (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->nb_channels = channels;
+ 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) {
+ uninit(ctx);
+ return AVERROR(ENOMEM);
+ }
+
+ p = s->attacks;
+ for (i = 0, new_nb_items = 0; i < nb_attacks; i++) {
+ char *tstr = av_get_token(&p, "|");
+ if (!tstr)
+ return AVERROR(ENOMEM);
+
+ new_nb_items += sscanf(tstr, "%f", &s->channels[i].attack) == 1;
+ av_freep(&tstr);
+ if (s->channels[i].attack < 0) {
+ uninit(ctx);
+ return AVERROR(EINVAL);
+ }
+ if (*p)
+ p++;
+ }
+ nb_attacks = new_nb_items;
+
+ p = s->decays;
+ for (i = 0, new_nb_items = 0; i < nb_decays; i++) {
+ char *tstr = av_get_token(&p, "|");
+ if (!tstr)
+ return AVERROR(ENOMEM);
+ new_nb_items += sscanf(tstr, "%f", &s->channels[i].decay) == 1;
+ av_freep(&tstr);
+ if (s->channels[i].decay < 0) {
+ uninit(ctx);
+ return AVERROR(EINVAL);
+ }
+ if (*p)
+ p++;
+ }
+ 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);
+ 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_get_token(&p, "|");
+ if (!tstr)
+ return AVERROR(ENOMEM);
+
+ err = sscanf(tstr, "%f/%f", &S(i).x, &S(i).y);
+ av_freep(&tstr);
+ if (err != 2) {
+ 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");
+ uninit(ctx);
+ return AVERROR(EINVAL);
+ }
+ S(i).y -= S(i).x;
+ av_log(ctx, AV_LOG_DEBUG, "%d: x=%f y=%f\n", i, S(i).x, S(i).y);
+ new_nb_items++;
+ if (*p)
+ p++;
+ }
+ num = new_nb_items;
+
+ /* Add 0,0 if necessary */
+ if (num == 0 || S(num - 1).x)
+ num++;
+
+#undef S
+#define S(x) s->segments[2 * (x)]
+ /* Add a tail off segment at the start */
+ S(0).x = S(1).x - 2 * s->curve_dB;
+ S(0).y = S(1).y;
+ num++;
+
+ /* Join adjacent colinear segments */
+ for (i = 2; i < num; i++) {
+ double g1 = (S(i - 1).y - S(i - 2).y) * (S(i - 0).x - S(i - 1).x);
+ double g2 = (S(i - 0).y - S(i - 1).y) * (S(i - 1).x - S(i - 2).x);
+ int j;
+
+ /* here we purposefully lose precision so that we can compare floats */
+ if (fabs(g1 - g2))
+ continue;
+ num--;
+ for (j = --i; j < num; j++)
+ S(j) = S(j + 1);
+ }
+
+ for (i = 0; !i || s->segments[i - 2].x; i += 2) {
+ s->segments[i].y += s->gain_dB;
+ s->segments[i].x *= M_LN10 / 20;
+ s->segments[i].y *= M_LN10 / 20;
+ }
+
+#define L(x) s->segments[i - (x)]
+ for (i = 4; s->segments[i - 2].x; i += 2) {
+ double x, y, cx, cy, in1, in2, out1, out2, theta, len, r;
+
+ L(4).a = 0;
+ L(4).b = (L(2).y - L(4).y) / (L(2).x - L(4).x);
+
+ L(2).a = 0;
+ L(2).b = (L(0).y - L(2).y) / (L(0).x - L(2).x);
+
+ theta = atan2(L(2).y - L(4).y, L(2).x - L(4).x);
+ len = sqrt(pow(L(2).x - L(4).x, 2.) + pow(L(2).y - L(4).y, 2.));
+ r = FFMIN(radius, len);
+ L(3).x = L(2).x - r * cos(theta);
+ L(3).y = L(2).y - r * sin(theta);
+
+ theta = atan2(L(0).y - L(2).y, L(0).x - L(2).x);
+ len = sqrt(pow(L(0).x - L(2).x, 2.) + pow(L(0).y - L(2).y, 2.));
+ r = FFMIN(radius, len / 2);
+ x = L(2).x + r * cos(theta);
+ y = L(2).y + r * sin(theta);
+
+ cx = (L(3).x + L(2).x + x) / 3;
+ cy = (L(3).y + L(2).y + y) / 3;
+
+ L(2).x = x;
+ L(2).y = y;
+
+ in1 = cx - L(3).x;
+ out1 = cy - L(3).y;
+ 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).b = out1 / in1 - L(3).a * in1;
+ }
+ L(3).x = 0;
+ L(3).y = L(2).y;
+
+ s->in_min_lin = exp(s->segments[1].x);
+ s->out_min_lin = exp(s->segments[1].y);
+
+ for (i = 0; i < channels; i++) {
+ ChanParam *cp = &s->channels[i];
+
+ if (cp->attack > 1.0 / sample_rate)
+ cp->attack = 1.0 - exp(-1.0 / (sample_rate * cp->attack));
+ else
+ cp->attack = 1.0;
+ if (cp->decay > 1.0 / sample_rate)
+ cp->decay = 1.0 - exp(-1.0 / (sample_rate * cp->decay));
+ else
+ cp->decay = 1.0;
+ cp->volume = pow(10.0, s->initial_volume / 20);
+ }
+
+ s->delay_samples = s->delay * sample_rate;
+ 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;
+
+ s->compand = compand_delay;
+ return 0;
+}
+
+static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
+{
+ AVFilterContext *ctx = inlink->dst;
+ CompandContext *s = ctx->priv;
+
+ return s->compand(ctx, frame);
+}
+
+static int request_frame(AVFilterLink *outlink)
+{
+ AVFilterContext *ctx = outlink->src;
+ CompandContext *s = ctx->priv;
+ int ret;
+
+ ret = ff_request_frame(ctx->inputs[0]);
+
+ if (ret == AVERROR_EOF && s->delay_count)
+ ret = compand_drain(outlink);
+
+ return ret;
+}
+
+static const AVFilterPad compand_inputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .filter_frame = filter_frame,
+ },
+ { NULL }
+};
+
+static const AVFilterPad compand_outputs[] = {
+ {
+ .name = "default",
+ .request_frame = request_frame,
+ .config_props = config_output,
+ .type = AVMEDIA_TYPE_AUDIO,
+ },
+ { NULL }
+};
+
+
+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,
+};

libav-v9.6.tar.bz2/libavfilter/af_join.c -> libav-v10.1.tar.bz2/libavfilter/af_join.c Changed

@@ -56,24 +56,14 @@
 /**
 * Temporary storage for input frames, until we get one on each input.
 */
- AVFilterBufferRef **input_frames;
+ AVFrame **input_frames;
 
 /**
- * Temporary storage for data pointers, for assembling the output buffer.
+ * Temporary storage for buffer references, for assembling the output frame.
 */
- uint8_t **data;
+ AVBufferRef **buffers;
 } JoinContext;
 
-/**
- * To avoid copying the data from input buffers, this filter creates
- * a custom output buffer that stores references to all inputs and
- * unrefs them on free.
- */
-typedef struct JoinBufferPriv {
- AVFilterBufferRef **in_buffers;
- int nb_in_buffers;
-} JoinBufferPriv;
-
 #define OFFSET(x) offsetof(JoinContext, x)
 #define A AV_OPT_FLAG_AUDIO_PARAM
 static const AVOption join_options[] = {
@@ -93,7 +83,7 @@
 .version = LIBAVUTIL_VERSION_INT,
 };
 
-static int filter_frame(AVFilterLink *link, AVFilterBufferRef *buf)
+static int filter_frame(AVFilterLink *link, AVFrame *frame)
 {
 AVFilterContext *ctx = link->dst;
 JoinContext *s = ctx->priv;
@@ -104,7 +94,7 @@
 break;
 av_assert0(i < ctx->nb_inputs);
 av_assert0(!s->input_frames[i]);
- s->input_frames[i] = buf;
+ s->input_frames[i] = frame;
 
 return 0;
 }
@@ -112,14 +102,23 @@
 static int parse_maps(AVFilterContext *ctx)
 {
 JoinContext *s = ctx->priv;
+ char separator = '|';
 char *cur = s->map;
 
+#if FF_API_OLD_FILTER_OPTS
+ if (cur && strchr(cur, ',')) {
+ av_log(ctx, AV_LOG_WARNING, "This syntax is deprecated, use '|' to "
+ "separate the mappings.\n");
+ separator = ',';
+ }
+#endif
+
 while (cur && *cur) {
 char *sep, *next, *p;
 uint64_t in_channel = 0, out_channel = 0;
 int input_idx, out_ch_idx, in_ch_idx;
 
- next = strchr(cur, ',');
+ next = strchr(cur, separator);
 if (next)
 *next++ = 0;
 
@@ -187,18 +186,11 @@
 return 0;
 }
 
-static int join_init(AVFilterContext *ctx, const char *args)
+static av_cold int join_init(AVFilterContext *ctx)
 {
 JoinContext *s = ctx->priv;
 int ret, i;
 
- s->class = &join_class;
- av_opt_set_defaults(s);
- if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", args);
- return ret;
- }
-
 if (!(s->channel_layout = av_get_channel_layout(s->channel_layout_str))) {
 av_log(ctx, AV_LOG_ERROR, "Error parsing channel layout '%s'.\n",
 s->channel_layout_str);
@@ -208,9 +200,9 @@
 
 s->nb_channels = av_get_channel_layout_nb_channels(s->channel_layout);
 s->channels = av_mallocz(sizeof(*s->channels) * s->nb_channels);
- s->data = av_mallocz(sizeof(*s->data) * s->nb_channels);
+ s->buffers = av_mallocz(sizeof(*s->buffers) * s->nb_channels);
 s->input_frames = av_mallocz(sizeof(*s->input_frames) * s->inputs);
- if (!s->channels || !s->data || !s->input_frames) {
+ if (!s->channels || !s->buffers|| !s->input_frames) {
 ret = AVERROR(ENOMEM);
 goto fail;
 }
@@ -242,18 +234,18 @@
 return ret;
 }
 
-static void join_uninit(AVFilterContext *ctx)
+static av_cold void join_uninit(AVFilterContext *ctx)
 {
 JoinContext *s = ctx->priv;
 int i;
 
 for (i = 0; i < ctx->nb_inputs; i++) {
 av_freep(&ctx->input_pads[i].name);
- avfilter_unref_bufferp(&s->input_frames[i]);
+ av_frame_free(&s->input_frames[i]);
 }
 
 av_freep(&s->channels);
- av_freep(&s->data);
+ av_freep(&s->buffers);
 av_freep(&s->input_frames);
 }
 
@@ -395,34 +387,14 @@
 return ret;
 }
 
-static void join_free_buffer(AVFilterBuffer *buf)
-{
- JoinBufferPriv *priv = buf->priv;
-
- if (priv) {
- int i;
-
- for (i = 0; i < priv->nb_in_buffers; i++)
- avfilter_unref_bufferp(&priv->in_buffers[i]);
-
- av_freep(&priv->in_buffers);
- av_freep(&buf->priv);
- }
-
- if (buf->extended_data != buf->data)
- av_freep(&buf->extended_data);
- av_freep(&buf);
-}
-
 static int join_request_frame(AVFilterLink *outlink)
 {
 AVFilterContext *ctx = outlink->src;
 JoinContext *s = ctx->priv;
- AVFilterBufferRef *buf;
- JoinBufferPriv *priv;
+ AVFrame *frame;
 int linesize = INT_MAX;
- int perms = ~0;
 int nb_samples = 0;
+ int nb_buffers = 0;
 int i, j, ret;
 
 /* get a frame on each input */
@@ -435,54 +407,96 @@
 
 /* request the same number of samples on all inputs */
 if (i == 0) {
- nb_samples = s->input_frames[0]->audio->nb_samples;
+ nb_samples = s->input_frames[0]->nb_samples;
 
 for (j = 1; !i && j < ctx->nb_inputs; j++)
 ctx->inputs[j]->request_samples = nb_samples;
 }
 }
 
+ /* setup the output frame */
+ frame = av_frame_alloc();
+ if (!frame)
+ return AVERROR(ENOMEM);
+ if (s->nb_channels > FF_ARRAY_ELEMS(frame->data)) {
+ frame->extended_data = av_mallocz(s->nb_channels *
+ sizeof(*frame->extended_data));
+ if (!frame->extended_data) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ }
+
+ /* copy the data pointers */
 for (i = 0; i < s->nb_channels; i++) {
 ChannelMap *ch = &s->channels[i];
- AVFilterBufferRef *cur_buf = s->input_frames[ch->input];
+ AVFrame *cur = s->input_frames[ch->input];
+ AVBufferRef *buf;
+
+ frame->extended_data[i] = cur->extended_data[ch->in_channel_idx];
+ linesize = FFMIN(linesize, cur->linesize[0]);
 
- s->data[i] = cur_buf->extended_data[ch->in_channel_idx];
- linesize = FFMIN(linesize, cur_buf->linesize[0]);
- perms &= cur_buf->perms;
+ /* add the buffer where this plan is stored to the list if it's
+ * not already there */
+ buf = av_frame_get_plane_buffer(cur, ch->in_channel_idx);
+ if (!buf) {
+ ret = AVERROR(EINVAL);
+ goto fail;
+ }
+ for (j = 0; j < nb_buffers; j++)
+ if (s->buffers[j]->buffer == buf->buffer)
+ break;
+ if (j == i)
+ s->buffers[nb_buffers++] = buf;
 }
 
- av_assert0(nb_samples > 0);
- buf = avfilter_get_audio_buffer_ref_from_arrays(s->data, linesize, perms,
- nb_samples, outlink->format,
- outlink->channel_layout);
- if (!buf)
- return AVERROR(ENOMEM);
+ /* create references to the buffers we copied to output */
+ if (nb_buffers > FF_ARRAY_ELEMS(frame->buf)) {
+ frame->nb_extended_buf = nb_buffers - FF_ARRAY_ELEMS(frame->buf);
+ frame->extended_buf = av_mallocz(sizeof(*frame->extended_buf) *
+ frame->nb_extended_buf);
+ if (!frame->extended_buf) {
+ frame->nb_extended_buf = 0;
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ }
+ for (i = 0; i < FFMIN(FF_ARRAY_ELEMS(frame->buf), nb_buffers); i++) {
+ frame->buf[i] = av_buffer_ref(s->buffers[i]);
+ if (!frame->buf[i]) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ }
+ for (i = 0; i < frame->nb_extended_buf; i++) {
+ frame->extended_buf[i] = av_buffer_ref(s->buffers[i +
+ FF_ARRAY_ELEMS(frame->buf)]);
+ if (!frame->extended_buf[i]) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ }
 
- buf->buf->free = join_free_buffer;
- buf->pts = s->input_frames[0]->pts;
+ frame->nb_samples = nb_samples;
+ frame->channel_layout = outlink->channel_layout;
+ frame->sample_rate = outlink->sample_rate;
+ frame->pts = s->input_frames[0]->pts;
+ frame->linesize[0] = linesize;
+ if (frame->data != frame->extended_data) {
+ memcpy(frame->data, frame->extended_data, sizeof(*frame->data) *
+ FFMIN(FF_ARRAY_ELEMS(frame->data), s->nb_channels));
+ }
 
- if (!(priv = av_mallocz(sizeof(*priv))))
- goto fail;
- if (!(priv->in_buffers = av_mallocz(sizeof(*priv->in_buffers) * ctx->nb_inputs)))
- goto fail;
+ ret = ff_filter_frame(outlink, frame);
 
 for (i = 0; i < ctx->nb_inputs; i++)
- priv->in_buffers[i] = s->input_frames[i];
- priv->nb_in_buffers = ctx->nb_inputs;
- buf->buf->priv = priv;
-
- ret = ff_filter_frame(outlink, buf);
-
- memset(s->input_frames, 0, sizeof(*s->input_frames) * ctx->nb_inputs);
+ av_frame_free(&s->input_frames[i]);
 
 return ret;
 
 fail:
- avfilter_unref_buffer(buf);
- if (priv)
- av_freep(&priv->in_buffers);
- av_freep(&priv);
- return AVERROR(ENOMEM);
+ av_frame_free(&frame);
+ return ret;
 }
 
 static const AVFilterPad avfilter_af_join_outputs[] = {
@@ -495,11 +509,12 @@
 { NULL }
 };
 
-AVFilter avfilter_af_join = {
+AVFilter ff_af_join = {
 .name = "join",
 .description = NULL_IF_CONFIG_SMALL("Join multiple audio streams into "
 "multi-channel output"),
 .priv_size = sizeof(JoinContext),
+ .priv_class = &join_class,
 
 .init = join_init,
 .uninit = join_uninit,
@@ -507,4 +522,6 @@
 
 .inputs = NULL,
 .outputs = avfilter_af_join_outputs,
+
+ .flags = AVFILTER_FLAG_DYNAMIC_INPUTS,
 };

libav-v9.6.tar.bz2/libavfilter/af_resample.c -> libav-v10.1.tar.bz2/libavfilter/af_resample.c Changed

@@ -25,6 +25,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/common.h"
+#include "libavutil/dict.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 
@@ -36,7 +37,9 @@
 #include "internal.h"
 
 typedef struct ResampleContext {
+ const AVClass *class;
 AVAudioResampleContext *avr;
+ AVDictionary *options;
 
 int64_t next_pts;
 
@@ -44,6 +47,33 @@
 int got_output;
 } ResampleContext;
 
+static av_cold int init(AVFilterContext *ctx, AVDictionary **opts)
+{
+ ResampleContext *s = ctx->priv;
+ const AVClass *avr_class = avresample_get_class();
+ AVDictionaryEntry *e = NULL;
+
+ while ((e = av_dict_get(*opts, "", e, AV_DICT_IGNORE_SUFFIX))) {
+ if (av_opt_find(&avr_class, e->key, NULL, 0,
+ AV_OPT_SEARCH_FAKE_OBJ | AV_OPT_SEARCH_CHILDREN))
+ av_dict_set(&s->options, e->key, e->value, 0);
+ }
+
+ e = NULL;
+ while ((e = av_dict_get(s->options, "", e, AV_DICT_IGNORE_SUFFIX)))
+ av_dict_set(opts, e->key, NULL, 0);
+
+ /* do not allow the user to override basic format options */
+ av_dict_set(&s->options, "in_channel_layout", NULL, 0);
+ av_dict_set(&s->options, "out_channel_layout", NULL, 0);
+ av_dict_set(&s->options, "in_sample_fmt", NULL, 0);
+ av_dict_set(&s->options, "out_sample_fmt", NULL, 0);
+ av_dict_set(&s->options, "in_sample_rate", NULL, 0);
+ av_dict_set(&s->options, "out_sample_rate", NULL, 0);
+
+ return 0;
+}
+
 static av_cold void uninit(AVFilterContext *ctx)
 {
 ResampleContext *s = ctx->priv;
@@ -52,6 +82,7 @@
 avresample_close(s->avr);
 avresample_free(&s->avr);
 }
+ av_dict_free(&s->options);
 }
 
 static int query_formats(AVFilterContext *ctx)
@@ -103,6 +134,14 @@
 if (!(s->avr = avresample_alloc_context()))
 return AVERROR(ENOMEM);
 
+ if (s->options) {
+ AVDictionaryEntry *e = NULL;
+ while ((e = av_dict_get(s->options, "", e, AV_DICT_IGNORE_SUFFIX)))
+ av_log(ctx, AV_LOG_VERBOSE, "lavr option: %s=%s\n", e->key, e->value);
+
+ av_opt_set_dict(s->avr, &s->options);
+ }
+
 av_opt_set_int(s->avr, "in_channel_layout", inlink ->channel_layout, 0);
 av_opt_set_int(s->avr, "out_channel_layout", outlink->channel_layout, 0);
 av_opt_set_int(s->avr, "in_sample_fmt", inlink ->format, 0);
@@ -140,7 +179,7 @@
 
 /* flush the lavr delay buffer */
 if (ret == AVERROR_EOF && s->avr) {
- AVFilterBufferRef *buf;
+ AVFrame *frame;
 int nb_samples = av_rescale_rnd(avresample_get_delay(s->avr),
 outlink->sample_rate,
 ctx->inputs[0]->sample_rate,
@@ -149,25 +188,25 @@
 if (!nb_samples)
 return ret;
 
- buf = ff_get_audio_buffer(outlink, AV_PERM_WRITE, nb_samples);
- if (!buf)
+ frame = ff_get_audio_buffer(outlink, nb_samples);
+ if (!frame)
 return AVERROR(ENOMEM);
 
- ret = avresample_convert(s->avr, buf->extended_data,
- buf->linesize[0], nb_samples,
+ ret = avresample_convert(s->avr, frame->extended_data,
+ frame->linesize[0], nb_samples,
 NULL, 0, 0);
 if (ret <= 0) {
- avfilter_unref_buffer(buf);
+ av_frame_free(&frame);
 return (ret == 0) ? AVERROR_EOF : ret;
 }
 
- buf->pts = s->next_pts;
- return ff_filter_frame(outlink, buf);
+ frame->pts = s->next_pts;
+ return ff_filter_frame(outlink, frame);
 }
 return ret;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
+static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 {
 AVFilterContext *ctx = inlink->dst;
 ResampleContext *s = ctx->priv;
@@ -175,27 +214,26 @@
 int ret;
 
 if (s->avr) {
- AVFilterBufferRef *buf_out;
+ AVFrame *out;
 int delay, nb_samples;
 
 /* maximum possible samples lavr can output */
 delay = avresample_get_delay(s->avr);
- nb_samples = av_rescale_rnd(buf->audio->nb_samples + delay,
+ nb_samples = av_rescale_rnd(in->nb_samples + delay,
 outlink->sample_rate, inlink->sample_rate,
 AV_ROUND_UP);
 
- buf_out = ff_get_audio_buffer(outlink, AV_PERM_WRITE, nb_samples);
- if (!buf_out) {
+ out = ff_get_audio_buffer(outlink, nb_samples);
+ if (!out) {
 ret = AVERROR(ENOMEM);
 goto fail;
 }
 
- ret = avresample_convert(s->avr, buf_out->extended_data,
- buf_out->linesize[0], nb_samples,
- buf->extended_data, buf->linesize[0],
- buf->audio->nb_samples);
+ ret = avresample_convert(s->avr, out->extended_data, out->linesize[0],
+ nb_samples, in->extended_data, in->linesize[0],
+ in->nb_samples);
 if (ret <= 0) {
- avfilter_unref_buffer(buf_out);
+ av_frame_free(&out);
 if (ret < 0)
 goto fail;
 }
@@ -203,48 +241,74 @@
 av_assert0(!avresample_available(s->avr));
 
 if (s->next_pts == AV_NOPTS_VALUE) {
- if (buf->pts == AV_NOPTS_VALUE) {
+ if (in->pts == AV_NOPTS_VALUE) {
 av_log(ctx, AV_LOG_WARNING, "First timestamp is missing, "
 "assuming 0.\n");
 s->next_pts = 0;
 } else
- s->next_pts = av_rescale_q(buf->pts, inlink->time_base,
+ s->next_pts = av_rescale_q(in->pts, inlink->time_base,
 outlink->time_base);
 }
 
 if (ret > 0) {
- buf_out->audio->nb_samples = ret;
- if (buf->pts != AV_NOPTS_VALUE) {
- buf_out->pts = av_rescale_q(buf->pts, inlink->time_base,
+ out->nb_samples = ret;
+
+ ret = av_frame_copy_props(out, in);
+ if (ret < 0) {
+ av_frame_free(&out);
+ goto fail;
+ }
+
+ out->sample_rate = outlink->sample_rate;
+ if (in->pts != AV_NOPTS_VALUE) {
+ out->pts = av_rescale_q(in->pts, inlink->time_base,
 outlink->time_base) -
 av_rescale(delay, outlink->sample_rate,
 inlink->sample_rate);
 } else
- buf_out->pts = s->next_pts;
+ out->pts = s->next_pts;
 
- s->next_pts = buf_out->pts + buf_out->audio->nb_samples;
+ s->next_pts = out->pts + out->nb_samples;
 
- ret = ff_filter_frame(outlink, buf_out);
+ ret = ff_filter_frame(outlink, out);
 s->got_output = 1;
 }
 
 fail:
- avfilter_unref_buffer(buf);
+ av_frame_free(&in);
 } else {
- buf->format = outlink->format;
- ret = ff_filter_frame(outlink, buf);
+ in->format = outlink->format;
+ ret = ff_filter_frame(outlink, in);
 s->got_output = 1;
 }
 
 return ret;
 }
 
+static const AVClass *resample_child_class_next(const AVClass *prev)
+{
+ return prev ? NULL : avresample_get_class();
+}
+
+static void *resample_child_next(void *obj, void *prev)
+{
+ ResampleContext *s = obj;
+ return prev ? NULL : s->avr;
+}
+
+static const AVClass resample_class = {
+ .class_name = "resample",
+ .item_name = av_default_item_name,
+ .version = LIBAVUTIL_VERSION_INT,
+ .child_class_next = resample_child_class_next,
+ .child_next = resample_child_next,
+};
+
 static const AVFilterPad avfilter_af_resample_inputs[] = {
 {
 .name = "default",
 .type = AVMEDIA_TYPE_AUDIO,
 .filter_frame = filter_frame,
- .min_perms = AV_PERM_READ
 },
 { NULL }
 };
@@ -259,11 +323,13 @@
 { NULL }
 };
 
-AVFilter avfilter_af_resample = {
+AVFilter ff_af_resample = {
 .name = "resample",
 .description = NULL_IF_CONFIG_SMALL("Audio resampling and conversion."),
 .priv_size = sizeof(ResampleContext),
+ .priv_class = &resample_class,
 
+ .init_dict = init,
 .uninit = uninit,
 .query_formats = query_formats,

libav-v9.6.tar.bz2/libavfilter/af_volume.c -> libav-v10.1.tar.bz2/libavfilter/af_volume.c Changed

@@ -24,7 +24,7 @@
 * audio volume filter
 */
 
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/eval.h"
 #include "libavutil/float_dsp.h"
@@ -60,18 +60,9 @@
 .version = LIBAVUTIL_VERSION_INT,
 };
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
 VolumeContext *vol = ctx->priv;
- int ret;
-
- vol->class = &volume_class;
- av_opt_set_defaults(vol);
-
- if ((ret = av_set_options_string(vol, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", args);
- return ret;
- }
 
 if (vol->precision == PRECISION_FIXED) {
 vol->volume_i = (int)(vol->volume * 256 + 0.5);
@@ -84,8 +75,7 @@
 precision_str[vol->precision]);
 }
 
- av_opt_free(vol);
- return ret;
+ return 0;
 }
 
 static int query_formats(AVFilterContext *ctx)
@@ -184,7 +174,7 @@
 
 
 
-static void volume_init(VolumeContext *vol)
+static av_cold void volume_init(VolumeContext *vol)
 {
 vol->samples_align = 1;
 
@@ -233,24 +223,30 @@
 return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
+static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
 {
 VolumeContext *vol = inlink->dst->priv;
 AVFilterLink *outlink = inlink->dst->outputs[0];
- int nb_samples = buf->audio->nb_samples;
- AVFilterBufferRef *out_buf;
+ int nb_samples = buf->nb_samples;
+ AVFrame *out_buf;
+ int ret;
 
 if (vol->volume == 1.0 || vol->volume_i == 256)
 return ff_filter_frame(outlink, buf);
 
 /* do volume scaling in-place if input buffer is writable */
- if (buf->perms & AV_PERM_WRITE) {
+ if (av_frame_is_writable(buf)) {
 out_buf = buf;
 } else {
- out_buf = ff_get_audio_buffer(inlink, AV_PERM_WRITE, nb_samples);
+ out_buf = ff_get_audio_buffer(inlink, nb_samples);
 if (!out_buf)
 return AVERROR(ENOMEM);
- out_buf->pts = buf->pts;
+ 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) {
@@ -282,8 +278,10 @@
 }
 }
 
+ emms_c();
+
 if (buf != out_buf)
- avfilter_unref_buffer(buf);
+ av_frame_free(&buf);
 
 return ff_filter_frame(outlink, out_buf);
 }
@@ -306,11 +304,12 @@
 { 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,
 .inputs = avfilter_af_volume_inputs,
 .outputs = avfilter_af_volume_outputs,

libav-v9.6.tar.bz2/libavfilter/allfilters.c -> libav-v10.1.tar.bz2/libavfilter/allfilters.c Changed

@@ -25,15 +25,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)
@@ -47,11 +47,14 @@
     REGISTER_FILTER(AFORMAT,        aformat,        af);
     REGISTER_FILTER(AMIX,           amix,           af);
     REGISTER_FILTER(ANULL,          anull,          af);
+    REGISTER_FILTER(ASETPTS,        asetpts,        af);
     REGISTER_FILTER(ASHOWINFO,      ashowinfo,      af);
     REGISTER_FILTER(ASPLIT,         asplit,         af);
     REGISTER_FILTER(ASYNCTS,        asyncts,        af);
+    REGISTER_FILTER(ATRIM,          atrim,          af);
     REGISTER_FILTER(CHANNELMAP,     channelmap,     af);
     REGISTER_FILTER(CHANNELSPLIT,   channelsplit,   af);
+    REGISTER_FILTER(COMPAND,        compand,        af);
     REGISTER_FILTER(JOIN,           join,           af);
     REGISTER_FILTER(RESAMPLE,       resample,       af);
     REGISTER_FILTER(VOLUME,         volume,         af);
@@ -72,10 +75,12 @@
     REGISTER_FILTER(FIELDORDER,     fieldorder,     vf);
     REGISTER_FILTER(FORMAT,         format,         vf);
     REGISTER_FILTER(FPS,            fps,            vf);
+    REGISTER_FILTER(FRAMEPACK,      framepack,      vf);
     REGISTER_FILTER(FREI0R,         frei0r,         vf);
     REGISTER_FILTER(GRADFUN,        gradfun,        vf);
     REGISTER_FILTER(HFLIP,          hflip,          vf);
     REGISTER_FILTER(HQDN3D,         hqdn3d,         vf);
+    REGISTER_FILTER(INTERLACE,      interlace,      vf);
     REGISTER_FILTER(LUT,            lut,            vf);
     REGISTER_FILTER(LUTRGB,         lutrgb,         vf);
     REGISTER_FILTER(LUTYUV,         lutyuv,         vf);
@@ -95,6 +100,7 @@
     REGISTER_FILTER(SHOWINFO,       showinfo,       vf);
     REGISTER_FILTER(SPLIT,          split,          vf);
     REGISTER_FILTER(TRANSPOSE,      transpose,      vf);
+    REGISTER_FILTER(TRIM,           trim,           vf);
     REGISTER_FILTER(UNSHARP,        unsharp,        vf);
     REGISTER_FILTER(VFLIP,          vflip,          vf);
     REGISTER_FILTER(YADIF,          yadif,          vf);

libav-v9.6.tar.bz2/libavfilter/asink_anullsink.c -> libav-v10.1.tar.bz2/libavfilter/asink_anullsink.c Changed

libav-v9.6.tar.bz2/libavfilter/asrc_anullsrc.c -> libav-v10.1.tar.bz2/libavfilter/asrc_anullsrc.c Changed

@@ -29,78 +29,24 @@
 #include "avfilter.h"
 #include "internal.h"
 
-typedef struct {
- uint64_t channel_layout;
- int64_t sample_rate;
-} ANullContext;
-
-static int init(AVFilterContext *ctx, const char *args)
-{
- ANullContext *priv = ctx->priv;
- char channel_layout_str[128] = "";
-
- priv->sample_rate = 44100;
- priv->channel_layout = AV_CH_LAYOUT_STEREO;
-
- if (args)
- sscanf(args, "%"PRId64":%s", &priv->sample_rate, channel_layout_str);
-
- if (priv->sample_rate < 0) {
- av_log(ctx, AV_LOG_ERROR, "Invalid negative sample rate: %"PRId64"\n", priv->sample_rate);
- return AVERROR(EINVAL);
- }
-
- if (*channel_layout_str)
- if (!(priv->channel_layout = av_get_channel_layout(channel_layout_str))
- && sscanf(channel_layout_str, "%"PRId64, &priv->channel_layout) != 1) {
- av_log(ctx, AV_LOG_ERROR, "Invalid value '%s' for channel layout\n",
- channel_layout_str);
- return AVERROR(EINVAL);
- }
-
- return 0;
-}
-
-static int config_props(AVFilterLink *outlink)
-{
- ANullContext *priv = outlink->src->priv;
- char buf[128];
- int chans_nb;
-
- outlink->sample_rate = priv->sample_rate;
- outlink->channel_layout = priv->channel_layout;
-
- chans_nb = av_get_channel_layout_nb_channels(priv->channel_layout);
- av_get_channel_layout_string(buf, sizeof(buf), chans_nb, priv->channel_layout);
- av_log(outlink->src, AV_LOG_VERBOSE,
- "sample_rate:%"PRId64 " channel_layout:%"PRId64 " channel_layout_description:'%s'\n",
- priv->sample_rate, priv->channel_layout, buf);
-
- return 0;
-}
-
 static int request_frame(AVFilterLink *link)
 {
- return -1;
+ return AVERROR_EOF;
 }
 
 static const AVFilterPad avfilter_asrc_anullsrc_outputs[] = {
 {
 .name = "default",
 .type = AVMEDIA_TYPE_AUDIO,
- .config_props = config_props,
 .request_frame = request_frame,
 },
 { NULL }
 };
 
-AVFilter avfilter_asrc_anullsrc = {
+AVFilter ff_asrc_anullsrc = {
 .name = "anullsrc",
 .description = NULL_IF_CONFIG_SMALL("Null audio source, never return audio frames."),
 
- .init = init,
- .priv_size = sizeof(ANullContext),
-
 .inputs = NULL,
 
 .outputs = avfilter_asrc_anullsrc_outputs,

libav-v9.6.tar.bz2/libavfilter/audio.c -> libav-v10.1.tar.bz2/libavfilter/audio.c Changed

@@ -23,60 +23,51 @@
 #include "avfilter.h"
 #include "internal.h"
 
-AVFilterBufferRef *ff_null_get_audio_buffer(AVFilterLink *link, int perms,
- int nb_samples)
+AVFrame *ff_null_get_audio_buffer(AVFilterLink *link, int nb_samples)
 {
- return ff_get_audio_buffer(link->dst->outputs[0], perms, nb_samples);
+ return ff_get_audio_buffer(link->dst->outputs[0], nb_samples);
 }
 
-AVFilterBufferRef *ff_default_get_audio_buffer(AVFilterLink *link, int perms,
- int nb_samples)
+AVFrame *ff_default_get_audio_buffer(AVFilterLink *link, int nb_samples)
 {
- AVFilterBufferRef *samplesref = NULL;
- uint8_t **data;
- int planar = av_sample_fmt_is_planar(link->format);
- int nb_channels = av_get_channel_layout_nb_channels(link->channel_layout);
- int planes = planar ? nb_channels : 1;
- int linesize;
-
- if (!(data = av_mallocz(sizeof(*data) * planes)))
- goto fail;
-
- if (av_samples_alloc(data, &linesize, nb_channels, nb_samples, link->format, 0) < 0)
- goto fail;
+ AVFrame *frame = av_frame_alloc();
+ int channels = av_get_channel_layout_nb_channels(link->channel_layout);
+ int ret;
+
+ if (!frame)
+ return NULL;
+
+ frame->nb_samples = nb_samples;
+ frame->format = link->format;
+ frame->channel_layout = link->channel_layout;
+ frame->sample_rate = link->sample_rate;
+ ret = av_frame_get_buffer(frame, 0);
+ if (ret < 0) {
+ av_frame_free(&frame);
+ return NULL;
+ }
 
- samplesref = avfilter_get_audio_buffer_ref_from_arrays(data, linesize, perms,
- nb_samples, link->format,
- link->channel_layout);
- if (!samplesref)
- goto fail;
+ av_samples_set_silence(frame->extended_data, 0, nb_samples, channels,
+ link->format);
 
- av_freep(&data);
 
-fail:
- if (data)
- av_freep(&data[0]);
- av_freep(&data);
- return samplesref;
+ return frame;
 }
 
-AVFilterBufferRef *ff_get_audio_buffer(AVFilterLink *link, int perms,
- int nb_samples)
+AVFrame *ff_get_audio_buffer(AVFilterLink *link, int nb_samples)
 {
- AVFilterBufferRef *ret = NULL;
+ AVFrame *ret = NULL;
 
 if (link->dstpad->get_audio_buffer)
- ret = link->dstpad->get_audio_buffer(link, perms, nb_samples);
+ ret = link->dstpad->get_audio_buffer(link, nb_samples);
 
 if (!ret)
- ret = ff_default_get_audio_buffer(link, perms, nb_samples);
-
- if (ret)
- ret->type = AVMEDIA_TYPE_AUDIO;
+ ret = ff_default_get_audio_buffer(link, nb_samples);
 
 return ret;
 }
 
+#if FF_API_AVFILTERBUFFER
 AVFilterBufferRef* avfilter_get_audio_buffer_ref_from_arrays(uint8_t **data,
 int linesize,int perms,
 int nb_samples,
@@ -146,3 +137,4 @@
 av_freep(&samples);
 return NULL;
 }
+#endif

libav-v9.6.tar.bz2/libavfilter/audio.h -> libav-v10.1.tar.bz2/libavfilter/audio.h Changed

@@ -22,24 +22,20 @@
 #include "avfilter.h"
 
 /** default handler for get_audio_buffer() for audio inputs */
-AVFilterBufferRef *ff_default_get_audio_buffer(AVFilterLink *link, int perms,
-                                                     int nb_samples);
+AVFrame *ff_default_get_audio_buffer(AVFilterLink *link, int nb_samples);
 
 /** get_audio_buffer() handler for filters which simply pass audio along */
-AVFilterBufferRef *ff_null_get_audio_buffer(AVFilterLink *link, int perms,
-                                                  int nb_samples);
+AVFrame *ff_null_get_audio_buffer(AVFilterLink *link, int nb_samples);
 
 /**
  * Request an audio samples buffer with a specific set of permissions.
  *
  * @param link           the output link to the filter from which the buffer will
  *                       be requested
- * @param perms          the required access permissions
  * @param nb_samples     the number of samples per channel
  * @return               A reference to the samples. This must be unreferenced with
  *                       avfilter_unref_buffer when you are finished with it.
  */
-AVFilterBufferRef *ff_get_audio_buffer(AVFilterLink *link, int perms,
-                                             int nb_samples);
+AVFrame *ff_get_audio_buffer(AVFilterLink *link, int nb_samples);
 
 #endif /* AVFILTER_AUDIO_H */

libav-v9.6.tar.bz2/libavfilter/avfilter.c -> libav-v10.1.tar.bz2/libavfilter/avfilter.c Changed

@@ -19,11 +19,12 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-/* #define DEBUG */
-
+#include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/internal.h"
+#include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/rational.h"
 #include "libavutil/samplefmt.h"
@@ -34,7 +35,8 @@
 #include "internal.h"
 #include "video.h"
 
-unsigned avfilter_version(void) {
+unsigned avfilter_version(void)
+{
 return LIBAVFILTER_VERSION_INT;
 }
 
@@ -59,13 +61,13 @@
 
 *pads = av_realloc(*pads, sizeof(AVFilterPad) * (*count + 1));
 *links = av_realloc(*links, sizeof(AVFilterLink*) * (*count + 1));
- memmove(*pads +idx+1, *pads +idx, sizeof(AVFilterPad) * (*count-idx));
- memmove(*links+idx+1, *links+idx, sizeof(AVFilterLink*) * (*count-idx));
- memcpy(*pads+idx, newpad, sizeof(AVFilterPad));
+ memmove(*pads + idx + 1, *pads + idx, sizeof(AVFilterPad) * (*count - idx));
+ memmove(*links + idx + 1, *links + idx, sizeof(AVFilterLink*) * (*count - idx));
+ memcpy(*pads + idx, newpad, sizeof(AVFilterPad));
 (*links)[idx] = NULL;
 
 (*count)++;
- for (i = idx+1; i < *count; i++)
+ for (i = idx + 1; i < *count; i++)
 if (*links[i])
 (*(unsigned *)((uint8_t *) *links[i] + padidx_off))++;
 }
@@ -86,8 +88,11 @@
 return AVERROR(EINVAL);
 }
 
- src->outputs[srcpad] =
- dst-> inputs[dstpad] = link = av_mallocz(sizeof(AVFilterLink));
+ link = av_mallocz(sizeof(*link));
+ if (!link)
+ return AVERROR(ENOMEM);
+
+ src->outputs[srcpad] = dst->inputs[dstpad] = link;
 
 link->src = src;
 link->dst = dst;
@@ -118,18 +123,18 @@
 }
 
 /* re-hookup the link to the new destination filter we inserted */
- link->dst = filt;
- link->dstpad = &filt->input_pads[filt_srcpad_idx];
+ link->dst = filt;
+ link->dstpad = &filt->input_pads[filt_srcpad_idx];
 filt->inputs[filt_srcpad_idx] = link;
 
 /* if any information on supported media formats already exists on the
 * link, we need to preserve that */
 if (link->out_formats)
 ff_formats_changeref(&link->out_formats,
- &filt->outputs[filt_dstpad_idx]->out_formats);
+ &filt->outputs[filt_dstpad_idx]->out_formats);
 if (link->out_samplerates)
 ff_formats_changeref(&link->out_samplerates,
- &filt->outputs[filt_dstpad_idx]->out_samplerates);
+ &filt->outputs[filt_dstpad_idx]->out_samplerates);
 if (link->out_channel_layouts)
 ff_channel_layouts_changeref(&link->out_channel_layouts,
 &filt->outputs[filt_dstpad_idx]->out_channel_layouts);
@@ -265,51 +270,60 @@
 return min;
 }
 
-#define MAX_REGISTERED_AVFILTERS_NB 64
-
-static AVFilter *registered_avfilters[MAX_REGISTERED_AVFILTERS_NB + 1];
-
-static int next_registered_avfilter_idx = 0;
+static AVFilter *first_filter;
 
+#if !FF_API_NOCONST_GET_NAME
+const
+#endif
 AVFilter *avfilter_get_by_name(const char *name)
 {
- int i;
+ const AVFilter *f = NULL;
 
- for (i = 0; registered_avfilters[i]; i++)
- if (!strcmp(registered_avfilters[i]->name, name))
- return registered_avfilters[i];
+ if (!name)
+ return NULL;
+
+ while ((f = avfilter_next(f)))
+ if (!strcmp(f->name, name))
+ return f;
 
 return NULL;
 }
 
 int avfilter_register(AVFilter *filter)
 {
- if (next_registered_avfilter_idx == MAX_REGISTERED_AVFILTERS_NB)
- return -1;
-
- registered_avfilters[next_registered_avfilter_idx++] = filter;
+ AVFilter **f = &first_filter;
+ while (*f)
+ f = &(*f)->next;
+ *f = filter;
+ filter->next = NULL;
 return 0;
 }
 
+const AVFilter *avfilter_next(const AVFilter *prev)
+{
+ return prev ? prev->next : first_filter;
+}
+
+#if FF_API_OLD_FILTER_REGISTER
 AVFilter **av_filter_next(AVFilter **filter)
 {
- return filter ? ++filter : &registered_avfilters[0];
+ return filter ? &(*filter)->next : &first_filter;
 }
 
 void avfilter_uninit(void)
 {
- memset(registered_avfilters, 0, sizeof(registered_avfilters));
- next_registered_avfilter_idx = 0;
 }
+#endif
 
-static int pad_count(const AVFilterPad *pads)
+int avfilter_pad_count(const AVFilterPad *pads)
 {
 int count;
 
 if (!pads)
 return 0;
 
- for(count = 0; pads->name; count ++) pads ++;
+ for (count = 0; pads->name; count++)
+ pads++;
 return count;
 }
 
@@ -319,24 +333,70 @@
 return filter->filter->name;
 }
 
+static void *filter_child_next(void *obj, void *prev)
+{
+ AVFilterContext *ctx = obj;
+ if (!prev && ctx->filter && ctx->filter->priv_class && ctx->priv)
+ return ctx->priv;
+ return NULL;
+}
+
+static const AVClass *filter_child_class_next(const AVClass *prev)
+{
+ const AVFilter *f = NULL;
+
+ while (prev && (f = avfilter_next(f)))
+ if (f->priv_class == prev)
+ break;
+
+ while ((f = avfilter_next(f)))
+ if (f->priv_class)
+ return f->priv_class;
+
+ return NULL;
+}
+
+#define OFFSET(x) offsetof(AVFilterContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption avfilter_options[] = {
+ { "thread_type", "Allowed thread types", OFFSET(thread_type), AV_OPT_TYPE_FLAGS,
+ { .i64 = AVFILTER_THREAD_SLICE }, 0, INT_MAX, FLAGS, "thread_type" },
+ { "slice", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AVFILTER_THREAD_SLICE }, .unit = "thread_type" },
+ { NULL },
+};
+
 static const AVClass avfilter_class = {
- "AVFilter",
- filter_name,
- NULL,
- LIBAVUTIL_VERSION_INT,
+ .class_name = "AVFilter",
+ .item_name = filter_name,
+ .version = LIBAVUTIL_VERSION_INT,
+ .child_next = filter_child_next,
+ .child_class_next = filter_child_class_next,
+ .option = avfilter_options,
 };
 
-int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name)
+static int default_execute(AVFilterContext *ctx, avfilter_action_func *func, void *arg,
+ int *ret, int nb_jobs)
+{
+ int i;
+
+ for (i = 0; i < nb_jobs; i++) {
+ int r = func(ctx, arg, i, nb_jobs);
+ if (ret)
+ ret[i] = r;
+ }
+ return 0;
+}
+
+AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name)
 {
 AVFilterContext *ret;
- *filter_ctx = NULL;
 
 if (!filter)
- return AVERROR(EINVAL);
+ return NULL;
 
 ret = av_mallocz(sizeof(AVFilterContext));
 if (!ret)
- return AVERROR(ENOMEM);
+ return NULL;
 
 ret->av_class = &avfilter_class;
 ret->filter = filter;
@@ -347,7 +407,18 @@
 goto err;
 }
 
- ret->nb_inputs = pad_count(filter->inputs);
+ av_opt_set_defaults(ret);
+ if (filter->priv_class) {
+ *(const AVClass**)ret->priv = filter->priv_class;
+ av_opt_set_defaults(ret->priv);
+ }
+
+ ret->internal = av_mallocz(sizeof(*ret->internal));
+ if (!ret->internal)
+ goto err;
+ ret->internal->execute = default_execute;
+
+ ret->nb_inputs = avfilter_pad_count(filter->inputs);
 if (ret->nb_inputs ) {
 ret->input_pads = av_malloc(sizeof(AVFilterPad) * ret->nb_inputs);
 if (!ret->input_pads)
@@ -358,7 +429,7 @@
 goto err;
 }
 
- ret->nb_outputs = pad_count(filter->outputs);
+ ret->nb_outputs = avfilter_pad_count(filter->outputs);
 if (ret->nb_outputs) {
 ret->output_pads = av_malloc(sizeof(AVFilterPad) * ret->nb_outputs);
 if (!ret->output_pads)
@@ -369,12 +440,13 @@
 goto err;
 }
 #if FF_API_FOO_COUNT
+FF_DISABLE_DEPRECATION_WARNINGS
 ret->output_count = ret->nb_outputs;
 ret->input_count = ret->nb_inputs;
+FF_ENABLE_DEPRECATION_WARNINGS
 #endif
 
- *filter_ctx = ret;
- return 0;
+ return ret;
 
 err:
 av_freep(&ret->inputs);
@@ -384,84 +456,281 @@
 av_freep(&ret->output_pads);
 ret->nb_outputs = 0;
 av_freep(&ret->priv);
+ av_freep(&ret->internal);
 av_free(ret);
- return AVERROR(ENOMEM);
+ return NULL;
+}
+
+#if FF_API_AVFILTER_OPEN
+int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name)
+{
+ *filter_ctx = ff_filter_alloc(filter, inst_name);
+ return *filter_ctx ? 0 : AVERROR(ENOMEM);
+}
+#endif
+
+static void free_link(AVFilterLink *link)
+{
+ if (!link)
+ return;
+
+ if (link->src)
+ link->src->outputs[link->srcpad - link->src->output_pads] = NULL;
+ if (link->dst)
+ link->dst->inputs[link->dstpad - link->dst->input_pads] = NULL;
+
+ ff_formats_unref(&link->in_formats);
+ ff_formats_unref(&link->out_formats);
+ ff_formats_unref(&link->in_samplerates);
+ ff_formats_unref(&link->out_samplerates);
+ ff_channel_layouts_unref(&link->in_channel_layouts);
+ ff_channel_layouts_unref(&link->out_channel_layouts);
+ av_freep(&link);
 }
 
 void avfilter_free(AVFilterContext *filter)
 {
 int i;
- AVFilterLink *link;
+
+ if (filter->graph)
+ ff_filter_graph_remove_filter(filter->graph, filter);
 
 if (filter->filter->uninit)
 filter->filter->uninit(filter);
 
 for (i = 0; i < filter->nb_inputs; i++) {
- if ((link = filter->inputs[i])) {
- if (link->src)
- link->src->outputs[link->srcpad - link->src->output_pads] = NULL;
- ff_formats_unref(&link->in_formats);
- ff_formats_unref(&link->out_formats);
- ff_formats_unref(&link->in_samplerates);
- ff_formats_unref(&link->out_samplerates);
- ff_channel_layouts_unref(&link->in_channel_layouts);
- ff_channel_layouts_unref(&link->out_channel_layouts);
- }
- av_freep(&link);
+ free_link(filter->inputs[i]);
 }
 for (i = 0; i < filter->nb_outputs; i++) {
- if ((link = filter->outputs[i])) {
- if (link->dst)
- link->dst->inputs[link->dstpad - link->dst->input_pads] = NULL;
- ff_formats_unref(&link->in_formats);
- ff_formats_unref(&link->out_formats);
- ff_formats_unref(&link->in_samplerates);
- ff_formats_unref(&link->out_samplerates);
- ff_channel_layouts_unref(&link->in_channel_layouts);
- ff_channel_layouts_unref(&link->out_channel_layouts);
- }
- av_freep(&link);
+ free_link(filter->outputs[i]);
 }
 
+ if (filter->filter->priv_class)
+ av_opt_free(filter->priv);
+
 av_freep(&filter->name);
 av_freep(&filter->input_pads);
 av_freep(&filter->output_pads);
 av_freep(&filter->inputs);
 av_freep(&filter->outputs);
 av_freep(&filter->priv);
+ av_freep(&filter->internal);
 av_free(filter);
 }
 
+/* process a list of value1:value2:..., each value corresponding
+ * to subsequent AVOption, in the order they are declared */
+static int process_unnamed_options(AVFilterContext *ctx, AVDictionary **options,
+ const char *args)
+{
+ const AVOption *o = NULL;
+ const char *p = args;
+ char *val;
+
+ while (*p) {
+ o = av_opt_next(ctx->priv, o);
+ if (!o) {
+ av_log(ctx, AV_LOG_ERROR, "More options provided than "
+ "this filter supports.\n");
+ return AVERROR(EINVAL);
+ }
+ if (o->type == AV_OPT_TYPE_CONST)
+ continue;
+
+ val = av_get_token(&p, ":");
+ if (!val)
+ return AVERROR(ENOMEM);
+
+ av_dict_set(options, o->name, val, 0);
+
+ av_freep(&val);
+ if (*p)
+ p++;
+ }
+
+ return 0;
+}
+
+#if FF_API_AVFILTER_INIT_FILTER
 int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque)
 {
- int ret=0;
+ return avfilter_init_str(filter, args);
+}
+#endif
+
+int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options)
+{
+ int ret = 0;
+
+ ret = av_opt_set_dict(ctx, options);
+ if (ret < 0) {
+ av_log(ctx, AV_LOG_ERROR, "Error applying generic filter options.\n");
+ return ret;
+ }
+
+ if (ctx->filter->flags & AVFILTER_FLAG_SLICE_THREADS &&
+ ctx->thread_type & ctx->graph->thread_type & AVFILTER_THREAD_SLICE &&
+ ctx->graph->internal->thread_execute) {
+ ctx->thread_type = AVFILTER_THREAD_SLICE;
+ ctx->internal->execute = ctx->graph->internal->thread_execute;
+ } else {
+ ctx->thread_type = 0;
+ }
+
+ if (ctx->filter->priv_class) {
+ ret = av_opt_set_dict(ctx->priv, options);
+ if (ret < 0) {
+ av_log(ctx, AV_LOG_ERROR, "Error applying options to the filter.\n");
+ return ret;
+ }
+ }
+
+ if (ctx->filter->init)
+ ret = ctx->filter->init(ctx);
+ else if (ctx->filter->init_dict)
+ ret = ctx->filter->init_dict(ctx, options);
 
- if (filter->filter->init)
- ret = filter->filter->init(filter, args);
 return ret;
 }
 
-const char *avfilter_pad_get_name(AVFilterPad *pads, int pad_idx)
+int avfilter_init_str(AVFilterContext *filter, const char *args)
+{
+ AVDictionary *options = NULL;
+ AVDictionaryEntry *e;
+ int ret = 0;
+
+ if (args && *args) {
+ if (!filter->filter->priv_class) {
+ av_log(filter, AV_LOG_ERROR, "This filter does not take any "
+ "options, but options were provided: %s.\n", args);
+ return AVERROR(EINVAL);
+ }
+
+#if FF_API_OLD_FILTER_OPTS
+ if (!strcmp(filter->filter->name, "scale") &&
+ strchr(args, ':') && strchr(args, ':') < strchr(args, '=')) {
+ /* old w:h:flags=<flags> syntax */
+ char *copy = av_strdup(args);
+ char *p;
+
+ av_log(filter, AV_LOG_WARNING, "The <w>:<h>:flags=<flags> option "
+ "syntax is deprecated. Use either <w>:<h>:<flags> or "
+ "w=<w>:h=<h>:flags=<flags>.\n");
+
+ if (!copy) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+
+ p = strrchr(copy, ':');
+ if (p) {
+ *p++ = 0;
+ ret = av_dict_parse_string(&options, p, "=", ":", 0);
+ }
+ if (ret >= 0)
+ ret = process_unnamed_options(filter, &options, copy);
+ av_freep(&copy);
+
+ if (ret < 0)
+ goto fail;
+ } else
+#endif
+
+ if (strchr(args, '=')) {
+ /* assume a list of key1=value1:key2=value2:... */
+ ret = av_dict_parse_string(&options, args, "=", ":", 0);
+ if (ret < 0)
+ goto fail;
+#if FF_API_OLD_FILTER_OPTS
+ } else if (!strcmp(filter->filter->name, "format") ||
+ !strcmp(filter->filter->name, "noformat") ||
+ !strcmp(filter->filter->name, "frei0r") ||
+ !strcmp(filter->filter->name, "frei0r_src") ||
+ !strcmp(filter->filter->name, "ocv")) {
+ /* a hack for compatibility with the old syntax
+ * replace colons with |s */
+ char *copy = av_strdup(args);
+ char *p = copy;
+ int nb_leading = 0; // number of leading colons to skip
+
+ if (!copy) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+
+ if (!strcmp(filter->filter->name, "frei0r") ||
+ !strcmp(filter->filter->name, "ocv"))
+ nb_leading = 1;
+ else if (!strcmp(filter->filter->name, "frei0r_src"))
+ nb_leading = 3;
+
+ while (nb_leading--) {
+ p = strchr(p, ':');
+ if (!p) {
+ p = copy + strlen(copy);
+ break;
+ }
+ p++;
+ }
+
+ if (strchr(p, ':')) {
+ av_log(filter, AV_LOG_WARNING, "This syntax is deprecated. Use "
+ "'|' to separate the list items.\n");
+ }
+
+ while ((p = strchr(p, ':')))
+ *p++ = '|';
+
+ ret = process_unnamed_options(filter, &options, copy);
+ av_freep(&copy);
+
+ if (ret < 0)
+ goto fail;
+#endif
+ } else {
+ ret = process_unnamed_options(filter, &options, args);
+ if (ret < 0)
+ goto fail;
+ }
+ }
+
+ ret = avfilter_init_dict(filter, &options);
+ if (ret < 0)
+ goto fail;
+
+ if ((e = av_dict_get(options, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
+ av_log(filter, AV_LOG_ERROR, "No such option: %s.\n", e->key);
+ ret = AVERROR_OPTION_NOT_FOUND;
+ goto fail;
+ }
+
+fail:
+ av_dict_free(&options);
+
+ return ret;
+}
+
+const char *avfilter_pad_get_name(const AVFilterPad *pads, int pad_idx)
 {
 return pads[pad_idx].name;
 }
 
-enum AVMediaType avfilter_pad_get_type(AVFilterPad *pads, int pad_idx)
+enum AVMediaType avfilter_pad_get_type(const AVFilterPad *pads, int pad_idx)
 {
 return pads[pad_idx].type;
 }
 
-static int default_filter_frame(AVFilterLink *link, AVFilterBufferRef *frame)
+static int default_filter_frame(AVFilterLink *link, AVFrame *frame)
 {
 return ff_filter_frame(link->dst->outputs[0], frame);
 }
 
-int ff_filter_frame(AVFilterLink *link, AVFilterBufferRef *frame)
+int ff_filter_frame(AVFilterLink *link, AVFrame *frame)
 {
- int (*filter_frame)(AVFilterLink *, AVFilterBufferRef *);
+ int (*filter_frame)(AVFilterLink *, AVFrame *);
 AVFilterPad *dst = link->dstpad;
- AVFilterBufferRef *out;
- int perms = frame->perms;
+ AVFrame *out = NULL;
+ int ret;
 
 FF_DPRINTF_START(NULL, filter_frame);
 ff_dlog_link(NULL, link, 1);
@@ -469,49 +738,59 @@
 if (!(filter_frame = dst->filter_frame))
 filter_frame = default_filter_frame;
 
- if (frame->linesize[0] < 0)
- perms |= AV_PERM_NEG_LINESIZES;
- /* prepare to copy the frame if the buffer has insufficient permissions */
- if ((dst->min_perms & perms) != dst->min_perms ||
- dst->rej_perms & perms) {
- av_log(link->dst, AV_LOG_DEBUG,
- "Copying data in avfilter (have perms %x, need %x, reject %x)\n",
- perms, link->dstpad->min_perms, link->dstpad->rej_perms);
+ /* copy the frame if needed */
+ if (dst->needs_writable && !av_frame_is_writable(frame)) {
+ av_log(link->dst, AV_LOG_DEBUG, "Copying data in avfilter.\n");
 
 switch (link->type) {
 case AVMEDIA_TYPE_VIDEO:
- out = ff_get_video_buffer(link, dst->min_perms,
- link->w, link->h);
+ out = ff_get_video_buffer(link, link->w, link->h);
 break;
 case AVMEDIA_TYPE_AUDIO:
- out = ff_get_audio_buffer(link, dst->min_perms,
- frame->audio->nb_samples);
+ out = ff_get_audio_buffer(link, frame->nb_samples);
 break;
- default: return AVERROR(EINVAL);
+ default:
+ ret = AVERROR(EINVAL);
+ goto fail;
 }
 if (!out) {
- avfilter_unref_buffer(frame);
- return AVERROR(ENOMEM);
+ ret = AVERROR(ENOMEM);
+ goto fail;
 }
- avfilter_copy_buffer_ref_props(out, frame);
+
+ ret = av_frame_copy_props(out, frame);
+ if (ret < 0)
+ goto fail;
 
 switch (link->type) {
 case AVMEDIA_TYPE_VIDEO:
 av_image_copy(out->data, out->linesize, frame->data, frame->linesize,
- frame->format, frame->video->w, frame->video->h);
+ frame->format, frame->width, frame->height);
 break;
 case AVMEDIA_TYPE_AUDIO:
 av_samples_copy(out->extended_data, frame->extended_data,
- 0, 0, frame->audio->nb_samples,
- av_get_channel_layout_nb_channels(frame->audio->channel_layout),
+ 0, 0, frame->nb_samples,
+ av_get_channel_layout_nb_channels(frame->channel_layout),
 frame->format);
 break;
- default: return AVERROR(EINVAL);
+ default:
+ ret = AVERROR(EINVAL);
+ goto fail;
 }
 
- avfilter_unref_buffer(frame);
+ av_frame_free(&frame);
 } else
 out = frame;
 
 return filter_frame(link, out);
+
+fail:
+ av_frame_free(&out);
+ av_frame_free(&frame);
+ return ret;
+}
+
+const AVClass *avfilter_get_class(void)
+{
+ return &avfilter_class;
 }

libav-v9.6.tar.bz2/libavfilter/avfilter.h -> libav-v10.1.tar.bz2/libavfilter/avfilter.h Changed

@@ -22,7 +22,20 @@
 #ifndef AVFILTER_AVFILTER_H
 #define AVFILTER_AVFILTER_H
 
+/**
+ * @file
+ * @ingroup lavfi
+ * Main libavfilter public API header
+ */
+
+/**
+ * @defgroup lavfi Libavfilter - graph-based frame editing library
+ * @{
+ */
+
+#include "libavutil/attributes.h"
 #include "libavutil/avutil.h"
+#include "libavutil/frame.h"
 #include "libavutil/log.h"
 #include "libavutil/samplefmt.h"
 #include "libavutil/pixfmt.h"
@@ -54,6 +67,7 @@
 typedef struct AVFilterPad AVFilterPad;
 typedef struct AVFilterFormats AVFilterFormats;
 
+#if FF_API_AVFILTERBUFFER
 /**
 * A reference-counted buffer data type used by the filter system. Filters
 * should not store pointers to this structure directly, but instead use the
@@ -177,6 +191,7 @@
 /**
 * Copy properties of src to dst, without copying the actual data
 */
+attribute_deprecated
 void avfilter_copy_buffer_ref_props(AVFilterBufferRef *dst, AVFilterBufferRef *src);
 
 /**
@@ -188,6 +203,7 @@
 * @return a new reference to the buffer with the same properties as the
 * old, excluding any permissions denied by pmask
 */
+attribute_deprecated
 AVFilterBufferRef *avfilter_ref_buffer(AVFilterBufferRef *ref, int pmask);
 
 /**
@@ -199,6 +215,7 @@
 * @note it is recommended to use avfilter_unref_bufferp() instead of this
 * function
 */
+attribute_deprecated
 void avfilter_unref_buffer(AVFilterBufferRef *ref);
 
 /**
@@ -208,7 +225,9 @@
 *
 * @param ref pointer to the buffer reference
 */
+attribute_deprecated
 void avfilter_unref_bufferp(AVFilterBufferRef **ref);
+#endif
 
 #if FF_API_AVFILTERPAD_PUBLIC
 /**
@@ -239,7 +258,7 @@
 *
 * Input pads only.
 */
- int min_perms;
+ attribute_deprecated int min_perms;
 
 /**
 * Permissions which are not accepted on incoming buffers. Any buffer
@@ -250,7 +269,7 @@
 *
 * Input pads only.
 */
- int rej_perms;
+ attribute_deprecated int rej_perms;
 
 /**
 * @deprecated unused
@@ -263,7 +282,7 @@
 *
 * Input video pads only.
 */
- AVFilterBufferRef *(*get_video_buffer)(AVFilterLink *link, int perms, int w, int h);
+ AVFrame *(*get_video_buffer)(AVFilterLink *link, int w, int h);
 
 /**
 * Callback function to get an audio buffer. If NULL, the filter system will
@@ -271,8 +290,7 @@
 *
 * Input audio pads only.
 */
- AVFilterBufferRef *(*get_audio_buffer)(AVFilterLink *link, int perms,
- int nb_samples);
+ AVFrame *(*get_audio_buffer)(AVFilterLink *link, int nb_samples);
 
 /**
 * @deprecated unused
@@ -294,7 +312,7 @@
 * must ensure that samplesref is properly unreferenced on error if it
 * hasn't been passed on to another filter.
 */
- int (*filter_frame)(AVFilterLink *link, AVFilterBufferRef *frame);
+ int (*filter_frame)(AVFilterLink *link, AVFrame *frame);
 
 /**
 * Frame poll callback. This returns the number of immediately available
@@ -339,10 +357,24 @@
 * input pads only.
 */
 int needs_fifo;
+
+ /**
+ * The filter expects writable frames from its input link,
+ * duplicating data buffers if needed.
+ *
+ * input pads only.
+ */
+ int needs_writable;
 };
 #endif
 
 /**
+ * Get the number of elements in a NULL-terminated array of AVFilterPads (e.g.
+ * AVFilter.inputs/outputs).
+ */
+int avfilter_pad_count(const AVFilterPad *pads);
+
+/**
 * Get the name of an AVFilterPad.
 *
 * @param pads an array of AVFilterPads
@@ -351,7 +383,7 @@
 *
 * @return name of the pad_idx'th pad in pads
 */
-const char *avfilter_pad_get_name(AVFilterPad *pads, int pad_idx);
+const char *avfilter_pad_get_name(const AVFilterPad *pads, int pad_idx);
 
 /**
 * Get the type of an AVFilterPad.
@@ -362,23 +394,74 @@
 *
 * @return type of the pad_idx'th pad in pads
 */
-enum AVMediaType avfilter_pad_get_type(AVFilterPad *pads, int pad_idx);
+enum AVMediaType avfilter_pad_get_type(const AVFilterPad *pads, int pad_idx);
+
+/**
+ * The number of the filter inputs is not determined just by AVFilter.inputs.
+ * The filter might add additional inputs during initialization depending on the
+ * options supplied to it.
+ */
+#define AVFILTER_FLAG_DYNAMIC_INPUTS (1 << 0)
+/**
+ * The number of the filter outputs is not determined just by AVFilter.outputs.
+ * The filter might add additional outputs during initialization depending on
+ * the options supplied to it.
+ */
+#define AVFILTER_FLAG_DYNAMIC_OUTPUTS (1 << 1)
+/**
+ * The filter supports multithreading by splitting frames into multiple parts
+ * and processing them concurrently.
+ */
+#define AVFILTER_FLAG_SLICE_THREADS (1 << 2)
 
 /**
 * Filter definition. This defines the pads a filter contains, and all the
 * callback functions used to interact with the filter.
 */
 typedef struct AVFilter {
- const char *name; ///< filter name
+ /**
+ * Filter name. Must be non-NULL and unique among filters.
+ */
+ const char *name;
 
 /**
- * A description for the filter. You should use the
- * NULL_IF_CONFIG_SMALL() macro to define it.
+ * A description of the filter. May be NULL.
+ *
+ * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
 */
 const char *description;
 
- const AVFilterPad *inputs; ///< NULL terminated list of inputs. NULL if none
- const AVFilterPad *outputs; ///< NULL terminated list of outputs. NULL if none
+ /**
+ * List of inputs, terminated by a zeroed element.
+ *
+ * NULL if there are no (static) inputs. Instances of filters with
+ * AVFILTER_FLAG_DYNAMIC_INPUTS set may have more inputs than present in
+ * this list.
+ */
+ const AVFilterPad *inputs;
+ /**
+ * List of outputs, terminated by a zeroed element.
+ *
+ * NULL if there are no (static) outputs. Instances of filters with
+ * AVFILTER_FLAG_DYNAMIC_OUTPUTS set may have more outputs than present in
+ * this list.
+ */
+ const AVFilterPad *outputs;
+
+ /**
+ * A class for the private data, used to declare filter private AVOptions.
+ * This field is NULL for filters that do not declare any options.
+ *
+ * If this field is non-NULL, the first member of the filter private data
+ * must be a pointer to AVClass, which will be set by libavfilter generic
+ * code to this class.
+ */
+ const AVClass *priv_class;
+
+ /**
+ * A combination of AVFILTER_FLAG_*
+ */
+ int flags;
 
 /*****************************************************************
 * All fields below this line are not part of the public API. They
@@ -389,22 +472,71 @@
 */
 
 /**
- * Filter initialization function. Args contains the user-supplied
- * parameters. FIXME: maybe an AVOption-based system would be better?
+ * Filter initialization function.
+ *
+ * This callback will be called only once during the filter lifetime, after
+ * all the options have been set, but before links between filters are
+ * established and format negotiation is done.
+ *
+ * Basic filter initialization should be done here. Filters with dynamic
+ * inputs and/or outputs should create those inputs/outputs here based on
+ * provided options. No more changes to this filter's inputs/outputs can be
+ * done after this callback.
+ *
+ * This callback must not assume that the filter links exist or frame
+ * parameters are known.
+ *
+ * @ref AVFilter.uninit "uninit" is guaranteed to be called even if
+ * initialization fails, so this callback does not have to clean up on
+ * failure.
+ *
+ * @return 0 on success, a negative AVERROR on failure
+ */
+ int (*init)(AVFilterContext *ctx);
+
+ /**
+ * Should be set instead of @ref AVFilter.init "init" by the filters that
+ * want to pass a dictionary of AVOptions to nested contexts that are
+ * allocated during init.
+ *
+ * On return, the options dict should be freed and replaced with one that
+ * contains all the options which could not be processed by this filter (or
+ * with NULL if all the options were processed).
+ *
+ * Otherwise the semantics is the same as for @ref AVFilter.init "init".
 */
- int (*init)(AVFilterContext *ctx, const char *args);
+ int (*init_dict)(AVFilterContext *ctx, AVDictionary **options);
 
 /**
- * Filter uninitialization function. Should deallocate any memory held
- * by the filter, release any buffer references, etc. This does not need
- * to deallocate the AVFilterContext->priv memory itself.
+ * Filter uninitialization function.
+ *
+ * Called only once right before the filter is freed. Should deallocate any
+ * memory held by the filter, release any buffer references, etc. It does
+ * not need to deallocate the AVFilterContext.priv memory itself.
+ *
+ * This callback may be called even if @ref AVFilter.init "init" was not
+ * called or failed, so it must be prepared to handle such a situation.
 */
 void (*uninit)(AVFilterContext *ctx);
 
 /**
- * Queries formats supported by the filter and its pads, and sets the
- * in_formats for links connected to its output pads, and out_formats
- * for links connected to its input pads.
+ * Query formats supported by the filter on its inputs and outputs.
+ *
+ * This callback is called after the filter is initialized (so the inputs
+ * and outputs are fixed), shortly before the format negotiation. This
+ * callback may be called more than once.
+ *
+ * This callback must set AVFilterLink.out_formats on every input link and
+ * AVFilterLink.in_formats on every output link to a list of pixel/sample
+ * formats that the filter supports on that link. For audio links, this
+ * filter must also set @ref AVFilterLink.in_samplerates "in_samplerates" /
+ * @ref AVFilterLink.out_samplerates "out_samplerates" and
+ * @ref AVFilterLink.in_channel_layouts "in_channel_layouts" /
+ * @ref AVFilterLink.out_channel_layouts "out_channel_layouts" analogously.
+ *
+ * This callback may be NULL for filters with one input, in which case
+ * libavfilter assumes that it supports all input formats and preserves
+ * them on output.
 *
 * @return zero on success, a negative value corresponding to an
 * AVERROR code otherwise
@@ -412,31 +544,69 @@
 int (*query_formats)(AVFilterContext *);
 
 int priv_size; ///< size of private data to allocate for the filter
+
+ /**
+ * Used by the filter registration system. Must not be touched by any other
+ * code.
+ */
+ struct AVFilter *next;
 } AVFilter;
 
+/**
+ * Process multiple parts of the frame concurrently.
+ */
+#define AVFILTER_THREAD_SLICE (1 << 0)
+
+typedef struct AVFilterInternal AVFilterInternal;
+
 /** An instance of a filter */
 struct AVFilterContext {
 const AVClass *av_class; ///< needed for av_log()
 
- AVFilter *filter; ///< the AVFilter of which this is an instance
+ const AVFilter *filter; ///< the AVFilter of which this is an instance
 
 char *name; ///< name of this filter instance
 
 AVFilterPad *input_pads; ///< array of input pads
 AVFilterLink **inputs; ///< array of pointers to input links
 #if FF_API_FOO_COUNT
- unsigned input_count; ///< @deprecated use nb_inputs
+ attribute_deprecated unsigned input_count; ///< @deprecated use nb_inputs
 #endif
 unsigned nb_inputs; ///< number of input pads
 
 AVFilterPad *output_pads; ///< array of output pads
 AVFilterLink **outputs; ///< array of pointers to output links
 #if FF_API_FOO_COUNT
- unsigned output_count; ///< @deprecated use nb_outputs
+ attribute_deprecated unsigned output_count; ///< @deprecated use nb_outputs
 #endif
 unsigned nb_outputs; ///< number of output pads
 
 void *priv; ///< private data for use by the filter
+
+ struct AVFilterGraph *graph; ///< filtergraph this filter belongs to
+
+ /**
+ * Type of multithreading being allowed/used. A combination of
+ * AVFILTER_THREAD_* flags.
+ *
+ * May be set by the caller before initializing the filter to forbid some
+ * or all kinds of multithreading for this filter. The default is allowing
+ * everything.
+ *
+ * When the filter is initialized, this field is combined using bit AND with
+ * AVFilterGraph.thread_type to get the final mask used for determining
+ * allowed threading types. I.e. a threading type needs to be set in both
+ * to be allowed.
+ *
+ * After the filter is initialzed, libavfilter sets this field to the
+ * threading type that is actually used (0 for no multithreading).
+ */
+ int thread_type;
+
+ /**
+ * An opaque struct for libavfilter internal use.
+ */
+ AVFilterInternal *internal;
 };
 
 /**
@@ -535,6 +705,7 @@
 */
 int avfilter_config_links(AVFilterContext *filter);
 
+#if FF_API_AVFILTERBUFFER
 /**
 * Create a buffer reference wrapped around an already allocated image
 * buffer.
@@ -546,6 +717,7 @@
 * @param h the height of the image specified by the data and linesize arrays
 * @param format the pixel format of the image specified by the data and linesize arrays
 */
+attribute_deprecated
 AVFilterBufferRef *
 avfilter_get_video_buffer_ref_from_arrays(uint8_t *data[4], int linesize[4], int perms,
 int w, int h, enum AVPixelFormat format);
@@ -561,24 +733,29 @@
 * @param sample_fmt the format of each sample in the buffer to allocate
 * @param channel_layout the channel layout of the buffer
 */
+attribute_deprecated
 AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_arrays(uint8_t **data,
 int linesize,
 int perms,
 int nb_samples,
 enum AVSampleFormat sample_fmt,
 uint64_t channel_layout);
+#endif
 
 /** Initialize the filter system. Register all builtin filters. */
 void avfilter_register_all(void);
 
+#if FF_API_OLD_FILTER_REGISTER
 /** Uninitialize the filter system. Unregister all filters. */
+attribute_deprecated
 void avfilter_uninit(void);
+#endif
 
 /**
 * Register a filter. This is only needed if you plan to use
 * avfilter_get_by_name later to lookup the AVFilter structure by name. A
- * filter can still by instantiated with avfilter_open even if it is not
- * registered.
+ * filter can still by instantiated with avfilter_graph_alloc_filter even if it
+ * is not registered.
 *
 * @param filter the filter to register
 * @return 0 if the registration was succesfull, a negative value
@@ -593,16 +770,31 @@
 * @return the filter definition, if any matching one is registered.
 * NULL if none found.
 */
+#if !FF_API_NOCONST_GET_NAME
+const
+#endif
 AVFilter *avfilter_get_by_name(const char *name);
 
 /**
+ * Iterate over all registered filters.
+ * @return If prev is non-NULL, next registered filter after prev or NULL if
+ * prev is the last filter. If prev is NULL, return the first registered filter.
+ */
+const AVFilter *avfilter_next(const AVFilter *prev);
+
+#if FF_API_OLD_FILTER_REGISTER
+/**
 * If filter is NULL, returns a pointer to the first registered filter pointer,
 * if filter is non-NULL, returns the next pointer after filter.
 * If the returned pointer points to NULL, the last registered filter
 * was already reached.
+ * @deprecated use avfilter_next()
 */
+attribute_deprecated
 AVFilter **av_filter_next(AVFilter **filter);
+#endif
 
+#if FF_API_AVFILTER_OPEN
 /**
 * Create a filter instance.
 *
@@ -611,9 +803,14 @@
 * @param filter the filter to create an instance of
 * @param inst_name Name to give to the new instance. Can be NULL for none.
 * @return >= 0 in case of success, a negative error code otherwise
+ * @deprecated use avfilter_graph_alloc_filter() instead
 */
+attribute_deprecated
 int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name);
+#endif
+
 
+#if FF_API_AVFILTER_INIT_FILTER
 /**
 * Initialize a filter.
 *
@@ -624,10 +821,47 @@
 * of this parameter varies by filter.
 * @return zero on success
 */
+attribute_deprecated
 int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque);
+#endif
 
 /**
- * Free a filter context.
+ * Initialize a filter with the supplied parameters.
+ *
+ * @param ctx uninitialized filter context to initialize
+ * @param args Options to initialize the filter with. This must be a
+ * ':'-separated list of options in the 'key=value' form.
+ * May be NULL if the options have been set directly using the
+ * AVOptions API or there are no options that need to be set.
+ * @return 0 on success, a negative AVERROR on failure
+ */
+int avfilter_init_str(AVFilterContext *ctx, const char *args);
+
+/**
+ * Initialize a filter with the supplied dictionary of options.
+ *
+ * @param ctx uninitialized filter context to initialize
+ * @param options An AVDictionary filled with options for this filter. On
+ * return this parameter will be destroyed and replaced with
+ * a dict containing options that were not found. This dictionary
+ * must be freed by the caller.
+ * May be NULL, then this function is equivalent to
+ * avfilter_init_str() with the second parameter set to NULL.
+ * @return 0 on success, a negative AVERROR on failure
+ *
+ * @note This function and avfilter_init_str() do essentially the same thing,
+ * the difference is in manner in which the options are passed. It is up to the
+ * calling code to choose whichever is more preferable. The two functions also
+ * behave differently when some of the provided options are not declared as
+ * supported by the filter. In such a case, avfilter_init_str() will fail, but
+ * this function will leave those extra options in the options AVDictionary and
+ * continue as usual.
+ */
+int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options);
+
+/**
+ * Free a filter context. This will also remove the filter from its
+ * filtergraph's list of filters.
 *
 * @param filter the filter to free
 */
@@ -645,12 +879,14 @@
 int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt,
 unsigned filt_srcpad_idx, unsigned filt_dstpad_idx);
 
+#if FF_API_AVFILTERBUFFER
 /**
 * Copy the frame properties of src to dst, without copying the actual
 * image data.
 *
 * @return 0 on success, a negative number on error.
 */
+attribute_deprecated
 int avfilter_copy_frame_props(AVFilterBufferRef *dst, const AVFrame *src);
 
 /**
@@ -659,6 +895,275 @@
 *
 * @return 0 on success, a negative number on error.
 */
+attribute_deprecated
 int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src);
+#endif
+
+/**
+ * @return AVClass for AVFilterContext.
+ *
+ * @see av_opt_find().
+ */
+const AVClass *avfilter_get_class(void);
+
+typedef struct AVFilterGraphInternal AVFilterGraphInternal;
+
+/**
+ * A function pointer passed to the @ref AVFilterGraph.execute callback to be
+ * executed multiple times, possibly in parallel.
+ *
+ * @param ctx the filter context the job belongs to
+ * @param arg an opaque parameter passed through from @ref
+ * AVFilterGraph.execute
+ * @param jobnr the index of the job being executed
+ * @param nb_jobs the total number of jobs
+ *
+ * @return 0 on success, a negative AVERROR on error
+ */
+typedef int (avfilter_action_func)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);
+
+/**
+ * A function executing multiple jobs, possibly in parallel.
+ *
+ * @param ctx the filter context to which the jobs belong
+ * @param func the function to be called multiple times
+ * @param arg the argument to be passed to func
+ * @param ret a nb_jobs-sized array to be filled with return values from each
+ * invocation of func
+ * @param nb_jobs the number of jobs to execute
+ *
+ * @return 0 on success, a negative AVERROR on error
+ */
+typedef int (avfilter_execute_func)(AVFilterContext *ctx, avfilter_action_func *func,
+ void *arg, int *ret, int nb_jobs);
+
+typedef struct AVFilterGraph {
+ const AVClass *av_class;
+#if FF_API_FOO_COUNT
+ attribute_deprecated
+ unsigned filter_count;
+#endif
+ AVFilterContext **filters;
+#if !FF_API_FOO_COUNT
+ unsigned nb_filters;
+#endif
+
+ char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters
+ char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters
+#if FF_API_FOO_COUNT
+ unsigned nb_filters;
+#endif
+
+ /**
+ * Type of multithreading allowed for filters in this graph. A combination
+ * of AVFILTER_THREAD_* flags.
+ *
+ * May be set by the caller at any point, the setting will apply to all
+ * filters initialized after that. The default is allowing everything.
+ *
+ * When a filter in this graph is initialized, this field is combined using
+ * bit AND with AVFilterContext.thread_type to get the final mask used for
+ * determining allowed threading types. I.e. a threading type needs to be
+ * set in both to be allowed.
+ */
+ int thread_type;
+
+ /**
+ * Maximum number of threads used by filters in this graph. May be set by
+ * the caller before adding any filters to the filtergraph. Zero (the
+ * default) means that the number of threads is determined automatically.
+ */
+ int nb_threads;
+
+ /**
+ * Opaque object for libavfilter internal use.
+ */
+ AVFilterGraphInternal *internal;
+
+ /**
+ * Opaque user data. May be set by the caller to an arbitrary value, e.g. to
+ * be used from callbacks like @ref AVFilterGraph.execute.
+ * Libavfilter will not touch this field in any way.
+ */
+ void *opaque;
+
+ /**
+ * This callback may be set by the caller immediately after allocating the
+ * graph and before adding any filters to it, to provide a custom
+ * multithreading implementation.
+ *
+ * If set, filters with slice threading capability will call this callback
+ * to execute multiple jobs in parallel.
+ *
+ * If this field is left unset, libavfilter will use its internal
+ * implementation, which may or may not be multithreaded depending on the
+ * platform and build options.
+ */
+ avfilter_execute_func *execute;
+} AVFilterGraph;
+
+/**
+ * Allocate a filter graph.
+ */
+AVFilterGraph *avfilter_graph_alloc(void);
+
+/**
+ * Create a new filter instance in a filter graph.
+ *
+ * @param graph graph in which the new filter will be used
+ * @param filter the filter to create an instance of
+ * @param name Name to give to the new instance (will be copied to
+ * AVFilterContext.name). This may be used by the caller to identify
+ * different filters, libavfilter itself assigns no semantics to
+ * this parameter. May be NULL.
+ *
+ * @return the context of the newly created filter instance (note that it is
+ * also retrievable directly through AVFilterGraph.filters or with
+ * avfilter_graph_get_filter()) on success or NULL or failure.
+ */
+AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph,
+ const AVFilter *filter,
+ const char *name);
+
+/**
+ * Get a filter instance with name name from graph.
+ *
+ * @return the pointer to the found filter instance or NULL if it
+ * cannot be found.
+ */
+AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name);
+
+#if FF_API_AVFILTER_OPEN
+/**
+ * Add an existing filter instance to a filter graph.
+ *
+ * @param graphctx the filter graph
+ * @param filter the filter to be added
+ *
+ * @deprecated use avfilter_graph_alloc_filter() to allocate a filter in a
+ * filter graph
+ */
+attribute_deprecated
+int avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter);
+#endif
+
+/**
+ * Create and add a filter instance into an existing graph.
+ * The filter instance is created from the filter filt and inited
+ * with the parameters args and opaque.
+ *
+ * In case of success put in *filt_ctx the pointer to the created
+ * filter instance, otherwise set *filt_ctx to NULL.
+ *
+ * @param name the instance name to give to the created filter instance
+ * @param graph_ctx the filter graph
+ * @return a negative AVERROR error code in case of failure, a non
+ * negative value otherwise
+ */
+int avfilter_graph_create_filter(AVFilterContext **filt_ctx, const AVFilter *filt,
+ const char *name, const char *args, void *opaque,
+ AVFilterGraph *graph_ctx);
+
+/**
+ * Check validity and configure all the links and formats in the graph.
+ *
+ * @param graphctx the filter graph
+ * @param log_ctx context used for logging
+ * @return 0 in case of success, a negative AVERROR code otherwise
+ */
+int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx);
+
+/**
+ * Free a graph, destroy its links, and set *graph to NULL.
+ * If *graph is NULL, do nothing.
+ */
+void avfilter_graph_free(AVFilterGraph **graph);
+
+/**
+ * A linked-list of the inputs/outputs of the filter chain.
+ *
+ * This is mainly useful for avfilter_graph_parse() / avfilter_graph_parse2(),
+ * where it is used to communicate open (unlinked) inputs and outputs from and
+ * to the caller.
+ * This struct specifies, per each not connected pad contained in the graph, the
+ * filter context and the pad index required for establishing a link.
+ */
+typedef struct AVFilterInOut {
+ /** unique name for this input/output in the list */
+ char *name;
+
+ /** filter context associated to this input/output */
+ AVFilterContext *filter_ctx;
+
+ /** index of the filt_ctx pad to use for linking */
+ int pad_idx;
+
+ /** next input/input in the list, NULL if this is the last */
+ struct AVFilterInOut *next;
+} AVFilterInOut;
+
+/**
+ * Allocate a single AVFilterInOut entry.
+ * Must be freed with avfilter_inout_free().
+ * @return allocated AVFilterInOut on success, NULL on failure.
+ */
+AVFilterInOut *avfilter_inout_alloc(void);
+
+/**
+ * Free the supplied list of AVFilterInOut and set *inout to NULL.
+ * If *inout is NULL, do nothing.
+ */
+void avfilter_inout_free(AVFilterInOut **inout);
+
+/**
+ * Add a graph described by a string to a graph.
+ *
+ * @param graph the filter graph where to link the parsed graph context
+ * @param filters string to be parsed
+ * @param inputs linked list to the inputs of the graph
+ * @param outputs linked list to the outputs of the graph
+ * @return zero on success, a negative AVERROR code on error
+ */
+int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
+ AVFilterInOut *inputs, AVFilterInOut *outputs,
+ void *log_ctx);
+
+/**
+ * Add a graph described by a string to a graph.
+ *
+ * @param[in] graph the filter graph where to link the parsed graph context
+ * @param[in] filters string to be parsed
+ * @param[out] inputs a linked list of all free (unlinked) inputs of the
+ * parsed graph will be returned here. It is to be freed
+ * by the caller using avfilter_inout_free().
+ * @param[out] outputs a linked list of all free (unlinked) outputs of the
+ * parsed graph will be returned here. It is to be freed by the
+ * caller using avfilter_inout_free().
+ * @return zero on success, a negative AVERROR code on error
+ *
+ * @note the difference between avfilter_graph_parse2() and
+ * avfilter_graph_parse() is that in avfilter_graph_parse(), the caller provides
+ * the lists of inputs and outputs, which therefore must be known before calling
+ * the function. On the other hand, avfilter_graph_parse2() \em returns the
+ * inputs and outputs that are left unlinked after parsing the graph and the
+ * caller then deals with them. Another difference is that in
+ * avfilter_graph_parse(), the inputs parameter describes inputs of the
+ * already existing part of the graph; i.e. from the point of view of
+ * the newly created part, they are outputs. Similarly the outputs parameter
+ * describes outputs of the already existing filters, which are provided as
+ * inputs to the parsed filters.
+ * avfilter_graph_parse2() takes the opposite approach -- it makes no reference
+ * whatsoever to already existing parts of the graph and the inputs parameter
+ * will on return contain inputs of the newly parsed part of the graph.
+ * Analogously the outputs parameter will contain outputs of the newly created
+ * filters.
+ */
+int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters,
+ AVFilterInOut **inputs,
+ AVFilterInOut **outputs);
+
+/**
+ * @}
+ */
 
 #endif /* AVFILTER_AVFILTER_H */

libav-v9.6.tar.bz2/libavfilter/avfiltergraph.c -> libav-v10.1.tar.bz2/libavfilter/avfiltergraph.c Changed

@@ -20,70 +20,139 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include <ctype.h>
+#include "config.h"
+
 #include <string.h>
 
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
+#include "libavutil/internal.h"
 #include "libavutil/log.h"
+#include "libavutil/opt.h"
+
 #include "avfilter.h"
-#include "avfiltergraph.h"
 #include "formats.h"
 #include "internal.h"
+#include "thread.h"
+
+#define OFFSET(x) offsetof(AVFilterGraph, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption filtergraph_options[] = {
+ { "thread_type", "Allowed thread types", OFFSET(thread_type), AV_OPT_TYPE_FLAGS,
+ { .i64 = AVFILTER_THREAD_SLICE }, 0, INT_MAX, FLAGS, "thread_type" },
+ { "slice", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AVFILTER_THREAD_SLICE }, .flags = FLAGS, .unit = "thread_type" },
+ { "threads", "Maximum number of threads", OFFSET(nb_threads),
+ AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS },
+ { NULL },
+};
 
 static const AVClass filtergraph_class = {
 .class_name = "AVFilterGraph",
 .item_name = av_default_item_name,
 .version = LIBAVUTIL_VERSION_INT,
+ .option = filtergraph_options,
 };
 
+#if !HAVE_THREADS
+void ff_graph_thread_free(AVFilterGraph *graph)
+{
+}
+
+int ff_graph_thread_init(AVFilterGraph *graph)
+{
+ graph->thread_type = 0;
+ graph->nb_threads = 1;
+ return 0;
+}
+#endif
+
 AVFilterGraph *avfilter_graph_alloc(void)
 {
- AVFilterGraph *ret = av_mallocz(sizeof(AVFilterGraph));
+ AVFilterGraph *ret = av_mallocz(sizeof(*ret));
 if (!ret)
 return NULL;
+
+ ret->internal = av_mallocz(sizeof(*ret->internal));
+ if (!ret->internal) {
+ av_freep(&ret);
+ return NULL;
+ }
+
 ret->av_class = &filtergraph_class;
+ av_opt_set_defaults(ret);
+
 return ret;
 }
 
+void ff_filter_graph_remove_filter(AVFilterGraph *graph, AVFilterContext *filter)
+{
+ int i;
+ for (i = 0; i < graph->nb_filters; i++) {
+ if (graph->filters[i] == filter) {
+ FFSWAP(AVFilterContext*, graph->filters[i],
+ graph->filters[graph->nb_filters - 1]);
+ graph->nb_filters--;
+ return;
+ }
+ }
+}
+
 void avfilter_graph_free(AVFilterGraph **graph)
 {
 if (!*graph)
 return;
- for (; (*graph)->filter_count > 0; (*graph)->filter_count--)
- avfilter_free((*graph)->filters[(*graph)->filter_count - 1]);
+
+ while ((*graph)->nb_filters)
+ avfilter_free((*graph)->filters[0]);
+
+ ff_graph_thread_free(*graph);
+
 av_freep(&(*graph)->scale_sws_opts);
+ av_freep(&(*graph)->resample_lavr_opts);
 av_freep(&(*graph)->filters);
+ av_freep(&(*graph)->internal);
 av_freep(graph);
 }
 
+#if FF_API_AVFILTER_OPEN
 int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
 {
 AVFilterContext **filters = av_realloc(graph->filters,
- sizeof(AVFilterContext*) * (graph->filter_count+1));
+ sizeof(*filters) * (graph->nb_filters + 1));
 if (!filters)
 return AVERROR(ENOMEM);
 
 graph->filters = filters;
- graph->filters[graph->filter_count++] = filter;
+ graph->filters[graph->nb_filters++] = filter;
+
+#if FF_API_FOO_COUNT
+FF_DISABLE_DEPRECATION_WARNINGS
+ graph->filter_count = graph->nb_filters;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
+ filter->graph = graph;
 
 return 0;
 }
+#endif
 
-int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt,
+int avfilter_graph_create_filter(AVFilterContext **filt_ctx, const AVFilter *filt,
 const char *name, const char *args, void *opaque,
 AVFilterGraph *graph_ctx)
 {
 int ret;
 
- if ((ret = avfilter_open(filt_ctx, filt, name)) < 0)
- goto fail;
- if ((ret = avfilter_init_filter(*filt_ctx, args, opaque)) < 0)
- goto fail;
- if ((ret = avfilter_graph_add_filter(graph_ctx, *filt_ctx)) < 0)
+ *filt_ctx = avfilter_graph_alloc_filter(graph_ctx, filt, name);
+ if (!*filt_ctx)
+ return AVERROR(ENOMEM);
+
+ ret = avfilter_init_str(*filt_ctx, args);
+ if (ret < 0)
 goto fail;
+
 return 0;
 
 fail:
@@ -93,6 +162,48 @@
 return ret;
 }
 
+AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph,
+ const AVFilter *filter,
+ const char *name)
+{
+ AVFilterContext **filters, *s;
+
+ if (graph->thread_type && !graph->internal->thread_execute) {
+ if (graph->execute) {
+ graph->internal->thread_execute = graph->execute;
+ } else {
+ int ret = ff_graph_thread_init(graph);
+ if (ret < 0) {
+ av_log(graph, AV_LOG_ERROR, "Error initializing threading.\n");
+ return NULL;
+ }
+ }
+ }
+
+ s = ff_filter_alloc(filter, name);
+ if (!s)
+ return NULL;
+
+ filters = av_realloc(graph->filters, sizeof(*filters) * (graph->nb_filters + 1));
+ if (!filters) {
+ avfilter_free(s);
+ return NULL;
+ }
+
+ graph->filters = filters;
+ graph->filters[graph->nb_filters++] = s;
+
+#if FF_API_FOO_COUNT
+FF_DISABLE_DEPRECATION_WARNINGS
+ graph->filter_count = graph->nb_filters;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
+ s->graph = graph;
+
+ return s;
+}
+
 /**
 * Check for the validity of graph.
 *
@@ -106,7 +217,7 @@
 AVFilterContext *filt;
 int i, j;
 
- for (i = 0; i < graph->filter_count; i++) {
+ for (i = 0; i < graph->nb_filters; i++) {
 filt = graph->filters[i];
 
 for (j = 0; j < filt->nb_inputs; j++) {
@@ -141,7 +252,7 @@
 AVFilterContext *filt;
 int i, ret;
 
- for (i=0; i < graph->filter_count; i++) {
+ for (i = 0; i < graph->nb_filters; i++) {
 filt = graph->filters[i];
 
 if (!filt->nb_outputs) {
@@ -157,7 +268,7 @@
 {
 int i;
 
- for (i = 0; i < graph->filter_count; i++)
+ for (i = 0; i < graph->nb_filters; i++)
 if (graph->filters[i]->name && !strcmp(name, graph->filters[i]->name))
 return graph->filters[i];
 
@@ -170,7 +281,7 @@
 int scaler_count = 0, resampler_count = 0;
 
 /* ask all the sub-filters for their supported media formats */
- for (i = 0; i < graph->filter_count; i++) {
+ for (i = 0; i < graph->nb_filters; i++) {
 if (graph->filters[i]->filter->query_formats)
 graph->filters[i]->filter->query_formats(graph->filters[i]);
 else
@@ -178,7 +289,7 @@
 }
 
 /* go through and merge as many format lists as possible */
- for (i = 0; i < graph->filter_count; i++) {
+ for (i = 0; i < graph->nb_filters; i++) {
 AVFilterContext *filter = graph->filters[i];
 
 for (j = 0; j < filter->nb_inputs; j++) {
@@ -221,13 +332,9 @@
 
 snprintf(inst_name, sizeof(inst_name), "auto-inserted scaler %d",
 scaler_count++);
- av_strlcpy(scale_args, "0:0", sizeof(scale_args));
- if (graph->scale_sws_opts) {
- av_strlcat(scale_args, ":", sizeof(scale_args));
- av_strlcat(scale_args, graph->scale_sws_opts, sizeof(scale_args));
- }
+
 if ((ret = avfilter_graph_create_filter(&convert, filter,
- inst_name, scale_args, NULL,
+ inst_name, graph->scale_sws_opts, NULL,
 graph)) < 0)
 return ret;
 break;
@@ -240,8 +347,13 @@
 
 snprintf(inst_name, sizeof(inst_name), "auto-inserted resampler %d",
 resampler_count++);
+ scale_args[0] = '\0';
+ if (graph->resample_lavr_opts)
+ snprintf(scale_args, sizeof(scale_args), "%s",
+ graph->resample_lavr_opts);
 if ((ret = avfilter_graph_create_filter(&convert, filter,
- inst_name, NULL, NULL, graph)) < 0)
+ inst_name, scale_args,
+ NULL, graph)) < 0)
 return ret;
 break;
 default:
@@ -288,17 +400,17 @@
 if (!link || !link->in_formats)
 return 0;
 
- link->in_formats->format_count = 1;
+ link->in_formats->nb_formats = 1;
 link->format = link->in_formats->formats[0];
 
 if (link->type == AVMEDIA_TYPE_AUDIO) {
- if (!link->in_samplerates->format_count) {
+ if (!link->in_samplerates->nb_formats) {
 av_log(link->src, AV_LOG_ERROR, "Cannot select sample rate for"
 " the link between filters %s and %s.\n", link->src->name,
 link->dst->name);
 return AVERROR(EINVAL);
 }
- link->in_samplerates->format_count = 1;
+ link->in_samplerates->nb_formats = 1;
 link->sample_rate = link->in_samplerates->formats[0];
 
 if (!link->in_channel_layouts->nb_channel_layouts) {
@@ -361,9 +473,9 @@
 int i, j, k, ret = 0;
 
 REDUCE_FORMATS(int, AVFilterFormats, formats, formats,
- format_count, ff_add_format);
+ nb_formats, ff_add_format);
 REDUCE_FORMATS(int, AVFilterFormats, samplerates, formats,
- format_count, ff_add_format);
+ nb_formats, ff_add_format);
 REDUCE_FORMATS(uint64_t, AVFilterChannelLayouts, channel_layouts,
 channel_layouts, nb_channel_layouts, ff_add_channel_layout);
 
@@ -377,7 +489,7 @@
 do {
 reduced = 0;
 
- for (i = 0; i < graph->filter_count; i++)
+ for (i = 0; i < graph->nb_filters; i++)
 reduced |= reduce_formats_on_filter(graph->filters[i]);
 } while (reduced);
 }
@@ -392,7 +504,7 @@
 link = filter->inputs[i];
 
 if (link->type == AVMEDIA_TYPE_AUDIO &&
- link->out_samplerates->format_count == 1)
+ link->out_samplerates->nb_formats== 1)
 break;
 }
 if (i == filter->nb_inputs)
@@ -405,10 +517,10 @@
 int best_idx, best_diff = INT_MAX;
 
 if (outlink->type != AVMEDIA_TYPE_AUDIO ||
- outlink->in_samplerates->format_count < 2)
+ outlink->in_samplerates->nb_formats < 2)
 continue;
 
- for (j = 0; j < outlink->in_samplerates->format_count; j++) {
+ for (j = 0; j < outlink->in_samplerates->nb_formats; j++) {
 int diff = abs(sample_rate - outlink->in_samplerates->formats[j]);
 
 if (diff < best_diff) {
@@ -425,7 +537,7 @@
 {
 int i;
 
- for (i = 0; i < graph->filter_count; i++)
+ for (i = 0; i < graph->nb_filters; i++)
 swap_samplerates_on_filter(graph->filters[i]);
 }
 
@@ -540,7 +652,7 @@
 {
 int i;
 
- for (i = 0; i < graph->filter_count; i++)
+ for (i = 0; i < graph->nb_filters; i++)
 swap_channel_layouts_on_filter(graph->filters[i]);
 }
 
@@ -554,7 +666,7 @@
 link = filter->inputs[i];
 
 if (link->type == AVMEDIA_TYPE_AUDIO &&
- link->out_formats->format_count == 1)
+ link->out_formats->nb_formats == 1)
 break;
 }
 if (i == filter->nb_inputs)
@@ -568,10 +680,10 @@
 int best_idx = -1, best_score = INT_MIN;
 
 if (outlink->type != AVMEDIA_TYPE_AUDIO ||
- outlink->in_formats->format_count < 2)
+ outlink->in_formats->nb_formats < 2)
 continue;
 
- for (j = 0; j < outlink->in_formats->format_count; j++) {
+ for (j = 0; j < outlink->in_formats->nb_formats; j++) {
 int out_format = outlink->in_formats->formats[j];
 int out_bps = av_get_bytes_per_sample(out_format);
 int score;
@@ -608,7 +720,7 @@
 {
 int i;
 
- for (i = 0; i < graph->filter_count; i++)
+ for (i = 0; i < graph->nb_filters; i++)
 swap_sample_fmts_on_filter(graph->filters[i]);
 
 }
@@ -617,7 +729,7 @@
 {
 int i, j, ret;
 
- for (i = 0; i < graph->filter_count; i++) {
+ for (i = 0; i < graph->nb_filters; i++) {
 AVFilterContext *filter = graph->filters[i];
 
 for (j = 0; j < filter->nb_inputs; j++)
@@ -664,7 +776,7 @@
 int i, j, ret;
 int fifo_count = 0;
 
- for (i = 0; i < graph->filter_count; i++) {
+ for (i = 0; i < graph->nb_filters; i++) {
 f = graph->filters[i];
 
 for (j = 0; j < f->nb_inputs; j++) {

libav-v9.6.tar.bz2/libavfilter/avfiltergraph.h -> libav-v10.1.tar.bz2/libavfilter/avfiltergraph.h Changed

@@ -25,148 +25,5 @@
 #include "avfilter.h"
 #include "libavutil/log.h"
 
-typedef struct AVFilterGraph {
- const AVClass *av_class;
- unsigned filter_count;
- AVFilterContext **filters;
-
- char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters
-} AVFilterGraph;
-
-/**
- * Allocate a filter graph.
- */
-AVFilterGraph *avfilter_graph_alloc(void);
-
-/**
- * Get a filter instance with name name from graph.
- *
- * @return the pointer to the found filter instance or NULL if it
- * cannot be found.
- */
-AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name);
-
-/**
- * Add an existing filter instance to a filter graph.
- *
- * @param graphctx the filter graph
- * @param filter the filter to be added
- */
-int avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter);
-
-/**
- * Create and add a filter instance into an existing graph.
- * The filter instance is created from the filter filt and inited
- * with the parameters args and opaque.
- *
- * In case of success put in *filt_ctx the pointer to the created
- * filter instance, otherwise set *filt_ctx to NULL.
- *
- * @param name the instance name to give to the created filter instance
- * @param graph_ctx the filter graph
- * @return a negative AVERROR error code in case of failure, a non
- * negative value otherwise
- */
-int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt,
- const char *name, const char *args, void *opaque,
- AVFilterGraph *graph_ctx);
-
-/**
- * Check validity and configure all the links and formats in the graph.
- *
- * @param graphctx the filter graph
- * @param log_ctx context used for logging
- * @return 0 in case of success, a negative AVERROR code otherwise
- */
-int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx);
-
-/**
- * Free a graph, destroy its links, and set *graph to NULL.
- * If *graph is NULL, do nothing.
- */
-void avfilter_graph_free(AVFilterGraph **graph);
-
-/**
- * A linked-list of the inputs/outputs of the filter chain.
- *
- * This is mainly useful for avfilter_graph_parse() / avfilter_graph_parse2(),
- * where it is used to communicate open (unlinked) inputs and outputs from and
- * to the caller.
- * This struct specifies, per each not connected pad contained in the graph, the
- * filter context and the pad index required for establishing a link.
- */
-typedef struct AVFilterInOut {
- /** unique name for this input/output in the list */
- char *name;
-
- /** filter context associated to this input/output */
- AVFilterContext *filter_ctx;
-
- /** index of the filt_ctx pad to use for linking */
- int pad_idx;
-
- /** next input/input in the list, NULL if this is the last */
- struct AVFilterInOut *next;
-} AVFilterInOut;
-
-/**
- * Allocate a single AVFilterInOut entry.
- * Must be freed with avfilter_inout_free().
- * @return allocated AVFilterInOut on success, NULL on failure.
- */
-AVFilterInOut *avfilter_inout_alloc(void);
-
-/**
- * Free the supplied list of AVFilterInOut and set *inout to NULL.
- * If *inout is NULL, do nothing.
- */
-void avfilter_inout_free(AVFilterInOut **inout);
-
-/**
- * Add a graph described by a string to a graph.
- *
- * @param graph the filter graph where to link the parsed graph context
- * @param filters string to be parsed
- * @param inputs linked list to the inputs of the graph
- * @param outputs linked list to the outputs of the graph
- * @return zero on success, a negative AVERROR code on error
- */
-int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
- AVFilterInOut *inputs, AVFilterInOut *outputs,
- void *log_ctx);
-
-/**
- * Add a graph described by a string to a graph.
- *
- * @param[in] graph the filter graph where to link the parsed graph context
- * @param[in] filters string to be parsed
- * @param[out] inputs a linked list of all free (unlinked) inputs of the
- * parsed graph will be returned here. It is to be freed
- * by the caller using avfilter_inout_free().
- * @param[out] outputs a linked list of all free (unlinked) outputs of the
- * parsed graph will be returned here. It is to be freed by the
- * caller using avfilter_inout_free().
- * @return zero on success, a negative AVERROR code on error
- *
- * @note the difference between avfilter_graph_parse2() and
- * avfilter_graph_parse() is that in avfilter_graph_parse(), the caller provides
- * the lists of inputs and outputs, which therefore must be known before calling
- * the function. On the other hand, avfilter_graph_parse2() \em returns the
- * inputs and outputs that are left unlinked after parsing the graph and the
- * caller then deals with them. Another difference is that in
- * avfilter_graph_parse(), the inputs parameter describes inputs of the
- * already existing part of the graph; i.e. from the point of view of
- * the newly created part, they are outputs. Similarly the outputs parameter
- * describes outputs of the already existing filters, which are provided as
- * inputs to the parsed filters.
- * avfilter_graph_parse2() takes the opposite approach -- it makes no reference
- * whatsoever to already existing parts of the graph and the inputs parameter
- * will on return contain inputs of the newly parsed part of the graph.
- * Analogously the outputs parameter will contain outputs of the newly created
- * filters.
- */
-int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters,
- AVFilterInOut **inputs,
- AVFilterInOut **outputs);
 
 #endif /* AVFILTER_AVFILTERGRAPH_H */

libav-v9.6.tar.bz2/libavfilter/buffer.c -> libav-v10.1.tar.bz2/libavfilter/buffer.c Changed

libav-v9.6.tar.bz2/libavfilter/buffersink.c -> libav-v10.1.tar.bz2/libavfilter/buffersink.c Changed

@@ -27,6 +27,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
+#include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
 
 #include "audio.h"
@@ -35,8 +36,8 @@
 #include "internal.h"
 
 typedef struct {
- AVFilterBufferRef *cur_buf; ///< last buffer delivered on the sink
- AVAudioFifo *audio_fifo; ///< FIFO for audio samples
+ AVFrame *cur_frame; ///< last frame delivered on the sink
+ AVAudioFifo *audio_fifo; ///< FIFO for audio samples
 int64_t next_pts; ///< interpolating audio pts
 } BufferSinkContext;
 
@@ -48,59 +49,58 @@
 av_audio_fifo_free(sink->audio_fifo);
 }
 
-static int filter_frame(AVFilterLink *link, AVFilterBufferRef *buf)
+static int filter_frame(AVFilterLink *link, AVFrame *frame)
 {
 BufferSinkContext *s = link->dst->priv;
 
- av_assert0(!s->cur_buf);
- s->cur_buf = buf;
+ av_assert0(!s->cur_frame);
+ s->cur_frame = frame;
 
 return 0;
 }
 
-int av_buffersink_read(AVFilterContext *ctx, AVFilterBufferRef **buf)
+int attribute_align_arg av_buffersink_get_frame(AVFilterContext *ctx,
+ AVFrame *frame)
 {
 BufferSinkContext *s = ctx->priv;
 AVFilterLink *link = ctx->inputs[0];
 int ret;
 
- if (!buf)
- return ff_poll_frame(ctx->inputs[0]);
-
 if ((ret = ff_request_frame(link)) < 0)
 return ret;
 
- if (!s->cur_buf)
+ if (!s->cur_frame)
 return AVERROR(EINVAL);
 
- *buf = s->cur_buf;
- s->cur_buf = NULL;
+ av_frame_move_ref(frame, s->cur_frame);
+ av_frame_free(&s->cur_frame);
 
 return 0;
 }
 
-static int read_from_fifo(AVFilterContext *ctx, AVFilterBufferRef **pbuf,
+static int read_from_fifo(AVFilterContext *ctx, AVFrame *frame,
 int nb_samples)
 {
 BufferSinkContext *s = ctx->priv;
 AVFilterLink *link = ctx->inputs[0];
- AVFilterBufferRef *buf;
+ AVFrame *tmp;
 
- if (!(buf = ff_get_audio_buffer(link, AV_PERM_WRITE, nb_samples)))
+ if (!(tmp = ff_get_audio_buffer(link, nb_samples)))
 return AVERROR(ENOMEM);
- av_audio_fifo_read(s->audio_fifo, (void**)buf->extended_data, nb_samples);
+ av_audio_fifo_read(s->audio_fifo, (void**)tmp->extended_data, nb_samples);
 
- buf->pts = s->next_pts;
+ tmp->pts = s->next_pts;
 s->next_pts += av_rescale_q(nb_samples, (AVRational){1, link->sample_rate},
 link->time_base);
 
- *pbuf = buf;
- return 0;
+ av_frame_move_ref(frame, tmp);
+ av_frame_free(&tmp);
 
+ return 0;
 }
 
-int av_buffersink_read_samples(AVFilterContext *ctx, AVFilterBufferRef **pbuf,
- int nb_samples)
+int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx,
+ AVFrame *frame, int nb_samples)
 {
 BufferSinkContext *s = ctx->priv;
 AVFilterLink *link = ctx->inputs[0];
@@ -113,70 +113,140 @@
 }
 
 while (ret >= 0) {
- AVFilterBufferRef *buf;
-
 if (av_audio_fifo_size(s->audio_fifo) >= nb_samples)
- return read_from_fifo(ctx, pbuf, nb_samples);
+ return read_from_fifo(ctx, frame, nb_samples);
 
- ret = av_buffersink_read(ctx, &buf);
+ ret = ff_request_frame(link);
 if (ret == AVERROR_EOF && av_audio_fifo_size(s->audio_fifo))
- return read_from_fifo(ctx, pbuf, av_audio_fifo_size(s->audio_fifo));
+ return read_from_fifo(ctx, frame, av_audio_fifo_size(s->audio_fifo));
 else if (ret < 0)
 return ret;
 
- if (buf->pts != AV_NOPTS_VALUE) {
- s->next_pts = buf->pts -
+ if (s->cur_frame->pts != AV_NOPTS_VALUE) {
+ s->next_pts = s->cur_frame->pts -
 av_rescale_q(av_audio_fifo_size(s->audio_fifo),
 (AVRational){ 1, link->sample_rate },
 link->time_base);
 }
 
- ret = av_audio_fifo_write(s->audio_fifo, (void**)buf->extended_data,
- buf->audio->nb_samples);
- avfilter_unref_buffer(buf);
+ ret = av_audio_fifo_write(s->audio_fifo, (void**)s->cur_frame->extended_data,
+ s->cur_frame->nb_samples);
+ av_frame_free(&s->cur_frame);
+ }
+
+ return ret;
+}
+
+#if FF_API_AVFILTERBUFFER
+FF_DISABLE_DEPRECATION_WARNINGS
+static void compat_free_buffer(AVFilterBuffer *buf)
+{
+ AVFrame *frame = buf->priv;
+ av_frame_free(&frame);
+ av_free(buf);
+}
+
+static int compat_read(AVFilterContext *ctx,
+ AVFilterBufferRef **pbuf, int nb_samples)
+{
+ AVFilterBufferRef *buf;
+ AVFrame *frame;
+ int ret;
+
+ if (!pbuf)
+ return ff_poll_frame(ctx->inputs[0]);
+
+ frame = av_frame_alloc();
+ if (!frame)
+ return AVERROR(ENOMEM);
+
+ if (!nb_samples)
+ ret = av_buffersink_get_frame(ctx, frame);
+ else
+ ret = av_buffersink_get_samples(ctx, frame, nb_samples);
+
+ if (ret < 0)
+ goto fail;
+
+ if (ctx->inputs[0]->type == AVMEDIA_TYPE_VIDEO) {
+ buf = avfilter_get_video_buffer_ref_from_arrays(frame->data, frame->linesize,
+ AV_PERM_READ,
+ frame->width, frame->height,
+ frame->format);
+ } else {
+ buf = avfilter_get_audio_buffer_ref_from_arrays(frame->extended_data,
+ frame->linesize[0], AV_PERM_READ,
+ frame->nb_samples,
+ frame->format,
+ frame->channel_layout);
 }
+ if (!buf) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+
+ avfilter_copy_frame_props(buf, frame);
+
+ buf->buf->priv = frame;
+ buf->buf->free = compat_free_buffer;
+
+ *pbuf = buf;
 
+ return 0;
+fail:
+ av_frame_free(&frame);
 return ret;
 }
 
+int attribute_align_arg av_buffersink_read(AVFilterContext *ctx, AVFilterBufferRef **buf)
+{
+ return compat_read(ctx, buf, 0);
+}
+
+int attribute_align_arg av_buffersink_read_samples(AVFilterContext *ctx, AVFilterBufferRef **buf,
+ int nb_samples)
+{
+ return compat_read(ctx, buf, nb_samples);
+}
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
 static const AVFilterPad avfilter_vsink_buffer_inputs[] = {
 {
- .name = "default",
- .type = AVMEDIA_TYPE_VIDEO,
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
 .filter_frame = filter_frame,
- .min_perms = AV_PERM_READ,
- .needs_fifo = 1
+ .needs_fifo = 1
 },
 { NULL }
 };
 
-AVFilter avfilter_vsink_buffer = {
- .name = "buffersink",
+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),
- .uninit = uninit,
+ .priv_size = sizeof(BufferSinkContext),
+ .uninit = uninit,
 
- .inputs = avfilter_vsink_buffer_inputs,
- .outputs = NULL,
+ .inputs = avfilter_vsink_buffer_inputs,
+ .outputs = NULL,
 };
 
 static const AVFilterPad avfilter_asink_abuffer_inputs[] = {
 {
- .name = "default",
- .type = AVMEDIA_TYPE_AUDIO,
- .filter_frame = filter_frame,
- .min_perms = AV_PERM_READ,
- .needs_fifo = 1
+ .name = "default",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .filter_frame = filter_frame,
+ .needs_fifo = 1
 },
 { NULL }
 };
 
-AVFilter avfilter_asink_abuffer = {
- .name = "abuffersink",
+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_size = sizeof(BufferSinkContext),
- .uninit = uninit,
+ .priv_size = sizeof(BufferSinkContext),
+ .uninit = uninit,
 
- .inputs = avfilter_asink_abuffer_inputs,
- .outputs = NULL,
+ .inputs = avfilter_asink_abuffer_inputs,
+ .outputs = NULL,
 };

libav-v9.6.tar.bz2/libavfilter/buffersink.h -> libav-v10.1.tar.bz2/libavfilter/buffersink.h Changed

@@ -21,12 +21,20 @@
 
 /**
  * @file
+ * @ingroup lavfi_buffersink
  * memory buffer sink API
  */
 
 #include "avfilter.h"
 
 /**
+ * @defgroup lavfi_buffersink Buffer sink API
+ * @ingroup lavfi
+ * @{
+ */
+
+#if FF_API_AVFILTERBUFFER
+/**
  * Get a buffer with filtered data from sink and put it in buf.
  *
  * @param ctx pointer to a context of a buffersink or abuffersink AVFilter.
@@ -38,6 +46,7 @@
  * @return >= 0 in case of success, a negative AVERROR code in case of
  *         failure.
  */
+attribute_deprecated
 int av_buffersink_read(AVFilterContext *ctx, AVFilterBufferRef **buf);
 
 /**
@@ -56,7 +65,48 @@
  * @warning do not mix this function with av_buffersink_read(). Use only one or
  * the other with a single sink, not both.
  */
+attribute_deprecated
 int av_buffersink_read_samples(AVFilterContext *ctx, AVFilterBufferRef **buf,
                                int nb_samples);
+#endif
+
+/**
+ * Get a frame with filtered data from sink and put it in frame.
+ *
+ * @param ctx pointer to a context of a buffersink or abuffersink AVFilter.
+ * @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 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);
+
+/**
+ * Same as av_buffersink_get_frame(), but with the ability to specify the number
+ * of samples read. This function is less efficient than
+ * av_buffersink_get_frame(), because it copies the data around.
+ *
+ * @param ctx pointer to a context of the abuffersink AVFilter.
+ * @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()
+ *              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 */

libav-v9.6.tar.bz2/libavfilter/buffersrc.c -> libav-v10.1.tar.bz2/libavfilter/buffersrc.c Changed

@@ -23,10 +23,14 @@
 * memory buffer source filter
 */
 
+#include <float.h>
+
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/fifo.h"
+#include "libavutil/frame.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/samplefmt.h"
 #include "audio.h"
@@ -44,6 +48,7 @@
 /* video only */
 int h, w;
 enum AVPixelFormat pix_fmt;
+ char *pix_fmt_str;
 AVRational pixel_aspect;
 
 /* audio only */
@@ -69,119 +74,203 @@
 return AVERROR(EINVAL);\
 }
 
-int av_buffersrc_write_frame(AVFilterContext *buffer_filter, const AVFrame *frame)
+int attribute_align_arg av_buffersrc_write_frame(AVFilterContext *ctx, const AVFrame *frame)
+{
+ AVFrame *copy;
+ int ret = 0;
+
+ if (!(copy = av_frame_alloc()))
+ return AVERROR(ENOMEM);
+ ret = av_frame_ref(copy, frame);
+ if (ret >= 0)
+ ret = av_buffersrc_add_frame(ctx, copy);
+
+ av_frame_free(&copy);
+ return ret;
+}
+
+int attribute_align_arg av_buffersrc_add_frame(AVFilterContext *ctx,
+ AVFrame *frame)
 {
- BufferSourceContext *c = buffer_filter->priv;
- AVFilterBufferRef *buf;
- int ret;
+ BufferSourceContext *s = ctx->priv;
+ AVFrame *copy;
+ int refcounted, ret;
 
 if (!frame) {
- c->eof = 1;
+ s->eof = 1;
 return 0;
- } else if (c->eof)
+ } else if (s->eof)
 return AVERROR(EINVAL);
 
- if (!av_fifo_space(c->fifo) &&
- (ret = av_fifo_realloc2(c->fifo, av_fifo_size(c->fifo) +
- sizeof(buf))) < 0)
- return ret;
+ refcounted = !!frame->buf[0];
 
- switch (buffer_filter->outputs[0]->type) {
+ switch (ctx->outputs[0]->type) {
 case AVMEDIA_TYPE_VIDEO:
- CHECK_VIDEO_PARAM_CHANGE(buffer_filter, c, frame->width, frame->height,
+ CHECK_VIDEO_PARAM_CHANGE(ctx, s, frame->width, frame->height,
 frame->format);
- buf = ff_get_video_buffer(buffer_filter->outputs[0], AV_PERM_WRITE,
- c->w, c->h);
- if (!buf)
- return AVERROR(ENOMEM);
-
- av_image_copy(buf->data, buf->linesize, frame->data, frame->linesize,
- c->pix_fmt, c->w, c->h);
 break;
 case AVMEDIA_TYPE_AUDIO:
- CHECK_AUDIO_PARAM_CHANGE(buffer_filter, c, frame->sample_rate, frame->channel_layout,
+ CHECK_AUDIO_PARAM_CHANGE(ctx, s, frame->sample_rate, frame->channel_layout,
 frame->format);
- buf = ff_get_audio_buffer(buffer_filter->outputs[0], AV_PERM_WRITE,
- frame->nb_samples);
- if (!buf)
- return AVERROR(ENOMEM);
-
- av_samples_copy(buf->extended_data, frame->extended_data,
- 0, 0, frame->nb_samples,
- av_get_channel_layout_nb_channels(frame->channel_layout),
- frame->format);
 break;
 default:
 return AVERROR(EINVAL);
 }
 
- avfilter_copy_frame_props(buf, frame);
+ if (!av_fifo_space(s->fifo) &&
+ (ret = av_fifo_realloc2(s->fifo, av_fifo_size(s->fifo) +
+ sizeof(copy))) < 0)
+ return ret;
+
+ if (!(copy = av_frame_alloc()))
+ return AVERROR(ENOMEM);
+
+ 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(c->fifo, &buf, sizeof(buf), NULL)) < 0) {
- avfilter_unref_buffer(buf);
+ if ((ret = av_fifo_generic_write(s->fifo, &copy, sizeof(copy), NULL)) < 0) {
+ if (refcounted)
+ av_frame_move_ref(frame, copy);
+ av_frame_free(&copy);
 return ret;
 }
 
 return 0;
 }
 
-int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf)
+#if FF_API_AVFILTERBUFFER
+FF_DISABLE_DEPRECATION_WARNINGS
+static void compat_free_buffer(void *opaque, uint8_t *data)
 {
- BufferSourceContext *c = s->priv;
- int ret;
+ AVFilterBufferRef *buf = opaque;
+ avfilter_unref_buffer(buf);
+}
+
+static void compat_unref_buffer(void *opaque, uint8_t *data)
+{
+ AVBufferRef *buf = opaque;
+ av_buffer_unref(&buf);
+}
+
+int av_buffersrc_buffer(AVFilterContext *ctx, AVFilterBufferRef *buf)
+{
+ BufferSourceContext *s = ctx->priv;
+ AVFrame *frame = NULL;
+ AVBufferRef *dummy_buf = NULL;
+ int ret = 0, planes, i;
 
 if (!buf) {
- c->eof = 1;
+ s->eof = 1;
 return 0;
- } else if (c->eof)
+ } else if (s->eof)
 return AVERROR(EINVAL);
 
- if (!av_fifo_space(c->fifo) &&
- (ret = av_fifo_realloc2(c->fifo, av_fifo_size(c->fifo) +
- sizeof(buf))) < 0)
- return ret;
+ frame = av_frame_alloc();
+ if (!frame)
+ return AVERROR(ENOMEM);
 
- switch (s->outputs[0]->type) {
- case AVMEDIA_TYPE_VIDEO:
- CHECK_VIDEO_PARAM_CHANGE(s, c, buf->video->w, buf->video->h, buf->format);
- break;
- case AVMEDIA_TYPE_AUDIO:
- CHECK_AUDIO_PARAM_CHANGE(s, c, buf->audio->sample_rate, buf->audio->channel_layout,
- buf->format);
- break;
- default:
- return AVERROR(EINVAL);
+ dummy_buf = av_buffer_create(NULL, 0, compat_free_buffer, buf, 0);
+ if (!dummy_buf) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
 }
 
- if ((ret = av_fifo_generic_write(c->fifo, &buf, sizeof(buf), NULL)) < 0)
- return ret;
+ if ((ret = avfilter_copy_buf_props(frame, buf)) < 0)
+ goto fail;
 
- return 0;
+#define WRAP_PLANE(ref_out, data, data_size) \
+do { \
+ AVBufferRef *dummy_ref = av_buffer_ref(dummy_buf); \
+ if (!dummy_ref) { \
+ ret = AVERROR(ENOMEM); \
+ goto fail; \
+ } \
+ ref_out = av_buffer_create(data, data_size, compat_unref_buffer, \
+ dummy_ref, 0); \
+ if (!ref_out) { \
+ av_frame_unref(frame); \
+ ret = AVERROR(ENOMEM); \
+ goto fail; \
+ } \
+} while (0)
+
+ if (ctx->outputs[0]->type == AVMEDIA_TYPE_VIDEO) {
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
+
+ planes = av_pix_fmt_count_planes(frame->format);
+ if (!desc || planes <= 0) {
+ ret = AVERROR(EINVAL);
+ goto fail;
+ }
+
+ for (i = 0; i < planes; i++) {
+ int v_shift = (i == 1 || i == 2) ? desc->log2_chroma_h : 0;
+ int plane_size = (frame->height >> v_shift) * frame->linesize[i];
+
+ WRAP_PLANE(frame->buf[i], frame->data[i], plane_size);
+ }
+ } else {
+ int planar = av_sample_fmt_is_planar(frame->format);
+ int channels = av_get_channel_layout_nb_channels(frame->channel_layout);
+
+ planes = planar ? channels : 1;
+
+ if (planes > FF_ARRAY_ELEMS(frame->buf)) {
+ frame->nb_extended_buf = planes - FF_ARRAY_ELEMS(frame->buf);
+ frame->extended_buf = av_mallocz(sizeof(*frame->extended_buf) *
+ frame->nb_extended_buf);
+ if (!frame->extended_buf) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ }
+
+ for (i = 0; i < FFMIN(planes, FF_ARRAY_ELEMS(frame->buf)); i++)
+ WRAP_PLANE(frame->buf[i], frame->extended_data[i], frame->linesize[0]);
+
+ for (i = 0; i < planes - FF_ARRAY_ELEMS(frame->buf); i++)
+ WRAP_PLANE(frame->extended_buf[i],
+ frame->extended_data[i + FF_ARRAY_ELEMS(frame->buf)],
+ frame->linesize[0]);
+ }
+
+ ret = av_buffersrc_add_frame(ctx, frame);
+
+fail:
+ av_buffer_unref(&dummy_buf);
+ av_frame_free(&frame);
+
+ return ret;
 }
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
 
-static av_cold int init_video(AVFilterContext *ctx, const char *args)
+static av_cold int init_video(AVFilterContext *ctx)
 {
 BufferSourceContext *c = ctx->priv;
- char pix_fmt_str[128];
- int n = 0;
-
- if (!args ||
- (n = sscanf(args, "%d:%d:%127[^:]:%d:%d:%d:%d", &c->w, &c->h, pix_fmt_str,
- &c->time_base.num, &c->time_base.den,
- &c->pixel_aspect.num, &c->pixel_aspect.den)) != 7) {
- av_log(ctx, AV_LOG_ERROR, "Expected 7 arguments, but %d found in '%s'\n", n, args);
+
+ if (!c->pix_fmt_str || !c->w || !c->h || av_q2d(c->time_base) <= 0) {
+ av_log(ctx, AV_LOG_ERROR, "Invalid parameters provided.\n");
 return AVERROR(EINVAL);
 }
- if ((c->pix_fmt = av_get_pix_fmt(pix_fmt_str)) == AV_PIX_FMT_NONE) {
+
+ if ((c->pix_fmt = av_get_pix_fmt(c->pix_fmt_str)) == AV_PIX_FMT_NONE) {
 char *tail;
- c->pix_fmt = strtol(pix_fmt_str, &tail, 10);
+ c->pix_fmt = strtol(c->pix_fmt_str, &tail, 10);
 if (*tail || c->pix_fmt < 0 || c->pix_fmt >= AV_PIX_FMT_NB) {
- av_log(ctx, AV_LOG_ERROR, "Invalid pixel format string '%s'\n", pix_fmt_str);
+ av_log(ctx, AV_LOG_ERROR, "Invalid pixel format string '%s'\n", c->pix_fmt_str);
 return AVERROR(EINVAL);
 }
 }
 
- if (!(c->fifo = av_fifo_alloc(sizeof(AVFilterBufferRef*))))
+ if (!(c->fifo = av_fifo_alloc(sizeof(AVFrame*))))
 return AVERROR(ENOMEM);
 
 av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d pixfmt:%s\n", c->w, c->h, av_get_pix_fmt_name(c->pix_fmt));
@@ -190,6 +279,32 @@
 
 #define OFFSET(x) offsetof(BufferSourceContext, x)
 #define A AV_OPT_FLAG_AUDIO_PARAM
+#define V AV_OPT_FLAG_VIDEO_PARAM
+
+static const AVOption video_options[] = {
+ { "width", NULL, OFFSET(w), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, V },
+ { "height", NULL, OFFSET(h), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, V },
+ { "pix_fmt", NULL, OFFSET(pix_fmt_str), AV_OPT_TYPE_STRING, .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 */
+ { "time_base_num", "deprecated, do not use", OFFSET(time_base.num), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, V },
+ { "time_base_den", "deprecated, do not use", OFFSET(time_base.den), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, V },
+ { "sar_num", "deprecated, do not use", OFFSET(pixel_aspect.num), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, V },
+ { "sar_den", "deprecated, do not use", OFFSET(pixel_aspect.den), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, V },
+#endif
+ { "sar", "sample aspect ratio", OFFSET(pixel_aspect), AV_OPT_TYPE_RATIONAL, { .dbl = 1 }, 0, DBL_MAX, V },
+ { "time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V },
+ { NULL },
+};
+
+static const AVClass buffer_class = {
+ .class_name = "buffer source",
+ .item_name = av_default_item_name,
+ .option = video_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVOption audio_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 },
@@ -205,39 +320,27 @@
 .version = LIBAVUTIL_VERSION_INT,
 };
 
-static av_cold int init_audio(AVFilterContext *ctx, const char *args)
+static av_cold int init_audio(AVFilterContext *ctx)
 {
 BufferSourceContext *s = ctx->priv;
 int ret = 0;
 
- s->class = &abuffer_class;
- av_opt_set_defaults(s);
-
- if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: %s.\n", args);
- goto fail;
- }
-
 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);
- ret = AVERROR(EINVAL);
- goto fail;
+ return AVERROR(EINVAL);
 }
 
 s->channel_layout = av_get_channel_layout(s->channel_layout_str);
 if (!s->channel_layout) {
 av_log(ctx, AV_LOG_ERROR, "Invalid channel layout %s.\n",
 s->channel_layout_str);
- ret = AVERROR(EINVAL);
- goto fail;
+ return AVERROR(EINVAL);
 }
 
- if (!(s->fifo = av_fifo_alloc(sizeof(AVFilterBufferRef*)))) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
+ if (!(s->fifo = av_fifo_alloc(sizeof(AVFrame*))))
+ return AVERROR(ENOMEM);
 
 if (!s->time_base.num)
 s->time_base = (AVRational){1, s->sample_rate};
@@ -246,8 +349,6 @@
 "ch layout:%s\n", s->time_base.num, s->time_base.den, s->sample_fmt_str,
 s->sample_rate, s->channel_layout_str);
 
-fail:
- av_opt_free(s);
 return ret;
 }
 
@@ -255,9 +356,9 @@
 {
 BufferSourceContext *s = ctx->priv;
 while (s->fifo && av_fifo_size(s->fifo)) {
- AVFilterBufferRef *buf;
- av_fifo_generic_read(s->fifo, &buf, sizeof(buf), NULL);
- avfilter_unref_buffer(buf);
+ AVFrame *frame;
+ av_fifo_generic_read(s->fifo, &frame, sizeof(frame), NULL);
+ av_frame_free(&frame);
 }
 av_fifo_free(s->fifo);
 s->fifo = NULL;
@@ -317,7 +418,7 @@
 static int request_frame(AVFilterLink *link)
 {
 BufferSourceContext *c = link->src->priv;
- AVFilterBufferRef *buf;
+ AVFrame *frame;
 int ret = 0;
 
 if (!av_fifo_size(c->fifo)) {
@@ -325,9 +426,9 @@
 return AVERROR_EOF;
 return AVERROR(EAGAIN);
 }
- av_fifo_generic_read(c->fifo, &buf, sizeof(buf), NULL);
+ av_fifo_generic_read(c->fifo, &frame, sizeof(frame), NULL);
 
- ff_filter_frame(link, buf);
+ ff_filter_frame(link, frame);
 
 return ret;
 }
@@ -338,7 +439,7 @@
 int size = av_fifo_size(c->fifo);
 if (!size && c->eof)
 return AVERROR_EOF;
- return size/sizeof(AVFilterBufferRef*);
+ return size/sizeof(AVFrame*);
 }
 
 static const AVFilterPad avfilter_vsrc_buffer_outputs[] = {
@@ -352,10 +453,11 @@
 { 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),
+ .priv_class = &buffer_class,
 .query_formats = query_formats,
 
 .init = init_video,
@@ -376,10 +478,11 @@
 { 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),
+ .priv_class = &abuffer_class,
 .query_formats = query_formats,
 
 .init = init_audio,

libav-v9.6.tar.bz2/libavfilter/buffersrc.h -> libav-v10.1.tar.bz2/libavfilter/buffersrc.h Changed

@@ -22,29 +22,64 @@
 
 /**
  * @file
+ * @ingroup lavfi_buffersrc
  * Memory buffer source API.
  */
 
 #include "avfilter.h"
 
 /**
- * Add a buffer to the filtergraph s.
+ * @defgroup lavfi_buffersrc Buffer source API
+ * @ingroup lavfi
+ * @{
+ */
+
+#if FF_API_AVFILTERBUFFER
+/**
+ * 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.
+ *
+ * @deprecated use av_buffersrc_write_frame() or av_buffersrc_add_frame()
+ */
+attribute_deprecated
+int av_buffersrc_buffer(AVFilterContext *ctx, AVFilterBufferRef *buf);
+#endif
+
+/**
+ * Add a frame to the buffer source.
+ *
+ * @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.
+ *
+ * @return 0 on success, a negative AVERROR on error
  */
-int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf);
+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 frame frame to be added.
+ * @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,
+ * the input frame is not touched.
+ *
+ * @return 0 on success, a negative AVERROR on error.
  *
- * @warning frame data will be memcpy()ed, which may be a big performance
- *          hit. Use av_buffersrc_buffer() to avoid copying the data.
+ * @note the difference between this function and av_buffersrc_write_frame() is
+ * that av_buffersrc_write_frame() creates a new reference to the input frame,
+ * while this function takes ownership of the reference passed to it.
+ */
+int av_buffersrc_add_frame(AVFilterContext *ctx, AVFrame *frame);
+
+/**
+ * @}
  */
-int av_buffersrc_write_frame(AVFilterContext *s, const AVFrame *frame);
 
 #endif /* AVFILTER_BUFFERSRC_H */

libav-v9.6.tar.bz2/libavfilter/fifo.c -> libav-v10.1.tar.bz2/libavfilter/fifo.c Changed

@@ -35,7 +35,7 @@
 #include "video.h"
 
 typedef struct Buf {
- AVFilterBufferRef *buf;
+ AVFrame *frame;
 struct Buf *next;
 } Buf;
 
@@ -47,11 +47,11 @@
 * When a specific number of output samples is requested, the partial
 * buffer is stored here
 */
- AVFilterBufferRef *buf_out;
- int allocated_samples; ///< number of samples buf_out was allocated for
+ AVFrame *out;
+ int allocated_samples; ///< number of samples out was allocated for
 } FifoContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
 FifoContext *fifo = ctx->priv;
 fifo->last = &fifo->root;
@@ -66,25 +66,25 @@
 
 for (buf = fifo->root.next; buf; buf = tmp) {
 tmp = buf->next;
- avfilter_unref_bufferp(&buf->buf);
+ av_frame_free(&buf->frame);
 av_free(buf);
 }
 
- avfilter_unref_bufferp(&fifo->buf_out);
+ av_frame_free(&fifo->out);
 }
 
-static int add_to_queue(AVFilterLink *inlink, AVFilterBufferRef *buf)
+static int add_to_queue(AVFilterLink *inlink, AVFrame *frame)
 {
 FifoContext *fifo = inlink->dst->priv;
 
 fifo->last->next = av_mallocz(sizeof(Buf));
 if (!fifo->last->next) {
- avfilter_unref_buffer(buf);
+ av_frame_free(&frame);
 return AVERROR(ENOMEM);
 }
 
 fifo->last = fifo->last->next;
- fifo->last->buf = buf;
+ fifo->last->frame = frame;
 
 return 0;
 }
@@ -101,7 +101,7 @@
 /**
 * Move data pointers and pts offset samples forward.
 */
-static void buffer_offset(AVFilterLink *link, AVFilterBufferRef *buf,
+static void buffer_offset(AVFilterLink *link, AVFrame *frame,
 int offset)
 {
 int nb_channels = av_get_channel_layout_nb_channels(link->channel_layout);
@@ -110,32 +110,32 @@
 int block_align = av_get_bytes_per_sample(link->format) * (planar ? 1 : nb_channels);
 int i;
 
- av_assert0(buf->audio->nb_samples > offset);
+ av_assert0(frame->nb_samples > offset);
 
 for (i = 0; i < planes; i++)
- buf->extended_data[i] += block_align*offset;
- if (buf->data != buf->extended_data)
- memcpy(buf->data, buf->extended_data,
- FFMIN(planes, FF_ARRAY_ELEMS(buf->data)) * sizeof(*buf->data));
- buf->linesize[0] -= block_align*offset;
- buf->audio->nb_samples -= offset;
-
- if (buf->pts != AV_NOPTS_VALUE) {
- buf->pts += av_rescale_q(offset, (AVRational){1, link->sample_rate},
- link->time_base);
+ frame->extended_data[i] += block_align * offset;
+ if (frame->data != frame->extended_data)
+ memcpy(frame->data, frame->extended_data,
+ FFMIN(planes, FF_ARRAY_ELEMS(frame->data)) * sizeof(*frame->data));
+ frame->linesize[0] -= block_align*offset;
+ frame->nb_samples -= offset;
+
+ if (frame->pts != AV_NOPTS_VALUE) {
+ frame->pts += av_rescale_q(offset, (AVRational){1, link->sample_rate},
+ link->time_base);
 }
 }
 
-static int calc_ptr_alignment(AVFilterBufferRef *buf)
+static int calc_ptr_alignment(AVFrame *frame)
 {
- int planes = av_sample_fmt_is_planar(buf->format) ?
- av_get_channel_layout_nb_channels(buf->audio->channel_layout) : 1;
+ int planes = av_sample_fmt_is_planar(frame->format) ?
+ av_get_channel_layout_nb_channels(frame->channel_layout) : 1;
 int min_align = 128;
 int p;
 
 for (p = 0; p < planes; p++) {
 int cur_align = 128;
- while ((intptr_t)buf->extended_data[p] % cur_align)
+ while ((intptr_t)frame->extended_data[p] % cur_align)
 cur_align >>= 1;
 if (cur_align < min_align)
 min_align = cur_align;
@@ -147,35 +147,38 @@
 {
 AVFilterLink *link = ctx->outputs[0];
 FifoContext *s = ctx->priv;
- AVFilterBufferRef *head = s->root.next->buf;
- AVFilterBufferRef *buf_out;
+ AVFrame *head = s->root.next ? s->root.next->frame : NULL;
+ AVFrame *out;
 int ret;
 
- if (!s->buf_out &&
- head->audio->nb_samples >= link->request_samples &&
+ /* if head is NULL then we're flushing the remaining samples in out */
+ if (!head && !s->out)
+ return AVERROR_EOF;
+
+ if (!s->out &&
+ head->nb_samples >= link->request_samples &&
 calc_ptr_alignment(head) >= 32) {
- if (head->audio->nb_samples == link->request_samples) {
- buf_out = head;
+ if (head->nb_samples == link->request_samples) {
+ out = head;
 queue_pop(s);
 } else {
- buf_out = avfilter_ref_buffer(head, AV_PERM_READ);
- if (!buf_out)
+ out = av_frame_clone(head);
+ if (!out)
 return AVERROR(ENOMEM);
 
- buf_out->audio->nb_samples = link->request_samples;
+ out->nb_samples = link->request_samples;
 buffer_offset(link, head, link->request_samples);
 }
 } else {
 int nb_channels = av_get_channel_layout_nb_channels(link->channel_layout);
 
- if (!s->buf_out) {
- s->buf_out = ff_get_audio_buffer(link, AV_PERM_WRITE,
- link->request_samples);
- if (!s->buf_out)
+ if (!s->out) {
+ s->out = ff_get_audio_buffer(link, link->request_samples);
+ if (!s->out)
 return AVERROR(ENOMEM);
 
- s->buf_out->audio->nb_samples = 0;
- s->buf_out->pts = head->pts;
+ s->out->nb_samples = 0;
+ s->out->pts = head->pts;
 s->allocated_samples = link->request_samples;
 } else if (link->request_samples != s->allocated_samples) {
 av_log(ctx, AV_LOG_ERROR, "request_samples changed before the "
@@ -183,43 +186,43 @@
 return AVERROR(EINVAL);
 }
 
- while (s->buf_out->audio->nb_samples < s->allocated_samples) {
+ while (s->out->nb_samples < s->allocated_samples) {
 int len;
 
- if (!s->root.next &&
- (ret = ff_request_frame(ctx->inputs[0])) < 0) {
+ if (!s->root.next) {
+ ret = ff_request_frame(ctx->inputs[0]);
 if (ret == AVERROR_EOF) {
- av_samples_set_silence(s->buf_out->extended_data,
- s->buf_out->audio->nb_samples,
+ av_samples_set_silence(s->out->extended_data,
+ s->out->nb_samples,
 s->allocated_samples -
- s->buf_out->audio->nb_samples,
+ s->out->nb_samples,
 nb_channels, link->format);
- s->buf_out->audio->nb_samples = s->allocated_samples;
+ s->out->nb_samples = s->allocated_samples;
 break;
- }
- return ret;
+ } else if (ret < 0)
+ return ret;
 }
- head = s->root.next->buf;
+ head = s->root.next->frame;
 
- len = FFMIN(s->allocated_samples - s->buf_out->audio->nb_samples,
- head->audio->nb_samples);
+ len = FFMIN(s->allocated_samples - s->out->nb_samples,
+ head->nb_samples);
 
- av_samples_copy(s->buf_out->extended_data, head->extended_data,
- s->buf_out->audio->nb_samples, 0, len, nb_channels,
+ av_samples_copy(s->out->extended_data, head->extended_data,
+ s->out->nb_samples, 0, len, nb_channels,
 link->format);
- s->buf_out->audio->nb_samples += len;
+ s->out->nb_samples += len;
 
- if (len == head->audio->nb_samples) {
- avfilter_unref_buffer(head);
+ if (len == head->nb_samples) {
+ av_frame_free(&head);
 queue_pop(s);
 } else {
 buffer_offset(link, head, len);
 }
 }
- buf_out = s->buf_out;
- s->buf_out = NULL;
+ out = s->out;
+ s->out = NULL;
 }
- return ff_filter_frame(link, buf_out);
+ return ff_filter_frame(link, out);
 }
 
 static int request_frame(AVFilterLink *outlink)
@@ -228,14 +231,17 @@
 int ret = 0;
 
 if (!fifo->root.next) {
- if ((ret = ff_request_frame(outlink->src->inputs[0])) < 0)
+ if ((ret = ff_request_frame(outlink->src->inputs[0])) < 0) {
+ if (ret == AVERROR_EOF && outlink->request_samples)
+ return return_audio_frame(outlink->src);
 return ret;
+ }
 }
 
 if (outlink->request_samples) {
 return return_audio_frame(outlink->src);
 } else {
- ret = ff_filter_frame(outlink, fifo->root.next->buf);
+ ret = ff_filter_frame(outlink, fifo->root.next->frame);
 queue_pop(fifo);
 }
 
@@ -248,7 +254,6 @@
 .type = AVMEDIA_TYPE_VIDEO,
 .get_video_buffer = ff_null_get_video_buffer,
 .filter_frame = add_to_queue,
- .rej_perms = AV_PERM_REUSE2,
 },
 { NULL }
 };
@@ -262,7 +267,7 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_fifo = {
+AVFilter ff_vf_fifo = {
 .name = "fifo",
 .description = NULL_IF_CONFIG_SMALL("Buffer input images and send them when they are requested."),
 
@@ -281,7 +286,6 @@
 .type = AVMEDIA_TYPE_AUDIO,
 .get_audio_buffer = ff_null_get_audio_buffer,
 .filter_frame = add_to_queue,
- .rej_perms = AV_PERM_REUSE2,
 },
 { NULL }
 };
@@ -295,7 +299,7 @@
 { NULL }
 };
 
-AVFilter avfilter_af_afifo = {
+AVFilter ff_af_afifo = {
 .name = "afifo",
 .description = NULL_IF_CONFIG_SMALL("Buffer input frames and send them when they are requested."),

libav-v9.6.tar.bz2/libavfilter/filtfmts.c -> libav-v10.1.tar.bz2/libavfilter/filtfmts.c Changed

@@ -29,6 +29,7 @@
 {
 AVFilter *filter;
 AVFilterContext *filter_ctx;
+ AVFilterGraph *graph_ctx;
 const char *filter_name;
 const char *filter_args = NULL;
 int i, j;
@@ -44,6 +45,11 @@
 if (argv[2])
 filter_args = argv[2];
 
+ /* allocate graph */
+ graph_ctx = avfilter_graph_alloc();
+ if (!graph_ctx)
+ return 1;
+
 avfilter_register_all();
 
 /* get a corresponding filter and open it */
@@ -52,24 +58,25 @@
 return 1;
 }
 
- if (avfilter_open(&filter_ctx, filter, NULL) < 0) {
+ /* open filter and add it to the graph */
+ if (!(filter_ctx = avfilter_graph_alloc_filter(graph_ctx, filter, filter_name))) {
 fprintf(stderr, "Impossible to open filter with name '%s'\n",
 filter_name);
 return 1;
 }
- if (avfilter_init_filter(filter_ctx, filter_args, NULL) < 0) {
+ if (avfilter_init_str(filter_ctx, filter_args) < 0) {
 fprintf(stderr, "Impossible to init filter '%s' with arguments '%s'\n",
 filter_name, filter_args);
 return 1;
 }
 
 /* create a link for each of the input pads */
- for (i = 0; i < filter_ctx->input_count; i++) {
+ for (i = 0; i < filter_ctx->nb_inputs; i++) {
 AVFilterLink *link = av_mallocz(sizeof(AVFilterLink));
 link->type = filter_ctx->filter->inputs[i].type;
 filter_ctx->inputs[i] = link;
 }
- for (i = 0; i < filter_ctx->output_count; i++) {
+ for (i = 0; i < filter_ctx->nb_outputs; i++) {
 AVFilterLink *link = av_mallocz(sizeof(AVFilterLink));
 link->type = filter_ctx->filter->outputs[i].type;
 filter_ctx->outputs[i] = link;
@@ -81,24 +88,25 @@
 ff_default_query_formats(filter_ctx);
 
 /* print the supported formats in input */
- for (i = 0; i < filter_ctx->input_count; i++) {
+ for (i = 0; i < filter_ctx->nb_inputs; i++) {
 AVFilterFormats *fmts = filter_ctx->inputs[i]->out_formats;
- for (j = 0; j < fmts->format_count; j++)
+ for (j = 0; j < fmts->nb_formats; j++)
 printf("INPUT[%d] %s: %s\n",
 i, filter_ctx->filter->inputs[i].name,
 av_get_pix_fmt_name(fmts->formats[j]));
 }
 
 /* print the supported formats in output */
- for (i = 0; i < filter_ctx->output_count; i++) {
+ for (i = 0; i < filter_ctx->nb_outputs; i++) {
 AVFilterFormats *fmts = filter_ctx->outputs[i]->in_formats;
- for (j = 0; j < fmts->format_count; j++)
+ for (j = 0; j < fmts->nb_formats; j++)
 printf("OUTPUT[%d] %s: %s\n",
 i, filter_ctx->filter->outputs[i].name,
 av_get_pix_fmt_name(fmts->formats[j]));
 }
 
 avfilter_free(filter_ctx);
+ avfilter_graph_free(&graph_ctx);
 fflush(stdout);
 return 0;
 }

libav-v9.6.tar.bz2/libavfilter/formats.c -> libav-v10.1.tar.bz2/libavfilter/formats.c Changed

@@ -84,7 +84,7 @@
 if (a == b)
 return a;
 
- MERGE_FORMATS(ret, a, b, formats, format_count, AVFilterFormats, fail);
+ MERGE_FORMATS(ret, a, b, formats, nb_formats, AVFilterFormats, fail);
 
 return ret;
 fail:
@@ -103,9 +103,9 @@
 
 if (a == b) return a;
 
- if (a->format_count && b->format_count) {
- MERGE_FORMATS(ret, a, b, formats, format_count, AVFilterFormats, fail);
- } else if (a->format_count) {
+ if (a->nb_formats && b->nb_formats) {
+ MERGE_FORMATS(ret, a, b, formats, nb_formats, AVFilterFormats, fail);
+ } else if (a->nb_formats) {
 MERGE_REF(a, b, formats, AVFilterFormats, fail);
 ret = a;
 } else {
@@ -173,7 +173,7 @@
 formats = av_mallocz(sizeof(*formats));
 if (count)
 formats->formats = av_malloc(sizeof(*formats->formats) * count);
- formats->format_count = count;
+ formats->nb_formats = count;
 memcpy(formats->formats, fmts, sizeof(*formats->formats) * count);
 
 return formats;
@@ -198,7 +198,7 @@
 
 int ff_add_format(AVFilterFormats **avff, int fmt)
 {
- ADD_FORMAT(avff, fmt, int, formats, format_count);
+ ADD_FORMAT(avff, fmt, int, formats, nb_formats);
 }
 
 int ff_add_channel_layout(AVFilterChannelLayouts **l, uint64_t channel_layout)
@@ -216,7 +216,7 @@
 for (fmt = 0; fmt < num_formats; fmt++) {
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt);
 if ((type != AVMEDIA_TYPE_VIDEO) ||
- (type == AVMEDIA_TYPE_VIDEO && !(desc->flags & PIX_FMT_HWACCEL)))
+ (type == AVMEDIA_TYPE_VIDEO && !(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)))
 ff_add_format(&ret, fmt);
 }

libav-v9.6.tar.bz2/libavfilter/formats.h -> libav-v10.1.tar.bz2/libavfilter/formats.h Changed

libav-v9.6.tar.bz2/libavfilter/gradfun.h -> libav-v10.1.tar.bz2/libavfilter/gradfun.h Changed

libav-v9.6.tar.bz2/libavfilter/graphparser.c -> libav-v10.1.tar.bz2/libavfilter/graphparser.c Changed

@@ -20,14 +20,12 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include <ctype.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "libavutil/avstring.h"
 #include "libavutil/mem.h"
 #include "avfilter.h"
-#include "avfiltergraph.h"
 
 #define WHITESPACES " \n\t"
 
@@ -111,16 +109,11 @@
 return AVERROR(EINVAL);
 }
 
- ret = avfilter_open(filt_ctx, filt, inst_name);
+ *filt_ctx = avfilter_graph_alloc_filter(ctx, filt, inst_name);
 if (!*filt_ctx) {
 av_log(log_ctx, AV_LOG_ERROR,
 "Error creating filter '%s'\n", filt_name);
- return ret;
- }
-
- if ((ret = avfilter_graph_add_filter(ctx, *filt_ctx)) < 0) {
- avfilter_free(*filt_ctx);
- return ret;
+ return AVERROR(ENOMEM);
 }
 
 if (!strcmp(filt_name, "scale") && args && !strstr(args, "flags") &&
@@ -130,9 +123,14 @@
 args = tmp_args;
 }
 
- if ((ret = avfilter_init_filter(*filt_ctx, args, NULL)) < 0) {
+ ret = avfilter_init_str(*filt_ctx, args);
+ if (ret < 0) {
 av_log(log_ctx, AV_LOG_ERROR,
- "Error initializing filter '%s' with args '%s'\n", filt_name, args);
+ "Error initializing filter '%s'", filt_name);
+ if (args)
+ av_log(log_ctx, AV_LOG_ERROR, " with args '%s'", args);
+ av_log(log_ctx, AV_LOG_ERROR, "\n");
+ avfilter_free(*filt_ctx);
 return ret;
 }
 
@@ -437,8 +435,8 @@
 return 0;
 
 fail:
- for (; graph->filter_count > 0; graph->filter_count--)
- avfilter_free(graph->filters[graph->filter_count - 1]);
+ while (graph->nb_filters)
+ avfilter_free(graph->filters[0]);
 av_freep(&graph->filters);
 avfilter_inout_free(&open_inputs);
 avfilter_inout_free(&open_outputs);
@@ -502,8 +500,8 @@
 
 fail:
 if (ret < 0) {
- for (; graph->filter_count > 0; graph->filter_count--)
- avfilter_free(graph->filters[graph->filter_count - 1]);
+ while (graph->nb_filters)
+ avfilter_free(graph->filters[0]);
 av_freep(&graph->filters);
 }
 avfilter_inout_free(&inputs);

libav-v9.6.tar.bz2/libavfilter/internal.h -> libav-v10.1.tar.bz2/libavfilter/internal.h Changed

@@ -24,7 +24,10 @@
  * internal API functions
  */
 
+#include "libavutil/internal.h"
 #include "avfilter.h"
+#include "thread.h"
+#include "version.h"
 
 #if !FF_API_AVFILTERPAD_PUBLIC
 /**
@@ -44,32 +47,12 @@
     enum AVMediaType type;
 
     /**
-     * Minimum required permissions on incoming buffers. Any buffer with
-     * insufficient permissions will be automatically copied by the filter
-     * system to a new buffer which provides the needed access permissions.
-     *
-     * Input pads only.
-     */
-    int min_perms;
-
-    /**
-     * Permissions which are not accepted on incoming buffers. Any buffer
-     * which has any of these permissions set will be automatically copied
-     * by the filter system to a new buffer which does not have those
-     * permissions. This can be used to easily disallow buffers with
-     * AV_PERM_REUSE.
-     *
-     * Input pads only.
-     */
-    int rej_perms;
-
-    /**
      * Callback function to get a video buffer. If NULL, the filter system will
      * use avfilter_default_get_video_buffer().
      *
      * Input video pads only.
      */
-    AVFilterBufferRef *(*get_video_buffer)(AVFilterLink *link, int perms, int w, int h);
+    AVFrame *(*get_video_buffer)(AVFilterLink *link, int w, int h);
 
     /**
      * Callback function to get an audio buffer. If NULL, the filter system will
@@ -77,8 +60,7 @@
      *
      * Input audio pads only.
      */
-    AVFilterBufferRef *(*get_audio_buffer)(AVFilterLink *link, int perms,
-                                           int nb_samples);
+    AVFrame *(*get_audio_buffer)(AVFilterLink *link, int nb_samples);
 
     /**
      * Filtering callback. This is where a filter receives a frame with
@@ -90,7 +72,7 @@
      * must ensure that samplesref is properly unreferenced on error if it
      * hasn't been passed on to another filter.
      */
-    int (*filter_frame)(AVFilterLink *link, AVFilterBufferRef *frame);
+    int (*filter_frame)(AVFilterLink *link, AVFrame *frame);
 
     /**
      * Frame poll callback. This returns the number of immediately available
@@ -135,11 +117,30 @@
      * input pads only.
      */
     int needs_fifo;
+
+    /**
+     * The filter expects writable frames from its input link,
+     * duplicating data buffers if needed.
+     *
+     * input pads only.
+     */
+    int needs_writable;
 };
 #endif
 
+struct AVFilterGraphInternal {
+    void *thread;
+    avfilter_execute_func *thread_execute;
+};
+
+struct AVFilterInternal {
+    avfilter_execute_func *execute;
+};
+
+#if FF_API_AVFILTERBUFFER
 /** default handler for freeing audio/video buffer when there are no references left */
 void ff_avfilter_default_free_buffer(AVFilterBuffer *buf);
+#endif
 
 /** Tell is a format is contained in the provided list terminated by -1. */
 int ff_fmt_is_in(int fmt, const int *fmts);
@@ -172,7 +173,9 @@
     ff_insert_pad(index, &f->nb_inputs, offsetof(AVFilterLink, dstpad),
                   &f->input_pads, &f->inputs, p);
 #if FF_API_FOO_COUNT
+FF_DISABLE_DEPRECATION_WARNINGS
     f->input_count = f->nb_inputs;
+FF_ENABLE_DEPRECATION_WARNINGS
 #endif
 }
 
@@ -183,7 +186,9 @@
     ff_insert_pad(index, &f->nb_outputs, offsetof(AVFilterLink, srcpad),
                   &f->output_pads, &f->outputs, p);
 #if FF_API_FOO_COUNT
+FF_DISABLE_DEPRECATION_WARNINGS
     f->output_count = f->nb_outputs;
+FF_ENABLE_DEPRECATION_WARNINGS
 #endif
 }
 
@@ -215,6 +220,21 @@
  * @return >= 0 on success, a negative AVERROR on error. The receiving filter
  * is responsible for unreferencing frame in case of error.
  */
-int ff_filter_frame(AVFilterLink *link, AVFilterBufferRef *frame);
+int ff_filter_frame(AVFilterLink *link, AVFrame *frame);
+
+/**
+ * Allocate a new filter context and return it.
+ *
+ * @param filter what filter to create an instance of
+ * @param inst_name name to give to the new filter context
+ *
+ * @return newly created filter context or NULL on failure
+ */
+AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name);
+
+/**
+ * Remove a filter from a graph;
+ */
+void ff_filter_graph_remove_filter(AVFilterGraph *graph, AVFilterContext *filter);
 
 #endif /* AVFILTER_INTERNAL_H */

libav-v10.1.tar.bz2/libavfilter/pthread.c Added

@@ -0,0 +1,236 @@
+/*
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Libavfilter multithreading support
+ */
+
+#include "config.h"
+
+#include "libavutil/common.h"
+#include "libavutil/cpu.h"
+#include "libavutil/mem.h"
+
+#include "avfilter.h"
+#include "internal.h"
+#include "thread.h"
+
+#if HAVE_PTHREADS
+#include <pthread.h>
+#elif HAVE_W32THREADS
+#include "compat/w32pthreads.h"
+#endif
+
+typedef struct ThreadContext {
+ AVFilterGraph *graph;
+
+ int nb_threads;
+ pthread_t *workers;
+ avfilter_action_func *func;
+
+ /* per-execute perameters */
+ AVFilterContext *ctx;
+ void *arg;
+ int *rets;
+ int nb_rets;
+ int nb_jobs;
+
+ pthread_cond_t last_job_cond;
+ pthread_cond_t current_job_cond;
+ pthread_mutex_t current_job_lock;
+ int current_job;
+ unsigned int current_execute;
+ int done;
+} ThreadContext;
+
+static void* attribute_align_arg worker(void *v)
+{
+ ThreadContext *c = v;
+ int our_job = c->nb_jobs;
+ int nb_threads = c->nb_threads;
+ unsigned int last_execute = 0;
+ int self_id;
+
+ pthread_mutex_lock(&c->current_job_lock);
+ self_id = c->current_job++;
+ for (;;) {
+ while (our_job >= c->nb_jobs) {
+ if (c->current_job == nb_threads + c->nb_jobs)
+ 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->nb_rets] = c->func(c->ctx, c->arg, our_job, c->nb_jobs);
+
+ pthread_mutex_lock(&c->current_job_lock);
+ our_job = c->current_job++;
+ }
+}
+
+static void slice_thread_uninit(ThreadContext *c)
+{
+ 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 < c->nb_threads; 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_freep(&c->workers);
+}
+
+static void slice_thread_park_workers(ThreadContext *c)
+{
+ while (c->current_job != c->nb_threads + c->nb_jobs)
+ pthread_cond_wait(&c->last_job_cond, &c->current_job_lock);
+ pthread_mutex_unlock(&c->current_job_lock);
+}
+
+static int thread_execute(AVFilterContext *ctx, avfilter_action_func *func,
+ void *arg, int *ret, int nb_jobs)
+{
+ ThreadContext *c = ctx->graph->internal->thread;
+ int dummy_ret;
+
+ if (nb_jobs <= 0)
+ return 0;
+
+ pthread_mutex_lock(&c->current_job_lock);
+
+ c->current_job = c->nb_threads;
+ c->nb_jobs = nb_jobs;
+ c->ctx = ctx;
+ c->arg = arg;
+ c->func = func;
+ if (ret) {
+ c->rets = ret;
+ c->nb_rets = nb_jobs;
+ } else {
+ c->rets = &dummy_ret;
+ c->nb_rets = 1;
+ }
+ c->current_execute++;
+
+ pthread_cond_broadcast(&c->current_job_cond);
+
+ slice_thread_park_workers(c);
+
+ return 0;
+}
+
+static int thread_init_internal(ThreadContext *c, int nb_threads)
+{
+ int i, ret;
+
+ if (!nb_threads) {
+ int nb_cpus = av_cpu_count();
+ av_log(c->graph, AV_LOG_DEBUG, "Detected %d logical cores.\n", nb_cpus);
+ // use number of cores + 1 as thread count if there is more than one
+ if (nb_cpus > 1)
+ nb_threads = nb_cpus + 1;
+ else
+ nb_threads = 1;
+ }
+
+ if (nb_threads <= 1)
+ return 1;
+
+ c->nb_threads = nb_threads;
+ c->workers = av_mallocz(sizeof(*c->workers) * nb_threads);
+ if (!c->workers)
+ return AVERROR(ENOMEM);
+
+ c->current_job = 0;
+ c->nb_jobs = 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 < nb_threads; i++) {
+ ret = pthread_create(&c->workers[i], NULL, worker, c);
+ if (ret) {
+ pthread_mutex_unlock(&c->current_job_lock);
+ c->nb_threads = i;
+ slice_thread_uninit(c);
+ return AVERROR(ret);
+ }
+ }
+
+ slice_thread_park_workers(c);
+
+ return c->nb_threads;
+}
+
+int ff_graph_thread_init(AVFilterGraph *graph)
+{
+ int ret;
+
+#if HAVE_W32THREADS
+ w32thread_init();
+#endif
+
+ if (graph->nb_threads == 1) {
+ graph->thread_type = 0;
+ return 0;
+ }
+
+ graph->internal->thread = av_mallocz(sizeof(ThreadContext));
+ if (!graph->internal->thread)
+ return AVERROR(ENOMEM);
+
+ ret = thread_init_internal(graph->internal->thread, graph->nb_threads);
+ if (ret <= 1) {
+ av_freep(&graph->internal->thread);
+ graph->thread_type = 0;
+ graph->nb_threads = 1;
+ return (ret < 0) ? ret : 0;
+ }
+ graph->nb_threads = ret;
+
+ graph->internal->thread_execute = thread_execute;
+
+ return 0;
+}
+
+void ff_graph_thread_free(AVFilterGraph *graph)
+{
+ if (graph->internal->thread)
+ slice_thread_uninit(graph->internal->thread);
+ av_freep(&graph->internal->thread);
+}

libav-v10.1.tar.bz2/libavfilter/setpts.c Added

@@ -0,0 +1,259 @@
+/*
+ * Copyright (c) 2010 Stefano Sabatini
+ * Copyright (c) 2008 Victor Paesa
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * video presentation timestamp (PTS) modification filter
+ */
+
+#include "libavutil/eval.h"
+#include "libavutil/internal.h"
+#include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
+#include "libavutil/time.h"
+
+#include "audio.h"
+#include "avfilter.h"
+#include "internal.h"
+#include "video.h"
+
+#include "config.h"
+
+static const char *const var_names[] = {
+ "E", ///< Euler number
+ "INTERLACED", ///< tell if the current frame is interlaced
+ "N", ///< frame / sample number (starting at zero)
+ "PHI", ///< golden ratio
+ "PI", ///< greek pi
+ "PREV_INPTS", ///< previous input PTS
+ "PREV_OUTPTS", ///< previous output PTS
+ "PTS", ///< original pts in the file of the frame
+ "STARTPTS", ///< PTS at start of movie
+ "TB", ///< timebase
+ "RTCTIME", ///< wallclock (RTC) time in micro seconds
+ "RTCSTART", ///< wallclock (RTC) time at the start of the movie in micro seconds
+ "S", // Number of samples in the current frame
+ "SR", // Audio sample rate
+ NULL
+};
+
+enum var_name {
+ VAR_E,
+ VAR_INTERLACED,
+ VAR_N,
+ VAR_PHI,
+ VAR_PI,
+ VAR_PREV_INPTS,
+ VAR_PREV_OUTPTS,
+ VAR_PTS,
+ VAR_STARTPTS,
+ VAR_TB,
+ VAR_RTCTIME,
+ VAR_RTCSTART,
+ VAR_S,
+ VAR_SR,
+ VAR_VARS_NB
+};
+
+typedef struct {
+ const AVClass *class;
+ char *expr_str;
+ AVExpr *expr;
+ double var_values[VAR_VARS_NB];
+} SetPTSContext;
+
+static av_cold int init(AVFilterContext *ctx)
+{
+ SetPTSContext *setpts = ctx->priv;
+ int ret;
+
+ if ((ret = av_expr_parse(&setpts->expr, setpts->expr_str,
+ var_names, NULL, NULL, NULL, NULL, 0, ctx)) < 0) {
+ av_log(ctx, AV_LOG_ERROR, "Error while parsing expression '%s'\n", setpts->expr_str);
+ return ret;
+ }
+
+ setpts->var_values[VAR_E] = M_E;
+ setpts->var_values[VAR_N] = 0.0;
+ setpts->var_values[VAR_S] = 0.0;
+ setpts->var_values[VAR_PHI] = M_PHI;
+ setpts->var_values[VAR_PI] = M_PI;
+ setpts->var_values[VAR_PREV_INPTS] = NAN;
+ setpts->var_values[VAR_PREV_OUTPTS] = NAN;
+ setpts->var_values[VAR_STARTPTS] = NAN;
+ return 0;
+}
+
+static int config_input(AVFilterLink *inlink)
+{
+ SetPTSContext *setpts = inlink->dst->priv;
+
+ setpts->var_values[VAR_TB] = av_q2d(inlink->time_base);
+ setpts->var_values[VAR_RTCSTART] = av_gettime();
+
+ if (inlink->type == AVMEDIA_TYPE_AUDIO) {
+ setpts->var_values[VAR_SR] = inlink->sample_rate;
+ }
+
+ av_log(inlink->src, AV_LOG_VERBOSE, "TB:%f\n", setpts->var_values[VAR_TB]);
+ return 0;
+}
+
+#define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d))
+#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
+
+static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
+{
+ SetPTSContext *setpts = inlink->dst->priv;
+ int64_t in_pts = frame->pts;
+ double d;
+
+ if (isnan(setpts->var_values[VAR_STARTPTS]))
+ setpts->var_values[VAR_STARTPTS] = TS2D(frame->pts);
+
+ setpts->var_values[VAR_PTS ] = TS2D(frame->pts);
+ setpts->var_values[VAR_RTCTIME ] = av_gettime();
+
+ if (inlink->type == AVMEDIA_TYPE_VIDEO) {
+ setpts->var_values[VAR_INTERLACED] = frame->interlaced_frame;
+ } else {
+ setpts->var_values[VAR_S] = frame->nb_samples;
+ }
+
+ d = av_expr_eval(setpts->expr, setpts->var_values, NULL);
+ frame->pts = D2TS(d);
+
+#ifdef DEBUG
+ av_log(inlink->dst, AV_LOG_DEBUG,
+ "n:%"PRId64" interlaced:%d pts:%"PRId64" t:%f -> pts:%"PRId64" t:%f\n",
+ (int64_t)setpts->var_values[VAR_N],
+ (int)setpts->var_values[VAR_INTERLACED],
+ in_pts, in_pts * av_q2d(inlink->time_base),
+ frame->pts, frame->pts * av_q2d(inlink->time_base));
+#endif
+
+
+ if (inlink->type == AVMEDIA_TYPE_VIDEO) {
+ setpts->var_values[VAR_N] += 1.0;
+ } else {
+ setpts->var_values[VAR_N] += frame->nb_samples;
+ }
+
+ setpts->var_values[VAR_PREV_INPTS ] = TS2D(in_pts);
+ setpts->var_values[VAR_PREV_OUTPTS] = TS2D(frame->pts);
+ return ff_filter_frame(inlink->dst->outputs[0], frame);
+}
+
+static av_cold void uninit(AVFilterContext *ctx)
+{
+ SetPTSContext *setpts = ctx->priv;
+ av_expr_free(setpts->expr);
+ setpts->expr = NULL;
+}
+
+#define OFFSET(x) offsetof(SetPTSContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_AUDIO_PARAM
+static const AVOption options[] = {
+ { "expr", "Expression determining the frame timestamp", OFFSET(expr_str), AV_OPT_TYPE_STRING, { .str = "PTS" }, .flags = FLAGS },
+ { NULL },
+};
+
+#if CONFIG_SETPTS_FILTER
+static const AVClass setpts_class = {
+ .class_name = "setpts",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+static const AVFilterPad avfilter_vf_setpts_inputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .get_video_buffer = ff_null_get_video_buffer,
+ .config_props = config_input,
+ .filter_frame = filter_frame,
+ },
+ { NULL }
+};
+
+static const AVFilterPad avfilter_vf_setpts_outputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ },
+ { NULL }
+};
+
+AVFilter ff_vf_setpts = {
+ .name = "setpts",
+ .description = NULL_IF_CONFIG_SMALL("Set PTS for the output video frame."),
+ .init = init,
+ .uninit = uninit,
+
+ .priv_size = sizeof(SetPTSContext),
+ .priv_class = &setpts_class,
+
+ .inputs = avfilter_vf_setpts_inputs,
+ .outputs = avfilter_vf_setpts_outputs,
+};
+#endif
+
+#if CONFIG_ASETPTS_FILTER
+static const AVClass asetpts_class = {
+ .class_name = "asetpts",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+static const AVFilterPad asetpts_inputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .get_audio_buffer = ff_null_get_audio_buffer,
+ .config_props = config_input,
+ .filter_frame = filter_frame,
+ },
+ { NULL }
+};
+
+static const AVFilterPad asetpts_outputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_AUDIO,
+ },
+ { NULL }
+};
+
+AVFilter ff_af_asetpts = {
+ .name = "asetpts",
+ .description = NULL_IF_CONFIG_SMALL("Set PTS for the output audio frame."),
+ .init = init,
+ .uninit = uninit,
+
+ .priv_size = sizeof(SetPTSContext),
+ .priv_class = &asetpts_class,
+
+ .inputs = asetpts_inputs,
+ .outputs = asetpts_outputs,
+};
+#endif

libav-v9.6.tar.bz2/libavfilter/split.c -> libav-v10.1.tar.bz2/libavfilter/split.c Changed

@@ -25,27 +25,27 @@
 
 #include <stdio.h>
 
+#include "libavutil/attributes.h"
 #include "libavutil/internal.h"
 #include "libavutil/mem.h"
+#include "libavutil/opt.h"
+
 #include "avfilter.h"
 #include "audio.h"
 #include "internal.h"
 #include "video.h"
 
-static int split_init(AVFilterContext *ctx, const char *args)
+typedef struct SplitContext {
+ const AVClass *class;
+ int nb_outputs;
+} SplitContext;
+
+static av_cold int split_init(AVFilterContext *ctx)
 {
- int i, nb_outputs = 2;
-
- if (args) {
- nb_outputs = strtol(args, NULL, 0);
- if (nb_outputs <= 0) {
- av_log(ctx, AV_LOG_ERROR, "Invalid number of outputs specified: %d.\n",
- nb_outputs);
- return AVERROR(EINVAL);
- }
- }
+ SplitContext *s = ctx->priv;
+ int i;
 
- for (i = 0; i < nb_outputs; i++) {
+ for (i = 0; i < s->nb_outputs; i++) {
 char name[32];
 AVFilterPad pad = { 0 };
 
@@ -59,7 +59,7 @@
 return 0;
 }
 
-static void split_uninit(AVFilterContext *ctx)
+static av_cold void split_uninit(AVFilterContext *ctx)
 {
 int i;
 
@@ -67,13 +67,13 @@
 av_freep(&ctx->output_pads[i].name);
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
+static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 {
 AVFilterContext *ctx = inlink->dst;
 int i, ret = 0;
 
 for (i = 0; i < ctx->nb_outputs; i++) {
- AVFilterBufferRef *buf_out = avfilter_ref_buffer(frame, ~AV_PERM_WRITE);
+ AVFrame *buf_out = av_frame_clone(frame);
 if (!buf_out) {
 ret = AVERROR(ENOMEM);
 break;
@@ -83,10 +83,31 @@
 if (ret < 0)
 break;
 }
- avfilter_unref_bufferp(&frame);
+ av_frame_free(&frame);
 return ret;
 }
 
+#define OFFSET(x) offsetof(SplitContext, x)
+#define FLAGS AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "outputs", "Number of outputs", OFFSET(nb_outputs), AV_OPT_TYPE_INT, { .i64 = 2 }, 1, INT_MAX, FLAGS },
+ { NULL },
+};
+
+static const AVClass split_class = {
+ .class_name = "split",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+static const AVClass asplit_class = {
+ .class_name = "asplit",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_split_inputs[] = {
 {
 .name = "default",
@@ -97,15 +118,20 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_split = {
+AVFilter ff_vf_split = {
 .name = "split",
- .description = NULL_IF_CONFIG_SMALL("Pass on the input to two outputs."),
+ .description = NULL_IF_CONFIG_SMALL("Pass on the input to N video outputs."),
+
+ .priv_size = sizeof(SplitContext),
+ .priv_class = &split_class,
 
 .init = split_init,
 .uninit = split_uninit,
 
 .inputs = avfilter_vf_split_inputs,
 .outputs = NULL,
+
+ .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS,
 };
 
 static const AVFilterPad avfilter_af_asplit_inputs[] = {
@@ -118,13 +144,18 @@
 { NULL }
 };
 
-AVFilter avfilter_af_asplit = {
+AVFilter ff_af_asplit = {
 .name = "asplit",
 .description = NULL_IF_CONFIG_SMALL("Pass on the audio input to N audio outputs."),
 
+ .priv_size = sizeof(SplitContext),
+ .priv_class = &asplit_class,
+
 .init = split_init,
 .uninit = split_uninit,
 
 .inputs = avfilter_af_asplit_inputs,
 .outputs = NULL,
+
+ .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS,
 };

libav-v10.1.tar.bz2/libavfilter/thread.h Added

@@ -0,0 +1,29 @@
+/*
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFILTER_THREAD_H
+#define AVFILTER_THREAD_H
+
+#include "avfilter.h"
+
+int ff_graph_thread_init(AVFilterGraph *graph);
+
+void ff_graph_thread_free(AVFilterGraph *graph);
+
+#endif /* AVFILTER_THREAD_H */

libav-v10.1.tar.bz2/libavfilter/trim.c Added

@@ -0,0 +1,408 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <float.h>
+#include <math.h>
+#include <stdint.h>
+
+#include "config.h"
+
+#include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
+#include "libavutil/common.h"
+#include "libavutil/log.h"
+#include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
+#include "libavutil/samplefmt.h"
+
+#include "audio.h"
+#include "avfilter.h"
+#include "internal.h"
+
+typedef struct TrimContext {
+ const AVClass *class;
+
+ /*
+ * AVOptions
+ */
+ double duration;
+ double start_time, end_time;
+ int64_t start_frame, end_frame;
+ /*
+ * in the link timebase for video,
+ * in 1/samplerate for audio
+ */
+ int64_t start_pts, end_pts;
+ int64_t start_sample, end_sample;
+
+ /*
+ * number of video frames that arrived on this filter so far
+ */
+ int64_t nb_frames;
+ /*
+ * number of audio samples that arrived on this filter so far
+ */
+ int64_t nb_samples;
+ /*
+ * timestamp of the first frame in the output, in the timebase units
+ */
+ int64_t first_pts;
+ /*
+ * duration in the timebase units
+ */
+ int64_t duration_tb;
+
+ int64_t next_pts;
+
+ int eof;
+ int got_output;
+} TrimContext;
+
+static int init(AVFilterContext *ctx)
+{
+ TrimContext *s = ctx->priv;
+
+ s->first_pts = AV_NOPTS_VALUE;
+
+ return 0;
+}
+
+static int config_input(AVFilterLink *inlink)
+{
+ AVFilterContext *ctx = inlink->dst;
+ TrimContext *s = ctx->priv;
+ AVRational tb = (inlink->type == AVMEDIA_TYPE_VIDEO) ?
+ inlink->time_base : (AVRational){ 1, inlink->sample_rate };
+
+ if (s->start_time != DBL_MAX) {
+ int64_t start_pts = lrintf(s->start_time / av_q2d(tb));
+ if (s->start_pts == AV_NOPTS_VALUE || start_pts < s->start_pts)
+ s->start_pts = start_pts;
+ }
+ if (s->end_time != DBL_MAX) {
+ int64_t end_pts = lrintf(s->end_time / av_q2d(tb));
+ if (s->end_pts == AV_NOPTS_VALUE || end_pts > s->end_pts)
+ s->end_pts = end_pts;
+ }
+ if (s->duration)
+ s->duration_tb = lrintf(s->duration / av_q2d(tb));
+
+ return 0;
+}
+
+static int request_frame(AVFilterLink *outlink)
+{
+ AVFilterContext *ctx = outlink->src;
+ TrimContext *s = ctx->priv;
+ int ret;
+
+ s->got_output = 0;
+ while (!s->got_output) {
+ if (s->eof)
+ return AVERROR_EOF;
+
+ ret = ff_request_frame(ctx->inputs[0]);
+ if (ret < 0)
+ return ret;
+ }
+
+ return 0;
+}
+
+#define OFFSET(x) offsetof(TrimContext, x)
+#define COMMON_OPTS \
+ { "start", "Timestamp in seconds of the first frame that " \
+ "should be passed", OFFSET(start_time), AV_OPT_TYPE_DOUBLE, { .dbl = DBL_MAX }, -DBL_MAX, DBL_MAX, FLAGS }, \
+ { "end", "Timestamp in seconds of the first frame that " \
+ "should be dropped again", OFFSET(end_time), AV_OPT_TYPE_DOUBLE, { .dbl = DBL_MAX }, -DBL_MAX, DBL_MAX, FLAGS }, \
+ { "start_pts", "Timestamp of the first frame that should be " \
+ " passed", OFFSET(start_pts), AV_OPT_TYPE_INT64, { .i64 = AV_NOPTS_VALUE }, INT64_MIN, INT64_MAX, FLAGS }, \
+ { "end_pts", "Timestamp of the first frame that should be " \
+ "dropped again", OFFSET(end_pts), AV_OPT_TYPE_INT64, { .i64 = AV_NOPTS_VALUE }, INT64_MIN, INT64_MAX, FLAGS }, \
+ { "duration", "Maximum duration of the output in seconds", OFFSET(duration), AV_OPT_TYPE_DOUBLE, { .dbl = 0 }, 0, DBL_MAX, FLAGS },
+
+
+#if CONFIG_TRIM_FILTER
+static int trim_filter_frame(AVFilterLink *inlink, AVFrame *frame)
+{
+ AVFilterContext *ctx = inlink->dst;
+ TrimContext *s = ctx->priv;
+ int drop;
+
+ /* drop everything if EOF has already been returned */
+ if (s->eof) {
+ av_frame_free(&frame);
+ return 0;
+ }
+
+ if (s->start_frame >= 0 || s->start_pts != AV_NOPTS_VALUE) {
+ drop = 1;
+ if (s->start_frame >= 0 && s->nb_frames >= s->start_frame)
+ drop = 0;
+ if (s->start_pts != AV_NOPTS_VALUE && frame->pts != AV_NOPTS_VALUE &&
+ frame->pts >= s->start_pts)
+ drop = 0;
+ if (drop)
+ goto drop;
+ }
+
+ if (s->first_pts == AV_NOPTS_VALUE && frame->pts != AV_NOPTS_VALUE)
+ s->first_pts = frame->pts;
+
+ if (s->end_frame != INT64_MAX || s->end_pts != AV_NOPTS_VALUE || s->duration_tb) {
+ drop = 1;
+
+ if (s->end_frame != INT64_MAX && s->nb_frames < s->end_frame)
+ drop = 0;
+ if (s->end_pts != AV_NOPTS_VALUE && frame->pts != AV_NOPTS_VALUE &&
+ frame->pts < s->end_pts)
+ drop = 0;
+ if (s->duration_tb && frame->pts != AV_NOPTS_VALUE &&
+ frame->pts - s->first_pts < s->duration_tb)
+ drop = 0;
+
+ if (drop) {
+ s->eof = 1;
+ goto drop;
+ }
+ }
+
+ s->nb_frames++;
+ s->got_output = 1;
+
+ return ff_filter_frame(ctx->outputs[0], frame);
+
+drop:
+ s->nb_frames++;
+ av_frame_free(&frame);
+ return 0;
+}
+
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption trim_options[] = {
+ COMMON_OPTS
+ { "start_frame", "Number of the first frame that should be passed "
+ "to the output", OFFSET(start_frame), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, FLAGS },
+ { "end_frame", "Number of the first frame that should be dropped "
+ "again", OFFSET(end_frame), AV_OPT_TYPE_INT64, { .i64 = INT64_MAX }, 0, INT64_MAX, FLAGS },
+ { NULL },
+};
+#undef FLAGS
+
+static const AVClass trim_class = {
+ .class_name = "trim",
+ .item_name = av_default_item_name,
+ .option = trim_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+static const AVFilterPad trim_inputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .filter_frame = trim_filter_frame,
+ .config_props = config_input,
+ },
+ { NULL }
+};
+
+static const AVFilterPad trim_outputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .request_frame = request_frame,
+ },
+ { NULL }
+};
+
+AVFilter ff_vf_trim = {
+ .name = "trim",
+ .description = NULL_IF_CONFIG_SMALL("Pick one continuous section from the input, drop the rest."),
+
+ .init = init,
+
+ .priv_size = sizeof(TrimContext),
+ .priv_class = &trim_class,
+
+ .inputs = trim_inputs,
+ .outputs = trim_outputs,
+};
+#endif // CONFIG_TRIM_FILTER
+
+#if CONFIG_ATRIM_FILTER
+static int atrim_filter_frame(AVFilterLink *inlink, AVFrame *frame)
+{
+ AVFilterContext *ctx = inlink->dst;
+ TrimContext *s = ctx->priv;
+ int64_t start_sample, end_sample = frame->nb_samples;
+ int64_t pts;
+ int drop;
+
+ /* drop everything if EOF has already been returned */
+ if (s->eof) {
+ av_frame_free(&frame);
+ return 0;
+ }
+
+ if (frame->pts != AV_NOPTS_VALUE)
+ pts = av_rescale_q(frame->pts, inlink->time_base,
+ (AVRational){ 1, inlink->sample_rate });
+ else
+ pts = s->next_pts;
+ s->next_pts = pts + frame->nb_samples;
+
+ /* check if at least a part of the frame is after the start time */
+ if (s->start_sample < 0 && s->start_pts == AV_NOPTS_VALUE) {
+ start_sample = 0;
+ } else {
+ drop = 1;
+ start_sample = frame->nb_samples;
+
+ if (s->start_sample >= 0 &&
+ s->nb_samples + frame->nb_samples > s->start_sample) {
+ drop = 0;
+ start_sample = FFMIN(start_sample, s->start_sample - s->nb_samples);
+ }
+
+ if (s->start_pts != AV_NOPTS_VALUE && pts != AV_NOPTS_VALUE &&
+ pts + frame->nb_samples > s->start_pts) {
+ drop = 0;
+ start_sample = FFMIN(start_sample, s->start_pts - pts);
+ }
+
+ if (drop)
+ goto drop;
+ }
+
+ if (s->first_pts == AV_NOPTS_VALUE)
+ s->first_pts = pts + start_sample;
+
+ /* check if at least a part of the frame is before the end time */
+ if (s->end_sample == INT64_MAX && s->end_pts == AV_NOPTS_VALUE && !s->duration_tb) {
+ end_sample = frame->nb_samples;
+ } else {
+ drop = 1;
+ end_sample = 0;
+
+ if (s->end_sample != INT64_MAX &&
+ s->nb_samples < s->end_sample) {
+ drop = 0;
+ end_sample = FFMAX(end_sample, s->end_sample - s->nb_samples);
+ }
+
+ if (s->end_pts != AV_NOPTS_VALUE && pts != AV_NOPTS_VALUE &&
+ pts < s->end_pts) {
+ drop = 0;
+ end_sample = FFMAX(end_sample, s->end_pts - pts);
+ }
+
+ if (s->duration_tb && pts - s->first_pts < s->duration_tb) {
+ drop = 0;
+ end_sample = FFMAX(end_sample, s->first_pts + s->duration_tb - pts);
+ }
+
+ if (drop) {
+ s->eof = 1;
+ goto drop;
+ }
+ }
+
+ s->nb_samples += frame->nb_samples;
+ start_sample = FFMAX(0, start_sample);
+ end_sample = FFMIN(frame->nb_samples, end_sample);
+ av_assert0(start_sample < end_sample);
+
+ if (start_sample) {
+ AVFrame *out = ff_get_audio_buffer(ctx->outputs[0], end_sample - start_sample);
+ if (!out) {
+ av_frame_free(&frame);
+ return AVERROR(ENOMEM);
+ }
+
+ av_frame_copy_props(out, frame);
+ av_samples_copy(out->extended_data, frame->extended_data, 0, start_sample,
+ out->nb_samples, av_get_channel_layout_nb_channels(frame->channel_layout),
+ frame->format);
+ if (out->pts != AV_NOPTS_VALUE)
+ out->pts += av_rescale_q(start_sample, (AVRational){ 1, out->sample_rate },
+ inlink->time_base);
+
+ av_frame_free(&frame);
+ frame = out;
+ } else
+ frame->nb_samples = end_sample;
+
+ s->got_output = 1;
+ return ff_filter_frame(ctx->outputs[0], frame);
+
+drop:
+ s->nb_samples += frame->nb_samples;
+ av_frame_free(&frame);
+ return 0;
+}
+
+#define FLAGS AV_OPT_FLAG_AUDIO_PARAM
+static const AVOption atrim_options[] = {
+ COMMON_OPTS
+ { "start_sample", "Number of the first audio sample that should be "
+ "passed to the output", OFFSET(start_sample), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, FLAGS },
+ { "end_sample", "Number of the first audio sample that should be "
+ "dropped again", OFFSET(end_sample), AV_OPT_TYPE_INT64, { .i64 = INT64_MAX }, 0, INT64_MAX, FLAGS },
+ { NULL },
+};
+#undef FLAGS
+
+static const AVClass atrim_class = {
+ .class_name = "atrim",
+ .item_name = av_default_item_name,
+ .option = atrim_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+static const AVFilterPad atrim_inputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .filter_frame = atrim_filter_frame,
+ .config_props = config_input,
+ },
+ { NULL }
+};
+
+static const AVFilterPad atrim_outputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .request_frame = request_frame,
+ },
+ { NULL }
+};
+
+AVFilter ff_af_atrim = {
+ .name = "atrim",
+ .description = NULL_IF_CONFIG_SMALL("Pick one continuous section from the input, drop the rest."),
+
+ .init = init,
+
+ .priv_size = sizeof(TrimContext),
+ .priv_class = &atrim_class,
+
+ .inputs = atrim_inputs,
+ .outputs = atrim_outputs,
+};
+#endif // CONFIG_ATRIM_FILTER

libav-v9.6.tar.bz2/libavfilter/version.h -> libav-v10.1.tar.bz2/libavfilter/version.h Changed

@@ -23,13 +23,14 @@
 
 /**
 * @file
+ * @ingroup lavfi
 * Libavfilter version macros
 */
 
-#include "libavutil/avutil.h"
+#include "libavutil/version.h"
 
-#define LIBAVFILTER_VERSION_MAJOR 3
-#define LIBAVFILTER_VERSION_MINOR 3
+#define LIBAVFILTER_VERSION_MAJOR 4
+#define LIBAVFILTER_VERSION_MINOR 2
 #define LIBAVFILTER_VERSION_MICRO 0
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
@@ -47,10 +48,28 @@
 */
 
 #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_AVFILTERBUFFER
+#define FF_API_AVFILTERBUFFER (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_OLD_FILTER_OPTS
+#define FF_API_OLD_FILTER_OPTS (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_AVFILTER_OPEN
+#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 < 5)
+#endif
+#ifndef FF_API_OLD_FILTER_REGISTER
+#define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 5)
+#endif
+#ifndef FF_API_NOCONST_GET_NAME
+#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 5)
 #endif
 
 #endif /* AVFILTER_VERSION_H */

libav-v9.6.tar.bz2/libavfilter/vf_aspect.c -> libav-v10.1.tar.bz2/libavfilter/vf_aspect.c Changed

@@ -23,75 +23,164 @@
 * aspect ratio modification video filters
 */
 
+#include <float.h>
+
 #include "libavutil/common.h"
+#include "libavutil/eval.h"
 #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[] = {
+ "PI",
+ "PHI",
+ "E",
+ "w",
+ "h",
+ "a", "dar",
+ "sar",
+ "hsub",
+ "vsub",
+ NULL
+};
+
+enum var_name {
+ VAR_PI,
+ VAR_PHI,
+ VAR_E,
+ VAR_W,
+ VAR_H,
+ VAR_A, VAR_DAR,
+ VAR_SAR,
+ VAR_HSUB,
+ VAR_VSUB,
+ VARS_NB
+};
+
 typedef struct {
- AVRational aspect;
+ const AVClass *class;
+ AVRational dar;
+ AVRational sar;
+#if FF_API_OLD_FILTER_OPTS
+ float aspect_num, aspect_den;
+#endif
+ char *ratio_expr;
 } AspectContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+#if FF_API_OLD_FILTER_OPTS
+static av_cold int init(AVFilterContext *ctx)
 {
- AspectContext *aspect = ctx->priv;
- double ratio;
- int64_t gcd;
- char c = 0;
-
- if (args) {
- if (sscanf(args, "%d:%d%c", &aspect->aspect.num, &aspect->aspect.den, &c) != 2)
- if (sscanf(args, "%lf%c", &ratio, &c) == 1)
- aspect->aspect = av_d2q(ratio, 100);
-
- if (c || aspect->aspect.num <= 0 || aspect->aspect.den <= 0) {
- av_log(ctx, AV_LOG_ERROR,
- "Invalid string '%s' for aspect ratio.\n", args);
- return AVERROR(EINVAL);
- }
-
- gcd = av_gcd(FFABS(aspect->aspect.num), FFABS(aspect->aspect.den));
- if (gcd) {
- aspect->aspect.num /= gcd;
- aspect->aspect.den /= gcd;
- }
- }
+ AspectContext *s = ctx->priv;
 
- if (aspect->aspect.den == 0)
- aspect->aspect = (AVRational) {0, 1};
+ if (s->aspect_num > 0 && s->aspect_den > 0) {
+ av_log(ctx, AV_LOG_WARNING, "This syntax is deprecated, use "
+ "dar=<number> or dar=num/den.\n");
+ s->sar = s->dar = av_d2q(s->aspect_num / s->aspect_den, INT_MAX);
+ }
 
- av_log(ctx, AV_LOG_VERBOSE, "a:%d/%d\n", aspect->aspect.num, aspect->aspect.den);
 return 0;
 }
+#endif
 
-static int filter_frame(AVFilterLink *link, AVFilterBufferRef *frame)
+static int filter_frame(AVFilterLink *link, AVFrame *frame)
 {
- AspectContext *aspect = link->dst->priv;
+ AspectContext *s = link->dst->priv;
 
- frame->video->pixel_aspect = aspect->aspect;
+ frame->sample_aspect_ratio = s->sar;
 return ff_filter_frame(link->dst->outputs[0], frame);
 }
 
+#define OFFSET(x) offsetof(AspectContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+
+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_PI] = M_PI;
+ var_values[VAR_PHI] = M_PHI;
+ var_values[VAR_E] = M_E;
+ 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*/
+ if ((ret = av_expr_parse_and_eval(&res, s->ratio_expr,
+ var_names, var_values,
+ NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) {
+ av_log(NULL, AV_LOG_ERROR,
+ "Error when evaluating the expression '%s'\n", s->ratio_expr);
+ return ret;
+ }
+ *aspect_ratio = av_d2q(res, INT_MAX);
+ return 0;
+}
+
 #if CONFIG_SETDAR_FILTER
 /* for setdar filter, convert from frame aspect ratio to pixel aspect ratio */
 static int setdar_config_props(AVFilterLink *inlink)
 {
- AspectContext *aspect = inlink->dst->priv;
- AVRational dar = aspect->aspect;
-
- av_reduce(&aspect->aspect.num, &aspect->aspect.den,
- aspect->aspect.num * inlink->h,
- aspect->aspect.den * inlink->w, 100);
+ AspectContext *s = inlink->dst->priv;
+ AVRational dar;
+ int ret;
+
+#if FF_API_OLD_FILTER_OPTS
+ if (!(s->aspect_num > 0 && 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,
+ s->dar.num * inlink->h,
+ s->dar.den * inlink->w, 100);
+ inlink->sample_aspect_ratio = s->sar;
+ dar = s->dar;
+ } else {
+ inlink->sample_aspect_ratio = (AVRational){ 1, 1 };
+ dar = (AVRational){ inlink->w, inlink->h };
+ }
 
 av_log(inlink->dst, AV_LOG_VERBOSE, "w:%d h:%d -> dar:%d/%d sar:%d/%d\n",
- inlink->w, inlink->h, dar.num, dar.den, aspect->aspect.num, aspect->aspect.den);
-
- inlink->sample_aspect_ratio = aspect->aspect;
+ inlink->w, inlink->h, dar.num, dar.den,
+ inlink->sample_aspect_ratio.num, inlink->sample_aspect_ratio.den);
 
 return 0;
 }
 
+static const AVOption setdar_options[] = {
+#if FF_API_OLD_FILTER_OPTS
+ { "dar_num", NULL, OFFSET(aspect_num), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, 0, FLT_MAX, FLAGS },
+ { "dar_den", NULL, OFFSET(aspect_den), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, 0, FLT_MAX, FLAGS },
+#endif
+ { "dar", "display aspect ratio", OFFSET(ratio_expr), AV_OPT_TYPE_STRING, { .str = "1" }, .flags = FLAGS },
+ { NULL },
+};
+
+static const AVClass setdar_class = {
+ .class_name = "setdar",
+ .item_name = av_default_item_name,
+ .option = setdar_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_setdar_inputs[] = {
 {
 .name = "default",
@@ -111,13 +200,16 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_setdar = {
+AVFilter ff_vf_setdar = {
 .name = "setdar",
 .description = NULL_IF_CONFIG_SMALL("Set the frame display aspect ratio."),
 
+#if FF_API_OLD_FILTER_OPTS
 .init = init,
+#endif
 
 .priv_size = sizeof(AspectContext),
+ .priv_class = &setdar_class,
 
 .inputs = avfilter_vf_setdar_inputs,
 
@@ -129,13 +221,39 @@
 /* for setdar filter, convert from frame aspect ratio to pixel aspect ratio */
 static int setsar_config_props(AVFilterLink *inlink)
 {
- AspectContext *aspect = inlink->dst->priv;
+ AspectContext *s = inlink->dst->priv;
+ int ret;
+
+#if FF_API_OLD_FILTER_OPTS
+ if (!(s->aspect_num > 0 && 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 = aspect->aspect;
+ inlink->sample_aspect_ratio = s->sar;
 
 return 0;
 }
 
+static const AVOption setsar_options[] = {
+#if FF_API_OLD_FILTER_OPTS
+ { "sar_num", NULL, OFFSET(aspect_num), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, 0, FLT_MAX, FLAGS },
+ { "sar_den", NULL, OFFSET(aspect_den), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, 0, FLT_MAX, FLAGS },
+#endif
+ { "sar", "sample (pixel) aspect ratio", OFFSET(ratio_expr), AV_OPT_TYPE_STRING, { .str = "1" }, .flags = FLAGS },
+ { NULL },
+};
+
+static const AVClass setsar_class = {
+ .class_name = "setsar",
+ .item_name = av_default_item_name,
+ .option = setsar_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_setsar_inputs[] = {
 {
 .name = "default",
@@ -155,13 +273,16 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_setsar = {
+AVFilter ff_vf_setsar = {
 .name = "setsar",
 .description = NULL_IF_CONFIG_SMALL("Set the pixel sample aspect ratio."),
 
+#if FF_API_OLD_FILTER_OPTS
 .init = init,
+#endif
 
 .priv_size = sizeof(AspectContext),
+ .priv_class = &setsar_class,
 
 .inputs = avfilter_vf_setsar_inputs,

libav-v9.6.tar.bz2/libavfilter/vf_blackframe.c -> libav-v10.1.tar.bz2/libavfilter/vf_blackframe.c Changed

@@ -31,14 +31,17 @@
 #include <inttypes.h>
 
 #include "libavutil/internal.h"
+#include "libavutil/opt.h"
+
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
 #include "video.h"
 
 typedef struct {
- unsigned int bamount; ///< black amount
- unsigned int bthresh; ///< black threshold
+ const AVClass *class;
+ int bamount; ///< black amount
+ int bthresh; ///< black threshold
 unsigned int frame; ///< frame number
 unsigned int nblack; ///< number of black pixels counted so far
 } BlackFrameContext;
@@ -55,54 +58,48 @@
 return 0;
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
-{
- BlackFrameContext *blackframe = ctx->priv;
-
- blackframe->bamount = 98;
- blackframe->bthresh = 32;
- blackframe->nblack = 0;
- blackframe->frame = 0;
-
- if (args)
- sscanf(args, "%u:%u", &blackframe->bamount, &blackframe->bthresh);
-
- av_log(ctx, AV_LOG_VERBOSE, "bamount:%u bthresh:%u\n",
- blackframe->bamount, blackframe->bthresh);
-
- if (blackframe->bamount > 100 || blackframe->bthresh > 255) {
- av_log(ctx, AV_LOG_ERROR, "Too big value for bamount (max is 100) or bthresh (max is 255)\n");
- return AVERROR(EINVAL);
- }
-
- return 0;
-}
-
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
+static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 {
 AVFilterContext *ctx = inlink->dst;
- BlackFrameContext *blackframe = ctx->priv;
+ BlackFrameContext *s = ctx->priv;
 int x, i;
 int pblack = 0;
 uint8_t *p = frame->data[0];
 
- for (i = 0; i < frame->video->h; i++) {
+ for (i = 0; i < frame->height; i++) {
 for (x = 0; x < inlink->w; x++)
- blackframe->nblack += p[x] < blackframe->bthresh;
+ s->nblack += p[x] < s->bthresh;
 p += frame->linesize[0];
 }
 
- pblack = blackframe->nblack * 100 / (inlink->w * inlink->h);
- if (pblack >= blackframe->bamount)
- av_log(ctx, AV_LOG_INFO, "frame:%u pblack:%u pos:%"PRId64" pts:%"PRId64" t:%f\n",
- blackframe->frame, pblack, frame->pos, frame->pts,
+ pblack = s->nblack * 100 / (inlink->w * inlink->h);
+ if (pblack >= s->bamount)
+ av_log(ctx, AV_LOG_INFO, "frame:%u pblack:%u pts:%"PRId64" t:%f\n",
+ s->frame, pblack, frame->pts,
 frame->pts == AV_NOPTS_VALUE ? -1 : frame->pts * av_q2d(inlink->time_base));
 
- blackframe->frame++;
- blackframe->nblack = 0;
+ s->frame++;
+ s->nblack = 0;
 return ff_filter_frame(inlink->dst->outputs[0], frame);
 }
 
+#define OFFSET(x) offsetof(BlackFrameContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "amount", "Percentage of the pixels that have to be below the threshold "
+ "for the frame to be considered black.", OFFSET(bamount), AV_OPT_TYPE_INT, { .i64 = 98 }, 0, 100, FLAGS },
+ { "threshold", "threshold below which a pixel value is considered black",
+ OFFSET(bthresh), AV_OPT_TYPE_INT, { .i64 = 32 }, 0, INT_MAX, FLAGS },
+ { NULL },
+};
+
+static const AVClass blackframe_class = {
+ .class_name = "blackframe",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_blackframe_inputs[] = {
 {
 .name = "default",
@@ -121,12 +118,12 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_blackframe = {
+AVFilter ff_vf_blackframe = {
 .name = "blackframe",
 .description = NULL_IF_CONFIG_SMALL("Detect frames that are (almost) black."),
 
 .priv_size = sizeof(BlackFrameContext),
- .init = init,
+ .priv_class = &blackframe_class,
 
 .query_formats = query_formats,

libav-v9.6.tar.bz2/libavfilter/vf_boxblur.c -> libav-v10.1.tar.bz2/libavfilter/vf_boxblur.c Changed

@@ -28,6 +28,7 @@
 #include "libavutil/avstring.h"
 #include "libavutil/common.h"
 #include "libavutil/eval.h"
+#include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "formats.h"
@@ -60,12 +61,13 @@
 } FilterParam;
 
 typedef struct {
+ const AVClass *class;
 FilterParam luma_param;
 FilterParam chroma_param;
 FilterParam alpha_param;
- char luma_radius_expr [256];
- char chroma_radius_expr[256];
- char alpha_radius_expr [256];
+ char *luma_radius_expr;
+ char *chroma_radius_expr;
+ char *alpha_radius_expr;
 
 int hsub, vsub;
 int radius[4];
@@ -78,37 +80,26 @@
 #define V 2
 #define A 3
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
- BoxBlurContext *boxblur = ctx->priv;
- int e;
+ BoxBlurContext *s = ctx->priv;
 
- if (!args) {
- av_log(ctx, AV_LOG_ERROR,
- "Filter expects 2 or 4 or 6 arguments, none provided\n");
+ if (!s->luma_radius_expr) {
+ av_log(ctx, AV_LOG_ERROR, "Luma radius expression is not set.\n");
 return AVERROR(EINVAL);
 }
 
- e = sscanf(args, "%255[^:]:%d:%255[^:]:%d:%255[^:]:%d",
- boxblur->luma_radius_expr, &boxblur->luma_param .power,
- boxblur->chroma_radius_expr, &boxblur->chroma_param.power,
- boxblur->alpha_radius_expr, &boxblur->alpha_param .power);
-
- if (e != 2 && e != 4 && e != 6) {
- av_log(ctx, AV_LOG_ERROR,
- "Filter expects 2 or 4 or 6 params, provided %d\n", e);
- return AVERROR(EINVAL);
- }
-
- if (e < 4) {
- boxblur->chroma_param.power = boxblur->luma_param.power;
- av_strlcpy(boxblur->chroma_radius_expr, boxblur->luma_radius_expr,
- sizeof(boxblur->chroma_radius_expr));
+ if (!s->chroma_radius_expr) {
+ s->chroma_radius_expr = av_strdup(s->luma_radius_expr);
+ if (!s->chroma_radius_expr)
+ return AVERROR(ENOMEM);
+ s->chroma_param.power = s->luma_param.power;
 }
- if (e < 6) {
- boxblur->alpha_param.power = boxblur->luma_param.power;
- av_strlcpy(boxblur->alpha_radius_expr, boxblur->luma_radius_expr,
- sizeof(boxblur->alpha_radius_expr));
+ if (!s->alpha_radius_expr) {
+ s->alpha_radius_expr = av_strdup(s->luma_radius_expr);
+ if (!s->alpha_radius_expr)
+ return AVERROR(ENOMEM);
+ s->alpha_param.power = s->luma_param.power;
 }
 
 return 0;
@@ -116,10 +107,10 @@
 
 static av_cold void uninit(AVFilterContext *ctx)
 {
- BoxBlurContext *boxblur = ctx->priv;
+ BoxBlurContext *s = ctx->priv;
 
- av_freep(&boxblur->temp[0]);
- av_freep(&boxblur->temp[1]);
+ av_freep(&s->temp[0]);
+ av_freep(&s->temp[1]);
 }
 
 static int query_formats(AVFilterContext *ctx)
@@ -141,37 +132,37 @@
 {
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
 AVFilterContext *ctx = inlink->dst;
- BoxBlurContext *boxblur = ctx->priv;
+ BoxBlurContext *s = ctx->priv;
 int w = inlink->w, h = inlink->h;
 int cw, ch;
 double var_values[VARS_NB], res;
 char *expr;
 int ret;
 
- av_freep(&boxblur->temp[0]);
- av_freep(&boxblur->temp[1]);
- if (!(boxblur->temp[0] = av_malloc(FFMAX(w, h))))
+ av_freep(&s->temp[0]);
+ av_freep(&s->temp[1]);
+ if (!(s->temp[0] = av_malloc(FFMAX(w, h))))
 return AVERROR(ENOMEM);
- if (!(boxblur->temp[1] = av_malloc(FFMAX(w, h)))) {
- av_freep(&boxblur->temp[0]);
+ if (!(s->temp[1] = av_malloc(FFMAX(w, h)))) {
+ av_freep(&s->temp[0]);
 return AVERROR(ENOMEM);
 }
 
- boxblur->hsub = desc->log2_chroma_w;
- boxblur->vsub = desc->log2_chroma_h;
+ s->hsub = desc->log2_chroma_w;
+ s->vsub = desc->log2_chroma_h;
 
 var_values[VAR_W] = inlink->w;
 var_values[VAR_H] = inlink->h;
- var_values[VAR_CW] = cw = w>>boxblur->hsub;
- var_values[VAR_CH] = ch = h>>boxblur->vsub;
- var_values[VAR_HSUB] = 1<<boxblur->hsub;
- var_values[VAR_VSUB] = 1<<boxblur->vsub;
+ var_values[VAR_CW] = cw = w>>s->hsub;
+ var_values[VAR_CH] = ch = h>>s->vsub;
+ var_values[VAR_HSUB] = 1<<s->hsub;
+ var_values[VAR_VSUB] = 1<<s->vsub;
 
 #define EVAL_RADIUS_EXPR(comp) \
- expr = boxblur->comp##_radius_expr; \
+ expr = s->comp##_radius_expr; \
 ret = av_expr_parse_and_eval(&res, expr, var_names, var_values, \
 NULL, NULL, NULL, NULL, NULL, 0, ctx); \
- boxblur->comp##_param.radius = res; \
+ s->comp##_param.radius = res; \
 if (ret < 0) { \
 av_log(NULL, AV_LOG_ERROR, \
 "Error when evaluating " #comp " radius expression '%s'\n", expr); \
@@ -186,30 +177,30 @@
 "chroma_radius:%d chroma_power:%d "
 "alpha_radius:%d alpha_power:%d "
 "w:%d chroma_w:%d h:%d chroma_h:%d\n",
- boxblur->luma_param .radius, boxblur->luma_param .power,
- boxblur->chroma_param.radius, boxblur->chroma_param.power,
- boxblur->alpha_param .radius, boxblur->alpha_param .power,
+ s->luma_param .radius, s->luma_param .power,
+ s->chroma_param.radius, s->chroma_param.power,
+ s->alpha_param .radius, s->alpha_param .power,
 w, cw, h, ch);
 
 #define CHECK_RADIUS_VAL(w_, h_, comp) \
- if (boxblur->comp##_param.radius < 0 || \
- 2*boxblur->comp##_param.radius > FFMIN(w_, h_)) { \
+ if (s->comp##_param.radius < 0 || \
+ 2*s->comp##_param.radius > FFMIN(w_, h_)) { \
 av_log(ctx, AV_LOG_ERROR, \
 "Invalid " #comp " radius value %d, must be >= 0 and <= %d\n", \
- boxblur->comp##_param.radius, FFMIN(w_, h_)/2); \
+ s->comp##_param.radius, FFMIN(w_, h_)/2); \
 return AVERROR(EINVAL); \
 }
 CHECK_RADIUS_VAL(w, h, luma);
 CHECK_RADIUS_VAL(cw, ch, chroma);
 CHECK_RADIUS_VAL(w, h, alpha);
 
- boxblur->radius[Y] = boxblur->luma_param.radius;
- boxblur->radius[U] = boxblur->radius[V] = boxblur->chroma_param.radius;
- boxblur->radius[A] = boxblur->alpha_param.radius;
+ s->radius[Y] = s->luma_param.radius;
+ s->radius[U] = s->radius[V] = s->chroma_param.radius;
+ s->radius[A] = s->alpha_param.radius;
 
- boxblur->power[Y] = boxblur->luma_param.power;
- boxblur->power[U] = boxblur->power[V] = boxblur->chroma_param.power;
- boxblur->power[A] = boxblur->alpha_param.power;
+ s->power[Y] = s->luma_param.power;
+ s->power[U] = s->power[V] = s->chroma_param.power;
+ s->power[A] = s->alpha_param.power;
 
 return 0;
 }
@@ -307,48 +298,69 @@
 h, radius, power, temp);
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
+static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 {
 AVFilterContext *ctx = inlink->dst;
- BoxBlurContext *boxblur = ctx->priv;
+ BoxBlurContext *s = ctx->priv;
 AVFilterLink *outlink = inlink->dst->outputs[0];
- AVFilterBufferRef *out;
+ AVFrame *out;
 int plane;
- int cw = inlink->w >> boxblur->hsub, ch = in->video->h >> boxblur->vsub;
+ int cw = inlink->w >> s->hsub, ch = in->height >> s->vsub;
 int w[4] = { inlink->w, cw, cw, inlink->w };
- int h[4] = { in->video->h, ch, ch, in->video->h };
+ int h[4] = { in->height, ch, ch, in->height };
 
- out = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
+ out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
 if (!out) {
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return AVERROR(ENOMEM);
 }
- avfilter_copy_buffer_ref_props(out, in);
+ av_frame_copy_props(out, in);
 
 for (plane = 0; in->data[plane] && plane < 4; plane++)
 hblur(out->data[plane], out->linesize[plane],
 in ->data[plane], in ->linesize[plane],
- w[plane], h[plane], boxblur->radius[plane], boxblur->power[plane],
- boxblur->temp);
+ w[plane], h[plane], s->radius[plane], s->power[plane],
+ s->temp);
 
 for (plane = 0; in->data[plane] && plane < 4; plane++)
 vblur(out->data[plane], out->linesize[plane],
 out->data[plane], out->linesize[plane],
- w[plane], h[plane], boxblur->radius[plane], boxblur->power[plane],
- boxblur->temp);
+ w[plane], h[plane], s->radius[plane], s->power[plane],
+ s->temp);
 
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 
 return ff_filter_frame(outlink, out);
 }
 
+#define OFFSET(x) offsetof(BoxBlurContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "luma_radius", "Radius of the luma blurring box", OFFSET(luma_radius_expr), AV_OPT_TYPE_STRING, .flags = FLAGS },
+ { "luma_power", "How many times should the boxblur be applied to luma",
+ OFFSET(luma_param.power), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, INT_MAX, FLAGS },
+ { "chroma_radius", "Radius of the chroma blurring box", OFFSET(chroma_radius_expr), AV_OPT_TYPE_STRING, .flags = FLAGS },
+ { "chroma_power", "How many times should the boxblur be applied to chroma",
+ OFFSET(chroma_param.power), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, INT_MAX, FLAGS },
+ { "alpha_radius", "Radius of the alpha blurring box", OFFSET(alpha_radius_expr), AV_OPT_TYPE_STRING, .flags = FLAGS },
+ { "alpha_power", "How many times should the boxblur be applied to alpha",
+ OFFSET(alpha_param.power), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, INT_MAX, FLAGS },
+ { NULL },
+};
+
+static const AVClass boxblur_class = {
+ .class_name = "boxblur",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_boxblur_inputs[] = {
 {
 .name = "default",
 .type = AVMEDIA_TYPE_VIDEO,
 .config_props = config_input,
 .filter_frame = filter_frame,
- .min_perms = AV_PERM_READ
 },
 { NULL }
 };
@@ -361,10 +373,11 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_boxblur = {
+AVFilter ff_vf_boxblur = {
 .name = "boxblur",
 .description = NULL_IF_CONFIG_SMALL("Blur the input."),
 .priv_size = sizeof(BoxBlurContext),
+ .priv_class = &boxblur_class,
 .init = init,
 .uninit = uninit,
 .query_formats = query_formats,

libav-v9.6.tar.bz2/libavfilter/vf_copy.c -> libav-v10.1.tar.bz2/libavfilter/vf_copy.c Changed

@@ -21,17 +21,35 @@
  * copy video filter
  */
 
+#include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
 #include "avfilter.h"
 #include "internal.h"
 #include "video.h"
 
+static int filter_frame(AVFilterLink *inlink, AVFrame *in)
+{
+    AVFilterLink *outlink = inlink->dst->outputs[0];
+    AVFrame *out = ff_get_video_buffer(outlink, in->width, in->height);
+
+    if (!out) {
+        av_frame_free(&in);
+        return AVERROR(ENOMEM);
+    }
+    av_frame_copy_props(out, in);
+    av_image_copy(out->data, out->linesize, in->data, in->linesize,
+                  in->format, in->width, in->height);
+
+    av_frame_free(&in);
+    return ff_filter_frame(outlink, out);
+}
+
 static const AVFilterPad avfilter_vf_copy_inputs[] = {
     {
         .name             = "default",
         .type             = AVMEDIA_TYPE_VIDEO,
         .get_video_buffer = ff_null_get_video_buffer,
-        .rej_perms        = ~0
+        .filter_frame     = filter_frame,
     },
     { NULL }
 };
@@ -44,7 +62,7 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_copy = {
+AVFilter ff_vf_copy = {
     .name      = "copy",
     .description = NULL_IF_CONFIG_SMALL("Copy the input video unchanged to the output."),

libav-v9.6.tar.bz2/libavfilter/vf_crop.c -> libav-v10.1.tar.bz2/libavfilter/vf_crop.c Changed

@@ -23,8 +23,6 @@
 * video crop filter
 */
 
-/* #define DEBUG */
-
 #include <stdio.h>
 
 #include "avfilter.h"
@@ -37,6 +35,7 @@
 #include "libavutil/libm.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
 
 static const char *const var_names[] = {
 "E",
@@ -65,12 +64,12 @@
 VAR_X,
 VAR_Y,
 VAR_N,
- VAR_POS,
 VAR_T,
 VAR_VARS_NB
 };
 
 typedef struct {
+ const AVClass *class;
 int x; ///< x offset of the non-cropped area with respect to the input area
 int y; ///< y offset of the non-cropped area with respect to the input area
 int w; ///< width of the cropped area
@@ -78,7 +77,7 @@
 
 int max_step[4]; ///< max pixel step for each plane, expressed as a number of bytes
 int hsub, vsub; ///< chroma subsampling
- char x_expr[256], y_expr[256], ow_expr[256], oh_expr[256];
+ char *x_expr, *y_expr, *ow_expr, *oh_expr;
 AVExpr *x_pexpr, *y_pexpr; /* parsed expressions for x and y */
 double var_values[VAR_VARS_NB];
 } CropContext;
@@ -116,27 +115,14 @@
 return 0;
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
-{
- CropContext *crop = ctx->priv;
-
- av_strlcpy(crop->ow_expr, "iw", sizeof(crop->ow_expr));
- av_strlcpy(crop->oh_expr, "ih", sizeof(crop->oh_expr));
- av_strlcpy(crop->x_expr, "(in_w-out_w)/2", sizeof(crop->x_expr));
- av_strlcpy(crop->y_expr, "(in_h-out_h)/2", sizeof(crop->y_expr));
-
- if (args)
- sscanf(args, "%255[^:]:%255[^:]:%255[^:]:%255[^:]", crop->ow_expr, crop->oh_expr, crop->x_expr, crop->y_expr);
-
- return 0;
-}
-
 static av_cold void uninit(AVFilterContext *ctx)
 {
- CropContext *crop = ctx->priv;
+ CropContext *s = ctx->priv;
 
- av_expr_free(crop->x_pexpr); crop->x_pexpr = NULL;
- av_expr_free(crop->y_pexpr); crop->y_pexpr = NULL;
+ av_expr_free(s->x_pexpr);
+ s->x_pexpr = NULL;
+ av_expr_free(s->y_pexpr);
+ s->y_pexpr = NULL;
 }
 
 static inline int normalize_double(int *n, double d)
@@ -157,75 +143,81 @@
 static int config_input(AVFilterLink *link)
 {
 AVFilterContext *ctx = link->dst;
- CropContext *crop = ctx->priv;
+ CropContext *s = ctx->priv;
 const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(link->format);
 int ret;
 const char *expr;
 double res;
 
- crop->var_values[VAR_E] = M_E;
- crop->var_values[VAR_PHI] = M_PHI;
- crop->var_values[VAR_PI] = M_PI;
- crop->var_values[VAR_IN_W] = crop->var_values[VAR_IW] = ctx->inputs[0]->w;
- crop->var_values[VAR_IN_H] = crop->var_values[VAR_IH] = ctx->inputs[0]->h;
- crop->var_values[VAR_X] = NAN;
- crop->var_values[VAR_Y] = NAN;
- crop->var_values[VAR_OUT_W] = crop->var_values[VAR_OW] = NAN;
- crop->var_values[VAR_OUT_H] = crop->var_values[VAR_OH] = NAN;
- crop->var_values[VAR_N] = 0;
- crop->var_values[VAR_T] = NAN;
- crop->var_values[VAR_POS] = NAN;
-
- av_image_fill_max_pixsteps(crop->max_step, NULL, pix_desc);
- crop->hsub = pix_desc->log2_chroma_w;
- crop->vsub = pix_desc->log2_chroma_h;
-
- if ((ret = av_expr_parse_and_eval(&res, (expr = crop->ow_expr),
- var_names, crop->var_values,
- NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) goto fail_expr;
- crop->var_values[VAR_OUT_W] = crop->var_values[VAR_OW] = res;
- if ((ret = av_expr_parse_and_eval(&res, (expr = crop->oh_expr),
- var_names, crop->var_values,
- NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) goto fail_expr;
- crop->var_values[VAR_OUT_H] = crop->var_values[VAR_OH] = res;
+ s->var_values[VAR_E] = M_E;
+ s->var_values[VAR_PHI] = M_PHI;
+ s->var_values[VAR_PI] = M_PI;
+ s->var_values[VAR_IN_W] = s->var_values[VAR_IW] = ctx->inputs[0]->w;
+ s->var_values[VAR_IN_H] = s->var_values[VAR_IH] = ctx->inputs[0]->h;
+ s->var_values[VAR_X] = NAN;
+ s->var_values[VAR_Y] = NAN;
+ s->var_values[VAR_OUT_W] = s->var_values[VAR_OW] = NAN;
+ s->var_values[VAR_OUT_H] = s->var_values[VAR_OH] = NAN;
+ s->var_values[VAR_N] = 0;
+ s->var_values[VAR_T] = NAN;
+
+ av_image_fill_max_pixsteps(s->max_step, NULL, pix_desc);
+ s->hsub = pix_desc->log2_chroma_w;
+ s->vsub = pix_desc->log2_chroma_h;
+
+ if ((ret = av_expr_parse_and_eval(&res, (expr = s->ow_expr),
+ var_names, s->var_values,
+ NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
+ goto fail_expr;
+ s->var_values[VAR_OUT_W] = s->var_values[VAR_OW] = res;
+ if ((ret = av_expr_parse_and_eval(&res, (expr = s->oh_expr),
+ var_names, s->var_values,
+ NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
+ goto fail_expr;
+ s->var_values[VAR_OUT_H] = s->var_values[VAR_OH] = res;
 /* evaluate again ow as it may depend on oh */
- if ((ret = av_expr_parse_and_eval(&res, (expr = crop->ow_expr),
- var_names, crop->var_values,
- NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) goto fail_expr;
- crop->var_values[VAR_OUT_W] = crop->var_values[VAR_OW] = res;
- if (normalize_double(&crop->w, crop->var_values[VAR_OUT_W]) < 0 ||
- normalize_double(&crop->h, crop->var_values[VAR_OUT_H]) < 0) {
+ if ((ret = av_expr_parse_and_eval(&res, (expr = s->ow_expr),
+ var_names, s->var_values,
+ NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
+ goto fail_expr;
+
+ s->var_values[VAR_OUT_W] = s->var_values[VAR_OW] = res;
+ if (normalize_double(&s->w, s->var_values[VAR_OUT_W]) < 0 ||
+ normalize_double(&s->h, s->var_values[VAR_OUT_H]) < 0) {
 av_log(ctx, AV_LOG_ERROR,
 "Too big value or invalid expression for out_w/ow or out_h/oh. "
 "Maybe the expression for out_w:'%s' or for out_h:'%s' is self-referencing.\n",
- crop->ow_expr, crop->oh_expr);
+ s->ow_expr, s->oh_expr);
 return AVERROR(EINVAL);
 }
- crop->w &= ~((1 << crop->hsub) - 1);
- crop->h &= ~((1 << crop->vsub) - 1);
+ s->w &= ~((1 << s->hsub) - 1);
+ s->h &= ~((1 << s->vsub) - 1);
 
- if ((ret = av_expr_parse(&crop->x_pexpr, crop->x_expr, var_names,
+ av_expr_free(s->x_pexpr);
+ av_expr_free(s->y_pexpr);
+ s->x_pexpr = s->y_pexpr = NULL;
+ if ((ret = av_expr_parse(&s->x_pexpr, s->x_expr, var_names,
 NULL, NULL, NULL, NULL, 0, ctx)) < 0 ||
- (ret = av_expr_parse(&crop->y_pexpr, crop->y_expr, var_names,
+ (ret = av_expr_parse(&s->y_pexpr, s->y_expr, var_names,
 NULL, NULL, NULL, NULL, 0, ctx)) < 0)
 return AVERROR(EINVAL);
 
 av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d -> w:%d h:%d\n",
- link->w, link->h, crop->w, crop->h);
+ link->w, link->h, s->w, s->h);
 
- if (crop->w <= 0 || crop->h <= 0 ||
- crop->w > link->w || crop->h > link->h) {
+ if (s->w <= 0 || s->h <= 0 ||
+ s->w > link->w || s->h > link->h) {
 av_log(ctx, AV_LOG_ERROR,
 "Invalid too big or non positive size for width '%d' or height '%d'\n",
- crop->w, crop->h);
+ s->w, s->h);
 return AVERROR(EINVAL);
 }
 
 /* set default, required in the case the first computed value for x/y is NAN */
- crop->x = (link->w - crop->w) / 2;
- crop->y = (link->h - crop->h) / 2;
- crop->x &= ~((1 << crop->hsub) - 1);
- crop->y &= ~((1 << crop->vsub) - 1);
+ s->x = (link->w - s->w) / 2;
+ s->y = (link->h - s->h) / 2;
+ s->x &= ~((1 << s->hsub) - 1);
+ s->y &= ~((1 << s->vsub) - 1);
 return 0;
 
 fail_expr:
@@ -235,68 +227,90 @@
 
 static int config_output(AVFilterLink *link)
 {
- CropContext *crop = link->src->priv;
+ CropContext *s = link->src->priv;
 
- link->w = crop->w;
- link->h = crop->h;
+ link->w = s->w;
+ link->h = s->h;
 
 return 0;
 }
 
-static int filter_frame(AVFilterLink *link, AVFilterBufferRef *frame)
+static int filter_frame(AVFilterLink *link, AVFrame *frame)
 {
 AVFilterContext *ctx = link->dst;
- CropContext *crop = ctx->priv;
+ CropContext *s = ctx->priv;
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format);
 int i;
 
- frame->video->w = crop->w;
- frame->video->h = crop->h;
+ frame->width = s->w;
+ frame->height = s->h;
 
- crop->var_values[VAR_T] = frame->pts == AV_NOPTS_VALUE ?
+ s->var_values[VAR_T] = frame->pts == AV_NOPTS_VALUE ?
 NAN : frame->pts * av_q2d(link->time_base);
- crop->var_values[VAR_POS] = frame->pos == -1 ? NAN : frame->pos;
- crop->var_values[VAR_X] = av_expr_eval(crop->x_pexpr, crop->var_values, NULL);
- crop->var_values[VAR_Y] = av_expr_eval(crop->y_pexpr, crop->var_values, NULL);
- crop->var_values[VAR_X] = av_expr_eval(crop->x_pexpr, crop->var_values, NULL);
-
- normalize_double(&crop->x, crop->var_values[VAR_X]);
- normalize_double(&crop->y, crop->var_values[VAR_Y]);
-
- if (crop->x < 0) crop->x = 0;
- if (crop->y < 0) crop->y = 0;
- if ((unsigned)crop->x + (unsigned)crop->w > link->w) crop->x = link->w - crop->w;
- if ((unsigned)crop->y + (unsigned)crop->h > link->h) crop->y = link->h - crop->h;
- crop->x &= ~((1 << crop->hsub) - 1);
- crop->y &= ~((1 << crop->vsub) - 1);
+ s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, NULL);
+ s->var_values[VAR_Y] = av_expr_eval(s->y_pexpr, s->var_values, NULL);
+ s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, NULL);
+
+ normalize_double(&s->x, s->var_values[VAR_X]);
+ normalize_double(&s->y, s->var_values[VAR_Y]);
+
+ if (s->x < 0)
+ s->x = 0;
+ if (s->y < 0)
+ s->y = 0;
+ if ((unsigned)s->x + (unsigned)s->w > link->w)
+ s->x = link->w - s->w;
+ if ((unsigned)s->y + (unsigned)s->h > link->h)
+ s->y = link->h - s->h;
+ s->x &= ~((1 << s->hsub) - 1);
+ s->y &= ~((1 << s->vsub) - 1);
 
 av_dlog(ctx, "n:%d t:%f x:%d y:%d x+w:%d y+h:%d\n",
- (int)crop->var_values[VAR_N], crop->var_values[VAR_T], crop->x,
- crop->y, crop->x+crop->w, crop->y+crop->h);
+ (int)s->var_values[VAR_N], s->var_values[VAR_T], s->x,
+ s->y, s->x+s->w, s->y+s->h);
 
- frame->data[0] += crop->y * frame->linesize[0];
- frame->data[0] += crop->x * crop->max_step[0];
+ frame->data[0] += s->y * frame->linesize[0];
+ frame->data[0] += s->x * s->max_step[0];
 
- if (!(desc->flags & PIX_FMT_PAL || desc->flags & PIX_FMT_PSEUDOPAL)) {
+ if (!(desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)) {
 for (i = 1; i < 3; i ++) {
 if (frame->data[i]) {
- frame->data[i] += (crop->y >> crop->vsub) * frame->linesize[i];
- frame->data[i] += (crop->x * crop->max_step[i]) >> crop->hsub;
+ frame->data[i] += (s->y >> s->vsub) * frame->linesize[i];
+ frame->data[i] += (s->x * s->max_step[i]) >> s->hsub;
 }
 }
 }
 
 /* alpha plane */
 if (frame->data[3]) {
- frame->data[3] += crop->y * frame->linesize[3];
- frame->data[3] += crop->x * crop->max_step[3];
+ frame->data[3] += s->y * frame->linesize[3];
+ frame->data[3] += s->x * s->max_step[3];
 }
 
- crop->var_values[VAR_N] += 1.0;
+ s->var_values[VAR_N] += 1.0;
 
 return ff_filter_frame(link->dst->outputs[0], frame);
 }
 
+#define OFFSET(x) offsetof(CropContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "out_w", "Output video width", OFFSET(ow_expr), AV_OPT_TYPE_STRING, { .str = "iw" }, .flags = FLAGS },
+ { "out_h", "Output video height", OFFSET(oh_expr), AV_OPT_TYPE_STRING, { .str = "ih" }, .flags = FLAGS },
+ { "x", "Horizontal position in the input video of the left edge of the cropped output video",
+ OFFSET(x_expr), AV_OPT_TYPE_STRING, { .str = "(in_w - out_w) / 2" }, .flags = FLAGS },
+ { "y", "Vertical position in the input video of the top edge of the cropped output video",
+ OFFSET(y_expr), AV_OPT_TYPE_STRING, { .str = "(in_h - out_h) / 2" }, .flags = FLAGS },
+ { NULL },
+};
+
+static const AVClass crop_class = {
+ .class_name = "crop",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_crop_inputs[] = {
 {
 .name = "default",
@@ -317,14 +331,14 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_crop = {
+AVFilter ff_vf_crop = {
 .name = "crop",
 .description = NULL_IF_CONFIG_SMALL("Crop the input video to width:height:x:y."),
 
 .priv_size = sizeof(CropContext),
+ .priv_class = &crop_class,
 
 .query_formats = query_formats,
- .init = init,
 .uninit = uninit,
 
 .inputs = avfilter_vf_crop_inputs,

libav-v9.6.tar.bz2/libavfilter/vf_cropdetect.c -> libav-v10.1.tar.bz2/libavfilter/vf_cropdetect.c Changed

@@ -27,12 +27,15 @@
 
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
+#include "libavutil/opt.h"
+
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
 #include "video.h"
 
 typedef struct {
+ const AVClass *class;
 int x1, y1, x2, y2;
 int limit;
 int round;
@@ -83,20 +86,14 @@
 return total;
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
- CropDetectContext *cd = ctx->priv;
-
- cd->limit = 24;
- cd->round = 0;
- cd->reset_count = 0;
- cd->frame_nb = -2;
+ CropDetectContext *s = ctx->priv;
 
- if (args)
- sscanf(args, "%d:%d:%d", &cd->limit, &cd->round, &cd->reset_count);
+ s->frame_nb = -2;
 
 av_log(ctx, AV_LOG_VERBOSE, "limit:%d round:%d reset_count:%d\n",
- cd->limit, cd->round, cd->reset_count);
+ s->limit, s->round, s->reset_count);
 
 return 0;
 }
@@ -104,91 +101,91 @@
 static int config_input(AVFilterLink *inlink)
 {
 AVFilterContext *ctx = inlink->dst;
- CropDetectContext *cd = ctx->priv;
+ CropDetectContext *s = ctx->priv;
 
- av_image_fill_max_pixsteps(cd->max_pixsteps, NULL,
+ av_image_fill_max_pixsteps(s->max_pixsteps, NULL,
 av_pix_fmt_desc_get(inlink->format));
 
- cd->x1 = inlink->w - 1;
- cd->y1 = inlink->h - 1;
- cd->x2 = 0;
- cd->y2 = 0;
+ s->x1 = inlink->w - 1;
+ s->y1 = inlink->h - 1;
+ s->x2 = 0;
+ s->y2 = 0;
 
 return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
+static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 {
 AVFilterContext *ctx = inlink->dst;
- CropDetectContext *cd = ctx->priv;
- int bpp = cd->max_pixsteps[0];
+ CropDetectContext *s = ctx->priv;
+ int bpp = s->max_pixsteps[0];
 int w, h, x, y, shrink_by;
 
 // ignore first 2 frames - they may be empty
- if (++cd->frame_nb > 0) {
+ if (++s->frame_nb > 0) {
 // Reset the crop area every reset_count frames, if reset_count is > 0
- if (cd->reset_count > 0 && cd->frame_nb > cd->reset_count) {
- cd->x1 = frame->video->w-1;
- cd->y1 = frame->video->h-1;
- cd->x2 = 0;
- cd->y2 = 0;
- cd->frame_nb = 1;
+ if (s->reset_count > 0 && s->frame_nb > s->reset_count) {
+ s->x1 = frame->width - 1;
+ s->y1 = frame->height - 1;
+ s->x2 = 0;
+ s->y2 = 0;
+ s->frame_nb = 1;
 }
 
- for (y = 0; y < cd->y1; y++) {
- if (checkline(ctx, frame->data[0] + frame->linesize[0] * y, bpp, frame->video->w, bpp) > cd->limit) {
- cd->y1 = y;
+ for (y = 0; y < s->y1; y++) {
+ if (checkline(ctx, frame->data[0] + frame->linesize[0] * y, bpp, frame->width, bpp) > s->limit) {
+ s->y1 = y;
 break;
 }
 }
 
- for (y = frame->video->h-1; y > cd->y2; y--) {
- if (checkline(ctx, frame->data[0] + frame->linesize[0] * y, bpp, frame->video->w, bpp) > cd->limit) {
- cd->y2 = y;
+ for (y = frame->height - 1; y > s->y2; y--) {
+ if (checkline(ctx, frame->data[0] + frame->linesize[0] * y, bpp, frame->width, bpp) > s->limit) {
+ s->y2 = y;
 break;
 }
 }
 
- for (y = 0; y < cd->x1; y++) {
- if (checkline(ctx, frame->data[0] + bpp*y, frame->linesize[0], frame->video->h, bpp) > cd->limit) {
- cd->x1 = y;
+ for (y = 0; y < s->x1; y++) {
+ if (checkline(ctx, frame->data[0] + bpp*y, frame->linesize[0], frame->height, bpp) > s->limit) {
+ s->x1 = y;
 break;
 }
 }
 
- for (y = frame->video->w-1; y > cd->x2; y--) {
- if (checkline(ctx, frame->data[0] + bpp*y, frame->linesize[0], frame->video->h, bpp) > cd->limit) {
- cd->x2 = y;
+ for (y = frame->width - 1; y > s->x2; y--) {
+ if (checkline(ctx, frame->data[0] + bpp*y, frame->linesize[0], frame->height, bpp) > s->limit) {
+ s->x2 = y;
 break;
 }
 }
 
 // round x and y (up), important for yuv colorspaces
 // make sure they stay rounded!
- x = (cd->x1+1) & ~1;
- y = (cd->y1+1) & ~1;
+ x = (s->x1+1) & ~1;
+ y = (s->y1+1) & ~1;
 
- w = cd->x2 - x + 1;
- h = cd->y2 - y + 1;
+ w = s->x2 - x + 1;
+ h = s->y2 - y + 1;
 
 // w and h must be divisible by 2 as well because of yuv
 // colorspace problems.
- if (cd->round <= 1)
- cd->round = 16;
- if (cd->round % 2)
- cd->round *= 2;
+ if (s->round <= 1)
+ s->round = 16;
+ if (s->round % 2)
+ s->round *= 2;
 
- shrink_by = w % cd->round;
+ shrink_by = w % s->round;
 w -= shrink_by;
 x += (shrink_by/2 + 1) & ~1;
 
- shrink_by = h % cd->round;
+ shrink_by = h % s->round;
 h -= shrink_by;
 y += (shrink_by/2 + 1) & ~1;
 
 av_log(ctx, AV_LOG_INFO,
- "x1:%d x2:%d y1:%d y2:%d w:%d h:%d x:%d y:%d pos:%"PRId64" pts:%"PRId64" t:%f crop=%d:%d:%d:%d\n",
- cd->x1, cd->x2, cd->y1, cd->y2, w, h, x, y, frame->pos, frame->pts,
+ "x1:%d x2:%d y1:%d y2:%d w:%d h:%d x:%d y:%d pts:%"PRId64" t:%f crop=%d:%d:%d:%d\n",
+ s->x1, s->x2, s->y1, s->y2, w, h, x, y, frame->pts,
 frame->pts == AV_NOPTS_VALUE ? -1 : frame->pts * av_q2d(inlink->time_base),
 w, h, x, y);
 }
@@ -196,6 +193,22 @@
 return ff_filter_frame(inlink->dst->outputs[0], frame);
 }
 
+#define OFFSET(x) offsetof(CropDetectContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "limit", "Threshold below which the pixel is considered black", OFFSET(limit), AV_OPT_TYPE_INT, { .i64 = 24 }, 0, INT_MAX, FLAGS },
+ { "round", "Value by which the width/height should be divisible", OFFSET(round), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS },
+ { "reset", "Recalculate the crop area after this many frames", OFFSET(reset_count), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS },
+ { NULL },
+};
+
+static const AVClass cropdetect_class = {
+ .class_name = "cropdetect",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_cropdetect_inputs[] = {
 {
 .name = "default",
@@ -215,11 +228,12 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_cropdetect = {
+AVFilter ff_vf_cropdetect = {
 .name = "cropdetect",
 .description = NULL_IF_CONFIG_SMALL("Auto-detect crop size."),
 
 .priv_size = sizeof(CropDetectContext),
+ .priv_class = &cropdetect_class,
 .init = init,
 
 .query_formats = query_formats,

libav-v9.6.tar.bz2/libavfilter/vf_delogo.c -> libav-v10.1.tar.bz2/libavfilter/vf_delogo.c Changed

@@ -136,16 +136,17 @@
 } DelogoContext;
 
 #define OFFSET(x) offsetof(DelogoContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
 
 static const AVOption delogo_options[]= {
- {"x", "set logo x position", OFFSET(x), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX },
- {"y", "set logo y position", OFFSET(y), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX },
- {"w", "set logo width", OFFSET(w), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX },
- {"h", "set logo height", OFFSET(h), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX },
- {"band", "set delogo area band size", OFFSET(band), AV_OPT_TYPE_INT, {.i64 = 4}, -1, INT_MAX },
- {"t", "set delogo area band size", OFFSET(band), AV_OPT_TYPE_INT, {.i64 = 4}, -1, INT_MAX },
- {"show", "show delogo area", OFFSET(show), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1 },
- {NULL},
+ { "x", "set logo x position", OFFSET(x), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS },
+ { "y", "set logo y position", OFFSET(y), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS },
+ { "w", "set logo width", OFFSET(w), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS },
+ { "h", "set logo height", OFFSET(h), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS },
+ { "band", "set delogo area band size", OFFSET(band), AV_OPT_TYPE_INT, { .i64 = 4 }, -1, INT_MAX, FLAGS },
+ { "t", "set delogo area band size", OFFSET(band), AV_OPT_TYPE_INT, { .i64 = 4 }, -1, INT_MAX, FLAGS },
+ { "show", "show delogo area", OFFSET(show), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, FLAGS },
+ { NULL },
 };
 
 static const char *delogo_get_name(void *ctx)
@@ -172,28 +173,13 @@
 return 0;
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
- DelogoContext *delogo = ctx->priv;
- int ret = 0;
-
- delogo->class = &delogo_class;
- av_opt_set_defaults(delogo);
-
- if (args)
- ret = sscanf(args, "%d:%d:%d:%d:%d",
- &delogo->x, &delogo->y, &delogo->w, &delogo->h, &delogo->band);
- if (ret == 5) {
- if (delogo->band < 0)
- delogo->show = 1;
- } else if ((ret = (av_set_options_string(delogo, args, "=", ":"))) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
- return ret;
- }
+ DelogoContext *s = ctx->priv;
 
 #define CHECK_UNSET_OPT(opt) \
- if (delogo->opt == -1) { \
- av_log(delogo, AV_LOG_ERROR, "Option %s was not set.\n", #opt); \
+ if (s->opt == -1) { \
+ av_log(s, AV_LOG_ERROR, "Option %s was not set.\n", #opt); \
 return AVERROR(EINVAL); \
 }
 CHECK_UNSET_OPT(x);
@@ -201,44 +187,44 @@
 CHECK_UNSET_OPT(w);
 CHECK_UNSET_OPT(h);
 
- if (delogo->show)
- delogo->band = 4;
+ if (s->show)
+ s->band = 4;
 
 av_log(ctx, AV_LOG_DEBUG, "x:%d y:%d, w:%d h:%d band:%d show:%d\n",
- delogo->x, delogo->y, delogo->w, delogo->h, delogo->band, delogo->show);
+ s->x, s->y, s->w, s->h, s->band, s->show);
 
- delogo->w += delogo->band*2;
- delogo->h += delogo->band*2;
- delogo->x -= delogo->band;
- delogo->y -= delogo->band;
+ s->w += s->band*2;
+ s->h += s->band*2;
+ s->x -= s->band;
+ s->y -= s->band;
 
 return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
+static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 {
- DelogoContext *delogo = inlink->dst->priv;
+ DelogoContext *s = inlink->dst->priv;
 AVFilterLink *outlink = inlink->dst->outputs[0];
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
- AVFilterBufferRef *out;
+ AVFrame *out;
 int hsub0 = desc->log2_chroma_w;
 int vsub0 = desc->log2_chroma_h;
 int direct = 0;
 int plane;
 
- if ((in->perms & AV_PERM_WRITE) && !(in->perms & AV_PERM_PRESERVE)) {
+ if (av_frame_is_writable(in)) {
 direct = 1;
 out = in;
 } else {
- out = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
+ out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
 if (!out) {
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return AVERROR(ENOMEM);
 }
 
- avfilter_copy_buffer_ref_props(out, in);
- out->video->w = outlink->w;
- out->video->h = outlink->h;
+ av_frame_copy_props(out, in);
+ out->width = outlink->w;
+ out->height = outlink->h;
 }
 
 for (plane = 0; plane < 4 && in->data[plane]; plane++) {
@@ -248,14 +234,14 @@
 apply_delogo(out->data[plane], out->linesize[plane],
 in ->data[plane], in ->linesize[plane],
 inlink->w>>hsub, inlink->h>>vsub,
- delogo->x>>hsub, delogo->y>>vsub,
- delogo->w>>hsub, delogo->h>>vsub,
- delogo->band>>FFMIN(hsub, vsub),
- delogo->show, direct);
+ s->x>>hsub, s->y>>vsub,
+ s->w>>hsub, s->h>>vsub,
+ s->band>>FFMIN(hsub, vsub),
+ s->show, direct);
 }
 
 if (!direct)
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 
 return ff_filter_frame(outlink, out);
 }
@@ -266,8 +252,6 @@
 .type = AVMEDIA_TYPE_VIDEO,
 .get_video_buffer = ff_null_get_video_buffer,
 .filter_frame = filter_frame,
- .min_perms = AV_PERM_WRITE | AV_PERM_READ,
- .rej_perms = AV_PERM_PRESERVE
 },
 { NULL }
 };
@@ -280,10 +264,11 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_delogo = {
+AVFilter ff_vf_delogo = {
 .name = "delogo",
 .description = NULL_IF_CONFIG_SMALL("Remove logo from input video."),
 .priv_size = sizeof(DelogoContext),
+ .priv_class = &delogo_class,
 .init = init,
 .query_formats = query_formats,

libav-v9.6.tar.bz2/libavfilter/vf_drawbox.c -> libav-v10.1.tar.bz2/libavfilter/vf_drawbox.c Changed

@@ -26,6 +26,7 @@
 
 #include "libavutil/colorspace.h"
 #include "libavutil/common.h"
+#include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/parseutils.h"
 #include "avfilter.h"
@@ -36,30 +37,25 @@
 enum { Y, U, V, A };
 
 typedef struct {
- int x, y, w, h;
+ const AVClass *class;
+ int x, y, w_opt, h_opt, w, h;
+ char *color_str;
 unsigned char yuv_color[4];
 int vsub, hsub; ///< chroma subsampling
 } DrawBoxContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
- DrawBoxContext *drawbox= ctx->priv;
- char color_str[1024] = "black";
+ DrawBoxContext *s = ctx->priv;
 uint8_t rgba_color[4];
 
- drawbox->x = drawbox->y = drawbox->w = drawbox->h = 0;
-
- if (args)
- sscanf(args, "%d:%d:%d:%d:%s",
- &drawbox->x, &drawbox->y, &drawbox->w, &drawbox->h, color_str);
-
- if (av_parse_color(rgba_color, color_str, -1, ctx) < 0)
+ if (av_parse_color(rgba_color, s->color_str, -1, ctx) < 0)
 return AVERROR(EINVAL);
 
- drawbox->yuv_color[Y] = RGB_TO_Y_CCIR(rgba_color[0], rgba_color[1], rgba_color[2]);
- drawbox->yuv_color[U] = RGB_TO_U_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0);
- drawbox->yuv_color[V] = RGB_TO_V_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0);
- drawbox->yuv_color[A] = rgba_color[3];
+ s->yuv_color[Y] = RGB_TO_Y_CCIR(rgba_color[0], rgba_color[1], rgba_color[2]);
+ s->yuv_color[U] = RGB_TO_U_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0);
+ s->yuv_color[V] = RGB_TO_V_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0);
+ s->yuv_color[A] = rgba_color[3];
 
 return 0;
 }
@@ -80,43 +76,43 @@
 
 static int config_input(AVFilterLink *inlink)
 {
- DrawBoxContext *drawbox = inlink->dst->priv;
+ DrawBoxContext *s = inlink->dst->priv;
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
 
- drawbox->hsub = desc->log2_chroma_w;
- drawbox->vsub = desc->log2_chroma_h;
+ s->hsub = desc->log2_chroma_w;
+ s->vsub = desc->log2_chroma_h;
 
- if (drawbox->w == 0) drawbox->w = inlink->w;
- if (drawbox->h == 0) drawbox->h = inlink->h;
+ s->w = (s->w_opt > 0) ? s->w_opt : inlink->w;
+ s->h = (s->h_opt > 0) ? s->h_opt : inlink->h;
 
 av_log(inlink->dst, AV_LOG_VERBOSE, "x:%d y:%d w:%d h:%d color:0x%02X%02X%02X%02X\n",
- drawbox->w, drawbox->y, drawbox->w, drawbox->h,
- drawbox->yuv_color[Y], drawbox->yuv_color[U], drawbox->yuv_color[V], drawbox->yuv_color[A]);
+ s->w, s->y, s->w, s->h,
+ s->yuv_color[Y], s->yuv_color[U], s->yuv_color[V], s->yuv_color[A]);
 
 return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
+static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 {
- DrawBoxContext *drawbox = inlink->dst->priv;
- int plane, x, y, xb = drawbox->x, yb = drawbox->y;
+ DrawBoxContext *s = inlink->dst->priv;
+ int plane, x, y, xb = s->x, yb = s->y;
 unsigned char *row[4];
 
- for (y = FFMAX(yb, 0); y < frame->video->h && y < (yb + drawbox->h); y++) {
+ for (y = FFMAX(yb, 0); y < frame->height && y < (yb + s->h); y++) {
 row[0] = frame->data[0] + y * frame->linesize[0];
 
 for (plane = 1; plane < 3; plane++)
 row[plane] = frame->data[plane] +
- frame->linesize[plane] * (y >> drawbox->vsub);
+ frame->linesize[plane] * (y >> s->vsub);
 
- for (x = FFMAX(xb, 0); x < (xb + drawbox->w) && x < frame->video->w; x++) {
- double alpha = (double)drawbox->yuv_color[A] / 255;
+ for (x = FFMAX(xb, 0); x < (xb + s->w) && x < frame->width; x++) {
+ double alpha = (double)s->yuv_color[A] / 255;
 
- if ((y - yb < 3) || (yb + drawbox->h - y < 4) ||
- (x - xb < 3) || (xb + drawbox->w - x < 4)) {
- row[0][x ] = (1 - alpha) * row[0][x ] + alpha * drawbox->yuv_color[Y];
- row[1][x >> drawbox->hsub] = (1 - alpha) * row[1][x >> drawbox->hsub] + alpha * drawbox->yuv_color[U];
- row[2][x >> drawbox->hsub] = (1 - alpha) * row[2][x >> drawbox->hsub] + alpha * drawbox->yuv_color[V];
+ if ((y - yb < 3) || (yb + s->h - y < 4) ||
+ (x - xb < 3) || (xb + s->w - x < 4)) {
+ row[0][x ] = (1 - alpha) * row[0][x ] + alpha * s->yuv_color[Y];
+ row[1][x >> s->hsub] = (1 - alpha) * row[1][x >> s->hsub] + alpha * s->yuv_color[U];
+ row[2][x >> s->hsub] = (1 - alpha) * row[2][x >> s->hsub] + alpha * s->yuv_color[V];
 }
 }
 }
@@ -124,6 +120,24 @@
 return ff_filter_frame(inlink->dst->outputs[0], frame);
 }
 
+#define OFFSET(x) offsetof(DrawBoxContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "x", "Horizontal position of the left box edge", OFFSET(x), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, FLAGS },
+ { "y", "Vertical position of the top box edge", OFFSET(y), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, FLAGS },
+ { "width", "Width of the box", OFFSET(w_opt), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS },
+ { "height", "Height of the box", OFFSET(h_opt), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS },
+ { "color", "Color of the box", OFFSET(color_str), AV_OPT_TYPE_STRING, { .str = "black" }, .flags = FLAGS },
+ { NULL },
+};
+
+static const AVClass drawbox_class = {
+ .class_name = "drawbox",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_drawbox_inputs[] = {
 {
 .name = "default",
@@ -131,8 +145,7 @@
 .config_props = config_input,
 .get_video_buffer = ff_null_get_video_buffer,
 .filter_frame = filter_frame,
- .min_perms = AV_PERM_WRITE | AV_PERM_READ,
- .rej_perms = AV_PERM_PRESERVE
+ .needs_writable = 1,
 },
 { NULL }
 };
@@ -145,10 +158,11 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_drawbox = {
+AVFilter ff_vf_drawbox = {
 .name = "drawbox",
 .description = NULL_IF_CONFIG_SMALL("Draw a colored box on the input video."),
 .priv_size = sizeof(DrawBoxContext),
+ .priv_class = &drawbox_class,
 .init = init,
 
 .query_formats = query_formats,

libav-v9.6.tar.bz2/libavfilter/vf_drawtext.c -> libav-v10.1.tar.bz2/libavfilter/vf_drawtext.c Changed

@@ -47,7 +47,6 @@
 #include "video.h"
 
 #include <ft2build.h>
-#include <freetype/config/ftheader.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 
@@ -144,43 +143,44 @@
 } DrawTextContext;
 
 #define OFFSET(x) offsetof(DrawTextContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
 
 static const AVOption drawtext_options[]= {
-{"fontfile", "set font file", OFFSET(fontfile), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX },
-{"text", "set text", OFFSET(text), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX },
-{"textfile", "set text file", OFFSET(textfile), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX },
-{"fontcolor","set foreground color", OFFSET(fontcolor_string), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX },
-{"boxcolor", "set box color", OFFSET(boxcolor_string), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX },
-{"shadowcolor", "set shadow color", OFFSET(shadowcolor_string), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX },
-{"box", "set box", OFFSET(draw_box), AV_OPT_TYPE_INT, {.i64=0}, 0, 1 },
-{"fontsize", "set font size", OFFSET(fontsize), AV_OPT_TYPE_INT, {.i64=16}, 1, 72 },
-{"x", "set x", OFFSET(x_expr), AV_OPT_TYPE_STRING, {.str="0"}, CHAR_MIN, CHAR_MAX },
-{"y", "set y", OFFSET(y_expr), AV_OPT_TYPE_STRING, {.str="0"}, CHAR_MIN, CHAR_MAX },
-{"shadowx", "set x", OFFSET(shadowx), AV_OPT_TYPE_INT, {.i64=0}, INT_MIN, INT_MAX },
-{"shadowy", "set y", OFFSET(shadowy), AV_OPT_TYPE_INT, {.i64=0}, INT_MIN, INT_MAX },
-{"tabsize", "set tab size", OFFSET(tabsize), AV_OPT_TYPE_INT, {.i64=4}, 0, INT_MAX },
-{"draw", "if false do not draw", OFFSET(d_expr), AV_OPT_TYPE_STRING, {.str="1"}, CHAR_MIN, CHAR_MAX },
-{"fix_bounds", "if true, check and fix text coords to avoid clipping",
- OFFSET(fix_bounds), AV_OPT_TYPE_INT, {.i64=1}, 0, 1 },
-
-/* 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, 0, "ft_load_flags" },
-{"default", "set default", 0, AV_OPT_TYPE_CONST, {.i64 = FT_LOAD_DEFAULT}, INT_MIN, INT_MAX, 0, "ft_load_flags" },
-{"no_scale", "set no_scale", 0, AV_OPT_TYPE_CONST, {.i64 = FT_LOAD_NO_SCALE}, INT_MIN, INT_MAX, 0, "ft_load_flags" },
-{"no_hinting", "set no_hinting", 0, AV_OPT_TYPE_CONST, {.i64 = FT_LOAD_NO_HINTING}, INT_MIN, INT_MAX, 0, "ft_load_flags" },
-{"render", "set render", 0, AV_OPT_TYPE_CONST, {.i64 = FT_LOAD_RENDER}, INT_MIN, INT_MAX, 0, "ft_load_flags" },
-{"no_bitmap", "set no_bitmap", 0, AV_OPT_TYPE_CONST, {.i64 = FT_LOAD_NO_BITMAP}, INT_MIN, INT_MAX, 0, "ft_load_flags" },
-{"vertical_layout", "set vertical_layout", 0, AV_OPT_TYPE_CONST, {.i64 = FT_LOAD_VERTICAL_LAYOUT}, INT_MIN, INT_MAX, 0, "ft_load_flags" },
-{"force_autohint", "set force_autohint", 0, AV_OPT_TYPE_CONST, {.i64 = FT_LOAD_FORCE_AUTOHINT}, INT_MIN, INT_MAX, 0, "ft_load_flags" },
-{"crop_bitmap", "set crop_bitmap", 0, AV_OPT_TYPE_CONST, {.i64 = FT_LOAD_CROP_BITMAP}, INT_MIN, INT_MAX, 0, "ft_load_flags" },
-{"pedantic", "set pedantic", 0, AV_OPT_TYPE_CONST, {.i64 = FT_LOAD_PEDANTIC}, INT_MIN, INT_MAX, 0, "ft_load_flags" },
-{"ignore_global_advance_width", "set ignore_global_advance_width", 0, AV_OPT_TYPE_CONST, {.i64 = FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH}, INT_MIN, INT_MAX, 0, "ft_load_flags" },
-{"no_recurse", "set no_recurse", 0, AV_OPT_TYPE_CONST, {.i64 = FT_LOAD_NO_RECURSE}, INT_MIN, INT_MAX, 0, "ft_load_flags" },
-{"ignore_transform", "set ignore_transform", 0, AV_OPT_TYPE_CONST, {.i64 = FT_LOAD_IGNORE_TRANSFORM}, INT_MIN, INT_MAX, 0, "ft_load_flags" },
-{"monochrome", "set monochrome", 0, AV_OPT_TYPE_CONST, {.i64 = FT_LOAD_MONOCHROME}, INT_MIN, INT_MAX, 0, "ft_load_flags" },
-{"linear_design", "set linear_design", 0, AV_OPT_TYPE_CONST, {.i64 = FT_LOAD_LINEAR_DESIGN}, INT_MIN, INT_MAX, 0, "ft_load_flags" },
-{"no_autohint", "set no_autohint", 0, AV_OPT_TYPE_CONST, {.i64 = FT_LOAD_NO_AUTOHINT}, INT_MIN, INT_MAX, 0, "ft_load_flags" },
-{NULL},
+ { "fontfile", NULL, OFFSET(fontfile), AV_OPT_TYPE_STRING, .flags = FLAGS },
+ { "text", NULL, OFFSET(text), AV_OPT_TYPE_STRING, .flags = FLAGS },
+ { "textfile", NULL, OFFSET(textfile), AV_OPT_TYPE_STRING, .flags = FLAGS },
+ { "fontcolor", NULL, OFFSET(fontcolor_string), AV_OPT_TYPE_STRING, { .str = "black" }, .flags = FLAGS },
+ { "boxcolor", NULL, OFFSET(boxcolor_string), AV_OPT_TYPE_STRING, { .str = "white" }, .flags = FLAGS },
+ { "shadowcolor", NULL, OFFSET(shadowcolor_string), AV_OPT_TYPE_STRING, { .str = "black" }, .flags = FLAGS },
+ { "box", NULL, OFFSET(draw_box), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, FLAGS },
+ { "fontsize", NULL, OFFSET(fontsize), AV_OPT_TYPE_INT, { .i64 = 16 }, 1, 72, FLAGS },
+ { "x", NULL, OFFSET(x_expr), AV_OPT_TYPE_STRING, { .str = "0" }, .flags = FLAGS },
+ { "y", NULL, OFFSET(y_expr), AV_OPT_TYPE_STRING, { .str = "0" }, .flags = FLAGS },
+ { "shadowx", NULL, OFFSET(shadowx), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, FLAGS },
+ { "shadowy", NULL, OFFSET(shadowy), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, FLAGS },
+ { "tabsize", NULL, OFFSET(tabsize), AV_OPT_TYPE_INT, { .i64 = 4 }, 0, INT_MAX, FLAGS },
+ { "draw", "if false do not draw", OFFSET(d_expr), AV_OPT_TYPE_STRING, { .str = "1" }, .flags = FLAGS },
+ { "fix_bounds", "if true, check and fix text coords to avoid clipping",
+ OFFSET(fix_bounds), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, 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" },
+ { "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" },
+ { "render", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FT_LOAD_RENDER }, .flags = FLAGS, .unit = "ft_load_flags" },
+ { "no_bitmap", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FT_LOAD_NO_BITMAP }, .flags = FLAGS, .unit = "ft_load_flags" },
+ { "vertical_layout", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FT_LOAD_VERTICAL_LAYOUT }, .flags = FLAGS, .unit = "ft_load_flags" },
+ { "force_autohint", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FT_LOAD_FORCE_AUTOHINT }, .flags = FLAGS, .unit = "ft_load_flags" },
+ { "crop_bitmap", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FT_LOAD_CROP_BITMAP }, .flags = FLAGS, .unit = "ft_load_flags" },
+ { "pedantic", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FT_LOAD_PEDANTIC }, .flags = FLAGS, .unit = "ft_load_flags" },
+ { "ignore_global_advance_width", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH }, .flags = FLAGS, .unit = "ft_load_flags" },
+ { "no_recurse", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FT_LOAD_NO_RECURSE }, .flags = FLAGS, .unit = "ft_load_flags" },
+ { "ignore_transform", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FT_LOAD_IGNORE_TRANSFORM }, .flags = FLAGS, .unit = "ft_load_flags" },
+ { "monochrome", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FT_LOAD_MONOCHROME }, .flags = FLAGS, .unit = "ft_load_flags" },
+ { "linear_design", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FT_LOAD_LINEAR_DESIGN }, .flags = FLAGS, .unit = "ft_load_flags" },
+ { "no_autohint", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FT_LOAD_NO_AUTOHINT }, .flags = FLAGS, .unit = "ft_load_flags" },
+ { NULL},
 };
 
 static const char *drawtext_get_name(void *ctx)
@@ -230,13 +230,13 @@
 */
 static int load_glyph(AVFilterContext *ctx, Glyph **glyph_ptr, uint32_t code)
 {
- DrawTextContext *dtext = ctx->priv;
+ DrawTextContext *s = ctx->priv;
 Glyph *glyph;
 struct AVTreeNode *node = NULL;
 int ret;
 
- /* load glyph into dtext->face->glyph */
- if (FT_Load_Char(dtext->face, code, dtext->ft_load_flags))
+ /* load glyph into s->face->glyph */
+ if (FT_Load_Char(s->face, code, s->ft_load_flags))
 return AVERROR(EINVAL);
 
 /* save glyph */
@@ -247,15 +247,15 @@
 }
 glyph->code = code;
 
- if (FT_Get_Glyph(dtext->face->glyph, glyph->glyph)) {
+ if (FT_Get_Glyph(s->face->glyph, glyph->glyph)) {
 ret = AVERROR(EINVAL);
 goto error;
 }
 
- glyph->bitmap = dtext->face->glyph->bitmap;
- glyph->bitmap_left = dtext->face->glyph->bitmap_left;
- glyph->bitmap_top = dtext->face->glyph->bitmap_top;
- glyph->advance = dtext->face->glyph->advance.x >> 6;
+ glyph->bitmap = s->face->glyph->bitmap;
+ glyph->bitmap_left = s->face->glyph->bitmap_left;
+ glyph->bitmap_top = s->face->glyph->bitmap_top;
+ glyph->advance = s->face->glyph->advance.x >> 6;
 
 /* measure text height to calculate text_height (or the maximum text height) */
 FT_Glyph_Get_CBox(*glyph->glyph, ft_glyph_bbox_pixels, &glyph->bbox);
@@ -265,7 +265,7 @@
 ret = AVERROR(ENOMEM);
 goto error;
 }
- av_tree_insert(&dtext->glyphs, glyph, glyph_cmp, &node);
+ av_tree_insert(&s->glyphs, glyph, glyph_cmp, &node);
 
 if (glyph_ptr)
 *glyph_ptr = glyph;
@@ -279,94 +279,83 @@
 return ret;
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
 int err;
- DrawTextContext *dtext = ctx->priv;
+ DrawTextContext *s = ctx->priv;
 Glyph *glyph;
 
- dtext->class = &drawtext_class;
- av_opt_set_defaults(dtext);
- dtext->fontcolor_string = av_strdup("black");
- dtext->boxcolor_string = av_strdup("white");
- dtext->shadowcolor_string = av_strdup("black");
-
- if ((err = (av_set_options_string(dtext, args, "=", ":"))) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
- return err;
- }
-
- if (!dtext->fontfile) {
+ if (!s->fontfile) {
 av_log(ctx, AV_LOG_ERROR, "No font filename provided\n");
 return AVERROR(EINVAL);
 }
 
- if (dtext->textfile) {
+ if (s->textfile) {
 uint8_t *textbuf;
 size_t textbuf_size;
 
- if (dtext->text) {
+ if (s->text) {
 av_log(ctx, AV_LOG_ERROR,
 "Both text and text file provided. Please provide only one\n");
 return AVERROR(EINVAL);
 }
- if ((err = av_file_map(dtext->textfile, &textbuf, &textbuf_size, 0, ctx)) < 0) {
+ if ((err = av_file_map(s->textfile, &textbuf, &textbuf_size, 0, ctx)) < 0) {
 av_log(ctx, AV_LOG_ERROR,
 "The text file '%s' could not be read or is empty\n",
- dtext->textfile);
+ s->textfile);
 return err;
 }
 
- if (!(dtext->text = av_malloc(textbuf_size+1)))
+ if (!(s->text = av_malloc(textbuf_size+1)))
 return AVERROR(ENOMEM);
- memcpy(dtext->text, textbuf, textbuf_size);
- dtext->text[textbuf_size] = 0;
+ memcpy(s->text, textbuf, textbuf_size);
+ s->text[textbuf_size] = 0;
 av_file_unmap(textbuf, textbuf_size);
 }
 
- if (!dtext->text) {
+ if (!s->text) {
 av_log(ctx, AV_LOG_ERROR,
 "Either text or a valid file must be provided\n");
 return AVERROR(EINVAL);
 }
 
- if ((err = av_parse_color(dtext->fontcolor_rgba, dtext->fontcolor_string, -1, ctx))) {
+ if ((err = av_parse_color(s->fontcolor_rgba, s->fontcolor_string, -1, ctx))) {
 av_log(ctx, AV_LOG_ERROR,
- "Invalid font color '%s'\n", dtext->fontcolor_string);
+ "Invalid font color '%s'\n", s->fontcolor_string);
 return err;
 }
 
- if ((err = av_parse_color(dtext->boxcolor_rgba, dtext->boxcolor_string, -1, ctx))) {
+ if ((err = av_parse_color(s->boxcolor_rgba, s->boxcolor_string, -1, ctx))) {
 av_log(ctx, AV_LOG_ERROR,
- "Invalid box color '%s'\n", dtext->boxcolor_string);
+ "Invalid box color '%s'\n", s->boxcolor_string);
 return err;
 }
 
- if ((err = av_parse_color(dtext->shadowcolor_rgba, dtext->shadowcolor_string, -1, ctx))) {
+ if ((err = av_parse_color(s->shadowcolor_rgba, s->shadowcolor_string, -1, ctx))) {
 av_log(ctx, AV_LOG_ERROR,
- "Invalid shadow color '%s'\n", dtext->shadowcolor_string);
+ "Invalid shadow color '%s'\n", s->shadowcolor_string);
 return err;
 }
 
- if ((err = FT_Init_FreeType(&(dtext->library)))) {
+ if ((err = FT_Init_FreeType(&(s->library)))) {
 av_log(ctx, AV_LOG_ERROR,
 "Could not load FreeType: %s\n", FT_ERRMSG(err));
 return AVERROR(EINVAL);
 }
 
 /* load the face, and set up the encoding, which is by default UTF-8 */
- if ((err = FT_New_Face(dtext->library, dtext->fontfile, 0, &dtext->face))) {
+ if ((err = FT_New_Face(s->library, s->fontfile, 0, &s->face))) {
 av_log(ctx, AV_LOG_ERROR, "Could not load fontface from file '%s': %s\n",
- dtext->fontfile, FT_ERRMSG(err));
+ s->fontfile, FT_ERRMSG(err));
 return AVERROR(EINVAL);
 }
- if ((err = FT_Set_Pixel_Sizes(dtext->face, 0, dtext->fontsize))) {
+ if ((err = FT_Set_Pixel_Sizes(s->face, 0, s->fontsize))) {
 av_log(ctx, AV_LOG_ERROR, "Could not set font size to %d pixels: %s\n",
- dtext->fontsize, FT_ERRMSG(err));
+ s->fontsize, FT_ERRMSG(err));
 return AVERROR(EINVAL);
 }
 
- dtext->use_kerning = FT_HAS_KERNING(dtext->face);
+ s->use_kerning = FT_HAS_KERNING(s->face);
 
 /* load the fallback glyph with code 0 */
 load_glyph(ctx, NULL, 0);
@@ -376,7 +365,7 @@
 av_log(ctx, AV_LOG_ERROR, "Could not set tabsize.\n");
 return err;
 }
- dtext->tabsize *= glyph->advance;
+ s->tabsize *= glyph->advance;
 
 #if !HAVE_LOCALTIME_R
 av_log(ctx, AV_LOG_WARNING, "strftime() expansion unavailable!\n");
@@ -409,25 +398,24 @@
 
 static av_cold void uninit(AVFilterContext *ctx)
 {
- DrawTextContext *dtext = ctx->priv;
+ DrawTextContext *s = ctx->priv;
 int i;
 
- av_freep(&dtext->fontfile);
- av_freep(&dtext->text);
- av_freep(&dtext->expanded_text);
- av_freep(&dtext->fontcolor_string);
- av_freep(&dtext->boxcolor_string);
- av_freep(&dtext->positions);
- av_freep(&dtext->shadowcolor_string);
- av_tree_enumerate(dtext->glyphs, NULL, NULL, glyph_enu_free);
- av_tree_destroy(dtext->glyphs);
- dtext->glyphs = 0;
- FT_Done_Face(dtext->face);
- FT_Done_FreeType(dtext->library);
+ av_expr_free(s->x_pexpr);
+ av_expr_free(s->y_pexpr);
+ av_expr_free(s->d_pexpr);
+ s->x_pexpr = s->y_pexpr = s->d_pexpr = NULL;
+ av_freep(&s->expanded_text);
+ av_freep(&s->positions);
+ av_tree_enumerate(s->glyphs, NULL, NULL, glyph_enu_free);
+ av_tree_destroy(s->glyphs);
+ s->glyphs = 0;
+ FT_Done_Face(s->face);
+ FT_Done_FreeType(s->library);
 
 for (i = 0; i < 4; i++) {
- av_freep(&dtext->box_line[i]);
- dtext->pixel_step[i] = 0;
+ av_freep(&s->box_line[i]);
+ s->pixel_step[i] = 0;
 }
 
 }
@@ -439,11 +427,11 @@
 
 static int dtext_prepare_text(AVFilterContext *ctx)
 {
- DrawTextContext *dtext = ctx->priv;
+ DrawTextContext *s = ctx->priv;
 uint32_t code = 0, prev_code = 0;
 int x = 0, y = 0, i = 0, ret;
 int text_height, baseline;
- char *text = dtext->text;
+ char *text = s->text;
 uint8_t *p;
 int str_w = 0, len;
 int y_min = 32000, y_max = -32000;
@@ -456,37 +444,37 @@
 #if HAVE_LOCALTIME_R
 time_t now = time(0);
 struct tm ltime;
- uint8_t *buf = dtext->expanded_text;
- int buf_size = dtext->expanded_text_size;
+ uint8_t *buf = s->expanded_text;
+ int buf_size = s->expanded_text_size;
 
 if (!buf)
- buf_size = 2*strlen(dtext->text)+1;
+ buf_size = 2*strlen(s->text)+1;
 
 localtime_r(&now, &ltime);
 
 while ((buf = av_realloc(buf, buf_size))) {
 *buf = 1;
- if (strftime(buf, buf_size, dtext->text, &ltime) != 0 || *buf == 0)
+ if (strftime(buf, buf_size, s->text, &ltime) != 0 || *buf == 0)
 break;
 buf_size *= 2;
 }
 
 if (!buf)
 return AVERROR(ENOMEM);
- text = dtext->expanded_text = buf;
- dtext->expanded_text_size = buf_size;
+ text = s->expanded_text = buf;
+ s->expanded_text_size = buf_size;
 #endif
 
- if ((len = strlen(text)) > dtext->nb_positions) {
- FT_Vector *p = av_realloc(dtext->positions,
- len * sizeof(*dtext->positions));
+ if ((len = strlen(text)) > s->nb_positions) {
+ FT_Vector *p = av_realloc(s->positions,
+ len * sizeof(*s->positions));
 if (!p) {
- av_freep(dtext->positions);
- dtext->nb_positions = 0;
+ av_freep(s->positions);
+ s->nb_positions = 0;
 return AVERROR(ENOMEM);
 } else {
- dtext->positions = p;
- dtext->nb_positions = len;
+ s->positions = p;
+ s->nb_positions = len;
 }
 }
 
@@ -496,7 +484,7 @@
 
 /* get glyph */
 dummy.code = code;
- glyph = av_tree_find(dtext->glyphs, &dummy, glyph_cmp, NULL);
+ glyph = av_tree_find(s->glyphs, &dummy, glyph_cmp, NULL);
 if (!glyph) {
 ret = load_glyph(ctx, &glyph, code);
 if (ret)
@@ -520,7 +508,7 @@
 
 prev_code = code;
 if (is_newline(code)) {
- str_w = FFMAX(str_w, x - dtext->x);
+ str_w = FFMAX(str_w, x - s->x);
 y += text_height;
 x = 0;
 continue;
@@ -529,11 +517,11 @@
 /* get glyph */
 prev_glyph = glyph;
 dummy.code = code;
- glyph = av_tree_find(dtext->glyphs, &dummy, glyph_cmp, NULL);
+ glyph = av_tree_find(s->glyphs, &dummy, glyph_cmp, NULL);
 
 /* kerning */
- if (dtext->use_kerning && prev_glyph && glyph->code) {
- FT_Get_Kerning(dtext->face, prev_glyph->code, glyph->code,
+ if (s->use_kerning && prev_glyph && glyph->code) {
+ FT_Get_Kerning(s->face, prev_glyph->code, glyph->code,
 ft_kerning_default, &delta);
 x += delta.x >> 6;
 }
@@ -545,19 +533,19 @@
 }
 
 /* save position */
- dtext->positions[i].x = x + glyph->bitmap_left;
- dtext->positions[i].y = y - glyph->bitmap_top + baseline;
- if (code == '\t') x = (x / dtext->tabsize + 1)*dtext->tabsize;
+ s->positions[i].x = x + glyph->bitmap_left;
+ s->positions[i].y = y - glyph->bitmap_top + baseline;
+ if (code == '\t') x = (x / s->tabsize + 1)*s->tabsize;
 else x += glyph->advance;
 }
 
 str_w = FFMIN(width - 1, FFMAX(str_w, x));
 y = FFMIN(y + text_height, height - 1);
 
- dtext->w = str_w;
- dtext->var_values[VAR_TEXT_W] = dtext->var_values[VAR_TW] = dtext->w;
- dtext->h = y;
- dtext->var_values[VAR_TEXT_H] = dtext->var_values[VAR_TH] = dtext->h;
+ s->w = str_w;
+ s->var_values[VAR_TEXT_W] = s->var_values[VAR_TW] = s->w;
+ s->h = y;
+ s->var_values[VAR_TEXT_H] = s->var_values[VAR_TH] = s->h;
 
 return 0;
 }
@@ -566,58 +554,61 @@
 static int config_input(AVFilterLink *inlink)
 {
 AVFilterContext *ctx = inlink->dst;
- DrawTextContext *dtext = ctx->priv;
+ DrawTextContext *s = ctx->priv;
 const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(inlink->format);
 int ret;
 
- dtext->hsub = pix_desc->log2_chroma_w;
- dtext->vsub = pix_desc->log2_chroma_h;
+ s->hsub = pix_desc->log2_chroma_w;
+ s->vsub = pix_desc->log2_chroma_h;
 
- dtext->var_values[VAR_E ] = M_E;
- dtext->var_values[VAR_PHI] = M_PHI;
- dtext->var_values[VAR_PI ] = M_PI;
+ s->var_values[VAR_E ] = M_E;
+ s->var_values[VAR_PHI] = M_PHI;
+ s->var_values[VAR_PI ] = M_PI;
 
- dtext->var_values[VAR_MAIN_W] =
- dtext->var_values[VAR_MW] = ctx->inputs[0]->w;
- dtext->var_values[VAR_MAIN_H] =
- dtext->var_values[VAR_MH] = ctx->inputs[0]->h;
+ s->var_values[VAR_MAIN_W] =
+ s->var_values[VAR_MW] = ctx->inputs[0]->w;
+ s->var_values[VAR_MAIN_H] =
+ s->var_values[VAR_MH] = ctx->inputs[0]->h;
 
- dtext->var_values[VAR_X] = 0;
- dtext->var_values[VAR_Y] = 0;
- dtext->var_values[VAR_N] = 0;
- dtext->var_values[VAR_T] = NAN;
+ s->var_values[VAR_X] = 0;
+ s->var_values[VAR_Y] = 0;
+ s->var_values[VAR_T] = NAN;
 
- av_lfg_init(&dtext->prng, av_get_random_seed());
+ av_lfg_init(&s->prng, av_get_random_seed());
 
- if ((ret = av_expr_parse(&dtext->x_pexpr, dtext->x_expr, var_names,
+ av_expr_free(s->x_pexpr);
+ av_expr_free(s->y_pexpr);
+ av_expr_free(s->d_pexpr);
+ s->x_pexpr = s->y_pexpr = s->d_pexpr = NULL;
+ if ((ret = av_expr_parse(&s->x_pexpr, s->x_expr, var_names,
 NULL, NULL, fun2_names, fun2, 0, ctx)) < 0 ||
- (ret = av_expr_parse(&dtext->y_pexpr, dtext->y_expr, var_names,
+ (ret = av_expr_parse(&s->y_pexpr, s->y_expr, var_names,
 NULL, NULL, fun2_names, fun2, 0, ctx)) < 0 ||
- (ret = av_expr_parse(&dtext->d_pexpr, dtext->d_expr, var_names,
+ (ret = av_expr_parse(&s->d_pexpr, s->d_expr, var_names,
 NULL, NULL, fun2_names, fun2, 0, ctx)) < 0)
 return AVERROR(EINVAL);
 
 if ((ret =
- ff_fill_line_with_color(dtext->box_line, dtext->pixel_step,
- inlink->w, dtext->boxcolor,
- inlink->format, dtext->boxcolor_rgba,
- &dtext->is_packed_rgb, dtext->rgba_map)) < 0)
+ ff_fill_line_with_color(s->box_line, s->pixel_step,
+ inlink->w, s->boxcolor,
+ inlink->format, s->boxcolor_rgba,
+ &s->is_packed_rgb, s->rgba_map)) < 0)
 return ret;
 
- if (!dtext->is_packed_rgb) {
- uint8_t *rgba = dtext->fontcolor_rgba;
- dtext->fontcolor[0] = RGB_TO_Y_CCIR(rgba[0], rgba[1], rgba[2]);
- dtext->fontcolor[1] = RGB_TO_U_CCIR(rgba[0], rgba[1], rgba[2], 0);
- dtext->fontcolor[2] = RGB_TO_V_CCIR(rgba[0], rgba[1], rgba[2], 0);
- dtext->fontcolor[3] = rgba[3];
- rgba = dtext->shadowcolor_rgba;
- dtext->shadowcolor[0] = RGB_TO_Y_CCIR(rgba[0], rgba[1], rgba[2]);
- dtext->shadowcolor[1] = RGB_TO_U_CCIR(rgba[0], rgba[1], rgba[2], 0);
- dtext->shadowcolor[2] = RGB_TO_V_CCIR(rgba[0], rgba[1], rgba[2], 0);
- dtext->shadowcolor[3] = rgba[3];
+ if (!s->is_packed_rgb) {
+ uint8_t *rgba = s->fontcolor_rgba;
+ s->fontcolor[0] = RGB_TO_Y_CCIR(rgba[0], rgba[1], rgba[2]);
+ s->fontcolor[1] = RGB_TO_U_CCIR(rgba[0], rgba[1], rgba[2], 0);
+ s->fontcolor[2] = RGB_TO_V_CCIR(rgba[0], rgba[1], rgba[2], 0);
+ s->fontcolor[3] = rgba[3];
+ rgba = s->shadowcolor_rgba;
+ s->shadowcolor[0] = RGB_TO_Y_CCIR(rgba[0], rgba[1], rgba[2]);
+ s->shadowcolor[1] = RGB_TO_U_CCIR(rgba[0], rgba[1], rgba[2], 0);
+ s->shadowcolor[2] = RGB_TO_V_CCIR(rgba[0], rgba[1], rgba[2], 0);
+ s->shadowcolor[3] = rgba[3];
 }
 
- dtext->draw = 1;
+ s->draw = 1;
 
 return dtext_prepare_text(ctx);
 }
@@ -627,19 +618,19 @@
 (bitmap->buffer[(r) * bitmap->pitch + ((c)>>3)] & (0x80 >> ((c)&7))) * 255 : \
 bitmap->buffer[(r) * bitmap->pitch + (c)]
 
-#define SET_PIXEL_YUV(picref, yuva_color, val, x, y, hsub, vsub) { \
- luma_pos = ((x) ) + ((y) ) * picref->linesize[0]; \
+#define SET_PIXEL_YUV(frame, yuva_color, val, x, y, hsub, vsub) { \
+ luma_pos = ((x) ) + ((y) ) * frame->linesize[0]; \
 alpha = yuva_color[3] * (val) * 129; \
- picref->data[0][luma_pos] = (alpha * yuva_color[0] + (255*255*129 - alpha) * picref->data[0][luma_pos] ) >> 23; \
+ frame->data[0][luma_pos] = (alpha * yuva_color[0] + (255*255*129 - alpha) * frame->data[0][luma_pos] ) >> 23; \
 if (((x) & ((1<<(hsub)) - 1)) == 0 && ((y) & ((1<<(vsub)) - 1)) == 0) {\
- chroma_pos1 = ((x) >> (hsub)) + ((y) >> (vsub)) * picref->linesize[1]; \
- chroma_pos2 = ((x) >> (hsub)) + ((y) >> (vsub)) * picref->linesize[2]; \
- picref->data[1][chroma_pos1] = (alpha * yuva_color[1] + (255*255*129 - alpha) * picref->data[1][chroma_pos1]) >> 23; \
- picref->data[2][chroma_pos2] = (alpha * yuva_color[2] + (255*255*129 - alpha) * picref->data[2][chroma_pos2]) >> 23; \
+ chroma_pos1 = ((x) >> (hsub)) + ((y) >> (vsub)) * frame->linesize[1]; \
+ chroma_pos2 = ((x) >> (hsub)) + ((y) >> (vsub)) * frame->linesize[2]; \
+ frame->data[1][chroma_pos1] = (alpha * yuva_color[1] + (255*255*129 - alpha) * frame->data[1][chroma_pos1]) >> 23; \
+ frame->data[2][chroma_pos2] = (alpha * yuva_color[2] + (255*255*129 - alpha) * frame->data[2][chroma_pos2]) >> 23; \
 }\
 }
 
-static inline int draw_glyph_yuv(AVFilterBufferRef *picref, FT_Bitmap *bitmap, unsigned int x,
+static inline int draw_glyph_yuv(AVFrame *frame, FT_Bitmap *bitmap, unsigned int x,
 unsigned int y, unsigned int width, unsigned int height,
 const uint8_t yuva_color[4], int hsub, int vsub)
 {
@@ -654,22 +645,22 @@
 if (!src_val)
 continue;
 
- SET_PIXEL_YUV(picref, yuva_color, src_val, c+x, y+r, hsub, vsub);
+ SET_PIXEL_YUV(frame, yuva_color, src_val, c+x, y+r, hsub, vsub);
 }
 }
 
 return 0;
 }
 
-#define SET_PIXEL_RGB(picref, rgba_color, val, x, y, pixel_step, r_off, g_off, b_off, a_off) { \
- p = picref->data[0] + (x) * pixel_step + ((y) * picref->linesize[0]); \
+#define SET_PIXEL_RGB(frame, rgba_color, val, x, y, pixel_step, r_off, g_off, b_off, a_off) { \
+ p = frame->data[0] + (x) * pixel_step + ((y) * frame->linesize[0]); \
 alpha = rgba_color[3] * (val) * 129; \
 *(p+r_off) = (alpha * rgba_color[0] + (255*255*129 - alpha) * *(p+r_off)) >> 23; \
 *(p+g_off) = (alpha * rgba_color[1] + (255*255*129 - alpha) * *(p+g_off)) >> 23; \
 *(p+b_off) = (alpha * rgba_color[2] + (255*255*129 - alpha) * *(p+b_off)) >> 23; \
 }
 
-static inline int draw_glyph_rgb(AVFilterBufferRef *picref, FT_Bitmap *bitmap,
+static inline int draw_glyph_rgb(AVFrame *frame, FT_Bitmap *bitmap,
 unsigned int x, unsigned int y,
 unsigned int width, unsigned int height, int pixel_step,
 const uint8_t rgba_color[4], const uint8_t rgba_map[4])
@@ -685,7 +676,7 @@
 if (!src_val)
 continue;
 
- SET_PIXEL_RGB(picref, rgba_color, src_val, c+x, y+r, pixel_step,
+ SET_PIXEL_RGB(frame, rgba_color, src_val, c+x, y+r, pixel_step,
 rgba_map[0], rgba_map[1], rgba_map[2], rgba_map[3]);
 }
 }
@@ -693,7 +684,7 @@
 return 0;
 }
 
-static inline void drawbox(AVFilterBufferRef *picref, unsigned int x, unsigned int y,
+static inline void drawbox(AVFrame *frame, unsigned int x, unsigned int y,
 unsigned int width, unsigned int height,
 uint8_t *line[4], int pixel_step[4], uint8_t color[4],
 int hsub, int vsub, int is_rgba_packed, uint8_t rgba_map[4])
@@ -705,25 +696,25 @@
 uint8_t *p;
 for (j = 0; j < height; j++)
 for (i = 0; i < width; i++)
- SET_PIXEL_RGB(picref, color, 255, i+x, y+j, pixel_step[0],
+ SET_PIXEL_RGB(frame, color, 255, i+x, y+j, pixel_step[0],
 rgba_map[0], rgba_map[1], rgba_map[2], rgba_map[3]);
 } else {
 unsigned int luma_pos, chroma_pos1, chroma_pos2;
 for (j = 0; j < height; j++)
 for (i = 0; i < width; i++)
- SET_PIXEL_YUV(picref, color, 255, i+x, y+j, hsub, vsub);
+ SET_PIXEL_YUV(frame, color, 255, i+x, y+j, hsub, vsub);
 }
 } else {
- ff_draw_rectangle(picref->data, picref->linesize,
+ ff_draw_rectangle(frame->data, frame->linesize,
 line, pixel_step, hsub, vsub,
 x, y, width, height);
 }
 }
 
-static int draw_glyphs(DrawTextContext *dtext, AVFilterBufferRef *picref,
+static int draw_glyphs(DrawTextContext *s, AVFrame *frame,
 int width, int height, const uint8_t rgbcolor[4], const uint8_t yuvcolor[4], int x, int y)
 {
- char *text = HAVE_LOCALTIME_R ? dtext->expanded_text : dtext->text;
+ char *text = HAVE_LOCALTIME_R ? s->expanded_text : s->text;
 uint32_t code = 0;
 int i;
 uint8_t *p;
@@ -738,53 +729,53 @@
 continue;
 
 dummy.code = code;
- glyph = av_tree_find(dtext->glyphs, &dummy, (void *)glyph_cmp, NULL);
+ glyph = av_tree_find(s->glyphs, &dummy, (void *)glyph_cmp, NULL);
 
 if (glyph->bitmap.pixel_mode != FT_PIXEL_MODE_MONO &&
 glyph->bitmap.pixel_mode != FT_PIXEL_MODE_GRAY)
 return AVERROR(EINVAL);
 
- if (dtext->is_packed_rgb) {
- draw_glyph_rgb(picref, &glyph->bitmap,
- dtext->positions[i].x+x, dtext->positions[i].y+y, width, height,
- dtext->pixel_step[0], rgbcolor, dtext->rgba_map);
+ if (s->is_packed_rgb) {
+ draw_glyph_rgb(frame, &glyph->bitmap,
+ s->positions[i].x+x, s->positions[i].y+y, width, height,
+ s->pixel_step[0], rgbcolor, s->rgba_map);
 } else {
- draw_glyph_yuv(picref, &glyph->bitmap,
- dtext->positions[i].x+x, dtext->positions[i].y+y, width, height,
- yuvcolor, dtext->hsub, dtext->vsub);
+ draw_glyph_yuv(frame, &glyph->bitmap,
+ s->positions[i].x+x, s->positions[i].y+y, width, height,
+ yuvcolor, s->hsub, s->vsub);
 }
 }
 
 return 0;
 }
 
-static int draw_text(AVFilterContext *ctx, AVFilterBufferRef *picref,
+static int draw_text(AVFilterContext *ctx, AVFrame *frame,
 int width, int height)
 {
- DrawTextContext *dtext = ctx->priv;
+ DrawTextContext *s = ctx->priv;
 int ret;
 
 /* draw box */
- if (dtext->draw_box)
- drawbox(picref, dtext->x, dtext->y, dtext->w, dtext->h,
- dtext->box_line, dtext->pixel_step, dtext->boxcolor,
- dtext->hsub, dtext->vsub, dtext->is_packed_rgb,
- dtext->rgba_map);
-
- if (dtext->shadowx || dtext->shadowy) {
- if ((ret = draw_glyphs(dtext, picref, width, height,
- dtext->shadowcolor_rgba,
- dtext->shadowcolor,
- dtext->x + dtext->shadowx,
- dtext->y + dtext->shadowy)) < 0)
+ if (s->draw_box)
+ drawbox(frame, s->x, s->y, s->w, s->h,
+ s->box_line, s->pixel_step, s->boxcolor,
+ s->hsub, s->vsub, s->is_packed_rgb,
+ s->rgba_map);
+
+ if (s->shadowx || s->shadowy) {
+ if ((ret = draw_glyphs(s, frame, width, height,
+ s->shadowcolor_rgba,
+ s->shadowcolor,
+ s->x + s->shadowx,
+ s->y + s->shadowy)) < 0)
 return ret;
 }
 
- if ((ret = draw_glyphs(dtext, picref, width, height,
- dtext->fontcolor_rgba,
- dtext->fontcolor,
- dtext->x,
- dtext->y)) < 0)
+ if ((ret = draw_glyphs(s, frame, width, height,
+ s->fontcolor_rgba,
+ s->fontcolor,
+ s->x,
+ s->y)) < 0)
 return ret;
 
 return 0;
@@ -805,52 +796,52 @@
 return ret;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
+static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 {
 AVFilterContext *ctx = inlink->dst;
- DrawTextContext *dtext = ctx->priv;
+ DrawTextContext *s = ctx->priv;
 int ret = 0;
 
 if ((ret = dtext_prepare_text(ctx)) < 0) {
 av_log(ctx, AV_LOG_ERROR, "Can't draw text\n");
- avfilter_unref_bufferp(&frame);
+ av_frame_free(&frame);
 return ret;
 }
 
- dtext->var_values[VAR_T] = frame->pts == AV_NOPTS_VALUE ?
+ s->var_values[VAR_T] = frame->pts == AV_NOPTS_VALUE ?
 NAN : frame->pts * av_q2d(inlink->time_base);
- dtext->var_values[VAR_X] =
- av_expr_eval(dtext->x_pexpr, dtext->var_values, &dtext->prng);
- dtext->var_values[VAR_Y] =
- av_expr_eval(dtext->y_pexpr, dtext->var_values, &dtext->prng);
- dtext->var_values[VAR_X] =
- av_expr_eval(dtext->x_pexpr, dtext->var_values, &dtext->prng);
-
- dtext->draw = av_expr_eval(dtext->d_pexpr, dtext->var_values, &dtext->prng);
-
- normalize_double(&dtext->x, dtext->var_values[VAR_X]);
- normalize_double(&dtext->y, dtext->var_values[VAR_Y]);
-
- if (dtext->fix_bounds) {
- if (dtext->x < 0) dtext->x = 0;
- if (dtext->y < 0) dtext->y = 0;
- if ((unsigned)dtext->x + (unsigned)dtext->w > inlink->w)
- dtext->x = inlink->w - dtext->w;
- if ((unsigned)dtext->y + (unsigned)dtext->h > inlink->h)
- dtext->y = inlink->h - dtext->h;
+ s->var_values[VAR_X] =
+ av_expr_eval(s->x_pexpr, s->var_values, &s->prng);
+ s->var_values[VAR_Y] =
+ av_expr_eval(s->y_pexpr, s->var_values, &s->prng);
+ s->var_values[VAR_X] =
+ av_expr_eval(s->x_pexpr, s->var_values, &s->prng);
+
+ s->draw = av_expr_eval(s->d_pexpr, s->var_values, &s->prng);
+
+ normalize_double(&s->x, s->var_values[VAR_X]);
+ normalize_double(&s->y, s->var_values[VAR_Y]);
+
+ if (s->fix_bounds) {
+ if (s->x < 0) s->x = 0;
+ if (s->y < 0) s->y = 0;
+ if ((unsigned)s->x + (unsigned)s->w > inlink->w)
+ s->x = inlink->w - s->w;
+ if ((unsigned)s->y + (unsigned)s->h > inlink->h)
+ s->y = inlink->h - s->h;
 }
 
- dtext->x &= ~((1 << dtext->hsub) - 1);
- dtext->y &= ~((1 << dtext->vsub) - 1);
+ s->x &= ~((1 << s->hsub) - 1);
+ s->y &= ~((1 << s->vsub) - 1);
 
 av_dlog(ctx, "n:%d t:%f x:%d y:%d x+w:%d y+h:%d\n",
- (int)dtext->var_values[VAR_N], dtext->var_values[VAR_T],
- dtext->x, dtext->y, dtext->x+dtext->w, dtext->y+dtext->h);
+ (int)s->var_values[VAR_N], s->var_values[VAR_T],
+ s->x, s->y, s->x+s->w, s->y+s->h);
 
- if (dtext->draw)
- draw_text(inlink->dst, frame, frame->video->w, frame->video->h);
+ if (s->draw)
+ draw_text(inlink->dst, frame, frame->width, frame->height);
 
- dtext->var_values[VAR_N] += 1.0;
+ s->var_values[VAR_N] += 1.0;
 
 return ff_filter_frame(inlink->dst->outputs[0], frame);
 }
@@ -862,9 +853,7 @@
 .get_video_buffer = ff_null_get_video_buffer,
 .filter_frame = filter_frame,
 .config_props = config_input,
- .min_perms = AV_PERM_WRITE |
- AV_PERM_READ,
- .rej_perms = AV_PERM_PRESERVE
+ .needs_writable = 1,
 },
 { NULL }
 };
@@ -877,10 +866,11 @@
 { 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),
+ .priv_class = &drawtext_class,
 .init = init,
 .uninit = uninit,
 .query_formats = query_formats,

libav-v9.6.tar.bz2/libavfilter/vf_fade.c -> libav-v10.1.tar.bz2/libavfilter/vf_fade.c Changed

@@ -26,48 +26,42 @@
 */
 
 #include "libavutil/common.h"
+#include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
 #include "video.h"
 
+#define FADE_IN 0
+#define FADE_OUT 1
+
 typedef struct {
+ const AVClass *class;
+ int type;
 int factor, fade_per_frame;
- unsigned int frame_index, start_frame, stop_frame;
+ int start_frame, nb_frames;
+ unsigned int frame_index, stop_frame;
 int hsub, vsub, bpp;
 } FadeContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
- FadeContext *fade = ctx->priv;
- unsigned int nb_frames;
- char in_out[4];
-
- if (!args ||
- sscanf(args, " %3[^:]:%u:%u", in_out, &fade->start_frame, &nb_frames) != 3) {
- av_log(ctx, AV_LOG_ERROR,
- "Expected 3 arguments '(in|out):#:#':'%s'\n", args);
- return AVERROR(EINVAL);
- }
-
- nb_frames = nb_frames ? nb_frames : 1;
- fade->fade_per_frame = (1 << 16) / nb_frames;
- if (!strcmp(in_out, "in"))
- fade->factor = 0;
- else if (!strcmp(in_out, "out")) {
- fade->fade_per_frame = -fade->fade_per_frame;
- fade->factor = (1 << 16);
- } else {
- av_log(ctx, AV_LOG_ERROR,
- "first argument must be 'in' or 'out':'%s'\n", in_out);
- return AVERROR(EINVAL);
+ FadeContext *s = ctx->priv;
+
+ s->fade_per_frame = (1 << 16) / s->nb_frames;
+ if (s->type == FADE_IN) {
+ s->factor = 0;
+ } else if (s->type == FADE_OUT) {
+ s->fade_per_frame = -s->fade_per_frame;
+ s->factor = (1 << 16);
 }
- fade->stop_frame = fade->start_frame + nb_frames;
+ s->stop_frame = s->start_frame + s->nb_frames;
 
 av_log(ctx, AV_LOG_VERBOSE,
 "type:%s start_frame:%d nb_frames:%d\n",
- in_out, fade->start_frame, nb_frames);
+ s->type == FADE_IN ? "in" : "out", s->start_frame,
+ s->nb_frames);
 return 0;
 }
 
@@ -88,61 +82,112 @@
 
 static int config_props(AVFilterLink *inlink)
 {
- FadeContext *fade = inlink->dst->priv;
+ FadeContext *s = inlink->dst->priv;
 const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(inlink->format);
 
- fade->hsub = pixdesc->log2_chroma_w;
- fade->vsub = pixdesc->log2_chroma_h;
+ s->hsub = pixdesc->log2_chroma_w;
+ s->vsub = pixdesc->log2_chroma_h;
+
+ s->bpp = av_get_bits_per_pixel(pixdesc) >> 3;
+ return 0;
+}
+
+static int filter_slice_luma(AVFilterContext *ctx, void *arg, int jobnr,
+ int nb_jobs)
+{
+ FadeContext *s = ctx->priv;
+ AVFrame *frame = arg;
+ int slice_h = frame->height / nb_jobs;
+ int slice_start = jobnr * slice_h;
+ int slice_end = (jobnr == nb_jobs - 1) ? frame->height : (jobnr + 1) * slice_h;
+ int i, j;
+
+ for (i = slice_start; i < slice_end; i++) {
+ uint8_t *p = frame->data[0] + i * frame->linesize[0];
+ for (j = 0; j < frame->width * s->bpp; j++) {
+ /* s->factor is using 16 lower-order bits for decimal
+ * places. 32768 = 1 << 15, it is an integer representation
+ * of 0.5 and is for rounding. */
+ *p = (*p * s->factor + 32768) >> 16;
+ p++;
+ }
+ }
 
- fade->bpp = av_get_bits_per_pixel(pixdesc) >> 3;
 return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
+static int filter_slice_chroma(AVFilterContext *ctx, void *arg, int jobnr,
+ int nb_jobs)
 {
- FadeContext *fade = inlink->dst->priv;
- uint8_t *p;
+ FadeContext *s = ctx->priv;
+ AVFrame *frame = arg;
+ int slice_h = FFALIGN(frame->height / nb_jobs, 1 << s->vsub);
+ int slice_start = jobnr * slice_h;
+ int slice_end = (jobnr == nb_jobs - 1) ? frame->height : (jobnr + 1) * slice_h;
 int i, j, plane;
 
- if (fade->factor < UINT16_MAX) {
- /* luma or rgb plane */
- for (i = 0; i < frame->video->h; i++) {
- p = frame->data[0] + i * frame->linesize[0];
- for (j = 0; j < inlink->w * fade->bpp; j++) {
- /* fade->factor is using 16 lower-order bits for decimal
- * places. 32768 = 1 << 15, it is an integer representation
- * of 0.5 and is for rounding. */
- *p = (*p * fade->factor + 32768) >> 16;
+ for (plane = 1; plane < 3; plane++) {
+ for (i = slice_start; i < slice_end; i++) {
+ uint8_t *p = frame->data[plane] + (i >> s->vsub) * frame->linesize[plane];
+ for (j = 0; j < frame->width >> s->hsub; j++) {
+ /* 8421367 = ((128 << 1) + 1) << 15. It is an integer
+ * representation of 128.5. The .5 is for rounding
+ * purposes. */
+ *p = ((*p - 128) * s->factor + 8421367) >> 16;
 p++;
 }
 }
+ }
+
+ return 0;
+}
+
+static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
+{
+ AVFilterContext *ctx = inlink->dst;
+ FadeContext *s = ctx->priv;
+
+ if (s->factor < UINT16_MAX) {
+ /* luma or rgb plane */
+ ctx->internal->execute(ctx, filter_slice_luma, frame, NULL,
+ FFMIN(frame->height, ctx->graph->nb_threads));
 
 if (frame->data[1] && frame->data[2]) {
 /* chroma planes */
- for (plane = 1; plane < 3; plane++) {
- for (i = 0; i < frame->video->h; i++) {
- p = frame->data[plane] + (i >> fade->vsub) * frame->linesize[plane];
- for (j = 0; j < inlink->w >> fade->hsub; j++) {
- /* 8421367 = ((128 << 1) + 1) << 15. It is an integer
- * representation of 128.5. The .5 is for rounding
- * purposes. */
- *p = ((*p - 128) * fade->factor + 8421367) >> 16;
- p++;
- }
- }
- }
+ ctx->internal->execute(ctx, filter_slice_chroma, frame, NULL,
+ FFMIN(frame->height, ctx->graph->nb_threads));
 }
 }
 
- if (fade->frame_index >= fade->start_frame &&
- fade->frame_index <= fade->stop_frame)
- fade->factor += fade->fade_per_frame;
- fade->factor = av_clip_uint16(fade->factor);
- fade->frame_index++;
+ if (s->frame_index >= s->start_frame &&
+ s->frame_index <= s->stop_frame)
+ s->factor += s->fade_per_frame;
+ s->factor = av_clip_uint16(s->factor);
+ s->frame_index++;
 
 return ff_filter_frame(inlink->dst->outputs[0], frame);
 }
 
+#define OFFSET(x) offsetof(FadeContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "type", "'in' or 'out' for fade-in/fade-out", OFFSET(type), AV_OPT_TYPE_INT, { .i64 = FADE_IN }, FADE_IN, FADE_OUT, FLAGS, "type" },
+ { "in", "fade-in", 0, AV_OPT_TYPE_CONST, { .i64 = FADE_IN }, .unit = "type" },
+ { "out", "fade-out", 0, AV_OPT_TYPE_CONST, { .i64 = FADE_OUT }, .unit = "type" },
+ { "start_frame", "Number of the first frame to which to apply the effect.",
+ OFFSET(start_frame), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS },
+ { "nb_frames", "Number of frames to which the effect should be applied.",
+ OFFSET(nb_frames), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, INT_MAX, FLAGS },
+ { NULL },
+};
+
+static const AVClass fade_class = {
+ .class_name = "fade",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_fade_inputs[] = {
 {
 .name = "default",
@@ -150,8 +195,7 @@
 .config_props = config_props,
 .get_video_buffer = ff_null_get_video_buffer,
 .filter_frame = filter_frame,
- .min_perms = AV_PERM_READ | AV_PERM_WRITE,
- .rej_perms = AV_PERM_PRESERVE,
+ .needs_writable = 1,
 },
 { NULL }
 };
@@ -164,13 +208,15 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_fade = {
+AVFilter ff_vf_fade = {
 .name = "fade",
 .description = NULL_IF_CONFIG_SMALL("Fade in/out input video"),
 .init = init,
 .priv_size = sizeof(FadeContext),
+ .priv_class = &fade_class,
 .query_formats = query_formats,
 
 .inputs = avfilter_vf_fade_inputs,
 .outputs = avfilter_vf_fade_outputs,
+ .flags = AVFILTER_FLAG_SLICE_THREADS,
 };

libav-v9.6.tar.bz2/libavfilter/vf_fieldorder.c -> libav-v10.1.tar.bz2/libavfilter/vf_fieldorder.c Changed

@@ -23,51 +23,24 @@
 * video field order filter, heavily influenced by vf_pad.c
 */
 
-/* #define DEBUG */
-
 #include <stdio.h>
 #include <string.h>
 
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
+#include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
 #include "video.h"
 
-typedef struct
-{
- unsigned int dst_tff; ///< output bff/tff
+typedef struct {
+ const AVClass *class;
+ int dst_tff; ///< output bff/tff
 int line_size[4]; ///< bytes of pixel data per line for each plane
 } FieldOrderContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
-{
- FieldOrderContext *fieldorder = ctx->priv;
-
- const char *tff = "tff";
- const char *bff = "bff";
-
- if (!args) {
- fieldorder->dst_tff = 1;
- } else if (sscanf(args, "%u", &fieldorder->dst_tff) == 1) {
- fieldorder->dst_tff = !!fieldorder->dst_tff;
- } else if (!strcmp(tff, args)) {
- fieldorder->dst_tff = 1;
- } else if (!strcmp(bff, args)) {
- fieldorder->dst_tff = 0;
- } else {
- av_log(ctx, AV_LOG_ERROR, "Invalid argument '%s'.\n", args);
- return AVERROR(EINVAL);
- }
-
- av_log(ctx, AV_LOG_VERBOSE, "output field order: %s\n",
- fieldorder->dst_tff ? tff : bff);
-
- return 0;
-}
-
 static int query_formats(AVFilterContext *ctx)
 {
 AVFilterFormats *formats;
@@ -80,8 +53,8 @@
 formats = NULL;
 for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++) {
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
- if (!(desc->flags & PIX_FMT_HWACCEL ||
- desc->flags & PIX_FMT_BITSTREAM) &&
+ if (!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL ||
+ desc->flags & AV_PIX_FMT_FLAG_BITSTREAM) &&
 desc->nb_components && !desc->log2_chroma_h &&
 (ret = ff_add_format(&formats, pix_fmt)) < 0) {
 ff_formats_unref(&formats);
@@ -97,31 +70,21 @@
 
 static int config_input(AVFilterLink *inlink)
 {
- AVFilterContext *ctx = inlink->dst;
- FieldOrderContext *fieldorder = ctx->priv;
+ AVFilterContext *ctx = inlink->dst;
+ FieldOrderContext *s = ctx->priv;
 int plane;
 
 /** full an array with the number of bytes that the video
 * data occupies per line for each plane of the input video */
 for (plane = 0; plane < 4; plane++) {
- fieldorder->line_size[plane] = av_image_get_linesize(
- inlink->format,
- inlink->w,
- plane);
+ s->line_size[plane] = av_image_get_linesize(inlink->format, inlink->w,
+ plane);
 }
 
 return 0;
 }
 
-static AVFilterBufferRef *get_video_buffer(AVFilterLink *inlink, int perms, int w, int h)
-{
- AVFilterContext *ctx = inlink->dst;
- AVFilterLink *outlink = ctx->outputs[0];
-
- return ff_get_video_buffer(outlink, perms, w, h);
-}
-
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
+static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 {
 AVFilterContext *ctx = inlink->dst;
 FieldOrderContext *s = ctx->priv;
@@ -129,14 +92,19 @@
 int h, plane, line_step, line_size, line;
 uint8_t *data;
 
- if (!frame->video->interlaced ||
- frame->video->top_field_first == s->dst_tff)
+ if (!frame->interlaced_frame ||
+ frame->top_field_first == s->dst_tff) {
+ av_log(ctx, AV_LOG_VERBOSE,
+ "Skipping %s.\n",
+ frame->interlaced_frame ?
+ "frame with same field order" : "progressive frame");
 return ff_filter_frame(outlink, frame);
+ }
 
 av_dlog(ctx,
 "picture will move %s one line\n",
 s->dst_tff ? "up" : "down");
- h = frame->video->h;
+ h = frame->height;
 for (plane = 0; plane < 4 && frame->data[plane]; plane++) {
 line_step = frame->linesize[plane];
 line_size = s->line_size[plane];
@@ -148,7 +116,7 @@
 * The new last line is created as a copy of the
 * penultimate line from that field. */
 for (line = 0; line < h; line++) {
- if (1 + line < frame->video->h) {
+ if (1 + line < frame->height) {
 memcpy(data, data + line_step, line_size);
 } else {
 memcpy(data, data - line_step - line_step, line_size);
@@ -172,20 +140,34 @@
 }
 }
 }
- frame->video->top_field_first = s->dst_tff;
+ frame->top_field_first = s->dst_tff;
 
 return ff_filter_frame(outlink, frame);
 }
 
+#define OFFSET(x) offsetof(FieldOrderContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "order", "output field order", OFFSET(dst_tff), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, FLAGS, "order" },
+ { "bff", "bottom field first", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, .unit = "order" },
+ { "tff", "top field first", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, .unit = "order" },
+ { NULL },
+};
+
+static const AVClass fieldorder_class = {
+ .class_name = "fieldorder",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_fieldorder_inputs[] = {
 {
 .name = "default",
 .type = AVMEDIA_TYPE_VIDEO,
 .config_props = config_input,
- .get_video_buffer = get_video_buffer,
 .filter_frame = filter_frame,
- .min_perms = AV_PERM_READ | AV_PERM_WRITE,
- .rej_perms = AV_PERM_REUSE2 | AV_PERM_PRESERVE,
+ .needs_writable = 1,
 },
 { NULL }
 };
@@ -198,11 +180,11 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_fieldorder = {
+AVFilter ff_vf_fieldorder = {
 .name = "fieldorder",
 .description = NULL_IF_CONFIG_SMALL("Set the field order."),
- .init = init,
 .priv_size = sizeof(FieldOrderContext),
+ .priv_class = &fieldorder_class,
 .query_formats = query_formats,
 .inputs = avfilter_vf_fieldorder_inputs,
 .outputs = avfilter_vf_fieldorder_outputs,

libav-v9.6.tar.bz2/libavfilter/vf_format.c -> libav-v10.1.tar.bz2/libavfilter/vf_format.c Changed

@@ -28,12 +28,16 @@
 #include "libavutil/internal.h"
 #include "libavutil/mem.h"
 #include "libavutil/pixdesc.h"
+#include "libavutil/opt.h"
+
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
 #include "video.h"
 
 typedef struct {
+ const AVClass *class;
+ char *pix_fmts;
 /**
 * List of flags telling if a given image format has been listed
 * as argument to the filter.
@@ -43,17 +47,17 @@
 
 #define AV_PIX_FMT_NAME_MAXSIZE 32
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
- FormatContext *format = ctx->priv;
+ FormatContext *s = ctx->priv;
 const char *cur, *sep;
 char pix_fmt_name[AV_PIX_FMT_NAME_MAXSIZE];
 int pix_fmt_name_len;
 enum AVPixelFormat pix_fmt;
 
 /* parse the list of formats */
- for (cur = args; cur; cur = sep ? sep+1 : NULL) {
- if (!(sep = strchr(cur, ':')))
+ for (cur = s->pix_fmts; cur; cur = sep ? sep + 1 : NULL) {
+ if (!(sep = strchr(cur, '|')))
 pix_fmt_name_len = strlen(cur);
 else
 pix_fmt_name_len = sep - cur;
@@ -71,27 +75,35 @@
 return -1;
 }
 
- format->listed_pix_fmt_flags[pix_fmt] = 1;
+ s->listed_pix_fmt_flags[pix_fmt] = 1;
 }
 
 return 0;
 }
 
-static AVFilterFormats *make_format_list(FormatContext *format, int flag)
+static AVFilterFormats *make_format_list(FormatContext *s, int flag)
 {
- AVFilterFormats *formats;
+ AVFilterFormats *formats = NULL;
 enum AVPixelFormat pix_fmt;
 
- formats = av_mallocz(sizeof(AVFilterFormats));
- formats->formats = av_malloc(sizeof(enum AVPixelFormat) * AV_PIX_FMT_NB);
-
 for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++)
- if (format->listed_pix_fmt_flags[pix_fmt] == flag)
- formats->formats[formats->format_count++] = pix_fmt;
+ if (s->listed_pix_fmt_flags[pix_fmt] == flag) {
+ int ret = ff_add_format(&formats, pix_fmt);
+ if (ret < 0) {
+ ff_formats_unref(&formats);
+ return NULL;
+ }
+ }
 
 return formats;
 }
 
+#define OFFSET(x) offsetof(FormatContext, x)
+static const AVOption options[] = {
+ { "pix_fmts", "A '|'-separated list of pixel formats", OFFSET(pix_fmts), AV_OPT_TYPE_STRING, .flags = AV_OPT_FLAG_VIDEO_PARAM },
+ { NULL },
+};
+
 #if CONFIG_FORMAT_FILTER
 static int query_formats_format(AVFilterContext *ctx)
 {
@@ -99,6 +111,13 @@
 return 0;
 }
 
+static const AVClass format_class = {
+ .class_name = "format",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_format_inputs[] = {
 {
 .name = "default",
@@ -116,7 +135,7 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_format = {
+AVFilter ff_vf_format = {
 .name = "format",
 .description = NULL_IF_CONFIG_SMALL("Convert the input video to one of the specified pixel formats."),
 
@@ -125,6 +144,7 @@
 .query_formats = query_formats_format,
 
 .priv_size = sizeof(FormatContext),
+ .priv_class = &format_class,
 
 .inputs = avfilter_vf_format_inputs,
 .outputs = avfilter_vf_format_outputs,
@@ -138,6 +158,13 @@
 return 0;
 }
 
+static const AVClass noformat_class = {
+ .class_name = "noformat",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_noformat_inputs[] = {
 {
 .name = "default",
@@ -155,7 +182,7 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_noformat = {
+AVFilter ff_vf_noformat = {
 .name = "noformat",
 .description = NULL_IF_CONFIG_SMALL("Force libavfilter not to use any of the specified pixel formats for the input to the next filter."),
 
@@ -164,6 +191,7 @@
 .query_formats = query_formats_noformat,
 
 .priv_size = sizeof(FormatContext),
+ .priv_class = &noformat_class,
 
 .inputs = avfilter_vf_noformat_inputs,
 .outputs = avfilter_vf_noformat_outputs,

libav-v9.6.tar.bz2/libavfilter/vf_fps.c -> libav-v10.1.tar.bz2/libavfilter/vf_fps.c Changed

@@ -21,6 +21,9 @@
 * a filter enforcing given constant framerate
 */
 
+#include <float.h>
+#include <stdint.h>
+
 #include "libavutil/common.h"
 #include "libavutil/fifo.h"
 #include "libavutil/mathematics.h"
@@ -40,6 +43,8 @@
 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
+
 AVRational framerate; ///< target framerate
 char *fps; ///< a string describing target framerate
 
@@ -54,6 +59,7 @@
 #define V AV_OPT_FLAG_VIDEO_PARAM
 static const AVOption options[] = {
 { "fps", "A string describing desired output framerate", OFFSET(fps), AV_OPT_TYPE_STRING, { .str = "25" }, .flags = V },
+ { "start_time", "Assume the first PTS should be this value.", OFFSET(start_time), AV_OPT_TYPE_DOUBLE, { .dbl = DBL_MAX}, -DBL_MAX, DBL_MAX, V },
 { NULL },
 };
 
@@ -64,29 +70,22 @@
 .version = LIBAVUTIL_VERSION_INT,
 };
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
 FPSContext *s = ctx->priv;
 int ret;
 
- s->class = &class;
- av_opt_set_defaults(s);
-
- if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing the options string %s.\n",
- args);
- return ret;
- }
-
 if ((ret = av_parse_video_rate(&s->framerate, s->fps)) < 0) {
 av_log(ctx, AV_LOG_ERROR, "Error parsing framerate %s.\n", s->fps);
 return ret;
 }
- av_opt_free(s);
 
- if (!(s->fifo = av_fifo_alloc(2*sizeof(AVFilterBufferRef*))))
+ 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);
 return 0;
 }
@@ -94,9 +93,9 @@
 static void flush_fifo(AVFifoBuffer *fifo)
 {
 while (av_fifo_size(fifo)) {
- AVFilterBufferRef *tmp;
+ AVFrame *tmp;
 av_fifo_generic_read(fifo, &tmp, sizeof(tmp), NULL);
- avfilter_unref_buffer(tmp);
+ av_frame_free(&tmp);
 }
 }
 
@@ -104,6 +103,7 @@
 {
 FPSContext *s = ctx->priv;
 if (s->fifo) {
+ s->drop += av_fifo_size(s->fifo) / sizeof(AVFilterBufferRef*);
 flush_fifo(s->fifo);
 av_fifo_free(s->fifo);
 }
@@ -119,7 +119,6 @@
 link->time_base = (AVRational){ s->framerate.den, s->framerate.num };
 link->w = link->src->inputs[0]->w;
 link->h = link->src->inputs[0]->h;
- s->pts = AV_NOPTS_VALUE;
 
 return 0;
 }
@@ -138,7 +137,7 @@
 if (ret == AVERROR_EOF && av_fifo_size(s->fifo)) {
 int i;
 for (i = 0; av_fifo_size(s->fifo); i++) {
- AVFilterBufferRef *buf;
+ AVFrame *buf;
 
 av_fifo_generic_read(s->fifo, &buf, sizeof(buf), NULL);
 buf->pts = av_rescale_q(s->first_pts, ctx->inputs[0]->time_base,
@@ -155,13 +154,13 @@
 return ret;
 }
 
-static int write_to_fifo(AVFifoBuffer *fifo, AVFilterBufferRef *buf)
+static int write_to_fifo(AVFifoBuffer *fifo, AVFrame *buf)
 {
 int ret;
 
 if (!av_fifo_space(fifo) &&
 (ret = av_fifo_realloc2(fifo, 2*av_fifo_size(fifo)))) {
- avfilter_unref_bufferp(&buf);
+ av_frame_free(&buf);
 return ret;
 }
 
@@ -169,7 +168,7 @@
 return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
+static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
 {
 AVFilterContext *ctx = inlink->dst;
 FPSContext *s = ctx->priv;
@@ -185,11 +184,21 @@
 if (ret < 0)
 return ret;
 
- s->first_pts = s->pts = buf->pts;
+ if (s->start_time != DBL_MAX) {
+ 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,
+ 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;
+ }
 } else {
 av_log(ctx, AV_LOG_WARNING, "Discarding initial frame(s) with no "
 "timestamp.\n");
- avfilter_unref_buffer(buf);
+ av_frame_free(&buf);
 s->drop++;
 }
 return 0;
@@ -206,8 +215,8 @@
 
 if (delta < 1) {
 /* drop the frame and everything buffered except the first */
- AVFilterBufferRef *tmp;
- int drop = av_fifo_size(s->fifo)/sizeof(AVFilterBufferRef*);
+ AVFrame *tmp;
+ int drop = av_fifo_size(s->fifo)/sizeof(AVFrame*);
 
 av_log(ctx, AV_LOG_DEBUG, "Dropping %d frame(s).\n", drop);
 s->drop += drop;
@@ -216,18 +225,18 @@
 flush_fifo(s->fifo);
 ret = write_to_fifo(s->fifo, tmp);
 
- avfilter_unref_buffer(buf);
+ av_frame_free(&buf);
 return ret;
 }
 
 /* can output >= 1 frames */
 for (i = 0; i < delta; i++) {
- AVFilterBufferRef *buf_out;
+ AVFrame *buf_out;
 av_fifo_generic_read(s->fifo, &buf_out, sizeof(buf_out), NULL);
 
 /* duplicate the frame if needed */
 if (!av_fifo_size(s->fifo) && i < delta - 1) {
- AVFilterBufferRef *dup = avfilter_ref_buffer(buf_out, AV_PERM_READ);
+ AVFrame *dup = av_frame_clone(buf_out);
 
 av_log(ctx, AV_LOG_DEBUG, "Duplicating frame.\n");
 if (dup)
@@ -236,8 +245,8 @@
 ret = AVERROR(ENOMEM);
 
 if (ret < 0) {
- avfilter_unref_bufferp(&buf_out);
- avfilter_unref_bufferp(&buf);
+ av_frame_free(&buf_out);
+ av_frame_free(&buf);
 return ret;
 }
 
@@ -248,7 +257,7 @@
 outlink->time_base) + s->frames_out;
 
 if ((ret = ff_filter_frame(outlink, buf_out)) < 0) {
- avfilter_unref_bufferp(&buf);
+ av_frame_free(&buf);
 return ret;
 }
 
@@ -281,7 +290,7 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_fps = {
+AVFilter ff_vf_fps = {
 .name = "fps",
 .description = NULL_IF_CONFIG_SMALL("Force constant framerate"),
 
@@ -289,6 +298,7 @@
 .uninit = uninit,
 
 .priv_size = sizeof(FPSContext),
+ .priv_class = &class,
 
 .inputs = avfilter_vf_fps_inputs,
 .outputs = avfilter_vf_fps_outputs,

libav-v10.1.tar.bz2/libavfilter/vf_framepack.c Added

@@ -0,0 +1,363 @@
+/*
+ * Copyright (c) 2013 Vittorio Giovara
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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,
+};

libav-v9.6.tar.bz2/libavfilter/vf_frei0r.c -> libav-v10.1.tar.bz2/libavfilter/vf_frei0r.c Changed

@@ -22,8 +22,6 @@
 * frei0r wrapper
 */
 
-/* #define DEBUG */
-
 #include <dlfcn.h>
 #include <frei0r.h>
 #include <stdio.h>
@@ -35,6 +33,7 @@
 #include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/mem.h"
+#include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
 #include "avfilter.h"
 #include "formats.h"
@@ -53,6 +52,7 @@
 typedef void (*f0r_get_param_value_f)(f0r_instance_t instance, f0r_param_t param, int param_index);
 
 typedef struct Frei0rContext {
+ const AVClass *class;
 f0r_update_f update;
 void *dl_handle; /* dynamic library handle */
 f0r_instance_t instance;
@@ -64,7 +64,11 @@
 f0r_construct_f construct;
 f0r_destruct_f destruct;
 f0r_deinit_f deinit;
- char params[256];
+
+ char *dl_name;
+ char *params;
+ char *size;
+ char *framerate;
 
 /* only used by the source */
 int w, h;
@@ -74,16 +78,16 @@
 
 static void *load_sym(AVFilterContext *ctx, const char *sym_name)
 {
- Frei0rContext *frei0r = ctx->priv;
- void *sym = dlsym(frei0r->dl_handle, sym_name);
+ 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;
 }
 
 static int set_param(AVFilterContext *ctx, f0r_param_info_t info, int index, char *param)
 {
- Frei0rContext *frei0r = ctx->priv;
+ Frei0rContext *s = ctx->priv;
 union {
 double d;
 f0r_param_color_t col;
@@ -121,29 +125,29 @@
 break;
 }
 
- frei0r->set_param_value(frei0r->instance, &val, index);
+ s->set_param_value(s->instance, &val, index);
 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);
 }
 
 static int set_params(AVFilterContext *ctx, const char *params)
 {
- Frei0rContext *frei0r = ctx->priv;
+ Frei0rContext *s = ctx->priv;
 int i;
 
- for (i = 0; i < frei0r->plugin_info.num_params; i++) {
+ for (i = 0; i < s->plugin_info.num_params; i++) {
 f0r_param_info_t info;
 char *param;
 int ret;
 
- frei0r->get_param_info(&info, i);
+ s->get_param_info(&info, i);
 
 if (*params) {
- if (!(param = av_get_token(&params, ":")))
+ if (!(param = av_get_token(&params, "|")))
 return AVERROR(ENOMEM);
 params++; /* skip ':' */
 ret = set_param(ctx, info, i, param);
@@ -173,32 +177,32 @@
 
 case F0R_PARAM_BOOL:
 v = &d;
- frei0r->get_param_value(frei0r->instance, v, i);
+ s->get_param_value(s->instance, v, i);
 av_log(ctx, AV_LOG_DEBUG, "%s", d >= 0.5 && d <= 1.0 ? "y" : "n");
 break;
 case F0R_PARAM_DOUBLE:
 v = &d;
- frei0r->get_param_value(frei0r->instance, v, i);
+ s->get_param_value(s->instance, v, i);
 av_log(ctx, AV_LOG_DEBUG, "%f", d);
 break;
 case F0R_PARAM_COLOR:
 v = &col;
- frei0r->get_param_value(frei0r->instance, v, i);
+ s->get_param_value(s->instance, v, i);
 av_log(ctx, AV_LOG_DEBUG, "%f/%f/%f", col.r, col.g, col.b);
 break;
 case F0R_PARAM_POSITION:
 v = &pos;
- frei0r->get_param_value(frei0r->instance, v, i);
+ s->get_param_value(s->instance, v, i);
 av_log(ctx, AV_LOG_DEBUG, "%f/%f", pos.x, pos.y);
 break;
 default: /* F0R_PARAM_STRING */
 v = s;
- frei0r->get_param_value(frei0r->instance, v, i);
- av_log(ctx, AV_LOG_DEBUG, "'%s'\n", s);
+ s->get_param_value(s->instance, v, i);
+ 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;
@@ -209,62 +213,73 @@
 char path[1024];
 
 snprintf(path, sizeof(path), "%s%s%s", prefix, name, SLIBSUF);
- 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);
 return dlopen(path, RTLD_NOW|RTLD_LOCAL);
 }
 
 static av_cold int frei0r_init(AVFilterContext *ctx,
 const char *dl_name, int type)
 {
- Frei0rContext *frei0r = ctx->priv;
+ Frei0rContext *s = ctx->priv;
 f0r_init_f f0r_init;
 f0r_get_plugin_info_f f0r_get_plugin_info;
 f0r_plugin_info_t *pi;
 char *path;
 
+ if (!dl_name) {
+ av_log(ctx, AV_LOG_ERROR, "No filter name provided.\n");
+ return AVERROR(EINVAL);
+ }
+
 /* see: http://piksel.org/frei0r/1.2/spec/1.2/spec/group__pluglocations.html */
- if ((path = av_strdup(getenv("FREI0R_PATH")))) {
- char *p, *ptr = NULL;
- for (p = path; p = strtok_r(p, ":", &ptr); p = NULL)
- if (frei0r->dl_handle = load_path(ctx, p, dl_name))
- break;
- av_free(path);
+ if (path = getenv("FREI0R_PATH")) {
+ while(*path) {
+ char *ptr = av_get_token((const char **)&path, ":");
+ if (!ptr)
+ return AVERROR(ENOMEM);
+ s->dl_handle = load_path(ctx, ptr, dl_name);
+ av_freep(&ptr);
+ if (s->dl_handle)
+ break; /* found */
+ if (*path)
+ path++; /* skip ':' */
+ }
 }
- if (!frei0r->dl_handle && (path = getenv("HOME"))) {
+ if (!s->dl_handle && (path = getenv("HOME"))) {
 char prefix[1024];
 snprintf(prefix, sizeof(prefix), "%s/.frei0r-1/lib/", path);
- frei0r->dl_handle = load_path(ctx, prefix, dl_name);
+ s->dl_handle = load_path(ctx, prefix, dl_name);
 }
- if (!frei0r->dl_handle)
- frei0r->dl_handle = load_path(ctx, "/usr/local/lib/frei0r-1/", dl_name);
- if (!frei0r->dl_handle)
- frei0r->dl_handle = load_path(ctx, "/usr/lib/frei0r-1/", dl_name);
- if (!frei0r->dl_handle) {
- av_log(ctx, AV_LOG_ERROR, "Could not find module '%s'\n", dl_name);
+ if (!s->dl_handle)
+ s->dl_handle = load_path(ctx, "/usr/local/lib/frei0r-1/", dl_name);
+ if (!s->dl_handle)
+ s->dl_handle = load_path(ctx, "/usr/lib/frei0r-1/", dl_name);
+ if (!s->dl_handle) {
+ av_log(ctx, AV_LOG_ERROR, "Could not find module '%s'.\n", dl_name);
 return AVERROR(EINVAL);
 }
 
 if (!(f0r_init = load_sym(ctx, "f0r_init" )) ||
 !(f0r_get_plugin_info = load_sym(ctx, "f0r_get_plugin_info")) ||
- !(frei0r->get_param_info = load_sym(ctx, "f0r_get_param_info" )) ||
- !(frei0r->get_param_value = load_sym(ctx, "f0r_get_param_value")) ||
- !(frei0r->set_param_value = load_sym(ctx, "f0r_set_param_value")) ||
- !(frei0r->update = load_sym(ctx, "f0r_update" )) ||
- !(frei0r->construct = load_sym(ctx, "f0r_construct" )) ||
- !(frei0r->destruct = load_sym(ctx, "f0r_destruct" )) ||
- !(frei0r->deinit = load_sym(ctx, "f0r_deinit" )))
+ !(s->get_param_info = load_sym(ctx, "f0r_get_param_info" )) ||
+ !(s->get_param_value = load_sym(ctx, "f0r_get_param_value")) ||
+ !(s->set_param_value = load_sym(ctx, "f0r_set_param_value")) ||
+ !(s->update = load_sym(ctx, "f0r_update" )) ||
+ !(s->construct = load_sym(ctx, "f0r_construct" )) ||
+ !(s->destruct = load_sym(ctx, "f0r_destruct" )) ||
+ !(s->deinit = load_sym(ctx, "f0r_deinit" )))
 return AVERROR(EINVAL);
 
 if (f0r_init() < 0) {
- av_log(ctx, AV_LOG_ERROR, "Could not init the frei0r module");
+ av_log(ctx, AV_LOG_ERROR, "Could not init the frei0r module.\n");
 return AVERROR(EINVAL);
 }
 
- f0r_get_plugin_info(&frei0r->plugin_info);
- pi = &frei0r->plugin_info;
+ f0r_get_plugin_info(&s->plugin_info);
+ 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" :
@@ -284,53 +299,48 @@
 return 0;
 }
 
-static av_cold int filter_init(AVFilterContext *ctx, const char *args)
+static av_cold int filter_init(AVFilterContext *ctx)
 {
- Frei0rContext *frei0r = ctx->priv;
- char dl_name[1024], c;
- *frei0r->params = 0;
-
- if (args)
- sscanf(args, "%1023[^:=]%c%255c", dl_name, &c, frei0r->params);
+ Frei0rContext *s = ctx->priv;
 
- return frei0r_init(ctx, dl_name, F0R_PLUGIN_TYPE_FILTER);
+ return frei0r_init(ctx, s->dl_name, F0R_PLUGIN_TYPE_FILTER);
 }
 
 static av_cold void uninit(AVFilterContext *ctx)
 {
- Frei0rContext *frei0r = ctx->priv;
-
- if (frei0r->destruct && frei0r->instance)
- frei0r->destruct(frei0r->instance);
- if (frei0r->deinit)
- frei0r->deinit();
- if (frei0r->dl_handle)
- dlclose(frei0r->dl_handle);
-
- memset(frei0r, 0, sizeof(*frei0r));
+ Frei0rContext *s = ctx->priv;
+
+ if (s->destruct && s->instance)
+ s->destruct(s->instance);
+ if (s->deinit)
+ s->deinit();
+ if (s->dl_handle)
+ dlclose(s->dl_handle);
 }
 
 static int config_input_props(AVFilterLink *inlink)
 {
 AVFilterContext *ctx = inlink->dst;
- Frei0rContext *frei0r = ctx->priv;
+ Frei0rContext *s = ctx->priv;
 
- if (!(frei0r->instance = frei0r->construct(inlink->w, inlink->h))) {
- av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance");
+ 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");
 return AVERROR(EINVAL);
 }
 
- return set_params(ctx, frei0r->params);
+ return set_params(ctx, s->params);
 }
 
 static int query_formats(AVFilterContext *ctx)
 {
- Frei0rContext *frei0r = ctx->priv;
+ Frei0rContext *s = ctx->priv;
 AVFilterFormats *formats = NULL;
 
- if (frei0r->plugin_info.color_model == F0R_COLOR_MODEL_BGRA8888) {
+ if (s->plugin_info.color_model == F0R_COLOR_MODEL_BGRA8888) {
 ff_add_format(&formats, AV_PIX_FMT_BGRA);
- } else if (frei0r->plugin_info.color_model == F0R_COLOR_MODEL_RGBA8888) {
+ } else if (s->plugin_info.color_model == F0R_COLOR_MODEL_RGBA8888) {
 ff_add_format(&formats, AV_PIX_FMT_RGBA);
 } else { /* F0R_COLOR_MODEL_PACKED32 */
 static const enum AVPixelFormat pix_fmts[] = {
@@ -346,35 +356,49 @@
 return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
+static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 {
- Frei0rContext *frei0r = inlink->dst->priv;
+ Frei0rContext *s = inlink->dst->priv;
 AVFilterLink *outlink = inlink->dst->outputs[0];
- AVFilterBufferRef *out;
+ AVFrame *out;
 
- out = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
+ out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
 if (!out) {
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return AVERROR(ENOMEM);
 }
- avfilter_copy_buffer_ref_props(out, in);
+ av_frame_copy_props(out, in);
 
- frei0r->update(frei0r->instance, in->pts * av_q2d(inlink->time_base) * 1000,
+ s->update(s->instance, in->pts * av_q2d(inlink->time_base) * 1000,
 (const uint32_t *)in->data[0],
 (uint32_t *)out->data[0]);
 
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 
 return ff_filter_frame(outlink, out);
 }
 
+#define OFFSET(x) offsetof(Frei0rContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption filter_options[] = {
+ { "filter_name", NULL, OFFSET(dl_name), AV_OPT_TYPE_STRING, .flags = FLAGS },
+ { "filter_params", NULL, OFFSET(params), AV_OPT_TYPE_STRING, .flags = FLAGS },
+ { NULL },
+};
+
+static const AVClass filter_class = {
+ .class_name = "frei0r",
+ .item_name = av_default_item_name,
+ .option = filter_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_frei0r_inputs[] = {
 {
 .name = "default",
 .type = AVMEDIA_TYPE_VIDEO,
 .config_props = config_input_props,
 .filter_frame = filter_frame,
- .min_perms = AV_PERM_READ
 },
 { NULL }
 };
@@ -387,7 +411,7 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_frei0r = {
+AVFilter ff_vf_frei0r = {
 .name = "frei0r",
 .description = NULL_IF_CONFIG_SMALL("Apply a frei0r effect."),
 
@@ -396,79 +420,91 @@
 .uninit = uninit,
 
 .priv_size = sizeof(Frei0rContext),
+ .priv_class = &filter_class,
 
 .inputs = avfilter_vf_frei0r_inputs,
 
 .outputs = avfilter_vf_frei0r_outputs,
 };
 
-static av_cold int source_init(AVFilterContext *ctx, const char *args)
+static av_cold int source_init(AVFilterContext *ctx)
 {
- Frei0rContext *frei0r = ctx->priv;
- char dl_name[1024], c;
- char frame_size[128] = "";
- char frame_rate[128] = "";
+ Frei0rContext *s = ctx->priv;
 AVRational frame_rate_q;
 
- memset(frei0r->params, 0, sizeof(frei0r->params));
-
- if (args)
- sscanf(args, "%127[^:]:%127[^:]:%1023[^:=]%c%255c",
- frame_size, frame_rate, dl_name, &c, frei0r->params);
-
- if (av_parse_video_size(&frei0r->w, &frei0r->h, frame_size) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Invalid frame size: '%s'\n", frame_size);
+ if (av_parse_video_size(&s->w, &s->h, s->size) < 0) {
+ av_log(ctx, AV_LOG_ERROR, "Invalid frame size: '%s'.\n", s->size);
 return AVERROR(EINVAL);
 }
 
- if (av_parse_video_rate(&frame_rate_q, frame_rate) < 0 ||
+ if (av_parse_video_rate(&frame_rate_q, s->framerate) < 0 ||
 frame_rate_q.den <= 0 || frame_rate_q.num <= 0) {
- av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: '%s'\n", frame_rate);
+ av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: '%s'.\n", s->framerate);
 return AVERROR(EINVAL);
 }
- frei0r->time_base.num = frame_rate_q.den;
- frei0r->time_base.den = frame_rate_q.num;
+ s->time_base.num = frame_rate_q.den;
+ s->time_base.den = frame_rate_q.num;
 
- return frei0r_init(ctx, dl_name, F0R_PLUGIN_TYPE_SOURCE);
+ return frei0r_init(ctx, s->dl_name, F0R_PLUGIN_TYPE_SOURCE);
 }
 
 static int source_config_props(AVFilterLink *outlink)
 {
 AVFilterContext *ctx = outlink->src;
- Frei0rContext *frei0r = ctx->priv;
+ Frei0rContext *s = ctx->priv;
 
- if (av_image_check_size(frei0r->w, frei0r->h, 0, ctx) < 0)
+ if (av_image_check_size(s->w, s->h, 0, ctx) < 0)
 return AVERROR(EINVAL);
- outlink->w = frei0r->w;
- outlink->h = frei0r->h;
- outlink->time_base = frei0r->time_base;
-
- if (!(frei0r->instance = frei0r->construct(outlink->w, outlink->h))) {
- av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance");
+ outlink->w = s->w;
+ outlink->h = s->h;
+ outlink->time_base = s->time_base;
+
+ 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");
+ return AVERROR(EINVAL);
+ }
+ if (!s->params) {
+ av_log(ctx, AV_LOG_ERROR, "frei0r filter parameters not set.\n");
 return AVERROR(EINVAL);
 }
 
- return set_params(ctx, frei0r->params);
+ return set_params(ctx, s->params);
 }
 
 static int source_request_frame(AVFilterLink *outlink)
 {
- Frei0rContext *frei0r = outlink->src->priv;
- AVFilterBufferRef *picref = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
+ Frei0rContext *s = outlink->src->priv;
+ AVFrame *frame = ff_get_video_buffer(outlink, outlink->w, outlink->h);
 
- if (!picref)
+ if (!frame)
 return AVERROR(ENOMEM);
 
- picref->video->pixel_aspect = (AVRational) {1, 1};
- picref->pts = frei0r->pts++;
- picref->pos = -1;
+ frame->sample_aspect_ratio = (AVRational) {1, 1};
+ frame->pts = s->pts++;
 
- frei0r->update(frei0r->instance, av_rescale_q(picref->pts, frei0r->time_base, (AVRational){1,1000}),
- NULL, (uint32_t *)picref->data[0]);
+ s->update(s->instance, av_rescale_q(frame->pts, s->time_base, (AVRational){1,1000}),
+ NULL, (uint32_t *)frame->data[0]);
 
- return ff_filter_frame(outlink, picref);
+ return ff_filter_frame(outlink, frame);
 }
 
+static const AVOption src_options[] = {
+ { "size", "Dimensions of the generated video.", OFFSET(size), AV_OPT_TYPE_STRING, { .str = "" }, .flags = FLAGS },
+ { "framerate", NULL, OFFSET(framerate), AV_OPT_TYPE_STRING, { .str = "25" }, .flags = FLAGS },
+ { "filter_name", NULL, OFFSET(dl_name), AV_OPT_TYPE_STRING, .flags = FLAGS },
+ { "filter_params", NULL, OFFSET(params), AV_OPT_TYPE_STRING, .flags = FLAGS },
+ { NULL },
+};
+
+static const AVClass src_class = {
+ .class_name = "frei0r_src",
+ .item_name = av_default_item_name,
+ .option = src_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vsrc_frei0r_src_outputs[] = {
 {
 .name = "default",
@@ -479,11 +515,12 @@
 { 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),
+ .priv_class = &src_class,
 .init = source_init,
 .uninit = uninit,

libav-v9.6.tar.bz2/libavfilter/vf_gradfun.c -> libav-v10.1.tar.bz2/libavfilter/vf_gradfun.c Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2010 Nolan Lum <nol888@gmail.com>
- * Copyright (c) 2009 Loren Merritt <lorenm@u.washignton.edu>
+ * Copyright (c) 2009 Loren Merritt <lorenm@u.washington.edu>
 *
 * This file is part of Libav.
 *
@@ -25,7 +25,7 @@
 * libmpcodecs/vf_gradfun.c
 *
 * Apply a boxblur debanding algorithm (based on the gradfun2db
- * Avisynth filter by prunedtree).
+ * AviSynth filter by prunedtree).
 * Foreach pixel, if it's within threshold of the blurred value, make it closer.
 * So now we have a smoothed and higher bitdepth version of all the shallow
 * gradients, while leaving detailed areas untouched.
@@ -35,6 +35,7 @@
 #include "libavutil/imgutils.h"
 #include "libavutil/common.h"
 #include "libavutil/cpu.h"
+#include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "formats.h"
@@ -56,7 +57,7 @@
 void ff_gradfun_filter_line_c(uint8_t *dst, uint8_t *src, uint16_t *dc, int width, int thresh, const uint16_t *dithers)
 {
 int x;
- for (x = 0; x < width; x++, dc += x & 1) {
+ for (x = 0; x < width; dc += x & 1, x++) {
 int pix = src[x] << 7;
 int delta = dc[0] - pix;
 int m = abs(delta) * thresh >> 16;
@@ -117,36 +118,31 @@
 ctx->filter_line(dst + y * dst_linesize, src + y * src_linesize, dc - r / 2, width, thresh, dither[y & 7]);
 if (++y >= height) break;
 }
+ emms_c();
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
- GradFunContext *gf = ctx->priv;
- float thresh = 1.2;
- int radius = 16;
+ GradFunContext *s = ctx->priv;
 
- if (args)
- sscanf(args, "%f:%d", &thresh, &radius);
+ s->thresh = (1 << 15) / s->strength;
+ s->radius &= ~1;
 
- thresh = av_clipf(thresh, 0.51, 255);
- gf->thresh = (1 << 15) / thresh;
- gf->radius = av_clip((radius + 1) & ~1, 4, 32);
-
- gf->blur_line = ff_gradfun_blur_line_c;
- gf->filter_line = ff_gradfun_filter_line_c;
+ s->blur_line = ff_gradfun_blur_line_c;
+ s->filter_line = ff_gradfun_filter_line_c;
 
 if (ARCH_X86)
- ff_gradfun_init_x86(gf);
+ ff_gradfun_init_x86(s);
 
- av_log(ctx, AV_LOG_VERBOSE, "threshold:%.2f radius:%d\n", thresh, gf->radius);
+ av_log(ctx, AV_LOG_VERBOSE, "threshold:%.2f radius:%d\n", s->strength, s->radius);
 
 return 0;
 }
 
 static av_cold void uninit(AVFilterContext *ctx)
 {
- GradFunContext *gf = ctx->priv;
- av_freep(&gf->buf);
+ GradFunContext *s = ctx->priv;
+ av_freep(&s->buf);
 }
 
 static int query_formats(AVFilterContext *ctx)
@@ -166,74 +162,89 @@
 
 static int config_input(AVFilterLink *inlink)
 {
- GradFunContext *gf = inlink->dst->priv;
+ GradFunContext *s = inlink->dst->priv;
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
 int hsub = desc->log2_chroma_w;
 int vsub = desc->log2_chroma_h;
 
- gf->buf = av_mallocz((FFALIGN(inlink->w, 16) * (gf->radius + 1) / 2 + 32) * sizeof(uint16_t));
- if (!gf->buf)
+ av_freep(&s->buf);
+ s->buf = av_mallocz((FFALIGN(inlink->w, 16) * (s->radius + 1) / 2 + 32) * sizeof(uint16_t));
+ if (!s->buf)
 return AVERROR(ENOMEM);
 
- gf->chroma_w = -((-inlink->w) >> hsub);
- gf->chroma_h = -((-inlink->h) >> vsub);
- gf->chroma_r = av_clip(((((gf->radius >> hsub) + (gf->radius >> vsub)) / 2 ) + 1) & ~1, 4, 32);
+ s->chroma_w = -((-inlink->w) >> hsub);
+ s->chroma_h = -((-inlink->h) >> vsub);
+ s->chroma_r = av_clip(((((s->radius >> hsub) + (s->radius >> vsub)) / 2 ) + 1) & ~1, 4, 32);
 
 return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
+static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 {
- GradFunContext *gf = inlink->dst->priv;
+ GradFunContext *s = inlink->dst->priv;
 AVFilterLink *outlink = inlink->dst->outputs[0];
- AVFilterBufferRef *out;
+ AVFrame *out;
 int p, direct;
 
- if ((in->perms & AV_PERM_WRITE) && !(in->perms & AV_PERM_PRESERVE)) {
+ if (av_frame_is_writable(in)) {
 direct = 1;
 out = in;
 } else {
 direct = 0;
- out = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
+ out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
 if (!out) {
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return AVERROR(ENOMEM);
 }
 
- avfilter_copy_buffer_ref_props(out, in);
- out->video->w = outlink->w;
- out->video->h = outlink->h;
+ av_frame_copy_props(out, in);
+ out->width = outlink->w;
+ out->height = outlink->h;
 }
 
 for (p = 0; p < 4 && in->data[p]; p++) {
 int w = inlink->w;
 int h = inlink->h;
- int r = gf->radius;
+ int r = s->radius;
 if (p) {
- w = gf->chroma_w;
- h = gf->chroma_h;
- r = gf->chroma_r;
+ w = s->chroma_w;
+ h = s->chroma_h;
+ r = s->chroma_r;
 }
 
 if (FFMIN(w, h) > 2 * r)
- filter(gf, out->data[p], in->data[p], w, h, out->linesize[p], in->linesize[p], r);
+ filter(s, out->data[p], in->data[p], w, h, out->linesize[p], in->linesize[p], r);
 else if (out->data[p] != in->data[p])
 av_image_copy_plane(out->data[p], out->linesize[p], in->data[p], in->linesize[p], w, h);
 }
 
 if (!direct)
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 
 return ff_filter_frame(outlink, out);
 }
 
+#define OFFSET(x) offsetof(GradFunContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "strength", "The maximum amount by which the filter will change any one pixel.", OFFSET(strength), AV_OPT_TYPE_FLOAT, { .dbl = 1.2 }, 0.51, 64, FLAGS },
+ { "radius", "The neighborhood to fit the gradient to.", OFFSET(radius), AV_OPT_TYPE_INT, { .i64 = 16 }, 4, 32, FLAGS },
+ { NULL },
+};
+
+static const AVClass gradfun_class = {
+ .class_name = "gradfun",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_gradfun_inputs[] = {
 {
 .name = "default",
 .type = AVMEDIA_TYPE_VIDEO,
 .config_props = config_input,
 .filter_frame = filter_frame,
- .min_perms = AV_PERM_READ,
 },
 { NULL }
 };
@@ -246,10 +257,11 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_gradfun = {
+AVFilter ff_vf_gradfun = {
 .name = "gradfun",
 .description = NULL_IF_CONFIG_SMALL("Debands video quickly using gradients."),
 .priv_size = sizeof(GradFunContext),
+ .priv_class = &gradfun_class,
 .init = init,
 .uninit = uninit,
 .query_formats = query_formats,

libav-v9.6.tar.bz2/libavfilter/vf_hflip.c -> libav-v10.1.tar.bz2/libavfilter/vf_hflip.c Changed

@@ -74,40 +74,40 @@
 
 static int config_props(AVFilterLink *inlink)
 {
- FlipContext *flip = inlink->dst->priv;
+ FlipContext *s = inlink->dst->priv;
 const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(inlink->format);
 
- av_image_fill_max_pixsteps(flip->max_step, NULL, pix_desc);
- flip->hsub = pix_desc->log2_chroma_w;
- flip->vsub = pix_desc->log2_chroma_h;
+ av_image_fill_max_pixsteps(s->max_step, NULL, pix_desc);
+ s->hsub = pix_desc->log2_chroma_w;
+ s->vsub = pix_desc->log2_chroma_h;
 
 return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
+static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 {
 AVFilterContext *ctx = inlink->dst;
- FlipContext *flip = ctx->priv;
+ FlipContext *s = ctx->priv;
 AVFilterLink *outlink = ctx->outputs[0];
- AVFilterBufferRef *out;
+ AVFrame *out;
 uint8_t *inrow, *outrow;
 int i, j, plane, step, hsub, vsub;
 
- out = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
+ out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
 if (!out) {
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return AVERROR(ENOMEM);
 }
- avfilter_copy_buffer_ref_props(out, in);
+ av_frame_copy_props(out, in);
 
 for (plane = 0; plane < 4 && in->data[plane]; plane++) {
- step = flip->max_step[plane];
- hsub = (plane == 1 || plane == 2) ? flip->hsub : 0;
- vsub = (plane == 1 || plane == 2) ? flip->vsub : 0;
+ step = s->max_step[plane];
+ hsub = (plane == 1 || plane == 2) ? s->hsub : 0;
+ vsub = (plane == 1 || plane == 2) ? s->vsub : 0;
 
 outrow = out->data[plane];
 inrow = in ->data[plane] + ((inlink->w >> hsub) - 1) * step;
- for (i = 0; i < in->video->h >> vsub; i++) {
+ for (i = 0; i < in->height >> vsub; i++) {
 switch (step) {
 case 1:
 for (j = 0; j < (inlink->w >> hsub); j++)
@@ -153,7 +153,7 @@
 }
 }
 
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return ff_filter_frame(outlink, out);
 }
 
@@ -163,7 +163,6 @@
 .type = AVMEDIA_TYPE_VIDEO,
 .filter_frame = filter_frame,
 .config_props = config_props,
- .min_perms = AV_PERM_READ,
 },
 { NULL }
 };
@@ -176,7 +175,7 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_hflip = {
+AVFilter ff_vf_hflip = {
 .name = "hflip",
 .description = NULL_IF_CONFIG_SMALL("Horizontally flip the input video."),
 .priv_size = sizeof(FlipContext),

libav-v9.6.tar.bz2/libavfilter/vf_hqdn3d.c -> libav-v10.1.tar.bz2/libavfilter/vf_hqdn3d.c Changed

@@ -26,28 +26,20 @@
 * libmpcodecs/vf_hqdn3d.c.
 */
 
+#include <float.h>
+
+#include "config.h"
+#include "libavutil/attributes.h"
 #include "libavutil/common.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/opt.h"
+
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
 #include "video.h"
-
-typedef struct {
- int16_t *coefs[4];
- uint16_t *line;
- uint16_t *frame_prev[3];
- double strength[4];
- int hsub, vsub;
- int depth;
- void (*denoise_row[17])(uint8_t *src, uint8_t *dst, uint16_t *line_ant, uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial, int16_t *temporal);
-} HQDN3DContext;
-
-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);
+#include "vf_hqdn3d.h"
 
 #define LUT_BITS (depth==16 ? 8 : 4)
 #define LOAD(x) (((depth == 8 ? src[x] : AV_RN16A(src + (x) * 2)) << (16 - depth))\
@@ -85,7 +77,7 @@
 }
 
 av_always_inline
-static void denoise_spatial(HQDN3DContext *hqdn3d,
+static void denoise_spatial(HQDN3DContext *s,
 uint8_t *src, uint8_t *dst,
 uint16_t *line_ant, uint16_t *frame_ant,
 int w, int h, int sstride, int dstride,
@@ -111,8 +103,8 @@
 src += sstride;
 dst += dstride;
 frame_ant += w;
- if (hqdn3d->denoise_row[depth]) {
- hqdn3d->denoise_row[depth](src, dst, line_ant, frame_ant, w, spatial, temporal);
+ if (s->denoise_row[depth]) {
+ s->denoise_row[depth](src, dst, line_ant, frame_ant, w, spatial, temporal);
 continue;
 }
 pixel_ant = LOAD(0);
@@ -129,7 +121,7 @@
 }
 
 av_always_inline
-static void denoise_depth(HQDN3DContext *hqdn3d,
+static void denoise_depth(HQDN3DContext *s,
 uint8_t *src, uint8_t *dst,
 uint16_t *line_ant, uint16_t **frame_ant_ptr,
 int w, int h, int sstride, int dstride,
@@ -150,15 +142,16 @@
 }
 
 if (spatial[0])
- denoise_spatial(hqdn3d, src, dst, line_ant, frame_ant,
+ denoise_spatial(s, src, dst, line_ant, frame_ant,
 w, h, sstride, dstride, spatial, temporal, depth);
 else
 denoise_temporal(src, dst, frame_ant,
 w, h, sstride, dstride, temporal, depth);
+ emms_c();
 }
 
 #define denoise(...) \
- switch (hqdn3d->depth) {\
+ switch (s->depth) {\
 case 8: denoise_depth(__VA_ARGS__, 8); break;\
 case 9: denoise_depth(__VA_ARGS__, 9); break;\
 case 10: denoise_depth(__VA_ARGS__, 10); break;\
@@ -190,76 +183,38 @@
 #define PARAM2_DEFAULT 3.0
 #define PARAM3_DEFAULT 6.0
 
-static int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
- HQDN3DContext *hqdn3d = ctx->priv;
- double lum_spac, lum_tmp, chrom_spac, chrom_tmp;
- double param1, param2, param3, param4;
-
- lum_spac = PARAM1_DEFAULT;
- chrom_spac = PARAM2_DEFAULT;
- lum_tmp = PARAM3_DEFAULT;
- chrom_tmp = lum_tmp * chrom_spac / lum_spac;
-
- if (args) {
- switch (sscanf(args, "%lf:%lf:%lf:%lf",
- &param1, &param2, &param3, &param4)) {
- case 1:
- lum_spac = param1;
- chrom_spac = PARAM2_DEFAULT * param1 / PARAM1_DEFAULT;
- lum_tmp = PARAM3_DEFAULT * param1 / PARAM1_DEFAULT;
- chrom_tmp = lum_tmp * chrom_spac / lum_spac;
- break;
- case 2:
- lum_spac = param1;
- chrom_spac = param2;
- lum_tmp = PARAM3_DEFAULT * param1 / PARAM1_DEFAULT;
- chrom_tmp = lum_tmp * chrom_spac / lum_spac;
- break;
- case 3:
- lum_spac = param1;
- chrom_spac = param2;
- lum_tmp = param3;
- chrom_tmp = lum_tmp * chrom_spac / lum_spac;
- break;
- case 4:
- lum_spac = param1;
- chrom_spac = param2;
- lum_tmp = param3;
- chrom_tmp = param4;
- break;
- }
- }
+ HQDN3DContext *s = ctx->priv;
 
- hqdn3d->strength[0] = lum_spac;
- hqdn3d->strength[1] = lum_tmp;
- hqdn3d->strength[2] = chrom_spac;
- hqdn3d->strength[3] = chrom_tmp;
+ if (!s->strength[LUMA_SPATIAL])
+ s->strength[LUMA_SPATIAL] = PARAM1_DEFAULT;
+ if (!s->strength[CHROMA_SPATIAL])
+ s->strength[CHROMA_SPATIAL] = PARAM2_DEFAULT * s->strength[LUMA_SPATIAL] / PARAM1_DEFAULT;
+ if (!s->strength[LUMA_TMP])
+ s->strength[LUMA_TMP] = PARAM3_DEFAULT * s->strength[LUMA_SPATIAL] / PARAM1_DEFAULT;
+ if (!s->strength[CHROMA_TMP])
+ s->strength[CHROMA_TMP] = s->strength[LUMA_TMP] * s->strength[CHROMA_SPATIAL] / s->strength[LUMA_SPATIAL];
 
 av_log(ctx, AV_LOG_VERBOSE, "ls:%f cs:%f lt:%f ct:%f\n",
- lum_spac, chrom_spac, lum_tmp, chrom_tmp);
- if (lum_spac < 0 || chrom_spac < 0 || isnan(chrom_tmp)) {
- av_log(ctx, AV_LOG_ERROR,
- "Invalid negative value for luma or chroma spatial strength, "
- "or resulting value for chroma temporal strength is nan.\n");
- return AVERROR(EINVAL);
- }
+ s->strength[LUMA_SPATIAL], s->strength[CHROMA_SPATIAL],
+ s->strength[LUMA_TMP], s->strength[CHROMA_TMP]);
 
 return 0;
 }
 
-static void uninit(AVFilterContext *ctx)
+static av_cold void uninit(AVFilterContext *ctx)
 {
- HQDN3DContext *hqdn3d = ctx->priv;
-
- av_freep(&hqdn3d->coefs[0]);
- av_freep(&hqdn3d->coefs[1]);
- av_freep(&hqdn3d->coefs[2]);
- av_freep(&hqdn3d->coefs[3]);
- av_freep(&hqdn3d->line);
- av_freep(&hqdn3d->frame_prev[0]);
- av_freep(&hqdn3d->frame_prev[1]);
- av_freep(&hqdn3d->frame_prev[2]);
+ HQDN3DContext *s = ctx->priv;
+
+ av_freep(&s->coefs[0]);
+ av_freep(&s->coefs[1]);
+ av_freep(&s->coefs[2]);
+ av_freep(&s->coefs[3]);
+ av_freep(&s->line);
+ av_freep(&s->frame_prev[0]);
+ av_freep(&s->frame_prev[1]);
+ av_freep(&s->frame_prev[2]);
 }
 
 static int query_formats(AVFilterContext *ctx)
@@ -294,72 +249,87 @@
 
 static int config_input(AVFilterLink *inlink)
 {
- HQDN3DContext *hqdn3d = inlink->dst->priv;
+ HQDN3DContext *s = inlink->dst->priv;
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
 int i;
 
- hqdn3d->hsub = desc->log2_chroma_w;
- hqdn3d->vsub = desc->log2_chroma_h;
- hqdn3d->depth = desc->comp[0].depth_minus1+1;
+ uninit(inlink->dst);
 
- hqdn3d->line = av_malloc(inlink->w * sizeof(*hqdn3d->line));
- if (!hqdn3d->line)
+ s->hsub = desc->log2_chroma_w;
+ s->vsub = desc->log2_chroma_h;
+ s->depth = desc->comp[0].depth_minus1+1;
+
+ s->line = av_malloc(inlink->w * sizeof(*s->line));
+ if (!s->line)
 return AVERROR(ENOMEM);
 
 for (i = 0; i < 4; i++) {
- hqdn3d->coefs[i] = precalc_coefs(hqdn3d->strength[i], hqdn3d->depth);
- if (!hqdn3d->coefs[i])
+ s->coefs[i] = precalc_coefs(s->strength[i], s->depth);
+ if (!s->coefs[i])
 return AVERROR(ENOMEM);
 }
 
-#if HAVE_YASM
- 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
+ if (ARCH_X86)
+ ff_hqdn3d_init_x86(s);
 
 return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
+static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 {
- HQDN3DContext *hqdn3d = inlink->dst->priv;
+ HQDN3DContext *s = inlink->dst->priv;
 AVFilterLink *outlink = inlink->dst->outputs[0];
- AVFilterBufferRef *out;
+ AVFrame *out;
 int direct, c;
 
- if ((in->perms & AV_PERM_WRITE) && !(in->perms & AV_PERM_PRESERVE)) {
+ if (av_frame_is_writable(in)) {
 direct = 1;
 out = in;
 } else {
 direct = 0;
- out = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
+ out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
 if (!out) {
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return AVERROR(ENOMEM);
 }
 
- avfilter_copy_buffer_ref_props(out, in);
- out->video->w = outlink->w;
- out->video->h = outlink->h;
+ av_frame_copy_props(out, in);
+ out->width = outlink->w;
+ out->height = outlink->h;
 }
 
 for (c = 0; c < 3; c++) {
- denoise(hqdn3d, in->data[c], out->data[c],
- hqdn3d->line, &hqdn3d->frame_prev[c],
- in->video->w >> (!!c * hqdn3d->hsub),
- in->video->h >> (!!c * hqdn3d->vsub),
+ denoise(s, in->data[c], out->data[c],
+ s->line, &s->frame_prev[c],
+ in->width >> (!!c * s->hsub),
+ in->height >> (!!c * s->vsub),
 in->linesize[c], out->linesize[c],
- hqdn3d->coefs[c?2:0], hqdn3d->coefs[c?3:1]);
+ s->coefs[c?2:0], s->coefs[c?3:1]);
 }
 
 if (!direct)
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 
 return ff_filter_frame(outlink, out);
 }
 
+#define OFFSET(x) offsetof(HQDN3DContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "luma_spatial", "spatial luma strength", OFFSET(strength[LUMA_SPATIAL]), AV_OPT_TYPE_DOUBLE, { .dbl = 0.0 }, 0, DBL_MAX, FLAGS },
+ { "chroma_spatial", "spatial chroma strength", OFFSET(strength[CHROMA_SPATIAL]), AV_OPT_TYPE_DOUBLE, { .dbl = 0.0 }, 0, DBL_MAX, FLAGS },
+ { "luma_tmp", "temporal luma strength", OFFSET(strength[LUMA_TMP]), AV_OPT_TYPE_DOUBLE, { .dbl = 0.0 }, 0, DBL_MAX, FLAGS },
+ { "chroma_tmp", "temporal chroma strength", OFFSET(strength[CHROMA_TMP]), AV_OPT_TYPE_DOUBLE, { .dbl = 0.0 }, 0, DBL_MAX, FLAGS },
+ { NULL },
+};
+
+static const AVClass hqdn3d_class = {
+ .class_name = "hqdn3d",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_hqdn3d_inputs[] = {
 {
 .name = "default",
@@ -378,11 +348,12 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_hqdn3d = {
+AVFilter ff_vf_hqdn3d = {
 .name = "hqdn3d",
 .description = NULL_IF_CONFIG_SMALL("Apply a High Quality 3D Denoiser."),
 
 .priv_size = sizeof(HQDN3DContext),
+ .priv_class = &hqdn3d_class,
 .init = init,
 .uninit = uninit,
 .query_formats = query_formats,

libav-v10.1.tar.bz2/libavfilter/vf_hqdn3d.h Added

@@ -0,0 +1,45 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef AVFILTER_VF_HQDN3D_H
+#define AVFILTER_VF_HQDN3D_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "libavutil/opt.h"
+
+typedef struct {
+ const AVClass *class;
+ int16_t *coefs[4];
+ uint16_t *line;
+ uint16_t *frame_prev[3];
+ double strength[4];
+ int hsub, vsub;
+ int depth;
+ void (*denoise_row[17])(uint8_t *src, uint8_t *dst, uint16_t *line_ant, uint16_t *frame_ant, ptrdiff_t w, int16_t *spatial, int16_t *temporal);
+} HQDN3DContext;
+
+#define LUMA_SPATIAL 0
+#define LUMA_TMP 1
+#define CHROMA_SPATIAL 2
+#define CHROMA_TMP 3
+
+void ff_hqdn3d_init_x86(HQDN3DContext *hqdn3d);
+
+#endif /* AVFILTER_VF_HQDN3D_H */

libav-v10.1.tar.bz2/libavfilter/vf_interlace.c Added

@@ -0,0 +1,264 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/**
+ * @file
+ * progressive to interlaced content filter, inspired by heavy debugging of tinterlace filter
+ */
+
+#include "libavutil/common.h"
+#include "libavutil/opt.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/avassert.h"
+
+#include "formats.h"
+#include "avfilter.h"
+#include "internal.h"
+#include "video.h"
+
+enum ScanMode {
+ MODE_TFF = 0,
+ MODE_BFF = 1,
+};
+
+enum FieldType {
+ FIELD_UPPER = 0,
+ FIELD_LOWER = 1,
+};
+
+typedef struct {
+ const AVClass *class;
+ enum ScanMode scan; // top or bottom field first scanning
+ int lowpass; // enable or disable low pass filterning
+ AVFrame *cur, *next; // the two frames from which the new one is obtained
+ int got_output; // signal an output frame is reday to request_frame()
+} InterlaceContext;
+
+#define OFFSET(x) offsetof(InterlaceContext, x)
+#define V AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "scan", "scanning mode", OFFSET(scan),
+ AV_OPT_TYPE_INT, {.i64 = MODE_TFF }, 0, 1, .flags = V, .unit = "scan" },
+ { "tff", "top field first", 0,
+ 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),
+ AV_OPT_TYPE_INT, {.i64 = 1 }, 0, 1, .flags = V },
+ { NULL }
+};
+
+static const AVClass class = {
+ .class_name = "interlace filter",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+
+static const enum AVPixelFormat formats_supported[] = {
+ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P,
+ AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUVA420P,
+ AV_PIX_FMT_GRAY8, 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)
+{
+ ff_set_common_formats(ctx, ff_make_format_list(formats_supported));
+ return 0;
+}
+
+static av_cold void uninit(AVFilterContext *ctx)
+{
+ InterlaceContext *s = ctx->priv;
+
+ av_frame_free(&s->cur);
+ av_frame_free(&s->next);
+
+ av_opt_free(s);
+}
+
+static int config_out_props(AVFilterLink *outlink)
+{
+ AVFilterContext *ctx = outlink->src;
+ AVFilterLink *inlink = outlink->src->inputs[0];
+ InterlaceContext *s = ctx->priv;
+
+ if (inlink->h < 2) {
+ av_log(ctx, AV_LOG_ERROR, "input video height is too small\n");
+ return AVERROR_INVALIDDATA;
+ }
+ // same input size
+ outlink->w = inlink->w;
+ outlink->h = inlink->h;
+ outlink->time_base = inlink->time_base;
+ // half framerate
+ outlink->time_base.num *= 2;
+
+ av_log(ctx, AV_LOG_VERBOSE, "%s interlacing %s lowpass filter\n",
+ s->scan == MODE_TFF ? "tff" : "bff", (s->lowpass) ? "with" : "without");
+
+ return 0;
+}
+
+static void copy_picture_field(AVFrame *src_frame, AVFrame *dst_frame,
+ AVFilterLink *inlink, enum FieldType field_type,
+ int lowpass)
+{
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
+ int vsub = desc->log2_chroma_h;
+ int plane, i, j;
+
+ for (plane = 0; plane < desc->nb_components; plane++) {
+ int lines = (plane == 1 || plane == 2) ? -(-inlink->h) >> vsub : inlink->h;
+ 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];
+
+ av_assert0(linesize >= 0);
+
+ lines = (lines + (field_type == FIELD_UPPER)) / 2;
+ if (field_type == FIELD_LOWER)
+ 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;
+ }
+ } else {
+ av_image_copy_plane(dstp, dst_frame->linesize[plane] * 2,
+ srcp, src_frame->linesize[plane] * 2,
+ linesize, lines);
+ }
+ }
+}
+
+static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
+{
+ AVFilterContext *ctx = inlink->dst;
+ AVFilterLink *outlink = ctx->outputs[0];
+ InterlaceContext *s = ctx->priv;
+ AVFrame *out;
+ int tff, ret;
+
+ av_frame_free(&s->cur);
+ s->cur = s->next;
+ s->next = buf;
+
+ /* we need at least two frames */
+ if (!s->cur || !s->next)
+ return 0;
+
+ if (s->cur->interlaced_frame) {
+ 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);
+ s->got_output = 1;
+ return ret;
+ }
+
+ tff = (s->scan == MODE_TFF);
+ out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
+ if (!out)
+ return AVERROR(ENOMEM);
+
+ av_frame_copy_props(out, s->cur);
+ out->interlaced_frame = 1;
+ out->top_field_first = tff;
+ 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);
+ 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);
+ av_frame_free(&s->next);
+
+ ret = ff_filter_frame(outlink, out);
+ s->got_output = 1;
+
+ return ret;
+}
+
+static int request_frame(AVFilterLink *outlink)
+{
+ AVFilterContext *ctx = outlink->src;
+ InterlaceContext *s = ctx->priv;
+ int ret = 0;
+
+ s->got_output = 0;
+ while (ret >= 0 && !s->got_output)
+ ret = ff_request_frame(ctx->inputs[0]);
+
+ return ret;
+}
+
+static const AVFilterPad inputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .filter_frame = filter_frame,
+ },
+ { NULL }
+};
+
+static const AVFilterPad outputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .config_props = config_out_props,
+ .request_frame = request_frame,
+ },
+ { NULL }
+};
+
+AVFilter ff_vf_interlace = {
+ .name = "interlace",
+ .description = NULL_IF_CONFIG_SMALL("Convert progressive video into interlaced."),
+ .uninit = uninit,
+
+ .priv_class = &class,
+ .priv_size = sizeof(InterlaceContext),
+ .query_formats = query_formats,
+
+ .inputs = inputs,
+ .outputs = outputs,
+};
+

libav-v9.6.tar.bz2/libavfilter/vf_libopencv.c -> libav-v10.1.tar.bz2/libavfilter/vf_libopencv.c Changed

@@ -23,19 +23,18 @@
 * libopencv wrapper functions
 */
 
-/* #define DEBUG */
-
 #include <opencv/cv.h>
 #include <opencv/cxcore.h>
 #include "libavutil/avstring.h"
 #include "libavutil/common.h"
 #include "libavutil/file.h"
+#include "libavutil/opt.h"
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
 #include "video.h"
 
-static void fill_iplimage_from_picref(IplImage *img, const AVFilterBufferRef *picref, enum AVPixelFormat pixfmt)
+static void fill_iplimage_from_frame(IplImage *img, const AVFrame *frame, enum AVPixelFormat pixfmt)
 {
 IplImage *tmpimg;
 int depth, channels_nb;
@@ -45,18 +44,18 @@
 else if (pixfmt == AV_PIX_FMT_BGR24) { depth = IPL_DEPTH_8U; channels_nb = 3; }
 else return;
 
- tmpimg = cvCreateImageHeader((CvSize){picref->video->w, picref->video->h}, depth, channels_nb);
+ tmpimg = cvCreateImageHeader((CvSize){frame->width, frame->height}, depth, channels_nb);
 *img = *tmpimg;
- img->imageData = img->imageDataOrigin = picref->data[0];
+ img->imageData = img->imageDataOrigin = frame->data[0];
 img->dataOrder = IPL_DATA_ORDER_PIXEL;
 img->origin = IPL_ORIGIN_TL;
- img->widthStep = picref->linesize[0];
+ img->widthStep = frame->linesize[0];
 }
 
-static void fill_picref_from_iplimage(AVFilterBufferRef *picref, const IplImage *img, enum AVPixelFormat pixfmt)
+static void fill_frame_from_iplimage(AVFrame *frame, const IplImage *img, enum AVPixelFormat pixfmt)
 {
- picref->linesize[0] = img->widthStep;
- picref->data[0] = img->imageData;
+ frame->linesize[0] = img->widthStep;
+ frame->data[0] = img->imageData;
 }
 
 static int query_formats(AVFilterContext *ctx)
@@ -70,7 +69,9 @@
 }
 
 typedef struct {
- const char *name;
+ const AVClass *class;
+ char *name;
+ char *params;
 int (*init)(AVFilterContext *ctx, const char *args);
 void (*uninit)(AVFilterContext *ctx);
 void (*end_frame_filter)(AVFilterContext *ctx, IplImage *inimg, IplImage *outimg);
@@ -85,8 +86,8 @@
 
 static av_cold int smooth_init(AVFilterContext *ctx, const char *args)
 {
- OCVContext *ocv = ctx->priv;
- SmoothContext *smooth = ocv->priv;
+ OCVContext *s = ctx->priv;
+ SmoothContext *smooth = s->priv;
 char type_str[128] = "gaussian";
 
 smooth->param1 = 3;
@@ -95,7 +96,7 @@
 smooth->param4 = 0.0;
 
 if (args)
- sscanf(args, "%127[^:]:%d:%d:%lf:%lf", type_str, &smooth->param1, &smooth->param2, &smooth->param3, &smooth->param4);
+ sscanf(args, "%127[^|]|%d|%d|%lf|%lf", type_str, &smooth->param1, &smooth->param2, &smooth->param3, &smooth->param4);
 
 if (!strcmp(type_str, "blur" )) smooth->type = CV_BLUR;
 else if (!strcmp(type_str, "blur_no_scale")) smooth->type = CV_BLUR_NO_SCALE;
@@ -128,8 +129,8 @@
 
 static void smooth_end_frame_filter(AVFilterContext *ctx, IplImage *inimg, IplImage *outimg)
 {
- OCVContext *ocv = ctx->priv;
- SmoothContext *smooth = ocv->priv;
+ OCVContext *s = ctx->priv;
+ SmoothContext *smooth = s->priv;
 cvSmooth(inimg, outimg, smooth->type, smooth->param1, smooth->param2, smooth->param3, smooth->param4);
 }
 
@@ -177,7 +178,7 @@
 p++;
 break;
 } else
- (*values)[*cols*i + j] = !!isgraph(*(p++));
+ (*values)[*cols*i + j] = !!av_isgraph(*(p++));
 }
 }
 av_file_unmap(buf, size);
@@ -251,8 +252,8 @@
 
 static av_cold int dilate_init(AVFilterContext *ctx, const char *args)
 {
- OCVContext *ocv = ctx->priv;
- DilateContext *dilate = ocv->priv;
+ OCVContext *s = ctx->priv;
+ DilateContext *dilate = s->priv;
 char default_kernel_str[] = "3x3+0x0/rect";
 char *kernel_str;
 const char *buf = args;
@@ -261,14 +262,14 @@
 dilate->nb_iterations = 1;
 
 if (args)
- kernel_str = av_get_token(&buf, ":");
+ kernel_str = av_get_token(&buf, "|");
 if ((ret = parse_iplconvkernel(&dilate->kernel,
 *kernel_str ? kernel_str : default_kernel_str,
 ctx)) < 0)
 return ret;
 av_free(kernel_str);
 
- sscanf(buf, ":%d", &dilate->nb_iterations);
+ sscanf(buf, "|%d", &dilate->nb_iterations);
 av_log(ctx, AV_LOG_VERBOSE, "iterations_nb:%d\n", dilate->nb_iterations);
 if (dilate->nb_iterations <= 0) {
 av_log(ctx, AV_LOG_ERROR, "Invalid non-positive value '%d' for nb_iterations\n",
@@ -280,23 +281,23 @@
 
 static av_cold void dilate_uninit(AVFilterContext *ctx)
 {
- OCVContext *ocv = ctx->priv;
- DilateContext *dilate = ocv->priv;
+ OCVContext *s = ctx->priv;
+ DilateContext *dilate = s->priv;
 
 cvReleaseStructuringElement(&dilate->kernel);
 }
 
 static void dilate_end_frame_filter(AVFilterContext *ctx, IplImage *inimg, IplImage *outimg)
 {
- OCVContext *ocv = ctx->priv;
- DilateContext *dilate = ocv->priv;
+ OCVContext *s = ctx->priv;
+ DilateContext *dilate = s->priv;
 cvDilate(inimg, outimg, dilate->kernel, dilate->nb_iterations);
 }
 
 static void erode_end_frame_filter(AVFilterContext *ctx, IplImage *inimg, IplImage *outimg)
 {
- OCVContext *ocv = ctx->priv;
- DilateContext *dilate = ocv->priv;
+ OCVContext *s = ctx->priv;
+ DilateContext *dilate = s->priv;
 cvErode(inimg, outimg, dilate->kernel, dilate->nb_iterations);
 }
 
@@ -314,74 +315,82 @@
 { "smooth", sizeof(SmoothContext), smooth_init, NULL, smooth_end_frame_filter },
 };
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
- OCVContext *ocv = ctx->priv;
- char name[128], priv_args[1024];
+ OCVContext *s = ctx->priv;
 int i;
- char c;
-
- sscanf(args, "%127[^=:]%c%1023s", name, &c, priv_args);
 
 for (i = 0; i < FF_ARRAY_ELEMS(ocv_filter_entries); i++) {
 OCVFilterEntry *entry = &ocv_filter_entries[i];
- if (!strcmp(name, entry->name)) {
- ocv->name = entry->name;
- ocv->init = entry->init;
- ocv->uninit = entry->uninit;
- ocv->end_frame_filter = entry->end_frame_filter;
+ if (!strcmp(s->name, entry->name)) {
+ s->init = entry->init;
+ s->uninit = entry->uninit;
+ s->end_frame_filter = entry->end_frame_filter;
 
- if (!(ocv->priv = av_mallocz(entry->priv_size)))
+ if (!(s->priv = av_mallocz(entry->priv_size)))
 return AVERROR(ENOMEM);
- return ocv->init(ctx, priv_args);
+ return s->init(ctx, s->params);
 }
 }
 
- av_log(ctx, AV_LOG_ERROR, "No libopencv filter named '%s'\n", name);
+ av_log(ctx, AV_LOG_ERROR, "No libopencv filter named '%s'\n", s->name);
 return AVERROR(EINVAL);
 }
 
 static av_cold void uninit(AVFilterContext *ctx)
 {
- OCVContext *ocv = ctx->priv;
+ OCVContext *s = ctx->priv;
 
- if (ocv->uninit)
- ocv->uninit(ctx);
- av_free(ocv->priv);
- memset(ocv, 0, sizeof(*ocv));
+ if (s->uninit)
+ s->uninit(ctx);
+ av_free(s->priv);
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
+static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 {
 AVFilterContext *ctx = inlink->dst;
- OCVContext *ocv = ctx->priv;
+ OCVContext *s = ctx->priv;
 AVFilterLink *outlink= inlink->dst->outputs[0];
- AVFilterBufferRef *out;
+ AVFrame *out;
 IplImage inimg, outimg;
 
- out = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
+ out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
 if (!out) {
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return AVERROR(ENOMEM);
 }
- avfilter_copy_buffer_ref_props(out, in);
+ av_frame_copy_props(out, in);
 
- fill_iplimage_from_picref(&inimg , in , inlink->format);
- fill_iplimage_from_picref(&outimg, out, inlink->format);
- ocv->end_frame_filter(ctx, &inimg, &outimg);
- fill_picref_from_iplimage(out, &outimg, inlink->format);
+ fill_iplimage_from_frame(&inimg , in , inlink->format);
+ fill_iplimage_from_frame(&outimg, out, inlink->format);
+ s->end_frame_filter(ctx, &inimg, &outimg);
+ fill_frame_from_iplimage(out, &outimg, inlink->format);
 
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 
 return ff_filter_frame(outlink, out);
 }
 
+#define OFFSET(x) offsetof(OCVContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "filter_name", NULL, OFFSET(name), AV_OPT_TYPE_STRING, .flags = FLAGS },
+ { "filter_params", NULL, OFFSET(params), AV_OPT_TYPE_STRING, .flags = FLAGS },
+ { NULL },
+};
+
+static const AVClass ocv_class = {
+ .class_name = "ocv",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_ocv_inputs[] = {
 {
 .name = "default",
 .type = AVMEDIA_TYPE_VIDEO,
 .filter_frame = filter_frame,
- .min_perms = AV_PERM_READ
 },
 { NULL }
 };
@@ -394,11 +403,12 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_ocv = {
+AVFilter ff_vf_ocv = {
 .name = "ocv",
 .description = NULL_IF_CONFIG_SMALL("Apply transform using libopencv."),
 
 .priv_size = sizeof(OCVContext),
+ .priv_class = &ocv_class,
 
 .query_formats = query_formats,
 .init = init,

libav-v9.6.tar.bz2/libavfilter/vf_lut.c -> libav-v10.1.tar.bz2/libavfilter/vf_lut.c Changed

@@ -24,6 +24,7 @@
 * value, and apply it to input video.
 */
 
+#include "libavutil/attributes.h"
 #include "libavutil/common.h"
 #include "libavutil/eval.h"
 #include "libavutil/mathematics.h"
@@ -84,62 +85,46 @@
 #define A 3
 
 #define OFFSET(x) offsetof(LutContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
 
 static const AVOption lut_options[] = {
- {"c0", "set component #0 expression", OFFSET(comp_expr_str[0]), AV_OPT_TYPE_STRING, {.str="val"}, CHAR_MIN, CHAR_MAX},
- {"c1", "set component #1 expression", OFFSET(comp_expr_str[1]), AV_OPT_TYPE_STRING, {.str="val"}, CHAR_MIN, CHAR_MAX},
- {"c2", "set component #2 expression", OFFSET(comp_expr_str[2]), AV_OPT_TYPE_STRING, {.str="val"}, CHAR_MIN, CHAR_MAX},
- {"c3", "set component #3 expression", OFFSET(comp_expr_str[3]), AV_OPT_TYPE_STRING, {.str="val"}, CHAR_MIN, CHAR_MAX},
- {"y", "set Y expression", OFFSET(comp_expr_str[Y]), AV_OPT_TYPE_STRING, {.str="val"}, CHAR_MIN, CHAR_MAX},
- {"u", "set U expression", OFFSET(comp_expr_str[U]), AV_OPT_TYPE_STRING, {.str="val"}, CHAR_MIN, CHAR_MAX},
- {"v", "set V expression", OFFSET(comp_expr_str[V]), AV_OPT_TYPE_STRING, {.str="val"}, CHAR_MIN, CHAR_MAX},
- {"r", "set R expression", OFFSET(comp_expr_str[R]), AV_OPT_TYPE_STRING, {.str="val"}, CHAR_MIN, CHAR_MAX},
- {"g", "set G expression", OFFSET(comp_expr_str[G]), AV_OPT_TYPE_STRING, {.str="val"}, CHAR_MIN, CHAR_MAX},
- {"b", "set B expression", OFFSET(comp_expr_str[B]), AV_OPT_TYPE_STRING, {.str="val"}, CHAR_MIN, CHAR_MAX},
- {"a", "set A expression", OFFSET(comp_expr_str[A]), AV_OPT_TYPE_STRING, {.str="val"}, CHAR_MIN, CHAR_MAX},
- {NULL},
+ { "c0", "set component #0 expression", OFFSET(comp_expr_str[0]), AV_OPT_TYPE_STRING, { .str = "val" }, .flags = FLAGS },
+ { "c1", "set component #1 expression", OFFSET(comp_expr_str[1]), AV_OPT_TYPE_STRING, { .str = "val" }, .flags = FLAGS },
+ { "c2", "set component #2 expression", OFFSET(comp_expr_str[2]), AV_OPT_TYPE_STRING, { .str = "val" }, .flags = FLAGS },
+ { "c3", "set component #3 expression", OFFSET(comp_expr_str[3]), AV_OPT_TYPE_STRING, { .str = "val" }, .flags = FLAGS },
+ { "y", "set Y expression", OFFSET(comp_expr_str[Y]), AV_OPT_TYPE_STRING, { .str = "val" }, .flags = FLAGS },
+ { "u", "set U expression", OFFSET(comp_expr_str[U]), AV_OPT_TYPE_STRING, { .str = "val" }, .flags = FLAGS },
+ { "v", "set V expression", OFFSET(comp_expr_str[V]), AV_OPT_TYPE_STRING, { .str = "val" }, .flags = FLAGS },
+ { "r", "set R expression", OFFSET(comp_expr_str[R]), AV_OPT_TYPE_STRING, { .str = "val" }, .flags = FLAGS },
+ { "g", "set G expression", OFFSET(comp_expr_str[G]), AV_OPT_TYPE_STRING, { .str = "val" }, .flags = FLAGS },
+ { "b", "set B expression", OFFSET(comp_expr_str[B]), AV_OPT_TYPE_STRING, { .str = "val" }, .flags = FLAGS },
+ { "a", "set A expression", OFFSET(comp_expr_str[A]), AV_OPT_TYPE_STRING, { .str = "val" }, .flags = FLAGS },
+ { NULL },
 };
 
-static const char *lut_get_name(void *ctx)
+static av_cold int init(AVFilterContext *ctx)
 {
- return "lut";
-}
-
-static const AVClass lut_class = {
- "LutContext",
- lut_get_name,
- lut_options
-};
+ LutContext *s = ctx->priv;
 
-static int init(AVFilterContext *ctx, const char *args)
-{
- LutContext *lut = ctx->priv;
- int ret;
+ s->var_values[VAR_PHI] = M_PHI;
+ s->var_values[VAR_PI] = M_PI;
+ s->var_values[VAR_E ] = M_E;
 
- lut->class = &lut_class;
- av_opt_set_defaults(lut);
-
- lut->var_values[VAR_PHI] = M_PHI;
- lut->var_values[VAR_PI] = M_PI;
- lut->var_values[VAR_E ] = M_E;
-
- lut->is_rgb = !strcmp(ctx->filter->name, "lutrgb");
- lut->is_yuv = !strcmp(ctx->filter->name, "lutyuv");
- if (args && (ret = av_set_options_string(lut, args, "=", ":")) < 0)
- return ret;
+ s->is_rgb = !strcmp(ctx->filter->name, "lutrgb");
+ s->is_yuv = !strcmp(ctx->filter->name, "lutyuv");
 
 return 0;
 }
 
 static av_cold void uninit(AVFilterContext *ctx)
 {
- LutContext *lut = ctx->priv;
+ LutContext *s = ctx->priv;
 int i;
 
 for (i = 0; i < 4; i++) {
- av_expr_free(lut->comp_expr[i]);
- lut->comp_expr[i] = NULL;
- av_freep(&lut->comp_expr_str[i]);
+ av_expr_free(s->comp_expr[i]);
+ s->comp_expr[i] = NULL;
+ av_freep(&s->comp_expr_str[i]);
 }
 }
 
@@ -155,16 +140,17 @@
 AV_PIX_FMT_ABGR, AV_PIX_FMT_BGRA, \
 AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24
 
-static enum AVPixelFormat yuv_pix_fmts[] = { YUV_FORMATS, AV_PIX_FMT_NONE };
-static enum AVPixelFormat rgb_pix_fmts[] = { RGB_FORMATS, AV_PIX_FMT_NONE };
-static enum AVPixelFormat all_pix_fmts[] = { RGB_FORMATS, YUV_FORMATS, AV_PIX_FMT_NONE };
+static const enum AVPixelFormat yuv_pix_fmts[] = { YUV_FORMATS, AV_PIX_FMT_NONE };
+static const enum AVPixelFormat rgb_pix_fmts[] = { RGB_FORMATS, AV_PIX_FMT_NONE };
+static const enum AVPixelFormat all_pix_fmts[] = { RGB_FORMATS, YUV_FORMATS, AV_PIX_FMT_NONE };
 
 static int query_formats(AVFilterContext *ctx)
 {
- LutContext *lut = ctx->priv;
+ LutContext *s = ctx->priv;
 
- enum AVPixelFormat *pix_fmts = lut->is_rgb ? rgb_pix_fmts :
- lut->is_yuv ? yuv_pix_fmts : all_pix_fmts;
+ const enum AVPixelFormat *pix_fmts = s->is_rgb ? rgb_pix_fmts :
+ s->is_yuv ? yuv_pix_fmts :
+ all_pix_fmts;
 
 ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
 return 0;
@@ -175,9 +161,9 @@
 */
 static double clip(void *opaque, double val)
 {
- LutContext *lut = opaque;
- double minval = lut->var_values[VAR_MINVAL];
- double maxval = lut->var_values[VAR_MAXVAL];
+ LutContext *s = opaque;
+ double minval = s->var_values[VAR_MINVAL];
+ double maxval = s->var_values[VAR_MAXVAL];
 
 return av_clip(val, minval, maxval);
 }
@@ -188,10 +174,10 @@
 */
 static double compute_gammaval(void *opaque, double gamma)
 {
- LutContext *lut = opaque;
- double val = lut->var_values[VAR_CLIPVAL];
- double minval = lut->var_values[VAR_MINVAL];
- double maxval = lut->var_values[VAR_MAXVAL];
+ LutContext *s = opaque;
+ double val = s->var_values[VAR_CLIPVAL];
+ double minval = s->var_values[VAR_MINVAL];
+ double maxval = s->var_values[VAR_MAXVAL];
 
 return pow((val-minval)/(maxval-minval), gamma) * (maxval-minval)+minval;
 }
@@ -211,16 +197,16 @@
 static int config_props(AVFilterLink *inlink)
 {
 AVFilterContext *ctx = inlink->dst;
- LutContext *lut = ctx->priv;
+ LutContext *s = ctx->priv;
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
 int min[4], max[4];
 int val, comp, ret;
 
- lut->hsub = desc->log2_chroma_w;
- lut->vsub = desc->log2_chroma_h;
+ s->hsub = desc->log2_chroma_w;
+ s->vsub = desc->log2_chroma_h;
 
- lut->var_values[VAR_W] = inlink->w;
- lut->var_values[VAR_H] = inlink->h;
+ s->var_values[VAR_W] = inlink->w;
+ s->var_values[VAR_H] = inlink->h;
 
 switch (inlink->format) {
 case AV_PIX_FMT_YUV410P:
@@ -240,90 +226,92 @@
 max[0] = max[1] = max[2] = max[3] = 255;
 }
 
- lut->is_yuv = lut->is_rgb = 0;
- if (ff_fmt_is_in(inlink->format, yuv_pix_fmts)) lut->is_yuv = 1;
- else if (ff_fmt_is_in(inlink->format, rgb_pix_fmts)) lut->is_rgb = 1;
+ s->is_yuv = s->is_rgb = 0;
+ if (ff_fmt_is_in(inlink->format, yuv_pix_fmts)) s->is_yuv = 1;
+ else if (ff_fmt_is_in(inlink->format, rgb_pix_fmts)) s->is_rgb = 1;
 
- if (lut->is_rgb) {
+ if (s->is_rgb) {
 switch (inlink->format) {
- case AV_PIX_FMT_ARGB: lut->rgba_map[A] = 0; lut->rgba_map[R] = 1; lut->rgba_map[G] = 2; lut->rgba_map[B] = 3; break;
- case AV_PIX_FMT_ABGR: lut->rgba_map[A] = 0; lut->rgba_map[B] = 1; lut->rgba_map[G] = 2; lut->rgba_map[R] = 3; break;
+ case AV_PIX_FMT_ARGB: s->rgba_map[A] = 0; s->rgba_map[R] = 1; s->rgba_map[G] = 2; s->rgba_map[B] = 3; break;
+ case AV_PIX_FMT_ABGR: s->rgba_map[A] = 0; s->rgba_map[B] = 1; s->rgba_map[G] = 2; s->rgba_map[R] = 3; break;
 case AV_PIX_FMT_RGBA:
- case AV_PIX_FMT_RGB24: lut->rgba_map[R] = 0; lut->rgba_map[G] = 1; lut->rgba_map[B] = 2; lut->rgba_map[A] = 3; break;
+ case AV_PIX_FMT_RGB24: s->rgba_map[R] = 0; s->rgba_map[G] = 1; s->rgba_map[B] = 2; s->rgba_map[A] = 3; break;
 case AV_PIX_FMT_BGRA:
- case AV_PIX_FMT_BGR24: lut->rgba_map[B] = 0; lut->rgba_map[G] = 1; lut->rgba_map[R] = 2; lut->rgba_map[A] = 3; break;
+ case AV_PIX_FMT_BGR24: s->rgba_map[B] = 0; s->rgba_map[G] = 1; s->rgba_map[R] = 2; s->rgba_map[A] = 3; break;
 }
- lut->step = av_get_bits_per_pixel(desc) >> 3;
+ s->step = av_get_bits_per_pixel(desc) >> 3;
 }
 
 for (comp = 0; comp < desc->nb_components; comp++) {
 double res;
 
 /* create the parsed expression */
- ret = av_expr_parse(&lut->comp_expr[comp], lut->comp_expr_str[comp],
+ av_expr_free(s->comp_expr[comp]);
+ s->comp_expr[comp] = NULL;
+ ret = av_expr_parse(&s->comp_expr[comp], s->comp_expr_str[comp],
 var_names, funcs1_names, funcs1, NULL, NULL, 0, ctx);
 if (ret < 0) {
 av_log(ctx, AV_LOG_ERROR,
 "Error when parsing the expression '%s' for the component %d.\n",
- lut->comp_expr_str[comp], comp);
+ s->comp_expr_str[comp], comp);
 return AVERROR(EINVAL);
 }
 
- /* compute the lut */
- lut->var_values[VAR_MAXVAL] = max[comp];
- lut->var_values[VAR_MINVAL] = min[comp];
+ /* compute the s */
+ s->var_values[VAR_MAXVAL] = max[comp];
+ s->var_values[VAR_MINVAL] = min[comp];
 
 for (val = 0; val < 256; val++) {
- lut->var_values[VAR_VAL] = val;
- lut->var_values[VAR_CLIPVAL] = av_clip(val, min[comp], max[comp]);
- lut->var_values[VAR_NEGVAL] =
- av_clip(min[comp] + max[comp] - lut->var_values[VAR_VAL],
+ s->var_values[VAR_VAL] = val;
+ s->var_values[VAR_CLIPVAL] = av_clip(val, min[comp], max[comp]);
+ s->var_values[VAR_NEGVAL] =
+ av_clip(min[comp] + max[comp] - s->var_values[VAR_VAL],
 min[comp], max[comp]);
 
- res = av_expr_eval(lut->comp_expr[comp], lut->var_values, lut);
+ res = av_expr_eval(s->comp_expr[comp], s->var_values, s);
 if (isnan(res)) {
 av_log(ctx, AV_LOG_ERROR,
 "Error when evaluating the expression '%s' for the value %d for the component #%d.\n",
- lut->comp_expr_str[comp], val, comp);
+ s->comp_expr_str[comp], val, comp);
 return AVERROR(EINVAL);
 }
- lut->lut[comp][val] = av_clip((int)res, min[comp], max[comp]);
- av_log(ctx, AV_LOG_DEBUG, "val[%d][%d] = %d\n", comp, val, lut->lut[comp][val]);
+ s->lut[comp][val] = av_clip((int)res, min[comp], max[comp]);
+ av_log(ctx, AV_LOG_DEBUG, "val[%d][%d] = %d\n", comp, val, s->lut[comp][val]);
 }
 }
 
 return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
+static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 {
 AVFilterContext *ctx = inlink->dst;
- LutContext *lut = ctx->priv;
+ LutContext *s = ctx->priv;
 AVFilterLink *outlink = ctx->outputs[0];
- AVFilterBufferRef *out;
+ AVFrame *out;
 uint8_t *inrow, *outrow, *inrow0, *outrow0;
 int i, j, k, plane;
 
- out = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
+ out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
 if (!out) {
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return AVERROR(ENOMEM);
 }
- avfilter_copy_buffer_ref_props(out, in);
+ av_frame_copy_props(out, in);
 
- if (lut->is_rgb) {
+ if (s->is_rgb) {
 /* packed */
 inrow0 = in ->data[0];
 outrow0 = out->data[0];
 
- for (i = 0; i < in->video->h; i ++) {
+ for (i = 0; i < in->height; i ++) {
 inrow = inrow0;
 outrow = outrow0;
 for (j = 0; j < inlink->w; j++) {
- for (k = 0; k < lut->step; k++)
- outrow[k] = lut->lut[lut->rgba_map[k]][inrow[k]];
- outrow += lut->step;
- inrow += lut->step;
+ for (k = 0; k < s->step; k++)
+ outrow[k] = s->lut[s->rgba_map[k]][inrow[k]];
+ outrow += s->step;
+ inrow += s->step;
 }
 inrow0 += in ->linesize[0];
 outrow0 += out->linesize[0];
@@ -331,22 +319,22 @@
 } else {
 /* planar */
 for (plane = 0; plane < 4 && in->data[plane]; plane++) {
- int vsub = plane == 1 || plane == 2 ? lut->vsub : 0;
- int hsub = plane == 1 || plane == 2 ? lut->hsub : 0;
+ int vsub = plane == 1 || plane == 2 ? s->vsub : 0;
+ int hsub = plane == 1 || plane == 2 ? s->hsub : 0;
 
 inrow = in ->data[plane];
 outrow = out->data[plane];
 
- for (i = 0; i < in->video->h >> vsub; i ++) {
+ for (i = 0; i < in->height >> vsub; i ++) {
 for (j = 0; j < inlink->w>>hsub; j++)
- outrow[j] = lut->lut[plane][inrow[j]];
+ outrow[j] = s->lut[plane][inrow[j]];
 inrow += in ->linesize[plane];
 outrow += out->linesize[plane];
 }
 }
 }
 
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return ff_filter_frame(outlink, out);
 }
 
@@ -355,7 +343,7 @@
 .type = AVMEDIA_TYPE_VIDEO,
 .filter_frame = filter_frame,
 .config_props = config_props,
- .min_perms = AV_PERM_READ, },
+ },
 { .name = NULL}
 };
 static const AVFilterPad outputs[] = {
@@ -363,11 +351,18 @@
 .type = AVMEDIA_TYPE_VIDEO, },
 { .name = NULL}
 };
-#define DEFINE_LUT_FILTER(name_, description_, init_) \
- AVFilter avfilter_vf_##name_ = { \
+#define DEFINE_LUT_FILTER(name_, description_, init_, options) \
+ static const AVClass name_ ## _class = { \
+ .class_name = #name_, \
+ .item_name = av_default_item_name, \
+ .option = options, \
+ .version = LIBAVUTIL_VERSION_INT, \
+ }; \
+ AVFilter ff_vf_##name_ = { \
 .name = #name_, \
 .description = NULL_IF_CONFIG_SMALL(description_), \
 .priv_size = sizeof(LutContext), \
+ .priv_class = &name_ ## _class, \
 \
 .init = init_, \
 .uninit = uninit, \
@@ -378,33 +373,41 @@
 }
 
 #if CONFIG_LUT_FILTER
-DEFINE_LUT_FILTER(lut, "Compute and apply a lookup table to the RGB/YUV input video.", init);
+DEFINE_LUT_FILTER(lut, "Compute and apply a lookup table to the RGB/YUV input video.", init, lut_options);
 #endif
 #if CONFIG_LUTYUV_FILTER
-DEFINE_LUT_FILTER(lutyuv, "Compute and apply a lookup table to the YUV input video.", init);
+DEFINE_LUT_FILTER(lutyuv, "Compute and apply a lookup table to the YUV input video.", init, lut_options);
 #endif
 #if CONFIG_LUTRGB_FILTER
-DEFINE_LUT_FILTER(lutrgb, "Compute and apply a lookup table to the RGB input video.", init);
+DEFINE_LUT_FILTER(lutrgb, "Compute and apply a lookup table to the RGB input video.", init, lut_options);
 #endif
 
 #if CONFIG_NEGATE_FILTER
 
-static int negate_init(AVFilterContext *ctx, const char *args)
-{
- LutContext *lut = ctx->priv;
- char lut_params[64];
+static const AVOption negate_options[] = {
+ { "negate_alpha", NULL, OFFSET(negate_alpha), AV_OPT_TYPE_INT, { .i64 = 0 }, .flags = FLAGS },
+ { NULL },
+};
 
- if (args)
- sscanf(args, "%d", &lut->negate_alpha);
+static av_cold int negate_init(AVFilterContext *ctx)
+{
+ LutContext *s = ctx->priv;
+ int i;
 
- av_log(ctx, AV_LOG_DEBUG, "negate_alpha:%d\n", lut->negate_alpha);
+ av_log(ctx, AV_LOG_DEBUG, "negate_alpha:%d\n", s->negate_alpha);
 
- snprintf(lut_params, sizeof(lut_params), "c0=negval:c1=negval:c2=negval:a=%s",
- lut->negate_alpha ? "negval" : "val");
+ for (i = 0; i < 4; i++) {
+ s->comp_expr_str[i] = av_strdup((i == 3 && s->negate_alpha) ?
+ "val" : "negval");
+ if (!s->comp_expr_str[i]) {
+ uninit(ctx);
+ return AVERROR(ENOMEM);
+ }
+ }
 
- return init(ctx, lut_params);
+ return init(ctx);
 }
 
-DEFINE_LUT_FILTER(negate, "Negate input video.", negate_init);
+DEFINE_LUT_FILTER(negate, "Negate input video.", negate_init, negate_options);
 
 #endif

libav-v9.6.tar.bz2/libavfilter/vf_null.c -> libav-v10.1.tar.bz2/libavfilter/vf_null.c Changed

libav-v9.6.tar.bz2/libavfilter/vf_overlay.c -> libav-v10.1.tar.bz2/libavfilter/vf_overlay.c Changed

@@ -34,6 +34,7 @@
 #include "libavutil/pixdesc.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
 #include "internal.h"
 #include "video.h"
 
@@ -59,41 +60,41 @@
 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
 
 typedef struct {
+ const AVClass *class;
 int x, y; ///< position of overlayed picture
 
 int max_plane_step[4]; ///< steps per pixel for each plane
 int hsub, vsub; ///< chroma subsampling values
 
- char x_expr[256], y_expr[256];
-
- AVFilterBufferRef *main;
- AVFilterBufferRef *over_prev, *over_next;
-} OverlayContext;
-
-static av_cold int init(AVFilterContext *ctx, const char *args)
-{
- OverlayContext *over = ctx->priv;
-
- av_strlcpy(over->x_expr, "0", sizeof(over->x_expr));
- av_strlcpy(over->y_expr, "0", sizeof(over->y_expr));
+ char *x_expr, *y_expr;
 
- if (args)
- sscanf(args, "%255[^:]:%255[^:]", over->x_expr, over->y_expr);
+ enum EOFAction eof_action; ///< action to take on EOF from source
 
- return 0;
-}
+ AVFrame *main;
+ AVFrame *over_prev, *over_next;
+} OverlayContext;
 
 static av_cold void uninit(AVFilterContext *ctx)
 {
 OverlayContext *s = ctx->priv;
 
- avfilter_unref_bufferp(&s->main);
- avfilter_unref_bufferp(&s->over_prev);
- avfilter_unref_bufferp(&s->over_next);
+ av_frame_free(&s->main);
+ av_frame_free(&s->over_prev);
+ av_frame_free(&s->over_next);
 }
 
 static int query_formats(AVFilterContext *ctx)
@@ -112,12 +113,12 @@
 
 static int config_input_main(AVFilterLink *inlink)
 {
- OverlayContext *over = inlink->dst->priv;
+ OverlayContext *s = inlink->dst->priv;
 const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(inlink->format);
 
- av_image_fill_max_pixsteps(over->max_plane_step, NULL, pix_desc);
- over->hsub = pix_desc->log2_chroma_w;
- over->vsub = pix_desc->log2_chroma_h;
+ av_image_fill_max_pixsteps(s->max_plane_step, NULL, pix_desc);
+ s->hsub = pix_desc->log2_chroma_w;
+ s->vsub = pix_desc->log2_chroma_h;
 
 return 0;
 }
@@ -125,7 +126,7 @@
 static int config_input_overlay(AVFilterLink *inlink)
 {
 AVFilterContext *ctx = inlink->dst;
- OverlayContext *over = inlink->dst->priv;
+ OverlayContext *s = inlink->dst->priv;
 char *expr;
 double var_values[VAR_VARS_NB], res;
 int ret;
@@ -141,36 +142,37 @@
 var_values[VAR_OVERLAY_W] = var_values[VAR_OW] = ctx->inputs[OVERLAY]->w;
 var_values[VAR_OVERLAY_H] = var_values[VAR_OH] = ctx->inputs[OVERLAY]->h;
 
- if ((ret = av_expr_parse_and_eval(&res, (expr = over->x_expr), var_names, var_values,
+ if ((ret = av_expr_parse_and_eval(&res, (expr = s->x_expr), var_names, var_values,
 NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
 goto fail;
- over->x = res;
- if ((ret = av_expr_parse_and_eval(&res, (expr = over->y_expr), var_names, var_values,
+ s->x = res;
+ if ((ret = av_expr_parse_and_eval(&res, (expr = s->y_expr), var_names, var_values,
 NULL, NULL, NULL, NULL, NULL, 0, ctx)))
 goto fail;
- over->y = res;
+ s->y = res;
 /* x may depend on y */
- if ((ret = av_expr_parse_and_eval(&res, (expr = over->x_expr), var_names, var_values,
+ if ((ret = av_expr_parse_and_eval(&res, (expr = s->x_expr), var_names, var_values,
 NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
 goto fail;
- over->x = res;
+ s->x = res;
 
 av_log(ctx, AV_LOG_VERBOSE,
- "main w:%d h:%d fmt:%s overlay x:%d y:%d w:%d h:%d fmt:%s\n",
+ "main w:%d h:%d fmt:%s overlay x:%d y:%d 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),
- over->x, over->y,
+ s->x, s->y,
 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]);
 
- if (over->x < 0 || over->y < 0 ||
- over->x + var_values[VAR_OVERLAY_W] > var_values[VAR_MAIN_W] ||
- over->y + var_values[VAR_OVERLAY_H] > var_values[VAR_MAIN_H]) {
+ if (s->x < 0 || s->y < 0 ||
+ s->x + var_values[VAR_OVERLAY_W] > var_values[VAR_MAIN_W] ||
+ s->y + var_values[VAR_OVERLAY_H] > var_values[VAR_MAIN_H]) {
 av_log(ctx, AV_LOG_ERROR,
 "Overlay area (%d,%d)<->(%d,%d) not within the main area (0,0)<->(%d,%d) or zero-sized\n",
- over->x, over->y,
- (int)(over->x + var_values[VAR_OVERLAY_W]),
- (int)(over->y + var_values[VAR_OVERLAY_H]),
+ s->x, s->y,
+ (int)(s->x + var_values[VAR_OVERLAY_W]),
+ (int)(s->y + var_values[VAR_OVERLAY_H]),
 (int)var_values[VAR_MAIN_W], (int)var_values[VAR_MAIN_H]);
 return AVERROR(EINVAL);
 }
@@ -194,17 +196,17 @@
 }
 
 static void blend_frame(AVFilterContext *ctx,
- AVFilterBufferRef *dst, AVFilterBufferRef *src,
+ AVFrame *dst, AVFrame *src,
 int x, int y)
 {
- OverlayContext *over = ctx->priv;
+ OverlayContext *s = ctx->priv;
 int i, j, k;
 int width, height;
- int overlay_end_y = y + src->video->h;
+ int overlay_end_y = y + src->height;
 int end_y, start_y;
 
- width = FFMIN(dst->video->w - x, src->video->w);
- end_y = FFMIN(dst->video->h, overlay_end_y);
+ width = FFMIN(dst->width - x, src->width);
+ end_y = FFMIN(dst->height, overlay_end_y);
 start_y = FFMAX(y, 0);
 height = end_y - start_y;
 
@@ -229,8 +231,8 @@
 }
 } else {
 for (i = 0; i < 3; i++) {
- int hsub = i ? over->hsub : 0;
- int vsub = i ? over->vsub : 0;
+ int hsub = i ? s->hsub : 0;
+ int vsub = i ? s->vsub : 0;
 uint8_t *dp = dst->data[i] + (x >> hsub) +
 (start_y >> vsub) * dst->linesize[i];
 uint8_t *sp = src->data[i];
@@ -269,7 +271,7 @@
 }
 }
 
-static int filter_frame_main(AVFilterLink *inlink, AVFilterBufferRef *frame)
+static int filter_frame_main(AVFilterLink *inlink, AVFrame *frame)
 {
 OverlayContext *s = inlink->dst->priv;
 
@@ -279,7 +281,7 @@
 return 0;
 }
 
-static int filter_frame_overlay(AVFilterLink *inlink, AVFilterBufferRef *frame)
+static int filter_frame_overlay(AVFilterLink *inlink, AVFrame *frame)
 {
 OverlayContext *s = inlink->dst->priv;
 
@@ -302,8 +304,12 @@
 static int handle_overlay_eof(AVFilterContext *ctx)
 {
 OverlayContext *s = ctx->priv;
- if (s->over_prev)
+ /* Repeat previous frame on secondary input */
+ if (s->over_prev && s->eof_action == EOF_ACTION_REPEAT)
 blend_frame(ctx, s->main, s->over_prev, s->x, s->y);
+ /* End both streams */
+ else if (s->eof_action == EOF_ACTION_ENDALL)
+ return AVERROR_EOF;
 return output_frame(ctx);
 }
 
@@ -322,8 +328,7 @@
 return ret;
 }
 
- /* get a new frame on the overlay input, on EOF
- * reuse previous */
+ /* get a new frame on the overlay input, on EOF check setting 'eof_action' */
 if (!s->over_next) {
 ret = ff_request_frame(ctx->inputs[OVERLAY]);
 if (ret == AVERROR_EOF)
@@ -335,8 +340,8 @@
 while (s->main->pts != AV_NOPTS_VALUE &&
 s->over_next->pts != AV_NOPTS_VALUE &&
 av_compare_ts(s->over_next->pts, tb_over, s->main->pts, tb_main) < 0) {
- avfilter_unref_bufferp(&s->over_prev);
- FFSWAP(AVFilterBufferRef*, s->over_prev, s->over_next);
+ av_frame_free(&s->over_prev);
+ FFSWAP(AVFrame*, s->over_prev, s->over_next);
 
 ret = ff_request_frame(ctx->inputs[OVERLAY]);
 if (ret == AVERROR_EOF)
@@ -349,8 +354,8 @@
 s->over_next->pts == AV_NOPTS_VALUE ||
 !av_compare_ts(s->over_next->pts, tb_over, s->main->pts, tb_main)) {
 blend_frame(ctx, s->main, s->over_next, s->x, s->y);
- avfilter_unref_bufferp(&s->over_prev);
- FFSWAP(AVFilterBufferRef*, s->over_prev, s->over_next);
+ av_frame_free(&s->over_prev);
+ FFSWAP(AVFrame*, s->over_prev, s->over_next);
 } else if (s->over_prev) {
 blend_frame(ctx, s->main, s->over_prev, s->x, s->y);
 }
@@ -358,14 +363,36 @@
 return output_frame(ctx);
 }
 
+#define OFFSET(x) offsetof(OverlayContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "x", "Horizontal position of the left edge of the overlaid video on the "
+ "main video.", OFFSET(x_expr), AV_OPT_TYPE_STRING, { .str = "0" }, .flags = FLAGS },
+ { "y", "Vertical position of the top edge of the overlaid video on the "
+ "main video.", OFFSET(y_expr), AV_OPT_TYPE_STRING, { .str = "0" }, .flags = 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" },
+ { NULL },
+};
+
+static const AVClass overlay_class = {
+ .class_name = "overlay",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_overlay_inputs[] = {
 {
 .name = "main",
 .type = AVMEDIA_TYPE_VIDEO,
 .config_props = config_input_main,
 .filter_frame = filter_frame_main,
- .min_perms = AV_PERM_READ,
- .rej_perms = AV_PERM_REUSE2 | AV_PERM_PRESERVE,
+ .needs_writable = 1,
 .needs_fifo = 1,
 },
 {
@@ -373,8 +400,6 @@
 .type = AVMEDIA_TYPE_VIDEO,
 .config_props = config_input_overlay,
 .filter_frame = filter_frame_overlay,
- .min_perms = AV_PERM_READ,
- .rej_perms = AV_PERM_REUSE2,
 .needs_fifo = 1,
 },
 { NULL }
@@ -390,14 +415,14 @@
 { 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,
 .uninit = uninit,
 
 .priv_size = sizeof(OverlayContext),
+ .priv_class = &overlay_class,
 
 .query_formats = query_formats,

libav-v9.6.tar.bz2/libavfilter/vf_pad.c -> libav-v10.1.tar.bz2/libavfilter/vf_pad.c Changed

@@ -37,6 +37,8 @@
 #include "libavutil/imgutils.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
+
 #include "drawutils.h"
 
 static const char *const var_names[] = {
@@ -93,14 +95,16 @@
 }
 
 typedef struct {
+ const AVClass *class;
 int w, h; ///< output dimensions, a value of 0 will result in the input size
 int x, y; ///< offsets of the input area with respect to the padded area
 int in_w, in_h; ///< width and height for the padded input video, which has to be aligned to the chroma values in order to avoid chroma issues
 
- char w_expr[256]; ///< width expression string
- char h_expr[256]; ///< height expression string
- char x_expr[256]; ///< width expression string
- char y_expr[256]; ///< height expression string
+ char *w_expr; ///< width expression string
+ char *h_expr; ///< height expression string
+ char *x_expr; ///< width expression string
+ char *y_expr; ///< height expression string
+ char *color_str;
 
 uint8_t color[4]; ///< color expressed either in YUVA or RGBA colorspace for the padding area
 uint8_t *line[4];
@@ -108,21 +112,11 @@
 int hsub, vsub; ///< chroma subsampling values
 } PadContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
- PadContext *pad = ctx->priv;
- char color_string[128] = "black";
-
- av_strlcpy(pad->w_expr, "iw", sizeof(pad->w_expr));
- av_strlcpy(pad->h_expr, "ih", sizeof(pad->h_expr));
- av_strlcpy(pad->x_expr, "0" , sizeof(pad->w_expr));
- av_strlcpy(pad->y_expr, "0" , sizeof(pad->h_expr));
+ PadContext *s = ctx->priv;
 
- if (args)
- sscanf(args, "%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255s",
- pad->w_expr, pad->h_expr, pad->x_expr, pad->y_expr, color_string);
-
- if (av_parse_color(pad->color, color_string, -1, ctx) < 0)
+ if (av_parse_color(s->color, s->color_str, -1, ctx) < 0)
 return AVERROR(EINVAL);
 
 return 0;
@@ -130,27 +124,27 @@
 
 static av_cold void uninit(AVFilterContext *ctx)
 {
- PadContext *pad = ctx->priv;
+ PadContext *s = ctx->priv;
 int i;
 
 for (i = 0; i < 4; i++) {
- av_freep(&pad->line[i]);
- pad->line_step[i] = 0;
+ av_freep(&s->line[i]);
+ s->line_step[i] = 0;
 }
 }
 
 static int config_input(AVFilterLink *inlink)
 {
 AVFilterContext *ctx = inlink->dst;
- PadContext *pad = ctx->priv;
+ PadContext *s = ctx->priv;
 const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(inlink->format);
 uint8_t rgba_color[4];
 int ret, is_packed_rgba;
 double var_values[VARS_NB], res;
 char *expr;
 
- pad->hsub = pix_desc->log2_chroma_w;
- pad->vsub = pix_desc->log2_chroma_h;
+ s->hsub = pix_desc->log2_chroma_w;
+ s->vsub = pix_desc->log2_chroma_h;
 
 var_values[VAR_PI] = M_PI;
 var_values[VAR_PHI] = M_PHI;
@@ -160,78 +154,78 @@
 var_values[VAR_OUT_W] = var_values[VAR_OW] = NAN;
 var_values[VAR_OUT_H] = var_values[VAR_OH] = NAN;
 var_values[VAR_A] = (double) inlink->w / inlink->h;
- var_values[VAR_HSUB] = 1<<pad->hsub;
- var_values[VAR_VSUB] = 1<<pad->vsub;
+ var_values[VAR_HSUB] = 1<<s->hsub;
+ var_values[VAR_VSUB] = 1<<s->vsub;
 
 /* evaluate width and height */
- av_expr_parse_and_eval(&res, (expr = pad->w_expr),
+ av_expr_parse_and_eval(&res, (expr = s->w_expr),
 var_names, var_values,
 NULL, NULL, NULL, NULL, NULL, 0, ctx);
- pad->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res;
- if ((ret = av_expr_parse_and_eval(&res, (expr = pad->h_expr),
+ s->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res;
+ if ((ret = av_expr_parse_and_eval(&res, (expr = s->h_expr),
 var_names, var_values,
 NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
 goto eval_fail;
- pad->h = var_values[VAR_OUT_H] = var_values[VAR_OH] = res;
+ s->h = var_values[VAR_OUT_H] = var_values[VAR_OH] = res;
 /* evaluate the width again, as it may depend on the evaluated output height */
- if ((ret = av_expr_parse_and_eval(&res, (expr = pad->w_expr),
+ if ((ret = av_expr_parse_and_eval(&res, (expr = s->w_expr),
 var_names, var_values,
 NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
 goto eval_fail;
- pad->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res;
+ s->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res;
 
 /* evaluate x and y */
- av_expr_parse_and_eval(&res, (expr = pad->x_expr),
+ av_expr_parse_and_eval(&res, (expr = s->x_expr),
 var_names, var_values,
 NULL, NULL, NULL, NULL, NULL, 0, ctx);
- pad->x = var_values[VAR_X] = res;
- if ((ret = av_expr_parse_and_eval(&res, (expr = pad->y_expr),
+ s->x = var_values[VAR_X] = res;
+ if ((ret = av_expr_parse_and_eval(&res, (expr = s->y_expr),
 var_names, var_values,
 NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
 goto eval_fail;
- pad->y = var_values[VAR_Y] = res;
+ s->y = var_values[VAR_Y] = res;
 /* evaluate x again, as it may depend on the evaluated y value */
- if ((ret = av_expr_parse_and_eval(&res, (expr = pad->x_expr),
+ if ((ret = av_expr_parse_and_eval(&res, (expr = s->x_expr),
 var_names, var_values,
 NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
 goto eval_fail;
- pad->x = var_values[VAR_X] = res;
+ s->x = var_values[VAR_X] = res;
 
 /* sanity check params */
- if (pad->w < 0 || pad->h < 0 || pad->x < 0 || pad->y < 0) {
+ if (s->w < 0 || s->h < 0 || s->x < 0 || s->y < 0) {
 av_log(ctx, AV_LOG_ERROR, "Negative values are not acceptable.\n");
 return AVERROR(EINVAL);
 }
 
- if (!pad->w)
- pad->w = inlink->w;
- if (!pad->h)
- pad->h = inlink->h;
+ if (!s->w)
+ s->w = inlink->w;
+ if (!s->h)
+ s->h = inlink->h;
 
- pad->w &= ~((1 << pad->hsub) - 1);
- pad->h &= ~((1 << pad->vsub) - 1);
- pad->x &= ~((1 << pad->hsub) - 1);
- pad->y &= ~((1 << pad->vsub) - 1);
+ s->w &= ~((1 << s->hsub) - 1);
+ s->h &= ~((1 << s->vsub) - 1);
+ s->x &= ~((1 << s->hsub) - 1);
+ s->y &= ~((1 << s->vsub) - 1);
 
- pad->in_w = inlink->w & ~((1 << pad->hsub) - 1);
- pad->in_h = inlink->h & ~((1 << pad->vsub) - 1);
+ s->in_w = inlink->w & ~((1 << s->hsub) - 1);
+ s->in_h = inlink->h & ~((1 << s->vsub) - 1);
 
- memcpy(rgba_color, pad->color, sizeof(rgba_color));
- ff_fill_line_with_color(pad->line, pad->line_step, pad->w, pad->color,
+ memcpy(rgba_color, s->color, sizeof(rgba_color));
+ ff_fill_line_with_color(s->line, s->line_step, s->w, s->color,
 inlink->format, rgba_color, &is_packed_rgba, NULL);
 
 av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d -> w:%d h:%d x:%d y:%d color:0x%02X%02X%02X%02X[%s]\n",
- inlink->w, inlink->h, pad->w, pad->h, pad->x, pad->y,
- pad->color[0], pad->color[1], pad->color[2], pad->color[3],
+ inlink->w, inlink->h, s->w, s->h, s->x, s->y,
+ s->color[0], s->color[1], s->color[2], s->color[3],
 is_packed_rgba ? "rgba" : "yuva");
 
- if (pad->x < 0 || pad->y < 0 ||
- pad->w <= 0 || pad->h <= 0 ||
- (unsigned)pad->x + (unsigned)inlink->w > pad->w ||
- (unsigned)pad->y + (unsigned)inlink->h > pad->h) {
+ if (s->x < 0 || s->y < 0 ||
+ s->w <= 0 || s->h <= 0 ||
+ (unsigned)s->x + (unsigned)inlink->w > s->w ||
+ (unsigned)s->y + (unsigned)inlink->h > s->h) {
 av_log(ctx, AV_LOG_ERROR,
 "Input area %d:%d:%d:%d not within the padded area 0:0:%d:%d or zero-sized\n",
- pad->x, pad->y, pad->x + inlink->w, pad->y + inlink->h, pad->w, pad->h);
+ s->x, s->y, s->x + inlink->w, s->y + inlink->h, s->w, s->h);
 return AVERROR(EINVAL);
 }
 
@@ -246,143 +240,193 @@
 
 static int config_output(AVFilterLink *outlink)
 {
- PadContext *pad = outlink->src->priv;
+ PadContext *s = outlink->src->priv;
 
- outlink->w = pad->w;
- outlink->h = pad->h;
+ outlink->w = s->w;
+ outlink->h = s->h;
 return 0;
 }
 
-static AVFilterBufferRef *get_video_buffer(AVFilterLink *inlink, int perms, int w, int h)
+static AVFrame *get_video_buffer(AVFilterLink *inlink, int w, int h)
 {
- PadContext *pad = inlink->dst->priv;
+ PadContext *s = inlink->dst->priv;
 
- AVFilterBufferRef *picref = ff_get_video_buffer(inlink->dst->outputs[0], perms,
- w + (pad->w - pad->in_w),
- h + (pad->h - pad->in_h));
+ AVFrame *frame = ff_get_video_buffer(inlink->dst->outputs[0],
+ w + (s->w - s->in_w),
+ h + (s->h - s->in_h));
 int plane;
 
- if (!picref)
+ if (!frame)
 return NULL;
 
- picref->video->w = w;
- picref->video->h = h;
+ frame->width = w;
+ frame->height = h;
 
- for (plane = 0; plane < 4 && picref->data[plane]; plane++) {
- int hsub = (plane == 1 || plane == 2) ? pad->hsub : 0;
- int vsub = (plane == 1 || plane == 2) ? pad->vsub : 0;
+ for (plane = 0; plane < 4 && frame->data[plane]; plane++) {
+ int hsub = (plane == 1 || plane == 2) ? s->hsub : 0;
+ int vsub = (plane == 1 || plane == 2) ? s->vsub : 0;
 
- picref->data[plane] += (pad->x >> hsub) * pad->line_step[plane] +
- (pad->y >> vsub) * picref->linesize[plane];
+ frame->data[plane] += (s->x >> hsub) * s->line_step[plane] +
+ (s->y >> vsub) * frame->linesize[plane];
 }
 
- return picref;
+ return frame;
 }
 
-static int does_clip(PadContext *pad, AVFilterBufferRef *outpicref, int plane, int hsub, int vsub, int x, int y)
+/* check whether each plane in this buffer can be padded without copying */
+static int buffer_needs_copy(PadContext *s, AVFrame *frame, AVBufferRef *buf)
 {
- int64_t x_in_buf, y_in_buf;
-
- x_in_buf = outpicref->data[plane] - outpicref->buf->data[plane]
- + (x >> hsub) * pad ->line_step[plane]
- + (y >> vsub) * outpicref->linesize [plane];
+ int planes[4] = { -1, -1, -1, -1}, *p = planes;
+ int i, j;
 
- if(x_in_buf < 0 || x_in_buf % pad->line_step[plane])
- return 1;
- x_in_buf /= pad->line_step[plane];
-
- av_assert0(outpicref->buf->linesize[plane]>0); //while reference can use negative linesize the main buffer should not
+ /* get all planes in this buffer */
+ for (i = 0; i < FF_ARRAY_ELEMS(planes) && frame->data[i]; i++) {
+ if (av_frame_get_plane_buffer(frame, i) == buf)
+ *p++ = i;
+ }
 
- y_in_buf = x_in_buf / outpicref->buf->linesize[plane];
- x_in_buf %= outpicref->buf->linesize[plane];
+ /* for each plane in this buffer, check that it can be padded without
+ * going over buffer bounds or other planes */
+ for (i = 0; i < FF_ARRAY_ELEMS(planes) && planes[i] >= 0; i++) {
+ int hsub = (planes[i] == 1 || planes[i] == 2) ? s->hsub : 0;
+ int vsub = (planes[i] == 1 || planes[i] == 2) ? s->vsub : 0;
+
+ uint8_t *start = frame->data[planes[i]];
+ uint8_t *end = start + (frame->height >> hsub) *
+ frame->linesize[planes[i]];
+
+ /* amount of free space needed before the start and after the end
+ * of the plane */
+ ptrdiff_t req_start = (s->x >> hsub) * s->line_step[planes[i]] +
+ (s->y >> vsub) * frame->linesize[planes[i]];
+ ptrdiff_t req_end = ((s->w - s->x - frame->width) >> hsub) *
+ s->line_step[planes[i]] +
+ (s->y >> vsub) * frame->linesize[planes[i]];
+
+ if (frame->linesize[planes[i]] < (s->w >> hsub) * s->line_step[planes[i]])
+ return 1;
+ if (start - buf->data < req_start ||
+ (buf->data + buf->size) - end < req_end)
+ return 1;
+
+#define SIGN(x) ((x) > 0 ? 1 : -1)
+ for (j = 0; j < FF_ARRAY_ELEMS(planes) && planes[j] >= 0; j++) {
+ int hsub1 = (planes[j] == 1 || planes[j] == 2) ? s->hsub : 0;
+ uint8_t *start1 = frame->data[planes[j]];
+ uint8_t *end1 = start1 + (frame->height >> hsub1) *
+ frame->linesize[planes[j]];
+ if (i == j)
+ continue;
+
+ if (SIGN(start - end1) != SIGN(start - end1 - req_start) ||
+ SIGN(end - start1) != SIGN(end - start1 + req_end))
+ return 1;
+ }
+ }
 
- if( y_in_buf<<vsub >= outpicref->buf->h
- || x_in_buf<<hsub >= outpicref->buf->w)
- return 1;
 return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
+static int frame_needs_copy(PadContext *s, AVFrame *frame)
 {
- PadContext *pad = inlink->dst->priv;
- AVFilterBufferRef *out = avfilter_ref_buffer(in, ~0);
- int plane, needs_copy;
-
- if (!out) {
- avfilter_unref_bufferp(&in);
- return AVERROR(ENOMEM);
- }
-
- for (plane = 0; plane < 4 && out->data[plane]; plane++) {
- int hsub = (plane == 1 || plane == 2) ? pad->hsub : 0;
- int vsub = (plane == 1 || plane == 2) ? pad->vsub : 0;
+ int i;
 
- av_assert0(out->buf->w > 0 && out->buf->h > 0);
+ if (!av_frame_is_writable(frame))
+ return 1;
 
- if (out->format != out->buf->format) //unsupported currently
- break;
+ for (i = 0; i < FF_ARRAY_ELEMS(frame->buf) && frame->buf[i]; i++)
+ if (buffer_needs_copy(s, frame, frame->buf[i]))
+ return 1;
+ return 0;
+}
 
- out->data[plane] -= (pad->x >> hsub) * pad->line_step[plane] +
- (pad->y >> vsub) * out->linesize [plane];
+static int filter_frame(AVFilterLink *inlink, AVFrame *in)
+{
+ PadContext *s = inlink->dst->priv;
+ AVFrame *out;
+ int needs_copy = frame_needs_copy(s, in);
 
- if (does_clip(pad, out, plane, hsub, vsub, 0, 0) ||
- does_clip(pad, out, plane, hsub, vsub, 0, pad->h - 1) ||
- does_clip(pad, out, plane, hsub, vsub, pad->w - 1, 0) ||
- does_clip(pad, out, plane, hsub, vsub, pad->w - 1, pad->h - 1))
- break;
- }
- needs_copy = plane < 4 && out->data[plane];
 if (needs_copy) {
 av_log(inlink->dst, AV_LOG_DEBUG, "Direct padding impossible allocating new frame\n");
- avfilter_unref_buffer(out);
- out = ff_get_video_buffer(inlink->dst->outputs[0], AV_PERM_WRITE | AV_PERM_NEG_LINESIZES,
- FFMAX(inlink->w, pad->w),
- FFMAX(inlink->h, pad->h));
+ out = ff_get_video_buffer(inlink->dst->outputs[0],
+ FFMAX(inlink->w, s->w),
+ FFMAX(inlink->h, s->h));
 if (!out) {
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return AVERROR(ENOMEM);
 }
 
- avfilter_copy_buffer_ref_props(out, in);
- }
+ av_frame_copy_props(out, in);
+ } else {
+ int i;
 
- out->video->w = pad->w;
- out->video->h = pad->h;
+ out = in;
+ for (i = 0; i < FF_ARRAY_ELEMS(out->data) && out->data[i]; i++) {
+ int hsub = (i == 1 || i == 2) ? s->hsub : 0;
+ int vsub = (i == 1 || i == 2) ? s->vsub : 0;
+ out->data[i] -= (s->x >> hsub) * s->line_step[i] +
+ (s->y >> vsub) * out->linesize[i];
+ }
+ }
 
 /* top bar */
- if (pad->y) {
+ if (s->y) {
 ff_draw_rectangle(out->data, out->linesize,
- pad->line, pad->line_step, pad->hsub, pad->vsub,
- 0, 0, pad->w, pad->y);
+ s->line, s->line_step, s->hsub, s->vsub,
+ 0, 0, s->w, s->y);
 }
 
 /* bottom bar */
- if (pad->h > pad->y + pad->in_h) {
+ if (s->h > s->y + s->in_h) {
 ff_draw_rectangle(out->data, out->linesize,
- pad->line, pad->line_step, pad->hsub, pad->vsub,
- 0, pad->y + pad->in_h, pad->w, pad->h - pad->y - pad->in_h);
+ s->line, s->line_step, s->hsub, s->vsub,
+ 0, s->y + s->in_h, s->w, s->h - s->y - s->in_h);
 }
 
 /* left border */
- ff_draw_rectangle(out->data, out->linesize, pad->line, pad->line_step,
- pad->hsub, pad->vsub, 0, pad->y, pad->x, in->video->h);
+ ff_draw_rectangle(out->data, out->linesize, s->line, s->line_step,
+ s->hsub, s->vsub, 0, s->y, s->x, in->height);
 
 if (needs_copy) {
 ff_copy_rectangle(out->data, out->linesize, in->data, in->linesize,
- pad->line_step, pad->hsub, pad->vsub,
- pad->x, pad->y, 0, in->video->w, in->video->h);
+ s->line_step, s->hsub, s->vsub,
+ s->x, s->y, 0, in->width, in->height);
 }
 
 /* right border */
 ff_draw_rectangle(out->data, out->linesize,
- pad->line, pad->line_step, pad->hsub, pad->vsub,
- pad->x + pad->in_w, pad->y, pad->w - pad->x - pad->in_w,
- in->video->h);
+ s->line, s->line_step, s->hsub, s->vsub,
+ s->x + s->in_w, s->y, s->w - s->x - s->in_w,
+ in->height);
+
+ out->width = s->w;
+ out->height = s->h;
 
- avfilter_unref_bufferp(&in);
+ if (in != out)
+ av_frame_free(&in);
 return ff_filter_frame(inlink->dst->outputs[0], out);
 }
 
+#define OFFSET(x) offsetof(PadContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "width", "Output video width", OFFSET(w_expr), AV_OPT_TYPE_STRING, { .str = "iw" }, .flags = FLAGS },
+ { "height", "Output video height", OFFSET(h_expr), AV_OPT_TYPE_STRING, { .str = "ih" }, .flags = FLAGS },
+ { "x", "Horizontal position of the left edge of the input video in the "
+ "output video", OFFSET(x_expr), AV_OPT_TYPE_STRING, { .str = "0" }, .flags = FLAGS },
+ { "y", "Vertical position of the top edge of the input video in the "
+ "output video", OFFSET(y_expr), AV_OPT_TYPE_STRING, { .str = "0" }, .flags = FLAGS },
+ { "color", "Color of the padded area", OFFSET(color_str), AV_OPT_TYPE_STRING, { .str = "black" }, .flags = FLAGS },
+ { NULL },
+};
+
+static const AVClass pad_class = {
+ .class_name = "pad",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_pad_inputs[] = {
 {
 .name = "default",
@@ -403,11 +447,12 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_pad = {
+AVFilter ff_vf_pad = {
 .name = "pad",
 .description = NULL_IF_CONFIG_SMALL("Pad input image to width:height[:x:y[:color]] (default x and y: 0, default color: black)."),
 
 .priv_size = sizeof(PadContext),
+ .priv_class = &pad_class,
 .init = init,
 .uninit = uninit,
 .query_formats = query_formats,

libav-v9.6.tar.bz2/libavfilter/vf_pixdesctest.c -> libav-v10.1.tar.bz2/libavfilter/vf_pixdesctest.c Changed

@@ -46,27 +46,27 @@
 
 priv->pix_desc = av_pix_fmt_desc_get(inlink->format);
 
+ av_freep(&priv->line);
 if (!(priv->line = av_malloc(sizeof(*priv->line) * inlink->w)))
 return AVERROR(ENOMEM);
 
 return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
+static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 {
 PixdescTestContext *priv = inlink->dst->priv;
 AVFilterLink *outlink = inlink->dst->outputs[0];
- AVFilterBufferRef *out;
+ AVFrame *out;
 int i, c, w = inlink->w, h = inlink->h;
 
- out = ff_get_video_buffer(outlink, AV_PERM_WRITE,
- outlink->w, outlink->h);
+ out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
 if (!out) {
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return AVERROR(ENOMEM);
 }
 
- avfilter_copy_buffer_ref_props(out, in);
+ av_frame_copy_props(out, in);
 
 for (i = 0; i < 4; i++) {
 int h = outlink->h;
@@ -79,8 +79,8 @@
 }
 
 /* copy palette */
- if (priv->pix_desc->flags & PIX_FMT_PAL ||
- priv->pix_desc->flags & PIX_FMT_PSEUDOPAL)
+ if (priv->pix_desc->flags & AV_PIX_FMT_FLAG_PAL ||
+ priv->pix_desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)
 memcpy(out->data[1], in->data[1], 256*4);
 
 for (c = 0; c < priv->pix_desc->nb_components; c++) {
@@ -102,7 +102,7 @@
 }
 }
 
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return ff_filter_frame(outlink, out);
 }
 
@@ -112,7 +112,6 @@
 .type = AVMEDIA_TYPE_VIDEO,
 .filter_frame = filter_frame,
 .config_props = config_props,
- .min_perms = AV_PERM_READ,
 },
 { NULL }
 };
@@ -125,7 +124,7 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_pixdesctest = {
+AVFilter ff_vf_pixdesctest = {
 .name = "pixdesctest",
 .description = NULL_IF_CONFIG_SMALL("Test pixel format definitions."),

libav-v9.6.tar.bz2/libavfilter/vf_scale.c -> libav-v10.1.tar.bz2/libavfilter/vf_scale.c Changed

@@ -69,6 +69,7 @@
 };
 
 typedef struct {
+ const AVClass *class;
 struct SwsContext *sws; ///< software scaler context
 
 /**
@@ -83,31 +84,23 @@
 int slice_y; ///< top of current output slice
 int input_is_pal; ///< set to 1 if the input format is paletted
 
- char w_expr[256]; ///< width expression string
- char h_expr[256]; ///< height expression string
+ char *w_expr; ///< width expression string
+ char *h_expr; ///< height expression string
+ char *flags_str;
 } ScaleContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
 ScaleContext *scale = ctx->priv;
- const char *p;
-
- av_strlcpy(scale->w_expr, "iw", sizeof(scale->w_expr));
- av_strlcpy(scale->h_expr, "ih", sizeof(scale->h_expr));
-
- scale->flags = SWS_BILINEAR;
- if (args) {
- sscanf(args, "%255[^:]:%255[^:]", scale->w_expr, scale->h_expr);
- p = strstr(args,"flags=");
- if (p) {
- const AVClass *class = sws_get_class();
- const AVOption *o = av_opt_find(&class, "sws_flags", NULL, 0,
- AV_OPT_SEARCH_FAKE_OBJ);
- int ret = av_opt_eval_flags(&class, o, p + 6, &scale->flags);
-
- if (ret < 0)
- return ret;
- }
+
+ if (scale->flags_str) {
+ const AVClass *class = sws_get_class();
+ const AVOption *o = av_opt_find(&class, "sws_flags", NULL, 0,
+ AV_OPT_SEARCH_FAKE_OBJ);
+ int ret = av_opt_eval_flags(&class, o, scale->flags_str, &scale->flags);
+
+ if (ret < 0)
+ return ret;
 }
 
 return 0;
@@ -129,7 +122,8 @@
 if (ctx->inputs[0]) {
 formats = NULL;
 for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++)
- if ( sws_isSupportedInput(pix_fmt)
+ if ((sws_isSupportedInput(pix_fmt) ||
+ sws_isSupportedEndiannessConversion(pix_fmt))
 && (ret = ff_add_format(&formats, pix_fmt)) < 0) {
 ff_formats_unref(&formats);
 return ret;
@@ -139,7 +133,8 @@
 if (ctx->outputs[0]) {
 formats = NULL;
 for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++)
- if ( sws_isSupportedOutput(pix_fmt)
+ if ((sws_isSupportedOutput(pix_fmt) ||
+ sws_isSupportedEndiannessConversion(pix_fmt))
 && (ret = ff_add_format(&formats, pix_fmt)) < 0) {
 ff_formats_unref(&formats);
 return ret;
@@ -168,9 +163,10 @@
 var_values[VAR_IN_H] = var_values[VAR_IH] = inlink->h;
 var_values[VAR_OUT_W] = var_values[VAR_OW] = NAN;
 var_values[VAR_OUT_H] = var_values[VAR_OH] = NAN;
- var_values[VAR_DAR] = var_values[VAR_A] = (double) inlink->w / 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;
 
@@ -225,8 +221,8 @@
 outlink->w, outlink->h, av_get_pix_fmt_name(outlink->format),
 scale->flags);
 
- scale->input_is_pal = desc->flags & PIX_FMT_PAL ||
- desc->flags & PIX_FMT_PSEUDOPAL;
+ scale->input_is_pal = desc->flags & AV_PIX_FMT_FLAG_PAL ||
+ desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL;
 
 if (scale->sws)
 sws_freeContext(scale->sws);
@@ -257,11 +253,11 @@
 return ret;
 }
 
-static int filter_frame(AVFilterLink *link, AVFilterBufferRef *in)
+static int filter_frame(AVFilterLink *link, AVFrame *in)
 {
 ScaleContext *scale = link->dst->priv;
 AVFilterLink *outlink = link->dst->outputs[0];
- AVFilterBufferRef *out;
+ AVFrame *out;
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format);
 
 if (!scale->sws)
@@ -270,34 +266,49 @@
 scale->hsub = desc->log2_chroma_w;
 scale->vsub = desc->log2_chroma_h;
 
- out = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
+ out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
 if (!out) {
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return AVERROR(ENOMEM);
 }
 
- avfilter_copy_buffer_ref_props(out, in);
- out->video->w = outlink->w;
- out->video->h = outlink->h;
+ av_frame_copy_props(out, in);
+ out->width = outlink->w;
+ out->height = outlink->h;
 
- av_reduce(&out->video->pixel_aspect.num, &out->video->pixel_aspect.den,
- (int64_t)in->video->pixel_aspect.num * outlink->h * link->w,
- (int64_t)in->video->pixel_aspect.den * outlink->w * link->h,
+ av_reduce(&out->sample_aspect_ratio.num, &out->sample_aspect_ratio.den,
+ (int64_t)in->sample_aspect_ratio.num * outlink->h * link->w,
+ (int64_t)in->sample_aspect_ratio.den * outlink->w * link->h,
 INT_MAX);
 
- sws_scale(scale->sws, in->data, in->linesize, 0, in->video->h,
+ sws_scale(scale->sws, in->data, in->linesize, 0, in->height,
 out->data, out->linesize);
 
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return ff_filter_frame(outlink, out);
 }
 
+#define OFFSET(x) offsetof(ScaleContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "w", "Output video width", OFFSET(w_expr), AV_OPT_TYPE_STRING, { .str = "iw" }, .flags = FLAGS },
+ { "h", "Output video height", OFFSET(h_expr), AV_OPT_TYPE_STRING, { .str = "ih" }, .flags = FLAGS },
+ { "flags", "Flags to pass to libswscale", OFFSET(flags_str), AV_OPT_TYPE_STRING, { .str = "bilinear" }, .flags = FLAGS },
+ { NULL },
+};
+
+static const AVClass scale_class = {
+ .class_name = "scale",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_scale_inputs[] = {
 {
 .name = "default",
 .type = AVMEDIA_TYPE_VIDEO,
 .filter_frame = filter_frame,
- .min_perms = AV_PERM_READ,
 },
 { NULL }
 };
@@ -311,7 +322,7 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_scale = {
+AVFilter ff_vf_scale = {
 .name = "scale",
 .description = NULL_IF_CONFIG_SMALL("Scale the input video to width:height size and/or convert the image format."),
 
@@ -321,6 +332,7 @@
 .query_formats = query_formats,
 
 .priv_size = sizeof(ScaleContext),
+ .priv_class = &scale_class,
 
 .inputs = avfilter_vf_scale_inputs,
 .outputs = avfilter_vf_scale_outputs,

libav-v9.6.tar.bz2/libavfilter/vf_select.c -> libav-v10.1.tar.bz2/libavfilter/vf_select.c Changed

@@ -27,6 +27,7 @@
 #include "libavutil/fifo.h"
 #include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
 #include "avfilter.h"
 #include "internal.h"
 #include "video.h"
@@ -108,7 +109,6 @@
 VAR_PREV_SELECTED_N,
 
 VAR_KEY,
- VAR_POS,
 
 VAR_VARS_NB
 };
@@ -116,6 +116,8 @@
 #define FIFO_SIZE 8
 
 typedef struct {
+ const AVClass *class;
+ char *expr_str;
 AVExpr *expr;
 double var_values[VAR_VARS_NB];
 double select;
@@ -123,18 +125,19 @@
 AVFifoBuffer *pending_frames; ///< FIFO buffer of video frames
 } SelectContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
 SelectContext *select = ctx->priv;
 int ret;
 
- if ((ret = av_expr_parse(&select->expr, args ? args : "1",
+ if ((ret = av_expr_parse(&select->expr, select->expr_str,
 var_names, NULL, NULL, NULL, NULL, 0, ctx)) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error while parsing expression '%s'\n", args);
+ av_log(ctx, AV_LOG_ERROR, "Error while parsing expression '%s'\n",
+ select->expr_str);
 return ret;
 }
 
- select->pending_frames = av_fifo_alloc(FIFO_SIZE*sizeof(AVFilterBufferRef*));
+ select->pending_frames = av_fifo_alloc(FIFO_SIZE*sizeof(AVFrame*));
 if (!select->pending_frames) {
 av_log(ctx, AV_LOG_ERROR, "Failed to allocate pending frames buffer.\n");
 return AVERROR(ENOMEM);
@@ -181,35 +184,33 @@
 #define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d))
 #define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
 
-static int select_frame(AVFilterContext *ctx, AVFilterBufferRef *picref)
+static int select_frame(AVFilterContext *ctx, AVFrame *frame)
 {
 SelectContext *select = ctx->priv;
 AVFilterLink *inlink = ctx->inputs[0];
 double res;
 
 if (isnan(select->var_values[VAR_START_PTS]))
- select->var_values[VAR_START_PTS] = TS2D(picref->pts);
+ select->var_values[VAR_START_PTS] = TS2D(frame->pts);
 if (isnan(select->var_values[VAR_START_T]))
- select->var_values[VAR_START_T] = TS2D(picref->pts) * av_q2d(inlink->time_base);
+ select->var_values[VAR_START_T] = TS2D(frame->pts) * av_q2d(inlink->time_base);
 
- select->var_values[VAR_PTS] = TS2D(picref->pts);
- select->var_values[VAR_T ] = TS2D(picref->pts) * av_q2d(inlink->time_base);
- select->var_values[VAR_POS] = picref->pos == -1 ? NAN : picref->pos;
- select->var_values[VAR_PREV_PTS] = TS2D(picref ->pts);
+ select->var_values[VAR_PTS] = TS2D(frame->pts);
+ select->var_values[VAR_T ] = TS2D(frame->pts) * av_q2d(inlink->time_base);
+ select->var_values[VAR_PREV_PTS] = TS2D(frame->pts);
 
 select->var_values[VAR_INTERLACE_TYPE] =
- !picref->video->interlaced ? INTERLACE_TYPE_P :
- picref->video->top_field_first ? INTERLACE_TYPE_T : INTERLACE_TYPE_B;
- select->var_values[VAR_PICT_TYPE] = picref->video->pict_type;
+ !frame->interlaced_frame ? INTERLACE_TYPE_P :
+ frame->top_field_first ? INTERLACE_TYPE_T : INTERLACE_TYPE_B;
+ select->var_values[VAR_PICT_TYPE] = frame->pict_type;
 
 res = av_expr_eval(select->expr, select->var_values, NULL);
 av_log(inlink->dst, AV_LOG_DEBUG,
- "n:%d pts:%d t:%f pos:%d interlace_type:%c key:%d pict_type:%c "
+ "n:%d pts:%d t:%f interlace_type:%c key:%d pict_type:%c "
 "-> select:%f\n",
 (int)select->var_values[VAR_N],
 (int)select->var_values[VAR_PTS],
 select->var_values[VAR_T],
- (int)select->var_values[VAR_POS],
 select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_P ? 'P' :
 select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_T ? 'T' :
 select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_B ? 'B' : '?',
@@ -228,7 +229,7 @@
 return res;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
+static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 {
 SelectContext *select = inlink->dst->priv;
 
@@ -239,7 +240,7 @@
 if (!av_fifo_space(select->pending_frames)) {
 av_log(inlink->dst, AV_LOG_ERROR,
 "Buffering limit reached, cannot cache more frames\n");
- avfilter_unref_bufferp(&frame);
+ av_frame_free(&frame);
 } else
 av_fifo_generic_write(select->pending_frames, &frame,
 sizeof(frame), NULL);
@@ -248,7 +249,7 @@
 return ff_filter_frame(inlink->dst->outputs[0], frame);
 }
 
- avfilter_unref_bufferp(&frame);
+ av_frame_free(&frame);
 return 0;
 }
 
@@ -260,10 +261,10 @@
 select->select = 0;
 
 if (av_fifo_size(select->pending_frames)) {
- AVFilterBufferRef *picref;
+ AVFrame *frame;
 
- av_fifo_generic_read(select->pending_frames, &picref, sizeof(picref), NULL);
- return ff_filter_frame(outlink, picref);
+ av_fifo_generic_read(select->pending_frames, &frame, sizeof(frame), NULL);
+ return ff_filter_frame(outlink, frame);
 }
 
 while (!select->select) {
@@ -294,24 +295,38 @@
 select->cache_frames = 0;
 }
 
- return av_fifo_size(select->pending_frames)/sizeof(AVFilterBufferRef *);
+ return av_fifo_size(select->pending_frames)/sizeof(AVFrame*);
 }
 
 static av_cold void uninit(AVFilterContext *ctx)
 {
 SelectContext *select = ctx->priv;
- AVFilterBufferRef *picref;
+ AVFrame *frame;
 
 av_expr_free(select->expr);
 select->expr = NULL;
 
 while (select->pending_frames &&
- av_fifo_generic_read(select->pending_frames, &picref, sizeof(picref), NULL) == sizeof(picref))
- avfilter_unref_buffer(picref);
+ av_fifo_generic_read(select->pending_frames, &frame, sizeof(frame), NULL) == sizeof(frame))
+ av_frame_free(&frame);
 av_fifo_free(select->pending_frames);
 select->pending_frames = NULL;
 }
 
+#define OFFSET(x) offsetof(SelectContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "expr", "An expression to use for selecting frames", OFFSET(expr_str), AV_OPT_TYPE_STRING, { .str = "1" }, .flags = FLAGS },
+ { NULL },
+};
+
+static const AVClass select_class = {
+ .class_name = "select",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_select_inputs[] = {
 {
 .name = "default",
@@ -333,13 +348,14 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_select = {
+AVFilter ff_vf_select = {
 .name = "select",
 .description = NULL_IF_CONFIG_SMALL("Select frames to pass in output."),
 .init = init,
 .uninit = uninit,
 
 .priv_size = sizeof(SelectContext),
+ .priv_class = &select_class,
 
 .inputs = avfilter_vf_select_inputs,
 .outputs = avfilter_vf_select_outputs,

libav-v9.6.tar.bz2/libavfilter/vf_settb.c -> libav-v10.1.tar.bz2/libavfilter/vf_settb.c Changed

@@ -30,6 +30,7 @@
 #include "libavutil/eval.h"
 #include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
 #include "libavutil/rational.h"
 #include "avfilter.h"
 #include "internal.h"
@@ -54,21 +55,11 @@
 };
 
 typedef struct {
-    char tb_expr[256];
+    const AVClass *class;
+    char *tb_expr;
     double var_values[VAR_VARS_NB];
 } SetTBContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
-{
-    SetTBContext *settb = ctx->priv;
-    av_strlcpy(settb->tb_expr, "intb", sizeof(settb->tb_expr));
-
-    if (args)
-        sscanf(args, "%255[^:]", settb->tb_expr);
-
-    return 0;
-}
-
 static int config_output_props(AVFilterLink *outlink)
 {
     AVFilterContext *ctx = outlink->src;
@@ -108,7 +99,7 @@
     return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
+static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 {
     AVFilterContext *ctx = inlink->dst;
     AVFilterLink *outlink = ctx->outputs[0];
@@ -124,6 +115,20 @@
     return ff_filter_frame(outlink, frame);
 }
 
+#define OFFSET(x) offsetof(SetTBContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+    { "expr", "Expression determining the output timebase", OFFSET(tb_expr), AV_OPT_TYPE_STRING, { .str = "intb" }, .flags = FLAGS },
+    { NULL },
+};
+
+static const AVClass settb_class = {
+    .class_name = "settb",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_settb_inputs[] = {
     {
         .name             = "default",
@@ -143,12 +148,12 @@
     { NULL }
 };
 
-AVFilter avfilter_vf_settb = {
+AVFilter ff_vf_settb = {
     .name      = "settb",
     .description = NULL_IF_CONFIG_SMALL("Set timebase for the output link."),
-    .init      = init,
 
     .priv_size = sizeof(SetTBContext),
+    .priv_class = &settb_class,
 
     .inputs    = avfilter_vf_settb_inputs,

libav-v9.6.tar.bz2/libavfilter/vf_showinfo.c -> libav-v10.1.tar.bz2/libavfilter/vf_showinfo.c Changed

@@ -34,14 +34,7 @@
 unsigned int frame;
 } ShowInfoContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
-{
- ShowInfoContext *showinfo = ctx->priv;
- showinfo->frame = 0;
- return 0;
-}
-
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
+static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 {
 AVFilterContext *ctx = inlink->dst;
 ShowInfoContext *showinfo = ctx->priv;
@@ -50,7 +43,7 @@
 int i, plane, vsub = desc->log2_chroma_h;
 
 for (plane = 0; frame->data[plane] && plane < 4; plane++) {
- size_t linesize = av_image_get_linesize(frame->format, frame->video->w, plane);
+ size_t linesize = av_image_get_linesize(frame->format, frame->width, plane);
 uint8_t *data = frame->data[plane];
 int h = plane == 1 || plane == 2 ? inlink->h >> vsub : inlink->h;
 
@@ -62,18 +55,18 @@
 }
 
 av_log(ctx, AV_LOG_INFO,
- "n:%d pts:%"PRId64" pts_time:%f pos:%"PRId64" "
+ "n:%d pts:%"PRId64" pts_time:%f "
 "fmt:%s sar:%d/%d s:%dx%d i:%c iskey:%d type:%c "
 "checksum:%u plane_checksum:[%u %u %u %u]\n",
 showinfo->frame,
- frame->pts, frame->pts * av_q2d(inlink->time_base), frame->pos,
+ frame->pts, frame->pts * av_q2d(inlink->time_base),
 desc->name,
- frame->video->pixel_aspect.num, frame->video->pixel_aspect.den,
- frame->video->w, frame->video->h,
- !frame->video->interlaced ? 'P' : /* Progressive */
- frame->video->top_field_first ? 'T' : 'B', /* Top / Bottom */
- frame->video->key_frame,
- av_get_picture_type_char(frame->video->pict_type),
+ frame->sample_aspect_ratio.num, frame->sample_aspect_ratio.den,
+ frame->width, frame->height,
+ !frame->interlaced_frame ? 'P' : /* Progressive */
+ frame->top_field_first ? 'T' : 'B', /* Top / Bottom */
+ frame->key_frame,
+ av_get_picture_type_char(frame->pict_type),
 checksum, plane_checksum[0], plane_checksum[1], plane_checksum[2], plane_checksum[3]);
 
 showinfo->frame++;
@@ -86,7 +79,6 @@
 .type = AVMEDIA_TYPE_VIDEO,
 .get_video_buffer = ff_null_get_video_buffer,
 .filter_frame = filter_frame,
- .min_perms = AV_PERM_READ,
 },
 { NULL }
 };
@@ -99,12 +91,11 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_showinfo = {
+AVFilter ff_vf_showinfo = {
 .name = "showinfo",
 .description = NULL_IF_CONFIG_SMALL("Show textual information for each video frame."),
 
 .priv_size = sizeof(ShowInfoContext),
- .init = init,
 
 .inputs = avfilter_vf_showinfo_inputs,

libav-v9.6.tar.bz2/libavfilter/vf_transpose.c -> libav-v10.1.tar.bz2/libavfilter/vf_transpose.c Changed

@@ -31,38 +31,27 @@
 #include "libavutil/pixdesc.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
+#include "libavutil/opt.h"
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
 #include "video.h"
 
+enum TransposeDir {
+ TRANSPOSE_CCLOCK_FLIP,
+ TRANSPOSE_CLOCK,
+ TRANSPOSE_CCLOCK,
+ TRANSPOSE_CLOCK_FLIP,
+};
+
 typedef struct {
+ const AVClass *class;
 int hsub, vsub;
 int pixsteps[4];
 
- /* 0 Rotate by 90 degrees counterclockwise and vflip. */
- /* 1 Rotate by 90 degrees clockwise. */
- /* 2 Rotate by 90 degrees counterclockwise. */
- /* 3 Rotate by 90 degrees clockwise and vflip. */
- int dir;
+ enum TransposeDir dir;
 } TransContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
-{
- TransContext *trans = ctx->priv;
- trans->dir = 0;
-
- if (args)
- sscanf(args, "%d", &trans->dir);
-
- if (trans->dir < 0 || trans->dir > 3) {
- av_log(ctx, AV_LOG_ERROR, "Invalid value %d not between 0 and 3.\n",
- trans->dir);
- return AVERROR(EINVAL);
- }
- return 0;
-}
-
 static int query_formats(AVFilterContext *ctx)
 {
 enum AVPixelFormat pix_fmts[] = {
@@ -121,35 +110,35 @@
 return 0;
 }
 
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
+static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 {
 AVFilterLink *outlink = inlink->dst->outputs[0];
 TransContext *trans = inlink->dst->priv;
- AVFilterBufferRef *out;
+ AVFrame *out;
 int plane;
 
- out = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
+ out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
 if (!out) {
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return AVERROR(ENOMEM);
 }
 
 out->pts = in->pts;
 
- if (in->video->pixel_aspect.num == 0) {
- out->video->pixel_aspect = in->video->pixel_aspect;
+ if (in->sample_aspect_ratio.num == 0) {
+ out->sample_aspect_ratio = in->sample_aspect_ratio;
 } else {
- out->video->pixel_aspect.num = in->video->pixel_aspect.den;
- out->video->pixel_aspect.den = in->video->pixel_aspect.num;
+ out->sample_aspect_ratio.num = in->sample_aspect_ratio.den;
+ out->sample_aspect_ratio.den = in->sample_aspect_ratio.num;
 }
 
 for (plane = 0; out->data[plane]; plane++) {
 int hsub = plane == 1 || plane == 2 ? trans->hsub : 0;
 int vsub = plane == 1 || plane == 2 ? trans->vsub : 0;
 int pixstep = trans->pixsteps[plane];
- int inh = in->video->h>>vsub;
- int outw = out->video->w>>hsub;
- int outh = out->video->h>>vsub;
+ int inh = in->height >> vsub;
+ int outw = out->width >> hsub;
+ int outh = out->height >> vsub;
 uint8_t *dst, *src;
 int dstlinesize, srclinesize;
 int x, y;
@@ -194,16 +183,34 @@
 }
 }
 
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return ff_filter_frame(outlink, out);
 }
 
+#define OFFSET(x) offsetof(TransContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "dir", "Transpose direction", OFFSET(dir), AV_OPT_TYPE_INT, { .i64 = TRANSPOSE_CCLOCK_FLIP },
+ TRANSPOSE_CCLOCK_FLIP, TRANSPOSE_CLOCK_FLIP, FLAGS, "dir" },
+ { "cclock_flip", "counter-clockwise with vertical flip", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK_FLIP }, .unit = "dir" },
+ { "clock", "clockwise", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK }, .unit = "dir" },
+ { "cclock", "counter-clockwise", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK }, .unit = "dir" },
+ { "clock_flip", "clockwise with vertical flip", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK_FLIP }, .unit = "dir" },
+ { NULL },
+};
+
+static const AVClass transpose_class = {
+ .class_name = "transpose",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_transpose_inputs[] = {
 {
 .name = "default",
 .type = AVMEDIA_TYPE_VIDEO,
 .filter_frame = filter_frame,
- .min_perms = AV_PERM_READ,
 },
 { NULL }
 };
@@ -217,12 +224,12 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_transpose = {
+AVFilter ff_vf_transpose = {
 .name = "transpose",
 .description = NULL_IF_CONFIG_SMALL("Transpose input video."),
 
- .init = init,
 .priv_size = sizeof(TransContext),
+ .priv_class = &transpose_class,
 
 .query_formats = query_formats,

libav-v9.6.tar.bz2/libavfilter/vf_unsharp.c -> libav-v10.1.tar.bz2/libavfilter/vf_unsharp.c Changed

@@ -42,6 +42,7 @@
 #include "video.h"
 #include "libavutil/common.h"
 #include "libavutil/mem.h"
+#include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 
 #define MIN_SIZE 3
@@ -62,6 +63,9 @@
 } FilterParam;
 
 typedef struct {
+ const AVClass *class;
+ int lmsize_x, lmsize_y, cmsize_x, cmsize_y;
+ float lamount, camount;
 FilterParam luma; ///< luma parameters (width, height, amount)
 FilterParam chroma; ///< chroma parameters (width, height, amount)
 int hsub, vsub;
@@ -120,7 +124,7 @@
 }
 }
 
-static void set_filter_param(FilterParam *fp, int msize_x, int msize_y, double amount)
+static void set_filter_param(FilterParam *fp, int msize_x, int msize_y, float amount)
 {
 fp->msize_x = msize_x;
 fp->msize_y = msize_y;
@@ -132,27 +136,12 @@
 fp->halfscale = 1 << (fp->scalebits - 1);
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
 UnsharpContext *unsharp = ctx->priv;
- int lmsize_x = 5, cmsize_x = 5;
- int lmsize_y = 5, cmsize_y = 5;
- double lamount = 1.0f, camount = 0.0f;
-
- if (args)
- sscanf(args, "%d:%d:%lf:%d:%d:%lf", &lmsize_x, &lmsize_y, &lamount,
- &cmsize_x, &cmsize_y, &camount);
-
- if ((lamount && (lmsize_x < 2 || lmsize_y < 2)) ||
- (camount && (cmsize_x < 2 || cmsize_y < 2))) {
- av_log(ctx, AV_LOG_ERROR,
- "Invalid value <2 for lmsize_x:%d or lmsize_y:%d or cmsize_x:%d or cmsize_y:%d\n",
- lmsize_x, lmsize_y, cmsize_x, cmsize_y);
- return AVERROR(EINVAL);
- }
 
- set_filter_param(&unsharp->luma, lmsize_x, lmsize_y, lamount);
- set_filter_param(&unsharp->chroma, cmsize_x, cmsize_y, camount);
+ set_filter_param(&unsharp->luma, unsharp->lmsize_x, unsharp->lmsize_y, unsharp->lamount);
+ set_filter_param(&unsharp->chroma, unsharp->cmsize_x, unsharp->cmsize_y, unsharp->camount);
 
 return 0;
 }
@@ -214,36 +203,54 @@
 free_filter_param(&unsharp->chroma);
 }
 
-static int filter_frame(AVFilterLink *link, AVFilterBufferRef *in)
+static int filter_frame(AVFilterLink *link, AVFrame *in)
 {
 UnsharpContext *unsharp = link->dst->priv;
 AVFilterLink *outlink = link->dst->outputs[0];
- AVFilterBufferRef *out;
+ AVFrame *out;
 int cw = SHIFTUP(link->w, unsharp->hsub);
 int ch = SHIFTUP(link->h, unsharp->vsub);
 
- out = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
+ out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
 if (!out) {
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return AVERROR(ENOMEM);
 }
- avfilter_copy_buffer_ref_props(out, in);
+ av_frame_copy_props(out, in);
 
 apply_unsharp(out->data[0], out->linesize[0], in->data[0], in->linesize[0], link->w, link->h, &unsharp->luma);
 apply_unsharp(out->data[1], out->linesize[1], in->data[1], in->linesize[1], cw, ch, &unsharp->chroma);
 apply_unsharp(out->data[2], out->linesize[2], in->data[2], in->linesize[2], cw, ch, &unsharp->chroma);
 
- avfilter_unref_bufferp(&in);
+ av_frame_free(&in);
 return ff_filter_frame(outlink, out);
 }
 
+#define OFFSET(x) offsetof(UnsharpContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "luma_msize_x", "luma matrix horizontal size", OFFSET(lmsize_x), AV_OPT_TYPE_INT, { .i64 = 5 }, MIN_SIZE, MAX_SIZE, FLAGS },
+ { "luma_msize_y", "luma matrix vertical size", OFFSET(lmsize_y), AV_OPT_TYPE_INT, { .i64 = 5 }, MIN_SIZE, MAX_SIZE, FLAGS },
+ { "luma_amount", "luma effect strength", OFFSET(lamount), AV_OPT_TYPE_FLOAT, { .dbl = 1 }, -2, 5, FLAGS },
+ { "chroma_msize_x", "chroma matrix horizontal size", OFFSET(cmsize_x), AV_OPT_TYPE_INT, { .i64 = 5 }, MIN_SIZE, MAX_SIZE, FLAGS },
+ { "chroma_msize_y", "chroma matrix vertical size", OFFSET(cmsize_y), AV_OPT_TYPE_INT, { .i64 = 5 }, MIN_SIZE, MAX_SIZE, FLAGS },
+ { "chroma_amount", "chroma effect strength", OFFSET(camount), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, -2, 5, FLAGS },
+ { NULL },
+};
+
+static const AVClass unsharp_class = {
+ .class_name = "unsharp",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_unsharp_inputs[] = {
 {
 .name = "default",
 .type = AVMEDIA_TYPE_VIDEO,
 .filter_frame = filter_frame,
 .config_props = config_props,
- .min_perms = AV_PERM_READ,
 },
 { NULL }
 };
@@ -256,11 +263,12 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_unsharp = {
+AVFilter ff_vf_unsharp = {
 .name = "unsharp",
 .description = NULL_IF_CONFIG_SMALL("Sharpen or blur the input video."),
 
 .priv_size = sizeof(UnsharpContext),
+ .priv_class = &unsharp_class,
 
 .init = init,
 .uninit = uninit,

libav-v9.6.tar.bz2/libavfilter/vf_vflip.c -> libav-v10.1.tar.bz2/libavfilter/vf_vflip.c Changed

@@ -43,33 +43,29 @@
 return 0;
 }
 
-static AVFilterBufferRef *get_video_buffer(AVFilterLink *link, int perms,
- int w, int h)
+static AVFrame *get_video_buffer(AVFilterLink *link, int w, int h)
 {
 FlipContext *flip = link->dst->priv;
- AVFilterBufferRef *picref;
+ AVFrame *frame;
 int i;
 
- if (!(perms & AV_PERM_NEG_LINESIZES))
- return ff_default_get_video_buffer(link, perms, w, h);
-
- picref = ff_get_video_buffer(link->dst->outputs[0], perms, w, h);
- if (!picref)
+ frame = ff_get_video_buffer(link->dst->outputs[0], w, h);
+ if (!frame)
 return NULL;
 
 for (i = 0; i < 4; i ++) {
 int vsub = i == 1 || i == 2 ? flip->vsub : 0;
 
- if (picref->data[i]) {
- picref->data[i] += ((h >> vsub)-1) * picref->linesize[i];
- picref->linesize[i] = -picref->linesize[i];
+ if (frame->data[i]) {
+ frame->data[i] += ((h >> vsub) - 1) * frame->linesize[i];
+ frame->linesize[i] = -frame->linesize[i];
 }
 }
 
- return picref;
+ return frame;
 }
 
-static int filter_frame(AVFilterLink *link, AVFilterBufferRef *frame)
+static int filter_frame(AVFilterLink *link, AVFrame *frame)
 {
 FlipContext *flip = link->dst->priv;
 int i;
@@ -104,7 +100,7 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_vflip = {
+AVFilter ff_vf_vflip = {
 .name = "vflip",
 .description = NULL_IF_CONFIG_SMALL("Flip the input video vertically."),

libav-v9.6.tar.bz2/libavfilter/vf_yadif.c -> libav-v10.1.tar.bz2/libavfilter/vf_yadif.c Changed

@@ -4,23 +4,24 @@
 *
 * This file is part of Libav.
 *
- * Libav 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.
+ * Libav 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.
 *
 * Libav 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 Libav; 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 Libav; 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/common.h"
+#include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "formats.h"
@@ -31,18 +32,27 @@
 #undef NDEBUG
 #include <assert.h>
 
-#define PERM_RWP AV_PERM_WRITE | AV_PERM_PRESERVE | AV_PERM_REUSE
+typedef struct ThreadData {
+ AVFrame *frame;
+ int plane;
+ int w, h;
+ int parity;
+ int tff;
+} ThreadData;
 
 #define CHECK(j)\
- { int score = FFABS(cur[mrefs-1+(j)] - cur[prefs-1-(j)])\
+ { int score = FFABS(cur[mrefs - 1 + (j)] - cur[prefs - 1 - (j)])\
 + FFABS(cur[mrefs +(j)] - cur[prefs -(j)])\
- + FFABS(cur[mrefs+1+(j)] - cur[prefs+1-(j)]);\
+ + FFABS(cur[mrefs + 1 + (j)] - cur[prefs + 1 - (j)]);\
 if (score < spatial_score) {\
 spatial_score= score;\
 spatial_pred= (cur[mrefs +(j)] + cur[prefs -(j)])>>1;\
 
-#define FILTER \
- for (x = 0; x < w; x++) { \
+/* The is_not_edge argument here controls when the code will enter a branch
+ * which reads up to and including x-3 and x+3. */
+
+#define FILTER(start, end, is_not_edge) \
+ for (x = start; x < end; x++) { \
 int c = cur[mrefs]; \
 int d = (prev2[0] + next2[0])>>1; \
 int e = cur[prefs]; \
@@ -51,11 +61,13 @@
 int temporal_diff2 =(FFABS(next[mrefs] - c) + FFABS(next[prefs] - e) )>>1; \
 int diff = FFMAX3(temporal_diff0 >> 1, temporal_diff1, temporal_diff2); \
 int spatial_pred = (c+e) >> 1; \
- int spatial_score = FFABS(cur[mrefs - 1] - cur[prefs - 1]) + FFABS(c-e) \
- + FFABS(cur[mrefs + 1] - cur[prefs + 1]) - 1; \
 \
- CHECK(-1) CHECK(-2) }} }} \
- CHECK( 1) CHECK( 2) }} }} \
+ if (is_not_edge) {\
+ int spatial_score = FFABS(cur[mrefs - 1] - cur[prefs - 1]) + FFABS(c-e) \
+ + FFABS(cur[mrefs + 1] - cur[prefs + 1]) - 1; \
+ CHECK(-1) CHECK(-2) }} }} \
+ CHECK( 1) CHECK( 2) }} }} \
+ }\
 \
 if (mode < 2) { \
 int b = (prev2[2 * mrefs] + next2[2 * mrefs])>>1; \
@@ -81,87 +93,176 @@
 next2++; \
 }
 
-static void filter_line_c(uint8_t *dst,
- uint8_t *prev, uint8_t *cur, uint8_t *next,
+static void filter_line_c(void *dst1,
+ void *prev1, void *cur1, void *next1,
 int w, int prefs, int mrefs, int parity, int mode)
 {
+ uint8_t *dst = dst1;
+ uint8_t *prev = prev1;
+ uint8_t *cur = cur1;
+ uint8_t *next = next1;
+ int x;
+ uint8_t *prev2 = parity ? prev : cur ;
+ uint8_t *next2 = parity ? cur : next;
+
+ /* The function is called with the pointers already pointing to data[3] and
+ * with 6 subtracted from the width. This allows the FILTER macro to be
+ * called so that it processes all the pixels normally. A constant value of
+ * true for is_not_edge lets the compiler ignore the if statement. */
+ FILTER(0, w, 1)
+}
+
+static void filter_edges(void *dst1, void *prev1, void *cur1, void *next1,
+ int w, int prefs, int mrefs, int parity, int mode)
+{
+ uint8_t *dst = dst1;
+ uint8_t *prev = prev1;
+ uint8_t *cur = cur1;
+ uint8_t *next = next1;
 int x;
 uint8_t *prev2 = parity ? prev : cur ;
 uint8_t *next2 = parity ? cur : next;
 
- FILTER
+ /* Only edge pixels need to be processed here. A constant value of false
+ * for is_not_edge should let the compiler ignore the whole branch. */
+ FILTER(0, 3, 0)
+
+ dst = (uint8_t*)dst1 + w - 3;
+ prev = (uint8_t*)prev1 + w - 3;
+ cur = (uint8_t*)cur1 + w - 3;
+ next = (uint8_t*)next1 + w - 3;
+ prev2 = (uint8_t*)(parity ? prev : cur);
+ next2 = (uint8_t*)(parity ? cur : next);
+
+ FILTER(w - 3, w, 0)
 }
 
-static void filter_line_c_16bit(uint16_t *dst,
- uint16_t *prev, uint16_t *cur, uint16_t *next,
+
+static void filter_line_c_16bit(void *dst1,
+ void *prev1, void *cur1, void *next1,
 int w, int prefs, int mrefs, int parity,
 int mode)
 {
+ uint16_t *dst = dst1;
+ uint16_t *prev = prev1;
+ uint16_t *cur = cur1;
+ uint16_t *next = next1;
+ int x;
+ uint16_t *prev2 = parity ? prev : cur ;
+ uint16_t *next2 = parity ? cur : next;
+ mrefs /= 2;
+ prefs /= 2;
+
+ FILTER(0, w, 1)
+}
+
+static void filter_edges_16bit(void *dst1, void *prev1, void *cur1, void *next1,
+ int w, int prefs, int mrefs, int parity, int mode)
+{
+ uint16_t *dst = dst1;
+ uint16_t *prev = prev1;
+ uint16_t *cur = cur1;
+ uint16_t *next = next1;
 int x;
 uint16_t *prev2 = parity ? prev : cur ;
 uint16_t *next2 = parity ? cur : next;
 mrefs /= 2;
 prefs /= 2;
 
- FILTER
+ FILTER(0, 3, 0)
+
+ dst = (uint16_t*)dst1 + w - 3;
+ prev = (uint16_t*)prev1 + w - 3;
+ cur = (uint16_t*)cur1 + w - 3;
+ next = (uint16_t*)next1 + w - 3;
+ prev2 = (uint16_t*)(parity ? prev : cur);
+ next2 = (uint16_t*)(parity ? cur : next);
+
+ FILTER(w - 3, w, 0)
 }
 
-static void filter(AVFilterContext *ctx, AVFilterBufferRef *dstpic,
+static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
+{
+ YADIFContext *s = ctx->priv;
+ ThreadData *td = arg;
+ int refs = s->cur->linesize[td->plane];
+ int df = (s->csp->comp[td->plane].depth_minus1 + 8) / 8;
+ int pix_3 = 3 * df;
+ int slice_h = td->h / nb_jobs;
+ int slice_start = jobnr * slice_h;
+ int slice_end = (jobnr == nb_jobs - 1) ? td->h : (jobnr + 1) * slice_h;
+ int y;
+
+ /* filtering reads 3 pixels to the left/right; to avoid invalid reads,
+ * we need to call the c variant which avoids this for border pixels
+ */
+ for (y = slice_start; y < slice_end; y++) {
+ if ((y ^ td->parity) & 1) {
+ uint8_t *prev = &s->prev->data[td->plane][y * refs];
+ uint8_t *cur = &s->cur ->data[td->plane][y * refs];
+ uint8_t *next = &s->next->data[td->plane][y * refs];
+ uint8_t *dst = &td->frame->data[td->plane][y * td->frame->linesize[td->plane]];
+ int mode = y == 1 || y + 2 == td->h ? 2 : s->mode;
+ s->filter_line(dst + pix_3, prev + pix_3, cur + pix_3,
+ next + pix_3, td->w - 6,
+ y + 1 < td->h ? refs : -refs,
+ y ? -refs : refs,
+ td->parity ^ td->tff, mode);
+ s->filter_edges(dst, prev, cur, next, td->w,
+ y + 1 < td->h ? refs : -refs,
+ y ? -refs : refs,
+ td->parity ^ td->tff, mode);
+ } else {
+ memcpy(&td->frame->data[td->plane][y * td->frame->linesize[td->plane]],
+ &s->cur->data[td->plane][y * refs], td->w * df);
+ }
+ }
+ return 0;
+}
+
+static void filter(AVFilterContext *ctx, AVFrame *dstpic,
 int parity, int tff)
 {
 YADIFContext *yadif = ctx->priv;
- int y, i;
+ ThreadData td = { .frame = dstpic, .parity = parity, .tff = tff };
+ int i;
 
 for (i = 0; i < yadif->csp->nb_components; i++) {
- int w = dstpic->video->w;
- int h = dstpic->video->h;
- int refs = yadif->cur->linesize[i];
- int df = (yadif->csp->comp[i].depth_minus1 + 8) / 8;
+ int w = dstpic->width;
+ int h = dstpic->height;
 
 if (i == 1 || i == 2) {
- /* Why is this not part of the per-plane description thing? */
 w >>= yadif->csp->log2_chroma_w;
 h >>= yadif->csp->log2_chroma_h;
 }
 
- for (y = 0; y < h; y++) {
- if ((y ^ parity) & 1) {
- uint8_t *prev = &yadif->prev->data[i][y * refs];
- uint8_t *cur = &yadif->cur ->data[i][y * refs];
- uint8_t *next = &yadif->next->data[i][y * refs];
- uint8_t *dst = &dstpic->data[i][y * dstpic->linesize[i]];
- int mode = y == 1 || y + 2 == h ? 2 : yadif->mode;
- yadif->filter_line(dst, prev, cur, next, w,
- y + 1 < h ? refs : -refs,
- y ? -refs : refs,
- parity ^ tff, mode);
- } else {
- memcpy(&dstpic->data[i][y * dstpic->linesize[i]],
- &yadif->cur->data[i][y * refs], w * df);
- }
- }
+
+ td.w = w;
+ td.h = h;
+ td.plane = i;
+
+ ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(h, ctx->graph->nb_threads));
 }
 
 emms_c();
 }
 
-static AVFilterBufferRef *get_video_buffer(AVFilterLink *link, int perms,
- int w, int h)
+static AVFrame *get_video_buffer(AVFilterLink *link, int w, int h)
 {
- AVFilterBufferRef *picref;
+ AVFrame *frame;
 int width = FFALIGN(w, 32);
 int height = FFALIGN(h + 2, 32);
 int i;
 
- picref = ff_default_get_video_buffer(link, perms, width, height);
+ frame = ff_default_get_video_buffer(link, width, height);
 
- picref->video->w = w;
- picref->video->h = h;
+ frame->width = w;
+ frame->height = h;
 
 for (i = 0; i < 3; i++)
- picref->data[i] += picref->linesize[i];
+ frame->data[i] += frame->linesize[i];
 
- return picref;
+ return frame;
 }
 
 static int return_frame(AVFilterContext *ctx, int is_second)
@@ -171,26 +272,21 @@
 int tff, ret;
 
 if (yadif->parity == -1) {
- tff = yadif->cur->video->interlaced ?
- yadif->cur->video->top_field_first : 1;
+ tff = yadif->cur->interlaced_frame ?
+ yadif->cur->top_field_first : 1;
 } else {
 tff = yadif->parity ^ 1;
 }
 
 if (is_second) {
- yadif->out = ff_get_video_buffer(link, PERM_RWP, link->w, link->h);
+ yadif->out = ff_get_video_buffer(link, link->w, link->h);
 if (!yadif->out)
 return AVERROR(ENOMEM);
 
- avfilter_copy_buffer_ref_props(yadif->out, yadif->cur);
- yadif->out->video->interlaced = 0;
+ av_frame_copy_props(yadif->out, yadif->cur);
+ yadif->out->interlaced_frame = 0;
 }
 
- if (!yadif->csp)
- yadif->csp = av_pix_fmt_desc_get(link->format);
- if (yadif->csp->comp[0].depth_minus1 / 8 == 1)
- yadif->filter_line = filter_line_c_16bit;
-
 filter(ctx, yadif->out, tff ^ !is_second, tff);
 
 if (is_second) {
@@ -209,7 +305,7 @@
 return ret;
 }
 
-static int filter_frame(AVFilterLink *link, AVFilterBufferRef *picref)
+static int filter_frame(AVFilterLink *link, AVFrame *frame)
 {
 AVFilterContext *ctx = link->dst;
 YADIFContext *yadif = ctx->priv;
@@ -218,36 +314,35 @@
 return_frame(ctx, 1);
 
 if (yadif->prev)
- avfilter_unref_buffer(yadif->prev);
+ av_frame_free(&yadif->prev);
 yadif->prev = yadif->cur;
 yadif->cur = yadif->next;
- yadif->next = picref;
+ yadif->next = frame;
 
 if (!yadif->cur)
 return 0;
 
- if (yadif->auto_enable && !yadif->cur->video->interlaced) {
- yadif->out = avfilter_ref_buffer(yadif->cur, AV_PERM_READ);
+ if (yadif->auto_enable && !yadif->cur->interlaced_frame) {
+ yadif->out = av_frame_clone(yadif->cur);
 if (!yadif->out)
 return AVERROR(ENOMEM);
 
- avfilter_unref_bufferp(&yadif->prev);
+ av_frame_free(&yadif->prev);
 if (yadif->out->pts != AV_NOPTS_VALUE)
 yadif->out->pts *= 2;
 return ff_filter_frame(ctx->outputs[0], yadif->out);
 }
 
 if (!yadif->prev &&
- !(yadif->prev = avfilter_ref_buffer(yadif->cur, AV_PERM_READ)))
+ !(yadif->prev = av_frame_clone(yadif->cur)))
 return AVERROR(ENOMEM);
 
- yadif->out = ff_get_video_buffer(ctx->outputs[0], PERM_RWP,
- link->w, link->h);
+ yadif->out = ff_get_video_buffer(ctx->outputs[0], link->w, link->h);
 if (!yadif->out)
 return AVERROR(ENOMEM);
 
- avfilter_copy_buffer_ref_props(yadif->out, yadif->cur);
- yadif->out->video->interlaced = 0;
+ av_frame_copy_props(yadif->out, yadif->cur);
+ yadif->out->interlaced_frame = 0;
 
 if (yadif->out->pts != AV_NOPTS_VALUE)
 yadif->out->pts *= 2;
@@ -274,8 +369,7 @@
 ret = ff_request_frame(link->src->inputs[0]);
 
 if (ret == AVERROR_EOF && yadif->next) {
- AVFilterBufferRef *next =
- avfilter_ref_buffer(yadif->next, AV_PERM_READ);
+ AVFrame *next = av_frame_clone(yadif->next);
 
 if (!next)
 return AVERROR(ENOMEM);
@@ -314,7 +408,7 @@
 }
 assert(yadif->next || !val);
 
- if (yadif->auto_enable && yadif->next && !yadif->next->video->interlaced)
+ if (yadif->auto_enable && yadif->next && !yadif->next->interlaced_frame)
 return val;
 
 return val * ((yadif->mode&1)+1);
@@ -324,9 +418,9 @@
 {
 YADIFContext *yadif = ctx->priv;
 
- if (yadif->prev) avfilter_unref_bufferp(&yadif->prev);
- if (yadif->cur ) avfilter_unref_bufferp(&yadif->cur );
- if (yadif->next) avfilter_unref_bufferp(&yadif->next);
+ if (yadif->prev) av_frame_free(&yadif->prev);
+ if (yadif->cur ) av_frame_free(&yadif->cur );
+ if (yadif->next) av_frame_free(&yadif->next);
 }
 
 static int query_formats(AVFilterContext *ctx)
@@ -359,40 +453,49 @@
 return 0;
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
-{
- YADIFContext *yadif = ctx->priv;
-
- yadif->mode = 0;
- yadif->parity = -1;
- yadif->auto_enable = 0;
- yadif->csp = NULL;
-
- if (args)
- sscanf(args, "%d:%d:%d",
- &yadif->mode, &yadif->parity, &yadif->auto_enable);
-
- yadif->filter_line = filter_line_c;
-
- if (ARCH_X86)
- ff_yadif_init_x86(yadif);
-
- av_log(ctx, AV_LOG_VERBOSE, "mode:%d parity:%d auto_enable:%d\n",
- yadif->mode, yadif->parity, yadif->auto_enable);
-
- return 0;
-}
-
 static int config_props(AVFilterLink *link)
 {
+ YADIFContext *s = link->src->priv;
+
 link->time_base.num = link->src->inputs[0]->time_base.num;
 link->time_base.den = link->src->inputs[0]->time_base.den * 2;
 link->w = link->src->inputs[0]->w;
 link->h = link->src->inputs[0]->h;
 
+ s->csp = av_pix_fmt_desc_get(link->format);
+ if (s->csp->comp[0].depth_minus1 / 8 == 1) {
+ s->filter_line = filter_line_c_16bit;
+ s->filter_edges = filter_edges_16bit;
+ } else {
+ s->filter_line = filter_line_c;
+ s->filter_edges = filter_edges;
+
+ if (ARCH_X86)
+ ff_yadif_init_x86(s);
+ }
+
 return 0;
 }
 
+#define OFFSET(x) offsetof(YADIFContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "mode", NULL, OFFSET(mode), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 3, FLAGS },
+ { "parity", NULL, OFFSET(parity), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, FLAGS, "parity" },
+ { "auto", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = -1 }, .unit = "parity" },
+ { "tff", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, .unit = "parity" },
+ { "bff", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, .unit = "parity" },
+ { "auto", NULL, OFFSET(auto_enable), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, FLAGS },
+ { NULL },
+};
+
+static const AVClass yadif_class = {
+ .class_name = "yadif",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vf_yadif_inputs[] = {
 {
 .name = "default",
@@ -414,16 +517,18 @@
 { NULL }
 };
 
-AVFilter avfilter_vf_yadif = {
+AVFilter ff_vf_yadif = {
 .name = "yadif",
 .description = NULL_IF_CONFIG_SMALL("Deinterlace the input image"),
 
 .priv_size = sizeof(YADIFContext),
- .init = init,
+ .priv_class = &yadif_class,
 .uninit = uninit,
 .query_formats = query_formats,
 
 .inputs = avfilter_vf_yadif_inputs,
 
 .outputs = avfilter_vf_yadif_outputs,
+
+ .flags = AVFILTER_FLAG_SLICE_THREADS,
 };

libav-v9.6.tar.bz2/libavfilter/video.c -> libav-v10.1.tar.bz2/libavfilter/video.c Changed

@@ -19,6 +19,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include "libavutil/buffer.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/mem.h"
 
@@ -26,77 +27,34 @@
 #include "internal.h"
 #include "video.h"
 
-#ifdef DEBUG
-static char *ff_get_ref_perms_string(char *buf, size_t buf_size, int perms)
+AVFrame *ff_null_get_video_buffer(AVFilterLink *link, int w, int h)
 {
- snprintf(buf, buf_size, "%s%s%s%s%s%s",
- perms & AV_PERM_READ ? "r" : "",
- perms & AV_PERM_WRITE ? "w" : "",
- perms & AV_PERM_PRESERVE ? "p" : "",
- perms & AV_PERM_REUSE ? "u" : "",
- perms & AV_PERM_REUSE2 ? "U" : "",
- perms & AV_PERM_NEG_LINESIZES ? "n" : "");
- return buf;
-}
-#endif
-
-static void ff_dlog_ref(void *ctx, AVFilterBufferRef *ref, int end)
-{
- av_unused char buf[16];
- av_dlog(ctx,
- "ref[%p buf:%p refcount:%d perms:%s data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64,
- ref, ref->buf, ref->buf->refcount, ff_get_ref_perms_string(buf, sizeof(buf), ref->perms), ref->data[0],
- ref->linesize[0], ref->linesize[1], ref->linesize[2], ref->linesize[3],
- ref->pts, ref->pos);
-
- if (ref->video) {
- av_dlog(ctx, " a:%d/%d s:%dx%d i:%c iskey:%d type:%c",
- ref->video->pixel_aspect.num, ref->video->pixel_aspect.den,
- ref->video->w, ref->video->h,
- !ref->video->interlaced ? 'P' : /* Progressive */
- ref->video->top_field_first ? 'T' : 'B', /* Top / Bottom */
- ref->video->key_frame,
- av_get_picture_type_char(ref->video->pict_type));
- }
- if (ref->audio) {
- av_dlog(ctx, " cl:%"PRId64"d n:%d r:%d p:%d",
- ref->audio->channel_layout,
- ref->audio->nb_samples,
- ref->audio->sample_rate,
- ref->audio->planar);
- }
-
- av_dlog(ctx, "]%s", end ? "\n" : "");
-}
-
-AVFilterBufferRef *ff_null_get_video_buffer(AVFilterLink *link, int perms, int w, int h)
-{
- return ff_get_video_buffer(link->dst->outputs[0], perms, w, h);
+ return ff_get_video_buffer(link->dst->outputs[0], w, h);
 }
 
 /* TODO: set the buffer's priv member to a context structure for the whole
 * filter chain. This will allow for a buffer pool instead of the constant
 * alloc & free cycle currently implemented. */
-AVFilterBufferRef *ff_default_get_video_buffer(AVFilterLink *link, int perms, int w, int h)
+AVFrame *ff_default_get_video_buffer(AVFilterLink *link, int w, int h)
 {
- int linesize[4];
- uint8_t *data[4];
- AVFilterBufferRef *picref = NULL;
+ AVFrame *frame = av_frame_alloc();
+ int ret;
 
- // +2 is needed for swscaler, +16 to be SIMD-friendly
- if (av_image_alloc(data, linesize, w, h, link->format, 16) < 0)
+ if (!frame)
 return NULL;
 
- picref = avfilter_get_video_buffer_ref_from_arrays(data, linesize,
- perms, w, h, link->format);
- if (!picref) {
- av_free(data[0]);
- return NULL;
- }
+ frame->width = w;
+ frame->height = h;
+ frame->format = link->format;
 
- return picref;
+ ret = av_frame_get_buffer(frame, 32);
+ if (ret < 0)
+ av_frame_free(&frame);
+
+ return frame;
 }
 
+#if FF_API_AVFILTERBUFFER
 AVFilterBufferRef *
 avfilter_get_video_buffer_ref_from_arrays(uint8_t *data[4], int linesize[4], int perms,
 int w, int h, enum AVPixelFormat format)
@@ -141,25 +99,20 @@
 av_free(pic);
 return NULL;
 }
+#endif
 
-AVFilterBufferRef *ff_get_video_buffer(AVFilterLink *link, int perms, int w, int h)
+AVFrame *ff_get_video_buffer(AVFilterLink *link, int w, int h)
 {
- AVFilterBufferRef *ret = NULL;
+ AVFrame *ret = NULL;
 
 av_unused char buf[16];
 FF_DPRINTF_START(NULL, get_video_buffer); ff_dlog_link(NULL, link, 0);
- av_dlog(NULL, " perms:%s w:%d h:%d\n", ff_get_ref_perms_string(buf, sizeof(buf), perms), w, h);
 
 if (link->dstpad->get_video_buffer)
- ret = link->dstpad->get_video_buffer(link, perms, w, h);
+ ret = link->dstpad->get_video_buffer(link, w, h);
 
 if (!ret)
- ret = ff_default_get_video_buffer(link, perms, w, h);
-
- if (ret)
- ret->type = AVMEDIA_TYPE_VIDEO;
-
- FF_DPRINTF_START(NULL, get_video_buffer); ff_dlog_link(NULL, link, 0); av_dlog(NULL, " returning "); ff_dlog_ref(NULL, ret, 1);
+ ret = ff_default_get_video_buffer(link, w, h);
 
 return ret;
 }

libav-v9.6.tar.bz2/libavfilter/video.h -> libav-v10.1.tar.bz2/libavfilter/video.h Changed

@@ -21,22 +21,19 @@
 
 #include "avfilter.h"
 
-AVFilterBufferRef *ff_default_get_video_buffer(AVFilterLink *link,
-                                               int perms, int w, int h);
-AVFilterBufferRef *ff_null_get_video_buffer(AVFilterLink *link, int perms, int w, int h);
+AVFrame *ff_default_get_video_buffer(AVFilterLink *link, int w, int h);
+AVFrame *ff_null_get_video_buffer(AVFilterLink *link, int w, int h);
 
 /**
  * Request a picture buffer with a specific set of permissions.
  *
  * @param link  the output link to the filter from which the buffer will
  *              be requested
- * @param perms the required access permissions
  * @param w     the minimum width of the buffer to allocate
  * @param h     the minimum height of the buffer to allocate
  * @return      A reference to the buffer. This must be unreferenced with
  *              avfilter_unref_buffer when you are finished with it.
  */
-AVFilterBufferRef *ff_get_video_buffer(AVFilterLink *link, int perms,
-                                       int w, int h);
+AVFrame *ff_get_video_buffer(AVFilterLink *link, int w, int h);
 
 #endif /* AVFILTER_VIDEO_H */

libav-v9.6.tar.bz2/libavfilter/vsink_nullsink.c -> libav-v10.1.tar.bz2/libavfilter/vsink_nullsink.c Changed

libav-v9.6.tar.bz2/libavfilter/vsrc_color.c -> libav-v10.1.tar.bz2/libavfilter/vsrc_color.c Changed

@@ -36,10 +36,12 @@
 #include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/mem.h"
+#include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
 #include "drawutils.h"
 
 typedef struct {
+ const AVClass *class;
 int w, h;
 uint8_t color[4];
 AVRational time_base;
@@ -47,34 +49,31 @@
 int line_step[4];
 int hsub, vsub; ///< chroma subsampling values
 uint64_t pts;
+ char *color_str;
+ char *size_str;
+ char *framerate_str;
 } ColorContext;
 
-static av_cold int color_init(AVFilterContext *ctx, const char *args)
+static av_cold int color_init(AVFilterContext *ctx)
 {
 ColorContext *color = ctx->priv;
- char color_string[128] = "black";
- char frame_size [128] = "320x240";
- char frame_rate [128] = "25";
 AVRational frame_rate_q;
 int ret;
 
- if (args)
- sscanf(args, "%127[^:]:%127[^:]:%127s", color_string, frame_size, frame_rate);
-
- if (av_parse_video_size(&color->w, &color->h, frame_size) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Invalid frame size: %s\n", frame_size);
+ if (av_parse_video_size(&color->w, &color->h, color->size_str) < 0) {
+ av_log(ctx, AV_LOG_ERROR, "Invalid frame size: %s\n", color->size_str);
 return AVERROR(EINVAL);
 }
 
- if (av_parse_video_rate(&frame_rate_q, frame_rate) < 0 ||
+ if (av_parse_video_rate(&frame_rate_q, color->framerate_str) < 0 ||
 frame_rate_q.den <= 0 || frame_rate_q.num <= 0) {
- av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: %s\n", frame_rate);
+ av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: %s\n", color->framerate_str);
 return AVERROR(EINVAL);
 }
 color->time_base.num = frame_rate_q.den;
 color->time_base.den = frame_rate_q.num;
 
- if ((ret = av_parse_color(color->color, color_string, -1, ctx)) < 0)
+ if ((ret = av_parse_color(color->color, color->color_str, -1, ctx)) < 0)
 return ret;
 
 return 0;
@@ -146,21 +145,36 @@
 static int color_request_frame(AVFilterLink *link)
 {
 ColorContext *color = link->src->priv;
- AVFilterBufferRef *picref = ff_get_video_buffer(link, AV_PERM_WRITE, color->w, color->h);
+ AVFrame *frame = ff_get_video_buffer(link, color->w, color->h);
 
- if (!picref)
+ if (!frame)
 return AVERROR(ENOMEM);
 
- picref->video->pixel_aspect = (AVRational) {1, 1};
- picref->pts = color->pts++;
- picref->pos = -1;
+ frame->sample_aspect_ratio = (AVRational) {1, 1};
+ frame->pts = color->pts++;
 
- ff_draw_rectangle(picref->data, picref->linesize,
+ ff_draw_rectangle(frame->data, frame->linesize,
 color->line, color->line_step, color->hsub, color->vsub,
 0, 0, color->w, color->h);
- return ff_filter_frame(link, picref);
+ return ff_filter_frame(link, frame);
 }
 
+#define OFFSET(x) offsetof(ColorContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "color", "Output video color", OFFSET(color_str), AV_OPT_TYPE_STRING, { .str = "black" }, .flags = FLAGS },
+ { "size", "Output video size (wxh or an abbreviation)", OFFSET(size_str), AV_OPT_TYPE_STRING, { .str = "320x240" }, .flags = FLAGS },
+ { "framerate", "Output video framerate", OFFSET(framerate_str), AV_OPT_TYPE_STRING, { .str = "25" }, .flags = FLAGS },
+ { NULL },
+};
+
+static const AVClass color_class = {
+ .class_name = "color",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vsrc_color_outputs[] = {
 {
 .name = "default",
@@ -171,10 +185,11 @@
 { NULL }
 };
 
-AVFilter avfilter_vsrc_color = {
+AVFilter ff_vsrc_color = {
 .name = "color",
 .description = NULL_IF_CONFIG_SMALL("Provide an uniformly colored input, syntax is: [color[:size[:rate]]]"),
 
+ .priv_class = &color_class,
 .priv_size = sizeof(ColorContext),
 .init = color_init,
 .uninit = color_uninit,

libav-v9.6.tar.bz2/libavfilter/vsrc_movie.c -> libav-v10.1.tar.bz2/libavfilter/vsrc_movie.c Changed

@@ -28,9 +28,10 @@
 * @todo support more than one output stream
 */
 
-/* #define DEBUG */
-
 #include <float.h>
+#include <stdint.h>
+
+#include "libavutil/attributes.h"
 #include "libavutil/avstring.h"
 #include "libavutil/opt.h"
 #include "libavutil/imgutils.h"
@@ -54,19 +55,20 @@
 AVFrame *frame; ///< video frame to store the decoded images in
 
 int w, h;
- AVFilterBufferRef *picref;
 } MovieContext;
 
 #define OFFSET(x) offsetof(MovieContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
 
 static const AVOption movie_options[]= {
-{"format_name", "set format name", OFFSET(format_name), AV_OPT_TYPE_STRING, {.str = 0}, CHAR_MIN, CHAR_MAX },
-{"f", "set format name", OFFSET(format_name), AV_OPT_TYPE_STRING, {.str = 0}, CHAR_MIN, CHAR_MAX },
-{"stream_index", "set stream index", OFFSET(stream_index), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX },
-{"si", "set stream index", OFFSET(stream_index), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX },
-{"seek_point", "set seekpoint (seconds)", OFFSET(seek_point_d), AV_OPT_TYPE_DOUBLE, {.dbl = 0}, 0, (INT64_MAX-1) / 1000000 },
-{"sp", "set seekpoint (seconds)", OFFSET(seek_point_d), AV_OPT_TYPE_DOUBLE, {.dbl = 0}, 0, (INT64_MAX-1) / 1000000 },
-{NULL},
+ { "filename", NULL, OFFSET(file_name), AV_OPT_TYPE_STRING, .flags = FLAGS },
+ { "format_name", "set format name", OFFSET(format_name), AV_OPT_TYPE_STRING, .flags = FLAGS },
+ { "f", "set format name", OFFSET(format_name), AV_OPT_TYPE_STRING, .flags = FLAGS },
+ { "stream_index", "set stream index", OFFSET(stream_index), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS },
+ { "si", "set stream index", OFFSET(stream_index), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS },
+ { "seek_point", "set seekpoint (seconds)", OFFSET(seek_point_d), AV_OPT_TYPE_DOUBLE, { .dbl = 0 }, 0, (INT64_MAX-1) / 1000000, FLAGS },
+ { "sp", "set seekpoint (seconds)", OFFSET(seek_point_d), AV_OPT_TYPE_DOUBLE, { .dbl = 0 }, 0, (INT64_MAX-1) / 1000000, FLAGS },
+ { NULL },
 };
 
 static const char *movie_get_name(void *ctx)
@@ -80,7 +82,7 @@
 movie_options
 };
 
-static int movie_init(AVFilterContext *ctx)
+static av_cold int movie_init(AVFilterContext *ctx)
 {
 MovieContext *movie = ctx->priv;
 AVInputFormat *iformat = NULL;
@@ -142,16 +144,13 @@
 return AVERROR(EINVAL);
 }
 
+ movie->codec_ctx->refcounted_frames = 1;
+
 if ((ret = avcodec_open2(movie->codec_ctx, codec, NULL)) < 0) {
 av_log(ctx, AV_LOG_ERROR, "Failed to open codec\n");
 return ret;
 }
 
- if (!(movie->frame = avcodec_alloc_frame()) ) {
- av_log(ctx, AV_LOG_ERROR, "Failed to alloc frame\n");
- return AVERROR(ENOMEM);
- }
-
 movie->w = movie->codec_ctx->width;
 movie->h = movie->codec_ctx->height;
 
@@ -162,24 +161,9 @@
 return 0;
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args)
+static av_cold int init(AVFilterContext *ctx)
 {
 MovieContext *movie = ctx->priv;
- int ret;
- movie->class = &movie_class;
- av_opt_set_defaults(movie);
-
- if (args)
- movie->file_name = av_get_token(&args, ":");
- if (!movie->file_name || !*movie->file_name) {
- av_log(ctx, AV_LOG_ERROR, "No filename provided!\n");
- return AVERROR(EINVAL);
- }
-
- if (*args++ == ':' && (ret = av_set_options_string(movie, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
- return ret;
- }
 
 movie->seek_point = movie->seek_point_d * 1000000 + 0.5;
 
@@ -190,14 +174,11 @@
 {
 MovieContext *movie = ctx->priv;
 
- av_free(movie->file_name);
- av_free(movie->format_name);
 if (movie->codec_ctx)
 avcodec_close(movie->codec_ctx);
 if (movie->format_ctx)
 avformat_close_input(&movie->format_ctx);
- avfilter_unref_buffer(movie->picref);
- avcodec_free_frame(&movie->frame);
+ av_frame_free(&movie->frame);
 }
 
 static int query_formats(AVFilterContext *ctx)
@@ -225,41 +206,29 @@
 MovieContext *movie = outlink->src->priv;
 AVPacket pkt;
 int ret, frame_decoded;
- AVStream *st = movie->format_ctx->streams[movie->stream_index];
+ AVStream av_unused *st = movie->format_ctx->streams[movie->stream_index];
 
 if (movie->is_done == 1)
 return 0;
 
+ movie->frame = av_frame_alloc();
+ if (!movie->frame)
+ return AVERROR(ENOMEM);
+
 while ((ret = av_read_frame(movie->format_ctx, &pkt)) >= 0) {
 // Is this a packet from the video stream?
 if (pkt.stream_index == movie->stream_index) {
- movie->codec_ctx->reordered_opaque = pkt.pos;
 avcodec_decode_video2(movie->codec_ctx, movie->frame, &frame_decoded, &pkt);
 
 if (frame_decoded) {
- /* FIXME: avoid the memcpy */
- movie->picref = ff_get_video_buffer(outlink, AV_PERM_WRITE | AV_PERM_PRESERVE |
- AV_PERM_REUSE2, outlink->w, outlink->h);
- av_image_copy(movie->picref->data, movie->picref->linesize,
- movie->frame->data, movie->frame->linesize,
- movie->picref->format, outlink->w, outlink->h);
- avfilter_copy_frame_props(movie->picref, movie->frame);
-
- /* FIXME: use a PTS correction mechanism as that in
- * ffplay.c when some API will be available for that */
- /* use pkt_dts if pkt_pts is not available */
- movie->picref->pts = movie->frame->pkt_pts == AV_NOPTS_VALUE ?
- movie->frame->pkt_dts : movie->frame->pkt_pts;
-
- movie->picref->pos = movie->frame->reordered_opaque;
- if (!movie->frame->sample_aspect_ratio.num)
- movie->picref->video->pixel_aspect = st->sample_aspect_ratio;
+ if (movie->frame->pkt_pts != AV_NOPTS_VALUE)
+ movie->frame->pts = movie->frame->pkt_pts;
 av_dlog(outlink->src,
- "movie_get_frame(): file:'%s' pts:%"PRId64" time:%f pos:%"PRId64" aspect:%d/%d\n",
- movie->file_name, movie->picref->pts,
- (double)movie->picref->pts * av_q2d(st->time_base),
- movie->picref->pos,
- movie->picref->video->pixel_aspect.num, movie->picref->video->pixel_aspect.den);
+ "movie_get_frame(): file:'%s' pts:%"PRId64" time:%f aspect:%d/%d\n",
+ movie->file_name, movie->frame->pts,
+ (double)movie->frame->pts * av_q2d(st->time_base),
+ movie->frame->sample_aspect_ratio.num,
+ movie->frame->sample_aspect_ratio.den);
 // We got it. Free the packet since we are returning
 av_free_packet(&pkt);
 
@@ -287,8 +256,8 @@
 if ((ret = movie_get_frame(outlink)) < 0)
 return ret;
 
- ret = ff_filter_frame(outlink, movie->picref);
- movie->picref = NULL;
+ ret = ff_filter_frame(outlink, movie->frame);
+ movie->frame = NULL;
 
 return ret;
 }
@@ -303,10 +272,11 @@
 { NULL }
 };
 
-AVFilter avfilter_vsrc_movie = {
+AVFilter ff_vsrc_movie = {
 .name = "movie",
 .description = NULL_IF_CONFIG_SMALL("Read from a movie source."),
 .priv_size = sizeof(MovieContext),
+ .priv_class = &movie_class,
 .init = init,
 .uninit = uninit,
 .query_formats = query_formats,

libav-v9.6.tar.bz2/libavfilter/vsrc_nullsrc.c -> libav-v10.1.tar.bz2/libavfilter/vsrc_nullsrc.c Changed

@@ -27,6 +27,7 @@
 #include "libavutil/eval.h"
 #include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
 #include "avfilter.h"
 #include "formats.h"
@@ -49,30 +50,12 @@
 };
 
 typedef struct {
+ const AVClass *class;
 int w, h;
- char tb_expr[256];
+ char *tb_expr;
 double var_values[VAR_VARS_NB];
 } NullContext;
 
-static int init(AVFilterContext *ctx, const char *args)
-{
- NullContext *priv = ctx->priv;
-
- priv->w = 352;
- priv->h = 288;
- av_strlcpy(priv->tb_expr, "AVTB", sizeof(priv->tb_expr));
-
- if (args)
- sscanf(args, "%d:%d:%255[^:]", &priv->w, &priv->h, priv->tb_expr);
-
- if (priv->w <= 0 || priv->h <= 0) {
- av_log(ctx, AV_LOG_ERROR, "Non-positive size values are not acceptable.\n");
- return AVERROR(EINVAL);
- }
-
- return 0;
-}
-
 static int config_props(AVFilterLink *outlink)
 {
 AVFilterContext *ctx = outlink->src;
@@ -114,6 +97,22 @@
 return -1;
 }
 
+#define OFFSET(x) offsetof(NullContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+ { "width", NULL, OFFSET(w), AV_OPT_TYPE_INT, { .i64 = 352 }, 1, INT_MAX, FLAGS },
+ { "height", NULL, OFFSET(h), AV_OPT_TYPE_INT, { .i64 = 288 }, 1, INT_MAX, FLAGS },
+ { "timebase", NULL, OFFSET(tb_expr), AV_OPT_TYPE_STRING, { .str = "AVTB" }, 0, 0, FLAGS },
+ { NULL },
+};
+
+static const AVClass nullsrc_class = {
+ .class_name = "nullsrc",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static const AVFilterPad avfilter_vsrc_nullsrc_outputs[] = {
 {
 .name = "default",
@@ -124,12 +123,12 @@
 { NULL }
 };
 
-AVFilter avfilter_vsrc_nullsrc = {
+AVFilter ff_vsrc_nullsrc = {
 .name = "nullsrc",
 .description = NULL_IF_CONFIG_SMALL("Null video source, never return images."),
 
- .init = init,
 .priv_size = sizeof(NullContext),
+ .priv_class = &nullsrc_class,
 
 .inputs = NULL,

libav-v9.6.tar.bz2/libavfilter/vsrc_testsrc.c -> libav-v10.1.tar.bz2/libavfilter/vsrc_testsrc.c Changed

@@ -53,38 +53,32 @@
 char *duration; ///< total duration of the generated video
 AVRational sar; ///< sample aspect ratio
 
- void (* fill_picture_fn)(AVFilterContext *ctx, AVFilterBufferRef *picref);
+ void (* fill_picture_fn)(AVFilterContext *ctx, AVFrame *frame);
 
 /* only used by rgbtest */
 int rgba_map[4];
 } TestSourceContext;
 
 #define OFFSET(x) offsetof(TestSourceContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
 
 static const AVOption testsrc_options[] = {
- { "size", "set video size", OFFSET(size), AV_OPT_TYPE_STRING, {.str = "320x240"}},
- { "s", "set video size", OFFSET(size), AV_OPT_TYPE_STRING, {.str = "320x240"}},
- { "rate", "set video rate", OFFSET(rate), AV_OPT_TYPE_STRING, {.str = "25"}, },
- { "r", "set video rate", OFFSET(rate), AV_OPT_TYPE_STRING, {.str = "25"}, },
- { "duration", "set video duration", OFFSET(duration), AV_OPT_TYPE_STRING, {.str = NULL}, },
- { "sar", "set video sample aspect ratio", OFFSET(sar), AV_OPT_TYPE_RATIONAL, {.dbl = 1}, 0, INT_MAX },
+ { "size", "set video size", OFFSET(size), AV_OPT_TYPE_STRING, {.str = "320x240"}, .flags = FLAGS },
+ { "s", "set video size", OFFSET(size), AV_OPT_TYPE_STRING, {.str = "320x240"}, .flags = FLAGS },
+ { "rate", "set video rate", OFFSET(rate), AV_OPT_TYPE_STRING, {.str = "25"}, .flags = FLAGS },
+ { "r", "set video rate", OFFSET(rate), AV_OPT_TYPE_STRING, {.str = "25"}, .flags = FLAGS },
+ { "duration", "set video duration", OFFSET(duration), AV_OPT_TYPE_STRING, {.str = NULL}, .flags = FLAGS },
+ { "sar", "set video sample aspect ratio", OFFSET(sar), AV_OPT_TYPE_RATIONAL, {.dbl = 1}, 0, INT_MAX, FLAGS },
 { NULL },
 };
 
-static av_cold int init_common(AVFilterContext *ctx, const char *args)
+static av_cold int init_common(AVFilterContext *ctx)
 {
 TestSourceContext *test = ctx->priv;
 AVRational frame_rate_q;
 int64_t duration = -1;
 int ret = 0;
 
- av_opt_set_defaults(test);
-
- if ((ret = (av_set_options_string(test, args, "=", ":"))) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
- return ret;
- }
-
 if ((ret = av_parse_video_size(&test->w, &test->h, test->size)) < 0) {
 av_log(ctx, AV_LOG_ERROR, "Invalid frame size: '%s'\n", test->size);
 return ret;
@@ -130,24 +124,23 @@
 static int request_frame(AVFilterLink *outlink)
 {
 TestSourceContext *test = outlink->src->priv;
- AVFilterBufferRef *picref;
+ AVFrame *frame;
 
 if (test->max_pts >= 0 && test->pts > test->max_pts)
 return AVERROR_EOF;
- picref = ff_get_video_buffer(outlink, AV_PERM_WRITE, test->w, test->h);
- if (!picref)
+ frame = ff_get_video_buffer(outlink, test->w, test->h);
+ if (!frame)
 return AVERROR(ENOMEM);
 
- picref->pts = test->pts++;
- picref->pos = -1;
- picref->video->key_frame = 1;
- picref->video->interlaced = 0;
- picref->video->pict_type = AV_PICTURE_TYPE_I;
- picref->video->pixel_aspect = test->sar;
+ frame->pts = test->pts++;
+ frame->key_frame = 1;
+ frame->interlaced_frame = 0;
+ frame->pict_type = AV_PICTURE_TYPE_I;
+ frame->sample_aspect_ratio = test->sar;
 test->nb_frame++;
- test->fill_picture_fn(outlink->src, picref);
+ test->fill_picture_fn(outlink->src, frame);
 
- return ff_filter_frame(outlink, picref);
+ return ff_filter_frame(outlink, frame);
 }
 
 #if CONFIG_TESTSRC_FILTER
@@ -235,7 +228,7 @@
 
 #define GRADIENT_SIZE (6 * 256)
 
-static void test_fill_picture(AVFilterContext *ctx, AVFilterBufferRef *picref)
+static void test_fill_picture(AVFilterContext *ctx, AVFrame *frame)
 {
 TestSourceContext *test = ctx->priv;
 uint8_t *p, *p0;
@@ -249,9 +242,9 @@
 int seg_size;
 int second;
 int i;
- uint8_t *data = picref->data[0];
- int width = picref->video->w;
- int height = picref->video->h;
+ uint8_t *data = frame->data[0];
+ int width = frame->width;
+ int height = frame->height;
 
 /* draw colored bars and circle */
 radius = (width + height) / 4;
@@ -281,11 +274,11 @@
 }
 quad0 += dquad_y;
 dquad_y += 2;
- p0 += picref->linesize[0];
+ p0 += frame->linesize[0];
 }
 
 /* draw sliding color line */
- p = data + picref->linesize[0] * height * 3/4;
+ p = data + frame->linesize[0] * height * 3/4;
 grad = (256 * test->nb_frame * test->time_base.num / test->time_base.den) %
 GRADIENT_SIZE;
 rgrad = 0;
@@ -314,8 +307,8 @@
 grad -= GRADIENT_SIZE;
 }
 for (y = height / 8; y > 0; y--) {
- memcpy(p, p - picref->linesize[0], 3 * width);
- p += picref->linesize[0];
+ memcpy(p, p - frame->linesize[0], 3 * width);
+ p += frame->linesize[0];
 }
 
 /* draw digits */
@@ -324,10 +317,10 @@
 second = test->nb_frame * test->time_base.num / test->time_base.den;
 x = width - (width - seg_size * 64) / 2;
 y = (height - seg_size * 13) / 2;
- p = data + (x*3 + y * picref->linesize[0]);
+ p = data + (x*3 + y * frame->linesize[0]);
 for (i = 0; i < 8; i++) {
 p -= 3 * 8 * seg_size;
- draw_digit(second % 10, p, picref->linesize[0], seg_size);
+ draw_digit(second % 10, p, frame->linesize[0], seg_size);
 second /= 10;
 if (second == 0)
 break;
@@ -335,13 +328,12 @@
 }
 }
 
-static av_cold int test_init(AVFilterContext *ctx, const char *args)
+static av_cold int test_init(AVFilterContext *ctx)
 {
 TestSourceContext *test = ctx->priv;
 
- test->class = &testsrc_class;
 test->fill_picture_fn = test_fill_picture;
- return init_common(ctx, args);
+ return init_common(ctx);
 }
 
 static int test_query_formats(AVFilterContext *ctx)
@@ -363,10 +355,11 @@
 { NULL }
 };
 
-AVFilter avfilter_vsrc_testsrc = {
+AVFilter ff_vsrc_testsrc = {
 .name = "testsrc",
 .description = NULL_IF_CONFIG_SMALL("Generate test pattern."),
 .priv_size = sizeof(TestSourceContext),
+ .priv_class = &testsrc_class,
 .init = test_init,
 
 .query_formats = test_query_formats,
@@ -427,13 +420,13 @@
 }
 }
 
-static void rgbtest_fill_picture(AVFilterContext *ctx, AVFilterBufferRef *picref)
+static void rgbtest_fill_picture(AVFilterContext *ctx, AVFrame *frame)
 {
 TestSourceContext *test = ctx->priv;
- int x, y, w = picref->video->w, h = picref->video->h;
+ int x, y, w = frame->width, h = frame->height;
 
 for (y = 0; y < h; y++) {
- for (x = 0; x < picref->video->w; x++) {
+ for (x = 0; x < w; x++) {
 int c = 256*x/w;
 int r = 0, g = 0, b = 0;
 
@@ -441,19 +434,18 @@
 else if (3*y < 2*h) g = c;
 else b = c;
 
- rgbtest_put_pixel(picref->data[0], picref->linesize[0], x, y, r, g, b,
+ rgbtest_put_pixel(frame->data[0], frame->linesize[0], x, y, r, g, b,
 ctx->outputs[0]->format, test->rgba_map);
 }
 }
 }
 
-static av_cold int rgbtest_init(AVFilterContext *ctx, const char *args)
+static av_cold int rgbtest_init(AVFilterContext *ctx)
 {
 TestSourceContext *test = ctx->priv;
 
- test->class = &rgbtestsrc_class;
 test->fill_picture_fn = rgbtest_fill_picture;
- return init_common(ctx, args);
+ return init_common(ctx);
 }
 
 static int rgbtest_query_formats(AVFilterContext *ctx)
@@ -496,10 +488,11 @@
 { NULL }
 };
 
-AVFilter avfilter_vsrc_rgbtestsrc = {
+AVFilter ff_vsrc_rgbtestsrc = {
 .name = "rgbtestsrc",
 .description = NULL_IF_CONFIG_SMALL("Generate RGB test pattern."),
 .priv_size = sizeof(TestSourceContext),
+ .priv_class = &rgbtestsrc_class,
 .init = rgbtest_init,
 
 .query_formats = rgbtest_query_formats,

libav-v9.6.tar.bz2/libavfilter/x86/Makefile -> libav-v10.1.tar.bz2/libavfilter/x86/Makefile Changed

libav-v9.6.tar.bz2/libavfilter/x86/af_volume_init.c -> libav-v10.1.tar.bz2/libavfilter/x86/af_volume_init.c Changed

@@ -17,6 +17,7 @@
 */
 
 #include "config.h"
+#include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/samplefmt.h"
 #include "libavutil/x86/cpu.h"
@@ -32,26 +33,26 @@
 void ff_scale_samples_s32_avx(uint8_t *dst, const uint8_t *src, int len,
 int volume);
 
-void ff_volume_init_x86(VolumeContext *vol)
+av_cold void ff_volume_init_x86(VolumeContext *vol)
 {
- int mm_flags = av_get_cpu_flags();
+ int cpu_flags = av_get_cpu_flags();
 enum AVSampleFormat sample_fmt = av_get_packed_sample_fmt(vol->sample_fmt);
 
 if (sample_fmt == AV_SAMPLE_FMT_S16) {
- if (EXTERNAL_SSE2(mm_flags) && vol->volume_i < 32768) {
+ if (EXTERNAL_SSE2(cpu_flags) && vol->volume_i < 32768) {
 vol->scale_samples = ff_scale_samples_s16_sse2;
 vol->samples_align = 8;
 }
 } else if (sample_fmt == AV_SAMPLE_FMT_S32) {
- if (EXTERNAL_SSE2(mm_flags)) {
+ if (EXTERNAL_SSE2(cpu_flags)) {
 vol->scale_samples = ff_scale_samples_s32_sse2;
 vol->samples_align = 4;
 }
- if (EXTERNAL_SSSE3(mm_flags) && mm_flags & AV_CPU_FLAG_ATOM) {
+ if (EXTERNAL_SSSE3(cpu_flags) && cpu_flags & AV_CPU_FLAG_ATOM) {
 vol->scale_samples = ff_scale_samples_s32_ssse3_atom;
 vol->samples_align = 4;
 }
- if (EXTERNAL_AVX(mm_flags)) {
+ if (EXTERNAL_AVX(cpu_flags)) {
 vol->scale_samples = ff_scale_samples_s32_avx;
 vol->samples_align = 8;
 }

libav-v10.1.tar.bz2/libavfilter/x86/vf_gradfun.asm Added

@@ -0,0 +1,110 @@
+;******************************************************************************
+;* x86-optimized functions for gradfun filter
+;*
+;* This file is part of Libav.
+;*
+;* Libav 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.
+;*
+;* Libav 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 Libav; 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_7f: times 8 dw 0x7F
+pw_ff: times 8 dw 0xFF
+
+SECTION .text
+
+%macro FILTER_LINE 1
+    movh       m0, [r2+r0]
+    movh       m1, [r3+r0]
+    punpcklbw  m0, m7
+    punpcklwd  m1, m1
+    psllw      m0, 7
+    psubw      m1, m0
+    PABSW      m2, m1
+    pmulhuw    m2, m5
+    psubw      m2, m6
+    pminsw     m2, m7
+    pmullw     m2, m2
+    psllw      m1, 2
+    paddw      m0, %1
+    pmulhw     m1, m2
+    paddw      m0, m1
+    psraw      m0, 7
+    packuswb   m0, m0
+    movh  [r1+r0], m0
+%endmacro
+
+INIT_MMX mmxext
+cglobal gradfun_filter_line, 6, 6
+    movh      m5, r4d
+    pxor      m7, m7
+    pshufw    m5, m5,0
+    mova      m6, [pw_7f]
+    mova      m3, [r5]
+    mova      m4, [r5+8]
+.loop:
+    FILTER_LINE m3
+    add       r0, 4
+    jge .end
+    FILTER_LINE m4
+    add       r0, 4
+    jl .loop
+.end:
+    REP_RET
+
+INIT_XMM ssse3
+cglobal gradfun_filter_line, 6, 6, 8
+    movd       m5, r4d
+    pxor       m7, m7
+    pshuflw    m5, m5, 0
+    mova       m6, [pw_7f]
+    punpcklqdq m5, m5
+    mova       m4, [r5]
+.loop:
+    FILTER_LINE m4
+    add        r0, 8
+    jl .loop
+    REP_RET
+
+%macro BLUR_LINE 1
+cglobal gradfun_blur_line_%1, 6, 6, 8
+    mova        m7, [pw_ff]
+.loop:
+    %1          m0, [r4+r0]
+    %1          m1, [r5+r0]
+    mova        m2, m0
+    mova        m3, m1
+    psrlw       m0, 8
+    psrlw       m1, 8
+    pand        m2, m7
+    pand        m3, m7
+    paddw       m0, m1
+    paddw       m2, m3
+    paddw       m0, m2
+    paddw       m0, [r2+r0]
+    mova        m1, [r1+r0]
+    mova   [r1+r0], m0
+    psubw       m0, m1
+    mova   [r3+r0], m0
+    add         r0, 16
+    jl .loop
+    REP_RET
+%endmacro
+
+INIT_XMM sse2
+BLUR_LINE movdqa
+BLUR_LINE movdqu

libav-v10.1.tar.bz2/libavfilter/x86/vf_gradfun_init.c Added

@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2009 Loren Merritt <lorenm@u.washington.edu>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/mem.h"
+#include "libavutil/x86/asm.h"
+#include "libavutil/x86/cpu.h"
+#include "libavfilter/gradfun.h"
+
+void ff_gradfun_filter_line_mmxext(intptr_t x, uint8_t *dst, uint8_t *src,
+ uint16_t *dc, int thresh,
+ const uint16_t *dithers);
+
+void ff_gradfun_filter_line_ssse3(intptr_t x, uint8_t *dst, uint8_t *src,
+ uint16_t *dc, int thresh,
+ const uint16_t *dithers);
+
+void ff_gradfun_blur_line_movdqa_sse2(intptr_t x, uint16_t *buf,
+ uint16_t *buf1, uint16_t *dc,
+ uint8_t *src1, uint8_t *src2);
+void ff_gradfun_blur_line_movdqu_sse2(intptr_t x, uint16_t *buf,
+ uint16_t *buf1, uint16_t *dc,
+ uint8_t *src1, uint8_t *src2);
+
+#if HAVE_YASM
+static void gradfun_filter_line(uint8_t *dst, uint8_t *src, uint16_t *dc,
+ int width, int thresh, const uint16_t *dithers,
+ int alignment)
+{
+ intptr_t x;
+ if (width & alignment) {
+ x = width & ~alignment;
+ 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,
+ thresh, dithers);
+}
+
+static void gradfun_filter_line_mmxext(uint8_t *dst, uint8_t *src, uint16_t *dc,
+ int width, int thresh,
+ const uint16_t *dithers)
+{
+ gradfun_filter_line(dst, src, dc, width, thresh, dithers, 3);
+}
+
+static void gradfun_filter_line_ssse3(uint8_t *dst, uint8_t *src, uint16_t *dc,
+ int width, int thresh,
+ const uint16_t *dithers)
+{
+ gradfun_filter_line(dst, src, dc, width, thresh, dithers, 7);
+}
+
+static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, uint16_t *buf1,
+ uint8_t *src, int src_linesize, int width)
+{
+ 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
+ ff_gradfun_blur_line_movdqa_sse2(x, buf + width, buf1 + width,
+ dc + width, src + width * 2,
+ src + width * 2 + src_linesize);
+}
+#endif /* HAVE_YASM */
+
+av_cold void ff_gradfun_init_x86(GradFunContext *gf)
+{
+#if HAVE_YASM
+ int cpu_flags = av_get_cpu_flags();
+
+ if (EXTERNAL_MMXEXT(cpu_flags))
+ gf->filter_line = gradfun_filter_line_mmxext;
+ if (EXTERNAL_SSSE3(cpu_flags))
+ gf->filter_line = gradfun_filter_line_ssse3;
+
+ if (EXTERNAL_SSE2(cpu_flags))
+ gf->blur_line = gradfun_blur_line_sse2;
+#endif /* HAVE_YASM */
+}

libav-v10.1.tar.bz2/libavfilter/x86/vf_hqdn3d.asm Changed

libav-v10.1.tar.bz2/libavfilter/x86/vf_hqdn3d_init.c Added

@@ -0,0 +1,47 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with Libav; 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 "libavutil/attributes.h"
+#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);
+
+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[10] = ff_hqdn3d_row_10_x86;
+ hqdn3d->denoise_row[16] = ff_hqdn3d_row_16_x86;
+#endif /* HAVE_YASM */
+}

libav-v10.1.tar.bz2/libavfilter/x86/vf_yadif.asm Added

@@ -0,0 +1,254 @@
+;*****************************************************************************
+;* x86-optimized functions for yadif filter
+;*
+;* Copyright (C) 2006 Michael Niedermayer <michaelni@gmx.at>
+;* Copyright (c) 2013 Daniel Kang <daniel.d.kang@gmail.com>
+;*
+;* This file is part of Libav.
+;*
+;* Libav 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.
+;*
+;* Libav 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 Libav; 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_1: times 16 db 1
+pw_1: times 8 dw 1
+
+SECTION .text
+
+%macro CHECK 2
+ movu m2, [curq+t1+%1]
+ movu m3, [curq+t0+%2]
+ mova m4, m2
+ mova m5, m2
+ pxor m4, m3
+ pavgb m5, m3
+ pand m4, [pb_1]
+ psubusb m5, m4
+%if mmsize == 16
+ psrldq m5, 1
+%else
+ psrlq m5, 8
+%endif
+ punpcklbw m5, m7
+ mova m4, m2
+ psubusb m2, m3
+ psubusb m3, m4
+ pmaxub m2, m3
+ mova m3, m2
+ mova m4, m2
+%if mmsize == 16
+ psrldq m3, 1
+ psrldq m4, 2
+%else
+ psrlq m3, 8
+ psrlq m4, 16
+%endif
+ punpcklbw m2, m7
+ punpcklbw m3, m7
+ punpcklbw m4, m7
+ paddw m2, m3
+ paddw m2, m4
+%endmacro
+
+%macro CHECK1 0
+ mova m3, m0
+ pcmpgtw m3, m2
+ pminsw m0, m2
+ mova m6, m3
+ pand m5, m3
+ pandn m3, m1
+ por m3, m5
+ mova m1, m3
+%endmacro
+
+%macro CHECK2 0
+ paddw m6, [pw_1]
+ psllw m6, 14
+ paddsw m2, m6
+ mova m3, m0
+ pcmpgtw m3, m2
+ pminsw m0, m2
+ pand m5, m3
+ pandn m3, m1
+ por m3, m5
+ mova m1, m3
+%endmacro
+
+%macro LOAD 2
+ movh m%1, %2
+ punpcklbw m%1, m7
+%endmacro
+
+%macro FILTER 3
+.loop%1:
+ pxor m7, m7
+ LOAD 0, [curq+t1]
+ LOAD 1, [curq+t0]
+ LOAD 2, [%2]
+ LOAD 3, [%3]
+ mova m4, m3
+ paddw m3, m2
+ psraw m3, 1
+ mova [rsp+ 0], m0
+ mova [rsp+16], m3
+ mova [rsp+32], m1
+ psubw m2, m4
+ ABS1 m2, m4
+ LOAD 3, [prevq+t1]
+ LOAD 4, [prevq+t0]
+ psubw m3, m0
+ psubw m4, m1
+ ABS1 m3, m5
+ ABS1 m4, m5
+ paddw m3, m4
+ psrlw m2, 1
+ psrlw m3, 1
+ pmaxsw m2, m3
+ LOAD 3, [nextq+t1]
+ LOAD 4, [nextq+t0]
+ psubw m3, m0
+ psubw m4, m1
+ ABS1 m3, m5
+ ABS1 m4, m5
+ paddw m3, m4
+ psrlw m3, 1
+ pmaxsw m2, m3
+ mova [rsp+48], m2
+
+ paddw m1, m0
+ paddw m0, m0
+ psubw m0, m1
+ psrlw m1, 1
+ ABS1 m0, m2
+
+ movu m2, [curq+t1-1]
+ movu m3, [curq+t0-1]
+ mova m4, m2
+ psubusb m2, m3
+ psubusb m3, m4
+ pmaxub m2, m3
+%if mmsize == 16
+ mova m3, m2
+ psrldq m3, 2
+%else
+ pshufw m3, m2, q0021
+%endif
+ punpcklbw m2, m7
+ punpcklbw m3, m7
+ paddw m0, m2
+ paddw m0, m3
+ psubw m0, [pw_1]
+
+ CHECK -2, 0
+ CHECK1
+ CHECK -3, 1
+ CHECK2
+ CHECK 0, -2
+ CHECK1
+ CHECK 1, -3
+ CHECK2
+
+ mova m6, [rsp+48]
+ cmp DWORD r8m, 2
+ jge .end%1
+ LOAD 2, [%2+t1*2]
+ LOAD 4, [%3+t1*2]
+ LOAD 3, [%2+t0*2]
+ LOAD 5, [%3+t0*2]
+ paddw m2, m4
+ paddw m3, m5
+ psrlw m2, 1
+ psrlw m3, 1
+ mova m4, [rsp+ 0]
+ mova m5, [rsp+16]
+ mova m7, [rsp+32]
+ psubw m2, m4
+ psubw m3, m7
+ mova m0, m5
+ psubw m5, m4
+ psubw m0, m7
+ mova m4, m2
+ pminsw m2, m3
+ pmaxsw m3, m4
+ pmaxsw m2, m5
+ pminsw m3, m5
+ pmaxsw m2, m0
+ pminsw m3, m0
+ pxor m4, m4
+ pmaxsw m6, m3
+ psubw m4, m2
+ pmaxsw m6, m4
+
+.end%1:
+ mova m2, [rsp+16]
+ mova m3, m2
+ psubw m2, m6
+ paddw m3, m6
+ pmaxsw m1, m2
+ pminsw m1, m3
+ packuswb m1, m1
+
+ movh [dstq], m1
+ add dstq, mmsize/2
+ add prevq, mmsize/2
+ add curq, mmsize/2
+ add nextq, mmsize/2
+ sub DWORD r4m, mmsize/2
+ jg .loop%1
+%endmacro
+
+%macro YADIF 0
+%if ARCH_X86_32
+cglobal yadif_filter_line, 4, 6, 8, 80, dst, prev, cur, next, w, prefs, \
+ mrefs, parity, mode
+%else
+cglobal yadif_filter_line, 4, 7, 8, 80, dst, prev, cur, next, w, prefs, \
+ mrefs, parity, mode
+%endif
+ cmp DWORD wm, 0
+ jle .ret
+%if ARCH_X86_32
+ mov r4, r5mp
+ mov r5, r6mp
+ DECLARE_REG_TMP 4,5
+%else
+ movsxd r5, DWORD r5m
+ movsxd r6, DWORD r6m
+ DECLARE_REG_TMP 5,6
+%endif
+
+ cmp DWORD paritym, 0
+ je .parity0
+ FILTER 1, prevq, curq
+ jmp .ret
+
+.parity0:
+ FILTER 0, curq, nextq
+
+.ret:
+ RET
+%endmacro
+
+INIT_XMM ssse3
+YADIF
+INIT_XMM sse2
+YADIF
+%if ARCH_X86_32
+INIT_MMX mmxext
+YADIF
+%endif

libav-v10.1.tar.bz2/libavfilter/x86/vf_yadif_init.c Added

@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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/internal.h"
+#include "libavutil/mem.h"
+#include "libavutil/x86/asm.h"
+#include "libavutil/x86/cpu.h"
+#include "libavfilter/yadif.h"
+
+void ff_yadif_filter_line_mmxext(void *dst, void *prev, void *cur,
+ void *next, int w, int prefs,
+ int mrefs, int parity, int mode);
+void ff_yadif_filter_line_sse2(void *dst, void *prev, void *cur,
+ void *next, int w, int prefs,
+ int mrefs, int parity, int mode);
+void ff_yadif_filter_line_ssse3(void *dst, void *prev, void *cur,
+ void *next, int w, int prefs,
+ int mrefs, int parity, int mode);
+
+av_cold void ff_yadif_init_x86(YADIFContext *yadif)
+{
+#if HAVE_YASM
+ int cpu_flags = av_get_cpu_flags();
+
+#if ARCH_X86_32
+ if (EXTERNAL_MMXEXT(cpu_flags))
+ yadif->filter_line = ff_yadif_filter_line_mmxext;
+#endif /* ARCH_X86_32 */
+ if (EXTERNAL_SSE2(cpu_flags))
+ yadif->filter_line = ff_yadif_filter_line_sse2;
+ if (EXTERNAL_SSSE3(cpu_flags))
+ yadif->filter_line = ff_yadif_filter_line_ssse3;
+#endif /* HAVE_YASM */
+}

libav-v9.6.tar.bz2/libavfilter/yadif.h -> libav-v10.1.tar.bz2/libavfilter/yadif.h Changed

@@ -1,19 +1,19 @@
 /*
  * This file is part of Libav.
  *
- * Libav 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.
+ * Libav 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.
  *
  * Libav 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 Libav; 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef AVFILTER_YADIF_H
@@ -23,6 +23,7 @@
 #include "avfilter.h"
 
 typedef struct YADIFContext {
+    const AVClass *class;
     /**
      * 0: send 1 frame for each frame
      * 1: send 1 frame for each field
@@ -46,13 +47,19 @@
      */
     int auto_enable;
 
-    AVFilterBufferRef *cur;
-    AVFilterBufferRef *next;
-    AVFilterBufferRef *prev;
-    AVFilterBufferRef *out;
-    void (*filter_line)(uint8_t *dst,
-                        uint8_t *prev, uint8_t *cur, uint8_t *next,
+    AVFrame *cur;
+    AVFrame *next;
+    AVFrame *prev;
+    AVFrame *out;
+
+    /**
+     * Required alignment for filter_line
+     */
+    void (*filter_line)(void *dst,
+                        void *prev, void *cur, void *next,
                         int w, int prefs, int mrefs, int parity, int mode);
+    void (*filter_edges)(void *dst, void *prev, void *cur, void *next,
+                         int w, int prefs, int mrefs, int parity, int mode);
 
     const AVPixFmtDescriptor *csp;
     int eof;

libav-v9.6.tar.bz2/libavformat/4xm.c -> libav-v10.1.tar.bz2/libavformat/4xm.c Changed

@@ -57,7 +57,7 @@
 
 #define GET_LIST_HEADER() \
 fourcc_tag = avio_rl32(pb); \
- size = avio_rl32(pb); \
+ size = avio_rl32(pb); \
 if (fourcc_tag != LIST_TAG) \
 return AVERROR_INVALIDDATA; \
 fourcc_tag = avio_rl32(pb);
@@ -72,8 +72,6 @@
 } AudioTrack;
 
 typedef struct FourxmDemuxContext {
- int width;
- int height;
 int video_stream_index;
 int track_count;
 AudioTrack *tracks;
@@ -91,6 +89,100 @@
 return AVPROBE_SCORE_MAX;
 }
 
+static int parse_vtrk(AVFormatContext *s,
+ FourxmDemuxContext *fourxm, uint8_t *buf, int size,
+ int left)
+{
+ AVStream *st;
+ /* check that there is enough data */
+ if (size != vtrk_SIZE || left < size + 8) {
+ return AVERROR_INVALIDDATA;
+ }
+
+ /* allocate a new AVStream */
+ st = avformat_new_stream(s, NULL);
+ if (!st)
+ return AVERROR(ENOMEM);
+
+ avpriv_set_pts_info(st, 60, 1, fourxm->fps);
+
+ fourxm->video_stream_index = st->index;
+
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codec->codec_id = AV_CODEC_ID_4XM;
+ st->codec->extradata_size = 4;
+ st->codec->extradata = av_malloc(4);
+ AV_WL32(st->codec->extradata, AV_RL32(buf + 16));
+ st->codec->width = AV_RL32(buf + 36);
+ st->codec->height = AV_RL32(buf + 40);
+
+ return 0;
+}
+
+
+static int parse_strk(AVFormatContext *s,
+ FourxmDemuxContext *fourxm, uint8_t *buf, int size,
+ int left)
+{
+ AVStream *st;
+ int track;
+ /* check that there is enough data */
+ if (size != strk_SIZE || left < size + 8)
+ return AVERROR_INVALIDDATA;
+
+ track = AV_RL32(buf + 8);
+ if (track < 0)
+ return AVERROR_INVALIDDATA;
+ if (track + 1 > fourxm->track_count) {
+ if (av_reallocp_array(&fourxm->tracks, track + 1, sizeof(AudioTrack)))
+ return AVERROR(ENOMEM);
+ memset(&fourxm->tracks[fourxm->track_count], 0,
+ sizeof(AudioTrack) * (track + 1 - fourxm->track_count));
+ fourxm->track_count = track + 1;
+ }
+ fourxm->tracks[track].adpcm = AV_RL32(buf + 12);
+ fourxm->tracks[track].channels = AV_RL32(buf + 36);
+ fourxm->tracks[track].sample_rate = AV_RL32(buf + 40);
+ fourxm->tracks[track].bits = AV_RL32(buf + 44);
+ fourxm->tracks[track].audio_pts = 0;
+
+ if (fourxm->tracks[track].channels <= 0 ||
+ fourxm->tracks[track].sample_rate <= 0 ||
+ fourxm->tracks[track].bits <= 0) {
+ av_log(s, AV_LOG_ERROR, "audio header invalid\n");
+ return AVERROR_INVALIDDATA;
+ }
+ /* allocate a new AVStream */
+ st = avformat_new_stream(s, NULL);
+ if (!st)
+ return AVERROR(ENOMEM);
+
+ st->id = track;
+ avpriv_set_pts_info(st, 60, 1, fourxm->tracks[track].sample_rate);
+
+ fourxm->tracks[track].stream_index = st->index;
+
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codec->codec_tag = 0;
+ st->codec->channels = fourxm->tracks[track].channels;
+ st->codec->sample_rate = fourxm->tracks[track].sample_rate;
+ st->codec->bits_per_coded_sample = fourxm->tracks[track].bits;
+ st->codec->bit_rate = st->codec->channels *
+ st->codec->sample_rate *
+ st->codec->bits_per_coded_sample;
+ st->codec->block_align = st->codec->channels *
+ st->codec->bits_per_coded_sample;
+
+ if (fourxm->tracks[track].adpcm){
+ st->codec->codec_id = AV_CODEC_ID_ADPCM_4XM;
+ } else if (st->codec->bits_per_coded_sample == 8) {
+ st->codec->codec_id = AV_CODEC_ID_PCM_U8;
+ } else
+ st->codec->codec_id = AV_CODEC_ID_PCM_S16LE;
+
+ return 0;
+}
+
 static int fourxm_read_header(AVFormatContext *s)
 {
 AVIOContext *pb = s->pb;
@@ -100,11 +192,10 @@
 FourxmDemuxContext *fourxm = s->priv_data;
 unsigned char *header;
 int i, ret;
- AVStream *st;
 
 fourxm->track_count = 0;
- fourxm->tracks = NULL;
- fourxm->fps = 1.0;
+ fourxm->tracks = NULL;
+ fourxm->fps = 1.0;
 
 /* skip the first 3 32-bit numbers */
 avio_skip(pb, 12);
@@ -119,7 +210,7 @@
 header = av_malloc(header_size);
 if (!header)
 return AVERROR(ENOMEM);
- if (avio_read(pb, header, header_size) != header_size){
+ if (avio_read(pb, header, header_size) != header_size) {
 av_free(header);
 return AVERROR(EIO);
 }
@@ -127,109 +218,33 @@
 /* take the lazy approach and search for any and all vtrk and strk chunks */
 for (i = 0; i < header_size - 8; i++) {
 fourcc_tag = AV_RL32(&header[i]);
- size = AV_RL32(&header[i + 4]);
+ size = AV_RL32(&header[i + 4]);
 
 if (fourcc_tag == std__TAG) {
- fourxm->fps = av_int2float(AV_RL32(&header[i + 12]));
- } else if (fourcc_tag == vtrk_TAG) {
- /* check that there is enough data */
- if (size != vtrk_SIZE) {
- ret= AVERROR_INVALIDDATA;
+ if (header_size - i < 16) {
+ ret = AVERROR_INVALIDDATA;
 goto fail;
 }
- fourxm->width = AV_RL32(&header[i + 36]);
- fourxm->height = AV_RL32(&header[i + 40]);
-
- /* allocate a new AVStream */
- st = avformat_new_stream(s, NULL);
- if (!st){
- ret= AVERROR(ENOMEM);
+ fourxm->fps = av_int2float(AV_RL32(&header[i + 12]));
+ } else if (fourcc_tag == vtrk_TAG) {
+ if ((ret = parse_vtrk(s, fourxm, header + i, size,
+ header_size - i)) < 0)
 goto fail;
- }
- avpriv_set_pts_info(st, 60, 1, fourxm->fps);
-
- fourxm->video_stream_index = st->index;
-
- st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = AV_CODEC_ID_4XM;
- st->codec->extradata_size = 4;
- st->codec->extradata = av_malloc(4);
- AV_WL32(st->codec->extradata, AV_RL32(&header[i + 16]));
- st->codec->width = fourxm->width;
- st->codec->height = fourxm->height;
 
 i += 8 + size;
 } else if (fourcc_tag == strk_TAG) {
- int current_track;
- /* check that there is enough data */
- if (size != strk_SIZE) {
- ret= AVERROR_INVALIDDATA;
- goto fail;
- }
- current_track = AV_RL32(&header[i + 8]);
- if((unsigned)current_track >= UINT_MAX / sizeof(AudioTrack) - 1){
- av_log(s, AV_LOG_ERROR, "current_track too large\n");
- ret= -1;
+ if ((ret = parse_strk(s, fourxm, header + i, size,
+ header_size - i)) < 0)
 goto fail;
- }
- if (current_track + 1 > fourxm->track_count) {
- fourxm->tracks = av_realloc(fourxm->tracks,
- (current_track + 1) * sizeof(AudioTrack));
- if (!fourxm->tracks) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
- memset(&fourxm->tracks[fourxm->track_count], 0,
- sizeof(AudioTrack) * (current_track + 1 - fourxm->track_count));
- fourxm->track_count = current_track + 1;
- }
- fourxm->tracks[current_track].adpcm = AV_RL32(&header[i + 12]);
- fourxm->tracks[current_track].channels = AV_RL32(&header[i + 36]);
- fourxm->tracks[current_track].sample_rate = AV_RL32(&header[i + 40]);
- fourxm->tracks[current_track].bits = AV_RL32(&header[i + 44]);
- fourxm->tracks[current_track].audio_pts = 0;
- if( fourxm->tracks[current_track].channels <= 0
- || fourxm->tracks[current_track].sample_rate <= 0
- || fourxm->tracks[current_track].bits < 0){
- av_log(s, AV_LOG_ERROR, "audio header invalid\n");
- ret= -1;
- goto fail;
- }
- i += 8 + size;
 
- /* allocate a new AVStream */
- st = avformat_new_stream(s, NULL);
- if (!st){
- ret= AVERROR(ENOMEM);
- goto fail;
- }
-
- st->id = current_track;
- avpriv_set_pts_info(st, 60, 1, fourxm->tracks[current_track].sample_rate);
-
- fourxm->tracks[current_track].stream_index = st->index;
-
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_tag = 0;
- st->codec->channels = fourxm->tracks[current_track].channels;
- st->codec->sample_rate = fourxm->tracks[current_track].sample_rate;
- st->codec->bits_per_coded_sample = fourxm->tracks[current_track].bits;
- st->codec->bit_rate = st->codec->channels * st->codec->sample_rate *
- st->codec->bits_per_coded_sample;
- st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample;
- if (fourxm->tracks[current_track].adpcm){
- st->codec->codec_id = AV_CODEC_ID_ADPCM_4XM;
- }else if (st->codec->bits_per_coded_sample == 8){
- st->codec->codec_id = AV_CODEC_ID_PCM_U8;
- }else
- st->codec->codec_id = AV_CODEC_ID_PCM_S16LE;
+ i += 8 + size;
 }
 }
 
 /* skip over the LIST-MOVI chunk (which is where the stream should be */
 GET_LIST_HEADER();
- if (fourcc_tag != MOVI_TAG){
- ret= AVERROR_INVALIDDATA;
+ if (fourcc_tag != MOVI_TAG) {
+ ret = AVERROR_INVALIDDATA;
 goto fail;
 }
 
@@ -248,7 +263,7 @@
 AVPacket *pkt)
 {
 FourxmDemuxContext *fourxm = s->priv_data;
- AVIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
 unsigned int fourcc_tag;
 unsigned int size;
 int ret = 0;
@@ -258,18 +273,16 @@
 int audio_frame_count;
 
 while (!packet_read) {
-
 if ((ret = avio_read(s->pb, header, 8)) < 0)
 return ret;
 fourcc_tag = AV_RL32(&header[0]);
- size = AV_RL32(&header[4]);
+ size = AV_RL32(&header[4]);
 if (pb->eof_reached)
 return AVERROR(EIO);
 switch (fourcc_tag) {
-
 case LIST_TAG:
 /* this is a good time to bump the video pts */
- fourxm->video_pts ++;
+ fourxm->video_pts++;
 
 /* skip the LIST-* tag and move on to the next fourcc */
 avio_rl32(pb);
@@ -286,45 +299,43 @@
 if (size + 8 < size || av_new_packet(pkt, size + 8))
 return AVERROR(EIO);
 pkt->stream_index = fourxm->video_stream_index;
- pkt->pts = fourxm->video_pts;
- pkt->pos = avio_tell(s->pb);
+ pkt->pts = fourxm->video_pts;
+ pkt->pos = avio_tell(s->pb);
 memcpy(pkt->data, header, 8);
 ret = avio_read(s->pb, &pkt->data[8], size);
 
- if (ret < 0){
+ if (ret < 0) {
 av_free_packet(pkt);
- }else
+ } else
 packet_read = 1;
 break;
 
 case snd__TAG:
 track_number = avio_rl32(pb);
 avio_skip(pb, 4);
- size-=8;
+ size -= 8;
 
- if (track_number < fourxm->track_count && fourxm->tracks[track_number].channels>0) {
- ret= av_get_packet(s->pb, pkt, size);
- if(ret<0)
+ if (track_number < fourxm->track_count &&
+ fourxm->tracks[track_number].channels > 0) {
+ ret = av_get_packet(s->pb, pkt, size);
+ if (ret < 0)
 return AVERROR(EIO);
 pkt->stream_index =
 fourxm->tracks[track_number].stream_index;
- pkt->pts = fourxm->tracks[track_number].audio_pts;
+ pkt->pts = fourxm->tracks[track_number].audio_pts;
 packet_read = 1;
 
 /* pts accounting */
 audio_frame_count = size;
 if (fourxm->tracks[track_number].adpcm)
- audio_frame_count -=
- 2 * (fourxm->tracks[track_number].channels);
- audio_frame_count /=
- fourxm->tracks[track_number].channels;
- if (fourxm->tracks[track_number].adpcm){
+ audio_frame_count -= 2 * (fourxm->tracks[track_number].channels);
+ audio_frame_count /= fourxm->tracks[track_number].channels;
+ if (fourxm->tracks[track_number].adpcm) {
 audio_frame_count *= 2;
- }else
+ } else
 audio_frame_count /=
- (fourxm->tracks[track_number].bits / 8);
+ (fourxm->tracks[track_number].bits / 8);
 fourxm->tracks[track_number].audio_pts += audio_frame_count;
-
 } else {
 avio_skip(pb, size);
 }

libav-v9.6.tar.bz2/libavformat/Makefile -> libav-v10.1.tar.bz2/libavformat/Makefile Changed

@@ -9,6 +9,7 @@
        avio.o               \
        aviobuf.o            \
        cutils.o             \
+       format.o             \
        id3v1.o              \
        id3v2.o              \
        log2_tab.o           \
@@ -19,9 +20,12 @@
        riff.o               \
        sdp.o                \
        seek.o               \
+       url.o                \
        utils.o              \
 
 OBJS-$(CONFIG_NETWORK)                   += network.o
+OBJS-$(CONFIG_RIFFDEC)                   += riffdec.o
+OBJS-$(CONFIG_RIFFENC)                   += riffenc.o
 OBJS-$(CONFIG_RTPDEC)                    += rdt.o                       \
                                             rtp.o                       \
                                             rtpdec.o                    \
@@ -34,13 +38,16 @@
                                             rtpdec_ilbc.o               \
                                             rtpdec_jpeg.o               \
                                             rtpdec_latm.o               \
+                                            rtpdec_mpeg12.o             \
                                             rtpdec_mpeg4.o              \
+                                            rtpdec_mpegts.o             \
                                             rtpdec_qcelp.o              \
                                             rtpdec_qdm2.o               \
                                             rtpdec_qt.o                 \
                                             rtpdec_svq3.o               \
                                             rtpdec_vp8.o                \
-                                            rtpdec_xiph.o
+                                            rtpdec_xiph.o               \
+                                            srtp.o
 OBJS-$(CONFIG_RTPENC_CHAIN)              += rtpenc_chain.o rtp.o
 
 # muxers/demuxers
@@ -65,7 +72,7 @@
 OBJS-$(CONFIG_ASS_DEMUXER)               += assdec.o
 OBJS-$(CONFIG_ASS_MUXER)                 += assenc.o
 OBJS-$(CONFIG_AU_DEMUXER)                += au.o pcm.o
-OBJS-$(CONFIG_AU_MUXER)                  += au.o
+OBJS-$(CONFIG_AU_MUXER)                  += au.o rawenc.o
 OBJS-$(CONFIG_AVI_DEMUXER)               += avidec.o
 OBJS-$(CONFIG_AVI_MUXER)                 += avienc.o
 OBJS-$(CONFIG_AVISYNTH)                  += avisynth.o
@@ -107,6 +114,7 @@
 OBJS-$(CONFIG_FILMSTRIP_DEMUXER)         += filmstripdec.o
 OBJS-$(CONFIG_FILMSTRIP_MUXER)           += filmstripenc.o
 OBJS-$(CONFIG_FLAC_DEMUXER)              += flacdec.o rawdec.o \
+                                            flac_picture.o   \
                                             oggparsevorbis.o \
                                             vorbiscomment.o
 OBJS-$(CONFIG_FLAC_MUXER)                += flacenc.o flacenc_header.o \
@@ -130,8 +138,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 mpegtsenc.o
+OBJS-$(CONFIG_HLS_MUXER)                 += hlsenc.o
+OBJS-$(CONFIG_HNM_DEMUXER)               += hnm.o
 OBJS-$(CONFIG_IDCIN_DEMUXER)             += idcin.o
 OBJS-$(CONFIG_IFF_DEMUXER)               += iff.o
 OBJS-$(CONFIG_ILBC_DEMUXER)              += ilbc.o
@@ -156,8 +168,8 @@
 OBJS-$(CONFIG_MATROSKA_DEMUXER)          += matroskadec.o matroska.o  \
                                             isom.o rmsipr.o
 OBJS-$(CONFIG_MATROSKA_MUXER)            += matroskaenc.o matroska.o \
-                                            isom.o avc.o \
-                                            flacenc_header.o avlanguage.o
+                                            isom.o avc.o hevc.o \
+                                            flacenc_header.o avlanguage.o wv.o
 OBJS-$(CONFIG_MD5_MUXER)                 += md5enc.o
 OBJS-$(CONFIG_MJPEG_DEMUXER)             += rawdec.o
 OBJS-$(CONFIG_MJPEG_MUXER)               += rawenc.o
@@ -167,7 +179,7 @@
 OBJS-$(CONFIG_MMF_DEMUXER)               += mmf.o pcm.o
 OBJS-$(CONFIG_MMF_MUXER)                 += mmf.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
 OBJS-$(CONFIG_MP2_MUXER)                 += mp3enc.o rawenc.o id3v2enc.o
 OBJS-$(CONFIG_MP3_DEMUXER)               += mp3dec.o
@@ -203,11 +215,13 @@
                                             oggparsedirac.o  \
                                             oggparseflac.o   \
                                             oggparseogm.o    \
+                                            oggparseopus.o   \
                                             oggparseskeleton.o \
                                             oggparsespeex.o  \
                                             oggparsetheora.o \
                                             oggparsevorbis.o \
-                                            vorbiscomment.o
+                                            vorbiscomment.o  \
+                                            flac_picture.o
 OBJS-$(CONFIG_OGG_MUXER)                 += oggenc.o \
                                             vorbiscomment.o
 OBJS-$(CONFIG_OMA_DEMUXER)               += omadec.o pcm.o oma.o
@@ -326,12 +340,13 @@
 OBJS-$(CONFIG_WC3_DEMUXER)               += wc3movie.o
 OBJS-$(CONFIG_WEBM_MUXER)                += matroskaenc.o matroska.o \
                                             isom.o avc.o \
-                                            flacenc_header.o avlanguage.o
+                                            flacenc_header.o avlanguage.o wv.o
 OBJS-$(CONFIG_WSAUD_DEMUXER)             += westwood_aud.o
 OBJS-$(CONFIG_WSVQA_DEMUXER)             += westwood_vqa.o
 OBJS-$(CONFIG_WTV_DEMUXER)               += wtv.o asfdec.o asf.o asfcrypt.o \
                                             avlanguage.o mpegts.o isom.o
-OBJS-$(CONFIG_WV_DEMUXER)                += wv.o apetag.o img2.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
 OBJS-$(CONFIG_XMV_DEMUXER)               += xmv.o
 OBJS-$(CONFIG_XWMA_DEMUXER)              += xwma.o
@@ -366,22 +381,24 @@
 OBJS-$(CONFIG_RTMPTS_PROTOCOL)           += rtmpproto.o rtmppkt.o
 OBJS-$(CONFIG_RTP_PROTOCOL)              += rtpproto.o
 OBJS-$(CONFIG_SCTP_PROTOCOL)             += sctp.o
+OBJS-$(CONFIG_SRTP_PROTOCOL)             += srtpproto.o srtp.o
 OBJS-$(CONFIG_TCP_PROTOCOL)              += tcp.o
 OBJS-$(CONFIG_TLS_PROTOCOL)              += tls.o
 OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
+OBJS-$(CONFIG_UNIX_PROTOCOL)             += unix.o
+
+OBJS-$(HAVE_LIBC_MSVCRT)                 += file_open.o
 
 SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h
 SKIPHEADERS-$(CONFIG_NETWORK)            += network.h rtsp.h
 
-EXAMPLES  = metadata                                                    \
-            output                                                      \
-
 TESTPROGS = seek                                                        \
+            srtp                                                        \
             url                                                         \
 
+TESTPROGS-$(CONFIG_NETWORK)              += noproxy
+
 TOOLS     = aviocat                                                     \
             ismindex                                                    \
             pktdumper                                                   \
             probetest                                                   \
-
-$(SUBDIR)output-example$(EXESUF): ELIBS = $(patsubst %,$(LD_LIB),swscale)

libav-v9.6.tar.bz2/libavformat/aacdec.c -> libav-v10.1.tar.bz2/libavformat/aacdec.c Changed

libav-v9.6.tar.bz2/libavformat/ac3dec.c -> libav-v10.1.tar.bz2/libavformat/ac3dec.c Changed

libav-v9.6.tar.bz2/libavformat/adtsenc.c -> libav-v10.1.tar.bz2/libavformat/adtsenc.c Changed

libav-v9.6.tar.bz2/libavformat/aiffenc.c -> libav-v10.1.tar.bz2/libavformat/aiffenc.c Changed

libav-v9.6.tar.bz2/libavformat/allformats.c -> libav-v10.1.tar.bz2/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)
@@ -100,6 +99,7 @@
     REGISTER_DEMUXER (EA,               ea);
     REGISTER_DEMUXER (EA_CDATA,         ea_cdata);
     REGISTER_MUXDEMUX(EAC3,             eac3);
+    REGISTER_MUXER   (F4V,              f4v);
     REGISTER_MUXDEMUX(FFM,              ffm);
     REGISTER_MUXDEMUX(FFMETADATA,       ffmetadata);
     REGISTER_MUXDEMUX(FILMSTRIP,        filmstrip);
@@ -117,7 +117,10 @@
     REGISTER_MUXDEMUX(H261,             h261);
     REGISTER_MUXDEMUX(H263,             h263);
     REGISTER_MUXDEMUX(H264,             h264);
+    REGISTER_MUXER   (HDS,              hds);
+    REGISTER_MUXDEMUX(HEVC,             hevc);
     REGISTER_MUXDEMUX(HLS,              hls);
+    REGISTER_DEMUXER (HNM,              hnm);
     REGISTER_DEMUXER (IDCIN,            idcin);
     REGISTER_DEMUXER (IFF,              iff);
     REGISTER_MUXDEMUX(ILBC,             ilbc);
@@ -209,8 +212,8 @@
     REGISTER_MUXDEMUX(SAP,              sap);
     REGISTER_DEMUXER (SDP,              sdp);
 #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);
@@ -247,7 +250,7 @@
     REGISTER_DEMUXER (WSAUD,            wsaud);
     REGISTER_DEMUXER (WSVQA,            wsvqa);
     REGISTER_DEMUXER (WTV,              wtv);
-    REGISTER_DEMUXER (WV,               wv);
+    REGISTER_MUXDEMUX(WV,               wv);
     REGISTER_DEMUXER (XA,               xa);
     REGISTER_DEMUXER (XMV,              xmv);
     REGISTER_DEMUXER (XWMA,             xwma);
@@ -255,9 +258,6 @@
     REGISTER_MUXDEMUX(YUV4MPEGPIPE,     yuv4mpegpipe);
 
     /* protocols */
-#if FF_API_APPLEHTTP_PROTO
-    REGISTER_PROTOCOL(APPLEHTTP,        applehttp);
-#endif
     REGISTER_PROTOCOL(CONCAT,           concat);
     REGISTER_PROTOCOL(CRYPTO,           crypto);
     REGISTER_PROTOCOL(FFRTMPCRYPT,      ffrtmpcrypt);
@@ -280,9 +280,11 @@
     REGISTER_PROTOCOL(RTMPTS,           rtmpts);
     REGISTER_PROTOCOL(RTP,              rtp);
     REGISTER_PROTOCOL(SCTP,             sctp);
+    REGISTER_PROTOCOL(SRTP,             srtp);
     REGISTER_PROTOCOL(TCP,              tcp);
     REGISTER_PROTOCOL(TLS,              tls);
     REGISTER_PROTOCOL(UDP,              udp);
+    REGISTER_PROTOCOL(UNIX,             unix);
 
     /* external libraries */
     REGISTER_PROTOCOL(LIBRTMP,          librtmp);

libav-v9.6.tar.bz2/libavformat/amr.c -> libav-v10.1.tar.bz2/libavformat/amr.c Changed

libav-v9.6.tar.bz2/libavformat/anm.c -> libav-v10.1.tar.bz2/libavformat/anm.c Changed

@@ -85,7 +85,7 @@
 
 avio_skip(pb, 4); /* magic number */
 if (avio_rl16(pb) != MAX_PAGES) {
- av_log_ask_for_sample(s, "max_pages != " AV_STRINGIFY(MAX_PAGES) "\n");
+ avpriv_request_sample(s, "max_pages != " AV_STRINGIFY(MAX_PAGES));
 return AVERROR_PATCHWELCOME;
 }
 
@@ -135,17 +135,16 @@
 st->codec->extradata_size = 16*8 + 4*256;
 st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
 if (!st->codec->extradata) {
- ret = AVERROR(ENOMEM);
- goto fail;
+ return AVERROR(ENOMEM);
 }
 ret = avio_read(pb, st->codec->extradata, st->codec->extradata_size);
 if (ret < 0)
- goto fail;
+ return ret;
 
 /* read page table */
 ret = avio_seek(pb, anm->page_table_offset, SEEK_SET);
 if (ret < 0)
- goto fail;
+ return ret;
 
 for (i = 0; i < MAX_PAGES; i++) {
 Page *p = &anm->pt[i];
@@ -157,19 +156,15 @@
 /* find page of first frame */
 anm->page = find_record(anm, 0);
 if (anm->page < 0) {
- ret = anm->page;
- goto fail;
+ return anm->page;
 }
 
 anm->record = -1;
 return 0;
 
 invalid:
- av_log_ask_for_sample(s, NULL);
- ret = AVERROR_PATCHWELCOME;
-
-fail:
- return ret;
+ avpriv_request_sample(s, "Invalid header element");
+ return AVERROR_PATCHWELCOME;
 }
 
 static int read_packet(AVFormatContext *s,

libav-v9.6.tar.bz2/libavformat/ape.c -> libav-v10.1.tar.bz2/libavformat/ape.c Changed

@@ -28,7 +28,7 @@
 #include "apetag.h"
 
 /* The earliest and latest file formats supported by this library */
-#define APE_MIN_VERSION 3950
+#define APE_MIN_VERSION 3800
 #define APE_MAX_VERSION 3990
 
 #define MAC_FORMAT_FLAG_8_BIT 1 // is 8-bit [OBSOLETE]
@@ -83,6 +83,7 @@
 
 /* Seektable */
 uint32_t *seektable;
+ uint8_t *bittable;
 } APEContext;
 
 static int ape_probe(AVProbeData * p)
@@ -130,9 +131,13 @@
 } else {
 for (i = 0; i < ape_ctx->seektablelength / sizeof(uint32_t); i++) {
 if (i < ape_ctx->totalframes - 1) {
- av_log(s, AV_LOG_DEBUG, "%8d %"PRIu32" (%"PRIu32" bytes)\n",
+ av_log(s, AV_LOG_DEBUG, "%8d %"PRIu32" (%"PRIu32" bytes)",
 i, ape_ctx->seektable[i],
 ape_ctx->seektable[i + 1] - ape_ctx->seektable[i]);
+ if (ape_ctx->bittable)
+ av_log(s, AV_LOG_DEBUG, " + %2d bits\n",
+ ape_ctx->bittable[i]);
+ av_log(s, AV_LOG_DEBUG, "\n");
 } else {
 av_log(s, AV_LOG_DEBUG, "%8d %"PRIu32"\n", i, ape_ctx->seektable[i]);
 }
@@ -255,7 +260,7 @@
 ape->totalframes);
 return -1;
 }
- if (ape->seektablelength && (ape->seektablelength / sizeof(*ape->seektable)) < ape->totalframes) {
+ if (ape->seektablelength / sizeof(*ape->seektable) < ape->totalframes) {
 av_log(s, AV_LOG_ERROR,
 "Number of seek entries is less than number of frames: %zu vs. %"PRIu32"\n",
 ape->seektablelength / sizeof(*ape->seektable), ape->totalframes);
@@ -265,6 +270,8 @@
 if(!ape->frames)
 return AVERROR(ENOMEM);
 ape->firstframe = ape->junklength + ape->descriptorlength + ape->headerlength + ape->seektablelength + ape->wavheaderlength;
+ if (ape->fileversion < 3810)
+ ape->firstframe += ape->totalframes;
 ape->currentframe = 0;
 
 
@@ -276,8 +283,15 @@
 ape->seektable = av_malloc(ape->seektablelength);
 if (!ape->seektable)
 return AVERROR(ENOMEM);
- for (i = 0; i < ape->seektablelength / sizeof(uint32_t); i++)
+ 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);
+ if (!ape->bittable)
+ return AVERROR(ENOMEM);
+ for (i = 0; i < ape->totalframes && !pb->eof_reached; i++)
+ ape->bittable[i] = avio_r8(pb);
+ }
 }
 
 ape->frames[0].pos = ape->firstframe;
@@ -308,7 +322,14 @@
 }
 ape->frames[i].size = (ape->frames[i].size + 3) & ~3;
 }
-
+ if (ape->fileversion < 3810) {
+ for (i = 0; i < ape->totalframes; i++) {
+ if (i < ape->totalframes - 1 && ape->bittable[i + 1])
+ ape->frames[i].size += 4;
+ ape->frames[i].skip <<= 3;
+ ape->frames[i].skip += ape->bittable[i];
+ }
+ }
 
 ape_dumpinfo(s, ape);
 
@@ -411,6 +432,7 @@
 
 av_freep(&ape->frames);
 av_freep(&ape->seektable);
+ av_freep(&ape->bittable);
 return 0;
 }

libav-v9.6.tar.bz2/libavformat/apetag.c -> libav-v10.1.tar.bz2/libavformat/apetag.c Changed

@@ -23,12 +23,14 @@
 #include "libavutil/intreadwrite.h"
 #include "libavutil/dict.h"
 #include "avformat.h"
+#include "avio_internal.h"
 #include "apetag.h"
 #include "internal.h"
 
 #define APE_TAG_VERSION 2000
 #define APE_TAG_FOOTER_BYTES 32
 #define APE_TAG_FLAG_CONTAINS_HEADER (1 << 31)
+#define APE_TAG_FLAG_CONTAINS_FOOTER (1 << 30)
 #define APE_TAG_FLAG_IS_HEADER (1 << 29)
 #define APE_TAG_FLAG_IS_BINARY (1 << 1)
 
@@ -116,7 +118,7 @@
 int64_t ff_ape_parse_tag(AVFormatContext *s)
 {
 AVIOContext *pb = s->pb;
- int file_size = avio_size(pb);
+ int64_t file_size = avio_size(pb);
 uint32_t val, fields, tag_bytes;
 uint8_t buf[8];
 int64_t tag_start;
@@ -169,3 +171,57 @@
 
 return tag_start;
 }
+
+int ff_ape_write_tag(AVFormatContext *s)
+{
+ AVDictionaryEntry *e = NULL;
+ int64_t start, end;
+ int size, count = 0;
+
+ if (!s->pb->seekable)
+ return 0;
+
+ start = avio_tell(s->pb);
+
+ // header
+ avio_write(s->pb, "APETAGEX", 8); // id
+ avio_wl32 (s->pb, APE_TAG_VERSION); // version
+ avio_wl32(s->pb, 0); // reserve space for size
+ avio_wl32(s->pb, 0); // reserve space for tag count
+
+ // flags
+ avio_wl32(s->pb, APE_TAG_FLAG_CONTAINS_HEADER | APE_TAG_FLAG_CONTAINS_FOOTER |
+ APE_TAG_FLAG_IS_HEADER);
+ ffio_fill(s->pb, 0, 8); // reserved
+
+ while ((e = av_dict_get(s->metadata, "", e, AV_DICT_IGNORE_SUFFIX))) {
+ int val_len = strlen(e->value);
+
+ avio_wl32(s->pb, val_len); // value length
+ avio_wl32(s->pb, 0); // item flags
+ avio_put_str(s->pb, e->key); // key
+ avio_write(s->pb, e->value, val_len); // value
+ count++;
+ }
+
+ size = avio_tell(s->pb) - start;
+
+ // footer
+ avio_write(s->pb, "APETAGEX", 8); // id
+ avio_wl32 (s->pb, APE_TAG_VERSION); // version
+ avio_wl32(s->pb, size); // size
+ avio_wl32(s->pb, count); // tag count
+
+ // flags
+ avio_wl32(s->pb, APE_TAG_FLAG_CONTAINS_HEADER | APE_TAG_FLAG_CONTAINS_FOOTER);
+ ffio_fill(s->pb, 0, 8); // reserved
+
+ // update values in the header
+ end = avio_tell(s->pb);
+ avio_seek(s->pb, start + 12, SEEK_SET);
+ avio_wl32(s->pb, size);
+ avio_wl32(s->pb, count);
+ avio_seek(s->pb, end, SEEK_SET);
+
+ return 0;
+}

libav-v9.6.tar.bz2/libavformat/apetag.h -> libav-v10.1.tar.bz2/libavformat/apetag.h Changed

libav-v9.6.tar.bz2/libavformat/asf.c -> libav-v10.1.tar.bz2/libavformat/asf.c Changed

@@ -20,7 +20,6 @@
 
 #include "asf.h"
 
-
 const ff_asf_guid ff_asf_header = {
 0x30, 0x26, 0xB2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C
 };
@@ -48,7 +47,7 @@
 };
 
 const ff_asf_guid ff_asf_audio_conceal_spread = {
- 0x50, 0xCD, 0xC3, 0xBF, 0x8F, 0x61, 0xCF, 0x11, 0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20
+ 0x50, 0xCD, 0xC3, 0xBF, 0x8F, 0x61, 0xCF, 0x11, 0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20
 };
 
 const ff_asf_guid ff_asf_video_stream = {
@@ -91,31 +90,39 @@
 };
 
 const ff_asf_guid ff_asf_extended_content_header = {
- 0x40, 0xA4, 0xD0, 0xD2, 0x07, 0xE3, 0xD2, 0x11, 0x97, 0xF0, 0x00, 0xA0, 0xC9, 0x5E, 0xA8, 0x50
+ 0x40, 0xA4, 0xD0, 0xD2, 0x07, 0xE3, 0xD2, 0x11, 0x97, 0xF0, 0x00, 0xA0, 0xC9, 0x5E, 0xA8, 0x50
 };
 
 const ff_asf_guid ff_asf_simple_index_header = {
- 0x90, 0x08, 0x00, 0x33, 0xB1, 0xE5, 0xCF, 0x11, 0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB
+ 0x90, 0x08, 0x00, 0x33, 0xB1, 0xE5, 0xCF, 0x11, 0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB
 };
 
 const ff_asf_guid ff_asf_ext_stream_embed_stream_header = {
- 0xe2, 0x65, 0xfb, 0x3a, 0xEF, 0x47, 0xF2, 0x40, 0xac, 0x2c, 0x70, 0xa9, 0x0d, 0x71, 0xd3, 0x43
+ 0xe2, 0x65, 0xfb, 0x3a, 0xEF, 0x47, 0xF2, 0x40, 0xac, 0x2c, 0x70, 0xa9, 0x0d, 0x71, 0xd3, 0x43
 };
 
 const ff_asf_guid ff_asf_ext_stream_audio_stream = {
- 0x9d, 0x8c, 0x17, 0x31, 0xE1, 0x03, 0x28, 0x45, 0xb5, 0x82, 0x3d, 0xf9, 0xdb, 0x22, 0xf5, 0x03
+ 0x9d, 0x8c, 0x17, 0x31, 0xE1, 0x03, 0x28, 0x45, 0xb5, 0x82, 0x3d, 0xf9, 0xdb, 0x22, 0xf5, 0x03
 };
 
 const ff_asf_guid ff_asf_metadata_header = {
- 0xea, 0xcb, 0xf8, 0xc5, 0xaf, 0x5b, 0x77, 0x48, 0x84, 0x67, 0xaa, 0x8c, 0x44, 0xfa, 0x4c, 0xca
+ 0xea, 0xcb, 0xf8, 0xc5, 0xaf, 0x5b, 0x77, 0x48, 0x84, 0x67, 0xaa, 0x8c, 0x44, 0xfa, 0x4c, 0xca
+};
+
+const ff_asf_guid ff_asf_metadata_library_header = {
+ 0x94, 0x1c, 0x23, 0x44, 0x98, 0x94, 0xd1, 0x49, 0xa1, 0x41, 0x1d, 0x13, 0x4e, 0x45, 0x70, 0x54
 };
 
 const ff_asf_guid ff_asf_marker_header = {
- 0x01, 0xCD, 0x87, 0xF4, 0x51, 0xA9, 0xCF, 0x11, 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65
+ 0x01, 0xCD, 0x87, 0xF4, 0x51, 0xA9, 0xCF, 0x11, 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65
+};
+
+const ff_asf_guid ff_asf_reserved_4 = {
+ 0x20, 0xdb, 0xfe, 0x4c, 0xf6, 0x75, 0xCF, 0x11, 0x9c, 0x0f, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xcb
 };
 
 /* I am not a number !!! This GUID is the one found on the PC used to
- generate the stream */
+ * generate the stream */
 const ff_asf_guid ff_asf_my_guid = {
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
@@ -138,23 +145,23 @@
 
 /* List of official tags at http://msdn.microsoft.com/en-us/library/dd743066(VS.85).aspx */
 const AVMetadataConv ff_asf_metadata_conv[] = {
- { "WM/AlbumArtist" , "album_artist"},
- { "WM/AlbumTitle" , "album" },
- { "Author" , "artist" },
- { "Description" , "comment" },
- { "WM/Composer" , "composer" },
- { "WM/EncodedBy" , "encoded_by" },
- { "WM/EncodingSettings", "encoder" },
- { "WM/Genre" , "genre" },
- { "WM/Language" , "language" },
- { "WM/OriginalFilename", "filename" },
- { "WM/PartOfSet" , "disc" },
- { "WM/Publisher" , "publisher" },
- { "WM/Tool" , "encoder" },
- { "WM/TrackNumber" , "track" },
- { "WM/Track" , "track" },
+ { "WM/AlbumArtist", "album_artist" },
+ { "WM/AlbumTitle", "album" },
+ { "Author", "artist" },
+ { "Description", "comment" },
+ { "WM/Composer", "composer" },
+ { "WM/EncodedBy", "encoded_by" },
+ { "WM/EncodingSettings", "encoder" },
+ { "WM/Genre", "genre" },
+ { "WM/Language", "language" },
+ { "WM/OriginalFilename", "filename" },
+ { "WM/PartOfSet", "disc" },
+ { "WM/Publisher", "publisher" },
+ { "WM/Tool", "encoder" },
+ { "WM/TrackNumber", "track" },
+ { "WM/Track", "track" },
 { "WM/MediaStationCallSign", "service_provider" },
- { "WM/MediaStationName", "service_name" },
+ { "WM/MediaStationName", "service_name" },
 // { "Year" , "date" }, TODO: conversion year<->date
 { 0 }
 };

libav-v9.6.tar.bz2/libavformat/asf.h -> libav-v10.1.tar.bz2/libavformat/asf.h Changed

@@ -24,6 +24,7 @@
 #include <stdint.h>
 #include "avformat.h"
 #include "metadata.h"
+#include "riff.h"
 
 #define PACKET_SIZE 3200
 
@@ -48,8 +49,6 @@
 uint32_t palette[256];
 } ASFStream;
 
-typedef uint8_t ff_asf_guid[16];
-
 typedef struct ASFMainHeader {
 ff_asf_guid guid; ///< generated by client computer
 uint64_t file_size; /**< in bytes
@@ -79,6 +78,8 @@
 typedef struct ASFIndex {
 uint32_t packet_number;
 uint16_t packet_count;
+ uint64_t send_time;
+ uint64_t offset;
 } ASFIndex;
 
 extern const ff_asf_guid ff_asf_header;
@@ -103,7 +104,9 @@
 extern const ff_asf_guid ff_asf_ext_stream_embed_stream_header;
 extern const ff_asf_guid ff_asf_ext_stream_audio_stream;
 extern const ff_asf_guid ff_asf_metadata_header;
+extern const ff_asf_guid ff_asf_metadata_library_header;
 extern const ff_asf_guid ff_asf_marker_header;
+extern const ff_asf_guid ff_asf_reserved_4;
 extern const ff_asf_guid ff_asf_my_guid;
 extern const ff_asf_guid ff_asf_language_guid;
 extern const ff_asf_guid ff_asf_content_encryption;
@@ -175,11 +178,4 @@
 
 extern AVInputFormat ff_asf_demuxer;
 
-static av_always_inline int ff_guidcmp(const void *g1, const void *g2)
-{
- return memcmp(g1, g2, sizeof(ff_asf_guid));
-}
-
-void ff_get_guid(AVIOContext *s, ff_asf_guid *g);
-
 #endif /* AVFORMAT_ASF_H */

libav-v9.6.tar.bz2/libavformat/asfcrypt.c -> libav-v10.1.tar.bz2/libavformat/asfcrypt.c Changed

@@ -20,10 +20,10 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include "libavutil/common.h"
-#include "libavutil/intreadwrite.h"
 #include "libavutil/bswap.h"
+#include "libavutil/common.h"
 #include "libavutil/des.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/rc4.h"
 #include "asfcrypt.h"
 
@@ -32,7 +32,8 @@
 * @param v number to invert, must be odd!
 * @return number so that result * v = 1 (mod 2^32)
 */
-static uint32_t inverse(uint32_t v) {
+static uint32_t inverse(uint32_t v)
+{
 // v ^ 3 gives the inverse (mod 16), could also be implemented
 // as table etc. (only lowest 4 bits matter!)
 uint32_t inverse = v * v * v;
@@ -50,7 +51,8 @@
 * @param keys output key array containing the keys for encryption in
 * native endianness
 */
-static void multiswap_init(const uint8_t keybuf[48], uint32_t keys[12]) {
+static void multiswap_init(const uint8_t keybuf[48], uint32_t keys[12])
+{
 int i;
 for (i = 0; i < 12; i++)
 keys[i] = AV_RL32(keybuf + (i << 2)) | 1;
@@ -61,7 +63,8 @@
 * the other way round.
 * @param keys key array of ints to invert
 */
-static void multiswap_invert_keys(uint32_t keys[12]) {
+static void multiswap_invert_keys(uint32_t keys[12])
+{
 int i;
 for (i = 0; i < 5; i++)
 keys[i] = inverse(keys[i]);
@@ -69,23 +72,25 @@
 keys[i] = inverse(keys[i]);
 }
 
-static uint32_t multiswap_step(const uint32_t keys[12], uint32_t v) {
+static uint32_t multiswap_step(const uint32_t keys[12], uint32_t v)
+{
 int i;
 v *= keys[0];
 for (i = 1; i < 5; i++) {
- v = (v >> 16) | (v << 16);
+ v = (v >> 16) | (v << 16);
 v *= keys[i];
 }
 v += keys[5];
 return v;
 }
 
-static uint32_t multiswap_inv_step(const uint32_t keys[12], uint32_t v) {
+static uint32_t multiswap_inv_step(const uint32_t keys[12], uint32_t v)
+{
 int i;
 v -= keys[5];
 for (i = 4; i > 0; i--) {
 v *= keys[i];
- v = (v >> 16) | (v << 16);
+ v = (v >> 16) | (v << 16);
 }
 v *= keys[0];
 return v;
@@ -99,17 +104,19 @@
 * @param data data to encrypt
 * @return encrypted data
 */
-static uint64_t multiswap_enc(const uint32_t keys[12], uint64_t key, uint64_t data) {
+static uint64_t multiswap_enc(const uint32_t keys[12],
+ uint64_t key, uint64_t data)
+{
 uint32_t a = data;
 uint32_t b = data >> 32;
 uint32_t c;
 uint32_t tmp;
- a += key;
- tmp = multiswap_step(keys , a);
- b += tmp;
- c = (key >> 32) + tmp;
+ a += key;
+ tmp = multiswap_step(keys, a);
+ b += tmp;
+ c = (key >> 32) + tmp;
 tmp = multiswap_step(keys + 6, b);
- c += tmp;
+ c += tmp;
 return ((uint64_t)c << 32) | tmp;
 }
 
@@ -121,25 +128,28 @@
 * @param data data to decrypt
 * @return decrypted data
 */
-static uint64_t multiswap_dec(const uint32_t keys[12], uint64_t key, uint64_t data) {
+static uint64_t multiswap_dec(const uint32_t keys[12],
+ uint64_t key, uint64_t data)
+{
 uint32_t a;
 uint32_t b;
- uint32_t c = data >> 32;
+ uint32_t c = data >> 32;
 uint32_t tmp = data;
- c -= tmp;
- b = multiswap_inv_step(keys + 6, tmp);
+ c -= tmp;
+ b = multiswap_inv_step(keys + 6, tmp);
 tmp = c - (key >> 32);
- b -= tmp;
- a = multiswap_inv_step(keys , tmp);
- a -= key;
+ b -= tmp;
+ a = multiswap_inv_step(keys, tmp);
+ a -= key;
 return ((uint64_t)b << 32) | a;
 }
 
-void ff_asfcrypt_dec(const uint8_t key[20], uint8_t *data, int len) {
+void ff_asfcrypt_dec(const uint8_t key[20], uint8_t *data, int len)
+{
 struct AVDES des;
 struct AVRC4 rc4;
- int num_qwords = len >> 3;
- uint8_t *qwords = data;
+ int num_qwords = len >> 3;
+ uint8_t *qwords = data;
 uint64_t rc4buff[8] = { 0 };
 uint64_t packetkey;
 uint32_t ms_keys[12];
@@ -155,7 +165,7 @@
 av_rc4_crypt(&rc4, (uint8_t *)rc4buff, NULL, sizeof(rc4buff), NULL, 1);
 multiswap_init((uint8_t *)rc4buff, ms_keys);
 
- packetkey = AV_RN64(&qwords[num_qwords*8 - 8]);
+ packetkey = AV_RN64(&qwords[num_qwords * 8 - 8]);
 packetkey ^= rc4buff[7];
 av_des_init(&des, key + 12, 64, 1);
 av_des_crypt(&des, (uint8_t *)&packetkey, (uint8_t *)&packetkey, 1, NULL, 1);

libav-v9.6.tar.bz2/libavformat/asfdec.c -> libav-v10.1.tar.bz2/libavformat/asfdec.c Changed

@@ -19,23 +19,23 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-//#define DEBUG
-
 #include "libavutil/attributes.h"
+#include "libavutil/avassert.h"
+#include "libavutil/avstring.h"
 #include "libavutil/bswap.h"
 #include "libavutil/common.h"
-#include "libavutil/avstring.h"
 #include "libavutil/dict.h"
+#include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 #include "avformat.h"
-#include "internal.h"
 #include "avio_internal.h"
+#include "avlanguage.h"
 #include "id3v2.h"
+#include "internal.h"
 #include "riff.h"
 #include "asf.h"
 #include "asfcrypt.h"
-#include "avlanguage.h"
 
 typedef struct {
 const AVClass *class;
@@ -75,13 +75,13 @@
 
 int stream_index;
 
- ASFStream* asf_st; ///< currently decoded stream
+ ASFStream *asf_st; ///< currently decoded stream
 
 int no_resync_search;
 } ASFContext;
 
 static const AVOption options[] = {
- {"no_resync_search", "Don't try to resynchronize by looking for a certain optional start code", offsetof(ASFContext, no_resync_search), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM },
+ { "no_resync_search", "Don't try to resynchronize by looking for a certain optional start code", offsetof(ASFContext, no_resync_search), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, AV_OPT_FLAG_DECODING_PARAM },
 { NULL },
 };
 
@@ -108,11 +108,11 @@
 0xce, 0x75, 0xf8, 0x7b, 0x8d, 0x46, 0xd1, 0x11, 0x8d, 0x82, 0x00, 0x60, 0x97, 0xc9, 0xa2, 0xb2
 };
 
-#define PRINT_IF_GUID(g,cmp) \
-if (!ff_guidcmp(g, &cmp)) \
- av_dlog(NULL, "(GUID: %s) ", #cmp)
+#define PRINT_IF_GUID(g, cmp) \
+ if (!ff_guidcmp(g, &cmp)) \
+ av_dlog(NULL, "(GUID: %s) ", # cmp)
 
-static void print_guid(const ff_asf_guid *g)
+static void print_guid(ff_asf_guid *g)
 {
 int i;
 PRINT_IF_GUID(g, ff_asf_header);
@@ -136,12 +136,13 @@
 else PRINT_IF_GUID(g, ff_asf_ext_stream_embed_stream_header);
 else PRINT_IF_GUID(g, ff_asf_ext_stream_audio_stream);
 else PRINT_IF_GUID(g, ff_asf_metadata_header);
+ else PRINT_IF_GUID(g, ff_asf_metadata_library_header);
 else PRINT_IF_GUID(g, ff_asf_marker_header);
 else PRINT_IF_GUID(g, stream_bitrate_guid);
 else PRINT_IF_GUID(g, ff_asf_language_guid);
 else
 av_dlog(NULL, "(GUID: unknown) ");
- for(i=0;i<16;i++)
+ for (i = 0; i < 16; i++)
 av_dlog(NULL, " 0x%02x,", (*g)[i]);
 av_dlog(NULL, "}\n");
 }
@@ -150,12 +151,6 @@
 #define print_guid(g)
 #endif
 
-void ff_get_guid(AVIOContext *s, ff_asf_guid *g)
-{
- assert(sizeof(*g) == 16);
- avio_read(s, *g, sizeof(*g));
-}
-
 static int asf_probe(AVProbeData *pd)
 {
 /* check file header */
@@ -165,13 +160,21 @@
 return 0;
 }
 
-static int get_value(AVIOContext *pb, int type){
- switch(type){
- case 2: return avio_rl32(pb);
- case 3: return avio_rl32(pb);
- case 4: return avio_rl64(pb);
- case 5: return avio_rl16(pb);
- default:return INT_MIN;
+/* size of type 2 (BOOL) is 32bit for "Extended Content Description Object"
+ * but 16 bit for "Metadata Object" and "Metadata Library Object" */
+static int get_value(AVIOContext *pb, int type, int type2_size)
+{
+ switch (type) {
+ case 2:
+ return (type2_size == 32) ? avio_rl32(pb) : avio_rl16(pb);
+ case 3:
+ return avio_rl32(pb);
+ case 4:
+ return avio_rl64(pb);
+ case 5:
+ return avio_rl16(pb);
+ default:
+ return INT_MIN;
 }
 }
 
@@ -179,12 +182,11 @@
 * but in reality this is only loosely similar */
 static int asf_read_picture(AVFormatContext *s, int len)
 {
- AVPacket pkt = { 0 };
+ AVPacket pkt = { 0 };
 const CodecMime *mime = ff_id3v2_mime_tags;
- enum AVCodecID id = AV_CODEC_ID_NONE;
+ enum AVCodecID id = AV_CODEC_ID_NONE;
 char mimetype[64];
 uint8_t *desc = NULL;
- ASFStream *ast = NULL;
 AVStream *st = NULL;
 int ret, type, picsize, desc_len;
 
@@ -204,7 +206,7 @@
 
 /* picture data size */
 picsize = avio_rl32(s->pb);
- len -= 4;
+ len -= 4;
 
 /* picture MIME type */
 len -= avio_get_str16le(s->pb, len, mimetype, sizeof(mimetype));
@@ -238,21 +240,17 @@
 if (ret < 0)
 goto fail;
 
- st = avformat_new_stream(s, NULL);
- ast = av_mallocz(sizeof(*ast));
- if (!st || !ast) {
+ st = avformat_new_stream(s, NULL);
+ if (!st) {
 ret = AVERROR(ENOMEM);
 goto fail;
 }
- st->priv_data = ast;
-
- st->disposition |= AV_DISPOSITION_ATTACHED_PIC;
- st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = id;
-
- st->attached_pic = pkt;
+ st->disposition |= AV_DISPOSITION_ATTACHED_PIC;
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codec->codec_id = id;
+ st->attached_pic = pkt;
 st->attached_pic.stream_index = st->index;
- st->attached_pic.flags |= AV_PKT_FLAG_KEY;
+ st->attached_pic.flags |= AV_PKT_FLAG_KEY;
 
 if (*desc)
 av_dict_set(&st->metadata, "title", desc, AV_DICT_DONT_STRDUP_VAL);
@@ -264,38 +262,58 @@
 return 0;
 
 fail:
- av_freep(&ast);
 av_freep(&desc);
 av_free_packet(&pkt);
 return ret;
 }
 
-static void get_tag(AVFormatContext *s, const char *key, int type, int len)
+static void get_id3_tag(AVFormatContext *s, int len)
+{
+ ID3v2ExtraMeta *id3v2_extra_meta = NULL;
+
+ ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta);
+ if (id3v2_extra_meta)
+ ff_id3v2_parse_apic(s, &id3v2_extra_meta);
+ ff_id3v2_free_extra_meta(&id3v2_extra_meta);
+}
+
+static void get_tag(AVFormatContext *s, const char *key, int type, int len, int type2_size)
 {
 char *value;
 int64_t off = avio_tell(s->pb);
 
- if ((unsigned)len >= (UINT_MAX - 1)/2)
+ if ((unsigned)len >= (UINT_MAX - 1) / 2)
 return;
 
- value = av_malloc(2*len+1);
+ value = av_malloc(2 * len + 1);
 if (!value)
 goto finish;
 
 if (type == 0) { // UTF16-LE
- avio_get_str16le(s->pb, len, value, 2*len + 1);
+ avio_get_str16le(s->pb, len, value, 2 * len + 1);
+ } else if (type == 1) { // byte array
+ if (!strcmp(key, "WM/Picture")) { // handle cover art
+ asf_read_picture(s, len);
+ } else if (!strcmp(key, "ID3")) { // handle ID3 tag
+ get_id3_tag(s, len);
+ } else {
+ av_log(s, AV_LOG_VERBOSE, "Unsupported byte array in tag %s.\n", key);
+ }
+ goto finish;
 } else if (type > 1 && type <= 5) { // boolean or DWORD or QWORD or WORD
- uint64_t num = get_value(s->pb, type);
+ uint64_t num = get_value(s->pb, type, type2_size);
 snprintf(value, len, "%"PRIu64, num);
- } else if (type == 1 && !strcmp(key, "WM/Picture")) { // handle cover art
- asf_read_picture(s, len);
+ } else if (type == 6) { // (don't) handle GUID
+ av_log(s, AV_LOG_DEBUG, "Unsupported GUID value in tag %s.\n", key);
 goto finish;
 } else {
- av_log(s, AV_LOG_DEBUG, "Unsupported value type %d in tag %s.\n", type, key);
+ av_log(s, AV_LOG_DEBUG,
+ "Unsupported value type %d in tag %s.\n", type, key);
 goto finish;
 }
 if (*value)
 av_dict_set(&s->metadata, key, value, 0);
+
 finish:
 av_freep(&value);
 avio_seek(s->pb, off + len, SEEK_SET);
@@ -307,20 +325,20 @@
 AVIOContext *pb = s->pb;
 
 ff_get_guid(pb, &asf->hdr.guid);
- asf->hdr.file_size = avio_rl64(pb);
- asf->hdr.create_time = avio_rl64(pb);
+ asf->hdr.file_size = avio_rl64(pb);
+ asf->hdr.create_time = avio_rl64(pb);
 avio_rl64(pb); /* number of packets */
- asf->hdr.play_time = avio_rl64(pb);
- asf->hdr.send_time = avio_rl64(pb);
- asf->hdr.preroll = avio_rl32(pb);
- asf->hdr.ignore = avio_rl32(pb);
- asf->hdr.flags = avio_rl32(pb);
- asf->hdr.min_pktsize = avio_rl32(pb);
- asf->hdr.max_pktsize = avio_rl32(pb);
- if (asf->hdr.min_pktsize >= (1U<<29))
+ asf->hdr.play_time = avio_rl64(pb);
+ asf->hdr.send_time = avio_rl64(pb);
+ asf->hdr.preroll = avio_rl32(pb);
+ asf->hdr.ignore = avio_rl32(pb);
+ asf->hdr.flags = avio_rl32(pb);
+ asf->hdr.min_pktsize = avio_rl32(pb);
+ asf->hdr.max_pktsize = avio_rl32(pb);
+ if (asf->hdr.min_pktsize >= (1U << 29))
 return AVERROR_INVALIDDATA;
- asf->hdr.max_bitrate = avio_rl32(pb);
- s->packet_size = asf->hdr.max_pktsize;
+ asf->hdr.max_bitrate = avio_rl32(pb);
+ s->packet_size = asf->hdr.max_pktsize;
 
 return 0;
 }
@@ -336,7 +354,7 @@
 int type_specific_size, sizeX;
 unsigned int tag1;
 int64_t pos1, pos2, start_time;
- int test_for_ext_stream_audio, is_dvr_ms_audio=0;
+ int test_for_ext_stream_audio, is_dvr_ms_audio = 0;
 
 if (s->nb_streams == ASF_MAX_STREAMS) {
 av_log(s, AV_LOG_ERROR, "too many streams\n");
@@ -352,15 +370,15 @@
 asf_st = av_mallocz(sizeof(ASFStream));
 if (!asf_st)
 return AVERROR(ENOMEM);
- st->priv_data = asf_st;
+ st->priv_data = asf_st;
 st->start_time = 0;
- start_time = asf->hdr.preroll;
+ start_time = asf->hdr.preroll;
 
 asf_st->stream_language_index = 128; // invalid stream index means no language info
 
- if(!(asf->hdr.flags & 0x01)) { // if we aren't streaming...
+ if (!(asf->hdr.flags & 0x01)) { // if we aren't streaming...
 st->duration = asf->hdr.play_time /
- (10000000 / 1000) - start_time;
+ (10000000 / 1000) - start_time;
 }
 ff_get_guid(pb, &g);
 
@@ -370,13 +388,13 @@
 } else if (!ff_guidcmp(&g, &ff_asf_video_stream)) {
 type = AVMEDIA_TYPE_VIDEO;
 } else if (!ff_guidcmp(&g, &ff_asf_jfif_media)) {
- type = AVMEDIA_TYPE_VIDEO;
+ type = AVMEDIA_TYPE_VIDEO;
 st->codec->codec_id = AV_CODEC_ID_MJPEG;
 } else if (!ff_guidcmp(&g, &ff_asf_command_stream)) {
 type = AVMEDIA_TYPE_DATA;
 } else if (!ff_guidcmp(&g, &ff_asf_ext_stream_embed_stream_header)) {
 test_for_ext_stream_audio = 1;
- type = AVMEDIA_TYPE_UNKNOWN;
+ type = AVMEDIA_TYPE_UNKNOWN;
 } else {
 return -1;
 }
@@ -393,8 +411,8 @@
 if (test_for_ext_stream_audio) {
 ff_get_guid(pb, &g);
 if (!ff_guidcmp(&g, &ff_asf_ext_stream_audio_stream)) {
- type = AVMEDIA_TYPE_AUDIO;
- is_dvr_ms_audio=1;
+ type = AVMEDIA_TYPE_AUDIO;
+ is_dvr_ms_audio = 1;
 ff_get_guid(pb, &g);
 avio_rl32(pb);
 avio_rl32(pb);
@@ -412,46 +430,46 @@
 if (is_dvr_ms_audio) {
 // codec_id and codec_tag are unreliable in dvr_ms
 // files. Set them later by probing stream.
- st->codec->codec_id = AV_CODEC_ID_PROBE;
+ st->codec->codec_id = AV_CODEC_ID_PROBE;
 st->codec->codec_tag = 0;
 }
- if (st->codec->codec_id == AV_CODEC_ID_AAC) {
+ if (st->codec->codec_id == AV_CODEC_ID_AAC)
 st->need_parsing = AVSTREAM_PARSE_NONE;
- } else {
+ else
 st->need_parsing = AVSTREAM_PARSE_FULL;
- }
 /* We have to init the frame size at some point .... */
 pos2 = avio_tell(pb);
 if (size >= (pos2 + 8 - pos1 + 24)) {
- asf_st->ds_span = avio_r8(pb);
+ asf_st->ds_span = avio_r8(pb);
 asf_st->ds_packet_size = avio_rl16(pb);
- asf_st->ds_chunk_size = avio_rl16(pb);
- avio_rl16(pb); //ds_data_size
- avio_r8(pb); //ds_silence_data
+ asf_st->ds_chunk_size = avio_rl16(pb);
+ avio_rl16(pb); // ds_data_size
+ avio_r8(pb); // ds_silence_data
 }
 if (asf_st->ds_span > 1) {
- if (!asf_st->ds_chunk_size
- || (asf_st->ds_packet_size/asf_st->ds_chunk_size <= 1)
- || asf_st->ds_packet_size % asf_st->ds_chunk_size)
- asf_st->ds_span = 0; // disable descrambling
+ if (!asf_st->ds_chunk_size ||
+ (asf_st->ds_packet_size / asf_st->ds_chunk_size <= 1) ||
+ asf_st->ds_packet_size % asf_st->ds_chunk_size)
+ asf_st->ds_span = 0; // disable descrambling
 }
 } else if (type == AVMEDIA_TYPE_VIDEO &&
- size - (avio_tell(pb) - pos1 + 24) >= 51) {
+ size - (avio_tell(pb) - pos1 + 24) >= 51) {
 avio_rl32(pb);
 avio_rl32(pb);
 avio_r8(pb);
 avio_rl16(pb); /* size */
- sizeX= avio_rl32(pb); /* size */
- st->codec->width = avio_rl32(pb);
+ sizeX = avio_rl32(pb); /* size */
+ st->codec->width = avio_rl32(pb);
 st->codec->height = avio_rl32(pb);
 /* not available for asf */
 avio_rl16(pb); /* panes */
 st->codec->bits_per_coded_sample = avio_rl16(pb); /* depth */
- tag1 = avio_rl32(pb);
+ tag1 = avio_rl32(pb);
 avio_skip(pb, 20);
 if (sizeX > 40) {
 st->codec->extradata_size = sizeX - 40;
- st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+ st->codec->extradata = av_mallocz(st->codec->extradata_size +
+ FF_INPUT_BUFFER_PADDING_SIZE);
 avio_read(pb, st->codec->extradata, st->codec->extradata_size);
 }
 
@@ -461,8 +479,8 @@
 if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) {
 #if HAVE_BIGENDIAN
 int i;
- for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++)
- asf_st->palette[i] = av_bswap32(((uint32_t*)st->codec->extradata)[i]);
+ for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE) / 4; i++)
+ asf_st->palette[i] = av_bswap32(((uint32_t *)st->codec->extradata)[i]);
 #else
 memcpy(asf_st->palette, st->codec->extradata,
 FFMIN(st->codec->extradata_size, AVPALETTE_SIZE));
@@ -471,16 +489,18 @@
 }
 
 st->codec->codec_tag = tag1;
- st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1);
- if(tag1 == MKTAG('D', 'V', 'R', ' ')){
+ st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1);
+ if (tag1 == MKTAG('D', 'V', 'R', ' ')) {
 st->need_parsing = AVSTREAM_PARSE_FULL;
- // issue658 containse wrong w/h and MS even puts a fake seq header with wrong w/h in extradata while a correct one is in te stream. maximum lameness
- st->codec->width =
+ /* issue658 contains wrong w/h and MS even puts a fake seq header
+ * with wrong w/h in extradata while a correct one is in the stream.
+ * maximum lameness */
+ st->codec->width =
 st->codec->height = 0;
 av_freep(&st->codec->extradata);
- st->codec->extradata_size=0;
+ st->codec->extradata_size = 0;
 }
- if(st->codec->codec_id == AV_CODEC_ID_H264)
+ if (st->codec->codec_id == AV_CODEC_ID_H264)
 st->need_parsing = AVSTREAM_PARSE_FULL_ONCE;
 }
 pos2 = avio_tell(pb);
@@ -515,22 +535,22 @@
 asf->streams[stream_num].stream_language_index = stream_languageid_index;
 
 avio_rl64(pb); // avg frametime in 100ns units
- stream_ct = avio_rl16(pb); //stream-name-count
- payload_ext_ct = avio_rl16(pb); //payload-extension-system-count
+ stream_ct = avio_rl16(pb); // stream-name-count
+ payload_ext_ct = avio_rl16(pb); // payload-extension-system-count
 
 if (stream_num < 128)
 asf->stream_bitrates[stream_num] = leak_rate;
 
- for (i=0; i<stream_ct; i++){
+ for (i = 0; i < stream_ct; i++) {
 avio_rl16(pb);
 ext_len = avio_rl16(pb);
 avio_skip(pb, ext_len);
 }
 
- for (i=0; i<payload_ext_ct; i++){
+ for (i = 0; i < payload_ext_ct; i++) {
 ff_get_guid(pb, &g);
 avio_skip(pb, 2);
- ext_len=avio_rl32(pb);
+ ext_len = avio_rl32(pb);
 avio_skip(pb, ext_len);
 }
 
@@ -547,10 +567,10 @@
 len3 = avio_rl16(pb);
 len4 = avio_rl16(pb);
 len5 = avio_rl16(pb);
- get_tag(s, "title" , 0, len1);
- get_tag(s, "author" , 0, len2);
- get_tag(s, "copyright", 0, len3);
- get_tag(s, "comment" , 0, len4);
+ get_tag(s, "title", 0, len1, 32);
+ get_tag(s, "author", 0, len2, 32);
+ get_tag(s, "copyright", 0, len3, 32);
+ get_tag(s, "comment", 0, len4, 32);
 avio_skip(pb, len5);
 
 return 0;
@@ -563,29 +583,28 @@
 int desc_count, i, ret;
 
 desc_count = avio_rl16(pb);
- for(i=0;i<desc_count;i++) {
- int name_len,value_type,value_len;
+ for (i = 0; i < desc_count; i++) {
+ int name_len, value_type, value_len;
 char name[1024];
 
 name_len = avio_rl16(pb);
- if (name_len%2) // must be even, broken lavf versions wrote len-1
+ if (name_len % 2) // must be even, broken lavf versions wrote len-1
 name_len += 1;
 if ((ret = avio_get_str16le(pb, name_len, name, sizeof(name))) < name_len)
 avio_skip(pb, name_len - ret);
 value_type = avio_rl16(pb);
 value_len = avio_rl16(pb);
- if (!value_type && value_len%2)
+ if (!value_type && value_len % 2)
 value_len += 1;
- /**
- * My sample has that stream set to 0 maybe that mean the container.
- * Asf stream count start at 1. I am using 0 to the container value since it's unused
- */
- if (!strcmp(name, "AspectRatioX")){
- asf->dar[0].num= get_value(s->pb, value_type);
- } else if(!strcmp(name, "AspectRatioY")){
- asf->dar[0].den= get_value(s->pb, value_type);
- } else
- get_tag(s, name, value_type, value_len);
+ /* My sample has that stream set to 0 maybe that mean the container.
+ * ASF stream count starts at 1. I am using 0 to the container value
+ * since it's unused. */
+ if (!strcmp(name, "AspectRatioX"))
+ asf->dar[0].num = get_value(s->pb, value_type, 32);
+ else if (!strcmp(name, "AspectRatioY"))
+ asf->dar[0].den = get_value(s->pb, value_type, 32);
+ else
+ get_tag(s, name, value_type, value_len, 32);
 }
 
 return 0;
@@ -597,13 +616,15 @@
 ASFContext *asf = s->priv_data;
 int j, ret;
 int stream_count = avio_rl16(pb);
- for(j = 0; j < stream_count; j++) {
+ for (j = 0; j < stream_count; j++) {
 char lang[6];
 unsigned int lang_len = avio_r8(pb);
- if ((ret = avio_get_str16le(pb, lang_len, lang, sizeof(lang))) < lang_len)
+ if ((ret = avio_get_str16le(pb, lang_len, lang,
+ sizeof(lang))) < lang_len)
 avio_skip(pb, lang_len - ret);
 if (j < 128)
- av_strlcpy(asf->stream_languages[j], lang, sizeof(*asf->stream_languages));
+ av_strlcpy(asf->stream_languages[j], lang,
+ sizeof(*asf->stream_languages));
 }
 
 return 0;
@@ -613,30 +634,35 @@
 {
 AVIOContext *pb = s->pb;
 ASFContext *asf = s->priv_data;
- int n, stream_num, name_len, value_len, value_num;
+ int n, stream_num, name_len, value_len;
 int ret, i;
 n = avio_rl16(pb);
 
- for(i=0;i<n;i++) {
+ for (i = 0; i < n; i++) {
 char name[1024];
- int av_unused value_type;
+ int value_type;
 
- avio_rl16(pb); //lang_list_index
- stream_num= avio_rl16(pb);
- name_len= avio_rl16(pb);
+ avio_rl16(pb); // lang_list_index
+ stream_num = avio_rl16(pb);
+ name_len = avio_rl16(pb);
 value_type = avio_rl16(pb); /* value_type */
- value_len= avio_rl32(pb);
+ value_len = avio_rl32(pb);
 
 if ((ret = avio_get_str16le(pb, name_len, name, sizeof(name))) < name_len)
 avio_skip(pb, name_len - ret);
- av_dlog(s, "%d %d %d %d %d <%s>\n",
+ av_dlog(s, "%d stream %d name_len %2d type %d len %4d <%s>\n",
 i, stream_num, name_len, value_type, value_len, name);
- value_num= avio_rl16(pb);//we should use get_value() here but it does not work 2 is le16 here but le32 elsewhere
- avio_skip(pb, value_len - 2);
 
- if(stream_num<128){
- if (!strcmp(name, "AspectRatioX")) asf->dar[stream_num].num= value_num;
- else if(!strcmp(name, "AspectRatioY")) asf->dar[stream_num].den= value_num;
+ if (!strcmp(name, "AspectRatioX")){
+ int aspect_x = get_value(s->pb, value_type, 16);
+ if(stream_num < 128)
+ asf->dar[stream_num].num = aspect_x;
+ } else if(!strcmp(name, "AspectRatioY")){
+ int aspect_y = get_value(s->pb, value_type, 16);
+ if(stream_num < 128)
+ asf->dar[stream_num].den = aspect_y;
+ } else {
+ get_tag(s, name, value_type, value_len, 16);
 }
 }
 
@@ -646,6 +672,7 @@
 static int asf_read_marker(AVFormatContext *s, int64_t size)
 {
 AVIOContext *pb = s->pb;
+ ASFContext *asf = s->priv_data;
 int i, count, name_len, ret;
 char name[1024];
 
@@ -654,23 +681,25 @@
 count = avio_rl32(pb); // markers count
 avio_rl16(pb); // reserved 2 bytes
 name_len = avio_rl16(pb); // name length
- for(i=0;i<name_len;i++){
+ for (i = 0; i < name_len; i++)
 avio_r8(pb); // skip the name
- }
 
- for(i=0;i<count;i++){
+ for (i = 0; i < count; i++) {
 int64_t pres_time;
 int name_len;
 
 avio_rl64(pb); // offset, 8 bytes
 pres_time = avio_rl64(pb); // presentation time
+ pres_time -= asf->hdr.preroll * 10000;
 avio_rl16(pb); // entry length
 avio_rl32(pb); // send time
 avio_rl32(pb); // flags
 name_len = avio_rl32(pb); // name length
- if ((ret = avio_get_str16le(pb, name_len * 2, name, sizeof(name))) < name_len)
+ if ((ret = avio_get_str16le(pb, name_len * 2, name,
+ sizeof(name))) < name_len)
 avio_skip(pb, name_len - ret);
- avpriv_new_chapter(s, i, (AVRational){1, 10000000}, pres_time, AV_NOPTS_VALUE, name );
+ avpriv_new_chapter(s, i, (AVRational) { 1, 10000000 }, pres_time,
+ AV_NOPTS_VALUE, name);
 }
 
 return 0;
@@ -692,19 +721,19 @@
 avio_r8(pb);
 avio_r8(pb);
 memset(&asf->asfid2avid, -1, sizeof(asf->asfid2avid));
- for(;;) {
- uint64_t gpos= avio_tell(pb);
+ for (;;) {
+ uint64_t gpos = avio_tell(pb);
 ff_get_guid(pb, &g);
 gsize = avio_rl64(pb);
 print_guid(&g);
 if (!ff_guidcmp(&g, &ff_asf_data_header)) {
 asf->data_object_offset = avio_tell(pb);
- // if not streaming, gsize is not unlimited (how?), and there is enough space in the file..
- if (!(asf->hdr.flags & 0x01) && gsize >= 100) {
+ /* If not streaming, gsize is not unlimited (how?),
+ * and there is enough space in the file.. */
+ if (!(asf->hdr.flags & 0x01) && gsize >= 100)
 asf->data_object_size = gsize - 24;
- } else {
+ else
 asf->data_object_size = (uint64_t)-1;
- }
 break;
 }
 if (gsize < 24)
@@ -714,7 +743,9 @@
 if (ret < 0)
 return ret;
 } else if (!ff_guidcmp(&g, &ff_asf_stream_header)) {
- asf_read_stream_properties(s, gsize);
+ int ret = asf_read_stream_properties(s, gsize);
+ if (ret < 0)
+ return ret;
 } else if (!ff_guidcmp(&g, &ff_asf_comment_header)) {
 asf_read_content_desc(s, gsize);
 } else if (!ff_guidcmp(&g, &ff_asf_language_guid)) {
@@ -723,6 +754,8 @@
 asf_read_ext_content_desc(s, gsize);
 } else if (!ff_guidcmp(&g, &ff_asf_metadata_header)) {
 asf_read_metadata(s, gsize);
+ } else if (!ff_guidcmp(&g, &ff_asf_metadata_library_header)) {
+ asf_read_metadata(s, gsize);
 } else if (!ff_guidcmp(&g, &ff_asf_ext_stream_header)) {
 asf_read_ext_stream_properties(s, gsize);
 
@@ -740,16 +773,21 @@
 } else {
 if (!s->keylen) {
 if (!ff_guidcmp(&g, &ff_asf_content_encryption)) {
- av_log(s, AV_LOG_WARNING, "DRM protected stream detected, decoding will likely fail!\n");
+ av_log(s, AV_LOG_WARNING,
+ "DRM protected stream detected, decoding will likely fail!\n");
 } else if (!ff_guidcmp(&g, &ff_asf_ext_content_encryption)) {
- av_log(s, AV_LOG_WARNING, "Ext DRM protected stream detected, decoding will likely fail!\n");
+ av_log(s, AV_LOG_WARNING,
+ "Ext DRM protected stream detected, decoding will likely fail!\n");
 } else if (!ff_guidcmp(&g, &ff_asf_digital_signature)) {
- av_log(s, AV_LOG_WARNING, "Digital signature detected, decoding will likely fail!\n");
+ av_log(s, AV_LOG_WARNING,
+ "Digital signature detected, decoding will likely fail!\n");
 }
 }
 }
- if(avio_tell(pb) != gpos + gsize)
- av_log(s, AV_LOG_DEBUG, "gpos mismatch our pos=%"PRIu64", end=%"PRIu64"\n", avio_tell(pb)-gpos, gsize);
+ if (avio_tell(pb) != gpos + gsize)
+ av_log(s, AV_LOG_DEBUG,
+ "gpos mismatch our pos=%"PRIu64", end=%"PRId64"\n",
+ avio_tell(pb) - gpos, gsize);
 avio_seek(pb, gpos + gsize, SEEK_SET);
 }
 ff_get_guid(pb, &g);
@@ -758,21 +796,22 @@
 avio_r8(pb);
 if (pb->eof_reached)
 return -1;
- asf->data_offset = avio_tell(pb);
+ asf->data_offset = avio_tell(pb);
 asf->packet_size_left = 0;
 
-
- for(i=0; i<128; i++){
- int stream_num= asf->asfid2avid[i];
- if(stream_num>=0){
+ for (i = 0; i < 128; i++) {
+ int stream_num = asf->asfid2avid[i];
+ if (stream_num >= 0) {
 AVStream *st = s->streams[stream_num];
 if (!st->codec->bit_rate)
 st->codec->bit_rate = asf->stream_bitrates[i];
- if (asf->dar[i].num > 0 && asf->dar[i].den > 0){
+ if (asf->dar[i].num > 0 && asf->dar[i].den > 0) {
 av_reduce(&st->sample_aspect_ratio.num,
 &st->sample_aspect_ratio.den,
 asf->dar[i].num, asf->dar[i].den, INT_MAX);
- } else if ((asf->dar[0].num > 0) && (asf->dar[0].den > 0) && (st->codec->codec_type==AVMEDIA_TYPE_VIDEO)) // Use ASF container value if the stream doesn't AR set.
+ } else if ((asf->dar[0].num > 0) && (asf->dar[0].den > 0) &&
+ // Use ASF container value if the stream doesn't set AR.
+ (st->codec->codec_type == AVMEDIA_TYPE_VIDEO))
 av_reduce(&st->sample_aspect_ratio.num,
 &st->sample_aspect_ratio.den,
 asf->dar[0].num, asf->dar[0].den, INT_MAX);
@@ -786,7 +825,8 @@
 const char *rfc1766 = asf->stream_languages[asf->streams[i].stream_language_index];
 if (rfc1766 && strlen(rfc1766) > 1) {
 const char primary_tag[3] = { rfc1766[0], rfc1766[1], '\0' }; // ignore country code if any
- const char *iso6392 = av_convert_lang_to(primary_tag, AV_LANG_ISO639_2_BIBL);
+ const char *iso6392 = av_convert_lang_to(primary_tag,
+ AV_LANG_ISO639_2_BIBL);
 if (iso6392)
 av_dict_set(&st->metadata, "language", iso6392, 0);
 }
@@ -799,13 +839,23 @@
 return 0;
 }
 
-#define DO_2BITS(bits, var, defval) \
- switch (bits & 3) \
- { \
- case 3: var = avio_rl32(pb); rsize += 4; break; \
- case 2: var = avio_rl16(pb); rsize += 2; break; \
- case 1: var = avio_r8(pb); rsize++; break; \
- default: var = defval; break; \
+#define DO_2BITS(bits, var, defval) \
+ switch (bits & 3) { \
+ case 3: \
+ var = avio_rl32(pb); \
+ rsize += 4; \
+ break; \
+ case 2: \
+ var = avio_rl16(pb); \
+ rsize += 2; \
+ break; \
+ case 1: \
+ var = avio_r8(pb); \
+ rsize++; \
+ break; \
+ default: \
+ var = defval; \
+ break; \
 }
 
 /**
@@ -814,7 +864,7 @@
 * @param pb context to read data from
 * @return 0 on success, <0 on error
 */
-static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb)
+static int asf_get_packet(AVFormatContext *s, AVIOContext *pb)
 {
 ASFContext *asf = s->priv_data;
 uint32_t packet_length, padsize;
@@ -822,31 +872,31 @@
 int c, d, e, off;
 
 // if we do not know packet size, allow skipping up to 32 kB
- off= 32768;
+ off = 32768;
 if (asf->no_resync_search)
 off = 3;
 else if (s->packet_size > 0)
- off= (avio_tell(pb) - s->data_offset) % s->packet_size + 3;
-
- c=d=e=-1;
- while(off-- > 0){
- c=d; d=e;
- e= avio_r8(pb);
- if(c == 0x82 && !d && !e)
+ off = (avio_tell(pb) - s->data_offset) % s->packet_size + 3;
+
+ c = d = e = -1;
+ while (off-- > 0) {
+ c = d;
+ d = e;
+ e = avio_r8(pb);
+ if (c == 0x82 && !d && !e)
 break;
 }
 
 if (c != 0x82) {
- /**
- * This code allows handling of -EAGAIN at packet boundaries (i.e.
+ /* This code allows handling of -EAGAIN at packet boundaries (i.e.
 * if the packet sync code above triggers -EAGAIN). This does not
 * imply complete -EAGAIN handling support at random positions in
- * the stream.
- */
+ * the stream. */
 if (pb->error == AVERROR(EAGAIN))
 return AVERROR(EAGAIN);
 if (!pb->eof_reached)
- av_log(s, AV_LOG_ERROR, "ff asf bad header %x at:%"PRId64"\n", c, avio_tell(pb));
+ av_log(s, AV_LOG_ERROR,
+ "ff asf bad header %x at:%"PRId64"\n", c, avio_tell(pb));
 }
 if ((c & 0x8f) == 0x82) {
 if (d || e) {
@@ -854,11 +904,11 @@
 av_log(s, AV_LOG_ERROR, "ff asf bad non zero\n");
 return -1;
 }
- c= avio_r8(pb);
- d= avio_r8(pb);
- rsize+=3;
+ c = avio_r8(pb);
+ d = avio_r8(pb);
+ rsize += 3;
 } else if (!pb->eof_reached) {
- avio_seek(pb, -1, SEEK_CUR); //FIXME
+ avio_seek(pb, -1, SEEK_CUR); // FIXME
 }
 
 asf->packet_flags = c;
@@ -868,13 +918,16 @@
 DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored
 DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length
 
- //the following checks prevent overflows and infinite loops
- if(!packet_length || packet_length >= (1U<<29)){
- av_log(s, AV_LOG_ERROR, "invalid packet_length %d at:%"PRId64"\n", packet_length, avio_tell(pb));
+ // the following checks prevent overflows and infinite loops
+ if (!packet_length || packet_length >= (1U << 29)) {
+ av_log(s, AV_LOG_ERROR,
+ "invalid packet_length %d at:%"PRId64"\n",
+ packet_length, avio_tell(pb));
 return -1;
 }
- if(padsize >= packet_length){
- av_log(s, AV_LOG_ERROR, "invalid padsize %d at:%"PRId64"\n", padsize, avio_tell(pb));
+ if (padsize >= packet_length) {
+ av_log(s, AV_LOG_ERROR,
+ "invalid padsize %d at:%"PRId64"\n", padsize, avio_tell(pb));
 return -1;
 }
 
@@ -883,10 +936,11 @@
 // rsize has at least 11 bytes which have to be present
 
 if (asf->packet_flags & 0x01) {
- asf->packet_segsizetype = avio_r8(pb); rsize++;
+ asf->packet_segsizetype = avio_r8(pb);
+ rsize++;
 asf->packet_segments = asf->packet_segsizetype & 0x3f;
 } else {
- asf->packet_segments = 1;
+ asf->packet_segments = 1;
 asf->packet_segsizetype = 0x80;
 }
 if (rsize > packet_length - padsize) {
@@ -900,7 +954,8 @@
 if (packet_length < asf->hdr.min_pktsize)
 padsize += asf->hdr.min_pktsize - packet_length;
 asf->packet_padsize = padsize;
- av_dlog(s, "packet: size=%d padsize=%d left=%d\n", s->packet_size, asf->packet_padsize, asf->packet_size_left);
+ av_dlog(s, "packet: size=%d padsize=%d left=%d\n",
+ s->packet_size, asf->packet_padsize, asf->packet_size_left);
 return 0;
 }
 
@@ -908,15 +963,16 @@
 *
 * @return <0 if error
 */
-static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){
+static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb)
+{
 ASFContext *asf = s->priv_data;
- int rsize = 1;
- int num = avio_r8(pb);
+ int rsize = 1;
+ int num = avio_r8(pb);
 int64_t ts0;
 
 asf->packet_segments--;
 asf->packet_key_frame = num >> 7;
- asf->stream_index = asf->asfid2avid[num & 0x7f];
+ asf->stream_index = asf->asfid2avid[num & 0x7f];
 // sequence should be ignored!
 DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0);
 DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0);
@@ -926,33 +982,36 @@
 asf->packet_frag_offset, asf->packet_replic_size);
 if (asf->packet_replic_size >= 8) {
 asf->packet_obj_size = avio_rl32(pb);
- if(asf->packet_obj_size >= (1<<24) || asf->packet_obj_size <= 0){
+ if (asf->packet_obj_size >= (1 << 24) || asf->packet_obj_size <= 0) {
 av_log(s, AV_LOG_ERROR, "packet_obj_size invalid\n");
 return -1;
 }
 asf->packet_frag_timestamp = avio_rl32(pb); // timestamp
- if(asf->packet_replic_size >= 8+38+4){
+ if (asf->packet_replic_size >= 8 + 38 + 4) {
 avio_skip(pb, 10);
- ts0= avio_rl64(pb);
- avio_skip(pb, 8);;
+ ts0 = avio_rl64(pb);
+ avio_skip(pb, 8);
 avio_skip(pb, 12);
 avio_rl32(pb);
 avio_skip(pb, asf->packet_replic_size - 8 - 38 - 4);
- if(ts0!= -1) asf->packet_frag_timestamp= ts0/10000;
- else asf->packet_frag_timestamp= AV_NOPTS_VALUE;
- }else
+ if (ts0 != -1)
+ asf->packet_frag_timestamp = ts0 / 10000;
+ else
+ asf->packet_frag_timestamp = AV_NOPTS_VALUE;
+ } else
 avio_skip(pb, asf->packet_replic_size - 8);
 rsize += asf->packet_replic_size; // FIXME - check validity
- } else if (asf->packet_replic_size==1){
+ } else if (asf->packet_replic_size == 1) {
 // multipacket - frag_offset is beginning timestamp
- asf->packet_time_start = asf->packet_frag_offset;
- asf->packet_frag_offset = 0;
+ asf->packet_time_start = asf->packet_frag_offset;
+ asf->packet_frag_offset = 0;
 asf->packet_frag_timestamp = asf->packet_timestamp;
 
 asf->packet_time_delta = avio_r8(pb);
 rsize++;
- }else if(asf->packet_replic_size!=0){
- av_log(s, AV_LOG_ERROR, "unexpected packet_replic_size of %d\n", asf->packet_replic_size);
+ } else if (asf->packet_replic_size != 0) {
+ av_log(s, AV_LOG_ERROR, "unexpected packet_replic_size of %d\n",
+ asf->packet_replic_size);
 return -1;
 }
 if (asf->packet_flags & 0x01) {
@@ -960,9 +1019,10 @@
 if (rsize > asf->packet_size_left) {
 av_log(s, AV_LOG_ERROR, "packet_replic_size is invalid\n");
 return -1;
- } else if(asf->packet_frag_size > asf->packet_size_left - rsize){
+ } else if (asf->packet_frag_size > asf->packet_size_left - rsize) {
 if (asf->packet_frag_size > asf->packet_size_left - rsize + asf->packet_padsize) {
- av_log(s, AV_LOG_ERROR, "packet_frag_size is invalid (%d-%d)\n", asf->packet_size_left, rsize);
+ av_log(s, AV_LOG_ERROR, "packet_frag_size is invalid (%d-%d)\n",
+ asf->packet_size_left, rsize);
 return -1;
 } else {
 int diff = asf->packet_frag_size - (asf->packet_size_left - rsize);
@@ -996,9 +1056,9 @@
 * @return 0 if data was stored in pkt, <0 on error or 1 if more ASF
 * packets need to be loaded (through asf_get_packet())
 */
-static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt)
+static int asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt)
 {
- ASFContext *asf = s->priv_data;
+ ASFContext *asf = s->priv_data;
 ASFStream *asf_st = 0;
 for (;;) {
 int ret;
@@ -1014,10 +1074,10 @@
 /* fail safe */
 avio_skip(pb, ret);
 
- asf->packet_pos= avio_tell(pb);
+ asf->packet_pos = avio_tell(pb);
 if (asf->data_object_size != (uint64_t)-1 &&
 (asf->packet_pos - asf->data_object_offset >= asf->data_object_size))
- return AVERROR_EOF; /* Do not exceed the size of the data object */
+ return AVERROR_EOF; /* Do not exceed the size of the data object */
 return 1;
 }
 if (asf->packet_time_start == 0) {
@@ -1034,12 +1094,24 @@
 avio_skip(pb, asf->packet_frag_size);
 asf->packet_size_left -= asf->packet_frag_size;
 if (asf->stream_index < 0)
- av_log(s, AV_LOG_ERROR, "ff asf skip %d (unknown stream)\n", asf->packet_frag_size);
+ av_log(s, AV_LOG_ERROR, "ff asf skip %d (unknown stream)\n",
+ asf->packet_frag_size);
 continue;
 }
 asf->asf_st = s->streams[asf->stream_index]->priv_data;
 }
 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
@@ -1065,11 +1137,12 @@
 }
 
 if (asf_st->pkt.size != asf->packet_obj_size ||
- //FIXME is this condition sufficient?
+ // FIXME is this condition sufficient?
 asf_st->frag_offset + asf->packet_frag_size > asf_st->pkt.size) {
 if (asf_st->pkt.data) {
- av_log(s, AV_LOG_INFO, "freeing incomplete packet size %d, "
- "new %d\n", asf_st->pkt.size, asf->packet_obj_size);
+ av_log(s, AV_LOG_INFO,
+ "freeing incomplete packet size %d, new %d\n",
+ asf_st->pkt.size, asf->packet_obj_size);
 asf_st->frag_offset = 0;
 av_free_packet(&asf_st->pkt);
 }
@@ -1112,8 +1185,10 @@
 
 if (asf->packet_frag_offset >= asf_st->pkt.size ||
 asf->packet_frag_size > asf_st->pkt.size - asf->packet_frag_offset) {
- av_log(s, AV_LOG_ERROR, "packet fragment position invalid %u,%u not in %u\n",
- asf->packet_frag_offset, asf->packet_frag_size, asf_st->pkt.size);
+ av_log(s, AV_LOG_ERROR,
+ "packet fragment position invalid %u,%u not in %u\n",
+ asf->packet_frag_offset, asf->packet_frag_size,
+ asf_st->pkt.size);
 continue;
 }
 
@@ -1141,11 +1216,12 @@
 asf_st->frag_offset += ret;
 /* test if whole packet is read */
 if (asf_st->frag_offset == asf_st->pkt.size) {
- //workaround for macroshit radio DVR-MS files
+ // workaround for macroshit radio DVR-MS files
 if (s->streams[asf->stream_index]->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO &&
 asf_st->pkt.size > 100) {
 int i;
- for (i = 0; i < asf_st->pkt.size && !asf_st->pkt.data[i]; i++);
+ for (i = 0; i < asf_st->pkt.size && !asf_st->pkt.data[i]; i++)
+ ;
 if (i == asf_st->pkt.size) {
 av_log(s, AV_LOG_DEBUG, "discarding ms fart\n");
 asf_st->frag_offset = 0;
@@ -1156,35 +1232,46 @@
 
 /* return packet */
 if (asf_st->ds_span > 1) {
- if(asf_st->pkt.size != asf_st->ds_packet_size * asf_st->ds_span) {
- av_log(s, AV_LOG_ERROR, "pkt.size != ds_packet_size * "
- "ds_span (%d %d %d)\n", asf_st->pkt.size,
- asf_st->ds_packet_size, asf_st->ds_span);
+ if (asf_st->pkt.size != asf_st->ds_packet_size * asf_st->ds_span) {
+ av_log(s, AV_LOG_ERROR,
+ "pkt.size != ds_packet_size * ds_span (%d %d %d)\n",
+ asf_st->pkt.size, asf_st->ds_packet_size,
+ asf_st->ds_span);
 } else {
 /* packet descrambling */
- uint8_t *newdata = av_malloc(asf_st->pkt.size + FF_INPUT_BUFFER_PADDING_SIZE);
- if (newdata) {
+ AVBufferRef *buf = av_buffer_alloc(asf_st->pkt.size +
+ FF_INPUT_BUFFER_PADDING_SIZE);
+ if (buf) {
+ uint8_t *newdata = buf->data;
 int offset = 0;
- memset(newdata + asf_st->pkt.size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+ memset(newdata + asf_st->pkt.size, 0,
+ FF_INPUT_BUFFER_PADDING_SIZE);
 while (offset < asf_st->pkt.size) {
 int off = offset / asf_st->ds_chunk_size;
 int row = off / asf_st->ds_span;
 int col = off % asf_st->ds_span;
 int idx = row + col * asf_st->ds_packet_size / asf_st->ds_chunk_size;
 assert(offset + asf_st->ds_chunk_size <= asf_st->pkt.size);
- assert(idx+1 <= asf_st->pkt.size / asf_st->ds_chunk_size);
+ assert(idx + 1 <= asf_st->pkt.size / asf_st->ds_chunk_size);
 memcpy(newdata + offset,
 asf_st->pkt.data + idx * asf_st->ds_chunk_size,
 asf_st->ds_chunk_size);
 offset += asf_st->ds_chunk_size;
 }
- av_free(asf_st->pkt.data);
- asf_st->pkt.data = newdata;
+ av_buffer_unref(&asf_st->pkt.buf);
+ asf_st->pkt.buf = buf;
+ asf_st->pkt.data = buf->data;
 }
 }
 }
 asf_st->frag_offset = 0;
 *pkt = asf_st->pkt;
+#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
+ asf_st->pkt.destruct = NULL;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+ asf_st->pkt.buf = 0;
 asf_st->pkt.size = 0;
 asf_st->pkt.data = 0;
 asf_st->pkt.side_data_elems = 0;
@@ -1203,10 +1290,11 @@
 int ret;
 
 /* parse cached packets, if any */
- if ((ret = ff_asf_parse_packet(s, s->pb, pkt)) <= 0)
+ if ((ret = asf_parse_packet(s, s->pb, pkt)) <= 0)
 return ret;
- if ((ret = ff_asf_get_packet(s, s->pb)) < 0)
- assert(asf->packet_size_left < FRAME_HEADER_SIZE || asf->packet_segments < 1);
+ if ((ret = asf_get_packet(s, s->pb)) < 0)
+ assert(asf->packet_size_left < FRAME_HEADER_SIZE ||
+ asf->packet_segments < 1);
 asf->packet_time_start = 0;
 }
 }
@@ -1220,32 +1308,34 @@
 ASFStream *asf_st;
 int i;
 
- asf->packet_size_left = 0;
- asf->packet_segments = 0;
- asf->packet_flags = 0;
- asf->packet_property = 0;
- asf->packet_timestamp = 0;
- asf->packet_segsizetype = 0;
- asf->packet_segments = 0;
- asf->packet_seq = 0;
- asf->packet_replic_size = 0;
- asf->packet_key_frame = 0;
- asf->packet_padsize = 0;
- asf->packet_frag_offset = 0;
- asf->packet_frag_size = 0;
+ asf->packet_size_left = 0;
+ asf->packet_segments = 0;
+ asf->packet_flags = 0;
+ asf->packet_property = 0;
+ asf->packet_timestamp = 0;
+ asf->packet_segsizetype = 0;
+ asf->packet_segments = 0;
+ asf->packet_seq = 0;
+ asf->packet_replic_size = 0;
+ asf->packet_key_frame = 0;
+ asf->packet_padsize = 0;
+ asf->packet_frag_offset = 0;
+ asf->packet_frag_size = 0;
 asf->packet_frag_timestamp = 0;
- asf->packet_multi_size = 0;
- asf->packet_obj_size = 0;
- asf->packet_time_delta = 0;
- asf->packet_time_start = 0;
-
- for(i=0; i<s->nb_streams; i++){
- asf_st= s->streams[i]->priv_data;
+ asf->packet_multi_size = 0;
+ asf->packet_obj_size = 0;
+ asf->packet_time_delta = 0;
+ asf->packet_time_start = 0;
+
+ for (i = 0; i < s->nb_streams; i++) {
+ asf_st = s->streams[i]->priv_data;
+ if (!asf_st)
+ continue;
 av_free_packet(&asf_st->pkt);
- asf_st->frag_offset=0;
- asf_st->seq=0;
+ asf_st->frag_offset = 0;
+ asf_st->seq = 0;
 }
- asf->asf_st= NULL;
+ asf->asf_st = NULL;
 }
 
 static int asf_read_close(AVFormatContext *s)
@@ -1255,27 +1345,29 @@
 return 0;
 }
 
-static int64_t asf_read_pts(AVFormatContext *s, int stream_index, int64_t *ppos, int64_t pos_limit)
+static int64_t asf_read_pts(AVFormatContext *s, int stream_index,
+ int64_t *ppos, int64_t pos_limit)
 {
 AVPacket pkt1, *pkt = &pkt1;
 ASFStream *asf_st;
 int64_t pts;
- int64_t pos= *ppos;
+ int64_t pos = *ppos;
 int i;
 int64_t start_pos[ASF_MAX_STREAMS];
 
- for(i=0; i<s->nb_streams; i++){
- start_pos[i]= pos;
- }
+ for (i = 0; i < s->nb_streams; i++)
+ start_pos[i] = pos;
 
 if (s->packet_size > 0)
- pos= (pos+s->packet_size-1-s->data_offset)/s->packet_size*s->packet_size+ s->data_offset;
- *ppos= pos;
+ pos = (pos + s->packet_size - 1 - s->data_offset) /
+ s->packet_size * s->packet_size +
+ s->data_offset;
+ *ppos = pos;
 avio_seek(s->pb, pos, SEEK_SET);
 
 asf_reset_header(s);
- for(;;){
- if (asf_read_packet(s, pkt) < 0){
+ for (;;) {
+ if (asf_read_packet(s, pkt) < 0) {
 av_log(s, AV_LOG_INFO, "asf_read_pts failed\n");
 return AV_NOPTS_VALUE;
 }
@@ -1283,100 +1375,119 @@
 pts = pkt->dts;
 
 av_free_packet(pkt);
- if(pkt->flags&AV_PKT_FLAG_KEY){
- i= pkt->stream_index;
+ if (pkt->flags & AV_PKT_FLAG_KEY) {
+ i = pkt->stream_index;
 
- asf_st= s->streams[i]->priv_data;
+ asf_st = s->streams[i]->priv_data;
+ av_assert0(asf_st);
 
 // assert((asf_st->packet_pos - s->data_offset) % s->packet_size == 0);
- pos= asf_st->packet_pos;
+ pos = asf_st->packet_pos;
 
- av_add_index_entry(s->streams[i], pos, pts, pkt->size, pos - start_pos[i] + 1, AVINDEX_KEYFRAME);
- start_pos[i]= asf_st->packet_pos + 1;
+ av_add_index_entry(s->streams[i], pos, pts, pkt->size,
+ pos - start_pos[i] + 1, AVINDEX_KEYFRAME);
+ start_pos[i] = asf_st->packet_pos + 1;
 
- if(pkt->stream_index == stream_index)
- break;
+ if (pkt->stream_index == stream_index)
+ break;
 }
 }
 
- *ppos= pos;
+ *ppos = pos;
 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 i;
+ ASFContext *asf = s->priv_data;
+ int64_t current_pos = avio_tell(s->pb);
+ int i, ret = 0;
 
 avio_seek(s->pb, asf->data_object_offset + asf->data_object_size, SEEK_SET);
- 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 */
+ * skip them until the simple index object is reached */
 while (ff_guidcmp(&g, &index_guid)) {
- int64_t gsize= avio_rl64(s->pb);
+ int64_t gsize = avio_rl64(s->pb);
 if (gsize < 24 || s->pb->eof_reached) {
- avio_seek(s->pb, current_pos, SEEK_SET);
- return;
+ goto end;
 }
- avio_skip(s->pb, gsize-24);
- ff_get_guid(s->pb, &g);
+ avio_skip(s->pb, gsize - 24);
+ if ((ret = ff_get_guid(s->pb, &g)) < 0)
+ goto end;
 }
 
 {
- int64_t itime, last_pos=-1;
+ int64_t itime, last_pos = -1;
 int pct, ict;
- int64_t av_unused gsize= avio_rl64(s->pb);
- ff_get_guid(s->pb, &g);
- itime=avio_rl64(s->pb);
- pct=avio_rl32(s->pb);
- ict=avio_rl32(s->pb);
- av_log(s, AV_LOG_DEBUG, "itime:0x%"PRIx64", pct:%d, ict:%d\n",itime,pct,ict);
-
- for (i=0;i<ict;i++){
- int pktnum=avio_rl32(s->pb);
- int pktct =avio_rl16(s->pb);
- int64_t pos = s->data_offset + s->packet_size*(int64_t)pktnum;
- int64_t index_pts= FFMAX(av_rescale(itime, i, 10000) - asf->hdr.preroll, 0);
-
- if(pos != last_pos){
- av_log(s, AV_LOG_DEBUG, "pktnum:%d, pktct:%d pts: %"PRId64"\n", pktnum, pktct, index_pts);
- av_add_index_entry(s->streams[stream_index], pos, index_pts, s->packet_size, 0, AVINDEX_KEYFRAME);
- last_pos=pos;
+ int64_t av_unused gsize = avio_rl64(s->pb);
+ 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);
+ av_log(s, AV_LOG_DEBUG,
+ "itime:0x%"PRIx64", pct:%d, ict:%d\n", itime, pct, ict);
+
+ for (i = 0; i < ict; i++) {
+ int pktnum = avio_rl32(s->pb);
+ int pktct = avio_rl16(s->pb);
+ int64_t pos = s->data_offset + s->packet_size * (int64_t)pktnum;
+ int64_t index_pts = FFMAX(av_rescale(itime, i, 10000) - asf->hdr.preroll, 0);
+
+ if (pos != last_pos) {
+ av_log(s, AV_LOG_DEBUG, "pktnum:%d, pktct:%d pts: %"PRId64"\n",
+ pktnum, pktct, index_pts);
+ av_add_index_entry(s->streams[stream_index], pos, index_pts,
+ s->packet_size, 0, AVINDEX_KEYFRAME);
+ last_pos = pos;
 }
 }
- asf->index_read= ict > 0;
+ asf->index_read = ict > 0;
 }
+end:
+ if (s->pb->eof_reached)
+ ret = 0;
 avio_seek(s->pb, current_pos, SEEK_SET);
+ return ret;
 }
 
-static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags)
+static int asf_read_seek(AVFormatContext *s, int stream_index,
+ int64_t pts, int flags)
 {
 ASFContext *asf = s->priv_data;
- AVStream *st = s->streams[stream_index];
+ AVStream *st = s->streams[stream_index];
 int64_t pos;
- int index;
+ int index, ret = 0;
 
 if (s->packet_size <= 0)
 return -1;
 
 /* Try using the protocol's read_seek if available */
- if(s->pb) {
+ if (s->pb) {
 int ret = avio_seek_time(s->pb, stream_index, pts, flags);
- if(ret >= 0)
+ if (ret >= 0)
 asf_reset_header(s);
 if (ret != AVERROR(ENOSYS))
 return ret;
 }
 
+ /* 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)
- asf_build_simple_index(s, stream_index);
+ ret = asf_build_simple_index(s, stream_index);
 
- if((asf->index_read && st->index_entries)){
- index= av_index_search_timestamp(st, pts, flags);
- if(index >= 0) {
+ if (!ret && asf->index_read && st->index_entries) {
+ index = av_index_search_timestamp(st, pts, flags);
+ if (index >= 0) {
 /* find the position */
 pos = st->index_entries[index].pos;

libav-v9.6.tar.bz2/libavformat/asfenc.c -> libav-v10.1.tar.bz2/libavformat/asfenc.c Changed

@@ -18,12 +18,14 @@
 * License along with Libav; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
+
+#include "libavutil/dict.h"
+#include "libavutil/mathematics.h"
 #include "avformat.h"
+#include "avio_internal.h"
 #include "internal.h"
 #include "riff.h"
 #include "asf.h"
-#include "avio_internal.h"
-#include "libavutil/dict.h"
 
 #undef NDEBUG
 #include <assert.h>
@@ -33,10 +35,9 @@
 #define ASF_INDEX_BLOCK 600
 
 #define ASF_PACKET_ERROR_CORRECTION_DATA_SIZE 0x2
-#define ASF_PACKET_ERROR_CORRECTION_FLAGS (\
- ASF_PACKET_FLAG_ERROR_CORRECTION_PRESENT | \
- ASF_PACKET_ERROR_CORRECTION_DATA_SIZE\
- )
+#define ASF_PACKET_ERROR_CORRECTION_FLAGS \
+ (ASF_PACKET_FLAG_ERROR_CORRECTION_PRESENT | \
+ ASF_PACKET_ERROR_CORRECTION_DATA_SIZE)
 
 #if (ASF_PACKET_ERROR_CORRECTION_FLAGS != 0)
 # define ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE 1
@@ -44,12 +45,11 @@
 # define ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE 0
 #endif
 
-#define ASF_PPI_PROPERTY_FLAGS (\
- ASF_PL_FLAG_REPLICATED_DATA_LENGTH_FIELD_IS_BYTE | \
- ASF_PL_FLAG_OFFSET_INTO_MEDIA_OBJECT_LENGTH_FIELD_IS_DWORD | \
- ASF_PL_FLAG_MEDIA_OBJECT_NUMBER_LENGTH_FIELD_IS_BYTE | \
- ASF_PL_FLAG_STREAM_NUMBER_LENGTH_FIELD_IS_BYTE \
- )
+#define ASF_PPI_PROPERTY_FLAGS \
+ (ASF_PL_FLAG_REPLICATED_DATA_LENGTH_FIELD_IS_BYTE | \
+ ASF_PL_FLAG_OFFSET_INTO_MEDIA_OBJECT_LENGTH_FIELD_IS_DWORD | \
+ ASF_PL_FLAG_MEDIA_OBJECT_NUMBER_LENGTH_FIELD_IS_BYTE | \
+ ASF_PL_FLAG_STREAM_NUMBER_LENGTH_FIELD_IS_BYTE)
 
 #define ASF_PPI_LENGTH_TYPE_FLAGS 0
 
@@ -68,7 +68,6 @@
 # define ASF_PPI_SEQUENCE_FIELD_SIZE 0
 #endif
 
-
 #if (ASF_PPI_FLAG_PACKET_LENGTH_FIELD_IS_BYTE == (ASF_PPI_LENGTH_TYPE_FLAGS & ASF_PPI_MASK_PACKET_LENGTH_FIELD_SIZE))
 # define ASF_PPI_PACKET_LENGTH_FIELD_SIZE 1
 #endif
@@ -144,51 +143,47 @@
 # define ASF_PAYLOAD_LENGTH_FIELD_SIZE 0
 #endif
 
-#define PACKET_HEADER_MIN_SIZE (\
- ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE + \
- ASF_PACKET_ERROR_CORRECTION_DATA_SIZE + \
- 1 + /*Length Type Flags*/ \
- 1 + /*Property Flags*/ \
- ASF_PPI_PACKET_LENGTH_FIELD_SIZE + \
- ASF_PPI_SEQUENCE_FIELD_SIZE + \
- ASF_PPI_PADDING_LENGTH_FIELD_SIZE + \
- 4 + /*Send Time Field*/ \
- 2 /*Duration Field*/ \
- )
-
+#define PACKET_HEADER_MIN_SIZE \
+ (ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE + \
+ ASF_PACKET_ERROR_CORRECTION_DATA_SIZE + \
+ 1 + /* Length Type Flags */ \
+ 1 + /* Property Flags */ \
+ ASF_PPI_PACKET_LENGTH_FIELD_SIZE + \
+ ASF_PPI_SEQUENCE_FIELD_SIZE + \
+ ASF_PPI_PADDING_LENGTH_FIELD_SIZE + \
+ 4 + /* Send Time Field */ \
+ 2) /* Duration Field */
 
 // Replicated Data shall be at least 8 bytes long.
 #define ASF_PAYLOAD_REPLICATED_DATA_LENGTH 0x08
 
-#define PAYLOAD_HEADER_SIZE_SINGLE_PAYLOAD (\
- 1 + /*Stream Number*/ \
- ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE + \
- ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE + \
- ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE + \
- ASF_PAYLOAD_REPLICATED_DATA_LENGTH \
- )
-
-#define PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS (\
- 1 + /*Stream Number*/ \
- ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE + \
- ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE + \
- ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE + \
- ASF_PAYLOAD_REPLICATED_DATA_LENGTH + \
- ASF_PAYLOAD_LENGTH_FIELD_SIZE \
- )
-
-#define SINGLE_PAYLOAD_DATA_LENGTH (\
- PACKET_SIZE - \
- PACKET_HEADER_MIN_SIZE - \
- PAYLOAD_HEADER_SIZE_SINGLE_PAYLOAD \
- )
-
-#define MULTI_PAYLOAD_CONSTANT (\
- PACKET_SIZE - \
- PACKET_HEADER_MIN_SIZE - \
- 1 - /*Payload Flags*/ \
- 2*PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS \
- )
+#define PAYLOAD_HEADER_SIZE_SINGLE_PAYLOAD \
+ (1 + /* Stream Number */ \
+ ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE + \
+ ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE + \
+ ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE + \
+ ASF_PAYLOAD_REPLICATED_DATA_LENGTH)
+
+#define PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS \
+ (1 + /* Stream Number */ \
+ ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE + \
+ ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE + \
+ ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE + \
+ ASF_PAYLOAD_REPLICATED_DATA_LENGTH + \
+ ASF_PAYLOAD_LENGTH_FIELD_SIZE)
+
+#define SINGLE_PAYLOAD_DATA_LENGTH \
+ (PACKET_SIZE - \
+ PACKET_HEADER_MIN_SIZE - \
+ PAYLOAD_HEADER_SIZE_SINGLE_PAYLOAD)
+
+#define MULTI_PAYLOAD_CONSTANT \
+ (PACKET_SIZE - \
+ PACKET_HEADER_MIN_SIZE - \
+ 1 - /* Payload Flags */ \
+ 2 * PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS)
+
+#define DATA_HEADER_SIZE 50
 
 typedef struct {
 uint32_t seqno;
@@ -209,17 +204,17 @@
 uint64_t data_offset; ///< beginning of the first data packet
 
 int64_t last_indexed_pts;
- ASFIndex* index_ptr;
+ ASFIndex *index_ptr;
 uint32_t nb_index_count;
 uint32_t nb_index_memory_alloc;
 uint16_t maximum_packet;
 } ASFContext;
 
 static const AVCodecTag codec_asf_bmp_tags[] = {
- { AV_CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') },
- { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') },
+ { AV_CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') },
+ { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') },
 { AV_CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
- { AV_CODEC_ID_NONE, 0 },
+ { AV_CODEC_ID_NONE, 0 },
 };
 
 #define PREROLL_TIME 3100
@@ -267,7 +262,8 @@
 }
 
 /* write an asf chunk (only used in streaming case) */
-static void put_chunk(AVFormatContext *s, int type, int payload_length, int flags)
+static void put_chunk(AVFormatContext *s, int type,
+ int payload_length, int flags)
 {
 ASFContext *asf = s->priv_data;
 AVIOContext *pb = s->pb;
@@ -275,10 +271,10 @@
 
 length = payload_length + 8;
 avio_wl16(pb, type);
- avio_wl16(pb, length); //size
- avio_wl32(pb, asf->seqno);//sequence number
- avio_wl16(pb, flags); /* unknown bytes */
- avio_wl16(pb, length); //size_confirm
+ avio_wl16(pb, length); // size
+ avio_wl32(pb, asf->seqno); // sequence number
+ avio_wl16(pb, flags); // unknown bytes
+ avio_wl16(pb, length); // size_confirm
 asf->seqno++;
 }
 
@@ -287,13 +283,72 @@
 {
 int64_t t;
 
- t = ti * INT64_C(10000000);
+ t = ti * INT64_C(10000000);
 t += INT64_C(116444736000000000);
 return t;
 }
 
+static int32_t get_send_time(ASFContext *asf, int64_t pres_time, uint64_t *offset)
+{
+ int i;
+ int32_t send_time = 0;
+ *offset = asf->data_offset + DATA_HEADER_SIZE;
+ for (i = 0; i < asf->nb_index_count; i++) {
+ if (pres_time <= asf->index_ptr[i].send_time)
+ break;
+ send_time = asf->index_ptr[i].send_time;
+ *offset = asf->index_ptr[i].offset;
+ }
+
+ return send_time / 10000;
+}
+
+static int asf_write_markers(AVFormatContext *s)
+{
+ ASFContext *asf = s->priv_data;
+ AVIOContext *pb = s->pb;
+ int i;
+ AVRational scale = {1, 10000000};
+ int64_t hpos = put_header(pb, &ff_asf_marker_header);
+
+ put_guid(pb, &ff_asf_reserved_4); // ASF spec mandates this reserved value
+ avio_wl32(pb, s->nb_chapters); // markers count
+ avio_wl16(pb, 0); // ASF spec mandates 0 for this
+ avio_wl16(pb, 0); // name length 0, no name given
+
+ for (i = 0; i < s->nb_chapters; i++) {
+ AVChapter *c = s->chapters[i];
+ AVDictionaryEntry *t = av_dict_get(c->metadata, "title", NULL, 0);
+ int64_t pres_time = av_rescale_q(c->start, c->time_base, scale);
+ uint64_t offset;
+ int32_t send_time = get_send_time(asf, pres_time, &offset);
+ int len = 0;
+ uint8_t *buf;
+ AVIOContext *dyn_buf;
+ if (t) {
+ if (avio_open_dyn_buf(&dyn_buf) < 0)
+ return AVERROR(ENOMEM);
+ avio_put_str16le(dyn_buf, t->value);
+ len = avio_close_dyn_buf(dyn_buf, &buf);
+ }
+ avio_wl64(pb, offset); // offset of the packet with send_time
+ avio_wl64(pb, pres_time + PREROLL_TIME * 10000); // presentation time
+ avio_wl16(pb, 12 + len); // entry length
+ avio_wl32(pb, send_time); // send time
+ avio_wl32(pb, 0); // flags, should be 0
+ avio_wl32(pb, len / 2); // marker desc length in WCHARS!
+ if (t) {
+ avio_write(pb, buf, len); // marker desc
+ av_freep(&buf);
+ }
+ }
+ end_header(pb, hpos);
+ return 0;
+}
+
 /* write the header (used two times if non streamed) */
-static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data_chunk_size)
+static int asf_write_header1(AVFormatContext *s, int64_t file_size,
+ int64_t data_chunk_size)
 {
 ASFContext *asf = s->priv_data;
 AVIOContext *pb = s->pb;
@@ -308,18 +363,18 @@
 
 ff_metadata_conv(&s->metadata, ff_asf_metadata_conv, NULL);
 
- tags[0] = av_dict_get(s->metadata, "title" , NULL, 0);
- tags[1] = av_dict_get(s->metadata, "author" , NULL, 0);
+ tags[0] = av_dict_get(s->metadata, "title", NULL, 0);
+ tags[1] = av_dict_get(s->metadata, "author", NULL, 0);
 tags[2] = av_dict_get(s->metadata, "copyright", NULL, 0);
- tags[3] = av_dict_get(s->metadata, "comment" , NULL, 0);
- tags[4] = av_dict_get(s->metadata, "rating" , NULL, 0);
+ tags[3] = av_dict_get(s->metadata, "comment", NULL, 0);
+ tags[4] = av_dict_get(s->metadata, "rating", NULL, 0);
 
- duration = asf->duration + PREROLL_TIME * 10000;
- has_title = tags[0] || tags[1] || tags[2] || tags[3] || tags[4];
+ duration = asf->duration + PREROLL_TIME * 10000;
+ has_title = tags[0] || tags[1] || tags[2] || tags[3] || tags[4];
 metadata_count = av_dict_count(s->metadata);
 
 bit_rate = 0;
- for(n=0;n<s->nb_streams;n++) {
+ for (n = 0; n < s->nb_streams; n++) {
 enc = s->streams[n]->codec;
 
 avpriv_set_pts_info(s->streams[n], 32, 1, 1000); /* 32 bit pts in ms */
@@ -339,7 +394,7 @@
 
 /* file header */
 header_offset = avio_tell(pb);
- hpos = put_header(pb, &ff_asf_file_header);
+ hpos = put_header(pb, &ff_asf_file_header);
 put_guid(pb, &ff_asf_my_guid);
 avio_wl64(pb, file_size);
 file_time = 0;
@@ -348,7 +403,7 @@
 avio_wl64(pb, duration); /* end time stamp (in 100ns units) */
 avio_wl64(pb, asf->duration); /* duration (in 100ns units) */
 avio_wl64(pb, PREROLL_TIME); /* start time stamp */
- avio_wl32(pb, (asf->is_streamed || !pb->seekable ) ? 3 : 2); /* ??? */
+ avio_wl32(pb, (asf->is_streamed || !pb->seekable) ? 3 : 2); /* ??? */
 avio_wl32(pb, s->packet_size); /* packet size */
 avio_wl32(pb, s->packet_size); /* packet size */
 avio_wl32(pb, bit_rate); /* Nominal data rate in bps */
@@ -392,28 +447,32 @@
 }
 end_header(pb, hpos);
 }
-
+ /* chapters using ASF markers */
+ if (!asf->is_streamed && s->nb_chapters) {
+ int ret;
+ if (ret = asf_write_markers(s))
+ return ret;
+ }
 /* stream headers */
- for(n=0;n<s->nb_streams;n++) {
+ for (n = 0; n < s->nb_streams; n++) {
 int64_t es_pos;
 // ASFStream *stream = &asf->streams[n];
 
- enc = s->streams[n]->codec;
+ enc = s->streams[n]->codec;
 asf->streams[n].num = n + 1;
 asf->streams[n].seq = 0;
 
-
- switch(enc->codec_type) {
+ switch (enc->codec_type) {
 case AVMEDIA_TYPE_AUDIO:
 wav_extra_size = 0;
- extra_size = 18 + wav_extra_size;
- extra_size2 = 8;
+ extra_size = 18 + wav_extra_size;
+ extra_size2 = 8;
 break;
 default:
 case AVMEDIA_TYPE_VIDEO:
 wav_extra_size = enc->extradata_size;
- extra_size = 0x33 + wav_extra_size;
- extra_size2 = 0;
+ extra_size = 0x33 + wav_extra_size;
+ extra_size2 = 0;
 break;
 }
 
@@ -446,10 +505,10 @@
 }
 /* ERROR Correction */
 avio_w8(pb, 0x01);
- if(enc->codec_id == AV_CODEC_ID_ADPCM_G726 || !enc->block_align){
+ if (enc->codec_id == AV_CODEC_ID_ADPCM_G726 || !enc->block_align) {
 avio_wl16(pb, 0x0190);
 avio_wl16(pb, 0x0190);
- }else{
+ } else {
 avio_wl16(pb, enc->block_align);
 avio_wl16(pb, enc->block_align);
 }
@@ -472,7 +531,7 @@
 hpos = put_header(pb, &ff_asf_codec_comment_header);
 put_guid(pb, &ff_asf_codec_comment1_header);
 avio_wl32(pb, s->nb_streams);
- for(n=0;n<s->nb_streams;n++) {
+ for (n = 0; n < s->nb_streams; n++) {
 AVCodec *p;
 const char *desc;
 int len;
@@ -480,21 +539,21 @@
 AVIOContext *dyn_buf;
 
 enc = s->streams[n]->codec;
- p = avcodec_find_encoder(enc->codec_id);
+ p = avcodec_find_encoder(enc->codec_id);
 
- if(enc->codec_type == AVMEDIA_TYPE_AUDIO)
+ if (enc->codec_type == AVMEDIA_TYPE_AUDIO)
 avio_wl16(pb, 2);
- else if(enc->codec_type == AVMEDIA_TYPE_VIDEO)
+ else if (enc->codec_type == AVMEDIA_TYPE_VIDEO)
 avio_wl16(pb, 1);
 else
 avio_wl16(pb, -1);
 
- if(enc->codec_id == AV_CODEC_ID_WMAV2)
+ if (enc->codec_id == AV_CODEC_ID_WMAV2)
 desc = "Windows Media Audio V8";
 else
 desc = p ? p->name : enc->codec_name;
 
- if ( avio_open_dyn_buf(&dyn_buf) < 0)
+ if (avio_open_dyn_buf(&dyn_buf) < 0)
 return AVERROR(ENOMEM);
 
 avio_put_str16le(dyn_buf, desc);
@@ -506,7 +565,6 @@
 
 avio_wl16(pb, 0); /* no parameters */
 
-
 /* id */
 if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
 avio_wl16(pb, 2);
@@ -515,24 +573,24 @@
 avio_wl16(pb, 4);
 avio_wl32(pb, enc->codec_tag);
 }
- if(!enc->codec_tag)
+ if (!enc->codec_tag)
 return -1;
 }
 end_header(pb, hpos);
 
 /* patch the header size fields */
 
- cur_pos = avio_tell(pb);
+ cur_pos = avio_tell(pb);
 header_size = cur_pos - header_offset;
 if (asf->is_streamed) {
- header_size += 8 + 30 + 50;
+ header_size += 8 + 30 + DATA_HEADER_SIZE;
 
 avio_seek(pb, header_offset - 10 - 30, SEEK_SET);
 avio_wl16(pb, header_size);
 avio_seek(pb, header_offset - 2 - 30, SEEK_SET);
 avio_wl16(pb, header_size);
 
- header_size -= 8 + 30 + 50;
+ header_size -= 8 + 30 + DATA_HEADER_SIZE;
 }
 header_size += 24 + 6;
 avio_seek(pb, header_offset - 14, SEEK_SET);
@@ -557,27 +615,27 @@
 s->packet_size = PACKET_SIZE;
 asf->nb_packets = 0;
 
- asf->last_indexed_pts = 0;
- asf->index_ptr = av_malloc( sizeof(ASFIndex) * ASF_INDEX_BLOCK );
+ asf->last_indexed_pts = 0;
+ asf->index_ptr = av_malloc(sizeof(ASFIndex) * ASF_INDEX_BLOCK);
 asf->nb_index_memory_alloc = ASF_INDEX_BLOCK;
- asf->nb_index_count = 0;
- asf->maximum_packet = 0;
+ asf->nb_index_count = 0;
+ asf->maximum_packet = 0;
 
- /* the data-chunk-size has to be 50, which is data_size - asf->data_offset
- * at the moment this function is done. It is needed to use asf as
- * streamable format. */
- if (asf_write_header1(s, 0, 50) < 0) {
+ /* the data-chunk-size has to be 50 (DATA_HEADER_SIZE), which is
+ * data_size - asf->data_offset at the moment this function is done.
+ * It is needed to use asf as a streamable format. */
+ if (asf_write_header1(s, 0, DATA_HEADER_SIZE) < 0) {
 //av_free(asf);
 return -1;
 }
 
 avio_flush(s->pb);
 
- asf->packet_nb_payloads = 0;
+ asf->packet_nb_payloads = 0;
 asf->packet_timestamp_start = -1;
- asf->packet_timestamp_end = -1;
+ asf->packet_timestamp_end = -1;
 ffio_init_context(&asf->pb, asf->packet_buf, s->packet_size, 1,
- NULL, NULL, NULL, NULL);
+ NULL, NULL, NULL, NULL);
 
 return 0;
 }
@@ -591,30 +649,25 @@
 return asf_write_header(s);
 }
 
-static int put_payload_parsing_info(
- AVFormatContext *s,
- unsigned int sendtime,
- unsigned int duration,
- int nb_payloads,
- int padsize
- )
+static int put_payload_parsing_info(AVFormatContext *s,
+ unsigned sendtime, unsigned duration,
+ int nb_payloads, int padsize)
 {
 ASFContext *asf = s->priv_data;
 AVIOContext *pb = s->pb;
 int ppi_size, i;
- int64_t start= avio_tell(pb);
+ int64_t start = avio_tell(pb);
 
 int iLengthTypeFlags = ASF_PPI_LENGTH_TYPE_FLAGS;
 
 padsize -= PACKET_HEADER_MIN_SIZE;
- if(asf->multi_payloads_present)
+ if (asf->multi_payloads_present)
 padsize--;
- assert(padsize>=0);
+ assert(padsize >= 0);
 
 avio_w8(pb, ASF_PACKET_ERROR_CORRECTION_FLAGS);
- for (i = 0; i < ASF_PACKET_ERROR_CORRECTION_DATA_SIZE; i++){
+ for (i = 0; i < ASF_PACKET_ERROR_CORRECTION_DATA_SIZE; i++)
 avio_w8(pb, 0x0);
- }
 
 if (asf->multi_payloads_present)
 iLengthTypeFlags |= ASF_PPI_FLAG_MULTIPLE_PAYLOADS_PRESENT;
@@ -651,17 +704,15 @@
 
 assert(asf->packet_timestamp_end >= asf->packet_timestamp_start);
 
- if (asf->is_streamed) {
+ if (asf->is_streamed)
 put_chunk(s, 0x4424, s->packet_size, 0);
- }
 
- packet_hdr_size = put_payload_parsing_info(
- s,
- asf->packet_timestamp_start,
- asf->packet_timestamp_end - asf->packet_timestamp_start,
- asf->packet_nb_payloads,
- asf->packet_size_left
- );
+ packet_hdr_size = put_payload_parsing_info(s,
+ asf->packet_timestamp_start,
+ asf->packet_timestamp_end -
+ asf->packet_timestamp_start,
+ asf->packet_nb_payloads,
+ asf->packet_size_left);
 
 packet_filled_size = PACKET_SIZE - asf->packet_size_left;
 assert(packet_hdr_size <= asf->packet_size_left);
@@ -671,22 +722,16 @@
 
 avio_flush(s->pb);
 asf->nb_packets++;
- asf->packet_nb_payloads = 0;
+ asf->packet_nb_payloads = 0;
 asf->packet_timestamp_start = -1;
- asf->packet_timestamp_end = -1;
+ asf->packet_timestamp_end = -1;
 ffio_init_context(&asf->pb, asf->packet_buf, s->packet_size, 1,
- NULL, NULL, NULL, NULL);
+ NULL, NULL, NULL, NULL);
 }
 
-static void put_payload_header(
- AVFormatContext *s,
- ASFStream *stream,
- int presentation_time,
- int m_obj_size,
- int m_obj_offset,
- int payload_len,
- int flags
- )
+static void put_payload_header(AVFormatContext *s, ASFStream *stream,
+ int presentation_time, int m_obj_size,
+ int m_obj_offset, int payload_len, int flags)
 {
 ASFContext *asf = s->priv_data;
 AVIOContext *pb = &asf->pb;
@@ -697,8 +742,8 @@
 val |= ASF_PL_FLAG_KEY_FRAME;
 avio_w8(pb, val);
 
- avio_w8(pb, stream->seq); //Media object number
- avio_wl32(pb, m_obj_offset); //Offset Into Media Object
+ avio_w8(pb, stream->seq); // Media object number
+ avio_wl32(pb, m_obj_offset); // Offset Into Media Object
 
 // Replicated Data shall be at least 8 bytes long.
 // The first 4 bytes of data shall contain the
@@ -707,23 +752,17 @@
 // Presentation Time for the media object that the payload belongs to.
 avio_w8(pb, ASF_PAYLOAD_REPLICATED_DATA_LENGTH);
 
- avio_wl32(pb, m_obj_size); //Replicated Data - Media Object Size
- avio_wl32(pb, presentation_time);//Replicated Data - Presentation Time
+ avio_wl32(pb, m_obj_size); // Replicated Data - Media Object Size
+ avio_wl32(pb, presentation_time); // Replicated Data - Presentation Time
 
- if (asf->multi_payloads_present){
- avio_wl16(pb, payload_len); //payload length
+ if (asf->multi_payloads_present) {
+ avio_wl16(pb, payload_len); // payload length
 }
 }
 
-static void put_frame(
- AVFormatContext *s,
- ASFStream *stream,
- AVStream *avst,
- int timestamp,
- const uint8_t *buf,
- int m_obj_size,
- int flags
- )
+static void put_frame(AVFormatContext *s, ASFStream *stream, AVStream *avst,
+ int timestamp, const uint8_t *buf,
+ int m_obj_size, int flags)
 {
 ASFContext *asf = s->priv_data;
 int m_obj_offset, payload_len, frag_len1;
@@ -735,19 +774,20 @@
 asf->multi_payloads_present = (payload_len < MULTI_PAYLOAD_CONSTANT);
 
 asf->packet_size_left = PACKET_SIZE;
- if (asf->multi_payloads_present){
+ if (asf->multi_payloads_present) {
 frag_len1 = MULTI_PAYLOAD_CONSTANT - 1;
- }
- else {
+ } else {
 frag_len1 = SINGLE_PAYLOAD_DATA_LENGTH;
 }
 asf->packet_timestamp_start = timestamp;
- }
- else {
+ } else {
 // multi payloads
- frag_len1 = asf->packet_size_left - PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS - PACKET_HEADER_MIN_SIZE - 1;
+ frag_len1 = asf->packet_size_left -
+ PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS -
+ PACKET_HEADER_MIN_SIZE - 1;
 
- if(frag_len1 < payload_len && avst->codec->codec_type == AVMEDIA_TYPE_AUDIO){
+ if (frag_len1 < payload_len &&
+ avst->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
 flush_packet(s);
 continue;
 }
@@ -756,9 +796,10 @@
 if (payload_len > frag_len1)
 payload_len = frag_len1;
 else if (payload_len == (frag_len1 - 1))
- payload_len = frag_len1 - 2; //additional byte need to put padding length
+ payload_len = frag_len1 - 2; // additional byte need to put padding length
 
- put_payload_header(s, stream, timestamp+PREROLL_TIME, m_obj_size, m_obj_offset, payload_len, flags);
+ put_payload_header(s, stream, timestamp + PREROLL_TIME,
+ m_obj_size, m_obj_offset, payload_len, flags);
 avio_write(&asf->pb, buf, payload_len);
 
 if (asf->multi_payloads_present)
@@ -772,7 +813,7 @@
 payload_len = 0;
 }
 m_obj_offset += payload_len;
- buf += payload_len;
+ buf += payload_len;
 
 if (!asf->multi_payloads_present)
 flush_packet(s);
@@ -785,61 +826,73 @@
 static int asf_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
 ASFContext *asf = s->priv_data;
+ AVIOContext *pb = s->pb;
 ASFStream *stream;
 int64_t duration;
 AVCodecContext *codec;
- int64_t packet_st,pts;
- int start_sec,i;
- int flags= pkt->flags;
+ int64_t packet_st, pts;
+ int start_sec, i;
+ int flags = pkt->flags;
+ uint64_t offset = avio_tell(pb);
 
- codec = s->streams[pkt->stream_index]->codec;
+ codec = s->streams[pkt->stream_index]->codec;
 stream = &asf->streams[pkt->stream_index];
 
- if(codec->codec_type == AVMEDIA_TYPE_AUDIO)
+ if (codec->codec_type == AVMEDIA_TYPE_AUDIO)
 flags &= ~AV_PKT_FLAG_KEY;
 
 pts = (pkt->pts != AV_NOPTS_VALUE) ? pkt->pts : pkt->dts;
 assert(pts != AV_NOPTS_VALUE);
- duration = pts * 10000;
- asf->duration= FFMAX(asf->duration, duration + pkt->duration * 10000);
+ duration = pts * 10000;
+ asf->duration = FFMAX(asf->duration, duration + pkt->duration * 10000);
 
 packet_st = asf->nb_packets;
- put_frame(s, stream, s->streams[pkt->stream_index], pkt->dts, pkt->data, pkt->size, flags);
+ put_frame(s, stream, s->streams[pkt->stream_index],
+ pkt->dts, pkt->data, pkt->size, flags);
 
 /* check index */
 if ((!asf->is_streamed) && (flags & AV_PKT_FLAG_KEY)) {
 start_sec = (int)(duration / INT64_C(10000000));
 if (start_sec != (int)(asf->last_indexed_pts / INT64_C(10000000))) {
- for(i=asf->nb_index_count;i<start_sec;i++) {
- if (i>=asf->nb_index_memory_alloc) {
+ for (i = asf->nb_index_count; i < start_sec; i++) {
+ if (i >= asf->nb_index_memory_alloc) {
+ int err;
 asf->nb_index_memory_alloc += ASF_INDEX_BLOCK;
- asf->index_ptr = (ASFIndex*)av_realloc( asf->index_ptr, sizeof(ASFIndex) * asf->nb_index_memory_alloc );
+ if ((err = av_reallocp_array(&asf->index_ptr,
+ asf->nb_index_memory_alloc,
+ sizeof(*asf->index_ptr))) < 0) {
+ asf->nb_index_memory_alloc = 0;
+ return err;
+ }
 }
 // store
 asf->index_ptr[i].packet_number = (uint32_t)packet_st;
- asf->index_ptr[i].packet_count = (uint16_t)(asf->nb_packets-packet_st);
- asf->maximum_packet = FFMAX(asf->maximum_packet, (uint16_t)(asf->nb_packets-packet_st));
+ asf->index_ptr[i].packet_count = (uint16_t)(asf->nb_packets - packet_st);
+ asf->index_ptr[i].send_time = start_sec * INT64_C(10000000);
+ asf->index_ptr[i].offset = offset;
+ asf->maximum_packet = FFMAX(asf->maximum_packet,
+ (uint16_t)(asf->nb_packets - packet_st));
 }
- asf->nb_index_count = start_sec;
+ asf->nb_index_count = start_sec;
 asf->last_indexed_pts = duration;
 }
 }
 return 0;
 }
 
-//
-static int asf_write_index(AVFormatContext *s, ASFIndex *index, uint16_t max, uint32_t count)
+static int asf_write_index(AVFormatContext *s, ASFIndex *index,
+ uint16_t max, uint32_t count)
 {
 AVIOContext *pb = s->pb;
 int i;
 
 put_guid(pb, &ff_asf_simple_index_header);
- avio_wl64(pb, 24 + 16 + 8 + 4 + 4 + (4 + 2)*count);
+ avio_wl64(pb, 24 + 16 + 8 + 4 + 4 + (4 + 2) * count);
 put_guid(pb, &ff_asf_my_guid);
 avio_wl64(pb, ASF_INDEXED_INTERVAL);
 avio_wl32(pb, max);
 avio_wl32(pb, count);
- for(i=0; i<count; i++) {
+ for (i = 0; i < count; i++) {
 avio_wl32(pb, index[i].packet_number);
 avio_wl16(pb, index[i].packet_count);
 }
@@ -850,7 +903,7 @@
 static int asf_write_trailer(AVFormatContext *s)
 {
 ASFContext *asf = s->priv_data;
- int64_t file_size,data_size;
+ int64_t file_size, data_size;
 
 /* flush the current packet */
 if (asf->pb.buf_ptr > asf->pb.buffer)
@@ -858,9 +911,8 @@
 
 /* write index */
 data_size = avio_tell(s->pb);
- if ((!asf->is_streamed) && (asf->nb_index_count != 0)) {
+ if ((!asf->is_streamed) && (asf->nb_index_count != 0))
 asf_write_index(s, asf->index_ptr, asf->maximum_packet, asf->nb_index_count);
- }
 avio_flush(s->pb);
 
 if (asf->is_streamed || !s->pb->seekable) {
@@ -889,11 +941,11 @@
 .write_packet = asf_write_packet,
 .write_trailer = asf_write_trailer,
 .flags = AVFMT_GLOBALHEADER,
- .codec_tag = (const AVCodecTag* const []){
+ .codec_tag = (const AVCodecTag * const []) {
 codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0
 },
 };
-#endif
+#endif /* CONFIG_ASF_MUXER */
 
 #if CONFIG_ASF_STREAM_MUXER
 AVOutputFormat ff_asf_stream_muxer = {
@@ -908,8 +960,8 @@
 .write_packet = asf_write_packet,
 .write_trailer = asf_write_trailer,
 .flags = AVFMT_GLOBALHEADER,
- .codec_tag = (const AVCodecTag* const []){
+ .codec_tag = (const AVCodecTag * const []) {
 codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0
 },
 };
-#endif //CONFIG_ASF_STREAM_MUXER
+#endif /* CONFIG_ASF_STREAM_MUXER */

libav-v9.6.tar.bz2/libavformat/assdec.c -> libav-v10.1.tar.bz2/libavformat/assdec.c Changed

libav-v9.6.tar.bz2/libavformat/assenc.c -> libav-v10.1.tar.bz2/libavformat/assenc.c Changed

libav-v9.6.tar.bz2/libavformat/au.c -> libav-v10.1.tar.bz2/libavformat/au.c Changed

@@ -2,6 +2,8 @@
 * AU muxer and demuxer
 * Copyright (c) 2001 Fabrice Bellard
 *
+ * first version by Francois Revol <revol@free.fr>
+ *
 * This file is part of Libav.
 *
 * Libav is free software; you can redistribute it and/or
@@ -20,8 +22,6 @@
 */
 
 /*
- * First version by Francois Revol revol@free.fr
- *
 * Reference documents:
 * http://www.opengroup.org/public/pubs/external/auformat.html
 * http://www.goice.co.jp/member/mo/formats/au.html
@@ -32,24 +32,22 @@
 #include "avio_internal.h"
 #include "pcm.h"
 
-/* The libavcodec codecs we support, and the IDs they have in the file */
 static const AVCodecTag codec_au_tags[] = {
- { AV_CODEC_ID_PCM_MULAW, 1 },
- { AV_CODEC_ID_PCM_S8, 2 },
- { AV_CODEC_ID_PCM_S16BE, 3 },
- { AV_CODEC_ID_PCM_S24BE, 4 },
- { AV_CODEC_ID_PCM_S32BE, 5 },
- { AV_CODEC_ID_PCM_F32BE, 6 },
- { AV_CODEC_ID_PCM_F64BE, 7 },
- { AV_CODEC_ID_PCM_ALAW, 27 },
- { AV_CODEC_ID_NONE, 0 },
+ { AV_CODEC_ID_PCM_MULAW, 1 },
+ { AV_CODEC_ID_PCM_S8, 2 },
+ { AV_CODEC_ID_PCM_S16BE, 3 },
+ { AV_CODEC_ID_PCM_S24BE, 4 },
+ { AV_CODEC_ID_PCM_S32BE, 5 },
+ { AV_CODEC_ID_PCM_F32BE, 6 },
+ { AV_CODEC_ID_PCM_F64BE, 7 },
+ { AV_CODEC_ID_PCM_ALAW, 27 },
+ { AV_CODEC_ID_NONE, 0 },
 };
 
 #if CONFIG_AU_DEMUXER
 
 static int au_probe(AVProbeData *p)
 {
- /* check file header */
 if (p->buf[0] == '.' && p->buf[1] == 's' &&
 p->buf[2] == 'n' && p->buf[3] == 'd')
 return AVPROBE_SCORE_MAX;
@@ -57,143 +55,149 @@
 return 0;
 }
 
-/* au input */
+#define BLOCK_SIZE 1024
+
 static int au_read_header(AVFormatContext *s)
 {
 int size;
 unsigned int tag;
 AVIOContext *pb = s->pb;
 unsigned int id, channels, rate;
+ int bps;
 enum AVCodecID codec;
 AVStream *st;
 
- /* check ".snd" header */
 tag = avio_rl32(pb);
 if (tag != MKTAG('.', 's', 'n', 'd'))
- return -1;
+ return AVERROR_INVALIDDATA;
 size = avio_rb32(pb); /* header size */
- avio_rb32(pb); /* data size */
+ avio_rb32(pb); /* data size */
 
- id = avio_rb32(pb);
- rate = avio_rb32(pb);
+ id = avio_rb32(pb);
+ rate = avio_rb32(pb);
 channels = avio_rb32(pb);
 
+ if (size > 24) {
+ /* skip unused data */
+ avio_skip(pb, size - 24);
+ }
+
 codec = ff_codec_get_id(codec_au_tags, id);
 
- if (!av_get_bits_per_sample(codec)) {
- av_log_ask_for_sample(s, "could not determine bits per sample\n");
+ if (codec == AV_CODEC_ID_NONE) {
+ avpriv_request_sample(s, "unknown or unsupported codec tag: %u", id);
 return AVERROR_PATCHWELCOME;
 }
 
- if (channels == 0 || channels > 64) {
- av_log(s, AV_LOG_ERROR, "Invalid number of channels %d\n", channels);
+ bps = av_get_bits_per_sample(codec);
+ if (!bps) {
+ avpriv_request_sample(s, "Unknown bits per sample");
+ return AVERROR_PATCHWELCOME;
+ }
+
+ if (channels == 0 || channels >= INT_MAX / (BLOCK_SIZE * bps >> 3)) {
+ av_log(s, AV_LOG_ERROR, "Invalid number of channels %u\n", channels);
 return AVERROR_INVALIDDATA;
 }
 
- if (size >= 24) {
- /* skip unused data */
- avio_skip(pb, size - 24);
+ if (rate == 0 || rate > INT_MAX) {
+ av_log(s, AV_LOG_ERROR, "Invalid sample rate: %u\n", rate);
+ return AVERROR_INVALIDDATA;
 }
 
- /* now we are ready: build format streams */
 st = avformat_new_stream(s, NULL);
 if (!st)
- return -1;
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_tag = id;
- st->codec->codec_id = codec;
- st->codec->channels = channels;
+ return AVERROR(ENOMEM);
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codec->codec_tag = id;
+ st->codec->codec_id = codec;
+ st->codec->channels = channels;
 st->codec->sample_rate = rate;
+ st->codec->bit_rate = channels * rate * bps;
+ st->codec->block_align = channels * bps >> 3;
+
+ st->start_time = 0;
 avpriv_set_pts_info(st, 64, 1, rate);
+
 return 0;
 }
 
-#define BLOCK_SIZE 1024
-
-static int au_read_packet(AVFormatContext *s,
- AVPacket *pkt)
+static int au_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
 int ret;
 
- ret= av_get_packet(s->pb, pkt, BLOCK_SIZE *
- s->streams[0]->codec->channels *
- av_get_bits_per_sample(s->streams[0]->codec->codec_id) >> 3);
+ ret = av_get_packet(s->pb, pkt, BLOCK_SIZE *
+ s->streams[0]->codec->block_align);
 if (ret < 0)
 return ret;
+
 pkt->stream_index = 0;
+ pkt->duration = ret / s->streams[0]->codec->block_align;
 
- /* note: we need to modify the packet size here to handle the last
- packet */
- pkt->size = ret;
 return 0;
 }
 
 AVInputFormat ff_au_demuxer = {
- .name = "au",
- .long_name = NULL_IF_CONFIG_SMALL("Sun AU"),
- .read_probe = au_probe,
- .read_header = au_read_header,
- .read_packet = au_read_packet,
- .read_seek = ff_pcm_read_seek,
- .codec_tag = (const AVCodecTag* const []){ codec_au_tags, 0 },
+ .name = "au",
+ .long_name = NULL_IF_CONFIG_SMALL("Sun AU"),
+ .read_probe = au_probe,
+ .read_header = au_read_header,
+ .read_packet = au_read_packet,
+ .read_seek = ff_pcm_read_seek,
+ .codec_tag = (const AVCodecTag* const []) { codec_au_tags, 0 },
 };
+
 #endif /* CONFIG_AU_DEMUXER */
 
 #if CONFIG_AU_MUXER
 
+#include "rawenc.h"
+
 /* if we don't know the size in advance */
 #define AU_UNKNOWN_SIZE ((uint32_t)(~0))
 
 /* AUDIO_FILE header */
 static int put_au_header(AVIOContext *pb, AVCodecContext *enc)
 {
- if(!enc->codec_tag)
- return -1;
- ffio_wfourcc(pb, ".snd"); /* magic number */
- avio_wb32(pb, 24); /* header size */
- avio_wb32(pb, AU_UNKNOWN_SIZE); /* data size */
- avio_wb32(pb, (uint32_t)enc->codec_tag); /* codec ID */
+ if (!enc->codec_tag)
+ return AVERROR(EINVAL);
+
+ ffio_wfourcc(pb, ".snd"); /* magic number */
+ avio_wb32(pb, 24); /* header size */
+ avio_wb32(pb, AU_UNKNOWN_SIZE); /* data size */
+ avio_wb32(pb, enc->codec_tag); /* codec ID */
 avio_wb32(pb, enc->sample_rate);
- avio_wb32(pb, (uint32_t)enc->channels);
+ avio_wb32(pb, enc->channels);
+
 return 0;
 }
 
 static int au_write_header(AVFormatContext *s)
 {
 AVIOContext *pb = s->pb;
+ int ret;
 
 s->priv_data = NULL;
 
- /* format header */
- if (put_au_header(pb, s->streams[0]->codec) < 0) {
- return -1;
- }
+ if ((ret = put_au_header(pb, s->streams[0]->codec)) < 0)
+ return ret;
 
 avio_flush(pb);
 
 return 0;
 }
 
-static int au_write_packet(AVFormatContext *s, AVPacket *pkt)
-{
- AVIOContext *pb = s->pb;
- avio_write(pb, pkt->data, pkt->size);
- return 0;
-}
-
 static int au_write_trailer(AVFormatContext *s)
 {
 AVIOContext *pb = s->pb;
 int64_t file_size;
 
 if (s->pb->seekable) {
-
 /* update file size */
 file_size = avio_tell(pb);
 avio_seek(pb, 8, SEEK_SET);
 avio_wb32(pb, (uint32_t)(file_size - 24));
 avio_seek(pb, file_size, SEEK_SET);
-
 avio_flush(pb);
 }
 
@@ -201,15 +205,16 @@
 }
 
 AVOutputFormat ff_au_muxer = {
- .name = "au",
- .long_name = NULL_IF_CONFIG_SMALL("Sun AU"),
- .mime_type = "audio/basic",
- .extensions = "au",
- .audio_codec = AV_CODEC_ID_PCM_S16BE,
- .video_codec = AV_CODEC_ID_NONE,
- .write_header = au_write_header,
- .write_packet = au_write_packet,
- .write_trailer = au_write_trailer,
- .codec_tag = (const AVCodecTag* const []){ codec_au_tags, 0 },
+ .name = "au",
+ .long_name = NULL_IF_CONFIG_SMALL("Sun AU"),
+ .mime_type = "audio/basic",
+ .extensions = "au",
+ .audio_codec = AV_CODEC_ID_PCM_S16BE,
+ .video_codec = AV_CODEC_ID_NONE,
+ .write_header = au_write_header,
+ .write_packet = ff_raw_write_packet,
+ .write_trailer = au_write_trailer,
+ .codec_tag = (const AVCodecTag* const []) { codec_au_tags, 0 },
 };
+
 #endif /* CONFIG_AU_MUXER */

libav-v9.6.tar.bz2/libavformat/audiointerleave.c -> libav-v10.1.tar.bz2/libavformat/audiointerleave.c Changed

libav-v9.6.tar.bz2/libavformat/avformat.h -> libav-v10.1.tar.bz2/libavformat/avformat.h Changed

@@ -158,9 +158,9 @@
 * information will be in AVStream.time_base units, i.e. it has to be
 * multiplied by the timebase to convert them to seconds.
 *
- * If AVPacket.destruct is set on the returned packet, then the packet is
+ * If AVPacket.buf is set on the returned packet, then the packet is
 * allocated dynamically and the user may keep it indefinitely.
- * Otherwise, if AVPacket.destruct is NULL, the packet data is backed by a
+ * Otherwise, if AVPacket.buf is NULL, the packet data is backed by a
 * static storage somewhere inside the demuxer and the packet is only valid
 * until the next av_read_frame() call or closing the file. If the caller
 * requires a longer lifetime, av_dup_packet() will make an av_malloc()ed copy
@@ -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
@@ -207,10 +259,6 @@
 #include "avio.h"
 #include "libavformat/version.h"
 
-#if FF_API_AV_GETTIME
-#include "libavutil/time.h"
-#endif
-
 struct AVFormatContext;
 
 
@@ -294,6 +342,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
@@ -309,6 +358,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
@@ -341,7 +391,9 @@
 int buf_size; /**< Size of buf except extra allocated bytes */
 } AVProbeData;
 
-#define AVPROBE_SCORE_MAX 100 ///< maximum score, half of that is used for file-extension-based detection
+#define AVPROBE_SCORE_EXTENSION 50 ///< score for file extension
+#define AVPROBE_SCORE_MAX 100 ///< maximum score
+
 #define AVPROBE_PADDING_SIZE 32 ///< extra allocated bytes at the end of the probe buffer
 
 /// Demuxer will use avio_open, no opened file should be provided by the caller.
@@ -357,13 +409,18 @@
 #define AVFMT_VARIABLE_FPS 0x0400 /**< Format allows variable fps. */
 #define AVFMT_NODIMENSIONS 0x0800 /**< Format does not need width/height */
 #define AVFMT_NOSTREAMS 0x1000 /**< Format does not require any streams */
-#define AVFMT_NOBINSEARCH 0x2000 /**< Format does not allow to fallback to binary search via read_timestamp */
-#define AVFMT_NOGENSEARCH 0x4000 /**< Format does not allow to fallback to generic search */
+#define AVFMT_NOBINSEARCH 0x2000 /**< Format does not allow to fall back on binary search via read_timestamp */
+#define AVFMT_NOGENSEARCH 0x4000 /**< Format does not allow to fall back on generic search */
 #define AVFMT_NO_BYTE_SEEK 0x8000 /**< Format does not allow seeking by bytes */
 #define AVFMT_ALLOW_FLUSH 0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */
 #define AVFMT_TS_NONSTRICT 0x20000 /**< Format does not require strictly
 increasing timestamps, but they must
 still be monotonic */
+#define AVFMT_TS_NEGATIVE 0x40000 /**< Format allows muxing negative
+ timestamps. If not set the timestamp
+ will be shifted in av_write_frame and
+ av_interleaved_write_frame so they
+ start from 0. */
 
 /**
 * @addtogroup lavf_encoding
@@ -636,17 +693,6 @@
 * not actually used for encoding.
 */
 AVCodecContext *codec;
-#if FF_API_R_FRAME_RATE
- /**
- * Real base framerate of the stream.
- * This is the lowest framerate with which all timestamps can be
- * represented accurately (it is the least common multiple of all
- * framerates in the stream). Note, this value is just a guess!
- * For example, if the time base is 1/90000 and all frames have either
- * approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
- */
- AVRational r_frame_rate;
-#endif
 void *priv_data;
 
 /**
@@ -722,12 +768,6 @@
 */
 #define MAX_STD_TIMEBASES (60*12+5)
 struct {
-#if FF_API_R_FRAME_RATE
- int64_t last_dts;
- int64_t duration_gcd;
- int duration_count;
- double duration_error[MAX_STD_TIMEBASES];
-#endif
 int nb_decoded_frames;
 int found_decoder;
 
@@ -743,15 +783,12 @@
 
 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 avconv, 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.
- *
- * Initialized when AVCodecParserContext.dts_sync_point >= 0 and
- * 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;
@@ -813,6 +850,8 @@
 AVDictionary *metadata;
 } AVChapter;
 
+typedef struct AVFormatInternal AVFormatInternal;
+
 /**
 * Format I/O context.
 * New fields can be added to the end with minor version bumps.
@@ -823,32 +862,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
@@ -860,36 +908,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 Libav can compute it automatically.
 */
@@ -908,15 +973,19 @@
 #define AVFMT_FLAG_NOBUFFER 0x0040 ///< Do not buffer frames when possible
 #define AVFMT_FLAG_CUSTOM_IO 0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.
 #define AVFMT_FLAG_DISCARD_CORRUPT 0x0100 ///< Discard frames marked corrupted
+#define AVFMT_FLAG_FLUSH_PACKETS 0x0200 ///< Flush the AVIOContext every packet.
 
 /**
- * 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;
 
@@ -951,8 +1020,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;
 
@@ -962,38 +1031,57 @@
 */
 unsigned int max_picture_buffer;
 
+ /**
+ * Number of chapters in AVChapter array.
+ * When muxing, chapters are normally written in the file header,
+ * so nb_chapters should normally be initialized before write_header
+ * is called. Some muxers (e.g. mov and mkv) can also write chapters
+ * 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
+ */
 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.
@@ -1005,6 +1093,25 @@
 */
 int debug;
 #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;
+
 /*****************************************************************
 * All fields below this line are not part of the public API. They
 * may not be used outside of libavformat and can be changed and
@@ -1042,6 +1149,23 @@
 */
 #define RAW_PACKET_BUFFER_SIZE 2500000
 int raw_packet_buffer_remaining_size;
+
+ /**
+ * Offset to remap timestamps to be non-negative.
+ * Expressed in timebase units.
+ */
+ int64_t offset;
+
+ /**
+ * Timebase for the timestamp offset.
+ */
+ AVRational offset_timebase;
+
+ /**
+ * An opaque field for libavformat internal usage.
+ * Must not be accessed in any way by callers.
+ */
+ AVFormatInternal *internal;
 } AVFormatContext;
 
 typedef struct AVPacketList {
@@ -1147,6 +1271,7 @@
 *
 * When muxing, should be called by the user before avformat_write_header().
 *
+ * @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.
@@ -1175,6 +1300,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.
 */
@@ -1183,6 +1309,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
@@ -1214,7 +1341,7 @@
 
 /**
 * Open an input stream and read the header. The codecs are not opened.
- * The stream must be closed with av_close_input_file().
+ * The stream must be closed with avformat_close_input().
 *
 * @param ps Pointer to user-supplied AVFormatContext (allocated by avformat_alloc_context).
 * May be a pointer to NULL, in which case an AVFormatContext is allocated by this
@@ -1287,24 +1414,6 @@
 AVCodec **decoder_ret,
 int flags);
 
-#if FF_API_READ_PACKET
-/**
- * @deprecated use AVFMT_FLAG_NOFILLIN | AVFMT_FLAG_NOPARSE to read raw
- * unprocessed packets
- *
- * Read a transport packet from a media file.
- *
- * This function is obsolete and should never be used.
- * Use av_read_frame() instead.
- *
- * @param s media file handle
- * @param pkt is filled
- * @return 0 if OK, AVERROR_xxx on error
- */
-attribute_deprecated
-int av_read_packet(AVFormatContext *s, AVPacket *pkt);
-#endif
-
 /**
 * Return the next frame of a stream.
 * This function returns what is stored in the file, and does not validate
@@ -1313,9 +1422,9 @@
 * omit invalid data between valid frames so as to give the decoder the maximum
 * information possible for decoding.
 *
- * If pkt->destruct is NULL, then the packet is valid until the next
- * av_read_frame() or until av_close_input_file(). Otherwise the packet is valid
- * indefinitely. In both cases the packet must be freed with
+ * If pkt->buf is NULL, then the packet is valid until the next
+ * av_read_frame() or until avformat_close_input(). Otherwise the packet
+ * is valid indefinitely. In both cases the packet must be freed with
 * av_free_packet when it is no longer needed. For video, the packet contains
 * exactly one frame. For audio, it contains an integer number of frames if each
 * frame has a known fixed size (e.g. PCM or ADPCM data). If the audio frames
@@ -1334,6 +1443,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.
@@ -1360,6 +1471,7 @@
 * If flags contain AVSEEK_FLAG_ANY, then non-keyframes are treated as
 * keyframes (this may not be supported by all demuxers).
 *
+ * @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
@@ -1386,17 +1498,6 @@
 */
 int av_read_pause(AVFormatContext *s);
 
-#if FF_API_CLOSE_INPUT_FILE
-/**
- * @deprecated use avformat_close_input()
- * Close a media file (but not its codecs).
- *
- * @param s media file handle
- */
-attribute_deprecated
-void av_close_input_file(AVFormatContext *s);
-#endif
-
 /**
 * Close an opened input AVFormatContext. Free it and all its contents
 * and set *s to NULL.
@@ -1421,7 +1522,7 @@
 *
 * @param s Media file handle, must be allocated with avformat_alloc_context().
 * Its oformat field must be set to the desired output format;
- * Its pb field must be set to an already openened AVIOContext.
+ * Its pb field must be set to an already opened AVIOContext.
 * @param options An AVDictionary filled with AVFormatContext and muxer-private options.
 * On return this parameter will be destroyed and replaced with a dict containing
 * options that were not found. May be NULL.
@@ -1435,59 +1536,70 @@
 /**
 * 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).
+ * 
+ * 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.
+ * 
+ * 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. Libavformat takes
- * ownership of the data and will free it when it sees fit using the packet's
- * @ref AVPacket.destruct "destruct" field. The caller must not access the data
- * after this function returns, as it may already be freed.
- * 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.
+ * 
+ * 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.
+ * 
+ * This parameter 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. 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);
 
-#if FF_API_INTERLEAVE_PACKET
-/**
- * @deprecated this function was never meant to be called by the user
- * programs.
- */
-attribute_deprecated
-int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
- AVPacket *pkt, int flush);
-#endif
-
 /**
 * Write the stream trailer to an output media file and free the
 * file private data.
@@ -1592,6 +1704,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);
 
@@ -1601,6 +1714,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);
 
@@ -1608,6 +1722,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 >=
@@ -1704,6 +1821,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);
@@ -1711,6 +1829,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.

libav-v9.6.tar.bz2/libavformat/avidec.c -> libav-v10.1.tar.bz2/libavformat/avidec.c Changed

@@ -19,37 +19,41 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include "libavutil/intreadwrite.h"
-#include "libavutil/mathematics.h"
+#include <stdint.h>
+
+#include "libavutil/avstring.h"
 #include "libavutil/bswap.h"
 #include "libavutil/dict.h"
-#include "libavutil/avstring.h"
+#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/mathematics.h"
 #include "avformat.h"
-#include "internal.h"
 #include "avi.h"
 #include "dv.h"
+#include "internal.h"
 #include "riff.h"
 
 #undef NDEBUG
 #include <assert.h>
 
 typedef struct AVIStream {
- int64_t frame_offset; /* current frame (video) or byte (audio) counter
- (used to compute the pts) */
+ int64_t frame_offset; /* current frame (video) or byte (audio) counter
+ * (used to compute the pts) */
 int remaining;
 int packet_size;
 
 uint32_t scale;
 uint32_t rate;
- int sample_size; /* size of one sample (or packet) (in the rate/scale sense) in bytes */
+ int sample_size; /* size of one sample (or packet)
+ * (in the rate/scale sense) in bytes */
 
- int64_t cum_len; /* temporary storage (used during seek) */
-
- int prefix; ///< normally 'd'<<8 + 'c' or 'w'<<8 + 'b'
+ int64_t cum_len; /* temporary storage (used during seek) */
+ int prefix; /* normally 'd'<<8 + 'c' or 'w'<<8 + 'b' */
 int prefix_count;
 uint32_t pal[256];
 int has_pal;
- int dshow_block_align; ///< block align variable used to emulate bugs in the MS dshow demuxer
+ int dshow_block_align; /* block align variable used to emulate bugs in
+ * the MS dshow demuxer */
 
 AVFormatContext *sub_ctx;
 AVPacket sub_pkt;
@@ -57,26 +61,26 @@
 } AVIStream;
 
 typedef struct {
- int64_t riff_end;
- int64_t movi_end;
- int64_t fsize;
+ int64_t riff_end;
+ int64_t movi_end;
+ int64_t fsize;
 int64_t movi_list;
 int64_t last_pkt_pos;
 int index_loaded;
 int is_odml;
 int non_interleaved;
 int stream_index;
- DVDemuxContext* dv_demux;
+ DVDemuxContext *dv_demux;
 int odml_depth;
 #define MAX_ODML_DEPTH 1000
 } AVIContext;
 
 static const char avi_headers[][8] = {
- { 'R', 'I', 'F', 'F', 'A', 'V', 'I', ' ' },
- { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 'X' },
- { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 0x19},
- { 'O', 'N', '2', ' ', 'O', 'N', '2', 'f' },
- { 'R', 'I', 'F', 'F', 'A', 'M', 'V', ' ' },
+ { 'R', 'I', 'F', 'F', 'A', 'V', 'I', ' ' },
+ { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 'X' },
+ { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 0x19 },
+ { 'O', 'N', '2', ' ', 'O', 'N', '2', 'f' },
+ { 'R', 'I', 'F', 'F', 'A', 'M', 'V', ' ' },
 { 0 }
 };
 
@@ -88,20 +92,21 @@
 static int avi_load_index(AVFormatContext *s);
 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, \
- (tag >> 8) & 0xff, \
- (tag >> 16) & 0xff, \
- (tag >> 24) & 0xff, \
- size)
+#define print_tag(str, tag, size) \
+ av_dlog(NULL, "%s: tag=%c%c%c%c size=0x%x\n", \
+ str, tag & 0xff, \
+ (tag >> 8) & 0xff, \
+ (tag >> 16) & 0xff, \
+ (tag >> 24) & 0xff, \
+ size)
 
-static inline int get_duration(AVIStream *ast, int len){
- if(ast->sample_size){
+static inline int get_duration(AVIStream *ast, int len)
+{
+ if (ast->sample_size)
 return len;
- }else if (ast->dshow_block_align){
- return (len + ast->dshow_block_align - 1)/ast->dshow_block_align;
- }else
+ else if (ast->dshow_block_align)
+ return (len + ast->dshow_block_align - 1) / ast->dshow_block_align;
+ else
 return 1;
 }
 
@@ -113,101 +118,113 @@
 
 /* check RIFF header */
 avio_read(pb, header, 4);
- avi->riff_end = avio_rl32(pb); /* RIFF chunk size */
+ avi->riff_end = avio_rl32(pb); /* RIFF chunk size */
 avi->riff_end += avio_tell(pb); /* RIFF chunk end */
- avio_read(pb, header+4, 4);
+ avio_read(pb, header + 4, 4);
 
- for(i=0; avi_headers[i][0]; i++)
- if(!memcmp(header, avi_headers[i], 8))
+ for (i = 0; avi_headers[i][0]; i++)
+ if (!memcmp(header, avi_headers[i], 8))
 break;
- if(!avi_headers[i][0])
- return -1;
+ if (!avi_headers[i][0])
+ return AVERROR_INVALIDDATA;
 
- if(header[7] == 0x19)
- av_log(s, AV_LOG_INFO, "This file has been generated by a totally broken muxer.\n");
+ if (header[7] == 0x19)
+ av_log(s, AV_LOG_INFO,
+ "This file has been generated by a totally broken muxer.\n");
 
 return 0;
 }
 
-static int read_braindead_odml_indx(AVFormatContext *s, int frame_num){
- AVIContext *avi = s->priv_data;
- AVIOContext *pb = s->pb;
- int longs_pre_entry= avio_rl16(pb);
- int index_sub_type = avio_r8(pb);
- int index_type = avio_r8(pb);
- int entries_in_use = avio_rl32(pb);
- int chunk_id = avio_rl32(pb);
- int64_t base = avio_rl64(pb);
- int stream_id= 10*((chunk_id&0xFF) - '0') + (((chunk_id>>8)&0xFF) - '0');
+static int read_braindead_odml_indx(AVFormatContext *s, int frame_num)
+{
+ AVIContext *avi = s->priv_data;
+ AVIOContext *pb = s->pb;
+ int longs_pre_entry = avio_rl16(pb);
+ int index_sub_type = avio_r8(pb);
+ int index_type = avio_r8(pb);
+ int entries_in_use = avio_rl32(pb);
+ int chunk_id = avio_rl32(pb);
+ int64_t base = avio_rl64(pb);
+ int stream_id = ((chunk_id & 0xFF) - '0') * 10 +
+ ((chunk_id >> 8 & 0xFF) - '0');
 AVStream *st;
 AVIStream *ast;
 int i;
- int64_t last_pos= -1;
- int64_t filesize= avio_size(s->pb);
-
- av_dlog(s, "longs_pre_entry:%d index_type:%d entries_in_use:%d chunk_id:%X base:%16"PRIX64"\n",
- longs_pre_entry,index_type, entries_in_use, chunk_id, base);
-
- if(stream_id >= s->nb_streams || stream_id < 0)
- return -1;
- st= s->streams[stream_id];
+ int64_t last_pos = -1;
+ int64_t filesize = avio_size(s->pb);
+
+ av_dlog(s,
+ "longs_pre_entry:%d index_type:%d entries_in_use:%d "
+ "chunk_id:%X base:%16"PRIX64"\n",
+ longs_pre_entry,
+ index_type,
+ entries_in_use,
+ chunk_id,
+ base);
+
+ if (stream_id >= s->nb_streams || stream_id < 0)
+ return AVERROR_INVALIDDATA;
+ st = s->streams[stream_id];
 ast = st->priv_data;
 
- if(index_sub_type)
- return -1;
+ if (index_sub_type)
+ return AVERROR_INVALIDDATA;
 
 avio_rl32(pb);
 
- if(index_type && longs_pre_entry != 2)
- return -1;
- if(index_type>1)
- return -1;
+ if (index_type && longs_pre_entry != 2)
+ return AVERROR_INVALIDDATA;
+ if (index_type > 1)
+ return AVERROR_INVALIDDATA;
 
- if(filesize > 0 && base >= filesize){
+ if (filesize > 0 && base >= filesize) {
 av_log(s, AV_LOG_ERROR, "ODML index invalid\n");
- if(base>>32 == (base & 0xFFFFFFFF) && (base & 0xFFFFFFFF) < filesize && filesize <= 0xFFFFFFFF)
+ if (base >> 32 == (base & 0xFFFFFFFF) &&
+ (base & 0xFFFFFFFF) < filesize &&
+ filesize <= 0xFFFFFFFF)
 base &= 0xFFFFFFFF;
 else
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- for(i=0; i<entries_in_use; i++){
- if(index_type){
- int64_t pos= avio_rl32(pb) + base - 8;
- int len = avio_rl32(pb);
- int key= len >= 0;
+ for (i = 0; i < entries_in_use; i++) {
+ if (index_type) {
+ int64_t pos = avio_rl32(pb) + base - 8;
+ int len = avio_rl32(pb);
+ int key = len >= 0;
 len &= 0x7FFFFFFF;
 
 av_dlog(s, "pos:%"PRId64", len:%X\n", pos, len);
 
- if(pb->eof_reached)
- return -1;
+ if (pb->eof_reached)
+ return AVERROR_INVALIDDATA;
 
- if(last_pos == pos || pos == base - 8)
- avi->non_interleaved= 1;
- if(last_pos != pos && (len || !ast->sample_size))
- av_add_index_entry(st, pos, ast->cum_len, len, 0, key ? AVINDEX_KEYFRAME : 0);
+ if (last_pos == pos || pos == base - 8)
+ avi->non_interleaved = 1;
+ if (last_pos != pos && (len || !ast->sample_size))
+ av_add_index_entry(st, pos, ast->cum_len, len, 0,
+ key ? AVINDEX_KEYFRAME : 0);
 
 ast->cum_len += get_duration(ast, len);
- last_pos= pos;
- }else{
+ last_pos = pos;
+ } else {
 int64_t offset, pos;
 int duration;
 offset = avio_rl64(pb);
 avio_rl32(pb); /* size */
 duration = avio_rl32(pb);
 
- if(pb->eof_reached)
- return -1;
+ if (pb->eof_reached)
+ return AVERROR_INVALIDDATA;
 
 pos = avio_tell(pb);
 
- if(avi->odml_depth > MAX_ODML_DEPTH){
+ if (avi->odml_depth > MAX_ODML_DEPTH) {
 av_log(s, AV_LOG_ERROR, "Too deeply nested ODML indexes\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- avio_seek(pb, offset+8, SEEK_SET);
+ avio_seek(pb, offset + 8, SEEK_SET);
 avi->odml_depth++;
 read_braindead_odml_indx(s, frame_num);
 avi->odml_depth--;
@@ -216,55 +233,59 @@
 avio_seek(pb, pos, SEEK_SET);
 }
 }
- avi->index_loaded=1;
+ avi->index_loaded = 1;
 return 0;
 }
 
-static void clean_index(AVFormatContext *s){
+static void clean_index(AVFormatContext *s)
+{
 int i;
 int64_t j;
 
- for(i=0; i<s->nb_streams; i++){
- AVStream *st = s->streams[i];
+ for (i = 0; i < s->nb_streams; i++) {
+ AVStream *st = s->streams[i];
 AVIStream *ast = st->priv_data;
- int n= st->nb_index_entries;
- int max= ast->sample_size;
+ int n = st->nb_index_entries;
+ int max = ast->sample_size;
 int64_t pos, size, ts;
 
- if(n != 1 || ast->sample_size==0)
+ if (n != 1 || ast->sample_size == 0)
 continue;
 
- while(max < 1024) max+=max;
+ while (max < 1024)
+ max += max;
 
- pos= st->index_entries[0].pos;
- size= st->index_entries[0].size;
- ts= st->index_entries[0].timestamp;
+ pos = st->index_entries[0].pos;
+ size = st->index_entries[0].size;
+ ts = st->index_entries[0].timestamp;
 
- for(j=0; j<size; j+=max){
- av_add_index_entry(st, pos+j, ts+j, FFMIN(max, size-j), 0, AVINDEX_KEYFRAME);
- }
+ for (j = 0; j < size; j += max)
+ av_add_index_entry(st, pos + j, ts + j, FFMIN(max, size - j), 0,
+ AVINDEX_KEYFRAME);
 }
 }
 
-static int avi_read_tag(AVFormatContext *s, AVStream *st, uint32_t tag, uint32_t size)
+static int avi_read_tag(AVFormatContext *s, AVStream *st, uint32_t tag,
+ uint32_t size)
 {
 AVIOContext *pb = s->pb;
- char key[5] = {0}, *value;
+ char key[5] = { 0 };
+ char *value;
 
 size += (size & 1);
 
 if (size == UINT_MAX)
- return -1;
- value = av_malloc(size+1);
+ return AVERROR(EINVAL);
+ value = av_malloc(size + 1);
 if (!value)
- return -1;
+ return AVERROR(ENOMEM);
 avio_read(pb, value, size);
- value[size]=0;
+ value[size] = 0;
 
 AV_WL32(key, tag);
 
 return av_dict_set(st ? &st->metadata : &s->metadata, key, value,
- AV_DICT_DONT_STRDUP_VAL);
+ AV_DICT_DONT_STRDUP_VAL);
 }
 
 static const char months[12][4] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
@@ -277,10 +298,10 @@
 /* parse standard AVI date format (ie. "Mon Mar 10 15:04:43 2003") */
 if (sscanf(date, "%*3s%*[ ]%3s%*[ ]%2d%*[ ]%8s%*[ ]%4d",
 month, &day, time, &year) == 4) {
- for (i=0; i<12; i++)
+ for (i = 0; i < 12; i++)
 if (!av_strcasecmp(month, months[i])) {
 snprintf(buffer, sizeof(buffer), "%.4d-%.2d-%.2d %s",
- year, i+1, day, time);
+ year, i + 1, day, time);
 av_dict_set(metadata, "creation_time", buffer, 0);
 }
 } else if (date[4] == '/' && date[7] == '/') {
@@ -295,19 +316,25 @@
 uint32_t tag = avio_rl32(s->pb);
 uint32_t size = avio_rl32(s->pb);
 switch (tag) {
- case MKTAG('n', 'c', 't', 'g'): { /* Nikon Tags */
+ case MKTAG('n', 'c', 't', 'g'): /* Nikon Tags */
+ {
 uint64_t tag_end = avio_tell(s->pb) + size;
 while (avio_tell(s->pb) < tag_end) {
- uint16_t tag = avio_rl16(s->pb);
- uint16_t size = avio_rl16(s->pb);
+ uint16_t tag = avio_rl16(s->pb);
+ uint16_t size = avio_rl16(s->pb);
 const char *name = NULL;
- char buffer[64] = {0};
+ char buffer[64] = { 0 };
 size -= avio_read(s->pb, buffer,
- FFMIN(size, sizeof(buffer)-1));
+ FFMIN(size, sizeof(buffer) - 1));
 switch (tag) {
- case 0x03: name = "maker"; break;
- case 0x04: name = "model"; break;
- case 0x13: name = "creation_time";
+ case 0x03:
+ name = "maker";
+ break;
+ case 0x04:
+ name = "model";
+ break;
+ case 0x13:
+ name = "creation_time";
 if (buffer[4] == ':' && buffer[7] == ':')
 buffer[4] = buffer[7] = '-';
 break;
@@ -334,34 +361,35 @@
 unsigned int size;
 int i;
 AVStream *st;
- AVIStream *ast = NULL;
- int avih_width=0, avih_height=0;
- int amv_file_format=0;
- uint64_t list_end = 0;
+ AVIStream *ast = NULL;
+ int avih_width = 0, avih_height = 0;
+ int amv_file_format = 0;
+ uint64_t list_end = 0;
 int ret;
 
- avi->stream_index= -1;
+ avi->stream_index = -1;
 
- if (get_riff(s, pb) < 0)
- return -1;
+ ret = get_riff(s, pb);
+ if (ret < 0)
+ return ret;
 
 avi->fsize = avio_size(pb);
- if(avi->fsize<=0)
- avi->fsize= avi->riff_end == 8 ? INT64_MAX : avi->riff_end;
+ if (avi->fsize <= 0)
+ avi->fsize = avi->riff_end == 8 ? INT64_MAX : avi->riff_end;
 
 /* first list tag */
 stream_index = -1;
- codec_type = -1;
+ codec_type = -1;
 frame_period = 0;
- for(;;) {
+ for (;;) {
 if (pb->eof_reached)
 goto fail;
- tag = avio_rl32(pb);
+ tag = avio_rl32(pb);
 size = avio_rl32(pb);
 
 print_tag("tag", tag, size);
 
- switch(tag) {
+ switch (tag) {
 case MKTAG('L', 'I', 'S', 'T'):
 list_end = avio_tell(pb) + size;
 /* Ignored, except at start of video packets. */
@@ -371,21 +399,23 @@
 
 if (tag1 == MKTAG('m', 'o', 'v', 'i')) {
 avi->movi_list = avio_tell(pb) - 4;
- if(size) avi->movi_end = avi->movi_list + size + (size & 1);
- else avi->movi_end = avio_size(pb);
+ if (size)
+ avi->movi_end = avi->movi_list + size + (size & 1);
+ else
+ avi->movi_end = avio_size(pb);
 av_dlog(NULL, "movi end=%"PRIx64"\n", avi->movi_end);
 goto end_of_header;
- }
- else if (tag1 == MKTAG('I', 'N', 'F', 'O'))
+ } else if (tag1 == MKTAG('I', 'N', 'F', 'O'))
 ff_read_riff_info(s, size - 4);
 else if (tag1 == MKTAG('n', 'c', 'd', 't'))
 avi_read_nikon(s, list_end);
 
 break;
- case MKTAG('I', 'D', 'I', 'T'): {
- unsigned char date[64] = {0};
+ case MKTAG('I', 'D', 'I', 'T'):
+ {
+ unsigned char date[64] = { 0 };
 size += (size & 1);
- size -= avio_read(pb, date, FFMIN(size, sizeof(date)-1));
+ size -= avio_read(pb, date, FFMIN(size, sizeof(date) - 1));
 avio_skip(pb, size);
 avi_metadata_creation_time(&s->metadata, date);
 break;
@@ -395,7 +425,7 @@
 avio_skip(pb, size + (size & 1));
 break;
 case MKTAG('a', 'm', 'v', 'h'):
- amv_file_format=1;
+ amv_file_format = 1;
 case MKTAG('a', 'v', 'i', 'h'):
 /* AVI header */
 /* using frame_period is bad idea */
@@ -407,116 +437,120 @@
 avio_skip(pb, 2 * 4);
 avio_rl32(pb);
 avio_rl32(pb);
- avih_width=avio_rl32(pb);
- avih_height=avio_rl32(pb);
+ avih_width = avio_rl32(pb);
+ avih_height = avio_rl32(pb);
 
 avio_skip(pb, size - 10 * 4);
 break;
 case MKTAG('s', 't', 'r', 'h'):
 /* stream header */
 
- tag1 = avio_rl32(pb);
+ tag1 = avio_rl32(pb);
 handler = avio_rl32(pb); /* codec tag */
 
- if(tag1 == MKTAG('p', 'a', 'd', 's')){
+ if (tag1 == MKTAG('p', 'a', 'd', 's')) {
 avio_skip(pb, size - 8);
 break;
- }else{
+ } else {
 stream_index++;
 st = avformat_new_stream(s, NULL);
 if (!st)
 goto fail;
 
 st->id = stream_index;
- ast = av_mallocz(sizeof(AVIStream));
+ ast = av_mallocz(sizeof(AVIStream));
 if (!ast)
 goto fail;
 st->priv_data = ast;
 }
- if(amv_file_format)
- tag1 = stream_index ? MKTAG('a','u','d','s') : MKTAG('v','i','d','s');
+ if (amv_file_format)
+ tag1 = stream_index ? MKTAG('a', 'u', 'd', 's')
+ : MKTAG('v', 'i', 'd', 's');
 
 print_tag("strh", tag1, -1);
 
- if(tag1 == MKTAG('i', 'a', 'v', 's') || tag1 == MKTAG('i', 'v', 'a', 's')){
+ if (tag1 == MKTAG('i', 'a', 'v', 's') ||
+ tag1 == MKTAG('i', 'v', 'a', 's')) {
 int64_t dv_dur;
 
- /*
- * After some consideration -- I don't think we
- * have to support anything but DV in type1 AVIs.
- */
+ /* After some consideration -- I don't think we
+ * have to support anything but DV in type1 AVIs. */
 if (s->nb_streams != 1)
 goto fail;
 
 if (handler != MKTAG('d', 'v', 's', 'd') &&
 handler != MKTAG('d', 'v', 'h', 'd') &&
 handler != MKTAG('d', 'v', 's', 'l'))
- goto fail;
+ goto fail;
 
 ast = s->streams[0]->priv_data;
 av_freep(&s->streams[0]->codec->extradata);
 av_freep(&s->streams[0]->codec);
+ av_freep(&s->streams[0]->info);
 av_freep(&s->streams[0]);
 s->nb_streams = 0;
 if (CONFIG_DV_DEMUXER) {
 avi->dv_demux = avpriv_dv_init_demux(s);
 if (!avi->dv_demux)
 goto fail;
- }
+ } else
+ goto fail;
 s->streams[0]->priv_data = ast;
 avio_skip(pb, 3 * 4);
 ast->scale = avio_rl32(pb);
- ast->rate = avio_rl32(pb);
+ ast->rate = avio_rl32(pb);
 avio_skip(pb, 4); /* start time */
 
 dv_dur = avio_rl32(pb);
 if (ast->scale > 0 && ast->rate > 0 && dv_dur > 0) {
- dv_dur *= AV_TIME_BASE;
+ dv_dur *= AV_TIME_BASE;
 s->duration = av_rescale(dv_dur, ast->scale, ast->rate);
 }
- /*
- * else, leave duration alone; timing estimation in utils.c
- * will make a guess based on bitrate.
- */
+ /* else, leave duration alone; timing estimation in utils.c
+ * will make a guess based on bitrate. */
 
 stream_index = s->nb_streams - 1;
- avio_skip(pb, size - 9*4);
+ avio_skip(pb, size - 9 * 4);
 break;
 }
 
 assert(stream_index < s->nb_streams);
- st->codec->stream_codec_tag= handler;
+ st->codec->stream_codec_tag = handler;
 
 avio_rl32(pb); /* flags */
 avio_rl16(pb); /* priority */
 avio_rl16(pb); /* language */
 avio_rl32(pb); /* initial frame */
 ast->scale = avio_rl32(pb);
- ast->rate = avio_rl32(pb);
- if(!(ast->scale && ast->rate)){
- av_log(s, AV_LOG_WARNING, "scale/rate is %u/%u which is invalid. (This file has been generated by broken software.)\n", ast->scale, ast->rate);
- if(frame_period){
- ast->rate = 1000000;
+ ast->rate = avio_rl32(pb);
+ if (!(ast->scale && ast->rate)) {
+ av_log(s, AV_LOG_WARNING,
+ "scale/rate is %u/%u which is invalid. "
+ "(This file has been generated by broken software.)\n",
+ ast->scale,
+ ast->rate);
+ if (frame_period) {
+ ast->rate = 1000000;
 ast->scale = frame_period;
- }else{
- ast->rate = 25;
+ } else {
+ ast->rate = 25;
 ast->scale = 1;
 }
 }
 avpriv_set_pts_info(st, 64, ast->scale, ast->rate);
 
- ast->cum_len=avio_rl32(pb); /* start */
+ ast->cum_len = avio_rl32(pb); /* start */
 st->nb_frames = avio_rl32(pb);
 
 st->start_time = 0;
 avio_rl32(pb); /* buffer size */
 avio_rl32(pb); /* quality */
 ast->sample_size = avio_rl32(pb); /* sample ssize */
- ast->cum_len *= FFMAX(1, ast->sample_size);
+ ast->cum_len *= FFMAX(1, ast->sample_size);
 av_dlog(s, "%"PRIu32" %"PRIu32" %d\n",
 ast->rate, ast->scale, ast->sample_size);
 
- switch(tag1) {
+ switch (tag1) {
 case MKTAG('v', 'i', 'd', 's'):
 codec_type = AVMEDIA_TYPE_VIDEO;
 
@@ -535,9 +569,9 @@
 av_log(s, AV_LOG_ERROR, "unknown stream type %X\n", tag1);
 goto fail;
 }
- if(ast->sample_size == 0)
+ if (ast->sample_size == 0)
 st->duration = st->nb_frames;
- ast->frame_offset= ast->cum_len;
+ ast->frame_offset = ast->cum_len;
 avio_skip(pb, size - 12 * 4);
 break;
 case MKTAG('s', 't', 'r', 'f'):
@@ -549,50 +583,58 @@
 if (cur_pos < list_end)
 size = FFMIN(size, list_end - cur_pos);
 st = s->streams[stream_index];
- switch(codec_type) {
+ switch (codec_type) {
 case AVMEDIA_TYPE_VIDEO:
- if(amv_file_format){
- st->codec->width=avih_width;
- st->codec->height=avih_height;
+ if (amv_file_format) {
+ st->codec->width = avih_width;
+ st->codec->height = avih_height;
 st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = AV_CODEC_ID_AMV;
+ st->codec->codec_id = AV_CODEC_ID_AMV;
 avio_skip(pb, size);
 break;
 }
 tag1 = ff_get_bmp_header(pb, st);
 
- if (tag1 == MKTAG('D', 'X', 'S', 'B') || tag1 == MKTAG('D','X','S','A')) {
+ if (tag1 == MKTAG('D', 'X', 'S', 'B') ||
+ tag1 == MKTAG('D', 'X', 'S', 'A')) {
 st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
- st->codec->codec_tag = tag1;
- st->codec->codec_id = AV_CODEC_ID_XSUB;
+ st->codec->codec_tag = tag1;
+ st->codec->codec_id = AV_CODEC_ID_XSUB;
 break;
 }
 
- if(size > 10*4 && size<(1<<30)){
- st->codec->extradata_size= size - 10*4;
- st->codec->extradata= av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (size > 10 * 4 && size < (1 << 30)) {
+ st->codec->extradata_size = size - 10 * 4;
+ st->codec->extradata = av_malloc(st->codec->extradata_size +
+ FF_INPUT_BUFFER_PADDING_SIZE);
 if (!st->codec->extradata) {
- st->codec->extradata_size= 0;
+ st->codec->extradata_size = 0;
 return AVERROR(ENOMEM);
 }
- avio_read(pb, st->codec->extradata, st->codec->extradata_size);
+ 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
+ // FIXME: check if the encoder really did this correctly
+ if (st->codec->extradata_size & 1)
 avio_r8(pb);
 
- /* Extract palette from extradata if bpp <= 8. */
- /* This code assumes that extradata contains only palette. */
- /* This is true for all paletted codecs implemented in Libav. */
- if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) {
+ /* Extract palette from extradata if bpp <= 8.
+ * This code assumes that extradata contains only palette.
+ * This is true for all paletted codecs implemented in
+ * Libav. */
+ if (st->codec->extradata_size &&
+ (st->codec->bits_per_coded_sample <= 8)) {
 int pal_size = (1 << st->codec->bits_per_coded_sample) << 2;
 const uint8_t *pal_src;
 
 pal_size = FFMIN(pal_size, st->codec->extradata_size);
- pal_src = st->codec->extradata + st->codec->extradata_size - pal_size;
+ pal_src = st->codec->extradata +
+ st->codec->extradata_size - pal_size;
 #if HAVE_BIGENDIAN
- for (i = 0; i < pal_size/4; i++)
- ast->pal[i] = av_bswap32(((uint32_t*)pal_src)[i]);
+ for (i = 0; i < pal_size / 4; i++)
+ ast->pal[i] = av_bswap32(((uint32_t *)pal_src)[i]);
 #else
 memcpy(ast->pal, pal_src, pal_size);
 #endif
@@ -602,22 +644,31 @@
 print_tag("video", tag1, 0);
 
 st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_tag = tag1;
- st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1);
- st->need_parsing = AVSTREAM_PARSE_HEADERS; // This is needed to get the pict type which is necessary for generating correct pts.
+ st->codec->codec_tag = tag1;
+ st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags,
+ tag1);
+ /* This is needed to get the pict type which is necessary
+ * for generating correct pts. */
+ st->need_parsing = AVSTREAM_PARSE_HEADERS;
 // Support "Resolution 1:1" for Avid AVI Codec
- if(tag1 == MKTAG('A', 'V', 'R', 'n') &&
- st->codec->extradata_size >= 31 &&
- !memcmp(&st->codec->extradata[28], "1:1", 3))
+ if (tag1 == MKTAG('A', 'V', 'R', 'n') &&
+ st->codec->extradata_size >= 31 &&
+ !memcmp(&st->codec->extradata[28], "1:1", 3))
 st->codec->codec_id = AV_CODEC_ID_RAWVIDEO;
 
- if(st->codec->codec_tag==0 && st->codec->height > 0 && st->codec->extradata_size < 1U<<30){
- st->codec->extradata_size+= 9;
- st->codec->extradata= av_realloc(st->codec->extradata, st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
- if(st->codec->extradata)
- memcpy(st->codec->extradata + st->codec->extradata_size - 9, "BottomUp", 9);
+ if (st->codec->codec_tag == 0 && st->codec->height > 0 &&
+ st->codec->extradata_size < 1U << 30) {
+ st->codec->extradata_size += 9;
+ if ((ret = av_reallocp(&st->codec->extradata,
+ st->codec->extradata_size +
+ FF_INPUT_BUFFER_PADDING_SIZE)) < 0) {
+ st->codec->extradata_size = 0;
+ return ret;
+ } else
+ memcpy(st->codec->extradata + st->codec->extradata_size - 9,
+ "BottomUp", 9);
 }
- st->codec->height= FFABS(st->codec->height);
+ st->codec->height = FFABS(st->codec->height);
 
 // avio_skip(pb, size - 5 * 4);
 break;
@@ -625,12 +676,19 @@
 ret = ff_get_wav_header(pb, st->codec, size);
 if (ret < 0)
 return ret;
- ast->dshow_block_align= st->codec->block_align;
- if(ast->sample_size && st->codec->block_align && ast->sample_size != st->codec->block_align){
- av_log(s, AV_LOG_WARNING, "sample size (%d) != block align (%d)\n", ast->sample_size, st->codec->block_align);
- ast->sample_size= st->codec->block_align;
+ ast->dshow_block_align = st->codec->block_align;
+ if (ast->sample_size && st->codec->block_align &&
+ ast->sample_size != st->codec->block_align) {
+ av_log(s,
+ AV_LOG_WARNING,
+ "sample size (%d) != block align (%d)\n",
+ ast->sample_size,
+ st->codec->block_align);
+ ast->sample_size = st->codec->block_align;
 }
- if (size&1) /* 2-aligned (fix for Stargate SG-1 - 3x18 - Shades of Grey.avi) */
+ /* 2-aligned
+ * (fix for Stargate SG-1 - 3x18 - Shades of Grey.avi) */
+ if (size & 1)
 avio_skip(pb, 1);
 /* Force parsing as several audio frames can be in
 * one packet and timestamps refer to packet start. */
@@ -638,16 +696,17 @@
 /* ADTS header is in extradata, AAC without header must be
 * stored as exact frames. Parser not needed and it will
 * fail. */
- if (st->codec->codec_id == AV_CODEC_ID_AAC && st->codec->extradata_size)
+ if (st->codec->codec_id == AV_CODEC_ID_AAC &&
+ st->codec->extradata_size)
 st->need_parsing = AVSTREAM_PARSE_NONE;
 /* AVI files with Xan DPCM audio (wrongly) declare PCM
 * audio in the header but have Axan as stream_code_tag. */
- if (st->codec->stream_codec_tag == AV_RL32("Axan")){
+ if (st->codec->stream_codec_tag == AV_RL32("Axan")) {
 st->codec->codec_id = AV_CODEC_ID_XAN_DPCM;
 st->codec->codec_tag = 0;
 }
- if (amv_file_format){
- st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_AMV;
+ if (amv_file_format) {
+ st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_AMV;
 ast->dshow_block_align = 0;
 }
 break;
@@ -657,23 +716,23 @@
 break;
 default:
 st->codec->codec_type = AVMEDIA_TYPE_DATA;
- st->codec->codec_id= AV_CODEC_ID_NONE;
- st->codec->codec_tag= 0;
+ st->codec->codec_id = AV_CODEC_ID_NONE;
+ st->codec->codec_tag = 0;
 avio_skip(pb, size);
 break;
 }
 }
 break;
 case MKTAG('i', 'n', 'd', 'x'):
- i= avio_tell(pb);
- if(pb->seekable && !(s->flags & AVFMT_FLAG_IGNIDX) &&
- read_braindead_odml_indx(s, 0) < 0 &&
- (s->error_recognition & AV_EF_EXPLODE))
+ i = avio_tell(pb);
+ if (pb->seekable && !(s->flags & AVFMT_FLAG_IGNIDX) &&
+ read_braindead_odml_indx(s, 0) < 0 &&
+ (s->error_recognition & AV_EF_EXPLODE))
 goto fail;
- avio_seek(pb, i+size, SEEK_SET);
+ avio_seek(pb, i + size, SEEK_SET);
 break;
 case MKTAG('v', 'p', 'r', 'p'):
- if(stream_index < (unsigned)s->nb_streams && size > 9*4){
+ if (stream_index < (unsigned)s->nb_streams && size > 9 * 4) {
 AVRational active, active_aspect;
 
 st = s->streams[stream_index];
@@ -683,31 +742,35 @@
 avio_rl32(pb);
 avio_rl32(pb);
 
- active_aspect.den= avio_rl16(pb);
- active_aspect.num= avio_rl16(pb);
- active.num = avio_rl32(pb);
- active.den = avio_rl32(pb);
- avio_rl32(pb); //nbFieldsPerFrame
+ active_aspect.den = avio_rl16(pb);
+ active_aspect.num = avio_rl16(pb);
+ active.num = avio_rl32(pb);
+ active.den = avio_rl32(pb);
+ avio_rl32(pb); // nbFieldsPerFrame
 
- if(active_aspect.num && active_aspect.den && active.num && active.den){
- st->sample_aspect_ratio= av_div_q(active_aspect, active);
+ if (active_aspect.num && active_aspect.den &&
+ active.num && active.den) {
+ st->sample_aspect_ratio = av_div_q(active_aspect, active);
 av_dlog(s, "vprp %d/%d %d/%d\n",
 active_aspect.num, active_aspect.den,
 active.num, active.den);
 }
- size -= 9*4;
+ size -= 9 * 4;
 }
 avio_skip(pb, size);
 break;
 case MKTAG('s', 't', 'r', 'n'):
- if(s->nb_streams){
- avi_read_tag(s, s->streams[s->nb_streams-1], tag, size);
+ if (s->nb_streams) {
+ ret = avi_read_tag(s, s->streams[s->nb_streams - 1], tag, size);
+ if (ret < 0)
+ return ret;
 break;
 }
 default:
- if(size > 1000000){
- av_log(s, AV_LOG_ERROR, "Something went wrong during header parsing, "
- "I will ignore it and try to continue anyway.\n");
+ if (size > 1000000) {
+ av_log(s, AV_LOG_ERROR,
+ "Something went wrong during header parsing, "
+ "I will ignore it and try to continue anyway.\n");
 if (s->error_recognition & AV_EF_EXPLODE)
 goto fail;
 avi->movi_list = avio_tell(pb) - 4;
@@ -720,28 +783,35 @@
 break;
 }
 }
- end_of_header:
+
+end_of_header:
 /* check stream number */
 if (stream_index != s->nb_streams - 1) {
- fail:
- return -1;
+
+fail:
+ return AVERROR_INVALIDDATA;
 }
 
- if(!avi->index_loaded && pb->seekable)
+ if (!avi->index_loaded && pb->seekable)
 avi_load_index(s);
- avi->index_loaded = 1;
- avi->non_interleaved |= guess_ni_flag(s);
- for(i=0; i<s->nb_streams; i++){
+ avi->index_loaded = 1;
+
+ if ((ret = guess_ni_flag(s)) < 0)
+ return ret;
+
+ avi->non_interleaved |= ret;
+ for (i = 0; i < s->nb_streams; i++) {
 AVStream *st = s->streams[i];
- if(st->nb_index_entries)
+ if (st->nb_index_entries)
 break;
 }
- if(i==s->nb_streams && avi->non_interleaved) {
- av_log(s, AV_LOG_WARNING, "non-interleaved AVI without index, switching to interleaved\n");
- avi->non_interleaved=0;
+ if (i == s->nb_streams && avi->non_interleaved) {
+ av_log(s, AV_LOG_WARNING,
+ "Non-interleaved AVI without index, switching to interleaved\n");
+ avi->non_interleaved = 0;
 }
 
- if(avi->non_interleaved) {
+ if (avi->non_interleaved) {
 av_log(s, AV_LOG_INFO, "non-interleaved AVI\n");
 clean_index(s);
 }
@@ -752,16 +822,18 @@
 return 0;
 }
 
-static int read_gab2_sub(AVStream *st, AVPacket *pkt) {
- if (!strcmp(pkt->data, "GAB2") && AV_RL16(pkt->data+5) == 2) {
+static int read_gab2_sub(AVStream *st, AVPacket *pkt)
+{
+ if (pkt->size >= 7 &&
+ !strcmp(pkt->data, "GAB2") && AV_RL16(pkt->data + 5) == 2) {
 uint8_t desc[256];
- int score = AVPROBE_SCORE_MAX / 2, ret;
+ int score = AVPROBE_SCORE_EXTENSION, ret;
 AVIStream *ast = st->priv_data;
 AVInputFormat *sub_demuxer;
 AVRational time_base;
- AVIOContext *pb = avio_alloc_context( pkt->data + 7,
- pkt->size - 7,
- 0, NULL, NULL, NULL, NULL);
+ AVIOContext *pb = avio_alloc_context(pkt->data + 7,
+ pkt->size - 7,
+ 0, NULL, NULL, NULL, NULL);
 AVProbeData pd;
 unsigned int desc_len = avio_rl32(pb);
 
@@ -776,14 +848,15 @@
 avio_rl16(pb); /* flags? */
 avio_rl32(pb); /* data size */
 
- pd = (AVProbeData) { .buf = pb->buf_ptr, .buf_size = pb->buf_end - pb->buf_ptr };
+ pd = (AVProbeData) { .buf = pb->buf_ptr,
+ .buf_size = pb->buf_end - pb->buf_ptr };
 if (!(sub_demuxer = av_probe_input_format2(&pd, 1, &score)))
 goto error;
 
 if (!(ast->sub_ctx = avformat_alloc_context()))
 goto error;
 
- ast->sub_ctx->pb = pb;
+ ast->sub_ctx->pb = pb;
 if (!avformat_open_input(&ast->sub_ctx, "", sub_demuxer, NULL)) {
 ff_read_packet(ast->sub_ctx, &ast->sub_pkt);
 *st->codec = *ast->sub_ctx->streams[0]->codec;
@@ -794,6 +867,7 @@
 ast->sub_buffer = pkt->data;
 memset(pkt, 0, sizeof(*pkt));
 return 1;
+
 error:
 av_freep(&pb);
 }
@@ -811,7 +885,7 @@
 next_ts = av_rescale_q(next_ast->frame_offset, next_st->time_base,
 AV_TIME_BASE_Q);
 
- for (i=0; i<s->nb_streams; i++) {
+ for (i = 0; i < s->nb_streams; i++) {
 st = s->streams[i];
 ast = st->priv_data;
 if (st->discard < AVDISCARD_ALL && ast && ast->sub_pkt.data) {
@@ -824,21 +898,23 @@
 }
 
 if (sub_st) {
- ast = sub_st->priv_data;
- *pkt = ast->sub_pkt;
+ ast = sub_st->priv_data;
+ *pkt = ast->sub_pkt;
 pkt->stream_index = sub_st->index;
+
 if (ff_read_packet(ast->sub_ctx, &ast->sub_pkt) < 0)
 ast->sub_pkt.data = NULL;
 }
 return sub_st;
 }
 
-static int get_stream_idx(int *d){
- if( d[0] >= '0' && d[0] <= '9'
- && d[1] >= '0' && d[1] <= '9'){
+static int get_stream_idx(int *d)
+{
+ if (d[0] >= '0' && d[0] <= '9' &&
+ d[1] >= '0' && d[1] <= '9') {
 return (d[0] - '0') * 10 + (d[1] - '0');
- }else{
- return 100; //invalid stream ID
+ } else {
+ return 100; // invalid stream ID
 }
 }
 
@@ -853,76 +929,79 @@
 
 start_sync:
 memset(d, -1, sizeof(d));
- for(i=sync=avio_tell(pb); !pb->eof_reached; i++) {
+ for (i = sync = avio_tell(pb); !pb->eof_reached; i++) {
 int j;
 
- for(j=0; j<7; j++)
- d[j]= d[j+1];
- d[7]= avio_r8(pb);
+ for (j = 0; j < 7; j++)
+ d[j] = d[j + 1];
+ d[7] = avio_r8(pb);
 
- size= d[4] + (d[5]<<8) + (d[6]<<16) + (d[7]<<24);
+ size = d[4] + (d[5] << 8) + (d[6] << 16) + (d[7] << 24);
 
- n= get_stream_idx(d+2);
+ n = get_stream_idx(d + 2);
 av_dlog(s, "%X %X %X %X %X %X %X %X %"PRId64" %u %d\n",
 d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], i, size, n);
- if(i + (uint64_t)size > avi->fsize || d[0] > 127)
+ if (i + (uint64_t)size > avi->fsize || d[0] > 127)
 continue;
 
- //parse ix##
- if( (d[0] == 'i' && d[1] == 'x' && n < s->nb_streams)
- //parse JUNK
- ||(d[0] == 'J' && d[1] == 'U' && d[2] == 'N' && d[3] == 'K')
- ||(d[0] == 'i' && d[1] == 'd' && d[2] == 'x' && d[3] == '1')){
+ // parse ix##
+ if ((d[0] == 'i' && d[1] == 'x' && n < s->nb_streams) ||
+ // parse JUNK
+ (d[0] == 'J' && d[1] == 'U' && d[2] == 'N' && d[3] == 'K') ||
+ (d[0] == 'i' && d[1] == 'd' && d[2] == 'x' && d[3] == '1')) {
 avio_skip(pb, size);
 goto start_sync;
 }
 
- //parse stray LIST
- if(d[0] == 'L' && d[1] == 'I' && d[2] == 'S' && d[3] == 'T'){
+ // parse stray LIST
+ if (d[0] == 'L' && d[1] == 'I' && d[2] == 'S' && d[3] == 'T') {
 avio_skip(pb, 4);
 goto start_sync;
 }
 
- n= get_stream_idx(d);
+ n = avi->dv_demux ? 0 : get_stream_idx(d);
 
- if(!((i-avi->last_pkt_pos)&1) && get_stream_idx(d+1) < s->nb_streams)
+ if (!((i - avi->last_pkt_pos) & 1) &&
+ get_stream_idx(d + 1) < s->nb_streams)
 continue;
 
- //detect ##ix chunk and skip
- if(d[2] == 'i' && d[3] == 'x' && n < s->nb_streams){
+ // detect ##ix chunk and skip
+ if (d[2] == 'i' && d[3] == 'x' && n < s->nb_streams) {
 avio_skip(pb, size);
 goto start_sync;
 }
 
- //parse ##dc/##wb
- if(n < s->nb_streams){
+ // parse ##dc/##wb
+ if (n < s->nb_streams) {
 AVStream *st;
 AVIStream *ast;
- st = s->streams[n];
+ st = s->streams[n];
 ast = st->priv_data;
 
- if(s->nb_streams>=2){
- AVStream *st1 = s->streams[1];
- AVIStream *ast1= st1->priv_data;
- //workaround for broken small-file-bug402.avi
- if( d[2] == 'w' && d[3] == 'b'
- && n==0
- && st ->codec->codec_type == AVMEDIA_TYPE_VIDEO
- && st1->codec->codec_type == AVMEDIA_TYPE_AUDIO
- && ast->prefix == 'd'*256+'c'
- && (d[2]*256+d[3] == ast1->prefix || !ast1->prefix_count)
- ){
- n=1;
- st = st1;
+ if (s->nb_streams >= 2) {
+ AVStream *st1 = s->streams[1];
+ AVIStream *ast1 = st1->priv_data;
+ // workaround for broken small-file-bug402.avi
+ if (d[2] == 'w' && d[3] == 'b' && n == 0 &&
+ st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
+ st1->codec->codec_type == AVMEDIA_TYPE_AUDIO &&
+ ast->prefix == 'd' * 256 + 'c' &&
+ (d[2] * 256 + d[3] == ast1->prefix ||
+ !ast1->prefix_count)) {
+ n = 1;
+ st = st1;
 ast = ast1;
- av_log(s, AV_LOG_WARNING, "Invalid stream + prefix combination, assuming audio.\n");
+ av_log(s, AV_LOG_WARNING,
+ "Invalid stream + prefix combination, assuming audio.\n");
 }
 }
 
-
- if( (st->discard >= AVDISCARD_DEFAULT && size==0)
- /*|| (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & AV_PKT_FLAG_KEY))*/ //FIXME needs a little reordering
- || st->discard >= AVDISCARD_ALL){
+ if (!avi->dv_demux &&
+ ((st->discard >= AVDISCARD_DEFAULT && size == 0) /* ||
+ // FIXME: needs a little reordering
+ (st->discard >= AVDISCARD_NONKEY &&
+ !(pkt->flags & AV_PKT_FLAG_KEY)) */
+ || st->discard >= AVDISCARD_ALL)) {
 if (!exit_early) {
 ast->frame_offset += get_duration(ast, size);
 }
@@ -930,38 +1009,42 @@
 goto start_sync;
 }
 
- if (d[2] == 'p' && d[3] == 'c' && size<=4*256+4) {
- int k = avio_r8(pb);
+ if (d[2] == 'p' && d[3] == 'c' && size <= 4 * 256 + 4) {
+ int k = avio_r8(pb);
 int last = (k + avio_r8(pb) - 1) & 0xFF;
 
- avio_rl16(pb); //flags
+ avio_rl16(pb); // flags
 
+ // b + (g << 8) + (r << 16);
 for (; k <= last; k++)
- ast->pal[k] = avio_rb32(pb)>>8;// b + (g << 8) + (r << 16);
- ast->has_pal= 1;
- goto start_sync;
- } else if( ((ast->prefix_count<5 || sync+9 > i) && d[2]<128 && d[3]<128) ||
- d[2]*256+d[3] == ast->prefix /*||
- (d[2] == 'd' && d[3] == 'c') ||
- (d[2] == 'w' && d[3] == 'b')*/) {
+ ast->pal[k] = avio_rb32(pb) >> 8;
 
+ ast->has_pal = 1;
+ goto start_sync;
+ } else if (((ast->prefix_count < 5 || sync + 9 > i) &&
+ d[2] < 128 && d[3] < 128) ||
+ d[2] * 256 + d[3] == ast->prefix /* ||
+ (d[2] == 'd' && d[3] == 'c') ||
+ (d[2] == 'w' && d[3] == 'b') */) {
 if (exit_early)
 return 0;
- if(d[2]*256+d[3] == ast->prefix)
+ if (d[2] * 256 + d[3] == ast->prefix)
 ast->prefix_count++;
- else{
- ast->prefix= d[2]*256+d[3];
- ast->prefix_count= 0;
+ else {
+ ast->prefix = d[2] * 256 + d[3];
+ ast->prefix_count = 0;
 }
 
- avi->stream_index= n;
- ast->packet_size= size + 8;
- ast->remaining= size;
+ avi->stream_index = n;
+ ast->packet_size = size + 8;
+ ast->remaining = size;
 
- if(size || !ast->sample_size){
- uint64_t pos= avio_tell(pb) - 8;
- if(!st->index_entries || !st->nb_index_entries || st->index_entries[st->nb_index_entries - 1].pos < pos){
- av_add_index_entry(st, pos, ast->frame_offset, size, 0, AVINDEX_KEYFRAME);
+ if (size || !ast->sample_size) {
+ uint64_t pos = avio_tell(pb) - 8;
+ if (!st->index_entries || !st->nb_index_entries ||
+ st->index_entries[st->nb_index_entries - 1].pos < pos) {
+ av_add_index_entry(st, pos, ast->frame_offset, size,
+ 0, AVINDEX_KEYFRAME);
 }
 }
 return 0;
@@ -977,129 +1060,163 @@
 AVIContext *avi = s->priv_data;
 AVIOContext *pb = s->pb;
 int err;
- void* dstr;
+#if FF_API_DESTRUCT_PACKET
+ void *dstr;
+#endif
 
 if (CONFIG_DV_DEMUXER && avi->dv_demux) {
 int size = avpriv_dv_get_packet(avi->dv_demux, pkt);
 if (size >= 0)
 return size;
+ else
+ goto resync;
 }
 
- if(avi->non_interleaved){
+ if (avi->non_interleaved) {
 int best_stream_index = 0;
- AVStream *best_st= NULL;
+ AVStream *best_st = NULL;
 AVIStream *best_ast;
- int64_t best_ts= INT64_MAX;
+ int64_t best_ts = INT64_MAX;
 int i;
 
- for(i=0; i<s->nb_streams; i++){
- AVStream *st = s->streams[i];
+ for (i = 0; i < s->nb_streams; i++) {
+ AVStream *st = s->streams[i];
 AVIStream *ast = st->priv_data;
- int64_t ts= ast->frame_offset;
+ int64_t ts = ast->frame_offset;
 int64_t last_ts;
 
- if(!st->nb_index_entries)
+ if (!st->nb_index_entries)
 continue;
 
 last_ts = st->index_entries[st->nb_index_entries - 1].timestamp;
- if(!ast->remaining && ts > last_ts)
+ if (!ast->remaining && ts > last_ts)
 continue;
 
- ts = av_rescale_q(ts, st->time_base, (AVRational){FFMAX(1, ast->sample_size), AV_TIME_BASE});
+ ts = av_rescale_q(ts, st->time_base,
+ (AVRational) { FFMAX(1, ast->sample_size),
+ AV_TIME_BASE });
 
 av_dlog(s, "%"PRId64" %d/%d %"PRId64"\n", ts,
 st->time_base.num, st->time_base.den, ast->frame_offset);
- if(ts < best_ts){
- best_ts= ts;
- best_st= st;
- best_stream_index= i;
+ if (ts < best_ts) {
+ best_ts = ts;
+ best_st = st;
+ best_stream_index = i;
 }
 }
- if(!best_st)
- return -1;
+ if (!best_st)
+ return AVERROR_EOF;
 
 best_ast = best_st->priv_data;
- best_ts = av_rescale_q(best_ts, (AVRational){FFMAX(1, best_ast->sample_size), AV_TIME_BASE}, best_st->time_base);
- if(best_ast->remaining)
- i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY | AVSEEK_FLAG_BACKWARD);
- else{
- i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY);
- if(i>=0)
- best_ast->frame_offset= best_st->index_entries[i].timestamp;
+ best_ts = av_rescale_q(best_ts,
+ (AVRational) { FFMAX(1, best_ast->sample_size),
+ AV_TIME_BASE },
+ best_st->time_base);
+ if (best_ast->remaining) {
+ i = av_index_search_timestamp(best_st,
+ best_ts,
+ AVSEEK_FLAG_ANY |
+ AVSEEK_FLAG_BACKWARD);
+ } else {
+ i = av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY);
+ if (i >= 0)
+ best_ast->frame_offset = best_st->index_entries[i].timestamp;
 }
 
- if(i>=0){
- int64_t pos= best_st->index_entries[i].pos;
+ if (i >= 0) {
+ int64_t pos = best_st->index_entries[i].pos;
 pos += best_ast->packet_size - best_ast->remaining;
 avio_seek(s->pb, pos + 8, SEEK_SET);
 
 assert(best_ast->remaining <= best_ast->packet_size);
 
- avi->stream_index= best_stream_index;
- if(!best_ast->remaining)
- best_ast->packet_size=
- best_ast->remaining= best_st->index_entries[i].size;
+ avi->stream_index = best_stream_index;
+ if (!best_ast->remaining)
+ best_ast->packet_size =
+ best_ast->remaining = best_st->index_entries[i].size;
 }
 }
 
 resync:
- if(avi->stream_index >= 0){
- AVStream *st= s->streams[ avi->stream_index ];
- AVIStream *ast= st->priv_data;
+ if (avi->stream_index >= 0) {
+ AVStream *st = s->streams[avi->stream_index];
+ AVIStream *ast = st->priv_data;
 int size, err;
 
- if(get_subtitle_pkt(s, st, pkt))
+ if (get_subtitle_pkt(s, st, pkt))
 return 0;
 
- if(ast->sample_size <= 1) // minorityreport.AVI block_align=1024 sample_size=1 IMA-ADPCM
- size= INT_MAX;
- else if(ast->sample_size < 32)
+ // minorityreport.AVI block_align=1024 sample_size=1 IMA-ADPCM
+ if (ast->sample_size <= 1)
+ size = INT_MAX;
+ else if (ast->sample_size < 32)
 // arbitrary multiplier to avoid tiny packets for raw PCM data
- size= 1024*ast->sample_size;
+ size = 1024 * ast->sample_size;
 else
- size= ast->sample_size;
+ size = ast->sample_size;
 
- if(size > ast->remaining)
- size= ast->remaining;
- avi->last_pkt_pos= avio_tell(pb);
- err= av_get_packet(pb, pkt, size);
- if(err<0)
+ if (size > ast->remaining)
+ size = ast->remaining;
+ avi->last_pkt_pos = avio_tell(pb);
+ err = av_get_packet(pb, pkt, size);
+ if (err < 0)
 return err;
 
- if(ast->has_pal && pkt->data && pkt->size<(unsigned)INT_MAX/2){
+ if (ast->has_pal && pkt->data && pkt->size < (unsigned)INT_MAX / 2) {
 uint8_t *pal;
- pal = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE, AVPALETTE_SIZE);
- if(!pal){
- av_log(s, AV_LOG_ERROR, "Failed to allocate data for palette\n");
- }else{
+ pal = av_packet_new_side_data(pkt,
+ AV_PKT_DATA_PALETTE,
+ AVPALETTE_SIZE);
+ if (!pal) {
+ av_log(s, AV_LOG_ERROR,
+ "Failed to allocate data for palette\n");
+ } else {
 memcpy(pal, ast->pal, AVPALETTE_SIZE);
 ast->has_pal = 0;
 }
 }
 
 if (CONFIG_DV_DEMUXER && avi->dv_demux) {
+ AVBufferRef *avbuf = pkt->buf;
+#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
 dstr = pkt->destruct;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
 size = avpriv_dv_produce_packet(avi->dv_demux, pkt,
- pkt->data, pkt->size);
+ pkt->data, pkt->size);
+#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
 pkt->destruct = dstr;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+ pkt->buf = avbuf;
 pkt->flags |= AV_PKT_FLAG_KEY;
 if (size < 0)
 av_free_packet(pkt);
- } else if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE
- && !st->codec->codec_tag && read_gab2_sub(st, pkt)) {
+ } else if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE &&
+ !st->codec->codec_tag && read_gab2_sub(st, pkt)) {
 ast->frame_offset++;
 avi->stream_index = -1;
- ast->remaining = 0;
+ ast->remaining = 0;
 goto resync;
 } else {
 /* XXX: How to handle B-frames in AVI? */
 pkt->dts = ast->frame_offset;
 // pkt->dts += ast->start;
- if(ast->sample_size)
+ if (ast->sample_size)
 pkt->dts /= ast->sample_size;
- av_dlog(s, "dts:%"PRId64" offset:%"PRId64" %d/%d smpl_siz:%d base:%d st:%d size:%d\n",
- pkt->dts, ast->frame_offset, ast->scale, ast->rate,
- ast->sample_size, AV_TIME_BASE, avi->stream_index, size);
+ av_dlog(s,
+ "dts:%"PRId64" offset:%"PRId64" %d/%d smpl_siz:%d "
+ "base:%d st:%d size:%d\n",
+ pkt->dts,
+ ast->frame_offset,
+ ast->scale,
+ ast->rate,
+ ast->sample_size,
+ AV_TIME_BASE,
+ avi->stream_index,
+ size);
 pkt->stream_index = avi->stream_index;
 
 if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
@@ -1107,22 +1224,21 @@
 int index;
 assert(st->index_entries);
 
- index= av_index_search_timestamp(st, ast->frame_offset, 0);
- e= &st->index_entries[index];
+ index = av_index_search_timestamp(st, ast->frame_offset, 0);
+ e = &st->index_entries[index];
 
- if(index >= 0 && e->timestamp == ast->frame_offset){
+ if (index >= 0 && e->timestamp == ast->frame_offset)
 if (e->flags & AVINDEX_KEYFRAME)
 pkt->flags |= AV_PKT_FLAG_KEY;
- }
 } else {
 pkt->flags |= AV_PKT_FLAG_KEY;
 }
 ast->frame_offset += get_duration(ast, pkt->size);
 }
 ast->remaining -= err;
- if(!ast->remaining){
- avi->stream_index= -1;
- ast->packet_size= 0;
+ if (!ast->remaining) {
+ avi->stream_index = -1;
+ ast->packet_size = 0;
 }
 
 return 0;
@@ -1134,7 +1250,7 @@
 }
 
 /* XXX: We make the implicit supposition that the positions are sorted
- for each stream. */
+ * for each stream. */
 static int avi_read_idx1(AVFormatContext *s, int size)
 {
 AVIContext *avi = s->priv_data;
@@ -1143,87 +1259,150 @@
 AVStream *st;
 AVIStream *ast;
 unsigned int index, tag, flags, pos, len, first_packet = 1;
- unsigned last_pos= -1;
+ unsigned last_pos = -1;
 int64_t idx1_pos, first_packet_pos = 0, data_offset = 0;
 
 nb_index_entries = size / 16;
 if (nb_index_entries <= 0)
- return -1;
+ return AVERROR_INVALIDDATA;
 
 idx1_pos = avio_tell(pb);
- avio_seek(pb, avi->movi_list+4, SEEK_SET);
- if (avi_sync(s, 1) == 0) {
+ avio_seek(pb, avi->movi_list + 4, SEEK_SET);
+ if (avi_sync(s, 1) == 0)
 first_packet_pos = avio_tell(pb) - 8;
- }
 avi->stream_index = -1;
 avio_seek(pb, idx1_pos, SEEK_SET);
 
 /* Read the entries and sort them in each stream component. */
- for(i = 0; i < nb_index_entries; i++) {
- tag = avio_rl32(pb);
+ for (i = 0; i < nb_index_entries; i++) {
+ tag = avio_rl32(pb);
 flags = avio_rl32(pb);
- pos = avio_rl32(pb);
- len = avio_rl32(pb);
+ pos = avio_rl32(pb);
+ len = avio_rl32(pb);
 av_dlog(s, "%d: tag=0x%x flags=0x%x pos=0x%x len=%d/",
 i, tag, flags, pos, len);
 
- index = ((tag & 0xff) - '0') * 10;
- index += ((tag >> 8) & 0xff) - '0';
+ index = ((tag & 0xff) - '0') * 10;
+ index += (tag >> 8 & 0xff) - '0';
 if (index >= s->nb_streams)
 continue;
- st = s->streams[index];
+ st = s->streams[index];
 ast = st->priv_data;
 
- if(first_packet && first_packet_pos && len) {
- data_offset = first_packet_pos - pos;
+ if (first_packet && first_packet_pos && len) {
+ data_offset = first_packet_pos - pos;
 first_packet = 0;
 }
 pos += data_offset;
 
 av_dlog(s, "%d cum_len=%"PRId64"\n", len, ast->cum_len);
 
- if(pb->eof_reached)
- return -1;
+ if (pb->eof_reached)
+ return AVERROR_INVALIDDATA;
 
- if(last_pos == pos)
- avi->non_interleaved= 1;
- else if(len || !ast->sample_size)
- av_add_index_entry(st, pos, ast->cum_len, len, 0, (flags&AVIIF_INDEX) ? AVINDEX_KEYFRAME : 0);
+ if (last_pos == pos)
+ avi->non_interleaved = 1;
+ else if (len || !ast->sample_size)
+ av_add_index_entry(st, pos, ast->cum_len, len, 0,
+ (flags & AVIIF_INDEX) ? AVINDEX_KEYFRAME : 0);
 ast->cum_len += get_duration(ast, len);
- last_pos= pos;
+ last_pos = pos;
 }
 return 0;
 }
 
-static int guess_ni_flag(AVFormatContext *s){
+/* Scan the index and consider any file with streams more than
+ * 2 seconds or 64MB apart non-interleaved. */
+static int check_stream_max_drift(AVFormatContext *s)
+{
+ int64_t min_pos, pos;
 int i;
- int64_t last_start=0;
- int64_t first_end= INT64_MAX;
- int64_t oldpos= avio_tell(s->pb);
+ int *idx = av_mallocz_array(s->nb_streams, sizeof(*idx));
+ if (!idx)
+ return AVERROR(ENOMEM);
+
+ for (min_pos = pos = 0; min_pos != INT64_MAX; pos = min_pos + 1LU) {
+ int64_t max_dts = INT64_MIN / 2;
+ int64_t min_dts = INT64_MAX / 2;
+ int64_t max_buffer = 0;
 
- for(i=0; i<s->nb_streams; i++){
+ min_pos = INT64_MAX;
+
+ for (i = 0; i < s->nb_streams; i++) {
+ AVStream *st = s->streams[i];
+ AVIStream *ast = st->priv_data;
+ int n = st->nb_index_entries;
+ while (idx[i] < n && st->index_entries[idx[i]].pos < pos)
+ idx[i]++;
+ if (idx[i] < n) {
+ int64_t dts;
+ dts = av_rescale_q(st->index_entries[idx[i]].timestamp /
+ FFMAX(ast->sample_size, 1),
+ st->time_base, AV_TIME_BASE_Q);
+ min_dts = FFMIN(min_dts, dts);
+ min_pos = FFMIN(min_pos, st->index_entries[idx[i]].pos);
+ }
+ }
+ for (i = 0; i < s->nb_streams; i++) {
+ AVStream *st = s->streams[i];
+ AVIStream *ast = st->priv_data;
+
+ if (idx[i] && min_dts != INT64_MAX / 2) {
+ int64_t dts;
+ dts = av_rescale_q(st->index_entries[idx[i] - 1].timestamp /
+ FFMAX(ast->sample_size, 1),
+ st->time_base, AV_TIME_BASE_Q);
+ max_dts = FFMAX(max_dts, dts);
+ max_buffer = FFMAX(max_buffer,
+ av_rescale(dts - min_dts,
+ st->codec->bit_rate,
+ AV_TIME_BASE));
+ }
+ }
+ if (max_dts - min_dts > 2 * AV_TIME_BASE ||
+ max_buffer > 1024 * 1024 * 8 * 8) {
+ av_free(idx);
+ return 1;
+ }
+ }
+ av_free(idx);
+ return 0;
+}
+
+static int guess_ni_flag(AVFormatContext *s)
+{
+ int i;
+ int64_t last_start = 0;
+ int64_t first_end = INT64_MAX;
+ int64_t oldpos = avio_tell(s->pb);
+
+ for (i = 0; i < s->nb_streams; i++) {
 AVStream *st = s->streams[i];
- int n= st->nb_index_entries;
+ int n = st->nb_index_entries;
 unsigned int size;
 
- if(n <= 0)
+ if (n <= 0)
 continue;
 
- if(n >= 2){
- int64_t pos= st->index_entries[0].pos;
+ if (n >= 2) {
+ int64_t pos = st->index_entries[0].pos;
 avio_seek(s->pb, pos + 4, SEEK_SET);
- size= avio_rl32(s->pb);
- if(pos + size > st->index_entries[1].pos)
- last_start= INT64_MAX;
+ size = avio_rl32(s->pb);
+ if (pos + size > st->index_entries[1].pos)
+ last_start = INT64_MAX;
 }
 
- if(st->index_entries[0].pos > last_start)
- last_start= st->index_entries[0].pos;
- if(st->index_entries[n-1].pos < first_end)
- first_end= st->index_entries[n-1].pos;
+ if (st->index_entries[0].pos > last_start)
+ last_start = st->index_entries[0].pos;
+ if (st->index_entries[n - 1].pos < first_end)
+ first_end = st->index_entries[n - 1].pos;
 }
 avio_seek(s->pb, oldpos, SEEK_SET);
- return last_start > first_end;
+
+ if (last_start > first_end)
+ return 1;
+
+ return check_stream_max_drift(s);
 }
 
 static int avi_load_index(AVFormatContext *s)
@@ -1231,16 +1410,16 @@
 AVIContext *avi = s->priv_data;
 AVIOContext *pb = s->pb;
 uint32_t tag, size;
- int64_t pos= avio_tell(pb);
- int ret = -1;
+ int64_t pos = avio_tell(pb);
+ int ret = -1;
 
 if (avio_seek(pb, avi->movi_end, SEEK_SET) < 0)
 goto the_end; // maybe truncated file
 av_dlog(s, "movi_end=0x%"PRIx64"\n", avi->movi_end);
- for(;;) {
+ for (;;) {
 if (pb->eof_reached)
 break;
- tag = avio_rl32(pb);
+ tag = avio_rl32(pb);
 size = avio_rl32(pb);
 av_dlog(s, "tag=%c%c%c%c size=0x%x\n",
 tag & 0xff,
@@ -1259,7 +1438,8 @@
 if (avio_skip(pb, size) < 0)
 break; // something is wrong here
 }
- the_end:
+
+the_end:
 avio_seek(pb, pos, SEEK_SET);
 return ret;
 }
@@ -1267,14 +1447,15 @@
 static void seek_subtitle(AVStream *st, AVStream *st2, int64_t timestamp)
 {
 AVIStream *ast2 = st2->priv_data;
- int64_t ts2 = av_rescale_q(timestamp, st->time_base, st2->time_base);
+ int64_t ts2 = av_rescale_q(timestamp, st->time_base, st2->time_base);
 av_free_packet(&ast2->sub_pkt);
 if (avformat_seek_file(ast2->sub_ctx, 0, INT64_MIN, ts2, ts2, 0) >= 0 ||
 avformat_seek_file(ast2->sub_ctx, 0, ts2, ts2, INT64_MAX, 0) >= 0)
 ff_read_packet(ast2->sub_ctx, &ast2->sub_pkt);
 }
 
-static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)
+static int avi_read_seek(AVFormatContext *s, int stream_index,
+ int64_t timestamp, int flags)
 {
 AVIContext *avi = s->priv_data;
 AVStream *st;
@@ -1282,21 +1463,28 @@
 int64_t pos;
 AVIStream *ast;
 
+ /* Does not matter which stream is requested dv in avi has the
+ * stream information in the first video stream.
+ */
+ if (avi->dv_demux)
+ stream_index = 0;
+
 if (!avi->index_loaded) {
 /* we only load the index on demand */
 avi_load_index(s);
 avi->index_loaded = 1;
 }
- assert(stream_index>= 0);
 
- st = s->streams[stream_index];
- ast= st->priv_data;
- index= av_index_search_timestamp(st, timestamp * FFMAX(ast->sample_size, 1), flags);
- if(index<0)
- return -1;
+ st = s->streams[stream_index];
+ ast = st->priv_data;
+ index = av_index_search_timestamp(st,
+ timestamp * FFMAX(ast->sample_size, 1),
+ flags);
+ if (index < 0)
+ return AVERROR_INVALIDDATA;
 
 /* find the position */
- pos = st->index_entries[index].pos;
+ pos = st->index_entries[index].pos;
 timestamp = st->index_entries[index].timestamp / FFMAX(ast->sample_size, 1);
 
 av_dlog(s, "XX %"PRId64" %d %"PRId64"\n",
@@ -1306,23 +1494,22 @@
 /* One and only one real stream for DV in AVI, and it has video */
 /* offsets. Calling with other stream indexes should have failed */
 /* the av_index_search_timestamp call above. */
- assert(stream_index == 0);
 
 /* Feed the DV video stream version of the timestamp to the */
 /* DV demux so it can synthesize correct timestamps. */
 ff_dv_offset_reset(avi->dv_demux, timestamp);
 
 avio_seek(s->pb, pos, SEEK_SET);
- avi->stream_index= -1;
+ avi->stream_index = -1;
 return 0;
 }
 
- for(i = 0; i < s->nb_streams; i++) {
- AVStream *st2 = s->streams[i];
+ for (i = 0; i < s->nb_streams; i++) {
+ AVStream *st2 = s->streams[i];
 AVIStream *ast2 = st2->priv_data;
 
- ast2->packet_size=
- ast2->remaining= 0;
+ ast2->packet_size =
+ ast2->remaining = 0;
 
 if (ast2->sub_ctx) {
 seek_subtitle(st, st2, timestamp);
@@ -1333,18 +1520,22 @@
 continue;
 
 // assert(st2->codec->block_align);
- assert((int64_t)st2->time_base.num*ast2->rate == (int64_t)st2->time_base.den*ast2->scale);
- index = av_index_search_timestamp(
- st2,
- av_rescale_q(timestamp, st->time_base, st2->time_base) * FFMAX(ast2->sample_size, 1),
- flags | AVSEEK_FLAG_BACKWARD);
- if(index<0)
- index=0;
-
- if(!avi->non_interleaved){
- while(index>0 && st2->index_entries[index].pos > pos)
+ assert((int64_t)st2->time_base.num * ast2->rate ==
+ (int64_t)st2->time_base.den * ast2->scale);
+ index = av_index_search_timestamp(st2,
+ av_rescale_q(timestamp,
+ st->time_base,
+ st2->time_base) *
+ FFMAX(ast2->sample_size, 1),
+ flags | AVSEEK_FLAG_BACKWARD);
+ if (index < 0)
+ index = 0;
+
+ if (!avi->non_interleaved) {
+ while (index > 0 && st2->index_entries[index].pos > pos)
 index--;
- while(index+1 < st2->nb_index_entries && st2->index_entries[index].pos < pos)
+ while (index + 1 < st2->nb_index_entries &&
+ st2->index_entries[index].pos < pos)
 index++;
 }
 
@@ -1356,7 +1547,7 @@
 
 /* do the seek */
 avio_seek(s->pb, pos, SEEK_SET);
- avi->stream_index= -1;
+ avi->stream_index = -1;
 return 0;
 }
 
@@ -1365,8 +1556,8 @@
 int i;
 AVIContext *avi = s->priv_data;
 
- for(i=0;i<s->nb_streams;i++) {
- AVStream *st = s->streams[i];
+ for (i = 0; i < s->nb_streams; i++) {
+ AVStream *st = s->streams[i];
 AVIStream *ast = st->priv_data;
 if (ast) {
 if (ast->sub_ctx) {
@@ -1388,9 +1579,9 @@
 int i;
 
 /* check file header */
- for(i=0; avi_headers[i][0]; i++)
- if(!memcmp(p->buf , avi_headers[i] , 4) &&
- !memcmp(p->buf+8, avi_headers[i]+4, 4))
+ for (i = 0; avi_headers[i][0]; i++)
+ if (!memcmp(p->buf, avi_headers[i], 4) &&
+ !memcmp(p->buf + 8, avi_headers[i] + 4, 4))
 return AVPROBE_SCORE_MAX;
 
 return 0;

libav-v9.6.tar.bz2/libavformat/avienc.c -> libav-v10.1.tar.bz2/libavformat/avienc.c Changed

@@ -533,13 +533,16 @@
 }
 
 if (s->pb->seekable) {
+ int err;
 AVIIndex* idx = &avist->indexes;
 int cl = idx->entry / AVI_INDEX_CLUSTER_SIZE;
 int id = idx->entry % AVI_INDEX_CLUSTER_SIZE;
 if (idx->ents_allocated <= idx->entry) {
- idx->cluster = av_realloc(idx->cluster, (cl+1)*sizeof(void*));
- if (!idx->cluster)
- return -1;
+ if ((err = av_reallocp(&idx->cluster, (cl + 1) * sizeof(*idx->cluster))) < 0) {
+ idx->ents_allocated = 0;
+ idx->entry = 0;
+ return err;
+ }
 idx->cluster[cl] = av_malloc(AVI_INDEX_CLUSTER_SIZE*sizeof(AVIIentry));
 if (!idx->cluster[cl])
 return -1;
@@ -558,7 +561,6 @@
 if (size & 1)
 avio_w8(pb, 0);
 
- avio_flush(pb);
 return 0;
 }
 
@@ -630,5 +632,4 @@
 .codec_tag = (const AVCodecTag* const []){
 ff_codec_bmp_tags, ff_codec_wav_tags, 0
 },
- .flags = AVFMT_VARIABLE_FPS,
 };

libav-v9.6.tar.bz2/libavformat/avio.c -> libav-v10.1.tar.bz2/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;
@@ -125,16 +122,20 @@
 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);
+ if (!uc->priv_data) {
+ err = AVERROR(ENOMEM);
+ goto fail;
+ }
 if (up->priv_data_class) {
- *(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);
 }
 }
@@ -143,8 +144,11 @@
 
 *puc = uc;
 return 0;
- fail:
+fail:
 *puc = NULL;
+ if (uc)
+ av_freep(&uc->priv_data);
+ av_freep(&uc);
 #if CONFIG_NETWORK
 if (up->flags & URL_PROTOCOL_FLAG_NETWORK)
 ff_network_close();
@@ -152,19 +156,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;
 }
 
@@ -183,7 +190,8 @@
 if (filename[proto_len] != ':' || 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)));
 
 av_strlcpy(proto_nested, proto_str, sizeof(proto_nested));
 if ((ptr = strchr(proto_nested, '+')))
@@ -191,13 +199,13 @@
 
 while (up = ffurl_protocol_next(up)) {
 if (!strcmp(proto_str, up->name))
- return url_alloc_for_protocol (puc, up, filename, flags, int_cb);
+ return url_alloc_for_protocol(puc, up, filename, flags, int_cb);
 if (up->flags & URL_PROTOCOL_FLAG_NESTED_SCHEME &&
 !strcmp(proto_nested, up->name))
- return url_alloc_for_protocol (puc, up, filename, flags, int_cb);
+ return url_alloc_for_protocol(puc, up, filename, flags, int_cb);
 }
 *puc = NULL;
- return AVERROR(ENOENT);
+ return AVERROR_PROTOCOL_NOT_FOUND;
 }
 
 int ffurl_open(URLContext **puc, const char *filename, int flags,
@@ -218,15 +226,18 @@
 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;
 
 len = 0;
 while (len < size_min) {
- 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)
@@ -238,9 +249,9 @@
 else
 av_usleep(1000);
 } else if (ret < 1)
- return ret < 0 ? ret : len;
+ return (ret < 0 && ret != AVERROR_EOF) ? ret : len;
 if (ret)
- fast_retries = FFMAX(fast_retries, 2);
+ fast_retries = FFMAX(fast_retries, 2);
 len += ret;
 if (ff_check_interrupt(&h->interrupt_callback))
 return AVERROR_EXIT;
@@ -286,7 +297,8 @@
 int ffurl_close(URLContext *h)
 {
 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);
@@ -326,8 +338,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;

libav-v9.6.tar.bz2/libavformat/avio.h -> libav-v10.1.tar.bz2/libavformat/avio.h Changed

@@ -318,6 +318,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
@@ -333,6 +334,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
@@ -406,6 +408,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);
@@ -413,6 +417,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.

libav-v9.6.tar.bz2/libavformat/avio_internal.h -> libav-v10.1.tar.bz2/libavformat/avio_internal.h Changed

@@ -38,6 +38,23 @@
 
 
 /**
+ * Read size bytes from AVIOContext, returning a pointer.
+ * Note that the data pointed at by the returned pointer is only
+ * valid until the next call that references the same IO context.
+ * @param s IO context
+ * @param buf pointer to buffer into which to assemble the requested
+ *    data if it is not available in contiguous addresses in the
+ *    underlying buffer
+ * @param size number of bytes requested
+ * @param data address at which to store pointer: this will be a
+ *    a direct pointer into the underlying buffer if the requested
+ *    number of bytes are available at contiguous addresses, otherwise
+ *    will be a copy of buf
+ * @return number of bytes read or AVERROR
+ */
+int ffio_read_indirect(AVIOContext *s, unsigned char *buf, int size, const unsigned char **data);
+
+/**
  * Read size bytes from AVIOContext into buf.
  * This reads at most 1 packet. If that is not enough fewer bytes will be
  * returned.
@@ -102,4 +119,22 @@
  */
 int ffio_fdopen(AVIOContext **s, URLContext *h);
 
+/**
+ * Open a write-only fake memory stream. The written data is not stored
+ * anywhere - this is only used for measuring the amount of data
+ * written.
+ *
+ * @param s new IO context
+ * @return zero if no error.
+ */
+int ffio_open_null_buf(AVIOContext **s);
+
+/**
+ * Close a null buffer.
+ *
+ * @param s an IO context opened by ffio_open_null_buf
+ * @return the number of bytes written to the null buffer
+ */
+int ffio_close_null_buf(AVIOContext *s);
+
 #endif /* AVFORMAT_AVIO_INTERNAL_H */

libav-v9.6.tar.bz2/libavformat/aviobuf.c -> libav-v10.1.tar.bz2/libavformat/aviobuf.c Changed

@@ -90,7 +90,7 @@
 s->must_flush = 0;
 s->eof_reached = 0;
 s->error = 0;
- s->seekable = AVIO_SEEKABLE_NORMAL;
+ s->seekable = seek ? AVIO_SEEKABLE_NORMAL : 0;
 s->max_packet_size = 0;
 s->update_checksum = NULL;
 
@@ -490,6 +490,18 @@
 return size1 - size;
 }
 
+int ffio_read_indirect(AVIOContext *s, unsigned char *buf, int size, const unsigned char **data)
+{
+ if (s->buf_end - s->buf_ptr >= size && !s->write_flag) {
+ *data = s->buf_ptr;
+ s->buf_ptr += size;
+ return size;
+ } else {
+ *data = buf;
+ return avio_read(s, buf, size);
+ }
+}
+
 int ffio_read_partial(AVIOContext *s, unsigned char *buf, int size)
 {
 int len;
@@ -867,9 +879,12 @@
 }
 
 if (new_allocated_size > d->allocated_size) {
- d->buffer = av_realloc(d->buffer, new_allocated_size);
- if(d->buffer == NULL)
- return AVERROR(ENOMEM);
+ int err;
+ if ((err = av_reallocp(&d->buffer, new_allocated_size)) < 0) {
+ d->allocated_size = 0;
+ d->size = 0;
+ return err;
+ }
 d->allocated_size = new_allocated_size;
 }
 memcpy(d->buffer + d->pos, buf, buf_size);
@@ -949,6 +964,11 @@
 static const char padbuf[FF_INPUT_BUFFER_PADDING_SIZE] = {0};
 int padding = 0;
 
+ if (!s) {
+ *pbuffer = NULL;
+ return 0;
+ }
+
 /* don't attempt to pad fixed-size packet buffers */
 if (!s->max_packet_size) {
 avio_write(s, padbuf, sizeof(padbuf));
@@ -963,3 +983,36 @@
 av_free(s);
 return size - padding;
 }
+
+static int null_buf_write(void *opaque, uint8_t *buf, int buf_size)
+{
+ DynBuffer *d = opaque;
+
+ d->pos += buf_size;
+ if (d->pos > d->size)
+ d->size = d->pos;
+ return buf_size;
+}
+
+int ffio_open_null_buf(AVIOContext **s)
+{
+ int ret = url_open_dyn_buf_internal(s, 0);
+ if (ret >= 0) {
+ AVIOContext *pb = *s;
+ pb->write_packet = null_buf_write;
+ }
+ return ret;
+}
+
+int ffio_close_null_buf(AVIOContext *s)
+{
+ DynBuffer *d = s->opaque;
+ int size;
+
+ avio_flush(s);
+
+ size = d->size;
+ av_free(d);
+ av_free(s);
+ return size;
+}

libav-v9.6.tar.bz2/libavformat/avisynth.c -> libav-v10.1.tar.bz2/libavformat/avisynth.c Changed

@@ -1,6 +1,6 @@
 /*
- * AVISynth support
- * Copyright (c) 2006 DivX, Inc.
+ * AviSynth/AvxSynth support
+ * Copyright (c) 2012 AvxSynth Team.
 *
 * This file is part of Libav.
 *
@@ -19,209 +19,673 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "libavutil/internal.h"
+#include "libavcodec/internal.h"
 #include "avformat.h"
 #include "internal.h"
-#include "riff.h"
-
-#include <windows.h>
-#include <vfw.h>
-
-typedef struct {
- PAVISTREAM handle;
- AVISTREAMINFO info;
- DWORD read;
- LONG chunck_size;
- LONG chunck_samples;
-} AVISynthStream;
-
-typedef struct {
- PAVIFILE file;
- AVISynthStream *streams;
- int nb_streams;
- int next_stream;
-} AVISynthContext;
-
-static int avisynth_read_header(AVFormatContext *s)
+
+/* Enable function pointer definitions for runtime loading. */
+#define AVSC_NO_DECLSPEC
+
+/* Platform-specific directives for AviSynth vs AvxSynth.
+ *
+ * avisynth_c.h needs to be the one provided with x264, as
+ * the one in AviSynth's CVS hasn't been updated to support
+ * 2.6's extra colorspaces. A temporary source of that header,
+ * installable from a GNU-style Makefile is available from
+ * github.com/qyot27/avisynth_headers -- AvxSynth doesn't
+ * require this kind of special treatment because like any
+ * standard *nix application, it installs its headers
+ * alongside its libs. */
+#ifdef _WIN32
+ #include <windows.h>
+ #undef EXTERN_C
+ #include <avisynth/avisynth_c.h>
+ #define AVISYNTH_LIB "avisynth"
+ #define USING_AVISYNTH
+#else
+ #include <dlfcn.h>
+ #include <avxsynth/avxsynth_c.h>
+ #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
+
+typedef struct AviSynthLibrary {
+ void *library;
+#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);
+ AVSC_DECLARE_FUNC(avs_delete_script_environment);
+ AVSC_DECLARE_FUNC(avs_get_audio);
+ AVSC_DECLARE_FUNC(avs_get_error);
+ AVSC_DECLARE_FUNC(avs_get_frame);
+ AVSC_DECLARE_FUNC(avs_get_version);
+ AVSC_DECLARE_FUNC(avs_get_video_info);
+ AVSC_DECLARE_FUNC(avs_invoke);
+ AVSC_DECLARE_FUNC(avs_release_clip);
+ AVSC_DECLARE_FUNC(avs_release_value);
+ AVSC_DECLARE_FUNC(avs_release_video_frame);
+ AVSC_DECLARE_FUNC(avs_take_clip);
+#undef AVSC_DECLARE_FUNC
+} AviSynthLibrary;
+
+typedef struct AviSynthContext {
+ AVS_ScriptEnvironment *env;
+ AVS_Clip *clip;
+ const AVS_VideoInfo *vi;
+
+ /* avisynth_read_packet_video() iterates over this. */
+ int n_planes;
+ const int *planes;
+
+ int curr_stream;
+ int curr_frame;
+ int64_t curr_sample;
+
+ int error;
+
+ /* Linked list pointers. */
+ struct AviSynthContext *next;
+} 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 };
+
+/* 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. */
+static AviSynthContext *avs_ctx_list = NULL;
+
+static av_cold void avisynth_atexit_handler(void);
+
+static av_cold int avisynth_load_library(void)
+{
+ avs_library.library = LoadLibrary(AVISYNTH_LIB);
+ if (!avs_library.library)
+ return AVERROR_UNKNOWN;
+
+#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);
+ LOAD_AVS_FUNC(avs_delete_script_environment, 0);
+ LOAD_AVS_FUNC(avs_get_audio, 0);
+ LOAD_AVS_FUNC(avs_get_error, 1); // New to AviSynth 2.6
+ LOAD_AVS_FUNC(avs_get_frame, 0);
+ LOAD_AVS_FUNC(avs_get_version, 0);
+ LOAD_AVS_FUNC(avs_get_video_info, 0);
+ LOAD_AVS_FUNC(avs_invoke, 0);
+ LOAD_AVS_FUNC(avs_release_clip, 0);
+ LOAD_AVS_FUNC(avs_release_value, 0);
+ LOAD_AVS_FUNC(avs_release_video_frame, 0);
+ LOAD_AVS_FUNC(avs_take_clip, 0);
+#undef LOAD_AVS_FUNC
+
+ atexit(avisynth_atexit_handler);
+ return 0;
+
+fail:
+ 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 = s->priv_data;
+ int ret;
+
+ 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);
+ if (error) {
+ av_log(s, AV_LOG_ERROR, "%s\n", error);
+ return AVERROR_UNKNOWN;
+ }
+ }
+
+ if (!avs_ctx_list) {
+ avs_ctx_list = avs;
+ } else {
+ avs->next = avs_ctx_list;
+ avs_ctx_list = avs;
+ }
+
+ return 0;
+}
+
+static av_cold void avisynth_context_destroy(AviSynthContext *avs)
+{
+ if (avs_atexit_called)
+ return;
+
+ if (avs == avs_ctx_list) {
+ avs_ctx_list = avs->next;
+ } else {
+ AviSynthContext *prev = avs_ctx_list;
+ while (prev->next != avs)
+ prev = prev->next;
+ prev->next = avs->next;
+ }
+
+ if (avs->clip) {
+ avs_library.avs_release_clip(avs->clip);
+ avs->clip = NULL;
+ }
+ if (avs->env) {
+ avs_library.avs_delete_script_environment(avs->env);
+ avs->env = NULL;
+ }
+}
+
+static av_cold void avisynth_atexit_handler(void)
+{
+ AviSynthContext *avs = avs_ctx_list;
+
+ while (avs) {
+ AviSynthContext *next = avs->next;
+ avisynth_context_destroy(avs);
+ avs = next;
+ }
+ 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)
 {
- AVISynthContext *avs = s->priv_data;
- HRESULT res;
- AVIFILEINFO info;
- DWORD id;
- AVStream *st;
- AVISynthStream *stream;
- wchar_t filename_wchar[1024] = { 0 };
- char filename_char[1024] = { 0 };
-
- AVIFileInit();
-
- /* avisynth can't accept UTF-8 filename */
- MultiByteToWideChar(CP_UTF8, 0, s->filename, -1, filename_wchar, 1024);
- WideCharToMultiByte(CP_THREAD_ACP, 0, filename_wchar, -1, filename_char, 1024, NULL, NULL);
- res = AVIFileOpen(&avs->file, filename_char, OF_READ|OF_SHARE_DENY_WRITE, NULL);
- if (res != S_OK)
- {
- av_log(s, AV_LOG_ERROR, "AVIFileOpen failed with error %ld", res);
- AVIFileExit();
- return -1;
- }
-
- res = AVIFileInfo(avs->file, &info, sizeof(info));
- if (res != S_OK)
- {
- av_log(s, AV_LOG_ERROR, "AVIFileInfo failed with error %ld", res);
- AVIFileExit();
- return -1;
- }
-
- avs->streams = av_mallocz(info.dwStreams * sizeof(AVISynthStream));
-
- for (id=0; id<info.dwStreams; id++)
- {
- stream = &avs->streams[id];
- stream->read = 0;
- if (AVIFileGetStream(avs->file, &stream->handle, 0, id) == S_OK)
- {
- if (AVIStreamInfo(stream->handle, &stream->info, sizeof(stream->info)) == S_OK)
- {
- if (stream->info.fccType == streamtypeAUDIO)
- {
- WAVEFORMATEX wvfmt;
- LONG struct_size = sizeof(WAVEFORMATEX);
- if (AVIStreamReadFormat(stream->handle, 0, &wvfmt, &struct_size) != S_OK)
- continue;
-
- st = avformat_new_stream(s, NULL);
- st->id = id;
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-
- st->codec->block_align = wvfmt.nBlockAlign;
- st->codec->channels = wvfmt.nChannels;
- st->codec->sample_rate = wvfmt.nSamplesPerSec;
- st->codec->bit_rate = wvfmt.nAvgBytesPerSec * 8;
- st->codec->bits_per_coded_sample = wvfmt.wBitsPerSample;
-
- stream->chunck_samples = wvfmt.nSamplesPerSec * (uint64_t)info.dwScale / (uint64_t)info.dwRate;
- stream->chunck_size = stream->chunck_samples * wvfmt.nChannels * wvfmt.wBitsPerSample / 8;
-
- st->codec->codec_tag = wvfmt.wFormatTag;
- st->codec->codec_id = ff_wav_codec_get_id(wvfmt.wFormatTag, st->codec->bits_per_coded_sample);
- }
- else if (stream->info.fccType == streamtypeVIDEO)
- {
- BITMAPINFO imgfmt;
- LONG struct_size = sizeof(BITMAPINFO);
-
- stream->chunck_size = stream->info.dwSampleSize;
- stream->chunck_samples = 1;
-
- if (AVIStreamReadFormat(stream->handle, 0, &imgfmt, &struct_size) != S_OK)
- continue;
-
- st = avformat_new_stream(s, NULL);
- st->id = id;
- st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->avg_frame_rate.num = stream->info.dwRate;
- st->avg_frame_rate.den = stream->info.dwScale;
-#if FF_API_R_FRAME_RATE
- st->r_frame_rate = st->avg_frame_rate;
+ 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 = 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 USING_AVISYNTH
+ case AVS_CS_YV24:
+ st->codec->pix_fmt = AV_PIX_FMT_YUV444P;
+ planar = 1;
+ break;
+ case AVS_CS_YV16:
+ st->codec->pix_fmt = AV_PIX_FMT_YUV422P;
+ planar = 1;
+ break;
+ case AVS_CS_YV411:
+ st->codec->pix_fmt = AV_PIX_FMT_YUV411P;
+ planar = 1;
+ break;
+ case AVS_CS_Y8:
+ st->codec->pix_fmt = AV_PIX_FMT_GRAY8;
+ planar = 2;
+ break;
 #endif
+ case AVS_CS_BGR24:
+ st->codec->pix_fmt = AV_PIX_FMT_BGR24;
+ break;
+ case AVS_CS_BGR32:
+ st->codec->pix_fmt = AV_PIX_FMT_RGB32;
+ break;
+ case AVS_CS_YUY2:
+ st->codec->pix_fmt = AV_PIX_FMT_YUYV422;
+ break;
+ case AVS_CS_YV12:
+ st->codec->pix_fmt = AV_PIX_FMT_YUV420P;
+ planar = 1;
+ break;
+ case AVS_CS_I420: // Is this even used anywhere?
+ st->codec->pix_fmt = AV_PIX_FMT_YUV420P;
+ planar = 1;
+ break;
+ default:
+ av_log(s, AV_LOG_ERROR,
+ "unknown AviSynth colorspace %d\n", avs->vi->pixel_type);
+ avs->error = 1;
+ return AVERROR_UNKNOWN;
+ }
 
- st->codec->width = imgfmt.bmiHeader.biWidth;
- st->codec->height = imgfmt.bmiHeader.biHeight;
+ switch (planar) {
+ case 2: // Y8
+ avs->n_planes = 1;
+ avs->planes = avs_planes_grey;
+ break;
+ case 1: // YUV
+ avs->n_planes = 3;
+ avs->planes = avs_planes_yuv;
+ break;
+ default:
+ avs->n_planes = 1;
+ avs->planes = avs_planes_packed;
+ }
+ return 0;
+}
+
+static int avisynth_create_stream_audio(AVFormatContext *s, AVStream *st)
+{
+ AviSynthContext *avs = s->priv_data;
+
+ 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 };
+
+ switch (avs->vi->sample_type) {
+ case AVS_SAMPLE_INT8:
+ st->codec->codec_id = AV_CODEC_ID_PCM_U8;
+ break;
+ case AVS_SAMPLE_INT16:
+ st->codec->codec_id = AV_CODEC_ID_PCM_S16LE;
+ break;
+ case AVS_SAMPLE_INT24:
+ st->codec->codec_id = AV_CODEC_ID_PCM_S24LE;
+ break;
+ case AVS_SAMPLE_INT32:
+ st->codec->codec_id = AV_CODEC_ID_PCM_S32LE;
+ break;
+ case AVS_SAMPLE_FLOAT:
+ 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);
+ avs->error = 1;
+ return AVERROR_UNKNOWN;
+ }
+ return 0;
+}
+
+static int avisynth_create_stream(AVFormatContext *s)
+{
+ AviSynthContext *avs = s->priv_data;
+ AVStream *st;
+ int ret;
+ int id = 0;
+
+ if (avs_has_video(avs->vi)) {
+ st = avformat_new_stream(s, NULL);
+ if (!st)
+ return AVERROR_UNKNOWN;
+ st->id = id++;
+ if (ret = avisynth_create_stream_video(s, st))
+ return ret;
+ }
+ if (avs_has_audio(avs->vi)) {
+ st = avformat_new_stream(s, NULL);
+ if (!st)
+ return AVERROR_UNKNOWN;
+ st->id = id++;
+ if (ret = avisynth_create_stream_audio(s, st))
+ return ret;
+ }
+ return 0;
+}
 
- st->codec->bits_per_coded_sample = imgfmt.bmiHeader.biBitCount;
- st->codec->bit_rate = (uint64_t)stream->info.dwSampleSize * (uint64_t)stream->info.dwRate * 8 / (uint64_t)stream->info.dwScale;
- st->codec->codec_tag = imgfmt.bmiHeader.biCompression;
- st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, imgfmt.bmiHeader.biCompression);
+static int avisynth_open_file(AVFormatContext *s)
+{
+ AviSynthContext *avs = s->priv_data;
+ AVS_Value arg, val;
+ int ret;
+#ifdef USING_AVISYNTH
+ char filename_ansi[MAX_PATH * 4];
+ wchar_t filename_wc[MAX_PATH * 4];
+#endif
 
- st->duration = stream->info.dwLength;
- }
- else
- {
- AVIStreamRelease(stream->handle);
- continue;
- }
+ if (ret = avisynth_context_create(s))
+ return ret;
+
+#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);
+ 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);
+ 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, "AviSynth script did not return a clip\n");
+ ret = AVERROR_UNKNOWN;
+ goto fail;
+ }
 
- avs->nb_streams++;
+ avs->clip = avs_library.avs_take_clip(val, avs->env);
+ avs->vi = avs_library.avs_get_video_info(avs->clip);
 
- st->codec->stream_codec_tag = stream->info.fccHandler;
+#ifdef USING_AVISYNTH
+ /* libav only supports AviSynth 2.6 on Windows. Since AvxSynth
+ * identifies itself as interface version 3 like 2.5.8, this
+ * needs to be special-cased. */
 
- avpriv_set_pts_info(st, 64, info.dwScale, info.dwRate);
- st->start_time = stream->info.dwStart;
- }
- }
+ if (avs_library.avs_get_version(avs->clip) == 3) {
+ av_log(s, AV_LOG_ERROR,
+ "AviSynth 2.5.8 not supported. Please upgrade to 2.6.\n");
+ ret = AVERROR_UNKNOWN;
+ goto fail;
 }
+#endif
+
+ /* 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;
 
- return 0;
+ return 0;
+
+fail:
+ avisynth_context_destroy(avs);
+ return ret;
 }
 
-static int avisynth_read_packet(AVFormatContext *s, AVPacket *pkt)
+static void avisynth_next_stream(AVFormatContext *s, AVStream **st,
+ AVPacket *pkt, int *discard)
+{
+ AviSynthContext *avs = s->priv_data;
+
+ avs->curr_stream++;
+ avs->curr_stream %= s->nb_streams;
+
+ *st = s->streams[avs->curr_stream];
+ if ((*st)->discard == AVDISCARD_ALL)
+ *discard = 1;
+ else
+ *discard = 0;
+
+ return;
+}
+
+/* Copy AviSynth clip data into an AVPacket. */
+static int avisynth_read_packet_video(AVFormatContext *s, AVPacket *pkt,
+ int discard)
 {
- AVISynthContext *avs = s->priv_data;
- HRESULT res;
- AVISynthStream *stream;
- int stream_id = avs->next_stream;
- LONG read_size;
+ AviSynthContext *avs = s->priv_data;
+ AVS_VideoFrame *frame;
+ unsigned char *dst_p;
+ const unsigned char *src_p;
+ int n, i, plane, rowsize, planeheight, pitch, bits;
+ const char *error;
+
+ if (avs->curr_frame >= avs->vi->num_frames)
+ return AVERROR_EOF;
+
+ /* This must happen even if the stream is discarded to prevent desync. */
+ n = avs->curr_frame++;
+ if (discard)
+ return 0;
+
+#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. */
+
+ if (avs_is_yv24(avs->vi))
+ bits = 24;
+ else if (avs_is_yv16(avs->vi))
+ bits = 16;
+ else if (avs_is_yv411(avs->vi))
+ bits = 12;
+ else if (avs_is_y8(avs->vi))
+ bits = 8;
+ else
+#endif
+ bits = avs_bits_per_pixel(avs->vi);
+
+ /* 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;
+
+ 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_packet_unref(pkt);
+ return AVERROR_UNKNOWN;
+ }
 
- // handle interleaving manually...
- stream = &avs->streams[stream_id];
+ dst_p = pkt->data;
+ for (i = 0; i < avs->n_planes; i++) {
+ plane = avs->planes[i];
+ src_p = avs_get_read_ptr_p(frame, plane);
+ pitch = avs_get_pitch_p(frame, plane);
 
- if (stream->read >= stream->info.dwLength)
- return AVERROR(EIO);
+ rowsize = avs_get_row_size_p(frame, plane);
+ planeheight = avs_get_height_p(frame, plane);
 
- if (av_new_packet(pkt, stream->chunck_size))
- return AVERROR(EIO);
- pkt->stream_index = stream_id;
- pkt->pts = avs->streams[stream_id].read / avs->streams[stream_id].chunck_samples;
+ /* Flip RGB video. */
+ if (avs_is_rgb24(avs->vi) || avs_is_rgb(avs->vi)) {
+ src_p = src_p + (planeheight - 1) * pitch;
+ pitch = -pitch;
+ }
 
- res = AVIStreamRead(stream->handle, stream->read, stream->chunck_samples, pkt->data, stream->chunck_size, &read_size, NULL);
+ avs_library.avs_bit_blt(avs->env, dst_p, rowsize, src_p, pitch,
+ rowsize, planeheight);
+ dst_p += rowsize * planeheight;
+ }
 
- pkt->pts = stream->read;
- pkt->size = read_size;
+ avs_library.avs_release_video_frame(frame);
+ return 0;
+}
 
- stream->read += stream->chunck_samples;
+static int avisynth_read_packet_audio(AVFormatContext *s, AVPacket *pkt,
+ int discard)
+{
+ AviSynthContext *avs = s->priv_data;
+ AVRational fps, samplerate;
+ int samples;
+ int64_t n;
+ const char *error;
+
+ if (avs->curr_sample >= avs->vi->num_audio_samples)
+ return AVERROR_EOF;
+
+ 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;
+ else
+ samples = av_rescale_q(1, samplerate, fps);
+ } else {
+ samples = 1000;
+ }
 
- // prepare for the next stream to read
- do {
- avs->next_stream = (avs->next_stream+1) % avs->nb_streams;
- } while (avs->next_stream != stream_id && s->streams[avs->next_stream]->discard >= AVDISCARD_ALL);
+ /* After seeking, audio may catch up with video. */
+ if (samples <= 0) {
+ pkt->size = 0;
+ pkt->data = NULL;
+ return 0;
+ }
 
- return (res == S_OK) ? pkt->size : -1;
+ 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;
+ avs->curr_sample += samples;
+ if (discard)
+ return 0;
+
+ pkt->size = avs_bytes_per_channel_sample(avs->vi) *
+ samples * avs->vi->nchannels;
+ if (!pkt->size)
+ return AVERROR_UNKNOWN;
+
+ 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_packet_unref(pkt);
+ return AVERROR_UNKNOWN;
+ }
+ return 0;
 }
 
-static int avisynth_read_close(AVFormatContext *s)
+static av_cold int avisynth_read_header(AVFormatContext *s)
 {
- AVISynthContext *avs = s->priv_data;
- int i;
+ int ret;
+
+ // Calling library must implement a lock for thread-safe opens.
+ if (ret = avpriv_lock_avformat())
+ return ret;
+
+ if (ret = avisynth_open_file(s)) {
+ avpriv_unlock_avformat();
+ return ret;
+ }
 
- for (i=0;i<avs->nb_streams;i++)
- {
- AVIStreamRelease(avs->streams[i].handle);
+ avpriv_unlock_avformat();
+ return 0;
+}
+
+static int avisynth_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ AviSynthContext *avs = s->priv_data;
+ AVStream *st;
+ int discard = 0;
+ int ret;
+
+ if (avs->error)
+ return AVERROR_UNKNOWN;
+
+ /* 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);
+ if (ret == AVERROR_EOF && avs_has_audio(avs->vi)) {
+ avisynth_next_stream(s, &st, pkt, &discard);
+ return avisynth_read_packet_audio(s, pkt, discard);
+ }
+ } 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);
+ }
 }
 
- av_free(avs->streams);
- AVIFileRelease(avs->file);
- AVIFileExit();
- return 0;
+ return ret;
 }
 
-static int avisynth_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags)
+static av_cold int avisynth_read_close(AVFormatContext *s)
 {
- AVISynthContext *avs = s->priv_data;
- int stream_id;
+ if (avpriv_lock_avformat())
+ return AVERROR_UNKNOWN;
+
+ avisynth_context_destroy(s->priv_data);
+ avpriv_unlock_avformat();
+ return 0;
+}
 
- for (stream_id = 0; stream_id < avs->nb_streams; stream_id++)
- {
- avs->streams[stream_id].read = pts * avs->streams[stream_id].chunck_samples;
+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;
+
+ 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 };
+
+ 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))
+ return AVERROR_EOF;
+ avs->curr_frame = timestamp;
+ if (avs_has_audio(avs->vi))
+ avs->curr_sample = av_rescale_q(timestamp, samplerate, fps);
+ } else {
+ if ((timestamp >= avs->vi->num_audio_samples) || (timestamp < 0))
+ return AVERROR_EOF;
+ /* Force frame granularity for seeking. */
+ if (avs_has_video(avs->vi)) {
+ 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;
+ }
 }
 
- return 0;
+ return 0;
 }
 
 AVInputFormat ff_avisynth_demuxer = {
- .name = "avs",
- .long_name = NULL_IF_CONFIG_SMALL("AVISynth"),
- .priv_data_size = sizeof(AVISynthContext),
+ .name = "avisynth",
+ .long_name = NULL_IF_CONFIG_SMALL("AviSynth script"),
+ .priv_data_size = sizeof(AviSynthContext),
 .read_header = avisynth_read_header,
 .read_packet = avisynth_read_packet,
 .read_close = avisynth_read_close,

libav-v9.6.tar.bz2/libavformat/avs.c -> libav-v10.1.tar.bz2/libavformat/avs.c Changed

libav-v9.6.tar.bz2/libavformat/bethsoftvid.c -> libav-v10.1.tar.bz2/libavformat/bethsoftvid.c Changed

libav-v9.6.tar.bz2/libavformat/bfi.c -> libav-v10.1.tar.bz2/libavformat/bfi.c Changed

libav-v9.6.tar.bz2/libavformat/bink.c -> libav-v10.1.tar.bz2/libavformat/bink.c Changed

libav-v9.6.tar.bz2/libavformat/bmv.c -> libav-v10.1.tar.bz2/libavformat/bmv.c Changed

libav-v9.6.tar.bz2/libavformat/cavsvideodec.c -> libav-v10.1.tar.bz2/libavformat/cavsvideodec.c Changed

libav-v9.6.tar.bz2/libavformat/concat.c -> libav-v10.1.tar.bz2/libavformat/concat.c Changed

@@ -56,7 +56,7 @@
 
 static av_cold int concat_open(URLContext *h, const char *uri, int flags)
 {
- char *node_uri = NULL, *tmp_uri;
+ char *node_uri = NULL;
 int err = 0;
 int64_t size;
 size_t len, i;
@@ -74,7 +74,7 @@
 return AVERROR(ENAMETOOLONG);
 }
 
- if (!(nodes = av_malloc(sizeof(*nodes) * len))) {
+ if (!(nodes = av_realloc(NULL, sizeof(*nodes) * len))) {
 return AVERROR(ENOMEM);
 } else
 data->nodes = nodes;
@@ -85,11 +85,8 @@
 for (i = 0; *uri; i++) {
 /* parsing uri */
 len = strcspn(uri, AV_CAT_SEPARATOR);
- if (!(tmp_uri = av_realloc(node_uri, len+1))) {
- err = AVERROR(ENOMEM);
+ if ((err = av_reallocp(&node_uri, len + 1)) < 0)
 break;
- } else
- node_uri = tmp_uri;
 av_strlcpy(node_uri, uri, len+1);
 uri += len + strspn(uri+len, AV_CAT_SEPARATOR);
 
@@ -114,10 +111,9 @@
 
 if (err < 0)
 concat_close(h);
- else if (!(nodes = av_realloc(nodes, data->length * sizeof(*nodes)))) {
+ else if ((err = av_reallocp(&nodes, data->length * sizeof(*nodes))) < 0)
 concat_close(h);
- err = AVERROR(ENOMEM);
- } else
+ else
 data->nodes = nodes;
 return err;
 }

libav-v9.6.tar.bz2/libavformat/daud.c -> libav-v10.1.tar.bz2/libavformat/daud.c Changed

libav-v9.6.tar.bz2/libavformat/dsicin.c -> libav-v10.1.tar.bz2/libavformat/dsicin.c Changed

libav-v9.6.tar.bz2/libavformat/dtsdec.c -> libav-v10.1.tar.bz2/libavformat/dtsdec.c Changed

libav-v9.6.tar.bz2/libavformat/dv.c -> libav-v10.1.tar.bz2/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"
@@ -63,7 +63,7 @@
 shift--;
 result = (sample - (256 * shift)) << shift;
 } else {
- shift = 0xe - shift;
+ shift = 0xe - shift;
 result = ((sample + ((256 * shift) + 1)) << shift) - 1;
 }
 
@@ -75,19 +75,19 @@
 * a fixed offset and if pack isn't there -- fails. We might want
 * to have a fallback mechanism for complete search of missing packs.
 */
-static const uint8_t* dv_extract_pack(uint8_t* frame, enum dv_pack_type t)
+static const uint8_t *dv_extract_pack(uint8_t *frame, enum dv_pack_type t)
 {
 int offs;
 
 switch (t) {
 case dv_audio_source:
- offs = (80*6 + 80*16*3 + 3);
+ offs = (80 * 6 + 80 * 16 * 3 + 3);
 break;
 case dv_audio_control:
- offs = (80*6 + 80*16*4 + 3);
+ offs = (80 * 6 + 80 * 16 * 4 + 3);
 break;
 case dv_video_control:
- offs = (80*5 + 48 + 5);
+ offs = (80 * 5 + 48 + 5);
 break;
 default:
 return NULL;
@@ -108,29 +108,29 @@
 * 3. Audio is always returned as 16bit linear samples: 12bit nonlinear samples
 * are converted into 16bit linear ones.
 */
-static int dv_extract_audio(uint8_t* frame, uint8_t* ppcm[4],
+static int dv_extract_audio(uint8_t *frame, uint8_t **ppcm,
 const DVprofile *sys)
 {
 int size, chan, i, j, d, of, smpls, freq, quant, half_ch;
 uint16_t lc, rc;
- const uint8_t* as_pack;
+ const uint8_t *as_pack;
 uint8_t *pcm, ipcm;
 
 as_pack = dv_extract_pack(frame, dv_audio_source);
 if (!as_pack) /* No audio ? */
 return 0;
 
- smpls = as_pack[1] & 0x3f; /* samples in this frame - min. samples */
- freq = (as_pack[4] >> 3) & 0x07; /* 0 - 48kHz, 1 - 44,1kHz, 2 - 32kHz */
- quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */
+ smpls = as_pack[1] & 0x3f; /* samples in this frame - min. samples */
+ freq = as_pack[4] >> 3 & 0x07; /* 0 - 48kHz, 1 - 44,1kHz, 2 - 32kHz */
+ quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */
 
 if (quant > 1)
- return -1; /* unsupported quantization */
+ return -1; /* unsupported quantization */
 
 if (freq >= FF_ARRAY_ELEMS(dv_audio_frequency))
 return AVERROR_INVALIDDATA;
 
- size = (sys->audio_min_samples[freq] + smpls) * 4; /* 2ch, 2bytes */
+ size = (sys->audio_min_samples[freq] + smpls) * 4; /* 2ch, 2bytes */
 half_ch = sys->difseg_size / 2;
 
 /* We work with 720p frames split in half, thus even frames have
@@ -158,32 +158,41 @@
 for (j = 0; j < 9; j++) {
 for (d = 8; d < 80; d += 2) {
 if (quant == 0) { /* 16bit quantization */
- of = sys->audio_shuffle[i][j] + (d - 8) / 2 * sys->audio_stride;
- if (of*2 >= size)
+ of = sys->audio_shuffle[i][j] +
+ (d - 8) / 2 * sys->audio_stride;
+ if (of * 2 >= size)
 continue;
 
- pcm[of*2] = frame[d+1]; // FIXME: maybe we have to admit
- pcm[of*2+1] = frame[d]; // that DV is a big-endian PCM
- if (pcm[of*2+1] == 0x80 && pcm[of*2] == 0x00)
- pcm[of*2+1] = 0;
+ /* FIXME: maybe we have to admit that DV is a
+ * big-endian PCM */
+ pcm[of * 2] = frame[d + 1];
+ pcm[of * 2 + 1] = frame[d];
+
+ if (pcm[of * 2 + 1] == 0x80 && pcm[of * 2] == 0x00)
+ pcm[of * 2 + 1] = 0;
 } else { /* 12bit quantization */
- lc = ((uint16_t)frame[d] << 4) |
- ((uint16_t)frame[d+2] >> 4);
- rc = ((uint16_t)frame[d+1] << 4) |
- ((uint16_t)frame[d+2] & 0x0f);
+ lc = ((uint16_t)frame[d] << 4) |
+ ((uint16_t)frame[d + 2] >> 4);
+ rc = ((uint16_t)frame[d + 1] << 4) |
+ ((uint16_t)frame[d + 2] & 0x0f);
 lc = (lc == 0x800 ? 0 : dv_audio_12to16(lc));
 rc = (rc == 0x800 ? 0 : dv_audio_12to16(rc));
 
- of = sys->audio_shuffle[i%half_ch][j] + (d - 8) / 3 * sys->audio_stride;
- if (of*2 >= size)
+ of = sys->audio_shuffle[i % half_ch][j] +
+ (d - 8) / 3 * sys->audio_stride;
+ if (of * 2 >= size)
 continue;
 
- pcm[of*2] = lc & 0xff; // FIXME: maybe we have to admit
- pcm[of*2+1] = lc >> 8; // that DV is a big-endian PCM
- of = sys->audio_shuffle[i%half_ch+half_ch][j] +
- (d - 8) / 3 * sys->audio_stride;
- pcm[of*2] = rc & 0xff; // FIXME: maybe we have to admit
- pcm[of*2+1] = rc >> 8; // that DV is a big-endian PCM
+ /* FIXME: maybe we have to admit that DV is a
+ * big-endian PCM */
+ pcm[of * 2] = lc & 0xff;
+ pcm[of * 2 + 1] = lc >> 8;
+ of = sys->audio_shuffle[i % half_ch + half_ch][j] +
+ (d - 8) / 3 * sys->audio_stride;
+ /* FIXME: maybe we have to admit that DV is a
+ * big-endian PCM */
+ pcm[of * 2] = rc & 0xff;
+ pcm[of * 2 + 1] = rc >> 8;
 ++d;
 }
 }
@@ -196,9 +205,9 @@
 return size;
 }
 
-static int dv_extract_audio_info(DVDemuxContext* c, uint8_t* frame)
+static int dv_extract_audio_info(DVDemuxContext *c, uint8_t *frame)
 {
- const uint8_t* as_pack;
+ const uint8_t *as_pack;
 int freq, stype, smpls, quant, i, ach;
 
 as_pack = dv_extract_pack(frame, dv_audio_source);
@@ -207,10 +216,10 @@
 return 0;
 }
 
- smpls = as_pack[1] & 0x3f; /* samples in this frame - min. samples */
- freq = (as_pack[4] >> 3) & 0x07; /* 0 - 48kHz, 1 - 44,1kHz, 2 - 32kHz */
- stype = (as_pack[3] & 0x1f); /* 0 - 2CH, 2 - 4CH, 3 - 8CH */
- quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */
+ smpls = as_pack[1] & 0x3f; /* samples in this frame - min. samples */
+ freq = as_pack[4] >> 3 & 0x07; /* 0 - 48kHz, 1 - 44,1kHz, 2 - 32kHz */
+ stype = as_pack[3] & 0x1f; /* 0 - 2CH, 2 - 4CH, 3 - 8CH */
+ quant = as_pack[4] & 0x07; /* 0 - 16bit linear, 1 - 12bit nonlinear */
 
 if (freq >= FF_ARRAY_ELEMS(dv_audio_frequency)) {
 av_log(c->fctx, AV_LOG_ERROR,
@@ -225,7 +234,7 @@
 }
 
 /* note: ach counts PAIRS of channels (i.e. stereo channels) */
- ach = ((int[4]){ 1, 0, 2, 4})[stype];
+ ach = ((int[4]) { 1, 0, 2, 4 })[stype];
 if (ach == 1 && quant && freq == 2)
 ach = 2;
 
@@ -245,21 +254,21 @@
 c->audio_pkt[i].stream_index = c->ast[i]->index;
 c->audio_pkt[i].flags |= AV_PKT_FLAG_KEY;
 }
- c->ast[i]->codec->sample_rate = dv_audio_frequency[freq];
- c->ast[i]->codec->channels = 2;
+ c->ast[i]->codec->sample_rate = dv_audio_frequency[freq];
+ c->ast[i]->codec->channels = 2;
 c->ast[i]->codec->channel_layout = AV_CH_LAYOUT_STEREO;
- c->ast[i]->codec->bit_rate = 2 * dv_audio_frequency[freq] * 16;
- c->ast[i]->start_time = 0;
+ c->ast[i]->codec->bit_rate = 2 * dv_audio_frequency[freq] * 16;
+ c->ast[i]->start_time = 0;
 }
 c->ach = i;
 
- return (c->sys->audio_min_samples[freq] + smpls) * 4; /* 2ch, 2bytes */;
+ return (c->sys->audio_min_samples[freq] + smpls) * 4; /* 2ch, 2bytes */
 }
 
-static int dv_extract_video_info(DVDemuxContext *c, uint8_t* frame)
+static int dv_extract_video_info(DVDemuxContext *c, uint8_t *frame)
 {
- const uint8_t* vsc_pack;
- AVCodecContext* avctx;
+ const uint8_t *vsc_pack;
+ AVCodecContext *avctx;
 int apt, is16_9;
 int size = 0;
 
@@ -268,9 +277,9 @@
 
 avpriv_set_pts_info(c->vst, 64, c->sys->time_base.num,
 c->sys->time_base.den);
- avctx->time_base= c->sys->time_base;
- if (!avctx->width){
- avctx->width = c->sys->width;
+ avctx->time_base = c->sys->time_base;
+ if (!avctx->width) {
+ avctx->width = c->sys->width;
 avctx->height = c->sys->height;
 }
 avctx->pix_fmt = c->sys->pix_fmt;
@@ -281,18 +290,17 @@
 is16_9 = (vsc_pack && ((vsc_pack[2] & 0x07) == 0x02 ||
 (!apt && (vsc_pack[2] & 0x07) == 0x07)));
 c->vst->sample_aspect_ratio = c->sys->sar[is16_9];
- avctx->bit_rate = av_rescale_q(c->sys->frame_size, (AVRational){8,1},
+ avctx->bit_rate = av_rescale_q(c->sys->frame_size,
+ (AVRational) { 8, 1 },
 c->sys->time_base);
 size = c->sys->frame_size;
 }
 return size;
 }
 
-/*
- * The following 3 functions constitute our interface to the world
- */
+/* The following 3 functions constitute our interface to the world */
 
-DVDemuxContext* avpriv_dv_init_demux(AVFormatContext *s)
+DVDemuxContext *avpriv_dv_init_demux(AVFormatContext *s)
 {
 DVDemuxContext *c;
 
@@ -322,9 +330,9 @@
 
 for (i = 0; i < c->ach; i++) {
 if (c->ast[i] && c->audio_pkt[i].size) {
- *pkt = c->audio_pkt[i];
+ *pkt = c->audio_pkt[i];
 c->audio_pkt[i].size = 0;
- size = pkt->size;
+ size = pkt->size;
 break;
 }
 }
@@ -333,10 +341,10 @@
 }
 
 int avpriv_dv_produce_packet(DVDemuxContext *c, AVPacket *pkt,
- uint8_t* buf, int buf_size)
+ uint8_t *buf, int buf_size)
 {
 int size, i;
- uint8_t *ppcm[4] = {0};
+ uint8_t *ppcm[5] = { 0 };
 
 if (buf_size < DV_PROFILE_BYTES ||
 !(c->sys = avpriv_dv_frame_profile(c->sys, buf, buf_size)) ||
@@ -349,7 +357,8 @@
 size = dv_extract_audio_info(c, buf);
 for (i = 0; i < c->ach; i++) {
 c->audio_pkt[i].size = size;
- c->audio_pkt[i].pts = c->abytes * 30000 * 8 / c->ast[i]->codec->bit_rate;
+ c->audio_pkt[i].pts = c->abytes * 30000 * 8 /
+ c->ast[i]->codec->bit_rate;
 ppcm[i] = c->audio_buf[i];
 }
 if (c->ach)
@@ -362,7 +371,7 @@
 c->audio_pkt[2].size = c->audio_pkt[3].size = 0;
 } else {
 c->audio_pkt[0].size = c->audio_pkt[1].size = 0;
- c->abytes += size;
+ c->abytes += size;
 }
 } else {
 c->abytes += size;
@@ -383,28 +392,31 @@
 }
 
 static int64_t dv_frame_offset(AVFormatContext *s, DVDemuxContext *c,
- int64_t timestamp, int flags)
+ int64_t timestamp, int flags)
 {
 // FIXME: sys may be wrong if last dv_read_packet() failed (buffer is junk)
- const DVprofile* sys = avpriv_dv_codec_profile(c->vst->codec);
+ const DVprofile *sys = avpriv_dv_codec_profile(c->vst->codec);
 int64_t offset;
- int64_t size = avio_size(s->pb) - s->data_offset;
- int64_t max_offset = ((size-1) / sys->frame_size) * sys->frame_size;
+ int64_t size = avio_size(s->pb) - s->data_offset;
+ int64_t max_offset = ((size - 1) / sys->frame_size) * sys->frame_size;
 
 offset = sys->frame_size * timestamp;
 
- if (size >= 0 && offset > max_offset) offset = max_offset;
- else if (offset < 0) offset = 0;
+ if (size >= 0 && offset > max_offset)
+ offset = max_offset;
+ else if (offset < 0)
+ offset = 0;
 
 return offset + s->data_offset;
 }
 
 void ff_dv_offset_reset(DVDemuxContext *c, int64_t frame_offset)
 {
- c->frames= frame_offset;
+ c->frames = frame_offset;
 if (c->ach)
- c->abytes= av_rescale_q(c->frames, c->sys->time_base,
- (AVRational){8, c->ast[0]->codec->bit_rate});
+ c->abytes = av_rescale_q(c->frames, c->sys->time_base,
+ (AVRational) { 8, c->ast[0]->codec->bit_rate });
+
 c->audio_pkt[0].size = c->audio_pkt[1].size = 0;
 c->audio_pkt[2].size = c->audio_pkt[3].size = 0;
 }
@@ -414,7 +426,7 @@
 ************************************************************/
 
 typedef struct RawDVContext {
- DVDemuxContext* dv_demux;
+ DVDemuxContext *dv_demux;
 uint8_t buf[DV_MAX_FRAME_SIZE];
 } RawDVContext;
 
@@ -448,19 +460,22 @@
 avio_seek(s->pb, -DV_PROFILE_BYTES, SEEK_CUR) < 0)
 return AVERROR(EIO);
 
- c->dv_demux->sys = avpriv_dv_frame_profile(c->dv_demux->sys, c->buf, DV_PROFILE_BYTES);
+ c->dv_demux->sys = avpriv_dv_frame_profile(c->dv_demux->sys,
+ c->buf,
+ DV_PROFILE_BYTES);
 if (!c->dv_demux->sys) {
- av_log(s, AV_LOG_ERROR, "Can't determine profile of DV input stream.\n");
+ av_log(s, AV_LOG_ERROR,
+ "Can't determine profile of DV input stream.\n");
 return -1;
 }
 
- s->bit_rate = av_rescale_q(c->dv_demux->sys->frame_size, (AVRational){8,1},
+ s->bit_rate = av_rescale_q(c->dv_demux->sys->frame_size,
+ (AVRational) { 8, 1 },
 c->dv_demux->sys->time_base);
 
 return 0;
 }
 
-
 static int dv_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
 int size;
@@ -482,7 +497,7 @@
 }
 
 static int dv_read_seek(AVFormatContext *s, int stream_index,
- int64_t timestamp, int flags)
+ int64_t timestamp, int flags)
 {
 RawDVContext *r = s->priv_data;
 DVDemuxContext *c = r->dv_demux;
@@ -506,7 +521,7 @@
 {
 unsigned state, marker_pos = 0;
 int i;
- int matches = 0;
+ int matches = 0;
 int secondary_matches = 0;
 
 if (p->buf_size < 5)
@@ -527,10 +542,13 @@
 state = (state << 8) | p->buf[i];
 }
 
- if (matches && p->buf_size / matches < 1024*1024) {
- if (matches > 4 || (secondary_matches >= 10 && p->buf_size / secondary_matches < 24000))
- return AVPROBE_SCORE_MAX*3/4; // not max to avoid dv in mov to match
- return AVPROBE_SCORE_MAX/4;
+ if (matches && p->buf_size / matches < 1024 * 1024) {
+ if (matches > 4 ||
+ (secondary_matches >= 10 &&
+ p->buf_size / secondary_matches < 24000))
+ // not max to avoid dv in mov to match
+ return AVPROBE_SCORE_MAX * 3 / 4;
+ return AVPROBE_SCORE_MAX / 4;
 }
 return 0;
 }

libav-v9.6.tar.bz2/libavformat/dvenc.c -> libav-v10.1.tar.bz2/libavformat/dvenc.c Changed

libav-v9.6.tar.bz2/libavformat/electronicarts.c -> libav-v10.1.tar.bz2/libavformat/electronicarts.c Changed

@@ -30,35 +30,35 @@
 #include "internal.h"
 
 #define SCHl_TAG MKTAG('S', 'C', 'H', 'l')
-#define SEAD_TAG MKTAG('S', 'E', 'A', 'D') /* Sxxx header */
-#define SNDC_TAG MKTAG('S', 'N', 'D', 'C') /* Sxxx data */
-#define SEND_TAG MKTAG('S', 'E', 'N', 'D') /* Sxxx end */
-#define SHEN_TAG MKTAG('S', 'H', 'E', 'N') /* SxEN header */
-#define SDEN_TAG MKTAG('S', 'D', 'E', 'N') /* SxEN data */
-#define SEEN_TAG MKTAG('S', 'E', 'E', 'N') /* SxEN end */
-#define ISNh_TAG MKTAG('1', 'S', 'N', 'h') /* 1SNx header */
+#define SEAD_TAG MKTAG('S', 'E', 'A', 'D') /* Sxxx header */
+#define SNDC_TAG MKTAG('S', 'N', 'D', 'C') /* Sxxx data */
+#define SEND_TAG MKTAG('S', 'E', 'N', 'D') /* Sxxx end */
+#define SHEN_TAG MKTAG('S', 'H', 'E', 'N') /* SxEN header */
+#define SDEN_TAG MKTAG('S', 'D', 'E', 'N') /* SxEN data */
+#define SEEN_TAG MKTAG('S', 'E', 'E', 'N') /* SxEN end */
+#define ISNh_TAG MKTAG('1', 'S', 'N', 'h') /* 1SNx header */
 #define EACS_TAG MKTAG('E', 'A', 'C', 'S')
-#define ISNd_TAG MKTAG('1', 'S', 'N', 'd') /* 1SNx data */
-#define ISNe_TAG MKTAG('1', 'S', 'N', 'e') /* 1SNx end */
+#define ISNd_TAG MKTAG('1', 'S', 'N', 'd') /* 1SNx data */
+#define ISNe_TAG MKTAG('1', 'S', 'N', 'e') /* 1SNx end */
 #define PT00_TAG MKTAG('P', 'T', 0x0, 0x0)
 #define GSTR_TAG MKTAG('G', 'S', 'T', 'R')
 #define SCDl_TAG MKTAG('S', 'C', 'D', 'l')
 #define SCEl_TAG MKTAG('S', 'C', 'E', 'l')
-#define kVGT_TAG MKTAG('k', 'V', 'G', 'T') /* TGV i-frame */
-#define fVGT_TAG MKTAG('f', 'V', 'G', 'T') /* TGV p-frame */
-#define mTCD_TAG MKTAG('m', 'T', 'C', 'D') /* MDEC */
-#define MADk_TAG MKTAG('M', 'A', 'D', 'k') /* MAD i-frame */
-#define MADm_TAG MKTAG('M', 'A', 'D', 'm') /* MAD p-frame */
-#define MADe_TAG MKTAG('M', 'A', 'D', 'e') /* MAD lqp-frame */
-#define MPCh_TAG MKTAG('M', 'P', 'C', 'h') /* MPEG2 */
-#define TGQs_TAG MKTAG('T', 'G', 'Q', 's') /* TGQ i-frame (appears in .TGQ files) */
-#define pQGT_TAG MKTAG('p', 'Q', 'G', 'T') /* TGQ i-frame (appears in .UV files) */
-#define pIQT_TAG MKTAG('p', 'I', 'Q', 'T') /* TQI/UV2 i-frame (.UV2/.WVE) */
+#define kVGT_TAG MKTAG('k', 'V', 'G', 'T') /* TGV I-frame */
+#define fVGT_TAG MKTAG('f', 'V', 'G', 'T') /* TGV P-frame */
+#define mTCD_TAG MKTAG('m', 'T', 'C', 'D') /* MDEC */
+#define MADk_TAG MKTAG('M', 'A', 'D', 'k') /* MAD I-frame */
+#define MADm_TAG MKTAG('M', 'A', 'D', 'm') /* MAD P-frame */
+#define MADe_TAG MKTAG('M', 'A', 'D', 'e') /* MAD lqp-frame */
+#define MPCh_TAG MKTAG('M', 'P', 'C', 'h') /* MPEG-2 */
+#define TGQs_TAG MKTAG('T', 'G', 'Q', 's') /* TGQ I-frame (appears in .TGQ files) */
+#define pQGT_TAG MKTAG('p', 'Q', 'G', 'T') /* TGQ I-frame (appears in .UV files) */
+#define pIQT_TAG MKTAG('p', 'I', 'Q', 'T') /* TQI/UV2 I-frame (.UV2/.WVE) */
 #define MVhd_TAG MKTAG('M', 'V', 'h', 'd')
 #define MV0K_TAG MKTAG('M', 'V', '0', 'K')
 #define MV0F_TAG MKTAG('M', 'V', '0', 'F')
-#define MVIh_TAG MKTAG('M', 'V', 'I', 'h') /* CMV header */
-#define MVIf_TAG MKTAG('M', 'V', 'I', 'f') /* CMV i-frame */
+#define MVIh_TAG MKTAG('M', 'V', 'I', 'h') /* CMV header */
+#define MVIf_TAG MKTAG('M', 'V', 'I', 'f') /* CMV I-frame */
 
 typedef struct EaDemuxContext {
 int big_endian;
@@ -77,7 +77,8 @@
 int num_samples;
 } EaDemuxContext;
 
-static uint32_t read_arbitary(AVIOContext *pb) {
+static uint32_t read_arbitrary(AVIOContext *pb)
+{
 uint8_t size, byte;
 int i;
 uint32_t word;
@@ -86,136 +87,168 @@
 
 word = 0;
 for (i = 0; i < size; i++) {
- byte = avio_r8(pb);
+ byte = avio_r8(pb);
 word <<= 8;
- word |= byte;
+ word |= byte;
 }
 
 return word;
 }
 
-/*
- * Process PT/GSTR sound header
- * return 1 if success, 0 if invalid format, otherwise AVERROR_xxx
- */
 static int process_audio_header_elements(AVFormatContext *s)
 {
- int inHeader = 1;
 EaDemuxContext *ea = s->priv_data;
- AVIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
+ int in_header = 1;
 int compression_type = -1, revision = -1, revision2 = -1;
 
- ea->bytes = 2;
- ea->sample_rate = -1;
+ ea->bytes = 2;
+ ea->sample_rate = -1;
 ea->num_channels = 1;
 
- while (!pb->eof_reached && inHeader) {
- int inSubheader;
+ while (!pb->eof_reached && in_header) {
+ int in_subheader;
 uint8_t byte;
 byte = avio_r8(pb);
 
 switch (byte) {
 case 0xFD:
- av_log (s, AV_LOG_DEBUG, "entered audio subheader\n");
- inSubheader = 1;
- while (!pb->eof_reached && inSubheader) {
+ av_log(s, AV_LOG_DEBUG, "entered audio subheader\n");
+ in_subheader = 1;
+ while (!pb->eof_reached && in_subheader) {
 uint8_t subbyte;
 subbyte = avio_r8(pb);
 
 switch (subbyte) {
 case 0x80:
- revision = read_arbitary(pb);
- av_log (s, AV_LOG_DEBUG, "revision (element 0x80) set to 0x%08x\n", revision);
+ revision = read_arbitrary(pb);
+ av_log(s, AV_LOG_DEBUG,
+ "revision (element 0x80) set to 0x%08x\n", revision);
 break;
 case 0x82:
- ea->num_channels = read_arbitary(pb);
- av_log (s, AV_LOG_DEBUG, "num_channels (element 0x82) set to 0x%08x\n", ea->num_channels);
+ ea->num_channels = read_arbitrary(pb);
+ av_log(s, AV_LOG_DEBUG,
+ "num_channels (element 0x82) set to 0x%08x\n",
+ ea->num_channels);
 break;
 case 0x83:
- compression_type = read_arbitary(pb);
- av_log (s, AV_LOG_DEBUG, "compression_type (element 0x83) set to 0x%08x\n", compression_type);
+ compression_type = read_arbitrary(pb);
+ av_log(s, AV_LOG_DEBUG,
+ "compression_type (element 0x83) set to 0x%08x\n",
+ compression_type);
 break;
 case 0x84:
- ea->sample_rate = read_arbitary(pb);
- av_log (s, AV_LOG_DEBUG, "sample_rate (element 0x84) set to %i\n", ea->sample_rate);
+ ea->sample_rate = read_arbitrary(pb);
+ av_log(s, AV_LOG_DEBUG,
+ "sample_rate (element 0x84) set to %i\n",
+ ea->sample_rate);
 break;
 case 0x85:
- ea->num_samples = read_arbitary(pb);
- av_log (s, AV_LOG_DEBUG, "num_samples (element 0x85) set to 0x%08x\n", ea->num_samples);
+ ea->num_samples = read_arbitrary(pb);
+ av_log(s, AV_LOG_DEBUG,
+ "num_samples (element 0x85) set to 0x%08x\n",
+ ea->num_samples);
 break;
 case 0x8A:
- av_log (s, AV_LOG_DEBUG, "element 0x%02x set to 0x%08x\n", subbyte, read_arbitary(pb));
- av_log (s, AV_LOG_DEBUG, "exited audio subheader\n");
- inSubheader = 0;
+ av_log(s, AV_LOG_DEBUG,
+ "element 0x%02x set to 0x%08x\n",
+ subbyte, read_arbitrary(pb));
+ av_log(s, AV_LOG_DEBUG, "exited audio subheader\n");
+ in_subheader = 0;
 break;
 case 0xA0:
- revision2 = read_arbitary(pb);
- av_log (s, AV_LOG_DEBUG, "revision2 (element 0xA0) set to 0x%08x\n", revision2);
+ revision2 = read_arbitrary(pb);
+ av_log(s, AV_LOG_DEBUG,
+ "revision2 (element 0xA0) set to 0x%08x\n",
+ revision2);
 break;
 case 0xFF:
- av_log (s, AV_LOG_DEBUG, "end of header block reached (within audio subheader)\n");
- inSubheader = 0;
- inHeader = 0;
+ av_log(s, AV_LOG_DEBUG,
+ "end of header block reached (within audio subheader)\n");
+ in_subheader = 0;
+ in_header = 0;
 break;
 default:
- av_log (s, AV_LOG_DEBUG, "element 0x%02x set to 0x%08x\n", subbyte, read_arbitary(pb));
+ av_log(s, AV_LOG_DEBUG,
+ "element 0x%02x set to 0x%08x\n",
+ subbyte, read_arbitrary(pb));
 break;
 }
 }
 break;
 case 0xFF:
- av_log (s, AV_LOG_DEBUG, "end of header block reached\n");
- inHeader = 0;
+ av_log(s, AV_LOG_DEBUG, "end of header block reached\n");
+ in_header = 0;
 break;
 default:
- av_log (s, AV_LOG_DEBUG, "header element 0x%02x set to 0x%08x\n", byte, read_arbitary(pb));
+ av_log(s, AV_LOG_DEBUG,
+ "header element 0x%02x set to 0x%08x\n",
+ byte, read_arbitrary(pb));
 break;
 }
 }
 
 switch (compression_type) {
- case 0: ea->audio_codec = AV_CODEC_ID_PCM_S16LE; break;
- case 7: ea->audio_codec = AV_CODEC_ID_ADPCM_EA; break;
+ case 0:
+ ea->audio_codec = AV_CODEC_ID_PCM_S16LE;
+ break;
+ case 7:
+ ea->audio_codec = AV_CODEC_ID_ADPCM_EA;
+ break;
 case -1:
 switch (revision) {
- case 1: ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R1; break;
- case 2: ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R2; break;
- case 3: ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R3; break;
- case -1: break;
+ case 1:
+ ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R1;
+ break;
+ case 2:
+ ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R2;
+ break;
+ case 3:
+ ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R3;
+ break;
+ case -1:
+ break;
 default:
- av_log(s, AV_LOG_ERROR, "unsupported stream type; revision=%i\n", revision);
+ av_log(s, AV_LOG_ERROR,
+ "unsupported stream type; revision=%i\n", revision);
 return 0;
 }
 switch (revision2) {
- case 8: ea->audio_codec = AV_CODEC_ID_PCM_S16LE_PLANAR; break;
- case 10: ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R2; break;
- case 16: ea->audio_codec = AV_CODEC_ID_MP3; break;
- case -1: break;
+ case 8:
+ ea->audio_codec = AV_CODEC_ID_PCM_S16LE_PLANAR;
+ break;
+ case 10:
+ ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R2;
+ break;
+ case 16:
+ ea->audio_codec = AV_CODEC_ID_MP3;
+ break;
+ case -1:
+ break;
 default:
 ea->audio_codec = AV_CODEC_ID_NONE;
- av_log(s, AV_LOG_ERROR, "unsupported stream type; revision2=%i\n", revision2);
+ av_log(s, AV_LOG_ERROR,
+ "unsupported stream type; revision2=%i\n", revision2);
 return 0;
 }
 break;
 default:
- av_log(s, AV_LOG_ERROR, "unsupported stream type; compression_type=%i\n", compression_type);
+ av_log(s, AV_LOG_ERROR,
+ "unsupported stream type; compression_type=%i\n",
+ compression_type);
 return 0;
 }
 
 if (ea->sample_rate == -1)
- ea->sample_rate = revision==3 ? 48000 : 22050;
+ ea->sample_rate = revision == 3 ? 48000 : 22050;
 
 return 1;
 }
 
-/*
- * Process EACS sound header
- * return 1 if success, 0 if invalid format, otherwise AVERROR_xxx
- */
-static int process_audio_header_eacs(AVFormatContext *s)
+static void process_audio_header_eacs(AVFormatContext *s)
 {
 EaDemuxContext *ea = s->priv_data;
- AVIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
 int compression_type;
 
 ea->sample_rate = ea->big_endian ? avio_rb32(pb) : avio_rl32(pb);
@@ -227,62 +260,62 @@
 switch (compression_type) {
 case 0:
 switch (ea->bytes) {
- case 1: ea->audio_codec = AV_CODEC_ID_PCM_S8; break;
- case 2: ea->audio_codec = AV_CODEC_ID_PCM_S16LE; break;
+ case 1:
+ ea->audio_codec = AV_CODEC_ID_PCM_S8;
+ break;
+ case 2:
+ ea->audio_codec = AV_CODEC_ID_PCM_S16LE;
+ break;
 }
 break;
- case 1: ea->audio_codec = AV_CODEC_ID_PCM_MULAW; ea->bytes = 1; break;
- case 2: ea->audio_codec = AV_CODEC_ID_ADPCM_IMA_EA_EACS; break;
+ case 1:
+ ea->audio_codec = AV_CODEC_ID_PCM_MULAW;
+ ea->bytes = 1;
+ break;
+ case 2:
+ ea->audio_codec = AV_CODEC_ID_ADPCM_IMA_EA_EACS;
+ break;
 default:
- av_log (s, AV_LOG_ERROR, "unsupported stream type; audio compression_type=%i\n", compression_type);
+ av_log(s, AV_LOG_ERROR,
+ "unsupported stream type; audio compression_type=%i\n",
+ compression_type);
 }
-
- return 1;
 }
 
-/*
- * Process SEAD sound header
- * return 1 if success, 0 if invalid format, otherwise AVERROR_xxx
- */
-static int process_audio_header_sead(AVFormatContext *s)
+static void process_audio_header_sead(AVFormatContext *s)
 {
 EaDemuxContext *ea = s->priv_data;
- AVIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
 
 ea->sample_rate = avio_rl32(pb);
 ea->bytes = avio_rl32(pb); /* 1=8-bit, 2=16-bit */
 ea->num_channels = avio_rl32(pb);
 ea->audio_codec = AV_CODEC_ID_ADPCM_IMA_EA_SEAD;
-
- return 1;
 }
 
-static int process_video_header_mdec(AVFormatContext *s)
+static void process_video_header_mdec(AVFormatContext *s)
 {
 EaDemuxContext *ea = s->priv_data;
- AVIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
 avio_skip(pb, 4);
- ea->width = avio_rl16(pb);
- ea->height = avio_rl16(pb);
- ea->time_base = (AVRational){1,15};
+ ea->width = avio_rl16(pb);
+ ea->height = avio_rl16(pb);
+ ea->time_base = (AVRational) { 1, 15 };
 ea->video_codec = AV_CODEC_ID_MDEC;
- return 1;
 }
 
-static int process_video_header_vp6(AVFormatContext *s)
+static void process_video_header_vp6(AVFormatContext *s)
 {
 EaDemuxContext *ea = s->priv_data;
- AVIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
 
 avio_skip(pb, 16);
 ea->time_base.den = avio_rl32(pb);
 ea->time_base.num = avio_rl32(pb);
- ea->video_codec = AV_CODEC_ID_VP6;
-
- return 1;
+ ea->video_codec = AV_CODEC_ID_VP6;
 }
 
-static int process_video_header_cmv(AVFormatContext *s)
+static void process_video_header_cmv(AVFormatContext *s)
 {
 EaDemuxContext *ea = s->priv_data;
 int fps;
@@ -290,91 +323,88 @@
 avio_skip(s->pb, 10);
 fps = avio_rl16(s->pb);
 if (fps)
- ea->time_base = (AVRational){1, fps};
+ ea->time_base = (AVRational) { 1, fps };
 ea->video_codec = AV_CODEC_ID_CMV;
-
- return 0;
 }
 
-/*
- * Process EA file header
- * Returns 1 if the EA file is valid and successfully opened, 0 otherwise
- */
-static int process_ea_header(AVFormatContext *s) {
+/* Process EA file header.
+ * Return 1 if the EA file is valid and successfully opened, 0 otherwise. */
+static int process_ea_header(AVFormatContext *s)
+{
 uint32_t blockid, size = 0;
 EaDemuxContext *ea = s->priv_data;
- AVIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
 int i;
 
- for (i=0; i<5 && (!ea->audio_codec || !ea->video_codec); i++) {
+ for (i = 0; i < 5 && (!ea->audio_codec || !ea->video_codec); i++) {
 unsigned int startpos = avio_tell(pb);
- int err = 0;
+ int err = 0;
 
 blockid = avio_rl32(pb);
- size = avio_rl32(pb);
+ size = avio_rl32(pb);
 if (i == 0)
 ea->big_endian = size > 0x000FFFFF;
 if (ea->big_endian)
 size = av_bswap32(size);
 
 switch (blockid) {
- case ISNh_TAG:
- if (avio_rl32(pb) != EACS_TAG) {
- av_log (s, AV_LOG_ERROR, "unknown 1SNh headerid\n");
- return 0;
- }
- err = process_audio_header_eacs(s);
- break;
+ case ISNh_TAG:
+ if (avio_rl32(pb) != EACS_TAG) {
+ av_log(s, AV_LOG_ERROR, "unknown 1SNh headerid\n");
+ return 0;
+ }
+ process_audio_header_eacs(s);
+ break;
 
- case SCHl_TAG :
- case SHEN_TAG :
- blockid = avio_rl32(pb);
- if (blockid == GSTR_TAG) {
- avio_skip(pb, 4);
- } else if ((blockid & 0xFFFF)!=PT00_TAG) {
- av_log (s, AV_LOG_ERROR, "unknown SCHl headerid\n");
- return 0;
- }
- err = process_audio_header_elements(s);
- break;
+ case SCHl_TAG:
+ case SHEN_TAG:
+ blockid = avio_rl32(pb);
+ if (blockid == GSTR_TAG) {
+ avio_skip(pb, 4);
+ } else if ((blockid & 0xFFFF) != PT00_TAG) {
+ av_log(s, AV_LOG_ERROR, "unknown SCHl headerid\n");
+ return 0;
+ }
+ err = process_audio_header_elements(s);
+ break;
 
- case SEAD_TAG:
- err = process_audio_header_sead(s);
- break;
+ case SEAD_TAG:
+ process_audio_header_sead(s);
+ break;
 
- case MVIh_TAG :
- err = process_video_header_cmv(s);
- break;
+ case MVIh_TAG:
+ process_video_header_cmv(s);
+ break;
 
- case kVGT_TAG:
- ea->video_codec = AV_CODEC_ID_TGV;
- ea->time_base = (AVRational){1, 15};
- break;
+ case kVGT_TAG:
+ ea->video_codec = AV_CODEC_ID_TGV;
+ ea->time_base = (AVRational) { 1, 15 };
+ break;
 
- case mTCD_TAG :
- err = process_video_header_mdec(s);
- break;
+ case mTCD_TAG:
+ process_video_header_mdec(s);
+ break;
 
- case MPCh_TAG:
- ea->video_codec = AV_CODEC_ID_MPEG2VIDEO;
- break;
+ case MPCh_TAG:
+ ea->video_codec = AV_CODEC_ID_MPEG2VIDEO;
+ break;
 
- case pQGT_TAG:
- case TGQs_TAG:
- ea->video_codec = AV_CODEC_ID_TGQ;
- break;
+ case pQGT_TAG:
+ case TGQs_TAG:
+ ea->video_codec = AV_CODEC_ID_TGQ;
+ break;
 
- case pIQT_TAG:
- ea->video_codec = AV_CODEC_ID_TQI;
- break;
+ case pIQT_TAG:
+ ea->video_codec = AV_CODEC_ID_TQI;
+ break;
 
- case MADk_TAG :
- ea->video_codec = AV_CODEC_ID_MAD;
- break;
+ case MADk_TAG:
+ ea->video_codec = AV_CODEC_ID_MAD;
+ break;
 
- case MVhd_TAG :
- err = process_video_header_vp6(s);
- break;
+ case MVhd_TAG:
+ process_video_header_vp6(s);
+ break;
 }
 
 if (err < 0) {
@@ -390,7 +420,6 @@
 return 1;
 }
 
-
 static int ea_probe(AVProbeData *p)
 {
 switch (AV_RL32(&p->buf[0])) {
@@ -409,6 +438,7 @@
 }
 if (AV_RL32(&p->buf[4]) > 0xfffff && AV_RB32(&p->buf[4]) > 0xfffff)
 return 0;
+
 return AVPROBE_SCORE_MAX;
 }
 
@@ -426,31 +456,32 @@
 if (!st)
 return AVERROR(ENOMEM);
 ea->video_stream_index = st->index;
- st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = ea->video_codec;
- st->codec->codec_tag = 0; /* no fourcc */
- st->codec->width = ea->width;
- st->codec->height = ea->height;
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codec->codec_id = ea->video_codec;
+ st->codec->codec_tag = 0; /* no fourcc */
+ st->codec->width = ea->width;
+ st->codec->height = ea->height;
 avpriv_set_pts_info(st, 33, ea->time_base.num, ea->time_base.den);
-#if FF_API_R_FRAME_RATE
- st->r_frame_rate =
-#endif
- st->avg_frame_rate = (AVRational){ea->time_base.den, ea->time_base.num};
+ st->avg_frame_rate = (AVRational) { ea->time_base.den,
+ ea->time_base.num };
 }
 
 if (ea->audio_codec) {
- if (ea->num_channels <= 0) {
- av_log(s, AV_LOG_WARNING, "Unsupported number of channels: %d\n", ea->num_channels);
+ if (ea->num_channels <= 0 || ea->num_channels > 2) {
+ av_log(s, AV_LOG_WARNING,
+ "Unsupported number of channels: %d\n", ea->num_channels);
 ea->audio_codec = 0;
 return 1;
 }
 if (ea->sample_rate <= 0) {
- av_log(s, AV_LOG_ERROR, "Unsupported sample rate: %d\n", ea->sample_rate);
+ av_log(s, AV_LOG_ERROR,
+ "Unsupported sample rate: %d\n", ea->sample_rate);
 ea->audio_codec = 0;
 return 1;
 }
 if (ea->bytes <= 0) {
- av_log(s, AV_LOG_ERROR, "Invalid number of bytes per sample: %d\n", ea->bytes);
+ av_log(s, AV_LOG_ERROR,
+ "Invalid number of bytes per sample: %d\n", ea->bytes);
 ea->audio_codec = AV_CODEC_ID_NONE;
 return 1;
 }
@@ -460,31 +491,30 @@
 if (!st)
 return AVERROR(ENOMEM);
 avpriv_set_pts_info(st, 33, 1, ea->sample_rate);
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_id = ea->audio_codec;
- st->codec->codec_tag = 0; /* no tag */
- st->codec->channels = ea->num_channels;
- st->codec->sample_rate = ea->sample_rate;
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codec->codec_id = ea->audio_codec;
+ st->codec->codec_tag = 0; /* no tag */
+ st->codec->channels = ea->num_channels;
+ st->codec->sample_rate = ea->sample_rate;
 st->codec->bits_per_coded_sample = ea->bytes * 8;
- st->codec->bit_rate = st->codec->channels * st->codec->sample_rate *
- st->codec->bits_per_coded_sample / 4;
- st->codec->block_align = st->codec->channels*st->codec->bits_per_coded_sample;
- ea->audio_stream_index = st->index;
- st->start_time = 0;
+ st->codec->bit_rate = st->codec->channels *
+ st->codec->sample_rate *
+ st->codec->bits_per_coded_sample / 4;
+ st->codec->block_align = st->codec->channels *
+ st->codec->bits_per_coded_sample;
+ ea->audio_stream_index = st->index;
+ st->start_time = 0;
 }
 
 return 1;
 }
 
-static int ea_read_packet(AVFormatContext *s,
- AVPacket *pkt)
+static int ea_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
 EaDemuxContext *ea = s->priv_data;
- AVIOContext *pb = s->pb;
- int ret = 0;
- int packet_read = 0;
+ AVIOContext *pb = s->pb;
 unsigned int chunk_type, chunk_size;
- int key = 0;
+ int ret = 0, packet_read = 0, key = 0;
 int av_uninit(num_samples);
 
 while (!packet_read) {
@@ -497,7 +527,7 @@
 switch (chunk_type) {
 /* audio data */
 case ISNh_TAG:
- /* header chunk also contains data; skip over the header portion*/
+ /* header chunk also contains data; skip over the header portion */
 if (chunk_size < 32)
 return AVERROR_INVALIDDATA;
 avio_skip(pb, 32);
@@ -525,10 +555,16 @@
 case AV_CODEC_ID_ADPCM_EA_R1:
 case AV_CODEC_ID_ADPCM_EA_R2:
 case AV_CODEC_ID_ADPCM_IMA_EA_EACS:
- pkt->duration = AV_RL32(pkt->data);
- break;
 case AV_CODEC_ID_ADPCM_EA_R3:
- pkt->duration = AV_RB32(pkt->data);
+ if (pkt->size < 4) {
+ av_log(s, AV_LOG_ERROR, "Packet is too short\n");
+ av_free_packet(pkt);
+ return AVERROR_INVALIDDATA;
+ }
+ if (ea->audio_codec == AV_CODEC_ID_ADPCM_EA_R3)
+ pkt->duration = AV_RB32(pkt->data);
+ else
+ pkt->duration = AV_RL32(pkt->data);
 break;
 case AV_CODEC_ID_ADPCM_IMA_EA_SEAD:
 pkt->duration = ret * 2 / ea->num_channels;
@@ -550,7 +586,7 @@
 case SCEl_TAG:
 case SEND_TAG:
 case SEEN_TAG:
- ret = AVERROR(EIO);
+ ret = AVERROR(EIO);
 packet_read = 1;
 break;
 
@@ -564,12 +600,12 @@
 case fVGT_TAG:
 case MADm_TAG:
 case MADe_TAG:
- avio_seek(pb, -8, SEEK_CUR); // include chunk preamble
+ avio_seek(pb, -8, SEEK_CUR); // include chunk preamble
 chunk_size += 8;
 goto get_video_packet;
 
 case mTCD_TAG:
- avio_skip(pb, 8); // skip ea dct header
+ avio_skip(pb, 8); // skip ea DCT header
 chunk_size -= 8;
 goto get_video_packet;
 
@@ -583,8 +619,8 @@
 if (ret < 0)
 return ret;
 pkt->stream_index = ea->video_stream_index;
- pkt->flags |= key;
- packet_read = 1;
+ pkt->flags |= key;
+ packet_read = 1;
 break;
 
 default:

libav-v9.6.tar.bz2/libavformat/ffmdec.c -> libav-v10.1.tar.bz2/libavformat/ffmdec.c Changed

libav-v9.6.tar.bz2/libavformat/ffmenc.c -> libav-v10.1.tar.bz2/libavformat/ffmenc.c Changed

libav-v9.6.tar.bz2/libavformat/file.c -> libav-v10.1.tar.bz2/libavformat/file.c Changed

libav-v10.1.tar.bz2/libavformat/file_open.c Added

libav-v9.6.tar.bz2/libavformat/filmstripdec.c -> libav-v10.1.tar.bz2/libavformat/filmstripdec.c Changed

libav-v10.1.tar.bz2/libavformat/flac_picture.c Added

@@ -0,0 +1,152 @@
+/*
+ * Raw FLAC picture parser
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avformat.h"
+#include "flac_picture.h"
+#include "id3v2.h"
+#include "internal.h"
+
+int ff_flac_parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size)
+{
+ const CodecMime *mime = ff_id3v2_mime_tags;
+ enum AVCodecID id = AV_CODEC_ID_NONE;
+ AVBufferRef *data = NULL;
+ uint8_t mimetype[64], *desc = NULL;
+ AVIOContext *pb = NULL;
+ AVStream *st;
+ int type, width, height;
+ int len, ret = 0;
+
+ pb = avio_alloc_context(buf, buf_size, 0, NULL, NULL, NULL, NULL);
+ if (!pb)
+ return AVERROR(ENOMEM);
+
+ /* read the picture type */
+ type = avio_rb32(pb);
+ if (type >= FF_ARRAY_ELEMS(ff_id3v2_picture_types) || type < 0) {
+ av_log(s, AV_LOG_ERROR, "Invalid picture type: %d.\n", type);
+ if (s->error_recognition & AV_EF_EXPLODE) {
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
+ type = 0;
+ }
+
+ /* picture mimetype */
+ len = avio_rb32(pb);
+ if (len <= 0 ||
+ avio_read(pb, mimetype, FFMIN(len, sizeof(mimetype) - 1)) != len) {
+ av_log(s, AV_LOG_ERROR, "Could not read mimetype from an attached "
+ "picture.\n");
+ if (s->error_recognition & AV_EF_EXPLODE)
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
+ mimetype[len] = 0;
+
+ while (mime->id != AV_CODEC_ID_NONE) {
+ if (!strncmp(mime->str, mimetype, sizeof(mimetype))) {
+ id = mime->id;
+ break;
+ }
+ mime++;
+ }
+ if (id == AV_CODEC_ID_NONE) {
+ av_log(s, AV_LOG_ERROR, "Unknown attached picture mimetype: %s.\n",
+ mimetype);
+ if (s->error_recognition & AV_EF_EXPLODE)
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
+
+ /* picture description */
+ len = avio_rb32(pb);
+ if (len > 0) {
+ if (!(desc = av_malloc(len + 1))) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+
+ if (avio_read(pb, desc, len) != len) {
+ av_log(s, AV_LOG_ERROR, "Error reading attached picture description.\n");
+ if (s->error_recognition & AV_EF_EXPLODE)
+ ret = AVERROR(EIO);
+ goto fail;
+ }
+ desc[len] = 0;
+ }
+
+ /* picture metadata */
+ width = avio_rb32(pb);
+ height = avio_rb32(pb);
+ avio_skip(pb, 8);
+
+ /* picture data */
+ len = avio_rb32(pb);
+ if (len <= 0) {
+ av_log(s, AV_LOG_ERROR, "Invalid attached picture size: %d.\n", len);
+ if (s->error_recognition & AV_EF_EXPLODE)
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
+ if (!(data = av_buffer_alloc(len))) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ if (avio_read(pb, data->data, len) != len) {
+ av_log(s, AV_LOG_ERROR, "Error reading attached picture data.\n");
+ if (s->error_recognition & AV_EF_EXPLODE)
+ ret = AVERROR(EIO);
+ goto fail;
+ }
+
+ st = avformat_new_stream(s, NULL);
+ if (!st) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+
+ av_init_packet(&st->attached_pic);
+ st->attached_pic.buf = data;
+ st->attached_pic.data = data->data;
+ st->attached_pic.size = len;
+ st->attached_pic.stream_index = st->index;
+ st->attached_pic.flags |= AV_PKT_FLAG_KEY;
+
+ st->disposition |= AV_DISPOSITION_ATTACHED_PIC;
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codec->codec_id = id;
+ st->codec->width = width;
+ st->codec->height = height;
+ av_dict_set(&st->metadata, "comment", ff_id3v2_picture_types[type], 0);
+ if (desc)
+ av_dict_set(&st->metadata, "title", desc, AV_DICT_DONT_STRDUP_VAL);
+
+ av_freep(&pb);
+
+ return 0;
+
+fail:
+ av_buffer_unref(&data);
+ av_freep(&desc);
+ av_freep(&pb);
+
+ return ret;
+}

libav-v10.1.tar.bz2/libavformat/flac_picture.h Added

@@ -0,0 +1,28 @@
+/*
+ * Raw FLAC picture parser
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_FLAC_PICTURE_H
+#define AVFORMAT_FLAC_PICTURE_H
+
+#include "avformat.h"
+
+int ff_flac_parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size);
+
+#endif /* AVFORMAT_FLAC_PICTURE_H */

libav-v9.6.tar.bz2/libavformat/flacdec.c -> libav-v10.1.tar.bz2/libavformat/flacdec.c Changed

@@ -21,140 +21,13 @@
 
 #include "libavcodec/flac.h"
 #include "avformat.h"
-#include "id3v2.h"
+#include "flac_picture.h"
 #include "internal.h"
 #include "rawdec.h"
 #include "oggdec.h"
 #include "vorbiscomment.h"
 #include "libavcodec/bytestream.h"
 
-static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size)
-{
- const CodecMime *mime = ff_id3v2_mime_tags;
- enum AVCodecID id = AV_CODEC_ID_NONE;
- uint8_t mimetype[64], *desc = NULL, *data = NULL;
- AVIOContext *pb = NULL;
- AVStream *st;
- int type, width, height;
- int len, ret = 0;
-
- pb = avio_alloc_context(buf, buf_size, 0, NULL, NULL, NULL, NULL);
- if (!pb)
- return AVERROR(ENOMEM);
-
- /* read the picture type */
- type = avio_rb32(pb);
- if (type >= FF_ARRAY_ELEMS(ff_id3v2_picture_types) || type < 0) {
- av_log(s, AV_LOG_ERROR, "Invalid picture type: %d.\n", type);
- if (s->error_recognition & AV_EF_EXPLODE) {
- ret = AVERROR_INVALIDDATA;
- goto fail;
- }
- type = 0;
- }
-
- /* picture mimetype */
- len = avio_rb32(pb);
- if (len <= 0 ||
- avio_read(pb, mimetype, FFMIN(len, sizeof(mimetype) - 1)) != len) {
- av_log(s, AV_LOG_ERROR, "Could not read mimetype from an attached "
- "picture.\n");
- if (s->error_recognition & AV_EF_EXPLODE)
- ret = AVERROR_INVALIDDATA;
- goto fail;
- }
- mimetype[len] = 0;
-
- while (mime->id != AV_CODEC_ID_NONE) {
- if (!strncmp(mime->str, mimetype, sizeof(mimetype))) {
- id = mime->id;
- break;
- }
- mime++;
- }
- if (id == AV_CODEC_ID_NONE) {
- av_log(s, AV_LOG_ERROR, "Unknown attached picture mimetype: %s.\n",
- mimetype);
- if (s->error_recognition & AV_EF_EXPLODE)
- ret = AVERROR_INVALIDDATA;
- goto fail;
- }
-
- /* picture description */
- len = avio_rb32(pb);
- if (len > 0) {
- if (!(desc = av_malloc(len + 1))) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
-
- if (avio_read(pb, desc, len) != len) {
- av_log(s, AV_LOG_ERROR, "Error reading attached picture description.\n");
- if (s->error_recognition & AV_EF_EXPLODE)
- ret = AVERROR(EIO);
- goto fail;
- }
- desc[len] = 0;
- }
-
- /* picture metadata */
- width = avio_rb32(pb);
- height = avio_rb32(pb);
- avio_skip(pb, 8);
-
- /* picture data */
- len = avio_rb32(pb);
- if (len <= 0) {
- av_log(s, AV_LOG_ERROR, "Invalid attached picture size: %d.\n", len);
- if (s->error_recognition & AV_EF_EXPLODE)
- ret = AVERROR_INVALIDDATA;
- goto fail;
- }
- if (!(data = av_malloc(len))) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
- if (avio_read(pb, data, len) != len) {
- av_log(s, AV_LOG_ERROR, "Error reading attached picture data.\n");
- if (s->error_recognition & AV_EF_EXPLODE)
- ret = AVERROR(EIO);
- goto fail;
- }
-
- st = avformat_new_stream(s, NULL);
- if (!st) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
-
- av_init_packet(&st->attached_pic);
- st->attached_pic.data = data;
- st->attached_pic.size = len;
- st->attached_pic.destruct = av_destruct_packet;
- st->attached_pic.stream_index = st->index;
- st->attached_pic.flags |= AV_PKT_FLAG_KEY;
-
- st->disposition |= AV_DISPOSITION_ATTACHED_PIC;
- st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = id;
- st->codec->width = width;
- st->codec->height = height;
- av_dict_set(&st->metadata, "comment", ff_id3v2_picture_types[type], 0);
- if (desc)
- av_dict_set(&st->metadata, "title", desc, AV_DICT_DONT_STRDUP_VAL);
-
- av_freep(&pb);
-
- return 0;
-
-fail:
- av_freep(&desc);
- av_freep(&data);
- av_freep(&pb);
- return ret;
-
-}
-
 static int flac_read_header(AVFormatContext *s)
 {
 int ret, metadata_last=0, metadata_type, metadata_size, found_streaminfo=0;
@@ -251,7 +124,7 @@
 avpriv_new_chapter(s, track, st->time_base, start, AV_NOPTS_VALUE, isrc);
 }
 } else if (metadata_type == FLAC_METADATA_TYPE_PICTURE) {
- ret = parse_picture(s, buffer, metadata_size);
+ ret = ff_flac_parse_picture(s, buffer, metadata_size);
 av_freep(&buffer);
 if (ret < 0) {
 av_log(s, AV_LOG_ERROR, "Error parsing attached picture.\n");
@@ -280,7 +153,7 @@
 {
 if (p->buf_size < 4 || memcmp(p->buf, "fLaC", 4))
 return 0;
- return AVPROBE_SCORE_MAX/2;
+ return AVPROBE_SCORE_EXTENSION;
 }
 
 AVInputFormat ff_flac_demuxer = {

libav-v9.6.tar.bz2/libavformat/flacenc.c -> libav-v10.1.tar.bz2/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 "flacenc.h"
@@ -26,6 +27,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)
 {
@@ -68,6 +74,10 @@
 {
     int ret;
     AVCodecContext *codec = s->streams[0]->codec;
+    FlacMuxerContext *c   = s->priv_data;
+
+    if (!c->write_header)
+        return 0;
 
     ret = ff_flac_write_header(s->pb, codec, 0);
     if (ret)
@@ -93,6 +103,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;
@@ -113,13 +127,25 @@
 static int flac_write_packet(struct AVFormatContext *s, AVPacket *pkt)
 {
     avio_write(s->pb, pkt->data, pkt->size);
-    avio_flush(s->pb);
     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,
@@ -128,4 +154,5 @@
     .write_packet      = flac_write_packet,
     .write_trailer     = flac_write_trailer,
     .flags             = AVFMT_NOTIMESTAMPS,
+    .priv_class        = &flac_muxer_class,
 };

libav-v9.6.tar.bz2/libavformat/flvdec.c -> libav-v10.1.tar.bz2/libavformat/flvdec.c Changed

@@ -45,12 +45,12 @@
 
 typedef struct {
 const AVClass *class; ///< Class for private options.
- int trust_metadata; ///< configure streams according onMetaData
- int wrong_dts; ///< wrong dts due to negative cts
+ int trust_metadata; ///< configure streams according onMetaData
+ int wrong_dts; ///< wrong dts due to negative cts
 uint8_t *new_extradata[2];
- int new_extradata_size[2];
- int last_sample_rate;
- int last_channels;
+ int new_extradata_size[2];
+ int last_sample_rate;
+ int last_channels;
 struct {
 int64_t dts;
 int64_t pos;
@@ -64,7 +64,11 @@
 const uint8_t *d;
 
 d = p->buf;
- if (d[0] == 'F' && d[1] == 'L' && d[2] == 'V' && d[3] < 5 && d[5]==0 && AV_RB32(d+5)>8) {
+ if (d[0] == 'F' &&
+ d[1] == 'L' &&
+ d[2] == 'V' &&
+ d[3] < 5 && d[5] == 0 &&
+ AV_RB32(d + 5) > 8) {
 return AVPROBE_SCORE_MAX;
 }
 return 0;
@@ -79,10 +83,11 @@
 avpriv_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */
 return st;
 }
+
 static int flv_same_audio_codec(AVCodecContext *acodec, int flags)
 {
 int bits_per_coded_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8;
- int flv_codecid = flags & FLV_AUDIO_CODECID_MASK;
+ int flv_codecid = flags & FLV_AUDIO_CODECID_MASK;
 int codec_id;
 
 if (!acodec->codec_id && !acodec->codec_tag)
@@ -91,18 +96,21 @@
 if (acodec->bits_per_coded_sample != bits_per_coded_sample)
 return 0;
 
- switch(flv_codecid) {
- //no distinction between S16 and S8 PCM codec flags
+ switch (flv_codecid) {
+ // no distinction between S16 and S8 PCM codec flags
 case FLV_CODECID_PCM:
- codec_id = bits_per_coded_sample == 8 ? AV_CODEC_ID_PCM_U8 :
+ codec_id = bits_per_coded_sample == 8
+ ? AV_CODEC_ID_PCM_U8
 #if HAVE_BIGENDIAN
- AV_CODEC_ID_PCM_S16BE;
+ : AV_CODEC_ID_PCM_S16BE;
 #else
- AV_CODEC_ID_PCM_S16LE;
+ : AV_CODEC_ID_PCM_S16LE;
 #endif
 return codec_id == acodec->codec_id;
 case FLV_CODECID_PCM_LE:
- codec_id = bits_per_coded_sample == 8 ? AV_CODEC_ID_PCM_U8 : AV_CODEC_ID_PCM_S16LE;
+ codec_id = bits_per_coded_sample == 8
+ ? AV_CODEC_ID_PCM_U8
+ : AV_CODEC_ID_PCM_S16LE;
 return codec_id == acodec->codec_id;
 case FLV_CODECID_AAC:
 return acodec->codec_id == AV_CODEC_ID_AAC;
@@ -118,59 +126,72 @@
 return acodec->codec_id == AV_CODEC_ID_NELLYMOSER;
 case FLV_CODECID_PCM_MULAW:
 return acodec->sample_rate == 8000 &&
- acodec->codec_id == AV_CODEC_ID_PCM_MULAW;
+ acodec->codec_id == AV_CODEC_ID_PCM_MULAW;
 case FLV_CODECID_PCM_ALAW:
- return acodec->sample_rate = 8000 &&
- acodec->codec_id == AV_CODEC_ID_PCM_ALAW;
+ return acodec->sample_rate == 8000 &&
+ acodec->codec_id == AV_CODEC_ID_PCM_ALAW;
 default:
 return acodec->codec_tag == (flv_codecid >> FLV_AUDIO_CODECID_OFFSET);
 }
-
- return 0;
 }
 
-static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, AVCodecContext *acodec, int flv_codecid) {
- switch(flv_codecid) {
- //no distinction between S16 and S8 PCM codec flags
- case FLV_CODECID_PCM:
- acodec->codec_id = acodec->bits_per_coded_sample == 8 ? AV_CODEC_ID_PCM_U8 :
+static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream,
+ AVCodecContext *acodec, int flv_codecid)
+{
+ switch (flv_codecid) {
+ // no distinction between S16 and S8 PCM codec flags
+ case FLV_CODECID_PCM:
+ acodec->codec_id = acodec->bits_per_coded_sample == 8
+ ? AV_CODEC_ID_PCM_U8
 #if HAVE_BIGENDIAN
- AV_CODEC_ID_PCM_S16BE;
+ : AV_CODEC_ID_PCM_S16BE;
 #else
- AV_CODEC_ID_PCM_S16LE;
+ : AV_CODEC_ID_PCM_S16LE;
 #endif
- break;
- case FLV_CODECID_PCM_LE:
- acodec->codec_id = acodec->bits_per_coded_sample == 8 ? AV_CODEC_ID_PCM_U8 : AV_CODEC_ID_PCM_S16LE; break;
- case FLV_CODECID_AAC : acodec->codec_id = AV_CODEC_ID_AAC; break;
- case FLV_CODECID_ADPCM: acodec->codec_id = AV_CODEC_ID_ADPCM_SWF; break;
- case FLV_CODECID_SPEEX:
- acodec->codec_id = AV_CODEC_ID_SPEEX;
- acodec->sample_rate = 16000;
- break;
- case FLV_CODECID_MP3 : acodec->codec_id = AV_CODEC_ID_MP3 ; astream->need_parsing = AVSTREAM_PARSE_FULL; break;
- case FLV_CODECID_NELLYMOSER_8KHZ_MONO:
- acodec->sample_rate = 8000; //in case metadata does not otherwise declare samplerate
- acodec->codec_id = AV_CODEC_ID_NELLYMOSER;
- break;
- case FLV_CODECID_NELLYMOSER_16KHZ_MONO:
- acodec->sample_rate = 16000;
- acodec->codec_id = AV_CODEC_ID_NELLYMOSER;
- break;
- case FLV_CODECID_NELLYMOSER:
- acodec->codec_id = AV_CODEC_ID_NELLYMOSER;
- break;
- case FLV_CODECID_PCM_MULAW:
- acodec->sample_rate = 8000;
- acodec->codec_id = AV_CODEC_ID_PCM_MULAW;
- break;
- case FLV_CODECID_PCM_ALAW:
- acodec->sample_rate = 8000;
- acodec->codec_id = AV_CODEC_ID_PCM_ALAW;
- break;
- default:
- av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flv_codecid >> FLV_AUDIO_CODECID_OFFSET);
- acodec->codec_tag = flv_codecid >> FLV_AUDIO_CODECID_OFFSET;
+ break;
+ case FLV_CODECID_PCM_LE:
+ acodec->codec_id = acodec->bits_per_coded_sample == 8
+ ? AV_CODEC_ID_PCM_U8
+ : AV_CODEC_ID_PCM_S16LE;
+ break;
+ case FLV_CODECID_AAC:
+ acodec->codec_id = AV_CODEC_ID_AAC;
+ break;
+ case FLV_CODECID_ADPCM:
+ acodec->codec_id = AV_CODEC_ID_ADPCM_SWF;
+ break;
+ case FLV_CODECID_SPEEX:
+ acodec->codec_id = AV_CODEC_ID_SPEEX;
+ acodec->sample_rate = 16000;
+ break;
+ case FLV_CODECID_MP3:
+ acodec->codec_id = AV_CODEC_ID_MP3;
+ astream->need_parsing = AVSTREAM_PARSE_FULL;
+ break;
+ case FLV_CODECID_NELLYMOSER_8KHZ_MONO:
+ // in case metadata does not otherwise declare samplerate
+ acodec->sample_rate = 8000;
+ acodec->codec_id = AV_CODEC_ID_NELLYMOSER;
+ break;
+ case FLV_CODECID_NELLYMOSER_16KHZ_MONO:
+ acodec->sample_rate = 16000;
+ acodec->codec_id = AV_CODEC_ID_NELLYMOSER;
+ break;
+ case FLV_CODECID_NELLYMOSER:
+ acodec->codec_id = AV_CODEC_ID_NELLYMOSER;
+ break;
+ case FLV_CODECID_PCM_MULAW:
+ acodec->sample_rate = 8000;
+ acodec->codec_id = AV_CODEC_ID_PCM_MULAW;
+ break;
+ case FLV_CODECID_PCM_ALAW:
+ acodec->sample_rate = 8000;
+ acodec->codec_id = AV_CODEC_ID_PCM_ALAW;
+ break;
+ default:
+ av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n",
+ flv_codecid >> FLV_AUDIO_CODECID_OFFSET);
+ acodec->codec_tag = flv_codecid >> FLV_AUDIO_CODECID_OFFSET;
 }
 }
 
@@ -182,61 +203,69 @@
 return 1;
 
 switch (flv_codecid) {
- case FLV_CODECID_H263:
- return vcodec->codec_id == AV_CODEC_ID_FLV1;
- case FLV_CODECID_SCREEN:
- return vcodec->codec_id == AV_CODEC_ID_FLASHSV;
- case FLV_CODECID_SCREEN2:
- return vcodec->codec_id == AV_CODEC_ID_FLASHSV2;
- case FLV_CODECID_VP6:
- return vcodec->codec_id == AV_CODEC_ID_VP6F;
- case FLV_CODECID_VP6A:
- return vcodec->codec_id == AV_CODEC_ID_VP6A;
- case FLV_CODECID_H264:
- return vcodec->codec_id == AV_CODEC_ID_H264;
- default:
- return vcodec->codec_tag == flv_codecid;
+ case FLV_CODECID_H263:
+ return vcodec->codec_id == AV_CODEC_ID_FLV1;
+ case FLV_CODECID_SCREEN:
+ return vcodec->codec_id == AV_CODEC_ID_FLASHSV;
+ case FLV_CODECID_SCREEN2:
+ return vcodec->codec_id == AV_CODEC_ID_FLASHSV2;
+ case FLV_CODECID_VP6:
+ return vcodec->codec_id == AV_CODEC_ID_VP6F;
+ case FLV_CODECID_VP6A:
+ return vcodec->codec_id == AV_CODEC_ID_VP6A;
+ case FLV_CODECID_H264:
+ return vcodec->codec_id == AV_CODEC_ID_H264;
+ default:
+ return vcodec->codec_tag == flv_codecid;
 }
-
- return 0;
 }
 
-static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_codecid, int read) {
+static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream,
+ int flv_codecid, int read)
+{
 AVCodecContext *vcodec = vstream->codec;
- switch(flv_codecid) {
- case FLV_CODECID_H263 : vcodec->codec_id = AV_CODEC_ID_FLV1 ; break;
- case FLV_CODECID_SCREEN: vcodec->codec_id = AV_CODEC_ID_FLASHSV; break;
- case FLV_CODECID_SCREEN2: vcodec->codec_id = AV_CODEC_ID_FLASHSV2; break;
- case FLV_CODECID_VP6 : vcodec->codec_id = AV_CODEC_ID_VP6F ;
- case FLV_CODECID_VP6A :
- if(flv_codecid == FLV_CODECID_VP6A)
- vcodec->codec_id = AV_CODEC_ID_VP6A;
- if (read) {
- if (vcodec->extradata_size != 1) {
- vcodec->extradata = av_malloc(1);
- if (vcodec->extradata)
- vcodec->extradata_size = 1;
- }
+ switch (flv_codecid) {
+ case FLV_CODECID_H263:
+ vcodec->codec_id = AV_CODEC_ID_FLV1;
+ break;
+ case FLV_CODECID_SCREEN:
+ vcodec->codec_id = AV_CODEC_ID_FLASHSV;
+ break;
+ case FLV_CODECID_SCREEN2:
+ vcodec->codec_id = AV_CODEC_ID_FLASHSV2;
+ break;
+ case FLV_CODECID_VP6:
+ vcodec->codec_id = AV_CODEC_ID_VP6F;
+ case FLV_CODECID_VP6A:
+ if (flv_codecid == FLV_CODECID_VP6A)
+ vcodec->codec_id = AV_CODEC_ID_VP6A;
+ if (read) {
+ if (vcodec->extradata_size != 1) {
+ vcodec->extradata = av_malloc(1);
 if (vcodec->extradata)
- vcodec->extradata[0] = avio_r8(s->pb);
- else
- avio_skip(s->pb, 1);
+ vcodec->extradata_size = 1;
 }
- return 1; // 1 byte body size adjustment for flv_read_packet()
- case FLV_CODECID_H264:
- vcodec->codec_id = AV_CODEC_ID_H264;
- return 3; // not 4, reading packet type will consume one byte
- default:
- av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flv_codecid);
- vcodec->codec_tag = flv_codecid;
+ if (vcodec->extradata)
+ vcodec->extradata[0] = avio_r8(s->pb);
+ else
+ avio_skip(s->pb, 1);
+ }
+ return 1; // 1 byte body size adjustment for flv_read_packet()
+ case FLV_CODECID_H264:
+ vcodec->codec_id = AV_CODEC_ID_H264;
+ return 3; // not 4, reading packet type will consume one byte
+ default:
+ av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flv_codecid);
+ vcodec->codec_tag = flv_codecid;
 }
 
 return 0;
 }
 
-static int amf_get_string(AVIOContext *ioc, char *buffer, int buffsize) {
+static int amf_get_string(AVIOContext *ioc, char *buffer, int buffsize)
+{
 int length = avio_rb16(ioc);
- if(length >= buffsize) {
+ if (length >= buffsize) {
 avio_skip(ioc, length);
 return -1;
 }
@@ -248,21 +277,24 @@
 return length;
 }
 
-static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, AVStream *vstream, int64_t max_pos) {
- FLVContext *flv = s->priv_data;
+static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc,
+ AVStream *vstream, int64_t max_pos)
+{
+ FLVContext *flv = s->priv_data;
 unsigned int arraylen = 0, timeslen = 0, fileposlen = 0, i;
 double num_val;
 char str_val[256];
- int64_t *times = NULL;
+ int64_t *times = NULL;
 int64_t *filepositions = NULL;
- int ret = AVERROR(ENOSYS);
- int64_t initial_pos = avio_tell(ioc);
+ int ret = AVERROR(ENOSYS);
+ int64_t initial_pos = avio_tell(ioc);
 
 if (s->flags & AVFMT_FLAG_IGNIDX)
 return 0;
 
- while (avio_tell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) {
- int64_t* current_array;
+ while (avio_tell(ioc) < max_pos - 2 &&
+ amf_get_string(ioc, str_val, sizeof(str_val)) > 0) {
+ int64_t *current_array;
 
 // Expect array object in context
 if (avio_r8(ioc) != AMF_DATA_TYPE_ARRAY)
@@ -272,31 +304,32 @@
 if (arraylen >> 28)
 break;
 
- /*
- * Expect only 'times' or 'filepositions' sub-arrays in other case refuse to use such metadata
- * for indexing
- */
+ /* Expect only 'times' or 'filepositions' sub-arrays in other
+ * case refuse to use such metadata for indexing. */
 if (!strcmp(KEYFRAMES_TIMESTAMP_TAG, str_val) && !times) {
 if (!(times = av_mallocz(sizeof(*times) * arraylen))) {
 ret = AVERROR(ENOMEM);
 goto finish;
 }
- timeslen = arraylen;
+ timeslen = arraylen;
 current_array = times;
- } else if (!strcmp(KEYFRAMES_BYTEOFFSET_TAG, str_val) && !filepositions) {
+ } else if (!strcmp(KEYFRAMES_BYTEOFFSET_TAG, str_val) &&
+ !filepositions) {
 if (!(filepositions = av_mallocz(sizeof(*filepositions) * arraylen))) {
 ret = AVERROR(ENOMEM);
 goto finish;
 }
- fileposlen = arraylen;
+ fileposlen = arraylen;
 current_array = filepositions;
- } else // unexpected metatag inside keyframes, will not use such metadata for indexing
+ } else
+ // unexpected metatag inside keyframes, will not use such
+ // metadata for indexing
 break;
 
 for (i = 0; i < arraylen && avio_tell(ioc) < max_pos - 1; i++) {
 if (avio_r8(ioc) != AMF_DATA_TYPE_NUMBER)
 goto finish;
- num_val = av_int2double(avio_rb64(ioc));
+ num_val = av_int2double(avio_rb64(ioc));
 current_array[i] = num_val;
 }
 if (times && filepositions) {
@@ -309,12 +342,12 @@
 
 if (!ret && timeslen == fileposlen) {
 for (i = 0; i < fileposlen; i++) {
- av_add_index_entry(vstream, filepositions[i], times[i]*1000,
+ av_add_index_entry(vstream, filepositions[i], times[i] * 1000,
 0, 0, AVINDEX_KEYFRAME);
 if (i < 2) {
 flv->validate_index[i].pos = filepositions[i];
 flv->validate_index[i].dts = times[i] * 1000;
- flv->validate_count = i + 1;
+ flv->validate_count = i + 1;
 }
 }
 } else
@@ -330,7 +363,10 @@
 return ret;
 }
 
-static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vstream, const char *key, int64_t max_pos, int depth) {
+static int amf_parse_object(AVFormatContext *s, AVStream *astream,
+ AVStream *vstream, const char *key,
+ int64_t max_pos, int depth)
+{
 AVCodecContext *acodec, *vcodec;
 FLVContext *flv = s->priv_data;
 AVIOContext *ioc;
@@ -338,74 +374,84 @@
 char str_val[256];
 double num_val;
 
- num_val = 0;
- ioc = s->pb;
-
+ num_val = 0;
+ ioc = s->pb;
 amf_type = avio_r8(ioc);
 
- switch(amf_type) {
- case AMF_DATA_TYPE_NUMBER:
- num_val = av_int2double(avio_rb64(ioc)); break;
- case AMF_DATA_TYPE_BOOL:
- num_val = avio_r8(ioc); break;
- case AMF_DATA_TYPE_STRING:
- if(amf_get_string(ioc, str_val, sizeof(str_val)) < 0)
- return -1;
- break;
- case AMF_DATA_TYPE_OBJECT:
- if ((vstream || astream) && key && !strcmp(KEYFRAMES_TAG, key) && depth == 1)
- if (parse_keyframes_index(s, ioc, vstream ? vstream : astream,
- max_pos) < 0)
- return -1;
-
- while (avio_tell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) {
- if (amf_parse_object(s, astream, vstream, str_val, max_pos, depth + 1) < 0)
- return -1; //if we couldn't skip, bomb out.
- }
- if(avio_r8(ioc) != AMF_END_OF_OBJECT)
- return -1;
- break;
- case AMF_DATA_TYPE_NULL:
- case AMF_DATA_TYPE_UNDEFINED:
- case AMF_DATA_TYPE_UNSUPPORTED:
- break; //these take up no additional space
- case AMF_DATA_TYPE_MIXEDARRAY:
- avio_skip(ioc, 4); //skip 32-bit max array index
- while(avio_tell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) {
- //this is the only case in which we would want a nested parse to not skip over the object
- if(amf_parse_object(s, astream, vstream, str_val, max_pos, depth + 1) < 0)
- return -1;
- }
- if(avio_r8(ioc) != AMF_END_OF_OBJECT)
+ switch (amf_type) {
+ case AMF_DATA_TYPE_NUMBER:
+ num_val = av_int2double(avio_rb64(ioc));
+ break;
+ case AMF_DATA_TYPE_BOOL:
+ num_val = avio_r8(ioc);
+ break;
+ case AMF_DATA_TYPE_STRING:
+ if (amf_get_string(ioc, str_val, sizeof(str_val)) < 0)
+ return -1;
+ break;
+ case AMF_DATA_TYPE_OBJECT:
+ if ((vstream || astream) && key &&
+ !strcmp(KEYFRAMES_TAG, key) && depth == 1)
+ if (parse_keyframes_index(s, ioc, vstream ? vstream : astream,
+ max_pos) < 0)
 return -1;
- break;
- case AMF_DATA_TYPE_ARRAY: {
- unsigned int arraylen, i;
 
- arraylen = avio_rb32(ioc);
- for(i = 0; i < arraylen && avio_tell(ioc) < max_pos - 1; i++) {
- if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0)
- return -1; //if we couldn't skip, bomb out.
- }
- }
- break;
- case AMF_DATA_TYPE_DATE:
- avio_skip(ioc, 8 + 2); //timestamp (double) and UTC offset (int16)
- break;
- default: //unsupported type, we couldn't skip
+ while (avio_tell(ioc) < max_pos - 2 &&
+ amf_get_string(ioc, str_val, sizeof(str_val)) > 0)
+ if (amf_parse_object(s, astream, vstream, str_val, max_pos,
+ depth + 1) < 0)
+ return -1; // if we couldn't skip, bomb out.
+ if (avio_r8(ioc) != AMF_END_OF_OBJECT)
 return -1;
+ break;
+ case AMF_DATA_TYPE_NULL:
+ case AMF_DATA_TYPE_UNDEFINED:
+ case AMF_DATA_TYPE_UNSUPPORTED:
+ break; // these take up no additional space
+ case AMF_DATA_TYPE_MIXEDARRAY:
+ avio_skip(ioc, 4); // skip 32-bit max array index
+ while (avio_tell(ioc) < max_pos - 2 &&
+ amf_get_string(ioc, str_val, sizeof(str_val)) > 0)
+ // this is the only case in which we would want a nested
+ // parse to not skip over the object
+ if (amf_parse_object(s, astream, vstream, str_val, max_pos,
+ depth + 1) < 0)
+ return -1;
+ if (avio_r8(ioc) != AMF_END_OF_OBJECT)
+ return -1;
+ break;
+ case AMF_DATA_TYPE_ARRAY:
+ {
+ unsigned int arraylen, i;
+
+ arraylen = avio_rb32(ioc);
+ for (i = 0; i < arraylen && avio_tell(ioc) < max_pos - 1; i++)
+ if (amf_parse_object(s, NULL, NULL, NULL, max_pos,
+ depth + 1) < 0)
+ return -1; // if we couldn't skip, bomb out.
+ }
+ break;
+ case AMF_DATA_TYPE_DATE:
+ avio_skip(ioc, 8 + 2); // timestamp (double) and UTC offset (int16)
+ break;
+ default: // unsupported type, we couldn't skip
+ return -1;
 }
 
- if(depth == 1 && key) { //only look for metadata values when we are not nested and key != NULL
+ // only look for metadata values when we are not nested and key != NULL
+ if (depth == 1 && key) {
 acodec = astream ? astream->codec : NULL;
 vcodec = vstream ? vstream->codec : NULL;
 
- if (amf_type == AMF_DATA_TYPE_NUMBER || amf_type == AMF_DATA_TYPE_BOOL) {
+ if (amf_type == AMF_DATA_TYPE_NUMBER ||
+ amf_type == AMF_DATA_TYPE_BOOL) {
 if (!strcmp(key, "duration"))
 s->duration = num_val * AV_TIME_BASE;
- else if (!strcmp(key, "videodatarate") && vcodec && 0 <= (int)(num_val * 1024.0))
+ else if (!strcmp(key, "videodatarate") && vcodec &&
+ 0 <= (int)(num_val * 1024.0))
 vcodec->bit_rate = num_val * 1024.0;
- else if (!strcmp(key, "audiodatarate") && acodec && 0 <= (int)(num_val * 1024.0))
+ else if (!strcmp(key, "audiodatarate") && acodec &&
+ 0 <= (int)(num_val * 1024.0))
 acodec->bit_rate = num_val * 1024.0;
 else if (!strcmp(key, "datastream")) {
 AVStream *st = create_stream(s, AVMEDIA_TYPE_DATA);
@@ -415,25 +461,21 @@
 } else if (flv->trust_metadata) {
 if (!strcmp(key, "videocodecid") && vcodec) {
 flv_set_video_codec(s, vstream, num_val, 0);
- } else
- if (!strcmp(key, "audiocodecid") && acodec) {
+ } else if (!strcmp(key, "audiocodecid") && acodec) {
 int id = ((int)num_val) << FLV_AUDIO_CODECID_OFFSET;
 flv_set_audio_codec(s, astream, acodec, id);
- } else
- if (!strcmp(key, "audiosamplerate") && acodec) {
+ } else if (!strcmp(key, "audiosamplerate") && acodec) {
 acodec->sample_rate = num_val;
 } else if (!strcmp(key, "audiosamplesize") && acodec) {
 acodec->bits_per_coded_sample = num_val;
 } else if (!strcmp(key, "stereo") && acodec) {
- acodec->channels = num_val + 1;
+ acodec->channels = num_val + 1;
 acodec->channel_layout = acodec->channels == 2 ?
 AV_CH_LAYOUT_STEREO :
 AV_CH_LAYOUT_MONO;
- } else
- if (!strcmp(key, "width") && vcodec) {
+ } else if (!strcmp(key, "width") && vcodec) {
 vcodec->width = num_val;
- } else
- if (!strcmp(key, "height") && vcodec) {
+ } else if (!strcmp(key, "height") && vcodec) {
 vcodec->height = num_val;
 }
 }
@@ -450,13 +492,15 @@
 !strcmp(key, "audiosamplerate") ||
 !strcmp(key, "audiosamplesize") ||
 !strcmp(key, "stereo") ||
- !strcmp(key, "audiocodecid"))
+ !strcmp(key, "audiocodecid") ||
+ !strcmp(key, "datastream"))
 return 0;
 
- if(amf_type == AMF_DATA_TYPE_BOOL) {
- av_strlcpy(str_val, num_val > 0 ? "true" : "false", sizeof(str_val));
+ if (amf_type == AMF_DATA_TYPE_BOOL) {
+ av_strlcpy(str_val, num_val > 0 ? "true" : "false",
+ sizeof(str_val));
 av_dict_set(&s->metadata, key, str_val, 0);
- } else if(amf_type == AMF_DATA_TYPE_NUMBER) {
+ } else if (amf_type == AMF_DATA_TYPE_NUMBER) {
 snprintf(str_val, sizeof(str_val), "%.f", num_val);
 av_dict_set(&s->metadata, key, str_val, 0);
 } else if (amf_type == AMF_DATA_TYPE_STRING)
@@ -466,18 +510,21 @@
 return 0;
 }
 
-static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) {
+static int flv_read_metabody(AVFormatContext *s, int64_t next_pos)
+{
 AMFDataType type;
 AVStream *stream, *astream, *vstream;
 AVIOContext *ioc;
 int i;
- char buffer[11]; //only needs to hold the string "onMetaData". Anything longer is something we don't want.
+ // only needs to hold the string "onMetaData".
+ // Anything longer is something we don't want.
+ char buffer[11];
 
 astream = NULL;
 vstream = NULL;
- ioc = s->pb;
+ ioc = s->pb;
 
- //first object needs to be "onMetaData" string
+ // first object needs to be "onMetaData" string
 type = avio_r8(ioc);
 if (type != AMF_DATA_TYPE_STRING ||
 amf_get_string(ioc, buffer, sizeof(buffer)) < 0)
@@ -489,15 +536,18 @@
 if (strcmp(buffer, "onMetaData"))
 return -1;
 
- //find the streams now so that amf_parse_object doesn't need to do the lookup every time it is called.
- for(i = 0; i < s->nb_streams; i++) {
+ // find the streams now so that amf_parse_object doesn't need to do
+ // the lookup every time it is called.
+ for (i = 0; i < s->nb_streams; i++) {
 stream = s->streams[i];
- if (stream->codec->codec_type == AVMEDIA_TYPE_AUDIO) astream = stream;
- else if(stream->codec->codec_type == AVMEDIA_TYPE_VIDEO) vstream = stream;
+ if (stream->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+ astream = stream;
+ else if (stream->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+ vstream = stream;
 }
 
- //parse the second object (we want a mixed array)
- if(amf_parse_object(s, astream, vstream, buffer, next_pos, 0) < 0)
+ // parse the second object (we want a mixed array)
+ if (amf_parse_object(s, astream, vstream, buffer, next_pos, 0) < 0)
 return -1;
 
 return 0;
@@ -513,19 +563,19 @@
 /* FIXME: better fix needed */
 if (!flags) {
 flags = FLV_HEADER_FLAG_HASVIDEO | FLV_HEADER_FLAG_HASAUDIO;
- av_log(s, AV_LOG_WARNING, "Broken FLV file, which says no streams present, this might fail\n");
+ av_log(s, AV_LOG_WARNING,
+ "Broken FLV file, which says no streams present, "
+ "this might fail\n");
 }
 
 s->ctx_flags |= AVFMTCTX_NOHEADER;
 
- if(flags & FLV_HEADER_FLAG_HASVIDEO){
- if(!create_stream(s, AVMEDIA_TYPE_VIDEO))
+ if (flags & FLV_HEADER_FLAG_HASVIDEO)
+ if (!create_stream(s, AVMEDIA_TYPE_VIDEO))
 return AVERROR(ENOMEM);
- }
- if(flags & FLV_HEADER_FLAG_HASAUDIO){
- if(!create_stream(s, AVMEDIA_TYPE_AUDIO))
+ if (flags & FLV_HEADER_FLAG_HASAUDIO)
+ if (!create_stream(s, AVMEDIA_TYPE_AUDIO))
 return AVERROR(ENOMEM);
- }
 
 offset = avio_rb32(s->pb);
 avio_seek(s->pb, offset, SEEK_SET);
@@ -559,7 +609,8 @@
 int size)
 {
 av_free(flv->new_extradata[stream]);
- flv->new_extradata[stream] = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
+ flv->new_extradata[stream] = av_mallocz(size +
+ FF_INPUT_BUFFER_PADDING_SIZE);
 if (!flv->new_extradata[stream])
 return AVERROR(ENOMEM);
 flv->new_extradata_size[stream] = size;
@@ -570,51 +621,96 @@
 static void clear_index_entries(AVFormatContext *s, int64_t pos)
 {
 int i, j, out;
- av_log(s, AV_LOG_WARNING, "Found invalid index entries, clearing the index.\n");
+ av_log(s, AV_LOG_WARNING,
+ "Found invalid index entries, clearing the index.\n");
 for (i = 0; i < s->nb_streams; i++) {
 AVStream *st = s->streams[i];
 /* Remove all index entries that point to >= pos */
 out = 0;
- for (j = 0; j < st->nb_index_entries; j++) {
+ for (j = 0; j < st->nb_index_entries; j++)
 if (st->index_entries[j].pos < pos)
 st->index_entries[out++] = st->index_entries[j];
- }
 st->nb_index_entries = out;
 }
 }
 
+static int amf_skip_tag(AVIOContext *pb, AMFDataType type)
+{
+ int nb = -1, ret, parse_name = 1;
+
+ switch (type) {
+ case AMF_DATA_TYPE_NUMBER:
+ avio_skip(pb, 8);
+ break;
+ case AMF_DATA_TYPE_BOOL:
+ avio_skip(pb, 1);
+ break;
+ case AMF_DATA_TYPE_STRING:
+ avio_skip(pb, avio_rb16(pb));
+ break;
+ case AMF_DATA_TYPE_ARRAY:
+ parse_name = 0;
+ case AMF_DATA_TYPE_MIXEDARRAY:
+ nb = avio_rb32(pb);
+ case AMF_DATA_TYPE_OBJECT:
+ while(!pb->eof_reached && (nb-- > 0 || type != AMF_DATA_TYPE_ARRAY)) {
+ if (parse_name) {
+ int size = avio_rb16(pb);
+ if (!size) {
+ avio_skip(pb, 1);
+ break;
+ }
+ avio_skip(pb, size);
+ }
+ if ((ret = amf_skip_tag(pb, avio_r8(pb))) < 0)
+ return ret;
+ }
+ break;
+ case AMF_DATA_TYPE_NULL:
+ case AMF_DATA_TYPE_OBJECT_END:
+ break;
+ default:
+ return AVERROR_INVALIDDATA;
+ }
+ return 0;
+}
 
 static int flv_data_packet(AVFormatContext *s, AVPacket *pkt,
 int64_t dts, int64_t next)
 {
- int ret = AVERROR_INVALIDDATA, i;
 AVIOContext *pb = s->pb;
- AVStream *st = NULL;
- AMFDataType type;
+ AVStream *st = NULL;
 char buf[20];
- int length;
+ int ret = AVERROR_INVALIDDATA;
+ int i, length = -1;
 
- type = avio_r8(pb);
- if (type == AMF_DATA_TYPE_MIXEDARRAY)
+ switch (avio_r8(pb)) {
+ case AMF_DATA_TYPE_MIXEDARRAY:
 avio_seek(pb, 4, SEEK_CUR);
- else if (type != AMF_DATA_TYPE_OBJECT)
- goto out;
-
- amf_get_string(pb, buf, sizeof(buf));
- if (strcmp(buf, "type") || avio_r8(pb) != AMF_DATA_TYPE_STRING)
- goto out;
-
- amf_get_string(pb, buf, sizeof(buf));
- //FIXME parse it as codec_id
- amf_get_string(pb, buf, sizeof(buf));
- if (strcmp(buf, "text") || avio_r8(pb) != AMF_DATA_TYPE_STRING)
- goto out;
-
- length = avio_rb16(pb);
- ret = av_get_packet(s->pb, pkt, length);
- if (ret < 0) {
- ret = AVERROR(EIO);
- goto out;
+ case AMF_DATA_TYPE_OBJECT:
+ break;
+ default:
+ goto skip;
+ }
+
+ while ((ret = amf_get_string(pb, buf, sizeof(buf))) > 0) {
+ AMFDataType type = avio_r8(pb);
+ if (type == AMF_DATA_TYPE_STRING && !strcmp(buf, "text")) {
+ length = avio_rb16(pb);
+ ret = av_get_packet(pb, pkt, length);
+ if (ret < 0)
+ goto skip;
+ else
+ break;
+ } else {
+ if ((ret = amf_skip_tag(pb, type)) < 0)
+ goto skip;
+ }
+ }
+
+ if (length < 0) {
+ ret = AVERROR_INVALIDDATA;
+ goto skip;
 }
 
 for (i = 0; i < s->nb_streams; i++) {
@@ -626,7 +722,7 @@
 if (i == s->nb_streams) {
 st = create_stream(s, AVMEDIA_TYPE_DATA);
 if (!st)
- goto out;
+ return AVERROR_INVALIDDATA;
 st->codec->codec_id = AV_CODEC_ID_TEXT;
 }
 
@@ -635,10 +731,11 @@
 pkt->size = ret;
 
 pkt->stream_index = st->index;
- pkt->flags |= AV_PKT_FLAG_KEY;
+ pkt->flags |= AV_PKT_FLAG_KEY;
 
+skip:
 avio_seek(s->pb, next + 4, SEEK_SET);
-out:
+
 return ret;
 }
 
@@ -649,137 +746,145 @@
 int64_t next, pos;
 int64_t dts, pts = AV_NOPTS_VALUE;
 int sample_rate = 0, channels = 0;
- AVStream *st = NULL;
-
- for(;;avio_skip(s->pb, 4)){ /* pkt size is repeated at end. skip it */
- pos = avio_tell(s->pb);
- type = avio_r8(s->pb);
- size = avio_rb24(s->pb);
- dts = avio_rb24(s->pb);
- dts |= avio_r8(s->pb) << 24;
- av_dlog(s, "type:%d, size:%d, dts:%"PRId64"\n", type, size, dts);
- if (s->pb->eof_reached)
- return AVERROR_EOF;
- avio_skip(s->pb, 3); /* stream id, always 0 */
- flags = 0;
-
- if (flv->validate_next < flv->validate_count) {
- int64_t validate_pos = flv->validate_index[flv->validate_next].pos;
- if (pos == validate_pos) {
- if (FFABS(dts - flv->validate_index[flv->validate_next].dts) <=
- VALIDATE_INDEX_TS_THRESH) {
- flv->validate_next++;
- } else {
+ AVStream *st = NULL;
+
+ /* pkt size is repeated at end. skip it */
+ for (;; avio_skip(s->pb, 4)) {
+ pos = avio_tell(s->pb);
+ type = avio_r8(s->pb);
+ size = avio_rb24(s->pb);
+ dts = avio_rb24(s->pb);
+ dts |= avio_r8(s->pb) << 24;
+ av_dlog(s, "type:%d, size:%d, dts:%"PRId64"\n", type, size, dts);
+ if (s->pb->eof_reached)
+ return AVERROR_EOF;
+ avio_skip(s->pb, 3); /* stream id, always 0 */
+ flags = 0;
+
+ if (flv->validate_next < flv->validate_count) {
+ int64_t validate_pos = flv->validate_index[flv->validate_next].pos;
+ if (pos == validate_pos) {
+ if (FFABS(dts - flv->validate_index[flv->validate_next].dts) <=
+ VALIDATE_INDEX_TS_THRESH) {
+ flv->validate_next++;
+ } else {
+ clear_index_entries(s, validate_pos);
+ flv->validate_count = 0;
+ }
+ } else if (pos > validate_pos) {
 clear_index_entries(s, validate_pos);
 flv->validate_count = 0;
 }
- } else if (pos > validate_pos) {
- clear_index_entries(s, validate_pos);
- flv->validate_count = 0;
 }
- }
 
- if(size == 0)
- continue;
-
- next= size + avio_tell(s->pb);
+ if (size == 0)
+ continue;
+
+ next = size + avio_tell(s->pb);
+
+ if (type == FLV_TAG_TYPE_AUDIO) {
+ is_audio = 1;
+ flags = avio_r8(s->pb);
+ size--;
+ } else if (type == FLV_TAG_TYPE_VIDEO) {
+ is_audio = 0;
+ flags = avio_r8(s->pb);
+ size--;
+ if ((flags & 0xf0) == 0x50) /* video info / command frame */
+ goto skip;
+ } else {
+ if (type == FLV_TAG_TYPE_META && size > 13 + 1 + 4)
+ if (flv_read_metabody(s, next) > 0) {
+ return flv_data_packet(s, pkt, dts, next);
+ } else /* skip packet */
+ av_log(s, AV_LOG_DEBUG,
+ "skipping flv packet: type %d, size %d, flags %d\n",
+ type, size, flags);
+
+skip:
+ avio_seek(s->pb, next, SEEK_SET);
+ continue;
+ }
 
- if (type == FLV_TAG_TYPE_AUDIO) {
- is_audio=1;
- flags = avio_r8(s->pb);
- size--;
- } else if (type == FLV_TAG_TYPE_VIDEO) {
- is_audio=0;
- flags = avio_r8(s->pb);
- size--;
- if ((flags & 0xf0) == 0x50) /* video info / command frame */
- goto skip;
- } else {
- if (type == FLV_TAG_TYPE_META && size > 13+1+4)
- if (flv_read_metabody(s, next) > 0) {
- return flv_data_packet(s, pkt, dts, next);
- }
- else /* skip packet */
- av_log(s, AV_LOG_DEBUG, "skipping flv packet: type %d, size %d, flags %d\n", type, size, flags);
- skip:
- avio_seek(s->pb, next, SEEK_SET);
- continue;
- }
-
- /* skip empty data packets */
- if (!size)
- continue;
-
- /* now find stream */
- for(i=0;i<s->nb_streams;i++) {
- st = s->streams[i];
- if (is_audio && st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
- if (flv_same_audio_codec(st->codec, flags)) {
- break;
- }
- } else
- if (!is_audio && st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
- if (flv_same_video_codec(st->codec, flags)) {
- break;
+ /* skip empty data packets */
+ if (!size)
+ continue;
+
+ /* now find stream */
+ for (i = 0; i < s->nb_streams; i++) {
+ st = s->streams[i];
+ if (is_audio && st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+ if (flv_same_audio_codec(st->codec, flags))
+ break;
+ } else if (!is_audio &&
+ st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+ if (flv_same_video_codec(st->codec, flags))
+ break;
 }
 }
+ if (i == s->nb_streams)
+ st = create_stream(s, is_audio ? AVMEDIA_TYPE_AUDIO
+ : AVMEDIA_TYPE_VIDEO);
+ av_dlog(s, "%d %X %d \n", is_audio, flags, st->discard);
+ if ((st->discard >= AVDISCARD_NONKEY &&
+ !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || is_audio)) ||
+ (st->discard >= AVDISCARD_BIDIR &&
+ ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && !is_audio)) ||
+ st->discard >= AVDISCARD_ALL) {
+ avio_seek(s->pb, next, SEEK_SET);
+ continue;
+ }
+ if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY)
+ av_add_index_entry(st, pos, dts, size, 0, AVINDEX_KEYFRAME);
+ break;
 }
- if(i == s->nb_streams){
- st = create_stream(s,
- is_audio ? AVMEDIA_TYPE_AUDIO : AVMEDIA_TYPE_VIDEO);
- }
- av_dlog(s, "%d %X %d \n", is_audio, flags, st->discard);
- if( (st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || is_audio))
- ||(st->discard >= AVDISCARD_BIDIR && ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && !is_audio))
- || st->discard >= AVDISCARD_ALL
- ){
- avio_seek(s->pb, next, SEEK_SET);
- continue;
- }
- if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY)
- av_add_index_entry(st, pos, dts, size, 0, AVINDEX_KEYFRAME);
- break;
- }
 
- // if not streamed and no duration from metadata then seek to end to find the duration from the timestamps
- if(s->pb->seekable && (!s->duration || s->duration==AV_NOPTS_VALUE)){
+ // if not streamed and no duration from metadata then seek to end to find
+ // the duration from the timestamps
+ if (s->pb->seekable && (!s->duration || s->duration == AV_NOPTS_VALUE)) {
 int size;
- const int64_t pos= avio_tell(s->pb);
- const int64_t fsize= avio_size(s->pb);
- avio_seek(s->pb, fsize-4, SEEK_SET);
- size= avio_rb32(s->pb);
- avio_seek(s->pb, fsize-3-size, SEEK_SET);
- if(size == avio_rb24(s->pb) + 11){
+ const int64_t pos = avio_tell(s->pb);
+ const int64_t fsize = avio_size(s->pb);
+ avio_seek(s->pb, fsize - 4, SEEK_SET);
+ size = avio_rb32(s->pb);
+ avio_seek(s->pb, fsize - 3 - size, SEEK_SET);
+ if (size == avio_rb24(s->pb) + 11) {
 uint32_t ts = avio_rb24(s->pb);
- ts |= avio_r8(s->pb) << 24;
+ ts |= avio_r8(s->pb) << 24;
 s->duration = ts * (int64_t)AV_TIME_BASE / 1000;
 }
 avio_seek(s->pb, pos, SEEK_SET);
 }
 
- if(is_audio){
+ if (is_audio) {
 int bits_per_coded_sample;
- channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1;
- sample_rate = (44100 << ((flags & FLV_AUDIO_SAMPLERATE_MASK) >> FLV_AUDIO_SAMPLERATE_OFFSET) >> 3);
+ channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1;
+ sample_rate = 44100 << ((flags & FLV_AUDIO_SAMPLERATE_MASK) >>
+ FLV_AUDIO_SAMPLERATE_OFFSET) >> 3;
 bits_per_coded_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8;
- if(!st->codec->channels || !st->codec->sample_rate || !st->codec->bits_per_coded_sample) {
+ if (!st->codec->channels || !st->codec->sample_rate ||
+ !st->codec->bits_per_coded_sample) {
 st->codec->channels = channels;
- st->codec->channel_layout = channels == 1 ? AV_CH_LAYOUT_MONO :
- AV_CH_LAYOUT_STEREO;
+ st->codec->channel_layout = channels == 1
+ ? AV_CH_LAYOUT_MONO
+ : AV_CH_LAYOUT_STEREO;
 st->codec->sample_rate = sample_rate;
 st->codec->bits_per_coded_sample = bits_per_coded_sample;
 }
- if(!st->codec->codec_id){
- flv_set_audio_codec(s, st, st->codec, flags & FLV_AUDIO_CODECID_MASK);
- flv->last_sample_rate = sample_rate = st->codec->sample_rate;
- flv->last_channels = channels = st->codec->channels;
+ if (!st->codec->codec_id) {
+ flv_set_audio_codec(s, st, st->codec,
+ flags & FLV_AUDIO_CODECID_MASK);
+ flv->last_sample_rate =
+ sample_rate = st->codec->sample_rate;
+ flv->last_channels =
+ channels = st->codec->channels;
 } else {
 AVCodecContext ctx;
 ctx.sample_rate = sample_rate;
 flv_set_audio_codec(s, st, &ctx, flags & FLV_AUDIO_CODECID_MASK);
 sample_rate = ctx.sample_rate;
 }
- }else{
+ } else {
 size -= flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK, 1);
 }
 
@@ -788,11 +893,13 @@
 int type = avio_r8(s->pb);
 size--;
 if (st->codec->codec_id == AV_CODEC_ID_H264) {
- int32_t cts = (avio_rb24(s->pb)+0xff800000)^0xff800000; // sign extension
+ // sign extension
+ int32_t cts = (avio_rb24(s->pb) + 0xff800000) ^ 0xff800000;
 pts = dts + cts;
 if (cts < 0) { // dts are wrong
 flv->wrong_dts = 1;
- av_log(s, AV_LOG_WARNING, "negative cts, previous timestamps might be wrong\n");
+ av_log(s, AV_LOG_WARNING,
+ "negative cts, previous timestamps might be wrong\n");
 }
 if (flv->wrong_dts)
 dts = AV_NOPTS_VALUE;
@@ -808,9 +915,15 @@
 return ret;
 if (st->codec->codec_id == AV_CODEC_ID_AAC) {
 MPEG4AudioConfig cfg;
+
+ /* Workaround for buggy Omnia A/XE encoder */
+ AVDictionaryEntry *t = av_dict_get(s->metadata, "Encoder", NULL, 0);
+ if (t && !strcmp(t->value, "Omnia A/XE"))
+ st->codec->extradata_size = 2;
+
 avpriv_mpeg4audio_get_config(&cfg, st->codec->extradata,
 st->codec->extradata_size * 8, 1);
- st->codec->channels = cfg.channels;
+ st->codec->channels = cfg.channels;
 st->codec->channel_layout = 0;
 if (cfg.ext_sample_rate)
 st->codec->sample_rate = cfg.ext_sample_rate;
@@ -831,15 +944,14 @@
 goto leave;
 }
 
- ret= av_get_packet(s->pb, pkt, size);
- if (ret < 0) {
+ ret = av_get_packet(s->pb, pkt, size);
+ if (ret < 0)
 return AVERROR(EIO);
- }
 /* note: we need to modify the packet size here to handle the last
- packet */
- pkt->size = ret;
- pkt->dts = dts;
- pkt->pts = pts == AV_NOPTS_VALUE ? dts : pts;
+ * packet */
+ pkt->size = ret;
+ pkt->dts = dts;
+ pkt->pts = pts == AV_NOPTS_VALUE ? dts : pts;
 pkt->stream_index = st->index;
 if (flv->new_extradata[is_audio]) {
 uint8_t *side = av_packet_new_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA,
@@ -852,7 +964,7 @@
 }
 }
 if (is_audio && (sample_rate != flv->last_sample_rate ||
- channels != flv->last_channels)) {
+ channels != flv->last_channels)) {
 flv->last_sample_rate = sample_rate;
 flv->last_channels = channels;
 ff_add_param_change(pkt, channels, 0, sample_rate, 0, 0);
@@ -867,7 +979,7 @@
 }
 
 static int flv_read_seek(AVFormatContext *s, int stream_index,
- int64_t ts, int flags)
+ int64_t ts, int flags)
 {
 FLVContext *flv = s->priv_data;
 flv->validate_count = 0;
@@ -877,7 +989,7 @@
 #define OFFSET(x) offsetof(FLVContext, x)
 #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
 static const AVOption options[] = {
- { "flv_metadata", "Allocate streams according the onMetaData array", OFFSET(trust_metadata), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VD},
+ { "flv_metadata", "Allocate streams according to the onMetaData array", OFFSET(trust_metadata), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VD },
 { NULL }
 };

libav-v9.6.tar.bz2/libavformat/flvenc.c -> libav-v10.1.tar.bz2/libavformat/flvenc.c Changed

@@ -35,7 +35,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 }
 };
@@ -208,6 +208,11 @@
 } else {
 framerate = 1 / av_q2d(s->streams[i]->codec->time_base);
 }
+ if (video_enc) {
+ av_log(s, AV_LOG_ERROR,
+ "at most one video stream is supported in flv\n");
+ return AVERROR(EINVAL);
+ }
 video_enc = enc;
 if (enc->codec_tag == 0) {
 av_log(s, AV_LOG_ERROR, "video codec not compatible with flv\n");
@@ -215,6 +220,11 @@
 }
 break;
 case AVMEDIA_TYPE_AUDIO:
+ if (audio_enc) {
+ av_log(s, AV_LOG_ERROR,
+ "at most one audio stream is supported in flv\n");
+ return AVERROR(EINVAL);
+ }
 audio_enc = enc;
 if (get_audio_flags(s, enc) < 0)
 return AVERROR_INVALIDDATA;
@@ -427,7 +437,7 @@
 uint8_t *data = NULL;
 int flags = 0, flags_size;
 
- if (enc->codec_id == AV_CODEC_ID_VP6 || enc->codec_id == AV_CODEC_ID_VP6F ||
+ if (enc->codec_id == AV_CODEC_ID_VP6F || enc->codec_id == AV_CODEC_ID_VP6A ||
 enc->codec_id == AV_CODEC_ID_AAC)
 flags_size = 2;
 else if (enc->codec_id == AV_CODEC_ID_H264)
@@ -496,7 +506,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);
@@ -517,11 +527,13 @@
 avio_wb32(pb, data_size + 11);
 } else {
 avio_w8(pb,flags);
- if (enc->codec_id == AV_CODEC_ID_VP6)
- avio_w8(pb, 0);
- if (enc->codec_id == AV_CODEC_ID_VP6F)
- avio_w8(pb, enc->extradata_size ? enc->extradata[0] : 0);
- else if (enc->codec_id == AV_CODEC_ID_AAC)
+ 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]);
+ else
+ avio_w8(pb, ((FFALIGN(enc->width, 16) - enc->width) << 4) |
+ (FFALIGN(enc->height, 16) - enc->height));
+ } else if (enc->codec_id == AV_CODEC_ID_AAC)
 avio_w8(pb, 1); // AAC raw
 else if (enc->codec_id == AV_CODEC_ID_H264) {
 avio_w8(pb, 1); // AVC NALU
@@ -535,7 +547,6 @@
 pkt->pts + flv->delay + pkt->duration);
 }
 
- avio_flush(pb);
 av_free(data);
 
 return pb->error;

libav-v10.1.tar.bz2/libavformat/format.c Added

@@ -0,0 +1,183 @@
+/*
+ * Format register and lookup
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avformat.h"
+#include "internal.h"
+#include "libavutil/avstring.h"
+
+/**
+ * @file
+ * Format register and lookup
+ */
+/** head of registered input format linked list */
+static AVInputFormat *first_iformat = NULL;
+/** head of registered output format linked list */
+static AVOutputFormat *first_oformat = NULL;
+
+AVInputFormat *av_iformat_next(AVInputFormat *f)
+{
+ if (f)
+ return f->next;
+ else
+ return first_iformat;
+}
+
+AVOutputFormat *av_oformat_next(AVOutputFormat *f)
+{
+ if (f)
+ return f->next;
+ else
+ return first_oformat;
+}
+
+void av_register_input_format(AVInputFormat *format)
+{
+ AVInputFormat **p = &first_iformat;
+
+ while (*p != NULL)
+ p = &(*p)->next;
+
+ *p = format;
+ format->next = NULL;
+}
+
+void av_register_output_format(AVOutputFormat *format)
+{
+ AVOutputFormat **p = &first_oformat;
+
+ while (*p != NULL)
+ p = &(*p)->next;
+
+ *p = format;
+ format->next = NULL;
+}
+
+int av_match_ext(const char *filename, const char *extensions)
+{
+ const char *ext, *p;
+ char ext1[32], *q;
+
+ if (!filename)
+ return 0;
+
+ ext = strrchr(filename, '.');
+ if (ext) {
+ ext++;
+ p = extensions;
+ for (;;) {
+ q = ext1;
+ while (*p != '\0' && *p != ',' && q - ext1 < sizeof(ext1) - 1)
+ *q++ = *p++;
+ *q = '\0';
+ if (!av_strcasecmp(ext1, ext))
+ return 1;
+ if (*p == '\0')
+ break;
+ p++;
+ }
+ }
+ return 0;
+}
+
+static int match_format(const char *name, const char *names)
+{
+ const char *p;
+ int len, namelen;
+
+ if (!name || !names)
+ return 0;
+
+ namelen = strlen(name);
+ while ((p = strchr(names, ','))) {
+ len = FFMAX(p - names, namelen);
+ if (!av_strncasecmp(name, names, len))
+ return 1;
+ names = p + 1;
+ }
+ return !av_strcasecmp(name, names);
+}
+
+AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
+ const char *mime_type)
+{
+ AVOutputFormat *fmt = NULL, *fmt_found;
+ int score_max, score;
+
+ /* specific test for image sequences */
+#if CONFIG_IMAGE2_MUXER
+ if (!short_name && filename &&
+ av_filename_number_test(filename) &&
+ ff_guess_image2_codec(filename) != AV_CODEC_ID_NONE) {
+ return av_guess_format("image2", NULL, NULL);
+ }
+#endif
+ /* Find the proper file type. */
+ fmt_found = NULL;
+ score_max = 0;
+ while ((fmt = av_oformat_next(fmt))) {
+ score = 0;
+ if (fmt->name && short_name && !av_strcasecmp(fmt->name, short_name))
+ score += 100;
+ if (fmt->mime_type && mime_type && !strcmp(fmt->mime_type, mime_type))
+ score += 10;
+ if (filename && fmt->extensions &&
+ av_match_ext(filename, fmt->extensions)) {
+ score += 5;
+ }
+ if (score > score_max) {
+ score_max = score;
+ fmt_found = fmt;
+ }
+ }
+ return fmt_found;
+}
+
+enum AVCodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
+ const char *filename, const char *mime_type,
+ enum AVMediaType type)
+{
+ if (type == AVMEDIA_TYPE_VIDEO) {
+ enum AVCodecID codec_id = AV_CODEC_ID_NONE;
+
+#if CONFIG_IMAGE2_MUXER
+ if (!strcmp(fmt->name, "image2") || !strcmp(fmt->name, "image2pipe")) {
+ codec_id = ff_guess_image2_codec(filename);
+ }
+#endif
+ if (codec_id == AV_CODEC_ID_NONE)
+ codec_id = fmt->video_codec;
+ return codec_id;
+ } else if (type == AVMEDIA_TYPE_AUDIO)
+ return fmt->audio_codec;
+ else if (type == AVMEDIA_TYPE_SUBTITLE)
+ return fmt->subtitle_codec;
+ else
+ return AV_CODEC_ID_NONE;
+}
+
+AVInputFormat *av_find_input_format(const char *short_name)
+{
+ AVInputFormat *fmt = NULL;
+ while ((fmt = av_iformat_next(fmt)))
+ if (match_format(short_name, fmt->name))
+ return fmt;
+ return NULL;
+}

libav-v9.6.tar.bz2/libavformat/framecrcenc.c -> libav-v10.1.tar.bz2/libavformat/framecrcenc.c Changed

libav-v9.6.tar.bz2/libavformat/g723_1.c -> libav-v10.1.tar.bz2/libavformat/g723_1.c Changed

libav-v9.6.tar.bz2/libavformat/gif.c -> libav-v10.1.tar.bz2/libavformat/gif.c Changed

libav-v9.6.tar.bz2/libavformat/gxfenc.c -> libav-v10.1.tar.bz2/libavformat/gxfenc.c Changed

@@ -342,11 +342,13 @@
 
 if (!rewrite) {
 if (!(gxf->map_offsets_nb % 30)) {
- gxf->map_offsets = av_realloc(gxf->map_offsets,
- (gxf->map_offsets_nb+30)*sizeof(*gxf->map_offsets));
- if (!gxf->map_offsets) {
+ int err;
+ if ((err = av_reallocp_array(&gxf->map_offsets,
+ gxf->map_offsets_nb + 30,
+ sizeof(*gxf->map_offsets))) < 0) {
+ gxf->map_offsets_nb = 0;
 av_log(s, AV_LOG_ERROR, "could not realloc map offsets\n");
- return -1;
+ return err;
 }
 }
 gxf->map_offsets[gxf->map_offsets_nb++] = pos; // do not increment here
@@ -873,11 +875,13 @@
 
 if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
 if (!(gxf->flt_entries_nb % 500)) {
- gxf->flt_entries = av_realloc(gxf->flt_entries,
- (gxf->flt_entries_nb+500)*sizeof(*gxf->flt_entries));
- if (!gxf->flt_entries) {
+ int err;
+ if ((err = av_reallocp_array(&gxf->flt_entries,
+ gxf->flt_entries_nb + 500,
+ sizeof(*gxf->flt_entries))) < 0) {
+ gxf->flt_entries_nb = 0;
 av_log(s, AV_LOG_ERROR, "could not reallocate flt entries\n");
- return -1;
+ return err;
 }
 }
 gxf->flt_entries[gxf->flt_entries_nb++] = packet_start_offset;
@@ -892,8 +896,6 @@
 gxf->packet_count = 0;
 }
 
- avio_flush(pb);
-
 return 0;
 }

libav-v9.6.tar.bz2/libavformat/h261dec.c -> libav-v10.1.tar.bz2/libavformat/h261dec.c Changed

libav-v9.6.tar.bz2/libavformat/h263dec.c -> libav-v10.1.tar.bz2/libavformat/h263dec.c Changed

libav-v9.6.tar.bz2/libavformat/h264dec.c -> libav-v10.1.tar.bz2/libavformat/h264dec.c Changed

@@ -24,47 +24,55 @@
 
 static int h264_probe(AVProbeData *p)
 {
- uint32_t code= -1;
- int sps=0, pps=0, idr=0, res=0, sli=0;
+ uint32_t code = -1;
+ int sps = 0, pps = 0, idr = 0, res = 0, sli = 0;
 int i;
 
- for(i=0; i<p->buf_size; i++){
- code = (code<<8) + p->buf[i];
+ for (i = 0; i < p->buf_size; i++) {
+ code = (code << 8) + p->buf[i];
 if ((code & 0xffffff00) == 0x100) {
- int ref_idc= (code>>5)&3;
- int type = code & 0x1F;
- static const int8_t ref_zero[32]={
- 2, 0, 0, 0, 0,-1, 1,-1,
- -1, 1, 1, 1, 1,-1, 2, 2,
- 2, 2, 2, 0, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2
+ int ref_idc = (code >> 5) & 3;
+ int type = code & 0x1F;
+ static const int8_t ref_zero[] = {
+ 2, 0, 0, 0, 0, -1, 1, -1,
+ -1, 1, 1, 1, 1, -1, 2, 2,
+ 2, 2, 2, 0, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2
 };
 
- if(code & 0x80) //forbidden bit
+ if (code & 0x80) // forbidden_bit
 return 0;
 
- if(ref_zero[type] == 1 && ref_idc)
+ if (ref_zero[type] == 1 && ref_idc)
 return 0;
- if(ref_zero[type] ==-1 && !ref_idc)
+ if (ref_zero[type] == -1 && !ref_idc)
 return 0;
- if(ref_zero[type] == 2)
+ if (ref_zero[type] == 2)
 res++;
 
- switch(type){
- case 1: sli++; break;
- case 5: idr++; break;
- case 7:
+ switch (type) {
+ case 1:
+ sli++;
+ break;
+ case 5:
+ idr++;
+ break;
+ case 7:
 if (p->buf[i + 2] & 0x03)
 return 0;
 sps++;
 break;
- case 8: pps++; break;
+ case 8:
+ pps++;
+ break;
 }
 }
 }
- if(sps && pps && (idr||sli>3) && res<(sps+pps+idr))
- return AVPROBE_SCORE_MAX/2+1; // +1 for .mpg
+
+ if (sps && pps && (idr || sli > 3) && res < (sps + pps + idr))
+ return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg
+
 return 0;
 }
 
-FF_DEF_RAWVIDEO_DEMUXER(h264 , "raw H.264 video", h264_probe, "h26l,h264,264", AV_CODEC_ID_H264)
+FF_DEF_RAWVIDEO_DEMUXER(h264, "raw H.264 video", h264_probe, "h26l,h264,264,avc", AV_CODEC_ID_H264)

libav-v10.1.tar.bz2/libavformat/hdsenc.c Added

@@ -0,0 +1,591 @@
+/*
+ * Live HDS fragmenter
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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);
+ rename(temp_filename, filename);
+ 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);
+ rename(temp_filename, filename);
+ 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;
+
+ mkdir(s->filename, 0777);
+
+ 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);
+ rename(os->temp_filename, target_filename);
+ 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,
+};

libav-v10.1.tar.bz2/libavformat/hevc.c Added

@@ -0,0 +1,1140 @@
+/*
+ * Copyright (c) 2014 Tim Walker <tdskywalker@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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;
+}

libav-v10.1.tar.bz2/libavformat/hevc.h Added

@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2014 Tim Walker <tdskywalker@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 */

libav-v10.1.tar.bz2/libavformat/hevcdec.c Added

@@ -0,0 +1,64 @@
+/*
+ * RAW HEVC video demuxer
+ * Copyright (c) 2013 Dirk Farin <dirk.farin@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavcodec/hevc.h"
+
+#include "avformat.h"
+#include "rawdec.h"
+
+static int hevc_probe(AVProbeData *p)
+{
+ uint32_t code = -1;
+ int vps = 0, sps = 0, pps = 0, irap = 0;
+ int i;
+
+ for (i = 0; i < p->buf_size - 1; i++) {
+ code = (code << 8) + p->buf[i];
+ if ((code & 0xffffff00) == 0x100) {
+ uint8_t nal2 = p->buf[i + 1];
+ int type = (code & 0x7E) >> 1;
+
+ if (code & 0x81) // forbidden and reserved zero bits
+ return 0;
+
+ if (nal2 & 0xf8) // reserved zero
+ return 0;
+
+ switch (type) {
+ case NAL_VPS: vps++; break;
+ case NAL_SPS: sps++; break;
+ case NAL_PPS: pps++; break;
+ case NAL_BLA_N_LP:
+ case NAL_BLA_W_LP:
+ case NAL_BLA_W_RADL:
+ case NAL_CRA_NUT:
+ case NAL_IDR_N_LP:
+ case NAL_IDR_W_RADL: irap++; break;
+ }
+ }
+ }
+
+ if (vps && sps && pps && irap)
+ return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg
+ return 0;
+}
+
+FF_DEF_RAWVIDEO_DEMUXER(hevc, "raw HEVC video", hevc_probe, "hevc,h265,265", AV_CODEC_ID_HEVC)

libav-v9.6.tar.bz2/libavformat/hls.c -> libav-v10.1.tar.bz2/libavformat/hls.c Changed

@@ -56,7 +56,7 @@
 };
 
 struct segment {
- int duration;
+ int64_t duration;
 char url[MAX_URL_SIZE];
 char key[MAX_URL_SIZE];
 enum KeyType key_type;
@@ -81,7 +81,7 @@
 int stream_offset;
 
 int finished;
- int target_duration;
+ int64_t target_duration;
 int start_seq_no;
 int n_segments;
 struct segment **segments;
@@ -108,7 +108,7 @@
 static int read_chomp_line(AVIOContext *s, char *buf, int maxlen)
 {
 int len = ff_get_line(s, buf, maxlen);
- while (len > 0 && isspace(buf[len - 1]))
+ while (len > 0 && av_isspace(buf[len - 1]))
 buf[--len] = '\0';
 return len;
 }
@@ -202,7 +202,8 @@
 static int parse_playlist(HLSContext *c, const char *url,
 struct variant *var, AVIOContext *in)
 {
- int ret = 0, duration = 0, is_segment = 0, is_variant = 0, bandwidth = 0;
+ int ret = 0, is_segment = 0, is_variant = 0, bandwidth = 0;
+ int64_t duration = 0;
 enum KeyType key_type = KEY_NONE;
 uint8_t iv[16] = "";
 int has_iv = 0;
@@ -210,6 +211,7 @@
 char line[1024];
 const char *ptr;
 int close_in = 0;
+ uint8_t *new_url = NULL;
 
 if (!in) {
 close_in = 1;
@@ -218,6 +220,9 @@
 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;
@@ -257,7 +262,7 @@
 goto fail;
 }
 }
- var->target_duration = atoi(ptr);
+ var->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);
@@ -272,7 +277,7 @@
 var->finished = 1;
 } else if (av_strstart(line, "#EXTINF:", &ptr)) {
 is_segment = 1;
- duration = atoi(ptr);
+ duration = atof(ptr) * AV_TIME_BASE;
 } else if (av_strstart(line, "#", NULL)) {
 continue;
 } else if (line[0]) {
@@ -318,6 +323,7 @@
 var->last_load_time = av_gettime();
 
 fail:
+ av_free(new_url);
 if (close_in)
 avio_close(in);
 return ret;
@@ -383,7 +389,6 @@
 int64_t reload_interval = v->n_segments > 0 ?
 v->segments[v->n_segments - 1]->duration :
 v->target_duration;
- reload_interval *= 1000000;
 
 reload:
 if (!v->finished &&
@@ -393,7 +398,7 @@
 /* If we need to reload the playlist again below (if
 * there's still no more segments), switch to a reload
 * interval of half the target duration. */
- reload_interval = v->target_duration * 500000;
+ reload_interval = v->target_duration / 2;
 }
 if (v->cur_seq_no < v->start_seq_no) {
 av_log(NULL, AV_LOG_WARNING,
@@ -427,7 +432,8 @@
 c->end_of_segment = 1;
 c->cur_seq_no = v->cur_seq_no;
 
- if (v->ctx && v->ctx->nb_streams) {
+ if (v->ctx && v->ctx->nb_streams &&
+ v->parent->nb_streams >= v->stream_offset + v->ctx->nb_streams) {
 v->needed = 0;
 for (i = v->stream_offset; i < v->stream_offset + v->ctx->nb_streams;
 i++) {
@@ -480,7 +486,7 @@
 int64_t duration = 0;
 for (i = 0; i < c->variants[0]->n_segments; i++)
 duration += c->variants[0]->segments[i]->duration;
- s->duration = duration * AV_TIME_BASE;
+ s->duration = duration;
 }
 
 /* Open the demuxer for each variant */
@@ -488,6 +494,8 @@
 struct variant *v = c->variants[i];
 AVInputFormat *in_fmt = NULL;
 char bitrate_str[20];
+ AVProgram *program;
+
 if (v->n_segments == 0)
 continue;
 
@@ -522,19 +530,33 @@
 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);
 if (ret < 0)
 goto fail;
- v->stream_offset = stream_offset;
+
+ v->ctx->ctx_flags &= ~AVFMTCTX_NOHEADER;
+ ret = avformat_find_stream_info(v->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++) {
 AVStream *st = avformat_new_stream(s, NULL);
+ AVStream *ist = v->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,
@@ -615,8 +637,11 @@
 reset_packet(&var->pkt);
 break;
 } else {
- if (c->first_timestamp == AV_NOPTS_VALUE)
- c->first_timestamp = var->pkt.dts;
+ 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,
+ AV_TIME_BASE_Q);
 }
 
 if (c->seek_timestamp == AV_NOPTS_VALUE)
@@ -636,13 +661,36 @@
 c->seek_timestamp = AV_NOPTS_VALUE;
 break;
 }
+ av_free_packet(&var->pkt);
+ reset_packet(&var->pkt);
 }
 }
- /* Check if this stream has the packet with the lowest dts */
+ /* Check if this stream still is on an earlier segment number, or
+ * has the packet with the lowest dts */
 if (var->pkt.data) {
- if (minvariant < 0 ||
- var->pkt.dts < c->variants[minvariant]->pkt.dts)
+ struct variant *minvar = minvariant < 0 ?
+ NULL : 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 (dts == AV_NOPTS_VALUE) {
+ minvariant = i;
+ } else if (mindts != AV_NOPTS_VALUE) {
+ if (st->start_time != AV_NOPTS_VALUE)
+ dts -= st->start_time;
+ if (minst->start_time != AV_NOPTS_VALUE)
+ mindts -= minst->start_time;
+
+ if (av_compare_ts(dts, st->time_base,
+ mindts, minst->time_base) < 0)
+ minvariant = i;
+ }
+ }
 }
 }
 if (c->end_of_segment) {
@@ -682,7 +730,7 @@
 s->streams[stream_index]->time_base.den,
 flags & AVSEEK_FLAG_BACKWARD ?
 AV_ROUND_DOWN : AV_ROUND_UP);
- timestamp = av_rescale_rnd(timestamp, 1, stream_index >= 0 ?
+ timestamp = av_rescale_rnd(timestamp, AV_TIME_BASE, stream_index >= 0 ?
 s->streams[stream_index]->time_base.den :
 AV_TIME_BASE, flags & AVSEEK_FLAG_BACKWARD ?
 AV_ROUND_DOWN : AV_ROUND_UP);
@@ -695,10 +743,8 @@
 for (i = 0; i < c->n_variants; i++) {
 /* Reset reading */
 struct variant *var = c->variants[i];
- int64_t pos = c->first_timestamp == AV_NOPTS_VALUE ? 0 :
- av_rescale_rnd(c->first_timestamp, 1,
- stream_index >= 0 ? s->streams[stream_index]->time_base.den : AV_TIME_BASE,
- flags & AVSEEK_FLAG_BACKWARD ? AV_ROUND_DOWN : AV_ROUND_UP);
+ int64_t pos = c->first_timestamp == AV_NOPTS_VALUE ?
+ 0 : c->first_timestamp;
 if (var->input) {
 ffurl_close(var->input);
 var->input = NULL;

libav-v9.6.tar.bz2/libavformat/hlsenc.c -> libav-v10.1.tar.bz2/libavformat/hlsenc.c Changed

@@ -20,6 +20,7 @@
 */
 
 #include <float.h>
+#include <stdint.h>
 
 #include "libavutil/mathematics.h"
 #include "libavutil/parseutils.h"
@@ -49,6 +50,7 @@
 int has_video;
 int64_t start_pts;
 int64_t end_pts;
+ int64_t duration; // last segment duration computed so far, in seconds
 int nb_entries;
 ListEntry *list;
 ListEntry *end_list;
@@ -163,12 +165,10 @@
 AVFormatContext *oc = c->avf;
 int err = 0;
 
- if (c->wrap)
- c->number %= c->wrap;
-
 if (av_get_frame_filename(oc->filename, sizeof(oc->filename),
- c->basename, c->number++) < 0)
+ c->basename, c->wrap ? c->number % c->wrap : c->number) < 0)
 return AVERROR(EINVAL);
+ c->number++;
 
 if ((err = avio_open2(&oc->pb, oc->filename, AVIO_FLAG_WRITE,
 &s->interrupt_callback, NULL)) < 0)
@@ -261,16 +261,20 @@
 can_split = st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
 pkt->flags & AV_PKT_FLAG_KEY;
 }
+ if (pkt->pts == AV_NOPTS_VALUE)
+ can_split = 0;
+ else
+ hls->duration = av_rescale(pkt->pts - hls->end_pts,
+ st->time_base.num, st->time_base.den);
 
 if (can_split && av_compare_ts(pkt->pts - hls->start_pts, st->time_base,
 end_pts, AV_TIME_BASE_Q) >= 0) {
- ret = append_entry(hls, av_rescale(pkt->pts - hls->end_pts,
- st->time_base.num,
- st->time_base.den));
+ ret = append_entry(hls, hls->duration);
 if (ret)
 return ret;
 
 hls->end_pts = pkt->pts;
+ hls->duration = 0;
 
 av_write_frame(oc, NULL); /* Flush any buffered data */
 avio_close(oc->pb);
@@ -300,6 +304,7 @@
 avio_closep(&oc->pb);
 avformat_free_context(oc);
 av_free(hls->basename);
+ append_entry(hls, hls->duration);
 hls_window(s, 1);
 
 free_entries(hls);
@@ -310,7 +315,7 @@
 #define OFFSET(x) offsetof(HLSContext, x)
 #define E AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption options[] = {
- { "start_number", "first number in the sequence", OFFSET(number), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E},
+ {"start_number", "first number in the sequence", OFFSET(sequence),AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, E},
 {"hls_time", "segment length in seconds", OFFSET(time), AV_OPT_TYPE_FLOAT, {.dbl = 2}, 0, FLT_MAX, E},
 {"hls_list_size", "maximum number of playlist entries", OFFSET(size), AV_OPT_TYPE_INT, {.i64 = 5}, 0, INT_MAX, E},
 {"hls_wrap", "number after which the index wraps", OFFSET(wrap), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E},

libav-v9.6.tar.bz2/libavformat/hlsproto.c -> libav-v10.1.tar.bz2/libavformat/hlsproto.c Changed

@@ -45,7 +45,7 @@
 */
 
 struct segment {
- int duration;
+ int64_t duration;
 char url[MAX_URL_SIZE];
 };
 
@@ -56,7 +56,7 @@
 
 typedef struct HLSContext {
 char playlisturl[MAX_URL_SIZE];
- int target_duration;
+ int64_t target_duration;
 int start_seq_no;
 int finished;
 int n_segments;
@@ -71,7 +71,7 @@
 static int read_chomp_line(AVIOContext *s, char *buf, int maxlen)
 {
 int len = ff_get_line(s, buf, maxlen);
- while (len > 0 && isspace(buf[len - 1]))
+ while (len > 0 && av_isspace(buf[len - 1]))
 buf[--len] = '\0';
 return len;
 }
@@ -111,7 +111,8 @@
 {
 HLSContext *s = h->priv_data;
 AVIOContext *in;
- int ret = 0, duration = 0, is_segment = 0, is_variant = 0, bandwidth = 0;
+ int ret = 0, is_segment = 0, is_variant = 0, bandwidth = 0;
+ int64_t duration = 0;
 char line[1024];
 const char *ptr;
 
@@ -134,14 +135,14 @@
 &info);
 bandwidth = atoi(info.bandwidth);
 } else if (av_strstart(line, "#EXT-X-TARGETDURATION:", &ptr)) {
- s->target_duration = atoi(ptr);
+ s->target_duration = atoi(ptr) * AV_TIME_BASE;
 } else if (av_strstart(line, "#EXT-X-MEDIA-SEQUENCE:", &ptr)) {
 s->start_seq_no = atoi(ptr);
 } else if (av_strstart(line, "#EXT-X-ENDLIST", &ptr)) {
 s->finished = 1;
 } else if (av_strstart(line, "#EXTINF:", &ptr)) {
 is_segment = 1;
- duration = atoi(ptr);
+ duration = atof(ptr) * AV_TIME_BASE;
 } else if (av_strstart(line, "#", NULL)) {
 continue;
 } else if (line[0]) {
@@ -204,19 +205,6 @@
 nested_url);
 ret = AVERROR(EINVAL);
 goto fail;
-#if FF_API_APPLEHTTP_PROTO
- } else if (av_strstart(uri, "applehttp+", &nested_url)) {
- av_strlcpy(s->playlisturl, nested_url, sizeof(s->playlisturl));
- av_log(h, AV_LOG_WARNING,
- "The applehttp protocol is deprecated, use hls+%s as url "
- "instead.\n", nested_url);
- } else if (av_strstart(uri, "applehttp://", &nested_url)) {
- av_strlcpy(s->playlisturl, "http://", sizeof(s->playlisturl));
- av_strlcat(s->playlisturl, nested_url, sizeof(s->playlisturl));
- av_log(h, AV_LOG_WARNING,
- "The applehttp protocol is deprecated, use hls+http://%s as url "
- "instead.\n", nested_url);
-#endif
 } else {
 av_log(h, AV_LOG_ERROR, "Unsupported url %s\n", uri);
 ret = AVERROR(EINVAL);
@@ -283,7 +271,6 @@
 reload_interval = s->n_segments > 0 ?
 s->segments[s->n_segments - 1]->duration :
 s->target_duration;
- reload_interval *= 1000000;
 retry:
 if (!s->finished) {
 int64_t now = av_gettime();
@@ -293,7 +280,7 @@
 /* If we need to reload the playlist again below (if
 * there's still no more segments), switch to a reload
 * interval of half the target duration. */
- reload_interval = s->target_duration * 500000;
+ reload_interval = s->target_duration / 2;
 }
 }
 if (s->cur_seq_no < s->start_seq_no) {
@@ -326,17 +313,6 @@
 goto start;
 }
 
-#if FF_API_APPLEHTTP_PROTO
-URLProtocol ff_applehttp_protocol = {
- .name = "applehttp",
- .url_open = hls_open,
- .url_read = hls_read,
- .url_close = hls_close,
- .flags = URL_PROTOCOL_FLAG_NESTED_SCHEME,
- .priv_data_size = sizeof(HLSContext),
-};
-#endif
-
 URLProtocol ff_hls_protocol = {
 .name = "hls",
 .url_open = hls_open,

libav-v10.1.tar.bz2/libavformat/hnm.c Added

@@ -0,0 +1,204 @@
+/*
+ * Cryo Interactive Entertainment HNM4 demuxer
+ *
+ * Copyright (c) 2012 David Kment
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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) {
+ 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
+};

libav-v9.6.tar.bz2/libavformat/http.c -> libav-v10.1.tar.bz2/libavformat/http.c Changed

@@ -29,6 +29,10 @@
 #include "url.h"
 #include "libavutil/opt.h"
 
+#if CONFIG_ZLIB
+#include <zlib.h>
+#endif
+
 /* XXX: POST protocol is not completely implemented because avconv uses
 only a subset of it. */
 
@@ -45,29 +49,67 @@
 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. */
- int64_t off, filesize;
- 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 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 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
+ int compressed;
+ z_stream inflate_stream;
+ uint8_t *inflate_buffer;
+#endif
+ AVDictionary *chained_options;
+ int send_expect_100;
 } HTTPContext;
 
 #define OFFSET(x) offsetof(HTTPContext, x)
 #define D AV_OPT_FLAG_DECODING_PARAM
 #define E AV_OPT_FLAG_ENCODING_PARAM
+#define DEFAULT_USER_AGENT "Lavf/" AV_STRINGIFY(LIBAVFORMAT_VERSION)
 static const AVOption options[] = {
 {"chunked_post", "use chunked transfer-encoding for posts", OFFSET(chunked_post), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, E },
-{"headers", "custom HTTP headers, can override built in default headers", OFFSET(headers), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D|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", "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, for compatibility with ffmpeg", 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", "custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D|E },
+{"post_data", "set custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D|E },
+{"mime_type", "export the MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },
+{"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 },
+{"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 },
+{"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)\
@@ -95,7 +137,7 @@
 }
 
 /* return non zero if error */
-static int http_open_cnx(URLContext *h)
+static int http_open_cnx(URLContext *h, AVDictionary **options)
 {
 const char *path, *proxy_path, *lower_proto = "tcp", *local_path;
 char hostname[1024], hoststr[1024], proto[10];
@@ -106,10 +148,6 @@
 HTTPAuthType cur_auth_type, cur_proxy_auth_type;
 HTTPContext *s = h->priv_data;
 
- proxy_path = getenv("http_proxy");
- use_proxy = (proxy_path != NULL) && !getenv("no_proxy") &&
- av_strstart(proxy_path, "http://", NULL);
-
 /* fill the dest addr */
 redo:
 /* needed in any case to build the host string */
@@ -118,6 +156,10 @@
 path1, sizeof(path1), s->location);
 ff_url_join(hoststr, sizeof(hoststr), NULL, NULL, hostname, port, NULL);
 
+ proxy_path = getenv("http_proxy");
+ use_proxy = !ff_http_match_no_proxy(getenv("no_proxy"), hostname) &&
+ proxy_path != NULL && av_strstart(proxy_path, "http://", NULL);
+
 if (!strcmp(proto, "https")) {
 lower_proto = "tls";
 use_proxy = 0;
@@ -146,7 +188,7 @@
 
 if (!s->hd) {
 err = ffurl_open(&s->hd, buf, AVIO_FLAG_READ_WRITE,
- &h->interrupt_callback, NULL);
+ &h->interrupt_callback, options);
 if (err < 0)
 goto fail;
 }
@@ -199,21 +241,36 @@
 int ff_http_do_new_request(URLContext *h, const char *uri)
 {
 HTTPContext *s = h->priv_data;
+ AVDictionary *options = NULL;
+ int ret;
 
 s->off = 0;
- av_strlcpy(s->location, uri, sizeof(s->location));
-
- return http_open_cnx(h);
+ s->icy_data_read = 0;
+ 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);
+ av_dict_free(&options);
+ return ret;
 }
 
-static int http_open(URLContext *h, const char *uri, int flags)
+static int http_open(URLContext *h, const char *uri, int flags,
+ AVDictionary **options)
 {
 HTTPContext *s = h->priv_data;
+ int ret;
 
 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);
 
 if (s->headers) {
 int len = strlen(s->headers);
@@ -221,7 +278,10 @@
 av_log(h, AV_LOG_WARNING, "No trailing CRLF found in HTTP header.\n");
 }
 
- return http_open_cnx(h);
+ ret = http_open_cnx(h, options);
+ if (ret < 0)
+ av_dict_free(&s->chained_options);
+ return ret;
 }
 static int http_getc(HTTPContext *s)
 {
@@ -231,7 +291,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;
@@ -264,11 +324,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);
+ }
+ 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 AVERROR(ENOSYS);
+ }
+ 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;
+ int ret;
 
 /* end of header */
 if (line[0] == '\0') {
@@ -278,24 +437,16 @@
 
 p = line;
 if (line_count == 0) {
- while (!isspace(*p) && *p != '\0')
+ while (!av_isspace(*p) && *p != '\0')
 p++;
- while (isspace(*p))
+ while (av_isspace(*p))
 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;
- }
+ if ((ret = check_http_code(h, s->http_code, end)) < 0)
+ return ret;
 } else {
 while (*p != '\0' && *p != ':')
 p++;
@@ -305,37 +456,43 @@
 *p = '\0';
 tag = line;
 p++;
- while (isspace(*p))
+ while (av_isspace(*p))
 p++;
 if (!av_strcasecmp(tag, "Location")) {
- av_strlcpy(s->location, p, 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);
- }
- h->is_streamed = 0; /* we _can_ in fact seek */
- } else if (!av_strcasecmp(tag, "Accept-Ranges") && !strncmp(p, "bytes", 5)) {
+ } else if (!av_strcasecmp(tag, "Content-Range")) {
+ parse_content_range(h, p);
+ } else if (!av_strcasecmp(tag, "Accept-Ranges") &&
+ !strncmp(p, "bytes", 5)) {
 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, "Content-Type")) {
+ av_free(s->mime_type);
+ s->mime_type = av_strdup(p);
+ } else if (!av_strcasecmp (tag, "Icy-MetaInt")) {
+ s->icy_metaint = strtoll(p, NULL, 10);
+ } else if (!av_strncasecmp(tag, "Icy-", 4)) {
+ 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;
@@ -385,6 +542,7 @@
 int64_t off = s->off;
 int len = 0;
 const char *method;
+ int send_expect_100 = 0;
 
 
 /* send http header */
@@ -402,17 +560,40 @@
 method);
 proxyauthstr = ff_http_auth_create_response(&s->proxy_auth_state, proxyauth,
 local_path, method);
+ if (post && !s->post_data) {
+ send_expect_100 = s->send_expect_100;
+ /* The user has supplied authentication but we don't know the auth type,
+ * send Expect: 100-continue to get the 401 response including the
+ * WWW-Authenticate header, or an 100 continue if no auth actually
+ * is needed. */
+ if (auth && *auth &&
+ s->auth_state.auth_type == HTTP_AUTH_NONE &&
+ s->http_code != 401)
+ send_expect_100 = 1;
+ }
 
 /* set default headers if needed */
 if (!has_header(s->headers, "\r\nUser-Agent: "))
- len += av_strlcatf(headers + len, sizeof(headers) - len,
- "User-Agent: %s\r\n", LIBAVFORMAT_IDENT);
+ len += av_strlcatf(headers + len, sizeof(headers) - len,
+ "User-Agent: %s\r\n", s->user_agent);
 if (!has_header(s->headers, "\r\nAccept: "))
 len += av_strlcpy(headers + len, "Accept: */*\r\n",
 sizeof(headers) - len);
- if (!has_header(s->headers, "\r\nRange: ") && !post)
+ // 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) {
+ len += av_strlcatf(headers + len, sizeof(headers) - len,
+ "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,
- "Range: bytes=%"PRId64"-\r\n", s->off);
+ "Expect: 100-continue\r\n");
 
 if (!has_header(s->headers, "\r\nConnection: ")) {
 if (s->multiple_requests) {
@@ -431,6 +612,14 @@
 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);
+ if (!has_header(s->headers, "\r\nIcy-MetaData: ") && s->icy) {
+ len += av_strlcatf(headers + len, sizeof(headers) - len,
+ "Icy-MetaData: %d\r\n", 1);
+ }
+
 /* now add in custom headers */
 if (s->headers)
 av_strlcpy(headers + len, s->headers, sizeof(headers) - len);
@@ -463,11 +652,12 @@
 s->buf_end = s->buffer;
 s->line_count = 0;
 s->off = 0;
+ s->icy_data_read = 0;
 s->filesize = -1;
 s->willclose = 0;
 s->end_chunked_post = 0;
 s->end_header = 0;
- if (post && !s->post_data) {
+ if (post && !s->post_data && !send_expect_100) {
 /* Pretend that it did work. We didn't read any header yet, since
 * we've still to send the POST data, but the code calling this
 * function will check http_code after we return. */
@@ -508,7 +698,39 @@
 return len;
 }
 
-static int http_read(URLContext *h, uint8_t *buf, int size)
+#if CONFIG_ZLIB
+#define DECOMPRESS_BUF_SIZE (256 * 1024)
+static int http_buf_read_compressed(URLContext *h, uint8_t *buf, int size)
+{
+ HTTPContext *s = h->priv_data;
+ int ret;
+
+ if (!s->inflate_buffer) {
+ s->inflate_buffer = av_malloc(DECOMPRESS_BUF_SIZE);
+ if (!s->inflate_buffer)
+ return AVERROR(ENOMEM);
+ }
+
+ if (s->inflate_stream.avail_in == 0) {
+ int read = http_buf_read(h, s->inflate_buffer, DECOMPRESS_BUF_SIZE);
+ if (read <= 0)
+ return read;
+ s->inflate_stream.next_in = s->inflate_buffer;
+ s->inflate_stream.avail_in = read;
+ }
+
+ s->inflate_stream.avail_out = size;
+ s->inflate_stream.next_out = buf;
+
+ ret = inflate(&s->inflate_stream, Z_SYNC_FLUSH);
+ if (ret != Z_OK && ret != Z_STREAM_END)
+ av_log(h, AV_LOG_WARNING, "inflate return value: %d, %s\n", ret, s->inflate_stream.msg);
+
+ return size - s->inflate_stream.avail_out;
+}
+#endif
+
+static int http_read_stream(URLContext *h, uint8_t *buf, int size)
 {
 HTTPContext *s = h->priv_data;
 int err, new_location;
@@ -543,9 +765,77 @@
 }
 size = FFMIN(size, s->chunksize);
 }
+#if CONFIG_ZLIB
+ if (s->compressed)
+ return http_buf_read_compressed(h, buf, size);
+#endif
 return http_buf_read(h, buf, size);
 }
 
+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)
 {
@@ -594,6 +884,11 @@
 int ret = 0;
 HTTPContext *s = h->priv_data;
 
+#if CONFIG_ZLIB
+ inflateEnd(&s->inflate_stream);
+ av_freep(&s->inflate_buffer);
+#endif
+
 if (!s->end_chunked_post) {
 /* Close the write direction by sending the end of chunked encoding. */
 ret = http_shutdown(h, h->flags);
@@ -601,6 +896,7 @@
 
 if (s->hd)
 ffurl_close(s->hd);
+ av_dict_free(&s->chained_options);
 return ret;
 }
 
@@ -610,12 +906,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;
@@ -628,14 +928,17 @@
 s->off = off;
 
 /* if it fails, continue on old connection */
- if (http_open_cnx(h) < 0) {
+ av_dict_copy(&options, s->chained_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);
 return off;
 }
@@ -650,7 +953,7 @@
 #if CONFIG_HTTP_PROTOCOL
 URLProtocol ff_http_protocol = {
 .name = "http",
- .url_open = http_open,
+ .url_open2 = http_open,
 .url_read = http_read,
 .url_write = http_write,
 .url_seek = http_seek,
@@ -665,7 +968,7 @@
 #if CONFIG_HTTPS_PROTOCOL
 URLProtocol ff_https_protocol = {
 .name = "https",
- .url_open = http_open,
+ .url_open2 = http_open,
 .url_read = http_read,
 .url_write = http_write,
 .url_seek = http_seek,

libav-v9.6.tar.bz2/libavformat/httpauth.c -> libav-v10.1.tar.bz2/libavformat/httpauth.c Changed

libav-v9.6.tar.bz2/libavformat/id3v2.c -> libav-v10.1.tar.bz2/libavformat/id3v2.c Changed

@@ -19,72 +19,71 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include "id3v2.h"
-#include "id3v1.h"
 #include "libavutil/avstring.h"
-#include "libavutil/intreadwrite.h"
 #include "libavutil/dict.h"
+#include "libavutil/intreadwrite.h"
 #include "avio_internal.h"
 #include "internal.h"
+#include "id3v1.h"
+#include "id3v2.h"
 
 const AVMetadataConv ff_id3v2_34_metadata_conv[] = {
- { "TALB", "album"},
- { "TCOM", "composer"},
- { "TCON", "genre"},
- { "TCOP", "copyright"},
- { "TENC", "encoded_by"},
- { "TIT2", "title"},
- { "TLAN", "language"},
- { "TPE1", "artist"},
- { "TPE2", "album_artist"},
- { "TPE3", "performer"},
- { "TPOS", "disc"},
- { "TPUB", "publisher"},
- { "TRCK", "track"},
- { "TSSE", "encoder"},
+ { "TALB", "album" },
+ { "TCOM", "composer" },
+ { "TCON", "genre" },
+ { "TCOP", "copyright" },
+ { "TENC", "encoded_by" },
+ { "TIT2", "title" },
+ { "TLAN", "language" },
+ { "TPE1", "artist" },
+ { "TPE2", "album_artist" },
+ { "TPE3", "performer" },
+ { "TPOS", "disc" },
+ { "TPUB", "publisher" },
+ { "TRCK", "track" },
+ { "TSSE", "encoder" },
 { 0 }
 };
 
 const AVMetadataConv ff_id3v2_4_metadata_conv[] = {
- { "TDRL", "date"},
- { "TDRC", "date"},
- { "TDEN", "creation_time"},
- { "TSOA", "album-sort"},
- { "TSOP", "artist-sort"},
- { "TSOT", "title-sort"},
+ { "TDRL", "date" },
+ { "TDRC", "date" },
+ { "TDEN", "creation_time" },
+ { "TSOA", "album-sort" },
+ { "TSOP", "artist-sort" },
+ { "TSOT", "title-sort" },
 { 0 }
 };
 
 static const AVMetadataConv id3v2_2_metadata_conv[] = {
- { "TAL", "album"},
- { "TCO", "genre"},
- { "TT2", "title"},
- { "TEN", "encoded_by"},
- { "TP1", "artist"},
- { "TP2", "album_artist"},
- { "TP3", "performer"},
- { "TRK", "track"},
+ { "TAL", "album" },
+ { "TCO", "genre" },
+ { "TT2", "title" },
+ { "TEN", "encoded_by" },
+ { "TP1", "artist" },
+ { "TP2", "album_artist" },
+ { "TP3", "performer" },
+ { "TRK", "track" },
 { 0 }
 };
 
-
 const char ff_id3v2_tags[][4] = {
- "TALB", "TBPM", "TCOM", "TCON", "TCOP", "TDLY", "TENC", "TEXT",
- "TFLT", "TIT1", "TIT2", "TIT3", "TKEY", "TLAN", "TLEN", "TMED",
- "TOAL", "TOFN", "TOLY", "TOPE", "TOWN", "TPE1", "TPE2", "TPE3",
- "TPE4", "TPOS", "TPUB", "TRCK", "TRSN", "TRSO", "TSRC", "TSSE",
- { 0 },
+ "TALB", "TBPM", "TCOM", "TCON", "TCOP", "TDLY", "TENC", "TEXT",
+ "TFLT", "TIT1", "TIT2", "TIT3", "TKEY", "TLAN", "TLEN", "TMED",
+ "TOAL", "TOFN", "TOLY", "TOPE", "TOWN", "TPE1", "TPE2", "TPE3",
+ "TPE4", "TPOS", "TPUB", "TRCK", "TRSN", "TRSO", "TSRC", "TSSE",
+ { 0 },
 };
 
 const char ff_id3v2_4_tags[][4] = {
- "TDEN", "TDOR", "TDRC", "TDRL", "TDTG", "TIPL", "TMCL", "TMOO",
- "TPRO", "TSOA", "TSOP", "TSOT", "TSST",
- { 0 },
+ "TDEN", "TDOR", "TDRC", "TDRL", "TDTG", "TIPL", "TMCL", "TMOO",
+ "TPRO", "TSOA", "TSOP", "TSOT", "TSST",
+ { 0 },
 };
 
 const char ff_id3v2_3_tags[][4] = {
- "TDAT", "TIME", "TORY", "TRDA", "TSIZ", "TYER",
- { 0 },
+ "TDAT", "TIME", "TORY", "TRDA", "TSIZ", "TYER",
+ { 0 },
 };
 
 const char *ff_id3v2_picture_types[21] = {
@@ -112,36 +111,36 @@
 };
 
 const CodecMime ff_id3v2_mime_tags[] = {
- {"image/gif" , AV_CODEC_ID_GIF},
- {"image/jpeg", AV_CODEC_ID_MJPEG},
- {"image/jpg", AV_CODEC_ID_MJPEG},
- {"image/png" , AV_CODEC_ID_PNG},
- {"image/tiff", AV_CODEC_ID_TIFF},
- {"image/bmp", AV_CODEC_ID_BMP},
- {"JPG", AV_CODEC_ID_MJPEG}, /* ID3v2.2 */
- {"PNG" , AV_CODEC_ID_PNG}, /* ID3v2.2 */
- {"", AV_CODEC_ID_NONE},
+ { "image/gif", AV_CODEC_ID_GIF },
+ { "image/jpeg", AV_CODEC_ID_MJPEG },
+ { "image/jpg", AV_CODEC_ID_MJPEG },
+ { "image/png", AV_CODEC_ID_PNG },
+ { "image/tiff", AV_CODEC_ID_TIFF },
+ { "image/bmp", AV_CODEC_ID_BMP },
+ { "JPG", AV_CODEC_ID_MJPEG }, /* ID3v2.2 */
+ { "PNG", AV_CODEC_ID_PNG }, /* ID3v2.2 */
+ { "", AV_CODEC_ID_NONE },
 };
 
-int ff_id3v2_match(const uint8_t *buf, const char * magic)
+int ff_id3v2_match(const uint8_t *buf, const char *magic)
 {
 return buf[0] == magic[0] &&
 buf[1] == magic[1] &&
 buf[2] == magic[2] &&
- buf[3] != 0xff &&
- buf[4] != 0xff &&
- (buf[6] & 0x80) == 0 &&
- (buf[7] & 0x80) == 0 &&
- (buf[8] & 0x80) == 0 &&
- (buf[9] & 0x80) == 0;
+ buf[3] != 0xff &&
+ buf[4] != 0xff &&
+ (buf[6] & 0x80) == 0 &&
+ (buf[7] & 0x80) == 0 &&
+ (buf[8] & 0x80) == 0 &&
+ (buf[9] & 0x80) == 0;
 }
 
-int ff_id3v2_tag_len(const uint8_t * buf)
+int ff_id3v2_tag_len(const uint8_t *buf)
 {
 int len = ((buf[6] & 0x7f) << 21) +
 ((buf[7] & 0x7f) << 14) +
 ((buf[8] & 0x7f) << 7) +
- (buf[9] & 0x7f) +
+ (buf[9] & 0x7f) +
 ID3v2_HEADER_SIZE;
 if (buf[5] & 0x10)
 len += ID3v2_HEADER_SIZE;
@@ -197,7 +196,6 @@
 }
 
 switch (encoding) {
-
 case ID3v2_ENCODING_ISO8859:
 while (left && ch) {
 ch = avio_r8(pb);
@@ -233,7 +231,7 @@
 PUT_UTF8(ch, tmp, avio_w8(dynbuf, tmp);)
 }
 if (left < 0)
- left += 2; /* did not read last char from pb */
+ left += 2; /* did not read last char from pb */
 break;
 
 case ID3v2_ENCODING_UTF8:
@@ -259,7 +257,8 @@
 /**
 * Parse a text tag.
 */
-static void read_ttag(AVFormatContext *s, AVIOContext *pb, int taglen, const char *key)
+static void read_ttag(AVFormatContext *s, AVIOContext *pb, int taglen,
+ const char *key)
 {
 uint8_t *dst;
 int encoding, dict_flags = AV_DICT_DONT_OVERWRITE | AV_DICT_DONT_STRDUP_VAL;
@@ -276,9 +275,9 @@
 return;
 }
 
- if (!(strcmp(key, "TCON") && strcmp(key, "TCO"))
- && (sscanf(dst, "(%d)", &genre) == 1 || sscanf(dst, "%d", &genre) == 1)
- && genre <= ID3v1_GENRE_MAX) {
+ if (!(strcmp(key, "TCON") && strcmp(key, "TCO")) &&
+ (sscanf(dst, "(%d)", &genre) == 1 || sscanf(dst, "%d", &genre) == 1) &&
+ genre <= ID3v1_GENRE_MAX) {
 av_freep(&dst);
 dst = av_strdup(ff_id3v1_genre_str[genre]);
 } else if (!(strcmp(key, "TXXX") && strcmp(key, "TXX"))) {
@@ -300,10 +299,11 @@
 /**
 * Parse GEOB tag into a ID3v2ExtraMetaGEOB struct.
 */
-static void read_geobtag(AVFormatContext *s, AVIOContext *pb, int taglen, char *tag, ID3v2ExtraMeta **extra_meta)
+static void read_geobtag(AVFormatContext *s, AVIOContext *pb, int taglen,
+ char *tag, ID3v2ExtraMeta **extra_meta)
 {
 ID3v2ExtraMetaGEOB *geob_data = NULL;
- ID3v2ExtraMeta *new_extra = NULL;
+ ID3v2ExtraMeta *new_extra = NULL;
 char encoding;
 unsigned int len;
 
@@ -312,13 +312,15 @@
 
 geob_data = av_mallocz(sizeof(ID3v2ExtraMetaGEOB));
 if (!geob_data) {
- av_log(s, AV_LOG_ERROR, "Failed to alloc %zu bytes\n", sizeof(ID3v2ExtraMetaGEOB));
+ av_log(s, AV_LOG_ERROR, "Failed to alloc %zu bytes\n",
+ sizeof(ID3v2ExtraMetaGEOB));
 return;
 }
 
 new_extra = av_mallocz(sizeof(ID3v2ExtraMeta));
 if (!new_extra) {
- av_log(s, AV_LOG_ERROR, "Failed to alloc %zu bytes\n", sizeof(ID3v2ExtraMeta));
+ av_log(s, AV_LOG_ERROR, "Failed to alloc %zu bytes\n",
+ sizeof(ID3v2ExtraMeta));
 goto fail;
 }
 
@@ -327,18 +329,19 @@
 taglen--;
 
 /* read MIME type (always ISO-8859) */
- if (decode_str(s, pb, ID3v2_ENCODING_ISO8859, &geob_data->mime_type, &taglen) < 0
- || taglen <= 0)
+ if (decode_str(s, pb, ID3v2_ENCODING_ISO8859, &geob_data->mime_type,
+ &taglen) < 0 ||
+ taglen <= 0)
 goto fail;
 
 /* read file name */
- if (decode_str(s, pb, encoding, &geob_data->file_name, &taglen) < 0
- || taglen <= 0)
+ if (decode_str(s, pb, encoding, &geob_data->file_name, &taglen) < 0 ||
+ taglen <= 0)
 goto fail;
 
 /* read content description */
- if (decode_str(s, pb, encoding, &geob_data->description, &taglen) < 0
- || taglen < 0)
+ if (decode_str(s, pb, encoding, &geob_data->description, &taglen) < 0 ||
+ taglen < 0)
 goto fail;
 
 if (taglen) {
@@ -349,18 +352,19 @@
 goto fail;
 }
 if ((len = avio_read(pb, geob_data->data, taglen)) < taglen)
- av_log(s, AV_LOG_WARNING, "Error reading GEOB frame, data truncated.\n");
+ av_log(s, AV_LOG_WARNING,
+ "Error reading GEOB frame, data truncated.\n");
 geob_data->datasize = len;
 } else {
- geob_data->data = NULL;
+ geob_data->data = NULL;
 geob_data->datasize = 0;
 }
 
 /* add data to the list */
- new_extra->tag = "GEOB";
+ new_extra->tag = "GEOB";
 new_extra->data = geob_data;
 new_extra->next = *extra_meta;
- *extra_meta = new_extra;
+ *extra_meta = new_extra;
 
 return;
 
@@ -373,11 +377,12 @@
 
 static int is_number(const char *str)
 {
- while (*str >= '0' && *str <= '9') str++;
+ while (*str >= '0' && *str <= '9')
+ str++;
 return !*str;
 }
 
-static AVDictionaryEntry* get_date_tag(AVDictionary *m, const char *tag)
+static AVDictionaryEntry *get_date_tag(AVDictionary *m, const char *tag)
 {
 AVDictionaryEntry *t;
 if ((t = av_dict_get(m, tag, NULL, AV_DICT_MATCH_CASE)) &&
@@ -389,28 +394,29 @@
 static void merge_date(AVDictionary **m)
 {
 AVDictionaryEntry *t;
- char date[17] = {0}; // YYYY-MM-DD hh:mm
+ char date[17] = { 0 }; // YYYY-MM-DD hh:mm
 
 if (!(t = get_date_tag(*m, "TYER")) &&
 !(t = get_date_tag(*m, "TYE")))
 return;
 av_strlcpy(date, t->value, 5);
 av_dict_set(m, "TYER", NULL, 0);
- av_dict_set(m, "TYE", NULL, 0);
+ av_dict_set(m, "TYE", NULL, 0);
 
 if (!(t = get_date_tag(*m, "TDAT")) &&
 !(t = get_date_tag(*m, "TDA")))
 goto finish;
 snprintf(date + 4, sizeof(date) - 4, "-%.2s-%.2s", t->value + 2, t->value);
 av_dict_set(m, "TDAT", NULL, 0);
- av_dict_set(m, "TDA", NULL, 0);
+ av_dict_set(m, "TDA", NULL, 0);
 
 if (!(t = get_date_tag(*m, "TIME")) &&
 !(t = get_date_tag(*m, "TIM")))
 goto finish;
- snprintf(date + 10, sizeof(date) - 10, " %.2s:%.2s", t->value, t->value + 2);
+ snprintf(date + 10, sizeof(date) - 10,
+ " %.2s:%.2s", t->value, t->value + 2);
 av_dict_set(m, "TIME", NULL, 0);
- av_dict_set(m, "TIM", NULL, 0);
+ av_dict_set(m, "TIM", NULL, 0);
 
 finish:
 if (date[0])
@@ -420,20 +426,21 @@
 static void free_apic(void *obj)
 {
 ID3v2ExtraMetaAPIC *apic = obj;
- av_freep(&apic->data);
+ av_buffer_unref(&apic->buf);
 av_freep(&apic->description);
 av_freep(&apic);
 }
 
-static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, char *tag, ID3v2ExtraMeta **extra_meta)
+static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen,
+ char *tag, ID3v2ExtraMeta **extra_meta)
 {
 int enc, pic_type;
- char mimetype[64];
- const CodecMime *mime = ff_id3v2_mime_tags;
- enum AVCodecID id = AV_CODEC_ID_NONE;
- ID3v2ExtraMetaAPIC *apic = NULL;
+ char mimetype[64];
+ const CodecMime *mime = ff_id3v2_mime_tags;
+ enum AVCodecID id = AV_CODEC_ID_NONE;
+ ID3v2ExtraMetaAPIC *apic = NULL;
 ID3v2ExtraMeta *new_extra = NULL;
- int64_t end = avio_tell(pb) + taglen;
+ int64_t end = avio_tell(pb) + taglen;
 
 if (taglen <= 4)
 goto fail;
@@ -456,7 +463,8 @@
 mime++;
 }
 if (id == AV_CODEC_ID_NONE) {
- av_log(s, AV_LOG_WARNING, "Unknown attached picture mimetype: %s, skipping.\n", mimetype);
+ av_log(s, AV_LOG_WARNING,
+ "Unknown attached picture mimetype: %s, skipping.\n", mimetype);
 goto fail;
 }
 apic->id = id;
@@ -465,27 +473,28 @@
 pic_type = avio_r8(pb);
 taglen--;
 if (pic_type < 0 || pic_type >= FF_ARRAY_ELEMS(ff_id3v2_picture_types)) {
- av_log(s, AV_LOG_WARNING, "Unknown attached picture type %d.\n", pic_type);
+ av_log(s, AV_LOG_WARNING, "Unknown attached picture type %d.\n",
+ pic_type);
 pic_type = 0;
 }
 apic->type = ff_id3v2_picture_types[pic_type];
 
 /* description and picture data */
 if (decode_str(s, pb, enc, &apic->description, &taglen) < 0) {
- av_log(s, AV_LOG_ERROR, "Error decoding attached picture description.\n");
+ av_log(s, AV_LOG_ERROR,
+ "Error decoding attached picture description.\n");
 goto fail;
 }
 
- apic->len = taglen;
- apic->data = av_malloc(taglen + FF_INPUT_BUFFER_PADDING_SIZE);
- if (!apic->data || avio_read(pb, apic->data, taglen) != taglen)
+ apic->buf = av_buffer_alloc(taglen + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!apic->buf || avio_read(pb, apic->buf->data, taglen) != taglen)
 goto fail;
- memset(apic->data + taglen, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+ memset(apic->buf->data + taglen, 0, FF_INPUT_BUFFER_PADDING_SIZE);
 
- new_extra->tag = "APIC";
- new_extra->data = apic;
- new_extra->next = *extra_meta;
- *extra_meta = new_extra;
+ new_extra->tag = "APIC";
+ new_extra->data = apic;
+ new_extra->next = *extra_meta;
+ *extra_meta = new_extra;
 
 return;
 
@@ -499,13 +508,14 @@
 typedef struct ID3v2EMFunc {
 const char *tag3;
 const char *tag4;
- void (*read)(AVFormatContext*, AVIOContext*, int, char*, ID3v2ExtraMeta **);
+ void (*read)(AVFormatContext *, AVIOContext *, int, char *,
+ ID3v2ExtraMeta **);
 void (*free)(void *obj);
 } ID3v2EMFunc;
 
 static const ID3v2EMFunc id3v2_extra_meta_funcs[] = {
 { "GEO", "GEOB", read_geobtag, free_geobtag },
- { "PIC", "APIC", read_apic, free_apic },
+ { "PIC", "APIC", read_apic, free_apic },
 { NULL }
 };
 
@@ -528,7 +538,8 @@
 return NULL;
 }
 
-static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags, ID3v2ExtraMeta **extra_meta)
+static void id3v2_parse(AVFormatContext *s, int len, uint8_t version,
+ uint8_t flags, ID3v2ExtraMeta **extra_meta)
 {
 int isv34, tlen, unsync;
 char tag[5];
@@ -538,7 +549,7 @@
 AVIOContext pb;
 AVIOContext *pbx;
 unsigned char *buffer = NULL;
- int buffer_size = 0;
+ int buffer_size = 0;
 const ID3v2EMFunc *extra_func;
 
 switch (version) {
@@ -547,13 +558,13 @@
 reason = "compression";
 goto error;
 }
- isv34 = 0;
+ isv34 = 0;
 taghdrlen = 6;
 break;
 
 case 3:
 case 4:
- isv34 = 1;
+ isv34 = 1;
 taghdrlen = 10;
 break;
 
@@ -567,7 +578,8 @@
 if (isv34 && flags & 0x40) { /* Extended header present, just skip over it */
 int extlen = get_size(s->pb, 4);
 if (version == 4)
- extlen -= 4; // in v2.4 the length includes the length field we just read
+ /* In v2.4 the length includes the length field we just read. */
+ extlen -= 4;
 
 if (extlen < 0) {
 reason = "invalid extended header length";
@@ -578,24 +590,26 @@
 
 while (len >= taghdrlen) {
 unsigned int tflags = 0;
- int tunsync = 0;
+ int tunsync = 0;
 
 if (isv34) {
 avio_read(s->pb, tag, 4);
 tag[4] = 0;
- if(version==3){
+ if (version == 3) {
 tlen = avio_rb32(s->pb);
- }else
+ } else
 tlen = get_size(s->pb, 4);
- tflags = avio_rb16(s->pb);
+ tflags = avio_rb16(s->pb);
 tunsync = tflags & ID3v2_FLAG_UNSYNCH;
 } else {
 avio_read(s->pb, tag, 3);
 tag[3] = 0;
- tlen = avio_rb24(s->pb);
+ tlen = avio_rb24(s->pb);
 }
 if (tlen < 0 || tlen > len - taghdrlen) {
- av_log(s, AV_LOG_WARNING, "Invalid size in frame %s, skipping the rest of tag.\n", tag);
+ av_log(s, AV_LOG_WARNING,
+ "Invalid size in frame %s, skipping the rest of tag.\n",
+ tag);
 break;
 }
 len -= taghdrlen + tlen;
@@ -603,7 +617,8 @@
 
 if (!tlen) {
 if (tag[0])
- av_log(s, AV_LOG_DEBUG, "Invalid empty frame %s, skipping.\n", tag);
+ av_log(s, AV_LOG_DEBUG, "Invalid empty frame %s, skipping.\n",
+ tag);
 continue;
 }
 
@@ -613,10 +628,13 @@
 }
 
 if (tflags & (ID3v2_FLAG_ENCRYPTION | ID3v2_FLAG_COMPRESSION)) {
- av_log(s, AV_LOG_WARNING, "Skipping encrypted/compressed ID3v2 frame %s.\n", tag);
+ av_log(s, AV_LOG_WARNING,
+ "Skipping encrypted/compressed ID3v2 frame %s.\n", tag);
 avio_skip(s->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)))) {
+ } else if (tag[0] == 'T' ||
+ (extra_meta &&
+ (extra_func = get_extra_meta_func(tag, isv34)))) {
 if (unsync || tunsync) {
 int64_t end = avio_tell(s->pb) + tlen;
 uint8_t *b;
@@ -634,9 +652,10 @@
 *b++ = val ? val : avio_r8(s->pb);
 }
 }
- ffio_init_context(&pb, buffer, b - buffer, 0, NULL, NULL, NULL, NULL);
+ ffio_init_context(&pb, buffer, b - buffer, 0, NULL, NULL, NULL,
+ NULL);
 tlen = b - buffer;
- pbx = &pb; // read from sync buffer
+ pbx = &pb; // read from sync buffer
 } else {
 pbx = s->pb; // read straight from input
 }
@@ -646,8 +665,7 @@
 else
 /* parse special meta tag */
 extra_func->read(s, pbx, tlen, tag, extra_meta);
- }
- else if (!tag[0]) {
+ } else if (!tag[0]) {
 if (tag[1])
 av_log(s, AV_LOG_WARNING, "invalid frame id, assuming padding");
 avio_skip(s->pb, tlen);
@@ -658,22 +676,25 @@
 avio_seek(s->pb, next, SEEK_SET);
 }
 
- if (version == 4 && flags & 0x10) /* Footer preset, always 10 bytes, skip over it */
+ /* Footer preset, always 10 bytes, skip over it */
+ if (version == 4 && flags & 0x10)
 end += 10;
 
- error:
+error:
 if (reason)
- av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n", version, reason);
+ av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n",
+ version, reason);
 avio_seek(s->pb, end, SEEK_SET);
 av_free(buffer);
 return;
 }
 
-void ff_id3v2_read(AVFormatContext *s, const char *magic, ID3v2ExtraMeta **extra_meta)
+void ff_id3v2_read(AVFormatContext *s, const char *magic,
+ ID3v2ExtraMeta **extra_meta)
 {
 int len, ret;
 uint8_t buf[ID3v2_HEADER_SIZE];
- int found_header;
+ int found_header;
 int64_t off;
 
 do {
@@ -682,14 +703,14 @@
 ret = avio_read(s->pb, buf, ID3v2_HEADER_SIZE);
 if (ret != ID3v2_HEADER_SIZE)
 break;
- found_header = ff_id3v2_match(buf, magic);
- if (found_header) {
+ found_header = ff_id3v2_match(buf, magic);
+ if (found_header) {
 /* parse ID3v2 header */
 len = ((buf[6] & 0x7f) << 21) |
 ((buf[7] & 0x7f) << 14) |
 ((buf[8] & 0x7f) << 7) |
 (buf[9] & 0x7f);
- ff_id3v2_parse(s, len, buf[3], buf[5], extra_meta);
+ id3v2_parse(s, len, buf[3], buf[5], extra_meta);
 } else {
 avio_seek(s->pb, off, SEEK_SET);
 }
@@ -736,14 +757,13 @@
 av_dict_set(&st->metadata, "comment", apic->type, 0);
 
 av_init_packet(&st->attached_pic);
- st->attached_pic.data = apic->data;
- st->attached_pic.size = apic->len;
- st->attached_pic.destruct = av_destruct_packet;
+ st->attached_pic.buf = apic->buf;
+ st->attached_pic.data = apic->buf->data;
+ st->attached_pic.size = apic->buf->size - FF_INPUT_BUFFER_PADDING_SIZE;
 st->attached_pic.stream_index = st->index;
 st->attached_pic.flags |= AV_PKT_FLAG_KEY;
 
- apic->data = NULL;
- apic->len = 0;
+ apic->buf = NULL;
 }
 
 return 0;

libav-v9.6.tar.bz2/libavformat/id3v2.h -> libav-v10.1.tar.bz2/libavformat/id3v2.h Changed

libav-v9.6.tar.bz2/libavformat/idcin.c -> libav-v10.1.tar.bz2/libavformat/idcin.c Changed

@@ -68,6 +68,8 @@
 * transmitting them to the video decoder
 */
 
+#include "libavutil/channel_layout.h"
+#include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "internal.h"
@@ -80,13 +82,13 @@
 int audio_stream_index;
 int audio_chunk_size1;
 int audio_chunk_size2;
+ int block_align;
 
 /* demux state variables */
 int current_audio_chunk;
 int next_chunk_is_video;
 int audio_present;
-
- int64_t pts;
+ int64_t first_pkt_pos;
 } IdcinDemuxContext;
 
 static int idcin_probe(AVProbeData *p)
@@ -134,8 +136,8 @@
 if (number > 2)
 return 0;
 
- /* return half certainly since this check is a bit sketchy */
- return AVPROBE_SCORE_MAX / 2;
+ /* return half certainty since this check is a bit sketchy */
+ return AVPROBE_SCORE_EXTENSION;
 }
 
 static int idcin_read_header(AVFormatContext *s)
@@ -145,6 +147,7 @@
 AVStream *st;
 unsigned int width, height;
 unsigned int sample_rate, bytes_per_sample, channels;
+ int ret;
 
 /* get the 5 header parameters */
 width = avio_rl32(pb);
@@ -153,10 +156,38 @@
 bytes_per_sample = avio_rl32(pb);
 channels = avio_rl32(pb);
 
+ if (s->pb->eof_reached) {
+ av_log(s, AV_LOG_ERROR, "incomplete header\n");
+ return s->pb->error ? s->pb->error : AVERROR_EOF;
+ }
+
+ if (av_image_check_size(width, height, 0, s) < 0)
+ return AVERROR_INVALIDDATA;
+ if (sample_rate > 0) {
+ if (sample_rate < 14 || sample_rate > INT_MAX) {
+ av_log(s, AV_LOG_ERROR, "invalid sample rate: %u\n", sample_rate);
+ return AVERROR_INVALIDDATA;
+ }
+ if (bytes_per_sample < 1 || bytes_per_sample > 2) {
+ av_log(s, AV_LOG_ERROR, "invalid bytes per sample: %u\n",
+ bytes_per_sample);
+ return AVERROR_INVALIDDATA;
+ }
+ if (channels < 1 || channels > 2) {
+ av_log(s, AV_LOG_ERROR, "invalid channels: %u\n", channels);
+ return AVERROR_INVALIDDATA;
+ }
+ idcin->audio_present = 1;
+ } else {
+ /* if sample rate is 0, assume no audio */
+ idcin->audio_present = 0;
+ }
+
 st = avformat_new_stream(s, NULL);
 if (!st)
 return AVERROR(ENOMEM);
 avpriv_set_pts_info(st, 33, 1, IDCIN_FPS);
+ st->start_time = 0;
 idcin->video_stream_index = st->index;
 st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
 st->codec->codec_id = AV_CODEC_ID_IDCIN;
@@ -167,25 +198,31 @@
 /* load up the Huffman tables into extradata */
 st->codec->extradata_size = HUFFMAN_TABLE_SIZE;
 st->codec->extradata = av_malloc(HUFFMAN_TABLE_SIZE);
- if (avio_read(pb, st->codec->extradata, HUFFMAN_TABLE_SIZE) !=
- HUFFMAN_TABLE_SIZE)
+ ret = avio_read(pb, st->codec->extradata, HUFFMAN_TABLE_SIZE);
+ if (ret < 0) {
+ return ret;
+ } else if (ret != HUFFMAN_TABLE_SIZE) {
+ av_log(s, AV_LOG_ERROR, "incomplete header\n");
 return AVERROR(EIO);
+ }
 
- /* if sample rate is 0, assume no audio */
- if (sample_rate) {
+ if (idcin->audio_present) {
 idcin->audio_present = 1;
 st = avformat_new_stream(s, NULL);
 if (!st)
 return AVERROR(ENOMEM);
- avpriv_set_pts_info(st, 33, 1, IDCIN_FPS);
+ avpriv_set_pts_info(st, 63, 1, sample_rate);
+ st->start_time = 0;
 idcin->audio_stream_index = st->index;
 st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
 st->codec->codec_tag = 1;
 st->codec->channels = channels;
+ st->codec->channel_layout = channels > 1 ? AV_CH_LAYOUT_STEREO :
+ AV_CH_LAYOUT_MONO;
 st->codec->sample_rate = sample_rate;
 st->codec->bits_per_coded_sample = bytes_per_sample * 8;
 st->codec->bit_rate = sample_rate * bytes_per_sample * 8 * channels;
- st->codec->block_align = bytes_per_sample * channels;
+ st->codec->block_align = idcin->block_align = bytes_per_sample * channels;
 if (bytes_per_sample == 1)
 st->codec->codec_id = AV_CODEC_ID_PCM_U8;
 else
@@ -201,11 +238,10 @@
 (sample_rate / 14) * bytes_per_sample * channels;
 }
 idcin->current_audio_chunk = 0;
- } else
- idcin->audio_present = 1;
+ }
 
 idcin->next_chunk_is_video = 1;
- idcin->pts = 0;
+ idcin->first_pkt_pos = avio_tell(s->pb);
 
 return 0;
 }
@@ -225,7 +261,7 @@
 uint32_t palette[256];
 
 if (s->pb->eof_reached)
- return AVERROR(EIO);
+ return s->pb->error ? s->pb->error : AVERROR_EOF;
 
 if (idcin->next_chunk_is_video) {
 command = avio_rl32(pb);
@@ -233,8 +269,13 @@
 return AVERROR(EIO);
 } else if (command == 1) {
 /* trigger a palette change */
- if (avio_read(pb, palette_buffer, 768) != 768)
+ ret = avio_read(pb, palette_buffer, 768);
+ if (ret < 0) {
+ return ret;
+ } else if (ret != 768) {
+ av_log(s, AV_LOG_ERROR, "incomplete packet\n");
 return AVERROR(EIO);
+ }
 /* scale the palette as necessary */
 palette_scale = 2;
 for (i = 0; i < 768; i++)
@@ -251,24 +292,40 @@
 }
 }
 
+ if (s->pb->eof_reached) {
+ av_log(s, AV_LOG_ERROR, "incomplete packet\n");
+ return s->pb->error ? s->pb->error : AVERROR_EOF;
+ }
 chunk_size = avio_rl32(pb);
+ if (chunk_size < 4 || chunk_size > INT_MAX - 4) {
+ av_log(s, AV_LOG_ERROR, "invalid chunk size: %u\n", chunk_size);
+ return AVERROR_INVALIDDATA;
+ }
 /* skip the number of decoded bytes (always equal to width * height) */
 avio_skip(pb, 4);
 chunk_size -= 4;
 ret= av_get_packet(pb, pkt, chunk_size);
 if (ret < 0)
 return ret;
+ else if (ret != chunk_size) {
+ av_log(s, AV_LOG_ERROR, "incomplete packet\n");
+ av_free_packet(pkt);
+ return AVERROR(EIO);
+ }
 if (command == 1) {
 uint8_t *pal;
 
 pal = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE,
 AVPALETTE_SIZE);
- if (ret < 0)
+ if (ret < 0) {
+ av_free_packet(pkt);
 return ret;
+ }
 memcpy(pal, palette, AVPALETTE_SIZE);
+ pkt->flags |= AV_PKT_FLAG_KEY;
 }
 pkt->stream_index = idcin->video_stream_index;
- pkt->pts = idcin->pts;
+ pkt->duration = 1;
 } else {
 /* send out the audio chunk */
 if (idcin->current_audio_chunk)
@@ -279,16 +336,32 @@
 if (ret < 0)
 return ret;
 pkt->stream_index = idcin->audio_stream_index;
- pkt->pts = idcin->pts;
+ pkt->duration = chunk_size / idcin->block_align;
 
 idcin->current_audio_chunk ^= 1;
- idcin->pts++;
 }
 
 if (idcin->audio_present)
 idcin->next_chunk_is_video ^= 1;
 
- return ret;
+ return 0;
+}
+
+static int idcin_read_seek(AVFormatContext *s, int stream_index,
+ int64_t timestamp, int flags)
+{
+ IdcinDemuxContext *idcin = s->priv_data;
+
+ if (idcin->first_pkt_pos > 0) {
+ int ret = avio_seek(s->pb, idcin->first_pkt_pos, SEEK_SET);
+ if (ret < 0)
+ return ret;
+ ff_update_cur_dts(s, s->streams[idcin->video_stream_index], 0);
+ idcin->next_chunk_is_video = 1;
+ idcin->current_audio_chunk = 0;
+ return 0;
+ }
+ return -1;
 }
 
 AVInputFormat ff_idcin_demuxer = {
@@ -298,4 +371,6 @@
 .read_probe = idcin_probe,
 .read_header = idcin_read_header,
 .read_packet = idcin_read_packet,
+ .read_seek = idcin_read_seek,
+ .flags = AVFMT_NO_BYTE_SEEK,
 };

libav-v9.6.tar.bz2/libavformat/idroqdec.c -> libav-v10.1.tar.bz2/libavformat/idroqdec.c Changed

libav-v9.6.tar.bz2/libavformat/ilbc.c -> libav-v10.1.tar.bz2/libavformat/ilbc.c Changed

libav-v9.6.tar.bz2/libavformat/img2.c -> libav-v10.1.tar.bz2/libavformat/img2.c Changed

libav-v9.6.tar.bz2/libavformat/img2dec.c -> libav-v10.1.tar.bz2/libavformat/img2dec.c Changed

libav-v9.6.tar.bz2/libavformat/img2enc.c -> libav-v10.1.tar.bz2/libavformat/img2enc.c Changed

@@ -33,6 +33,7 @@
 int img_number;
 int is_pipe;
 char path[1024];
+ int update;
 } VideoMuxData;
 
 static int write_header(AVFormatContext *s)
@@ -59,8 +60,10 @@
 int i;
 
 if (!img->is_pipe) {
- if (av_get_frame_filename(filename, sizeof(filename),
- img->path, img->img_number) < 0 && img->img_number > 1) {
+ if (img->update) {
+ av_strlcpy(filename, img->path, sizeof(filename));
+ } else if (av_get_frame_filename(filename, sizeof(filename), img->path, img->img_number) < 0 &&
+ img->img_number > 1) {
 av_log(s, AV_LOG_ERROR,
 "Could not get frame filename number %d from pattern '%s'\n",
 img->img_number, img->path);
@@ -128,6 +131,7 @@
 #define ENC AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption muxoptions[] = {
 { "start_number", "first number in the sequence", OFFSET(img_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, INT_MAX, ENC },
+ { "update", "continuously overwrite one file", OFFSET(update), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, ENC },
 { NULL },
 };
 
@@ -144,7 +148,7 @@
 .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"),
 .extensions = "bmp,dpx,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,"
 "ppm,sgi,tga,tif,tiff,jp2,xwd,sun,ras,rs,im1,im8,im24,"
- "sunras,xbm",
+ "sunras,webp,xbm",
 .priv_data_size = sizeof(VideoMuxData),
 .video_codec = AV_CODEC_ID_MJPEG,
 .write_header = write_header,

libav-v9.6.tar.bz2/libavformat/internal.h -> libav-v10.1.tar.bz2/libavformat/internal.h Changed

@@ -42,6 +42,14 @@
     enum AVCodecID id;
 } CodecMime;
 
+struct AVFormatInternal {
+    /**
+     * Number of streams relevant for interleaving.
+     * Muxing only.
+     */
+    int nb_interleaved_streams;
+};
+
 void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem);
 
 #ifdef __GNUC__
@@ -91,31 +99,6 @@
 uint64_t ff_ntp_time(void);
 
 /**
- * Assemble a URL string from components. This is the reverse operation
- * of av_url_split.
- *
- * Note, this requires networking to be initialized, so the caller must
- * ensure ff_network_init has been called.
- *
- * @see av_url_split
- *
- * @param str the buffer to fill with the url
- * @param size the size of the str buffer
- * @param proto the protocol identifier, if null, the separator
- *              after the identifier is left out, too
- * @param authorization an optional authorization string, may be null.
- *                      An empty string is treated the same as a null string.
- * @param hostname the host name string
- * @param port the port number, left out from the string if negative
- * @param fmt a generic format string for everything to add after the
- *            host/port, may be null
- * @return the number of characters written to the destination buffer
- */
-int ff_url_join(char *str, int size, const char *proto,
-                const char *authorization, const char *hostname,
-                int port, const char *fmt, ...) av_printf_format(7, 8);
-
-/**
  * Append the media-specific SDP fragment for the media stream c
  * to the buffer buff.
  *
@@ -241,17 +224,6 @@
  */
 void ff_reduce_index(AVFormatContext *s, int stream_index);
 
-/*
- * Convert a relative url into an absolute url, given a base url.
- *
- * @param buf the buffer where output absolute url is written
- * @param size the size of buf
- * @param base the base url, may be equal to buf.
- * @param rel the new url, which is interpreted relative to base
- */
-void ff_make_absolute_url(char *buf, int size, const char *base,
-                          const char *rel);
-
 enum AVCodecID ff_guess_image2_codec(const char *filename);
 
 /**
@@ -375,4 +347,10 @@
  */
 enum AVCodecID ff_get_pcm_codec_id(int bps, int flt, int be, int sflags);
 
+/**
+ * Generate standard extradata for AVC-Intra based on width/height and field
+ * order.
+ */
+int ff_generate_avci_extradata(AVStream *st);
+
 #endif /* AVFORMAT_INTERNAL_H */

libav-v9.6.tar.bz2/libavformat/isom.c -> libav-v10.1.tar.bz2/libavformat/isom.c Changed

@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-//#define DEBUG
-
 #include "avformat.h"
 #include "internal.h"
 #include "isom.h"
@@ -35,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 */
@@ -138,6 +137,9 @@
 
     { AV_CODEC_ID_RAWVIDEO, MKTAG('W', 'R', 'A', 'W') },
 
+    { 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 */
     { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', 'q') }, /* AVC-Intra  50M 720p25/50 */
@@ -151,6 +153,7 @@
     { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '3') }, /* AVC-Intra 100M 1080p24/30/60 */
     { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '5') }, /* AVC-Intra 100M 1080i50 */
     { AV_CODEC_ID_H264, MKTAG('a', 'i', '1', '6') }, /* AVC-Intra 100M 1080i60 */
+    { AV_CODEC_ID_H264, MKTAG('A', 'V', 'i', 'n') }, /* AVC-Intra with implicit SPS/PPS */
 
     { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */
     { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */
@@ -224,6 +227,8 @@
     { AV_CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'o') }, /* Apple ProRes 422 Proxy */
     { AV_CODEC_ID_PRORES, MKTAG('a', 'p', '4', 'h') }, /* Apple ProRes 4444 */
 
+    { AV_CODEC_ID_AIC, MKTAG('i', 'c', 'o', 'd') },
+
     { AV_CODEC_ID_NONE, 0 },
 };
 
@@ -259,6 +264,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') },
@@ -342,7 +348,7 @@
     memset(to, 0, 4);
     /* is it the mangled iso code? */
     /* see http://www.geocities.com/xhelmboyx/quicktime/formats/mp4-layout.txt */
-    if (code > 138) {
+    if (code >= 0x400 && code != 0x7fff) {
         for (i = 2; i >= 0; i--) {
             to[i] = 0x60 + (code & 0x1f);
             code >>= 5;

libav-v9.6.tar.bz2/libavformat/isom.h -> libav-v10.1.tar.bz2/libavformat/isom.h Changed

@@ -190,6 +190,27 @@
 #define MOV_FRAG_SAMPLE_FLAG_DEPENDS_NO                0x02000000
 #define MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES               0x01000000
 
+#define MOV_TKHD_FLAG_ENABLED       0x0001
+#define MOV_TKHD_FLAG_IN_MOVIE      0x0002
+#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);

libav-v9.6.tar.bz2/libavformat/ivfenc.c -> libav-v10.1.tar.bz2/libavformat/ivfenc.c Changed

libav-v9.6.tar.bz2/libavformat/jvdec.c -> libav-v10.1.tar.bz2/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 (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;
@@ -226,4 +259,5 @@
 .read_header = read_header,
 .read_packet = read_packet,
 .read_seek = read_seek,
+ .read_close = read_close,
 };

libav-v9.6.tar.bz2/libavformat/lxfdec.c -> libav-v10.1.tar.bz2/libavformat/lxfdec.c Changed

@@ -20,15 +20,15 @@
 */
 
 #include "libavutil/intreadwrite.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
 #include "internal.h"
 
-#define LXF_PACKET_HEADER_SIZE 60
+#define LXF_MAX_PACKET_HEADER_SIZE 256
 #define LXF_HEADER_DATA_SIZE 120
 #define LXF_IDENT "LEITCH\0"
 #define LXF_IDENT_LENGTH 8
 #define LXF_SAMPLERATE 48000
-#define LXF_MAX_AUDIO_PACKET (8008*15*4) ///< 15-channel 32-bit NTSC audio frame
 
 static const AVCodecTag lxf_tags[] = {
 { AV_CODEC_ID_MJPEG, 0 },
@@ -46,8 +46,8 @@
 
 typedef struct {
 int channels; ///< number of audio channels. zero means no audio
- uint8_t temp[LXF_MAX_AUDIO_PACKET]; ///< temp buffer for de-planarizing the audio data
 int frame_number; ///< current video frame
+ uint32_t video_format, packet_type, extended_size;
 } LXFDemuxContext;
 
 static int lxf_probe(AVProbeData *p)
@@ -64,12 +64,12 @@
 * @param[in] header the packet header to check
 * @return zero if the checksum is OK, non-zero otherwise
 */
-static int check_checksum(const uint8_t *header)
+static int check_checksum(const uint8_t *header, int size)
 {
 int x;
 uint32_t sum = 0;
 
- for (x = 0; x < LXF_PACKET_HEADER_SIZE; x += 4)
+ for (x = 0; x < size; x += 4)
 sum += AV_RL32(&header[x]);
 
 return sum;
@@ -105,70 +105,94 @@
 /**
 * Read and checksum the next packet header
 *
- * @param[out] header the read packet header
- * @param[out] format context dependent format information
 * @return the size of the payload following the header or < 0 on failure
 */
-static int get_packet_header(AVFormatContext *s, uint8_t *header, uint32_t *format)
+static int get_packet_header(AVFormatContext *s)
 {
+ LXFDemuxContext *lxf = s->priv_data;
 AVIOContext *pb = s->pb;
 int track_size, samples, ret;
+ uint32_t version, audio_format, header_size, channels, tmp;
 AVStream *st;
+ uint8_t header[LXF_MAX_PACKET_HEADER_SIZE];
+ const uint8_t *p = header + LXF_IDENT_LENGTH;
 
 //find and read the ident
 if ((ret = sync(s, header)) < 0)
 return ret;
 
- //read the rest of the packet header
- if ((ret = avio_read(pb, header + LXF_IDENT_LENGTH,
- LXF_PACKET_HEADER_SIZE - LXF_IDENT_LENGTH)) !=
- LXF_PACKET_HEADER_SIZE - LXF_IDENT_LENGTH) {
+ ret = avio_read(pb, header + LXF_IDENT_LENGTH, 8);
+ if (ret != 8)
 return ret < 0 ? ret : AVERROR_EOF;
+
+ version = bytestream_get_le32(&p);
+ header_size = bytestream_get_le32(&p);
+ if (version > 1)
+ avpriv_request_sample(s, "Unknown format version %i\n", version);
+
+ if (header_size < (version ? 72 : 60) ||
+ header_size > LXF_MAX_PACKET_HEADER_SIZE ||
+ (header_size & 3)) {
+ av_log(s, AV_LOG_ERROR, "Invalid header size 0x%x\n", header_size);
+ return AVERROR_INVALIDDATA;
 }
 
- if (check_checksum(header))
+ //read the rest of the packet header
+ ret = avio_read(pb, header + (p - header), header_size - (p - header));
+ if (ret != header_size - (p - header))
+ return ret < 0 ? ret : AVERROR_EOF;
+
+ if (check_checksum(header, header_size))
 av_log(s, AV_LOG_ERROR, "checksum error\n");
 
- *format = AV_RL32(&header[32]);
- ret = AV_RL32(&header[36]);
+ lxf->packet_type = bytestream_get_le32(&p);
+ p += version ? 20 : 12;
 
- //type
- switch (AV_RL32(&header[16])) {
+ lxf->extended_size = 0;
+ switch (lxf->packet_type) {
 case 0:
 //video
+ lxf->video_format = bytestream_get_le32(&p);
+ ret = bytestream_get_le32(&p);
 //skip VBI data and metadata
- avio_skip(pb, (int64_t)(uint32_t)AV_RL32(&header[44]) +
- (int64_t)(uint32_t)AV_RL32(&header[52]));
+ avio_skip(pb, (int64_t)(uint32_t)AV_RL32(p + 4) +
+ (int64_t)(uint32_t)AV_RL32(p + 12));
 break;
 case 1:
 //audio
- if (!(st = s->streams[1])) {
+ if (s->nb_streams < 2) {
 av_log(s, AV_LOG_INFO, "got audio packet, but no audio stream present\n");
 break;
 }
 
+ if (version == 0)
+ p += 8;
+ audio_format = bytestream_get_le32(&p);
+ channels = bytestream_get_le32(&p);
+ track_size = bytestream_get_le32(&p);
+
+ st = s->streams[1];
+
 //set codec based on specified audio bitdepth
 //we only support tightly packed 16-, 20-, 24- and 32-bit PCM at the moment
- *format = AV_RL32(&header[40]);
- st->codec->bits_per_coded_sample = (*format >> 6) & 0x3F;
+ st->codec->bits_per_coded_sample = (audio_format >> 6) & 0x3F;
 
- if (st->codec->bits_per_coded_sample != (*format & 0x3F)) {
+ if (st->codec->bits_per_coded_sample != (audio_format & 0x3F)) {
 av_log(s, AV_LOG_WARNING, "only tightly packed PCM currently supported\n");
 return AVERROR_PATCHWELCOME;
 }
 
 switch (st->codec->bits_per_coded_sample) {
- case 16: st->codec->codec_id = AV_CODEC_ID_PCM_S16LE; break;
+ case 16: st->codec->codec_id = AV_CODEC_ID_PCM_S16LE_PLANAR; break;
 case 20: st->codec->codec_id = AV_CODEC_ID_PCM_LXF; break;
- case 24: st->codec->codec_id = AV_CODEC_ID_PCM_S24LE; break;
- case 32: st->codec->codec_id = AV_CODEC_ID_PCM_S32LE; break;
+ case 24: st->codec->codec_id = AV_CODEC_ID_PCM_S24LE_PLANAR; break;
+ case 32: st->codec->codec_id = AV_CODEC_ID_PCM_S32LE_PLANAR; break;
 default:
 av_log(s, AV_LOG_WARNING,
 "only 16-, 20-, 24- and 32-bit PCM currently supported\n");
 return AVERROR_PATCHWELCOME;
 }
 
- track_size = AV_RL32(&header[48]);
 samples = track_size * 8 / st->codec->bits_per_coded_sample;
 
 //use audio packet size to determine video standard
@@ -185,10 +209,14 @@
 }
 
 //TODO: warning if track mask != (1 << channels) - 1?
- ret = av_popcount(AV_RL32(&header[44])) * track_size;
+ ret = av_popcount(channels) * track_size;
 
 break;
 default:
+ tmp = bytestream_get_le32(&p);
+ ret = bytestream_get_le32(&p);
+ if (tmp == 1)
+ lxf->extended_size = bytestream_get_le32(&p);
 break;
 }
 
@@ -199,13 +227,13 @@
 {
 LXFDemuxContext *lxf = s->priv_data;
 AVIOContext *pb = s->pb;
- uint8_t header[LXF_PACKET_HEADER_SIZE], header_data[LXF_HEADER_DATA_SIZE];
+ uint8_t header_data[LXF_HEADER_DATA_SIZE];
 int ret;
 AVStream *st;
- uint32_t format, video_params, disk_params;
+ uint32_t video_params, disk_params;
 uint16_t record_date, expiration_date;
 
- if ((ret = get_packet_header(s, header, &format)) < 0)
+ if ((ret = get_packet_header(s)) < 0)
 return ret;
 
 if (ret != LXF_HEADER_DATA_SIZE) {
@@ -242,7 +270,7 @@
 if ((video_params >> 22) & 1)
 av_log(s, AV_LOG_WARNING, "VBI data not yet supported\n");
 
- if ((lxf->channels = (disk_params >> 2) & 0xF)) {
+ if ((lxf->channels = 1 << (disk_params >> 4 & 3) + 1)) {
 if (!(st = avformat_new_stream(s, NULL)))
 return AVERROR(ENOMEM);
 
@@ -253,81 +281,46 @@
 avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
 }
 
- if (format == 1) {
- //skip extended field data
- avio_skip(s->pb, (uint32_t)AV_RL32(&header[40]));
- }
+ avio_skip(s->pb, lxf->extended_size);
 
 return 0;
 }
 
-/**
- * De-planerize the PCM data in lxf->temp
- * FIXME: remove this once support for planar audio is added to libavcodec
- *
- * @param[out] out where to write the de-planerized data to
- * @param[in] bytes the total size of the PCM data
- */
-static void deplanarize(LXFDemuxContext *lxf, AVStream *ast, uint8_t *out, int bytes)
-{
- int x, y, z, i, bytes_per_sample = ast->codec->bits_per_coded_sample >> 3;
-
- for (z = i = 0; z < lxf->channels; z++)
- for (y = 0; y < bytes / bytes_per_sample / lxf->channels; y++)
- for (x = 0; x < bytes_per_sample; x++, i++)
- out[x + bytes_per_sample*(z + y*lxf->channels)] = lxf->temp[i];
-}
-
 static int lxf_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
 LXFDemuxContext *lxf = s->priv_data;
 AVIOContext *pb = s->pb;
- uint8_t header[LXF_PACKET_HEADER_SIZE], *buf;
- AVStream *ast = NULL;
- uint32_t stream, format;
+ uint32_t stream;
 int ret, ret2;
 
- if ((ret = get_packet_header(s, header, &format)) < 0)
+ if ((ret = get_packet_header(s)) < 0)
 return ret;
 
- stream = AV_RL32(&header[16]);
+ stream = lxf->packet_type;
 
 if (stream > 1) {
 av_log(s, AV_LOG_WARNING, "got packet with illegal stream index %u\n", stream);
 return AVERROR(EAGAIN);
 }
 
- if (stream == 1 && !(ast = s->streams[1])) {
+ if (stream == 1 && s->nb_streams < 2) {
 av_log(s, AV_LOG_ERROR, "got audio packet without having an audio stream\n");
 return AVERROR_INVALIDDATA;
 }
 
- //make sure the data fits in the de-planerization buffer
- if (ast && ret > LXF_MAX_AUDIO_PACKET) {
- av_log(s, AV_LOG_ERROR, "audio packet too large (%i > %i)\n",
- ret, LXF_MAX_AUDIO_PACKET);
- return AVERROR_INVALIDDATA;
- }
-
 if ((ret2 = av_new_packet(pkt, ret)) < 0)
 return ret2;
 
- //read non-20-bit audio data into lxf->temp so we can deplanarize it
- buf = ast && ast->codec->codec_id != AV_CODEC_ID_PCM_LXF ? lxf->temp : pkt->data;
-
- if ((ret2 = avio_read(pb, buf, ret)) != ret) {
+ if ((ret2 = avio_read(pb, pkt->data, ret)) != ret) {
 av_free_packet(pkt);
 return ret2 < 0 ? ret2 : AVERROR_EOF;
 }
 
 pkt->stream_index = stream;
 
- if (ast) {
- if(ast->codec->codec_id != AV_CODEC_ID_PCM_LXF)
- deplanarize(lxf, ast, pkt->data, ret);
- } else {
+ if (!stream) {
 //picture type (0 = closed I, 1 = open I, 2 = P, 3 = B)
- if (((format >> 22) & 0x3) < 2)
+ if (((lxf->video_format >> 22) & 0x3) < 2)
 pkt->flags |= AV_PKT_FLAG_KEY;
 
 pkt->dts = lxf->frame_number++;

libav-v9.6.tar.bz2/libavformat/m4vdec.c -> libav-v10.1.tar.bz2/libavformat/m4vdec.c Changed

libav-v9.6.tar.bz2/libavformat/matroska.c -> libav-v10.1.tar.bz2/libavformat/matroska.c Changed

@@ -32,6 +32,7 @@
     {"A_MPEG/L2"        , AV_CODEC_ID_MP2},
     {"A_MPEG/L1"        , AV_CODEC_ID_MP2},
     {"A_MPEG/L3"        , AV_CODEC_ID_MP3},
+    {"A_OPUS"           , AV_CODEC_ID_OPUS},
     {"A_PCM/FLOAT/IEEE" , AV_CODEC_ID_PCM_F32LE},
     {"A_PCM/FLOAT/IEEE" , AV_CODEC_ID_PCM_F64LE},
     {"A_PCM/INT/BIG"    , AV_CODEC_ID_PCM_S16BE},
@@ -70,16 +71,17 @@
     {"V_MPEG4/ISO/AP"   , AV_CODEC_ID_MPEG4},
     {"V_MPEG4/ISO/SP"   , AV_CODEC_ID_MPEG4},
     {"V_MPEG4/ISO/AVC"  , AV_CODEC_ID_H264},
+    {"V_MPEGH/ISO/HEVC" , AV_CODEC_ID_HEVC},
     {"V_MPEG4/MS/V3"    , AV_CODEC_ID_MSMPEG4V3},
     {"V_PRORES"         , AV_CODEC_ID_PRORES},
     {"V_REAL/RV10"      , AV_CODEC_ID_RV10},
     {"V_REAL/RV20"      , AV_CODEC_ID_RV20},
     {"V_REAL/RV30"      , AV_CODEC_ID_RV30},
     {"V_REAL/RV40"      , AV_CODEC_ID_RV40},
-    {"V_SNOW"           , AV_CODEC_ID_SNOW},
     {"V_THEORA"         , AV_CODEC_ID_THEORA},
     {"V_UNCOMPRESSED"   , AV_CODEC_ID_RAWVIDEO},
     {"V_VP8"            , AV_CODEC_ID_VP8},
+    {"V_VP9"            , AV_CODEC_ID_VP9},
 
     {""                 , AV_CODEC_ID_NONE}
 };

libav-v9.6.tar.bz2/libavformat/matroska.h -> libav-v10.1.tar.bz2/libavformat/matroska.h Changed

libav-v9.6.tar.bz2/libavformat/matroskadec.c -> libav-v10.1.tar.bz2/libavformat/matroskadec.c Changed

@@ -44,6 +44,7 @@
 #include "libavutil/avstring.h"
 #include "libavutil/lzo.h"
 #include "libavutil/dict.h"
+#include "libavutil/mathematics.h"
 #if CONFIG_ZLIB
 #include <zlib.h>
 #endif
@@ -148,6 +149,7 @@
 MatroskaTrackVideo video;
 MatroskaTrackAudio audio;
 EbmlList encodings;
+ uint64_t codec_delay;
 
 AVStream *stream;
 int64_t end_timecode;
@@ -348,6 +350,7 @@
 { MATROSKA_ID_TRACKTYPE, EBML_UINT, 0, offsetof(MatroskaTrack,type) },
 { MATROSKA_ID_CODECID, EBML_STR, 0, offsetof(MatroskaTrack,codec_id) },
 { MATROSKA_ID_CODECPRIVATE, EBML_BIN, 0, offsetof(MatroskaTrack,codec_priv) },
+ { MATROSKA_ID_CODECDELAY, EBML_UINT, 0, offsetof(MatroskaTrack, codec_delay) },
 { MATROSKA_ID_TRACKLANGUAGE, EBML_UTF8, 0, offsetof(MatroskaTrack,language), {.s="eng"} },
 { MATROSKA_ID_TRACKDEFAULTDURATION, EBML_UINT, 0, offsetof(MatroskaTrack,default_duration) },
 { MATROSKA_ID_TRACKTIMECODESCALE, EBML_FLOAT,0, offsetof(MatroskaTrack,time_scale), {.f=1.0} },
@@ -500,6 +503,7 @@
 { MATROSKA_ID_SIMPLEBLOCK, EBML_BIN, 0, offsetof(MatroskaBlock,bin) },
 { MATROSKA_ID_BLOCKDURATION, EBML_UINT, 0, offsetof(MatroskaBlock,duration), {.u=AV_NOPTS_VALUE} },
 { MATROSKA_ID_BLOCKREFERENCE, EBML_UINT, 0, offsetof(MatroskaBlock,reference) },
+ { MATROSKA_ID_CODECSTATE, EBML_NONE },
 { 1, EBML_UINT, 0, offsetof(MatroskaBlock,non_simple), {.u=1} },
 { 0 }
 };
@@ -556,6 +560,35 @@
 
 static const char *const matroska_doctypes[] = { "matroska", "webm" };
 
+static int matroska_resync(MatroskaDemuxContext *matroska, int64_t last_pos)
+{
+ AVIOContext *pb = matroska->ctx->pb;
+ uint32_t id;
+ matroska->current_id = 0;
+ matroska->num_levels = 0;
+
+ /* seek to next position to resync from */
+ if (avio_seek(pb, last_pos + 1, SEEK_SET) < 0)
+ goto eof;
+
+ id = avio_rb32(pb);
+
+ // try to find a toplevel element
+ while (!pb->eof_reached) {
+ if (id == MATROSKA_ID_INFO || id == MATROSKA_ID_TRACKS ||
+ id == MATROSKA_ID_CUES || id == MATROSKA_ID_TAGS ||
+ id == MATROSKA_ID_SEEKHEAD || id == MATROSKA_ID_ATTACHMENTS ||
+ id == MATROSKA_ID_CLUSTER || id == MATROSKA_ID_CHAPTERS) {
+ matroska->current_id = id;
+ return 0;
+ }
+ id = (id << 8) | avio_r8(pb);
+ }
+eof:
+ matroska->done = 1;
+ return AVERROR_EOF;
+}
+
 /*
 * Return: Whether we reached the end of a level in the hierarchy or not.
 */
@@ -704,9 +737,11 @@
 static int ebml_read_binary(AVIOContext *pb, int length, EbmlBin *bin)
 {
 av_free(bin->data);
- if (!(bin->data = av_malloc(length)))
+ if (!(bin->data = av_malloc(length + FF_INPUT_BUFFER_PADDING_SIZE)))
 return AVERROR(ENOMEM);
 
+ memset(bin->data + length, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+
 bin->size = length;
 bin->pos = avio_tell(pb);
 if (avio_read(pb, bin->data, length) != length) {
@@ -821,7 +856,13 @@
 break;
 case EBML_STR:
 case EBML_UTF8:
- *(char **)((char *)data+syntax[i].data_offset) = av_strdup(syntax[i].def.s);
+ // the default may be NULL
+ if (syntax[i].def.s) {
+ uint8_t **dst = (uint8_t**)((uint8_t*)data + syntax[i].data_offset);
+ *dst = av_strdup(syntax[i].def.s);
+ if (!*dst)
+ return AVERROR(ENOMEM);
+ }
 break;
 }
 
@@ -848,15 +889,16 @@
 uint32_t id = syntax->id;
 uint64_t length;
 int res;
- void *newelem;
 
 data = (char *)data + syntax->data_offset;
 if (syntax->list_elem_size) {
 EbmlList *list = data;
- newelem = av_realloc(list->elem, (list->nb_elem+1)*syntax->list_elem_size);
- if (!newelem)
- return AVERROR(ENOMEM);
- list->elem = newelem;
+ if ((res = av_reallocp_array(&list->elem,
+ list->nb_elem + 1,
+ syntax->list_elem_size)) < 0) {
+ list->nb_elem = 0;
+ return res;
+ }
 data = (char*)list->elem + list->nb_elem*syntax->list_elem_size;
 memset(data, 0, syntax->list_elem_size);
 list->nb_elem++;
@@ -962,7 +1004,7 @@
 }
 
 // probably valid EBML header but no recognized doctype
- return AVPROBE_SCORE_MAX/2;
+ return AVPROBE_SCORE_EXTENSION;
 }
 
 static MatroskaTrack *matroska_find_track_by_num(MatroskaDemuxContext *matroska,
@@ -1107,7 +1149,8 @@
 static void matroska_fix_ass_packet(MatroskaDemuxContext *matroska,
 AVPacket *pkt, uint64_t display_duration)
 {
- char *line, *layer, *ptr = pkt->data, *end = ptr+pkt->size;
+ AVBufferRef *line;
+ char *layer, *ptr = pkt->data, *end = ptr+pkt->size;
 for (; *ptr!=',' && ptr<end-1; ptr++);
 if (*ptr == ',')
 layer = ++ptr;
@@ -1125,13 +1168,14 @@
 es = ec/ 100; ec -= 100*es;
 *ptr++ = '\0';
 len = 50 + end-ptr + FF_INPUT_BUFFER_PADDING_SIZE;
- if (!(line = av_malloc(len)))
+ if (!(line = av_buffer_alloc(len)))
 return;
- snprintf(line,len,"Dialogue: %s,%d:%02d:%02d.%02d,%d:%02d:%02d.%02d,%s\r\n",
+ snprintf(line->data, len,"Dialogue: %s,%d:%02d:%02d.%02d,%d:%02d:%02d.%02d,%s\r\n",
 layer, sh, sm, ss, sc, eh, em, es, ec, ptr);
- av_free(pkt->data);
- pkt->data = line;
- pkt->size = strlen(line);
+ av_buffer_unref(&pkt->buf);
+ pkt->buf = line;
+ pkt->data = line->data;
+ pkt->size = strlen(line->data);
 }
 }
 
@@ -1157,7 +1201,8 @@
 int i;
 
 for (i=0; i < list->nb_elem; i++) {
- const char *lang = strcmp(tags[i].lang, "und") ? tags[i].lang : NULL;
+ const char *lang = tags[i].lang && strcmp(tags[i].lang, "und") ?
+ tags[i].lang : NULL;
 
 if (!tags[i].name) {
 av_log(s, AV_LOG_WARNING, "Skipping invalid tag with no TagName.\n");
@@ -1359,6 +1404,7 @@
 MatroskaChapter *chapters;
 MatroskaTrack *tracks;
 uint64_t max_start = 0;
+ int64_t pos;
 Ebml ebml = { 0 };
 AVStream *st;
 int i, j, res;
@@ -1389,8 +1435,16 @@
 ebml_free(ebml_syntax, &ebml);
 
 /* The next thing is a segment. */
- if ((res = ebml_parse(matroska, matroska_segments, matroska)) < 0)
- return res;
+ pos = avio_tell(matroska->ctx->pb);
+ res = ebml_parse(matroska, matroska_segments, matroska);
+ // try resyncing until we find a EBML_STOP type element.
+ while (res != 1) {
+ res = matroska_resync(matroska, pos);
+ if (res < 0)
+ return res;
+ pos = avio_tell(matroska->ctx->pb);
+ res = ebml_parse(matroska, matroska_segment, matroska);
+ }
 matroska_execute_seekhead(matroska);
 
 if (!matroska->time_scale)
@@ -1404,7 +1458,7 @@
 for (i=0; i < matroska->tracks.nb_elem; i++) {
 MatroskaTrack *track = &tracks[i];
 enum AVCodecID codec_id = AV_CODEC_ID_NONE;
- EbmlList *encodings_list = &tracks->encodings;
+ EbmlList *encodings_list = &track->encodings;
 MatroskaTrackEncoding *encodings = encodings_list->elem;
 uint8_t *extradata = NULL;
 int extradata_size = 0;
@@ -1494,7 +1548,7 @@
 && track->codec_priv.data != NULL) {
 int ret;
 ffio_init_context(&b, track->codec_priv.data, track->codec_priv.size,
- AVIO_FLAG_READ, NULL, NULL, NULL, NULL);
+ 0, NULL, NULL, NULL, NULL);
 ret = ff_get_wav_header(&b, st->codec, track->codec_priv.size);
 if (ret < 0)
 return ret;
@@ -1579,6 +1633,10 @@
 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 ||
+ track->audio.sub_packet_h <= 0 || track->audio.frame_size <= 0 ||
+ track->audio.sub_packet_size <= 0)
+ return AVERROR_INVALIDDATA;
 track->audio.buf = av_malloc(track->audio.frame_size * track->audio.sub_packet_h);
 if (codec_id == AV_CODEC_ID_RA_288) {
 st->codec->block_align = track->audio.coded_framesize;
@@ -1603,6 +1661,11 @@
 track->time_scale = 1.0;
 avpriv_set_pts_info(st, 64, matroska->time_scale*track->time_scale, 1000*1000*1000); /* 64 bit pts in ns */
 
+ /* convert the delay from ns to the track timebase */
+ track->codec_delay = av_rescale_q(track->codec_delay,
+ (AVRational){ 1, 1000000000 },
+ st->time_base);
+
 st->codec->codec_id = codec_id;
 st->start_time = 0;
 if (strcmp(track->language, "und"))
@@ -1640,14 +1703,12 @@
 st->codec->height * track->video.display_width,
 st->codec-> width * track->video.display_height,
 255);
- if (st->codec->codec_id != AV_CODEC_ID_H264)
- st->need_parsing = AVSTREAM_PARSE_HEADERS;
+ if (st->codec->codec_id != AV_CODEC_ID_H264 &&
+ 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);
-#if FF_API_R_FRAME_RATE
- st->r_frame_rate = st->avg_frame_rate;
-#endif
 }
 } else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) {
 st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
@@ -1929,6 +1990,88 @@
 
 return 0;
 }
+
+/* reconstruct full wavpack blocks from mangled matroska ones */
+static int matroska_parse_wavpack(MatroskaTrack *track, uint8_t *src,
+ uint8_t **pdst, int *size)
+{
+ uint8_t *dst = NULL;
+ int dstlen = 0;
+ int srclen = *size;
+ uint32_t samples;
+ uint16_t ver;
+ int ret, offset = 0;
+
+ if (srclen < 12 || track->stream->codec->extradata_size < 2)
+ return AVERROR_INVALIDDATA;
+
+ ver = AV_RL16(track->stream->codec->extradata);
+
+ samples = AV_RL32(src);
+ src += 4;
+ srclen -= 4;
+
+ while (srclen >= 8) {
+ int multiblock;
+ uint32_t blocksize;
+ uint8_t *tmp;
+
+ uint32_t flags = AV_RL32(src);
+ uint32_t crc = AV_RL32(src + 4);
+ src += 8;
+ srclen -= 8;
+
+ multiblock = (flags & 0x1800) != 0x1800;
+ if (multiblock) {
+ if (srclen < 4) {
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
+ blocksize = AV_RL32(src);
+ src += 4;
+ srclen -= 4;
+ } else
+ blocksize = srclen;
+
+ if (blocksize > srclen) {
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
+
+ tmp = av_realloc(dst, dstlen + blocksize + 32);
+ if (!tmp) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ dst = tmp;
+ dstlen += blocksize + 32;
+
+ AV_WL32(dst + offset, MKTAG('w', 'v', 'p', 'k')); // tag
+ AV_WL32(dst + offset + 4, blocksize + 24); // blocksize - 8
+ AV_WL16(dst + offset + 8, ver); // version
+ AV_WL16(dst + offset + 10, 0); // track/index_no
+ AV_WL32(dst + offset + 12, 0); // total samples
+ AV_WL32(dst + offset + 16, 0); // block index
+ AV_WL32(dst + offset + 20, samples); // number of samples
+ AV_WL32(dst + offset + 24, flags); // flags
+ AV_WL32(dst + offset + 28, crc); // crc
+ memcpy (dst + offset + 32, src, blocksize); // block data
+
+ src += blocksize;
+ srclen -= blocksize;
+ offset += blocksize + 32;
+ }
+
+ *pdst = dst;
+ *size = dstlen;
+
+ return 0;
+
+fail:
+ av_freep(&dst);
+ return ret;
+}
+
 static int matroska_parse_frame(MatroskaDemuxContext *matroska,
 MatroskaTrack *track,
 AVStream *st,
@@ -1947,6 +2090,18 @@
 return res;
 }
 
+ if (st->codec->codec_id == AV_CODEC_ID_WAVPACK) {
+ uint8_t *wv_data;
+ res = matroska_parse_wavpack(track, pkt_data, &wv_data, &pkt_size);
+ if (res < 0) {
+ av_log(matroska->ctx, AV_LOG_ERROR, "Error parsing a wavpack block.\n");
+ goto fail;
+ }
+ if (pkt_data != data)
+ av_freep(&pkt_data);
+ pkt_data = wv_data;
+ }
+
 if (st->codec->codec_id == AV_CODEC_ID_PRORES)
 offset = 8;
 
@@ -1996,6 +2151,10 @@
 }
 
 return 0;
+fail:
+ if (pkt_data != data)
+ av_freep(&pkt_data);
+ return res;
 }
 
 static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
@@ -2039,7 +2198,7 @@
 
 if (cluster_time != (uint64_t)-1
 && (block_time >= 0 || cluster_time >= -block_time)) {
- timecode = cluster_time + block_time;
+ timecode = cluster_time + block_time - track->codec_delay;
 if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE
 && timecode < track->end_timecode)
 is_keyframe = 0; /* overlapping subtitles are not key frame */
@@ -2188,7 +2347,6 @@
 pos);
 }
 ebml_free(matroska_cluster, &cluster);
- if (res < 0) matroska->done = 1;
 return res;
 }
 
@@ -2198,9 +2356,11 @@
 int ret = 0;
 
 while (!ret && matroska_deliver_packet(matroska, pkt)) {
+ int64_t pos = avio_tell(matroska->ctx->pb);
 if (matroska->done)
 return AVERROR_EOF;
- ret = matroska_parse_cluster(matroska);
+ if (matroska_parse_cluster(matroska) < 0)
+ ret = matroska_resync(matroska, pos);
 }
 
 if (ret == AVERROR_INVALIDDATA && pkt->data) {

libav-v9.6.tar.bz2/libavformat/matroskaenc.c -> libav-v10.1.tar.bz2/libavformat/matroskaenc.c Changed

@@ -19,22 +19,29 @@
 * 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 "avlanguage.h"
+#include "flacenc.h"
 #include "internal.h"
-#include "riff.h"
 #include "isom.h"
 #include "matroska.h"
-#include "avc.h"
-#include "flacenc.h"
-#include "avlanguage.h"
-#include "libavutil/samplefmt.h"
-#include "libavutil/intreadwrite.h"
+#include "riff.h"
+#include "wv.h"
+
+#include "libavutil/avstring.h"
+#include "libavutil/dict.h"
 #include "libavutil/intfloat.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/lfg.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
 #include "libavutil/random_seed.h"
-#include "libavutil/lfg.h"
-#include "libavutil/dict.h"
-#include "libavutil/avstring.h"
+#include "libavutil/samplefmt.h"
+
 #include "libavcodec/xiph.h"
 #include "libavcodec/mpeg4audio.h"
 
@@ -77,6 +84,7 @@
 #define MODE_WEBM 0x02
 
 typedef struct MatroskaMuxContext {
+ const AVClass *class;
 int mode;
 AVIOContext *dyn_bc;
 ebml_master segment;
@@ -90,10 +98,15 @@
 mkv_cues *cues;
 mkv_track *tracks;
 
- unsigned int audio_buffer_size;
 AVPacket cur_audio_pkt;
 
 int have_attachments;
+
+ int reserve_cues_space;
+ int cluster_size_limit;
+ int64_t cues_pos;
+ int64_t cluster_time_limit;
+ int wrote_chapters;
 } MatroskaMuxContext;
 
 
@@ -284,20 +297,21 @@
 
 static int mkv_add_seekhead_entry(mkv_seekhead *seekhead, unsigned int elementid, uint64_t filepos)
 {
- mkv_seekhead_entry *entries = seekhead->entries;
+ int err;
 
 // don't store more elements than we reserved space for
 if (seekhead->max_entries > 0 && seekhead->max_entries <= seekhead->num_entries)
 return -1;
 
- entries = av_realloc(entries, (seekhead->num_entries + 1) * sizeof(mkv_seekhead_entry));
- if (entries == NULL)
- return AVERROR(ENOMEM);
+ if ((err = av_reallocp_array(&seekhead->entries, seekhead->num_entries + 1,
+ sizeof(*seekhead->entries))) < 0) {
+ seekhead->num_entries = 0;
+ return err;
+ }
 
- entries[seekhead->num_entries ].elementid = elementid;
- entries[seekhead->num_entries++].segmentpos = filepos - seekhead->segment_offset;
+ seekhead->entries[seekhead->num_entries].elementid = elementid;
+ seekhead->entries[seekhead->num_entries++].segmentpos = filepos - seekhead->segment_offset;
 
- seekhead->entries = entries;
 return 0;
 }
 
@@ -366,20 +380,21 @@
 
 static int mkv_add_cuepoint(mkv_cues *cues, int stream, int64_t ts, int64_t cluster_pos)
 {
- mkv_cuepoint *entries = cues->entries;
+ int err;
 
 if (ts < 0)
 return 0;
 
- entries = av_realloc(entries, (cues->num_entries + 1) * sizeof(mkv_cuepoint));
- if (entries == NULL)
- return AVERROR(ENOMEM);
+ if ((err = av_reallocp_array(&cues->entries, cues->num_entries + 1,
+ sizeof(*cues->entries))) < 0) {
+ cues->num_entries = 0;
+ return err;
+ }
 
- entries[cues->num_entries ].pts = ts;
- entries[cues->num_entries ].tracknum = stream + 1;
- entries[cues->num_entries++].cluster_pos = cluster_pos - cues->segment_offset;
+ cues->entries[cues->num_entries].pts = ts;
+ cues->entries[cues->num_entries].tracknum = stream + 1;
+ cues->entries[cues->num_entries++].cluster_pos = cluster_pos - cues->segment_offset;
 
- cues->entries = entries;
 return 0;
 }
 
@@ -444,6 +459,15 @@
 return 0;
 }
 
+static int put_wv_codecpriv(AVIOContext *pb, AVCodecContext *codec)
+{
+ if (codec->extradata && codec->extradata_size == 2)
+ avio_write(pb, codec->extradata, 2);
+ else
+ avio_wl16(pb, 0x403); // fallback to the version mentioned in matroska specs
+ return 0;
+}
+
 static void get_aac_sample_rates(AVFormatContext *s, AVCodecContext *codec, int *sample_rate, int *output_sample_rate)
 {
 MPEG4AudioConfig mp4ac;
@@ -473,8 +497,12 @@
 ret = put_xiph_codecpriv(s, dyn_cp, codec);
 else if (codec->codec_id == AV_CODEC_ID_FLAC)
 ret = ff_flac_write_header(dyn_cp, codec, 1);
+ else if (codec->codec_id == AV_CODEC_ID_WAVPACK)
+ 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,
@@ -567,7 +595,9 @@
 tag = av_dict_get(st->metadata, "language", NULL, 0);
 put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, tag ? tag->value:"und");
 
- if (st->disposition)
+ // The default value for TRACKFLAGDEFAULT is 1, so add element
+ // if we need to clear it.
+ if (!(st->disposition & AV_DISPOSITION_DEFAULT))
 put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGDEFAULT, !!(st->disposition & AV_DISPOSITION_DEFAULT));
 
 // look for a codec ID string specific to mkv to use,
@@ -688,7 +718,7 @@
 AVRational scale = {1, 1E9};
 int i, ret;
 
- if (!s->nb_chapters)
+ if (!s->nb_chapters || mkv->wrote_chapters)
 return 0;
 
 ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CHAPTERS, avio_tell(pb));
@@ -721,6 +751,8 @@
 }
 end_ebml_master(pb, editionentry);
 end_ebml_master(pb, chapters);
+
+ mkv->wrote_chapters = 1;
 return 0;
 }
 
@@ -776,7 +808,8 @@
 end_ebml_master(s->pb, targets);
 
 while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX)))
- if (av_strcasecmp(t->key, "title"))
+ if (av_strcasecmp(t->key, "title") &&
+ av_strcasecmp(t->key, "encoding_tool"))
 mkv_write_simpletag(s->pb, t);
 
 end_ebml_master(s->pb, tag);
@@ -936,7 +969,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);
 }
 
@@ -967,11 +1003,30 @@
 if (mkv->cues == NULL)
 return AVERROR(ENOMEM);
 
+ if (pb->seekable && mkv->reserve_cues_space) {
+ mkv->cues_pos = avio_tell(pb);
+ put_ebml_void(pb, mkv->reserve_cues_space);
+ }
+
 av_init_packet(&mkv->cur_audio_pkt);
 mkv->cur_audio_pkt.size = 0;
- mkv->audio_buffer_size = 0;
 
 avio_flush(pb);
+
+ // start a new cluster every 5 MB or 5 sec, or 32k / 1 sec for streaming or
+ // after 4k and on a keyframe
+ if (pb->seekable) {
+ if (mkv->cluster_time_limit < 0)
+ mkv->cluster_time_limit = 5000;
+ if (mkv->cluster_size_limit < 0)
+ mkv->cluster_size_limit = 5 * 1024 * 1024;
+ } else {
+ if (mkv->cluster_time_limit < 0)
+ mkv->cluster_time_limit = 1000;
+ if (mkv->cluster_size_limit < 0)
+ mkv->cluster_size_limit = 32 * 1024;
+ }
+
 return 0;
 }
 
@@ -1044,6 +1099,59 @@
 return max_duration;
 }
 
+static int mkv_strip_wavpack(const uint8_t *src, uint8_t **pdst, int *size)
+{
+ uint8_t *dst;
+ int srclen = *size;
+ int offset = 0;
+ int ret;
+
+ dst = av_malloc(srclen);
+ if (!dst)
+ return AVERROR(ENOMEM);
+
+ while (srclen >= WV_HEADER_SIZE) {
+ WvHeader header;
+
+ ret = ff_wv_parse_header(&header, src);
+ if (ret < 0)
+ goto fail;
+ src += WV_HEADER_SIZE;
+ srclen -= WV_HEADER_SIZE;
+
+ if (srclen < header.blocksize) {
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
+
+ if (header.initial) {
+ AV_WL32(dst + offset, header.samples);
+ offset += 4;
+ }
+ AV_WL32(dst + offset, header.flags);
+ AV_WL32(dst + offset + 4, header.crc);
+ offset += 8;
+
+ if (!(header.initial && header.final)) {
+ AV_WL32(dst + offset, header.blocksize);
+ offset += 4;
+ }
+
+ memcpy(dst + offset, src, header.blocksize);
+ src += header.blocksize;
+ srclen -= header.blocksize;
+ offset += header.blocksize;
+ }
+
+ *pdst = dst;
+ *size = offset;
+
+ return 0;
+fail:
+ av_freep(&dst);
+ return ret;
+}
+
 static void mkv_write_block(AVFormatContext *s, AVIOContext *pb,
 unsigned int blockid, AVPacket *pkt, int flags)
 {
@@ -1059,7 +1167,17 @@
 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
+ 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) {
+ av_log(s, AV_LOG_ERROR, "Error stripping a WavPack packet.\n");
+ return;
+ }
+ } else
 data = pkt->data;
 
 if (codec->codec_id == AV_CODEC_ID_PRORES) {
@@ -1180,46 +1298,50 @@
 return 0;
 }
 
-static int mkv_copy_packet(MatroskaMuxContext *mkv, const AVPacket *pkt)
-{
- uint8_t *data = mkv->cur_audio_pkt.data;
- mkv->cur_audio_pkt = *pkt;
- mkv->cur_audio_pkt.data = av_fast_realloc(data, &mkv->audio_buffer_size, pkt->size);
- if (!mkv->cur_audio_pkt.data)
- return AVERROR(ENOMEM);
-
- memcpy(mkv->cur_audio_pkt.data, pkt->data, pkt->size);
- mkv->cur_audio_pkt.size = pkt->size;
- return 0;
-}
-
 static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
 MatroskaMuxContext *mkv = s->priv_data;
- AVIOContext *pb = s->pb->seekable ? s->pb : mkv->dyn_bc;
- AVCodecContext *codec = s->streams[pkt->stream_index]->codec;
- int ret, keyframe = !!(pkt->flags & AV_PKT_FLAG_KEY);
- int64_t ts = mkv->tracks[pkt->stream_index].write_dts ? pkt->dts : pkt->pts;
- int cluster_size = avio_tell(pb) - (s->pb->seekable ? mkv->cluster_pos : 0);
+ int codec_type = s->streams[pkt->stream_index]->codec->codec_type;
+ int keyframe = !!(pkt->flags & AV_PKT_FLAG_KEY);
+ int cluster_size;
+ int64_t cluster_time;
+ AVIOContext *pb;
+ int ret;
+
+ if (mkv->tracks[pkt->stream_index].write_dts)
+ cluster_time = pkt->dts - mkv->cluster_pts;
+ else
+ cluster_time = pkt->pts - mkv->cluster_pts;
 
 // start a new cluster every 5 MB or 5 sec, or 32k / 1 sec for streaming or
 // after 4k and on a keyframe
+ if (s->pb->seekable) {
+ pb = s->pb;
+ cluster_size = avio_tell(pb) - mkv->cluster_pos;
+ } else {
+ pb = mkv->dyn_bc;
+ cluster_size = avio_tell(pb);
+ }
+
 if (mkv->cluster_pos &&
- ((!s->pb->seekable && (cluster_size > 32*1024 || ts > mkv->cluster_pts + 1000))
- || cluster_size > 5*1024*1024 || ts > mkv->cluster_pts + 5000
- || (codec->codec_type == AVMEDIA_TYPE_VIDEO && keyframe && cluster_size > 4*1024))) {
+ (cluster_size > mkv->cluster_size_limit ||
+ cluster_time > mkv->cluster_time_limit ||
+ (codec_type == AVMEDIA_TYPE_VIDEO && keyframe &&
+ cluster_size > 4 * 1024))) {
 av_log(s, AV_LOG_DEBUG, "Starting new cluster at offset %" PRIu64
- " bytes, pts %" PRIu64 "\n", avio_tell(pb), ts);
+ " bytes, pts %" PRIu64 "dts %" PRIu64 "\n",
+ avio_tell(pb), pkt->pts, pkt->dts);
 end_ebml_master(pb, mkv->cluster);
 mkv->cluster_pos = 0;
 if (mkv->dyn_bc)
 mkv_flush_dynbuf(s);
+ avio_flush(s->pb);
 }
 
 // check if we have an audio packet cached
 if (mkv->cur_audio_pkt.size > 0) {
 ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt);
- mkv->cur_audio_pkt.size = 0;
+ av_free_packet(&mkv->cur_audio_pkt);
 if (ret < 0) {
 av_log(s, AV_LOG_ERROR, "Could not write cached audio packet ret:%d\n", ret);
 return ret;
@@ -1228,13 +1350,41 @@
 
 // buffer an audio packet to ensure the packet containing the video
 // keyframe's timecode is contained in the same cluster for WebM
- if (codec->codec_type == AVMEDIA_TYPE_AUDIO)
- ret = mkv_copy_packet(mkv, pkt);
- else
+ if (codec_type == AVMEDIA_TYPE_AUDIO) {
+ mkv->cur_audio_pkt = *pkt;
+ if (pkt->buf) {
+ mkv->cur_audio_pkt.buf = av_buffer_ref(pkt->buf);
+ ret = mkv->cur_audio_pkt.buf ? 0 : AVERROR(ENOMEM);
+ } else
+ ret = av_dup_packet(&mkv->cur_audio_pkt);
+ } else
 ret = mkv_write_packet_internal(s, pkt);
 return ret;
 }
 
+static int mkv_write_flush_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ MatroskaMuxContext *mkv = s->priv_data;
+ AVIOContext *pb;
+ if (s->pb->seekable)
+ pb = s->pb;
+ else
+ pb = mkv->dyn_bc;
+ if (!pkt) {
+ if (mkv->cluster_pos) {
+ av_log(s, AV_LOG_DEBUG, "Flushing cluster at offset %" PRIu64
+ " bytes\n", avio_tell(pb));
+ end_ebml_master(pb, mkv->cluster);
+ mkv->cluster_pos = 0;
+ if (mkv->dyn_bc)
+ mkv_flush_dynbuf(s);
+ avio_flush(s->pb);
+ }
+ return 0;
+ }
+ return mkv_write_packet(s, pkt);
+}
+
 static int mkv_write_trailer(AVFormatContext *s)
 {
 MatroskaMuxContext *mkv = s->priv_data;
@@ -1245,7 +1395,7 @@
 // check if we have an audio packet cached
 if (mkv->cur_audio_pkt.size > 0) {
 ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt);
- mkv->cur_audio_pkt.size = 0;
+ av_free_packet(&mkv->cur_audio_pkt);
 if (ret < 0) {
 av_log(s, AV_LOG_ERROR, "Could not write cached audio packet ret:%d\n", ret);
 return ret;
@@ -1259,9 +1409,35 @@
 end_ebml_master(pb, mkv->cluster);
 }
 
+ if (mkv->mode != MODE_WEBM) {
+ ret = mkv_write_chapters(s);
+ if (ret < 0) return ret;
+ }
+
 if (pb->seekable) {
 if (mkv->cues->num_entries) {
- cuespos = mkv_write_cues(pb, mkv->cues, s->nb_streams);
+ if (mkv->reserve_cues_space) {
+ int64_t cues_end;
+
+ currentpos = avio_tell(pb);
+ avio_seek(pb, mkv->cues_pos, SEEK_SET);
+
+ cuespos = mkv_write_cues(pb, mkv->cues, s->nb_streams);
+ cues_end = avio_tell(pb);
+ if (cues_end > cuespos + mkv->reserve_cues_space) {
+ av_log(s, AV_LOG_ERROR, "Insufficient space reserved for cues: %d "
+ "(needed: %"PRId64").\n", mkv->reserve_cues_space,
+ cues_end - cuespos);
+ return AVERROR(EINVAL);
+ }
+
+ if (cues_end < cuespos + mkv->reserve_cues_space)
+ put_ebml_void(pb, mkv->reserve_cues_space - (cues_end - cuespos));
+
+ avio_seek(pb, currentpos, SEEK_SET);
+ } else {
+ cuespos = mkv_write_cues(pb, mkv->cues, s->nb_streams);
+ }
 
 ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CUES, cuespos);
 if (ret < 0) return ret;
@@ -1282,7 +1458,6 @@
 av_free(mkv->tracks);
 av_freep(&mkv->cues->entries);
 av_freep(&mkv->cues);
- av_destruct_packet(&mkv->cur_audio_pkt);
 
 return 0;
 }
@@ -1303,7 +1478,23 @@
 return 0;
 }
 
+#define OFFSET(x) offsetof(MatroskaMuxContext, x)
+#define FLAGS AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption options[] = {
+ { "reserve_index_space", "Reserve a given amount of space (in bytes) at the beginning of the file for the index (cues).", OFFSET(reserve_cues_space), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS },
+ { "cluster_size_limit", "Store at most the provided amount of bytes in a cluster. ", OFFSET(cluster_size_limit), AV_OPT_TYPE_INT , { .i64 = -1 }, -1, INT_MAX, FLAGS },
+ { "cluster_time_limit", "Store at most the provided number of milliseconds in a cluster.", OFFSET(cluster_time_limit), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, FLAGS },
+ { NULL },
+};
+
 #if CONFIG_MATROSKA_MUXER
+static const AVClass matroska_class = {
+ .class_name = "matroska muxer",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 AVOutputFormat ff_matroska_muxer = {
 .name = "matroska",
 .long_name = NULL_IF_CONFIG_SMALL("Matroska"),
@@ -1315,19 +1506,27 @@
 .video_codec = CONFIG_LIBX264_ENCODER ?
 AV_CODEC_ID_H264 : AV_CODEC_ID_MPEG4,
 .write_header = mkv_write_header,
- .write_packet = mkv_write_packet,
+ .write_packet = mkv_write_flush_packet,
 .write_trailer = mkv_write_trailer,
 .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS |
- AVFMT_TS_NONSTRICT,
+ AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH,
 .codec_tag = (const AVCodecTag* const []){
 ff_codec_bmp_tags, ff_codec_wav_tags, 0
 },
 .subtitle_codec = AV_CODEC_ID_SSA,
 .query_codec = mkv_query_codec,
+ .priv_class = &matroska_class,
 };
 #endif
 
 #if CONFIG_WEBM_MUXER
+static const AVClass webm_class = {
+ .class_name = "webm muxer",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 AVOutputFormat ff_webm_muxer = {
 .name = "webm",
 .long_name = NULL_IF_CONFIG_SMALL("WebM"),
@@ -1337,14 +1536,21 @@
 .audio_codec = AV_CODEC_ID_VORBIS,
 .video_codec = AV_CODEC_ID_VP8,
 .write_header = mkv_write_header,
- .write_packet = mkv_write_packet,
+ .write_packet = mkv_write_flush_packet,
 .write_trailer = mkv_write_trailer,
 .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS |
- AVFMT_TS_NONSTRICT,
+ AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH,
+ .priv_class = &webm_class,
 };
 #endif
 
 #if CONFIG_MATROSKA_AUDIO_MUXER
+static const AVClass mka_class = {
+ .class_name = "matroska audio muxer",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
 AVOutputFormat ff_matroska_audio_muxer = {
 .name = "matroska",
 .long_name = NULL_IF_CONFIG_SMALL("Matroska"),
@@ -1355,9 +1561,11 @@
 AV_CODEC_ID_VORBIS : AV_CODEC_ID_AC3,
 .video_codec = AV_CODEC_ID_NONE,
 .write_header = mkv_write_header,
- .write_packet = mkv_write_packet,
+ .write_packet = mkv_write_flush_packet,
 .write_trailer = mkv_write_trailer,
- .flags = AVFMT_GLOBALHEADER | AVFMT_TS_NONSTRICT,
+ .flags = AVFMT_GLOBALHEADER | AVFMT_TS_NONSTRICT |
+ AVFMT_ALLOW_FLUSH,
 .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },
+ .priv_class = &mka_class,
 };
 #endif

libav-v9.6.tar.bz2/libavformat/md5enc.c -> libav-v10.1.tar.bz2/libavformat/md5enc.c Changed

libav-v9.6.tar.bz2/libavformat/mm.c -> libav-v10.1.tar.bz2/libavformat/mm.c Changed

libav-v9.6.tar.bz2/libavformat/mmf.c -> libav-v10.1.tar.bz2/libavformat/mmf.c Changed

@@ -21,8 +21,8 @@
 
 #include "libavutil/channel_layout.h"
 #include "avformat.h"
-#include "internal.h"
 #include "avio_internal.h"
+#include "internal.h"
 #include "pcm.h"
 #include "riff.h"
 
@@ -35,7 +35,7 @@
 
 static int mmf_rate(int code)
 {
- if((code < 0) || (code > 4))
+ if ((code < 0) || (code > 4))
 return -1;
 return mmf_rates[code];
 }
@@ -44,8 +44,8 @@
 static int mmf_rate_code(int rate)
 {
 int i;
- for(i = 0; i < 5; i++)
- if(mmf_rates[i] == rate)
+ for (i = 0; i < 5; i++)
+ if (mmf_rates[i] == rate)
 return i;
 return -1;
 }
@@ -69,8 +69,9 @@
 int rate;
 
 rate = mmf_rate_code(s->streams[0]->codec->sample_rate);
- if(rate < 0) {
- av_log(s, AV_LOG_ERROR, "Unsupported sample rate %d\n", s->streams[0]->codec->sample_rate);
+ if (rate < 0) {
+ av_log(s, AV_LOG_ERROR, "Unsupported sample rate %d\n",
+ s->streams[0]->codec->sample_rate);
 return -1;
 }
 
@@ -82,6 +83,9 @@
 avio_w8(pb, 0); /* code type */
 avio_w8(pb, 0); /* status */
 avio_w8(pb, 0); /* counts */
+ end_tag_be(pb, pos);
+
+ pos = ff_start_tag(pb, "OPDA");
 avio_write(pb, "VN:libavcodec,", sizeof("VN:libavcodec,") -1); /* metadata ("ST:songtitle,VN:version,...") */
 end_tag_be(pb, pos);
 
@@ -120,7 +124,7 @@
 /* Write a variable-length symbol */
 static void put_varlength(AVIOContext *pb, int val)
 {
- if(val < 128)
+ if (val < 128)
 avio_w8(pb, val);
 else {
 val -= 128;
@@ -142,7 +146,7 @@
 end_tag_be(pb, mmf->atrpos);
 end_tag_be(pb, 8);
 
- pos = avio_tell(pb);
+ pos = avio_tell(pb);
 size = pos - mmf->awapos;
 
 /* Fill Atsq chunk */
@@ -197,11 +201,13 @@
 avio_skip(pb, 4); /* file_size */
 
 /* Skip some unused chunks that may or may not be present */
- for(;; avio_skip(pb, size)) {
- tag = avio_rl32(pb);
+ for (;; avio_skip(pb, size)) {
+ tag = avio_rl32(pb);
 size = avio_rb32(pb);
- if(tag == MKTAG('C','N','T','I')) continue;
- if(tag == MKTAG('O','P','D','A')) continue;
+ if (tag == MKTAG('C', 'N', 'T', 'I'))
+ continue;
+ if (tag == MKTAG('O', 'P', 'D', 'A'))
+ continue;
 break;
 }
 
@@ -218,8 +224,8 @@
 avio_r8(pb); /* format type */
 avio_r8(pb); /* sequence type */
 params = avio_r8(pb); /* (channel << 7) | (format << 4) | rate */
- rate = mmf_rate(params & 0x0f);
- if(rate < 0) {
+ rate = mmf_rate(params & 0x0f);
+ if (rate < 0) {
 av_log(s, AV_LOG_ERROR, "Invalid sample rate\n");
 return -1;
 }
@@ -228,11 +234,13 @@
 avio_r8(pb); /* time base g */
 
 /* Skip some unused chunks that may or may not be present */
- for(;; avio_skip(pb, size)) {
- tag = avio_rl32(pb);
+ for (;; avio_skip(pb, size)) {
+ tag = avio_rl32(pb);
 size = avio_rb32(pb);
- if(tag == MKTAG('A','t','s','q')) continue;
- if(tag == MKTAG('A','s','p','I')) continue;
+ if (tag == MKTAG('A', 't', 's', 'q'))
+ continue;
+ if (tag == MKTAG('A', 's', 'p', 'I'))
+ continue;
 break;
 }
 
@@ -247,13 +255,14 @@
 if (!st)
 return AVERROR(ENOMEM);
 
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_id = AV_CODEC_ID_ADPCM_YAMAHA;
- st->codec->sample_rate = rate;
- st->codec->channels = 1;
- st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codec->codec_id = AV_CODEC_ID_ADPCM_YAMAHA;
+ st->codec->sample_rate = rate;
+ st->codec->channels = 1;
+ st->codec->channel_layout = AV_CH_LAYOUT_MONO;
 st->codec->bits_per_coded_sample = 4;
- st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_coded_sample;
+ st->codec->bit_rate = st->codec->sample_rate *
+ st->codec->bits_per_coded_sample;
 
 avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
 
@@ -262,8 +271,7 @@
 
 #define MAX_SIZE 4096
 
-static int mmf_read_packet(AVFormatContext *s,
- AVPacket *pkt)
+static int mmf_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
 MMFContext *mmf = s->priv_data;
 int ret, size;
@@ -272,10 +280,10 @@
 return AVERROR(EIO);
 
 size = MAX_SIZE;
- if(size > mmf->data_size)
+ if (size > mmf->data_size)
 size = mmf->data_size;
 
- if(!size)
+ if (!size)
 return AVERROR(EIO);
 
 if (av_new_packet(pkt, size))
@@ -303,17 +311,18 @@
 .read_seek = ff_pcm_read_seek,
 };
 #endif
+
 #if CONFIG_MMF_MUXER
 AVOutputFormat ff_mmf_muxer = {
- .name = "mmf",
- .long_name = NULL_IF_CONFIG_SMALL("Yamaha SMAF"),
- .mime_type = "application/vnd.smaf",
- .extensions = "mmf",
- .priv_data_size = sizeof(MMFContext),
- .audio_codec = AV_CODEC_ID_ADPCM_YAMAHA,
- .video_codec = AV_CODEC_ID_NONE,
- .write_header = mmf_write_header,
- .write_packet = mmf_write_packet,
- .write_trailer = mmf_write_trailer,
+ .name = "mmf",
+ .long_name = NULL_IF_CONFIG_SMALL("Yamaha SMAF"),
+ .mime_type = "application/vnd.smaf",
+ .extensions = "mmf",
+ .priv_data_size = sizeof(MMFContext),
+ .audio_codec = AV_CODEC_ID_ADPCM_YAMAHA,
+ .video_codec = AV_CODEC_ID_NONE,
+ .write_header = mmf_write_header,
+ .write_packet = mmf_write_packet,
+ .write_trailer = mmf_write_trailer,
 };
 #endif

libav-v9.6.tar.bz2/libavformat/mms.c -> libav-v10.1.tar.bz2/libavformat/mms.c Changed

libav-v9.6.tar.bz2/libavformat/mmst.c -> libav-v10.1.tar.bz2/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 Libav.
@@ -331,16 +331,16 @@
 
 // if we successfully read everything.
 if(packet_id_type == mmst->header_packet_id) {
+ int err;
 packet_type = SC_PKT_ASF_HEADER;
 // Store the asf header
 if(!mms->header_parsed) {
- void *p = av_realloc(mms->asf_header,
- mms->asf_header_size + mms->remaining_in_len);
- if (!p) {
- av_freep(&mms->asf_header);
- return AVERROR(ENOMEM);
+ if ((err = av_reallocp(&mms->asf_header,
+ mms->asf_header_size +
+ mms->remaining_in_len)) < 0) {
+ mms->asf_header_size = 0;
+ return err;
 }
- mms->asf_header = p;
 memcpy(mms->asf_header + mms->asf_header_size,
 mms->read_in_ptr, mms->remaining_in_len);
 mms->asf_header_size += mms->remaining_in_len;

libav-v9.6.tar.bz2/libavformat/mov.c -> libav-v10.1.tar.bz2/libavformat/mov.c Changed

@@ -3,6 +3,9 @@
 * Copyright (c) 2001 Fabrice Bellard
 * Copyright (c) 2009 Baptiste Coudurier <baptiste dot coudurier at gmail dot com>
 *
+ * first version by Francois Revol <revol@free.fr>
+ * seek function by Gael Chardon <gael.dev@4now.net>
+ *
 * This file is part of Libav.
 *
 * Libav is free software; you can redistribute it and/or
@@ -21,8 +24,8 @@
 */
 
 #include <limits.h>
+#include <stdint.h>
 
-//#define DEBUG
 //#define MOV_EXPORT_ALL_METADATA
 
 #include "libavutil/attributes.h"
@@ -46,11 +49,6 @@
 #include <zlib.h>
 #endif
 
-/*
- * First version by Francois Revol revol@free.fr
- * Seek function by Gael Chardon gael.dev@4now.net
- */
-
 #include "qtpalette.h"
 
 
@@ -300,7 +298,7 @@
 if (parse)
 parse(c, pb, str_size, key);
 else {
- if (data_type == 3 || (data_type == 0 && langcode < 0x800)) { // MAC Encoded
+ 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);
@@ -716,9 +714,14 @@
 st = c->fc->streams[c->fc->nb_streams-1];
 sc = st->priv_data;
 
+ if (sc->time_scale) {
+ av_log(c->fc, AV_LOG_ERROR, "Multiple mdhd?\n");
+ return AVERROR_INVALIDDATA;
+ }
+
 version = avio_r8(pb);
 if (version > 1) {
- av_log_ask_for_sample(c->fc, "unsupported version %d\n", version);
+ avpriv_request_sample(c->fc, "Version %d", version);
 return AVERROR_PATCHWELCOME;
 }
 avio_rb24(pb); /* flags */
@@ -876,6 +879,7 @@
 AVStream *st;
 uint64_t size;
 uint8_t *buf;
+ int err;
 
 if (c->fc->nb_streams < 1) // will happen with jp2 files
 return 0;
@@ -883,11 +887,11 @@
 size= (uint64_t)st->codec->extradata_size + atom.size + 8 + FF_INPUT_BUFFER_PADDING_SIZE;
 if (size > INT_MAX || (uint64_t)atom.size > INT_MAX)
 return AVERROR_INVALIDDATA;
- buf= av_realloc(st->codec->extradata, size);
- if (!buf)
- return AVERROR(ENOMEM);
- st->codec->extradata= buf;
- buf+= st->codec->extradata_size;
+ if ((err = av_reallocp(&st->codec->extradata, size)) < 0) {
+ st->codec->extradata_size = 0;
+ return err;
+ }
+ buf = st->codec->extradata + st->codec->extradata_size;
 st->codec->extradata_size= size - FF_INPUT_BUFFER_PADDING_SIZE;
 AV_WB32( buf , atom.size + 8);
 AV_WL32( buf + 4, atom.type);
@@ -1067,321 +1071,290 @@
 return ff_get_pcm_codec_id(bps, flags & 1, flags & 2, flags & 4 ? -1 : 0);
 }
 
-int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
+static int mov_codec_id(AVStream *st, uint32_t format)
 {
- AVStream *st;
- MOVStreamContext *sc;
- int j, pseudo_stream_id;
-
- if (c->fc->nb_streams < 1)
- return 0;
- st = c->fc->streams[c->fc->nb_streams-1];
- sc = st->priv_data;
-
- for (pseudo_stream_id = 0;
- pseudo_stream_id < entries && !pb->eof_reached;
- pseudo_stream_id++) {
- //Parsing Sample description table
- enum AVCodecID id;
- int dref_id = 1;
- MOVAtom a = { AV_RL32("stsd") };
- int64_t start_pos = avio_tell(pb);
- uint32_t size = avio_rb32(pb); /* size */
- uint32_t format = avio_rl32(pb); /* data format */
+ int id = ff_codec_get_id(ff_codec_movaudio_tags, format);
 
- if (size >= 16) {
- avio_rb32(pb); /* reserved */
- avio_rb16(pb); /* reserved */
- dref_id = avio_rb16(pb);
- } else {
- av_log(c->fc, AV_LOG_ERROR, "invalid size %d in stsd\n", size);
- return AVERROR_INVALIDDATA;
- }
+ if (id <= 0 &&
+ ((format & 0xFFFF) == 'm' + ('s' << 8) ||
+ (format & 0xFFFF) == 'T' + ('S' << 8)))
+ id = ff_codec_get_id(ff_codec_wav_tags, av_bswap32(format) & 0xFFFF);
 
- if (st->codec->codec_tag &&
- st->codec->codec_tag != format &&
- (c->fc->video_codec_id ? ff_codec_get_id(ff_codec_movvideo_tags, format) != c->fc->video_codec_id
- : st->codec->codec_tag != MKTAG('j','p','e','g'))
- ){
- /* Multiple fourcc, we skip JPEG. This is not correct, we should
- * export it as a separate AVStream but this needs a few changes
- * in the MOV demuxer, patch welcome. */
- multiple_stsd:
- av_log(c->fc, AV_LOG_WARNING, "multiple fourcc not supported\n");
- avio_skip(pb, size - (avio_tell(pb) - start_pos));
- continue;
- }
- /* we cannot demux concatenated h264 streams because of different extradata */
- if (st->codec->codec_tag && st->codec->codec_tag == AV_RL32("avc1"))
- goto multiple_stsd;
- sc->pseudo_stream_id = st->codec->codec_tag ? -1 : pseudo_stream_id;
- sc->dref_id= dref_id;
-
- st->codec->codec_tag = format;
- id = ff_codec_get_id(ff_codec_movaudio_tags, format);
- if (id<=0 && ((format&0xFFFF) == 'm'+('s'<<8) || (format&0xFFFF) == 'T'+('S'<<8)))
- id = ff_codec_get_id(ff_codec_wav_tags, av_bswap32(format)&0xFFFF);
-
- if (st->codec->codec_type != AVMEDIA_TYPE_VIDEO && id > 0) {
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- } else if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO && /* do not overwrite codec type */
- format && format != MKTAG('m','p','4','s')) { /* skip old asf mpeg4 tag */
- id = ff_codec_get_id(ff_codec_movvideo_tags, format);
- if (id <= 0)
- id = ff_codec_get_id(ff_codec_bmp_tags, format);
+ if (st->codec->codec_type != AVMEDIA_TYPE_VIDEO && id > 0) {
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ } else if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO &&
+ /* skip old asf mpeg4 tag */
+ format && format != MKTAG('m','p','4','s')) {
+ id = ff_codec_get_id(ff_codec_movvideo_tags, format);
+ if (id <= 0)
+ id = ff_codec_get_id(ff_codec_bmp_tags, format);
+ if (id > 0)
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ else if (st->codec->codec_type == AVMEDIA_TYPE_DATA) {
+ id = ff_codec_get_id(ff_codec_movsubtitle_tags, format);
 if (id > 0)
- st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- else if (st->codec->codec_type == AVMEDIA_TYPE_DATA){
- id = ff_codec_get_id(ff_codec_movsubtitle_tags, format);
- if (id > 0)
- st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
- }
+ st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
 }
+ }
 
- av_dlog(c->fc, "size=%d 4CC= %c%c%c%c codec_type=%d\n", size,
- (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff,
- (format >> 24) & 0xff, st->codec->codec_type);
+ st->codec->codec_tag = format;
 
- if (st->codec->codec_type==AVMEDIA_TYPE_VIDEO) {
- unsigned int color_depth, len;
- int color_greyscale;
- int color_table_id;
+ return id;
+}
 
- st->codec->codec_id = id;
- avio_rb16(pb); /* version */
- avio_rb16(pb); /* revision level */
- avio_rb32(pb); /* vendor */
- avio_rb32(pb); /* temporal quality */
- avio_rb32(pb); /* spatial quality */
-
- st->codec->width = avio_rb16(pb); /* width */
- st->codec->height = avio_rb16(pb); /* height */
-
- avio_rb32(pb); /* horiz resolution */
- avio_rb32(pb); /* vert resolution */
- avio_rb32(pb); /* data size, always 0 */
- avio_rb16(pb); /* frames per samples */
-
- len = avio_r8(pb); /* codec name, pascal string */
- if (len > 31)
- len = 31;
- mov_read_mac_string(c, pb, len, st->codec->codec_name, 32);
- if (len < 31)
- avio_skip(pb, 31 - len);
- /* codec_tag YV12 triggers an UV swap in rawdec.c */
- if (!memcmp(st->codec->codec_name, "Planar Y'CbCr 8-bit 4:2:0", 25))
- st->codec->codec_tag=MKTAG('I', '4', '2', '0');
- /* Flash Media Server uses tag H263 with Sorenson Spark */
- if (format == MKTAG('H','2','6','3') &&
- !memcmp(st->codec->codec_name, "Sorenson H263", 13))
- st->codec->codec_id = AV_CODEC_ID_FLV1;
-
- st->codec->bits_per_coded_sample = avio_rb16(pb); /* depth */
- color_table_id = avio_rb16(pb); /* colortable id */
- av_dlog(c->fc, "depth %d, ctab id %d\n",
- st->codec->bits_per_coded_sample, color_table_id);
- /* figure out the palette situation */
- color_depth = st->codec->bits_per_coded_sample & 0x1F;
- color_greyscale = st->codec->bits_per_coded_sample & 0x20;
-
- /* if the depth is 2, 4, or 8 bpp, file is palettized */
- if ((color_depth == 2) || (color_depth == 4) ||
- (color_depth == 8)) {
- /* for palette traversal */
- unsigned int color_start, color_count, color_end;
- unsigned char r, g, b;
-
- if (color_greyscale) {
- int color_index, color_dec;
- /* compute the greyscale palette */
- st->codec->bits_per_coded_sample = color_depth;
- color_count = 1 << color_depth;
- color_index = 255;
- color_dec = 256 / (color_count - 1);
- for (j = 0; j < color_count; j++) {
- r = g = b = color_index;
- sc->palette[j] =
- (r << 16) | (g << 8) | (b);
- color_index -= color_dec;
- if (color_index < 0)
- color_index = 0;
- }
- } else if (color_table_id) {
- const uint8_t *color_table;
- /* if flag bit 3 is set, use the default palette */
- color_count = 1 << color_depth;
- if (color_depth == 2)
- color_table = ff_qt_default_palette_4;
- else if (color_depth == 4)
- color_table = ff_qt_default_palette_16;
- else
- color_table = ff_qt_default_palette_256;
-
- for (j = 0; j < color_count; j++) {
- r = color_table[j * 3 + 0];
- g = color_table[j * 3 + 1];
- b = color_table[j * 3 + 2];
- sc->palette[j] =
- (r << 16) | (g << 8) | (b);
- }
- } else {
- /* load the palette from the file */
- color_start = avio_rb32(pb);
- color_count = avio_rb16(pb);
- color_end = avio_rb16(pb);
- if ((color_start <= 255) &&
- (color_end <= 255)) {
- for (j = color_start; j <= color_end; j++) {
- /* each R, G, or B component is 16 bits;
- * only use the top 8 bits; skip alpha bytes
- * up front */
- avio_r8(pb);
- avio_r8(pb);
- r = avio_r8(pb);
- avio_r8(pb);
- g = avio_r8(pb);
- avio_r8(pb);
- b = avio_r8(pb);
- avio_r8(pb);
- sc->palette[j] =
- (r << 16) | (g << 8) | (b);
- }
- }
- }
- sc->has_palette = 1;
+static void mov_parse_stsd_video(MOVContext *c, AVIOContext *pb,
+ AVStream *st, MOVStreamContext *sc)
+{
+ unsigned int color_depth, len, j;
+ int color_greyscale;
+ int color_table_id;
+
+ avio_rb16(pb); /* version */
+ avio_rb16(pb); /* revision level */
+ avio_rb32(pb); /* vendor */
+ avio_rb32(pb); /* temporal quality */
+ avio_rb32(pb); /* spatial quality */
+
+ st->codec->width = avio_rb16(pb); /* width */
+ st->codec->height = avio_rb16(pb); /* height */
+
+ avio_rb32(pb); /* horiz resolution */
+ avio_rb32(pb); /* vert resolution */
+ avio_rb32(pb); /* data size, always 0 */
+ avio_rb16(pb); /* frames per samples */
+
+ len = avio_r8(pb); /* codec name, pascal string */
+ if (len > 31)
+ len = 31;
+ mov_read_mac_string(c, pb, len, st->codec->codec_name, 32);
+ if (len < 31)
+ avio_skip(pb, 31 - len);
+ /* codec_tag YV12 triggers an UV swap in rawdec.c */
+ if (!memcmp(st->codec->codec_name, "Planar Y'CbCr 8-bit 4:2:0", 25))
+ st->codec->codec_tag = MKTAG('I', '4', '2', '0');
+ /* Flash Media Server uses tag H263 with Sorenson Spark */
+ if (st->codec->codec_tag == MKTAG('H','2','6','3') &&
+ !memcmp(st->codec->codec_name, "Sorenson H263", 13))
+ st->codec->codec_id = AV_CODEC_ID_FLV1;
+
+ st->codec->bits_per_coded_sample = avio_rb16(pb); /* depth */
+ color_table_id = avio_rb16(pb); /* colortable id */
+ av_dlog(c->fc, "depth %d, ctab id %d\n",
+ st->codec->bits_per_coded_sample, color_table_id);
+ /* figure out the palette situation */
+ color_depth = st->codec->bits_per_coded_sample & 0x1F;
+ color_greyscale = st->codec->bits_per_coded_sample & 0x20;
+
+ /* if the depth is 2, 4, or 8 bpp, file is palettized */
+ if ((color_depth == 2) || (color_depth == 4) || (color_depth == 8)) {
+ /* for palette traversal */
+ unsigned int color_start, color_count, color_end;
+ unsigned char r, g, b;
+
+ if (color_greyscale) {
+ int color_index, color_dec;
+ /* compute the greyscale palette */
+ st->codec->bits_per_coded_sample = color_depth;
+ color_count = 1 << color_depth;
+ color_index = 255;
+ color_dec = 256 / (color_count - 1);
+ for (j = 0; j < color_count; j++) {
+ r = g = b = color_index;
+ sc->palette[j] = (r << 16) | (g << 8) | (b);
+ color_index -= color_dec;
+ if (color_index < 0)
+ color_index = 0;
 }
- } else if (st->codec->codec_type==AVMEDIA_TYPE_AUDIO) {
- int bits_per_sample, flags;
- uint16_t version = avio_rb16(pb);
-
- st->codec->codec_id = id;
- avio_rb16(pb); /* revision level */
- avio_rb32(pb); /* vendor */
+ } else if (color_table_id) {
+ const uint8_t *color_table;
+ /* if flag bit 3 is set, use the default palette */
+ color_count = 1 << color_depth;
+ if (color_depth == 2)
+ color_table = ff_qt_default_palette_4;
+ else if (color_depth == 4)
+ color_table = ff_qt_default_palette_16;
+ else
+ color_table = ff_qt_default_palette_256;
 
- st->codec->channels = avio_rb16(pb); /* channel count */
- av_dlog(c->fc, "audio channels %d\n", st->codec->channels);
- st->codec->bits_per_coded_sample = avio_rb16(pb); /* sample size */
-
- sc->audio_cid = avio_rb16(pb);
- avio_rb16(pb); /* packet size = 0 */
-
- st->codec->sample_rate = ((avio_rb32(pb) >> 16));
-
- //Read QT version 1 fields. In version 0 these do not exist.
- av_dlog(c->fc, "version =%d, isom =%d\n",version,c->isom);
- if (!c->isom) {
- if (version==1) {
- sc->samples_per_frame = avio_rb32(pb);
- avio_rb32(pb); /* bytes per packet */
- sc->bytes_per_frame = avio_rb32(pb);
- avio_rb32(pb); /* bytes per sample */
- } else if (version==2) {
- avio_rb32(pb); /* sizeof struct only */
- st->codec->sample_rate = av_int2double(avio_rb64(pb)); /* float 64 */
- st->codec->channels = avio_rb32(pb);
- avio_rb32(pb); /* always 0x7F000000 */
- st->codec->bits_per_coded_sample = avio_rb32(pb); /* bits per channel if sound is uncompressed */
- flags = avio_rb32(pb); /* lpcm format specific flag */
- sc->bytes_per_frame = avio_rb32(pb); /* bytes per audio packet if constant */
- sc->samples_per_frame = avio_rb32(pb); /* lpcm frames per audio packet if constant */
- if (format == MKTAG('l','p','c','m'))
- st->codec->codec_id = ff_mov_get_lpcm_codec_id(st->codec->bits_per_coded_sample, flags);
+ for (j = 0; j < color_count; j++) {
+ r = color_table[j * 3 + 0];
+ g = color_table[j * 3 + 1];
+ b = color_table[j * 3 + 2];
+ sc->palette[j] = (r << 16) | (g << 8) | (b);
+ }
+ } else {
+ /* load the palette from the file */
+ color_start = avio_rb32(pb);
+ color_count = avio_rb16(pb);
+ color_end = avio_rb16(pb);
+ if ((color_start <= 255) && (color_end <= 255)) {
+ for (j = color_start; j <= color_end; j++) {
+ /* each R, G, or B component is 16 bits;
+ * only use the top 8 bits; skip alpha bytes
+ * up front */
+ avio_r8(pb);
+ avio_r8(pb);
+ r = avio_r8(pb);
+ avio_r8(pb);
+ g = avio_r8(pb);
+ avio_r8(pb);
+ b = avio_r8(pb);
+ avio_r8(pb);
+ sc->palette[j] = (r << 16) | (g << 8) | (b);
 }
 }
+ }
+ sc->has_palette = 1;
+ }
+}
 
- switch (st->codec->codec_id) {
- case AV_CODEC_ID_PCM_S8:
- case AV_CODEC_ID_PCM_U8:
- if (st->codec->bits_per_coded_sample == 16)
- st->codec->codec_id = AV_CODEC_ID_PCM_S16BE;
- break;
- case AV_CODEC_ID_PCM_S16LE:
- case AV_CODEC_ID_PCM_S16BE:
- if (st->codec->bits_per_coded_sample == 8)
- st->codec->codec_id = AV_CODEC_ID_PCM_S8;
- else if (st->codec->bits_per_coded_sample == 24)
- st->codec->codec_id =
- st->codec->codec_id == AV_CODEC_ID_PCM_S16BE ?
- AV_CODEC_ID_PCM_S24BE : AV_CODEC_ID_PCM_S24LE;
- break;
- /* set values for old format before stsd version 1 appeared */
- case AV_CODEC_ID_MACE3:
- sc->samples_per_frame = 6;
- sc->bytes_per_frame = 2*st->codec->channels;
- break;
- case AV_CODEC_ID_MACE6:
- sc->samples_per_frame = 6;
- sc->bytes_per_frame = 1*st->codec->channels;
- break;
- case AV_CODEC_ID_ADPCM_IMA_QT:
- sc->samples_per_frame = 64;
- sc->bytes_per_frame = 34*st->codec->channels;
- break;
- case AV_CODEC_ID_GSM:
- sc->samples_per_frame = 160;
- sc->bytes_per_frame = 33;
- break;
- default:
- break;
- }
+static void mov_parse_stsd_audio(MOVContext *c, AVIOContext *pb,
+ AVStream *st, MOVStreamContext *sc)
+{
+ int bits_per_sample, flags;
+ uint16_t version = avio_rb16(pb);
 
- bits_per_sample = av_get_bits_per_sample(st->codec->codec_id);
- if (bits_per_sample) {
- st->codec->bits_per_coded_sample = bits_per_sample;
- sc->sample_size = (bits_per_sample >> 3) * st->codec->channels;
- }
- } else if (st->codec->codec_type==AVMEDIA_TYPE_SUBTITLE){
- // ttxt stsd contains display flags, justification, background
- // color, fonts, and default styles, so fake an atom to read it
- MOVAtom fake_atom = { .size = size - (avio_tell(pb) - start_pos) };
- if (format != AV_RL32("mp4s")) // mp4s contains a regular esds atom
- mov_read_glbl(c, pb, fake_atom);
- st->codec->codec_id= id;
- st->codec->width = sc->width;
- st->codec->height = sc->height;
- } else {
- /* other codec type, just skip (rtp, mp4s, tmcd ...) */
- avio_skip(pb, size - (avio_tell(pb) - start_pos));
+ avio_rb16(pb); /* revision level */
+ avio_rb32(pb); /* vendor */
+
+ st->codec->channels = avio_rb16(pb); /* channel count */
+ st->codec->bits_per_coded_sample = avio_rb16(pb); /* sample size */
+ av_dlog(c->fc, "audio channels %d\n", st->codec->channels);
+
+ sc->audio_cid = avio_rb16(pb);
+ avio_rb16(pb); /* packet size = 0 */
+
+ st->codec->sample_rate = ((avio_rb32(pb) >> 16));
+
+ // Read QT version 1 fields. In version 0 these do not exist.
+ av_dlog(c->fc, "version =%d, isom =%d\n", version, c->isom);
+ if (!c->isom) {
+ if (version == 1) {
+ sc->samples_per_frame = avio_rb32(pb);
+ avio_rb32(pb); /* bytes per packet */
+ sc->bytes_per_frame = avio_rb32(pb);
+ avio_rb32(pb); /* bytes per sample */
+ } else if (version == 2) {
+ avio_rb32(pb); /* sizeof struct only */
+ st->codec->sample_rate = av_int2double(avio_rb64(pb));
+ st->codec->channels = avio_rb32(pb);
+ avio_rb32(pb); /* always 0x7F000000 */
+ st->codec->bits_per_coded_sample = avio_rb32(pb);
+
+ flags = avio_rb32(pb); /* lpcm format specific flag */
+ sc->bytes_per_frame = avio_rb32(pb);
+ sc->samples_per_frame = avio_rb32(pb);
+ if (st->codec->codec_tag == MKTAG('l','p','c','m'))
+ st->codec->codec_id =
+ ff_mov_get_lpcm_codec_id(st->codec->bits_per_coded_sample,
+ flags);
 }
- /* this will read extra atoms at the end (wave, alac, damr, avcC, SMI ...) */
- a.size = size - (avio_tell(pb) - start_pos);
- if (a.size > 8) {
- int ret;
- if ((ret = mov_read_default(c, pb, a)) < 0)
- return ret;
- } else if (a.size > 0)
- avio_skip(pb, a.size);
 }
 
- if (pb->eof_reached)
- return AVERROR_EOF;
+ switch (st->codec->codec_id) {
+ case AV_CODEC_ID_PCM_S8:
+ case AV_CODEC_ID_PCM_U8:
+ if (st->codec->bits_per_coded_sample == 16)
+ st->codec->codec_id = AV_CODEC_ID_PCM_S16BE;
+ break;
+ case AV_CODEC_ID_PCM_S16LE:
+ case AV_CODEC_ID_PCM_S16BE:
+ if (st->codec->bits_per_coded_sample == 8)
+ st->codec->codec_id = AV_CODEC_ID_PCM_S8;
+ else if (st->codec->bits_per_coded_sample == 24)
+ st->codec->codec_id =
+ st->codec->codec_id == AV_CODEC_ID_PCM_S16BE ?
+ AV_CODEC_ID_PCM_S24BE : AV_CODEC_ID_PCM_S24LE;
+ break;
+ /* set values for old format before stsd version 1 appeared */
+ case AV_CODEC_ID_MACE3:
+ sc->samples_per_frame = 6;
+ sc->bytes_per_frame = 2 * st->codec->channels;
+ break;
+ case AV_CODEC_ID_MACE6:
+ sc->samples_per_frame = 6;
+ sc->bytes_per_frame = 1 * st->codec->channels;
+ break;
+ case AV_CODEC_ID_ADPCM_IMA_QT:
+ sc->samples_per_frame = 64;
+ sc->bytes_per_frame = 34 * st->codec->channels;
+ break;
+ case AV_CODEC_ID_GSM:
+ sc->samples_per_frame = 160;
+ sc->bytes_per_frame = 33;
+ break;
+ default:
+ break;
+ }
 
- if (st->codec->codec_type==AVMEDIA_TYPE_AUDIO && st->codec->sample_rate==0 && sc->time_scale>1)
- st->codec->sample_rate= sc->time_scale;
+ bits_per_sample = av_get_bits_per_sample(st->codec->codec_id);
+ if (bits_per_sample) {
+ st->codec->bits_per_coded_sample = bits_per_sample;
+ sc->sample_size = (bits_per_sample >> 3) * st->codec->channels;
+ }
+}
+
+static void mov_parse_stsd_subtitle(MOVContext *c, AVIOContext *pb,
+ AVStream *st, MOVStreamContext *sc,
+ int size)
+{
+ // ttxt stsd contains display flags, justification, background
+ // color, fonts, and default styles, so fake an atom to read it
+ MOVAtom fake_atom = { .size = size };
+ // mp4s contains a regular esds atom
+ if (st->codec->codec_tag != AV_RL32("mp4s"))
+ mov_read_glbl(c, pb, fake_atom);
+ st->codec->width = sc->width;
+ st->codec->height = sc->height;
+}
+
+static int mov_parse_stsd_data(MOVContext *c, AVIOContext *pb,
+ AVStream *st, MOVStreamContext *sc,
+ int size)
+{
+ if (st->codec->codec_tag == MKTAG('t','m','c','d')) {
+ st->codec->extradata_size = size;
+ st->codec->extradata = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!st->codec->extradata)
+ return AVERROR(ENOMEM);
+ avio_read(pb, st->codec->extradata, size);
+ } else {
+ /* other codec type, just skip (rtp, mp4s ...) */
+ avio_skip(pb, size);
+ }
+ return 0;
+}
+
+static int mov_finalize_stsd_codec(MOVContext *c, AVIOContext *pb,
+ AVStream *st, MOVStreamContext *sc)
+{
+ if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO &&
+ !st->codec->sample_rate && sc->time_scale > 1)
+ st->codec->sample_rate = sc->time_scale;
 
 /* special codec parameters handling */
 switch (st->codec->codec_id) {
 #if CONFIG_DV_DEMUXER
 case AV_CODEC_ID_DVAUDIO:
- c->dv_fctx = avformat_alloc_context();
+ c->dv_fctx = avformat_alloc_context();
 c->dv_demux = avpriv_dv_init_demux(c->dv_fctx);
 if (!c->dv_demux) {
 av_log(c->fc, AV_LOG_ERROR, "dv demux context init error\n");
 return AVERROR(ENOMEM);
 }
 sc->dv_audio_container = 1;
- st->codec->codec_id = AV_CODEC_ID_PCM_S16LE;
+ st->codec->codec_id = AV_CODEC_ID_PCM_S16LE;
 break;
 #endif
 /* no ifdef since parameters are always those */
 case AV_CODEC_ID_QCELP:
+ st->codec->channels = 1;
 // 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;
- st->codec->channels= 1; /* really needed */
 break;
 case AV_CODEC_ID_AMR_NB:
- st->codec->channels= 1; /* really needed */
+ st->codec->channels = 1;
 /* force sample rate for amr, stsd in 3gp does not store sample rate */
 st->codec->sample_rate = 8000;
 break;
@@ -1391,8 +1364,9 @@
 break;
 case AV_CODEC_ID_MP2:
 case AV_CODEC_ID_MP3:
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO; /* force type after stsd for m1a hdlr */
- st->need_parsing = AVSTREAM_PARSE_FULL;
+ /* force type after stsd for m1a hdlr */
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->need_parsing = AVSTREAM_PARSE_FULL;
 break;
 case AV_CODEC_ID_GSM:
 case AV_CODEC_ID_ADPCM_MS:
@@ -1402,8 +1376,8 @@
 break;
 case AV_CODEC_ID_ALAC:
 if (st->codec->extradata_size == 36) {
- st->codec->channels = AV_RB8 (st->codec->extradata+21);
- st->codec->sample_rate = AV_RB32(st->codec->extradata+32);
+ st->codec->channels = AV_RB8 (st->codec->extradata + 21);
+ st->codec->sample_rate = AV_RB32(st->codec->extradata + 32);
 }
 break;
 case AV_CODEC_ID_VC1:
@@ -1412,10 +1386,109 @@
 default:
 break;
 }
+ return 0;
+}
+
+static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb,
+ int codec_tag, int format,
+ int size)
+{
+ int video_codec_id = ff_codec_get_id(ff_codec_movvideo_tags, format);
+
+ if (codec_tag &&
+ (codec_tag == AV_RL32("avc1") ||
+ codec_tag == AV_RL32("hvc1") ||
+ codec_tag == AV_RL32("hev1") ||
+ (codec_tag != format &&
+ (c->fc->video_codec_id ? video_codec_id != c->fc->video_codec_id
+ : codec_tag != MKTAG('j','p','e','g'))))) {
+ /* Multiple fourcc, we skip JPEG. This is not correct, we should
+ * export it as a separate AVStream but this needs a few changes
+ * in the MOV demuxer, patch welcome. */
+
+ av_log(c->fc, AV_LOG_WARNING, "multiple fourcc not supported\n");
+ avio_skip(pb, size);
+ return 1;
+ }
 
 return 0;
 }
 
+int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
+{
+ AVStream *st;
+ MOVStreamContext *sc;
+ int pseudo_stream_id;
+
+ if (c->fc->nb_streams < 1)
+ return 0;
+ st = c->fc->streams[c->fc->nb_streams-1];
+ sc = st->priv_data;
+
+ for (pseudo_stream_id = 0;
+ pseudo_stream_id < entries && !pb->eof_reached;
+ pseudo_stream_id++) {
+ //Parsing Sample description table
+ enum AVCodecID id;
+ int ret, dref_id = 1;
+ MOVAtom a = { AV_RL32("stsd") };
+ int64_t start_pos = avio_tell(pb);
+ uint32_t size = avio_rb32(pb); /* size */
+ uint32_t format = avio_rl32(pb); /* data format */
+
+ if (size >= 16) {
+ avio_rb32(pb); /* reserved */
+ avio_rb16(pb); /* reserved */
+ dref_id = avio_rb16(pb);
+ } else {
+ av_log(c->fc, AV_LOG_ERROR, "invalid size %d in stsd\n", size);
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (mov_skip_multiple_stsd(c, pb, st->codec->codec_tag, format,
+ size - (avio_tell(pb) - start_pos)))
+ continue;
+
+ sc->pseudo_stream_id = st->codec->codec_tag ? -1 : pseudo_stream_id;
+ sc->dref_id= dref_id;
+
+ id = mov_codec_id(st, format);
+
+ av_dlog(c->fc, "size=%d 4CC= %c%c%c%c codec_type=%d\n", size,
+ (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff,
+ (format >> 24) & 0xff, st->codec->codec_type);
+
+ if (st->codec->codec_type==AVMEDIA_TYPE_VIDEO) {
+ st->codec->codec_id = id;
+ mov_parse_stsd_video(c, pb, st, sc);
+ } else if (st->codec->codec_type==AVMEDIA_TYPE_AUDIO) {
+ st->codec->codec_id = id;
+ mov_parse_stsd_audio(c, pb, st, sc);
+ } else if (st->codec->codec_type==AVMEDIA_TYPE_SUBTITLE){
+ st->codec->codec_id = id;
+ mov_parse_stsd_subtitle(c, pb, st, sc,
+ size - (avio_tell(pb) - start_pos));
+ } else {
+ ret = mov_parse_stsd_data(c, pb, st, sc,
+ size - (avio_tell(pb) - start_pos));
+ if (ret < 0)
+ return ret;
+ }
+ /* this will read extra atoms at the end (wave, alac, damr, avcC, hvcC, SMI ...) */
+ a.size = size - (avio_tell(pb) - start_pos);
+ if (a.size > 8) {
+ if ((ret = mov_read_default(c, pb, a)) < 0)
+ return ret;
+ } else if (a.size > 0)
+ avio_skip(pb, a.size);
+ }
+
+ if (pb->eof_reached)
+ return AVERROR_EOF;
+
+ return mov_finalize_stsd_codec(c, pb, st, sc);
+}
+
 static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 {
 int entries;
@@ -1644,6 +1717,7 @@
 if (entries >= UINT_MAX / sizeof(*sc->stts_data))
 return AVERROR(EINVAL);
 
+ av_free(sc->stts_data);
 sc->stts_data = av_malloc(entries * sizeof(*sc->stts_data));
 if (!sc->stts_data)
 return AVERROR(ENOMEM);
@@ -1654,6 +1728,10 @@
 
 sample_count=avio_rb32(pb);
 sample_duration = avio_rb32(pb);
+ if (sample_count < 0) {
+ av_log(c->fc, AV_LOG_ERROR, "Invalid sample_count=%d\n", sample_count);
+ return AVERROR_INVALIDDATA;
+ }
 sc->stts_data[i].count= sample_count;
 sc->stts_data[i].duration= sample_duration;
 
@@ -1772,7 +1850,6 @@
 unsigned int stps_index = 0;
 unsigned int i, j;
 uint64_t stream_size = 0;
- AVIndexEntry *mem;
 
 /* adjust first dts according to edit list */
 if (sc->time_offset && mov->time_scale > 0) {
@@ -1806,10 +1883,12 @@
 return;
 if (sc->sample_count >= UINT_MAX / sizeof(*st->index_entries) - st->nb_index_entries)
 return;
- mem = av_realloc(st->index_entries, (st->nb_index_entries + sc->sample_count) * sizeof(*st->index_entries));
- if (!mem)
+ if (av_reallocp_array(&st->index_entries,
+ st->nb_index_entries + sc->sample_count,
+ sizeof(*st->index_entries)) < 0) {
+ st->nb_index_entries = 0;
 return;
- st->index_entries = mem;
+ }
 st->index_entries_allocated_size = (st->nb_index_entries + sc->sample_count) * sizeof(*st->index_entries);
 
 for (i = 0; i < sc->chunk_count; i++) {
@@ -1904,10 +1983,12 @@
 av_dlog(mov->fc, "chunk count %d\n", total);
 if (total >= UINT_MAX / sizeof(*st->index_entries) - st->nb_index_entries)
 return;
- mem = av_realloc(st->index_entries, (st->nb_index_entries + total) * sizeof(*st->index_entries));
- if (!mem)
+ if (av_reallocp_array(&st->index_entries,
+ st->nb_index_entries + total,
+ sizeof(*st->index_entries)) < 0) {
+ st->nb_index_entries = 0;
 return;
- st->index_entries = mem;
+ }
 st->index_entries_allocated_size = (st->nb_index_entries + total) * sizeof(*st->index_entries);
 
 // populate index
@@ -2057,16 +2138,14 @@
 st->sample_aspect_ratio = av_d2q(((double)st->codec->height * sc->width) /
 ((double)st->codec->width * sc->height), INT_MAX);
 }
+ }
 
- if (st->duration != AV_NOPTS_VALUE)
- 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,
- sc->time_scale, sc->stts_data[0].duration, INT_MAX);
-#endif
+ // done for ai5q, ai52, ai55, ai1q, ai12 and ai15.
+ if (!st->codec->extradata_size && st->codec->codec_id == AV_CODEC_ID_H264 &&
+ TAG_IS_AVCI(st->codec->codec_tag)) {
+ ret = ff_generate_avci_extradata(st);
+ if (ret < 0)
+ return ret;
 }
 
 switch (st->codec->codec_id) {
@@ -2129,6 +2208,7 @@
 AVStream *st;
 MOVStreamContext *sc;
 int version;
+ int flags;
 
 if (c->fc->nb_streams < 1)
 return 0;
@@ -2136,13 +2216,8 @@
 sc = st->priv_data;
 
 version = avio_r8(pb);
- avio_rb24(pb); /* flags */
- /*
- MOV_TRACK_ENABLED 0x0001
- MOV_TRACK_IN_MOVIE 0x0002
- MOV_TRACK_IN_PREVIEW 0x0004
- MOV_TRACK_IN_POSTER 0x0008
- */
+ flags = avio_rb24(pb);
+ st->disposition |= (flags & MOV_TKHD_FLAG_ENABLED) ? AV_DISPOSITION_DEFAULT : 0;
 
 if (version == 1) {
 avio_rb64(pb);
@@ -2248,13 +2323,15 @@
 static int mov_read_trex(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 {
 MOVTrackExt *trex;
+ int err;
 
 if ((uint64_t)c->trex_count+1 >= UINT_MAX / sizeof(*c->trex_data))
 return AVERROR_INVALIDDATA;
- trex = av_realloc(c->trex_data, (c->trex_count+1)*sizeof(*c->trex_data));
- if (!trex)
- return AVERROR(ENOMEM);
- c->trex_data = trex;
+ if ((err = av_reallocp_array(&c->trex_data, c->trex_count + 1,
+ sizeof(*c->trex_data))) < 0) {
+ c->trex_count = 0;
+ return err;
+ }
 trex = &c->trex_data[c->trex_count++];
 avio_r8(pb); /* version */
 avio_rb24(pb); /* flags */
@@ -2276,7 +2353,7 @@
 int64_t dts;
 int data_offset = 0;
 unsigned entries, first_sample_flags = frag->flags;
- int flags, distance, i, found_keyframe = 0;
+ int flags, distance, i, found_keyframe = 0, err;
 
 for (i = 0; i < c->fc->nb_streams; i++) {
 if (c->fc->streams[i]->id == frag->track_id) {
@@ -2304,7 +2381,7 @@
 if (!sc->ctts_count && sc->sample_count)
 {
 /* Complement ctts table if moov atom doesn't have ctts atom. */
- ctts_data = av_malloc(sizeof(*sc->ctts_data));
+ ctts_data = av_realloc(NULL, sizeof(*sc->ctts_data));
 if (!ctts_data)
 return AVERROR(ENOMEM);
 sc->ctts_data = ctts_data;
@@ -2314,12 +2391,11 @@
 }
 if ((uint64_t)entries+sc->ctts_count >= UINT_MAX/sizeof(*sc->ctts_data))
 return AVERROR_INVALIDDATA;
- ctts_data = av_realloc(sc->ctts_data,
- (entries+sc->ctts_count)*sizeof(*sc->ctts_data));
- if (!ctts_data)
- return AVERROR(ENOMEM);
- sc->ctts_data = ctts_data;
-
+ if ((err = av_reallocp_array(&sc->ctts_data, entries + sc->ctts_count,
+ sizeof(*sc->ctts_data))) < 0) {
+ sc->ctts_count = 0;
+ return err;
+ }
 if (flags & MOV_TRUN_DATA_OFFSET) data_offset = avio_rb32(pb);
 if (flags & MOV_TRUN_FIRST_SAMPLE_FLAGS) first_sample_flags = avio_rb32(pb);
 dts = sc->track_end - sc->time_offset;
@@ -2536,6 +2612,7 @@
 { MKTAG('c','h','a','n'), mov_read_chan }, /* channel layout */
 { MKTAG('d','v','c','1'), mov_read_dvc1 },
 { MKTAG('s','b','g','p'), mov_read_sbgp },
+{ MKTAG('h','v','c','C'), mov_read_glbl },
 { 0, NULL }
 };
 
@@ -2601,6 +2678,12 @@
 left = a.size - avio_tell(pb) + start_pos;
 if (left > 0) /* skip garbage at atom end */
 avio_skip(pb, left);
+ else if (left < 0) {
+ av_log(c->fc, AV_LOG_WARNING,
+ "overread end of atom '%.4s' by %"PRId64" bytes\n",
+ (char*)&a.type, -left);
+ avio_seek(pb, left, SEEK_CUR);
+ }
 }
 
 total_size += a.size;
@@ -2647,7 +2730,7 @@
 case MKTAG('p','r','f','l'):
 offset = AV_RB32(p->buf+offset) + offset;
 /* if we only find those cause probedata is too small at least rate them */
- score = AVPROBE_SCORE_MAX - 50;
+ score = AVPROBE_SCORE_EXTENSION;
 break;
 default:
 /* unrecognized tag */
@@ -2743,6 +2826,14 @@
 av_freep(&sc->drefs);
 if (sc->pb && sc->pb != s->pb)
 avio_close(sc->pb);
+
+ av_freep(&sc->chunk_offsets);
+ 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) {
@@ -2794,7 +2885,7 @@
 for (i = 0; i < s->nb_streams; i++) {
 AVStream *st = s->streams[i];
 MOVStreamContext *sc = st->priv_data;
- if (st->duration)
+ if (st->duration > 0)
 st->codec->bit_rate = sc->data_size * 8 * sc->time_scale / st->duration;
 }
 }

libav-v9.6.tar.bz2/libavformat/movenc.c -> libav-v10.1.tar.bz2/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"
 
@@ -51,6 +54,8 @@
 { "separate_moof", "Write separate moof/mdat atoms for each track", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_SEPARATE_MOOF}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },
 { "frag_custom", "Flush fragments on caller requests", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_FRAG_CUSTOM}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },
 { "isml", "Create a live smooth streaming feed (for pushing to a publishing point)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_ISML}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },
+ { "faststart", "Run a second pass to put the index (moov atom) at the beginning of the file", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_FASTSTART}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },
+ { "omit_tfhd_offset", "Omit the base data offset in tfhd atoms", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_OMIT_TFHD_OFFSET}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },
 FF_RTP_FLAG_OPTS(MOVMuxContext, rtp_flags),
 { "skip_iods", "Skip writing iods atom.", offsetof(MOVMuxContext, iods_skip), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
 { "iods_audio_profile", "iods audio profile atom.", offsetof(MOVMuxContext, iods_audio_profile), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 255, AV_OPT_FLAG_ENCODING_PARAM},
@@ -59,6 +64,7 @@
 { "min_frag_duration", "Minimum fragment duration", offsetof(MOVMuxContext, min_fragment_duration), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM},
 { "frag_size", "Maximum fragment size", offsetof(MOVMuxContext, max_fragment_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM},
 { "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},
+ { "brand", "Override major brand", offsetof(MOVMuxContext, major_brand), AV_OPT_TYPE_STRING, {.str = NULL}, .flags = AV_OPT_FLAG_ENCODING_PARAM },
 { NULL },
 };
 
@@ -81,22 +87,28 @@
 return curpos - pos;
 }
 
+static int co64_required(const MOVTrack *track)
+{
+ if (track->entry > 0 && track->cluster[track->entry - 1].pos + track->data_offset > UINT32_MAX)
+ return 1;
+ return 0;
+}
+
 /* Chunk offset atom */
 static int mov_write_stco_tag(AVIOContext *pb, MOVTrack *track)
 {
 int i;
- int mode64 = 0; // use 32 bit size variant if possible
+ int mode64 = co64_required(track); // use 32 bit size variant if possible
 int64_t pos = avio_tell(pb);
 avio_wb32(pb, 0); /* size */
- if (pos > UINT32_MAX) {
- mode64 = 1;
+ if (mode64) {
 ffio_wfourcc(pb, "co64");
 } else
 ffio_wfourcc(pb, "stco");
 avio_wb32(pb, 0); /* version & flags */
 avio_wb32(pb, track->entry); /* entry count */
- for (i=0; i<track->entry; i++) {
- if(mode64 == 1)
+ for (i = 0; i < track->entry; i++) {
+ if (mode64 == 1)
 avio_wb64(pb, track->cluster[i].pos + track->data_offset);
 else
 avio_wb32(pb, track->cluster[i].pos + track->data_offset);
@@ -115,27 +127,25 @@
 ffio_wfourcc(pb, "stsz");
 avio_wb32(pb, 0); /* version & flags */
 
- for (i=0; i<track->entry; i++) {
- tst = track->cluster[i].size/track->cluster[i].entries;
- if(oldtst != -1 && tst != oldtst) {
+ for (i = 0; i < track->entry; i++) {
+ tst = track->cluster[i].size / track->cluster[i].entries;
+ if (oldtst != -1 && tst != oldtst)
 equalChunks = 0;
- }
 oldtst = tst;
 entries += track->cluster[i].entries;
 }
 if (equalChunks && track->entry) {
- int sSize = track->entry ? track->cluster[0].size/track->cluster[0].entries : 0;
+ int sSize = track->entry ? track->cluster[0].size / track->cluster[0].entries : 0;
 sSize = FFMAX(1, sSize); // adpcm mono case could make sSize == 0
 avio_wb32(pb, sSize); // sample size
 avio_wb32(pb, entries); // sample count
- }
- else {
+ } else {
 avio_wb32(pb, 0); // sample size
 avio_wb32(pb, entries); // sample count
- for (i=0; i<track->entry; i++) {
- for (j=0; j<track->cluster[i].entries; j++) {
+ for (i = 0; i < track->entry; i++) {
+ for (j = 0; j < track->cluster[i].entries; j++) {
 avio_wb32(pb, track->cluster[i].size /
- track->cluster[i].entries);
+ track->cluster[i].entries);
 }
 }
 }
@@ -154,10 +164,9 @@
 avio_wb32(pb, 0); // version & flags
 entryPos = avio_tell(pb);
 avio_wb32(pb, track->entry); // entry count
- for (i=0; i<track->entry; i++) {
- if (oldval != track->cluster[i].samples_in_chunk)
- {
- avio_wb32(pb, i+1); // first chunk
+ for (i = 0; i < track->entry; i++) {
+ if (oldval != track->cluster[i].samples_in_chunk) {
+ avio_wb32(pb, i + 1); // first chunk
 avio_wb32(pb, track->cluster[i].samples_in_chunk); // samples per chunk
 avio_wb32(pb, 0x1); // sample description index
 oldval = track->cluster[i].samples_in_chunk;
@@ -183,9 +192,9 @@
 avio_wb32(pb, 0); // version & flags
 entryPos = avio_tell(pb);
 avio_wb32(pb, track->entry); // entry count
- for (i=0; i<track->entry; i++) {
+ for (i = 0; i < track->entry; i++) {
 if (track->cluster[i].flags & flag) {
- avio_wb32(pb, i+1);
+ avio_wb32(pb, i + 1);
 index++;
 }
 }
@@ -245,7 +254,7 @@
 put_bits(&pbc, 3, bsmod);
 put_bits(&pbc, 3, acmod);
 put_bits(&pbc, 1, lfeon);
- put_bits(&pbc, 5, frmsizecod>>1); // bit_rate_code
+ put_bits(&pbc, 5, frmsizecod >> 1); // bit_rate_code
 put_bits(&pbc, 5, 0); // reserved
 
 flush_put_bits(&pbc);
@@ -268,8 +277,8 @@
 {
 int i = 3;
 avio_w8(pb, tag);
- for(; i>0; i--)
- avio_w8(pb, (size>>(7*i)) | 0x80);
+ for (; i > 0; i--)
+ avio_w8(pb, (size >> (7 * i)) | 0x80);
 avio_w8(pb, size & 0x7F);
 }
 
@@ -300,16 +309,16 @@
 
 // the following fields is made of 6 bits to identify the streamtype (4 for video, 5 for audio)
 // plus 1 bit to indicate upstream and 1 bit set to 1 (reserved)
- if(track->enc->codec_type == AVMEDIA_TYPE_AUDIO)
+ if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO)
 avio_w8(pb, 0x15); // flags (= Audiostream)
 else
 avio_w8(pb, 0x11); // flags (= Visualstream)
 
- avio_w8(pb, track->enc->rc_buffer_size>>(3+16)); // Buffersize DB (24 bits)
- avio_wb16(pb, (track->enc->rc_buffer_size>>3)&0xFFFF); // Buffersize DB
+ avio_wb24(pb, track->enc->rc_buffer_size >> 3); // Buffersize DB
 
 avio_wb32(pb, FFMAX(track->enc->bit_rate, track->enc->rc_max_rate)); // maxbitrate (FIXME should be max rate in any 1 sec window)
- if(track->enc->rc_max_rate != track->enc->rc_min_rate || track->enc->rc_min_rate==0)
+ if (track->enc->rc_max_rate != track->enc->rc_min_rate ||
+ track->enc->rc_min_rate == 0)
 avio_wb32(pb, 0); // vbr
 else
 avio_wb32(pb, track->enc->rc_max_rate); // avg bitrate
@@ -616,21 +625,21 @@
 avio_wb16(pb, 0); /* Reserved */
 }
 
- if(track->mode == MODE_MOV &&
- (track->enc->codec_id == AV_CODEC_ID_AAC ||
- track->enc->codec_id == AV_CODEC_ID_AC3 ||
- track->enc->codec_id == AV_CODEC_ID_AMR_NB ||
- track->enc->codec_id == AV_CODEC_ID_ALAC ||
- track->enc->codec_id == AV_CODEC_ID_ADPCM_MS ||
- track->enc->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV))
+ if (track->mode == MODE_MOV &&
+ (track->enc->codec_id == AV_CODEC_ID_AAC ||
+ track->enc->codec_id == AV_CODEC_ID_AC3 ||
+ track->enc->codec_id == AV_CODEC_ID_AMR_NB ||
+ track->enc->codec_id == AV_CODEC_ID_ALAC ||
+ track->enc->codec_id == AV_CODEC_ID_ADPCM_MS ||
+ track->enc->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV))
 mov_write_wave_tag(pb, track);
- else if(track->tag == MKTAG('m','p','4','a'))
+ else if (track->tag == MKTAG('m','p','4','a'))
 mov_write_esds_tag(pb, track);
- else if(track->enc->codec_id == AV_CODEC_ID_AMR_NB)
+ else if (track->enc->codec_id == AV_CODEC_ID_AMR_NB)
 mov_write_amr_tag(pb, track);
- else if(track->enc->codec_id == AV_CODEC_ID_AC3)
+ else if (track->enc->codec_id == AV_CODEC_ID_AC3)
 mov_write_ac3_tag(pb, track);
- else if(track->enc->codec_id == AV_CODEC_ID_ALAC)
+ else if (track->enc->codec_id == AV_CODEC_ID_ALAC)
 mov_write_extradata_tag(pb, track);
 else if (track->enc->codec_id == AV_CODEC_ID_WMAPRO)
 mov_write_wfex_tag(pb, track);
@@ -678,6 +687,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)
 {
@@ -704,7 +723,7 @@
 avio_wb32(pb, track->enc->width);
 /* values below are based on samples created with quicktime and avid codecs */
 if (track->vos_data[5] & 2) { // interlaced
- avio_wb32(pb, track->enc->height/2);
+ avio_wb32(pb, track->enc->height / 2);
 avio_wb32(pb, 2); /* unknown */
 avio_wb32(pb, 0); /* unknown */
 avio_wb32(pb, 4); /* unknown */
@@ -734,22 +753,23 @@
 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');
 else if (track->enc->codec_id == AV_CODEC_ID_VC1) tag = MKTAG('v','c','-','1');
- else if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO) tag = MKTAG('m','p','4','v');
- else if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO) tag = MKTAG('m','p','4','a');
+ else if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO) tag = MKTAG('m','p','4','v');
+ else if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO) tag = MKTAG('m','p','4','a');
 
 return tag;
 }
 
 static const AVCodecTag codec_ipod_tags[] = {
- { AV_CODEC_ID_H264, MKTAG('a','v','c','1') },
- { AV_CODEC_ID_MPEG4, MKTAG('m','p','4','v') },
- { AV_CODEC_ID_AAC, MKTAG('m','p','4','a') },
- { AV_CODEC_ID_ALAC, MKTAG('a','l','a','c') },
- { AV_CODEC_ID_AC3, MKTAG('a','c','-','3') },
+ { AV_CODEC_ID_H264, MKTAG('a','v','c','1') },
+ { AV_CODEC_ID_MPEG4, MKTAG('m','p','4','v') },
+ { AV_CODEC_ID_AAC, MKTAG('m','p','4','a') },
+ { AV_CODEC_ID_ALAC, MKTAG('a','l','a','c') },
+ { AV_CODEC_ID_AC3, MKTAG('a','c','-','3') },
 { AV_CODEC_ID_MOV_TEXT, MKTAG('t','x','3','g') },
 { AV_CODEC_ID_MOV_TEXT, MKTAG('t','e','x','t') },
 { AV_CODEC_ID_NONE, 0 },
@@ -761,8 +781,8 @@
 
 // keep original tag for subs, ipod supports both formats
 if (!(track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE &&
- (tag == MKTAG('t','x','3','g') ||
- tag == MKTAG('t','e','x','t'))))
+ (tag == MKTAG('t', 'x', '3', 'g') ||
+ tag == MKTAG('t', 'e', 'x', 't'))))
 tag = ff_codec_get_tag(codec_ipod_tags, track->enc->codec_id);
 
 if (!av_match_ext(s->filename, "m4a") && !av_match_ext(s->filename, "m4v"))
@@ -779,16 +799,16 @@
 if (track->enc->width == 720) /* SD */
 if (track->enc->height == 480) /* NTSC */
 if (track->enc->pix_fmt == AV_PIX_FMT_YUV422P) tag = MKTAG('d','v','5','n');
- else tag = MKTAG('d','v','c',' ');
+ else tag = MKTAG('d','v','c',' ');
 else if (track->enc->pix_fmt == AV_PIX_FMT_YUV422P) tag = MKTAG('d','v','5','p');
 else if (track->enc->pix_fmt == AV_PIX_FMT_YUV420P) tag = MKTAG('d','v','c','p');
- else tag = MKTAG('d','v','p','p');
+ else tag = MKTAG('d','v','p','p');
 else if (track->enc->height == 720) /* HD 720 line */
- if (track->enc->time_base.den == 50) tag = MKTAG('d','v','h','q');
- else tag = MKTAG('d','v','h','p');
+ if (track->enc->time_base.den == 50) tag = MKTAG('d','v','h','q');
+ else tag = MKTAG('d','v','h','p');
 else if (track->enc->height == 1080) /* HD 1080 line */
- if (track->enc->time_base.den == 25) tag = MKTAG('d','v','h','5');
- else tag = MKTAG('d','v','h','6');
+ if (track->enc->time_base.den == 25) tag = MKTAG('d','v','h','5');
+ else tag = MKTAG('d','v','h','6');
 else {
 av_log(s, AV_LOG_ERROR, "unsupported height for dv codec\n");
 return 0;
@@ -873,16 +893,25 @@
 }
 
 static const AVCodecTag codec_3gp_tags[] = {
- { AV_CODEC_ID_H263, MKTAG('s','2','6','3') },
- { AV_CODEC_ID_H264, MKTAG('a','v','c','1') },
- { AV_CODEC_ID_MPEG4, MKTAG('m','p','4','v') },
- { AV_CODEC_ID_AAC, MKTAG('m','p','4','a') },
- { AV_CODEC_ID_AMR_NB, MKTAG('s','a','m','r') },
- { AV_CODEC_ID_AMR_WB, MKTAG('s','a','w','b') },
+ { AV_CODEC_ID_H263, MKTAG('s','2','6','3') },
+ { AV_CODEC_ID_H264, MKTAG('a','v','c','1') },
+ { AV_CODEC_ID_MPEG4, MKTAG('m','p','4','v') },
+ { AV_CODEC_ID_AAC, MKTAG('m','p','4','a') },
+ { AV_CODEC_ID_AMR_NB, MKTAG('s','a','m','r') },
+ { AV_CODEC_ID_AMR_WB, MKTAG('s','a','w','b') },
 { AV_CODEC_ID_MOV_TEXT, MKTAG('t','x','3','g') },
 { AV_CODEC_ID_NONE, 0 },
 };
 
+static const AVCodecTag codec_f4v_tags[] = {
+ { AV_CODEC_ID_MP3, MKTAG('.','m','p','3') },
+ { AV_CODEC_ID_AAC, MKTAG('m','p','4','a') },
+ { AV_CODEC_ID_H264, MKTAG('a','v','c','1') },
+ { AV_CODEC_ID_VP6A, MKTAG('V','P','6','A') },
+ { AV_CODEC_ID_VP6F, MKTAG('V','P','6','F') },
+ { AV_CODEC_ID_NONE, 0 },
+};
+
 static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track)
 {
 int tag;
@@ -897,6 +926,8 @@
 tag = ipod_get_codec_tag(s, track);
 else if (track->mode & MODE_3GP)
 tag = ff_codec_get_tag(codec_3gp_tags, track->enc->codec_id);
+ else if (track->mode == MODE_F4V)
+ tag = ff_codec_get_tag(codec_f4v_tags, track->enc->codec_id);
 else
 tag = mov_get_codec_tag(s, track);
 
@@ -979,7 +1010,7 @@
 avio_wb16(pb, 0); /* Codec stream revision (=0) */
 if (track->mode == MODE_MOV) {
 ffio_wfourcc(pb, "FFMP"); /* Vendor */
- if(track->enc->codec_id == AV_CODEC_ID_RAWVIDEO) {
+ if (track->enc->codec_id == AV_CODEC_ID_RAWVIDEO) {
 avio_wb32(pb, 0); /* Temporal Quality */
 avio_wb32(pb, 0x400); /* Spatial Quality = lossless*/
 } else {
@@ -1000,7 +1031,7 @@
 
 /* FIXME not sure, ISO 14496-1 draft where it shall be set to 0 */
 if (track->mode == MODE_MOV && track->enc->codec && track->enc->codec->name)
- av_strlcpy(compressor_name,track->enc->codec->name,32);
+ av_strlcpy(compressor_name, track->enc->codec->name, 32);
 avio_w8(pb, strlen(compressor_name));
 avio_write(pb, compressor_name, 31);
 
@@ -1009,23 +1040,29 @@
 else
 avio_wb16(pb, 0x18); /* Reserved */
 avio_wb16(pb, 0xffff); /* Reserved */
- if(track->tag == MKTAG('m','p','4','v'))
+ if (track->tag == MKTAG('m','p','4','v'))
 mov_write_esds_tag(pb, track);
- else if(track->enc->codec_id == AV_CODEC_ID_H263)
+ else if (track->enc->codec_id == AV_CODEC_ID_H263)
 mov_write_d263_tag(pb);
- else if(track->enc->codec_id == AV_CODEC_ID_SVQ3)
+ else if (track->enc->codec_id == AV_CODEC_ID_SVQ3)
 mov_write_svq3_tag(pb);
- else if(track->enc->codec_id == AV_CODEC_ID_DNXHD)
+ 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_H264) {
+ 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)
+ if (track->mode == MODE_IPOD)
 mov_write_uuid_tag_ipod(pb);
 } else if (track->enc->field_order != AV_FIELD_UNKNOWN)
 mov_write_fiel_tag(pb, track);
 else if (track->enc->codec_id == AV_CODEC_ID_VC1 && track->vos_len > 0)
 mov_write_dvc1_tag(pb, track);
- else if (track->vos_len > 0)
+ else if (track->enc->codec_id == AV_CODEC_ID_VP6F ||
+ track->enc->codec_id == AV_CODEC_ID_VP6A) {
+ /* Don't write any potential extradata here - the cropping
+ * is signalled via the normal width/height fields. */
+ } else if (track->vos_len > 0)
 mov_write_glbl_tag(pb, track);
 
 if (track->enc->sample_aspect_ratio.den && track->enc->sample_aspect_ratio.num &&
@@ -1056,6 +1093,19 @@
 return update_size(pb, pos);
 }
 
+static int mov_write_tmcd_tag(AVIOContext *pb, MOVTrack *track)
+{
+ int64_t pos = avio_tell(pb);
+
+ avio_wb32(pb, 0); /* size */
+ ffio_wfourcc(pb, "tmcd"); /* Data format */
+ avio_wb32(pb, 0); /* Reserved */
+ avio_wb32(pb, 1); /* Data reference index */
+ if (track->enc->extradata_size)
+ avio_write(pb, track->enc->extradata, track->enc->extradata_size);
+ return update_size(pb, pos);
+}
+
 static int mov_write_stsd_tag(AVIOContext *pb, MOVTrack *track)
 {
 int64_t pos = avio_tell(pb);
@@ -1071,6 +1121,8 @@
 mov_write_subtitle_tag(pb, track);
 else if (track->enc->codec_tag == MKTAG('r','t','p',' '))
 mov_write_rtp_tag(pb, track);
+ else if (track->enc->codec_tag == MKTAG('t','m','c','d'))
+ mov_write_tmcd_tag(pb, track);
 return update_size(pb, pos);
 }
 
@@ -1084,7 +1136,7 @@
 ctts_entries = av_malloc((track->entry + 1) * sizeof(*ctts_entries)); /* worst case */
 ctts_entries[0].count = 1;
 ctts_entries[0].duration = track->cluster[0].cts;
- for (i=1; i<track->entry; i++) {
+ for (i = 1; i < track->entry; i++) {
 if (track->cluster[i].cts == ctts_entries[entries].duration) {
 ctts_entries[entries].count++; /* compress */
 } else {
@@ -1099,7 +1151,7 @@
 ffio_wfourcc(pb, "ctts");
 avio_wb32(pb, 0); /* version & flags */
 avio_wb32(pb, entries); /* entry count */
- for (i=0; i<entries; i++) {
+ for (i = 0; i < entries; i++) {
 avio_wb32(pb, ctts_entries[i].count);
 avio_wb32(pb, ctts_entries[i].duration);
 }
@@ -1124,7 +1176,7 @@
 stts_entries = track->entry ?
 av_malloc(track->entry * sizeof(*stts_entries)) : /* worst case */
 NULL;
- for (i=0; i<track->entry; i++) {
+ for (i = 0; i < track->entry; i++) {
 int duration = get_cluster_duration(track, i);
 if (i && duration == stts_entries[entries].duration) {
 stts_entries[entries].count++; /* compress */
@@ -1141,7 +1193,7 @@
 ffio_wfourcc(pb, "stts");
 avio_wb32(pb, 0); /* version & flags */
 avio_wb32(pb, entries); /* entry count */
- for (i=0; i<entries; i++) {
+ for (i = 0; i < entries; i++) {
 avio_wb32(pb, stts_entries[i].count);
 avio_wb32(pb, stts_entries[i].duration);
 }
@@ -1242,25 +1294,36 @@
 const char *hdlr, *descr = NULL, *hdlr_type = NULL;
 int64_t pos = avio_tell(pb);
 
- if (!track) { /* no media --> data handler */
- hdlr = "dhlr";
- hdlr_type = "url ";
- descr = "DataHandler";
- } else {
+ hdlr = "dhlr";
+ hdlr_type = "url ";
+ descr = "DataHandler";
+
+ if (track) {
 hdlr = (track->mode == MODE_MOV) ? "mhlr" : "\0\0\0\0";
 if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO) {
 hdlr_type = "vide";
- descr = "VideoHandler";
+ descr = "VideoHandler";
 } else if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO) {
 hdlr_type = "soun";
- descr = "SoundHandler";
+ descr = "SoundHandler";
 } else if (track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE) {
 if (track->tag == MKTAG('t','x','3','g')) hdlr_type = "sbtl";
 else hdlr_type = "text";
 descr = "SubtitleHandler";
 } else if (track->enc->codec_tag == MKTAG('r','t','p',' ')) {
 hdlr_type = "hint";
- descr = "HintHandler";
+ descr = "HintHandler";
+ } else if (track->enc->codec_tag == MKTAG('t','m','c','d')) {
+ hdlr_type = "tmcd";
+ descr = "TimeCodeHandler";
+ } else {
+ char tag_buf[32];
+ av_get_codec_tag_string(tag_buf, sizeof(tag_buf),
+ track->enc->codec_tag);
+
+ av_log(track->enc, AV_LOG_WARNING,
+ "Unknown hldr_type for %s / 0x%04X, writing dummy values\n",
+ tag_buf, track->enc->codec_tag);
 }
 }
 
@@ -1269,9 +1332,9 @@
 avio_wb32(pb, 0); /* Version & flags */
 avio_write(pb, hdlr, 4); /* handler */
 ffio_wfourcc(pb, hdlr_type); /* handler type */
- avio_wb32(pb ,0); /* reserved */
- avio_wb32(pb ,0); /* reserved */
- avio_wb32(pb ,0); /* reserved */
+ avio_wb32(pb, 0); /* reserved */
+ avio_wb32(pb, 0); /* reserved */
+ avio_wb32(pb, 0); /* reserved */
 if (!track || track->mode == MODE_MOV)
 avio_w8(pb, strlen(descr)); /* pascal string */
 avio_write(pb, descr, strlen(descr)); /* handler description */
@@ -1300,7 +1363,7 @@
 int64_t pos = avio_tell(pb);
 avio_wb32(pb, 0); /* size */
 ffio_wfourcc(pb, "minf");
- if(track->enc->codec_type == AVMEDIA_TYPE_VIDEO)
+ if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO)
 mov_write_vmhd_tag(pb);
 else if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO)
 mov_write_smhd_tag(pb);
@@ -1309,6 +1372,8 @@
 else mov_write_nmhd_tag(pb);
 } else if (track->tag == MKTAG('r','t','p',' ')) {
 mov_write_hmhd_tag(pb);
+ } else if (track->tag == MKTAG('t','m','c','d')) {
+ mov_write_gmhd_tag(pb);
 }
 if (track->mode == MODE_MOV) /* FIXME: Why do it for MODE_MOV only ? */
 mov_write_hdlr_tag(pb, NULL);
@@ -1343,11 +1408,11 @@
 avio_wb16(pb, track->language); /* language */
 avio_wb16(pb, 0); /* reserved (quality) */
 
- if(version!=0 && track->mode == MODE_MOV){
+ if (version != 0 && track->mode == MODE_MOV) {
 av_log(NULL, AV_LOG_ERROR,
- "FATAL error, file duration too long for timebase, this file will not be\n"
- "playable with quicktime. Choose a different timebase or a different\n"
- "container format\n");
+ "FATAL error, file duration too long for timebase, this file will not be\n"
+ "playable with quicktime. Choose a different timebase or a different\n"
+ "container format\n");
 }
 
 return 32;
@@ -1376,7 +1441,9 @@
 (version == 1) ? avio_wb32(pb, 104) : avio_wb32(pb, 92); /* size */
 ffio_wfourcc(pb, "tkhd");
 avio_w8(pb, version);
- avio_wb24(pb, 0xf); /* flags (track enabled) */
+ avio_wb24(pb, (track->flags & MOV_TRACK_ENABLED) ?
+ MOV_TKHD_FLAG_ENABLED | MOV_TKHD_FLAG_IN_MOVIE :
+ MOV_TKHD_FLAG_IN_MOVIE);
 if (version == 1) {
 avio_wb64(pb, track->time);
 avio_wb64(pb, track->time);
@@ -1396,7 +1463,7 @@
 avio_wb16(pb, 0); /* layer */
 avio_wb16(pb, st ? st->codec->codec_type : 0); /* alternate group) */
 /* Volume, only for audio */
- if(track->enc->codec_type == AVMEDIA_TYPE_AUDIO)
+ if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO)
 avio_wb16(pb, 0x0100);
 else
 avio_wb16(pb, 0);
@@ -1414,20 +1481,19 @@
 avio_wb32(pb, 0x40000000); /* reserved */
 
 /* Track width and height, for visual only */
- if(st && (track->enc->codec_type == AVMEDIA_TYPE_VIDEO ||
- track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE)) {
- if(track->mode == MODE_MOV) {
+ if (st && (track->enc->codec_type == AVMEDIA_TYPE_VIDEO ||
+ track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE)) {
+ if (track->mode == MODE_MOV) {
 avio_wb32(pb, track->enc->width << 16);
 avio_wb32(pb, track->height << 16);
 } else {
 double sample_aspect_ratio = av_q2d(st->sample_aspect_ratio);
- if(!sample_aspect_ratio || track->height != track->enc->height)
+ if (!sample_aspect_ratio || track->height != track->enc->height)
 sample_aspect_ratio = 1;
- avio_wb32(pb, sample_aspect_ratio * track->enc->width*0x10000);
- avio_wb32(pb, track->height*0x10000);
+ avio_wb32(pb, sample_aspect_ratio * track->enc->width * 0x10000);
+ avio_wb32(pb, track->height * 0x10000);
 }
- }
- else {
+ } else {
 avio_wb32(pb, 0);
 avio_wb32(pb, 0);
 }
@@ -1538,7 +1604,6 @@
 
 static int mov_write_udta_sdp(AVIOContext *pb, MOVTrack *track)
 {
-
 AVFormatContext *ctx = track->rtp_ctx;
 char buf[1000] = "";
 int len;
@@ -1574,14 +1639,14 @@
 mov_write_tref_tag(pb, track);
 mov_write_mdia_tag(pb, track);
 if (track->mode == MODE_PSP)
- mov_write_uuid_tag_psp(pb,track); // PSP Movies require this uuid box
+ mov_write_uuid_tag_psp(pb, track); // PSP Movies require this uuid box
 if (track->tag == MKTAG('r','t','p',' '))
 mov_write_udta_sdp(pb, track);
 if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO && track->mode == MODE_MOV) {
 double sample_aspect_ratio = av_q2d(st->sample_aspect_ratio);
 if (0.0 != sample_aspect_ratio && 1.0 != sample_aspect_ratio)
 mov_write_tapt_tag(pb, track);
- };
+ }
 return update_size(pb, pos);
 }
 
@@ -1592,7 +1657,7 @@
 int audio_profile = mov->iods_audio_profile;
 int video_profile = mov->iods_video_profile;
 for (i = 0; i < mov->nb_streams; i++) {
- if(mov->tracks[i].entry > 0) {
+ if (mov->tracks[i].entry > 0) {
 has_audio |= mov->tracks[i].enc->codec_type == AVMEDIA_TYPE_AUDIO;
 has_video |= mov->tracks[i].enc->codec_type == AVMEDIA_TYPE_VIDEO;
 }
@@ -1644,8 +1709,8 @@
 int64_t max_track_len_temp, max_track_len = 0;
 int version;
 
- for (i=0; i<mov->nb_streams; i++) {
- if(mov->tracks[i].entry > 0) {
+ for (i = 0; i < mov->nb_streams; i++) {
+ if (mov->tracks[i].entry > 0 && mov->tracks[i].timescale) {
 max_track_len_temp = av_rescale_rnd(mov->tracks[i].track_duration,
 MOV_TIMESCALE,
 mov->tracks[i].timescale,
@@ -1717,7 +1782,7 @@
 /* helper function to write a data tag with the specified string as data */
 static int mov_write_string_data_tag(AVIOContext *pb, const char *data, int lang, int long_style)
 {
- if(long_style){
+ if (long_style) {
 int size = 16 + strlen(data);
 avio_wb32(pb, size); /* size */
 ffio_wfourcc(pb, "data");
@@ -1725,7 +1790,7 @@
 avio_wb32(pb, 0);
 avio_write(pb, data, strlen(data));
 return size;
- }else{
+ } else {
 if (!lang)
 lang = ff_mov_iso639_to_lang("und", 1);
 avio_wb16(pb, strlen(data)); /* string length */
@@ -1735,7 +1800,9 @@
 }
 }
 
-static int mov_write_string_tag(AVIOContext *pb, const char *name, const char *value, int lang, int long_style){
+static int mov_write_string_tag(AVIOContext *pb, const char *name,
+ const char *value, int lang, int long_style)
+{
 int size = 0;
 if (value && value[0]) {
 int64_t pos = avio_tell(pb);
@@ -1762,8 +1829,8 @@
 snprintf(tag2, sizeof(tag2), "%s-", tag);
 while ((t2 = av_dict_get(s->metadata, tag2, t2, AV_DICT_IGNORE_SUFFIX))) {
 len2 = strlen(t2->key);
- if (len2 == len+4 && !strcmp(t->value, t2->value)
- && (l=ff_mov_iso639_to_lang(&t2->key[len2-3], 1)) >= 0) {
+ if (len2 == len + 4 && !strcmp(t->value, t2->value)
+ && (l = ff_mov_iso639_to_lang(&t2->key[len2 - 3], 1)) >= 0) {
 lang = l;
 break;
 }
@@ -1780,14 +1847,14 @@
 if (track) {
 avio_wb32(pb, 32); /* size */
 ffio_wfourcc(pb, "trkn");
- avio_wb32(pb, 24); /* size */
- ffio_wfourcc(pb, "data");
- avio_wb32(pb, 0); // 8 bytes empty
- avio_wb32(pb, 0);
- avio_wb16(pb, 0); // empty
- avio_wb16(pb, track); // track number
- avio_wb16(pb, 0); // total track number
- avio_wb16(pb, 0); // empty
+ avio_wb32(pb, 24); /* size */
+ ffio_wfourcc(pb, "data");
+ avio_wb32(pb, 0); // 8 bytes empty
+ avio_wb32(pb, 0);
+ avio_wb16(pb, 0); // empty
+ avio_wb16(pb, track); // track number
+ avio_wb16(pb, 0); // total track number
+ avio_wb16(pb, 0); // empty
 size = 32;
 }
 return size;
@@ -1806,7 +1873,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);
@@ -1838,9 +1906,9 @@
 
 static int utf8len(const uint8_t *b)
 {
- int len=0;
+ int len = 0;
 int val;
- while(*b){
+ while (*b) {
 GET_UTF8(val, *b++, return -1;)
 len++;
 }
@@ -1850,7 +1918,7 @@
 static int ascii_to_wc(AVIOContext *pb, const uint8_t *b)
 {
 int val;
- while(*b){
+ while (*b) {
 GET_UTF8(val, *b++, return -1;)
 avio_wb16(pb, val);
 }
@@ -1860,7 +1928,9 @@
 
 static uint16_t language_code(const char *str)
 {
- return (((str[0]-0x60) & 0x1F) << 10) + (((str[1]-0x60) & 0x1F) << 5) + ((str[2]-0x60) & 0x1F);
+ return (((str[0] - 0x60) & 0x1F) << 10) +
+ (((str[1] - 0x60) & 0x1F) << 5) +
+ (( str[2] - 0x60) & 0x1F);
 }
 
 static int mov_write_3gp_udta_tag(AVIOContext *pb, AVFormatContext *s,
@@ -1877,7 +1947,7 @@
 avio_wb16(pb, atoi(t->value));
 else {
 avio_wb16(pb, language_code("eng")); /* language */
- avio_write(pb, t->value, strlen(t->value)+1); /* UTF8 string value */
+ avio_write(pb, t->value, strlen(t->value) + 1); /* UTF8 string value */
 if (!strcmp(tag, "albm") &&
 (t = av_dict_get(s->metadata, "track", NULL, 0)))
 avio_w8(pb, atoi(t->value));
@@ -1924,38 +1994,38 @@
 }
 
 ret = avio_open_dyn_buf(&pb_buf);
- if(ret < 0)
+ if (ret < 0)
 return ret;
 
- if (mov->mode & MODE_3GP) {
- mov_write_3gp_udta_tag(pb_buf, s, "perf", "artist");
- mov_write_3gp_udta_tag(pb_buf, s, "titl", "title");
- mov_write_3gp_udta_tag(pb_buf, s, "auth", "author");
- mov_write_3gp_udta_tag(pb_buf, s, "gnre", "genre");
- mov_write_3gp_udta_tag(pb_buf, s, "dscp", "comment");
- mov_write_3gp_udta_tag(pb_buf, s, "albm", "album");
- mov_write_3gp_udta_tag(pb_buf, s, "cprt", "copyright");
- mov_write_3gp_udta_tag(pb_buf, s, "yrrc", "date");
- } else if (mov->mode == MODE_MOV) { // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4
- mov_write_string_metadata(s, pb_buf, "\251ART", "artist" , 0);
- mov_write_string_metadata(s, pb_buf, "\251nam", "title" , 0);
- mov_write_string_metadata(s, pb_buf, "\251aut", "author" , 0);
- mov_write_string_metadata(s, pb_buf, "\251alb", "album" , 0);
- mov_write_string_metadata(s, pb_buf, "\251day", "date" , 0);
- mov_write_string_metadata(s, pb_buf, "\251swr", "encoder" , 0);
- mov_write_string_metadata(s, pb_buf, "\251des", "comment" , 0);
- mov_write_string_metadata(s, pb_buf, "\251gen", "genre" , 0);
- mov_write_string_metadata(s, pb_buf, "\251cpy", "copyright" , 0);
- } else {
- /* iTunes meta data */
- mov_write_meta_tag(pb_buf, mov, s);
- }
+ if (mov->mode & MODE_3GP) {
+ mov_write_3gp_udta_tag(pb_buf, s, "perf", "artist");
+ mov_write_3gp_udta_tag(pb_buf, s, "titl", "title");
+ mov_write_3gp_udta_tag(pb_buf, s, "auth", "author");
+ mov_write_3gp_udta_tag(pb_buf, s, "gnre", "genre");
+ mov_write_3gp_udta_tag(pb_buf, s, "dscp", "comment");
+ mov_write_3gp_udta_tag(pb_buf, s, "albm", "album");
+ mov_write_3gp_udta_tag(pb_buf, s, "cprt", "copyright");
+ mov_write_3gp_udta_tag(pb_buf, s, "yrrc", "date");
+ } else if (mov->mode == MODE_MOV) { // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4
+ mov_write_string_metadata(s, pb_buf, "\251ART", "artist", 0);
+ mov_write_string_metadata(s, pb_buf, "\251nam", "title", 0);
+ mov_write_string_metadata(s, pb_buf, "\251aut", "author", 0);
+ mov_write_string_metadata(s, pb_buf, "\251alb", "album", 0);
+ mov_write_string_metadata(s, pb_buf, "\251day", "date", 0);
+ mov_write_string_metadata(s, pb_buf, "\251swr", "encoder", 0);
+ mov_write_string_metadata(s, pb_buf, "\251des", "comment", 0);
+ mov_write_string_metadata(s, pb_buf, "\251gen", "genre", 0);
+ mov_write_string_metadata(s, pb_buf, "\251cpy", "copyright", 0);
+ } else {
+ /* iTunes meta data */
+ mov_write_meta_tag(pb_buf, mov, s);
+ }
 
- if (s->nb_chapters)
- mov_write_chpl_tag(pb_buf, s);
+ if (s->nb_chapters)
+ mov_write_chpl_tag(pb_buf, s);
 
 if ((size = avio_close_dyn_buf(pb_buf, &buf)) > 0) {
- avio_wb32(pb, size+8);
+ avio_wb32(pb, size + 8);
 ffio_wfourcc(pb, "udta");
 avio_write(pb, buf, size);
 }
@@ -1965,12 +2035,12 @@
 }
 
 static void mov_write_psp_udta_tag(AVIOContext *pb,
- const char *str, const char *lang, int type)
+ const char *str, const char *lang, int type)
 {
- int len = utf8len(str)+1;
- if(len<=0)
+ int len = utf8len(str) + 1;
+ if (len <= 0)
 return;
- avio_wb16(pb, len*2+10); /* size */
+ avio_wb16(pb, len * 2 + 10); /* size */
 avio_wb32(pb, type); /* type */
 avio_wb16(pb, language_code(lang)); /* language */
 avio_wb16(pb, 0x01); /* ? */
@@ -2022,18 +2092,18 @@
 avio_wb32(pb, 0); /* size placeholder*/
 ffio_wfourcc(pb, "moov");
 
- for (i=0; i<mov->nb_streams; i++) {
+ for (i = 0; i < mov->nb_streams; i++) {
 if (mov->tracks[i].entry <= 0 && !(mov->flags & FF_MOV_FLAG_FRAGMENT))
 continue;
 
- mov->tracks[i].time = mov->time;
- mov->tracks[i].track_id = i+1;
+ mov->tracks[i].time = mov->time;
+ mov->tracks[i].track_id = i + 1;
 }
 
 if (mov->chapter_track)
- for (i=0; i<s->nb_streams; i++) {
+ for (i = 0; i < s->nb_streams; i++) {
 mov->tracks[i].tref_tag = MKTAG('c','h','a','p');
- mov->tracks[i].tref_id = mov->tracks[mov->chapter_track].track_id;
+ mov->tracks[i].tref_id = mov->tracks[mov->chapter_track].track_id;
 }
 for (i = 0; i < mov->nb_streams; i++) {
 if (mov->tracks[i].tag == MKTAG('r','t','p',' ')) {
@@ -2046,7 +2116,7 @@
 mov_write_mvhd_tag(pb, mov);
 if (mov->mode != MODE_MOV && !mov->iods_skip)
 mov_write_iods_tag(pb, mov);
- for (i=0; i<mov->nb_streams; i++) {
+ for (i = 0; i < mov->nb_streams; i++) {
 if (mov->tracks[i].entry > 0 || mov->flags & FF_MOV_FLAG_FRAGMENT) {
 mov_write_trak_tag(pb, mov, &(mov->tracks[i]), i < s->nb_streams ? s->streams[i] : NULL);
 }
@@ -2075,9 +2145,9 @@
 static void param_write_hex(AVIOContext *pb, const char *name, const uint8_t *value, int len)
 {
 char buf[150];
- len = FFMIN(sizeof(buf)/2 - 1, len);
+ len = FFMIN(sizeof(buf) / 2 - 1, len);
 ff_data_to_hex(buf, value, len, 0);
- buf[2*len] = '\0';
+ buf[2 * len] = '\0';
 avio_printf(pb, "<param name=\"%s\" value=\"%s\" valuetype=\"data\"/>\n", name, buf);
 }
 
@@ -2151,7 +2221,7 @@
 param_write_hex(pb, "CodecPrivateData", track->enc->extradata,
 track->enc->extradata_size);
 param_write_int(pb, "AudioTag", ff_codec_get_tag(ff_codec_wav_tags,
- track->enc->codec_id));
+ track->enc->codec_id));
 param_write_int(pb, "Channels", track->enc->channels);
 param_write_int(pb, "SamplingRate", track->enc->sample_rate);
 param_write_int(pb, "BitsPerSample", 16);
@@ -2176,8 +2246,8 @@
 return 0;
 }
 
-static int mov_write_tfhd_tag(AVIOContext *pb, MOVTrack *track,
- int64_t moof_offset)
+static int mov_write_tfhd_tag(AVIOContext *pb, MOVMuxContext *mov,
+ MOVTrack *track, int64_t moof_offset)
 {
 int64_t pos = avio_tell(pb);
 uint32_t flags = MOV_TFHD_DEFAULT_SIZE | MOV_TFHD_DEFAULT_DURATION |
@@ -2187,12 +2257,16 @@
 } else {
 flags |= MOV_TFHD_DEFAULT_FLAGS;
 }
+ if (mov->flags & FF_MOV_FLAG_OMIT_TFHD_OFFSET)
+ flags &= ~MOV_TFHD_BASE_DATA_OFFSET;
 
 /* Don't set a default sample size, the silverlight player refuses
 * to play files with that set. Don't set a default sample duration,
- * WMP freaks out if it is set. */
+ * WMP freaks out if it is set. Don't set a base data offset, PIFF
+ * file format says it MUST NOT be set. */
 if (track->mode == MODE_ISM)
- flags &= ~(MOV_TFHD_DEFAULT_SIZE | MOV_TFHD_DEFAULT_DURATION);
+ flags &= ~(MOV_TFHD_DEFAULT_SIZE | MOV_TFHD_DEFAULT_DURATION |
+ MOV_TFHD_BASE_DATA_OFFSET);
 
 avio_wb32(pb, 0); /* size placeholder */
 ffio_wfourcc(pb, "tfhd");
@@ -2229,7 +2303,8 @@
 (MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES | MOV_FRAG_SAMPLE_FLAG_IS_NON_SYNC);
 }
 
-static int mov_write_trun_tag(AVIOContext *pb, MOVTrack *track)
+static int mov_write_trun_tag(AVIOContext *pb, MOVMuxContext *mov,
+ MOVTrack *track, int moof_size)
 {
 int64_t pos = avio_tell(pb);
 uint32_t flags = MOV_TRUN_DATA_OFFSET;
@@ -2254,8 +2329,13 @@
 avio_wb24(pb, flags);
 
 avio_wb32(pb, track->entry); /* sample count */
- track->moof_size_offset = avio_tell(pb);
- avio_wb32(pb, 0); /* data offset */
+ if (mov->flags & FF_MOV_FLAG_OMIT_TFHD_OFFSET &&
+ !(mov->flags & FF_MOV_FLAG_SEPARATE_MOOF) &&
+ track->track_id != 1)
+ avio_wb32(pb, 0); /* Later tracks follow immediately after the previous one */
+ else
+ avio_wb32(pb, moof_size + 8 + track->data_offset +
+ track->cluster[0].pos); /* data offset */
 if (flags & MOV_TRUN_FIRST_SAMPLE_FLAGS)
 avio_wb32(pb, get_sample_flags(track, &track->cluster[0]));
 
@@ -2319,7 +2399,7 @@
 avio_wb64(pb, track->frag_info[index].duration);
 }
 if (n < mov->ism_lookahead) {
- int free_size = 16*(mov->ism_lookahead - n);
+ int free_size = 16 * (mov->ism_lookahead - n);
 avio_wb32(pb, free_size);
 ffio_wfourcc(pb, "free");
 for (i = 0; i < free_size - 8; i++)
@@ -2344,19 +2424,20 @@
 }
 
 static int mov_write_traf_tag(AVIOContext *pb, MOVMuxContext *mov,
- MOVTrack *track, int64_t moof_offset)
+ MOVTrack *track, int64_t moof_offset,
+ int moof_size)
 {
 int64_t pos = avio_tell(pb);
 avio_wb32(pb, 0); /* size placeholder */
 ffio_wfourcc(pb, "traf");
 
- mov_write_tfhd_tag(pb, track, moof_offset);
- mov_write_trun_tag(pb, track);
+ mov_write_tfhd_tag(pb, mov, track, moof_offset);
+ mov_write_trun_tag(pb, mov, track, moof_size);
 if (mov->mode == MODE_ISM) {
 mov_write_tfxd_tag(pb, track);
 
 if (mov->ism_lookahead) {
- int i, size = 16 + 4 + 1 + 16*mov->ism_lookahead;
+ int i, size = 16 + 4 + 1 + 16 * mov->ism_lookahead;
 
 track->tfrf_offset = avio_tell(pb);
 avio_wb32(pb, 8 + size);
@@ -2369,10 +2450,11 @@
 return update_size(pb, pos);
 }
 
-static int mov_write_moof_tag(AVIOContext *pb, MOVMuxContext *mov, int tracks)
+static int mov_write_moof_tag_internal(AVIOContext *pb, MOVMuxContext *mov,
+ int tracks, int moof_size)
 {
- int64_t pos = avio_tell(pb), end;
- int i, moof_size;
+ int64_t pos = avio_tell(pb);
+ int i;
 
 avio_wb32(pb, 0); /* size placeholder */
 ffio_wfourcc(pb, "moof");
@@ -2384,25 +2466,24 @@
 continue;
 if (!track->entry)
 continue;
- mov_write_traf_tag(pb, mov, track, pos);
+ mov_write_traf_tag(pb, mov, track, pos, moof_size);
 }
 
- end = avio_tell(pb);
- moof_size = end - pos;
- for (i = 0; i < mov->nb_streams; i++) {
- MOVTrack *track = &mov->tracks[i];
- if (tracks >= 0 && i != tracks)
- continue;
- if (!track->entry)
- continue;
- avio_seek(pb, mov->tracks[i].moof_size_offset, SEEK_SET);
- avio_wb32(pb, moof_size + 8 + mov->tracks[i].data_offset);
- }
- avio_seek(pb, end, SEEK_SET);
-
 return update_size(pb, pos);
 }
 
+static int mov_write_moof_tag(AVIOContext *pb, MOVMuxContext *mov, int tracks)
+{
+ AVIOContext *avio_buf;
+ int ret, moof_size;
+
+ if ((ret = ffio_open_null_buf(&avio_buf)) < 0)
+ return ret;
+ mov_write_moof_tag_internal(avio_buf, mov, tracks, 0);
+ moof_size = ffio_close_null_buf(avio_buf);
+ return mov_write_moof_tag_internal(pb, mov, tracks, moof_size);
+}
+
 static int mov_write_tfra_tag(AVIOContext *pb, MOVTrack *track)
 {
 int64_t pos = avio_tell(pb);
@@ -2484,13 +2565,15 @@
 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) {
 ffio_wfourcc(pb, has_h264 ? "3g2b" : "3g2a");
 minor = has_h264 ? 0x20000 : 0x10000;
- }else if (mov->mode == MODE_PSP)
+ } else if (mov->mode == MODE_PSP)
 ffio_wfourcc(pb, "MSNV");
 else if (mov->mode == MODE_MP4)
 ffio_wfourcc(pb, "isom");
@@ -2498,12 +2581,14 @@
 ffio_wfourcc(pb, has_video ? "M4V ":"M4A ");
 else if (mov->mode == MODE_ISM)
 ffio_wfourcc(pb, "isml");
+ else if (mov->mode == MODE_F4V)
+ ffio_wfourcc(pb, "f4v ");
 else
 ffio_wfourcc(pb, "qt ");
 
 avio_wb32(pb, minor);
 
- if(mov->mode == MODE_MOV)
+ if (mov->mode == MODE_MOV)
 ffio_wfourcc(pb, "qt ");
 else if (mov->mode == MODE_ISM) {
 ffio_wfourcc(pb, "piff");
@@ -2511,7 +2596,7 @@
 } else {
 ffio_wfourcc(pb, "isom");
 ffio_wfourcc(pb, "iso2");
- if(has_h264)
+ if (has_h264)
 ffio_wfourcc(pb, "avc1");
 }
 
@@ -2531,7 +2616,7 @@
 AVCodecContext *video_codec = s->streams[0]->codec;
 AVCodecContext *audio_codec = s->streams[1]->codec;
 int audio_rate = audio_codec->sample_rate;
- int frame_rate = ((video_codec->time_base.den) * (0x10000))/ (video_codec->time_base.num);
+ int frame_rate = ((video_codec->time_base.den) * (0x10000)) / (video_codec->time_base.num);
 int audio_kbitrate = audio_codec->bit_rate / 1000;
 int video_kbitrate = FFMIN(video_codec->bit_rate / 1000, 800 - audio_kbitrate);
 
@@ -2553,7 +2638,7 @@
 avio_wb32(pb, 0x0); /* ? */
 
 avio_wb32(pb, 0x2c); /* size */
- ffio_wfourcc(pb, "APRF");/* audio */
+ ffio_wfourcc(pb, "APRF"); /* audio */
 avio_wb32(pb, 0x0);
 avio_wb32(pb, 0x2); /* TrackID */
 ffio_wfourcc(pb, "mp4a");
@@ -2593,11 +2678,11 @@
 int i, closed_gop = 0;
 
 for (i = 0; i < pkt->size - 4; i++) {
- c = (c<<8) + pkt->data[i];
+ c = (c << 8) + pkt->data[i];
 if (c == 0x1b8) { // gop
- closed_gop = pkt->data[i+4]>>6 & 0x01;
+ closed_gop = pkt->data[i + 4] >> 6 & 0x01;
 } else if (c == 0x100) { // pic
- int temp_ref = (pkt->data[i+1]<<2) | (pkt->data[i+2]>>6);
+ int temp_ref = (pkt->data[i + 1] << 2) | (pkt->data[i + 2] >> 6);
 if (!temp_ref || closed_gop) // I picture is not reordered
 *flags = MOV_SYNC_SAMPLE;
 else
@@ -2688,11 +2773,10 @@
 if (i < mov->nb_streams)
 return 0;
 
- if ((ret = avio_open_dyn_buf(&moov_buf)) < 0)
+ if ((ret = ffio_open_null_buf(&moov_buf)) < 0)
 return ret;
 mov_write_moov_tag(moov_buf, mov, s);
- buf_size = avio_close_dyn_buf(moov_buf, &buf);
- av_free(buf);
+ buf_size = ffio_close_null_buf(moov_buf);
 for (i = 0; i < mov->nb_streams; i++)
 mov->tracks[i].data_offset = pos + buf_size + 8;
 
@@ -2756,9 +2840,14 @@
 MOVFragmentInfo *info;
 avio_flush(s->pb);
 track->nb_frag_info++;
- track->frag_info = av_realloc(track->frag_info,
- sizeof(*track->frag_info) *
- track->nb_frag_info);
+ if (track->nb_frag_info >= track->frag_info_capacity) {
+ unsigned new_capacity = track->nb_frag_info + MOV_FRAG_INFO_ALLOC_INCREMENT;
+ if (av_reallocp_array(&track->frag_info,
+ new_capacity,
+ sizeof(*track->frag_info)))
+ return AVERROR(ENOMEM);
+ track->frag_info_capacity = new_capacity;
+ }
 info = &track->frag_info[track->nb_frag_info - 1];
 info->offset = avio_tell(s->pb);
 info->time = mov->tracks[i].frag_start;
@@ -2798,7 +2887,7 @@
 MOVTrack *trk = &mov->tracks[pkt->stream_index];
 AVCodecContext *enc = trk->enc;
 unsigned int samples_in_chunk = 0;
- int size= pkt->size;
+ int size = pkt->size;
 uint8_t *reformatted_data = NULL;
 
 if (mov->flags & FF_MOV_FLAG_FRAGMENT) {
@@ -2839,7 +2928,7 @@
 
 /* copy extradata if it exists */
 if (trk->vos_len == 0 && enc->extradata_size > 0) {
- trk->vos_len = enc->extradata_size;
+ trk->vos_len = enc->extradata_size;
 trk->vos_data = av_malloc(trk->vos_len);
 memcpy(trk->vos_data, enc->extradata, trk->vos_len);
 }
@@ -2854,6 +2943,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);
 }
@@ -2861,24 +2959,26 @@
 if ((enc->codec_id == AV_CODEC_ID_DNXHD ||
 enc->codec_id == AV_CODEC_ID_AC3) && !trk->vos_len) {
 /* copy frame to create needed atoms */
- trk->vos_len = size;
+ trk->vos_len = size;
 trk->vos_data = av_malloc(size);
 if (!trk->vos_data)
 return AVERROR(ENOMEM);
 memcpy(trk->vos_data, pkt->data, size);
 }
 
- if (!(trk->entry % MOV_INDEX_CLUSTER_SIZE)) {
- trk->cluster = av_realloc(trk->cluster, (trk->entry + MOV_INDEX_CLUSTER_SIZE) * sizeof(*trk->cluster));
- if (!trk->cluster)
- return -1;
+ if (trk->entry >= trk->cluster_capacity) {
+ unsigned new_capacity = 2 * (trk->entry + MOV_INDEX_CLUSTER_SIZE);
+ if (av_reallocp_array(&trk->cluster, new_capacity,
+ sizeof(*trk->cluster)))
+ return AVERROR(ENOMEM);
+ trk->cluster_capacity = new_capacity;
 }
 
- trk->cluster[trk->entry].pos = avio_tell(pb) - size;
+ trk->cluster[trk->entry].pos = avio_tell(pb) - size;
 trk->cluster[trk->entry].samples_in_chunk = samples_in_chunk;
- trk->cluster[trk->entry].size = size;
- trk->cluster[trk->entry].entries = samples_in_chunk;
- trk->cluster[trk->entry].dts = pkt->dts;
+ trk->cluster[trk->entry].size = size;
+ trk->cluster[trk->entry].entries = samples_in_chunk;
+ trk->cluster[trk->entry].dts = pkt->dts;
 if (!trk->entry && trk->start_dts != AV_NOPTS_VALUE) {
 /* First packet of a new fragment. We already wrote the duration
 * of the last packet of the previous fragment based on track_duration,
@@ -2896,7 +2996,7 @@
 }
 if (pkt->dts != pkt->pts)
 trk->flags |= MOV_TRACK_CTTS;
- trk->cluster[trk->entry].cts = pkt->pts - pkt->dts;
+ trk->cluster[trk->entry].cts = pkt->pts - pkt->dts;
 trk->cluster[trk->entry].flags = 0;
 if (enc->codec_id == AV_CODEC_ID_VC1) {
 mov_parse_vc1_frame(pkt, trk, mov->fragments);
@@ -2914,9 +3014,7 @@
 }
 trk->entry++;
 trk->sample_count += samples_in_chunk;
- mov->mdat_size += size;
-
- avio_flush(pb);
+ mov->mdat_size += size;
 
 if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams)
 ff_mov_add_hinted_packet(s, pkt, trk->hint_track, trk->entry,
@@ -2937,7 +3035,8 @@
 int64_t frag_duration = 0;
 int size = pkt->size;
 
- if (!pkt->size) return 0; /* Discard 0 sized packets */
+ if (!pkt->size)
+ return 0; /* Discard 0 sized packets */
 
 if (trk->entry)
 frag_duration = av_rescale_q(pkt->dts - trk->cluster[0].dts,
@@ -2959,18 +3058,27 @@
 
 // QuickTime chapters involve an additional text track with the chapter names
 // as samples, and a tref pointing from the other tracks to the chapter one.
-static void mov_create_chapter_track(AVFormatContext *s, int tracknum)
+static int mov_create_chapter_track(AVFormatContext *s, int tracknum)
 {
 MOVMuxContext *mov = s->priv_data;
 MOVTrack *track = &mov->tracks[tracknum];
 AVPacket pkt = { .stream_index = tracknum, .flags = AV_PKT_FLAG_KEY };
 int i, len;
+ // These properties are required to make QT recognize the chapter track
+ uint8_t chapter_properties[43] = { 0, 0, 0, 0, 0, 0, 0, 1, };
 
 track->mode = mov->mode;
 track->tag = MKTAG('t','e','x','t');
 track->timescale = MOV_TIMESCALE;
 track->enc = avcodec_alloc_context3(NULL);
+ if (!track->enc)
+ return AVERROR(ENOMEM);
 track->enc->codec_type = AVMEDIA_TYPE_SUBTITLE;
+ track->enc->extradata = av_malloc(sizeof(chapter_properties));
+ if (track->enc->extradata == NULL)
+ return AVERROR(ENOMEM);
+ track->enc->extradata_size = sizeof(chapter_properties);
+ memcpy(track->enc->extradata, chapter_properties, sizeof(chapter_properties));
 
 for (i = 0; i < s->nb_chapters; i++) {
 AVChapter *c = s->chapters[i];
@@ -2981,15 +3089,93 @@
 pkt.duration = end - pkt.dts;
 
 if ((t = av_dict_get(c->metadata, "title", NULL, 0))) {
- len = strlen(t->value);
- pkt.size = len+2;
+ len = strlen(t->value);
+ pkt.size = len + 2;
 pkt.data = av_malloc(pkt.size);
+ if (!pkt.data)
+ return AVERROR(ENOMEM);
 AV_WB16(pkt.data, len);
- memcpy(pkt.data+2, t->value, len);
+ memcpy(pkt.data + 2, t->value, len);
 ff_mov_write_packet(s, &pkt);
 av_freep(&pkt.data);
 }
 }
+
+ return 0;
+}
+
+/*
+ * st->disposition controls the "enabled" flag in the tkhd tag.
+ * QuickTime will not play a track if it is not enabled. So make sure
+ * that one track of each type (audio, video, subtitle) is enabled.
+ *
+ * Subtitles are special. For audio and video, setting "enabled" also
+ * makes the track "default" (i.e. it is rendered when played). For
+ * subtitles, an "enabled" subtitle is not rendered by default, but
+ * if no subtitle is enabled, the subtitle menu in QuickTime will be
+ * empty!
+ */
+static void enable_tracks(AVFormatContext *s)
+{
+ MOVMuxContext *mov = s->priv_data;
+ int i;
+ uint8_t enabled[AVMEDIA_TYPE_NB];
+ int first[AVMEDIA_TYPE_NB];
+
+ for (i = 0; i < AVMEDIA_TYPE_NB; i++) {
+ enabled[i] = 0;
+ first[i] = -1;
+ }
+
+ for (i = 0; i < s->nb_streams; i++) {
+ AVStream *st = s->streams[i];
+
+ if (st->codec->codec_type <= AVMEDIA_TYPE_UNKNOWN ||
+ st->codec->codec_type >= AVMEDIA_TYPE_NB)
+ continue;
+
+ if (first[st->codec->codec_type] < 0)
+ first[st->codec->codec_type] = i;
+ if (st->disposition & AV_DISPOSITION_DEFAULT) {
+ mov->tracks[i].flags |= MOV_TRACK_ENABLED;
+ enabled[st->codec->codec_type] = 1;
+ }
+ }
+
+ for (i = 0; i < AVMEDIA_TYPE_NB; i++) {
+ switch (i) {
+ case AVMEDIA_TYPE_VIDEO:
+ case AVMEDIA_TYPE_AUDIO:
+ case AVMEDIA_TYPE_SUBTITLE:
+ if (!enabled[i] && first[i] >= 0)
+ mov->tracks[first[i]].flags |= MOV_TRACK_ENABLED;
+ break;
+ }
+ }
+}
+
+static void mov_free(AVFormatContext *s)
+{
+ MOVMuxContext *mov = s->priv_data;
+ int i;
+
+ if (mov->chapter_track) {
+ if (mov->tracks[mov->chapter_track].enc)
+ av_free(mov->tracks[mov->chapter_track].enc->extradata);
+ av_freep(&mov->tracks[mov->chapter_track].enc);
+ }
+
+ for (i = 0; i < mov->nb_streams; i++) {
+ if (mov->tracks[i].tag == MKTAG('r','t','p',' '))
+ ff_mov_close_hinting(&mov->tracks[i]);
+ av_freep(&mov->tracks[i].cluster);
+ av_freep(&mov->tracks[i].frag_info);
+
+ if (mov->tracks[i].vos_len)
+ av_free(mov->tracks[i].vos_data);
+ }
+
+ av_freep(&mov->tracks);
 }
 
 static int mov_write_header(AVFormatContext *s)
@@ -2999,6 +3185,19 @@
 AVDictionaryEntry *t;
 int i, hint_track = 0;
 
+ /* Default mode == MP4 */
+ mov->mode = MODE_MP4;
+
+ if (s->oformat != NULL) {
+ if (!strcmp("3gp", s->oformat->name)) mov->mode = MODE_3GP;
+ else if (!strcmp("3g2", s->oformat->name)) mov->mode = MODE_3GP|MODE_3G2;
+ else if (!strcmp("mov", s->oformat->name)) mov->mode = MODE_MOV;
+ else if (!strcmp("psp", s->oformat->name)) mov->mode = MODE_PSP;
+ else if (!strcmp("ipod",s->oformat->name)) mov->mode = MODE_IPOD;
+ else if (!strcmp("ismv",s->oformat->name)) mov->mode = MODE_ISM;
+ else if (!strcmp("f4v", s->oformat->name)) mov->mode = MODE_F4V;
+ }
+
 /* Set the FRAGMENT flag if any of the fragmentation methods are
 * enabled. */
 if (mov->max_fragment_duration || mov->max_fragment_size ||
@@ -3007,39 +3206,41 @@
 FF_MOV_FLAG_FRAG_CUSTOM))
 mov->flags |= FF_MOV_FLAG_FRAGMENT;
 
+ /* Set other implicit flags immediately */
+ if (mov->mode == MODE_ISM)
+ mov->flags |= FF_MOV_FLAG_EMPTY_MOOV | FF_MOV_FLAG_SEPARATE_MOOF |
+ FF_MOV_FLAG_FRAGMENT;
+
+ /* faststart: moov at the beginning of the file, if supported */
+ if (mov->flags & FF_MOV_FLAG_FASTSTART) {
+ if ((mov->flags & FF_MOV_FLAG_FRAGMENT) ||
+ (s->flags & AVFMT_FLAG_CUSTOM_IO)) {
+ av_log(s, AV_LOG_WARNING, "The faststart flag is incompatible "
+ "with fragmentation and custom IO, disabling faststart\n");
+ mov->flags &= ~FF_MOV_FLAG_FASTSTART;
+ }
+ }
+
 /* Non-seekable output is ok if using fragmentation. If ism_lookahead
 * is enabled, we don't support non-seekable output at all. */
 if (!s->pb->seekable &&
- ((!(mov->flags & FF_MOV_FLAG_FRAGMENT) &&
- !(s->oformat && !strcmp(s->oformat->name, "ismv")))
- || mov->ism_lookahead)) {
+ (!(mov->flags & FF_MOV_FLAG_FRAGMENT) || mov->ism_lookahead)) {
 av_log(s, AV_LOG_ERROR, "muxer does not support non seekable output\n");
- return -1;
+ return AVERROR(EINVAL);
 }
 
- /* Default mode == MP4 */
- mov->mode = MODE_MP4;
-
- if (s->oformat != NULL) {
- if (!strcmp("3gp", s->oformat->name)) mov->mode = MODE_3GP;
- else if (!strcmp("3g2", s->oformat->name)) mov->mode = MODE_3GP|MODE_3G2;
- else if (!strcmp("mov", s->oformat->name)) mov->mode = MODE_MOV;
- else if (!strcmp("psp", s->oformat->name)) mov->mode = MODE_PSP;
- else if (!strcmp("ipod",s->oformat->name)) mov->mode = MODE_IPOD;
- else if (!strcmp("ismv",s->oformat->name)) mov->mode = MODE_ISM;
 
- mov_write_ftyp_tag(pb,s);
- if (mov->mode == MODE_PSP) {
- if (s->nb_streams != 2) {
- av_log(s, AV_LOG_ERROR, "PSP mode need one video and one audio stream\n");
- return -1;
- }
- mov_write_uuidprof_tag(pb,s);
+ mov_write_ftyp_tag(pb,s);
+ if (mov->mode == MODE_PSP) {
+ if (s->nb_streams != 2) {
+ av_log(s, AV_LOG_ERROR, "PSP mode need one video and one audio stream\n");
+ return AVERROR(EINVAL);
 }
+ mov_write_uuidprof_tag(pb, s);
 }
 
 mov->nb_streams = s->nb_streams;
- if (mov->mode & (MODE_MOV|MODE_IPOD) && s->nb_chapters)
+ if (mov->mode & (MODE_MP4|MODE_MOV|MODE_IPOD) && s->nb_chapters)
 mov->chapter_track = mov->nb_streams++;
 
 if (mov->flags & FF_MOV_FLAG_RTP_HINT) {
@@ -3054,11 +3255,13 @@
 }
 }
 
- mov->tracks = av_mallocz(mov->nb_streams*sizeof(*mov->tracks));
+ // Reserve an extra stream for chapters for the case where chapters
+ // are written in the trailer
+ mov->tracks = av_mallocz((mov->nb_streams + 1) * sizeof(*mov->tracks));
 if (!mov->tracks)
 return AVERROR(ENOMEM);
 
- for(i=0; i<s->nb_streams; i++){
+ for (i = 0; i < s->nb_streams; i++) {
 AVStream *st= s->streams[i];
 MOVTrack *track= &mov->tracks[i];
 AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL,0);
@@ -3068,7 +3271,7 @@
 if (track->language < 0)
 track->language = 0;
 track->mode = mov->mode;
- track->tag = mov_find_codec_tag(s, track);
+ 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);
@@ -3077,8 +3280,8 @@
 /* If hinting of this track is enabled by a later hint track,
 * this is updated. */
 track->hint_track = -1;
- track->start_dts = AV_NOPTS_VALUE;
- if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO){
+ track->start_dts = AV_NOPTS_VALUE;
+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
 if (track->tag == MKTAG('m','x','3','p') || track->tag == MKTAG('m','x','3','n') ||
 track->tag == MKTAG('m','x','4','p') || track->tag == MKTAG('m','x','4','n') ||
 track->tag == MKTAG('m','x','5','p') || track->tag == MKTAG('m','x','5','n')) {
@@ -3086,7 +3289,7 @@
 av_log(s, AV_LOG_ERROR, "D-10/IMX must use 720x608 or 720x512 video resolution\n");
 goto error;
 }
- track->height = track->tag>>24 == 'n' ? 486 : 576;
+ track->height = track->tag >> 24 == 'n' ? 486 : 576;
 }
 track->timescale = st->codec->time_base.den;
 if (track->mode == MODE_MOV && track->timescale > 100000)
@@ -3094,7 +3297,7 @@
 "WARNING codec timebase is very high. If duration is too long,\n"
 "file may not be playable by quicktime. Specify a shorter timebase\n"
 "or choose different container.\n");
- }else if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO){
+ } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
 track->timescale = st->codec->sample_rate;
 /* set sample_size for PCM and ADPCM */
 if (av_get_bits_per_sample(st->codec->codec_id) ||
@@ -3115,7 +3318,9 @@
 i, track->enc->sample_rate);
 goto error;
 }
- }else if(st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE){
+ } else if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
+ track->timescale = st->codec->time_base.den;
+ } else if (st->codec->codec_type == AVMEDIA_TYPE_DATA) {
 track->timescale = st->codec->time_base.den;
 }
 if (!track->height)
@@ -3135,18 +3340,19 @@
 }
 }
 
- if (mov->mode == MODE_ISM) {
+ enable_tracks(s);
+
+ 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->max_fragment_duration = 5000000;
- mov->flags |= FF_MOV_FLAG_EMPTY_MOOV | FF_MOV_FLAG_SEPARATE_MOOF |
- FF_MOV_FLAG_FRAGMENT;
- }
-
- if (!(mov->flags & FF_MOV_FLAG_FRAGMENT))
+ 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);
+ }
 
 if (t = av_dict_get(s->metadata, "creation_time", NULL, 0))
 mov->time = ff_iso8601_to_unix_time(t->value);
@@ -3154,7 +3360,8 @@
 mov->time += 0x7C25B080; // 1970 based -> 1904 based
 
 if (mov->chapter_track)
- mov_create_chapter_track(s, mov->chapter_track);
+ if (mov_create_chapter_track(s, mov->chapter_track) < 0)
+ goto error;
 
 if (mov->flags & FF_MOV_FLAG_RTP_HINT) {
 /* Initialize the hint tracks for each audio and video stream */
@@ -3180,20 +3387,138 @@
 
 return 0;
 error:
- av_freep(&mov->tracks);
+ mov_free(s);
 return -1;
 }
 
+static int get_moov_size(AVFormatContext *s)
+{
+ int ret;
+ AVIOContext *moov_buf;
+ MOVMuxContext *mov = s->priv_data;
+
+ if ((ret = ffio_open_null_buf(&moov_buf)) < 0)
+ return ret;
+ mov_write_moov_tag(moov_buf, mov, s);
+ return ffio_close_null_buf(moov_buf);
+}
+
+/*
+ * This function gets the moov size if moved to the top of the file: the chunk
+ * offset table can switch between stco (32-bit entries) to co64 (64-bit
+ * entries) when the moov is moved to the beginning, so the size of the moov
+ * would change. It also updates the chunk offset tables.
+ */
+static int compute_moov_size(AVFormatContext *s)
+{
+ int i, moov_size, moov_size2;
+ MOVMuxContext *mov = s->priv_data;
+
+ moov_size = get_moov_size(s);
+ if (moov_size < 0)
+ return moov_size;
+
+ for (i = 0; i < mov->nb_streams; i++)
+ mov->tracks[i].data_offset += moov_size;
+
+ moov_size2 = get_moov_size(s);
+ if (moov_size2 < 0)
+ return moov_size2;
+
+ /* if the size changed, we just switched from stco to co64 and need to
+ * update the offsets */
+ if (moov_size2 != moov_size)
+ for (i = 0; i < mov->nb_streams; i++)
+ mov->tracks[i].data_offset += moov_size2 - moov_size;
+
+ return moov_size2;
+}
+
+static int shift_data(AVFormatContext *s)
+{
+ int ret = 0, moov_size;
+ MOVMuxContext *mov = s->priv_data;
+ int64_t pos, pos_end = avio_tell(s->pb);
+ uint8_t *buf, *read_buf[2];
+ int read_buf_id = 0;
+ int read_size[2];
+ AVIOContext *read_pb;
+
+ moov_size = compute_moov_size(s);
+ if (moov_size < 0)
+ return moov_size;
+
+ buf = av_malloc(moov_size * 2);
+ if (!buf)
+ return AVERROR(ENOMEM);
+ read_buf[0] = buf;
+ read_buf[1] = buf + moov_size;
+
+ /* Shift the data: the AVIO context of the output can only be used for
+ * writing, so we re-open the same output, but for reading. It also avoids
+ * a read/seek/write/seek back and forth. */
+ avio_flush(s->pb);
+ ret = avio_open(&read_pb, s->filename, AVIO_FLAG_READ);
+ if (ret < 0) {
+ av_log(s, AV_LOG_ERROR, "Unable to re-open %s output file for "
+ "the second pass (faststart)\n", s->filename);
+ goto end;
+ }
+
+ /* mark the end of the shift to up to the last data we wrote, and get ready
+ * for writing */
+ pos_end = avio_tell(s->pb);
+ avio_seek(s->pb, mov->reserved_moov_pos + moov_size, SEEK_SET);
+
+ /* start reading at where the new moov will be placed */
+ avio_seek(read_pb, mov->reserved_moov_pos, SEEK_SET);
+ pos = avio_tell(read_pb);
+
+#define READ_BLOCK do { \
+ read_size[read_buf_id] = avio_read(read_pb, read_buf[read_buf_id], moov_size); \
+ read_buf_id ^= 1; \
+} while (0)
+
+ /* shift data by chunk of at most moov_size */
+ READ_BLOCK;
+ do {
+ int n;
+ READ_BLOCK;
+ n = read_size[read_buf_id];
+ if (n <= 0)
+ break;
+ avio_write(s->pb, read_buf[read_buf_id], n);
+ pos += n;
+ } while (pos < pos_end);
+ avio_close(read_pb);
+
+end:
+ av_free(buf);
+ return ret;
+}
+
 static int mov_write_trailer(AVFormatContext *s)
 {
 MOVMuxContext *mov = s->priv_data;
 AVIOContext *pb = s->pb;
 int res = 0;
 int i;
+ int64_t moov_pos;
 
- int64_t moov_pos = avio_tell(pb);
+ // If there were no chapters when the header was written, but there
+ // are chapters now, write them in the trailer. This only works
+ // when we are not doing fragments.
+ if (!mov->chapter_track && !(mov->flags & FF_MOV_FLAG_FRAGMENT)) {
+ if (mov->mode & (MODE_MP4|MODE_MOV|MODE_IPOD) && s->nb_chapters) {
+ mov->chapter_track = mov->nb_streams++;
+ if ((res = mov_create_chapter_track(s, mov->chapter_track)) < 0)
+ goto error;
+ }
+ }
 
 if (!(mov->flags & FF_MOV_FLAG_FRAGMENT)) {
+ moov_pos = avio_tell(pb);
+
 /* Write size of mdat tag */
 if (mov->mdat_size + 8 <= UINT32_MAX) {
 avio_seek(pb, mov->mdat_pos, SEEK_SET);
@@ -3209,18 +3534,22 @@
 }
 avio_seek(pb, moov_pos, SEEK_SET);
 
- mov_write_moov_tag(pb, mov, s);
+ if (mov->flags & FF_MOV_FLAG_FASTSTART) {
+ av_log(s, AV_LOG_INFO, "Starting second pass: moving the moov atom to the beginning of the file\n");
+ res = shift_data(s);
+ if (res == 0) {
+ avio_seek(s->pb, mov->reserved_moov_pos, SEEK_SET);
+ mov_write_moov_tag(pb, mov, s);
+ }
+ } else {
+ mov_write_moov_tag(pb, mov, s);
+ }
 } else {
 mov_flush_fragment(s);
 mov_write_mfra_tag(pb, mov);
 }
 
- if (mov->chapter_track)
- av_freep(&mov->tracks[mov->chapter_track].enc);
-
- for (i=0; i<mov->nb_streams; i++) {
- if (mov->tracks[i].tag == MKTAG('r','t','p',' '))
- ff_mov_close_hinting(&mov->tracks[i]);
+ for (i = 0; i < mov->nb_streams; i++) {
 if (mov->flags & FF_MOV_FLAG_FRAGMENT &&
 mov->tracks[i].vc1_info.struct_offset && s->pb->seekable) {
 int64_t off = avio_tell(pb);
@@ -3231,15 +3560,10 @@
 avio_seek(pb, off, SEEK_SET);
 }
 }
- av_freep(&mov->tracks[i].cluster);
- av_freep(&mov->tracks[i].frag_info);
-
- if (mov->tracks[i].vos_len)
- av_free(mov->tracks[i].vos_data);
-
 }
 
- av_freep(&mov->tracks);
+error:
+ mov_free(s);
 
 return res;
 }
@@ -3257,7 +3581,7 @@
 .write_header = mov_write_header,
 .write_packet = mov_write_packet,
 .write_trailer = mov_write_trailer,
- .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
+ .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,
 .codec_tag = (const AVCodecTag* const []){
 ff_codec_movvideo_tags, ff_codec_movaudio_tags, 0
 },
@@ -3276,7 +3600,7 @@
 .write_header = mov_write_header,
 .write_packet = mov_write_packet,
 .write_trailer = mov_write_trailer,
- .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
+ .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,
 .codec_tag = (const AVCodecTag* const []){ codec_3gp_tags, 0 },
 .priv_class = &tgp_muxer_class,
 };
@@ -3295,7 +3619,7 @@
 .write_header = mov_write_header,
 .write_packet = mov_write_packet,
 .write_trailer = mov_write_trailer,
- .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
+ .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,
 .codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },
 .priv_class = &mp4_muxer_class,
 };
@@ -3313,7 +3637,7 @@
 .write_header = mov_write_header,
 .write_packet = mov_write_packet,
 .write_trailer = mov_write_trailer,
- .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
+ .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,
 .codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },
 .priv_class = &psp_muxer_class,
 };
@@ -3330,7 +3654,7 @@
 .write_header = mov_write_header,
 .write_packet = mov_write_packet,
 .write_trailer = mov_write_trailer,
- .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
+ .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,
 .codec_tag = (const AVCodecTag* const []){ codec_3gp_tags, 0 },
 .priv_class = &tg2_muxer_class,
 };
@@ -3348,7 +3672,7 @@
 .write_header = mov_write_header,
 .write_packet = mov_write_packet,
 .write_trailer = mov_write_trailer,
- .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
+ .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,
 .codec_tag = (const AVCodecTag* const []){ codec_ipod_tags, 0 },
 .priv_class = &ipod_muxer_class,
 };
@@ -3366,8 +3690,26 @@
 .write_header = mov_write_header,
 .write_packet = mov_write_packet,
 .write_trailer = mov_write_trailer,
- .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
+ .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,
 .codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },
 .priv_class = &ismv_muxer_class,
 };
 #endif
+#if CONFIG_F4V_MUXER
+MOV_CLASS(f4v)
+AVOutputFormat ff_f4v_muxer = {
+ .name = "f4v",
+ .long_name = NULL_IF_CONFIG_SMALL("F4V Adobe Flash Video"),
+ .mime_type = "application/f4v",
+ .extensions = "f4v",
+ .priv_data_size = sizeof(MOVMuxContext),
+ .audio_codec = AV_CODEC_ID_AAC,
+ .video_codec = AV_CODEC_ID_H264,
+ .write_header = mov_write_header,
+ .write_packet = mov_write_packet,
+ .write_trailer = mov_write_trailer,
+ .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,
+ .codec_tag = (const AVCodecTag* const []){ codec_f4v_tags, 0 },
+ .priv_class = &f4v_muxer_class,
+};
+#endif

libav-v9.6.tar.bz2/libavformat/movenc.h -> libav-v10.1.tar.bz2/libavformat/movenc.h Changed

@@ -26,7 +26,8 @@
 
 #include "avformat.h"
 
-#define MOV_INDEX_CLUSTER_SIZE 16384
+#define MOV_FRAG_INFO_ALLOC_INCREMENT 64
+#define MOV_INDEX_CLUSTER_SIZE 1024
 #define MOV_TIMESCALE 1000
 
 #define RTP_MAX_PACKET_SIZE 1450
@@ -39,6 +40,7 @@
 #define MODE_3G2 0x10
 #define MODE_IPOD 0x20
 #define MODE_ISM 0x40
+#define MODE_F4V 0x80
 
 typedef struct MOVIentry {
 uint64_t pos;
@@ -73,7 +75,7 @@
 int64_t tfrf_offset;
 } MOVFragmentInfo;
 
-typedef struct MOVIndex {
+typedef struct MOVTrack {
 int mode;
 int entry;
 unsigned timescale;
@@ -84,6 +86,7 @@
 int has_keyframes;
 #define MOV_TRACK_CTTS 0x0001
 #define MOV_TRACK_STPS 0x0002
+#define MOV_TRACK_ENABLED 0x0004
 uint32_t flags;
 int language;
 int track_id;
@@ -93,6 +96,7 @@
 int vos_len;
 uint8_t *vos_data;
 MOVIentry *cluster;
+ unsigned cluster_capacity;
 int audio_vbr;
 int height; ///< active picture (w/o VBI) height for D-10/IMX
 uint32_t tref_tag;
@@ -113,13 +117,13 @@
 HintSampleQueue sample_queue;
 
 AVIOContext *mdat_buf;
- int64_t moof_size_offset;
 int64_t data_offset;
 int64_t frag_start;
 int64_t tfrf_offset;
 
 int nb_frag_info;
 MOVFragmentInfo *frag_info;
+ unsigned frag_info_capacity;
 
 struct {
 int64_t struct_offset;
@@ -153,6 +157,10 @@
 int max_fragment_size;
 int ism_lookahead;
 AVIOContext *mdat_buf;
+
+ int64_t reserved_moov_pos;
+
+ char *major_brand;
 } MOVMuxContext;
 
 #define FF_MOV_FLAG_RTP_HINT 1
@@ -162,6 +170,8 @@
 #define FF_MOV_FLAG_SEPARATE_MOOF 16
 #define FF_MOV_FLAG_FRAG_CUSTOM 32
 #define FF_MOV_FLAG_ISML 64
+#define FF_MOV_FLAG_FASTSTART 128
+#define FF_MOV_FLAG_OMIT_TFHD_OFFSET 256
 
 int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt);

libav-v9.6.tar.bz2/libavformat/movenchint.c -> libav-v10.1.tar.bz2/libavformat/movenchint.c Changed

@@ -87,7 +87,7 @@
 if (queue->samples[i].own_data)
 av_free(queue->samples[i].data);
 av_freep(&queue->samples);
- queue->len = 0;
+ queue->len = 0;
 queue->size = 0;
 }
 
@@ -104,17 +104,16 @@
 if (size <= 14)
 return;
 if (!queue->samples || queue->len >= queue->size) {
- HintSample* samples;
 queue->size += 10;
- samples = av_realloc(queue->samples, sizeof(HintSample)*queue->size);
- if (!samples)
+ if (av_reallocp(&queue->samples, sizeof(*queue->samples) * queue->size) < 0) {
+ queue->len = queue->size = 0;
 return;
- queue->samples = samples;
+ }
 }
 queue->samples[queue->len].data = data;
 queue->samples[queue->len].size = size;
 queue->samples[queue->len].sample_number = sample;
- queue->samples[queue->len].offset = 0;
+ queue->samples[queue->len].offset = 0;
 queue->samples[queue->len].own_data = 0;
 queue->len++;
 }
@@ -128,7 +127,7 @@
 for (i = 0; i < queue->len; ) {
 HintSample *sample = &queue->samples[i];
 if (!sample->own_data) {
- uint8_t* ptr = av_malloc(sample->size);
+ uint8_t *ptr = av_malloc(sample->size);
 if (!ptr) {
 /* Unable to allocate memory for this one, remove it */
 memmove(queue->samples + i, queue->samples + i + 1,
@@ -309,11 +308,11 @@
 * @param data buffer containing RTP packets
 * @param size the size of the data buffer
 * @param trk the MOVTrack for the hint track
- * @param pts pointer where the timestamp for the written RTP hint is stored
+ * @param dts pointer where the timestamp for the written RTP hint is stored
 * @return the number of RTP packets in the written hint
 */
 static int write_hint_packets(AVIOContext *out, const uint8_t *data,
- int size, MOVTrack *trk, int64_t *pts)
+ int size, MOVTrack *trk, int64_t *dts)
 {
 int64_t curpos;
 int64_t count_pos, entries_pos;
@@ -328,6 +327,7 @@
 uint32_t packet_len = AV_RB32(data);
 uint16_t seq;
 uint32_t ts;
+ int32_t ts_diff;
 
 data += 4;
 size -= 4;
@@ -344,25 +344,35 @@
 trk->max_packet_size = packet_len;
 
 seq = AV_RB16(&data[2]);
- ts = AV_RB32(&data[4]);
+ ts = AV_RB32(&data[4]);
 
 if (trk->prev_rtp_ts == 0)
 trk->prev_rtp_ts = ts;
 /* Unwrap the 32-bit RTP timestamp that wraps around often
 * into a not (as often) wrapping 64-bit timestamp. */
- trk->cur_rtp_ts_unwrapped += (int32_t) (ts - trk->prev_rtp_ts);
- trk->prev_rtp_ts = ts;
- if (*pts == AV_NOPTS_VALUE)
- *pts = trk->cur_rtp_ts_unwrapped;
+ ts_diff = ts - trk->prev_rtp_ts;
+ if (ts_diff > 0) {
+ trk->cur_rtp_ts_unwrapped += ts_diff;
+ trk->prev_rtp_ts = ts;
+ ts_diff = 0;
+ }
+ if (*dts == AV_NOPTS_VALUE)
+ *dts = trk->cur_rtp_ts_unwrapped;
 
 count++;
 /* RTPpacket header */
 avio_wb32(out, 0); /* relative_time */
 avio_write(out, data, 2); /* RTP header */
 avio_wb16(out, seq); /* RTPsequenceseed */
- avio_wb16(out, 0); /* reserved + flags */
+ avio_wb16(out, ts_diff ? 4 : 0); /* reserved + flags (extra_flag) */
 entries_pos = avio_tell(out);
 avio_wb16(out, 0); /* entry count */
+ if (ts_diff) { /* if extra_flag is set */
+ avio_wb32(out, 16); /* extra_information_length */
+ avio_wb32(out, 12); /* rtpoffsetTLV box */
+ avio_write(out, "rtpo", 4);
+ avio_wb32(out, ts_diff);
+ }
 
 data += 12;
 size -= 12;
@@ -417,7 +427,7 @@
 * for next time. */
 size = avio_close_dyn_buf(rtp_ctx->pb, &buf);
 if ((ret = ffio_open_dyn_packet_buf(&rtp_ctx->pb,
- RTP_MAX_PACKET_SIZE)) < 0)
+ RTP_MAX_PACKET_SIZE)) < 0)
 goto done;
 
 if (size <= 0)
@@ -445,8 +455,9 @@
 return ret;
 }
 
-void ff_mov_close_hinting(MOVTrack *track) {
- AVFormatContext* rtp_ctx = track->rtp_ctx;
+void ff_mov_close_hinting(MOVTrack *track)
+{
+ AVFormatContext *rtp_ctx = track->rtp_ctx;
 uint8_t *ptr;
 
 av_freep(&track->enc);

libav-v9.6.tar.bz2/libavformat/mp3dec.c -> libav-v10.1.tar.bz2/libavformat/mp3dec.c Changed

@@ -73,7 +73,7 @@
     }
     // keep this in sync with ac3 probe, both need to avoid
     // issues with MPEG-files!
-    if (first_frames >= 4) return AVPROBE_SCORE_MAX / 2 + 1;
+    if (first_frames >= 4) return AVPROBE_SCORE_EXTENSION + 1;
 
     if (max_frames) {
         int pes = 0, i;
@@ -94,8 +94,8 @@
         if (pes)
             max_frames = (max_frames + pes - 1) / pes;
     }
-    if      (max_frames >  500) return AVPROBE_SCORE_MAX / 2;
-    else if (max_frames >= 4)   return AVPROBE_SCORE_MAX / 4;
+    if      (max_frames >  500) return AVPROBE_SCORE_EXTENSION;
+    else if (max_frames >= 4)   return AVPROBE_SCORE_EXTENSION / 2;
     else if (max_frames >= 1)   return 1;
     else                        return 0;
 //mpegps_mp3_unrecognized_format.mpg has max_frames=3
@@ -282,5 +282,5 @@
     .read_seek      = mp3_seek,
     .priv_data_size = sizeof(MP3DecContext),
     .flags          = AVFMT_GENERIC_INDEX,
-    .extensions     = "mp2,mp3,m2a", /* XXX: use probe */
+    .extensions     = "mp2,mp3,m2a,mpa", /* XXX: use probe */
 };

libav-v9.6.tar.bz2/libavformat/mp3enc.c -> libav-v10.1.tar.bz2/libavformat/mp3enc.c Changed

@@ -84,6 +84,7 @@
 ID3v2EncContext id3;
 int id3v2_version;
 int write_id3v1;
+ int write_xing;
 
 /* xing header */
 int64_t xing_offset;
@@ -118,10 +119,13 @@
 MPADecodeHeader mpah;
 int srate_idx, i, channels;
 int bitrate_idx;
+ int best_bitrate_idx;
+ int best_bitrate_error = INT_MAX;
 int xing_offset;
 int ver = 0;
+ int lsf, bytes_needed;
 
- if (!s->pb->seekable)
+ if (!s->pb->seekable || !mp3->write_xing)
 return;
 
 for (i = 0; i < FF_ARRAY_ELEMS(avpriv_mpa_freq_tab); i++) {
@@ -149,21 +153,51 @@
 return;
 }
 
- /* 64 kbps frame, should be large enough */
- bitrate_idx = (ver == 3) ? 5 : 8;
-
 /* dummy MPEG audio header */
 header = 0xff << 24; // sync
 header |= (0x7 << 5 | ver << 3 | 0x1 << 1 | 0x1) << 16; // sync/audio-version/layer 3/no crc*/
- header |= (bitrate_idx << 4 | srate_idx << 2) << 8;
+ header |= (srate_idx << 2) << 8;
 header |= channels << 6;
+
+ lsf = !((header & (1 << 20) && header & (1 << 19)));
+
+ xing_offset = xing_offtbl[ver != 3][channels == 1];
+ bytes_needed = 4 // header
+ + xing_offset
+ + 4 // xing tag
+ + 4 // frames/size/toc flags
+ + 4 // frames
+ + 4 // size
+ + XING_TOC_SIZE; // toc
+
+ for (bitrate_idx = 1; bitrate_idx < 15; bitrate_idx++) {
+ int bit_rate = 1000 * avpriv_mpa_bitrate_tab[lsf][3 - 1][bitrate_idx];
+ int error = FFABS(bit_rate - codec->bit_rate);
+
+ if (error < best_bitrate_error){
+ best_bitrate_error = error;
+ best_bitrate_idx = bitrate_idx;
+ }
+ }
+
+ for (bitrate_idx = best_bitrate_idx; bitrate_idx < 15; bitrate_idx++) {
+ int32_t mask = bitrate_idx << (4 + 8);
+ header |= mask;
+
+ avpriv_mpegaudio_decode_header(&mpah, header);
+
+ if (bytes_needed <= mpah.frame_size)
+ break;
+
+ header &= ~mask;
+ }
+
 avio_wb32(s->pb, header);
 
 avpriv_mpegaudio_decode_header(&mpah, header);
 
 av_assert0(mpah.frame_size >= XING_MAX_SIZE);
 
- xing_offset = xing_offtbl[ver != 3][codec->channels == 1];
 ffio_fill(s->pb, 0, xing_offset);
 mp3->xing_offset = avio_tell(s->pb);
 ffio_wfourcc(s->pb, "Xing");
@@ -179,8 +213,7 @@
 for (i = 0; i < XING_TOC_SIZE; i++)
 avio_w8(s->pb, 255 * i / XING_TOC_SIZE);
 
- mpah.frame_size -= 4 + xing_offset + 4 + 4 + 4 + 4 + XING_TOC_SIZE;
- ffio_fill(s->pb, 0, mpah.frame_size);
+ ffio_fill(s->pb, 0, mpah.frame_size - bytes_needed);
 }
 
 /*
@@ -306,7 +339,7 @@
 .name = "mp2",
 .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
 .mime_type = "audio/x-mpeg",
- .extensions = "mp2,m2a",
+ .extensions = "mp2,m2a,mpa",
 .audio_codec = AV_CODEC_ID_MP2,
 .video_codec = AV_CODEC_ID_NONE,
 .write_packet = ff_raw_write_packet,
@@ -318,9 +351,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 },
 };
 
@@ -343,7 +378,11 @@
 return AVERROR(ENOMEM);
 
 pktl->pkt = *pkt;
- pkt->destruct = NULL;
+ pktl->pkt.buf = av_buffer_ref(pkt->buf);
+ if (!pktl->pkt.buf) {
+ av_freep(&pktl);
+ return AVERROR(ENOMEM);
+ }
 
 if (mp3->queue_end)
 mp3->queue_end->next = pktl;
@@ -385,6 +424,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;
@@ -408,13 +455,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);
 mp3_write_xing(s);
 }

libav-v9.6.tar.bz2/libavformat/mpc8.c -> libav-v10.1.tar.bz2/libavformat/mpc8.c Changed

@@ -92,7 +92,7 @@
 if (size < 2)
 return 0;
 if (bs + size - 2 >= bs_end)
- return AVPROBE_SCORE_MAX / 4 - 1; //seems to be valid MPC but no header yet
+ return AVPROBE_SCORE_EXTENSION - 1; // seems to be valid MPC but no header yet
 if (header_found) {
 if (size < 11 || size > 28)
 return 0;
@@ -139,12 +139,21 @@
 int i, t, seekd;
 GetBitContext gb;
 
+ if (s->nb_streams == 0) {
+ av_log(s, AV_LOG_ERROR, "No stream added before parsing seek table\n");
+ return;
+ }
+
 avio_seek(s->pb, off, SEEK_SET);
 mpc8_get_chunk_header(s->pb, &tag, &size);
 if(tag != TAG_SEEKTABLE){
 av_log(s, AV_LOG_ERROR, "No seek table at given position\n");
 return;
 }
+ if (size < 0 || size >= INT_MAX / 2) {
+ av_log(s, AV_LOG_ERROR, "Bad seek table size\n");
+ return;
+ }
 if(!(buf = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE)))
 return;
 avio_read(s->pb, buf, size);

libav-v9.6.tar.bz2/libavformat/mpeg.c -> libav-v10.1.tar.bz2/libavformat/mpeg.c Changed

@@ -82,14 +82,14 @@
 }
 
 if(vid+audio > invalid) /* invalid VDR files nd short PES streams */
- score= AVPROBE_SCORE_MAX/4;
+ score = AVPROBE_SCORE_EXTENSION / 2;
 
 if(sys>invalid && sys*9 <= pspack*10)
- return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
+ return pspack > 2 ? AVPROBE_SCORE_EXTENSION + 2 : AVPROBE_SCORE_EXTENSION / 2; // 1 more than .mpg
 if(pspack > invalid && (priv1+vid+audio)*10 >= pspack*9)
- return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
+ return pspack > 2 ? AVPROBE_SCORE_EXTENSION + 2 : AVPROBE_SCORE_EXTENSION / 2; // 1 more than .mpg
 if((!!vid ^ !!audio) && (audio > 4 || vid > 1) && !sys && !pspack && p->buf_size>2048 && vid + audio > invalid) /* PES stream */
- return (audio > 12 || vid > 3) ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4;
+ return (audio > 12 || vid > 3) ? AVPROBE_SCORE_EXTENSION + 2 : AVPROBE_SCORE_EXTENSION / 2;
 
 //02-Penguin.flac has sys:0 priv1:0 pspack:0 vid:0 audio:1
 //mp3_misidentified_2.mp3 has sys:0 priv1:0 pspack:0 vid:0 audio:6
@@ -453,7 +453,6 @@
 codec_id = AV_CODEC_ID_DTS;
 } else if (startcode >= 0xa0 && startcode <= 0xaf) {
 type = AVMEDIA_TYPE_AUDIO;
- /* 16 bit form will be handled as AV_CODEC_ID_PCM_S16BE */
 codec_id = AV_CODEC_ID_PCM_DVD;
 } else if (startcode >= 0xb0 && startcode <= 0xbf) {
 type = AVMEDIA_TYPE_AUDIO;
@@ -494,35 +493,10 @@
 st->id = startcode;
 st->codec->codec_type = type;
 st->codec->codec_id = codec_id;
- if (codec_id != AV_CODEC_ID_PCM_S16BE)
- st->need_parsing = AVSTREAM_PARSE_FULL;
+ st->need_parsing = AVSTREAM_PARSE_FULL;
 found:
 if(st->discard >= AVDISCARD_ALL)
 goto skip;
- if ((startcode >= 0xa0 && startcode <= 0xaf) ||
- (startcode == 0x1bd && ((dvdaudio_substream_type & 0xe0) == 0xa0))) {
- int b1, freq;
-
- /* for LPCM, we just skip the header and consider it is raw
- audio data */
- if (len <= 3)
- goto skip;
- avio_r8(s->pb); /* emphasis (1), muse(1), reserved(1), frame number(5) */
- b1 = avio_r8(s->pb); /* quant (2), freq(2), reserved(1), channels(3) */
- avio_r8(s->pb); /* dynamic range control (0x80 = off) */
- len -= 3;
- freq = (b1 >> 4) & 3;
- st->codec->sample_rate = lpcm_freq_tab[freq];
- st->codec->channels = 1 + (b1 & 7);
- st->codec->bits_per_coded_sample = 16 + ((b1 >> 6) & 3) * 4;
- st->codec->bit_rate = st->codec->channels *
- st->codec->sample_rate *
- st->codec->bits_per_coded_sample;
- if (st->codec->bits_per_coded_sample == 16)
- st->codec->codec_id = AV_CODEC_ID_PCM_S16BE;
- else if (st->codec->bits_per_coded_sample == 28)
- return AVERROR(EINVAL);
- }
 ret = av_get_packet(s->pb, pkt, len);
 pkt->pts = pts;
 pkt->dts = dts;

libav-v9.6.tar.bz2/libavformat/mpeg.h -> libav-v10.1.tar.bz2/libavformat/mpeg.h Changed

libav-v9.6.tar.bz2/libavformat/mpegenc.c -> libav-v10.1.tar.bz2/libavformat/mpegenc.c Changed

libav-v9.6.tar.bz2/libavformat/mpegts.c -> libav-v10.1.tar.bz2/libavformat/mpegts.c Changed

@@ -19,6 +19,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "libavutil/buffer.h"
 #include "libavutil/crc.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/log.h"
@@ -27,6 +28,7 @@
 #include "libavutil/opt.h"
 #include "libavcodec/bytestream.h"
 #include "libavcodec/get_bits.h"
+#include "libavcodec/mathops.h"
 #include "avformat.h"
 #include "mpegts.h"
 #include "internal.h"
@@ -97,6 +99,8 @@
 int raw_packet_size;
 
 int pos47;
+ /** position corresponding to pos47, or 0 if pos47 invalid */
+ int64_t pos;
 
 /** if true, all pids are analyzed to find streams */
 int auto_guess;
@@ -173,7 +177,7 @@
 int64_t pts, dts;
 int64_t ts_packet_pos; /**< position of first TS packet of this PES packet */
 uint8_t header[MAX_PES_HEADER_SIZE];
- uint8_t *buffer;
+ AVBufferRef *buffer;
 SLConfigDescr sl;
 } PESContext;
 
@@ -197,10 +201,10 @@
 static void add_pat_entry(MpegTSContext *ts, unsigned int programid)
 {
 struct Program *p;
- void *tmp = av_realloc(ts->prg, (ts->nb_prg+1)*sizeof(struct Program));
- if(!tmp)
+ if (av_reallocp_array(&ts->prg, ts->nb_prg + 1, sizeof(*ts->prg)) < 0) {
+ ts->nb_prg = 0;
 return;
- ts->prg = tmp;
+ }
 p = &ts->prg[ts->nb_prg];
 p->id = programid;
 p->nb_pids = 0;
@@ -238,6 +242,17 @@
 int i, j, k;
 int used = 0, discarded = 0;
 struct Program *p;
+
+ /* If none of the programs have .discard=AVDISCARD_ALL then there's
+ * no way we have to discard this packet
+ */
+ for (k = 0; k < ts->stream->nb_programs; k++) {
+ if (ts->stream->programs[k]->discard == AVDISCARD_ALL)
+ break;
+ }
+ if (k == ts->stream->nb_programs)
+ return 0;
+
 for(i=0; i<ts->nb_prg; i++) {
 p = &ts->prg[i];
 for(j=0; j<p->nb_pids; j++) {
@@ -364,7 +379,7 @@
 av_freep(&filter->u.section_filter.section_buf);
 else if (filter->type == MPEGTS_PES) {
 PESContext *pes = filter->u.pes_filter.opaque;
- av_freep(&pes->buffer);
+ av_buffer_unref(&pes->buffer);
 /* referenced private data will be freed later in
 * avformat_close_input */
 if (!((PESContext *)filter->u.pes_filter.opaque)->st) {
@@ -522,6 +537,8 @@
 { 0x10, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG4 },
 { 0x11, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC_LATM }, /* LATM syntax */
 { 0x1b, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 },
+ { 0x24, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC },
+ { 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS },
 { 0xd1, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC },
 { 0xea, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1 },
 { 0 },
@@ -553,6 +570,7 @@
 { MKTAG('D','T','S','1'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS },
 { MKTAG('D','T','S','2'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS },
 { MKTAG('D','T','S','3'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS },
+ { MKTAG('H','E','V','C'), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC },
 { MKTAG('V','C','-','1'), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1 },
 { 0 },
 };
@@ -635,8 +653,8 @@
 {
 av_init_packet(pkt);
 
- pkt->destruct = av_destruct_packet;
- pkt->data = pes->buffer;
+ pkt->buf = pes->buffer;
+ pkt->data = pes->buffer->data;
 pkt->size = pes->data_index;
 
 if(pes->total_size != MAX_PES_PAYLOAD &&
@@ -793,7 +811,8 @@
 pes->total_size = MAX_PES_PAYLOAD;
 
 /* allocate pes buffer */
- pes->buffer = av_malloc(pes->total_size+FF_INPUT_BUFFER_PADDING_SIZE);
+ pes->buffer = av_buffer_alloc(pes->total_size +
+ FF_INPUT_BUFFER_PADDING_SIZE);
 if (!pes->buffer)
 return AVERROR(ENOMEM);
 
@@ -895,7 +914,7 @@
 if (pes->data_index > 0 && pes->data_index+buf_size > pes->total_size) {
 new_pes_packet(pes, ts->pkt);
 pes->total_size = MAX_PES_PAYLOAD;
- pes->buffer = av_malloc(pes->total_size+FF_INPUT_BUFFER_PADDING_SIZE);
+ pes->buffer = av_buffer_alloc(pes->total_size + FF_INPUT_BUFFER_PADDING_SIZE);
 if (!pes->buffer)
 return AVERROR(ENOMEM);
 ts->stop_parse = 1;
@@ -904,7 +923,7 @@
 // not sure if this is legal in ts but see issue #2392
 buf_size = pes->total_size;
 }
- memcpy(pes->buffer+pes->data_index, p, buf_size);
+ memcpy(pes->buffer->data + pes->data_index, p, buf_size);
 pes->data_index += buf_size;
 }
 buf_size = 0;
@@ -1089,7 +1108,7 @@
 descr->sl.au_seq_num_len = (lengths >> 7) & 0x1f;
 descr->sl.packet_seq_num_len = (lengths >> 2) & 0x1f;
 } else {
- av_log_missing_feature(d->s, "Predefined SLConfigDescriptor\n", 0);
+ avpriv_report_missing_feature(d->s, "Predefined SLConfigDescriptor");
 }
 return 0;
 }
@@ -1311,7 +1330,7 @@
 }
 if (st->codec->extradata) {
 if (st->codec->extradata_size == 4 && memcmp(st->codec->extradata, *pp, 4))
- av_log_ask_for_sample(fc, "DVB sub with multiple IDs\n");
+ avpriv_request_sample(fc, "DVB sub with multiple IDs");
 } else {
 st->codec->extradata = av_malloc(4 + FF_INPUT_BUFFER_PADDING_SIZE);
 if (st->codec->extradata) {
@@ -1680,7 +1699,7 @@
 return 0;
 
 pos = avio_tell(ts->stream->pb);
- ts->pos47= pos % ts->raw_packet_size;
+ MOD_UNLIKELY(ts->pos47, pos, ts->raw_packet_size, ts->pos);
 
 if (tss->type == MPEGTS_SECTION) {
 if (is_start) {
@@ -1740,17 +1759,17 @@
 }
 
 /* return -1 if error or EOF. Return 0 if OK. */
-static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size)
+static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size, const uint8_t **data)
 {
 AVIOContext *pb = s->pb;
- int skip, len;
+ int len;
 
 for(;;) {
- len = avio_read(pb, buf, TS_PACKET_SIZE);
+ len = ffio_read_indirect(pb, buf, TS_PACKET_SIZE, data);
 if (len != TS_PACKET_SIZE)
 return len < 0 ? len : AVERROR_EOF;
 /* check packet sync byte */
- if (buf[0] != 0x47) {
+ if ((*data)[0] != 0x47) {
 /* find a new packet start */
 avio_seek(pb, -TS_PACKET_SIZE, SEEK_CUR);
 if (mpegts_resync(s) < 0)
@@ -1758,19 +1777,25 @@
 else
 continue;
 } else {
- skip = raw_packet_size - TS_PACKET_SIZE;
- if (skip > 0)
- avio_skip(pb, skip);
 break;
 }
 }
 return 0;
 }
 
+static void finished_reading_packet(AVFormatContext *s, int raw_packet_size)
+{
+ AVIOContext *pb = s->pb;
+ int skip = raw_packet_size - TS_PACKET_SIZE;
+ if (skip > 0)
+ avio_skip(pb, skip);
+}
+
 static int handle_packets(MpegTSContext *ts, int nb_packets)
 {
 AVFormatContext *s = ts->stream;
 uint8_t packet[TS_PACKET_SIZE+FF_INPUT_BUFFER_PADDING_SIZE];
+ const uint8_t *data;
 int packet_num, ret = 0;
 
 if (avio_tell(s->pb) != ts->last_pos) {
@@ -1781,7 +1806,7 @@
 if (ts->pids[i]) {
 if (ts->pids[i]->type == MPEGTS_PES) {
 PESContext *pes = ts->pids[i]->u.pes_filter.opaque;
- av_freep(&pes->buffer);
+ av_buffer_unref(&pes->buffer);
 pes->data_index = 0;
 pes->state = MPEGTS_SKIP; /* skip until pes header */
 }
@@ -1799,10 +1824,11 @@
 packet_num++;
 if (nb_packets != 0 && packet_num >= nb_packets)
 break;
- ret = read_packet(s, packet, ts->raw_packet_size);
+ ret = read_packet(s, packet, ts->raw_packet_size, &data);
 if (ret != 0)
 break;
- ret = handle_packet(ts, packet);
+ ret = handle_packet(ts, data);
+ finished_reading_packet(s, ts->raw_packet_size);
 if (ret != 0)
 break;
 }
@@ -1906,6 +1932,7 @@
 int64_t pcrs[2], pcr_h;
 int packet_count[2];
 uint8_t packet[TS_PACKET_SIZE];
+ const uint8_t *data;
 
 /* only read packets */
 
@@ -1921,18 +1948,21 @@
 nb_pcrs = 0;
 nb_packets = 0;
 for(;;) {
- ret = read_packet(s, packet, ts->raw_packet_size);
+ ret = read_packet(s, packet, ts->raw_packet_size, &data);
 if (ret < 0)
 return -1;
- pid = AV_RB16(packet + 1) & 0x1fff;
+ pid = AV_RB16(data + 1) & 0x1fff;
 if ((pcr_pid == -1 || pcr_pid == pid) &&
- parse_pcr(&pcr_h, &pcr_l, packet) == 0) {
+ parse_pcr(&pcr_h, &pcr_l, data) == 0) {
+ finished_reading_packet(s, ts->raw_packet_size);
 pcr_pid = pid;
 packet_count[nb_pcrs] = nb_packets;
 pcrs[nb_pcrs] = pcr_h * 300 + pcr_l;
 nb_pcrs++;
 if (nb_pcrs >= 2)
 break;
+ } else {
+ finished_reading_packet(s, ts->raw_packet_size);
 }
 nb_packets++;
 }
@@ -1964,15 +1994,19 @@
 int64_t pcr_h, next_pcr_h, pos;
 int pcr_l, next_pcr_l;
 uint8_t pcr_buf[12];
+ const uint8_t *data;
 
 if (av_new_packet(pkt, TS_PACKET_SIZE) < 0)
 return AVERROR(ENOMEM);
 pkt->pos= avio_tell(s->pb);
- ret = read_packet(s, pkt->data, ts->raw_packet_size);
+ ret = read_packet(s, pkt->data, ts->raw_packet_size, &data);
 if (ret < 0) {
 av_free_packet(pkt);
 return ret;
 }
+ if (data != pkt->data)
+ memcpy(pkt->data, data, ts->raw_packet_size);
+ finished_reading_packet(s, ts->raw_packet_size);
 if (ts->mpeg2ts_compute_pcr) {
 /* compute exact PCR for each packet */
 if (parse_pcr(&pcr_h, &pcr_l, pkt->data) == 0) {
@@ -2029,16 +2063,20 @@
 return ret;
 }
 
-static int mpegts_read_close(AVFormatContext *s)
+static void mpegts_free(MpegTSContext *ts)
 {
- MpegTSContext *ts = s->priv_data;
 int i;
 
 clear_programs(ts);
 
 for(i=0;i<NB_PID_MAX;i++)
 if (ts->pids[i]) mpegts_close_filter(ts, ts->pids[i]);
+}
 
+static int mpegts_read_close(AVFormatContext *s)
+{
+ MpegTSContext *ts = s->priv_data;
+ mpegts_free(ts);
 return 0;
 }
 
@@ -2150,10 +2188,7 @@
 
 void ff_mpegts_parse_close(MpegTSContext *ts)
 {
- int i;
-
- for(i=0;i<NB_PID_MAX;i++)
- av_free(ts->pids[i]);
+ mpegts_free(ts);
 av_free(ts);
 }

libav-v9.6.tar.bz2/libavformat/mpegts.h -> libav-v10.1.tar.bz2/libavformat/mpegts.h Changed

libav-v9.6.tar.bz2/libavformat/mpegtsenc.c -> libav-v10.1.tar.bz2/libavformat/mpegtsenc.c Changed

@@ -22,9 +22,10 @@
 #include "libavutil/bswap.h"
 #include "libavutil/crc.h"
 #include "libavutil/dict.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
-#include "libavcodec/mpegvideo.h"
+#include "libavcodec/internal.h"
 #include "avformat.h"
 #include "internal.h"
 #include "mpegts.h"
@@ -279,6 +280,9 @@
 case AV_CODEC_ID_H264:
 stream_type = STREAM_TYPE_VIDEO_H264;
 break;
+ case AV_CODEC_ID_CAVS:
+ stream_type = STREAM_TYPE_VIDEO_CAVS;
+ break;
 case AV_CODEC_ID_DIRAC:
 stream_type = STREAM_TYPE_VIDEO_DIRAC;
 break;
@@ -1016,7 +1020,7 @@
 }
 
 do {
- p = avpriv_mpv_find_start_code(p, buf_end, &state);
+ p = avpriv_find_start_code(p, buf_end, &state);
 av_dlog(s, "nal %d\n", state & 0x1f);
 } while (p < buf_end && (state & 0x1f) != 9 &&
 (state & 0x1f) != 5 && (state & 0x1f) != 1);

libav-v9.6.tar.bz2/libavformat/mpegvideodec.c -> libav-v10.1.tar.bz2/libavformat/mpegvideodec.c Changed

libav-v9.6.tar.bz2/libavformat/mpjpeg.c -> libav-v10.1.tar.bz2/libavformat/mpjpeg.c Changed

libav-v9.6.tar.bz2/libavformat/mtv.c -> libav-v10.1.tar.bz2/libavformat/mtv.c Changed

libav-v9.6.tar.bz2/libavformat/mux.c -> libav-v10.1.tar.bz2/libavformat/mux.c Changed

@@ -19,8 +19,6 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-/* #define DEBUG */
-
 #include "avformat.h"
 #include "avio_internal.h"
 #include "internal.h"
@@ -33,6 +31,7 @@
 #include "id3v2.h"
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
+#include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/time.h"
@@ -189,13 +188,18 @@
 
 if (av_cmp_q(st->sample_aspect_ratio,
 codec->sample_aspect_ratio)) {
- av_log(s, AV_LOG_ERROR, "Aspect ratio mismatch between muxer "
- "(%d/%d) and encoder layer (%d/%d)\n",
- st->sample_aspect_ratio.num, st->sample_aspect_ratio.den,
- codec->sample_aspect_ratio.num,
- codec->sample_aspect_ratio.den);
- ret = AVERROR(EINVAL);
- goto fail;
+ if (st->sample_aspect_ratio.num != 0 &&
+ st->sample_aspect_ratio.den != 0 &&
+ codec->sample_aspect_ratio.den != 0 &&
+ codec->sample_aspect_ratio.den != 0) {
+ av_log(s, AV_LOG_ERROR, "Aspect ratio mismatch between muxer "
+ "(%d/%d) and encoder layer (%d/%d)\n",
+ st->sample_aspect_ratio.num, st->sample_aspect_ratio.den,
+ codec->sample_aspect_ratio.num,
+ codec->sample_aspect_ratio.den);
+ ret = AVERROR(EINVAL);
+ goto fail;
+ }
 }
 break;
 }
@@ -228,6 +232,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) {
@@ -305,7 +312,7 @@
 return ret;
 }
 
- if ((ret = init_pts(s) < 0))
+ if ((ret = init_pts(s)) < 0)
 return ret;
 
 return 0;
@@ -391,10 +398,67 @@
 return 0;
 }
 
+/*
+ * FIXME: this function should NEVER get undefined pts/dts beside when the
+ * AVFMT_NOTIMESTAMPS is set.
+ * Those additional safety checks should be dropped once the correct checks
+ * are set in the callers.
+ */
+
+static int write_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ int ret;
+ if (!(s->oformat->flags & (AVFMT_TS_NEGATIVE | AVFMT_NOTIMESTAMPS))) {
+ AVRational time_base = s->streams[pkt->stream_index]->time_base;
+ int64_t offset = 0;
+
+ if (!s->offset && pkt->dts != AV_NOPTS_VALUE && pkt->dts < 0) {
+ s->offset = -pkt->dts;
+ s->offset_timebase = time_base;
+ }
+ if (s->offset)
+ offset = av_rescale_q(s->offset, s->offset_timebase, time_base);
+
+ if (pkt->dts != AV_NOPTS_VALUE)
+ pkt->dts += offset;
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts += offset;
+ }
+ ret = s->oformat->write_packet(s, pkt);
+
+ if (s->pb && ret >= 0 && s->flags & AVFMT_FLAG_FLUSH_PACKETS)
+ avio_flush(s->pb);
+
+ 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)
 return s->oformat->write_packet(s, pkt);
@@ -406,7 +470,7 @@
 if (ret < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS))
 return ret;
 
- ret = s->oformat->write_packet(s, pkt);
+ ret = write_packet(s, pkt);
 
 if (ret >= 0)
 s->streams[pkt->stream_index]->nb_frames++;
@@ -420,7 +484,12 @@
 
 this_pktl = av_mallocz(sizeof(AVPacketList));
 this_pktl->pkt = *pkt;
+#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
 pkt->destruct = NULL; // do not free original but only the copy
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+ pkt->buf = NULL;
 av_dup_packet(&this_pktl->pkt); // duplicate the packet if it uses non-alloced memory
 
 if (s->streams[pkt->stream_index]->last_in_packet_buffer) {
@@ -448,7 +517,8 @@
 *next_point = this_pktl;
 }
 
-static int ff_interleave_compare_dts(AVFormatContext *s, AVPacket *next, AVPacket *pkt)
+static int interleave_compare_dts(AVFormatContext *s, AVPacket *next,
+ AVPacket *pkt)
 {
 AVStream *st = s->streams[pkt->stream_index];
 AVStream *st2 = s->streams[next->stream_index];
@@ -468,13 +538,44 @@
 int i;
 
 if (pkt) {
- ff_interleave_add_packet(s, pkt, ff_interleave_compare_dts);
+ ff_interleave_add_packet(s, pkt, interleave_compare_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);
+ stream_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;
+ }
+ } else {
+ for (i = 0; i < s->nb_streams; i++)
+ stream_count += !!s->streams[i]->last_in_packet_buffer;
 }
 
- for (i = 0; i < s->nb_streams; i++)
- stream_count += !!s->streams[i]->last_in_packet_buffer;
 
- if (stream_count && (s->nb_streams == stream_count || flush)) {
+ if (stream_count && (s->internal->nb_interleaved_streams == stream_count || flush)) {
 pktl = s->packet_buffer;
 *out = pktl->pkt;
 
@@ -492,15 +593,6 @@
 }
 }
 
-#if FF_API_INTERLEAVE_PACKET
-int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
- AVPacket *pkt, int flush)
-{
- return ff_interleave_packet_per_dts(s, out, pkt, flush);
-}
-
-#endif
-
 /**
 * Interleave an AVPacket correctly so it can be muxed.
 * @param out the interleaved packet will be output here
@@ -525,20 +617,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:%" PRId64 " pts:%" PRId64 "\n",
 pkt->size, pkt->dts, 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;
@@ -547,19 +647,26 @@
 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;
 
- ret = s->oformat->write_packet(s, &opkt);
+ ret = write_packet(s, &opkt);
 if (ret >= 0)
 s->streams[opkt.stream_index]->nb_frames++;
 
 av_free_packet(&opkt);
- pkt = NULL;
 
 if (ret < 0)
 return ret;
 }
+fail:
+ av_packet_unref(pkt);
+ return ret;
 }
 
 int av_write_trailer(AVFormatContext *s)
@@ -574,7 +681,7 @@
 if (!ret)
 break;
 
- ret = s->oformat->write_packet(s, &pkt);
+ ret = write_packet(s, &pkt);
 if (ret >= 0)
 s->streams[pkt.stream_index]->nb_frames++;
 
@@ -600,3 +707,21 @@
 av_freep(&s->priv_data);
 return ret;
 }
+
+int ff_write_chained(AVFormatContext *dst, int dst_stream, AVPacket *pkt,
+ AVFormatContext *src)
+{
+ AVPacket local_pkt;
+
+ local_pkt = *pkt;
+ local_pkt.stream_index = dst_stream;
+ if (pkt->pts != AV_NOPTS_VALUE)
+ local_pkt.pts = av_rescale_q(pkt->pts,
+ src->streams[pkt->stream_index]->time_base,
+ dst->streams[dst_stream]->time_base);
+ if (pkt->dts != AV_NOPTS_VALUE)
+ local_pkt.dts = av_rescale_q(pkt->dts,
+ src->streams[pkt->stream_index]->time_base,
+ dst->streams[dst_stream]->time_base);
+ return av_write_frame(dst, &local_pkt);
+}

libav-v9.6.tar.bz2/libavformat/mvi.c -> libav-v10.1.tar.bz2/libavformat/mvi.c Changed

libav-v9.6.tar.bz2/libavformat/mxfdec.c -> libav-v10.1.tar.bz2/libavformat/mxfdec.c Changed

@@ -43,7 +43,7 @@
 * Only tracks with associated descriptors will be decoded. "Highly Desirable" SMPTE 377M D.1
 */
 
-//#define DEBUG
+#include <stdint.h>
 
 #include "libavutil/aes.h"
 #include "libavutil/mathematics.h"
@@ -134,6 +134,9 @@
 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;
 unsigned int component_depth;
@@ -312,7 +315,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)
@@ -396,8 +399,7 @@
 int item_len = avio_rb32(pb);
 
 if (item_len != 18) {
- av_log_ask_for_sample(pb, "unsupported primer pack item length %d\n",
- item_len);
+ avpriv_request_sample(pb, "Primer pack item length %d", item_len);
 return AVERROR_PATCHWELCOME;
 }
 if (item_num > UINT_MAX / item_len)
@@ -413,18 +415,17 @@
 static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size, UID uid, int64_t klv_offset)
 {
 MXFContext *mxf = arg;
- MXFPartition *partition, *tmp_part;
+ MXFPartition *partition;
 UID op;
 uint64_t footer_partition;
 uint32_t nb_essence_containers;
+ int err;
 
- if (mxf->partitions_count+1 >= UINT_MAX / sizeof(*mxf->partitions))
- return AVERROR(ENOMEM);
-
- tmp_part = av_realloc(mxf->partitions, (mxf->partitions_count + 1) * sizeof(*mxf->partitions));
- if (!tmp_part)
- return AVERROR(ENOMEM);
- mxf->partitions = tmp_part;
+ if ((err = av_reallocp_array(&mxf->partitions, mxf->partitions_count + 1,
+ sizeof(*mxf->partitions))) < 0) {
+ mxf->partitions_count = 0;
+ return err;
+ }
 
 if (mxf->parsing_backward) {
 /* insert the new partition pack in the middle
@@ -549,13 +550,13 @@
 
 static int mxf_add_metadata_set(MXFContext *mxf, void *metadata_set)
 {
- MXFMetadataSet **tmp;
- if (mxf->metadata_sets_count+1 >= UINT_MAX / sizeof(*mxf->metadata_sets))
- return AVERROR(ENOMEM);
- tmp = av_realloc(mxf->metadata_sets, (mxf->metadata_sets_count + 1) * sizeof(*mxf->metadata_sets));
- if (!tmp)
- return AVERROR(ENOMEM);
- mxf->metadata_sets = tmp;
+ int err;
+
+ if ((err = av_reallocp_array(&mxf->metadata_sets, mxf->metadata_sets_count + 1,
+ sizeof(*mxf->metadata_sets))) < 0) {
+ mxf->metadata_sets_count = 0;
+ return err;
+ }
 mxf->metadata_sets[mxf->metadata_sets_count] = metadata_set;
 mxf->metadata_sets_count++;
 return 0;
@@ -832,6 +833,9 @@
 descriptor->aspect_ratio.num = avio_rb32(pb);
 descriptor->aspect_ratio.den = avio_rb32(pb);
 break;
+ case 0x3212:
+ descriptor->field_dominance = avio_r8(pb);
+ break;
 case 0x3301:
 descriptor->component_depth = avio_rb32(pb);
 break;
@@ -860,6 +864,8 @@
 default:
 /* Private uid used by SONY C0023S01.mxf */
 if (IS_KLV_KEY(uid, mxf_sony_mpeg4_extradata)) {
+ av_free(descriptor->extradata);
+ descriptor->extradata_size = 0;
 descriptor->extradata = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
 if (!descriptor->extradata)
 return AVERROR(ENOMEM);
@@ -927,6 +933,7 @@
 /* intra-only PictureEssenceCoding ULs, where no corresponding EC UL exists */
 static const MXFCodecUL mxf_intra_only_picture_essence_coding_uls[] = {
 { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x32,0x00,0x00 }, 14, AV_CODEC_ID_H264 }, /* H.264/MPEG-4 AVC Intra Profiles */
+ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 }, 14, AV_CODEC_ID_JPEG2000 }, /* JPEG2000 Codestream */
 { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AV_CODEC_ID_NONE },
 };
 
@@ -970,19 +977,23 @@
 /* sort segments by {BodySID, IndexSID, IndexStartPosition}, remove duplicates while we're at it */
 for (i = 0; i < nb_segments; i++) {
 int best = -1, best_body_sid = -1, best_index_sid = -1, best_index_start = -1;
+ uint64_t best_index_duration = 0;
 
 for (j = 0; j < nb_segments; j++) {
 MXFIndexTableSegment *s = unsorted_segments[j];
 
 /* Require larger BosySID, IndexSID or IndexStartPosition then the previous entry. This removes duplicates.
 * We want the smallest values for the keys than what we currently have, unless this is the first such entry this time around.
+ * If we come across an entry with the same IndexStartPosition but larger IndexDuration, then we'll prefer it over the one we currently have.
 */
 if ((i == 0 || s->body_sid > last_body_sid || s->index_sid > last_index_sid || s->index_start_position > last_index_start) &&
- (best == -1 || s->body_sid < best_body_sid || s->index_sid < best_index_sid || s->index_start_position < best_index_start)) {
+ (best == -1 || s->body_sid < best_body_sid || s->index_sid < best_index_sid || s->index_start_position < best_index_start ||
+ (s->index_start_position == best_index_start && s->index_duration > best_index_duration))) {
 best = j;
 best_body_sid = s->body_sid;
 best_index_sid = s->index_sid;
 best_index_start = s->index_start_position;
+ best_index_duration = s->index_duration;
 }
 }
 
@@ -1235,9 +1246,9 @@
 }
 }
 
- if (mxf->nb_index_tables > INT_MAX / sizeof(MXFIndexTable) ||
- !(mxf->index_tables = av_mallocz(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;
@@ -1256,10 +1267,10 @@
 for (i = j = 0; j < mxf->nb_index_tables; i += mxf->index_tables[j++].nb_segments) {
 MXFIndexTable *t = &mxf->index_tables[j];
 
- if (t->nb_segments >
- (INT_MAX / sizeof(MXFIndexTableSegment *)) ||
- !(t->segments = av_mallocz(t->nb_segments *
- sizeof(MXFIndexTableSegment*)))) {
+ 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);
@@ -1417,6 +1428,15 @@
 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) {
+ 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);
+ material_track->edit_rate = (AVRational){25, 1};
+ }
 avpriv_set_pts_info(st, 64, material_track->edit_rate.den, material_track->edit_rate.num);
 
 PRINT_KEY(mxf->fc, "data definition ul", source_track->sequence->data_definition_ul);
@@ -1464,10 +1484,7 @@
 /* TODO: drop PictureEssenceCoding and SoundEssenceCompression, only check EssenceContainer */
 codec_ul = mxf_get_codec_ul(ff_mxf_codec_uls, &descriptor->essence_codec_ul);
 st->codec->codec_id = codec_ul->id;
- if (descriptor->extradata) {
- st->codec->extradata = descriptor->extradata;
- st->codec->extradata_size = descriptor->extradata_size;
- }
+
 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);
@@ -1483,6 +1500,7 @@
 "SegmentedFrame layout isn't currently supported\n");
 break;
 case FullFrame:
+ st->codec->field_order = AV_FIELD_PROGRESSIVE;
 break;
 case OneField:
 /* Every other line is stored and needs to be duplicated. */
@@ -1495,6 +1513,19 @@
 * It's also for compatibility with the old behavior. */
 case SeparateFields:
 case MixedFields:
+ 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;
 default:
@@ -1527,8 +1558,16 @@
 st->codec->channels = descriptor->channels;
 st->codec->bits_per_coded_sample = descriptor->bits_per_sample;
 
- if (descriptor->sample_rate.den > 0)
+ if (descriptor->sample_rate.den > 0) {
 st->codec->sample_rate = descriptor->sample_rate.num / descriptor->sample_rate.den;
+ avpriv_set_pts_info(st, 64, descriptor->sample_rate.den, descriptor->sample_rate.num);
+ } else {
+ av_log(mxf->fc, AV_LOG_WARNING, "invalid sample rate (%d/%d) "
+ "found for stream #%d, time base forced to 1/48000\n",
+ descriptor->sample_rate.num, descriptor->sample_rate.den,
+ st->index);
+ avpriv_set_pts_info(st, 64, 1, 48000);
+ }
 
 /* TODO: implement AV_CODEC_ID_RAWAUDIO */
 if (st->codec->codec_id == AV_CODEC_ID_PCM_S16LE) {
@@ -1545,6 +1584,17 @@
 st->need_parsing = AVSTREAM_PARSE_FULL;
 }
 }
+ if (descriptor->extradata) {
+ st->codec->extradata = av_mallocz(descriptor->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (st->codec->extradata) {
+ memcpy(st->codec->extradata, descriptor->extradata, descriptor->extradata_size);
+ st->codec->extradata_size = descriptor->extradata_size;
+ }
+ } 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 */
 st->need_parsing = AVSTREAM_PARSE_TIMESTAMPS;
@@ -1626,6 +1676,9 @@
 /* Accept the 64k local set limit being exceeded (Avid). Don't accept
 * it extending past the end of the KLV though (zzuf5.mxf). */
 if (avio_tell(pb) > klv_end) {
+ if (ctx_size)
+ av_free(ctx);
+
 av_log(mxf->fc, AV_LOG_ERROR,
 "local tag %#04x extends past end of local set @ %#"PRIx64"\n",
 tag, klv->offset);
@@ -2027,10 +2080,10 @@
 /* if this check is hit then it's possible OPAtom was treated
 * as OP1a truncate the packet since it's probably very large
 * (>2 GiB is common) */
- av_log_ask_for_sample(s,
- "KLV for edit unit %i extends into next "
- "edit unit - OPAtom misinterpreted as "
- "OP1a?\n",
+ avpriv_request_sample(s,
+ "OPAtom misinterpreted as OP1a?"
+ "KLV for edit unit %i extending into "
+ "next edit unit",
 mxf->current_edit_unit);
 klv.length = next_ofs - avio_tell(s->pb);
 }
@@ -2147,6 +2200,9 @@
 
 for (i = 0; i < mxf->metadata_sets_count; i++) {
 switch (mxf->metadata_sets[i]->type) {
+ case Descriptor:
+ av_freep(&((MXFDescriptor *)mxf->metadata_sets[i])->extradata);
+ break;
 case MultipleDescriptor:
 av_freep(&((MXFDescriptor *)mxf->metadata_sets[i])->sub_descriptors_refs);
 break;
@@ -2217,9 +2273,12 @@
 sample_time = 0;
 seconds = av_rescale(sample_time, st->time_base.num, st->time_base.den);
 
- if ((ret = avio_seek(s->pb, (s->bit_rate * seconds) >> 3, SEEK_SET)) < 0)
- return ret;
+ 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 {
 t = &mxf->index_tables[0];

libav-v9.6.tar.bz2/libavformat/mxfenc.c -> libav-v10.1.tar.bz2/libavformat/mxfenc.c Changed

@@ -30,8 +30,7 @@
 * SMPTE RP224: Registry of SMPTE Universal Labels
 */
 
-//#define DEBUG
-
+#include <inttypes.h>
 #include <math.h>
 #include <time.h>
 
@@ -1183,7 +1182,7 @@
 }
 }
 
-static void mxf_write_partition(AVFormatContext *s, int bodysid,
+static int mxf_write_partition(AVFormatContext *s, int bodysid,
 int indexsid,
 const uint8_t *key, int write_metadata)
 {
@@ -1192,6 +1191,7 @@
 int64_t header_byte_count_offset;
 unsigned index_byte_count = 0;
 uint64_t partition_offset = avio_tell(pb);
+ int err;
 
 if (!mxf->edit_unit_byte_count && mxf->edit_units_count)
 index_byte_count = 85 + 12+(s->nb_streams+1)*6 +
@@ -1206,10 +1206,11 @@
 }
 
 if (!memcmp(key, body_partition_key, 16)) {
- mxf->body_partition_offset =
- av_realloc(mxf->body_partition_offset,
- (mxf->body_partitions_count+1)*
- sizeof(*mxf->body_partition_offset));
+ if ((err = av_reallocp_array(&mxf->body_partition_offset, mxf->body_partitions_count + 1,
+ sizeof(*mxf->body_partition_offset))) < 0) {
+ mxf->body_partitions_count = 0;
+ return err;
+ }
 mxf->body_partition_offset[mxf->body_partitions_count++] = partition_offset;
 }
 
@@ -1274,6 +1275,8 @@
 }
 
 avio_flush(pb);
+
+ return 0;
 }
 
 static const UID mxf_mpeg2_codec_uls[] = {
@@ -1545,7 +1548,7 @@
 static const uint8_t system_metadata_pack_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x03,0x01,0x04,0x01,0x01,0x00 };
 static const uint8_t system_metadata_package_set_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x43,0x01,0x01,0x0D,0x01,0x03,0x01,0x04,0x01,0x02,0x01 };
 
-static uint32_t ff_framenum_to_12m_time_code(unsigned frame, int drop, int fps)
+static uint32_t framenum_to_12m_time_code(unsigned frame, int drop, int fps)
 {
 return (0 << 31) | // color frame flag
 (drop << 30) | // drop frame flag
@@ -1591,7 +1594,8 @@
 avio_wb64(pb, 0); // creation date/time stamp
 
 avio_w8(pb, 0x81); // SMPTE 12M time code
- time_code = ff_framenum_to_12m_time_code(frame, mxf->timecode_drop_frame, mxf->timecode_base);
+ time_code = framenum_to_12m_time_code(frame, mxf->timecode_drop_frame,
+ mxf->timecode_base);
 avio_wb32(pb, time_code);
 avio_wb32(pb, 0); // binary group data
 avio_wb64(pb, 0);
@@ -1673,13 +1677,14 @@
 AVStream *st = s->streams[pkt->stream_index];
 MXFStreamContext *sc = st->priv_data;
 MXFIndexEntry ie = {0};
+ int err;
 
 if (!mxf->edit_unit_byte_count && !(mxf->edit_units_count % EDIT_UNITS_PER_BODY)) {
- mxf->index_entries = av_realloc(mxf->index_entries,
- (mxf->edit_units_count + EDIT_UNITS_PER_BODY)*sizeof(*mxf->index_entries));
- if (!mxf->index_entries) {
+ if ((err = av_reallocp_array(&mxf->index_entries, mxf->edit_units_count
+ + EDIT_UNITS_PER_BODY, sizeof(*mxf->index_entries))) < 0) {
+ mxf->edit_units_count = 0;
 av_log(s, AV_LOG_ERROR, "could not allocate index entries\n");
- return -1;
+ return err;
 }
 }
 
@@ -1692,11 +1697,13 @@
 
 if (!mxf->header_written) {
 if (mxf->edit_unit_byte_count) {
- mxf_write_partition(s, 1, 2, header_open_partition_key, 1);
+ if ((err = mxf_write_partition(s, 1, 2, header_open_partition_key, 1)) < 0)
+ return err;
 mxf_write_klv_fill(s);
 mxf_write_index_table_segment(s);
 } else {
- mxf_write_partition(s, 0, 0, header_open_partition_key, 1);
+ if ((err = mxf_write_partition(s, 0, 0, header_open_partition_key, 1)) < 0)
+ return err;
 }
 mxf->header_written = 1;
 }
@@ -1706,8 +1713,8 @@
 (!mxf->edit_units_count || mxf->edit_units_count > EDIT_UNITS_PER_BODY) &&
 !(ie.flags & 0x33)) { // I frame, Gop start
 mxf_write_klv_fill(s);
- mxf_write_partition(s, 1, 2, body_partition_key, 0);
-
+ if ((err = mxf_write_partition(s, 1, 2, body_partition_key, 0)) < 0)
+ return err;
 mxf_write_klv_fill(s);
 mxf_write_index_table_segment(s);
 }
@@ -1776,16 +1783,18 @@
 {
 MXFContext *mxf = s->priv_data;
 AVIOContext *pb = s->pb;
+ int err;
 
 mxf->duration = mxf->last_indexed_edit_unit + mxf->edit_units_count;
 
 mxf_write_klv_fill(s);
 mxf->footer_partition_offset = avio_tell(pb);
 if (mxf->edit_unit_byte_count) { // no need to repeat index
- mxf_write_partition(s, 0, 0, footer_partition_key, 0);
+ if ((err = mxf_write_partition(s, 0, 0, footer_partition_key, 0)) < 0)
+ return err;
 } else {
- mxf_write_partition(s, 0, 2, footer_partition_key, 0);
-
+ if ((err = mxf_write_partition(s, 0, 2, footer_partition_key, 0)) < 0)
+ return err;
 mxf_write_klv_fill(s);
 mxf_write_index_table_segment(s);
 }
@@ -1796,11 +1805,13 @@
 if (s->pb->seekable) {
 avio_seek(pb, 0, SEEK_SET);
 if (mxf->edit_unit_byte_count) {
- mxf_write_partition(s, 1, 2, header_closed_partition_key, 1);
+ if ((err = mxf_write_partition(s, 1, 2, header_closed_partition_key, 1)) < 0)
+ return err;
 mxf_write_klv_fill(s);
 mxf_write_index_table_segment(s);
 } else {
- mxf_write_partition(s, 0, 0, header_closed_partition_key, 1);
+ if ((err = mxf_write_partition(s, 0, 0, header_closed_partition_key, 1)) < 0)
+ return err;
 }
 }
 
@@ -1856,7 +1867,7 @@
 }
 
 *out = pktl->pkt;
- av_dlog(s, "out st:%d dts:%lld\n", (*out).stream_index, (*out).dts);
+ av_dlog(s, "out st:%d dts:%"PRId64"\n", (*out).stream_index, (*out).dts);
 s->packet_buffer = pktl->next;
 if(s->streams[pktl->pkt.stream_index]->last_in_packet_buffer == pktl)
 s->streams[pktl->pkt.stream_index]->last_in_packet_buffer= NULL;

libav-v9.6.tar.bz2/libavformat/mxg.c -> libav-v10.1.tar.bz2/libavformat/mxg.c Changed

@@ -20,6 +20,7 @@
  */
 
 #include "libavutil/channel_layout.h"
+#include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavcodec/mjpeg.h"
 #include "avformat.h"
@@ -168,7 +169,12 @@
 
                 pkt->pts = pkt->dts = mxg->dts;
                 pkt->stream_index = 0;
+#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
                 pkt->destruct = NULL;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+                pkt->buf  = NULL;
                 pkt->size = mxg->buffer_ptr - mxg->soi_ptr;
                 pkt->data = mxg->soi_ptr;
 
@@ -206,7 +212,12 @@
                     /* time (GMT) of first sample in usec since 1970, little-endian */
                     pkt->pts = pkt->dts = AV_RL64(startmarker_ptr + 8);
                     pkt->stream_index = 1;
+#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
                     pkt->destruct = NULL;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+                    pkt->buf  = NULL;
                     pkt->size = size - 14;
                     pkt->data = startmarker_ptr + 16;

libav-v9.6.tar.bz2/libavformat/network.c -> libav-v10.1.tar.bz2/libavformat/network.c Changed

@@ -18,7 +18,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include <fcntl.h>
 #include "network.h"
+#include "url.h"
 #include "libavcodec/internal.h"
 #include "libavutil/mem.h"
 
@@ -26,7 +28,7 @@
 #if HAVE_PTHREADS
 #include <pthread.h>
 #else
-#include "libavcodec/w32pthreads.h"
+#include "compat/w32pthreads.h"
 #endif
 #endif
 
@@ -187,3 +189,169 @@
 
 return 0;
 }
+
+static int ff_poll_interrupt(struct pollfd *p, nfds_t nfds, int timeout,
+ AVIOInterruptCB *cb)
+{
+ int runs = timeout / POLLING_TIME;
+ int ret = 0;
+
+ do {
+ if (ff_check_interrupt(cb))
+ return AVERROR_EXIT;
+ ret = poll(p, nfds, POLLING_TIME);
+ if (ret != 0)
+ break;
+ } while (timeout < 0 || runs-- > 0);
+
+ if (!ret)
+ return AVERROR(ETIMEDOUT);
+ if (ret < 0)
+ return AVERROR(errno);
+ return ret;
+}
+
+int ff_socket(int af, int type, int proto)
+{
+ int fd;
+
+#ifdef SOCK_CLOEXEC
+ fd = socket(af, type | SOCK_CLOEXEC, proto);
+ if (fd == -1 && errno == EINVAL)
+#endif
+ {
+ fd = socket(af, type, proto);
+#if HAVE_FCNTL
+ if (fd != -1)
+ fcntl(fd, F_SETFD, FD_CLOEXEC);
+#endif
+ }
+ return fd;
+}
+
+int ff_listen_bind(int fd, const struct sockaddr *addr,
+ socklen_t addrlen, int timeout, URLContext *h)
+{
+ int ret;
+ int reuse = 1;
+ struct pollfd lp = { fd, POLLIN, 0 };
+ setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse));
+ ret = bind(fd, addr, addrlen);
+ if (ret)
+ return ff_neterrno();
+
+ ret = listen(fd, 1);
+ if (ret)
+ return ff_neterrno();
+
+ ret = ff_poll_interrupt(&lp, 1, timeout, &h->interrupt_callback);
+ if (ret < 0)
+ return ret;
+
+ ret = accept(fd, NULL, NULL);
+ if (ret < 0)
+ return ff_neterrno();
+
+ closesocket(fd);
+
+ ff_socket_nonblock(ret, 1);
+ return ret;
+}
+
+int ff_listen_connect(int fd, const struct sockaddr *addr,
+ socklen_t addrlen, int timeout, URLContext *h,
+ int will_try_next)
+{
+ struct pollfd p = {fd, POLLOUT, 0};
+ int ret;
+ socklen_t optlen;
+
+ ff_socket_nonblock(fd, 1);
+
+ while ((ret = connect(fd, addr, addrlen))) {
+ ret = ff_neterrno();
+ switch (ret) {
+ case AVERROR(EINTR):
+ if (ff_check_interrupt(&h->interrupt_callback))
+ return AVERROR_EXIT;
+ continue;
+ case AVERROR(EINPROGRESS):
+ case AVERROR(EAGAIN):
+ ret = ff_poll_interrupt(&p, 1, timeout, &h->interrupt_callback);
+ if (ret < 0)
+ return ret;
+ optlen = sizeof(ret);
+ if (getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &optlen))
+ ret = AVUNERROR(ff_neterrno());
+ if (ret != 0) {
+ char errbuf[100];
+ ret = AVERROR(ret);
+ av_strerror(ret, errbuf, sizeof(errbuf));
+ if (will_try_next)
+ av_log(h, AV_LOG_WARNING,
+ "Connection to %s failed (%s), trying next address\n",
+ h->filename, errbuf);
+ else
+ av_log(h, AV_LOG_ERROR, "Connection to %s failed: %s\n",
+ h->filename, errbuf);
+ }
+ default:
+ return ret;
+ }
+ }
+ return ret;
+}
+
+static int match_host_pattern(const char *pattern, const char *hostname)
+{
+ int len_p, len_h;
+ if (!strcmp(pattern, "*"))
+ return 1;
+ // Skip a possible *. at the start of the pattern
+ if (pattern[0] == '*')
+ pattern++;
+ if (pattern[0] == '.')
+ pattern++;
+ len_p = strlen(pattern);
+ len_h = strlen(hostname);
+ if (len_p > len_h)
+ return 0;
+ // Simply check if the end of hostname is equal to 'pattern'
+ if (!strcmp(pattern, &hostname[len_h - len_p])) {
+ if (len_h == len_p)
+ return 1; // Exact match
+ if (hostname[len_h - len_p - 1] == '.')
+ return 1; // The matched substring is a domain and not just a substring of a domain
+ }
+ return 0;
+}
+
+int ff_http_match_no_proxy(const char *no_proxy, const char *hostname)
+{
+ char *buf, *start;
+ int ret = 0;
+ if (!no_proxy)
+ return 0;
+ if (!hostname)
+ return 0;
+ buf = av_strdup(no_proxy);
+ if (!buf)
+ return 0;
+ start = buf;
+ while (start) {
+ char *sep, *next = NULL;
+ start += strspn(start, " ,");
+ sep = start + strcspn(start, " ,");
+ if (*sep) {
+ next = sep + 1;
+ *sep = '\0';
+ }
+ if (match_host_pattern(start, hostname)) {
+ ret = 1;
+ break;
+ }
+ start = next;
+ }
+ av_free(buf);
+ return ret;
+}

libav-v9.6.tar.bz2/libavformat/network.h -> libav-v10.1.tar.bz2/libavformat/network.h Changed

@@ -27,6 +27,7 @@
 #include "config.h"
 #include "libavutil/error.h"
 #include "os_support.h"
+#include "url.h"
 
 #if HAVE_UNISTD_H
 #include <unistd.h>
@@ -60,7 +61,7 @@
 #include <netdb.h>
 
 #define ff_neterrno() AVERROR(errno)
-#endif
+#endif /* HAVE_WINSOCK2_H */
 
 #if HAVE_ARPA_INET_H
 #include <arpa/inet.h>
@@ -90,12 +91,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 {
@@ -108,7 +109,7 @@
 char *ai_canonname;
 struct addrinfo *ai_next;
 };
-#endif
+#endif /* !HAVE_STRUCT_ADDRINFO */
 
 /* getaddrinfo constants */
 #ifndef EAI_AGAIN
@@ -181,12 +182,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
@@ -209,4 +211,45 @@
 
 int ff_is_multicast_address(struct sockaddr *addr);
 
+#define POLLING_TIME 100 /// Time in milliseconds between interrupt check
+
+/**
+ * Bind to a file descriptor and poll for a connection.
+ *
+ * @param fd First argument of bind().
+ * @param addr Second argument of bind().
+ * @param addrlen Third argument of bind().
+ * @param timeout Polling timeout in milliseconds.
+ * @param h URLContext providing interrupt check
+ * callback and logging context.
+ * @return A non-blocking file descriptor on success
+ * or an AVERROR on failure.
+ */
+int ff_listen_bind(int fd, const struct sockaddr *addr,
+ socklen_t addrlen, int timeout,
+ URLContext *h);
+
+/**
+ * Connect to a file descriptor and poll for result.
+ *
+ * @param fd First argument of connect(),
+ * will be set as non-blocking.
+ * @param addr Second argument of connect().
+ * @param addrlen Third argument of connect().
+ * @param timeout Polling timeout in milliseconds.
+ * @param h URLContext providing interrupt check
+ * callback and logging context.
+ * @param will_try_next Whether the caller will try to connect to another
+ * address for the same host name, affecting the form of
+ * logged errors.
+ * @return 0 on success, AVERROR on failure.
+ */
+int ff_listen_connect(int fd, const struct sockaddr *addr,
+ socklen_t addrlen, int timeout,
+ URLContext *h, int will_try_next);
+
+int ff_http_match_no_proxy(const char *no_proxy, const char *hostname);
+
+int ff_socket(int domain, int type, int protocol);
+
 #endif /* AVFORMAT_NETWORK_H */

libav-v10.1.tar.bz2/libavformat/noproxy-test.c Added

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "network.h"
+
+static void test(const char *pattern, const char *host)
+{
+    int res = ff_http_match_no_proxy(pattern, host);
+    printf("The pattern \"%s\" %s the hostname %s\n",
+           pattern ? pattern : "(null)", res ? "matches" : "does not match",
+           host);
+}
+
+int main(void)
+{
+    test(NULL, "domain.com");
+    test("example.com domain.com", "domain.com");
+    test("example.com other.com", "domain.com");
+    test("example.com,domain.com", "domain.com");
+    test("example.com,domain.com", "otherdomain.com");
+    test("example.com, *.domain.com", "sub.domain.com");
+    test("example.com, *.domain.com", "domain.com");
+    test("example.com, .domain.com", "domain.com");
+    test("*", "domain.com");
+    return 0;
+}

libav-v9.6.tar.bz2/libavformat/nsvdec.c -> libav-v10.1.tar.bz2/libavformat/nsvdec.c Changed

@@ -2,6 +2,8 @@
 * NSV demuxer
 * Copyright (c) 2004 The Libav Project
 *
+ * first version by Francois Revol <revol@free.fr>
+ *
 * This file is part of Libav.
 *
 * Libav is free software; you can redistribute it and/or
@@ -25,10 +27,6 @@
 #include "internal.h"
 #include "libavutil/dict.h"
 
-//#define DEBUG_DUMP_INDEX // XXX dumbdriving-271.nsv breaks with it commented!!
-#define CHECK_SUBSEQUENT_NSVS
-//#define DISABLE_AUDIO
-
 /* max bytes to crawl for trying to resync
 * stupid streaming servers don't start at chunk boundaries...
 */
@@ -36,7 +34,6 @@
 #define NSV_MAX_RESYNC_TRIES 300
 
 /*
- * First version by Francois Revol - revol@free.fr
 * References:
 * (1) http://www.multimedia.cx/nsv-format.txt
 * seems someone came to the same conclusions as me, and updated it:
@@ -370,25 +367,6 @@
 
 av_dlog(s, "NSV got index; filepos %"PRId64"\n", avio_tell(pb));
 
-#ifdef DEBUG_DUMP_INDEX
-#define V(v) ((v<0x20 || v > 127)?'.':v)
- /* dump index */
- av_dlog(s, "NSV %d INDEX ENTRIES:\n", table_entries);
- av_dlog(s, "NSV [dataoffset][fileoffset]\n", table_entries);
- for (i = 0; i < table_entries; i++) {
- unsigned char b[8];
- avio_seek(pb, size + nsv->nsvs_file_offset[i], SEEK_SET);
- avio_read(pb, b, 8);
- av_dlog(s, "NSV [0x%08lx][0x%08lx]: %02x %02x %02x %02x %02x %02x %02x %02x"
- "%c%c%c%c%c%c%c%c\n",
- nsv->nsvs_file_offset[i], size + nsv->nsvs_file_offset[i],
- b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7],
- V(b[0]), V(b[1]), V(b[2]), V(b[3]), V(b[4]), V(b[5]), V(b[6]), V(b[7]) );
- }
- //avio_seek(pb, size, SEEK_SET); /* go back to end of header */
-#undef V
-#endif
-
 avio_seek(pb, nsv->base_offset + size, SEEK_SET); /* required for dumbdriving-271.nsv (2 extra bytes) */
 
 if (pb->eof_reached)
@@ -479,7 +457,6 @@
 }
 }
 if (atag != T_NONE) {
-#ifndef DISABLE_AUDIO
 st = avformat_new_stream(s, NULL);
 if (!st)
 goto fail;
@@ -499,15 +476,12 @@
 avpriv_set_pts_info(st, 64, 1, framerate.num*1000);
 st->start_time = 0;
 st->duration = (int64_t)nsv->duration * framerate.num;
-#endif
 }
-#ifdef CHECK_SUBSEQUENT_NSVS
 } else {
 if (nsv->vtag != vtag || nsv->atag != atag || nsv->vwidth != vwidth || nsv->vheight != vwidth) {
 av_dlog(s, "NSV NSVs header values differ from the first one!!!\n");
 //return -1;
 }
-#endif /* CHECK_SUBSEQUENT_NSVS */
 }
 
 nsv->state = NSV_HAS_READ_NSVS;
@@ -790,7 +764,7 @@
 }
 /* so we'll have more luck on extension... */
 if (av_match_ext(p->filename, "nsv"))
- return AVPROBE_SCORE_MAX/2;
+ return AVPROBE_SCORE_EXTENSION;
 /* FIXME: add mime-type check */
 return score;
 }

libav-v9.6.tar.bz2/libavformat/nut.c -> libav-v10.1.tar.bz2/libavformat/nut.c Changed

@@ -26,127 +26,130 @@
 #include "internal.h"
 
 const AVCodecTag ff_nut_subtitle_tags[] = {
- { AV_CODEC_ID_TEXT , MKTAG('U', 'T', 'F', '8') },
- { AV_CODEC_ID_SSA , MKTAG('S', 'S', 'A', 0 ) },
- { AV_CODEC_ID_DVD_SUBTITLE, MKTAG('D', 'V', 'D', 'S') },
- { AV_CODEC_ID_DVB_SUBTITLE, MKTAG('D', 'V', 'B', 'S') },
- { AV_CODEC_ID_NONE , 0 }
+ { AV_CODEC_ID_TEXT, MKTAG('U', 'T', 'F', '8') },
+ { AV_CODEC_ID_SSA, MKTAG('S', 'S', 'A', 0) },
+ { AV_CODEC_ID_DVD_SUBTITLE, MKTAG('D', 'V', 'D', 'S') },
+ { AV_CODEC_ID_DVB_SUBTITLE, MKTAG('D', 'V', 'B', 'S') },
+ { AV_CODEC_ID_NONE, 0 }
 };
 
 const AVCodecTag ff_nut_data_tags[] = {
- { AV_CODEC_ID_TEXT , MKTAG('U', 'T', 'F', '8') },
- { AV_CODEC_ID_NONE , 0 }
+ { AV_CODEC_ID_TEXT, MKTAG('U', 'T', 'F', '8') },
+ { AV_CODEC_ID_NONE, 0 }
 };
 
 const AVCodecTag ff_nut_video_tags[] = {
- { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 15 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 15 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 16 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 16 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(15 , 'B', 'G', 'R') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(15 , 'R', 'G', 'B') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 'B', 'G', 'R') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 'R', 'G', 'B') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 12 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 12 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 'B', 'G', 'R') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 'R', 'G', 'B') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'R', 'G', 'B') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 24 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 24 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '1', '1', 'P') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('B', '1', 'W', '0') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('B', '0', 'W', '1') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 8 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 8 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 4 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 4 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('B', '4', 'B', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('R', '4', 'B', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 48 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 48 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(48 , 'B', 'G', 'R') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(48 , 'R', 'G', 'B') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 10 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 11 , '3', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 10 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 10 , '3', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 10 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 0 , '3', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0 , 16 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '1', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 16 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 11 , '3', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 16 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 10 , '3', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 16 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '3', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11 , 8 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '2', 0 , 8 ) },
-
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0 , 9 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG( 9 , 0 , '1', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11 , 9 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG( 9 , 11 , '4', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10 , 9 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG( 9 , 10 , '4', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0 , 9 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG( 9 , 0 , '4', 'Y') },
-
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0 , 10 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 0 , '1', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11 , 10 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 11 , '4', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10 , 10 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 10 , '4', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0 , 10 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 0 , '4', 'Y') },
-
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0 , 16 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '1', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11 , 16 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 11 , '4', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10 , 16 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 10 , '4', 'Y') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0 , 16 ) },
- { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '4', 'Y') },
-
- { AV_CODEC_ID_NONE , 0 }
+ { AV_CODEC_ID_VP9, MKTAG('V', 'P', '9', '0') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 15) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 15) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 16) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 16) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(15, 'B', 'G', 'R') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(15, 'R', 'G', 'B') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(16, 'B', 'G', 'R') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(16, 'R', 'G', 'B') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 12) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 12) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(12, 'B', 'G', 'R') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(12, 'R', 'G', 'B') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'R', 'G', 'B') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 24) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 24) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '1', '1', 'P') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('B', '1', 'W', '0') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('B', '0', 'W', '1') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 8) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 8) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 4) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 4) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('B', '4', 'B', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('R', '4', 'B', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 48) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 48) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(48, 'B', 'G', 'R') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(48, 'R', 'G', 'B') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11, 10) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(10, 11, '3', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10, 10) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(10, 10, '3', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0, 10) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(10, 0, '3', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0, 16) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(16, 0, '1', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11, 16) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(16, 11, '3', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10, 16) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(16, 10, '3', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0, 16) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(16, 0, '3', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11, 8) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '2', 0, 8) },
+
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0, 9) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(9, 0, '1', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11, 9) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(9, 11, '4', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10, 9) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(9, 10, '4', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0, 9) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(9, 0, '4', 'Y') },
+
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0, 10) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(10, 0, '1', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11, 10) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(10, 11, '4', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10, 10) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(10, 10, '4', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0, 10) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(10, 0, '4', 'Y') },
+
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0, 16) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(16, 0, '1', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11, 16) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(16, 11, '4', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10, 16) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(16, 10, '4', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0, 16) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(16, 0, '4', 'Y') },
+
+ { AV_CODEC_ID_NONE, 0 }
 };
 
 const AVCodecTag ff_nut_audio_tags[] = {
 { AV_CODEC_ID_PCM_ALAW, MKTAG('A', 'L', 'A', 'W') },
 { AV_CODEC_ID_PCM_MULAW, MKTAG('U', 'L', 'A', 'W') },
- { AV_CODEC_ID_PCM_F32BE, MKTAG(32 , 'D', 'F', 'P') },
- { AV_CODEC_ID_PCM_F32LE, MKTAG('P', 'F', 'D', 32 ) },
- { AV_CODEC_ID_PCM_F64BE, MKTAG(64 , 'D', 'F', 'P') },
- { AV_CODEC_ID_PCM_F64LE, MKTAG('P', 'F', 'D', 64 ) },
- { AV_CODEC_ID_PCM_S16BE, MKTAG(16 , 'D', 'S', 'P') },
- { AV_CODEC_ID_PCM_S16LE, MKTAG('P', 'S', 'D', 16 ) },
- { AV_CODEC_ID_PCM_S24BE, MKTAG(24 , 'D', 'S', 'P') },
- { AV_CODEC_ID_PCM_S24LE, MKTAG('P', 'S', 'D', 24 ) },
- { AV_CODEC_ID_PCM_S32BE, MKTAG(32 , 'D', 'S', 'P') },
- { AV_CODEC_ID_PCM_S32LE, MKTAG('P', 'S', 'D', 32 ) },
- { AV_CODEC_ID_PCM_S8, MKTAG('P', 'S', 'D', 8 ) },
- { AV_CODEC_ID_PCM_U16BE, MKTAG(16 , 'D', 'U', 'P') },
- { AV_CODEC_ID_PCM_U16LE, MKTAG('P', 'U', 'D', 16 ) },
- { AV_CODEC_ID_PCM_U24BE, MKTAG(24 , 'D', 'U', 'P') },
- { AV_CODEC_ID_PCM_U24LE, MKTAG('P', 'U', 'D', 24 ) },
- { AV_CODEC_ID_PCM_U32BE, MKTAG(32 , 'D', 'U', 'P') },
- { AV_CODEC_ID_PCM_U32LE, MKTAG('P', 'U', 'D', 32 ) },
- { AV_CODEC_ID_PCM_U8, MKTAG('P', 'U', 'D', 8 ) },
- { AV_CODEC_ID_PCM_S16LE_PLANAR, MKTAG('P', 'S', 'P', 16 ) },
+ { AV_CODEC_ID_PCM_F32BE, MKTAG(32, 'D', 'F', 'P') },
+ { AV_CODEC_ID_PCM_F32LE, MKTAG('P', 'F', 'D', 32) },
+ { AV_CODEC_ID_PCM_F64BE, MKTAG(64, 'D', 'F', 'P') },
+ { AV_CODEC_ID_PCM_F64LE, MKTAG('P', 'F', 'D', 64) },
+ { AV_CODEC_ID_PCM_S16BE, MKTAG(16, 'D', 'S', 'P') },
+ { AV_CODEC_ID_PCM_S16LE, MKTAG('P', 'S', 'D', 16) },
+ { AV_CODEC_ID_PCM_S24BE, MKTAG(24, 'D', 'S', 'P') },
+ { AV_CODEC_ID_PCM_S24LE, MKTAG('P', 'S', 'D', 24) },
+ { AV_CODEC_ID_PCM_S32BE, MKTAG(32, 'D', 'S', 'P') },
+ { AV_CODEC_ID_PCM_S32LE, MKTAG('P', 'S', 'D', 32) },
+ { AV_CODEC_ID_PCM_S8, MKTAG('P', 'S', 'D', 8) },
+ { AV_CODEC_ID_PCM_U16BE, MKTAG(16, 'D', 'U', 'P') },
+ { AV_CODEC_ID_PCM_U16LE, MKTAG('P', 'U', 'D', 16) },
+ { AV_CODEC_ID_PCM_U24BE, MKTAG(24, 'D', 'U', 'P') },
+ { AV_CODEC_ID_PCM_U24LE, MKTAG('P', 'U', 'D', 24) },
+ { AV_CODEC_ID_PCM_U32BE, MKTAG(32, 'D', 'U', 'P') },
+ { AV_CODEC_ID_PCM_U32LE, MKTAG('P', 'U', 'D', 32) },
+ { AV_CODEC_ID_PCM_U8, MKTAG('P', 'U', 'D', 8) },
+ { AV_CODEC_ID_PCM_S16LE_PLANAR, MKTAG('P', 'S', 'P', 16) },
+ { AV_CODEC_ID_PCM_S24LE_PLANAR, MKTAG('P', 'S', 'P', 24) },
+ { AV_CODEC_ID_PCM_S32LE_PLANAR, MKTAG('P', 'S', 'P', 32) },
 { AV_CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') },
- { AV_CODEC_ID_NONE, 0 }
+ { AV_CODEC_ID_NONE, 0 }
 };
 
 const AVCodecTag * const ff_nut_codec_tags[] = {
@@ -154,43 +157,55 @@
 ff_codec_bmp_tags, ff_codec_wav_tags, ff_nut_data_tags, 0
 };
 
-void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){
+void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val)
+{
 int i;
- for(i=0; i<nut->avf->nb_streams; i++){
- nut->stream[i].last_pts= av_rescale_rnd(
- val,
- time_base.num * (int64_t)nut->stream[i].time_base->den,
- time_base.den * (int64_t)nut->stream[i].time_base->num,
- AV_ROUND_DOWN);
- }
+ for (i = 0; i < nut->avf->nb_streams; i++)
+ nut->stream[i].last_pts =
+ av_rescale_rnd(val,
+ time_base.num * (int64_t)nut->stream[i].time_base->den,
+ time_base.den * (int64_t)nut->stream[i].time_base->num,
+ AV_ROUND_DOWN);
 }
 
-int64_t ff_lsb2full(StreamContext *stream, int64_t lsb){
- int64_t mask = (1<<stream->msb_pts_shift)-1;
- int64_t delta= stream->last_pts - mask/2;
- return ((lsb - delta)&mask) + delta;
+int64_t ff_lsb2full(StreamContext *stream, int64_t lsb)
+{
+ int64_t mask = (1 << stream->msb_pts_shift) - 1;
+ int64_t delta = stream->last_pts - mask / 2;
+ return ((lsb - delta) & mask) + delta;
 }
 
-int ff_nut_sp_pos_cmp(const Syncpoint *a, const Syncpoint *b){
+int ff_nut_sp_pos_cmp(const Syncpoint *a, const Syncpoint *b)
+{
 return ((a->pos - b->pos) >> 32) - ((b->pos - a->pos) >> 32);
 }
 
-int ff_nut_sp_pts_cmp(const Syncpoint *a, const Syncpoint *b){
+int ff_nut_sp_pts_cmp(const Syncpoint *a, const Syncpoint *b)
+{
 return ((a->ts - b->ts) >> 32) - ((b->ts - a->ts) >> 32);
 }
 
-void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts){
- Syncpoint *sp= av_mallocz(sizeof(Syncpoint));
+int ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts)
+{
+ Syncpoint *sp = av_mallocz(sizeof(Syncpoint));
 struct AVTreeNode *node = av_tree_node_alloc();
 
- sp->pos= pos;
- sp->back_ptr= back_ptr;
- sp->ts= ts;
+ if (!sp || !node) {
+ av_freep(&sp);
+ av_freep(&node);
+ return AVERROR(ENOMEM);
+ }
+
+ sp->pos = pos;
+ sp->back_ptr = back_ptr;
+ sp->ts = ts;
 av_tree_insert(&nut->syncpoints, sp, (void *) ff_nut_sp_pos_cmp, &node);
- if(node){
+ if (node) {
 av_free(sp);
 av_free(node);
 }
+
+ return 0;
 }
 
 static int enu_free(void *opaque, void *elem)
@@ -206,13 +221,13 @@
 }
 
 const Dispositions ff_nut_dispositions[] = {
- {"default" , AV_DISPOSITION_DEFAULT},
- {"dub" , AV_DISPOSITION_DUB},
- {"original" , AV_DISPOSITION_ORIGINAL},
- {"comment" , AV_DISPOSITION_COMMENT},
- {"lyrics" , AV_DISPOSITION_LYRICS},
- {"karaoke" , AV_DISPOSITION_KARAOKE},
- {"" , 0}
+ { "default", AV_DISPOSITION_DEFAULT },
+ { "dub", AV_DISPOSITION_DUB },
+ { "original", AV_DISPOSITION_ORIGINAL },
+ { "comment", AV_DISPOSITION_COMMENT },
+ { "lyrics", AV_DISPOSITION_LYRICS },
+ { "karaoke", AV_DISPOSITION_KARAOKE },
+ { "", 0 }
 };
 
 const AVMetadataConv ff_nut_metadata_conv[] = {

libav-v9.6.tar.bz2/libavformat/nut.h -> libav-v10.1.tar.bz2/libavformat/nut.h Changed

libav-v9.6.tar.bz2/libavformat/nutdec.c -> libav-v10.1.tar.bz2/libavformat/nutdec.c Changed

@@ -183,7 +183,7 @@
 tmp = ffio_read_varlen(bc); \
 if (!(check)) { \
 av_log(s, AV_LOG_ERROR, "Error " #dst " is (%"PRId64")\n", tmp); \
- return -1; \
+ return AVERROR_INVALIDDATA; \
 } \
 dst = tmp; \
 } while (0)
@@ -193,7 +193,7 @@
 pos -= avio_tell(bc);
 if (pos < 0) {
 avio_seek(bc, pos, SEEK_CUR);
- return -1;
+ return AVERROR_INVALIDDATA;
 } else {
 while (pos--)
 avio_r8(bc);
@@ -213,7 +213,13 @@
 end = get_packetheader(nut, bc, 1, MAIN_STARTCODE);
 end += avio_tell(bc);
 
- GET_V(tmp, tmp >= 2 && tmp <= 3);
+ tmp = ffio_read_varlen(bc);
+ if (tmp < 2 && tmp > NUT_VERSION) {
+ av_log(s, AV_LOG_ERROR, "Version %"PRId64" not supported.\n",
+ tmp);
+ return AVERROR(ENOSYS);
+ }
+
 GET_V(stream_count, tmp > 0 && tmp <= NUT_MAX_STREAMS);
 
 nut->max_distance = ffio_read_varlen(bc);
@@ -376,7 +382,7 @@
 break;
 default:
 av_log(s, AV_LOG_ERROR, "unknown stream class (%d)\n", class);
- return -1;
+ return AVERROR(ENOSYS);
 }
 if (class < 3 && st->codec->codec_id == AV_CODEC_ID_NONE)
 av_log(s, AV_LOG_ERROR,
@@ -405,7 +411,7 @@
 if ((!st->sample_aspect_ratio.num) != (!st->sample_aspect_ratio.den)) {
 av_log(s, AV_LOG_ERROR, "invalid aspect ratio %d/%d\n",
 st->sample_aspect_ratio.num, st->sample_aspect_ratio.den);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 ffio_read_varlen(bc); /* csp type */
 } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
@@ -416,7 +422,7 @@
 if (skip_reserved(bc, end) || ffio_get_checksum(bc)) {
 av_log(s, AV_LOG_ERROR,
 "stream header %d checksum mismatch\n", stream_id);
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 stc->time_base = &nut->time_base[stc->time_base_id];
 avpriv_set_pts_info(s->streams[stream_id], 63, stc->time_base->num,
@@ -516,7 +522,7 @@
 
 if (skip_reserved(bc, end) || ffio_get_checksum(bc)) {
 av_log(s, AV_LOG_ERROR, "info header checksum mismatch\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 return 0;
 }
@@ -526,6 +532,7 @@
 AVFormatContext *s = nut->avf;
 AVIOContext *bc = s->pb;
 int64_t end, tmp;
+ int ret;
 
 nut->last_syncpoint_pos = avio_tell(bc) - 8;
 
@@ -542,12 +549,14 @@
 
 if (skip_reserved(bc, end) || ffio_get_checksum(bc)) {
 av_log(s, AV_LOG_ERROR, "sync point checksum mismatch\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 *ts = tmp / s->nb_streams *
 av_q2d(nut->time_base[tmp % s->nb_streams]) * AV_TIME_BASE;
- ff_nut_add_sp(nut, nut->last_syncpoint_pos, *back_ptr, *ts);
+
+ if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, *back_ptr, *ts)) < 0)
+ return ret;
 
 return 0;
 }
@@ -561,13 +570,13 @@
 int64_t filesize = avio_size(bc);
 int64_t *syncpoints;
 int8_t *has_keyframe;
- int ret = -1;
+ int ret = AVERROR_INVALIDDATA;
 
 avio_seek(bc, filesize - 12, SEEK_SET);
 avio_seek(bc, filesize - avio_rb64(bc), SEEK_SET);
 if (avio_rb64(bc) != INDEX_STARTCODE) {
 av_log(s, AV_LOG_ERROR, "no index at the end\n");
- return -1;
+ return ret;
 }
 
 end = get_packetheader(nut, bc, 1, INDEX_STARTCODE);
@@ -843,7 +852,7 @@
 } else {
 frame_code = avio_r8(bc);
 if (bc->eof_reached)
- return -1;
+ return AVERROR_EOF;
 if (frame_code == 'N') {
 tmp = frame_code;
 for (i = 1; i < 8; i++)
@@ -910,7 +919,7 @@
 else if (stream_index == -2)
 return back_ptr;
 
- assert(0);
+ return AV_NOPTS_VALUE;
 }
 
 static int read_seek(AVFormatContext *s, int stream_index,

libav-v9.6.tar.bz2/libavformat/nutenc.c -> libav-v10.1.tar.bz2/libavformat/nutenc.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/mathematics.h"
 #include "libavutil/tree.h"
@@ -93,7 +95,7 @@
 header |= (bitrate_index & 1) << 9;
 
 return 2; //FIXME actually put the needed ones in build_elision_headers()
- return 3; //we guess that the private bit is not set
+ //return 3; //we guess that the private bit is not set
 //FIXME the above assumptions should be checked, if these turn out false too often something should be done
 }
 return 0;
@@ -323,7 +325,7 @@
 tmp_head_idx;
 int64_t tmp_match;
 
- ff_put_v(bc, 3); /* version */
+ ff_put_v(bc, NUT_VERSION);
 ff_put_v(bc, nut->avf->nb_streams);
 ff_put_v(bc, nut->max_distance);
 ff_put_v(bc, nut->time_base_count);
@@ -815,7 +817,8 @@
 ff_put_v(dyn_bc, sp ? (nut->last_syncpoint_pos - sp->pos) >> 4 : 0);
 put_packet(nut, bc, dyn_bc, 1, SYNCPOINT_STARTCODE);
 
- ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts);
+ if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts)) < 0)
+ return ret;
 }
 assert(nus->last_pts != AV_NOPTS_VALUE);

libav-v9.6.tar.bz2/libavformat/nuv.c -> libav-v10.1.tar.bz2/libavformat/nuv.c Changed

libav-v9.6.tar.bz2/libavformat/oggdec.c -> libav-v10.1.tar.bz2/libavformat/oggdec.c Changed

@@ -46,6 +46,7 @@
 &ff_theora_codec,
 &ff_flac_codec,
 &ff_celt_codec,
+ &ff_opus_codec,
 &ff_old_dirac_codec,
 &ff_old_flac_codec,
 &ff_ogm_video_codec,
@@ -84,7 +85,7 @@
 struct ogg *ogg = s->priv_data;
 AVIOContext *bc = s->pb;
 struct ogg_state *ost = ogg->state;
- int i;
+ int i, err;
 
 if (!ost)
 return 0;
@@ -92,7 +93,6 @@
 ogg->state = ost->next;
 
 if (!discard) {
- struct ogg_stream *old_streams = ogg->streams;
 
 for (i = 0; i < ogg->nstreams; i++)
 av_free(ogg->streams[i].buf);
@@ -100,16 +100,13 @@
 avio_seek(bc, ost->pos, SEEK_SET);
 ogg->curidx = ost->curidx;
 ogg->nstreams = ost->nstreams;
- ogg->streams = av_realloc(ogg->streams,
- ogg->nstreams * sizeof(*ogg->streams));
-
- if (ogg->streams) {
+ if ((err = av_reallocp_array(&ogg->streams, ogg->nstreams,
+ sizeof(*ogg->streams))) < 0) {
+ ogg->nstreams = 0;
+ return err;
+ } else
 memcpy(ogg->streams, ost->streams,
 ost->nstreams * sizeof(*ogg->streams));
- } else {
- av_free(old_streams);
- ogg->nstreams = 0;
- }
 }
 
 av_free(ost);
@@ -384,7 +381,11 @@
 
 if (!complete && os->segp == os->nsegs) {
 ogg->curidx = -1;
- os->incomplete = 1;
+ // Do not set incomplete for empty packets.
+ // Together with the code in ogg_read_page
+ // that discards all continuation of empty packets
+ // we would get an infinite loop.
+ os->incomplete = !!os->psize;
 }
 } while (!complete);
 
@@ -478,8 +479,11 @@
 if (os->codec && os->codec->nb_header &&
 os->nb_header < os->codec->nb_header) {
 av_log(s, AV_LOG_ERROR,
- "Headers mismatch for stream %d\n", i);
- return AVERROR_INVALIDDATA;
+ "Headers mismatch for stream %d: "
+ "expected %d received %d.\n",
+ i, os->codec->nb_header, os->nb_header);
+ if (s->error_recognition & AV_EF_EXPLODE)
+ return AVERROR_INVALIDDATA;
 }
 if (os->start_granule != OGG_NOGRANULE_VALUE)
 os->lastpts = s->streams[i]->start_time =
@@ -701,5 +705,5 @@
 .read_seek = ogg_read_seek,
 .read_timestamp = ogg_read_timestamp,
 .extensions = "ogg",
- .flags = AVFMT_GENERIC_INDEX,
+ .flags = AVFMT_GENERIC_INDEX | AVFMT_NOBINSEARCH,
 };

libav-v9.6.tar.bz2/libavformat/oggdec.h -> libav-v10.1.tar.bz2/libavformat/oggdec.h Changed

libav-v9.6.tar.bz2/libavformat/oggenc.c -> libav-v10.1.tar.bz2/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"
@@ -34,6 +36,7 @@
 #define MAX_PAGE_SIZE 65025
 
 typedef struct {
+ int64_t start_granule;
 int64_t granule;
 int stream_index;
 uint8_t flags;
@@ -67,14 +70,17 @@
 const AVClass *class;
 OGGPageList *page_list;
 int pref_size; ///< preferred page size (0 => fill all segments)
+ int64_t pref_duration; ///< preferred page duration (0 => fill all segments)
 } OGGContext;
 
 #define OFFSET(x) offsetof(OGGContext, x)
 #define PARAM AV_OPT_FLAG_ENCODING_PARAM
 
 static const AVOption options[] = {
- { "pagesize", "preferred page size in bytes",
+ { "pagesize", "preferred page size in bytes (deprecated)",
 OFFSET(pref_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, MAX_PAGE_SIZE, PARAM },
+ { "page_duration", "preferred page duration, in microseconds",
+ OFFSET(pref_duration), AV_OPT_TYPE_INT, { .i64 = 1000000 }, 0, INT64_MAX, PARAM },
 { NULL },
 };
 
@@ -177,6 +183,7 @@
 return AVERROR(ENOMEM);
 l->page = oggstream->page;
 
+ oggstream->page.start_granule = oggstream->page.granule;
 oggstream->page_count++;
 ogg_reset_cur_page(oggstream);
 
@@ -210,6 +217,12 @@
 flush = 1;
 }
 
+ // avoid a continued page
+ if (!header && oggstream->page.size > 0 &&
+ MAX_PAGE_SIZE - oggstream->page.size < size) {
+ ogg_buffer_page(s, oggstream);
+ }
+
 for (i = 0; i < total_segments; ) {
 OGGPage *page = &oggstream->page;
 
@@ -232,9 +245,19 @@
 if (i == total_segments)
 page->granule = granule;
 
- if (!header && (page->segments_count == 255 ||
- (ogg->pref_size > 0 && page->size >= ogg->pref_size))) {
- ogg_buffer_page(s, oggstream);
+ if (!header) {
+ AVStream *st = s->streams[page->stream_index];
+
+ int64_t start = av_rescale_q(page->start_granule, st->time_base,
+ AV_TIME_BASE_Q);
+ int64_t next = av_rescale_q(page->granule, st->time_base,
+ AV_TIME_BASE_Q);
+
+ if (page->segments_count == 255 ||
+ (ogg->pref_size > 0 && page->size >= ogg->pref_size) ||
+ (ogg->pref_duration > 0 && next - start >= ogg->pref_duration)) {
+ ogg_buffer_page(s, oggstream);
+ }
 }
 }
 
@@ -367,9 +390,13 @@
 
 static int ogg_write_header(AVFormatContext *s)
 {
+ OGGContext *ogg = s->priv_data;
 OGGStreamContext *oggstream;
 int i, j;
 
+ if (ogg->pref_size)
+ av_log(s, AV_LOG_WARNING, "The pagesize option is deprecated\n");
+
 for (i = 0; i < s->nb_streams; i++) {
 AVStream *st = s->streams[i];
 unsigned serial_num = i;
@@ -489,6 +516,9 @@
 }
 ogg_buffer_page(s, oggstream);
 }
+
+ oggstream->page.start_granule = AV_NOPTS_VALUE;
+
 return 0;
 }
 
@@ -538,6 +568,9 @@
 else
 granule = pkt->pts + pkt->duration;
 
+ if (oggstream->page.start_granule == AV_NOPTS_VALUE)
+ oggstream->page.start_granule = pkt->pts;
+
 ret = ogg_buffer_data(s, st, pkt->data, pkt->size, granule, 0);
 if (ret < 0)
 return ret;
@@ -553,9 +586,13 @@
 {
 int i;
 
- /* flush current page */
- for (i = 0; i < s->nb_streams; i++)
- ogg_buffer_page(s, s->streams[i]->priv_data);
+ /* flush current page if needed */
+ for (i = 0; i < s->nb_streams; i++) {
+ OGGStreamContext *oggstream = s->streams[i]->priv_data;
+
+ if (oggstream->page.size > 0)
+ ogg_buffer_page(s, oggstream);
+ }
 
 ogg_write_pages(s, 1);
 
@@ -579,10 +616,12 @@
 .mime_type = "application/ogg",
 .extensions = "ogg,ogv,spx,opus",
 .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,
 .write_trailer = ogg_write_trailer,
+ .flags = AVFMT_TS_NEGATIVE,
 .priv_class = &ogg_muxer_class,
 };

libav-v9.6.tar.bz2/libavformat/oggparseogm.c -> libav-v10.1.tar.bz2/libavformat/oggparseogm.c Changed

@@ -37,60 +37,67 @@
     struct ogg *ogg = s->priv_data;
     struct ogg_stream *os = ogg->streams + idx;
     AVStream *st = s->streams[idx];
-    const uint8_t *p = os->buf + os->pstart;
+    GetByteContext p;
     uint64_t time_unit;
     uint64_t spu;
 
-    if(!(*p & 1))
+    bytestream2_init(&p, os->buf + os->pstart, os->psize);
+    if (!(bytestream2_peek_byte(&p) & 1))
         return 0;
 
-    if(*p == 1) {
-        p++;
+    if (bytestream2_peek_byte(&p) == 1) {
+        bytestream2_skip(&p, 1);
 
-        if(*p == 'v'){
+        if (bytestream2_peek_byte(&p) == 'v'){
             int tag;
             st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-            p += 8;
-            tag = bytestream_get_le32(&p);
+            bytestream2_skip(&p, 8);
+            tag = bytestream2_get_le32(&p);
             st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag);
             st->codec->codec_tag = tag;
-        } else if (*p == 't') {
+        } else if (bytestream2_peek_byte(&p) == 't') {
             st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
             st->codec->codec_id = AV_CODEC_ID_TEXT;
-            p += 12;
+            bytestream2_skip(&p, 12);
         } else {
-            uint8_t acid[5];
+            uint8_t acid[5] = { 0 };
             int cid;
             st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-            p += 8;
-            bytestream_get_buffer(&p, acid, 4);
+            bytestream2_skip(&p, 8);
+            bytestream2_get_buffer(&p, acid, 4);
             acid[4] = 0;
             cid = strtol(acid, NULL, 16);
             st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, cid);
             st->need_parsing = AVSTREAM_PARSE_FULL;
         }
 
-        p += 4;                     /* useless size field */
+        bytestream2_skip(&p, 4);    /* useless size field */
+
+        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;
+        }
 
-        time_unit   = bytestream_get_le64(&p);
-        spu         = bytestream_get_le64(&p);
-        p += 4;                     /* default_len */
-        p += 8;                     /* buffersize + bits_per_sample */
+        bytestream2_skip(&p, 4);    /* default_len */
+        bytestream2_skip(&p, 8);    /* buffersize + bits_per_sample */
 
         if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO){
-            st->codec->width = bytestream_get_le32(&p);
-            st->codec->height = bytestream_get_le32(&p);
+            st->codec->width = bytestream2_get_le32(&p);
+            st->codec->height = bytestream2_get_le32(&p);
             avpriv_set_pts_info(st, 64, time_unit, spu * 10000000);
         } else {
-            st->codec->channels = bytestream_get_le16(&p);
-            p += 2;                 /* block_align */
-            st->codec->bit_rate = bytestream_get_le32(&p) * 8;
+            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 = spu * 10000000 / time_unit;
             avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
         }
-    } else if (*p == 3) {
-        if (os->psize > 8)
-            ff_vorbis_comment(s, &st->metadata, p+7, os->psize-8);
+    } else if (bytestream2_peek_byte(&p) == 3) {
+        bytestream2_skip(&p, 7);
+        if (bytestream2_get_bytes_left(&p) > 1)
+            ff_vorbis_comment(s, &st->metadata, p.buffer, bytestream2_get_bytes_left(&p) - 1);
     }
 
     return 1;

libav-v10.1.tar.bz2/libavformat/oggparseopus.c Added

@@ -0,0 +1,142 @@
+/*
+ * Opus parser for Ogg
+ * Copyright (c) 2012 Nicolas George
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <string.h>
+
+#include "libavutil/intreadwrite.h"
+#include "avformat.h"
+#include "internal.h"
+#include "oggdec.h"
+
+struct oggopus_private {
+ int need_comments;
+ unsigned pre_skip;
+ int64_t cur_dts;
+};
+
+#define OPUS_HEAD_SIZE 19
+
+static int opus_header(AVFormatContext *avf, int idx)
+{
+ struct ogg *ogg = avf->priv_data;
+ struct ogg_stream *os = &ogg->streams[idx];
+ AVStream *st = avf->streams[idx];
+ struct oggopus_private *priv = os->private;
+ uint8_t *packet = os->buf + os->pstart;
+ uint8_t *extradata;
+
+ if (!priv) {
+ priv = os->private = av_mallocz(sizeof(*priv));
+ if (!priv)
+ return AVERROR(ENOMEM);
+ }
+ if (os->flags & OGG_FLAG_BOS) {
+ if (os->psize < OPUS_HEAD_SIZE || (AV_RL8(packet + 8) & 0xF0) != 0)
+ return AVERROR_INVALIDDATA;
+
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codec->codec_id = AV_CODEC_ID_OPUS;
+ st->codec->channels = AV_RL8(packet + 9);
+ priv->pre_skip = AV_RL16(packet + 10);
+
+ extradata = av_malloc(os->psize + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!extradata)
+ return AVERROR(ENOMEM);
+
+ memcpy(extradata, packet, os->psize);
+ st->codec->extradata = extradata;
+ st->codec->extradata_size = os->psize;
+
+ st->codec->sample_rate = 48000;
+ avpriv_set_pts_info(st, 64, 1, 48000);
+ priv->need_comments = 1;
+ return 1;
+ }
+
+ if (priv->need_comments) {
+ if (os->psize < 8 || memcmp(packet, "OpusTags", 8))
+ return AVERROR_INVALIDDATA;
+ ff_vorbis_comment(avf, &st->metadata, packet + 8, os->psize - 8);
+ priv->need_comments--;
+ return 1;
+ }
+
+ return 0;
+}
+
+static int opus_packet(AVFormatContext *avf, int idx)
+{
+ struct ogg *ogg = avf->priv_data;
+ struct ogg_stream *os = &ogg->streams[idx];
+ 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;
+
+ 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;
+ }
+
+ os->pduration = frame_size * nb_frames;
+ if (os->lastpts != AV_NOPTS_VALUE) {
+ if (st->start_time == AV_NOPTS_VALUE)
+ st->start_time = os->lastpts;
+ priv->cur_dts = os->lastdts = os->lastpts -= priv->pre_skip;
+ }
+
+ priv->cur_dts += os->pduration;
+ if ((os->flags & OGG_FLAG_EOS)) {
+ int64_t skip = priv->cur_dts - os->granule + priv->pre_skip;
+ skip = FFMIN(skip, os->pduration);
+ if (skip > 0) {
+ os->pduration = skip < os->pduration ? os->pduration - skip : 1;
+ av_log(avf, AV_LOG_WARNING,
+ "Last packet is truncated to %d (because of unimplemented end trim support).\n",
+ os->pduration);
+ return AVERROR_PATCHWELCOME;
+ }
+ }
+
+ return 0;
+}
+
+const struct ogg_codec ff_opus_codec = {
+ .name = "Opus",
+ .magic = "OpusHead",
+ .magicsize = 8,
+ .header = opus_header,
+ .packet = opus_packet,
+ .granule_is_start = 1,
+ .nb_header = 1,
+};

libav-v9.6.tar.bz2/libavformat/oggparseskeleton.c -> libav-v10.1.tar.bz2/libavformat/oggparseskeleton.c Changed

libav-v9.6.tar.bz2/libavformat/oggparsetheora.c -> libav-v10.1.tar.bz2/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;
+ 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,41 +108,43 @@
 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 - 8);
+ 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:
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
- st->codec->extradata = av_realloc (st->codec->extradata,
- cds + FF_INPUT_BUFFER_PADDING_SIZE);
- cdp = st->codec->extradata + st->codec->extradata_size;
+ if ((err = av_reallocp(&st->codec->extradata,
+ cds + FF_INPUT_BUFFER_PADDING_SIZE)) < 0) {
+ st->codec->extradata_size = 0;
+ return err;
+ }
+ 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)
@@ -151,7 +156,7 @@
 if (thp->version < 0x030201)
 iframe++;
 
- if(!pframe)
+ if (!pframe)
 os->pflags |= AV_PKT_FLAG_KEY;
 
 if (dts)
@@ -161,9 +166,9 @@
 }
 
 const struct ogg_codec ff_theora_codec = {
- .magic = "\200theora",
+ .magic = "\200theora",
 .magicsize = 7,
- .header = theora_header,
- .gptopts = theora_gptopts,
+ .header = theora_header,
+ .gptopts = theora_gptopts,
 .nb_header = 3,
 };

libav-v9.6.tar.bz2/libavformat/oggparsevorbis.c -> libav-v10.1.tar.bz2/libavformat/oggparsevorbis.c Changed

@@ -1,35 +1,38 @@
-/**
- Copyright (C) 2005 Michael Ahlberg, Måns Rullgård
-
- 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 Michael Ahlberg, Måns Rullgård
+ *
+ * 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/avstring.h"
+#include "libavutil/base64.h"
 #include "libavutil/bswap.h"
 #include "libavutil/dict.h"
-#include "libavcodec/get_bits.h"
 #include "libavcodec/bytestream.h"
+#include "libavcodec/get_bits.h"
 #include "libavcodec/vorbis_parser.h"
 #include "avformat.h"
+#include "flac_picture.h"
 #include "internal.h"
 #include "oggdec.h"
 #include "vorbiscomment.h"
@@ -39,19 +42,19 @@
 int i, cnum, h, m, s, ms, keylen = strlen(key);
 AVChapter *chapter = NULL;
 
- if (keylen < 9 || sscanf(key, "CHAPTER%02d", &cnum) != 1)
+ if (keylen < 9 || sscanf(key, "CHAPTER%03d", &cnum) != 1)
 return 0;
 
- if (keylen == 9) {
+ if (keylen <= 10) {
 if (sscanf(val, "%02d:%02d:%02d.%03d", &h, &m, &s, &ms) < 4)
 return 0;
 
- avpriv_new_chapter(as, cnum, (AVRational){1,1000},
- ms + 1000*(s + 60*(m + 60*h)),
- AV_NOPTS_VALUE, NULL);
+ avpriv_new_chapter(as, cnum, (AVRational) { 1, 1000 },
+ ms + 1000 * (s + 60 * (m + 60 * h)),
+ AV_NOPTS_VALUE, NULL);
 av_free(val);
- } else if (!strcmp(key+9, "NAME")) {
- for(i = 0; i < as->nb_chapters; i++)
+ } else if (!strcmp(key + keylen - 4, "NAME")) {
+ for (i = 0; i < as->nb_chapters; i++)
 if (as->chapters[i]->id == cnum) {
 chapter = as->chapters[i];
 break;
@@ -59,8 +62,7 @@
 if (!chapter)
 return 0;
 
- av_dict_set(&chapter->metadata, "title", val,
- AV_DICT_DONT_STRDUP_VAL);
+ av_dict_set(&chapter->metadata, "title", val, AV_DICT_DONT_STRDUP_VAL);
 } else
 return 0;
 
@@ -68,21 +70,22 @@
 return 1;
 }
 
-int
-ff_vorbis_comment(AVFormatContext * as, AVDictionary **m, const uint8_t *buf, int size)
+int ff_vorbis_comment(AVFormatContext *as, AVDictionary **m,
+ const uint8_t *buf, int size)
 {
- const uint8_t *p = buf;
+ const uint8_t *p = buf;
 const uint8_t *end = buf + size;
 unsigned n, j;
 int s;
 
- if (size < 8) /* must have vendor_length and user_comment_list_length */
- return -1;
+ /* must have vendor_length and user_comment_list_length */
+ if (size < 8)
+ return AVERROR_INVALIDDATA;
 
 s = bytestream_get_le32(&p);
 
 if (end - p - 4 < s || s < 0)
- return -1;
+ return AVERROR_INVALIDDATA;
 
 p += s;
 
@@ -97,7 +100,7 @@
 if (end - p < s || s < 0)
 break;
 
- t = p;
+ t = p;
 p += s;
 n--;
 
@@ -117,26 +120,50 @@
 if (!tt || !ct) {
 av_freep(&tt);
 av_freep(&ct);
- av_log(as, AV_LOG_WARNING, "out-of-memory error. skipping VorbisComment tag.\n");
- continue;
+ return AVERROR(ENOMEM);
 }
 
 for (j = 0; j < tl; j++)
- tt[j] = toupper(t[j]);
+ tt[j] = av_toupper(t[j]);
 tt[tl] = 0;
 
 memcpy(ct, v, vl);
 ct[vl] = 0;
 
- if (!ogm_chapter(as, tt, ct))
+ /* The format in which the pictures are stored is the FLAC format.
+ * Xiph says: "The binary FLAC picture structure is base64 encoded
+ * and placed within a VorbisComment with the tag name
+ * 'METADATA_BLOCK_PICTURE'. This is the preferred and
+ * recommended way of embedding cover art within VorbisComments."
+ */
+ if (!strcmp(tt, "METADATA_BLOCK_PICTURE")) {
+ int ret;
+ char *pict = av_malloc(vl);
+
+ if (!pict) {
+ av_freep(&tt);
+ av_freep(&ct);
+ return AVERROR(ENOMEM);
+ }
+ if ((ret = av_base64_decode(pict, ct, vl)) > 0)
+ ret = ff_flac_parse_picture(as, pict, ret);
+ av_freep(&tt);
+ av_freep(&ct);
+ av_freep(&pict);
+ if (ret < 0) {
+ av_log(as, AV_LOG_WARNING, "Failed to parse cover art block.\n");
+ continue;
+ }
+ } else if (!ogm_chapter(as, tt, ct))
 av_dict_set(m, tt, ct,
- AV_DICT_DONT_STRDUP_KEY |
- AV_DICT_DONT_STRDUP_VAL);
+ AV_DICT_DONT_STRDUP_KEY |
+ AV_DICT_DONT_STRDUP_VAL);
 }
 }
 
 if (p != end)
- av_log(as, AV_LOG_INFO, "%ti bytes of comment header remain\n", end-p);
+ av_log(as, AV_LOG_INFO,
+ "%ti bytes of comment header remain\n", end - p);
 if (n > 0)
 av_log(as, AV_LOG_INFO,
 "truncated comment header, %i comments not found\n", n);
@@ -146,8 +173,9 @@
 return 0;
 }
 
-
-/** Parse the vorbis header
+/*
+ * Parse the vorbis header
+ *
 * Vorbis Identification header from Vorbis_I_spec.html#vorbis-spec-codec
 * [vorbis_version] = read 32 bits as unsigned integer | Not used
 * [audio_channels] = read 8 bit integer as unsigned | Used
@@ -158,7 +186,7 @@
 * [blocksize_0] = read 4 bits as unsigned integer | Not Used
 * [blocksize_1] = read 4 bits as unsigned integer | Not Used
 * [framing_flag] = read one bit | Not Used
- * */
+ */
 
 struct oggvorbis_private {
 unsigned int len[3];
@@ -168,19 +196,20 @@
 int final_duration;
 };
 
-
-static unsigned int
-fixup_vorbis_headers(AVFormatContext * as, struct oggvorbis_private *priv,
- uint8_t **buf)
+static int fixup_vorbis_headers(AVFormatContext *as,
+ struct oggvorbis_private *priv,
+ uint8_t **buf)
 {
- int i,offset, len;
+ int i, offset, len, err;
 unsigned char *ptr;
 
 len = priv->len[0] + priv->len[1] + priv->len[2];
- ptr = *buf = av_mallocz(len + len/255 + 64);
+ ptr = *buf = av_mallocz(len + len / 255 + 64);
+ if (!ptr)
+ return AVERROR(ENOMEM);
 
- ptr[0] = 2;
- offset = 1;
+ ptr[0] = 2;
+ offset = 1;
 offset += av_xiphlacing(&ptr[offset], priv->len[0]);
 offset += av_xiphlacing(&ptr[offset], priv->len[1]);
 for (i = 0; i < 3; i++) {
@@ -188,7 +217,8 @@
 offset += priv->len[i];
 av_freep(&priv->packet[i]);
 }
- *buf = av_realloc(*buf, offset + FF_INPUT_BUFFER_PADDING_SIZE);
+ if ((err = av_reallocp(buf, offset + FF_INPUT_BUFFER_PADDING_SIZE)) < 0)
+ return err;
 return offset;
 }
 
@@ -203,36 +233,37 @@
 av_freep(&priv->packet[i]);
 }
 
-static int
-vorbis_header (AVFormatContext * s, int idx)
+static int vorbis_header(AVFormatContext *s, int idx)
 {
 struct ogg *ogg = s->priv_data;
+ AVStream *st = s->streams[idx];
 struct ogg_stream *os = ogg->streams + idx;
- AVStream *st = s->streams[idx];
 struct oggvorbis_private *priv;
 int pkt_type = os->buf[os->pstart];
 
- if (!(pkt_type & 1))
- return 0;
-
 if (!os->private) {
 os->private = av_mallocz(sizeof(struct oggvorbis_private));
 if (!os->private)
- return 0;
+ return AVERROR(ENOMEM);
 }
 
+ if (!(pkt_type & 1))
+ return 0;
+
 if (os->psize < 1 || pkt_type > 5)
- return -1;
+ return AVERROR_INVALIDDATA;
 
 priv = os->private;
 
- if (priv->packet[pkt_type>>1])
- return -1;
+ if (priv->packet[pkt_type >> 1])
+ return AVERROR_INVALIDDATA;
 if (pkt_type > 1 && !priv->packet[0] || pkt_type > 3 && !priv->packet[1])
- return -1;
+ return AVERROR_INVALIDDATA;
 
- priv->len[pkt_type >> 1] = os->psize;
+ priv->len[pkt_type >> 1] = os->psize;
 priv->packet[pkt_type >> 1] = av_mallocz(os->psize);
+ if (!priv->packet[pkt_type >> 1])
+ return AVERROR(ENOMEM);
 memcpy(priv->packet[pkt_type >> 1], os->buf + os->pstart, os->psize);
 if (os->buf[os->pstart] == 1) {
 const uint8_t *p = os->buf + os->pstart + 7; /* skip "\001vorbis" tag */
@@ -240,31 +271,31 @@
 int srate;
 
 if (os->psize != 30)
- return -1;
+ return AVERROR_INVALIDDATA;
 
 if (bytestream_get_le32(&p) != 0) /* vorbis_version */
- return -1;
+ return AVERROR_INVALIDDATA;
 
 st->codec->channels = bytestream_get_byte(&p);
- srate = bytestream_get_le32(&p);
+ srate = bytestream_get_le32(&p);
 p += 4; // skip maximum bitrate
 st->codec->bit_rate = bytestream_get_le32(&p); // nominal bitrate
 p += 4; // skip minimum bitrate
 
 blocksize = bytestream_get_byte(&p);
- bs0 = blocksize & 15;
- bs1 = blocksize >> 4;
+ bs0 = blocksize & 15;
+ bs1 = blocksize >> 4;
 
 if (bs0 > bs1)
- return -1;
+ return AVERROR_INVALIDDATA;
 if (bs0 < 6 || bs1 > 13)
- return -1;
+ return AVERROR_INVALIDDATA;
 
 if (bytestream_get_byte(&p) != 1) /* framing_flag */
- return -1;
+ return AVERROR_INVALIDDATA;
 
 st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_id = AV_CODEC_ID_VORBIS;
+ st->codec->codec_id = AV_CODEC_ID_VORBIS;
 
 if (srate > 0) {
 st->codec->sample_rate = srate;
@@ -272,19 +303,23 @@
 }
 } 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) {
+ ff_vorbis_comment(s, &st->metadata, os->buf + os->pstart + 7,
+ os->psize - 8) >= 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) {
 AV_WL32(priv->packet[1] + new_len - 5, 0);
 priv->packet[1][new_len - 1] = 1;
- priv->len[1] = new_len;
+ priv->len[1] = new_len;
 }
 }
 } else {
- int ret;
- st->codec->extradata_size =
- fixup_vorbis_headers(s, priv, &st->codec->extradata);
+ int ret = fixup_vorbis_headers(s, priv, &st->codec->extradata);
+ if (ret < 0) {
+ st->codec->extradata_size = 0;
+ return ret;
+ }
+ st->codec->extradata_size = ret;
 if ((ret = avpriv_vorbis_parse_extradata(st->codec, &priv->vp))) {
 av_freep(&st->codec->extradata);
 st->codec->extradata_size = 0;
@@ -303,13 +338,13 @@
 int duration;
 
 /* 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 */
+ * 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) {
 int seg;
- uint8_t *last_pkt = os->buf + os->pstart;
- uint8_t *next_pkt = last_pkt;
+ uint8_t *last_pkt = os->buf + os->pstart;
+ uint8_t *next_pkt = last_pkt;
 int first_duration = 0;
 
 avpriv_vorbis_parse_reset(&priv->vp);
@@ -324,16 +359,17 @@
 if (!duration)
 first_duration = d;
 duration += d;
- last_pkt = next_pkt + os->segments[seg];
+ last_pkt = next_pkt + os->segments[seg];
 }
 next_pkt += os->segments[seg];
 }
- os->lastpts = os->lastdts = os->granule - duration;
+ os->lastpts =
+ os->lastdts = os->granule - duration;
 s->streams[idx]->start_time = os->lastpts + first_duration;
 if (s->streams[idx]->duration)
 s->streams[idx]->duration -= s->streams[idx]->start_time;
- s->streams[idx]->cur_dts = AV_NOPTS_VALUE;
- priv->final_pts = AV_NOPTS_VALUE;
+ s->streams[idx]->cur_dts = AV_NOPTS_VALUE;
+ priv->final_pts = AV_NOPTS_VALUE;
 avpriv_vorbis_parse_reset(&priv->vp);
 }
 
@@ -348,12 +384,12 @@
 }
 
 /* final packet handling
- here we save the pts of the first packet in the final page, sum up all
- packet durations in the final page except for the last one, and compare
- to the page granule to find the duration of the final packet */
+ * here we save the pts of the first packet in the final page, sum up all
+ * packet durations in the final page except for the last one, and compare
+ * to the page granule to find the duration of the final packet */
 if (os->flags & OGG_FLAG_EOS) {
 if (os->lastpts != AV_NOPTS_VALUE) {
- priv->final_pts = os->lastpts;
+ priv->final_pts = os->lastpts;
 priv->final_duration = 0;
 }
 if (os->segp == os->nsegs)
@@ -365,10 +401,10 @@
 }
 
 const struct ogg_codec ff_vorbis_codec = {
- .magic = "\001vorbis",
+ .magic = "\001vorbis",
 .magicsize = 7,
- .header = vorbis_header,
- .packet = vorbis_packet,
- .cleanup= vorbis_cleanup,
+ .header = vorbis_header,
+ .packet = vorbis_packet,
+ .cleanup = vorbis_cleanup,
 .nb_header = 3,
 };

libav-v9.6.tar.bz2/libavformat/oma.c -> libav-v10.1.tar.bz2/libavformat/oma.c Changed

libav-v9.6.tar.bz2/libavformat/oma.h -> libav-v10.1.tar.bz2/libavformat/oma.h Changed

libav-v9.6.tar.bz2/libavformat/omadec.c -> libav-v10.1.tar.bz2/libavformat/omadec.c Changed

@@ -1,7 +1,7 @@
 /*
 * Sony OpenMG (OMA) demuxer
 *
- * Copyright (c) 2008 Maxim Poliakovski
+ * Copyright (c) 2008, 2013 Maxim Poliakovski
 * 2008 Benjamin Larsson
 * 2011 David Goldwich
 *
@@ -37,7 +37,7 @@
 * - Sound data organized in packets follow the EA3 header
 * (can be encrypted using the Sony DRM!).
 *
- * CODEC SUPPORT: Only ATRAC3 codec is currently supported!
+ * Supported decoders: ATRAC3, ATRAC3+, MP3, LPCM
 */
 
 #include "libavutil/channel_layout.h"
@@ -74,18 +74,20 @@
 struct AVDES av_des;
 } OMAContext;
 
-static void hex_log(AVFormatContext *s, int level, const char *name, const uint8_t *value, int len)
+static void hex_log(AVFormatContext *s, int level,
+ const char *name, const uint8_t *value, int len)
 {
 char buf[33];
 len = FFMIN(len, 16);
 if (av_log_get_level() < level)
 return;
 ff_data_to_hex(buf, value, len, 1);
- buf[len<<1] = '\0';
+ buf[len << 1] = '\0';
 av_log(s, level, "%s: %s\n", name, buf);
 }
 
-static int kset(AVFormatContext *s, const uint8_t *r_val, const uint8_t *n_val, int len)
+static int kset(AVFormatContext *s, const uint8_t *r_val, const uint8_t *n_val,
+ int len)
 {
 OMAContext *oc = s->priv_data;
 
@@ -113,13 +115,18 @@
 return 0;
 }
 
-static int rprobe(AVFormatContext *s, uint8_t *enc_header, const uint8_t *r_val)
+#define OMA_RPROBE_M_VAL 48 + 1
+
+static int rprobe(AVFormatContext *s, uint8_t *enc_header, unsigned size,
+ const uint8_t *r_val)
 {
 OMAContext *oc = s->priv_data;
 unsigned int pos;
 struct AVDES av_des;
 
- if (!enc_header || !r_val)
+ if (!enc_header || !r_val ||
+ size < OMA_ENC_HEADER_SIZE + oc->k_size + oc->e_size + oc->i_size ||
+ size < OMA_RPROBE_M_VAL)
 return -1;
 
 /* m_val */
@@ -140,35 +147,45 @@
 return memcmp(&enc_header[pos], oc->sm_val, 8) ? -1 : 0;
 }
 
-static int nprobe(AVFormatContext *s, uint8_t *enc_header, int size, const uint8_t *n_val)
+static int nprobe(AVFormatContext *s, uint8_t *enc_header, unsigned size,
+ const uint8_t *n_val)
 {
 OMAContext *oc = s->priv_data;
- uint32_t pos, taglen, datalen;
+ uint64_t pos;
+ uint32_t taglen, datalen;
 struct AVDES av_des;
 
- if (!enc_header || !n_val)
+ if (!enc_header || !n_val ||
+ size < OMA_ENC_HEADER_SIZE + oc->k_size + 4)
 return -1;
 
 pos = OMA_ENC_HEADER_SIZE + oc->k_size;
 if (!memcmp(&enc_header[pos], "EKB ", 4))
 pos += 32;
 
+ if (size < pos + 44)
+ return -1;
+
 if (AV_RB32(&enc_header[pos]) != oc->rid)
 av_log(s, AV_LOG_DEBUG, "Mismatching RID\n");
 
- taglen = AV_RB32(&enc_header[pos+32]);
- datalen = AV_RB32(&enc_header[pos+36]) >> 4;
+ taglen = AV_RB32(&enc_header[pos + 32]);
+ datalen = AV_RB32(&enc_header[pos + 36]) >> 4;
 
- if(taglen + (((uint64_t)datalen)<<4) + 44 > size)
+ pos += 44;
+ if (size - pos < taglen)
 return -1;
 
- pos += 44 + taglen;
+ pos += taglen;
+
+ if (datalen << 4 > size - pos)
+ return -1;
 
 av_des_init(&av_des, n_val, 192, 1);
 while (datalen-- > 0) {
 av_des_crypt(&av_des, oc->r_val, &enc_header[pos], 2, NULL, 1);
 kset(s, oc->r_val, NULL, 16);
- if (!rprobe(s, enc_header, oc->r_val))
+ if (!rprobe(s, enc_header, size, oc->r_val))
 return 0;
 pos += 16;
 }
@@ -197,12 +214,13 @@
 }
 if (!em) {
 av_log(s, AV_LOG_ERROR, "No encryption header found\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 if (geob->datasize < 64) {
- av_log(s, AV_LOG_ERROR, "Invalid GEOB data size: %u\n", geob->datasize);
- return -1;
+ av_log(s, AV_LOG_ERROR,
+ "Invalid GEOB data size: %u\n", geob->datasize);
+ return AVERROR_INVALIDDATA;
 }
 
 gdata = geob->data;
@@ -217,7 +235,12 @@
 
 if (memcmp(&gdata[OMA_ENC_HEADER_SIZE], "KEYRING ", 12)) {
 av_log(s, AV_LOG_ERROR, "Invalid encryption header\n");
- return -1;
+ 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) {
+ av_log(s, AV_LOG_ERROR, "Too little GEOB data\n");
+ return AVERROR_INVALIDDATA;
 }
 oc->rid = AV_RB32(&gdata[OMA_ENC_HEADER_SIZE + 28]);
 av_log(s, AV_LOG_DEBUG, "RID: %.8x\n", oc->rid);
@@ -225,32 +248,36 @@
 memcpy(oc->iv, &header[0x58], 8);
 hex_log(s, AV_LOG_DEBUG, "IV", oc->iv, 8);
 
- hex_log(s, AV_LOG_DEBUG, "CBC-MAC", &gdata[OMA_ENC_HEADER_SIZE+oc->k_size+oc->e_size+oc->i_size], 8);
+ hex_log(s, AV_LOG_DEBUG, "CBC-MAC",
+ &gdata[OMA_ENC_HEADER_SIZE + oc->k_size + oc->e_size + oc->i_size],
+ 8);
 
 if (s->keylen > 0) {
 kset(s, s->key, s->key, s->keylen);
 }
 if (!memcmp(oc->r_val, (const uint8_t[8]){0}, 8) ||
- rprobe(s, gdata, oc->r_val) < 0 &&
+ rprobe(s, gdata, geob->datasize, oc->r_val) < 0 &&
 nprobe(s, gdata, geob->datasize, oc->n_val) < 0) {
 int i;
 for (i = 0; i < FF_ARRAY_ELEMS(leaf_table); i += 2) {
 uint8_t buf[16];
- AV_WL64(buf, leaf_table[i]);
- AV_WL64(&buf[8], leaf_table[i+1]);
+ AV_WL64(buf, leaf_table[i]);
+ AV_WL64(&buf[8], leaf_table[i + 1]);
 kset(s, buf, buf, 16);
- if (!rprobe(s, gdata, oc->r_val) || !nprobe(s, gdata, geob->datasize, oc->n_val))
+ if (!rprobe(s, gdata, geob->datasize, oc->r_val) ||
+ !nprobe(s, gdata, geob->datasize, oc->n_val))
 break;
 }
- if (i >= sizeof(leaf_table)) {
+ if (i >= FF_ARRAY_ELEMS(leaf_table)) {
 av_log(s, AV_LOG_ERROR, "Invalid key\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 }
 
 /* e_val */
 av_des_init(&oc->av_des, oc->m_val, 64, 0);
- av_des_crypt(&oc->av_des, oc->e_val, &gdata[OMA_ENC_HEADER_SIZE + 40], 1, NULL, 0);
+ av_des_crypt(&oc->av_des, oc->e_val,
+ &gdata[OMA_ENC_HEADER_SIZE + 40], 1, NULL, 0);
 hex_log(s, AV_LOG_DEBUG, "EK", oc->e_val, 8);
 
 /* init e_val */
@@ -262,7 +289,7 @@
 static int oma_read_header(AVFormatContext *s)
 {
 int ret, framesize, jsflag, samplerate;
- uint32_t codec_params;
+ uint32_t codec_params, channel_id;
 int16_t eid;
 uint8_t buf[EA3_HEADER_SIZE];
 uint8_t *edata;
@@ -275,9 +302,10 @@
 if (ret < EA3_HEADER_SIZE)
 return -1;
 
- if (memcmp(buf, ((const uint8_t[]){'E', 'A', '3'}),3) || buf[4] != 0 || buf[5] != EA3_HEADER_SIZE) {
+ if (memcmp(buf, ((const uint8_t[]){'E', 'A', '3'}), 3) ||
+ buf[4] != 0 || buf[5] != EA3_HEADER_SIZE) {
 av_log(s, AV_LOG_ERROR, "Couldn't find the EA3 header !\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 oc->content_start = avio_tell(s->pb);
@@ -298,75 +326,86 @@
 return AVERROR(ENOMEM);
 
 st->start_time = 0;
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_tag = buf[32];
- st->codec->codec_id = ff_codec_get_id(ff_oma_codec_tags, st->codec->codec_tag);
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codec->codec_tag = buf[32];
+ st->codec->codec_id = ff_codec_get_id(ff_oma_codec_tags,
+ st->codec->codec_tag);
 
 switch (buf[32]) {
- case OMA_CODECID_ATRAC3:
- samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7] * 100;
- if (!samplerate) {
- av_log(s, AV_LOG_ERROR, "Unsupported sample rate\n");
- return AVERROR_INVALIDDATA;
- }
- if (samplerate != 44100)
- av_log_ask_for_sample(s, "Unsupported sample rate: %d\n",
- samplerate);
-
- framesize = (codec_params & 0x3FF) * 8;
- jsflag = (codec_params >> 17) & 1; /* get stereo coding mode, 1 for joint-stereo */
- st->codec->channels = 2;
- st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
- st->codec->sample_rate = samplerate;
- st->codec->bit_rate = st->codec->sample_rate * framesize * 8 / 1024;
-
- /* fake the atrac3 extradata (wav format, makes stream copy to wav work) */
- st->codec->extradata_size = 14;
- edata = av_mallocz(14 + FF_INPUT_BUFFER_PADDING_SIZE);
- if (!edata)
- return AVERROR(ENOMEM);
-
- st->codec->extradata = edata;
- AV_WL16(&edata[0], 1); // always 1
- AV_WL32(&edata[2], samplerate); // samples rate
- AV_WL16(&edata[6], jsflag); // coding mode
- AV_WL16(&edata[8], jsflag); // coding mode
- AV_WL16(&edata[10], 1); // always 1
- // AV_WL16(&edata[12], 0); // always 0
-
- avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
- break;
- case OMA_CODECID_ATRAC3P:
- st->codec->channels = (codec_params >> 10) & 7;
- framesize = ((codec_params & 0x3FF) * 8) + 8;
- samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7] * 100;
- if (!samplerate) {
- av_log(s, AV_LOG_ERROR, "Unsupported sample rate\n");
- return AVERROR_INVALIDDATA;
- }
- st->codec->sample_rate = samplerate;
- st->codec->bit_rate = samplerate * framesize * 8 / 1024;
- 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;
- framesize = 1024;
- break;
- case OMA_CODECID_LPCM:
- /* PCM 44.1 kHz 16 bit stereo big-endian */
- st->codec->channels = 2;
- st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
- st->codec->sample_rate = 44100;
- framesize = 1024;
- /* bit rate = sample rate x PCM block align (= 4) x 8 */
- st->codec->bit_rate = st->codec->sample_rate * 32;
- st->codec->bits_per_coded_sample = av_get_bits_per_sample(st->codec->codec_id);
- avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
- break;
- default:
- av_log(s, AV_LOG_ERROR, "Unsupported codec %d!\n",buf[32]);
- return -1;
+ case OMA_CODECID_ATRAC3:
+ samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7] * 100;
+ if (!samplerate) {
+ av_log(s, AV_LOG_ERROR, "Unsupported sample rate\n");
+ return AVERROR_INVALIDDATA;
+ }
+ if (samplerate != 44100)
+ avpriv_request_sample(s, "Sample rate %d", samplerate);
+
+ framesize = (codec_params & 0x3FF) * 8;
+
+ /* get stereo coding mode, 1 for joint-stereo */
+ jsflag = (codec_params >> 17) & 1;
+
+ st->codec->channels = 2;
+ st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
+ st->codec->sample_rate = samplerate;
+ st->codec->bit_rate = st->codec->sample_rate * framesize * 8 / 1024;
+
+ /* fake the ATRAC3 extradata
+ * (wav format, makes stream copy to wav work) */
+ st->codec->extradata_size = 14;
+ edata = av_mallocz(14 + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!edata)
+ return AVERROR(ENOMEM);
+
+ st->codec->extradata = edata;
+ AV_WL16(&edata[0], 1); // always 1
+ AV_WL32(&edata[2], samplerate); // samples rate
+ AV_WL16(&edata[6], jsflag); // coding mode
+ AV_WL16(&edata[8], jsflag); // coding mode
+ AV_WL16(&edata[10], 1); // always 1
+ // AV_WL16(&edata[12], 0); // always 0
+
+ avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
+ break;
+ case OMA_CODECID_ATRAC3P:
+ channel_id = (codec_params >> 10) & 7;
+ if (!channel_id) {
+ av_log(s, AV_LOG_ERROR,
+ "Invalid ATRAC-X channel id: %d\n", channel_id);
+ return AVERROR_INVALIDDATA;
+ }
+ st->codec->channel_layout = ff_oma_chid_to_native_layout[channel_id - 1];
+ st->codec->channels = ff_oma_chid_to_num_channels[channel_id - 1];
+ framesize = ((codec_params & 0x3FF) * 8) + 8;
+ samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7] * 100;
+ if (!samplerate) {
+ av_log(s, AV_LOG_ERROR, "Unsupported sample rate\n");
+ return AVERROR_INVALIDDATA;
+ }
+ st->codec->sample_rate = samplerate;
+ st->codec->bit_rate = samplerate * framesize * 8 / 2048;
+ avpriv_set_pts_info(st, 64, 1, samplerate);
+ break;
+ case OMA_CODECID_MP3:
+ st->need_parsing = AVSTREAM_PARSE_FULL;
+ framesize = 1024;
+ break;
+ case OMA_CODECID_LPCM:
+ /* PCM 44.1 kHz 16 bit stereo big-endian */
+ st->codec->channels = 2;
+ st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
+ st->codec->sample_rate = 44100;
+ framesize = 1024;
+ /* bit rate = sample rate x PCM block align (= 4) x 8 */
+ st->codec->bit_rate = st->codec->sample_rate * 32;
+ st->codec->bits_per_coded_sample =
+ av_get_bits_per_sample(st->codec->codec_id);
+ avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
+ break;
+ default:
+ av_log(s, AV_LOG_ERROR, "Unsupported codec %d!\n", buf[32]);
+ return AVERROR(ENOSYS);
 }
 
 st->codec->block_align = framesize;
@@ -381,6 +420,9 @@
 int packet_size = s->streams[0]->codec->block_align;
 int ret = av_get_packet(s->pb, pkt, packet_size);
 
+ if (ret < packet_size)
+ pkt->flags |= AV_PKT_FLAG_CORRUPT;
+
 if (ret < 0)
 return ret;
 if (!ret)
@@ -389,8 +431,13 @@
 pkt->stream_index = 0;
 
 if (oc->encrypted) {
- /* previous unencrypted block saved in IV for the next packet (CBC mode) */
- av_des_crypt(&oc->av_des, pkt->data, pkt->data, (packet_size >> 3), oc->iv, 1);
+ /* previous unencrypted block saved in IV for
+ * the next packet (CBC mode) */
+ if (ret == packet_size)
+ av_des_crypt(&oc->av_des, pkt->data, pkt->data,
+ (packet_size >> 3), oc->iv, 1);
+ else
+ memset(oc->iv, 0, 8);
 }
 
 return ret;
@@ -398,23 +445,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_MAX / 2;
+ return tag_len ? AVPROBE_SCORE_EXTENSION : 0;
 
 buf += tag_len;
 
@@ -424,26 +464,30 @@
 return 0;
 }
 
-static int oma_read_seek(struct AVFormatContext *s, int stream_index, int64_t timestamp, int flags)
+static int oma_read_seek(struct AVFormatContext *s,
+ int stream_index, int64_t timestamp, int flags)
 {
 OMAContext *oc = s->priv_data;
-
- ff_pcm_read_seek(s, stream_index, timestamp, flags);
-
- if (oc->encrypted) {
- /* readjust IV for CBC */
- int64_t pos = avio_tell(s->pb);
- if (pos < oc->content_start)
- memset(oc->iv, 0, 8);
- else {
- if (avio_seek(s->pb, -8, SEEK_CUR) < 0 || avio_read(s->pb, oc->iv, 8) < 8) {
- memset(oc->iv, 0, 8);
- return -1;
- }
- }
+ int err = ff_pcm_read_seek(s, stream_index, timestamp, flags);
+
+ if (!oc->encrypted)
+ return err;
+
+ /* readjust IV for CBC */
+ if (err || avio_tell(s->pb) < oc->content_start)
+ goto wipe;
+ if ((err = avio_seek(s->pb, -8, SEEK_CUR)) < 0)
+ goto wipe;
+ if ((err = avio_read(s->pb, oc->iv, 8)) < 8) {
+ if (err >= 0)
+ err = AVERROR_EOF;
+ goto wipe;
 }
 
 return 0;
+wipe:
+ memset(oc->iv, 0, 8);
+ return err;
 }
 
 AVInputFormat ff_oma_demuxer = {

libav-v9.6.tar.bz2/libavformat/options.c -> libav-v10.1.tar.bz2/libavformat/options.c Changed

libav-v9.6.tar.bz2/libavformat/options_table.h -> libav-v10.1.tar.bz2/libavformat/options_table.h Changed

@@ -30,10 +30,11 @@
 #define E AV_OPT_FLAG_ENCODING_PARAM
 #define D AV_OPT_FLAG_DECODING_PARAM
 
-static const AVOption options[]={
+static const AVOption avformat_options[] = {
 {"probesize", "set probing size", OFFSET(probesize), AV_OPT_TYPE_INT, {.i64 = 5000000 }, 32, INT_MAX, D},
 {"packetsize", "set packet size", OFFSET(packet_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, E},
-{"fflags", NULL, OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, INT_MIN, INT_MAX, D|E, "fflags"},
+{"fflags", NULL, OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = AVFMT_FLAG_FLUSH_PACKETS }, INT_MIN, INT_MAX, D|E, "fflags"},
+{"flush_packets", "reduce the latency by flushing out packets immediately", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_FLUSH_PACKETS }, INT_MIN, INT_MAX, D, "fflags"},
 {"ignidx", "ignore index", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_IGNIDX }, INT_MIN, INT_MAX, D, "fflags"},
 {"genpts", "generate pts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_GENPTS }, INT_MIN, INT_MAX, D, "fflags"},
 {"nofillin", "do not fill in missing values that can be exactly calculated", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOFILLIN }, INT_MIN, INT_MAX, D, "fflags"},
@@ -57,6 +58,7 @@
 {"bitstream", "detect bitstream specification deviations", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BITSTREAM }, INT_MIN, INT_MAX, D, "err_detect"},
 {"buffer", "detect improper bitstream length", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BUFFER }, INT_MIN, INT_MAX, D, "err_detect"},
 {"explode", "abort decoding on minor error detection", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_EXPLODE }, INT_MIN, INT_MAX, D, "err_detect"},
+{"max_interleave_delta", "maximum buffering duration for interleaving", OFFSET(max_interleave_delta), AV_OPT_TYPE_INT64, { .i64 = 10000000 }, 0, INT64_MAX, E },
 {NULL},
 };

libav-v9.6.tar.bz2/libavformat/os_support.c -> libav-v10.1.tar.bz2/libavformat/os_support.c Changed

@@ -27,48 +27,18 @@
 #include "avformat.h"
 #include "os_support.h"
 
-#if defined(_WIN32) && !defined(__MINGW32CE__)
-#undef open
-#include <fcntl.h>
-#include <io.h>
-#include <windows.h>
-
-int ff_win32_open(const char *filename_utf8, int oflag, int pmode)
-{
- int fd;
- int num_chars;
- wchar_t *filename_w;
-
- /* convert UTF-8 to wide chars */
- num_chars = MultiByteToWideChar(CP_UTF8, 0, filename_utf8, -1, NULL, 0);
- if (num_chars <= 0)
- return -1;
- filename_w = av_mallocz(sizeof(wchar_t) * num_chars);
- MultiByteToWideChar(CP_UTF8, 0, filename_utf8, -1, filename_w, num_chars);
-
- fd = _wopen(filename_w, oflag, pmode);
- av_freep(&filename_w);
-
- /* filename maybe be in CP_ACP */
- if (fd == -1 && !(oflag & O_CREAT))
- return open(filename_utf8, oflag, pmode);
-
- return fd;
-}
-#endif
-
 #if CONFIG_NETWORK
 #include <fcntl.h>
 #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"
 
@@ -112,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));
@@ -186,7 +156,7 @@
 win_freeaddrinfo(res);
 return;
 }
-#endif
+#endif /* HAVE_WINSOCK2_H */
 
 av_free(res->ai_canonname);
 av_free(res->ai_addr);
@@ -207,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;
@@ -238,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);
@@ -268,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:
@@ -291,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
@@ -309,7 +279,7 @@
 errno = EINVAL;
 return -1;
 }
-#endif
+#endif /* HAVE_WINSOCK2_H */
 
 FD_ZERO(&read_set);
 FD_ZERO(&write_set);
@@ -324,7 +294,7 @@
 errno = EINVAL;
 return -1;
 }
-#endif
+#endif /* !HAVE_WINSOCK2_H */
 
 if (fds[i].events & POLLIN)
 FD_SET(fds[i].fd, &read_set);
@@ -366,5 +336,6 @@
 
 return rc;
 }
-#endif /* HAVE_POLL_H */
+#endif /* !HAVE_POLL_H */
+
 #endif /* CONFIG_NETWORK */

libav-v9.6.tar.bz2/libavformat/os_support.h -> libav-v10.1.tar.bz2/libavformat/os_support.h Changed

libav-v9.6.tar.bz2/libavformat/pcmdec.c -> libav-v10.1.tar.bz2/libavformat/pcmdec.c Changed

libav-v9.6.tar.bz2/libavformat/pmpdec.c -> libav-v10.1.tar.bz2/libavformat/pmpdec.c Changed

libav-v9.6.tar.bz2/libavformat/psxstr.c -> libav-v10.1.tar.bz2/libavformat/psxstr.c Changed

libav-v9.6.tar.bz2/libavformat/pva.c -> libav-v10.1.tar.bz2/libavformat/pva.c Changed

libav-v9.6.tar.bz2/libavformat/r3d.c -> libav-v10.1.tar.bz2/libavformat/r3d.c Changed

libav-v9.6.tar.bz2/libavformat/rawdec.c -> libav-v10.1.tar.bz2/libavformat/rawdec.c Changed

libav-v9.6.tar.bz2/libavformat/rawenc.c -> libav-v10.1.tar.bz2/libavformat/rawenc.c Changed

libav-v9.6.tar.bz2/libavformat/rdt.c -> libav-v10.1.tar.bz2/libavformat/rdt.c Changed

@@ -419,15 +419,16 @@
 
 for (n = 0; n < s->nb_streams; n++)
 if (s->streams[n]->id == stream->id) {
- int count = s->streams[n]->index + 1;
+ int count = s->streams[n]->index + 1, err;
 if (first == -1) first = n;
 if (rdt->nb_rmst < count) {
- RMStream **rmst= av_realloc(rdt->rmst, count*sizeof(*rmst));
- if (!rmst)
- return AVERROR(ENOMEM);
- memset(rmst + rdt->nb_rmst, 0,
- (count - rdt->nb_rmst) * sizeof(*rmst));
- rdt->rmst = rmst;
+ if ((err = av_reallocp(&rdt->rmst,
+ count * sizeof(*rdt->rmst))) < 0) {
+ rdt->nb_rmst = 0;
+ return err;
+ }
+ memset(rdt->rmst + rdt->nb_rmst, 0,
+ (count - rdt->nb_rmst) * sizeof(*rdt->rmst));
 rdt->nb_rmst = count;
 }
 rdt->rmst[s->streams[n]->index] = ff_rm_alloc_rmstream();
@@ -548,7 +549,7 @@
 }
 
 #define RDT_HANDLER(n, s, t) \
-static RTPDynamicProtocolHandler ff_rdt_ ## n ## _handler = { \
+static RTPDynamicProtocolHandler rdt_ ## n ## _handler = { \
 .enc_name = s, \
 .codec_type = t, \
 .codec_id = AV_CODEC_ID_NONE, \
@@ -563,10 +564,10 @@
 RDT_HANDLER(video, "x-pn-realvideo", AVMEDIA_TYPE_VIDEO);
 RDT_HANDLER(audio, "x-pn-realaudio", AVMEDIA_TYPE_AUDIO);
 
-void av_register_rdt_dynamic_payload_handlers(void)
+void ff_register_rdt_dynamic_payload_handlers(void)
 {
- ff_register_dynamic_payload_handler(&ff_rdt_video_handler);
- ff_register_dynamic_payload_handler(&ff_rdt_audio_handler);
- ff_register_dynamic_payload_handler(&ff_rdt_live_video_handler);
- ff_register_dynamic_payload_handler(&ff_rdt_live_audio_handler);
+ ff_register_dynamic_payload_handler(&rdt_video_handler);
+ ff_register_dynamic_payload_handler(&rdt_audio_handler);
+ ff_register_dynamic_payload_handler(&rdt_live_video_handler);
+ ff_register_dynamic_payload_handler(&rdt_live_audio_handler);
 }

libav-v9.6.tar.bz2/libavformat/rdt.h -> libav-v10.1.tar.bz2/libavformat/rdt.h Changed

libav-v9.6.tar.bz2/libavformat/riff.c -> libav-v10.1.tar.bz2/libavformat/riff.c Changed

@@ -19,15 +19,13 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include "libavutil/mathematics.h"
+#include "libavutil/error.h"
 #include "libavcodec/avcodec.h"
 #include "avformat.h"
-#include "avio_internal.h"
 #include "riff.h"
-#include "libavcodec/bytestream.h"
 
-/* Note: when encoding, the first matching tag is used, so order is
- important if multiple tags possible for a given codec. */
+/* Note: When encoding, the first matching tag is used, so order is
+ * important if multiple tags are possible for a given codec. */
 const AVCodecTag ff_codec_bmp_tags[] = {
 { AV_CODEC_ID_H264, MKTAG('H', '2', '6', '4') },
 { AV_CODEC_ID_H264, MKTAG('h', '2', '6', '4') },
@@ -44,7 +42,7 @@
 { AV_CODEC_ID_H263, MKTAG('Z', 'y', 'G', 'o') },
 { AV_CODEC_ID_H263, MKTAG('M', '2', '6', '3') },
 { AV_CODEC_ID_H263P, MKTAG('H', '2', '6', '3') },
- { AV_CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */
+ { AV_CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* Intel H.263 */
 { AV_CODEC_ID_H261, MKTAG('H', '2', '6', '1') },
 { AV_CODEC_ID_H263P, MKTAG('U', '2', '6', '3') },
 { AV_CODEC_ID_H263P, MKTAG('v', 'i', 'v', '1') },
@@ -54,7 +52,10 @@
 { AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') },
 { AV_CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') },
 { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') },
- { AV_CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 0 ) }, /* some broken avi use this */
+ /* some broken AVIs use this */
+ { AV_CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 0 ) },
+ /* some broken AVIs use this */
+ { AV_CODEC_ID_MPEG4, MKTAG('Z', 'M', 'P', '4') },
 { AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', '1') },
 { AV_CODEC_ID_MPEG4, MKTAG('B', 'L', 'Z', '0') },
 { AV_CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },
@@ -63,7 +64,8 @@
 { AV_CODEC_ID_MPEG4, MKTAG('S', 'E', 'D', 'G') },
 { AV_CODEC_ID_MPEG4, MKTAG('R', 'M', 'P', '4') },
 { AV_CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') },
- { AV_CODEC_ID_MPEG4, MKTAG('W', 'A', 'W', 'V') }, /* WaWv MPEG-4 Video Codec */
+ /* WaWv MPEG-4 Video Codec */
+ { AV_CODEC_ID_MPEG4, MKTAG('W', 'A', 'W', 'V') },
 { AV_CODEC_ID_MPEG4, MKTAG('F', 'F', 'D', 'S') },
 { AV_CODEC_ID_MPEG4, MKTAG('F', 'V', 'F', 'W') },
 { AV_CODEC_ID_MPEG4, MKTAG('D', 'C', 'O', 'D') },
@@ -74,18 +76,22 @@
 { AV_CODEC_ID_MPEG4, MKTAG('V', 'I', 'D', 'M') },
 { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'T', '3') },
 { AV_CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'X') },
- { AV_CODEC_ID_MPEG4, MKTAG('H', 'D', 'X', '4') }, /* flipped video */
+ /* flipped video */
+ { AV_CODEC_ID_MPEG4, MKTAG('H', 'D', 'X', '4') },
 { AV_CODEC_ID_MPEG4, MKTAG('D', 'M', 'K', '2') },
 { AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'G', 'I') },
 { AV_CODEC_ID_MPEG4, MKTAG('I', 'N', 'M', 'C') },
- { AV_CODEC_ID_MPEG4, MKTAG('E', 'P', 'H', 'V') }, /* Ephv MPEG-4 */
+ /* Ephv MPEG-4 */
+ { AV_CODEC_ID_MPEG4, MKTAG('E', 'P', 'H', 'V') },
 { AV_CODEC_ID_MPEG4, MKTAG('E', 'M', '4', 'A') },
- { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'C', 'C') }, /* Divio MPEG-4 */
+ /* Divio MPEG-4 */
+ { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'C', 'C') },
 { AV_CODEC_ID_MPEG4, MKTAG('S', 'N', '4', '0') },
 { AV_CODEC_ID_MPEG4, MKTAG('V', 'S', 'P', 'X') },
 { AV_CODEC_ID_MPEG4, MKTAG('U', 'L', 'D', 'X') },
 { AV_CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'V') },
- { AV_CODEC_ID_MPEG4, MKTAG('S', 'I', 'P', 'P') }, /* Samsung SHR-6040 */
+ /* Samsung SHR-6040 */
+ { AV_CODEC_ID_MPEG4, MKTAG('S', 'I', 'P', 'P') },
 { AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'X') },
 { AV_CODEC_ID_MPEG4, MKTAG('D', 'r', 'e', 'X') },
 { AV_CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
@@ -110,9 +116,12 @@
 { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'l') },
 { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', '2', '5') },
 { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', '0') },
- { AV_CODEC_ID_DVVIDEO, MKTAG('c', 'd', 'v', 'c') }, /* Canopus DV */
- { AV_CODEC_ID_DVVIDEO, MKTAG('C', 'D', 'V', 'H') }, /* Canopus DV */
- { AV_CODEC_ID_DVVIDEO, MKTAG('C', 'D', 'V', '5') }, /* Canopus DV */
+ /* Canopus DV */
+ { AV_CODEC_ID_DVVIDEO, MKTAG('c', 'd', 'v', 'c') },
+ /* Canopus DV */
+ { AV_CODEC_ID_DVVIDEO, MKTAG('C', 'D', 'V', 'H') },
+ /* Canopus DV */
+ { AV_CODEC_ID_DVVIDEO, MKTAG('C', 'D', 'V', '5') },
 { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') },
 { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 's') },
 { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') },
@@ -128,33 +137,43 @@
 { AV_CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 16) },
 { AV_CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') },
 { AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') },
- { AV_CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */
+ /* Lead MPEG-2 in AVI */
+ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') },
 { AV_CODEC_ID_MPEG2VIDEO, MKTAG('s', 'l', 'i', 'f') },
 { AV_CODEC_ID_MPEG2VIDEO, MKTAG('E', 'M', '2', 'V') },
- { AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', '7', '0', '1') }, /* Matrox MPEG2 intra-only */
+ /* Matrox MPEG-2 intra-only */
+ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', '7', '0', '1') },
 { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', 'v') },
 { AV_CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
 { AV_CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },
 { AV_CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') },
 { AV_CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') },
 { AV_CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') },
- { AV_CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */
- { AV_CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */
+ /* Pegasus lossless JPEG */
+ { AV_CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') },
+ /* JPEG-LS custom FOURCC for AVI - encoder */
+ { AV_CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') },
 { AV_CODEC_ID_JPEGLS, MKTAG('M', 'J', 'P', 'G') },
- { AV_CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */
+ /* JPEG-LS custom FOURCC for AVI - decoder */
+ { AV_CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') },
 { AV_CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') },
 { AV_CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') },
 { AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') },
 { AV_CODEC_ID_MJPEG, MKTAG('A', 'C', 'D', 'V') },
 { AV_CODEC_ID_MJPEG, MKTAG('Q', 'I', 'V', 'G') },
- { AV_CODEC_ID_MJPEG, MKTAG('S', 'L', 'M', 'J') }, /* SL M-JPEG */
- { AV_CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') }, /* Creative Webcam JPEG */
- { AV_CODEC_ID_MJPEG, MKTAG('I', 'J', 'L', 'V') }, /* Intel JPEG Library Video Codec */
- { AV_CODEC_ID_MJPEG, MKTAG('M', 'V', 'J', 'P') }, /* Midvid JPEG Video Codec */
+ /* SL M-JPEG */
+ { AV_CODEC_ID_MJPEG, MKTAG('S', 'L', 'M', 'J') },
+ /* Creative Webcam JPEG */
+ { AV_CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') },
+ /* Intel JPEG Library Video Codec */
+ { AV_CODEC_ID_MJPEG, MKTAG('I', 'J', 'L', 'V') },
+ /* Midvid JPEG Video Codec */
+ { AV_CODEC_ID_MJPEG, MKTAG('M', 'V', 'J', 'P') },
 { AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '1') },
 { AV_CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '2') },
 { AV_CODEC_ID_MJPEG, MKTAG('M', 'T', 'S', 'J') },
- { AV_CODEC_ID_MJPEG, MKTAG('Z', 'J', 'P', 'G') }, /* Paradigm Matrix M-JPEG Codec */
+ /* Paradigm Matrix M-JPEG Codec */
+ { AV_CODEC_ID_MJPEG, MKTAG('Z', 'J', 'P', 'G') },
 { AV_CODEC_ID_MJPEG, MKTAG('M', 'M', 'J', 'P') },
 { AV_CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') },
 { AV_CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') },
@@ -184,7 +203,8 @@
 { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '8', ' ', ' ') },
 { AV_CODEC_ID_RAWVIDEO, MKTAG('H', 'D', 'Y', 'C') },
 { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'U', '9') },
- { AV_CODEC_ID_RAWVIDEO, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */
+ /* SoftLab-NSK VideoTizer */
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('V', 'D', 'T', 'Z') },
 { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '1', '1') },
 { AV_CODEC_ID_RAWVIDEO, MKTAG('N', 'V', '1', '2') },
 { AV_CODEC_ID_RAWVIDEO, MKTAG('N', 'V', '2', '1') },
@@ -208,6 +228,7 @@
 { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') },
 { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') },
 { AV_CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') },
+ { AV_CODEC_ID_VP6A, MKTAG('V', 'P', '6', 'A') },
 { 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') },
@@ -231,7 +252,6 @@
 { AV_CODEC_ID_TRUEMOTION1, MKTAG('P', 'V', 'E', 'Z') },
 { AV_CODEC_ID_MSZH, MKTAG('M', 'S', 'Z', 'H') },
 { AV_CODEC_ID_ZLIB, MKTAG('Z', 'L', 'I', 'B') },
- { AV_CODEC_ID_SNOW, MKTAG('S', 'N', 'O', 'W') },
 { AV_CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') },
 { AV_CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') },
 { AV_CODEC_ID_FLASHSV, MKTAG('F', 'S', 'V', '1') },
@@ -281,6 +301,8 @@
 { AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'R', 'G') },
 { AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'Y', '0') },
 { AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'Y', '2') },
+ { AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'H', '0') },
+ { AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'H', '2') },
 { AV_CODEC_ID_VBLE, MKTAG('V', 'B', 'L', 'E') },
 { AV_CODEC_ID_DXTORY, MKTAG('x', 't', 'o', 'r') },
 { AV_CODEC_ID_ZEROCODEC, MKTAG('Z', 'E', 'C', 'O') },
@@ -291,34 +313,44 @@
 { AV_CODEC_ID_CLLC, MKTAG('C', 'L', 'L', 'C') },
 { AV_CODEC_ID_MSS2, MKTAG('M', 'S', 'S', '2') },
 { AV_CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') },
+ { 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 }
 };
 
 const AVCodecTag ff_codec_wav_tags[] = {
 { AV_CODEC_ID_PCM_S16LE, 0x0001 },
- { AV_CODEC_ID_PCM_U8, 0x0001 }, /* must come after s16le in this list */
+ /* must come after s16le in this list */
+ { AV_CODEC_ID_PCM_U8, 0x0001 },
 { AV_CODEC_ID_PCM_S24LE, 0x0001 },
 { AV_CODEC_ID_PCM_S32LE, 0x0001 },
 { AV_CODEC_ID_ADPCM_MS, 0x0002 },
 { AV_CODEC_ID_PCM_F32LE, 0x0003 },
- { AV_CODEC_ID_PCM_F64LE, 0x0003 }, /* must come after f32le in this list */
+ /* must come after f32le in this list */
+ { AV_CODEC_ID_PCM_F64LE, 0x0003 },
 { AV_CODEC_ID_PCM_ALAW, 0x0006 },
 { AV_CODEC_ID_PCM_MULAW, 0x0007 },
 { AV_CODEC_ID_WMAVOICE, 0x000A },
 { AV_CODEC_ID_ADPCM_IMA_WAV, 0x0011 },
- { AV_CODEC_ID_PCM_ZORK, 0x0011 }, /* must come after adpcm_ima_wav in this list */
+ /* must come after adpcm_ima_wav in this list */
+ { AV_CODEC_ID_PCM_ZORK, 0x0011 },
 { AV_CODEC_ID_ADPCM_YAMAHA, 0x0020 },
 { AV_CODEC_ID_TRUESPEECH, 0x0022 },
 { AV_CODEC_ID_GSM_MS, 0x0031 },
+ { AV_CODEC_ID_GSM_MS, 0x0032 },
 { AV_CODEC_ID_ADPCM_G726, 0x0045 },
 { AV_CODEC_ID_MP2, 0x0050 },
 { AV_CODEC_ID_MP3, 0x0055 },
 { AV_CODEC_ID_AMR_NB, 0x0057 },
 { AV_CODEC_ID_AMR_WB, 0x0058 },
- { AV_CODEC_ID_ADPCM_IMA_DK4, 0x0061 }, /* rogue format number */
- { AV_CODEC_ID_ADPCM_IMA_DK3, 0x0062 }, /* rogue format number */
+ /* rogue format number */
+ { AV_CODEC_ID_ADPCM_IMA_DK4, 0x0061 },
+ /* rogue format number */
+ { AV_CODEC_ID_ADPCM_IMA_DK3, 0x0062 },
 { AV_CODEC_ID_ADPCM_IMA_WAV, 0x0069 },
- { AV_CODEC_ID_VOXWARE, 0x0075 },
+ { AV_CODEC_ID_METASOUND, 0x0075 },
 { AV_CODEC_ID_AAC, 0x00ff },
 { AV_CODEC_ID_SIPR, 0x0130 },
 { AV_CODEC_ID_WMAV1, 0x0160 },
@@ -332,7 +364,8 @@
 { AV_CODEC_ID_IAC, 0x0402 },
 { AV_CODEC_ID_GSM_MS, 0x1500 },
 { AV_CODEC_ID_TRUESPEECH, 0x1501 },
- { AV_CODEC_ID_AAC, 0x1600 }, /* ADTS AAC */
+ /* ADTS AAC */
+ { AV_CODEC_ID_AAC, 0x1600 },
 { AV_CODEC_ID_AAC_LATM, 0x1602 },
 { AV_CODEC_ID_AC3, 0x2000 },
 { AV_CODEC_ID_DTS, 0x2001 },
@@ -341,419 +374,33 @@
 { AV_CODEC_ID_AAC, 0x4143 },
 { AV_CODEC_ID_SPEEX, 0xA109 },
 { AV_CODEC_ID_FLAC, 0xF1AC },
- { AV_CODEC_ID_ADPCM_SWF, ('S'<<8)+'F' },
- { AV_CODEC_ID_VORBIS, ('V'<<8)+'o' }, //HACK/FIXME, does vorbis in WAV/AVI have an (in)official id?
+ { AV_CODEC_ID_ADPCM_SWF, ('S' << 8) + 'F' },
+ /* HACK/FIXME: Does Vorbis in WAV/AVI have an (in)official ID? */
+ { AV_CODEC_ID_VORBIS, ('V' << 8) + 'o' },
 { AV_CODEC_ID_NONE, 0 },
 };
 
 const AVMetadataConv ff_riff_info_conv[] = {
- { "IART", "artist" },
- { "ICMT", "comment" },
- { "ICOP", "copyright" },
- { "ICRD", "date" },
- { "IGNR", "genre" },
- { "ILNG", "language" },
- { "INAM", "title" },
- { "IPRD", "album" },
- { "IPRT", "track" },
- { "ISFT", "encoder" },
- { "ITCH", "encoded_by"},
+ { "IART", "artist" },
+ { "ICMT", "comment" },
+ { "ICOP", "copyright" },
+ { "ICRD", "date" },
+ { "IGNR", "genre" },
+ { "ILNG", "language" },
+ { "INAM", "title" },
+ { "IPRD", "album" },
+ { "IPRT", "track" },
+ { "ISFT", "encoder" },
+ { "ITCH", "encoded_by" },
 { 0 },
 };
 
-#if CONFIG_MUXERS
-int64_t ff_start_tag(AVIOContext *pb, const char *tag)
+const struct AVCodecTag *avformat_get_riff_video_tags(void)
 {
- ffio_wfourcc(pb, tag);
- avio_wl32(pb, 0);
- return avio_tell(pb);
+ return ff_codec_bmp_tags;
 }
 
-void ff_end_tag(AVIOContext *pb, int64_t start)
+const struct AVCodecTag *avformat_get_riff_audio_tags(void)
 {
- int64_t pos;
-
- pos = avio_tell(pb);
- avio_seek(pb, start - 4, SEEK_SET);
- avio_wl32(pb, (uint32_t)(pos - start));
- avio_seek(pb, pos, SEEK_SET);
-}
-
-/* WAVEFORMATEX header */
-/* returns the size or -1 on error */
-int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc)
-{
- int bps, blkalign, bytespersec, frame_size;
- int hdrsize = 18;
- int waveformatextensible;
- uint8_t temp[256];
- uint8_t *riff_extradata= temp;
- uint8_t *riff_extradata_start= temp;
-
- if(!enc->codec_tag || enc->codec_tag > 0xffff)
- return -1;
-
- /* We use the known constant frame size for the codec if known, otherwise
- fallback to using AVCodecContext.frame_size, which is not as reliable
- for indicating packet duration */
- frame_size = av_get_audio_frame_duration(enc, 0);
- if (!frame_size)
- frame_size = enc->frame_size;
-
- waveformatextensible = (enc->channels > 2 && enc->channel_layout)
- || enc->sample_rate > 48000
- || av_get_bits_per_sample(enc->codec_id) > 16;
-
- if (waveformatextensible) {
- avio_wl16(pb, 0xfffe);
- } else {
- avio_wl16(pb, enc->codec_tag);
- }
- avio_wl16(pb, enc->channels);
- avio_wl32(pb, enc->sample_rate);
- if (enc->codec_id == AV_CODEC_ID_MP2 || enc->codec_id == AV_CODEC_ID_MP3 || enc->codec_id == AV_CODEC_ID_GSM_MS) {
- bps = 0;
- } else {
- if (!(bps = av_get_bits_per_sample(enc->codec_id))) {
- if (enc->bits_per_coded_sample)
- bps = enc->bits_per_coded_sample;
- else
- bps = 16; // default to 16
- }
- }
- if(bps != enc->bits_per_coded_sample && enc->bits_per_coded_sample){
- av_log(enc, AV_LOG_WARNING, "requested bits_per_coded_sample (%d) and actually stored (%d) differ\n", enc->bits_per_coded_sample, bps);
- }
-
- if (enc->codec_id == AV_CODEC_ID_MP2 || enc->codec_id == AV_CODEC_ID_MP3) {
- /* this is wrong, but it seems many demuxers do not work if this is set
- correctly */
- blkalign = frame_size;
- //blkalign = 144 * enc->bit_rate/enc->sample_rate;
- } else if (enc->codec_id == AV_CODEC_ID_AC3) {
- blkalign = 3840; //maximum bytes per frame
- } else if (enc->block_align != 0) { /* specified by the codec */
- blkalign = enc->block_align;
- } else
- blkalign = bps * enc->channels / av_gcd(8, bps);
- if (enc->codec_id == AV_CODEC_ID_PCM_U8 ||
- enc->codec_id == AV_CODEC_ID_PCM_S24LE ||
- enc->codec_id == AV_CODEC_ID_PCM_S32LE ||
- enc->codec_id == AV_CODEC_ID_PCM_F32LE ||
- enc->codec_id == AV_CODEC_ID_PCM_F64LE ||
- enc->codec_id == AV_CODEC_ID_PCM_S16LE) {
- bytespersec = enc->sample_rate * blkalign;
- } else {
- bytespersec = enc->bit_rate / 8;
- }
- avio_wl32(pb, bytespersec); /* bytes per second */
- avio_wl16(pb, blkalign); /* block align */
- avio_wl16(pb, bps); /* bits per sample */
- if (enc->codec_id == AV_CODEC_ID_MP3) {
- hdrsize += 12;
- bytestream_put_le16(&riff_extradata, 1); /* wID */
- bytestream_put_le32(&riff_extradata, 2); /* fdwFlags */
- bytestream_put_le16(&riff_extradata, 1152); /* nBlockSize */
- bytestream_put_le16(&riff_extradata, 1); /* nFramesPerBlock */
- bytestream_put_le16(&riff_extradata, 1393); /* nCodecDelay */
- } else if (enc->codec_id == AV_CODEC_ID_MP2) {
- hdrsize += 22;
- bytestream_put_le16(&riff_extradata, 2); /* fwHeadLayer */
- bytestream_put_le32(&riff_extradata, enc->bit_rate); /* dwHeadBitrate */
- bytestream_put_le16(&riff_extradata, enc->channels == 2 ? 1 : 8); /* fwHeadMode */
- bytestream_put_le16(&riff_extradata, 0); /* fwHeadModeExt */
- bytestream_put_le16(&riff_extradata, 1); /* wHeadEmphasis */
- bytestream_put_le16(&riff_extradata, 16); /* fwHeadFlags */
- bytestream_put_le32(&riff_extradata, 0); /* dwPTSLow */
- bytestream_put_le32(&riff_extradata, 0); /* dwPTSHigh */
- } else if (enc->codec_id == AV_CODEC_ID_GSM_MS || enc->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV) {
- hdrsize += 2;
- bytestream_put_le16(&riff_extradata, frame_size); /* wSamplesPerBlock */
- } else if(enc->extradata_size){
- riff_extradata_start= enc->extradata;
- riff_extradata= enc->extradata + enc->extradata_size;
- hdrsize += enc->extradata_size;
- }
- if(waveformatextensible) { /* write WAVEFORMATEXTENSIBLE extensions */
- hdrsize += 22;
- avio_wl16(pb, riff_extradata - riff_extradata_start + 22); /* 22 is WAVEFORMATEXTENSIBLE size */
- avio_wl16(pb, bps); /* ValidBitsPerSample || SamplesPerBlock || Reserved */
- avio_wl32(pb, enc->channel_layout); /* dwChannelMask */
- avio_wl32(pb, enc->codec_tag); /* GUID + next 3 */
- avio_wl32(pb, 0x00100000);
- avio_wl32(pb, 0xAA000080);
- avio_wl32(pb, 0x719B3800);
- } else {
- avio_wl16(pb, riff_extradata - riff_extradata_start); /* cbSize */
- }
- avio_write(pb, riff_extradata_start, riff_extradata - riff_extradata_start);
- if(hdrsize&1){
- hdrsize++;
- avio_w8(pb, 0);
- }
-
- return hdrsize;
-}
-
-/* BITMAPINFOHEADER header */
-void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf)
-{
- avio_wl32(pb, 40 + enc->extradata_size); /* size */
- avio_wl32(pb, enc->width);
- //We always store RGB TopDown
- avio_wl32(pb, enc->codec_tag ? enc->height : -enc->height);
- avio_wl16(pb, 1); /* planes */
-
- avio_wl16(pb, enc->bits_per_coded_sample ? enc->bits_per_coded_sample : 24); /* depth */
- /* compression type */
- avio_wl32(pb, enc->codec_tag);
- avio_wl32(pb, enc->width * enc->height * 3);
- avio_wl32(pb, 0);
- avio_wl32(pb, 0);
- avio_wl32(pb, 0);
- avio_wl32(pb, 0);
-
- avio_write(pb, enc->extradata, enc->extradata_size);
-
- if (!for_asf && enc->extradata_size & 1)
- avio_w8(pb, 0);
-}
-
-void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale)
-{
- int gcd;
- int audio_frame_size;
-
- /* We use the known constant frame size for the codec if known, otherwise
- fallback to using AVCodecContext.frame_size, which is not as reliable
- for indicating packet duration */
- audio_frame_size = av_get_audio_frame_duration(stream, 0);
- if (!audio_frame_size)
- audio_frame_size = stream->frame_size;
-
- *au_ssize= stream->block_align;
- if (audio_frame_size && stream->sample_rate) {
- *au_scale = audio_frame_size;
- *au_rate= stream->sample_rate;
- }else if(stream->codec_type == AVMEDIA_TYPE_VIDEO ||
- stream->codec_type == AVMEDIA_TYPE_DATA ||
- stream->codec_type == AVMEDIA_TYPE_SUBTITLE){
- *au_scale= stream->time_base.num;
- *au_rate = stream->time_base.den;
- }else{
- *au_scale= stream->block_align ? stream->block_align*8 : 8;
- *au_rate = stream->bit_rate ? stream->bit_rate : 8*stream->sample_rate;
- }
- gcd= av_gcd(*au_scale, *au_rate);
- *au_scale /= gcd;
- *au_rate /= gcd;
-}
-
-void ff_riff_write_info_tag(AVIOContext *pb, const char *tag, const char *str)
-{
- int len = strlen(str);
- if (len > 0) {
- len++;
- ffio_wfourcc(pb, tag);
- avio_wl32(pb, len);
- avio_put_str(pb, str);
- if (len & 1)
- avio_w8(pb, 0);
- }
-}
-
-static const char riff_tags[][5] = {
- "IARL", "IART", "ICMS", "ICMT", "ICOP", "ICRD", "ICRP", "IDIM", "IDPI",
- "IENG", "IGNR", "IKEY", "ILGT", "ILNG", "IMED", "INAM", "IPLT", "IPRD",
- "IPRT", "ISBJ", "ISFT", "ISHP", "ISRC", "ISRF", "ITCH",
- {0}
-};
-
-static int riff_has_valid_tags(AVFormatContext *s)
-{
- int i;
-
- for (i = 0; *riff_tags[i]; i++) {
- if (av_dict_get(s->metadata, riff_tags[i], NULL, AV_DICT_MATCH_CASE))
- return 1;
- }
-
- return 0;
-}
-
-void ff_riff_write_info(AVFormatContext *s)
-{
- AVIOContext *pb = s->pb;
- int i;
- int64_t list_pos;
- AVDictionaryEntry *t = NULL;
-
- ff_metadata_conv(&s->metadata, ff_riff_info_conv, NULL);
-
- /* writing empty LIST is not nice and may cause problems */
- if (!riff_has_valid_tags(s))
- return;
-
- list_pos = ff_start_tag(pb, "LIST");
- ffio_wfourcc(pb, "INFO");
- for (i = 0; *riff_tags[i]; i++) {
- if ((t = av_dict_get(s->metadata, riff_tags[i], NULL, AV_DICT_MATCH_CASE)))
- ff_riff_write_info_tag(s->pb, t->key, t->value);
- }
- ff_end_tag(pb, list_pos);
-}
-#endif //CONFIG_MUXERS
-
-#if CONFIG_DEMUXERS
-/* We could be given one of the three possible structures here:
- * WAVEFORMAT, PCMWAVEFORMAT or WAVEFORMATEX. Each structure
- * is an expansion of the previous one with the fields added
- * at the bottom. PCMWAVEFORMAT adds 'WORD wBitsPerSample' and
- * WAVEFORMATEX adds 'WORD cbSize' and basically makes itself
- * an openended structure.
- */
-int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size)
-{
- int id;
-
- id = avio_rl16(pb);
- codec->codec_type = AVMEDIA_TYPE_AUDIO;
- codec->codec_tag = id;
- codec->channels = avio_rl16(pb);
- codec->sample_rate = avio_rl32(pb);
- codec->bit_rate = avio_rl32(pb) * 8;
- codec->block_align = avio_rl16(pb);
- if (size == 14) { /* We're dealing with plain vanilla WAVEFORMAT */
- codec->bits_per_coded_sample = 8;
- }else
- codec->bits_per_coded_sample = avio_rl16(pb);
- if (size >= 18) { /* We're obviously dealing with WAVEFORMATEX */
- int cbSize = avio_rl16(pb); /* cbSize */
- size -= 18;
- cbSize = FFMIN(size, cbSize);
- if (cbSize >= 22 && id == 0xfffe) { /* WAVEFORMATEXTENSIBLE */
- codec->bits_per_coded_sample = avio_rl16(pb);
- codec->channel_layout = avio_rl32(pb); /* dwChannelMask */
- id = avio_rl32(pb); /* 4 first bytes of GUID */
- avio_skip(pb, 12); /* skip end of GUID */
- cbSize -= 22;
- size -= 22;
- }
- codec->extradata_size = cbSize;
- if (cbSize > 0) {
- av_free(codec->extradata);
- codec->extradata = av_mallocz(codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
- if (!codec->extradata)
- return AVERROR(ENOMEM);
- avio_read(pb, codec->extradata, codec->extradata_size);
- size -= cbSize;
- }
-
- /* It is possible for the chunk to contain garbage at the end */
- if (size > 0)
- avio_skip(pb, size);
- }
- codec->codec_id = ff_wav_codec_get_id(id, codec->bits_per_coded_sample);
- if (codec->codec_id == AV_CODEC_ID_AAC_LATM) {
- /* channels and sample_rate values are those prior to applying SBR and/or PS */
- codec->channels = 0;
- codec->sample_rate = 0;
- }
- /* override bits_per_coded_sample for G.726 */
- if (codec->codec_id == AV_CODEC_ID_ADPCM_G726)
- codec->bits_per_coded_sample = codec->bit_rate / codec->sample_rate;
-
- return 0;
-}
-
-
-enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps)
-{
- enum AVCodecID id;
- id = ff_codec_get_id(ff_codec_wav_tags, tag);
- if (id <= 0)
- return id;
-
- if (id == AV_CODEC_ID_PCM_S16LE)
- id = ff_get_pcm_codec_id(bps, 0, 0, ~1);
- else if (id == AV_CODEC_ID_PCM_F32LE)
- id = ff_get_pcm_codec_id(bps, 1, 0, 0);
-
- if (id == AV_CODEC_ID_ADPCM_IMA_WAV && bps == 8)
- id = AV_CODEC_ID_PCM_ZORK;
- return id;
-}
-
-int ff_get_bmp_header(AVIOContext *pb, AVStream *st)
-{
- int tag1;
- avio_rl32(pb); /* size */
- st->codec->width = avio_rl32(pb);
- st->codec->height = (int32_t)avio_rl32(pb);
- avio_rl16(pb); /* planes */
- st->codec->bits_per_coded_sample= avio_rl16(pb); /* depth */
- tag1 = avio_rl32(pb);
- avio_rl32(pb); /* ImageSize */
- avio_rl32(pb); /* XPelsPerMeter */
- avio_rl32(pb); /* YPelsPerMeter */
- avio_rl32(pb); /* ClrUsed */
- avio_rl32(pb); /* ClrImportant */
- return tag1;
-}
-
-int ff_read_riff_info(AVFormatContext *s, int64_t size)
-{
- int64_t start, end, cur;
- AVIOContext *pb = s->pb;
-
- start = avio_tell(pb);
- end = start + size;
-
- while ((cur = avio_tell(pb)) >= 0 && cur <= end - 8 /* = tag + size */) {
- uint32_t chunk_code;
- int64_t chunk_size;
- char key[5] = {0};
- char *value;
-
- chunk_code = avio_rl32(pb);
- chunk_size = avio_rl32(pb);
-
- if (chunk_size > end || end - chunk_size < cur || chunk_size == UINT_MAX) {
- av_log(s, AV_LOG_WARNING, "too big INFO subchunk\n");
- break;
- }
-
- chunk_size += (chunk_size & 1);
-
- if (!chunk_code) {
- if (chunk_size)
- avio_skip(pb, chunk_size);
- else if (pb->eof_reached) {
- av_log(s, AV_LOG_WARNING, "truncated file\n");
- return AVERROR_EOF;
- }
- continue;
- }
-
- value = av_malloc(chunk_size + 1);
- if (!value) {
- av_log(s, AV_LOG_ERROR, "out of memory, unable to read INFO tag\n");
- return AVERROR(ENOMEM);
- }
-
- AV_WL32(key, chunk_code);
-
- if (avio_read(pb, value, chunk_size) != chunk_size) {
- av_free(value);
- av_log(s, AV_LOG_WARNING, "premature end of file while reading INFO tag\n");
- break;
- }
-
- value[chunk_size] = 0;
-
- av_dict_set(&s->metadata, key, value, AV_DICT_DONT_STRDUP_VAL);
- }
-
- return 0;
+ return ff_codec_wav_tags;
 }
-#endif // CONFIG_DEMUXERS

libav-v9.6.tar.bz2/libavformat/riff.h -> libav-v10.1.tar.bz2/libavformat/riff.h Changed

@@ -34,7 +34,6 @@
 #include "metadata.h"
 
 extern const AVMetadataConv ff_riff_info_conv[];
-extern const char ff_riff_tags[][5];
 
 int64_t ff_start_tag(AVIOContext *pb, const char *tag);
 void ff_end_tag(AVIOContext *pb, int64_t start);
@@ -68,4 +67,35 @@
  */
 void ff_riff_write_info_tag(AVIOContext *pb, const char *tag, const char *str);
 
+typedef uint8_t ff_asf_guid[16];
+
+typedef struct AVCodecGuid {
+    enum AVCodecID id;
+    ff_asf_guid guid;
+} AVCodecGuid;
+
+extern const AVCodecGuid ff_codec_wav_guids[];
+
+#define FF_PRI_GUID \
+    "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
+
+#define FF_ARG_GUID(g) \
+    g[0], g[1], g[2],  g[3],  g[4],  g[5],  g[6],  g[7], \
+    g[8], g[9], g[10], g[11], g[12], g[13], g[14], g[15]
+
+#define FF_MEDIASUBTYPE_BASE_GUID \
+    0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71
+
+static av_always_inline int ff_guidcmp(const void *g1, const void *g2)
+{
+    return memcmp(g1, g2, sizeof(ff_asf_guid));
+}
+
+static av_always_inline int ff_get_guid(AVIOContext *s, ff_asf_guid *g)
+{
+    return avio_read(s, *g, sizeof(*g));
+}
+
+enum AVCodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid);
+
 #endif /* AVFORMAT_RIFF_H */

libav-v10.1.tar.bz2/libavformat/riffdec.c Added

@@ -0,0 +1,234 @@
+/*
+ * RIFF demuxing functions and data
+ * Copyright (c) 2000 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/dict.h"
+#include "libavutil/error.h"
+#include "libavutil/log.h"
+#include "libavutil/mathematics.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/bytestream.h"
+#include "avformat.h"
+#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 }
+};
+
+enum AVCodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid)
+{
+ int i;
+ for (i = 0; guids[i].id != AV_CODEC_ID_NONE; i++)
+ if (!ff_guidcmp(guids[i].guid, guid))
+ return guids[i].id;
+ return AV_CODEC_ID_NONE;
+}
+
+/* We could be given one of the three possible structures here:
+ * WAVEFORMAT, PCMWAVEFORMAT or WAVEFORMATEX. Each structure
+ * is an expansion of the previous one with the fields added
+ * at the bottom. PCMWAVEFORMAT adds 'WORD wBitsPerSample' and
+ * WAVEFORMATEX adds 'WORD cbSize' and basically makes itself
+ * an openended structure.
+ */
+
+static void parse_waveformatex(AVIOContext *pb, AVCodecContext *c)
+{
+ ff_asf_guid subformat;
+ c->bits_per_coded_sample = avio_rl16(pb);
+ c->channel_layout = avio_rl32(pb); /* dwChannelMask */
+
+ ff_get_guid(pb, &subformat);
+ if (!memcmp(subformat + 4,
+ (const uint8_t[]){ FF_MEDIASUBTYPE_BASE_GUID }, 12)) {
+ c->codec_tag = AV_RL32(subformat);
+ c->codec_id = ff_wav_codec_get_id(c->codec_tag,
+ c->bits_per_coded_sample);
+ } else {
+ c->codec_id = ff_codec_guid_get_id(ff_codec_wav_guids, subformat);
+ if (!c->codec_id)
+ av_log(c, AV_LOG_WARNING,
+ "unknown subformat:"FF_PRI_GUID"\n",
+ FF_ARG_GUID(subformat));
+ }
+}
+
+int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size)
+{
+ int id;
+
+ id = avio_rl16(pb);
+ codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ codec->channels = avio_rl16(pb);
+ codec->sample_rate = avio_rl32(pb);
+ codec->bit_rate = avio_rl32(pb) * 8;
+ codec->block_align = avio_rl16(pb);
+ if (size == 14) { /* We're dealing with plain vanilla WAVEFORMAT */
+ codec->bits_per_coded_sample = 8;
+ } else
+ codec->bits_per_coded_sample = avio_rl16(pb);
+ if (id == 0xFFFE) {
+ codec->codec_tag = 0;
+ } else {
+ codec->codec_tag = id;
+ codec->codec_id = ff_wav_codec_get_id(id,
+ codec->bits_per_coded_sample);
+ }
+ if (size >= 18) { /* We're obviously dealing with WAVEFORMATEX */
+ int cbSize = avio_rl16(pb); /* cbSize */
+ size -= 18;
+ cbSize = FFMIN(size, cbSize);
+ if (cbSize >= 22 && id == 0xfffe) { /* WAVEFORMATEXTENSIBLE */
+ parse_waveformatex(pb, codec);
+ cbSize -= 22;
+ size -= 22;
+ }
+ codec->extradata_size = cbSize;
+ if (cbSize > 0) {
+ av_free(codec->extradata);
+ codec->extradata = av_mallocz(codec->extradata_size +
+ FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!codec->extradata)
+ return AVERROR(ENOMEM);
+ avio_read(pb, codec->extradata, codec->extradata_size);
+ size -= cbSize;
+ }
+
+ /* It is possible for the chunk to contain garbage at the end */
+ if (size > 0)
+ avio_skip(pb, size);
+ }
+ if (codec->sample_rate <= 0) {
+ av_log(NULL, AV_LOG_ERROR,
+ "Invalid sample rate: %d\n", codec->sample_rate);
+ return AVERROR_INVALIDDATA;
+ }
+ if (codec->codec_id == AV_CODEC_ID_AAC_LATM) {
+ /* Channels and sample_rate values are those prior to applying SBR
+ * and/or PS. */
+ codec->channels = 0;
+ codec->sample_rate = 0;
+ }
+ /* override bits_per_coded_sample for G.726 */
+ if (codec->codec_id == AV_CODEC_ID_ADPCM_G726)
+ codec->bits_per_coded_sample = codec->bit_rate / codec->sample_rate;
+
+ return 0;
+}
+
+enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps)
+{
+ enum AVCodecID id;
+ id = ff_codec_get_id(ff_codec_wav_tags, tag);
+ if (id <= 0)
+ return id;
+
+ if (id == AV_CODEC_ID_PCM_S16LE)
+ id = ff_get_pcm_codec_id(bps, 0, 0, ~1);
+ else if (id == AV_CODEC_ID_PCM_F32LE)
+ id = ff_get_pcm_codec_id(bps, 1, 0, 0);
+
+ if (id == AV_CODEC_ID_ADPCM_IMA_WAV && bps == 8)
+ id = AV_CODEC_ID_PCM_ZORK;
+ return id;
+}
+
+int ff_get_bmp_header(AVIOContext *pb, AVStream *st)
+{
+ int tag1;
+ avio_rl32(pb); /* size */
+ st->codec->width = avio_rl32(pb);
+ st->codec->height = (int32_t)avio_rl32(pb);
+ avio_rl16(pb); /* planes */
+ st->codec->bits_per_coded_sample = avio_rl16(pb); /* depth */
+ tag1 = avio_rl32(pb);
+ avio_rl32(pb); /* ImageSize */
+ avio_rl32(pb); /* XPelsPerMeter */
+ avio_rl32(pb); /* YPelsPerMeter */
+ avio_rl32(pb); /* ClrUsed */
+ avio_rl32(pb); /* ClrImportant */
+ return tag1;
+}
+
+int ff_read_riff_info(AVFormatContext *s, int64_t size)
+{
+ int64_t start, end, cur;
+ AVIOContext *pb = s->pb;
+
+ start = avio_tell(pb);
+ end = start + size;
+
+ while ((cur = avio_tell(pb)) >= 0 &&
+ cur <= end - 8 /* = tag + size */) {
+ uint32_t chunk_code;
+ int64_t chunk_size;
+ char key[5] = { 0 };
+ char *value;
+
+ chunk_code = avio_rl32(pb);
+ chunk_size = avio_rl32(pb);
+
+ if (chunk_size > end ||
+ end - chunk_size < cur ||
+ chunk_size == UINT_MAX) {
+ av_log(s, AV_LOG_WARNING, "too big INFO subchunk\n");
+ break;
+ }
+
+ chunk_size += (chunk_size & 1);
+
+ if (!chunk_code) {
+ if (chunk_size)
+ avio_skip(pb, chunk_size);
+ else if (pb->eof_reached) {
+ av_log(s, AV_LOG_WARNING, "truncated file\n");
+ return AVERROR_EOF;
+ }
+ continue;
+ }
+
+ value = av_malloc(chunk_size + 1);
+ if (!value) {
+ av_log(s, AV_LOG_ERROR,
+ "out of memory, unable to read INFO tag\n");
+ return AVERROR(ENOMEM);
+ }
+
+ AV_WL32(key, chunk_code);
+
+ if (avio_read(pb, value, chunk_size) != chunk_size) {
+ av_free(value);
+ av_log(s, AV_LOG_WARNING,
+ "premature end of file while reading INFO tag\n");
+ break;
+ }
+
+ value[chunk_size] = 0;
+
+ av_dict_set(&s->metadata, key, value, AV_DICT_DONT_STRDUP_VAL);
+ }
+
+ return 0;
+}

libav-v10.1.tar.bz2/libavformat/riffenc.c Added

@@ -0,0 +1,295 @@
+/*
+ * RIFF muxing functions
+ * Copyright (c) 2000 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/dict.h"
+#include "libavutil/log.h"
+#include "libavutil/mathematics.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/bytestream.h"
+#include "avformat.h"
+#include "avio_internal.h"
+#include "riff.h"
+
+int64_t ff_start_tag(AVIOContext *pb, const char *tag)
+{
+    ffio_wfourcc(pb, tag);
+    avio_wl32(pb, 0);
+    return avio_tell(pb);
+}
+
+void ff_end_tag(AVIOContext *pb, int64_t start)
+{
+    int64_t pos;
+
+    pos = avio_tell(pb);
+    avio_seek(pb, start - 4, SEEK_SET);
+    avio_wl32(pb, (uint32_t)(pos - start));
+    avio_seek(pb, pos, SEEK_SET);
+}
+
+/* WAVEFORMATEX header */
+/* returns the size or -1 on error */
+int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc)
+{
+    int bps, blkalign, bytespersec, frame_size;
+    int hdrsize = 18;
+    int waveformatextensible;
+    uint8_t temp[256];
+    uint8_t *riff_extradata       = temp;
+    uint8_t *riff_extradata_start = temp;
+
+    if (!enc->codec_tag || enc->codec_tag > 0xffff)
+        return -1;
+
+    /* We use the known constant frame size for the codec if known, otherwise
+     * fall back on using AVCodecContext.frame_size, which is not as reliable
+     * for indicating packet duration. */
+    frame_size = av_get_audio_frame_duration(enc, 0);
+    if (!frame_size)
+        frame_size = enc->frame_size;
+
+    waveformatextensible = (enc->channels > 2 && enc->channel_layout) ||
+                           enc->sample_rate > 48000 ||
+                           av_get_bits_per_sample(enc->codec_id) > 16;
+
+    if (waveformatextensible)
+        avio_wl16(pb, 0xfffe);
+    else
+        avio_wl16(pb, enc->codec_tag);
+
+    avio_wl16(pb, enc->channels);
+    avio_wl32(pb, enc->sample_rate);
+    if (enc->codec_id == AV_CODEC_ID_MP2 ||
+        enc->codec_id == AV_CODEC_ID_MP3 ||
+        enc->codec_id == AV_CODEC_ID_GSM_MS) {
+        bps = 0;
+    } else {
+        if (!(bps = av_get_bits_per_sample(enc->codec_id))) {
+            if (enc->bits_per_coded_sample)
+                bps = enc->bits_per_coded_sample;
+            else
+                bps = 16;  // default to 16
+        }
+    }
+    if (bps != enc->bits_per_coded_sample && enc->bits_per_coded_sample) {
+        av_log(enc, AV_LOG_WARNING,
+               "requested bits_per_coded_sample (%d) "
+               "and actually stored (%d) differ\n",
+               enc->bits_per_coded_sample, bps);
+    }
+
+    if (enc->codec_id == AV_CODEC_ID_MP2 ||
+        enc->codec_id == AV_CODEC_ID_MP3) {
+        /* This is wrong, but it seems many demuxers do not work if this
+         * is set correctly. */
+        blkalign = frame_size;
+        // blkalign = 144 * enc->bit_rate/enc->sample_rate;
+    } else if (enc->codec_id == AV_CODEC_ID_AC3) {
+        blkalign = 3840;                /* maximum bytes per frame */
+    } else if (enc->block_align != 0) { /* specified by the codec */
+        blkalign = enc->block_align;
+    } else
+        blkalign = bps * enc->channels / av_gcd(8, bps);
+    if (enc->codec_id == AV_CODEC_ID_PCM_U8 ||
+        enc->codec_id == AV_CODEC_ID_PCM_S24LE ||
+        enc->codec_id == AV_CODEC_ID_PCM_S32LE ||
+        enc->codec_id == AV_CODEC_ID_PCM_F32LE ||
+        enc->codec_id == AV_CODEC_ID_PCM_F64LE ||
+        enc->codec_id == AV_CODEC_ID_PCM_S16LE) {
+        bytespersec = enc->sample_rate * blkalign;
+    } else {
+        bytespersec = enc->bit_rate / 8;
+    }
+    avio_wl32(pb, bytespersec); /* bytes per second */
+    avio_wl16(pb, blkalign);    /* block align */
+    avio_wl16(pb, bps);         /* bits per sample */
+    if (enc->codec_id == AV_CODEC_ID_MP3) {
+        hdrsize += 12;
+        bytestream_put_le16(&riff_extradata, 1);    /* wID */
+        bytestream_put_le32(&riff_extradata, 2);    /* fdwFlags */
+        bytestream_put_le16(&riff_extradata, 1152); /* nBlockSize */
+        bytestream_put_le16(&riff_extradata, 1);    /* nFramesPerBlock */
+        bytestream_put_le16(&riff_extradata, 1393); /* nCodecDelay */
+    } else if (enc->codec_id == AV_CODEC_ID_MP2) {
+        hdrsize += 22;
+        /* fwHeadLayer */
+        bytestream_put_le16(&riff_extradata, 2);
+        /* dwHeadBitrate */
+        bytestream_put_le32(&riff_extradata, enc->bit_rate);
+        /* fwHeadMode */
+        bytestream_put_le16(&riff_extradata, enc->channels == 2 ? 1 : 8);
+        /* fwHeadModeExt */
+        bytestream_put_le16(&riff_extradata, 0);
+        /* wHeadEmphasis */
+        bytestream_put_le16(&riff_extradata, 1);
+        /* fwHeadFlags */
+        bytestream_put_le16(&riff_extradata, 16);
+        /* dwPTSLow */
+        bytestream_put_le32(&riff_extradata, 0);
+        /* dwPTSHigh */
+        bytestream_put_le32(&riff_extradata, 0);
+    } else if (enc->codec_id == AV_CODEC_ID_GSM_MS ||
+               enc->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV) {
+        hdrsize += 2;
+        /* wSamplesPerBlock */
+        bytestream_put_le16(&riff_extradata, frame_size);
+    } else if (enc->extradata_size) {
+        riff_extradata_start = enc->extradata;
+        riff_extradata       = enc->extradata + enc->extradata_size;
+        hdrsize             += enc->extradata_size;
+    }
+    /* write WAVEFORMATEXTENSIBLE extensions */
+    if (waveformatextensible) {
+        hdrsize += 22;
+        /* 22 is WAVEFORMATEXTENSIBLE size */
+        avio_wl16(pb, riff_extradata - riff_extradata_start + 22);
+        /* ValidBitsPerSample || SamplesPerBlock || Reserved */
+        avio_wl16(pb, bps);
+        /* dwChannelMask */
+        avio_wl32(pb, enc->channel_layout);
+        /* GUID + next 3 */
+        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 */
+    }
+    avio_write(pb, riff_extradata_start, riff_extradata - riff_extradata_start);
+    if (hdrsize & 1) {
+        hdrsize++;
+        avio_w8(pb, 0);
+    }
+
+    return hdrsize;
+}
+
+/* BITMAPINFOHEADER header */
+void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc,
+                       const AVCodecTag *tags, int for_asf)
+{
+    /* size */
+    avio_wl32(pb, 40 + enc->extradata_size);
+    avio_wl32(pb, enc->width);
+    //We always store RGB TopDown
+    avio_wl32(pb, enc->codec_tag ? enc->height : -enc->height);
+    /* planes */
+    avio_wl16(pb, 1);
+    /* depth */
+    avio_wl16(pb, enc->bits_per_coded_sample ? enc->bits_per_coded_sample : 24);
+    /* compression type */
+    avio_wl32(pb, enc->codec_tag);
+    avio_wl32(pb, enc->width * enc->height * 3);
+    avio_wl32(pb, 0);
+    avio_wl32(pb, 0);
+    avio_wl32(pb, 0);
+    avio_wl32(pb, 0);
+
+    avio_write(pb, enc->extradata, enc->extradata_size);
+
+    if (!for_asf && enc->extradata_size & 1)
+        avio_w8(pb, 0);
+}
+
+void ff_parse_specific_params(AVCodecContext *stream, int *au_rate,
+                              int *au_ssize, int *au_scale)
+{
+    int gcd;
+    int audio_frame_size;
+
+    /* We use the known constant frame size for the codec if known, otherwise
+     * fall back on using AVCodecContext.frame_size, which is not as reliable
+     * for indicating packet duration. */
+    audio_frame_size = av_get_audio_frame_duration(stream, 0);
+    if (!audio_frame_size)
+        audio_frame_size = stream->frame_size;
+
+    *au_ssize = stream->block_align;
+    if (audio_frame_size && stream->sample_rate) {
+        *au_scale = audio_frame_size;
+        *au_rate  = stream->sample_rate;
+    } else if (stream->codec_type == AVMEDIA_TYPE_VIDEO ||
+               stream->codec_type == AVMEDIA_TYPE_DATA ||
+               stream->codec_type == AVMEDIA_TYPE_SUBTITLE) {
+        *au_scale = stream->time_base.num;
+        *au_rate  = stream->time_base.den;
+    } else {
+        *au_scale = stream->block_align ? stream->block_align * 8 : 8;
+        *au_rate  = stream->bit_rate ? stream->bit_rate :
+                    8 * stream->sample_rate;
+    }
+    gcd        = av_gcd(*au_scale, *au_rate);
+    *au_scale /= gcd;
+    *au_rate  /= gcd;
+}
+
+void ff_riff_write_info_tag(AVIOContext *pb, const char *tag, const char *str)
+{
+    int len = strlen(str);
+    if (len > 0) {
+        len++;
+        ffio_wfourcc(pb, tag);
+        avio_wl32(pb, len);
+        avio_put_str(pb, str);
+        if (len & 1)
+            avio_w8(pb, 0);
+    }
+}
+
+static const char riff_tags[][5] = {
+    "IARL", "IART", "ICMS", "ICMT", "ICOP", "ICRD", "ICRP", "IDIM", "IDPI",
+    "IENG", "IGNR", "IKEY", "ILGT", "ILNG", "IMED", "INAM", "IPLT", "IPRD",
+    "IPRT", "ISBJ", "ISFT", "ISHP", "ISRC", "ISRF", "ITCH",
+    { 0 }
+};
+
+static int riff_has_valid_tags(AVFormatContext *s)
+{
+    int i;
+
+    for (i = 0; *riff_tags[i]; i++)
+        if (av_dict_get(s->metadata, riff_tags[i], NULL, AV_DICT_MATCH_CASE))
+            return 1;
+
+    return 0;
+}
+
+void ff_riff_write_info(AVFormatContext *s)
+{
+    AVIOContext *pb = s->pb;
+    int i;
+    int64_t list_pos;
+    AVDictionaryEntry *t = NULL;
+
+    ff_metadata_conv(&s->metadata, ff_riff_info_conv, NULL);
+
+    /* writing empty LIST is not nice and may cause problems */
+    if (!riff_has_valid_tags(s))
+        return;
+
+    list_pos = ff_start_tag(pb, "LIST");
+    ffio_wfourcc(pb, "INFO");
+    for (i = 0; *riff_tags[i]; i++)
+        if ((t = av_dict_get(s->metadata, riff_tags[i],
+                             NULL, AV_DICT_MATCH_CASE)))
+            ff_riff_write_info_tag(s->pb, t->key, t->value);
+    ff_end_tag(pb, list_pos);
+}

libav-v9.6.tar.bz2/libavformat/rl2.c -> libav-v10.1.tar.bz2/libavformat/rl2.c Changed

libav-v9.6.tar.bz2/libavformat/rmdec.c -> libav-v10.1.tar.bz2/libavformat/rmdec.c Changed

@@ -21,6 +21,7 @@
 
 #include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
+#include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/dict.h"
 #include "avformat.h"
@@ -28,7 +29,7 @@
 #include "rmsipr.h"
 #include "rm.h"
 
-#define DEINT_ID_GENR MKTAG('g', 'e', 'n', 'r') ///< interleaving for Cooker/Atrac
+#define DEINT_ID_GENR MKTAG('g', 'e', 'n', 'r') ///< interleaving for Cooker/ATRAC
 #define DEINT_ID_INT0 MKTAG('I', 'n', 't', '0') ///< no interleaving needed
 #define DEINT_ID_INT4 MKTAG('I', 'n', 't', '4') ///< interleaving for 28.8
 #define DEINT_ID_SIPR MKTAG('s', 'i', 'p', 'r') ///< interleaving for Sipro
@@ -93,13 +94,13 @@
 return 0;
 }
 
-static void rm_read_metadata(AVFormatContext *s, int wide)
+static void rm_read_metadata(AVFormatContext *s, AVIOContext *pb, int wide)
 {
 char buf[1024];
 int i;
 for (i=0; i<FF_ARRAY_ELEMS(ff_rm_metadata); i++) {
- int len = wide ? avio_rb16(s->pb) : avio_r8(s->pb);
- get_strl(s->pb, buf, sizeof(buf), len);
+ int len = wide ? avio_rb16(pb) : avio_r8(pb);
+ get_strl(pb, buf, sizeof(buf), len);
 av_dict_set(&s->metadata, ff_rm_metadata[i], buf, 0);
 }
 }
@@ -129,7 +130,7 @@
 int header_size = avio_rb16(pb);
 int64_t startpos = avio_tell(pb);
 avio_skip(pb, 14);
- rm_read_metadata(s, 0);
+ rm_read_metadata(s, pb, 0);
 if ((startpos + header_size) >= avio_tell(pb) + 2) {
 // fourcc (should always be "lpcJ")
 avio_r8(pb);
@@ -276,7 +277,7 @@
 avio_r8(pb);
 avio_r8(pb);
 avio_r8(pb);
- rm_read_metadata(s, 0);
+ rm_read_metadata(s, pb, 0);
 }
 }
 return 0;
@@ -331,11 +332,13 @@
 if ((ret = rm_read_extradata(pb, st->codec, codec_data_size - (avio_tell(pb) - codec_pos))) < 0)
 return ret;
 
- av_reduce(&st->avg_frame_rate.den, &st->avg_frame_rate.num,
- 0x10000, fps, (1 << 30) - 1);
-#if FF_API_R_FRAME_RATE
- st->r_frame_rate = st->avg_frame_rate;
-#endif
+ if (fps > 0) {
+ av_reduce(&st->avg_frame_rate.den, &st->avg_frame_rate.num,
+ 0x10000, fps, (1 << 30) - 1);
+ } else if (s->error_recognition & AV_EF_EXPLODE) {
+ av_log(s, AV_LOG_ERROR, "Invalid framerate\n");
+ return AVERROR_INVALIDDATA;
+ }
 }
 
 skip:
@@ -471,7 +474,7 @@
 flags = avio_rb16(pb); /* flags */
 break;
 case MKTAG('C', 'O', 'N', 'T'):
- rm_read_metadata(s, 1);
+ rm_read_metadata(s, pb, 1);
 break;
 case MKTAG('M', 'D', 'P', 'R'):
 st = avformat_new_stream(s, NULL);
@@ -678,6 +681,12 @@
 *pkt= vst->pkt;
 vst->pkt.data= NULL;
 vst->pkt.size= 0;
+ vst->pkt.buf = NULL;
+#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
+ vst->pkt.destruct = NULL;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
 if(vst->slices != vst->cur_slice) //FIXME find out how to set slices correct from the begin
 memmove(pkt->data + 1 + 8*vst->cur_slice, pkt->data + 1 + 8*vst->slices,
 vst->videobufpos - 1 - 8*vst->slices);

libav-v9.6.tar.bz2/libavformat/rmenc.c -> libav-v10.1.tar.bz2/libavformat/rmenc.c Changed

libav-v9.6.tar.bz2/libavformat/rpl.c -> libav-v10.1.tar.bz2/libavformat/rpl.c Changed

libav-v9.6.tar.bz2/libavformat/rsodec.c -> libav-v10.1.tar.bz2/libavformat/rsodec.c Changed

libav-v9.6.tar.bz2/libavformat/rtmp.h -> libav-v10.1.tar.bz2/libavformat/rtmp.h Changed

libav-v9.6.tar.bz2/libavformat/rtmphttp.c -> libav-v10.1.tar.bz2/libavformat/rtmphttp.c Changed

@@ -85,14 +85,15 @@
 static int rtmp_http_write(URLContext *h, const uint8_t *buf, int size)
 {
 RTMP_HTTPContext *rt = h->priv_data;
- void *ptr;
 
 if (rt->out_size + size > rt->out_capacity) {
+ int err;
 rt->out_capacity = (rt->out_size + size) * 2;
- ptr = av_realloc(rt->out_data, rt->out_capacity);
- if (!ptr)
- return AVERROR(ENOMEM);
- rt->out_data = ptr;
+ if ((err = av_reallocp(&rt->out_data, rt->out_capacity)) < 0) {
+ rt->out_size = 0;
+ rt->out_capacity = 0;
+ return err;
+ }
 }
 
 memcpy(rt->out_data + rt->out_size, buf, size);
@@ -112,7 +113,7 @@
 if (ret < 0 && ret != AVERROR_EOF)
 return ret;
 
- if (ret == AVERROR_EOF) {
+ if (!ret || ret == AVERROR_EOF) {
 if (rt->finishing) {
 /* Do not send new requests when the client wants to
 * close the connection. */
@@ -226,7 +227,7 @@
 /* read the server reply which contains a unique ID */
 for (;;) {
 ret = ffurl_read(rt->stream, rt->client_id + off, sizeof(rt->client_id) - off);
- if (ret == AVERROR_EOF)
+ if (!ret || ret == AVERROR_EOF)
 break;
 if (ret < 0)
 goto fail;
@@ -236,7 +237,7 @@
 goto fail;
 }
 }
- while (off > 0 && isspace(rt->client_id[off - 1]))
+ while (off > 0 && av_isspace(rt->client_id[off - 1]))
 off--;
 rt->client_id[off] = '\0';

libav-v9.6.tar.bz2/libavformat/rtmppkt.c -> libav-v10.1.tar.bz2/libavformat/rtmppkt.c Changed

@@ -1,6 +1,6 @@
 /*
 * RTMP input format
- * Copyright (c) 2009 Kostya Shishkov
+ * Copyright (c) 2009 Konstantin Shishkov
 *
 * This file is part of Libav.
 *
@@ -129,41 +129,69 @@
 return 0;
 }
 
+int ff_rtmp_check_alloc_array(RTMPPacket **prev_pkt, int *nb_prev_pkt,
+ int channel)
+{
+ int nb_alloc;
+ RTMPPacket *ptr;
+ if (channel < *nb_prev_pkt)
+ return 0;
+
+ nb_alloc = channel + 16;
+ // This can't use the av_reallocp family of functions, since we
+ // would need to free each element in the array before the array
+ // itself is freed.
+ ptr = av_realloc_array(*prev_pkt, nb_alloc, sizeof(**prev_pkt));
+ if (!ptr)
+ return AVERROR(ENOMEM);
+ memset(ptr + *nb_prev_pkt, 0, (nb_alloc - *nb_prev_pkt) * sizeof(*ptr));
+ *prev_pkt = ptr;
+ *nb_prev_pkt = nb_alloc;
+ return 0;
+}
+
 int ff_rtmp_packet_read(URLContext *h, RTMPPacket *p,
- int chunk_size, RTMPPacket *prev_pkt)
+ int chunk_size, RTMPPacket **prev_pkt, int *nb_prev_pkt)
 {
 uint8_t hdr;
 
 if (ffurl_read(h, &hdr, 1) != 1)
 return AVERROR(EIO);
 
- return ff_rtmp_packet_read_internal(h, p, chunk_size, prev_pkt, hdr);
+ return ff_rtmp_packet_read_internal(h, p, chunk_size, prev_pkt,
+ nb_prev_pkt, hdr);
 }
 
-int ff_rtmp_packet_read_internal(URLContext *h, RTMPPacket *p, int chunk_size,
- RTMPPacket *prev_pkt, uint8_t hdr)
+static int rtmp_packet_read_one_chunk(URLContext *h, RTMPPacket *p,
+ int chunk_size, RTMPPacket **prev_pkt_ptr,
+ int *nb_prev_pkt, uint8_t hdr)
 {
 
- uint8_t t, buf[16];
- int channel_id, timestamp, data_size, offset = 0;
+ uint8_t buf[16];
+ int channel_id, timestamp, size;
 uint32_t extra = 0;
 enum RTMPPacketType type;
- int size = 0;
- int ret;
+ int written = 0;
+ int ret, toread;
+ RTMPPacket *prev_pkt;
 
- size++;
+ written++;
 channel_id = hdr & 0x3F;
 
 if (channel_id < 2) { //special case for channel number >= 64
 buf[1] = 0;
 if (ffurl_read_complete(h, buf, channel_id + 1) != channel_id + 1)
 return AVERROR(EIO);
- size += channel_id + 1;
+ written += channel_id + 1;
 channel_id = AV_RL16(buf) + 64;
 }
- data_size = prev_pkt[channel_id].data_size;
- type = prev_pkt[channel_id].type;
- extra = prev_pkt[channel_id].extra;
+ if ((ret = ff_rtmp_check_alloc_array(prev_pkt_ptr, nb_prev_pkt,
+ channel_id)) < 0)
+ return ret;
+ prev_pkt = *prev_pkt_ptr;
+ size = prev_pkt[channel_id].size;
+ type = prev_pkt[channel_id].type;
+ extra = prev_pkt[channel_id].extra;
 
 hdr >>= 6;
 if (hdr == RTMP_PS_ONEBYTE) {
@@ -171,21 +199,21 @@
 } else {
 if (ffurl_read_complete(h, buf, 3) != 3)
 return AVERROR(EIO);
- size += 3;
+ written += 3;
 timestamp = AV_RB24(buf);
 if (hdr != RTMP_PS_FOURBYTES) {
 if (ffurl_read_complete(h, buf, 3) != 3)
 return AVERROR(EIO);
- size += 3;
- data_size = AV_RB24(buf);
+ written += 3;
+ size = AV_RB24(buf);
 if (ffurl_read_complete(h, buf, 1) != 1)
 return AVERROR(EIO);
- size++;
+ written++;
 type = buf[0];
 if (hdr == RTMP_PS_TWELVEBYTES) {
 if (ffurl_read_complete(h, buf, 4) != 4)
 return AVERROR(EIO);
- size += 4;
+ written += 4;
 extra = AV_RL32(buf);
 }
 }
@@ -198,55 +226,97 @@
 if (hdr != RTMP_PS_TWELVEBYTES)
 timestamp += prev_pkt[channel_id].timestamp;
 
- if ((ret = ff_rtmp_packet_create(p, channel_id, type, timestamp,
- data_size)) < 0)
- return ret;
+ if (!prev_pkt[channel_id].read) {
+ if ((ret = ff_rtmp_packet_create(p, channel_id, type, timestamp,
+ size)) < 0)
+ return ret;
+ p->read = written;
+ p->offset = 0;
+ prev_pkt[channel_id].ts_delta = timestamp -
+ prev_pkt[channel_id].timestamp;
+ prev_pkt[channel_id].timestamp = timestamp;
+ } else {
+ // previous packet in this channel hasn't completed reading
+ RTMPPacket *prev = &prev_pkt[channel_id];
+ p->data = prev->data;
+ p->size = prev->size;
+ p->channel_id = prev->channel_id;
+ p->type = prev->type;
+ p->ts_delta = prev->ts_delta;
+ p->extra = prev->extra;
+ p->offset = prev->offset;
+ p->read = prev->read + written;
+ p->timestamp = prev->timestamp;
+ prev->data = NULL;
+ }
 p->extra = extra;
 // save history
 prev_pkt[channel_id].channel_id = channel_id;
 prev_pkt[channel_id].type = type;
- prev_pkt[channel_id].data_size = data_size;
- prev_pkt[channel_id].ts_delta = timestamp - prev_pkt[channel_id].timestamp;
- prev_pkt[channel_id].timestamp = timestamp;
+ prev_pkt[channel_id].size = size;
 prev_pkt[channel_id].extra = extra;
- while (data_size > 0) {
- int toread = FFMIN(data_size, chunk_size);
- if (ffurl_read_complete(h, p->data + offset, toread) != toread) {
- ff_rtmp_packet_destroy(p);
+ size = size - p->offset;
+
+ toread = FFMIN(size, chunk_size);
+ if (ffurl_read_complete(h, p->data + p->offset, toread) != toread) {
+ ff_rtmp_packet_destroy(p);
+ return AVERROR(EIO);
+ }
+ size -= toread;
+ p->read += toread;
+ p->offset += toread;
+
+ if (size > 0) {
+ RTMPPacket *prev = &prev_pkt[channel_id];
+ prev->data = p->data;
+ prev->read = p->read;
+ prev->offset = p->offset;
+ return AVERROR(EAGAIN);
+ }
+
+ prev_pkt[channel_id].read = 0; // read complete; reset if needed
+ return p->read;
+}
+
+int ff_rtmp_packet_read_internal(URLContext *h, RTMPPacket *p, int chunk_size,
+ RTMPPacket **prev_pkt, int *nb_prev_pkt,
+ uint8_t hdr)
+{
+ while (1) {
+ int ret = rtmp_packet_read_one_chunk(h, p, chunk_size, prev_pkt,
+ nb_prev_pkt, hdr);
+ if (ret > 0 || ret != AVERROR(EAGAIN))
+ return ret;
+
+ if (ffurl_read(h, &hdr, 1) != 1)
 return AVERROR(EIO);
- }
- data_size -= chunk_size;
- offset += chunk_size;
- size += chunk_size;
- if (data_size > 0) {
- if ((ret = ffurl_read_complete(h, &t, 1)) < 0) { // marker
- ff_rtmp_packet_destroy(p);
- return ret;
- }
- size++;
- if (t != (0xC0 + channel_id))
- return -1;
- }
 }
- return size;
 }
 
 int ff_rtmp_packet_write(URLContext *h, RTMPPacket *pkt,
- int chunk_size, RTMPPacket *prev_pkt)
+ int chunk_size, RTMPPacket **prev_pkt_ptr,
+ int *nb_prev_pkt)
 {
 uint8_t pkt_hdr[16], *p = pkt_hdr;
 int mode = RTMP_PS_TWELVEBYTES;
 int off = 0;
- int size = 0;
+ int written = 0;
 int ret;
+ RTMPPacket *prev_pkt;
+
+ if ((ret = ff_rtmp_check_alloc_array(prev_pkt_ptr, nb_prev_pkt,
+ pkt->channel_id)) < 0)
+ return ret;
+ prev_pkt = *prev_pkt_ptr;
 
 pkt->ts_delta = pkt->timestamp - prev_pkt[pkt->channel_id].timestamp;
 
 //if channel_id = 0, this is first presentation of prev_pkt, send full hdr.
 if (prev_pkt[pkt->channel_id].channel_id &&
- pkt->extra == prev_pkt[pkt->channel_id].extra) {
+ pkt->extra == prev_pkt[pkt->channel_id].extra &&
+ pkt->timestamp >= prev_pkt[pkt->channel_id].timestamp) {
 if (pkt->type == prev_pkt[pkt->channel_id].type &&
- pkt->data_size == prev_pkt[pkt->channel_id].data_size) {
+ pkt->size == prev_pkt[pkt->channel_id].size) {
 mode = RTMP_PS_FOURBYTES;
 if (pkt->ts_delta == prev_pkt[pkt->channel_id].ts_delta)
 mode = RTMP_PS_ONEBYTE;
@@ -270,7 +340,7 @@
 timestamp = pkt->ts_delta;
 bytestream_put_be24(&p, timestamp >= 0xFFFFFF ? 0xFFFFFF : timestamp);
 if (mode != RTMP_PS_FOURBYTES) {
- bytestream_put_be24(&p, pkt->data_size);
+ bytestream_put_be24(&p, pkt->size);
 bytestream_put_byte(&p, pkt->type);
 if (mode == RTMP_PS_TWELVEBYTES)
 bytestream_put_le32(&p, pkt->extra);
@@ -281,7 +351,7 @@
 // save history
 prev_pkt[pkt->channel_id].channel_id = pkt->channel_id;
 prev_pkt[pkt->channel_id].type = pkt->type;
- prev_pkt[pkt->channel_id].data_size = pkt->data_size;
+ prev_pkt[pkt->channel_id].size = pkt->size;
 prev_pkt[pkt->channel_id].timestamp = pkt->timestamp;
 if (mode != RTMP_PS_TWELVEBYTES) {
 prev_pkt[pkt->channel_id].ts_delta = pkt->ts_delta;
@@ -292,20 +362,20 @@
 
 if ((ret = ffurl_write(h, pkt_hdr, p - pkt_hdr)) < 0)
 return ret;
- size = p - pkt_hdr + pkt->data_size;
- while (off < pkt->data_size) {
- int towrite = FFMIN(chunk_size, pkt->data_size - off);
+ written = p - pkt_hdr + pkt->size;
+ while (off < pkt->size) {
+ int towrite = FFMIN(chunk_size, pkt->size - off);
 if ((ret = ffurl_write(h, pkt->data + off, towrite)) < 0)
 return ret;
 off += towrite;
- if (off < pkt->data_size) {
+ if (off < pkt->size) {
 uint8_t marker = 0xC0 | pkt->channel_id;
 if ((ret = ffurl_write(h, &marker, 1)) < 0)
 return ret;
- size++;
+ written++;
 }
 }
- return size;
+ return written;
 }
 
 int ff_rtmp_packet_create(RTMPPacket *pkt, int channel_id, RTMPPacketType type,
@@ -316,7 +386,7 @@
 if (!pkt->data)
 return AVERROR(ENOMEM);
 }
- pkt->data_size = size;
+ pkt->size = size;
 pkt->channel_id = channel_id;
 pkt->type = type;
 pkt->timestamp = timestamp;
@@ -331,36 +401,43 @@
 if (!pkt)
 return;
 av_freep(&pkt->data);
- pkt->data_size = 0;
+ pkt->size = 0;
 }
 
 int ff_amf_tag_size(const uint8_t *data, const uint8_t *data_end)
 {
 const uint8_t *base = data;
+ AMFDataType type;
+ unsigned nb = -1;
+ int parse_key = 1;
 
 if (data >= data_end)
 return -1;
- switch (*data++) {
+ switch ((type = *data++)) {
 case AMF_DATA_TYPE_NUMBER: return 9;
 case AMF_DATA_TYPE_BOOL: return 2;
 case AMF_DATA_TYPE_STRING: return 3 + AV_RB16(data);
 case AMF_DATA_TYPE_LONG_STRING: return 5 + AV_RB32(data);
 case AMF_DATA_TYPE_NULL: return 1;
 case AMF_DATA_TYPE_ARRAY:
- data += 4;
+ parse_key = 0;
+ case AMF_DATA_TYPE_MIXEDARRAY:
+ nb = bytestream_get_be32(&data);
 case AMF_DATA_TYPE_OBJECT:
- for (;;) {
- int size = bytestream_get_be16(&data);
+ while (nb-- > 0 || type != AMF_DATA_TYPE_ARRAY) {
 int t;
- if (!size) {
- data++;
- break;
+ if (parse_key) {
+ int size = bytestream_get_be16(&data);
+ if (!size) {
+ data++;
+ break;
+ }
+ if (size < 0 || size >= data_end - data)
+ return -1;
+ data += size;
 }
- if (data + size >= data_end || data + size < data)
- return -1;
- data += size;
 t = ff_amf_tag_size(data, data_end);
- if (t < 0 || data + t >= data_end)
+ if (t < 0 || t >= data_end - data)
 return -1;
 data += t;
 }
@@ -389,7 +466,7 @@
 int size = bytestream_get_be16(&data);
 if (!size)
 break;
- if (data + size >= data_end || data + size < data)
+ if (size < 0 || size >= data_end - data)
 return -1;
 data += size;
 if (size == namelen && !memcmp(data-size, name, namelen)) {
@@ -410,7 +487,7 @@
 return 0;
 }
 len = ff_amf_tag_size(data, data_end);
- if (len < 0 || data + len >= data_end || data + len < data)
+ if (len < 0 || len >= data_end - data)
 return -1;
 data += len;
 }
@@ -438,14 +515,17 @@
 }
 }
 
-static void ff_amf_tag_contents(void *ctx, const uint8_t *data, const uint8_t *data_end)
+static void amf_tag_contents(void *ctx, const uint8_t *data,
+ const uint8_t *data_end)
 {
- int size;
+ unsigned int size, nb = -1;
 char buf[1024];
+ AMFDataType type;
+ int parse_key = 1;
 
 if (data >= data_end)
 return;
- switch (*data++) {
+ switch ((type = *data++)) {
 case AMF_DATA_TYPE_NUMBER:
 av_log(ctx, AV_LOG_DEBUG, " number %g\n", av_int2double(AV_RB64(data)));
 return;
@@ -454,12 +534,12 @@
 return;
 case AMF_DATA_TYPE_STRING:
 case AMF_DATA_TYPE_LONG_STRING:
- if (data[-1] == AMF_DATA_TYPE_STRING) {
+ if (type == AMF_DATA_TYPE_STRING) {
 size = bytestream_get_be16(&data);
 } else {
 size = bytestream_get_be32(&data);
 }
- size = FFMIN(size, 1023);
+ size = FFMIN(size, sizeof(buf) - 1);
 memcpy(buf, data, size);
 buf[size] = 0;
 av_log(ctx, AV_LOG_DEBUG, " string '%s'\n", buf);
@@ -468,26 +548,31 @@
 av_log(ctx, AV_LOG_DEBUG, " NULL\n");
 return;
 case AMF_DATA_TYPE_ARRAY:
- data += 4;
+ parse_key = 0;
+ case AMF_DATA_TYPE_MIXEDARRAY:
+ nb = bytestream_get_be32(&data);
 case AMF_DATA_TYPE_OBJECT:
 av_log(ctx, AV_LOG_DEBUG, " {\n");
- for (;;) {
- int size = bytestream_get_be16(&data);
+ while (nb-- > 0 || type != AMF_DATA_TYPE_ARRAY) {
 int t;
- memcpy(buf, data, size);
- buf[size] = 0;
- if (!size) {
- av_log(ctx, AV_LOG_DEBUG, " }\n");
- data++;
- break;
+ if (parse_key) {
+ size = bytestream_get_be16(&data);
+ size = FFMIN(size, sizeof(buf) - 1);
+ if (!size) {
+ av_log(ctx, AV_LOG_DEBUG, " }\n");
+ data++;
+ break;
+ }
+ memcpy(buf, data, size);
+ buf[size] = 0;
+ if (size >= data_end - data)
+ return;
+ data += size;
+ av_log(ctx, AV_LOG_DEBUG, " %s: ", buf);
 }
- if (data + size >= data_end || data + size < data)
- return;
- data += size;
- av_log(ctx, AV_LOG_DEBUG, " %s: ", buf);
- ff_amf_tag_contents(ctx, data, data_end);
+ amf_tag_contents(ctx, data, data_end);
 t = ff_amf_tag_size(data, data_end);
- if (t < 0 || data + t >= data_end)
+ if (t < 0 || t >= data_end - data)
 return;
 data += t;
 }
@@ -503,12 +588,12 @@
 void ff_rtmp_packet_dump(void *ctx, RTMPPacket *p)
 {
 av_log(ctx, AV_LOG_DEBUG, "RTMP packet type '%s'(%d) for channel %d, timestamp %d, extra field %d size %d\n",
- rtmp_packet_type(p->type), p->type, p->channel_id, p->timestamp, p->extra, p->data_size);
+ rtmp_packet_type(p->type), p->type, p->channel_id, p->timestamp, p->extra, p->size);
 if (p->type == RTMP_PT_INVOKE || p->type == RTMP_PT_NOTIFY) {
- uint8_t *src = p->data, *src_end = p->data + p->data_size;
+ uint8_t *src = p->data, *src_end = p->data + p->size;
 while (src < src_end) {
 int sz;
- ff_amf_tag_contents(ctx, src, src_end);
+ amf_tag_contents(ctx, src, src_end);
 sz = ff_amf_tag_size(src, src_end);
 if (sz < 0)
 break;
@@ -520,8 +605,41 @@
 av_log(ctx, AV_LOG_DEBUG, "Client BW = %d\n", AV_RB32(p->data));
 } else if (p->type != RTMP_PT_AUDIO && p->type != RTMP_PT_VIDEO && p->type != RTMP_PT_METADATA) {
 int i;
- for (i = 0; i < p->data_size; i++)
+ for (i = 0; i < p->size; i++)
 av_log(ctx, AV_LOG_DEBUG, " %02X", p->data[i]);
 av_log(ctx, AV_LOG_DEBUG, "\n");
 }
 }
+
+int ff_amf_match_string(const uint8_t *data, int size, const char *str)
+{
+ int len = strlen(str);
+ int amf_len, type;
+
+ if (size < 1)
+ return 0;
+
+ type = *data++;
+
+ if (type != AMF_DATA_TYPE_LONG_STRING &&
+ type != AMF_DATA_TYPE_STRING)
+ return 0;
+
+ if (type == AMF_DATA_TYPE_LONG_STRING) {
+ if ((size -= 4 + 1) < 0)
+ return 0;
+ amf_len = bytestream_get_be32(&data);
+ } else {
+ if ((size -= 2 + 1) < 0)
+ return 0;
+ amf_len = bytestream_get_be16(&data);
+ }
+
+ if (amf_len > size)
+ return 0;
+
+ if (amf_len != len)
+ return 0;
+
+ return !memcmp(data, str, len);
+}

libav-v9.6.tar.bz2/libavformat/rtmppkt.h -> libav-v10.1.tar.bz2/libavformat/rtmppkt.h Changed

@@ -1,6 +1,6 @@
 /*
 * RTMP packet utilities
- * Copyright (c) 2009 Kostya Shishkov
+ * Copyright (c) 2009 Konstantin Shishkov
 *
 * This file is part of Libav.
 *
@@ -36,9 +36,9 @@
 enum RTMPChannel {
 RTMP_NETWORK_CHANNEL = 2, ///< channel for network-related messages (bandwidth report, ping, etc)
 RTMP_SYSTEM_CHANNEL, ///< channel for sending server control messages
- RTMP_SOURCE_CHANNEL, ///< channel for sending a/v to server
- RTMP_VIDEO_CHANNEL = 8, ///< channel for video data
 RTMP_AUDIO_CHANNEL, ///< channel for audio data
+ RTMP_VIDEO_CHANNEL = 6, ///< channel for video data
+ RTMP_SOURCE_CHANNEL = 8, ///< channel for a/v invokes
 };
 
 /**
@@ -81,7 +81,9 @@
 uint32_t ts_delta; ///< timestamp increment to the previous one in milliseconds (latter only for media packets)
 uint32_t extra; ///< probably an additional channel ID used during streaming data
 uint8_t *data; ///< packet payload
- int data_size; ///< packet payload size
+ int size; ///< packet payload size
+ int offset; ///< amount of data read so far
+ int read; ///< amount read, including headers
 } RTMPPacket;
 
 /**
@@ -112,10 +114,12 @@
 * @param chunk_size current chunk size
 * @param prev_pkt previously read packet headers for all channels
 * (may be needed for restoring incomplete packet header)
+ * @param nb_prev_pkt number of allocated elements in prev_pkt
 * @return number of bytes read on success, negative value otherwise
 */
 int ff_rtmp_packet_read(URLContext *h, RTMPPacket *p,
- int chunk_size, RTMPPacket *prev_pkt);
+ int chunk_size, RTMPPacket **prev_pkt,
+ int *nb_prev_pkt);
 /**
 * Read internal RTMP packet sent by the server.
 *
@@ -124,11 +128,13 @@
 * @param chunk_size current chunk size
 * @param prev_pkt previously read packet headers for all channels
 * (may be needed for restoring incomplete packet header)
+ * @param nb_prev_pkt number of allocated elements in prev_pkt
 * @param c the first byte already read
 * @return number of bytes read on success, negative value otherwise
 */
 int ff_rtmp_packet_read_internal(URLContext *h, RTMPPacket *p, int chunk_size,
- RTMPPacket *prev_pkt, uint8_t c);
+ RTMPPacket **prev_pkt, int *nb_prev_pkt,
+ uint8_t c);
 
 /**
 * Send RTMP packet to the server.
@@ -138,10 +144,12 @@
 * @param chunk_size current chunk size
 * @param prev_pkt previously sent packet headers for all channels
 * (may be used for packet header compressing)
+ * @param nb_prev_pkt number of allocated elements in prev_pkt
 * @return number of bytes written on success, negative value otherwise
 */
 int ff_rtmp_packet_write(URLContext *h, RTMPPacket *p,
- int chunk_size, RTMPPacket *prev_pkt);
+ int chunk_size, RTMPPacket **prev_pkt,
+ int *nb_prev_pkt);
 
 /**
 * Print information and contents of RTMP packet.
@@ -152,6 +160,16 @@
 void ff_rtmp_packet_dump(void *ctx, RTMPPacket *p);
 
 /**
+ * Enlarge the prev_pkt array to fit the given channel
+ *
+ * @param prev_pkt array with previously sent packet headers
+ * @param nb_prev_pkt number of allocated elements in prev_pkt
+ * @param channel the channel number that needs to be allocated
+ */
+int ff_rtmp_check_alloc_array(RTMPPacket **prev_pkt, int *nb_prev_pkt,
+ int channel);
+
+/**
 * @name Functions used to work with the AMF format (which is also used in .flv)
 * @see amf_* funcs in libavformat/flvdec.c
 * @{
@@ -282,6 +300,13 @@
 */
 int ff_amf_read_null(GetByteContext *gbc);
 
+/**
+ * Match AMF string with a NULL-terminated string.
+ *
+ * @return 0 if the strings do not match.
+ */
+
+int ff_amf_match_string(const uint8_t *data, int size, const char *str);
 
 /** @} */ // AMF funcs

libav-v9.6.tar.bz2/libavformat/rtmpproto.c -> libav-v10.1.tar.bz2/libavformat/rtmpproto.c Changed

@@ -1,6 +1,6 @@
 /*
 * RTMP network protocol
- * Copyright (c) 2009 Kostya Shishkov
+ * Copyright (c) 2009 Konstantin Shishkov
 *
 * This file is part of Libav.
 *
@@ -48,13 +48,12 @@
 #include <zlib.h>
 #endif
 
-//#define DEBUG
-
 #define APP_MAX_LENGTH 128
 #define PLAYPATH_MAX_LENGTH 256
 #define TCURL_MAX_LENGTH 512
 #define FLASHVER_MAX_LENGTH 64
 #define RTMP_PKTDATA_DEFAULT_SIZE 4096
+#define RTMP_HEADER 11
 
 /** RTMP protocol handler state */
 typedef enum {
@@ -62,8 +61,10 @@
 STATE_HANDSHAKED, ///< client has performed handshake
 STATE_FCPUBLISH, ///< client FCPublishing stream (for output)
 STATE_PLAYING, ///< client has started receiving multimedia data from server
+ STATE_SEEKING, ///< client has started the seek operation. Back on STATE_PLAYING when the time comes
 STATE_PUBLISHING, ///< client has started sending multimedia data to server (for output)
 STATE_RECEIVING, ///< received a publish command (for input)
+ STATE_SENDING, ///< received a play command (for output)
 STATE_STOPPED, ///< the broadcast has been stopped
 } ClientState;
 
@@ -76,7 +77,8 @@
 typedef struct RTMPContext {
 const AVClass *class;
 URLContext* stream; ///< TCP stream used in interactions with RTMP server
- RTMPPacket prev_pkt[2][RTMP_CHANNELS]; ///< packet history used when reading and sending packets
+ RTMPPacket *prev_pkt[2]; ///< packet history used when reading and sending packets ([0] for reading, [1] for writing)
+ int nb_prev_pkt[2]; ///< number of elements in prev_pkt
 int in_chunk_size; ///< size of the chunks incoming RTMP packets are divided into
 int out_chunk_size; ///< size of the chunks outgoing RTMP packets are divided into
 int is_input; ///< input/output flag
@@ -85,7 +87,7 @@
 char *app; ///< name of application
 char *conn; ///< append arbitrary AMF data to the Connect message
 ClientState state; ///< current state
- int main_channel_id; ///< an additional channel ID which is used for some invocations
+ int stream_id; ///< ID assigned by the server for the stream
 uint8_t* flv_data; ///< buffer with data for demuxer
 int flv_size; ///< current buffer size
 int flv_off; ///< number of bytes read from current buffer
@@ -95,7 +97,7 @@
 uint32_t bytes_read; ///< number of bytes read from server
 uint32_t last_bytes_read; ///< number of bytes read last reported to server
 int skip_bytes; ///< number of bytes to skip from the input FLV stream in the next write call
- uint8_t flv_header[11]; ///< partial incoming flv packet header
+ uint8_t flv_header[RTMP_HEADER]; ///< partial incoming flv packet header
 int flv_header_bytes; ///< number of initialized bytes in flv_header
 int nb_invokes; ///< keeps track of invoke messages
 char* tcurl; ///< url of the target stream
@@ -150,15 +152,16 @@
 
 static int add_tracked_method(RTMPContext *rt, const char *name, int id)
 {
- void *ptr;
+ int err;
 
 if (rt->nb_tracked_methods + 1 > rt->tracked_methods_size) {
 rt->tracked_methods_size = (rt->nb_tracked_methods + 1) * 2;
- ptr = av_realloc(rt->tracked_methods,
- rt->tracked_methods_size * sizeof(*rt->tracked_methods));
- if (!ptr)
- return AVERROR(ENOMEM);
- rt->tracked_methods = ptr;
+ if ((err = av_reallocp(&rt->tracked_methods, rt->tracked_methods_size *
+ sizeof(*rt->tracked_methods))) < 0) {
+ rt->nb_tracked_methods = 0;
+ rt->tracked_methods_size = 0;
+ return err;
+ }
 }
 
 rt->tracked_methods[rt->nb_tracked_methods].name = av_strdup(name);
@@ -186,7 +189,7 @@
 int ret;
 int i;
 
- bytestream2_init(&gbc, pkt->data + offset, pkt->data_size - offset);
+ bytestream2_init(&gbc, pkt->data + offset, pkt->size - offset);
 if ((ret = ff_amf_read_number(&gbc, &pkt_id)) < 0)
 return ret;
 
@@ -224,7 +227,7 @@
 double pkt_id;
 int len;
 
- bytestream2_init(&gbc, pkt->data, pkt->data_size);
+ bytestream2_init(&gbc, pkt->data, pkt->size);
 if ((ret = ff_amf_read_string(&gbc, name, sizeof(name), &len)) < 0)
 goto fail;
 
@@ -236,7 +239,7 @@
 }
 
 ret = ff_rtmp_packet_write(rt->stream, pkt, rt->out_chunk_size,
- rt->prev_pkt[1]);
+ &rt->prev_pkt[1], &rt->nb_prev_pkt[1]);
 fail:
 ff_rtmp_packet_destroy(pkt);
 return ret;
@@ -388,7 +391,7 @@
 }
 }
 
- pkt.data_size = p - pkt.data;
+ pkt.size = p - pkt.data;
 
 return rtmp_send_packet(rt, &pkt, 1);
 }
@@ -406,10 +409,10 @@
 GetByteContext gbc;
 
 if ((ret = ff_rtmp_packet_read(rt->stream, &pkt, rt->in_chunk_size,
- rt->prev_pkt[1])) < 0)
+ &rt->prev_pkt[0], &rt->nb_prev_pkt[0])) < 0)
 return ret;
 cp = pkt.data;
- bytestream2_init(&gbc, cp, pkt.data_size);
+ bytestream2_init(&gbc, cp, pkt.size);
 if (ff_amf_read_string(&gbc, command, sizeof(command), &stringlen)) {
 av_log(s, AV_LOG_ERROR, "Unable to read command string\n");
 ff_rtmp_packet_destroy(&pkt);
@@ -440,9 +443,9 @@
 return ret;
 p = pkt.data;
 bytestream_put_be32(&p, rt->server_bw);
- pkt.data_size = p - pkt.data;
+ pkt.size = p - pkt.data;
 ret = ff_rtmp_packet_write(rt->stream, &pkt, rt->out_chunk_size,
- rt->prev_pkt[1]);
+ &rt->prev_pkt[1], &rt->nb_prev_pkt[1]);
 ff_rtmp_packet_destroy(&pkt);
 if (ret < 0)
 return ret;
@@ -453,9 +456,9 @@
 p = pkt.data;
 bytestream_put_be32(&p, rt->server_bw);
 bytestream_put_byte(&p, 2); // dynamic
- pkt.data_size = p - pkt.data;
+ pkt.size = p - pkt.data;
 ret = ff_rtmp_packet_write(rt->stream, &pkt, rt->out_chunk_size,
- rt->prev_pkt[1]);
+ &rt->prev_pkt[1], &rt->nb_prev_pkt[1]);
 ff_rtmp_packet_destroy(&pkt);
 if (ret < 0)
 return ret;
@@ -469,7 +472,7 @@
 bytestream_put_be16(&p, 0); // 0 -> Stream Begin
 bytestream_put_be32(&p, 0);
 ret = ff_rtmp_packet_write(rt->stream, &pkt, rt->out_chunk_size,
- rt->prev_pkt[1]);
+ &rt->prev_pkt[1], &rt->nb_prev_pkt[1]);
 ff_rtmp_packet_destroy(&pkt);
 if (ret < 0)
 return ret;
@@ -482,7 +485,7 @@
 p = pkt.data;
 bytestream_put_be32(&p, rt->out_chunk_size);
 ret = ff_rtmp_packet_write(rt->stream, &pkt, rt->out_chunk_size,
- rt->prev_pkt[1]);
+ &rt->prev_pkt[1], &rt->nb_prev_pkt[1]);
 ff_rtmp_packet_destroy(&pkt);
 if (ret < 0)
 return ret;
@@ -515,9 +518,9 @@
 ff_amf_write_number(&p, 0);
 ff_amf_write_object_end(&p);
 
- pkt.data_size = p - pkt.data;
+ pkt.size = p - pkt.data;
 ret = ff_rtmp_packet_write(rt->stream, &pkt, rt->out_chunk_size,
- rt->prev_pkt[1]);
+ &rt->prev_pkt[1], &rt->nb_prev_pkt[1]);
 ff_rtmp_packet_destroy(&pkt);
 if (ret < 0)
 return ret;
@@ -530,9 +533,9 @@
 ff_amf_write_number(&p, 0);
 ff_amf_write_null(&p);
 ff_amf_write_number(&p, 8192);
- pkt.data_size = p - pkt.data;
+ pkt.size = p - pkt.data;
 ret = ff_rtmp_packet_write(rt->stream, &pkt, rt->out_chunk_size,
- rt->prev_pkt[1]);
+ &rt->prev_pkt[1], &rt->nb_prev_pkt[1]);
 ff_rtmp_packet_destroy(&pkt);
 
 return ret;
@@ -655,7 +658,7 @@
 ff_amf_write_string(&p, "deleteStream");
 ff_amf_write_number(&p, ++rt->nb_invokes);
 ff_amf_write_null(&p);
- ff_amf_write_number(&p, rt->main_channel_id);
+ ff_amf_write_number(&p, rt->stream_id);
 
 return rtmp_send_packet(rt, &pkt, 0);
 }
@@ -675,7 +678,7 @@
 
 p = pkt.data;
 bytestream_put_be16(&p, 3);
- bytestream_put_be32(&p, rt->main_channel_id);
+ bytestream_put_be32(&p, rt->stream_id);
 bytestream_put_be32(&p, rt->client_buffer_time);
 
 return rtmp_send_packet(rt, &pkt, 0);
@@ -693,18 +696,41 @@
 
 av_log(s, AV_LOG_DEBUG, "Sending play command for '%s'\n", rt->playpath);
 
- if ((ret = ff_rtmp_packet_create(&pkt, RTMP_VIDEO_CHANNEL, RTMP_PT_INVOKE,
+ if ((ret = ff_rtmp_packet_create(&pkt, RTMP_SOURCE_CHANNEL, RTMP_PT_INVOKE,
 0, 29 + strlen(rt->playpath))) < 0)
 return ret;
 
- pkt.extra = rt->main_channel_id;
+ pkt.extra = rt->stream_id;
 
 p = pkt.data;
 ff_amf_write_string(&p, "play");
 ff_amf_write_number(&p, ++rt->nb_invokes);
 ff_amf_write_null(&p);
 ff_amf_write_string(&p, rt->playpath);
- ff_amf_write_number(&p, rt->live);
+ ff_amf_write_number(&p, rt->live * 1000);
+
+ return rtmp_send_packet(rt, &pkt, 1);
+}
+
+static int gen_seek(URLContext *s, RTMPContext *rt, int64_t timestamp)
+{
+ RTMPPacket pkt;
+ uint8_t *p;
+ int ret;
+
+ av_log(s, AV_LOG_DEBUG, "Sending seek command for timestamp %"PRId64"\n",
+ timestamp);
+
+ if ((ret = ff_rtmp_packet_create(&pkt, 3, RTMP_PT_INVOKE, 0, 26)) < 0)
+ return ret;
+
+ pkt.extra = rt->stream_id;
+
+ p = pkt.data;
+ ff_amf_write_string(&p, "seek");
+ ff_amf_write_number(&p, 0); //no tracking back responses
+ ff_amf_write_null(&p); //as usual, the first null param
+ ff_amf_write_number(&p, timestamp); //where we want to jump
 
 return rtmp_send_packet(rt, &pkt, 1);
 }
@@ -724,7 +750,7 @@
 0, 30 + strlen(rt->playpath))) < 0)
 return ret;
 
- pkt.extra = rt->main_channel_id;
+ pkt.extra = rt->stream_id;
 
 p = pkt.data;
 ff_amf_write_string(&p, "publish");
@@ -745,9 +771,9 @@
 uint8_t *p;
 int ret;
 
- if (ppkt->data_size < 6) {
+ if (ppkt->size < 6) {
 av_log(s, AV_LOG_ERROR, "Too short ping packet (%d)\n",
- ppkt->data_size);
+ ppkt->size);
 return AVERROR_INVALIDDATA;
 }
 
@@ -1145,7 +1171,7 @@
 for (i = 9; i <= RTMP_HANDSHAKE_PACKET_SIZE; i++)
 tosend[i] = av_lfg_get(&rnd) >> 24;
 
- if (rt->encrypted && CONFIG_FFRTMPCRYPT_PROTOCOL) {
+ if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) {
 /* When the client wants to use RTMPE, we have to change the command
 * byte to 0x06 which means to use encrypted data and we have to set
 * the flash version to at least 9.0.115.0. */
@@ -1223,7 +1249,7 @@
 if (ret < 0)
 return ret;
 
- if (rt->encrypted && CONFIG_FFRTMPCRYPT_PROTOCOL) {
+ if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) {
 /* Compute the shared secret key sent by the server and initialize
 * the RC4 encryption. */
 if ((ret = ff_rtmpe_compute_secret_key(rt->stream, serverdata + 1,
@@ -1253,7 +1279,7 @@
 if (ret < 0)
 return ret;
 
- if (rt->encrypted && CONFIG_FFRTMPCRYPT_PROTOCOL) {
+ if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) {
 /* Encrypt the signature to be send to the server. */
 ff_rtmpe_encrypt_sig(rt->stream, tosend +
 RTMP_HANDSHAKE_PACKET_SIZE - 32, digest,
@@ -1265,13 +1291,13 @@
 RTMP_HANDSHAKE_PACKET_SIZE)) < 0)
 return ret;
 
- if (rt->encrypted && CONFIG_FFRTMPCRYPT_PROTOCOL) {
+ if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) {
 /* Set RC4 keys for encryption and update the keystreams. */
 if ((ret = ff_rtmpe_update_keystream(rt->stream)) < 0)
 return ret;
 }
 } else {
- if (rt->encrypted && CONFIG_FFRTMPCRYPT_PROTOCOL) {
+ if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) {
 /* Compute the shared secret key sent by the server and initialize
 * the RC4 encryption. */
 if ((ret = ff_rtmpe_compute_secret_key(rt->stream, serverdata + 1,
@@ -1289,7 +1315,7 @@
 RTMP_HANDSHAKE_PACKET_SIZE)) < 0)
 return ret;
 
- if (rt->encrypted && CONFIG_FFRTMPCRYPT_PROTOCOL) {
+ if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) {
 /* Set RC4 keys for encryption and update the keystreams. */
 if ((ret = ff_rtmpe_update_keystream(rt->stream)) < 0)
 return ret;
@@ -1326,7 +1352,7 @@
 int inoutsize;
 
 AV_WB32(arraydata, first_int);
- AV_WB32(arraydata + 4, first_int);
+ AV_WB32(arraydata + 4, second_int);
 inoutsize = ffurl_write(rt->stream, arraydata,
 RTMP_HANDSHAKE_PACKET_SIZE);
 if (inoutsize != RTMP_HANDSHAKE_PACKET_SIZE) {
@@ -1375,8 +1401,6 @@
 av_log(s, AV_LOG_ERROR, "RTMP Handshake C1 Error\n");
 return ret;
 }
- if (zeroes)
- av_log(s, AV_LOG_WARNING, "Erroneous C1 Message zero != 0\n");
 /* Send S1 */
 /* By now same epoch will be sent */
 hs_my_epoch = hs_epoch;
@@ -1421,10 +1445,10 @@
 RTMPContext *rt = s->priv_data;
 int ret;
 
- if (pkt->data_size < 4) {
+ if (pkt->size < 4) {
 av_log(s, AV_LOG_ERROR,
 "Too short chunk size change packet (%d)\n",
- pkt->data_size);
+ pkt->size);
 return AVERROR_INVALIDDATA;
 }
 
@@ -1432,7 +1456,7 @@
 /* Send the same chunk size change packet back to the server,
 * setting the outgoing chunk size to the same as the incoming one. */
 if ((ret = ff_rtmp_packet_write(rt->stream, pkt, rt->out_chunk_size,
- rt->prev_pkt[1])) < 0)
+ &rt->prev_pkt[1], &rt->nb_prev_pkt[1])) < 0)
 return ret;
 rt->out_chunk_size = AV_RB32(pkt->data);
 }
@@ -1454,9 +1478,9 @@
 RTMPContext *rt = s->priv_data;
 int t, ret;
 
- if (pkt->data_size < 2) {
+ if (pkt->size < 2) {
 av_log(s, AV_LOG_ERROR, "Too short ping packet (%d)\n",
- pkt->data_size);
+ pkt->size);
 return AVERROR_INVALIDDATA;
 }
 
@@ -1480,10 +1504,10 @@
 {
 RTMPContext *rt = s->priv_data;
 
- if (pkt->data_size < 4) {
+ if (pkt->size < 4) {
 av_log(s, AV_LOG_ERROR,
 "Client bandwidth report packet is less than 4 bytes long (%d)\n",
- pkt->data_size);
+ pkt->size);
 return AVERROR_INVALIDDATA;
 }
 
@@ -1504,10 +1528,10 @@
 {
 RTMPContext *rt = s->priv_data;
 
- if (pkt->data_size < 4) {
+ if (pkt->size < 4) {
 av_log(s, AV_LOG_ERROR,
 "Too short server bandwidth report packet (%d)\n",
- pkt->data_size);
+ pkt->size);
 return AVERROR_INVALIDDATA;
 }
 
@@ -1590,6 +1614,8 @@
 av_md5_update(md5, method, strlen(method));
 av_md5_update(md5, ":/", 2);
 av_md5_update(md5, rt->app, strlen(rt->app));
+ if (!strchr(rt->app, '/'))
+ av_md5_update(md5, "/_definst_", strlen("/_definst_"));
 av_md5_final(md5, hash);
 ff_data_to_hex(hashstr2, hash, 16, 1);
 hashstr2[32] = '\0';
@@ -1693,7 +1719,7 @@
 }
 
 if (!strcmp(authmod, "adobe")) {
- if ((ret = do_adobe_auth(rt, user, salt, challenge, opaque)) < 0)
+ if ((ret = do_adobe_auth(rt, user, salt, opaque, challenge)) < 0)
 return ret;
 } else {
 if ((ret = do_llnw_auth(rt, user, nonce)) < 0)
@@ -1707,7 +1733,7 @@
 static int handle_invoke_error(URLContext *s, RTMPPacket *pkt)
 {
 RTMPContext *rt = s->priv_data;
- const uint8_t *data_end = pkt->data + pkt->data_size;
+ const uint8_t *data_end = pkt->data + pkt->size;
 char *tracked_method = NULL;
 int level = AV_LOG_ERROR;
 uint8_t tmpstr[256];
@@ -1740,13 +1766,84 @@
 return ret;
 }
 
+static int write_begin(URLContext *s)
+{
+ RTMPContext *rt = s->priv_data;
+ PutByteContext pbc;
+ RTMPPacket spkt = { 0 };
+ int ret;
+
+ // Send Stream Begin 1
+ if ((ret = ff_rtmp_packet_create(&spkt, RTMP_NETWORK_CHANNEL,
+ RTMP_PT_PING, 0, 6)) < 0) {
+ av_log(s, AV_LOG_ERROR, "Unable to create response packet\n");
+ return ret;
+ }
+
+ bytestream2_init_writer(&pbc, spkt.data, spkt.size);
+ bytestream2_put_be16(&pbc, 0); // 0 -> Stream Begin
+ bytestream2_put_be32(&pbc, rt->nb_streamid);
+
+ ret = ff_rtmp_packet_write(rt->stream, &spkt, rt->out_chunk_size,
+ &rt->prev_pkt[1], &rt->nb_prev_pkt[1]);
+
+ ff_rtmp_packet_destroy(&spkt);
+
+ return ret;
+}
+
+static int write_status(URLContext *s, RTMPPacket *pkt,
+ const char *status, const char *filename)
+{
+ RTMPContext *rt = s->priv_data;
+ RTMPPacket spkt = { 0 };
+ char statusmsg[128];
+ uint8_t *pp;
+ int ret;
+
+ if ((ret = ff_rtmp_packet_create(&spkt, RTMP_SYSTEM_CHANNEL,
+ RTMP_PT_INVOKE, 0,
+ RTMP_PKTDATA_DEFAULT_SIZE)) < 0) {
+ av_log(s, AV_LOG_ERROR, "Unable to create response packet\n");
+ return ret;
+ }
+
+ pp = spkt.data;
+ spkt.extra = pkt->extra;
+ ff_amf_write_string(&pp, "onStatus");
+ ff_amf_write_number(&pp, 0);
+ ff_amf_write_null(&pp);
+
+ ff_amf_write_object_start(&pp);
+ ff_amf_write_field_name(&pp, "level");
+ ff_amf_write_string(&pp, "status");
+ ff_amf_write_field_name(&pp, "code");
+ ff_amf_write_string(&pp, status);
+ ff_amf_write_field_name(&pp, "description");
+ snprintf(statusmsg, sizeof(statusmsg),
+ "%s is now published", filename);
+ ff_amf_write_string(&pp, statusmsg);
+ ff_amf_write_field_name(&pp, "details");
+ ff_amf_write_string(&pp, filename);
+ ff_amf_write_field_name(&pp, "clientid");
+ snprintf(statusmsg, sizeof(statusmsg), "%s", LIBAVFORMAT_IDENT);
+ ff_amf_write_string(&pp, statusmsg);
+ ff_amf_write_object_end(&pp);
+
+ spkt.size = pp - spkt.data;
+ ret = ff_rtmp_packet_write(rt->stream, &spkt, rt->out_chunk_size,
+ &rt->prev_pkt[1], &rt->nb_prev_pkt[1]);
+ ff_rtmp_packet_destroy(&spkt);
+
+ return ret;
+}
+
 static int send_invoke_response(URLContext *s, RTMPPacket *pkt)
 {
 RTMPContext *rt = s->priv_data;
 double seqnum;
 char filename[64];
 char command[64];
- char statusmsg[128];
 int stringlen;
 char *pchar;
 const uint8_t *p = pkt->data;
@@ -1755,7 +1852,7 @@
 GetByteContext gbc;
 int ret;
 
- bytestream2_init(&gbc, p, pkt->data_size);
+ bytestream2_init(&gbc, p, pkt->size);
 if (ff_amf_read_string(&gbc, command, sizeof(command),
 &stringlen)) {
 av_log(s, AV_LOG_ERROR, "Error in PT_INVOKE\n");
@@ -1799,52 +1896,20 @@
 pp = spkt.data;
 ff_amf_write_string(&pp, "onFCPublish");
 } else if (!strcmp(command, "publish")) {
- PutByteContext pbc;
- // Send Stream Begin 1
- if ((ret = ff_rtmp_packet_create(&spkt, RTMP_NETWORK_CHANNEL,
- RTMP_PT_PING, 0, 6)) < 0) {
- av_log(s, AV_LOG_ERROR, "Unable to create response packet\n");
- return ret;
- }
- pp = spkt.data;
- bytestream2_init_writer(&pbc, pp, spkt.data_size);
- bytestream2_put_be16(&pbc, 0); // 0 -> Stream Begin
- bytestream2_put_be32(&pbc, rt->nb_streamid);
- ret = ff_rtmp_packet_write(rt->stream, &spkt, rt->out_chunk_size,
- rt->prev_pkt[1]);
- ff_rtmp_packet_destroy(&spkt);
+ ret = write_begin(s);
 if (ret < 0)
 return ret;
 
 // Send onStatus(NetStream.Publish.Start)
- if ((ret = ff_rtmp_packet_create(&spkt, RTMP_SYSTEM_CHANNEL,
- RTMP_PT_INVOKE, 0,
- RTMP_PKTDATA_DEFAULT_SIZE)) < 0) {
- av_log(s, AV_LOG_ERROR, "Unable to create response packet\n");
+ return write_status(s, pkt, "NetStream.Publish.Start",
+ filename);
+ } else if (!strcmp(command, "play")) {
+ ret = write_begin(s);
+ if (ret < 0)
 return ret;
- }
- spkt.extra = pkt->extra;
- pp = spkt.data;
- ff_amf_write_string(&pp, "onStatus");
- ff_amf_write_number(&pp, 0);
- ff_amf_write_null(&pp);
-
- ff_amf_write_object_start(&pp);
- ff_amf_write_field_name(&pp, "level");
- ff_amf_write_string(&pp, "status");
- ff_amf_write_field_name(&pp, "code");
- ff_amf_write_string(&pp, "NetStream.Publish.Start");
- ff_amf_write_field_name(&pp, "description");
- snprintf(statusmsg, sizeof(statusmsg),
- "%s is now published", filename);
- ff_amf_write_string(&pp, statusmsg);
- ff_amf_write_field_name(&pp, "details");
- ff_amf_write_string(&pp, filename);
- ff_amf_write_field_name(&pp, "clientid");
- snprintf(statusmsg, sizeof(statusmsg), "%s", LIBAVFORMAT_IDENT);
- ff_amf_write_string(&pp, statusmsg);
- ff_amf_write_object_end(&pp);
-
+ rt->state = STATE_SENDING;
+ return write_status(s, pkt, "NetStream.Play.Start",
+ filename);
 } else {
 if ((ret = ff_rtmp_packet_create(&spkt, RTMP_SYSTEM_CHANNEL,
 RTMP_PT_INVOKE, 0,
@@ -1866,9 +1931,9 @@
 * if a client creates more than 2^32 - 2 streams. */
 }
 }
- spkt.data_size = pp - spkt.data;
+ spkt.size = pp - spkt.data;
 ret = ff_rtmp_packet_write(rt->stream, &spkt, rt->out_chunk_size,
- rt->prev_pkt[1]);
+ &rt->prev_pkt[1], &rt->nb_prev_pkt[1]);
 ff_rtmp_packet_destroy(&spkt);
 return ret;
 }
@@ -1887,7 +1952,7 @@
 return ret;
 }
 
- if (!memcmp(tracked_method, "connect", 7)) {
+ if (!strcmp(tracked_method, "connect")) {
 if (!rt->is_input) {
 if ((ret = gen_release_stream(s, rt)) < 0)
 goto fail;
@@ -1913,12 +1978,12 @@
 goto fail;
 }
 }
- } else if (!memcmp(tracked_method, "createStream", 12)) {
+ } else if (!strcmp(tracked_method, "createStream")) {
 //extract a number from the result
 if (pkt->data[10] || pkt->data[19] != 5 || pkt->data[20]) {
 av_log(s, AV_LOG_WARNING, "Unexpected reply on connect()\n");
 } else {
- rt->main_channel_id = av_int2double(AV_RB64(pkt->data + 21));
+ rt->stream_id = av_int2double(AV_RB64(pkt->data + 21));
 }
 
 if (!rt->is_input) {
@@ -1940,8 +2005,8 @@
 static int handle_invoke_status(URLContext *s, RTMPPacket *pkt)
 {
 RTMPContext *rt = s->priv_data;
- const uint8_t *data_end = pkt->data + pkt->data_size;
- const uint8_t *ptr = pkt->data + 11;
+ const uint8_t *data_end = pkt->data + pkt->size;
+ const uint8_t *ptr = pkt->data + RTMP_HEADER;
 uint8_t tmpstr[256];
 int i, t;
 
@@ -1954,8 +2019,12 @@
 
 t = ff_amf_get_field_value(ptr, data_end, "level", tmpstr, sizeof(tmpstr));
 if (!t && !strcmp(tmpstr, "error")) {
- if (!ff_amf_get_field_value(ptr, data_end,
- "description", tmpstr, sizeof(tmpstr)))
+ t = ff_amf_get_field_value(ptr, data_end,
+ "description", tmpstr, sizeof(tmpstr));
+ if (t || !tmpstr[0])
+ t = ff_amf_get_field_value(ptr, data_end, "code",
+ tmpstr, sizeof(tmpstr));
+ if (!t)
 av_log(s, AV_LOG_ERROR, "Server error: %s\n", tmpstr);
 return -1;
 }
@@ -1965,6 +2034,7 @@
 if (!t && !strcmp(tmpstr, "NetStream.Play.Stop")) rt->state = STATE_STOPPED;
 if (!t && !strcmp(tmpstr, "NetStream.Play.UnpublishNotify")) rt->state = STATE_STOPPED;
 if (!t && !strcmp(tmpstr, "NetStream.Publish.Start")) rt->state = STATE_PUBLISHING;
+ if (!t && !strcmp(tmpstr, "NetStream.Seek.Notify")) rt->state = STATE_PLAYING;
 
 return 0;
 }
@@ -1975,89 +2045,100 @@
 int ret = 0;
 
 //TODO: check for the messages sent for wrong state?
- if (!memcmp(pkt->data, "\002\000\006_error", 9)) {
+ if (ff_amf_match_string(pkt->data, pkt->size, "_error")) {
 if ((ret = handle_invoke_error(s, pkt)) < 0)
 return ret;
- } else if (!memcmp(pkt->data, "\002\000\007_result", 10)) {
+ } else if (ff_amf_match_string(pkt->data, pkt->size, "_result")) {
 if ((ret = handle_invoke_result(s, pkt)) < 0)
 return ret;
- } else if (!memcmp(pkt->data, "\002\000\010onStatus", 11)) {
+ } else if (ff_amf_match_string(pkt->data, pkt->size, "onStatus")) {
 if ((ret = handle_invoke_status(s, pkt)) < 0)
 return ret;
- } else if (!memcmp(pkt->data, "\002\000\010onBWDone", 11)) {
+ } else if (ff_amf_match_string(pkt->data, pkt->size, "onBWDone")) {
 if ((ret = gen_check_bw(s, rt)) < 0)
 return ret;
- } else if (!memcmp(pkt->data, "\002\000\015releaseStream", 16) ||
- !memcmp(pkt->data, "\002\000\011FCPublish", 12) ||
- !memcmp(pkt->data, "\002\000\007publish", 10) ||
- !memcmp(pkt->data, "\002\000\010_checkbw", 11) ||
- !memcmp(pkt->data, "\002\000\014createStream", 15)) {
- if (ret = send_invoke_response(s, pkt) < 0)
+ } else if (ff_amf_match_string(pkt->data, pkt->size, "releaseStream") ||
+ ff_amf_match_string(pkt->data, pkt->size, "FCPublish") ||
+ ff_amf_match_string(pkt->data, pkt->size, "publish") ||
+ ff_amf_match_string(pkt->data, pkt->size, "play") ||
+ ff_amf_match_string(pkt->data, pkt->size, "_checkbw") ||
+ ff_amf_match_string(pkt->data, pkt->size, "createStream")) {
+ if ((ret = send_invoke_response(s, pkt)) < 0)
 return ret;
 }
 
 return ret;
 }
 
-static int handle_notify(URLContext *s, RTMPPacket *pkt) {
+static int update_offset(RTMPContext *rt, int size)
+{
+ int old_flv_size;
+
+ // generate packet header and put data into buffer for FLV demuxer
+ if (rt->flv_off < rt->flv_size) {
+ // There is old unread data in the buffer, thus append at the end
+ old_flv_size = rt->flv_size;
+ rt->flv_size += size;
+ } else {
+ // All data has been read, write the new data at the start of the buffer
+ old_flv_size = 0;
+ rt->flv_size = size;
+ rt->flv_off = 0;
+ }
+
+ return old_flv_size;
+}
+
+static int append_flv_data(RTMPContext *rt, RTMPPacket *pkt, int skip)
+{
+ int old_flv_size, ret;
+ PutByteContext pbc;
+ const uint8_t *data = pkt->data + skip;
+ const int size = pkt->size - skip;
+ uint32_t ts = pkt->timestamp;
+
+ old_flv_size = update_offset(rt, size + 15);
+
+ if ((ret = av_reallocp(&rt->flv_data, rt->flv_size)) < 0) {
+ rt->flv_size = rt->flv_off = 0;
+ return ret;
+ }
+ bytestream2_init_writer(&pbc, rt->flv_data, rt->flv_size);
+ bytestream2_skip_p(&pbc, old_flv_size);
+ bytestream2_put_byte(&pbc, pkt->type);
+ bytestream2_put_be24(&pbc, size);
+ bytestream2_put_be24(&pbc, ts);
+ bytestream2_put_byte(&pbc, ts >> 24);
+ bytestream2_put_be24(&pbc, 0);
+ bytestream2_put_buffer(&pbc, data, size);
+ bytestream2_put_be32(&pbc, 0);
+
+ return 0;
+}
+
+static int handle_notify(URLContext *s, RTMPPacket *pkt)
+{
 RTMPContext *rt = s->priv_data;
- const uint8_t *p = NULL;
- uint8_t *cp = NULL;
 uint8_t commandbuffer[64];
 char statusmsg[128];
- int stringlen;
+ int stringlen, ret, skip = 0;
 GetByteContext gbc;
- PutByteContext pbc;
- uint32_t ts;
- int old_flv_size;
- const uint8_t *datatowrite;
- unsigned datatowritelength;
 
- p = pkt->data;
- bytestream2_init(&gbc, p, pkt->data_size);
+ bytestream2_init(&gbc, pkt->data, pkt->size);
 if (ff_amf_read_string(&gbc, commandbuffer, sizeof(commandbuffer),
 &stringlen))
 return AVERROR_INVALIDDATA;
+
+ // Skip the @setDataFrame string and validate it is a notification
 if (!strcmp(commandbuffer, "@setDataFrame")) {
- datatowrite = gbc.buffer;
- datatowritelength = bytestream2_get_bytes_left(&gbc);
- if (ff_amf_read_string(&gbc, statusmsg,
- sizeof(statusmsg), &stringlen))
+ skip = gbc.buffer - pkt->data;
+ ret = ff_amf_read_string(&gbc, statusmsg,
+ sizeof(statusmsg), &stringlen);
+ if (ret < 0)
 return AVERROR_INVALIDDATA;
- if (strcmp(statusmsg, "onMetaData")) {
- av_log(s, AV_LOG_INFO, "Expecting onMetadata but got %s\n",
- statusmsg);
- return 0;
- }
-
- /* Provide ECMAArray to flv */
- ts = pkt->timestamp;
-
- // generate packet header and put data into buffer for FLV demuxer
- if (rt->flv_off < rt->flv_size) {
- old_flv_size = rt->flv_size;
- rt->flv_size += datatowritelength + 15;
- } else {
- old_flv_size = 0;
- rt->flv_size = datatowritelength + 15;
- rt->flv_off = 0;
- }
-
- cp = av_realloc(rt->flv_data, rt->flv_size);
- if (!cp)
- return AVERROR(ENOMEM);
- rt->flv_data = cp;
- bytestream2_init_writer(&pbc, cp, rt->flv_size);
- bytestream2_skip_p(&pbc, old_flv_size);
- bytestream2_put_byte(&pbc, pkt->type);
- bytestream2_put_be24(&pbc, datatowritelength);
- bytestream2_put_be24(&pbc, ts);
- bytestream2_put_byte(&pbc, ts >> 24);
- bytestream2_put_be24(&pbc, 0);
- bytestream2_put_buffer(&pbc, datatowrite, datatowritelength);
- bytestream2_put_be32(&pbc, 0);
 }
- return 0;
+
+ return append_flv_data(rt, pkt, skip);
 }
 
 /**
@@ -2111,6 +2192,55 @@
 return 0;
 }
 
+static int handle_metadata(RTMPContext *rt, RTMPPacket *pkt)
+{
+ int ret, old_flv_size, type;
+ const uint8_t *next;
+ uint8_t *p;
+ uint32_t size;
+ uint32_t ts, cts, pts = 0;
+
+ old_flv_size = update_offset(rt, pkt->size);
+
+ if ((ret = av_reallocp(&rt->flv_data, rt->flv_size)) < 0) {
+ rt->flv_size = rt->flv_off = 0;
+ return ret;
+ }
+
+ next = pkt->data;
+ p = rt->flv_data + old_flv_size;
+
+ /* copy data while rewriting timestamps */
+ ts = pkt->timestamp;
+
+ while (next - pkt->data < pkt->size - RTMP_HEADER) {
+ type = bytestream_get_byte(&next);
+ size = bytestream_get_be24(&next);
+ cts = bytestream_get_be24(&next);
+ cts |= bytestream_get_byte(&next) << 24;
+ if (!pts)
+ pts = cts;
+ ts += cts - pts;
+ pts = cts;
+ if (size + 3 + 4 > pkt->data + pkt->size - next)
+ break;
+ bytestream_put_byte(&p, type);
+ bytestream_put_be24(&p, size);
+ bytestream_put_be24(&p, ts);
+ bytestream_put_byte(&p, ts >> 24);
+ memcpy(p, next, size + 3 + 4);
+ next += size + 3 + 4;
+ p += size + 3 + 4;
+ }
+ if (p != rt->flv_data + rt->flv_size) {
+ av_log(NULL, AV_LOG_WARNING, "Incomplete flv packets in "
+ "RTMP_PT_METADATA packet\n");
+ rt->flv_size = p - rt->flv_data;
+ }
+
+ return 0;
+}
+
 /**
 * Interact with the server by receiving and sending RTMP packets until
 * there is some significant data (media data or expected status notification).
@@ -2126,10 +2256,6 @@
 {
 RTMPContext *rt = s->priv_data;
 int ret;
- uint8_t *p;
- const uint8_t *next;
- uint32_t data_size;
- uint32_t ts, cts, pts=0;
 
 if (rt->state == STATE_STOPPED)
 return AVERROR_EOF;
@@ -2137,7 +2263,8 @@
 for (;;) {
 RTMPPacket rpkt = { 0 };
 if ((ret = ff_rtmp_packet_read(rt->stream, &rpkt,
- rt->in_chunk_size, rt->prev_pkt[0])) <= 0) {
+ rt->in_chunk_size, &rt->prev_pkt[0],
+ &rt->nb_prev_pkt[0])) <= 0) {
 if (ret == 0) {
 return AVERROR(EAGAIN);
 } else {
@@ -2153,6 +2280,17 @@
 }
 
 ret = rtmp_parse_result(s, rt, &rpkt);
+
+ // At this point we must check if we are in the seek state and continue
+ // with the next packet. handle_invoke will get us out of this state
+ // when the right message is encountered
+ if (rt->state == STATE_SEEKING) {
+ ff_rtmp_packet_destroy(&rpkt);
+ // We continue, let the natural flow of things happen:
+ // AVERROR(EAGAIN) or handle_invoke gets us out of here
+ continue;
+ }
+
 if (ret < 0) {//serious error in current packet
 ff_rtmp_packet_destroy(&rpkt);
 return ret;
@@ -2167,62 +2305,25 @@
 }
 if (for_header && (rt->state == STATE_PLAYING ||
 rt->state == STATE_PUBLISHING ||
+ rt->state == STATE_SENDING ||
 rt->state == STATE_RECEIVING)) {
 ff_rtmp_packet_destroy(&rpkt);
 return 0;
 }
- if (!rpkt.data_size || !rt->is_input) {
+ if (!rpkt.size || !rt->is_input) {
 ff_rtmp_packet_destroy(&rpkt);
 continue;
 }
- if (rpkt.type == RTMP_PT_VIDEO || rpkt.type == RTMP_PT_AUDIO ||
- (rpkt.type == RTMP_PT_NOTIFY && !memcmp("\002\000\012onMetaData", rpkt.data, 13))) {
- ts = rpkt.timestamp;
-
- // generate packet header and put data into buffer for FLV demuxer
- rt->flv_off = 0;
- rt->flv_size = rpkt.data_size + 15;
- rt->flv_data = p = av_realloc(rt->flv_data, rt->flv_size);
- bytestream_put_byte(&p, rpkt.type);
- bytestream_put_be24(&p, rpkt.data_size);
- bytestream_put_be24(&p, ts);
- bytestream_put_byte(&p, ts >> 24);
- bytestream_put_be24(&p, 0);
- bytestream_put_buffer(&p, rpkt.data, rpkt.data_size);
- bytestream_put_be32(&p, 0);
+ if (rpkt.type == RTMP_PT_VIDEO || rpkt.type == RTMP_PT_AUDIO) {
+ ret = append_flv_data(rt, &rpkt, 0);
 ff_rtmp_packet_destroy(&rpkt);
- return 0;
+ return ret;
 } else if (rpkt.type == RTMP_PT_NOTIFY) {
 ret = handle_notify(s, &rpkt);
 ff_rtmp_packet_destroy(&rpkt);
- if (ret) {
- av_log(s, AV_LOG_ERROR, "Handle notify error\n");
- return ret;
- }
- return 0;
+ return ret;
 } else if (rpkt.type == RTMP_PT_METADATA) {
- // we got raw FLV data, make it available for FLV demuxer
- rt->flv_off = 0;
- rt->flv_size = rpkt.data_size;
- rt->flv_data = av_realloc(rt->flv_data, rt->flv_size);
- /* rewrite timestamps */
- next = rpkt.data;
- ts = rpkt.timestamp;
- while (next - rpkt.data < rpkt.data_size - 11) {
- next++;
- data_size = bytestream_get_be24(&next);
- p=next;
- cts = bytestream_get_be24(&next);
- cts |= bytestream_get_byte(&next) << 24;
- if (pts==0)
- pts=cts;
- ts += cts - pts;
- pts = cts;
- bytestream_put_be24(&p, ts);
- bytestream_put_byte(&p, ts >> 24);
- next += data_size + 3 + 4;
- }
- memcpy(rt->flv_data, rpkt.data, rpkt.data_size);
+ ret = handle_metadata(rt, &rpkt);
 ff_rtmp_packet_destroy(&rpkt);
 return 0;
 }
@@ -2233,17 +2334,22 @@
 static int rtmp_close(URLContext *h)
 {
 RTMPContext *rt = h->priv_data;
- int ret = 0;
+ int ret = 0, i, j;
 
 if (!rt->is_input) {
 rt->flv_data = NULL;
- if (rt->out_pkt.data_size)
+ if (rt->out_pkt.size)
 ff_rtmp_packet_destroy(&rt->out_pkt);
 if (rt->state > STATE_FCPUBLISH)
 ret = gen_fcunpublish_stream(h, rt);
 }
 if (rt->state > STATE_HANDSHAKED)
 ret = gen_delete_stream(h, rt);
+ for (i = 0; i < 2; i++) {
+ for (j = 0; j < rt->nb_prev_pkt[i]; j++)
+ ff_rtmp_packet_destroy(&rt->prev_pkt[i][j]);
+ av_freep(&rt->prev_pkt[i]);
+ }
 
 free_tracked_methods(rt);
 av_freep(&rt->flv_data);
@@ -2279,6 +2385,13 @@
 hostname, sizeof(hostname), &port,
 path, sizeof(path), s->filename);
 
+ if (strchr(path, ' ')) {
+ av_log(s, AV_LOG_WARNING,
+ "Detected librtmp style URL parameters, these aren't supported "
+ "by the libavformat internal RTMP handler currently enabled. "
+ "See the documentation for the correct way to pass parameters.\n");
+ }
+
 if (auth[0]) {
 char *ptr = strchr(auth, ':');
 if (ptr) {
@@ -2370,10 +2483,10 @@
 fname = strchr(p + 1, '/');
 if (!fname || (c && c < fname)) {
 fname = p + 1;
- av_strlcpy(rt->app, path + 1, p - path);
+ av_strlcpy(rt->app, path + 1, FFMIN(p - path, APP_MAX_LENGTH));
 } else {
 fname++;
- av_strlcpy(rt->app, path + 1, fname - path - 1);
+ av_strlcpy(rt->app, path + 1, FFMIN(fname - path - 1, APP_MAX_LENGTH));
 }
 }
 }
@@ -2397,9 +2510,9 @@
 (!strcmp(fname + len - 4, ".f4v") ||
 !strcmp(fname + len - 4, ".mp4"))) {
 memcpy(rt->playpath, "mp4:", 5);
- } else if (len >= 4 && !strcmp(fname + len - 4, ".flv")) {
- fname[len - 4] = '\0';
 } else {
+ if (len >= 4 && !strcmp(fname + len - 4, ".flv"))
+ fname[len - 4] = '\0';
 rt->playpath[0] = 0;
 }
 av_strlcat(rt->playpath, fname, PLAYPATH_MAX_LENGTH);
@@ -2442,31 +2555,35 @@
 if ((ret = gen_connect(s, rt)) < 0)
 goto fail;
 } else {
- if (read_connect(s, s->priv_data) < 0)
+ if ((ret = read_connect(s, s->priv_data)) < 0)
 goto fail;
- rt->is_input = 1;
 }
 
 do {
 ret = get_packet(s, 1);
- } while (ret == EAGAIN);
+ } while (ret == AVERROR(EAGAIN));
 if (ret < 0)
 goto fail;
 
 if (rt->do_reconnect) {
+ int i;
 ffurl_close(rt->stream);
 rt->stream = NULL;
 rt->do_reconnect = 0;
 rt->nb_invokes = 0;
- memset(rt->prev_pkt, 0, sizeof(rt->prev_pkt));
+ for (i = 0; i < 2; i++)
+ memset(rt->prev_pkt[i], 0,
+ sizeof(**rt->prev_pkt) * rt->nb_prev_pkt[i]);
 free_tracked_methods(rt);
 goto reconnect;
 }
 
 if (rt->is_input) {
+ int err;
 // generate FLV header for demuxer
 rt->flv_size = 13;
- rt->flv_data = av_realloc(rt->flv_data, rt->flv_size);
+ if ((err = av_reallocp(&rt->flv_data, rt->flv_size)) < 0)
+ return err;
 rt->flv_off = 0;
 memcpy(rt->flv_data, "FLV\1\5\0\0\0\011\0\0\0\0", rt->flv_size);
 } else {
@@ -2513,6 +2630,26 @@
 return orig_size;
 }
 
+static int64_t rtmp_seek(URLContext *s, int stream_index, int64_t timestamp,
+ int flags)
+{
+ RTMPContext *rt = s->priv_data;
+ int ret;
+ av_log(s, AV_LOG_DEBUG,
+ "Seek on stream index %d at timestamp %"PRId64" with flags %08x\n",
+ stream_index, timestamp, flags);
+ if ((ret = gen_seek(s, rt, timestamp)) < 0) {
+ av_log(s, AV_LOG_ERROR,
+ "Unable to send seek command on stream index %d at timestamp "
+ "%"PRId64" with flags %08x\n",
+ stream_index, timestamp, flags);
+ return ret;
+ }
+ rt->flv_off = rt->flv_size;
+ rt->state = STATE_SEEKING;
+ return timestamp;
+}
+
 static int rtmp_write(URLContext *s, const uint8_t *buf, int size)
 {
 RTMPContext *rt = s->priv_data;
@@ -2532,13 +2669,14 @@
 continue;
 }
 
- if (rt->flv_header_bytes < 11) {
+ if (rt->flv_header_bytes < RTMP_HEADER) {
 const uint8_t *header = rt->flv_header;
- int copy = FFMIN(11 - rt->flv_header_bytes, size_temp);
+ int copy = FFMIN(RTMP_HEADER - rt->flv_header_bytes, size_temp);
+ int channel = RTMP_AUDIO_CHANNEL;
 bytestream_get_buffer(&buf_temp, rt->flv_header + rt->flv_header_bytes, copy);
 rt->flv_header_bytes += copy;
 size_temp -= copy;
- if (rt->flv_header_bytes < 11)
+ if (rt->flv_header_bytes < RTMP_HEADER)
 break;
 
 pkttype = bytestream_get_byte(&header);
@@ -2548,20 +2686,27 @@
 bytestream_get_be24(&header);
 rt->flv_size = pktsize;
 
+ if (pkttype == RTMP_PT_VIDEO)
+ channel = RTMP_VIDEO_CHANNEL;
+
 //force 12bytes header
 if (((pkttype == RTMP_PT_VIDEO || pkttype == RTMP_PT_AUDIO) && ts == 0) ||
 pkttype == RTMP_PT_NOTIFY) {
 if (pkttype == RTMP_PT_NOTIFY)
 pktsize += 16;
- rt->prev_pkt[1][RTMP_SOURCE_CHANNEL].channel_id = 0;
+ if ((ret = ff_rtmp_check_alloc_array(&rt->prev_pkt[1],
+ &rt->nb_prev_pkt[1],
+ channel)) < 0)
+ return ret;
+ rt->prev_pkt[1][channel].channel_id = 0;
 }
 
 //this can be a big packet, it's better to send it right here
- if ((ret = ff_rtmp_packet_create(&rt->out_pkt, RTMP_SOURCE_CHANNEL,
+ if ((ret = ff_rtmp_packet_create(&rt->out_pkt, channel,
 pkttype, ts, pktsize)) < 0)
 return ret;
 
- rt->out_pkt.extra = rt->main_channel_id;
+ rt->out_pkt.extra = rt->stream_id;
 rt->flv_data = rt->out_pkt.data;
 
 if (pkttype == RTMP_PT_NOTIFY)
@@ -2613,7 +2758,8 @@
 
 if ((ret = ff_rtmp_packet_read_internal(rt->stream, &rpkt,
 rt->in_chunk_size,
- rt->prev_pkt[0], c)) <= 0)
+ &rt->prev_pkt[0],
+ &rt->nb_prev_pkt[0], c)) <= 0)
 return ret;
 
 if ((ret = rtmp_parse_result(s, rt, &rpkt)) < 0)
@@ -2648,6 +2794,7 @@
 {"rtmp_swfverify", "URL to player swf file, compute hash/size automatically.", OFFSET(swfverify), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC},
 {"rtmp_tcurl", "URL of the target stream. Defaults to proto://host[:port]/app.", OFFSET(tcurl), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC},
 {"rtmp_listen", "Listen for incoming rtmp connections", OFFSET(listen), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC, "rtmp_listen" },
+ {"listen", "Listen for incoming rtmp connections", OFFSET(listen), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC, "rtmp_listen" },
 {"timeout", "Maximum timeout (in seconds) to wait for incoming connections. -1 is infinite. Implies -rtmp_listen 1", OFFSET(listen_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC, "rtmp_listen" },
 { NULL },
 };
@@ -2664,6 +2811,7 @@
 .name = #flavor, \
 .url_open = rtmp_open, \
 .url_read = rtmp_read, \
+ .url_read_seek = rtmp_seek, \
 .url_write = rtmp_write, \
 .url_close = rtmp_close, \
 .priv_data_size = sizeof(RTMPContext), \

libav-v9.6.tar.bz2/libavformat/rtp.c -> libav-v10.1.tar.bz2/libavformat/rtp.c Changed

@@ -19,29 +19,25 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include <libavutil/opt.h>
+#include "libavutil/opt.h"
 #include "avformat.h"
 
 #include "rtp.h"
 
-//#define DEBUG
-
 /* from http://www.iana.org/assignments/rtp-parameters last updated 05 January 2005 */
 /* payload types >= 96 are dynamic;
 * payload types between 72 and 76 are reserved for RTCP conflict avoidance;
 * all the other payload types not present in the table are unassigned or
 * reserved
 */
-static const struct
-{
+static const struct {
 int pt;
 const char enc_name[6];
 enum AVMediaType codec_type;
 enum AVCodecID codec_id;
 int clock_rate;
 int audio_channels;
-} AVRtpPayloadTypes[]=
-{
+} rtp_payload_types[] = {
 {0, "PCMU", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_PCM_MULAW, 8000, 1},
 {3, "GSM", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_NONE, 8000, 1},
 {4, "G723", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_G723_1, 8000, 1},
@@ -75,15 +71,15 @@
 {
 int i = 0;
 
- for (i = 0; AVRtpPayloadTypes[i].pt >= 0; i++)
- if (AVRtpPayloadTypes[i].pt == payload_type) {
- if (AVRtpPayloadTypes[i].codec_id != AV_CODEC_ID_NONE) {
- codec->codec_type = AVRtpPayloadTypes[i].codec_type;
- codec->codec_id = AVRtpPayloadTypes[i].codec_id;
- if (AVRtpPayloadTypes[i].audio_channels > 0)
- codec->channels = AVRtpPayloadTypes[i].audio_channels;
- if (AVRtpPayloadTypes[i].clock_rate > 0)
- codec->sample_rate = AVRtpPayloadTypes[i].clock_rate;
+ for (i = 0; rtp_payload_types[i].pt >= 0; i++)
+ if (rtp_payload_types[i].pt == payload_type) {
+ if (rtp_payload_types[i].codec_id != AV_CODEC_ID_NONE) {
+ codec->codec_type = rtp_payload_types[i].codec_type;
+ codec->codec_id = rtp_payload_types[i].codec_id;
+ if (rtp_payload_types[i].audio_channels > 0)
+ codec->channels = rtp_payload_types[i].audio_channels;
+ if (rtp_payload_types[i].clock_rate > 0)
+ codec->sample_rate = rtp_payload_types[i].clock_rate;
 return 0;
 }
 }
@@ -105,8 +101,8 @@
 }
 
 /* static payload type */
- for (i = 0; AVRtpPayloadTypes[i].pt >= 0; ++i)
- if (AVRtpPayloadTypes[i].codec_id == codec->codec_id) {
+ for (i = 0; rtp_payload_types[i].pt >= 0; ++i)
+ if (rtp_payload_types[i].codec_id == codec->codec_id) {
 if (codec->codec_id == AV_CODEC_ID_H263 && (!fmt || !fmt->oformat ||
 !fmt->oformat->priv_class || !fmt->priv_data ||
 !av_opt_flag_is_set(fmt->priv_data, "rtpflags", "rfc2190")))
@@ -115,14 +111,14 @@
 * see section 4.5.2 in RFC 3551. */
 if (codec->codec_id == AV_CODEC_ID_ADPCM_G722 &&
 codec->sample_rate == 16000 && codec->channels == 1)
- return AVRtpPayloadTypes[i].pt;
+ return rtp_payload_types[i].pt;
 if (codec->codec_type == AVMEDIA_TYPE_AUDIO &&
- ((AVRtpPayloadTypes[i].clock_rate > 0 &&
- codec->sample_rate != AVRtpPayloadTypes[i].clock_rate) ||
- (AVRtpPayloadTypes[i].audio_channels > 0 &&
- codec->channels != AVRtpPayloadTypes[i].audio_channels)))
+ ((rtp_payload_types[i].clock_rate > 0 &&
+ codec->sample_rate != rtp_payload_types[i].clock_rate) ||
+ (rtp_payload_types[i].audio_channels > 0 &&
+ codec->channels != rtp_payload_types[i].audio_channels)))
 continue;
- return AVRtpPayloadTypes[i].pt;
+ return rtp_payload_types[i].pt;
 }
 
 if (idx < 0)
@@ -136,10 +132,9 @@
 {
 int i;
 
- for (i = 0; AVRtpPayloadTypes[i].pt >= 0; i++)
- if (AVRtpPayloadTypes[i].pt == payload_type) {
- return AVRtpPayloadTypes[i].enc_name;
- }
+ for (i = 0; rtp_payload_types[i].pt >= 0; i++)
+ if (rtp_payload_types[i].pt == payload_type)
+ return rtp_payload_types[i].enc_name;
 
 return "";
 }
@@ -148,10 +143,9 @@
 {
 int i;
 
- for (i = 0; AVRtpPayloadTypes[i].pt >= 0; i++)
- if (!strcmp(buf, AVRtpPayloadTypes[i].enc_name) && (codec_type == AVRtpPayloadTypes[i].codec_type)){
- return AVRtpPayloadTypes[i].codec_id;
- }
+ for (i = 0; rtp_payload_types[i].pt >= 0; i++)
+ if (!strcmp(buf, rtp_payload_types[i].enc_name) && (codec_type == rtp_payload_types[i].codec_type))
+ return rtp_payload_types[i].codec_id;
 
 return AV_CODEC_ID_NONE;
 }

libav-v9.6.tar.bz2/libavformat/rtp.h -> libav-v10.1.tar.bz2/libavformat/rtp.h Changed

libav-v9.6.tar.bz2/libavformat/rtpdec.c -> libav-v10.1.tar.bz2/libavformat/rtpdec.c Changed

@@ -24,12 +24,14 @@
 #include "libavutil/time.h"
 #include "libavcodec/get_bits.h"
 #include "avformat.h"
-#include "mpegts.h"
 #include "network.h"
+#include "srtp.h"
 #include "url.h"
 #include "rtpdec.h"
 #include "rtpdec_formats.h"
 
+#define MIN_FEEDBACK_INTERVAL 200000 /* 200 ms in us */
+
 static RTPDynamicProtocolHandler realmedia_mp3_dynamic_handler = {
 .enc_name = "X-MP3-draft-00",
 .codec_type = AVMEDIA_TYPE_AUDIO,
@@ -48,7 +50,6 @@
 .codec_id = AV_CODEC_ID_OPUS,
 };
 
-/* statistics functions */
 static RTPDynamicProtocolHandler *rtp_first_dynamic_payload_handler = NULL;
 
 void ff_register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler)
@@ -57,41 +58,41 @@
 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_mp4v_es_dynamic_handler);
- ff_register_dynamic_payload_handler(&ff_mpeg4_generic_dynamic_handler);
 ff_register_dynamic_payload_handler(&ff_amr_nb_dynamic_handler);
 ff_register_dynamic_payload_handler(&ff_amr_wb_dynamic_handler);
+ ff_register_dynamic_payload_handler(&ff_g726_16_dynamic_handler);
+ ff_register_dynamic_payload_handler(&ff_g726_24_dynamic_handler);
+ ff_register_dynamic_payload_handler(&ff_g726_32_dynamic_handler);
+ ff_register_dynamic_payload_handler(&ff_g726_40_dynamic_handler);
 ff_register_dynamic_payload_handler(&ff_h263_1998_dynamic_handler);
 ff_register_dynamic_payload_handler(&ff_h263_2000_dynamic_handler);
 ff_register_dynamic_payload_handler(&ff_h263_rfc2190_dynamic_handler);
 ff_register_dynamic_payload_handler(&ff_h264_dynamic_handler);
 ff_register_dynamic_payload_handler(&ff_ilbc_dynamic_handler);
 ff_register_dynamic_payload_handler(&ff_jpeg_dynamic_handler);
- ff_register_dynamic_payload_handler(&ff_vorbis_dynamic_handler);
- ff_register_dynamic_payload_handler(&ff_theora_dynamic_handler);
- ff_register_dynamic_payload_handler(&ff_qdm2_dynamic_handler);
- ff_register_dynamic_payload_handler(&ff_svq3_dynamic_handler);
 ff_register_dynamic_payload_handler(&ff_mp4a_latm_dynamic_handler);
- ff_register_dynamic_payload_handler(&ff_vp8_dynamic_handler);
- ff_register_dynamic_payload_handler(&ff_qcelp_dynamic_handler);
- ff_register_dynamic_payload_handler(&realmedia_mp3_dynamic_handler);
- ff_register_dynamic_payload_handler(&speex_dynamic_handler);
- ff_register_dynamic_payload_handler(&opus_dynamic_handler);
-
- ff_register_dynamic_payload_handler(&ff_ms_rtp_asf_pfv_handler);
+ ff_register_dynamic_payload_handler(&ff_mp4v_es_dynamic_handler);
+ ff_register_dynamic_payload_handler(&ff_mpeg_audio_dynamic_handler);
+ ff_register_dynamic_payload_handler(&ff_mpeg_video_dynamic_handler);
+ ff_register_dynamic_payload_handler(&ff_mpeg4_generic_dynamic_handler);
+ ff_register_dynamic_payload_handler(&ff_mpegts_dynamic_handler);
 ff_register_dynamic_payload_handler(&ff_ms_rtp_asf_pfa_handler);
-
+ ff_register_dynamic_payload_handler(&ff_ms_rtp_asf_pfv_handler);
+ ff_register_dynamic_payload_handler(&ff_qcelp_dynamic_handler);
+ ff_register_dynamic_payload_handler(&ff_qdm2_dynamic_handler);
 ff_register_dynamic_payload_handler(&ff_qt_rtp_aud_handler);
 ff_register_dynamic_payload_handler(&ff_qt_rtp_vid_handler);
 ff_register_dynamic_payload_handler(&ff_quicktime_rtp_aud_handler);
 ff_register_dynamic_payload_handler(&ff_quicktime_rtp_vid_handler);
-
- ff_register_dynamic_payload_handler(&ff_g726_16_dynamic_handler);
- ff_register_dynamic_payload_handler(&ff_g726_24_dynamic_handler);
- ff_register_dynamic_payload_handler(&ff_g726_32_dynamic_handler);
- ff_register_dynamic_payload_handler(&ff_g726_40_dynamic_handler);
+ ff_register_dynamic_payload_handler(&ff_svq3_dynamic_handler);
+ 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(&opus_dynamic_handler);
+ ff_register_dynamic_payload_handler(&realmedia_mp3_dynamic_handler);
+ ff_register_dynamic_payload_handler(&speex_dynamic_handler);
 }
 
 RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name,
@@ -133,6 +134,7 @@
 return AVERROR_INVALIDDATA;
 }
 
+ s->last_rtcp_reception_time = av_gettime();
 s->last_rtcp_ntp_time = AV_RB64(buf + 8);
 s->last_rtcp_timestamp = AV_RB32(buf + 16);
 if (s->first_rtcp_ntp_time == AV_NOPTS_VALUE) {
@@ -226,6 +228,24 @@
 return 1;
 }
 
+static void rtcp_update_jitter(RTPStatistics *s, uint32_t sent_timestamp,
+ uint32_t arrival_timestamp)
+{
+ // Most of this is pretty straight from RFC 3550 appendix A.8
+ uint32_t transit = arrival_timestamp - sent_timestamp;
+ uint32_t prev_transit = s->transit;
+ int32_t d = transit - prev_transit;
+ // Doing the FFABS() call directly on the "transit - prev_transit"
+ // expression doesn't work, since it's an unsigned expression. Doing the
+ // transit calculation in unsigned is desired though, since it most
+ // probably will need to wrap around.
+ d = FFABS(d);
+ s->transit = transit;
+ if (!prev_transit)
+ return;
+ s->jitter += d - (int32_t) ((s->jitter + 8) >> 4);
+}
+
 int ff_rtp_check_and_send_back_rr(RTPDemuxContext *s, URLContext *fd,
 AVIOContext *avio, int count)
 {
@@ -238,10 +258,9 @@
 uint32_t extended_max;
 uint32_t expected_interval;
 uint32_t received_interval;
- uint32_t lost_interval;
+ int32_t lost_interval;
 uint32_t expected;
 uint32_t fraction;
- uint64_t ntp_time = s->last_rtcp_ntp_time; // TODO: Get local ntp time?
 
 if ((!fd && !avio) || (count < 1))
 return -1;
@@ -271,7 +290,7 @@
 // some placeholders we should really fill...
 // RFC 1889/p64
 extended_max = stats->cycles + stats->max_seq;
- expected = extended_max - stats->base_seq + 1;
+ expected = extended_max - stats->base_seq;
 lost = expected - stats->received;
 lost = FFMIN(lost, 0xffffff); // clamp it since it's only 24 bits...
 expected_interval = expected - stats->expected_prior;
@@ -295,7 +314,8 @@
 avio_wb32(pb, 0); /* delay since last SR */
 } else {
 uint32_t middle_32_bits = s->last_rtcp_ntp_time >> 16; // this is valid, right? do we need to handle 64 bit values special?
- uint32_t delay_since_last = ntp_time - s->last_rtcp_ntp_time;
+ uint32_t delay_since_last = av_rescale(av_gettime() - s->last_rtcp_reception_time,
+ 65536, AV_TIME_BASE);
 
 avio_wb32(pb, middle_32_bits); /* last SR timestamp */
 avio_wb32(pb, delay_since_last); /* delay since last SR */
@@ -305,13 +325,14 @@
 avio_w8(pb, (RTP_VERSION << 6) + 1); /* 1 report block */
 avio_w8(pb, RTCP_SDES);
 len = strlen(s->hostname);
- avio_wb16(pb, (6 + len + 3) / 4); /* length in words - 1 */
+ avio_wb16(pb, (7 + len + 3) / 4); /* length in words - 1 */
 avio_wb32(pb, s->ssrc + 1);
 avio_w8(pb, 0x01);
 avio_w8(pb, len);
 avio_write(pb, s->hostname, len);
+ avio_w8(pb, 0); /* END */
 // padding
- for (len = (6 + len) % 4; len % 4; len++)
+ for (len = (7 + len) % 4; len % 4; len++)
 avio_w8(pb, 0);
 
 avio_flush(pb);
@@ -366,10 +387,103 @@
 av_free(buf);
 }
 
+static int find_missing_packets(RTPDemuxContext *s, uint16_t *first_missing,
+ uint16_t *missing_mask)
+{
+ int i;
+ uint16_t next_seq = s->seq + 1;
+ RTPPacket *pkt = s->queue;
+
+ if (!pkt || pkt->seq == next_seq)
+ return 0;
+
+ *missing_mask = 0;
+ for (i = 1; i <= 16; i++) {
+ uint16_t missing_seq = next_seq + i;
+ while (pkt) {
+ int16_t diff = pkt->seq - missing_seq;
+ if (diff >= 0)
+ break;
+ pkt = pkt->next;
+ }
+ if (!pkt)
+ break;
+ if (pkt->seq == missing_seq)
+ continue;
+ *missing_mask |= 1 << (i - 1);
+ }
+
+ *first_missing = next_seq;
+ return 1;
+}
+
+int ff_rtp_send_rtcp_feedback(RTPDemuxContext *s, URLContext *fd,
+ AVIOContext *avio)
+{
+ int len, need_keyframe, missing_packets;
+ AVIOContext *pb;
+ uint8_t *buf;
+ int64_t now;
+ uint16_t first_missing = 0, missing_mask = 0;
+
+ if (!fd && !avio)
+ return -1;
+
+ need_keyframe = s->handler && s->handler->need_keyframe &&
+ s->handler->need_keyframe(s->dynamic_protocol_context);
+ missing_packets = find_missing_packets(s, &first_missing, &missing_mask);
+
+ if (!need_keyframe && !missing_packets)
+ return 0;
+
+ /* Send new feedback if enough time has elapsed since the last
+ * feedback packet. */
+
+ now = av_gettime();
+ if (s->last_feedback_time &&
+ (now - s->last_feedback_time) < MIN_FEEDBACK_INTERVAL)
+ return 0;
+ s->last_feedback_time = now;
+
+ if (!fd)
+ pb = avio;
+ else if (avio_open_dyn_buf(&pb) < 0)
+ return -1;
+
+ if (need_keyframe) {
+ avio_w8(pb, (RTP_VERSION << 6) | 1); /* PLI */
+ avio_w8(pb, RTCP_PSFB);
+ avio_wb16(pb, 2); /* length in words - 1 */
+ // our own SSRC: we use the server's SSRC + 1 to avoid conflicts
+ avio_wb32(pb, s->ssrc + 1);
+ avio_wb32(pb, s->ssrc); // server SSRC
+ }
+
+ if (missing_packets) {
+ avio_w8(pb, (RTP_VERSION << 6) | 1); /* NACK */
+ avio_w8(pb, RTCP_RTPFB);
+ avio_wb16(pb, 3); /* length in words - 1 */
+ avio_wb32(pb, s->ssrc + 1);
+ avio_wb32(pb, s->ssrc); // server SSRC
+
+ avio_wb16(pb, first_missing);
+ avio_wb16(pb, missing_mask);
+ }
+
+ avio_flush(pb);
+ if (!fd)
+ return 0;
+ len = avio_close_dyn_buf(pb, &buf);
+ if (len > 0 && buf) {
+ ffurl_write(fd, buf, len);
+ av_free(buf);
+ }
+ return 0;
+}
+
 /**
 * open a new RTP parse context for stream 'st'. 'st' can be NULL for
- * MPEG2-TS streams to indicate that they should be demuxed inside the
- * rtp demux (otherwise AV_CODEC_ID_MPEG2TS packets are returned)
+ * MPEG2-TS streams.
 */
 RTPDemuxContext *ff_rtp_parse_open(AVFormatContext *s1, AVStream *st,
 int payload_type, int queue_size)
@@ -385,27 +499,9 @@
 s->ic = s1;
 s->st = st;
 s->queue_size = queue_size;
- rtp_init_statistics(&s->statistics, 0); // do we know the initial sequence from sdp?
- if (!strcmp(ff_rtp_enc_name(payload_type), "MP2T")) {
- s->ts = ff_mpegts_parse_open(s->ic);
- if (s->ts == NULL) {
- av_free(s);
- return NULL;
- }
- } else if (st) {
+ rtp_init_statistics(&s->statistics, 0);
+ if (st) {
 switch (st->codec->codec_id) {
- case AV_CODEC_ID_MPEG1VIDEO:
- case AV_CODEC_ID_MPEG2VIDEO:
- case AV_CODEC_ID_MP2:
- case AV_CODEC_ID_MP3:
- case AV_CODEC_ID_MPEG4:
- case AV_CODEC_ID_H263:
- case AV_CODEC_ID_H264:
- st->need_parsing = AVSTREAM_PARSE_FULL;
- break;
- case AV_CODEC_ID_VORBIS:
- st->need_parsing = AVSTREAM_PARSE_HEADERS;
- break;
 case AV_CODEC_ID_ADPCM_G722:
 /* According to RFC 3551, the stream clock rate is 8000
 * even if the sample rate is 16000. */
@@ -425,7 +521,14 @@
 RTPDynamicProtocolHandler *handler)
 {
 s->dynamic_protocol_context = ctx;
- s->parse_packet = handler->parse_packet;
+ s->handler = handler;
+}
+
+void ff_rtp_parse_set_crypto(RTPDemuxContext *s, const char *suite,
+ const char *params)
+{
+ if (!ff_srtp_set_crypto(&s->srtp, suite, params))
+ s->srtp_enabled = 1;
 }
 
 /**
@@ -470,13 +573,14 @@
 static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt,
 const uint8_t *buf, int len)
 {
- unsigned int ssrc, h;
- int payload_type, seq, ret, flags = 0;
- int ext;
+ unsigned int ssrc;
+ int payload_type, seq, flags = 0;
+ int ext, csrc;
 AVStream *st;
 uint32_t timestamp;
 int rv = 0;
 
+ csrc = buf[0] & 0x0f;
 ext = buf[0] & 0x10;
 payload_type = buf[1] & 0x7f;
 if (buf[1] & 0x80)
@@ -510,6 +614,11 @@
 len -= 12;
 buf += 12;
 
+ len -= 4 * csrc;
+ buf += 4 * csrc;
+ if (len < 0)
+ return AVERROR_INVALIDDATA;
+
 /* RFC 3550 Section 5.3.1 RTP Header Extension handling */
 if (ext) {
 if (len < 4)
@@ -525,64 +634,17 @@
 buf += ext;
 }
 
- if (!st) {
- /* specific MPEG2-TS demux support */
- ret = ff_mpegts_parse_packet(s->ts, pkt, buf, len);
- /* The only error that can be returned from ff_mpegts_parse_packet
- * is "no more data to return from the provided buffer", so return
- * AVERROR(EAGAIN) for all errors */
- if (ret < 0)
- return AVERROR(EAGAIN);
- if (ret < len) {
- s->read_buf_size = FFMIN(len - ret, sizeof(s->buf));
- memcpy(s->buf, buf + ret, s->read_buf_size);
- s->read_buf_index = 0;
- return 1;
- }
- return 0;
- } else if (s->parse_packet) {
- rv = s->parse_packet(s->ic, s->dynamic_protocol_context,
- s->st, pkt, &timestamp, buf, len, seq, flags);
- } else {
- /* At this point, the RTP header has been stripped;
- * This is ASSUMING that there is only 1 CSRC, which isn't wise. */
- switch (st->codec->codec_id) {
- case AV_CODEC_ID_MP2:
- case AV_CODEC_ID_MP3:
- /* better than nothing: skip MPEG audio RTP header */
- if (len <= 4)
- return -1;
- h = AV_RB32(buf);
- len -= 4;
- buf += 4;
- av_new_packet(pkt, len);
- memcpy(pkt->data, buf, len);
- break;
- case AV_CODEC_ID_MPEG1VIDEO:
- case AV_CODEC_ID_MPEG2VIDEO:
- /* better than nothing: skip MPEG video RTP header */
- if (len <= 4)
- return -1;
- h = AV_RB32(buf);
- buf += 4;
- len -= 4;
- if (h & (1 << 26)) {
- /* MPEG-2 */
- if (len <= 4)
- return -1;
- buf += 4;
- len -= 4;
- }
- av_new_packet(pkt, len);
- memcpy(pkt->data, buf, len);
- break;
- default:
- av_new_packet(pkt, len);
- memcpy(pkt->data, buf, len);
- break;
- }
-
+ if (s->handler && s->handler->parse_packet) {
+ rv = s->handler->parse_packet(s->ic, s->dynamic_protocol_context,
+ s->st, pkt, &timestamp, buf, len, seq,
+ flags);
+ } else if (st) {
+ if ((rv = av_new_packet(pkt, len)) < 0)
+ return rv;
+ memcpy(pkt->data, buf, len);
 pkt->stream_index = st->index;
+ } else {
+ return AVERROR(EINVAL);
 }
 
 // now perform timestamp things....
@@ -607,15 +669,14 @@
 static void enqueue_packet(RTPDemuxContext *s, uint8_t *buf, int len)
 {
 uint16_t seq = AV_RB16(buf + 2);
- RTPPacket *cur = s->queue, *prev = NULL, *packet;
+ RTPPacket **cur = &s->queue, *packet;
 
 /* Find the correct place in the queue to insert the packet */
- while (cur) {
- int16_t diff = seq - cur->seq;
+ while (*cur) {
+ int16_t diff = seq - (*cur)->seq;
 if (diff < 0)
 break;
- prev = cur;
- cur = cur->next;
+ cur = &(*cur)->next;
 }
 
 packet = av_mallocz(sizeof(*packet));
@@ -625,11 +686,8 @@
 packet->seq = seq;
 packet->len = len;
 packet->buf = buf;
- packet->next = cur;
- if (prev)
- prev->next = packet;
- else
- s->queue = packet;
+ packet->next = *cur;
+ *cur = packet;
 s->queue_len++;
 }
 
@@ -669,7 +727,7 @@
 uint8_t **bufptr, int len)
 {
 uint8_t *buf = bufptr ? *bufptr : NULL;
- int ret, flags = 0;
+ int flags = 0;
 uint32_t timestamp;
 int rv = 0;
 
@@ -680,28 +738,15 @@
 if (s->prev_ret <= 0)
 return rtp_parse_queued_packet(s, pkt);
 /* return the next packets, if any */
- if (s->st && s->parse_packet) {
+ if (s->handler && s->handler->parse_packet) {
 /* timestamp should be overwritten by parse_packet, if not,
 * the packet is left with pts == AV_NOPTS_VALUE */
 timestamp = RTP_NOTS_VALUE;
- rv = s->parse_packet(s->ic, s->dynamic_protocol_context,
- s->st, pkt, &timestamp, NULL, 0, 0,
- flags);
+ rv = s->handler->parse_packet(s->ic, s->dynamic_protocol_context,
+ s->st, pkt, &timestamp, NULL, 0, 0,
+ flags);
 finalize_packet(s, pkt, timestamp);
 return rv;
- } else {
- // TODO: Move to a dynamic packet handler (like above)
- if (s->read_buf_index >= s->read_buf_size)
- return AVERROR(EAGAIN);
- ret = ff_mpegts_parse_packet(s->ts, pkt, s->buf + s->read_buf_index,
- s->read_buf_size - s->read_buf_index);
- if (ret < 0)
- return AVERROR(EAGAIN);
- s->read_buf_index += ret;
- if (s->read_buf_index < s->read_buf_size)
- return 1;
- else
- return 0;
 }
 }
 
@@ -714,6 +759,16 @@
 return rtcp_parse_packet(s, buf, len);
 }
 
+ if (s->st) {
+ int64_t received = av_gettime();
+ uint32_t arrival_ts = av_rescale_q(received, AV_TIME_BASE_Q,
+ s->st->time_base);
+ timestamp = AV_RB32(buf + 4);
+ // Calculate the jitter immediately, before queueing the packet
+ // into the reordering queue.
+ rtcp_update_jitter(&s->statistics, timestamp, arrival_ts);
+ }
+
 if ((s->seq == 0 && !s->queue) || s->queue_size <= 1) {
 /* First packet, or no reordering */
 return rtp_parse_packet_internal(s, pkt, buf, len);
@@ -754,7 +809,10 @@
 int ff_rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
 uint8_t **bufptr, int len)
 {
- int rv = rtp_parse_one_packet(s, pkt, bufptr, len);
+ int rv;
+ if (s->srtp_enabled && bufptr && ff_srtp_decrypt(&s->srtp, *bufptr, &len) < 0)
+ return -1;
+ rv = rtp_parse_one_packet(s, pkt, bufptr, len);
 s->prev_ret = rv;
 while (rv == AVERROR(EAGAIN) && has_next_packet(s))
 rv = rtp_parse_queued_packet(s, pkt);
@@ -764,9 +822,7 @@
 void ff_rtp_parse_close(RTPDemuxContext *s)
 {
 ff_rtp_reset_packet_queue(s);
- if (!strcmp(ff_rtp_enc_name(s->payload_type), "MP2T")) {
- ff_mpegts_parse_close(s->ts);
- }
+ ff_srtp_free(&s->srtp);
 av_free(s);
 }
 
@@ -808,11 +864,15 @@
 
 int ff_rtp_finalize_packet(AVPacket *pkt, AVIOContext **dyn_buf, int stream_idx)
 {
+ int ret;
 av_init_packet(pkt);
 
 pkt->size = avio_close_dyn_buf(*dyn_buf, &pkt->data);
 pkt->stream_index = stream_idx;
- pkt->destruct = av_destruct_packet;
- *dyn_buf = NULL;
+ *dyn_buf = NULL;
+ if ((ret = av_packet_from_data(pkt, pkt->data, pkt->size)) < 0) {
+ av_freep(&pkt->data);
+ return ret;
+ }
 return pkt->size;
 }

libav-v9.6.tar.bz2/libavformat/rtpdec.h -> libav-v10.1.tar.bz2/libavformat/rtpdec.h Changed

@@ -27,12 +27,13 @@
 #include "avformat.h"
 #include "rtp.h"
 #include "url.h"
+#include "srtp.h"
 
 typedef struct PayloadContext PayloadContext;
 typedef struct RTPDynamicProtocolHandler RTPDynamicProtocolHandler;
 
 #define RTP_MIN_PACKET_LENGTH 12
-#define RTP_MAX_PACKET_LENGTH 1500
+#define RTP_MAX_PACKET_LENGTH 8192
 
 #define RTP_REORDER_QUEUE_DEFAULT_SIZE 10
 
@@ -43,15 +44,13 @@
 int payload_type, int queue_size);
 void ff_rtp_parse_set_dynamic_protocol(RTPDemuxContext *s, PayloadContext *ctx,
 RTPDynamicProtocolHandler *handler);
+void ff_rtp_parse_set_crypto(RTPDemuxContext *s, const char *suite,
+ const char *params);
 int ff_rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
 uint8_t **buf, int len);
 void ff_rtp_parse_close(RTPDemuxContext *s);
 int64_t ff_rtp_queued_packet_time(RTPDemuxContext *s);
 void ff_rtp_reset_packet_queue(RTPDemuxContext *s);
-int ff_rtp_get_local_rtp_port(URLContext *h);
-int ff_rtp_get_local_rtcp_port(URLContext *h);
-
-int ff_rtp_set_remote_url(URLContext *h, const char *uri);
 
 /**
 * Send a dummy packet on both port pairs to set up the connection
@@ -73,6 +72,8 @@
 */
 int ff_rtp_check_and_send_back_rr(RTPDemuxContext *s, URLContext *fd,
 AVIOContext *avio, int count);
+int ff_rtp_send_rtcp_feedback(RTPDemuxContext *s, URLContext *fd,
+ AVIOContext *avio);
 
 // these statistics are used for rtcp receiver reports...
 typedef struct RTPStatistics {
@@ -81,9 +82,9 @@
 uint32_t base_seq; ///< base sequence number
 uint32_t bad_seq; ///< last bad sequence number + 1
 int probation; ///< sequence packets till source is valid
- int received; ///< packets received
- int expected_prior; ///< packets expected in last interval
- int received_prior; ///< packets received in last interval
+ uint32_t received; ///< packets received
+ uint32_t expected_prior; ///< packets expected in last interval
+ uint32_t received_prior; ///< packets received in last interval
 uint32_t transit; ///< relative transit time for previous packet
 uint32_t jitter; ///< estimated jitter.
 } RTPStatistics;
@@ -130,6 +131,7 @@
 void (*free)(PayloadContext *protocol_data);
 /** Parse handler for this dynamic packet */
 DynamicPayloadPacketHandlerProc parse_packet;
+ int (*need_keyframe)(PayloadContext *context);
 
 struct RTPDynamicProtocolHandler *next;
 };
@@ -154,12 +156,12 @@
 int64_t unwrapped_timestamp;
 int64_t range_start_offset;
 int max_payload_size;
- struct MpegTSContext *ts; /* only used for MP2T payloads */
- int read_buf_index;
- int read_buf_size;
 /* used to send back RTCP RR */
 char hostname[256];
 
+ int srtp_enabled;
+ struct SRTPContext srtp;
+
 /** Statistics for this stream (used by RTCP receiver reports) */
 RTPStatistics statistics;
 
@@ -172,6 +174,7 @@
 
 /* rtcp sender statistics receive */
 int64_t last_rtcp_ntp_time;
+ int64_t last_rtcp_reception_time;
 int64_t first_rtcp_ntp_time;
 uint32_t last_rtcp_timestamp;
 int64_t rtcp_ts_offset;
@@ -180,11 +183,10 @@
 unsigned int packet_count;
 unsigned int octet_count;
 unsigned int last_octet_count;
- /* buffer for partially parsed packets */
- uint8_t buf[RTP_MAX_PACKET_LENGTH];
+ int64_t last_feedback_time;
 
 /* dynamic payload stuff */
- DynamicPayloadPacketHandlerProc parse_packet;
+ const RTPDynamicProtocolHandler *handler;
 PayloadContext *dynamic_protocol_context;
 };
 
@@ -203,7 +205,7 @@
 PayloadContext *data,
 char *attr, char *value));
 
-void av_register_rtp_dynamic_payload_handlers(void);
+void ff_register_rtp_dynamic_payload_handlers(void);
 
 /**
 * Close the dynamic buffer and make a packet from it.

libav-v9.6.tar.bz2/libavformat/rtpdec_asf.c -> libav-v10.1.tar.bz2/libavformat/rtpdec_asf.c Changed

@@ -144,6 +144,8 @@
 if (s->streams[stream_index]->id == rt->asf_ctx->streams[i]->id) {
 *s->streams[stream_index]->codec =
 *rt->asf_ctx->streams[i]->codec;
+ s->streams[stream_index]->need_parsing =
+ rt->asf_ctx->streams[i]->need_parsing;
 rt->asf_ctx->streams[i]->codec->extradata_size = 0;
 rt->asf_ctx->streams[i]->codec->extradata = NULL;
 avpriv_set_pts_info(s->streams[stream_index], 32, 1, 1000);
@@ -239,14 +241,11 @@
 
 int cur_len = start_off + len_off - off;
 int prev_len = out_len;
- void *newmem;
 out_len += cur_len;
 if (FFMIN(cur_len, len - off) < 0)
 return -1;
- newmem = av_realloc(asf->buf, out_len);
- if (!newmem)
- return -1;
- asf->buf = newmem;
+ if ((res = av_reallocp(&asf->buf, out_len)) < 0)
+ return res;
 memcpy(asf->buf + prev_len, buf + off,
 FFMIN(cur_len, len - off));
 avio_skip(pb, cur_len);

libav-v9.6.tar.bz2/libavformat/rtpdec_formats.h -> libav-v10.1.tar.bz2/libavformat/rtpdec_formats.h Changed

libav-v9.6.tar.bz2/libavformat/rtpdec_g726.c -> libav-v10.1.tar.bz2/libavformat/rtpdec_g726.c Changed

libav-v9.6.tar.bz2/libavformat/rtpdec_h263.c -> libav-v10.1.tar.bz2/libavformat/rtpdec_h263.c Changed

@@ -21,8 +21,18 @@
 
 #include "avformat.h"
 #include "rtpdec_formats.h"
+#include "libavutil/attributes.h"
 #include "libavutil/intreadwrite.h"
 
+static av_cold int h263_init(AVFormatContext *ctx, int st_index,
+ PayloadContext *data)
+{
+ if (st_index < 0)
+ return 0;
+ ctx->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL;
+ return 0;
+}
+
 int ff_h263_handle_packet(AVFormatContext *ctx, PayloadContext *data,
 AVStream *st, AVPacket *pkt, uint32_t *timestamp,
 const uint8_t *buf, int len, uint16_t seq, int flags)
@@ -92,6 +102,7 @@
 .enc_name = "H263-1998",
 .codec_type = AVMEDIA_TYPE_VIDEO,
 .codec_id = AV_CODEC_ID_H263,
+ .init = h263_init,
 .parse_packet = ff_h263_handle_packet,
 };
 
@@ -99,5 +110,6 @@
 .enc_name = "H263-2000",
 .codec_type = AVMEDIA_TYPE_VIDEO,
 .codec_id = AV_CODEC_ID_H263,
+ .init = h263_init,
 .parse_packet = ff_h263_handle_packet,
 };

libav-v9.6.tar.bz2/libavformat/rtpdec_h263_rfc2190.c -> libav-v10.1.tar.bz2/libavformat/rtpdec_h263_rfc2190.c Changed

@@ -27,6 +27,7 @@
 
 #include "avformat.h"
 #include "rtpdec_formats.h"
+#include "libavutil/attributes.h"
 #include "libavutil/intreadwrite.h"
 #include "libavcodec/get_bits.h"
 
@@ -55,6 +56,14 @@
 av_free(data);
 }
 
+static av_cold int h263_init(AVFormatContext *ctx, int st_index, PayloadContext *data)
+{
+ if (st_index < 0)
+ return 0;
+ ctx->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL;
+ return 0;
+}
+
 static int h263_handle_packet(AVFormatContext *ctx, PayloadContext *data,
 AVStream *st, AVPacket *pkt, uint32_t *timestamp,
 const uint8_t *buf, int len, uint16_t seq,
@@ -198,6 +207,7 @@
 RTPDynamicProtocolHandler ff_h263_rfc2190_dynamic_handler = {
 .codec_type = AVMEDIA_TYPE_VIDEO,
 .codec_id = AV_CODEC_ID_H263,
+ .init = h263_init,
 .parse_packet = h263_handle_packet,
 .alloc = h263_new_context,
 .free = h263_free_context,

libav-v9.6.tar.bz2/libavformat/rtpdec_h264.c -> libav-v10.1.tar.bz2/libavformat/rtpdec_h264.c Changed

@@ -33,6 +33,7 @@
 * FU-B packet types)
 */
 
+#include "libavutil/attributes.h"
 #include "libavutil/base64.h"
 #include "libavutil/avstring.h"
 #include "libavcodec/get_bits.h"
@@ -189,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);
@@ -246,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);
@@ -291,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 {
@@ -338,6 +343,15 @@
 av_free(data);
 }
 
+static av_cold int h264_init(AVFormatContext *s, int st_index,
+ PayloadContext *data)
+{
+ if (st_index < 0)
+ return 0;
+ s->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL;
+ return 0;
+}
+
 static int parse_h264_sdp_line(AVFormatContext *s, int st_index,
 PayloadContext *h264_data, const char *line)
 {
@@ -383,6 +397,7 @@
 .enc_name = "H264",
 .codec_type = AVMEDIA_TYPE_VIDEO,
 .codec_id = AV_CODEC_ID_H264,
+ .init = h264_init,
 .parse_sdp_a_line = parse_h264_sdp_line,
 .alloc = h264_new_context,
 .free = h264_free_context,

libav-v9.6.tar.bz2/libavformat/rtpdec_latm.c -> libav-v10.1.tar.bz2/libavformat/rtpdec_latm.c Changed

libav-v10.1.tar.bz2/libavformat/rtpdec_mpeg12.c Added

@@ -0,0 +1,73 @@
+/*
+ * Common code for the RTP depacketization of MPEG-1/2 formats.
+ * Copyright (c) 2002 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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/intreadwrite.h"
+#include "rtpdec_formats.h"
+
+static av_cold int mpeg_init(AVFormatContext *ctx, int st_index, PayloadContext *data)
+{
+ if (st_index < 0)
+ return 0;
+ ctx->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL;
+ return 0;
+}
+
+static int mpeg_parse_packet(AVFormatContext *ctx, PayloadContext *data,
+ AVStream *st, AVPacket *pkt, uint32_t *timestamp,
+ const uint8_t *buf, int len, uint16_t seq,
+ int flags)
+{
+ unsigned int h;
+ if (len <= 4)
+ return AVERROR_INVALIDDATA;
+ h = AV_RB32(buf);
+ buf += 4;
+ len -= 4;
+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && h & (1 << 26)) {
+ /* MPEG-2 */
+ if (len <= 4)
+ return AVERROR_INVALIDDATA;
+ buf += 4;
+ len -= 4;
+ }
+ if (av_new_packet(pkt, len) < 0)
+ return AVERROR(ENOMEM);
+ memcpy(pkt->data, buf, len);
+ pkt->stream_index = st->index;
+ return 0;
+}
+
+RTPDynamicProtocolHandler ff_mpeg_audio_dynamic_handler = {
+ .codec_type = AVMEDIA_TYPE_AUDIO,
+ .codec_id = AV_CODEC_ID_MP3,
+ .init = mpeg_init,
+ .parse_packet = mpeg_parse_packet,
+ .static_payload_id = 14,
+};
+
+RTPDynamicProtocolHandler ff_mpeg_video_dynamic_handler = {
+ .codec_type = AVMEDIA_TYPE_VIDEO,
+ .codec_id = AV_CODEC_ID_MPEG2VIDEO,
+ .init = mpeg_init,
+ .parse_packet = mpeg_parse_packet,
+ .static_payload_id = 32,
+};

libav-v9.6.tar.bz2/libavformat/rtpdec_mpeg4.c -> libav-v10.1.tar.bz2/libavformat/rtpdec_mpeg4.c Changed

@@ -29,6 +29,7 @@
 
 #include "rtpdec_formats.h"
 #include "internal.h"
+#include "libavutil/attributes.h"
 #include "libavutil/avstring.h"
 #include "libavcodec/get_bits.h"
 
@@ -57,6 +58,9 @@
 int nb_au_headers;
 int au_headers_length_bytes;
 int cur_au_index;
+
+ uint8_t buf[RTP_MAX_PACKET_LENGTH];
+ int buf_pos, buf_size;
 };
 
 typedef struct {
@@ -109,11 +113,14 @@
 return 0;
 }
 
-static int rtp_parse_mp4_au(PayloadContext *data, const uint8_t *buf)
+static int rtp_parse_mp4_au(PayloadContext *data, const uint8_t *buf, int len)
 {
 int au_headers_length, au_header_size, i;
 GetBitContext getbitcontext;
 
+ if (len < 2)
+ return AVERROR_INVALIDDATA;
+
 /* decode the first 2 bytes where the AUHeader sections are stored
 length in bits */
 au_headers_length = AV_RB16(buf);
@@ -125,6 +132,10 @@
 
 /* skip AU headers length section (2 bytes) */
 buf += 2;
+ len -= 2;
+
+ if (len < data->au_headers_length_bytes)
+ return AVERROR_INVALIDDATA;
 
 init_get_bits(&getbitcontext, buf, data->au_headers_length_bytes * 8);
 
@@ -137,21 +148,16 @@
 if (!data->au_headers || data->au_headers_allocated < data->nb_au_headers) {
 av_free(data->au_headers);
 data->au_headers = av_malloc(sizeof(struct AUHeaders) * data->nb_au_headers);
+ if (!data->au_headers)
+ return AVERROR(ENOMEM);
 data->au_headers_allocated = data->nb_au_headers;
 }
 
- /* XXX: We handle multiple AU Section as only one (need to fix this for interleaving)
- In my test, the FAAD decoder does not behave correctly when sending each AU one by one
- but does when sending the whole as one big packet... */
- data->au_headers[0].size = 0;
- data->au_headers[0].index = 0;
 for (i = 0; i < data->nb_au_headers; ++i) {
- data->au_headers[0].size += get_bits_long(&getbitcontext, data->sizelength);
- data->au_headers[0].index = get_bits_long(&getbitcontext, data->indexlength);
+ data->au_headers[i].size = get_bits_long(&getbitcontext, data->sizelength);
+ data->au_headers[i].index = get_bits_long(&getbitcontext, data->indexlength);
 }
 
- data->nb_au_headers = 1;
-
 return 0;
 }
 
@@ -162,18 +168,45 @@
 const uint8_t *buf, int len, uint16_t seq,
 int flags)
 {
- if (rtp_parse_mp4_au(data, buf))
+ int ret;
+
+ if (!buf) {
+ if (data->cur_au_index > data->nb_au_headers)
+ return AVERROR_INVALIDDATA;
+ if (data->buf_size - data->buf_pos < data->au_headers[data->cur_au_index].size)
+ return AVERROR_INVALIDDATA;
+ if ((ret = av_new_packet(pkt, data->au_headers[data->cur_au_index].size)) < 0)
+ return ret;
+ memcpy(pkt->data, &data->buf[data->buf_pos], data->au_headers[data->cur_au_index].size);
+ data->buf_pos += data->au_headers[data->cur_au_index].size;
+ pkt->stream_index = st->index;
+ data->cur_au_index++;
+ return data->cur_au_index < data->nb_au_headers;
+ }
+
+ if (rtp_parse_mp4_au(data, buf, len))
 return -1;
 
 buf += data->au_headers_length_bytes + 2;
 len -= data->au_headers_length_bytes + 2;
 
- /* XXX: Fixme we only handle the case where rtp_parse_mp4_au define
- one au_header */
- av_new_packet(pkt, data->au_headers[0].size);
+ if (len < data->au_headers[0].size)
+ return AVERROR_INVALIDDATA;
+ if ((ret = av_new_packet(pkt, data->au_headers[0].size)) < 0)
+ return ret;
 memcpy(pkt->data, buf, data->au_headers[0].size);
-
+ len -= data->au_headers[0].size;
+ buf += data->au_headers[0].size;
 pkt->stream_index = st->index;
+
+ if (len > 0 && data->nb_au_headers > 1) {
+ data->buf_size = FFMIN(len, sizeof(data->buf));
+ memcpy(data->buf, buf, data->buf_size);
+ data->cur_au_index = 1;
+ data->buf_pos = 0;
+ return 1;
+ }
+
 return 0;
 }
 
@@ -220,10 +253,20 @@
 return 0;
 }
 
+static av_cold int init_video(AVFormatContext *s, int st_index,
+ PayloadContext *data)
+{
+ if (st_index < 0)
+ return 0;
+ s->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL;
+ return 0;
+}
+
 RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler = {
 .enc_name = "MP4V-ES",
 .codec_type = AVMEDIA_TYPE_VIDEO,
 .codec_id = AV_CODEC_ID_MPEG4,
+ .init = init_video,
 .parse_sdp_a_line = parse_sdp_line,
 };

libav-v10.1.tar.bz2/libavformat/rtpdec_mpegts.c Added

@@ -0,0 +1,108 @@
+/*
+ * RTP MPEG2TS depacketizer
+ * Copyright (c) 2003 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/attributes.h"
+#include "mpegts.h"
+#include "rtpdec_formats.h"
+
+struct PayloadContext {
+ struct MpegTSContext *ts;
+ int read_buf_index;
+ int read_buf_size;
+ uint8_t buf[RTP_MAX_PACKET_LENGTH];
+};
+
+static PayloadContext *mpegts_new_context(void)
+{
+ return av_mallocz(sizeof(PayloadContext));
+}
+
+static void mpegts_free_context(PayloadContext *data)
+{
+ if (!data)
+ return;
+ if (data->ts)
+ ff_mpegts_parse_close(data->ts);
+ av_free(data);
+}
+
+static av_cold int mpegts_init(AVFormatContext *ctx, int st_index,
+ PayloadContext *data)
+{
+ data->ts = ff_mpegts_parse_open(ctx);
+ if (!data->ts)
+ return AVERROR(ENOMEM);
+ return 0;
+}
+
+static int mpegts_handle_packet(AVFormatContext *ctx, PayloadContext *data,
+ AVStream *st, AVPacket *pkt, uint32_t *timestamp,
+ const uint8_t *buf, int len, uint16_t seq,
+ int flags)
+{
+ int ret;
+
+ // We don't want to use the RTP timestamps at all. If the mpegts demuxer
+ // doesn't set any pts/dts, the generic rtpdec code shouldn't try to
+ // fill it in either, since the mpegts and RTP timestamps are in totally
+ // different ranges.
+ *timestamp = RTP_NOTS_VALUE;
+
+ if (!data->ts)
+ return AVERROR(EINVAL);
+
+ if (!buf) {
+ if (data->read_buf_index >= data->read_buf_size)
+ return AVERROR(EAGAIN);
+ ret = ff_mpegts_parse_packet(data->ts, pkt, data->buf + data->read_buf_index,
+ data->read_buf_size - data->read_buf_index);
+ if (ret < 0)
+ return AVERROR(EAGAIN);
+ data->read_buf_index += ret;
+ if (data->read_buf_index < data->read_buf_size)
+ return 1;
+ else
+ return 0;
+ }
+
+ ret = ff_mpegts_parse_packet(data->ts, pkt, buf, len);
+ /* The only error that can be returned from ff_mpegts_parse_packet
+ * is "no more data to return from the provided buffer", so return
+ * AVERROR(EAGAIN) for all errors */
+ if (ret < 0)
+ return AVERROR(EAGAIN);
+ if (ret < len) {
+ data->read_buf_size = FFMIN(len - ret, sizeof(data->buf));
+ memcpy(data->buf, buf + ret, data->read_buf_size);
+ data->read_buf_index = 0;
+ return 1;
+ }
+ return 0;
+}
+
+RTPDynamicProtocolHandler ff_mpegts_dynamic_handler = {
+ .codec_type = AVMEDIA_TYPE_DATA,
+ .parse_packet = mpegts_handle_packet,
+ .alloc = mpegts_new_context,
+ .init = mpegts_init,
+ .free = mpegts_free_context,
+ .static_payload_id = 33,
+};

libav-v9.6.tar.bz2/libavformat/rtpdec_qt.c -> libav-v10.1.tar.bz2/libavformat/rtpdec_qt.c Changed

@@ -97,8 +97,8 @@
 is_start = get_bits1(&gb);
 is_finish = get_bits1(&gb);
 if (!is_start || !is_finish) {
- av_log_missing_feature(s, "RTP-X-QT with payload description "
- "split over several packets", 1);
+ avpriv_request_sample(s, "RTP-X-QT with payload description "
+ "split over several packets");
 return AVERROR_PATCHWELCOME;
 }
 skip_bits(&gb, 12); // reserved
@@ -161,7 +161,7 @@
 avio_seek(&pb, 4, SEEK_SET);
 
 if (has_packet_info) {
- av_log_missing_feature(s, "RTP-X-QT with packet specific info", 1);
+ avpriv_request_sample(s, "RTP-X-QT with packet-specific info");
 return AVERROR_PATCHWELCOME;
 }
 
@@ -172,26 +172,32 @@
 switch (packing_scheme) {
 case 3: /* one data packet spread over 1 or multiple RTP packets */
 if (qt->pkt.size > 0 && qt->timestamp == *timestamp) {
- qt->pkt.data = av_realloc(qt->pkt.data, qt->pkt.size + alen +
- FF_INPUT_BUFFER_PADDING_SIZE);
+ int err;
+ if ((err = av_reallocp(&qt->pkt.data, qt->pkt.size + alen +
+ FF_INPUT_BUFFER_PADDING_SIZE)) < 0) {
+ qt->pkt.size = 0;
+ return err;
+ }
 } else {
 av_freep(&qt->pkt.data);
 av_init_packet(&qt->pkt);
- qt->pkt.data = av_malloc(alen + FF_INPUT_BUFFER_PADDING_SIZE);
+ qt->pkt.data = av_realloc(NULL, alen + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!qt->pkt.data)
+ return AVERROR(ENOMEM);
 qt->pkt.size = 0;
 qt->timestamp = *timestamp;
 }
- if (!qt->pkt.data)
- return AVERROR(ENOMEM);
 memcpy(qt->pkt.data + qt->pkt.size, buf + avio_tell(&pb), alen);
 qt->pkt.size += alen;
 if (has_marker_bit) {
- *pkt = qt->pkt;
+ int ret = av_packet_from_data(pkt, qt->pkt.data, qt->pkt.size);
+ if (ret < 0)
+ return ret;
+
 qt->pkt.size = 0;
 qt->pkt.data = NULL;
 pkt->flags = flags & RTP_FLAG_KEY ? AV_PKT_FLAG_KEY : 0;
 pkt->stream_index = st->index;
- pkt->destruct = av_destruct_packet;
 memset(pkt->data + pkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
 return 0;
 }
@@ -209,7 +215,7 @@
 pkt->stream_index = st->index;
 if (qt->remaining > 0) {
 av_freep(&qt->pkt.data);
- qt->pkt.data = av_malloc(qt->remaining * qt->bytes_per_frame);
+ qt->pkt.data = av_realloc(NULL, qt->remaining * qt->bytes_per_frame);
 if (!qt->pkt.data) {
 av_free_packet(pkt);
 return AVERROR(ENOMEM);
@@ -224,7 +230,7 @@
 return 0;
 
 default: /* unimplemented */
- av_log_missing_feature(NULL, "RTP-X-QT with packing scheme 2", 1);
+ avpriv_request_sample(NULL, "RTP-X-QT with packing scheme 2");
 return AVERROR_PATCHWELCOME;
 }
 }

libav-v9.6.tar.bz2/libavformat/rtpdec_vp8.c -> libav-v10.1.tar.bz2/libavformat/rtpdec_vp8.c Changed

@@ -35,11 +35,21 @@
 AVIOContext *data;
 uint32_t timestamp;
 int is_keyframe;
+ /* If sequence_ok is set, we keep returning data (even if we might have
+ * lost some data, but we haven't lost any too critical data that would
+ * cause the decoder to desynchronize and output random garbage).
+ */
 int sequence_ok;
 int first_part_size;
 uint16_t prev_seq;
 int prev_pictureid;
 int broken_frame;
+ /* If sequence_dirty is set, we have lost some data (critical or
+ * non-critical) and decoding will have some sort of artefacts, and
+ * we thus should request a new keyframe.
+ */
+ int sequence_dirty;
+ int got_keyframe;
 };
 
 static void vp8_free_buffer(PayloadContext *vp8)
@@ -70,15 +80,18 @@
 int extended_bits, part_id;
 int pictureid_present = 0, tl0picidx_present = 0, tid_present = 0,
 keyidx_present = 0;
- int pictureid = -1, pictureid_mask;
+ int pictureid = -1, pictureid_mask = 0;
 int returned_old_frame = 0;
- uint32_t old_timestamp;
+ uint32_t old_timestamp = 0;
 
 if (!buf) {
 if (vp8->data) {
 int ret = ff_rtp_finalize_packet(pkt, &vp8->data, st->index);
 if (ret < 0)
 return ret;
+ *timestamp = vp8->timestamp;
+ if (vp8->sequence_dirty)
+ pkt->flags |= AV_PKT_FLAG_CORRUPT;
 return 0;
 }
 return AVERROR(EAGAIN);
@@ -140,11 +153,15 @@
 vp8_free_buffer(vp8);
 // Keyframe, decoding ok again
 vp8->sequence_ok = 1;
+ vp8->sequence_dirty = 0;
+ vp8->got_keyframe = 1;
 } else {
 int can_continue = vp8->data && !vp8->is_keyframe &&
 avio_tell(vp8->data) >= vp8->first_part_size;
 if (!vp8->sequence_ok)
 return AVERROR(EAGAIN);
+ if (!vp8->got_keyframe)
+ return vp8_broken_sequence(ctx, vp8, "Keyframe missing\n");
 if (pictureid >= 0) {
 if (pictureid != ((vp8->prev_pictureid + 1) & pictureid_mask)) {
 return vp8_broken_sequence(ctx, vp8,
@@ -178,11 +195,12 @@
 }
 }
 if (vp8->data) {
+ vp8->sequence_dirty = 1;
 if (avio_tell(vp8->data) >= vp8->first_part_size) {
 int ret = ff_rtp_finalize_packet(pkt, &vp8->data, st->index);
 if (ret < 0)
 return ret;
- pkt->size = vp8->first_part_size;
+ pkt->flags |= AV_PKT_FLAG_CORRUPT;
 returned_old_frame = 1;
 old_timestamp = vp8->timestamp;
 } else {
@@ -206,11 +224,8 @@
 
 if (vp8->timestamp != *timestamp) {
 // Missed the start of the new frame, sequence broken
- vp8->sequence_ok = 0;
- av_log(ctx, AV_LOG_WARNING,
- "Received no start marker; dropping frame\n");
- vp8_free_buffer(vp8);
- return AVERROR(EAGAIN);
+ return vp8_broken_sequence(ctx, vp8,
+ "Received no start marker; dropping frame\n");
 }
 
 if (seq != expected_seq) {
@@ -219,6 +234,7 @@
 "Missed part of a keyframe, sequence broken\n");
 } else if (vp8->data && avio_tell(vp8->data) >= vp8->first_part_size) {
 vp8->broken_frame = 1;
+ vp8->sequence_dirty = 1;
 } else {
 return vp8_broken_sequence(ctx, vp8,
 "Missed part of the first partition, sequence broken\n");
@@ -230,19 +246,21 @@
 return vp8_broken_sequence(ctx, vp8, "Received no start marker\n");
 
 vp8->prev_seq = seq;
- avio_write(vp8->data, buf, len);
+ if (!vp8->broken_frame)
+ avio_write(vp8->data, buf, len);
+
+ if (returned_old_frame) {
+ *timestamp = old_timestamp;
+ return end_packet ? 1 : 0;
+ }
 
 if (end_packet) {
 int ret;
- if (returned_old_frame) {
- *timestamp = old_timestamp;
- return 1;
- }
 ret = ff_rtp_finalize_packet(pkt, &vp8->data, st->index);
 if (ret < 0)
 return ret;
- if (vp8->broken_frame)
- pkt->size = vp8->first_part_size;
+ if (vp8->sequence_dirty)
+ pkt->flags |= AV_PKT_FLAG_CORRUPT;
 return 0;
 }
 
@@ -251,7 +269,11 @@
 
 static PayloadContext *vp8_new_context(void)
 {
- return av_mallocz(sizeof(PayloadContext));
+ PayloadContext *vp8 = av_mallocz(sizeof(PayloadContext));
+ if (!vp8)
+ return NULL;
+ vp8->sequence_ok = 1;
+ return vp8;
 }
 
 static void vp8_free_context(PayloadContext *vp8)
@@ -260,6 +282,11 @@
 av_free(vp8);
 }
 
+static int vp8_need_keyframe(PayloadContext *vp8)
+{
+ return vp8->sequence_dirty || !vp8->sequence_ok;
+}
+
 RTPDynamicProtocolHandler ff_vp8_dynamic_handler = {
 .enc_name = "VP8",
 .codec_type = AVMEDIA_TYPE_VIDEO,
@@ -267,4 +294,5 @@
 .alloc = vp8_new_context,
 .free = vp8_free_context,
 .parse_packet = vp8_handle_packet,
+ .need_keyframe = vp8_need_keyframe,
 };

libav-v9.6.tar.bz2/libavformat/rtpdec_xiph.c -> libav-v10.1.tar.bz2/libavformat/rtpdec_xiph.c Changed

@@ -27,6 +27,7 @@
 * @author Josh Allmann <joshua.allmann@gmail.com>
 */
 
+#include "libavutil/attributes.h"
 #include "libavutil/avstring.h"
 #include "libavutil/base64.h"
 #include "libavcodec/bytestream.h"
@@ -70,6 +71,16 @@
 av_free(data);
 }
 
+static av_cold int xiph_vorbis_init(AVFormatContext *ctx, int st_index,
+ PayloadContext *data)
+{
+ if (st_index < 0)
+ return 0;
+ ctx->streams[st_index]->need_parsing = AVSTREAM_PARSE_HEADERS;
+ return 0;
+}
+
+
 static int xiph_handle_packet(AVFormatContext *ctx, PayloadContext *data,
 AVStream *st, AVPacket *pkt, uint32_t *timestamp,
 const uint8_t *buf, int len, uint16_t seq,
@@ -392,6 +403,7 @@
 .enc_name = "vorbis",
 .codec_type = AVMEDIA_TYPE_AUDIO,
 .codec_id = AV_CODEC_ID_VORBIS,
+ .init = xiph_vorbis_init,
 .parse_sdp_a_line = xiph_parse_sdp_line,
 .alloc = xiph_new_context,
 .free = xiph_free_context,

libav-v9.6.tar.bz2/libavformat/rtpenc.c -> libav-v10.1.tar.bz2/libavformat/rtpenc.c Changed

@@ -28,13 +28,12 @@
 
 #include "rtpenc.h"
 
-//#define DEBUG
-
 static const AVOption options[] = {
 FF_RTP_FLAG_OPTS(RTPMuxContext, flags),
 { "payload_type", "Specify RTP payload type", offsetof(RTPMuxContext, payload_type), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 127, AV_OPT_FLAG_ENCODING_PARAM },
 { "ssrc", "Stream identifier", offsetof(RTPMuxContext, ssrc), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
 { "cname", "CNAME to include in RTCP SR packets", offsetof(RTPMuxContext, cname), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },
+ { "seq", "Starting sequence number", offsetof(RTPMuxContext, seq), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 65535, AV_OPT_FLAG_ENCODING_PARAM },
 { NULL },
 };
 
@@ -124,6 +123,13 @@
 /* Round the NTP time to whole milliseconds. */
 s->first_rtcp_ntp_time = (s1->start_time_realtime / 1000) * 1000 +
 NTP_OFFSET_US;
+ // Pick a random sequence start number, but in the lower end of the
+ // available range, so that any wraparound doesn't happen immediately.
+ // (Immediate wraparound would be an issue for SRTP.)
+ if (s->seq < 0)
+ s->seq = av_get_random_seed() & 0x0fff;
+ else
+ s->seq &= 0xffff; // Use the given parameter, wrapped to the right interval
 
 if (s1->packet_size) {
 if (s1->pb->max_packet_size)
@@ -253,7 +259,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;
@@ -263,12 +269,11 @@
 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);
- avio_wb32(s1->pb, ntp_time / 1000000);
- avio_wb32(s1->pb, ((ntp_time % 1000000) << 32) / 1000000);
+ avio_wb64(s1->pb, NTP_TO_RTP_FORMAT(ntp_time));
 avio_wb32(s1->pb, rtp_ts);
 avio_wb32(s1->pb, s->packet_count);
 avio_wb32(s1->pb, s->octet_count);
@@ -288,6 +293,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);
 }
 
@@ -300,7 +312,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);
@@ -309,7 +321,7 @@
 avio_write(s1->pb, buf1, len);
 avio_flush(s1->pb);
 
- s->seq++;
+ s->seq = (s->seq + 1) & 0xffff;
 s->octet_count += len;
 s->packet_count++;
 }
@@ -486,7 +498,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;
 }
@@ -582,6 +594,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;

libav-v9.6.tar.bz2/libavformat/rtpenc.h -> libav-v10.1.tar.bz2/libavformat/rtpenc.h Changed

@@ -31,18 +31,16 @@
     int payload_type;
     uint32_t ssrc;
     const char *cname;
-    uint16_t seq;
+    int seq;
     uint32_t timestamp;
     uint32_t base_timestamp;
     uint32_t cur_timestamp;
     int max_payload_size;
     int num_frames;
 
-    /* rtcp sender statistics receive */
+    /* rtcp sender statistics */
     int64_t last_rtcp_ntp_time;
     int64_t first_rtcp_ntp_time;
-
-    /* rtcp sender statistics */
     unsigned int packet_count;
     unsigned int octet_count;
     unsigned int last_octet_count;
@@ -70,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);

libav-v9.6.tar.bz2/libavformat/rtpenc_chain.c -> libav-v10.1.tar.bz2/libavformat/rtpenc_chain.c Changed

libav-v9.6.tar.bz2/libavformat/rtpenc_h264.c -> libav-v10.1.tar.bz2/libavformat/rtpenc_h264.c Changed

libav-v9.6.tar.bz2/libavformat/rtpenc_mpv.c -> libav-v10.1.tar.bz2/libavformat/rtpenc_mpv.c Changed

libav-v9.6.tar.bz2/libavformat/rtpproto.c -> libav-v10.1.tar.bz2/libavformat/rtpproto.c Changed

@@ -28,7 +28,8 @@
 #include "libavutil/avstring.h"
 #include "avformat.h"
 #include "avio_internal.h"
-#include "rtpdec.h"
+#include "rtp.h"
+#include "rtpproto.h"
 #include "url.h"
 
 #include <stdarg.h>
@@ -42,7 +43,11 @@
 
 typedef struct RTPContext {
 URLContext *rtp_hd, *rtcp_hd;
- int rtp_fd, rtcp_fd;
+ int rtp_fd, rtcp_fd, nb_ssm_include_addrs, nb_ssm_exclude_addrs;
+ struct sockaddr_storage **ssm_include_addrs, **ssm_exclude_addrs;
+ int write_to_source;
+ struct sockaddr_storage last_rtp_source, last_rtcp_source;
+ socklen_t last_rtp_source_len, last_rtcp_source_len;
 } RTPContext;
 
 /**
@@ -59,22 +64,109 @@
 {
 RTPContext *s = h->priv_data;
 char hostname[256];
- int port;
+ int port, rtcp_port;
+ const char *p;
 
 char buf[1024];
 char path[1024];
 
 av_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port,
 path, sizeof(path), uri);
+ rtcp_port = port + 1;
+
+ p = strchr(uri, '?');
+ if (p) {
+ if (av_find_info_tag(buf, sizeof(buf), "rtcpport", p)) {
+ rtcp_port = strtol(buf, NULL, 10);
+ }
+ }
 
 ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, port, "%s", path);
 ff_udp_set_remote_url(s->rtp_hd, buf);
 
- ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, port + 1, "%s", path);
+ ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, rtcp_port, "%s", path);
 ff_udp_set_remote_url(s->rtcp_hd, buf);
 return 0;
 }
 
+static struct addrinfo* rtp_resolve_host(const char *hostname, int port,
+ int type, int family, int flags)
+{
+ struct addrinfo hints = { 0 }, *res = 0;
+ int error;
+ char service[16];
+
+ snprintf(service, sizeof(service), "%d", port);
+ hints.ai_socktype = type;
+ hints.ai_family = family;
+ hints.ai_flags = flags;
+ if ((error = getaddrinfo(hostname, service, &hints, &res))) {
+ res = NULL;
+ av_log(NULL, AV_LOG_ERROR, "rtp_resolve_host: %s\n", gai_strerror(error));
+ }
+
+ return res;
+}
+
+static int compare_addr(const struct sockaddr_storage *a,
+ const struct sockaddr_storage *b)
+{
+ if (a->ss_family != b->ss_family)
+ return 1;
+ if (a->ss_family == AF_INET) {
+ return (((const struct sockaddr_in *)a)->sin_addr.s_addr !=
+ ((const struct sockaddr_in *)b)->sin_addr.s_addr);
+ }
+
+#if HAVE_STRUCT_SOCKADDR_IN6
+ if (a->ss_family == AF_INET6) {
+ const uint8_t *s6_addr_a = ((const struct sockaddr_in6 *)a)->sin6_addr.s6_addr;
+ const uint8_t *s6_addr_b = ((const struct sockaddr_in6 *)b)->sin6_addr.s6_addr;
+ return memcmp(s6_addr_a, s6_addr_b, 16);
+ }
+#endif
+ return 1;
+}
+
+static int get_port(const struct sockaddr_storage *ss)
+{
+ if (ss->ss_family == AF_INET)
+ return ntohs(((const struct sockaddr_in *)ss)->sin_port);
+#if HAVE_STRUCT_SOCKADDR_IN6
+ if (ss->ss_family == AF_INET6)
+ return ntohs(((const struct sockaddr_in6 *)ss)->sin6_port);
+#endif
+ return 0;
+}
+
+static void set_port(struct sockaddr_storage *ss, int port)
+{
+ if (ss->ss_family == AF_INET)
+ ((struct sockaddr_in *)ss)->sin_port = htons(port);
+#if HAVE_STRUCT_SOCKADDR_IN6
+ else if (ss->ss_family == AF_INET6)
+ ((struct sockaddr_in6 *)ss)->sin6_port = htons(port);
+#endif
+}
+
+static int rtp_check_source_lists(RTPContext *s, struct sockaddr_storage *source_addr_ptr)
+{
+ int i;
+ if (s->nb_ssm_exclude_addrs) {
+ for (i = 0; i < s->nb_ssm_exclude_addrs; i++) {
+ if (!compare_addr(source_addr_ptr, s->ssm_exclude_addrs[i]))
+ return 1;
+ }
+ }
+ if (s->nb_ssm_include_addrs) {
+ for (i = 0; i < s->nb_ssm_include_addrs; i++) {
+ if (!compare_addr(source_addr_ptr, s->ssm_include_addrs[i]))
+ return 0;
+ }
+ return 1;
+ }
+ return 0;
+}
 
 /**
 * add option to url of the form:
@@ -99,7 +191,9 @@
 static void build_udp_url(char *buf, int buf_size,
 const char *hostname, int port,
 int local_port, int ttl,
- int max_packet_size, int connect)
+ int max_packet_size, int connect,
+ const char *include_sources,
+ const char *exclude_sources)
 {
 ff_url_join(buf, buf_size, "udp", NULL, hostname, port, NULL);
 if (local_port >= 0)
@@ -110,6 +204,50 @@
 url_add_option(buf, buf_size, "pkt_size=%d", max_packet_size);
 if (connect)
 url_add_option(buf, buf_size, "connect=1");
+ if (include_sources && include_sources[0])
+ url_add_option(buf, buf_size, "sources=%s", include_sources);
+ if (exclude_sources && exclude_sources[0])
+ url_add_option(buf, buf_size, "block=%s", exclude_sources);
+}
+
+static void rtp_parse_addr_list(URLContext *h, char *buf,
+ struct sockaddr_storage ***address_list_ptr,
+ int *address_list_size_ptr)
+{
+ struct addrinfo *ai = NULL;
+ struct sockaddr_storage *source_addr;
+ char tmp = '\0', *p = buf, *next;
+
+ /* Resolve all of the IPs */
+
+ while (p && p[0]) {
+ next = strchr(p, ',');
+
+ if (next) {
+ tmp = *next;
+ *next = '\0';
+ }
+
+ ai = rtp_resolve_host(p, 0, SOCK_DGRAM, AF_UNSPEC, 0);
+ if (ai) {
+ source_addr = av_mallocz(sizeof(struct sockaddr_storage));
+ if (!source_addr)
+ break;
+
+ memcpy(source_addr, ai->ai_addr, ai->ai_addrlen);
+ freeaddrinfo(ai);
+ dynarray_add(address_list_ptr, address_list_size_ptr, source_addr);
+ } else {
+ av_log(h, AV_LOG_WARNING, "Unable to resolve %s\n", p);
+ }
+
+ if (next) {
+ *next = tmp;
+ p = next + 1;
+ } else {
+ p = NULL;
+ }
+ }
 }
 
 /**
@@ -120,6 +258,9 @@
 * 'localrtcpport=n' : set the local rtcp port to n
 * 'pkt_size=n' : set max packet size
 * 'connect=0/1' : do a connect() on the UDP socket
+ * 'sources=ip[,ip]' : list allowed source IP addresses
+ * 'block=ip[,ip]' : list disallowed source IP addresses
+ * 'write_to_source=0/1' : send packets to the source address of the latest received packet
 * deprecated option:
 * 'localport=n' : set the local port to n
 *
@@ -135,7 +276,7 @@
 int rtp_port, rtcp_port,
 ttl, connect,
 local_rtp_port, local_rtcp_port, max_packet_size;
- char hostname[256];
+ char hostname[256], include_sources[1024] = "", exclude_sources[1024] = "";
 char buf[1024];
 char path[1024];
 const char *p;
@@ -173,11 +314,22 @@
 if (av_find_info_tag(buf, sizeof(buf), "connect", p)) {
 connect = strtol(buf, NULL, 10);
 }
+ if (av_find_info_tag(buf, sizeof(buf), "write_to_source", p)) {
+ s->write_to_source = strtol(buf, NULL, 10);
+ }
+ if (av_find_info_tag(buf, sizeof(buf), "sources", p)) {
+ av_strlcpy(include_sources, buf, sizeof(include_sources));
+ rtp_parse_addr_list(h, buf, &s->ssm_include_addrs, &s->nb_ssm_include_addrs);
+ }
+ if (av_find_info_tag(buf, sizeof(buf), "block", p)) {
+ av_strlcpy(exclude_sources, buf, sizeof(exclude_sources));
+ rtp_parse_addr_list(h, buf, &s->ssm_exclude_addrs, &s->nb_ssm_exclude_addrs);
+ }
 }
 
 build_udp_url(buf, sizeof(buf),
 hostname, rtp_port, local_rtp_port, ttl, max_packet_size,
- connect);
+ connect, include_sources, exclude_sources);
 if (ffurl_open(&s->rtp_hd, buf, flags, &h->interrupt_callback, NULL) < 0)
 goto fail;
 if (local_rtp_port>=0 && local_rtcp_port<0)
@@ -185,7 +337,7 @@
 
 build_udp_url(buf, sizeof(buf),
 hostname, rtcp_port, local_rtcp_port, ttl, max_packet_size,
- connect);
+ connect, include_sources, exclude_sources);
 if (ffurl_open(&s->rtcp_hd, buf, flags, &h->interrupt_callback, NULL) < 0)
 goto fail;
 
@@ -209,48 +361,41 @@
 static int rtp_read(URLContext *h, uint8_t *buf, int size)
 {
 RTPContext *s = h->priv_data;
- struct sockaddr_storage from;
- socklen_t from_len;
- int len, n;
+ int len, n, i;
 struct pollfd p[2] = {{s->rtp_fd, POLLIN, 0}, {s->rtcp_fd, POLLIN, 0}};
+ int poll_delay = h->flags & AVIO_FLAG_NONBLOCK ? 0 : 100;
+ struct sockaddr_storage *addrs[2] = { &s->last_rtp_source, &s->last_rtcp_source };
+ socklen_t *addr_lens[2] = { &s->last_rtp_source_len, &s->last_rtcp_source_len };
 
 for(;;) {
 if (ff_check_interrupt(&h->interrupt_callback))
 return AVERROR_EXIT;
- /* build fdset to listen to RTP and RTCP packets */
- n = poll(p, 2, 100);
+ n = poll(p, 2, poll_delay);
 if (n > 0) {
- /* first try RTCP */
- if (p[1].revents & POLLIN) {
- from_len = sizeof(from);
- len = recvfrom (s->rtcp_fd, buf, size, 0,
- (struct sockaddr *)&from, &from_len);
- if (len < 0) {
- if (ff_neterrno() == AVERROR(EAGAIN) ||
- ff_neterrno() == AVERROR(EINTR))
- continue;
- return AVERROR(EIO);
- }
- break;
- }
- /* then RTP */
- if (p[0].revents & POLLIN) {
- from_len = sizeof(from);
- len = recvfrom (s->rtp_fd, buf, size, 0,
- (struct sockaddr *)&from, &from_len);
+ /* first try RTCP, then RTP */
+ for (i = 1; i >= 0; i--) {
+ if (!(p[i].revents & POLLIN))
+ continue;
+ *addr_lens[i] = sizeof(*addrs[i]);
+ len = recvfrom(p[i].fd, buf, size, 0,
+ (struct sockaddr *)addrs[i], addr_lens[i]);
 if (len < 0) {
 if (ff_neterrno() == AVERROR(EAGAIN) ||
 ff_neterrno() == AVERROR(EINTR))
 continue;
 return AVERROR(EIO);
 }
- break;
+ if (rtp_check_source_lists(s, addrs[i]))
+ continue;
+ return len;
 }
 } else if (n < 0) {
 if (ff_neterrno() == AVERROR(EINTR))
 continue;
 return AVERROR(EIO);
 }
+ if (h->flags & AVIO_FLAG_NONBLOCK)
+ return AVERROR(EAGAIN);
 }
 return len;
 }
@@ -261,6 +406,60 @@
 int ret;
 URLContext *hd;
 
+ if (size < 2)
+ return AVERROR(EINVAL);
+
+ if (s->write_to_source) {
+ int fd;
+ struct sockaddr_storage *source, temp_source;
+ socklen_t *source_len, temp_len;
+ if (!s->last_rtp_source.ss_family && !s->last_rtcp_source.ss_family) {
+ av_log(h, AV_LOG_ERROR,
+ "Unable to send packet to source, no packets received yet\n");
+ // Intentionally not returning an error here
+ return size;
+ }
+
+ if (RTP_PT_IS_RTCP(buf[1])) {
+ fd = s->rtcp_fd;
+ source = &s->last_rtcp_source;
+ source_len = &s->last_rtcp_source_len;
+ } else {
+ fd = s->rtp_fd;
+ source = &s->last_rtp_source;
+ source_len = &s->last_rtp_source_len;
+ }
+ if (!source->ss_family) {
+ source = &temp_source;
+ source_len = &temp_len;
+ if (RTP_PT_IS_RTCP(buf[1])) {
+ temp_source = s->last_rtp_source;
+ temp_len = s->last_rtp_source_len;
+ set_port(source, get_port(source) + 1);
+ av_log(h, AV_LOG_INFO,
+ "Not received any RTCP packets yet, inferring peer port "
+ "from the RTP port\n");
+ } else {
+ temp_source = s->last_rtcp_source;
+ temp_len = s->last_rtcp_source_len;
+ set_port(source, get_port(source) - 1);
+ av_log(h, AV_LOG_INFO,
+ "Not received any RTP packets yet, inferring peer port "
+ "from the RTCP port\n");
+ }
+ }
+
+ if (!(h->flags & AVIO_FLAG_NONBLOCK)) {
+ ret = ff_network_wait_fd(fd, 1);
+ if (ret < 0)
+ return ret;
+ }
+ ret = sendto(fd, buf, size, 0, (struct sockaddr *) source,
+ *source_len);
+
+ return ret < 0 ? ff_neterrno() : ret;
+ }
+
 if (RTP_PT_IS_RTCP(buf[1])) {
 /* RTCP payload type */
 hd = s->rtcp_hd;
@@ -276,6 +475,14 @@
 static int rtp_close(URLContext *h)
 {
 RTPContext *s = h->priv_data;
+ int i;
+
+ for (i = 0; i < s->nb_ssm_include_addrs; i++)
+ av_free(s->ssm_include_addrs[i]);
+ av_freep(&s->ssm_include_addrs);
+ for (i = 0; i < s->nb_ssm_exclude_addrs; i++)
+ av_free(s->ssm_exclude_addrs[i]);
+ av_freep(&s->ssm_exclude_addrs);
 
 ffurl_close(s->rtp_hd);
 ffurl_close(s->rtcp_hd);

libav-v10.1.tar.bz2/libavformat/rtpproto.h Added

@@ -0,0 +1,31 @@
+/*
+ * RTP network protocol
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_RTPPROTO_H
+#define AVFORMAT_RTPPROTO_H
+
+#include "url.h"
+
+int ff_rtp_set_remote_url(URLContext *h, const char *uri);
+
+int ff_rtp_get_local_rtp_port(URLContext *h);
+int ff_rtp_get_local_rtcp_port(URLContext *h);
+
+#endif /* AVFORMAT_RTPPROTO_H */

libav-v9.6.tar.bz2/libavformat/rtsp.c -> libav-v10.1.tar.bz2/libavformat/rtsp.c Changed

@@ -41,6 +41,7 @@
 #include "rtsp.h"
 
 #include "rtpdec.h"
+#include "rtpproto.h"
 #include "rdt.h"
 #include "rtpdec_formats.h"
 #include "rtpenc_chain.h"
@@ -48,8 +49,6 @@
 #include "rtpenc.h"
 #include "mpegts.h"
 
-//#define DEBUG
-
 /* Timeout values for socket poll, in ms,
 * and read_packet(), in seconds */
 #define POLL_TIMEOUT_MS 100
@@ -65,8 +64,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" }, \
- { "listen", "Wait for incoming connections", 0, AV_OPT_TYPE_CONST, {.i64 = RTSP_FLAG_LISTEN}, 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" }, \
@@ -86,6 +84,7 @@
 { "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 },
@@ -97,6 +96,7 @@
 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"),
 RTSP_REORDERING_OPTS(),
 { NULL },
@@ -180,7 +180,8 @@
 {
 if (!handler)
 return;
- codec->codec_id = handler->codec_id;
+ if (codec)
+ codec->codec_id = handler->codec_id;
 rtsp_st->dynamic_handler = handler;
 if (handler->alloc) {
 rtsp_st->dynamic_protocol_context = handler->alloc();
@@ -200,8 +201,7 @@
 AVCodec *c;
 const char *c_name;
 
- /* Loop into AVRtpDynamicPayloadTypes[] and AVRtpPayloadTypes[] and
- * see if we can handle this kind of payload.
+ /* See if we can handle this kind of payload.
 * The space should normally not be there but some Real streams or
 * particular servers ("RealServer Version 6.1.3.970", see issue 1658)
 * have a trailing space. */
@@ -209,7 +209,6 @@
 if (payload_type < RTP_PT_PRIVATE) {
 /* We are in a standard case
 * (from http://www.iana.org/assignments/rtp-parameters). */
- /* search into AVRtpPayloadTypes[] */
 codec->codec_id = ff_rtp_codec_id(buf, codec->codec_type);
 }
 
@@ -245,10 +244,6 @@
 i = atoi(buf);
 if (i > 0)
 codec->channels = i;
- // TODO: there is a bug here; if it is a mono stream, and
- // less than 22000Hz, faad upconverts to stereo and twice
- // the frequency. No problem, but the sample rate is being
- // set here by the sdp line. Patch on its way. (rdm)
 }
 av_log(s, AV_LOG_DEBUG, "audio samplerate set to: %i\n",
 codec->sample_rate);
@@ -293,8 +288,27 @@
 struct sockaddr_storage default_ip;
 int default_ttl;
 int skip_media; ///< set if an unknown m= line occurs
+ int nb_default_include_source_addrs; /**< Number of source-specific multicast include source IP address (from SDP content) */
+ struct RTSPSource **default_include_source_addrs; /**< Source-specific multicast include source IP address (from SDP content) */
+ int nb_default_exclude_source_addrs; /**< Number of source-specific multicast exclude source IP address (from SDP content) */
+ struct RTSPSource **default_exclude_source_addrs; /**< Source-specific multicast exclude source IP address (from SDP content) */
 } SDPParseState;
 
+static void copy_default_source_addrs(struct RTSPSource **addrs, int count,
+ struct RTSPSource ***dest, int *dest_count)
+{
+ RTSPSource *rtsp_src, *rtsp_src2;
+ int i;
+ for (i = 0; i < count; i++) {
+ rtsp_src = addrs[i];
+ rtsp_src2 = av_malloc(sizeof(*rtsp_src2));
+ if (!rtsp_src2)
+ continue;
+ memcpy(rtsp_src2, rtsp_src, sizeof(*rtsp_src));
+ dynarray_add(dest, dest_count, rtsp_src2);
+ }
+}
+
 static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
 int letter, const char *buf)
 {
@@ -305,6 +319,7 @@
 int payload_type, i;
 AVStream *st;
 RTSPStream *rtsp_st;
+ RTSPSource *rtsp_src;
 struct sockaddr_storage sdp_ip;
 int ttl;
 
@@ -373,12 +388,23 @@
 rtsp_st->sdp_ip = s1->default_ip;
 rtsp_st->sdp_ttl = s1->default_ttl;
 
+ copy_default_source_addrs(s1->default_include_source_addrs,
+ s1->nb_default_include_source_addrs,
+ &rtsp_st->include_source_addrs,
+ &rtsp_st->nb_include_source_addrs);
+ copy_default_source_addrs(s1->default_exclude_source_addrs,
+ s1->nb_default_exclude_source_addrs,
+ &rtsp_st->exclude_source_addrs,
+ &rtsp_st->nb_exclude_source_addrs);
+
 get_word(buf1, sizeof(buf1), &p); /* port */
 rtsp_st->sdp_port = atoi(buf1);
 
 get_word(buf1, sizeof(buf1), &p); /* protocol */
 if (!strcmp(buf1, "udp"))
 rt->transport = RTSP_TRANSPORT_RAW;
+ else if (strstr(buf1, "/AVPF") || strstr(buf1, "/SAVPF"))
+ rtsp_st->feedback = 1;
 
 /* XXX: handle list of formats */
 get_word(buf1, sizeof(buf1), &p); /* format list */
@@ -386,8 +412,17 @@
 
 if (!strcmp(ff_rtp_enc_name(rtsp_st->sdp_payload_type), "MP2T")) {
 /* no corresponding stream */
- if (rt->transport == RTSP_TRANSPORT_RAW && !rt->ts && CONFIG_RTPDEC)
- rt->ts = ff_mpegts_parse_open(s);
+ if (rt->transport == RTSP_TRANSPORT_RAW) {
+ if (!rt->ts && CONFIG_RTPDEC)
+ rt->ts = ff_mpegts_parse_open(s);
+ } else {
+ RTPDynamicProtocolHandler *handler;
+ handler = ff_rtp_handler_find_by_id(
+ rtsp_st->sdp_payload_type, AVMEDIA_TYPE_DATA);
+ init_rtp_handler(handler, rtsp_st, NULL);
+ if (handler && handler->init)
+ handler->init(s, -1, rtsp_st->dynamic_protocol_context);
+ }
 } else if (rt->server_type == RTSP_SERVER_WMS &&
 codec_type == AVMEDIA_TYPE_DATA) {
 /* RTX stream, a stream that carries all the other actual
@@ -483,6 +518,51 @@
 s->nb_streams > 0) {
 st = s->streams[s->nb_streams - 1];
 st->codec->sample_rate = atoi(p);
+ } else if (av_strstart(p, "crypto:", &p) && s->nb_streams > 0) {
+ // RFC 4568
+ rtsp_st = rt->rtsp_streams[rt->nb_rtsp_streams - 1];
+ get_word(buf1, sizeof(buf1), &p); // ignore tag
+ get_word(rtsp_st->crypto_suite, sizeof(rtsp_st->crypto_suite), &p);
+ p += strspn(p, SPACE_CHARS);
+ if (av_strstart(p, "inline:", &p))
+ get_word(rtsp_st->crypto_params, sizeof(rtsp_st->crypto_params), &p);
+ } else if (av_strstart(p, "source-filter:", &p)) {
+ int exclude = 0;
+ get_word(buf1, sizeof(buf1), &p);
+ if (strcmp(buf1, "incl") && strcmp(buf1, "excl"))
+ return;
+ exclude = !strcmp(buf1, "excl");
+
+ get_word(buf1, sizeof(buf1), &p);
+ if (strcmp(buf1, "IN") != 0)
+ return;
+ get_word(buf1, sizeof(buf1), &p);
+ if (strcmp(buf1, "IP4") && strcmp(buf1, "IP6") && strcmp(buf1, "*"))
+ return;
+ // not checking that the destination address actually matches or is wildcard
+ get_word(buf1, sizeof(buf1), &p);
+
+ while (*p != '\0') {
+ rtsp_src = av_mallocz(sizeof(*rtsp_src));
+ if (!rtsp_src)
+ return;
+ get_word(rtsp_src->addr, sizeof(rtsp_src->addr), &p);
+ if (exclude) {
+ if (s->nb_streams == 0) {
+ dynarray_add(&s1->default_exclude_source_addrs, &s1->nb_default_exclude_source_addrs, rtsp_src);
+ } else {
+ rtsp_st = rt->rtsp_streams[rt->nb_rtsp_streams - 1];
+ dynarray_add(&rtsp_st->exclude_source_addrs, &rtsp_st->nb_exclude_source_addrs, rtsp_src);
+ }
+ } else {
+ if (s->nb_streams == 0) {
+ dynarray_add(&s1->default_include_source_addrs, &s1->nb_default_include_source_addrs, rtsp_src);
+ } else {
+ rtsp_st = rt->rtsp_streams[rt->nb_rtsp_streams - 1];
+ dynarray_add(&rtsp_st->include_source_addrs, &rtsp_st->nb_include_source_addrs, rtsp_src);
+ }
+ }
+ }
 } else {
 if (rt->server_type == RTSP_SERVER_WMS)
 ff_wms_parse_sdp_a_line(s, p);
@@ -507,7 +587,7 @@
 {
 RTSPState *rt = s->priv_data;
 const char *p;
- int letter;
+ int letter, i;
 /* Some SDP lines, particularly for Realmedia or ASF RTSP streams,
 * contain long SDP lines containing complete ASF Headers (several
 * kB) or arrays of MDPR (RM stream descriptor) headers plus
@@ -544,13 +624,21 @@
 if (*p == '\n')
 p++;
 }
+
+ for (i = 0; i < s1->nb_default_include_source_addrs; i++)
+ av_free(s1->default_include_source_addrs[i]);
+ av_freep(&s1->default_include_source_addrs);
+ for (i = 0; i < s1->nb_default_exclude_source_addrs; i++)
+ av_free(s1->default_exclude_source_addrs[i]);
+ av_freep(&s1->default_exclude_source_addrs);
+
 rt->p = av_malloc(sizeof(struct pollfd)*2*(rt->nb_rtsp_streams+1));
 if (!rt->p) return AVERROR(ENOMEM);
 return 0;
 }
 #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;
@@ -565,6 +653,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 {
@@ -587,16 +677,23 @@
 void ff_rtsp_close_streams(AVFormatContext *s)
 {
 RTSPState *rt = s->priv_data;
- int i;
+ 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) {
 if (rtsp_st->dynamic_handler && rtsp_st->dynamic_protocol_context)
 rtsp_st->dynamic_handler->free(
 rtsp_st->dynamic_protocol_context);
+ for (j = 0; j < rtsp_st->nb_include_source_addrs; j++)
+ av_free(rtsp_st->include_source_addrs[j]);
+ av_freep(&rtsp_st->include_source_addrs);
+ for (j = 0; j < rtsp_st->nb_exclude_source_addrs; j++)
+ av_free(rtsp_st->exclude_source_addrs[j]);
+ av_freep(&rtsp_st->exclude_source_addrs);
+
 av_free(rtsp_st);
 }
 }
@@ -629,8 +726,8 @@
 s->ctx_flags |= AVFMTCTX_NOHEADER;
 
 if (s->oformat && CONFIG_RTSP_MUXER) {
- int ret = ff_rtp_chain_mux_open(&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 */
@@ -656,6 +753,10 @@
 rtsp_st->dynamic_protocol_context,
 rtsp_st->dynamic_handler);
 }
+ if (rtsp_st->crypto_suite[0])
+ ff_rtp_parse_set_crypto(rtsp_st->transport_priv,
+ rtsp_st->crypto_suite,
+ rtsp_st->crypto_params);
 }
 
 return 0;
@@ -1100,11 +1201,11 @@
 *
 * @return zero if success, nonzero otherwise
 */
-static int ff_rtsp_send_cmd_with_content_async(AVFormatContext *s,
- const char *method, const char *url,
- const char *headers,
- const unsigned char *send_content,
- int send_content_length)
+static int rtsp_send_cmd_with_content_async(AVFormatContext *s,
+ const char *method, const char *url,
+ const char *headers,
+ const unsigned char *send_content,
+ int send_content_length)
 {
 RTSPState *rt = s->priv_data;
 char buf[4096], *out_buf;
@@ -1117,6 +1218,7 @@
 if (headers)
 av_strlcat(buf, headers, sizeof(buf));
 av_strlcatf(buf, sizeof(buf), "CSeq: %d\r\n", rt->seq);
+ av_strlcatf(buf, sizeof(buf), "User-Agent: %s\r\n", LIBAVFORMAT_IDENT);
 if (rt->session_id[0] != '\0' && (!headers ||
 !strstr(headers, "\nIf-Match:"))) {
 av_strlcatf(buf, sizeof(buf), "Session: %s\r\n", rt->session_id);
@@ -1157,7 +1259,7 @@
 int ff_rtsp_send_cmd_async(AVFormatContext *s, const char *method,
 const char *url, const char *headers)
 {
- return ff_rtsp_send_cmd_with_content_async(s, method, url, headers, NULL, 0);
+ return rtsp_send_cmd_with_content_async(s, method, url, headers, NULL, 0);
 }
 
 int ff_rtsp_send_cmd(AVFormatContext *s, const char *method, const char *url,
@@ -1182,9 +1284,9 @@
 
 retry:
 cur_auth_type = rt->auth_state.auth_type;
- if ((ret = ff_rtsp_send_cmd_with_content_async(s, method, url, header,
- send_content,
- send_content_length)))
+ if ((ret = rtsp_send_cmd_with_content_async(s, method, url, header,
+ send_content,
+ send_content_length)))
 return ret;
 
 if ((ret = ff_rtsp_read_reply(s, reply, content_ptr, 0, method) ) < 0)
@@ -1384,18 +1486,15 @@
 
 case RTSP_LOWER_TRANSPORT_UDP: {
 char url[1024], options[30] = "";
+ const char *peer = host;
 
 if (rt->rtsp_flags & RTSP_FLAG_FILTER_SRC)
 av_strlcpy(options, "?connect=1", sizeof(options));
 /* Use source address if specified */
- if (reply->transports[0].source[0]) {
- ff_url_join(url, sizeof(url), "rtp", NULL,
- reply->transports[0].source,
- reply->transports[0].server_port_min, "%s", options);
- } else {
- ff_url_join(url, sizeof(url), "rtp", NULL, host,
- reply->transports[0].server_port_min, "%s", options);
- }
+ if (reply->transports[0].source[0])
+ peer = reply->transports[0].source;
+ ff_url_join(url, sizeof(url), "rtp", NULL, peer,
+ reply->transports[0].server_port_min, "%s", options);
 if (!(rt->server_type == RTSP_SERVER_WMS && i > 1) &&
 ff_rtp_set_remote_url(rtsp_st->rtp_handle, url) < 0) {
 err = AVERROR_INVALIDDATA;
@@ -1452,7 +1551,7 @@
 return 0;
 
 fail:
- ff_rtsp_undo_setup(s);
+ ff_rtsp_undo_setup(s, 0);
 return err;
 }
 
@@ -1867,6 +1966,7 @@
 rt->cur_transport_priv = NULL;
 }
 
+redo:
 if (rt->transport == RTSP_TRANSPORT_RTP) {
 int i;
 int64_t first_queue_time = 0;
@@ -1882,12 +1982,15 @@
 first_queue_st = rt->rtsp_streams[i];
 }
 }
- if (first_queue_time)
+ if (first_queue_time) {
 wait_end = first_queue_time + s->max_delay;
+ } else {
+ wait_end = 0;
+ first_queue_st = NULL;
+ }
 }
 
 /* read next RTP packet */
- redo:
 if (!rt->recvbuf) {
 rt->recvbuf = av_malloc(RECVBUF_SIZE);
 if (!rt->recvbuf)
@@ -1908,7 +2011,11 @@
 ff_rtp_check_and_send_back_rr(rtsp_st->transport_priv, rtsp_st->rtp_handle, NULL, len);
 break;
 case RTSP_LOWER_TRANSPORT_CUSTOM:
- len = ffio_read_partial(s->pb, rt->recvbuf, RECVBUF_SIZE);
+ if (first_queue_st && rt->transport == RTSP_TRANSPORT_RTP &&
+ wait_end && wait_end < av_gettime())
+ len = AVERROR(EAGAIN);
+ else
+ len = ffio_read_partial(s->pb, rt->recvbuf, RECVBUF_SIZE);
 len = pick_stream(s, &rtsp_st, rt->recvbuf, len);
 if (len > 0 && rtsp_st->transport_priv && rt->transport == RTSP_TRANSPORT_RTP)
 ff_rtp_check_and_send_back_rr(rtsp_st->transport_priv, NULL, s->pb, len);
@@ -1928,6 +2035,12 @@
 ret = ff_rdt_parse_packet(rtsp_st->transport_priv, pkt, &rt->recvbuf, len);
 } else if (rt->transport == RTSP_TRANSPORT_RTP) {
 ret = ff_rtp_parse_packet(rtsp_st->transport_priv, pkt, &rt->recvbuf, len);
+ if (rtsp_st->feedback) {
+ AVIOContext *pb = NULL;
+ if (rt->lower_transport == RTSP_LOWER_TRANSPORT_CUSTOM)
+ pb = s->pb;
+ ff_rtp_send_rtcp_feedback(rtsp_st->transport_priv, rtsp_st->rtp_handle, pb);
+ }
 if (ret < 0) {
 /* Either bad packet, or a RTCP packet. Check if the
 * first_rtcp_ntp_time field was initialized. */
@@ -2000,7 +2113,7 @@
 while (p < p_end && *p != '\0') {
 if (p + sizeof("c=IN IP") - 1 < p_end &&
 av_strstart(p, "c=IN IP", NULL))
- return AVPROBE_SCORE_MAX / 2;
+ return AVPROBE_SCORE_EXTENSION;
 
 while (p < p_end - 1 && *p != '\n') p++;
 if (++p >= p_end)
@@ -2011,6 +2124,17 @@
 return 0;
 }
 
+static void append_source_addrs(char *buf, int size, const char *name,
+ int count, struct RTSPSource **addrs)
+{
+ int i;
+ if (!count)
+ return;
+ av_strlcatf(buf, size, "&%s=%s", name, addrs[0]->addr);
+ for (i = 1; i < count; i++)
+ av_strlcatf(buf, size, ",%s", addrs[i]->addr);
+}
+
 static int sdp_read_header(AVFormatContext *s)
 {
 RTSPState *rt = s->priv_data;
@@ -2051,9 +2175,17 @@
 namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
 ff_url_join(url, sizeof(url), "rtp", NULL,
 namebuf, rtsp_st->sdp_port,
- "?localport=%d&ttl=%d&connect=%d", rtsp_st->sdp_port,
- rtsp_st->sdp_ttl,
- rt->rtsp_flags & RTSP_FLAG_FILTER_SRC ? 1 : 0);
+ "?localport=%d&ttl=%d&connect=%d&write_to_source=%d",
+ rtsp_st->sdp_port, rtsp_st->sdp_ttl,
+ rt->rtsp_flags & RTSP_FLAG_FILTER_SRC ? 1 : 0,
+ rt->rtsp_flags & RTSP_FLAG_RTCP_TO_SOURCE ? 1 : 0);
+
+ append_source_addrs(url, sizeof(url), "sources",
+ rtsp_st->nb_include_source_addrs,
+ rtsp_st->include_source_addrs);
+ append_source_addrs(url, sizeof(url), "block",
+ rtsp_st->nb_exclude_source_addrs,
+ rtsp_st->exclude_source_addrs);
 if (ffurl_open(&rtsp_st->rtp_handle, url, AVIO_FLAG_READ_WRITE,
 &s->interrupt_callback, NULL) < 0) {
 err = AVERROR_INVALIDDATA;
@@ -2106,7 +2238,7 @@
 
 static int rtp_read_header(AVFormatContext *s)
 {
- uint8_t recvbuf[1500];
+ uint8_t recvbuf[RTP_MAX_PACKET_LENGTH];
 char host[500], sdp[500];
 int ret, port;
 URLContext* in = NULL;

libav-v9.6.tar.bz2/libavformat/rtsp.h -> libav-v10.1.tar.bz2/libavformat/rtsp.h Changed

@@ -401,6 +401,12 @@
 source address and port. */
 #define RTSP_FLAG_LISTEN 0x2 /**< Wait for incoming connections. */
 #define RTSP_FLAG_CUSTOM_IO 0x4 /**< Do all IO via the AVIOContext. */
+#define RTSP_FLAG_RTCP_TO_SOURCE 0x8 /**< Send RTCP packets to the source
+ address of received packets. */
+
+typedef struct RTSPSource {
+ char addr[128]; /**< Source-specific multicast include source IP address (from SDP content) */
+} RTSPSource;
 
 /**
 * Describe a single stream, as identified by a single m= line block in the
@@ -425,6 +431,10 @@
 //@{
 int sdp_port; /**< port (from SDP content) */
 struct sockaddr_storage sdp_ip; /**< IP address (from SDP content) */
+ int nb_include_source_addrs; /**< Number of source-specific multicast include source IP addresses (from SDP content) */
+ struct RTSPSource **include_source_addrs; /**< Source-specific multicast include source IP addresses (from SDP content) */
+ int nb_exclude_source_addrs; /**< Number of source-specific multicast exclude source IP addresses (from SDP content) */
+ struct RTSPSource **exclude_source_addrs; /**< Source-specific multicast exclude source IP addresses (from SDP content) */
 int sdp_ttl; /**< IP Time-To-Live (from SDP content) */
 int sdp_payload_type; /**< payload type */
 //@}
@@ -437,6 +447,12 @@
 /** private data associated with the dynamic protocol */
 PayloadContext *dynamic_protocol_context;
 //@}
+
+ /** Enable sending RTCP feedback messages according to RFC 4585 */
+ int feedback;
+
+ char crypto_suite[40];
+ char crypto_params[100];
 } RTSPStream;
 
 void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf,
@@ -572,6 +588,11 @@
 uint8_t *buf, int buf_size);
 
 /**
+ * Send buffered packets over TCP.
+ */
+int ff_rtsp_tcp_write_packet(AVFormatContext *s, RTSPStream *rtsp_st);
+
+/**
 * Receive one packet from the RTSPStreams set up in the AVFormatContext
 * (which should contain a RTSPState struct as priv_data).
 */
@@ -589,7 +610,7 @@
 * Undo the effect of ff_rtsp_make_setup_request, close the
 * transport_priv and rtp_handle fields.
 */
-void ff_rtsp_undo_setup(AVFormatContext *s);
+void ff_rtsp_undo_setup(AVFormatContext *s, int send_packets);
 
 /**
 * Open RTSP transport context.

libav-v9.6.tar.bz2/libavformat/rtspdec.c -> libav-v10.1.tar.bz2/libavformat/rtspdec.c Changed

libav-v9.6.tar.bz2/libavformat/rtspenc.c -> libav-v10.1.tar.bz2/libavformat/rtspenc.c Changed

@@ -136,7 +136,7 @@
     return 0;
 }
 
-static int tcp_write_packet(AVFormatContext *s, RTSPStream *rtsp_st)
+int ff_rtsp_tcp_write_packet(AVFormatContext *s, RTSPStream *rtsp_st)
 {
     RTSPState *rt = s->priv_data;
     AVFormatContext *rtpctx = rtsp_st->transport_priv;
@@ -145,6 +145,7 @@
     uint8_t *interleave_header, *interleaved_packet;
 
     size = avio_close_dyn_buf(rtpctx->pb, &buf);
+    rtpctx->pb = NULL;
     ptr = buf;
     while (size > 4) {
         uint32_t packet_len = AV_RB32(ptr);
@@ -171,8 +172,7 @@
         size -= packet_len;
     }
     av_free(buf);
-    ffio_open_dyn_packet_buf(&rtpctx->pb, RTSP_TCP_MAX_PACKET_SIZE);
-    return 0;
+    return ffio_open_dyn_packet_buf(&rtpctx->pb, RTSP_TCP_MAX_PACKET_SIZE);
 }
 
 static int rtsp_write_packet(AVFormatContext *s, AVPacket *pkt)
@@ -217,7 +217,7 @@
      * packets, so we need to send them out on the TCP connection separately.
      */
     if (!ret && rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP)
-        ret = tcp_write_packet(s, rtsp_st);
+        ret = ff_rtsp_tcp_write_packet(s, rtsp_st);
     return ret;
 }
 
@@ -225,6 +225,11 @@
 {
     RTSPState *rt = s->priv_data;
 
+    // If we want to send RTCP_BYE packets, these are sent by av_write_trailer.
+    // Thus call this on all streams before doing the teardown. This is
+    // done within ff_rtsp_undo_setup.
+    ff_rtsp_undo_setup(s, 1);
+
     ff_rtsp_send_cmd_async(s, "TEARDOWN", rt->control_uri, NULL);
 
     ff_rtsp_close_streams(s);

libav-v9.6.tar.bz2/libavformat/sapdec.c -> libav-v10.1.tar.bz2/libavformat/sapdec.c Changed

libav-v9.6.tar.bz2/libavformat/sctp.c -> libav-v10.1.tar.bz2/libavformat/sctp.c Changed

libav-v9.6.tar.bz2/libavformat/sdp.c -> libav-v10.1.tar.bz2/libavformat/sdp.c Changed

@@ -128,7 +128,7 @@
 
     *ttl = 0;
 
-    if (strcmp(proto, "rtp")) {
+    if (strcmp(proto, "rtp") && strcmp(proto, "srtp")) {
         /* The url isn't for the actual rtp sessions,
          * don't parse out anything else than the destination.
          */
@@ -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; "
@@ -667,6 +667,19 @@
                 av_strlcatf(buf, size,
                                    "a=control:streamid=%d\r\n", i + j);
             }
+            if (ac[i]->pb && ac[i]->pb->av_class) {
+                uint8_t *crypto_suite = NULL, *crypto_params = NULL;
+                av_opt_get(ac[i]->pb, "srtp_out_suite",  AV_OPT_SEARCH_CHILDREN,
+                           &crypto_suite);
+                av_opt_get(ac[i]->pb, "srtp_out_params", AV_OPT_SEARCH_CHILDREN,
+                           &crypto_params);
+                if (crypto_suite && crypto_suite[0])
+                    av_strlcatf(buf, size,
+                                "a=crypto:1 %s inline:%s\r\n",
+                                crypto_suite, crypto_params);
+                av_free(crypto_suite);
+                av_free(crypto_params);
+            }
         }
     }

libav-v9.6.tar.bz2/libavformat/seek.c -> libav-v10.1.tar.bz2/libavformat/seek.c Changed

libav-v9.6.tar.bz2/libavformat/seek.h -> libav-v10.1.tar.bz2/libavformat/seek.h Changed

libav-v9.6.tar.bz2/libavformat/segafilm.c -> libav-v10.1.tar.bz2/libavformat/segafilm.c Changed

@@ -75,13 +75,23 @@
 return AVPROBE_SCORE_MAX;
 }
 
+static int film_read_close(AVFormatContext *s)
+{
+ FilmDemuxContext *film = s->priv_data;
+
+ av_freep(&film->sample_table);
+ av_freep(&film->stereo_buffer);
+
+ 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;
 
@@ -111,6 +121,11 @@
 return AVERROR(EIO);
 film->audio_samplerate = AV_RB16(&scratch[24]);
 film->audio_channels = scratch[21];
+ if (!film->audio_channels || film->audio_channels > 2) {
+ av_log(s, AV_LOG_ERROR,
+ "Invalid number of channels: %d\n", film->audio_channels);
+ return AVERROR_INVALIDDATA;
+ }
 film->audio_bits = scratch[22];
 if (scratch[23] == 2)
 film->audio_type = AV_CODEC_ID_ADPCM_ADX;
@@ -208,12 +223,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_free(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) {
+ 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;
@@ -234,6 +253,9 @@
 film->current_sample = 0;
 
 return 0;
+fail:
+ film_read_close(s);
+ return ret;
 }
 
 static int film_read_packet(AVFormatContext *s,
@@ -312,16 +334,6 @@
 return ret;
 }
 
-static int film_read_close(AVFormatContext *s)
-{
- FilmDemuxContext *film = s->priv_data;
-
- av_free(film->sample_table);
- av_free(film->stereo_buffer);
-
- return 0;
-}
-
 AVInputFormat ff_segafilm_demuxer = {
 .name = "film_cpk",
 .long_name = NULL_IF_CONFIG_SMALL("Sega FILM / CPK"),

libav-v9.6.tar.bz2/libavformat/sierravmd.c -> libav-v10.1.tar.bz2/libavformat/sierravmd.c Changed

@@ -76,7 +76,7 @@
         return 0;
 
     /* only return half certainty since this check is a bit sketchy */
-    return AVPROBE_SCORE_MAX / 2;
+    return AVPROBE_SCORE_EXTENSION;
 }
 
 static int vmd_read_header(AVFormatContext *s)
@@ -88,7 +88,7 @@
     unsigned char *raw_frame_table;
     int raw_frame_table_size;
     int64_t current_offset;
-    int i, j;
+    int i, j, ret;
     unsigned int total_frames;
     int64_t current_audio_pts = 0;
     unsigned char chunk[BYTES_PER_FRAME_RECORD];
@@ -175,15 +175,13 @@
     raw_frame_table = av_malloc(raw_frame_table_size);
     vmd->frame_table = av_malloc((vmd->frame_count * vmd->frames_per_block + sound_buffers) * sizeof(vmd_frame));
     if (!raw_frame_table || !vmd->frame_table) {
-        av_free(raw_frame_table);
-        av_free(vmd->frame_table);
-        return AVERROR(ENOMEM);
+        ret = AVERROR(ENOMEM);
+        goto error;
     }
     if (avio_read(pb, raw_frame_table, raw_frame_table_size) !=
         raw_frame_table_size) {
-        av_free(raw_frame_table);
-        av_free(vmd->frame_table);
-        return AVERROR(EIO);
+        ret = AVERROR(EIO);
+        goto error;
     }
 
     total_frames = 0;
@@ -199,6 +197,11 @@
             avio_read(pb, chunk, BYTES_PER_FRAME_RECORD);
             type = chunk[0];
             size = AV_RL32(&chunk[2]);
+            if (size > INT_MAX / 2) {
+                av_log(s, AV_LOG_ERROR, "Invalid frame size\n");
+                ret = AVERROR_INVALIDDATA;
+                goto error;
+            }
             if(!size && type != 1)
                 continue;
             switch(type) {
@@ -235,6 +238,11 @@
     vmd->frame_count = total_frames;
 
     return 0;
+
+error:
+    av_free(raw_frame_table);
+    av_free(vmd->frame_table);
+    return ret;
 }
 
 static int vmd_read_packet(AVFormatContext *s,

libav-v9.6.tar.bz2/libavformat/smacker.c -> libav-v10.1.tar.bz2/libavformat/smacker.c Changed

@@ -210,7 +210,8 @@
 
 
 /* load trees to extradata, they will be unpacked by decoder */
- st->codec->extradata = av_malloc(smk->treesize + 16);
+ st->codec->extradata = av_mallocz(smk->treesize + 16 +
+ FF_INPUT_BUFFER_PADDING_SIZE);
 st->codec->extradata_size = smk->treesize + 16;
 if(!st->codec->extradata){
 av_log(s, AV_LOG_ERROR, "Cannot allocate %i bytes of extradata\n", smk->treesize + 16);
@@ -274,7 +275,7 @@
 } else if(t & 0x40){ /* copy with offset */
 off = avio_r8(s->pb);
 j = (t & 0x3F) + 1;
- if (off + j > 0xff) {
+ if (off + j > 0x100) {
 av_log(s, AV_LOG_ERROR,
 "Invalid palette update, offset=%d length=%d extends beyond palette size\n",
 off, j);
@@ -303,17 +304,21 @@
 /* if audio chunks are present, put them to stack and retrieve later */
 for(i = 0; i < 7; i++) {
 if(flags & 1) {
- int size;
- uint8_t *tmpbuf;
+ uint32_t size;
+ int err;
 
 size = avio_rl32(s->pb) - 4;
+ if (!size || size > frame_size) {
+ av_log(s, AV_LOG_ERROR, "Invalid audio part size\n");
+ return AVERROR_INVALIDDATA;
+ }
 frame_size -= size;
 frame_size -= 4;
 smk->curstream++;
- tmpbuf = av_realloc(smk->bufs[smk->curstream], size);
- if (!tmpbuf)
- return AVERROR(ENOMEM);
- smk->bufs[smk->curstream] = tmpbuf;
+ if ((err = av_reallocp(&smk->bufs[smk->curstream], size)) < 0) {
+ smk->buf_sizes[smk->curstream] = 0;
+ return err;
+ }
 smk->buf_sizes[smk->curstream] = size;
 ret = avio_read(s->pb, smk->bufs[smk->curstream], size);
 if(ret != size)
@@ -322,7 +327,7 @@
 }
 flags >>= 1;
 }
- if (frame_size < 0)
+ if (frame_size < 0 || frame_size >= INT_MAX/2)
 return AVERROR_INVALIDDATA;
 if (av_new_packet(pkt, frame_size + 769))
 return AVERROR(ENOMEM);
@@ -334,10 +339,13 @@
 if(ret != frame_size)
 return AVERROR(EIO);
 pkt->stream_index = smk->videoindex;
+ pkt->pts = smk->cur_frame;
 pkt->size = ret + 769;
 smk->cur_frame++;
 smk->nextpos = avio_tell(s->pb);
 } else {
+ if (smk->stream_id[smk->curstream] < 0)
+ return AVERROR_INVALIDDATA;
 if (av_new_packet(pkt, smk->buf_sizes[smk->curstream]))
 return AVERROR(ENOMEM);
 memcpy(pkt->data, smk->bufs[smk->curstream], smk->buf_sizes[smk->curstream]);

libav-v9.6.tar.bz2/libavformat/smjpegdec.c -> libav-v10.1.tar.bz2/libavformat/smjpegdec.c Changed

libav-v9.6.tar.bz2/libavformat/smjpegenc.c -> libav-v10.1.tar.bz2/libavformat/smjpegenc.c Changed

libav-v9.6.tar.bz2/libavformat/smoothstreamingenc.c -> libav-v10.1.tar.bz2/libavformat/smoothstreamingenc.c Changed

@@ -210,14 +210,15 @@
 {
 SmoothStreamingContext *c = s->priv_data;
 AVIOContext *out;
- char filename[1024];
+ char filename[1024], temp_filename[1024];
 int ret, i, video_chunks = 0, audio_chunks = 0, video_streams = 0, audio_streams = 0;
 int64_t duration = 0;
 
 snprintf(filename, sizeof(filename), "%s/Manifest", s->filename);
- ret = avio_open2(&out, filename, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL);
+ snprintf(temp_filename, sizeof(temp_filename), "%s/Manifest.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);
+ av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", temp_filename);
 return ret;
 }
 avio_printf(out, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
@@ -278,6 +279,7 @@
 avio_printf(out, "</SmoothStreamingMedia>\n");
 avio_flush(out);
 avio_close(out);
+ rename(temp_filename, filename);
 return 0;
 }
 
@@ -443,12 +445,16 @@
 
 static int add_fragment(OutputStream *os, const char *file, const char *infofile, int64_t start_time, int64_t duration, int64_t start_pos, int64_t size)
 {
+ int err;
 Fragment *frag;
 if (os->nb_fragments >= os->fragments_size) {
 os->fragments_size = (os->fragments_size + 1) * 2;
- os->fragments = av_realloc(os->fragments, sizeof(*os->fragments)*os->fragments_size);
- if (!os->fragments)
- return AVERROR(ENOMEM);
+ if ((err = av_reallocp(&os->fragments, sizeof(*os->fragments) *
+ os->fragments_size)) < 0) {
+ os->fragments_size = 0;
+ os->nb_fragments = 0;
+ return err;
+ }
 }
 frag = av_mallocz(sizeof(*frag));
 if (!frag)

libav-v9.6.tar.bz2/libavformat/spdif.h -> libav-v10.1.tar.bz2/libavformat/spdif.h Changed

libav-v9.6.tar.bz2/libavformat/spdifdec.c -> libav-v10.1.tar.bz2/libavformat/spdifdec.c Changed

@@ -91,8 +91,8 @@
         break;
     default:
         if (s) { /* be silent during a probe */
-            av_log(s, AV_LOG_WARNING, "Data type 0x%04x", data_type);
-            av_log_missing_feature(s, " in IEC 61937", 1);
+            avpriv_request_sample(s, "Data type 0x%04x in IEC 61937",
+                                  data_type);
         }
         return AVERROR_PATCHWELCOME;
     }
@@ -149,10 +149,10 @@
 
     if (sync_codes >= 6)
         /* good amount of sync codes but with unexpected offsets */
-        return AVPROBE_SCORE_MAX / 2;
+        return AVPROBE_SCORE_EXTENSION;
 
     /* some sync codes were found */
-    return AVPROBE_SCORE_MAX / 8;
+    return AVPROBE_SCORE_EXTENSION / 4;
 }
 
 static int spdif_read_header(AVFormatContext *s)
@@ -179,7 +179,7 @@
     pkt_size_bits = avio_rl16(pb);
 
     if (pkt_size_bits % 16)
-        av_log_ask_for_sample(s, "Packet does not end to a 16-bit boundary.");
+        avpriv_request_sample(s, "Packet not ending at a 16-bit boundary");
 
     ret = av_new_packet(pkt, FFALIGN(pkt_size_bits, 16) >> 3);
     if (ret)
@@ -213,7 +213,7 @@
         st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
         st->codec->codec_id = codec_id;
     } else if (codec_id != s->streams[0]->codec->codec_id) {
-        av_log_missing_feature(s, "Codec change in IEC 61937", 0);
+        avpriv_report_missing_feature(s, "Codec change in IEC 61937");
         return AVERROR_PATCHWELCOME;
     }

libav-v9.6.tar.bz2/libavformat/spdifenc.c -> libav-v10.1.tar.bz2/libavformat/spdifenc.c Changed

@@ -307,7 +307,7 @@
          * discs and dts-in-wav. */
         ctx->use_preamble = 0;
     } else if (ctx->out_bytes > ctx->pkt_offset - BURST_HEADER_SIZE) {
-        av_log_ask_for_sample(s, "Unrecognized large DTS frame.");
+        avpriv_request_sample(s, "Unrecognized large DTS frame");
         /* This will fail with a "bitrate too high" in the caller */
     }
 
@@ -412,8 +412,8 @@
     if (pkt->size > TRUEHD_FRAME_OFFSET - mat_code_length) {
         /* if such frames exist, we'd need some more complex logic to
          * distribute the TrueHD frames in the MAT frame */
-        av_log(s, AV_LOG_ERROR, "TrueHD frame too big, %d bytes\n", pkt->size);
-        av_log_ask_for_sample(s, NULL);
+        avpriv_request_sample(s, "Too large TrueHD frame of %d bytes",
+                              pkt->size);
         return AVERROR_PATCHWELCOME;
     }
 
@@ -538,7 +538,6 @@
     av_log(s, AV_LOG_DEBUG, "type=%x len=%i pkt_offset=%i\n",
            ctx->data_type, ctx->out_bytes, ctx->pkt_offset);
 
-    avio_flush(s->pb);
     return 0;
 }

libav-v10.1.tar.bz2/libavformat/srtp.c Added

@@ -0,0 +1,472 @@
+/*
+ * SRTP encryption/decryption
+ * Copyright (c) 2012 Martin Storsjo
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/base64.h"
+#include "libavutil/aes.h"
+#include "libavutil/hmac.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/log.h"
+#include "rtp.h"
+#include "rtpdec.h"
+#include "srtp.h"
+
+void ff_srtp_free(struct SRTPContext *s)
+{
+ if (!s)
+ return;
+ av_freep(&s->aes);
+ if (s->hmac)
+ av_hmac_free(s->hmac);
+ s->hmac = NULL;
+}
+
+static void encrypt_counter(struct AVAES *aes, uint8_t *iv, uint8_t *outbuf,
+ int outlen)
+{
+ int i, j, outpos;
+ for (i = 0, outpos = 0; outpos < outlen; i++) {
+ uint8_t keystream[16];
+ AV_WB16(&iv[14], i);
+ av_aes_crypt(aes, keystream, iv, 1, NULL, 0);
+ for (j = 0; j < 16 && outpos < outlen; j++, outpos++)
+ outbuf[outpos] ^= keystream[j];
+ }
+}
+
+static void derive_key(struct AVAES *aes, const uint8_t *salt, int label,
+ uint8_t *out, int outlen)
+{
+ uint8_t input[16] = { 0 };
+ memcpy(input, salt, 14);
+ // Key derivation rate assumed to be zero
+ input[14 - 7] ^= label;
+ memset(out, 0, outlen);
+ encrypt_counter(aes, input, out, outlen);
+}
+
+int ff_srtp_set_crypto(struct SRTPContext *s, const char *suite,
+ const char *params)
+{
+ uint8_t buf[30];
+
+ ff_srtp_free(s);
+
+ // RFC 4568
+ if (!strcmp(suite, "AES_CM_128_HMAC_SHA1_80") ||
+ !strcmp(suite, "SRTP_AES128_CM_HMAC_SHA1_80")) {
+ s->rtp_hmac_size = s->rtcp_hmac_size = 10;
+ } else if (!strcmp(suite, "AES_CM_128_HMAC_SHA1_32")) {
+ s->rtp_hmac_size = s->rtcp_hmac_size = 4;
+ } else if (!strcmp(suite, "SRTP_AES128_CM_HMAC_SHA1_32")) {
+ // RFC 5764 section 4.1.2
+ s->rtp_hmac_size = 4;
+ s->rtcp_hmac_size = 10;
+ } else {
+ av_log(NULL, AV_LOG_WARNING, "SRTP Crypto suite %s not supported\n",
+ suite);
+ return AVERROR(EINVAL);
+ }
+ if (av_base64_decode(buf, params, sizeof(buf)) != sizeof(buf)) {
+ av_log(NULL, AV_LOG_WARNING, "Incorrect amount of SRTP params\n");
+ return AVERROR(EINVAL);
+ }
+ // MKI and lifetime not handled yet
+ s->aes = av_aes_alloc();
+ s->hmac = av_hmac_alloc(AV_HMAC_SHA1);
+ if (!s->aes || !s->hmac)
+ return AVERROR(ENOMEM);
+ memcpy(s->master_key, buf, 16);
+ memcpy(s->master_salt, buf + 16, 14);
+
+ // RFC 3711
+ av_aes_init(s->aes, s->master_key, 128, 0);
+
+ derive_key(s->aes, s->master_salt, 0x00, s->rtp_key, sizeof(s->rtp_key));
+ derive_key(s->aes, s->master_salt, 0x02, s->rtp_salt, sizeof(s->rtp_salt));
+ derive_key(s->aes, s->master_salt, 0x01, s->rtp_auth, sizeof(s->rtp_auth));
+
+ derive_key(s->aes, s->master_salt, 0x03, s->rtcp_key, sizeof(s->rtcp_key));
+ derive_key(s->aes, s->master_salt, 0x05, s->rtcp_salt, sizeof(s->rtcp_salt));
+ derive_key(s->aes, s->master_salt, 0x04, s->rtcp_auth, sizeof(s->rtcp_auth));
+ return 0;
+}
+
+static void create_iv(uint8_t *iv, const uint8_t *salt, uint64_t index,
+ uint32_t ssrc)
+{
+ uint8_t indexbuf[8];
+ int i;
+ memset(iv, 0, 16);
+ AV_WB32(&iv[4], ssrc);
+ AV_WB64(indexbuf, index);
+ for (i = 0; i < 8; i++) // index << 16
+ iv[6 + i] ^= indexbuf[i];
+ for (i = 0; i < 14; i++)
+ iv[i] ^= salt[i];
+}
+
+int ff_srtp_decrypt(struct SRTPContext *s, uint8_t *buf, int *lenptr)
+{
+ uint8_t iv[16] = { 0 }, hmac[20];
+ int len = *lenptr;
+ int av_uninit(seq_largest);
+ uint32_t ssrc, av_uninit(roc);
+ uint64_t index;
+ int rtcp, hmac_size;
+
+ // TODO: Missing replay protection
+
+ if (len < 2)
+ return AVERROR_INVALIDDATA;
+
+ rtcp = RTP_PT_IS_RTCP(buf[1]);
+ hmac_size = rtcp ? s->rtcp_hmac_size : s->rtp_hmac_size;
+
+ if (len < hmac_size)
+ return AVERROR_INVALIDDATA;
+
+ // Authentication HMAC
+ av_hmac_init(s->hmac, rtcp ? s->rtcp_auth : s->rtp_auth, sizeof(s->rtp_auth));
+ // If MKI is used, this should exclude the MKI as well
+ av_hmac_update(s->hmac, buf, len - hmac_size);
+
+ if (!rtcp) {
+ int seq = AV_RB16(buf + 2);
+ uint32_t v;
+ uint8_t rocbuf[4];
+
+ // RFC 3711 section 3.3.1, appendix A
+ seq_largest = s->seq_initialized ? s->seq_largest : seq;
+ v = roc = s->roc;
+ if (seq_largest < 32768) {
+ if (seq - seq_largest > 32768)
+ v = roc - 1;
+ } else {
+ if (seq_largest - 32768 > seq)
+ v = roc + 1;
+ }
+ if (v == roc) {
+ seq_largest = FFMAX(seq_largest, seq);
+ } else if (v == roc + 1) {
+ seq_largest = seq;
+ roc = v;
+ }
+ index = seq + (((uint64_t)v) << 16);
+
+ AV_WB32(rocbuf, roc);
+ av_hmac_update(s->hmac, rocbuf, 4);
+ }
+
+ av_hmac_final(s->hmac, hmac, sizeof(hmac));
+ if (memcmp(hmac, buf + len - hmac_size, hmac_size)) {
+ av_log(NULL, AV_LOG_WARNING, "HMAC mismatch\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ len -= hmac_size;
+ *lenptr = len;
+
+ if (len < 12)
+ return AVERROR_INVALIDDATA;
+
+ if (rtcp) {
+ uint32_t srtcp_index = AV_RB32(buf + len - 4);
+ len -= 4;
+ *lenptr = len;
+
+ ssrc = AV_RB32(buf + 4);
+ index = srtcp_index & 0x7fffffff;
+
+ buf += 8;
+ len -= 8;
+ if (!(srtcp_index & 0x80000000))
+ return 0;
+ } else {
+ int ext, csrc;
+ s->seq_initialized = 1;
+ s->seq_largest = seq_largest;
+ s->roc = roc;
+
+ csrc = buf[0] & 0x0f;
+ ext = buf[0] & 0x10;
+ ssrc = AV_RB32(buf + 8);
+
+ buf += 12;
+ len -= 12;
+
+ buf += 4 * csrc;
+ len -= 4 * csrc;
+ if (len < 0)
+ return AVERROR_INVALIDDATA;
+
+ if (ext) {
+ if (len < 4)
+ return AVERROR_INVALIDDATA;
+ ext = (AV_RB16(buf + 2) + 1) * 4;
+ if (len < ext)
+ return AVERROR_INVALIDDATA;
+ len -= ext;
+ buf += ext;
+ }
+ }
+
+ create_iv(iv, rtcp ? s->rtcp_salt : s->rtp_salt, index, ssrc);
+ av_aes_init(s->aes, rtcp ? s->rtcp_key : s->rtp_key, 128, 0);
+ encrypt_counter(s->aes, iv, buf, len);
+
+ return 0;
+}
+
+int ff_srtp_encrypt(struct SRTPContext *s, const uint8_t *in, int len,
+ uint8_t *out, int outlen)
+{
+ uint8_t iv[16] = { 0 }, hmac[20];
+ uint64_t index;
+ uint32_t ssrc;
+ int rtcp, hmac_size, padding;
+ uint8_t *buf;
+
+ if (len < 8)
+ return AVERROR_INVALIDDATA;
+
+ rtcp = RTP_PT_IS_RTCP(in[1]);
+ hmac_size = rtcp ? s->rtcp_hmac_size : s->rtp_hmac_size;
+ padding = hmac_size;
+ if (rtcp)
+ padding += 4; // For the RTCP index
+
+ if (len + padding > outlen)
+ return 0;
+
+ memcpy(out, in, len);
+ buf = out;
+
+ if (rtcp) {
+ ssrc = AV_RB32(buf + 4);
+ index = s->rtcp_index++;
+
+ buf += 8;
+ len -= 8;
+ } else {
+ int ext, csrc;
+ int seq = AV_RB16(buf + 2);
+
+ if (len < 12)
+ return AVERROR_INVALIDDATA;
+
+ ssrc = AV_RB32(buf + 8);
+
+ if (seq < s->seq_largest)
+ s->roc++;
+ s->seq_largest = seq;
+ index = seq + (((uint64_t)s->roc) << 16);
+
+ csrc = buf[0] & 0x0f;
+ ext = buf[0] & 0x10;
+
+ buf += 12;
+ len -= 12;
+
+ buf += 4 * csrc;
+ len -= 4 * csrc;
+ if (len < 0)
+ return AVERROR_INVALIDDATA;
+
+ if (ext) {
+ if (len < 4)
+ return AVERROR_INVALIDDATA;
+ ext = (AV_RB16(buf + 2) + 1) * 4;
+ if (len < ext)
+ return AVERROR_INVALIDDATA;
+ len -= ext;
+ buf += ext;
+ }
+ }
+
+ create_iv(iv, rtcp ? s->rtcp_salt : s->rtp_salt, index, ssrc);
+ av_aes_init(s->aes, rtcp ? s->rtcp_key : s->rtp_key, 128, 0);
+ encrypt_counter(s->aes, iv, buf, len);
+
+ if (rtcp) {
+ AV_WB32(buf + len, 0x80000000 | index);
+ len += 4;
+ }
+
+ av_hmac_init(s->hmac, rtcp ? s->rtcp_auth : s->rtp_auth, sizeof(s->rtp_auth));
+ av_hmac_update(s->hmac, out, buf + len - out);
+ if (!rtcp) {
+ uint8_t rocbuf[4];
+ AV_WB32(rocbuf, s->roc);
+ av_hmac_update(s->hmac, rocbuf, 4);
+ }
+ av_hmac_final(s->hmac, hmac, sizeof(hmac));
+
+ memcpy(buf + len, hmac, hmac_size);
+ len += hmac_size;
+ return buf + len - out;
+}
+
+#ifdef TEST
+#include <stdio.h>
+
+static const char *aes128_80_key = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmn";
+
+static const uint8_t rtp_aes128_80[] = {
+ // RTP header
+ 0x80, 0xe0, 0x12, 0x34, 0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78,
+ // encrypted payload
+ 0x62, 0x69, 0x76, 0xca, 0xc5,
+ // HMAC
+ 0xa1, 0xac, 0x1b, 0xb4, 0xa0, 0x1c, 0xd5, 0x49, 0x28, 0x99,
+};
+
+static const uint8_t rtcp_aes128_80[] = {
+ // RTCP header
+ 0x81, 0xc9, 0x00, 0x07, 0x12, 0x34, 0x56, 0x78,
+ // encrypted payload
+ 0x8a, 0xac, 0xdc, 0xa5, 0x4c, 0xf6, 0x78, 0xa6, 0x62, 0x8f, 0x24, 0xda,
+ 0x6c, 0x09, 0x3f, 0xa9, 0x28, 0x7a, 0xb5, 0x7f, 0x1f, 0x0f, 0xc9, 0x35,
+ // RTCP index
+ 0x80, 0x00, 0x00, 0x03,
+ // HMAC
+ 0xe9, 0x3b, 0xc0, 0x5c, 0x0c, 0x06, 0x9f, 0xab, 0xc0, 0xde,
+};
+
+static const char *aes128_32_key = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmn";
+
+static const uint8_t rtp_aes128_32[] = {
+ // RTP header
+ 0x80, 0xe0, 0x12, 0x34, 0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78,
+ // encrypted payload
+ 0x62, 0x69, 0x76, 0xca, 0xc5,
+ // HMAC
+ 0xa1, 0xac, 0x1b, 0xb4,
+};
+
+static const uint8_t rtcp_aes128_32[] = {
+ // RTCP header
+ 0x81, 0xc9, 0x00, 0x07, 0x12, 0x34, 0x56, 0x78,
+ // encrypted payload
+ 0x35, 0xe9, 0xb5, 0xff, 0x0d, 0xd1, 0xde, 0x70, 0x74, 0x10, 0xaa, 0x1b,
+ 0xb2, 0x8d, 0xf0, 0x20, 0x02, 0x99, 0x6b, 0x1b, 0x0b, 0xd0, 0x47, 0x34,
+ // RTCP index
+ 0x80, 0x00, 0x00, 0x04,
+ // HMAC
+ 0x5b, 0xd2, 0xa9, 0x9d,
+};
+
+static const char *aes128_80_32_key = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmn";
+
+static const uint8_t rtp_aes128_80_32[] = {
+ // RTP header
+ 0x80, 0xe0, 0x12, 0x34, 0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78,
+ // encrypted payload
+ 0x62, 0x69, 0x76, 0xca, 0xc5,
+ // HMAC
+ 0xa1, 0xac, 0x1b, 0xb4,
+};
+
+static const uint8_t rtcp_aes128_80_32[] = {
+ // RTCP header
+ 0x81, 0xc9, 0x00, 0x07, 0x12, 0x34, 0x56, 0x78,
+ // encrypted payload
+ 0xd6, 0xae, 0xc1, 0x58, 0x63, 0x70, 0xc9, 0x88, 0x66, 0x26, 0x1c, 0x53,
+ 0xff, 0x5d, 0x5d, 0x2b, 0x0f, 0x8c, 0x72, 0x3e, 0xc9, 0x1d, 0x43, 0xf9,
+ // RTCP index
+ 0x80, 0x00, 0x00, 0x05,
+ // HMAC
+ 0x09, 0x16, 0xb4, 0x27, 0x9a, 0xe9, 0x92, 0x26, 0x4e, 0x10,
+};
+
+static void print_data(const uint8_t *buf, int len)
+{
+ int i;
+ for (i = 0; i < len; i++)
+ printf("%02x", buf[i]);
+ printf("\n");
+}
+
+static int test_decrypt(struct SRTPContext *srtp, const uint8_t *in, int len,
+ uint8_t *out)
+{
+ memcpy(out, in, len);
+ if (!ff_srtp_decrypt(srtp, out, &len)) {
+ print_data(out, len);
+ return len;
+ } else
+ return -1;
+}
+
+static void test_encrypt(const uint8_t *data, int in_len, const char *suite,
+ const char *key)
+{
+ struct SRTPContext enc = { 0 }, dec = { 0 };
+ int len;
+ char buf[RTP_MAX_PACKET_LENGTH];
+ ff_srtp_set_crypto(&enc, suite, key);
+ ff_srtp_set_crypto(&dec, suite, key);
+ len = ff_srtp_encrypt(&enc, data, in_len, buf, sizeof(buf));
+ if (!ff_srtp_decrypt(&dec, buf, &len)) {
+ if (len == in_len && !memcmp(buf, data, len))
+ printf("Decrypted content matches input\n");
+ else
+ printf("Decrypted content doesn't match input\n");
+ } else {
+ printf("Decryption failed\n");
+ }
+ ff_srtp_free(&enc);
+ ff_srtp_free(&dec);
+}
+
+int main(void)
+{
+ static const char *aes128_80_suite = "AES_CM_128_HMAC_SHA1_80";
+ static const char *aes128_32_suite = "AES_CM_128_HMAC_SHA1_32";
+ static const char *aes128_80_32_suite = "SRTP_AES128_CM_HMAC_SHA1_32";
+ static const char *test_key = "abcdefghijklmnopqrstuvwxyz1234567890ABCD";
+ uint8_t buf[RTP_MAX_PACKET_LENGTH];
+ struct SRTPContext srtp = { 0 };
+ int len;
+ ff_srtp_set_crypto(&srtp, aes128_80_suite, aes128_80_key);
+ len = test_decrypt(&srtp, rtp_aes128_80, sizeof(rtp_aes128_80), buf);
+ test_encrypt(buf, len, aes128_80_suite, test_key);
+ test_encrypt(buf, len, aes128_32_suite, test_key);
+ test_encrypt(buf, len, aes128_80_32_suite, test_key);
+ test_decrypt(&srtp, rtcp_aes128_80, sizeof(rtcp_aes128_80), buf);
+ test_encrypt(buf, len, aes128_80_suite, test_key);
+ test_encrypt(buf, len, aes128_32_suite, test_key);
+ test_encrypt(buf, len, aes128_80_32_suite, test_key);
+ ff_srtp_free(&srtp);
+
+ memset(&srtp, 0, sizeof(srtp)); // Clear the context
+ ff_srtp_set_crypto(&srtp, aes128_32_suite, aes128_32_key);
+ test_decrypt(&srtp, rtp_aes128_32, sizeof(rtp_aes128_32), buf);
+ test_decrypt(&srtp, rtcp_aes128_32, sizeof(rtcp_aes128_32), buf);
+ ff_srtp_free(&srtp);
+
+ memset(&srtp, 0, sizeof(srtp)); // Clear the context
+ ff_srtp_set_crypto(&srtp, aes128_80_32_suite, aes128_80_32_key);
+ test_decrypt(&srtp, rtp_aes128_80_32, sizeof(rtp_aes128_80_32), buf);
+ test_decrypt(&srtp, rtcp_aes128_80_32, sizeof(rtcp_aes128_80_32), buf);
+ ff_srtp_free(&srtp);
+ return 0;
+}
+#endif /* TEST */

libav-v10.1.tar.bz2/libavformat/srtp.h Added

@@ -0,0 +1,52 @@
+/*
+ * SRTP encryption/decryption
+ * Copyright (c) 2012 Martin Storsjo
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_SRTP_H
+#define AVFORMAT_SRTP_H
+
+#include <stdint.h>
+
+struct AVAES;
+struct AVHMAC;
+
+struct SRTPContext {
+ struct AVAES *aes;
+ struct AVHMAC *hmac;
+ int rtp_hmac_size, rtcp_hmac_size;
+ uint8_t master_key[16];
+ uint8_t master_salt[14];
+ uint8_t rtp_key[16], rtcp_key[16];
+ uint8_t rtp_salt[14], rtcp_salt[14];
+ uint8_t rtp_auth[20], rtcp_auth[20];
+ int seq_largest, seq_initialized;
+ uint32_t roc;
+
+ uint32_t rtcp_index;
+};
+
+int ff_srtp_set_crypto(struct SRTPContext *s, const char *suite,
+ const char *params);
+void ff_srtp_free(struct SRTPContext *s);
+int ff_srtp_decrypt(struct SRTPContext *s, uint8_t *buf, int *lenptr);
+int ff_srtp_encrypt(struct SRTPContext *s, const uint8_t *in, int len,
+ uint8_t *out, int outlen);
+
+#endif /* AVFORMAT_SRTP_H */

libav-v10.1.tar.bz2/libavformat/srtpproto.c Added

@@ -0,0 +1,145 @@
+/*
+ * SRTP network protocol
+ * Copyright (c) 2012 Martin Storsjo
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/opt.h"
+#include "avformat.h"
+#include "avio_internal.h"
+#include "url.h"
+
+#include "internal.h"
+#include "rtpdec.h"
+#include "srtp.h"
+
+typedef struct SRTPProtoContext {
+ const AVClass *class;
+ URLContext *rtp_hd;
+ const char *out_suite, *out_params;
+ const char *in_suite, *in_params;
+ struct SRTPContext srtp_out, srtp_in;
+ uint8_t encryptbuf[RTP_MAX_PACKET_LENGTH];
+} SRTPProtoContext;
+
+#define D AV_OPT_FLAG_DECODING_PARAM
+#define E AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption options[] = {
+ { "srtp_out_suite", "", offsetof(SRTPProtoContext, out_suite), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E },
+ { "srtp_out_params", "", offsetof(SRTPProtoContext, out_params), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E },
+ { "srtp_in_suite", "", offsetof(SRTPProtoContext, in_suite), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E },
+ { "srtp_in_params", "", offsetof(SRTPProtoContext, in_params), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E },
+ { NULL }
+};
+
+static const AVClass srtp_context_class = {
+ .class_name = "srtp",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+static int srtp_close(URLContext *h)
+{
+ SRTPProtoContext *s = h->priv_data;
+ ff_srtp_free(&s->srtp_out);
+ ff_srtp_free(&s->srtp_in);
+ ffurl_close(s->rtp_hd);
+ s->rtp_hd = NULL;
+ return 0;
+}
+
+static int srtp_open(URLContext *h, const char *uri, int flags)
+{
+ SRTPProtoContext *s = h->priv_data;
+ char hostname[256], buf[1024], path[1024];
+ int rtp_port, ret;
+
+ if (s->out_suite && s->out_params)
+ if ((ret = ff_srtp_set_crypto(&s->srtp_out, s->out_suite, s->out_params)) < 0)
+ goto fail;
+ if (s->in_suite && s->in_params)
+ if ((ret = ff_srtp_set_crypto(&s->srtp_in, s->in_suite, s->in_params)) < 0)
+ goto fail;
+
+ av_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &rtp_port,
+ path, sizeof(path), uri);
+ ff_url_join(buf, sizeof(buf), "rtp", NULL, hostname, rtp_port, "%s", path);
+ if ((ret = ffurl_open(&s->rtp_hd, buf, flags, &h->interrupt_callback, NULL)) < 0)
+ goto fail;
+
+ h->max_packet_size = FFMIN(s->rtp_hd->max_packet_size,
+ sizeof(s->encryptbuf)) - 14;
+ h->is_streamed = 1;
+ return 0;
+
+fail:
+ srtp_close(h);
+ return ret;
+}
+
+static int srtp_read(URLContext *h, uint8_t *buf, int size)
+{
+ SRTPProtoContext *s = h->priv_data;
+ int ret;
+start:
+ ret = ffurl_read(s->rtp_hd, buf, size);
+ if (ret > 0 && s->srtp_in.aes) {
+ if (ff_srtp_decrypt(&s->srtp_in, buf, &ret) < 0)
+ goto start;
+ }
+ return ret;
+}
+
+static int srtp_write(URLContext *h, const uint8_t *buf, int size)
+{
+ SRTPProtoContext *s = h->priv_data;
+ if (!s->srtp_out.aes)
+ return ffurl_write(s->rtp_hd, buf, size);
+ size = ff_srtp_encrypt(&s->srtp_out, buf, size, s->encryptbuf,
+ sizeof(s->encryptbuf));
+ if (size < 0)
+ return size;
+ return ffurl_write(s->rtp_hd, s->encryptbuf, size);
+}
+
+static int srtp_get_file_handle(URLContext *h)
+{
+ SRTPProtoContext *s = h->priv_data;
+ return ffurl_get_file_handle(s->rtp_hd);
+}
+
+static int srtp_get_multi_file_handle(URLContext *h, int **handles,
+ int *numhandles)
+{
+ SRTPProtoContext *s = h->priv_data;
+ return ffurl_get_multi_file_handle(s->rtp_hd, handles, numhandles);
+}
+
+URLProtocol ff_srtp_protocol = {
+ .name = "srtp",
+ .url_open = srtp_open,
+ .url_read = srtp_read,
+ .url_write = srtp_write,
+ .url_close = srtp_close,
+ .url_get_file_handle = srtp_get_file_handle,
+ .url_get_multi_file_handle = srtp_get_multi_file_handle,
+ .priv_data_size = sizeof(SRTPProtoContext),
+ .priv_data_class = &srtp_context_class,
+ .flags = URL_PROTOCOL_FLAG_NETWORK,
+};

libav-v9.6.tar.bz2/libavformat/swfenc.c -> libav-v10.1.tar.bz2/libavformat/swfenc.c Changed

libav-v9.6.tar.bz2/libavformat/takdec.c -> libav-v10.1.tar.bz2/libavformat/takdec.c Changed

libav-v9.6.tar.bz2/libavformat/tcp.c -> libav-v10.1.tar.bz2/libavformat/tcp.c Changed

@@ -42,7 +42,6 @@
 const char *p;
 char buf[256];
 int ret;
- socklen_t optlen;
 int timeout = 100, listen_timeout = -1;
 char hostname[1024],proto[1024],path[1024];
 char portstr[10];
@@ -85,87 +84,31 @@
 cur_ai = ai;
 
 restart:
- ret = AVERROR(EIO);
- fd = socket(cur_ai->ai_family, cur_ai->ai_socktype, cur_ai->ai_protocol);
- if (fd < 0)
+ fd = ff_socket(cur_ai->ai_family,
+ cur_ai->ai_socktype,
+ cur_ai->ai_protocol);
+ if (fd < 0) {
+ ret = ff_neterrno();
 goto fail;
+ }
 
 if (listen_socket) {
- int fd1;
- int reuse = 1;
- struct pollfd lp = { fd, POLLIN, 0 };
- setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse));
- ret = bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen);
- if (ret) {
- ret = ff_neterrno();
+ if ((fd = ff_listen_bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen,
+ listen_timeout, h)) < 0) {
+ ret = fd;
 goto fail1;
 }
- ret = listen(fd, 1);
- if (ret) {
- ret = ff_neterrno();
- goto fail1;
- }
- ret = poll(&lp, 1, listen_timeout >= 0 ? listen_timeout : -1);
- if (ret <= 0) {
- ret = AVERROR(ETIMEDOUT);
- goto fail1;
- }
- fd1 = accept(fd, NULL, NULL);
- if (fd1 < 0) {
- ret = ff_neterrno();
- goto fail1;
- }
- closesocket(fd);
- fd = fd1;
- ff_socket_nonblock(fd, 1);
 } else {
- redo:
- ff_socket_nonblock(fd, 1);
- ret = connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen);
- }
-
- if (ret < 0) {
- struct pollfd p = {fd, POLLOUT, 0};
- ret = ff_neterrno();
- if (ret == AVERROR(EINTR)) {
- if (ff_check_interrupt(&h->interrupt_callback)) {
- ret = AVERROR_EXIT;
- goto fail1;
- }
- goto redo;
- }
- if (ret != AVERROR(EINPROGRESS) &&
- ret != AVERROR(EAGAIN))
- goto fail;
+ if ((ret = ff_listen_connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen,
+ timeout * 100, h, !!cur_ai->ai_next)) < 0) {
 
- /* wait until we are connected or until abort */
- while(timeout--) {
- if (ff_check_interrupt(&h->interrupt_callback)) {
- ret = AVERROR_EXIT;
+ if (ret == AVERROR_EXIT)
 goto fail1;
- }
- ret = poll(&p, 1, 100);
- if (ret > 0)
- break;
- }
- if (ret <= 0) {
- ret = AVERROR(ETIMEDOUT);
- goto fail;
- }
- /* test error */
- optlen = sizeof(ret);
- if (getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &optlen))
- ret = AVUNERROR(ff_neterrno());
- if (ret != 0) {
- char errbuf[100];
- ret = AVERROR(ret);
- av_strerror(ret, errbuf, sizeof(errbuf));
- av_log(h, AV_LOG_ERROR,
- "TCP connection to %s:%d failed: %s\n",
- hostname, port, errbuf);
- goto fail;
+ else
+ goto fail;
 }
 }
+
 h->is_streamed = 1;
 s->fd = fd;
 freeaddrinfo(ai);
@@ -177,6 +120,7 @@
 cur_ai = cur_ai->ai_next;
 if (fd >= 0)
 closesocket(fd);
+ ret = 0;
 goto restart;
 }
 fail1:

libav-v9.6.tar.bz2/libavformat/tls.c -> libav-v10.1.tar.bz2/libavformat/tls.c Changed

@@ -22,8 +22,11 @@
 #include "avformat.h"
 #include "url.h"
 #include "libavutil/avstring.h"
+#include "libavutil/opt.h"
+#include "libavutil/parseutils.h"
 #if CONFIG_GNUTLS
 #include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
 #define TLS_read(c, buf, size) gnutls_record_recv(c->session, buf, size)
 #define TLS_write(c, buf, size) gnutls_record_send(c->session, buf, size)
 #define TLS_shutdown(c) gnutls_bye(c->session, GNUTLS_SHUT_RDWR)
@@ -65,14 +68,45 @@
 SSL *ssl;
 #endif
 int fd;
+ char *ca_file;
+ int verify;
+ char *cert_file;
+ char *key_file;
+ int listen;
 } TLSContext;
 
+#define OFFSET(x) offsetof(TLSContext, x)
+#define D AV_OPT_FLAG_DECODING_PARAM
+#define E AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption options[] = {
+ {"ca_file", "Certificate Authority database file", OFFSET(ca_file), AV_OPT_TYPE_STRING, .flags = D|E },
+ {"tls_verify", "Verify the peer certificate", OFFSET(verify), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags = D|E },
+ {"cert_file", "Certificate file", OFFSET(cert_file), AV_OPT_TYPE_STRING, .flags = D|E },
+ {"key_file", "Private key file", OFFSET(key_file), AV_OPT_TYPE_STRING, .flags = D|E },
+ {"listen", "Listen for incoming connections", OFFSET(listen), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags = D|E },
+ { NULL }
+};
+
+static const AVClass tls_class = {
+ .class_name = "tls",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
 static int do_tls_poll(URLContext *h, int ret)
 {
 TLSContext *c = h->priv_data;
 struct pollfd p = { c->fd, 0, 0 };
 #if CONFIG_GNUTLS
- if (ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED) {
+ switch (ret) {
+ case GNUTLS_E_AGAIN:
+ case GNUTLS_E_INTERRUPTED:
+ break;
+ case GNUTLS_E_WARNING_ALERT_RECEIVED:
+ av_log(h, AV_LOG_WARNING, "%s\n", gnutls_strerror(ret));
+ break;
+ default:
 av_log(h, AV_LOG_ERROR, "%s\n", gnutls_strerror(ret));
 return AVERROR(EIO);
 }
@@ -108,7 +142,7 @@
 TLSContext *c = h->priv_data;
 int ret;
 int port;
- char buf[200], host[200];
+ char buf[200], host[200], opts[50] = "";
 int numerichost = 0;
 struct addrinfo hints = { 0 }, *ai = NULL;
 const char *proxy_path;
@@ -116,12 +150,11 @@
 
 ff_tls_init();
 
- proxy_path = getenv("http_proxy");
- use_proxy = (proxy_path != NULL) && !getenv("no_proxy") &&
- av_strstart(proxy_path, "http://", NULL);
+ if (c->listen)
+ snprintf(opts, sizeof(opts), "?listen=1");
 
 av_url_split(NULL, 0, NULL, 0, host, sizeof(host), &port, NULL, 0, uri);
- ff_url_join(buf, sizeof(buf), "tcp", NULL, host, port, NULL);
+ ff_url_join(buf, sizeof(buf), "tcp", NULL, host, port, "%s", opts);
 
 hints.ai_flags = AI_NUMERICHOST;
 if (!getaddrinfo(host, NULL, &hints, &ai)) {
@@ -129,6 +162,10 @@
 freeaddrinfo(ai);
 }
 
+ proxy_path = getenv("http_proxy");
+ use_proxy = !ff_http_match_no_proxy(getenv("no_proxy"), host) &&
+ proxy_path != NULL && av_strstart(proxy_path, "http://", NULL);
+
 if (use_proxy) {
 char proxy_host[200], proxy_auth[200], dest[200];
 int proxy_port;
@@ -147,11 +184,30 @@
 c->fd = ffurl_get_file_handle(c->tcp);
 
 #if CONFIG_GNUTLS
- gnutls_init(&c->session, GNUTLS_CLIENT);
- if (!numerichost)
+ gnutls_init(&c->session, c->listen ? GNUTLS_SERVER : GNUTLS_CLIENT);
+ if (!c->listen && !numerichost)
 gnutls_server_name_set(c->session, GNUTLS_NAME_DNS, host, strlen(host));
 gnutls_certificate_allocate_credentials(&c->cred);
- gnutls_certificate_set_verify_flags(c->cred, 0);
+ if (c->ca_file)
+ gnutls_certificate_set_x509_trust_file(c->cred, c->ca_file, GNUTLS_X509_FMT_PEM);
+#if GNUTLS_VERSION_MAJOR >= 3
+ else
+ gnutls_certificate_set_x509_system_trust(c->cred);
+#endif
+ gnutls_certificate_set_verify_flags(c->cred, c->verify ?
+ GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT : 0);
+ if (c->cert_file && c->key_file) {
+ ret = gnutls_certificate_set_x509_key_file(c->cred,
+ c->cert_file, c->key_file,
+ GNUTLS_X509_FMT_PEM);
+ if (ret < 0) {
+ av_log(h, AV_LOG_ERROR,
+ "Unable to set cert/key files %s and %s: %s\n",
+ c->cert_file, c->key_file, gnutls_strerror(ret));
+ ret = AVERROR(EIO);
+ goto fail;
+ }
+ }
 gnutls_credentials_set(c->session, GNUTLS_CRD_CERTIFICATE, c->cred);
 gnutls_transport_set_ptr(c->session, (gnutls_transport_ptr_t)
 (intptr_t) c->fd);
@@ -163,13 +219,63 @@
 if ((ret = do_tls_poll(h, ret)) < 0)
 goto fail;
 }
+ if (c->verify) {
+ unsigned int status, cert_list_size;
+ gnutls_x509_crt_t cert;
+ const gnutls_datum_t *cert_list;
+ if ((ret = gnutls_certificate_verify_peers2(c->session, &status)) < 0) {
+ av_log(h, AV_LOG_ERROR, "Unable to verify peer certificate: %s\n",
+ gnutls_strerror(ret));
+ ret = AVERROR(EIO);
+ goto fail;
+ }
+ if (status & GNUTLS_CERT_INVALID) {
+ av_log(h, AV_LOG_ERROR, "Peer certificate failed verification\n");
+ ret = AVERROR(EIO);
+ goto fail;
+ }
+ if (gnutls_certificate_type_get(c->session) != GNUTLS_CRT_X509) {
+ av_log(h, AV_LOG_ERROR, "Unsupported certificate type\n");
+ ret = AVERROR(EIO);
+ goto fail;
+ }
+ gnutls_x509_crt_init(&cert);
+ cert_list = gnutls_certificate_get_peers(c->session, &cert_list_size);
+ gnutls_x509_crt_import(cert, cert_list, GNUTLS_X509_FMT_DER);
+ ret = gnutls_x509_crt_check_hostname(cert, host);
+ gnutls_x509_crt_deinit(cert);
+ if (!ret) {
+ av_log(h, AV_LOG_ERROR,
+ "The certificate's owner does not match hostname %s\n", host);
+ ret = AVERROR(EIO);
+ goto fail;
+ }
+ }
 #elif CONFIG_OPENSSL
- c->ctx = SSL_CTX_new(TLSv1_client_method());
+ c->ctx = SSL_CTX_new(c->listen ? TLSv1_server_method() : TLSv1_client_method());
 if (!c->ctx) {
 av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));
 ret = AVERROR(EIO);
 goto fail;
 }
+ if (c->ca_file)
+ SSL_CTX_load_verify_locations(c->ctx, c->ca_file, NULL);
+ if (c->cert_file && !SSL_CTX_use_certificate_chain_file(c->ctx, c->cert_file)) {
+ av_log(h, AV_LOG_ERROR, "Unable to load cert file %s: %s\n",
+ c->cert_file, ERR_error_string(ERR_get_error(), NULL));
+ ret = AVERROR(EIO);
+ goto fail;
+ }
+ if (c->key_file && !SSL_CTX_use_PrivateKey_file(c->ctx, c->key_file, SSL_FILETYPE_PEM)) {
+ av_log(h, AV_LOG_ERROR, "Unable to load key file %s: %s\n",
+ c->key_file, ERR_error_string(ERR_get_error(), NULL));
+ ret = AVERROR(EIO);
+ goto fail;
+ }
+ // Note, this doesn't check that the peer certificate actually matches
+ // the requested hostname.
+ if (c->verify)
+ SSL_CTX_set_verify(c->ctx, SSL_VERIFY_PEER, NULL);
 c->ssl = SSL_new(c->ctx);
 if (!c->ssl) {
 av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));
@@ -177,10 +283,10 @@
 goto fail;
 }
 SSL_set_fd(c->ssl, c->fd);
- if (!numerichost)
+ if (!c->listen && !numerichost)
 SSL_set_tlsext_host_name(c->ssl, host);
 while (1) {
- ret = SSL_connect(c->ssl);
+ ret = c->listen ? SSL_accept(c->ssl) : SSL_connect(c->ssl);
 if (ret > 0)
 break;
 if (ret == 0) {
@@ -249,4 +355,5 @@
 .url_close = tls_close,
 .priv_data_size = sizeof(TLSContext),
 .flags = URL_PROTOCOL_FLAG_NETWORK,
+ .priv_data_class = &tls_class,
 };

libav-v9.6.tar.bz2/libavformat/tta.c -> libav-v10.1.tar.bz2/libavformat/tta.c Changed

libav-v9.6.tar.bz2/libavformat/tty.c -> libav-v10.1.tar.bz2/libavformat/tty.c Changed

libav-v9.6.tar.bz2/libavformat/udp.c -> libav-v10.1.tar.bz2/libavformat/udp.c Changed

@@ -181,7 +181,7 @@
 int level = addr->sa_family == AF_INET ? IPPROTO_IP : IPPROTO_IPV6;
 struct addrinfo *sourceaddr = udp_resolve_host(sources[i], 0,
 SOCK_DGRAM, AF_UNSPEC,
- AI_NUMERICHOST);
+ 0);
 if (!sourceaddr)
 return AVERROR(ENOENT);
 
@@ -211,7 +211,7 @@
 struct ip_mreq_source mreqs;
 struct addrinfo *sourceaddr = udp_resolve_host(sources[i], 0,
 SOCK_DGRAM, AF_UNSPEC,
- AI_NUMERICHOST);
+ 0);
 if (!sourceaddr)
 return AVERROR(ENOENT);
 if (sourceaddr->ai_addr->sa_family != AF_INET) {
@@ -270,7 +270,7 @@
 if (res0 == 0)
 goto fail;
 for (res = res0; res; res=res->ai_next) {
- udp_fd = socket(res->ai_family, SOCK_DGRAM, 0);
+ udp_fd = ff_socket(res->ai_family, SOCK_DGRAM, 0);
 if (udp_fd != -1) break;
 log_net_error(NULL, AV_LOG_ERROR, "socket");
 }
@@ -378,6 +378,27 @@
 return s->udp_fd;
 }
 
+static int parse_source_list(char *buf, char **sources, int *num_sources,
+ int max_sources)
+{
+ char *source_start;
+
+ source_start = buf;
+ while (1) {
+ char *next = strchr(source_start, ',');
+ if (next)
+ *next = '\0';
+ sources[*num_sources] = av_strdup(source_start);
+ if (!sources[*num_sources])
+ return AVERROR(ENOMEM);
+ source_start = next + 1;
+ (*num_sources)++;
+ if (*num_sources >= max_sources || !next)
+ break;
+ }
+ return 0;
+}
+
 /* put it in UDP context */
 /* return non zero if error */
 static int udp_open(URLContext *h, const char *uri, int flags)
@@ -391,8 +412,8 @@
 struct sockaddr_storage my_addr;
 socklen_t len;
 int reuse_specified = 0;
- int i, include = 0, num_sources = 0;
- char *sources[32];
+ int i, num_include_sources = 0, num_exclude_sources = 0;
+ char *include_sources[32], *exclude_sources[32];
 
 h->is_streamed = 1;
 h->max_packet_size = 1472;
@@ -430,24 +451,15 @@
 if (av_find_info_tag(buf, sizeof(buf), "localaddr", p)) {
 av_strlcpy(localaddr, buf, sizeof(localaddr));
 }
- if (av_find_info_tag(buf, sizeof(buf), "sources", p))
- include = 1;
- if (include || av_find_info_tag(buf, sizeof(buf), "block", p)) {
- char *source_start;
-
- source_start = buf;
- while (1) {
- char *next = strchr(source_start, ',');
- if (next)
- *next = '\0';
- sources[num_sources] = av_strdup(source_start);
- if (!sources[num_sources])
- goto fail;
- source_start = next + 1;
- num_sources++;
- if (num_sources >= FF_ARRAY_ELEMS(sources) || !next)
- break;
- }
+ if (av_find_info_tag(buf, sizeof(buf), "sources", p)) {
+ if (parse_source_list(buf, include_sources, &num_include_sources,
+ FF_ARRAY_ELEMS(include_sources)))
+ goto fail;
+ }
+ if (av_find_info_tag(buf, sizeof(buf), "block", p)) {
+ if (parse_source_list(buf, exclude_sources, &num_exclude_sources,
+ FF_ARRAY_ELEMS(exclude_sources)))
+ goto fail;
 }
 }
 
@@ -506,20 +518,20 @@
 }
 if (h->flags & AVIO_FLAG_READ) {
 /* input */
- if (num_sources == 0 || !include) {
+ if (num_include_sources && num_exclude_sources) {
+ av_log(h, AV_LOG_ERROR, "Simultaneously including and excluding multicast sources is not supported\n");
+ goto fail;
+ }
+ if (num_include_sources) {
+ 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)
 goto fail;
-
- if (num_sources) {
- if (udp_set_multicast_sources(udp_fd, (struct sockaddr *)&s->dest_addr, s->dest_addr_len, sources, num_sources, 0) < 0)
- goto fail;
- }
- } else if (include && num_sources) {
- if (udp_set_multicast_sources(udp_fd, (struct sockaddr *)&s->dest_addr, s->dest_addr_len, sources, num_sources, 1) < 0)
+ }
+ if (num_exclude_sources) {
+ if (udp_set_multicast_sources(udp_fd, (struct sockaddr *)&s->dest_addr, s->dest_addr_len, exclude_sources, num_exclude_sources, 0) < 0)
 goto fail;
- } else {
- av_log(NULL, AV_LOG_ERROR, "invalid udp settings: inclusive multicast but no sources given\n");
- goto fail;
 }
 }
 }
@@ -548,16 +560,20 @@
 }
 }
 
- for (i = 0; i < num_sources; i++)
- av_free(sources[i]);
+ for (i = 0; i < num_include_sources; i++)
+ av_freep(&include_sources[i]);
+ for (i = 0; i < num_exclude_sources; i++)
+ av_freep(&exclude_sources[i]);
 
 s->udp_fd = udp_fd;
 return 0;
 fail:
 if (udp_fd >= 0)
 closesocket(udp_fd);
- for (i = 0; i < num_sources; i++)
- av_free(sources[i]);
+ for (i = 0; i < num_include_sources; i++)
+ av_freep(&include_sources[i]);
+ for (i = 0; i < num_exclude_sources; i++)
+ av_freep(&exclude_sources[i]);
 return AVERROR(EIO);
 }

libav-v10.1.tar.bz2/libavformat/unix.c Added

@@ -0,0 +1,156 @@
+/*
+ * Unix socket protocol
+ * Copyright (c) 2013 Luca Barbato
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ *
+ * Unix socket url_protocol
+ *
+ */
+
+#include <sys/un.h>
+
+#include "libavutil/avstring.h"
+#include "libavutil/opt.h"
+#include "os_support.h"
+#include "network.h"
+#include "url.h"
+
+typedef struct UnixContext {
+ const AVClass *class;
+ struct sockaddr_un addr;
+ int timeout;
+ int listen;
+ int type;
+ int fd;
+} UnixContext;
+
+#define OFFSET(x) offsetof(UnixContext, x)
+#define ED AV_OPT_FLAG_DECODING_PARAM|AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption unix_options[] = {
+ { "listen", "Open socket for listening", OFFSET(listen), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, ED },
+ { "timeout", "Timeout in ms", OFFSET(timeout), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, ED },
+ { "type", "Socket type", OFFSET(type), AV_OPT_TYPE_INT, { .i64 = SOCK_STREAM }, INT_MIN, INT_MAX, ED, "type" },
+ { "stream", "Stream (reliable stream-oriented)", 0, AV_OPT_TYPE_CONST, { .i64 = SOCK_STREAM }, INT_MIN, INT_MAX, ED, "type" },
+ { "datagram", "Datagram (unreliable packet-oriented)", 0, AV_OPT_TYPE_CONST, { .i64 = SOCK_DGRAM }, INT_MIN, INT_MAX, ED, "type" },
+ { "seqpacket", "Seqpacket (reliable packet-oriented", 0, AV_OPT_TYPE_CONST, { .i64 = SOCK_SEQPACKET }, INT_MIN, INT_MAX, ED, "type" },
+ { NULL }
+};
+
+static const AVClass unix_class = {
+ .class_name = "unix",
+ .item_name = av_default_item_name,
+ .option = unix_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+static int unix_open(URLContext *h, const char *filename, int flags)
+{
+ UnixContext *s = h->priv_data;
+ int fd, ret;
+
+ av_strstart(filename, "unix:", &filename);
+ s->addr.sun_family = AF_UNIX;
+ av_strlcpy(s->addr.sun_path, filename, sizeof(s->addr.sun_path));
+
+ if ((fd = ff_socket(AF_UNIX, s->type, 0)) < 0)
+ return ff_neterrno();
+
+ if (s->listen) {
+ fd = ff_listen_bind(fd, (struct sockaddr *)&s->addr,
+ sizeof(s->addr), s->timeout, h);
+ if (fd < 0) {
+ ret = fd;
+ goto fail;
+ }
+ } else {
+ ret = ff_listen_connect(fd, (struct sockaddr *)&s->addr,
+ sizeof(s->addr), s->timeout, h, 0);
+ if (ret < 0)
+ goto fail;
+ }
+
+ s->fd = fd;
+
+ return 0;
+
+fail:
+ if (s->listen && AVUNERROR(ret) != EADDRINUSE)
+ unlink(s->addr.sun_path);
+ if (fd >= 0)
+ closesocket(fd);
+ return ret;
+}
+
+static int unix_read(URLContext *h, uint8_t *buf, int size)
+{
+ UnixContext *s = h->priv_data;
+ int ret;
+
+ if (!(h->flags & AVIO_FLAG_NONBLOCK)) {
+ ret = ff_network_wait_fd(s->fd, 0);
+ if (ret < 0)
+ return ret;
+ }
+ ret = recv(s->fd, buf, size, 0);
+ return ret < 0 ? ff_neterrno() : ret;
+}
+
+static int unix_write(URLContext *h, const uint8_t *buf, int size)
+{
+ UnixContext *s = h->priv_data;
+ int ret;
+
+ if (!(h->flags & AVIO_FLAG_NONBLOCK)) {
+ ret = ff_network_wait_fd(s->fd, 1);
+ if (ret < 0)
+ return ret;
+ }
+ ret = send(s->fd, buf, size, 0);
+ return ret < 0 ? ff_neterrno() : ret;
+}
+
+static int unix_close(URLContext *h)
+{
+ UnixContext *s = h->priv_data;
+ if (s->listen)
+ unlink(s->addr.sun_path);
+ closesocket(s->fd);
+ return 0;
+}
+
+static int unix_get_file_handle(URLContext *h)
+{
+ UnixContext *s = h->priv_data;
+ return s->fd;
+}
+
+URLProtocol ff_unix_protocol = {
+ .name = "unix",
+ .url_open = unix_open,
+ .url_read = unix_read,
+ .url_write = unix_write,
+ .url_close = unix_close,
+ .url_get_file_handle = unix_get_file_handle,
+ .priv_data_size = sizeof(UnixContext),
+ .priv_data_class = &unix_class,
+ .flags = URL_PROTOCOL_FLAG_NETWORK,
+};

libav-v9.6.tar.bz2/libavformat/url-test.c -> libav-v10.1.tar.bz2/libavformat/url-test.c Changed

libav-v10.1.tar.bz2/libavformat/url.c Added

@@ -0,0 +1,147 @@
+/*
+ * URL utility functions
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+#include "avformat.h"
+#include "config.h"
+#include "url.h"
+#if CONFIG_NETWORK
+#include "network.h"
+#endif
+#include "libavutil/avstring.h"
+
+/**
+ * @file
+ * URL utility functions.
+ */
+
+int ff_url_join(char *str, int size, const char *proto,
+                const char *authorization, const char *hostname,
+                int port, const char *fmt, ...)
+{
+#if CONFIG_NETWORK
+    struct addrinfo hints = { 0 }, *ai;
+#endif
+
+    str[0] = '\0';
+    if (proto)
+        av_strlcatf(str, size, "%s://", proto);
+    if (authorization && authorization[0])
+        av_strlcatf(str, size, "%s@", authorization);
+#if CONFIG_NETWORK && defined(AF_INET6)
+    /* Determine if hostname is a numerical IPv6 address,
+     * properly escape it within [] in that case. */
+    hints.ai_flags = AI_NUMERICHOST;
+    if (!getaddrinfo(hostname, NULL, &hints, &ai)) {
+        if (ai->ai_family == AF_INET6) {
+            av_strlcat(str, "[", size);
+            av_strlcat(str, hostname, size);
+            av_strlcat(str, "]", size);
+        } else {
+            av_strlcat(str, hostname, size);
+        }
+        freeaddrinfo(ai);
+    } else
+#endif
+        /* Not an IPv6 address, just output the plain string. */
+        av_strlcat(str, hostname, size);
+
+    if (port >= 0)
+        av_strlcatf(str, size, ":%d", port);
+    if (fmt) {
+        va_list vl;
+        int len = strlen(str);
+
+        va_start(vl, fmt);
+        vsnprintf(str + len, size > len ? size - len : 0, fmt, vl);
+        va_end(vl);
+    }
+    return strlen(str);
+}
+
+void ff_make_absolute_url(char *buf, int size, const char *base,
+                          const char *rel)
+{
+    char *sep, *path_query;
+    /* Absolute path, relative to the current server */
+    if (base && strstr(base, "://") && rel[0] == '/') {
+        if (base != buf)
+            av_strlcpy(buf, base, size);
+        sep = strstr(buf, "://");
+        if (sep) {
+            /* Take scheme from base url */
+            if (rel[1] == '/') {
+                sep[1] = '\0';
+            } else {
+                /* Take scheme and host from base url */
+                sep += 3;
+                sep = strchr(sep, '/');
+                if (sep)
+                    *sep = '\0';
+            }
+        }
+        av_strlcat(buf, rel, size);
+        return;
+    }
+    /* If rel actually is an absolute url, just copy it */
+    if (!base || strstr(rel, "://") || rel[0] == '/') {
+        av_strlcpy(buf, rel, size);
+        return;
+    }
+    if (base != buf)
+        av_strlcpy(buf, base, size);
+
+    /* Strip off any query string from base */
+    path_query = strchr(buf, '?');
+    if (path_query != NULL)
+        *path_query = '\0';
+
+    /* Is relative path just a new query part? */
+    if (rel[0] == '?') {
+        av_strlcat(buf, rel, size);
+        return;
+    }
+
+    /* Remove the file name from the base url */
+    sep = strrchr(buf, '/');
+    if (sep)
+        sep[1] = '\0';
+    else
+        buf[0] = '\0';
+    while (av_strstart(rel, "../", NULL) && sep) {
+        /* Remove the path delimiter at the end */
+        sep[0] = '\0';
+        sep = strrchr(buf, '/');
+        /* If the next directory name to pop off is "..", break here */
+        if (!strcmp(sep ? &sep[1] : buf, "..")) {
+            /* Readd the slash we just removed */
+            av_strlcat(buf, "/", size);
+            break;
+        }
+        /* Cut off the directory name */
+        if (sep)
+            sep[1] = '\0';
+        else
+            buf[0] = '\0';
+        rel += 3;
+    }
+    av_strlcat(buf, rel, size);
+}

libav-v9.6.tar.bz2/libavformat/url.h -> libav-v10.1.tar.bz2/libavformat/url.h Changed

@@ -224,10 +224,8 @@
 
 /**
  * Register the URLProtocol protocol.
- *
- * @param size the size of the URLProtocol struct referenced
  */
-int ffurl_register_protocol(URLProtocol *protocol, int size);
+int ffurl_register_protocol(URLProtocol *protocol);
 
 /**
  * Check if the user has requested to interrup a blocking function
@@ -246,4 +244,41 @@
 int ff_udp_set_remote_url(URLContext *h, const char *uri);
 int ff_udp_get_local_port(URLContext *h);
 
+/**
+ * Assemble a URL string from components. This is the reverse operation
+ * of av_url_split.
+ *
+ * Note, this requires networking to be initialized, so the caller must
+ * ensure ff_network_init has been called.
+ *
+ * @see av_url_split
+ *
+ * @param str the buffer to fill with the url
+ * @param size the size of the str buffer
+ * @param proto the protocol identifier, if null, the separator
+ *              after the identifier is left out, too
+ * @param authorization an optional authorization string, may be null.
+ *                      An empty string is treated the same as a null string.
+ * @param hostname the host name string
+ * @param port the port number, left out from the string if negative
+ * @param fmt a generic format string for everything to add after the
+ *            host/port, may be null
+ * @return the number of characters written to the destination buffer
+ */
+int ff_url_join(char *str, int size, const char *proto,
+                const char *authorization, const char *hostname,
+                int port, const char *fmt, ...) av_printf_format(7, 8);
+
+/*
+ * Convert a relative url into an absolute url, given a base url.
+ *
+ * @param buf the buffer where output absolute url is written
+ * @param size the size of buf
+ * @param base the base url, may be equal to buf.
+ * @param rel the new url, which is interpreted relative to base
+ */
+void ff_make_absolute_url(char *buf, int size, const char *base,
+                          const char *rel);
+
+
 #endif /* AVFORMAT_URL_H */

libav-v9.6.tar.bz2/libavformat/urldecode.c -> libav-v10.1.tar.bz2/libavformat/urldecode.c Changed

libav-v9.6.tar.bz2/libavformat/utils.c -> libav-v10.1.tar.bz2/libavformat/utils.c Changed

@@ -19,33 +19,37 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-/* #define DEBUG */
+#undef NDEBUG
+#include <assert.h>
+#include <stdarg.h>
+#include <stdint.h>
+
+#include "config.h"
 
-#include "avformat.h"
-#include "avio_internal.h"
-#include "internal.h"
-#include "libavcodec/internal.h"
-#include "libavcodec/bytestream.h"
-#include "libavutil/opt.h"
-#include "libavutil/dict.h"
-#include "libavutil/pixdesc.h"
-#include "metadata.h"
-#include "id3v2.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 "riff.h"
+
+#include "libavcodec/bytestream.h"
+#include "libavcodec/internal.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
@@ -68,194 +72,75 @@
 return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
 }
 
-/** head of registered input format linked list */
-static AVInputFormat *first_iformat = NULL;
-/** head of registered output format linked list */
-static AVOutputFormat *first_oformat = NULL;
+/* an arbitrarily chosen "sane" max packet size -- 50M */
+#define SANE_CHUNK_SIZE (50000000)
 
-AVInputFormat *av_iformat_next(AVInputFormat *f)
-{
- if(f) return f->next;
- else return first_iformat;
-}
-
-AVOutputFormat *av_oformat_next(AVOutputFormat *f)
-{
- if(f) return f->next;
- else return first_oformat;
-}
-
-void av_register_input_format(AVInputFormat *format)
-{
- AVInputFormat **p;
- p = &first_iformat;
- while (*p != NULL) p = &(*p)->next;
- *p = format;
- format->next = NULL;
-}
-
-void av_register_output_format(AVOutputFormat *format)
-{
- AVOutputFormat **p;
- p = &first_oformat;
- while (*p != NULL) p = &(*p)->next;
- *p = format;
- format->next = NULL;
-}
-
-int av_match_ext(const char *filename, const char *extensions)
-{
- const char *ext, *p;
- char ext1[32], *q;
-
- if(!filename)
- return 0;
+/* 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 chunk_size = size;
+ int64_t orig_pos = pkt->pos; // av_grow_packet might reset pos
+ int orig_size = pkt->size;
+ int ret = 0;
 
- ext = strrchr(filename, '.');
- if (ext) {
- ext++;
- p = extensions;
- for(;;) {
- q = ext1;
- while (*p != '\0' && *p != ',' && q-ext1<sizeof(ext1)-1)
- *q++ = *p++;
- *q = '\0';
- if (!av_strcasecmp(ext1, ext))
- return 1;
- if (*p == '\0')
- break;
- p++;
+ do {
+ 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. */
+ if (size > SANE_CHUNK_SIZE) {
+ int64_t filesize = avio_size(s) - avio_tell(s);
+ chunk_size = FFMAX(filesize, SANE_CHUNK_SIZE);
 }
- }
- return 0;
-}
+ read_size = FFMIN(size, chunk_size);
 
-static int match_format(const char *name, const char *names)
-{
- const char *p;
- int len, namelen;
-
- if (!name || !names)
- return 0;
-
- namelen = strlen(name);
- while ((p = strchr(names, ','))) {
- len = FFMAX(p - names, namelen);
- if (!av_strncasecmp(name, names, len))
- return 1;
- names = p+1;
- }
- return !av_strcasecmp(name, names);
-}
-
-AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
- const char *mime_type)
-{
- AVOutputFormat *fmt = NULL, *fmt_found;
- int score_max, score;
+ ret = av_grow_packet(pkt, read_size);
+ if (ret < 0)
+ break;
 
- /* specific test for image sequences */
-#if CONFIG_IMAGE2_MUXER
- if (!short_name && filename &&
- av_filename_number_test(filename) &&
- ff_guess_image2_codec(filename) != AV_CODEC_ID_NONE) {
- return av_guess_format("image2", NULL, NULL);
- }
-#endif
- /* Find the proper file type. */
- fmt_found = NULL;
- score_max = 0;
- while ((fmt = av_oformat_next(fmt))) {
- score = 0;
- if (fmt->name && short_name && !av_strcasecmp(fmt->name, short_name))
- score += 100;
- if (fmt->mime_type && mime_type && !strcmp(fmt->mime_type, mime_type))
- score += 10;
- if (filename && fmt->extensions &&
- av_match_ext(filename, fmt->extensions)) {
- score += 5;
- }
- if (score > score_max) {
- score_max = score;
- fmt_found = fmt;
- }
- }
- return fmt_found;
-}
-
-enum AVCodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
- const char *filename, const char *mime_type, enum AVMediaType type){
- if(type == AVMEDIA_TYPE_VIDEO){
- enum AVCodecID codec_id= AV_CODEC_ID_NONE;
-
-#if CONFIG_IMAGE2_MUXER
- if(!strcmp(fmt->name, "image2") || !strcmp(fmt->name, "image2pipe")){
- codec_id= ff_guess_image2_codec(filename);
+ ret = avio_read(s, pkt->data + prev_size, read_size);
+ if (ret != read_size) {
+ av_shrink_packet(pkt, prev_size + FFMAX(ret, 0));
+ break;
 }
-#endif
- if(codec_id == AV_CODEC_ID_NONE)
- codec_id= fmt->video_codec;
- return codec_id;
- }else if(type == AVMEDIA_TYPE_AUDIO)
- return fmt->audio_codec;
- else if (type == AVMEDIA_TYPE_SUBTITLE)
- return fmt->subtitle_codec;
- else
- return AV_CODEC_ID_NONE;
-}
 
-AVInputFormat *av_find_input_format(const char *short_name)
-{
- AVInputFormat *fmt = NULL;
- while ((fmt = av_iformat_next(fmt))) {
- if (match_format(short_name, fmt->name))
- return fmt;
- }
- return NULL;
-}
+ size -= read_size;
+ } while (size > 0);
 
+ pkt->pos = orig_pos;
+ if (!pkt->size)
+ av_free_packet(pkt);
+ return pkt->size > orig_size ? pkt->size - orig_size : ret;
+}
 
 int av_get_packet(AVIOContext *s, AVPacket *pkt, int size)
 {
- int ret= av_new_packet(pkt, size);
-
- if(ret<0)
- return ret;
-
- pkt->pos= avio_tell(s);
-
- ret= avio_read(s, pkt->data, size);
- if(ret<=0)
- av_free_packet(pkt);
- else
- av_shrink_packet(pkt, ret);
+ av_init_packet(pkt);
+ pkt->data = NULL;
+ pkt->size = 0;
+ pkt->pos = avio_tell(s);
 
- return ret;
+ return append_packet_chunked(s, pkt, size);
 }
 
 int av_append_packet(AVIOContext *s, AVPacket *pkt, int size)
 {
- int ret;
- int old_size;
 if (!pkt->size)
 return av_get_packet(s, pkt, size);
- old_size = pkt->size;
- ret = av_grow_packet(pkt, size);
- if (ret < 0)
- return ret;
- ret = avio_read(s, pkt->data + old_size, size);
- av_shrink_packet(pkt, old_size + FFMAX(ret, 0));
- return ret;
+ 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_format2(AVProbeData *pd, int is_opened, int *score_max)
+AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened,
+ int *score_max)
 {
 AVProbeData lpd = *pd;
 AVInputFormat *fmt1 = NULL, *fmt;
@@ -264,7 +149,7 @@
 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;
 }
 id3 = 1;
@@ -278,30 +163,30 @@
 if (fmt1->read_probe) {
 score = fmt1->read_probe(&lpd);
 } else if (fmt1->extensions) {
- if (av_match_ext(lpd.filename, fmt1->extensions)) {
- score = 50;
- }
+ 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;
 }
 
- /* a hack for files with huge id3v2 tags -- try to guess by file extension. */
- if (!fmt && is_opened && *score_max < AVPROBE_SCORE_MAX/4) {
+ // A hack for files with huge id3v2 tags -- try to guess by file extension.
+ if (!fmt && is_opened && *score_max < AVPROBE_SCORE_EXTENSION / 2) {
 while ((fmt = av_iformat_next(fmt)))
- if (fmt->extensions && av_match_ext(lpd.filename, fmt->extensions)) {
- *score_max = AVPROBE_SCORE_MAX/4;
+ if (fmt->extensions &&
+ av_match_ext(lpd.filename, fmt->extensions)) {
+ *score_max = AVPROBE_SCORE_EXTENSION / 2;
 break;
 }
 }
 
- if (!fmt && id3 && *score_max < AVPROBE_SCORE_MAX/4-1) {
+ if (!fmt && id3 && *score_max < AVPROBE_SCORE_EXTENSION / 2 - 1) {
 while ((fmt = av_iformat_next(fmt)))
 if (fmt->extensions && av_match_ext("mp3", fmt->extensions)) {
- *score_max = AVPROBE_SCORE_MAX/4-1;
+ *score_max = AVPROBE_SCORE_EXTENSION / 2 - 1;
 break;
 }
 }
@@ -309,23 +194,27 @@
 return fmt;
 }
 
-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, int score)
+static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st,
+ AVProbeData *pd, int score)
 {
 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 },
- { "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 },
+ { "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 }
 };
@@ -333,8 +222,10 @@
 
 if (fmt) {
 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;
@@ -351,60 +242,62 @@
 
 /** 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)
 
 int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
 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;
 int ret = 0, probe_size;
 
- 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)
 return AVERROR(EINVAL);
- }
 
- if (offset >= max_probe_size) {
+ if (offset >= max_probe_size)
 return AVERROR(EINVAL);
- }
+ avio_skip(pb, offset);
+ max_probe_size -= offset;
 
- 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))) {
- int score = probe_size < max_probe_size ? AVPROBE_SCORE_MAX/4 : 0;
- int buf_offset = (probe_size == PROBE_BUF_MIN) ? 0 : probe_size>>1;
+ 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))) {
+ int score = probe_size < max_probe_size ? AVPROBE_SCORE_MAX / 4 : 0;
 
- if (probe_size < offset) {
- continue;
- }
-
- /* read probe data */
- buf = av_realloc(buf, probe_size + AVPROBE_PADDING_SIZE);
- if ((ret = avio_read(pb, buf + buf_offset, probe_size - buf_offset)) < 0) {
- /* fail if error was not end of file, otherwise, lower score */
+ /* Read probe data. */
+ if ((ret = av_reallocp(&buf, probe_size + AVPROBE_PADDING_SIZE)) < 0)
+ return ret;
+ if ((ret = avio_read(pb, buf + pd.buf_size,
+ probe_size - pd.buf_size)) < 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 += ret;
- pd.buf = &buf[offset];
+ pd.buf = buf;
 
 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_MAX/4){ //this can only be true in the last iteration
- av_log(logctx, AV_LOG_WARNING, "Format detected only with low score of %d, misdetection possible!\n", score);
- }else
- av_log(logctx, AV_LOG_DEBUG, "Probed with size=%d and score=%d\n", probe_size, score);
+ if (*fmt) {
+ /* This can only be true in the last iteration. */
+ if (score <= AVPROBE_SCORE_MAX / 4) {
+ av_log(logctx, AV_LOG_WARNING,
+ "Format detected only with low score of %d, "
+ "misdetection possible!\n", score);
+ } else
+ av_log(logctx, AV_LOG_DEBUG,
+ "Probed with size=%d and score=%d\n", probe_size, score);
 }
 }
 
@@ -413,29 +306,31 @@
 return AVERROR_INVALIDDATA;
 }
 
- /* rewind. reuse probe buffer to avoid seeking */
+ /* Rewind. Reuse probe buffer to avoid seeking. */
 if ((ret = ffio_rewind_with_probe_data(pb, buf, pd.buf_size)) < 0)
 av_free(buf);
 
 return ret;
 }
 
-/* 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 };
 
 if (s->pb) {
 s->flags |= AVFMT_FLAG_CUSTOM_IO;
 if (!s->iformat)
- return av_probe_input_buffer(s->pb, &s->iformat, filename, s, 0, s->probesize);
+ return av_probe_input_buffer(s->pb, &s->iformat, filename,
+ s, 0, s->probesize);
 else if (s->iformat->flags & AVFMT_NOFILE)
 return AVERROR(EINVAL);
 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_format(&pd, 0))))
 return 0;
 
@@ -444,11 +339,13 @@
 return ret;
 if (s->iformat)
 return 0;
- return av_probe_input_buffer(s->pb, &s->iformat, filename, s, 0, s->probesize);
+ return av_probe_input_buffer(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;
@@ -458,25 +355,31 @@
 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;
 }
 
-static void queue_attached_pictures(AVFormatContext *s)
+static int queue_attached_pictures(AVFormatContext *s)
 {
 int i;
 for (i = 0; i < s->nb_streams; i++)
 if (s->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC &&
 s->streams[i]->discard < AVDISCARD_ALL) {
 AVPacket copy = s->streams[i]->attached_pic;
- copy.destruct = NULL;
- add_to_pktbuf(&s->raw_packet_buffer, &copy, &s->raw_packet_buffer_end);
+ 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);
 }
+ 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;
@@ -497,7 +400,7 @@
 if ((ret = init_input(s, filename, &tmp)) < 0)
 goto fail;
 
- /* 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);
@@ -508,14 +411,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;
@@ -535,7 +438,8 @@
 goto fail;
 ff_id3v2_free_extra_meta(&id3v2_extra_meta);
 
- queue_attached_pictures(s);
+ if ((ret = queue_attached_pictures(s)) < 0)
+ goto fail;
 
 if (s->pb && !s->data_offset)
 s->data_offset = avio_tell(s->pb);
@@ -561,60 +465,66 @@
 
 /*******************************************************/
 
-static void probe_codec(AVFormatContext *s, AVStream *st, const AVPacket *pkt)
+static int probe_codec(AVFormatContext *s, AVStream *st, const AVPacket *pkt)
 {
- if(st->codec->codec_id == AV_CODEC_ID_PROBE){
+ if (st->codec->codec_id == AV_CODEC_ID_PROBE) {
 AVProbeData *pd = &st->probe_data;
 av_log(s, AV_LOG_DEBUG, "probing stream %d\n", st->index);
 --st->probe_packets;
 
 if (pkt) {
- pd->buf = av_realloc(pd->buf, pd->buf_size+pkt->size+AVPROBE_PADDING_SIZE);
- memcpy(pd->buf+pd->buf_size, pkt->data, pkt->size);
+ int err;
+ if ((err = av_reallocp(&pd->buf, pd->buf_size + pkt->size +
+ AVPROBE_PADDING_SIZE)) < 0)
+ return err;
+ 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 {
 st->probe_packets = 0;
 if (!pd->buf_size) {
- av_log(s, AV_LOG_ERROR, "nothing to probe for stream %d\n",
- st->index);
- return;
+ av_log(s, AV_LOG_ERROR,
+ "nothing to probe for stream %d\n", st->index);
+ return 0;
 }
 }
 
 if (!st->probe_packets ||
 av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)) {
- set_codec_from_probe_data(s, st, pd, st->probe_packets > 0 ? AVPROBE_SCORE_MAX/4 : 0);
- if(st->codec->codec_id != AV_CODEC_ID_PROBE){
- pd->buf_size=0;
+ set_codec_from_probe_data(s, st, pd, st->probe_packets > 0
+ ? AVPROBE_SCORE_MAX / 4 : 0);
+ if (st->codec->codec_id != AV_CODEC_ID_PROBE) {
+ pd->buf_size = 0;
 av_freep(&pd->buf);
 av_log(s, AV_LOG_DEBUG, "probed stream %d\n", st->index);
 }
 }
 }
+ return 0;
 }
 
 int ff_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
- int ret, i;
+ 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 (st->codec->codec_id != AV_CODEC_ID_PROBE || !st->probe_packets ||
+ st = s->streams[pkt->stream_index];
+ if (st->codec->codec_id != AV_CODEC_ID_PROBE ||
+ !st->probe_packets ||
 s->raw_packet_buffer_remaining_size < pkt->size) {
 AVProbeData *pd;
- if (st->probe_packets) {
- probe_codec(s, st, NULL);
- }
+ if (st->probe_packets)
+ if ((err = probe_codec(s, st, NULL)) < 0)
+ return err;
 pd = &st->probe_data;
 av_freep(&pd->buf);
 pd->buf_size = 0;
- s->raw_packet_buffer = pktl->next;
+ s->raw_packet_buffer = pktl->next;
 s->raw_packet_buffer_remaining_size += pkt->size;
 av_free(pktl);
 return 0;
@@ -624,15 +534,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) {
- probe_codec(s, st, NULL);
- }
+ if (st->probe_packets)
+ if ((err = probe_codec(s, st, NULL)) < 0)
+ return err;
 }
 continue;
 }
@@ -646,39 +556,35 @@
 continue;
 }
 
- st= s->streams[pkt->stream_index];
+ st = s->streams[pkt->stream_index];
 
- 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;
 }
 
- if(!pktl && (st->codec->codec_id != AV_CODEC_ID_PROBE ||
- !st->probe_packets))
+ if (!pktl && (st->codec->codec_id != AV_CODEC_ID_PROBE ||
+ !st->probe_packets))
 return ret;
 
 add_to_pktbuf(&s->raw_packet_buffer, pkt, &s->raw_packet_buffer_end);
 s->raw_packet_buffer_remaining_size -= pkt->size;
 
- probe_codec(s, st, pkt);
+ if ((err = probe_codec(s, st, pkt)) < 0)
+ return err;
 }
 }
 
-#if FF_API_READ_PACKET
-int av_read_packet(AVFormatContext *s, AVPacket *pkt)
-{
- return ff_read_packet(s, pkt);
-}
-#endif
-
-
 /**********************************************************/
 
 /**
@@ -695,14 +601,13 @@
 if ((frame_size = av_get_audio_frame_duration(enc, size)) > 0)
 return frame_size;
 
- /* fallback to using frame_size if muxing */
+ /* Fall back on using frame_size if muxing. */
 if (enc->frame_size > 1)
 return enc->frame_size;
 
 return -1;
 }
 
-
 /**
 * Return the frame duration in seconds. Return 0 if not available.
 */
@@ -713,15 +618,15 @@
 
 *pnum = 0;
 *pden = 0;
- switch(st->codec->codec_type) {
+ switch (st->codec->codec_type) {
 case AVMEDIA_TYPE_VIDEO:
 if (st->avg_frame_rate.num) {
 *pnum = st->avg_frame_rate.den;
 *pden = st->avg_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) {
@@ -730,11 +635,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:
@@ -762,27 +667,29 @@
 static void update_initial_timestamps(AVFormatContext *s, int stream_index,
 int64_t dts, int64_t pts)
 {
- AVStream *st= s->streams[stream_index];
- AVPacketList *pktl= s->packet_buffer;
+ AVStream *st = s->streams[stream_index];
+ AVPacketList *pktl = s->packet_buffer;
 
- if(st->first_dts != AV_NOPTS_VALUE || dts == AV_NOPTS_VALUE || st->cur_dts == AV_NOPTS_VALUE)
+ if (st->first_dts != AV_NOPTS_VALUE ||
+ dts == AV_NOPTS_VALUE ||
+ st->cur_dts == AV_NOPTS_VALUE)
 return;
 
- st->first_dts= dts - st->cur_dts;
- st->cur_dts= dts;
+ st->first_dts = dts - st->cur_dts;
+ st->cur_dts = dts;
 
- for(; pktl; pktl= pktl->next){
- if(pktl->pkt.stream_index != stream_index)
+ for (; pktl; pktl = pktl->next) {
+ if (pktl->pkt.stream_index != stream_index)
 continue;
- //FIXME think more about this check
- if(pktl->pkt.pts != AV_NOPTS_VALUE && pktl->pkt.pts == pktl->pkt.dts)
+ // FIXME: think more about this check
+ if (pktl->pkt.pts != AV_NOPTS_VALUE && pktl->pkt.pts == pktl->pkt.dts)
 pktl->pkt.pts += st->first_dts;
 
- if(pktl->pkt.dts != AV_NOPTS_VALUE)
+ if (pktl->pkt.dts != AV_NOPTS_VALUE)
 pktl->pkt.dts += st->first_dts;
 
- 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 (st->start_time == AV_NOPTS_VALUE)
 st->start_time = pts;
@@ -791,39 +698,42 @@
 static void update_initial_durations(AVFormatContext *s, AVStream *st,
 int stream_index, int duration)
 {
- AVPacketList *pktl= s->packet_buffer;
- int64_t cur_dts= 0;
+ AVPacketList *pktl = s->packet_buffer;
+ int64_t cur_dts = 0;
 
- if(st->first_dts != AV_NOPTS_VALUE){
- cur_dts= st->first_dts;
- for(; pktl; pktl= pktl->next){
- 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) {
+ cur_dts = st->first_dts;
+ for (; pktl; pktl = pktl->next) {
+ 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;
 }
 }
- pktl= s->packet_buffer;
+ pktl = s->packet_buffer;
 st->first_dts = cur_dts;
- }else if(st->cur_dts)
+ } else if (st->cur_dts)
 return;
 
- for(; pktl; pktl= pktl->next){
- if(pktl->pkt.stream_index != stream_index)
+ for (; pktl; pktl = pktl->next) {
+ if (pktl->pkt.stream_index != stream_index)
 continue;
- if(pktl->pkt.pts == pktl->pkt.dts && pktl->pkt.dts == AV_NOPTS_VALUE
- && !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.duration) {
+ pktl->pkt.dts = cur_dts;
+ if (!st->codec->has_b_frames)
+ pktl->pkt.pts = cur_dts;
 cur_dts += duration;
 if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO)
 pktl->pkt.duration = duration;
- }else
+ } else
 break;
 }
- if(st->first_dts == AV_NOPTS_VALUE)
- st->cur_dts= cur_dts;
+ if (st->first_dts == AV_NOPTS_VALUE)
+ st->cur_dts = cur_dts;
 }
 
 static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
@@ -835,83 +745,74 @@
 if (s->flags & AVFMT_FLAG_NOFILLIN)
 return;
 
- if((s->flags & AVFMT_FLAG_IGNDTS) && pkt->pts != AV_NOPTS_VALUE)
- pkt->dts= AV_NOPTS_VALUE;
+ if ((s->flags & AVFMT_FLAG_IGNDTS) && pkt->pts != AV_NOPTS_VALUE)
+ pkt->dts = AV_NOPTS_VALUE;
 
 /* 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;
 
- if(pkt->pts != AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE && pkt->dts > pkt->pts && st->pts_wrap_bits<63
- /*&& pkt->dts-(1LL<<st->pts_wrap_bits) < pkt->pts*/){
- pkt->dts -= 1LL<<st->pts_wrap_bits;
+ 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) {
+ pkt->dts -= 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\n");
- pkt->dts= pkt->pts= AV_NOPTS_VALUE;
+ pkt->dts = pkt->pts = AV_NOPTS_VALUE;
 }
 
 if (pkt->duration == 0 && st->codec->codec_type != AVMEDIA_TYPE_AUDIO) {
 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);
+ 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)
- update_initial_durations(s, st, pkt->stream_index, pkt->duration);
+ if (pkt->duration != 0 && s->packet_buffer)
+ 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;
- pkt->pts = pkt->dts + pc->pts_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;
- 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:%"PRId64", dts:%"PRId64" cur_dts:%"PRId64" st:%d pc:%p\n",
+ "IN delayed:%d pts:%"PRId64", dts:%"PRId64" "
+ "cur_dts:%"PRId64" st:%d pc:%p\n",
 presentation_delayed, pkt->pts, pkt->dts, st->cur_dts,
 pkt->stream_index, pc);
- /* 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){
+ /* Interpolate PTS and DTS if they are not present. We skip H.264
+ * 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) {
 if (presentation_delayed) {
 /* DTS = decompression timestamp */
 /* PTS = presentation timestamp */
@@ -921,16 +822,16 @@
 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 ||
@@ -939,13 +840,13 @@
 if (!duration && st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
 ff_compute_frame_duration(&num, &den, st, pc, pkt);
 if (den && num) {
- duration = av_rescale_rnd(1, num * (int64_t)st->time_base.den,
- den * (int64_t)st->time_base.num,
- AV_ROUND_DOWN);
- if (duration != 0 && s->packet_buffer) {
+ duration = av_rescale_rnd(1,
+ num * (int64_t) st->time_base.den,
+ den * (int64_t) st->time_base.num,
+ AV_ROUND_DOWN);
+ if (duration != 0 && s->packet_buffer)
 update_initial_durations(s, st, pkt->stream_index,
 duration);
- }
 }
 }
 
@@ -965,16 +866,17 @@
 }
 }
 
- if(pkt->pts != AV_NOPTS_VALUE && delay <= MAX_REORDER_DELAY){
- 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); // this should happen on the first packet
- }
- if(pkt->dts > st->cur_dts)
+ if (pkt->pts != AV_NOPTS_VALUE && delay <= MAX_REORDER_DELAY) {
+ 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];
+ // We skipped it above so we try here.
+ if (st->codec->codec_id == AV_CODEC_ID_H264)
+ // This should happen on the first packet
+ update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts);
+ if (pkt->dts > st->cur_dts)
 st->cur_dts = pkt->dts;
 }
 
@@ -1001,21 +903,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;
 }
 
@@ -1023,7 +925,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);
 
@@ -1037,14 +939,22 @@
 if (!out_pkt.size)
 continue;
 
+ 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;
+ }
+
 /* 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) {
@@ -1055,9 +965,9 @@
 }
 
 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->parser->key_frame == 1 ||
 (st->parser->key_frame == -1 &&
@@ -1074,8 +984,14 @@
 }
 
 if (out_pkt.data == pkt->data && out_pkt.size == pkt->size) {
+ out_pkt.buf = pkt->buf;
+ pkt->buf = NULL;
+#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
 out_pkt.destruct = pkt->destruct;
 pkt->destruct = NULL;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
 }
 if ((ret = av_dup_packet(&out_pkt)) < 0)
 goto fail;
@@ -1087,7 +1003,6 @@
 }
 }
 
-
 /* end of the stream => close and free the parser */
 if (pkt == &flush_pkt) {
 av_parser_close(st->parser);
@@ -1105,8 +1020,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;
@@ -1130,7 +1045,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);
@@ -1145,31 +1060,28 @@
 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=%"PRId64", dts=%"PRId64", size=%d\n",
- cur_pkt.stream_index,
- cur_pkt.pts,
- cur_pkt.dts,
- cur_pkt.size);
+ av_log(s, AV_LOG_WARNING,
+ "Invalid timestamps stream=%d, pts=%"PRId64", "
+ "dts=%"PRId64", size=%d\n",
+ cur_pkt.stream_index, cur_pkt.pts,
+ cur_pkt.dts, cur_pkt.size);
 }
 if (s->debug & FF_FDEBUG_TS)
- av_log(s, AV_LOG_DEBUG, "ff_read_packet stream=%d, pts=%"PRId64", dts=%"PRId64", size=%d, duration=%d, flags=%d\n",
- cur_pkt.stream_index,
- cur_pkt.pts,
- cur_pkt.dts,
- cur_pkt.size,
- cur_pkt.duration,
- cur_pkt.flags);
+ av_log(s, AV_LOG_DEBUG,
+ "ff_read_packet stream=%d, pts=%"PRId64", dts=%"PRId64", "
+ "size=%d, duration=%d, flags=%d\n",
+ cur_pkt.stream_index, cur_pkt.pts, cur_pkt.dts,
+ 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);
- if (!st->parser) {
+ if (!st->parser)
 /* 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;
- }
 }
 
 if (!st->need_parsing || !st->parser) {
@@ -1179,7 +1091,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) {
@@ -1194,14 +1107,12 @@
 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=%"PRId64", dts=%"PRId64", size=%d, duration=%d, flags=%d\n",
- pkt->stream_index,
- pkt->pts,
- pkt->dts,
- pkt->size,
- pkt->duration,
- pkt->flags);
+ if (s->debug & FF_FDEBUG_TS)
+ av_log(s, AV_LOG_DEBUG,
+ "read_frame_internal stream=%d, pts=%"PRId64", dts=%"PRId64", "
+ "size=%d, duration=%d, flags=%d\n",
+ pkt->stream_index, pkt->pts, pkt->dts,
+ pkt->size, pkt->duration, pkt->flags);
 
 return ret;
 }
@@ -1209,13 +1120,13 @@
 int av_read_frame(AVFormatContext *s, AVPacket *pkt)
 {
 const int genpts = s->flags & AVFMT_FLAG_GENPTS;
- int eof = 0;
+ int eof = 0;
 
 if (!genpts)
- return s->packet_buffer ? read_from_packet_buffer(&s->packet_buffer,
- &s->packet_buffer_end,
- pkt) :
- read_frame_internal(s, pkt);
+ return s->packet_buffer
+ ? read_from_packet_buffer(&s->packet_buffer,
+ &s->packet_buffer_end, pkt)
+ : read_frame_internal(s, pkt);
 
 for (;;) {
 int ret;
@@ -1229,7 +1140,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) &&
- av_compare_mod(pktl->pkt.pts, pktl->pkt.dts, 2LL << (wrap_bits - 1))) { //not b frame
+ av_compare_mod(pktl->pkt.pts, pktl->pkt.dts, 2LL << (wrap_bits - 1))) {
+ // not B-frame
 next_pkt->pts = pktl->pkt.dts;
 }
 pktl = pktl->next;
@@ -1254,7 +1166,7 @@
 }
 
 if (av_dup_packet(add_to_pktbuf(&s->packet_buffer, pkt,
- &s->packet_buffer_end)) < 0)
+ &s->packet_buffer_end)) < 0)
 return AVERROR(ENOMEM);
 }
 }
@@ -1280,21 +1192,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;
@@ -1302,8 +1213,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) {
@@ -1311,13 +1222,13 @@
 st->parser = NULL;
 }
 st->last_IP_pts = AV_NOPTS_VALUE;
- st->cur_dts = AV_NOPTS_VALUE; /* we set the current DTS to an unspecified origin */
- st->reference_dts = AV_NOPTS_VALUE;
+ /* 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;
 }
 }
 
@@ -1325,76 +1236,81 @@
 {
 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;
 
 entries = av_fast_realloc(*index_entries,
 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];
- assert(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];
+ assert(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)
 {
 return ff_add_index_entry(&st->index_entries, &st->nb_index_entries,
 &st->index_entries_allocated_size, pos,
@@ -1407,44 +1323,43 @@
 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);
 }
 
-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;
@@ -1456,42 +1371,47 @@
 
 av_dlog(s, "read_seek: %d %"PRId64"\n", stream_index, 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=%"PRId64"\n",
- pos_min,ts_min);
- }else{
- assert(index==0);
+ pos_min, ts_min);
+ } else {
+ assert(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);
 assert(index < st->nb_index_entries);
- if(index >= 0){
- e= &st->index_entries[index];
+ if (index >= 0) {
+ e = &st->index_entries[index];
 assert(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=%"PRId64"\n",
- pos_max,pos_limit, 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=%"PRId64"\n", pos_max, pos_limit, 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 */
@@ -1505,8 +1425,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, filesize;
@@ -1514,121 +1436,129 @@
 
 av_dlog(s, "gen_seek: %d %"PRId64"\n", stream_index, target_ts);
 
- if(ts_min == AV_NOPTS_VALUE){
+ if (ts_min == AV_NOPTS_VALUE) {
 pos_min = s->data_offset;
- ts_min = read_timestamp(s, stream_index, &pos_min, INT64_MAX);
+ ts_min = read_timestamp(s, stream_index, &pos_min, INT64_MAX);
 if (ts_min == AV_NOPTS_VALUE)
 return -1;
 }
 
- if(ts_max == AV_NOPTS_VALUE){
- int step= 1024;
+ if (ts_max == AV_NOPTS_VALUE) {
+ int step = 1024;
 filesize = avio_size(s->pb);
- pos_max = filesize - 1;
- do{
+ pos_max = filesize - 1;
+ do {
 pos_max -= step;
- ts_max = read_timestamp(s, stream_index, &pos_max, pos_max + step);
- step += step;
- }while(ts_max == AV_NOPTS_VALUE && pos_max >= step);
+ ts_max = read_timestamp(s, stream_index, &pos_max,
+ pos_max + step);
+ step += step;
+ } while (ts_max == AV_NOPTS_VALUE && pos_max >= step);
 if (ts_max == AV_NOPTS_VALUE)
 return -1;
 
- for(;;){
- int64_t tmp_pos= pos_max + 1;
- int64_t tmp_ts= read_timestamp(s, stream_index, &tmp_pos, INT64_MAX);
- if(tmp_ts == AV_NOPTS_VALUE)
+ for (;;) {
+ int64_t tmp_pos = pos_max + 1;
+ int64_t tmp_ts = read_timestamp(s, stream_index,
+ &tmp_pos, INT64_MAX);
+ if (tmp_ts == AV_NOPTS_VALUE)
 break;
- ts_max= tmp_ts;
- pos_max= tmp_pos;
- if(tmp_pos >= filesize)
+ ts_max = tmp_ts;
+ pos_max = tmp_pos;
+ if (tmp_pos >= filesize)
 break;
 }
- pos_limit= pos_max;
+ pos_limit = 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=%"PRId64" dts_max=%"PRId64"\n",
- pos_min, pos_max, ts_min, ts_max);
+ av_dlog(s, "pos_min=0x%"PRIx64" pos_max=0x%"PRIx64" dts_min=%"PRId64
+ " dts_max=%"PRId64"\n", pos_min, pos_max, ts_min, 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 = read_timestamp(s, stream_index, &pos, INT64_MAX); //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 = read_timestamp(s, stream_index, &pos, INT64_MAX);
+ if (pos == pos_max)
 no_change++;
 else
- no_change=0;
- av_dlog(s, "%"PRId64" %"PRId64" %"PRId64" / %"PRId64" %"PRId64" %"PRId64" target:%"PRId64" limit:%"PRId64" start:%"PRId64" noc:%d\n",
+ no_change = 0;
+ av_dlog(s, "%"PRId64" %"PRId64" %"PRId64" / %"PRId64" %"PRId64" %"PRId64
+ " target:%"PRId64" limit:%"PRId64" start:%"PRId64" noc:%d\n",
 pos_min, pos, pos_max, ts_min, ts, ts_max, 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;
 pos_min = pos;
- ts_min = read_timestamp(s, stream_index, &pos_min, INT64_MAX);
+ ts_min = read_timestamp(s, stream_index, &pos_min, INT64_MAX);
 pos_min++;
 ts_max = read_timestamp(s, stream_index, &pos_min, INT64_MAX);
 av_dlog(s, "pos=0x%"PRIx64" %"PRId64"<=%"PRId64"<=%"PRId64"\n",
 pos, ts_min, target_ts, ts_max);
- *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);
 
 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;
@@ -1639,34 +1569,34 @@
 
 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;
 
- if(st->nb_index_entries){
+ if (st->nb_index_entries) {
 assert(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){
- if((pkt.flags & AV_PKT_FLAG_KEY) && pkt.dts > timestamp)
+ if (stream_index == pkt.stream_index)
+ if ((pkt.flags & AV_PKT_FLAG_KEY) && pkt.dts > timestamp)
 break;
- }
 }
 index = av_index_search_timestamp(st, timestamp, flags);
 }
@@ -1674,10 +1604,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;
@@ -1699,14 +1628,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 */
@@ -1715,54 +1645,59 @@
 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 = seek_frame_internal(s, stream_index, timestamp, flags);
 
 if (ret >= 0)
- queue_attached_pictures(s);
+ ret = queue_attached_pictures(s);
 
 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 (s->iformat->read_seek2) {
 int ret;
 ff_read_frame_flush(s);
- 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)
- queue_attached_pictures(s);
+ ret = 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()
 }
 
- //Fallback to old API if new is not implemented but old is
- //Note the old has somewat different sematics
- if(s->iformat->read_seek || 1)
- return av_seek_frame(s, stream_index, ts, flags | ((uint64_t)ts - min_ts > (uint64_t)max_ts - ts ? AVSEEK_FLAG_BACKWARD : 0));
+ // Fall back on old API if new is not implemented but old is.
+ // Note the old API has somewhat different semantics.
+ if (s->iformat->read_seek || 1)
+ return av_seek_frame(s, stream_index, ts,
+ flags | ((uint64_t) ts - min_ts >
+ (uint64_t) max_ts - ts
+ ? AVSEEK_FLAG_BACKWARD : 0));
 
 // try some generic seek like seek_frame_generic() but with new ts semantics
 }
@@ -1779,7 +1714,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;
@@ -1802,22 +1737,25 @@
 AVStream *st;
 
 start_time = 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_time = FFMIN(start_time, start_time1);
+ start_time1 = av_rescale_q(st->start_time, st->time_base,
+ AV_TIME_BASE_Q);
+ start_time = FFMIN(start_time, start_time1);
 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);
 }
 }
 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) {
@@ -1827,11 +1765,10 @@
 }
 if (duration != INT64_MIN) {
 ic->duration = duration;
- if (ic->pb && (filesize = avio_size(ic->pb)) > 0) {
+ if (ic->pb && (filesize = avio_size(ic->pb)) > 0)
 /* compute the bitrate */
- ic->bit_rate = (double)filesize * 8.0 * AV_TIME_BASE /
- (double)ic->duration;
- }
+ ic->bit_rate = (double) filesize * 8.0 * AV_TIME_BASE /
+ (double) ic->duration;
 }
 }
 
@@ -1841,13 +1778,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);
 }
 }
 }
@@ -1855,16 +1794,21 @@
 static void estimate_timings_from_bit_rate(AVFormatContext *ic)
 {
 int64_t filesize, duration;
- int bit_rate, i;
+ int i;
 AVStream *st;
 
 /* if bit_rate is already set, we believe it */
 if (ic->bit_rate <= 0) {
- bit_rate = 0;
- for(i=0;i<ic->nb_streams;i++) {
+ int bit_rate = 0;
+ for (i = 0; i < ic->nb_streams; i++) {
 st = ic->streams[i];
- if (st->codec->bit_rate > 0)
- bit_rate += st->codec->bit_rate;
+ if (st->codec->bit_rate > 0) {
+ if (INT_MAX - st->codec->bit_rate < bit_rate) {
+ bit_rate = 0;
+ break;
+ }
+ bit_rate += st->codec->bit_rate;
+ }
 }
 ic->bit_rate = bit_rate;
 }
@@ -1874,9 +1818,11 @@
 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];
- duration= av_rescale(8*filesize, st->time_base.den, ic->bit_rate*(int64_t)st->time_base.num);
+ for (i = 0; i < ic->nb_streams; i++) {
+ st = ic->streams[i];
+ duration = av_rescale(8 * filesize, st->time_base.den,
+ ic->bit_rate *
+ (int64_t) st->time_base.num);
 if (st->duration == AV_NOPTS_VALUE)
 st->duration = duration;
 }
@@ -1895,19 +1841,20 @@
 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");
+ 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;
 }
 }
 
@@ -1915,24 +1862,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)) {
@@ -1942,7 +1889,7 @@
 else
 duration -= st->first_dts;
 if (duration < 0)
- duration += 1LL<<st->pts_wrap_bits;
+ duration += 1LL << st->pts_wrap_bits;
 if (duration > 0) {
 if (st->duration == AV_NOPTS_VALUE || st->duration < duration)
 st->duration = duration;
@@ -1950,18 +1897,17 @@
 }
 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++) {
+ st = ic->streams[i];
+ st->cur_dts = st->first_dts;
 st->last_IP_pts = AV_NOPTS_VALUE;
- st->reference_dts = AV_NOPTS_VALUE;
 }
 }
 
@@ -1984,10 +1930,11 @@
 estimate_timings_from_pts(ic, old_offset);
 } 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);
 } else {
- 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");
 /* less precise: use bitrate info */
 estimate_timings_from_bit_rate(ic);
 }
@@ -1996,13 +1943,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);
@@ -2013,10 +1961,12 @@
 {
 AVCodecContext *avctx = st->codec;
 int val;
+
 switch (avctx->codec_type) {
 case AVMEDIA_TYPE_AUDIO:
 val = avctx->sample_rate && avctx->channels;
- 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)
 return 0;
 break;
 case AVMEDIA_TYPE_VIDEO:
@@ -2034,15 +1984,16 @@
 static int has_decode_delay_been_guessed(AVStream *st)
 {
 return st->codec->codec_id != AV_CODEC_ID_H264 ||
- st->info->nb_decoded_frames >= 6;
+ st->info->nb_decoded_frames >= 6;
 }
 
 /* returns 1 or 0 if or if not decoded data was returned, or a negative error */
-static int try_decode_frame(AVStream *st, AVPacket *avpkt, AVDictionary **options)
+static int try_decode_frame(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();
 AVPacket pkt = *avpkt;
 
 if (!frame)
@@ -2051,17 +2002,17 @@
 if (!avcodec_is_open(st->codec) && !st->info->found_decoder) {
 AVDictionary *thread_opt = NULL;
 
- codec = st->codec->codec ? st->codec->codec :
- avcodec_find_decoder(st->codec->codec_id);
+ codec = st->codec->codec ? st->codec->codec
+ : avcodec_find_decoder(st->codec->codec_id);
 
 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)
@@ -2081,12 +2032,11 @@
 
 while ((pkt.size > 0 || (!pkt.data && got_picture)) &&
 ret >= 0 &&
- (!has_codec_parameters(st) ||
- !has_decode_delay_been_guessed(st) ||
- (!st->codec_info_nb_frames && st->codec->codec->capabilities & CODEC_CAP_CHANNEL_CONF))) {
+ (!has_codec_parameters(st) || !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);
@@ -2107,7 +2057,7 @@
 }
 
 fail:
- avcodec_free_frame(&frame);
+ av_frame_free(&frame);
 return ret;
 }
 
@@ -2124,14 +2074,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;
 }
 
@@ -2139,48 +2087,63 @@
 {
 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 >>= 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)
 {
 int i;
- for(i=0; tags && tags[i]; i++){
- int tag= ff_codec_get_tag(tags[i], id);
- if(tag) return tag;
+ for (i = 0; tags && tags[i]; i++) {
+ int tag = ff_codec_get_tag(tags[i], id);
+ if (tag)
+ return tag;
 }
 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;
 }
@@ -2188,17 +2151,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;
 }
@@ -2206,27 +2172,28 @@
 }
 }
 
-static int get_std_framerate(int i){
- if(i<60*12) return i*1001;
- else return ((const int[]){24,30,60,12,15})[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 })[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_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_id == AV_CODEC_ID_MPEG2VIDEO ||
+ c->codec_id == AV_CODEC_ID_H264)
 return 1;
 return 0;
 }
@@ -2236,81 +2203,79 @@
 int i, count, ret, read_size, j;
 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
+ int64_t old_offset = avio_tell(ic->pb);
+ // new streams might appear, no options for those
+ int orig_nb_streams = ic->nb_streams;
 
- 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];
 
- //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->need_parsing == AVSTREAM_PARSE_HEADERS && st->parser){
+ if (st->need_parsing == AVSTREAM_PARSE_HEADERS && st->parser)
 st->parser->flags |= PARSER_FLAG_COMPLETE_FRAMES;
- }
 }
- codec = st->codec->codec ? st->codec->codec :
- avcodec_find_decoder(st->codec->codec_id);
+ codec = st->codec->codec ? st->codec->codec
+ : avcodec_find_decoder(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);
+ avcodec_open2(st->codec, codec,
+ options ? &options[i] : &thread_opt);
 
- //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)) {
 if (codec && !st->codec->codec)
- avcodec_open2(st->codec, codec, options ? &options[i]
- : &thread_opt);
+ avcodec_open2(st->codec, codec,
+ options ? &options[i] : &thread_opt);
 }
 if (!options)
 av_dict_free(&thread_opt);
 }
 
- for (i=0; i<ic->nb_streams; i++) {
-#if FF_API_R_FRAME_RATE
- ic->streams[i]->info->last_dts = AV_NOPTS_VALUE;
-#endif
+ for (i = 0; i < ic->nb_streams; i++) {
 ic->streams[i]->info->fps_first_dts = AV_NOPTS_VALUE;
 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))
 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)
 fps_analyze_framecount = ic->fps_probe_size;
 /* variable fps and no guess at the real fps */
- if( tb_unreliable(st->codec) && !st->avg_frame_rate.num
- && st->codec_info_nb_frames < fps_analyze_framecount
- && st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+ if (tb_unreliable(st->codec) && !st->avg_frame_rate.num &&
+ st->codec_info_nb_frames < 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 ||
@@ -2318,25 +2283,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");
 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 %d reached\n", ic->probesize);
+ av_log(ic, AV_LOG_DEBUG,
+ "Probe buffer size limit %d reached\n", ic->probesize);
 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;
@@ -2347,16 +2312,17 @@
 int err = 0;
 av_init_packet(&empty_pkt);
 
- 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++) {
 st = ic->streams[i];
 
 /* flush the decoders */
 if (st->info->found_decoder == 1) {
 do {
 err = try_decode_frame(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));
 }
 
@@ -2391,24 +2357,31 @@
 /* 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_WARNING, "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_WARNING,
+ "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 */
@@ -2416,7 +2389,7 @@
 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;
 
 /* check max_analyze_duration */
@@ -2426,132 +2399,100 @@
 break;
 }
 }
-#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){
- int64_t duration= pkt->dts - last;
- double dur= duration * av_q2d(st->time_base);
-
- if (st->info->duration_count < 2)
- memset(st->info->duration_error, 0, sizeof(st->info->duration_error));
- for (i=1; i<FF_ARRAY_ELEMS(st->info->duration_error); i++) {
- int framerate= get_std_framerate(i);
- int ticks= lrintf(dur*framerate/(1001*12));
- double error = dur - (double)ticks*1001*12 / framerate;
- st->info->duration_error[i] += error*error;
- }
- st->info->duration_count++;
- // ignore the first 4 values, they might have some random jitter
- if (st->info->duration_count > 3)
- st->info->duration_gcd = av_gcd(st->info->duration_gcd, duration);
- }
- if (last == AV_NOPTS_VALUE || st->info->duration_count <= 1)
- st->info->last_dts = 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) {
- st->codec->extradata_size= i;
- st->codec->extradata= av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+ st->codec->extradata_size = i;
+ st->codec->extradata = av_malloc(st->codec->extradata_size +
+ FF_INPUT_BUFFER_PADDING_SIZE);
 if (!st->codec->extradata)
 return AVERROR(ENOMEM);
- memcpy(st->codec->extradata, pkt->data, st->codec->extradata_size);
- memset(st->codec->extradata + i, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+ memcpy(st->codec->extradata, pkt->data,
+ st->codec->extradata_size);
+ memset(st->codec->extradata + i, 0,
+ FF_INPUT_BUFFER_PADDING_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(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(st, pkt,
+ (options && i < orig_nb_streams) ? &options[i] : NULL);
 
 st->codec_info_nb_frames++;
 count++;
 }
 
 // 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++) {
+ for (i = 0; i < ic->nb_streams; i++) {
 st = ic->streams[i];
 if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
 /* estimate average framerate if not set by demuxer */
- if (!st->avg_frame_rate.num && st->info->fps_last_dts != st->info->fps_first_dts) {
- int64_t delta_dts = st->info->fps_last_dts - st->info->fps_first_dts;
- int delta_packets = st->info->fps_last_dts_idx - st->info->fps_first_dts_idx;
- int best_fps = 0;
+ if (!st->avg_frame_rate.num &&
+ st->info->fps_last_dts != st->info->fps_first_dts) {
+ int64_t delta_dts = st->info->fps_last_dts -
+ st->info->fps_first_dts;
+ int delta_packets = st->info->fps_last_dts_idx -
+ st->info->fps_first_dts_idx;
+ int best_fps = 0;
 double best_error = 0.01;
 
+ if (delta_dts >= INT64_MAX / st->time_base.num ||
+ delta_packets >= INT64_MAX / st->time_base.den ||
+ delta_dts < 0)
+ continue;
 av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
- delta_packets*(int64_t)st->time_base.den,
- delta_dts*(int64_t)st->time_base.num, 60000);
+ delta_packets * (int64_t) st->time_base.den,
+ delta_dts * (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);
- }
+ best_fps, 12 * 1001, INT_MAX);
 }
-#if FF_API_R_FRAME_RATE
- // 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 > 1 && !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 && !st->r_frame_rate.num
- && tb_unreliable(st->codec)) {
- int num = 0;
- double best_error= 2*av_q2d(st->time_base);
- best_error = best_error*best_error*st->info->duration_count*1000*12*30;
-
- for (j=1; j<FF_ARRAY_ELEMS(st->info->duration_error); j++) {
- double error = st->info->duration_error[j] * get_std_framerate(j);
- if(error < best_error){
- best_error= error;
- num = get_std_framerate(j);
- }
- }
- // 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);
- }
-#endif
- }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;
 }
 }
 }
@@ -2560,10 +2501,9 @@
 
 compute_chapters_end(ic);
 
- find_stream_info_err:
- for (i=0; i < ic->nb_streams; i++) {
- if (ic->streams[i]->codec)
- ic->streams[i]->codec->thread_count = 0;
+find_stream_info_err:
+ for (i = 0; i < ic->nb_streams; i++) {
+ ic->streams[i]->codec->thread_count = 0;
 av_freep(&ic->streams[i]->info);
 }
 return ret;
@@ -2580,12 +2520,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;
@@ -2595,19 +2532,20 @@
 if (related_stream >= 0 && wanted_stream_nb < 0) {
 AVProgram *p = find_program_from_stream(ic, 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 (st->disposition & (AV_DISPOSITION_HEARING_IMPAIRED |
+ AV_DISPOSITION_VISUAL_IMPAIRED))
 continue;
 if (decoder_ret) {
 decoder = avcodec_find_decoder(st->codec->codec_id);
@@ -2619,13 +2557,14 @@
 }
 if (best_count >= st->codec_info_nb_frames)
 continue;
- best_count = st->codec_info_nb_frames;
- ret = real_stream_index;
+ best_count = st->codec_info_nb_frames;
+ 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)
@@ -2662,7 +2601,7 @@
 if (s->iformat && s->iformat->priv_class && s->priv_data)
 av_opt_free(s->priv_data);
 
- for(i=0;i<s->nb_streams;i++) {
+ for (i = 0; i < s->nb_streams; i++) {
 /* free all data in a stream component */
 st = s->streams[i];
 if (st->parser) {
@@ -2680,34 +2619,28 @@
 av_free(st->info);
 av_free(st);
 }
- 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_free(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);
 }
 
-#if FF_API_CLOSE_INPUT_FILE
-void av_close_input_file(AVFormatContext *s)
-{
- avformat_close_input(&s);
-}
-#endif
-
 void avformat_close_input(AVFormatContext **ps)
 {
 AVFormatContext *s = *ps;
- AVIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
 
 if ((s->iformat && s->iformat->flags & AVFMT_NOFILE) ||
 (s->flags & AVFMT_FLAG_CUSTOM_IO))
@@ -2715,10 +2648,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);
 
@@ -2731,14 +2663,12 @@
 {
 AVStream *st;
 int i;
- AVStream **streams;
 
- if (s->nb_streams >= INT_MAX/sizeof(*streams))
- return NULL;
- streams = av_realloc(s->streams, (s->nb_streams + 1) * sizeof(*streams));
- if (!streams)
+ if (av_reallocp_array(&s->streams, s->nb_streams + 1,
+ sizeof(*s->streams)) < 0) {
+ s->nb_streams = 0;
 return NULL;
- s->streams = streams;
+ }
 
 st = av_mallocz(sizeof(AVStream));
 if (!st)
@@ -2749,33 +2679,28 @@
 }
 
 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 = 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 = 0;
+ st->first_dts = AV_NOPTS_VALUE;
 st->probe_packets = MAX_PROBE_PACKETS;
 
 /* 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;
+ 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;
-#endif
 st->info->fps_first_dts = AV_NOPTS_VALUE;
 st->info->fps_last_dts = AV_NOPTS_VALUE;
 
@@ -2785,16 +2710,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;
@@ -2806,80 +2731,87 @@
 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;
- void *tmp;
+ AVProgram *program = NULL;
 
 if (idx >= ac->nb_streams) {
 av_log(ac, AV_LOG_ERROR, "stream index %d is not valid\n", idx);
 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(program->stream_index, sizeof(unsigned int)*(program->nb_stream_indexes+1));
- if(!tmp)
+ if (av_reallocp_array(&program->stream_index,
+ program->nb_stream_indexes + 1,
+ sizeof(*program->stream_index)) < 0) {
+ program->nb_stream_indexes = 0;
 return;
- program->stream_index = tmp;
+ }
 program->stream_index[program->nb_stream_indexes++] = idx;
 return;
 }
 }
 
-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))
- av_log(ctx, AV_LOG_INFO, "%s %-16s: %s\n", indent, tag->key, tag->value);
- }
+ while ((tag = av_dict_get(m, "", tag, AV_DICT_IGNORE_SUFFIX)))
+ if (strcmp("language", tag->key))
+ av_log(ctx, AV_LOG_INFO,
+ "%s %-16s: %s\n", indent, tag->key, tag->value);
 }
 }
 
 /* "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);
@@ -2894,30 +2826,27 @@
 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, ", PAR %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)
- 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)");
@@ -2943,10 +2872,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;
@@ -2954,18 +2881,18 @@
 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;
- secs = ic->duration / AV_TIME_BASE;
- us = ic->duration % AV_TIME_BASE;
- mins = secs / 60;
+ secs = ic->duration / AV_TIME_BASE;
+ us = ic->duration % AV_TIME_BASE;
+ mins = secs / 60;
 secs %= 60;
 hours = mins / 60;
 mins %= 60;
@@ -2978,36 +2905,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;
@@ -3015,27 +2944,19 @@
 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);
 
 av_free(printed);
 }
 
-#if FF_API_AV_GETTIME && CONFIG_SHARED && HAVE_SYMVER
-FF_SYMVER(int64_t, av_gettime, (void), "LIBAVFORMAT_54")
-{
- return av_gettime();
-}
-#endif
-
 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;
@@ -3044,20 +2965,19 @@
 q = buf;
 p = path;
 percentd_found = 0;
- for(;;) {
+ for (;;) {
 c = *p++;
 if (c == '\0')
 break;
 if (c == '%') {
 do {
 nd = 0;
- while (isdigit(*p)) {
+ while (av_isdigit(*p))
 nd = nd * 10 + *p++ - '0';
- }
 c = *p++;
- } while (isdigit(c));
+ } while (av_isdigit(c));
 
- switch(c) {
+ switch (c) {
 case '%':
 goto addchar;
 case 'd':
@@ -3075,7 +2995,7 @@
 goto fail;
 }
 } else {
- addchar:
+addchar:
 if ((q - buf) < buf_size - 1)
 *q++ = c;
 }
@@ -3084,38 +3004,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)
@@ -3128,27 +3054,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);
 }
@@ -3167,24 +3092,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, *at, *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);
@@ -3193,12 +3123,12 @@
 
 /* separate path from hostname */
 ls = strchr(p, '/');
- if(!ls)
+ if (!ls)
 ls = strchr(p, '?');
- 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) {
@@ -3218,7 +3148,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));
@@ -3238,7 +3169,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];
 }
@@ -3251,12 +3182,12 @@
 int c, len, v;
 
 len = 0;
- v = 1;
+ v = 1;
 for (;;) {
 p += strspn(p, SPACE_CHARS);
 if (*p == '\0')
 break;
- c = toupper((unsigned char) *p++);
+ c = av_toupper((unsigned char) *p++);
 if (c >= '0' && c <= '9')
 c = c - '0';
 else if (c >= 'A' && c <= 'F')
@@ -3278,82 +3209,25 @@
 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 for st:%d\n", s->index);
+ if (new_tb.num <= 0 || new_tb.den <= 0) {
+ av_log(NULL, AV_LOG_ERROR,
+ "Ignoring attempt to set invalid timebase for st:%d\n",
+ s->index);
 return;
 }
- s->time_base = new_tb;
+ s->time_base = new_tb;
 s->pts_wrap_bits = pts_wrap_bits;
 }
 
-int ff_url_join(char *str, int size, const char *proto,
- const char *authorization, const char *hostname,
- int port, const char *fmt, ...)
-{
-#if CONFIG_NETWORK
- struct addrinfo hints = { 0 }, *ai;
-#endif
-
- str[0] = '\0';
- if (proto)
- av_strlcatf(str, size, "%s://", proto);
- if (authorization && authorization[0])
- av_strlcatf(str, size, "%s@", authorization);
-#if CONFIG_NETWORK && defined(AF_INET6)
- /* Determine if hostname is a numerical IPv6 address,
- * properly escape it within [] in that case. */
- hints.ai_flags = AI_NUMERICHOST;
- if (!getaddrinfo(hostname, NULL, &hints, &ai)) {
- if (ai->ai_family == AF_INET6) {
- av_strlcat(str, "[", size);
- av_strlcat(str, hostname, size);
- av_strlcat(str, "]", size);
- } else {
- av_strlcat(str, hostname, size);
- }
- freeaddrinfo(ai);
- } else
-#endif
- /* Not an IPv6 address, just output the plain string. */
- av_strlcat(str, hostname, size);
-
- if (port >= 0)
- av_strlcatf(str, size, ":%d", port);
- if (fmt) {
- va_list vl;
- int len = strlen(str);
-
- va_start(vl, fmt);
- vsnprintf(str + len, size > len ? size - len : 0, fmt, vl);
- va_end(vl);
- }
- return strlen(str);
-}
-
-int ff_write_chained(AVFormatContext *dst, int dst_stream, AVPacket *pkt,
- AVFormatContext *src)
-{
- AVPacket local_pkt;
-
- local_pkt = *pkt;
- local_pkt.stream_index = dst_stream;
- if (pkt->pts != AV_NOPTS_VALUE)
- local_pkt.pts = av_rescale_q(pkt->pts,
- src->streams[pkt->stream_index]->time_base,
- dst->streams[dst_stream]->time_base);
- if (pkt->dts != AV_NOPTS_VALUE)
- local_pkt.dts = av_rescale_q(pkt->dts,
- src->streams[pkt->stream_index]->time_base,
- dst->streams[dst_stream]->time_base);
- return av_write_frame(dst, &local_pkt);
-}
-
 void ff_parse_key_value(const char *str, ff_parse_key_val_cb callback_get_buf,
 void *context)
 {
@@ -3366,7 +3240,7 @@
 int key_len, dest_len = 0;
 
 /* Skip whitespace and potential commas. */
- while (*ptr && (isspace(*ptr) || *ptr == ','))
+ while (*ptr && (av_isspace(*ptr) || *ptr == ','))
 ptr++;
 if (!*ptr)
 break;
@@ -3399,7 +3273,7 @@
 if (*ptr == '\"')
 ptr++;
 } else {
- for (; *ptr && !(isspace(*ptr) || *ptr == ','); ptr++)
+ for (; *ptr && !(av_isspace(*ptr) || *ptr == ','); ptr++)
 if (dest && dest < dest_end)
 *dest++ = *ptr;
 }
@@ -3411,86 +3285,16 @@
 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;
 }
 
-void ff_make_absolute_url(char *buf, int size, const char *base,
- const char *rel)
-{
- char *sep, *path_query;
- /* Absolute path, relative to the current server */
- if (base && strstr(base, "://") && rel[0] == '/') {
- if (base != buf)
- av_strlcpy(buf, base, size);
- sep = strstr(buf, "://");
- if (sep) {
- /* Take scheme from base url */
- if (rel[1] == '/') {
- sep[1] = '\0';
- } else {
- /* Take scheme and host from base url */
- sep += 3;
- sep = strchr(sep, '/');
- if (sep)
- *sep = '\0';
- }
- }
- av_strlcat(buf, rel, size);
- return;
- }
- /* If rel actually is an absolute url, just copy it */
- if (!base || strstr(rel, "://") || rel[0] == '/') {
- av_strlcpy(buf, rel, size);
- return;
- }
- if (base != buf)
- av_strlcpy(buf, base, size);
-
- /* Strip off any query string from base */
- path_query = strchr(buf, '?');
- if (path_query != NULL)
- *path_query = '\0';
-
- /* Is relative path just a new query part? */
- if (rel[0] == '?') {
- av_strlcat(buf, rel, size);
- return;
- }
-
- /* Remove the file name from the base url */
- sep = strrchr(buf, '/');
- if (sep)
- sep[1] = '\0';
- else
- buf[0] = '\0';
- while (av_strstart(rel, "../", NULL) && sep) {
- /* Remove the path delimiter at the end */
- sep[0] = '\0';
- sep = strrchr(buf, '/');
- /* If the next directory name to pop off is "..", break here */
- if (!strcmp(sep ? &sep[1] : buf, "..")) {
- /* Readd the slash we just removed */
- av_strlcat(buf, "/", size);
- break;
- }
- /* Cut off the directory name */
- if (sep)
- sep[1] = '\0';
- else
- buf[0] = '\0';
- rel += 3;
- }
- av_strlcat(buf, rel, size);
-}
-
 int64_t ff_iso8601_to_unix_time(const char *datestr)
 {
 #if HAVE_STRPTIME
- struct tm time1 = {0}, time2 = {0};
+ struct tm time1 = { 0 }, time2 = { 0 };
 char *ret1, *ret2;
 ret1 = strptime(datestr, "%Y - %m - %d %T", &time1);
 ret2 = strptime(datestr, "%Y - %m - %dT%T", &time2);
@@ -3499,20 +3303,23 @@
 else
 return av_timegm(&time1);
 #else
- av_log(NULL, AV_LOG_WARNING, "strptime() unavailable on this system, cannot convert "
- "the date string.\n");
+ av_log(NULL, AV_LOG_WARNING,
+ "strptime() unavailable on this system, cannot convert "
+ "the date string.\n");
 return 0;
 #endif
 }
 
-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;
 }
@@ -3550,19 +3357,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);
@@ -3582,11 +3389,104 @@
 return 0;
 }
 
-const struct AVCodecTag *avformat_get_riff_video_tags(void)
+int ff_generate_avci_extradata(AVStream *st)
 {
- return ff_codec_bmp_tags;
-}
-const struct AVCodecTag *avformat_get_riff_audio_tags(void)
-{
- return ff_codec_wav_tags;
+ static const uint8_t avci100_1080p_extradata[] = {
+ // SPS
+ 0x00, 0x00, 0x00, 0x01, 0x67, 0x7a, 0x10, 0x29,
+ 0xb6, 0xd4, 0x20, 0x22, 0x33, 0x19, 0xc6, 0x63,
+ 0x23, 0x21, 0x01, 0x11, 0x98, 0xce, 0x33, 0x19,
+ 0x18, 0x21, 0x02, 0x56, 0xb9, 0x3d, 0x7d, 0x7e,
+ 0x4f, 0xe3, 0x3f, 0x11, 0xf1, 0x9e, 0x08, 0xb8,
+ 0x8c, 0x54, 0x43, 0xc0, 0x78, 0x02, 0x27, 0xe2,
+ 0x70, 0x1e, 0x30, 0x10, 0x10, 0x14, 0x00, 0x00,
+ 0x03, 0x00, 0x04, 0x00, 0x00, 0x03, 0x00, 0xca,
+ 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ // PPS
+ 0x00, 0x00, 0x00, 0x01, 0x68, 0xce, 0x33, 0x48,
+ 0xd0
+ };
+ static const uint8_t avci100_1080i_extradata[] = {
+ // SPS
+ 0x00, 0x00, 0x00, 0x01, 0x67, 0x7a, 0x10, 0x29,
+ 0xb6, 0xd4, 0x20, 0x22, 0x33, 0x19, 0xc6, 0x63,
+ 0x23, 0x21, 0x01, 0x11, 0x98, 0xce, 0x33, 0x19,
+ 0x18, 0x21, 0x03, 0x3a, 0x46, 0x65, 0x6a, 0x65,
+ 0x24, 0xad, 0xe9, 0x12, 0x32, 0x14, 0x1a, 0x26,
+ 0x34, 0xad, 0xa4, 0x41, 0x82, 0x23, 0x01, 0x50,
+ 0x2b, 0x1a, 0x24, 0x69, 0x48, 0x30, 0x40, 0x2e,
+ 0x11, 0x12, 0x08, 0xc6, 0x8c, 0x04, 0x41, 0x28,
+ 0x4c, 0x34, 0xf0, 0x1e, 0x01, 0x13, 0xf2, 0xe0,
+ 0x3c, 0x60, 0x20, 0x20, 0x28, 0x00, 0x00, 0x03,
+ 0x00, 0x08, 0x00, 0x00, 0x03, 0x01, 0x94, 0x00,
+ // PPS
+ 0x00, 0x00, 0x00, 0x01, 0x68, 0xce, 0x33, 0x48,
+ 0xd0
+ };
+ static const uint8_t avci50_1080i_extradata[] = {
+ // SPS
+ 0x00, 0x00, 0x00, 0x01, 0x67, 0x6e, 0x10, 0x28,
+ 0xa6, 0xd4, 0x20, 0x32, 0x33, 0x0c, 0x71, 0x18,
+ 0x88, 0x62, 0x10, 0x19, 0x19, 0x86, 0x38, 0x8c,
+ 0x44, 0x30, 0x21, 0x02, 0x56, 0x4e, 0x6e, 0x61,
+ 0x87, 0x3e, 0x73, 0x4d, 0x98, 0x0c, 0x03, 0x06,
+ 0x9c, 0x0b, 0x73, 0xe6, 0xc0, 0xb5, 0x18, 0x63,
+ 0x0d, 0x39, 0xe0, 0x5b, 0x02, 0xd4, 0xc6, 0x19,
+ 0x1a, 0x79, 0x8c, 0x32, 0x34, 0x24, 0xf0, 0x16,
+ 0x81, 0x13, 0xf7, 0xff, 0x80, 0x01, 0x80, 0x02,
+ 0x71, 0x80, 0x80, 0x80, 0xa0, 0x00, 0x00, 0x03,
+ 0x00, 0x20, 0x00, 0x00, 0x06, 0x50, 0x80, 0x00,
+ // PPS
+ 0x00, 0x00, 0x00, 0x01, 0x68, 0xee, 0x31, 0x12,
+ 0x11
+ };
+ static const uint8_t avci100_720p_extradata[] = {
+ // SPS
+ 0x00, 0x00, 0x00, 0x01, 0x67, 0x7a, 0x10, 0x29,
+ 0xb6, 0xd4, 0x20, 0x2a, 0x33, 0x1d, 0xc7, 0x62,
+ 0xa1, 0x08, 0x40, 0x54, 0x66, 0x3b, 0x8e, 0xc5,
+ 0x42, 0x02, 0x10, 0x25, 0x64, 0x2c, 0x89, 0xe8,
+ 0x85, 0xe4, 0x21, 0x4b, 0x90, 0x83, 0x06, 0x95,
+ 0xd1, 0x06, 0x46, 0x97, 0x20, 0xc8, 0xd7, 0x43,
+ 0x08, 0x11, 0xc2, 0x1e, 0x4c, 0x91, 0x0f, 0x01,
+ 0x40, 0x16, 0xec, 0x07, 0x8c, 0x04, 0x04, 0x05,
+ 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x03,
+ 0x00, 0x64, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00,
+ // PPS
+ 0x00, 0x00, 0x00, 0x01, 0x68, 0xce, 0x31, 0x12,
+ 0x11
+ };
+
+ 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;
+ size = sizeof(avci100_1080p_extradata);
+ } else {
+ data = avci100_1080i_extradata;
+ size = sizeof(avci100_1080i_extradata);
+ }
+ } else if (st->codec->width == 1440) {
+ data = avci50_1080i_extradata;
+ size = sizeof(avci50_1080i_extradata);
+ } else if (st->codec->width == 1280) {
+ data = avci100_720p_extradata;
+ size = sizeof(avci100_720p_extradata);
+ }
+
+ if (!size)
+ return 0;
+
+ av_freep(&st->codec->extradata);
+ st->codec->extradata_size = 0;
+ st->codec->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!st->codec->extradata)
+ return AVERROR(ENOMEM);
+
+ memcpy(st->codec->extradata, data, size);
+ st->codec->extradata_size = size;
+
+ return 0;
 }

libav-v9.6.tar.bz2/libavformat/vc1test.c -> libav-v10.1.tar.bz2/libavformat/vc1test.c Changed

libav-v9.6.tar.bz2/libavformat/vc1testenc.c -> libav-v10.1.tar.bz2/libavformat/vc1testenc.c Changed

libav-v9.6.tar.bz2/libavformat/version.h -> libav-v10.1.tar.bz2/libavformat/version.h Changed

@@ -27,11 +27,11 @@
 * Libavformat version macros
 */
 
-#include "libavutil/avutil.h"
+#include "libavutil/version.h"
 
-#define LIBAVFORMAT_VERSION_MAJOR 54
-#define LIBAVFORMAT_VERSION_MINOR 20
-#define LIBAVFORMAT_VERSION_MICRO 3
+#define LIBAVFORMAT_VERSION_MAJOR 55
+#define LIBAVFORMAT_VERSION_MINOR 12
+#define LIBAVFORMAT_VERSION_MICRO 0
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
 LIBAVFORMAT_VERSION_MINOR, \
@@ -48,24 +48,8 @@
 * dropped at a future version bump. The defines themselves are not part of
 * the public API and may change, break or disappear at any time.
 */
-
-#ifndef FF_API_CLOSE_INPUT_FILE
-#define FF_API_CLOSE_INPUT_FILE (LIBAVFORMAT_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_APPLEHTTP_PROTO
-#define FF_API_APPLEHTTP_PROTO (LIBAVFORMAT_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_READ_PACKET
-#define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_INTERLEAVE_PACKET
-#define FF_API_INTERLEAVE_PACKET (LIBAVFORMAT_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_AV_GETTIME
-#define FF_API_AV_GETTIME (LIBAVFORMAT_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_R_FRAME_RATE
-#define FF_API_R_FRAME_RATE (LIBAVFORMAT_VERSION_MAJOR < 55)
+#ifndef FF_API_REFERENCE_DTS
+#define FF_API_REFERENCE_DTS (LIBAVFORMAT_VERSION_MAJOR < 56)
 #endif
 
 #endif /* AVFORMAT_VERSION_H */

libav-v9.6.tar.bz2/libavformat/vocdec.c -> libav-v10.1.tar.bz2/libavformat/vocdec.c Changed

@@ -91,11 +91,11 @@
                 if (sample_rate)
                     dec->sample_rate = sample_rate;
                 avpriv_set_pts_info(st, 64, 1, dec->sample_rate);
+                dec->channels = channels;
+                dec->bits_per_coded_sample = av_get_bits_per_sample(dec->codec_id);
             } else
                 avio_skip(pb, 1);
-            dec->channels = channels;
             tmp_codec = avio_r8(pb);
-            dec->bits_per_coded_sample = av_get_bits_per_sample(dec->codec_id);
             voc->remaining_size -= 2;
             max_size -= 2;
             channels = 1;
@@ -117,10 +117,10 @@
             if (!dec->sample_rate) {
                 dec->sample_rate = avio_rl32(pb);
                 avpriv_set_pts_info(st, 64, 1, dec->sample_rate);
+                dec->bits_per_coded_sample = avio_r8(pb);
+                dec->channels = avio_r8(pb);
             } else
-                avio_skip(pb, 4);
-            dec->bits_per_coded_sample = avio_r8(pb);
-            dec->channels = avio_r8(pb);
+                avio_skip(pb, 6);
             tmp_codec = avio_rl16(pb);
             avio_skip(pb, 4);
             voc->remaining_size -= 12;

libav-v9.6.tar.bz2/libavformat/vqf.c -> libav-v10.1.tar.bz2/libavformat/vqf.c Changed

libav-v9.6.tar.bz2/libavformat/wavdec.c -> libav-v10.1.tar.bz2/libavformat/wavdec.c Changed

@@ -23,25 +23,26 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include <stdint.h>
+
 #include "libavutil/avassert.h"
 #include "libavutil/dict.h"
 #include "libavutil/log.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 #include "avformat.h"
-#include "internal.h"
+#include "avio.h"
 #include "avio_internal.h"
+#include "internal.h"
+#include "metadata.h"
 #include "pcm.h"
 #include "riff.h"
-#include "avio.h"
-#include "metadata.h"
 
 typedef struct WAVDemuxContext {
 int64_t data_end;
 int w64;
 } WAVDemuxContext;
 
-
 #if CONFIG_WAV_DEMUXER
 
 static int64_t next_tag(AVIOContext *pb, uint32_t *tag)
@@ -80,11 +81,9 @@
 return 0;
 if (!memcmp(p->buf + 8, "WAVE", 4)) {
 if (!memcmp(p->buf, "RIFF", 4))
- /*
- Since ACT demuxer has standard WAV header at top of it's own,
- returning score is decreased to avoid probe conflict
- between ACT and WAV.
- */
+ /* Since the ACT demuxer has a standard WAV header at the top of
+ * its own, the returned score is decreased to avoid a probe
+ * conflict between ACT and WAV. */
 return AVPROBE_SCORE_MAX - 1;
 else if (!memcmp(p->buf, "RF64", 4) &&
 !memcmp(p->buf + 12, "ds64", 4))
@@ -157,16 +156,22 @@
 
 if (umid_mask) {
 /* the string formatting below is per SMPTE 330M-2004 Annex C */
- if (umid_parts[4] == 0 && umid_parts[5] == 0 && umid_parts[6] == 0 && umid_parts[7] == 0) {
+ if (umid_parts[4] == 0 && umid_parts[5] == 0 &&
+ umid_parts[6] == 0 && umid_parts[7] == 0) {
 /* basic UMID */
- snprintf(temp, sizeof(temp), "0x%016"PRIX64"%016"PRIX64"%016"PRIX64"%016"PRIX64,
- umid_parts[0], umid_parts[1], umid_parts[2], umid_parts[3]);
+ snprintf(temp, sizeof(temp),
+ "0x%016"PRIX64"%016"PRIX64"%016"PRIX64"%016"PRIX64,
+ umid_parts[0], umid_parts[1],
+ umid_parts[2], umid_parts[3]);
 } else {
 /* extended UMID */
- snprintf(temp, sizeof(temp), "0x%016"PRIX64"%016"PRIX64"%016"PRIX64"%016"PRIX64
- "0x%016"PRIX64"%016"PRIX64"%016"PRIX64"%016"PRIX64,
- umid_parts[0], umid_parts[1], umid_parts[2], umid_parts[3],
- umid_parts[4], umid_parts[5], umid_parts[6], umid_parts[7]);
+ snprintf(temp, sizeof(temp),
+ "0x%016"PRIX64"%016"PRIX64"%016"PRIX64"%016"PRIX64
+ "0x%016"PRIX64"%016"PRIX64"%016"PRIX64"%016"PRIX64,
+ umid_parts[0], umid_parts[1],
+ umid_parts[2], umid_parts[3],
+ umid_parts[4], umid_parts[5],
+ umid_parts[6], umid_parts[7]);
 }
 
 if ((ret = av_dict_set(&s->metadata, "umid", temp, 0)) < 0)
@@ -181,7 +186,7 @@
 /* CodingHistory present */
 size -= 602;
 
- if (!(coding_history = av_malloc(size+1)))
+ if (!(coding_history = av_malloc(size + 1)))
 return AVERROR(ENOMEM);
 
 if ((ret = avio_read(s->pb, coding_history, size)) < 0)
@@ -197,22 +202,22 @@
 }
 
 static const AVMetadataConv wav_metadata_conv[] = {
- {"description", "comment" },
- {"originator", "encoded_by" },
- {"origination_date", "date" },
- {"origination_time", "creation_time"},
- {0},
+ { "description", "comment" },
+ { "originator", "encoded_by" },
+ { "origination_date", "date" },
+ { "origination_time", "creation_time" },
+ { 0 },
 };
 
 /* wav input */
 static int wav_read_header(AVFormatContext *s)
 {
 int64_t size, av_uninit(data_size);
- int64_t sample_count=0;
+ int64_t sample_count = 0;
 int rf64;
 uint32_t tag;
- AVIOContext *pb = s->pb;
- AVStream *st = NULL;
+ AVIOContext *pb = s->pb;
+ AVStream *st = NULL;
 WAVDemuxContext *wav = s->priv_data;
 int ret, got_fmt = 0;
 int64_t next_tag_ofs, data_ofs = -1;
@@ -222,21 +227,23 @@
 
 rf64 = tag == MKTAG('R', 'F', '6', '4');
 if (!rf64 && tag != MKTAG('R', 'I', 'F', 'F'))
- return -1;
+ return AVERROR_INVALIDDATA;
 avio_rl32(pb); /* file size */
 tag = avio_rl32(pb);
 if (tag != MKTAG('W', 'A', 'V', 'E'))
- return -1;
+ return AVERROR_INVALIDDATA;
 
 if (rf64) {
 if (avio_rl32(pb) != MKTAG('d', 's', '6', '4'))
- return -1;
+ return AVERROR_INVALIDDATA;
 size = avio_rl32(pb);
 if (size < 16)
- return -1;
+ return AVERROR_INVALIDDATA;
 avio_rl64(pb); /* RIFF size */
- data_size = avio_rl64(pb);
+
+ data_size = avio_rl64(pb);
 sample_count = avio_rl64(pb);
+
 if (data_size < 0 || sample_count < 0) {
 av_log(s, AV_LOG_ERROR, "negative data_size and/or sample_count in "
 "ds64: data_size = %"PRId64", sample_count = %"PRId64"\n",
@@ -247,7 +254,7 @@
 }
 
 for (;;) {
- size = next_tag(pb, &tag);
+ size = next_tag(pb, &tag);
 next_tag_ofs = avio_tell(pb) + size;
 
 if (pb->eof_reached)
@@ -265,14 +272,15 @@
 break;
 case MKTAG('d', 'a', 't', 'a'):
 if (!got_fmt) {
- av_log(s, AV_LOG_ERROR, "found no 'fmt ' tag before the 'data' tag\n");
+ av_log(s, AV_LOG_ERROR,
+ "found no 'fmt ' tag before the 'data' tag\n");
 return AVERROR_INVALIDDATA;
 }
 
 if (rf64) {
 next_tag_ofs = wav->data_end = avio_tell(pb) + data_size;
 } else {
- data_size = size;
+ data_size = size;
 next_tag_ofs = wav->data_end = size ? next_tag_ofs : INT64_MAX;
 }
 
@@ -284,11 +292,11 @@
 if (!pb->seekable || (!rf64 && !size))
 goto break_loop;
 break;
- case MKTAG('f','a','c','t'):
+ case MKTAG('f', 'a', 'c', 't'):
 if (!sample_count)
 sample_count = avio_rl32(pb);
 break;
- case MKTAG('b','e','x','t'):
+ case MKTAG('b', 'e', 'x', 't'):
 if ((ret = wav_parse_bext_tag(s, size)) < 0)
 return ret;
 break;
@@ -311,6 +319,7 @@
 break;
 }
 }
+
 break_loop:
 if (data_ofs < 0) {
 av_log(s, AV_LOG_ERROR, "no 'data' tag found\n");
@@ -319,8 +328,11 @@
 
 avio_seek(pb, data_ofs, SEEK_SET);
 
- if (!sample_count && st->codec->channels && av_get_bits_per_sample(st->codec->codec_id))
- sample_count = (data_size<<3) / (st->codec->channels * (uint64_t)av_get_bits_per_sample(st->codec->codec_id));
+ if (!sample_count && st->codec->channels &&
+ av_get_bits_per_sample(st->codec->codec_id))
+ sample_count = (data_size << 3) /
+ (st->codec->channels *
+ (uint64_t)av_get_bits_per_sample(st->codec->codec_id));
 if (sample_count)
 st->duration = sample_count;
 
@@ -330,7 +342,8 @@
 return 0;
 }
 
-/** Find chunk with w64 GUID by skipping over other chunks
+/**
+ * Find chunk with w64 GUID by skipping over other chunks.
 * @return the size of the found chunk
 */
 static int64_t find_guid(AVIOContext *pb, const uint8_t guid1[16])
@@ -350,13 +363,14 @@
 return -1;
 }
 
-static const uint8_t guid_data[16] = { 'd', 'a', 't', 'a',
- 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A };
+static const uint8_t guid_data[16] = {
+ 'd', 'a', 't', 'a',
+ 0xF3, 0xAC, 0xD3, 0x11,0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A
+};
 
 #define MAX_SIZE 4096
 
-static int wav_read_packet(AVFormatContext *s,
- AVPacket *pkt)
+static int wav_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
 int ret, size;
 int64_t left;
@@ -366,14 +380,14 @@
 st = s->streams[0];
 
 left = wav->data_end - avio_tell(s->pb);
- if (left <= 0){
+ if (left <= 0) {
 if (CONFIG_W64_DEMUXER && wav->w64)
 left = find_guid(s->pb, guid_data) - 24;
 else
 left = find_tag(s->pb, MKTAG('d', 'a', 't', 'a'));
 if (left < 0)
 return AVERROR_EOF;
- wav->data_end= avio_tell(s->pb) + left;
+ wav->data_end = avio_tell(s->pb) + left;
 }
 
 size = MAX_SIZE;
@@ -419,20 +433,25 @@
 .read_packet = wav_read_packet,
 .read_seek = wav_read_seek,
 .flags = AVFMT_GENERIC_INDEX,
- .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },
+ .codec_tag = (const AVCodecTag * const []) { ff_codec_wav_tags, 0 },
 };
 #endif /* CONFIG_WAV_DEMUXER */
 
-
 #if CONFIG_W64_DEMUXER
-static const uint8_t guid_riff[16] = { 'r', 'i', 'f', 'f',
- 0x2E, 0x91, 0xCF, 0x11, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 };
+static const uint8_t guid_riff[16] = {
+ 'r', 'i', 'f', 'f',
+ 0x2E, 0x91, 0xCF, 0x11,0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00
+};
 
-static const uint8_t guid_wave[16] = { 'w', 'a', 'v', 'e',
- 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A };
+static const uint8_t guid_wave[16] = {
+ 'w', 'a', 'v', 'e',
+ 0xF3, 0xAC, 0xD3, 0x11,0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A
+};
 
-static const uint8_t guid_fmt [16] = { 'f', 'm', 't', ' ',
- 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A };
+static const uint8_t guid_fmt[16] = {
+ 'f', 'm', 't', ' ',
+ 0xF3, 0xAC, 0xD3, 0x11,0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A
+};
 
 static int w64_probe(AVProbeData *p)
 {
@@ -448,29 +467,30 @@
 static int w64_read_header(AVFormatContext *s)
 {
 int64_t size;
- AVIOContext *pb = s->pb;
- WAVDemuxContext *wav = s->priv_data;
+ AVIOContext *pb = s->pb;
+ WAVDemuxContext *wav = s->priv_data;
 AVStream *st;
 uint8_t guid[16];
 int ret;
 
 avio_read(pb, guid, 16);
 if (memcmp(guid, guid_riff, 16))
- return -1;
+ return AVERROR_INVALIDDATA;
 
- if (avio_rl64(pb) < 16 + 8 + 16 + 8 + 16 + 8) /* riff + wave + fmt + sizes */
- return -1;
+ /* riff + wave + fmt + sizes */
+ if (avio_rl64(pb) < 16 + 8 + 16 + 8 + 16 + 8)
+ return AVERROR_INVALIDDATA;
 
 avio_read(pb, guid, 16);
 if (memcmp(guid, guid_wave, 16)) {
 av_log(s, AV_LOG_ERROR, "could not find wave guid\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 size = find_guid(pb, guid_fmt);
 if (size < 0) {
 av_log(s, AV_LOG_ERROR, "could not find fmt guid\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 
 st = avformat_new_stream(s, NULL);
@@ -490,7 +510,7 @@
 size = find_guid(pb, guid_data);
 if (size < 0) {
 av_log(s, AV_LOG_ERROR, "could not find data guid\n");
- return -1;
+ return AVERROR_INVALIDDATA;
 }
 wav->data_end = avio_tell(pb) + size - 24;
 wav->w64 = 1;
@@ -507,6 +527,6 @@
 .read_packet = wav_read_packet,
 .read_seek = wav_read_seek,
 .flags = AVFMT_GENERIC_INDEX,
- .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },
+ .codec_tag = (const AVCodecTag * const []) { ff_codec_wav_tags, 0 },
 };
 #endif /* CONFIG_W64_DEMUXER */

libav-v9.6.tar.bz2/libavformat/westwood_aud.c -> libav-v10.1.tar.bz2/libavformat/westwood_aud.c Changed

libav-v9.6.tar.bz2/libavformat/westwood_vqa.c -> libav-v10.1.tar.bz2/libavformat/westwood_vqa.c Changed

libav-v9.6.tar.bz2/libavformat/wtv.c -> libav-v10.1.tar.bz2/libavformat/wtv.c Changed

@@ -36,11 +36,6 @@
 #include "mpegts.h"
 
 /* Macros for formating GUIDs */
-#define PRI_GUID \
- "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
-#define ARG_GUID(g) \
- g[0],g[1],g[2],g[3],g[4],g[5],g[6],g[7],g[8],g[9],g[10],g[11],g[12],g[13],g[14],g[15]
-
 #define PRI_PRETTY_GUID \
 "%08x-%04x-%04x-%02x%02x%02x%02x%02x%02x%02x%02x"
 #define ARG_PRETTY_GUID(g) \
@@ -57,6 +52,8 @@
 #define WTV_SECTOR_SIZE (1 << WTV_SECTOR_BITS)
 #define WTV_BIGSECTOR_BITS 18
 
+#define SHIFT_SECTOR_BITS(a) ((int64_t)(a) << WTV_SECTOR_BITS)
+
 typedef struct {
 AVIOContext *pb_filesystem; /** file system (AVFormatContext->pb) */
 
@@ -69,6 +66,11 @@
 int64_t length;
 } WtvFile;
 
+static int64_t seek_by_sector(AVIOContext *pb, int64_t sector, int64_t offset)
+{
+ return avio_seek(pb, SHIFT_SECTOR_BITS(sector) + offset, SEEK_SET);
+}
+
 /**
 * @return bytes read, 0 on end of file, or <0 on error
 */
@@ -99,7 +101,7 @@
 int i = wf->position >> wf->sector_bits;
 if (i >= wf->nb_sectors ||
 (wf->sectors[i] != wf->sectors[i - 1] + (1 << (wf->sector_bits - WTV_SECTOR_BITS)) &&
- avio_seek(pb, (int64_t)wf->sectors[i] << WTV_SECTOR_BITS, SEEK_SET) < 0)) {
+ seek_by_sector(pb, wf->sectors[i], 0) < 0)) {
 wf->error = 1;
 break;
 }
@@ -124,8 +126,8 @@
 offset = wf->length;
 
 wf->error = offset < 0 || offset >= wf->length ||
- avio_seek(pb, ((int64_t)wf->sectors[offset >> wf->sector_bits] << WTV_SECTOR_BITS)
- + (offset & ((1 << wf->sector_bits) - 1)), SEEK_SET) < 0;
+ seek_by_sector(pb, wf->sectors[offset >> wf->sector_bits],
+ offset & ((1 << wf->sector_bits) - 1)) < 0;
 wf->position = offset;
 return offset;
 }
@@ -160,7 +162,7 @@
 WtvFile *wf;
 uint8_t *buffer;
 
- if (avio_seek(s->pb, first_sector << WTV_SECTOR_BITS, SEEK_SET) < 0)
+ if (seek_by_sector(s->pb, first_sector, 0) < 0)
 return NULL;
 
 wf = av_mallocz(sizeof(WtvFile));
@@ -189,14 +191,14 @@
 int nb_sectors1 = read_ints(s->pb, sectors1, WTV_SECTOR_SIZE / 4);
 int i;
 
- wf->sectors = av_malloc(nb_sectors1 << WTV_SECTOR_BITS);
+ wf->sectors = av_malloc(SHIFT_SECTOR_BITS(nb_sectors1));
 if (!wf->sectors) {
 av_free(wf);
 return NULL;
 }
 wf->nb_sectors = 0;
 for (i = 0; i < nb_sectors1; i++) {
- if (avio_seek(s->pb, (int64_t)sectors1[i] << WTV_SECTOR_BITS, SEEK_SET) < 0)
+ if (seek_by_sector(s->pb, sectors1[i], 0) < 0)
 break;
 wf->nb_sectors += read_ints(s->pb, wf->sectors + i * WTV_SECTOR_SIZE / 4, WTV_SECTOR_SIZE / 4);
 }
@@ -223,7 +225,7 @@
 
 /* seek to initial sector */
 wf->position = 0;
- if (avio_seek(s->pb, (int64_t)wf->sectors[0] << WTV_SECTOR_BITS, SEEK_SET) < 0) {
+ if (seek_by_sector(s->pb, wf->sectors[0], 0) < 0) {
 av_free(wf->sectors);
 av_free(wf);
 return NULL;
@@ -267,14 +269,19 @@
 uint64_t file_length;
 const uint8_t *name;
 if (ff_guidcmp(buf, dir_entry_guid)) {
- av_log(s, AV_LOG_ERROR, "unknown guid "PRI_GUID", expected dir_entry_guid; "
- "remaining directory entries ignored\n", ARG_GUID(buf));
+ av_log(s, AV_LOG_ERROR, "unknown guid "FF_PRI_GUID", expected dir_entry_guid; "
+ "remaining directory entries ignored\n", FF_ARG_GUID(buf));
 break;
 }
 dir_length = AV_RL16(buf + 16);
 file_length = AV_RL64(buf + 24);
 name_size = 2 * AV_RL32(buf + 32);
- if (buf + 48 + name_size > buf_end) {
+ if (name_size < 0) {
+ av_log(s, AV_LOG_ERROR,
+ "bad filename length, remaining directory entries ignored\n");
+ break;
+ }
+ if (48 + name_size > buf_end - buf) {
 av_log(s, AV_LOG_ERROR, "filename exceeds buffer size; remaining directory entries ignored\n");
 break;
 }
@@ -331,21 +338,6 @@
 unsigned int index_entries_allocated_size;
 } WtvContext;
 
-typedef struct {
- enum AVCodecID id;
- ff_asf_guid guid;
-} AVCodecGuid;
-
-static enum AVCodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid)
-{
- int i;
- for (i = 0; guids[i].id != AV_CODEC_ID_NONE; i++) {
- if (!ff_guidcmp(guids[i].guid, guid))
- return guids[i].id;
- }
- return AV_CODEC_ID_NONE;
-}
-
 /* WTV GUIDs */
 static const ff_asf_guid wtv_guid =
 {0xB7,0xD8,0x00,0x20,0x37,0x49,0xDA,0x11,0xA6,0x4E,0x00,0x07,0xE9,0x5E,0xAD,0x8D};
@@ -380,14 +372,11 @@
 
 /* Windows media GUIDs */
 
-#define MEDIASUBTYPE_BASE_GUID \
- 0x00,0x00,0x10,0x00,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71
-
 /* Media types */
 static const ff_asf_guid mediatype_audio =
- {'a','u','d','s',MEDIASUBTYPE_BASE_GUID};
+ {'a','u','d','s',FF_MEDIASUBTYPE_BASE_GUID};
 static const ff_asf_guid mediatype_video =
- {'v','i','d','s',MEDIASUBTYPE_BASE_GUID};
+ {'v','i','d','s',FF_MEDIASUBTYPE_BASE_GUID};
 static const ff_asf_guid mediasubtype_mpeg1payload =
 {0x81,0xEB,0x36,0xE4,0x4F,0x52,0xCE,0x11,0x9F,0x53,0x00,0x20,0xAF,0x0B,0xA7,0x70};
 static const ff_asf_guid mediatype_mpeg2_sections =
@@ -426,13 +415,6 @@
 {AV_CODEC_ID_NONE}
 };
 
-static const AVCodecGuid audio_guids[] = {
- {AV_CODEC_ID_AC3, {0x2C,0x80,0x6D,0xE0,0x46,0xDB,0xCF,0x11,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA}},
- {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}
-};
-
 static int read_probe(AVProbeData *p)
 {
 return ff_guidcmp(p->buf, wtv_guid) ? 0 : AVPROBE_SCORE_MAX;
@@ -502,6 +484,7 @@
 st->codec->codec_id = AV_CODEC_ID_MJPEG;
 st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT;
 st->codec->extradata = av_mallocz(filesize);
+ st->id = -1;
 if (!st->codec->extradata)
 goto done;
 st->codec->extradata_size = filesize;
@@ -542,7 +525,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);
@@ -577,8 +560,8 @@
 if (!length)
 break;
 if (ff_guidcmp(&guid, metadata_guid)) {
- av_log(s, AV_LOG_WARNING, "unknown guid "PRI_GUID", expected metadata_guid; "
- "remaining metadata entries ignored\n", ARG_GUID(guid));
+ av_log(s, AV_LOG_WARNING, "unknown guid "FF_PRI_GUID", expected metadata_guid; "
+ "remaining metadata entries ignored\n", FF_ARG_GUID(guid));
 break;
 }
 avio_get_str16le(pb, INT_MAX, key, sizeof(key));
@@ -702,11 +685,11 @@
 return NULL;
 } else {
 if (ff_guidcmp(formattype, format_none))
- av_log(s, AV_LOG_WARNING, "unknown formattype:"PRI_GUID"\n", ARG_GUID(formattype));
+ av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype));
 avio_skip(pb, size);
 }
 
- if (!memcmp(subtype + 4, (const uint8_t[]){MEDIASUBTYPE_BASE_GUID}, 12)) {
+ if (!memcmp(subtype + 4, (const uint8_t[]){FF_MEDIASUBTYPE_BASE_GUID}, 12)) {
 st->codec->codec_id = ff_wav_codec_get_id(AV_RL32(subtype), st->codec->bits_per_coded_sample);
 } else if (!ff_guidcmp(subtype, mediasubtype_mpeg1payload)) {
 if (st->codec->extradata && st->codec->extradata_size >= 22)
@@ -714,9 +697,9 @@
 else
 av_log(s, AV_LOG_WARNING, "MPEG1WAVEFORMATEX underflow\n");
 } else {
- st->codec->codec_id = ff_codec_guid_get_id(audio_guids, subtype);
+ st->codec->codec_id = ff_codec_guid_get_id(ff_codec_wav_guids, subtype);
 if (st->codec->codec_id == AV_CODEC_ID_NONE)
- av_log(s, AV_LOG_WARNING, "unknown subtype:"PRI_GUID"\n", ARG_GUID(subtype));
+ av_log(s, AV_LOG_WARNING, "unknown subtype:"FF_PRI_GUID"\n", FF_ARG_GUID(subtype));
 }
 return st;
 } else if (!ff_guidcmp(mediatype, mediatype_video)) {
@@ -731,17 +714,17 @@
 avio_skip(pb, FFMAX(size - consumed, 0));
 } else {
 if (ff_guidcmp(formattype, format_none))
- av_log(s, AV_LOG_WARNING, "unknown formattype:"PRI_GUID"\n", ARG_GUID(formattype));
+ av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype));
 avio_skip(pb, size);
 }
 
- if (!memcmp(subtype + 4, (const uint8_t[]){MEDIASUBTYPE_BASE_GUID}, 12)) {
+ if (!memcmp(subtype + 4, (const uint8_t[]){FF_MEDIASUBTYPE_BASE_GUID}, 12)) {
 st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, AV_RL32(subtype));
 } else {
 st->codec->codec_id = ff_codec_guid_get_id(video_guids, subtype);
 }
 if (st->codec->codec_id == AV_CODEC_ID_NONE)
- av_log(s, AV_LOG_WARNING, "unknown subtype:"PRI_GUID"\n", ARG_GUID(subtype));
+ av_log(s, AV_LOG_WARNING, "unknown subtype:"FF_PRI_GUID"\n", FF_ARG_GUID(subtype));
 return st;
 } else if (!ff_guidcmp(mediatype, mediatype_mpeg2_pes) &&
 !ff_guidcmp(subtype, mediasubtype_dvb_subtitle)) {
@@ -749,7 +732,7 @@
 if (!st)
 return NULL;
 if (ff_guidcmp(formattype, format_none))
- av_log(s, AV_LOG_WARNING, "unknown formattype:"PRI_GUID"\n", ARG_GUID(formattype));
+ av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype));
 avio_skip(pb, size);
 st->codec->codec_id = AV_CODEC_ID_DVB_SUBTITLE;
 return st;
@@ -759,21 +742,21 @@
 if (!st)
 return NULL;
 if (ff_guidcmp(formattype, format_none))
- av_log(s, AV_LOG_WARNING, "unknown formattype:"PRI_GUID"\n", ARG_GUID(formattype));
+ av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype));
 avio_skip(pb, size);
 st->codec->codec_id = AV_CODEC_ID_DVB_TELETEXT;
 return st;
 } else if (!ff_guidcmp(mediatype, mediatype_mpeg2_sections) &&
 !ff_guidcmp(subtype, mediasubtype_mpeg2_sections)) {
 if (ff_guidcmp(formattype, format_none))
- av_log(s, AV_LOG_WARNING, "unknown formattype:"PRI_GUID"\n", ARG_GUID(formattype));
+ av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype));
 avio_skip(pb, size);
 return NULL;
 }
 
- av_log(s, AV_LOG_WARNING, "unknown media type, mediatype:"PRI_GUID
- ", subtype:"PRI_GUID", formattype:"PRI_GUID"\n",
- ARG_GUID(mediatype), ARG_GUID(subtype), ARG_GUID(formattype));
+ av_log(s, AV_LOG_WARNING, "unknown media type, mediatype:"FF_PRI_GUID
+ ", subtype:"FF_PRI_GUID", formattype:"FF_PRI_GUID"\n",
+ FF_ARG_GUID(mediatype), FF_ARG_GUID(subtype), FF_ARG_GUID(formattype));
 avio_skip(pb, size);
 return NULL;
 }
@@ -945,7 +928,7 @@
 !ff_guidcmp(g, (const ff_asf_guid){0xA1,0xC3,0xD2,0xC2,0x7E,0x9A,0xDA,0x11,0x8B,0xF7,0x00,0x07,0xE9,0x5E,0xAD,0x8D})) {
 //ignore known guids
 } else
- av_log(s, AV_LOG_WARNING, "unsupported chunk:"PRI_GUID"\n", ARG_GUID(g));
+ av_log(s, AV_LOG_WARNING, "unsupported chunk:"FF_PRI_GUID"\n", FF_ARG_GUID(g));
 
 avio_skip(pb, WTV_PAD8(len) - consumed);
 }
@@ -987,7 +970,7 @@
 avio_skip(s->pb, 4);
 root_sector = avio_rl32(s->pb);
 
- avio_seek(s->pb, root_sector << WTV_SECTOR_BITS, SEEK_SET);
+ seek_by_sector(s->pb, root_sector, 0);
 root_size = avio_read(s->pb, root, root_size);
 if (root_size < 0)
 return AVERROR_INVALIDDATA;

libav-v9.6.tar.bz2/libavformat/wv.c -> libav-v10.1.tar.bz2/libavformat/wv.c Changed

@@ -1,6 +1,5 @@
 /*
- * WavPack demuxer
- * Copyright (c) 2006,2011 Konstantin Shishkov
+ * WavPack shared functions
 *
 * This file is part of Libav.
 *
@@ -19,378 +18,35 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include "libavutil/channel_layout.h"
-#include "libavutil/intreadwrite.h"
-#include "libavutil/dict.h"
-#include "avformat.h"
-#include "internal.h"
-#include "apetag.h"
-#include "id3v1.h"
-
-// specs say that maximum block size is 1Mb
-#define WV_BLOCK_LIMIT 1047576
-
-#define WV_EXTRA_SIZE 12
-
-#define WV_START_BLOCK 0x0800
-#define WV_END_BLOCK 0x1000
-#define WV_SINGLE_BLOCK (WV_START_BLOCK | WV_END_BLOCK)
-
-enum WV_FLAGS {
- WV_MONO = 0x0004,
- WV_HYBRID = 0x0008,
- WV_JOINT = 0x0010,
- WV_CROSSD = 0x0020,
- WV_HSHAPE = 0x0040,
- WV_FLOAT = 0x0080,
- WV_INT32 = 0x0100,
- WV_HBR = 0x0200,
- WV_HBAL = 0x0400,
- WV_MCINIT = 0x0800,
- WV_MCEND = 0x1000,
-};
+#include <stdint.h>
+#include <string.h>
 
-static const int wv_rates[16] = {
- 6000, 8000, 9600, 11025, 12000, 16000, 22050, 24000,
- 32000, 44100, 48000, 64000, 88200, 96000, 192000, -1
-};
-
-typedef struct {
- uint32_t blksize, flags;
- int rate, chan, bpp;
- uint32_t chmask;
- uint32_t samples, soff;
- int multichannel;
- int block_parsed;
- uint8_t extra[WV_EXTRA_SIZE];
- int64_t pos;
-
- int64_t apetag_start;
-} WVContext;
+#include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
 
-static int wv_probe(AVProbeData *p)
-{
- /* check file header */
- if (p->buf_size <= 32)
- return 0;
- if (p->buf[0] == 'w' && p->buf[1] == 'v' &&
- p->buf[2] == 'p' && p->buf[3] == 'k')
- return AVPROBE_SCORE_MAX;
- else
- return 0;
-}
+#include "wv.h"
 
-static int wv_read_block_header(AVFormatContext *ctx, AVIOContext *pb,
- int append)
+int ff_wv_parse_header(WvHeader *wv, const uint8_t *data)
 {
- WVContext *wc = ctx->priv_data;
- uint32_t tag, ver;
- int size;
- int rate, bpp, chan;
- uint32_t chmask;
-
- wc->pos = avio_tell(pb);
-
- /* don't return bogus packets with the ape tag data */
- if (wc->apetag_start && wc->pos >= wc->apetag_start)
- return AVERROR_EOF;
+ memset(wv, 0, sizeof(*wv));
 
- if (!append) {
- tag = avio_rl32(pb);
- if (tag != MKTAG('w', 'v', 'p', 'k'))
- return AVERROR_INVALIDDATA;
- size = avio_rl32(pb);
- if (size < 24 || size > WV_BLOCK_LIMIT) {
- av_log(ctx, AV_LOG_ERROR, "Incorrect block size %i\n", size);
- return AVERROR_INVALIDDATA;
- }
- wc->blksize = size;
- ver = avio_rl16(pb);
- if (ver < 0x402 || ver > 0x410) {
- av_log(ctx, AV_LOG_ERROR, "Unsupported version %03X\n", ver);
- return AVERROR_PATCHWELCOME;
- }
- avio_r8(pb); // track no
- avio_r8(pb); // track sub index
- wc->samples = avio_rl32(pb); // total samples in file
- wc->soff = avio_rl32(pb); // offset in samples of current block
- avio_read(pb, wc->extra, WV_EXTRA_SIZE);
- } else {
- size = wc->blksize;
- }
- wc->flags = AV_RL32(wc->extra + 4);
- /* Blocks with zero samples don't contain actual audio information
- * and should be ignored */
- if (!AV_RN32(wc->extra))
- return 0;
- // parse flags
- bpp = ((wc->flags & 3) + 1) << 3;
- chan = 1 + !(wc->flags & WV_MONO);
- chmask = wc->flags & WV_MONO ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO;
- rate = wv_rates[(wc->flags >> 23) & 0xF];
- wc->multichannel = !!((wc->flags & WV_SINGLE_BLOCK) != WV_SINGLE_BLOCK);
- if (wc->multichannel) {
- chan = wc->chan;
- chmask = wc->chmask;
- }
- if ((rate == -1 || !chan) && !wc->block_parsed) {
- int64_t block_end = avio_tell(pb) + wc->blksize - 24;
- if (!pb->seekable) {
- av_log(ctx, AV_LOG_ERROR,
- "Cannot determine additional parameters\n");
- return AVERROR_INVALIDDATA;
- }
- while (avio_tell(pb) < block_end) {
- int id, size;
- id = avio_r8(pb);
- size = (id & 0x80) ? avio_rl24(pb) : avio_r8(pb);
- size <<= 1;
- if (id & 0x40)
- size--;
- switch (id & 0x3F) {
- case 0xD:
- if (size <= 1) {
- av_log(ctx, AV_LOG_ERROR,
- "Insufficient channel information\n");
- return AVERROR_INVALIDDATA;
- }
- chan = avio_r8(pb);
- switch (size - 2) {
- case 0:
- chmask = avio_r8(pb);
- break;
- case 1:
- chmask = avio_rl16(pb);
- break;
- case 2:
- chmask = avio_rl24(pb);
- break;
- case 3:
- chmask = avio_rl32(pb);
- break;
- case 5:
- avio_skip(pb, 1);
- chan |= (avio_r8(pb) & 0xF) << 8;
- chmask = avio_rl24(pb);
- break;
- default:
- av_log(ctx, AV_LOG_ERROR,
- "Invalid channel info size %d\n", size);
- return AVERROR_INVALIDDATA;
- }
- break;
- case 0x27:
- rate = avio_rl24(pb);
- break;
- default:
- avio_skip(pb, size);
- }
- if (id & 0x40)
- avio_skip(pb, 1);
- }
- if (rate == -1) {
- av_log(ctx, AV_LOG_ERROR,
- "Cannot determine custom sampling rate\n");
- return AVERROR_INVALIDDATA;
- }
- avio_seek(pb, block_end - wc->blksize + 24, SEEK_SET);
- }
- if (!wc->bpp)
- wc->bpp = bpp;
- if (!wc->chan)
- wc->chan = chan;
- if (!wc->chmask)
- wc->chmask = chmask;
- if (!wc->rate)
- wc->rate = rate;
-
- if (wc->flags && bpp != wc->bpp) {
- av_log(ctx, AV_LOG_ERROR,
- "Bits per sample differ, this block: %i, header block: %i\n",
- bpp, wc->bpp);
- return AVERROR_INVALIDDATA;
- }
- if (wc->flags && !wc->multichannel && chan != wc->chan) {
- av_log(ctx, AV_LOG_ERROR,
- "Channels differ, this block: %i, header block: %i\n",
- chan, wc->chan);
+ if (AV_RL32(data) != MKTAG('w', 'v', 'p', 'k'))
 return AVERROR_INVALIDDATA;
- }
- if (wc->flags && rate != -1 && rate != wc->rate) {
- av_log(ctx, AV_LOG_ERROR,
- "Sampling rate differ, this block: %i, header block: %i\n",
- rate, wc->rate);
- return AVERROR_INVALIDDATA;
- }
- wc->blksize = size - 24;
- return 0;
-}
 
-static int wv_read_header(AVFormatContext *s)
-{
- AVIOContext *pb = s->pb;
- WVContext *wc = s->priv_data;
- AVStream *st;
- int ret;
-
- wc->block_parsed = 0;
- for (;;) {
- if ((ret = wv_read_block_header(s, pb, 0)) < 0)
- return ret;
- if (!AV_RN32(wc->extra))
- avio_skip(pb, wc->blksize - 24);
- else
- break;
- }
-
- /* now we are ready: build format streams */
- st = avformat_new_stream(s, NULL);
- if (!st)
- return AVERROR(ENOMEM);
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_id = AV_CODEC_ID_WAVPACK;
- st->codec->channels = wc->chan;
- st->codec->channel_layout = wc->chmask;
- st->codec->sample_rate = wc->rate;
- st->codec->bits_per_coded_sample = wc->bpp;
- avpriv_set_pts_info(st, 64, 1, wc->rate);
- st->start_time = 0;
- st->duration = wc->samples;
-
- if (s->pb->seekable) {
- int64_t cur = avio_tell(s->pb);
- wc->apetag_start = ff_ape_parse_tag(s);
- if (!av_dict_get(s->metadata, "", NULL, AV_DICT_IGNORE_SUFFIX))
- ff_id3v1_read(s);
- avio_seek(s->pb, cur, SEEK_SET);
- }
-
- return 0;
-}
-
-static int wv_read_packet(AVFormatContext *s, AVPacket *pkt)
-{
- WVContext *wc = s->priv_data;
- int ret;
- int size, ver, off;
- int64_t pos;
- uint32_t block_samples;
-
- if (s->pb->eof_reached)
- return AVERROR_EOF;
- if (wc->block_parsed) {
- if ((ret = wv_read_block_header(s, s->pb, 0)) < 0)
- return ret;
- }
-
- pos = wc->pos;
- off = wc->multichannel ? 4 : 0;
- if (av_new_packet(pkt, wc->blksize + WV_EXTRA_SIZE + off) < 0)
- return AVERROR(ENOMEM);
- if (wc->multichannel)
- AV_WL32(pkt->data, wc->blksize + WV_EXTRA_SIZE + 12);
- memcpy(pkt->data + off, wc->extra, WV_EXTRA_SIZE);
- ret = avio_read(s->pb, pkt->data + WV_EXTRA_SIZE + off, wc->blksize);
- if (ret != wc->blksize) {
- av_free_packet(pkt);
- return AVERROR(EIO);
- }
- while (!(wc->flags & WV_END_BLOCK)) {
- if (avio_rl32(s->pb) != MKTAG('w', 'v', 'p', 'k')) {
- av_free_packet(pkt);
- return AVERROR_INVALIDDATA;
- }
- if ((ret = av_append_packet(s->pb, pkt, 4)) < 0) {
- av_free_packet(pkt);
- return ret;
- }
- size = AV_RL32(pkt->data + pkt->size - 4);
- if (size < 24 || size > WV_BLOCK_LIMIT) {
- av_free_packet(pkt);
- av_log(s, AV_LOG_ERROR, "Incorrect block size %d\n", size);
- return AVERROR_INVALIDDATA;
- }
- wc->blksize = size;
- ver = avio_rl16(s->pb);
- if (ver < 0x402 || ver > 0x410) {
- av_free_packet(pkt);
- av_log(s, AV_LOG_ERROR, "Unsupported version %03X\n", ver);
- return AVERROR_PATCHWELCOME;
- }
- avio_r8(s->pb); // track no
- avio_r8(s->pb); // track sub index
- wc->samples = avio_rl32(s->pb); // total samples in file
- wc->soff = avio_rl32(s->pb); // offset in samples of current block
- if ((ret = av_append_packet(s->pb, pkt, WV_EXTRA_SIZE)) < 0) {
- av_free_packet(pkt);
- return ret;
- }
- memcpy(wc->extra, pkt->data + pkt->size - WV_EXTRA_SIZE, WV_EXTRA_SIZE);
-
- if ((ret = wv_read_block_header(s, s->pb, 1)) < 0) {
- av_free_packet(pkt);
- return ret;
- }
- ret = av_append_packet(s->pb, pkt, wc->blksize);
- if (ret < 0) {
- av_free_packet(pkt);
- return ret;
- }
- }
- pkt->stream_index = 0;
- wc->block_parsed = 1;
- pkt->pts = wc->soff;
- block_samples = AV_RN32(wc->extra);
- if (block_samples > INT32_MAX)
- av_log(s, AV_LOG_WARNING,
- "Too many samples in block: %"PRIu32"\n", block_samples);
- else
- pkt->duration = block_samples;
-
- av_add_index_entry(s->streams[0], pos, pkt->pts, 0, 0, AVINDEX_KEYFRAME);
- return 0;
-}
+ wv->blocksize = AV_RL32(data + 4);
+ if (wv->blocksize < 24 || wv->blocksize > WV_BLOCK_LIMIT)
+ return AVERROR_INVALIDDATA;
+ wv->blocksize -= 24;
 
-static int wv_read_seek(AVFormatContext *s, int stream_index,
- int64_t timestamp, int flags)
-{
- AVStream *st = s->streams[stream_index];
- WVContext *wc = s->priv_data;
- AVPacket pkt1, *pkt = &pkt1;
- int ret;
- int index = av_index_search_timestamp(st, timestamp, flags);
- int64_t pos, pts;
+ wv->version = AV_RL16(data + 8);
+ wv->total_samples = AV_RL32(data + 12);
+ wv->block_idx = AV_RL32(data + 16);
+ wv->samples = AV_RL32(data + 20);
+ wv->flags = AV_RL32(data + 24);
+ wv->crc = AV_RL32(data + 28);
 
- /* if found, seek there */
- if (index >= 0 &&
- timestamp <= st->index_entries[st->nb_index_entries - 1].timestamp) {
- wc->block_parsed = 1;
- avio_seek(s->pb, st->index_entries[index].pos, SEEK_SET);
- return 0;
- }
- /* if timestamp is out of bounds, return error */
- if (timestamp < 0 || timestamp >= s->duration)
- return AVERROR(EINVAL);
+ wv->initial = !!(wv->flags & WV_FLAG_INITIAL_BLOCK);
+ wv->final = !!(wv->flags & WV_FLAG_FINAL_BLOCK);
 
- pos = avio_tell(s->pb);
- do {
- ret = av_read_frame(s, pkt);
- if (ret < 0) {
- avio_seek(s->pb, pos, SEEK_SET);
- return ret;
- }
- pts = pkt->pts;
- av_free_packet(pkt);
- } while(pts < timestamp);
 return 0;
 }
-
-AVInputFormat ff_wv_demuxer = {
- .name = "wv",
- .long_name = NULL_IF_CONFIG_SMALL("WavPack"),
- .priv_data_size = sizeof(WVContext),
- .read_probe = wv_probe,
- .read_header = wv_read_header,
- .read_packet = wv_read_packet,
- .read_seek = wv_read_seek,
-};

libav-v10.1.tar.bz2/libavformat/wv.h Added

@@ -0,0 +1,56 @@
+/*
+ * WavPack shared functions
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_WV_H
+#define AVFORMAT_WV_H
+
+#include <stdint.h>
+
+#define WV_HEADER_SIZE 32
+
+#define WV_FLAG_INITIAL_BLOCK (1 << 11)
+#define WV_FLAG_FINAL_BLOCK (1 << 12)
+
+// specs say that maximum block size is 1Mb
+#define WV_BLOCK_LIMIT 1048576
+
+typedef struct WvHeader {
+ uint32_t blocksize; //< size of the block data (excluding the header)
+ uint16_t version; //< bitstream version
+ uint32_t total_samples; //< total number of samples in the stream
+ uint32_t block_idx; //< index of the first sample in this block
+ uint32_t samples; //< number of samples in this block
+ uint32_t flags;
+ uint32_t crc;
+
+ int initial, final;
+} WvHeader;
+
+/**
+ * Parse a WavPack block header.
+ *
+ * @param wv this struct will be filled with parse header information
+ * @param data header data, must be WV_HEADER_SIZE bytes long
+ *
+ * @return 0 on success, a negative AVERROR code on failure
+ */
+int ff_wv_parse_header(WvHeader *wv, const uint8_t *data);
+
+#endif /* AVFORMAT_WV_H */

libav-v10.1.tar.bz2/libavformat/wvdec.c Added

@@ -0,0 +1,350 @@
+/*
+ * WavPack demuxer
+ * Copyright (c) 2006,2011 Konstantin Shishkov
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/channel_layout.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/dict.h"
+#include "avformat.h"
+#include "internal.h"
+#include "apetag.h"
+#include "id3v1.h"
+#include "wv.h"
+
+enum WV_FLAGS {
+ WV_MONO = 0x0004,
+ WV_HYBRID = 0x0008,
+ WV_JOINT = 0x0010,
+ WV_CROSSD = 0x0020,
+ WV_HSHAPE = 0x0040,
+ WV_FLOAT = 0x0080,
+ WV_INT32 = 0x0100,
+ WV_HBR = 0x0200,
+ WV_HBAL = 0x0400,
+ WV_MCINIT = 0x0800,
+ WV_MCEND = 0x1000,
+};
+
+static const int wv_rates[16] = {
+ 6000, 8000, 9600, 11025, 12000, 16000, 22050, 24000,
+ 32000, 44100, 48000, 64000, 88200, 96000, 192000, -1
+};
+
+typedef struct {
+ uint8_t block_header[WV_HEADER_SIZE];
+ WvHeader header;
+ int rate, chan, bpp;
+ uint32_t chmask;
+ int multichannel;
+ int block_parsed;
+ int64_t pos;
+
+ int64_t apetag_start;
+} WVContext;
+
+static int wv_probe(AVProbeData *p)
+{
+ /* check file header */
+ if (p->buf_size <= 32)
+ return 0;
+ if (p->buf[0] == 'w' && p->buf[1] == 'v' &&
+ p->buf[2] == 'p' && p->buf[3] == 'k')
+ return AVPROBE_SCORE_MAX;
+ else
+ return 0;
+}
+
+static int wv_read_block_header(AVFormatContext *ctx, AVIOContext *pb)
+{
+ WVContext *wc = ctx->priv_data;
+ int ret;
+ int rate, bpp, chan;
+ uint32_t chmask, flags;
+
+ wc->pos = avio_tell(pb);
+
+ /* don't return bogus packets with the ape tag data */
+ if (wc->apetag_start && wc->pos >= wc->apetag_start)
+ return AVERROR_EOF;
+
+ ret = avio_read(pb, wc->block_header, WV_HEADER_SIZE);
+ if (ret != WV_HEADER_SIZE)
+ return (ret < 0) ? ret : AVERROR_EOF;
+
+ ret = ff_wv_parse_header(&wc->header, wc->block_header);
+ if (ret < 0) {
+ av_log(ctx, AV_LOG_ERROR, "Invalid block header.\n");
+ return ret;
+ }
+
+ if (wc->header.version < 0x402 || wc->header.version > 0x410) {
+ av_log(ctx, AV_LOG_ERROR, "Unsupported version %03X\n", wc->header.version);
+ return AVERROR_PATCHWELCOME;
+ }
+
+ /* Blocks with zero samples don't contain actual audio information
+ * and should be ignored */
+ if (!wc->header.samples)
+ return 0;
+ // parse flags
+ flags = wc->header.flags;
+ bpp = ((flags & 3) + 1) << 3;
+ chan = 1 + !(flags & WV_MONO);
+ chmask = flags & WV_MONO ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO;
+ rate = wv_rates[(flags >> 23) & 0xF];
+ wc->multichannel = !(wc->header.initial && wc->header.final);
+ if (wc->multichannel) {
+ chan = wc->chan;
+ chmask = wc->chmask;
+ }
+ if ((rate == -1 || !chan) && !wc->block_parsed) {
+ int64_t block_end = avio_tell(pb) + wc->header.blocksize;
+ if (!pb->seekable) {
+ av_log(ctx, AV_LOG_ERROR,
+ "Cannot determine additional parameters\n");
+ return AVERROR_INVALIDDATA;
+ }
+ while (avio_tell(pb) < block_end) {
+ int id, size;
+ id = avio_r8(pb);
+ size = (id & 0x80) ? avio_rl24(pb) : avio_r8(pb);
+ size <<= 1;
+ if (id & 0x40)
+ size--;
+ switch (id & 0x3F) {
+ case 0xD:
+ if (size <= 1) {
+ av_log(ctx, AV_LOG_ERROR,
+ "Insufficient channel information\n");
+ return AVERROR_INVALIDDATA;
+ }
+ chan = avio_r8(pb);
+ switch (size - 2) {
+ case 0:
+ chmask = avio_r8(pb);
+ break;
+ case 1:
+ chmask = avio_rl16(pb);
+ break;
+ case 2:
+ chmask = avio_rl24(pb);
+ break;
+ case 3:
+ chmask = avio_rl32(pb);
+ break;
+ case 5:
+ avio_skip(pb, 1);
+ chan |= (avio_r8(pb) & 0xF) << 8;
+ chmask = avio_rl24(pb);
+ break;
+ default:
+ av_log(ctx, AV_LOG_ERROR,
+ "Invalid channel info size %d\n", size);
+ return AVERROR_INVALIDDATA;
+ }
+ break;
+ case 0x27:
+ rate = avio_rl24(pb);
+ break;
+ default:
+ avio_skip(pb, size);
+ }
+ if (id & 0x40)
+ avio_skip(pb, 1);
+ }
+ if (rate == -1) {
+ av_log(ctx, AV_LOG_ERROR,
+ "Cannot determine custom sampling rate\n");
+ return AVERROR_INVALIDDATA;
+ }
+ avio_seek(pb, block_end - wc->header.blocksize, SEEK_SET);
+ }
+ if (!wc->bpp)
+ wc->bpp = bpp;
+ if (!wc->chan)
+ wc->chan = chan;
+ if (!wc->chmask)
+ wc->chmask = chmask;
+ if (!wc->rate)
+ wc->rate = rate;
+
+ if (flags && bpp != wc->bpp) {
+ av_log(ctx, AV_LOG_ERROR,
+ "Bits per sample differ, this block: %i, header block: %i\n",
+ bpp, wc->bpp);
+ return AVERROR_INVALIDDATA;
+ }
+ if (flags && !wc->multichannel && chan != wc->chan) {
+ av_log(ctx, AV_LOG_ERROR,
+ "Channels differ, this block: %i, header block: %i\n",
+ chan, wc->chan);
+ return AVERROR_INVALIDDATA;
+ }
+ if (flags && rate != -1 && rate != wc->rate) {
+ av_log(ctx, AV_LOG_ERROR,
+ "Sampling rate differ, this block: %i, header block: %i\n",
+ rate, wc->rate);
+ return AVERROR_INVALIDDATA;
+ }
+ return 0;
+}
+
+static int wv_read_header(AVFormatContext *s)
+{
+ AVIOContext *pb = s->pb;
+ WVContext *wc = s->priv_data;
+ AVStream *st;
+ int ret;
+
+ wc->block_parsed = 0;
+ for (;;) {
+ if ((ret = wv_read_block_header(s, pb)) < 0)
+ return ret;
+ if (!wc->header.samples)
+ avio_skip(pb, wc->header.blocksize);
+ else
+ break;
+ }
+
+ /* now we are ready: build format streams */
+ st = avformat_new_stream(s, NULL);
+ if (!st)
+ return AVERROR(ENOMEM);
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codec->codec_id = AV_CODEC_ID_WAVPACK;
+ st->codec->channels = wc->chan;
+ st->codec->channel_layout = wc->chmask;
+ st->codec->sample_rate = wc->rate;
+ st->codec->bits_per_coded_sample = wc->bpp;
+ avpriv_set_pts_info(st, 64, 1, wc->rate);
+ st->start_time = 0;
+ st->duration = wc->header.total_samples;
+
+ if (s->pb->seekable) {
+ int64_t cur = avio_tell(s->pb);
+ wc->apetag_start = ff_ape_parse_tag(s);
+ if (!av_dict_get(s->metadata, "", NULL, AV_DICT_IGNORE_SUFFIX))
+ ff_id3v1_read(s);
+ avio_seek(s->pb, cur, SEEK_SET);
+ }
+
+ return 0;
+}
+
+static int wv_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ WVContext *wc = s->priv_data;
+ int ret;
+ int off;
+ int64_t pos;
+ uint32_t block_samples;
+
+ if (s->pb->eof_reached)
+ return AVERROR_EOF;
+ if (wc->block_parsed) {
+ if ((ret = wv_read_block_header(s, s->pb)) < 0)
+ return ret;
+ }
+
+ pos = wc->pos;
+ if (av_new_packet(pkt, wc->header.blocksize + WV_HEADER_SIZE) < 0)
+ return AVERROR(ENOMEM);
+ memcpy(pkt->data, wc->block_header, WV_HEADER_SIZE);
+ ret = avio_read(s->pb, pkt->data + WV_HEADER_SIZE, wc->header.blocksize);
+ if (ret != wc->header.blocksize) {
+ av_free_packet(pkt);
+ return AVERROR(EIO);
+ }
+ while (!(wc->header.flags & WV_FLAG_FINAL_BLOCK)) {
+ if ((ret = wv_read_block_header(s, s->pb)) < 0) {
+ av_free_packet(pkt);
+ return ret;
+ }
+
+ off = pkt->size;
+ if ((ret = av_grow_packet(pkt, WV_HEADER_SIZE + wc->header.blocksize)) < 0) {
+ av_free_packet(pkt);
+ return ret;
+ }
+ memcpy(pkt->data + off, wc->block_header, WV_HEADER_SIZE);
+
+ ret = avio_read(s->pb, pkt->data + off + WV_HEADER_SIZE, wc->header.blocksize);
+ if (ret != wc->header.blocksize) {
+ av_free_packet(pkt);
+ return (ret < 0) ? ret : AVERROR_EOF;
+ }
+ }
+ pkt->stream_index = 0;
+ wc->block_parsed = 1;
+ pkt->pts = wc->header.block_idx;
+ block_samples = wc->header.samples;
+ if (block_samples > INT32_MAX)
+ av_log(s, AV_LOG_WARNING,
+ "Too many samples in block: %"PRIu32"\n", block_samples);
+ else
+ pkt->duration = block_samples;
+
+ av_add_index_entry(s->streams[0], pos, pkt->pts, 0, 0, AVINDEX_KEYFRAME);
+ return 0;
+}
+
+static int wv_read_seek(AVFormatContext *s, int stream_index,
+ int64_t timestamp, int flags)
+{
+ AVStream *st = s->streams[stream_index];
+ WVContext *wc = s->priv_data;
+ AVPacket pkt1, *pkt = &pkt1;
+ int ret;
+ int index = av_index_search_timestamp(st, timestamp, flags);
+ int64_t pos, pts;
+
+ /* if found, seek there */
+ if (index >= 0 &&
+ timestamp <= st->index_entries[st->nb_index_entries - 1].timestamp) {
+ wc->block_parsed = 1;
+ avio_seek(s->pb, st->index_entries[index].pos, SEEK_SET);
+ return 0;
+ }
+ /* if timestamp is out of bounds, return error */
+ if (timestamp < 0 || timestamp >= s->duration)
+ return AVERROR(EINVAL);
+
+ pos = avio_tell(s->pb);
+ do {
+ ret = av_read_frame(s, pkt);
+ if (ret < 0) {
+ avio_seek(s->pb, pos, SEEK_SET);
+ return ret;
+ }
+ pts = pkt->pts;
+ av_free_packet(pkt);
+ } while(pts < timestamp);
+ return 0;
+}
+
+AVInputFormat ff_wv_demuxer = {
+ .name = "wv",
+ .long_name = NULL_IF_CONFIG_SMALL("WavPack"),
+ .priv_data_size = sizeof(WVContext),
+ .read_probe = wv_probe,
+ .read_header = wv_read_header,
+ .read_packet = wv_read_packet,
+ .read_seek = wv_read_seek,
+};

libav-v10.1.tar.bz2/libavformat/wvenc.c Added

@@ -0,0 +1,87 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/attributes.h"
+
+#include "apetag.h"
+#include "avformat.h"
+#include "wv.h"
+
+typedef struct WvMuxContext {
+ int64_t samples;
+} WvMuxContext;
+
+static av_cold int wv_write_header(AVFormatContext *ctx)
+{
+ if (ctx->nb_streams > 1 ||
+ ctx->streams[0]->codec->codec_id != AV_CODEC_ID_WAVPACK) {
+ av_log(ctx, AV_LOG_ERROR, "This muxer only supports a single WavPack stream.\n");
+ return AVERROR(EINVAL);
+ }
+
+ return 0;
+}
+
+static int wv_write_packet(AVFormatContext *ctx, AVPacket *pkt)
+{
+ WvMuxContext *s = ctx->priv_data;
+ WvHeader header;
+ int ret;
+
+ if (pkt->size < WV_HEADER_SIZE ||
+ (ret = ff_wv_parse_header(&header, pkt->data)) < 0) {
+ av_log(ctx, AV_LOG_ERROR, "Invalid WavPack packet.\n");
+ return AVERROR(EINVAL);
+ }
+ s->samples += header.samples;
+
+ avio_write(ctx->pb, pkt->data, pkt->size);
+
+ return 0;
+}
+
+static av_cold int wv_write_trailer(AVFormatContext *ctx)
+{
+ WvMuxContext *s = ctx->priv_data;
+
+ /* update total number of samples in the first block */
+ if (ctx->pb->seekable && s->samples &&
+ s->samples < UINT32_MAX) {
+ int64_t pos = avio_tell(ctx->pb);
+ avio_seek(ctx->pb, 12, SEEK_SET);
+ avio_wl32(ctx->pb, s->samples);
+ avio_seek(ctx->pb, pos, SEEK_SET);
+ }
+
+ ff_ape_write_tag(ctx);
+ return 0;
+}
+
+AVOutputFormat ff_wv_muxer = {
+ .name = "wv",
+ .long_name = NULL_IF_CONFIG_SMALL("raw WavPack"),
+ .mime_type = "audio/x-wavpack",
+ .extensions = "wv",
+ .priv_data_size = sizeof(WvMuxContext),
+ .audio_codec = AV_CODEC_ID_WAVPACK,
+ .video_codec = AV_CODEC_ID_NONE,
+ .write_header = wv_write_header,
+ .write_packet = wv_write_packet,
+ .write_trailer = wv_write_trailer,
+ .flags = AVFMT_NOTIMESTAMPS,
+};

libav-v9.6.tar.bz2/libavformat/xa.c -> libav-v10.1.tar.bz2/libavformat/xa.c Changed

libav-v9.6.tar.bz2/libavformat/xmv.c -> libav-v10.1.tar.bz2/libavformat/xmv.c Changed

@@ -43,6 +43,8 @@
                            XMV_AUDIO_ADPCM51_FRONTCENTERLOW | \
                            XMV_AUDIO_ADPCM51_REARLEFTRIGHT)
 
+#define XMV_BLOCK_ALIGN_SIZE 36
+
 typedef struct XMVAudioTrack {
     uint16_t compression;
     uint16_t channels;
@@ -156,7 +158,7 @@
 
     file_version = avio_rl32(pb);
     if ((file_version != 4) && (file_version != 2))
-        av_log_ask_for_sample(s, "Found uncommon version %d\n", file_version);
+        avpriv_request_sample(s, "Uncommon version %d", file_version);
 
 
     /* Video track */
@@ -207,7 +209,7 @@
         track->bit_rate      = track->bits_per_sample *
                                track->sample_rate *
                                track->channels;
-        track->block_align   = 36 * track->channels;
+        track->block_align   = XMV_BLOCK_ALIGN_SIZE * track->channels;
         track->block_samples = 64;
         track->codec_id      = ff_wav_codec_get_id(track->compression,
                                                    track->bits_per_sample);
@@ -224,7 +226,8 @@
             av_log(s, AV_LOG_WARNING, "Unsupported 5.1 ADPCM audio stream "
                                       "(0x%04X)\n", track->flags);
 
-        if (!track->channels || !track->sample_rate) {
+        if (!track->channels || !track->sample_rate ||
+             track->channels >= UINT16_MAX / XMV_BLOCK_ALIGN_SIZE) {
             av_log(s, AV_LOG_ERROR, "Invalid parameters for audio track %d.\n",
                    audio_track);
             ret = AVERROR_INVALIDDATA;

libav-v9.6.tar.bz2/libavformat/xwma.c -> libav-v10.1.tar.bz2/libavformat/xwma.c Changed

@@ -20,6 +20,7 @@
 */
 
 #include <inttypes.h>
+#include <stdint.h>
 
 #include "avformat.h"
 #include "internal.h"
@@ -42,7 +43,7 @@
 
 static int xwma_read_header(AVFormatContext *s)
 {
- int64_t size, av_uninit(data_size);
+ int64_t size;
 int ret;
 uint32_t dpds_table_size = 0;
 uint32_t *dpds_table = 0;
@@ -85,9 +86,8 @@
 * anyway.
 */
 if (st->codec->codec_id != AV_CODEC_ID_WMAV2) {
- av_log(s, AV_LOG_WARNING, "unexpected codec (tag 0x04%x; id %d)\n",
+ avpriv_request_sample(s, "Unexpected codec (tag 0x04%x; id %d)",
 st->codec->codec_tag, st->codec->codec_id);
- av_log_ask_for_sample(s, NULL);
 } else {
 /* In all xWMA files I have seen, there is no extradata. But the WMA
 * codecs require extradata, so we provide our own fake extradata.
@@ -101,9 +101,8 @@
 * if it will work, but just go on and try it, after asking
 * the user for a sample.
 */
- av_log(s, AV_LOG_WARNING, "unexpected extradata (%d bytes)\n",
+ avpriv_request_sample(s, "Unexpected extradata (%d bytes)",
 st->codec->extradata_size);
- av_log_ask_for_sample(s, NULL);
 } else {
 st->codec->extradata_size = 6;
 st->codec->extradata = av_mallocz(6 + FF_INPUT_BUFFER_PADDING_SIZE);
@@ -200,6 +199,14 @@
 
 /* Estimate the duration from the total number of output bytes. */
 const uint64_t total_decoded_bytes = dpds_table[dpds_table_size - 1];
+
+ if (!bytes_per_sample) {
+ av_log(s, AV_LOG_ERROR,
+ "Invalid bits_per_coded_sample %d for %d channels\n",
+ st->codec->bits_per_coded_sample, st->codec->channels);
+ return AVERROR_INVALIDDATA;
+ }
+
 st->duration = total_decoded_bytes / bytes_per_sample;
 
 /* Use the dpds data to build a seek table. We can only do this after

libav-v9.6.tar.bz2/libavformat/yop.c -> libav-v10.1.tar.bz2/libavformat/yop.c Changed

libav-v9.6.tar.bz2/libavformat/yuv4mpeg.c -> libav-v10.1.tar.bz2/libavformat/yuv4mpeg.c Changed

@@ -18,6 +18,8 @@
 * License along with Libav; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
+
+#include "libavutil/pixdesc.h"
 #include "avformat.h"
 #include "internal.h"
 
@@ -128,10 +130,11 @@
 
 if (st->codec->pix_fmt != AV_PIX_FMT_GRAY8) {
 // Adjust for smaller Cb and Cr planes
- avcodec_get_chroma_sub_sample(st->codec->pix_fmt, &h_chroma_shift,
- &v_chroma_shift);
- width >>= h_chroma_shift;
- height >>= v_chroma_shift;
+ av_pix_fmt_get_chroma_sub_sample(st->codec->pix_fmt, &h_chroma_shift,
+ &v_chroma_shift);
+ // Shift right, rounding up
+ width = -(-width >> h_chroma_shift);
+ height = -(-height >> v_chroma_shift);
 
 ptr1 = picture->data[1];
 ptr2 = picture->data[2];
@@ -144,7 +147,6 @@
 ptr2 += picture->linesize[2];
 }
 }
- avio_flush(pb);
 return 0;
 }
 
@@ -359,6 +361,7 @@
 st->codec->height = height;
 av_reduce(&raten, &rated, raten, rated, (1UL << 31) - 1);
 avpriv_set_pts_info(st, 64, rated, raten);
+ st->avg_frame_rate = av_inv_q(st->time_base);
 st->codec->pix_fmt = pix_fmt;
 st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
 st->codec->codec_id = AV_CODEC_ID_RAWVIDEO;

libav-v10.1.tar.bz2/libavresample/aarch64 Added

libav-v10.1.tar.bz2/libavresample/aarch64/Makefile Added

libav-v10.1.tar.bz2/libavresample/aarch64/neontest.c Added

@@ -0,0 +1,31 @@
+/*
+ * check NEON registers for clobbers
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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);
+}

libav-v9.6.tar.bz2/libavresample/arm/Makefile -> libav-v10.1.tar.bz2/libavresample/arm/Makefile Changed

libav-v9.6.tar.bz2/libavresample/arm/audio_convert_neon.S -> libav-v10.1.tar.bz2/libavresample/arm/audio_convert_neon.S Changed

libav-v10.1.tar.bz2/libavresample/arm/neontest.c Added

@@ -0,0 +1,31 @@
+/*
+ * check NEON registers for clobbers
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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);
+}

libav-v9.6.tar.bz2/libavresample/audio_convert.c -> libav-v10.1.tar.bz2/libavresample/audio_convert.c Changed

@@ -30,7 +30,6 @@
 #include "audio_convert.h"
 #include "audio_data.h"
 #include "dither.h"
-#include "internal.h"
 
 enum ConvFuncType {
 CONV_FUNC_TYPE_FLAT,
@@ -51,6 +50,7 @@
 DitherContext *dc;
 enum AVSampleFormat in_fmt;
 enum AVSampleFormat out_fmt;
+ int apply_map;
 int channels;
 int planes;
 int ptr_align;
@@ -260,7 +260,8 @@
 AudioConvert *ff_audio_convert_alloc(AVAudioResampleContext *avr,
 enum AVSampleFormat out_fmt,
 enum AVSampleFormat in_fmt,
- int channels, int sample_rate)
+ int channels, int sample_rate,
+ int apply_map)
 {
 AudioConvert *ac;
 int in_planar, out_planar;
@@ -273,11 +274,13 @@
 ac->out_fmt = out_fmt;
 ac->in_fmt = in_fmt;
 ac->channels = channels;
+ ac->apply_map = apply_map;
 
 if (avr->dither_method != AV_RESAMPLE_DITHER_NONE &&
 av_get_packed_sample_fmt(out_fmt) == AV_SAMPLE_FMT_S16 &&
 av_get_bytes_per_sample(in_fmt) > 2) {
- ac->dc = ff_dither_alloc(avr, out_fmt, in_fmt, channels, sample_rate);
+ ac->dc = ff_dither_alloc(avr, out_fmt, in_fmt, channels, sample_rate,
+ apply_map);
 if (!ac->dc) {
 av_free(ac);
 return NULL;
@@ -310,6 +313,7 @@
 {
 int use_generic = 1;
 int len = in->nb_samples;
+ int p;
 
 if (ac->dc) {
 /* dithered conversion */
@@ -336,32 +340,73 @@
 av_get_sample_fmt_name(ac->out_fmt),
 use_generic ? ac->func_descr_generic : ac->func_descr);
 
- switch (ac->func_type) {
- case CONV_FUNC_TYPE_FLAT: {
- int p;
- if (!in->is_planar)
- len *= in->channels;
- if (use_generic) {
- for (p = 0; p < ac->planes; p++)
- ac->conv_flat_generic(out->data[p], in->data[p], len);
- } else {
- for (p = 0; p < ac->planes; p++)
- ac->conv_flat(out->data[p], in->data[p], len);
+ if (ac->apply_map) {
+ ChannelMapInfo *map = &ac->avr->ch_map_info;
+
+ if (!av_sample_fmt_is_planar(ac->out_fmt)) {
+ av_log(ac->avr, AV_LOG_ERROR, "cannot remap packed format during conversion\n");
+ return AVERROR(EINVAL);
+ }
+
+ if (map->do_remap) {
+ if (av_sample_fmt_is_planar(ac->in_fmt)) {
+ conv_func_flat *convert = use_generic ? ac->conv_flat_generic :
+ ac->conv_flat;
+
+ for (p = 0; p < ac->planes; p++)
+ if (map->channel_map[p] >= 0)
+ convert(out->data[p], in->data[map->channel_map[p]], len);
+ } else {
+ uint8_t *data[AVRESAMPLE_MAX_CHANNELS];
+ conv_func_deinterleave *convert = use_generic ?
+ ac->conv_deinterleave_generic :
+ ac->conv_deinterleave;
+
+ for (p = 0; p < ac->channels; p++)
+ data[map->input_map[p]] = out->data[p];
+
+ convert(data, in->data[0], len, ac->channels);
+ }
+ }
+ if (map->do_copy || map->do_zero) {
+ for (p = 0; p < ac->planes; p++) {
+ if (map->channel_copy[p])
+ memcpy(out->data[p], out->data[map->channel_copy[p]],
+ len * out->stride);
+ else if (map->channel_zero[p])
+ av_samples_set_silence(&out->data[p], 0, len, 1, ac->out_fmt);
+ }
+ }
+ } else {
+ switch (ac->func_type) {
+ case CONV_FUNC_TYPE_FLAT: {
+ if (!in->is_planar)
+ len *= in->channels;
+ if (use_generic) {
+ for (p = 0; p < ac->planes; p++)
+ ac->conv_flat_generic(out->data[p], in->data[p], len);
+ } else {
+ for (p = 0; p < ac->planes; p++)
+ ac->conv_flat(out->data[p], in->data[p], len);
+ }
+ break;
+ }
+ case CONV_FUNC_TYPE_INTERLEAVE:
+ if (use_generic)
+ ac->conv_interleave_generic(out->data[0], in->data, len,
+ ac->channels);
+ else
+ ac->conv_interleave(out->data[0], in->data, len, ac->channels);
+ break;
+ case CONV_FUNC_TYPE_DEINTERLEAVE:
+ if (use_generic)
+ ac->conv_deinterleave_generic(out->data, in->data[0], len,
+ ac->channels);
+ else
+ ac->conv_deinterleave(out->data, in->data[0], len,
+ ac->channels);
+ break;
 }
- break;
- }
- case CONV_FUNC_TYPE_INTERLEAVE:
- if (use_generic)
- ac->conv_interleave_generic(out->data[0], in->data, len, ac->channels);
- else
- ac->conv_interleave(out->data[0], in->data, len, ac->channels);
- break;
- case CONV_FUNC_TYPE_DEINTERLEAVE:
- if (use_generic)
- ac->conv_deinterleave_generic(out->data, in->data[0], len, ac->channels);
- else
- ac->conv_deinterleave(out->data, in->data[0], len, ac->channels);
- break;
 }
 
 out->nb_samples = in->nb_samples;

libav-v9.6.tar.bz2/libavresample/audio_convert.h -> libav-v10.1.tar.bz2/libavresample/audio_convert.h Changed

libav-v9.6.tar.bz2/libavresample/audio_data.c -> libav-v10.1.tar.bz2/libavresample/audio_data.c Changed

@@ -213,7 +213,7 @@
 av_freep(a);
 }
 
-int ff_audio_data_copy(AudioData *dst, AudioData *src)
+int ff_audio_data_copy(AudioData *dst, AudioData *src, ChannelMapInfo *map)
 {
 int ret, p;
 
@@ -221,6 +221,11 @@
 if (dst->sample_fmt != src->sample_fmt || dst->channels < src->channels)
 return AVERROR(EINVAL);
 
+ if (map && !src->is_planar) {
+ av_log(src, AV_LOG_ERROR, "cannot remap packed format during copy\n");
+ return AVERROR(EINVAL);
+ }
+
 /* if the input is empty, just empty the output */
 if (!src->nb_samples) {
 dst->nb_samples = 0;
@@ -233,8 +238,29 @@
 return ret;
 
 /* copy data */
- for (p = 0; p < src->planes; p++)
- memcpy(dst->data[p], src->data[p], src->nb_samples * src->stride);
+ if (map) {
+ if (map->do_remap) {
+ for (p = 0; p < src->planes; p++) {
+ if (map->channel_map[p] >= 0)
+ memcpy(dst->data[p], src->data[map->channel_map[p]],
+ src->nb_samples * src->stride);
+ }
+ }
+ if (map->do_copy || map->do_zero) {
+ for (p = 0; p < src->planes; p++) {
+ if (map->channel_copy[p])
+ memcpy(dst->data[p], dst->data[map->channel_copy[p]],
+ src->nb_samples * src->stride);
+ else if (map->channel_zero[p])
+ av_samples_set_silence(&dst->data[p], 0, src->nb_samples,
+ 1, dst->sample_fmt);
+ }
+ }
+ } else {
+ for (p = 0; p < src->planes; p++)
+ memcpy(dst->data[p], src->data[p], src->nb_samples * src->stride);
+ }
+
 dst->nb_samples = src->nb_samples;
 
 return 0;

libav-v9.6.tar.bz2/libavresample/audio_data.h -> libav-v10.1.tar.bz2/libavresample/audio_data.h Changed

@@ -27,11 +27,12 @@
 #include "libavutil/log.h"
 #include "libavutil/samplefmt.h"
 #include "avresample.h"
+#include "internal.h"
 
 /**
 * Audio buffer used for intermediate storage between conversion phases.
 */
-typedef struct AudioData {
+struct AudioData {
 const AVClass *class; /**< AVClass for logging */
 uint8_t *data[AVRESAMPLE_MAX_CHANNELS]; /**< data plane pointers */
 uint8_t *buffer; /**< data buffer */
@@ -50,7 +51,7 @@
 int ptr_align; /**< minimum data pointer alignment */
 int samples_align; /**< allocated samples alignment */
 const char *name; /**< name for debug logging */
-} AudioData;
+};
 
 int ff_audio_data_set_channels(AudioData *a, int channels);
 
@@ -117,9 +118,10 @@
 *
 * @param out output AudioData
 * @param in input AudioData
+ * @param map channel map, NULL if not remapping
 * @return 0 on success, negative AVERROR value on error
 */
-int ff_audio_data_copy(AudioData *out, AudioData *in);
+int ff_audio_data_copy(AudioData *out, AudioData *in, ChannelMapInfo *map);
 
 /**
 * Append data from one AudioData to the end of another.

libav-v9.6.tar.bz2/libavresample/audio_mix.c -> libav-v10.1.tar.bz2/libavresample/audio_mix.c Changed

@@ -47,6 +47,11 @@
 mix_func *mix;
 mix_func *mix_generic;
 
+ int in_matrix_channels;
+ int out_matrix_channels;
+ int output_zero[AVRESAMPLE_MAX_CHANNELS];
+ int input_skip[AVRESAMPLE_MAX_CHANNELS];
+ int output_skip[AVRESAMPLE_MAX_CHANNELS];
 int16_t *matrix_q8[AVRESAMPLE_MAX_CHANNELS];
 int32_t *matrix_q15[AVRESAMPLE_MAX_CHANNELS];
 float *matrix_flt[AVRESAMPLE_MAX_CHANNELS];
@@ -59,8 +64,8 @@
 const char *descr, void *mix_func)
 {
 if (fmt == am->fmt && coeff_type == am->coeff_type &&
- ( in_channels == am->in_channels || in_channels == 0) &&
- (out_channels == am->out_channels || out_channels == 0)) {
+ ( in_channels == am->in_matrix_channels || in_channels == 0) &&
+ (out_channels == am->out_matrix_channels || out_channels == 0)) {
 char chan_str[16];
 am->mix = mix_func;
 am->func_descr = descr;
@@ -82,11 +87,12 @@
 } else if (out_channels) {
 snprintf(chan_str, sizeof(chan_str), "[any to %d] ",
 out_channels);
+ } else {
+ snprintf(chan_str, sizeof(chan_str), "[any to any] ");
 }
 av_log(am->avr, AV_LOG_DEBUG, "audio_mix: found function: [fmt=%s] "
 "[c=%s] %s(%s)\n", av_get_sample_fmt_name(fmt),
- coeff_type_names[coeff_type],
- (in_channels || out_channels) ? chan_str : "", descr);
+ coeff_type_names[coeff_type], chan_str, descr);
 }
 }
 
@@ -195,23 +201,23 @@
 
 while (len > 4) {
 v = *src++;
- *dst0++ = v * m1;
- *dst1++ = v * m0;
+ *dst0++ = v * m0;
+ *dst1++ = v * m1;
 v = *src++;
- *dst0++ = v * m1;
- *dst1++ = v * m0;
+ *dst0++ = v * m0;
+ *dst1++ = v * m1;
 v = *src++;
- *dst0++ = v * m1;
- *dst1++ = v * m0;
+ *dst0++ = v * m0;
+ *dst1++ = v * m1;
 v = *src++;
- *dst0++ = v * m1;
- *dst1++ = v * m0;
+ *dst0++ = v * m0;
+ *dst1++ = v * m1;
 len -= 4;
 }
 while (len > 0) {
 v = *src++;
- *dst0++ = v * m1;
- *dst1++ = v * m0;
+ *dst0++ = v * m0;
+ *dst1++ = v * m1;
 len--;
 }
 }
@@ -276,8 +282,15 @@
 }
 }
 
-static int mix_function_init(AudioMix *am)
+static av_cold int mix_function_init(AudioMix *am)
 {
+ am->func_descr = am->func_descr_generic = "n/a";
+ am->mix = am->mix_generic = NULL;
+
+ /* no need to set a mix function when we're skipping mixing */
+ if (!am->in_matrix_channels || !am->out_matrix_channels)
+ return 0;
+
 /* any-to-any C versions */
 
 ff_audio_mix_set_func(am, AV_SAMPLE_FMT_FLTP, AV_MIX_COEFF_TYPE_FLT,
@@ -357,9 +370,6 @@
 goto error;
 av_freep(&avr->mix_matrix);
 } else {
- int i, j;
- char in_layout_name[128];
- char out_layout_name[128];
 double *matrix_dbl = av_mallocz(avr->out_channels * avr->in_channels *
 sizeof(*matrix_dbl));
 if (!matrix_dbl)
@@ -379,25 +389,13 @@
 goto error;
 }
 
- av_get_channel_layout_string(in_layout_name, sizeof(in_layout_name),
- avr->in_channels, avr->in_channel_layout);
- av_get_channel_layout_string(out_layout_name, sizeof(out_layout_name),
- avr->out_channels, avr->out_channel_layout);
- av_log(avr, AV_LOG_DEBUG, "audio_mix: %s to %s\n",
- in_layout_name, out_layout_name);
- for (i = 0; i < avr->out_channels; i++) {
- for (j = 0; j < avr->in_channels; j++) {
- av_log(avr, AV_LOG_DEBUG, " %0.3f ",
- matrix_dbl[i * avr->in_channels + j]);
- }
- av_log(avr, AV_LOG_DEBUG, "\n");
- }
-
 ret = ff_audio_mix_set_matrix(am, matrix_dbl, avr->in_channels);
 if (ret < 0) {
+ av_log(avr, AV_LOG_ERROR, "error setting mix matrix\n");
 av_free(matrix_dbl);
 goto error;
 }
+
 av_free(matrix_dbl);
 }
 
@@ -431,6 +429,7 @@
 {
 int use_generic = 1;
 int len = src->nb_samples;
+ int i, j;
 
 /* determine whether to use the optimized function based on pointer and
 samples alignment in both the input and output */
@@ -446,11 +445,35 @@
 src->nb_samples, am->in_channels, am->out_channels,
 use_generic ? am->func_descr_generic : am->func_descr);
 
- if (use_generic)
- am->mix_generic(src->data, am->matrix, len, am->out_channels,
- am->in_channels);
- else
- am->mix(src->data, am->matrix, len, am->out_channels, am->in_channels);
+ if (am->in_matrix_channels && am->out_matrix_channels) {
+ uint8_t **data;
+ uint8_t *data0[AVRESAMPLE_MAX_CHANNELS] = { NULL };
+
+ if (am->out_matrix_channels < am->out_channels ||
+ am->in_matrix_channels < am->in_channels) {
+ for (i = 0, j = 0; i < FFMAX(am->in_channels, am->out_channels); i++) {
+ if (am->input_skip[i] || am->output_skip[i] || am->output_zero[i])
+ continue;
+ data0[j++] = src->data[i];
+ }
+ data = data0;
+ } else {
+ data = src->data;
+ }
+
+ if (use_generic)
+ am->mix_generic(data, am->matrix, len, am->out_matrix_channels,
+ am->in_matrix_channels);
+ else
+ am->mix(data, am->matrix, len, am->out_matrix_channels,
+ am->in_matrix_channels);
+ }
+
+ if (am->out_matrix_channels < am->out_channels) {
+ for (i = 0; i < am->out_channels; i++)
+ if (am->output_zero[i])
+ av_samples_set_silence(&src->data[i], 0, len, 1, am->fmt);
+ }
 
 ff_audio_data_set_channels(src, am->out_channels);
 
@@ -459,7 +482,7 @@
 
 int ff_audio_mix_get_matrix(AudioMix *am, double *matrix, int stride)
 {
- int i, o;
+ int i, o, i0, o0;
 
 if ( am->in_channels <= 0 || am->in_channels > AVRESAMPLE_MAX_CHANNELS ||
 am->out_channels <= 0 || am->out_channels > AVRESAMPLE_MAX_CHANNELS) {
@@ -472,9 +495,19 @@
 av_log(am->avr, AV_LOG_ERROR, "matrix is not set\n"); \
 return AVERROR(EINVAL); \
 } \
- for (o = 0; o < am->out_channels; o++) \
- for (i = 0; i < am->in_channels; i++) \
- matrix[o * stride + i] = am->matrix_ ## suffix[o][i] * (scale);
+ for (o = 0, o0 = 0; o < am->out_channels; o++) { \
+ for (i = 0, i0 = 0; i < am->in_channels; i++) { \
+ if (am->input_skip[i] || am->output_zero[o]) \
+ matrix[o * stride + i] = 0.0; \
+ else \
+ matrix[o * stride + i] = am->matrix_ ## suffix[o0][i0] * \
+ (scale); \
+ if (!am->input_skip[i]) \
+ i0++; \
+ } \
+ if (!am->output_zero[o]) \
+ o0++; \
+ }
 
 switch (am->coeff_type) {
 case AV_MIX_COEFF_TYPE_Q8:
@@ -494,10 +527,135 @@
 return 0;
 }
 
-int ff_audio_mix_set_matrix(AudioMix *am, const double *matrix, int stride)
+static void reduce_matrix(AudioMix *am, const double *matrix, int stride)
 {
 int i, o;
 
+ memset(am->output_zero, 0, sizeof(am->output_zero));
+ memset(am->input_skip, 0, sizeof(am->input_skip));
+ memset(am->output_skip, 0, sizeof(am->output_skip));
+
+ /* exclude output channels if they can be zeroed instead of mixed */
+ for (o = 0; o < am->out_channels; o++) {
+ int zero = 1;
+
+ /* check if the output is always silent */
+ for (i = 0; i < am->in_channels; i++) {
+ if (matrix[o * stride + i] != 0.0) {
+ zero = 0;
+ break;
+ }
+ }
+ /* check if the corresponding input channel makes a contribution to
+ any output channel */
+ if (o < am->in_channels) {
+ for (i = 0; i < am->out_channels; i++) {
+ if (matrix[i * stride + o] != 0.0) {
+ zero = 0;
+ break;
+ }
+ }
+ }
+ 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 || am->in_matrix_channels == 0) {
+ am->out_matrix_channels = 0;
+ am->in_matrix_channels = 0;
+ return;
+ }
+
+ /* skip input channels that contribute fully only to the corresponding
+ output channel */
+ for (i = 0; i < FFMIN(am->in_channels, am->out_channels); i++) {
+ int skip = 1;
+
+ for (o = 0; o < am->out_channels; o++) {
+ int i0;
+ if ((o != i && matrix[o * stride + i] != 0.0) ||
+ (o == i && matrix[o * stride + i] != 1.0)) {
+ skip = 0;
+ break;
+ }
+ /* if the input contributes fully to the output, also check that no
+ other inputs contribute to this output */
+ if (o == i) {
+ for (i0 = 0; i0 < am->in_channels; i0++) {
+ if (i0 != i && matrix[o * stride + i0] != 0.0) {
+ skip = 0;
+ break;
+ }
+ }
+ }
+ }
+ if (skip) {
+ am->input_skip[i] = 1;
+ am->in_matrix_channels--;
+ }
+ }
+ /* skip input channels that do not contribute to any output channel */
+ for (; i < am->in_channels; i++) {
+ int contrib = 0;
+
+ for (o = 0; o < am->out_channels; o++) {
+ if (matrix[o * stride + i] != 0.0) {
+ contrib = 1;
+ break;
+ }
+ }
+ if (!contrib) {
+ am->input_skip[i] = 1;
+ am->in_matrix_channels--;
+ }
+ }
+ if (am->in_matrix_channels == 0) {
+ am->out_matrix_channels = 0;
+ return;
+ }
+
+ /* skip output channels that only get full contribution from the
+ corresponding input channel */
+ for (o = 0; o < FFMIN(am->in_channels, am->out_channels); o++) {
+ int skip = 1;
+ int o0;
+
+ for (i = 0; i < am->in_channels; i++) {
+ if ((o != i && matrix[o * stride + i] != 0.0) ||
+ (o == i && matrix[o * stride + i] != 1.0)) {
+ skip = 0;
+ break;
+ }
+ }
+ /* check if the corresponding input channel makes a contribution to
+ any other output channel */
+ i = o;
+ for (o0 = 0; o0 < am->out_channels; o0++) {
+ if (o0 != i && matrix[o0 * stride + i] != 0.0) {
+ skip = 0;
+ break;
+ }
+ }
+ if (skip) {
+ am->output_skip[o] = 1;
+ am->out_matrix_channels--;
+ }
+ }
+ if (am->out_matrix_channels == 0) {
+ am->in_matrix_channels = 0;
+ return;
+ }
+}
+
+int ff_audio_mix_set_matrix(AudioMix *am, const double *matrix, int stride)
+{
+ int i, o, i0, o0, ret;
+ char in_layout_name[128];
+ char out_layout_name[128];
+
 if ( am->in_channels <= 0 || am->in_channels > AVRESAMPLE_MAX_CHANNELS ||
 am->out_channels <= 0 || am->out_channels > AVRESAMPLE_MAX_CHANNELS) {
 av_log(am->avr, AV_LOG_ERROR, "Invalid channel counts\n");
@@ -509,36 +667,76 @@
 am->matrix = NULL;
 }
 
+ am->in_matrix_channels = am->in_channels;
+ am->out_matrix_channels = am->out_channels;
+
+ reduce_matrix(am, matrix, stride);
+
 #define CONVERT_MATRIX(type, expr) \
- am->matrix_## type[0] = av_mallocz(am->out_channels * am->in_channels * \
+ am->matrix_## type[0] = av_mallocz(am->out_matrix_channels * \
+ am->in_matrix_channels * \
 sizeof(*am->matrix_## type[0])); \
 if (!am->matrix_## type[0]) \
 return AVERROR(ENOMEM); \
- for (o = 0; o < am->out_channels; o++) { \
- if (o > 0) \
- am->matrix_## type[o] = am->matrix_## type[o - 1] + \
- am->in_channels; \
- for (i = 0; i < am->in_channels; i++) { \
- double v = matrix[o * stride + i]; \
- am->matrix_## type[o][i] = expr; \
+ for (o = 0, o0 = 0; o < am->out_channels; o++) { \
+ if (am->output_zero[o] || am->output_skip[o]) \
+ continue; \
+ if (o0 > 0) \
+ am->matrix_## type[o0] = am->matrix_## type[o0 - 1] + \
+ am->in_matrix_channels; \
+ for (i = 0, i0 = 0; i < am->in_channels; i++) { \
+ double v; \
+ if (am->input_skip[i] || am->output_zero[i]) \
+ continue; \
+ v = matrix[o * stride + i]; \
+ am->matrix_## type[o0][i0] = expr; \
+ i0++; \
 } \
+ o0++; \
 } \
 am->matrix = (void **)am->matrix_## type;
 
- switch (am->coeff_type) {
- case AV_MIX_COEFF_TYPE_Q8:
- CONVERT_MATRIX(q8, av_clip_int16(lrint(256.0 * v)))
- break;
- case AV_MIX_COEFF_TYPE_Q15:
- CONVERT_MATRIX(q15, av_clipl_int32(llrint(32768.0 * v)))
- break;
- case AV_MIX_COEFF_TYPE_FLT:
- CONVERT_MATRIX(flt, v)
- break;
- default:
- av_log(am->avr, AV_LOG_ERROR, "Invalid mix coeff type\n");
- return AVERROR(EINVAL);
+ if (am->in_matrix_channels && am->out_matrix_channels) {
+ switch (am->coeff_type) {
+ case AV_MIX_COEFF_TYPE_Q8:
+ CONVERT_MATRIX(q8, av_clip_int16(lrint(256.0 * v)))
+ break;
+ case AV_MIX_COEFF_TYPE_Q15:
+ CONVERT_MATRIX(q15, av_clipl_int32(llrint(32768.0 * v)))
+ break;
+ case AV_MIX_COEFF_TYPE_FLT:
+ CONVERT_MATRIX(flt, v)
+ break;
+ default:
+ av_log(am->avr, AV_LOG_ERROR, "Invalid mix coeff type\n");
+ return AVERROR(EINVAL);
+ }
 }
 
- return mix_function_init(am);
+ ret = mix_function_init(am);
+ if (ret < 0)
+ return ret;
+
+ av_get_channel_layout_string(in_layout_name, sizeof(in_layout_name),
+ am->in_channels, am->in_layout);
+ av_get_channel_layout_string(out_layout_name, sizeof(out_layout_name),
+ am->out_channels, am->out_layout);
+ av_log(am->avr, AV_LOG_DEBUG, "audio_mix: %s to %s\n",
+ in_layout_name, out_layout_name);
+ av_log(am->avr, AV_LOG_DEBUG, "matrix size: %d x %d\n",
+ am->in_matrix_channels, am->out_matrix_channels);
+ for (o = 0; o < am->out_channels; o++) {
+ 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_zero[i] || am->output_skip[o])
+ av_log(am->avr, AV_LOG_DEBUG, " (SKIP)");
+ else
+ av_log(am->avr, AV_LOG_DEBUG, " %0.3f ",
+ matrix[o * am->in_channels + i]);
+ }
+ av_log(am->avr, AV_LOG_DEBUG, "\n");
+ }
+
+ return 0;
 }

libav-v9.6.tar.bz2/libavresample/audio_mix.h -> libav-v10.1.tar.bz2/libavresample/audio_mix.h Changed

libav-v9.6.tar.bz2/libavresample/audio_mix_matrix.c -> libav-v10.1.tar.bz2/libavresample/audio_mix_matrix.c Changed

libav-v9.6.tar.bz2/libavresample/avresample-test.c -> libav-v10.1.tar.bz2/libavresample/avresample-test.c Changed

libav-v9.6.tar.bz2/libavresample/avresample.h -> libav-v10.1.tar.bz2/libavresample/avresample.h Changed

@@ -259,6 +259,36 @@
                           int stride);
 
 /**
+ * Set a customized input channel mapping.
+ *
+ * This function can only be called when the allocated context is not open.
+ * Also, the input channel layout must have already been set.
+ *
+ * Calling avresample_close() on the context will clear the channel mapping.
+ *
+ * The map for each input channel specifies the channel index in the source to
+ * use for that particular channel, or -1 to mute the channel. Source channels
+ * can be duplicated by using the same index for multiple input channels.
+ *
+ * Examples:
+ *
+ * Reordering 5.1 AAC order (C,L,R,Ls,Rs,LFE) to Libav order (L,R,C,LFE,Ls,Rs):
+ * { 1, 2, 0, 5, 3, 4 }
+ *
+ * Muting the 3rd channel in 4-channel input:
+ * { 0, 1, -1, 3 }
+ *
+ * Duplicating the left channel of stereo input:
+ * { 0, 0 }
+ *
+ * @param avr         audio resample context
+ * @param channel_map customized input channel mapping
+ * @return            0 on success, negative AVERROR code on failure
+ */
+int avresample_set_channel_mapping(AVAudioResampleContext *avr,
+                                   const int *channel_map);
+
+/**
  * Set compensation for resampling.
  *
  * This can be called anytime after avresample_open(). If resampling is not

libav-v9.6.tar.bz2/libavresample/dither.c -> libav-v10.1.tar.bz2/libavresample/dither.c Changed

@@ -31,6 +31,7 @@
 #include <math.h>
 #include <stdint.h>
 
+#include "libavutil/attributes.h"
 #include "libavutil/common.h"
 #include "libavutil/lfg.h"
 #include "libavutil/mem.h"
@@ -53,6 +54,8 @@
 struct DitherContext {
 DitherDSPContext ddsp;
 enum AVResampleDitherMethod method;
+ int apply_map;
+ ChannelMapInfo *ch_map_info;
 
 int mute_dither_threshold; // threshold for disabling dither
 int mute_reset_threshold; // threshold for resetting noise shaping
@@ -251,17 +254,23 @@
 return ret;
 }
 
- if (src->sample_fmt != AV_SAMPLE_FMT_FLTP) {
+ if (src->sample_fmt != AV_SAMPLE_FMT_FLTP || c->apply_map) {
 /* make sure flt_data is large enough for the input */
 ret = ff_audio_data_realloc(c->flt_data, src->nb_samples);
 if (ret < 0)
 return ret;
 flt_data = c->flt_data;
+ }
 
+ if (src->sample_fmt != AV_SAMPLE_FMT_FLTP) {
 /* convert input samples to fltp and scale to s16 range */
 ret = ff_audio_convert(c->ac_in, flt_data, src);
 if (ret < 0)
 return ret;
+ } else if (c->apply_map) {
+ ret = ff_audio_data_copy(flt_data, src, c->ch_map_info);
+ if (ret < 0)
+ return ret;
 } else {
 flt_data = src;
 }
@@ -317,8 +326,8 @@
 av_freep(cp);
 }
 
-static void dither_init(DitherDSPContext *ddsp,
- enum AVResampleDitherMethod method)
+static av_cold void dither_init(DitherDSPContext *ddsp,
+ enum AVResampleDitherMethod method)
 {
 ddsp->quantize = quantize_c;
 ddsp->ptr_align = 1;
@@ -328,12 +337,15 @@
 ddsp->dither_int_to_float = dither_int_to_float_rectangular_c;
 else
 ddsp->dither_int_to_float = dither_int_to_float_triangular_c;
+
+ if (ARCH_X86)
+ ff_dither_init_x86(ddsp, method);
 }
 
 DitherContext *ff_dither_alloc(AVAudioResampleContext *avr,
 enum AVSampleFormat out_fmt,
 enum AVSampleFormat in_fmt,
- int channels, int sample_rate)
+ int channels, int sample_rate, int apply_map)
 {
 AVLFG seed_gen;
 DitherContext *c;
@@ -350,6 +362,10 @@
 if (!c)
 return NULL;
 
+ c->apply_map = apply_map;
+ if (apply_map)
+ c->ch_map_info = &avr->ch_map_info;
+
 if (avr->dither_method == AV_RESAMPLE_DITHER_TRIANGULAR_NS &&
 sample_rate != 48000 && sample_rate != 44100) {
 av_log(avr, AV_LOG_WARNING, "sample rate must be 48000 or 44100 Hz "
@@ -379,19 +395,20 @@
 goto fail;
 
 c->ac_out = ff_audio_convert_alloc(avr, out_fmt, AV_SAMPLE_FMT_S16P,
- channels, sample_rate);
+ channels, sample_rate, 0);
 if (!c->ac_out)
 goto fail;
 }
 
- if (in_fmt != AV_SAMPLE_FMT_FLTP) {
+ if (in_fmt != AV_SAMPLE_FMT_FLTP || c->apply_map) {
 c->flt_data = ff_audio_data_alloc(channels, 1024, AV_SAMPLE_FMT_FLTP,
 "dither flt buffer");
 if (!c->flt_data)
 goto fail;
-
+ }
+ if (in_fmt != AV_SAMPLE_FMT_FLTP) {
 c->ac_in = ff_audio_convert_alloc(avr, AV_SAMPLE_FMT_FLTP, in_fmt,
- channels, sample_rate);
+ channels, sample_rate, c->apply_map);
 if (!c->ac_in)
 goto fail;
 }

libav-v9.6.tar.bz2/libavresample/dither.h -> libav-v10.1.tar.bz2/libavresample/dither.h Changed

libav-v9.6.tar.bz2/libavresample/internal.h -> libav-v10.1.tar.bz2/libavresample/internal.h Changed

@@ -26,10 +26,29 @@
 #include "libavutil/opt.h"
 #include "libavutil/samplefmt.h"
 #include "avresample.h"
-#include "audio_convert.h"
-#include "audio_data.h"
-#include "audio_mix.h"
-#include "resample.h"
+
+typedef struct AudioData AudioData;
+typedef struct AudioConvert AudioConvert;
+typedef struct AudioMix AudioMix;
+typedef struct ResampleContext ResampleContext;
+
+enum RemapPoint {
+ REMAP_NONE,
+ REMAP_IN_COPY,
+ REMAP_IN_CONVERT,
+ REMAP_OUT_COPY,
+ REMAP_OUT_CONVERT,
+};
+
+typedef struct ChannelMapInfo {
+ int channel_map[AVRESAMPLE_MAX_CHANNELS]; /**< source index of each output channel, -1 if not remapped */
+ int do_remap; /**< remap needed */
+ int channel_copy[AVRESAMPLE_MAX_CHANNELS]; /**< dest index to copy from */
+ int do_copy; /**< copy needed */
+ int channel_zero[AVRESAMPLE_MAX_CHANNELS]; /**< dest index to zero */
+ int do_zero; /**< zeroing needed */
+ int input_map[AVRESAMPLE_MAX_CHANNELS]; /**< dest index of each input channel */
+} ChannelMapInfo;
 
 struct AVAudioResampleContext {
 const AVClass *av_class; /**< AVClass for logging and AVOptions */
@@ -64,6 +83,7 @@
 int resample_needed; /**< resampling is needed */
 int in_convert_needed; /**< input sample format conversion is needed */
 int out_convert_needed; /**< output sample format conversion is needed */
+ int in_copy_needed; /**< input data copy is needed */
 
 AudioData *in_buffer; /**< buffer for converted input */
 AudioData *resample_out_buffer; /**< buffer for output from resampler */
@@ -81,6 +101,10 @@
 * only used if avresample_set_matrix() is called before avresample_open()
 */
 double *mix_matrix;
+
+ int use_channel_map;
+ enum RemapPoint remap_point;
+ ChannelMapInfo ch_map_info;
 };
 
 #endif /* AVRESAMPLE_INTERNAL_H */

libav-v9.6.tar.bz2/libavresample/options.c -> libav-v10.1.tar.bz2/libavresample/options.c Changed

@@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include <stdint.h>
+
 #include "libavutil/mathematics.h"
 #include "libavutil/mem.h"
 #include "libavutil/opt.h"
@@ -33,14 +35,24 @@
 #define OFFSET(x) offsetof(AVAudioResampleContext, x)
 #define PARAM AV_OPT_FLAG_AUDIO_PARAM
 
-static const AVOption options[] = {
+static const AVOption avresample_options[] = {
 { "in_channel_layout", "Input Channel Layout", OFFSET(in_channel_layout), AV_OPT_TYPE_INT64, { .i64 = 0 }, INT64_MIN, INT64_MAX, PARAM },
 { "in_sample_fmt", "Input Sample Format", OFFSET(in_sample_fmt), AV_OPT_TYPE_INT, { .i64 = AV_SAMPLE_FMT_S16 }, AV_SAMPLE_FMT_U8, AV_SAMPLE_FMT_NB-1, PARAM },
 { "in_sample_rate", "Input Sample Rate", OFFSET(in_sample_rate), AV_OPT_TYPE_INT, { .i64 = 48000 }, 1, INT_MAX, PARAM },
 { "out_channel_layout", "Output Channel Layout", OFFSET(out_channel_layout), AV_OPT_TYPE_INT64, { .i64 = 0 }, INT64_MIN, INT64_MAX, PARAM },
 { "out_sample_fmt", "Output Sample Format", OFFSET(out_sample_fmt), AV_OPT_TYPE_INT, { .i64 = AV_SAMPLE_FMT_S16 }, AV_SAMPLE_FMT_U8, AV_SAMPLE_FMT_NB-1, PARAM },
 { "out_sample_rate", "Output Sample Rate", OFFSET(out_sample_rate), AV_OPT_TYPE_INT, { .i64 = 48000 }, 1, INT_MAX, PARAM },
- { "internal_sample_fmt", "Internal Sample Format", OFFSET(internal_sample_fmt), AV_OPT_TYPE_INT, { .i64 = AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE, AV_SAMPLE_FMT_NB-1, PARAM },
+ { "internal_sample_fmt", "Internal Sample Format", OFFSET(internal_sample_fmt), AV_OPT_TYPE_INT, { .i64 = AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE, AV_SAMPLE_FMT_NB-1, PARAM, "internal_sample_fmt" },
+ {"u8" , "8-bit unsigned integer", 0, AV_OPT_TYPE_CONST, {.i64 = AV_SAMPLE_FMT_U8 }, INT_MIN, INT_MAX, PARAM, "internal_sample_fmt"},
+ {"s16", "16-bit signed integer", 0, AV_OPT_TYPE_CONST, {.i64 = AV_SAMPLE_FMT_S16 }, INT_MIN, INT_MAX, PARAM, "internal_sample_fmt"},
+ {"s32", "32-bit signed integer", 0, AV_OPT_TYPE_CONST, {.i64 = AV_SAMPLE_FMT_S32 }, INT_MIN, INT_MAX, PARAM, "internal_sample_fmt"},
+ {"flt", "32-bit float", 0, AV_OPT_TYPE_CONST, {.i64 = AV_SAMPLE_FMT_FLT }, INT_MIN, INT_MAX, PARAM, "internal_sample_fmt"},
+ {"dbl", "64-bit double", 0, AV_OPT_TYPE_CONST, {.i64 = AV_SAMPLE_FMT_DBL }, INT_MIN, INT_MAX, PARAM, "internal_sample_fmt"},
+ {"u8p" , "8-bit unsigned integer planar", 0, AV_OPT_TYPE_CONST, {.i64 = AV_SAMPLE_FMT_U8P }, INT_MIN, INT_MAX, PARAM, "internal_sample_fmt"},
+ {"s16p", "16-bit signed integer planar", 0, AV_OPT_TYPE_CONST, {.i64 = AV_SAMPLE_FMT_S16P }, INT_MIN, INT_MAX, PARAM, "internal_sample_fmt"},
+ {"s32p", "32-bit signed integer planar", 0, AV_OPT_TYPE_CONST, {.i64 = AV_SAMPLE_FMT_S32P }, INT_MIN, INT_MAX, PARAM, "internal_sample_fmt"},
+ {"fltp", "32-bit float planar", 0, AV_OPT_TYPE_CONST, {.i64 = AV_SAMPLE_FMT_FLTP }, INT_MIN, INT_MAX, PARAM, "internal_sample_fmt"},
+ {"dblp", "64-bit double planar", 0, AV_OPT_TYPE_CONST, {.i64 = AV_SAMPLE_FMT_DBLP }, INT_MIN, INT_MAX, PARAM, "internal_sample_fmt"},
 { "mix_coeff_type", "Mixing Coefficient Type", OFFSET(mix_coeff_type), AV_OPT_TYPE_INT, { .i64 = AV_MIX_COEFF_TYPE_FLT }, AV_MIX_COEFF_TYPE_Q8, AV_MIX_COEFF_TYPE_NB-1, PARAM, "mix_coeff_type" },
 { "q8", "16-bit 8.8 Fixed-Point", 0, AV_OPT_TYPE_CONST, { .i64 = AV_MIX_COEFF_TYPE_Q8 }, INT_MIN, INT_MAX, PARAM, "mix_coeff_type" },
 { "q15", "32-bit 17.15 Fixed-Point", 0, AV_OPT_TYPE_CONST, { .i64 = AV_MIX_COEFF_TYPE_Q15 }, INT_MIN, INT_MAX, PARAM, "mix_coeff_type" },
@@ -54,6 +66,8 @@
 { "phase_shift", "Resampling Phase Shift", OFFSET(phase_shift), AV_OPT_TYPE_INT, { .i64 = 10 }, 0, 30, /* ??? */ PARAM },
 { "linear_interp", "Use Linear Interpolation", OFFSET(linear_interp), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, PARAM },
 { "cutoff", "Cutoff Frequency Ratio", OFFSET(cutoff), AV_OPT_TYPE_DOUBLE, { .dbl = 0.8 }, 0.0, 1.0, PARAM },
+ /* duplicate option in order to work with avconv */
+ { "resample_cutoff", "Cutoff Frequency Ratio", OFFSET(cutoff), AV_OPT_TYPE_DOUBLE, { .dbl = 0.8 }, 0.0, 1.0, PARAM },
 { "matrix_encoding", "Matrixed Stereo Encoding", OFFSET(matrix_encoding), AV_OPT_TYPE_INT, {.i64 = AV_MATRIX_ENCODING_NONE}, AV_MATRIX_ENCODING_NONE, AV_MATRIX_ENCODING_NB-1, PARAM, "matrix_encoding" },
 { "none", "None", 0, AV_OPT_TYPE_CONST, { .i64 = AV_MATRIX_ENCODING_NONE }, INT_MIN, INT_MAX, PARAM, "matrix_encoding" },
 { "dolby", "Dolby", 0, AV_OPT_TYPE_CONST, { .i64 = AV_MATRIX_ENCODING_DOLBY }, INT_MIN, INT_MAX, PARAM, "matrix_encoding" },
@@ -75,7 +89,7 @@
 static const AVClass av_resample_context_class = {
 .class_name = "AVAudioResampleContext",
 .item_name = av_default_item_name,
- .option = options,
+ .option = avresample_options,
 .version = LIBAVUTIL_VERSION_INT,
 };

libav-v9.6.tar.bz2/libavresample/resample.c -> libav-v10.1.tar.bz2/libavresample/resample.c Changed

libav-v9.6.tar.bz2/libavresample/resample.h -> libav-v10.1.tar.bz2/libavresample/resample.h Changed

libav-v9.6.tar.bz2/libavresample/utils.c -> libav-v10.1.tar.bz2/libavresample/utils.c Changed

@@ -26,8 +26,11 @@
 #include "libavutil/opt.h"
 
 #include "avresample.h"
-#include "audio_data.h"
 #include "internal.h"
+#include "audio_data.h"
+#include "audio_convert.h"
+#include "audio_mix.h"
+#include "resample.h"
 
 int avresample_open(AVAudioResampleContext *avr)
 {
@@ -93,20 +96,84 @@
 av_get_sample_fmt_name(avr->internal_sample_fmt));
 }
 
- /* set sample format conversion parameters */
+ /* treat all mono as planar for easier comparison */
 if (avr->in_channels == 1)
 avr->in_sample_fmt = av_get_planar_sample_fmt(avr->in_sample_fmt);
 if (avr->out_channels == 1)
 avr->out_sample_fmt = av_get_planar_sample_fmt(avr->out_sample_fmt);
- avr->in_convert_needed = (avr->resample_needed || avr->mixing_needed) &&
- avr->in_sample_fmt != avr->internal_sample_fmt;
+
+ /* we may need to add an extra conversion in order to remap channels if
+ the output format is not planar */
+ if (avr->use_channel_map && !avr->mixing_needed && !avr->resample_needed &&
+ !av_sample_fmt_is_planar(avr->out_sample_fmt)) {
+ avr->internal_sample_fmt = av_get_planar_sample_fmt(avr->out_sample_fmt);
+ }
+
+ /* set sample format conversion parameters */
 if (avr->resample_needed || avr->mixing_needed)
+ avr->in_convert_needed = avr->in_sample_fmt != avr->internal_sample_fmt;
+ else
+ avr->in_convert_needed = avr->use_channel_map &&
+ !av_sample_fmt_is_planar(avr->out_sample_fmt);
+
+ if (avr->resample_needed || avr->mixing_needed || avr->in_convert_needed)
 avr->out_convert_needed = avr->internal_sample_fmt != avr->out_sample_fmt;
 else
 avr->out_convert_needed = avr->in_sample_fmt != avr->out_sample_fmt;
 
+ avr->in_copy_needed = !avr->in_convert_needed && (avr->mixing_needed ||
+ (avr->use_channel_map && avr->resample_needed));
+
+ if (avr->use_channel_map) {
+ if (avr->in_copy_needed) {
+ avr->remap_point = REMAP_IN_COPY;
+ av_dlog(avr, "remap channels during in_copy\n");
+ } else if (avr->in_convert_needed) {
+ avr->remap_point = REMAP_IN_CONVERT;
+ av_dlog(avr, "remap channels during in_convert\n");
+ } else if (avr->out_convert_needed) {
+ avr->remap_point = REMAP_OUT_CONVERT;
+ av_dlog(avr, "remap channels during out_convert\n");
+ } else {
+ avr->remap_point = REMAP_OUT_COPY;
+ av_dlog(avr, "remap channels during out_copy\n");
+ }
+
+#ifdef DEBUG
+ {
+ int ch;
+ av_dlog(avr, "output map: ");
+ if (avr->ch_map_info.do_remap)
+ for (ch = 0; ch < avr->in_channels; ch++)
+ av_dlog(avr, " % 2d", avr->ch_map_info.channel_map[ch]);
+ else
+ av_dlog(avr, "n/a");
+ av_dlog(avr, "\n");
+ av_dlog(avr, "copy map: ");
+ if (avr->ch_map_info.do_copy)
+ for (ch = 0; ch < avr->in_channels; ch++)
+ av_dlog(avr, " % 2d", avr->ch_map_info.channel_copy[ch]);
+ else
+ av_dlog(avr, "n/a");
+ av_dlog(avr, "\n");
+ av_dlog(avr, "zero map: ");
+ if (avr->ch_map_info.do_zero)
+ for (ch = 0; ch < avr->in_channels; ch++)
+ av_dlog(avr, " % 2d", avr->ch_map_info.channel_zero[ch]);
+ else
+ av_dlog(avr, "n/a");
+ av_dlog(avr, "\n");
+ av_dlog(avr, "input map: ");
+ for (ch = 0; ch < avr->in_channels; ch++)
+ av_dlog(avr, " % 2d", avr->ch_map_info.input_map[ch]);
+ av_dlog(avr, "\n");
+ }
+#endif
+ } else
+ avr->remap_point = REMAP_NONE;
+
 /* allocate buffers */
- if (avr->mixing_needed || avr->in_convert_needed) {
+ if (avr->in_copy_needed || avr->in_convert_needed) {
 avr->in_buffer = ff_audio_data_alloc(FFMAX(avr->in_channels, avr->out_channels),
 0, avr->internal_sample_fmt,
 "in_buffer");
@@ -117,7 +184,7 @@
 }
 if (avr->resample_needed) {
 avr->resample_out_buffer = ff_audio_data_alloc(avr->out_channels,
- 0, avr->internal_sample_fmt,
+ 1024, avr->internal_sample_fmt,
 "resample_out_buffer");
 if (!avr->resample_out_buffer) {
 ret = AVERROR(EINVAL);
@@ -143,7 +210,8 @@
 if (avr->in_convert_needed) {
 avr->ac_in = ff_audio_convert_alloc(avr, avr->internal_sample_fmt,
 avr->in_sample_fmt, avr->in_channels,
- avr->in_sample_rate);
+ avr->in_sample_rate,
+ avr->remap_point == REMAP_IN_CONVERT);
 if (!avr->ac_in) {
 ret = AVERROR(ENOMEM);
 goto error;
@@ -157,7 +225,8 @@
 src_fmt = avr->in_sample_fmt;
 avr->ac_out = ff_audio_convert_alloc(avr, avr->out_sample_fmt, src_fmt,
 avr->out_channels,
- avr->out_sample_rate);
+ avr->out_sample_rate,
+ avr->remap_point == REMAP_OUT_CONVERT);
 if (!avr->ac_out) {
 ret = AVERROR(ENOMEM);
 goto error;
@@ -197,6 +266,8 @@
 ff_audio_resample_free(&avr->resample);
 ff_audio_mix_free(&avr->am);
 av_freep(&avr->mix_matrix);
+
+ avr->use_channel_map = 0;
 }
 
 void avresample_free(AVAudioResampleContext **avr)
@@ -239,7 +310,9 @@
 data in the output FIFO */
 av_dlog(avr, "[copy] %s to output\n", converted->name);
 output->nb_samples = 0;
- ret = ff_audio_data_copy(output, converted);
+ ret = ff_audio_data_copy(output, converted,
+ avr->remap_point == REMAP_OUT_COPY ?
+ &avr->ch_map_info : NULL);
 if (ret < 0)
 return ret;
 av_dlog(avr, "[end conversion]\n");
@@ -303,11 +376,24 @@
 /* in some rare cases we can copy input to output and upmix
 directly in the output buffer */
 av_dlog(avr, "[copy] %s to output\n", current_buffer->name);
- ret = ff_audio_data_copy(&output_buffer, current_buffer);
+ ret = ff_audio_data_copy(&output_buffer, current_buffer,
+ avr->remap_point == REMAP_OUT_COPY ?
+ &avr->ch_map_info : NULL);
 if (ret < 0)
 return ret;
 current_buffer = &output_buffer;
- } else if (avr->mixing_needed || avr->in_convert_needed) {
+ } else if (avr->remap_point == REMAP_OUT_COPY &&
+ (!direct_output || out_samples < in_samples)) {
+ /* if remapping channels during output copy, we may need to
+ * use an intermediate buffer in order to remap before adding
+ * samples to the output fifo */
+ av_dlog(avr, "[copy] %s to out_buffer\n", current_buffer->name);
+ ret = ff_audio_data_copy(avr->out_buffer, current_buffer,
+ &avr->ch_map_info);
+ if (ret < 0)
+ return ret;
+ current_buffer = avr->out_buffer;
+ } else if (avr->in_copy_needed || avr->in_convert_needed) {
 /* if needed, copy or convert input to in_buffer, and downmix if
 applicable */
 if (avr->in_convert_needed) {
@@ -322,7 +408,9 @@
 return ret;
 } else {
 av_dlog(avr, "[copy] %s to in_buffer\n", current_buffer->name);
- ret = ff_audio_data_copy(avr->in_buffer, current_buffer);
+ ret = ff_audio_data_copy(avr->in_buffer, current_buffer,
+ avr->remap_point == REMAP_IN_COPY ?
+ &avr->ch_map_info : NULL);
 if (ret < 0)
 return ret;
 }
@@ -350,7 +438,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);
@@ -467,6 +556,57 @@
 return 0;
 }
 
+int avresample_set_channel_mapping(AVAudioResampleContext *avr,
+ const int *channel_map)
+{
+ ChannelMapInfo *info = &avr->ch_map_info;
+ int in_channels, ch, i;
+
+ in_channels = av_get_channel_layout_nb_channels(avr->in_channel_layout);
+ if (in_channels <= 0 || in_channels > AVRESAMPLE_MAX_CHANNELS) {
+ av_log(avr, AV_LOG_ERROR, "Invalid input channel layout\n");
+ return AVERROR(EINVAL);
+ }
+
+ memset(info, 0, sizeof(*info));
+ memset(info->input_map, -1, sizeof(info->input_map));
+
+ for (ch = 0; ch < in_channels; ch++) {
+ if (channel_map[ch] >= in_channels) {
+ av_log(avr, AV_LOG_ERROR, "Invalid channel map\n");
+ return AVERROR(EINVAL);
+ }
+ if (channel_map[ch] < 0) {
+ info->channel_zero[ch] = 1;
+ info->channel_map[ch] = -1;
+ info->do_zero = 1;
+ } else if (info->input_map[channel_map[ch]] >= 0) {
+ info->channel_copy[ch] = info->input_map[channel_map[ch]];
+ info->channel_map[ch] = -1;
+ info->do_copy = 1;
+ } else {
+ info->channel_map[ch] = channel_map[ch];
+ info->input_map[channel_map[ch]] = ch;
+ info->do_remap = 1;
+ }
+ }
+ /* Fill-in unmapped input channels with unmapped output channels.
+ This is used when remapping during conversion from interleaved to
+ planar format. */
+ for (ch = 0, i = 0; ch < in_channels && i < in_channels; ch++, i++) {
+ while (ch < in_channels && info->input_map[ch] >= 0)
+ ch++;
+ while (i < in_channels && info->channel_map[i] >= 0)
+ i++;
+ if (ch >= in_channels || i >= in_channels)
+ break;
+ info->input_map[ch] = i;
+ }
+
+ avr->use_channel_map = 1;
+ return 0;
+}
+
 int avresample_available(AVAudioResampleContext *avr)
 {
 return av_audio_fifo_size(avr->out_fifo);

libav-v9.6.tar.bz2/libavresample/version.h -> libav-v10.1.tar.bz2/libavresample/version.h Changed

libav-v9.6.tar.bz2/libavresample/x86/Makefile -> libav-v10.1.tar.bz2/libavresample/x86/Makefile Changed

libav-v9.6.tar.bz2/libavresample/x86/audio_convert_init.c -> libav-v10.1.tar.bz2/libavresample/x86/audio_convert_init.c Changed

@@ -25,135 +25,135 @@
 
 /* flat conversions */
 
-extern void ff_conv_s16_to_s32_sse2(int16_t *dst, const int32_t *src, int len);
+void ff_conv_s16_to_s32_sse2(int16_t *dst, const int32_t *src, int len);
 
-extern void ff_conv_s16_to_flt_sse2(float *dst, const int16_t *src, int len);
-extern void ff_conv_s16_to_flt_sse4(float *dst, const int16_t *src, int len);
+void ff_conv_s16_to_flt_sse2(float *dst, const int16_t *src, int len);
+void ff_conv_s16_to_flt_sse4(float *dst, const int16_t *src, int len);
 
-extern void ff_conv_s32_to_s16_mmx (int16_t *dst, const int32_t *src, int len);
-extern void ff_conv_s32_to_s16_sse2(int16_t *dst, const int32_t *src, int len);
+void ff_conv_s32_to_s16_mmx (int16_t *dst, const int32_t *src, int len);
+void ff_conv_s32_to_s16_sse2(int16_t *dst, const int32_t *src, int len);
 
-extern void ff_conv_s32_to_flt_sse2(float *dst, const int32_t *src, int len);
-extern void ff_conv_s32_to_flt_avx (float *dst, const int32_t *src, int len);
+void ff_conv_s32_to_flt_sse2(float *dst, const int32_t *src, int len);
+void ff_conv_s32_to_flt_avx (float *dst, const int32_t *src, int len);
 
-extern void ff_conv_flt_to_s16_sse2(int16_t *dst, const float *src, int len);
+void ff_conv_flt_to_s16_sse2(int16_t *dst, const float *src, int len);
 
-extern void ff_conv_flt_to_s32_sse2(int32_t *dst, const float *src, int len);
-extern void ff_conv_flt_to_s32_avx (int32_t *dst, const float *src, int len);
+void ff_conv_flt_to_s32_sse2(int32_t *dst, const float *src, int len);
+void ff_conv_flt_to_s32_avx (int32_t *dst, const float *src, int len);
 
 /* interleave conversions */
 
-extern void ff_conv_s16p_to_s16_2ch_sse2(int16_t *dst, int16_t *const *src,
-                                         int len, int channels);
-extern void ff_conv_s16p_to_s16_2ch_avx (int16_t *dst, int16_t *const *src,
-                                         int len, int channels);
+void ff_conv_s16p_to_s16_2ch_sse2(int16_t *dst, int16_t *const *src,
+                                  int len, int channels);
+void ff_conv_s16p_to_s16_2ch_avx (int16_t *dst, int16_t *const *src,
+                                  int len, int channels);
 
-extern void ff_conv_s16p_to_s16_6ch_sse2(int16_t *dst, int16_t *const *src,
-                                         int len, int channels);
-extern void ff_conv_s16p_to_s16_6ch_sse2slow(int16_t *dst, int16_t *const *src,
-                                             int len, int channels);
-extern void ff_conv_s16p_to_s16_6ch_avx (int16_t *dst, int16_t *const *src,
-                                         int len, int channels);
+void ff_conv_s16p_to_s16_6ch_sse2(int16_t *dst, int16_t *const *src,
+                                  int len, int channels);
+void ff_conv_s16p_to_s16_6ch_sse2slow(int16_t *dst, int16_t *const *src,
+                                      int len, int channels);
+void ff_conv_s16p_to_s16_6ch_avx (int16_t *dst, int16_t *const *src,
+                                  int len, int channels);
 
-extern void ff_conv_s16p_to_flt_2ch_sse2(float *dst, int16_t *const *src,
-                                         int len, int channels);
-extern void ff_conv_s16p_to_flt_2ch_avx (float *dst, int16_t *const *src,
-                                         int len, int channels);
+void ff_conv_s16p_to_flt_2ch_sse2(float *dst, int16_t *const *src,
+                                  int len, int channels);
+void ff_conv_s16p_to_flt_2ch_avx (float *dst, int16_t *const *src,
+                                  int len, int channels);
 
-extern void ff_conv_s16p_to_flt_6ch_sse2 (float *dst, int16_t *const *src,
-                                          int len, int channels);
-extern void ff_conv_s16p_to_flt_6ch_ssse3(float *dst, int16_t *const *src,
-                                         int len, int channels);
-extern void ff_conv_s16p_to_flt_6ch_avx  (float *dst, int16_t *const *src,
-                                          int len, int channels);
+void ff_conv_s16p_to_flt_6ch_sse2 (float *dst, int16_t *const *src,
+                                   int len, int channels);
+void ff_conv_s16p_to_flt_6ch_ssse3(float *dst, int16_t *const *src,
+                                  int len, int channels);
+void ff_conv_s16p_to_flt_6ch_avx  (float *dst, int16_t *const *src,
+                                   int len, int channels);
 
-extern void ff_conv_fltp_to_s16_2ch_sse2 (int16_t *dst, float *const *src,
-                                          int len, int channels);
-extern void ff_conv_fltp_to_s16_2ch_ssse3(int16_t *dst, float *const *src,
-                                          int len, int channels);
+void ff_conv_fltp_to_s16_2ch_sse2 (int16_t *dst, float *const *src,
+                                   int len, int channels);
+void ff_conv_fltp_to_s16_2ch_ssse3(int16_t *dst, float *const *src,
+                                   int len, int channels);
 
-extern void ff_conv_fltp_to_s16_6ch_sse (int16_t *dst, float *const *src,
-                                         int len, int channels);
-extern void ff_conv_fltp_to_s16_6ch_sse2(int16_t *dst, float *const *src,
-                                         int len, int channels);
-extern void ff_conv_fltp_to_s16_6ch_avx (int16_t *dst, float *const *src,
-                                         int len, int channels);
+void ff_conv_fltp_to_s16_6ch_sse (int16_t *dst, float *const *src,
+                                  int len, int channels);
+void ff_conv_fltp_to_s16_6ch_sse2(int16_t *dst, float *const *src,
+                                  int len, int channels);
+void ff_conv_fltp_to_s16_6ch_avx (int16_t *dst, float *const *src,
+                                  int len, int channels);
 
-extern void ff_conv_fltp_to_flt_2ch_sse(float *dst, float *const *src, int len,
-                                        int channels);
-extern void ff_conv_fltp_to_flt_2ch_avx(float *dst, float *const *src, int len,
-                                        int channels);
+void ff_conv_fltp_to_flt_2ch_sse(float *dst, float *const *src, int len,
+                                 int channels);
+void ff_conv_fltp_to_flt_2ch_avx(float *dst, float *const *src, int len,
+                                 int channels);
 
-extern void ff_conv_fltp_to_flt_6ch_mmx (float *dst, float *const *src, int len,
-                                         int channels);
-extern void ff_conv_fltp_to_flt_6ch_sse4(float *dst, float *const *src, int len,
-                                         int channels);
-extern void ff_conv_fltp_to_flt_6ch_avx (float *dst, float *const *src, int len,
-                                         int channels);
+void ff_conv_fltp_to_flt_6ch_mmx (float *dst, float *const *src, int len,
+                                  int channels);
+void ff_conv_fltp_to_flt_6ch_sse4(float *dst, float *const *src, int len,
+                                  int channels);
+void ff_conv_fltp_to_flt_6ch_avx (float *dst, float *const *src, int len,
+                                  int channels);
 
 /* deinterleave conversions */
 
-extern void ff_conv_s16_to_s16p_2ch_sse2(int16_t *const *dst, int16_t *src,
-                                         int len, int channels);
-extern void ff_conv_s16_to_s16p_2ch_ssse3(int16_t *const *dst, int16_t *src,
-                                          int len, int channels);
-extern void ff_conv_s16_to_s16p_2ch_avx (int16_t *const *dst, int16_t *src,
-                                         int len, int channels);
+void ff_conv_s16_to_s16p_2ch_sse2(int16_t *const *dst, int16_t *src,
+                                  int len, int channels);
+void ff_conv_s16_to_s16p_2ch_ssse3(int16_t *const *dst, int16_t *src,
+                                   int len, int channels);
+void ff_conv_s16_to_s16p_2ch_avx (int16_t *const *dst, int16_t *src,
+                                  int len, int channels);
 
-extern void ff_conv_s16_to_s16p_6ch_sse2 (int16_t *const *dst, int16_t *src,
-                                          int len, int channels);
-extern void ff_conv_s16_to_s16p_6ch_ssse3(int16_t *const *dst, int16_t *src,
-                                          int len, int channels);
-extern void ff_conv_s16_to_s16p_6ch_avx  (int16_t *const *dst, int16_t *src,
-                                          int len, int channels);
+void ff_conv_s16_to_s16p_6ch_sse2 (int16_t *const *dst, int16_t *src,
+                                   int len, int channels);
+void ff_conv_s16_to_s16p_6ch_ssse3(int16_t *const *dst, int16_t *src,
+                                   int len, int channels);
+void ff_conv_s16_to_s16p_6ch_avx  (int16_t *const *dst, int16_t *src,
+                                   int len, int channels);
 
-extern void ff_conv_s16_to_fltp_2ch_sse2(float *const *dst, int16_t *src,
-                                         int len, int channels);
-extern void ff_conv_s16_to_fltp_2ch_avx (float *const *dst, int16_t *src,
-                                         int len, int channels);
+void ff_conv_s16_to_fltp_2ch_sse2(float *const *dst, int16_t *src,
+                                  int len, int channels);
+void ff_conv_s16_to_fltp_2ch_avx (float *const *dst, int16_t *src,
+                                  int len, int channels);
 
-extern void ff_conv_s16_to_fltp_6ch_sse2 (float *const *dst, int16_t *src,
-                                          int len, int channels);
-extern void ff_conv_s16_to_fltp_6ch_ssse3(float *const *dst, int16_t *src,
-                                          int len, int channels);
-extern void ff_conv_s16_to_fltp_6ch_sse4 (float *const *dst, int16_t *src,
-                                          int len, int channels);
-extern void ff_conv_s16_to_fltp_6ch_avx  (float *const *dst, int16_t *src,
-                                          int len, int channels);
+void ff_conv_s16_to_fltp_6ch_sse2 (float *const *dst, int16_t *src,
+                                   int len, int channels);
+void ff_conv_s16_to_fltp_6ch_ssse3(float *const *dst, int16_t *src,
+                                   int len, int channels);
+void ff_conv_s16_to_fltp_6ch_sse4 (float *const *dst, int16_t *src,
+                                   int len, int channels);
+void ff_conv_s16_to_fltp_6ch_avx  (float *const *dst, int16_t *src,
+                                   int len, int channels);
 
-extern void ff_conv_flt_to_s16p_2ch_sse2(int16_t *const *dst, float *src,
-                                         int len, int channels);
-extern void ff_conv_flt_to_s16p_2ch_avx (int16_t *const *dst, float *src,
-                                         int len, int channels);
+void ff_conv_flt_to_s16p_2ch_sse2(int16_t *const *dst, float *src,
+                                  int len, int channels);
+void ff_conv_flt_to_s16p_2ch_avx (int16_t *const *dst, float *src,
+                                  int len, int channels);
 
-extern void ff_conv_flt_to_s16p_6ch_sse2 (int16_t *const *dst, float *src,
-                                          int len, int channels);
-extern void ff_conv_flt_to_s16p_6ch_ssse3(int16_t *const *dst, float *src,
-                                          int len, int channels);
-extern void ff_conv_flt_to_s16p_6ch_avx  (int16_t *const *dst, float *src,
-                                          int len, int channels);
+void ff_conv_flt_to_s16p_6ch_sse2 (int16_t *const *dst, float *src,
+                                   int len, int channels);
+void ff_conv_flt_to_s16p_6ch_ssse3(int16_t *const *dst, float *src,
+                                   int len, int channels);
+void ff_conv_flt_to_s16p_6ch_avx  (int16_t *const *dst, float *src,
+                                   int len, int channels);
 
-extern void ff_conv_flt_to_fltp_2ch_sse(float *const *dst, float *src, int len,
-                                        int channels);
-extern void ff_conv_flt_to_fltp_2ch_avx(float *const *dst, float *src, int len,
-                                        int channels);
+void ff_conv_flt_to_fltp_2ch_sse(float *const *dst, float *src, int len,
+                                 int channels);
+void ff_conv_flt_to_fltp_2ch_avx(float *const *dst, float *src, int len,
+                                 int channels);
 
-extern void ff_conv_flt_to_fltp_6ch_sse2(float *const *dst, float *src, int len,
-                                         int channels);
-extern void ff_conv_flt_to_fltp_6ch_avx (float *const *dst, float *src, int len,
-                                         int channels);
+void ff_conv_flt_to_fltp_6ch_sse2(float *const *dst, float *src, int len,
+                                  int channels);
+void ff_conv_flt_to_fltp_6ch_avx (float *const *dst, float *src, int len,
+                                  int channels);
 
 av_cold void ff_audio_convert_init_x86(AudioConvert *ac)
 {
-    int mm_flags = av_get_cpu_flags();
+    int cpu_flags = av_get_cpu_flags();
 
-    if (EXTERNAL_MMX(mm_flags)) {
+    if (EXTERNAL_MMX(cpu_flags)) {
         ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32,
                                   0, 1, 8, "MMX", ff_conv_s32_to_s16_mmx);
         ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP,
                                   6, 1, 4, "MMX", ff_conv_fltp_to_flt_6ch_mmx);
     }
-    if (EXTERNAL_SSE(mm_flags)) {
+    if (EXTERNAL_SSE(cpu_flags)) {
         ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_FLTP,
                                   6, 1, 2, "SSE", ff_conv_fltp_to_s16_6ch_sse);
         ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP,
@@ -161,8 +161,8 @@
         ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_FLT,
                                   2, 16, 4, "SSE", ff_conv_flt_to_fltp_2ch_sse);
     }
-    if (EXTERNAL_SSE2(mm_flags)) {
-        if (!(mm_flags & AV_CPU_FLAG_SSE2SLOW)) {
+    if (EXTERNAL_SSE2(cpu_flags)) {
+        if (!(cpu_flags & AV_CPU_FLAG_SSE2SLOW)) {
             ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32,
                                       0, 16, 16, "SSE2", ff_conv_s32_to_s16_sse2);
             ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P,
@@ -206,7 +206,7 @@
         ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_FLT,
                                   6, 16, 4, "SSE2", ff_conv_flt_to_fltp_6ch_sse2);
     }
-    if (EXTERNAL_SSSE3(mm_flags)) {
+    if (EXTERNAL_SSSE3(cpu_flags)) {
         ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16P,
                                   6, 16, 4, "SSSE3", ff_conv_s16p_to_flt_6ch_ssse3);
         ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_FLTP,
@@ -220,13 +220,13 @@
         ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_FLT,
                                   6, 16, 4, "SSSE3", ff_conv_flt_to_s16p_6ch_ssse3);
     }
-    if (EXTERNAL_SSE4(mm_flags)) {
+    if (EXTERNAL_SSE4(cpu_flags)) {
         ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16,
                                   0, 16, 8, "SSE4", ff_conv_s16_to_flt_sse4);
         ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP,
                                   6, 16, 4, "SSE4", ff_conv_fltp_to_flt_6ch_sse4);
     }
-    if (EXTERNAL_AVX(mm_flags)) {
+    if (EXTERNAL_AVX(cpu_flags)) {
         ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S32,
                                   0, 32, 16, "AVX", ff_conv_s32_to_flt_avx);
         ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_FLT,

libav-v9.6.tar.bz2/libavresample/x86/audio_mix.asm -> libav-v10.1.tar.bz2/libavresample/x86/audio_mix.asm Changed

@@ -384,10 +384,10 @@
     S16_TO_S32_SX   4, 5
     cvtdq2ps       m4, m4
     cvtdq2ps       m5, m5
-    fmaddps        m2, m4, mx_1_ %+ %%i, m2, m6
-    fmaddps        m3, m5, mx_1_ %+ %%i, m3, m6
-    fmaddps        m0, m4, mx_0_ %+ %%i, m0, m4
-    fmaddps        m1, m5, mx_0_ %+ %%i, m1, m5
+    FMULADD_PS     m2, m4, mx_1_ %+ %%i, m2, m6
+    FMULADD_PS     m3, m5, mx_1_ %+ %%i, m3, m6
+    FMULADD_PS     m0, m4, mx_0_ %+ %%i, m0, m4
+    FMULADD_PS     m1, m5, mx_0_ %+ %%i, m1, m5
     %else
     %if copy_src_from_stack
     mov       src_ptr, src %+ %%i %+ m
@@ -396,8 +396,8 @@
     S16_TO_S32_SX   2, 3
     cvtdq2ps       m2, m2
     cvtdq2ps       m3, m3
-    fmaddps        m0, m2, mx_0_ %+ %%i, m0, m4
-    fmaddps        m1, m3, mx_0_ %+ %%i, m1, m4
+    FMULADD_PS     m0, m2, mx_0_ %+ %%i, m0, m4
+    FMULADD_PS     m1, m3, mx_0_ %+ %%i, m1, m4
     %endif
     %assign %%i %%i+1
 %endrep
@@ -422,7 +422,7 @@
     %if stereo || mx_stack_0_0
     mulps          m0, m0, mx_0_0
     %else
-    mulps          m0, [src0q+lenq], mx_0_0
+    mulps          m0, mx_0_0, [src0q+lenq]
     %endif
 %assign %%i 1
 %rep (in_channels - 1)
@@ -437,12 +437,12 @@
     mova           m2, [src_ptr+lenq]
     %endif
     %if stereo
-    fmaddps        m1, m2, mx_1_ %+ %%i, m1, m3
+    FMULADD_PS     m1, m2, mx_1_ %+ %%i, m1, m3
     %endif
     %if stereo || mx_stack_0_ %+ %%i
-    fmaddps        m0, m2, mx_0_ %+ %%i, m0, m2
+    FMULADD_PS     m0, m2, mx_0_ %+ %%i, m0, m2
     %else
-    fmaddps        m0, mx_0_ %+ %%i, [src_ptr+lenq], m0, m1
+    FMULADD_PS     m0, mx_0_ %+ %%i, [src_ptr+lenq], m0, m1
     %endif
     %assign %%i %%i+1
 %endrep

libav-v9.6.tar.bz2/libavresample/x86/audio_mix_init.c -> libav-v10.1.tar.bz2/libavresample/x86/audio_mix_init.c Changed

@@ -23,80 +23,80 @@
 #include "libavutil/x86/cpu.h"
 #include "libavresample/audio_mix.h"
 
-extern void ff_mix_2_to_1_fltp_flt_sse(float **src, float **matrix, int len,
-                                       int out_ch, int in_ch);
-extern void ff_mix_2_to_1_fltp_flt_avx(float **src, float **matrix, int len,
-                                       int out_ch, int in_ch);
+void ff_mix_2_to_1_fltp_flt_sse(float **src, float **matrix, int len,
+                                int out_ch, int in_ch);
+void ff_mix_2_to_1_fltp_flt_avx(float **src, float **matrix, int len,
+                                int out_ch, int in_ch);
 
-extern void ff_mix_2_to_1_s16p_flt_sse2(int16_t **src, float **matrix, int len,
-                                        int out_ch, int in_ch);
-extern void ff_mix_2_to_1_s16p_flt_sse4(int16_t **src, float **matrix, int len,
-                                        int out_ch, int in_ch);
+void ff_mix_2_to_1_s16p_flt_sse2(int16_t **src, float **matrix, int len,
+                                 int out_ch, int in_ch);
+void ff_mix_2_to_1_s16p_flt_sse4(int16_t **src, float **matrix, int len,
+                                 int out_ch, int in_ch);
 
-extern void ff_mix_2_to_1_s16p_q8_sse2(int16_t **src, int16_t **matrix,
-                                       int len, int out_ch, int in_ch);
+void ff_mix_2_to_1_s16p_q8_sse2(int16_t **src, int16_t **matrix,
+                                int len, int out_ch, int in_ch);
 
-extern void ff_mix_1_to_2_fltp_flt_sse(float **src, float **matrix, int len,
-                                       int out_ch, int in_ch);
-extern void ff_mix_1_to_2_fltp_flt_avx(float **src, float **matrix, int len,
-                                       int out_ch, int in_ch);
+void ff_mix_1_to_2_fltp_flt_sse(float **src, float **matrix, int len,
+                                int out_ch, int in_ch);
+void ff_mix_1_to_2_fltp_flt_avx(float **src, float **matrix, int len,
+                                int out_ch, int in_ch);
 
-extern void ff_mix_1_to_2_s16p_flt_sse2(int16_t **src, float **matrix, int len,
-                                        int out_ch, int in_ch);
-extern void ff_mix_1_to_2_s16p_flt_sse4(int16_t **src, float **matrix, int len,
-                                        int out_ch, int in_ch);
-extern void ff_mix_1_to_2_s16p_flt_avx (int16_t **src, float **matrix, int len,
-                                        int out_ch, int in_ch);
+void ff_mix_1_to_2_s16p_flt_sse2(int16_t **src, float **matrix, int len,
+                                 int out_ch, int in_ch);
+void ff_mix_1_to_2_s16p_flt_sse4(int16_t **src, float **matrix, int len,
+                                 int out_ch, int in_ch);
+void ff_mix_1_to_2_s16p_flt_avx (int16_t **src, float **matrix, int len,
+                                 int out_ch, int in_ch);
 
-#define DEFINE_MIX_3_8_TO_1_2(chan)                                         \
-extern void ff_mix_ ## chan ## _to_1_fltp_flt_sse(float **src,              \
-                                                  float **matrix, int len,  \
-                                                  int out_ch, int in_ch);   \
-extern void ff_mix_ ## chan ## _to_2_fltp_flt_sse(float **src,              \
-                                                  float **matrix, int len,  \
-                                                  int out_ch, int in_ch);   \
-                                                                            \
-extern void ff_mix_ ## chan ## _to_1_s16p_flt_sse2(int16_t **src,           \
-                                                   float **matrix, int len, \
-                                                   int out_ch, int in_ch);  \
-extern void ff_mix_ ## chan ## _to_2_s16p_flt_sse2(int16_t **src,           \
-                                                   float **matrix, int len, \
-                                                   int out_ch, int in_ch);  \
-                                                                            \
-extern void ff_mix_ ## chan ## _to_1_s16p_flt_sse4(int16_t **src,           \
-                                                   float **matrix, int len, \
-                                                   int out_ch, int in_ch);  \
-extern void ff_mix_ ## chan ## _to_2_s16p_flt_sse4(int16_t **src,           \
-                                                   float **matrix, int len, \
-                                                   int out_ch, int in_ch);  \
-                                                                            \
-extern void ff_mix_ ## chan ## _to_1_fltp_flt_avx(float **src,              \
-                                                  float **matrix, int len,  \
-                                                  int out_ch, int in_ch);   \
-extern void ff_mix_ ## chan ## _to_2_fltp_flt_avx(float **src,              \
-                                                  float **matrix, int len,  \
-                                                  int out_ch, int in_ch);   \
-                                                                            \
-extern void ff_mix_ ## chan ## _to_1_s16p_flt_avx(int16_t **src,            \
-                                                  float **matrix, int len,  \
-                                                  int out_ch, int in_ch);   \
-extern void ff_mix_ ## chan ## _to_2_s16p_flt_avx(int16_t **src,            \
-                                                  float **matrix, int len,  \
-                                                  int out_ch, int in_ch);   \
-                                                                            \
-extern void ff_mix_ ## chan ## _to_1_fltp_flt_fma4(float **src,             \
-                                                   float **matrix, int len, \
-                                                   int out_ch, int in_ch);  \
-extern void ff_mix_ ## chan ## _to_2_fltp_flt_fma4(float **src,             \
-                                                   float **matrix, int len, \
-                                                   int out_ch, int in_ch);  \
-                                                                            \
-extern void ff_mix_ ## chan ## _to_1_s16p_flt_fma4(int16_t **src,           \
-                                                   float **matrix, int len, \
-                                                   int out_ch, int in_ch);  \
-extern void ff_mix_ ## chan ## _to_2_s16p_flt_fma4(int16_t **src,           \
-                                                   float **matrix, int len, \
-                                                   int out_ch, int in_ch);
+#define DEFINE_MIX_3_8_TO_1_2(chan)                                     \
+void ff_mix_ ## chan ## _to_1_fltp_flt_sse(float **src,                 \
+                                           float **matrix, int len,     \
+                                           int out_ch, int in_ch);      \
+void ff_mix_ ## chan ## _to_2_fltp_flt_sse(float **src,                 \
+                                           float **matrix, int len,     \
+                                           int out_ch, int in_ch);      \
+                                                                        \
+void ff_mix_ ## chan ## _to_1_s16p_flt_sse2(int16_t **src,              \
+                                            float **matrix, int len,    \
+                                            int out_ch, int in_ch);     \
+void ff_mix_ ## chan ## _to_2_s16p_flt_sse2(int16_t **src,              \
+                                            float **matrix, int len,    \
+                                            int out_ch, int in_ch);     \
+                                                                        \
+void ff_mix_ ## chan ## _to_1_s16p_flt_sse4(int16_t **src,              \
+                                            float **matrix, int len,    \
+                                            int out_ch, int in_ch);     \
+void ff_mix_ ## chan ## _to_2_s16p_flt_sse4(int16_t **src,              \
+                                            float **matrix, int len,    \
+                                            int out_ch, int in_ch);     \
+                                                                        \
+void ff_mix_ ## chan ## _to_1_fltp_flt_avx(float **src,                 \
+                                           float **matrix, int len,     \
+                                           int out_ch, int in_ch);      \
+void ff_mix_ ## chan ## _to_2_fltp_flt_avx(float **src,                 \
+                                           float **matrix, int len,     \
+                                           int out_ch, int in_ch);      \
+                                                                        \
+void ff_mix_ ## chan ## _to_1_s16p_flt_avx(int16_t **src,               \
+                                           float **matrix, int len,     \
+                                           int out_ch, int in_ch);      \
+void ff_mix_ ## chan ## _to_2_s16p_flt_avx(int16_t **src,               \
+                                           float **matrix, int len,     \
+                                           int out_ch, int in_ch);      \
+                                                                        \
+void ff_mix_ ## chan ## _to_1_fltp_flt_fma4(float **src,                \
+                                            float **matrix, int len,    \
+                                            int out_ch, int in_ch);     \
+void ff_mix_ ## chan ## _to_2_fltp_flt_fma4(float **src,                \
+                                            float **matrix, int len,    \
+                                            int out_ch, int in_ch);     \
+                                                                        \
+void ff_mix_ ## chan ## _to_1_s16p_flt_fma4(int16_t **src,              \
+                                            float **matrix, int len,    \
+                                            int out_ch, int in_ch);     \
+void ff_mix_ ## chan ## _to_2_s16p_flt_fma4(int16_t **src,              \
+                                            float **matrix, int len,    \
+                                            int out_ch, int in_ch);
 
 DEFINE_MIX_3_8_TO_1_2(3)
 DEFINE_MIX_3_8_TO_1_2(4)
@@ -106,7 +106,7 @@
 DEFINE_MIX_3_8_TO_1_2(8)
 
 #define SET_MIX_3_8_TO_1_2(chan)                                            \
-    if (EXTERNAL_SSE(mm_flags)) {                                           \
+    if (EXTERNAL_SSE(cpu_flags)) {                                          \
         ff_audio_mix_set_func(am, AV_SAMPLE_FMT_FLTP, AV_MIX_COEFF_TYPE_FLT,\
                               chan, 1, 16, 4, "SSE",                        \
                               ff_mix_ ## chan ## _to_1_fltp_flt_sse);       \
@@ -114,7 +114,7 @@
                               chan, 2, 16, 4, "SSE",                        \
                               ff_mix_## chan ##_to_2_fltp_flt_sse);         \
     }                                                                       \
-    if (EXTERNAL_SSE2(mm_flags)) {                                          \
+    if (EXTERNAL_SSE2(cpu_flags)) {                                         \
         ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT,\
                               chan, 1, 16, 8, "SSE2",                       \
                               ff_mix_ ## chan ## _to_1_s16p_flt_sse2);      \
@@ -122,7 +122,7 @@
                               chan, 2, 16, 8, "SSE2",                       \
                               ff_mix_ ## chan ## _to_2_s16p_flt_sse2);      \
     }                                                                       \
-    if (EXTERNAL_SSE4(mm_flags)) {                                          \
+    if (EXTERNAL_SSE4(cpu_flags)) {                                         \
         ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT,\
                               chan, 1, 16, 8, "SSE4",                       \
                               ff_mix_ ## chan ## _to_1_s16p_flt_sse4);      \
@@ -130,7 +130,7 @@
                               chan, 2, 16, 8, "SSE4",                       \
                               ff_mix_ ## chan ## _to_2_s16p_flt_sse4);      \
     }                                                                       \
-    if (EXTERNAL_AVX(mm_flags)) {                                           \
+    if (EXTERNAL_AVX(cpu_flags)) {                                          \
         int ptr_align = 32;                                                 \
         int smp_align = 8;                                                  \
         if (ARCH_X86_32 || chan >= 6) {                                     \
@@ -150,7 +150,7 @@
                               chan, 2, 16, 8, "AVX",                        \
                               ff_mix_ ## chan ## _to_2_s16p_flt_avx);       \
     }                                                                       \
-    if (EXTERNAL_FMA4(mm_flags)) {                                          \
+    if (EXTERNAL_FMA4(cpu_flags)) {                                         \
         int ptr_align = 32;                                                 \
         int smp_align = 8;                                                  \
         if (ARCH_X86_32 || chan >= 6) {                                     \
@@ -174,15 +174,15 @@
 av_cold void ff_audio_mix_init_x86(AudioMix *am)
 {
 #if HAVE_YASM
-    int mm_flags = av_get_cpu_flags();
+    int cpu_flags = av_get_cpu_flags();
 
-    if (EXTERNAL_SSE(mm_flags)) {
+    if (EXTERNAL_SSE(cpu_flags)) {
         ff_audio_mix_set_func(am, AV_SAMPLE_FMT_FLTP, AV_MIX_COEFF_TYPE_FLT,
                               2, 1, 16, 8, "SSE", ff_mix_2_to_1_fltp_flt_sse);
         ff_audio_mix_set_func(am, AV_SAMPLE_FMT_FLTP, AV_MIX_COEFF_TYPE_FLT,
                               1, 2, 16, 4, "SSE", ff_mix_1_to_2_fltp_flt_sse);
     }
-    if (EXTERNAL_SSE2(mm_flags)) {
+    if (EXTERNAL_SSE2(cpu_flags)) {
         ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT,
                               2, 1, 16, 8, "SSE2", ff_mix_2_to_1_s16p_flt_sse2);
         ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_Q8,
@@ -190,13 +190,13 @@
         ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT,
                               1, 2, 16, 8, "SSE2", ff_mix_1_to_2_s16p_flt_sse2);
     }
-    if (EXTERNAL_SSE4(mm_flags)) {
+    if (EXTERNAL_SSE4(cpu_flags)) {
         ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT,
                               2, 1, 16, 8, "SSE4", ff_mix_2_to_1_s16p_flt_sse4);
         ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT,
                               1, 2, 16, 8, "SSE4", ff_mix_1_to_2_s16p_flt_sse4);
     }
-    if (EXTERNAL_AVX(mm_flags)) {
+    if (EXTERNAL_AVX(cpu_flags)) {
         ff_audio_mix_set_func(am, AV_SAMPLE_FMT_FLTP, AV_MIX_COEFF_TYPE_FLT,
                               2, 1, 32, 16, "AVX", ff_mix_2_to_1_fltp_flt_avx);
         ff_audio_mix_set_func(am, AV_SAMPLE_FMT_FLTP, AV_MIX_COEFF_TYPE_FLT,

libav-v10.1.tar.bz2/libavresample/x86/dither.asm Added

@@ -0,0 +1,117 @@
+;******************************************************************************
+;* x86 optimized dithering format conversion
+;* Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
+;*
+;* This file is part of Libav.
+;*
+;* Libav 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.
+;*
+;* Libav 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 Libav; 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 32
+
+; 1.0f / (2.0f * INT32_MAX)
+pf_dither_scale: times 8 dd 2.32830643762e-10
+
+pf_s16_scale: times 4 dd 32753.0
+
+SECTION_TEXT
+
+;------------------------------------------------------------------------------
+; void ff_quantize(int16_t *dst, float *src, float *dither, int len);
+;------------------------------------------------------------------------------
+
+INIT_XMM sse2
+cglobal quantize, 4,4,3, dst, src, dither, len
+ lea lenq, [2*lend]
+ add dstq, lenq
+ lea srcq, [srcq+2*lenq]
+ lea ditherq, [ditherq+2*lenq]
+ neg lenq
+ mova m2, [pf_s16_scale]
+.loop:
+ mulps m0, m2, [srcq+2*lenq]
+ mulps m1, m2, [srcq+2*lenq+mmsize]
+ addps m0, [ditherq+2*lenq]
+ addps m1, [ditherq+2*lenq+mmsize]
+ cvtps2dq m0, m0
+ cvtps2dq m1, m1
+ packssdw m0, m1
+ mova [dstq+lenq], m0
+ add lenq, mmsize
+ jl .loop
+ REP_RET
+
+;------------------------------------------------------------------------------
+; void ff_dither_int_to_float_rectangular(float *dst, int *src, int len)
+;------------------------------------------------------------------------------
+
+%macro DITHER_INT_TO_FLOAT_RECTANGULAR 0
+cglobal dither_int_to_float_rectangular, 3,3,3, dst, src, len
+ lea lenq, [4*lend]
+ add srcq, lenq
+ add dstq, lenq
+ neg lenq
+ mova m0, [pf_dither_scale]
+.loop:
+ cvtdq2ps m1, [srcq+lenq]
+ cvtdq2ps m2, [srcq+lenq+mmsize]
+ mulps m1, m1, m0
+ mulps m2, m2, m0
+ mova [dstq+lenq], m1
+ mova [dstq+lenq+mmsize], m2
+ add lenq, 2*mmsize
+ jl .loop
+ REP_RET
+%endmacro
+
+INIT_XMM sse2
+DITHER_INT_TO_FLOAT_RECTANGULAR
+INIT_YMM avx
+DITHER_INT_TO_FLOAT_RECTANGULAR
+
+;------------------------------------------------------------------------------
+; void ff_dither_int_to_float_triangular(float *dst, int *src0, int len)
+;------------------------------------------------------------------------------
+
+%macro DITHER_INT_TO_FLOAT_TRIANGULAR 0
+cglobal dither_int_to_float_triangular, 3,4,5, dst, src0, len, src1
+ lea lenq, [4*lend]
+ lea src1q, [src0q+2*lenq]
+ add src0q, lenq
+ add dstq, lenq
+ neg lenq
+ mova m0, [pf_dither_scale]
+.loop:
+ cvtdq2ps m1, [src0q+lenq]
+ cvtdq2ps m2, [src0q+lenq+mmsize]
+ cvtdq2ps m3, [src1q+lenq]
+ cvtdq2ps m4, [src1q+lenq+mmsize]
+ addps m1, m1, m3
+ addps m2, m2, m4
+ mulps m1, m1, m0
+ mulps m2, m2, m0
+ mova [dstq+lenq], m1
+ mova [dstq+lenq+mmsize], m2
+ add lenq, 2*mmsize
+ jl .loop
+ REP_RET
+%endmacro
+
+INIT_XMM sse2
+DITHER_INT_TO_FLOAT_TRIANGULAR
+INIT_YMM avx
+DITHER_INT_TO_FLOAT_TRIANGULAR

libav-v10.1.tar.bz2/libavresample/x86/dither_init.c Added

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "libavutil/cpu.h"
+#include "libavutil/x86/cpu.h"
+#include "libavresample/dither.h"
+
+void ff_quantize_sse2(int16_t *dst, const float *src, float *dither, int len);
+
+void ff_dither_int_to_float_rectangular_sse2(float *dst, int *src, int len);
+void ff_dither_int_to_float_rectangular_avx(float *dst, int *src, int len);
+
+void ff_dither_int_to_float_triangular_sse2(float *dst, int *src0, int len);
+void ff_dither_int_to_float_triangular_avx(float *dst, int *src0, int len);
+
+av_cold void ff_dither_init_x86(DitherDSPContext *ddsp,
+ enum AVResampleDitherMethod method)
+{
+ int cpu_flags = av_get_cpu_flags();
+
+ if (EXTERNAL_SSE2(cpu_flags)) {
+ ddsp->quantize = ff_quantize_sse2;
+ ddsp->ptr_align = 16;
+ ddsp->samples_align = 8;
+ }
+
+ if (method == AV_RESAMPLE_DITHER_RECTANGULAR) {
+ if (EXTERNAL_SSE2(cpu_flags)) {
+ ddsp->dither_int_to_float = ff_dither_int_to_float_rectangular_sse2;
+ }
+ if (EXTERNAL_AVX(cpu_flags)) {
+ ddsp->dither_int_to_float = ff_dither_int_to_float_rectangular_avx;
+ }
+ } else {
+ if (EXTERNAL_SSE2(cpu_flags)) {
+ ddsp->dither_int_to_float = ff_dither_int_to_float_triangular_sse2;
+ }
+ if (EXTERNAL_AVX(cpu_flags)) {
+ ddsp->dither_int_to_float = ff_dither_int_to_float_triangular_avx;
+ }
+ }
+}

libav-v10.1.tar.bz2/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 Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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);
+}

libav-v9.6.tar.bz2/libavutil/Makefile -> libav-v10.1.tar.bz2/libavutil/Makefile Changed

@@ -11,20 +11,24 @@
           base64.h                                                      \
           blowfish.h                                                    \
           bswap.h                                                       \
+          buffer.h                                                      \
           channel_layout.h                                              \
           common.h                                                      \
           cpu.h                                                         \
           crc.h                                                         \
+          downmix_info.h                                                \
           error.h                                                       \
           eval.h                                                        \
           fifo.h                                                        \
           file.h                                                        \
+          frame.h                                                       \
+          hmac.h                                                        \
           imgutils.h                                                    \
           intfloat.h                                                    \
-          intfloat_readwrite.h                                          \
           intreadwrite.h                                                \
           lfg.h                                                         \
           log.h                                                         \
+          macros.h                                                      \
           mathematics.h                                                 \
           md5.h                                                         \
           mem.h                                                         \
@@ -38,6 +42,7 @@
           rational.h                                                    \
           samplefmt.h                                                   \
           sha.h                                                         \
+          stereo3d.h                                                    \
           time.h                                                        \
           version.h                                                     \
           xtea.h                                                        \
@@ -53,21 +58,26 @@
 
 OBJS = adler32.o                                                        \
        aes.o                                                            \
+       atomic.o                                                         \
        audio_fifo.o                                                     \
        avstring.o                                                       \
        base64.o                                                         \
        blowfish.o                                                       \
+       buffer.o                                                         \
        channel_layout.o                                                 \
        cpu.o                                                            \
        crc.o                                                            \
        des.o                                                            \
+       downmix_info.o                                                   \
        error.o                                                          \
        eval.o                                                           \
        fifo.o                                                           \
        file.o                                                           \
+       file_open.o                                                      \
        float_dsp.o                                                      \
+       frame.o                                                          \
+       hmac.o                                                           \
        imgutils.o                                                       \
-       intfloat_readwrite.o                                             \
        intmath.o                                                        \
        lfg.o                                                            \
        lls.o                                                            \
@@ -85,6 +95,7 @@
        rc4.o                                                            \
        samplefmt.o                                                      \
        sha.o                                                            \
+       stereo3d.o                                                       \
        time.o                                                           \
        tree.o                                                           \
        utils.o                                                          \
@@ -96,8 +107,13 @@
 
 SKIPHEADERS          = old_pix_fmts.h
 
+SKIPHEADERS-$(HAVE_ATOMICS_GCC)        += atomic_gcc.h
+SKIPHEADERS-$(HAVE_ATOMICS_SUNCC)      += atomic_suncc.h
+SKIPHEADERS-$(HAVE_ATOMICS_WIN32)      += atomic_win32.h
+
 TESTPROGS = adler32                                                     \
             aes                                                         \
+            atomic                                                      \
             avstring                                                    \
             base64                                                      \
             blowfish                                                    \
@@ -106,6 +122,7 @@
             des                                                         \
             eval                                                        \
             fifo                                                        \
+            hmac                                                        \
             lfg                                                         \
             lls                                                         \
             md5                                                         \

libav-v10.1.tar.bz2/libavutil/aarch64 Added

libav-v10.1.tar.bz2/libavutil/aarch64/Makefile Added

libav-v10.1.tar.bz2/libavutil/aarch64/asm.S Added

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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
+EXTERN_ASM\name:
+ .endif
+ELF .type \name, %function
+ .func \name
+\name:
+.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

libav-v10.1.tar.bz2/libavutil/aarch64/bswap.h Added

@@ -0,0 +1,50 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 */

libav-v10.1.tar.bz2/libavutil/aarch64/cpu.c Added

@@ -0,0 +1,27 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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;
+}

libav-v10.1.tar.bz2/libavutil/aarch64/cpu.h Added

@@ -0,0 +1,29 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 */

libav-v10.1.tar.bz2/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 Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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

libav-v9.6.tar.bz2/libavutil/aes.c -> libav-v10.1.tar.bz2/libavutil/aes.c Changed

libav-v9.6.tar.bz2/libavutil/arm/asm.S -> libav-v10.1.tar.bz2/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
@@ -291,7 +302,7 @@
 .endm
 
 #if HAVE_VFP_ARGS
-        .eabi_attribute 28, 1
+ELF     .eabi_attribute 28, 1
 #   define VFP
 #   define NOVFP @
 #else

libav-v9.6.tar.bz2/libavutil/arm/cpu.c -> libav-v10.1.tar.bz2/libavutil/arm/cpu.c Changed

libav-v9.6.tar.bz2/libavutil/arm/cpu.h -> libav-v10.1.tar.bz2/libavutil/arm/cpu.h Changed

libav-v9.6.tar.bz2/libavutil/arm/float_dsp_arm.h -> libav-v10.1.tar.bz2/libavutil/arm/float_dsp_arm.h Changed

libav-v9.6.tar.bz2/libavutil/arm/float_dsp_init_arm.c -> libav-v10.1.tar.bz2/libavutil/arm/float_dsp_init_arm.c Changed

libav-v9.6.tar.bz2/libavutil/arm/float_dsp_init_neon.c -> libav-v10.1.tar.bz2/libavutil/arm/float_dsp_init_neon.c Changed

@@ -21,6 +21,7 @@
 
 #include <stdint.h>
 
+#include "libavutil/attributes.h"
 #include "libavutil/float_dsp.h"
 #include "float_dsp_arm.h"
 
@@ -32,9 +33,27 @@
 void ff_vector_fmul_scalar_neon(float *dst, const float *src, float mul,
 int len);
 
-void ff_float_dsp_init_neon(AVFloatDSPContext *fdsp)
+void ff_vector_fmul_window_neon(float *dst, const float *src0,
+ const float *src1, const float *win, int len);
+
+void ff_vector_fmul_add_neon(float *dst, const float *src0, const float *src1,
+ const float *src2, int len);
+
+void ff_vector_fmul_reverse_neon(float *dst, const float *src0,
+ const float *src1, int len);
+
+void ff_butterflies_float_neon(float *v1, float *v2, int len);
+
+float ff_scalarproduct_float_neon(const float *v1, const float *v2, int len);
+
+av_cold void ff_float_dsp_init_neon(AVFloatDSPContext *fdsp)
 {
 fdsp->vector_fmul = ff_vector_fmul_neon;
 fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_neon;
 fdsp->vector_fmul_scalar = ff_vector_fmul_scalar_neon;
+ fdsp->vector_fmul_window = ff_vector_fmul_window_neon;
+ fdsp->vector_fmul_add = ff_vector_fmul_add_neon;
+ fdsp->vector_fmul_reverse = ff_vector_fmul_reverse_neon;
+ fdsp->butterflies_float = ff_butterflies_float_neon;
+ fdsp->scalarproduct_float = ff_scalarproduct_float_neon;
 }

libav-v9.6.tar.bz2/libavutil/arm/float_dsp_init_vfp.c -> libav-v10.1.tar.bz2/libavutil/arm/float_dsp_init_vfp.c Changed

libav-v9.6.tar.bz2/libavutil/arm/float_dsp_neon.S -> libav-v10.1.tar.bz2/libavutil/arm/float_dsp_neon.S Changed

@@ -146,3 +146,126 @@
         bx              lr
         .unreq          len
 endfunc
+
+function ff_vector_fmul_window_neon, export=1
+        push            {r4,r5,lr}
+        ldr             lr,  [sp, #12]
+        sub             r2,  r2,  #8
+        sub             r5,  lr,  #2
+        add             r2,  r2,  r5, lsl #2
+        add             r4,  r3,  r5, lsl #3
+        add             ip,  r0,  r5, lsl #3
+        mov             r5,  #-16
+        vld1.32         {d0,d1},  [r1,:128]!
+        vld1.32         {d2,d3},  [r2,:128], r5
+        vld1.32         {d4,d5},  [r3,:128]!
+        vld1.32         {d6,d7},  [r4,:128], r5
+1:      subs            lr,  lr,  #4
+        vmul.f32        d22, d0,  d4
+        vrev64.32       q3,  q3
+        vmul.f32        d23, d1,  d5
+        vrev64.32       q1,  q1
+        vmul.f32        d20, d0,  d7
+        vmul.f32        d21, d1,  d6
+        beq             2f
+        vmla.f32        d22, d3,  d7
+        vld1.32         {d0,d1},  [r1,:128]!
+        vmla.f32        d23, d2,  d6
+        vld1.32         {d18,d19},[r2,:128], r5
+        vmls.f32        d20, d3,  d4
+        vld1.32         {d24,d25},[r3,:128]!
+        vmls.f32        d21, d2,  d5
+        vld1.32         {d6,d7},  [r4,:128], r5
+        vmov            q1,  q9
+        vrev64.32       q11, q11
+        vmov            q2,  q12
+        vswp            d22, d23
+        vst1.32         {d20,d21},[r0,:128]!
+        vst1.32         {d22,d23},[ip,:128], r5
+        b               1b
+2:      vmla.f32        d22, d3,  d7
+        vmla.f32        d23, d2,  d6
+        vmls.f32        d20, d3,  d4
+        vmls.f32        d21, d2,  d5
+        vrev64.32       q11, q11
+        vswp            d22, d23
+        vst1.32         {d20,d21},[r0,:128]!
+        vst1.32         {d22,d23},[ip,:128], r5
+        pop             {r4,r5,pc}
+endfunc
+
+function ff_vector_fmul_add_neon, export=1
+        ldr             r12, [sp]
+        vld1.32         {q0-q1},  [r1,:128]!
+        vld1.32         {q8-q9},  [r2,:128]!
+        vld1.32         {q2-q3},  [r3,:128]!
+        vmul.f32        q10, q0,  q8
+        vmul.f32        q11, q1,  q9
+1:      vadd.f32        q12, q2,  q10
+        vadd.f32        q13, q3,  q11
+        pld             [r1, #16]
+        pld             [r2, #16]
+        pld             [r3, #16]
+        subs            r12, r12, #8
+        beq             2f
+        vld1.32         {q0},     [r1,:128]!
+        vld1.32         {q8},     [r2,:128]!
+        vmul.f32        q10, q0,  q8
+        vld1.32         {q1},     [r1,:128]!
+        vld1.32         {q9},     [r2,:128]!
+        vmul.f32        q11, q1,  q9
+        vld1.32         {q2-q3},  [r3,:128]!
+        vst1.32         {q12-q13},[r0,:128]!
+        b               1b
+2:      vst1.32         {q12-q13},[r0,:128]!
+        bx              lr
+endfunc
+
+function ff_vector_fmul_reverse_neon, export=1
+        add             r2,  r2,  r3,  lsl #2
+        sub             r2,  r2,  #32
+        mov             r12, #-32
+        vld1.32         {q0-q1},  [r1,:128]!
+        vld1.32         {q2-q3},  [r2,:128], r12
+1:      pld             [r1, #32]
+        vrev64.32       q3,  q3
+        vmul.f32        d16, d0,  d7
+        vmul.f32        d17, d1,  d6
+        pld             [r2, #-32]
+        vrev64.32       q2,  q2
+        vmul.f32        d18, d2,  d5
+        vmul.f32        d19, d3,  d4
+        subs            r3,  r3,  #8
+        beq             2f
+        vld1.32         {q0-q1},  [r1,:128]!
+        vld1.32         {q2-q3},  [r2,:128], r12
+        vst1.32         {q8-q9},  [r0,:128]!
+        b               1b
+2:      vst1.32         {q8-q9},  [r0,:128]!
+        bx              lr
+endfunc
+
+function ff_butterflies_float_neon, export=1
+1:      vld1.32         {q0},[r0,:128]
+        vld1.32         {q1},[r1,:128]
+        vsub.f32        q2,  q0,  q1
+        vadd.f32        q1,  q0,  q1
+        vst1.32         {q2},[r1,:128]!
+        vst1.32         {q1},[r0,:128]!
+        subs            r2,  r2,  #4
+        bgt             1b
+        bx              lr
+endfunc
+
+function ff_scalarproduct_float_neon, export=1
+        vmov.f32        q2,  #0.0
+1:      vld1.32         {q0},[r0,:128]!
+        vld1.32         {q1},[r1,:128]!
+        vmla.f32        q2,  q0,  q1
+        subs            r2,  r2,  #4
+        bgt             1b
+        vadd.f32        d0,  d4,  d5
+        vpadd.f32       d0,  d0,  d0
+NOVFP   vmov.32         r0,  d0[0]
+        bx              lr
+endfunc

libav-v9.6.tar.bz2/libavutil/arm/float_dsp_vfp.S -> libav-v10.1.tar.bz2/libavutil/arm/float_dsp_vfp.S Changed

@@ -66,3 +66,72 @@
         vpop            {d8-d15}
         bx              lr
 endfunc
+
+/**
+ * ARM VFP optimized implementation of 'vector_fmul_reverse_c' function.
+ * Assume that len is a positive number and is multiple of 8
+ */
+@ void ff_vector_fmul_reverse_vfp(float *dst, const float *src0,
+@                                 const float *src1, int len)
+function ff_vector_fmul_reverse_vfp, export=1
+        vpush           {d8-d15}
+        add             r2,  r2,  r3, lsl #2
+        vldmdb          r2!, {s0-s3}
+        vldmia          r1!, {s8-s11}
+        vldmdb          r2!, {s4-s7}
+        vldmia          r1!, {s12-s15}
+        vmul.f32        s8,  s3,  s8
+        vmul.f32        s9,  s2,  s9
+        vmul.f32        s10, s1,  s10
+        vmul.f32        s11, s0,  s11
+1:
+        subs            r3,  r3,  #16
+        it              ge
+        vldmdbge        r2!, {s16-s19}
+        vmul.f32        s12, s7,  s12
+        it              ge
+        vldmiage        r1!, {s24-s27}
+        vmul.f32        s13, s6,  s13
+        it              ge
+        vldmdbge        r2!, {s20-s23}
+        vmul.f32        s14, s5,  s14
+        it              ge
+        vldmiage        r1!, {s28-s31}
+        vmul.f32        s15, s4,  s15
+        it              ge
+        vmulge.f32      s24, s19, s24
+        it              gt
+        vldmdbgt        r2!, {s0-s3}
+        it              ge
+        vmulge.f32      s25, s18, s25
+        vstmia          r0!, {s8-s13}
+        it              ge
+        vmulge.f32      s26, s17, s26
+        it              gt
+        vldmiagt        r1!, {s8-s11}
+        itt             ge
+        vmulge.f32      s27, s16, s27
+        vmulge.f32      s28, s23, s28
+        it              gt
+        vldmdbgt        r2!, {s4-s7}
+        it              ge
+        vmulge.f32      s29, s22, s29
+        vstmia          r0!, {s14-s15}
+        ittt            ge
+        vmulge.f32      s30, s21, s30
+        vmulge.f32      s31, s20, s31
+        vmulge.f32      s8,  s3,  s8
+        it              gt
+        vldmiagt        r1!, {s12-s15}
+        itttt           ge
+        vmulge.f32      s9,  s2,  s9
+        vmulge.f32      s10, s1,  s10
+        vstmiage        r0!, {s24-s27}
+        vmulge.f32      s11, s0,  s11
+        it              ge
+        vstmiage        r0!, {s28-s31}
+        bgt             1b
+
+        vpop            {d8-d15}
+        bx              lr
+endfunc

libav-v10.1.tar.bz2/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 Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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

libav-v10.1.tar.bz2/libavutil/atomic.c Added

@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2012 Ronald S. Bultje <rsbultje@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "atomic.h"
+
+#if !HAVE_ATOMICS_NATIVE
+
+#if HAVE_PTHREADS
+
+#include <pthread.h>
+
+static pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER;
+
+int avpriv_atomic_int_get(volatile int *ptr)
+{
+ int res;
+
+ pthread_mutex_lock(&atomic_lock);
+ res = *ptr;
+ pthread_mutex_unlock(&atomic_lock);
+
+ return res;
+}
+
+void avpriv_atomic_int_set(volatile int *ptr, int val)
+{
+ pthread_mutex_lock(&atomic_lock);
+ *ptr = val;
+ pthread_mutex_unlock(&atomic_lock);
+}
+
+int avpriv_atomic_int_add_and_fetch(volatile int *ptr, int inc)
+{
+ int res;
+
+ pthread_mutex_lock(&atomic_lock);
+ *ptr += inc;
+ res = *ptr;
+ pthread_mutex_unlock(&atomic_lock);
+
+ return res;
+}
+
+void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval)
+{
+ void *ret;
+ pthread_mutex_lock(&atomic_lock);
+ ret = *ptr;
+ if (*ptr == oldval)
+ *ptr = newval;
+ pthread_mutex_unlock(&atomic_lock);
+ return ret;
+}
+
+#elif !HAVE_THREADS
+
+int avpriv_atomic_int_get(volatile int *ptr)
+{
+ return *ptr;
+}
+
+void avpriv_atomic_int_set(volatile int *ptr, int val)
+{
+ *ptr = val;
+}
+
+int avpriv_atomic_int_add_and_fetch(volatile int *ptr, int inc)
+{
+ *ptr += inc;
+ return *ptr;
+}
+
+void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval)
+{
+ if (*ptr == oldval) {
+ *ptr = newval;
+ return oldval;
+ }
+ return *ptr;
+}
+
+#else
+
+#error "Threading is enabled, but there is no implementation of atomic operations available"
+
+#endif /* HAVE_PTHREADS */
+
+#endif /* !HAVE_ATOMICS_NATIVE */
+
+#ifdef TEST
+#include <assert.h>
+
+int main(void)
+{
+ volatile int val = 1;
+ int res;
+
+ res = avpriv_atomic_int_add_and_fetch(&val, 1);
+ assert(res == 2);
+ avpriv_atomic_int_set(&val, 3);
+ res = avpriv_atomic_int_get(&val);
+ assert(res == 3);
+
+ return 0;
+}
+#endif

libav-v10.1.tar.bz2/libavutil/atomic.h Added

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2012 Ronald S. Bultje <rsbultje@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_ATOMIC_H
+#define AVUTIL_ATOMIC_H
+
+#include "config.h"
+
+#if HAVE_ATOMICS_NATIVE
+
+#if HAVE_ATOMICS_GCC
+#include "atomic_gcc.h"
+#elif HAVE_ATOMICS_WIN32
+#include "atomic_win32.h"
+#elif HAVE_ATOMICS_SUNCC
+#include "atomic_suncc.h"
+#endif
+
+#else
+
+/**
+ * Load the current value stored in an atomic integer.
+ *
+ * @param ptr atomic integer
+ * @return the current value of the atomic integer
+ * @note This acts as a memory barrier.
+ */
+int avpriv_atomic_int_get(volatile int *ptr);
+
+/**
+ * Store a new value in an atomic integer.
+ *
+ * @param ptr atomic integer
+ * @param val the value to store in the atomic integer
+ * @note This acts as a memory barrier.
+ */
+void avpriv_atomic_int_set(volatile int *ptr, int val);
+
+/**
+ * Add a value to an atomic integer.
+ *
+ * @param ptr atomic integer
+ * @param inc the value to add to the atomic integer (may be negative)
+ * @return the new value of the atomic integer.
+ * @note This does NOT act as a memory barrier. This is primarily
+ * intended for reference counting.
+ */
+int avpriv_atomic_int_add_and_fetch(volatile int *ptr, int inc);
+
+/**
+ * Atomic pointer compare and swap.
+ *
+ * @param ptr pointer to the pointer to operate on
+ * @param oldval do the swap if the current value of *ptr equals to oldval
+ * @param newval value to replace *ptr with
+ * @return the value of *ptr before comparison
+ */
+void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval);
+
+#endif /* HAVE_ATOMICS_NATIVE */
+
+#endif /* AVUTIL_ATOMIC_H */

libav-v10.1.tar.bz2/libavutil/atomic_gcc.h Added

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2012 Ronald S. Bultje <rsbultje@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_ATOMIC_GCC_H
+#define AVUTIL_ATOMIC_GCC_H
+
+#include <stdint.h>
+
+#include "atomic.h"
+
+#define avpriv_atomic_int_get atomic_int_get_gcc
+static inline int atomic_int_get_gcc(volatile int *ptr)
+{
+ __sync_synchronize();
+ return *ptr;
+}
+
+#define avpriv_atomic_int_set atomic_int_set_gcc
+static inline void atomic_int_set_gcc(volatile int *ptr, int val)
+{
+ *ptr = val;
+ __sync_synchronize();
+}
+
+#define avpriv_atomic_int_add_and_fetch atomic_int_add_and_fetch_gcc
+static inline int atomic_int_add_and_fetch_gcc(volatile int *ptr, int inc)
+{
+ return __sync_add_and_fetch(ptr, inc);
+}
+
+#define avpriv_atomic_ptr_cas atomic_ptr_cas_gcc
+static inline void *atomic_ptr_cas_gcc(void * volatile *ptr,
+ void *oldval, void *newval)
+{
+#ifdef __ARMCC_VERSION
+ // armcc will throw an error if ptr is not an integer type
+ volatile uintptr_t *tmp = (volatile uintptr_t*)ptr;
+ return (void*)__sync_val_compare_and_swap(tmp, oldval, newval);
+#else
+ return __sync_val_compare_and_swap(ptr, oldval, newval);
+#endif
+}
+
+#endif /* AVUTIL_ATOMIC_GCC_H */

libav-v10.1.tar.bz2/libavutil/atomic_suncc.h Added

@@ -0,0 +1,55 @@
+/*
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_ATOMIC_SUNCC_H
+#define AVUTIL_ATOMIC_SUNCC_H
+
+#include <atomic.h>
+#include <mbarrier.h>
+
+#include "atomic.h"
+
+#define avpriv_atomic_int_get atomic_int_get_suncc
+static inline int atomic_int_get_suncc(volatile int *ptr)
+{
+ __machine_rw_barrier();
+ return *ptr;
+}
+
+#define avpriv_atomic_int_set atomic_int_set_suncc
+static inline void atomic_int_set_suncc(volatile int *ptr, int val)
+{
+ *ptr = val;
+ __machine_rw_barrier();
+}
+
+#define avpriv_atomic_int_add_and_fetch atomic_int_add_and_fetch_suncc
+static inline int atomic_int_add_and_fetch_suncc(volatile int *ptr, int inc)
+{
+ return atomic_add_int_nv(ptr, inc);
+}
+
+#define avpriv_atomic_ptr_cas atomic_ptr_cas_suncc
+static inline void *atomic_ptr_cas_suncc(void * volatile *ptr,
+ void *oldval, void *newval)
+{
+ return atomic_cas_ptr(ptr, oldval, newval);
+}
+
+#endif /* AVUTIL_ATOMIC_SUNCC_H */

libav-v10.1.tar.bz2/libavutil/atomic_win32.h Added

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2012 Ronald S. Bultje <rsbultje@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_ATOMIC_WIN32_H
+#define AVUTIL_ATOMIC_WIN32_H
+
+#include <windows.h>
+
+#include "atomic.h"
+
+#define avpriv_atomic_int_get atomic_int_get_win32
+static inline int atomic_int_get_win32(volatile int *ptr)
+{
+ MemoryBarrier();
+ return *ptr;
+}
+
+#define avpriv_atomic_int_set atomic_int_set_win32
+static inline void atomic_int_set_win32(volatile int *ptr, int val)
+{
+ *ptr = val;
+ MemoryBarrier();
+}
+
+#define avpriv_atomic_int_add_and_fetch atomic_int_add_and_fetch_win32
+static inline int atomic_int_add_and_fetch_win32(volatile int *ptr, int inc)
+{
+ return inc + InterlockedExchangeAdd(ptr, inc);
+}
+
+#define avpriv_atomic_ptr_cas atomic_ptr_cas_win32
+static inline void *atomic_ptr_cas_win32(void * volatile *ptr,
+ void *oldval, void *newval)
+{
+ return InterlockedCompareExchangePointer(ptr, newval, oldval);
+}
+
+#endif /* AVUTIL_ATOMIC_WIN32_H */

libav-v9.6.tar.bz2/libavutil/attributes.h -> libav-v10.1.tar.bz2/libavutil/attributes.h Changed

libav-v9.6.tar.bz2/libavutil/avstring.c -> libav-v10.1.tar.bz2/libavutil/avstring.c Changed

@@ -23,11 +23,11 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
-#include "avstring.h"
+
 #include "config.h"
 #include "common.h"
 #include "mem.h"
+#include "avstring.h"
 
 int av_strstart(const char *str, const char *pfx, const char **ptr)
 {
@@ -42,7 +42,7 @@
 
 int av_stristart(const char *str, const char *pfx, const char **ptr)
 {
- while (*pfx && toupper((unsigned)*pfx) == toupper((unsigned)*str)) {
+ while (*pfx && av_toupper((unsigned)*pfx) == av_toupper((unsigned)*str)) {
 pfx++;
 str++;
 }
@@ -56,11 +56,25 @@
 if (!*s2)
 return s1;
 
- do {
+ do
 if (av_stristart(s1, s2, NULL))
 return s1;
- } while (*s1++);
+ while (*s1++);
+
+ return NULL;
+}
 
+char *av_strnstr(const char *haystack, const char *needle, size_t hay_length)
+{
+ size_t needle_len = strlen(needle);
+ if (!needle_len)
+ return haystack;
+ while (hay_length >= needle_len) {
+ hay_length--;
+ if (!memcmp(haystack, needle, needle_len))
+ return haystack;
+ haystack++;
+ }
 return NULL;
 }
 
@@ -96,8 +110,9 @@
 
 char *av_d2str(double d)
 {
- char *str= av_malloc(16);
- if(str) snprintf(str, 16, "%f", d);
+ char *str = av_malloc(16);
+ if (str)
+ snprintf(str, 16, "%f", d);
 return str;
 }
 
@@ -105,32 +120,33 @@
 
 char *av_get_token(const char **buf, const char *term)
 {
- char *out = av_malloc(strlen(*buf) + 1);
- char *ret= out, *end= out;
+ char *out = av_malloc(strlen(*buf) + 1);
+ char *ret = out, *end = out;
 const char *p = *buf;
- if (!out) return NULL;
+ if (!out)
+ return NULL;
 p += strspn(p, WHITESPACES);
 
- while(*p && !strspn(p, term)) {
+ while (*p && !strspn(p, term)) {
 char c = *p++;
- if(c == '\\' && *p){
+ if (c == '\\' && *p) {
 *out++ = *p++;
- end= out;
- }else if(c == '\''){
- while(*p && *p != '\'')
+ end = out;
+ } else if (c == '\'') {
+ while (*p && *p != '\'')
 *out++ = *p++;
- if(*p){
+ if (*p) {
 p++;
- end= out;
+ end = out;
 }
- }else{
+ } else {
 *out++ = c;
 }
 }
 
- do{
+ do
 *out-- = 0;
- }while(out >= end && strspn(out, WHITESPACES));
+ while (out >= end && strspn(out, WHITESPACES));
 
 *buf = p;
 
@@ -196,54 +212,71 @@
 return path;
 }
 
+int av_isdigit(int c)
+{
+ return c >= '0' && c <= '9';
+}
 
-#ifdef TEST
+int av_isgraph(int c)
+{
+ return c > 32 && c < 127;
+}
 
-#include "common.h"
+int av_isspace(int c)
+{
+ return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' ||
+ c == '\v';
+}
+
+int av_isxdigit(int c)
+{
+ c = av_tolower(c);
+ return av_isdigit(c) || (c >= 'a' && c <= 'f');
+}
+
+#ifdef TEST
 
 int main(void)
 {
 int i;
+ const char *strings[] = {
+ "''",
+ "",
+ ":",
+ "\\",
+ "'",
+ " '' :",
+ " '' '' :",
+ "foo '' :",
+ "'foo'",
+ "foo ",
+ " ' foo ' ",
+ "foo\\",
+ "foo': blah:blah",
+ "foo\\: blah:blah",
+ "foo\'",
+ "'foo : ' :blahblah",
+ "\\ :blah",
+ " foo",
+ " foo ",
+ " foo \\ ",
+ "foo ':blah",
+ " foo bar : blahblah",
+ "\\f\\o\\o",
+ "'foo : \\ \\ ' : blahblah",
+ "'\\fo\\o:': blahblah",
+ "\\'fo\\o\\:': foo ' :blahblah"
+ };
 
 printf("Testing av_get_token()\n");
- {
- const char *strings[] = {
- "''",
- "",
- ":",
- "\\",
- "'",
- " '' :",
- " '' '' :",
- "foo '' :",
- "'foo'",
- "foo ",
- " ' foo ' ",
- "foo\\",
- "foo': blah:blah",
- "foo\\: blah:blah",
- "foo\'",
- "'foo : ' :blahblah",
- "\\ :blah",
- " foo",
- " foo ",
- " foo \\ ",
- "foo ':blah",
- " foo bar : blahblah",
- "\\f\\o\\o",
- "'foo : \\ \\ ' : blahblah",
- "'\\fo\\o:': blahblah",
- "\\'fo\\o\\:': foo ' :blahblah"
- };
-
- for (i=0; i < FF_ARRAY_ELEMS(strings); i++) {
- const char *p = strings[i], *q;
- printf("|%s|", p);
- q = av_get_token(&p, ":");
- printf(" -> |%s|", q);
- printf(" + |%s|\n", p);
- av_free(q);
- }
+ for (i = 0; i < FF_ARRAY_ELEMS(strings); i++) {
+ const char *p = strings[i];
+ char *q;
+ printf("|%s|", p);
+ q = av_get_token(&p, ":");
+ printf(" -> |%s|", q);
+ printf(" + |%s|\n", p);
+ av_free(q);
 }
 
 return 0;

libav-v9.6.tar.bz2/libavutil/avstring.h -> libav-v10.1.tar.bz2/libavutil/avstring.h Changed

@@ -67,6 +67,21 @@
 char *av_stristr(const char *haystack, const char *needle);
 
 /**
+ * Locate the first occurrence of the string needle in the string haystack
+ * where not more than hay_length characters are searched. A zero-length
+ * string needle is considered to match at the start of haystack.
+ *
+ * This function is a length-limited version of the standard strstr().
+ *
+ * @param haystack   string to search in
+ * @param needle     string to search for
+ * @param hay_length length of string to search in
+ * @return           pointer to the located match within haystack
+ *                   or a null pointer if no match
+ */
+char *av_strnstr(const char *haystack, const char *needle, size_t hay_length);
+
+/**
  * Copy the string src to dst, but no more than size - 1 bytes, and
  * null-terminate dst.
  *
@@ -137,6 +152,21 @@
 char *av_get_token(const char **buf, const char *term);
 
 /**
+ * Locale-independent conversion of ASCII isdigit.
+ */
+int av_isdigit(int c);
+
+/**
+ * Locale-independent conversion of ASCII isgraph.
+ */
+int av_isgraph(int c);
+
+/**
+ * Locale-independent conversion of ASCII isspace.
+ */
+int av_isspace(int c);
+
+/**
  * Locale-independent conversion of ASCII characters to uppercase.
  */
 static inline int av_toupper(int c)
@@ -156,6 +186,11 @@
     return c;
 }
 
+/**
+ * Locale-independent conversion of ASCII isxdigit.
+ */
+int av_isxdigit(int c);
+
 /*
  * Locale-independent case-insensitive compare.
  * @note This means only ASCII-range characters are case-insensitive

libav-v9.6.tar.bz2/libavutil/avutil.h -> libav-v10.1.tar.bz2/libavutil/avutil.h Changed

@@ -35,12 +35,45 @@
 * provided by Libav.
 *
 * @li @ref libavc "libavcodec" encoding/decoding library
- * @li @subpage libavfilter graph based frame editing library
+ * @li @ref lavfi "libavfilter" graph-based frame editing library
 * @li @ref libavf "libavformat" I/O and muxing/demuxing library
 * @li @ref lavd "libavdevice" special devices muxing/demuxing library
 * @li @ref lavu "libavutil" common utility library
 * @li @ref lavr "libavresample" audio resampling, format conversion and mixing
- * @li @subpage libswscale color conversion and scaling library
+ * @li @ref libsws "libswscale" color conversion and scaling library
+ *
+ * @section libav_versioning Versioning and compatibility
+ *
+ * Each of the Libav libraries contains a version.h header, which defines a
+ * major, minor and micro version number with the
+ * LIBRARYNAME_VERSION_{MAJOR,MINOR,MICRO} macros. The major version
+ * number is incremented with backward incompatible changes - e.g. removing
+ * parts of the public API, reordering public struct members, etc. The minor
+ * version number is incremented for backward compatible API changes or major
+ * new features - e.g. adding a new public function or a new decoder. The micro
+ * version number is incremented for smaller changes that a calling program
+ * might still want to check for - e.g. changing behavior in a previously
+ * unspecified situation.
+ *
+ * Libav guarantees backward API and ABI compatibility for each library as long
+ * as its major version number is unchanged. This means that no public symbols
+ * will be removed or renamed. Types and names of the public struct members and
+ * values of public macros and enums will remain the same (unless they were
+ * explicitly declared as not part of the public API). Documented behavior will
+ * not change.
+ *
+ * In other words, any correct program that works with a given Libav snapshot
+ * should work just as well without any changes with any later snapshot with the
+ * same major versions. This applies to both rebuilding the program against new
+ * Libav versions or to replacing the dynamic Libav libraries that a program
+ * links against.
+ *
+ * However, new public symbols may be added and new members may be appended to
+ * public structs whose size is not part of public ABI (most public structs in
+ * Libav). New macros and enum values may be added. Behavior in undocumented
+ * situations may change slightly (and be documented). All those are accompanied
+ * by an entry in doc/APIchanges and incrementing either the minor or micro
+ * version number.
 */
 
 /**
@@ -94,6 +127,12 @@
 *
 * @}
 *
+ * @defgroup lavu_log Logging Facility
+ *
+ * @{
+ *
+ * @}
+ *
 * @defgroup lavu_misc Other
 *
 * @{
@@ -105,46 +144,15 @@
 * @{
 *
 * @}
- */
-
-
-/**
- * @defgroup preproc_misc Preprocessor String Macros
 *
- * String manipulation macros
+ * @defgroup preproc_misc Preprocessor String 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)
-
-/**
- * @}
- */
-
-/**
- * @defgroup version_utils Library Version Macros
 *
- * Useful to check and match library version in order to maintain
- * backward compatibility.
- *
- * @{
- */
-
-#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
-#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
-#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
-
-/**
 * @}
 */
 
+
 /**
 * @addtogroup lavu_ver
 * @{
@@ -266,6 +274,7 @@
 
 #include "error.h"
 #include "version.h"
+#include "macros.h"
 
 /**
 * @}

libav-v9.6.tar.bz2/libavutil/base64.c -> libav-v10.1.tar.bz2/libavutil/base64.c Changed

libav-v9.6.tar.bz2/libavutil/blowfish.c -> libav-v10.1.tar.bz2/libavutil/blowfish.c Changed

libav-v9.6.tar.bz2/libavutil/bswap.h -> libav-v10.1.tar.bz2/libavutil/bswap.h Changed

libav-v10.1.tar.bz2/libavutil/buffer.c Added

@@ -0,0 +1,337 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+#include <string.h>
+
+#include "atomic.h"
+#include "buffer_internal.h"
+#include "common.h"
+#include "mem.h"
+
+AVBufferRef *av_buffer_create(uint8_t *data, int size,
+ void (*free)(void *opaque, uint8_t *data),
+ void *opaque, int flags)
+{
+ AVBufferRef *ref = NULL;
+ AVBuffer *buf = NULL;
+
+ buf = av_mallocz(sizeof(*buf));
+ if (!buf)
+ return NULL;
+
+ buf->data = data;
+ buf->size = size;
+ buf->free = free ? free : av_buffer_default_free;
+ buf->opaque = opaque;
+ buf->refcount = 1;
+
+ if (flags & AV_BUFFER_FLAG_READONLY)
+ buf->flags |= BUFFER_FLAG_READONLY;
+
+ ref = av_mallocz(sizeof(*ref));
+ if (!ref) {
+ av_freep(&buf);
+ return NULL;
+ }
+
+ ref->buffer = buf;
+ ref->data = data;
+ ref->size = size;
+
+ return ref;
+}
+
+void av_buffer_default_free(void *opaque, uint8_t *data)
+{
+ av_free(data);
+}
+
+AVBufferRef *av_buffer_alloc(int size)
+{
+ AVBufferRef *ret = NULL;
+ uint8_t *data = NULL;
+
+ data = av_malloc(size);
+ if (!data)
+ return NULL;
+
+ ret = av_buffer_create(data, size, av_buffer_default_free, NULL, 0);
+ if (!ret)
+ av_freep(&data);
+
+ return ret;
+}
+
+AVBufferRef *av_buffer_allocz(int size)
+{
+ AVBufferRef *ret = av_buffer_alloc(size);
+ if (!ret)
+ return NULL;
+
+ memset(ret->data, 0, size);
+ return ret;
+}
+
+AVBufferRef *av_buffer_ref(AVBufferRef *buf)
+{
+ AVBufferRef *ret = av_mallocz(sizeof(*ret));
+
+ if (!ret)
+ return NULL;
+
+ *ret = *buf;
+
+ avpriv_atomic_int_add_and_fetch(&buf->buffer->refcount, 1);
+
+ return ret;
+}
+
+void av_buffer_unref(AVBufferRef **buf)
+{
+ AVBuffer *b;
+
+ if (!buf || !*buf)
+ return;
+ b = (*buf)->buffer;
+ av_freep(buf);
+
+ if (!avpriv_atomic_int_add_and_fetch(&b->refcount, -1)) {
+ b->free(b->opaque, b->data);
+ av_freep(&b);
+ }
+}
+
+int av_buffer_is_writable(const AVBufferRef *buf)
+{
+ if (buf->buffer->flags & AV_BUFFER_FLAG_READONLY)
+ return 0;
+
+ return avpriv_atomic_int_add_and_fetch(&buf->buffer->refcount, 0) == 1;
+}
+
+int av_buffer_make_writable(AVBufferRef **pbuf)
+{
+ AVBufferRef *newbuf, *buf = *pbuf;
+
+ if (av_buffer_is_writable(buf))
+ return 0;
+
+ newbuf = av_buffer_alloc(buf->size);
+ if (!newbuf)
+ return AVERROR(ENOMEM);
+
+ memcpy(newbuf->data, buf->data, buf->size);
+ av_buffer_unref(pbuf);
+ *pbuf = newbuf;
+
+ return 0;
+}
+
+int av_buffer_realloc(AVBufferRef **pbuf, int size)
+{
+ AVBufferRef *buf = *pbuf;
+ uint8_t *tmp;
+
+ if (!buf) {
+ /* allocate a new buffer with av_realloc(), so it will be reallocatable
+ * later */
+ uint8_t *data = av_realloc(NULL, size);
+ if (!data)
+ return AVERROR(ENOMEM);
+
+ buf = av_buffer_create(data, size, av_buffer_default_free, NULL, 0);
+ if (!buf) {
+ av_freep(&data);
+ return AVERROR(ENOMEM);
+ }
+
+ buf->buffer->flags |= BUFFER_FLAG_REALLOCATABLE;
+ *pbuf = buf;
+
+ return 0;
+ } else if (buf->size == size)
+ return 0;
+
+ if (!(buf->buffer->flags & BUFFER_FLAG_REALLOCATABLE) ||
+ !av_buffer_is_writable(buf)) {
+ /* cannot realloc, allocate a new reallocable buffer and copy data */
+ AVBufferRef *new = NULL;
+
+ av_buffer_realloc(&new, size);
+ if (!new)
+ return AVERROR(ENOMEM);
+
+ memcpy(new->data, buf->data, FFMIN(size, buf->size));
+
+ av_buffer_unref(pbuf);
+ *pbuf = new;
+ return 0;
+ }
+
+ tmp = av_realloc(buf->buffer->data, size);
+ if (!tmp)
+ return AVERROR(ENOMEM);
+
+ buf->buffer->data = buf->data = tmp;
+ buf->buffer->size = buf->size = size;
+ return 0;
+}
+
+AVBufferPool *av_buffer_pool_init(int size, AVBufferRef* (*alloc)(int size))
+{
+ AVBufferPool *pool = av_mallocz(sizeof(*pool));
+ if (!pool)
+ return NULL;
+
+ pool->size = size;
+ pool->alloc = alloc ? alloc : av_buffer_alloc;
+
+ avpriv_atomic_int_set(&pool->refcount, 1);
+
+ return pool;
+}
+
+/*
+ * This function gets called when the pool has been uninited and
+ * all the buffers returned to it.
+ */
+static void buffer_pool_free(AVBufferPool *pool)
+{
+ while (pool->pool) {
+ BufferPoolEntry *buf = pool->pool;
+ pool->pool = buf->next;
+
+ buf->free(buf->opaque, buf->data);
+ av_freep(&buf);
+ }
+ av_freep(&pool);
+}
+
+void av_buffer_pool_uninit(AVBufferPool **ppool)
+{
+ AVBufferPool *pool;
+
+ if (!ppool || !*ppool)
+ return;
+ pool = *ppool;
+ *ppool = NULL;
+
+ if (!avpriv_atomic_int_add_and_fetch(&pool->refcount, -1))
+ buffer_pool_free(pool);
+}
+
+/* remove the whole buffer list from the pool and return it */
+static BufferPoolEntry *get_pool(AVBufferPool *pool)
+{
+ BufferPoolEntry *cur = NULL, *last = NULL;
+
+ do {
+ FFSWAP(BufferPoolEntry*, cur, last);
+ cur = avpriv_atomic_ptr_cas((void * volatile *)&pool->pool, last, NULL);
+ if (!cur)
+ return NULL;
+ } while (cur != last);
+
+ return cur;
+}
+
+static void add_to_pool(BufferPoolEntry *buf)
+{
+ AVBufferPool *pool;
+ BufferPoolEntry *cur, *end = buf;
+
+ if (!buf)
+ return;
+ pool = buf->pool;
+
+ while (end->next)
+ end = end->next;
+
+ while ((cur = avpriv_atomic_ptr_cas((void * volatile *)&pool->pool, NULL, buf))) {
+ /* pool is not empty, retrieve it and append it to our list */
+ cur = get_pool(pool);
+ end->next = cur;
+ while (end->next)
+ end = end->next;
+ }
+}
+
+static void pool_release_buffer(void *opaque, uint8_t *data)
+{
+ BufferPoolEntry *buf = opaque;
+ AVBufferPool *pool = buf->pool;
+ add_to_pool(buf);
+ if (!avpriv_atomic_int_add_and_fetch(&pool->refcount, -1))
+ buffer_pool_free(pool);
+}
+
+/* allocate a new buffer and override its free() callback so that
+ * it is returned to the pool on free */
+static AVBufferRef *pool_alloc_buffer(AVBufferPool *pool)
+{
+ BufferPoolEntry *buf;
+ AVBufferRef *ret;
+
+ ret = pool->alloc(pool->size);
+ if (!ret)
+ return NULL;
+
+ buf = av_mallocz(sizeof(*buf));
+ if (!buf) {
+ av_buffer_unref(&ret);
+ return NULL;
+ }
+
+ buf->data = ret->buffer->data;
+ buf->opaque = ret->buffer->opaque;
+ buf->free = ret->buffer->free;
+ buf->pool = pool;
+
+ ret->buffer->opaque = buf;
+ ret->buffer->free = pool_release_buffer;
+
+ avpriv_atomic_int_add_and_fetch(&pool->refcount, 1);
+
+ return ret;
+}
+
+AVBufferRef *av_buffer_pool_get(AVBufferPool *pool)
+{
+ AVBufferRef *ret;
+ BufferPoolEntry *buf;
+
+ /* check whether the pool is empty */
+ buf = get_pool(pool);
+ if (!buf)
+ return pool_alloc_buffer(pool);
+
+ /* keep the first entry, return the rest of the list to the pool */
+ add_to_pool(buf->next);
+ buf->next = NULL;
+
+ ret = av_buffer_create(buf->data, pool->size, pool_release_buffer,
+ buf, 0);
+ if (!ret) {
+ add_to_pool(buf);
+ return NULL;
+ }
+ avpriv_atomic_int_add_and_fetch(&pool->refcount, 1);
+
+ return ret;
+}

libav-v10.1.tar.bz2/libavutil/buffer.h Added

@@ -0,0 +1,267 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * @ingroup lavu_buffer
+ * refcounted data buffer API
+ */
+
+#ifndef AVUTIL_BUFFER_H
+#define AVUTIL_BUFFER_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_buffer AVBuffer
+ * @ingroup lavu_data
+ *
+ * @{
+ * AVBuffer is an API for reference-counted data buffers.
+ *
+ * There are two core objects in this API -- AVBuffer and AVBufferRef. AVBuffer
+ * represents the data buffer itself; it is opaque and not meant to be accessed
+ * by the caller directly, but only through AVBufferRef. However, the caller may
+ * e.g. compare two AVBuffer pointers to check whether two different references
+ * are describing the same data buffer. AVBufferRef represents a single
+ * reference to an AVBuffer and it is the object that may be manipulated by the
+ * caller directly.
+ *
+ * There are two functions provided for creating a new AVBuffer with a single
+ * reference -- av_buffer_alloc() to just allocate a new buffer, and
+ * av_buffer_create() to wrap an existing array in an AVBuffer. From an existing
+ * reference, additional references may be created with av_buffer_ref().
+ * Use av_buffer_unref() to free a reference (this will automatically free the
+ * data once all the references are freed).
+ *
+ * The convention throughout this API and the rest of Libav is such that the
+ * buffer is considered writable if there exists only one reference to it (and
+ * it has not been marked as read-only). The av_buffer_is_writable() function is
+ * provided to check whether this is true and av_buffer_make_writable() will
+ * automatically create a new writable buffer when necessary.
+ * Of course nothing prevents the calling code from violating this convention,
+ * however that is safe only when all the existing references are under its
+ * control.
+ *
+ * @note Referencing and unreferencing the buffers is thread-safe and thus
+ * may be done from multiple threads simultaneously without any need for
+ * additional locking.
+ *
+ * @note Two different references to the same buffer can point to different
+ * parts of the buffer (i.e. their AVBufferRef.data will not be equal).
+ */
+
+/**
+ * A reference counted buffer type. It is opaque and is meant to be used through
+ * references (AVBufferRef).
+ */
+typedef struct AVBuffer AVBuffer;
+
+/**
+ * A reference to a data buffer.
+ *
+ * The size of this struct is not a part of the public ABI and it is not meant
+ * to be allocated directly.
+ */
+typedef struct AVBufferRef {
+ AVBuffer *buffer;
+
+ /**
+ * The data buffer. It is considered writable if and only if
+ * this is the only reference to the buffer, in which case
+ * av_buffer_is_writable() returns 1.
+ */
+ uint8_t *data;
+ /**
+ * Size of data in bytes.
+ */
+ int size;
+} AVBufferRef;
+
+/**
+ * Allocate an AVBuffer of the given size using av_malloc().
+ *
+ * @return an AVBufferRef of given size or NULL when out of memory
+ */
+AVBufferRef *av_buffer_alloc(int size);
+
+/**
+ * Same as av_buffer_alloc(), except the returned buffer will be initialized
+ * to zero.
+ */
+AVBufferRef *av_buffer_allocz(int size);
+
+/**
+ * Always treat the buffer as read-only, even when it has only one
+ * reference.
+ */
+#define AV_BUFFER_FLAG_READONLY (1 << 0)
+
+/**
+ * Create an AVBuffer from an existing array.
+ *
+ * If this function is successful, data is owned by the AVBuffer. The caller may
+ * only access data through the returned AVBufferRef and references derived from
+ * it.
+ * If this function fails, data is left untouched.
+ * @param data data array
+ * @param size size of data in bytes
+ * @param free a callback for freeing this buffer's data
+ * @param opaque parameter to be passed to free
+ * @param flags a combination of AV_BUFFER_FLAG_*
+ *
+ * @return an AVBufferRef referring to data on success, NULL on failure.
+ */
+AVBufferRef *av_buffer_create(uint8_t *data, int size,
+ void (*free)(void *opaque, uint8_t *data),
+ void *opaque, int flags);
+
+/**
+ * Default free callback, which calls av_free() on the buffer data.
+ * This function is meant to be passed to av_buffer_create(), not called
+ * directly.
+ */
+void av_buffer_default_free(void *opaque, uint8_t *data);
+
+/**
+ * Create a new reference to an AVBuffer.
+ *
+ * @return a new AVBufferRef referring to the same AVBuffer as buf or NULL on
+ * failure.
+ */
+AVBufferRef *av_buffer_ref(AVBufferRef *buf);
+
+/**
+ * Free a given reference and automatically free the buffer if there are no more
+ * references to it.
+ *
+ * @param buf the reference to be freed. The pointer is set to NULL on return.
+ */
+void av_buffer_unref(AVBufferRef **buf);
+
+/**
+ * @return 1 if the caller may write to the data referred to by buf (which is
+ * true if and only if buf is the only reference to the underlying AVBuffer).
+ * Return 0 otherwise.
+ * A positive answer is valid until av_buffer_ref() is called on buf.
+ */
+int av_buffer_is_writable(const AVBufferRef *buf);
+
+/**
+ * Create a writable reference from a given buffer reference, avoiding data copy
+ * if possible.
+ *
+ * @param buf buffer reference to make writable. On success, buf is either left
+ * untouched, or it is unreferenced and a new writable AVBufferRef is
+ * written in its place. On failure, buf is left untouched.
+ * @return 0 on success, a negative AVERROR on failure.
+ */
+int av_buffer_make_writable(AVBufferRef **buf);
+
+/**
+ * Reallocate a given buffer.
+ *
+ * @param buf a buffer reference to reallocate. On success, buf will be
+ * unreferenced and a new reference with the required size will be
+ * written in its place. On failure buf will be left untouched. *buf
+ * may be NULL, then a new buffer is allocated.
+ * @param size required new buffer size.
+ * @return 0 on success, a negative AVERROR on failure.
+ *
+ * @note the buffer is actually reallocated with av_realloc() only if it was
+ * initially allocated through av_buffer_realloc(NULL) and there is only one
+ * reference to it (i.e. the one passed to this function). In all other cases
+ * a new buffer is allocated and the data is copied.
+ */
+int av_buffer_realloc(AVBufferRef **buf, int size);
+
+/**
+ * @}
+ */
+
+/**
+ * @defgroup lavu_bufferpool AVBufferPool
+ * @ingroup lavu_data
+ *
+ * @{
+ * AVBufferPool is an API for a lock-free thread-safe pool of AVBuffers.
+ *
+ * Frequently allocating and freeing large buffers may be slow. AVBufferPool is
+ * meant to solve this in cases when the caller needs a set of buffers of the
+ * same size (the most obvious use case being buffers for raw video or audio
+ * frames).
+ *
+ * At the beginning, the user must call av_buffer_pool_init() to create the
+ * buffer pool. Then whenever a buffer is needed, call av_buffer_pool_get() to
+ * get a reference to a new buffer, similar to av_buffer_alloc(). This new
+ * reference works in all aspects the same way as the one created by
+ * av_buffer_alloc(). However, when the last reference to this buffer is
+ * unreferenced, it is returned to the pool instead of being freed and will be
+ * reused for subsequent av_buffer_pool_get() calls.
+ *
+ * When the caller is done with the pool and no longer needs to allocate any new
+ * buffers, av_buffer_pool_uninit() must be called to mark the pool as freeable.
+ * Once all the buffers are released, it will automatically be freed.
+ *
+ * Allocating and releasing buffers with this API is thread-safe as long as
+ * either the default alloc callback is used, or the user-supplied one is
+ * thread-safe.
+ */
+
+/**
+ * The buffer pool. This structure is opaque and not meant to be accessed
+ * directly. It is allocated with av_buffer_pool_init() and freed with
+ * av_buffer_pool_uninit().
+ */
+typedef struct AVBufferPool AVBufferPool;
+
+/**
+ * Allocate and initialize a buffer pool.
+ *
+ * @param size size of each buffer in this pool
+ * @param alloc a function that will be used to allocate new buffers when the
+ * pool is empty. May be NULL, then the default allocator will be used
+ * (av_buffer_alloc()).
+ * @return newly created buffer pool on success, NULL on error.
+ */
+AVBufferPool *av_buffer_pool_init(int size, AVBufferRef* (*alloc)(int size));
+
+/**
+ * Mark the pool as being available for freeing. It will actually be freed only
+ * once all the allocated buffers associated with the pool are released. Thus it
+ * is safe to call this function while some of the allocated buffers are still
+ * in use.
+ *
+ * @param pool pointer to the pool to be freed. It will be set to NULL.
+ * @see av_buffer_pool_can_uninit()
+ */
+void av_buffer_pool_uninit(AVBufferPool **pool);
+
+/**
+ * Allocate a new AVBuffer, reusing an old buffer from the pool when available.
+ * This function may be called simultaneously from multiple threads.
+ *
+ * @return a reference to the new buffer on success, NULL on error.
+ */
+AVBufferRef *av_buffer_pool_get(AVBufferPool *pool);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_BUFFER_H */

libav-v10.1.tar.bz2/libavutil/buffer_internal.h Added

@@ -0,0 +1,92 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_BUFFER_INTERNAL_H
+#define AVUTIL_BUFFER_INTERNAL_H
+
+#include <stdint.h>
+
+#include "buffer.h"
+
+/**
+ * The buffer is always treated as read-only.
+ */
+#define BUFFER_FLAG_READONLY (1 << 0)
+/**
+ * The buffer was av_realloc()ed, so it is reallocatable.
+ */
+#define BUFFER_FLAG_REALLOCATABLE (1 << 1)
+
+struct AVBuffer {
+ uint8_t *data; /**< data described by this buffer */
+ int size; /**< size of data in bytes */
+
+ /**
+ * number of existing AVBufferRef instances referring to this buffer
+ */
+ volatile int refcount;
+
+ /**
+ * a callback for freeing the data
+ */
+ void (*free)(void *opaque, uint8_t *data);
+
+ /**
+ * an opaque pointer, to be used by the freeing callback
+ */
+ void *opaque;
+
+ /**
+ * A combination of BUFFER_FLAG_*
+ */
+ int flags;
+};
+
+typedef struct BufferPoolEntry {
+ uint8_t *data;
+
+ /*
+ * Backups of the original opaque/free of the AVBuffer corresponding to
+ * data. They will be used to free the buffer when the pool is freed.
+ */
+ void *opaque;
+ void (*free)(void *opaque, uint8_t *data);
+
+ AVBufferPool *pool;
+ struct BufferPoolEntry * volatile next;
+} BufferPoolEntry;
+
+struct AVBufferPool {
+ BufferPoolEntry * volatile pool;
+
+ /*
+ * This is used to track when the pool is to be freed.
+ * The pointer to the pool itself held by the caller is considered to
+ * be one reference. Each buffer requested by the caller increases refcount
+ * by one, returning the buffer to the pool decreases it by one.
+ * refcount reaches zero when the buffer has been uninited AND all the
+ * buffers have been released, then it's safe to free the pool and all
+ * the buffers in it.
+ */
+ volatile int refcount;
+
+ int size;
+ AVBufferRef* (*alloc)(int size);
+};
+
+#endif /* AVUTIL_BUFFER_INTERNAL_H */

libav-v9.6.tar.bz2/libavutil/channel_layout.c -> libav-v10.1.tar.bz2/libavutil/channel_layout.c Changed

libav-v9.6.tar.bz2/libavutil/channel_layout.h -> libav-v10.1.tar.bz2/libavutil/channel_layout.h Changed

libav-v9.6.tar.bz2/libavutil/common.h -> libav-v10.1.tar.bz2/libavutil/common.h Changed

libav-v9.6.tar.bz2/libavutil/cpu.c -> libav-v10.1.tar.bz2/libavutil/cpu.c Changed

@@ -16,9 +16,31 @@
 * 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"
 #include "opt.h"
+#include "common.h"
+
+#if HAVE_SCHED_GETAFFINITY
+#define _GNU_SOURCE
+#include <sched.h>
+#endif
+#if HAVE_GETPROCESSAFFINITYMASK
+#include <windows.h>
+#endif
+#if HAVE_SYSCTL
+#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#endif
+#if HAVE_SYSCONF
+#include <unistd.h>
+#endif
 
 static int cpuflags_mask = -1, checked;
 
@@ -29,9 +51,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();
 
 flags &= cpuflags_mask;
 checked = 1;
@@ -61,6 +88,7 @@
 #define CPUFLAG_AVX (AV_CPU_FLAG_AVX | CPUFLAG_SSE42)
 #define CPUFLAG_XOP (AV_CPU_FLAG_XOP | CPUFLAG_AVX)
 #define CPUFLAG_FMA4 (AV_CPU_FLAG_FMA4 | CPUFLAG_AVX)
+#define CPUFLAG_AVX2 (AV_CPU_FLAG_AVX2 | CPUFLAG_AVX)
 static const AVOption cpuflags_opts[] = {
 { "flags" , NULL, 0, AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT64_MIN, INT64_MAX, .unit = "flags" },
 #if ARCH_PPC
@@ -80,6 +108,7 @@
 { "avx" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_AVX }, .unit = "flags" },
 { "xop" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = CPUFLAG_XOP }, .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" },
 { "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" },
@@ -90,6 +119,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 },
 };
@@ -109,6 +141,35 @@
 return flags & INT_MAX;
 }
 
+int av_cpu_count(void)
+{
+ int nb_cpus = 1;
+#if HAVE_SCHED_GETAFFINITY && defined(CPU_COUNT)
+ cpu_set_t cpuset;
+
+ CPU_ZERO(&cpuset);
+
+ if (!sched_getaffinity(0, sizeof(cpuset), &cpuset))
+ nb_cpus = CPU_COUNT(&cpuset);
+#elif HAVE_GETPROCESSAFFINITYMASK
+ DWORD_PTR proc_aff, sys_aff;
+ if (GetProcessAffinityMask(GetCurrentProcess(), &proc_aff, &sys_aff))
+ nb_cpus = av_popcount64(proc_aff);
+#elif HAVE_SYSCTL && defined(HW_NCPU)
+ int mib[2] = { CTL_HW, HW_NCPU };
+ size_t len = sizeof(nb_cpus);
+
+ if (sysctl(mib, 2, &nb_cpus, &len, NULL, 0) == -1)
+ nb_cpus = 0;
+#elif HAVE_SYSCONF && defined(_SC_NPROC_ONLN)
+ nb_cpus = sysconf(_SC_NPROC_ONLN);
+#elif HAVE_SYSCONF && defined(_SC_NPROCESSORS_ONLN)
+ nb_cpus = sysconf(_SC_NPROCESSORS_ONLN);
+#endif
+
+ return nb_cpus;
+}
+
 #ifdef TEST
 
 #include <stdio.h>
@@ -117,7 +178,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" },
@@ -144,6 +208,7 @@
 { AV_CPU_FLAG_3DNOW, "3dnow" },
 { AV_CPU_FLAG_3DNOWEXT, "3dnowext" },
 { AV_CPU_FLAG_CMOV, "cmov" },
+ { AV_CPU_FLAG_AVX2, "avx2" },
 #endif
 { 0 }
 };

libav-v9.6.tar.bz2/libavutil/cpu.h -> libav-v10.1.tar.bz2/libavutil/cpu.h Changed

@@ -35,9 +35,11 @@
 #define AV_CPU_FLAG_SSE 0x0008 ///< SSE functions
 #define AV_CPU_FLAG_SSE2 0x0010 ///< PIV SSE2 functions
 #define AV_CPU_FLAG_SSE2SLOW 0x40000000 ///< SSE2 supported, but usually not faster
+ ///< than regular MMX/SSE (e.g. Core1)
 #define AV_CPU_FLAG_3DNOWEXT 0x0020 ///< AMD 3DNowExt
 #define AV_CPU_FLAG_SSE3 0x0040 ///< Prescott SSE3 functions
 #define AV_CPU_FLAG_SSE3SLOW 0x20000000 ///< SSE3 supported, but usually not faster
+ ///< than regular MMX/SSE (e.g. Core1)
 #define AV_CPU_FLAG_SSSE3 0x0080 ///< Conroe SSSE3 functions
 #define AV_CPU_FLAG_ATOM 0x10000000 ///< Atom processor, some SSSE3 instructions are slower
 #define AV_CPU_FLAG_SSE4 0x0100 ///< Penryn SSE4.1 functions
@@ -46,6 +48,7 @@
 #define AV_CPU_FLAG_XOP 0x0400 ///< Bulldozer XOP functions
 #define AV_CPU_FLAG_FMA4 0x0800 ///< Bulldozer FMA4 functions
 #define AV_CPU_FLAG_CMOV 0x1000 ///< i686 cmov
+#define AV_CPU_FLAG_AVX2 0x8000 ///< AVX2 functions: requires OS support even if YMM registers aren't used
 
 #define AV_CPU_FLAG_ALTIVEC 0x0001 ///< standard
 
@@ -76,9 +79,9 @@
 */
 int av_parse_cpu_flags(const char *s);
 
-/* The following CPU-specific functions shall not be called directly. */
-int ff_get_cpu_flags_arm(void);
-int ff_get_cpu_flags_ppc(void);
-int ff_get_cpu_flags_x86(void);
+/**
+ * @return the number of logical CPU cores present.
+ */
+int av_cpu_count(void);
 
 #endif /* AVUTIL_CPU_H */

libav-v10.1.tar.bz2/libavutil/cpu_internal.h Added

@@ -0,0 +1,34 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_CPU_INTERNAL_H
+#define AVUTIL_CPU_INTERNAL_H
+
+#include "cpu.h"
+
+#define CPUEXT_SUFFIX(flags, suffix, cpuext)                            \
+    (HAVE_ ## cpuext ## suffix && ((flags) & AV_CPU_FLAG_ ## cpuext))
+
+#define CPUEXT(flags, cpuext) CPUEXT_SUFFIX(flags, , cpuext)
+
+int ff_get_cpu_flags_aarch64(void);
+int ff_get_cpu_flags_arm(void);
+int ff_get_cpu_flags_ppc(void);
+int ff_get_cpu_flags_x86(void);
+
+#endif /* AVUTIL_CPU_INTERNAL_H */

libav-v9.6.tar.bz2/libavutil/crc.c -> libav-v10.1.tar.bz2/libavutil/crc.c Changed

@@ -24,7 +24,192 @@
 #include "crc.h"
 
 #if CONFIG_HARDCODED_TABLES
-#include "crc_data.h"
+static const AVCRC av_crc_table[AV_CRC_MAX][257] = {
+    [AV_CRC_8_ATM] = {
+        0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15, 0x38, 0x3F, 0x36, 0x31,
+        0x24, 0x23, 0x2A, 0x2D, 0x70, 0x77, 0x7E, 0x79, 0x6C, 0x6B, 0x62, 0x65,
+        0x48, 0x4F, 0x46, 0x41, 0x54, 0x53, 0x5A, 0x5D, 0xE0, 0xE7, 0xEE, 0xE9,
+        0xFC, 0xFB, 0xF2, 0xF5, 0xD8, 0xDF, 0xD6, 0xD1, 0xC4, 0xC3, 0xCA, 0xCD,
+        0x90, 0x97, 0x9E, 0x99, 0x8C, 0x8B, 0x82, 0x85, 0xA8, 0xAF, 0xA6, 0xA1,
+        0xB4, 0xB3, 0xBA, 0xBD, 0xC7, 0xC0, 0xC9, 0xCE, 0xDB, 0xDC, 0xD5, 0xD2,
+        0xFF, 0xF8, 0xF1, 0xF6, 0xE3, 0xE4, 0xED, 0xEA, 0xB7, 0xB0, 0xB9, 0xBE,
+        0xAB, 0xAC, 0xA5, 0xA2, 0x8F, 0x88, 0x81, 0x86, 0x93, 0x94, 0x9D, 0x9A,
+        0x27, 0x20, 0x29, 0x2E, 0x3B, 0x3C, 0x35, 0x32, 0x1F, 0x18, 0x11, 0x16,
+        0x03, 0x04, 0x0D, 0x0A, 0x57, 0x50, 0x59, 0x5E, 0x4B, 0x4C, 0x45, 0x42,
+        0x6F, 0x68, 0x61, 0x66, 0x73, 0x74, 0x7D, 0x7A, 0x89, 0x8E, 0x87, 0x80,
+        0x95, 0x92, 0x9B, 0x9C, 0xB1, 0xB6, 0xBF, 0xB8, 0xAD, 0xAA, 0xA3, 0xA4,
+        0xF9, 0xFE, 0xF7, 0xF0, 0xE5, 0xE2, 0xEB, 0xEC, 0xC1, 0xC6, 0xCF, 0xC8,
+        0xDD, 0xDA, 0xD3, 0xD4, 0x69, 0x6E, 0x67, 0x60, 0x75, 0x72, 0x7B, 0x7C,
+        0x51, 0x56, 0x5F, 0x58, 0x4D, 0x4A, 0x43, 0x44, 0x19, 0x1E, 0x17, 0x10,
+        0x05, 0x02, 0x0B, 0x0C, 0x21, 0x26, 0x2F, 0x28, 0x3D, 0x3A, 0x33, 0x34,
+        0x4E, 0x49, 0x40, 0x47, 0x52, 0x55, 0x5C, 0x5B, 0x76, 0x71, 0x78, 0x7F,
+        0x6A, 0x6D, 0x64, 0x63, 0x3E, 0x39, 0x30, 0x37, 0x22, 0x25, 0x2C, 0x2B,
+        0x06, 0x01, 0x08, 0x0F, 0x1A, 0x1D, 0x14, 0x13, 0xAE, 0xA9, 0xA0, 0xA7,
+        0xB2, 0xB5, 0xBC, 0xBB, 0x96, 0x91, 0x98, 0x9F, 0x8A, 0x8D, 0x84, 0x83,
+        0xDE, 0xD9, 0xD0, 0xD7, 0xC2, 0xC5, 0xCC, 0xCB, 0xE6, 0xE1, 0xE8, 0xEF,
+        0xFA, 0xFD, 0xF4, 0xF3, 0x01
+    },
+    [AV_CRC_16_ANSI] = {
+        0x0000, 0x0580, 0x0F80, 0x0A00, 0x1B80, 0x1E00, 0x1400, 0x1180,
+        0x3380, 0x3600, 0x3C00, 0x3980, 0x2800, 0x2D80, 0x2780, 0x2200,
+        0x6380, 0x6600, 0x6C00, 0x6980, 0x7800, 0x7D80, 0x7780, 0x7200,
+        0x5000, 0x5580, 0x5F80, 0x5A00, 0x4B80, 0x4E00, 0x4400, 0x4180,
+        0xC380, 0xC600, 0xCC00, 0xC980, 0xD800, 0xDD80, 0xD780, 0xD200,
+        0xF000, 0xF580, 0xFF80, 0xFA00, 0xEB80, 0xEE00, 0xE400, 0xE180,
+        0xA000, 0xA580, 0xAF80, 0xAA00, 0xBB80, 0xBE00, 0xB400, 0xB180,
+        0x9380, 0x9600, 0x9C00, 0x9980, 0x8800, 0x8D80, 0x8780, 0x8200,
+        0x8381, 0x8601, 0x8C01, 0x8981, 0x9801, 0x9D81, 0x9781, 0x9201,
+        0xB001, 0xB581, 0xBF81, 0xBA01, 0xAB81, 0xAE01, 0xA401, 0xA181,
+        0xE001, 0xE581, 0xEF81, 0xEA01, 0xFB81, 0xFE01, 0xF401, 0xF181,
+        0xD381, 0xD601, 0xDC01, 0xD981, 0xC801, 0xCD81, 0xC781, 0xC201,
+        0x4001, 0x4581, 0x4F81, 0x4A01, 0x5B81, 0x5E01, 0x5401, 0x5181,
+        0x7381, 0x7601, 0x7C01, 0x7981, 0x6801, 0x6D81, 0x6781, 0x6201,
+        0x2381, 0x2601, 0x2C01, 0x2981, 0x3801, 0x3D81, 0x3781, 0x3201,
+        0x1001, 0x1581, 0x1F81, 0x1A01, 0x0B81, 0x0E01, 0x0401, 0x0181,
+        0x0383, 0x0603, 0x0C03, 0x0983, 0x1803, 0x1D83, 0x1783, 0x1203,
+        0x3003, 0x3583, 0x3F83, 0x3A03, 0x2B83, 0x2E03, 0x2403, 0x2183,
+        0x6003, 0x6583, 0x6F83, 0x6A03, 0x7B83, 0x7E03, 0x7403, 0x7183,
+        0x5383, 0x5603, 0x5C03, 0x5983, 0x4803, 0x4D83, 0x4783, 0x4203,
+        0xC003, 0xC583, 0xCF83, 0xCA03, 0xDB83, 0xDE03, 0xD403, 0xD183,
+        0xF383, 0xF603, 0xFC03, 0xF983, 0xE803, 0xED83, 0xE783, 0xE203,
+        0xA383, 0xA603, 0xAC03, 0xA983, 0xB803, 0xBD83, 0xB783, 0xB203,
+        0x9003, 0x9583, 0x9F83, 0x9A03, 0x8B83, 0x8E03, 0x8403, 0x8183,
+        0x8002, 0x8582, 0x8F82, 0x8A02, 0x9B82, 0x9E02, 0x9402, 0x9182,
+        0xB382, 0xB602, 0xBC02, 0xB982, 0xA802, 0xAD82, 0xA782, 0xA202,
+        0xE382, 0xE602, 0xEC02, 0xE982, 0xF802, 0xFD82, 0xF782, 0xF202,
+        0xD002, 0xD582, 0xDF82, 0xDA02, 0xCB82, 0xCE02, 0xC402, 0xC182,
+        0x4382, 0x4602, 0x4C02, 0x4982, 0x5802, 0x5D82, 0x5782, 0x5202,
+        0x7002, 0x7582, 0x7F82, 0x7A02, 0x6B82, 0x6E02, 0x6402, 0x6182,
+        0x2002, 0x2582, 0x2F82, 0x2A02, 0x3B82, 0x3E02, 0x3402, 0x3182,
+        0x1382, 0x1602, 0x1C02, 0x1982, 0x0802, 0x0D82, 0x0782, 0x0202,
+        0x0001
+    },
+    [AV_CRC_16_CCITT] = {
+        0x0000, 0x2110, 0x4220, 0x6330, 0x8440, 0xA550, 0xC660, 0xE770,
+        0x0881, 0x2991, 0x4AA1, 0x6BB1, 0x8CC1, 0xADD1, 0xCEE1, 0xEFF1,
+        0x3112, 0x1002, 0x7332, 0x5222, 0xB552, 0x9442, 0xF772, 0xD662,
+        0x3993, 0x1883, 0x7BB3, 0x5AA3, 0xBDD3, 0x9CC3, 0xFFF3, 0xDEE3,
+        0x6224, 0x4334, 0x2004, 0x0114, 0xE664, 0xC774, 0xA444, 0x8554,
+        0x6AA5, 0x4BB5, 0x2885, 0x0995, 0xEEE5, 0xCFF5, 0xACC5, 0x8DD5,
+        0x5336, 0x7226, 0x1116, 0x3006, 0xD776, 0xF666, 0x9556, 0xB446,
+        0x5BB7, 0x7AA7, 0x1997, 0x3887, 0xDFF7, 0xFEE7, 0x9DD7, 0xBCC7,
+        0xC448, 0xE558, 0x8668, 0xA778, 0x4008, 0x6118, 0x0228, 0x2338,
+        0xCCC9, 0xEDD9, 0x8EE9, 0xAFF9, 0x4889, 0x6999, 0x0AA9, 0x2BB9,
+        0xF55A, 0xD44A, 0xB77A, 0x966A, 0x711A, 0x500A, 0x333A, 0x122A,
+        0xFDDB, 0xDCCB, 0xBFFB, 0x9EEB, 0x799B, 0x588B, 0x3BBB, 0x1AAB,
+        0xA66C, 0x877C, 0xE44C, 0xC55C, 0x222C, 0x033C, 0x600C, 0x411C,
+        0xAEED, 0x8FFD, 0xECCD, 0xCDDD, 0x2AAD, 0x0BBD, 0x688D, 0x499D,
+        0x977E, 0xB66E, 0xD55E, 0xF44E, 0x133E, 0x322E, 0x511E, 0x700E,
+        0x9FFF, 0xBEEF, 0xDDDF, 0xFCCF, 0x1BBF, 0x3AAF, 0x599F, 0x788F,
+        0x8891, 0xA981, 0xCAB1, 0xEBA1, 0x0CD1, 0x2DC1, 0x4EF1, 0x6FE1,
+        0x8010, 0xA100, 0xC230, 0xE320, 0x0450, 0x2540, 0x4670, 0x6760,
+        0xB983, 0x9893, 0xFBA3, 0xDAB3, 0x3DC3, 0x1CD3, 0x7FE3, 0x5EF3,
+        0xB102, 0x9012, 0xF322, 0xD232, 0x3542, 0x1452, 0x7762, 0x5672,
+        0xEAB5, 0xCBA5, 0xA895, 0x8985, 0x6EF5, 0x4FE5, 0x2CD5, 0x0DC5,
+        0xE234, 0xC324, 0xA014, 0x8104, 0x6674, 0x4764, 0x2454, 0x0544,
+        0xDBA7, 0xFAB7, 0x9987, 0xB897, 0x5FE7, 0x7EF7, 0x1DC7, 0x3CD7,
+        0xD326, 0xF236, 0x9106, 0xB016, 0x5766, 0x7676, 0x1546, 0x3456,
+        0x4CD9, 0x6DC9, 0x0EF9, 0x2FE9, 0xC899, 0xE989, 0x8AB9, 0xABA9,
+        0x4458, 0x6548, 0x0678, 0x2768, 0xC018, 0xE108, 0x8238, 0xA328,
+        0x7DCB, 0x5CDB, 0x3FEB, 0x1EFB, 0xF98B, 0xD89B, 0xBBAB, 0x9ABB,
+        0x754A, 0x545A, 0x376A, 0x167A, 0xF10A, 0xD01A, 0xB32A, 0x923A,
+        0x2EFD, 0x0FED, 0x6CDD, 0x4DCD, 0xAABD, 0x8BAD, 0xE89D, 0xC98D,
+        0x267C, 0x076C, 0x645C, 0x454C, 0xA23C, 0x832C, 0xE01C, 0xC10C,
+        0x1FEF, 0x3EFF, 0x5DCF, 0x7CDF, 0x9BAF, 0xBABF, 0xD98F, 0xF89F,
+        0x176E, 0x367E, 0x554E, 0x745E, 0x932E, 0xB23E, 0xD10E, 0xF01E,
+        0x0001
+    },
+    [AV_CRC_32_IEEE] = {
+        0x00000000, 0xB71DC104, 0x6E3B8209, 0xD926430D, 0xDC760413, 0x6B6BC517,
+        0xB24D861A, 0x0550471E, 0xB8ED0826, 0x0FF0C922, 0xD6D68A2F, 0x61CB4B2B,
+        0x649B0C35, 0xD386CD31, 0x0AA08E3C, 0xBDBD4F38, 0x70DB114C, 0xC7C6D048,
+        0x1EE09345, 0xA9FD5241, 0xACAD155F, 0x1BB0D45B, 0xC2969756, 0x758B5652,
+        0xC836196A, 0x7F2BD86E, 0xA60D9B63, 0x11105A67, 0x14401D79, 0xA35DDC7D,
+        0x7A7B9F70, 0xCD665E74, 0xE0B62398, 0x57ABE29C, 0x8E8DA191, 0x39906095,
+        0x3CC0278B, 0x8BDDE68F, 0x52FBA582, 0xE5E66486, 0x585B2BBE, 0xEF46EABA,
+        0x3660A9B7, 0x817D68B3, 0x842D2FAD, 0x3330EEA9, 0xEA16ADA4, 0x5D0B6CA0,
+        0x906D32D4, 0x2770F3D0, 0xFE56B0DD, 0x494B71D9, 0x4C1B36C7, 0xFB06F7C3,
+        0x2220B4CE, 0x953D75CA, 0x28803AF2, 0x9F9DFBF6, 0x46BBB8FB, 0xF1A679FF,
+        0xF4F63EE1, 0x43EBFFE5, 0x9ACDBCE8, 0x2DD07DEC, 0x77708634, 0xC06D4730,
+        0x194B043D, 0xAE56C539, 0xAB068227, 0x1C1B4323, 0xC53D002E, 0x7220C12A,
+        0xCF9D8E12, 0x78804F16, 0xA1A60C1B, 0x16BBCD1F, 0x13EB8A01, 0xA4F64B05,
+        0x7DD00808, 0xCACDC90C, 0x07AB9778, 0xB0B6567C, 0x69901571, 0xDE8DD475,
+        0xDBDD936B, 0x6CC0526F, 0xB5E61162, 0x02FBD066, 0xBF469F5E, 0x085B5E5A,
+        0xD17D1D57, 0x6660DC53, 0x63309B4D, 0xD42D5A49, 0x0D0B1944, 0xBA16D840,
+        0x97C6A5AC, 0x20DB64A8, 0xF9FD27A5, 0x4EE0E6A1, 0x4BB0A1BF, 0xFCAD60BB,
+        0x258B23B6, 0x9296E2B2, 0x2F2BAD8A, 0x98366C8E, 0x41102F83, 0xF60DEE87,
+        0xF35DA999, 0x4440689D, 0x9D662B90, 0x2A7BEA94, 0xE71DB4E0, 0x500075E4,
+        0x892636E9, 0x3E3BF7ED, 0x3B6BB0F3, 0x8C7671F7, 0x555032FA, 0xE24DF3FE,
+        0x5FF0BCC6, 0xE8ED7DC2, 0x31CB3ECF, 0x86D6FFCB, 0x8386B8D5, 0x349B79D1,
+        0xEDBD3ADC, 0x5AA0FBD8, 0xEEE00C69, 0x59FDCD6D, 0x80DB8E60, 0x37C64F64,
+        0x3296087A, 0x858BC97E, 0x5CAD8A73, 0xEBB04B77, 0x560D044F, 0xE110C54B,
+        0x38368646, 0x8F2B4742, 0x8A7B005C, 0x3D66C158, 0xE4408255, 0x535D4351,
+        0x9E3B1D25, 0x2926DC21, 0xF0009F2C, 0x471D5E28, 0x424D1936, 0xF550D832,
+        0x2C769B3F, 0x9B6B5A3B, 0x26D61503, 0x91CBD407, 0x48ED970A, 0xFFF0560E,
+        0xFAA01110, 0x4DBDD014, 0x949B9319, 0x2386521D, 0x0E562FF1, 0xB94BEEF5,
+        0x606DADF8, 0xD7706CFC, 0xD2202BE2, 0x653DEAE6, 0xBC1BA9EB, 0x0B0668EF,
+        0xB6BB27D7, 0x01A6E6D3, 0xD880A5DE, 0x6F9D64DA, 0x6ACD23C4, 0xDDD0E2C0,
+        0x04F6A1CD, 0xB3EB60C9, 0x7E8D3EBD, 0xC990FFB9, 0x10B6BCB4, 0xA7AB7DB0,
+        0xA2FB3AAE, 0x15E6FBAA, 0xCCC0B8A7, 0x7BDD79A3, 0xC660369B, 0x717DF79F,
+        0xA85BB492, 0x1F467596, 0x1A163288, 0xAD0BF38C, 0x742DB081, 0xC3307185,
+        0x99908A5D, 0x2E8D4B59, 0xF7AB0854, 0x40B6C950, 0x45E68E4E, 0xF2FB4F4A,
+        0x2BDD0C47, 0x9CC0CD43, 0x217D827B, 0x9660437F, 0x4F460072, 0xF85BC176,
+        0xFD0B8668, 0x4A16476C, 0x93300461, 0x242DC565, 0xE94B9B11, 0x5E565A15,
+        0x87701918, 0x306DD81C, 0x353D9F02, 0x82205E06, 0x5B061D0B, 0xEC1BDC0F,
+        0x51A69337, 0xE6BB5233, 0x3F9D113E, 0x8880D03A, 0x8DD09724, 0x3ACD5620,
+        0xE3EB152D, 0x54F6D429, 0x7926A9C5, 0xCE3B68C1, 0x171D2BCC, 0xA000EAC8,
+        0xA550ADD6, 0x124D6CD2, 0xCB6B2FDF, 0x7C76EEDB, 0xC1CBA1E3, 0x76D660E7,
+        0xAFF023EA, 0x18EDE2EE, 0x1DBDA5F0, 0xAAA064F4, 0x738627F9, 0xC49BE6FD,
+        0x09FDB889, 0xBEE0798D, 0x67C63A80, 0xD0DBFB84, 0xD58BBC9A, 0x62967D9E,
+        0xBBB03E93, 0x0CADFF97, 0xB110B0AF, 0x060D71AB, 0xDF2B32A6, 0x6836F3A2,
+        0x6D66B4BC, 0xDA7B75B8, 0x035D36B5, 0xB440F7B1, 0x00000001
+    },
+    [AV_CRC_32_IEEE_LE] = {
+        0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F,
+        0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
+        0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2,
+        0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+        0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9,
+        0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+        0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C,
+        0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+        0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423,
+        0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
+        0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, 0x01DB7106,
+        0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+        0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D,
+        0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
+        0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950,
+        0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+        0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7,
+        0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+        0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA,
+        0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+        0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
+        0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
+        0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84,
+        0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+        0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB,
+        0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
+        0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E,
+        0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+        0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55,
+        0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+        0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28,
+        0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+        0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F,
+        0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
+        0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242,
+        0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+        0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69,
+        0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
+        0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC,
+        0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+        0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693,
+        0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+        0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D, 0x00000001
+    },
+};
 #else
 static struct {
     uint8_t  le;

libav-v9.6.tar.bz2/libavutil/des.c -> libav-v10.1.tar.bz2/libavutil/des.c Changed

libav-v9.6.tar.bz2/libavutil/dict.c -> libav-v10.1.tar.bz2/libavutil/dict.c Changed

@@ -18,7 +18,6 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include <ctype.h>
 #include <string.h>
 
 #include "avstring.h"
@@ -50,7 +49,7 @@
 for(; i<m->count; i++){
 const char *s= m->elems[i].key;
 if(flags & AV_DICT_MATCH_CASE) for(j=0; s[j] == key[j] && key[j]; j++);
- else for(j=0; toupper(s[j]) == toupper(key[j]) && key[j]; j++);
+ else for(j=0; av_toupper(s[j]) == av_toupper(key[j]) && key[j]; j++);
 if(key[j])
 continue;
 if(s[j] && !(flags & AV_DICT_IGNORE_SUFFIX))
@@ -110,6 +109,53 @@
 return 0;
 }
 
+static int parse_key_value_pair(AVDictionary **pm, const char **buf,
+ const char *key_val_sep, const char *pairs_sep,
+ int flags)
+{
+ char *key = av_get_token(buf, key_val_sep);
+ char *val = NULL;
+ int ret;
+
+ if (key && *key && strspn(*buf, key_val_sep)) {
+ (*buf)++;
+ val = av_get_token(buf, pairs_sep);
+ }
+
+ if (key && *key && val && *val)
+ ret = av_dict_set(pm, key, val, flags);
+ else
+ ret = AVERROR(EINVAL);
+
+ av_freep(&key);
+ av_freep(&val);
+
+ return ret;
+}
+
+int av_dict_parse_string(AVDictionary **pm, const char *str,
+ const char *key_val_sep, const char *pairs_sep,
+ int flags)
+{
+ int ret;
+
+ if (!str)
+ return 0;
+
+ /* ignore STRDUP flags */
+ flags &= ~(AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
+
+ while (*str) {
+ if ((ret = parse_key_value_pair(pm, &str, key_val_sep, pairs_sep, flags)) < 0)
+ return ret;
+
+ if (*str)
+ str++;
+ }
+
+ return 0;
+}
+
 void av_dict_free(AVDictionary **pm)
 {
 AVDictionary *m = *pm;

libav-v9.6.tar.bz2/libavutil/dict.h -> libav-v10.1.tar.bz2/libavutil/dict.h Changed

@@ -40,21 +40,21 @@
 * 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
 *
 */
 
@@ -107,6 +107,23 @@
 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.
+ *
+ * @param key_val_sep a 0-terminated list of characters used to separate
+ * key from value
+ * @param pairs_sep a 0-terminated list of characters used to separate
+ * two pairs from each other
+ * @param flags flags to use when adding to dictionary.
+ * AV_DICT_DONT_STRDUP_KEY and AV_DICT_DONT_STRDUP_VAL
+ * are ignored since the key/value tokens will always
+ * be duplicated.
+ * @return 0 on success, negative AVERROR code on failure
+ */
+int av_dict_parse_string(AVDictionary **pm, const char *str,
+ const char *key_val_sep, const char *pairs_sep,
+ int flags);
+
+/**
 * Copy entries from one AVDictionary struct into another.
 * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,
 * this function will allocate a struct for you and put it in *dst

libav-v10.1.tar.bz2/libavutil/downmix_info.c Added

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2014 Tim Walker <tdskywalker@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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;
+}

libav-v10.1.tar.bz2/libavutil/downmix_info.h Added

@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2014 Tim Walker <tdskywalker@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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 */

libav-v9.6.tar.bz2/libavutil/error.h -> libav-v10.1.tar.bz2/libavutil/error.h Changed

libav-v9.6.tar.bz2/libavutil/eval.c -> libav-v10.1.tar.bz2/libavutil/eval.c Changed

libav-v9.6.tar.bz2/libavutil/fifo.c -> libav-v10.1.tar.bz2/libavutil/fifo.c Changed

@@ -24,11 +24,11 @@
 
 AVFifoBuffer *av_fifo_alloc(unsigned int size)
 {
- AVFifoBuffer *f= av_mallocz(sizeof(AVFifoBuffer));
- if(!f)
+ AVFifoBuffer *f = av_mallocz(sizeof(AVFifoBuffer));
+ if (!f)
 return NULL;
 f->buffer = av_malloc(size);
- f->end = f->buffer + size;
+ f->end = f->buffer + size;
 av_fifo_reset(f);
 if (!f->buffer)
 av_freep(&f);
@@ -37,7 +37,7 @@
 
 void av_fifo_free(AVFifoBuffer *f)
 {
- if(f){
+ if (f) {
 av_free(f->buffer);
 av_free(f);
 }
@@ -59,12 +59,13 @@
 return f->end - f->buffer - av_fifo_size(f);
 }
 
-int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) {
- unsigned int old_size= f->end - f->buffer;
+int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size)
+{
+ unsigned int old_size = f->end - f->buffer;
 
- if(old_size < new_size){
- int len= av_fifo_size(f);
- AVFifoBuffer *f2= av_fifo_alloc(new_size);
+ if (old_size < new_size) {
+ int len = av_fifo_size(f);
+ AVFifoBuffer *f2 = av_fifo_alloc(new_size);
 
 if (!f2)
 return -1;
@@ -72,45 +73,48 @@
 f2->wptr += len;
 f2->wndx += len;
 av_free(f->buffer);
- *f= *f2;
+ *f = *f2;
 av_free(f2);
 }
 return 0;
 }
 
-// src must NOT be const as it can be a context for func that may need updating (like a pointer or byte counter)
-int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int))
+/* src must NOT be const as it can be a context for func that may need
+ * updating (like a pointer or byte counter) */
+int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size,
+ int (*func)(void *, void *, int))
 {
 int total = size;
 do {
 int len = FFMIN(f->end - f->wptr, size);
- if(func) {
- if(func(src, f->wptr, len) <= 0)
+ if (func) {
+ if (func(src, f->wptr, len) <= 0)
 break;
 } else {
 memcpy(f->wptr, src, len);
- src = (uint8_t*)src + len;
+ src = (uint8_t *)src + len;
 }
 // Write memory barrier needed for SMP here in theory
 f->wptr += len;
 if (f->wptr >= f->end)
 f->wptr = f->buffer;
 f->wndx += len;
- size -= len;
+ size -= len;
 } while (size > 0);
 return total - size;
 }
 
-
-int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int))
+int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size,
+ void (*func)(void *, void *, int))
 {
 // Read memory barrier needed for SMP here in theory
 do {
 int len = FFMIN(f->end - f->rptr, buf_size);
- if(func) func(dest, f->rptr, len);
- else{
+ if (func)
+ func(dest, f->rptr, len);
+ else {
 memcpy(dest, f->rptr, len);
- dest = (uint8_t*)dest + len;
+ dest = (uint8_t *)dest + len;
 }
 // memory barrier needed for SMP here in theory
 av_fifo_drain(f, len);
@@ -141,9 +145,9 @@
 av_fifo_generic_write(fifo, &i, sizeof(int), NULL);
 
 /* peek at FIFO */
- n = av_fifo_size(fifo)/sizeof(int);
- for (i = -n+1; i < n; i++) {
- int *v = (int *)av_fifo_peek2(fifo, i*sizeof(int));
+ n = av_fifo_size(fifo) / sizeof(int);
+ for (i = -n + 1; i < n; i++) {
+ int *v = (int *)av_fifo_peek2(fifo, i * sizeof(int));
 printf("%d: %d\n", i, *v);
 }
 printf("\n");

libav-v9.6.tar.bz2/libavutil/file.c -> libav-v10.1.tar.bz2/libavutil/file.c Changed

libav-v10.1.tar.bz2/libavutil/file_open.c Added

@@ -0,0 +1,93 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "internal.h"
+#include "mem.h"
+#include <stdarg.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if HAVE_IO_H
+#include <io.h>
+#endif
+
+#if defined(_WIN32) && !defined(__MINGW32CE__)
+#undef open
+#undef lseek
+#undef stat
+#undef fstat
+#include <windows.h>
+#include <share.h>
+#include <errno.h>
+
+static int win32_open(const char *filename_utf8, int oflag, int pmode)
+{
+ int fd;
+ int num_chars;
+ wchar_t *filename_w;
+
+ /* convert UTF-8 to wide chars */
+ num_chars = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filename_utf8, -1, NULL, 0);
+ if (num_chars <= 0)
+ goto fallback;
+ filename_w = av_mallocz(sizeof(wchar_t) * num_chars);
+ if (!filename_w) {
+ errno = ENOMEM;
+ return -1;
+ }
+ MultiByteToWideChar(CP_UTF8, 0, filename_utf8, -1, filename_w, num_chars);
+
+ fd = _wsopen(filename_w, oflag, SH_DENYNO, pmode);
+ av_freep(&filename_w);
+
+ if (fd != -1 || (oflag & O_CREAT))
+ return fd;
+
+fallback:
+ /* filename may be be in CP_ACP */
+ return _sopen(filename_utf8, oflag, SH_DENYNO, pmode);
+}
+#define open win32_open
+#endif
+
+int avpriv_open(const char *filename, int flags, ...)
+{
+ int fd;
+ unsigned int mode = 0;
+ va_list ap;
+
+ va_start(ap, flags);
+ if (flags & O_CREAT)
+ mode = va_arg(ap, unsigned int);
+ va_end(ap);
+
+#ifdef O_CLOEXEC
+ flags |= O_CLOEXEC;
+#endif
+
+ fd = open(filename, flags, mode);
+#if HAVE_FCNTL
+ if (fd != -1)
+ fcntl(fd, F_SETFD, FD_CLOEXEC);
+#endif
+
+ return fd;
+}

libav-v9.6.tar.bz2/libavutil/float_dsp.c -> libav-v10.1.tar.bz2/libavutil/float_dsp.c Changed

@@ -17,7 +17,7 @@
 */
 
 #include "config.h"
-
+#include "attributes.h"
 #include "float_dsp.h"
 
 static void vector_fmul_c(float *dst, const float *src0, const float *src1,
@@ -52,12 +52,77 @@
 dst[i] = src[i] * mul;
 }
 
-void avpriv_float_dsp_init(AVFloatDSPContext *fdsp, int bit_exact)
+static void vector_fmul_window_c(float *dst, const float *src0,
+ const float *src1, const float *win, int len)
+{
+ int i, j;
+
+ dst += len;
+ win += len;
+ src0 += len;
+
+ for (i = -len, j = len - 1; i < 0; i++, j--) {
+ float s0 = src0[i];
+ float s1 = src1[j];
+ float wi = win[i];
+ float wj = win[j];
+ dst[i] = s0 * wj - s1 * wi;
+ dst[j] = s0 * wi + s1 * wj;
+ }
+}
+
+static void vector_fmul_add_c(float *dst, const float *src0, const float *src1,
+ const float *src2, int len){
+ int i;
+
+ for (i = 0; i < len; i++)
+ dst[i] = src0[i] * src1[i] + src2[i];
+}
+
+static void vector_fmul_reverse_c(float *dst, const float *src0,
+ const float *src1, int len)
+{
+ int i;
+
+ src1 += len-1;
+ for (i = 0; i < len; i++)
+ dst[i] = src0[i] * src1[-i];
+}
+
+static void butterflies_float_c(float *restrict v1, float *restrict v2,
+ int len)
+{
+ int i;
+
+ for (i = 0; i < len; i++) {
+ float t = v1[i] - v2[i];
+ v1[i] += v2[i];
+ v2[i] = t;
+ }
+}
+
+float avpriv_scalarproduct_float_c(const float *v1, const float *v2, int len)
+{
+ float p = 0.0;
+ int i;
+
+ for (i = 0; i < len; i++)
+ p += v1[i] * v2[i];
+
+ return p;
+}
+
+av_cold void avpriv_float_dsp_init(AVFloatDSPContext *fdsp, int bit_exact)
 {
 fdsp->vector_fmul = vector_fmul_c;
 fdsp->vector_fmac_scalar = vector_fmac_scalar_c;
 fdsp->vector_fmul_scalar = vector_fmul_scalar_c;
 fdsp->vector_dmul_scalar = vector_dmul_scalar_c;
+ fdsp->vector_fmul_window = vector_fmul_window_c;
+ fdsp->vector_fmul_add = vector_fmul_add_c;
+ fdsp->vector_fmul_reverse = vector_fmul_reverse_c;
+ fdsp->butterflies_float = butterflies_float_c;
+ fdsp->scalarproduct_float = avpriv_scalarproduct_float_c;
 
 #if ARCH_ARM
 ff_float_dsp_init_arm(fdsp);

libav-v9.6.tar.bz2/libavutil/float_dsp.h -> libav-v10.1.tar.bz2/libavutil/float_dsp.h Changed

@@ -19,6 +19,8 @@
 #ifndef AVUTIL_FLOAT_DSP_H
 #define AVUTIL_FLOAT_DSP_H
 
+#include "config.h"
+
 typedef struct AVFloatDSPContext {
     /**
      * Calculate the product of two vectors of floats and store the result in
@@ -81,9 +83,94 @@
      */
     void (*vector_dmul_scalar)(double *dst, const double *src, double mul,
                                int len);
+
+    /**
+     * Overlap/add with window function.
+     * Used primarily by MDCT-based audio codecs.
+     * Source and destination vectors must overlap exactly or not at all.
+     *
+     * @param dst  result vector
+     *             constraints: 16-byte aligned
+     * @param src0 first source vector
+     *             constraints: 16-byte aligned
+     * @param src1 second source vector
+     *             constraints: 16-byte aligned
+     * @param win  half-window vector
+     *             constraints: 16-byte aligned
+     * @param len  length of vector
+     *             constraints: multiple of 4
+     */
+    void (*vector_fmul_window)(float *dst, const float *src0,
+                               const float *src1, const float *win, int len);
+
+    /**
+     * Calculate the product of two vectors of floats, add a third vector of
+     * floats and store the result in a vector of floats.
+     *
+     * @param dst  output vector
+     *             constraints: 32-byte aligned
+     * @param src0 first input vector
+     *             constraints: 32-byte aligned
+     * @param src1 second input vector
+     *             constraints: 32-byte aligned
+     * @param src2 third input vector
+     *             constraints: 32-byte aligned
+     * @param len  number of elements in the input
+     *             constraints: multiple of 16
+     */
+    void (*vector_fmul_add)(float *dst, const float *src0, const float *src1,
+                            const float *src2, int len);
+
+    /**
+     * Calculate the product of two vectors of floats, and store the result
+     * in a vector of floats. The second vector of floats is iterated over
+     * in reverse order.
+     *
+     * @param dst  output vector
+     *             constraints: 32-byte aligned
+     * @param src0 first input vector
+     *             constraints: 32-byte aligned
+     * @param src1 second input vector
+     *             constraints: 32-byte aligned
+     * @param len  number of elements in the input
+     *             constraints: multiple of 16
+     */
+    void (*vector_fmul_reverse)(float *dst, const float *src0,
+                                const float *src1, int len);
+
+    /**
+     * Calculate the sum and difference of two vectors of floats.
+     *
+     * @param v1  first input vector, sum output, 16-byte aligned
+     * @param v2  second input vector, difference output, 16-byte aligned
+     * @param len length of vectors, multiple of 4
+     */
+    void (*butterflies_float)(float *restrict v1, float *restrict v2, int len);
+
+    /**
+     * Calculate the scalar product of two vectors of floats.
+     *
+     * @param v1  first vector, 16-byte aligned
+     * @param v2  second vector, 16-byte aligned
+     * @param len length of vectors, multiple of 4
+     *
+     * @return sum of elementwise products
+     */
+    float (*scalarproduct_float)(const float *v1, const float *v2, int len);
 } AVFloatDSPContext;
 
 /**
+ * Return the scalar product of two vectors.
+ *
+ * @param v1  first input vector
+ * @param v2  first input vector
+ * @param len number of elements
+ *
+ * @return sum of elementwise products
+ */
+float avpriv_scalarproduct_float_c(const float *v1, const float *v2, int len);
+
+/**
  * Initialize a float DSP context.
  *
  * @param fdsp    float DSP context

libav-v10.1.tar.bz2/libavutil/frame.c Added

@@ -0,0 +1,479 @@
+/*
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "channel_layout.h"
+#include "buffer.h"
+#include "common.h"
+#include "dict.h"
+#include "frame.h"
+#include "imgutils.h"
+#include "mem.h"
+#include "samplefmt.h"
+
+static void get_frame_defaults(AVFrame *frame)
+{
+ if (frame->extended_data != frame->data)
+ av_freep(&frame->extended_data);
+
+ memset(frame, 0, sizeof(*frame));
+
+ frame->pts = AV_NOPTS_VALUE;
+ frame->key_frame = 1;
+ frame->sample_aspect_ratio = (AVRational){ 0, 1 };
+ frame->format = -1; /* unknown */
+ frame->extended_data = frame->data;
+}
+
+AVFrame *av_frame_alloc(void)
+{
+ AVFrame *frame = av_mallocz(sizeof(*frame));
+
+ if (!frame)
+ return NULL;
+
+ get_frame_defaults(frame);
+
+ return frame;
+}
+
+void av_frame_free(AVFrame **frame)
+{
+ if (!frame || !*frame)
+ return;
+
+ av_frame_unref(*frame);
+ av_freep(frame);
+}
+
+static int get_video_buffer(AVFrame *frame, int align)
+{
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
+ int ret, i;
+
+ if (!desc)
+ return AVERROR(EINVAL);
+
+ if ((ret = av_image_check_size(frame->width, frame->height, 0, NULL)) < 0)
+ return ret;
+
+ if (!frame->linesize[0]) {
+ ret = av_image_fill_linesizes(frame->linesize, frame->format,
+ frame->width);
+ if (ret < 0)
+ return ret;
+
+ for (i = 0; i < 4 && frame->linesize[i]; i++)
+ frame->linesize[i] = FFALIGN(frame->linesize[i], align);
+ }
+
+ for (i = 0; i < 4 && frame->linesize[i]; i++) {
+ int h = frame->height;
+ if (i == 1 || i == 2)
+ h = -((-h) >> desc->log2_chroma_h);
+
+ frame->buf[i] = av_buffer_alloc(frame->linesize[i] * h);
+ if (!frame->buf[i])
+ goto fail;
+
+ frame->data[i] = frame->buf[i]->data;
+ }
+ if (desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) {
+ av_buffer_unref(&frame->buf[1]);
+ frame->buf[1] = av_buffer_alloc(1024);
+ if (!frame->buf[1])
+ goto fail;
+ frame->data[1] = frame->buf[1]->data;
+ }
+
+ frame->extended_data = frame->data;
+
+ return 0;
+fail:
+ av_frame_unref(frame);
+ return AVERROR(ENOMEM);
+}
+
+static int get_audio_buffer(AVFrame *frame, int align)
+{
+ int channels = av_get_channel_layout_nb_channels(frame->channel_layout);
+ int planar = av_sample_fmt_is_planar(frame->format);
+ int planes = planar ? channels : 1;
+ int ret, i;
+
+ if (!frame->linesize[0]) {
+ ret = av_samples_get_buffer_size(&frame->linesize[0], channels,
+ frame->nb_samples, frame->format,
+ align);
+ if (ret < 0)
+ return ret;
+ }
+
+ if (planes > AV_NUM_DATA_POINTERS) {
+ frame->extended_data = av_mallocz(planes *
+ sizeof(*frame->extended_data));
+ frame->extended_buf = av_mallocz((planes - AV_NUM_DATA_POINTERS) *
+ sizeof(*frame->extended_buf));
+ if (!frame->extended_data || !frame->extended_buf) {
+ av_freep(&frame->extended_data);
+ av_freep(&frame->extended_buf);
+ return AVERROR(ENOMEM);
+ }
+ frame->nb_extended_buf = planes - AV_NUM_DATA_POINTERS;
+ } else
+ frame->extended_data = frame->data;
+
+ for (i = 0; i < FFMIN(planes, AV_NUM_DATA_POINTERS); i++) {
+ frame->buf[i] = av_buffer_alloc(frame->linesize[0]);
+ if (!frame->buf[i]) {
+ av_frame_unref(frame);
+ return AVERROR(ENOMEM);
+ }
+ frame->extended_data[i] = frame->data[i] = frame->buf[i]->data;
+ }
+ for (i = 0; i < planes - AV_NUM_DATA_POINTERS; i++) {
+ frame->extended_buf[i] = av_buffer_alloc(frame->linesize[0]);
+ if (!frame->extended_buf[i]) {
+ av_frame_unref(frame);
+ return AVERROR(ENOMEM);
+ }
+ frame->extended_data[i + AV_NUM_DATA_POINTERS] = frame->extended_buf[i]->data;
+ }
+ return 0;
+
+}
+
+int av_frame_get_buffer(AVFrame *frame, int align)
+{
+ if (frame->format < 0)
+ return AVERROR(EINVAL);
+
+ if (frame->width > 0 && frame->height > 0)
+ return get_video_buffer(frame, align);
+ else if (frame->nb_samples > 0 && frame->channel_layout)
+ return get_audio_buffer(frame, align);
+
+ return AVERROR(EINVAL);
+}
+
+int av_frame_ref(AVFrame *dst, const AVFrame *src)
+{
+ int i, ret = 0;
+
+ dst->format = src->format;
+ dst->width = src->width;
+ dst->height = src->height;
+ dst->channel_layout = src->channel_layout;
+ dst->nb_samples = src->nb_samples;
+
+ ret = av_frame_copy_props(dst, src);
+ if (ret < 0)
+ return ret;
+
+ /* duplicate the frame data if it's not refcounted */
+ if (!src->buf[0]) {
+ ret = av_frame_get_buffer(dst, 32);
+ if (ret < 0)
+ return ret;
+
+ if (src->nb_samples) {
+ int ch = av_get_channel_layout_nb_channels(src->channel_layout);
+ 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;
+ }
+
+ /* ref the buffers */
+ for (i = 0; i < FF_ARRAY_ELEMS(src->buf) && src->buf[i]; i++) {
+ dst->buf[i] = av_buffer_ref(src->buf[i]);
+ if (!dst->buf[i]) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ }
+
+ if (src->extended_buf) {
+ dst->extended_buf = av_mallocz(sizeof(*dst->extended_buf) *
+ src->nb_extended_buf);
+ if (!dst->extended_buf) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ dst->nb_extended_buf = src->nb_extended_buf;
+
+ for (i = 0; i < src->nb_extended_buf; i++) {
+ dst->extended_buf[i] = av_buffer_ref(src->extended_buf[i]);
+ if (!dst->extended_buf[i]) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ }
+ }
+
+ /* duplicate extended data */
+ if (src->extended_data != src->data) {
+ int ch = av_get_channel_layout_nb_channels(src->channel_layout);
+
+ if (!ch) {
+ ret = AVERROR(EINVAL);
+ goto fail;
+ }
+
+ dst->extended_data = av_malloc(sizeof(*dst->extended_data) * ch);
+ if (!dst->extended_data) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ memcpy(dst->extended_data, src->extended_data, sizeof(*src->extended_data) * ch);
+ } else
+ dst->extended_data = dst->data;
+
+ memcpy(dst->data, src->data, sizeof(src->data));
+ memcpy(dst->linesize, src->linesize, sizeof(src->linesize));
+
+ return 0;
+
+fail:
+ av_frame_unref(dst);
+ return ret;
+}
+
+AVFrame *av_frame_clone(const AVFrame *src)
+{
+ AVFrame *ret = av_frame_alloc();
+
+ if (!ret)
+ return NULL;
+
+ if (av_frame_ref(ret, src) < 0)
+ av_frame_free(&ret);
+
+ return ret;
+}
+
+void av_frame_unref(AVFrame *frame)
+{
+ int i;
+
+ for (i = 0; i < frame->nb_side_data; i++) {
+ av_freep(&frame->side_data[i]->data);
+ av_dict_free(&frame->side_data[i]->metadata);
+ av_freep(&frame->side_data[i]);
+ }
+ av_freep(&frame->side_data);
+
+ for (i = 0; i < FF_ARRAY_ELEMS(frame->buf); i++)
+ av_buffer_unref(&frame->buf[i]);
+ for (i = 0; i < frame->nb_extended_buf; i++)
+ av_buffer_unref(&frame->extended_buf[i]);
+ av_freep(&frame->extended_buf);
+ get_frame_defaults(frame);
+}
+
+void av_frame_move_ref(AVFrame *dst, AVFrame *src)
+{
+ *dst = *src;
+ if (src->extended_data == src->data)
+ dst->extended_data = dst->data;
+ memset(src, 0, sizeof(*src));
+ get_frame_defaults(src);
+}
+
+int av_frame_is_writable(AVFrame *frame)
+{
+ int i, ret = 1;
+
+ /* assume non-refcounted frames are not writable */
+ if (!frame->buf[0])
+ return 0;
+
+ for (i = 0; i < FF_ARRAY_ELEMS(frame->buf) && frame->buf[i]; i++)
+ ret &= !!av_buffer_is_writable(frame->buf[i]);
+ for (i = 0; i < frame->nb_extended_buf; i++)
+ ret &= !!av_buffer_is_writable(frame->extended_buf[i]);
+
+ return ret;
+}
+
+int av_frame_make_writable(AVFrame *frame)
+{
+ AVFrame tmp;
+ int ret;
+
+ if (!frame->buf[0])
+ return AVERROR(EINVAL);
+
+ if (av_frame_is_writable(frame))
+ return 0;
+
+ memset(&tmp, 0, sizeof(tmp));
+ tmp.format = frame->format;
+ tmp.width = frame->width;
+ tmp.height = frame->height;
+ tmp.channel_layout = frame->channel_layout;
+ tmp.nb_samples = frame->nb_samples;
+ ret = av_frame_get_buffer(&tmp, 32);
+ if (ret < 0)
+ return ret;
+
+ if (tmp.nb_samples) {
+ int ch = av_get_channel_layout_nb_channels(tmp.channel_layout);
+ 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_props(&tmp, frame);
+ if (ret < 0) {
+ av_frame_unref(&tmp);
+ return ret;
+ }
+
+ av_frame_unref(frame);
+
+ *frame = tmp;
+ if (tmp.data == tmp.extended_data)
+ frame->extended_data = frame->data;
+
+ return 0;
+}
+
+int av_frame_copy_props(AVFrame *dst, const AVFrame *src)
+{
+ 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->pkt_pts = src->pkt_pts;
+ dst->pkt_dts = src->pkt_dts;
+ dst->reordered_opaque = src->reordered_opaque;
+ dst->quality = src->quality;
+ dst->coded_picture_number = src->coded_picture_number;
+ dst->display_picture_number = src->display_picture_number;
+ dst->flags = src->flags;
+
+ memcpy(dst->error, src->error, sizeof(dst->error));
+
+ for (i = 0; i < src->nb_side_data; i++) {
+ const AVFrameSideData *sd_src = src->side_data[i];
+ AVFrameSideData *sd_dst = av_frame_new_side_data(dst, sd_src->type,
+ sd_src->size);
+ if (!sd_dst) {
+ for (i = 0; i < dst->nb_side_data; i++) {
+ av_freep(&dst->side_data[i]->data);
+ av_freep(&dst->side_data[i]);
+ av_dict_free(&dst->side_data[i]->metadata);
+ }
+ av_freep(&dst->side_data);
+ return AVERROR(ENOMEM);
+ }
+ memcpy(sd_dst->data, sd_src->data, sd_src->size);
+ av_dict_copy(&sd_dst->metadata, sd_src->metadata, 0);
+ }
+
+ return 0;
+}
+
+AVBufferRef *av_frame_get_plane_buffer(AVFrame *frame, int plane)
+{
+ uint8_t *data;
+ int planes, i;
+
+ if (frame->nb_samples) {
+ int channels = av_get_channel_layout_nb_channels(frame->channel_layout);
+ if (!channels)
+ return NULL;
+ planes = av_sample_fmt_is_planar(frame->format) ? channels : 1;
+ } else
+ planes = 4;
+
+ if (plane < 0 || plane >= planes || !frame->extended_data[plane])
+ return NULL;
+ data = frame->extended_data[plane];
+
+ for (i = 0; i < FF_ARRAY_ELEMS(frame->buf) && frame->buf[i]; i++) {
+ AVBufferRef *buf = frame->buf[i];
+ if (data >= buf->data && data < buf->data + buf->size)
+ return buf;
+ }
+ for (i = 0; i < frame->nb_extended_buf; i++) {
+ AVBufferRef *buf = frame->extended_buf[i];
+ if (data >= buf->data && data < buf->data + buf->size)
+ return buf;
+ }
+ return NULL;
+}
+
+AVFrameSideData *av_frame_new_side_data(AVFrame *frame,
+ enum AVFrameSideDataType type,
+ int size)
+{
+ AVFrameSideData *ret, **tmp;
+
+ if (frame->nb_side_data > INT_MAX / sizeof(*frame->side_data) - 1)
+ return NULL;
+
+ tmp = av_realloc(frame->side_data,
+ (frame->nb_side_data + 1) * sizeof(*frame->side_data));
+ if (!tmp)
+ return NULL;
+ frame->side_data = tmp;
+
+ ret = av_mallocz(sizeof(*ret));
+ if (!ret)
+ return NULL;
+
+ ret->data = av_malloc(size);
+ if (!ret->data) {
+ av_freep(&ret);
+ return NULL;
+ }
+
+ ret->size = size;
+ ret->type = type;
+
+ frame->side_data[frame->nb_side_data++] = ret;
+
+ return ret;
+}
+
+AVFrameSideData *av_frame_get_side_data(const AVFrame *frame,
+ enum AVFrameSideDataType type)
+{
+ int i;
+
+ for (i = 0; i < frame->nb_side_data; i++) {
+ if (frame->side_data[i]->type == type)
+ return frame->side_data[i];
+ }
+ return NULL;
+}

libav-v10.1.tar.bz2/libavutil/frame.h Added

@@ -0,0 +1,552 @@
+/*
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * 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 "avutil.h"
+#include "buffer.h"
+#include "dict.h"
+#include "rational.h"
+#include "samplefmt.h"
+#include "version.h"
+
+
+/**
+ * @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 {
+ enum AVFrameSideDataType type;
+ uint8_t *data;
+ int size;
+ AVDictionary *metadata;
+} AVFrameSideData;
+
+/**
+ * This structure describes decoded (raw) audio or video data.
+ *
+ * AVFrame must be allocated using av_frame_alloc(). Note that this only
+ * allocates the AVFrame itself, the buffers for the data must be managed
+ * through other means (see below).
+ * AVFrame must be freed with av_frame_free().
+ *
+ * AVFrame is typically allocated once and then reused multiple times to hold
+ * different data (e.g. a single AVFrame to hold frames received from a
+ * decoder). In such a case, av_frame_unref() will free any references held by
+ * the frame and reset it to its original clean state before it
+ * is reused again.
+ *
+ * The data described by an AVFrame is usually reference counted through the
+ * AVBuffer API. The underlying buffer references are stored in AVFrame.buf /
+ * AVFrame.extended_buf. An AVFrame is considered to be reference counted if at
+ * least one reference is set, i.e. if AVFrame.buf[0] != NULL. In such a case,
+ * every single data plane must be contained in one of the buffers in
+ * AVFrame.buf or AVFrame.extended_buf.
+ * There may be a single buffer for all the data, or one separate buffer for
+ * each plane, or anything in between.
+ *
+ * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added
+ * to the end with a minor bump.
+ */
+typedef struct AVFrame {
+#define AV_NUM_DATA_POINTERS 8
+ /**
+ * pointer to the picture/channel planes.
+ * This might be different from the first allocated byte
+ */
+ uint8_t *data[AV_NUM_DATA_POINTERS];
+
+ /**
+ * For video, size in bytes of each picture line.
+ * For audio, size in bytes of each plane.
+ *
+ * For audio, only linesize[0] may be set. For planar audio, each channel
+ * plane must be the same size.
+ *
+ * @note The linesize may be larger than the size of usable data -- there
+ * may be extra padding present for performance reasons.
+ */
+ int linesize[AV_NUM_DATA_POINTERS];
+
+ /**
+ * pointers to the data planes/channels.
+ *
+ * For video, this should simply point to data[].
+ *
+ * For planar audio, each channel has a separate data pointer, and
+ * linesize[0] contains the size of each channel buffer.
+ * For packed audio, there is just one data pointer, and linesize[0]
+ * contains the total size of the buffer for all channels.
+ *
+ * Note: Both data and extended_data should always be set in a valid frame,
+ * but for planar audio with more channels that can fit in data,
+ * extended_data must be used in order to access all channels.
+ */
+ uint8_t **extended_data;
+
+ /**
+ * width and height of the video frame
+ */
+ int width, height;
+
+ /**
+ * number of audio samples (per channel) described by this frame
+ */
+ int nb_samples;
+
+ /**
+ * format of the frame, -1 if unknown or unset
+ * Values correspond to enum AVPixelFormat for video frames,
+ * enum AVSampleFormat for audio)
+ */
+ int format;
+
+ /**
+ * 1 -> keyframe, 0-> not
+ */
+ int key_frame;
+
+ /**
+ * Picture type of the frame.
+ */
+ enum AVPictureType pict_type;
+
+#if FF_API_AVFRAME_LAVC
+ attribute_deprecated
+ uint8_t *base[AV_NUM_DATA_POINTERS];
+#endif
+
+ /**
+ * Sample aspect ratio for the video frame, 0/1 if unknown/unspecified.
+ */
+ AVRational sample_aspect_ratio;
+
+ /**
+ * Presentation timestamp in time_base units (time when frame should be shown to user).
+ */
+ int64_t pts;
+
+ /**
+ * PTS copied from the AVPacket that was decoded to produce this frame.
+ */
+ int64_t pkt_pts;
+
+ /**
+ * DTS copied from the AVPacket that triggered returning this frame.
+ */
+ int64_t pkt_dts;
+
+ /**
+ * picture number in bitstream order
+ */
+ int coded_picture_number;
+ /**
+ * picture number in display order
+ */
+ int display_picture_number;
+
+ /**
+ * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
+ */
+ int quality;
+
+#if FF_API_AVFRAME_LAVC
+ attribute_deprecated
+ int reference;
+
+ /**
+ * QP table
+ */
+ attribute_deprecated
+ int8_t *qscale_table;
+ /**
+ * QP store stride
+ */
+ attribute_deprecated
+ int qstride;
+
+ attribute_deprecated
+ int qscale_type;
+
+ /**
+ * mbskip_table[mb]>=1 if MB didn't change
+ * stride= mb_width = (width+15)>>4
+ */
+ attribute_deprecated
+ uint8_t *mbskip_table;
+
+ /**
+ * motion vector table
+ * @code
+ * example:
+ * int mv_sample_log2= 4 - motion_subsample_log2;
+ * int mb_width= (width+15)>>4;
+ * int mv_stride= (mb_width << mv_sample_log2) + 1;
+ * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];
+ * @endcode
+ */
+ attribute_deprecated
+ int16_t (*motion_val[2])[2];
+
+ /**
+ * macroblock type table
+ * mb_type_base + mb_width + 2
+ */
+ attribute_deprecated
+ uint32_t *mb_type;
+
+ /**
+ * DCT coefficients
+ */
+ attribute_deprecated
+ short *dct_coeff;
+
+ /**
+ * motion reference frame index
+ * the order in which these are stored can depend on the codec.
+ */
+ attribute_deprecated
+ int8_t *ref_index[2];
+#endif
+
+ /**
+ * for some private data of the user
+ */
+ void *opaque;
+
+ /**
+ * error
+ */
+ uint64_t error[AV_NUM_DATA_POINTERS];
+
+#if FF_API_AVFRAME_LAVC
+ attribute_deprecated
+ int type;
+#endif
+
+ /**
+ * When decoding, this signals how much the picture must be delayed.
+ * extra_delay = repeat_pict / (2*fps)
+ */
+ int repeat_pict;
+
+ /**
+ * The content of the picture is interlaced.
+ */
+ int interlaced_frame;
+
+ /**
+ * If the content is interlaced, is top field displayed first.
+ */
+ int top_field_first;
+
+ /**
+ * Tell user application that palette has changed from previous frame.
+ */
+ int palette_has_changed;
+
+#if FF_API_AVFRAME_LAVC
+ attribute_deprecated
+ int buffer_hints;
+
+ /**
+ * Pan scan.
+ */
+ attribute_deprecated
+ struct AVPanScan *pan_scan;
+#endif
+
+ /**
+ * reordered opaque 64bit (generally an integer or a double precision float
+ * PTS but can be anything).
+ * The user sets AVCodecContext.reordered_opaque to represent the input at
+ * that time,
+ * the decoder reorders values as needed and sets AVFrame.reordered_opaque
+ * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque
+ * @deprecated in favor of pkt_pts
+ */
+ int64_t reordered_opaque;
+
+#if FF_API_AVFRAME_LAVC
+ /**
+ * @deprecated this field is unused
+ */
+ attribute_deprecated void *hwaccel_picture_private;
+
+ attribute_deprecated
+ struct AVCodecContext *owner;
+ attribute_deprecated
+ void *thread_opaque;
+
+ /**
+ * log2 of the size of the block which a single vector in motion_val represents:
+ * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)
+ */
+ attribute_deprecated
+ uint8_t motion_subsample_log2;
+#endif
+
+ /**
+ * Sample rate of the audio data.
+ */
+ int sample_rate;
+
+ /**
+ * Channel layout of the audio data.
+ */
+ uint64_t channel_layout;
+
+ /**
+ * AVBuffer references backing the data for this frame. If all elements of
+ * this array are NULL, then this frame is not reference counted.
+ *
+ * There may be at most one AVBuffer per data plane, so for video this array
+ * always contains all the references. For planar audio with more than
+ * AV_NUM_DATA_POINTERS channels, there may be more buffers than can fit in
+ * this array. Then the extra AVBufferRef pointers are stored in the
+ * extended_buf array.
+ */
+ AVBufferRef *buf[AV_NUM_DATA_POINTERS];
+
+ /**
+ * For planar audio which requires more than AV_NUM_DATA_POINTERS
+ * AVBufferRef pointers, this array will hold all the references which
+ * cannot fit into AVFrame.buf.
+ *
+ * Note that this is different from AVFrame.extended_data, which always
+ * contains all the pointers. This array only contains the extra pointers,
+ * which cannot fit into AVFrame.buf.
+ *
+ * This array is always allocated using av_malloc() by whoever constructs
+ * the frame. It is freed in av_frame_unref().
+ */
+ AVBufferRef **extended_buf;
+ /**
+ * Number of elements in extended_buf.
+ */
+ int nb_extended_buf;
+
+ 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;
+} AVFrame;
+
+/**
+ * Allocate an AVFrame and set its fields to default values. The resulting
+ * struct must be freed using av_frame_free().
+ *
+ * @return An AVFrame filled with default values or NULL on failure.
+ *
+ * @note this only allocates the AVFrame itself, not the data buffers. Those
+ * must be allocated through other means, e.g. with av_frame_get_buffer() or
+ * manually.
+ */
+AVFrame *av_frame_alloc(void);
+
+/**
+ * Free the frame and any dynamically allocated objects in it,
+ * e.g. extended_data. If the frame is reference counted, it will be
+ * unreferenced first.
+ *
+ * @param frame frame to be freed. The pointer will be set to NULL.
+ */
+void av_frame_free(AVFrame **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.
+ *
+ * If src is not reference counted, new buffers are allocated and the data is
+ * copied.
+ *
+ * @return 0 on success, a negative AVERROR on error
+ */
+int av_frame_ref(AVFrame *dst, const AVFrame *src);
+
+/**
+ * Create a new frame that references the same data as src.
+ *
+ * This is a shortcut for av_frame_alloc()+av_frame_ref().
+ *
+ * @return newly created AVFrame on success, NULL on error.
+ */
+AVFrame *av_frame_clone(const AVFrame *src);
+
+/**
+ * Unreference all the buffers referenced by frame and reset the frame fields.
+ */
+void av_frame_unref(AVFrame *frame);
+
+/**
+ * Move everythnig contained in src to dst and reset src.
+ */
+void av_frame_move_ref(AVFrame *dst, AVFrame *src);
+
+/**
+ * Allocate new buffer(s) for audio or video data.
+ *
+ * The following fields must be set on frame before calling this function:
+ * - format (pixel format for video, sample format for audio)
+ * - width and height for video
+ * - nb_samples and channel_layout for audio
+ *
+ * This function will fill AVFrame.data and AVFrame.buf arrays and, if
+ * necessary, allocate and fill AVFrame.extended_data and AVFrame.extended_buf.
+ * For planar formats, one buffer will be allocated for each plane.
+ *
+ * @param frame frame in which to store the new buffers.
+ * @param align required buffer size alignment
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ */
+int av_frame_get_buffer(AVFrame *frame, int align);
+
+/**
+ * Check if the frame data is writable.
+ *
+ * @return A positive value if the frame data is writable (which is true if and
+ * only if each of the underlying buffers has only one reference, namely the one
+ * stored in this frame). Return 0 otherwise.
+ *
+ * If 1 is returned the answer is valid until av_buffer_ref() is called on any
+ * of the underlying AVBufferRefs (e.g. through av_frame_ref() or directly).
+ *
+ * @see av_frame_make_writable(), av_buffer_is_writable()
+ */
+int av_frame_is_writable(AVFrame *frame);
+
+/**
+ * Ensure that the frame data is writable, avoiding data copy if possible.
+ *
+ * Do nothing if the frame is writable, allocate new buffers and copy the data
+ * if it is not.
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ *
+ * @see av_frame_is_writable(), av_buffer_is_writable(),
+ * av_buffer_make_writable()
+ */
+int av_frame_make_writable(AVFrame *frame);
+
+/**
+ * Copy only "metadata" fields from src to dst.
+ *
+ * Metadata for the purpose of this function are those fields that do not affect
+ * the data layout in the buffers. E.g. pts, sample rate (for audio) or sample
+ * aspect ratio (for video), but not width/height or channel layout.
+ * Side data is also copied.
+ */
+int av_frame_copy_props(AVFrame *dst, const AVFrame *src);
+
+/**
+ * Get the buffer reference a given data plane is stored in.
+ *
+ * @param plane index of the data plane of interest in frame->extended_data.
+ *
+ * @return the buffer reference that contains the plane or NULL if the input
+ * frame is not valid.
+ */
+AVBufferRef *av_frame_get_plane_buffer(AVFrame *frame, int plane);
+
+/**
+ * Add a new side data to a frame.
+ *
+ * @param frame a frame to which the side data should be added
+ * @param type type of the added side data
+ * @param size size of the side data
+ *
+ * @return newly added side data on success, NULL on error
+ */
+AVFrameSideData *av_frame_new_side_data(AVFrame *frame,
+ enum AVFrameSideDataType type,
+ int size);
+
+/**
+ * @return a pointer to the side data of a given type on success, NULL if there
+ * is no side data with such type in this frame.
+ */
+AVFrameSideData *av_frame_get_side_data(const AVFrame *frame,
+ enum AVFrameSideDataType type);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_FRAME_H */

libav-v10.1.tar.bz2/libavutil/hmac.c Added

@@ -0,0 +1,187 @@
+/*
+ * Copyright (C) 2012 Martin Storsjo
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <string.h>
+
+#include "attributes.h"
+#include "hmac.h"
+#include "md5.h"
+#include "sha.h"
+#include "mem.h"
+
+#define MAX_HASHLEN 20
+#define MAX_BLOCKLEN 64
+
+struct AVHMAC {
+ void *hash;
+ int blocklen, hashlen;
+ void (*final)(void*, uint8_t*);
+ void (*update)(void*, const uint8_t*, int len);
+ void (*init)(void*);
+ uint8_t key[MAX_BLOCKLEN];
+ int keylen;
+};
+
+static av_cold void sha1_init(void *ctx)
+{
+ av_sha_init(ctx, 160);
+}
+
+AVHMAC *av_hmac_alloc(enum AVHMACType type)
+{
+ AVHMAC *c = av_mallocz(sizeof(*c));
+ if (!c)
+ return NULL;
+ switch (type) {
+ case AV_HMAC_MD5:
+ c->blocklen = 64;
+ c->hashlen = 16;
+ c->init = av_md5_init;
+ c->update = av_md5_update;
+ c->final = av_md5_final;
+ c->hash = av_md5_alloc();
+ break;
+ case AV_HMAC_SHA1:
+ c->blocklen = 64;
+ c->hashlen = 20;
+ c->init = sha1_init;
+ c->update = av_sha_update;
+ c->final = av_sha_final;
+ c->hash = av_sha_alloc();
+ break;
+ default:
+ av_free(c);
+ return NULL;
+ }
+ if (!c->hash) {
+ av_free(c);
+ return NULL;
+ }
+ return c;
+}
+
+void av_hmac_free(AVHMAC *c)
+{
+ if (!c)
+ return;
+ av_free(c->hash);
+ av_free(c);
+}
+
+void av_hmac_init(AVHMAC *c, const uint8_t *key, unsigned int keylen)
+{
+ int i;
+ uint8_t block[MAX_BLOCKLEN];
+ if (keylen > c->blocklen) {
+ c->init(c->hash);
+ c->update(c->hash, key, keylen);
+ c->final(c->hash, c->key);
+ c->keylen = c->hashlen;
+ } else {
+ memcpy(c->key, key, keylen);
+ c->keylen = keylen;
+ }
+ c->init(c->hash);
+ for (i = 0; i < c->keylen; i++)
+ block[i] = c->key[i] ^ 0x36;
+ for (i = c->keylen; i < c->blocklen; i++)
+ block[i] = 0x36;
+ c->update(c->hash, block, c->blocklen);
+}
+
+void av_hmac_update(AVHMAC *c, const uint8_t *data, unsigned int len)
+{
+ c->update(c->hash, data, len);
+}
+
+int av_hmac_final(AVHMAC *c, uint8_t *out, unsigned int outlen)
+{
+ uint8_t block[MAX_BLOCKLEN];
+ int i;
+ if (outlen < c->hashlen)
+ return AVERROR(EINVAL);
+ c->final(c->hash, out);
+ c->init(c->hash);
+ for (i = 0; i < c->keylen; i++)
+ block[i] = c->key[i] ^ 0x5C;
+ for (i = c->keylen; i < c->blocklen; i++)
+ block[i] = 0x5C;
+ c->update(c->hash, block, c->blocklen);
+ c->update(c->hash, out, c->hashlen);
+ c->final(c->hash, out);
+ return c->hashlen;
+}
+
+int av_hmac_calc(AVHMAC *c, const uint8_t *data, unsigned int len,
+ const uint8_t *key, unsigned int keylen,
+ uint8_t *out, unsigned int outlen)
+{
+ av_hmac_init(c, key, keylen);
+ av_hmac_update(c, data, len);
+ return av_hmac_final(c, out, outlen);
+}
+
+#ifdef TEST
+#include <stdio.h>
+
+static void test(AVHMAC *hmac, const uint8_t *key, int keylen,
+ const uint8_t *data, int datalen)
+{
+ uint8_t buf[MAX_HASHLEN];
+ int out, i;
+ // Some of the test vectors are strings, where sizeof() includes the
+ // trailing null byte - remove that.
+ if (!key[keylen - 1])
+ keylen--;
+ if (!data[datalen - 1])
+ datalen--;
+ out = av_hmac_calc(hmac, data, datalen, key, keylen, buf, sizeof(buf));
+ for (i = 0; i < out; i++)
+ printf("%02x", buf[i]);
+ printf("\n");
+}
+
+int main(void)
+{
+ uint8_t key1[16], key3[16], data3[50], key4[63], key5[64], key6[65];
+ const uint8_t key2[] = "Jefe";
+ const uint8_t data1[] = "Hi There";
+ const uint8_t data2[] = "what do ya want for nothing?";
+ AVHMAC *hmac = av_hmac_alloc(AV_HMAC_MD5);
+ if (!hmac)
+ return 1;
+ memset(key1, 0x0b, sizeof(key1));
+ memset(key3, 0xaa, sizeof(key3));
+ memset(key4, 0x44, sizeof(key4));
+ memset(key5, 0x55, sizeof(key5));
+ memset(key6, 0x66, sizeof(key6));
+ memset(data3, 0xdd, sizeof(data3));
+ // RFC 2104 test vectors
+ test(hmac, key1, sizeof(key1), data1, sizeof(data1));
+ test(hmac, key2, sizeof(key2), data2, sizeof(data2));
+ test(hmac, key3, sizeof(key3), data3, sizeof(data3));
+ // Additional tests, to test cases where the key is too long
+ test(hmac, key4, sizeof(key4), data1, sizeof(data1));
+ test(hmac, key5, sizeof(key5), data2, sizeof(data2));
+ test(hmac, key6, sizeof(key6), data3, sizeof(data3));
+ av_hmac_free(hmac);
+ return 0;
+}
+#endif /* TEST */

libav-v10.1.tar.bz2/libavutil/hmac.h Added

@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2012 Martin Storsjo
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_HMAC_H
+#define AVUTIL_HMAC_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_hmac HMAC
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+enum AVHMACType {
+ AV_HMAC_MD5,
+ AV_HMAC_SHA1,
+};
+
+typedef struct AVHMAC AVHMAC;
+
+/**
+ * Allocate an AVHMAC context.
+ * @param type The hash function used for the HMAC.
+ */
+AVHMAC *av_hmac_alloc(enum AVHMACType type);
+
+/**
+ * Free an AVHMAC context.
+ * @param ctx The context to free, may be NULL
+ */
+void av_hmac_free(AVHMAC *ctx);
+
+/**
+ * Initialize an AVHMAC context with an authentication key.
+ * @param ctx The HMAC context
+ * @param key The authentication key
+ * @param keylen The length of the key, in bytes
+ */
+void av_hmac_init(AVHMAC *ctx, const uint8_t *key, unsigned int keylen);
+
+/**
+ * Hash data with the HMAC.
+ * @param ctx The HMAC context
+ * @param data The data to hash
+ * @param len The length of the data, in bytes
+ */
+void av_hmac_update(AVHMAC *ctx, const uint8_t *data, unsigned int len);
+
+/**
+ * Finish hashing and output the HMAC digest.
+ * @param ctx The HMAC context
+ * @param out The output buffer to write the digest into
+ * @param outlen The length of the out buffer, in bytes
+ * @return The number of bytes written to out, or a negative error code.
+ */
+int av_hmac_final(AVHMAC *ctx, uint8_t *out, unsigned int outlen);
+
+/**
+ * Hash an array of data with a key.
+ * @param ctx The HMAC context
+ * @param data The data to hash
+ * @param len The length of the data, in bytes
+ * @param key The authentication key
+ * @param keylen The length of the key, in bytes
+ * @param out The output buffer to write the digest into
+ * @param outlen The length of the out buffer, in bytes
+ * @return The number of bytes written to out, or a negative error code.
+ */
+int av_hmac_calc(AVHMAC *ctx, const uint8_t *data, unsigned int len,
+ const uint8_t *key, unsigned int keylen,
+ uint8_t *out, unsigned int outlen);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_HMAC_H */

libav-v9.6.tar.bz2/libavutil/imgutils.c -> libav-v10.1.tar.bz2/libavutil/imgutils.c Changed

@@ -55,7 +55,7 @@
     if (!desc)
         return AVERROR(EINVAL);
 
-    if (desc->flags & PIX_FMT_BITSTREAM)
+    if (desc->flags & AV_PIX_FMT_FLAG_BITSTREAM)
         return (width * (desc->comp[0].step_minus1+1) + 7) >> 3;
 
     av_image_fill_max_pixsteps(max_step, max_step_comp, desc);
@@ -72,10 +72,10 @@
 
     memset(linesizes, 0, 4*sizeof(linesizes[0]));
 
-    if (!desc || desc->flags & PIX_FMT_HWACCEL)
+    if (!desc || desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
         return AVERROR(EINVAL);
 
-    if (desc->flags & PIX_FMT_BITSTREAM) {
+    if (desc->flags & AV_PIX_FMT_FLAG_BITSTREAM) {
         if (width > (INT_MAX -7) / (desc->comp[0].step_minus1+1))
             return AVERROR(EINVAL);
         linesizes[0] = (width * (desc->comp[0].step_minus1+1) + 7) >> 3;
@@ -102,7 +102,7 @@
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
     memset(data     , 0, sizeof(data[0])*4);
 
-    if (!desc || desc->flags & PIX_FMT_HWACCEL)
+    if (!desc || desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
         return AVERROR(EINVAL);
 
     data[0] = ptr;
@@ -110,8 +110,8 @@
         return AVERROR(EINVAL);
     size[0] = linesizes[0] * height;
 
-    if (desc->flags & PIX_FMT_PAL ||
-        desc->flags & PIX_FMT_PSEUDOPAL) {
+    if (desc->flags & AV_PIX_FMT_FLAG_PAL ||
+        desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) {
         size[0] = (size[0] + 3) & ~3;
         data[1] = ptr + size[0]; /* palette is stored here as 256 32 bits words */
         return size[0] + 256 * 4;
@@ -203,7 +203,7 @@
         av_free(buf);
         return ret;
     }
-    if (desc->flags & PIX_FMT_PAL || desc->flags & PIX_FMT_PSEUDOPAL)
+    if (desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)
         avpriv_set_systematic_pal2((uint32_t*)pointers[1], pix_fmt);
 
     return ret;
@@ -247,11 +247,11 @@
 {
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
 
-    if (!desc || desc->flags & PIX_FMT_HWACCEL)
+    if (!desc || desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
         return;
 
-    if (desc->flags & PIX_FMT_PAL ||
-        desc->flags & PIX_FMT_PSEUDOPAL) {
+    if (desc->flags & AV_PIX_FMT_FLAG_PAL ||
+        desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) {
         av_image_copy_plane(dst_data[0], dst_linesizes[0],
                             src_data[0], src_linesizes[0],
                             width, height);

libav-v9.6.tar.bz2/libavutil/internal.h -> libav-v10.1.tar.bz2/libavutil/internal.h Changed

@@ -36,9 +36,16 @@
 #include <assert.h>
 #include "config.h"
 #include "attributes.h"
-#include "timer.h"
 #include "dict.h"
 
+#if ARCH_X86
+# include "x86/emms.h"
+#endif
+
+#ifndef emms_c
+# define emms_c()
+#endif
+
 #ifndef attribute_align_arg
 #if ARCH_X86_32 && AV_GCC_VERSION_AT_LEAST(4,2)
 # define attribute_align_arg __attribute__((force_align_arg_pointer))
@@ -53,10 +60,52 @@
 # define av_export
 #endif
 
+#if HAVE_PRAGMA_DEPRECATED
+# if defined(__ICL)
+# define FF_DISABLE_DEPRECATION_WARNINGS __pragma(warning(push)) __pragma(warning(disable:1478))
+# define FF_ENABLE_DEPRECATION_WARNINGS __pragma(warning(pop))
+# elif defined(_MSC_VER)
+# define FF_DISABLE_DEPRECATION_WARNINGS __pragma(warning(push)) __pragma(warning(disable:4996))
+# define FF_ENABLE_DEPRECATION_WARNINGS __pragma(warning(pop))
+# else
+# define FF_DISABLE_DEPRECATION_WARNINGS _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+# define FF_ENABLE_DEPRECATION_WARNINGS _Pragma("GCC diagnostic warning \"-Wdeprecated-declarations\"")
+# endif
+#else
+# define FF_DISABLE_DEPRECATION_WARNINGS
+# define FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
 #ifndef INT_BIT
 # define INT_BIT (CHAR_BIT * sizeof(int))
 #endif
 
+// Some broken preprocessors need a second expansion
+// to be forced to tokenize __VA_ARGS__
+#define E1(x) x
+
+#define LOCAL_ALIGNED_A(a, t, v, s, o, ...) \
+ uint8_t la_##v[sizeof(t s o) + (a)]; \
+ t (*v) o = (void *)FFALIGN((uintptr_t)la_##v, a)
+
+#define LOCAL_ALIGNED_D(a, t, v, s, o, ...) \
+ DECLARE_ALIGNED(a, t, la_##v) s o; \
+ t (*v) o = la_##v
+
+#define LOCAL_ALIGNED(a, t, v, ...) E1(LOCAL_ALIGNED_A(a, t, v, __VA_ARGS__,,))
+
+#if HAVE_LOCAL_ALIGNED_8
+# define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,))
+#else
+# define LOCAL_ALIGNED_8(t, v, ...) LOCAL_ALIGNED(8, t, v, __VA_ARGS__)
+#endif
+
+#if HAVE_LOCAL_ALIGNED_16
+# define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,))
+#else
+# define LOCAL_ALIGNED_16(t, v, ...) LOCAL_ALIGNED(16, t, v, __VA_ARGS__)
+#endif
+
 #define FF_ALLOC_OR_GOTO(ctx, p, size, label)\
 {\
 p = av_malloc(size);\
@@ -77,6 +126,11 @@
 
 #include "libm.h"
 
+#if defined(_MSC_VER)
+#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_strtod")
+#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_snprintf")
+#endif
+
 /**
 * Return NULL if CONFIG_SMALL is true, otherwise the argument
 * without modification. Used to disable the definition of strings
@@ -128,21 +182,34 @@
 # define ONLY_IF_THREADS_ENABLED(x) NULL
 #endif
 
-#if HAVE_MMX_INLINE
 /**
- * Empty mmx state.
- * this must be called between any dsp function and float/double code.
- * for example sin(); dsp->idct_put(); emms_c(); cos()
+ * Log a generic warning message about a missing feature.
+ *
+ * @param[in] avc a pointer to an arbitrary struct of which the first
+ * field is a pointer to an AVClass struct
+ * @param[in] msg string containing the name of the missing feature
 */
-static av_always_inline void emms_c(void)
-{
- __asm__ volatile ("emms" ::: "memory");
-}
-#elif HAVE_MMX && HAVE_MM_EMPTY
-# include <mmintrin.h>
-# define emms_c _mm_empty
-#else
-# define emms_c()
-#endif /* HAVE_MMX_INLINE */
+void avpriv_report_missing_feature(void *avc,
+ const char *msg, ...) av_printf_format(2, 3);
+
+/**
+ * Log a generic warning message about a missing feature.
+ * Additionally request that a sample showcasing the feature be uploaded.
+ *
+ * @param[in] avc a pointer to an arbitrary struct of which the first field is
+ * a pointer to an AVClass struct
+ * @param[in] msg string containing the name of the missing feature
+ */
+void avpriv_request_sample(void *avc,
+ const char *msg, ...) av_printf_format(2, 3);
+
+#if HAVE_LIBC_MSVCRT
+#define avpriv_open ff_open
+#endif
+
+/**
+ * A wrapper for open() setting O_CLOEXEC.
+ */
+int avpriv_open(const char *filename, int flags, ...);
 
 #endif /* AVUTIL_INTERNAL_H */

libav-v9.6.tar.bz2/libavutil/lls.c -> libav-v10.1.tar.bz2/libavutil/lls.c Changed

@@ -28,31 +28,26 @@
 #include <math.h>
 #include <string.h>
 
+#include "attributes.h"
+#include "version.h"
 #include "lls.h"
 
-void av_init_lls(LLSModel *m, int indep_count)
-{
- memset(m, 0, sizeof(LLSModel));
- m->indep_count = indep_count;
-}
-
-void av_update_lls(LLSModel *m, double *var, double decay)
+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] *= decay;
 m->covariance[i][j] += var[i] * var[j];
 }
 }
 }
 
-void av_solve_lls(LLSModel *m, double threshold, int min_order)
+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 (*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;
 
@@ -105,7 +100,7 @@
 }
 }
 
-double av_evaluate_lls(LLSModel *m, double *param, int order)
+static double evaluate_lls(LLSModel *m, double *param, int order)
 {
 int i;
 double out = 0;
@@ -116,6 +111,35 @@
 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>
@@ -129,20 +153,20 @@
 AVLFG lfg;
 
 av_lfg_init(&lfg, 1);
- av_init_lls(&m, 3);
+ avpriv_init_lls(&m, 3);
 
 for (i = 0; i < 100; i++) {
- double var[4];
+ 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;
- av_update_lls(&m, var, 0.99);
- av_solve_lls(&m, 0.001, 0);
+ m.update_lls(&m, var);
+ avpriv_solve_lls(&m, 0.001, 0);
 for (order = 0; order < 3; order++) {
- eval = av_evaluate_lls(&m, var + 1, 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],

libav-v9.6.tar.bz2/libavutil/lls.h -> libav-v10.1.tar.bz2/libavutil/lls.h Changed

@@ -23,23 +23,49 @@
 #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{
-    double covariance[MAX_VARS+1][MAX_VARS+1];
-    double coeff[MAX_VARS][MAX_VARS];
+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;
-}LLSModel;
+    /**
+     * 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 */

libav-v9.6.tar.bz2/libavutil/log.c -> libav-v10.1.tar.bz2/libavutil/log.c Changed

@@ -32,10 +32,12 @@
 #if HAVE_IO_H
 #include <io.h>
 #endif
+#include <stdarg.h>
 #include <stdlib.h>
 #include "avstring.h"
 #include "avutil.h"
 #include "common.h"
+#include "internal.h"
 #include "log.h"
 
 static int av_log_level = AV_LOG_INFO;
@@ -92,20 +94,20 @@
 return (*(AVClass **) ptr)->class_name;
 }
 
-void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl)
+void av_log_default_callback(void *avcl, int level, const char *fmt, va_list vl)
 {
 static int print_prefix = 1;
 static int count;
 static char prev[1024];
 char line[1024];
 static int is_atty;
- AVClass* avc = ptr ? *(AVClass **) ptr : NULL;
+ AVClass* avc = avcl ? *(AVClass **) avcl : NULL;
 if (level > av_log_level)
 return;
 line[0] = 0;
 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) {
 snprintf(line, sizeof(line), "[%s @ %p] ",
@@ -113,7 +115,7 @@
 }
 }
 snprintf(line + strlen(line), sizeof(line) - strlen(line), "[%s @ %p] ",
- avc->item_name(ptr), ptr);
+ avc->item_name(avcl), avcl);
 }
 
 vsnprintf(line + strlen(line), sizeof(line) - strlen(line), fmt, vl);
@@ -179,3 +181,35 @@
 {
 av_log_callback = callback;
 }
+
+static void missing_feature_sample(int sample, void *avc, const char *msg,
+ va_list argument_list)
+{
+ av_vlog(avc, AV_LOG_WARNING, msg, argument_list);
+ av_log(avc, AV_LOG_WARNING, " is not implemented. Update your Libav "
+ "version to the newest one from Git. If the problem still "
+ "occurs, it means that your file has a feature which has not "
+ "been implemented.\n");
+ if (sample)
+ av_log(avc, AV_LOG_WARNING, "If you want to help, upload a sample "
+ "of this file to ftp://upload.libav.org/incoming/ "
+ "and contact the libav-devel mailing list.\n");
+}
+
+void avpriv_request_sample(void *avc, const char *msg, ...)
+{
+ va_list argument_list;
+
+ va_start(argument_list, msg);
+ missing_feature_sample(1, avc, msg, argument_list);
+ va_end(argument_list);
+}
+
+void avpriv_report_missing_feature(void *avc, const char *msg, ...)
+{
+ va_list argument_list;
+
+ va_start(argument_list, msg);
+ missing_feature_sample(0, avc, msg, argument_list);
+ va_end(argument_list);
+}

libav-v9.6.tar.bz2/libavutil/log.h -> libav-v10.1.tar.bz2/libavutil/log.h Changed

@@ -89,8 +89,19 @@
     const struct AVClass* (*child_class_next)(const struct AVClass *prev);
 } AVClass;
 
-/* av_log API */
+/**
+ * @addtogroup lavu_log
+ *
+ * @{
+ *
+ * @defgroup lavu_log_constants Logging Constants
+ *
+ * @{
+ */
 
+/**
+ * Print no output.
+ */
 #define AV_LOG_QUIET    -8
 
 /**
@@ -117,7 +128,14 @@
  */
 #define AV_LOG_WARNING  24
 
+/**
+ * Standard information.
+ */
 #define AV_LOG_INFO     32
+
+/**
+ * Detailed information.
+ */
 #define AV_LOG_VERBOSE  40
 
 /**
@@ -126,26 +144,93 @@
 #define AV_LOG_DEBUG    48
 
 /**
+ * @}
+ */
+
+/**
  * Send the specified message to the log if the level is less than or equal
  * to the current av_log_level. By default, all logging messages are sent to
- * stderr. This behavior can be altered by setting a different av_vlog callback
+ * stderr. This behavior can be altered by setting a different logging callback
  * function.
+ * @see av_log_set_callback
  *
  * @param avcl A pointer to an arbitrary struct of which the first field is a
- * pointer to an AVClass struct.
- * @param level The importance level of the message, lower values signifying
- * higher importance.
+ *        pointer to an AVClass struct.
+ * @param level The importance level of the message expressed using a @ref
+ *        lavu_log_constants "Logging Constant".
  * @param fmt The format string (printf-compatible) that specifies how
- * subsequent arguments are converted to output.
- * @see av_vlog
+ *        subsequent arguments are converted to output.
  */
 void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4);
 
-void av_vlog(void *avcl, int level, const char *fmt, va_list);
+
+/**
+ * Send the specified message to the log if the level is less than or equal
+ * to the current av_log_level. By default, all logging messages are sent to
+ * stderr. This behavior can be altered by setting a different logging callback
+ * function.
+ * @see av_log_set_callback
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ *        pointer to an AVClass struct.
+ * @param level The importance level of the message expressed using a @ref
+ *        lavu_log_constants "Logging Constant".
+ * @param fmt The format string (printf-compatible) that specifies how
+ *        subsequent arguments are converted to output.
+ * @param vl The arguments referenced by the format string.
+ */
+void av_vlog(void *avcl, int level, const char *fmt, va_list vl);
+
+/**
+ * Get the current log level
+ *
+ * @see lavu_log_constants
+ *
+ * @return Current log level
+ */
 int av_log_get_level(void);
-void av_log_set_level(int);
-void av_log_set_callback(void (*)(void*, int, const char*, va_list));
-void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl);
+
+/**
+ * Set the log level
+ *
+ * @see lavu_log_constants
+ *
+ * @param level Logging level
+ */
+void av_log_set_level(int level);
+
+/**
+ * Set the logging callback
+ *
+ * @see av_log_default_callback
+ *
+ * @param callback A logging function with a compatible signature.
+ */
+void av_log_set_callback(void (*callback)(void*, int, const char*, va_list));
+
+/**
+ * Default logging callback
+ *
+ * It prints the message to stderr, optionally colorizing it.
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ *        pointer to an AVClass struct.
+ * @param level The importance level of the message expressed using a @ref
+ *        lavu_log_constants "Logging Constant".
+ * @param fmt The format string (printf-compatible) that specifies how
+ *        subsequent arguments are converted to output.
+ * @param vl The arguments referenced by the format string.
+ */
+void av_log_default_callback(void *avcl, int level, const char *fmt,
+                             va_list vl);
+
+/**
+ * Return the context name
+ *
+ * @param  ctx The AVClass context
+ *
+ * @return The AVClass class_name
+ */
 const char* av_default_item_name(void* ctx);
 
 /**
@@ -170,4 +255,8 @@
 #define AV_LOG_SKIP_REPEATED 1
 void av_log_set_flags(int arg);
 
+/**
+ * @}
+ */
+
 #endif /* AVUTIL_LOG_H */

libav-v10.1.tar.bz2/libavutil/macros.h Added

libav-v9.6.tar.bz2/libavutil/mathematics.c -> libav-v10.1.tar.bz2/libavutil/mathematics.c Changed

libav-v9.6.tar.bz2/libavutil/mem.c -> libav-v10.1.tar.bz2/libavutil/mem.c Changed

@@ -35,6 +35,7 @@
 #endif
 
 #include "avutil.h"
+#include "common.h"
 #include "intreadwrite.h"
 #include "mem.h"
 
@@ -65,7 +66,7 @@
 long diff;
 #endif
 
- /* let's disallow possible ambiguous cases */
+ /* let's disallow possibly ambiguous cases */
 if (size > (INT_MAX - 32) || !size)
 return NULL;
 
@@ -119,7 +120,7 @@
 int diff;
 #endif
 
- /* let's disallow possible ambiguous cases */
+ /* let's disallow possibly ambiguous cases */
 if (size > (INT_MAX - 16))
 return NULL;
 
@@ -136,6 +137,52 @@
 #endif
 }
 
+int av_reallocp(void *ptr, size_t size)
+{
+ void **ptrptr = ptr;
+ void *ret;
+
+ if (!size) {
+ av_freep(ptr);
+ return 0;
+ }
+ ret = av_realloc(*ptrptr, size);
+
+ if (!ret) {
+ av_freep(ptr);
+ return AVERROR(ENOMEM);
+ }
+
+ *ptrptr = ret;
+ return 0;
+}
+
+void *av_realloc_array(void *ptr, size_t nmemb, size_t size)
+{
+ if (!size || nmemb >= INT_MAX / size)
+ return NULL;
+ return av_realloc(ptr, nmemb * size);
+}
+
+int av_reallocp_array(void *ptr, size_t nmemb, size_t size)
+{
+ void **ptrptr = ptr;
+ void *ret;
+ if (!size || nmemb >= INT_MAX / size)
+ return AVERROR(ENOMEM);
+ if (!nmemb) {
+ av_freep(ptr);
+ return 0;
+ }
+ ret = av_realloc(*ptrptr, nmemb * size);
+ if (!ret) {
+ av_freep(ptr);
+ return AVERROR(ENOMEM);
+ }
+ *ptrptr = ret;
+ return 0;
+}
+
 void av_free(void *ptr)
 {
 #if CONFIG_MEMALIGN_HACK
@@ -168,7 +215,7 @@
 char *ptr = NULL;
 if (s) {
 int len = strlen(s) + 1;
- ptr = av_malloc(len);
+ ptr = av_realloc(NULL, len);
 if (ptr)
 memcpy(ptr, s, len);
 }
@@ -298,3 +345,35 @@
 *dst = *src;
 }
 }
+
+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;
+}
+
+void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size)
+{
+ void **p = ptr;
+ if (min_size < *size)
+ return;
+ min_size = FFMAX(17 * min_size / 16 + 32, min_size);
+ av_free(*p);
+ *p = av_malloc(min_size);
+ if (!*p)
+ min_size = 0;
+ *size = min_size;
+}

libav-v9.6.tar.bz2/libavutil/mem.h -> libav-v10.1.tar.bz2/libavutil/mem.h Changed

@@ -82,8 +82,7 @@
 void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
 
 /**
- * Helper function to allocate a block of size * nmemb bytes with
- * using av_malloc()
+ * Allocate a block of size * nmemb bytes with av_malloc().
 * @param nmemb Number of elements
 * @param size Size of the single element
 * @return Pointer to the allocated block, NULL if the block cannot
@@ -92,7 +91,7 @@
 */
 av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size)
 {
- if (size <= 0 || nmemb >= INT_MAX / size)
+ if (!size || nmemb >= INT_MAX / size)
 return NULL;
 return av_malloc(nmemb * size);
 }
@@ -102,16 +101,79 @@
 * If ptr is NULL and size > 0, allocate a new block. If
 * size is zero, free the memory block pointed to by ptr.
 * @param ptr Pointer to a memory block already allocated with
- * av_malloc(z)() or av_realloc() or NULL.
- * @param size Size in bytes for the memory block to be allocated or
+ * av_realloc() or NULL.
+ * @param size Size in bytes of the memory block to be allocated or
 * reallocated.
- * @return Pointer to a newly reallocated block or NULL if the block
+ * @return Pointer to a newly-reallocated block or NULL if the block
 * cannot be reallocated or the function is used to free the memory block.
+ * @warning Pointers originating from the av_malloc() family of functions must
+ * not be passed to av_realloc(). The former can be implemented using
+ * memalign() (or other functions), and there is no guarantee that
+ * pointers from such functions can be passed to realloc() at all.
+ * The situation is undefined according to POSIX and may crash with
+ * some libc implementations.
 * @see av_fast_realloc()
 */
 void *av_realloc(void *ptr, size_t size) av_alloc_size(2);
 
 /**
+ * Allocate or reallocate a block of memory.
+ * If *ptr is NULL and size > 0, allocate a new block. If
+ * size is zero, free the memory block pointed to by ptr.
+ * @param ptr Pointer to a pointer to a memory block already allocated
+ * with av_realloc(), or pointer to a pointer to NULL.
+ * The pointer is updated on success, or freed on failure.
+ * @param size Size in bytes for the memory block to be allocated or
+ * reallocated
+ * @return Zero on success, an AVERROR error code on failure.
+ * @warning Pointers originating from the av_malloc() family of functions must
+ * not be passed to av_reallocp(). The former can be implemented using
+ * memalign() (or other functions), and there is no guarantee that
+ * pointers from such functions can be passed to realloc() at all.
+ * The situation is undefined according to POSIX and may crash with
+ * some libc implementations.
+ */
+int av_reallocp(void *ptr, size_t size);
+
+/**
+ * Allocate or reallocate an array.
+ * If ptr is NULL and nmemb > 0, allocate a new block. If
+ * nmemb is zero, free the memory block pointed to by ptr.
+ * @param ptr Pointer to a memory block already allocated with
+ * av_realloc() or NULL.
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Pointer to a newly-reallocated block or NULL if the block
+ * cannot be reallocated or the function is used to free the memory block.
+ * @warning Pointers originating from the av_malloc() family of functions must
+ * not be passed to av_realloc(). The former can be implemented using
+ * memalign() (or other functions), and there is no guarantee that
+ * pointers from such functions can be passed to realloc() at all.
+ * The situation is undefined according to POSIX and may crash with
+ * some libc implementations.
+ */
+av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size);
+
+/**
+ * Allocate or reallocate an array through a pointer to a pointer.
+ * If *ptr is NULL and nmemb > 0, allocate a new block. If
+ * nmemb is zero, free the memory block pointed to by ptr.
+ * @param ptr Pointer to a pointer to a memory block already allocated
+ * with av_realloc(), or pointer to a pointer to NULL.
+ * The pointer is updated on success, or freed on failure.
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @return Zero on success, an AVERROR error code on failure.
+ * @warning Pointers originating from the av_malloc() family of functions must
+ * not be passed to av_realloc(). The former can be implemented using
+ * memalign() (or other functions), and there is no guarantee that
+ * pointers from such functions can be passed to realloc() at all.
+ * The situation is undefined according to POSIX and may crash with
+ * some libc implementations.
+ */
+av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
+
+/**
 * Free a memory block which has been allocated with av_malloc(z)() or
 * av_realloc().
 * @param ptr Pointer to the memory block which should be freed.
@@ -132,8 +194,7 @@
 void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
 
 /**
- * Helper function to allocate a block of size * nmemb bytes with
- * using av_mallocz()
+ * Allocate a block of size * nmemb bytes with av_mallocz().
 * @param nmemb Number of elements
 * @param size Size of the single element
 * @return Pointer to the allocated block, NULL if the block cannot
@@ -143,7 +204,7 @@
 */
 av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size)
 {
- if (size <= 0 || nmemb >= INT_MAX / size)
+ if (!size || nmemb >= INT_MAX / size)
 return NULL;
 return av_mallocz(nmemb * size);
 }
@@ -151,7 +212,7 @@
 /**
 * Duplicate the string s.
 * @param s string to be duplicated
- * @return Pointer to a newly allocated string containing a
+ * @return Pointer to a newly-allocated string containing a
 * copy of s or NULL if the string cannot be allocated.
 */
 char *av_strdup(const char *s) av_malloc_attrib;
@@ -166,7 +227,7 @@
 void av_freep(void *ptr);
 
 /**
- * @brief deliberately overlapping memcpy implementation
+ * deliberately overlapping memcpy implementation
 * @param dst destination buffer
 * @param back how many bytes back we start (the initial size of the overlapping window)
 * @param cnt number of bytes to copy, must be >= 0
@@ -177,6 +238,27 @@
 void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
 
 /**
+ * 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);
+
+/**
 * @}
 */

libav-v9.6.tar.bz2/libavutil/old_pix_fmts.h -> libav-v10.1.tar.bz2/libavutil/old_pix_fmts.h Changed

@@ -42,8 +42,10 @@
 PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
 PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
 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
 PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
 PIX_FMT_XVMC_MPEG2_IDCT,
+#endif /* FF_API_XVMC */
 PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
 PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
 PIX_FMT_BGR8, ///< packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb)
@@ -65,11 +67,13 @@
 PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
 PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
 PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+#if FF_API_VDPAU
 PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
 PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
 PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
 PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
 PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
 PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
 PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
 
@@ -93,7 +97,9 @@
 PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
 PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
 PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+#if FF_API_VDPAU
 PIX_FMT_VDPAU_MPEG4, ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
 PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
 
 PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0

libav-v9.6.tar.bz2/libavutil/opt.c -> libav-v10.1.tar.bz2/libavutil/opt.c Changed

@@ -61,7 +61,8 @@
 
 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\n",
 num*intnum/den, o->name);
 return AVERROR(ERANGE);
@@ -146,7 +147,7 @@
 opt->type == AV_OPT_TYPE_INT) ? \
 opt->default_val.i64 : opt->default_val.dbl)
 
-static int set_string_number(void *obj, const AVOption *o, const char *val, void *dst)
+static int set_string_number(void *obj, void *target_obj, const AVOption *o, const char *val, void *dst)
 {
 int ret = 0, notfirst = 0;
 for (;;) {
@@ -169,7 +170,7 @@
 buf[i] = 0;
 
 {
- const AVOption *o_named = av_opt_find(obj, buf, o->unit, 0, 0);
+ const AVOption *o_named = av_opt_find(target_obj, buf, o->unit, 0, 0);
 if (o_named && o_named->type == AV_OPT_TYPE_CONST)
 d = DEFAULT_NUMVAL(o_named);
 else if (!strcmp(buf, "default")) d = DEFAULT_NUMVAL(o);
@@ -224,7 +225,7 @@
 case AV_OPT_TYPE_INT64:
 case AV_OPT_TYPE_FLOAT:
 case AV_OPT_TYPE_DOUBLE:
- case AV_OPT_TYPE_RATIONAL: return set_string_number(obj, o, val, dst);
+ case AV_OPT_TYPE_RATIONAL: return set_string_number(obj, target_obj, o, val, dst);
 }
 
 av_log(obj, AV_LOG_ERROR, "Invalid option type.\n");
@@ -236,7 +237,7 @@
 {\
 if (!o || o->type != opttype)\
 return AVERROR(EINVAL);\
- return set_string_number(obj, o, val, name ## _out);\
+ return set_string_number(obj, obj, o, val, name ## _out);\
 }
 
 OPT_EVAL_NUMBER(flags, AV_OPT_TYPE_FLAGS, int)
@@ -349,7 +350,7 @@
 return 0;
 }
 
-static int get_number(void *obj, const char *name, const AVOption **o_out, double *num, int *den, int64_t *intnum,
+static int get_number(void *obj, const char *name, double *num, int *den, int64_t *intnum,
 int search_flags)
 {
 void *dst, *target_obj;
@@ -359,8 +360,6 @@
 
 dst = ((uint8_t*)target_obj) + o->offset;
 
- if (o_out) *o_out= o;
-
 return read_number(o, dst, num, den, intnum);
 
 error:
@@ -374,7 +373,7 @@
 double num = 1;
 int ret, den = 1;
 
- if ((ret = get_number(obj, name, NULL, &num, &den, &intnum, search_flags)) < 0)
+ if ((ret = get_number(obj, name, &num, &den, &intnum, search_flags)) < 0)
 return ret;
 *out_val = num*intnum/den;
 return 0;
@@ -386,7 +385,7 @@
 double num = 1;
 int ret, den = 1;
 
- if ((ret = get_number(obj, name, NULL, &num, &den, &intnum, search_flags)) < 0)
+ if ((ret = get_number(obj, name, &num, &den, &intnum, search_flags)) < 0)
 return ret;
 *out_val = num*intnum/den;
 return 0;
@@ -398,7 +397,7 @@
 double num = 1;
 int ret, den = 1;
 
- if ((ret = get_number(obj, name, NULL, &num, &den, &intnum, search_flags)) < 0)
+ if ((ret = get_number(obj, name, &num, &den, &intnum, search_flags)) < 0)
 return ret;
 
 if (num == 1.0 && (int)intnum == intnum)
@@ -564,9 +563,16 @@
 char *val;
 int ret;
 
+ if (!key)
+ return AVERROR(ENOMEM);
+
 if (*key && strspn(*buf, key_val_sep)) {
 (*buf)++;
 val = av_get_token(buf, pairs_sep);
+ if (!val) {
+ av_freep(&key);
+ return AVERROR(ENOMEM);
+ }
 } else {
 av_log(ctx, AV_LOG_ERROR, "Missing key or no key/value separator found after key '%s'\n", key);
 av_free(key);
@@ -575,7 +581,7 @@
 
 av_log(ctx, AV_LOG_DEBUG, "Setting value '%s' for key '%s'\n", val, key);
 
- ret = av_opt_set(ctx, key, val, 0);
+ ret = av_opt_set(ctx, key, val, AV_OPT_SEARCH_CHILDREN);
 if (ret == AVERROR_OPTION_NOT_FOUND)
 av_log(ctx, AV_LOG_ERROR, "Key '%s' not found.\n", key);
 
@@ -645,6 +651,9 @@
 const AVClass *c = *(AVClass**)obj;
 const AVOption *o = NULL;
 
+ if (!c)
+ return NULL;
+
 if (search_flags & AV_OPT_SEARCH_CHILDREN) {
 if (search_flags & AV_OPT_SEARCH_FAKE_OBJ) {
 const AVClass *child = NULL;

libav-v9.6.tar.bz2/libavutil/opt.h -> libav-v10.1.tar.bz2/libavutil/opt.h Changed

libav-v9.6.tar.bz2/libavutil/parseutils.c -> libav-v10.1.tar.bz2/libavutil/parseutils.c Changed

@@ -385,7 +385,7 @@
 val = 0;
 for(i = 0; i < len_max; i++) {
 c = *p;
- if (!isdigit(c))
+ if (!av_isdigit(c))
 break;
 val = (val * 10) + c - '0';
 p++;
@@ -555,15 +555,17 @@
 /* parse timestr as HH:MM:SS */
 q = small_strptime(p, time_fmt[0], &dt);
 if (!q) {
+ char *o;
 /* parse timestr as S+ */
- dt.tm_sec = strtol(p, (char **)&q, 10);
- if (q == p) {
+ dt.tm_sec = strtol(p, &o, 10);
+ if (o == p) {
 /* the parsing didn't succeed */
 *timeval = INT64_MIN;
 return AVERROR(EINVAL);
 }
 dt.tm_min = 0;
 dt.tm_hour = 0;
+ q = o;
 }
 }
 
@@ -591,7 +593,7 @@
 int val, n;
 q++;
 for (val = 0, n = 100000; n >= 1; n /= 10, q++) {
- if (!isdigit(*q))
+ if (!av_isdigit(*q))
 break;
 val += n * (*q - '0');
 }

libav-v9.6.tar.bz2/libavutil/pixdesc.c -> libav-v10.1.tar.bz2/libavutil/pixdesc.c Changed

@@ -25,8 +25,9 @@
 #include "common.h"
 #include "pixfmt.h"
 #include "pixdesc.h"
-
+#include "internal.h"
 #include "intreadwrite.h"
+#include "version.h"
 
 void av_read_image_line(uint16_t *dst,
 const uint8_t *data[4], const int linesize[4],
@@ -42,7 +43,7 @@
 int step = comp.step_minus1 + 1;
 int flags = desc->flags;
 
- if (flags & PIX_FMT_BITSTREAM) {
+ if (flags & AV_PIX_FMT_FLAG_BITSTREAM) {
 int skip = x * step + comp.offset_plus1 - 1;
 const uint8_t *p = data[plane] + y * linesize[plane] + (skip >> 3);
 int shift = 8 - depth - (skip & 7);
@@ -62,11 +63,11 @@
 int is_8bit = shift + depth <= 8;
 
 if (is_8bit)
- p += !!(flags & PIX_FMT_BE);
+ p += !!(flags & AV_PIX_FMT_FLAG_BE);
 
 while (w--) {
 int val = is_8bit ? *p :
- flags & PIX_FMT_BE ? AV_RB16(p) : AV_RL16(p);
+ flags & AV_PIX_FMT_FLAG_BE ? AV_RB16(p) : AV_RL16(p);
 val = (val >> shift) & mask;
 if (read_pal_component)
 val = data[1][4 * val + c];
@@ -87,7 +88,7 @@
 int step = comp.step_minus1 + 1;
 int flags = desc->flags;
 
- if (flags & PIX_FMT_BITSTREAM) {
+ if (flags & AV_PIX_FMT_FLAG_BITSTREAM) {
 int skip = x * step + comp.offset_plus1 - 1;
 uint8_t *p = data[plane] + y * linesize[plane] + (skip >> 3);
 int shift = 8 - depth - (skip & 7);
@@ -104,14 +105,14 @@
 x * step + comp.offset_plus1 - 1;
 
 if (shift + depth <= 8) {
- p += !!(flags & PIX_FMT_BE);
+ p += !!(flags & AV_PIX_FMT_FLAG_BE);
 while (w--) {
 *p |= (*src++ << shift);
 p += step;
 }
 } else {
 while (w--) {
- if (flags & PIX_FMT_BE) {
+ if (flags & AV_PIX_FMT_FLAG_BE) {
 uint16_t val = AV_RB16(p) | (*src++ << shift);
 AV_WB16(p, val);
 } else {
@@ -138,7 +139,7 @@
 { 1, 0, 1, 0, 7 }, /* U */
 { 2, 0, 1, 0, 7 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUYV422] = {
 .name = "yuyv422",
@@ -161,7 +162,7 @@
 { 0, 2, 2, 0, 7 }, /* G */
 { 0, 2, 3, 0, 7 }, /* B */
 },
- .flags = PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_BGR24] = {
 .name = "bgr24",
@@ -173,7 +174,7 @@
 { 0, 2, 2, 0, 7 }, /* G */
 { 0, 2, 3, 0, 7 }, /* R */
 },
- .flags = PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_YUV422P] = {
 .name = "yuv422p",
@@ -185,7 +186,7 @@
 { 1, 0, 1, 0, 7 }, /* U */
 { 2, 0, 1, 0, 7 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV444P] = {
 .name = "yuv444p",
@@ -197,7 +198,7 @@
 { 1, 0, 1, 0, 7 }, /* U */
 { 2, 0, 1, 0, 7 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV410P] = {
 .name = "yuv410p",
@@ -209,7 +210,7 @@
 { 1, 0, 1, 0, 7 }, /* U */
 { 2, 0, 1, 0, 7 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV411P] = {
 .name = "yuv411p",
@@ -221,7 +222,7 @@
 { 1, 0, 1, 0, 7 }, /* U */
 { 2, 0, 1, 0, 7 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_GRAY8] = {
 .name = "gray",
@@ -231,6 +232,7 @@
 .comp = {
 { 0, 0, 1, 0, 7 }, /* Y */
 },
+ .flags = AV_PIX_FMT_FLAG_PSEUDOPAL,
 },
 [AV_PIX_FMT_MONOWHITE] = {
 .name = "monow",
@@ -240,7 +242,7 @@
 .comp = {
 { 0, 0, 1, 0, 0 }, /* Y */
 },
- .flags = PIX_FMT_BITSTREAM,
+ .flags = AV_PIX_FMT_FLAG_BITSTREAM,
 },
 [AV_PIX_FMT_MONOBLACK] = {
 .name = "monob",
@@ -250,7 +252,7 @@
 .comp = {
 { 0, 0, 1, 7, 0 }, /* Y */
 },
- .flags = PIX_FMT_BITSTREAM,
+ .flags = AV_PIX_FMT_FLAG_BITSTREAM,
 },
 [AV_PIX_FMT_PAL8] = {
 .name = "pal8",
@@ -260,7 +262,7 @@
 .comp = {
 { 0, 0, 1, 0, 7 },
 },
- .flags = PIX_FMT_PAL,
+ .flags = AV_PIX_FMT_FLAG_PAL,
 },
 [AV_PIX_FMT_YUVJ420P] = {
 .name = "yuvj420p",
@@ -272,7 +274,7 @@
 { 1, 0, 1, 0, 7 }, /* U */
 { 2, 0, 1, 0, 7 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUVJ422P] = {
 .name = "yuvj422p",
@@ -284,7 +286,7 @@
 { 1, 0, 1, 0, 7 }, /* U */
 { 2, 0, 1, 0, 7 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUVJ444P] = {
 .name = "yuvj444p",
@@ -296,16 +298,18 @@
 {1, 0, 1, 0, 7}, /* U */
 {2, 0, 1, 0, 7}, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
+#if FF_API_XVMC
 [AV_PIX_FMT_XVMC_MPEG2_MC] = {
 .name = "xvmcmc",
- .flags = PIX_FMT_HWACCEL,
+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
 },
 [AV_PIX_FMT_XVMC_MPEG2_IDCT] = {
 .name = "xvmcidct",
- .flags = PIX_FMT_HWACCEL,
+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
 },
+#endif /* FF_API_XVMC */
 [AV_PIX_FMT_UYVY422] = {
 .name = "uyvy422",
 .nb_components = 3,
@@ -338,7 +342,7 @@
 { 0, 0, 1, 3, 2 }, /* G */
 { 0, 0, 1, 0, 2 }, /* R */
 },
- .flags = PIX_FMT_RGB | PIX_FMT_PSEUDOPAL,
+ .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL,
 },
 [AV_PIX_FMT_BGR4] = {
 .name = "bgr4",
@@ -350,7 +354,7 @@
 { 0, 3, 2, 0, 1 }, /* G */
 { 0, 3, 4, 0, 0 }, /* R */
 },
- .flags = PIX_FMT_BITSTREAM | PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_BGR4_BYTE] = {
 .name = "bgr4_byte",
@@ -362,7 +366,7 @@
 { 0, 0, 1, 1, 1 }, /* G */
 { 0, 0, 1, 0, 0 }, /* R */
 },
- .flags = PIX_FMT_RGB | PIX_FMT_PSEUDOPAL,
+ .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL,
 },
 [AV_PIX_FMT_RGB8] = {
 .name = "rgb8",
@@ -374,7 +378,7 @@
 { 0, 0, 1, 3, 2 }, /* G */
 { 0, 0, 1, 0, 2 }, /* B */
 },
- .flags = PIX_FMT_RGB | PIX_FMT_PSEUDOPAL,
+ .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL,
 },
 [AV_PIX_FMT_RGB4] = {
 .name = "rgb4",
@@ -386,7 +390,7 @@
 { 0, 3, 2, 0, 1 }, /* G */
 { 0, 3, 4, 0, 0 }, /* B */
 },
- .flags = PIX_FMT_BITSTREAM | PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_RGB4_BYTE] = {
 .name = "rgb4_byte",
@@ -398,7 +402,7 @@
 { 0, 0, 1, 1, 1 }, /* G */
 { 0, 0, 1, 0, 0 }, /* B */
 },
- .flags = PIX_FMT_RGB | PIX_FMT_PSEUDOPAL,
+ .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL,
 },
 [AV_PIX_FMT_NV12] = {
 .name = "nv12",
@@ -410,7 +414,7 @@
 { 1, 1, 1, 0, 7 }, /* U */
 { 1, 1, 2, 0, 7 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_NV21] = {
 .name = "nv21",
@@ -422,7 +426,7 @@
 { 1, 1, 1, 0, 7 }, /* V */
 { 1, 1, 2, 0, 7 }, /* U */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_ARGB] = {
 .name = "argb",
@@ -435,7 +439,7 @@
 { 0, 3, 3, 0, 7 }, /* G */
 { 0, 3, 4, 0, 7 }, /* B */
 },
- .flags = PIX_FMT_RGB | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_RGBA] = {
 .name = "rgba",
@@ -448,7 +452,7 @@
 { 0, 3, 3, 0, 7 }, /* B */
 { 0, 3, 4, 0, 7 }, /* A */
 },
- .flags = PIX_FMT_RGB | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_ABGR] = {
 .name = "abgr",
@@ -461,7 +465,7 @@
 { 0, 3, 3, 0, 7 }, /* G */
 { 0, 3, 4, 0, 7 }, /* R */
 },
- .flags = PIX_FMT_RGB | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_BGRA] = {
 .name = "bgra",
@@ -474,7 +478,7 @@
 { 0, 3, 3, 0, 7 }, /* R */
 { 0, 3, 4, 0, 7 }, /* A */
 },
- .flags = PIX_FMT_RGB | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_GRAY16BE] = {
 .name = "gray16be",
@@ -484,7 +488,7 @@
 .comp = {
 { 0, 1, 1, 0, 15 }, /* Y */
 },
- .flags = PIX_FMT_BE,
+ .flags = AV_PIX_FMT_FLAG_BE,
 },
 [AV_PIX_FMT_GRAY16LE] = {
 .name = "gray16le",
@@ -505,7 +509,7 @@
 { 1, 0, 1, 0, 7 }, /* U */
 { 2, 0, 1, 0, 7 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUVJ440P] = {
 .name = "yuvj440p",
@@ -517,7 +521,7 @@
 { 1, 0, 1, 0, 7 }, /* U */
 { 2, 0, 1, 0, 7 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUVA420P] = {
 .name = "yuva420p",
@@ -530,7 +534,7 @@
 { 2, 0, 1, 0, 7 }, /* V */
 { 3, 0, 1, 0, 7 }, /* A */
 },
- .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA422P] = {
 .name = "yuva422p",
@@ -543,7 +547,7 @@
 { 2, 0, 1, 0, 7 }, /* V */
 { 3, 0, 1, 0, 7 }, /* A */
 },
- .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA444P] = {
 .name = "yuva444p",
@@ -556,7 +560,7 @@
 { 2, 0, 1, 0, 7 }, /* V */
 { 3, 0, 1, 0, 7 }, /* A */
 },
- .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA420P9BE] = {
 .name = "yuva420p9be",
@@ -569,7 +573,7 @@
 { 2, 1, 1, 0, 8 }, /* V */
 { 3, 1, 1, 0, 8 }, /* A */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUVA420P9LE] = {
 .name = "yuva420p9le",
@@ -582,7 +586,7 @@
 { 2, 1, 1, 0, 8 }, /* V */
 { 3, 1, 1, 0, 8 }, /* A */
 },
- .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA422P9BE] = {
 .name = "yuva422p9be",
@@ -595,7 +599,7 @@
 { 2, 1, 1, 0, 8 }, /* V */
 { 3, 1, 1, 0, 8 }, /* A */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA422P9LE] = {
 .name = "yuva422p9le",
@@ -608,7 +612,7 @@
 { 2, 1, 1, 0, 8 }, /* V */
 { 3, 1, 1, 0, 8 }, /* A */
 },
- .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA444P9BE] = {
 .name = "yuva444p9be",
@@ -621,7 +625,7 @@
 { 2, 1, 1, 0, 8 }, /* V */
 { 3, 1, 1, 0, 8 }, /* A */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA444P9LE] = {
 .name = "yuva444p9le",
@@ -634,7 +638,7 @@
 { 2, 1, 1, 0, 8 }, /* V */
 { 3, 1, 1, 0, 8 }, /* A */
 },
- .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA420P10BE] = {
 .name = "yuva420p10be",
@@ -647,7 +651,7 @@
 { 2, 1, 1, 0, 9 }, /* V */
 { 3, 1, 1, 0, 9 }, /* A */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA420P10LE] = {
 .name = "yuva420p10le",
@@ -660,7 +664,7 @@
 { 2, 1, 1, 0, 9 }, /* V */
 { 3, 1, 1, 0, 9 }, /* A */
 },
- .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA422P10BE] = {
 .name = "yuva422p10be",
@@ -673,7 +677,7 @@
 { 2, 1, 1, 0, 9 }, /* V */
 { 3, 1, 1, 0, 9 }, /* A */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA422P10LE] = {
 .name = "yuva422p10le",
@@ -686,7 +690,7 @@
 { 2, 1, 1, 0, 9 }, /* V */
 { 3, 1, 1, 0, 9 }, /* A */
 },
- .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA444P10BE] = {
 .name = "yuva444p10be",
@@ -699,7 +703,7 @@
 { 2, 1, 1, 0, 9 }, /* V */
 { 3, 1, 1, 0, 9 }, /* A */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA444P10LE] = {
 .name = "yuva444p10le",
@@ -712,7 +716,7 @@
 { 2, 1, 1, 0, 9 }, /* V */
 { 3, 1, 1, 0, 9 }, /* A */
 },
- .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA420P16BE] = {
 .name = "yuva420p16be",
@@ -725,7 +729,7 @@
 { 2, 1, 1, 0, 15 }, /* V */
 { 3, 1, 1, 0, 15 }, /* A */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA420P16LE] = {
 .name = "yuva420p16le",
@@ -738,7 +742,7 @@
 { 2, 1, 1, 0, 15 }, /* V */
 { 3, 1, 1, 0, 15 }, /* A */
 },
- .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA422P16BE] = {
 .name = "yuva422p16be",
@@ -751,7 +755,7 @@
 { 2, 1, 1, 0, 15 }, /* V */
 { 3, 1, 1, 0, 15 }, /* A */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA422P16LE] = {
 .name = "yuva422p16le",
@@ -764,7 +768,7 @@
 { 2, 1, 1, 0, 15 }, /* V */
 { 3, 1, 1, 0, 15 }, /* A */
 },
- .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA444P16BE] = {
 .name = "yuva444p16be",
@@ -777,7 +781,7 @@
 { 2, 1, 1, 0, 15 }, /* V */
 { 3, 1, 1, 0, 15 }, /* A */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_YUVA444P16LE] = {
 .name = "yuva444p16le",
@@ -790,44 +794,46 @@
 { 2, 1, 1, 0, 15 }, /* V */
 { 3, 1, 1, 0, 15 }, /* A */
 },
- .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
 },
+#if FF_API_VDPAU
 [AV_PIX_FMT_VDPAU_H264] = {
 .name = "vdpau_h264",
 .log2_chroma_w = 1,
 .log2_chroma_h = 1,
- .flags = PIX_FMT_HWACCEL,
+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
 },
 [AV_PIX_FMT_VDPAU_MPEG1] = {
 .name = "vdpau_mpeg1",
 .log2_chroma_w = 1,
 .log2_chroma_h = 1,
- .flags = PIX_FMT_HWACCEL,
+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
 },
 [AV_PIX_FMT_VDPAU_MPEG2] = {
 .name = "vdpau_mpeg2",
 .log2_chroma_w = 1,
 .log2_chroma_h = 1,
- .flags = PIX_FMT_HWACCEL,
+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
 },
 [AV_PIX_FMT_VDPAU_WMV3] = {
 .name = "vdpau_wmv3",
 .log2_chroma_w = 1,
 .log2_chroma_h = 1,
- .flags = PIX_FMT_HWACCEL,
+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
 },
 [AV_PIX_FMT_VDPAU_VC1] = {
 .name = "vdpau_vc1",
 .log2_chroma_w = 1,
 .log2_chroma_h = 1,
- .flags = PIX_FMT_HWACCEL,
+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
 },
 [AV_PIX_FMT_VDPAU_MPEG4] = {
 .name = "vdpau_mpeg4",
 .log2_chroma_w = 1,
 .log2_chroma_h = 1,
- .flags = PIX_FMT_HWACCEL,
+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
 },
+#endif
 [AV_PIX_FMT_RGB48BE] = {
 .name = "rgb48be",
 .nb_components = 3,
@@ -838,7 +844,7 @@
 { 0, 5, 3, 0, 15 }, /* G */
 { 0, 5, 5, 0, 15 }, /* B */
 },
- .flags = PIX_FMT_RGB | PIX_FMT_BE,
+ .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_BE,
 },
 [AV_PIX_FMT_RGB48LE] = {
 .name = "rgb48le",
@@ -850,7 +856,7 @@
 { 0, 5, 3, 0, 15 }, /* G */
 { 0, 5, 5, 0, 15 }, /* B */
 },
- .flags = PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_RGB565BE] = {
 .name = "rgb565be",
@@ -862,7 +868,7 @@
 { 0, 1, 1, 5, 5 }, /* G */
 { 0, 1, 1, 0, 4 }, /* B */
 },
- .flags = PIX_FMT_BE | PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_RGB565LE] = {
 .name = "rgb565le",
@@ -874,7 +880,7 @@
 { 0, 1, 1, 5, 5 }, /* G */
 { 0, 1, 1, 0, 4 }, /* B */
 },
- .flags = PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_RGB555BE] = {
 .name = "rgb555be",
@@ -886,7 +892,7 @@
 { 0, 1, 1, 5, 4 }, /* G */
 { 0, 1, 1, 0, 4 }, /* B */
 },
- .flags = PIX_FMT_BE | PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_RGB555LE] = {
 .name = "rgb555le",
@@ -898,7 +904,7 @@
 { 0, 1, 1, 5, 4 }, /* G */
 { 0, 1, 1, 0, 4 }, /* B */
 },
- .flags = PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_RGB444BE] = {
 .name = "rgb444be",
@@ -910,7 +916,7 @@
 { 0, 1, 1, 4, 3 }, /* G */
 { 0, 1, 1, 0, 3 }, /* B */
 },
- .flags = PIX_FMT_BE | PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_RGB444LE] = {
 .name = "rgb444le",
@@ -922,7 +928,7 @@
 { 0, 1, 1, 4, 3 }, /* G */
 { 0, 1, 1, 0, 3 }, /* B */
 },
- .flags = PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_BGR48BE] = {
 .name = "bgr48be",
@@ -934,7 +940,7 @@
 { 0, 5, 3, 0, 15 }, /* G */
 { 0, 5, 5, 0, 15 }, /* R */
 },
- .flags = PIX_FMT_BE | PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_BGR48LE] = {
 .name = "bgr48le",
@@ -946,7 +952,7 @@
 { 0, 5, 3, 0, 15 }, /* G */
 { 0, 5, 5, 0, 15 }, /* R */
 },
- .flags = PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_BGR565BE] = {
 .name = "bgr565be",
@@ -958,7 +964,7 @@
 { 0, 1, 1, 5, 5 }, /* G */
 { 0, 1, 1, 0, 4 }, /* R */
 },
- .flags = PIX_FMT_BE | PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_BGR565LE] = {
 .name = "bgr565le",
@@ -970,7 +976,7 @@
 { 0, 1, 1, 5, 5 }, /* G */
 { 0, 1, 1, 0, 4 }, /* R */
 },
- .flags = PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_BGR555BE] = {
 .name = "bgr555be",
@@ -982,7 +988,7 @@
 { 0, 1, 1, 5, 4 }, /* G */
 { 0, 1, 1, 0, 4 }, /* R */
 },
- .flags = PIX_FMT_BE | PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_BGR555LE] = {
 .name = "bgr555le",
@@ -994,7 +1000,7 @@
 { 0, 1, 1, 5, 4 }, /* G */
 { 0, 1, 1, 0, 4 }, /* R */
 },
- .flags = PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_BGR444BE] = {
 .name = "bgr444be",
@@ -1006,7 +1012,7 @@
 { 0, 1, 1, 4, 3 }, /* G */
 { 0, 1, 1, 0, 3 }, /* R */
 },
- .flags = PIX_FMT_BE | PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_BGR444LE] = {
 .name = "bgr444le",
@@ -1018,31 +1024,31 @@
 { 0, 1, 1, 4, 3 }, /* G */
 { 0, 1, 1, 0, 3 }, /* R */
 },
- .flags = PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_VAAPI_MOCO] = {
 .name = "vaapi_moco",
 .log2_chroma_w = 1,
 .log2_chroma_h = 1,
- .flags = PIX_FMT_HWACCEL,
+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
 },
 [AV_PIX_FMT_VAAPI_IDCT] = {
 .name = "vaapi_idct",
 .log2_chroma_w = 1,
 .log2_chroma_h = 1,
- .flags = PIX_FMT_HWACCEL,
+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
 },
 [AV_PIX_FMT_VAAPI_VLD] = {
 .name = "vaapi_vld",
 .log2_chroma_w = 1,
 .log2_chroma_h = 1,
- .flags = PIX_FMT_HWACCEL,
+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
 },
 [AV_PIX_FMT_VDA_VLD] = {
 .name = "vda_vld",
 .log2_chroma_w = 1,
 .log2_chroma_h = 1,
- .flags = PIX_FMT_HWACCEL,
+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
 },
 [AV_PIX_FMT_YUV420P9LE] = {
 .name = "yuv420p9le",
@@ -1054,7 +1060,7 @@
 { 1, 1, 1, 0, 8 }, /* U */
 { 2, 1, 1, 0, 8 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV420P9BE] = {
 .name = "yuv420p9be",
@@ -1066,7 +1072,7 @@
 { 1, 1, 1, 0, 8 }, /* U */
 { 2, 1, 1, 0, 8 }, /* V */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV420P10LE] = {
 .name = "yuv420p10le",
@@ -1078,7 +1084,7 @@
 { 1, 1, 1, 0, 9 }, /* U */
 { 2, 1, 1, 0, 9 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV420P10BE] = {
 .name = "yuv420p10be",
@@ -1090,7 +1096,7 @@
 { 1, 1, 1, 0, 9 }, /* U */
 { 2, 1, 1, 0, 9 }, /* V */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV420P16LE] = {
 .name = "yuv420p16le",
@@ -1102,7 +1108,7 @@
 { 1, 1, 1, 0, 15 }, /* U */
 { 2, 1, 1, 0, 15 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV420P16BE] = {
 .name = "yuv420p16be",
@@ -1114,7 +1120,7 @@
 { 1, 1, 1, 0, 15 }, /* U */
 { 2, 1, 1, 0, 15 }, /* V */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV422P9LE] = {
 .name = "yuv422p9le",
@@ -1126,7 +1132,7 @@
 { 1, 1, 1, 0, 8 }, /* U */
 { 2, 1, 1, 0, 8 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV422P9BE] = {
 .name = "yuv422p9be",
@@ -1138,7 +1144,7 @@
 { 1, 1, 1, 0, 8 }, /* U */
 { 2, 1, 1, 0, 8 }, /* V */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV422P10LE] = {
 .name = "yuv422p10le",
@@ -1150,7 +1156,7 @@
 { 1, 1, 1, 0, 9 }, /* U */
 { 2, 1, 1, 0, 9 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV422P10BE] = {
 .name = "yuv422p10be",
@@ -1162,7 +1168,7 @@
 { 1, 1, 1, 0, 9 }, /* U */
 { 2, 1, 1, 0, 9 }, /* V */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV422P16LE] = {
 .name = "yuv422p16le",
@@ -1174,7 +1180,7 @@
 { 1, 1, 1, 0, 15 }, /* U */
 { 2, 1, 1, 0, 15 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV422P16BE] = {
 .name = "yuv422p16be",
@@ -1186,7 +1192,7 @@
 { 1, 1, 1, 0, 15 }, /* U */
 { 2, 1, 1, 0, 15 }, /* V */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV444P16LE] = {
 .name = "yuv444p16le",
@@ -1198,7 +1204,7 @@
 { 1, 1, 1, 0, 15 }, /* U */
 { 2, 1, 1, 0, 15 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV444P16BE] = {
 .name = "yuv444p16be",
@@ -1210,7 +1216,7 @@
 { 1, 1, 1, 0, 15 }, /* U */
 { 2, 1, 1, 0, 15 }, /* V */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV444P10LE] = {
 .name = "yuv444p10le",
@@ -1222,7 +1228,7 @@
 { 1, 1, 1, 0, 9 }, /* U */
 { 2, 1, 1, 0, 9 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV444P10BE] = {
 .name = "yuv444p10be",
@@ -1234,7 +1240,7 @@
 { 1, 1, 1, 0, 9 }, /* U */
 { 2, 1, 1, 0, 9 }, /* V */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV444P9LE] = {
 .name = "yuv444p9le",
@@ -1246,7 +1252,7 @@
 { 1, 1, 1, 0, 8 }, /* U */
 { 2, 1, 1, 0, 8 }, /* V */
 },
- .flags = PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_YUV444P9BE] = {
 .name = "yuv444p9be",
@@ -1258,13 +1264,13 @@
 { 1, 1, 1, 0, 8 }, /* U */
 { 2, 1, 1, 0, 8 }, /* V */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
 },
 [AV_PIX_FMT_DXVA2_VLD] = {
 .name = "dxva2_vld",
 .log2_chroma_w = 1,
 .log2_chroma_h = 1,
- .flags = PIX_FMT_HWACCEL,
+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
 },
 [AV_PIX_FMT_Y400A] = {
 .name = "y400a",
@@ -1273,7 +1279,7 @@
 { 0, 1, 1, 0, 7 }, /* Y */
 { 0, 1, 2, 0, 7 }, /* A */
 },
- .flags = PIX_FMT_ALPHA,
+ .flags = AV_PIX_FMT_FLAG_ALPHA,
 },
 [AV_PIX_FMT_GBRP] = {
 .name = "gbrp",
@@ -1285,7 +1291,7 @@
 { 1, 0, 1, 0, 7 }, /* B */
 { 2, 0, 1, 0, 7 }, /* R */
 },
- .flags = PIX_FMT_PLANAR | PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_GBRP9LE] = {
 .name = "gbrp9le",
@@ -1297,7 +1303,7 @@
 { 1, 1, 1, 0, 8 }, /* B */
 { 2, 1, 1, 0, 8 }, /* R */
 },
- .flags = PIX_FMT_PLANAR | PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_GBRP9BE] = {
 .name = "gbrp9be",
@@ -1309,7 +1315,7 @@
 { 1, 1, 1, 0, 8 }, /* B */
 { 2, 1, 1, 0, 8 }, /* R */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_GBRP10LE] = {
 .name = "gbrp10le",
@@ -1321,7 +1327,7 @@
 { 1, 1, 1, 0, 9 }, /* B */
 { 2, 1, 1, 0, 9 }, /* R */
 },
- .flags = PIX_FMT_PLANAR | PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_GBRP10BE] = {
 .name = "gbrp10be",
@@ -1333,7 +1339,7 @@
 { 1, 1, 1, 0, 9 }, /* B */
 { 2, 1, 1, 0, 9 }, /* R */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_GBRP16LE] = {
 .name = "gbrp16le",
@@ -1345,7 +1351,7 @@
 { 1, 1, 1, 0, 15 }, /* B */
 { 2, 1, 1, 0, 15 }, /* R */
 },
- .flags = PIX_FMT_PLANAR | PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
 },
 [AV_PIX_FMT_GBRP16BE] = {
 .name = "gbrp16be",
@@ -1357,10 +1363,77 @@
 { 1, 1, 1, 0, 15 }, /* B */
 { 2, 1, 1, 0, 15 }, /* R */
 },
- .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB,
+ .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
+ },
+ [AV_PIX_FMT_VDPAU] = {
+ .name = "vdpau",
+ .log2_chroma_w = 1,
+ .log2_chroma_h = 1,
+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
+ },
+ [AV_PIX_FMT_XYZ12LE] = {
+ .name = "xyz12le",
+ .nb_components = 3,
+ .log2_chroma_w = 0,
+ .log2_chroma_h = 0,
+ .comp = {
+ { 0, 5, 1, 4, 11 }, /* X */
+ { 0, 5, 3, 4, 11 }, /* Y */
+ { 0, 5, 5, 4, 11 }, /* Z */
+ },
+ /*.flags = -- not used*/
+ },
+ [AV_PIX_FMT_XYZ12BE] = {
+ .name = "xyz12be",
+ .nb_components = 3,
+ .log2_chroma_w = 0,
+ .log2_chroma_h = 0,
+ .comp = {
+ { 0, 5, 1, 4, 11 }, /* X */
+ { 0, 5, 3, 4, 11 }, /* Y */
+ { 0, 5, 5, 4, 11 }, /* Z */
+ },
+ .flags = AV_PIX_FMT_FLAG_BE,
+ },
+ [AV_PIX_FMT_NV16] = {
+ .name = "nv16",
+ .nb_components = 3,
+ .log2_chroma_w = 1,
+ .log2_chroma_h = 0,
+ .comp = {
+ { 0, 0, 1, 0, 7 }, /* Y */
+ { 1, 1, 1, 0, 7 }, /* U */
+ { 1, 1, 2, 0, 7 }, /* V */
+ },
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
+ },
+ [AV_PIX_FMT_NV20LE] = {
+ .name = "nv20le",
+ .nb_components = 3,
+ .log2_chroma_w = 1,
+ .log2_chroma_h = 0,
+ .comp = {
+ { 0, 1, 1, 0, 9 }, /* Y */
+ { 1, 3, 1, 0, 9 }, /* U */
+ { 1, 3, 3, 0, 9 }, /* V */
+ },
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
+ },
+ [AV_PIX_FMT_NV20BE] = {
+ .name = "nv20be",
+ .nb_components = 3,
+ .log2_chroma_w = 1,
+ .log2_chroma_h = 0,
+ .comp = {
+ { 0, 1, 1, 0, 9 }, /* Y */
+ { 1, 3, 1, 0, 9 }, /* U */
+ { 1, 3, 3, 0, 9 }, /* V */
+ },
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE,
 },
 };
 
+FF_DISABLE_DEPRECATION_WARNINGS
 static enum AVPixelFormat get_pix_fmt_internal(const char *name)
 {
 enum AVPixelFormat pix_fmt;
@@ -1455,6 +1528,7 @@
 
 return desc - av_pix_fmt_descriptors;
 }
+FF_ENABLE_DEPRECATION_WARNINGS
 
 int av_pix_fmt_get_chroma_sub_sample(enum AVPixelFormat pix_fmt,
 int *h_shift, int *v_shift)
@@ -1467,3 +1541,66 @@
 
 return 0;
 }
+
+int av_pix_fmt_count_planes(enum AVPixelFormat pix_fmt)
+{
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
+ int i, planes[4] = { 0 }, ret = 0;
+
+ if (!desc)
+ return AVERROR(EINVAL);
+
+ for (i = 0; i < desc->nb_components; i++)
+ planes[desc->comp[i].plane] = 1;
+ for (i = 0; i < FF_ARRAY_ELEMS(planes); i++)
+ ret += planes[i];
+ return ret;
+}
+
+
+enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt)
+{
+#define PIX_FMT_SWAP_ENDIANNESS(fmt) \
+ case AV_PIX_FMT_ ## fmt ## BE: return AV_PIX_FMT_ ## fmt ## LE; \
+ case AV_PIX_FMT_ ## fmt ## LE: return AV_PIX_FMT_ ## fmt ## BE
+
+ switch (pix_fmt) {
+ PIX_FMT_SWAP_ENDIANNESS(GRAY16);
+ PIX_FMT_SWAP_ENDIANNESS(RGB48);
+ PIX_FMT_SWAP_ENDIANNESS(RGB565);
+ PIX_FMT_SWAP_ENDIANNESS(RGB555);
+ PIX_FMT_SWAP_ENDIANNESS(RGB444);
+ PIX_FMT_SWAP_ENDIANNESS(BGR48);
+ PIX_FMT_SWAP_ENDIANNESS(BGR565);
+ PIX_FMT_SWAP_ENDIANNESS(BGR555);
+ PIX_FMT_SWAP_ENDIANNESS(BGR444);
+
+ PIX_FMT_SWAP_ENDIANNESS(YUV420P9);
+ PIX_FMT_SWAP_ENDIANNESS(YUV422P9);
+ PIX_FMT_SWAP_ENDIANNESS(YUV444P9);
+ PIX_FMT_SWAP_ENDIANNESS(YUV420P10);
+ PIX_FMT_SWAP_ENDIANNESS(YUV422P10);
+ PIX_FMT_SWAP_ENDIANNESS(YUV444P10);
+ PIX_FMT_SWAP_ENDIANNESS(YUV420P16);
+ PIX_FMT_SWAP_ENDIANNESS(YUV422P16);
+ PIX_FMT_SWAP_ENDIANNESS(YUV444P16);
+
+ PIX_FMT_SWAP_ENDIANNESS(GBRP9);
+ PIX_FMT_SWAP_ENDIANNESS(GBRP10);
+ PIX_FMT_SWAP_ENDIANNESS(GBRP16);
+ PIX_FMT_SWAP_ENDIANNESS(YUVA420P9);
+ PIX_FMT_SWAP_ENDIANNESS(YUVA422P9);
+ PIX_FMT_SWAP_ENDIANNESS(YUVA444P9);
+ PIX_FMT_SWAP_ENDIANNESS(YUVA420P10);
+ PIX_FMT_SWAP_ENDIANNESS(YUVA422P10);
+ PIX_FMT_SWAP_ENDIANNESS(YUVA444P10);
+ PIX_FMT_SWAP_ENDIANNESS(YUVA420P16);
+ PIX_FMT_SWAP_ENDIANNESS(YUVA422P16);
+ PIX_FMT_SWAP_ENDIANNESS(YUVA444P16);
+
+ PIX_FMT_SWAP_ENDIANNESS(XYZ12);
+ default:
+ return AV_PIX_FMT_NONE;
+ }
+#undef PIX_FMT_SWAP_ENDIANNESS
+}

libav-v9.6.tar.bz2/libavutil/pixdesc.h -> libav-v10.1.tar.bz2/libavutil/pixdesc.h Changed

@@ -23,6 +23,8 @@
 #define AVUTIL_PIXDESC_H
 
 #include <inttypes.h>
+
+#include "attributes.h"
 #include "pixfmt.h"
 
 typedef struct AVComponentDescriptor{
@@ -83,27 +85,60 @@
 AVComponentDescriptor comp[4];
 }AVPixFmtDescriptor;
 
-#define PIX_FMT_BE 1 ///< Pixel format is big-endian.
-#define PIX_FMT_PAL 2 ///< Pixel format has a palette in data[1], values are indexes in this palette.
-#define PIX_FMT_BITSTREAM 4 ///< All values of a component are bit-wise packed end to end.
-#define PIX_FMT_HWACCEL 8 ///< Pixel format is an HW accelerated format.
-#define PIX_FMT_PLANAR 16 ///< At least one pixel component is not in the first data plane
-#define PIX_FMT_RGB 32 ///< The pixel format contains RGB-like data (as opposed to YUV/grayscale)
+/**
+ * Pixel format is big-endian.
+ */
+#define AV_PIX_FMT_FLAG_BE (1 << 0)
+/**
+ * Pixel format has a palette in data[1], values are indexes in this palette.
+ */
+#define AV_PIX_FMT_FLAG_PAL (1 << 1)
+/**
+ * All values of a component are bit-wise packed end to end.
+ */
+#define AV_PIX_FMT_FLAG_BITSTREAM (1 << 2)
+/**
+ * Pixel format is an HW accelerated format.
+ */
+#define AV_PIX_FMT_FLAG_HWACCEL (1 << 3)
+/**
+ * At least one pixel component is not in the first data plane.
+ */
+#define AV_PIX_FMT_FLAG_PLANAR (1 << 4)
+/**
+ * The pixel format contains RGB-like data (as opposed to YUV/grayscale).
+ */
+#define AV_PIX_FMT_FLAG_RGB (1 << 5)
 /**
 * The pixel format is "pseudo-paletted". This means that Libav treats it as
 * paletted internally, but the palette is generated by the decoder and is not
 * stored in the file.
 */
-#define PIX_FMT_PSEUDOPAL 64
-
-#define PIX_FMT_ALPHA 128 ///< The pixel format has an alpha channel
+#define AV_PIX_FMT_FLAG_PSEUDOPAL (1 << 6)
+/**
+ * The pixel format has an alpha channel.
+ */
+#define AV_PIX_FMT_FLAG_ALPHA (1 << 7)
 
+#if FF_API_PIX_FMT
+/**
+ * @deprecated use the AV_PIX_FMT_FLAG_* flags
+ */
+#define PIX_FMT_BE AV_PIX_FMT_FLAG_BE
+#define PIX_FMT_PAL AV_PIX_FMT_FLAG_PAL
+#define PIX_FMT_BITSTREAM AV_PIX_FMT_FLAG_BITSTREAM
+#define PIX_FMT_HWACCEL AV_PIX_FMT_FLAG_HWACCEL
+#define PIX_FMT_PLANAR AV_PIX_FMT_FLAG_PLANAR
+#define PIX_FMT_RGB AV_PIX_FMT_FLAG_RGB
+#define PIX_FMT_PSEUDOPAL AV_PIX_FMT_FLAG_PSEUDOPAL
+#define PIX_FMT_ALPHA AV_PIX_FMT_FLAG_ALPHA
+#endif
 
 #if FF_API_PIX_FMT_DESC
 /**
 * The array of all the pixel format descriptors.
 */
-extern const AVPixFmtDescriptor av_pix_fmt_descriptors[];
+extern attribute_deprecated const AVPixFmtDescriptor av_pix_fmt_descriptors[];
 #endif
 
 /**
@@ -177,7 +212,8 @@
 
 /**
 * Return the number of bits per pixel used by the pixel format
- * described by pixdesc.
+ * described by pixdesc. Note that this is not the same as the number
+ * of bits per sample.
 *
 * The returned number of bits refers to the number of bits actually
 * used for storing the pixel information, that is padding bits are
@@ -219,5 +255,22 @@
 int av_pix_fmt_get_chroma_sub_sample(enum AVPixelFormat pix_fmt,
 int *h_shift, int *v_shift);
 
+/**
+ * @return number of planes in pix_fmt, a negative AVERROR if pix_fmt is not a
+ * valid pixel format.
+ */
+int av_pix_fmt_count_planes(enum AVPixelFormat pix_fmt);
+
+
+/**
+ * Utility function to swap the endianness of a pixel format.
+ *
+ * @param[in] pix_fmt the pixel format
+ *
+ * @return pixel format with swapped endianness if it exists,
+ * otherwise AV_PIX_FMT_NONE
+ */
+enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt);
+
 
 #endif /* AVUTIL_PIXDESC_H */

libav-v9.6.tar.bz2/libavutil/pixfmt.h -> libav-v10.1.tar.bz2/libavutil/pixfmt.h Changed

@@ -28,7 +28,7 @@
 */
 
 #include "libavutil/avconfig.h"
-#include "libavutil/version.h"
+#include "version.h"
 
 /**
 * Pixel format.
@@ -77,8 +77,10 @@
 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,
+#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)
@@ -100,11 +102,13 @@
 AV_PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
 AV_PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
 AV_PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+#if FF_API_VDPAU
 AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
 AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
 AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
 AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
 AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
 AV_PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
 AV_PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
 
@@ -128,7 +132,9 @@
 AV_PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
 AV_PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
 AV_PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+#if FF_API_VDPAU
 AV_PIX_FMT_VDPAU_MPEG4, ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
 AV_PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
 
 AV_PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
@@ -178,6 +184,12 @@
 AV_PIX_FMT_YUVA422P16LE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian)
 AV_PIX_FMT_YUVA444P16BE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian)
 AV_PIX_FMT_YUVA444P16LE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian)
+ AV_PIX_FMT_VDPAU, ///< HW acceleration through VDPAU, Picture.data[3] contains a VdpVideoSurface
+ AV_PIX_FMT_XYZ12LE, ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as little-endian, the 4 lower bits are set to 0
+ AV_PIX_FMT_XYZ12BE, ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as big-endian, the 4 lower bits are set to 0
+ AV_PIX_FMT_NV16, ///< interleaved chroma YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
+ AV_PIX_FMT_NV20LE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+ AV_PIX_FMT_NV20BE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
 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
 
 #if FF_API_PIX_FMT
@@ -230,6 +242,9 @@
 #define AV_PIX_FMT_YUVA422P16 AV_PIX_FMT_NE(YUVA422P16BE, YUVA422P16LE)
 #define AV_PIX_FMT_YUVA444P16 AV_PIX_FMT_NE(YUVA444P16BE, YUVA444P16LE)
 
+#define AV_PIX_FMT_XYZ12 AV_PIX_FMT_NE(XYZ12BE, XYZ12LE)
+#define AV_PIX_FMT_NV20 AV_PIX_FMT_NE(NV20BE, NV20LE)
+
 #if FF_API_PIX_FMT
 #define PixelFormat AVPixelFormat

libav-v9.6.tar.bz2/libavutil/ppc/cpu.c -> libav-v10.1.tar.bz2/libavutil/ppc/cpu.c Changed

libav-v10.1.tar.bz2/libavutil/ppc/cpu.h Added

@@ -0,0 +1,28 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_PPC_CPU_H
+#define AVUTIL_PPC_CPU_H
+
+#include "config.h"
+#include "libavutil/cpu.h"
+#include "libavutil/cpu_internal.h"
+
+#define PPC_ALTIVEC(flags) CPUEXT(flags, ALTIVEC)
+
+#endif /* AVUTIL_PPC_CPU_H */

libav-v9.6.tar.bz2/libavutil/ppc/float_dsp_altivec.c -> libav-v10.1.tar.bz2/libavutil/ppc/float_dsp_altivec.c Changed

@@ -36,3 +36,89 @@
 vec_st(d1, 16, dst + i);
 }
 }
+
+void ff_vector_fmul_window_altivec(float *dst, const float *src0,
+ const float *src1, const float *win, int len)
+{
+ vector float zero, t0, t1, s0, s1, wi, wj;
+ const vector unsigned char reverse = vcprm(3, 2, 1, 0);
+ int i, j;
+
+ dst += len;
+ win += len;
+ src0 += len;
+
+ zero = (vector float)vec_splat_u32(0);
+
+ for (i = -len * 4, j = len * 4 - 16; i < 0; i += 16, j -= 16) {
+ s0 = vec_ld(i, src0);
+ s1 = vec_ld(j, src1);
+ wi = vec_ld(i, win);
+ wj = vec_ld(j, win);
+
+ s1 = vec_perm(s1, s1, reverse);
+ wj = vec_perm(wj, wj, reverse);
+
+ t0 = vec_madd(s0, wj, zero);
+ t0 = vec_nmsub(s1, wi, t0);
+ t1 = vec_madd(s0, wi, zero);
+ t1 = vec_madd(s1, wj, t1);
+ t1 = vec_perm(t1, t1, reverse);
+
+ vec_st(t0, i, dst);
+ vec_st(t1, j, dst);
+ }
+}
+
+void ff_vector_fmul_add_altivec(float *dst, const float *src0,
+ const float *src1, const float *src2,
+ int len)
+{
+ int i;
+ vector float d, s0, s1, s2, t0, t1, edges;
+ vector unsigned char align = vec_lvsr(0,dst),
+ mask = vec_lvsl(0, dst);
+
+ for (i = 0; i < len - 3; i += 4) {
+ t0 = vec_ld(0, dst + i);
+ t1 = vec_ld(15, dst + i);
+ s0 = vec_ld(0, src0 + i);
+ s1 = vec_ld(0, src1 + i);
+ s2 = vec_ld(0, src2 + i);
+ edges = vec_perm(t1, t0, mask);
+ d = vec_madd(s0, s1, s2);
+ t1 = vec_perm(d, edges, align);
+ t0 = vec_perm(edges, d, align);
+ vec_st(t1, 15, dst + i);
+ vec_st(t0, 0, dst + i);
+ }
+}
+
+void ff_vector_fmul_reverse_altivec(float *dst, const float *src0,
+ const float *src1, int len)
+{
+ int i;
+ vector float d, s0, s1, h0, l0,
+ s2, s3, zero = (vector float) vec_splat_u32(0);
+
+ src1 += len-4;
+ for(i = 0; i < len - 7; i += 8) {
+ s1 = vec_ld(0, src1 - i); // [a,b,c,d]
+ s0 = vec_ld(0, src0 + i);
+ l0 = vec_mergel(s1, s1); // [c,c,d,d]
+ s3 = vec_ld(-16, src1 - i);
+ h0 = vec_mergeh(s1, s1); // [a,a,b,b]
+ s2 = vec_ld(16, src0 + i);
+ s1 = vec_mergeh(vec_mergel(l0, h0), // [d,b,d,b]
+ vec_mergeh(l0, h0)); // [c,a,c,a]
+ // [d,c,b,a]
+ l0 = vec_mergel(s3, s3);
+ d = vec_madd(s0, s1, zero);
+ h0 = vec_mergeh(s3, s3);
+ vec_st(d, 0, dst + i);
+ s3 = vec_mergeh(vec_mergel(l0, h0),
+ vec_mergeh(l0, h0));
+ d = vec_madd(s2, s3, zero);
+ vec_st(d, 16, dst + i);
+ }
+}

libav-v9.6.tar.bz2/libavutil/ppc/float_dsp_altivec.h -> libav-v10.1.tar.bz2/libavutil/ppc/float_dsp_altivec.h Changed

libav-v9.6.tar.bz2/libavutil/ppc/float_dsp_init.c -> libav-v10.1.tar.bz2/libavutil/ppc/float_dsp_init.c Changed

libav-v9.6.tar.bz2/libavutil/ppc/timer.h -> libav-v10.1.tar.bz2/libavutil/ppc/timer.h Changed

libav-v9.6.tar.bz2/libavutil/ppc/util_altivec.h -> libav-v10.1.tar.bz2/libavutil/ppc/util_altivec.h Changed

libav-v9.6.tar.bz2/libavutil/random_seed.c -> libav-v10.1.tar.bz2/libavutil/random_seed.c Changed

@@ -30,13 +30,17 @@
 #include <fcntl.h>
 #include <math.h>
 #include <time.h>
+#include "internal.h"
+#include "intreadwrite.h"
+#include "mem.h"
 #include "timer.h"
 #include "random_seed.h"
+#include "sha.h"
 
 static int read_random(uint32_t *dst, const char *file)
 {
 #if HAVE_UNISTD_H
- int fd = open(file, O_RDONLY);
+ int fd = avpriv_open(file, O_RDONLY);
 int err = -1;
 
 if (fd == -1)
@@ -52,34 +56,40 @@
 
 static uint32_t get_generic_seed(void)
 {
+ struct AVSHA *sha = av_sha_alloc();
 clock_t last_t = 0;
- int bits = 0;
- uint64_t random = 0;
- unsigned i;
- float s = 0.000000000001;
+ static uint64_t i = 0;
+ static uint32_t buffer[512] = { 0 };
+ unsigned char digest[20];
+ uint64_t last_i = i;
 
- for (i = 0; bits < 64; i++) {
+ for (;;) {
 clock_t t = clock();
- if (last_t && fabs(t - last_t) > s || t == (clock_t) -1) {
- if (i < 10000 && s < (1 << 24)) {
- s += s;
- i = t = 0;
- } else {
- random = 2 * random + (i & 1);
- bits++;
- }
+
+ 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)
+ break;
 }
 last_t = t;
 }
-#ifdef AV_READ_TIME
- random ^= AV_READ_TIME();
-#else
- random ^= clock();
-#endif
 
- random += random >> 32;
-
- return random;
+ if (!sha) {
+ uint32_t seed = 0;
+ int j;
+ // Unable to allocate an sha context, just xor the buffer together
+ // to create something hopefully unique.
+ for (j = 0; j < 512; j++)
+ seed ^= buffer[j];
+ return seed;
+ }
+ av_sha_init(sha, 160);
+ av_sha_update(sha, (const uint8_t *) buffer, sizeof(buffer));
+ av_sha_final(sha, digest);
+ av_free(sha);
+ return AV_RB32(digest) + AV_RB32(digest + 16);
 }
 
 uint32_t av_get_random_seed(void)

libav-v9.6.tar.bz2/libavutil/rational.c -> libav-v10.1.tar.bz2/libavutil/rational.c Changed

libav-v9.6.tar.bz2/libavutil/samplefmt.c -> libav-v10.1.tar.bz2/libavutil/samplefmt.c Changed

libav-v9.6.tar.bz2/libavutil/sha.c -> libav-v10.1.tar.bz2/libavutil/sha.c Changed

libav-v10.1.tar.bz2/libavutil/stereo3d.c Added

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2013 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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;
+}

libav-v10.1.tar.bz2/libavutil/stereo3d.h Added

@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2013 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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);

libav-v9.6.tar.bz2/libavutil/time.c -> libav-v10.1.tar.bz2/libavutil/time.c Changed

libav-v9.6.tar.bz2/libavutil/timer.h -> libav-v10.1.tar.bz2/libavutil/timer.h Changed

libav-v9.6.tar.bz2/libavutil/tomi/intreadwrite.h -> libav-v10.1.tar.bz2/libavutil/tomi/intreadwrite.h Changed

libav-v9.6.tar.bz2/libavutil/tree.c -> libav-v10.1.tar.bz2/libavutil/tree.c Changed

@@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include "error.h"
 #include "log.h"
 #include "mem.h"
 #include "tree.h"
@@ -43,7 +44,8 @@
 if (t) {
 unsigned int v = cmp(key, t->elem);
 if (v) {
- if (next) next[v >> 31] = t->elem;
+ if (next)
+ next[v >> 31] = t->elem;
 return av_tree_find(t->child[(v >> 31) ^ 1], key, cmp, next);
 } else {
 if (next) {
@@ -71,56 +73,60 @@
 void *next_elem[2];
 av_tree_find(t->child[i], key, cmp, next_elem);
 key = t->elem = next_elem[i];
- v = -i;
+ v = -i;
 } else {
 *next = t;
- *tp = NULL;
+ *tp = NULL;
 return NULL;
 }
 }
 ret = av_tree_insert(&t->child[v >> 31], key, cmp, next);
 if (!ret) {
- int i = (v >> 31) ^ !!*next;
+ int i = (v >> 31) ^ !!*next;
 AVTreeNode **child = &t->child[i];
 t->state += 2 * i - 1;
 
 if (!(t->state & 1)) {
 if (t->state) {
 /* The following code is equivalent to
- if((*child)->state*2 == -t->state)
- rotate(child, i^1);
- rotate(tp, i);
-
- with rotate():
- static void rotate(AVTreeNode **tp, int i) {
- AVTreeNode *t= *tp;
-
- *tp= t->child[i];
- t->child[i]= t->child[i]->child[i^1];
- (*tp)->child[i^1]= t;
- i= 4*t->state + 2*(*tp)->state + 12;
- t ->state= ((0x614586 >> i) & 3)-1;
- (*tp)->state= ((*tp)->state>>1) + ((0x400EEA >> i) & 3)-1;
- }
- but such a rotate function is both bigger and slower
- */
- if (( *child )->state * 2 == -t->state) {
+ * if ((*child)->state * 2 == -t->state)
+ * rotate(child, i ^ 1);
+ * rotate(tp, i);
+ *
+ * with rotate():
+ * static void rotate(AVTreeNode **tp, int i)
+ * {
+ * AVTreeNode *t= *tp;
+ *
+ * *tp = t->child[i];
+ * t->child[i] = t->child[i]->child[i ^ 1];
+ * (*tp)->child[i ^ 1] = t;
+ * i = 4 * t->state + 2 * (*tp)->state + 12;
+ * t->state = ((0x614586 >> i) & 3) - 1;
+ * (*tp)->state = ((0x400EEA >> i) & 3) - 1 +
+ * ((*tp)->state >> 1);
+ * }
+ * but such a rotate function is both bigger and slower
+ */
+ if ((*child)->state * 2 == -t->state) {
 *tp = (*child)->child[i ^ 1];
 (*child)->child[i ^ 1] = (*tp)->child[i];
 (*tp)->child[i] = *child;
- *child = ( *tp )->child[i ^ 1];
+ *child = (*tp)->child[i ^ 1];
 (*tp)->child[i ^ 1] = t;
 
 (*tp)->child[0]->state = -((*tp)->state > 0);
- (*tp)->child[1]->state = (*tp)->state < 0;
+ (*tp)->child[1]->state = (*tp)->state < 0;
 (*tp)->state = 0;
 } else {
- *tp = *child;
- *child = (*child)->child[i ^ 1];
- (*tp)->child[i ^ 1] = t;
- if ((*tp)->state) t->state = 0;
- else t->state >>= 1;
- (*tp)->state = -t->state;
+ *tp = *child;
+ *child = (*child)->child[i ^ 1];
+ (*tp)->child[i ^ 1] = t;
+ if ((*tp)->state)
+ t->state = 0;
+ else
+ t->state >>= 1;
+ (*tp)->state = -t->state;
 }
 }
 }
@@ -174,11 +180,11 @@
 int left = check(t->child[0]);
 int right = check(t->child[1]);
 
- if (left>999 || right>999)
+ if (left > 999 || right > 999)
 return 1000;
 if (right - left != t->state)
 return 1000;
- if (t->state>1 || t->state<-1)
+ if (t->state > 1 || t->state < -1)
 return 1000;
 return FFMAX(left, right) + 1;
 }
@@ -188,7 +194,8 @@
 static void print(AVTreeNode *t, int depth)
 {
 int i;
- for (i = 0; i < depth * 4; i++) av_log(NULL, AV_LOG_ERROR, " ");
+ for (i = 0; i < depth * 4; i++)
+ av_log(NULL, AV_LOG_ERROR, " ");
 if (t) {
 av_log(NULL, AV_LOG_ERROR, "Node %p %2d %p\n", t, t->state, t->elem);
 print(t->child[0], depth + 1);
@@ -202,37 +209,53 @@
 return (uint8_t *) a - (const uint8_t *) b;
 }
 
-int main (void)
+int main(void)
 {
 int i;
- void *k;
 AVTreeNode *root = NULL, *node = NULL;
 AVLFG prng;
 
 av_lfg_init(&prng, 1);
 
 for (i = 0; i < 10000; i++) {
- int j = av_lfg_get(&prng) % 86294;
+ AVTreeNode *node2 = NULL;
+ intptr_t j = av_lfg_get(&prng) % 86294;
+ void *ret, *jj = (void *)(j + 1);
+
+ while (ret = av_tree_find(root, jj, cmp, NULL)) {
+ j = av_lfg_get(&prng) % 86294;
+ jj = (void *)(j + 1);
+ }
+
 if (check(root) > 999) {
 av_log(NULL, AV_LOG_ERROR, "FATAL error %d\n", i);
- print(root, 0);
- return -1;
+ print(root, 0);
+ return 1;
 }
- av_log(NULL, AV_LOG_ERROR, "inserting %4d\n", j);
+
 if (!node)
 node = av_tree_node_alloc();
- av_tree_insert(&root, (void *) (j + 1), cmp, &node);
-
- j = av_lfg_get(&prng) % 86294;
- {
- AVTreeNode *node2 = NULL;
- av_log(NULL, AV_LOG_ERROR, "removing %4d\n", j);
- av_tree_insert(&root, (void *) (j + 1), cmp, &node2);
- k = av_tree_find(root, (void *) (j + 1), cmp, NULL);
- if (k)
- av_log(NULL, AV_LOG_ERROR, "removal failure %d\n", i);
+ if (!node) {
+ av_log(NULL, AV_LOG_ERROR, "Memory allocation failure.\n");
+ return 1;
 }
+ av_tree_insert(&root, jj, cmp, &node);
+
+ while (ret = av_tree_find(root, jj, cmp, NULL)) {
+ j = av_lfg_get(&prng) % 86294;
+ jj = (void *)(j + 1);
+ }
+
+ ret = av_tree_insert(&root, jj, cmp, &node2);
+ if (ret != jj)
+ av_tree_destroy(node2);
+ ret = av_tree_find(root, jj, cmp, NULL);
+ if (ret)
+ av_log(NULL, AV_LOG_ERROR, "removal failure %d\n", i);
 }
+
+ av_tree_destroy(root);
+
 return 0;
 }
 #endif

libav-v9.6.tar.bz2/libavutil/tree.h -> libav-v10.1.tar.bz2/libavutil/tree.h Changed

@@ -34,10 +34,10 @@
  * @addtogroup lavu_tree AVTree
  * @ingroup lavu_data
  *
- * Low complexity tree container
+ * Low-complexity tree container
  *
  * Insertion, removal, finding equal, largest which is smaller than and
- * smallest which is larger than, all have O(log n) worst case complexity.
+ * smallest which is larger than, all have O(log n) worst-case complexity.
  * @{
  */
 
@@ -58,10 +58,11 @@
  * @param next If next is not NULL, then next[0] will contain the previous
  *             element and next[1] the next element. If either does not exist,
  *             then the corresponding entry in next is unchanged.
- * @return An element with cmp(key, elem)==0 or NULL if no such element exists in
- *         the tree.
+ * @return An element with cmp(key, elem) == 0 or NULL if no such element
+ *         exists in the tree.
  */
-void *av_tree_find(const struct AVTreeNode *root, void *key, int (*cmp)(void *key, const void *b), void *next[2]);
+void *av_tree_find(const struct AVTreeNode *root, void *key,
+                   int (*cmp)(void *key, const void *b), void *next[2]);
 
 /**
  * Insert or remove an element.
@@ -82,11 +83,17 @@
  *             lower overhead compared to many malloced elements.
  *             You might want to define a function like:
  *             @code
- *             void *tree_insert(struct AVTreeNode **rootp, void *key, int (*cmp)(void *key, const void *b), AVTreeNode **next){
- *                 if(!*next) *next= av_mallocz(av_tree_node_size);
+ *             void *tree_insert(struct AVTreeNode **rootp, void *key,
+ *                               int (*cmp)(void *key, const void *b),
+ *                               AVTreeNode **next)
+ *             {
+ *                 if (!*next)
+ *                     *next = av_mallocz(av_tree_node_size);
  *                 return av_tree_insert(rootp, key, cmp, next);
  *             }
- *             void *tree_remove(struct AVTreeNode **rootp, void *key, int (*cmp)(void *key, const void *b, AVTreeNode **next)){
+ *             void *tree_remove(struct AVTreeNode **rootp, void *key,
+ *                               int (*cmp)(void *key, const void *b, AVTreeNode **next))
+ *             {
  *                 av_freep(next);
  *                 return av_tree_insert(rootp, key, cmp, next);
  *             }
@@ -96,7 +103,10 @@
  *         Which one it is depends on the tree state and the implementation. You
  *         should make no assumptions that it's one or the other in the code.
  */
-void *av_tree_insert(struct AVTreeNode **rootp, void *key, int (*cmp)(void *key, const void *b), struct AVTreeNode **next);
+void *av_tree_insert(struct AVTreeNode **rootp, void *key,
+                     int (*cmp)(void *key, const void *b),
+                     struct AVTreeNode **next);
+
 void av_tree_destroy(struct AVTreeNode *t);
 
 /**
@@ -109,7 +119,9 @@
  * @note The cmp function should use the same ordering used to construct the
  *       tree.
  */
-void av_tree_enumerate(struct AVTreeNode *t, void *opaque, int (*cmp)(void *opaque, void *elem), int (*enu)(void *opaque, void *elem));
+void av_tree_enumerate(struct AVTreeNode *t, void *opaque,
+                       int (*cmp)(void *opaque, void *elem),
+                       int (*enu)(void *opaque, void *elem));
 
 /**
  * @}

libav-v9.6.tar.bz2/libavutil/version.h -> libav-v10.1.tar.bz2/libavutil/version.h Changed

@@ -19,7 +19,24 @@
 #ifndef AVUTIL_VERSION_H
 #define AVUTIL_VERSION_H
 
-#include "avutil.h"
+#include "macros.h"
+
+/**
+ * @defgroup version_utils Library Version Macros
+ *
+ * Useful to check and match library version in order to maintain
+ * backward compatibility.
+ *
+ * @{
+ */
+
+#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
+#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
+#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
+
+/**
+ * @}
+ */
 
 /**
 * @file
@@ -36,7 +53,7 @@
 * @{
 */
 
-#define LIBAVUTIL_VERSION_MAJOR 52
+#define LIBAVUTIL_VERSION_MAJOR 53
 #define LIBAVUTIL_VERSION_MINOR 3
 #define LIBAVUTIL_VERSION_MICRO 0
 
@@ -62,22 +79,34 @@
 */
 
 #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_LLS_PRIVATE
+#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_AVFRAME_LAVC
+#define FF_API_AVFRAME_LAVC (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_VDPAU
+#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_XVMC
+#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 54)
 #endif
 
 /**

libav-v9.6.tar.bz2/libavutil/x86/Makefile -> libav-v10.1.tar.bz2/libavutil/x86/Makefile Changed

libav-v9.6.tar.bz2/libavutil/x86/asm.h -> libav-v10.1.tar.bz2/libavutil/x86/asm.h Changed

libav-v9.6.tar.bz2/libavutil/x86/cpu.c -> libav-v10.1.tar.bz2/libavutil/x86/cpu.c Changed

libav-v9.6.tar.bz2/libavutil/x86/cpu.h -> libav-v10.1.tar.bz2/libavutil/x86/cpu.h Changed

@@ -21,38 +21,52 @@
 
 #include "config.h"
 #include "libavutil/cpu.h"
-
-#define CPUEXT(flags, suffix, cpuext)                                   \
-    (HAVE_ ## cpuext ## suffix && ((flags) & AV_CPU_FLAG_ ## cpuext))
+#include "libavutil/cpu_internal.h"
 
 #define AV_CPU_FLAG_AMD3DNOW    AV_CPU_FLAG_3DNOW
 #define AV_CPU_FLAG_AMD3DNOWEXT AV_CPU_FLAG_3DNOWEXT
 
-#define EXTERNAL_AMD3DNOW(flags)    CPUEXT(flags, _EXTERNAL, AMD3DNOW)
-#define EXTERNAL_AMD3DNOWEXT(flags) CPUEXT(flags, _EXTERNAL, AMD3DNOWEXT)
-#define EXTERNAL_MMX(flags)         CPUEXT(flags, _EXTERNAL, MMX)
-#define EXTERNAL_MMXEXT(flags)      CPUEXT(flags, _EXTERNAL, MMXEXT)
-#define EXTERNAL_SSE(flags)         CPUEXT(flags, _EXTERNAL, SSE)
-#define EXTERNAL_SSE2(flags)        CPUEXT(flags, _EXTERNAL, SSE2)
-#define EXTERNAL_SSE3(flags)        CPUEXT(flags, _EXTERNAL, SSE3)
-#define EXTERNAL_SSSE3(flags)       CPUEXT(flags, _EXTERNAL, SSSE3)
-#define EXTERNAL_SSE4(flags)        CPUEXT(flags, _EXTERNAL, SSE4)
-#define EXTERNAL_SSE42(flags)       CPUEXT(flags, _EXTERNAL, SSE42)
-#define EXTERNAL_AVX(flags)         CPUEXT(flags, _EXTERNAL, AVX)
-#define EXTERNAL_FMA4(flags)        CPUEXT(flags, _EXTERNAL, FMA4)
-
-#define INLINE_AMD3DNOW(flags)      CPUEXT(flags, _INLINE, AMD3DNOW)
-#define INLINE_AMD3DNOWEXT(flags)   CPUEXT(flags, _INLINE, AMD3DNOWEXT)
-#define INLINE_MMX(flags)           CPUEXT(flags, _INLINE, MMX)
-#define INLINE_MMXEXT(flags)        CPUEXT(flags, _INLINE, MMXEXT)
-#define INLINE_SSE(flags)           CPUEXT(flags, _INLINE, SSE)
-#define INLINE_SSE2(flags)          CPUEXT(flags, _INLINE, SSE2)
-#define INLINE_SSE3(flags)          CPUEXT(flags, _INLINE, SSE3)
-#define INLINE_SSSE3(flags)         CPUEXT(flags, _INLINE, SSSE3)
-#define INLINE_SSE4(flags)          CPUEXT(flags, _INLINE, SSE4)
-#define INLINE_SSE42(flags)         CPUEXT(flags, _INLINE, SSE42)
-#define INLINE_AVX(flags)           CPUEXT(flags, _INLINE, AVX)
-#define INLINE_FMA4(flags)          CPUEXT(flags, _INLINE, FMA4)
+#define X86_AMD3DNOW(flags)         CPUEXT(flags, AMD3DNOW)
+#define X86_AMD3DNOWEXT(flags)      CPUEXT(flags, AMD3DNOWEXT)
+#define X86_MMX(flags)              CPUEXT(flags, MMX)
+#define X86_MMXEXT(flags)           CPUEXT(flags, MMXEXT)
+#define X86_SSE(flags)              CPUEXT(flags, SSE)
+#define X86_SSE2(flags)             CPUEXT(flags, SSE2)
+#define X86_SSE3(flags)             CPUEXT(flags, SSE3)
+#define X86_SSSE3(flags)            CPUEXT(flags, SSSE3)
+#define X86_SSE4(flags)             CPUEXT(flags, SSE4)
+#define X86_SSE42(flags)            CPUEXT(flags, SSE42)
+#define X86_AVX(flags)              CPUEXT(flags, AVX)
+#define X86_FMA4(flags)             CPUEXT(flags, FMA4)
+#define X86_AVX2(flags)             CPUEXT(flags, AVX2)
+
+#define EXTERNAL_AMD3DNOW(flags)    CPUEXT_SUFFIX(flags, _EXTERNAL, AMD3DNOW)
+#define EXTERNAL_AMD3DNOWEXT(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, AMD3DNOWEXT)
+#define EXTERNAL_MMX(flags)         CPUEXT_SUFFIX(flags, _EXTERNAL, MMX)
+#define EXTERNAL_MMXEXT(flags)      CPUEXT_SUFFIX(flags, _EXTERNAL, MMXEXT)
+#define EXTERNAL_SSE(flags)         CPUEXT_SUFFIX(flags, _EXTERNAL, SSE)
+#define EXTERNAL_SSE2(flags)        CPUEXT_SUFFIX(flags, _EXTERNAL, SSE2)
+#define EXTERNAL_SSE3(flags)        CPUEXT_SUFFIX(flags, _EXTERNAL, SSE3)
+#define EXTERNAL_SSSE3(flags)       CPUEXT_SUFFIX(flags, _EXTERNAL, SSSE3)
+#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_FMA4(flags)        CPUEXT_SUFFIX(flags, _EXTERNAL, FMA4)
+#define EXTERNAL_AVX2(flags)        CPUEXT_SUFFIX(flags, _EXTERNAL, AVX2)
+
+#define INLINE_AMD3DNOW(flags)      CPUEXT_SUFFIX(flags, _INLINE, AMD3DNOW)
+#define INLINE_AMD3DNOWEXT(flags)   CPUEXT_SUFFIX(flags, _INLINE, AMD3DNOWEXT)
+#define INLINE_MMX(flags)           CPUEXT_SUFFIX(flags, _INLINE, MMX)
+#define INLINE_MMXEXT(flags)        CPUEXT_SUFFIX(flags, _INLINE, MMXEXT)
+#define INLINE_SSE(flags)           CPUEXT_SUFFIX(flags, _INLINE, SSE)
+#define INLINE_SSE2(flags)          CPUEXT_SUFFIX(flags, _INLINE, SSE2)
+#define INLINE_SSE3(flags)          CPUEXT_SUFFIX(flags, _INLINE, SSE3)
+#define INLINE_SSSE3(flags)         CPUEXT_SUFFIX(flags, _INLINE, SSSE3)
+#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_FMA4(flags)          CPUEXT_SUFFIX(flags, _INLINE, FMA4)
+#define INLINE_AVX2(flags)          CPUEXT_SUFFIX(flags, _INLINE, AVX2)
 
 void ff_cpu_cpuid(int index, int *eax, int *ebx, int *ecx, int *edx);
 void ff_cpu_xgetbv(int op, int *eax, int *edx);

libav-v10.1.tar.bz2/libavutil/x86/emms.asm Added

@@ -0,0 +1,30 @@
+;*****************************************************************************
+;* Copyright (C) 2013 Martin Storsjo
+;*
+;* This file is part of Libav.
+;*
+;* Libav 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.
+;*
+;* Libav 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 Libav; if not, write to the Free Software
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;******************************************************************************
+
+%include "x86util.asm"
+
+SECTION .text
+
+;-----------------------------------------------------------------------------
+; void avpriv_emms_yasm(void)
+;-----------------------------------------------------------------------------
+cvisible emms_yasm, 0, 0
+    emms
+    RET

libav-v10.1.tar.bz2/libavutil/x86/emms.h Added

@@ -0,0 +1,45 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_X86_EMMS_H
+#define AVUTIL_X86_EMMS_H
+
+#include "config.h"
+#include "libavutil/attributes.h"
+
+void avpriv_emms_yasm(void);
+
+#if HAVE_MMX_INLINE
+# define emms_c emms_c
+/**
+ * Empty mmx state.
+ * this must be called between any dsp function and float/double code.
+ * for example sin(); dsp->idct_put(); emms_c(); cos()
+ */
+static av_always_inline void emms_c(void)
+{
+ __asm__ volatile ("emms" ::: "memory");
+}
+#elif HAVE_MMX && HAVE_MM_EMPTY
+# include <mmintrin.h>
+# define emms_c _mm_empty
+#elif HAVE_MMX_EXTERNAL
+# define emms_c avpriv_emms_yasm
+#endif /* HAVE_MMX_INLINE */
+
+#endif /* AVUTIL_X86_EMMS_H */

libav-v9.6.tar.bz2/libavutil/x86/float_dsp.asm -> libav-v10.1.tar.bz2/libavutil/x86/float_dsp.asm Changed

@@ -162,3 +162,119 @@
 INIT_YMM avx
 VECTOR_DMUL_SCALAR
 %endif
+
+;-----------------------------------------------------------------------------
+; vector_fmul_add(float *dst, const float *src0, const float *src1,
+;                 const float *src2, int len)
+;-----------------------------------------------------------------------------
+%macro VECTOR_FMUL_ADD 0
+cglobal vector_fmul_add, 5,5,2, dst, src0, src1, src2, len
+    lea       lenq, [lend*4 - 2*mmsize]
+ALIGN 16
+.loop:
+    mova    m0,   [src0q + lenq]
+    mova    m1,   [src0q + lenq + mmsize]
+    mulps   m0, m0, [src1q + lenq]
+    mulps   m1, m1, [src1q + lenq + mmsize]
+    addps   m0, m0, [src2q + lenq]
+    addps   m1, m1, [src2q + lenq + mmsize]
+    mova    [dstq + lenq], m0
+    mova    [dstq + lenq + mmsize], m1
+
+    sub     lenq,   2*mmsize
+    jge     .loop
+    REP_RET
+%endmacro
+
+INIT_XMM sse
+VECTOR_FMUL_ADD
+INIT_YMM avx
+VECTOR_FMUL_ADD
+
+;-----------------------------------------------------------------------------
+; void vector_fmul_reverse(float *dst, const float *src0, const float *src1,
+;                          int len)
+;-----------------------------------------------------------------------------
+%macro VECTOR_FMUL_REVERSE 0
+cglobal vector_fmul_reverse, 4,4,2, dst, src0, src1, len
+    lea       lenq, [lend*4 - 2*mmsize]
+ALIGN 16
+.loop:
+%if cpuflag(avx)
+    vmovaps     xmm0, [src1q + 16]
+    vinsertf128 m0, m0, [src1q], 1
+    vshufps     m0, m0, m0, q0123
+    vmovaps     xmm1, [src1q + mmsize + 16]
+    vinsertf128 m1, m1, [src1q + mmsize], 1
+    vshufps     m1, m1, m1, q0123
+%else
+    mova    m0, [src1q]
+    mova    m1, [src1q + mmsize]
+    shufps  m0, m0, q0123
+    shufps  m1, m1, q0123
+%endif
+    mulps   m0, m0, [src0q + lenq + mmsize]
+    mulps   m1, m1, [src0q + lenq]
+    mova    [dstq + lenq + mmsize], m0
+    mova    [dstq + lenq], m1
+    add     src1q, 2*mmsize
+    sub     lenq,  2*mmsize
+    jge     .loop
+    REP_RET
+%endmacro
+
+INIT_XMM sse
+VECTOR_FMUL_REVERSE
+INIT_YMM avx
+VECTOR_FMUL_REVERSE
+
+; float scalarproduct_float_sse(const float *v1, const float *v2, int len)
+INIT_XMM sse
+cglobal scalarproduct_float, 3,3,2, v1, v2, offset
+    neg   offsetq
+    shl   offsetq, 2
+    sub       v1q, offsetq
+    sub       v2q, offsetq
+    xorps    xmm0, xmm0
+.loop:
+    movaps   xmm1, [v1q+offsetq]
+    mulps    xmm1, [v2q+offsetq]
+    addps    xmm0, xmm1
+    add   offsetq, 16
+    js .loop
+    movhlps  xmm1, xmm0
+    addps    xmm0, xmm1
+    movss    xmm1, xmm0
+    shufps   xmm0, xmm0, 1
+    addss    xmm0, xmm1
+%if ARCH_X86_64 == 0
+    movss     r0m,  xmm0
+    fld dword r0m
+%endif
+    RET
+
+;-----------------------------------------------------------------------------
+; void ff_butterflies_float(float *src0, float *src1, int len);
+;-----------------------------------------------------------------------------
+INIT_XMM sse
+cglobal butterflies_float, 3,3,3, src0, src1, len
+%if ARCH_X86_64
+    movsxd    lenq, lend
+%endif
+    test      lenq, lenq
+    jz .end
+    shl       lenq, 2
+    lea      src0q, [src0q +   lenq]
+    lea      src1q, [src1q +   lenq]
+    neg       lenq
+.loop:
+    mova        m0, [src0q + lenq]
+    mova        m1, [src1q + lenq]
+    subps       m2, m0, m1
+    addps       m0, m0, m1
+    mova        [src1q + lenq], m2
+    mova        [src0q + lenq], m0
+    add       lenq, mmsize
+    jl .loop
+.end:
+    REP_RET

libav-v9.6.tar.bz2/libavutil/x86/float_dsp_init.c -> libav-v10.1.tar.bz2/libavutil/x86/float_dsp_init.c Changed

@@ -18,43 +18,139 @@
 
 #include "config.h"
 
+#include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
 #include "libavutil/float_dsp.h"
 #include "cpu.h"
+#include "asm.h"
 
-extern void ff_vector_fmul_sse(float *dst, const float *src0, const float *src1,
+void ff_vector_fmul_sse(float *dst, const float *src0, const float *src1,
+                        int len);
+void ff_vector_fmul_avx(float *dst, const float *src0, const float *src1,
+                        int len);
+
+void ff_vector_fmac_scalar_sse(float *dst, const float *src, float mul,
+                               int len);
+void ff_vector_fmac_scalar_avx(float *dst, const float *src, float mul,
                                int len);
-extern void ff_vector_fmul_avx(float *dst, const float *src0, const float *src1,
+
+void ff_vector_fmul_scalar_sse(float *dst, const float *src, float mul,
                                int len);
 
-extern void ff_vector_fmac_scalar_sse(float *dst, const float *src, float mul,
-                                      int len);
-extern void ff_vector_fmac_scalar_avx(float *dst, const float *src, float mul,
-                                      int len);
+void ff_vector_dmul_scalar_sse2(double *dst, const double *src,
+                                double mul, int len);
+void ff_vector_dmul_scalar_avx(double *dst, const double *src,
+                               double mul, int len);
+
+void ff_vector_fmul_add_sse(float *dst, const float *src0, const float *src1,
+                            const float *src2, int len);
+void ff_vector_fmul_add_avx(float *dst, const float *src0, const float *src1,
+                            const float *src2, int len);
 
-extern void ff_vector_fmul_scalar_sse(float *dst, const float *src, float mul,
-                                      int len);
+void ff_vector_fmul_reverse_sse(float *dst, const float *src0,
+                                const float *src1, int len);
+void ff_vector_fmul_reverse_avx(float *dst, const float *src0,
+                                const float *src1, int len);
 
-extern void ff_vector_dmul_scalar_sse2(double *dst, const double *src,
-                                       double mul, int len);
-extern void ff_vector_dmul_scalar_avx(double *dst, const double *src,
-                                      double mul, int len);
+float ff_scalarproduct_float_sse(const float *v1, const float *v2, int order);
 
-void ff_float_dsp_init_x86(AVFloatDSPContext *fdsp)
+void ff_butterflies_float_sse(float *src0, float *src1, int len);
+
+#if HAVE_6REGS && HAVE_INLINE_ASM
+static void vector_fmul_window_3dnowext(float *dst, const float *src0,
+                                        const float *src1, const float *win,
+                                        int len)
 {
-    int mm_flags = av_get_cpu_flags();
+    x86_reg i = -len * 4;
+    x86_reg j =  len * 4 - 8;
+    __asm__ volatile (
+        "1:                             \n"
+        "pswapd (%5, %1), %%mm1         \n"
+        "movq   (%5, %0), %%mm0         \n"
+        "pswapd (%4, %1), %%mm5         \n"
+        "movq   (%3, %0), %%mm4         \n"
+        "movq      %%mm0, %%mm2         \n"
+        "movq      %%mm1, %%mm3         \n"
+        "pfmul     %%mm4, %%mm2         \n" // src0[len + i] * win[len + i]
+        "pfmul     %%mm5, %%mm3         \n" // src1[j]       * win[len + j]
+        "pfmul     %%mm4, %%mm1         \n" // src0[len + i] * win[len + j]
+        "pfmul     %%mm5, %%mm0         \n" // src1[j]       * win[len + i]
+        "pfadd     %%mm3, %%mm2         \n"
+        "pfsub     %%mm0, %%mm1         \n"
+        "pswapd    %%mm2, %%mm2         \n"
+        "movq      %%mm1, (%2, %0)      \n"
+        "movq      %%mm2, (%2, %1)      \n"
+        "sub          $8, %1            \n"
+        "add          $8, %0            \n"
+        "jl           1b                \n"
+        "femms                          \n"
+        : "+r"(i), "+r"(j)
+        : "r"(dst + len), "r"(src0 + len), "r"(src1), "r"(win + len)
+    );
+}
 
-    if (EXTERNAL_SSE(mm_flags)) {
+static void vector_fmul_window_sse(float *dst, const float *src0,
+                                   const float *src1, const float *win, int len)
+{
+    x86_reg i = -len * 4;
+    x86_reg j =  len * 4 - 16;
+    __asm__ volatile (
+        "1:                             \n"
+        "movaps      (%5, %1), %%xmm1   \n"
+        "movaps      (%5, %0), %%xmm0   \n"
+        "movaps      (%4, %1), %%xmm5   \n"
+        "movaps      (%3, %0), %%xmm4   \n"
+        "shufps $0x1b, %%xmm1, %%xmm1   \n"
+        "shufps $0x1b, %%xmm5, %%xmm5   \n"
+        "movaps        %%xmm0, %%xmm2   \n"
+        "movaps        %%xmm1, %%xmm3   \n"
+        "mulps         %%xmm4, %%xmm2   \n" // src0[len + i] * win[len + i]
+        "mulps         %%xmm5, %%xmm3   \n" // src1[j]       * win[len + j]
+        "mulps         %%xmm4, %%xmm1   \n" // src0[len + i] * win[len + j]
+        "mulps         %%xmm5, %%xmm0   \n" // src1[j]       * win[len + i]
+        "addps         %%xmm3, %%xmm2   \n"
+        "subps         %%xmm0, %%xmm1   \n"
+        "shufps $0x1b, %%xmm2, %%xmm2   \n"
+        "movaps        %%xmm1, (%2, %0) \n"
+        "movaps        %%xmm2, (%2, %1) \n"
+        "sub              $16, %1       \n"
+        "add              $16, %0       \n"
+        "jl                1b           \n"
+        : "+r"(i), "+r"(j)
+        : "r"(dst + len), "r"(src0 + len), "r"(src1), "r"(win + len)
+    );
+}
+#endif /* HAVE_6REGS && HAVE_INLINE_ASM */
+
+av_cold void ff_float_dsp_init_x86(AVFloatDSPContext *fdsp)
+{
+    int cpu_flags = av_get_cpu_flags();
+
+#if HAVE_6REGS && HAVE_INLINE_ASM
+    if (INLINE_AMD3DNOWEXT(cpu_flags)) {
+        fdsp->vector_fmul_window  = vector_fmul_window_3dnowext;
+    }
+    if (INLINE_SSE(cpu_flags)) {
+        fdsp->vector_fmul_window = vector_fmul_window_sse;
+    }
+#endif
+    if (EXTERNAL_SSE(cpu_flags)) {
         fdsp->vector_fmul = ff_vector_fmul_sse;
         fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_sse;
         fdsp->vector_fmul_scalar = ff_vector_fmul_scalar_sse;
+        fdsp->vector_fmul_add    = ff_vector_fmul_add_sse;
+        fdsp->vector_fmul_reverse = ff_vector_fmul_reverse_sse;
+        fdsp->scalarproduct_float = ff_scalarproduct_float_sse;
+        fdsp->butterflies_float   = ff_butterflies_float_sse;
     }
-    if (EXTERNAL_SSE2(mm_flags)) {
+    if (EXTERNAL_SSE2(cpu_flags)) {
         fdsp->vector_dmul_scalar = ff_vector_dmul_scalar_sse2;
     }
-    if (EXTERNAL_AVX(mm_flags)) {
+    if (EXTERNAL_AVX(cpu_flags)) {
         fdsp->vector_fmul = ff_vector_fmul_avx;
         fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_avx;
         fdsp->vector_dmul_scalar = ff_vector_dmul_scalar_avx;
+        fdsp->vector_fmul_add    = ff_vector_fmul_add_avx;
+        fdsp->vector_fmul_reverse = ff_vector_fmul_reverse_avx;
     }
 }

libav-v10.1.tar.bz2/libavutil/x86/lls.asm Added

@@ -0,0 +1,234 @@
+;******************************************************************************
+;* linear least squares model
+;*
+;* Copyright (c) 2013 Loren Merritt
+;*
+;* This file is part of Libav.
+;*
+;* Libav 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.
+;*
+;* Libav 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 Libav; if not, write to the Free Software
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;******************************************************************************
+
+%include "x86util.asm"
+
+SECTION .text
+
+%define MAX_VARS 32
+%define MAX_VARS_ALIGN (MAX_VARS+4)
+%define COVAR_STRIDE MAX_VARS_ALIGN*8
+%define COVAR(x,y) [covarq + (x)*8 + (y)*COVAR_STRIDE]
+
+struc LLSModel
+    .covariance:  resq MAX_VARS_ALIGN*MAX_VARS_ALIGN
+    .coeff:       resq MAX_VARS*MAX_VARS
+    .variance:    resq MAX_VARS
+    .indep_count: resd 1
+endstruc
+
+%macro ADDPD_MEM 2
+%if cpuflag(avx)
+    vaddpd %2, %2, %1
+%else
+    addpd  %2, %1
+%endif
+    mova   %1, %2
+%endmacro
+
+INIT_XMM sse2
+%define movdqa movaps
+cglobal update_lls, 2,5,8, ctx, var, i, j, covar2
+    %define covarq ctxq
+    mov     id, [ctxq + LLSModel.indep_count]
+    lea   varq, [varq + iq*8]
+    neg     iq
+    mov covar2q, covarq
+.loopi:
+    ; Compute all 3 pairwise products of a 2x2 block that lies on the diagonal
+    mova    m1, [varq + iq*8]
+    mova    m3, [varq + iq*8 + 16]
+    pshufd  m4, m1, q1010
+    pshufd  m5, m1, q3232
+    pshufd  m6, m3, q1010
+    pshufd  m7, m3, q3232
+    mulpd   m0, m1, m4
+    mulpd   m1, m1, m5
+    lea covarq, [covar2q + 16]
+    ADDPD_MEM COVAR(-2,0), m0
+    ADDPD_MEM COVAR(-2,1), m1
+    lea     jq, [iq + 2]
+    cmp     jd, -2
+    jg .skip4x4
+.loop4x4:
+    ; Compute all 16 pairwise products of a 4x4 block
+    mulpd   m0, m4, m3
+    mulpd   m1, m5, m3
+    mulpd   m2, m6, m3
+    mulpd   m3, m3, m7
+    ADDPD_MEM COVAR(0,0), m0
+    ADDPD_MEM COVAR(0,1), m1
+    ADDPD_MEM COVAR(0,2), m2
+    ADDPD_MEM COVAR(0,3), m3
+    mova    m3, [varq + jq*8 + 16]
+    mulpd   m0, m4, m3
+    mulpd   m1, m5, m3
+    mulpd   m2, m6, m3
+    mulpd   m3, m3, m7
+    ADDPD_MEM COVAR(2,0), m0
+    ADDPD_MEM COVAR(2,1), m1
+    ADDPD_MEM COVAR(2,2), m2
+    ADDPD_MEM COVAR(2,3), m3
+    mova    m3, [varq + jq*8 + 32]
+    add covarq, 32
+    add     jq, 4
+    cmp     jd, -2
+    jle .loop4x4
+.skip4x4:
+    test    jd, jd
+    jg .skip2x4
+    mulpd   m4, m3
+    mulpd   m5, m3
+    mulpd   m6, m3
+    mulpd   m7, m3
+    ADDPD_MEM COVAR(0,0), m4
+    ADDPD_MEM COVAR(0,1), m5
+    ADDPD_MEM COVAR(0,2), m6
+    ADDPD_MEM COVAR(0,3), m7
+.skip2x4:
+    add     iq, 4
+    add covar2q, 4*COVAR_STRIDE+32
+    cmp     id, -2
+    jle .loopi
+    test    id, id
+    jg .ret
+    mov     jq, iq
+    %define covarq covar2q
+.loop2x1:
+    movsd   m0, [varq + iq*8]
+    movlhps m0, m0
+    mulpd   m0, [varq + jq*8]
+    ADDPD_MEM COVAR(0,0), m0
+    inc     iq
+    add covarq, COVAR_STRIDE
+    test    id, id
+    jle .loop2x1
+.ret:
+    REP_RET
+
+INIT_YMM avx
+cglobal update_lls, 3,6,8, ctx, var, count, i, j, count2
+    %define covarq ctxq
+    mov  countd, [ctxq + LLSModel.indep_count]
+    lea count2d, [countq-2]
+    xor     id, id
+.loopi:
+    ; Compute all 10 pairwise products of a 4x4 block that lies on the diagonal
+    mova    ymm1, [varq + iq*8]
+    vbroadcastsd ymm4, [varq + iq*8]
+    vbroadcastsd ymm5, [varq + iq*8 + 8]
+    vbroadcastsd ymm6, [varq + iq*8 + 16]
+    vbroadcastsd ymm7, [varq + iq*8 + 24]
+    vextractf128 xmm3, ymm1, 1
+    vmulpd  ymm0, ymm1, ymm4
+    vmulpd  ymm1, ymm1, ymm5
+    vmulpd  xmm2, xmm3, xmm6
+    vmulpd  xmm3, xmm3, xmm7
+    ADDPD_MEM COVAR(iq  ,0), ymm0
+    ADDPD_MEM COVAR(iq  ,1), ymm1
+    ADDPD_MEM COVAR(iq+2,2), xmm2
+    ADDPD_MEM COVAR(iq+2,3), xmm3
+    lea     jd, [iq + 4]
+    cmp     jd, count2d
+    jg .skip4x4
+.loop4x4:
+    ; Compute all 16 pairwise products of a 4x4 block
+    mova    ymm3, [varq + jq*8]
+    vmulpd  ymm0, ymm3, ymm4
+    vmulpd  ymm1, ymm3, ymm5
+    vmulpd  ymm2, ymm3, ymm6
+    vmulpd  ymm3, ymm3, ymm7
+    ADDPD_MEM COVAR(jq,0), ymm0
+    ADDPD_MEM COVAR(jq,1), ymm1
+    ADDPD_MEM COVAR(jq,2), ymm2
+    ADDPD_MEM COVAR(jq,3), ymm3
+    add     jd, 4
+    cmp     jd, count2d
+    jle .loop4x4
+.skip4x4:
+    cmp     jd, countd
+    jg .skip2x4
+    mova    xmm3, [varq + jq*8]
+    vmulpd  xmm0, xmm3, xmm4
+    vmulpd  xmm1, xmm3, xmm5
+    vmulpd  xmm2, xmm3, xmm6
+    vmulpd  xmm3, xmm3, xmm7
+    ADDPD_MEM COVAR(jq,0), xmm0
+    ADDPD_MEM COVAR(jq,1), xmm1
+    ADDPD_MEM COVAR(jq,2), xmm2
+    ADDPD_MEM COVAR(jq,3), xmm3
+.skip2x4:
+    add     id, 4
+    add covarq, 4*COVAR_STRIDE
+    cmp     id, count2d
+    jle .loopi
+    cmp     id, countd
+    jg .ret
+    mov     jd, id
+.loop2x1:
+    vmovddup xmm0, [varq + iq*8]
+    vmulpd   xmm0, [varq + jq*8]
+    ADDPD_MEM COVAR(jq,0), xmm0
+    inc     id
+    add covarq, COVAR_STRIDE
+    cmp     id, countd
+    jle .loop2x1
+.ret:
+    REP_RET
+
+
+INIT_XMM sse2
+cglobal evaluate_lls, 3,4,2, ctx, var, order, i
+    ; This function is often called on the same buffer as update_lls, but with
+    ; an offset. They can't both be aligned.
+    ; Load halves rather than movu to avoid store-forwarding stalls, since the
+    ; input was initialized immediately prior to this function using scalar math.
+    %define coefsq ctxq
+    mov     id, orderd
+    imul    orderd, MAX_VARS
+    lea     coefsq, [ctxq + LLSModel.coeff + orderq*8]
+    movsd   m0, [varq]
+    movhpd  m0, [varq + 8]
+    mulpd   m0, [coefsq]
+    lea coefsq, [coefsq + iq*8]
+    lea   varq, [varq + iq*8]
+    neg     iq
+    add     iq, 2
+.loop:
+    movsd   m1, [varq + iq*8]
+    movhpd  m1, [varq + iq*8 + 8]
+    mulpd   m1, [coefsq + iq*8]
+    addpd   m0, m1
+    add     iq, 2
+    jl .loop
+    jg .skip1
+    movsd   m1, [varq + iq*8]
+    mulsd   m1, [coefsq + iq*8]
+    addpd   m0, m1
+.skip1:
+    movhlps m1, m0
+    addsd   m0, m1
+%if ARCH_X86_32
+    movsd  r0m, m0
+    fld   qword r0m
+%endif
+    RET

libav-v10.1.tar.bz2/libavutil/x86/lls_init.c Added

@@ -0,0 +1,41 @@
+/*
+ * linear least squares model
+ *
+ * Copyright (c) 2013 Loren Merritt
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/lls.h"
+#include "libavutil/x86/cpu.h"
+
+void ff_update_lls_sse2(LLSModel *m, double *var);
+void ff_update_lls_avx(LLSModel *m, double *var);
+double ff_evaluate_lls_sse2(LLSModel *m, double *var, int order);
+
+av_cold void ff_init_lls_x86(LLSModel *m)
+{
+    int cpu_flags = av_get_cpu_flags();
+    if (EXTERNAL_SSE2(cpu_flags)) {
+        m->update_lls = ff_update_lls_sse2;
+        if (m->indep_count >= 4)
+            m->evaluate_lls = ff_evaluate_lls_sse2;
+    }
+    if (EXTERNAL_AVX(cpu_flags)) {
+        m->update_lls = ff_update_lls_avx;
+    }
+}

libav-v9.6.tar.bz2/libavutil/x86/timer.h -> libav-v10.1.tar.bz2/libavutil/x86/timer.h Changed

libav-v9.6.tar.bz2/libavutil/x86/x86inc.asm -> libav-v10.1.tar.bz2/libavutil/x86/x86inc.asm Changed

@@ -1,12 +1,12 @@
 ;*****************************************************************************
 ;* x86inc.asm: x264asm abstraction layer
 ;*****************************************************************************
-;* Copyright (C) 2005-2012 x264 project
+;* Copyright (C) 2005-2013 x264 project
 ;*
 ;* Authors: Loren Merritt <lorenm@u.washington.edu>
 ;* Anton Mitrofanov <BugMaster@narod.ru>
 ;* Jason Garrett-Glaser <darkshikari@gmail.com>
-;* Henrik Gramner <hengar-6@student.ltu.se>
+;* Henrik Gramner <henrik@gramner.com>
 ;*
 ;* Permission to use, copy, modify, and/or distribute this software for any
 ;* purpose with or without fee is hereby granted, provided that the above
@@ -34,8 +34,12 @@
 ; as this feature might be useful for others as well. Send patches or ideas
 ; to x264-devel@videolan.org .
 
-%ifndef program_name
- %define program_name x264
+%ifndef private_prefix
+ %define private_prefix x264
+%endif
+
+%ifndef public_prefix
+ %define public_prefix private_prefix
 %endif
 
 %define WIN64 0
@@ -45,6 +49,8 @@
 %define WIN64 1
 %elifidn __OUTPUT_FORMAT__,win64
 %define WIN64 1
+ %elifidn __OUTPUT_FORMAT__,x64
+ %define WIN64 1
 %else
 %define UNIX64 1
 %endif
@@ -56,23 +62,17 @@
 %define mangle(x) x
 %endif
 
-; Name of the .rodata section.
-; Kludge: Something on OS X fails to align .rodata even given an align attribute,
-; so use a different read-only section.
+; aout does not support align=
+; NOTE: This section is out of sync with x264, in order to
+; keep supporting OS/2.
 %macro SECTION_RODATA 0-1 16
- %ifidn __OUTPUT_FORMAT__,macho64
- SECTION .text align=%1
- %elifidn __OUTPUT_FORMAT__,macho
- SECTION .text align=%1
- fakegot:
- %elifidn __OUTPUT_FORMAT__,aout
+ %ifidn __OUTPUT_FORMAT__,aout
 section .text
 %else
 SECTION .rodata align=%1
 %endif
 %endmacro
 
-; aout does not support align=
 %macro SECTION_TEXT 0-1 16
 %ifidn __OUTPUT_FORMAT__,aout
 SECTION .text
@@ -131,8 +131,7 @@
 ; Pops anything that was pushed by PROLOGUE, and returns.
 
 ; REP_RET:
-; Same, but if it doesn't pop anything it becomes a 2-byte ret, for athlons
-; which are slow when a normal ret follows a branch.
+; Use this instead of RET if it's a branch target.
 
 ; registers:
 ; rN and rNq are the native-size register holding function argument N
@@ -331,14 +330,18 @@
 %if stack_size < 0
 %assign stack_size -stack_size
 %endif
- %if mmsize != 8
- %assign xmm_regs_used %2
+ %assign stack_size_padded stack_size
+ %if WIN64
+ %assign stack_size_padded stack_size_padded + 32 ; reserve 32 bytes for shadow space
+ %if mmsize != 8
+ %assign xmm_regs_used %2
+ %if xmm_regs_used > 8
+ %assign stack_size_padded stack_size_padded + (xmm_regs_used-8)*16
+ %endif
+ %endif
 %endif
 %if mmsize <= 16 && HAVE_ALIGNED_STACK
- %assign stack_size_padded stack_size + %%stack_alignment - gprsize - (stack_offset & (%%stack_alignment - 1))
- %if xmm_regs_used > 6
- %assign stack_size_padded stack_size_padded + (xmm_regs_used - 6) * 16
- %endif
+ %assign stack_size_padded stack_size_padded + %%stack_alignment - gprsize - (stack_offset & (%%stack_alignment - 1))
 SUB rsp, stack_size_padded
 %else
 %assign %%reg_num (regs_used - 1)
@@ -348,14 +351,6 @@
 ; stack in a single instruction (i.e. mov rsp, rstk or mov
 ; rsp, [rsp+stack_size_padded])
 mov rstk, rsp
- %assign stack_size_padded stack_size
- %if xmm_regs_used > 6
- %assign stack_size_padded stack_size_padded + (xmm_regs_used - 6) * 16
- %if mmsize == 32 && xmm_regs_used & 1
- ; re-align to 32 bytes
- %assign stack_size_padded (stack_size_padded + 16)
- %endif
- %endif
 %if %1 < 0 ; need to store rsp on stack
 sub rsp, gprsize+stack_size_padded
 and rsp, ~(%%stack_alignment-1)
@@ -367,9 +362,7 @@
 %xdefine rstkm rstk
 %endif
 %endif
- %if xmm_regs_used > 6
- WIN64_PUSH_XMM
- %endif
+ WIN64_PUSH_XMM
 %endif
 %endif
 %endmacro
@@ -430,40 +423,55 @@
 %endmacro
 
 %macro WIN64_PUSH_XMM 0
- %assign %%i xmm_regs_used
- %rep (xmm_regs_used-6)
- %assign %%i %%i-1
- movdqa [rsp + (%%i-6)*16 + stack_size + (~stack_offset&8)], xmm %+ %%i
- %endrep
+ ; Use the shadow space to store XMM6 and XMM7, the rest needs stack space allocated.
+ %if xmm_regs_used > 6
+ movaps [rstk + stack_offset + 8], xmm6
+ %endif
+ %if xmm_regs_used > 7
+ movaps [rstk + stack_offset + 24], xmm7
+ %endif
+ %if xmm_regs_used > 8
+ %assign %%i 8
+ %rep xmm_regs_used-8
+ movaps [rsp + (%%i-8)*16 + stack_size + 32], xmm %+ %%i
+ %assign %%i %%i+1
+ %endrep
+ %endif
 %endmacro
 
 %macro WIN64_SPILL_XMM 1
 %assign xmm_regs_used %1
 ASSERT xmm_regs_used <= 16
- %if xmm_regs_used > 6
- SUB rsp, (xmm_regs_used-6)*16+16
- WIN64_PUSH_XMM
+ %if xmm_regs_used > 8
+ %assign stack_size_padded (xmm_regs_used-8)*16 + (~stack_offset&8) + 32
+ SUB rsp, stack_size_padded
 %endif
+ WIN64_PUSH_XMM
 %endmacro
 
 %macro WIN64_RESTORE_XMM_INTERNAL 1
- %if xmm_regs_used > 6
+ %assign %%pad_size 0
+ %if xmm_regs_used > 8
 %assign %%i xmm_regs_used
- %rep (xmm_regs_used-6)
+ %rep xmm_regs_used-8
 %assign %%i %%i-1
- movdqa xmm %+ %%i, [%1 + (%%i-6)*16+stack_size+(~stack_offset&8)]
+ movaps xmm %+ %%i, [%1 + (%%i-8)*16 + stack_size + 32]
 %endrep
- %if stack_size_padded == 0
- add %1, (xmm_regs_used-6)*16+16
- %endif
 %endif
 %if stack_size_padded > 0
 %if stack_size > 0 && (mmsize == 32 || HAVE_ALIGNED_STACK == 0)
 mov rsp, rstkm
 %else
 add %1, stack_size_padded
+ %assign %%pad_size stack_size_padded
 %endif
 %endif
+ %if xmm_regs_used > 7
+ movaps xmm7, [%1 + stack_offset - %%pad_size + 24]
+ %endif
+ %if xmm_regs_used > 6
+ movaps xmm6, [%1 + stack_offset - %%pad_size + 8]
+ %endif
 %endmacro
 
 %macro WIN64_RESTORE_XMM 1
@@ -480,7 +488,7 @@
 %if mmsize == 32
 vzeroupper
 %endif
- ret
+ AUTO_REP_RET
 %endmacro
 
 %elif ARCH_X86_64 ; *nix x64 ;=============================================
@@ -527,7 +535,7 @@
 %if mmsize == 32
 vzeroupper
 %endif
- ret
+ AUTO_REP_RET
 %endmacro
 
 %else ; X86_32 ;==============================================================
@@ -583,7 +591,7 @@
 %if mmsize == 32
 vzeroupper
 %endif
- ret
+ AUTO_REP_RET
 %endmacro
 
 %endif ;======================================================================
@@ -597,6 +605,10 @@
 %endmacro
 %endif
 
+; On AMD cpus <=K10, an ordinary ret is slow if it immediately follows either
+; a branch or a branch target. So switch to a 2-byte form of ret in that case.
+; We can automatically detect "follows a branch", but not a branch target.
+; (SSSE3 is a sufficient condition to know that your cpu doesn't have this problem.)
 %macro REP_RET 0
 %if has_epilogue
 RET
@@ -605,6 +617,29 @@
 %endif
 %endmacro
 
+%define last_branch_adr $$
+%macro AUTO_REP_RET 0
+ %ifndef cpuflags
+ times ((last_branch_adr-$)>>31)+1 rep ; times 1 iff $ != last_branch_adr.
+ %elif notcpuflag(ssse3)
+ times ((last_branch_adr-$)>>31)+1 rep
+ %endif
+ ret
+%endmacro
+
+%macro BRANCH_INSTR 0-*
+ %rep %0
+ %macro %1 1-2 %1
+ %2 %1
+ %%branch_instr:
+ %xdefine last_branch_adr %%branch_instr
+ %endmacro
+ %rotate 1
+ %endrep
+%endmacro
+
+BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae, jna, jnae, jb, jbe, jnb, jnbe, jc, jnc, js, jns, jo, jno, jp, jnp
+
 %macro TAIL_CALL 2 ; callee, is_nonadjacent
 %if has_epilogue
 call %1
@@ -624,38 +659,48 @@
 ; Applies any symbol mangling needed for C linkage, and sets up a define such that
 ; subsequent uses of the function name automatically refer to the mangled version.
 ; Appends cpuflags to the function name if cpuflags has been specified.
+; The "" empty default parameter is a workaround for nasm, which fails if SUFFIX
+; is empty and we call cglobal_internal with just %1 %+ SUFFIX (without %2).
 %macro cglobal 1-2+ "" ; name, [PROLOGUE args]
- ; the "" is a workaround for nasm, which fails if SUFFIX is empty
- ; and we call cglobal_internal with just %1 %+ SUFFIX (without %2)
- cglobal_internal %1 %+ SUFFIX, %2
-%endmacro
-%macro cglobal_internal 1-2+
- %ifndef cglobaled_%1
- %xdefine %1 mangle(program_name %+ _ %+ %1)
- %xdefine %1.skip_prologue %1 %+ .skip_prologue
- CAT_XDEFINE cglobaled_, %1, 1
+ cglobal_internal 1, %1 %+ SUFFIX, %2
+%endmacro
+%macro cvisible 1-2+ "" ; name, [PROLOGUE args]
+ cglobal_internal 0, %1 %+ SUFFIX, %2
+%endmacro
+%macro cglobal_internal 2-3+
+ %if %1
+ %xdefine %%FUNCTION_PREFIX private_prefix
+ %xdefine %%VISIBILITY hidden
+ %else
+ %xdefine %%FUNCTION_PREFIX public_prefix
+ %xdefine %%VISIBILITY
+ %endif
+ %ifndef cglobaled_%2
+ %xdefine %2 mangle(%%FUNCTION_PREFIX %+ _ %+ %2)
+ %xdefine %2.skip_prologue %2 %+ .skip_prologue
+ CAT_XDEFINE cglobaled_, %2, 1
 %endif
- %xdefine current_function %1
+ %xdefine current_function %2
 %ifidn __OUTPUT_FORMAT__,elf
- global %1:function hidden
+ global %2:function %%VISIBILITY
 %else
- global %1
+ global %2
 %endif
 align function_align
- %1:
- RESET_MM_PERMUTATION ; not really needed, but makes disassembly somewhat nicer
- %xdefine rstk rsp
- %assign stack_offset 0
- %assign stack_size 0
- %assign stack_size_padded 0
- %assign xmm_regs_used 0
- %ifnidn %2, ""
- PROLOGUE %2
+ %2:
+ RESET_MM_PERMUTATION ; needed for x86-64, also makes disassembly somewhat nicer
+ %xdefine rstk rsp ; copy of the original stack pointer, used when greater alignment than the known stack alignment is required
+ %assign stack_offset 0 ; stack pointer offset relative to the return address
+ %assign stack_size 0 ; amount of stack space that can be freely used inside a function
+ %assign stack_size_padded 0 ; total amount of allocated stack space, including space for callee-saved xmm registers on WIN64 and alignment padding
+ %assign xmm_regs_used 0 ; number of XMM registers requested, used for dealing with callee-saved registers on WIN64
+ %ifnidn %3, ""
+ PROLOGUE %3
 %endif
 %endmacro
 
 %macro cextern 1
- %xdefine %1 mangle(program_name %+ _ %+ %1)
+ %xdefine %1 mangle(private_prefix %+ _ %+ %1)
 CAT_XDEFINE cglobaled_, %1, 1
 extern %1
 %endmacro
@@ -667,9 +712,13 @@
 extern %1
 %endmacro
 
-%macro const 2+
- %xdefine %1 mangle(program_name %+ _ %+ %1)
- global %1
+%macro const 1-2+
+ %xdefine %1 mangle(private_prefix %+ _ %+ %1)
+ %ifidn __OUTPUT_FORMAT__,elf
+ global %1:data hidden
+ %else
+ global %1
+ %endif
 %1: %2
 %endmacro
 
@@ -702,12 +751,10 @@
 %assign cpuflags_cache64 (1<<17)
 %assign cpuflags_slowctz (1<<18)
 %assign cpuflags_lzcnt (1<<19)
-%assign cpuflags_misalign (1<<20)
-%assign cpuflags_aligned (1<<21) ; not a cpu feature, but a function variant
-%assign cpuflags_atom (1<<22)
-%assign cpuflags_bmi1 (1<<23)
-%assign cpuflags_bmi2 (1<<24)|cpuflags_bmi1
-%assign cpuflags_tbm (1<<25)|cpuflags_bmi1
+%assign cpuflags_aligned (1<<20) ; not a cpu feature, but a function variant
+%assign cpuflags_atom (1<<21)
+%assign cpuflags_bmi1 (1<<22)|cpuflags_lzcnt
+%assign cpuflags_bmi2 (1<<23)|cpuflags_bmi1
 
 %define cpuflag(x) ((cpuflags & (cpuflags_ %+ x)) == (cpuflags_ %+ x))
 %define notcpuflag(x) ((cpuflags & (cpuflags_ %+ x)) != (cpuflags_ %+ x))
@@ -728,7 +775,7 @@
 %if cpuflag(avx)
 %assign avx_enabled 1
 %endif
- %if mmsize == 16 && notcpuflag(sse2)
+ %if (mmsize == 16 && notcpuflag(sse2)) || (mmsize == 32 && notcpuflag(avx2))
 %define mova movaps
 %define movu movups
 %define movnta movntps
@@ -738,7 +785,7 @@
 %elifidn %1, sse3
 %define movu lddqu
 %endif
- %if notcpuflag(mmx2)
+ %if notcpuflag(sse2)
 CPUNOP basicnop
 %endif
 %else
@@ -748,7 +795,11 @@
 %endif
 %endmacro
 
-; merge mmx and sse*
+; Merge mmx and sse*
+; m# is a simd regsiter of the currently selected size
+; xm# is the corresponding xmmreg (if selcted xmm or ymm size), or mmreg (if selected mmx)
+; ym# is the corresponding ymmreg (if selcted xmm or ymm size), or mmreg (if selected mmx)
+; (All 3 remain in sync through SWAP.)
 
 %macro CAT_XDEFINE 3
 %xdefine %1%2 %3
@@ -810,10 +861,10 @@
 %if ARCH_X86_64
 %define num_mmregs 16
 %endif
- %define mova vmovaps
- %define movu vmovups
+ %define mova movdqa
+ %define movu movdqu
 %undef movh
- %define movnta vmovntps
+ %define movnta movntdq
 %assign %%i 0
 %rep num_mmregs
 CAT_XDEFINE m, %%i, ymm %+ %%i
@@ -825,6 +876,26 @@
 
 INIT_XMM
 
+%macro DECLARE_MMCAST 1
+ %define mmmm%1 mm%1
+ %define mmxmm%1 mm%1
+ %define mmymm%1 mm%1
+ %define xmmmm%1 mm%1
+ %define xmmxmm%1 xmm%1
+ %define xmmymm%1 xmm%1
+ %define ymmmm%1 mm%1
+ %define ymmxmm%1 ymm%1
+ %define ymmymm%1 ymm%1
+ %define xm%1 xmm %+ m%1
+ %define ym%1 ymm %+ m%1
+%endmacro
+
+%assign i 0
+%rep 16
+ DECLARE_MMCAST i
+%assign i i+1
+%endrep
+
 ; I often want to use macros that permute their arguments. e.g. there's no
 ; efficient way to implement butterfly or transpose or dct without swapping some
 ; arguments.
@@ -841,42 +912,42 @@
 
 %macro PERMUTE 2-* ; takes a list of pairs to swap
 %rep %0/2
- %xdefine tmp%2 m%2
- %xdefine ntmp%2 nm%2
+ %xdefine %%tmp%2 m%2
 %rotate 2
 %endrep
 %rep %0/2
- %xdefine m%1 tmp%2
- %xdefine nm%1 ntmp%2
- %undef tmp%2
- %undef ntmp%2
+ %xdefine m%1 %%tmp%2
+ CAT_XDEFINE n, m%1, %1
 %rotate 2
 %endrep
 %endmacro
 
-%macro SWAP 2-* ; swaps a single chain (sometimes more concise than pairs)
-%rep %0-1
-%ifdef m%1
- %xdefine tmp m%1
- %xdefine m%1 m%2
- %xdefine m%2 tmp
- CAT_XDEFINE n, m%1, %1
- CAT_XDEFINE n, m%2, %2
-%else
- ; If we were called as "SWAP m0,m1" rather than "SWAP 0,1" infer the original numbers here.
- ; Be careful using this mode in nested macros though, as in some cases there may be
- ; other copies of m# that have already been dereferenced and don't get updated correctly.
- %xdefine %%n1 n %+ %1
- %xdefine %%n2 n %+ %2
- %xdefine tmp m %+ %%n1
- CAT_XDEFINE m, %%n1, m %+ %%n2
- CAT_XDEFINE m, %%n2, tmp
- CAT_XDEFINE n, m %+ %%n1, %%n1
- CAT_XDEFINE n, m %+ %%n2, %%n2
+%macro SWAP 2+ ; swaps a single chain (sometimes more concise than pairs)
+%ifnum %1 ; SWAP 0, 1, ...
+ SWAP_INTERNAL_NUM %1, %2
+%else ; SWAP m0, m1, ...
+ SWAP_INTERNAL_NAME %1, %2
 %endif
- %undef tmp
+%endmacro
+
+%macro SWAP_INTERNAL_NUM 2-*
+ %rep %0-1
+ %xdefine %%tmp m%1
+ %xdefine m%1 m%2
+ %xdefine m%2 %%tmp
+ CAT_XDEFINE n, m%1, %1
+ CAT_XDEFINE n, m%2, %2
 %rotate 1
-%endrep
+ %endrep
+%endmacro
+
+%macro SWAP_INTERNAL_NAME 2-*
+ %xdefine %%args n %+ %1
+ %rep %0-1
+ %xdefine %%args %%args, n %+ %2
+ %rotate 1
+ %endrep
+ SWAP_INTERNAL_NUM %%args
 %endmacro
 
 ; If SAVE_MM_PERMUTATION is placed at the end of a function, then any later
@@ -974,122 +1045,148 @@
 
 ;%1 == instruction
 ;%2 == 1 if float, 0 if int
-;%3 == 1 if 4-operand (xmm, xmm, xmm, imm), 0 if 2- or 3-operand (xmm, xmm, xmm)
-;%4 == number of operands given
+;%3 == 1 if non-destructive or 4-operand (xmm, xmm, xmm, imm), 0 otherwise
+;%4 == 1 if commutative (i.e. doesn't matter which src arg is which), 0 if not
 ;%5+: operands
-%macro RUN_AVX_INSTR 6-7+
- %ifid %6
- %define %%sizeofreg sizeof%6
- %elifid %5
- %define %%sizeofreg sizeof%5
+%macro RUN_AVX_INSTR 5-8+
+ %ifnum sizeof%6
+ %assign __sizeofreg sizeof%6
+ %elifnum sizeof%5
+ %assign __sizeofreg sizeof%5
 %else
- %define %%sizeofreg mmsize
+ %assign __sizeofreg mmsize
 %endif
- %if %%sizeofreg==32
- %if %4>=3
- v%1 %5, %6, %7
- %else
- v%1 %5, %6
- %endif
+ %assign __emulate_avx 0
+ %if avx_enabled && __sizeofreg >= 16
+ %xdefine __instr v%1
 %else
- %if %%sizeofreg==8
- %define %%regmov movq
- %elif %2
- %define %%regmov movaps
- %else
- %define %%regmov movdqa
+ %xdefine __instr %1
+ %if %0 >= 7+%3
+ %assign __emulate_avx 1
 %endif
+ %endif
 
- %if %4>=3+%3
- %ifnidn %5, %6
- %if avx_enabled && %%sizeofreg==16
- v%1 %5, %6, %7
- %else
- CHECK_AVX_INSTR_EMU {%1 %5, %6, %7}, %5, %7
- %%regmov %5, %6
- %1 %5, %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
+ %else
+ CHECK_AVX_INSTR_EMU {%1 %5, %6, %7}, %5, %7
+ %endif
+ %if %4 && %3 == 0
+ %ifnid %7
+ ; 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
 %endif
+ %endif
+ %if __sizeofreg == 8
+ MOVQ %5, __src1
+ %elif %2
+ MOVAPS %5, __src1
 %else
- %1 %5, %7
+ MOVDQA %5, __src1
 %endif
- %elif %4>=3
- %1 %5, %6, %7
- %else
- %1 %5, %6
- %endif
- %endif
-%endmacro
-
-; 3arg AVX ops with a memory arg can only have it in src2,
-; whereas SSE emulation of 3arg prefers to have it in src1 (i.e. the mov).
-; So, if the op is symmetric and the wrong one is memory, swap them.
-%macro RUN_AVX_INSTR1 8
- %assign %%swap 0
- %if avx_enabled
- %ifnid %6
- %assign %%swap 1
 %endif
- %elifnidn %5, %6
- %ifnid %7
- %assign %%swap 1
+ %if %0 >= 8
+ %1 %5, __src2, %8
+ %else
+ %1 %5, __src2
 %endif
- %endif
- %if %%swap && %3 == 0 && %8 == 1
- RUN_AVX_INSTR %1, %2, %3, %4, %5, %7, %6
+ %elif %0 >= 8
+ __instr %5, %6, %7, %8
+ %elif %0 == 7
+ __instr %5, %6, %7
+ %elif %0 == 6
+ __instr %5, %6
 %else
- RUN_AVX_INSTR %1, %2, %3, %4, %5, %6, %7
+ __instr %5
 %endif
 %endmacro
 
 ;%1 == instruction
 ;%2 == 1 if float, 0 if int
-;%3 == 1 if 4-operand (xmm, xmm, xmm, imm), 0 if 2- or 3-operand (xmm, xmm, xmm)
-;%4 == 1 if symmetric (i.e. doesn't matter which src arg is which), 0 if not
-%macro AVX_INSTR 4
- %macro %1 2-9 fnord, fnord, fnord, %1, %2, %3, %4
- %ifidn %3, fnord
- RUN_AVX_INSTR %6, %7, %8, 2, %1, %2
+;%3 == 1 if non-destructive or 4-operand (xmm, xmm, xmm, imm), 0 otherwise
+;%4 == 1 if commutative (i.e. doesn't matter which src arg is which), 0 if not
+%macro AVX_INSTR 1-4 0, 1, 0
+ %macro %1 1-9 fnord, fnord, fnord, fnord, %1, %2, %3, %4
+ %ifidn %2, fnord
+ RUN_AVX_INSTR %6, %7, %8, %9, %1
+ %elifidn %3, fnord
+ RUN_AVX_INSTR %6, %7, %8, %9, %1, %2
 %elifidn %4, fnord
- RUN_AVX_INSTR1 %6, %7, %8, 3, %1, %2, %3, %9
+ RUN_AVX_INSTR %6, %7, %8, %9, %1, %2, %3
 %elifidn %5, fnord
- RUN_AVX_INSTR %6, %7, %8, 4, %1, %2, %3, %4
+ RUN_AVX_INSTR %6, %7, %8, %9, %1, %2, %3, %4
 %else
- RUN_AVX_INSTR %6, %7, %8, 5, %1, %2, %3, %4, %5
+ RUN_AVX_INSTR %6, %7, %8, %9, %1, %2, %3, %4, %5
 %endif
 %endmacro
 %endmacro
 
+; Instructions with both VEX and non-VEX encodings
+; Non-destructive instructions are written without parameters
 AVX_INSTR addpd, 1, 0, 1
 AVX_INSTR addps, 1, 0, 1
 AVX_INSTR addsd, 1, 0, 1
 AVX_INSTR addss, 1, 0, 1
 AVX_INSTR addsubpd, 1, 0, 0
 AVX_INSTR addsubps, 1, 0, 0
-AVX_INSTR andpd, 1, 0, 1
-AVX_INSTR andps, 1, 0, 1
+AVX_INSTR aesdec, 0, 0, 0
+AVX_INSTR aesdeclast, 0, 0, 0
+AVX_INSTR aesenc, 0, 0, 0
+AVX_INSTR aesenclast, 0, 0, 0
+AVX_INSTR aesimc
+AVX_INSTR aeskeygenassist
 AVX_INSTR andnpd, 1, 0, 0
 AVX_INSTR andnps, 1, 0, 0
+AVX_INSTR andpd, 1, 0, 1
+AVX_INSTR andps, 1, 0, 1
 AVX_INSTR blendpd, 1, 0, 0
 AVX_INSTR blendps, 1, 0, 0
 AVX_INSTR blendvpd, 1, 0, 0
 AVX_INSTR blendvps, 1, 0, 0
-AVX_INSTR cmppd, 1, 0, 0
-AVX_INSTR cmpps, 1, 0, 0
-AVX_INSTR cmpsd, 1, 0, 0
-AVX_INSTR cmpss, 1, 0, 0
-AVX_INSTR cvtdq2ps, 1, 0, 0
-AVX_INSTR cvtpd2dq, 1, 0, 0
-AVX_INSTR cvtps2dq, 1, 0, 0
+AVX_INSTR cmppd, 1, 1, 0
+AVX_INSTR cmpps, 1, 1, 0
+AVX_INSTR cmpsd, 1, 1, 0
+AVX_INSTR cmpss, 1, 1, 0
+AVX_INSTR comisd
+AVX_INSTR comiss
+AVX_INSTR cvtdq2pd
+AVX_INSTR cvtdq2ps
+AVX_INSTR cvtpd2dq
+AVX_INSTR cvtpd2ps
+AVX_INSTR cvtps2dq
+AVX_INSTR cvtps2pd
+AVX_INSTR cvtsd2si
+AVX_INSTR cvtsd2ss
+AVX_INSTR cvtsi2sd
+AVX_INSTR cvtsi2ss
+AVX_INSTR cvtss2sd
+AVX_INSTR cvtss2si
+AVX_INSTR cvttpd2dq
+AVX_INSTR cvttps2dq
+AVX_INSTR cvttsd2si
+AVX_INSTR cvttss2si
 AVX_INSTR divpd, 1, 0, 0
 AVX_INSTR divps, 1, 0, 0
 AVX_INSTR divsd, 1, 0, 0
 AVX_INSTR divss, 1, 0, 0
 AVX_INSTR dppd, 1, 1, 0
 AVX_INSTR dpps, 1, 1, 0
+AVX_INSTR extractps
 AVX_INSTR haddpd, 1, 0, 0
 AVX_INSTR haddps, 1, 0, 0
 AVX_INSTR hsubpd, 1, 0, 0
 AVX_INSTR hsubps, 1, 0, 0
+AVX_INSTR insertps, 1, 1, 0
+AVX_INSTR lddqu
+AVX_INSTR ldmxcsr
+AVX_INSTR maskmovdqu
 AVX_INSTR maxpd, 1, 0, 1
 AVX_INSTR maxps, 1, 0, 1
 AVX_INSTR maxsd, 1, 0, 1
@@ -1098,10 +1195,31 @@
 AVX_INSTR minps, 1, 0, 1
 AVX_INSTR minsd, 1, 0, 1
 AVX_INSTR minss, 1, 0, 1
+AVX_INSTR movapd
+AVX_INSTR movaps
+AVX_INSTR movd
+AVX_INSTR movddup
+AVX_INSTR movdqa
+AVX_INSTR movdqu
 AVX_INSTR movhlps, 1, 0, 0
+AVX_INSTR movhpd, 1, 0, 0
+AVX_INSTR movhps, 1, 0, 0
 AVX_INSTR movlhps, 1, 0, 0
+AVX_INSTR movlpd, 1, 0, 0
+AVX_INSTR movlps, 1, 0, 0
+AVX_INSTR movmskpd
+AVX_INSTR movmskps
+AVX_INSTR movntdq
+AVX_INSTR movntdqa
+AVX_INSTR movntpd
+AVX_INSTR movntps
+AVX_INSTR movq
 AVX_INSTR movsd, 1, 0, 0
+AVX_INSTR movshdup
+AVX_INSTR movsldup
 AVX_INSTR movss, 1, 0, 0
+AVX_INSTR movupd
+AVX_INSTR movups
 AVX_INSTR mpsadbw, 0, 1, 0
 AVX_INSTR mulpd, 1, 0, 1
 AVX_INSTR mulps, 1, 0, 1
@@ -1109,9 +1227,9 @@
 AVX_INSTR mulss, 1, 0, 1
 AVX_INSTR orpd, 1, 0, 1
 AVX_INSTR orps, 1, 0, 1
-AVX_INSTR pabsb, 0, 0, 0
-AVX_INSTR pabsw, 0, 0, 0
-AVX_INSTR pabsd, 0, 0, 0
+AVX_INSTR pabsb
+AVX_INSTR pabsd
+AVX_INSTR pabsw
 AVX_INSTR packsswb, 0, 0, 0
 AVX_INSTR packssdw, 0, 0, 0
 AVX_INSTR packuswb, 0, 0, 0
@@ -1131,10 +1249,11 @@
 AVX_INSTR pavgw, 0, 0, 1
 AVX_INSTR pblendvb, 0, 0, 0
 AVX_INSTR pblendw, 0, 1, 0
-AVX_INSTR pcmpestri, 0, 0, 0
-AVX_INSTR pcmpestrm, 0, 0, 0
-AVX_INSTR pcmpistri, 0, 0, 0
-AVX_INSTR pcmpistrm, 0, 0, 0
+AVX_INSTR pclmulqdq, 0, 1, 0
+AVX_INSTR pcmpestri
+AVX_INSTR pcmpestrm
+AVX_INSTR pcmpistri
+AVX_INSTR pcmpistrm
 AVX_INSTR pcmpeqb, 0, 0, 1
 AVX_INSTR pcmpeqw, 0, 0, 1
 AVX_INSTR pcmpeqd, 0, 0, 1
@@ -1143,12 +1262,21 @@
 AVX_INSTR pcmpgtw, 0, 0, 0
 AVX_INSTR pcmpgtd, 0, 0, 0
 AVX_INSTR pcmpgtq, 0, 0, 0
+AVX_INSTR pextrb
+AVX_INSTR pextrd
+AVX_INSTR pextrq
+AVX_INSTR pextrw
 AVX_INSTR phaddw, 0, 0, 0
 AVX_INSTR phaddd, 0, 0, 0
 AVX_INSTR phaddsw, 0, 0, 0
+AVX_INSTR phminposuw
 AVX_INSTR phsubw, 0, 0, 0
 AVX_INSTR phsubd, 0, 0, 0
 AVX_INSTR phsubsw, 0, 0, 0
+AVX_INSTR pinsrb, 0, 1, 0
+AVX_INSTR pinsrd, 0, 1, 0
+AVX_INSTR pinsrq, 0, 1, 0
+AVX_INSTR pinsrw, 0, 1, 0
 AVX_INSTR pmaddwd, 0, 0, 1
 AVX_INSTR pmaddubsw, 0, 0, 0
 AVX_INSTR pmaxsb, 0, 0, 1
@@ -1163,20 +1291,32 @@
 AVX_INSTR pminub, 0, 0, 1
 AVX_INSTR pminuw, 0, 0, 1
 AVX_INSTR pminud, 0, 0, 1
-AVX_INSTR pmovmskb, 0, 0, 0
-AVX_INSTR pmulhuw, 0, 0, 1
+AVX_INSTR pmovmskb
+AVX_INSTR pmovsxbw
+AVX_INSTR pmovsxbd
+AVX_INSTR pmovsxbq
+AVX_INSTR pmovsxwd
+AVX_INSTR pmovsxwq
+AVX_INSTR pmovsxdq
+AVX_INSTR pmovzxbw
+AVX_INSTR pmovzxbd
+AVX_INSTR pmovzxbq
+AVX_INSTR pmovzxwd
+AVX_INSTR pmovzxwq
+AVX_INSTR pmovzxdq
+AVX_INSTR pmuldq, 0, 0, 1
 AVX_INSTR pmulhrsw, 0, 0, 1
+AVX_INSTR pmulhuw, 0, 0, 1
 AVX_INSTR pmulhw, 0, 0, 1
 AVX_INSTR pmullw, 0, 0, 1
 AVX_INSTR pmulld, 0, 0, 1
 AVX_INSTR pmuludq, 0, 0, 1
-AVX_INSTR pmuldq, 0, 0, 1
 AVX_INSTR por, 0, 0, 1
 AVX_INSTR psadbw, 0, 0, 1
 AVX_INSTR pshufb, 0, 0, 0
-AVX_INSTR pshufd, 0, 1, 0
-AVX_INSTR pshufhw, 0, 1, 0
-AVX_INSTR pshuflw, 0, 1, 0
+AVX_INSTR pshufd
+AVX_INSTR pshufhw
+AVX_INSTR pshuflw
 AVX_INSTR psignb, 0, 0, 0
 AVX_INSTR psignw, 0, 0, 0
 AVX_INSTR psignd, 0, 0, 0
@@ -1198,7 +1338,7 @@
 AVX_INSTR psubsw, 0, 0, 0
 AVX_INSTR psubusb, 0, 0, 0
 AVX_INSTR psubusw, 0, 0, 0
-AVX_INSTR ptest, 0, 0, 0
+AVX_INSTR ptest
 AVX_INSTR punpckhbw, 0, 0, 0
 AVX_INSTR punpckhwd, 0, 0, 0
 AVX_INSTR punpckhdq, 0, 0, 0
@@ -1208,11 +1348,27 @@
 AVX_INSTR punpckldq, 0, 0, 0
 AVX_INSTR punpcklqdq, 0, 0, 0
 AVX_INSTR pxor, 0, 0, 1
+AVX_INSTR rcpps, 1, 0, 0
+AVX_INSTR rcpss, 1, 0, 0
+AVX_INSTR roundpd
+AVX_INSTR roundps
+AVX_INSTR roundsd
+AVX_INSTR roundss
+AVX_INSTR rsqrtps, 1, 0, 0
+AVX_INSTR rsqrtss, 1, 0, 0
+AVX_INSTR shufpd, 1, 1, 0
 AVX_INSTR shufps, 1, 1, 0
+AVX_INSTR sqrtpd, 1, 0, 0
+AVX_INSTR sqrtps, 1, 0, 0
+AVX_INSTR sqrtsd, 1, 0, 0
+AVX_INSTR sqrtss, 1, 0, 0
+AVX_INSTR stmxcsr
 AVX_INSTR subpd, 1, 0, 0
 AVX_INSTR subps, 1, 0, 0
 AVX_INSTR subsd, 1, 0, 0
 AVX_INSTR subss, 1, 0, 0
+AVX_INSTR ucomisd
+AVX_INSTR ucomiss
 AVX_INSTR unpckhpd, 1, 0, 0
 AVX_INSTR unpckhps, 1, 0, 0
 AVX_INSTR unpcklpd, 1, 0, 0
@@ -1244,22 +1400,16 @@
 %undef j
 
 %macro FMA_INSTR 3
- %macro %1 5-8 %1, %2, %3
- %if cpuflag(xop) || cpuflag(fma4)
- v%6 %1, %2, %3, %4
+ %macro %1 4-7 %1, %2, %3
+ %if cpuflag(xop)
+ v%5 %1, %2, %3, %4
 %else
- %ifidn %1, %4
- %7 %5, %2, %3
- %8 %1, %4, %5
- %else
- %7 %1, %2, %3
- %8 %1, %4
- %endif
+ %6 %1, %2, %3
+ %7 %1, %4
 %endif
 %endmacro
 %endmacro
 
-FMA_INSTR fmaddps, mulps, addps
 FMA_INSTR pmacsdd, pmulld, paddd
 FMA_INSTR pmacsww, pmullw, paddw
 FMA_INSTR pmadcswd, pmaddwd, paddd
@@ -1267,3 +1417,56 @@
 ; 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
+
+; convert FMA4 to FMA3 if possible
+%macro FMA4_INSTR 4
+ %macro %1 4-8 %1, %2, %3, %4
+ %if cpuflag(fma4)
+ v%5 %1, %2, %3, %4
+ %elifidn %1, %2
+ v%6 %1, %4, %3 ; %1 = %1 * %3 + %4
+ %elifidn %1, %3
+ v%7 %1, %2, %4 ; %1 = %2 * %1 + %4
+ %elifidn %1, %4
+ v%8 %1, %2, %3 ; %1 = %2 * %3 + %1
+ %else
+ %error fma3 emulation of ``%5 %1, %2, %3, %4'' is not supported
+ %endif
+ %endmacro
+%endmacro
+
+FMA4_INSTR fmaddpd, fmadd132pd, fmadd213pd, fmadd231pd
+FMA4_INSTR fmaddps, fmadd132ps, fmadd213ps, fmadd231ps
+FMA4_INSTR fmaddsd, fmadd132sd, fmadd213sd, fmadd231sd
+FMA4_INSTR fmaddss, fmadd132ss, fmadd213ss, fmadd231ss
+
+FMA4_INSTR fmaddsubpd, fmaddsub132pd, fmaddsub213pd, fmaddsub231pd
+FMA4_INSTR fmaddsubps, fmaddsub132ps, fmaddsub213ps, fmaddsub231ps
+FMA4_INSTR fmsubaddpd, fmsubadd132pd, fmsubadd213pd, fmsubadd231pd
+FMA4_INSTR fmsubaddps, fmsubadd132ps, fmsubadd213ps, fmsubadd231ps
+
+FMA4_INSTR fmsubpd, fmsub132pd, fmsub213pd, fmsub231pd
+FMA4_INSTR fmsubps, fmsub132ps, fmsub213ps, fmsub231ps
+FMA4_INSTR fmsubsd, fmsub132sd, fmsub213sd, fmsub231sd
+FMA4_INSTR fmsubss, fmsub132ss, fmsub213ss, fmsub231ss
+
+FMA4_INSTR fnmaddpd, fnmadd132pd, fnmadd213pd, fnmadd231pd
+FMA4_INSTR fnmaddps, fnmadd132ps, fnmadd213ps, fnmadd231ps
+FMA4_INSTR fnmaddsd, fnmadd132sd, fnmadd213sd, fnmadd231sd
+FMA4_INSTR fnmaddss, fnmadd132ss, fnmadd213ss, fnmadd231ss
+
+FMA4_INSTR fnmsubpd, fnmsub132pd, fnmsub213pd, fnmsub231pd
+FMA4_INSTR fnmsubps, fnmsub132ps, fnmsub213ps, fnmsub231ps
+FMA4_INSTR fnmsubsd, fnmsub132sd, fnmsub213sd, fnmsub231sd
+FMA4_INSTR fnmsubss, fnmsub132ss, fnmsub213ss, fnmsub231ss
+
+; workaround: vpbroadcastq is broken in x86_32 due to a yasm bug
+%if ARCH_X86_64 == 0
+%macro vpbroadcastq 2
+%if sizeof%1 == 16
+ movddup %1, %2
+%else
+ vbroadcastsd %1, %2
+%endif
+%endmacro
+%endif

libav-v9.6.tar.bz2/libavutil/x86/x86util.asm -> libav-v10.1.tar.bz2/libavutil/x86/x86util.asm Changed

@@ -23,7 +23,8 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%define program_name ff
+%define private_prefix ff
+%define public_prefix  avpriv
 %define cpuflags_mmxext cpuflags_mmx2
 
 %include "libavutil/x86/x86inc.asm"
@@ -172,14 +173,33 @@
     psignw     %1, %2
 %endmacro
 
-%macro ABS1_MMX 2    ; a, tmp
+%macro ABS1 2
+%if cpuflag(ssse3)
+    pabsw   %1, %1
+%elif cpuflag(mmxext) ; a, tmp
+    pxor    %2, %2
+    psubw   %2, %1
+    pmaxsw  %1, %2
+%else ; a, tmp
     pxor       %2, %2
     pcmpgtw    %2, %1
     pxor       %1, %2
     psubw      %1, %2
+%endif
 %endmacro
 
-%macro ABS2_MMX 4    ; a, b, tmp0, tmp1
+%macro ABS2 4
+%if cpuflag(ssse3)
+    pabsw   %1, %1
+    pabsw   %2, %2
+%elif cpuflag(mmxext) ; a, b, tmp0, tmp1
+    pxor    %3, %3
+    pxor    %4, %4
+    psubw   %3, %1
+    psubw   %4, %2
+    pmaxsw  %1, %3
+    pmaxsw  %2, %4
+%else ; a, b, tmp0, tmp1
     pxor       %3, %3
     pxor       %4, %4
     pcmpgtw    %3, %1
@@ -188,45 +208,31 @@
     pxor       %2, %4
     psubw      %1, %3
     psubw      %2, %4
+%endif
 %endmacro
 
-%macro ABS1_MMXEXT 2 ; a, tmp
-    pxor    %2, %2
-    psubw   %2, %1
-    pmaxsw  %1, %2
-%endmacro
-
-%macro ABS2_MMXEXT 4 ; a, b, tmp0, tmp1
-    pxor    %3, %3
-    pxor    %4, %4
-    psubw   %3, %1
-    psubw   %4, %2
-    pmaxsw  %1, %3
-    pmaxsw  %2, %4
-%endmacro
-
-%macro ABS1_SSSE3 2
-    pabsw   %1, %1
-%endmacro
-
-%macro ABS2_SSSE3 4
-    pabsw   %1, %1
-    pabsw   %2, %2
-%endmacro
-
-%macro ABSB_MMX 2
+%macro ABSB 2 ; source mmreg, temp mmreg (unused for ssse3)
+%if cpuflag(ssse3)
+    pabsb   %1, %1
+%else
     pxor    %2, %2
     psubb   %2, %1
     pminub  %1, %2
+%endif
 %endmacro
 
-%macro ABSB2_MMX 4
+%macro ABSB2 4 ; src1, src2, tmp1, tmp2 (tmp1/2 unused for SSSE3)
+%if cpuflag(ssse3)
+    pabsb   %1, %1
+    pabsb   %2, %2
+%else
     pxor    %3, %3
     pxor    %4, %4
     psubb   %3, %1
     psubb   %4, %2
     pminub  %1, %3
     pminub  %2, %4
+%endif
 %endmacro
 
 %macro ABSD2_MMX 4
@@ -240,25 +246,11 @@
     psubd   %2, %4
 %endmacro
 
-%macro ABSB_SSSE3 2
-    pabsb   %1, %1
-%endmacro
-
-%macro ABSB2_SSSE3 4
-    pabsb   %1, %1
-    pabsb   %2, %2
-%endmacro
-
 %macro ABS4 6
     ABS2 %1, %2, %5, %6
     ABS2 %3, %4, %5, %6
 %endmacro
 
-%define ABS1 ABS1_MMX
-%define ABS2 ABS2_MMX
-%define ABSB ABSB_MMX
-%define ABSB2 ABSB2_MMX
-
 %macro SPLATB_LOAD 3
 %if cpuflag(ssse3)
     movd      %1, [%2-3]
@@ -310,6 +302,14 @@
 %endif
 %endmacro
 
+%macro PAVGB 2
+%if cpuflag(mmxext)
+    pavgb   %1, %2
+%elif cpuflag(3dnow)
+    pavgusb %1, %2
+%endif
+%endmacro
+
 %macro PSHUFLW 1+
     %if mmsize == 8
         pshufw %1
@@ -665,3 +665,16 @@
     psrad        %1, 16
 %endif
 %endmacro
+
+; Wrapper for non-FMA version of fmaddps
+%macro FMULADD_PS 5
+    %if cpuflag(fma3) || cpuflag(fma4)
+        fmaddps %1, %2, %3, %4
+    %elifidn %1, %4
+        mulps   %5, %2, %3
+        addps   %1, %4, %5
+    %else
+        mulps   %1, %2, %3
+        addps   %1, %4
+    %endif
+%endmacro

libav-v9.6.tar.bz2/libavutil/xtea.c -> libav-v10.1.tar.bz2/libavutil/xtea.c Changed

libav-v9.6.tar.bz2/library.mak -> libav-v10.1.tar.bz2/library.mak Changed

@@ -1,9 +1,8 @@
-SRC_DIR := $(SRC_PATH)/lib$(NAME)
-
 include $(SRC_PATH)/common.mak
 
 LIBVERSION := $(lib$(NAME)_VERSION)
 LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR)
+LIBMINOR := $(lib$(NAME)_VERSION_MINOR)
 INCINSTDIR := $(INCDIR)/lib$(NAME)
 
 INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%)
@@ -26,6 +25,7 @@
 $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
 	$(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
 	$(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
+	-$(STRIP) $(STRIPFLAGS) $@
 
 LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS)
 $(LIBOBJS) $(LIBOBJS:.o=.i): CPPFLAGS += -DHAVE_AV_CONFIG_H
@@ -42,10 +42,10 @@
 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)
@@ -57,7 +57,7 @@
 	$(SLIB_EXTRA_CMD)
 
 clean::
-	$(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
+	$(RM) $(addprefix $(SUBDIR),*-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
 	 $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%)
 
 distclean:: clean
@@ -100,8 +100,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)

libav-v9.6.tar.bz2/libswscale/bfin/swscale_bfin.c -> libav-v10.1.tar.bz2/libswscale/bfin/swscale_bfin.c Changed

libav-v9.6.tar.bz2/libswscale/bfin/yuv2rgb_bfin.c -> libav-v10.1.tar.bz2/libswscale/bfin/yuv2rgb_bfin.c Changed

libav-v9.6.tar.bz2/libswscale/options.c -> libav-v10.1.tar.bz2/libswscale/options.c Changed

libav-v9.6.tar.bz2/libswscale/output.c -> libav-v10.1.tar.bz2/libswscale/output.c Changed

@@ -46,14 +46,14 @@
 { 0, 4, 0, 4, 0, 4, 0, 4, },
 };
 
-DECLARE_ALIGNED(8, const uint8_t, dither_4x4_16)[4][8]={
+DECLARE_ALIGNED(8, const uint8_t, ff_dither_4x4_16)[4][8] = {
 { 8, 4, 11, 7, 8, 4, 11, 7, },
 { 2, 14, 1, 13, 2, 14, 1, 13, },
 { 10, 6, 9, 5, 10, 6, 9, 5, },
 { 0, 12, 3, 15, 0, 12, 3, 15, },
 };
 
-DECLARE_ALIGNED(8, const uint8_t, dither_8x8_32)[8][8]={
+DECLARE_ALIGNED(8, const uint8_t, ff_dither_8x8_32)[8][8] = {
 { 17, 9, 23, 15, 16, 8, 22, 14, },
 { 5, 29, 3, 27, 4, 28, 2, 26, },
 { 21, 13, 19, 11, 20, 12, 18, 10, },
@@ -64,7 +64,7 @@
 { 1, 25, 7, 31, 0, 24, 6, 30, },
 };
 
-DECLARE_ALIGNED(8, const uint8_t, dither_8x8_73)[8][8]={
+DECLARE_ALIGNED(8, const uint8_t, ff_dither_8x8_73)[8][8] = {
 { 0, 55, 14, 68, 3, 58, 17, 72, },
 { 37, 18, 50, 32, 40, 22, 54, 35, },
 { 9, 64, 5, 59, 13, 67, 8, 63, },
@@ -76,7 +76,7 @@
 };
 
 #if 1
-DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220)[8][8]={
+DECLARE_ALIGNED(8, const uint8_t, ff_dither_8x8_220)[8][8] = {
 {117, 62, 158, 103, 113, 58, 155, 100, },
 { 34, 199, 21, 186, 31, 196, 17, 182, },
 {144, 89, 131, 76, 141, 86, 127, 72, },
@@ -88,7 +88,7 @@
 };
 #elif 1
 // tries to correct a gamma of 1.5
-DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220)[8][8]={
+DECLARE_ALIGNED(8, const uint8_t, ff_dither_8x8_220)[8][8] = {
 { 0, 143, 18, 200, 2, 156, 25, 215, },
 { 78, 28, 125, 64, 89, 36, 138, 74, },
 { 10, 180, 3, 161, 16, 195, 8, 175, },
@@ -100,7 +100,7 @@
 };
 #elif 1
 // tries to correct a gamma of 2.0
-DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220)[8][8]={
+DECLARE_ALIGNED(8, const uint8_t, ff_dither_8x8_220)[8][8] = {
 { 0, 124, 8, 193, 0, 140, 12, 213, },
 { 55, 14, 104, 42, 66, 19, 119, 52, },
 { 3, 168, 1, 145, 6, 187, 3, 162, },
@@ -112,7 +112,7 @@
 };
 #else
 // tries to correct a gamma of 2.5
-DECLARE_ALIGNED(8, const uint8_t, dither_8x8_220)[8][8]={
+DECLARE_ALIGNED(8, const uint8_t, ff_dither_8x8_220)[8][8] = {
 { 0, 107, 3, 187, 0, 125, 6, 212, },
 { 39, 7, 86, 28, 49, 11, 102, 36, },
 { 1, 158, 0, 131, 3, 180, 1, 151, },
@@ -314,7 +314,7 @@
 const int16_t **alpSrc, uint8_t *dest, int dstW,
 int y, enum AVPixelFormat target)
 {
- const uint8_t * const d128=dither_8x8_220[y&7];
+ const uint8_t * const d128 = ff_dither_8x8_220[y&7];
 int i;
 unsigned acc = 0;
 
@@ -353,7 +353,7 @@
 enum AVPixelFormat target)
 {
 const int16_t *buf0 = buf[0], *buf1 = buf[1];
- const uint8_t * const d128 = dither_8x8_220[y & 7];
+ const uint8_t * const d128 = ff_dither_8x8_220[y & 7];
 int yalpha1 = 4096 - yalpha;
 int i;
 
@@ -387,7 +387,7 @@
 const int16_t *abuf0, uint8_t *dest, int dstW,
 int uvalpha, int y, enum AVPixelFormat target)
 {
- const uint8_t * const d128 = dither_8x8_220[y & 7];
+ const uint8_t * const d128 = ff_dither_8x8_220[y & 7];
 int i;
 
 for (i = 0; i < dstW; i += 8) {
@@ -880,12 +880,12 @@
 dg2 = dither_2x2_8[ y & 1 ][0];
 db2 = dither_2x2_8[(y & 1) ^ 1][1];
 } else {
- dr1 = dither_4x4_16[ y & 3 ][0];
- dg1 = dither_4x4_16[ y & 3 ][1];
- db1 = dither_4x4_16[(y & 3) ^ 3][0];
- dr2 = dither_4x4_16[ y & 3 ][1];
- dg2 = dither_4x4_16[ y & 3 ][0];
- db2 = dither_4x4_16[(y & 3) ^ 3][1];
+ dr1 = ff_dither_4x4_16[ y & 3 ][0];
+ dg1 = ff_dither_4x4_16[ y & 3 ][1];
+ db1 = ff_dither_4x4_16[(y & 3) ^ 3][0];
+ dr2 = ff_dither_4x4_16[ y & 3 ][1];
+ dg2 = ff_dither_4x4_16[ y & 3 ][0];
+ db2 = ff_dither_4x4_16[(y & 3) ^ 3][1];
 }
 
 dest[i * 2 + 0] = r[Y1 + dr1] + g[Y1 + dg1] + b[Y1 + db1];
@@ -898,15 +898,15 @@
 int dr1, dg1, db1, dr2, dg2, db2;
 
 if (target == AV_PIX_FMT_RGB8 || target == AV_PIX_FMT_BGR8) {
- const uint8_t * const d64 = dither_8x8_73[y & 7];
- const uint8_t * const d32 = dither_8x8_32[y & 7];
+ const uint8_t * const d64 = ff_dither_8x8_73[y & 7];
+ const uint8_t * const d32 = ff_dither_8x8_32[y & 7];
 dr1 = dg1 = d32[(i * 2 + 0) & 7];
 db1 = d64[(i * 2 + 0) & 7];
 dr2 = dg2 = d32[(i * 2 + 1) & 7];
 db2 = d64[(i * 2 + 1) & 7];
 } else {
- const uint8_t * const d64 = dither_8x8_73 [y & 7];
- const uint8_t * const d128 = dither_8x8_220[y & 7];
+ const uint8_t * const d64 = ff_dither_8x8_73 [y & 7];
+ const uint8_t * const d128 = ff_dither_8x8_220[y & 7];
 dr1 = db1 = d128[(i * 2 + 0) & 7];
 dg1 = d64[(i * 2 + 0) & 7];
 dr2 = db2 = d128[(i * 2 + 1) & 7];
@@ -1261,13 +1261,91 @@
 YUV2RGBWRAPPERX(yuv2, rgb_full, bgr24_full, AV_PIX_FMT_BGR24, 0)
 YUV2RGBWRAPPERX(yuv2, rgb_full, rgb24_full, AV_PIX_FMT_RGB24, 0)
 
+static void
+yuv2gbrp_full_X_c(SwsContext *c, const int16_t *lumFilter,
+ const int16_t **lumSrc, int lumFilterSize,
+ const int16_t *chrFilter, const int16_t **chrUSrc,
+ const int16_t **chrVSrc, int chrFilterSize,
+ const int16_t **alpSrc, uint8_t **dest,
+ int dstW, int y)
+{
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->dstFormat);
+ int i;
+ int hasAlpha = 0;
+ uint16_t **dest16 = (uint16_t**)dest;
+ int SH = 22 + 7 - desc->comp[0].depth_minus1;
+
+ for (i = 0; i < dstW; i++) {
+ int j;
+ int Y = 1 << 9;
+ int U = (1 << 9) - (128 << 19);
+ int V = (1 << 9) - (128 << 19);
+ int R, G, B, A;
+
+ for (j = 0; j < lumFilterSize; j++)
+ Y += lumSrc[j][i] * lumFilter[j];
+
+ for (j = 0; j < chrFilterSize; j++) {
+ U += chrUSrc[j][i] * chrFilter[j];
+ V += chrVSrc[j][i] * chrFilter[j];
+ }
+
+ Y >>= 10;
+ U >>= 10;
+ V >>= 10;
+
+ if (hasAlpha) {
+ A = 1 << 18;
+
+ for (j = 0; j < lumFilterSize; j++)
+ A += alpSrc[j][i] * lumFilter[j];
+
+ A >>= 19;
+
+ if (A & 0x100)
+ A = av_clip_uint8(A);
+ }
+
+ Y -= c->yuv2rgb_y_offset;
+ Y *= c->yuv2rgb_y_coeff;
+ Y += 1 << 21;
+ R = Y + V * c->yuv2rgb_v2r_coeff;
+ G = Y + V * c->yuv2rgb_v2g_coeff + U * c->yuv2rgb_u2g_coeff;
+ B = Y + U * c->yuv2rgb_u2b_coeff;
+
+ if ((R | G | B) & 0xC0000000) {
+ R = av_clip_uintp2(R, 30);
+ G = av_clip_uintp2(G, 30);
+ B = av_clip_uintp2(B, 30);
+ }
+
+ if (SH != 22) {
+ dest16[0][i] = G >> SH;
+ dest16[1][i] = B >> SH;
+ dest16[2][i] = R >> SH;
+ } else {
+ dest[0][i] = G >> 22;
+ dest[1][i] = B >> 22;
+ dest[2][i] = R >> 22;
+ }
+ }
+ if (SH != 22 && (!isBE(c->dstFormat)) != (!HAVE_BIGENDIAN)) {
+ for (i = 0; i < dstW; i++) {
+ dest16[0][i] = av_bswap16(dest16[0][i]);
+ dest16[1][i] = av_bswap16(dest16[1][i]);
+ dest16[2][i] = av_bswap16(dest16[2][i]);
+ }
+ }
+}
+
 av_cold void ff_sws_init_output_funcs(SwsContext *c,
 yuv2planar1_fn *yuv2plane1,
 yuv2planarX_fn *yuv2planeX,
 yuv2interleavedX_fn *yuv2nv12cX,
 yuv2packed1_fn *yuv2packed1,
 yuv2packed2_fn *yuv2packed2,
- yuv2packedX_fn *yuv2packedX)
+ yuv2packedX_fn *yuv2packedX,
+ yuv2anyX_fn *yuv2anyX)
 {
 enum AVPixelFormat dstFormat = c->dstFormat;
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(dstFormat);
@@ -1354,6 +1432,15 @@
 case AV_PIX_FMT_BGR24:
 *yuv2packedX = yuv2bgr24_full_X_c;
 break;
+ case AV_PIX_FMT_GBRP:
+ case AV_PIX_FMT_GBRP9BE:
+ case AV_PIX_FMT_GBRP9LE:
+ case AV_PIX_FMT_GBRP10BE:
+ case AV_PIX_FMT_GBRP10LE:
+ case AV_PIX_FMT_GBRP16BE:
+ case AV_PIX_FMT_GBRP16LE:
+ *yuv2anyX = yuv2gbrp_full_X_c;
+ break;
 }
 } else {
 switch (dstFormat) {

libav-v9.6.tar.bz2/libswscale/ppc/Makefile -> libav-v10.1.tar.bz2/libswscale/ppc/Makefile Changed

libav-v9.6.tar.bz2/libswscale/ppc/swscale_altivec.c -> libav-v10.1.tar.bz2/libswscale/ppc/swscale_altivec.c Changed

libav-v9.6.tar.bz2/libswscale/ppc/yuv2rgb_altivec.c -> libav-v10.1.tar.bz2/libswscale/ppc/yuv2rgb_altivec.c Changed

@@ -99,6 +99,8 @@
 #include "libavutil/cpu.h"
 #include "yuv2rgb_altivec.h"
 
+#if HAVE_ALTIVEC
+
 #undef PROFILE_THE_BEAST
 #undef INC_SCALING
 
@@ -245,8 +247,6 @@
                   (vector unsigned short)                               \
                       vec_max(y, ((vector signed short) { 0 })))
 
-//#define out_pixels(a, b, c, ptr) vec_mstrgb32(__typeof__(a), ((__typeof__(a)) { 255 }), a, a, a, ptr)
-
 static inline void cvtyuvtoRGB(SwsContext *c, vector signed short Y,
                                vector signed short U, vector signed short V,
                                vector signed short *R, vector signed short *G,
@@ -530,14 +530,17 @@
     return srcSliceH;
 }
 
+#endif /* HAVE_ALTIVEC */
+
 /* Ok currently the acceleration routine only supports
  * inputs of widths a multiple of 16
  * and heights a multiple 2
  *
  * So we just fall back to the C codes for this.
  */
-av_cold SwsFunc ff_yuv2rgb_init_altivec(SwsContext *c)
+av_cold SwsFunc ff_yuv2rgb_init_ppc(SwsContext *c)
 {
+#if HAVE_ALTIVEC
     if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
         return NULL;
 
@@ -593,20 +596,26 @@
         }
         break;
     }
+#endif /* HAVE_ALTIVEC */
+
     return NULL;
 }
 
-av_cold void ff_yuv2rgb_init_tables_altivec(SwsContext *c,
-                                            const int inv_table[4],
-                                            int brightness,
-                                            int contrast,
-                                            int saturation)
+av_cold void ff_yuv2rgb_init_tables_ppc(SwsContext *c,
+                                        const int inv_table[4],
+                                        int brightness,
+                                        int contrast,
+                                        int saturation)
 {
+#if HAVE_ALTIVEC
     union {
         DECLARE_ALIGNED(16, signed short, tmp)[8];
         vector signed short vec;
     } buf;
 
+    if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
+        return;
+
     buf.tmp[0] = ((0xffffLL) * contrast >> 8) >> 9;                               // cy
     buf.tmp[1] = -256 * brightness;                                               // oy
     buf.tmp[2] =   (inv_table[0] >> 3) * (contrast >> 16) * (saturation >> 16);   // crv
@@ -622,20 +631,23 @@
     c->CGU    = vec_splat((vector signed short) buf.vec, 4);
     c->CGV    = vec_splat((vector signed short) buf.vec, 5);
     return;
+#endif /* HAVE_ALTIVEC */
 }
 
-static av_always_inline void ff_yuv2packedX_altivec(SwsContext *c,
-                                                    const int16_t *lumFilter,
-                                                    const int16_t **lumSrc,
-                                                    int lumFilterSize,
-                                                    const int16_t *chrFilter,
-                                                    const int16_t **chrUSrc,
-                                                    const int16_t **chrVSrc,
-                                                    int chrFilterSize,
-                                                    const int16_t **alpSrc,
-                                                    uint8_t *dest,
-                                                    int dstW, int dstY,
-                                                    enum AVPixelFormat target)
+#if HAVE_ALTIVEC
+
+static av_always_inline void yuv2packedX_altivec(SwsContext *c,
+                                                 const int16_t *lumFilter,
+                                                 const int16_t **lumSrc,
+                                                 int lumFilterSize,
+                                                 const int16_t *chrFilter,
+                                                 const int16_t **chrUSrc,
+                                                 const int16_t **chrVSrc,
+                                                 int chrFilterSize,
+                                                 const int16_t **alpSrc,
+                                                 uint8_t *dest,
+                                                 int dstW, int dstY,
+                                                 enum AVPixelFormat target)
 {
     int i, j;
     vector signed short X, X0, X1, Y0, U0, V0, Y1, U1, V1, U, V;
@@ -844,10 +856,10 @@
                                      const int16_t **alpSrc,            \
                                      uint8_t *dest, int dstW, int dstY) \
 {                                                                       \
-    ff_yuv2packedX_altivec(c, lumFilter, lumSrc, lumFilterSize,         \
-                           chrFilter, chrUSrc, chrVSrc,                 \
-                           chrFilterSize, alpSrc,                       \
-                           dest, dstW, dstY, pixfmt);                   \
+    yuv2packedX_altivec(c, lumFilter, lumSrc, lumFilterSize,            \
+                        chrFilter, chrUSrc, chrVSrc,                    \
+                        chrFilterSize, alpSrc,                          \
+                        dest, dstW, dstY, pixfmt);                      \
 }
 
 YUV2PACKEDX_WRAPPER(abgr,  AV_PIX_FMT_ABGR);
@@ -856,3 +868,5 @@
 YUV2PACKEDX_WRAPPER(rgba,  AV_PIX_FMT_RGBA);
 YUV2PACKEDX_WRAPPER(rgb24, AV_PIX_FMT_RGB24);
 YUV2PACKEDX_WRAPPER(bgr24, AV_PIX_FMT_BGR24);
+
+#endif /* HAVE_ALTIVEC */

libav-v9.6.tar.bz2/libswscale/ppc/yuv2yuv_altivec.c -> libav-v10.1.tar.bz2/libswscale/ppc/yuv2yuv_altivec.c Changed

@@ -24,9 +24,12 @@
 #include <inttypes.h>
 
 #include "config.h"
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
 #include "libswscale/swscale.h"
 #include "libswscale/swscale_internal.h"
-#include "libavutil/cpu.h"
+
+#if HAVE_ALTIVEC
 
 static int yv12toyuy2_unscaled_altivec(SwsContext *c, const uint8_t *src[],
 int srcStride[], int srcSliceY,
@@ -179,16 +182,23 @@
 return srcSliceH;
 }
 
-void ff_swscale_get_unscaled_altivec(SwsContext *c)
+#endif /* HAVE_ALTIVEC */
+
+av_cold void ff_get_unscaled_swscale_ppc(SwsContext *c)
 {
- if ((av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) && !(c->srcW & 15) &&
- !(c->flags & SWS_BITEXACT) && c->srcFormat == AV_PIX_FMT_YUV420P) {
+#if HAVE_ALTIVEC
+ if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
+ return;
+
+ if (!(c->srcW & 15) && !(c->flags & SWS_BITEXACT) &&
+ c->srcFormat == AV_PIX_FMT_YUV420P) {
 enum AVPixelFormat dstFormat = c->dstFormat;
 
 // unscaled YV12 -> packed YUV, we want speed
 if (dstFormat == AV_PIX_FMT_YUYV422)
- c->swScale = yv12toyuy2_unscaled_altivec;
+ c->swscale = yv12toyuy2_unscaled_altivec;
 else if (dstFormat == AV_PIX_FMT_UYVY422)
- c->swScale = yv12touyvy_unscaled_altivec;
+ c->swscale = yv12touyvy_unscaled_altivec;
 }
+#endif /* HAVE_ALTIVEC */
 }

libav-v9.6.tar.bz2/libswscale/rgb2rgb.c -> libav-v10.1.tar.bz2/libswscale/rgb2rgb.c Changed

libav-v9.6.tar.bz2/libswscale/rgb2rgb.h -> libav-v10.1.tar.bz2/libswscale/rgb2rgb.h Changed

libav-v9.6.tar.bz2/libswscale/rgb2rgb_template.c -> libav-v10.1.tar.bz2/libswscale/rgb2rgb_template.c Changed

@@ -26,6 +26,8 @@
 
 #include <stddef.h>
 
+#include "libavutil/attributes.h"
+
 static inline void rgb24tobgr32_c(const uint8_t *src, uint8_t *dst,
 int src_size)
 {
@@ -706,6 +708,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,
@@ -907,7 +927,7 @@
 }
 }
 
-static inline void rgb2rgb_init_c(void)
+static av_cold void rgb2rgb_init_c(void)
 {
 rgb15to16 = rgb15to16_c;
 rgb15tobgr24 = rgb15tobgr24_c;
@@ -935,6 +955,7 @@
 planar2x = planar2x_c;
 rgb24toyv12 = rgb24toyv12_c;
 interleaveBytes = interleaveBytes_c;
+ deinterleaveBytes = deinterleaveBytes_c;
 vu9_to_vu12 = vu9_to_vu12_c;
 yvu9_to_yuy2 = yvu9_to_yuy2_c;

libav-v9.6.tar.bz2/libswscale/swscale.c -> libav-v10.1.tar.bz2/libswscale/swscale.c Changed

@@ -35,7 +35,7 @@
 #include "swscale_internal.h"
 #include "swscale.h"
 
-DECLARE_ALIGNED(8, const uint8_t, dither_8x8_128)[8][8] = {
+DECLARE_ALIGNED(8, const uint8_t, ff_dither_8x8_128)[8][8] = {
 { 36, 68, 60, 92, 34, 66, 58, 90, },
 { 100, 4, 124, 28, 98, 2, 122, 26, },
 { 52, 84, 44, 76, 50, 82, 42, 74, },
@@ -46,7 +46,7 @@
 { 112, 16, 104, 8, 118, 22, 110, 14, },
 };
 
-DECLARE_ALIGNED(8, const uint8_t, ff_sws_pb_64)[8] = {
+DECLARE_ALIGNED(8, static const uint8_t, sws_pb_64)[8] = {
 64, 64, 64, 64, 64, 64, 64, 64
 };
 
@@ -337,7 +337,7 @@
 if (DEBUG_SWSCALE_BUFFERS) \
 av_log(c, AV_LOG_DEBUG, __VA_ARGS__)
 
-static int swScale(SwsContext *c, const uint8_t *src[],
+static int swscale(SwsContext *c, const uint8_t *src[],
 int srcStride[], int srcSliceY,
 int srcSliceH, uint8_t *dst[], int dstStride[])
 {
@@ -380,6 +380,7 @@
 yuv2packed1_fn yuv2packed1 = c->yuv2packed1;
 yuv2packed2_fn yuv2packed2 = c->yuv2packed2;
 yuv2packedX_fn yuv2packedX = c->yuv2packedX;
+ yuv2anyX_fn yuv2anyX = c->yuv2anyX;
 const int chrSrcSliceY = srcSliceY >> c->chrSrcVSubSample;
 const int chrSrcSliceH = -((-srcSliceH) >> c->chrSrcVSubSample);
 int should_dither = is9_OR_10BPS(c->srcFormat) ||
@@ -406,7 +407,7 @@
 srcStride[1] <<= c->vChrDrop;
 srcStride[2] <<= c->vChrDrop;
 
- DEBUG_BUFFERS("swScale() %p[%d] %p[%d] %p[%d] %p[%d] -> %p[%d] %p[%d] %p[%d] %p[%d]\n",
+ DEBUG_BUFFERS("swscale() %p[%d] %p[%d] %p[%d] %p[%d] -> %p[%d] %p[%d] %p[%d] %p[%d]\n",
 src[0], srcStride[0], src[1], srcStride[1],
 src[2], srcStride[2], src[3], srcStride[3],
 dst[0], dstStride[0], dst[1], dstStride[1],
@@ -439,7 +440,7 @@
 }
 
 if (!should_dither) {
- c->chrDither8 = c->lumDither8 = ff_sws_pb_64;
+ c->chrDither8 = c->lumDither8 = sws_pb_64;
 }
 lastDstY = dstY;
 
@@ -547,14 +548,14 @@
 lastInLumBuf, lastInChrBuf);
 #endif
 if (should_dither) {
- c->chrDither8 = dither_8x8_128[chrDstY & 7];
- c->lumDither8 = dither_8x8_128[dstY & 7];
+ c->chrDither8 = ff_dither_8x8_128[chrDstY & 7];
+ c->lumDither8 = ff_dither_8x8_128[dstY & 7];
 }
 if (dstY >= dstH - 2) {
 /* hmm looks like we can't use MMX here without overwriting
 * this array's tail */
 ff_sws_init_output_funcs(c, &yuv2plane1, &yuv2planeX, &yuv2nv12cX,
- &yuv2packed1, &yuv2packed2, &yuv2packedX);
+ &yuv2packed1, &yuv2packed2, &yuv2packedX, &yuv2anyX);
 }
 
 {
@@ -651,7 +652,7 @@
 dstW, c->lumDither8, 0);
 }
 }
- } else {
+ } else if (yuv2packedX) {
 if (c->yuv2packed1 && vLumFilterSize == 1 &&
 vChrFilterSize <= 2) { // unscaled RGB
 int chrAlpha = vChrFilterSize == 1 ? 0 : vChrFilter[2 * dstY + 1];
@@ -676,6 +677,12 @@
 chrUSrcPtr, chrVSrcPtr, vChrFilterSize,
 alpSrcPtr, dest[0], dstW, dstY);
 }
+ } else {
+ yuv2anyX(c, vLumFilter + dstY * vLumFilterSize,
+ lumSrcPtr, vLumFilterSize,
+ vChrFilter + dstY * vChrFilterSize,
+ chrUSrcPtr, chrVSrcPtr, vChrFilterSize,
+ alpSrcPtr, dest, dstW, dstY);
 }
 }
 }
@@ -711,13 +718,13 @@
 return dstY - lastDstY;
 }
 
-static av_cold void sws_init_swScale_c(SwsContext *c)
+static av_cold void sws_init_swscale(SwsContext *c)
 {
 enum AVPixelFormat srcFormat = c->srcFormat;
 
 ff_sws_init_output_funcs(c, &c->yuv2plane1, &c->yuv2planeX,
 &c->yuv2nv12cX, &c->yuv2packed1,
- &c->yuv2packed2, &c->yuv2packedX);
+ &c->yuv2packed2, &c->yuv2packedX, &c->yuv2anyX);
 
 ff_sws_init_input_funcs(c);
 
@@ -763,12 +770,12 @@
 
 SwsFunc ff_getSwsFunc(SwsContext *c)
 {
- sws_init_swScale_c(c);
+ sws_init_swscale(c);
 
- if (HAVE_MMX)
- ff_sws_init_swScale_mmx(c);
- if (HAVE_ALTIVEC)
- ff_sws_init_swScale_altivec(c);
+ if (ARCH_PPC)
+ ff_sws_init_swscale_ppc(c);
+ if (ARCH_X86)
+ ff_sws_init_swscale_x86(c);
 
- return swScale;
+ return swscale;
 }

libav-v9.6.tar.bz2/libswscale/swscale.h -> libav-v10.1.tar.bz2/libswscale/swscale.h Changed

libav-v9.6.tar.bz2/libswscale/swscale_internal.h -> libav-v10.1.tar.bz2/libswscale/swscale_internal.h Changed

@@ -218,6 +218,40 @@
 const int16_t **alpSrc, uint8_t *dest,
 int dstW, int y);
 
+/**
+ * Write one line of horizontally scaled Y/U/V/A to YUV/RGB
+ * output by doing multi-point vertical scaling between input pixels.
+ *
+ * @param c SWS scaling context
+ * @param lumFilter vertical luma/alpha scaling coefficients, 12bit [0,4096]
+ * @param lumSrc scaled luma (Y) source data, 15bit for 8-10bit output,
+ * 19-bit for 16bit output (in int32_t)
+ * @param lumFilterSize number of vertical luma/alpha input lines to scale
+ * @param chrFilter vertical chroma scaling coefficients, 12bit [0,4096]
+ * @param chrUSrc scaled chroma (U) source data, 15bit for 8-10bit output,
+ * 19-bit for 16bit output (in int32_t)
+ * @param chrVSrc scaled chroma (V) source data, 15bit for 8-10bit output,
+ * 19-bit for 16bit output (in int32_t)
+ * @param chrFilterSize number of vertical chroma input lines to scale
+ * @param alpSrc scaled alpha (A) source data, 15bit for 8-10bit output,
+ * 19-bit for 16bit output (in int32_t)
+ * @param dest pointer to the output planes. For 16bit output, this is
+ * uint16_t
+ * @param dstW width of lumSrc and alpSrc in pixels, number of pixels
+ * to write into dest[]
+ * @param y vertical line number for this output. This does not need
+ * to be used to calculate the offset in the destination,
+ * but can be used to generate comfort noise using dithering
+ * or some output formats.
+ */
+typedef void (*yuv2anyX_fn)(struct SwsContext *c, const int16_t *lumFilter,
+ const int16_t **lumSrc, int lumFilterSize,
+ const int16_t *chrFilter,
+ const int16_t **chrUSrc,
+ const int16_t **chrVSrc, int chrFilterSize,
+ const int16_t **alpSrc, uint8_t **dest,
+ int dstW, int y);
+
 /* This struct should be aligned on at least a 32-byte boundary. */
 typedef struct SwsContext {
 /**
@@ -229,7 +263,7 @@
 * Note that src, dst, srcStride, dstStride will be copied in the
 * sws_scale() wrapper so they can be freely modified here.
 */
- SwsFunc swScale;
+ SwsFunc swscale;
 int srcW; ///< Width of source luma/alpha planes.
 int srcH; ///< Height of source luma/alpha planes.
 int dstH; ///< Height of destination luma/alpha planes.
@@ -420,13 +454,14 @@
 DECLARE_ALIGNED(8, uint64_t, sparc_coeffs)[10];
 #endif
 
- /* function pointers for swScale() */
+ /* function pointers for swscale() */
 yuv2planar1_fn yuv2plane1;
 yuv2planarX_fn yuv2planeX;
 yuv2interleavedX_fn yuv2nv12cX;
 yuv2packed1_fn yuv2packed1;
 yuv2packed2_fn yuv2packed2;
 yuv2packedX_fn yuv2packedX;
+ yuv2anyX_fn yuv2anyX;
 
 /// Unscaled conversion of luma plane to YV12 for horizontal scaler.
 void (*lumToYV12)(uint8_t *dst, const uint8_t *src,
@@ -529,17 +564,16 @@
 int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4],
 int fullRange, int brightness,
 int contrast, int saturation);
+void ff_yuv2rgb_init_tables_ppc(SwsContext *c, const int inv_table[4],
+ int brightness, int contrast, int saturation);
 
-void ff_yuv2rgb_init_tables_altivec(SwsContext *c, const int inv_table[4],
- int brightness, int contrast, int saturation);
 void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufIndex,
 int lastInLumBuf, int lastInChrBuf);
 
-SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c);
+SwsFunc ff_yuv2rgb_init_x86(SwsContext *c);
 SwsFunc ff_yuv2rgb_init_vis(SwsContext *c);
-SwsFunc ff_yuv2rgb_init_altivec(SwsContext *c);
-SwsFunc ff_yuv2rgb_get_func_ptr_bfin(SwsContext *c);
-void ff_bfin_get_unscaled_swscale(SwsContext *c);
+SwsFunc ff_yuv2rgb_init_ppc(SwsContext *c);
+SwsFunc ff_yuv2rgb_init_bfin(SwsContext *c);
 
 const char *sws_format_name(enum AVPixelFormat format);
 
@@ -561,33 +595,33 @@
 {
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
 av_assert0(desc);
- return desc->flags & PIX_FMT_BE;
+ return desc->flags & AV_PIX_FMT_FLAG_BE;
 }
 
 static av_always_inline int isYUV(enum AVPixelFormat pix_fmt)
 {
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
 av_assert0(desc);
- return !(desc->flags & PIX_FMT_RGB) && desc->nb_components >= 2;
+ return !(desc->flags & AV_PIX_FMT_FLAG_RGB) && desc->nb_components >= 2;
 }
 
 static av_always_inline int isPlanarYUV(enum AVPixelFormat pix_fmt)
 {
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
 av_assert0(desc);
- return ((desc->flags & PIX_FMT_PLANAR) && isYUV(pix_fmt));
+ return ((desc->flags & AV_PIX_FMT_FLAG_PLANAR) && isYUV(pix_fmt));
 }
 
 static av_always_inline int isRGB(enum AVPixelFormat pix_fmt)
 {
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
 av_assert0(desc);
- return (desc->flags & PIX_FMT_RGB);
+ return (desc->flags & AV_PIX_FMT_FLAG_RGB);
 }
 
 #if 0 // FIXME
 #define isGray(x) \
- (!(av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL) && \
+ (!(av_pix_fmt_descriptors[x].flags & AV_PIX_FMT_FLAG_PAL) && \
 av_pix_fmt_descriptors[x].nb_components <= 2)
 #else
 #define isGray(x) \
@@ -648,7 +682,7 @@
 {
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
 av_assert0(desc);
- return ((desc->nb_components >= 2 && !(desc->flags & PIX_FMT_PLANAR)) ||
+ return ((desc->nb_components >= 2 && !(desc->flags & AV_PIX_FMT_FLAG_PLANAR)) ||
 pix_fmt == AV_PIX_FMT_PAL8);
 }
 
@@ -656,44 +690,52 @@
 {
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
 av_assert0(desc);
- return (desc->nb_components >= 2 && (desc->flags & PIX_FMT_PLANAR));
+ return (desc->nb_components >= 2 && (desc->flags & AV_PIX_FMT_FLAG_PLANAR));
 }
 
 static av_always_inline int isPackedRGB(enum AVPixelFormat pix_fmt)
 {
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
 av_assert0(desc);
- return ((desc->flags & (PIX_FMT_PLANAR | PIX_FMT_RGB)) == PIX_FMT_RGB);
+ return ((desc->flags & (AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB)) == AV_PIX_FMT_FLAG_RGB);
 }
 
 static av_always_inline int isPlanarRGB(enum AVPixelFormat pix_fmt)
 {
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
 av_assert0(desc);
- return ((desc->flags & (PIX_FMT_PLANAR | PIX_FMT_RGB)) ==
- (PIX_FMT_PLANAR | PIX_FMT_RGB));
+ return ((desc->flags & (AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB)) ==
+ (AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB));
 }
 
 static av_always_inline int usePal(enum AVPixelFormat pix_fmt)
 {
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
 av_assert0(desc);
- return ((desc->flags & PIX_FMT_PAL) || (desc->flags & PIX_FMT_PSEUDOPAL) ||
+ return ((desc->flags & AV_PIX_FMT_FLAG_PAL) || (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) ||
 pix_fmt == AV_PIX_FMT_Y400A);
 }
 
 extern const uint64_t ff_dither4[2];
 extern const uint64_t ff_dither8[2];
 
+extern const uint8_t ff_dither_4x4_16[4][8];
+extern const uint8_t ff_dither_8x8_32[8][8];
+extern const uint8_t ff_dither_8x8_73[8][8];
+extern const uint8_t ff_dither_8x8_128[8][8];
+extern const uint8_t ff_dither_8x8_220[8][8];
+
+extern const int32_t ff_yuv2rgb_coeffs[8][4];
+
 extern const AVClass sws_context_class;
 
 /**
- * Set c->swScale to an unscaled converter if one exists for the specific
+ * Set c->swscale to an unscaled converter if one exists for the specific
 * source and destination formats, bit depths, flags, etc.
 */
 void ff_get_unscaled_swscale(SwsContext *c);
-
-void ff_swscale_get_unscaled_altivec(SwsContext *c);
+void ff_get_unscaled_swscale_bfin(SwsContext *c);
+void ff_get_unscaled_swscale_ppc(SwsContext *c);
 
 /**
 * Return function pointer to fastest main scaler path function depending
@@ -708,8 +750,9 @@
 yuv2interleavedX_fn *yuv2nv12cX,
 yuv2packed1_fn *yuv2packed1,
 yuv2packed2_fn *yuv2packed2,
- yuv2packedX_fn *yuv2packedX);
-void ff_sws_init_swScale_altivec(SwsContext *c);
-void ff_sws_init_swScale_mmx(SwsContext *c);
+ yuv2packedX_fn *yuv2packedX,
+ yuv2anyX_fn *yuv2anyX);
+void ff_sws_init_swscale_ppc(SwsContext *c);
+void ff_sws_init_swscale_x86(SwsContext *c);
 
 #endif /* SWSCALE_SWSCALE_INTERNAL_H */

libav-v9.6.tar.bz2/libswscale/swscale_unscaled.c -> libav-v10.1.tar.bz2/libswscale/swscale_unscaled.c Changed

@@ -34,7 +34,7 @@
 #include "libavutil/bswap.h"
 #include "libavutil/pixdesc.h"
 
-DECLARE_ALIGNED(8, const uint8_t, dither_8x8_1)[8][8] = {
+DECLARE_ALIGNED(8, static const uint8_t, dither_8x8_1)[8][8] = {
 { 0, 1, 0, 1, 0, 1, 0, 1,},
 { 1, 0, 1, 0, 1, 0, 1, 0,},
 { 0, 1, 0, 1, 0, 1, 0, 1,},
@@ -44,7 +44,7 @@
 { 0, 1, 0, 1, 0, 1, 0, 1,},
 { 1, 0, 1, 0, 1, 0, 1, 0,},
 };
-DECLARE_ALIGNED(8, const uint8_t, dither_8x8_3)[8][8] = {
+DECLARE_ALIGNED(8, static const uint8_t, dither_8x8_3)[8][8] = {
 { 1, 2, 1, 2, 1, 2, 1, 2,},
 { 3, 0, 3, 0, 3, 0, 3, 0,},
 { 1, 2, 1, 2, 1, 2, 1, 2,},
@@ -54,7 +54,7 @@
 { 1, 2, 1, 2, 1, 2, 1, 2,},
 { 3, 0, 3, 0, 3, 0, 3, 0,},
 };
-DECLARE_ALIGNED(8, const uint8_t, dither_8x8_64)[8][8] = {
+DECLARE_ALIGNED(8, static const uint8_t, dither_8x8_64)[8][8] = {
 { 18, 34, 30, 46, 17, 33, 29, 45,},
 { 50, 2, 62, 14, 49, 1, 61, 13,},
 { 26, 42, 22, 38, 25, 41, 21, 37,},
@@ -64,8 +64,7 @@
 { 24, 40, 20, 36, 27, 43, 23, 39,},
 { 56, 8, 52, 4, 59, 11, 55, 7,},
 };
-extern const uint8_t dither_8x8_128[8][8];
-DECLARE_ALIGNED(8, const uint8_t, dither_8x8_256)[8][8] = {
+DECLARE_ALIGNED(8, static const uint8_t, dither_8x8_256)[8][8] = {
 { 72, 136, 120, 184, 68, 132, 116, 180,},
 { 200, 8, 248, 56, 196, 4, 244, 52,},
 { 104, 168, 88, 152, 100, 164, 84, 148,},
@@ -148,10 +147,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;
 }
@@ -468,6 +488,80 @@
 return srcSliceH;
 }
 
+static void packedtogbr24p(const uint8_t *src, int srcStride,
+ uint8_t *dst[], int dstStride[], int srcSliceH,
+ int alpha_first, int inc_size, int width)
+{
+ uint8_t *dest[3];
+ int x, h;
+
+ dest[0] = dst[0];
+ dest[1] = dst[1];
+ dest[2] = dst[2];
+
+ if (alpha_first)
+ src++;
+
+ for (h = 0; h < srcSliceH; h++) {
+ for (x = 0; x < width; x++) {
+ dest[0][x] = src[0];
+ dest[1][x] = src[1];
+ dest[2][x] = src[2];
+
+ src += inc_size;
+ }
+ src += srcStride - width * inc_size;
+ dest[0] += dstStride[0];
+ dest[1] += dstStride[1];
+ dest[2] += dstStride[2];
+ }
+}
+
+static int rgbToPlanarRgbWrapper(SwsContext *c, const uint8_t *src[],
+ int srcStride[], int srcSliceY, int srcSliceH,
+ uint8_t *dst[], int dstStride[])
+{
+ int alpha_first = 0;
+ int stride102[] = { dstStride[1], dstStride[0], dstStride[2] };
+ int stride201[] = { dstStride[2], dstStride[0], dstStride[1] };
+ uint8_t *dst102[] = { dst[1] + srcSliceY * dstStride[1],
+ dst[0] + srcSliceY * dstStride[0],
+ dst[2] + srcSliceY * dstStride[2] };
+ uint8_t *dst201[] = { dst[2] + srcSliceY * dstStride[2],
+ dst[0] + srcSliceY * dstStride[0],
+ dst[1] + srcSliceY * dstStride[1] };
+
+ switch (c->srcFormat) {
+ case AV_PIX_FMT_RGB24:
+ packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst201,
+ stride201, srcSliceH, alpha_first, 3, c->srcW);
+ break;
+ case AV_PIX_FMT_BGR24:
+ packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst102,
+ stride102, srcSliceH, alpha_first, 3, c->srcW);
+ break;
+ case AV_PIX_FMT_ARGB:
+ alpha_first = 1;
+ case AV_PIX_FMT_RGBA:
+ packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst201,
+ stride201, srcSliceH, alpha_first, 4, c->srcW);
+ break;
+ case AV_PIX_FMT_ABGR:
+ alpha_first = 1;
+ case AV_PIX_FMT_BGRA:
+ packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst102,
+ stride102, srcSliceH, alpha_first, 4, c->srcW);
+ break;
+ default:
+ av_log(c, AV_LOG_ERROR,
+ "unsupported planar RGB conversion %s -> %s\n",
+ av_get_pix_fmt_name(c->srcFormat),
+ av_get_pix_fmt_name(c->dstFormat));
+ }
+
+ return srcSliceH;
+}
+
 #define isRGBA32(x) ( \
 (x) == AV_PIX_FMT_ARGB \
 || (x) == AV_PIX_FMT_RGBA \
@@ -489,7 +583,7 @@
 
 #define IS_NOT_NE(bpp, desc) \
 (((bpp + 7) >> 3) == 2 && \
- (!(desc->flags & PIX_FMT_BE) != !HAVE_BIGENDIAN))
+ (!(desc->flags & AV_PIX_FMT_FLAG_BE) != !HAVE_BIGENDIAN))
 
 /* if this is non-native rgb444/555/565, don't handle it here. */
 if (IS_NOT_NE(srcId, desc_src) || IS_NOT_NE(dstId, desc_dst))
@@ -801,7 +895,7 @@
 if (dst_depth == 9) { \
 DITHER_COPY(dstPtr2, dstStride[plane] / 2, wfunc, \
 srcPtr2, srcStride[plane] / 2, rfunc, \
- dither_8x8_128, 7, clip9); \
+ ff_dither_8x8_128, 7, clip9); \
 } else { \
 DITHER_COPY(dstPtr2, dstStride[plane] / 2, wfunc, \
 srcPtr2, srcStride[plane] / 2, rfunc, \
@@ -906,34 +1000,51 @@
 /* yv12_to_nv12 */
 if ((srcFormat == AV_PIX_FMT_YUV420P || srcFormat == AV_PIX_FMT_YUVA420P) &&
 (dstFormat == AV_PIX_FMT_NV12 || dstFormat == AV_PIX_FMT_NV21)) {
- c->swScale = planarToNv12Wrapper;
+ 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) &&
 !(flags & SWS_ACCURATE_RND) && !(dstH & 1)) {
- c->swScale = ff_yuv2rgb_get_func_ptr(c);
+ c->swscale = ff_yuv2rgb_get_func_ptr(c);
 }
 
 if (srcFormat == AV_PIX_FMT_YUV410P &&
 (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P) &&
 !(flags & SWS_BITEXACT)) {
- c->swScale = yvu9ToYv12Wrapper;
+ c->swscale = yvu9ToYv12Wrapper;
 }
 
 /* bgr24toYV12 */
 if (srcFormat == AV_PIX_FMT_BGR24 &&
 (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P) &&
 !(flags & SWS_ACCURATE_RND))
- c->swScale = bgr24ToYv12Wrapper;
+ c->swscale = bgr24ToYv12Wrapper;
 
 /* RGB/BGR -> RGB/BGR (no dither needed forms) */
 if (isAnyRGB(srcFormat) && isAnyRGB(dstFormat) && findRgbConvFn(c)
 && (!needsDither || (c->flags&(SWS_FAST_BILINEAR|SWS_POINT))))
- c->swScale= rgbToRgbWrapper;
+ c->swscale = rgbToRgbWrapper;
+
+#define isByteRGB(f) ( \
+ f == AV_PIX_FMT_RGB32 || \
+ f == AV_PIX_FMT_RGB32_1 || \
+ f == AV_PIX_FMT_RGB24 || \
+ f == AV_PIX_FMT_BGR32 || \
+ f == AV_PIX_FMT_BGR32_1 || \
+ f == AV_PIX_FMT_BGR24)
+
+ if (srcFormat == AV_PIX_FMT_GBRP && isPlanar(srcFormat) && isByteRGB(dstFormat))
+ c->swscale = planarRgbToRgbWrapper;
 
- if (isPlanarRGB(srcFormat) && isPackedRGB(dstFormat))
- c->swScale = planarRgbToRgbWrapper;
+ if (av_pix_fmt_desc_get(srcFormat)->comp[0].depth_minus1 == 7 &&
+ isPackedRGB(srcFormat) && dstFormat == AV_PIX_FMT_GBRP)
+ c->swscale = rgbToPlanarRgbWrapper;
 
 /* bswap 16 bits per pixel/component packed formats */
 if (IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGR444) ||
@@ -944,8 +1055,9 @@
 IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB444) ||
 IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB48) ||
 IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB555) ||
- IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB565))
- c->swScale = packed_16bpc_bswap;
+ IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB565) ||
+ IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_XYZ12))
+ c->swscale = packed_16bpc_bswap;
 
 if ((usePal(srcFormat) && (
 dstFormat == AV_PIX_FMT_RGB32 ||
@@ -954,13 +1066,13 @@
 dstFormat == AV_PIX_FMT_BGR32 ||
 dstFormat == AV_PIX_FMT_BGR32_1 ||
 dstFormat == AV_PIX_FMT_BGR24)))
- c->swScale = palToRgbWrapper;
+ c->swscale = palToRgbWrapper;
 
 if (srcFormat == AV_PIX_FMT_YUV422P) {
 if (dstFormat == AV_PIX_FMT_YUYV422)
- c->swScale = yuv422pToYuy2Wrapper;
+ c->swscale = yuv422pToYuy2Wrapper;
 else if (dstFormat == AV_PIX_FMT_UYVY422)
- c->swScale = yuv422pToUyvyWrapper;
+ c->swscale = yuv422pToUyvyWrapper;
 }
 
 /* LQ converters if -sws 0 or -sws 4*/
@@ -968,21 +1080,21 @@
 /* yv12_to_yuy2 */
 if (srcFormat == AV_PIX_FMT_YUV420P || srcFormat == AV_PIX_FMT_YUVA420P) {
 if (dstFormat == AV_PIX_FMT_YUYV422)
- c->swScale = planarToYuy2Wrapper;
+ c->swscale = planarToYuy2Wrapper;
 else if (dstFormat == AV_PIX_FMT_UYVY422)
- c->swScale = planarToUyvyWrapper;
+ c->swscale = planarToUyvyWrapper;
 }
 }
 if (srcFormat == AV_PIX_FMT_YUYV422 &&
 (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P))
- c->swScale = yuyvToYuv420Wrapper;
+ c->swscale = yuyvToYuv420Wrapper;
 if (srcFormat == AV_PIX_FMT_UYVY422 &&
 (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P))
- c->swScale = uyvyToYuv420Wrapper;
+ c->swscale = uyvyToYuv420Wrapper;
 if (srcFormat == AV_PIX_FMT_YUYV422 && dstFormat == AV_PIX_FMT_YUV422P)
- c->swScale = yuyvToYuv422Wrapper;
+ c->swscale = yuyvToYuv422Wrapper;
 if (srcFormat == AV_PIX_FMT_UYVY422 && dstFormat == AV_PIX_FMT_YUV422P)
- c->swScale = uyvyToYuv422Wrapper;
+ c->swscale = uyvyToYuv422Wrapper;
 
 /* simple copy */
 if ( srcFormat == dstFormat ||
@@ -998,15 +1110,15 @@
 srcFormat != AV_PIX_FMT_NV12 && srcFormat != AV_PIX_FMT_NV21))
 {
 if (isPacked(c->srcFormat))
- c->swScale = packedCopyWrapper;
+ c->swscale = packedCopyWrapper;
 else /* Planar YUV or gray */
- c->swScale = planarCopyWrapper;
+ c->swscale = planarCopyWrapper;
 }
 
 if (ARCH_BFIN)
- ff_bfin_get_unscaled_swscale(c);
- if (HAVE_ALTIVEC)
- ff_swscale_get_unscaled_altivec(c);
+ ff_get_unscaled_swscale_bfin(c);
+ if (ARCH_PPC)
+ ff_get_unscaled_swscale_ppc(c);
 }
 
 static void reset_ptr(const uint8_t *src[], int format)
@@ -1149,7 +1261,7 @@
 if (srcSliceY + srcSliceH == c->srcH)
 c->sliceDir = 0;
 
- return c->swScale(c, src2, srcStride2, srcSliceY, srcSliceH, dst2,
+ return c->swscale(c, src2, srcStride2, srcSliceY, srcSliceH, dst2,
 dstStride2);
 } else {
 // slices go from bottom to top => we flip the image internally
@@ -1175,7 +1287,7 @@
 if (!srcSliceY)
 c->sliceDir = 0;
 
- return c->swScale(c, src2, srcStride2, c->srcH-srcSliceY-srcSliceH,
+ return c->swscale(c, src2, srcStride2, c->srcH-srcSliceY-srcSliceH,
 srcSliceH, dst2, dstStride2);
 }
 }

libav-v9.6.tar.bz2/libswscale/utils.c -> libav-v10.1.tar.bz2/libswscale/utils.c Changed

@@ -45,6 +45,7 @@
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
+#include "libavutil/ppc/cpu.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
 #include "rgb2rgb.h"
@@ -70,7 +71,9 @@
 #define RET 0xC3 // near return opcode for x86
 
 typedef struct FormatEntry {
- int is_supported_in, is_supported_out;
+ uint8_t is_supported_in :1;
+ uint8_t is_supported_out :1;
+ uint8_t is_supported_endianness :1;
 } FormatEntry;
 
 static const FormatEntry format_entries[AV_PIX_FMT_NB] = {
@@ -163,13 +166,15 @@
 [AV_PIX_FMT_YUV444P9LE] = { 1, 1 },
 [AV_PIX_FMT_YUV444P10BE] = { 1, 1 },
 [AV_PIX_FMT_YUV444P10LE] = { 1, 1 },
- [AV_PIX_FMT_GBRP] = { 1, 0 },
- [AV_PIX_FMT_GBRP9LE] = { 1, 0 },
- [AV_PIX_FMT_GBRP9BE] = { 1, 0 },
- [AV_PIX_FMT_GBRP10LE] = { 1, 0 },
- [AV_PIX_FMT_GBRP10BE] = { 1, 0 },
+ [AV_PIX_FMT_GBRP] = { 1, 1 },
+ [AV_PIX_FMT_GBRP9LE] = { 1, 1 },
+ [AV_PIX_FMT_GBRP9BE] = { 1, 1 },
+ [AV_PIX_FMT_GBRP10LE] = { 1, 1 },
+ [AV_PIX_FMT_GBRP10BE] = { 1, 1 },
 [AV_PIX_FMT_GBRP16LE] = { 1, 0 },
 [AV_PIX_FMT_GBRP16BE] = { 1, 0 },
+ [AV_PIX_FMT_XYZ12BE] = { 0, 0, 1 },
+ [AV_PIX_FMT_XYZ12LE] = { 0, 0, 1 },
 };
 
 int sws_isSupportedInput(enum AVPixelFormat pix_fmt)
@@ -184,7 +189,11 @@
 format_entries[pix_fmt].is_supported_out : 0;
 }
 
-extern const int32_t ff_yuv2rgb_coeffs[8][4];
+int sws_isSupportedEndiannessConversion(enum AVPixelFormat pix_fmt)
+{
+ return (unsigned)pix_fmt < AV_PIX_FMT_NB ?
+ format_entries[pix_fmt].is_supported_endianness : 0;
+}
 
 const char *sws_format_name(enum AVPixelFormat format)
 {
@@ -208,11 +217,12 @@
 dist - 1.0);
 }
 
-static int initFilter(int16_t **outFilter, int32_t **filterPos,
- int *outFilterSize, int xInc, int srcW, int dstW,
- int filterAlign, int one, int flags, int cpu_flags,
- SwsVector *srcFilter, SwsVector *dstFilter,
- double param[2], int is_horizontal)
+static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos,
+ int *outFilterSize, int xInc, int srcW,
+ int dstW, int filterAlign, int one,
+ int flags, int cpu_flags,
+ SwsVector *srcFilter, SwsVector *dstFilter,
+ double param[2], int is_horizontal)
 {
 int i;
 int filterSize;
@@ -316,7 +326,7 @@
 
 xDstInSrc = xInc - 0x10000;
 for (i = 0; i < dstW; i++) {
- int xx = (xDstInSrc - ((filterSize - 2) << 16)) / (1 << 17);
+ int xx = (xDstInSrc - ((int64_t)(filterSize - 2) << 16)) / (1 << 17);
 int j;
 (*filterPos)[i] = xx;
 for (j = 0; j < filterSize; j++) {
@@ -483,7 +493,7 @@
 minFilterSize = min;
 }
 
- if (HAVE_ALTIVEC && cpu_flags & AV_CPU_FLAG_ALTIVEC) {
+ if (PPC_ALTIVEC(cpu_flags)) {
 // we can handle the special case 4, so we don't want to go the full 8
 if (minFilterSize < 5)
 filterAlign = 4;
@@ -600,9 +610,9 @@
 }
 
 #if HAVE_MMXEXT_INLINE
-static int init_hscaler_mmxext(int dstW, int xInc, uint8_t *filterCode,
- int16_t *filter, int32_t *filterPos,
- int numSplits)
+static av_cold int init_hscaler_mmxext(int dstW, int xInc, uint8_t *filterCode,
+ int16_t *filter, int32_t *filterPos,
+ int numSplits)
 {
 uint8_t *fragmentA;
 x86_reg imm8OfPShufW1A;
@@ -796,9 +806,9 @@
 contrast, saturation);
 // FIXME factorize
 
- if (HAVE_ALTIVEC && av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)
- ff_yuv2rgb_init_tables_altivec(c, inv_table, brightness,
- contrast, saturation);
+ if (ARCH_PPC)
+ ff_yuv2rgb_init_tables_ppc(c, inv_table, brightness,
+ contrast, saturation);
 return 0;
 }
 
@@ -879,6 +889,8 @@
 
 unscaled = (srcW == dstW && srcH == dstH);
 
+ if (!(unscaled && sws_isSupportedEndiannessConversion(srcFormat) &&
+ av_pix_fmt_swap_endianness(srcFormat) == dstFormat)) {
 if (!sws_isSupportedInput(srcFormat)) {
 av_log(c, AV_LOG_ERROR, "%s is not supported as input pixel format\n",
 sws_format_name(srcFormat));
@@ -889,6 +901,7 @@
 sws_format_name(dstFormat));
 return AVERROR(EINVAL);
 }
+ }
 
 i = flags & (SWS_POINT |
 SWS_AREA |
@@ -901,7 +914,17 @@
 SWS_SINC |
 SWS_SPLINE |
 SWS_BICUBLIN);
- if (!i || (i & (i - 1))) {
+
+ /* provide a default scaler if not set by caller */
+ if (!i) {
+ if (dstW < srcW && dstH < srcH)
+ flags |= SWS_GAUSS;
+ else if (dstW > srcW && dstH > srcH)
+ flags |= SWS_SINC;
+ else
+ flags |= SWS_LANCZOS;
+ c->flags = flags;
+ } else if (i & (i - 1)) {
 av_log(c, AV_LOG_ERROR,
 "Exactly one scaler algorithm must be chosen\n");
 return AVERROR(EINVAL);
@@ -938,10 +961,21 @@
 getSubSampleFactors(&c->chrSrcHSubSample, &c->chrSrcVSubSample, srcFormat);
 getSubSampleFactors(&c->chrDstHSubSample, &c->chrDstVSubSample, dstFormat);
 
+ if (isPlanarRGB(dstFormat)) {
+ if (!(flags & SWS_FULL_CHR_H_INT)) {
+ av_log(c, AV_LOG_DEBUG,
+ "%s output is not supported with half chroma resolution, switching to full\n",
+ av_get_pix_fmt_name(dstFormat));
+ flags |= SWS_FULL_CHR_H_INT;
+ c->flags = flags;
+ }
+ }
+
 /* reuse chroma for 2 pixels RGB/BGR unless user wants full
 * chroma interpolation */
 if (flags & SWS_FULL_CHR_H_INT &&
 isAnyRGB(dstFormat) &&
+ !isPlanarRGB(dstFormat) &&
 dstFormat != AV_PIX_FMT_RGBA &&
 dstFormat != AV_PIX_FMT_ARGB &&
 dstFormat != AV_PIX_FMT_BGRA &&
@@ -968,6 +1002,9 @@
 srcFormat != AV_PIX_FMT_RGB8 && srcFormat != AV_PIX_FMT_BGR8 &&
 srcFormat != AV_PIX_FMT_RGB4 && srcFormat != AV_PIX_FMT_BGR4 &&
 srcFormat != AV_PIX_FMT_RGB4_BYTE && srcFormat != AV_PIX_FMT_BGR4_BYTE &&
+ srcFormat != AV_PIX_FMT_GBRP9BE && srcFormat != AV_PIX_FMT_GBRP9LE &&
+ srcFormat != AV_PIX_FMT_GBRP10BE && srcFormat != AV_PIX_FMT_GBRP10LE &&
+ srcFormat != AV_PIX_FMT_GBRP16BE && srcFormat != AV_PIX_FMT_GBRP16LE &&
 ((dstW >> c->chrDstHSubSample) <= (srcW >> 1) ||
 (flags & SWS_FAST_BILINEAR)))
 c->chrSrcHSubSample = 1;
@@ -983,7 +1020,7 @@
 (c->srcRange == c->dstRange || isAnyRGB(dstFormat))) {
 ff_get_unscaled_swscale(c);
 
- if (c->swScale) {
+ if (c->swscale) {
 if (flags & SWS_PRINT_INFO)
 av_log(c, AV_LOG_INFO,
 "using unscaled %s -> %s special converter\n",
@@ -1093,10 +1130,8 @@
 } else
 #endif /* HAVE_MMXEXT_INLINE */
 {
- const int filterAlign =
- (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) ? 4 :
- (HAVE_ALTIVEC && cpu_flags & AV_CPU_FLAG_ALTIVEC) ? 8 :
- 1;
+ const int filterAlign = X86_MMX(cpu_flags) ? 4 :
+ PPC_ALTIVEC(cpu_flags) ? 8 : 1;
 
 if (initFilter(&c->hLumFilter, &c->hLumFilterPos,
 &c->hLumFilterSize, c->lumXInc,
@@ -1117,10 +1152,8 @@
 
 /* precalculate vertical scaler filter coefficients */
 {
- const int filterAlign =
- (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) ? 2 :
- (HAVE_ALTIVEC && cpu_flags & AV_CPU_FLAG_ALTIVEC) ? 8 :
- 1;
+ const int filterAlign = X86_MMX(cpu_flags) ? 2 :
+ PPC_ALTIVEC(cpu_flags) ? 8 : 1;
 
 if (initFilter(&c->vLumFilter, &c->vLumFilterPos, &c->vLumFilterSize,
 c->lumYInc, srcH, dstH, filterAlign, (1 << 12),
@@ -1257,7 +1290,7 @@
 av_log(c, AV_LOG_INFO, "using 3DNOW\n");
 else if (INLINE_MMX(cpu_flags))
 av_log(c, AV_LOG_INFO, "using MMX\n");
- else if (HAVE_ALTIVEC && cpu_flags & AV_CPU_FLAG_ALTIVEC)
+ else if (PPC_ALTIVEC(cpu_flags))
 av_log(c, AV_LOG_INFO, "using AltiVec\n");
 else
 av_log(c, AV_LOG_INFO, "using C\n");
@@ -1272,7 +1305,7 @@
 c->chrXInc, c->chrYInc);
 }
 
- c->swScale = ff_getSwsFunc(c);
+ c->swscale = ff_getSwsFunc(c);
 return 0;
 fail: // FIXME replace things by appropriate error codes
 return -1;

libav-v9.6.tar.bz2/libswscale/version.h -> libav-v10.1.tar.bz2/libswscale/version.h Changed

libav-v9.6.tar.bz2/libswscale/x86/Makefile -> libav-v10.1.tar.bz2/libswscale/x86/Makefile Changed

libav-v9.6.tar.bz2/libswscale/x86/input.asm -> libav-v10.1.tar.bz2/libswscale/x86/input.asm Changed

@@ -98,7 +98,7 @@
 %define coeff2 [%2_Ycoeff_3x56]
 %endif ; x86-32/64 && mmsize == 8/16
 %if (ARCH_X86_64 || mmsize == 8) && %0 == 3
-    jmp mangle(program_name %+ _ %+ %3 %+ 24ToY %+ SUFFIX).body
+    jmp mangle(private_prefix %+ _ %+ %3 %+ 24ToY %+ SUFFIX).body
 %else ; (ARCH_X86_64 && %0 == 3) || mmsize == 8
 .body:
 %if cpuflag(ssse3)
@@ -188,7 +188,7 @@
 %define coeffV2 [%2_Vcoeff_3x56]
 %endif ; x86-32/64
 %if ARCH_X86_64 && %0 == 3
-    jmp mangle(program_name %+ _ %+ %3 %+ 24ToUV %+ SUFFIX).body
+    jmp mangle(private_prefix %+ _ %+ %3 %+ 24ToUV %+ SUFFIX).body
 %else ; ARCH_X86_64 && %0 == 3
 .body:
 %if cpuflag(ssse3)
@@ -315,7 +315,7 @@
     mova           m5, [rgba_Ycoeff_%2%4]
     mova           m6, [rgba_Ycoeff_%3%5]
 %if %0 == 6
-    jmp mangle(program_name %+ _ %+ %6 %+ ToY %+ SUFFIX).body
+    jmp mangle(private_prefix %+ _ %+ %6 %+ ToY %+ SUFFIX).body
 %else ; %0 == 6
 .body:
 %if ARCH_X86_64
@@ -371,7 +371,7 @@
 %define coeffV2 [rgba_Vcoeff_%3%5]
 %endif ; x86-64/32
 %if ARCH_X86_64 && %0 == 6
-    jmp mangle(program_name %+ _ %+ %6 %+ ToUV %+ SUFFIX).body
+    jmp mangle(private_prefix %+ _ %+ %6 %+ ToUV %+ SUFFIX).body
 %else ; ARCH_X86_64 && %0 == 6
 .body:
 %if ARCH_X86_64

libav-v9.6.tar.bz2/libswscale/x86/rgb2rgb.c -> libav-v10.1.tar.bz2/libswscale/x86/rgb2rgb.c Changed

@@ -89,35 +89,44 @@
 #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_AMD3DNOW 1
-#define RENAME(a) a ## _3DNOW
+#define RENAME(a) a ## _3dnow
 #include "rgb2rgb_template.c"
 
 /*
@@ -135,12 +144,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 */
 }

libav-v9.6.tar.bz2/libswscale/x86/rgb2rgb_template.c -> libav-v10.1.tar.bz2/libswscale/x86/rgb2rgb_template.c Changed

@@ -26,6 +26,8 @@
 
 #include <stddef.h>
 
+#include "libavutil/attributes.h"
+
 #undef PREFETCH
 #undef MOVNTQ
 #undef EMMS
@@ -1869,7 +1871,7 @@
 }
 #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)
@@ -1939,6 +1941,30 @@
 ::: "memory"
 );
 }
+#endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX */
+
+#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 *src, const uint8_t *unused, 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, src, NULL, width, NULL);
+ src += srcStride;
+ dst1 += dst1Stride;
+ dst2 += dst2Stride;
+ }
+ __asm__(
+ EMMS" \n\t"
+ SFENCE" \n\t"
+ ::: "memory"
+ );
+}
 #endif /* !COMPILE_TEMPLATE_AMD3DNOW */
 
 #if !COMPILE_TEMPLATE_SSE2
@@ -2465,7 +2491,7 @@
 #endif /* !COMPILE_TEMPLATE_AMD3DNOW */
 #endif /* !COMPILE_TEMPLATE_SSE2 */
 
-static inline void RENAME(rgb2rgb_init)(void)
+static av_cold void RENAME(rgb2rgb_init)(void)
 {
 #if !COMPILE_TEMPLATE_SSE2
 #if !COMPILE_TEMPLATE_AMD3DNOW
@@ -2507,7 +2533,10 @@
 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_AMD3DNOW && (ARCH_X86_32 || COMPILE_TEMPLATE_SSE2) && COMPILE_TEMPLATE_MMXEXT == COMPILE_TEMPLATE_SSE2 && HAVE_YASM
+ deinterleaveBytes = RENAME(deinterleaveBytes);
+#endif
 }

libav-v9.6.tar.bz2/libswscale/x86/swscale.c -> libav-v10.1.tar.bz2/libswscale/x86/swscale.c Changed

@@ -74,7 +74,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
 
@@ -83,7 +83,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 @@
 #endif /* HAVE_INLINE_ASM */
 
 #define SCALE_FUNC(filter_n, from_bpc, to_bpc, opt) \
-extern void ff_hscale ## from_bpc ## to ## to_bpc ## _ ## filter_n ## _ ## opt( \
+void ff_hscale ## from_bpc ## to ## to_bpc ## _ ## filter_n ## _ ## opt( \
                                                 SwsContext *c, int16_t *data, \
                                                 int dstW, const uint8_t *src, \
                                                 const int16_t *filter, \
@@ -241,9 +241,9 @@
 SCALE_FUNCS_SSE(sse4);
 
 #define VSCALEX_FUNC(size, opt) \
-extern void ff_yuv2planeX_ ## size ## _ ## opt(const int16_t *filter, int filterSize, \
-                                               const int16_t **src, uint8_t *dest, int dstW, \
-                                               const uint8_t *dither, int offset)
+void ff_yuv2planeX_ ## size ## _ ## opt(const int16_t *filter, int filterSize, \
+                                        const int16_t **src, uint8_t *dest, int dstW, \
+                                        const uint8_t *dither, int offset)
 #define VSCALEX_FUNCS(opt) \
     VSCALEX_FUNC(8,  opt); \
     VSCALEX_FUNC(9,  opt); \
@@ -258,8 +258,8 @@
 VSCALEX_FUNCS(avx);
 
 #define VSCALE_FUNC(size, opt) \
-extern void ff_yuv2plane1_ ## size ## _ ## opt(const int16_t *src, uint8_t *dst, int dstW, \
-                                               const uint8_t *dither, int offset)
+void ff_yuv2plane1_ ## size ## _ ## opt(const int16_t *src, uint8_t *dst, int dstW, \
+                                        const uint8_t *dither, int offset)
 #define VSCALE_FUNCS(opt1, opt2) \
     VSCALE_FUNC(8,  opt1); \
     VSCALE_FUNC(9,  opt2); \
@@ -274,12 +274,12 @@
 VSCALE_FUNCS(avx, avx);
 
 #define INPUT_Y_FUNC(fmt, opt) \
-extern void ff_ ## fmt ## ToY_  ## opt(uint8_t *dst, const uint8_t *src, \
-                                       int w, uint32_t *unused)
+void ff_ ## fmt ## ToY_  ## opt(uint8_t *dst, const uint8_t *src, \
+                                int w, uint32_t *unused)
 #define INPUT_UV_FUNC(fmt, opt) \
-extern void ff_ ## fmt ## ToUV_ ## opt(uint8_t *dstU, uint8_t *dstV, \
-                                       const uint8_t *src, const uint8_t *unused1, \
-                                       int w, uint32_t *unused2)
+void ff_ ## fmt ## ToUV_ ## opt(uint8_t *dstU, uint8_t *dstV, \
+                                const uint8_t *src, const uint8_t *unused1, \
+                                int w, uint32_t *unused2)
 #define INPUT_FUNC(fmt, opt) \
     INPUT_Y_FUNC(fmt, opt); \
     INPUT_UV_FUNC(fmt, opt)
@@ -302,18 +302,18 @@
 INPUT_FUNCS(ssse3);
 INPUT_FUNCS(avx);
 
-av_cold void ff_sws_init_swScale_mmx(SwsContext *c)
+av_cold void ff_sws_init_swscale_x86(SwsContext *c)
 {
     int cpu_flags = av_get_cpu_flags();
 
-#if HAVE_INLINE_ASM
-    if (cpu_flags & AV_CPU_FLAG_MMX)
-        sws_init_swScale_MMX(c);
+#if HAVE_MMX_INLINE
+    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);
 #endif
-#endif /* HAVE_INLINE_ASM */
 
 #define ASSIGN_SCALE_FUNC2(hscalefn, filtersize, opt1, opt2) do { \
     if (c->srcBpc == 8) { \

libav-v9.6.tar.bz2/libswscale/x86/swscale_template.c -> libav-v10.1.tar.bz2/libswscale/x86/swscale_template.c Changed

libav-v9.6.tar.bz2/libswscale/x86/yuv2rgb.c -> libav-v10.1.tar.bz2/libswscale/x86/yuv2rgb.c Changed

@@ -35,6 +35,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
@@ -54,7 +55,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 */
 
@@ -63,15 +64,15 @@
 #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 */
 
 #endif /* HAVE_INLINE_ASM */
 
-av_cold SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c)
+av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
 {
-#if HAVE_INLINE_ASM
+#if HAVE_MMX_INLINE
     int cpu_flags = av_get_cpu_flags();
 
     if (c->srcFormat != AV_PIX_FMT_YUV420P &&
@@ -79,39 +80,45 @@
         return NULL;
 
 #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_INLINE_ASM */
+#endif /* HAVE_MMX_INLINE */
 
     return NULL;
 }

libav-v9.6.tar.bz2/libswscale/yuv2rgb.c -> libav-v10.1.tar.bz2/libswscale/yuv2rgb.c Changed

@@ -35,11 +35,6 @@
 #include "swscale.h"
 #include "swscale_internal.h"
 
-extern const uint8_t dither_4x4_16[4][8];
-extern const uint8_t dither_8x8_32[8][8];
-extern const uint8_t dither_8x8_73[8][8];
-extern const uint8_t dither_8x8_220[8][8];
-
 const int32_t ff_yuv2rgb_coeffs[8][4] = {
 { 117504, 138453, 13954, 34903 }, /* no sequence_display_extension */
 { 117504, 138453, 13954, 34903 }, /* ITU-R Rec. 709 (1990) */
@@ -274,8 +269,8 @@
 LOADCHROMA(3);
 PUTRGBA(dst_2, py_2, pa_2, 3, 24);
 PUTRGBA(dst_1, py_1, pa_1, 3, 24);
- pa_1 += 8; \
- pa_2 += 8; \
+ pa_1 += 8;
+ pa_2 += 8;
 ENDYUV2RGBLINE(8, 0)
 LOADCHROMA(0);
 PUTRGBA(dst_1, py_1, pa_1, 0, 24);
@@ -284,8 +279,8 @@
 LOADCHROMA(1);
 PUTRGBA(dst_2, py_2, pa_2, 1, 24);
 PUTRGBA(dst_1, py_1, pa_1, 1, 24);
- pa_1 += 4; \
- pa_2 += 4; \
+ pa_1 += 4;
+ pa_2 += 4;
 ENDYUV2RGBLINE(8, 1)
 LOADCHROMA(0);
 PUTRGBA(dst_1, py_1, pa_1, 0, 24);
@@ -308,8 +303,8 @@
 LOADCHROMA(3);
 PUTRGBA(dst_2, py_2, pa_2, 3, 0);
 PUTRGBA(dst_1, py_1, pa_1, 3, 0);
- pa_1 += 8; \
- pa_2 += 8; \
+ pa_1 += 8;
+ pa_2 += 8;
 ENDYUV2RGBLINE(8, 0)
 LOADCHROMA(0);
 PUTRGBA(dst_1, py_1, pa_1, 0, 0);
@@ -318,8 +313,8 @@
 LOADCHROMA(1);
 PUTRGBA(dst_2, py_2, pa_2, 1, 0);
 PUTRGBA(dst_1, py_1, pa_1, 1, 0);
- pa_1 += 4; \
- pa_2 += 4; \
+ pa_1 += 4;
+ pa_2 += 4;
 ENDYUV2RGBLINE(8, 1)
 LOADCHROMA(0);
 PUTRGBA(dst_1, py_1, pa_1, 0, 0);
@@ -409,7 +404,7 @@
 
 // r, g, b, dst_1, dst_2
 YUV2RGBFUNC(yuv2rgb_c_12_ordered_dither, uint16_t, 0)
- const uint8_t *d16 = dither_4x4_16[y & 3];
+ const uint8_t *d16 = ff_dither_4x4_16[y & 3];
 
 #define PUTRGB12(dst, src, i, o) \
 Y = src[2 * i]; \
@@ -440,8 +435,8 @@
 
 // r, g, b, dst_1, dst_2
 YUV2RGBFUNC(yuv2rgb_c_8_ordered_dither, uint8_t, 0)
- const uint8_t *d32 = dither_8x8_32[y & 7];
- const uint8_t *d64 = dither_8x8_73[y & 7];
+ const uint8_t *d32 = ff_dither_8x8_32[y & 7];
+ const uint8_t *d64 = ff_dither_8x8_73[y & 7];
 
 #define PUTRGB8(dst, src, i, o) \
 Y = src[2 * i]; \
@@ -471,8 +466,8 @@
 CLOSEYUV2RGBFUNC(8)
 
 YUV2RGBFUNC(yuv2rgb_c_4_ordered_dither, uint8_t, 0)
- const uint8_t * d64 = dither_8x8_73[y & 7];
- const uint8_t *d128 = dither_8x8_220[y & 7];
+ const uint8_t * d64 = ff_dither_8x8_73[y & 7];
+ const uint8_t *d128 = ff_dither_8x8_220[y & 7];
 int acc;
 
 #define PUTRGB4D(dst, src, i, o) \
@@ -504,8 +499,8 @@
 CLOSEYUV2RGBFUNC(4)
 
 YUV2RGBFUNC(yuv2rgb_c_4b_ordered_dither, uint8_t, 0)
- const uint8_t *d64 = dither_8x8_73[y & 7];
- const uint8_t *d128 = dither_8x8_220[y & 7];
+ const uint8_t *d64 = ff_dither_8x8_73[y & 7];
+ const uint8_t *d128 = ff_dither_8x8_220[y & 7];
 
 #define PUTRGB4DB(dst, src, i, o) \
 Y = src[2 * i]; \
@@ -535,7 +530,7 @@
 CLOSEYUV2RGBFUNC(8)
 
 YUV2RGBFUNC(yuv2rgb_c_1_ordered_dither, uint8_t, 0)
- const uint8_t *d128 = dither_8x8_220[y & 7];
+ const uint8_t *d128 = ff_dither_8x8_220[y & 7];
 char out_1 = 0, out_2 = 0;
 g = c->table_gU[128] + c->table_gV[128];
 
@@ -565,14 +560,14 @@
 {
 SwsFunc t = NULL;
 
- if (HAVE_MMX)
- t = ff_yuv2rgb_init_mmx(c);
- else if (HAVE_VIS)
+ if (ARCH_BFIN)
+ t = ff_yuv2rgb_init_bfin(c);
+ if (ARCH_PPC)
+ t = ff_yuv2rgb_init_ppc(c);
+ if (HAVE_VIS)
 t = ff_yuv2rgb_init_vis(c);
- else if (HAVE_ALTIVEC)
- t = ff_yuv2rgb_init_altivec(c);
- else if (ARCH_BFIN)
- t = ff_yuv2rgb_get_func_ptr_bfin(c);
+ if (ARCH_X86)
+ t = ff_yuv2rgb_init_x86(c);
 
 if (t)
 return t;
@@ -882,7 +877,8 @@
 break;
 default:
 c->yuvTable = NULL;
- av_log(c, AV_LOG_ERROR, "%ibpp not supported by yuv2rgb\n", bpp);
+ if(!isPlanar(c->dstFormat) || bpp <= 24)
+ av_log(c, AV_LOG_ERROR, "%ibpp not supported by yuv2rgb\n", bpp);
 return -1;
 }
 return 0;

libav-v9.6.tar.bz2/tests/Makefile -> libav-v10.1.tar.bz2/tests/Makefile Changed

@@ -1,12 +1,12 @@
 VREF = tests/vsynth1/00.pgm
 AREF = tests/data/asynth1.sw
 
-OBJDIRS += tests/data tests/vsynth1
+OBJDIRS += tests/data tests/vsynth1 tests/data/filtergraphs
 
-tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF) | tests/vsynth1
+$(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1
 	$(M)./$< 'tests/vsynth1/'
 
-tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF) | tests/data
+$(AREF): tests/audiogen$(HOSTEXESUF) | tests/data
 	$(M)./$< $@
 
 tests/data/asynth-%.wav: tests/audiogen$(HOSTEXESUF) | tests/data
@@ -20,7 +20,14 @@
 
 tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm: TAG = GEN
 
+tests/data/filtergraphs/%: TAG = COPY
+tests/data/filtergraphs/%: $(SRC_PATH)/tests/filtergraphs/% | tests/data/filtergraphs
+	$(M)cp $< $@
+
+# Check sanity of dependencies when running FATE tests.
+ifneq (,$(filter check fate%,$(filter-out fate-rsync,$(MAKECMDGOALS))))
 CHKCFG = $(if $($(1))$(!$(1)),$($(1)), $(error No such config: $(1)))
+endif
 
 ALLYES = $(strip $(call XYES, $(1)))
 XYES = $(if $(strip $(1)), \
@@ -38,10 +45,17 @@
 DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER))
 ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER)
 
+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)
+
+PARSERDEMDEC = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER)
+
 include $(SRC_PATH)/tests/fate/acodec.mak
 include $(SRC_PATH)/tests/fate/vcodec.mak
 include $(SRC_PATH)/tests/fate/avformat.mak
-include $(SRC_PATH)/tests/fate/avfilter.mak
 include $(SRC_PATH)/tests/fate/seek.mak
 
 include $(SRC_PATH)/tests/fate/aac.mak
@@ -60,18 +74,23 @@
 include $(SRC_PATH)/tests/fate/dfa.mak
 include $(SRC_PATH)/tests/fate/dpcm.mak
 include $(SRC_PATH)/tests/fate/ea.mak
-include $(SRC_PATH)/tests/fate/filter.mak
+include $(SRC_PATH)/tests/fate/filter-audio.mak
+include $(SRC_PATH)/tests/fate/filter-video.mak
 include $(SRC_PATH)/tests/fate/flac.mak
 include $(SRC_PATH)/tests/fate/fft.mak
 include $(SRC_PATH)/tests/fate/h264.mak
+include $(SRC_PATH)/tests/fate/hevc.mak
 include $(SRC_PATH)/tests/fate/image.mak
 include $(SRC_PATH)/tests/fate/indeo.mak
 include $(SRC_PATH)/tests/fate/libavcodec.mak
+include $(SRC_PATH)/tests/fate/libavdevice.mak
 include $(SRC_PATH)/tests/fate/libavformat.mak
+include $(SRC_PATH)/tests/fate/libavresample.mak
 include $(SRC_PATH)/tests/fate/libavutil.mak
 include $(SRC_PATH)/tests/fate/lossless-audio.mak
 include $(SRC_PATH)/tests/fate/lossless-video.mak
 include $(SRC_PATH)/tests/fate/microsoft.mak
+include $(SRC_PATH)/tests/fate/monkeysaudio.mak
 include $(SRC_PATH)/tests/fate/mp3.mak
 include $(SRC_PATH)/tests/fate/mpc.mak
 include $(SRC_PATH)/tests/fate/pcm.mak
@@ -89,6 +108,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_AVCONV += $(FATE_AVCONV-yes)
 FATE-$(CONFIG_AVCONV) += $(FATE_AVCONV)
@@ -104,7 +124,7 @@
 ifdef SAMPLES
 FATE += $(FATE_SAMPLES)
 fate-rsync:
-	rsync -vaLW rsync://fate-suite.libav.org/fate-suite-9/ $(SAMPLES)
+	rsync -vaLW rsync://fate-suite.libav.org/fate-suite-10/ $(SAMPLES)
 else
 fate-rsync:
 	@echo "use 'make fate-rsync SAMPLES=/path/to/samples' to sync the fate suite"
@@ -118,11 +138,26 @@
 
 $(FATE): $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
 	@echo "TEST $(@:fate-%=%)"
-	$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)'
+	$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)'
 
 fate-list:
 	@printf '%s\n' $(sort $(FATE))
 
+coverage.info: TAG = LCOV
+coverage.info:
+	$(M)lcov -q -d $(CURDIR) -b $(SRC_PATH) --capture | \
+	 sed "s,$(CURDIR)/\./,$(CURDIR)/," > $@
+	$(M)lcov -q --remove $@ "/usr/include*" -o $@
+
+lcov: TAG = GENHTML
+lcov: coverage.info
+	$(M)genhtml -q -o $(CURDIR)/lcov $<
+
+lcov-reset: TAG = LCOV
+lcov-reset:
+	$(M)lcov -d $(CURDIR) --zerocounters
+	$(Q)$(RM) -f coverage.info
+
 clean:: testclean
 
 testclean:
@@ -132,4 +167,5 @@
 
 -include $(wildcard tests/*.d)
 
-.PHONY: fate*
+.PHONY: fate* lcov lcov-reset
+.INTERMEDIATE: coverage.info

libav-v9.6.tar.bz2/tests/audiogen.c -> libav-v10.1.tar.bz2/tests/audiogen.c Changed

libav-v9.6.tar.bz2/tests/fate-run.sh -> libav-v10.1.tar.bz2/tests/fate-run.sh Changed

@@ -22,6 +22,7 @@
 cmp_target=${13:-0}
 size_tolerance=${14:-0}
 cmp_unit=${15:-2}
+gen=${16:-no}
 
 outdir="tests/data/fate"
 outfile="${outdir}/${test}"
@@ -145,19 +146,49 @@
 tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift
 }
 
-regtest(){
- t="${test#$2-}"
- ref=${base}/ref/$2/$t
- ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags"
-}
-
 lavftest(){
- regtest lavf lavf tests/vsynth1
+ t="${test#lavf-}"
+ ref=${base}/ref/lavf/$t
+ ${base}/lavf-regression.sh $t lavf tests/vsynth1 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags"
+}
+
+video_filter(){
+ filters=$1
+ shift
+ label=${test#filter-}
+ raw_src="${target_path}/tests/vsynth1/%02d.pgm"
+ printf '%-20s' $label
+ avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src \
+ $FLAGS $ENC_OPTS -vf "$filters" -vcodec rawvideo $* -f nut md5:
+}
+
+pixdesc(){
+ pix_fmts="$(avconv -pix_fmts list 2>/dev/null | awk 'NR > 8 && /^IO/ { print $2 }' | sort)"
+ for pix_fmt in $pix_fmts; do
+ test=$pix_fmt
+ video_filter "format=$pix_fmt,pixdesctest" -pix_fmt $pix_fmt
+ done
 }
 
-lavfitest(){
- cleanfiles="tests/data/lavfi/${test#lavfi-}.nut"
- regtest lavfi lavfi tests/vsynth1
+pixfmts(){
+ filter=${test#filter-pixfmts-}
+ filter_args=$1
+
+ showfiltfmts="$target_exec $target_path/libavfilter/filtfmts-test"
+ exclude_fmts=${outfile}${filter}_exclude_fmts
+ out_fmts=${outfile}${filter}_out_fmts
+
+ # exclude pixel formats which are not supported as input
+ avconv -pix_fmts list 2>/dev/null | awk 'NR > 8 && /^\..\./ { print $2 }' | sort >$exclude_fmts
+ $showfiltfmts scale | awk -F '[ \r]' '/^OUTPUT/{ print $3 }' | sort | comm -23 - $exclude_fmts >$out_fmts
+
+ pix_fmts=$($showfiltfmts $filter | awk -F '[ \r]' '/^INPUT/{ print $3 }' | sort | comm -12 - $out_fmts)
+ for pix_fmt in $pix_fmts; do
+ test=$pix_fmt
+ video_filter "format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt
+ done
+
+ rm $exclude_fmts $out_fmts
 }
 
 mkdir -p "$outdir"
@@ -189,5 +220,11 @@
 
 echo "${test}:${sig:-$err}:$($base64 <$cmpfile):$($base64 <$errfile)" >$repfile
 
+if test $err != 0 && test $gen != "no" ; then
+ echo "GEN $ref"
+ cp -f "$outfile" "$ref"
+ err=$?
+fi
+
 test $err = 0 && rm -f $outfile $errfile $cmpfile $cleanfiles
 exit $err

libav-v9.6.tar.bz2/tests/fate.sh -> libav-v10.1.tar.bz2/tests/fate.sh Changed

@@ -28,14 +28,14 @@
 checkout(){
     case "$repo" in
         file:*|/*) src="${repo#file:}"      ;;
-        git:*)     git clone "$repo" "$src" ;;
+        git:*)     git clone --quiet "$repo" "$src" ;;
     esac
 }
 
 update()(
     cd ${src} || return
     case "$repo" in
-        git:*) git pull --quiet ;;
+        git:*) git fetch --force; git reset --hard origin/master ;;
     esac
 )
 
@@ -48,12 +48,14 @@
         ${arch:+--arch=$arch}                                           \
         ${cpu:+--cpu="$cpu"}                                            \
         ${cross_prefix:+--cross-prefix="$cross_prefix"}                 \
+        ${as:+--as="$as"}                                               \
         ${cc:+--cc="$cc"}                                               \
         ${ld:+--ld="$ld"}                                               \
         ${target_os:+--target-os="$target_os"}                          \
         ${sysroot:+--sysroot="$sysroot"}                                \
         ${target_exec:+--target-exec="$target_exec"}                    \
         ${target_path:+--target-path="$target_path"}                    \
+        ${target_samples:+--target-samples="$target_samples"}           \
         ${extra_cflags:+--extra-cflags="$extra_cflags"}                 \
         ${extra_ldflags:+--extra-ldflags="$extra_ldflags"}              \
         ${extra_libs:+--extra-libs="$extra_libs"}                       \
@@ -66,6 +68,7 @@
 )
 
 fate()(
+    test "$build_only" = "yes" && return
     cd ${build} || return
     ${make} ${makeopts} -k fate
 )

libav-v9.6.tar.bz2/tests/fate/aac.mak -> libav-v10.1.tar.bz2/tests/fate/aac.mak Changed

@@ -1,56 +1,73 @@
 FATE_AAC += fate-aac-al04_44
-fate-aac-al04_44: CMD = pcm -i $(SAMPLES)/aac/al04_44.mp4
+fate-aac-al04_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al04_44.mp4
 fate-aac-al04_44: REF = $(SAMPLES)/aac/al04_44.s16
 
 FATE_AAC += fate-aac-al05_44
-fate-aac-al05_44: CMD = pcm -i $(SAMPLES)/aac/al05_44.mp4
+fate-aac-al05_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al05_44.mp4
 fate-aac-al05_44: REF = $(SAMPLES)/aac/al05_44.s16
 
 FATE_AAC += fate-aac-al06_44
-fate-aac-al06_44: CMD = pcm -i $(SAMPLES)/aac/al06_44.mp4
+fate-aac-al06_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al06_44.mp4
 fate-aac-al06_44: REF = $(SAMPLES)/aac/al06_44_reorder.s16
 
 FATE_AAC += fate-aac-al07_96
-fate-aac-al07_96: CMD = pcm -i $(SAMPLES)/aac/al07_96.mp4
+fate-aac-al07_96: CMD = pcm -i $(TARGET_SAMPLES)/aac/al07_96.mp4
 fate-aac-al07_96: REF = $(SAMPLES)/aac/al07_96_reorder.s16
 
 FATE_AAC += fate-aac-al15_44
-fate-aac-al15_44: CMD = pcm -i $(SAMPLES)/aac/al15_44.mp4
+fate-aac-al15_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al15_44.mp4
 fate-aac-al15_44: REF = $(SAMPLES)/aac/al15_44_reorder.s16
 
 FATE_AAC += fate-aac-al17_44
-fate-aac-al17_44: CMD = pcm -i $(SAMPLES)/aac/al17_44.mp4
+fate-aac-al17_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al17_44.mp4
 fate-aac-al17_44: REF = $(SAMPLES)/aac/al17_44.s16
 
 FATE_AAC += fate-aac-al18_44
-fate-aac-al18_44: CMD = pcm -i $(SAMPLES)/aac/al18_44.mp4
+fate-aac-al18_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al18_44.mp4
 fate-aac-al18_44: REF = $(SAMPLES)/aac/al18_44.s16
 
 FATE_AAC += fate-aac-am00_88
-fate-aac-am00_88: CMD = pcm -i $(SAMPLES)/aac/am00_88.mp4
+fate-aac-am00_88: CMD = pcm -i $(TARGET_SAMPLES)/aac/am00_88.mp4
 fate-aac-am00_88: REF = $(SAMPLES)/aac/am00_88.s16
 
 FATE_AAC += fate-aac-am05_44
-fate-aac-am05_44: CMD = pcm -i $(SAMPLES)/aac/am05_44.mp4
+fate-aac-am05_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/am05_44.mp4
 fate-aac-am05_44: REF = $(SAMPLES)/aac/am05_44_reorder.s16
 
 FATE_AAC += fate-aac-al_sbr_hq_cm_48_2
-fate-aac-al_sbr_hq_cm_48_2: CMD = pcm -i $(SAMPLES)/aac/al_sbr_cm_48_2.mp4
+fate-aac-al_sbr_hq_cm_48_2: CMD = pcm -i $(TARGET_SAMPLES)/aac/al_sbr_cm_48_2.mp4
 fate-aac-al_sbr_hq_cm_48_2: REF = $(SAMPLES)/aac/al_sbr_hq_cm_48_2.s16
 
 FATE_AAC += fate-aac-al_sbr_hq_cm_48_5.1
-fate-aac-al_sbr_hq_cm_48_5.1: CMD = pcm -i $(SAMPLES)/aac/al_sbr_cm_48_5.1.mp4
+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 $(SAMPLES)/aac/al_sbr_ps_06_new.mp4
+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
 
 FATE_AAC += fate-aac-ap05_48
-fate-aac-ap05_48: CMD = pcm -i $(SAMPLES)/aac/ap05_48.mp4
+fate-aac-ap05_48: CMD = pcm -i $(TARGET_SAMPLES)/aac/ap05_48.mp4
 fate-aac-ap05_48: REF = $(SAMPLES)/aac/ap05_48.s16
 
-fate-aac-ct%: CMD = pcm -i $(SAMPLES)/aac/CT_DecoderCheck/$(@:fate-aac-ct-%=%)
+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.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
+fate-aac-er_eld2000np_48_ep0: REF = $(SAMPLES)/aac/er_eld2000np_48_ep0.s16
+
+
+fate-aac-ct%: CMD = pcm -i $(TARGET_SAMPLES)/aac/CT_DecoderCheck/$(@:fate-aac-ct-%=%)
 fate-aac-ct%: REF = $(SAMPLES)/aac/CT_DecoderCheck/aacPlusv2.wav
 
 FATE_AAC_CT_RAW = fate-aac-ct-sbr_i-ps_i.aac
@@ -65,11 +82,11 @@
 FATE_AAC += $(FATE_AAC_CT:%=fate-aac-ct-%)
 
 FATE_AAC_LATM += fate-aac-latm_000000001180bc60
-fate-aac-latm_000000001180bc60: CMD = pcm -i $(SAMPLES)/aac/latm_000000001180bc60.mpg
+fate-aac-latm_000000001180bc60: CMD = pcm -i $(TARGET_SAMPLES)/aac/latm_000000001180bc60.mpg
 fate-aac-latm_000000001180bc60: REF = $(SAMPLES)/aac/latm_000000001180bc60.s16
 
 FATE_AAC_LATM += fate-aac-latm_stereo_to_51
-fate-aac-latm_stereo_to_51: CMD = pcm -i $(SAMPLES)/aac/latm_stereo_to_51.ts -channel_layout 5.1
+fate-aac-latm_stereo_to_51: CMD = pcm -i $(TARGET_SAMPLES)/aac/latm_stereo_to_51.ts -channel_layout 5.1
 fate-aac-latm_stereo_to_51: REF = $(SAMPLES)/aac/latm_stereo_to_51_ref.s16
 
 FATE_AAC-$(call      DEMDEC, AAC,    AAC)      += $(FATE_AAC_CT_RAW)

libav-v9.6.tar.bz2/tests/fate/ac3.mak -> libav-v10.1.tar.bz2/tests/fate/ac3.mak Changed

@@ -1,46 +1,46 @@
 FATE_AC3 += fate-ac3-2.0
-fate-ac3-2.0: CMD = pcm -i $(SAMPLES)/ac3/monsters_inc_2.0_192_small.ac3
-fate-ac3-2.0: REF = $(SAMPLES)/ac3/monsters_inc_2.0_192_small.pcm
+fate-ac3-2.0: CMD = pcm -i $(TARGET_SAMPLES)/ac3/monsters_inc_2.0_192_small.ac3
+fate-ac3-2.0: REF = $(SAMPLES)/ac3/monsters_inc_2.0_192_small_v2.pcm
 
 FATE_AC3 += fate-ac3-4.0
-fate-ac3-4.0: CMD = pcm -i $(SAMPLES)/ac3/millers_crossing_4.0.ac3
-fate-ac3-4.0: REF = $(SAMPLES)/ac3/millers_crossing_4.0.pcm
+fate-ac3-4.0: CMD = pcm -i $(TARGET_SAMPLES)/ac3/millers_crossing_4.0.ac3
+fate-ac3-4.0: REF = $(SAMPLES)/ac3/millers_crossing_4.0_v2.pcm
 
 FATE_AC3 += fate-ac3-4.0-downmix-mono
-fate-ac3-4.0-downmix-mono: CMD = pcm -request_channels 1 -i $(SAMPLES)/ac3/millers_crossing_4.0.ac3
-fate-ac3-4.0-downmix-mono: REF = $(SAMPLES)/ac3/millers_crossing_4.0_mono.pcm
+fate-ac3-4.0-downmix-mono: CMD = pcm -request_channels 1 -i $(TARGET_SAMPLES)/ac3/millers_crossing_4.0.ac3
+fate-ac3-4.0-downmix-mono: REF = $(SAMPLES)/ac3/millers_crossing_4.0_mono_v2.pcm
 
 FATE_AC3 += fate-ac3-4.0-downmix-stereo
-fate-ac3-4.0-downmix-stereo: CMD = pcm -request_channels 2 -i $(SAMPLES)/ac3/millers_crossing_4.0.ac3
-fate-ac3-4.0-downmix-stereo: REF = $(SAMPLES)/ac3/millers_crossing_4.0_stereo.pcm
+fate-ac3-4.0-downmix-stereo: CMD = pcm -request_channels 2 -i $(TARGET_SAMPLES)/ac3/millers_crossing_4.0.ac3
+fate-ac3-4.0-downmix-stereo: REF = $(SAMPLES)/ac3/millers_crossing_4.0_stereo_v2.pcm
 
 FATE_AC3 += fate-ac3-5.1
-fate-ac3-5.1: CMD = pcm -i $(SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3
-fate-ac3-5.1: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small.pcm
+fate-ac3-5.1: CMD = pcm -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3
+fate-ac3-5.1: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_v2.pcm
 
 FATE_AC3 += fate-ac3-5.1-downmix-mono
-fate-ac3-5.1-downmix-mono: CMD = pcm -request_channels 1 -i $(SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3
-fate-ac3-5.1-downmix-mono: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_mono.pcm
+fate-ac3-5.1-downmix-mono: CMD = pcm -request_channels 1 -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3
+fate-ac3-5.1-downmix-mono: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_mono_v2.pcm
 
 FATE_AC3 += fate-ac3-5.1-downmix-stereo
-fate-ac3-5.1-downmix-stereo: CMD = pcm -request_channels 2 -i $(SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3
-fate-ac3-5.1-downmix-stereo: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_stereo.pcm
+fate-ac3-5.1-downmix-stereo: CMD = pcm -request_channels 2 -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3
+fate-ac3-5.1-downmix-stereo: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_stereo_v2.pcm
 
 FATE_EAC3 += fate-eac3-1
-fate-eac3-1: CMD = pcm -i $(SAMPLES)/eac3/csi_miami_5.1_256_spx_small.eac3
-fate-eac3-1: REF = $(SAMPLES)/eac3/csi_miami_5.1_256_spx_small.pcm
+fate-eac3-1: CMD = pcm -i $(TARGET_SAMPLES)/eac3/csi_miami_5.1_256_spx_small.eac3
+fate-eac3-1: REF = $(SAMPLES)/eac3/csi_miami_5.1_256_spx_small_v2.pcm
 
 FATE_EAC3 += fate-eac3-2
-fate-eac3-2: CMD = pcm -i $(SAMPLES)/eac3/csi_miami_stereo_128_spx_small.eac3
-fate-eac3-2: REF = $(SAMPLES)/eac3/csi_miami_stereo_128_spx_small.pcm
+fate-eac3-2: CMD = pcm -i $(TARGET_SAMPLES)/eac3/csi_miami_stereo_128_spx_small.eac3
+fate-eac3-2: REF = $(SAMPLES)/eac3/csi_miami_stereo_128_spx_small_v2.pcm
 
 FATE_EAC3 += fate-eac3-3
-fate-eac3-3: CMD = pcm -i $(SAMPLES)/eac3/matrix2_commentary1_stereo_192_small.eac3
-fate-eac3-3: REF = $(SAMPLES)/eac3/matrix2_commentary1_stereo_192_small.pcm
+fate-eac3-3: CMD = pcm -i $(TARGET_SAMPLES)/eac3/matrix2_commentary1_stereo_192_small.eac3
+fate-eac3-3: REF = $(SAMPLES)/eac3/matrix2_commentary1_stereo_192_small_v2.pcm
 
 FATE_EAC3 += fate-eac3-4
-fate-eac3-4: CMD = pcm -i $(SAMPLES)/eac3/serenity_english_5.1_1536_small.eac3
-fate-eac3-4: REF = $(SAMPLES)/eac3/serenity_english_5.1_1536_small.pcm
+fate-eac3-4: CMD = pcm -i $(TARGET_SAMPLES)/eac3/serenity_english_5.1_1536_small.eac3
+fate-eac3-4: REF = $(SAMPLES)/eac3/serenity_english_5.1_1536_small_v2.pcm
 
 $(FATE_AC3) $(FATE_EAC3): CMP = oneoff
 
@@ -48,18 +48,16 @@
 FATE_EAC3-$(call DEMDEC, EAC3, EAC3) += $(FATE_EAC3)
 
 FATE_AC3-$(call ENCDEC, AC3, AC3) += fate-ac3-encode
-fate-ac3-encode: CMD = enc_dec_pcm ac3 wav s16le $(REF) -c:a ac3 -b:a 128k
+fate-ac3-encode: CMD = enc_dec_pcm ac3 wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c:a ac3 -b:a 128k
 fate-ac3-encode: CMP_SHIFT = -1024
-fate-ac3-encode: CMP_TARGET = 399.62
+fate-ac3-encode: CMP_TARGET = 404.53
 fate-ac3-encode: SIZE_TOLERANCE = 488
-fate-ac3-encode: FUZZ = 3
 
 FATE_EAC3-$(call ENCDEC, EAC3, EAC3) += fate-eac3-encode
-fate-eac3-encode: CMD = enc_dec_pcm eac3 wav s16le $(REF) -c:a eac3 -b:a 128k
+fate-eac3-encode: CMD = enc_dec_pcm eac3 wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c:a eac3 -b:a 128k
 fate-eac3-encode: CMP_SHIFT = -1024
-fate-eac3-encode: CMP_TARGET = 514.02
+fate-eac3-encode: CMP_TARGET = 516.94
 fate-eac3-encode: SIZE_TOLERANCE = 488
-fate-eac3-encode: FUZZ = 3
 
 fate-ac3-encode fate-eac3-encode: CMP = stddev
 fate-ac3-encode fate-eac3-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav

libav-v9.6.tar.bz2/tests/fate/adpcm.mak -> libav-v10.1.tar.bz2/tests/fate/adpcm.mak Changed

@@ -1,74 +1,74 @@
 FATE_ADPCM-$(call DEMDEC, WAV, ADPCM_CT) += fate-adpcm-creative
-fate-adpcm-creative: CMD = md5 -i $(SAMPLES)/creative/intro-partial.wav -f s16le
+fate-adpcm-creative: CMD = md5 -i $(TARGET_SAMPLES)/creative/intro-partial.wav -f s16le
 
 FATE_ADPCM-$(call DEMDEC, VOC, ADPCM_SBPRO_2) += fate-adpcm-creative-8-2bit
-fate-adpcm-creative-8-2bit: CMD = md5 -i $(SAMPLES)/creative/BBC_2BIT.VOC -f s16le
+fate-adpcm-creative-8-2bit: CMD = md5 -i $(TARGET_SAMPLES)/creative/BBC_2BIT.VOC -f s16le
 
 FATE_ADPCM-$(call DEMDEC, VOC, ADPCM_SBPRO_3) += fate-adpcm-creative-8-2.6bit
-fate-adpcm-creative-8-2.6bit: CMD = md5 -i $(SAMPLES)/creative/BBC_3BIT.VOC -f s16le
+fate-adpcm-creative-8-2.6bit: CMD = md5 -i $(TARGET_SAMPLES)/creative/BBC_3BIT.VOC -f s16le
 
 FATE_ADPCM-$(call DEMDEC, VOC, ADPCM_SBPRO_4) += fate-adpcm-creative-8-4bit
-fate-adpcm-creative-8-4bit: CMD = md5 -i $(SAMPLES)/creative/BBC_4BIT.VOC -f s16le
+fate-adpcm-creative-8-4bit: CMD = md5 -i $(TARGET_SAMPLES)/creative/BBC_4BIT.VOC -f s16le
 
 FATE_ADPCM-$(call DEMDEC, EA, ADPCM_EA) += fate-adpcm-ea-1
-fate-adpcm-ea-1: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:a 26 -vn
+fate-adpcm-ea-1: CMD = framecrc -i $(TARGET_SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:a 26 -vn
 
 FATE_ADPCM-$(call DEMDEC, EA, ADPCM_EA) += fate-adpcm-ea-2
-fate-adpcm-ea-2: CMD = framecrc -i $(SAMPLES)/ea-dct/NFS2Esprit-partial.dct -vn
+fate-adpcm-ea-2: CMD = framecrc -i $(TARGET_SAMPLES)/ea-dct/NFS2Esprit-partial.dct -vn
 
 FATE_ADPCM-$(call DEMDEC, XA, ADPCM_EA_MAXIS_XA) += fate-adpcm-ea-maxis-xa
-fate-adpcm-ea-maxis-xa: CMD = framecrc -i $(SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30
+fate-adpcm-ea-maxis-xa: CMD = framecrc -i $(TARGET_SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30
 
 FATE_ADPCM-$(call DEMDEC, EA, ADPCM_EA_R1) += fate-adpcm-ea-r1
-fate-adpcm-ea-r1: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad -vn
+fate-adpcm-ea-r1: CMD = framecrc -i $(TARGET_SAMPLES)/ea-mad/NFS6LogoE.mad -vn
 
 FATE_ADPCM-$(call DEMDEC, EA, ADPCM_EA_R2) += fate-adpcm-ea-r2
-fate-adpcm-ea-r2: CMD = crc -i $(SAMPLES)/ea-mpc/THX_logo.mpc -vn
+fate-adpcm-ea-r2: CMD = crc -i $(TARGET_SAMPLES)/ea-mpc/THX_logo.mpc -vn
 
 FATE_ADPCM-$(call DEMDEC, EA, ADPCM_EA_R3) += fate-adpcm-ea-r3
-fate-adpcm-ea-r3: CMD = crc -i $(SAMPLES)/ea-vp6/THX_logo.vp6 -vn
+fate-adpcm-ea-r3: CMD = crc -i $(TARGET_SAMPLES)/ea-vp6/THX_logo.vp6 -vn
 
 FATE_ADPCM-$(call DEMDEC, AVI, ADPCM_IMA_AMV) += fate-adpcm-ima-amv
-fate-adpcm-ima-amv: CMD = framecrc -i $(SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -vn
+fate-adpcm-ima-amv: CMD = framecrc -i $(TARGET_SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -vn
 
 FATE_ADPCM-$(call DEMDEC, APC, ADPCM_IMA_APC) += fate-adpcm-ima-apc
-fate-adpcm-ima-apc: CMD = md5 -i $(SAMPLES)/cryo-apc/cine007.APC -f s16le
+fate-adpcm-ima-apc: CMD = md5 -i $(TARGET_SAMPLES)/cryo-apc/cine007.APC -f s16le
 
 FATE_ADPCM-$(call DEMDEC, AVI, ADPCM_IMA_DK3) += fate-adpcm-ima-dk3
-fate-adpcm-ima-dk3: CMD = md5 -i $(SAMPLES)/duck/sop-audio-only.avi -f s16le
+fate-adpcm-ima-dk3: CMD = md5 -i $(TARGET_SAMPLES)/duck/sop-audio-only.avi -f s16le
 
 FATE_ADPCM-$(call DEMDEC, AVI, ADPCM_IMA_DK4) += fate-adpcm-ima-dk4
-fate-adpcm-ima-dk4: CMD = md5 -i $(SAMPLES)/duck/salsa-audio-only.avi -f s16le
+fate-adpcm-ima-dk4: CMD = md5 -i $(TARGET_SAMPLES)/duck/salsa-audio-only.avi -f s16le
 
 FATE_ADPCM-$(call DEMDEC, EA, ADPCM_IMA_EA_EACS) += fate-adpcm-ima-ea-eacs
-fate-adpcm-ima-ea-eacs: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTRO8K-partial.TGV -vn
+fate-adpcm-ima-ea-eacs: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgv/INTRO8K-partial.TGV -vn
 
 FATE_ADPCM-$(call DEMDEC, EA, ADPCM_IMA_EA_SEAD) += fate-adpcm-ima-ea-sead
-fate-adpcm-ima-ea-sead: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -vn
+fate-adpcm-ima-ea-sead: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgv/INTEL_S.TGV -vn
 
 FATE_ADPCM-$(call DEMDEC, ISS, ADPCM_IMA_ISS) += fate-adpcm-ima-iss
-fate-adpcm-ima-iss: CMD = md5 -i $(SAMPLES)/funcom-iss/0004010100.iss -f s16le
+fate-adpcm-ima-iss: CMD = md5 -i $(TARGET_SAMPLES)/funcom-iss/0004010100.iss -f s16le
 
 FATE_ADPCM-$(call DEMDEC, SMJPEG, ADPCM_IMA_SMJPEG) += fate-adpcm-ima-smjpeg
-fate-adpcm-ima-smjpeg: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -vn
+fate-adpcm-ima-smjpeg: CMD = framecrc -i $(TARGET_SAMPLES)/smjpeg/scenwin.mjpg -vn
 
 FATE_ADPCM-$(call DEMDEC, MOV, ADPCM_IMA_WAV) += fate-adpcm-ima_wav-stereo
-fate-adpcm-ima_wav-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms11.mov -f s16le
+fate-adpcm-ima_wav-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-L-ms11.mov -f s16le
 
 FATE_ADPCM-$(call DEMDEC, WSVQA, ADPCM_IMA_WS) += fate-adpcm-ima-ws
-fate-adpcm-ima-ws: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -vn
+fate-adpcm-ima-ws: CMD = framecrc -i $(TARGET_SAMPLES)/vqa/cc-demo1-partial.vqa -vn
 
 FATE_ADPCM-$(call DEMDEC, DXA, ADPCM_MS) += fate-adpcm-ms-mono
-fate-adpcm-ms-mono: CMD = framecrc -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -vn
+fate-adpcm-ms-mono: CMD = framecrc -i $(TARGET_SAMPLES)/dxa/meetsquid.dxa -t 2 -vn
 
 FATE_ADPCM-$(call DEMDEC, MOV, ADPCM_MS) += fate-adpcm_ms-stereo
-fate-adpcm_ms-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms02.mov -f s16le
+fate-adpcm_ms-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-L-ms02.mov -f s16le
 
 FATE_ADPCM-$(call DEMDEC, THP, ADPCM_THP) += fate-adpcm-thp
-fate-adpcm-thp: CMD = framecrc -i $(SAMPLES)/thp/pikmin2-opening1-partial.thp -vn
+fate-adpcm-thp: CMD = framecrc -i $(TARGET_SAMPLES)/thp/pikmin2-opening1-partial.thp -vn
 
 FATE_ADPCM-$(call DEMDEC, STR, ADPCM_XA) += fate-adpcm-xa
-fate-adpcm-xa: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -vn
+fate-adpcm-xa: CMD = framecrc -i $(TARGET_SAMPLES)/psx-str/abc000_cut.str -vn
 
 FATE_SAMPLES_AVCONV += $(FATE_ADPCM-yes)
 fate-adpcm: $(FATE_ADPCM-yes)

libav-v9.6.tar.bz2/tests/fate/alac.mak -> libav-v10.1.tar.bz2/tests/fate/alac.mak Changed

libav-v9.6.tar.bz2/tests/fate/als.mak -> libav-v10.1.tar.bz2/tests/fate/als.mak Changed

libav-v9.6.tar.bz2/tests/fate/amrnb.mak -> libav-v10.1.tar.bz2/tests/fate/amrnb.mak Changed

@@ -1,33 +1,33 @@
 FATE_AMRNB += fate-amrnb-4k75
-fate-amrnb-4k75: CMD = pcm -i $(SAMPLES)/amrnb/4.75k.amr
+fate-amrnb-4k75: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/4.75k.amr
 fate-amrnb-4k75: REF = $(SAMPLES)/amrnb/4.75k.pcm
 
 FATE_AMRNB += fate-amrnb-5k15
-fate-amrnb-5k15: CMD = pcm -i $(SAMPLES)/amrnb/5.15k.amr
+fate-amrnb-5k15: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/5.15k.amr
 fate-amrnb-5k15: REF = $(SAMPLES)/amrnb/5.15k.pcm
 
 FATE_AMRNB += fate-amrnb-5k9
-fate-amrnb-5k9: CMD = pcm -i $(SAMPLES)/amrnb/5.9k.amr
+fate-amrnb-5k9: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/5.9k.amr
 fate-amrnb-5k9: REF = $(SAMPLES)/amrnb/5.9k.pcm
 
 FATE_AMRNB += fate-amrnb-6k7
-fate-amrnb-6k7: CMD = pcm -i $(SAMPLES)/amrnb/6.7k.amr
+fate-amrnb-6k7: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/6.7k.amr
 fate-amrnb-6k7: REF = $(SAMPLES)/amrnb/6.7k.pcm
 
 FATE_AMRNB += fate-amrnb-7k4
-fate-amrnb-7k4: CMD = pcm -i $(SAMPLES)/amrnb/7.4k.amr
+fate-amrnb-7k4: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/7.4k.amr
 fate-amrnb-7k4: REF = $(SAMPLES)/amrnb/7.4k.pcm
 
 FATE_AMRNB += fate-amrnb-7k95
-fate-amrnb-7k95: CMD = pcm -i $(SAMPLES)/amrnb/7.95k.amr
+fate-amrnb-7k95: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/7.95k.amr
 fate-amrnb-7k95: REF = $(SAMPLES)/amrnb/7.95k.pcm
 
 FATE_AMRNB += fate-amrnb-10k2
-fate-amrnb-10k2: CMD = pcm -i $(SAMPLES)/amrnb/10.2k.amr
+fate-amrnb-10k2: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/10.2k.amr
 fate-amrnb-10k2: REF = $(SAMPLES)/amrnb/10.2k.pcm
 
 FATE_AMRNB += fate-amrnb-12k2
-fate-amrnb-12k2: CMD = pcm -i $(SAMPLES)/amrnb/12.2k.amr
+fate-amrnb-12k2: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/12.2k.amr
 fate-amrnb-12k2: REF = $(SAMPLES)/amrnb/12.2k.pcm
 
 $(FATE_AMRNB): CMP = stddev

libav-v9.6.tar.bz2/tests/fate/amrwb.mak -> libav-v10.1.tar.bz2/tests/fate/amrwb.mak Changed

@@ -1,44 +1,44 @@
 FATE_AMRWB += fate-amrwb-6k60
-fate-amrwb-6k60: CMD = pcm -i $(SAMPLES)/amrwb/seed-6k60.awb
+fate-amrwb-6k60: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-6k60.awb
 fate-amrwb-6k60: REF = $(SAMPLES)/amrwb/seed-6k60.pcm
 
 FATE_AMRWB += fate-amrwb-8k85
-fate-amrwb-8k85: CMD = pcm -i $(SAMPLES)/amrwb/seed-8k85.awb
+fate-amrwb-8k85: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-8k85.awb
 fate-amrwb-8k85: REF = $(SAMPLES)/amrwb/seed-8k85.pcm
 
 FATE_AMRWB += fate-amrwb-12k65
-fate-amrwb-12k65: CMD = pcm -i $(SAMPLES)/amrwb/seed-12k65.awb
+fate-amrwb-12k65: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-12k65.awb
 fate-amrwb-12k65: REF = $(SAMPLES)/amrwb/seed-12k65.pcm
 
 FATE_AMRWB += fate-amrwb-14k25
-fate-amrwb-14k25: CMD = pcm -i $(SAMPLES)/amrwb/seed-14k25.awb
+fate-amrwb-14k25: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-14k25.awb
 fate-amrwb-14k25: REF = $(SAMPLES)/amrwb/seed-14k25.pcm
 fate-amrwb-14k25: FUZZ = 2.6
 
 FATE_AMRWB += fate-amrwb-15k85
-fate-amrwb-15k85: CMD = pcm -i $(SAMPLES)/amrwb/seed-15k85.awb
+fate-amrwb-15k85: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-15k85.awb
 fate-amrwb-15k85: REF = $(SAMPLES)/amrwb/seed-15k85.pcm
 
 FATE_AMRWB += fate-amrwb-18k25
-fate-amrwb-18k25: CMD = pcm -i $(SAMPLES)/amrwb/seed-18k25.awb
+fate-amrwb-18k25: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-18k25.awb
 fate-amrwb-18k25: REF = $(SAMPLES)/amrwb/seed-18k25.pcm
 
 FATE_AMRWB += fate-amrwb-19k85
-fate-amrwb-19k85: CMD = pcm -i $(SAMPLES)/amrwb/seed-19k85.awb
+fate-amrwb-19k85: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-19k85.awb
 fate-amrwb-19k85: REF = $(SAMPLES)/amrwb/seed-19k85.pcm
 
 FATE_AMRWB += fate-amrwb-23k05
-fate-amrwb-23k05: CMD = pcm -i $(SAMPLES)/amrwb/seed-23k05.awb
+fate-amrwb-23k05: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-23k05.awb
 fate-amrwb-23k05: REF = $(SAMPLES)/amrwb/seed-23k05.pcm
 fate-amrwb-23k05: FUZZ = 2
 
 FATE_AMRWB += fate-amrwb-23k85
-fate-amrwb-23k85: CMD = pcm -i $(SAMPLES)/amrwb/seed-23k85.awb
+fate-amrwb-23k85: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-23k85.awb
 fate-amrwb-23k85: REF = $(SAMPLES)/amrwb/seed-23k85.pcm
 fate-amrwb-23k85: FUZZ = 2
 
 FATE_AMRWB += fate-amrwb-23k85-2
-fate-amrwb-23k85-2: CMD = pcm -i $(SAMPLES)/amrwb/deus-23k85.awb
+fate-amrwb-23k85-2: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/deus-23k85.awb
 fate-amrwb-23k85-2: REF = $(SAMPLES)/amrwb/deus-23k85.pcm
 
 $(FATE_AMRWB): CMP = stddev

libav-v9.6.tar.bz2/tests/fate/atrac.mak -> libav-v10.1.tar.bz2/tests/fate/atrac.mak Changed

@@ -1,17 +1,17 @@
 FATE_ATRAC1-$(call DEMDEC, AEA, ATRAC1) += fate-atrac1
-fate-atrac1: CMD = pcm -i $(SAMPLES)/atrac1/test_tones_small.aea
+fate-atrac1: CMD = pcm -i $(TARGET_SAMPLES)/atrac1/test_tones_small.aea
 fate-atrac1: REF = $(SAMPLES)/atrac1/test_tones_small.pcm
 
 FATE_ATRAC3 += fate-atrac3-1
-fate-atrac3-1: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_066_small.wav
+fate-atrac3-1: CMD = pcm -i $(TARGET_SAMPLES)/atrac3/mc_sich_at3_066_small.wav
 fate-atrac3-1: REF = $(SAMPLES)/atrac3/mc_sich_at3_066_small.pcm
 
 FATE_ATRAC3 += fate-atrac3-2
-fate-atrac3-2: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_105_small.wav
+fate-atrac3-2: CMD = pcm -i $(TARGET_SAMPLES)/atrac3/mc_sich_at3_105_small.wav
 fate-atrac3-2: REF = $(SAMPLES)/atrac3/mc_sich_at3_105_small.pcm
 
 FATE_ATRAC3 += fate-atrac3-3
-fate-atrac3-3: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_132_small.wav
+fate-atrac3-3: CMD = pcm -i $(TARGET_SAMPLES)/atrac3/mc_sich_at3_132_small.wav
 fate-atrac3-3: REF = $(SAMPLES)/atrac3/mc_sich_at3_132_small.pcm
 
 FATE_ATRAC3-$(call DEMDEC, WAV, ATRAC3) += $(FATE_ATRAC3)

libav-v9.6.tar.bz2/tests/fate/audio.mak -> libav-v10.1.tar.bz2/tests/fate/audio.mak Changed

@@ -1,10 +1,10 @@
 FATE_BINKAUDIO-$(call DEMDEC, BINK, BINKAUDIO_DCT) += fate-binkaudio-dct
-fate-binkaudio-dct: CMD = pcm -i $(SAMPLES)/bink/binkaudio_dct.bik
+fate-binkaudio-dct: CMD = pcm -i $(TARGET_SAMPLES)/bink/binkaudio_dct.bik
 fate-binkaudio-dct: REF = $(SAMPLES)/bink/binkaudio_dct.pcm
 fate-binkaudio-dct: FUZZ = 2
 
 FATE_BINKAUDIO-$(call DEMDEC, BINK, BINKAUDIO_RDFT) += fate-binkaudio-rdft
-fate-binkaudio-rdft: CMD = pcm -i $(SAMPLES)/bink/binkaudio_rdft.bik
+fate-binkaudio-rdft: CMD = pcm -i $(TARGET_SAMPLES)/bink/binkaudio_rdft.bik
 fate-binkaudio-rdft: REF = $(SAMPLES)/bink/binkaudio_rdft.pcm
 fate-binkaudio-rdft: FUZZ = 2
 
@@ -14,31 +14,31 @@
 fate-binkaudio: $(FATE_BINKAUDIO-yes)
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, BMV, BMV_AUDIO) += fate-bmv-audio
-fate-bmv-audio: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -vn
+fate-bmv-audio: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -vn
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, DSICIN, DSICINAUDIO) += fate-delphine-cin-audio
-fate-delphine-cin-audio: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -vn
+fate-delphine-cin-audio: CMD = framecrc -i $(TARGET_SAMPLES)/delphine-cin/LOGO-partial.CIN -vn
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MPEGTS, DCA) += fate-dts
-fate-dts: CMD = pcm -i $(SAMPLES)/dts/dts.ts
+fate-dts: CMD = pcm -i $(TARGET_SAMPLES)/dts/dts.ts
 fate-dts: CMP = oneoff
 fate-dts: REF = $(SAMPLES)/dts/dts.pcm
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, IMC) += fate-imc
-fate-imc: CMD = pcm -i $(SAMPLES)/imc/imc.avi
+fate-imc: CMD = pcm -i $(TARGET_SAMPLES)/imc/imc.avi
 fate-imc: CMP = oneoff
 fate-imc: REF = $(SAMPLES)/imc/imc.pcm
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, FLV, NELLYMOSER) += fate-nellymoser
-fate-nellymoser: CMD = pcm -i $(SAMPLES)/nellymoser/nellymoser.flv
+fate-nellymoser: CMD = pcm -i $(TARGET_SAMPLES)/nellymoser/nellymoser.flv
 fate-nellymoser: CMP = oneoff
 fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, VMD, VMDAUDIO) += fate-sierra-vmd-audio
-fate-sierra-vmd-audio: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -vn
+fate-sierra-vmd-audio: CMD = framecrc -i $(TARGET_SAMPLES)/vmd/12.vmd -vn
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, SMACKER, SMACKAUD) += fate-smacker-audio
-fate-smacker-audio: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -vn
+fate-smacker-audio: CMD = framecrc -i $(TARGET_SAMPLES)/smacker/wetlogo.smk -vn
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, WSVQA, WS_SND1) += fate-ws_snd
-fate-ws_snd: CMD = md5 -i $(SAMPLES)/vqa/ws_snd.vqa -f s16le
+fate-ws_snd: CMD = md5 -i $(TARGET_SAMPLES)/vqa/ws_snd.vqa -f s16le

libav-v9.6.tar.bz2/tests/fate/bmp.mak -> libav-v10.1.tar.bz2/tests/fate/bmp.mak Changed

@@ -1,41 +1,41 @@
 FATE_BMP += fate-bmp-1bit
-fate-bmp-1bit: CMD = framecrc -i $(SAMPLES)/bmp/test1.bmp -pix_fmt rgb24
+fate-bmp-1bit: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test1.bmp -pix_fmt rgb24
 
 FATE_BMP += fate-bmp-4bit
-fate-bmp-4bit: CMD = framecrc -i $(SAMPLES)/bmp/test4.bmp -pix_fmt rgb24
+fate-bmp-4bit: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test4.bmp -pix_fmt rgb24
 
 FATE_BMP += fate-bmp-4bit-os2
-fate-bmp-4bit-os2: CMD = framecrc -i $(SAMPLES)/bmp/test4os2v2.bmp -pix_fmt rgb24
+fate-bmp-4bit-os2: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test4os2v2.bmp -pix_fmt rgb24
 
 FATE_BMP += fate-bmp-8bit
-fate-bmp-8bit: CMD = framecrc -i $(SAMPLES)/bmp/test8.bmp -pix_fmt rgb24
+fate-bmp-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test8.bmp -pix_fmt rgb24
 
 FATE_BMP += fate-bmp-8bit-os2
-fate-bmp-8bit-os2: CMD = framecrc -i $(SAMPLES)/bmp/test8os2.bmp -pix_fmt rgb24
+fate-bmp-8bit-os2: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test8os2.bmp -pix_fmt rgb24
 
 FATE_BMP += fate-bmp-15bit
-fate-bmp-15bit: CMD = framecrc -i $(SAMPLES)/bmp/test16.bmp -pix_fmt rgb555le
+fate-bmp-15bit: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test16.bmp -pix_fmt rgb555le
 
 FATE_BMP += fate-bmp-15bit-mask
-fate-bmp-15bit-mask: CMD = framecrc -i $(SAMPLES)/bmp/test16bf555.bmp -pix_fmt rgb555le
+fate-bmp-15bit-mask: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test16bf555.bmp -pix_fmt rgb555le
 
 FATE_BMP += fate-bmp-16bit-mask
-fate-bmp-16bit-mask: CMD = framecrc -i $(SAMPLES)/bmp/test16bf565.bmp -pix_fmt rgb565le
+fate-bmp-16bit-mask: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test16bf565.bmp -pix_fmt rgb565le
 
 FATE_BMP += fate-bmp-24bit
-fate-bmp-24bit: CMD = framecrc -i $(SAMPLES)/bmp/test24.bmp
+fate-bmp-24bit: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test24.bmp
 
 FATE_BMP += fate-bmp-32bit
-fate-bmp-32bit: CMD = framecrc -i $(SAMPLES)/bmp/test32.bmp -pix_fmt bgr24
+fate-bmp-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test32.bmp -pix_fmt bgr24
 
 FATE_BMP += fate-bmp-32bit-mask
-fate-bmp-32bit-mask: CMD = framecrc -i $(SAMPLES)/bmp/test32bf.bmp -pix_fmt bgr24
+fate-bmp-32bit-mask: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test32bf.bmp -pix_fmt bgr24
 
 FATE_BMP += fate-bmp-rle4
-fate-bmp-rle4: CMD = framecrc -i $(SAMPLES)/bmp/testcompress4.bmp -pix_fmt rgb24
+fate-bmp-rle4: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/testcompress4.bmp -pix_fmt rgb24
 
 FATE_BMP += fate-bmp-rle8
-fate-bmp-rle8: CMD = framecrc -i $(SAMPLES)/bmp/testcompress8.bmp -pix_fmt rgb24
+fate-bmp-rle8: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/testcompress8.bmp -pix_fmt rgb24
 
 FATE_BMP-$(call DEMDEC, IMAGE2, BMP) += $(FATE_BMP)

libav-v9.6.tar.bz2/tests/fate/cdxl.mak -> libav-v10.1.tar.bz2/tests/fate/cdxl.mak Changed

@@ -1,17 +1,17 @@
+FATE_CDXL += fate-cdxl-bitline-ham6
+fate-cdxl-bitline-ham6: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/bitline.cdxl -frames:v 10
+
 FATE_CDXL += fate-cdxl-ham6
-fate-cdxl-ham6: CMD = framecrc -i $(SAMPLES)/cdxl/cat.cdxl -an -frames:v 16
+fate-cdxl-ham6: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/cat.cdxl -an -frames:v 16
 
 FATE_CDXL += fate-cdxl-ham8
-fate-cdxl-ham8: CMD = framecrc -i $(SAMPLES)/cdxl/mirage.cdxl -an -frames:v 1
+fate-cdxl-ham8: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/mirage.cdxl -an -frames:v 1
 
 FATE_CDXL += fate-cdxl-pal8
-fate-cdxl-pal8: CMD = framecrc -i $(SAMPLES)/cdxl/maku.cdxl -pix_fmt rgb24 -frames:v 11
+fate-cdxl-pal8: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/maku.cdxl -pix_fmt rgb24 -frames:v 11
 
 FATE_CDXL += fate-cdxl-pal8-small
-fate-cdxl-pal8-small: CMD = framecrc -i $(SAMPLES)/cdxl/fruit.cdxl -an -pix_fmt rgb24 -frames:v 46
-
-FATE_CDXL += fate-cdxl-bitline-ham6
-fate-cdxl-bitline-ham6: CMD = framecrc -i $(SAMPLES)/cdxl/bitline.cdxl -frames:v 10
+fate-cdxl-pal8-small: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/fruit.cdxl -an -pix_fmt rgb24 -frames:v 46
 
 FATE_CDXL-$(call DEMDEC, CDXL, CDXL) += $(FATE_CDXL)

libav-v9.6.tar.bz2/tests/fate/cover-art.mak -> libav-v10.1.tar.bz2/tests/fate/cover-art.mak Changed

@@ -1,21 +1,33 @@
 FATE_COVER_ART += fate-cover-art-ape
-fate-cover-art-ape: CMD = md5 -i $(SAMPLES)/cover_art/luckynight_cover.ape -an -c:v copy -f rawvideo
+fate-cover-art-ape: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/luckynight_cover.ape -an -c:v copy -f rawvideo
 fate-cover-art-ape: REF = 45333c983c45af54449dff10af144317
 
 FATE_COVER_ART += fate-cover-art-flac
-fate-cover-art-flac: CMD = md5 -i $(SAMPLES)/cover_art/cover_art.flac -an -c:v copy -f rawvideo
+fate-cover-art-flac: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/cover_art.flac -an -c:v copy -f rawvideo
 fate-cover-art-flac: REF = 0de1fc6200596fa32b8f7300a14c0261
 
 FATE_COVER_ART += fate-cover-art-m4a
-fate-cover-art-m4a: CMD = md5 -i $(SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a -an -c:v copy -f rawvideo
+fate-cover-art-m4a: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a -an -c:v copy -f rawvideo
 fate-cover-art-m4a: REF = 08ba70a3b594ff6345a93965e96a9d3e
 
+FATE_COVER_ART += fate-cover-art-ogg
+fate-cover-art-ogg: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/ogg_vorbiscomment_cover.opus -an -c:v copy -f rawvideo
+fate-cover-art-ogg: REF = b796d33363dbfed1868523b5c751b7b1
+
 FATE_COVER_ART += fate-cover-art-wma
-fate-cover-art-wma: CMD = md5 -i $(SAMPLES)/cover_art/Californication_cover.wma -an -c:v copy -f rawvideo
+fate-cover-art-wma: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/Californication_cover.wma -an -c:v copy -f rawvideo
 fate-cover-art-wma: REF = 0808bd0e1b61542a16e1906812dd924b
 
+FATE_COVER_ART += fate-cover-art-wma-id3
+fate-cover-art-wma-id3: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/wma_with_ID3_APIC_trimmed.wma -an -c:v copy -f rawvideo
+fate-cover-art-wma-id3: REF = e6a8dd03687d5178bc13fc7d3316696e
+
+FATE_COVER_ART += fate-cover-art-wma-metadatalib
+fate-cover-art-wma-metadatalib: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/wma_with_metadata_library_object_tag_trimmed.wma -map 0:v -c:v copy -f rawvideo
+fate-cover-art-wma-metadatalib: REF = 32e8bd4fad546f63d881a0256f083aea
+
 FATE_COVER_ART += fate-cover-art-wv
-fate-cover-art-wv: CMD = md5 -i $(SAMPLES)/cover_art/luckynight_cover.wv -an -c:v copy -f rawvideo
+fate-cover-art-wv: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/luckynight_cover.wv -an -c:v copy -f rawvideo
 fate-cover-art-wv: REF = 45333c983c45af54449dff10af144317
 
 $(FATE_COVER_ART): CMP = oneline

libav-v9.6.tar.bz2/tests/fate/demux.mak -> libav-v10.1.tar.bz2/tests/fate/demux.mak Changed

@@ -1,71 +1,71 @@
 FATE_SAMPLES_AVCONV-$(CONFIG_AAC_DEMUXER) += fate-adts-demux
-fate-adts-demux: CMD = crc -i $(SAMPLES)/aac/ct_faac-adts.aac -acodec copy
+fate-adts-demux: CMD = crc -i $(TARGET_SAMPLES)/aac/ct_faac-adts.aac -acodec copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_AEA_DEMUXER) += fate-aea-demux
-fate-aea-demux: CMD = crc -i $(SAMPLES)/aea/chirp.aea -acodec copy
+fate-aea-demux: CMD = crc -i $(TARGET_SAMPLES)/aea/chirp.aea -acodec copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_BINK_DEMUXER) += fate-bink-demux
-fate-bink-demux: CMD = crc -i $(SAMPLES)/bink/Snd0a7d9b58.dee -vn -acodec copy
+fate-bink-demux: CMD = crc -i $(TARGET_SAMPLES)/bink/Snd0a7d9b58.dee -vn -acodec copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_CAF_DEMUXER) += fate-caf
-fate-caf: CMD = crc -i $(SAMPLES)/caf/caf-pcm16.caf -c copy
+fate-caf: CMD = crc -i $(TARGET_SAMPLES)/caf/caf-pcm16.caf -c copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_CDXL_DEMUXER) += fate-cdxl-demux
-fate-cdxl-demux: CMD = framecrc -i $(SAMPLES)/cdxl/mirage.cdxl -vcodec copy -acodec copy
+fate-cdxl-demux: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/mirage.cdxl -vcodec copy -acodec copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_DAUD_DEMUXER) += fate-d-cinema-demux
-fate-d-cinema-demux: CMD = framecrc -i $(SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy
+fate-d-cinema-demux: CMD = framecrc -i $(TARGET_SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_IV8_DEMUXER) += fate-iv8-demux
-fate-iv8-demux: CMD = framecrc -i $(SAMPLES)/iv8/zzz-partial.mpg -vcodec copy
+fate-iv8-demux: CMD = framecrc -i $(TARGET_SAMPLES)/iv8/zzz-partial.mpg -vcodec copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_LMLM4_DEMUXER) += fate-lmlm4-demux
-fate-lmlm4-demux: CMD = framecrc -i $(SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t 3 -acodec copy -vcodec copy
+fate-lmlm4-demux: CMD = framecrc -i $(TARGET_SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t 3 -acodec copy -vcodec copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_XA_DEMUXER) += fate-maxis-xa
-fate-maxis-xa: CMD = framecrc -i $(SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30 -c:a copy
+fate-maxis-xa: CMD = framecrc -i $(TARGET_SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30 -c:a copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_MTV_DEMUXER) += fate-mtv
-fate-mtv: CMD = framecrc -i $(SAMPLES)/mtv/comedian_auto-partial.mtv -c copy
+fate-mtv: CMD = framecrc -i $(TARGET_SAMPLES)/mtv/comedian_auto-partial.mtv -c copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_MXF_DEMUXER) += fate-mxf-demux
-fate-mxf-demux: CMD = framecrc -i $(SAMPLES)/mxf/C0023S01.mxf -acodec copy -vcodec copy
+fate-mxf-demux: CMD = framecrc -i $(TARGET_SAMPLES)/mxf/C0023S01.mxf -acodec copy -vcodec copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_NC_DEMUXER) += fate-nc-demux
-fate-nc-demux: CMD = framecrc -i $(SAMPLES)/nc-camera/nc-sample-partial -vcodec copy
+fate-nc-demux: CMD = framecrc -i $(TARGET_SAMPLES)/nc-camera/nc-sample-partial -vcodec copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_NSV_DEMUXER) += fate-nsv-demux
-fate-nsv-demux: CMD = framecrc -i $(SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -vcodec copy -acodec copy
+fate-nsv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -vcodec copy -acodec copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_OMA_DEMUXER) += fate-oma-demux
-fate-oma-demux: CMD = crc -i $(SAMPLES)/oma/01-Untitled-partial.oma -acodec copy
+fate-oma-demux: CMD = crc -i $(TARGET_SAMPLES)/oma/01-Untitled-partial.oma -acodec copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_STR_DEMUXER) += fate-psx-str-demux
-fate-psx-str-demux: CMD = framecrc -i $(SAMPLES)/psx-str/descent-partial.str -c copy
+fate-psx-str-demux: CMD = framecrc -i $(TARGET_SAMPLES)/psx-str/descent-partial.str -c copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_PVA_DEMUXER) += fate-pva-demux
-fate-pva-demux: CMD = framecrc -idct simple -i $(SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -acodec copy -vn
+fate-pva-demux: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -acodec copy -vn
 
 FATE_SAMPLES_AVCONV-$(CONFIG_QCP_DEMUXER) += fate-qcp-demux
-fate-qcp-demux: CMD = crc -i $(SAMPLES)/qcp/0036580847.QCP -acodec copy
+fate-qcp-demux: CMD = crc -i $(TARGET_SAMPLES)/qcp/0036580847.QCP -acodec copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_R3D_DEMUXER) += fate-redcode-demux
-fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec copy -acodec copy
+fate-redcode-demux: CMD = framecrc -i $(TARGET_SAMPLES)/r3d/4MB-sample.r3d -vcodec copy -acodec copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_SIFF_DEMUXER) += fate-siff
-fate-siff: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24
+FATE_SAMPLES_AVCONV-$(CONFIG_SIFF_DEMUXER) += fate-siff-demux
+fate-siff-demux: CMD = framecrc -i $(TARGET_SAMPLES)/SIFF/INTRO_B.VB -c copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_SMJPEG_DEMUXER) += fate-smjpeg-demux
-fate-smjpeg-demux: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -c copy
+fate-smjpeg-demux: CMD = framecrc -i $(TARGET_SAMPLES)/smjpeg/scenwin.mjpg -c copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_WSAUD_DEMUXER) += fate-westwood-aud
-fate-westwood-aud: CMD = framecrc -i $(SAMPLES)/westwood-aud/excellent.aud -c copy
+fate-westwood-aud: CMD = framecrc -i $(TARGET_SAMPLES)/westwood-aud/excellent.aud -c copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_WTV_DEMUXER) += fate-wtv-demux
-fate-wtv-demux: CMD = framecrc -i $(SAMPLES)/wtv/law-and-order-partial.wtv -vcodec copy -acodec copy
+fate-wtv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/wtv/law-and-order-partial.wtv -vcodec copy -acodec copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_XMV_DEMUXER) += fate-xmv-demux
-fate-xmv-demux: CMD = framecrc -i $(SAMPLES)/xmv/logos1p.fmv -vcodec copy -acodec copy
+fate-xmv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/xmv/logos1p.fmv -vcodec copy -acodec copy
 
 FATE_SAMPLES_AVCONV-$(CONFIG_XWMA_DEMUXER) += fate-xwma-demux
-fate-xwma-demux: CMD = crc -i $(SAMPLES)/xwma/ergon.xwma -acodec copy
+fate-xwma-demux: CMD = crc -i $(TARGET_SAMPLES)/xwma/ergon.xwma -acodec copy

libav-v9.6.tar.bz2/tests/fate/dfa.mak -> libav-v10.1.tar.bz2/tests/fate/dfa.mak Changed

@@ -1,35 +1,35 @@
 FATE_DFA += fate-dfa1
-fate-dfa1: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0000.dfa -pix_fmt rgb24
+fate-dfa1: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0000.dfa -pix_fmt rgb24
 
 FATE_DFA += fate-dfa2
-fate-dfa2: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0001.dfa -pix_fmt rgb24
+fate-dfa2: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0001.dfa -pix_fmt rgb24
 
 FATE_DFA += fate-dfa3
-fate-dfa3: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0002.dfa -pix_fmt rgb24
+fate-dfa3: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0002.dfa -pix_fmt rgb24
 
 FATE_DFA += fate-dfa4
-fate-dfa4: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0003.dfa -pix_fmt rgb24
+fate-dfa4: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0003.dfa -pix_fmt rgb24
 
 FATE_DFA += fate-dfa5
-fate-dfa5: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0004.dfa -pix_fmt rgb24
+fate-dfa5: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0004.dfa -pix_fmt rgb24
 
 FATE_DFA += fate-dfa6
-fate-dfa6: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0005.dfa -pix_fmt rgb24
+fate-dfa6: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0005.dfa -pix_fmt rgb24
 
 FATE_DFA += fate-dfa7
-fate-dfa7: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0006.dfa -pix_fmt rgb24
+fate-dfa7: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0006.dfa -pix_fmt rgb24
 
 FATE_DFA += fate-dfa8
-fate-dfa8: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0007.dfa -pix_fmt rgb24
+fate-dfa8: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0007.dfa -pix_fmt rgb24
 
 FATE_DFA += fate-dfa9
-fate-dfa9: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0008.dfa -pix_fmt rgb24
+fate-dfa9: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0008.dfa -pix_fmt rgb24
 
 FATE_DFA += fate-dfa10
-fate-dfa10: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0009.dfa -pix_fmt rgb24
+fate-dfa10: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0009.dfa -pix_fmt rgb24
 
 FATE_DFA += fate-dfa11
-fate-dfa11: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0010.dfa -pix_fmt rgb24
+fate-dfa11: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0010.dfa -pix_fmt rgb24
 
 FATE_DFA-$(call DEMDEC, DFA, DFA) += $(FATE_DFA)

libav-v9.6.tar.bz2/tests/fate/dpcm.mak -> libav-v10.1.tar.bz2/tests/fate/dpcm.mak Changed

libav-v9.6.tar.bz2/tests/fate/ea.mak -> libav-v10.1.tar.bz2/tests/fate/ea.mak Changed

@@ -1,23 +1,23 @@
 FATE_SAMPLES_AVCONV-$(call DEMDEC, EA_CDATA, ADPCM_EA_XAS) += fate-ea-cdata
-fate-ea-cdata: CMD = md5 -i $(SAMPLES)/ea-cdata/166b084d.46410f77.0009b440.24be960c.cdata -f s16le
+fate-ea-cdata: CMD = md5 -i $(TARGET_SAMPLES)/ea-cdata/166b084d.46410f77.0009b440.24be960c.cdata -f s16le
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, EA, EACMV) += fate-ea-cmv
-fate-ea-cmv: CMD = framecrc -i $(SAMPLES)/ea-cmv/TITLE.CMV -pix_fmt rgb24
+fate-ea-cmv: CMD = framecrc -i $(TARGET_SAMPLES)/ea-cmv/TITLE.CMV -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, EA, EAMAD) += fate-ea-mad
-fate-ea-mad: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad -an
+fate-ea-mad: CMD = framecrc -i $(TARGET_SAMPLES)/ea-mad/NFS6LogoE.mad -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, EA, EATGQ) += fate-ea-tgq
-fate-ea-tgq: CMD = framecrc -i $(SAMPLES)/ea-tgq/v27.tgq -an
+fate-ea-tgq: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgq/v27.tgq -an
 
 FATE_EA_TGV += fate-ea-tgv-1
-fate-ea-tgv-1: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTRO8K-partial.TGV -pix_fmt rgb24 -an
+fate-ea-tgv-1: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgv/INTRO8K-partial.TGV -pix_fmt rgb24 -an
 
 FATE_EA_TGV += fate-ea-tgv-2
-fate-ea-tgv-2: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24 -an
+fate-ea-tgv-2: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24 -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, EA, EATGV) += $(FATE_EA_TGV)
 fate-ea-tgv: $(FATE_EA_TGV)
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, EA, EATQI) += fate-ea-tqi
-fate-ea-tqi: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26 -an
+fate-ea-tqi: CMD = framecrc -i $(TARGET_SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26 -an

libav-v10.1.tar.bz2/tests/fate/filter-audio.mak Added

@@ -0,0 +1,75 @@
+FATE_AMIX += fate-filter-amix-simple
+fate-filter-amix-simple: CMD = avconv -filter_complex amix -i $(SRC) -ss 3 -i $(SRC1) -f f32le -
+fate-filter-amix-simple: REF = $(SAMPLES)/filter/amix_simple.pcm
+
+FATE_AMIX += fate-filter-amix-first
+fate-filter-amix-first: CMD = avconv -filter_complex amix=duration=first -ss 4 -i $(SRC) -i $(SRC1) -f f32le -
+fate-filter-amix-first: REF = $(SAMPLES)/filter/amix_first.pcm
+
+FATE_AMIX += fate-filter-amix-transition
+fate-filter-amix-transition: tests/data/asynth-44100-2-3.wav
+fate-filter-amix-transition: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-2-3.wav
+fate-filter-amix-transition: CMD = avconv -filter_complex amix=inputs=3:dropout_transition=0.5 -i $(SRC) -ss 2 -i $(SRC1) -ss 4 -i $(SRC2) -f f32le -
+fate-filter-amix-transition: REF = $(SAMPLES)/filter/amix_transition.pcm
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, AMIX, WAV, PCM_S16LE, PCM_F32LE, PCM_F32LE) += $(FATE_AMIX)
+$(FATE_AMIX): tests/data/asynth-44100-2.wav tests/data/asynth-44100-2-2.wav
+$(FATE_AMIX): SRC  = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+$(FATE_AMIX): SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2-2.wav
+$(FATE_AMIX): CMP  = oneoff
+$(FATE_AMIX): CMP_UNIT = f32
+
+FATE_AFILTER-$(call FILTERDEMDECMUX, ASYNCTS, FLV, NELLYMOSER, PCM_S16LE) += fate-filter-asyncts
+fate-filter-asyncts: SRC = $(TARGET_SAMPLES)/nellymoser/nellymoser-discont.flv
+fate-filter-asyncts: CMD = pcm -analyzeduration 10000000 -i $(SRC) -af asyncts
+fate-filter-asyncts: CMP = oneoff
+fate-filter-asyncts: REF = $(SAMPLES)/nellymoser/nellymoser-discont.pcm
+
+FATE_ATRIM += fate-filter-atrim-duration
+fate-filter-atrim-duration: CMD = framecrc -i $(SRC) -af atrim=start=0.1:duration=0.01
+FATE_ATRIM += fate-filter-atrim-mixed
+fate-filter-atrim-mixed: CMD = framecrc -i $(SRC) -af atrim=start=0.05:start_sample=1025:end=0.1:end_sample=4411
+
+FATE_ATRIM += fate-filter-atrim-samples
+fate-filter-atrim-samples: CMD = framecrc -i $(SRC) -af atrim=start_sample=26:end_sample=80
+
+FATE_ATRIM += fate-filter-atrim-time
+fate-filter-atrim-time: CMD = framecrc -i $(SRC) -af atrim=0.1:0.2
+
+$(FATE_ATRIM): tests/data/asynth-44100-2.wav
+$(FATE_ATRIM): SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+
+FATE_FILTER-$(call FILTERDEMDECENCMUX, ATRIM, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_ATRIM)
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELMAP, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-channelmap
+fate-filter-channelmap: tests/data/filtergraphs/channelmap
+fate-filter-channelmap: SRC = $(TARGET_PATH)/tests/data/asynth-44100-6.wav
+fate-filter-channelmap: tests/data/asynth-44100-6.wav
+fate-filter-channelmap: CMD = md5 -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/channelmap -f wav -flags +bitexact
+fate-filter-channelmap: CMP = oneline
+fate-filter-channelmap: REF = 21f1977c4f9705e2057083f84764e685
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELSPLIT, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-channelsplit
+fate-filter-channelsplit: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-channelsplit: tests/data/asynth-44100-2.wav
+fate-filter-channelsplit: CMD = md5 -i $(SRC) -filter_complex channelsplit -f s16le
+fate-filter-channelsplit: CMP = oneline
+fate-filter-channelsplit: REF = d92988d0fe2dd92236763f47b07ab597
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, JOIN, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-join
+fate-filter-join: SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-join: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-3.wav
+fate-filter-join: tests/data/asynth-44100-2.wav tests/data/asynth-44100-3.wav
+fate-filter-join: CMD = md5 -i $(SRC1) -i $(SRC2) -filter_complex join=channel_layout=5 -f s16le
+fate-filter-join: CMP = oneline
+fate-filter-join: REF = 409e66fc5ece4ddea4aa16bc47026bb0
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, VOLUME, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-volume
+fate-filter-volume: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-volume: tests/data/asynth-44100-2.wav
+fate-filter-volume: CMD = md5 -i $(SRC) -af volume=precision=fixed:volume=0.5 -f s16le
+fate-filter-volume: CMP = oneline
+fate-filter-volume: REF = 4d6ba75ef3e32d305d066b9bc771d6f4
+
+FATE_SAMPLES_AVCONV += $(FATE_AFILTER-yes)
+fate-afilter: $(FATE_AFILTER-yes)

libav-v10.1.tar.bz2/tests/fate/filter-video.mak Added

@@ -0,0 +1,147 @@
+FATE_FILTER-$(call FILTERDEMDEC, DELOGO, RM, RV30) += fate-filter-delogo
+fate-filter-delogo: CMD = framecrc -i $(TARGET_SAMPLES)/real/rv30.rm -vf delogo=show=0:x=290:y=25:w=26:h=16 -an
+
+FATE_YADIF += fate-filter-yadif-mode0
+fate-filter-yadif-mode0: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=0
+
+FATE_YADIF += fate-filter-yadif-mode1
+fate-filter-yadif-mode1: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=1
+
+FATE_FILTER-$(call FILTERDEMDEC, YADIF, MPEGTS, MPEG2VIDEO) += $(FATE_YADIF)
+
+FATE_SAMPLES_AVCONV += $(FATE_FILTER-yes)
+
+
+FATE_FILTER_VSYNTH-$(CONFIG_BOXBLUR_FILTER) += fate-filter-boxblur
+fate-filter-boxblur: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf boxblur=2:1
+
+FATE_FILTER_VSYNTH-$(CONFIG_DRAWBOX_FILTER) += fate-filter-drawbox
+fate-filter-drawbox: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf drawbox=10:20:200:60:red@0.5
+
+FATE_FILTER_VSYNTH-$(CONFIG_FADE_FILTER) += fate-filter-fade
+fate-filter-fade: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf fade=in:0:25,fade=out:25:25
+
+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
+
+FATE_FILTER_VSYNTH-$(CONFIG_HQDN3D_FILTER) += fate-filter-hqdn3d
+fate-filter-hqdn3d: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf hqdn3d
+
+FATE_FILTER_VSYNTH-$(CONFIG_INTERLACE_FILTER) += fate-filter-interlace
+fate-filter-interlace: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf interlace
+
+FATE_FILTER_VSYNTH-$(CONFIG_NEGATE_FILTER) += fate-filter-negate
+fate-filter-negate: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf negate
+
+FATE_FILTER_VSYNTH-$(CONFIG_OVERLAY_FILTER) += fate-filter-overlay
+fate-filter-overlay: tests/data/filtergraphs/overlay
+fate-filter-overlay: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay
+
+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
+
+FATE_FILTER_VSYNTH-$(CONFIG_TRANSPOSE_FILTER) += fate-filter-transpose
+fate-filter-transpose: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf transpose
+
+FATE_TRIM += fate-filter-trim-duration
+fate-filter-trim-duration: CMD = framecrc -i $(SRC) -vf trim=start=0.4:duration=0.05
+
+FATE_TRIM += fate-filter-trim-frame
+fate-filter-trim-frame: CMD = framecrc -i $(SRC) -vf trim=start_frame=3:end_frame=10
+
+FATE_TRIM += fate-filter-trim-mixed
+fate-filter-trim-mixed: CMD = framecrc -i $(SRC) -vf trim=start=0.2:end=0.4:start_frame=1:end_frame=3
+
+FATE_TRIM += fate-filter-trim-time
+fate-filter-trim-time: CMD = framecrc -i $(SRC) -vf trim=0:0.09
+
+FATE_FILTER_VSYNTH-$(CONFIG_TRIM_FILTER) += $(FATE_TRIM)
+
+FATE_FILTER_VSYNTH-$(CONFIG_UNSHARP_FILTER) += fate-filter-unsharp
+fate-filter-unsharp: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf unsharp
+
+
+FATE_FILTER_VSYNTH-$(CONFIG_CROP_FILTER) += fate-filter-crop
+fate-filter-crop: CMD = video_filter "crop=iw-100:ih-100:100:100"
+
+FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER SCALE_FILTER) += fate-filter-crop_scale
+fate-filter-crop_scale: CMD = video_filter "crop=iw-100:ih-100:100:100,scale=w=400:h=-1"
+
+FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER SCALE_FILTER VFLIP_FILTER) += fate-filter-crop_scale_vflip
+fate-filter-crop_scale_vflip: CMD = video_filter "null,null,crop=iw-200:ih-200:200:200,crop=iw-20:ih-20:20:20,scale=w=200:h=200,scale=w=250:h=250,vflip,vflip,null,scale=w=200:h=200,crop=iw-100:ih-100:100:100,vflip,scale=w=200:h=200,null,vflip,crop=iw-100:ih-100:100:100,null"
+
+FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER VFLIP_FILTER) += fate-filter-crop_vflip
+fate-filter-crop_vflip: CMD = video_filter "crop=iw-100:ih-100:100:100,vflip"
+
+FATE_FILTER_VSYNTH-$(CONFIG_NULL_FILTER) += fate-filter-null
+fate-filter-null: CMD = video_filter "null"
+
+FATE_FILTER_VSYNTH-$(CONFIG_SCALE_FILTER) += fate-filter-scale200
+fate-filter-scale200: CMD = video_filter "scale=w=200:h=200"
+
+FATE_FILTER_VSYNTH-$(CONFIG_SCALE_FILTER) += fate-filter-scale500
+fate-filter-scale500: CMD = video_filter "scale=w=500:h=500"
+
+FATE_FILTER_VSYNTH-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip
+fate-filter-vflip: CMD = video_filter "vflip"
+
+FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER VFLIP_FILTER) += fate-filter-vflip_crop
+fate-filter-vflip_crop: CMD = video_filter "vflip,crop=iw-100:ih-100:100:100"
+
+FATE_FILTER_VSYNTH-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip_vflip
+fate-filter-vflip_vflip: CMD = video_filter "vflip,vflip"
+
+
+FATE_FILTER_VSYNTH-$(CONFIG_FORMAT_FILTER) += fate-filter-pixdesc
+fate-filter-pixdesc: CMD = pixdesc
+
+
+FATE_FILTER_PIXFMTS += fate-filter-pixfmts-copy
+fate-filter-pixfmts-copy:  CMD = pixfmts
+
+FATE_FILTER_PIXFMTS += fate-filter-pixfmts-crop
+fate-filter-pixfmts-crop:  CMD = pixfmts "100:100:100:100"
+
+FATE_FILTER_PIXFMTS += fate-filter-pixfmts-hflip
+fate-filter-pixfmts-hflip: CMD = pixfmts
+
+FATE_FILTER_PIXFMTS += fate-filter-pixfmts-null
+fate-filter-pixfmts-null:  CMD = pixfmts
+
+FATE_FILTER_PIXFMTS += fate-filter-pixfmts-pad
+fate-filter-pixfmts-pad:   CMD = pixfmts "500:400:20:20"
+
+FATE_FILTER_PIXFMTS += fate-filter-pixfmts-scale
+fate-filter-pixfmts-scale: CMD = pixfmts "200:100"
+
+FATE_FILTER_PIXFMTS += fate-filter-pixfmts-vflip
+fate-filter-pixfmts-vflip: CMD = pixfmts
+
+$(FATE_FILTER_PIXFMTS): libavfilter/filtfmts-test$(EXESUF)
+FATE_FILTER_VSYNTH-$(CONFIG_FORMAT_FILTER) += $(FATE_FILTER_PIXFMTS)
+
+
+$(FATE_FILTER_VSYNTH-yes): $(VREF)
+$(FATE_FILTER_VSYNTH-yes): SRC = $(TARGET_PATH)/tests/vsynth1/%02d.pgm
+
+FATE_AVCONV-$(call DEMDEC, IMAGE2, PGMYUV) += $(FATE_FILTER_VSYNTH-yes)
+
+fate-vfilter: $(FATE_FILTER-yes) $(FATE_FILTER_VSYNTH-yes)
+
+fate-filter: fate-afilter fate-vfilter

libav-v9.6.tar.bz2/tests/fate/flac.mak -> libav-v10.1.tar.bz2/tests/fate/flac.mak Changed

libav-v9.6.tar.bz2/tests/fate/h264.mak -> libav-v10.1.tar.bz2/tests/fate/h264.mak Changed

@@ -64,6 +64,7 @@
             ci_mw_d                                                     \
             cvbs3_sony_c                                                \
             cvcanlma2_sony_c                                            \
+            cvfc1_sony_c                                                \
             cvfi1_sony_d                                                \
             cvfi1_sva_c                                                 \
             cvfi2_sony_h                                                \
@@ -171,191 +172,202 @@
             sva_nl1_b                                                   \
             sva_nl2_e                                                   \
 
+FATE_H264_REINIT_TESTS := large_420_8-to-small_420_8                    \
+                          small_420_8-to-large_444_10                   \
+                          small_420_9-to-small_420_8                    \
+                          small_422_9-to-small_420_9                    \
+
 FATE_H264  := $(FATE_H264:%=fate-h264-conformance-%)                    \
+              $(FATE_H264_REINIT_TESTS:%=fate-h264-reinit-%)            \
               fate-h264-extreme-plane-pred                              \
               fate-h264-lossless                                        \
 
 FATE_H264-$(call DEMDEC, H264, H264) += $(FATE_H264)
+FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-crop-to-container
 FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-interlace-crop
 FATE_H264-$(call ALLYES, MOV_DEMUXER H264_MP4TOANNEXB_BSF) += fate-h264-bsf-mp4toannexb
 
 FATE_SAMPLES_AVCONV += $(FATE_H264-yes)
 fate-h264: $(FATE_H264-yes)
 
-fate-h264-conformance-aud_mw_e:                   CMD = framecrc -i $(SAMPLES)/h264-conformance/AUD_MW_E.264
-fate-h264-conformance-ba1_ft_c:                   CMD = framecrc -i $(SAMPLES)/h264-conformance/BA1_FT_C.264
-fate-h264-conformance-ba1_sony_d:                 CMD = framecrc -i $(SAMPLES)/h264-conformance/BA1_Sony_D.jsv
-fate-h264-conformance-ba2_sony_f:                 CMD = framecrc -i $(SAMPLES)/h264-conformance/BA2_Sony_F.jsv
-fate-h264-conformance-ba3_sva_c:                  CMD = framecrc -i $(SAMPLES)/h264-conformance/BA3_SVA_C.264
-fate-h264-conformance-ba_mw_d:                    CMD = framecrc -i $(SAMPLES)/h264-conformance/BA_MW_D.264
-fate-h264-conformance-bamq1_jvc_c:                CMD = framecrc -i $(SAMPLES)/h264-conformance/BAMQ1_JVC_C.264
-fate-h264-conformance-bamq2_jvc_c:                CMD = framecrc -i $(SAMPLES)/h264-conformance/BAMQ2_JVC_C.264
-fate-h264-conformance-banm_mw_d:                  CMD = framecrc -i $(SAMPLES)/h264-conformance/BANM_MW_D.264
-fate-h264-conformance-basqp1_sony_c:              CMD = framecrc -i $(SAMPLES)/h264-conformance/BASQP1_Sony_C.jsv
-fate-h264-conformance-caba1_sony_d:               CMD = framecrc -i $(SAMPLES)/h264-conformance/CABA1_Sony_D.jsv
-fate-h264-conformance-caba1_sva_b:                CMD = framecrc -i $(SAMPLES)/h264-conformance/CABA1_SVA_B.264
-fate-h264-conformance-caba2_sony_e:               CMD = framecrc -i $(SAMPLES)/h264-conformance/CABA2_Sony_E.jsv
-fate-h264-conformance-caba2_sva_b:                CMD = framecrc -i $(SAMPLES)/h264-conformance/CABA2_SVA_B.264
-fate-h264-conformance-caba3_sony_c:               CMD = framecrc -i $(SAMPLES)/h264-conformance/CABA3_Sony_C.jsv
-fate-h264-conformance-caba3_sva_b:                CMD = framecrc -i $(SAMPLES)/h264-conformance/CABA3_SVA_B.264
-fate-h264-conformance-caba3_toshiba_e:            CMD = framecrc -i $(SAMPLES)/h264-conformance/CABA3_TOSHIBA_E.264
-fate-h264-conformance-cabac_mot_fld0_full:        CMD = framecrc -i $(SAMPLES)/h264-conformance/camp_mot_fld0_full.26l
-fate-h264-conformance-cabac_mot_frm0_full:        CMD = framecrc -i $(SAMPLES)/h264-conformance/camp_mot_frm0_full.26l
-fate-h264-conformance-cabac_mot_mbaff0_full:      CMD = framecrc -i $(SAMPLES)/h264-conformance/camp_mot_mbaff0_full.26l
-fate-h264-conformance-cabac_mot_picaff0_full:     CMD = framecrc -i $(SAMPLES)/h264-conformance/camp_mot_picaff0_full.26l
-fate-h264-conformance-cabaci3_sony_b:             CMD = framecrc -i $(SAMPLES)/h264-conformance/CABACI3_Sony_B.jsv
-fate-h264-conformance-cabast3_sony_e:             CMD = framecrc -i $(SAMPLES)/h264-conformance/CABAST3_Sony_E.jsv
-fate-h264-conformance-cabastbr3_sony_b:           CMD = framecrc -i $(SAMPLES)/h264-conformance/CABASTBR3_Sony_B.jsv
-fate-h264-conformance-cabref3_sand_d:             CMD = framecrc -i $(SAMPLES)/h264-conformance/CABREF3_Sand_D.264
-fate-h264-conformance-cacqp3_sony_d:              CMD = framecrc -i $(SAMPLES)/h264-conformance/CACQP3_Sony_D.jsv
-fate-h264-conformance-cafi1_sva_c:                CMD = framecrc -i $(SAMPLES)/h264-conformance/CAFI1_SVA_C.264
-fate-h264-conformance-cama1_sony_c:               CMD = framecrc -i $(SAMPLES)/h264-conformance/CAMA1_Sony_C.jsv
-fate-h264-conformance-cama1_toshiba_b:            CMD = framecrc -i $(SAMPLES)/h264-conformance/CAMA1_TOSHIBA_B.264
-fate-h264-conformance-cama1_vtc_c:                CMD = framecrc -i $(SAMPLES)/h264-conformance/cama1_vtc_c.avc
-fate-h264-conformance-cama2_vtc_b:                CMD = framecrc -i $(SAMPLES)/h264-conformance/cama2_vtc_b.avc
-fate-h264-conformance-cama3_sand_e:               CMD = framecrc -i $(SAMPLES)/h264-conformance/CAMA3_Sand_E.264
-fate-h264-conformance-cama3_vtc_b:                CMD = framecrc -i $(SAMPLES)/h264-conformance/cama3_vtc_b.avc
-fate-h264-conformance-camaci3_sony_c:             CMD = framecrc -i $(SAMPLES)/h264-conformance/CAMACI3_Sony_C.jsv
-fate-h264-conformance-camanl1_toshiba_b:          CMD = framecrc -i $(SAMPLES)/h264-conformance/CAMANL1_TOSHIBA_B.264
-fate-h264-conformance-camanl2_toshiba_b:          CMD = framecrc -i $(SAMPLES)/h264-conformance/CAMANL2_TOSHIBA_B.264
-fate-h264-conformance-camanl3_sand_e:             CMD = framecrc -i $(SAMPLES)/h264-conformance/CAMANL3_Sand_E.264
-fate-h264-conformance-camasl3_sony_b:             CMD = framecrc -i $(SAMPLES)/h264-conformance/CAMASL3_Sony_B.jsv
-fate-h264-conformance-camp_mot_mbaff_l30:         CMD = framecrc -i $(SAMPLES)/h264-conformance/CAMP_MOT_MBAFF_L30.26l
-fate-h264-conformance-camp_mot_mbaff_l31:         CMD = framecrc -i $(SAMPLES)/h264-conformance/CAMP_MOT_MBAFF_L31.26l
-fate-h264-conformance-canl1_sony_e:               CMD = framecrc -i $(SAMPLES)/h264-conformance/CANL1_Sony_E.jsv
-fate-h264-conformance-canl1_sva_b:                CMD = framecrc -i $(SAMPLES)/h264-conformance/CANL1_SVA_B.264
-fate-h264-conformance-canl1_toshiba_g:            CMD = framecrc -i $(SAMPLES)/h264-conformance/CANL1_TOSHIBA_G.264
-fate-h264-conformance-canl2_sony_e:               CMD = framecrc -i $(SAMPLES)/h264-conformance/CANL2_Sony_E.jsv
-fate-h264-conformance-canl2_sva_b:                CMD = framecrc -i $(SAMPLES)/h264-conformance/CANL2_SVA_B.264
-fate-h264-conformance-canl3_sony_c:               CMD = framecrc -i $(SAMPLES)/h264-conformance/CANL3_Sony_C.jsv
-fate-h264-conformance-canl3_sva_b:                CMD = framecrc -i $(SAMPLES)/h264-conformance/CANL3_SVA_B.264
-fate-h264-conformance-canl4_sva_b:                CMD = framecrc -i $(SAMPLES)/h264-conformance/CANL4_SVA_B.264
-fate-h264-conformance-canlma2_sony_c:             CMD = framecrc -i $(SAMPLES)/h264-conformance/CANLMA2_Sony_C.jsv
-fate-h264-conformance-canlma3_sony_c:             CMD = framecrc -i $(SAMPLES)/h264-conformance/CANLMA3_Sony_C.jsv
-fate-h264-conformance-capa1_toshiba_b:            CMD = framecrc -i $(SAMPLES)/h264-conformance/CAPA1_TOSHIBA_B.264
-fate-h264-conformance-capama3_sand_f:             CMD = framecrc -i $(SAMPLES)/h264-conformance/CAPAMA3_Sand_F.264
-fate-h264-conformance-capcm1_sand_e:              CMD = framecrc -i $(SAMPLES)/h264-conformance/CAPCM1_Sand_E.264
-fate-h264-conformance-capcmnl1_sand_e:            CMD = framecrc -i $(SAMPLES)/h264-conformance/CAPCMNL1_Sand_E.264
-fate-h264-conformance-capm3_sony_d:               CMD = framecrc -i $(SAMPLES)/h264-conformance/CAPM3_Sony_D.jsv
-fate-h264-conformance-caqp1_sony_b:               CMD = framecrc -i $(SAMPLES)/h264-conformance/CAQP1_Sony_B.jsv
-fate-h264-conformance-cavlc_mot_fld0_full_b:      CMD = framecrc -i $(SAMPLES)/h264-conformance/cvmp_mot_fld0_full_B.26l
-fate-h264-conformance-cavlc_mot_frm0_full_b:      CMD = framecrc -i $(SAMPLES)/h264-conformance/cvmp_mot_frm0_full_B.26l
-fate-h264-conformance-cavlc_mot_mbaff0_full_b:    CMD = framecrc -i $(SAMPLES)/h264-conformance/cvmp_mot_mbaff0_full_B.26l
-fate-h264-conformance-cavlc_mot_picaff0_full_b:   CMD = framecrc -i $(SAMPLES)/h264-conformance/cvmp_mot_picaff0_full_B.26l
-fate-h264-conformance-cawp1_toshiba_e:            CMD = framecrc -i $(SAMPLES)/h264-conformance/CAWP1_TOSHIBA_E.264
-fate-h264-conformance-cawp5_toshiba_e:            CMD = framecrc -i $(SAMPLES)/h264-conformance/CAWP5_TOSHIBA_E.264
-fate-h264-conformance-ci1_ft_b:                   CMD = framecrc -i $(SAMPLES)/h264-conformance/CI1_FT_B.264
-fate-h264-conformance-ci_mw_d:                    CMD = framecrc -i $(SAMPLES)/h264-conformance/CI_MW_D.264
-fate-h264-conformance-cvbs3_sony_c:               CMD = framecrc -i $(SAMPLES)/h264-conformance/CVBS3_Sony_C.jsv
-fate-h264-conformance-cvcanlma2_sony_c:           CMD = framecrc -i $(SAMPLES)/h264-conformance/CVCANLMA2_Sony_C.jsv
-fate-h264-conformance-cvfi1_sony_d:               CMD = framecrc -i $(SAMPLES)/h264-conformance/CVFI1_Sony_D.jsv
-fate-h264-conformance-cvfi1_sva_c:                CMD = framecrc -i $(SAMPLES)/h264-conformance/CVFI1_SVA_C.264
-fate-h264-conformance-cvfi2_sony_h:               CMD = framecrc -i $(SAMPLES)/h264-conformance/CVFI2_Sony_H.jsv
-fate-h264-conformance-cvfi2_sva_c:                CMD = framecrc -i $(SAMPLES)/h264-conformance/CVFI2_SVA_C.264
-fate-h264-conformance-cvma1_sony_d:               CMD = framecrc -i $(SAMPLES)/h264-conformance/CVMA1_Sony_D.jsv
-fate-h264-conformance-cvma1_toshiba_b:            CMD = framecrc -i $(SAMPLES)/h264-conformance/CVMA1_TOSHIBA_B.264
-fate-h264-conformance-cvmanl1_toshiba_b:          CMD = framecrc -i $(SAMPLES)/h264-conformance/CVMANL1_TOSHIBA_B.264
-fate-h264-conformance-cvmanl2_toshiba_b:          CMD = framecrc -i $(SAMPLES)/h264-conformance/CVMANL2_TOSHIBA_B.264
-fate-h264-conformance-cvmapaqp3_sony_e:           CMD = framecrc -i $(SAMPLES)/h264-conformance/CVMAPAQP3_Sony_E.jsv
-fate-h264-conformance-cvmaqp2_sony_g:             CMD = framecrc -i $(SAMPLES)/h264-conformance/CVMAQP2_Sony_G.jsv
-fate-h264-conformance-cvmaqp3_sony_d:             CMD = framecrc -i $(SAMPLES)/h264-conformance/CVMAQP3_Sony_D.jsv
-fate-h264-conformance-cvmp_mot_fld_l30_b:         CMD = framecrc -i $(SAMPLES)/h264-conformance/CVMP_MOT_FLD_L30_B.26l
-fate-h264-conformance-cvmp_mot_frm_l31_b:         CMD = framecrc -i $(SAMPLES)/h264-conformance/CVMP_MOT_FRM_L31_B.26l
-fate-h264-conformance-cvnlfi1_sony_c:             CMD = framecrc -i $(SAMPLES)/h264-conformance/CVNLFI1_Sony_C.jsv
-fate-h264-conformance-cvnlfi2_sony_h:             CMD = framecrc -i $(SAMPLES)/h264-conformance/CVNLFI2_Sony_H.jsv
-fate-h264-conformance-cvpa1_toshiba_b:            CMD = framecrc -i $(SAMPLES)/h264-conformance/CVPA1_TOSHIBA_B.264
-fate-h264-conformance-cvpcmnl1_sva_c:             CMD = framecrc -i $(SAMPLES)/h264-conformance/CVPCMNL1_SVA_C.264
-fate-h264-conformance-cvpcmnl2_sva_c:             CMD = framecrc -i $(SAMPLES)/h264-conformance/CVPCMNL2_SVA_C.264
-fate-h264-conformance-cvwp1_toshiba_e:            CMD = framecrc -i $(SAMPLES)/h264-conformance/CVWP1_TOSHIBA_E.264
-fate-h264-conformance-cvwp2_toshiba_e:            CMD = framecrc -i $(SAMPLES)/h264-conformance/CVWP2_TOSHIBA_E.264
-fate-h264-conformance-cvwp3_toshiba_e:            CMD = framecrc -i $(SAMPLES)/h264-conformance/CVWP3_TOSHIBA_E.264
-fate-h264-conformance-cvwp5_toshiba_e:            CMD = framecrc -i $(SAMPLES)/h264-conformance/CVWP5_TOSHIBA_E.264
-fate-h264-conformance-fi1_sony_e:                 CMD = framecrc -i $(SAMPLES)/h264-conformance/FI1_Sony_E.jsv
-fate-h264-conformance-frext-alphaconformanceg:    CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/test8b43.264
-fate-h264-conformance-frext-bcrm_freh10:          CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/freh10.264 -vsync 0
-fate-h264-conformance-frext-brcm_freh11:          CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/freh11.264 -vsync 0
-fate-h264-conformance-frext-brcm_freh3:           CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/freh3.264
-fate-h264-conformance-frext-brcm_freh4:           CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/freh4.264 -vsync 0
-fate-h264-conformance-frext-brcm_freh5:           CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/freh5.264
-fate-h264-conformance-frext-brcm_freh8:           CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/freh8.264
-fate-h264-conformance-frext-brcm_freh9:           CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/freh9.264
-fate-h264-conformance-frext-freh12_b:             CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/Freh12_B.264
-fate-h264-conformance-frext-freh1_b:              CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/Freh1_B.264
-fate-h264-conformance-frext-freh2_b:              CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/Freh2_B.264
-fate-h264-conformance-frext-freh6:                CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/freh6.264 -vsync 0
-fate-h264-conformance-frext-freh7_b:              CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/Freh7_B.264 -vsync 0
-fate-h264-conformance-frext-frext01_jvc_d:        CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/FREXT01_JVC_D.264
-fate-h264-conformance-frext-frext02_jvc_c:        CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/FREXT02_JVC_C.264
-fate-h264-conformance-frext-frext1_panasonic_c:   CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/FRExt1_Panasonic.avc
-fate-h264-conformance-frext-frext2_panasonic_b:   CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/FRExt2_Panasonic.avc -vsync 0
-fate-h264-conformance-frext-frext3_panasonic_d:   CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/FRExt3_Panasonic.avc
-fate-h264-conformance-frext-frext4_panasonic_a:   CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/FRExt4_Panasonic.avc
-fate-h264-conformance-frext-frext_mmco4_sony_b:   CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/FRExt_MMCO4_Sony_B.264
-fate-h264-conformance-frext-hcaff1_hhi_b:         CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HCAFF1_HHI.264
-fate-h264-conformance-frext-hcafr1_hhi_c:         CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HCAFR1_HHI.264
-fate-h264-conformance-frext-hcafr2_hhi_a:         CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HCAFR2_HHI.264
-fate-h264-conformance-frext-hcafr3_hhi_a:         CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HCAFR3_HHI.264
-fate-h264-conformance-frext-hcafr4_hhi_a:         CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HCAFR4_HHI.264
-fate-h264-conformance-frext-hcamff1_hhi_b:        CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HCAMFF1_HHI.264
-fate-h264-conformance-frext-hpca_brcm_c:          CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HPCA_BRCM_C.264
-fate-h264-conformance-frext-hpcadq_brcm_b:        CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HPCADQ_BRCM_B.264
-fate-h264-conformance-frext-hpcafl_bcrm_c:        CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HPCAFL_BRCM_C.264 -vsync 0
-fate-h264-conformance-frext-hpcaflnl_bcrm_c:      CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HPCAFLNL_BRCM_C.264 -vsync 0
-fate-h264-conformance-frext-hpcalq_brcm_b:        CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HPCALQ_BRCM_B.264
-fate-h264-conformance-frext-hpcamapalq_bcrm_b:    CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HPCAMAPALQ_BRCM_B.264 -vsync 0
-fate-h264-conformance-frext-hpcamolq_brcm_b:      CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HPCAMOLQ_BRCM_B.264
-fate-h264-conformance-frext-hpcanl_brcm_c:        CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HPCANL_BRCM_C.264
-fate-h264-conformance-frext-hpcaq2lq_brcm_b:      CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HPCAQ2LQ_BRCM_B.264
-fate-h264-conformance-frext-hpcv_brcm_a:          CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HPCV_BRCM_A.264
-fate-h264-conformance-frext-hpcvfl_bcrm_a:        CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HPCVFL_BRCM_A.264 -vsync 0
-fate-h264-conformance-frext-hpcvflnl_bcrm_a:      CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HPCVFLNL_BRCM_A.264 -vsync 0
-fate-h264-conformance-frext-hpcvmolq_brcm_b:      CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HPCVMOLQ_BRCM_B.264
-fate-h264-conformance-frext-hpcvnl_brcm_a:        CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/HPCVNL_BRCM_A.264
-fate-h264-conformance-frext-pph10i1_panasonic_a:  CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/PPH10I1_Panasonic_A.264 -pix_fmt yuv420p10le
-fate-h264-conformance-frext-pph10i2_panasonic_a:  CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/PPH10I2_Panasonic_A.264 -pix_fmt yuv420p10le
-fate-h264-conformance-frext-pph10i3_panasonic_a:  CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/PPH10I3_Panasonic_A.264 -pix_fmt yuv420p10le
-fate-h264-conformance-frext-pph10i4_panasonic_a:  CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/PPH10I4_Panasonic_A.264 -pix_fmt yuv420p10le
-fate-h264-conformance-frext-pph10i5_panasonic_a:  CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/PPH10I5_Panasonic_A.264 -pix_fmt yuv420p10le
-fate-h264-conformance-frext-pph10i6_panasonic_a:  CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/PPH10I6_Panasonic_A.264 -pix_fmt yuv420p10le
-fate-h264-conformance-frext-pph10i7_panasonic_a:  CMD = framecrc -i $(SAMPLES)/h264-conformance/FRext/PPH10I7_Panasonic_A.264 -pix_fmt yuv420p10le
-fate-h264-conformance-hcbp2_hhi_a:                CMD = framecrc -i $(SAMPLES)/h264-conformance/HCBP2_HHI_A.264
-fate-h264-conformance-hcmp1_hhi_a:                CMD = framecrc -i $(SAMPLES)/h264-conformance/HCMP1_HHI_A.264
-fate-h264-conformance-ls_sva_d:                   CMD = framecrc -i $(SAMPLES)/h264-conformance/LS_SVA_D.264
-fate-h264-conformance-midr_mw_d:                  CMD = framecrc -i $(SAMPLES)/h264-conformance/MIDR_MW_D.264
-fate-h264-conformance-mps_mw_a:                   CMD = framecrc -i $(SAMPLES)/h264-conformance/MPS_MW_A.264
-fate-h264-conformance-mr1_bt_a:                   CMD = framecrc -i $(SAMPLES)/h264-conformance/MR1_BT_A.h264
-fate-h264-conformance-mr1_mw_a:                   CMD = framecrc -i $(SAMPLES)/h264-conformance/MR1_MW_A.264
-fate-h264-conformance-mr2_mw_a:                   CMD = framecrc -i $(SAMPLES)/h264-conformance/MR2_MW_A.264
-fate-h264-conformance-mr2_tandberg_e:             CMD = framecrc -i $(SAMPLES)/h264-conformance/MR2_TANDBERG_E.264
-fate-h264-conformance-mr3_tandberg_b:             CMD = framecrc -i $(SAMPLES)/h264-conformance/MR3_TANDBERG_B.264
-fate-h264-conformance-mr4_tandberg_c:             CMD = framecrc -strict 1 -i $(SAMPLES)/h264-conformance/MR4_TANDBERG_C.264
-fate-h264-conformance-mr5_tandberg_c:             CMD = framecrc -strict 1 -i $(SAMPLES)/h264-conformance/MR5_TANDBERG_C.264
-fate-h264-conformance-mr6_bt_b:                   CMD = framecrc -i $(SAMPLES)/h264-conformance/MR6_BT_B.h264
-fate-h264-conformance-mr7_bt_b:                   CMD = framecrc -i $(SAMPLES)/h264-conformance/MR7_BT_B.h264
-fate-h264-conformance-mr8_bt_b:                   CMD = framecrc -i $(SAMPLES)/h264-conformance/MR8_BT_B.h264
-fate-h264-conformance-mr9_bt_b:                   CMD = framecrc -i $(SAMPLES)/h264-conformance/MR9_BT_B.h264
-fate-h264-conformance-mv1_brcm_d:                 CMD = framecrc -i $(SAMPLES)/h264-conformance/src19td.IBP.264
-fate-h264-conformance-nl1_sony_d:                 CMD = framecrc -i $(SAMPLES)/h264-conformance/NL1_Sony_D.jsv
-fate-h264-conformance-nl2_sony_h:                 CMD = framecrc -i $(SAMPLES)/h264-conformance/NL2_Sony_H.jsv
-fate-h264-conformance-nl3_sva_e:                  CMD = framecrc -i $(SAMPLES)/h264-conformance/NL3_SVA_E.264
-fate-h264-conformance-nlmq1_jvc_c:                CMD = framecrc -i $(SAMPLES)/h264-conformance/NLMQ1_JVC_C.264
-fate-h264-conformance-nlmq2_jvc_c:                CMD = framecrc -i $(SAMPLES)/h264-conformance/NLMQ2_JVC_C.264
-fate-h264-conformance-nrf_mw_e:                   CMD = framecrc -i $(SAMPLES)/h264-conformance/NRF_MW_E.264
-fate-h264-conformance-sharp_mp_field_1_b:         CMD = framecrc -i $(SAMPLES)/h264-conformance/Sharp_MP_Field_1_B.jvt
-fate-h264-conformance-sharp_mp_field_2_b:         CMD = framecrc -i $(SAMPLES)/h264-conformance/Sharp_MP_Field_2_B.jvt
-fate-h264-conformance-sharp_mp_field_3_b:         CMD = framecrc -i $(SAMPLES)/h264-conformance/Sharp_MP_Field_3_B.jvt
-fate-h264-conformance-sharp_mp_paff_1r2:          CMD = framecrc -i $(SAMPLES)/h264-conformance/Sharp_MP_PAFF_1r2.jvt
-fate-h264-conformance-sharp_mp_paff_2r:           CMD = framecrc -i $(SAMPLES)/h264-conformance/Sharp_MP_PAFF_2.jvt
-fate-h264-conformance-sl1_sva_b:                  CMD = framecrc -i $(SAMPLES)/h264-conformance/SL1_SVA_B.264
-fate-h264-conformance-sva_ba1_b:                  CMD = framecrc -i $(SAMPLES)/h264-conformance/SVA_BA1_B.264
-fate-h264-conformance-sva_ba2_d:                  CMD = framecrc -i $(SAMPLES)/h264-conformance/SVA_BA2_D.264
-fate-h264-conformance-sva_base_b:                 CMD = framecrc -i $(SAMPLES)/h264-conformance/SVA_Base_B.264
-fate-h264-conformance-sva_cl1_e:                  CMD = framecrc -i $(SAMPLES)/h264-conformance/SVA_CL1_E.264
-fate-h264-conformance-sva_fm1_e:                  CMD = framecrc -i $(SAMPLES)/h264-conformance/SVA_FM1_E.264
-fate-h264-conformance-sva_nl1_b:                  CMD = framecrc -i $(SAMPLES)/h264-conformance/SVA_NL1_B.264
-fate-h264-conformance-sva_nl2_e:                  CMD = framecrc -i $(SAMPLES)/h264-conformance/SVA_NL2_E.264
+fate-h264-conformance-aud_mw_e:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/AUD_MW_E.264
+fate-h264-conformance-ba1_ft_c:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BA1_FT_C.264
+fate-h264-conformance-ba1_sony_d:                 CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BA1_Sony_D.jsv
+fate-h264-conformance-ba2_sony_f:                 CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BA2_Sony_F.jsv
+fate-h264-conformance-ba3_sva_c:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BA3_SVA_C.264
+fate-h264-conformance-ba_mw_d:                    CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BA_MW_D.264
+fate-h264-conformance-bamq1_jvc_c:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BAMQ1_JVC_C.264
+fate-h264-conformance-bamq2_jvc_c:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BAMQ2_JVC_C.264
+fate-h264-conformance-banm_mw_d:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BANM_MW_D.264
+fate-h264-conformance-basqp1_sony_c:              CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BASQP1_Sony_C.jsv
+fate-h264-conformance-caba1_sony_d:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABA1_Sony_D.jsv
+fate-h264-conformance-caba1_sva_b:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABA1_SVA_B.264
+fate-h264-conformance-caba2_sony_e:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABA2_Sony_E.jsv
+fate-h264-conformance-caba2_sva_b:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABA2_SVA_B.264
+fate-h264-conformance-caba3_sony_c:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABA3_Sony_C.jsv
+fate-h264-conformance-caba3_sva_b:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABA3_SVA_B.264
+fate-h264-conformance-caba3_toshiba_e:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABA3_TOSHIBA_E.264
+fate-h264-conformance-cabac_mot_fld0_full:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_fld0_full.26l
+fate-h264-conformance-cabac_mot_frm0_full:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_frm0_full.26l
+fate-h264-conformance-cabac_mot_mbaff0_full:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_mbaff0_full.26l
+fate-h264-conformance-cabac_mot_picaff0_full:     CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_picaff0_full.26l
+fate-h264-conformance-cabaci3_sony_b:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABACI3_Sony_B.jsv
+fate-h264-conformance-cabast3_sony_e:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABAST3_Sony_E.jsv
+fate-h264-conformance-cabastbr3_sony_b:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABASTBR3_Sony_B.jsv
+fate-h264-conformance-cabref3_sand_d:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABREF3_Sand_D.264
+fate-h264-conformance-cacqp3_sony_d:              CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CACQP3_Sony_D.jsv
+fate-h264-conformance-cafi1_sva_c:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAFI1_SVA_C.264
+fate-h264-conformance-cama1_sony_c:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMA1_Sony_C.jsv
+fate-h264-conformance-cama1_toshiba_b:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMA1_TOSHIBA_B.264
+fate-h264-conformance-cama1_vtc_c:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cama1_vtc_c.avc
+fate-h264-conformance-cama2_vtc_b:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cama2_vtc_b.avc
+fate-h264-conformance-cama3_sand_e:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMA3_Sand_E.264
+fate-h264-conformance-cama3_vtc_b:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cama3_vtc_b.avc
+fate-h264-conformance-camaci3_sony_c:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMACI3_Sony_C.jsv
+fate-h264-conformance-camanl1_toshiba_b:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMANL1_TOSHIBA_B.264
+fate-h264-conformance-camanl2_toshiba_b:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMANL2_TOSHIBA_B.264
+fate-h264-conformance-camanl3_sand_e:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMANL3_Sand_E.264
+fate-h264-conformance-camasl3_sony_b:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMASL3_Sony_B.jsv
+fate-h264-conformance-camp_mot_mbaff_l30:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMP_MOT_MBAFF_L30.26l
+fate-h264-conformance-camp_mot_mbaff_l31:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMP_MOT_MBAFF_L31.26l
+fate-h264-conformance-canl1_sony_e:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL1_Sony_E.jsv
+fate-h264-conformance-canl1_sva_b:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL1_SVA_B.264
+fate-h264-conformance-canl1_toshiba_g:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL1_TOSHIBA_G.264
+fate-h264-conformance-canl2_sony_e:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL2_Sony_E.jsv
+fate-h264-conformance-canl2_sva_b:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL2_SVA_B.264
+fate-h264-conformance-canl3_sony_c:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL3_Sony_C.jsv
+fate-h264-conformance-canl3_sva_b:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL3_SVA_B.264
+fate-h264-conformance-canl4_sva_b:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL4_SVA_B.264
+fate-h264-conformance-canlma2_sony_c:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANLMA2_Sony_C.jsv
+fate-h264-conformance-canlma3_sony_c:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANLMA3_Sony_C.jsv
+fate-h264-conformance-capa1_toshiba_b:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAPA1_TOSHIBA_B.264
+fate-h264-conformance-capama3_sand_f:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAPAMA3_Sand_F.264
+fate-h264-conformance-capcm1_sand_e:              CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAPCM1_Sand_E.264
+fate-h264-conformance-capcmnl1_sand_e:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAPCMNL1_Sand_E.264
+fate-h264-conformance-capm3_sony_d:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAPM3_Sony_D.jsv
+fate-h264-conformance-caqp1_sony_b:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAQP1_Sony_B.jsv
+fate-h264-conformance-cavlc_mot_fld0_full_b:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_fld0_full_B.26l
+fate-h264-conformance-cavlc_mot_frm0_full_b:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_frm0_full_B.26l
+fate-h264-conformance-cavlc_mot_mbaff0_full_b:    CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_mbaff0_full_B.26l
+fate-h264-conformance-cavlc_mot_picaff0_full_b:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_picaff0_full_B.26l
+fate-h264-conformance-cawp1_toshiba_e:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAWP1_TOSHIBA_E.264
+fate-h264-conformance-cawp5_toshiba_e:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAWP5_TOSHIBA_E.264
+fate-h264-conformance-ci1_ft_b:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CI1_FT_B.264
+fate-h264-conformance-ci_mw_d:                    CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CI_MW_D.264
+fate-h264-conformance-cvbs3_sony_c:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVBS3_Sony_C.jsv
+fate-h264-conformance-cvcanlma2_sony_c:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVCANLMA2_Sony_C.jsv
+fate-h264-conformance-cvfc1_sony_c:               CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/h264-conformance/CVFC1_Sony_C.jsv
+fate-h264-conformance-cvfi1_sony_d:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVFI1_Sony_D.jsv
+fate-h264-conformance-cvfi1_sva_c:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVFI1_SVA_C.264
+fate-h264-conformance-cvfi2_sony_h:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVFI2_Sony_H.jsv
+fate-h264-conformance-cvfi2_sva_c:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVFI2_SVA_C.264
+fate-h264-conformance-cvma1_sony_d:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMA1_Sony_D.jsv
+fate-h264-conformance-cvma1_toshiba_b:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMA1_TOSHIBA_B.264
+fate-h264-conformance-cvmanl1_toshiba_b:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMANL1_TOSHIBA_B.264
+fate-h264-conformance-cvmanl2_toshiba_b:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMANL2_TOSHIBA_B.264
+fate-h264-conformance-cvmapaqp3_sony_e:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMAPAQP3_Sony_E.jsv
+fate-h264-conformance-cvmaqp2_sony_g:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMAQP2_Sony_G.jsv
+fate-h264-conformance-cvmaqp3_sony_d:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMAQP3_Sony_D.jsv
+fate-h264-conformance-cvmp_mot_fld_l30_b:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMP_MOT_FLD_L30_B.26l
+fate-h264-conformance-cvmp_mot_frm_l31_b:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMP_MOT_FRM_L31_B.26l
+fate-h264-conformance-cvnlfi1_sony_c:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVNLFI1_Sony_C.jsv
+fate-h264-conformance-cvnlfi2_sony_h:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVNLFI2_Sony_H.jsv
+fate-h264-conformance-cvpa1_toshiba_b:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVPA1_TOSHIBA_B.264
+fate-h264-conformance-cvpcmnl1_sva_c:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVPCMNL1_SVA_C.264
+fate-h264-conformance-cvpcmnl2_sva_c:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVPCMNL2_SVA_C.264
+fate-h264-conformance-cvwp1_toshiba_e:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVWP1_TOSHIBA_E.264
+fate-h264-conformance-cvwp2_toshiba_e:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVWP2_TOSHIBA_E.264
+fate-h264-conformance-cvwp3_toshiba_e:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVWP3_TOSHIBA_E.264
+fate-h264-conformance-cvwp5_toshiba_e:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVWP5_TOSHIBA_E.264
+fate-h264-conformance-fi1_sony_e:                 CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FI1_Sony_E.jsv
+fate-h264-conformance-frext-alphaconformanceg:    CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/test8b43.264
+fate-h264-conformance-frext-bcrm_freh10:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh10.264 -vsync 0
+fate-h264-conformance-frext-brcm_freh11:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh11.264 -vsync 0
+fate-h264-conformance-frext-brcm_freh3:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh3.264
+fate-h264-conformance-frext-brcm_freh4:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh4.264 -vsync 0
+fate-h264-conformance-frext-brcm_freh5:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh5.264
+fate-h264-conformance-frext-brcm_freh8:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh8.264
+fate-h264-conformance-frext-brcm_freh9:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh9.264
+fate-h264-conformance-frext-freh12_b:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh12_B.264
+fate-h264-conformance-frext-freh1_b:              CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh1_B.264
+fate-h264-conformance-frext-freh2_b:              CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh2_B.264
+fate-h264-conformance-frext-freh6:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh6.264 -vsync 0
+fate-h264-conformance-frext-freh7_b:              CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh7_B.264 -vsync 0
+fate-h264-conformance-frext-frext01_jvc_d:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FREXT01_JVC_D.264
+fate-h264-conformance-frext-frext02_jvc_c:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FREXT02_JVC_C.264
+fate-h264-conformance-frext-frext1_panasonic_c:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt1_Panasonic.avc
+fate-h264-conformance-frext-frext2_panasonic_b:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt2_Panasonic.avc -vsync 0
+fate-h264-conformance-frext-frext3_panasonic_d:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt3_Panasonic.avc
+fate-h264-conformance-frext-frext4_panasonic_a:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt4_Panasonic.avc
+fate-h264-conformance-frext-frext_mmco4_sony_b:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt_MMCO4_Sony_B.264
+fate-h264-conformance-frext-hcaff1_hhi_b:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFF1_HHI.264
+fate-h264-conformance-frext-hcafr1_hhi_c:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR1_HHI.264
+fate-h264-conformance-frext-hcafr2_hhi_a:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR2_HHI.264
+fate-h264-conformance-frext-hcafr3_hhi_a:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR3_HHI.264
+fate-h264-conformance-frext-hcafr4_hhi_a:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR4_HHI.264
+fate-h264-conformance-frext-hcamff1_hhi_b:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAMFF1_HHI.264
+fate-h264-conformance-frext-hpca_brcm_c:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCA_BRCM_C.264
+fate-h264-conformance-frext-hpcadq_brcm_b:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCADQ_BRCM_B.264
+fate-h264-conformance-frext-hpcafl_bcrm_c:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAFL_BRCM_C.264 -vsync 0
+fate-h264-conformance-frext-hpcaflnl_bcrm_c:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAFLNL_BRCM_C.264 -vsync 0
+fate-h264-conformance-frext-hpcalq_brcm_b:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCALQ_BRCM_B.264
+fate-h264-conformance-frext-hpcamapalq_bcrm_b:    CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAMAPALQ_BRCM_B.264 -vsync 0
+fate-h264-conformance-frext-hpcamolq_brcm_b:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAMOLQ_BRCM_B.264
+fate-h264-conformance-frext-hpcanl_brcm_c:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCANL_BRCM_C.264
+fate-h264-conformance-frext-hpcaq2lq_brcm_b:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAQ2LQ_BRCM_B.264
+fate-h264-conformance-frext-hpcv_brcm_a:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCV_BRCM_A.264
+fate-h264-conformance-frext-hpcvfl_bcrm_a:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVFL_BRCM_A.264 -vsync 0
+fate-h264-conformance-frext-hpcvflnl_bcrm_a:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVFLNL_BRCM_A.264 -vsync 0
+fate-h264-conformance-frext-hpcvmolq_brcm_b:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVMOLQ_BRCM_B.264
+fate-h264-conformance-frext-hpcvnl_brcm_a:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVNL_BRCM_A.264
+fate-h264-conformance-frext-pph10i1_panasonic_a:  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I1_Panasonic_A.264 -pix_fmt yuv420p10le
+fate-h264-conformance-frext-pph10i2_panasonic_a:  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I2_Panasonic_A.264 -pix_fmt yuv420p10le
+fate-h264-conformance-frext-pph10i3_panasonic_a:  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I3_Panasonic_A.264 -pix_fmt yuv420p10le
+fate-h264-conformance-frext-pph10i4_panasonic_a:  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I4_Panasonic_A.264 -pix_fmt yuv420p10le
+fate-h264-conformance-frext-pph10i5_panasonic_a:  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I5_Panasonic_A.264 -pix_fmt yuv420p10le
+fate-h264-conformance-frext-pph10i6_panasonic_a:  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I6_Panasonic_A.264 -pix_fmt yuv420p10le
+fate-h264-conformance-frext-pph10i7_panasonic_a:  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I7_Panasonic_A.264 -pix_fmt yuv420p10le
+fate-h264-conformance-hcbp2_hhi_a:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/HCBP2_HHI_A.264
+fate-h264-conformance-hcmp1_hhi_a:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/HCMP1_HHI_A.264
+fate-h264-conformance-ls_sva_d:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/LS_SVA_D.264
+fate-h264-conformance-midr_mw_d:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MIDR_MW_D.264
+fate-h264-conformance-mps_mw_a:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MPS_MW_A.264
+fate-h264-conformance-mr1_bt_a:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR1_BT_A.h264
+fate-h264-conformance-mr1_mw_a:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR1_MW_A.264
+fate-h264-conformance-mr2_mw_a:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR2_MW_A.264
+fate-h264-conformance-mr2_tandberg_e:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR2_TANDBERG_E.264
+fate-h264-conformance-mr3_tandberg_b:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR3_TANDBERG_B.264
+fate-h264-conformance-mr4_tandberg_c:             CMD = framecrc -strict 1 -i $(TARGET_SAMPLES)/h264-conformance/MR4_TANDBERG_C.264
+fate-h264-conformance-mr5_tandberg_c:             CMD = framecrc -strict 1 -i $(TARGET_SAMPLES)/h264-conformance/MR5_TANDBERG_C.264
+fate-h264-conformance-mr6_bt_b:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR6_BT_B.h264
+fate-h264-conformance-mr7_bt_b:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR7_BT_B.h264
+fate-h264-conformance-mr8_bt_b:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR8_BT_B.h264
+fate-h264-conformance-mr9_bt_b:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR9_BT_B.h264
+fate-h264-conformance-mv1_brcm_d:                 CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/src19td.IBP.264
+fate-h264-conformance-nl1_sony_d:                 CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NL1_Sony_D.jsv
+fate-h264-conformance-nl2_sony_h:                 CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NL2_Sony_H.jsv
+fate-h264-conformance-nl3_sva_e:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NL3_SVA_E.264
+fate-h264-conformance-nlmq1_jvc_c:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NLMQ1_JVC_C.264
+fate-h264-conformance-nlmq2_jvc_c:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NLMQ2_JVC_C.264
+fate-h264-conformance-nrf_mw_e:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NRF_MW_E.264
+fate-h264-conformance-sharp_mp_field_1_b:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_1_B.jvt
+fate-h264-conformance-sharp_mp_field_2_b:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_2_B.jvt
+fate-h264-conformance-sharp_mp_field_3_b:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_3_B.jvt
+fate-h264-conformance-sharp_mp_paff_1r2:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_PAFF_1r2.jvt
+fate-h264-conformance-sharp_mp_paff_2r:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_PAFF_2.jvt
+fate-h264-conformance-sl1_sva_b:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SL1_SVA_B.264
+fate-h264-conformance-sva_ba1_b:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_BA1_B.264
+fate-h264-conformance-sva_ba2_d:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_BA2_D.264
+fate-h264-conformance-sva_base_b:                 CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_Base_B.264
+fate-h264-conformance-sva_cl1_e:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_CL1_E.264
+fate-h264-conformance-sva_fm1_e:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_FM1_E.264
+fate-h264-conformance-sva_nl1_b:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_NL1_B.264
+fate-h264-conformance-sva_nl2_e:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264
+
+fate-h264-bsf-mp4toannexb:                        CMD = md5 -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -vcodec copy -bsf h264_mp4toannexb -f h264
+fate-h264-crop-to-container:                      CMD = framemd5 -i $(TARGET_SAMPLES)/h264/crop-to-container-dims-canon.mov
+fate-h264-extreme-plane-pred:                     CMD = framemd5 -i $(TARGET_SAMPLES)/h264/extreme-plane-pred.h264
+fate-h264-interlace-crop:                         CMD = framecrc -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -vframes 3
+fate-h264-lossless:                               CMD = framecrc -i $(TARGET_SAMPLES)/h264/lossless.h264
 
-fate-h264-bsf-mp4toannexb:                        CMD = md5 -i $(SAMPLES)/h264/interlaced_crop.mp4 -vcodec copy -bsf h264_mp4toannexb -f h264
-fate-h264-extreme-plane-pred:                     CMD = framemd5 -i $(SAMPLES)/h264/extreme-plane-pred.h264
-fate-h264-interlace-crop:                         CMD = framecrc -i $(SAMPLES)/h264/interlaced_crop.mp4 -vframes 3
-fate-h264-lossless:                               CMD = framecrc -i $(SAMPLES)/h264/lossless.h264
+fate-h264-reinit-%:                               CMD = framecrc -i $(TARGET_SAMPLES)/h264/$(@:fate-h264-%=%).h264 -vf format=yuv444p10le,scale=w=352:h=288

libav-v10.1.tar.bz2/tests/fate/hevc.mak Added

@@ -0,0 +1,162 @@
+HEVC_SAMPLES =                  \
+    AMP_A_Samsung_4             \
+    AMP_B_Samsung_4             \
+    AMVP_C_Samsung_4            \
+    AMP_D_Hisilicon             \
+    AMP_E_Hisilicon             \
+    AMP_F_Hisilicon_3           \
+    AMVP_A_MTK_4                \
+    AMVP_B_MTK_4                \
+    CAINIT_A_SHARP_4            \
+    CAINIT_B_SHARP_4            \
+    CAINIT_C_SHARP_3            \
+    CAINIT_D_SHARP_3            \
+    CAINIT_E_SHARP_3            \
+    CAINIT_F_SHARP_3            \
+    CAINIT_G_SHARP_3            \
+    CAINIT_H_SHARP_3            \
+    CIP_A_Panasonic_3           \
+    cip_B_NEC_3                 \
+    CIP_C_Panasonic_2           \
+    DBLK_A_SONY_3               \
+    DBLK_B_SONY_3               \
+    DBLK_C_SONY_3               \
+    DBLK_D_VIXS_1               \
+    DBLK_D_VIXS_2               \
+    DBLK_E_VIXS_1               \
+    DBLK_E_VIXS_2               \
+    DBLK_F_VIXS_1               \
+    DBLK_F_VIXS_2               \
+    DBLK_G_VIXS_1               \
+    DBLK_G_VIXS_2               \
+    DELTAQP_B_SONY_3            \
+    DELTAQP_C_SONY_3            \
+    DSLICE_A_HHI_5              \
+    DSLICE_B_HHI_5              \
+    DSLICE_C_HHI_5              \
+    ENTP_A_LG_2                 \
+    ENTP_B_LG_2                 \
+    ENTP_C_LG_3                 \
+    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_4               \
+    LTRPSPS_A_Qualcomm_1        \
+    MAXBINS_A_TI_4              \
+    MAXBINS_B_TI_4              \
+    MAXBINS_C_TI_4              \
+    MERGE_A_TI_3                \
+    MERGE_B_TI_3                \
+    MERGE_C_TI_3                \
+    MERGE_D_TI_3                \
+    MERGE_E_TI_3                \
+    MERGE_F_MTK_4               \
+    MERGE_G_HHI_4               \
+    MVCLIP_A_qualcomm_3         \
+    MVDL1ZERO_A_docomo_3        \
+    MVEDGE_A_qualcomm_3         \
+    NUT_A_ericsson_5            \
+    PICSIZE_A_Bossen_1          \
+    PICSIZE_B_Bossen_1          \
+    PICSIZE_C_Bossen_1          \
+    PICSIZE_D_Bossen_1          \
+    PMERGE_A_TI_3               \
+    PMERGE_B_TI_3               \
+    PMERGE_C_TI_3               \
+    PMERGE_D_TI_3               \
+    PMERGE_E_TI_3               \
+    POC_A_Bossen_3              \
+    PPS_A_qualcomm_7            \
+    RAP_A_docomo_4              \
+    PS_A_VIDYO_3                \
+    PS_B_VIDYO_3                \
+    RAP_B_Bossen_1              \
+    RPLM_A_qualcomm_4           \
+    RPLM_B_qualcomm_4           \
+    RPS_A_docomo_4              \
+    RPS_B_qualcomm_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                 \
+    RQT_D_HHI_4                 \
+    RQT_E_HHI_4                 \
+    RQT_F_HHI_4                 \
+    RQT_G_HHI_4                 \
+    SAO_A_MediaTek_4            \
+    SAO_B_MediaTek_5            \
+    SAO_C_Samsung_4             \
+    SAO_D_Samsung_4             \
+    SAO_E_Canon_4               \
+    SAO_F_Canon_3               \
+    SAO_G_Canon_3               \
+    SDH_A_Orange_3              \
+    SLICES_A_Rovi_3             \
+    SLIST_A_Sony_4              \
+    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_3                 \
+    TSCL_A_VIDYO_5              \
+    TSCL_B_VIDYO_4              \
+    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       \
+    WPP_B_ericsson_MAIN_2       \
+    WPP_C_ericsson_MAIN_2       \
+    WPP_D_ericsson_MAIN_2       \
+    WPP_E_ericsson_MAIN_2       \
+    WPP_F_ericsson_MAIN_2       \
+
+HEVC_SAMPLES_10BIT =            \
+    DBLK_A_MAIN10_VIXS_2        \
+    WP_A_MAIN10_Toshiba_3       \
+    WP_MAIN10_B_Toshiba_3       \
+    WPP_A_ericsson_MAIN10_2     \
+    WPP_B_ericsson_MAIN10_2     \
+    WPP_C_ericsson_MAIN10_2     \
+    WPP_D_ericsson_MAIN10_2     \
+    WPP_E_ericsson_MAIN10_2     \
+    WPP_F_ericsson_MAIN10_2     \
+
+# do not pass:
+# DELTAQP_A_BRCM_4.bit -- TODO uses CRC instead of MD5
+# HRD_A_Fujitsu_2.bin -- TODO uses hash 2 ("checksum")
+# TSUNEQBD_A_MAIN10_Technicolor_2.bit (segfault)
+
+define FATE_HEVC_TEST
+FATE_HEVC += fate-hevc-conformance-$(1)
+fate-hevc-conformance-$(1): CMD = framecrc -vsync 0 -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit
+endef
+
+define FATE_HEVC_TEST_10BIT
+FATE_HEVC += fate-hevc-conformance-$(1)
+fate-hevc-conformance-$(1): CMD = framecrc -vsync 0 -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv420p10le
+endef
+
+$(foreach N,$(HEVC_SAMPLES),$(eval $(call FATE_HEVC_TEST,$(N))))
+$(foreach N,$(HEVC_SAMPLES_10BIT),$(eval $(call FATE_HEVC_TEST_10BIT,$(N))))
+
+FATE_HEVC-$(call DEMDEC, HEVC, HEVC) += $(FATE_HEVC)
+
+FATE_SAMPLES_AVCONV += $(FATE_HEVC-yes)
+
+fate-hevc: $(FATE_HEVC-yes)

libav-v9.6.tar.bz2/tests/fate/image.mak -> libav-v10.1.tar.bz2/tests/fate/image.mak Changed

@@ -1,32 +1,35 @@
 FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, DPX) += fate-dpx
-fate-dpx: CMD = framecrc -i $(SAMPLES)/dpx/lighthouse_rgb48.dpx
+fate-dpx: CMD = framecrc -i $(TARGET_SAMPLES)/dpx/lighthouse_rgb48.dpx
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor
-fate-pictor: CMD = framecrc -i $(SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24
+fate-pictor: CMD = framecrc -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24
+
+FATE_SAMPLES_AVCONV-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser
+fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/libav_4x_concat.png -pix_fmt rgba
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PTX) += fate-ptx
-fate-ptx: CMD = framecrc -i $(SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
+fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
 
 FATE_SUNRASTER += fate-sunraster-1bit-raw
-fate-sunraster-1bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-1bit-raw.sun
+fate-sunraster-1bit-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-1bit-raw.sun
 
 FATE_SUNRASTER += fate-sunraster-1bit-rle
-fate-sunraster-1bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-1bit-rle.sun
+fate-sunraster-1bit-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-1bit-rle.sun
 
 FATE_SUNRASTER += fate-sunraster-8bit-raw
-fate-sunraster-8bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-8bit-raw.sun -pix_fmt rgb24
+fate-sunraster-8bit-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-8bit-raw.sun -pix_fmt rgb24
 
 FATE_SUNRASTER += fate-sunraster-8bit_gray-raw
-fate-sunraster-8bit_gray-raw: CMD = framecrc -i $(SAMPLES)/sunraster/gray.ras
+fate-sunraster-8bit_gray-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/gray.ras
 
 FATE_SUNRASTER += fate-sunraster-8bit-rle
-fate-sunraster-8bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-8bit-rle.sun -pix_fmt rgb24
+fate-sunraster-8bit-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-8bit-rle.sun -pix_fmt rgb24
 
 FATE_SUNRASTER += fate-sunraster-24bit-raw
-fate-sunraster-24bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-raw.sun
+fate-sunraster-24bit-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-24bit-raw.sun
 
 FATE_SUNRASTER += fate-sunraster-24bit-rle
-fate-sunraster-24bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-rle.sun
+fate-sunraster-24bit-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-24bit-rle.sun
 
 FATE_SUNRASTER-$(call DEMDEC, IMAGE2, SUNRAST) += $(FATE_SUNRASTER)
 
@@ -52,24 +55,24 @@
 FATE_SAMPLES_AVCONV += $(FATE_TARGA-yes)
 fate-targa: $(FATE_TARGA-yes)
 
-fate-targa-conformance-CBW8:  CMD = framecrc -i $(SAMPLES)/targa-conformance/CBW8.TGA
-fate-targa-conformance-CCM8:  CMD = framecrc -i $(SAMPLES)/targa-conformance/CCM8.TGA  -pix_fmt rgba
-fate-targa-conformance-CTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC16.TGA -pix_fmt rgb555le
-fate-targa-conformance-CTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC24.TGA
-fate-targa-conformance-CTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC32.TGA -pix_fmt bgra
-fate-targa-conformance-UBW8:  CMD = framecrc -i $(SAMPLES)/targa-conformance/UBW8.TGA
-fate-targa-conformance-UCM8:  CMD = framecrc -i $(SAMPLES)/targa-conformance/UCM8.TGA  -pix_fmt rgba
-fate-targa-conformance-UTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC16.TGA -pix_fmt rgb555le
-fate-targa-conformance-UTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC24.TGA
-fate-targa-conformance-UTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC32.TGA -pix_fmt bgra
+fate-targa-conformance-CBW8:  CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CBW8.TGA
+fate-targa-conformance-CCM8:  CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CCM8.TGA  -pix_fmt rgba
+fate-targa-conformance-CTC16: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CTC16.TGA -pix_fmt rgb555le
+fate-targa-conformance-CTC24: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CTC24.TGA
+fate-targa-conformance-CTC32: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CTC32.TGA -pix_fmt bgra
+fate-targa-conformance-UBW8:  CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UBW8.TGA
+fate-targa-conformance-UCM8:  CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UCM8.TGA  -pix_fmt rgba
+fate-targa-conformance-UTC16: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UTC16.TGA -pix_fmt rgb555le
+fate-targa-conformance-UTC24: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UTC24.TGA
+fate-targa-conformance-UTC32: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UTC32.TGA -pix_fmt bgra
 
-fate-targa-top-to-bottom: CMD = framecrc -i $(SAMPLES)/targa/lena-top-to-bottom.tga
+fate-targa-top-to-bottom: CMD = framecrc -i $(TARGET_SAMPLES)/targa/lena-top-to-bottom.tga
 
 FATE_TIFF += fate-tiff-fax-g3
-fate-tiff-fax-g3: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31D.TIF
+fate-tiff-fax-g3: CMD = framecrc -i $(TARGET_SAMPLES)/CCITT_fax/G31D.TIF
 
 FATE_TIFF += fate-tiff-fax-g3s
-fate-tiff-fax-g3s: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31DS.TIF
+fate-tiff-fax-g3s: CMD = framecrc -i $(TARGET_SAMPLES)/CCITT_fax/G31DS.TIF
 
 FATE_TIFF-$(call DEMDEC, IMAGE2, TIFF) += $(FATE_TIFF)

libav-v9.6.tar.bz2/tests/fate/indeo.mak -> libav-v10.1.tar.bz2/tests/fate/indeo.mak Changed

@@ -1,14 +1,17 @@
 FATE_INDEO-$(call DEMDEC, AVI, INDEO2) += fate-indeo2
-fate-indeo2: CMD = framecrc -i $(SAMPLES)/rt21/VPAR0026.AVI
+fate-indeo2: CMD = framecrc -i $(TARGET_SAMPLES)/rt21/VPAR0026.AVI
 
 FATE_INDEO-$(call DEMDEC, MOV, INDEO3) += fate-indeo3
-fate-indeo3: CMD = framecrc -i $(SAMPLES)/iv32/cubes.mov
+fate-indeo3: CMD = framecrc -i $(TARGET_SAMPLES)/iv32/cubes.mov
+
+FATE_INDEO-$(call DEMDEC, AVI, INDEO3) += fate-indeo3-2
+fate-indeo3-2: CMD = framecrc -i $(TARGET_SAMPLES)/iv32/OPENINGH.avi
 
 FATE_INDEO-$(call DEMDEC, AVI, INDEO4) += fate-indeo4
-fate-indeo4: CMD = framecrc -i $(SAMPLES)/iv41/indeo41-partial.avi -an
+fate-indeo4: CMD = framecrc -i $(TARGET_SAMPLES)/iv41/indeo41-partial.avi -an
 
 FATE_INDEO-$(call DEMDEC, AVI, INDEO5) += fate-indeo5
-fate-indeo5: CMD = framecrc -i $(SAMPLES)/iv50/Educ_Movie_DeadlyForce.avi -an
+fate-indeo5: CMD = framecrc -i $(TARGET_SAMPLES)/iv50/Educ_Movie_DeadlyForce.avi -an
 
 FATE_SAMPLES_AVCONV += $(FATE_INDEO-yes)
 fate-indeo: $(FATE_INDEO-yes)

libav-v10.1.tar.bz2/tests/fate/libavdevice.mak Added

libav-v9.6.tar.bz2/tests/fate/libavformat.mak -> libav-v10.1.tar.bz2/tests/fate/libavformat.mak Changed

libav-v10.1.tar.bz2/tests/fate/libavresample.mak Added

@@ -0,0 +1,54 @@
+CROSS_TEST = $(foreach I,$(1),                                        \
+                 $(foreach J,$(1),                                    \
+                     $(if $(filter-out $(I),$(J)),                    \
+                         $(eval $(call $(2),$(I),$(J),$(3),$(4),$(5))),    \
+                     )))
+
+MIX_CHANNELS = 1 2 3 4 5 6 7 8
+
+define MIX
+FATE_LAVR_MIX += fate-lavr-mix-$(3)-$(1)-$(2)
+fate-lavr-mix-$(3)-$(1)-$(2): tests/data/asynth-44100-$(1).wav
+fate-lavr-mix-$(3)-$(1)-$(2): CMD = avconv -i $(TARGET_PATH)/tests/data/asynth-44100-$(1).wav -ac $(2) -mix_coeff_type $(3) -internal_sample_fmt $(4) -f s16le -af atrim=end_sample=1024 -
+fate-lavr-mix-$(3)-$(1)-$(2): CMP = oneoff
+fate-lavr-mix-$(3)-$(1)-$(2): REF = $(SAMPLES)/lavr/lavr-mix-$(3)-$(1)-$(2)
+endef
+
+$(call CROSS_TEST,$(MIX_CHANNELS),MIX,q8,s16p)
+$(call CROSS_TEST,$(MIX_CHANNELS),MIX,q15,s16p)
+$(call CROSS_TEST,$(MIX_CHANNELS),MIX,flt,fltp)
+
+# test output zeroing with skipped corresponding input
+FATE_LAVR_MIX-$(call FILTERDEMDECENCMUX, CHANNELMAP RESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-lavr-mix-output-zero
+fate-lavr-mix-output-zero: tests/data/filtergraphs/lavr_mix_output_zero tests/data/asynth-44100-4.wav
+fate-lavr-mix-output-zero: CMP = oneoff
+fate-lavr-mix-output-zero: CMD = avconv -i $(TARGET_PATH)/tests/data/asynth-44100-4.wav -filter_script $(TARGET_PATH)/tests/data/filtergraphs/lavr_mix_output_zero -f s16le -
+fate-lavr-mix-output-zero: REF = $(SAMPLES)/lavr/lavr-mix-output-zero
+
+FATE_LAVR_MIX-$(call FILTERDEMDECENCMUX, RESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_LAVR_MIX)
+fate-lavr-mix: $(FATE_LAVR_MIX-yes)
+FATE_LAVR += $(FATE_LAVR_MIX-yes)
+
+SAMPLERATES = 2626 8000 44100 48000 96000
+
+define RESAMPLE
+FATE_LAVR_RESAMPLE += fate-lavr-resample-$(3)-$(1)-$(2)
+fate-lavr-resample-$(3)-$(1)-$(2): tests/data/asynth-$(1)-1.wav
+fate-lavr-resample-$(3)-$(1)-$(2): CMD = avconv -i $(TARGET_PATH)/tests/data/asynth-$(1)-1.wav -ar $(2) -internal_sample_fmt $(3) -f $(4) -af atrim=end_sample=10240 -
+fate-lavr-resample-$(3)-$(1)-$(2): CMP = oneoff
+fate-lavr-resample-$(3)-$(1)-$(2): CMP_UNIT = $(5)
+fate-lavr-resample-$(3)-$(1)-$(2): FUZZ = 6
+fate-lavr-resample-$(3)-$(1)-$(2): REF = $(SAMPLES)/lavr/lavr-resample-$(3)-$(1)-$(2)
+endef
+
+$(call CROSS_TEST,$(SAMPLERATES),RESAMPLE,s16p,s16le,s16)
+$(call CROSS_TEST,$(SAMPLERATES),RESAMPLE,s32p,s32le,s16)
+$(call CROSS_TEST,$(SAMPLERATES),RESAMPLE,fltp,f32le,f32)
+$(call CROSS_TEST,$(SAMPLERATES),RESAMPLE,dblp,f64le,f64)
+
+FATE_LAVR_RESAMPLE-$(call FILTERDEMDECENCMUX, RESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_LAVR_RESAMPLE)
+fate-lavr-resample: $(FATE_LAVR_RESAMPLE-yes)
+FATE_LAVR += $(FATE_LAVR_RESAMPLE-yes)
+
+FATE_SAMPLES_AVCONV += $(FATE_LAVR)
+fate-lavr: $(FATE_LAVR)

libav-v9.6.tar.bz2/tests/fate/libavutil.mak -> libav-v10.1.tar.bz2/tests/fate/libavutil.mak Changed

@@ -8,6 +8,11 @@
 fate-aes: CMD = run libavutil/aes-test
 fate-aes: REF = /dev/null
 
+FATE_LIBAVUTIL += fate-atomic
+fate-atomic: libavutil/atomic-test$(EXESUF)
+fate-atomic: CMD = run libavutil/atomic-test
+fate-atomic: REF = /dev/null
+
 FATE_LIBAVUTIL += fate-avstring
 fate-avstring: libavutil/avstring-test$(EXESUF)
 fate-avstring: CMD = run libavutil/avstring-test
@@ -37,6 +42,10 @@
 fate-fifo: libavutil/fifo-test$(EXESUF)
 fate-fifo: CMD = run libavutil/fifo-test
 
+FATE_LIBAVUTIL += fate-hmac
+fate-hmac: libavutil/hmac-test$(EXESUF)
+fate-hmac: CMD = run libavutil/hmac-test
+
 FATE_LIBAVUTIL += fate-md5
 fate-md5: libavutil/md5-test$(EXESUF)
 fate-md5: CMD = run libavutil/md5-test
@@ -49,6 +58,11 @@
 fate-sha: libavutil/sha-test$(EXESUF)
 fate-sha: CMD = run libavutil/sha-test
 
+FATE_LIBAVUTIL += fate-tree
+fate-tree: libavutil/tree-test$(EXESUF)
+fate-tree: CMD = run libavutil/tree-test
+fate-tree: REF = /dev/null
+
 FATE_LIBAVUTIL += fate-xtea
 fate-xtea: libavutil/xtea-test$(EXESUF)
 fate-xtea: CMD = run libavutil/xtea-test

libav-v9.6.tar.bz2/tests/fate/lossless-audio.mak -> libav-v10.1.tar.bz2/tests/fate/lossless-audio.mak Changed

@@ -1,20 +1,22 @@
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, ALAC) += fate-lossless-alac
-fate-lossless-alac: CMD = md5 -i $(SAMPLES)/lossless-audio/inside.m4a -f s16le
+fate-lossless-alac: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/inside.m4a -f s16le
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MLP, MLP) += fate-lossless-meridianaudio
-fate-lossless-meridianaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le
-
-FATE_SAMPLES_AVCONV-$(call DEMDEC, APE, APE) += fate-lossless-monkeysaudio
-fate-lossless-monkeysaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le
+fate-lossless-meridianaudio: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RALF) += fate-ralf
-fate-ralf: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.rmvb -vn -f s16le
+fate-ralf: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.rmvb -vn -f s16le
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, SHORTEN, SHORTEN) += fate-lossless-shorten
-fate-lossless-shorten: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le
+fate-lossless-shorten: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le
+
+FATE_SAMPLES_AVCONV-$(call DEMDEC, TAK, TAK) += fate-lossless-tak
+fate-lossless-tak: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.tak -f s16le
+fate-lossless-tak: CMP = oneline
+fate-lossless-tak: REF = a28d4e5f2192057f7d4bece870f40bd0
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, TTA, TTA) += fate-lossless-tta
-fate-lossless-tta: CMD = crc -i $(SAMPLES)/lossless-audio/inside.tta
+fate-lossless-tta: CMD = crc -i $(TARGET_SAMPLES)/lossless-audio/inside.tta
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, WMALOSSLESS) += fate-lossless-wma
-fate-lossless-wma: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.wma -f s16le
+fate-lossless-wma: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.wma -f s16le

libav-v9.6.tar.bz2/tests/fate/lossless-video.mak -> libav-v10.1.tar.bz2/tests/fate/lossless-video.mak Changed

@@ -1,47 +1,50 @@
+FATE_CLLC += fate-cllc-argb
+fate-cllc-argb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-argb.avi
+
 FATE_CLLC += fate-cllc-rgb
-fate-cllc-rgb: CMD = framecrc -i $(SAMPLES)/cllc/sample-cllc-rgb.avi
+fate-cllc-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-rgb.avi
 
-FATE_CLLC += fate-cllc-argb
-fate-cllc-argb: CMD = framecrc -i $(SAMPLES)/cllc/sample-cllc-argb.avi
+FATE_CLLC += fate-cllc-yuy2-noblock
+fate-cllc-yuy2-noblock: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-yuy2-noblock.avi
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, CLLC) += $(FATE_CLLC)
 fate-cllc: $(FATE_CLLC)
 
 FATE_LAGARITH += fate-lagarith-rgb24
-fate-lagarith-rgb24: CMD = framecrc -i $(SAMPLES)/lagarith/lag-rgb24.avi
+fate-lagarith-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-rgb24.avi
 
 FATE_LAGARITH += fate-lagarith-rgb32
-fate-lagarith-rgb32: CMD = framecrc -i $(SAMPLES)/lagarith/lag-rgb32.avi -pix_fmt bgra
+fate-lagarith-rgb32: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-rgb32.avi -pix_fmt bgra
 
 FATE_LAGARITH += fate-lagarith-yuy2
-fate-lagarith-yuy2: CMD = framecrc -i $(SAMPLES)/lagarith/lag-yuy2.avi
+fate-lagarith-yuy2: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-yuy2.avi
 
 FATE_LAGARITH += fate-lagarith-yv12
-fate-lagarith-yv12: CMD = framecrc -i $(SAMPLES)/lagarith/lag-yv12.avi
+fate-lagarith-yv12: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-yv12.avi
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, LAGARITH) += $(FATE_LAGARITH)
 fate-lagarith: $(FATE_LAGARITH)
 
 FATE_LOCO += fate-loco-rgb
-fate-loco-rgb: CMD = framecrc -i $(SAMPLES)/loco/pig-loco-rgb.avi
+fate-loco-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/loco/pig-loco-rgb.avi
 
 FATE_LOCO += fate-loco-yuy2
-fate-loco-yuy2: CMD = framecrc -i $(SAMPLES)/loco/pig-loco-0.avi
+fate-loco-yuy2: CMD = framecrc -i $(TARGET_SAMPLES)/loco/pig-loco-0.avi
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, LOCO) += $(FATE_LOCO)
 fate-loco: $(FATE_LOCO)
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, MSRLE) += fate-msrle-8bit
-fate-msrle-8bit: CMD = framecrc -i $(SAMPLES)/msrle/Search-RLE.avi -pix_fmt rgb24
+fate-msrle-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/msrle/Search-RLE.avi -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, MSZH) += fate-mszh
-fate-mszh: CMD = framecrc -i $(SAMPLES)/lcl/mszh-1frame.avi
+fate-mszh: CMD = framecrc -i $(TARGET_SAMPLES)/lcl/mszh-1frame.avi
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VBLE) += fate-vble
-fate-vble: CMD = framecrc -i $(SAMPLES)/vble/flowers-partial-2MB.avi
-
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, ZLIB) += fate-zlib
-fate-zlib: CMD = framecrc -i $(SAMPLES)/lcl/zlib-1frame.avi
+fate-vble: CMD = framecrc -i $(TARGET_SAMPLES)/vble/flowers-partial-2MB.avi
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, ZEROCODEC) += fate-zerocodec
-fate-zerocodec: CMD = framecrc -i $(SAMPLES)/zerocodec/sample-zeco.avi
+fate-zerocodec: CMD = framecrc -i $(TARGET_SAMPLES)/zerocodec/sample-zeco.avi
+
+FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, ZLIB) += fate-zlib
+fate-zlib: CMD = framecrc -i $(TARGET_SAMPLES)/lcl/zlib-1frame.avi

libav-v9.6.tar.bz2/tests/fate/microsoft.mak -> libav-v10.1.tar.bz2/tests/fate/microsoft.mak Changed

@@ -1,42 +1,60 @@
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, MSMPEG4V1) += fate-msmpeg4v1
-fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an
+fate-msmpeg4v1: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/msmpeg4v1/mpg4.avi -an
 
-FATE_MSVIDEO1 += fate-msvideo1-16bit
-fate-msvideo1-16bit: CMD = framecrc -i $(SAMPLES)/cram/clock-cram16.avi -pix_fmt rgb24
+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 $(SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24
+fate-msvideo1-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24
+
+FATE_MSVIDEO1 += fate-msvideo1-16bit
+fate-msvideo1-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/cram/clock-cram16.avi -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, MSVIDEO1) += $(FATE_MSVIDEO1)
 fate-msvideo1: $(FATE_MSVIDEO1)
 
 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 $(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 $(SAMPLES)/wmv8/wmv_drm.wmv -acodec copy -vcodec copy
+fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -acodec copy -vcodec copy
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, WMV3) += $(FATE_WMV8_DRM)
 fate-wmv8_drm: $(FATE_WMV8_DRM)
 
 FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa00040
-fate-vc1_sa00040: CMD = framecrc -i $(SAMPLES)/vc1/SA00040.vc1
+fate-vc1_sa00040: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA00040.vc1
 
 FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa00050
-fate-vc1_sa00050: CMD = framecrc -i $(SAMPLES)/vc1/SA00050.vc1
+fate-vc1_sa00050: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA00050.vc1
 
 FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa10091
-fate-vc1_sa10091: CMD = framecrc -i $(SAMPLES)/vc1/SA10091.vc1
-
-FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa20021
-fate-vc1_sa20021: CMD = framecrc -i $(SAMPLES)/vc1/SA20021.vc1
+fate-vc1_sa10091: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA10091.vc1
 
 FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa10143
-fate-vc1_sa10143: CMD = framecrc -i $(SAMPLES)/vc1/SA10143.vc1
+fate-vc1_sa10143: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA10143.vc1
+
+FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa20021
+fate-vc1_sa20021: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA20021.vc1
 
 FATE_VC1-$(CONFIG_MOV_DEMUXER) += fate-vc1-ism
-fate-vc1-ism: CMD = framecrc -i $(SAMPLES)/isom/vc1-wmapro.ism -an
+fate-vc1-ism: CMD = framecrc -i $(TARGET_SAMPLES)/isom/vc1-wmapro.ism -an
 
 FATE_SAMPLES_AVCONV-$(CONFIG_VC1_DECODER) += $(FATE_VC1-yes)
 fate-vc1: $(FATE_VC1-yes)

libav-v10.1.tar.bz2/tests/fate/monkeysaudio.mak Added

@@ -0,0 +1,20 @@
+APE_VERSIONS = 380 388 389b1 391b1 392b2 394b1
+
+define FATE_APE_SUITE
+FATE_APE += fate-lossless-monkeysaudio-$(1)-normal
+fate-lossless-monkeysaudio-$(1)-normal: CMD = crc -i $(TARGET_SAMPLES)/lossless-audio/luckynight-mac$(1)-c2000.ape -af atrim=end_sample=73728
+fate-lossless-monkeysaudio-$(1)-normal: REF = CRC=0x5d08c17e
+fate-lossless-monkeysaudio-$(1)-normal: CMP = oneline
+FATE_APE += fate-lossless-monkeysaudio-$(1)-extrahigh
+fate-lossless-monkeysaudio-$(1)-extrahigh: CMD = crc -i $(TARGET_SAMPLES)/lossless-audio/luckynight-mac$(1)-c4000.ape -af atrim=end_sample=73728
+fate-lossless-monkeysaudio-$(1)-extrahigh: REF = CRC=0x5d08c17e
+fate-lossless-monkeysaudio-$(1)-extrahigh: CMP = oneline
+endef
+
+$(foreach N,$(APE_VERSIONS),$(eval $(call FATE_APE_SUITE,$(N))))
+
+FATE_APE += fate-lossless-monkeysaudio-399
+fate-lossless-monkeysaudio-399: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le
+
+FATE_SAMPLES_AVCONV-$(call DEMDEC, APE, APE) += $(FATE_APE)
+fate-lossless-monkeysaudio: $(FATE_APE)

libav-v9.6.tar.bz2/tests/fate/mp3.mak -> libav-v10.1.tar.bz2/tests/fate/mp3.mak Changed

@@ -1,33 +1,33 @@
 FATE_MP3 += fate-mp3-float-conf-compl
-fate-mp3-float-conf-compl: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/compl.bit
+fate-mp3-float-conf-compl: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/compl.bit
 fate-mp3-float-conf-compl: REF = $(SAMPLES)/mp3-conformance/compl.pcm
 
 FATE_MP3 += fate-mp3-float-conf-he_32khz
-fate-mp3-float-conf-he_32khz: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/he_32khz.bit -fs 343296
+fate-mp3-float-conf-he_32khz: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_32khz.bit -fs 343296
 fate-mp3-float-conf-he_32khz: REF = $(SAMPLES)/mp3-conformance/he_32khz.pcm
 
 FATE_MP3 += fate-mp3-float-conf-he_44khz
-fate-mp3-float-conf-he_44khz: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/he_44khz.bit -fs 942336
+fate-mp3-float-conf-he_44khz: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_44khz.bit -fs 942336
 fate-mp3-float-conf-he_44khz: REF = $(SAMPLES)/mp3-conformance/he_44khz.pcm
 
 FATE_MP3 += fate-mp3-float-conf-he_48khz
-fate-mp3-float-conf-he_48khz: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/he_48khz.bit -fs 343296
+fate-mp3-float-conf-he_48khz: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_48khz.bit -fs 343296
 fate-mp3-float-conf-he_48khz: REF = $(SAMPLES)/mp3-conformance/he_48khz.pcm
 
 FATE_MP3 += fate-mp3-float-conf-hecommon
-fate-mp3-float-conf-hecommon: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/hecommon.bit -fs 133632
+fate-mp3-float-conf-hecommon: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/hecommon.bit -fs 133632
 fate-mp3-float-conf-hecommon: REF = $(SAMPLES)/mp3-conformance/hecommon.pcm
 
 FATE_MP3 += fate-mp3-float-conf-si
-fate-mp3-float-conf-si: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/si.bit -fs 269568
+fate-mp3-float-conf-si: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/si.bit -fs 269568
 fate-mp3-float-conf-si: REF = $(SAMPLES)/mp3-conformance/si.pcm
 
 FATE_MP3 += fate-mp3-float-conf-si_block
-fate-mp3-float-conf-si_block: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/si_block.bit -fs 145152
+fate-mp3-float-conf-si_block: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/si_block.bit -fs 145152
 fate-mp3-float-conf-si_block: REF = $(SAMPLES)/mp3-conformance/si_block.pcm
 
 FATE_MP3 += fate-mp3-float-extra_overread
-fate-mp3-float-extra_overread: CMD = pcm -c:a mp3float -i $(SAMPLES)/mpegaudio/extra_overread.mp3
+fate-mp3-float-extra_overread: CMD = pcm -c:a mp3float -i $(TARGET_SAMPLES)/mpegaudio/extra_overread.mp3
 fate-mp3-float-extra_overread: REF = $(SAMPLES)/mpegaudio/extra_overread.pcm
 
 $(FATE_MP3): CMP = stddev

libav-v9.6.tar.bz2/tests/fate/mpc.mak -> libav-v10.1.tar.bz2/tests/fate/mpc.mak Changed

libav-v9.6.tar.bz2/tests/fate/pcm.mak -> libav-v10.1.tar.bz2/tests/fate/pcm.mak Changed

@@ -1,26 +1,26 @@
 FATE_SAMPLES_PCM += fate-iff-pcm
-fate-iff-pcm: CMD = md5 -i $(SAMPLES)/iff/Bells -f s16le
+fate-iff-pcm: CMD = md5 -i $(TARGET_SAMPLES)/iff/Bells -f s16le
 
 FATE_SAMPLES_PCM += fate-pcm_dvd
-fate-pcm_dvd: CMD = framecrc -i $(SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn
+fate-pcm_dvd: CMD = framecrc -i $(TARGET_SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn
 
 FATE_SAMPLES_PCM += fate-pcm-planar
-fate-pcm-planar: CMD = framecrc -i $(SAMPLES)/ea-mad/xeasport.mad -vn
+fate-pcm-planar: CMD = framecrc -i $(TARGET_SAMPLES)/ea-mad/xeasport.mad -vn
 
 FATE_SAMPLES_PCM += fate-pcm_s16be-stereo
-fate-pcm_s16be-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-twos.mov -f s16le
+fate-pcm_s16be-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-twos.mov -f s16le
 
 FATE_SAMPLES_PCM += fate-pcm_s16le-stereo
-fate-pcm_s16le-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-sowt.mov -f s16le
+fate-pcm_s16le-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-L-sowt.mov -f s16le
 
 FATE_SAMPLES_PCM += fate-pcm_u8-mono
-fate-pcm_u8-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-raw.mov -f s16le
+fate-pcm_u8-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-8-raw.mov -f s16le
 
 FATE_SAMPLES_PCM += fate-pcm_u8-stereo
-fate-pcm_u8-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-raw.mov -f s16le
+fate-pcm_u8-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-8-raw.mov -f s16le
 
 FATE_SAMPLES_PCM += fate-w64
-fate-w64: CMD = crc -i $(SAMPLES)/w64/w64-pcm16.w64
+fate-w64: CMD = crc -i $(TARGET_SAMPLES)/w64/w64-pcm16.w64
 
 FATE_PCM += fate-dcinema-encode
 fate-dcinema-encode: tests/data/asynth-96000-6.wav

libav-v9.6.tar.bz2/tests/fate/probe.mak -> libav-v10.1.tar.bz2/tests/fate/probe.mak Changed

libav-v9.6.tar.bz2/tests/fate/prores.mak -> libav-v10.1.tar.bz2/tests/fate/prores.mak Changed

@@ -7,8 +7,8 @@
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PRORES) += $(FATE_PRORES)
 fate-prores: $(FATE_PRORES)
 
-fate-prores-422:       CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov -pix_fmt yuv422p10le
-fate-prores-422_hq:    CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_HQ.mov -pix_fmt yuv422p10le
-fate-prores-422_lt:    CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_LT.mov -pix_fmt yuv422p10le
-fate-prores-422_proxy: CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov -pix_fmt yuv422p10le
-fate-prores-alpha:     CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuv444p10le
+fate-prores-422:       CMD = framecrc -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov -pix_fmt yuv422p10le
+fate-prores-422_hq:    CMD = framecrc -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422_HQ.mov -pix_fmt yuv422p10le
+fate-prores-422_lt:    CMD = framecrc -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422_LT.mov -pix_fmt yuv422p10le
+fate-prores-422_proxy: CMD = framecrc -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov -pix_fmt yuv422p10le
+fate-prores-alpha:     CMD = framecrc -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuva444p10le

libav-v9.6.tar.bz2/tests/fate/qt.mak -> libav-v10.1.tar.bz2/tests/fate/qt.mak Changed

@@ -1,50 +1,50 @@
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, EIGHTBPS) += fate-8bps
-fate-8bps: CMD = framecrc -i $(SAMPLES)/8bps/full9iron-partial.mov -pix_fmt rgb24
+fate-8bps: CMD = framecrc -i $(TARGET_SAMPLES)/8bps/full9iron-partial.mov -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, QDM2) += fate-qdm2
-fate-qdm2: CMD = pcm -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.mov
+fate-qdm2: CMD = pcm -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.mov
 fate-qdm2: CMP = oneoff
 fate-qdm2: REF = $(SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.pcm
 fate-qdm2: FUZZ = 2
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-mono
-fate-qt-alaw-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-16-B-alaw.mov -f s16le
+fate-qt-alaw-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-alaw.mov -f s16le
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-stereo
-fate-qt-alaw-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-alaw.mov -f s16le
+fate-qt-alaw-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-alaw.mov -f s16le
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-mono
-fate-qt-ima4-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-16-B-ima4.mov -f s16le
+fate-qt-ima4-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-ima4.mov -f s16le
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-stereo
-fate-qt-ima4-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-ima4.mov -f s16le
+fate-qt-ima4-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-ima4.mov -f s16le
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-mono
-fate-qt-mac3-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-MAC3.mov -f s16le
+fate-qt-mac3-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-8-MAC3.mov -f s16le
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-stereo
-fate-qt-mac3-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-MAC3.mov -f s16le
+fate-qt-mac3-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-8-MAC3.mov -f s16le
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-mono
-fate-qt-mac6-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-MAC6.mov -f s16le
+fate-qt-mac6-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-8-MAC6.mov -f s16le
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-stereo
-fate-qt-mac6-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-MAC6.mov -f s16le
+fate-qt-mac6-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-8-MAC6.mov -f s16le
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-mono
-fate-qt-ulaw-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-16-B-ulaw.mov -f s16le
+fate-qt-ulaw-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-ulaw.mov -f s16le
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-stereo
-fate-qt-ulaw-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-ulaw.mov -f s16le
+fate-qt-ulaw-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-ulaw.mov -f s16le
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, QDRAW) += fate-quickdraw
-fate-quickdraw: CMD = framecrc -i $(SAMPLES)/quickdraw/Airplane.mov -pix_fmt rgb24
+fate-quickdraw: CMD = framecrc -i $(TARGET_SAMPLES)/quickdraw/Airplane.mov -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, RPZA) += fate-rpza
-fate-rpza: CMD = framecrc -i $(SAMPLES)/rpza/rpza2.mov -t 2 -pix_fmt rgb24
+fate-rpza: CMD = framecrc -i $(TARGET_SAMPLES)/rpza/rpza2.mov -t 2 -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, SVQ1) += fate-svq1
-fate-svq1: CMD = framecrc -i $(SAMPLES)/svq1/marymary-shackles.mov -an -t 10
+fate-svq1: CMD = framecrc -i $(TARGET_SAMPLES)/svq1/marymary-shackles.mov -an -t 10
 
 FATE_SAMPLES_AVCONV-$(call ALLYES, MOV_DEMUXER SVQ3_DECODER ZLIB) += fate-svq3
-fate-svq3: CMD = framecrc -i $(SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an
+fate-svq3: CMD = framecrc -i $(TARGET_SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an

libav-v9.6.tar.bz2/tests/fate/qtrle.mak -> libav-v10.1.tar.bz2/tests/fate/qtrle.mak Changed

@@ -1,23 +1,23 @@
 FATE_QTRLE += fate-qtrle-1bit
-fate-qtrle-1bit: CMD = framecrc -i $(SAMPLES)/qtrle/Animation-Monochrome.mov -an
+fate-qtrle-1bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/Animation-Monochrome.mov -an
 
 FATE_QTRLE += fate-qtrle-2bit
-fate-qtrle-2bit: CMD = framecrc -i $(SAMPLES)/qtrle/Animation-4Greys.mov -pix_fmt rgb24 -an
+fate-qtrle-2bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/Animation-4Greys.mov -pix_fmt rgb24 -an
 
 FATE_QTRLE += fate-qtrle-4bit
-fate-qtrle-4bit: CMD = framecrc -i $(SAMPLES)/qtrle/Animation-16Greys.mov -pix_fmt rgb24 -an
+fate-qtrle-4bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/Animation-16Greys.mov -pix_fmt rgb24 -an
 
 FATE_QTRLE += fate-qtrle-8bit
-fate-qtrle-8bit: CMD = framecrc -i $(SAMPLES)/qtrle/criticalpath-credits.mov -pix_fmt rgb24 -an
+fate-qtrle-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/criticalpath-credits.mov -pix_fmt rgb24 -an
 
 FATE_QTRLE += fate-qtrle-16bit
-fate-qtrle-16bit: CMD = framecrc -i $(SAMPLES)/qtrle/mr-cork-rle.mov -pix_fmt rgb24
+fate-qtrle-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/mr-cork-rle.mov -pix_fmt rgb24
 
 FATE_QTRLE += fate-qtrle-24bit
-fate-qtrle-24bit: CMD = framecrc -i $(SAMPLES)/qtrle/aletrek-rle.mov
+fate-qtrle-24bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/aletrek-rle.mov
 
 FATE_QTRLE += fate-qtrle-32bit
-fate-qtrle-32bit: CMD = framecrc -i $(SAMPLES)/qtrle/ultra_demo_720_480_32bpp_rle.mov -pix_fmt rgb24
+fate-qtrle-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/ultra_demo_720_480_32bpp_rle.mov -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, QTRLE) += $(FATE_QTRLE)
 fate-qtrle: $(FATE_QTRLE)

libav-v9.6.tar.bz2/tests/fate/real.mak -> libav-v10.1.tar.bz2/tests/fate/real.mak Changed

@@ -1,37 +1,37 @@
 FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RA_144) += fate-ra-144
-fate-ra-144: CMD = md5 -i $(SAMPLES)/real/ra3_in_rm_file.rm -f s16le
+fate-ra-144: CMD = md5 -i $(TARGET_SAMPLES)/real/ra3_in_rm_file.rm -f s16le
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RA_288) += fate-ra-288
-fate-ra-288: CMD = pcm -i $(SAMPLES)/real/ra_288.rm
+fate-ra-288: CMD = pcm -i $(TARGET_SAMPLES)/real/ra_288.rm
 fate-ra-288: CMP = oneoff
 fate-ra-288: REF = $(SAMPLES)/real/ra_288.pcm
 fate-ra-288: FUZZ = 2
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, COOK) += fate-ra-cook
-fate-ra-cook: CMD = pcm -i $(SAMPLES)/real/ra_cook.rm
+fate-ra-cook: CMD = pcm -i $(TARGET_SAMPLES)/real/ra_cook.rm
 fate-ra-cook: CMP = oneoff
 fate-ra-cook: REF = $(SAMPLES)/real/ra_cook.pcm
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RV30) += fate-rv30
-fate-rv30: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/real/rv30.rm -an
+fate-rv30: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/real/rv30.rm -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RV40) += fate-rv40
-fate-rv40: CMD = framecrc -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10 -an -vsync 0
+fate-rv40: CMD = framecrc -i $(TARGET_SAMPLES)/real/spygames-2MB.rmvb -t 10 -an -vsync 0
 
 FATE_SIPR += fate-sipr-5k0
-fate-sipr-5k0: CMD = pcm -i $(SAMPLES)/sipr/sipr_5k0.rm
+fate-sipr-5k0: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_5k0.rm
 fate-sipr-5k0: REF = $(SAMPLES)/sipr/sipr_5k0.pcm
 
 FATE_SIPR += fate-sipr-6k5
-fate-sipr-6k5: CMD = pcm -i $(SAMPLES)/sipr/sipr_6k5.rm
+fate-sipr-6k5: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_6k5.rm
 fate-sipr-6k5: REF = $(SAMPLES)/sipr/sipr_6k5.pcm
 
 FATE_SIPR += fate-sipr-8k5
-fate-sipr-8k5: CMD = pcm -i $(SAMPLES)/sipr/sipr_8k5.rm
+fate-sipr-8k5: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_8k5.rm
 fate-sipr-8k5: REF = $(SAMPLES)/sipr/sipr_8k5.pcm
 
 FATE_SIPR += fate-sipr-16k
-fate-sipr-16k: CMD = pcm -i $(SAMPLES)/sipr/sipr_16k.rm
+fate-sipr-16k: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_16k.rm
 fate-sipr-16k: REF = $(SAMPLES)/sipr/sipr_16k.pcm
 
 $(FATE_SIPR): CMP = oneoff

libav-v9.6.tar.bz2/tests/fate/screen.mak -> libav-v10.1.tar.bz2/tests/fate/screen.mak Changed

@@ -1,60 +1,63 @@
 # FIXME dropped frames in this test because of coarse timebase
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, CSCD) += fate-cscd
-fate-cscd: CMD = framecrc -i $(SAMPLES)/CSCD/sample_video.avi -an -pix_fmt rgb24
+fate-cscd: CMD = framecrc -i $(TARGET_SAMPLES)/CSCD/sample_video.avi -an -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, DXTORY) += fate-dxtory
-fate-dxtory: CMD = framecrc -i $(SAMPLES)/dxtory/dxtory_mic.avi
+fate-dxtory: CMD = framecrc -i $(TARGET_SAMPLES)/dxtory/dxtory_mic.avi
 
 FATE_FRAPS += fate-fraps-v0
-fate-fraps-v0: CMD = framecrc -i $(SAMPLES)/fraps/Griffin_Ragdoll01-partial.avi
+fate-fraps-v0: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/Griffin_Ragdoll01-partial.avi
 
 FATE_FRAPS += fate-fraps-v1
-fate-fraps-v1: CMD = framecrc -i $(SAMPLES)/fraps/sample-v1.avi -an
+fate-fraps-v1: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/sample-v1.avi -an
 
 FATE_FRAPS += fate-fraps-v2
-fate-fraps-v2: CMD = framecrc -i $(SAMPLES)/fraps/test3-nosound-partial.avi
+fate-fraps-v2: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/test3-nosound-partial.avi
 
 FATE_FRAPS += fate-fraps-v3
-fate-fraps-v3: CMD = framecrc -i $(SAMPLES)/fraps/psclient-partial.avi -pix_fmt rgb24
+fate-fraps-v3: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/psclient-partial.avi -pix_fmt rgb24
 
 FATE_FRAPS += fate-fraps-v4
-fate-fraps-v4: CMD = framecrc -i $(SAMPLES)/fraps/WoW_2006-11-03_14-58-17-19-nosound-partial.avi
+fate-fraps-v4: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/WoW_2006-11-03_14-58-17-19-nosound-partial.avi
 
 FATE_FRAPS += fate-fraps-v5
-fate-fraps-v5: CMD = framecrc -i $(SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi
+fate-fraps-v5: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, FRAPS) += $(FATE_FRAPS)
 fate-fraps: $(FATE_FRAPS)
 
 FATE_TSCC += fate-tscc-15bit
-fate-tscc-15bit: CMD = framecrc -i $(SAMPLES)/tscc/oneminute.avi -t 15 -pix_fmt rgb24
+fate-tscc-15bit: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/oneminute.avi -t 15 -pix_fmt rgb24
 
 FATE_TSCC += fate-tscc-32bit
-fate-tscc-32bit: CMD = framecrc -i $(SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an
+fate-tscc-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TSCC) += $(FATE_TSCC)
 fate-tscc: $(FATE_TSCC)
 
+FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TSCC2) += fate-tscc2
+fate-tscc2: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/tsc2_16bpp.avi
+
 FATE_VMNC += fate-vmnc-16bit
-fate-vmnc-16bit: CMD = framecrc -i $(SAMPLES)/VMnc/test.avi -pix_fmt rgb24
+fate-vmnc-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/VMnc/test.avi -pix_fmt rgb24
 
 FATE_VMNC += fate-vmnc-32bit
-fate-vmnc-32bit: CMD = framecrc -i $(SAMPLES)/VMnc/VS2k5DebugDemo-01-partial.avi -pix_fmt rgb24
+fate-vmnc-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/VMnc/VS2k5DebugDemo-01-partial.avi -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VMNC) += $(FATE_VMNC)
 fate-vmnc: $(FATE_VMNC)
 
 FATE_ZMBV += fate-zmbv-8bit
-fate-zmbv-8bit: CMD = framecrc -i $(SAMPLES)/zmbv/wc2_001-partial.avi -an -pix_fmt rgb24
+fate-zmbv-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/zmbv/wc2_001-partial.avi -an -pix_fmt rgb24
 
 FATE_ZMBV += fate-zmbv-15bit
-fate-zmbv-15bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_15bit.avi -pix_fmt rgb24 -t 25
+fate-zmbv-15bit: CMD = framecrc -i $(TARGET_SAMPLES)/zmbv/zmbv_15bit.avi -pix_fmt rgb24 -t 25
 
 FATE_ZMBV += fate-zmbv-16bit
-fate-zmbv-16bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_16bit.avi -pix_fmt rgb24 -t 25
+fate-zmbv-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/zmbv/zmbv_16bit.avi -pix_fmt rgb24 -t 25
 
 FATE_ZMBV += fate-zmbv-32bit
-fate-zmbv-32bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt rgb24 -t 25
+fate-zmbv-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt rgb24 -t 25
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, ZMBV) += $(FATE_ZMBV)
 fate-zmbv: $(FATE_ZMBV)

libav-v9.6.tar.bz2/tests/fate/seek.mak -> libav-v10.1.tar.bz2/tests/fate/seek.mak Changed

@@ -1,5 +1,13 @@
 # files from fate-acodec
 
+FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_IMA_QT,  AIFF)    += adpcm-ima_qt
+FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_IMA_WAV, WAV)     += adpcm-ima_wav
+FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_MS,      WAV)     += adpcm-ms
+FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_SWF,     FLV)     += adpcm-swf
+FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_YAMAHA,  WAV)     += adpcm-yamaha
+FATE_SEEK_ACODEC-$(call ENCDEC, ALAC,          MOV)     += alac
+FATE_SEEK_ACODEC-$(call ENCDEC, FLAC,          FLAC)    += flac
+FATE_SEEK_ACODEC-$(call ENCDEC, MP2,           MP2 MP3) += mp2
 FATE_SEEK_ACODEC-$(call ENCDEC, PCM_ALAW,      WAV)     += pcm-alaw
 FATE_SEEK_ACODEC-$(call ENCDEC, PCM_MULAW,     WAV)     += pcm-mulaw
 FATE_SEEK_ACODEC-$(call ENCDEC, PCM_S8,        MOV)     += pcm-s8
@@ -14,14 +22,6 @@
 FATE_SEEK_ACODEC-$(call ENCDEC, PCM_F32LE,     WAV)     += pcm-f32le
 FATE_SEEK_ACODEC-$(call ENCDEC, PCM_F64BE,     AU)      += pcm-f64be
 FATE_SEEK_ACODEC-$(call ENCDEC, PCM_F64LE,     WAV)     += pcm-f64le
-FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_IMA_QT,  AIFF)    += adpcm-ima_qt
-FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_IMA_WAV, WAV)     += adpcm-ima_wav
-FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_MS,      WAV)     += adpcm-ms
-FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_SWF,     FLV)     += adpcm-swf
-FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_YAMAHA,  WAV)     += adpcm-yamaha
-FATE_SEEK_ACODEC-$(call ENCDEC, ALAC,          MOV)     += alac
-FATE_SEEK_ACODEC-$(call ENCDEC, FLAC,          FLAC)    += flac
-FATE_SEEK_ACODEC-$(call ENCDEC, MP2,           MP2 MP3) += mp2
 
 fate-seek-acodec-adpcm-ima_qt:  SRC = fate/acodec-adpcm-ima_qt.aiff
 fate-seek-acodec-adpcm-ima_wav: SRC = fate/acodec-adpcm-ima_wav.wav
@@ -89,8 +89,6 @@
 FATE_SEEK_VSYNTH2-$(call ENCDEC, ROQ,           ROQ)     += roqvideo
 FATE_SEEK_VSYNTH2-$(call ENCDEC, RV10,          RM)      += rv10
 FATE_SEEK_VSYNTH2-$(call ENCDEC, RV20,          RM)      += rv20
-FATE_SEEK_VSYNTH2-$(call ENCDEC, SNOW,          AVI)     += snow
-FATE_SEEK_VSYNTH2-$(call ENCDEC, SNOW,          AVI)     += snow-ll
 FATE_SEEK_VSYNTH2-$(call ENCDEC, SVQ1,          MOV)     += svq1
 FATE_SEEK_VSYNTH2-$(call ENCDEC, WMV1,          AVI)     += wmv1
 FATE_SEEK_VSYNTH2-$(call ENCDEC, WMV2,          AVI)     += wmv2

libav-v9.6.tar.bz2/tests/fate/utvideo.mak -> libav-v10.1.tar.bz2/tests/fate/utvideo.mak Changed

@@ -1,37 +1,34 @@
+FATE_UTVIDEO += fate-utvideo_rgb_left
+fate-utvideo_rgb_left: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_rgb_left.avi
+
+FATE_UTVIDEO += fate-utvideo_rgb_median
+fate-utvideo_rgb_median: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_rgb_median.avi
+
 FATE_UTVIDEO += fate-utvideo_rgba_left
-fate-utvideo_rgba_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgba_left.avi
+fate-utvideo_rgba_left: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_rgba_left.avi
 
 FATE_UTVIDEO += fate-utvideo_rgba_median
-fate-utvideo_rgba_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgba_median.avi
+fate-utvideo_rgba_median: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_rgba_median.avi
 
 FATE_UTVIDEO += fate-utvideo_rgba_single_symbol
-fate-utvideo_rgba_single_symbol: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgba_single_symbol.avi
-
-FATE_UTVIDEO += fate-utvideo_rgb_left
-fate-utvideo_rgb_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgb_left.avi
-
-FATE_UTVIDEO += fate-utvideo_rgb_median
-fate-utvideo_rgb_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgb_median.avi
+fate-utvideo_rgba_single_symbol: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_rgba_single_symbol.avi
 
 FATE_UTVIDEO += fate-utvideo_yuv420_left
-fate-utvideo_yuv420_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv420_left.avi
+fate-utvideo_yuv420_left: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_yuv420_left.avi
 
 FATE_UTVIDEO += fate-utvideo_yuv420_median
-fate-utvideo_yuv420_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv420_median.avi
+fate-utvideo_yuv420_median: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_yuv420_median.avi
 
 FATE_UTVIDEO += fate-utvideo_yuv422_left
-fate-utvideo_yuv422_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_left.avi
+fate-utvideo_yuv422_left: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_yuv422_left.avi
 
 FATE_UTVIDEO += fate-utvideo_yuv422_median
-fate-utvideo_yuv422_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_median.avi
+fate-utvideo_yuv422_median: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_yuv422_median.avi
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, UTVIDEO) += $(FATE_UTVIDEO)
 fate-utvideo: $(FATE_UTVIDEO)
 
-fate-utvideoenc%: CMD = framemd5 -f image2 -vcodec pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -vcodec utvideo -f avi -sws_flags +accurate_rnd+bitexact ${OPTS}
-
-FATE_UTVIDEOENC += fate-utvideoenc_rgba_none
-fate-utvideoenc_rgba_none: OPTS = -pix_fmt rgba -pred 3
+fate-utvideoenc%: CMD = framemd5 -f image2 -vcodec pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -vcodec utvideo -slices 1 -f avi -sws_flags +accurate_rnd+bitexact ${OPTS}
 
 FATE_UTVIDEOENC += fate-utvideoenc_rgba_left
 fate-utvideoenc_rgba_left: OPTS = -pix_fmt rgba -pred left
@@ -39,8 +36,8 @@
 FATE_UTVIDEOENC += fate-utvideoenc_rgba_median
 fate-utvideoenc_rgba_median: OPTS = -pix_fmt rgba -pred median
 
-FATE_UTVIDEOENC += fate-utvideoenc_rgb_none
-fate-utvideoenc_rgb_none: OPTS = -pix_fmt rgb24 -pred 3
+FATE_UTVIDEOENC += fate-utvideoenc_rgba_none
+fate-utvideoenc_rgba_none: OPTS = -pix_fmt rgba -pred 3
 
 FATE_UTVIDEOENC += fate-utvideoenc_rgb_left
 fate-utvideoenc_rgb_left: OPTS = -pix_fmt rgb24 -pred left
@@ -48,8 +45,8 @@
 FATE_UTVIDEOENC += fate-utvideoenc_rgb_median
 fate-utvideoenc_rgb_median: OPTS = -pix_fmt rgb24 -pred median
 
-FATE_UTVIDEOENC += fate-utvideoenc_yuv420_none
-fate-utvideoenc_yuv420_none: OPTS = -pix_fmt yuv420p -pred 3
+FATE_UTVIDEOENC += fate-utvideoenc_rgb_none
+fate-utvideoenc_rgb_none: OPTS = -pix_fmt rgb24 -pred 3
 
 FATE_UTVIDEOENC += fate-utvideoenc_yuv420_left
 fate-utvideoenc_yuv420_left: OPTS = -pix_fmt yuv420p -pred left
@@ -57,8 +54,8 @@
 FATE_UTVIDEOENC += fate-utvideoenc_yuv420_median
 fate-utvideoenc_yuv420_median: OPTS = -pix_fmt yuv420p -pred median
 
-FATE_UTVIDEOENC += fate-utvideoenc_yuv422_none
-fate-utvideoenc_yuv422_none: OPTS = -pix_fmt yuv422p -pred 3
+FATE_UTVIDEOENC += fate-utvideoenc_yuv420_none
+fate-utvideoenc_yuv420_none: OPTS = -pix_fmt yuv420p -pred 3
 
 FATE_UTVIDEOENC += fate-utvideoenc_yuv422_left
 fate-utvideoenc_yuv422_left: OPTS = -pix_fmt yuv422p -pred left
@@ -66,7 +63,10 @@
 FATE_UTVIDEOENC += fate-utvideoenc_yuv422_median
 fate-utvideoenc_yuv422_median: OPTS = -pix_fmt yuv422p -pred median
 
-$(FATE_UTVIDEOENC): tests/vsynth1/00.pgm
+FATE_UTVIDEOENC += fate-utvideoenc_yuv422_none
+fate-utvideoenc_yuv422_none: OPTS = -pix_fmt yuv422p -pred 3
+
+$(FATE_UTVIDEOENC): $(VREF)
 
 FATE_AVCONV-$(call ENCMUX, UTVIDEO, AVI) += $(FATE_UTVIDEOENC)
 fate-utvideoenc: $(FATE_UTVIDEOENC)

libav-v9.6.tar.bz2/tests/fate/vcodec.mak -> libav-v10.1.tar.bz2/tests/fate/vcodec.mak Changed

@@ -53,7 +53,7 @@
 fate-vsynth%-dv-50:              FMT     = dv
 
 FATE_VCODEC-$(call ENCDEC, FFV1, AVI)   += ffv1
-fate-vsynth%-ffv1:               ENCOPTS = -strict -2
+fate-vsynth%-ffv1:               ENCOPTS = -slices 4 -strict -2
 
 FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff
 
@@ -111,7 +111,7 @@
 $(FATE_MPEG2:%=fate-vsynth\%-%): CODEC  = mpeg2video
 
 fate-vsynth%-mpeg2:              ENCOPTS = -qscale 10
-fate-vsynth%-mpeg2-422:          ENCOPTS = -vb 1000k                    \
+fate-vsynth%-mpeg2-422:          ENCOPTS = -b:v 1000k                   \
                                            -bf 2                        \
                                            -trellis 1                   \
                                            -flags +mv0+ildct+ilme       \
@@ -121,7 +121,7 @@
                                            -pix_fmt yuv422p
 fate-vsynth%-mpeg2-idct-int:     ENCOPTS = -qscale 10 -idct int -dct int
 fate-vsynth%-mpeg2-ilace:        ENCOPTS = -qscale 10 -flags +ildct+ilme
-fate-vsynth%-mpeg2-ivlc-qprd:    ENCOPTS = -vb 500k                     \
+fate-vsynth%-mpeg2-ivlc-qprd:    ENCOPTS = -b:v 500k                    \
                                            -bf 2                        \
                                            -trellis 1                   \
                                            -flags +mv0                  \
@@ -150,34 +150,34 @@
 fate-vsynth%-mpeg4:              ENCOPTS = -qscale 10 -flags +mv4 -mbd bits
 fate-vsynth%-mpeg4:              FMT     = mp4
 
-fate-vsynth%-mpeg4-rc:           ENCOPTS = -b 400k -bf 2
+fate-vsynth%-mpeg4-adap:         ENCOPTS = -b 550k -bf 2 -flags +mv4+mv0 \
+                                           -trellis 1 -cmp 1 -subcmp 2   \
+                                           -mbd rd -scplx_mask 0.3
 
 fate-vsynth%-mpeg4-adv:          ENCOPTS = -qscale 9 -flags +mv4+aic       \
                                            -data_partitioning 1 -trellis 1 \
                                            -mbd bits -ps 200
 
-fate-vsynth%-mpeg4-qprd:         ENCOPTS = -b 450k -bf 2 -trellis 1          \
-                                           -flags +mv4+mv0 -mpv_flags +qp_rd \
-                                           -cmp 2 -subcmp 2 -mbd rd
+fate-vsynth%-mpeg4-error:        ENCOPTS = -qscale 7 -flags +mv4+aic    \
+                                           -data_partitioning 1 -mbd rd \
+                                           -ps 250 -error 10
 
-fate-vsynth%-mpeg4-adap:         ENCOPTS = -b 550k -bf 2 -flags +mv4+mv0 \
-                                           -trellis 1 -cmp 1 -subcmp 2   \
-                                           -mbd rd -scplx_mask 0.3
+fate-vsynth%-mpeg4-nr:           ENCOPTS = -qscale 8 -flags +mv4 -mbd rd -nr 200
 
 fate-vsynth%-mpeg4-qpel:         ENCOPTS = -qscale 7 -flags +mv4+qpel -mbd 2 \
                                            -bf 2 -cmp 1 -subcmp 2
 
+fate-vsynth%-mpeg4-qprd:         ENCOPTS = -b 450k -bf 2 -trellis 1          \
+                                           -flags +mv4+mv0 -mpv_flags +qp_rd \
+                                           -cmp 2 -subcmp 2 -mbd rd
+
+fate-vsynth%-mpeg4-rc:           ENCOPTS = -b 400k -bf 2
+
 fate-vsynth%-mpeg4-thread:       ENCOPTS = -b 500k -flags +mv4+aic         \
                                            -data_partitioning 1 -trellis 1 \
                                            -mbd bits -ps 200 -bf 2         \
                                            -threads 2 -slices 2
 
-fate-vsynth%-mpeg4-error:        ENCOPTS = -qscale 7 -flags +mv4+aic    \
-                                           -data_partitioning 1 -mbd rd \
-                                           -ps 250 -error 10
-
-fate-vsynth%-mpeg4-nr:           ENCOPTS = -qscale 8 -flags +mv4 -mbd rd -nr 200
-
 FATE_VCODEC-$(call ENCDEC, MSMPEG4V3, AVI) += msmpeg4
 fate-vsynth%-msmpeg4:            ENCOPTS = -qscale 10
 
@@ -208,18 +208,6 @@
 fate-vsynth%-rv20:               ENCOPTS = -qscale 10
 fate-vsynth%-rv20:               FMT     = rm
 
-FATE_VCODEC-$(call ENCDEC, SNOW, AVI)   += snow snow-hpel snow-ll
-fate-vsynth%-snow:               ENCOPTS = -strict -2 -qscale 2 -flags +qpel \
-                                           -me_method iter -dia_size 2       \
-                                           -cmp 12 -subcmp 12 -s 128x64
-
-fate-vsynth%-snow-hpel:          ENCOPTS = -strict -2 -qscale 2              \
-                                           -me_method iter -dia_size 2       \
-                                           -cmp 12 -subcmp 12 -s 128x64
-
-fate-vsynth%-snow-ll:            ENCOPTS = -strict -2 -qscale .001 -pred 1 \
-                                           -flags +mv4+qpel
-
 FATE_VCODEC-$(call ENCDEC, SVQ1, MOV)   += svq1
 fate-vsynth%-svq1:               ENCOPTS = -qscale 3 -pix_fmt yuv410p
 fate-vsynth%-svq1:               FMT     = mov

libav-v9.6.tar.bz2/tests/fate/video.mak -> libav-v10.1.tar.bz2/tests/fate/video.mak Changed

@@ -1,265 +1,277 @@
 FATE_4XM += fate-4xm-1
-fate-4xm-1: CMD = framecrc -i $(SAMPLES)/4xm/version1.4xm -pix_fmt rgb24 -an
+fate-4xm-1: CMD = framecrc -i $(TARGET_SAMPLES)/4xm/version1.4xm -pix_fmt rgb24 -an
 
 FATE_4XM += fate-4xm-2
-fate-4xm-2: CMD = framecrc -i $(SAMPLES)/4xm/version2.4xm -pix_fmt rgb24 -an
+fate-4xm-2: CMD = framecrc -i $(TARGET_SAMPLES)/4xm/version2.4xm -pix_fmt rgb24 -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, FOURXM, FOURXM) += $(FATE_4XM)
 fate-4xm: $(FATE_4XM)
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, AASC) += fate-aasc
-fate-aasc: CMD = framecrc -i $(SAMPLES)/aasc/AASC-1.5MB.AVI -pix_fmt rgb24
+fate-aasc: CMD = framecrc -i $(TARGET_SAMPLES)/aasc/AASC-1.5MB.AVI -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MM, MMVIDEO) += fate-alg-mm
-fate-alg-mm: CMD = framecrc -i $(SAMPLES)/alg-mm/ibmlogo.mm -an -pix_fmt rgb24
+fate-alg-mm: CMD = framecrc -i $(TARGET_SAMPLES)/alg-mm/ibmlogo.mm -an -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, AMV) += fate-amv
-fate-amv: CMD = framecrc -idct simple -i $(SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -an
+fate-amv: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, TTY, ANSI) += fate-ansi
-fate-ansi: CMD = framecrc -chars_per_frame 44100 -i $(SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24
+fate-ansi: CMD = framecrc -chars_per_frame 44100 -i $(TARGET_SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, RPL, ESCAPE124) += fate-armovie-escape124
-fate-armovie-escape124: CMD = framecrc -i $(SAMPLES)/rpl/ESCAPE.RPL -pix_fmt rgb24
+fate-armovie-escape124: CMD = framecrc -i $(TARGET_SAMPLES)/rpl/ESCAPE.RPL -pix_fmt rgb24
+
+FATE_SAMPLES_AVCONV-$(call DEMDEC, RPL, ESCAPE130) += fate-armovie-escape130
+fate-armovie-escape130: CMD = framecrc -i $(TARGET_SAMPLES)/rpl/landing.rpl -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, AURA) += fate-auravision-v1
-fate-auravision-v1: CMD = framecrc -i $(SAMPLES)/auravision/SOUVIDEO.AVI -an
+fate-auravision-v1: CMD = framecrc -i $(TARGET_SAMPLES)/auravision/SOUVIDEO.AVI -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, AURA2) += fate-auravision-v2
-fate-auravision-v2: CMD = framecrc -i $(SAMPLES)/auravision/salma-hayek-in-ugly-betty-partial-avi -an
+fate-auravision-v2: CMD = framecrc -i $(TARGET_SAMPLES)/auravision/salma-hayek-in-ugly-betty-partial-avi -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, BETHSOFTVID, BETHSOFTVID) += fate-bethsoft-vid
-fate-bethsoft-vid: CMD = framecrc -i $(SAMPLES)/bethsoft-vid/ANIM0001.VID -t 5 -pix_fmt rgb24
+fate-bethsoft-vid: CMD = framecrc -i $(TARGET_SAMPLES)/bethsoft-vid/ANIM0001.VID -t 5 -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, BFI, BFI) += fate-bfi
-fate-bfi: CMD = framecrc -i $(SAMPLES)/bfi/2287.bfi -pix_fmt rgb24
+fate-bfi: CMD = framecrc -i $(TARGET_SAMPLES)/bfi/2287.bfi -pix_fmt rgb24
 
 FATE_BINK_VIDEO += fate-bink-video-b
-fate-bink-video-b: CMD = framecrc -i $(SAMPLES)/bink/RISE.BIK -frames 30
+fate-bink-video-b: CMD = framecrc -i $(TARGET_SAMPLES)/bink/RISE.BIK -frames 30
 
 FATE_BINK_VIDEO += fate-bink-video-f
-fate-bink-video-f: CMD = framecrc -i $(SAMPLES)/bink/hol2br.bik
+fate-bink-video-f: CMD = framecrc -i $(TARGET_SAMPLES)/bink/hol2br.bik
 
 FATE_BINK_VIDEO += fate-bink-video-i
-fate-bink-video-i: CMD = framecrc -i $(SAMPLES)/bink/RazOnBull.bik -an
+fate-bink-video-i: CMD = framecrc -i $(TARGET_SAMPLES)/bink/RazOnBull.bik -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, BINK, BINK) += $(FATE_BINK_VIDEO)
 fate-bink-video: $(FATE_BINK_VIDEO)
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, BMV, BMV_VIDEO) += fate-bmv-video
-fate-bmv-video: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an
+fate-bmv-video: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MPEGPS, CAVS) += fate-cavs
-fate-cavs: CMD = framecrc -i $(SAMPLES)/cavs/cavs.mpg -an
+fate-cavs: CMD = framecrc -i $(TARGET_SAMPLES)/cavs/cavs.mpg -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, CDG, CDGRAPHICS) += fate-cdgraphics
-fate-cdgraphics: CMD = framecrc -i $(SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgb24 -t 1
+fate-cdgraphics: CMD = framecrc -i $(TARGET_SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgb24 -t 1
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, CLJR) += fate-cljr
-fate-cljr: CMD = framecrc -i $(SAMPLES)/cljr/testcljr-partial.avi
+fate-cljr: CMD = framecrc -i $(TARGET_SAMPLES)/cljr/testcljr-partial.avi
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, PNG) += fate-corepng
-fate-corepng: CMD = framecrc -i $(SAMPLES)/png1/corepng-partial.avi
+fate-corepng: CMD = framecrc -i $(TARGET_SAMPLES)/png1/corepng-partial.avi
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVS, AVS) += fate-creatureshock-avs
-fate-creatureshock-avs: CMD = framecrc -i $(SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24
-
-FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-partial
-fate-cvid-partial: CMD = framecrc -i $(SAMPLES)/cvid/laracroft-cinepak-partial.avi -an
+fate-creatureshock-avs: CMD = framecrc -i $(TARGET_SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24
 
 FATE_CVID-$(CONFIG_MOV_DEMUXER) += fate-cvid-palette
-fate-cvid-palette: CMD = framecrc -i $(SAMPLES)/cvid/catfight-cvid-pal8-partial.mov -pix_fmt rgb24 -an
+fate-cvid-palette: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/catfight-cvid-pal8-partial.mov -pix_fmt rgb24 -an
+
+FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-partial
+fate-cvid-partial: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/laracroft-cinepak-partial.avi -an
 
 FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-grayscale
-fate-cvid-grayscale: CMD = framecrc -i $(SAMPLES)/cvid/pcitva15.avi -an
+fate-cvid-grayscale: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/pcitva15.avi -an
 
 FATE_SAMPLES_AVCONV-$(CONFIG_CINEPAK_DECODER) += $(FATE_CVID-yes)
 fate-cvid: $(FATE_CVID-yes)
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, C93, C93) += fate-cyberia-c93
-fate-cyberia-c93: CMD = framecrc -i $(SAMPLES)/cyberia-c93/intro1.c93 -t 3 -pix_fmt rgb24
+fate-cyberia-c93: CMD = framecrc -i $(TARGET_SAMPLES)/cyberia-c93/intro1.c93 -t 3 -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, CYUV) += fate-cyuv
-fate-cyuv: CMD = framecrc -i $(SAMPLES)/cyuv/cyuv.avi
+fate-cyuv: CMD = framecrc -i $(TARGET_SAMPLES)/cyuv/cyuv.avi
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, DSICIN, DSICINVIDEO) += fate-delphine-cin-video
-fate-delphine-cin-video: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -pix_fmt rgb24 -an
+fate-delphine-cin-video: CMD = framecrc -i $(TARGET_SAMPLES)/delphine-cin/LOGO-partial.CIN -pix_fmt rgb24 -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, ANM, ANM) += fate-deluxepaint-anm
-fate-deluxepaint-anm: CMD = framecrc -i $(SAMPLES)/deluxepaint-anm/INTRO1.ANM -pix_fmt rgb24
+fate-deluxepaint-anm: CMD = framecrc -i $(TARGET_SAMPLES)/deluxepaint-anm/INTRO1.ANM -pix_fmt rgb24
 
 FATE_TRUEMOTION1 += fate-truemotion1-15
-fate-truemotion1-15: CMD = framecrc -i $(SAMPLES)/duck/phant2-940.duk -pix_fmt rgb24 -an
+fate-truemotion1-15: CMD = framecrc -i $(TARGET_SAMPLES)/duck/phant2-940.duk -pix_fmt rgb24 -an
 
 FATE_TRUEMOTION1 += fate-truemotion1-24
-fate-truemotion1-24: CMD = framecrc -i $(SAMPLES)/duck/sonic3dblast_intro-partial.avi -pix_fmt rgb24 -an
+fate-truemotion1-24: CMD = framecrc -i $(TARGET_SAMPLES)/duck/sonic3dblast_intro-partial.avi -pix_fmt rgb24 -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TRUEMOTION1) += $(FATE_TRUEMOTION1)
 fate-truemotion1: $(FATE_TRUEMOTION1)
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TRUEMOTION2) += fate-truemotion2
-fate-truemotion2: CMD = framecrc -i $(SAMPLES)/duck/tm20.avi
+fate-truemotion2: CMD = framecrc -i $(TARGET_SAMPLES)/duck/tm20.avi
 
 FATE_DXA += fate-dxa-feeble
-fate-dxa-feeble: CMD = framecrc -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt rgb24 -an
+fate-dxa-feeble: CMD = framecrc -i $(TARGET_SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt rgb24 -an
 
 FATE_DXA += fate-dxa-scummvm
-fate-dxa-scummvm: CMD = framecrc -i $(SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24
+fate-dxa-scummvm: CMD = framecrc -i $(TARGET_SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, DXA, DXA) += $(FATE_DXA)
 fate-dxa: $(FATE_DXA)
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, SEGAFILM, CINEPAK) += fate-film-cvid
-fate-film-cvid: CMD = framecrc -i $(SAMPLES)/film/logo-capcom.cpk -an
+fate-film-cvid: CMD = framecrc -i $(TARGET_SAMPLES)/film/logo-capcom.cpk -an
 
 FATE_FLIC += fate-flic-af11-palette-change
-fate-flic-af11-palette-change: CMD = framecrc -i $(SAMPLES)/fli/fli-engines.fli -t 3.3 -pix_fmt rgb24
+fate-flic-af11-palette-change: CMD = framecrc -i $(TARGET_SAMPLES)/fli/fli-engines.fli -t 3.3 -pix_fmt rgb24
 
 FATE_FLIC += fate-flic-af12
-fate-flic-af12: CMD = framecrc -i $(SAMPLES)/fli/jj00c2.fli -pix_fmt rgb24
+fate-flic-af12: CMD = framecrc -i $(TARGET_SAMPLES)/fli/jj00c2.fli -pix_fmt rgb24
 
 FATE_FLIC += fate-flic-magiccarpet
-fate-flic-magiccarpet: CMD = framecrc -i $(SAMPLES)/fli/intel.dat -pix_fmt rgb24
+fate-flic-magiccarpet: CMD = framecrc -i $(TARGET_SAMPLES)/fli/intel.dat -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, FLIC, FLIC) += $(FATE_FLIC)
 fate-flic: $(FATE_FLIC)
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, FRWU) += fate-frwu
-fate-frwu: CMD = framecrc -i $(SAMPLES)/frwu/frwu.avi
+fate-frwu: CMD = framecrc -i $(TARGET_SAMPLES)/frwu/frwu.avi
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, IDCIN, IDCIN) += fate-id-cin-video
-fate-id-cin-video: CMD = framecrc -i $(SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb24
+fate-id-cin-video: CMD = framecrc -i $(TARGET_SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call ENCDEC, ROQ PGMYUV, ROQ IMAGE2) += fate-idroq-video-encode
-fate-idroq-video-encode: CMD = md5 -f image2 -vcodec pgmyuv -i $(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 -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 $(SAMPLES)/iff/ASH.LBM -pix_fmt rgb24
+fate-iff-byterun1: CMD = framecrc -i $(TARGET_SAMPLES)/iff/ASH.LBM -pix_fmt rgb24
 
 FATE_IFF-$(CONFIG_EIGHTSVX_FIB_DECODER) += fate-iff-fibonacci
-fate-iff-fibonacci: CMD = md5 -i $(SAMPLES)/iff/dasboot-in-compressed -f s16le
+fate-iff-fibonacci: CMD = md5 -i $(TARGET_SAMPLES)/iff/dasboot-in-compressed -f s16le
 
 FATE_IFF-$(CONFIG_IFF_ILBM_DECODER) += fate-iff-ilbm
-fate-iff-ilbm: CMD = framecrc -i $(SAMPLES)/iff/lms-matriks.ilbm -pix_fmt rgb24
+fate-iff-ilbm: CMD = framecrc -i $(TARGET_SAMPLES)/iff/lms-matriks.ilbm -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(CONFIG_IFF_DEMUXER)  += $(FATE_IFF-yes)
 fate-iff: $(FATE_IFF-yes)
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-8bit
-fate-interplay-mve-8bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/interplay-logo-2MB.mve -pix_fmt rgb24 -an
+fate-interplay-mve-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/interplay-logo-2MB.mve -pix_fmt rgb24 -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-16bit
-fate-interplay-mve-16bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 -an
+fate-interplay-mve-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 -an
+
+FATE_SAMPLES_AVCONV-$(call DEMDEC, MXF, JPEG2000) += fate-jpeg2000-dcinema
+fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt xyz12le
+
+FATE_SAMPLES_AVCONV-$(call DEMDEC, JV, JV) += fate-jv
+fate-jv: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -an -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, KGV1) += fate-kgv1
-fate-kgv1: CMD = framecrc -i $(SAMPLES)/kega/kgv1.avi -pix_fmt rgb555le -an
+fate-kgv1: CMD = framecrc -i $(TARGET_SAMPLES)/kega/kgv1.avi -pix_fmt rgb555le -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, KMVC) += fate-kmvc
-fate-kmvc: CMD = framecrc -i $(SAMPLES)/KMVC/LOGO1.AVI -an -t 3 -pix_fmt rgb24
+fate-kmvc: CMD = framecrc -i $(TARGET_SAMPLES)/KMVC/LOGO1.AVI -an -t 3 -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, EA, MDEC) += fate-mdec
-fate-mdec: CMD = framecrc -idct simple -i $(SAMPLES)/ea-dct/NFS2Esprit-partial.dct -an
+fate-mdec: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/ea-dct/NFS2Esprit-partial.dct -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, STR, MDEC) += fate-mdec-v3
-fate-mdec-v3: CMD = framecrc -idct simple -i $(SAMPLES)/psx-str/abc000_cut.str -an
+fate-mdec-v3: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/psx-str/abc000_cut.str -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MSNWC_TCP, MIMIC) += fate-mimic
-fate-mimic: CMD = framecrc -idct simple -i $(SAMPLES)/mimic/mimic2-womanloveffmpeg.cam
+fate-mimic: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/mimic/mimic2-womanloveffmpeg.cam
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, MJPEGB) += fate-mjpegb
-fate-mjpegb: CMD = framecrc -idct simple -flags +bitexact -i $(SAMPLES)/mjpegb/mjpegb_part.mov -an
+fate-mjpegb: CMD = framecrc -idct simple -flags +bitexact -i $(TARGET_SAMPLES)/mjpegb/mjpegb_part.mov -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MVI, MOTIONPIXELS) += fate-motionpixels
-fate-motionpixels: CMD = framecrc -i $(SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -vframes 111
+fate-motionpixels: CMD = framecrc -i $(TARGET_SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -vframes 111
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc
-fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an
+fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -vframes 30
 
 # FIXME dropped frames in this test because of coarse timebase
 FATE_NUV += fate-nuv-rtjpeg
-fate-nuv-rtjpeg: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv -an
+fate-nuv-rtjpeg: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/nuv/Today.nuv -an
 
 FATE_NUV += fate-nuv-rtjpeg-fh
-fate-nuv-rtjpeg-fh: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/rtjpeg_frameheader.nuv -an
+fate-nuv-rtjpeg-fh: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/nuv/rtjpeg_frameheader.nuv -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, NUV, NUV) += $(FATE_NUV)
 fate-nuv: $(FATE_NUV)
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, QPEG) += fate-qpeg
-fate-qpeg: CMD = framecrc -i $(SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24
+fate-qpeg: CMD = framecrc -i $(TARGET_SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, R210) += fate-r210
-fate-r210: CMD = framecrc -i $(SAMPLES)/r210/r210.avi -pix_fmt rgb48le
+fate-r210: CMD = framecrc -i $(TARGET_SAMPLES)/r210/r210.avi -pix_fmt rgb48le
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, RL2, RL2) += fate-rl2
-fate-rl2: CMD = framecrc -i $(SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an
+fate-rl2: CMD = framecrc -i $(TARGET_SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, ROQ, ROQ) += fate-roqvideo
-fate-roqvideo: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq -an
+fate-roqvideo: CMD = framecrc -i $(TARGET_SAMPLES)/idroq/idlogo.roq -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, VMD, VMDVIDEO) += fate-sierra-vmd-video
-fate-sierra-vmd-video: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -pix_fmt rgb24 -an
+fate-sierra-vmd-video: CMD = framecrc -i $(TARGET_SAMPLES)/vmd/12.vmd -pix_fmt rgb24 -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, SMACKER, SMACKER) += fate-smacker-video
-fate-smacker-video: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24 -an
+fate-smacker-video: CMD = framecrc -i $(TARGET_SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24 -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, SMC) += fate-smc
-fate-smc: CMD = framecrc -i $(SAMPLES)/smc/cass_schi.qt -pix_fmt rgb24
+fate-smc: CMD = framecrc -i $(TARGET_SAMPLES)/smc/cass_schi.qt -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, SP5X) += fate-sp5x
-fate-sp5x: CMD = framecrc -idct simple -i $(SAMPLES)/sp5x/sp5x_problem.avi
+fate-sp5x: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/sp5x/sp5x_problem.avi
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, SRT, SRT) += fate-sub-srt
-fate-sub-srt: CMD = md5 -i $(SAMPLES)/sub/SubRip_capability_tester.srt -f ass
+fate-sub-srt: CMD = md5 -i $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt -f ass
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, THP, THP) += fate-thp
-fate-thp: CMD = framecrc -idct simple -i $(SAMPLES)/thp/pikmin2-opening1-partial.thp -an
+fate-thp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/thp/pikmin2-opening1-partial.thp -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, TIERTEXSEQ, TIERTEXSEQVIDEO) += fate-tiertex-seq
-fate-tiertex-seq: CMD = framecrc -i $(SAMPLES)/tiertex-seq/Gameover.seq -pix_fmt rgb24
+fate-tiertex-seq: CMD = framecrc -i $(TARGET_SAMPLES)/tiertex-seq/Gameover.seq -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, TMV, TMV) += fate-tmv
-fate-tmv: CMD = framecrc -i $(SAMPLES)/tmv/pop-partial.tmv -pix_fmt rgb24
+fate-tmv: CMD = framecrc -i $(TARGET_SAMPLES)/tmv/pop-partial.tmv -pix_fmt rgb24
 
 FATE_TXD += fate-txd-16bpp
-fate-txd-16bpp: CMD = framecrc -i $(SAMPLES)/txd/misc.txd -pix_fmt bgra -an
+fate-txd-16bpp: CMD = framecrc -i $(TARGET_SAMPLES)/txd/misc.txd -pix_fmt bgra -an
 
 FATE_TXD += fate-txd-pal8
-fate-txd-pal8: CMD = framecrc -i $(SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an
+fate-txd-pal8: CMD = framecrc -i $(TARGET_SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, TXD, TXD) += $(FATE_TXD)
 fate-txd: $(FATE_TXD)
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, ULTI) += fate-ulti
-fate-ulti: CMD = framecrc -i $(SAMPLES)/ulti/hit12w.avi -an
+fate-ulti: CMD = framecrc -i $(TARGET_SAMPLES)/ulti/hit12w.avi -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, V210) += fate-v210
-fate-v210: CMD = framecrc -i $(SAMPLES)/v210/v210_720p-partial.avi -pix_fmt yuv422p16be -an
+fate-v210: CMD = framecrc -i $(TARGET_SAMPLES)/v210/v210_720p-partial.avi -pix_fmt yuv422p16be -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, V410) += fate-v410dec
-fate-v410dec: CMD = framecrc -i $(SAMPLES)/v410/lenav410.mov -pix_fmt yuv444p10le
+fate-v410dec: CMD = framecrc -i $(TARGET_SAMPLES)/v410/lenav410.mov -pix_fmt yuv444p10le
 
 FATE_SAMPLES_AVCONV-$(call ENCDEC, V410 PGMYUV, AVI IMAGE2) += fate-v410enc
-fate-v410enc: tests/vsynth1/00.pgm
+fate-v410enc: $(VREF)
 fate-v410enc: CMD = md5 -f image2 -vcodec pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -flags +bitexact -vcodec v410 -f avi
 
+FATE_SAMPLES_AVCONV-$(call DEMDEC, SIFF, VB) += fate-vb
+fate-vb: CMD = framecrc -i $(TARGET_SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24 -an
+
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VCR1) += fate-vcr1
-fate-vcr1: CMD = framecrc -i $(SAMPLES)/vcr1/VCR1test.avi -an
+fate-vcr1: CMD = framecrc -i $(TARGET_SAMPLES)/vcr1/VCR1test.avi -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, XL) += fate-videoxl
-fate-videoxl: CMD = framecrc -i $(SAMPLES)/vixl/pig-vixl.avi
+fate-videoxl: CMD = framecrc -i $(TARGET_SAMPLES)/vixl/pig-vixl.avi
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, WSVQA, VQA) += fate-vqa-cc
-fate-vqa-cc: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24 -an
+fate-vqa-cc: CMD = framecrc -i $(TARGET_SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24 -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, WC3, XAN_WC3) += fate-wc3movie-xan
-fate-wc3movie-xan: CMD = framecrc -i $(SAMPLES)/wc3movie/SC_32-part.MVE -pix_fmt rgb24
+fate-wc3movie-xan: CMD = framecrc -i $(TARGET_SAMPLES)/wc3movie/SC_32-part.MVE -pix_fmt rgb24
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, WNV1) += fate-wnv1
-fate-wnv1: CMD = framecrc -i $(SAMPLES)/wnv1/wnv1-codec.avi -an
+fate-wnv1: CMD = framecrc -i $(TARGET_SAMPLES)/wnv1/wnv1-codec.avi -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, YOP, YOP) += fate-yop
-fate-yop: CMD = framecrc -i $(SAMPLES)/yop/test1.yop -pix_fmt rgb24 -an
+fate-yop: CMD = framecrc -i $(TARGET_SAMPLES)/yop/test1.yop -pix_fmt rgb24 -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, XAN_WC4) += fate-xxan-wc4
-fate-xxan-wc4: CMD = framecrc -i $(SAMPLES)/wc4-xan/wc4trailer-partial.avi -an
+fate-xxan-wc4: CMD = framecrc -i $(TARGET_SAMPLES)/wc4-xan/wc4trailer-partial.avi -an

libav-v9.6.tar.bz2/tests/fate/voice.mak -> libav-v10.1.tar.bz2/tests/fate/voice.mak Changed

@@ -1,5 +1,5 @@
 FATE_G722 += fate-g722dec-1
-fate-g722dec-1: CMD = framecrc -i $(SAMPLES)/g722/conf-adminmenu-162.g722
+fate-g722dec-1: CMD = framecrc -i $(TARGET_SAMPLES)/g722/conf-adminmenu-162.g722
 
 FATE_G722 += fate-g722-encode
 fate-g722-encode: tests/data/asynth-16000-1.wav
@@ -10,28 +10,28 @@
 fate-g722: $(FATE_G722)
 
 FATE_G723_1 += fate-g723_1-dec-1
-fate-g723_1-dec-1: CMD = framecrc -postfilter 0 -i $(SAMPLES)/g723_1/ineqd53.tco
+fate-g723_1-dec-1: CMD = framecrc -postfilter 0 -i $(TARGET_SAMPLES)/g723_1/ineqd53.tco
 
 FATE_G723_1 += fate-g723_1-dec-2
-fate-g723_1-dec-2: CMD = framecrc -postfilter 0 -i $(SAMPLES)/g723_1/overd53.tco
+fate-g723_1-dec-2: CMD = framecrc -postfilter 0 -i $(TARGET_SAMPLES)/g723_1/overd53.tco
 
 FATE_G723_1 += fate-g723_1-dec-3
-fate-g723_1-dec-3: CMD = framecrc -postfilter 1 -i $(SAMPLES)/g723_1/overd63p.tco
+fate-g723_1-dec-3: CMD = framecrc -postfilter 1 -i $(TARGET_SAMPLES)/g723_1/overd63p.tco
 
 FATE_G723_1 += fate-g723_1-dec-4
-fate-g723_1-dec-4: CMD = framecrc -postfilter 0 -i $(SAMPLES)/g723_1/pathd53.tco
+fate-g723_1-dec-4: CMD = framecrc -postfilter 0 -i $(TARGET_SAMPLES)/g723_1/pathd53.tco
 
 FATE_G723_1 += fate-g723_1-dec-5
-fate-g723_1-dec-5: CMD = framecrc -postfilter 1 -i $(SAMPLES)/g723_1/pathd63p.tco
+fate-g723_1-dec-5: CMD = framecrc -postfilter 1 -i $(TARGET_SAMPLES)/g723_1/pathd63p.tco
 
 FATE_G723_1 += fate-g723_1-dec-6
-fate-g723_1-dec-6: CMD = framecrc -postfilter 1 -i $(SAMPLES)/g723_1/tamed63p.tco
+fate-g723_1-dec-6: CMD = framecrc -postfilter 1 -i $(TARGET_SAMPLES)/g723_1/tamed63p.tco
 
 FATE_G723_1 += fate-g723_1-dec-7
-fate-g723_1-dec-7: CMD = framecrc -postfilter 1 -i $(SAMPLES)/g723_1/dtx63b.tco
+fate-g723_1-dec-7: CMD = framecrc -postfilter 1 -i $(TARGET_SAMPLES)/g723_1/dtx63b.tco
 
 FATE_G723_1 += fate-g723_1-dec-8
-fate-g723_1-dec-8: CMD = framecrc -postfilter 1 -i $(SAMPLES)/g723_1/dtx63e.tco
+fate-g723_1-dec-8: CMD = framecrc -postfilter 1 -i $(TARGET_SAMPLES)/g723_1/dtx63e.tco
 
 FATE_SAMPLES_AVCONV += $(FATE_G723_1)
 fate-g723_1: $(FATE_G723_1)
@@ -55,20 +55,20 @@
 fate-g726: $(FATE_G726)
 
 FATE_GSM += fate-gsm-ms
-fate-gsm-ms: CMD = framecrc -i $(SAMPLES)/gsm/ciao.wav
+fate-gsm-ms: CMD = framecrc -i $(TARGET_SAMPLES)/gsm/ciao.wav
 
 FATE_GSM += fate-gsm-toast
-fate-gsm-toast: CMD = framecrc -i $(SAMPLES)/gsm/sample-gsm-8000.mov -t 10
+fate-gsm-toast: CMD = framecrc -i $(TARGET_SAMPLES)/gsm/sample-gsm-8000.mov -t 10
 
 FATE_SAMPLES_AVCONV += $(FATE_GSM)
 fate-gsm: $(FATE_GSM)
 
 FATE_SAMPLES_AVCONV += fate-qcelp
-fate-qcelp: CMD = pcm -i $(SAMPLES)/qcp/0036580847.QCP
+fate-qcelp: CMD = pcm -i $(TARGET_SAMPLES)/qcp/0036580847.QCP
 fate-qcelp: CMP = oneoff
 fate-qcelp: REF = $(SAMPLES)/qcp/0036580847.pcm
 
 FATE_SAMPLES_AVCONV += fate-truespeech
-fate-truespeech: CMD = pcm -i $(SAMPLES)/truespeech/a6.wav
+fate-truespeech: CMD = pcm -i $(TARGET_SAMPLES)/truespeech/a6.wav
 fate-truespeech: CMP = oneoff
 fate-truespeech: REF = $(SAMPLES)/truespeech/a6.pcm

libav-v9.6.tar.bz2/tests/fate/vorbis.mak -> libav-v10.1.tar.bz2/tests/fate/vorbis.mak Changed

@@ -1,83 +1,83 @@
 FATE_VORBIS += fate-vorbis-1
-fate-vorbis-1: CMD = pcm -i $(SAMPLES)/vorbis/1.0.1-test_small.ogg
+fate-vorbis-1: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/1.0.1-test_small.ogg
 fate-vorbis-1: REF = $(SAMPLES)/vorbis/1.0.1-test_small.pcm
 
 FATE_VORBIS += fate-vorbis-2
-fate-vorbis-2: CMD = pcm -i $(SAMPLES)/vorbis/1.0-test_small.ogg
+fate-vorbis-2: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/1.0-test_small.ogg
 fate-vorbis-2: REF = $(SAMPLES)/vorbis/1.0-test_small.pcm
 
 FATE_VORBIS += fate-vorbis-3
-fate-vorbis-3: CMD = pcm -i $(SAMPLES)/vorbis/beta3-test_small.ogg
+fate-vorbis-3: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/beta3-test_small.ogg
 fate-vorbis-3: REF = $(SAMPLES)/vorbis/beta3-test_small.pcm
 
 FATE_VORBIS += fate-vorbis-4
-fate-vorbis-4: CMD = pcm -i $(SAMPLES)/vorbis/beta4-test_small.ogg
+fate-vorbis-4: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/beta4-test_small.ogg
 fate-vorbis-4: REF = $(SAMPLES)/vorbis/beta4-test_small.pcm
 
 FATE_VORBIS += fate-vorbis-5
-fate-vorbis-5: CMD = pcm -i $(SAMPLES)/vorbis/chain-test1_small.ogg
+fate-vorbis-5: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/chain-test1_small.ogg
 fate-vorbis-5: REF = $(SAMPLES)/vorbis/chain-test1_small.pcm
 
 FATE_VORBIS += fate-vorbis-6
-fate-vorbis-6: CMD = pcm -i $(SAMPLES)/vorbis/chain-test2_small.ogg
+fate-vorbis-6: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/chain-test2_small.ogg
 fate-vorbis-6: REF = $(SAMPLES)/vorbis/chain-test2_small.pcm
 
 FATE_VORBIS += fate-vorbis-7
-fate-vorbis-7: CMD = pcm -i $(SAMPLES)/vorbis/highrate-test_small.ogg
+fate-vorbis-7: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/highrate-test_small.ogg
 fate-vorbis-7: REF = $(SAMPLES)/vorbis/highrate-test_small.pcm
 
 FATE_VORBIS += fate-vorbis-8
-fate-vorbis-8: CMD = pcm -i $(SAMPLES)/vorbis/lsp-test2_small.ogg
+fate-vorbis-8: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/lsp-test2_small.ogg
 fate-vorbis-8: REF = $(SAMPLES)/vorbis/lsp-test2_small.pcm
 
 FATE_VORBIS += fate-vorbis-9
-fate-vorbis-9: CMD = pcm -i $(SAMPLES)/vorbis/lsp-test3_small.ogg
+fate-vorbis-9: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/lsp-test3_small.ogg
 fate-vorbis-9: REF = $(SAMPLES)/vorbis/lsp-test3_small.pcm
 
 FATE_VORBIS += fate-vorbis-10
-fate-vorbis-10: CMD = pcm -i $(SAMPLES)/vorbis/lsp-test4_small.ogg
+fate-vorbis-10: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/lsp-test4_small.ogg
 fate-vorbis-10: REF = $(SAMPLES)/vorbis/lsp-test4_small.pcm
 
 FATE_VORBIS += fate-vorbis-11
-fate-vorbis-11: CMD = pcm -i $(SAMPLES)/vorbis/lsp-test_small.ogg
+fate-vorbis-11: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/lsp-test_small.ogg
 fate-vorbis-11: REF = $(SAMPLES)/vorbis/lsp-test_small.pcm
 
 FATE_VORBIS += fate-vorbis-12
-fate-vorbis-12: CMD = pcm -i $(SAMPLES)/vorbis/mono_small.ogg
+fate-vorbis-12: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/mono_small.ogg
 fate-vorbis-12: REF = $(SAMPLES)/vorbis/mono_small.pcm
 
 FATE_VORBIS += fate-vorbis-13
-fate-vorbis-13: CMD = pcm -i $(SAMPLES)/vorbis/moog_small.ogg
+fate-vorbis-13: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/moog_small.ogg
 fate-vorbis-13: REF = $(SAMPLES)/vorbis/moog_small.pcm
 fate-vorbis-13: FUZZ = 2
 
 FATE_VORBIS += fate-vorbis-14
-fate-vorbis-14: CMD = pcm -i $(SAMPLES)/vorbis/rc1-test_small.ogg
+fate-vorbis-14: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/rc1-test_small.ogg
 fate-vorbis-14: REF = $(SAMPLES)/vorbis/rc1-test_small.pcm
 
 FATE_VORBIS += fate-vorbis-15
-fate-vorbis-15: CMD = pcm -i $(SAMPLES)/vorbis/rc2-test2_small.ogg
+fate-vorbis-15: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/rc2-test2_small.ogg
 fate-vorbis-15: REF = $(SAMPLES)/vorbis/rc2-test2_small.pcm
 
 FATE_VORBIS += fate-vorbis-16
-fate-vorbis-16: CMD = pcm -i $(SAMPLES)/vorbis/rc2-test_small.ogg
+fate-vorbis-16: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/rc2-test_small.ogg
 fate-vorbis-16: REF = $(SAMPLES)/vorbis/rc2-test_small.pcm
 
 FATE_VORBIS += fate-vorbis-17
-fate-vorbis-17: CMD = pcm -i $(SAMPLES)/vorbis/rc3-test_small.ogg
+fate-vorbis-17: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/rc3-test_small.ogg
 fate-vorbis-17: REF = $(SAMPLES)/vorbis/rc3-test_small.pcm
 
 FATE_VORBIS += fate-vorbis-18
-fate-vorbis-18: CMD = pcm -i $(SAMPLES)/vorbis/sleepzor_small.ogg
+fate-vorbis-18: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/sleepzor_small.ogg
 fate-vorbis-18: REF = $(SAMPLES)/vorbis/sleepzor_small.pcm
 fate-vorbis-18: FUZZ = 2
 
 FATE_VORBIS += fate-vorbis-19
-fate-vorbis-19: CMD = pcm -i $(SAMPLES)/vorbis/test-short2_small.ogg
+fate-vorbis-19: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/test-short2_small.ogg
 fate-vorbis-19: REF = $(SAMPLES)/vorbis/test-short2_small.pcm
 
 FATE_VORBIS += fate-vorbis-20
-fate-vorbis-20: CMD = pcm -i $(SAMPLES)/vorbis/6.ogg
+fate-vorbis-20: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/6.ogg
 fate-vorbis-20: REF = $(SAMPLES)/vorbis/6.pcm
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, OGG, VORBIS) += $(FATE_VORBIS)

libav-v9.6.tar.bz2/tests/fate/vpx.mak -> libav-v10.1.tar.bz2/tests/fate/vpx.mak Changed

@@ -1,26 +1,26 @@
-FATE_VP3-$(CONFIG_AVI_DEMUXER) += fate-vp31
-fate-vp31: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi
+FATE_VP3-$(call DEMDEC, MATROSKA, THEORA) += fate-theora-coeff-level64
+fate-theora-coeff-level64: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp3/coeff_level64.mkv
 
-FATE_VP3-$(CONFIG_MATROSKA_DEMUXER) += fate-vp3-coeff-level64
-fate-vp3-coeff-level64: CMD = framecrc -i $(SAMPLES)/vp3/coeff_level64.mkv
+FATE_VP3-$(call DEMDEC, AVI, VP3) += fate-vp31
+fate-vp31: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp3/vp31.avi
 
-FATE_SAMPLES_AVCONV-$(CONFIG_VP3_DECODER) += $(FATE_VP3-yes)
+FATE_SAMPLES_AVCONV += $(FATE_VP3-yes)
 fate-vp3: $(FATE_VP3-yes)
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VP5) += fate-vp5
-fate-vp5: CMD = framecrc -i $(SAMPLES)/vp5/potter512-400-partial.avi -an
+fate-vp5: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp5/potter512-400-partial.avi -an
 
 FATE_VP6-$(call DEMDEC, EA, VP6) += fate-vp60
-fate-vp60: CMD = framecrc -i $(SAMPLES)/ea-vp6/g36.vp6
+fate-vp60: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/ea-vp6/g36.vp6
 
 FATE_VP6-$(call DEMDEC, EA, VP6) += fate-vp61
-fate-vp61: CMD = framecrc -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4
+fate-vp61: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4
 
 FATE_VP6-$(call DEMDEC, FLV, VP6A) += fate-vp6a
-fate-vp6a: CMD = framecrc -i $(SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv
+fate-vp6a: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv
 
 FATE_VP6-$(call DEMDEC, FLV, VP6F) += fate-vp6f
-fate-vp6f: CMD = framecrc -i $(SAMPLES)/flash-vp6/clip1024.flv
+fate-vp6f: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/flash-vp6/clip1024.flv
 
 FATE_SAMPLES_AVCONV += $(FATE_VP6-yes)
 fate-vp6: $(FATE_VP6-yes)
@@ -29,7 +29,7 @@
 
 define FATE_VP8_SUITE
 FATE_VP8-$(CONFIG_IVF_DEMUXER) += fate-vp8-test-vector$(2)-$(1)
-fate-vp8-test-vector$(2)-$(1): CMD = framemd5 $(3) -i $(SAMPLES)/vp8-test-vectors-r1/vp80-00-comprehensive-$(1).ivf
+fate-vp8-test-vector$(2)-$(1): CMD = framemd5 $(3) -i $(TARGET_SAMPLES)/vp8-test-vectors-r1/vp80-00-comprehensive-$(1).ivf
 fate-vp8-test-vector$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-test-vector-$(1)
 endef
 
@@ -39,15 +39,47 @@
 # FIXME this file contains two frames with identical timestamps,
 # so avconv drops one of them
 FATE_VP8-$(CONFIG_IVF_DEMUXER) += fate-vp8-sign-bias$(1)
-fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/sintel-signbias.ivf
+fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(TARGET_SAMPLES)/vp8/sintel-signbias.ivf
 fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias
 
 FATE_VP8-$(CONFIG_MATROSKA_DEMUXER) += fate-vp8-size-change$(1)
-fate-vp8-size-change$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/frame_size_change.webm -frames:v 30
+fate-vp8-size-change$(1): CMD = framemd5 $(2) -i $(TARGET_SAMPLES)/vp8/frame_size_change.webm -frames:v 30
 fate-vp8-size-change$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-size-change
 endef
 
-$(eval $(call FATE_VP8_FULL))
-$(eval $(call FATE_VP8_FULL,-emu-edge,-flags +emu_edge))
+$(call FATE_VP8_FULL)
+
 FATE_SAMPLES_AVCONV-$(CONFIG_VP8_DECODER) += $(FATE_VP8-yes)
 fate-vp8: $(FATE_VP8-yes)
+
+define FATE_VP9_SUITE
+FATE_VP9-$(CONFIG_MATROSKA_DEMUXER) += fate-vp9$(2)-$(1)
+fate-vp9$(2)-$(1): CMD = framemd5 $(3) -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-$(1).webm
+fate-vp9$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp9-$(1)
+endef
+
+VP9_Q = 00 01 02 03 04 05 06 07 08 09 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
+VP9_SHARP = 1 2 3 4 5 6 7
+VP9_SIZE_A = 08 10 16 18 32 34 64 66
+VP9_SIZE_B = 196 198 200 202 208 210 224 226
+
+define FATE_VP9_FULL
+$(foreach Q,$(VP9_Q),$(eval $(call FATE_VP9_SUITE,00-quantizer-$(Q),$(1),$(2))))
+$(foreach SHARP,$(VP9_SHARP),$(eval $(call FATE_VP9_SUITE,01-sharpness-$(SHARP),$(1),$(2))))
+$(foreach W,$(VP9_SIZE_A),$(eval $(foreach H,$(VP9_SIZE_A),$(eval $(call FATE_VP9_SUITE,02-size-$(W)x$(H),$(1),$(2))))))
+$(foreach W,$(VP9_SIZE_B),$(eval $(foreach H,$(VP9_SIZE_B),$(eval $(call FATE_VP9_SUITE,03-size-$(W)x$(H),$(1),$(2))))))
+$(eval $(call FATE_VP9_SUITE,03-deltaq,$(1),$(2)))
+$(eval $(call FATE_VP9_SUITE,2pass-akiyo,$(1),$(2)))
+$(eval $(call FATE_VP9_SUITE,parallelmode-akiyo,$(1),$(2)))
+$(eval $(call FATE_VP9_SUITE,segmentation-aq-akiyo,$(1),$(2)))
+$(eval $(call FATE_VP9_SUITE,segmentation-sf-akiyo,$(1),$(2)))
+$(eval $(call FATE_VP9_SUITE,tiling-pedestrian,$(1),$(2)))
+endef
+
+$(eval $(call FATE_VP9_FULL))
+
+FATE_SAMPLES_AVCONV-$(CONFIG_VP9_DECODER) += $(FATE_VP9-yes)
+fate-vp9: $(FATE_VP9-yes)

libav-v9.6.tar.bz2/tests/fate/vqf.mak -> libav-v10.1.tar.bz2/tests/fate/vqf.mak Changed

libav-v9.6.tar.bz2/tests/fate/wavpack.mak -> libav-v10.1.tar.bz2/tests/fate/wavpack.mak Changed

@@ -1,92 +1,102 @@
 # lossless
 
-FATE_WAVPACK += fate-wavpack-lossless-float
-fate-wavpack-lossless-float: CMD = md5 -i $(SAMPLES)/wavpack/lossless/32bit_float-partial.wv -f f32le
-
 FATE_WAVPACK += fate-wavpack-lossless-8bit
-fate-wavpack-lossless-8bit: CMD = md5 -i $(SAMPLES)/wavpack/lossless/8bit-partial.wv -f s8
+fate-wavpack-lossless-8bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/8bit-partial.wv -f s8
 
 FATE_WAVPACK += fate-wavpack-lossless-12bit
-fate-wavpack-lossless-12bit: CMD = md5 -i $(SAMPLES)/wavpack/lossless/12bit-partial.wv -f s16le
+fate-wavpack-lossless-12bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/12bit-partial.wv -f s16le
 
 FATE_WAVPACK += fate-wavpack-lossless-16bit
-fate-wavpack-lossless-16bit: CMD = md5 -i $(SAMPLES)/wavpack/lossless/16bit-partial.wv -f s16le
+fate-wavpack-lossless-16bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/16bit-partial.wv -f s16le
 
 FATE_WAVPACK += fate-wavpack-lossless-24bit
-fate-wavpack-lossless-24bit: CMD = md5 -i $(SAMPLES)/wavpack/lossless/24bit-partial.wv -f s24le
+fate-wavpack-lossless-24bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/24bit-partial.wv -f s24le
 
 FATE_WAVPACK += fate-wavpack-lossless-32bit
-fate-wavpack-lossless-32bit: CMD = md5 -i $(SAMPLES)/wavpack/lossless/32bit_int-partial.wv -f s32le
+fate-wavpack-lossless-32bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_int-partial.wv -f s32le
 
-# lossy
+FATE_WAVPACK += fate-wavpack-lossless-float
+fate-wavpack-lossless-float: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_float-partial.wv -f f32le
 
-FATE_WAVPACK += fate-wavpack-lossy-float
-fate-wavpack-lossy-float: CMD = md5 -i $(SAMPLES)/wavpack/lossy/2.0_32-bit_float.wv -f f32le
+# lossy
 
 FATE_WAVPACK += fate-wavpack-lossy-8bit
-fate-wavpack-lossy-8bit: CMD = md5 -i $(SAMPLES)/wavpack/lossy/4.0_8-bit.wv -f s8
+fate-wavpack-lossy-8bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_8-bit.wv -f s8
 
 FATE_WAVPACK += fate-wavpack-lossy-16bit
-fate-wavpack-lossy-16bit: CMD = md5 -i $(SAMPLES)/wavpack/lossy/4.0_16-bit.wv -f s16le
+fate-wavpack-lossy-16bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_16-bit.wv -f s16le
 
 FATE_WAVPACK += fate-wavpack-lossy-24bit
-fate-wavpack-lossy-24bit: CMD = md5 -i $(SAMPLES)/wavpack/lossy/4.0_24-bit.wv -f s24le
+fate-wavpack-lossy-24bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_24-bit.wv -f s24le
 
 FATE_WAVPACK += fate-wavpack-lossy-32bit
-fate-wavpack-lossy-32bit: CMD = md5 -i $(SAMPLES)/wavpack/lossy/4.0_32-bit_int.wv -f s32le
+fate-wavpack-lossy-32bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_32-bit_int.wv -f s32le
+
+FATE_WAVPACK += fate-wavpack-lossy-float
+fate-wavpack-lossy-float: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/2.0_32-bit_float.wv -f f32le
 
 # channel configurations
 
 FATE_WAVPACK += fate-wavpack-channels-monofloat
-fate-wavpack-channels-monofloat: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/mono_float-partial.wv -f f32le
+fate-wavpack-channels-monofloat: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_float-partial.wv -f f32le
 
 FATE_WAVPACK += fate-wavpack-channels-monoint
-fate-wavpack-channels-monoint: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -f s16le
+fate-wavpack-channels-monoint: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -f s16le
 
 FATE_WAVPACK += fate-wavpack-channels-4.0
-fate-wavpack-channels-4.0: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/edward_4.0_16bit-partial.wv -f s16le
+fate-wavpack-channels-4.0: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/edward_4.0_16bit-partial.wv -f s16le
 
 FATE_WAVPACK += fate-wavpack-channels-5.1
-fate-wavpack-channels-5.1: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/panslab_sample_5.1_16bit-partial.wv -f s16le
+fate-wavpack-channels-5.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_5.1_16bit-partial.wv -f s16le
 
 FATE_WAVPACK += fate-wavpack-channels-6.1
-fate-wavpack-channels-6.1: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -f s16le
+fate-wavpack-channels-6.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -f s16le
 
 FATE_WAVPACK += fate-wavpack-channels-7.1
-fate-wavpack-channels-7.1: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/panslab_sample_7.1_16bit-partial.wv -f s16le
+fate-wavpack-channels-7.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_7.1_16bit-partial.wv -f s16le
 
 # speed modes
 
 FATE_WAVPACK += fate-wavpack-speed-default
-fate-wavpack-speed-default: CMD = md5 -i $(SAMPLES)/wavpack/speed_modes/default-partial.wv  -f s16le
+fate-wavpack-speed-default: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/default-partial.wv  -f s16le
 
 FATE_WAVPACK += fate-wavpack-speed-fast
-fate-wavpack-speed-fast: CMD = md5 -i $(SAMPLES)/wavpack/speed_modes/fast-partial.wv  -f s16le
+fate-wavpack-speed-fast: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/fast-partial.wv  -f s16le
 
 FATE_WAVPACK += fate-wavpack-speed-high
-fate-wavpack-speed-high: CMD = md5 -i $(SAMPLES)/wavpack/speed_modes/high-partial.wv  -f s16le
+fate-wavpack-speed-high: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/high-partial.wv  -f s16le
 
 FATE_WAVPACK += fate-wavpack-speed-vhigh
-fate-wavpack-speed-vhigh: CMD = md5 -i $(SAMPLES)/wavpack/speed_modes/vhigh-partial.wv  -f s16le
+fate-wavpack-speed-vhigh: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/vhigh-partial.wv  -f s16le
 
 # special cases
 
-FATE_WAVPACK += fate-wavpack-cuesheet
-fate-wavpack-cuesheet: CMD = md5 -i $(SAMPLES)/wavpack/special/cue_sheet.wv -f s16le
-
-FATE_WAVPACK += fate-wavpack-zerolsbs
-fate-wavpack-zerolsbs: CMD = md5 -i $(SAMPLES)/wavpack/special/zero_lsbs.wv -f s16le
-
 FATE_WAVPACK += fate-wavpack-clipping
-fate-wavpack-clipping: CMD = md5 -i $(SAMPLES)/wavpack/special/clipping.wv -f s16le
+fate-wavpack-clipping: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/clipping.wv -f s16le
+
+FATE_WAVPACK += fate-wavpack-cuesheet
+fate-wavpack-cuesheet: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/cue_sheet.wv -f s16le
 
 FATE_WAVPACK += fate-wavpack-falsestereo
-fate-wavpack-falsestereo: CMD = md5 -i $(SAMPLES)/wavpack/special/false_stereo.wv -f s16le
+fate-wavpack-falsestereo: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/false_stereo.wv -f s16le
+
+FATE_WAVPACK += fate-wavpack-zerolsbs
+fate-wavpack-zerolsbs: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/zero_lsbs.wv -f s16le
 
 FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += $(FATE_WAVPACK)
 
 FATE_WAVPACK-$(call DEMDEC, MATROSKA, WAVPACK) += fate-wavpack-matroskamode
-fate-wavpack-matroskamode: CMD = md5 -i $(SAMPLES)/wavpack/special/matroska_mode.mka -f s16le
+fate-wavpack-matroskamode: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/matroska_mode.mka -f s16le
+
+FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-mono
+fate-wavpack-matroska_mux-mono: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -c copy -flags +bitexact -f matroska
+fate-wavpack-matroska_mux-mono: CMP = oneline
+fate-wavpack-matroska_mux-mono: REF = 6bd769b3f0e9d7fa6261c3b73a53eb7d
+
+FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-61
+fate-wavpack-matroska_mux-61: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -c copy -flags +bitexact -f matroska
+fate-wavpack-matroska_mux-61: CMP = oneline
+fate-wavpack-matroska_mux-61: REF = 2d2f1e7f81a8b1983fcffc7f24de8a11
 
 FATE_SAMPLES_AVCONV += $(FATE_WAVPACK-yes)
 fate-wavpack: $(FATE_WAVPACK-yes)

libav-v9.6.tar.bz2/tests/fate/wma.mak -> libav-v10.1.tar.bz2/tests/fate/wma.mak Changed

@@ -1,13 +1,13 @@
 FATE_WMAPRO-$(call DEMDEC, ASF, WMAPRO) += fate-wmapro-2ch
-fate-wmapro-2ch: CMD = pcm -i $(SAMPLES)/wmapro/Beethovens_9th-1_small.wma
+fate-wmapro-2ch: CMD = pcm -i $(TARGET_SAMPLES)/wmapro/Beethovens_9th-1_small.wma
 fate-wmapro-2ch: REF = $(SAMPLES)/wmapro/Beethovens_9th-1_small.pcm
 
 FATE_WMAPRO-$(call DEMDEC, ASF, WMAPRO) += fate-wmapro-5.1
-fate-wmapro-5.1: CMD = pcm -i $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.wma
+fate-wmapro-5.1: CMD = pcm -i $(TARGET_SAMPLES)/wmapro/latin_192_mulitchannel_cut.wma
 fate-wmapro-5.1: REF = $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.pcm
 
 FATE_WMAPRO-$(call DEMDEC, MOV, WMAPRO) += fate-wmapro-ism
-fate-wmapro-ism: CMD = pcm -i $(SAMPLES)/isom/vc1-wmapro.ism -vn
+fate-wmapro-ism: CMD = pcm -i $(TARGET_SAMPLES)/isom/vc1-wmapro.ism -vn
 fate-wmapro-ism: REF = $(SAMPLES)/isom/vc1-wmapro.pcm
 
 $(FATE_WMAPRO-yes): CMP = oneoff
@@ -16,17 +16,17 @@
 fate-wmapro: $(FATE_WMAPRO-yes)
 
 FATE_WMAVOICE-$(call DEMDEC, ASF, WMAVOICE) += fate-wmavoice-7k
-fate-wmavoice-7k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-7K.wma
+fate-wmavoice-7k: CMD = pcm -i $(TARGET_SAMPLES)/wmavoice/streaming_CBR-7K.wma
 fate-wmavoice-7k: REF = $(SAMPLES)/wmavoice/streaming_CBR-7K.pcm
 fate-wmavoice-7k: FUZZ = 3
 
 FATE_WMAVOICE-$(call DEMDEC, ASF, WMAVOICE) += fate-wmavoice-11k
-fate-wmavoice-11k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-11K.wma
+fate-wmavoice-11k: CMD = pcm -i $(TARGET_SAMPLES)/wmavoice/streaming_CBR-11K.wma
 fate-wmavoice-11k: REF = $(SAMPLES)/wmavoice/streaming_CBR-11K.pcm
 fate-wmavoice-11k: FUZZ = 3
 
 FATE_WMAVOICE-$(call DEMDEC, ASF, WMAVOICE) += fate-wmavoice-19k
-fate-wmavoice-19k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-19K.wma
+fate-wmavoice-19k: CMD = pcm -i $(TARGET_SAMPLES)/wmavoice/streaming_CBR-19K.wma
 fate-wmavoice-19k: REF = $(SAMPLES)/wmavoice/streaming_CBR-19K.pcm
 fate-wmavoice-19k: FUZZ = 3
 
@@ -36,13 +36,13 @@
 fate-wmavoice: $(FATE_WMAVOICE-yes)
 
 FATE_WMA_ENCODE-$(call ENCDEC, WMAV1, ASF) += fate-wmav1-encode
-fate-wmav1-encode: CMD = enc_dec_pcm asf wav s16le $(REF) -c:a wmav1 -b:a 128k
+fate-wmav1-encode: CMD = enc_dec_pcm asf wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c:a wmav1 -b:a 128k
 fate-wmav1-encode: CMP_SHIFT = -8192
 fate-wmav1-encode: CMP_TARGET = 291.06
 fate-wmav1-encode: SIZE_TOLERANCE = 4632
 
 FATE_WMA_ENCODE-$(call ENCDEC, WMAV2, ASF) += fate-wmav2-encode
-fate-wmav2-encode: CMD = enc_dec_pcm asf wav s16le $(REF) -c:a wmav2 -b:a 128k
+fate-wmav2-encode: CMD = enc_dec_pcm asf wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c:a wmav2 -b:a 128k
 fate-wmav2-encode: CMP_SHIFT = -8192
 fate-wmav2-encode: CMP_TARGET = 258.32
 fate-wmav2-encode: SIZE_TOLERANCE = 4632

libav-v10.1.tar.bz2/tests/fate/xvid.mak Added

libav-v10.1.tar.bz2/tests/filtergraphs Added

libav-v10.1.tar.bz2/tests/filtergraphs/channelmap Added

libav-v10.1.tar.bz2/tests/filtergraphs/lavr_mix_output_zero Added

libav-v10.1.tar.bz2/tests/filtergraphs/overlay Added

libav-v10.1.tar.bz2/tests/filtergraphs/select-alternate Added

libav-v10.1.tar.bz2/tests/filtergraphs/setpts Added

libav-v9.6.tar.bz2/tests/lavf-regression.sh -> libav-v10.1.tar.bz2/tests/lavf-regression.sh Changed

libav-v9.6.tar.bz2/tests/ref/acodec/alac -> libav-v10.1.tar.bz2/tests/ref/acodec/alac Changed

libav-v9.6.tar.bz2/tests/ref/acodec/pcm-s16be -> libav-v10.1.tar.bz2/tests/ref/acodec/pcm-s16be Changed

libav-v9.6.tar.bz2/tests/ref/acodec/pcm-s24be -> libav-v10.1.tar.bz2/tests/ref/acodec/pcm-s24be Changed

libav-v9.6.tar.bz2/tests/ref/acodec/pcm-s32be -> libav-v10.1.tar.bz2/tests/ref/acodec/pcm-s32be Changed

libav-v9.6.tar.bz2/tests/ref/acodec/pcm-s8 -> libav-v10.1.tar.bz2/tests/ref/acodec/pcm-s8 Changed

libav-v9.6.tar.bz2/tests/ref/fate/adpcm-ms-mono -> libav-v10.1.tar.bz2/tests/ref/fate/adpcm-ms-mono Changed

libav-v10.1.tar.bz2/tests/ref/fate/armovie-escape130 Added

@@ -0,0 +1,360 @@
+#tb 0: 1/15
+0,          0,          0,        1,    76800, 0x860502ee
+0,          1,          1,        1,    76800, 0x055da755
+0,          2,          2,        1,    76800, 0x67969220
+0,          3,          3,        1,    76800, 0xbb28885c
+0,          4,          4,        1,    76800, 0x4000a5dd
+0,          5,          5,        1,    76800, 0xfe1f6b04
+0,          6,          6,        1,    76800, 0x334cbe5d
+0,          7,          7,        1,    76800, 0x87d15088
+0,          8,          8,        1,    76800, 0x70248ad3
+0,          9,          9,        1,    76800, 0x29bcaea0
+0,         10,         10,        1,    76800, 0xee81d3e2
+0,         11,         11,        1,    76800, 0x5bdd3cbc
+0,         12,         12,        1,    76800, 0xd7a5e42e
+0,         13,         13,        1,    76800, 0xbb354f7c
+0,         14,         14,        1,    76800, 0x4c86e881
+0,         15,         15,        1,    76800, 0xc6acb7f4
+0,         16,         16,        1,    76800, 0x7701ca9c
+0,         17,         17,        1,    76800, 0x5555d472
+0,         18,         18,        1,    76800, 0xa8fbc2d6
+0,         19,         19,        1,    76800, 0x558ab4f2
+0,         20,         20,        1,    76800, 0x9eb5ab72
+0,         21,         21,        1,    76800, 0x4711a894
+0,         22,         22,        1,    76800, 0xd649c04c
+0,         23,         23,        1,    76800, 0x26b9d6cc
+0,         24,         24,        1,    76800, 0x6217e494
+0,         25,         25,        1,    76800, 0x85d7e232
+0,         26,         26,        1,    76800, 0x4059ddb0
+0,         27,         27,        1,    76800, 0x3581cae2
+0,         28,         28,        1,    76800, 0x1885c99e
+0,         29,         29,        1,    76800, 0xc87dcd66
+0,         30,         30,        1,    76800, 0x8645e084
+0,         31,         31,        1,    76800, 0xe17ed6b4
+0,         32,         32,        1,    76800, 0x2709c7b6
+0,         33,         33,        1,    76800, 0xded3ab34
+0,         34,         34,        1,    76800, 0x3e69a364
+0,         35,         35,        1,    76800, 0x90c7ae7e
+0,         36,         36,        1,    76800, 0x7dffba9a
+0,         37,         37,        1,    76800, 0x1311ce7a
+0,         38,         38,        1,    76800, 0x6663e5ce
+0,         39,         39,        1,    76800, 0x597d0173
+0,         40,         40,        1,    76800, 0x936b1ab3
+0,         41,         41,        1,    76800, 0x860f2157
+0,         42,         42,        1,    76800, 0x69cd2ffd
+0,         43,         43,        1,    76800, 0xd0a24429
+0,         44,         44,        1,    76800, 0x6fbd49b3
+0,         45,         45,        1,    76800, 0x6e866211
+0,         46,         46,        1,    76800, 0x8ed9615d
+0,         47,         47,        1,    76800, 0x5ef45ab1
+0,         48,         48,        1,    76800, 0x72174a5d
+0,         49,         49,        1,    76800, 0x9e1346e1
+0,         50,         50,        1,    76800, 0xbe2046ef
+0,         51,         51,        1,    76800, 0x6417511d
+0,         52,         52,        1,    76800, 0xdc7d59d7
+0,         53,         53,        1,    76800, 0xea8f5569
+0,         54,         54,        1,    76800, 0x77b45d67
+0,         55,         55,        1,    76800, 0x949566bf
+0,         56,         56,        1,    76800, 0x644c6e39
+0,         57,         57,        1,    76800, 0xe8e47155
+0,         58,         58,        1,    76800, 0x84eb80d3
+0,         59,         59,        1,    76800, 0x6ade8f99
+0,         60,         60,        1,    76800, 0x1359adf5
+0,         61,         61,        1,    76800, 0x3b8ab849
+0,         62,         62,        1,    76800, 0xb761c9af
+0,         63,         63,        1,    76800, 0x89f0ccf5
+0,         64,         64,        1,    76800, 0xf50dc989
+0,         65,         65,        1,    76800, 0xc9e8c37f
+0,         66,         66,        1,    76800, 0x91b1c6fb
+0,         67,         67,        1,    76800, 0x30accc59
+0,         68,         68,        1,    76800, 0x4dbbd735
+0,         69,         69,        1,    76800, 0x06ece049
+0,         70,         70,        1,    76800, 0x9112ebef
+0,         71,         71,        1,    76800, 0x4b9af209
+0,         72,         72,        1,    76800, 0x1063f2d5
+0,         73,         73,        1,    76800, 0xc00ef0eb
+0,         74,         74,        1,    76800, 0xfc76efa1
+0,         75,         75,        1,    76800, 0xd85cff3b
+0,         76,         76,        1,    76800, 0x2dc9fc19
+0,         77,         77,        1,    76800, 0xe5610674
+0,         78,         78,        1,    76800, 0xdfa5fdb5
+0,         79,         79,        1,    76800, 0xb7eef1d9
+0,         80,         80,        1,    76800, 0x3743ed2b
+0,         81,         81,        1,    76800, 0xaaf6a11d
+0,         82,         82,        1,    76800, 0xbd3dba25
+0,         83,         83,        1,    76800, 0x0d5a84c2
+0,         84,         84,        1,    76800, 0x04d3cede
+0,         85,         85,        1,    76800, 0xd0ed078b
+0,         86,         86,        1,    76800, 0x712c4257
+0,         87,         87,        1,    76800, 0x0866f074
+0,         88,         88,        1,    76800, 0x7bcbd610
+0,         89,         89,        1,    76800, 0xcfb16193
+0,         90,         90,        1,    76800, 0x08b2bf53
+0,         91,         91,        1,    76800, 0x8a89d293
+0,         92,         92,        1,    76800, 0xdceb169e
+0,         93,         93,        1,    76800, 0x91b53522
+0,         94,         94,        1,    76800, 0xc6f36e86
+0,         95,         95,        1,    76800, 0x64849fae
+0,         96,         96,        1,    76800, 0x7f060705
+0,         97,         97,        1,    76800, 0x100c7c79
+0,         98,         98,        1,    76800, 0xe6d3df05
+0,         99,         99,        1,    76800, 0x3947f65d
+0,        100,        100,        1,    76800, 0xfe52d0e1
+0,        101,        101,        1,    76800, 0x5a81b935
+0,        102,        102,        1,    76800, 0x3dabcb31
+0,        103,        103,        1,    76800, 0x0ae6dea9
+0,        104,        104,        1,    76800, 0x214c2dec
+0,        105,        105,        1,    76800, 0xeb526560
+0,        106,        106,        1,    76800, 0xbb618418
+0,        107,        107,        1,    76800, 0x61d9cbd0
+0,        108,        108,        1,    76800, 0x9d2660bb
+0,        109,        109,        1,    76800, 0xf4f5dc33
+0,        110,        110,        1,    76800, 0xe2551ec2
+0,        111,        111,        1,    76800, 0x5f971e3a
+0,        112,        112,        1,    76800, 0xa96c0cea
+0,        113,        113,        1,    76800, 0xd904cdeb
+0,        114,        114,        1,    76800, 0x0443a227
+0,        115,        115,        1,    76800, 0xf3e92457
+0,        116,        116,        1,    76800, 0x2df4d5b0
+0,        117,        117,        1,    76800, 0x72d4b018
+0,        118,        118,        1,    76800, 0x260ac3dc
+0,        119,        119,        1,    76800, 0x30160163
+0,        120,        120,        1,    76800, 0x76c7656f
+0,        121,        121,        1,    76800, 0xdc42bb23
+0,        122,        122,        1,    76800, 0xdbab366a
+0,        123,        123,        1,    76800, 0xf998ae66
+0,        124,        124,        1,    76800, 0x3b6afb62
+0,        125,        125,        1,    76800, 0x3fb3f76e
+0,        126,        126,        1,    76800, 0xc4f4d89a
+0,        127,        127,        1,    76800, 0xf448aa5a
+0,        128,        128,        1,    76800, 0xf9fed3c2
+0,        129,        129,        1,    76800, 0x8e4526bd
+0,        130,        130,        1,    76800, 0xa4be7a39
+0,        131,        131,        1,    76800, 0x07d376b9
+0,        132,        132,        1,    76800, 0x47993f51
+0,        133,        133,        1,    76800, 0x2f5816ad
+0,        134,        134,        1,    76800, 0x0f78187d
+0,        135,        135,        1,    76800, 0x5129e47e
+0,        136,        136,        1,    76800, 0x1050b9e2
+0,        137,        137,        1,    76800, 0x5ba278d2
+0,        138,        138,        1,    76800, 0xc5f5278e
+0,        139,        139,        1,    76800, 0xe406e093
+0,        140,        140,        1,    76800, 0x1b03c34f
+0,        141,        141,        1,    76800, 0xaad8b463
+0,        142,        142,        1,    76800, 0x4f90ad0d
+0,        143,        143,        1,    76800, 0x83a1b8b3
+0,        144,        144,        1,    76800, 0x682ccba1
+0,        145,        145,        1,    76800, 0xf44f0d22
+0,        146,        146,        1,    76800, 0x19c02d14
+0,        147,        147,        1,    76800, 0x01148baa
+0,        148,        148,        1,    76800, 0xff45dfbe
+0,        149,        149,        1,    76800, 0x05f8db6e
+0,        150,        150,        1,    76800, 0x9a129a6e
+0,        151,        151,        1,    76800, 0x93f8749e
+0,        152,        152,        1,    76800, 0x7dd1f89b
+0,        153,        153,        1,    76800, 0x3c81b16f
+0,        154,        154,        1,    76800, 0xefc3e567
+0,        155,        155,        1,    76800, 0x9fe26222
+0,        156,        156,        1,    76800, 0x85018ef4
+0,        157,        157,        1,    76800, 0x0aa984a4
+0,        158,        158,        1,    76800, 0xea45538e
+0,        159,        159,        1,    76800, 0x8e112454
+0,        160,        160,        1,    76800, 0xab76bf13
+0,        161,        161,        1,    76800, 0x9c1e32a1
+0,        162,        162,        1,    76800, 0xedb88ef8
+0,        163,        163,        1,    76800, 0x5371d475
+0,        164,        164,        1,    76800, 0x631a36eb
+0,        165,        165,        1,    76800, 0x6d4403ef
+0,        166,        166,        1,    76800, 0xdd67190b
+0,        167,        167,        1,    76800, 0x41b054a5
+0,        168,        168,        1,    76800, 0x53f55a99
+0,        169,        169,        1,    76800, 0x93182147
+0,        170,        170,        1,    76800, 0xcce0dd8c
+0,        171,        171,        1,    76800, 0x51f68932
+0,        172,        172,        1,    76800, 0x3d5e2f4a
+0,        173,        173,        1,    76800, 0x8baed3b3
+0,        174,        174,        1,    76800, 0xdc66509b
+0,        175,        175,        1,    76800, 0x1b81fb6c
+0,        176,        176,        1,    76800, 0x63e1f954
+0,        177,        177,        1,    76800, 0x75fd36a1
+0,        178,        178,        1,    76800, 0x68f1a18f
+0,        179,        179,        1,    76800, 0x8b0a1c76
+0,        180,        180,        1,    76800, 0x6d7b9810
+0,        181,        181,        1,    76800, 0x5dcdee4a
+0,        182,        182,        1,    76800, 0xf97c2187
+0,        183,        183,        1,    76800, 0x3e575d0d
+0,        184,        184,        1,    76800, 0x4fc6a723
+0,        185,        185,        1,    76800, 0xf5dcde6d
+0,        186,        186,        1,    76800, 0xc42204d2
+0,        187,        187,        1,    76800, 0x12cff747
+0,        188,        188,        1,    76800, 0xa11ae405
+0,        189,        189,        1,    76800, 0x7cd8d07f
+0,        190,        190,        1,    76800, 0xa100a8fb
+0,        191,        191,        1,    76800, 0x7e9e945b
+0,        192,        192,        1,    76800, 0x2ead8009
+0,        193,        193,        1,    76800, 0x755a7399
+0,        194,        194,        1,    76800, 0x25324c65
+0,        195,        195,        1,    76800, 0xe12ad1a4
+0,        196,        196,        1,    76800, 0x02366ec8
+0,        197,        197,        1,    76800, 0x1e8f0d5a
+0,        198,        198,        1,    76800, 0x0235d45b
+0,        199,        199,        1,    76800, 0x26d2b581
+0,        200,        200,        1,    76800, 0x304f1ccb
+0,        201,        201,        1,    76800, 0x4e1625ff
+0,        202,        202,        1,    76800, 0xfecc1f5b
+0,        203,        203,        1,    76800, 0x499714ff
+0,        204,        204,        1,    76800, 0xff240d1b
+0,        205,        205,        1,    76800, 0xc257ebf8
+0,        206,        206,        1,    76800, 0xf752cdfc
+0,        207,        207,        1,    76800, 0xb031b7cc
+0,        208,        208,        1,    76800, 0xb3f29c84
+0,        209,        209,        1,    76800, 0x77f66fd4
+0,        210,        210,        1,    76800, 0x9ef247ec
+0,        211,        211,        1,    76800, 0xdc32180c
+0,        212,        212,        1,    76800, 0x41bed8e5
+0,        213,        213,        1,    76800, 0x931b8b05
+0,        214,        214,        1,    76800, 0xe45b36f9
+0,        215,        215,        1,    76800, 0xc71bd626
+0,        216,        216,        1,    76800, 0x5b637aca
+0,        217,        217,        1,    76800, 0x3e8d1752
+0,        218,        218,        1,    76800, 0x5f9ca28b
+0,        219,        219,        1,    76800, 0x56d937bf
+0,        220,        220,        1,    76800, 0xe811c010
+0,        221,        221,        1,    76800, 0xca414fe8
+0,        222,        222,        1,    76800, 0x774ef141
+0,        223,        223,        1,    76800, 0xa44282f9
+0,        224,        224,        1,    76800, 0x30690641
+0,        225,        225,        1,    76800, 0xa833ad96
+0,        226,        226,        1,    76800, 0xe18d4932
+0,        227,        227,        1,    76800, 0xf934c0af
+0,        228,        228,        1,    76800, 0xdbc361b7
+0,        229,        229,        1,    76800, 0x7e0d0077
+0,        230,        230,        1,    76800, 0x2d3faaa4
+0,        231,        231,        1,    76800, 0xfa1a7708
+0,        232,        232,        1,    76800, 0xb60870a0
+0,        233,        233,        1,    76800, 0x5f5f7682
+0,        234,        234,        1,    76800, 0x47dc7564
+0,        235,        235,        1,    76800, 0x48f984c8
+0,        236,        236,        1,    76800, 0x7b0892a8
+0,        237,        237,        1,    76800, 0x56a0c014
+0,        238,        238,        1,    76800, 0x5dd1d854
+0,        239,        239,        1,    76800, 0xdfb0f698
+0,        240,        240,        1,    76800, 0xda051775
+0,        241,        241,        1,    76800, 0xa19c3eb1
+0,        242,        242,        1,    76800, 0xda74780d
+0,        243,        243,        1,    76800, 0x5dd28f7f
+0,        244,        244,        1,    76800, 0xf23fa74b
+0,        245,        245,        1,    76800, 0x4014c817
+0,        246,        246,        1,    76800, 0x0954ead7
+0,        247,        247,        1,    76800, 0xa8e319fe
+0,        248,        248,        1,    76800, 0x722e3f2c
+0,        249,        249,        1,    76800, 0xbee3702c
+0,        250,        250,        1,    76800, 0x19599172
+0,        251,        251,        1,    76800, 0x61c18ef0
+0,        252,        252,        1,    76800, 0xfb13780e
+0,        253,        253,        1,    76800, 0xd86e6b80
+0,        254,        254,        1,    76800, 0xf5cc6abc
+0,        255,        255,        1,    76800, 0x5fe86912
+0,        256,        256,        1,    76800, 0xba3d6efe
+0,        257,        257,        1,    76800, 0x23927f3e
+0,        258,        258,        1,    76800, 0x6947b124
+0,        259,        259,        1,    76800, 0x80e9f682
+0,        260,        260,        1,    76800, 0x6a393a9b
+0,        261,        261,        1,    76800, 0x5aff928b
+0,        262,        262,        1,    76800, 0xd81dfbab
+0,        263,        263,        1,    76800, 0x950166ca
+0,        264,        264,        1,    76800, 0xc7e6c6f0
+0,        265,        265,        1,    76800, 0x9aa328a1
+0,        266,        266,        1,    76800, 0x17de849b
+0,        267,        267,        1,    76800, 0xc4f7d9e3
+0,        268,        268,        1,    76800, 0x3f372bee
+0,        269,        269,        1,    76800, 0xaffc6e06
+0,        270,        270,        1,    76800, 0x94b8875c
+0,        271,        271,        1,    76800, 0xb713a42a
+0,        272,        272,        1,    76800, 0x8a89c232
+0,        273,        273,        1,    76800, 0xde65db42
+0,        274,        274,        1,    76800, 0x2c7dfaac
+0,        275,        275,        1,    76800, 0xa9202a71
+0,        276,        276,        1,    76800, 0x78715817
+0,        277,        277,        1,    76800, 0x3c0d8bb9
+0,        278,        278,        1,    76800, 0xa4cdbb61
+0,        279,        279,        1,    76800, 0xb9abd6ad
+0,        280,        280,        1,    76800, 0xecef0146
+0,        281,        281,        1,    76800, 0x82f22350
+0,        282,        282,        1,    76800, 0x17f442f2
+0,        283,        283,        1,    76800, 0xa6ea59e4
+0,        284,        284,        1,    76800, 0x62e452e6
+0,        285,        285,        1,    76800, 0xce2c454e
+0,        286,        286,        1,    76800, 0x27a821b4
+0,        287,        287,        1,    76800, 0x899f0f98
+0,        288,        288,        1,    76800, 0xe25dffb7
+0,        289,        289,        1,    76800, 0xa288ff17
+0,        290,        290,        1,    76800, 0x678500b0
+0,        291,        291,        1,    76800, 0xfe9c1216
+0,        292,        292,        1,    76800, 0x56da27a0
+0,        293,        293,        1,    76800, 0x62f239be
+0,        294,        294,        1,    76800, 0xa0a74b90
+0,        295,        295,        1,    76800, 0xc2f969a0
+0,        296,        296,        1,    76800, 0xe1ca7ad4
+0,        297,        297,        1,    76800, 0xf7938a7e
+0,        298,        298,        1,    76800, 0x3a339640
+0,        299,        299,        1,    76800, 0x44b79e0c
+0,        300,        300,        1,    76800, 0xd6e78ee6
+0,        301,        301,        1,    76800, 0xeecd91b6
+0,        302,        302,        1,    76800, 0x3ea99774
+0,        303,        303,        1,    76800, 0xd399967e
+0,        304,        304,        1,    76800, 0xc1e38de6
+0,        305,        305,        1,    76800, 0xd8ec7958
+0,        306,        306,        1,    76800, 0xe9e26992
+0,        307,        307,        1,    76800, 0xb6ee580a
+0,        308,        308,        1,    76800, 0xd56852f4
+0,        309,        309,        1,    76800, 0x997f4b9c
+0,        310,        310,        1,    76800, 0xc62841a6
+0,        311,        311,        1,    76800, 0x58063cee
+0,        312,        312,        1,    76800, 0xbaaf3e16
+0,        313,        313,        1,    76800, 0xac043a50
+0,        314,        314,        1,    76800, 0xa6c73a14
+0,        315,        315,        1,    76800, 0x1d614480
+0,        316,        316,        1,    76800, 0xc4e63b4c
+0,        317,        317,        1,    76800, 0x9d393b06
+0,        318,        318,        1,    76800, 0x9a902ef4
+0,        319,        319,        1,    76800, 0x6f872c74
+0,        320,        320,        1,    76800, 0x288a2f92
+0,        321,        321,        1,    76800, 0xb4832d76
+0,        322,        322,        1,    76800, 0x99e21c30
+0,        323,        323,        1,    76800, 0x287f0c90
+0,        324,        324,        1,    76800, 0xfd8bfe3f
+0,        325,        325,        1,    76800, 0x0a62f1d3
+0,        326,        326,        1,    76800, 0x2928eb4d
+0,        327,        327,        1,    76800, 0x2acfe487
+0,        328,        328,        1,    76800, 0x2b2ce339
+0,        329,        329,        1,    76800, 0x25d2e4c5
+0,        330,        330,        1,    76800, 0x0c14dd95
+0,        331,        331,        1,    76800, 0xfe8fdf29
+0,        332,        332,        1,    76800, 0x3afedd29
+0,        333,        333,        1,    76800, 0x3c85dd05
+0,        334,        334,        1,    76800, 0x9981db4d
+0,        335,        335,        1,    76800, 0xc4f9d501
+0,        336,        336,        1,    76800, 0xccd4d2d5
+0,        337,        337,        1,    76800, 0x229fdc41
+0,        338,        338,        1,    76800, 0x305de4ad
+0,        339,        339,        1,    76800, 0xb40eaef6
+0,        340,        340,        1,    76800, 0xb14f0431
+0,        341,        341,        1,    76800, 0x346b9280
+0,        342,        342,        1,    76800, 0x9198b4c0
+0,        343,        343,        1,    76800, 0xba1fde8f
+0,        344,        344,        1,    76800, 0x45260fa2
+0,        345,        345,        1,    76800, 0x69dd33cb
+0,        346,        346,        1,    76800, 0x6e10c599
+0,        347,        347,        1,    76800, 0x9dd33a40
+0,        348,        348,        1,    76800, 0x9dc7eb47
+0,        349,        349,        1,    76800, 0x8776f7df
+0,        350,        350,        1,    76800, 0xfd674e91
+0,        351,        351,        1,    76800, 0xcd69d151
+0,        352,        352,        1,    76800, 0xa8f69f9e
+0,        353,        353,        1,    76800, 0xf83587a2
+0,        354,        354,        1,    76800, 0xcb656e2a
+0,        355,        355,        1,    76800, 0x8c5e6b82
+0,        356,        356,        1,    76800, 0x880d5f56
+0,        357,        357,        1,    76800, 0x93405cce
+0,        358,        358,        1,    76800, 0x51345c1e

libav-v9.6.tar.bz2/tests/ref/fate/bethsoft-vid -> libav-v10.1.tar.bz2/tests/ref/fate/bethsoft-vid Changed

libav-v9.6.tar.bz2/tests/ref/fate/cdgraphics -> libav-v10.1.tar.bz2/tests/ref/fate/cdgraphics Changed

@@ -1,20 +1,20 @@
 #tb 0: 1/300
-0,          0,          0,        1,   194400, 0xd919c635
-0,          1,          1,        1,   194400, 0xd919c635
-0,          2,          2,        1,   194400, 0x516a1007
-0,          3,          3,        1,   194400, 0x516a1007
-0,          4,          4,        1,   194400, 0x516a1007
-0,          5,          5,        1,   194400, 0x516a1007
-0,          6,          6,        1,   194400, 0x516a1007
-0,          7,          7,        1,   194400, 0x516a1007
-0,          8,          8,        1,   194400, 0x516a1007
-0,          9,          9,        1,   194400, 0x516a1007
-0,         10,         10,        1,   194400, 0x516a1007
-0,         11,         11,        1,   194400, 0x516a1007
-0,         12,         12,        1,   194400, 0x516a1007
-0,         13,         13,        1,   194400, 0x516a1007
-0,         14,         14,        1,   194400, 0x516a1007
-0,         15,         15,        1,   194400, 0x516a1007
+0,          0,          0,        1,   194400, 0x46ad80da
+0,          1,          1,        1,   194400, 0x46ad80da
+0,          2,          2,        1,   194400, 0x9392c3b9
+0,          3,          3,        1,   194400, 0x9392c3b9
+0,          4,          4,        1,   194400, 0x9392c3b9
+0,          5,          5,        1,   194400, 0x9392c3b9
+0,          6,          6,        1,   194400, 0x9392c3b9
+0,          7,          7,        1,   194400, 0x9392c3b9
+0,          8,          8,        1,   194400, 0x9392c3b9
+0,          9,          9,        1,   194400, 0x9392c3b9
+0,         10,         10,        1,   194400, 0x9392c3b9
+0,         11,         11,        1,   194400, 0x9392c3b9
+0,         12,         12,        1,   194400, 0x9392c3b9
+0,         13,         13,        1,   194400, 0x9392c3b9
+0,         14,         14,        1,   194400, 0x9392c3b9
+0,         15,         15,        1,   194400, 0x9392c3b9
 0,         16,         16,        1,   194400, 0x46ad80da
 0,         17,         17,        1,   194400, 0x46ad80da
 0,         18,         18,        1,   194400, 0x46ad80da

libav-v10.1.tar.bz2/tests/ref/fate/cllc-yuy2-noblock Added

libav-v9.6.tar.bz2/tests/ref/fate/cyberia-c93 -> libav-v10.1.tar.bz2/tests/ref/fate/cyberia-c93 Changed

libav-v10.1.tar.bz2/tests/ref/fate/filter-atrim-duration Added

libav-v10.1.tar.bz2/tests/ref/fate/filter-atrim-mixed Added

libav-v10.1.tar.bz2/tests/ref/fate/filter-atrim-samples Added

libav-v10.1.tar.bz2/tests/ref/fate/filter-atrim-time Added

libav-v10.1.tar.bz2/tests/ref/fate/filter-boxblur Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   152064, 0x113489f8
+0,          1,          1,        1,   152064, 0x650a64ca
+0,          2,          2,        1,   152064, 0x29ecf6b1
+0,          3,          3,        1,   152064, 0x5cb98169
+0,          4,          4,        1,   152064, 0x4f46b6d7
+0,          5,          5,        1,   152064, 0x793ba919
+0,          6,          6,        1,   152064, 0x6caf7c14
+0,          7,          7,        1,   152064, 0xca638b2e
+0,          8,          8,        1,   152064, 0xf6df803d
+0,          9,          9,        1,   152064, 0x907b386f
+0,         10,         10,        1,   152064, 0xbb8d47f9
+0,         11,         11,        1,   152064, 0x17befd28
+0,         12,         12,        1,   152064, 0xf29eae1e
+0,         13,         13,        1,   152064, 0xb08ba1e6
+0,         14,         14,        1,   152064, 0x39948df7
+0,         15,         15,        1,   152064, 0x841d0e7e
+0,         16,         16,        1,   152064, 0x21d64dd6
+0,         17,         17,        1,   152064, 0x18af38e9
+0,         18,         18,        1,   152064, 0x1f946a26
+0,         19,         19,        1,   152064, 0x0d9cdc4e
+0,         20,         20,        1,   152064, 0xaf2af54d
+0,         21,         21,        1,   152064, 0x09e724e1
+0,         22,         22,        1,   152064, 0xff7d1e4b
+0,         23,         23,        1,   152064, 0xd49d68ad
+0,         24,         24,        1,   152064, 0x7ea4f96b
+0,         25,         25,        1,   152064, 0xd2f698b9
+0,         26,         26,        1,   152064, 0xc2a696ac
+0,         27,         27,        1,   152064, 0x1e8ed7b4
+0,         28,         28,        1,   152064, 0x980ba498
+0,         29,         29,        1,   152064, 0x47c364f2
+0,         30,         30,        1,   152064, 0x1a196ada
+0,         31,         31,        1,   152064, 0x4847c564
+0,         32,         32,        1,   152064, 0xa959fc15
+0,         33,         33,        1,   152064, 0x7d1a79d3
+0,         34,         34,        1,   152064, 0xae7e438d
+0,         35,         35,        1,   152064, 0xc32794b4
+0,         36,         36,        1,   152064, 0x6ef43744
+0,         37,         37,        1,   152064, 0xa06a01d0
+0,         38,         38,        1,   152064, 0xc94b5847
+0,         39,         39,        1,   152064, 0xb7514f04
+0,         40,         40,        1,   152064, 0xf0c959e8
+0,         41,         41,        1,   152064, 0xe6439e5e
+0,         42,         42,        1,   152064, 0xd347bf8d
+0,         43,         43,        1,   152064, 0x40822107
+0,         44,         44,        1,   152064, 0xe0ad044a
+0,         45,         45,        1,   152064, 0x05f77e73
+0,         46,         46,        1,   152064, 0xbeaa536d
+0,         47,         47,        1,   152064, 0xb0edc576
+0,         48,         48,        1,   152064, 0x35fcb4fa
+0,         49,         49,        1,   152064, 0x8d9ad8fa

libav-v10.1.tar.bz2/tests/ref/fate/filter-crop Changed

libav-v10.1.tar.bz2/tests/ref/fate/filter-crop_scale Changed

libav-v10.1.tar.bz2/tests/ref/fate/filter-crop_scale_vflip Changed

libav-v10.1.tar.bz2/tests/ref/fate/filter-crop_vflip Changed

libav-v10.1.tar.bz2/tests/ref/fate/filter-drawbox Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   152064, 0x7eee5ca3
+0,          1,          1,        1,   152064, 0x61125759
+0,          2,          2,        1,   152064, 0x2a64f47f
+0,          3,          3,        1,   152064, 0xc1089594
+0,          4,          4,        1,   152064, 0xd9e18830
+0,          5,          5,        1,   152064, 0xeb135e03
+0,          6,          6,        1,   152064, 0x6a5b40d7
+0,          7,          7,        1,   152064, 0x0a356a16
+0,          8,          8,        1,   152064, 0xfc1d7858
+0,          9,          9,        1,   152064, 0xa04bfeb8
+0,         10,         10,        1,   152064, 0x2d952ef0
+0,         11,         11,        1,   152064, 0x7f360233
+0,         12,         12,        1,   152064, 0xdd2bd142
+0,         13,         13,        1,   152064, 0xd231ad4a
+0,         14,         14,        1,   152064, 0x0543400e
+0,         15,         15,        1,   152064, 0x8252be2b
+0,         16,         16,        1,   152064, 0xd9f702be
+0,         17,         17,        1,   152064, 0xed5cf787
+0,         18,         18,        1,   152064, 0xf9472f8e
+0,         19,         19,        1,   152064, 0x89e4a60b
+0,         20,         20,        1,   152064, 0x1f12c1f5
+0,         21,         21,        1,   152064, 0x76eaf390
+0,         22,         22,        1,   152064, 0x60b5eba3
+0,         23,         23,        1,   152064, 0xf09e348c
+0,         24,         24,        1,   152064, 0x1afabf8a
+0,         25,         25,        1,   152064, 0xd16c558e
+0,         26,         26,        1,   152064, 0x78634796
+0,         27,         27,        1,   152064, 0xcd13b1e3
+0,         28,         28,        1,   152064, 0x59c2c6e5
+0,         29,         29,        1,   152064, 0x265e6beb
+0,         30,         30,        1,   152064, 0x82c656af
+0,         31,         31,        1,   152064, 0x919e923c
+0,         32,         32,        1,   152064, 0xc428fc15
+0,         33,         33,        1,   152064, 0x488760cd
+0,         34,         34,        1,   152064, 0x0a080c93
+0,         35,         35,        1,   152064, 0xaab649e6
+0,         36,         36,        1,   152064, 0x9b34edaa
+0,         37,         37,        1,   152064, 0x44e12816
+0,         38,         38,        1,   152064, 0x03777927
+0,         39,         39,        1,   152064, 0x6644573e
+0,         40,         40,        1,   152064, 0x18574df7
+0,         41,         41,        1,   152064, 0x5dce82f6
+0,         42,         42,        1,   152064, 0xb8be9205
+0,         43,         43,        1,   152064, 0xb927eacb
+0,         44,         44,        1,   152064, 0x303ec874
+0,         45,         45,        1,   152064, 0x05eb3c6f
+0,         46,         46,        1,   152064, 0x74a614d6
+0,         47,         47,        1,   152064, 0x6d078969
+0,         48,         48,        1,   152064, 0xe57a7ae0
+0,         49,         49,        1,   152064, 0xd6fca9ec

libav-v10.1.tar.bz2/tests/ref/fate/filter-fade Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   152064, 0xeb8105cd
+0,          1,          1,        1,   152064, 0x0bc0a27d
+0,          2,          2,        1,   152064, 0x9dcd3a04
+0,          3,          3,        1,   152064, 0xecd9e8ec
+0,          4,          4,        1,   152064, 0xdcc09bca
+0,          5,          5,        1,   152064, 0xbf1537ad
+0,          6,          6,        1,   152064, 0xf32214db
+0,          7,          7,        1,   152064, 0x9584ce5e
+0,          8,          8,        1,   152064, 0xbaa930e7
+0,          9,          9,        1,   152064, 0xce411a6c
+0,         10,         10,        1,   152064, 0xdbc2c004
+0,         11,         11,        1,   152064, 0x635a55df
+0,         12,         12,        1,   152064, 0x49d5807f
+0,         13,         13,        1,   152064, 0xd18734a6
+0,         14,         14,        1,   152064, 0xf9d3581f
+0,         15,         15,        1,   152064, 0x423dbdf7
+0,         16,         16,        1,   152064, 0x0c52a4a2
+0,         17,         17,        1,   152064, 0xf7a6a90e
+0,         18,         18,        1,   152064, 0x472441c2
+0,         19,         19,        1,   152064, 0x9470c09a
+0,         20,         20,        1,   152064, 0xce7da1a3
+0,         21,         21,        1,   152064, 0xdb01a0c9
+0,         22,         22,        1,   152064, 0x052e74cb
+0,         23,         23,        1,   152064, 0xab0eab85
+0,         24,         24,        1,   152064, 0x069c1d15
+0,         25,         25,        1,   152064, 0x95579936
+0,         26,         26,        1,   152064, 0x292dc6d4
+0,         27,         27,        1,   152064, 0x951d382d
+0,         28,         28,        1,   152064, 0x9ce23e7d
+0,         29,         29,        1,   152064, 0x5ceb17dd
+0,         30,         30,        1,   152064, 0xe0835003
+0,         31,         31,        1,   152064, 0x7b8a03ba
+0,         32,         32,        1,   152064, 0x1531b18c
+0,         33,         33,        1,   152064, 0xa4a2ee9a
+0,         34,         34,        1,   152064, 0xa5b0e442
+0,         35,         35,        1,   152064, 0x47e0554d
+0,         36,         36,        1,   152064, 0x9443792e
+0,         37,         37,        1,   152064, 0x1a3316ce
+0,         38,         38,        1,   152064, 0xbe8088d7
+0,         39,         39,        1,   152064, 0xd3013824
+0,         40,         40,        1,   152064, 0x342f2f5d
+0,         41,         41,        1,   152064, 0x638a816f
+0,         42,         42,        1,   152064, 0x0cf11a0f
+0,         43,         43,        1,   152064, 0xc4d87159
+0,         44,         44,        1,   152064, 0xa5c36b72
+0,         45,         45,        1,   152064, 0x17a9970d
+0,         46,         46,        1,   152064, 0x5479e51c
+0,         47,         47,        1,   152064, 0x2ae4382a
+0,         48,         48,        1,   152064, 0xab7097a6
+0,         49,         49,        1,   152064, 0xbc97d4bb

libav-v10.1.tar.bz2/tests/ref/fate/filter-fieldorder Added

@@ -0,0 +1,26 @@
+#tb 0: 2/25
+0,          0,          0,        1,   202752, 0x789424b6
+0,          1,          1,        1,   202752, 0x7a1f47a9
+0,          2,          2,        1,   202752, 0xa55a9aba
+0,          3,          3,        1,   202752, 0x71aa394c
+0,          4,          4,        1,   202752, 0xa5d9d0a7
+0,          5,          5,        1,   202752, 0x192d92ff
+0,          6,          6,        1,   202752, 0xa66d9bdd
+0,          7,          7,        1,   202752, 0x29a256bf
+0,          8,          8,        1,   202752, 0x75910eed
+0,          9,          9,        1,   202752, 0x99de19d7
+0,         10,         10,        1,   202752, 0x3a5a16e4
+0,         11,         11,        1,   202752, 0x262ce461
+0,         12,         12,        1,   202752, 0x08da338f
+0,         13,         13,        1,   202752, 0xfb515dbe
+0,         14,         14,        1,   202752, 0x984a8697
+0,         15,         15,        1,   202752, 0xbbd58420
+0,         16,         16,        1,   202752, 0xdd7e560b
+0,         17,         17,        1,   202752, 0x49b94d23
+0,         18,         18,        1,   202752, 0xb679bec7
+0,         19,         19,        1,   202752, 0xe6cffad0
+0,         20,         20,        1,   202752, 0x29a65535
+0,         21,         21,        1,   202752, 0x32851117
+0,         22,         22,        1,   202752, 0x35feb7d1
+0,         23,         23,        1,   202752, 0x96ad33b0
+0,         24,         24,        1,   202752, 0x7ec60b7d

libav-v10.1.tar.bz2/tests/ref/fate/filter-framepack-columns Added

libav-v10.1.tar.bz2/tests/ref/fate/filter-framepack-frameseq Added

libav-v10.1.tar.bz2/tests/ref/fate/filter-framepack-lines Added

libav-v10.1.tar.bz2/tests/ref/fate/filter-framepack-sbs Added

libav-v10.1.tar.bz2/tests/ref/fate/filter-framepack-tab Added

libav-v10.1.tar.bz2/tests/ref/fate/filter-gradfun Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   152064, 0xaebf898f
+0,          1,          1,        1,   152064, 0x217b6560
+0,          2,          2,        1,   152064, 0x0269f62d
+0,          3,          3,        1,   152064, 0x12168087
+0,          4,          4,        1,   152064, 0x42f9b5fb
+0,          5,          5,        1,   152064, 0xa653a8b3
+0,          6,          6,        1,   152064, 0x2e317bc3
+0,          7,          7,        1,   152064, 0xf3c28b63
+0,          8,          8,        1,   152064, 0x12e57fce
+0,          9,          9,        1,   152064, 0xeac238dd
+0,         10,         10,        1,   152064, 0x8fe74772
+0,         11,         11,        1,   152064, 0x982afc9c
+0,         12,         12,        1,   152064, 0xd82ead51
+0,         13,         13,        1,   152064, 0xf83ca211
+0,         14,         14,        1,   152064, 0xc01f8de2
+0,         15,         15,        1,   152064, 0x7ec60ec6
+0,         16,         16,        1,   152064, 0x1beb4dd3
+0,         17,         17,        1,   152064, 0x5a513899
+0,         18,         18,        1,   152064, 0x8c766a7b
+0,         19,         19,        1,   152064, 0x8bcddbb0
+0,         20,         20,        1,   152064, 0x01f6f558
+0,         21,         21,        1,   152064, 0xac7e240f
+0,         22,         22,        1,   152064, 0xe8811d38
+0,         23,         23,        1,   152064, 0x4ea268c9
+0,         24,         24,        1,   152064, 0xadc5f950
+0,         25,         25,        1,   152064, 0xdbf498fb
+0,         26,         26,        1,   152064, 0x1b999678
+0,         27,         27,        1,   152064, 0x085dd810
+0,         28,         28,        1,   152064, 0x4665a44f
+0,         29,         29,        1,   152064, 0x674764cf
+0,         30,         30,        1,   152064, 0x65e96a72
+0,         31,         31,        1,   152064, 0x44e0c539
+0,         32,         32,        1,   152064, 0xb124fc9e
+0,         33,         33,        1,   152064, 0x5cff79e3
+0,         34,         34,        1,   152064, 0x7dd94359
+0,         35,         35,        1,   152064, 0x3ec294b6
+0,         36,         36,        1,   152064, 0x675d3767
+0,         37,         37,        1,   152064, 0x9efa01cb
+0,         38,         38,        1,   152064, 0x321058d2
+0,         39,         39,        1,   152064, 0xe0d04e9c
+0,         40,         40,        1,   152064, 0xa4dd58d4
+0,         41,         41,        1,   152064, 0x4cc19dc5
+0,         42,         42,        1,   152064, 0x30a1bf77
+0,         43,         43,        1,   152064, 0x2c9d20f2
+0,         44,         44,        1,   152064, 0x55cb0447
+0,         45,         45,        1,   152064, 0x4daa7e4f
+0,         46,         46,        1,   152064, 0x2a4f53c7
+0,         47,         47,        1,   152064, 0x9fb8c583
+0,         48,         48,        1,   152064, 0x072eb401
+0,         49,         49,        1,   152064, 0xa203d8b7

libav-v10.1.tar.bz2/tests/ref/fate/filter-hqdn3d Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   152064, 0x0c09883a
+0,          1,          1,        1,   152064, 0xfc2748a0
+0,          2,          2,        1,   152064, 0xb746eea8
+0,          3,          3,        1,   152064, 0xf14192d7
+0,          4,          4,        1,   152064, 0xae26db7f
+0,          5,          5,        1,   152064, 0xe1a7da48
+0,          6,          6,        1,   152064, 0x5196b387
+0,          7,          7,        1,   152064, 0x20eac7ff
+0,          8,          8,        1,   152064, 0x4896c7f5
+0,          9,          9,        1,   152064, 0x97ba6468
+0,         10,         10,        1,   152064, 0x29b19884
+0,         11,         11,        1,   152064, 0x591e4e14
+0,         12,         12,        1,   152064, 0xb692fc98
+0,         13,         13,        1,   152064, 0x3457ed57
+0,         14,         14,        1,   152064, 0xbb10d71d
+0,         15,         15,        1,   152064, 0x47f45b57
+0,         16,         16,        1,   152064, 0xddbd8bc6
+0,         17,         17,        1,   152064, 0x1ef36e02
+0,         18,         18,        1,   152064, 0x55a363d2
+0,         19,         19,        1,   152064, 0x11c1c2f4
+0,         20,         20,        1,   152064, 0x553bdc2b
+0,         21,         21,        1,   152064, 0x2101d886
+0,         22,         22,        1,   152064, 0xe8f77998
+0,         23,         23,        1,   152064, 0x39bac7ff
+0,         24,         24,        1,   152064, 0x09a4172e
+0,         25,         25,        1,   152064, 0x6121f57f
+0,         26,         26,        1,   152064, 0x60e7525c
+0,         27,         27,        1,   152064, 0xd7895259
+0,         28,         28,        1,   152064, 0x12b2153b
+0,         29,         29,        1,   152064, 0x6119a22e
+0,         30,         30,        1,   152064, 0xf1969bd5
+0,         31,         31,        1,   152064, 0x7b03fc83
+0,         32,         32,        1,   152064, 0x17383667
+0,         33,         33,        1,   152064, 0x332bbfba
+0,         34,         34,        1,   152064, 0x253998a8
+0,         35,         35,        1,   152064, 0x2614c984
+0,         36,         36,        1,   152064, 0x50c86e8d
+0,         37,         37,        1,   152064, 0x9ff23b55
+0,         38,         38,        1,   152064, 0xc4589665
+0,         39,         39,        1,   152064, 0x5e7d86c7
+0,         40,         40,        1,   152064, 0xdda07f2f
+0,         41,         41,        1,   152064, 0xa1dacf4a
+0,         42,         42,        1,   152064, 0x3c83fb32
+0,         43,         43,        1,   152064, 0xa43da916
+0,         44,         44,        1,   152064, 0x0e767b80
+0,         45,         45,        1,   152064, 0xa18c5f82
+0,         46,         46,        1,   152064, 0xdb21c249
+0,         47,         47,        1,   152064, 0xb126341e
+0,         48,         48,        1,   152064, 0xc14742be
+0,         49,         49,        1,   152064, 0x582f631d

libav-v10.1.tar.bz2/tests/ref/fate/filter-interlace Added

@@ -0,0 +1,26 @@
+#tb 0: 2/25
+0,          0,          0,        1,   152064, 0x6077db38
+0,          1,          1,        1,   152064, 0x3d4f1b15
+0,          2,          2,        1,   152064, 0x447594f6
+0,          3,          3,        1,   152064, 0xb6258a38
+0,          4,          4,        1,   152064, 0x296abb09
+0,          5,          5,        1,   152064, 0x0fad069d
+0,          6,          6,        1,   152064, 0x92c78c0d
+0,          7,          7,        1,   152064, 0x645531fd
+0,          8,          8,        1,   152064, 0xe7652880
+0,          9,          9,        1,   152064, 0x496e1151
+0,         10,         10,        1,   152064, 0x7f7cfb06
+0,         11,         11,        1,   152064, 0x45e9affe
+0,         12,         12,        1,   152064, 0xaedb2d3a
+0,         13,         13,        1,   152064, 0x03fd9ae6
+0,         14,         14,        1,   152064, 0x2084e84d
+0,         15,         15,        1,   152064, 0xcf05faf6
+0,         16,         16,        1,   152064, 0x84c746c2
+0,         17,         17,        1,   152064, 0x898a6321
+0,         18,         18,        1,   152064, 0xe12b7fe9
+0,         19,         19,        1,   152064, 0x12feb756
+0,         20,         20,        1,   152064, 0xd813601a
+0,         21,         21,        1,   152064, 0xc0f3d385
+0,         22,         22,        1,   152064, 0xfca3a63f
+0,         23,         23,        1,   152064, 0xa0796f44
+0,         24,         24,        1,   152064, 0x1d26af11

libav-v10.1.tar.bz2/tests/ref/fate/filter-negate Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   152064, 0xef20e1ec
+0,          1,          1,        1,   152064, 0x899606ec
+0,          2,          2,        1,   152064, 0xaea175d2
+0,          3,          3,        1,   152064, 0x5201eb55
+0,          4,          4,        1,   152064, 0xf02bb525
+0,          5,          5,        1,   152064, 0x99fdc305
+0,          6,          6,        1,   152064, 0x3a8fefe7
+0,          7,          7,        1,   152064, 0x005edfbf
+0,          8,          8,        1,   152064, 0xe37aea50
+0,          9,          9,        1,   152064, 0xa5ad32f9
+0,         10,         10,        1,   152064, 0xb1e52485
+0,         11,         11,        1,   152064, 0x55b06e56
+0,         12,         12,        1,   152064, 0xdfb7be97
+0,         13,         13,        1,   152064, 0x191bca13
+0,         14,         14,        1,   152064, 0xa554dd3c
+0,         15,         15,        1,   152064, 0x36075b77
+0,         16,         16,        1,   152064, 0xbf6b1cbd
+0,         17,         17,        1,   152064, 0xf33432b6
+0,         18,         18,        1,   152064, 0x5d7100c3
+0,         19,         19,        1,   152064, 0x376f8f0c
+0,         20,         20,        1,   152064, 0x07ca75fa
+0,         21,         21,        1,   152064, 0xe3984704
+0,         22,         22,        1,   152064, 0xa8fb4e4c
+0,         23,         23,        1,   152064, 0xe8e102d8
+0,         24,         24,        1,   152064, 0xcc6771c9
+0,         25,         25,        1,   152064, 0xf646d238
+0,         26,         26,        1,   152064, 0xa52cd41e
+0,         27,         27,        1,   152064, 0x536d92c2
+0,         28,         28,        1,   152064, 0x7058c6a1
+0,         29,         29,        1,   152064, 0xcc6c05d0
+0,         30,         30,        1,   152064, 0x1fc2ffb8
+0,         31,         31,        1,   152064, 0x041ea59c
+0,         32,         32,        1,   152064, 0xfc006e07
+0,         33,         33,        1,   152064, 0x0246efe1
+0,         34,         34,        1,   152064, 0x079428e5
+0,         35,         35,        1,   152064, 0x64d9d773
+0,         36,         36,        1,   152064, 0x914d3454
+0,         37,         37,        1,   152064, 0xef69686e
+0,         38,         38,        1,   152064, 0x3c91129f
+0,         39,         39,        1,   152064, 0x2a611ca7
+0,         40,         40,        1,   152064, 0xaf56124f
+0,         41,         41,        1,   152064, 0xce48cd45
+0,         42,         42,        1,   152064, 0x75feac29
+0,         43,         43,        1,   152064, 0xfd2b4b5b
+0,         44,         44,        1,   152064, 0x8d2f675c
+0,         45,         45,        1,   152064, 0x1573ed3b
+0,         46,         46,        1,   152064, 0xb0fc17ca
+0,         47,         47,        1,   152064, 0x53e5a654
+0,         48,         48,        1,   152064, 0xe0cbb786
+0,         49,         49,        1,   152064, 0xcaa092fe

libav-v10.1.tar.bz2/tests/ref/fate/filter-null Changed

libav-v10.1.tar.bz2/tests/ref/fate/filter-overlay Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   152064, 0xf6f773b6
+0,          1,          1,        1,   152064, 0x8e67618e
+0,          2,          2,        1,   152064, 0xc8eff2ef
+0,          3,          3,        1,   152064, 0xcf39936c
+0,          4,          4,        1,   152064, 0xaf18c4d1
+0,          5,          5,        1,   152064, 0x7e69911e
+0,          6,          6,        1,   152064, 0x1b70214f
+0,          7,          7,        1,   152064, 0xc8032176
+0,          8,          8,        1,   152064, 0xefb42ecc
+0,          9,          9,        1,   152064, 0xfb210e4b
+0,         10,         10,        1,   152064, 0x2ee24b11
+0,         11,         11,        1,   152064, 0x0dac02a5
+0,         12,         12,        1,   152064, 0x9a5ce483
+0,         13,         13,        1,   152064, 0x6bb7c758
+0,         14,         14,        1,   152064, 0xcbb545e5
+0,         15,         15,        1,   152064, 0x81c1b339
+0,         16,         16,        1,   152064, 0xfa38d624
+0,         17,         17,        1,   152064, 0x56c5e63e
+0,         18,         18,        1,   152064, 0x419d194d
+0,         19,         19,        1,   152064, 0xed1a92b8
+0,         20,         20,        1,   152064, 0xd2c0aa39
+0,         21,         21,        1,   152064, 0x6214ddd5
+0,         22,         22,        1,   152064, 0xa978e19f
+0,         23,         23,        1,   152064, 0x676422a2
+0,         24,         24,        1,   152064, 0x5213dd62
+0,         25,         25,        1,   152064, 0x13c1a404
+0,         26,         26,        1,   152064, 0xa543a1a2
+0,         27,         27,        1,   152064, 0x8d0d0bed
+0,         28,         28,        1,   152064, 0x000304cf
+0,         29,         29,        1,   152064, 0x7f75b0ab
+0,         30,         30,        1,   152064, 0x68d07ce6
+0,         31,         31,        1,   152064, 0xb88c9852
+0,         32,         32,        1,   152064, 0x4be5ae13
+0,         33,         33,        1,   152064, 0x85b3f7b1
+0,         34,         34,        1,   152064, 0x9facb7d5
+0,         35,         35,        1,   152064, 0x9f11617e
+0,         36,         36,        1,   152064, 0x43393f46
+0,         37,         37,        1,   152064, 0xd45c3b92
+0,         38,         38,        1,   152064, 0x53de7e1b
+0,         39,         39,        1,   152064, 0xd1c685a7
+0,         40,         40,        1,   152064, 0x21e1778f
+0,         41,         41,        1,   152064, 0xe2b1abe1
+0,         42,         42,        1,   152064, 0x8623b5aa
+0,         43,         43,        1,   152064, 0xfc700aa3
+0,         44,         44,        1,   152064, 0x30a2d120
+0,         45,         45,        1,   152064, 0xa35e4d15
+0,         46,         46,        1,   152064, 0xa3fb11c5
+0,         47,         47,        1,   152064, 0x034f8fb7
+0,         48,         48,        1,   152064, 0x921c7d85
+0,         49,         49,        1,   152064, 0x7a94b9bf

libav-v10.1.tar.bz2/tests/ref/fate/filter-pixdesc Added

@@ -0,0 +1,89 @@
+abgr                037bf9df6a765520ad6d490066bf4b89
+argb                c442a8261c2265a07212ef0f72e35f5a
+bgr24               0d0cb38ab3fa0b2ec0865c14f78b217b
+bgr444be            d9ea9307d21b162225b8b2c524cf9477
+bgr444le            88035350e9da3a8f67387890b956f0bc
+bgr48be             00624e6c7ec7ab19897ba2f0a3257fe8
+bgr48le             d02c235ebba7167881ca2d576497ff84
+bgr4_byte           50d23cc82d9dcef2fd12adb81fb9b806
+bgr555be            49f01b1f1f0c84fd9e776dd34cc3c280
+bgr555le            378d6ac4223651a1adcbf94a3d0d807b
+bgr565be            257cf78afa35dc31e9696f139c916715
+bgr565le            1dfdd03995c287e3c754b164bf26a355
+bgr8                24bd566170343d06fec6fccfff5abc54
+bgra                76a18a5151242fa137133f604cd624d2
+gbrp                76204621e200a3cc633012f6720c7005
+gbrp10be            2ca4a4a589a7dc461ff186913c7a69e5
+gbrp10le            46176f1fcc6e67f9862115fe373f73d3
+gbrp9be             981c2c1b0ef1791824b4c7518331bc2e
+gbrp9le             25fb915ed11d07d631e0e7b78d54bebf
+gray                db08f7f0751900347e6b8649e4164d21
+gray16be            7becf34ae825a3df3969bf4c6bfeb5e2
+gray16le            10bd87059b5c189f3caef2837f4f2b5c
+monob               668ebe8b8103b9046b251b2fa8a1d88f
+monow               9251497f3b0634f1165d12d5a289d943
+nv12                e0af357888584d36eec5aa0f673793ef
+nv21                9a3297f3b34baa038b1f37cb202b512f
+rgb24               b41eba9651e1b5fe386289b506188105
+rgb444be            9e89db334568c6b2e3d5d0540f4ba960
+rgb444le            0a68cb6de8bf530aa30c5c1205c25155
+rgb48be             cc139ec1dd9451f0e049c0cb3a0c8aa2
+rgb48le             86c5608904f75360d492dbc5c9589969
+rgb4_byte           c93ba89b74c504e7f5ae9d9ab1546c73
+rgb555be            912a62c5e53bfcbac2a0340e10973cf2
+rgb555le            a937a0fc764fb57dc1b3af87cba0273c
+rgb565be            9cadf742e05ddc23a3b5b270f89aad3c
+rgb565le            d39aa298bb525e9be8860351c6f62dab
+rgb8                4a9d8e4f2f154e83a7e1735be6300700
+rgba                93a5b3712e6eb8c5b9a09ffc7b9fbc12
+uyvy422             adcf64516a19fce44df77082bdb16291
+yuv410p             2d9225153c83ee1132397d619d94d1b3
+yuv411p             8b298af3e43348ca1b11eb8a3252ac6c
+yuv420p             eba2f135a08829387e2f698ff72a2939
+yuv420p10be         299fe1d785a3d3dd5e70778700d7fb06
+yuv420p10le         8aee004e765a5383be0954f5e916b72f
+yuv420p16be         16c009a235cd52b74791a895423152a3
+yuv420p16le         2d59c4f1d0314a5a957a7cfc4b6fabcc
+yuv420p9be          ce880fa07830e5297c22acf6e20555ce
+yuv420p9le          16543fda8f87d94a6cf857d2e8d4461a
+yuv422p             c9bba4529821d796a6ab09f6a5fd355a
+yuv422p10be         11af7dfafe8bc025c7e3bd82b830fe8a
+yuv422p10le         ec04efb76efa79bf0d02b21572371a56
+yuv422p16be         5499502e1c29534a158a1fe60e889f60
+yuv422p16le         e3d61fde6978591596bc36b914386623
+yuv422p9be          29b71579946940a8c00fa844c9dff507
+yuv422p9le          062b7f9cbb972bf36b5bdb1a7623701a
+yuv440p             5a064afe2b453bb52cdb3f176b1aa1cf
+yuv444p             0a98447b78fd476aa39686da6a74fa2e
+yuv444p10be         71be185a2fb7a353eb024df9bc63212d
+yuv444p10le         c1c6b30a12065c7901c0a267e4861a0f
+yuv444p16be         1c6ea2c2f5e539006112ceec3d4e7d90
+yuv444p16le         20f86bc2f68d2b3f1f2b48b97b2189f4
+yuv444p9be          6ab31f4c12b533ce318ecdff83cdd054
+yuv444p9le          f0606604a5c08becab6ba500124c4b7c
+yuva420p            a29884f3f3dfe1e00b961bc17bef3d47
+yuva420p10be        145366ff1632de3e300d947f49844284
+yuva420p10le        d797038552d7f698e4d1db4dfa18ceb0
+yuva420p16be        25a335f66a0670911ced818aa42fb670
+yuva420p16le        97bf252e6c030f0f0412d3826c2ea259
+yuva420p9be         06b764d85bd3c22e9b7ca4babed84d4f
+yuva420p9le         1f01cdd4fc46f98d4c11b2947307a0e3
+yuva422p            92b6815f465297284cdb843711682cee
+yuva422p10be        fb240ff9ac49b45b1b3d40df2c89e39d
+yuva422p10le        f767ede9ba1d427faadc963cf41d2412
+yuva422p16be        ef442b11b26e5e61f3c958fa309576dd
+yuva422p16le        5789009759d7a44dacc6da2194e402b1
+yuva422p9be         e0d2f45f7f5541eee988137c7ebb3495
+yuva422p9le         a4ec81f328efd3856dec430fb27f2f56
+yuva444p            c523716e4900cfe515eaab1d7124fdd9
+yuva444p10be        f5791a75fdb86da0c243511ef9ab8fbd
+yuva444p10le        578e88dfbe4ab07f280fcc7554f3a5c4
+yuva444p16be        ee7b9dd854e36b165d5b7cffb646ba6c
+yuva444p16le        ec93b2907923d5655e9fb085479260ef
+yuva444p9be         03414257d78e72c28d03e3c247319b7c
+yuva444p9le         e421d753257e36a79c2c0ec1607ac9e6
+yuvj420p            32eec78ba51857b16ce9b813a49b7189
+yuvj422p            0dfa0ed434f73be51428758c69e082cb
+yuvj440p            657501a28004e27a592757a7509f5189
+yuvj444p            98d3d054f2ec09a75eeed5d328dc75b7
+yuyv422             f2569f2b5069a0ee0cecae33de0455e3

libav-v10.1.tar.bz2/tests/ref/fate/filter-pixfmts-copy Added

libav-v10.1.tar.bz2/tests/ref/fate/filter-pixfmts-crop Changed

libav-v10.1.tar.bz2/tests/ref/fate/filter-pixfmts-hflip Changed

libav-v10.1.tar.bz2/tests/ref/fate/filter-pixfmts-null Added

libav-v10.1.tar.bz2/tests/ref/fate/filter-pixfmts-pad Changed

libav-v10.1.tar.bz2/tests/ref/fate/filter-pixfmts-scale Added

@@ -0,0 +1,89 @@
+abgr                d894cb97f6c80eb21bdbe8a4eea62d86
+argb                54346f2b2eef10919e0f247241df3b24
+bgr24               570f8d6b51a838aed022ef67535f6bdc
+bgr444be            25fe04f73a3bad4140d1c4f96ca5b670
+bgr444le            2fde227e6cea6dca5decdd0b7c0866f7
+bgr48be             390d3058a12a99c2b153ed7922508bea
+bgr48le             39fe06feb4ec1d9730dccc04a0cfac4c
+bgr4_byte           ee1d35a7baf8e9016891929a2f565c0b
+bgr555be            de8901c1358834fddea060fcb3a67beb
+bgr555le            36b745067197f9ca8c1731cac51329c9
+bgr565be            922a2503767036ae9536f4f7823c04ee
+bgr565le            3a514a298c6161a071ddf9963c06509d
+bgr8                7f007fa6c153a16e808a9c51605a4016
+bgra                a5e7040f9a80cccd65e5acf2ca09ace5
+gbrp                205c50f8359cb4ba2827a7711dea2cc6
+gbrp10be            30b7f9d5ef5da474fb794743146236aa
+gbrp10le            2e9949a01fe4c38774728e34795165cc
+gbrp9be             6bac01a7f64a381521b2149fc46f4178
+gbrp9le             4b6cba7acf7886c13db122e590ec6b1f
+gray                d7786a7d9d99ac74230cc045cab5632c
+gray16be            b554d6c1cc8da23967445be4dd3e4a86
+gray16le            715a33aa1c19cb26b14f5cc000e7a3d1
+monob               88c4c050758e64d120f50c7eff694381
+monow               d31772ebaa877fc2a78565937f7f9673
+nv12                4676d59db43d657dc12841f6bc3ab452
+nv21                69c699510ff1fb777b118ebee1002f14
+rgb24               514692e28e8ff6860e415ce4fcf6eb8c
+rgb444be            12254053ae93373869fca18b2afcba31
+rgb444le            badbd68b59c87df6ae73248309637634
+rgb48be             8fac63787a711886030f8e056872b488
+rgb48le             ab92f2763a2eb264c3870cc758f97149
+rgb4_byte           d81ffd3add95842a618eec81024f0b5c
+rgb555be            4607309f9f217d51cbb53d13b84b4537
+rgb555le            a350ef1dc2c9688ed49e7ba018843795
+rgb565be            678ce231c4ea13629c1353b1df4ffbef
+rgb565le            6f4bb711238baa762d73305213f8d035
+rgb8                091d0170b354ef0e97312b95feb5483f
+rgba                a3d362f222098a00e63867f612018659
+uyvy422             314bd486277111a95d9369b944fa0400
+yuv410p             7df8f6d69b56a8dcb6c7ee908e5018b5
+yuv411p             1143e7c5cc28fe0922b051b17733bc4c
+yuv420p             fdad2d8df8985e3d17e73c71f713cb14
+yuv420p10be         27f28a6e09b1c04d0f755035a5db1f43
+yuv420p10le         a5a1692e026590ba2eddb46b9b827529
+yuv420p16be         d7270efce54eb59c7b01c14157a1b890
+yuv420p16le         e85abf00bad940a922b623c91c9026d7
+yuv420p9be          bb87fddca65d1742412c8d2b1caf96c6
+yuv420p9le          828eec50014a41258a5423c1fe56ac97
+yuv422p             918e37701ee7377d16a8a6c119c56a40
+yuv422p10be         315654908d50718e175aae018c484732
+yuv422p10le         91bbc78a9a56f659b55abc17722dcc09
+yuv422p16be         e7e34fe9264784763ab6cb406524c0f3
+yuv422p16le         c435b76b08204dda6908640fb5fd4621
+yuv422p9be          82494823944912f73cebc58ad2979bbd
+yuv422p9le          fc69c8a21f473916a4b4225636b97e06
+yuv440p             461503fdb9b90451020aa3b25ddf041c
+yuv444p             81b2eba962d12e8d64f003ac56f6faf2
+yuv444p10be         fb304d77c6d2e18df5938662a22176f0
+yuv444p10le         b17136913eb066dca6be6af645b9f7e8
+yuv444p16be         0da9bed80f5542682ab286f3261cf24c
+yuv444p16le         a0c5d3c7bf3f181db503cf8e450d1335
+yuv444p9be          9ac2643ce7f7e5c4e17c8c9fd8494d4a
+yuv444p9le          896a1cc9cccca1ba410dd53942d33cc4
+yuva420p            8673a9131fb47de69788863f93a50eb7
+yuva420p10be        d92a95061809f251175f5d5e3074930e
+yuva420p10le        bad90ba2d4c260e379a7aa6dc7760853
+yuva420p16be        a61d8ddb646e2d26020fc7ed2a48c1a9
+yuva420p16le        90ef774f86ad3177ec57eca8744b4e09
+yuva420p9be         f7655546446bfdc875243d7cdeb13b30
+yuva420p9le         ada2b719827059d70ebc57e2a3f9da92
+yuva422p            3c76ebeca0a7d3aa5f8e31ef80a86ffe
+yuva422p10be        01dd539e4a62762a3c97e965c76bb6f7
+yuva422p10le        76355d9d8fdcd085a24d48832b72e40b
+yuva422p16be        c21afa31ac18bd92e8e596b81552b52b
+yuva422p16le        0bc3720dba6076dcce3b74b1d3c6c4b7
+yuva422p9be         a60ac5b8026e9621724c033fbf79dbda
+yuva422p9le         c3eda8831e9b9c94a3eb487d33114103
+yuva444p            3268c6abe5e3cdbd16552a1eddced816
+yuva444p10be        856b37c1ee53459f46b9359d329ac9b5
+yuva444p10le        22790592361c007406d4ca9a9e0954a5
+yuva444p16be        ed5b07fe4d5b1137604568786777af1d
+yuva444p16le        3a3df23feb60d8832b566fd9765983d0
+yuva444p9be         4fc479c5b1044ad37b4e6fc6488b4f7f
+yuva444p9le         c41849b0134670d6f6253c337defbb04
+yuvj420p            30427bd6caf5bda93a173dbebe759e09
+yuvj422p            fc8288f64fd149573f73cf8da05d8e6d
+yuvj440p            508ac7a9ddeb6d1794a1100ba7a1664c
+yuvj444p            73aebe144085b22d1189caf6ca07e18c
+yuyv422             169e19ac91b257bd84ace0fdf56559ad

libav-v10.1.tar.bz2/tests/ref/fate/filter-pixfmts-vflip Added

@@ -0,0 +1,89 @@
+abgr                25e72e9dbd01ab00727c976d577f7be5
+argb                19869bf1a5ac0b6af4d8bbe2c104533c
+bgr24               89108a4ba00201f79b75b9305c42352d
+bgr444be            9ef12c42fb791948ca4423c452dc6b9a
+bgr444le            3650ecfc163abd1596c0cd29d130c4b0
+bgr48be             2f23931844f57641f3737348182d118c
+bgr48le             4242a026012b6c135a6aa138a6d67031
+bgr4_byte           407fcf564ed764c38e1d748f700ab921
+bgr555be            f739d2519f7e9d494359bf67a3821537
+bgr555le            bd7b3ec4d684dfad075d89a606cb8b74
+bgr565be            f19e9a4786395e1ddcd51399c98c9f6c
+bgr565le            fdb617533e1e7ff512ea5b6b6233e738
+bgr8                c60f93fd152c6903391d1fe9decd3547
+bgra                7f9b799fb48544e49ce93e91d7f9fca8
+gbrp                25c1bce192daefab910d51a56b52199e
+gbrp10be            6fe980f9ca94cbcdb9e01f4e906fdf19
+gbrp10le            f793a1d96d3524c6a17e53356c415c4e
+gbrp9be             e10dc3a2566b065260a45356ef08c1cd
+gbrp9le             f25105a33f18d6bcca3205c67ec106be
+gray                30d9014a9d43b5f37e7aa64be3a3ecfc
+gray16be            6b84b85d3326182fa1217e138249edc5
+gray16le            66bb8faa09dc149734aca3c768a6d4e1
+monob               d0cf8732677a5360b6160133043590d8
+monow               ff9869d067ecb94eb9d90c9750c31fea
+nv12                046f00f598ce14d9854a3534a5c99114
+nv21                01ea369dd2d0d3ed7451dc5c8d61497f
+rgb24               eaefabc168d0b14576bab45bc1e56e1e
+rgb444be            06722e03f8404e7d2226665ed2444a32
+rgb444le            185c9a5d9c2877484310d4196ef4cd6f
+rgb48be             62dd185862ed142283bd300eb6dbd216
+rgb48le             dcb76353268bc5862194d131762220da
+rgb4_byte           8c6ff02df0b06dd2d574836c3741b2a2
+rgb555be            40dc33cfb5cf56aac1c5a290ac486c36
+rgb555le            4f8eaad29a17e0f8e9d8ab743e76b999
+rgb565be            b57623ad9df74648339311a0edcebc7b
+rgb565le            73f247a3315dceaea3022ac7c197c5ef
+rgb8                13a8d89ef78d8127297d899005456ff0
+rgba                1fc6e920a42ec812aaa3b2aa02f37987
+uyvy422             ffbd36720c77398d9a0d03ce2625928f
+yuv410p             7bfb39d7afb49d6a6173e6b23ae321eb
+yuv411p             4a90048cc3a65fac150e53289700efe1
+yuv420p             2e6d6062e8cad37fb3ab2c433b55f382
+yuv420p10be         fb0772f5e2b9da20ff826e64c3893137
+yuv420p10le         e95879e14c4a6805f39643964baf41f7
+yuv420p16be         539076782902664a8acf381bf4f713e8
+yuv420p16le         0f609e588e5a258644ef85170d70e030
+yuv420p9be          be40ec975fb2873891643cbbbddbc3b0
+yuv420p9le          7e606310d3f5ff12badf911e8f333471
+yuv422p             d7f5cb44d9b0210d66d6a8762640ab34
+yuv422p10be         0be8378c3773e1c0b394315ef4994351
+yuv422p10le         6518094fe8de6bee95af21af1e5dc1e1
+yuv422p16be         9bd8f8c961822b586fa4cf992be54acc
+yuv422p16le         9c4a1239605c7952b736ac3130163f14
+yuv422p9be          7c6f1e140b3999ee7d923854e507752a
+yuv422p9le          51f10d79c07989060dd06e767e6d7d60
+yuv440p             876385e96165acf51271b20e5d85a416
+yuv444p             9c3c667d1613b72d15bc6d851c5eb8f7
+yuv444p10be         ee069cc6db48975eb029d72f889a7fe6
+yuv444p10le         645b3335248113cafe3c29edb1d7f3be
+yuv444p16be         de2dedfc6f12073ffead113f86e07ecf
+yuv444p16le         8e83323cf102d6c823a03ae8a7b7e033
+yuv444p9be          6ac92b7dc9ab2fc59bee99204886899a
+yuv444p9le          85aef13a654953d3455d89770b0d74bd
+yuva420p            c705d1cf061d8c6580ac690b55f92276
+yuva420p10be        baa5e3b0ff6d0ebbb0958560cd763c6e
+yuva420p10le        a36dc59ad55b406e5fee475236e9753c
+yuva420p16be        bf3b134eb70878df9afba61d03e930b8
+yuva420p16le        105d375154329a381aa58379a0a6ec46
+yuva420p9be         8273d591e055f48990c29dd905a6cdfd
+yuva420p9le         95ced0bb07e422d98db61a35cdb3fb8f
+yuva422p            6aed0ea657ed51cc047a4fbdd981aec8
+yuva422p10be        d69a3404984c5fd30c0fc548532bcb6b
+yuva422p10le        a40c8e6f50e12d94bf7484107ec98559
+yuva422p16be        39552c259ca242f2417e913ffc602fde
+yuva422p16le        16faa558a34291ca32f6d94dce211ee2
+yuva422p9be         a951eafb62c092c63f7566b6803f60df
+yuva422p9le         00b39cfca78666e057ee527f5e174a04
+yuva444p            da5d64f2b2bd2013c186456f595fad65
+yuva444p10be        00e74a9c0c7818a9bbd9fee95b961ee8
+yuva444p10le        cbe30f44b63cf7ed27fc2dde40315b5e
+yuva444p16be        7e9b799b057e1446dabbf0f738480cfb
+yuva444p16le        556d58b91a617fe4a83af99a4aea1c2e
+yuva444p9be         b5a31de4fac408eeecaf3aff11f40e55
+yuva444p9le         67467f1e1d9edbd59d3984ebbfe24be6
+yuvj420p            41fd02b204da0ab62452cd14b595e2e4
+yuvj422p            7f6ca9bc1812cde02036d7d29a7cce43
+yuvj440p            25711c3c0fd15ec19c59a10784fcfb96
+yuvj444p            e45dee2ac02276dfab92e8ebfbe52e00
+yuyv422             e944ff7316cd03c42c091717ce74f602

libav-v10.1.tar.bz2/tests/ref/fate/filter-scale200 Changed

libav-v10.1.tar.bz2/tests/ref/fate/filter-scale500 Changed

libav-v10.1.tar.bz2/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

libav-v10.1.tar.bz2/tests/ref/fate/filter-setpts Added

@@ -0,0 +1,51 @@
+#tb 0: 1/1000
+0,          0,          0,        0,   152064, 0x05b789ef
+0,         28,         28,        0,   152064, 0x4bb46551
+0,         57,         57,        0,   152064, 0x9dddf64a
+0,         86,         86,        0,   152064, 0x2a8380b0
+0,        115,        115,        0,   152064, 0x4de3b652
+0,        144,        144,        0,   152064, 0xedb5a8e6
+0,        172,        172,        0,   152064, 0xe20f7c23
+0,        201,        201,        0,   152064, 0x5ab58bac
+0,        229,        229,        0,   152064, 0x1f1b8026
+0,        258,        258,        0,   152064, 0x91373915
+0,        286,        286,        0,   152064, 0x02344760
+0,        314,        314,        0,   152064, 0x30f5fcd5
+0,        343,        343,        0,   152064, 0xc711ad61
+0,        371,        371,        0,   152064, 0x24eca223
+0,        399,        399,        0,   152064, 0x52a48ddd
+0,        427,        427,        0,   152064, 0xa91c0f05
+0,        456,        456,        0,   152064, 0x8e364e18
+0,        484,        484,        0,   152064, 0xb15d38c8
+0,        512,        512,        0,   152064, 0xf25f6acc
+0,        541,        541,        0,   152064, 0xf34ddbff
+0,        570,        570,        0,   152064, 0xfc7bf570
+0,        598,        598,        0,   152064, 0x9dc72412
+0,        627,        627,        0,   152064, 0x445d1d59
+0,        656,        656,        0,   152064, 0x2f2768ef
+0,        685,        685,        0,   152064, 0xce09f9d6
+0,        714,        714,        0,   152064, 0x95579936
+0,        743,        743,        0,   152064, 0x43d796b5
+0,        772,        772,        0,   152064, 0xd780d887
+0,        800,        800,        0,   152064, 0x76d2a455
+0,        829,        829,        0,   152064, 0x6dc3650e
+0,        858,        858,        0,   152064, 0x0f9d6aca
+0,        887,        887,        0,   152064, 0xe295c51e
+0,        915,        915,        0,   152064, 0xd766fc8d
+0,        944,        944,        0,   152064, 0xe22f7a30
+0,        972,        972,        0,   152064, 0x7fea4378
+0,       1000,       1000,        0,   152064, 0xfa8d94fb
+0,       1029,       1029,        0,   152064, 0x4c9737ab
+0,       1057,       1057,        0,   152064, 0xa50d01f8
+0,       1085,       1085,        0,   152064, 0x0b07594c
+0,       1113,       1113,        0,   152064, 0x88734edd
+0,       1142,       1142,        0,   152064, 0xd2735925
+0,       1170,       1170,        0,   152064, 0xd4e49e08
+0,       1198,       1198,        0,   152064, 0x20cebfa9
+0,       1227,       1227,        0,   152064, 0x575c20ec
+0,       1255,       1255,        0,   152064, 0xfd500471
+0,       1284,       1284,        0,   152064, 0x61b47e73
+0,       1313,       1313,        0,   152064, 0x09ef53ff
+0,       1341,       1341,        0,   152064, 0x6e88c5c2
+0,       1370,       1370,        0,   152064, 0xbb87b483
+0,       1399,       1399,        0,   152064, 0x4bbad8ea

libav-v10.1.tar.bz2/tests/ref/fate/filter-transpose Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   152064, 0xab5889ef
+0,          1,          1,        1,   152064, 0x898b6551
+0,          2,          2,        1,   152064, 0x231bf64a
+0,          3,          3,        1,   152064, 0x0b8c80b0
+0,          4,          4,        1,   152064, 0x8b3cb652
+0,          5,          5,        1,   152064, 0x0100a8e6
+0,          6,          6,        1,   152064, 0x55df7c23
+0,          7,          7,        1,   152064, 0x91bd8bac
+0,          8,          8,        1,   152064, 0xf5508026
+0,          9,          9,        1,   152064, 0xa7ec3915
+0,         10,         10,        1,   152064, 0x4e304760
+0,         11,         11,        1,   152064, 0x98ccfcd5
+0,         12,         12,        1,   152064, 0x00edad61
+0,         13,         13,        1,   152064, 0x01a0a223
+0,         14,         14,        1,   152064, 0x840e8ddd
+0,         15,         15,        1,   152064, 0x52280f05
+0,         16,         16,        1,   152064, 0x75064e18
+0,         17,         17,        1,   152064, 0xf41638c8
+0,         18,         18,        1,   152064, 0x258d6acc
+0,         19,         19,        1,   152064, 0x9d73dbff
+0,         20,         20,        1,   152064, 0x80e0f570
+0,         21,         21,        1,   152064, 0x3a912412
+0,         22,         22,        1,   152064, 0xaf241d59
+0,         23,         23,        1,   152064, 0xe73568ef
+0,         24,         24,        1,   152064, 0xc739f9d6
+0,         25,         25,        1,   152064, 0xc8c19936
+0,         26,         26,        1,   152064, 0x47dd96b5
+0,         27,         27,        1,   152064, 0x5329d887
+0,         28,         28,        1,   152064, 0x5b46a455
+0,         29,         29,        1,   152064, 0xfd8c650e
+0,         30,         30,        1,   152064, 0x85c86aca
+0,         31,         31,        1,   152064, 0x46a6c51e
+0,         32,         32,        1,   152064, 0x220dfc8d
+0,         33,         33,        1,   152064, 0xdbe27a30
+0,         34,         34,        1,   152064, 0xb8cc4378
+0,         35,         35,        1,   152064, 0xb6cf94fb
+0,         36,         36,        1,   152064, 0xeaa937ab
+0,         37,         37,        1,   152064, 0x335401f8
+0,         38,         38,        1,   152064, 0xdb3d594c
+0,         39,         39,        1,   152064, 0x211c4edd
+0,         40,         40,        1,   152064, 0xc3725925
+0,         41,         41,        1,   152064, 0x8f389e08
+0,         42,         42,        1,   152064, 0xc62cbfa9
+0,         43,         43,        1,   152064, 0x803820ec
+0,         44,         44,        1,   152064, 0x0d860471
+0,         45,         45,        1,   152064, 0xf6997e73
+0,         46,         46,        1,   152064, 0x6c2153ff
+0,         47,         47,        1,   152064, 0x1bb2c5c2
+0,         48,         48,        1,   152064, 0x39d1b483
+0,         49,         49,        1,   152064, 0x2b50d8ea

libav-v10.1.tar.bz2/tests/ref/fate/filter-trim-duration Added

libav-v10.1.tar.bz2/tests/ref/fate/filter-trim-frame Added

libav-v10.1.tar.bz2/tests/ref/fate/filter-trim-mixed Added

libav-v10.1.tar.bz2/tests/ref/fate/filter-trim-time Added

libav-v10.1.tar.bz2/tests/ref/fate/filter-unsharp Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   152064, 0x19a94798
+0,          1,          1,        1,   152064, 0xc88b24f4
+0,          2,          2,        1,   152064, 0xd027b44b
+0,          3,          3,        1,   152064, 0xa9fb3e54
+0,          4,          4,        1,   152064, 0x2991747d
+0,          5,          5,        1,   152064, 0x1dc267fc
+0,          6,          6,        1,   152064, 0xe9063293
+0,          7,          7,        1,   152064, 0xc23e41a4
+0,          8,          8,        1,   152064, 0xaa433dc5
+0,          9,          9,        1,   152064, 0x22b0f0a3
+0,         10,         10,        1,   152064, 0x796d08d8
+0,         11,         11,        1,   152064, 0xa2babd6b
+0,         12,         12,        1,   152064, 0x531e6a62
+0,         13,         13,        1,   152064, 0xc8fa5b9d
+0,         14,         14,        1,   152064, 0x33e54ae8
+0,         15,         15,        1,   152064, 0x86dfd0b8
+0,         16,         16,        1,   152064, 0x101f1170
+0,         17,         17,        1,   152064, 0x230eef00
+0,         18,         18,        1,   152064, 0xa5ee1c5e
+0,         19,         19,        1,   152064, 0x241893c6
+0,         20,         20,        1,   152064, 0x86a0a883
+0,         21,         21,        1,   152064, 0x12b4d8f7
+0,         22,         22,        1,   152064, 0xb220d497
+0,         23,         23,        1,   152064, 0xbaea200e
+0,         24,         24,        1,   152064, 0x6d96b7f3
+0,         25,         25,        1,   152064, 0xc70d4ebb
+0,         26,         26,        1,   152064, 0x20df50af
+0,         27,         27,        1,   152064, 0xfce89174
+0,         28,         28,        1,   152064, 0x74be5c8e
+0,         29,         29,        1,   152064, 0x51f419a6
+0,         30,         30,        1,   152064, 0x790621e7
+0,         31,         31,        1,   152064, 0x37387da2
+0,         32,         32,        1,   152064, 0x8228baa4
+0,         33,         33,        1,   152064, 0xdd2a42b7
+0,         34,         34,        1,   152064, 0xa28bfc63
+0,         35,         35,        1,   152064, 0xe8284337
+0,         36,         36,        1,   152064, 0xb1dae9fe
+0,         37,         37,        1,   152064, 0x0378c0af
+0,         38,         38,        1,   152064, 0x79c514d4
+0,         39,         39,        1,   152064, 0x043e0347
+0,         40,         40,        1,   152064, 0x4d11131b
+0,         41,         41,        1,   152064, 0xb2a05924
+0,         42,         42,        1,   152064, 0xd0097464
+0,         43,         43,        1,   152064, 0x32dfd8c0
+0,         44,         44,        1,   152064, 0xd9ecbf03
+0,         45,         45,        1,   152064, 0x8dcc403f
+0,         46,         46,        1,   152064, 0x95e81af7
+0,         47,         47,        1,   152064, 0xb8018b25
+0,         48,         48,        1,   152064, 0xeecf7281
+0,         49,         49,        1,   152064, 0x23e49602

libav-v10.1.tar.bz2/tests/ref/fate/filter-vflip Changed

libav-v10.1.tar.bz2/tests/ref/fate/filter-vflip_crop Changed

libav-v10.1.tar.bz2/tests/ref/fate/filter-vflip_vflip Changed

libav-v9.6.tar.bz2/tests/ref/fate/filter-yadif-mode0 -> libav-v10.1.tar.bz2/tests/ref/fate/filter-yadif-mode0 Changed

@@ -1,32 +1,32 @@
 #tb 0: 1/180000
-0,      64800,      64800,        0,   622080, 0x4440caef
-0,      72000,      72000,        0,   622080, 0xce67e69d
-0,      79200,      79200,        0,   622080, 0x1dbdc653
-0,      86400,      86400,        0,   622080, 0x82c591d1
-0,      93600,      93600,        0,   622080, 0x8193740b
-0,     100800,     100800,        0,   622080, 0xcb219711
-0,     108000,     108000,        0,   622080, 0x1870783b
-0,     115200,     115200,        0,   622080, 0x7080590b
-0,     122400,     122400,        0,   622080, 0x6df4175d
-0,     129600,     129600,        0,   622080, 0x6b530e95
-0,     136800,     136800,        0,   622080, 0x7f9d66f7
-0,     144000,     144000,        0,   622080, 0x338cda81
-0,     151200,     151200,        0,   622080, 0xb13797f8
-0,     158400,     158400,        0,   622080, 0xb51e7ca4
-0,     165600,     165600,        0,   622080, 0x353eed75
-0,     172800,     172800,        0,   622080, 0xf93e92b0
-0,     180000,     180000,        0,   622080, 0xd0811094
-0,     187200,     187200,        0,   622080, 0xb04a3141
-0,     194400,     194400,        0,   622080, 0x4ab84909
-0,     201600,     201600,        0,   622080, 0xa0fcb8fb
-0,     208800,     208800,        0,   622080, 0x9003aebb
-0,     216000,     216000,        0,   622080, 0x153faa3e
-0,     223200,     223200,        0,   622080, 0xae724063
-0,     230400,     230400,        0,   622080, 0xeb4de77a
-0,     237600,     237600,        0,   622080, 0x209ed8c7
-0,     244800,     244800,        0,   622080, 0xe2bbac96
-0,     252000,     252000,        0,   622080, 0xe945441e
-0,     259200,     259200,        0,   622080, 0x8f8cbd5f
-0,     266400,     266400,        0,   622080, 0xbc3cf717
-0,     273600,     273600,        0,   622080, 0x0109f125
-0,     280800,     280800,        0,   622080, 0x230c373f
+0,      64800,      64800,        0,   622080, 0x6331caee
+0,      72000,      72000,        0,   622080, 0xa459e690
+0,      79200,      79200,        0,   622080, 0x6429c648
+0,      86400,      86400,        0,   622080, 0xa49891ca
+0,      93600,      93600,        0,   622080, 0x2a887404
+0,     100800,     100800,        0,   622080, 0xe8d49705
+0,     108000,     108000,        0,   622080, 0x1b627835
+0,     115200,     115200,        0,   622080, 0x686858fd
+0,     122400,     122400,        0,   622080, 0x2675174f
+0,     129600,     129600,        0,   622080, 0x78470e7f
+0,     136800,     136800,        0,   622080, 0xffb366ec
+0,     144000,     144000,        0,   622080, 0xd575da72
+0,     151200,     151200,        0,   622080, 0x5fb297f7
+0,     158400,     158400,        0,   622080, 0xbac77ca0
+0,     165600,     165600,        0,   622080, 0x3276ed72
+0,     172800,     172800,        0,   622080, 0x264092b2
+0,     180000,     180000,        0,   622080, 0x20ba1094
+0,     187200,     187200,        0,   622080, 0x76cc3139
+0,     194400,     194400,        0,   622080, 0x469a4902
+0,     201600,     201600,        0,   622080, 0x0ed7b8f5
+0,     208800,     208800,        0,   622080, 0xdc51aeac
+0,     216000,     216000,        0,   622080, 0xee06aa36
+0,     223200,     223200,        0,   622080, 0x7372405f
+0,     230400,     230400,        0,   622080, 0x9e0ee776
+0,     237600,     237600,        0,   622080, 0x39e6d8c9
+0,     244800,     244800,        0,   622080, 0x51d9ac9a
+0,     252000,     252000,        0,   622080, 0x2b63441d
+0,     259200,     259200,        0,   622080, 0x58afbd5e
+0,     266400,     266400,        0,   622080, 0xb972f716
+0,     273600,     273600,        0,   622080, 0x6a6df129
+0,     280800,     280800,        0,   622080, 0x28b1373d

libav-v9.6.tar.bz2/tests/ref/fate/filter-yadif-mode1 -> libav-v10.1.tar.bz2/tests/ref/fate/filter-yadif-mode1 Changed

@@ -1,63 +1,63 @@
 #tb 0: 1/180000
-0,      64800,      64800,        0,   622080, 0x4440caef
-0,      68400,      68400,        0,   622080, 0xa5cea88b
-0,      72000,      72000,        0,   622080, 0xce67e69d
-0,      75600,      75600,        0,   622080, 0x9a57891f
-0,      79200,      79200,        0,   622080, 0x1dbdc653
-0,      82800,      82800,        0,   622080, 0xc171c0c5
-0,      86400,      86400,        0,   622080, 0x82c591d1
-0,      90000,      90000,        0,   622080, 0x20db9890
-0,      93600,      93600,        0,   622080, 0x8193740b
-0,      97200,      97200,        0,   622080, 0xdb181d52
-0,     100800,     100800,        0,   622080, 0xcb219711
-0,     104400,     104400,        0,   622080, 0xc2b913d1
-0,     108000,     108000,        0,   622080, 0x1870783b
-0,     111600,     111600,        0,   622080, 0xf1d9c5fb
-0,     115200,     115200,        0,   622080, 0x7080590b
-0,     118800,     118800,        0,   622080, 0x669c5775
-0,     122400,     122400,        0,   622080, 0x6df4175d
-0,     126000,     126000,        0,   622080, 0x01921a16
-0,     129600,     129600,        0,   622080, 0x6b530e95
-0,     133200,     133200,        0,   622080, 0xd5047bc9
-0,     136800,     136800,        0,   622080, 0x7f9d66f7
-0,     140400,     140400,        0,   622080, 0xa8b006eb
-0,     144000,     144000,        0,   622080, 0x338cda81
-0,     147600,     147600,        0,   622080, 0xf0e125a7
-0,     151200,     151200,        0,   622080, 0xb13797f8
-0,     154800,     154800,        0,   622080, 0x4afe2976
-0,     158400,     158400,        0,   622080, 0xb51e7ca4
-0,     162000,     162000,        0,   622080, 0x637fcbfe
-0,     165600,     165600,        0,   622080, 0x353eed75
-0,     169200,     169200,        0,   622080, 0xd9a8f5ac
-0,     172800,     172800,        0,   622080, 0xf93e92b0
-0,     176400,     176400,        0,   622080, 0x4540039f
-0,     180000,     180000,        0,   622080, 0xd0811094
-0,     183600,     183600,        0,   622080, 0x3039906f
-0,     187200,     187200,        0,   622080, 0xb04a3141
-0,     190800,     190800,        0,   622080, 0x52872cf9
-0,     194400,     194400,        0,   622080, 0x4ab84909
-0,     198000,     198000,        0,   622080, 0x82de12ee
-0,     201600,     201600,        0,   622080, 0xa0fcb8fb
-0,     205200,     205200,        0,   622080, 0x7e849cc9
-0,     208800,     208800,        0,   622080, 0x9003aebb
-0,     212400,     212400,        0,   622080, 0xffe6f770
-0,     216000,     216000,        0,   622080, 0x153faa3e
-0,     219600,     219600,        0,   622080, 0xb67f3233
-0,     223200,     223200,        0,   622080, 0xae724063
-0,     226800,     226800,        0,   622080, 0x15fe44b4
-0,     230400,     230400,        0,   622080, 0xeb4de77a
-0,     234000,     234000,        0,   622080, 0x380f8563
-0,     237600,     237600,        0,   622080, 0x209ed8c7
-0,     241200,     241200,        0,   622080, 0xb964d70f
-0,     244800,     244800,        0,   622080, 0xe2bbac96
-0,     248400,     248400,        0,   622080, 0x4f60f7f4
-0,     252000,     252000,        0,   622080, 0xe945441e
-0,     255600,     255600,        0,   622080, 0xd0afb742
-0,     259200,     259200,        0,   622080, 0x8f8cbd5f
-0,     262800,     262800,        0,   622080, 0xb9a15294
-0,     266400,     266400,        0,   622080, 0xbc3cf717
-0,     270000,     270000,        0,   622080, 0xb70b01a9
-0,     273600,     273600,        0,   622080, 0x0109f125
-0,     277200,     277200,        0,   622080, 0xcb3a371f
-0,     280800,     280800,        0,   622080, 0x230c373f
-0,     284400,     284400,        0,   622080, 0x82dfb1f2
+0,      64800,      64800,        0,   622080, 0x6331caee
+0,      68400,      68400,        0,   622080, 0x625da883
+0,      72000,      72000,        0,   622080, 0xa459e690
+0,      75600,      75600,        0,   622080, 0xce5d891e
+0,      79200,      79200,        0,   622080, 0x6429c648
+0,      82800,      82800,        0,   622080, 0x608cc0ba
+0,      86400,      86400,        0,   622080, 0xa49891ca
+0,      90000,      90000,        0,   622080, 0x9721987f
+0,      93600,      93600,        0,   622080, 0x2a887404
+0,      97200,      97200,        0,   622080, 0x60d71d47
+0,     100800,     100800,        0,   622080, 0xe8d49705
+0,     104400,     104400,        0,   622080, 0x821e13cb
+0,     108000,     108000,        0,   622080, 0x1b627835
+0,     111600,     111600,        0,   622080, 0x1806c5f4
+0,     115200,     115200,        0,   622080, 0x686858fd
+0,     118800,     118800,        0,   622080, 0xab865773
+0,     122400,     122400,        0,   622080, 0x2675174f
+0,     126000,     126000,        0,   622080, 0x43a61a14
+0,     129600,     129600,        0,   622080, 0x78470e7f
+0,     133200,     133200,        0,   622080, 0xeb877bc6
+0,     136800,     136800,        0,   622080, 0xffb366ec
+0,     140400,     140400,        0,   622080, 0xda0906e7
+0,     144000,     144000,        0,   622080, 0xd575da72
+0,     147600,     147600,        0,   622080, 0x23ae25a4
+0,     151200,     151200,        0,   622080, 0x5fb297f7
+0,     154800,     154800,        0,   622080, 0x99b32978
+0,     158400,     158400,        0,   622080, 0xbac77ca0
+0,     162000,     162000,        0,   622080, 0xc1cdcbf9
+0,     165600,     165600,        0,   622080, 0x3276ed72
+0,     169200,     169200,        0,   622080, 0x4061f5ab
+0,     172800,     172800,        0,   622080, 0x264092b2
+0,     176400,     176400,        0,   622080, 0xa4e2039e
+0,     180000,     180000,        0,   622080, 0x20ba1094
+0,     183600,     183600,        0,   622080, 0x984e906e
+0,     187200,     187200,        0,   622080, 0x76cc3139
+0,     190800,     190800,        0,   622080, 0xf70e2cf6
+0,     194400,     194400,        0,   622080, 0x469a4902
+0,     198000,     198000,        0,   622080, 0x235312e6
+0,     201600,     201600,        0,   622080, 0x0ed7b8f5
+0,     205200,     205200,        0,   622080, 0xd0269cc3
+0,     208800,     208800,        0,   622080, 0xdc51aeac
+0,     212400,     212400,        0,   622080, 0x1aa5f76e
+0,     216000,     216000,        0,   622080, 0xee06aa36
+0,     219600,     219600,        0,   622080, 0xa7103230
+0,     223200,     223200,        0,   622080, 0x7372405f
+0,     226800,     226800,        0,   622080, 0x8d7a44b5
+0,     230400,     230400,        0,   622080, 0x9e0ee776
+0,     234000,     234000,        0,   622080, 0xd41e8560
+0,     237600,     237600,        0,   622080, 0x39e6d8c9
+0,     241200,     241200,        0,   622080, 0x7a23d70c
+0,     244800,     244800,        0,   622080, 0x51d9ac9a
+0,     248400,     248400,        0,   622080, 0x8eacf7f2
+0,     252000,     252000,        0,   622080, 0x2b63441d
+0,     255600,     255600,        0,   622080, 0x9f71b742
+0,     259200,     259200,        0,   622080, 0x58afbd5e
+0,     262800,     262800,        0,   622080, 0x4d645292
+0,     266400,     266400,        0,   622080, 0xb972f716
+0,     270000,     270000,        0,   622080, 0xbb5d01a2
+0,     273600,     273600,        0,   622080, 0x6a6df129
+0,     277200,     277200,        0,   622080, 0x9e45371e
+0,     280800,     280800,        0,   622080, 0x28b1373d
+0,     284400,     284400,        0,   622080, 0xa1cdb1f2

libav-v10.1.tar.bz2/tests/ref/fate/h264-conformance-cvfc1_sony_c Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,    75600, 0x6f6a8c48
+0,          1,          1,        1,    75600, 0x4b7ac558
+0,          2,          2,        1,    75600, 0x907feda3
+0,          3,          3,        1,    75600, 0x7b2b17d2
+0,          4,          4,        1,    75600, 0x46d038e7
+0,          5,          5,        1,    75600, 0x90d463b3
+0,          6,          6,        1,    75600, 0xc00d7ec1
+0,          7,          7,        1,    75600, 0x10f69a60
+0,          8,          8,        1,    75600, 0x676aad50
+0,          9,          9,        1,    75600, 0x0a3fd3e0
+0,         10,         10,        1,    75600, 0xaee8fc87
+0,         11,         11,        1,    75600, 0xc9f41fbb
+0,         12,         12,        1,    75600, 0x183743dd
+0,         13,         13,        1,    75600, 0xf0385aa2
+0,         14,         14,        1,    75600, 0xad63782e
+0,         15,         15,        1,    75600, 0x9ed08c01
+0,         16,         16,        1,    75600, 0x79aba20e
+0,         17,         17,        1,    75600, 0x53d6c34c
+0,         18,         18,        1,    75600, 0x4cead515
+0,         19,         19,        1,    75600, 0xc701e3c8
+0,         20,         20,        1,    75600, 0xb278e37d
+0,         21,         21,        1,    75600, 0x02e6f95e
+0,         22,         22,        1,    75600, 0x5cdffef4
+0,         23,         23,        1,    75600, 0x6e0a1089
+0,         24,         24,        1,    75600, 0x23a919b5
+0,         25,         25,        1,    75600, 0x31f5391c
+0,         26,         26,        1,    75600, 0xaa2c3445
+0,         27,         27,        1,    75600, 0x42204340
+0,         28,         28,        1,    75600, 0x55924031
+0,         29,         29,        1,    75600, 0x6bc94d1b
+0,         30,         30,        1,    75600, 0x3e1a1e21
+0,         31,         31,        1,    75600, 0xaf4816fc
+0,         32,         32,        1,    75600, 0x322c1d18
+0,         33,         33,        1,    75600, 0xf59c1746
+0,         34,         34,        1,    75600, 0x875cfc24
+0,         35,         35,        1,    75600, 0x8657f65b
+0,         36,         36,        1,    75600, 0x7e78f95f
+0,         37,         37,        1,    75600, 0x7639e983
+0,         38,         38,        1,    75600, 0xcdaac5fa
+0,         39,         39,        1,    75600, 0x2b7ac473
+0,         40,         40,        1,    75600, 0x028cb98f
+0,         41,         41,        1,    75600, 0x023abda4
+0,         42,         42,        1,    75600, 0x9733ad92
+0,         43,         43,        1,    75600, 0xfb4f8cfe
+0,         44,         44,        1,    75600, 0xfef071b6
+0,         45,         45,        1,    75600, 0xf7513219
+0,         46,         46,        1,    75600, 0x9d6e3c98
+0,         47,         47,        1,    75600, 0xd5501ac7
+0,         48,         48,        1,    75600, 0xa00201f1
+0,         49,         49,        1,    75600, 0xee84e8c6

libav-v10.1.tar.bz2/tests/ref/fate/h264-crop-to-container Added

libav-v10.1.tar.bz2/tests/ref/fate/h264-reinit-large_420_8-to-small_420_8 Added

@@ -0,0 +1,101 @@
+#tb 0: 1/25
+0,          0,          0,        1,   608256, 0x65574c43
+0,          1,          1,        1,   608256, 0x5e5a1aa4
+0,          2,          2,        1,   608256, 0xa9a5cbc5
+0,          3,          3,        1,   608256, 0x4e462c02
+0,          4,          4,        1,   608256, 0xf8215f14
+0,          5,          5,        1,   608256, 0x4f332ccd
+0,          6,          6,        1,   608256, 0x5dac18a3
+0,          7,          7,        1,   608256, 0x81196f38
+0,          8,          8,        1,   608256, 0xd4cb4ffc
+0,          9,          9,        1,   608256, 0x839af1a4
+0,         10,         10,        1,   608256, 0x15ab7a99
+0,         11,         11,        1,   608256, 0x7496aec8
+0,         12,         12,        1,   608256, 0xfe974593
+0,         13,         13,        1,   608256, 0x702a94b7
+0,         14,         14,        1,   608256, 0x0f74cd7a
+0,         15,         15,        1,   608256, 0x3b35b667
+0,         16,         16,        1,   608256, 0x22083d70
+0,         17,         17,        1,   608256, 0xab77f6e1
+0,         18,         18,        1,   608256, 0x51513651
+0,         19,         19,        1,   608256, 0x06ff4ef1
+0,         20,         20,        1,   608256, 0xdf2ed7d3
+0,         21,         21,        1,   608256, 0x3107421b
+0,         22,         22,        1,   608256, 0x975823fe
+0,         23,         23,        1,   608256, 0xe40d9894
+0,         24,         24,        1,   608256, 0x8fb1fead
+0,         25,         25,        1,   608256, 0x56e5056b
+0,         26,         26,        1,   608256, 0x3346b970
+0,         27,         27,        1,   608256, 0x7e3c5b82
+0,         28,         28,        1,   608256, 0x6a86c482
+0,         29,         29,        1,   608256, 0x3e800e13
+0,         30,         30,        1,   608256, 0xd6c4589e
+0,         31,         31,        1,   608256, 0xcdfa7d94
+0,         32,         32,        1,   608256, 0xdc91cfce
+0,         33,         33,        1,   608256, 0x8aa5fd0e
+0,         34,         34,        1,   608256, 0x85c190be
+0,         35,         35,        1,   608256, 0xe7563061
+0,         36,         36,        1,   608256, 0x7fd501ec
+0,         37,         37,        1,   608256, 0x088d0df3
+0,         38,         38,        1,   608256, 0x08129a2f
+0,         39,         39,        1,   608256, 0x7bed8d9c
+0,         40,         40,        1,   608256, 0x16ce64c6
+0,         41,         41,        1,   608256, 0x6a120a3a
+0,         42,         42,        1,   608256, 0xfe0b889e
+0,         43,         43,        1,   608256, 0x57f4efcd
+0,         44,         44,        1,   608256, 0xc363ca91
+0,         45,         45,        1,   608256, 0x92237dce
+0,         46,         46,        1,   608256, 0x77bab64f
+0,         47,         47,        1,   608256, 0x29118201
+0,         48,         48,        1,   608256, 0x6f8e8e53
+0,         49,         49,        1,   608256, 0x4a13c4a3
+0,         50,         50,        1,   608256, 0x27a069a3
+0,         51,         51,        1,   608256, 0x22a5ff96
+0,         52,         52,        1,   608256, 0x29ad753f
+0,         53,         53,        1,   608256, 0x955788a6
+0,         54,         54,        1,   608256, 0xb73599c5
+0,         55,         55,        1,   608256, 0x73765aca
+0,         56,         56,        1,   608256, 0x39118f45
+0,         57,         57,        1,   608256, 0xfb0f8b96
+0,         58,         58,        1,   608256, 0xfcf71085
+0,         59,         59,        1,   608256, 0xccaaca7d
+0,         60,         60,        1,   608256, 0xde873299
+0,         61,         61,        1,   608256, 0x5d904202
+0,         62,         62,        1,   608256, 0x1e92c9b8
+0,         63,         63,        1,   608256, 0xdb8ec231
+0,         64,         64,        1,   608256, 0x388e2b9f
+0,         65,         65,        1,   608256, 0x1d190c39
+0,         66,         66,        1,   608256, 0xb6609efd
+0,         67,         67,        1,   608256, 0x0c6bf1d0
+0,         68,         68,        1,   608256, 0x178e0a3c
+0,         69,         69,        1,   608256, 0x439509f7
+0,         70,         70,        1,   608256, 0x00eb29ec
+0,         71,         71,        1,   608256, 0xee45f2a0
+0,         72,         72,        1,   608256, 0xae62eb8c
+0,         73,         73,        1,   608256, 0x3bb7510d
+0,         74,         74,        1,   608256, 0x03f08d02
+0,         75,         75,        1,   608256, 0x4beffc2a
+0,         76,         76,        1,   608256, 0x6071eb56
+0,         77,         77,        1,   608256, 0xbcb4e4e5
+0,         78,         78,        1,   608256, 0x775864aa
+0,         79,         79,        1,   608256, 0x3cfa0a94
+0,         80,         80,        1,   608256, 0x4652d529
+0,         81,         81,        1,   608256, 0xc5be07e2
+0,         82,         82,        1,   608256, 0xe7b480a2
+0,         83,         83,        1,   608256, 0x83b11945
+0,         84,         84,        1,   608256, 0x25ff0458
+0,         85,         85,        1,   608256, 0x5a780cda
+0,         86,         86,        1,   608256, 0x3448077c
+0,         87,         87,        1,   608256, 0x0f9c6f09
+0,         88,         88,        1,   608256, 0x05ece146
+0,         89,         89,        1,   608256, 0x3b02b504
+0,         90,         90,        1,   608256, 0xf3a8e2a6
+0,         91,         91,        1,   608256, 0xd4544847
+0,         92,         92,        1,   608256, 0x49bd2a3f
+0,         93,         93,        1,   608256, 0x22a42082
+0,         94,         94,        1,   608256, 0x8d8d1923
+0,         95,         95,        1,   608256, 0x2ba6877f
+0,         96,         96,        1,   608256, 0x494d481b
+0,         97,         97,        1,   608256, 0x28c99c35
+0,         98,         98,        1,   608256, 0x80128077
+0,         99,         99,        1,   608256, 0x887c2fb0

libav-v10.1.tar.bz2/tests/ref/fate/h264-reinit-small_420_8-to-large_444_10 Added

@@ -0,0 +1,101 @@
+#tb 0: 1/25
+0,          0,          0,        1,   608256, 0x27a069a3
+0,          1,          1,        1,   608256, 0x22a5ff96
+0,          2,          2,        1,   608256, 0x29ad753f
+0,          3,          3,        1,   608256, 0x955788a6
+0,          4,          4,        1,   608256, 0xb73599c5
+0,          5,          5,        1,   608256, 0x73765aca
+0,          6,          6,        1,   608256, 0x39118f45
+0,          7,          7,        1,   608256, 0xfb0f8b96
+0,          8,          8,        1,   608256, 0xfcf71085
+0,          9,          9,        1,   608256, 0xccaaca7d
+0,         10,         10,        1,   608256, 0xde873299
+0,         11,         11,        1,   608256, 0x5d904202
+0,         12,         12,        1,   608256, 0x1e92c9b8
+0,         13,         13,        1,   608256, 0xdb8ec231
+0,         14,         14,        1,   608256, 0x388e2b9f
+0,         15,         15,        1,   608256, 0x1d190c39
+0,         16,         16,        1,   608256, 0xb6609efd
+0,         17,         17,        1,   608256, 0x0c6bf1d0
+0,         18,         18,        1,   608256, 0x178e0a3c
+0,         19,         19,        1,   608256, 0x439509f7
+0,         20,         20,        1,   608256, 0x00eb29ec
+0,         21,         21,        1,   608256, 0xee45f2a0
+0,         22,         22,        1,   608256, 0xae62eb8c
+0,         23,         23,        1,   608256, 0x3bb7510d
+0,         24,         24,        1,   608256, 0x03f08d02
+0,         25,         25,        1,   608256, 0x4beffc2a
+0,         26,         26,        1,   608256, 0x6071eb56
+0,         27,         27,        1,   608256, 0xbcb4e4e5
+0,         28,         28,        1,   608256, 0x775864aa
+0,         29,         29,        1,   608256, 0x3cfa0a94
+0,         30,         30,        1,   608256, 0x4652d529
+0,         31,         31,        1,   608256, 0xc5be07e2
+0,         32,         32,        1,   608256, 0xe7b480a2
+0,         33,         33,        1,   608256, 0x83b11945
+0,         34,         34,        1,   608256, 0x25ff0458
+0,         35,         35,        1,   608256, 0x5a780cda
+0,         36,         36,        1,   608256, 0x3448077c
+0,         37,         37,        1,   608256, 0x0f9c6f09
+0,         38,         38,        1,   608256, 0x05ece146
+0,         39,         39,        1,   608256, 0x3b02b504
+0,         40,         40,        1,   608256, 0xf3a8e2a6
+0,         41,         41,        1,   608256, 0xd4544847
+0,         42,         42,        1,   608256, 0x49bd2a3f
+0,         43,         43,        1,   608256, 0x22a42082
+0,         44,         44,        1,   608256, 0x8d8d1923
+0,         45,         45,        1,   608256, 0x2ba6877f
+0,         46,         46,        1,   608256, 0x494d481b
+0,         47,         47,        1,   608256, 0x28c99c35
+0,         48,         48,        1,   608256, 0x80128077
+0,         49,         49,        1,   608256, 0x887c2fb0
+0,         50,         50,        1,   608256, 0xfaba3fe4
+0,         51,         51,        1,   608256, 0x0369a227
+0,         52,         52,        1,   608256, 0xe62cb2b1
+0,         53,         53,        1,   608256, 0x851d9e78
+0,         54,         54,        1,   608256, 0x6847b938
+0,         55,         55,        1,   608256, 0x48eb702e
+0,         56,         56,        1,   608256, 0x3eb52eec
+0,         57,         57,        1,   608256, 0xf880edf8
+0,         58,         58,        1,   608256, 0xf7ac1860
+0,         59,         59,        1,   608256, 0x3ead29f3
+0,         60,         60,        1,   608256, 0x6db1860a
+0,         61,         61,        1,   608256, 0x72ee9271
+0,         62,         62,        1,   608256, 0xa8b643e4
+0,         63,         63,        1,   608256, 0x22a95a3e
+0,         64,         64,        1,   608256, 0x4e8aa877
+0,         65,         65,        1,   608256, 0x9545cfcf
+0,         66,         66,        1,   608256, 0x42d820e0
+0,         67,         67,        1,   608256, 0xe701ea6f
+0,         68,         68,        1,   608256, 0x05f61a49
+0,         69,         69,        1,   608256, 0xc1de9f65
+0,         70,         70,        1,   608256, 0x2b121933
+0,         71,         71,        1,   608256, 0x4de4e185
+0,         72,         72,        1,   608256, 0x01c6fb05
+0,         73,         73,        1,   608256, 0x1fbf8603
+0,         74,         74,        1,   608256, 0x9d8f2fd4
+0,         75,         75,        1,   608256, 0xb7d6f14e
+0,         76,         76,        1,   608256, 0x503c33a9
+0,         77,         77,        1,   608256, 0x051e8b02
+0,         78,         78,        1,   608256, 0xeff7c286
+0,         79,         79,        1,   608256, 0xeb80088a
+0,         80,         80,        1,   608256, 0xffbc6cec
+0,         81,         81,        1,   608256, 0x42d55e9d
+0,         82,         82,        1,   608256, 0x4898c507
+0,         83,         83,        1,   608256, 0x2c2411b5
+0,         84,         84,        1,   608256, 0xd70a34a4
+0,         85,         85,        1,   608256, 0xce5e64f5
+0,         86,         86,        1,   608256, 0x7790d293
+0,         87,         87,        1,   608256, 0xac5b44fb
+0,         88,         88,        1,   608256, 0xae4c2921
+0,         89,         89,        1,   608256, 0x373a26bb
+0,         90,         90,        1,   608256, 0x3aa3fed4
+0,         91,         91,        1,   608256, 0x4f4b1496
+0,         92,         92,        1,   608256, 0x4760fe2b
+0,         93,         93,        1,   608256, 0x9e38af43
+0,         94,         94,        1,   608256, 0xd7c66f6e
+0,         95,         95,        1,   608256, 0xf6cb1649
+0,         96,         96,        1,   608256, 0xb0591bf1
+0,         97,         97,        1,   608256, 0xb507b282
+0,         98,         98,        1,   608256, 0xfb53c6e5
+0,         99,         99,        1,   608256, 0x5410f10f

libav-v10.1.tar.bz2/tests/ref/fate/h264-reinit-small_420_9-to-small_420_8 Added

@@ -0,0 +1,101 @@
+#tb 0: 1/25
+0,          0,          0,        1,   608256, 0xee06377f
+0,          1,          1,        1,   608256, 0x9c22c5ee
+0,          2,          2,        1,   608256, 0x322abee2
+0,          3,          3,        1,   608256, 0x82745ed3
+0,          4,          4,        1,   608256, 0xe7b9248b
+0,          5,          5,        1,   608256, 0xc8c1ce0e
+0,          6,          6,        1,   608256, 0x8451eba9
+0,          7,          7,        1,   608256, 0xece9412d
+0,          8,          8,        1,   608256, 0xffbc2c24
+0,          9,          9,        1,   608256, 0xf58c117e
+0,         10,         10,        1,   608256, 0x7853f334
+0,         11,         11,        1,   608256, 0x1acd6465
+0,         12,         12,        1,   608256, 0xb668856c
+0,         13,         13,        1,   608256, 0x3f52c230
+0,         14,         14,        1,   608256, 0xd7e8b5b6
+0,         15,         15,        1,   608256, 0xf663681d
+0,         16,         16,        1,   608256, 0x07ef670c
+0,         17,         17,        1,   608256, 0x1d5084f4
+0,         18,         18,        1,   608256, 0x0ea3fe04
+0,         19,         19,        1,   608256, 0xf095d1e0
+0,         20,         20,        1,   608256, 0xbdac37fb
+0,         21,         21,        1,   608256, 0x2cbfdf91
+0,         22,         22,        1,   608256, 0x8da7190f
+0,         23,         23,        1,   608256, 0x08bf6fc9
+0,         24,         24,        1,   608256, 0xa2368e5c
+0,         25,         25,        1,   608256, 0x36d38f81
+0,         26,         26,        1,   608256, 0x94d344cc
+0,         27,         27,        1,   608256, 0x1cf33f86
+0,         28,         28,        1,   608256, 0x98d6341f
+0,         29,         29,        1,   608256, 0xb04e3a3a
+0,         30,         30,        1,   608256, 0x74e52483
+0,         31,         31,        1,   608256, 0x6acc8d96
+0,         32,         32,        1,   608256, 0x136d6c4e
+0,         33,         33,        1,   608256, 0x50efa37a
+0,         34,         34,        1,   608256, 0x53170421
+0,         35,         35,        1,   608256, 0x2ed5210e
+0,         36,         36,        1,   608256, 0x5f471854
+0,         37,         37,        1,   608256, 0xd6ff7856
+0,         38,         38,        1,   608256, 0x446bf456
+0,         39,         39,        1,   608256, 0x872b95b1
+0,         40,         40,        1,   608256, 0xc9e5e827
+0,         41,         41,        1,   608256, 0xdab3eb04
+0,         42,         42,        1,   608256, 0xccd6347e
+0,         43,         43,        1,   608256, 0xd7dfd0a9
+0,         44,         44,        1,   608256, 0x60b834c3
+0,         45,         45,        1,   608256, 0x0b822676
+0,         46,         46,        1,   608256, 0x0e5d3d5a
+0,         47,         47,        1,   608256, 0x1fa0233d
+0,         48,         48,        1,   608256, 0xb853b650
+0,         49,         49,        1,   608256, 0x30d8d033
+0,         50,         50,        1,   608256, 0x27a069a3
+0,         51,         51,        1,   608256, 0x22a5ff96
+0,         52,         52,        1,   608256, 0x29ad753f
+0,         53,         53,        1,   608256, 0x955788a6
+0,         54,         54,        1,   608256, 0xb73599c5
+0,         55,         55,        1,   608256, 0x73765aca
+0,         56,         56,        1,   608256, 0x39118f45
+0,         57,         57,        1,   608256, 0xfb0f8b96
+0,         58,         58,        1,   608256, 0xfcf71085
+0,         59,         59,        1,   608256, 0xccaaca7d
+0,         60,         60,        1,   608256, 0xde873299
+0,         61,         61,        1,   608256, 0x5d904202
+0,         62,         62,        1,   608256, 0x1e92c9b8
+0,         63,         63,        1,   608256, 0xdb8ec231
+0,         64,         64,        1,   608256, 0x388e2b9f
+0,         65,         65,        1,   608256, 0x1d190c39
+0,         66,         66,        1,   608256, 0xb6609efd
+0,         67,         67,        1,   608256, 0x0c6bf1d0
+0,         68,         68,        1,   608256, 0x178e0a3c
+0,         69,         69,        1,   608256, 0x439509f7
+0,         70,         70,        1,   608256, 0x00eb29ec
+0,         71,         71,        1,   608256, 0xee45f2a0
+0,         72,         72,        1,   608256, 0xae62eb8c
+0,         73,         73,        1,   608256, 0x3bb7510d
+0,         74,         74,        1,   608256, 0x03f08d02
+0,         75,         75,        1,   608256, 0x4beffc2a
+0,         76,         76,        1,   608256, 0x6071eb56
+0,         77,         77,        1,   608256, 0xbcb4e4e5
+0,         78,         78,        1,   608256, 0x775864aa
+0,         79,         79,        1,   608256, 0x3cfa0a94
+0,         80,         80,        1,   608256, 0x4652d529
+0,         81,         81,        1,   608256, 0xc5be07e2
+0,         82,         82,        1,   608256, 0xe7b480a2
+0,         83,         83,        1,   608256, 0x83b11945
+0,         84,         84,        1,   608256, 0x25ff0458
+0,         85,         85,        1,   608256, 0x5a780cda
+0,         86,         86,        1,   608256, 0x3448077c
+0,         87,         87,        1,   608256, 0x0f9c6f09
+0,         88,         88,        1,   608256, 0x05ece146
+0,         89,         89,        1,   608256, 0x3b02b504
+0,         90,         90,        1,   608256, 0xf3a8e2a6
+0,         91,         91,        1,   608256, 0xd4544847
+0,         92,         92,        1,   608256, 0x49bd2a3f
+0,         93,         93,        1,   608256, 0x22a42082
+0,         94,         94,        1,   608256, 0x8d8d1923
+0,         95,         95,        1,   608256, 0x2ba6877f
+0,         96,         96,        1,   608256, 0x494d481b
+0,         97,         97,        1,   608256, 0x28c99c35
+0,         98,         98,        1,   608256, 0x80128077
+0,         99,         99,        1,   608256, 0x887c2fb0

libav-v10.1.tar.bz2/tests/ref/fate/h264-reinit-small_422_9-to-small_420_9 Added

@@ -0,0 +1,101 @@
+#tb 0: 1/25
+0,          0,          0,        1,   608256, 0x3aef31f3
+0,          1,          1,        1,   608256, 0x05afe4e8
+0,          2,          2,        1,   608256, 0x9d7dc9b1
+0,          3,          3,        1,   608256, 0x60b3efec
+0,          4,          4,        1,   608256, 0x7dc51741
+0,          5,          5,        1,   608256, 0xb3bfb413
+0,          6,          6,        1,   608256, 0x0a2738b3
+0,          7,          7,        1,   608256, 0xfd3f8f1b
+0,          8,          8,        1,   608256, 0x922d413f
+0,          9,          9,        1,   608256, 0x775b4cfb
+0,         10,         10,        1,   608256, 0xcbfaec82
+0,         11,         11,        1,   608256, 0x1f1903a2
+0,         12,         12,        1,   608256, 0xdd246528
+0,         13,         13,        1,   608256, 0xe3d8afdc
+0,         14,         14,        1,   608256, 0xb29c4235
+0,         15,         15,        1,   608256, 0xa230e654
+0,         16,         16,        1,   608256, 0xe0246276
+0,         17,         17,        1,   608256, 0xd47b6b3c
+0,         18,         18,        1,   608256, 0xa5593d23
+0,         19,         19,        1,   608256, 0x01cd5642
+0,         20,         20,        1,   608256, 0x0c451611
+0,         21,         21,        1,   608256, 0xc4833ff5
+0,         22,         22,        1,   608256, 0xbed881fc
+0,         23,         23,        1,   608256, 0x709e77e6
+0,         24,         24,        1,   608256, 0x9815dad3
+0,         25,         25,        1,   608256, 0x55c1fe5f
+0,         26,         26,        1,   608256, 0xd89ff770
+0,         27,         27,        1,   608256, 0xc636abf7
+0,         28,         28,        1,   608256, 0x17d3f5b1
+0,         29,         29,        1,   608256, 0x0389cd38
+0,         30,         30,        1,   608256, 0x502eea66
+0,         31,         31,        1,   608256, 0xcb697a48
+0,         32,         32,        1,   608256, 0xd4f6c694
+0,         33,         33,        1,   608256, 0x734a5163
+0,         34,         34,        1,   608256, 0xa53f5187
+0,         35,         35,        1,   608256, 0x64d2c1c7
+0,         36,         36,        1,   608256, 0x41a170d0
+0,         37,         37,        1,   608256, 0x6f671fe1
+0,         38,         38,        1,   608256, 0x56983008
+0,         39,         39,        1,   608256, 0x95911957
+0,         40,         40,        1,   608256, 0x027f2a7a
+0,         41,         41,        1,   608256, 0xcd22d70f
+0,         42,         42,        1,   608256, 0x268beec0
+0,         43,         43,        1,   608256, 0xcf14123e
+0,         44,         44,        1,   608256, 0xfc8e3bff
+0,         45,         45,        1,   608256, 0x6974ad54
+0,         46,         46,        1,   608256, 0x8fbd9cdd
+0,         47,         47,        1,   608256, 0x66110ef8
+0,         48,         48,        1,   608256, 0x84b4b1f1
+0,         49,         49,        1,   608256, 0xf0d4949b
+0,         50,         50,        1,   608256, 0xee06377f
+0,         51,         51,        1,   608256, 0x9c22c5ee
+0,         52,         52,        1,   608256, 0x322abee2
+0,         53,         53,        1,   608256, 0x82745ed3
+0,         54,         54,        1,   608256, 0xe7b9248b
+0,         55,         55,        1,   608256, 0xc8c1ce0e
+0,         56,         56,        1,   608256, 0x8451eba9
+0,         57,         57,        1,   608256, 0xece9412d
+0,         58,         58,        1,   608256, 0xffbc2c24
+0,         59,         59,        1,   608256, 0xf58c117e
+0,         60,         60,        1,   608256, 0x7853f334
+0,         61,         61,        1,   608256, 0x1acd6465
+0,         62,         62,        1,   608256, 0xb668856c
+0,         63,         63,        1,   608256, 0x3f52c230
+0,         64,         64,        1,   608256, 0xd7e8b5b6
+0,         65,         65,        1,   608256, 0xf663681d
+0,         66,         66,        1,   608256, 0x07ef670c
+0,         67,         67,        1,   608256, 0x1d5084f4
+0,         68,         68,        1,   608256, 0x0ea3fe04
+0,         69,         69,        1,   608256, 0xf095d1e0
+0,         70,         70,        1,   608256, 0xbdac37fb
+0,         71,         71,        1,   608256, 0x2cbfdf91
+0,         72,         72,        1,   608256, 0x8da7190f
+0,         73,         73,        1,   608256, 0x08bf6fc9
+0,         74,         74,        1,   608256, 0xa2368e5c
+0,         75,         75,        1,   608256, 0x36d38f81
+0,         76,         76,        1,   608256, 0x94d344cc
+0,         77,         77,        1,   608256, 0x1cf33f86
+0,         78,         78,        1,   608256, 0x98d6341f
+0,         79,         79,        1,   608256, 0xb04e3a3a
+0,         80,         80,        1,   608256, 0x74e52483
+0,         81,         81,        1,   608256, 0x6acc8d96
+0,         82,         82,        1,   608256, 0x136d6c4e
+0,         83,         83,        1,   608256, 0x50efa37a
+0,         84,         84,        1,   608256, 0x53170421
+0,         85,         85,        1,   608256, 0x2ed5210e
+0,         86,         86,        1,   608256, 0x5f471854
+0,         87,         87,        1,   608256, 0xd6ff7856
+0,         88,         88,        1,   608256, 0x446bf456
+0,         89,         89,        1,   608256, 0x872b95b1
+0,         90,         90,        1,   608256, 0xc9e5e827
+0,         91,         91,        1,   608256, 0xdab3eb04
+0,         92,         92,        1,   608256, 0xccd6347e
+0,         93,         93,        1,   608256, 0xd7dfd0a9
+0,         94,         94,        1,   608256, 0x60b834c3
+0,         95,         95,        1,   608256, 0x0b822676
+0,         96,         96,        1,   608256, 0x0e5d3d5a
+0,         97,         97,        1,   608256, 0x1fa0233d
+0,         98,         98,        1,   608256, 0xb853b650
+0,         99,         99,        1,   608256, 0x30d8d033

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-AMP_A_Samsung_4 Added

@@ -0,0 +1,61 @@
+#tb 0: 1/25
+0,          0,          0,        1,  6144000, 0xf7da9a00
+0,          1,          1,        1,  6144000, 0xf5cfc76f
+0,          2,          2,        1,  6144000, 0x20663e82
+0,          3,          3,        1,  6144000, 0xbff3d1e7
+0,          4,          4,        1,  6144000, 0x6f1b824d
+0,          5,          5,        1,  6144000, 0x4d75e5c9
+0,          6,          6,        1,  6144000, 0xb4443853
+0,          7,          7,        1,  6144000, 0x6943bbcb
+0,          8,          8,        1,  6144000, 0x1748b8d3
+0,          9,          9,        1,  6144000, 0x0e15caec
+0,         10,         10,        1,  6144000, 0xf7553ff4
+0,         11,         11,        1,  6144000, 0x34007146
+0,         12,         12,        1,  6144000, 0xd115a7ad
+0,         13,         13,        1,  6144000, 0x1adc8d27
+0,         14,         14,        1,  6144000, 0x2c3a43a6
+0,         15,         15,        1,  6144000, 0x1820500a
+0,         16,         16,        1,  6144000, 0xb33cf5af
+0,         17,         17,        1,  6144000, 0x5ba58d5a
+0,         18,         18,        1,  6144000, 0x453f35bc
+0,         19,         19,        1,  6144000, 0x4e6ac2ab
+0,         20,         20,        1,  6144000, 0xfab2b132
+0,         21,         21,        1,  6144000, 0xf903b7bf
+0,         22,         22,        1,  6144000, 0x160ebf13
+0,         23,         23,        1,  6144000, 0xd147c884
+0,         24,         24,        1,  6144000, 0x266abc04
+0,         25,         25,        1,  6144000, 0x9fabf642
+0,         26,         26,        1,  6144000, 0x1ad4f6c7
+0,         27,         27,        1,  6144000, 0x41fa1e6f
+0,         28,         28,        1,  6144000, 0x14b2b3b4
+0,         29,         29,        1,  6144000, 0x19c6d13e
+0,         30,         30,        1,  6144000, 0x414f5a36
+0,         31,         31,        1,  6144000, 0x439278aa
+0,         32,         32,        1,  6144000, 0xf8e73a55
+0,         33,         33,        1,  6144000, 0xf4cf7779
+0,         34,         34,        1,  6144000, 0x86ac3a16
+0,         35,         35,        1,  6144000, 0xdc9abdb8
+0,         36,         36,        1,  6144000, 0x9ab68a62
+0,         37,         37,        1,  6144000, 0xcd290547
+0,         38,         38,        1,  6144000, 0xd2eb88bb
+0,         39,         39,        1,  6144000, 0x126e084e
+0,         40,         40,        1,  6144000, 0x1aa5302c
+0,         41,         41,        1,  6144000, 0x689cb93e
+0,         42,         42,        1,  6144000, 0xaa9e3be6
+0,         43,         43,        1,  6144000, 0x33dc9ead
+0,         44,         44,        1,  6144000, 0xcb943dd3
+0,         45,         45,        1,  6144000, 0x22a67b19
+0,         46,         46,        1,  6144000, 0x3bfb741a
+0,         47,         47,        1,  6144000, 0x9238e595
+0,         48,         48,        1,  6144000, 0xf0fb6381
+0,         49,         49,        1,  6144000, 0x6ea42af1
+0,         50,         50,        1,  6144000, 0x47d9c3a7
+0,         51,         51,        1,  6144000, 0x9f73966b
+0,         52,         52,        1,  6144000, 0xdf777adc
+0,         53,         53,        1,  6144000, 0xf51f206e
+0,         54,         54,        1,  6144000, 0x465c350a
+0,         55,         55,        1,  6144000, 0x9253a45a
+0,         56,         56,        1,  6144000, 0x72c89751
+0,         57,         57,        1,  6144000, 0x0405cdfc
+0,         58,         58,        1,  6144000, 0xc5ede0c7
+0,         59,         59,        1,  6144000, 0xcf1c2b5e

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-AMP_B_Samsung_4 Added

@@ -0,0 +1,61 @@
+#tb 0: 1/25
+0,          0,          0,        1,  6144000, 0xcd32ef33
+0,          1,          1,        1,  6144000, 0x58ce681d
+0,          2,          2,        1,  6144000, 0x77a732b6
+0,          3,          3,        1,  6144000, 0xa95418d0
+0,          4,          4,        1,  6144000, 0xa1593606
+0,          5,          5,        1,  6144000, 0x0d5429bc
+0,          6,          6,        1,  6144000, 0xe7cd205c
+0,          7,          7,        1,  6144000, 0x52c30ff4
+0,          8,          8,        1,  6144000, 0xf0a0f686
+0,          9,          9,        1,  6144000, 0xa6371d86
+0,         10,         10,        1,  6144000, 0x18bf1478
+0,         11,         11,        1,  6144000, 0xb84c6322
+0,         12,         12,        1,  6144000, 0x12f35f80
+0,         13,         13,        1,  6144000, 0xa9009e83
+0,         14,         14,        1,  6144000, 0x08568380
+0,         15,         15,        1,  6144000, 0xb01e98e8
+0,         16,         16,        1,  6144000, 0x0796ee90
+0,         17,         17,        1,  6144000, 0x3bb7cbef
+0,         18,         18,        1,  6144000, 0x7c3d6929
+0,         19,         19,        1,  6144000, 0x62c0e56c
+0,         20,         20,        1,  6144000, 0xd05907f7
+0,         21,         21,        1,  6144000, 0x9aa33b33
+0,         22,         22,        1,  6144000, 0xc47a0195
+0,         23,         23,        1,  6144000, 0xa5a5db13
+0,         24,         24,        1,  6144000, 0x54fda44b
+0,         25,         25,        1,  6144000, 0x7695be2f
+0,         26,         26,        1,  6144000, 0x247228e1
+0,         27,         27,        1,  6144000, 0xec38b2f7
+0,         28,         28,        1,  6144000, 0x223b098d
+0,         29,         29,        1,  6144000, 0xdd13f4bf
+0,         30,         30,        1,  6144000, 0x42651b46
+0,         31,         31,        1,  6144000, 0xc0b2ac9a
+0,         32,         32,        1,  6144000, 0x574908ee
+0,         33,         33,        1,  6144000, 0x070f0d88
+0,         34,         34,        1,  6144000, 0xc68ee679
+0,         35,         35,        1,  6144000, 0x4d571c82
+0,         36,         36,        1,  6144000, 0xec7f28cb
+0,         37,         37,        1,  6144000, 0x07ca3ccd
+0,         38,         38,        1,  6144000, 0xa5161fd7
+0,         39,         39,        1,  6144000, 0xb0908b25
+0,         40,         40,        1,  6144000, 0x4fa56c5e
+0,         41,         41,        1,  6144000, 0x1ad84207
+0,         42,         42,        1,  6144000, 0xc862a32b
+0,         43,         43,        1,  6144000, 0x341b9b0a
+0,         44,         44,        1,  6144000, 0xa940cdab
+0,         45,         45,        1,  6144000, 0x57521b2d
+0,         46,         46,        1,  6144000, 0x31969dee
+0,         47,         47,        1,  6144000, 0x7a09e240
+0,         48,         48,        1,  6144000, 0x14e6c360
+0,         49,         49,        1,  6144000, 0x0dfd6085
+0,         50,         50,        1,  6144000, 0xdf231a1e
+0,         51,         51,        1,  6144000, 0x6d1e9ce1
+0,         52,         52,        1,  6144000, 0xc6c2fb26
+0,         53,         53,        1,  6144000, 0xd4bc5e3e
+0,         54,         54,        1,  6144000, 0xa4a56b9e
+0,         55,         55,        1,  6144000, 0x8ba6349f
+0,         56,         56,        1,  6144000, 0x0683757f
+0,         57,         57,        1,  6144000, 0xe3840d8b
+0,         58,         58,        1,  6144000, 0x2fdf2ae6
+0,         59,         59,        1,  6144000, 0xea877e27

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-AMP_D_Hisilicon Added

@@ -0,0 +1,101 @@
+#tb 0: 1/25
+0,          0,          0,        1,  3110400, 0x1559c293
+0,          1,          1,        1,  3110400, 0xd0802706
+0,          2,          2,        1,  3110400, 0xb48cf229
+0,          3,          3,        1,  3110400, 0x4108509b
+0,          4,          4,        1,  3110400, 0xd1cec277
+0,          5,          5,        1,  3110400, 0x3e68c589
+0,          6,          6,        1,  3110400, 0x1543a517
+0,          7,          7,        1,  3110400, 0x5ddcd669
+0,          8,          8,        1,  3110400, 0x09bd4c27
+0,          9,          9,        1,  3110400, 0xd583bfa1
+0,         10,         10,        1,  3110400, 0xe9411279
+0,         11,         11,        1,  3110400, 0xe07e6f3f
+0,         12,         12,        1,  3110400, 0xcfd23191
+0,         13,         13,        1,  3110400, 0x24276734
+0,         14,         14,        1,  3110400, 0x485aeafe
+0,         15,         15,        1,  3110400, 0xb8039a85
+0,         16,         16,        1,  3110400, 0x1d154e19
+0,         17,         17,        1,  3110400, 0xaa3ce800
+0,         18,         18,        1,  3110400, 0xe2601cba
+0,         19,         19,        1,  3110400, 0xb6657a57
+0,         20,         20,        1,  3110400, 0x34dbda52
+0,         21,         21,        1,  3110400, 0x921e218a
+0,         22,         22,        1,  3110400, 0x7de5262f
+0,         23,         23,        1,  3110400, 0x1a97e083
+0,         24,         24,        1,  3110400, 0x4bfc81d0
+0,         25,         25,        1,  3110400, 0x583396e6
+0,         26,         26,        1,  3110400, 0xc96bcd39
+0,         27,         27,        1,  3110400, 0x483cf7cf
+0,         28,         28,        1,  3110400, 0x20882e52
+0,         29,         29,        1,  3110400, 0x93d352fe
+0,         30,         30,        1,  3110400, 0x0c932722
+0,         31,         31,        1,  3110400, 0x78c5a9f0
+0,         32,         32,        1,  3110400, 0xcea3bddd
+0,         33,         33,        1,  3110400, 0x3e4e7c77
+0,         34,         34,        1,  3110400, 0xbe048a0a
+0,         35,         35,        1,  3110400, 0x1cf7ea0d
+0,         36,         36,        1,  3110400, 0xeb60343a
+0,         37,         37,        1,  3110400, 0x2158ed1f
+0,         38,         38,        1,  3110400, 0x3a7126b1
+0,         39,         39,        1,  3110400, 0x282804ff
+0,         40,         40,        1,  3110400, 0x292ed438
+0,         41,         41,        1,  3110400, 0x49a9769d
+0,         42,         42,        1,  3110400, 0xdfc12632
+0,         43,         43,        1,  3110400, 0xff3da16a
+0,         44,         44,        1,  3110400, 0x134b68c6
+0,         45,         45,        1,  3110400, 0x717e6f1d
+0,         46,         46,        1,  3110400, 0x283293f5
+0,         47,         47,        1,  3110400, 0x3d401456
+0,         48,         48,        1,  3110400, 0x500eddac
+0,         49,         49,        1,  3110400, 0x2a96fbff
+0,         50,         50,        1,  3110400, 0x9d75f303
+0,         51,         51,        1,  3110400, 0x08d1fa48
+0,         52,         52,        1,  3110400, 0xa685a8da
+0,         53,         53,        1,  3110400, 0xc19216d8
+0,         54,         54,        1,  3110400, 0x61ebd7f2
+0,         55,         55,        1,  3110400, 0x866c9002
+0,         56,         56,        1,  3110400, 0x3edda174
+0,         57,         57,        1,  3110400, 0x4e848db7
+0,         58,         58,        1,  3110400, 0x1dd822ba
+0,         59,         59,        1,  3110400, 0x8157b534
+0,         60,         60,        1,  3110400, 0x72637dbe
+0,         61,         61,        1,  3110400, 0xc6fc1305
+0,         62,         62,        1,  3110400, 0xbfadeee4
+0,         63,         63,        1,  3110400, 0xad20c230
+0,         64,         64,        1,  3110400, 0x5afff02b
+0,         65,         65,        1,  3110400, 0x5e533c71
+0,         66,         66,        1,  3110400, 0x52e10588
+0,         67,         67,        1,  3110400, 0x13a6dbb1
+0,         68,         68,        1,  3110400, 0xc74de5ae
+0,         69,         69,        1,  3110400, 0x382aafb8
+0,         70,         70,        1,  3110400, 0x5e0a11b2
+0,         71,         71,        1,  3110400, 0x049fe7cc
+0,         72,         72,        1,  3110400, 0x9d79484e
+0,         73,         73,        1,  3110400, 0x1116ced8
+0,         74,         74,        1,  3110400, 0x5d8d075d
+0,         75,         75,        1,  3110400, 0x49392496
+0,         76,         76,        1,  3110400, 0x5f24b3b3
+0,         77,         77,        1,  3110400, 0x6ca1c16d
+0,         78,         78,        1,  3110400, 0x131a16d2
+0,         79,         79,        1,  3110400, 0x39e2f9a1
+0,         80,         80,        1,  3110400, 0x988bd0ee
+0,         81,         81,        1,  3110400, 0xa6c050ec
+0,         82,         82,        1,  3110400, 0x5275142a
+0,         83,         83,        1,  3110400, 0x5705923d
+0,         84,         84,        1,  3110400, 0x3098d52d
+0,         85,         85,        1,  3110400, 0xb16e2eb7
+0,         86,         86,        1,  3110400, 0x0dee6bc8
+0,         87,         87,        1,  3110400, 0x577acf61
+0,         88,         88,        1,  3110400, 0x2b70d954
+0,         89,         89,        1,  3110400, 0x26b5f1c5
+0,         90,         90,        1,  3110400, 0x2351ad88
+0,         91,         91,        1,  3110400, 0xe5bdf6ad
+0,         92,         92,        1,  3110400, 0xaf0d83de
+0,         93,         93,        1,  3110400, 0xaee86799
+0,         94,         94,        1,  3110400, 0xe73fe067
+0,         95,         95,        1,  3110400, 0x46b90697
+0,         96,         96,        1,  3110400, 0xb270f77a
+0,         97,         97,        1,  3110400, 0xf33aa535
+0,         98,         98,        1,  3110400, 0xcafe6eec
+0,         99,         99,        1,  3110400, 0xcf051a31

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-AMP_E_Hisilicon Added

@@ -0,0 +1,101 @@
+#tb 0: 1/25
+0,          0,          0,        1,  3110400, 0xf9342188
+0,          1,          1,        1,  3110400, 0x46638dc4
+0,          2,          2,        1,  3110400, 0x96da436e
+0,          3,          3,        1,  3110400, 0xae9ee064
+0,          4,          4,        1,  3110400, 0x03fc9d17
+0,          5,          5,        1,  3110400, 0xd7ba9ab8
+0,          6,          6,        1,  3110400, 0x9f3cc881
+0,          7,          7,        1,  3110400, 0x911c9e2a
+0,          8,          8,        1,  3110400, 0x2c1bdec1
+0,          9,          9,        1,  3110400, 0xffc2cfb2
+0,         10,         10,        1,  3110400, 0x34136d4c
+0,         11,         11,        1,  3110400, 0x400dca0c
+0,         12,         12,        1,  3110400, 0x5a3d3c71
+0,         13,         13,        1,  3110400, 0x5bd262f9
+0,         14,         14,        1,  3110400, 0x27bbec47
+0,         15,         15,        1,  3110400, 0x53ca3f78
+0,         16,         16,        1,  3110400, 0x7fee4170
+0,         17,         17,        1,  3110400, 0x393d318c
+0,         18,         18,        1,  3110400, 0x203f26f1
+0,         19,         19,        1,  3110400, 0x35e00c3e
+0,         20,         20,        1,  3110400, 0x995afdde
+0,         21,         21,        1,  3110400, 0xa8b623b9
+0,         22,         22,        1,  3110400, 0x047e53bd
+0,         23,         23,        1,  3110400, 0xc7e69515
+0,         24,         24,        1,  3110400, 0x7e5ade49
+0,         25,         25,        1,  3110400, 0x863cddc9
+0,         26,         26,        1,  3110400, 0xb1f6189c
+0,         27,         27,        1,  3110400, 0x622d6d1d
+0,         28,         28,        1,  3110400, 0x1e82ef1a
+0,         29,         29,        1,  3110400, 0x06a7054a
+0,         30,         30,        1,  3110400, 0x736bd4a9
+0,         31,         31,        1,  3110400, 0x1db8ead3
+0,         32,         32,        1,  3110400, 0x1d872697
+0,         33,         33,        1,  3110400, 0x86b11604
+0,         34,         34,        1,  3110400, 0x54bee045
+0,         35,         35,        1,  3110400, 0x3577fa15
+0,         36,         36,        1,  3110400, 0x717b6c0b
+0,         37,         37,        1,  3110400, 0x5e0f0b6e
+0,         38,         38,        1,  3110400, 0x054ecc86
+0,         39,         39,        1,  3110400, 0x9ec29ad1
+0,         40,         40,        1,  3110400, 0x7c3b56e4
+0,         41,         41,        1,  3110400, 0xcf4cf721
+0,         42,         42,        1,  3110400, 0x43c01adb
+0,         43,         43,        1,  3110400, 0x6abb4879
+0,         44,         44,        1,  3110400, 0x90473c9f
+0,         45,         45,        1,  3110400, 0x5f5bb9a9
+0,         46,         46,        1,  3110400, 0x08678e6b
+0,         47,         47,        1,  3110400, 0xf4ad0c9b
+0,         48,         48,        1,  3110400, 0x22870cc8
+0,         49,         49,        1,  3110400, 0xb417cf63
+0,         50,         50,        1,  3110400, 0xb7a1588e
+0,         51,         51,        1,  3110400, 0x7a35ac81
+0,         52,         52,        1,  3110400, 0xcd1c6d82
+0,         53,         53,        1,  3110400, 0x181b9920
+0,         54,         54,        1,  3110400, 0xf2417d5e
+0,         55,         55,        1,  3110400, 0x8a67e02b
+0,         56,         56,        1,  3110400, 0xe7b99077
+0,         57,         57,        1,  3110400, 0x6814e5c2
+0,         58,         58,        1,  3110400, 0xd8bce44d
+0,         59,         59,        1,  3110400, 0x9faf4ebc
+0,         60,         60,        1,  3110400, 0x3daa5fbf
+0,         61,         61,        1,  3110400, 0x747921ba
+0,         62,         62,        1,  3110400, 0xbe30214e
+0,         63,         63,        1,  3110400, 0x8f5533fe
+0,         64,         64,        1,  3110400, 0x835a4545
+0,         65,         65,        1,  3110400, 0xfa99f4c8
+0,         66,         66,        1,  3110400, 0x9559c5db
+0,         67,         67,        1,  3110400, 0xd0d096f8
+0,         68,         68,        1,  3110400, 0x7b24dbb0
+0,         69,         69,        1,  3110400, 0x4a8aa189
+0,         70,         70,        1,  3110400, 0x876bab32
+0,         71,         71,        1,  3110400, 0xc930bec9
+0,         72,         72,        1,  3110400, 0x009841d8
+0,         73,         73,        1,  3110400, 0x93e5be89
+0,         74,         74,        1,  3110400, 0x82260331
+0,         75,         75,        1,  3110400, 0x7ef2e971
+0,         76,         76,        1,  3110400, 0x606b638a
+0,         77,         77,        1,  3110400, 0xf08b84df
+0,         78,         78,        1,  3110400, 0x8a609222
+0,         79,         79,        1,  3110400, 0xa76cb2f3
+0,         80,         80,        1,  3110400, 0x2b611cb3
+0,         81,         81,        1,  3110400, 0x81d5b315
+0,         82,         82,        1,  3110400, 0x6f385e43
+0,         83,         83,        1,  3110400, 0x5959a754
+0,         84,         84,        1,  3110400, 0x1cf4935c
+0,         85,         85,        1,  3110400, 0xc8da3639
+0,         86,         86,        1,  3110400, 0x50a2ee3d
+0,         87,         87,        1,  3110400, 0xd33ad53a
+0,         88,         88,        1,  3110400, 0xe7ed4eff
+0,         89,         89,        1,  3110400, 0x7d72d260
+0,         90,         90,        1,  3110400, 0x16ca295b
+0,         91,         91,        1,  3110400, 0xf126df1d
+0,         92,         92,        1,  3110400, 0x0aca09d1
+0,         93,         93,        1,  3110400, 0x6aefb52b
+0,         94,         94,        1,  3110400, 0xf797ee6d
+0,         95,         95,        1,  3110400, 0xf1053ace
+0,         96,         96,        1,  3110400, 0xf7f91618
+0,         97,         97,        1,  3110400, 0xc711acf8
+0,         98,         98,        1,  3110400, 0x31123f40
+0,         99,         99,        1,  3110400, 0xc7b703dc

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-AMP_F_Hisilicon_3 Added

@@ -0,0 +1,101 @@
+#tb 0: 1/25
+0,          0,          0,        1,  3110400, 0xa5d2b8b0
+0,          1,          1,        1,  3110400, 0x13035cfa
+0,          2,          2,        1,  3110400, 0x96b16f86
+0,          3,          3,        1,  3110400, 0x09e96331
+0,          4,          4,        1,  3110400, 0xd2662da8
+0,          5,          5,        1,  3110400, 0x77d3db00
+0,          6,          6,        1,  3110400, 0xaa025e5b
+0,          7,          7,        1,  3110400, 0x77284bc5
+0,          8,          8,        1,  3110400, 0x625b165e
+0,          9,          9,        1,  3110400, 0x69c0b4c8
+0,         10,         10,        1,  3110400, 0x52e627a4
+0,         11,         11,        1,  3110400, 0x774eaf6a
+0,         12,         12,        1,  3110400, 0xa9042cad
+0,         13,         13,        1,  3110400, 0xf367e96a
+0,         14,         14,        1,  3110400, 0x4687e2d9
+0,         15,         15,        1,  3110400, 0xe57d46b8
+0,         16,         16,        1,  3110400, 0x074da0b5
+0,         17,         17,        1,  3110400, 0xbf8dd856
+0,         18,         18,        1,  3110400, 0xb9cae21e
+0,         19,         19,        1,  3110400, 0xa43687fc
+0,         20,         20,        1,  3110400, 0x83cce559
+0,         21,         21,        1,  3110400, 0xb19963d9
+0,         22,         22,        1,  3110400, 0x636d69b7
+0,         23,         23,        1,  3110400, 0xfcfe1a00
+0,         24,         24,        1,  3110400, 0x0a804c37
+0,         25,         25,        1,  3110400, 0x6af0c5ec
+0,         26,         26,        1,  3110400, 0xccec0692
+0,         27,         27,        1,  3110400, 0x0547e98d
+0,         28,         28,        1,  3110400, 0xc4dc2caa
+0,         29,         29,        1,  3110400, 0x43473ac6
+0,         30,         30,        1,  3110400, 0xd5e9a795
+0,         31,         31,        1,  3110400, 0x3227df7b
+0,         32,         32,        1,  3110400, 0x087e57bb
+0,         33,         33,        1,  3110400, 0x892f5ad0
+0,         34,         34,        1,  3110400, 0xeeb23459
+0,         35,         35,        1,  3110400, 0xd1efe2a6
+0,         36,         36,        1,  3110400, 0x5abd5104
+0,         37,         37,        1,  3110400, 0x6b018b83
+0,         38,         38,        1,  3110400, 0x91617ca7
+0,         39,         39,        1,  3110400, 0x601cd6ad
+0,         40,         40,        1,  3110400, 0xf81cb126
+0,         41,         41,        1,  3110400, 0x4bb949df
+0,         42,         42,        1,  3110400, 0xed94fea0
+0,         43,         43,        1,  3110400, 0x39ba8fec
+0,         44,         44,        1,  3110400, 0xc65e113c
+0,         45,         45,        1,  3110400, 0x627344cb
+0,         46,         46,        1,  3110400, 0x5680c16a
+0,         47,         47,        1,  3110400, 0x12d02cfc
+0,         48,         48,        1,  3110400, 0x2e409afa
+0,         49,         49,        1,  3110400, 0xfd4142f2
+0,         50,         50,        1,  3110400, 0x6db3965a
+0,         51,         51,        1,  3110400, 0x578962c5
+0,         52,         52,        1,  3110400, 0x68d75bd1
+0,         53,         53,        1,  3110400, 0x568fbb72
+0,         54,         54,        1,  3110400, 0xf3c03b95
+0,         55,         55,        1,  3110400, 0xeb67b532
+0,         56,         56,        1,  3110400, 0x0e445b34
+0,         57,         57,        1,  3110400, 0x32c04ad2
+0,         58,         58,        1,  3110400, 0x239d1a14
+0,         59,         59,        1,  3110400, 0xcb295635
+0,         60,         60,        1,  3110400, 0x7e347c1d
+0,         61,         61,        1,  3110400, 0x74e1fcf7
+0,         62,         62,        1,  3110400, 0x6e399603
+0,         63,         63,        1,  3110400, 0xe3bbdbcd
+0,         64,         64,        1,  3110400, 0xddd336f3
+0,         65,         65,        1,  3110400, 0x7834e9f7
+0,         66,         66,        1,  3110400, 0xb53a7f1f
+0,         67,         67,        1,  3110400, 0x1f52cbb6
+0,         68,         68,        1,  3110400, 0xea26692a
+0,         69,         69,        1,  3110400, 0xa4e1765f
+0,         70,         70,        1,  3110400, 0x6367794d
+0,         71,         71,        1,  3110400, 0x69bff6d1
+0,         72,         72,        1,  3110400, 0xdf52ef08
+0,         73,         73,        1,  3110400, 0x002892b7
+0,         74,         74,        1,  3110400, 0x1ca49791
+0,         75,         75,        1,  3110400, 0x8de95d1d
+0,         76,         76,        1,  3110400, 0x9c9c38cf
+0,         77,         77,        1,  3110400, 0x9f9947cd
+0,         78,         78,        1,  3110400, 0xe5da908b
+0,         79,         79,        1,  3110400, 0x032415ae
+0,         80,         80,        1,  3110400, 0x0fef3a03
+0,         81,         81,        1,  3110400, 0xd04c1b77
+0,         82,         82,        1,  3110400, 0x5d46813b
+0,         83,         83,        1,  3110400, 0x1dbeaa76
+0,         84,         84,        1,  3110400, 0x2b2eea1a
+0,         85,         85,        1,  3110400, 0x7138da47
+0,         86,         86,        1,  3110400, 0xe9a43ef8
+0,         87,         87,        1,  3110400, 0x02f7b1bf
+0,         88,         88,        1,  3110400, 0xd1cdf8b1
+0,         89,         89,        1,  3110400, 0x2e924022
+0,         90,         90,        1,  3110400, 0x59d68bcf
+0,         91,         91,        1,  3110400, 0x3dc70503
+0,         92,         92,        1,  3110400, 0x26aeb1fa
+0,         93,         93,        1,  3110400, 0x91434f9d
+0,         94,         94,        1,  3110400, 0x91411f14
+0,         95,         95,        1,  3110400, 0xd99a172a
+0,         96,         96,        1,  3110400, 0x19678f5a
+0,         97,         97,        1,  3110400, 0xc6c357ae
+0,         98,         98,        1,  3110400, 0xba6cd89f
+0,         99,         99,        1,  3110400, 0x657af6cf

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-AMVP_A_MTK_4 Added

@@ -0,0 +1,31 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x88619f80
+0,          1,          1,        1,   149760, 0x550bdaf0
+0,          2,          2,        1,   149760, 0xb769fa4c
+0,          3,          3,        1,   149760, 0x3c2c2e9a
+0,          4,          4,        1,   149760, 0x75316bcc
+0,          5,          5,        1,   149760, 0x7b9ba7ff
+0,          6,          6,        1,   149760, 0x9981ea7b
+0,          7,          7,        1,   149760, 0x3f682105
+0,          8,          8,        1,   149760, 0x63252c25
+0,          9,          9,        1,   149760, 0x44427967
+0,         10,         10,        1,   149760, 0x24199a9e
+0,         11,         11,        1,   149760, 0xaa30c241
+0,         12,         12,        1,   149760, 0xf24faaaf
+0,         13,         13,        1,   149760, 0x0291c766
+0,         14,         14,        1,   149760, 0xb826e44f
+0,         15,         15,        1,   149760, 0xbc2310b8
+0,         16,         16,        1,   149760, 0xcfd81d4a
+0,         17,         17,        1,   149760, 0xb356484a
+0,         18,         18,        1,   149760, 0x02bf515a
+0,         19,         19,        1,   149760, 0x729d778c
+0,         20,         20,        1,   149760, 0x3ade8453
+0,         21,         21,        1,   149760, 0xfedead3d
+0,         22,         22,        1,   149760, 0x46bfc8db
+0,         23,         23,        1,   149760, 0x8590f422
+0,         24,         24,        1,   149760, 0x6d2dfd9d
+0,         25,         25,        1,   149760, 0x373f2c82
+0,         26,         26,        1,   149760, 0xa12f3ca1
+0,         27,         27,        1,   149760, 0x34be4b0d
+0,         28,         28,        1,   149760, 0x24f538b9
+0,         29,         29,        1,   149760, 0xd1616303

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-AMVP_B_MTK_4 Added

@@ -0,0 +1,42 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0xcfffa013
+0,          1,          1,        1,   149760, 0x5166146a
+0,          2,          2,        1,   149760, 0xc3cc318e
+0,          3,          3,        1,   149760, 0x5bb465f9
+0,          4,          4,        1,   149760, 0x10c97bd4
+0,          5,          5,        1,   149760, 0xd9d5c4ab
+0,          6,          6,        1,   149760, 0x5112e11d
+0,          7,          7,        1,   149760, 0xde3803d6
+0,          8,          8,        1,   149760, 0x82c62409
+0,          9,          9,        1,   149760, 0x28f88d53
+0,         10,         10,        1,   149760, 0x796fb89d
+0,         11,         11,        1,   149760, 0x1b95dd75
+0,         12,         12,        1,   149760, 0xfcc9ced4
+0,         13,         13,        1,   149760, 0x6b00ee9c
+0,         14,         14,        1,   149760, 0xdb72e81a
+0,         15,         15,        1,   149760, 0x0c771a25
+0,         16,         16,        1,   149760, 0x959a2215
+0,         17,         17,        1,   149760, 0xf1d672ce
+0,         18,         18,        1,   149760, 0x2f407a06
+0,         19,         19,        1,   149760, 0xee389f83
+0,         20,         20,        1,   149760, 0x2e0695dd
+0,         21,         21,        1,   149760, 0xf80ac1eb
+0,         22,         22,        1,   149760, 0x29decec4
+0,         23,         23,        1,   149760, 0xff34eb5e
+0,         24,         24,        1,   149760, 0x1c85fe71
+0,         25,         25,        1,   149760, 0x056dae51
+0,         26,         26,        1,   149760, 0x78a99f1d
+0,         27,         27,        1,   149760, 0xe507b40c
+0,         28,         28,        1,   149760, 0xbd3fa06c
+0,         29,         29,        1,   149760, 0x3475d95b
+0,         30,         30,        1,   149760, 0x9b25d416
+0,         31,         31,        1,   149760, 0x73c4ec88
+0,         32,         32,        1,   149760, 0xd4437e12
+0,         33,         33,        1,   149760, 0xcf08c736
+0,         34,         34,        1,   149760, 0x0cedd0d6
+0,         35,         35,        1,   149760, 0xc317e9bc
+0,         36,         36,        1,   149760, 0x0dcbd636
+0,         37,         37,        1,   149760, 0x4e6501b0
+0,         38,         38,        1,   149760, 0x5f9c02bb
+0,         39,         39,        1,   149760, 0x43052939
+0,         40,         40,        1,   149760, 0x8ec12318

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-AMVP_C_Samsung_4 Added

@@ -0,0 +1,61 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0x8087662a
+0,          1,          1,        1,   599040, 0x5278d8db
+0,          2,          2,        1,   599040, 0x73c74090
+0,          3,          3,        1,   599040, 0xde0d8317
+0,          4,          4,        1,   599040, 0xd9d4c26c
+0,          5,          5,        1,   599040, 0x603a10bd
+0,          6,          6,        1,   599040, 0xa91e9b91
+0,          7,          7,        1,   599040, 0x73567e6a
+0,          8,          8,        1,   599040, 0x67912cc6
+0,          9,          9,        1,   599040, 0x98d3fb2c
+0,         10,         10,        1,   599040, 0x50c6d7fc
+0,         11,         11,        1,   599040, 0x8ae23020
+0,         12,         12,        1,   599040, 0x9eaa976f
+0,         13,         13,        1,   599040, 0x3cadf6c0
+0,         14,         14,        1,   599040, 0x7d498902
+0,         15,         15,        1,   599040, 0x525decac
+0,         16,         16,        1,   599040, 0x081485cc
+0,         17,         17,        1,   599040, 0x3fd6ba7a
+0,         18,         18,        1,   599040, 0x8bbbaa4c
+0,         19,         19,        1,   599040, 0x9e60a407
+0,         20,         20,        1,   599040, 0x394becb9
+0,         21,         21,        1,   599040, 0x068dffb5
+0,         22,         22,        1,   599040, 0x531fd221
+0,         23,         23,        1,   599040, 0x3aa6922e
+0,         24,         24,        1,   599040, 0x089d2456
+0,         25,         25,        1,   599040, 0x7c432995
+0,         26,         26,        1,   599040, 0x3693613d
+0,         27,         27,        1,   599040, 0x8b6d902f
+0,         28,         28,        1,   599040, 0x7c9a947b
+0,         29,         29,        1,   599040, 0x51d9e4c6
+0,         30,         30,        1,   599040, 0xdc7f62f3
+0,         31,         31,        1,   599040, 0x9da6cba0
+0,         32,         32,        1,   599040, 0x1bef8581
+0,         33,         33,        1,   599040, 0xc19c4211
+0,         34,         34,        1,   599040, 0x7824188e
+0,         35,         35,        1,   599040, 0xd0511050
+0,         36,         36,        1,   599040, 0x39d93e78
+0,         37,         37,        1,   599040, 0x1e0dc88e
+0,         38,         38,        1,   599040, 0x2cd7522e
+0,         39,         39,        1,   599040, 0x538928a5
+0,         40,         40,        1,   599040, 0x95549fb2
+0,         41,         41,        1,   599040, 0x1f57d5c1
+0,         42,         42,        1,   599040, 0xc99fa8c6
+0,         43,         43,        1,   599040, 0x567f4e7e
+0,         44,         44,        1,   599040, 0x23d3d54f
+0,         45,         45,        1,   599040, 0xe8f74d97
+0,         46,         46,        1,   599040, 0xd2b03a4d
+0,         47,         47,        1,   599040, 0xe59c4faf
+0,         48,         48,        1,   599040, 0x46da921d
+0,         49,         49,        1,   599040, 0x7a344fa3
+0,         50,         50,        1,   599040, 0xbc736fd4
+0,         51,         51,        1,   599040, 0xfe5c362c
+0,         52,         52,        1,   599040, 0x115ed271
+0,         53,         53,        1,   599040, 0x3c4913fc
+0,         54,         54,        1,   599040, 0x1e1f8114
+0,         55,         55,        1,   599040, 0x08c06e58
+0,         56,         56,        1,   599040, 0x599f07f6
+0,         57,         57,        1,   599040, 0xc922a0c9
+0,         58,         58,        1,   599040, 0xc77b5201
+0,         59,         59,        1,   599040, 0x4c2cde6d

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-CAINIT_A_SHARP_4 Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0x001f0c48
+0,          1,          1,        1,   599040, 0x83120d87
+0,          2,          2,        1,   599040, 0x10c267aa
+0,          3,          3,        1,   599040, 0xef591aef
+0,          4,          4,        1,   599040, 0xded62c79
+0,          5,          5,        1,   599040, 0xe7c1c748
+0,          6,          6,        1,   599040, 0x14db55d0
+0,          7,          7,        1,   599040, 0x73c4156b
+0,          8,          8,        1,   599040, 0x0cec903c
+0,          9,          9,        1,   599040, 0x791029a0
+0,         10,         10,        1,   599040, 0x0fe72908
+0,         11,         11,        1,   599040, 0xd0ebe0be
+0,         12,         12,        1,   599040, 0x473cb5aa
+0,         13,         13,        1,   599040, 0xe774cf8c
+0,         14,         14,        1,   599040, 0x3d63909f
+0,         15,         15,        1,   599040, 0xe05af465
+0,         16,         16,        1,   599040, 0x9679aa54
+0,         17,         17,        1,   599040, 0xe9d2ef49
+0,         18,         18,        1,   599040, 0x1e797cac
+0,         19,         19,        1,   599040, 0xf3d51077
+0,         20,         20,        1,   599040, 0x74e3b5e0
+0,         21,         21,        1,   599040, 0xb97e5178
+0,         22,         22,        1,   599040, 0x7c79a425
+0,         23,         23,        1,   599040, 0xfeeedb62
+0,         24,         24,        1,   599040, 0x8d5a3686
+0,         25,         25,        1,   599040, 0x3f6109e4
+0,         26,         26,        1,   599040, 0x365df50e
+0,         27,         27,        1,   599040, 0xd65876a1
+0,         28,         28,        1,   599040, 0xfa21e766
+0,         29,         29,        1,   599040, 0x2f24ed68
+0,         30,         30,        1,   599040, 0x0e90e5d4
+0,         31,         31,        1,   599040, 0xd044eb9c
+0,         32,         32,        1,   599040, 0xe55e8b18
+0,         33,         33,        1,   599040, 0xa92b93b6
+0,         34,         34,        1,   599040, 0x9b6827c6
+0,         35,         35,        1,   599040, 0x486e155b
+0,         36,         36,        1,   599040, 0xbff46adc
+0,         37,         37,        1,   599040, 0x61637615
+0,         38,         38,        1,   599040, 0xc0423ea9
+0,         39,         39,        1,   599040, 0xda80f8d8
+0,         40,         40,        1,   599040, 0xe0f77fcc
+0,         41,         41,        1,   599040, 0x68bef4cf
+0,         42,         42,        1,   599040, 0xd2e0699b
+0,         43,         43,        1,   599040, 0xcc6cd663
+0,         44,         44,        1,   599040, 0x00ed2594
+0,         45,         45,        1,   599040, 0x140b6efb
+0,         46,         46,        1,   599040, 0xa418f9d0
+0,         47,         47,        1,   599040, 0x500083a3
+0,         48,         48,        1,   599040, 0x619045ec
+0,         49,         49,        1,   599040, 0xdf0ce1e6

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-CAINIT_B_SHARP_4 Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0x001f0c48
+0,          1,          1,        1,   599040, 0xf8160d82
+0,          2,          2,        1,   599040, 0x5f2060e2
+0,          3,          3,        1,   599040, 0x421104a7
+0,          4,          4,        1,   599040, 0xded62c79
+0,          5,          5,        1,   599040, 0x782b4517
+0,          6,          6,        1,   599040, 0xcf47861d
+0,          7,          7,        1,   599040, 0xd401373c
+0,          8,          8,        1,   599040, 0x0cec903c
+0,          9,          9,        1,   599040, 0x2dec6230
+0,         10,         10,        1,   599040, 0xe8d25791
+0,         11,         11,        1,   599040, 0x243af0ad
+0,         12,         12,        1,   599040, 0x4f77c47b
+0,         13,         13,        1,   599040, 0x9777f7c4
+0,         14,         14,        1,   599040, 0xc5c5be51
+0,         15,         15,        1,   599040, 0xb9b27b63
+0,         16,         16,        1,   599040, 0xc333f76b
+0,         17,         17,        1,   599040, 0x6bd00f09
+0,         18,         18,        1,   599040, 0x7f76875d
+0,         19,         19,        1,   599040, 0xc9e80bec
+0,         20,         20,        1,   599040, 0x8681b48f
+0,         21,         21,        1,   599040, 0xefaa5077
+0,         22,         22,        1,   599040, 0x73cc72a4
+0,         23,         23,        1,   599040, 0x55c8bc27
+0,         24,         24,        1,   599040, 0x9d84419d
+0,         25,         25,        1,   599040, 0x89db2dfe
+0,         26,         26,        1,   599040, 0x39a012fe
+0,         27,         27,        1,   599040, 0x9ae88b01
+0,         28,         28,        1,   599040, 0x0928f3d0
+0,         29,         29,        1,   599040, 0x39359eb1
+0,         30,         30,        1,   599040, 0x3e00a5b5
+0,         31,         31,        1,   599040, 0xaf1b1809
+0,         32,         32,        1,   599040, 0xe55e8b18
+0,         33,         33,        1,   599040, 0xa4739b3d
+0,         34,         34,        1,   599040, 0x224d47d4
+0,         35,         35,        1,   599040, 0x3ce1d830
+0,         36,         36,        1,   599040, 0xd3b33990
+0,         37,         37,        1,   599040, 0x15c3ae0e
+0,         38,         38,        1,   599040, 0xcce735aa
+0,         39,         39,        1,   599040, 0x173d8406
+0,         40,         40,        1,   599040, 0xe0f77fcc
+0,         41,         41,        1,   599040, 0xbeefe9eb
+0,         42,         42,        1,   599040, 0xb3d761cf
+0,         43,         43,        1,   599040, 0x75ffe5f0
+0,         44,         44,        1,   599040, 0xf446226e
+0,         45,         45,        1,   599040, 0xf425475a
+0,         46,         46,        1,   599040, 0x5180ee65
+0,         47,         47,        1,   599040, 0x5edb78f9
+0,         48,         48,        1,   599040, 0x28eb41c5
+0,         49,         49,        1,   599040, 0x0d65d9d3

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-CAINIT_C_SHARP_3 Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0x2b58dee2
+0,          1,          1,        1,   599040, 0x2b58dee2
+0,          2,          2,        1,   599040, 0xcd9295f4
+0,          3,          3,        1,   599040, 0xc052f81f
+0,          4,          4,        1,   599040, 0xfe5932ed
+0,          5,          5,        1,   599040, 0x8a8aa4b9
+0,          6,          6,        1,   599040, 0x6ac33b24
+0,          7,          7,        1,   599040, 0xd053bb83
+0,          8,          8,        1,   599040, 0xa9cf6ba6
+0,          9,          9,        1,   599040, 0x3d5a1a3b
+0,         10,         10,        1,   599040, 0x90997f48
+0,         11,         11,        1,   599040, 0xc99390bd
+0,         12,         12,        1,   599040, 0x9723079d
+0,         13,         13,        1,   599040, 0x7f0fe29b
+0,         14,         14,        1,   599040, 0x778afdb4
+0,         15,         15,        1,   599040, 0x72963905
+0,         16,         16,        1,   599040, 0xa677b29c
+0,         17,         17,        1,   599040, 0x88bdccd8
+0,         18,         18,        1,   599040, 0x8be37199
+0,         19,         19,        1,   599040, 0x6628117a
+0,         20,         20,        1,   599040, 0xefa701b0
+0,         21,         21,        1,   599040, 0x75d6705d
+0,         22,         22,        1,   599040, 0x85242d6f
+0,         23,         23,        1,   599040, 0xd559eaa6
+0,         24,         24,        1,   599040, 0xe0663879
+0,         25,         25,        1,   599040, 0x3255d67c
+0,         26,         26,        1,   599040, 0xf41a4d73
+0,         27,         27,        1,   599040, 0xda630d57
+0,         28,         28,        1,   599040, 0x7b8eec79
+0,         29,         29,        1,   599040, 0x70dff7a6
+0,         30,         30,        1,   599040, 0x4b600806
+0,         31,         31,        1,   599040, 0xdcbbc54d
+0,         32,         32,        1,   599040, 0x7e6e66b4
+0,         33,         33,        1,   599040, 0x645ce246
+0,         34,         34,        1,   599040, 0x03d3117c
+0,         35,         35,        1,   599040, 0x7c3cab88
+0,         36,         36,        1,   599040, 0x5cdaeeef
+0,         37,         37,        1,   599040, 0x4cce6d93
+0,         38,         38,        1,   599040, 0x78c28e4c
+0,         39,         39,        1,   599040, 0x8acbe642
+0,         40,         40,        1,   599040, 0xcd0a39f8
+0,         41,         41,        1,   599040, 0x9c580311
+0,         42,         42,        1,   599040, 0x668eab11
+0,         43,         43,        1,   599040, 0xc76f6206
+0,         44,         44,        1,   599040, 0xe0baf2a2
+0,         45,         45,        1,   599040, 0x430db206
+0,         46,         46,        1,   599040, 0x9c1565ad
+0,         47,         47,        1,   599040, 0xfc302be0
+0,         48,         48,        1,   599040, 0x6ccfc206
+0,         49,         49,        1,   599040, 0x46c7722d

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-CAINIT_D_SHARP_3 Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0x2b58dee2
+0,          1,          1,        1,   599040, 0x2b58dee2
+0,          2,          2,        1,   599040, 0xb055b638
+0,          3,          3,        1,   599040, 0x3e2b06c9
+0,          4,          4,        1,   599040, 0xa0e53610
+0,          5,          5,        1,   599040, 0x5f6eca50
+0,          6,          6,        1,   599040, 0x516e679d
+0,          7,          7,        1,   599040, 0xdbbbf791
+0,          8,          8,        1,   599040, 0x04be5abc
+0,          9,          9,        1,   599040, 0x85283636
+0,         10,         10,        1,   599040, 0x1bcdb857
+0,         11,         11,        1,   599040, 0x258bb8a8
+0,         12,         12,        1,   599040, 0x33340003
+0,         13,         13,        1,   599040, 0xa2cc0dc3
+0,         14,         14,        1,   599040, 0x2b83400f
+0,         15,         15,        1,   599040, 0xf33ba886
+0,         16,         16,        1,   599040, 0x73f43f10
+0,         17,         17,        1,   599040, 0x63ff4628
+0,         18,         18,        1,   599040, 0x41170243
+0,         19,         19,        1,   599040, 0x84f34b72
+0,         20,         20,        1,   599040, 0x4913e415
+0,         21,         21,        1,   599040, 0x38cfaac3
+0,         22,         22,        1,   599040, 0xb2f0650c
+0,         23,         23,        1,   599040, 0xe0d12249
+0,         24,         24,        1,   599040, 0xca931ca0
+0,         25,         25,        1,   599040, 0xfc14d1cb
+0,         26,         26,        1,   599040, 0xb74667d8
+0,         27,         27,        1,   599040, 0xfdc22b8b
+0,         28,         28,        1,   599040, 0x30b425eb
+0,         29,         29,        1,   599040, 0xc31f3b73
+0,         30,         30,        1,   599040, 0xefda0062
+0,         31,         31,        1,   599040, 0x8fe0d742
+0,         32,         32,        1,   599040, 0xdaa54d1d
+0,         33,         33,        1,   599040, 0x2188ae4b
+0,         34,         34,        1,   599040, 0x7ef0f088
+0,         35,         35,        1,   599040, 0xcfd2619f
+0,         36,         36,        1,   599040, 0x3b0fca50
+0,         37,         37,        1,   599040, 0x78746df2
+0,         38,         38,        1,   599040, 0xdc917e1b
+0,         39,         39,        1,   599040, 0xc6cf2732
+0,         40,         40,        1,   599040, 0xdbd2f5f2
+0,         41,         41,        1,   599040, 0x45a8cba3
+0,         42,         42,        1,   599040, 0xe276b712
+0,         43,         43,        1,   599040, 0x36057004
+0,         44,         44,        1,   599040, 0xe0da7e77
+0,         45,         45,        1,   599040, 0x823e7c30
+0,         46,         46,        1,   599040, 0x62c9457a
+0,         47,         47,        1,   599040, 0xf6743a30
+0,         48,         48,        1,   599040, 0x8db4f476
+0,         49,         49,        1,   599040, 0x79537927

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-CAINIT_E_SHARP_3 Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0x1cf21d79
+0,          1,          1,        1,   599040, 0x1cf21d79
+0,          2,          2,        1,   599040, 0xb54ee9e0
+0,          3,          3,        1,   599040, 0x757f33f0
+0,          4,          4,        1,   599040, 0x783e06bc
+0,          5,          5,        1,   599040, 0x73127ae7
+0,          6,          6,        1,   599040, 0x52f86193
+0,          7,          7,        1,   599040, 0x8e8afa2c
+0,          8,          8,        1,   599040, 0x29359620
+0,          9,          9,        1,   599040, 0x23f46fd3
+0,         10,         10,        1,   599040, 0x00c9d47d
+0,         11,         11,        1,   599040, 0xcabcca8d
+0,         12,         12,        1,   599040, 0x02e92d89
+0,         13,         13,        1,   599040, 0x3e97268f
+0,         14,         14,        1,   599040, 0xba6230c2
+0,         15,         15,        1,   599040, 0x4393aa3b
+0,         16,         16,        1,   599040, 0x06b1b9c8
+0,         17,         17,        1,   599040, 0xcc2aa30b
+0,         18,         18,        1,   599040, 0x3e029a11
+0,         19,         19,        1,   599040, 0x0ec1fc36
+0,         20,         20,        1,   599040, 0xd61dd438
+0,         21,         21,        1,   599040, 0xa7b1816b
+0,         22,         22,        1,   599040, 0xa98ef225
+0,         23,         23,        1,   599040, 0x368912ca
+0,         24,         24,        1,   599040, 0x1ae95cbe
+0,         25,         25,        1,   599040, 0x0e01f8ed
+0,         26,         26,        1,   599040, 0x05497937
+0,         27,         27,        1,   599040, 0x735c2420
+0,         28,         28,        1,   599040, 0x0ef80004
+0,         29,         29,        1,   599040, 0xd744091b
+0,         30,         30,        1,   599040, 0x0f3b1576
+0,         31,         31,        1,   599040, 0x24e4fab9
+0,         32,         32,        1,   599040, 0x6b5d7fca
+0,         33,         33,        1,   599040, 0x2afcdaec
+0,         34,         34,        1,   599040, 0x39dfd5b6
+0,         35,         35,        1,   599040, 0xe5844f4e
+0,         36,         36,        1,   599040, 0xf26920d9
+0,         37,         37,        1,   599040, 0x8feb56e2
+0,         38,         38,        1,   599040, 0x6433712f
+0,         39,         39,        1,   599040, 0xba311758
+0,         40,         40,        1,   599040, 0x09f87643
+0,         41,         41,        1,   599040, 0x68562c28
+0,         42,         42,        1,   599040, 0x9465e267
+0,         43,         43,        1,   599040, 0x03e2802f
+0,         44,         44,        1,   599040, 0xa61ed250
+0,         45,         45,        1,   599040, 0x5ab680db
+0,         46,         46,        1,   599040, 0xc4663840
+0,         47,         47,        1,   599040, 0xefe83a4f
+0,         48,         48,        1,   599040, 0x7bfb4ecd
+0,         49,         49,        1,   599040, 0xcafdbfd0

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-CAINIT_F_SHARP_3 Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0x1cf21d79
+0,          1,          1,        1,   599040, 0x1cf21d79
+0,          2,          2,        1,   599040, 0xc182eaa8
+0,          3,          3,        1,   599040, 0x260358ee
+0,          4,          4,        1,   599040, 0x381e5b16
+0,          5,          5,        1,   599040, 0x329dacd8
+0,          6,          6,        1,   599040, 0x7306d51c
+0,          7,          7,        1,   599040, 0x869d359b
+0,          8,          8,        1,   599040, 0xf8fc941a
+0,          9,          9,        1,   599040, 0x0798842b
+0,         10,         10,        1,   599040, 0xe6e1f54e
+0,         11,         11,        1,   599040, 0xc7d5ba9e
+0,         12,         12,        1,   599040, 0xc8c5507a
+0,         13,         13,        1,   599040, 0x97ae604a
+0,         14,         14,        1,   599040, 0x14dd4139
+0,         15,         15,        1,   599040, 0xb2f998dc
+0,         16,         16,        1,   599040, 0xc3a3a6bc
+0,         17,         17,        1,   599040, 0x1f95be77
+0,         18,         18,        1,   599040, 0xb7fd124b
+0,         19,         19,        1,   599040, 0x25703b3c
+0,         20,         20,        1,   599040, 0x3bddeba7
+0,         21,         21,        1,   599040, 0xffcc9b6d
+0,         22,         22,        1,   599040, 0x3dd66a0a
+0,         23,         23,        1,   599040, 0xe9607af7
+0,         24,         24,        1,   599040, 0x218cdc65
+0,         25,         25,        1,   599040, 0x88f97761
+0,         26,         26,        1,   599040, 0x62e1f5d4
+0,         27,         27,        1,   599040, 0xcc3cd429
+0,         28,         28,        1,   599040, 0xb4290272
+0,         29,         29,        1,   599040, 0x4f73142c
+0,         30,         30,        1,   599040, 0x753eefd9
+0,         31,         31,        1,   599040, 0xea77e837
+0,         32,         32,        1,   599040, 0xfa927e55
+0,         33,         33,        1,   599040, 0x3dff1295
+0,         34,         34,        1,   599040, 0x513c2088
+0,         35,         35,        1,   599040, 0x9822b7f0
+0,         36,         36,        1,   599040, 0xc4770af6
+0,         37,         37,        1,   599040, 0x7cb576fb
+0,         38,         38,        1,   599040, 0x2af8ca3a
+0,         39,         39,        1,   599040, 0x0a324910
+0,         40,         40,        1,   599040, 0x1aeb3d7a
+0,         41,         41,        1,   599040, 0x82de1408
+0,         42,         42,        1,   599040, 0x7ebad7f4
+0,         43,         43,        1,   599040, 0xd100bcc1
+0,         44,         44,        1,   599040, 0x4719dc40
+0,         45,         45,        1,   599040, 0xd82f658b
+0,         46,         46,        1,   599040, 0x8c596a54
+0,         47,         47,        1,   599040, 0xd0b4572c
+0,         48,         48,        1,   599040, 0xdc3c5a89
+0,         49,         49,        1,   599040, 0x4f0ad888

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-CAINIT_G_SHARP_3 Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0xd9b73cbe
+0,          1,          1,        1,   599040, 0xd9b73cbe
+0,          2,          2,        1,   599040, 0xe4e5dd7c
+0,          3,          3,        1,   599040, 0xa7333d7e
+0,          4,          4,        1,   599040, 0x6b82552b
+0,          5,          5,        1,   599040, 0x4f02e2a4
+0,          6,          6,        1,   599040, 0x8fdcc50a
+0,          7,          7,        1,   599040, 0x2481542d
+0,          8,          8,        1,   599040, 0x73d0dfad
+0,          9,          9,        1,   599040, 0x842b8cd2
+0,         10,         10,        1,   599040, 0x87b3a3b2
+0,         11,         11,        1,   599040, 0xe4decf78
+0,         12,         12,        1,   599040, 0xfba7dd51
+0,         13,         13,        1,   599040, 0x3dc1e85c
+0,         14,         14,        1,   599040, 0xea8a4987
+0,         15,         15,        1,   599040, 0xa3cc5c8c
+0,         16,         16,        1,   599040, 0x10a09cd8
+0,         17,         17,        1,   599040, 0x6739c5f7
+0,         18,         18,        1,   599040, 0x819af14a
+0,         19,         19,        1,   599040, 0xe9d65a5c
+0,         20,         20,        1,   599040, 0x09def54e
+0,         21,         21,        1,   599040, 0x8595aa5d
+0,         22,         22,        1,   599040, 0xc3f134d7
+0,         23,         23,        1,   599040, 0xdac9496a
+0,         24,         24,        1,   599040, 0x760f0897
+0,         25,         25,        1,   599040, 0x8daddaf5
+0,         26,         26,        1,   599040, 0xed313947
+0,         27,         27,        1,   599040, 0xc875ed4d
+0,         28,         28,        1,   599040, 0xdb5d0b3b
+0,         29,         29,        1,   599040, 0x7cbc0e6a
+0,         30,         30,        1,   599040, 0x193bbc9f
+0,         31,         31,        1,   599040, 0x4f20d599
+0,         32,         32,        1,   599040, 0x09e545e8
+0,         33,         33,        1,   599040, 0x0637d524
+0,         34,         34,        1,   599040, 0x11a3bd85
+0,         35,         35,        1,   599040, 0x304155ce
+0,         36,         36,        1,   599040, 0x6636291b
+0,         37,         37,        1,   599040, 0xc4039e80
+0,         38,         38,        1,   599040, 0xd73ca756
+0,         39,         39,        1,   599040, 0x96a68426
+0,         40,         40,        1,   599040, 0xd945391c
+0,         41,         41,        1,   599040, 0x95a83264
+0,         42,         42,        1,   599040, 0x6356a243
+0,         43,         43,        1,   599040, 0xb9b8973e
+0,         44,         44,        1,   599040, 0xf361d0d9
+0,         45,         45,        1,   599040, 0x2783b0e2
+0,         46,         46,        1,   599040, 0x870ac424
+0,         47,         47,        1,   599040, 0xa8397c01
+0,         48,         48,        1,   599040, 0xf1bc2ac0
+0,         49,         49,        1,   599040, 0x82fbb428

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-CAINIT_H_SHARP_3 Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0xd9b73cbe
+0,          1,          1,        1,   599040, 0xd9b73cbe
+0,          2,          2,        1,   599040, 0x93a3fabf
+0,          3,          3,        1,   599040, 0x245a522e
+0,          4,          4,        1,   599040, 0xff1e8bb4
+0,          5,          5,        1,   599040, 0x03390b9a
+0,          6,          6,        1,   599040, 0x27030635
+0,          7,          7,        1,   599040, 0x431c6312
+0,          8,          8,        1,   599040, 0xeddc5f83
+0,          9,          9,        1,   599040, 0x34168a1e
+0,         10,         10,        1,   599040, 0xf4d795a4
+0,         11,         11,        1,   599040, 0xe716ea67
+0,         12,         12,        1,   599040, 0xf3b8446d
+0,         13,         13,        1,   599040, 0x082d12d0
+0,         14,         14,        1,   599040, 0x68e12e99
+0,         15,         15,        1,   599040, 0x3fd079df
+0,         16,         16,        1,   599040, 0x6087fb37
+0,         17,         17,        1,   599040, 0x12c2142e
+0,         18,         18,        1,   599040, 0xb3bcf682
+0,         19,         19,        1,   599040, 0xcec84ee7
+0,         20,         20,        1,   599040, 0x12a4fb43
+0,         21,         21,        1,   599040, 0x85749580
+0,         22,         22,        1,   599040, 0x6df99536
+0,         23,         23,        1,   599040, 0x377282a6
+0,         24,         24,        1,   599040, 0xe296f874
+0,         25,         25,        1,   599040, 0x1b29cd1a
+0,         26,         26,        1,   599040, 0x1cf633c9
+0,         27,         27,        1,   599040, 0xf8cd2544
+0,         28,         28,        1,   599040, 0x61c05325
+0,         29,         29,        1,   599040, 0x87646c89
+0,         30,         30,        1,   599040, 0x5b840711
+0,         31,         31,        1,   599040, 0x5bc4c181
+0,         32,         32,        1,   599040, 0x91ce695a
+0,         33,         33,        1,   599040, 0xed54dcca
+0,         34,         34,        1,   599040, 0xc41fef8e
+0,         35,         35,        1,   599040, 0x9da8830b
+0,         36,         36,        1,   599040, 0xb76cec12
+0,         37,         37,        1,   599040, 0xef9661f0
+0,         38,         38,        1,   599040, 0xe1d38227
+0,         39,         39,        1,   599040, 0xce440134
+0,         40,         40,        1,   599040, 0x41a54dd1
+0,         41,         41,        1,   599040, 0xdd83da8e
+0,         42,         42,        1,   599040, 0xf9cee595
+0,         43,         43,        1,   599040, 0x6f5db54d
+0,         44,         44,        1,   599040, 0x00b6f064
+0,         45,         45,        1,   599040, 0xfbaa978d
+0,         46,         46,        1,   599040, 0x2c9ee1d7
+0,         47,         47,        1,   599040, 0xe8c4be1f
+0,         48,         48,        1,   599040, 0x132a260f
+0,         49,         49,        1,   599040, 0x8571a213

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-CIP_A_Panasonic_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-CIP_C_Panasonic_2 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-DBLK_A_MAIN10_VIXS_2 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-DBLK_A_SONY_3 Added

@@ -0,0 +1,31 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0x154e6dd9
+0,          2,          2,        1,   599040, 0xcce25693
+0,          3,          3,        1,   599040, 0x3dd84e88
+0,          4,          4,        1,   599040, 0xca197027
+0,          5,          5,        1,   599040, 0xc9af0241
+0,          6,          6,        1,   599040, 0x510470de
+0,          7,          7,        1,   599040, 0xac8c0a7c
+0,          8,          8,        1,   599040, 0x04cbed5e
+0,          9,          9,        1,   599040, 0x514ce2f1
+0,         10,         10,        1,   599040, 0xf37a4eec
+0,         11,         11,        1,   599040, 0xabfd7f2f
+0,         12,         12,        1,   599040, 0x944458a1
+0,         13,         13,        1,   599040, 0xf4f81db2
+0,         14,         14,        1,   599040, 0xdde236fb
+0,         15,         15,        1,   599040, 0x6b0132be
+0,         16,         16,        1,   599040, 0x641683a3
+0,         17,         17,        1,   599040, 0x81d6be90
+0,         18,         18,        1,   599040, 0xf1e04e55
+0,         19,         19,        1,   599040, 0x63c4dc0a
+0,         20,         20,        1,   599040, 0x47170db8
+0,         21,         21,        1,   599040, 0xdc22f27b
+0,         22,         22,        1,   599040, 0xd5b63800
+0,         23,         23,        1,   599040, 0x07b76936
+0,         24,         24,        1,   599040, 0x5215eee2
+0,         25,         25,        1,   599040, 0xb5b2c9b1
+0,         26,         26,        1,   599040, 0x79bee732
+0,         27,         27,        1,   599040, 0x14c1f436
+0,         28,         28,        1,   599040, 0x384f7f05
+0,         29,         29,        1,   599040, 0x44229c42
+0,         30,         30,        1,   599040, 0x5dea88e9

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-DBLK_B_SONY_3 Added

@@ -0,0 +1,31 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0xda0cb5d4
+0,          2,          2,        1,   599040, 0x352bc397
+0,          3,          3,        1,   599040, 0x72bc28fe
+0,          4,          4,        1,   599040, 0x22294f68
+0,          5,          5,        1,   599040, 0x1f6415a7
+0,          6,          6,        1,   599040, 0xa9f6b0d7
+0,          7,          7,        1,   599040, 0x6b7c1f2d
+0,          8,          8,        1,   599040, 0xb93857f5
+0,          9,          9,        1,   599040, 0xb0d752d3
+0,         10,         10,        1,   599040, 0x0622e689
+0,         11,         11,        1,   599040, 0x23d8780a
+0,         12,         12,        1,   599040, 0x4844581b
+0,         13,         13,        1,   599040, 0x791322f9
+0,         14,         14,        1,   599040, 0x82f6cf43
+0,         15,         15,        1,   599040, 0xcace3aba
+0,         16,         16,        1,   599040, 0x68a68427
+0,         17,         17,        1,   599040, 0x23fa500a
+0,         18,         18,        1,   599040, 0x7d78b77d
+0,         19,         19,        1,   599040, 0x8d295032
+0,         20,         20,        1,   599040, 0x16fa266c
+0,         21,         21,        1,   599040, 0x37d8173b
+0,         22,         22,        1,   599040, 0x8a4f90e1
+0,         23,         23,        1,   599040, 0x40f98f6d
+0,         24,         24,        1,   599040, 0xc060b193
+0,         25,         25,        1,   599040, 0xa53c3bc1
+0,         26,         26,        1,   599040, 0x5a9556d6
+0,         27,         27,        1,   599040, 0x37582393
+0,         28,         28,        1,   599040, 0x376acd14
+0,         29,         29,        1,   599040, 0x81ee1e64
+0,         30,         30,        1,   599040, 0xff2a600c

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-DBLK_C_SONY_3 Added

@@ -0,0 +1,31 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0x57369bf4
+0,          2,          2,        1,   599040, 0x319aab9c
+0,          3,          3,        1,   599040, 0xbc1b7698
+0,          4,          4,        1,   599040, 0x05cea248
+0,          5,          5,        1,   599040, 0xdca73743
+0,          6,          6,        1,   599040, 0x5b5a9f70
+0,          7,          7,        1,   599040, 0x16c51b34
+0,          8,          8,        1,   599040, 0x734fe724
+0,          9,          9,        1,   599040, 0x48e4e0ba
+0,         10,         10,        1,   599040, 0xf1423cc1
+0,         11,         11,        1,   599040, 0xb4bb68b1
+0,         12,         12,        1,   599040, 0x54a77ad6
+0,         13,         13,        1,   599040, 0x6e0dfce3
+0,         14,         14,        1,   599040, 0x7ca687e3
+0,         15,         15,        1,   599040, 0xf9ac2443
+0,         16,         16,        1,   599040, 0xe35b8d34
+0,         17,         17,        1,   599040, 0xef4bbe9f
+0,         18,         18,        1,   599040, 0x21eb418e
+0,         19,         19,        1,   599040, 0xae6df30f
+0,         20,         20,        1,   599040, 0x743500af
+0,         21,         21,        1,   599040, 0x7fba1ce1
+0,         22,         22,        1,   599040, 0x45793eae
+0,         23,         23,        1,   599040, 0x1f7e3467
+0,         24,         24,        1,   599040, 0x7400c7c3
+0,         25,         25,        1,   599040, 0xcf79806d
+0,         26,         26,        1,   599040, 0x324ea91d
+0,         27,         27,        1,   599040, 0x9c8cae92
+0,         28,         28,        1,   599040, 0x70bfc368
+0,         29,         29,        1,   599040, 0x46a0f8ff
+0,         30,         30,        1,   599040, 0xd864208a

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-DBLK_D_VIXS_1 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-DBLK_D_VIXS_2 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-DBLK_E_VIXS_1 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-DBLK_E_VIXS_2 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-DBLK_F_VIXS_1 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-DBLK_F_VIXS_2 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-DBLK_G_VIXS_1 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-DBLK_G_VIXS_2 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3 Added

@@ -0,0 +1,31 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0x7ea9597c
+0,          2,          2,        1,   599040, 0x3e7365e4
+0,          3,          3,        1,   599040, 0x4a9149c9
+0,          4,          4,        1,   599040, 0x3b1f6549
+0,          5,          5,        1,   599040, 0x3e35f616
+0,          6,          6,        1,   599040, 0x843c7951
+0,          7,          7,        1,   599040, 0xa2adb299
+0,          8,          8,        1,   599040, 0xb9dda682
+0,          9,          9,        1,   599040, 0x9a5e7355
+0,         10,         10,        1,   599040, 0xc4bafa8c
+0,         11,         11,        1,   599040, 0xc4ec160e
+0,         12,         12,        1,   599040, 0x538421a3
+0,         13,         13,        1,   599040, 0xb294a96e
+0,         14,         14,        1,   599040, 0x9bb217df
+0,         15,         15,        1,   599040, 0xbe70c870
+0,         16,         16,        1,   599040, 0xa4e319a8
+0,         17,         17,        1,   599040, 0x3a4c702d
+0,         18,         18,        1,   599040, 0x9f790906
+0,         19,         19,        1,   599040, 0xbbfdb8d6
+0,         20,         20,        1,   599040, 0x0965c0ed
+0,         21,         21,        1,   599040, 0x6993e1f1
+0,         22,         22,        1,   599040, 0xc1cc1df9
+0,         23,         23,        1,   599040, 0xe570c390
+0,         24,         24,        1,   599040, 0x422f6fd7
+0,         25,         25,        1,   599040, 0x9c89298c
+0,         26,         26,        1,   599040, 0x5ece4193
+0,         27,         27,        1,   599040, 0x142a4f2f
+0,         28,         28,        1,   599040, 0xa5356c63
+0,         29,         29,        1,   599040, 0x8458a378
+0,         30,         30,        1,   599040, 0xc149ed56

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3 Added

@@ -0,0 +1,31 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0xcb2969c5
+0,          2,          2,        1,   599040, 0xd9825d1f
+0,          3,          3,        1,   599040, 0x5ff4245a
+0,          4,          4,        1,   599040, 0xd34e7bcb
+0,          5,          5,        1,   599040, 0x032e1b8b
+0,          6,          6,        1,   599040, 0x5ba1873c
+0,          7,          7,        1,   599040, 0xa0b725ad
+0,          8,          8,        1,   599040, 0x9cade6a6
+0,          9,          9,        1,   599040, 0xe41bee5a
+0,         10,         10,        1,   599040, 0x9de4340f
+0,         11,         11,        1,   599040, 0xb966282a
+0,         12,         12,        1,   599040, 0x52fd5300
+0,         13,         13,        1,   599040, 0x8e6d6753
+0,         14,         14,        1,   599040, 0x2011759b
+0,         15,         15,        1,   599040, 0x5da5b7af
+0,         16,         16,        1,   599040, 0x090e298c
+0,         17,         17,        1,   599040, 0xfd618263
+0,         18,         18,        1,   599040, 0xdaf4ef69
+0,         19,         19,        1,   599040, 0x0349d1a0
+0,         20,         20,        1,   599040, 0x75a35caf
+0,         21,         21,        1,   599040, 0x4544918e
+0,         22,         22,        1,   599040, 0xbca15836
+0,         23,         23,        1,   599040, 0x443bc611
+0,         24,         24,        1,   599040, 0xc380beaf
+0,         25,         25,        1,   599040, 0x01a581ca
+0,         26,         26,        1,   599040, 0x1690835f
+0,         27,         27,        1,   599040, 0x871e9c3b
+0,         28,         28,        1,   599040, 0xf4c20a25
+0,         29,         29,        1,   599040, 0x86d8f2df
+0,         30,         30,        1,   599040, 0x7690bd56

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-DSLICE_A_HHI_5 Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,  3110400, 0xdc18cd12
+0,          1,          1,        1,  3110400, 0x42f7020d
+0,          2,          2,        1,  3110400, 0x6ac4421a
+0,          3,          3,        1,  3110400, 0xdbf78c86
+0,          4,          4,        1,  3110400, 0x123f9c50
+0,          5,          5,        1,  3110400, 0x9356a73f
+0,          6,          6,        1,  3110400, 0xc54a446b
+0,          7,          7,        1,  3110400, 0xdfa92401
+0,          8,          8,        1,  3110400, 0xd3226c6a
+0,          9,          9,        1,  3110400, 0xa0bd149a
+0,         10,         10,        1,  3110400, 0xc38c58cc
+0,         11,         11,        1,  3110400, 0xf1871f13
+0,         12,         12,        1,  3110400, 0xfdf151d5
+0,         13,         13,        1,  3110400, 0x65ca7286
+0,         14,         14,        1,  3110400, 0xac2d80dc
+0,         15,         15,        1,  3110400, 0x3e024908
+0,         16,         16,        1,  3110400, 0x22a66454
+0,         17,         17,        1,  3110400, 0x83b6cac8
+0,         18,         18,        1,  3110400, 0xe1bccc50
+0,         19,         19,        1,  3110400, 0x76be567e
+0,         20,         20,        1,  3110400, 0x743c4335
+0,         21,         21,        1,  3110400, 0xd3d28565
+0,         22,         22,        1,  3110400, 0x2ab3a5a2
+0,         23,         23,        1,  3110400, 0x9141f68e
+0,         24,         24,        1,  3110400, 0xe90fac3b
+0,         25,         25,        1,  3110400, 0xdc8e496d
+0,         26,         26,        1,  3110400, 0x4ea216b9
+0,         27,         27,        1,  3110400, 0xd1f8a08e
+0,         28,         28,        1,  3110400, 0x2b512b98
+0,         29,         29,        1,  3110400, 0x6af060b6
+0,         30,         30,        1,  3110400, 0x69389c02
+0,         31,         31,        1,  3110400, 0x7a8cef2f
+0,         32,         32,        1,  3110400, 0x8f5bd7eb
+0,         33,         33,        1,  3110400, 0x3960d741
+0,         34,         34,        1,  3110400, 0x86c2c23b
+0,         35,         35,        1,  3110400, 0x6d0d258a
+0,         36,         36,        1,  3110400, 0xaff6795b
+0,         37,         37,        1,  3110400, 0x97b9cb1e
+0,         38,         38,        1,  3110400, 0x5966d391
+0,         39,         39,        1,  3110400, 0xb9c90726
+0,         40,         40,        1,  3110400, 0x3ab5836d
+0,         41,         41,        1,  3110400, 0xcc3c95e7
+0,         42,         42,        1,  3110400, 0x190df1ce
+0,         43,         43,        1,  3110400, 0x64e6f266
+0,         44,         44,        1,  3110400, 0x98dfdcdd
+0,         45,         45,        1,  3110400, 0xd8889aff
+0,         46,         46,        1,  3110400, 0x969775b8
+0,         47,         47,        1,  3110400, 0x8f3dec20
+0,         48,         48,        1,  3110400, 0xbd2b80ca
+0,         49,         49,        1,  3110400, 0x68baa6f7

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-DSLICE_B_HHI_5 Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,  3110400, 0x96995c57
+0,          1,          1,        1,  3110400, 0x2924a10f
+0,          2,          2,        1,  3110400, 0x892e146c
+0,          3,          3,        1,  3110400, 0x9b0b8733
+0,          4,          4,        1,  3110400, 0xb09ffc2d
+0,          5,          5,        1,  3110400, 0x588e04a0
+0,          6,          6,        1,  3110400, 0xa9ed178c
+0,          7,          7,        1,  3110400, 0x54254788
+0,          8,          8,        1,  3110400, 0x4fa444bc
+0,          9,          9,        1,  3110400, 0xe97d958a
+0,         10,         10,        1,  3110400, 0x8e168461
+0,         11,         11,        1,  3110400, 0xc39e551f
+0,         12,         12,        1,  3110400, 0xb5649a69
+0,         13,         13,        1,  3110400, 0x64eb3085
+0,         14,         14,        1,  3110400, 0xb4485019
+0,         15,         15,        1,  3110400, 0x989e4c47
+0,         16,         16,        1,  3110400, 0x0ff21984
+0,         17,         17,        1,  3110400, 0xe81b3ddd
+0,         18,         18,        1,  3110400, 0x6404610f
+0,         19,         19,        1,  3110400, 0xa61c3403
+0,         20,         20,        1,  3110400, 0x033ca068
+0,         21,         21,        1,  3110400, 0x3513dff4
+0,         22,         22,        1,  3110400, 0xe903a3c2
+0,         23,         23,        1,  3110400, 0xd40b3248
+0,         24,         24,        1,  3110400, 0xa257fb35
+0,         25,         25,        1,  3110400, 0x6fcab221
+0,         26,         26,        1,  3110400, 0x079a34c7
+0,         27,         27,        1,  3110400, 0x7308ecbc
+0,         28,         28,        1,  3110400, 0x1cf2dffb
+0,         29,         29,        1,  3110400, 0x59a0a84d
+0,         30,         30,        1,  3110400, 0x6b76450f
+0,         31,         31,        1,  3110400, 0x27de01f3
+0,         32,         32,        1,  3110400, 0x8541fe8b
+0,         33,         33,        1,  3110400, 0x07b740d9
+0,         34,         34,        1,  3110400, 0x735d36e9
+0,         35,         35,        1,  3110400, 0x0336ac98
+0,         36,         36,        1,  3110400, 0xab9f7d33
+0,         37,         37,        1,  3110400, 0xc5f62e67
+0,         38,         38,        1,  3110400, 0x68d6c250
+0,         39,         39,        1,  3110400, 0xaf26c339
+0,         40,         40,        1,  3110400, 0xfa920d0f
+0,         41,         41,        1,  3110400, 0xac9c6a89
+0,         42,         42,        1,  3110400, 0xa0d0cbd0
+0,         43,         43,        1,  3110400, 0x9d517b81
+0,         44,         44,        1,  3110400, 0x3c3b2b89
+0,         45,         45,        1,  3110400, 0x3cf50b0c
+0,         46,         46,        1,  3110400, 0xee319ebe
+0,         47,         47,        1,  3110400, 0x5b7c3397
+0,         48,         48,        1,  3110400, 0x1a089921
+0,         49,         49,        1,  3110400, 0x69718487

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-DSLICE_C_HHI_5 Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,  3110400, 0x62a2ceab
+0,          1,          1,        1,  3110400, 0x5e4d6adc
+0,          2,          2,        1,  3110400, 0x4ad0955d
+0,          3,          3,        1,  3110400, 0x17fd7b7c
+0,          4,          4,        1,  3110400, 0xe8270ac1
+0,          5,          5,        1,  3110400, 0xbc32bf86
+0,          6,          6,        1,  3110400, 0x13cc365c
+0,          7,          7,        1,  3110400, 0xef503eb5
+0,          8,          8,        1,  3110400, 0xcc9506f4
+0,          9,          9,        1,  3110400, 0xdc213a9e
+0,         10,         10,        1,  3110400, 0xe567c736
+0,         11,         11,        1,  3110400, 0x0a79aad4
+0,         12,         12,        1,  3110400, 0x61773cff
+0,         13,         13,        1,  3110400, 0x2e93a037
+0,         14,         14,        1,  3110400, 0xf419a7bf
+0,         15,         15,        1,  3110400, 0xa57b06bf
+0,         16,         16,        1,  3110400, 0x6e94960a
+0,         17,         17,        1,  3110400, 0x11f22564
+0,         18,         18,        1,  3110400, 0x850e5f7c
+0,         19,         19,        1,  3110400, 0xdfad06af
+0,         20,         20,        1,  3110400, 0xf2912aee
+0,         21,         21,        1,  3110400, 0x57e1c391
+0,         22,         22,        1,  3110400, 0xc8976a8f
+0,         23,         23,        1,  3110400, 0x88fb8b68
+0,         24,         24,        1,  3110400, 0xbe0e314b
+0,         25,         25,        1,  3110400, 0x33ae23f8
+0,         26,         26,        1,  3110400, 0x4db83c5c
+0,         27,         27,        1,  3110400, 0xa5f71a9d
+0,         28,         28,        1,  3110400, 0x34bb4f19
+0,         29,         29,        1,  3110400, 0xb1fee8d9
+0,         30,         30,        1,  3110400, 0x369990b7
+0,         31,         31,        1,  3110400, 0x6bfdbd4a
+0,         32,         32,        1,  3110400, 0x709dd60d
+0,         33,         33,        1,  3110400, 0x4213781c
+0,         34,         34,        1,  3110400, 0x7810dadd
+0,         35,         35,        1,  3110400, 0x1bc02bc6
+0,         36,         36,        1,  3110400, 0x760ed4aa
+0,         37,         37,        1,  3110400, 0xe2b45e4d
+0,         38,         38,        1,  3110400, 0x517b8d0a
+0,         39,         39,        1,  3110400, 0xf145ed7e
+0,         40,         40,        1,  3110400, 0xd8cbc454
+0,         41,         41,        1,  3110400, 0xa80f26f7
+0,         42,         42,        1,  3110400, 0x340a418d
+0,         43,         43,        1,  3110400, 0x5a0f7264
+0,         44,         44,        1,  3110400, 0xf2936a6d
+0,         45,         45,        1,  3110400, 0x841e715b
+0,         46,         46,        1,  3110400, 0xb17e4131
+0,         47,         47,        1,  3110400, 0x40e3ba7b
+0,         48,         48,        1,  3110400, 0x610254f7
+0,         49,         49,        1,  3110400, 0x76aa8b44

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-ENTP_A_LG_2 Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0x866449d5
+0,          1,          1,        1,   599040, 0x6a8919f0
+0,          2,          2,        1,   599040, 0x5bec3742
+0,          3,          3,        1,   599040, 0x0e66f78b
+0,          4,          4,        1,   599040, 0x798e543b
+0,          5,          5,        1,   599040, 0x342467e0
+0,          6,          6,        1,   599040, 0x2cb393e1
+0,          7,          7,        1,   599040, 0x2f326539
+0,          8,          8,        1,   599040, 0x8ac6eb6a
+0,          9,          9,        1,   599040, 0x810a887b
+0,         10,         10,        1,   599040, 0x4feb2d60
+0,         11,         11,        1,   599040, 0xd32165ff
+0,         12,         12,        1,   599040, 0x46e505e1
+0,         13,         13,        1,   599040, 0x2d917014
+0,         14,         14,        1,   599040, 0xb504f112
+0,         15,         15,        1,   599040, 0x0fca37ce
+0,         16,         16,        1,   599040, 0x2d5a269d
+0,         17,         17,        1,   599040, 0x3928ef6d
+0,         18,         18,        1,   599040, 0x94397312
+0,         19,         19,        1,   599040, 0xc1c1257b
+0,         20,         20,        1,   599040, 0x4e23adcc
+0,         21,         21,        1,   599040, 0x3eaef1e0
+0,         22,         22,        1,   599040, 0x5e66fa14
+0,         23,         23,        1,   599040, 0x2adfa0c2
+0,         24,         24,        1,   599040, 0xf888db90
+0,         25,         25,        1,   599040, 0xab3a6418
+0,         26,         26,        1,   599040, 0x7689d0a2
+0,         27,         27,        1,   599040, 0x2f5746bf
+0,         28,         28,        1,   599040, 0xad2cf3da
+0,         29,         29,        1,   599040, 0x32f2854e
+0,         30,         30,        1,   599040, 0xb73cf7db
+0,         31,         31,        1,   599040, 0xbe996991
+0,         32,         32,        1,   599040, 0xe66501c8
+0,         33,         33,        1,   599040, 0x12d1bc13
+0,         34,         34,        1,   599040, 0x06e103d5
+0,         35,         35,        1,   599040, 0x49af0680
+0,         36,         36,        1,   599040, 0xdbf128b0
+0,         37,         37,        1,   599040, 0xa1ac770d
+0,         38,         38,        1,   599040, 0x99156429
+0,         39,         39,        1,   599040, 0x8ce1a9a7
+0,         40,         40,        1,   599040, 0x14067700
+0,         41,         41,        1,   599040, 0xcdedccee
+0,         42,         42,        1,   599040, 0x09c12765
+0,         43,         43,        1,   599040, 0x7979a1be
+0,         44,         44,        1,   599040, 0xbd3148d1
+0,         45,         45,        1,   599040, 0xc83f9aac
+0,         46,         46,        1,   599040, 0x91acbae4
+0,         47,         47,        1,   599040, 0xd230907a
+0,         48,         48,        1,   599040, 0x3f6c31f6
+0,         49,         49,        1,   599040, 0x84496e55

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-ENTP_B_LG_2 Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0x95a24137
+0,          1,          1,        1,   599040, 0x7d7f2b75
+0,          2,          2,        1,   599040, 0xd9fb2120
+0,          3,          3,        1,   599040, 0x14d50590
+0,          4,          4,        1,   599040, 0xe3d1b70e
+0,          5,          5,        1,   599040, 0x57708a86
+0,          6,          6,        1,   599040, 0xae56a720
+0,          7,          7,        1,   599040, 0x74c18679
+0,          8,          8,        1,   599040, 0x6422d2a7
+0,          9,          9,        1,   599040, 0xf587702b
+0,         10,         10,        1,   599040, 0x0f630fe0
+0,         11,         11,        1,   599040, 0x4e3537dd
+0,         12,         12,        1,   599040, 0xa645e9c1
+0,         13,         13,        1,   599040, 0x35ab4155
+0,         14,         14,        1,   599040, 0x4b78ba34
+0,         15,         15,        1,   599040, 0xa9a9e572
+0,         16,         16,        1,   599040, 0x6d57f10f
+0,         17,         17,        1,   599040, 0xffb8e333
+0,         18,         18,        1,   599040, 0x7b2d6319
+0,         19,         19,        1,   599040, 0xcf3319aa
+0,         20,         20,        1,   599040, 0xb0d097ee
+0,         21,         21,        1,   599040, 0xf042f780
+0,         22,         22,        1,   599040, 0xfafafdcb
+0,         23,         23,        1,   599040, 0xc8c1c452
+0,         24,         24,        1,   599040, 0x83c4d488
+0,         25,         25,        1,   599040, 0x81a8fd08
+0,         26,         26,        1,   599040, 0x2cb0c333
+0,         27,         27,        1,   599040, 0xa7bf4e52
+0,         28,         28,        1,   599040, 0x5b7ed8e9
+0,         29,         29,        1,   599040, 0x4ff03464
+0,         30,         30,        1,   599040, 0x54a700c2
+0,         31,         31,        1,   599040, 0x7dbb63aa
+0,         32,         32,        1,   599040, 0xda26288e
+0,         33,         33,        1,   599040, 0x8074da41
+0,         34,         34,        1,   599040, 0xa32b2ab2
+0,         35,         35,        1,   599040, 0x51b457fb
+0,         36,         36,        1,   599040, 0x05e34953
+0,         37,         37,        1,   599040, 0x68c762d6
+0,         38,         38,        1,   599040, 0x11bf469e
+0,         39,         39,        1,   599040, 0xc2fdadaf
+0,         40,         40,        1,   599040, 0x05588da0
+0,         41,         41,        1,   599040, 0x8855f927
+0,         42,         42,        1,   599040, 0x11c85d5a
+0,         43,         43,        1,   599040, 0x7a0aede5
+0,         44,         44,        1,   599040, 0x39dc4f7d
+0,         45,         45,        1,   599040, 0x388f81d6
+0,         46,         46,        1,   599040, 0x2afa830d
+0,         47,         47,        1,   599040, 0xd7f26886
+0,         48,         48,        1,   599040, 0xb8e12aef
+0,         49,         49,        1,   599040, 0x73f7582c

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-ENTP_C_LG_3 Added

@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,  3110400, 0xaea1c3d6
+0,          1,          1,        1,  3110400, 0x665b4f52
+0,          2,          2,        1,  3110400, 0xc7da58a2
+0,          3,          3,        1,  3110400, 0x1dda6461
+0,          4,          4,        1,  3110400, 0x1d8d6eaf
+0,          5,          5,        1,  3110400, 0x7a29911a
+0,          6,          6,        1,  3110400, 0x0dce92c9
+0,          7,          7,        1,  3110400, 0x79c84570
+0,          8,          8,        1,  3110400, 0x736ef1e7
+0,          9,          9,        1,  3110400, 0x9dd86492
+0,         10,         10,        1,  3110400, 0x0ea31a1b
+0,         11,         11,        1,  3110400, 0x0d84fdc8
+0,         12,         12,        1,  3110400, 0x06ed89a7
+0,         13,         13,        1,  3110400, 0xfaea4fd6
+0,         14,         14,        1,  3110400, 0xe787abe8
+0,         15,         15,        1,  3110400, 0x050b653a
+0,         16,         16,        1,  3110400, 0x35cc1ec1
+0,         17,         17,        1,  3110400, 0x86a43e07
+0,         18,         18,        1,  3110400, 0xa6ab021e
+0,         19,         19,        1,  3110400, 0x491e0efa
+0,         20,         20,        1,  3110400, 0x8f210c38
+0,         21,         21,        1,  3110400, 0x637af0d0
+0,         22,         22,        1,  3110400, 0x47a59197
+0,         23,         23,        1,  3110400, 0x53e04637
+0,         24,         24,        1,  3110400, 0x7b99325e
+0,         25,         25,        1,  3110400, 0x972aa252
+0,         26,         26,        1,  3110400, 0xe76ef917
+0,         27,         27,        1,  3110400, 0x7a25babc
+0,         28,         28,        1,  3110400, 0x3bee3c5c
+0,         29,         29,        1,  3110400, 0xbae82bcb
+0,         30,         30,        1,  3110400, 0x5b65c1e5
+0,         31,         31,        1,  3110400, 0xa546266f
+0,         32,         32,        1,  3110400, 0x5c5b9b8e
+0,         33,         33,        1,  3110400, 0xec29c804
+0,         34,         34,        1,  3110400, 0x384efc7d
+0,         35,         35,        1,  3110400, 0x6c1aaa23
+0,         36,         36,        1,  3110400, 0x55494f9f
+0,         37,         37,        1,  3110400, 0xa9c56fec
+0,         38,         38,        1,  3110400, 0x49c29ef2
+0,         39,         39,        1,  3110400, 0xac24fdd4
+0,         40,         40,        1,  3110400, 0x403d8213
+0,         41,         41,        1,  3110400, 0xf2d8aefe
+0,         42,         42,        1,  3110400, 0x2884f0e1
+0,         43,         43,        1,  3110400, 0x69a0a781
+0,         44,         44,        1,  3110400, 0x3ab6114c
+0,         45,         45,        1,  3110400, 0x1d4425a2
+0,         46,         46,        1,  3110400, 0x59f8970a
+0,         47,         47,        1,  3110400, 0xfe0a05a9
+0,         48,         48,        1,  3110400, 0x50b9be4f
+0,         49,         49,        1,  3110400, 0x3e1b65bd

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-EXT_A_ericsson_4 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-IPRED_A_docomo_2 Added

@@ -0,0 +1,21 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0xac658d10
+0,          1,          1,        1,   599040, 0xe3f65389
+0,          2,          2,        1,   599040, 0xfbd644b0
+0,          3,          3,        1,   599040, 0x3ac49569
+0,          4,          4,        1,   599040, 0x75abc5e2
+0,          5,          5,        1,   599040, 0xe787ddcd
+0,          6,          6,        1,   599040, 0x1df5f293
+0,          7,          7,        1,   599040, 0xa87774aa
+0,          8,          8,        1,   599040, 0x42b2bec6
+0,          9,          9,        1,   599040, 0x89f22378
+0,         10,         10,        1,   599040, 0x0d4e5397
+0,         11,         11,        1,   599040, 0xf4430d13
+0,         12,         12,        1,   599040, 0xfd2ff520
+0,         13,         13,        1,   599040, 0x21bf374b
+0,         14,         14,        1,   599040, 0xcba1032e
+0,         15,         15,        1,   599040, 0x58247f24
+0,         16,         16,        1,   599040, 0x7985788a
+0,         17,         17,        1,   599040, 0x3306488e
+0,         18,         18,        1,   599040, 0x8bcbf22e
+0,         19,         19,        1,   599040, 0xb7a7ae5c

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-IPRED_B_Nokia_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-IPRED_C_Mitsubishi_2 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-LS_A_Orange_2 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-LS_B_ORANGE_4 Added

@@ -0,0 +1,26 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0x25267761
+0,          1,          1,        1,   599040, 0x4b4b6846
+0,          2,          2,        1,   599040, 0x78e251e8
+0,          3,          3,        1,   599040, 0xd5b261b0
+0,          4,          4,        1,   599040, 0x2c4cf4e1
+0,          5,          5,        1,   599040, 0x67dc648f
+0,          6,          6,        1,   599040, 0x3c43bffc
+0,          7,          7,        1,   599040, 0x43dca917
+0,          8,          8,        1,   599040, 0x86c9915e
+0,          9,          9,        1,   599040, 0xcfc4f95c
+0,         10,         10,        1,   599040, 0x1ad40bab
+0,         11,         11,        1,   599040, 0x88b5419e
+0,         12,         12,        1,   599040, 0x94e89a06
+0,         13,         13,        1,   599040, 0x3c68f4a6
+0,         14,         14,        1,   599040, 0xc573ac93
+0,         15,         15,        1,   599040, 0x3c401779
+0,         16,         16,        1,   599040, 0x33358319
+0,         17,         17,        1,   599040, 0xbecb022e
+0,         18,         18,        1,   599040, 0x824ca6c1
+0,         19,         19,        1,   599040, 0x9d13a2b8
+0,         20,         20,        1,   599040, 0xbdd4b44b
+0,         21,         21,        1,   599040, 0x7e43e7e9
+0,         22,         22,        1,   599040, 0x88c39a97
+0,         23,         23,        1,   599040, 0xe0462f05
+0,         24,         24,        1,   599040, 0xc5651fd1

libav-v10.1.tar.bz2/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

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-MAXBINS_A_TI_4 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-MAXBINS_B_TI_4 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-MAXBINS_C_TI_4 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-MERGE_A_TI_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-MERGE_B_TI_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-MERGE_C_TI_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-MERGE_D_TI_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-MERGE_E_TI_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-MERGE_F_MTK_4 Added

@@ -0,0 +1,42 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0xcfffa013
+0,          1,          1,        1,   149760, 0xec800e71
+0,          2,          2,        1,   149760, 0x9fb014c7
+0,          3,          3,        1,   149760, 0xfd7a48a8
+0,          4,          4,        1,   149760, 0x99816bb5
+0,          5,          5,        1,   149760, 0x8645acaa
+0,          6,          6,        1,   149760, 0xd2a8e04b
+0,          7,          7,        1,   149760, 0xf96f038d
+0,          8,          8,        1,   149760, 0x82c62409
+0,          9,          9,        1,   149760, 0x64907b29
+0,         10,         10,        1,   149760, 0xfe29990e
+0,         11,         11,        1,   149760, 0xce2dc52d
+0,         12,         12,        1,   149760, 0x164fb2c5
+0,         13,         13,        1,   149760, 0xbcf8ca2d
+0,         14,         14,        1,   149760, 0xe59dc9bc
+0,         15,         15,        1,   149760, 0x2ab10400
+0,         16,         16,        1,   149760, 0xef111c81
+0,         17,         17,        1,   149760, 0xd08466b1
+0,         18,         18,        1,   149760, 0x6d356ff0
+0,         19,         19,        1,   149760, 0x16a59175
+0,         20,         20,        1,   149760, 0xd7888866
+0,         21,         21,        1,   149760, 0x2b22b943
+0,         22,         22,        1,   149760, 0x3b4fc3fe
+0,         23,         23,        1,   149760, 0x4ec8ee47
+0,         24,         24,        1,   149760, 0x0126f17b
+0,         25,         25,        1,   149760, 0x1176ad14
+0,         26,         26,        1,   149760, 0x2d4da75f
+0,         27,         27,        1,   149760, 0x144bb9e4
+0,         28,         28,        1,   149760, 0x5176a21b
+0,         29,         29,        1,   149760, 0x5e3fe673
+0,         30,         30,        1,   149760, 0xa533db65
+0,         31,         31,        1,   149760, 0x3009f3f8
+0,         32,         32,        1,   149760, 0xd4437e12
+0,         33,         33,        1,   149760, 0x5b03cd64
+0,         34,         34,        1,   149760, 0xdc40d49b
+0,         35,         35,        1,   149760, 0xf8cef0f6
+0,         36,         36,        1,   149760, 0x241be1b7
+0,         37,         37,        1,   149760, 0x23830404
+0,         38,         38,        1,   149760, 0x6ef7087e
+0,         39,         39,        1,   149760, 0xaf351e5b
+0,         40,         40,        1,   149760, 0x4cf40a64

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-MERGE_G_HHI_4 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-MVCLIP_A_qualcomm_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-MVDL1ZERO_A_docomo_3 Added

@@ -0,0 +1,501 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0x9b27dc7d
+0,          1,          1,        1,   599040, 0x796cdd26
+0,          2,          2,        1,   599040, 0xd3c9dca9
+0,          3,          3,        1,   599040, 0xf7b2876a
+0,          4,          4,        1,   599040, 0x296701c8
+0,          5,          5,        1,   599040, 0xf9a80f9a
+0,          6,          6,        1,   599040, 0x7cbe9656
+0,          7,          7,        1,   599040, 0x17093be8
+0,          8,          8,        1,   599040, 0x2a0e196e
+0,          9,          9,        1,   599040, 0x3492c809
+0,         10,         10,        1,   599040, 0xbc5523f3
+0,         11,         11,        1,   599040, 0xf618ff66
+0,         12,         12,        1,   599040, 0x07060c9d
+0,         13,         13,        1,   599040, 0xd5a8fb5d
+0,         14,         14,        1,   599040, 0x780e18b9
+0,         15,         15,        1,   599040, 0xff553fbd
+0,         16,         16,        1,   599040, 0x715cce2d
+0,         17,         17,        1,   599040, 0x8a834c19
+0,         18,         18,        1,   599040, 0xbc4a0c21
+0,         19,         19,        1,   599040, 0xc85fed31
+0,         20,         20,        1,   599040, 0xcbb97b56
+0,         21,         21,        1,   599040, 0x518111dd
+0,         22,         22,        1,   599040, 0x5a680f48
+0,         23,         23,        1,   599040, 0x02956f28
+0,         24,         24,        1,   599040, 0x10845ef6
+0,         25,         25,        1,   599040, 0x2ad3c6d7
+0,         26,         26,        1,   599040, 0xa9f725e9
+0,         27,         27,        1,   599040, 0xb835f470
+0,         28,         28,        1,   599040, 0x693bf01d
+0,         29,         29,        1,   599040, 0x50bf3b77
+0,         30,         30,        1,   599040, 0x304873e3
+0,         31,         31,        1,   599040, 0x707a6af9
+0,         32,         32,        1,   599040, 0x50bf2017
+0,         33,         33,        1,   599040, 0x2c583f11
+0,         34,         34,        1,   599040, 0xe738080b
+0,         35,         35,        1,   599040, 0x549984e6
+0,         36,         36,        1,   599040, 0xa22e8a96
+0,         37,         37,        1,   599040, 0xc9f222cd
+0,         38,         38,        1,   599040, 0x28d944bc
+0,         39,         39,        1,   599040, 0x2e366350
+0,         40,         40,        1,   599040, 0xbcc2eb12
+0,         41,         41,        1,   599040, 0x074d3fdd
+0,         42,         42,        1,   599040, 0x0e0bd820
+0,         43,         43,        1,   599040, 0xf078af68
+0,         44,         44,        1,   599040, 0xaeed7222
+0,         45,         45,        1,   599040, 0xb66100cd
+0,         46,         46,        1,   599040, 0x848cd1c5
+0,         47,         47,        1,   599040, 0xa6bf930c
+0,         48,         48,        1,   599040, 0x32501b56
+0,         49,         49,        1,   599040, 0x2498d992
+0,         50,         50,        1,   599040, 0x03481b78
+0,         51,         51,        1,   599040, 0x551d7c11
+0,         52,         52,        1,   599040, 0xfbdc629d
+0,         53,         53,        1,   599040, 0x1f438ded
+0,         54,         54,        1,   599040, 0x4d25ce07
+0,         55,         55,        1,   599040, 0x4fe8f8aa
+0,         56,         56,        1,   599040, 0x5d65d790
+0,         57,         57,        1,   599040, 0xfcba4efb
+0,         58,         58,        1,   599040, 0x50b483a3
+0,         59,         59,        1,   599040, 0x12fd4b31
+0,         60,         60,        1,   599040, 0x71014417
+0,         61,         61,        1,   599040, 0xeed88bc4
+0,         62,         62,        1,   599040, 0xb2d4710d
+0,         63,         63,        1,   599040, 0xbe4dfe69
+0,         64,         64,        1,   599040, 0x9b7844b6
+0,         65,         65,        1,   599040, 0xe2e691bf
+0,         66,         66,        1,   599040, 0xb24200dc
+0,         67,         67,        1,   599040, 0xf29cb5bf
+0,         68,         68,        1,   599040, 0x90350310
+0,         69,         69,        1,   599040, 0xbe1cc3c1
+0,         70,         70,        1,   599040, 0xaae58f97
+0,         71,         71,        1,   599040, 0x0d5cb388
+0,         72,         72,        1,   599040, 0x0fa734e3
+0,         73,         73,        1,   599040, 0xaa41543a
+0,         74,         74,        1,   599040, 0x3e6e1d4b
+0,         75,         75,        1,   599040, 0x6426e543
+0,         76,         76,        1,   599040, 0xe65ad058
+0,         77,         77,        1,   599040, 0xf7f1744d
+0,         78,         78,        1,   599040, 0xa8fa32da
+0,         79,         79,        1,   599040, 0xa2c80e49
+0,         80,         80,        1,   599040, 0x22b972e9
+0,         81,         81,        1,   599040, 0x2462823b
+0,         82,         82,        1,   599040, 0xa7fd0432
+0,         83,         83,        1,   599040, 0x38d22ea4
+0,         84,         84,        1,   599040, 0xb472f4d6
+0,         85,         85,        1,   599040, 0x36c107a0
+0,         86,         86,        1,   599040, 0x9abb5ce0
+0,         87,         87,        1,   599040, 0x74b2861c
+0,         88,         88,        1,   599040, 0xba3d04d3
+0,         89,         89,        1,   599040, 0x65132373
+0,         90,         90,        1,   599040, 0x63585754
+0,         91,         91,        1,   599040, 0xa6c0f4d4
+0,         92,         92,        1,   599040, 0xc2cf9c33
+0,         93,         93,        1,   599040, 0xdf6d16af
+0,         94,         94,        1,   599040, 0x94566b11
+0,         95,         95,        1,   599040, 0x8070818d
+0,         96,         96,        1,   599040, 0x4acc92c1
+0,         97,         97,        1,   599040, 0xb520033c
+0,         98,         98,        1,   599040, 0xc82e7058
+0,         99,         99,        1,   599040, 0xb23367bc
+0,        100,        100,        1,   599040, 0x1fa25586
+0,        101,        101,        1,   599040, 0x2b2abbb8
+0,        102,        102,        1,   599040, 0xb9b74546
+0,        103,        103,        1,   599040, 0x4c4a2ef9
+0,        104,        104,        1,   599040, 0x5eb54025
+0,        105,        105,        1,   599040, 0x1e1cbcc6
+0,        106,        106,        1,   599040, 0xc3bf1017
+0,        107,        107,        1,   599040, 0xdbda1761
+0,        108,        108,        1,   599040, 0x19241b7c
+0,        109,        109,        1,   599040, 0x791dda93
+0,        110,        110,        1,   599040, 0x444a152f
+0,        111,        111,        1,   599040, 0x0b69d08b
+0,        112,        112,        1,   599040, 0xd024abae
+0,        113,        113,        1,   599040, 0x724e0d78
+0,        114,        114,        1,   599040, 0x648f9c09
+0,        115,        115,        1,   599040, 0xee114298
+0,        116,        116,        1,   599040, 0x92d1e98f
+0,        117,        117,        1,   599040, 0xb623cb10
+0,        118,        118,        1,   599040, 0xf8e9b414
+0,        119,        119,        1,   599040, 0xe47a0981
+0,        120,        120,        1,   599040, 0xdc78d28d
+0,        121,        121,        1,   599040, 0xd36d9ad5
+0,        122,        122,        1,   599040, 0xe7bea48e
+0,        123,        123,        1,   599040, 0x0dd39d1d
+0,        124,        124,        1,   599040, 0xb66a18ee
+0,        125,        125,        1,   599040, 0x6085d265
+0,        126,        126,        1,   599040, 0xb9ef646b
+0,        127,        127,        1,   599040, 0x544140a4
+0,        128,        128,        1,   599040, 0x9c546327
+0,        129,        129,        1,   599040, 0xd74d4a8e
+0,        130,        130,        1,   599040, 0x98a504e0
+0,        131,        131,        1,   599040, 0x88849351
+0,        132,        132,        1,   599040, 0xa519f6c7
+0,        133,        133,        1,   599040, 0xc548df7f
+0,        134,        134,        1,   599040, 0x8e690444
+0,        135,        135,        1,   599040, 0x5edbdced
+0,        136,        136,        1,   599040, 0xd3e189c2
+0,        137,        137,        1,   599040, 0x286d44a2
+0,        138,        138,        1,   599040, 0xe946f83e
+0,        139,        139,        1,   599040, 0xdc94ae6d
+0,        140,        140,        1,   599040, 0x5d4e95dc
+0,        141,        141,        1,   599040, 0x2c03280f
+0,        142,        142,        1,   599040, 0x368c6b23
+0,        143,        143,        1,   599040, 0x2fc5d2ee
+0,        144,        144,        1,   599040, 0x85e8f3ec
+0,        145,        145,        1,   599040, 0xd1fdcf69
+0,        146,        146,        1,   599040, 0xa663cf5a
+0,        147,        147,        1,   599040, 0x5d644057
+0,        148,        148,        1,   599040, 0xfdd039e0
+0,        149,        149,        1,   599040, 0x9cdb6369
+0,        150,        150,        1,   599040, 0x3c4ca86b
+0,        151,        151,        1,   599040, 0x27ac4d91
+0,        152,        152,        1,   599040, 0x3f13a8bb
+0,        153,        153,        1,   599040, 0xbcd984c5
+0,        154,        154,        1,   599040, 0xa55eb124
+0,        155,        155,        1,   599040, 0xb09c4a47
+0,        156,        156,        1,   599040, 0x0da7fd48
+0,        157,        157,        1,   599040, 0xa01dc374
+0,        158,        158,        1,   599040, 0xe428b3b0
+0,        159,        159,        1,   599040, 0xff3fcc43
+0,        160,        160,        1,   599040, 0xbc5491c1
+0,        161,        161,        1,   599040, 0x34e51a66
+0,        162,        162,        1,   599040, 0xb63f5acd
+0,        163,        163,        1,   599040, 0xe12f417d
+0,        164,        164,        1,   599040, 0x789bb191
+0,        165,        165,        1,   599040, 0x5fdeaa57
+0,        166,        166,        1,   599040, 0x65034250
+0,        167,        167,        1,   599040, 0xab577632
+0,        168,        168,        1,   599040, 0x1338c7eb
+0,        169,        169,        1,   599040, 0x5a84b078
+0,        170,        170,        1,   599040, 0x9f3fd6c2
+0,        171,        171,        1,   599040, 0x23cd7f3f
+0,        172,        172,        1,   599040, 0x43701c5c
+0,        173,        173,        1,   599040, 0x72eff5aa
+0,        174,        174,        1,   599040, 0x858a7280
+0,        175,        175,        1,   599040, 0x5d1da2b1
+0,        176,        176,        1,   599040, 0x2b6fae7b
+0,        177,        177,        1,   599040, 0x3d96cd3f
+0,        178,        178,        1,   599040, 0x5d6d48e5
+0,        179,        179,        1,   599040, 0x829023ee
+0,        180,        180,        1,   599040, 0xeafa5127
+0,        181,        181,        1,   599040, 0x1adf2830
+0,        182,        182,        1,   599040, 0x35f07617
+0,        183,        183,        1,   599040, 0x7aa691e2
+0,        184,        184,        1,   599040, 0xd11b3ed2
+0,        185,        185,        1,   599040, 0x69c12b52
+0,        186,        186,        1,   599040, 0x34fb8557
+0,        187,        187,        1,   599040, 0xd06c84ff
+0,        188,        188,        1,   599040, 0x26338170
+0,        189,        189,        1,   599040, 0x3d24f1e9
+0,        190,        190,        1,   599040, 0x28a99f46
+0,        191,        191,        1,   599040, 0x22421eea
+0,        192,        192,        1,   599040, 0xc53b57eb
+0,        193,        193,        1,   599040, 0x752433b8
+0,        194,        194,        1,   599040, 0x6332eaaa
+0,        195,        195,        1,   599040, 0x559d273f
+0,        196,        196,        1,   599040, 0xe9811056
+0,        197,        197,        1,   599040, 0x61acf706
+0,        198,        198,        1,   599040, 0x3893c930
+0,        199,        199,        1,   599040, 0x5d6d3f58
+0,        200,        200,        1,   599040, 0xb645df35
+0,        201,        201,        1,   599040, 0x6af7f2eb
+0,        202,        202,        1,   599040, 0xeb456cc5
+0,        203,        203,        1,   599040, 0x32abac64
+0,        204,        204,        1,   599040, 0x1327da04
+0,        205,        205,        1,   599040, 0x73ca53b9
+0,        206,        206,        1,   599040, 0xe940d23e
+0,        207,        207,        1,   599040, 0xc6fdf611
+0,        208,        208,        1,   599040, 0xc72e4309
+0,        209,        209,        1,   599040, 0xecab46a1
+0,        210,        210,        1,   599040, 0xb248b91e
+0,        211,        211,        1,   599040, 0xe9aeb62c
+0,        212,        212,        1,   599040, 0x5827cf39
+0,        213,        213,        1,   599040, 0x763a74d6
+0,        214,        214,        1,   599040, 0x232e397c
+0,        215,        215,        1,   599040, 0xe2ef8213
+0,        216,        216,        1,   599040, 0xddcbe94f
+0,        217,        217,        1,   599040, 0xe8a8919a
+0,        218,        218,        1,   599040, 0x5860fae0
+0,        219,        219,        1,   599040, 0x525b1a95
+0,        220,        220,        1,   599040, 0x50e36027
+0,        221,        221,        1,   599040, 0xd05ee599
+0,        222,        222,        1,   599040, 0xc1e7b87b
+0,        223,        223,        1,   599040, 0x2edfa52c
+0,        224,        224,        1,   599040, 0xca147244
+0,        225,        225,        1,   599040, 0x9e0a77b7
+0,        226,        226,        1,   599040, 0x88ac8035
+0,        227,        227,        1,   599040, 0xe34c890a
+0,        228,        228,        1,   599040, 0xbe4feadd
+0,        229,        229,        1,   599040, 0xd5a7503d
+0,        230,        230,        1,   599040, 0xae18e82d
+0,        231,        231,        1,   599040, 0x66cf3881
+0,        232,        232,        1,   599040, 0x9f08a65c
+0,        233,        233,        1,   599040, 0xeb3e1a58
+0,        234,        234,        1,   599040, 0x2b83004a
+0,        235,        235,        1,   599040, 0x65be32c9
+0,        236,        236,        1,   599040, 0x231586fa
+0,        237,        237,        1,   599040, 0x7e5724fb
+0,        238,        238,        1,   599040, 0xfebe47b6
+0,        239,        239,        1,   599040, 0xfeeb9a38
+0,        240,        240,        1,   599040, 0x44e90683
+0,        241,        241,        1,   599040, 0x546d03f4
+0,        242,        242,        1,   599040, 0x211a534e
+0,        243,        243,        1,   599040, 0x12d2a800
+0,        244,        244,        1,   599040, 0xa6022d19
+0,        245,        245,        1,   599040, 0x6bedd152
+0,        246,        246,        1,   599040, 0x6f7de80b
+0,        247,        247,        1,   599040, 0x778f0771
+0,        248,        248,        1,   599040, 0xe63e4241
+0,        249,        249,        1,   599040, 0xa0298023
+0,        250,        250,        1,   599040, 0xc4c5b8b2
+0,        251,        251,        1,   599040, 0xcca64f1c
+0,        252,        252,        1,   599040, 0xfec4d1a0
+0,        253,        253,        1,   599040, 0xcb7c4b80
+0,        254,        254,        1,   599040, 0x0795f7b7
+0,        255,        255,        1,   599040, 0x5f45706c
+0,        256,        256,        1,   599040, 0x927f04d8
+0,        257,        257,        1,   599040, 0x4c201f08
+0,        258,        258,        1,   599040, 0xdb447b37
+0,        259,        259,        1,   599040, 0xae33725e
+0,        260,        260,        1,   599040, 0x474281af
+0,        261,        261,        1,   599040, 0xe198764e
+0,        262,        262,        1,   599040, 0xb226916f
+0,        263,        263,        1,   599040, 0x8a7156a5
+0,        264,        264,        1,   599040, 0x5fe639ab
+0,        265,        265,        1,   599040, 0xaa62b79e
+0,        266,        266,        1,   599040, 0x94618e23
+0,        267,        267,        1,   599040, 0x47ba12f0
+0,        268,        268,        1,   599040, 0xd33c215e
+0,        269,        269,        1,   599040, 0x581e0537
+0,        270,        270,        1,   599040, 0x19dce924
+0,        271,        271,        1,   599040, 0x95329055
+0,        272,        272,        1,   599040, 0x6d2eb80f
+0,        273,        273,        1,   599040, 0x11d5e940
+0,        274,        274,        1,   599040, 0x30aec978
+0,        275,        275,        1,   599040, 0xd742df04
+0,        276,        276,        1,   599040, 0xef9ef4ae
+0,        277,        277,        1,   599040, 0x51d8fb34
+0,        278,        278,        1,   599040, 0xbb6e070a
+0,        279,        279,        1,   599040, 0x785a9813
+0,        280,        280,        1,   599040, 0xb94d8771
+0,        281,        281,        1,   599040, 0x8bd2fe53
+0,        282,        282,        1,   599040, 0x6b600868
+0,        283,        283,        1,   599040, 0x4b1d6a6f
+0,        284,        284,        1,   599040, 0x974f6365
+0,        285,        285,        1,   599040, 0xebefa21d
+0,        286,        286,        1,   599040, 0x8ce62dad
+0,        287,        287,        1,   599040, 0x7a6e6e1b
+0,        288,        288,        1,   599040, 0x3746d218
+0,        289,        289,        1,   599040, 0xc1aa50d9
+0,        290,        290,        1,   599040, 0xda60f976
+0,        291,        291,        1,   599040, 0x98274aa8
+0,        292,        292,        1,   599040, 0xdf09c760
+0,        293,        293,        1,   599040, 0xeb485b8f
+0,        294,        294,        1,   599040, 0xad76453b
+0,        295,        295,        1,   599040, 0x6eaee19a
+0,        296,        296,        1,   599040, 0x464e9cc8
+0,        297,        297,        1,   599040, 0xccd0bd12
+0,        298,        298,        1,   599040, 0xc7345e2b
+0,        299,        299,        1,   599040, 0xe51dd0a9
+0,        300,        300,        1,   599040, 0x11b9586b
+0,        301,        301,        1,   599040, 0xcb2c85b8
+0,        302,        302,        1,   599040, 0x024ce62d
+0,        303,        303,        1,   599040, 0x8c1da4eb
+0,        304,        304,        1,   599040, 0x9924ed3f
+0,        305,        305,        1,   599040, 0xc8f89a61
+0,        306,        306,        1,   599040, 0x52db38f2
+0,        307,        307,        1,   599040, 0xf1baca44
+0,        308,        308,        1,   599040, 0x8d1b322e
+0,        309,        309,        1,   599040, 0x5e8a990e
+0,        310,        310,        1,   599040, 0xfe281b7c
+0,        311,        311,        1,   599040, 0x065ced47
+0,        312,        312,        1,   599040, 0x962087db
+0,        313,        313,        1,   599040, 0x2e932805
+0,        314,        314,        1,   599040, 0x9a4b4946
+0,        315,        315,        1,   599040, 0x504bea02
+0,        316,        316,        1,   599040, 0xff97cf64
+0,        317,        317,        1,   599040, 0xcca9a61c
+0,        318,        318,        1,   599040, 0x1ab70ff5
+0,        319,        319,        1,   599040, 0x99ed2919
+0,        320,        320,        1,   599040, 0xa02f40d2
+0,        321,        321,        1,   599040, 0x8a1d83c2
+0,        322,        322,        1,   599040, 0xaacec6c2
+0,        323,        323,        1,   599040, 0x4f6fe261
+0,        324,        324,        1,   599040, 0x1dde4745
+0,        325,        325,        1,   599040, 0xa17bdf95
+0,        326,        326,        1,   599040, 0xcb5b56b3
+0,        327,        327,        1,   599040, 0x7088cdd4
+0,        328,        328,        1,   599040, 0xca02bafb
+0,        329,        329,        1,   599040, 0x3c5ca543
+0,        330,        330,        1,   599040, 0x4ab80de3
+0,        331,        331,        1,   599040, 0x75edb57b
+0,        332,        332,        1,   599040, 0x772ef858
+0,        333,        333,        1,   599040, 0xd7fa8d9f
+0,        334,        334,        1,   599040, 0xbc515acc
+0,        335,        335,        1,   599040, 0xb1b66d54
+0,        336,        336,        1,   599040, 0x40290b6a
+0,        337,        337,        1,   599040, 0xd1ff952e
+0,        338,        338,        1,   599040, 0x5641abf7
+0,        339,        339,        1,   599040, 0x3411e0fd
+0,        340,        340,        1,   599040, 0xed4abbaf
+0,        341,        341,        1,   599040, 0x34d40ea4
+0,        342,        342,        1,   599040, 0xa9983db0
+0,        343,        343,        1,   599040, 0x58dc8d9a
+0,        344,        344,        1,   599040, 0x24a989a2
+0,        345,        345,        1,   599040, 0xc9d1dcdd
+0,        346,        346,        1,   599040, 0x6df3031f
+0,        347,        347,        1,   599040, 0xa67339d9
+0,        348,        348,        1,   599040, 0x545b3ed1
+0,        349,        349,        1,   599040, 0xb4d98187
+0,        350,        350,        1,   599040, 0xdd2f8588
+0,        351,        351,        1,   599040, 0x2aee5737
+0,        352,        352,        1,   599040, 0xe7c90c87
+0,        353,        353,        1,   599040, 0xb547f0bc
+0,        354,        354,        1,   599040, 0x69cc594a
+0,        355,        355,        1,   599040, 0xa01adf9c
+0,        356,        356,        1,   599040, 0x77021bc9
+0,        357,        357,        1,   599040, 0x1cd7e74b
+0,        358,        358,        1,   599040, 0x4d284292
+0,        359,        359,        1,   599040, 0xe57fd832
+0,        360,        360,        1,   599040, 0x76992cf7
+0,        361,        361,        1,   599040, 0x88156158
+0,        362,        362,        1,   599040, 0xc872db18
+0,        363,        363,        1,   599040, 0xc0487bf4
+0,        364,        364,        1,   599040, 0x9f3aab7b
+0,        365,        365,        1,   599040, 0xfddd1c86
+0,        366,        366,        1,   599040, 0x2a991cff
+0,        367,        367,        1,   599040, 0x97e3623f
+0,        368,        368,        1,   599040, 0x69e5900a
+0,        369,        369,        1,   599040, 0x7a5167ec
+0,        370,        370,        1,   599040, 0x74bf045a
+0,        371,        371,        1,   599040, 0x5b2c1554
+0,        372,        372,        1,   599040, 0xc7e9c2e1
+0,        373,        373,        1,   599040, 0x9d76e364
+0,        374,        374,        1,   599040, 0x2c365ed8
+0,        375,        375,        1,   599040, 0x3b7bb213
+0,        376,        376,        1,   599040, 0x00a34fa9
+0,        377,        377,        1,   599040, 0x0a82f6b8
+0,        378,        378,        1,   599040, 0x34f8cf6b
+0,        379,        379,        1,   599040, 0x283a256f
+0,        380,        380,        1,   599040, 0x89dfe63a
+0,        381,        381,        1,   599040, 0x757c7bc3
+0,        382,        382,        1,   599040, 0xbcbf4f4a
+0,        383,        383,        1,   599040, 0x45fe93d3
+0,        384,        384,        1,   599040, 0xa93c4724
+0,        385,        385,        1,   599040, 0x25862ef7
+0,        386,        386,        1,   599040, 0xff94b8eb
+0,        387,        387,        1,   599040, 0x9d350c21
+0,        388,        388,        1,   599040, 0x90d6cce5
+0,        389,        389,        1,   599040, 0x5c3e51c8
+0,        390,        390,        1,   599040, 0x8f966096
+0,        391,        391,        1,   599040, 0xddc8ad04
+0,        392,        392,        1,   599040, 0xb64a170a
+0,        393,        393,        1,   599040, 0xfb8fa0c6
+0,        394,        394,        1,   599040, 0x99fa48dc
+0,        395,        395,        1,   599040, 0xd62e9344
+0,        396,        396,        1,   599040, 0x55ff8d51
+0,        397,        397,        1,   599040, 0x1e9809bd
+0,        398,        398,        1,   599040, 0x00f0122d
+0,        399,        399,        1,   599040, 0x5af2911e
+0,        400,        400,        1,   599040, 0xbfcd6c1d
+0,        401,        401,        1,   599040, 0xd809c652
+0,        402,        402,        1,   599040, 0xee36969a
+0,        403,        403,        1,   599040, 0x9c0ed842
+0,        404,        404,        1,   599040, 0x4e07a2b0
+0,        405,        405,        1,   599040, 0xa5b3202b
+0,        406,        406,        1,   599040, 0x4c1add0e
+0,        407,        407,        1,   599040, 0x489b2fa9
+0,        408,        408,        1,   599040, 0xa088c512
+0,        409,        409,        1,   599040, 0x4f6121ac
+0,        410,        410,        1,   599040, 0x1959f62b
+0,        411,        411,        1,   599040, 0x2d51a5c4
+0,        412,        412,        1,   599040, 0x95e70f4f
+0,        413,        413,        1,   599040, 0x4eab3c11
+0,        414,        414,        1,   599040, 0xf2c2b9b5
+0,        415,        415,        1,   599040, 0x62f50ffe
+0,        416,        416,        1,   599040, 0x2104d2f8
+0,        417,        417,        1,   599040, 0x42a8b39f
+0,        418,        418,        1,   599040, 0x857f1fe6
+0,        419,        419,        1,   599040, 0x6ac5190d
+0,        420,        420,        1,   599040, 0x228d7a0b
+0,        421,        421,        1,   599040, 0x0042ef94
+0,        422,        422,        1,   599040, 0x4a83e001
+0,        423,        423,        1,   599040, 0xc43fec08
+0,        424,        424,        1,   599040, 0x5e029548
+0,        425,        425,        1,   599040, 0xbc89dea9
+0,        426,        426,        1,   599040, 0x6c5d88cf
+0,        427,        427,        1,   599040, 0x3a5dabfb
+0,        428,        428,        1,   599040, 0x876e1e54
+0,        429,        429,        1,   599040, 0x55715da8
+0,        430,        430,        1,   599040, 0x199c039b
+0,        431,        431,        1,   599040, 0x0286f71e
+0,        432,        432,        1,   599040, 0xf9a244a1
+0,        433,        433,        1,   599040, 0xf5655275
+0,        434,        434,        1,   599040, 0xde3dba0c
+0,        435,        435,        1,   599040, 0x617f8963
+0,        436,        436,        1,   599040, 0x0fe0e661
+0,        437,        437,        1,   599040, 0x8ba905ea
+0,        438,        438,        1,   599040, 0xb2812b34
+0,        439,        439,        1,   599040, 0x32d61c8b
+0,        440,        440,        1,   599040, 0xb7603400
+0,        441,        441,        1,   599040, 0x232c278f
+0,        442,        442,        1,   599040, 0xdf61c27d
+0,        443,        443,        1,   599040, 0xa053482f
+0,        444,        444,        1,   599040, 0x109724d3
+0,        445,        445,        1,   599040, 0x49d36800
+0,        446,        446,        1,   599040, 0x4a103bff
+0,        447,        447,        1,   599040, 0x7cd3813b
+0,        448,        448,        1,   599040, 0xeef677d7
+0,        449,        449,        1,   599040, 0xc5ad66c2
+0,        450,        450,        1,   599040, 0xa06e472d
+0,        451,        451,        1,   599040, 0x53182cc5
+0,        452,        452,        1,   599040, 0x9e62bfc0
+0,        453,        453,        1,   599040, 0x93515843
+0,        454,        454,        1,   599040, 0x5e0778d7
+0,        455,        455,        1,   599040, 0x957a6d55
+0,        456,        456,        1,   599040, 0x0bc26b3d
+0,        457,        457,        1,   599040, 0x5e0bc514
+0,        458,        458,        1,   599040, 0x7f717a98
+0,        459,        459,        1,   599040, 0x8497968c
+0,        460,        460,        1,   599040, 0x8fb527b8
+0,        461,        461,        1,   599040, 0x8580e487
+0,        462,        462,        1,   599040, 0x59b2d7cc
+0,        463,        463,        1,   599040, 0x5fbc38d7
+0,        464,        464,        1,   599040, 0xb1ba014e
+0,        465,        465,        1,   599040, 0x10481d8f
+0,        466,        466,        1,   599040, 0xd42e42e0
+0,        467,        467,        1,   599040, 0x14a361c1
+0,        468,        468,        1,   599040, 0x58378917
+0,        469,        469,        1,   599040, 0xaeb99a82
+0,        470,        470,        1,   599040, 0x5666ef55
+0,        471,        471,        1,   599040, 0xbd0ce495
+0,        472,        472,        1,   599040, 0xf13af36c
+0,        473,        473,        1,   599040, 0x55e8b101
+0,        474,        474,        1,   599040, 0x4e2966b4
+0,        475,        475,        1,   599040, 0xd973e873
+0,        476,        476,        1,   599040, 0x72d55685
+0,        477,        477,        1,   599040, 0x48eee8c2
+0,        478,        478,        1,   599040, 0x61291b38
+0,        479,        479,        1,   599040, 0x91f839f8
+0,        480,        480,        1,   599040, 0x0a4e9585
+0,        481,        481,        1,   599040, 0x02e0f1f0
+0,        482,        482,        1,   599040, 0xc104009c
+0,        483,        483,        1,   599040, 0x9417127e
+0,        484,        484,        1,   599040, 0x4630302e
+0,        485,        485,        1,   599040, 0x692141ea
+0,        486,        486,        1,   599040, 0x1ebed0bd
+0,        487,        487,        1,   599040, 0x362544a8
+0,        488,        488,        1,   599040, 0xd9cbef36
+0,        489,        489,        1,   599040, 0x54cda997
+0,        490,        490,        1,   599040, 0x79463ed1
+0,        491,        491,        1,   599040, 0xe95b66eb
+0,        492,        492,        1,   599040, 0x5bdaa63e
+0,        493,        493,        1,   599040, 0x72ced562
+0,        494,        494,        1,   599040, 0xcb2bdc53
+0,        495,        495,        1,   599040, 0x4ff80855
+0,        496,        496,        1,   599040, 0x68515ba6
+0,        497,        497,        1,   599040, 0x56228d2d
+0,        498,        498,        1,   599040, 0xb72a68ed
+0,        499,        499,        1,   599040, 0x111cc604

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-MVEDGE_A_qualcomm_3 Added

@@ -0,0 +1,18 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x1d68213a
+0,          1,          1,        1,   149760, 0x9cc81d30
+0,          2,          2,        1,   149760, 0xa3cf6438
+0,          3,          3,        1,   149760, 0x6acf213a
+0,          4,          4,        1,   149760, 0x0f75ce7b
+0,          5,          5,        1,   149760, 0x5e0286a7
+0,          6,          6,        1,   149760, 0xc62cd2b0
+0,          7,          7,        1,   149760, 0x7d9af3ac
+0,          8,          8,        1,   149760, 0x9d58afc7
+0,          9,          9,        1,   149760, 0x91c5ad7f
+0,         10,         10,        1,   149760, 0xc43c5b0a
+0,         11,         11,        1,   149760, 0x6b8cc1a5
+0,         12,         12,        1,   149760, 0x4cebb13e
+0,         13,         13,        1,   149760, 0xca136846
+0,         14,         14,        1,   149760, 0xba22e581
+0,         15,         15,        1,   149760, 0x2844ddd3
+0,         16,         16,        1,   149760, 0xf943399e

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5 Added

@@ -0,0 +1,35 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x8ce7200b
+0,          1,          1,        1,   149760, 0x73610669
+0,          2,          2,        1,   149760, 0x42942047
+0,          3,          3,        1,   149760, 0x57334d85
+0,          4,          4,        1,   149760, 0xdd97fbb3
+0,          5,          5,        1,   149760, 0x10469b12
+0,          6,          6,        1,   149760, 0x9b4231f0
+0,          7,          7,        1,   149760, 0x2b295a52
+0,          8,          8,        1,   149760, 0xdaf7c29f
+0,          9,          9,        1,   149760, 0x6798d072
+0,         10,         10,        1,   149760, 0xf77ae91e
+0,         11,         11,        1,   149760, 0xe2d516c9
+0,         12,         12,        1,   149760, 0x5cf0b221
+0,         13,         13,        1,   149760, 0x1d34991e
+0,         14,         14,        1,   149760, 0xb730d93a
+0,         15,         15,        1,   149760, 0x643b1861
+0,         16,         16,        1,   149760, 0x436586ff
+0,         17,         17,        1,   149760, 0xa65d9b80
+0,         18,         18,        1,   149760, 0x1d395210
+0,         19,         19,        1,   149760, 0x0580f2be
+0,         20,         20,        1,   149760, 0x8e4cea96
+0,         21,         21,        1,   149760, 0x6c98d019
+0,         22,         22,        1,   149760, 0x842803c8
+0,         23,         23,        1,   149760, 0xddc196ee
+0,         24,         24,        1,   149760, 0x89e45523
+0,         25,         25,        1,   149760, 0x2a36b008
+0,         26,         26,        1,   149760, 0x14a319f7
+0,         27,         27,        1,   149760, 0x7394854c
+0,         28,         28,        1,   149760, 0x26dcf933
+0,         29,         29,        1,   149760, 0x5b000b7e
+0,         30,         30,        1,   149760, 0x6e76bded
+0,         31,         31,        1,   149760, 0x0284d92d
+0,         32,         32,        1,   149760, 0xf14a25e0
+0,         33,         33,        1,   149760, 0x10c03d98

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-PICSIZE_A_Bossen_1 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-PICSIZE_B_Bossen_1 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-PICSIZE_C_Bossen_1 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-PICSIZE_D_Bossen_1 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-PMERGE_A_TI_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-PMERGE_B_TI_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-PMERGE_C_TI_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-PMERGE_D_TI_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-PMERGE_E_TI_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-POC_A_Bossen_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-PPS_A_qualcomm_7 Added

@@ -0,0 +1,82 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0x87159328
+0,          1,          1,        1,   599040, 0x825672ff
+0,          2,          2,        1,   599040, 0x2f4224ff
+0,          3,          3,        1,   599040, 0x4be431ff
+0,          4,          4,        1,   599040, 0xa0118b14
+0,          5,          5,        1,   599040, 0x488aac33
+0,          6,          6,        1,   599040, 0x1edd0d4e
+0,          7,          7,        1,   599040, 0x7f4562a2
+0,          8,          8,        1,   599040, 0xe177a7d4
+0,          9,          9,        1,   599040, 0x32d2fd58
+0,         10,         10,        1,   599040, 0x81d50c36
+0,         11,         11,        1,   599040, 0xdf32810d
+0,         12,         12,        1,   599040, 0xc4f50543
+0,         13,         13,        1,   599040, 0x777bfdce
+0,         14,         14,        1,   599040, 0x01db8731
+0,         15,         15,        1,   599040, 0x74ae2b2c
+0,         16,         16,        1,   599040, 0x424e130a
+0,         17,         17,        1,   599040, 0x7002f7c8
+0,         18,         18,        1,   599040, 0xde098c5b
+0,         19,         19,        1,   599040, 0x072ca0e3
+0,         20,         20,        1,   599040, 0x6c50e3ba
+0,         21,         21,        1,   599040, 0xa398c530
+0,         22,         22,        1,   599040, 0xcd8a780a
+0,         23,         23,        1,   599040, 0x7c849e63
+0,         24,         24,        1,   599040, 0xb70e2a1f
+0,         25,         25,        1,   599040, 0xc00d893c
+0,         26,         26,        1,   599040, 0x5da32c94
+0,         27,         27,        1,   599040, 0xc3177b8c
+0,         28,         28,        1,   599040, 0x06668480
+0,         29,         29,        1,   599040, 0xbceeac78
+0,         30,         30,        1,   599040, 0x162d5cd1
+0,         31,         31,        1,   599040, 0x071b71c4
+0,         32,         32,        1,   599040, 0xfe61e0b2
+0,         33,         33,        1,   599040, 0xe78c121f
+0,         34,         34,        1,   599040, 0x3b47c051
+0,         35,         35,        1,   599040, 0x10c1eedd
+0,         36,         36,        1,   599040, 0x09cf2d2c
+0,         37,         37,        1,   599040, 0xc4272450
+0,         38,         38,        1,   599040, 0x3a9e0db7
+0,         39,         39,        1,   599040, 0xe62595ad
+0,         40,         40,        1,   599040, 0xc03669a5
+0,         41,         41,        1,   599040, 0x4fbb058e
+0,         42,         42,        1,   599040, 0xaaee8771
+0,         43,         43,        1,   599040, 0xcc4f3a71
+0,         44,         44,        1,   599040, 0xc5717c31
+0,         45,         45,        1,   599040, 0xe2bc02fc
+0,         46,         46,        1,   599040, 0x380e06eb
+0,         47,         47,        1,   599040, 0x15d4ba04
+0,         48,         48,        1,   599040, 0xb9204342
+0,         49,         49,        1,   599040, 0xb9d9a246
+0,         50,         50,        1,   599040, 0xb5611280
+0,         51,         51,        1,   599040, 0xc80e3909
+0,         52,         52,        1,   599040, 0xef93ecbd
+0,         53,         53,        1,   599040, 0xdd6b435e
+0,         54,         54,        1,   599040, 0x1622f253
+0,         55,         55,        1,   599040, 0x41cd55a6
+0,         56,         56,        1,   599040, 0x7ed864e7
+0,         57,         57,        1,   599040, 0x1604c563
+0,         58,         58,        1,   599040, 0x1d5a3dc9
+0,         59,         59,        1,   599040, 0xa904a8a5
+0,         60,         60,        1,   599040, 0x19c43226
+0,         61,         61,        1,   599040, 0x60d803e0
+0,         62,         62,        1,   599040, 0xe862b0e0
+0,         63,         63,        1,   599040, 0x37c76c51
+0,         64,         64,        1,   599040, 0x8528cc3c
+0,         65,         65,        1,   599040, 0x03ece1f9
+0,         66,         66,        1,   599040, 0x8f0ef28e
+0,         67,         67,        1,   599040, 0x92164007
+0,         68,         68,        1,   599040, 0x9d3c2ecf
+0,         69,         69,        1,   599040, 0xacf536d4
+0,         70,         70,        1,   599040, 0xbdf6165f
+0,         71,         71,        1,   599040, 0xbc19f80a
+0,         72,         72,        1,   599040, 0x128a6480
+0,         73,         73,        1,   599040, 0xb487c333
+0,         74,         74,        1,   599040, 0x8dc350fa
+0,         75,         75,        1,   599040, 0x0043fe96
+0,         76,         76,        1,   599040, 0x47b502a5
+0,         77,         77,        1,   599040, 0xf62b761f
+0,         78,         78,        1,   599040, 0x608f63c3
+0,         79,         79,        1,   599040, 0xe285d93d
+0,         80,         80,        1,   599040, 0x1c3404cf

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-PS_A_VIDYO_3 Added

@@ -0,0 +1,26 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x88619f80
+0,          1,          1,        1,   149760, 0x550bdaf0
+0,          2,          2,        1,   149760, 0x4121f7a2
+0,          3,          3,        1,   149760, 0x210b1d07
+0,          4,          4,        1,   149760, 0x731b7758
+0,          5,          5,        1,   149760, 0x17adb789
+0,          6,          6,        1,   149760, 0x98b2f080
+0,          7,          7,        1,   149760, 0xc0be1f2a
+0,          8,          8,        1,   149760, 0xc01e387a
+0,          9,          9,        1,   149760, 0xd932822b
+0,         10,         10,        1,   149760, 0x16c0a1df
+0,         11,         11,        1,   149760, 0x5aa6c005
+0,         12,         12,        1,   149760, 0xd3aab602
+0,         13,         13,        1,   149760, 0x4e6ecab1
+0,         14,         14,        1,   149760, 0x8a86f1f2
+0,         15,         15,        1,   149760, 0x2ed21e1b
+0,         16,         16,        1,   149760, 0x80892f24
+0,         17,         17,        1,   149760, 0xb8a952ef
+0,         18,         18,        1,   149760, 0x557e57fb
+0,         19,         19,        1,   149760, 0x2b825b2c
+0,         20,         20,        1,   149760, 0x30b69b5e
+0,         21,         21,        1,   149760, 0x802ebf08
+0,         22,         22,        1,   149760, 0x95aadc8e
+0,         23,         23,        1,   149760, 0x4d4c02b7
+0,         24,         24,        1,   149760, 0x3fdd1762

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-PS_B_VIDYO_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-RAP_A_docomo_4 Added

@@ -0,0 +1,87 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x1ae5f13d
+0,          1,          1,        1,   149760, 0x0a6ad0e3
+0,          2,          2,        1,   149760, 0x2415af05
+0,          3,          3,        1,   149760, 0xf50f6eef
+0,          4,          4,        1,   149760, 0xef65835c
+0,          5,          5,        1,   149760, 0x4929b5cb
+0,          6,          6,        1,   149760, 0x165c6f55
+0,          7,          7,        1,   149760, 0x9caaa249
+0,          8,          8,        1,   149760, 0x6c25c4cf
+0,          9,          9,        1,   149760, 0x4678cef0
+0,         10,         10,        1,   149760, 0x72e04433
+0,         11,         11,        1,   149760, 0x36f8aa9d
+0,         12,         12,        1,   149760, 0x255189ad
+0,         13,         13,        1,   149760, 0x712d7f7f
+0,         14,         14,        1,   149760, 0x4d088988
+0,         15,         15,        1,   149760, 0xc0da3925
+0,         16,         16,        1,   149760, 0x9990db7c
+0,         17,         17,        1,   149760, 0xb02cc0e8
+0,         18,         18,        1,   149760, 0x3e859d8f
+0,         19,         19,        1,   149760, 0xce786bc1
+0,         20,         20,        1,   149760, 0x87555e5f
+0,         21,         21,        1,   149760, 0x3c95fb7e
+0,         22,         22,        1,   149760, 0xf092b65e
+0,         23,         23,        1,   149760, 0x7db2c04c
+0,         24,         24,        1,   149760, 0x7d39eb21
+0,         25,         25,        1,   149760, 0x2cfd7d57
+0,         26,         26,        1,   149760, 0xb1902c06
+0,         27,         27,        1,   149760, 0xe0eae1d7
+0,         28,         28,        1,   149760, 0xf8212977
+0,         29,         29,        1,   149760, 0x6cb31328
+0,         30,         30,        1,   149760, 0x862ab736
+0,         31,         31,        1,   149760, 0xc7a87f44
+0,         32,         32,        1,   149760, 0x8ff7a1a1
+0,         33,         33,        1,   149760, 0xd7bee49b
+0,         34,         34,        1,   149760, 0x1925db84
+0,         35,         35,        1,   149760, 0xf32a7dc6
+0,         36,         36,        1,   149760, 0x02a1e3b6
+0,         37,         37,        1,   149760, 0xb6398aad
+0,         38,         38,        1,   149760, 0xa3756e2d
+0,         39,         39,        1,   149760, 0xf90f3732
+0,         40,         40,        1,   149760, 0x3b05115a
+0,         41,         41,        1,   149760, 0x81ca9bdb
+0,         42,         42,        1,   149760, 0xa75ee938
+0,         43,         43,        1,   149760, 0x9e5c232f
+0,         44,         44,        1,   149760, 0x64cb04e9
+0,         45,         45,        1,   149760, 0x4064df52
+0,         46,         46,        1,   149760, 0x47fa0afc
+0,         47,         47,        1,   149760, 0xd209252e
+0,         48,         48,        1,   149760, 0x2f811f02
+0,         49,         49,        1,   149760, 0x733b6721
+0,         50,         50,        1,   149760, 0x30b12427
+0,         51,         51,        1,   149760, 0xdf58d3e2
+0,         52,         52,        1,   149760, 0xc144d7be
+0,         53,         53,        1,   149760, 0x48f0ac79
+0,         54,         54,        1,   149760, 0xb8d8a2c6
+0,         55,         55,        1,   149760, 0x2a7d916d
+0,         56,         56,        1,   149760, 0xd9d38cd5
+0,         57,         57,        1,   149760, 0xd7c7f9a6
+0,         58,         58,        1,   149760, 0x64d0df7a
+0,         59,         59,        1,   149760, 0x4e365cff
+0,         60,         60,        1,   149760, 0x74bc2a8b
+0,         61,         61,        1,   149760, 0x70a7cd2b
+0,         62,         62,        1,   149760, 0x0836b51e
+0,         63,         63,        1,   149760, 0xbc37b5d7
+0,         64,         64,        1,   149760, 0xb6d651e5
+0,         65,         65,        1,   149760, 0x7aa0e35f
+0,         66,         66,        1,   149760, 0x0fbc89a3
+0,         67,         67,        1,   149760, 0x2ca2f2a6
+0,         68,         68,        1,   149760, 0xf742c5c5
+0,         69,         69,        1,   149760, 0x4117208f
+0,         70,         70,        1,   149760, 0xec392efb
+0,         71,         71,        1,   149760, 0xbfba5063
+0,         72,         72,        1,   149760, 0xb2499f48
+0,         73,         73,        1,   149760, 0xf1183244
+0,         74,         74,        1,   149760, 0x364a6400
+0,         75,         75,        1,   149760, 0xfcfddf36
+0,         76,         76,        1,   149760, 0xbcc1b37e
+0,         77,         77,        1,   149760, 0xab364748
+0,         78,         78,        1,   149760, 0xebb27fcd
+0,         79,         79,        1,   149760, 0xe2e7a723
+0,         80,         80,        1,   149760, 0xf671b5e0
+0,         81,         81,        1,   149760, 0xbf0cc349
+0,         82,         82,        1,   149760, 0xf195d868
+0,         83,         83,        1,   149760, 0xe0097460
+0,         84,         84,        1,   149760, 0x3d4c1812
+0,         85,         85,        1,   149760, 0x133cd867

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-RAP_B_Bossen_1 Added

@@ -0,0 +1,84 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0xb989ae7a
+0,          1,          1,        1,   149760, 0x4765caed
+0,          2,          2,        1,   149760, 0xd908c148
+0,          3,          3,        1,   149760, 0xf6ebd66c
+0,          4,          4,        1,   149760, 0x5d5ea14b
+0,          5,          5,        1,   149760, 0xcc939a7c
+0,          6,          6,        1,   149760, 0xa91b8243
+0,          7,          7,        1,   149760, 0x61926618
+0,          8,          8,        1,   149760, 0xe440099c
+0,          9,          9,        1,   149760, 0x18b88a73
+0,         10,         10,        1,   149760, 0xa669f2a9
+0,         11,         11,        1,   149760, 0xc2f6af3a
+0,         12,         12,        1,   149760, 0x02465354
+0,         13,         13,        1,   149760, 0x54e51ff9
+0,         14,         14,        1,   149760, 0xb9f3c056
+0,         15,         15,        1,   149760, 0x050274f9
+0,         16,         16,        1,   149760, 0xd7a413c1
+0,         17,         17,        1,   149760, 0x6e92cda4
+0,         18,         18,        1,   149760, 0x9cb86d4d
+0,         19,         19,        1,   149760, 0x95f440a3
+0,         20,         20,        1,   149760, 0x6dabd616
+0,         21,         21,        1,   149760, 0xd6a0b62d
+0,         22,         22,        1,   149760, 0x585c811b
+0,         23,         23,        1,   149760, 0x50a4d6fc
+0,         24,         24,        1,   149760, 0xe419eb23
+0,         25,         25,        1,   149760, 0x1f0fc316
+0,         26,         26,        1,   149760, 0xf61dc981
+0,         27,         27,        1,   149760, 0xff34d001
+0,         28,         28,        1,   149760, 0x598be76c
+0,         29,         29,        1,   149760, 0xbb50a4d6
+0,         30,         30,        1,   149760, 0x2add9abd
+0,         31,         31,        1,   149760, 0xd74185c7
+0,         32,         32,        1,   149760, 0xcdad6e8e
+0,         33,         33,        1,   149760, 0x54d704ad
+0,         34,         34,        1,   149760, 0xe52e7fc0
+0,         35,         35,        1,   149760, 0xdb331061
+0,         36,         36,        1,   149760, 0x7dacb973
+0,         37,         37,        1,   149760, 0xfc8d5670
+0,         38,         38,        1,   149760, 0xca9024cd
+0,         39,         39,        1,   149760, 0x7fc9bbc2
+0,         40,         40,        1,   149760, 0xe9c386a9
+0,         41,         41,        1,   149760, 0xd0dd1a21
+0,         42,         42,        1,   149760, 0x4b57d734
+0,         43,         43,        1,   149760, 0x55607afc
+0,         44,         44,        1,   149760, 0x567c3e8b
+0,         45,         45,        1,   149760, 0x312eda16
+0,         46,         46,        1,   149760, 0xafcbacf8
+0,         47,         47,        1,   149760, 0xcbde8420
+0,         48,         48,        1,   149760, 0x88a2f29e
+0,         49,         49,        1,   149760, 0x417bf220
+0,         50,         50,        1,   149760, 0xa454835a
+0,         51,         51,        1,   149760, 0x16bf2871
+0,         52,         52,        1,   149760, 0x51253402
+0,         53,         53,        1,   149760, 0x13822dfd
+0,         54,         54,        1,   149760, 0x5e099d3d
+0,         55,         55,        1,   149760, 0xcc19fe87
+0,         56,         56,        1,   149760, 0x7f5f6ce2
+0,         57,         57,        1,   149760, 0x79797a94
+0,         58,         58,        1,   149760, 0x16f26086
+0,         59,         59,        1,   149760, 0x01aedea3
+0,         60,         60,        1,   149760, 0xcafd3221
+0,         61,         61,        1,   149760, 0xcbd61c1f
+0,         62,         62,        1,   149760, 0xf46839e5
+0,         63,         63,        1,   149760, 0x87fb61ee
+0,         64,         64,        1,   149760, 0x3362678b
+0,         65,         65,        1,   149760, 0x6e7fc851
+0,         66,         66,        1,   149760, 0x33f96449
+0,         67,         67,        1,   149760, 0xd9d05007
+0,         68,         68,        1,   149760, 0x477f2cf2
+0,         69,         69,        1,   149760, 0xe1f9ccd0
+0,         70,         70,        1,   149760, 0xb3ba8cfb
+0,         71,         71,        1,   149760, 0x64787995
+0,         72,         72,        1,   149760, 0xc10de4c4
+0,         73,         73,        1,   149760, 0x18dd343f
+0,         74,         74,        1,   149760, 0xa1c51358
+0,         75,         75,        1,   149760, 0x91fe6361
+0,         76,         76,        1,   149760, 0xeec85f94
+0,         77,         77,        1,   149760, 0x00a57402
+0,         78,         78,        1,   149760, 0x4e88cc16
+0,         79,         79,        1,   149760, 0xdbd51976
+0,         80,         80,        1,   149760, 0xfebf6b1a
+0,         81,         81,        1,   149760, 0x052546d2
+0,         82,         82,        1,   149760, 0x046cd73b

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-RPLM_A_qualcomm_4 Added

@@ -0,0 +1,301 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0xdb5e3b56
+0,          1,          1,        1,   149760, 0xd5320970
+0,          2,          2,        1,   149760, 0x9387ed18
+0,          3,          3,        1,   149760, 0x3ab6fde8
+0,          4,          4,        1,   149760, 0xf5d39a39
+0,          5,          5,        1,   149760, 0xf8c15b34
+0,          6,          6,        1,   149760, 0x12261fdc
+0,          7,          7,        1,   149760, 0x8ed03f57
+0,          8,          8,        1,   149760, 0x04d29f74
+0,          9,          9,        1,   149760, 0x86daf75e
+0,         10,         10,        1,   149760, 0x85d817a4
+0,         11,         11,        1,   149760, 0xf9c97006
+0,         12,         12,        1,   149760, 0x60baf6ad
+0,         13,         13,        1,   149760, 0x7272aa6b
+0,         14,         14,        1,   149760, 0x18e00ede
+0,         15,         15,        1,   149760, 0x60592cfe
+0,         16,         16,        1,   149760, 0x7d49650d
+0,         17,         17,        1,   149760, 0x865e7b22
+0,         18,         18,        1,   149760, 0xad6a33e4
+0,         19,         19,        1,   149760, 0x7c8ab573
+0,         20,         20,        1,   149760, 0x0c7d8afa
+0,         21,         21,        1,   149760, 0xb0e567a3
+0,         22,         22,        1,   149760, 0x3c2ccbf1
+0,         23,         23,        1,   149760, 0x0804aead
+0,         24,         24,        1,   149760, 0x0dcb6756
+0,         25,         25,        1,   149760, 0x99bc82dd
+0,         26,         26,        1,   149760, 0x4d2907f1
+0,         27,         27,        1,   149760, 0xc4c330ff
+0,         28,         28,        1,   149760, 0x6c73cef4
+0,         29,         29,        1,   149760, 0xbaa82ab1
+0,         30,         30,        1,   149760, 0xeea3d591
+0,         31,         31,        1,   149760, 0x8240d007
+0,         32,         32,        1,   149760, 0x698f11e4
+0,         33,         33,        1,   149760, 0x46700948
+0,         34,         34,        1,   149760, 0x819e62d9
+0,         35,         35,        1,   149760, 0x0cfe1471
+0,         36,         36,        1,   149760, 0xf30dc9da
+0,         37,         37,        1,   149760, 0x81ea3390
+0,         38,         38,        1,   149760, 0x85bc8dec
+0,         39,         39,        1,   149760, 0x01d3451a
+0,         40,         40,        1,   149760, 0x626dc94b
+0,         41,         41,        1,   149760, 0xf50f2a66
+0,         42,         42,        1,   149760, 0x6294bc3e
+0,         43,         43,        1,   149760, 0x41427bc1
+0,         44,         44,        1,   149760, 0xe200ecf3
+0,         45,         45,        1,   149760, 0xc44785c5
+0,         46,         46,        1,   149760, 0xadc8c3cf
+0,         47,         47,        1,   149760, 0x6c57fb6d
+0,         48,         48,        1,   149760, 0x139cddc1
+0,         49,         49,        1,   149760, 0xc5c9def6
+0,         50,         50,        1,   149760, 0xa8da3f7b
+0,         51,         51,        1,   149760, 0x21823d13
+0,         52,         52,        1,   149760, 0x00e265fd
+0,         53,         53,        1,   149760, 0x289f21d2
+0,         54,         54,        1,   149760, 0xa96d8d0b
+0,         55,         55,        1,   149760, 0x4e50b434
+0,         56,         56,        1,   149760, 0x4e469eae
+0,         57,         57,        1,   149760, 0x62a258af
+0,         58,         58,        1,   149760, 0xc61beb2b
+0,         59,         59,        1,   149760, 0x15d7853b
+0,         60,         60,        1,   149760, 0xd5b8941b
+0,         61,         61,        1,   149760, 0x6312a7c5
+0,         62,         62,        1,   149760, 0x2da74d59
+0,         63,         63,        1,   149760, 0x5fd72bc7
+0,         64,         64,        1,   149760, 0x4035f027
+0,         65,         65,        1,   149760, 0xbe9992e2
+0,         66,         66,        1,   149760, 0xb96093b8
+0,         67,         67,        1,   149760, 0x1024bd43
+0,         68,         68,        1,   149760, 0x1376a3fe
+0,         69,         69,        1,   149760, 0xdf93ec7f
+0,         70,         70,        1,   149760, 0x17d27bfa
+0,         71,         71,        1,   149760, 0x440cb7aa
+0,         72,         72,        1,   149760, 0x8b230df3
+0,         73,         73,        1,   149760, 0x2526130e
+0,         74,         74,        1,   149760, 0x77926a77
+0,         75,         75,        1,   149760, 0x8562bddc
+0,         76,         76,        1,   149760, 0xda86bb2e
+0,         77,         77,        1,   149760, 0x2b4f921b
+0,         78,         78,        1,   149760, 0xf13bca77
+0,         79,         79,        1,   149760, 0x53e76b99
+0,         80,         80,        1,   149760, 0x29a2f5bb
+0,         81,         81,        1,   149760, 0x83a8c4f8
+0,         82,         82,        1,   149760, 0xbe6d8f45
+0,         83,         83,        1,   149760, 0x03d3bf96
+0,         84,         84,        1,   149760, 0x3a0bd29e
+0,         85,         85,        1,   149760, 0xdb656a22
+0,         86,         86,        1,   149760, 0x557b020e
+0,         87,         87,        1,   149760, 0x573ee5f2
+0,         88,         88,        1,   149760, 0x5484faea
+0,         89,         89,        1,   149760, 0x06bb73ae
+0,         90,         90,        1,   149760, 0x3d4049fa
+0,         91,         91,        1,   149760, 0xe574eedb
+0,         92,         92,        1,   149760, 0x1c46205d
+0,         93,         93,        1,   149760, 0x0c5c322e
+0,         94,         94,        1,   149760, 0x2bbeed95
+0,         95,         95,        1,   149760, 0x225897dc
+0,         96,         96,        1,   149760, 0x0a39aa8b
+0,         97,         97,        1,   149760, 0x3242e156
+0,         98,         98,        1,   149760, 0x1790ee85
+0,         99,         99,        1,   149760, 0x55ef9dac
+0,        100,        100,        1,   149760, 0x98e1c49e
+0,        101,        101,        1,   149760, 0x479a84b5
+0,        102,        102,        1,   149760, 0x1711b4f9
+0,        103,        103,        1,   149760, 0xd7d25fce
+0,        104,        104,        1,   149760, 0x7bde1977
+0,        105,        105,        1,   149760, 0x25777a4d
+0,        106,        106,        1,   149760, 0x7b55ed5f
+0,        107,        107,        1,   149760, 0xb28e59e6
+0,        108,        108,        1,   149760, 0x8314281a
+0,        109,        109,        1,   149760, 0x3a5ceeb3
+0,        110,        110,        1,   149760, 0x33760ed8
+0,        111,        111,        1,   149760, 0x19332370
+0,        112,        112,        1,   149760, 0xf25d1f68
+0,        113,        113,        1,   149760, 0x4d665712
+0,        114,        114,        1,   149760, 0x3e310eb7
+0,        115,        115,        1,   149760, 0xafa3c1bb
+0,        116,        116,        1,   149760, 0xf0b7a7ec
+0,        117,        117,        1,   149760, 0xa88a747a
+0,        118,        118,        1,   149760, 0x7b7e6e85
+0,        119,        119,        1,   149760, 0xbc8f8ede
+0,        120,        120,        1,   149760, 0x449f7d2f
+0,        121,        121,        1,   149760, 0x9bc70c53
+0,        122,        122,        1,   149760, 0x8544dc98
+0,        123,        123,        1,   149760, 0xef687641
+0,        124,        124,        1,   149760, 0x0c962219
+0,        125,        125,        1,   149760, 0x4325ae76
+0,        126,        126,        1,   149760, 0xcec7a18c
+0,        127,        127,        1,   149760, 0x941ee8a2
+0,        128,        128,        1,   149760, 0x3eaf3f55
+0,        129,        129,        1,   149760, 0x5b571274
+0,        130,        130,        1,   149760, 0x0532488a
+0,        131,        131,        1,   149760, 0x893fbaf7
+0,        132,        132,        1,   149760, 0xd0155ddf
+0,        133,        133,        1,   149760, 0x83ec86ee
+0,        134,        134,        1,   149760, 0xedffba86
+0,        135,        135,        1,   149760, 0x838c19de
+0,        136,        136,        1,   149760, 0x8482639d
+0,        137,        137,        1,   149760, 0x9501004d
+0,        138,        138,        1,   149760, 0x1db0525f
+0,        139,        139,        1,   149760, 0x8b431467
+0,        140,        140,        1,   149760, 0x972e7d24
+0,        141,        141,        1,   149760, 0xd8151b94
+0,        142,        142,        1,   149760, 0x1ded6a85
+0,        143,        143,        1,   149760, 0x03497fe2
+0,        144,        144,        1,   149760, 0x07427bb7
+0,        145,        145,        1,   149760, 0x33c085ef
+0,        146,        146,        1,   149760, 0x0feda1d0
+0,        147,        147,        1,   149760, 0xf86930e7
+0,        148,        148,        1,   149760, 0x42c2ea09
+0,        149,        149,        1,   149760, 0xcfb76b86
+0,        150,        150,        1,   149760, 0x672e2fce
+0,        151,        151,        1,   149760, 0xb006ec79
+0,        152,        152,        1,   149760, 0xdbc8511c
+0,        153,        153,        1,   149760, 0x3278b299
+0,        154,        154,        1,   149760, 0xd19fe063
+0,        155,        155,        1,   149760, 0x13bb8951
+0,        156,        156,        1,   149760, 0xec5cfe36
+0,        157,        157,        1,   149760, 0x9381a0e7
+0,        158,        158,        1,   149760, 0x304cf3c0
+0,        159,        159,        1,   149760, 0xd380511c
+0,        160,        160,        1,   149760, 0xbd1abe11
+0,        161,        161,        1,   149760, 0x7b220293
+0,        162,        162,        1,   149760, 0xbbe85931
+0,        163,        163,        1,   149760, 0x316e422a
+0,        164,        164,        1,   149760, 0x5e5db530
+0,        165,        165,        1,   149760, 0xc48d6ddb
+0,        166,        166,        1,   149760, 0x9adf5d65
+0,        167,        167,        1,   149760, 0x2adb94de
+0,        168,        168,        1,   149760, 0xbc052746
+0,        169,        169,        1,   149760, 0xac4d3569
+0,        170,        170,        1,   149760, 0x3cd8fdee
+0,        171,        171,        1,   149760, 0x34bfd6ed
+0,        172,        172,        1,   149760, 0xf72fec4b
+0,        173,        173,        1,   149760, 0xf8c5b374
+0,        174,        174,        1,   149760, 0x28ff7382
+0,        175,        175,        1,   149760, 0xac3b49f4
+0,        176,        176,        1,   149760, 0x9d995a62
+0,        177,        177,        1,   149760, 0xe0b292f1
+0,        178,        178,        1,   149760, 0x4edbd05d
+0,        179,        179,        1,   149760, 0x4fd5038b
+0,        180,        180,        1,   149760, 0x899d2101
+0,        181,        181,        1,   149760, 0x0733f804
+0,        182,        182,        1,   149760, 0xe4297100
+0,        183,        183,        1,   149760, 0x5aff9292
+0,        184,        184,        1,   149760, 0x41eda25c
+0,        185,        185,        1,   149760, 0xb4d7aaf2
+0,        186,        186,        1,   149760, 0xbd99fade
+0,        187,        187,        1,   149760, 0xdea6d265
+0,        188,        188,        1,   149760, 0xa2d3bdcd
+0,        189,        189,        1,   149760, 0x38f8a729
+0,        190,        190,        1,   149760, 0x0a356f1b
+0,        191,        191,        1,   149760, 0x865411a5
+0,        192,        192,        1,   149760, 0xd6720a40
+0,        193,        193,        1,   149760, 0xf40589f9
+0,        194,        194,        1,   149760, 0x0646106d
+0,        195,        195,        1,   149760, 0x88e55688
+0,        196,        196,        1,   149760, 0xda2fce82
+0,        197,        197,        1,   149760, 0xc823200b
+0,        198,        198,        1,   149760, 0xc9513041
+0,        199,        199,        1,   149760, 0x798d0e88
+0,        200,        200,        1,   149760, 0xb6d4f15a
+0,        201,        201,        1,   149760, 0xab5b24a4
+0,        202,        202,        1,   149760, 0x9888aa8d
+0,        203,        203,        1,   149760, 0xbf13bbf4
+0,        204,        204,        1,   149760, 0x5450bb23
+0,        205,        205,        1,   149760, 0x12aec398
+0,        206,        206,        1,   149760, 0xa5e1579a
+0,        207,        207,        1,   149760, 0xbeeb07e1
+0,        208,        208,        1,   149760, 0x209a9f1b
+0,        209,        209,        1,   149760, 0x4d3d1c1a
+0,        210,        210,        1,   149760, 0xb4edd703
+0,        211,        211,        1,   149760, 0xc71adf66
+0,        212,        212,        1,   149760, 0x40006d36
+0,        213,        213,        1,   149760, 0x1c5485c9
+0,        214,        214,        1,   149760, 0xa3d8c9a1
+0,        215,        215,        1,   149760, 0x9bfac6de
+0,        216,        216,        1,   149760, 0xed3b0782
+0,        217,        217,        1,   149760, 0x8f075ce2
+0,        218,        218,        1,   149760, 0xb744fa07
+0,        219,        219,        1,   149760, 0xa9356722
+0,        220,        220,        1,   149760, 0xd792bd01
+0,        221,        221,        1,   149760, 0xa124618b
+0,        222,        222,        1,   149760, 0x7492bb54
+0,        223,        223,        1,   149760, 0x67dcefca
+0,        224,        224,        1,   149760, 0x8a7f716d
+0,        225,        225,        1,   149760, 0x7775bb01
+0,        226,        226,        1,   149760, 0xe4a845e5
+0,        227,        227,        1,   149760, 0x79a3962d
+0,        228,        228,        1,   149760, 0x4f395ad7
+0,        229,        229,        1,   149760, 0x3948ce05
+0,        230,        230,        1,   149760, 0x037e6c07
+0,        231,        231,        1,   149760, 0x91881ae9
+0,        232,        232,        1,   149760, 0x937e2545
+0,        233,        233,        1,   149760, 0xdc892763
+0,        234,        234,        1,   149760, 0x96ebd47f
+0,        235,        235,        1,   149760, 0xfecbf8c6
+0,        236,        236,        1,   149760, 0xe1443808
+0,        237,        237,        1,   149760, 0xe0cd36c0
+0,        238,        238,        1,   149760, 0xb485eb4d
+0,        239,        239,        1,   149760, 0x36edf31f
+0,        240,        240,        1,   149760, 0x988bb97f
+0,        241,        241,        1,   149760, 0xc266c616
+0,        242,        242,        1,   149760, 0x7ec4c3f4
+0,        243,        243,        1,   149760, 0xedf5e2ff
+0,        244,        244,        1,   149760, 0xbdd351e3
+0,        245,        245,        1,   149760, 0x900e194e
+0,        246,        246,        1,   149760, 0x5dc7daad
+0,        247,        247,        1,   149760, 0x1ce37e7e
+0,        248,        248,        1,   149760, 0x15982333
+0,        249,        249,        1,   149760, 0x976bb72e
+0,        250,        250,        1,   149760, 0x0b42e05e
+0,        251,        251,        1,   149760, 0xffbcc758
+0,        252,        252,        1,   149760, 0x6377782d
+0,        253,        253,        1,   149760, 0x8aa42a80
+0,        254,        254,        1,   149760, 0x8e0ab3fd
+0,        255,        255,        1,   149760, 0xdfdd49d4
+0,        256,        256,        1,   149760, 0x2659a6cb
+0,        257,        257,        1,   149760, 0x1e9a3d51
+0,        258,        258,        1,   149760, 0x7a66d80d
+0,        259,        259,        1,   149760, 0x5756a9e9
+0,        260,        260,        1,   149760, 0x0fa8d6dd
+0,        261,        261,        1,   149760, 0x885799a5
+0,        262,        262,        1,   149760, 0xb8d02df7
+0,        263,        263,        1,   149760, 0xd2e2800c
+0,        264,        264,        1,   149760, 0xa26ee27a
+0,        265,        265,        1,   149760, 0x7c86750f
+0,        266,        266,        1,   149760, 0xb4694ea1
+0,        267,        267,        1,   149760, 0x89d0b75a
+0,        268,        268,        1,   149760, 0x92b9af80
+0,        269,        269,        1,   149760, 0x107dd610
+0,        270,        270,        1,   149760, 0x8ad35f55
+0,        271,        271,        1,   149760, 0xccc32cb1
+0,        272,        272,        1,   149760, 0xd08ce4ff
+0,        273,        273,        1,   149760, 0x30bd8d0a
+0,        274,        274,        1,   149760, 0x01b74d14
+0,        275,        275,        1,   149760, 0x79aa7a3b
+0,        276,        276,        1,   149760, 0x5f7a40fc
+0,        277,        277,        1,   149760, 0x8837643e
+0,        278,        278,        1,   149760, 0xb6b66baa
+0,        279,        279,        1,   149760, 0xf4ae17cd
+0,        280,        280,        1,   149760, 0xe0d2546a
+0,        281,        281,        1,   149760, 0x0e118751
+0,        282,        282,        1,   149760, 0x0732e19c
+0,        283,        283,        1,   149760, 0x9cfe27b3
+0,        284,        284,        1,   149760, 0x1c77b242
+0,        285,        285,        1,   149760, 0x25be3938
+0,        286,        286,        1,   149760, 0x735ce859
+0,        287,        287,        1,   149760, 0x2bca0f6e
+0,        288,        288,        1,   149760, 0xcce3eb48
+0,        289,        289,        1,   149760, 0xf3556dd8
+0,        290,        290,        1,   149760, 0xcb2cecb4
+0,        291,        291,        1,   149760, 0x9c489742
+0,        292,        292,        1,   149760, 0xbe25370d
+0,        293,        293,        1,   149760, 0x798ff17f
+0,        294,        294,        1,   149760, 0x2f1a46c4
+0,        295,        295,        1,   149760, 0x7d119bd6
+0,        296,        296,        1,   149760, 0x42ceab74
+0,        297,        297,        1,   149760, 0x6fcbe2ef
+0,        298,        298,        1,   149760, 0x290fe6da
+0,        299,        299,        1,   149760, 0x6b280a24

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-RPLM_B_qualcomm_4 Added

@@ -0,0 +1,301 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x82ff0cca
+0,          1,          1,        1,   149760, 0xcd05ba17
+0,          2,          2,        1,   149760, 0x33a5b924
+0,          3,          3,        1,   149760, 0xc0a8d82f
+0,          4,          4,        1,   149760, 0xa18c8ce6
+0,          5,          5,        1,   149760, 0x4d3c4902
+0,          6,          6,        1,   149760, 0xf118cb2a
+0,          7,          7,        1,   149760, 0xb37643c0
+0,          8,          8,        1,   149760, 0x0d6f8a70
+0,          9,          9,        1,   149760, 0xeaebd0f0
+0,         10,         10,        1,   149760, 0x81cce277
+0,         11,         11,        1,   149760, 0x85f216cc
+0,         12,         12,        1,   149760, 0x799cc7c7
+0,         13,         13,        1,   149760, 0x575f76da
+0,         14,         14,        1,   149760, 0x79e10395
+0,         15,         15,        1,   149760, 0x80f62423
+0,         16,         16,        1,   149760, 0x13657087
+0,         17,         17,        1,   149760, 0xcd147ae1
+0,         18,         18,        1,   149760, 0xcee71159
+0,         19,         19,        1,   149760, 0x6fa7b8d5
+0,         20,         20,        1,   149760, 0xd90bd038
+0,         21,         21,        1,   149760, 0x13eead73
+0,         22,         22,        1,   149760, 0xe2eddfc8
+0,         23,         23,        1,   149760, 0x1f07a4f6
+0,         24,         24,        1,   149760, 0x90b25f59
+0,         25,         25,        1,   149760, 0xd0dd86ba
+0,         26,         26,        1,   149760, 0x3008066c
+0,         27,         27,        1,   149760, 0x74ec54dd
+0,         28,         28,        1,   149760, 0xa423046c
+0,         29,         29,        1,   149760, 0x8a410bca
+0,         30,         30,        1,   149760, 0x55337573
+0,         31,         31,        1,   149760, 0x55d3623c
+0,         32,         32,        1,   149760, 0x699d234b
+0,         33,         33,        1,   149760, 0xbcd029b6
+0,         34,         34,        1,   149760, 0xa56e6600
+0,         35,         35,        1,   149760, 0x1dfc4a28
+0,         36,         36,        1,   149760, 0x9a72d671
+0,         37,         37,        1,   149760, 0xc01812ae
+0,         38,         38,        1,   149760, 0x8ef428c2
+0,         39,         39,        1,   149760, 0x6e79de92
+0,         40,         40,        1,   149760, 0xf315ba7c
+0,         41,         41,        1,   149760, 0xa678caff
+0,         42,         42,        1,   149760, 0xbd2049c0
+0,         43,         43,        1,   149760, 0x649323ea
+0,         44,         44,        1,   149760, 0x686eb3a4
+0,         45,         45,        1,   149760, 0x89725136
+0,         46,         46,        1,   149760, 0xc4db7e6f
+0,         47,         47,        1,   149760, 0xf6f0d823
+0,         48,         48,        1,   149760, 0x44b3a07a
+0,         49,         49,        1,   149760, 0xf23c221d
+0,         50,         50,        1,   149760, 0x858f11ef
+0,         51,         51,        1,   149760, 0xcd5311c4
+0,         52,         52,        1,   149760, 0x72c9297d
+0,         53,         53,        1,   149760, 0xf6acd772
+0,         54,         54,        1,   149760, 0x8c0f91ed
+0,         55,         55,        1,   149760, 0x7ef6f2be
+0,         56,         56,        1,   149760, 0x1237a677
+0,         57,         57,        1,   149760, 0x66e461f9
+0,         58,         58,        1,   149760, 0x3e06e1b3
+0,         59,         59,        1,   149760, 0xa6f6065c
+0,         60,         60,        1,   149760, 0x16e38cc0
+0,         61,         61,        1,   149760, 0x05762de1
+0,         62,         62,        1,   149760, 0xbda617c5
+0,         63,         63,        1,   149760, 0x75b904a9
+0,         64,         64,        1,   149760, 0x2f8bf179
+0,         65,         65,        1,   149760, 0x9be6a533
+0,         66,         66,        1,   149760, 0xf4eb99e8
+0,         67,         67,        1,   149760, 0xf3a68b9a
+0,         68,         68,        1,   149760, 0x34b86f19
+0,         69,         69,        1,   149760, 0x6a71cc04
+0,         70,         70,        1,   149760, 0xe206a202
+0,         71,         71,        1,   149760, 0xdfa8dea6
+0,         72,         72,        1,   149760, 0x8ef7fb73
+0,         73,         73,        1,   149760, 0x67a8de32
+0,         74,         74,        1,   149760, 0xc8c16870
+0,         75,         75,        1,   149760, 0xf5e5d04d
+0,         76,         76,        1,   149760, 0x79d0cc8d
+0,         77,         77,        1,   149760, 0xcd80a22b
+0,         78,         78,        1,   149760, 0x12dce452
+0,         79,         79,        1,   149760, 0x0586aa3d
+0,         80,         80,        1,   149760, 0x5a4d0c1e
+0,         81,         81,        1,   149760, 0x25dbe94e
+0,         82,         82,        1,   149760, 0x3236bbe8
+0,         83,         83,        1,   149760, 0x3b4bc068
+0,         84,         84,        1,   149760, 0x3f32c299
+0,         85,         85,        1,   149760, 0x5b0738e5
+0,         86,         86,        1,   149760, 0x0c1d0c80
+0,         87,         87,        1,   149760, 0x76ace6f5
+0,         88,         88,        1,   149760, 0xc738ff39
+0,         89,         89,        1,   149760, 0x0f078335
+0,         90,         90,        1,   149760, 0x0e941631
+0,         91,         91,        1,   149760, 0x284ee7d6
+0,         92,         92,        1,   149760, 0xce9b49b8
+0,         93,         93,        1,   149760, 0x7c132570
+0,         94,         94,        1,   149760, 0xa983dc5e
+0,         95,         95,        1,   149760, 0x994e4d69
+0,         96,         96,        1,   149760, 0xb8f599ed
+0,         97,         97,        1,   149760, 0xee81b454
+0,         98,         98,        1,   149760, 0xf27bdeee
+0,         99,         99,        1,   149760, 0xc7628895
+0,        100,        100,        1,   149760, 0x003521d1
+0,        101,        101,        1,   149760, 0x7ed9b167
+0,        102,        102,        1,   149760, 0x47598b95
+0,        103,        103,        1,   149760, 0x879b347e
+0,        104,        104,        1,   149760, 0x55f8f8c1
+0,        105,        105,        1,   149760, 0xdddc5dda
+0,        106,        106,        1,   149760, 0xc531c9a1
+0,        107,        107,        1,   149760, 0x28ef0e7e
+0,        108,        108,        1,   149760, 0x4c090cbd
+0,        109,        109,        1,   149760, 0x5818f270
+0,        110,        110,        1,   149760, 0x89ea1f0e
+0,        111,        111,        1,   149760, 0x263925ef
+0,        112,        112,        1,   149760, 0x4e7d45b8
+0,        113,        113,        1,   149760, 0xa98dbf77
+0,        114,        114,        1,   149760, 0xaa0239b3
+0,        115,        115,        1,   149760, 0x4eaa2226
+0,        116,        116,        1,   149760, 0x9927c7f9
+0,        117,        117,        1,   149760, 0x17f09e34
+0,        118,        118,        1,   149760, 0x45cc73e9
+0,        119,        119,        1,   149760, 0x21836e14
+0,        120,        120,        1,   149760, 0x14c38cf6
+0,        121,        121,        1,   149760, 0x18ee35ee
+0,        122,        122,        1,   149760, 0x4f55f781
+0,        123,        123,        1,   149760, 0x85556339
+0,        124,        124,        1,   149760, 0xc41e3261
+0,        125,        125,        1,   149760, 0xed34ba27
+0,        126,        126,        1,   149760, 0x91e7841c
+0,        127,        127,        1,   149760, 0x1605bd75
+0,        128,        128,        1,   149760, 0xb5af2fbc
+0,        129,        129,        1,   149760, 0x9024b2d8
+0,        130,        130,        1,   149760, 0xda8d3c03
+0,        131,        131,        1,   149760, 0xc23a9686
+0,        132,        132,        1,   149760, 0xf9c8686b
+0,        133,        133,        1,   149760, 0xec09b569
+0,        134,        134,        1,   149760, 0x398df9bb
+0,        135,        135,        1,   149760, 0x716c2934
+0,        136,        136,        1,   149760, 0x0a6ea078
+0,        137,        137,        1,   149760, 0x777739fe
+0,        138,        138,        1,   149760, 0x80417304
+0,        139,        139,        1,   149760, 0xe0a5c378
+0,        140,        140,        1,   149760, 0x9565a659
+0,        141,        141,        1,   149760, 0xdf6f1938
+0,        142,        142,        1,   149760, 0xe60d5639
+0,        143,        143,        1,   149760, 0xa89fa739
+0,        144,        144,        1,   149760, 0xd1529b40
+0,        145,        145,        1,   149760, 0x48a7d440
+0,        146,        146,        1,   149760, 0x5946afbb
+0,        147,        147,        1,   149760, 0x2cad2855
+0,        148,        148,        1,   149760, 0x7ac1d993
+0,        149,        149,        1,   149760, 0x0841a016
+0,        150,        150,        1,   149760, 0x35ea4bd2
+0,        151,        151,        1,   149760, 0x5371effa
+0,        152,        152,        1,   149760, 0xd6445a37
+0,        153,        153,        1,   149760, 0x782ea184
+0,        154,        154,        1,   149760, 0x919c2013
+0,        155,        155,        1,   149760, 0x0ea79614
+0,        156,        156,        1,   149760, 0x1ac0e835
+0,        157,        157,        1,   149760, 0x32a36ada
+0,        158,        158,        1,   149760, 0x6b0ad17c
+0,        159,        159,        1,   149760, 0xcd442d19
+0,        160,        160,        1,   149760, 0x0dd1df50
+0,        161,        161,        1,   149760, 0xe26b248f
+0,        162,        162,        1,   149760, 0x490348bb
+0,        163,        163,        1,   149760, 0x638b547e
+0,        164,        164,        1,   149760, 0xb2cbe2ca
+0,        165,        165,        1,   149760, 0xc6cfaa86
+0,        166,        166,        1,   149760, 0xe2317842
+0,        167,        167,        1,   149760, 0xe6e7cd9b
+0,        168,        168,        1,   149760, 0x55bf48cb
+0,        169,        169,        1,   149760, 0xefee6ea0
+0,        170,        170,        1,   149760, 0x2bb127fa
+0,        171,        171,        1,   149760, 0xebbf0725
+0,        172,        172,        1,   149760, 0xb40718a1
+0,        173,        173,        1,   149760, 0x33c8e7da
+0,        174,        174,        1,   149760, 0xfeea8d03
+0,        175,        175,        1,   149760, 0x52f47fa9
+0,        176,        176,        1,   149760, 0xb08fa2f6
+0,        177,        177,        1,   149760, 0xc9adcd96
+0,        178,        178,        1,   149760, 0xb8981cc2
+0,        179,        179,        1,   149760, 0x547b1eaa
+0,        180,        180,        1,   149760, 0x10733813
+0,        181,        181,        1,   149760, 0x14edfa3d
+0,        182,        182,        1,   149760, 0x28ae8eb3
+0,        183,        183,        1,   149760, 0x9b94a69c
+0,        184,        184,        1,   149760, 0x42f67a2a
+0,        185,        185,        1,   149760, 0x1ead65e6
+0,        186,        186,        1,   149760, 0x30b99840
+0,        187,        187,        1,   149760, 0xafdebbda
+0,        188,        188,        1,   149760, 0xc31cda7f
+0,        189,        189,        1,   149760, 0xe7afdfa8
+0,        190,        190,        1,   149760, 0xc8358146
+0,        191,        191,        1,   149760, 0xb8ea3a3b
+0,        192,        192,        1,   149760, 0xebbb2c0e
+0,        193,        193,        1,   149760, 0xe911c057
+0,        194,        194,        1,   149760, 0x843f3082
+0,        195,        195,        1,   149760, 0xd18f6dcb
+0,        196,        196,        1,   149760, 0xd0f67de3
+0,        197,        197,        1,   149760, 0xa7077645
+0,        198,        198,        1,   149760, 0xb7432bef
+0,        199,        199,        1,   149760, 0x9e3284ee
+0,        200,        200,        1,   149760, 0x931ec601
+0,        201,        201,        1,   149760, 0xd0f92a35
+0,        202,        202,        1,   149760, 0x2141c549
+0,        203,        203,        1,   149760, 0x46abf101
+0,        204,        204,        1,   149760, 0x92069ea7
+0,        205,        205,        1,   149760, 0xbf0dd536
+0,        206,        206,        1,   149760, 0xc0c34245
+0,        207,        207,        1,   149760, 0xd9f60e8b
+0,        208,        208,        1,   149760, 0xe20cb181
+0,        209,        209,        1,   149760, 0xdf58fbd2
+0,        210,        210,        1,   149760, 0xe047e805
+0,        211,        211,        1,   149760, 0xe6dd0520
+0,        212,        212,        1,   149760, 0xa7a1a7dd
+0,        213,        213,        1,   149760, 0x6bd6d799
+0,        214,        214,        1,   149760, 0x9fcbda54
+0,        215,        215,        1,   149760, 0xe9b8bf5a
+0,        216,        216,        1,   149760, 0x818d2b8d
+0,        217,        217,        1,   149760, 0x021c5b55
+0,        218,        218,        1,   149760, 0x0da93d94
+0,        219,        219,        1,   149760, 0x7d66b00d
+0,        220,        220,        1,   149760, 0xf84ab99e
+0,        221,        221,        1,   149760, 0xbc866ed2
+0,        222,        222,        1,   149760, 0x8075f6fa
+0,        223,        223,        1,   149760, 0x64540cad
+0,        224,        224,        1,   149760, 0xf3e28d9a
+0,        225,        225,        1,   149760, 0xb88fef8b
+0,        226,        226,        1,   149760, 0x1c782c83
+0,        227,        227,        1,   149760, 0xb89e4047
+0,        228,        228,        1,   149760, 0x593815a7
+0,        229,        229,        1,   149760, 0xa41a68d1
+0,        230,        230,        1,   149760, 0x7fdc56e5
+0,        231,        231,        1,   149760, 0xea8a0533
+0,        232,        232,        1,   149760, 0xc74709cc
+0,        233,        233,        1,   149760, 0xecca373c
+0,        234,        234,        1,   149760, 0x1dae228f
+0,        235,        235,        1,   149760, 0xbb900da8
+0,        236,        236,        1,   149760, 0xf71e4935
+0,        237,        237,        1,   149760, 0x8587d747
+0,        238,        238,        1,   149760, 0x5382afdd
+0,        239,        239,        1,   149760, 0x4075dea6
+0,        240,        240,        1,   149760, 0x1ccde8f2
+0,        241,        241,        1,   149760, 0x8065ed82
+0,        242,        242,        1,   149760, 0x0726bb8a
+0,        243,        243,        1,   149760, 0xedf2172c
+0,        244,        244,        1,   149760, 0x552cce61
+0,        245,        245,        1,   149760, 0x32851927
+0,        246,        246,        1,   149760, 0x15e8ae45
+0,        247,        247,        1,   149760, 0x9265625c
+0,        248,        248,        1,   149760, 0x11612465
+0,        249,        249,        1,   149760, 0x9f5586fa
+0,        250,        250,        1,   149760, 0x77f295a1
+0,        251,        251,        1,   149760, 0xb0757b88
+0,        252,        252,        1,   149760, 0xa0bd3d9c
+0,        253,        253,        1,   149760, 0x12471db6
+0,        254,        254,        1,   149760, 0x5c329d6b
+0,        255,        255,        1,   149760, 0x62f32654
+0,        256,        256,        1,   149760, 0xeafeb1f0
+0,        257,        257,        1,   149760, 0x707f6647
+0,        258,        258,        1,   149760, 0xe8acda33
+0,        259,        259,        1,   149760, 0x1e9dcb1b
+0,        260,        260,        1,   149760, 0x984a4a40
+0,        261,        261,        1,   149760, 0x066b9585
+0,        262,        262,        1,   149760, 0x5e2d2091
+0,        263,        263,        1,   149760, 0x6a6a5172
+0,        264,        264,        1,   149760, 0xc4c4fe94
+0,        265,        265,        1,   149760, 0x6ed2c46b
+0,        266,        266,        1,   149760, 0x810f27f8
+0,        267,        267,        1,   149760, 0xc27ca970
+0,        268,        268,        1,   149760, 0xfd3dae79
+0,        269,        269,        1,   149760, 0x9744ce6d
+0,        270,        270,        1,   149760, 0x45772f2a
+0,        271,        271,        1,   149760, 0x482ed805
+0,        272,        272,        1,   149760, 0x9606c429
+0,        273,        273,        1,   149760, 0x79a9ca8a
+0,        274,        274,        1,   149760, 0xf625806e
+0,        275,        275,        1,   149760, 0x0c9eed01
+0,        276,        276,        1,   149760, 0xb0007687
+0,        277,        277,        1,   149760, 0x620a7b35
+0,        278,        278,        1,   149760, 0x5d6fa9dc
+0,        279,        279,        1,   149760, 0x92c86275
+0,        280,        280,        1,   149760, 0xca1886f0
+0,        281,        281,        1,   149760, 0x6363a557
+0,        282,        282,        1,   149760, 0x32ab19ca
+0,        283,        283,        1,   149760, 0xa6113c10
+0,        284,        284,        1,   149760, 0x257fd46a
+0,        285,        285,        1,   149760, 0xb8af4e28
+0,        286,        286,        1,   149760, 0x9716d086
+0,        287,        287,        1,   149760, 0x0cc14c4d
+0,        288,        288,        1,   149760, 0xd194f150
+0,        289,        289,        1,   149760, 0xb7cd7cf8
+0,        290,        290,        1,   149760, 0xae1bb1a3
+0,        291,        291,        1,   149760, 0xb4cc355f
+0,        292,        292,        1,   149760, 0x617c1ecb
+0,        293,        293,        1,   149760, 0xf2d1f288
+0,        294,        294,        1,   149760, 0x109bcb52
+0,        295,        295,        1,   149760, 0xe61a97dd
+0,        296,        296,        1,   149760, 0xc629ac10
+0,        297,        297,        1,   149760, 0xb91acded
+0,        298,        298,        1,   149760, 0x54ccb321
+0,        299,        299,        1,   149760, 0x1ad3c115

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-RPS_A_docomo_4 Added

@@ -0,0 +1,45 @@
+#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, 0x7a3a0c9a
+0,          4,          4,        1,   149760, 0xab0ed81d
+0,          5,          5,        1,   149760, 0xe2d4722a
+0,          6,          6,        1,   149760, 0x1df1f103
+0,          7,          7,        1,   149760, 0xdde42fb8
+0,          8,          8,        1,   149760, 0xfe2eb624
+0,          9,          9,        1,   149760, 0x121ff262
+0,         10,         10,        1,   149760, 0x64e5e7ba
+0,         11,         11,        1,   149760, 0x61b40e67
+0,         12,         12,        1,   149760, 0x8ceeb33f
+0,         13,         13,        1,   149760, 0xcbff6fc5
+0,         14,         14,        1,   149760, 0x07d6f767
+0,         15,         15,        1,   149760, 0x5cff14a5
+0,         16,         16,        1,   149760, 0x5c336ca3
+0,         17,         17,        1,   149760, 0x424990cd
+0,         18,         18,        1,   149760, 0x2c423459
+0,         19,         19,        1,   149760, 0xaff700ac
+0,         20,         20,        1,   149760, 0xaab9e6f4
+0,         21,         21,        1,   149760, 0x7979bfd4
+0,         22,         22,        1,   149760, 0x5096ee11
+0,         23,         23,        1,   149760, 0x4f02d1d0
+0,         24,         24,        1,   149760, 0x0c6468d2
+0,         25,         25,        1,   149760, 0x707e9307
+0,         26,         26,        1,   149760, 0xf4a71dc8
+0,         27,         27,        1,   149760, 0xbefc67f0
+0,         28,         28,        1,   149760, 0x05b8f3a9
+0,         29,         29,        1,   149760, 0xcd080a46
+0,         30,         30,        1,   149760, 0x1b5ab043
+0,         31,         31,        1,   149760, 0xd4b896e2
+0,         32,         32,        1,   149760, 0xbd342d08
+0,         33,         33,        1,   149760, 0x0b993f3c
+0,         34,         34,        1,   149760, 0xd89190e2
+0,         35,         35,        1,   149760, 0x507f2663
+0,         36,         36,        1,   149760, 0x6994c08f
+0,         37,         37,        1,   149760, 0xcf0209b2
+0,         38,         38,        1,   149760, 0x9695327c
+0,         39,         39,        1,   149760, 0x7116fdb3
+0,         40,         40,        1,   149760, 0x1294b154
+0,         41,         41,        1,   149760, 0x7ed1f716
+0,         42,         42,        1,   149760, 0xdc4880da
+0,         43,         43,        1,   149760, 0xa5955d35

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-RPS_B_qualcomm_5 Added

@@ -0,0 +1,301 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0xdb5e3b56
+0,          1,          1,        1,   149760, 0xe328e677
+0,          2,          2,        1,   149760, 0x8f18f4c0
+0,          3,          3,        1,   149760, 0xf48de64c
+0,          4,          4,        1,   149760, 0x2937ad23
+0,          5,          5,        1,   149760, 0x93f166d2
+0,          6,          6,        1,   149760, 0x80e4e9c2
+0,          7,          7,        1,   149760, 0xb2a35da7
+0,          8,          8,        1,   149760, 0xf4fbb5c2
+0,          9,          9,        1,   149760, 0x2193bd91
+0,         10,         10,        1,   149760, 0xd4eec3b4
+0,         11,         11,        1,   149760, 0xb2e20b91
+0,         12,         12,        1,   149760, 0xaf8d17dc
+0,         13,         13,        1,   149760, 0x2189ac78
+0,         14,         14,        1,   149760, 0x52b8130f
+0,         15,         15,        1,   149760, 0xdfbc2f0a
+0,         16,         16,        1,   149760, 0x4c0269cf
+0,         17,         17,        1,   149760, 0xf99bb7d2
+0,         18,         18,        1,   149760, 0xada1495f
+0,         19,         19,        1,   149760, 0x57c42893
+0,         20,         20,        1,   149760, 0x022d29ca
+0,         21,         21,        1,   149760, 0x9883a271
+0,         22,         22,        1,   149760, 0xc8c132d7
+0,         23,         23,        1,   149760, 0xa97f8b43
+0,         24,         24,        1,   149760, 0x1bc187fa
+0,         25,         25,        1,   149760, 0x7b93951b
+0,         26,         26,        1,   149760, 0x88fd367c
+0,         27,         27,        1,   149760, 0x29471b92
+0,         28,         28,        1,   149760, 0x3ba820f1
+0,         29,         29,        1,   149760, 0x0a223169
+0,         30,         30,        1,   149760, 0x70fee1d5
+0,         31,         31,        1,   149760, 0x5f5cf053
+0,         32,         32,        1,   149760, 0x698f11e4
+0,         33,         33,        1,   149760, 0x65314fd4
+0,         34,         34,        1,   149760, 0x7a689450
+0,         35,         35,        1,   149760, 0x28774ca0
+0,         36,         36,        1,   149760, 0x0751f804
+0,         37,         37,        1,   149760, 0x875a6fb9
+0,         38,         38,        1,   149760, 0xde1f5309
+0,         39,         39,        1,   149760, 0x82701dd6
+0,         40,         40,        1,   149760, 0x13a2f45e
+0,         41,         41,        1,   149760, 0xfc3b140c
+0,         42,         42,        1,   149760, 0x4518ab47
+0,         43,         43,        1,   149760, 0xe5459482
+0,         44,         44,        1,   149760, 0x4cfafc6e
+0,         45,         45,        1,   149760, 0xc7cd5e43
+0,         46,         46,        1,   149760, 0x1ee79746
+0,         47,         47,        1,   149760, 0xccc73c83
+0,         48,         48,        1,   149760, 0xd9ecafc7
+0,         49,         49,        1,   149760, 0x65221c9d
+0,         50,         50,        1,   149760, 0x219b0b4b
+0,         51,         51,        1,   149760, 0x9d1e2010
+0,         52,         52,        1,   149760, 0x11685e16
+0,         53,         53,        1,   149760, 0x37eb1297
+0,         54,         54,        1,   149760, 0x99088778
+0,         55,         55,        1,   149760, 0xb41cbf25
+0,         56,         56,        1,   149760, 0x56f78bda
+0,         57,         57,        1,   149760, 0x6c284868
+0,         58,         58,        1,   149760, 0x37f245b9
+0,         59,         59,        1,   149760, 0x79682de2
+0,         60,         60,        1,   149760, 0x5a04f379
+0,         61,         61,        1,   149760, 0xfecc668b
+0,         62,         62,        1,   149760, 0x29328d8c
+0,         63,         63,        1,   149760, 0x8aff3ad7
+0,         64,         64,        1,   149760, 0x4035f027
+0,         65,         65,        1,   149760, 0xe7cead1d
+0,         66,         66,        1,   149760, 0x18578492
+0,         67,         67,        1,   149760, 0xd3ab3f9d
+0,         68,         68,        1,   149760, 0x6f866e38
+0,         69,         69,        1,   149760, 0x6a47800c
+0,         70,         70,        1,   149760, 0x01c6305e
+0,         71,         71,        1,   149760, 0x489ab5a8
+0,         72,         72,        1,   149760, 0xb2570787
+0,         73,         73,        1,   149760, 0xb0d5d478
+0,         74,         74,        1,   149760, 0x88484ccc
+0,         75,         75,        1,   149760, 0xb4c6be2c
+0,         76,         76,        1,   149760, 0x461d874c
+0,         77,         77,        1,   149760, 0x3be464b0
+0,         78,         78,        1,   149760, 0x06aa9443
+0,         79,         79,        1,   149760, 0xe0e625a3
+0,         80,         80,        1,   149760, 0x17e2daeb
+0,         81,         81,        1,   149760, 0x58a1a350
+0,         82,         82,        1,   149760, 0xcd4983ce
+0,         83,         83,        1,   149760, 0x90459a42
+0,         84,         84,        1,   149760, 0x899dedaa
+0,         85,         85,        1,   149760, 0x814e3529
+0,         86,         86,        1,   149760, 0x5795a2e5
+0,         87,         87,        1,   149760, 0xcedb245c
+0,         88,         88,        1,   149760, 0x37f9dd30
+0,         89,         89,        1,   149760, 0x320d899e
+0,         90,         90,        1,   149760, 0x6a33ffca
+0,         91,         91,        1,   149760, 0x6620b9eb
+0,         92,         92,        1,   149760, 0xfc8b1e1b
+0,         93,         93,        1,   149760, 0x835a0dd9
+0,         94,         94,        1,   149760, 0xcee4a9b0
+0,         95,         95,        1,   149760, 0x2c2972f0
+0,         96,         96,        1,   149760, 0x0a39aa8b
+0,         97,         97,        1,   149760, 0xa8a9c0bf
+0,         98,         98,        1,   149760, 0xd563c087
+0,         99,         99,        1,   149760, 0xb0f88320
+0,        100,        100,        1,   149760, 0x0ffffd6b
+0,        101,        101,        1,   149760, 0x95269e8c
+0,        102,        102,        1,   149760, 0xd0d4acd9
+0,        103,        103,        1,   149760, 0x7cf06805
+0,        104,        104,        1,   149760, 0xa5192bbe
+0,        105,        105,        1,   149760, 0x2fed928b
+0,        106,        106,        1,   149760, 0x549edd04
+0,        107,        107,        1,   149760, 0xa42b55d7
+0,        108,        108,        1,   149760, 0xeab32579
+0,        109,        109,        1,   149760, 0x95a727c3
+0,        110,        110,        1,   149760, 0x76714576
+0,        111,        111,        1,   149760, 0x5efc352a
+0,        112,        112,        1,   149760, 0x154a2c06
+0,        113,        113,        1,   149760, 0x516faf62
+0,        114,        114,        1,   149760, 0x622b6d64
+0,        115,        115,        1,   149760, 0x2ada08a9
+0,        116,        116,        1,   149760, 0xf24efa06
+0,        117,        117,        1,   149760, 0x5979b33e
+0,        118,        118,        1,   149760, 0x2130a282
+0,        119,        119,        1,   149760, 0x1ee8b3d1
+0,        120,        120,        1,   149760, 0x840c6913
+0,        121,        121,        1,   149760, 0xa37049b8
+0,        122,        122,        1,   149760, 0x8d95efb0
+0,        123,        123,        1,   149760, 0x22d3afb2
+0,        124,        124,        1,   149760, 0x113d6c6f
+0,        125,        125,        1,   149760, 0xb407014d
+0,        126,        126,        1,   149760, 0x33a8e5c9
+0,        127,        127,        1,   149760, 0x2689ced2
+0,        128,        128,        1,   149760, 0x3eaf3f55
+0,        129,        129,        1,   149760, 0x93ad7fa5
+0,        130,        130,        1,   149760, 0x30c15154
+0,        131,        131,        1,   149760, 0xdce68c7a
+0,        132,        132,        1,   149760, 0xea092d4c
+0,        133,        133,        1,   149760, 0xed679468
+0,        134,        134,        1,   149760, 0x9128c0d5
+0,        135,        135,        1,   149760, 0xd4f121ba
+0,        136,        136,        1,   149760, 0xe5e228f0
+0,        137,        137,        1,   149760, 0x8246dae3
+0,        138,        138,        1,   149760, 0x8a3b430c
+0,        139,        139,        1,   149760, 0x9a8edc3d
+0,        140,        140,        1,   149760, 0x68b0af97
+0,        141,        141,        1,   149760, 0x90d54b52
+0,        142,        142,        1,   149760, 0xd6395796
+0,        143,        143,        1,   149760, 0x70986b40
+0,        144,        144,        1,   149760, 0xc0b4a9c8
+0,        145,        145,        1,   149760, 0x760b973b
+0,        146,        146,        1,   149760, 0xe8fe9846
+0,        147,        147,        1,   149760, 0x61062c97
+0,        148,        148,        1,   149760, 0x9148e99b
+0,        149,        149,        1,   149760, 0x962c6a1e
+0,        150,        150,        1,   149760, 0x57bb088f
+0,        151,        151,        1,   149760, 0x2b0fa8c5
+0,        152,        152,        1,   149760, 0x00f932fc
+0,        153,        153,        1,   149760, 0x4cc58697
+0,        154,        154,        1,   149760, 0xd2bf178f
+0,        155,        155,        1,   149760, 0xc510c1cd
+0,        156,        156,        1,   149760, 0xc48e0192
+0,        157,        157,        1,   149760, 0xa03e7fe5
+0,        158,        158,        1,   149760, 0xb68ce060
+0,        159,        159,        1,   149760, 0x653951c8
+0,        160,        160,        1,   149760, 0xbd1abe11
+0,        161,        161,        1,   149760, 0xad7a2366
+0,        162,        162,        1,   149760, 0xb018279e
+0,        163,        163,        1,   149760, 0xd5994bff
+0,        164,        164,        1,   149760, 0x3eb7e082
+0,        165,        165,        1,   149760, 0x87257b3a
+0,        166,        166,        1,   149760, 0x12fc4c4d
+0,        167,        167,        1,   149760, 0x9fbfa94d
+0,        168,        168,        1,   149760, 0x61714cae
+0,        169,        169,        1,   149760, 0xae291b59
+0,        170,        170,        1,   149760, 0x8f161442
+0,        171,        171,        1,   149760, 0x603cf3a5
+0,        172,        172,        1,   149760, 0xf9f214a0
+0,        173,        173,        1,   149760, 0xbbf5dcb9
+0,        174,        174,        1,   149760, 0x8af1a1ab
+0,        175,        175,        1,   149760, 0x16f581e5
+0,        176,        176,        1,   149760, 0xdadd8eed
+0,        177,        177,        1,   149760, 0x2f1acd8e
+0,        178,        178,        1,   149760, 0xa28bd660
+0,        179,        179,        1,   149760, 0x7902dd67
+0,        180,        180,        1,   149760, 0x9b771dc2
+0,        181,        181,        1,   149760, 0x0fc82bda
+0,        182,        182,        1,   149760, 0xd6128167
+0,        183,        183,        1,   149760, 0xe57b7a2f
+0,        184,        184,        1,   149760, 0x1e158d0e
+0,        185,        185,        1,   149760, 0x682c7c60
+0,        186,        186,        1,   149760, 0x32096bbe
+0,        187,        187,        1,   149760, 0x297652f2
+0,        188,        188,        1,   149760, 0x056c7432
+0,        189,        189,        1,   149760, 0x0469b39a
+0,        190,        190,        1,   149760, 0x00044bc9
+0,        191,        191,        1,   149760, 0x766c0bad
+0,        192,        192,        1,   149760, 0xd6720a40
+0,        193,        193,        1,   149760, 0x814895eb
+0,        194,        194,        1,   149760, 0x1a84fcbc
+0,        195,        195,        1,   149760, 0x8b9442aa
+0,        196,        196,        1,   149760, 0x290187d1
+0,        197,        197,        1,   149760, 0x8f87294f
+0,        198,        198,        1,   149760, 0x8c49a125
+0,        199,        199,        1,   149760, 0xe169806a
+0,        200,        200,        1,   149760, 0x18c0e2f1
+0,        201,        201,        1,   149760, 0xb92b0e67
+0,        202,        202,        1,   149760, 0x98d2acef
+0,        203,        203,        1,   149760, 0x179eeaec
+0,        204,        204,        1,   149760, 0xa054a7bb
+0,        205,        205,        1,   149760, 0x5f78d160
+0,        206,        206,        1,   149760, 0x09f9a40f
+0,        207,        207,        1,   149760, 0xfb4a59f5
+0,        208,        208,        1,   149760, 0xdc5ca1f2
+0,        209,        209,        1,   149760, 0xf2254927
+0,        210,        210,        1,   149760, 0xfda4fab3
+0,        211,        211,        1,   149760, 0x45ab23cc
+0,        212,        212,        1,   149760, 0x1f69c006
+0,        213,        213,        1,   149760, 0x326bb5a1
+0,        214,        214,        1,   149760, 0x810dad28
+0,        215,        215,        1,   149760, 0x96dfc515
+0,        216,        216,        1,   149760, 0xc685fd80
+0,        217,        217,        1,   149760, 0x18da42f4
+0,        218,        218,        1,   149760, 0x11773807
+0,        219,        219,        1,   149760, 0x3f54c458
+0,        220,        220,        1,   149760, 0xa5dff146
+0,        221,        221,        1,   149760, 0x4bc3ffcb
+0,        222,        222,        1,   149760, 0x84801971
+0,        223,        223,        1,   149760, 0x2ff65539
+0,        224,        224,        1,   149760, 0x8a7f716d
+0,        225,        225,        1,   149760, 0xe7e8cdd0
+0,        226,        226,        1,   149760, 0xc8567d5f
+0,        227,        227,        1,   149760, 0x63986bcd
+0,        228,        228,        1,   149760, 0x8817f648
+0,        229,        229,        1,   149760, 0xa0152e36
+0,        230,        230,        1,   149760, 0x2eca851e
+0,        231,        231,        1,   149760, 0x09c0f0cb
+0,        232,        232,        1,   149760, 0xf1c81b23
+0,        233,        233,        1,   149760, 0x93096c98
+0,        234,        234,        1,   149760, 0x1fe47331
+0,        235,        235,        1,   149760, 0x79c0b70e
+0,        236,        236,        1,   149760, 0xb1929b60
+0,        237,        237,        1,   149760, 0xb42ea35a
+0,        238,        238,        1,   149760, 0x42d5bf86
+0,        239,        239,        1,   149760, 0xa83efbd4
+0,        240,        240,        1,   149760, 0xbdd2f313
+0,        241,        241,        1,   149760, 0x85a5dbd4
+0,        242,        242,        1,   149760, 0xc475b180
+0,        243,        243,        1,   149760, 0x63911e68
+0,        244,        244,        1,   149760, 0x5b79baab
+0,        245,        245,        1,   149760, 0xa22d310e
+0,        246,        246,        1,   149760, 0x243ef7b5
+0,        247,        247,        1,   149760, 0x813fdc95
+0,        248,        248,        1,   149760, 0xbb7d19fa
+0,        249,        249,        1,   149760, 0x199ae62c
+0,        250,        250,        1,   149760, 0x7a4ce5b2
+0,        251,        251,        1,   149760, 0xd632a9d3
+0,        252,        252,        1,   149760, 0xc07b75fe
+0,        253,        253,        1,   149760, 0x5bae6a88
+0,        254,        254,        1,   149760, 0x29b411e0
+0,        255,        255,        1,   149760, 0x78706cbe
+0,        256,        256,        1,   149760, 0x2659a6cb
+0,        257,        257,        1,   149760, 0xefb170f8
+0,        258,        258,        1,   149760, 0x9dd107b8
+0,        259,        259,        1,   149760, 0xf38b5ce5
+0,        260,        260,        1,   149760, 0xd7e0f10e
+0,        261,        261,        1,   149760, 0x080b9e49
+0,        262,        262,        1,   149760, 0xa2274c3b
+0,        263,        263,        1,   149760, 0x3d3376c9
+0,        264,        264,        1,   149760, 0xe04719e3
+0,        265,        265,        1,   149760, 0xfe4123e3
+0,        266,        266,        1,   149760, 0x769a3cf6
+0,        267,        267,        1,   149760, 0xaf0be9e6
+0,        268,        268,        1,   149760, 0xe9baa873
+0,        269,        269,        1,   149760, 0x4f5fb405
+0,        270,        270,        1,   149760, 0x207b401e
+0,        271,        271,        1,   149760, 0xb1483351
+0,        272,        272,        1,   149760, 0x5fe3dc9f
+0,        273,        273,        1,   149760, 0xb35dcae7
+0,        274,        274,        1,   149760, 0x8cc69de4
+0,        275,        275,        1,   149760, 0xd6e29308
+0,        276,        276,        1,   149760, 0xf8f53227
+0,        277,        277,        1,   149760, 0xaf483e80
+0,        278,        278,        1,   149760, 0x287cdfc9
+0,        279,        279,        1,   149760, 0xf72b93eb
+0,        280,        280,        1,   149760, 0x09c26976
+0,        281,        281,        1,   149760, 0xae58601f
+0,        282,        282,        1,   149760, 0x7f951546
+0,        283,        283,        1,   149760, 0x81e742b2
+0,        284,        284,        1,   149760, 0xb16554a6
+0,        285,        285,        1,   149760, 0xcdafc4c0
+0,        286,        286,        1,   149760, 0x0bb335bc
+0,        287,        287,        1,   149760, 0xe1e4ba60
+0,        288,        288,        1,   149760, 0xcce3eb48
+0,        289,        289,        1,   149760, 0x8b8992a9
+0,        290,        290,        1,   149760, 0x0a5ff2f6
+0,        291,        291,        1,   149760, 0xb04b8ed1
+0,        292,        292,        1,   149760, 0x0c874aae
+0,        293,        293,        1,   149760, 0x19d6f138
+0,        294,        294,        1,   149760, 0x30e322f2
+0,        295,        295,        1,   149760, 0x67a5700c
+0,        296,        296,        1,   149760, 0xb65bd462
+0,        297,        297,        1,   149760, 0xe267d09e
+0,        298,        298,        1,   149760, 0x8824c043
+0,        299,        299,        1,   149760, 0x680cfc20

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-RPS_C_ericsson_5 Added

@@ -0,0 +1,41 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x8ce7200b
+0,          1,          1,        1,   149760, 0x85340cda
+0,          2,          2,        1,   149760, 0x16fd1f91
+0,          3,          3,        1,   149760, 0x7d8d312d
+0,          4,          4,        1,   149760, 0xae6ed875
+0,          5,          5,        1,   149760, 0xccac730a
+0,          6,          6,        1,   149760, 0x3d321c3f
+0,          7,          7,        1,   149760, 0x18e05688
+0,          8,          8,        1,   149760, 0x23fec4de
+0,          9,          9,        1,   149760, 0x3e0de0ca
+0,         10,         10,        1,   149760, 0x4789e861
+0,         11,         11,        1,   149760, 0x34550f71
+0,         12,         12,        1,   149760, 0xb0b1b4a7
+0,         13,         13,        1,   149760, 0xb9b8967e
+0,         14,         14,        1,   149760, 0x92e7f3c5
+0,         15,         15,        1,   149760, 0x61c0f62e
+0,         16,         16,        1,   149760, 0x819648c5
+0,         17,         17,        1,   149760, 0xe0286f95
+0,         18,         18,        1,   149760, 0xc2d85311
+0,         19,         19,        1,   149760, 0xbb07ec4e
+0,         20,         20,        1,   149760, 0xe073f10b
+0,         21,         21,        1,   149760, 0xd2e8c52f
+0,         22,         22,        1,   149760, 0x12020583
+0,         23,         23,        1,   149760, 0x0dfecaba
+0,         24,         24,        1,   149760, 0xe35f8ee5
+0,         25,         25,        1,   149760, 0x267bbf14
+0,         26,         26,        1,   149760, 0x371037a8
+0,         27,         27,        1,   149760, 0x3d188434
+0,         28,         28,        1,   149760, 0xce81fd31
+0,         29,         29,        1,   149760, 0xfbbf2801
+0,         30,         30,        1,   149760, 0x9af9d1b6
+0,         31,         31,        1,   149760, 0x14e2feea
+0,         32,         32,        1,   149760, 0x83f04b3a
+0,         33,         33,        1,   149760, 0xfc30687f
+0,         34,         34,        1,   149760, 0xaec2be07
+0,         35,         35,        1,   149760, 0xc7da6926
+0,         36,         36,        1,   149760, 0x50d20e8e
+0,         37,         37,        1,   149760, 0xd0fa63e9
+0,         38,         38,        1,   149760, 0x9d15906a
+0,         39,         39,        1,   149760, 0x4c685317

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-RPS_D_ericsson_6 Added

@@ -0,0 +1,69 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x8ce7200b
+0,          2,          2,        1,   149760, 0x73610669
+0,          3,          3,        1,   149760, 0xc01620f4
+0,          4,          4,        1,   149760, 0x847a4297
+0,          5,          5,        1,   149760, 0xb4d3e870
+0,          6,          6,        1,   149760, 0xc2dd98a6
+0,          7,          7,        1,   149760, 0xefd02009
+0,          8,          8,        1,   149760, 0x3ae86ed0
+0,          9,          9,        1,   149760, 0x92f3cfb6
+0,         10,         10,        1,   149760, 0x0393e437
+0,         11,         11,        1,   149760, 0x6b29ea60
+0,         12,         12,        1,   149760, 0x9cb1216a
+0,         13,         13,        1,   149760, 0x82c2b1c4
+0,         14,         14,        1,   149760, 0x74899241
+0,         15,         15,        1,   149760, 0xa561f720
+0,         16,         16,        1,   149760, 0x339a11f6
+0,         17,         17,        1,   149760, 0x6bd9772b
+0,         18,         18,        1,   149760, 0x0a0c7c7d
+0,         19,         19,        1,   149760, 0x38426f65
+0,         20,         20,        1,   149760, 0x134ee7b3
+0,         21,         21,        1,   149760, 0xe436e35c
+0,         22,         22,        1,   149760, 0x4174d949
+0,         23,         23,        1,   149760, 0x44e60f0d
+0,         24,         24,        1,   149760, 0xbb6fb0a4
+0,         25,         25,        1,   149760, 0x715a653e
+0,         26,         26,        1,   149760, 0xad11b160
+0,         27,         27,        1,   149760, 0xfa6b368e
+0,         28,         28,        1,   149760, 0x60ff970f
+0,         29,         29,        1,   149760, 0x16430649
+0,         30,         30,        1,   149760, 0xa6cc0767
+0,         31,         31,        1,   149760, 0x59b0c566
+0,         32,         32,        1,   149760, 0xc9e3dfa9
+0,         33,         33,        1,   149760, 0x82873917
+0,         34,         34,        1,   149760, 0xc49e5d22
+0,         35,         35,        1,   149760, 0x416890a8
+0,         36,         36,        1,   149760, 0x386e57e8
+0,         37,         37,        1,   149760, 0x1c27e9d7
+0,         38,         38,        1,   149760, 0x85425596
+0,         39,         39,        1,   149760, 0xe6107df8
+0,         40,         40,        1,   149760, 0x056a3977
+0,         41,         41,        1,   149760, 0x753cf7f7
+0,         42,         42,        1,   149760, 0xc4005218
+0,         43,         43,        1,   149760, 0xce7edcf2
+0,         44,         44,        1,   149760, 0x93465fee
+0,         45,         45,        1,   149760, 0xa21b040a
+0,         46,         46,        1,   149760, 0xd82a53d5
+0,         47,         47,        1,   149760, 0x8f8fd3ae
+0,         48,         48,        1,   149760, 0x52420da5
+0,         49,         49,        1,   149760, 0xa899a9be
+0,         50,         50,        1,   149760, 0xcd85e363
+0,         51,         51,        1,   149760, 0x1a9240c4
+0,         52,         52,        1,   149760, 0xf0b11a36
+0,         53,         53,        1,   149760, 0xcf175809
+0,         54,         54,        1,   149760, 0x24afecc2
+0,         55,         55,        1,   149760, 0x874f7176
+0,         56,         56,        1,   149760, 0xb126dff9
+0,         57,         57,        1,   149760, 0x825ba060
+0,         58,         58,        1,   149760, 0x18c55eed
+0,         59,         59,        1,   149760, 0xf09b03f0
+0,         60,         60,        1,   149760, 0xf4dafd64
+0,         61,         61,        1,   149760, 0x08b49190
+0,         62,         62,        1,   149760, 0xcf336dc7
+0,         63,         63,        1,   149760, 0x51c65c08
+0,         64,         64,        1,   149760, 0x6cfe3433
+0,         65,         65,        1,   149760, 0x4b0af196
+0,         66,         66,        1,   149760, 0xffaeb2db
+0,         67,         67,        1,   149760, 0xa990a19f
+0,         68,         68,        1,   149760, 0x7ed944a3

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-RPS_E_qualcomm_5 Added

@@ -0,0 +1,301 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x8edb27d7
+0,          1,          1,        1,   149760, 0xd62a31bc
+0,          2,          2,        1,   149760, 0xec822f84
+0,          3,          3,        1,   149760, 0x7a0a0f25
+0,          4,          4,        1,   149760, 0x461dd882
+0,          5,          5,        1,   149760, 0x62777923
+0,          6,          6,        1,   149760, 0x063c2559
+0,          7,          7,        1,   149760, 0x03b34c02
+0,          8,          8,        1,   149760, 0xe999bdad
+0,          9,          9,        1,   149760, 0x3285f731
+0,         10,         10,        1,   149760, 0x1f8ffaaa
+0,         11,         11,        1,   149760, 0xd7c956f4
+0,         12,         12,        1,   149760, 0xb9e3da56
+0,         13,         13,        1,   149760, 0x1200953f
+0,         14,         14,        1,   149760, 0x06c212cc
+0,         15,         15,        1,   149760, 0xaaa84f01
+0,         16,         16,        1,   149760, 0x7a606de8
+0,         17,         17,        1,   149760, 0x47e49e5a
+0,         18,         18,        1,   149760, 0x666a3370
+0,         19,         19,        1,   149760, 0x187b6b6c
+0,         20,         20,        1,   149760, 0x3c8f0ef4
+0,         21,         21,        1,   149760, 0xc3e59d36
+0,         22,         22,        1,   149760, 0xecb40b3b
+0,         23,         23,        1,   149760, 0x0ae9e31e
+0,         24,         24,        1,   149760, 0xd324746b
+0,         25,         25,        1,   149760, 0xc337c3d5
+0,         26,         26,        1,   149760, 0xd3883c16
+0,         27,         27,        1,   149760, 0xa28b836c
+0,         28,         28,        1,   149760, 0x1cd61f86
+0,         29,         29,        1,   149760, 0x52b51344
+0,         30,         30,        1,   149760, 0x3980a396
+0,         31,         31,        1,   149760, 0x85d0e262
+0,         32,         32,        1,   149760, 0xbd342d08
+0,         33,         33,        1,   149760, 0xc6114038
+0,         34,         34,        1,   149760, 0xc3ab6ca9
+0,         35,         35,        1,   149760, 0x6db56aa7
+0,         36,         36,        1,   149760, 0x22df9ab0
+0,         37,         37,        1,   149760, 0xfa6d2caf
+0,         38,         38,        1,   149760, 0xc1b64e52
+0,         39,         39,        1,   149760, 0x4b9c1d64
+0,         40,         40,        1,   149760, 0xbab6de8f
+0,         41,         41,        1,   149760, 0xfc0e1193
+0,         42,         42,        1,   149760, 0x8fa0a268
+0,         43,         43,        1,   149760, 0x80cf5e07
+0,         44,         44,        1,   149760, 0xe9720cd6
+0,         45,         45,        1,   149760, 0xa9bb2593
+0,         46,         46,        1,   149760, 0xc2e3e7c6
+0,         47,         47,        1,   149760, 0xc9a4ffd6
+0,         48,         48,        1,   149760, 0x9acebbe2
+0,         49,         49,        1,   149760, 0xb3a6bee1
+0,         50,         50,        1,   149760, 0xd1f12057
+0,         51,         51,        1,   149760, 0x9a2306c0
+0,         52,         52,        1,   149760, 0xd1ee37ff
+0,         53,         53,        1,   149760, 0xb0e1dca1
+0,         54,         54,        1,   149760, 0x35646e46
+0,         55,         55,        1,   149760, 0x803baac5
+0,         56,         56,        1,   149760, 0x7ee17b15
+0,         57,         57,        1,   149760, 0x03274ce1
+0,         58,         58,        1,   149760, 0xf3db2fea
+0,         59,         59,        1,   149760, 0xc3c4ff33
+0,         60,         60,        1,   149760, 0x0fc4786e
+0,         61,         61,        1,   149760, 0x27505756
+0,         62,         62,        1,   149760, 0x4c797266
+0,         63,         63,        1,   149760, 0xeba43f1b
+0,         64,         64,        1,   149760, 0x1ae5f13d
+0,         65,         65,        1,   149760, 0x97e186b1
+0,         66,         66,        1,   149760, 0xc0556895
+0,         67,         67,        1,   149760, 0x4e4d18ed
+0,         68,         68,        1,   149760, 0x39811c80
+0,         69,         69,        1,   149760, 0x6bca8c2f
+0,         70,         70,        1,   149760, 0x27ec4807
+0,         71,         71,        1,   149760, 0x50cea38b
+0,         72,         72,        1,   149760, 0x7ec4c09d
+0,         73,         73,        1,   149760, 0xb2a8afee
+0,         74,         74,        1,   149760, 0x0e943cbf
+0,         75,         75,        1,   149760, 0x7c119ea8
+0,         76,         76,        1,   149760, 0x71e194e5
+0,         77,         77,        1,   149760, 0x6a5d792d
+0,         78,         78,        1,   149760, 0xb8aeb406
+0,         79,         79,        1,   149760, 0x263767f2
+0,         80,         80,        1,   149760, 0xcfbef5ae
+0,         81,         81,        1,   149760, 0xad7eb01c
+0,         82,         82,        1,   149760, 0x612d937d
+0,         83,         83,        1,   149760, 0x90a591fd
+0,         84,         84,        1,   149760, 0x582a60dd
+0,         85,         85,        1,   149760, 0x2640124e
+0,         86,         86,        1,   149760, 0x1c12b037
+0,         87,         87,        1,   149760, 0xc916c4e7
+0,         88,         88,        1,   149760, 0x43d2bfe6
+0,         89,         89,        1,   149760, 0xdc7460c4
+0,         90,         90,        1,   149760, 0xc46e21a8
+0,         91,         91,        1,   149760, 0xe08dbd50
+0,         92,         92,        1,   149760, 0xf40bceed
+0,         93,         93,        1,   149760, 0x0ab01b81
+0,         94,         94,        1,   149760, 0xe6ab1f16
+0,         95,         95,        1,   149760, 0x6b4f6a62
+0,         96,         96,        1,   149760, 0x8ff7a1a1
+0,         97,         97,        1,   149760, 0x079be281
+0,         98,         98,        1,   149760, 0xa24bc187
+0,         99,         99,        1,   149760, 0xfbed7e79
+0,        100,        100,        1,   149760, 0xa27c2048
+0,        101,        101,        1,   149760, 0xe6119831
+0,        102,        102,        1,   149760, 0xc75684c6
+0,        103,        103,        1,   149760, 0x76575ef4
+0,        104,        104,        1,   149760, 0xebd32a7e
+0,        105,        105,        1,   149760, 0x6e5c703a
+0,        106,        106,        1,   149760, 0x3c43d0b3
+0,        107,        107,        1,   149760, 0xcc3354af
+0,        108,        108,        1,   149760, 0xa7bc26f3
+0,        109,        109,        1,   149760, 0xb04b0400
+0,        110,        110,        1,   149760, 0x3e5d3995
+0,        111,        111,        1,   149760, 0x549331ae
+0,        112,        112,        1,   149760, 0xd39031c0
+0,        113,        113,        1,   149760, 0xada1a1bd
+0,        114,        114,        1,   149760, 0xd08a4bcb
+0,        115,        115,        1,   149760, 0xcbefb4fa
+0,        116,        116,        1,   149760, 0xb311a7e0
+0,        117,        117,        1,   149760, 0xab23a6f2
+0,        118,        118,        1,   149760, 0xa90a6dfb
+0,        119,        119,        1,   149760, 0xafcc72b7
+0,        120,        120,        1,   149760, 0xe7c48044
+0,        121,        121,        1,   149760, 0x4449cf72
+0,        122,        122,        1,   149760, 0xfe4ba9d7
+0,        123,        123,        1,   149760, 0x76623bda
+0,        124,        124,        1,   149760, 0x8d071b0b
+0,        125,        125,        1,   149760, 0x777aaefa
+0,        126,        126,        1,   149760, 0xab995bab
+0,        127,        127,        1,   149760, 0xfd0e8e0c
+0,        128,        128,        1,   149760, 0xb6d651e5
+0,        129,        129,        1,   149760, 0x0646c2d0
+0,        130,        130,        1,   149760, 0xefc2561a
+0,        131,        131,        1,   149760, 0xaa86dcd1
+0,        132,        132,        1,   149760, 0x0caf821e
+0,        133,        133,        1,   149760, 0x55a5e7fa
+0,        134,        134,        1,   149760, 0x1a011bae
+0,        135,        135,        1,   149760, 0xe7a922b2
+0,        136,        136,        1,   149760, 0x4b968175
+0,        137,        137,        1,   149760, 0xc0bc1018
+0,        138,        138,        1,   149760, 0x58775461
+0,        139,        139,        1,   149760, 0x77dad082
+0,        140,        140,        1,   149760, 0x995e78d7
+0,        141,        141,        1,   149760, 0xc6360898
+0,        142,        142,        1,   149760, 0xbd0b48ce
+0,        143,        143,        1,   149760, 0x6d076602
+0,        144,        144,        1,   149760, 0xc3459e98
+0,        145,        145,        1,   149760, 0x8e53625e
+0,        146,        146,        1,   149760, 0xd1ba7915
+0,        147,        147,        1,   149760, 0xf41a48e7
+0,        148,        148,        1,   149760, 0xc3fbdcc3
+0,        149,        149,        1,   149760, 0x1f726dcf
+0,        150,        150,        1,   149760, 0x6f882d61
+0,        151,        151,        1,   149760, 0x2e02c8c5
+0,        152,        152,        1,   149760, 0x35ed54c6
+0,        153,        153,        1,   149760, 0x11dd8c48
+0,        154,        154,        1,   149760, 0xc95bf20b
+0,        155,        155,        1,   149760, 0x64f96433
+0,        156,        156,        1,   149760, 0x1ab5d8d5
+0,        157,        157,        1,   149760, 0x3af856f0
+0,        158,        158,        1,   149760, 0xdaa3bd1b
+0,        159,        159,        1,   149760, 0x25c64816
+0,        160,        160,        1,   149760, 0x6a4cc5d7
+0,        161,        161,        1,   149760, 0xf8e815f5
+0,        162,        162,        1,   149760, 0xa0bf431e
+0,        163,        163,        1,   149760, 0x09567fc4
+0,        164,        164,        1,   149760, 0x2d9408d7
+0,        165,        165,        1,   149760, 0xe09fff24
+0,        166,        166,        1,   149760, 0x6d58a81b
+0,        167,        167,        1,   149760, 0x0280e181
+0,        168,        168,        1,   149760, 0x465e63d1
+0,        169,        169,        1,   149760, 0xedb432a0
+0,        170,        170,        1,   149760, 0xdff70d73
+0,        171,        171,        1,   149760, 0x9386fdb4
+0,        172,        172,        1,   149760, 0xdcb03cb9
+0,        173,        173,        1,   149760, 0x3538dbd4
+0,        174,        174,        1,   149760, 0xc637709d
+0,        175,        175,        1,   149760, 0x7a1a6681
+0,        176,        176,        1,   149760, 0x403ca1e0
+0,        177,        177,        1,   149760, 0xe562d48a
+0,        178,        178,        1,   149760, 0x90a2e933
+0,        179,        179,        1,   149760, 0x0e9e167a
+0,        180,        180,        1,   149760, 0x2da90c4d
+0,        181,        181,        1,   149760, 0x2ce92218
+0,        182,        182,        1,   149760, 0x164a613d
+0,        183,        183,        1,   149760, 0x336d9e2e
+0,        184,        184,        1,   149760, 0x598986e6
+0,        185,        185,        1,   149760, 0xd0039cfc
+0,        186,        186,        1,   149760, 0x8e74c5e6
+0,        187,        187,        1,   149760, 0xb95fa63c
+0,        188,        188,        1,   149760, 0xc688c596
+0,        189,        189,        1,   149760, 0x4757034b
+0,        190,        190,        1,   149760, 0xc9ac948a
+0,        191,        191,        1,   149760, 0x580b9d60
+0,        192,        192,        1,   149760, 0xf39031d6
+0,        193,        193,        1,   149760, 0x2d68ad7b
+0,        194,        194,        1,   149760, 0xf72815ea
+0,        195,        195,        1,   149760, 0xc16323fa
+0,        196,        196,        1,   149760, 0x8a65665e
+0,        197,        197,        1,   149760, 0xcf1d5a89
+0,        198,        198,        1,   149760, 0x03f3011a
+0,        199,        199,        1,   149760, 0x24c47cbc
+0,        200,        200,        1,   149760, 0xcc89db6d
+0,        201,        201,        1,   149760, 0xd8332e3c
+0,        202,        202,        1,   149760, 0x8a73af5f
+0,        203,        203,        1,   149760, 0x9079e1c5
+0,        204,        204,        1,   149760, 0x7b70b098
+0,        205,        205,        1,   149760, 0x8a0fc720
+0,        206,        206,        1,   149760, 0x92644eef
+0,        207,        207,        1,   149760, 0x75cc5f7a
+0,        208,        208,        1,   149760, 0xf04b9756
+0,        209,        209,        1,   149760, 0x156b33cd
+0,        210,        210,        1,   149760, 0x4876d087
+0,        211,        211,        1,   149760, 0x393c01c8
+0,        212,        212,        1,   149760, 0x29b0a5d9
+0,        213,        213,        1,   149760, 0xd76249a1
+0,        214,        214,        1,   149760, 0xb946135e
+0,        215,        215,        1,   149760, 0x4968f245
+0,        216,        216,        1,   149760, 0xb91e27b2
+0,        217,        217,        1,   149760, 0x485bfa6c
+0,        218,        218,        1,   149760, 0xe7f9fe28
+0,        219,        219,        1,   149760, 0x46a6a837
+0,        220,        220,        1,   149760, 0xd2cf971c
+0,        221,        221,        1,   149760, 0xcb518e01
+0,        222,        222,        1,   149760, 0x7870fcd4
+0,        223,        223,        1,   149760, 0x8af73981
+0,        224,        224,        1,   149760, 0xa90281a7
+0,        225,        225,        1,   149760, 0x3fd9c634
+0,        226,        226,        1,   149760, 0x5c4e7e8a
+0,        227,        227,        1,   149760, 0x520d80e9
+0,        228,        228,        1,   149760, 0xd94a7e31
+0,        229,        229,        1,   149760, 0x2a846f4e
+0,        230,        230,        1,   149760, 0x71f027f1
+0,        231,        231,        1,   149760, 0x6edbe368
+0,        232,        232,        1,   149760, 0x5c9923eb
+0,        233,        233,        1,   149760, 0xff230eab
+0,        234,        234,        1,   149760, 0xc7a5ca99
+0,        235,        235,        1,   149760, 0x50732f2a
+0,        236,        236,        1,   149760, 0xa9f3c8bc
+0,        237,        237,        1,   149760, 0x7fa53464
+0,        238,        238,        1,   149760, 0xe4c2edcd
+0,        239,        239,        1,   149760, 0x43f1e758
+0,        240,        240,        1,   149760, 0xdb6b153b
+0,        241,        241,        1,   149760, 0x0979d792
+0,        242,        242,        1,   149760, 0xaae4a6fd
+0,        243,        243,        1,   149760, 0x7ffd1046
+0,        244,        244,        1,   149760, 0x083becd8
+0,        245,        245,        1,   149760, 0xba86428d
+0,        246,        246,        1,   149760, 0xd4cf652a
+0,        247,        247,        1,   149760, 0xe518a1e4
+0,        248,        248,        1,   149760, 0xfbcf0017
+0,        249,        249,        1,   149760, 0xd827b5b1
+0,        250,        250,        1,   149760, 0x6b95eb0d
+0,        251,        251,        1,   149760, 0x625bf8f9
+0,        252,        252,        1,   149760, 0xde17b8b8
+0,        253,        253,        1,   149760, 0xfd731e76
+0,        254,        254,        1,   149760, 0xae0ce756
+0,        255,        255,        1,   149760, 0x15ec506d
+0,        256,        256,        1,   149760, 0xfc9dba5c
+0,        257,        257,        1,   149760, 0x87e46ba1
+0,        258,        258,        1,   149760, 0x31f1d787
+0,        259,        259,        1,   149760, 0xfbde528e
+0,        260,        260,        1,   149760, 0x152becf8
+0,        261,        261,        1,   149760, 0x008386d7
+0,        262,        262,        1,   149760, 0x53c00ef9
+0,        263,        263,        1,   149760, 0x322d4f0b
+0,        264,        264,        1,   149760, 0xd31bf0ec
+0,        265,        265,        1,   149760, 0x66b5097e
+0,        266,        266,        1,   149760, 0xa9cd719f
+0,        267,        267,        1,   149760, 0x427cdc52
+0,        268,        268,        1,   149760, 0x6647dabc
+0,        269,        269,        1,   149760, 0x651df15f
+0,        270,        270,        1,   149760, 0x4ce124c7
+0,        271,        271,        1,   149760, 0x8ad42ad7
+0,        272,        272,        1,   149760, 0x7303ce98
+0,        273,        273,        1,   149760, 0x0c8ad3ab
+0,        274,        274,        1,   149760, 0x86859065
+0,        275,        275,        1,   149760, 0x97f23fc7
+0,        276,        276,        1,   149760, 0x6fde3d1a
+0,        277,        277,        1,   149760, 0xca12860e
+0,        278,        278,        1,   149760, 0xd0c98709
+0,        279,        279,        1,   149760, 0x8f234c79
+0,        280,        280,        1,   149760, 0xbc6987fa
+0,        281,        281,        1,   149760, 0x40246698
+0,        282,        282,        1,   149760, 0x7f83b9ad
+0,        283,        283,        1,   149760, 0x87a3596b
+0,        284,        284,        1,   149760, 0x0ba5d7f6
+0,        285,        285,        1,   149760, 0x2a015c97
+0,        286,        286,        1,   149760, 0xa1a73e7b
+0,        287,        287,        1,   149760, 0x3c1d8178
+0,        288,        288,        1,   149760, 0x2207f0b6
+0,        289,        289,        1,   149760, 0x1f56738a
+0,        290,        290,        1,   149760, 0x0014e5b6
+0,        291,        291,        1,   149760, 0xe0113ffa
+0,        292,        292,        1,   149760, 0x7df23683
+0,        293,        293,        1,   149760, 0x2a1afb23
+0,        294,        294,        1,   149760, 0x072ced03
+0,        295,        295,        1,   149760, 0x7afca5d3
+0,        296,        296,        1,   149760, 0x6055b3da
+0,        297,        297,        1,   149760, 0xa785c79c
+0,        298,        298,        1,   149760, 0x3606db52
+0,        299,        299,        1,   149760, 0x007fdd05

libav-v10.1.tar.bz2/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

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-RQT_A_HHI_4 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-RQT_B_HHI_4 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-RQT_C_HHI_4 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-RQT_D_HHI_4 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-RQT_E_HHI_4 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-RQT_F_HHI_4 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-RQT_G_HHI_4 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-SAO_A_MediaTek_4 Added

@@ -0,0 +1,61 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x304198c2
+0,          1,          1,        1,   149760, 0xe765e30d
+0,          2,          2,        1,   149760, 0x0130a054
+0,          3,          3,        1,   149760, 0x169ed0c3
+0,          4,          4,        1,   149760, 0x334881a5
+0,          5,          5,        1,   149760, 0x06cadd37
+0,          6,          6,        1,   149760, 0x5ec4a7ee
+0,          7,          7,        1,   149760, 0x595fd534
+0,          8,          8,        1,   149760, 0xa1d97197
+0,          9,          9,        1,   149760, 0xf79a9d84
+0,         10,         10,        1,   149760, 0x10d84f28
+0,         11,         11,        1,   149760, 0xab375848
+0,         12,         12,        1,   149760, 0x3079f8ca
+0,         13,         13,        1,   149760, 0xac101dfb
+0,         14,         14,        1,   149760, 0x5354f852
+0,         15,         15,        1,   149760, 0x64d709d5
+0,         16,         16,        1,   149760, 0xff669ff2
+0,         17,         17,        1,   149760, 0xd20dd474
+0,         18,         18,        1,   149760, 0x32439e22
+0,         19,         19,        1,   149760, 0x3ae5a118
+0,         20,         20,        1,   149760, 0xebe245ef
+0,         21,         21,        1,   149760, 0x9d046e35
+0,         22,         22,        1,   149760, 0x2e5b2347
+0,         23,         23,        1,   149760, 0x0e683e86
+0,         24,         24,        1,   149760, 0xccc1019e
+0,         25,         25,        1,   149760, 0x42a9571a
+0,         26,         26,        1,   149760, 0x8999386c
+0,         27,         27,        1,   149760, 0x3d164645
+0,         28,         28,        1,   149760, 0x657afc5e
+0,         29,         29,        1,   149760, 0x06f832f9
+0,         30,         30,        1,   149760, 0xfbedfe1e
+0,         31,         31,        1,   149760, 0x1edc2fc5
+0,         32,         32,        1,   149760, 0xe1cee4e7
+0,         33,         33,        1,   149760, 0x43a823e0
+0,         34,         34,        1,   149760, 0xc2f42916
+0,         35,         35,        1,   149760, 0x51db1483
+0,         36,         36,        1,   149760, 0x54a9d6bf
+0,         37,         37,        1,   149760, 0x7324e246
+0,         38,         38,        1,   149760, 0x2523cc9d
+0,         39,         39,        1,   149760, 0xfa3bdce3
+0,         40,         40,        1,   149760, 0xcf9fb7bb
+0,         41,         41,        1,   149760, 0xe914e23c
+0,         42,         42,        1,   149760, 0x6c9fd72a
+0,         43,         43,        1,   149760, 0x3580cca9
+0,         44,         44,        1,   149760, 0x1d4ec5c0
+0,         45,         45,        1,   149760, 0x52c4d418
+0,         46,         46,        1,   149760, 0xb728ae3e
+0,         47,         47,        1,   149760, 0x6616ae50
+0,         48,         48,        1,   149760, 0x6f1a919d
+0,         49,         49,        1,   149760, 0x6e76b774
+0,         50,         50,        1,   149760, 0x6075b37d
+0,         51,         51,        1,   149760, 0xeeb7b8df
+0,         52,         52,        1,   149760, 0xfd979056
+0,         53,         53,        1,   149760, 0xc0fda5ee
+0,         54,         54,        1,   149760, 0xd1329055
+0,         55,         55,        1,   149760, 0x9b179f0f
+0,         56,         56,        1,   149760, 0x7461850a
+0,         57,         57,        1,   149760, 0xe63a86ea
+0,         58,         58,        1,   149760, 0xe85c6f94
+0,         59,         59,        1,   149760, 0x0b857d13

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-SAO_B_MediaTek_5 Added

@@ -0,0 +1,61 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0xe56f6a5c
+0,          1,          1,        1,   599040, 0x31ec1bb9
+0,          2,          2,        1,   599040, 0xf3ce0311
+0,          3,          3,        1,   599040, 0x1ae1c223
+0,          4,          4,        1,   599040, 0x4369499d
+0,          5,          5,        1,   599040, 0xd7366bd6
+0,          6,          6,        1,   599040, 0x6d3a9099
+0,          7,          7,        1,   599040, 0x49dea495
+0,          8,          8,        1,   599040, 0x375640e7
+0,          9,          9,        1,   599040, 0x76b6f9b0
+0,         10,         10,        1,   599040, 0x7d1f48cf
+0,         11,         11,        1,   599040, 0x4a01899c
+0,         12,         12,        1,   599040, 0x34ff06e6
+0,         13,         13,        1,   599040, 0x270d874f
+0,         14,         14,        1,   599040, 0x5a091d5c
+0,         15,         15,        1,   599040, 0x36406961
+0,         16,         16,        1,   599040, 0xd32f2687
+0,         17,         17,        1,   599040, 0x8d533cb5
+0,         18,         18,        1,   599040, 0x5f189f98
+0,         19,         19,        1,   599040, 0x32b76de3
+0,         20,         20,        1,   599040, 0x2dd0e738
+0,         21,         21,        1,   599040, 0xbc24fe31
+0,         22,         22,        1,   599040, 0xfd5e6578
+0,         23,         23,        1,   599040, 0x23ea676c
+0,         24,         24,        1,   599040, 0xa86d1f70
+0,         25,         25,        1,   599040, 0xef35e81e
+0,         26,         26,        1,   599040, 0x19e5b355
+0,         27,         27,        1,   599040, 0x9dab17b3
+0,         28,         28,        1,   599040, 0x1aebe590
+0,         29,         29,        1,   599040, 0x6fd9b16e
+0,         30,         30,        1,   599040, 0xd2f3087b
+0,         31,         31,        1,   599040, 0x4bdc5019
+0,         32,         32,        1,   599040, 0xeccd10a0
+0,         33,         33,        1,   599040, 0x1eacd33c
+0,         34,         34,        1,   599040, 0xc73d2b6d
+0,         35,         35,        1,   599040, 0xe1305f2b
+0,         36,         36,        1,   599040, 0xb66c5e54
+0,         37,         37,        1,   599040, 0x0ac17870
+0,         38,         38,        1,   599040, 0x9d976180
+0,         39,         39,        1,   599040, 0x0be7d418
+0,         40,         40,        1,   599040, 0x5c4fb909
+0,         41,         41,        1,   599040, 0x7a4de7c2
+0,         42,         42,        1,   599040, 0x9c0d3ed3
+0,         43,         43,        1,   599040, 0xf9b2ba7e
+0,         44,         44,        1,   599040, 0x78e77b58
+0,         45,         45,        1,   599040, 0xc30ead17
+0,         46,         46,        1,   599040, 0x647c9095
+0,         47,         47,        1,   599040, 0x070d61a3
+0,         48,         48,        1,   599040, 0x0ec33c61
+0,         49,         49,        1,   599040, 0x0adcf4f3
+0,         50,         50,        1,   599040, 0x5cbb5aa6
+0,         51,         51,        1,   599040, 0xb9f99f74
+0,         52,         52,        1,   599040, 0xebc3c13e
+0,         53,         53,        1,   599040, 0x40e76036
+0,         54,         54,        1,   599040, 0xf08d2df3
+0,         55,         55,        1,   599040, 0x47442b55
+0,         56,         56,        1,   599040, 0x147622c1
+0,         57,         57,        1,   599040, 0xc95508a3
+0,         58,         58,        1,   599040, 0x361b8995
+0,         59,         59,        1,   599040, 0x51086ed4

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-SAO_C_Samsung_4 Added

@@ -0,0 +1,61 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0xf923a1a0
+0,          1,          1,        1,   149760, 0x614d851a
+0,          2,          2,        1,   149760, 0xc3976ce4
+0,          3,          3,        1,   149760, 0x39925bdc
+0,          4,          4,        1,   149760, 0x86067422
+0,          5,          5,        1,   149760, 0x60dc6078
+0,          6,          6,        1,   149760, 0xac79a412
+0,          7,          7,        1,   149760, 0x3b1bab1e
+0,          8,          8,        1,   149760, 0x7562555f
+0,          9,          9,        1,   149760, 0xf0a2385f
+0,         10,         10,        1,   149760, 0xd2661fa6
+0,         11,         11,        1,   149760, 0x89b30a0a
+0,         12,         12,        1,   149760, 0x3c59f8cb
+0,         13,         13,        1,   149760, 0x70e4da0a
+0,         14,         14,        1,   149760, 0x5e60caa8
+0,         15,         15,        1,   149760, 0x9828a7e0
+0,         16,         16,        1,   149760, 0x11e069a1
+0,         17,         17,        1,   149760, 0xe98a55c2
+0,         18,         18,        1,   149760, 0xaa9f64e5
+0,         19,         19,        1,   149760, 0x03c32cea
+0,         20,         20,        1,   149760, 0x869e0f6e
+0,         21,         21,        1,   149760, 0x54baeff8
+0,         22,         22,        1,   149760, 0xf1f8cc04
+0,         23,         23,        1,   149760, 0x1724aafb
+0,         24,         24,        1,   149760, 0xaf01b9f8
+0,         25,         25,        1,   149760, 0xb1b5bbe9
+0,         26,         26,        1,   149760, 0xd9e6d5a4
+0,         27,         27,        1,   149760, 0x8351ca2d
+0,         28,         28,        1,   149760, 0x38dceffe
+0,         29,         29,        1,   149760, 0x3bffe1c4
+0,         30,         30,        1,   149760, 0x4075b534
+0,         31,         31,        1,   149760, 0x0e8fb246
+0,         32,         32,        1,   149760, 0x70fceafb
+0,         33,         33,        1,   149760, 0x940bec8d
+0,         34,         34,        1,   149760, 0x7d34f896
+0,         35,         35,        1,   149760, 0x39a1d77f
+0,         36,         36,        1,   149760, 0x9755e104
+0,         37,         37,        1,   149760, 0xd584cb48
+0,         38,         38,        1,   149760, 0x06ecdd44
+0,         39,         39,        1,   149760, 0x0226a40d
+0,         40,         40,        1,   149760, 0xb53aaf56
+0,         41,         41,        1,   149760, 0xdad4a984
+0,         42,         42,        1,   149760, 0xa58c9eb0
+0,         43,         43,        1,   149760, 0x7330bde6
+0,         44,         44,        1,   149760, 0x98fcabd9
+0,         45,         45,        1,   149760, 0x9570b74a
+0,         46,         46,        1,   149760, 0x3c1eab60
+0,         47,         47,        1,   149760, 0x2038a069
+0,         48,         48,        1,   149760, 0x672fa347
+0,         49,         49,        1,   149760, 0xa7328b16
+0,         50,         50,        1,   149760, 0x677b6a87
+0,         51,         51,        1,   149760, 0xb036b028
+0,         52,         52,        1,   149760, 0x7a7f9966
+0,         53,         53,        1,   149760, 0xc34b7c39
+0,         54,         54,        1,   149760, 0xb44345ed
+0,         55,         55,        1,   149760, 0x90193c4a
+0,         56,         56,        1,   149760, 0x90986e7b
+0,         57,         57,        1,   149760, 0x5e8e6545
+0,         58,         58,        1,   149760, 0x3ac7758e
+0,         59,         59,        1,   149760, 0x4dd271fb

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-SAO_D_Samsung_4 Added

@@ -0,0 +1,61 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x0d2edbbc
+0,          1,          1,        1,   149760, 0x4830af95
+0,          2,          2,        1,   149760, 0x39e8d3bb
+0,          3,          3,        1,   149760, 0x3cc8d639
+0,          4,          4,        1,   149760, 0xfcfe8415
+0,          5,          5,        1,   149760, 0xa6cf9a48
+0,          6,          6,        1,   149760, 0x0fe191b3
+0,          7,          7,        1,   149760, 0x71d26e20
+0,          8,          8,        1,   149760, 0x1ee5541a
+0,          9,          9,        1,   149760, 0x4ac56652
+0,         10,         10,        1,   149760, 0x967e7c2c
+0,         11,         11,        1,   149760, 0x2011ba0c
+0,         12,         12,        1,   149760, 0x2da4bc05
+0,         13,         13,        1,   149760, 0x6354fac2
+0,         14,         14,        1,   149760, 0x799e66ce
+0,         15,         15,        1,   149760, 0x2ca24940
+0,         16,         16,        1,   149760, 0x2a102e28
+0,         17,         17,        1,   149760, 0x652edcce
+0,         18,         18,        1,   149760, 0xb1c34a9a
+0,         19,         19,        1,   149760, 0xfae6ce90
+0,         20,         20,        1,   149760, 0xf42fddbf
+0,         21,         21,        1,   149760, 0x2a8532c3
+0,         22,         22,        1,   149760, 0xbe43addc
+0,         23,         23,        1,   149760, 0x3545f94a
+0,         24,         24,        1,   149760, 0xa35fa6fa
+0,         25,         25,        1,   149760, 0xfed8577f
+0,         26,         26,        1,   149760, 0xac03b492
+0,         27,         27,        1,   149760, 0x1fbdabc9
+0,         28,         28,        1,   149760, 0x99707175
+0,         29,         29,        1,   149760, 0x95e69481
+0,         30,         30,        1,   149760, 0xd68412d8
+0,         31,         31,        1,   149760, 0x9f900e37
+0,         32,         32,        1,   149760, 0x7e6eceba
+0,         33,         33,        1,   149760, 0xd1ca85af
+0,         34,         34,        1,   149760, 0x352b1d50
+0,         35,         35,        1,   149760, 0xdef3e377
+0,         36,         36,        1,   149760, 0x08efcc16
+0,         37,         37,        1,   149760, 0xc20a7c74
+0,         38,         38,        1,   149760, 0xa8e45939
+0,         39,         39,        1,   149760, 0x322546cf
+0,         40,         40,        1,   149760, 0xf7167766
+0,         41,         41,        1,   149760, 0x959f808f
+0,         42,         42,        1,   149760, 0xcca5ccc3
+0,         43,         43,        1,   149760, 0x18789407
+0,         44,         44,        1,   149760, 0xf6c97e87
+0,         45,         45,        1,   149760, 0x58aaba55
+0,         46,         46,        1,   149760, 0xc3529005
+0,         47,         47,        1,   149760, 0x3847adb4
+0,         48,         48,        1,   149760, 0xa4d589db
+0,         49,         49,        1,   149760, 0x9c50dd88
+0,         50,         50,        1,   149760, 0xad087c44
+0,         51,         51,        1,   149760, 0x4a6b656d
+0,         52,         52,        1,   149760, 0x6ec79bcf
+0,         53,         53,        1,   149760, 0x82756cb6
+0,         54,         54,        1,   149760, 0x8b3a9a6a
+0,         55,         55,        1,   149760, 0x775c0430
+0,         56,         56,        1,   149760, 0xbaa08d27
+0,         57,         57,        1,   149760, 0x686cd03f
+0,         58,         58,        1,   149760, 0x1b10dc94
+0,         59,         59,        1,   149760, 0xde81e414

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-SAO_E_Canon_4 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-SAO_F_Canon_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-SAO_G_Canon_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-SDH_A_Orange_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-SLICES_A_Rovi_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-SLIST_A_Sony_4 Added

@@ -0,0 +1,66 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0xbd0eb43e
+0,          1,          1,        1,   599040, 0x4c3a98b5
+0,          2,          2,        1,   599040, 0x105410dc
+0,          3,          3,        1,   599040, 0xffaff69c
+0,          4,          4,        1,   599040, 0x39cb22ea
+0,          5,          5,        1,   599040, 0xa19296c3
+0,          6,          6,        1,   599040, 0x84cad39d
+0,          7,          7,        1,   599040, 0x5dc5c5a9
+0,          8,          8,        1,   599040, 0xc6a2c0dd
+0,          9,          9,        1,   599040, 0xeb5947bf
+0,         10,         10,        1,   599040, 0x9f8f9ce5
+0,         11,         11,        1,   599040, 0xdce5be4e
+0,         12,         12,        1,   599040, 0x07141c84
+0,         13,         13,        1,   599040, 0x3a05273d
+0,         14,         14,        1,   599040, 0xa16a112c
+0,         15,         15,        1,   599040, 0x6fa79123
+0,         16,         16,        1,   599040, 0xbda4cf46
+0,         17,         17,        1,   599040, 0xa5a81a05
+0,         18,         18,        1,   599040, 0x7370af29
+0,         19,         19,        1,   599040, 0xbd70e89e
+0,         20,         20,        1,   599040, 0xe7850613
+0,         21,         21,        1,   599040, 0xfaa8cf89
+0,         22,         22,        1,   599040, 0x30a78a21
+0,         23,         23,        1,   599040, 0x5520a8cf
+0,         24,         24,        1,   599040, 0xbcd93ea7
+0,         25,         25,        1,   599040, 0xd8ce632c
+0,         26,         26,        1,   599040, 0x87c6476f
+0,         27,         27,        1,   599040, 0xf6799dcc
+0,         28,         28,        1,   599040, 0xc0370664
+0,         29,         29,        1,   599040, 0x17196bd3
+0,         30,         30,        1,   599040, 0xe7ae6de3
+0,         31,         31,        1,   599040, 0x0345bc72
+0,         32,         32,        1,   599040, 0x7b86141e
+0,         33,         33,        1,   599040, 0x65564792
+0,         34,         34,        1,   599040, 0xf90c7f54
+0,         35,         35,        1,   599040, 0x00ce2f3c
+0,         36,         36,        1,   599040, 0xe6b185f2
+0,         37,         37,        1,   599040, 0x513942f1
+0,         38,         38,        1,   599040, 0x7c27b03a
+0,         39,         39,        1,   599040, 0xa201fea3
+0,         40,         40,        1,   599040, 0x5023fd92
+0,         41,         41,        1,   599040, 0xe05ba218
+0,         42,         42,        1,   599040, 0x84b61765
+0,         43,         43,        1,   599040, 0xfa6c8f65
+0,         44,         44,        1,   599040, 0xede8ef78
+0,         45,         45,        1,   599040, 0xcd2763f2
+0,         46,         46,        1,   599040, 0xb83e3bc6
+0,         47,         47,        1,   599040, 0x99fb3a3e
+0,         48,         48,        1,   599040, 0x3dd1e5ac
+0,         49,         49,        1,   599040, 0x776d7464
+0,         50,         50,        1,   599040, 0xaea89891
+0,         51,         51,        1,   599040, 0xfc0f1ec9
+0,         52,         52,        1,   599040, 0x2621f36f
+0,         53,         53,        1,   599040, 0x41101bbc
+0,         54,         54,        1,   599040, 0x7a5d4d0e
+0,         55,         55,        1,   599040, 0xc04fb148
+0,         56,         56,        1,   599040, 0x889d8186
+0,         57,         57,        1,   599040, 0x26f091bf
+0,         58,         58,        1,   599040, 0xe6644a2d
+0,         59,         59,        1,   599040, 0xd48efb7f
+0,         60,         60,        1,   599040, 0xe25204e3
+0,         61,         61,        1,   599040, 0x928f2efd
+0,         62,         62,        1,   599040, 0x535a4f2d
+0,         63,         63,        1,   599040, 0x2672ad63
+0,         64,         64,        1,   599040, 0x194f1463

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-SLIST_B_Sony_8 Added

@@ -0,0 +1,66 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0xbd0eb43e
+0,          1,          1,        1,   599040, 0x3ea696c4
+0,          2,          2,        1,   599040, 0x866beffc
+0,          3,          3,        1,   599040, 0x89622860
+0,          4,          4,        1,   599040, 0x416bcaf8
+0,          5,          5,        1,   599040, 0x4098709b
+0,          6,          6,        1,   599040, 0x8d1ef343
+0,          7,          7,        1,   599040, 0xbd1bbc79
+0,          8,          8,        1,   599040, 0xc6a2c0dd
+0,          9,          9,        1,   599040, 0x438cc40e
+0,         10,         10,        1,   599040, 0xb666a438
+0,         11,         11,        1,   599040, 0x114580e4
+0,         12,         12,        1,   599040, 0xb75c41dc
+0,         13,         13,        1,   599040, 0x52e1e32f
+0,         14,         14,        1,   599040, 0x22835865
+0,         15,         15,        1,   599040, 0xfb0e0003
+0,         16,         16,        1,   599040, 0xebcb1ef9
+0,         17,         17,        1,   599040, 0xd6939619
+0,         18,         18,        1,   599040, 0xe22afdd8
+0,         19,         19,        1,   599040, 0xff4a248f
+0,         20,         20,        1,   599040, 0x9fc3878e
+0,         21,         21,        1,   599040, 0xce2f6499
+0,         22,         22,        1,   599040, 0x04aa9986
+0,         23,         23,        1,   599040, 0x68ba9838
+0,         24,         24,        1,   599040, 0x62e950a9
+0,         25,         25,        1,   599040, 0x5161526d
+0,         26,         26,        1,   599040, 0xcdde709e
+0,         27,         27,        1,   599040, 0x8c48ded1
+0,         28,         28,        1,   599040, 0x3451ecbb
+0,         29,         29,        1,   599040, 0xfc5a5fca
+0,         30,         30,        1,   599040, 0x7c0090fe
+0,         31,         31,        1,   599040, 0xbc4eb1de
+0,         32,         32,        1,   599040, 0x5350cf4f
+0,         33,         33,        1,   599040, 0x175152d6
+0,         34,         34,        1,   599040, 0xcf65acea
+0,         35,         35,        1,   599040, 0x099a7298
+0,         36,         36,        1,   599040, 0x31b7a2a2
+0,         37,         37,        1,   599040, 0xd6a71415
+0,         38,         38,        1,   599040, 0xe68880e7
+0,         39,         39,        1,   599040, 0x0c7d0373
+0,         40,         40,        1,   599040, 0xfb56ac78
+0,         41,         41,        1,   599040, 0x1177b0dd
+0,         42,         42,        1,   599040, 0x1393026f
+0,         43,         43,        1,   599040, 0xc6346b58
+0,         44,         44,        1,   599040, 0x2949cd11
+0,         45,         45,        1,   599040, 0xff867f22
+0,         46,         46,        1,   599040, 0xef196e4d
+0,         47,         47,        1,   599040, 0x17a2332c
+0,         48,         48,        1,   599040, 0x45d59fbc
+0,         49,         49,        1,   599040, 0x5f51575c
+0,         50,         50,        1,   599040, 0x6049a451
+0,         51,         51,        1,   599040, 0x4d6086ac
+0,         52,         52,        1,   599040, 0xd709596b
+0,         53,         53,        1,   599040, 0xacdbc22f
+0,         54,         54,        1,   599040, 0x45c11bb5
+0,         55,         55,        1,   599040, 0x608a7c7e
+0,         56,         56,        1,   599040, 0x242a67c9
+0,         57,         57,        1,   599040, 0x2d186d8a
+0,         58,         58,        1,   599040, 0x07ed9fd5
+0,         59,         59,        1,   599040, 0xaee9a49b
+0,         60,         60,        1,   599040, 0xaeb2b2a2
+0,         61,         61,        1,   599040, 0x4ca2d84b
+0,         62,         62,        1,   599040, 0x4254b5f6
+0,         63,         63,        1,   599040, 0x105c7a25
+0,         64,         64,        1,   599040, 0x87b51bce

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-SLIST_C_Sony_3 Added

@@ -0,0 +1,66 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0xc3e98658
+0,          1,          1,        1,   599040, 0x621fa0b7
+0,          2,          2,        1,   599040, 0x53b2e637
+0,          3,          3,        1,   599040, 0x1db118c2
+0,          4,          4,        1,   599040, 0xa25003ba
+0,          5,          5,        1,   599040, 0x51de524b
+0,          6,          6,        1,   599040, 0x5f01f648
+0,          7,          7,        1,   599040, 0x43d8c9cb
+0,          8,          8,        1,   599040, 0xf7f6c7f6
+0,          9,          9,        1,   599040, 0xb08885ec
+0,         10,         10,        1,   599040, 0x1e6e91a7
+0,         11,         11,        1,   599040, 0x18549abd
+0,         12,         12,        1,   599040, 0xef523cbc
+0,         13,         13,        1,   599040, 0x87985e99
+0,         14,         14,        1,   599040, 0x37521482
+0,         15,         15,        1,   599040, 0xe9fbc0ce
+0,         16,         16,        1,   599040, 0x20bab233
+0,         17,         17,        1,   599040, 0xbe3525e6
+0,         18,         18,        1,   599040, 0xace46e50
+0,         19,         19,        1,   599040, 0xf709b3a9
+0,         20,         20,        1,   599040, 0xf2690bc8
+0,         21,         21,        1,   599040, 0x7eacdec3
+0,         22,         22,        1,   599040, 0xaed66c65
+0,         23,         23,        1,   599040, 0x066b2fa6
+0,         24,         24,        1,   599040, 0x5dc050bd
+0,         25,         25,        1,   599040, 0x170e7de1
+0,         26,         26,        1,   599040, 0x2ccd7b16
+0,         27,         27,        1,   599040, 0x4f7bc972
+0,         28,         28,        1,   599040, 0x72d7f274
+0,         29,         29,        1,   599040, 0x44d2396e
+0,         30,         30,        1,   599040, 0xe4dc9b54
+0,         31,         31,        1,   599040, 0xfacba54d
+0,         32,         32,        1,   599040, 0x7b86141e
+0,         33,         33,        1,   599040, 0x65564792
+0,         34,         34,        1,   599040, 0xf90c7f54
+0,         35,         35,        1,   599040, 0x00ce2f3c
+0,         36,         36,        1,   599040, 0xe6b185f2
+0,         37,         37,        1,   599040, 0x513942f1
+0,         38,         38,        1,   599040, 0x7c27b03a
+0,         39,         39,        1,   599040, 0xa201fea3
+0,         40,         40,        1,   599040, 0x5023fd92
+0,         41,         41,        1,   599040, 0xe05ba218
+0,         42,         42,        1,   599040, 0x84b61765
+0,         43,         43,        1,   599040, 0xfa6c8f65
+0,         44,         44,        1,   599040, 0xede8ef78
+0,         45,         45,        1,   599040, 0xcd2763f2
+0,         46,         46,        1,   599040, 0xb83e3bc6
+0,         47,         47,        1,   599040, 0x99fb3a3e
+0,         48,         48,        1,   599040, 0x3dd1e5ac
+0,         49,         49,        1,   599040, 0x776d7464
+0,         50,         50,        1,   599040, 0xaea89891
+0,         51,         51,        1,   599040, 0xfc0f1ec9
+0,         52,         52,        1,   599040, 0x2621f36f
+0,         53,         53,        1,   599040, 0x41101bbc
+0,         54,         54,        1,   599040, 0x7a5d4d0e
+0,         55,         55,        1,   599040, 0xc04fb148
+0,         56,         56,        1,   599040, 0x889d8186
+0,         57,         57,        1,   599040, 0x26f091bf
+0,         58,         58,        1,   599040, 0xe6644a2d
+0,         59,         59,        1,   599040, 0xd48efb7f
+0,         60,         60,        1,   599040, 0xe25204e3
+0,         61,         61,        1,   599040, 0x928f2efd
+0,         62,         62,        1,   599040, 0x535a4f2d
+0,         63,         63,        1,   599040, 0x2672ad63
+0,         64,         64,        1,   599040, 0x194f1463

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-SLIST_D_Sony_9 Added

@@ -0,0 +1,66 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0xf3038515
+0,          1,          1,        1,   599040, 0xb1bc9386
+0,          2,          2,        1,   599040, 0xa069e86f
+0,          3,          3,        1,   599040, 0xdf7c4cb7
+0,          4,          4,        1,   599040, 0xefaa2ac5
+0,          5,          5,        1,   599040, 0x81c67c18
+0,          6,          6,        1,   599040, 0xeb1a0669
+0,          7,          7,        1,   599040, 0xbab3c0b8
+0,          8,          8,        1,   599040, 0x82b99936
+0,          9,          9,        1,   599040, 0x027a90d1
+0,         10,         10,        1,   599040, 0x5d6d7489
+0,         11,         11,        1,   599040, 0xeaaf6d39
+0,         12,         12,        1,   599040, 0x7788f8fa
+0,         13,         13,        1,   599040, 0x654393e8
+0,         14,         14,        1,   599040, 0xc6c2237c
+0,         15,         15,        1,   599040, 0x8b16d890
+0,         16,         16,        1,   599040, 0x2c36eed0
+0,         17,         17,        1,   599040, 0x02792aa8
+0,         18,         18,        1,   599040, 0xf4088e47
+0,         19,         19,        1,   599040, 0xea9796ad
+0,         20,         20,        1,   599040, 0xa4aecc01
+0,         21,         21,        1,   599040, 0x2ec8c1c4
+0,         22,         22,        1,   599040, 0xcfa87d49
+0,         23,         23,        1,   599040, 0x012b62f1
+0,         24,         24,        1,   599040, 0xd8b72ae0
+0,         25,         25,        1,   599040, 0xe0ca1977
+0,         26,         26,        1,   599040, 0x3f048981
+0,         27,         27,        1,   599040, 0xe416a928
+0,         28,         28,        1,   599040, 0xdfef9086
+0,         29,         29,        1,   599040, 0xd810cd6a
+0,         30,         30,        1,   599040, 0x11fab789
+0,         31,         31,        1,   599040, 0x90a890d5
+0,         32,         32,        1,   599040, 0x0dabef8d
+0,         33,         33,        1,   599040, 0x7a32557d
+0,         34,         34,        1,   599040, 0xc3427914
+0,         35,         35,        1,   599040, 0x65266a45
+0,         36,         36,        1,   599040, 0x8b5e9213
+0,         37,         37,        1,   599040, 0x4e2e2b0a
+0,         38,         38,        1,   599040, 0xaebdb406
+0,         39,         39,        1,   599040, 0xca35eadb
+0,         40,         40,        1,   599040, 0xb711adc7
+0,         41,         41,        1,   599040, 0x594d28b9
+0,         42,         42,        1,   599040, 0x27fec3c9
+0,         43,         43,        1,   599040, 0x35fe73ce
+0,         44,         44,        1,   599040, 0x3069c845
+0,         45,         45,        1,   599040, 0x2df2a12d
+0,         46,         46,        1,   599040, 0x96d42f5c
+0,         47,         47,        1,   599040, 0x95d9319b
+0,         48,         48,        1,   599040, 0x4f8c92aa
+0,         49,         49,        1,   599040, 0x29620b31
+0,         50,         50,        1,   599040, 0x3d1441f7
+0,         51,         51,        1,   599040, 0x7040914d
+0,         52,         52,        1,   599040, 0x95a73274
+0,         53,         53,        1,   599040, 0xda51c6c7
+0,         54,         54,        1,   599040, 0x41592676
+0,         55,         55,        1,   599040, 0xf21c682b
+0,         56,         56,        1,   599040, 0x5d6b65cf
+0,         57,         57,        1,   599040, 0x13fc6e8e
+0,         58,         58,        1,   599040, 0xe05ec001
+0,         59,         59,        1,   599040, 0x06113d89
+0,         60,         60,        1,   599040, 0x1d74bd0d
+0,         61,         61,        1,   599040, 0x757ffab3
+0,         62,         62,        1,   599040, 0x0599c7fb
+0,         63,         63,        1,   599040, 0x8aaa91ed
+0,         64,         64,        1,   599040, 0x79582f08

libav-v10.1.tar.bz2/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

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-STRUCT_A_Samsung_5 Added

@@ -0,0 +1,61 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x479fa7ca
+0,          1,          1,        1,   149760, 0x761fb3a3
+0,          2,          2,        1,   149760, 0xa0f4cd97
+0,          3,          3,        1,   149760, 0x22a0c92b
+0,          4,          4,        1,   149760, 0xdedc8cb2
+0,          5,          5,        1,   149760, 0x38da8674
+0,          6,          6,        1,   149760, 0xe5d77e68
+0,          7,          7,        1,   149760, 0x31cc6196
+0,          8,          8,        1,   149760, 0xdb70f4d3
+0,          9,          9,        1,   149760, 0x966b6f89
+0,         10,         10,        1,   149760, 0x2297ff66
+0,         11,         11,        1,   149760, 0x2a2fa4e7
+0,         12,         12,        1,   149760, 0x217442b7
+0,         13,         13,        1,   149760, 0x5341ff7f
+0,         14,         14,        1,   149760, 0xb413af37
+0,         15,         15,        1,   149760, 0x61c86ce5
+0,         16,         16,        1,   149760, 0x6b1a0c63
+0,         17,         17,        1,   149760, 0x4596d2e5
+0,         18,         18,        1,   149760, 0xafc0abbd
+0,         19,         19,        1,   149760, 0xb9197a81
+0,         20,         20,        1,   149760, 0xf67d43f3
+0,         21,         21,        1,   149760, 0xe7ef11f2
+0,         22,         22,        1,   149760, 0x89180592
+0,         23,         23,        1,   149760, 0xf6900816
+0,         24,         24,        1,   149760, 0x7cb2f3c0
+0,         25,         25,        1,   149760, 0x71c269f5
+0,         26,         26,        1,   149760, 0x19720666
+0,         27,         27,        1,   149760, 0x5794f402
+0,         28,         28,        1,   149760, 0xe08bf8d2
+0,         29,         29,        1,   149760, 0x11638859
+0,         30,         30,        1,   149760, 0x5024fddc
+0,         31,         31,        1,   149760, 0x8b3d4a37
+0,         32,         32,        1,   149760, 0x5f727144
+0,         33,         33,        1,   149760, 0xb6cf2d76
+0,         34,         34,        1,   149760, 0xf528b070
+0,         35,         35,        1,   149760, 0x3e95f116
+0,         36,         36,        1,   149760, 0x1db5f92a
+0,         37,         37,        1,   149760, 0xf8331667
+0,         38,         38,        1,   149760, 0x57ca4161
+0,         39,         39,        1,   149760, 0x7add32bd
+0,         40,         40,        1,   149760, 0x4b84af44
+0,         41,         41,        1,   149760, 0xf3e1eeaf
+0,         42,         42,        1,   149760, 0x0d602ea8
+0,         43,         43,        1,   149760, 0x420bfdf8
+0,         44,         44,        1,   149760, 0x6e2eb72f
+0,         45,         45,        1,   149760, 0x0450e4ba
+0,         46,         46,        1,   149760, 0xbfa60971
+0,         47,         47,        1,   149760, 0x89791529
+0,         48,         48,        1,   149760, 0x4e32e37b
+0,         49,         49,        1,   149760, 0x273f0927
+0,         50,         50,        1,   149760, 0x0373f961
+0,         51,         51,        1,   149760, 0x5f105bd2
+0,         52,         52,        1,   149760, 0x6b1b290a
+0,         53,         53,        1,   149760, 0xeaad4ccb
+0,         54,         54,        1,   149760, 0xeb21c2e6
+0,         55,         55,        1,   149760, 0x342ff483
+0,         56,         56,        1,   149760, 0x0ac70398
+0,         57,         57,        1,   149760, 0x5366fd7c
+0,         58,         58,        1,   149760, 0xc05249b6
+0,         59,         59,        1,   149760, 0x32279e70

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-STRUCT_B_Samsung_4 Added

@@ -0,0 +1,61 @@
+#tb 0: 1/25
+0,          0,          0,        1,   599040, 0x4b489a60
+0,          1,          1,        1,   599040, 0x80369c9a
+0,          2,          2,        1,   599040, 0x33189b1a
+0,          3,          3,        1,   599040, 0x01d73abb
+0,          4,          4,        1,   599040, 0xd5de0ab7
+0,          5,          5,        1,   599040, 0xf7b9f1c3
+0,          6,          6,        1,   599040, 0xe72b6446
+0,          7,          7,        1,   599040, 0xf78cc5d6
+0,          8,          8,        1,   599040, 0x9c6d33a2
+0,          9,          9,        1,   599040, 0xacb6cb08
+0,         10,         10,        1,   599040, 0x2a215019
+0,         11,         11,        1,   599040, 0xcd89d5be
+0,         12,         12,        1,   599040, 0x60403ebb
+0,         13,         13,        1,   599040, 0xc5c62e88
+0,         14,         14,        1,   599040, 0x93403d23
+0,         15,         15,        1,   599040, 0x6b86071d
+0,         16,         16,        1,   599040, 0xfaaad32f
+0,         17,         17,        1,   599040, 0x68651db5
+0,         18,         18,        1,   599040, 0xfbedeba6
+0,         19,         19,        1,   599040, 0x7fa3a0c0
+0,         20,         20,        1,   599040, 0x76b34545
+0,         21,         21,        1,   599040, 0x34e4c1cd
+0,         22,         22,        1,   599040, 0xfad3eda9
+0,         23,         23,        1,   599040, 0xf4324901
+0,         24,         24,        1,   599040, 0x991b4fde
+0,         25,         25,        1,   599040, 0xd9d7823d
+0,         26,         26,        1,   599040, 0xd8a80ca5
+0,         27,         27,        1,   599040, 0x19ae0251
+0,         28,         28,        1,   599040, 0xfa68cda7
+0,         29,         29,        1,   599040, 0xb9c72f07
+0,         30,         30,        1,   599040, 0xf1df5f78
+0,         31,         31,        1,   599040, 0xda75192b
+0,         32,         32,        1,   599040, 0x1102b6e6
+0,         33,         33,        1,   599040, 0x259ec490
+0,         34,         34,        1,   599040, 0xee1dabe5
+0,         35,         35,        1,   599040, 0xf6bf5454
+0,         36,         36,        1,   599040, 0x058061be
+0,         37,         37,        1,   599040, 0x2f9aebeb
+0,         38,         38,        1,   599040, 0x169c0bff
+0,         39,         39,        1,   599040, 0xeffb5a9f
+0,         40,         40,        1,   599040, 0xb3bbebac
+0,         41,         41,        1,   599040, 0x174af746
+0,         42,         42,        1,   599040, 0x8359db57
+0,         43,         43,        1,   599040, 0xdd7693ad
+0,         44,         44,        1,   599040, 0x05aebad4
+0,         45,         45,        1,   599040, 0xc34fd8bc
+0,         46,         46,        1,   599040, 0x2798f32e
+0,         47,         47,        1,   599040, 0x319b9b8c
+0,         48,         48,        1,   599040, 0xa28d783f
+0,         49,         49,        1,   599040, 0x5c79026f
+0,         50,         50,        1,   599040, 0xd4ae9b08
+0,         51,         51,        1,   599040, 0x79b19064
+0,         52,         52,        1,   599040, 0xe773bd75
+0,         53,         53,        1,   599040, 0xfbeda52a
+0,         54,         54,        1,   599040, 0x2ed916e6
+0,         55,         55,        1,   599040, 0xd3243fe7
+0,         56,         56,        1,   599040, 0xfdbc20e8
+0,         57,         57,        1,   599040, 0x80983226
+0,         58,         58,        1,   599040, 0x51c66b23
+0,         59,         59,        1,   599040, 0x30816b80

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-TILES_A_Cisco_2 Added

@@ -0,0 +1,101 @@
+#tb 0: 1/25
+0,          0,          0,        1,  3110400, 0xfc052e85
+0,          1,          1,        1,  3110400, 0xfb49bf20
+0,          2,          2,        1,  3110400, 0x549eef2b
+0,          3,          3,        1,  3110400, 0xc3857801
+0,          4,          4,        1,  3110400, 0xb27d6aea
+0,          5,          5,        1,  3110400, 0xa52e1d58
+0,          6,          6,        1,  3110400, 0x02d348e6
+0,          7,          7,        1,  3110400, 0x45a9c47c
+0,          8,          8,        1,  3110400, 0xc308e886
+0,          9,          9,        1,  3110400, 0x43cd6ed6
+0,         10,         10,        1,  3110400, 0x29a054ce
+0,         11,         11,        1,  3110400, 0x76fbd08e
+0,         12,         12,        1,  3110400, 0x8638d5e2
+0,         13,         13,        1,  3110400, 0xfb4b7823
+0,         14,         14,        1,  3110400, 0x66185e15
+0,         15,         15,        1,  3110400, 0x82eaea0a
+0,         16,         16,        1,  3110400, 0x5895f1c6
+0,         17,         17,        1,  3110400, 0x0a28a1c7
+0,         18,         18,        1,  3110400, 0x37f2ecc8
+0,         19,         19,        1,  3110400, 0x0ad8b6c1
+0,         20,         20,        1,  3110400, 0x90300dcb
+0,         21,         21,        1,  3110400, 0x9731112d
+0,         22,         22,        1,  3110400, 0x5078ba88
+0,         23,         23,        1,  3110400, 0xdcfbacae
+0,         24,         24,        1,  3110400, 0x40769123
+0,         25,         25,        1,  3110400, 0xa09f4d29
+0,         26,         26,        1,  3110400, 0xa3749feb
+0,         27,         27,        1,  3110400, 0xb04c36ae
+0,         28,         28,        1,  3110400, 0x4d30c177
+0,         29,         29,        1,  3110400, 0xe247070a
+0,         30,         30,        1,  3110400, 0x84c669d5
+0,         31,         31,        1,  3110400, 0x3e0529e6
+0,         32,         32,        1,  3110400, 0xd0d58b7a
+0,         33,         33,        1,  3110400, 0x05de0ffa
+0,         34,         34,        1,  3110400, 0x7d10a27f
+0,         35,         35,        1,  3110400, 0x87dd43fe
+0,         36,         36,        1,  3110400, 0xc6f39e98
+0,         37,         37,        1,  3110400, 0x9bf5a18b
+0,         38,         38,        1,  3110400, 0x4880f4e6
+0,         39,         39,        1,  3110400, 0xbba7a2fd
+0,         40,         40,        1,  3110400, 0x82fe2a14
+0,         41,         41,        1,  3110400, 0x7e701e1c
+0,         42,         42,        1,  3110400, 0x23cdbc0c
+0,         43,         43,        1,  3110400, 0xf15977e6
+0,         44,         44,        1,  3110400, 0x50df6fe2
+0,         45,         45,        1,  3110400, 0x8913ddde
+0,         46,         46,        1,  3110400, 0x633c8c0e
+0,         47,         47,        1,  3110400, 0xea604347
+0,         48,         48,        1,  3110400, 0xa5049365
+0,         49,         49,        1,  3110400, 0x35da77a8
+0,         50,         50,        1,  3110400, 0xcfa4af57
+0,         51,         51,        1,  3110400, 0x5a3bfe64
+0,         52,         52,        1,  3110400, 0x91f9ee34
+0,         53,         53,        1,  3110400, 0x21b0df73
+0,         54,         54,        1,  3110400, 0x7807baf2
+0,         55,         55,        1,  3110400, 0x96dbaf03
+0,         56,         56,        1,  3110400, 0xb8d29f57
+0,         57,         57,        1,  3110400, 0x1a04f732
+0,         58,         58,        1,  3110400, 0x54a34b35
+0,         59,         59,        1,  3110400, 0x4850a07a
+0,         60,         60,        1,  3110400, 0x7010be29
+0,         61,         61,        1,  3110400, 0x7178d2e7
+0,         62,         62,        1,  3110400, 0x17483898
+0,         63,         63,        1,  3110400, 0x4c55872a
+0,         64,         64,        1,  3110400, 0xe67b0f06
+0,         65,         65,        1,  3110400, 0x958789cf
+0,         66,         66,        1,  3110400, 0x5cd6ba06
+0,         67,         67,        1,  3110400, 0xb7852fe2
+0,         68,         68,        1,  3110400, 0x8b67bd9f
+0,         69,         69,        1,  3110400, 0x9555c0ff
+0,         70,         70,        1,  3110400, 0x6b99aab7
+0,         71,         71,        1,  3110400, 0xcab904b7
+0,         72,         72,        1,  3110400, 0xeb915c25
+0,         73,         73,        1,  3110400, 0xd3066bd8
+0,         74,         74,        1,  3110400, 0xa2d45cb5
+0,         75,         75,        1,  3110400, 0x011db978
+0,         76,         76,        1,  3110400, 0xf35b9f2c
+0,         77,         77,        1,  3110400, 0x6afd3bde
+0,         78,         78,        1,  3110400, 0xa1ad77b7
+0,         79,         79,        1,  3110400, 0x8b4d3823
+0,         80,         80,        1,  3110400, 0xd806be79
+0,         81,         81,        1,  3110400, 0x29dcff87
+0,         82,         82,        1,  3110400, 0x202fb0f7
+0,         83,         83,        1,  3110400, 0xacfc7d1d
+0,         84,         84,        1,  3110400, 0xf04bdcb8
+0,         85,         85,        1,  3110400, 0x89cef288
+0,         86,         86,        1,  3110400, 0x657315e2
+0,         87,         87,        1,  3110400, 0x1615cb5f
+0,         88,         88,        1,  3110400, 0xc6986395
+0,         89,         89,        1,  3110400, 0x6b77258e
+0,         90,         90,        1,  3110400, 0xcd9975ae
+0,         91,         91,        1,  3110400, 0x5044fd0f
+0,         92,         92,        1,  3110400, 0x20dd1132
+0,         93,         93,        1,  3110400, 0xdb5a0b84
+0,         94,         94,        1,  3110400, 0xf40d29ae
+0,         95,         95,        1,  3110400, 0xe88bffed
+0,         96,         96,        1,  3110400, 0x3e50146a
+0,         97,         97,        1,  3110400, 0xaacd9bfa
+0,         98,         98,        1,  3110400, 0x270b2c2a
+0,         99,         99,        1,  3110400, 0xc727f760

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-TILES_B_Cisco_1 Added

@@ -0,0 +1,101 @@
+#tb 0: 1/25
+0,          0,          0,        1,  3110400, 0x3471f473
+0,          1,          1,        1,  3110400, 0xb371a3e8
+0,          2,          2,        1,  3110400, 0x6d83c623
+0,          3,          3,        1,  3110400, 0x62d68b96
+0,          4,          4,        1,  3110400, 0xa8ed6ea9
+0,          5,          5,        1,  3110400, 0xcabe52be
+0,          6,          6,        1,  3110400, 0xbbb23578
+0,          7,          7,        1,  3110400, 0xb1609c77
+0,          8,          8,        1,  3110400, 0x61e7c2a7
+0,          9,          9,        1,  3110400, 0x6d8b34ad
+0,         10,         10,        1,  3110400, 0xde0dfa96
+0,         11,         11,        1,  3110400, 0x48c2b0b0
+0,         12,         12,        1,  3110400, 0x647b6f90
+0,         13,         13,        1,  3110400, 0xd37f2dda
+0,         14,         14,        1,  3110400, 0x1b0dd122
+0,         15,         15,        1,  3110400, 0x0b050786
+0,         16,         16,        1,  3110400, 0xcd9ce7e5
+0,         17,         17,        1,  3110400, 0xb92a4ee4
+0,         18,         18,        1,  3110400, 0x4fa4d97c
+0,         19,         19,        1,  3110400, 0x109777eb
+0,         20,         20,        1,  3110400, 0xc3d2236a
+0,         21,         21,        1,  3110400, 0x1cd12d07
+0,         22,         22,        1,  3110400, 0xdd1ef75d
+0,         23,         23,        1,  3110400, 0xd00c0906
+0,         24,         24,        1,  3110400, 0x8de79207
+0,         25,         25,        1,  3110400, 0x18017e1e
+0,         26,         26,        1,  3110400, 0x4329f68a
+0,         27,         27,        1,  3110400, 0x6a402bae
+0,         28,         28,        1,  3110400, 0x90eb1a20
+0,         29,         29,        1,  3110400, 0xe3474876
+0,         30,         30,        1,  3110400, 0xd652e216
+0,         31,         31,        1,  3110400, 0xeb458ebb
+0,         32,         32,        1,  3110400, 0xc5aff075
+0,         33,         33,        1,  3110400, 0xcb4d72e7
+0,         34,         34,        1,  3110400, 0x5504d9c5
+0,         35,         35,        1,  3110400, 0xcd0147b4
+0,         36,         36,        1,  3110400, 0xe2f0001e
+0,         37,         37,        1,  3110400, 0xa2199fe5
+0,         38,         38,        1,  3110400, 0x2f269683
+0,         39,         39,        1,  3110400, 0x7cf11244
+0,         40,         40,        1,  3110400, 0xf39cb39d
+0,         41,         41,        1,  3110400, 0x0e195a06
+0,         42,         42,        1,  3110400, 0x195e31e3
+0,         43,         43,        1,  3110400, 0xc43cd272
+0,         44,         44,        1,  3110400, 0x9dc1c4ea
+0,         45,         45,        1,  3110400, 0x846cd55f
+0,         46,         46,        1,  3110400, 0xe9468052
+0,         47,         47,        1,  3110400, 0xc5bb38ff
+0,         48,         48,        1,  3110400, 0xd1886697
+0,         49,         49,        1,  3110400, 0x23f2012b
+0,         50,         50,        1,  3110400, 0x669d63ff
+0,         51,         51,        1,  3110400, 0xced83804
+0,         52,         52,        1,  3110400, 0x005f5f3d
+0,         53,         53,        1,  3110400, 0x772efc80
+0,         54,         54,        1,  3110400, 0x94012838
+0,         55,         55,        1,  3110400, 0x99770054
+0,         56,         56,        1,  3110400, 0x8654c655
+0,         57,         57,        1,  3110400, 0xed3d19f4
+0,         58,         58,        1,  3110400, 0x8efc2172
+0,         59,         59,        1,  3110400, 0x9aaf930d
+0,         60,         60,        1,  3110400, 0xbe32f43e
+0,         61,         61,        1,  3110400, 0x6008f53e
+0,         62,         62,        1,  3110400, 0xb87897b9
+0,         63,         63,        1,  3110400, 0xe2406eb1
+0,         64,         64,        1,  3110400, 0xbdfa067b
+0,         65,         65,        1,  3110400, 0x82a16dbd
+0,         66,         66,        1,  3110400, 0x909aa5f0
+0,         67,         67,        1,  3110400, 0xc63836b5
+0,         68,         68,        1,  3110400, 0xaf7ad199
+0,         69,         69,        1,  3110400, 0xfa010078
+0,         70,         70,        1,  3110400, 0x00c0c24e
+0,         71,         71,        1,  3110400, 0xbda7cc4e
+0,         72,         72,        1,  3110400, 0xda97f9d5
+0,         73,         73,        1,  3110400, 0xd359e94a
+0,         74,         74,        1,  3110400, 0xcd48c131
+0,         75,         75,        1,  3110400, 0xb52ca032
+0,         76,         76,        1,  3110400, 0x55a69650
+0,         77,         77,        1,  3110400, 0x7241c1a9
+0,         78,         78,        1,  3110400, 0xf06c5744
+0,         79,         79,        1,  3110400, 0xe1befd73
+0,         80,         80,        1,  3110400, 0xe8ffea92
+0,         81,         81,        1,  3110400, 0xd76e40b6
+0,         82,         82,        1,  3110400, 0xbf5f5b4c
+0,         83,         83,        1,  3110400, 0x0eb8d128
+0,         84,         84,        1,  3110400, 0x453dd680
+0,         85,         85,        1,  3110400, 0x7114fada
+0,         86,         86,        1,  3110400, 0xa3b4e7a8
+0,         87,         87,        1,  3110400, 0xbca356f0
+0,         88,         88,        1,  3110400, 0x80a83fa3
+0,         89,         89,        1,  3110400, 0x713a33d4
+0,         90,         90,        1,  3110400, 0x4fda8aea
+0,         91,         91,        1,  3110400, 0x31ed1a88
+0,         92,         92,        1,  3110400, 0x736312a0
+0,         93,         93,        1,  3110400, 0x60aff0c5
+0,         94,         94,        1,  3110400, 0xee66bd76
+0,         95,         95,        1,  3110400, 0xe8f9a352
+0,         96,         96,        1,  3110400, 0xb51520de
+0,         97,         97,        1,  3110400, 0xd0542466
+0,         98,         98,        1,  3110400, 0x92c2f3e1
+0,         99,         99,        1,  3110400, 0xbbe1839a

libav-v10.1.tar.bz2/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

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-TSCL_A_VIDYO_5 Added

@@ -0,0 +1,74 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0xcfffa013
+0,          1,          1,        1,   149760, 0x5166146a
+0,          2,          2,        1,   149760, 0xc3cc318e
+0,          3,          3,        1,   149760, 0xcedf65a0
+0,          4,          4,        1,   149760, 0x10c97bd4
+0,          5,          5,        1,   149760, 0xd9d5c4ab
+0,          6,          6,        1,   149760, 0x5112e11d
+0,          7,          7,        1,   149760, 0xde3803d6
+0,          8,          8,        1,   149760, 0x82c62409
+0,          9,          9,        1,   149760, 0x69a587f2
+0,         10,         10,        1,   149760, 0x90e2ac16
+0,         11,         11,        1,   149760, 0xdc2ed2ba
+0,         12,         12,        1,   149760, 0xcabec51f
+0,         13,         13,        1,   149760, 0x915de948
+0,         14,         14,        1,   149760, 0xd824e422
+0,         15,         15,        1,   149760, 0x10f91769
+0,         16,         16,        1,   149760, 0xf8ea1f0a
+0,         17,         17,        1,   149760, 0x88306494
+0,         18,         18,        1,   149760, 0x4b667403
+0,         19,         19,        1,   149760, 0x190b939f
+0,         20,         20,        1,   149760, 0xe754929d
+0,         21,         21,        1,   149760, 0xdd1eb9b5
+0,         22,         22,        1,   149760, 0x5ef1c64b
+0,         23,         23,        1,   149760, 0xab92e9f9
+0,         24,         24,        1,   149760, 0x873fec38
+0,         25,         25,        1,   149760, 0x1f0ca11f
+0,         26,         26,        1,   149760, 0xa2f591ca
+0,         27,         27,        1,   149760, 0x2713a994
+0,         28,         28,        1,   149760, 0xfbdba1f9
+0,         29,         29,        1,   149760, 0x3742ed2e
+0,         30,         30,        1,   149760, 0xf43fe43c
+0,         31,         31,        1,   149760, 0xa84ff250
+0,         32,         32,        1,   149760, 0xd4437e12
+0,         33,         33,        1,   149760, 0xcf08c736
+0,         34,         34,        1,   149760, 0x0cedd0d6
+0,         35,         35,        1,   149760, 0xc317e9bc
+0,         36,         36,        1,   149760, 0x0dcbd636
+0,         37,         37,        1,   149760, 0x4e6501b0
+0,         38,         38,        1,   149760, 0x5f9c02bb
+0,         39,         39,        1,   149760, 0x43052939
+0,         40,         40,        1,   149760, 0x8ec12318
+0,         41,         41,        1,   149760, 0xc51577f3
+0,         42,         42,        1,   149760, 0xbda1775b
+0,         43,         43,        1,   149760, 0x62b7b2a2
+0,         44,         44,        1,   149760, 0x5dd68203
+0,         45,         45,        1,   149760, 0xe004b4bf
+0,         46,         46,        1,   149760, 0x1469769f
+0,         47,         47,        1,   149760, 0x96f57e0a
+0,         48,         48,        1,   149760, 0x75e58819
+0,         49,         49,        1,   149760, 0xf826a158
+0,         50,         50,        1,   149760, 0xf789a3bd
+0,         51,         51,        1,   149760, 0x9d8fb09a
+0,         52,         52,        1,   149760, 0x1d33bbe5
+0,         53,         53,        1,   149760, 0x7e93e014
+0,         54,         54,        1,   149760, 0x04ade2e6
+0,         55,         55,        1,   149760, 0xb93a2c32
+0,         56,         56,        1,   149760, 0x5fa73dc3
+0,         57,         57,        1,   149760, 0xa70099ee
+0,         58,         58,        1,   149760, 0xcc5aaf3e
+0,         59,         59,        1,   149760, 0x4e83f938
+0,         60,         60,        1,   149760, 0x9faae668
+0,         61,         61,        1,   149760, 0x7a5cbf24
+0,         62,         62,        1,   149760, 0x4b23714c
+0,         63,         63,        1,   149760, 0x55d246ad
+0,         64,         64,        1,   149760, 0xd3378be9
+0,         65,         65,        1,   149760, 0xf5ef9731
+0,         66,         66,        1,   149760, 0xc4ba3ad7
+0,         67,         67,        1,   149760, 0xd9182d2c
+0,         68,         68,        1,   149760, 0x0ff5eaa5
+0,         69,         69,        1,   149760, 0xefe21a58
+0,         70,         70,        1,   149760, 0x4cad2a57
+0,         71,         71,        1,   149760, 0x24a35d1a
+0,         72,         72,        1,   149760, 0xeb1b6a6e

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-TSCL_B_VIDYO_4 Added

@@ -0,0 +1,74 @@
+#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
+0,         33,         33,        1,   149760, 0xf7aea3b6
+0,         34,         34,        1,   149760, 0x53f482c9
+0,         35,         35,        1,   149760, 0x7184b3ae
+0,         36,         36,        1,   149760, 0xb425b53d
+0,         37,         37,        1,   149760, 0xfb7cce6e
+0,         38,         38,        1,   149760, 0x820bc1ef
+0,         39,         39,        1,   149760, 0xbb0de30a
+0,         40,         40,        1,   149760, 0xbdcb0af2
+0,         41,         41,        1,   149760, 0xf2404ff7
+0,         42,         42,        1,   149760, 0xd6636f0a
+0,         43,         43,        1,   149760, 0x0e908b06
+0,         44,         44,        1,   149760, 0x36a158f4
+0,         45,         45,        1,   149760, 0x178d5bbd
+0,         46,         46,        1,   149760, 0xba9a6d14
+0,         47,         47,        1,   149760, 0x89145886
+0,         48,         48,        1,   149760, 0x6ec26794
+0,         49,         49,        1,   149760, 0xf6ac7551
+0,         50,         50,        1,   149760, 0xc829c66f
+0,         51,         51,        1,   149760, 0x64d50d50
+0,         52,         52,        1,   149760, 0x215dd855
+0,         53,         53,        1,   149760, 0x8b2ffec3
+0,         54,         54,        1,   149760, 0x1a0b7bcd
+0,         55,         55,        1,   149760, 0x14a5ad0e
+0,         56,         56,        1,   149760, 0x88c34286
+0,         57,         57,        1,   149760, 0xe2706fa9
+0,         58,         58,        1,   149760, 0x8de2decf
+0,         59,         59,        1,   149760, 0x1b37e5d7
+0,         60,         60,        1,   149760, 0xaf8d175a
+0,         61,         61,        1,   149760, 0x0f4aec5f
+0,         62,         62,        1,   149760, 0x3818df10
+0,         63,         63,        1,   149760, 0xe791d309
+0,         64,         64,        1,   149760, 0x6ad9aa0d
+0,         65,         65,        1,   149760, 0x1e1ab8a1
+0,         66,         66,        1,   149760, 0xd0ef526a
+0,         67,         67,        1,   149760, 0x45da3cf1
+0,         68,         68,        1,   149760, 0x3cb4eee6
+0,         69,         69,        1,   149760, 0x3e816ebc
+0,         70,         70,        1,   149760, 0x29d45e93
+0,         71,         71,        1,   149760, 0x824b5bc2
+0,         72,         72,        1,   149760, 0x015e6fd2

libav-v10.1.tar.bz2/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

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-TUSIZE_A_Samsung_1 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_1 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN10_2 Added

@@ -0,0 +1,49 @@
+#tb 0: 1/25
+0,          0,          0,        1,   299520, 0xa3f96d63
+0,          1,          1,        1,   299520, 0x5f788f3f
+0,          2,          2,        1,   299520, 0x41c7d0ae
+0,          3,          3,        1,   299520, 0x14a9175c
+0,          4,          4,        1,   299520, 0x5215ed5f
+0,          5,          5,        1,   299520, 0xffa5ab17
+0,          6,          6,        1,   299520, 0x7d179b2b
+0,          7,          7,        1,   299520, 0x87280332
+0,          8,          8,        1,   299520, 0xca5e278f
+0,          9,          9,        1,   299520, 0x89d59325
+0,         10,         10,        1,   299520, 0x6593cfa5
+0,         11,         11,        1,   299520, 0x216ce552
+0,         12,         12,        1,   299520, 0x4494f2ac
+0,         13,         13,        1,   299520, 0xc9aafeb4
+0,         14,         14,        1,   299520, 0xe93a43ab
+0,         15,         15,        1,   299520, 0x89bdba99
+0,         16,         16,        1,   299520, 0xdc529079
+0,         17,         17,        1,   299520, 0xfbc29de7
+0,         18,         18,        1,   299520, 0xa8c6c853
+0,         19,         19,        1,   299520, 0xd552dc1f
+0,         20,         20,        1,   299520, 0x60a7d5d9
+0,         21,         21,        1,   299520, 0x4b784987
+0,         22,         22,        1,   299520, 0xec9bd2a0
+0,         23,         23,        1,   299520, 0x71e1d437
+0,         24,         24,        1,   299520, 0x5776a225
+0,         25,         25,        1,   299520, 0x01598543
+0,         26,         26,        1,   299520, 0x8abb1f7b
+0,         27,         27,        1,   299520, 0xa3a0bb58
+0,         28,         28,        1,   299520, 0x4a718127
+0,         29,         29,        1,   299520, 0x6b1647bc
+0,         30,         30,        1,   299520, 0x7b653009
+0,         31,         31,        1,   299520, 0xca15d4be
+0,         32,         32,        1,   299520, 0xf8075689
+0,         33,         33,        1,   299520, 0x2717f2e6
+0,         34,         34,        1,   299520, 0x53ad6267
+0,         35,         35,        1,   299520, 0x29fedd49
+0,         36,         36,        1,   299520, 0x4e8aa5db
+0,         37,         37,        1,   299520, 0xca316c94
+0,         38,         38,        1,   299520, 0x8071fd57
+0,         39,         39,        1,   299520, 0xc9915cd3
+0,         40,         40,        1,   299520, 0xab335447
+0,         41,         41,        1,   299520, 0xf733a390
+0,         42,         42,        1,   299520, 0x1fa14afb
+0,         43,         43,        1,   299520, 0xe5d7ae71
+0,         44,         44,        1,   299520, 0xb48c2ee6
+0,         45,         45,        1,   299520, 0xe288ebcc
+0,         46,         46,        1,   299520, 0xa4000bdd
+0,         47,         47,        1,   299520, 0xf3fdee3a

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN_2 Added

@@ -0,0 +1,49 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0xfbb3d914
+0,          1,          1,        1,   149760, 0xdccd707b
+0,          2,          2,        1,   149760, 0x32008963
+0,          3,          3,        1,   149760, 0x0fcdd808
+0,          4,          4,        1,   149760, 0x69f0e1a5
+0,          5,          5,        1,   149760, 0x1be36c09
+0,          6,          6,        1,   149760, 0x18a1588f
+0,          7,          7,        1,   149760, 0xdc46acd8
+0,          8,          8,        1,   149760, 0xec46760a
+0,          9,          9,        1,   149760, 0xe87fc7b5
+0,         10,         10,        1,   149760, 0x7c78d960
+0,         11,         11,        1,   149760, 0x73e2ea91
+0,         12,         12,        1,   149760, 0x9164db8c
+0,         13,         13,        1,   149760, 0x31a6124b
+0,         14,         14,        1,   149760, 0x8a143aed
+0,         15,         15,        1,   149760, 0x15a364f4
+0,         16,         16,        1,   149760, 0x93b8560e
+0,         17,         17,        1,   149760, 0xc2aa985c
+0,         18,         18,        1,   149760, 0xe83ca4da
+0,         19,         19,        1,   149760, 0x6c79cb07
+0,         20,         20,        1,   149760, 0x2c24c739
+0,         21,         21,        1,   149760, 0x6a60f769
+0,         22,         22,        1,   149760, 0x13f00ad1
+0,         23,         23,        1,   149760, 0x59dd330d
+0,         24,         24,        1,   149760, 0x8815348c
+0,         25,         25,        1,   149760, 0x88576cd4
+0,         26,         26,        1,   149760, 0xfa3d6b9c
+0,         27,         27,        1,   149760, 0x810c8145
+0,         28,         28,        1,   149760, 0xf2357fcc
+0,         29,         29,        1,   149760, 0xc885a093
+0,         30,         30,        1,   149760, 0x5939a048
+0,         31,         31,        1,   149760, 0x9f93a489
+0,         32,         32,        1,   149760, 0xc11a879e
+0,         33,         33,        1,   149760, 0x5221c04b
+0,         34,         34,        1,   149760, 0x7dcdca90
+0,         35,         35,        1,   149760, 0xfdd8df1e
+0,         36,         36,        1,   149760, 0x3a88c802
+0,         37,         37,        1,   149760, 0x50ff1081
+0,         38,         38,        1,   149760, 0x6388f458
+0,         39,         39,        1,   149760, 0x85623a2b
+0,         40,         40,        1,   149760, 0x1bfd34a4
+0,         41,         41,        1,   149760, 0xb6037b88
+0,         42,         42,        1,   149760, 0xd24e65c7
+0,         43,         43,        1,   149760, 0xd2bd8fac
+0,         44,         44,        1,   149760, 0x602f64d0
+0,         45,         45,        1,   149760, 0x59415d5e
+0,         46,         46,        1,   149760, 0x9faf5737
+0,         47,         47,        1,   149760, 0x66ce56a9

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN10_2 Added

@@ -0,0 +1,49 @@
+#tb 0: 1/25
+0,          0,          0,        1,   299520, 0x66b3cef3
+0,          1,          1,        1,   299520, 0x99df880f
+0,          2,          2,        1,   299520, 0xb4a03801
+0,          3,          3,        1,   299520, 0x1510c9e2
+0,          4,          4,        1,   299520, 0x42fe77b1
+0,          5,          5,        1,   299520, 0x815e1727
+0,          6,          6,        1,   299520, 0x6dd002f4
+0,          7,          7,        1,   299520, 0x2650e944
+0,          8,          8,        1,   299520, 0x3268c1e9
+0,          9,          9,        1,   299520, 0xced41a5f
+0,         10,         10,        1,   299520, 0x91334b97
+0,         11,         11,        1,   299520, 0xc5bb7ff6
+0,         12,         12,        1,   299520, 0x26e27c35
+0,         13,         13,        1,   299520, 0x482da6cb
+0,         14,         14,        1,   299520, 0xfe742e8e
+0,         15,         15,        1,   299520, 0x3f395752
+0,         16,         16,        1,   299520, 0x189936e5
+0,         17,         17,        1,   299520, 0x56a58a07
+0,         18,         18,        1,   299520, 0x798d8de9
+0,         19,         19,        1,   299520, 0x5d8e947f
+0,         20,         20,        1,   299520, 0x65477654
+0,         21,         21,        1,   299520, 0x5012d167
+0,         22,         22,        1,   299520, 0xe889bb27
+0,         23,         23,        1,   299520, 0x4611c1e6
+0,         24,         24,        1,   299520, 0xb093402b
+0,         25,         25,        1,   299520, 0xddc065d8
+0,         26,         26,        1,   299520, 0x6986e1d9
+0,         27,         27,        1,   299520, 0x0e539004
+0,         28,         28,        1,   299520, 0x4768f9ed
+0,         29,         29,        1,   299520, 0xfad20b53
+0,         30,         30,        1,   299520, 0x82f9c996
+0,         31,         31,        1,   299520, 0x6b366d79
+0,         32,         32,        1,   299520, 0x5a35d42e
+0,         33,         33,        1,   299520, 0xf3849013
+0,         34,         34,        1,   299520, 0x6b8eae50
+0,         35,         35,        1,   299520, 0x0f854274
+0,         36,         36,        1,   299520, 0x31685299
+0,         37,         37,        1,   299520, 0x77357bfb
+0,         38,         38,        1,   299520, 0xd67f1807
+0,         39,         39,        1,   299520, 0x371e7eb6
+0,         40,         40,        1,   299520, 0xe2ee3531
+0,         41,         41,        1,   299520, 0x50f242f1
+0,         42,         42,        1,   299520, 0x265ed919
+0,         43,         43,        1,   299520, 0xad496c85
+0,         44,         44,        1,   299520, 0xb2aef047
+0,         45,         45,        1,   299520, 0xac5c4451
+0,         46,         46,        1,   299520, 0x2b26a0cb
+0,         47,         47,        1,   299520, 0x5738d837

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN_2 Added

@@ -0,0 +1,49 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x3772de54
+0,          1,          1,        1,   149760, 0x571d885e
+0,          2,          2,        1,   149760, 0x71576f09
+0,          3,          3,        1,   149760, 0xf0724ce0
+0,          4,          4,        1,   149760, 0x2cc6e355
+0,          5,          5,        1,   149760, 0x0ca14365
+0,          6,          6,        1,   149760, 0x5aeb4b4d
+0,          7,          7,        1,   149760, 0xb018561c
+0,          8,          8,        1,   149760, 0x8fb07521
+0,          9,          9,        1,   149760, 0x9e1ccc5b
+0,         10,         10,        1,   149760, 0x0cf3de9f
+0,         11,         11,        1,   149760, 0x918cf512
+0,         12,         12,        1,   149760, 0x9a60e5c4
+0,         13,         13,        1,   149760, 0xc3b01d10
+0,         14,         14,        1,   149760, 0x929b34a6
+0,         15,         15,        1,   149760, 0x1f9462ac
+0,         16,         16,        1,   149760, 0xcadf511e
+0,         17,         17,        1,   149760, 0x318e9af6
+0,         18,         18,        1,   149760, 0x0860a371
+0,         19,         19,        1,   149760, 0x13e3c4d1
+0,         20,         20,        1,   149760, 0xfa27cbf6
+0,         21,         21,        1,   149760, 0x407ffed5
+0,         22,         22,        1,   149760, 0xa3c00c3b
+0,         23,         23,        1,   149760, 0x926938c6
+0,         24,         24,        1,   149760, 0xf5792acf
+0,         25,         25,        1,   149760, 0x66e16a48
+0,         26,         26,        1,   149760, 0xd46e7041
+0,         27,         27,        1,   149760, 0x814c84ee
+0,         28,         28,        1,   149760, 0x165b750a
+0,         29,         29,        1,   149760, 0x24ad9df0
+0,         30,         30,        1,   149760, 0x11189e4e
+0,         31,         31,        1,   149760, 0xb841a5b6
+0,         32,         32,        1,   149760, 0xea738605
+0,         33,         33,        1,   149760, 0xbbf0ca3f
+0,         34,         34,        1,   149760, 0xcfb5d03c
+0,         35,         35,        1,   149760, 0x0654f0b7
+0,         36,         36,        1,   149760, 0x1c2cd18d
+0,         37,         37,        1,   149760, 0x9a4602ae
+0,         38,         38,        1,   149760, 0xf2a2ff5a
+0,         39,         39,        1,   149760, 0x9c153c77
+0,         40,         40,        1,   149760, 0x5ed23e56
+0,         41,         41,        1,   149760, 0x1eb58383
+0,         42,         42,        1,   149760, 0x725e70f2
+0,         43,         43,        1,   149760, 0x652aa56c
+0,         44,         44,        1,   149760, 0x7f736ad2
+0,         45,         45,        1,   149760, 0x0827700a
+0,         46,         46,        1,   149760, 0x76a06370
+0,         47,         47,        1,   149760, 0xa7fe6f9d

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN10_2 Added

@@ -0,0 +1,49 @@
+#tb 0: 1/25
+0,          0,          0,        1,   299520, 0xbc71d699
+0,          1,          1,        1,   299520, 0x3207e1f9
+0,          2,          2,        1,   299520, 0xdd2087b5
+0,          3,          3,        1,   299520, 0xb512c976
+0,          4,          4,        1,   299520, 0x22957011
+0,          5,          5,        1,   299520, 0x8ce04965
+0,          6,          6,        1,   299520, 0x9cf37cba
+0,          7,          7,        1,   299520, 0xd52f8b2d
+0,          8,          8,        1,   299520, 0x2f55a94d
+0,          9,          9,        1,   299520, 0x53d3cc42
+0,         10,         10,        1,   299520, 0xbc33f3a1
+0,         11,         11,        1,   299520, 0x5e67d0de
+0,         12,         12,        1,   299520, 0x5708ecc5
+0,         13,         13,        1,   299520, 0x104869c0
+0,         14,         14,        1,   299520, 0xaf2a8638
+0,         15,         15,        1,   299520, 0xbdf1d001
+0,         16,         16,        1,   299520, 0xa3f71579
+0,         17,         17,        1,   299520, 0x68cedb09
+0,         18,         18,        1,   299520, 0xa4262d4d
+0,         19,         19,        1,   299520, 0x99320c8d
+0,         20,         20,        1,   299520, 0x57be6268
+0,         21,         21,        1,   299520, 0xc7e14cfc
+0,         22,         22,        1,   299520, 0x3d906541
+0,         23,         23,        1,   299520, 0x804b2f29
+0,         24,         24,        1,   299520, 0x93cf0ae2
+0,         25,         25,        1,   299520, 0x0fd2f932
+0,         26,         26,        1,   299520, 0xf869a25c
+0,         27,         27,        1,   299520, 0xa2dc56cd
+0,         28,         28,        1,   299520, 0x075b14a7
+0,         29,         29,        1,   299520, 0x233b0085
+0,         30,         30,        1,   299520, 0x80a69c4c
+0,         31,         31,        1,   299520, 0xf45f21af
+0,         32,         32,        1,   299520, 0x88dcab6e
+0,         33,         33,        1,   299520, 0xc1df3e99
+0,         34,         34,        1,   299520, 0xac298452
+0,         35,         35,        1,   299520, 0x6b4cc1e3
+0,         36,         36,        1,   299520, 0xfd39c597
+0,         37,         37,        1,   299520, 0xe60f808c
+0,         38,         38,        1,   299520, 0x27c47830
+0,         39,         39,        1,   299520, 0x4fd9ec76
+0,         40,         40,        1,   299520, 0x3249e084
+0,         41,         41,        1,   299520, 0x40632223
+0,         42,         42,        1,   299520, 0x9b68d213
+0,         43,         43,        1,   299520, 0x9e210ed8
+0,         44,         44,        1,   299520, 0x54489508
+0,         45,         45,        1,   299520, 0xc799df16
+0,         46,         46,        1,   299520, 0x020b2211
+0,         47,         47,        1,   299520, 0xcc1a1683

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN_2 Added

@@ -0,0 +1,49 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x0948e521
+0,          1,          1,        1,   149760, 0x37afb384
+0,          2,          2,        1,   149760, 0xe1864c4a
+0,          3,          3,        1,   149760, 0x143344eb
+0,          4,          4,        1,   149760, 0x34cce612
+0,          5,          5,        1,   149760, 0x45ce60b3
+0,          6,          6,        1,   149760, 0x17b36585
+0,          7,          7,        1,   149760, 0x6447ebe5
+0,          8,          8,        1,   149760, 0x0f4282c7
+0,          9,          9,        1,   149760, 0xa0c3dab3
+0,         10,         10,        1,   149760, 0x0f3ceb7c
+0,         11,         11,        1,   149760, 0xb861f311
+0,         12,         12,        1,   149760, 0x620fe482
+0,         13,         13,        1,   149760, 0xa3dc1603
+0,         14,         14,        1,   149760, 0x6b7a3a6c
+0,         15,         15,        1,   149760, 0x01d16e5e
+0,         16,         16,        1,   149760, 0xe12f6009
+0,         17,         17,        1,   149760, 0xc96d98bd
+0,         18,         18,        1,   149760, 0x542e9f47
+0,         19,         19,        1,   149760, 0x5bcbc3b8
+0,         20,         20,        1,   149760, 0x3be2c63a
+0,         21,         21,        1,   149760, 0xd63df815
+0,         22,         22,        1,   149760, 0x5c210d61
+0,         23,         23,        1,   149760, 0xc7fb33b8
+0,         24,         24,        1,   149760, 0xa9f13508
+0,         25,         25,        1,   149760, 0xbf636172
+0,         26,         26,        1,   149760, 0xf1966847
+0,         27,         27,        1,   149760, 0xcc0579eb
+0,         28,         28,        1,   149760, 0x467673cb
+0,         29,         29,        1,   149760, 0x4dbca3f2
+0,         30,         30,        1,   149760, 0xada29bc9
+0,         31,         31,        1,   149760, 0x2983a0d5
+0,         32,         32,        1,   149760, 0x3864832a
+0,         33,         33,        1,   149760, 0x6a06b61d
+0,         34,         34,        1,   149760, 0x90a0d994
+0,         35,         35,        1,   149760, 0x3c58f375
+0,         36,         36,        1,   149760, 0x365bd42a
+0,         37,         37,        1,   149760, 0x5665f25f
+0,         38,         38,        1,   149760, 0x75d8fe8f
+0,         39,         39,        1,   149760, 0xc67e3508
+0,         40,         40,        1,   149760, 0x2e7b428b
+0,         41,         41,        1,   149760, 0x59cf741c
+0,         42,         42,        1,   149760, 0x2cc77eb4
+0,         43,         43,        1,   149760, 0x4957970a
+0,         44,         44,        1,   149760, 0xa69f7323
+0,         45,         45,        1,   149760, 0xaf1f6772
+0,         46,         46,        1,   149760, 0x864a5a76
+0,         47,         47,        1,   149760, 0x57795407

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN10_2 Added

@@ -0,0 +1,49 @@
+#tb 0: 1/25
+0,          0,          0,        1,    46080, 0xc50ed6b4
+0,          1,          1,        1,    46080, 0x2aeac52d
+0,          2,          2,        1,    46080, 0xe3e36cd3
+0,          3,          3,        1,    46080, 0x81c6b317
+0,          4,          4,        1,    46080, 0x20e24e33
+0,          5,          5,        1,    46080, 0xc4a64f17
+0,          6,          6,        1,    46080, 0xf95a5014
+0,          7,          7,        1,    46080, 0x8d9e9a26
+0,          8,          8,        1,    46080, 0x5f0f4592
+0,          9,          9,        1,    46080, 0xa1b54f9f
+0,         10,         10,        1,    46080, 0x3d5c3673
+0,         11,         11,        1,    46080, 0xca6e5e83
+0,         12,         12,        1,    46080, 0x93eca575
+0,         13,         13,        1,    46080, 0xf84bab2b
+0,         14,         14,        1,    46080, 0xf22599d1
+0,         15,         15,        1,    46080, 0xf916673f
+0,         16,         16,        1,    46080, 0xbb11a29b
+0,         17,         17,        1,    46080, 0x047e1dd7
+0,         18,         18,        1,    46080, 0x9a975834
+0,         19,         19,        1,    46080, 0xa3fe84d4
+0,         20,         20,        1,    46080, 0x08e1c2f4
+0,         21,         21,        1,    46080, 0xbbbcf81b
+0,         22,         22,        1,    46080, 0x4abb0255
+0,         23,         23,        1,    46080, 0x20052dda
+0,         24,         24,        1,    46080, 0x10290ef3
+0,         25,         25,        1,    46080, 0x9e7633d0
+0,         26,         26,        1,    46080, 0x60d0fb3a
+0,         27,         27,        1,    46080, 0xe0209fb3
+0,         28,         28,        1,    46080, 0xea006c44
+0,         29,         29,        1,    46080, 0xe0b84e96
+0,         30,         30,        1,    46080, 0x35e507d7
+0,         31,         31,        1,    46080, 0x4107fcd6
+0,         32,         32,        1,    46080, 0x1b34af49
+0,         33,         33,        1,    46080, 0x4ab91078
+0,         34,         34,        1,    46080, 0x130750dd
+0,         35,         35,        1,    46080, 0x592dbe41
+0,         36,         36,        1,    46080, 0xfd39cf6b
+0,         37,         37,        1,    46080, 0xbe9ee5b7
+0,         38,         38,        1,    46080, 0x25ebde48
+0,         39,         39,        1,    46080, 0x2becd45c
+0,         40,         40,        1,    46080, 0x9b5fdfdb
+0,         41,         41,        1,    46080, 0xededa5f5
+0,         42,         42,        1,    46080, 0x476bc4e5
+0,         43,         43,        1,    46080, 0x4a4a0a4e
+0,         44,         44,        1,    46080, 0x1324f41b
+0,         45,         45,        1,    46080, 0xc503cfc8
+0,         46,         46,        1,    46080, 0x53f7c74c
+0,         47,         47,        1,    46080, 0xc861b5a3

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN_2 Added

@@ -0,0 +1,49 @@
+#tb 0: 1/25
+0,          0,          0,        1,    23040, 0x6977dbca
+0,          1,          1,        1,    23040, 0xd9bfcb5c
+0,          2,          2,        1,    23040, 0xbdd5a346
+0,          3,          3,        1,    23040, 0x021877cd
+0,          4,          4,        1,    23040, 0xb8a45933
+0,          5,          5,        1,    23040, 0xc289338e
+0,          6,          6,        1,    23040, 0x6968e57d
+0,          7,          7,        1,    23040, 0x1142c50c
+0,          8,          8,        1,    23040, 0xcf86c357
+0,          9,          9,        1,    23040, 0xf73de7ec
+0,         10,         10,        1,    23040, 0x2103ed06
+0,         11,         11,        1,    23040, 0xf0ecc0e2
+0,         12,         12,        1,    23040, 0xa7b1971f
+0,         13,         13,        1,    23040, 0x4454871a
+0,         14,         14,        1,    23040, 0xc5088346
+0,         15,         15,        1,    23040, 0x89189469
+0,         16,         16,        1,    23040, 0x320d977a
+0,         17,         17,        1,    23040, 0xbdc0a95b
+0,         18,         18,        1,    23040, 0xbcfec5c9
+0,         19,         19,        1,    23040, 0xb68ceb37
+0,         20,         20,        1,    23040, 0x41a60b0c
+0,         21,         21,        1,    23040, 0x0e662b47
+0,         22,         22,        1,    23040, 0x0e2440b7
+0,         23,         23,        1,    23040, 0x77415a77
+0,         24,         24,        1,    23040, 0x62936fdf
+0,         25,         25,        1,    23040, 0xaa987f9d
+0,         26,         26,        1,    23040, 0xaf0c8764
+0,         27,         27,        1,    23040, 0x645c913e
+0,         28,         28,        1,    23040, 0x2f249b06
+0,         29,         29,        1,    23040, 0xb54fb546
+0,         30,         30,        1,    23040, 0xc669c247
+0,         31,         31,        1,    23040, 0xe308bb8f
+0,         32,         32,        1,    23040, 0xb920b69d
+0,         33,         33,        1,    23040, 0x86d5c0ff
+0,         34,         34,        1,    23040, 0x7d5ec3e4
+0,         35,         35,        1,    23040, 0x5ca1cdb0
+0,         36,         36,        1,    23040, 0xdc11cf9e
+0,         37,         37,        1,    23040, 0x1a7fd0d5
+0,         38,         38,        1,    23040, 0x9884d5cd
+0,         39,         39,        1,    23040, 0xcafbd5fb
+0,         40,         40,        1,    23040, 0xc670ceb7
+0,         41,         41,        1,    23040, 0x63cecef7
+0,         42,         42,        1,    23040, 0xfe29c28c
+0,         43,         43,        1,    23040, 0x368dc66e
+0,         44,         44,        1,    23040, 0x2ec7c4de
+0,         45,         45,        1,    23040, 0x8954c9d6
+0,         46,         46,        1,    23040, 0xff89ca68
+0,         47,         47,        1,    23040, 0x5ae0b290

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN10_2 Added

@@ -0,0 +1,49 @@
+#tb 0: 1/25
+0,          0,          0,        1,    92160, 0x591c992e
+0,          1,          1,        1,    92160, 0xe7a8cd8b
+0,          2,          2,        1,    92160, 0x2e7528bb
+0,          3,          3,        1,    92160, 0x92438eae
+0,          4,          4,        1,    92160, 0x15cc21b9
+0,          5,          5,        1,    92160, 0x3f14a50e
+0,          6,          6,        1,    92160, 0xdbc712e7
+0,          7,          7,        1,    92160, 0x277b2d3f
+0,          8,          8,        1,    92160, 0x05478988
+0,          9,          9,        1,    92160, 0x46888b9c
+0,         10,         10,        1,    92160, 0xb1f46d1b
+0,         11,         11,        1,    92160, 0xa86771fa
+0,         12,         12,        1,    92160, 0x1294944a
+0,         13,         13,        1,    92160, 0xe134cd44
+0,         14,         14,        1,    92160, 0x5fdbf1fb
+0,         15,         15,        1,    92160, 0x01f04b2e
+0,         16,         16,        1,    92160, 0x50989c28
+0,         17,         17,        1,    92160, 0x3202cf37
+0,         18,         18,        1,    92160, 0x67fbdb0f
+0,         19,         19,        1,    92160, 0x4d453062
+0,         20,         20,        1,    92160, 0x799c3e16
+0,         21,         21,        1,    92160, 0xdda76a94
+0,         22,         22,        1,    92160, 0x392d0fc9
+0,         23,         23,        1,    92160, 0x1196e850
+0,         24,         24,        1,    92160, 0x8758d8a9
+0,         25,         25,        1,    92160, 0xb632c2b3
+0,         26,         26,        1,    92160, 0xf3ba5e47
+0,         27,         27,        1,    92160, 0x3ae40182
+0,         28,         28,        1,    92160, 0xf285e2eb
+0,         29,         29,        1,    92160, 0x826aee47
+0,         30,         30,        1,    92160, 0xe06ba18b
+0,         31,         31,        1,    92160, 0xf34b6ef5
+0,         32,         32,        1,    92160, 0xf94045ab
+0,         33,         33,        1,    92160, 0xd0ae63f4
+0,         34,         34,        1,    92160, 0x4c35afc1
+0,         35,         35,        1,    92160, 0x9a150816
+0,         36,         36,        1,    92160, 0x1a4214d4
+0,         37,         37,        1,    92160, 0x9f042653
+0,         38,         38,        1,    92160, 0xf69a40a8
+0,         39,         39,        1,    92160, 0xb8462c18
+0,         40,         40,        1,    92160, 0xf42d4748
+0,         41,         41,        1,    92160, 0x4968dc19
+0,         42,         42,        1,    92160, 0xc8e6001f
+0,         43,         43,        1,    92160, 0xebb42677
+0,         44,         44,        1,    92160, 0x3fb805dd
+0,         45,         45,        1,    92160, 0x1953cfc1
+0,         46,         46,        1,    92160, 0x633108f4
+0,         47,         47,        1,    92160, 0x65aedf42

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN_2 Added

@@ -0,0 +1,49 @@
+#tb 0: 1/25
+0,          0,          0,        1,    46080, 0xcd234724
+0,          1,          1,        1,    46080, 0x66649579
+0,          2,          2,        1,    46080, 0x4317d38d
+0,          3,          3,        1,    46080, 0x308dfc39
+0,          4,          4,        1,    46080, 0xe08e3015
+0,          5,          5,        1,    46080, 0xaa0a3e44
+0,          6,          6,        1,    46080, 0x491b61cf
+0,          7,          7,        1,    46080, 0x9c5a9749
+0,          8,          8,        1,    46080, 0x4384ae34
+0,          9,          9,        1,    46080, 0xfd2bf2c1
+0,         10,         10,        1,    46080, 0xf29b18d7
+0,         11,         11,        1,    46080, 0xc1912df5
+0,         12,         12,        1,    46080, 0x9cc3344b
+0,         13,         13,        1,    46080, 0x41c062a3
+0,         14,         14,        1,    46080, 0xa5ec8417
+0,         15,         15,        1,    46080, 0x94e5aed6
+0,         16,         16,        1,    46080, 0x1af6ce24
+0,         17,         17,        1,    46080, 0xd73c0272
+0,         18,         18,        1,    46080, 0xb7b41c50
+0,         19,         19,        1,    46080, 0x7fa442dc
+0,         20,         20,        1,    46080, 0x513e5f5a
+0,         21,         21,        1,    46080, 0x46a1848b
+0,         22,         22,        1,    46080, 0xcf31a1c4
+0,         23,         23,        1,    46080, 0x3ee8c90c
+0,         24,         24,        1,    46080, 0xc54fdd27
+0,         25,         25,        1,    46080, 0x59830556
+0,         26,         26,        1,    46080, 0xf8c70cc7
+0,         27,         27,        1,    46080, 0x44a519f9
+0,         28,         28,        1,    46080, 0xdd0323d3
+0,         29,         29,        1,    46080, 0x93874212
+0,         30,         30,        1,    46080, 0xba8e4d8e
+0,         31,         31,        1,    46080, 0x5c3f4fb0
+0,         32,         32,        1,    46080, 0x37084bf2
+0,         33,         33,        1,    46080, 0xad256b1b
+0,         34,         34,        1,    46080, 0x862b7a7d
+0,         35,         35,        1,    46080, 0x4a2e8d56
+0,         36,         36,        1,    46080, 0xe99d8f5a
+0,         37,         37,        1,    46080, 0xe41a9456
+0,         38,         38,        1,    46080, 0xe7339f1c
+0,         39,         39,        1,    46080, 0xfa38a6c3
+0,         40,         40,        1,    46080, 0x219e97d2
+0,         41,         41,        1,    46080, 0x652d9cc2
+0,         42,         42,        1,    46080, 0x40bf8f94
+0,         43,         43,        1,    46080, 0x2fee9e23
+0,         44,         44,        1,    46080, 0xeea39203
+0,         45,         45,        1,    46080, 0x69819b5c
+0,         46,         46,        1,    46080, 0x511ba0b5
+0,         47,         47,        1,    46080, 0x85fd892f

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN10_2 Added

@@ -0,0 +1,49 @@
+#tb 0: 1/25
+0,          0,          0,        1,   138240, 0x99f196ae
+0,          1,          1,        1,   138240, 0x45f407de
+0,          2,          2,        1,   138240, 0xdaef815b
+0,          3,          3,        1,   138240, 0x6812ba5a
+0,          4,          4,        1,   138240, 0x1099912d
+0,          5,          5,        1,   138240, 0xf58ee932
+0,          6,          6,        1,   138240, 0x79df05d8
+0,          7,          7,        1,   138240, 0xa0813719
+0,          8,          8,        1,   138240, 0xe9c7c5c0
+0,          9,          9,        1,   138240, 0xe8c5aba3
+0,         10,         10,        1,   138240, 0x7f0ed0b6
+0,         11,         11,        1,   138240, 0x1bdcfd20
+0,         12,         12,        1,   138240, 0x3b1fc007
+0,         13,         13,        1,   138240, 0xf6a9d270
+0,         14,         14,        1,   138240, 0x3a2d47d4
+0,         15,         15,        1,   138240, 0xbeb9685f
+0,         16,         16,        1,   138240, 0x4cb6eb4a
+0,         17,         17,        1,   138240, 0xa456dcdf
+0,         18,         18,        1,   138240, 0x2933f8e1
+0,         19,         19,        1,   138240, 0x27de28e9
+0,         20,         20,        1,   138240, 0x557c0e51
+0,         21,         21,        1,   138240, 0x6f106540
+0,         22,         22,        1,   138240, 0xf78421a4
+0,         23,         23,        1,   138240, 0xa94029a7
+0,         24,         24,        1,   138240, 0xacfa2b8b
+0,         25,         25,        1,   138240, 0x32e7d347
+0,         26,         26,        1,   138240, 0xe4c17fac
+0,         27,         27,        1,   138240, 0x47e61949
+0,         28,         28,        1,   138240, 0xd248e34b
+0,         29,         29,        1,   138240, 0xb747dc2c
+0,         30,         30,        1,   138240, 0x3a0eaf61
+0,         31,         31,        1,   138240, 0x4e254b5f
+0,         32,         32,        1,   138240, 0xf434f578
+0,         33,         33,        1,   138240, 0xe799308e
+0,         34,         34,        1,   138240, 0xb3e67c89
+0,         35,         35,        1,   138240, 0xb6ceb379
+0,         36,         36,        1,   138240, 0xd70bea99
+0,         37,         37,        1,   138240, 0xad0717a8
+0,         38,         38,        1,   138240, 0x2b50f085
+0,         39,         39,        1,   138240, 0xb334e518
+0,         40,         40,        1,   138240, 0xe7311c3a
+0,         41,         41,        1,   138240, 0x7c46dc19
+0,         42,         42,        1,   138240, 0x18c20dfa
+0,         43,         43,        1,   138240, 0x8bc0f6ae
+0,         44,         44,        1,   138240, 0x91a8c381
+0,         45,         45,        1,   138240, 0x2ba57297
+0,         46,         46,        1,   138240, 0x99d982f0
+0,         47,         47,        1,   138240, 0x0f84942a

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN_2 Added

@@ -0,0 +1,49 @@
+#tb 0: 1/25
+0,          0,          0,        1,    69120, 0x28326a13
+0,          1,          1,        1,    69120, 0x1f41a4a7
+0,          2,          2,        1,    69120, 0x803ceeb4
+0,          3,          3,        1,    69120, 0x1eba4049
+0,          4,          4,        1,    69120, 0x61a25512
+0,          5,          5,        1,    69120, 0x4db37e41
+0,          6,          6,        1,    69120, 0x00f69308
+0,          7,          7,        1,    69120, 0x7478c70f
+0,          8,          8,        1,    69120, 0xba1bd40b
+0,          9,          9,        1,    69120, 0x31d416bc
+0,         10,         10,        1,    69120, 0xd0c042bd
+0,         11,         11,        1,    69120, 0xe7a75aba
+0,         12,         12,        1,    69120, 0xb4235b4c
+0,         13,         13,        1,    69120, 0xaad387c3
+0,         14,         14,        1,    69120, 0xb97aab7a
+0,         15,         15,        1,    69120, 0x1acdda47
+0,         16,         16,        1,    69120, 0x2c95f726
+0,         17,         17,        1,    69120, 0xba3f2ebb
+0,         18,         18,        1,    69120, 0x15fc4901
+0,         19,         19,        1,    69120, 0x56387074
+0,         20,         20,        1,    69120, 0xe9638772
+0,         21,         21,        1,    69120, 0x344db5ec
+0,         22,         22,        1,    69120, 0xf54bd087
+0,         23,         23,        1,    69120, 0x5b35fbe4
+0,         24,         24,        1,    69120, 0x052c0947
+0,         25,         25,        1,    69120, 0xe562417c
+0,         26,         26,        1,    69120, 0x502a4776
+0,         27,         27,        1,    69120, 0x46b05919
+0,         28,         28,        1,    69120, 0x103161a1
+0,         29,         29,        1,    69120, 0xd83e8318
+0,         30,         30,        1,    69120, 0xd7ce8fb1
+0,         31,         31,        1,    69120, 0xda3f8ac5
+0,         32,         32,        1,    69120, 0xecd17de1
+0,         33,         33,        1,    69120, 0x7beeab11
+0,         34,         34,        1,    69120, 0xb295b81f
+0,         35,         35,        1,    69120, 0x785ec9ab
+0,         36,         36,        1,    69120, 0x58a3c317
+0,         37,         37,        1,    69120, 0x05feda91
+0,         38,         38,        1,    69120, 0xd21fdcab
+0,         39,         39,        1,    69120, 0x0d6ce0ee
+0,         40,         40,        1,    69120, 0x40ddc715
+0,         41,         41,        1,    69120, 0x5489d3e1
+0,         42,         42,        1,    69120, 0x7f57c42b
+0,         43,         43,        1,    69120, 0xd470cca3
+0,         44,         44,        1,    69120, 0xfb80c51c
+0,         45,         45,        1,    69120, 0x76b1d068
+0,         46,         46,        1,    69120, 0x5b01d81e
+0,         47,         47,        1,    69120, 0x21cfc241

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-WP_A_MAIN10_Toshiba_3 Added

@@ -0,0 +1,257 @@
+#tb 0: 1/25
+0,          0,          0,        1,   299520, 0x7750edc7
+0,          1,          1,        1,   299520, 0x97fb359b
+0,          2,          2,        1,   299520, 0x89ac22bc
+0,          3,          3,        1,   299520, 0x4f7e0ecc
+0,          4,          4,        1,   299520, 0x7367f210
+0,          5,          5,        1,   299520, 0x5c2274e3
+0,          6,          6,        1,   299520, 0x11f26352
+0,          7,          7,        1,   299520, 0x2c712fcc
+0,          8,          8,        1,   299520, 0x44d700aa
+0,          9,          9,        1,   299520, 0x7426fc80
+0,         10,         10,        1,   299520, 0xd31d2fef
+0,         11,         11,        1,   299520, 0xd7c8d389
+0,         12,         12,        1,   299520, 0x2a8283e7
+0,         13,         13,        1,   299520, 0x429f5e44
+0,         14,         14,        1,   299520, 0x5c818504
+0,         15,         15,        1,   299520, 0x1057090e
+0,         16,         16,        1,   299520, 0x61404e77
+0,         17,         17,        1,   299520, 0x8ce43ed3
+0,         18,         18,        1,   299520, 0xf08e6c4d
+0,         19,         19,        1,   299520, 0xb133a69f
+0,         20,         20,        1,   299520, 0xd1be15a5
+0,         21,         21,        1,   299520, 0xe875543f
+0,         22,         22,        1,   299520, 0x0310f356
+0,         23,         23,        1,   299520, 0x5ee0a7d9
+0,         24,         24,        1,   299520, 0xacd092bb
+0,         25,         25,        1,   299520, 0x878ef783
+0,         26,         26,        1,   299520, 0xed9a2c06
+0,         27,         27,        1,   299520, 0x0a4cb661
+0,         28,         28,        1,   299520, 0x69aed89b
+0,         29,         29,        1,   299520, 0xaa75d081
+0,         30,         30,        1,   299520, 0x4c0402c6
+0,         31,         31,        1,   299520, 0x7050b8f8
+0,         32,         32,        1,   299520, 0x20cf8db8
+0,         33,         33,        1,   299520, 0xa615d0cb
+0,         34,         34,        1,   299520, 0x3170b77f
+0,         35,         35,        1,   299520, 0x781f17a5
+0,         36,         36,        1,   299520, 0x8767468b
+0,         37,         37,        1,   299520, 0x8f291a78
+0,         38,         38,        1,   299520, 0x87534588
+0,         39,         39,        1,   299520, 0xb4861cee
+0,         40,         40,        1,   299520, 0x38b6ba36
+0,         41,         41,        1,   299520, 0x757ebda4
+0,         42,         42,        1,   299520, 0xeccca3c0
+0,         43,         43,        1,   299520, 0x8af415a3
+0,         44,         44,        1,   299520, 0x37064dea
+0,         45,         45,        1,   299520, 0xfea46d66
+0,         46,         46,        1,   299520, 0x038d776f
+0,         47,         47,        1,   299520, 0x2b905161
+0,         48,         48,        1,   299520, 0x60230f44
+0,         49,         49,        1,   299520, 0x828f8991
+0,         50,         50,        1,   299520, 0x7c5ded06
+0,         51,         51,        1,   299520, 0xef38fd3a
+0,         52,         52,        1,   299520, 0x4c08ea42
+0,         53,         53,        1,   299520, 0x66dd9974
+0,         54,         54,        1,   299520, 0x4af1e690
+0,         55,         55,        1,   299520, 0x3fce05be
+0,         56,         56,        1,   299520, 0x07ccca7a
+0,         57,         57,        1,   299520, 0x1113a830
+0,         58,         58,        1,   299520, 0xe095faa8
+0,         59,         59,        1,   299520, 0x01da87b4
+0,         60,         60,        1,   299520, 0xecd3ea56
+0,         61,         61,        1,   299520, 0x8b80d26b
+0,         62,         62,        1,   299520, 0x625b4844
+0,         63,         63,        1,   299520, 0x1f96bc19
+0,         64,         64,        1,   299520, 0x8de15c59
+0,         65,         65,        1,   299520, 0x8de15c59
+0,         66,         66,        1,   299520, 0xe0f88d0d
+0,         67,         67,        1,   299520, 0xe0f88d0d
+0,         68,         68,        1,   299520, 0xf951adca
+0,         69,         69,        1,   299520, 0x3159e1a0
+0,         70,         70,        1,   299520, 0xa3b9764d
+0,         71,         71,        1,   299520, 0xa294c4db
+0,         72,         72,        1,   299520, 0x9ddd0aa8
+0,         73,         73,        1,   299520, 0x47702302
+0,         74,         74,        1,   299520, 0xebd66219
+0,         75,         75,        1,   299520, 0x9daa6030
+0,         76,         76,        1,   299520, 0x74aad521
+0,         77,         77,        1,   299520, 0x74aad521
+0,         78,         78,        1,   299520, 0x6be83092
+0,         79,         79,        1,   299520, 0x87e19ded
+0,         80,         80,        1,   299520, 0x41f4552c
+0,         81,         81,        1,   299520, 0xdbbd4643
+0,         82,         82,        1,   299520, 0x85505e9d
+0,         83,         83,        1,   299520, 0x33692949
+0,         84,         84,        1,   299520, 0x2d3ded88
+0,         85,         85,        1,   299520, 0x211ed3d4
+0,         86,         86,        1,   299520, 0x9dd3c6b8
+0,         87,         87,        1,   299520, 0x96016144
+0,         88,         88,        1,   299520, 0xdb86dd3a
+0,         89,         89,        1,   299520, 0x2a07d782
+0,         90,         90,        1,   299520, 0x4baeac21
+0,         91,         91,        1,   299520, 0x9426dbd3
+0,         92,         92,        1,   299520, 0x69203a74
+0,         93,         93,        1,   299520, 0x69203a74
+0,         94,         94,        1,   299520, 0xcb3e55c2
+0,         95,         95,        1,   299520, 0xbbc8dea2
+0,         96,         96,        1,   299520, 0x19b27f0d
+0,         97,         97,        1,   299520, 0x0edb8988
+0,         98,         98,        1,   299520, 0x0b3a8feb
+0,         99,         99,        1,   299520, 0xa2a3a4b4
+0,        100,        100,        1,   299520, 0xeb26e563
+0,        101,        101,        1,   299520, 0xd3fb037e
+0,        102,        102,        1,   299520, 0x106089ed
+0,        103,        103,        1,   299520, 0x606fb6ed
+0,        104,        104,        1,   299520, 0x6e14a326
+0,        105,        105,        1,   299520, 0x875cfdab
+0,        106,        106,        1,   299520, 0xa1f316f9
+0,        107,        107,        1,   299520, 0x444fff4a
+0,        108,        108,        1,   299520, 0x9c7b6c8a
+0,        109,        109,        1,   299520, 0xffd0ffa3
+0,        110,        110,        1,   299520, 0x278941d9
+0,        111,        111,        1,   299520, 0x05a1552f
+0,        112,        112,        1,   299520, 0x5b564fbc
+0,        113,        113,        1,   299520, 0x25ffb96d
+0,        114,        114,        1,   299520, 0x6e389daf
+0,        115,        115,        1,   299520, 0x1b48132b
+0,        116,        116,        1,   299520, 0xcc9b5df0
+0,        117,        117,        1,   299520, 0xe8895d00
+0,        118,        118,        1,   299520, 0x35ea30df
+0,        119,        119,        1,   299520, 0x8dcf07b4
+0,        120,        120,        1,   299520, 0x1cf3780e
+0,        121,        121,        1,   299520, 0x5f1a6062
+0,        122,        122,        1,   299520, 0xe2ac4ed0
+0,        123,        123,        1,   299520, 0x07fe56aa
+0,        124,        124,        1,   299520, 0xe892eab8
+0,        125,        125,        1,   299520, 0xdeda11d7
+0,        126,        126,        1,   299520, 0xc8134b3f
+0,        127,        127,        1,   299520, 0x8baa039a
+0,        128,        128,        1,   299520, 0x8ec71908
+0,        129,        129,        1,   299520, 0x8ec71908
+0,        130,        130,        1,   299520, 0x73ae1f71
+0,        131,        131,        1,   299520, 0xb615e210
+0,        132,        132,        1,   299520, 0x7afe31e6
+0,        133,        133,        1,   299520, 0x38362f5b
+0,        134,        134,        1,   299520, 0xbb7c2fad
+0,        135,        135,        1,   299520, 0xe08720c1
+0,        136,        136,        1,   299520, 0xb1118297
+0,        137,        137,        1,   299520, 0x33740a04
+0,        138,        138,        1,   299520, 0x567c1e9c
+0,        139,        139,        1,   299520, 0x3911af2a
+0,        140,        140,        1,   299520, 0xec64ec95
+0,        141,        141,        1,   299520, 0x83128903
+0,        142,        142,        1,   299520, 0xd11a7835
+0,        143,        143,        1,   299520, 0xd96bc851
+0,        144,        144,        1,   299520, 0x726696ba
+0,        145,        145,        1,   299520, 0x35c6b8e4
+0,        146,        146,        1,   299520, 0xd238e317
+0,        147,        147,        1,   299520, 0xf28c861b
+0,        148,        148,        1,   299520, 0x5d49132b
+0,        149,        149,        1,   299520, 0xcbadef81
+0,        150,        150,        1,   299520, 0x1fbcfda6
+0,        151,        151,        1,   299520, 0xa18a07b6
+0,        152,        152,        1,   299520, 0xa1631bb5
+0,        153,        153,        1,   299520, 0xcb80f2d6
+0,        154,        154,        1,   299520, 0x88b23aae
+0,        155,        155,        1,   299520, 0xbaa50ebe
+0,        156,        156,        1,   299520, 0x1bc7151d
+0,        157,        157,        1,   299520, 0x7254b9a4
+0,        158,        158,        1,   299520, 0xd66682cb
+0,        159,        159,        1,   299520, 0x846c055b
+0,        160,        160,        1,   299520, 0x4d0ac94f
+0,        161,        161,        1,   299520, 0xf9a01b25
+0,        162,        162,        1,   299520, 0x193dc288
+0,        163,        163,        1,   299520, 0xf43fb875
+0,        164,        164,        1,   299520, 0xf4fd6452
+0,        165,        165,        1,   299520, 0xafcdfb2a
+0,        166,        166,        1,   299520, 0x5c342ad7
+0,        167,        167,        1,   299520, 0xfe7943ec
+0,        168,        168,        1,   299520, 0xc7e8a82d
+0,        169,        169,        1,   299520, 0x99b1ed3f
+0,        170,        170,        1,   299520, 0x4decbdb8
+0,        171,        171,        1,   299520, 0x3cb0ccc2
+0,        172,        172,        1,   299520, 0x3b210547
+0,        173,        173,        1,   299520, 0xb8dee8bf
+0,        174,        174,        1,   299520, 0x75124e85
+0,        175,        175,        1,   299520, 0xbd390ba5
+0,        176,        176,        1,   299520, 0x5030302d
+0,        177,        177,        1,   299520, 0x38a4c990
+0,        178,        178,        1,   299520, 0x6d091561
+0,        179,        179,        1,   299520, 0x4598d16a
+0,        180,        180,        1,   299520, 0xa60c8a7c
+0,        181,        181,        1,   299520, 0x1987b4ab
+0,        182,        182,        1,   299520, 0x3fc66893
+0,        183,        183,        1,   299520, 0x3fc66893
+0,        184,        184,        1,   299520, 0x84694e9d
+0,        185,        185,        1,   299520, 0x84694e9d
+0,        186,        186,        1,   299520, 0xa736933c
+0,        187,        187,        1,   299520, 0x994e35f8
+0,        188,        188,        1,   299520, 0x80999aab
+0,        189,        189,        1,   299520, 0x5cf09e35
+0,        190,        190,        1,   299520, 0x8678f05d
+0,        191,        191,        1,   299520, 0xe4ca13df
+0,        192,        192,        1,   299520, 0x0ab1fc5b
+0,        193,        193,        1,   299520, 0x949977a6
+0,        194,        194,        1,   299520, 0x0ab1fc5b
+0,        195,        195,        1,   299520, 0xb5677d4e
+0,        196,        196,        1,   299520, 0xefd5e34c
+0,        197,        197,        1,   299520, 0xfb5875da
+0,        198,        198,        1,   299520, 0x3520759c
+0,        199,        199,        1,   299520, 0xc30dbfb6
+0,        200,        200,        1,   299520, 0xcedb09c4
+0,        201,        201,        1,   299520, 0xced1dc4a
+0,        202,        202,        1,   299520, 0xcf7d3425
+0,        203,        203,        1,   299520, 0xede92113
+0,        204,        204,        1,   299520, 0x6ca1204e
+0,        205,        205,        1,   299520, 0x04a46f67
+0,        206,        206,        1,   299520, 0x1bd8fe03
+0,        207,        207,        1,   299520, 0x11dab44d
+0,        208,        208,        1,   299520, 0xc0d1109c
+0,        209,        209,        1,   299520, 0x9e19c78f
+0,        210,        210,        1,   299520, 0xcffab4cb
+0,        211,        211,        1,   299520, 0x07582785
+0,        212,        212,        1,   299520, 0x43182694
+0,        213,        213,        1,   299520, 0x76f8c058
+0,        214,        214,        1,   299520, 0x895cbd03
+0,        215,        215,        1,   299520, 0xec9f9014
+0,        216,        216,        1,   299520, 0xd9cc6c00
+0,        217,        217,        1,   299520, 0xf15c775e
+0,        218,        218,        1,   299520, 0xe4b60e06
+0,        219,        219,        1,   299520, 0x5d825ea9
+0,        220,        220,        1,   299520, 0xd39d2f4a
+0,        221,        221,        1,   299520, 0x9b8dfedc
+0,        222,        222,        1,   299520, 0xc851ce8f
+0,        223,        223,        1,   299520, 0xdc399f09
+0,        224,        224,        1,   299520, 0xbce817c6
+0,        225,        225,        1,   299520, 0x48cc865e
+0,        226,        226,        1,   299520, 0xf875c060
+0,        227,        227,        1,   299520, 0xb3b4b0a3
+0,        228,        228,        1,   299520, 0xce683731
+0,        229,        229,        1,   299520, 0xeddd5126
+0,        230,        230,        1,   299520, 0x2ecf505e
+0,        231,        231,        1,   299520, 0x631c4af2
+0,        232,        232,        1,   299520, 0x1cc7742e
+0,        233,        233,        1,   299520, 0xc5124083
+0,        234,        234,        1,   299520, 0x4a851970
+0,        235,        235,        1,   299520, 0xbfad7925
+0,        236,        236,        1,   299520, 0x92058c0e
+0,        237,        237,        1,   299520, 0x7ecd39b5
+0,        238,        238,        1,   299520, 0x58887a74
+0,        239,        239,        1,   299520, 0xb0825813
+0,        240,        240,        1,   299520, 0xbc763455
+0,        241,        241,        1,   299520, 0x3b259a45
+0,        242,        242,        1,   299520, 0xb200177c
+0,        243,        243,        1,   299520, 0x1cb15851
+0,        244,        244,        1,   299520, 0xd73a92cd
+0,        245,        245,        1,   299520, 0xe43419cf
+0,        246,        246,        1,   299520, 0xf0facff1
+0,        247,        247,        1,   299520, 0xc931e638
+0,        248,        248,        1,   299520, 0xc33e31e7
+0,        249,        249,        1,   299520, 0x03b43a26
+0,        250,        250,        1,   299520, 0x85d64d60
+0,        251,        251,        1,   299520, 0x86a8848c
+0,        252,        252,        1,   299520, 0x5f09afaf
+0,        253,        253,        1,   299520, 0xb7e92098
+0,        254,        254,        1,   299520, 0xf1957fad
+0,        255,        255,        1,   299520, 0xf29dc4b0

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-WP_A_Toshiba_3 Added

@@ -0,0 +1,257 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0xf4bafc83
+0,          1,          1,        1,   149760, 0x611ca492
+0,          2,          2,        1,   149760, 0x8fa9bbb1
+0,          3,          3,        1,   149760, 0x3926aed3
+0,          4,          4,        1,   149760, 0x33e4f7f0
+0,          5,          5,        1,   149760, 0x03cc4fab
+0,          6,          6,        1,   149760, 0xbfae58e5
+0,          7,          7,        1,   149760, 0x0e6f1fea
+0,          8,          8,        1,   149760, 0x5a2ed57e
+0,          9,          9,        1,   149760, 0x5513cc3a
+0,         10,         10,        1,   149760, 0xd610ccca
+0,         11,         11,        1,   149760, 0xbf27617f
+0,         12,         12,        1,   149760, 0x878cd03b
+0,         13,         13,        1,   149760, 0x7b7ec3e9
+0,         14,         14,        1,   149760, 0xdaff0ba7
+0,         15,         15,        1,   149760, 0xce3be576
+0,         16,         16,        1,   149760, 0x16d32b84
+0,         17,         17,        1,   149760, 0xb7f6a144
+0,         18,         18,        1,   149760, 0x4dfb9b67
+0,         19,         19,        1,   149760, 0x29cb06ba
+0,         20,         20,        1,   149760, 0xcee5f14c
+0,         21,         21,        1,   149760, 0xe05bde26
+0,         22,         22,        1,   149760, 0xf717e789
+0,         23,         23,        1,   149760, 0xbbbf0ce8
+0,         24,         24,        1,   149760, 0x0e3ccfb1
+0,         25,         25,        1,   149760, 0x84204399
+0,         26,         26,        1,   149760, 0x02063b2b
+0,         27,         27,        1,   149760, 0xa4198aab
+0,         28,         28,        1,   149760, 0x4a4075aa
+0,         29,         29,        1,   149760, 0x1869435b
+0,         30,         30,        1,   149760, 0x04a12a8b
+0,         31,         31,        1,   149760, 0x7ab3f640
+0,         32,         32,        1,   149760, 0xba55f83a
+0,         33,         33,        1,   149760, 0xa8abaa48
+0,         34,         34,        1,   149760, 0x25483cb4
+0,         35,         35,        1,   149760, 0xc6925d6d
+0,         36,         36,        1,   149760, 0xc944b04d
+0,         37,         37,        1,   149760, 0xd7093017
+0,         38,         38,        1,   149760, 0x8d11c574
+0,         39,         39,        1,   149760, 0xdbaab3e1
+0,         40,         40,        1,   149760, 0xb412a3d9
+0,         41,         41,        1,   149760, 0x37b918a6
+0,         42,         42,        1,   149760, 0x6f6e7575
+0,         43,         43,        1,   149760, 0x059a55de
+0,         44,         44,        1,   149760, 0xe75aa6e6
+0,         45,         45,        1,   149760, 0x627394bf
+0,         46,         46,        1,   149760, 0xbcf99ab9
+0,         47,         47,        1,   149760, 0x29c52e30
+0,         48,         48,        1,   149760, 0x22056e1a
+0,         49,         49,        1,   149760, 0xf272fa39
+0,         50,         50,        1,   149760, 0x4b89033e
+0,         51,         51,        1,   149760, 0x0a59e138
+0,         52,         52,        1,   149760, 0x61a1a6c8
+0,         53,         53,        1,   149760, 0xe5414697
+0,         54,         54,        1,   149760, 0x6db38ec2
+0,         55,         55,        1,   149760, 0x2d09b0ba
+0,         56,         56,        1,   149760, 0x014a751e
+0,         57,         57,        1,   149760, 0x3e6f78d6
+0,         58,         58,        1,   149760, 0xed483aab
+0,         59,         59,        1,   149760, 0xcf366ee0
+0,         60,         60,        1,   149760, 0x4fc5e2dc
+0,         61,         61,        1,   149760, 0xf2a16393
+0,         62,         62,        1,   149760, 0xaa7ff5be
+0,         63,         63,        1,   149760, 0xa8c4c963
+0,         64,         64,        1,   149760, 0x3af766cf
+0,         65,         65,        1,   149760, 0x3af766cf
+0,         66,         66,        1,   149760, 0x11de29e7
+0,         67,         67,        1,   149760, 0x3aa137c0
+0,         68,         68,        1,   149760, 0x6f5bf4c4
+0,         69,         69,        1,   149760, 0xa5b8f392
+0,         70,         70,        1,   149760, 0x106ee459
+0,         71,         71,        1,   149760, 0x65dd99cc
+0,         72,         72,        1,   149760, 0x96facd15
+0,         73,         73,        1,   149760, 0x3355cb07
+0,         74,         74,        1,   149760, 0xe994f26b
+0,         75,         75,        1,   149760, 0xe955f0d5
+0,         76,         76,        1,   149760, 0xb740949e
+0,         77,         77,        1,   149760, 0x0b95963b
+0,         78,         78,        1,   149760, 0xdf7cf302
+0,         79,         79,        1,   149760, 0x8805c30d
+0,         80,         80,        1,   149760, 0xc30c832a
+0,         81,         81,        1,   149760, 0x696836a7
+0,         82,         82,        1,   149760, 0x696836a7
+0,         83,         83,        1,   149760, 0x4c7e0e68
+0,         84,         84,        1,   149760, 0xfee52485
+0,         85,         85,        1,   149760, 0xebbe8381
+0,         86,         86,        1,   149760, 0xb30ff0a9
+0,         87,         87,        1,   149760, 0x4ddafbfb
+0,         88,         88,        1,   149760, 0x5449c902
+0,         89,         89,        1,   149760, 0x79e61161
+0,         90,         90,        1,   149760, 0x72f1a340
+0,         91,         91,        1,   149760, 0xf98bae64
+0,         92,         92,        1,   149760, 0x253dd19f
+0,         93,         93,        1,   149760, 0x253dd19f
+0,         94,         94,        1,   149760, 0xc16e6af4
+0,         95,         95,        1,   149760, 0x66f2a539
+0,         96,         96,        1,   149760, 0xfccfd340
+0,         97,         97,        1,   149760, 0xd76a28c9
+0,         98,         98,        1,   149760, 0x38797af0
+0,         99,         99,        1,   149760, 0x06165c19
+0,        100,        100,        1,   149760, 0x9afee257
+0,        101,        101,        1,   149760, 0x1b2ce435
+0,        102,        102,        1,   149760, 0xb3e2de89
+0,        103,        103,        1,   149760, 0xb585e81f
+0,        104,        104,        1,   149760, 0x6743ece6
+0,        105,        105,        1,   149760, 0xfe5a001f
+0,        106,        106,        1,   149760, 0x064a778f
+0,        107,        107,        1,   149760, 0x99907eef
+0,        108,        108,        1,   149760, 0x1b9ec247
+0,        109,        109,        1,   149760, 0x52adad6c
+0,        110,        110,        1,   149760, 0xf5176bd9
+0,        111,        111,        1,   149760, 0xefdfa365
+0,        112,        112,        1,   149760, 0xa2e8447f
+0,        113,        113,        1,   149760, 0x3ea43a87
+0,        114,        114,        1,   149760, 0xbe643579
+0,        115,        115,        1,   149760, 0x518ae330
+0,        116,        116,        1,   149760, 0x49d815e6
+0,        117,        117,        1,   149760, 0xbfbb1bf0
+0,        118,        118,        1,   149760, 0x19596f6f
+0,        119,        119,        1,   149760, 0x4f6cbeec
+0,        120,        120,        1,   149760, 0xdd3f7460
+0,        121,        121,        1,   149760, 0xf2bb54f3
+0,        122,        122,        1,   149760, 0xb9d5d7cd
+0,        123,        123,        1,   149760, 0xe62736a5
+0,        124,        124,        1,   149760, 0x29c6f950
+0,        125,        125,        1,   149760, 0x99e1faed
+0,        126,        126,        1,   149760, 0x5c149afe
+0,        127,        127,        1,   149760, 0xb4118f9b
+0,        128,        128,        1,   149760, 0x262d7f30
+0,        129,        129,        1,   149760, 0x262d7f30
+0,        130,        130,        1,   149760, 0x13e286ed
+0,        131,        131,        1,   149760, 0xee6b3447
+0,        132,        132,        1,   149760, 0x9e749867
+0,        133,        133,        1,   149760, 0xdbca6bab
+0,        134,        134,        1,   149760, 0x154c9331
+0,        135,        135,        1,   149760, 0x653a3058
+0,        136,        136,        1,   149760, 0x739c1e57
+0,        137,        137,        1,   149760, 0x8e05e122
+0,        138,        138,        1,   149760, 0xe21f583a
+0,        139,        139,        1,   149760, 0xa58149fc
+0,        140,        140,        1,   149760, 0x90bd3787
+0,        141,        141,        1,   149760, 0x385aa42a
+0,        142,        142,        1,   149760, 0xf2589fc6
+0,        143,        143,        1,   149760, 0xd5233b3b
+0,        144,        144,        1,   149760, 0x2cc2d9cc
+0,        145,        145,        1,   149760, 0xb9b0eeef
+0,        146,        146,        1,   149760, 0xa9a60da9
+0,        147,        147,        1,   149760, 0xb854378a
+0,        148,        148,        1,   149760, 0xa76e2c37
+0,        149,        149,        1,   149760, 0xbe5c0542
+0,        150,        150,        1,   149760, 0x4d78b907
+0,        151,        151,        1,   149760, 0x6119f5d7
+0,        152,        152,        1,   149760, 0x195ae3c8
+0,        153,        153,        1,   149760, 0x35e9de61
+0,        154,        154,        1,   149760, 0x99f0df3b
+0,        155,        155,        1,   149760, 0x1a0ebfee
+0,        156,        156,        1,   149760, 0x4ece0a87
+0,        157,        157,        1,   149760, 0x670773b9
+0,        158,        158,        1,   149760, 0xae8c2789
+0,        159,        159,        1,   149760, 0xa145e3f8
+0,        160,        160,        1,   149760, 0x130d2ea3
+0,        161,        161,        1,   149760, 0x9afdf6dc
+0,        162,        162,        1,   149760, 0x8f8ed056
+0,        163,        163,        1,   149760, 0x8d50ad5c
+0,        164,        164,        1,   149760, 0x50b41bbb
+0,        165,        165,        1,   149760, 0xe8a89c0b
+0,        166,        166,        1,   149760, 0x4862c664
+0,        167,        167,        1,   149760, 0x9f99193f
+0,        168,        168,        1,   149760, 0x3d2ea4d8
+0,        169,        169,        1,   149760, 0xfcb83723
+0,        170,        170,        1,   149760, 0x2e135fe9
+0,        171,        171,        1,   149760, 0xcd059eeb
+0,        172,        172,        1,   149760, 0xcc2914ab
+0,        173,        173,        1,   149760, 0x63a4cf21
+0,        174,        174,        1,   149760, 0x0bdf9666
+0,        175,        175,        1,   149760, 0x8fcd46d9
+0,        176,        176,        1,   149760, 0xa2a94d81
+0,        177,        177,        1,   149760, 0x72da1124
+0,        178,        178,        1,   149760, 0x4faf50a2
+0,        179,        179,        1,   149760, 0x52168ea8
+0,        180,        180,        1,   149760, 0x766cd6e4
+0,        181,        181,        1,   149760, 0x9a76dd3f
+0,        182,        182,        1,   149760, 0xacf745bb
+0,        183,        183,        1,   149760, 0xacf745bb
+0,        184,        184,        1,   149760, 0x5d0f5914
+0,        185,        185,        1,   149760, 0x5d0f5914
+0,        186,        186,        1,   149760, 0x491b5959
+0,        187,        187,        1,   149760, 0xce9bf07f
+0,        188,        188,        1,   149760, 0x45123e08
+0,        189,        189,        1,   149760, 0x7ec1ced4
+0,        190,        190,        1,   149760, 0x7ec1ced4
+0,        191,        191,        1,   149760, 0xd383e72e
+0,        192,        192,        1,   149760, 0x29558d4c
+0,        193,        193,        1,   149760, 0xdcea6ec3
+0,        194,        194,        1,   149760, 0x29558d4c
+0,        195,        195,        1,   149760, 0x55b305ad
+0,        196,        196,        1,   149760, 0x68326c39
+0,        197,        197,        1,   149760, 0x89c8c0f7
+0,        198,        198,        1,   149760, 0x1fb33243
+0,        199,        199,        1,   149760, 0xa07b14e8
+0,        200,        200,        1,   149760, 0x6b37b02f
+0,        201,        201,        1,   149760, 0x7453171e
+0,        202,        202,        1,   149760, 0xec95ce93
+0,        203,        203,        1,   149760, 0xdbb0481b
+0,        204,        204,        1,   149760, 0xe44eaafd
+0,        205,        205,        1,   149760, 0xcdf5dfd5
+0,        206,        206,        1,   149760, 0x42695b4e
+0,        207,        207,        1,   149760, 0xe4e26db0
+0,        208,        208,        1,   149760, 0xada778f6
+0,        209,        209,        1,   149760, 0x77dab36a
+0,        210,        210,        1,   149760, 0xcabeb23d
+0,        211,        211,        1,   149760, 0x43d21021
+0,        212,        212,        1,   149760, 0xe4a5280c
+0,        213,        213,        1,   149760, 0xeb408a99
+0,        214,        214,        1,   149760, 0x0751fc6c
+0,        215,        215,        1,   149760, 0x2e770c68
+0,        216,        216,        1,   149760, 0x5a799fb0
+0,        217,        217,        1,   149760, 0x0e2e22dd
+0,        218,        218,        1,   149760, 0x276e6e88
+0,        219,        219,        1,   149760, 0xf83b9da4
+0,        220,        220,        1,   149760, 0xd4599290
+0,        221,        221,        1,   149760, 0xd4599290
+0,        222,        222,        1,   149760, 0xcf41ec75
+0,        223,        223,        1,   149760, 0x84af0bfc
+0,        224,        224,        1,   149760, 0x59db5c12
+0,        225,        225,        1,   149760, 0x0405a92a
+0,        226,        226,        1,   149760, 0xfde2c0fe
+0,        227,        227,        1,   149760, 0x96a68bab
+0,        228,        228,        1,   149760, 0x7e9d4983
+0,        229,        229,        1,   149760, 0x27b724c9
+0,        230,        230,        1,   149760, 0x402cdb15
+0,        231,        231,        1,   149760, 0x0d89328b
+0,        232,        232,        1,   149760, 0x08847a7e
+0,        233,        233,        1,   149760, 0x8eb7f52f
+0,        234,        234,        1,   149760, 0x49bf75bb
+0,        235,        235,        1,   149760, 0xbd6c77e3
+0,        236,        236,        1,   149760, 0x9eb5a5c0
+0,        237,        237,        1,   149760, 0xb5900c9b
+0,        238,        238,        1,   149760, 0xa9278bd6
+0,        239,        239,        1,   149760, 0x688d4c01
+0,        240,        240,        1,   149760, 0xe2669ce6
+0,        241,        241,        1,   149760, 0xb80590b9
+0,        242,        242,        1,   149760, 0xcdcc0036
+0,        243,        243,        1,   149760, 0xad653077
+0,        244,        244,        1,   149760, 0xe87179ae
+0,        245,        245,        1,   149760, 0x91553e8b
+0,        246,        246,        1,   149760, 0xd254f2b4
+0,        247,        247,        1,   149760, 0xe284e289
+0,        248,        248,        1,   149760, 0x09118405
+0,        249,        249,        1,   149760, 0x5f46d196
+0,        250,        250,        1,   149760, 0xfee1f4be
+0,        251,        251,        1,   149760, 0xbccf48bc
+0,        252,        252,        1,   149760, 0x48327792
+0,        253,        253,        1,   149760, 0x3d893b3c
+0,        254,        254,        1,   149760, 0xb2ae071d
+0,        255,        255,        1,   149760, 0x278e0be3

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-WP_B_Toshiba_3 Added

@@ -0,0 +1,257 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0xd8bf0c39
+0,          4,          4,        1,   149760, 0xad390a29
+0,          5,          5,        1,   149760, 0x0d310906
+0,          5,          5,        1,   149760, 0x03bcb5ac
+0,          6,          6,        1,   149760, 0x6c38226f
+0,          7,          7,        1,   149760, 0xc7d898b6
+0,          8,          8,        1,   149760, 0x1e031118
+0,          9,          9,        1,   149760, 0x7a2437f2
+0,         10,         10,        1,   149760, 0x524d616a
+0,         11,         11,        1,   149760, 0x001ac80e
+0,         12,         12,        1,   149760, 0x6fe323e4
+0,         13,         13,        1,   149760, 0x2a95a125
+0,         14,         14,        1,   149760, 0x212316e4
+0,         15,         15,        1,   149760, 0x7984e2ed
+0,         16,         16,        1,   149760, 0xb0a4a95c
+0,         17,         17,        1,   149760, 0x100566ae
+0,         18,         18,        1,   149760, 0xb21b2344
+0,         19,         19,        1,   149760, 0x0578bca2
+0,         20,         20,        1,   149760, 0xf7523964
+0,         21,         21,        1,   149760, 0x38d2ca9e
+0,         22,         22,        1,   149760, 0x77890564
+0,         23,         23,        1,   149760, 0xbdba85df
+0,         24,         24,        1,   149760, 0x646ae92d
+0,         25,         25,        1,   149760, 0xfcbb58b9
+0,         26,         26,        1,   149760, 0x0122aa96
+0,         27,         27,        1,   149760, 0x60f8e1ee
+0,         28,         28,        1,   149760, 0x3fc2d587
+0,         29,         29,        1,   149760, 0xdb622c12
+0,         30,         30,        1,   149760, 0xa8df64cf
+0,         31,         31,        1,   149760, 0x12f8d6c8
+0,         32,         32,        1,   149760, 0xf6703c4d
+0,         33,         33,        1,   149760, 0x66ef211d
+0,         34,         34,        1,   149760, 0x821b02f6
+0,         35,         35,        1,   149760, 0xc87f48a0
+0,         36,         36,        1,   149760, 0xb816ad51
+0,         37,         37,        1,   149760, 0x238e6fa0
+0,         38,         38,        1,   149760, 0x0fc06010
+0,         39,         39,        1,   149760, 0x749c71dc
+0,         40,         40,        1,   149760, 0x88c69718
+0,         41,         41,        1,   149760, 0x4b29aeb1
+0,         42,         42,        1,   149760, 0xaaefb509
+0,         43,         43,        1,   149760, 0x2975fda6
+0,         44,         44,        1,   149760, 0x613ec356
+0,         45,         45,        1,   149760, 0xf1e46db6
+0,         46,         46,        1,   149760, 0x8c8aec07
+0,         47,         47,        1,   149760, 0xb9a8be75
+0,         48,         48,        1,   149760, 0xfdce756a
+0,         49,         49,        1,   149760, 0x9c76f148
+0,         50,         50,        1,   149760, 0x5d1862dd
+0,         51,         51,        1,   149760, 0x42ae08bf
+0,         52,         52,        1,   149760, 0xc28f9247
+0,         53,         53,        1,   149760, 0x719d321c
+0,         54,         54,        1,   149760, 0x1520a7bc
+0,         55,         55,        1,   149760, 0x4fb98c9a
+0,         56,         56,        1,   149760, 0x88d410a6
+0,         57,         57,        1,   149760, 0x807ac417
+0,         58,         58,        1,   149760, 0x6de5f4ab
+0,         59,         59,        1,   149760, 0x678613c7
+0,         60,         60,        1,   149760, 0xe7d12abf
+0,         61,         61,        1,   149760, 0x23955076
+0,         62,         62,        1,   149760, 0x298d1bce
+0,         63,         63,        1,   149760, 0x18d4605d
+0,         64,         64,        1,   149760, 0x3a606618
+0,         65,         65,        1,   149760, 0x861fcb5a
+0,         66,         66,        1,   149760, 0xc6622a90
+0,         67,         67,        1,   149760, 0x62d4cd48
+0,         68,         68,        1,   149760, 0x991430e6
+0,         69,         69,        1,   149760, 0x6316503c
+0,         70,         70,        1,   149760, 0xdf2d29f2
+0,         71,         71,        1,   149760, 0xeeeb307a
+0,         72,         72,        1,   149760, 0xade9ae1d
+0,         73,         73,        1,   149760, 0x54734581
+0,         74,         74,        1,   149760, 0x5ccd7389
+0,         75,         75,        1,   149760, 0xf0588bf8
+0,         76,         76,        1,   149760, 0xf18e44e5
+0,         77,         77,        1,   149760, 0x4512602b
+0,         78,         78,        1,   149760, 0x9aac8281
+0,         79,         79,        1,   149760, 0x69bdad58
+0,         80,         80,        1,   149760, 0x04ffe580
+0,         81,         81,        1,   149760, 0x28bfe45f
+0,         82,         82,        1,   149760, 0xd7ce93b0
+0,         83,         83,        1,   149760, 0xa880b1d4
+0,         84,         84,        1,   149760, 0xf38298d0
+0,         85,         85,        1,   149760, 0x2ae05958
+0,         86,         86,        1,   149760, 0xa892151b
+0,         87,         87,        1,   149760, 0xed2cef63
+0,         88,         88,        1,   149760, 0x678fc6f5
+0,         89,         89,        1,   149760, 0xfcbaa892
+0,         90,         90,        1,   149760, 0x48cc722b
+0,         91,         91,        1,   149760, 0x32cd8975
+0,         92,         92,        1,   149760, 0x05ad8586
+0,         93,         93,        1,   149760, 0x62a0fb36
+0,         94,         94,        1,   149760, 0x41df8d45
+0,         95,         95,        1,   149760, 0x80bd938d
+0,         96,         96,        1,   149760, 0xafe414b0
+0,         97,         97,        1,   149760, 0x3077d51d
+0,         98,         98,        1,   149760, 0x65148cef
+0,         99,         99,        1,   149760, 0xadb76ef0
+0,        100,        100,        1,   149760, 0x889c3051
+0,        101,        101,        1,   149760, 0xe83b227e
+0,        102,        102,        1,   149760, 0xc373f5e0
+0,        103,        103,        1,   149760, 0x6ffa2a5f
+0,        104,        104,        1,   149760, 0x6eef18f5
+0,        105,        105,        1,   149760, 0x1b1ba6e4
+0,        106,        106,        1,   149760, 0x88e316a4
+0,        107,        107,        1,   149760, 0x4c0697f4
+0,        108,        108,        1,   149760, 0x5eb30515
+0,        109,        109,        1,   149760, 0xeeff8fa3
+0,        110,        110,        1,   149760, 0x653a07a9
+0,        111,        111,        1,   149760, 0x3faf44a8
+0,        112,        112,        1,   149760, 0xe33f740e
+0,        113,        113,        1,   149760, 0x6bea0f49
+0,        114,        114,        1,   149760, 0x4d5aa784
+0,        115,        115,        1,   149760, 0x0c85ea00
+0,        116,        116,        1,   149760, 0xf64fc40b
+0,        117,        117,        1,   149760, 0xf222e3b4
+0,        118,        118,        1,   149760, 0x6b3be6bc
+0,        119,        119,        1,   149760, 0x91447dfb
+0,        120,        120,        1,   149760, 0xfd0dd98c
+0,        121,        121,        1,   149760, 0x468eb01a
+0,        122,        122,        1,   149760, 0x928a720a
+0,        123,        123,        1,   149760, 0x0b3f576b
+0,        124,        124,        1,   149760, 0x430493df
+0,        125,        125,        1,   149760, 0x375d2221
+0,        126,        126,        1,   149760, 0x50d0a88c
+0,        127,        127,        1,   149760, 0x54363ffb
+0,        128,        128,        1,   149760, 0xc243c434
+0,        129,        129,        1,   149760, 0x26fe8f5c
+0,        130,        130,        1,   149760, 0xd936485c
+0,        131,        131,        1,   149760, 0xd936485c
+0,        132,        132,        1,   149760, 0xa0cabe5a
+0,        133,        133,        1,   149760, 0xf0956484
+0,        134,        134,        1,   149760, 0x14cda6ee
+0,        135,        135,        1,   149760, 0x0b7ada70
+0,        136,        136,        1,   149760, 0x113f0ec5
+0,        137,        137,        1,   149760, 0xc1364acc
+0,        138,        138,        1,   149760, 0x0c768a6a
+0,        139,        139,        1,   149760, 0x94fd7a00
+0,        140,        140,        1,   149760, 0x624a5ebb
+0,        141,        141,        1,   149760, 0xdd5008a0
+0,        142,        142,        1,   149760, 0xc380626c
+0,        143,        143,        1,   149760, 0xb0974c02
+0,        144,        144,        1,   149760, 0x68be6c1e
+0,        145,        145,        1,   149760, 0xb8d24677
+0,        146,        146,        1,   149760, 0x1efe195c
+0,        147,        147,        1,   149760, 0x29e9153a
+0,        148,        148,        1,   149760, 0x1b6057b7
+0,        149,        149,        1,   149760, 0x959a4461
+0,        150,        150,        1,   149760, 0x4e3d33a9
+0,        151,        151,        1,   149760, 0x206e7899
+0,        152,        152,        1,   149760, 0xcb7da081
+0,        153,        153,        1,   149760, 0xc650ed7b
+0,        154,        154,        1,   149760, 0x82832d10
+0,        155,        155,        1,   149760, 0xdf9c6218
+0,        156,        156,        1,   149760, 0xcc3489c7
+0,        157,        157,        1,   149760, 0xd284a4a1
+0,        158,        158,        1,   149760, 0x7099451c
+0,        159,        159,        1,   149760, 0xec26fc56
+0,        160,        160,        1,   149760, 0x105a496f
+0,        161,        161,        1,   149760, 0xb8756fe8
+0,        162,        162,        1,   149760, 0xb1a509df
+0,        163,        163,        1,   149760, 0x135f8f7e
+0,        164,        164,        1,   149760, 0x3419098d
+0,        165,        165,        1,   149760, 0xa55dad5f
+0,        166,        166,        1,   149760, 0x326ba794
+0,        167,        167,        1,   149760, 0x5401b03c
+0,        168,        168,        1,   149760, 0x3ace76ee
+0,        169,        169,        1,   149760, 0x140191ac
+0,        170,        170,        1,   149760, 0x3e3ca195
+0,        171,        171,        1,   149760, 0x2a8b3622
+0,        172,        172,        1,   149760, 0x9e33c765
+0,        173,        173,        1,   149760, 0xf7795367
+0,        174,        174,        1,   149760, 0xa7909e25
+0,        175,        175,        1,   149760, 0x44a5a014
+0,        176,        176,        1,   149760, 0x919bb07c
+0,        177,        177,        1,   149760, 0xd353b9a7
+0,        178,        178,        1,   149760, 0x4c3dda24
+0,        179,        179,        1,   149760, 0x1428eafb
+0,        180,        180,        1,   149760, 0x9d9fa613
+0,        181,        181,        1,   149760, 0x661475c6
+0,        182,        182,        1,   149760, 0x5f6f4180
+0,        183,        183,        1,   149760, 0xf50a4b4c
+0,        184,        184,        1,   149760, 0xf6373eb9
+0,        185,        185,        1,   149760, 0x0ab24b74
+0,        186,        186,        1,   149760, 0x6b3d58b0
+0,        187,        187,        1,   149760, 0xc4c8bd05
+0,        188,        188,        1,   149760, 0x0df172c6
+0,        189,        189,        1,   149760, 0x81a85144
+0,        190,        190,        1,   149760, 0x7f926ee5
+0,        191,        191,        1,   149760, 0x3a355d45
+0,        192,        192,        1,   149760, 0x9f645c90
+0,        193,        193,        1,   149760, 0xf42674ea
+0,        194,        194,        1,   149760, 0xa6e943ab
+0,        195,        195,        1,   149760, 0xede16b49
+0,        196,        196,        1,   149760, 0xf80c9957
+0,        197,        197,        1,   149760, 0xa7a44665
+0,        198,        198,        1,   149760, 0x08f17b20
+0,        199,        199,        1,   149760, 0x0319e942
+0,        200,        200,        1,   149760, 0xab69057c
+0,        201,        201,        1,   149760, 0xb98814f4
+0,        202,        202,        1,   149760, 0xa172e6d0
+0,        203,        203,        1,   149760, 0x6cd35cd1
+0,        204,        204,        1,   149760, 0x7352b4b9
+0,        205,        205,        1,   149760, 0x07cbdedd
+0,        206,        206,        1,   149760, 0xbe7aa3c8
+0,        207,        207,        1,   149760, 0xdcbc8993
+0,        208,        208,        1,   149760, 0x0c5dbf95
+0,        209,        209,        1,   149760, 0x107e4f2c
+0,        210,        210,        1,   149760, 0xc650e333
+0,        211,        211,        1,   149760, 0x46abae6f
+0,        212,        212,        1,   149760, 0x0e41309d
+0,        213,        213,        1,   149760, 0x831e19a1
+0,        214,        214,        1,   149760, 0xd1955874
+0,        215,        215,        1,   149760, 0x486c41bb
+0,        216,        216,        1,   149760, 0xba020143
+0,        217,        217,        1,   149760, 0x3ebedef4
+0,        218,        218,        1,   149760, 0xda7bc235
+0,        219,        219,        1,   149760, 0x0abcb13e
+0,        220,        220,        1,   149760, 0xdf5159ac
+0,        221,        221,        1,   149760, 0x4e39d893
+0,        222,        222,        1,   149760, 0x393f382d
+0,        223,        223,        1,   149760, 0x92556867
+0,        224,        224,        1,   149760, 0x2daf47a8
+0,        225,        225,        1,   149760, 0x792a4448
+0,        226,        226,        1,   149760, 0x429e05ad
+0,        227,        227,        1,   149760, 0x89caaa32
+0,        228,        228,        1,   149760, 0xa70ec97b
+0,        229,        229,        1,   149760, 0xce0d24b7
+0,        230,        230,        1,   149760, 0x04be745d
+0,        231,        231,        1,   149760, 0xfb04d3d2
+0,        232,        232,        1,   149760, 0x5b472952
+0,        233,        233,        1,   149760, 0x6cd704b5
+0,        234,        234,        1,   149760, 0x18b0db7e
+0,        235,        235,        1,   149760, 0xdfb24e07
+0,        236,        236,        1,   149760, 0x6d9bae45
+0,        237,        237,        1,   149760, 0xf2eb5756
+0,        238,        238,        1,   149760, 0xdf858203
+0,        239,        239,        1,   149760, 0xdcd4822f
+0,        240,        240,        1,   149760, 0x80ceabaf
+0,        241,        241,        1,   149760, 0x8bd1a92f
+0,        242,        242,        1,   149760, 0x981a61ca
+0,        243,        243,        1,   149760, 0x5fa92603
+0,        244,        244,        1,   149760, 0xbb28f8da
+0,        245,        245,        1,   149760, 0x1710666d
+0,        246,        246,        1,   149760, 0xf928099a
+0,        247,        247,        1,   149760, 0x2e0ae9cb
+0,        248,        248,        1,   149760, 0xcf0e402c
+0,        249,        249,        1,   149760, 0x48e5b987
+0,        250,        250,        1,   149760, 0x7dc42853
+0,        251,        251,        1,   149760, 0x25f4aef0
+0,        252,        252,        1,   149760, 0x5f1d37b3
+0,        253,        253,        1,   149760, 0xb2fabf9f
+0,        254,        254,        1,   149760, 0xe87348ee
+0,        255,        255,        1,   149760, 0xbe9ec00f
+0,        256,        256,        1,   149760, 0xd67d1fb2
+0,        257,        257,        1,   149760, 0x92db1ca8

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-WP_MAIN10_B_Toshiba_3 Added

@@ -0,0 +1,257 @@
+#tb 0: 1/25
+0,          0,          0,        1,   299520, 0x6ecba46b
+0,          4,          4,        1,   299520, 0x54e6ef0a
+0,          5,          5,        1,   299520, 0x7a4d46c5
+0,          6,          6,        1,   299520, 0xccd57f4e
+0,          7,          7,        1,   299520, 0xbe0cb48d
+0,          8,          8,        1,   299520, 0x10e7b49f
+0,          9,          9,        1,   299520, 0x81aa72e2
+0,         10,         10,        1,   299520, 0x5bf7b51f
+0,         11,         11,        1,   299520, 0xfcedee4a
+0,         12,         12,        1,   299520, 0x586c99b6
+0,         13,         13,        1,   299520, 0x414ca13c
+0,         14,         14,        1,   299520, 0x3f0162f2
+0,         15,         15,        1,   299520, 0x4d450c05
+0,         16,         16,        1,   299520, 0x0a58bd84
+0,         17,         17,        1,   299520, 0x26e8394d
+0,         18,         18,        1,   299520, 0xfd78121b
+0,         19,         19,        1,   299520, 0x6afeaf44
+0,         20,         20,        1,   299520, 0x3e9a9270
+0,         21,         21,        1,   299520, 0x58b889ca
+0,         22,         22,        1,   299520, 0x0245ba62
+0,         23,         23,        1,   299520, 0xddecc5ab
+0,         24,         24,        1,   299520, 0x32cf3cd9
+0,         25,         25,        1,   299520, 0x5c0a0440
+0,         26,         26,        1,   299520, 0x9d3e2fee
+0,         27,         27,        1,   299520, 0x2894c708
+0,         28,         28,        1,   299520, 0x25be67d5
+0,         29,         29,        1,   299520, 0xe3ece9d6
+0,         30,         30,        1,   299520, 0xcc98e38b
+0,         31,         31,        1,   299520, 0xc448c794
+0,         32,         32,        1,   299520, 0xb4f75575
+0,         33,         33,        1,   299520, 0xac74a437
+0,         34,         34,        1,   299520, 0x09c7f2e2
+0,         35,         35,        1,   299520, 0xbfaed8ab
+0,         36,         36,        1,   299520, 0xb077d700
+0,         37,         37,        1,   299520, 0x6efa0545
+0,         38,         38,        1,   299520, 0xb8c1802d
+0,         39,         39,        1,   299520, 0x794774f8
+0,         40,         40,        1,   299520, 0x1098f4ff
+0,         41,         41,        1,   299520, 0x80ab8bfc
+0,         42,         42,        1,   299520, 0xc324c3bc
+0,         43,         43,        1,   299520, 0x1eee77cd
+0,         44,         44,        1,   299520, 0x7147e72e
+0,         45,         45,        1,   299520, 0x1a34883c
+0,         46,         46,        1,   299520, 0x74e93e31
+0,         47,         47,        1,   299520, 0x89410382
+0,         48,         48,        1,   299520, 0xfcce0ce1
+0,         49,         49,        1,   299520, 0x07bb33c6
+0,         50,         50,        1,   299520, 0xc1ee7318
+0,         51,         51,        1,   299520, 0xd1c4bd2d
+0,         52,         52,        1,   299520, 0xa670cfae
+0,         53,         53,        1,   299520, 0x718de79b
+0,         54,         54,        1,   299520, 0x85e40b78
+0,         55,         55,        1,   299520, 0x15362e72
+0,         56,         56,        1,   299520, 0xc6e523fa
+0,         57,         57,        1,   299520, 0x3e536edd
+0,         58,         58,        1,   299520, 0x9312996e
+0,         59,         59,        1,   299520, 0x9456d53c
+0,         60,         60,        1,   299520, 0x7bc01398
+0,         61,         61,        1,   299520, 0x5a40bcb4
+0,         62,         62,        1,   299520, 0xcfe126ce
+0,         63,         63,        1,   299520, 0xd9e1adf1
+0,         64,         64,        1,   299520, 0x9027b1ae
+0,         65,         65,        1,   299520, 0x4c1372fb
+0,         66,         66,        1,   299520, 0xe475a00b
+0,         67,         67,        1,   299520, 0x945bc646
+0,         68,         68,        1,   299520, 0xc33dbab3
+0,         69,         69,        1,   299520, 0x9e4afb82
+0,         70,         70,        1,   299520, 0x1bffa858
+0,         71,         71,        1,   299520, 0x3bc78ad7
+0,         72,         72,        1,   299520, 0xa096e683
+0,         73,         73,        1,   299520, 0xb889aa23
+0,         74,         74,        1,   299520, 0x8ffad857
+0,         75,         75,        1,   299520, 0x59d3cc7c
+0,         76,         76,        1,   299520, 0x47d1377a
+0,         77,         77,        1,   299520, 0xea73e864
+0,         78,         78,        1,   299520, 0x0994bd5c
+0,         79,         79,        1,   299520, 0xdf779d85
+0,         80,         80,        1,   299520, 0x8238cfa7
+0,         81,         81,        1,   299520, 0x8f2e94cc
+0,         82,         82,        1,   299520, 0x9e0b0df8
+0,         83,         83,        1,   299520, 0x98ac1ce5
+0,         84,         84,        1,   299520, 0xc1c293ed
+0,         85,         85,        1,   299520, 0x1f1dfedb
+0,         86,         86,        1,   299520, 0xe7297d56
+0,         87,         87,        1,   299520, 0xa1390726
+0,         88,         88,        1,   299520, 0xf0e828e8
+0,         89,         89,        1,   299520, 0x108b8291
+0,         90,         90,        1,   299520, 0xd8830efb
+0,         91,         91,        1,   299520, 0xeee3d2f0
+0,         92,         92,        1,   299520, 0xa35d5b29
+0,         93,         93,        1,   299520, 0xa14d0840
+0,         94,         94,        1,   299520, 0xfa894a56
+0,         95,         95,        1,   299520, 0xd50005b5
+0,         96,         96,        1,   299520, 0xba625134
+0,         97,         97,        1,   299520, 0xce7dd782
+0,         98,         98,        1,   299520, 0x9e04e32f
+0,         99,         99,        1,   299520, 0x07e6d466
+0,        100,        100,        1,   299520, 0x4e66e1d4
+0,        101,        101,        1,   299520, 0x80aa6be6
+0,        102,        102,        1,   299520, 0xa4564be8
+0,        103,        103,        1,   299520, 0x7d34e443
+0,        104,        104,        1,   299520, 0xd5a08c86
+0,        105,        105,        1,   299520, 0xa73e63e8
+0,        106,        106,        1,   299520, 0x93937eb2
+0,        107,        107,        1,   299520, 0x0c08ba8f
+0,        108,        108,        1,   299520, 0x1d6b1a8c
+0,        109,        109,        1,   299520, 0x2e0272b4
+0,        110,        110,        1,   299520, 0x47177676
+0,        111,        111,        1,   299520, 0x6af7ffce
+0,        112,        112,        1,   299520, 0x0564a4bc
+0,        113,        113,        1,   299520, 0x7f664100
+0,        114,        114,        1,   299520, 0x6decd6ae
+0,        115,        115,        1,   299520, 0xb2d94adc
+0,        116,        116,        1,   299520, 0x55d33809
+0,        117,        117,        1,   299520, 0x5b126674
+0,        118,        118,        1,   299520, 0xd25d5750
+0,        119,        119,        1,   299520, 0x789a7f89
+0,        120,        120,        1,   299520, 0xdd082ab2
+0,        121,        121,        1,   299520, 0x3e6132ee
+0,        122,        122,        1,   299520, 0xe48209ca
+0,        123,        123,        1,   299520, 0x707d3b24
+0,        124,        124,        1,   299520, 0x8af19539
+0,        125,        125,        1,   299520, 0x0bbb4c38
+0,        126,        126,        1,   299520, 0xaaba4bd6
+0,        127,        127,        1,   299520, 0xa325d79e
+0,        128,        128,        1,   299520, 0x2bd4b64a
+0,        129,        129,        1,   299520, 0xab0c59a7
+0,        130,        130,        1,   299520, 0x260a56fc
+0,        131,        131,        1,   299520, 0xa1a55847
+0,        132,        132,        1,   299520, 0xa1a55847
+0,        133,        133,        1,   299520, 0x01438514
+0,        134,        134,        1,   299520, 0xa511e8bd
+0,        135,        135,        1,   299520, 0x7ebfd5b9
+0,        136,        136,        1,   299520, 0xdf4f1365
+0,        137,        137,        1,   299520, 0x6266911a
+0,        138,        138,        1,   299520, 0xe8eefcab
+0,        139,        139,        1,   299520, 0x7e74ca0d
+0,        140,        140,        1,   299520, 0x4b21d349
+0,        141,        141,        1,   299520, 0xa8b9ef41
+0,        142,        142,        1,   299520, 0x3187ee5b
+0,        143,        143,        1,   299520, 0x3fadb935
+0,        144,        144,        1,   299520, 0x8dca0391
+0,        145,        145,        1,   299520, 0x68215cc6
+0,        146,        146,        1,   299520, 0x7c81f366
+0,        147,        147,        1,   299520, 0x1a976381
+0,        148,        148,        1,   299520, 0x8ac095f4
+0,        149,        149,        1,   299520, 0xf5f8752b
+0,        150,        150,        1,   299520, 0xd8c03c80
+0,        151,        151,        1,   299520, 0x445a2e07
+0,        152,        152,        1,   299520, 0xddb83c6f
+0,        153,        153,        1,   299520, 0xc6dfe76a
+0,        154,        154,        1,   299520, 0x860a120f
+0,        155,        155,        1,   299520, 0x1ec91a95
+0,        156,        156,        1,   299520, 0x0180cc49
+0,        157,        157,        1,   299520, 0x63a115e3
+0,        158,        158,        1,   299520, 0x8848e971
+0,        159,        159,        1,   299520, 0x49246622
+0,        160,        160,        1,   299520, 0x3169db32
+0,        161,        161,        1,   299520, 0xcf01d8a3
+0,        162,        162,        1,   299520, 0x57a1a9c1
+0,        163,        163,        1,   299520, 0x517670eb
+0,        164,        164,        1,   299520, 0x4e2e6b5a
+0,        165,        165,        1,   299520, 0x06240a68
+0,        166,        166,        1,   299520, 0xa0d076a1
+0,        167,        167,        1,   299520, 0xb73c4515
+0,        168,        168,        1,   299520, 0x9f523268
+0,        169,        169,        1,   299520, 0x6fdcc6a2
+0,        170,        170,        1,   299520, 0xf3f5b69f
+0,        171,        171,        1,   299520, 0xce33a286
+0,        172,        172,        1,   299520, 0xce46e834
+0,        173,        173,        1,   299520, 0x14a6fe0d
+0,        174,        174,        1,   299520, 0x39a8145f
+0,        175,        175,        1,   299520, 0x91981d47
+0,        176,        176,        1,   299520, 0x1507d9be
+0,        177,        177,        1,   299520, 0x4525d4a2
+0,        178,        178,        1,   299520, 0x95e058ab
+0,        179,        179,        1,   299520, 0x8de2438a
+0,        180,        180,        1,   299520, 0xf43dc0ff
+0,        181,        181,        1,   299520, 0xaf232f4b
+0,        182,        182,        1,   299520, 0x8adabd81
+0,        183,        183,        1,   299520, 0x1e837b72
+0,        184,        184,        1,   299520, 0xb79f811d
+0,        185,        185,        1,   299520, 0x1532fb05
+0,        186,        186,        1,   299520, 0x2e3f6341
+0,        187,        187,        1,   299520, 0x10c82269
+0,        188,        188,        1,   299520, 0x8c39bd0c
+0,        189,        189,        1,   299520, 0x64fefe7b
+0,        190,        190,        1,   299520, 0x3ef6d5c7
+0,        191,        191,        1,   299520, 0x571c1edc
+0,        192,        192,        1,   299520, 0xe9e1584c
+0,        193,        193,        1,   299520, 0xd150a0db
+0,        194,        194,        1,   299520, 0x5d140f2d
+0,        195,        195,        1,   299520, 0xea00f302
+0,        196,        196,        1,   299520, 0xdd4e0fc4
+0,        197,        197,        1,   299520, 0x51c760fa
+0,        198,        198,        1,   299520, 0x68d5d26e
+0,        199,        199,        1,   299520, 0xde594a02
+0,        200,        200,        1,   299520, 0xac6d361a
+0,        201,        201,        1,   299520, 0xef6506ae
+0,        202,        202,        1,   299520, 0x744737a8
+0,        203,        203,        1,   299520, 0x2bd0834b
+0,        204,        204,        1,   299520, 0x348a8d0f
+0,        205,        205,        1,   299520, 0x93e165c8
+0,        206,        206,        1,   299520, 0x208d305c
+0,        207,        207,        1,   299520, 0xb927ed9a
+0,        208,        208,        1,   299520, 0xd252b13a
+0,        209,        209,        1,   299520, 0x11a59b2d
+0,        210,        210,        1,   299520, 0xc27785d0
+0,        211,        211,        1,   299520, 0x5c654cb5
+0,        212,        212,        1,   299520, 0x3d03a387
+0,        213,        213,        1,   299520, 0xdb0dc19d
+0,        214,        214,        1,   299520, 0x2ef3bbba
+0,        215,        215,        1,   299520, 0x7d36cd79
+0,        216,        216,        1,   299520, 0xa9ceca1e
+0,        217,        217,        1,   299520, 0x33db4d99
+0,        218,        218,        1,   299520, 0x8d28a55e
+0,        219,        219,        1,   299520, 0x554864a6
+0,        220,        220,        1,   299520, 0x6a336557
+0,        221,        221,        1,   299520, 0xd2285832
+0,        222,        222,        1,   299520, 0x9509f5f8
+0,        223,        223,        1,   299520, 0x8e479b03
+0,        224,        224,        1,   299520, 0x9513a8c3
+0,        225,        225,        1,   299520, 0x81080fac
+0,        226,        226,        1,   299520, 0x6c447b69
+0,        227,        227,        1,   299520, 0xbf4c2fbd
+0,        228,        228,        1,   299520, 0x1a77306e
+0,        229,        229,        1,   299520, 0xd485864b
+0,        230,        230,        1,   299520, 0x4e87b787
+0,        231,        231,        1,   299520, 0xe28e7153
+0,        232,        232,        1,   299520, 0x2ab24b9b
+0,        233,        233,        1,   299520, 0xffcb7357
+0,        234,        234,        1,   299520, 0x5e1e2b7e
+0,        235,        235,        1,   299520, 0x58d39e6d
+0,        236,        236,        1,   299520, 0x4a2b836a
+0,        237,        237,        1,   299520, 0xa1728e1e
+0,        238,        238,        1,   299520, 0x33e5bdd4
+0,        239,        239,        1,   299520, 0x3b144d98
+0,        240,        240,        1,   299520, 0xe72c4de2
+0,        241,        241,        1,   299520, 0x031350cb
+0,        242,        242,        1,   299520, 0x146fba58
+0,        243,        243,        1,   299520, 0x1b6679c7
+0,        244,        244,        1,   299520, 0x27e9d545
+0,        245,        245,        1,   299520, 0x5105beeb
+0,        246,        246,        1,   299520, 0x80284fd3
+0,        247,        247,        1,   299520, 0x426a5d65
+0,        248,        248,        1,   299520, 0xdcc33f89
+0,        249,        249,        1,   299520, 0x29e805ec
+0,        250,        250,        1,   299520, 0x89a09ed9
+0,        251,        251,        1,   299520, 0x60ad258c
+0,        252,        252,        1,   299520, 0xb44ee9b1
+0,        253,        253,        1,   299520, 0x184d6a88
+0,        254,        254,        1,   299520, 0xb4c8cefe
+0,        255,        255,        1,   299520, 0x358a0407
+0,        256,        256,        1,   299520, 0xa5cb97eb
+0,        257,        257,        1,   299520, 0x3d6a096e
+0,        258,        258,        1,   299520, 0xcb266e78

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-cip_B_NEC_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-ipcm_A_NEC_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-ipcm_B_NEC_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-ipcm_C_NEC_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-ipcm_D_NEC_3 Added

libav-v10.1.tar.bz2/tests/ref/fate/hevc-conformance-ipcm_E_NEC_2 Added

libav-v10.1.tar.bz2/tests/ref/fate/hmac Added

libav-v9.6.tar.bz2/tests/ref/fate/id-cin-video -> libav-v10.1.tar.bz2/tests/ref/fate/id-cin-video Changed

libav-v10.1.tar.bz2/tests/ref/fate/indeo3-2 Added

@@ -0,0 +1,101 @@
+#tb 0: 200/2997
+0,          0,          0,        1,    67680, 0x532a4c40
+0,         37,         37,        1,    67680, 0x63d2757a
+0,         38,         38,        1,    67680, 0xb1dcf7d3
+0,         39,         39,        1,    67680, 0x3225ee89
+0,         40,         40,        1,    67680, 0x9a102730
+0,         41,         41,        1,    67680, 0xf266888b
+0,         42,         42,        1,    67680, 0xd3b30d01
+0,         43,         43,        1,    67680, 0x7c647901
+0,         44,         44,        1,    67680, 0x0838e924
+0,         45,         45,        1,    67680, 0x2d470a56
+0,         46,         46,        1,    67680, 0x3eb99bda
+0,         47,         47,        1,    67680, 0x2b89e9f7
+0,         48,         48,        1,    67680, 0xcc006f93
+0,         49,         49,        1,    67680, 0x967b33e8
+0,         50,         50,        1,    67680, 0xcebbbfd3
+0,         51,         51,        1,    67680, 0x68365b83
+0,         52,         52,        1,    67680, 0xf1b0e536
+0,         53,         53,        1,    67680, 0x292ecc68
+0,         54,         54,        1,    67680, 0x83329d20
+0,         55,         55,        1,    67680, 0xe6ea8f5a
+0,         56,         56,        1,    67680, 0xcef27038
+0,         57,         57,        1,    67680, 0xa30445e4
+0,         58,         58,        1,    67680, 0x61aef9f5
+0,         59,         59,        1,    67680, 0x20abe80c
+0,         60,         60,        1,    67680, 0x7182a479
+0,         61,         61,        1,    67680, 0x56db4ec8
+0,         62,         62,        1,    67680, 0x08c1c3d4
+0,         63,         63,        1,    67680, 0x0d8879ed
+0,         64,         64,        1,    67680, 0x8e4eb9b9
+0,         65,         65,        1,    67680, 0x4629639e
+0,         66,         66,        1,    67680, 0x990bcd94
+0,         67,         67,        1,    67680, 0x2ae85671
+0,         68,         68,        1,    67680, 0xec296417
+0,         69,         69,        1,    67680, 0x41adf8da
+0,         70,         70,        1,    67680, 0xa035008f
+0,         71,         71,        1,    67680, 0xf8845e14
+0,         72,         72,        1,    67680, 0x802e52c4
+0,         73,         73,        1,    67680, 0xa2582b4a
+0,         74,         74,        1,    67680, 0x9ca567d7
+0,         75,         75,        1,    67680, 0x2ec69fac
+0,         76,         76,        1,    67680, 0x3a6d35ea
+0,         77,         77,        1,    67680, 0x9df7b7f6
+0,         78,         78,        1,    67680, 0x2d9dc502
+0,         79,         79,        1,    67680, 0x0ee16604
+0,         80,         80,        1,    67680, 0xb25d31a0
+0,         81,         81,        1,    67680, 0x52c04cb4
+0,         82,         82,        1,    67680, 0xd9ddec28
+0,         83,         83,        1,    67680, 0x1732f444
+0,         84,         84,        1,    67680, 0x19e01da5
+0,         85,         85,        1,    67680, 0x9af109df
+0,         86,         86,        1,    67680, 0xc59ba581
+0,         87,         87,        1,    67680, 0x8daaa58f
+0,         88,         88,        1,    67680, 0xd560a9ae
+0,         89,         89,        1,    67680, 0xe3fe77b4
+0,         90,         90,        1,    67680, 0x2a0e6c20
+0,         91,         91,        1,    67680, 0x9741f744
+0,         92,         92,        1,    67680, 0x8ec827dd
+0,         93,         93,        1,    67680, 0x7d90551f
+0,         94,         94,        1,    67680, 0x4d8f2665
+0,         95,         95,        1,    67680, 0x21e5a86e
+0,         96,         96,        1,    67680, 0x9ba3fe8f
+0,         97,         97,        1,    67680, 0xc84b7e41
+0,         98,         98,        1,    67680, 0x8da743e2
+0,         99,         99,        1,    67680, 0x49c4e00e
+0,        100,        100,        1,    67680, 0x90fc5dab
+0,        101,        101,        1,    67680, 0x9973a011
+0,        102,        102,        1,    67680, 0xfdd58648
+0,        103,        103,        1,    67680, 0xe181e329
+0,        104,        104,        1,    67680, 0xf60065c3
+0,        105,        105,        1,    67680, 0xde9bfc23
+0,        106,        106,        1,    67680, 0x37b9f867
+0,        107,        107,        1,    67680, 0x232ce0e9
+0,        108,        108,        1,    67680, 0x3fde091d
+0,        109,        109,        1,    67680, 0x3f00a465
+0,        110,        110,        1,    67680, 0x882b0042
+0,        111,        111,        1,    67680, 0x1bc3d626
+0,        112,        112,        1,    67680, 0xd15861a7
+0,        113,        113,        1,    67680, 0x056cd815
+0,        114,        114,        1,    67680, 0xe3fc887f
+0,        115,        115,        1,    67680, 0xdbddd03a
+0,        116,        116,        1,    67680, 0xfe6d865f
+0,        117,        117,        1,    67680, 0xbea7f202
+0,        118,        118,        1,    67680, 0x6d4114b9
+0,        119,        119,        1,    67680, 0x47bc93be
+0,        120,        120,        1,    67680, 0xb6136a41
+0,        121,        121,        1,    67680, 0xf0e63ecb
+0,        122,        122,        1,    67680, 0xb014b2a0
+0,        123,        123,        1,    67680, 0xf85a4be5
+0,        124,        124,        1,    67680, 0x21457c25
+0,        125,        125,        1,    67680, 0x75ae6bfb
+0,        126,        126,        1,    67680, 0x7ced988c
+0,        127,        127,        1,    67680, 0x3bf67347
+0,        128,        128,        1,    67680, 0x43e1ace5
+0,        129,        129,        1,    67680, 0xa23f8f45
+0,        130,        130,        1,    67680, 0x29d6cd9e
+0,        131,        131,        1,    67680, 0xad41bd94
+0,        132,        132,        1,    67680, 0x58e131c8
+0,        133,        133,        1,    67680, 0x617debea
+0,        134,        134,        1,    67680, 0x8a9db524
+0,        135,        135,        1,    67680, 0x17264d55

libav-v10.1.tar.bz2/tests/ref/fate/jpeg2000-dcinema Added

libav-v10.1.tar.bz2/tests/ref/fate/jv Added

libav-v10.1.tar.bz2/tests/ref/fate/lossless-monkeysaudio-399 Changed

libav-v9.6.tar.bz2/tests/ref/fate/mpeg2-field-enc -> libav-v10.1.tar.bz2/tests/ref/fate/mpeg2-field-enc Changed

libav-v10.1.tar.bz2/tests/ref/fate/mss2-pal Added

libav-v10.1.tar.bz2/tests/ref/fate/mss2-pals Added

libav-v10.1.tar.bz2/tests/ref/fate/mss2-rgb555 Added

libav-v10.1.tar.bz2/tests/ref/fate/mss2-rgb555s Added

libav-v10.1.tar.bz2/tests/ref/fate/mss2-wmv Added

@@ -0,0 +1,101 @@
+#tb 0: 1/1000
+0,          0,          0,        0,   230400, 0x00000000
+0,        233,        233,        0,   230400, 0xaf950008
+0,        299,        299,        0,   230400, 0x8d2a0010
+0,        366,        366,        0,   230400, 0xd75e0018
+0,        433,        433,        0,   230400, 0x00000000
+0,        499,        499,        0,   230400, 0x517f0008
+0,        566,        566,        0,   230400, 0xcf5a0010
+0,        633,        633,        0,   230400, 0x00000000
+0,        699,        699,        0,   230400, 0x40ef0018
+0,        766,        766,        0,   230400, 0xdc850008
+0,        833,        833,        0,   230400, 0x00000000
+0,        899,        899,        0,   230400, 0x09a40008
+0,        966,        966,        0,   230400, 0x00000000
+0,       1033,       1033,        0,   230400, 0x8b950008
+0,       1099,       1099,        0,   230400, 0xae260038
+0,       1166,       1166,        0,   230400, 0x6d850008
+0,       1233,       1233,        0,   230400, 0x00000000
+0,       1566,       1566,        0,   230400, 0x8b950008
+0,       1633,       1633,        0,   230400, 0x75450018
+0,       1699,       1699,        0,   230400, 0xb0dd0010
+0,       1766,       1766,        0,   230400, 0xecdd0018
+0,       1833,       1833,        0,   230400, 0x68e3f7f7
+0,       1899,       1899,        0,   230400, 0x9cfdcea6
+0,       1966,       1966,        0,   230400, 0x735ababf
+0,       2033,       2033,        0,   230400, 0xa1c604ea
+0,       2099,       2099,        0,   230400, 0x18a2f97a
+0,       2166,       2166,        0,   230400, 0xf9e82961
+0,       2233,       2233,        0,   230400, 0x57a8e9e8
+0,       2299,       2299,        0,   230400, 0xdef6fd66
+0,       2366,       2366,        0,   230400, 0xc7d923a9
+0,       2433,       2433,        0,   230400, 0x08bb41ee
+0,       2499,       2499,        0,   230400, 0x43ccbd29
+0,       2566,       2566,        0,   230400, 0x46666ee3
+0,       2633,       2633,        0,   230400, 0xbfd2ef29
+0,       2699,       2699,        0,   230400, 0x6504545f
+0,       2766,       2766,        0,   230400, 0x8fb86901
+0,       2833,       2833,        0,   230400, 0xc95f0917
+0,       2899,       2899,        0,   230400, 0x21f6a54b
+0,       2966,       2966,        0,   230400, 0xf808106b
+0,       3033,       3033,        0,   230400, 0x34150020
+0,       3099,       3099,        0,   230400, 0x50fdfe89
+0,       3166,       3166,        0,   230400, 0x920b7708
+0,       3233,       3233,        0,   230400, 0xed64fcc4
+0,       3299,       3299,        0,   230400, 0x6291a170
+0,       3366,       3366,        0,   230400, 0x20524643
+0,       3433,       3433,        0,   230400, 0x92aafecd
+0,       3499,       3499,        0,   230400, 0xf00ee14d
+0,       3566,       3566,        0,   230400, 0xfa3113ea
+0,       3633,       3633,        0,   230400, 0x99c06df1
+0,       3699,       3699,        0,   230400, 0x625c6918
+0,       3766,       3766,        0,   230400, 0xb277b25e
+0,       3833,       3833,        0,   230400, 0x2e913006
+0,       3899,       3899,        0,   230400, 0x3f6f1d99
+0,       3966,       3966,        0,   230400, 0x100ab60f
+0,       4033,       4033,        0,   230400, 0x9b73d0bf
+0,       4099,       4099,        0,   230400, 0xda0df2ce
+0,       4166,       4166,        0,   230400, 0x67f7ca24
+0,       4233,       4233,        0,   230400, 0xbde9b3d0
+0,       4299,       4299,        0,   230400, 0x92e14d07
+0,       4366,       4366,        0,   230400, 0x9426c3d9
+0,       4433,       4433,        0,   230400, 0x6104be70
+0,       4499,       4499,        0,   230400, 0xc4d1078a
+0,       4566,       4566,        0,   230400, 0x89426a42
+0,       4633,       4633,        0,   230400, 0x5271324a
+0,       4699,       4699,        0,   230400, 0x1cb1c735
+0,       4766,       4766,        0,   230400, 0x4249b8c6
+0,       4833,       4833,        0,   230400, 0x4b88cad3
+0,       4899,       4899,        0,   230400, 0x76af545d
+0,       4966,       4966,        0,   230400, 0xfe47e3c4
+0,       5033,       5033,        0,   230400, 0xa2e0e721
+0,       5099,       5099,        0,   230400, 0xde974a42
+0,       5166,       5166,        0,   230400, 0xe86a376b
+0,       5233,       5233,        0,   230400, 0xd52318fd
+0,       5299,       5299,        0,   230400, 0x0bbb1526
+0,       5366,       5366,        0,   230400, 0xa22c5e5e
+0,       5433,       5433,        0,   230400, 0x4532c5d2
+0,       5499,       5499,        0,   230400, 0x88b560ec
+0,       5566,       5566,        0,   230400, 0xcee9d9c9
+0,       5633,       5633,        0,   230400, 0x0429358f
+0,       5699,       5699,        0,   230400, 0xf18a9b98
+0,       5766,       5766,        0,   230400, 0x63f7a12c
+0,       5833,       5833,        0,   230400, 0x98635515
+0,       5899,       5899,        0,   230400, 0x36affebc
+0,       5966,       5966,        0,   230400, 0xd8c19629
+0,       6033,       6033,        0,   230400, 0x9ef5344d
+0,       6099,       6099,        0,   230400, 0x545668dc
+0,       6166,       6166,        0,   230400, 0x50e65e74
+0,       6233,       6233,        0,   230400, 0xe3258be3
+0,       6299,       6299,        0,   230400, 0xeb479e1b
+0,       6366,       6366,        0,   230400, 0x91894243
+0,       6433,       6433,        0,   230400, 0x3c5660fc
+0,       6499,       6499,        0,   230400, 0xf0c35673
+0,       6566,       6566,        0,   230400, 0x552832e8
+0,       6633,       6633,        0,   230400, 0x1970f2b1
+0,       6699,       6699,        0,   230400, 0x812d4c91
+0,       6766,       6766,        0,   230400, 0xa3fbd4ef
+0,       6833,       6833,        0,   230400, 0x486f9649
+0,       6899,       6899,        0,   230400, 0x850f315a
+0,       6966,       6966,        0,   230400, 0xc18ec66b
+0,       7033,       7033,        0,   230400, 0xc9ef266e

libav-v9.6.tar.bz2/tests/ref/fate/msvideo1-8bit -> libav-v10.1.tar.bz2/tests/ref/fate/msvideo1-8bit Changed

libav-v9.6.tar.bz2/tests/ref/fate/mxf-demux -> libav-v10.1.tar.bz2/tests/ref/fate/mxf-demux Changed

libav-v10.1.tar.bz2/tests/ref/fate/noproxy Added

libav-v9.6.tar.bz2/tests/ref/fate/nuv-rtjpeg -> libav-v10.1.tar.bz2/tests/ref/fate/nuv-rtjpeg Changed

libav-v9.6.tar.bz2/tests/ref/fate/nuv-rtjpeg-fh -> libav-v10.1.tar.bz2/tests/ref/fate/nuv-rtjpeg-fh Changed

@@ -1,11 +1,11 @@
 #tb 0: 1/1000
-0,          0,          0,        0,   221184, 0xf48c94f6
-0,         40,         40,        0,   221184, 0x89b625b2
-0,         60,         60,        0,   221184, 0x37e04714
-0,         80,         80,        0,   221184, 0x4f4c5224
-0,        100,        100,        0,   221184, 0x9193c9f1
-0,        120,        120,        0,   221184, 0x5d1a6197
-0,        140,        140,        0,   221184, 0x40cd51e7
+0,          0,          0,        0,   221184, 0xdaf54f83
+0,         40,         40,        0,   221184, 0xeea3e3b4
+0,         60,         60,        0,   221184, 0x5f1a8525
+0,         80,         80,        0,   221184, 0x950bb170
+0,        100,        100,        0,   221184, 0x6262e94c
+0,        120,        120,        0,   221184, 0x28752197
+0,        140,        140,        0,   221184, 0x0c2811e7
 0,        160,        160,        0,   221184, 0xb2c1a729
 0,        200,        200,        0,   221184, 0x998d6144
 0,        220,        220,        0,   221184, 0xf5d52311

libav-v10.1.tar.bz2/tests/ref/fate/pngparser Added

libav-v9.6.tar.bz2/tests/ref/fate/prores-alpha -> libav-v10.1.tar.bz2/tests/ref/fate/prores-alpha Changed

libav-v10.1.tar.bz2/tests/ref/fate/siff-demux Added

@@ -0,0 +1,112 @@
+#tb 0: 1/12
+#tb 1: 1/22050
+0,          0,          0,        1,    15152, 0x14fc0f1f
+1,          0,          0,    22050,    22050, 0xa7d60d27
+0,          1,          1,        1,    15344, 0x31614bd7
+0,          2,          2,        1,    15163, 0x88c46248
+0,          3,          3,        1,    15152, 0x43c9c0e6
+0,          4,          4,        1,    15341, 0x813f6f01
+0,          5,          5,        1,    15152, 0x7598d01c
+0,          6,          6,        1,    15152, 0x40b5cdb1
+0,          7,          7,        1,    15347, 0xe061c843
+0,          8,          8,        1,    15159, 0x2e3c2242
+0,          9,          9,        1,    15151, 0x7201abc5
+0,         10,         10,        1,    15346, 0xeb5a349e
+0,         11,         11,        1,    15154, 0xda9907c9
+0,         12,         12,        1,    15159, 0x8d4d63b0
+1,      22050,      22050,    22050,    22050, 0xeb11185c
+0,         13,         13,        1,    15337, 0xd988436d
+0,         14,         14,        1,    15162, 0x0b495da7
+0,         15,         15,        1,    15164, 0xd8837439
+0,         16,         16,        1,    15339, 0x7ad372cc
+0,         17,         17,        1,    15161, 0xc45d4590
+0,         18,         18,        1,    15159, 0x5bdd9801
+0,         19,         19,        1,    15335, 0x8e17c83e
+0,         20,         20,        1,    15160, 0x5cdbdc04
+0,         21,         21,        1,    15157, 0xf480a643
+0,         22,         22,        1,    15346, 0x0c61b206
+0,         23,         23,        1,    15160, 0x05d9acfd
+0,         24,         24,        1,    15158, 0xebdc3ac4
+1,      44100,      44100,    22050,    22050, 0xd6dc0e17
+0,         25,         25,        1,    15334, 0xb51fd1b9
+0,         26,         26,        1,    15152, 0x81f74e5c
+0,         27,         27,        1,    15161, 0xafeca32c
+0,         28,         28,        1,    15347, 0x8f5e5874
+0,         29,         29,        1,    15157, 0xdeff353c
+0,         30,         30,        1,    15160, 0x93a19aa0
+0,         31,         31,        1,    15347, 0x94224071
+0,         32,         32,        1,    15153, 0x9982aff5
+0,         33,         33,        1,    15164, 0x044bcf2b
+0,         34,         34,        1,    15347, 0x40aca6e9
+0,         35,         35,        1,    15160, 0xf820e2c7
+0,         36,         36,        1,    15154, 0x457832b5
+1,      66150,      66150,    22050,    22050, 0x020412c4
+0,         37,         37,        1,    15334, 0xbb1704f0
+0,         38,         38,        1,    15156, 0xc0672ed1
+0,         39,         39,        1,    15159, 0x9a82c7c1
+0,         40,         40,        1,    15338, 0x03857aae
+0,         41,         41,        1,    15158, 0xe6177548
+0,         42,         42,        1,    15159, 0xf8ecafc4
+0,         43,         43,        1,    15345, 0x0a10882e
+0,         44,         44,        1,    15161, 0xec4339fb
+0,         45,         45,        1,    15157, 0x071935a2
+0,         46,         46,        1,    15340, 0x68aad418
+0,         47,         47,        1,    15151, 0x891bc3fe
+0,         48,         48,        1,    15153, 0xf522e54c
+1,      88200,      88200,    22050,    22050, 0x5d9606ae
+0,         49,         49,        1,    15346, 0x5a018842
+0,         50,         50,        1,    15164, 0x6842ac50
+0,         51,         51,        1,    15156, 0x32369159
+0,         52,         52,        1,    15347, 0xf5be31aa
+0,         53,         53,        1,    15157, 0xd2da28bd
+0,         54,         54,        1,    15152, 0x389feda6
+0,         55,         55,        1,    15345, 0x69187603
+0,         56,         56,        1,    15154, 0x5dc60365
+0,         57,         57,        1,    15159, 0x8c811193
+0,         58,         58,        1,    15344, 0x3db4bf13
+0,         59,         59,        1,    15156, 0xf729ebe1
+0,         60,         60,        1,    15162, 0xf10a4ce5
+1,     110250,     110250,    22050,    22050, 0x08171bca
+0,         61,         61,        1,    15345, 0x749b0604
+0,         62,         62,        1,    15160, 0xfe3bbbce
+0,         63,         63,        1,    15160, 0x6dcc4b85
+0,         64,         64,        1,    15337, 0xab87dd97
+0,         65,         65,        1,    15163, 0x1ce60db8
+0,         66,         66,        1,    15164, 0xfc4a2002
+0,         67,         67,        1,    15345, 0x9108e072
+0,         68,         68,        1,    15153, 0x83fc9055
+0,         69,         69,        1,    15155, 0xa1101e1a
+0,         70,         70,        1,    15343, 0x6418f0e9
+0,         71,         71,        1,    15157, 0x8c743049
+0,         72,         72,        1,    15153, 0x9c0e33eb
+1,     132300,     132300,    22050,    22050, 0xd43b0cf9
+0,         73,         73,        1,    15337, 0x64bae0b6
+0,         74,         74,        1,    15162, 0x5f6b91d5
+0,         75,         75,        1,    15162, 0x44e5dd3d
+0,         76,         76,        1,    15342, 0x968dc44c
+0,         77,         77,        1,    15158, 0x0e706c4d
+0,         78,         78,        1,    15153, 0xa7d2199a
+0,         79,         79,        1,    15345, 0x834d0f2e
+0,         80,         80,        1,    15163, 0x3d5d38c3
+0,         81,         81,        1,    15151, 0xf7d49515
+0,         82,         82,        1,    15337, 0x5f362f2a
+0,         83,         83,        1,    15162, 0xea87d814
+0,         84,         84,        1,    15164, 0xeb0a2662
+1,     154350,     154350,    22050,    22050, 0x486d1bc2
+0,         85,         85,        1,    15340, 0x772109e6
+0,         86,         86,        1,    15156, 0x9459cda5
+0,         87,         87,        1,    15152, 0x4f174e2d
+0,         88,         88,        1,    15343, 0x10d42a59
+0,         89,         89,        1,    15162, 0xd65ec2ec
+0,         90,         90,        1,    15156, 0x1e382319
+0,         91,         91,        1,    15335, 0xec904c2a
+0,         92,         92,        1,    15161, 0x56d49e44
+0,         93,         93,        1,    15154, 0x51d02cd0
+0,         94,         94,        1,    15340, 0xec3e14ee
+0,         95,         95,        1,    15160, 0xe43b5305
+0,         96,         96,        1,    15156, 0x8f2876a5
+1,     176400,     176400,    22050,    22050, 0x5c5508d3
+0,         97,         97,        1,    15340, 0xb26a9059
+0,         98,         98,        1,    15156, 0xf9570ec0
+0,         99,         99,        1,    15151, 0x862ffa1f
+1,     198450,     198450,     1984,     1984, 0x9cb4dfb7

libav-v10.1.tar.bz2/tests/ref/fate/srtp Added

libav-v10.1.tar.bz2/tests/ref/fate/theora-coeff-level64 Changed

libav-v10.1.tar.bz2/tests/ref/fate/timefilter Added

libav-v10.1.tar.bz2/tests/ref/fate/tscc2 Added

@@ -0,0 +1,33 @@
+#tb 0: 1/24
+0,          0,          0,        1,   230400, 0x7a2103c0
+0,          1,          1,        1,   230400, 0xd381c279
+0,          2,          2,        1,   230400, 0xd381c279
+0,          3,          3,        1,   230400, 0x110aec27
+0,          4,          4,        1,   230400, 0x4be67ee7
+0,          5,          5,        1,   230400, 0xd87fe4b4
+0,          6,          6,        1,   230400, 0xd87fe4b4
+0,          7,          7,        1,   230400, 0x9bc6a398
+0,          8,          8,        1,   230400, 0xd67d92db
+0,          9,          9,        1,   230400, 0x3df6559e
+0,         10,         10,        1,   230400, 0x3df6559e
+0,         11,         11,        1,   230400, 0x2136ff25
+0,         12,         12,        1,   230400, 0x94573fe6
+0,         13,         13,        1,   230400, 0xbf67d3f5
+0,         14,         14,        1,   230400, 0xbf67d3f5
+0,         15,         15,        1,   230400, 0x2592b5cf
+0,         16,         16,        1,   230400, 0x5b23cd93
+0,         17,         17,        1,   230400, 0x9b76d079
+0,         18,         18,        1,   230400, 0x9b76d079
+0,         19,         19,        1,   230400, 0x771a017e
+0,         20,         20,        1,   230400, 0xacfee1d0
+0,         21,         21,        1,   230400, 0x6b9ff4eb
+0,         22,         22,        1,   230400, 0x6b9ff4eb
+0,         23,         23,        1,   230400, 0xbaf643e1
+0,         24,         24,        1,   230400, 0x052efe59
+0,         25,         25,        1,   230400, 0xd751f901
+0,         26,         26,        1,   230400, 0xd751f901
+0,         27,         27,        1,   230400, 0x6f94e11f
+0,         28,         28,        1,   230400, 0x17eeabb9
+0,         29,         29,        1,   230400, 0x3733a035
+0,         30,         30,        1,   230400, 0x3733a035
+0,         31,         31,        1,   230400, 0xb0829f45

libav-v10.1.tar.bz2/tests/ref/fate/vb Added

@@ -0,0 +1,37 @@
+#tb 0: 1/12
+0,          0,          0,        1,   230400, 0x3bd1d731
+0,          1,          1,        1,   230400, 0x9d0774c3
+0,          2,          2,        1,   230400, 0xa0faafe2
+0,          3,          3,        1,   230400, 0x38325309
+0,          4,          4,        1,   230400, 0xe90a1b1e
+0,          5,          5,        1,   230400, 0x8efbc904
+0,          6,          6,        1,   230400, 0x0a8476f3
+0,          7,          7,        1,   230400, 0x5d94587d
+0,          8,          8,        1,   230400, 0x280b905d
+0,          9,          9,        1,   230400, 0x07178dd9
+0,         10,         10,        1,   230400, 0xf52b8db4
+0,         11,         11,        1,   230400, 0x2b70c1dc
+0,         12,         12,        1,   230400, 0x8157a6e9
+0,         13,         13,        1,   230400, 0xd4a3c357
+0,         14,         14,        1,   230400, 0x703861bb
+0,         15,         15,        1,   230400, 0xa13cf75e
+0,         16,         16,        1,   230400, 0x140e487f
+0,         17,         17,        1,   230400, 0x05cca333
+0,         18,         18,        1,   230400, 0x0506ee2b
+0,         19,         19,        1,   230400, 0xe3e13466
+0,         20,         20,        1,   230400, 0x8a24118c
+0,         21,         21,        1,   230400, 0x22050962
+0,         22,         22,        1,   230400, 0x0f5c8a0d
+0,         23,         23,        1,   230400, 0x3475df44
+0,         24,         24,        1,   230400, 0x65354e06
+0,         25,         25,        1,   230400, 0xb9a01978
+0,         26,         26,        1,   230400, 0x15207ee1
+0,         27,         27,        1,   230400, 0x3b214f0b
+0,         28,         28,        1,   230400, 0xf9461bbb
+0,         29,         29,        1,   230400, 0x1469290f
+0,         30,         30,        1,   230400, 0x8ddfd514
+0,         31,         31,        1,   230400, 0x1bffa6a1
+0,         32,         32,        1,   230400, 0x5a04d712
+0,         33,         33,        1,   230400, 0xaa8de439
+0,         34,         34,        1,   230400, 0x610c5439
+0,         35,         35,        1,   230400, 0xd02d3e7c

libav-v9.6.tar.bz2/tests/ref/fate/vc1_sa10143 -> libav-v10.1.tar.bz2/tests/ref/fate/vc1_sa10143 Changed

@@ -1,31 +1,31 @@
 #tb 0: 1/25
 0,          0,          0,        1,   518400, 0x89407f55
-0,          2,          2,        1,   518400, 0xeb8d84a1
-0,          3,          3,        1,   518400, 0x2121ff57
-0,          4,          4,        1,   518400, 0xd81adb3d
-0,          5,          5,        1,   518400, 0x01e36aa2
-0,          6,          6,        1,   518400, 0x6b802361
-0,          7,          7,        1,   518400, 0xc8403c77
-0,          8,          8,        1,   518400, 0xdd342b5d
-0,          9,          9,        1,   518400, 0x2100eea5
-0,         10,         10,        1,   518400, 0x92a22da6
-0,         11,         11,        1,   518400, 0x6bacdef7
-0,         12,         12,        1,   518400, 0x4a00715f
-0,         13,         13,        1,   518400, 0x59b98727
-0,         14,         14,        1,   518400, 0xbf912ee1
-0,         15,         15,        1,   518400, 0x8c966cd6
-0,         16,         16,        1,   518400, 0x2c9a2535
-0,         17,         17,        1,   518400, 0x29085c06
-0,         18,         18,        1,   518400, 0x46ae6b7d
-0,         19,         19,        1,   518400, 0x283100f4
-0,         20,         20,        1,   518400, 0x2731b5ff
-0,         21,         21,        1,   518400, 0x1132ea54
-0,         22,         22,        1,   518400, 0x37cbe539
-0,         23,         23,        1,   518400, 0x08ff75cf
-0,         24,         24,        1,   518400, 0xafb6bc45
-0,         25,         25,        1,   518400, 0x19d3873d
-0,         26,         26,        1,   518400, 0xd494a8be
-0,         27,         27,        1,   518400, 0x285f41ef
-0,         28,         28,        1,   518400, 0xd4b1ffa1
-0,         29,         29,        1,   518400, 0xc3876c3a
-0,         30,         30,        1,   518400, 0xb73dbb62
+0,          2,          2,        1,   518400, 0x8611849c
+0,          3,          3,        1,   518400, 0x0e69ff59
+0,          4,          4,        1,   518400, 0xf31adb03
+0,          5,          5,        1,   518400, 0x1a5b6a69
+0,          6,          6,        1,   518400, 0x6ae6232e
+0,          7,          7,        1,   518400, 0x9a4e3c54
+0,          8,          8,        1,   518400, 0xe5852b45
+0,          9,          9,        1,   518400, 0x0fcfeebc
+0,         10,         10,        1,   518400, 0x06e22dc3
+0,         11,         11,        1,   518400, 0x9d79df09
+0,         12,         12,        1,   518400, 0xcb2c716f
+0,         13,         13,        1,   518400, 0x638a8746
+0,         14,         14,        1,   518400, 0xf7032efd
+0,         15,         15,        1,   518400, 0x306f6cef
+0,         16,         16,        1,   518400, 0xe83d2518
+0,         17,         17,        1,   518400, 0x49ab5bf5
+0,         18,         18,        1,   518400, 0x6b336b6f
+0,         19,         19,        1,   518400, 0x95ae00c9
+0,         20,         20,        1,   518400, 0x68ddb64f
+0,         21,         21,        1,   518400, 0x5205ea68
+0,         22,         22,        1,   518400, 0xb088e617
+0,         23,         23,        1,   518400, 0xa3217616
+0,         24,         24,        1,   518400, 0x1723bc53
+0,         25,         25,        1,   518400, 0xf024872a
+0,         26,         26,        1,   518400, 0x2e81a8bb
+0,         27,         27,        1,   518400, 0xa3a2418e
+0,         28,         28,        1,   518400, 0xb7beffed
+0,         29,         29,        1,   518400, 0x50fb6c94
+0,         30,         30,        1,   518400, 0x5584bb40

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-00 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-01 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-02 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-03 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-04 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-05 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-06 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-07 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-08 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-09 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-10 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-11 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-12 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-13 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-14 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-15 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-16 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-17 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-18 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-19 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-20 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-21 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-22 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-23 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-24 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-25 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-26 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-27 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-28 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-29 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-30 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-31 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-32 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-33 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-34 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-35 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-36 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-37 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-38 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-39 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-40 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-41 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-42 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-43 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-44 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-45 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-46 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-47 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-48 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-49 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-50 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-51 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-52 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-53 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-54 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-55 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-56 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-57 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-58 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-59 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-60 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-61 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-62 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-00-quantizer-63 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-01-sharpness-1 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-01-sharpness-2 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-01-sharpness-3 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-01-sharpness-4 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-01-sharpness-5 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-01-sharpness-6 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-01-sharpness-7 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-08x08 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-08x10 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-08x16 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-08x18 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-08x32 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-08x34 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-08x64 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-08x66 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-10x08 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-10x10 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-10x16 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-10x18 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-10x32 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-10x34 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-10x64 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-10x66 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-16x08 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-16x10 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-16x16 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-16x18 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-16x32 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-16x34 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-16x64 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-16x66 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-18x08 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-18x10 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-18x16 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-18x18 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-18x32 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-18x34 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-18x64 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-18x66 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-32x08 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-32x10 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-32x16 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-32x18 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-32x32 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-32x34 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-32x64 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-32x66 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-34x08 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-34x10 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-34x16 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-34x18 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-34x32 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-34x34 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-34x64 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-34x66 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-64x08 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-64x10 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-64x16 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-64x18 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-64x32 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-64x34 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-64x64 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-64x66 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-66x08 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-66x10 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-66x16 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-66x18 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-66x32 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-66x34 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-66x64 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-02-size-66x66 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-deltaq Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-196x196 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-196x198 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-196x200 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-196x202 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-196x208 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-196x210 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-196x224 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-196x226 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-198x196 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-198x198 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-198x200 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-198x202 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-198x208 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-198x210 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-198x224 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-198x226 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-200x196 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-200x198 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-200x200 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-200x202 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-200x208 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-200x210 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-200x224 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-200x226 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-202x196 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-202x198 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-202x200 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-202x202 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-202x208 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-202x210 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-202x224 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-202x226 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-208x196 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-208x198 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-208x200 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-208x202 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-208x208 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-208x210 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-208x224 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-208x226 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-210x196 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-210x198 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-210x200 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-210x202 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-210x208 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-210x210 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-210x224 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-210x226 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-224x196 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-224x198 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-224x200 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-224x202 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-224x208 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-224x210 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-224x224 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-224x226 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-226x196 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-226x198 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-226x200 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-226x202 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-226x208 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-226x210 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-226x224 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-03-size-226x226 Added

libav-v10.1.tar.bz2/tests/ref/fate/vp9-2pass-akiyo Added

@@ -0,0 +1,51 @@
+#tb 0: 1/1000
+0,          0,          0,        0,   152064, 043ce065a309514e1e8ebdcbb3c2458b
+0,         33,         33,        0,   152064, 8579c9cffd95b11db86158e518b2e34a
+0,         66,         66,        0,   152064, ebbba105e499604f5e69b8aa48fe86f4
+0,        100,        100,        0,   152064, b08526fab7e106021f9fb9b1e2d4b725
+0,        133,        133,        0,   152064, 92afa561d06f41ccc6d2e2bcc3ab2ee4
+0,        166,        166,        0,   152064, 50de8ec2db66c783289a3982dd1c4f97
+0,        200,        200,        0,   152064, c2ab55d114b8822adef06ccb093b5ac7
+0,        233,        233,        0,   152064, e3ee4edbe8a1f0b5486bbd8a52e7cbcb
+0,        266,        266,        0,   152064, fc33fd50566cd64e5b13911ee06c6e24
+0,        300,        300,        0,   152064, 05297e847f983a19fe2ba5e05932a110
+0,        333,        333,        0,   152064, d21db9adb27be89ab3b7f75d89175e24
+0,        367,        367,        0,   152064, 29bb87bdebd078f8dd953a70def6c4dc
+0,        400,        400,        0,   152064, c57f7bc772f6143a22edaf926f92de5f
+0,        433,        433,        0,   152064, 39f2fc755d4bc2cc5ec077035382be22
+0,        467,        467,        0,   152064, 000ec9c75374f6d74a5e61189e6fd782
+0,        500,        500,        0,   152064, 3027187c9bdb2a755d14513b7e597bb1
+0,        533,        533,        0,   152064, 2b3129659df2b3aa10b9398c50301e00
+0,        567,        567,        0,   152064, e23bcacf1cafca9a7959508b33e63907
+0,        600,        600,        0,   152064, fe0382dd155284998a0d7eb7effb5adf
+0,        633,        633,        0,   152064, e0a487860dd0df3d865971b483fab3e9
+0,        667,        667,        0,   152064, 7ca757c55b0ea4779cdfa3a535f8f234
+0,        700,        700,        0,   152064, 1a276d27f4ce0e2720e25dbed2e524ae
+0,        734,        734,        0,   152064, dd39bc322c8bdce196a9c2129bcb5d6e
+0,        767,        767,        0,   152064, 63e295427977d645462e0fb3277ccb53
+0,        800,        800,        0,   152064, e9a35655c71da22fb0c7865e0bbc91b8
+0,        834,        834,        0,   152064, 5903bcbccabb3366382b37bf08119dde
+0,        867,        867,        0,   152064, 3b6ce09353b07b193914a71ca2334d8c
+0,        900,        900,        0,   152064, cb3731eb5dbe338125c0a7d6b4bf2868
+0,        934,        934,        0,   152064, 0837c62b54912ed06f7f755894ad3f6b
+0,        967,        967,        0,   152064, 7f215dc14d8e280fc18ad3fb3122fa58
+0,       1001,       1001,        0,   152064, 6dafaf5adc45fead74f0153e3764b17d
+0,       1034,       1034,        0,   152064, e19c8274ee6377dbf005f6516a81c413
+0,       1067,       1067,        0,   152064, 358cbf29bd136d2f9dcb60ab82a2e9e5
+0,       1101,       1101,        0,   152064, 2276d4670ff35c3a76c27c3a5810eea3
+0,       1134,       1134,        0,   152064, 636dd3390d4011c377915d7d3acc9ee1
+0,       1167,       1167,        0,   152064, 5e7a1ed17d80168567d61987425f4e60
+0,       1201,       1201,        0,   152064, c10a4830c5f268888789fccd16c0cc0e
+0,       1234,       1234,        0,   152064, 298ef49418d730a031ff23311031c969
+0,       1267,       1267,        0,   152064, 4dd2249e13cda0f99fa46786d345c96a
+0,       1301,       1301,        0,   152064, 24232dbc6e35a069c60422c4c23dfa51
+0,       1334,       1334,        0,   152064, ae8751c5ac168d6aa4499fe69f018ae2
+0,       1368,       1368,        0,   152064, 6a3a7e60a569e7415f2c3a1453e4dc38
+0,       1401,       1401,        0,   152064, 5475af1c118d1b7cc0a357bc434241a8
+0,       1434,       1434,        0,   152064, c6b5ab39e630e66e8f09698fd1dfa160
+0,       1468,       1468,        0,   152064, f1c0310adf115456167e3fa790e43dde
+0,       1501,       1501,        0,   152064, 3028296307b47d10156fc9657693edc3
+0,       1534,       1534,        0,   152064, 0903dabcb8ac707b423b222ac5bb4898
+0,       1568,       1568,        0,   152064, 713cf71b994e2c85ed577062814c5732
+0,       1601,       1601,        0,   152064, 674f56b9cccf5c9d1f88f68c3996a671
+0,       1634,       1634,        0,   152064, f63732c2ff823960d8b62d866dfb5e6a

libav-v10.1.tar.bz2/tests/ref/fate/vp9-parallelmode-akiyo Added

@@ -0,0 +1,26 @@
+#tb 0: 1/1000
+0,          0,          0,        0,   152064, f5bc602db15c69545307e56990f9f9f7
+0,         33,         33,        0,   152064, b56428b6f97669938c8b9b05458fca70
+0,         66,         66,        0,   152064, b56428b6f97669938c8b9b05458fca70
+0,        100,        100,        0,   152064, 3098d2eb9129beddb6975e3ae332a4ab
+0,        133,        133,        0,   152064, 6719f3a6c22f05dc53dd3906e4154bd7
+0,        166,        166,        0,   152064, 8cd9a12761e35f67c278949cd3aee88f
+0,        200,        200,        0,   152064, 8cd9a12761e35f67c278949cd3aee88f
+0,        233,        233,        0,   152064, 0160dec415234d39f148e91f72d264ab
+0,        266,        266,        0,   152064, 9f90d96d67d9e9b3716abe2a3faa854e
+0,        300,        300,        0,   152064, 1edb312f9d0be7835b964a3ffa014759
+0,        333,        333,        0,   152064, 7614fd674609afccacd355aa2f714c75
+0,        367,        367,        0,   152064, cb46868706dd246878bebf354aff66f4
+0,        400,        400,        0,   152064, da36fe96cb4956036f890bb2f6d05b98
+0,        433,        433,        0,   152064, af0a178c68b719b369c8fa8537d38e65
+0,        467,        467,        0,   152064, ff03dbc436376fc60ac240cd6c4fc518
+0,        500,        500,        0,   152064, b0bf25e139556bd9067616db7e4f47b5
+0,        533,        533,        0,   152064, e70d5480c1f82fc877bbe1a8093f807a
+0,        567,        567,        0,   152064, 622fb43e6ff63834f0f680a68b49f6e6
+0,        600,        600,        0,   152064, c331ebba15f2290f174533dbffb3c27b
+0,        633,        633,        0,   152064, 15cb153425c55f7065fb36606c48972e
+0,        667,        667,        0,   152064, b95c7699639c51b08b3615ef7fa7046c
+0,        700,        700,        0,   152064, b4774148c71c9c184bda5a18294e459c
+0,        734,        734,        0,   152064, 795b7ce4c5e0dc343bd8f80ad6c1a454
+0,        767,        767,        0,   152064, 19163601b7b6138e2940cf28f6df6c7f
+0,        800,        800,        0,   152064, b9b388e0892c52df0680a30bfa954506

libav-v10.1.tar.bz2/tests/ref/fate/vp9-segmentation-aq-akiyo Added

@@ -0,0 +1,26 @@
+#tb 0: 1/1000
+0,          0,          0,        0,   152064, b208eac12f0ae74a812bc9e314bdfac7
+0,         33,         33,        0,   152064, ebb2259451c3acf3ad6379d1f4092efb
+0,         66,         66,        0,   152064, 33de46060afd14aa359b7bd0d9ff1be8
+0,        100,        100,        0,   152064, 33de46060afd14aa359b7bd0d9ff1be8
+0,        133,        133,        0,   152064, 5d087d8df10fd406d59172710ea0341a
+0,        166,        166,        0,   152064, 3570ed7fb90ac9b5335b97adf0539e94
+0,        200,        200,        0,   152064, 68a8c56b889a3befc75c9ec4293c7fda
+0,        233,        233,        0,   152064, f871f7c0456f644cfb0ec896132a097f
+0,        266,        266,        0,   152064, 14e939bfeb2b878e0782a7ce68ecd214
+0,        300,        300,        0,   152064, bd3e97881ebece0f876d46d067c6a7ff
+0,        333,        333,        0,   152064, a20529c091ef3e68a901c574371224b3
+0,        367,        367,        0,   152064, 5253f16c8b0329d33d38d275124487fb
+0,        400,        400,        0,   152064, c9c2f7d8835e620709a53ff8adfe72bf
+0,        433,        433,        0,   152064, dc8f1df0d7ab8e4f9daf2ccfd96de855
+0,        467,        467,        0,   152064, d09d43208d4de7f81d54f48cff310b6f
+0,        500,        500,        0,   152064, 0dcf7212075c1f15219690ad6ffe2940
+0,        533,        533,        0,   152064, 3b52e3eb4f972318c6912dd29a95dcf3
+0,        567,        567,        0,   152064, aa1414343067749fbd743ace93553492
+0,        600,        600,        0,   152064, 6951cb7a78e0a03f9a3f6264084de6dc
+0,        633,        633,        0,   152064, 5324f2f03c4d5fe35446561af654e9ec
+0,        667,        667,        0,   152064, dff11b046a02ca34c6b1aecc857632ec
+0,        700,        700,        0,   152064, 971182c013c1524d4864fd946b8c1550
+0,        734,        734,        0,   152064, 3306f1dcd5760ba92dd9cec8bfc21b08
+0,        767,        767,        0,   152064, f1f7b13c33332fece576b4d175f91832
+0,        800,        800,        0,   152064, 9e66573fbfe847149eb32e8a9c242c18

libav-v10.1.tar.bz2/tests/ref/fate/vp9-segmentation-sf-akiyo Added

@@ -0,0 +1,26 @@
+#tb 0: 1/1000
+0,          0,          0,        0,   152064, f4e04a0f92fab3a52d858bb222807ac0
+0,         33,         33,        0,   152064, 493cb96b8202a1518c6c9bdb848540e4
+0,         66,         66,        0,   152064, 60b5b63f832cff119a43de82102758f4
+0,        100,        100,        0,   152064, 0d9bd42e279d480603f9c670f0a8ffe3
+0,        133,        133,        0,   152064, 25ca563f233688f32f40fec985a116a2
+0,        166,        166,        0,   152064, dd14b43d538708a91de41606703dbe1c
+0,        200,        200,        0,   152064, 01bb23cb43960ff185a97ea79936d3b4
+0,        233,        233,        0,   152064, 85045c4310ee80cd12979bdea4f3f86e
+0,        266,        266,        0,   152064, c8e015ea13359a05483de349313a6686
+0,        300,        300,        0,   152064, 8dbb0406bf6fe19c30a9c9253fcdfe7f
+0,        333,        333,        0,   152064, 84881463643069036d03e8120a5f15e9
+0,        367,        367,        0,   152064, 9abcd3f2f86ff31f8d357389b330df59
+0,        400,        400,        0,   152064, 19ada6395c4e656578d2ceeaba291bb2
+0,        433,        433,        0,   152064, fc29773a6f32eed2bfa44143f8f505b1
+0,        467,        467,        0,   152064, 5e56bd91f5e3d1457c124b5702bdc3b6
+0,        500,        500,        0,   152064, 5b920d73e301adb6c45699a209f09a33
+0,        533,        533,        0,   152064, 4d06ec294270638c6abdd1c2303b34fc
+0,        567,        567,        0,   152064, dc99797067851f74708d7e6ff54367d8
+0,        600,        600,        0,   152064, 5df68b49124219592b043916affb1311
+0,        633,        633,        0,   152064, cfb52d101fad76acb1bb0d48c513bffd
+0,        667,        667,        0,   152064, 206dbd55680b8a83d8bafe33c54c3e36
+0,        700,        700,        0,   152064, 171f2e26771db631788065eecf6c44d9
+0,        734,        734,        0,   152064, b10809dcf9ecfdb4f86a6f3236ac273e
+0,        767,        767,        0,   152064, b354107bdea9bd011b09d9f4a32d4e89
+0,        800,        800,        0,   152064, 0c18be13dc6fbf79a613f2b24bb301c1

libav-v10.1.tar.bz2/tests/ref/fate/vp9-tiling-pedestrian Added

libav-v9.6.tar.bz2/tests/ref/fate/wmv8-drm -> libav-v10.1.tar.bz2/tests/ref/fate/wmv8-drm Changed

libav-v10.1.tar.bz2/tests/ref/fate/xvid-custom-matrix Added

@@ -0,0 +1,21 @@
+#tb 0: 1/25
+0,          1,          1,        1,   622080, 870e846b6b001d3e34fa87df96297e28
+0,          2,          2,        1,   622080, de1a3dd9fcc32086ecdffd4591a8defa
+0,          3,          3,        1,   622080, 59f5f16d4224e98e09f22818cc9227e0
+0,          4,          4,        1,   622080, 9744609bcf95107bdbe6a9e21dc22b9d
+0,          5,          5,        1,   622080, 6dc50ad4b5821cc20f418f2eb273a45c
+0,          6,          6,        1,   622080, 57012fc77d853c17591319cc528ebd93
+0,          7,          7,        1,   622080, fd0068955ce1583f21bb888ad3b6952a
+0,          8,          8,        1,   622080, 58b7bcb056fac5d34ec4197fe10723a7
+0,          9,          9,        1,   622080, 064311346d0ea2753f01f18f13188c27
+0,         10,         10,        1,   622080, 21995e49367aee152a11992f48317bbe
+0,         11,         11,        1,   622080, 288c2cd0ac0a3b74d23da6ba30111d55
+0,         12,         12,        1,   622080, 88db7bf240fd6ee5ef89c34522de76e8
+0,         13,         13,        1,   622080, 8e2d38686bbf768e812005decc37cb90
+0,         14,         14,        1,   622080, 3a7d3c036ecaa669d26660937a8b723e
+0,         15,         15,        1,   622080, 6c8b8e847c544125213c9f49d9607d98
+0,         16,         16,        1,   622080, 16b56117f1b327862f78421116dfe52e
+0,         17,         17,        1,   622080, a7ce423456a59bdb4d5921aff1a27691
+0,         18,         18,        1,   622080, 881c9561c9ab66a7659145173f8e8cda
+0,         19,         19,        1,   622080, 7413961f9accd1d32e116592a6448e9b
+0,         20,         20,        1,   622080, c66409494fd1714e6236596f476cece6

libav-v10.1.tar.bz2/tests/ref/fate/xvid-idctmmx Added

@@ -0,0 +1,21 @@
+#tb 0: 1/25
+0,          1,          1,        1,   622080, 8fe318df973b5d7669e6d28ebf03b229
+0,          2,          2,        1,   622080, 3568d92074e0298a2027f990004fe1a6
+0,          3,          3,        1,   622080, 4781afb6ba38318738e26a98ace4061b
+0,          4,          4,        1,   622080, bd29a005b8392005ef30211f185ca049
+0,          5,          5,        1,   622080, fc50b441ee9256883edba5a584000d66
+0,          6,          6,        1,   622080, 5fce9fb7e66c9d0773ff9c7482cb8307
+0,          7,          7,        1,   622080, 2e0ad7b1ba39e60cdd7a65ed1ed57c30
+0,          8,          8,        1,   622080, b91cfdb91751dabd6691d3c34221b636
+0,          9,          9,        1,   622080, f65507bc00043e8fe345c542f0861a64
+0,         10,         10,        1,   622080, 2e4ee4ea4ec761c2298acced17f63f35
+0,         11,         11,        1,   622080, e7945bd07296205d1549c8edf843af48
+0,         12,         12,        1,   622080, 52fed0ec02c57a138de7dc0e0c804de8
+0,         13,         13,        1,   622080, 3ee2848d0d70795e14765127111a677c
+0,         14,         14,        1,   622080, 42cb0929406b10b95817ffaa2da47335
+0,         15,         15,        1,   622080, 523986866b6cf729e130ea43feacb0a2
+0,         16,         16,        1,   622080, 5d1e4becddf728e93bbcb428de1f02ae
+0,         17,         17,        1,   622080, 0a1453df21e4547447ec8f27a0d4d5ec
+0,         18,         18,        1,   622080, d3495686e769df299b1732326fa3f17e
+0,         19,         19,        1,   622080, 602e9020397b1e82b58b1ff6b9733d21
+0,         20,         20,        1,   622080, 759bd3f739a3b99309efa5c1a697e34d

libav-v9.6.tar.bz2/tests/ref/fate/yop -> libav-v10.1.tar.bz2/tests/ref/fate/yop Changed

libav-v9.6.tar.bz2/tests/ref/lavf/aiff -> libav-v10.1.tar.bz2/tests/ref/lavf/aiff Changed

libav-v9.6.tar.bz2/tests/ref/lavf/alaw -> libav-v10.1.tar.bz2/tests/ref/lavf/alaw Changed

libav-v9.6.tar.bz2/tests/ref/lavf/asf -> libav-v10.1.tar.bz2/tests/ref/lavf/asf Changed

libav-v9.6.tar.bz2/tests/ref/lavf/au -> libav-v10.1.tar.bz2/tests/ref/lavf/au Changed

libav-v9.6.tar.bz2/tests/ref/lavf/avi -> libav-v10.1.tar.bz2/tests/ref/lavf/avi Changed

libav-v9.6.tar.bz2/tests/ref/lavf/bmp -> libav-v10.1.tar.bz2/tests/ref/lavf/bmp Changed

libav-v9.6.tar.bz2/tests/ref/lavf/dpx -> libav-v10.1.tar.bz2/tests/ref/lavf/dpx Changed

libav-v9.6.tar.bz2/tests/ref/lavf/ffm -> libav-v10.1.tar.bz2/tests/ref/lavf/ffm Changed

libav-v9.6.tar.bz2/tests/ref/lavf/gxf -> libav-v10.1.tar.bz2/tests/ref/lavf/gxf Changed

libav-v9.6.tar.bz2/tests/ref/lavf/jpg -> libav-v10.1.tar.bz2/tests/ref/lavf/jpg Changed

libav-v9.6.tar.bz2/tests/ref/lavf/mkv -> libav-v10.1.tar.bz2/tests/ref/lavf/mkv Changed

libav-v9.6.tar.bz2/tests/ref/lavf/mmf -> libav-v10.1.tar.bz2/tests/ref/lavf/mmf Changed

libav-v9.6.tar.bz2/tests/ref/lavf/mov -> libav-v10.1.tar.bz2/tests/ref/lavf/mov Changed

libav-v9.6.tar.bz2/tests/ref/lavf/mpg -> libav-v10.1.tar.bz2/tests/ref/lavf/mpg Changed

libav-v9.6.tar.bz2/tests/ref/lavf/mulaw -> libav-v10.1.tar.bz2/tests/ref/lavf/mulaw Changed

libav-v9.6.tar.bz2/tests/ref/lavf/nut -> libav-v10.1.tar.bz2/tests/ref/lavf/nut Changed

libav-v9.6.tar.bz2/tests/ref/lavf/ogg -> libav-v10.1.tar.bz2/tests/ref/lavf/ogg Changed

libav-v9.6.tar.bz2/tests/ref/lavf/pam -> libav-v10.1.tar.bz2/tests/ref/lavf/pam Changed

libav-v9.6.tar.bz2/tests/ref/lavf/pcx -> libav-v10.1.tar.bz2/tests/ref/lavf/pcx Changed

libav-v9.6.tar.bz2/tests/ref/lavf/pgm -> libav-v10.1.tar.bz2/tests/ref/lavf/pgm Changed

libav-v9.6.tar.bz2/tests/ref/lavf/png -> libav-v10.1.tar.bz2/tests/ref/lavf/png Changed

libav-v9.6.tar.bz2/tests/ref/lavf/ppm -> libav-v10.1.tar.bz2/tests/ref/lavf/ppm Changed

libav-v9.6.tar.bz2/tests/ref/lavf/rm -> libav-v10.1.tar.bz2/tests/ref/lavf/rm Changed

libav-v9.6.tar.bz2/tests/ref/lavf/rso -> libav-v10.1.tar.bz2/tests/ref/lavf/rso Changed

libav-v9.6.tar.bz2/tests/ref/lavf/sgi -> libav-v10.1.tar.bz2/tests/ref/lavf/sgi Changed

libav-v9.6.tar.bz2/tests/ref/lavf/sox -> libav-v10.1.tar.bz2/tests/ref/lavf/sox Changed

libav-v9.6.tar.bz2/tests/ref/lavf/sunrast -> libav-v10.1.tar.bz2/tests/ref/lavf/sunrast Changed

libav-v9.6.tar.bz2/tests/ref/lavf/tga -> libav-v10.1.tar.bz2/tests/ref/lavf/tga Changed

libav-v9.6.tar.bz2/tests/ref/lavf/tiff -> libav-v10.1.tar.bz2/tests/ref/lavf/tiff Changed

libav-v9.6.tar.bz2/tests/ref/lavf/ts -> libav-v10.1.tar.bz2/tests/ref/lavf/ts Changed

libav-v9.6.tar.bz2/tests/ref/lavf/voc -> libav-v10.1.tar.bz2/tests/ref/lavf/voc Changed

libav-v9.6.tar.bz2/tests/ref/lavf/voc_s16 -> libav-v10.1.tar.bz2/tests/ref/lavf/voc_s16 Changed

libav-v9.6.tar.bz2/tests/ref/lavf/wav -> libav-v10.1.tar.bz2/tests/ref/lavf/wav Changed

libav-v9.6.tar.bz2/tests/ref/lavf/xwd -> libav-v10.1.tar.bz2/tests/ref/lavf/xwd Changed

libav-v9.6.tar.bz2/tests/ref/seek/lavf-alaw -> libav-v10.1.tar.bz2/tests/ref/seek/lavf-alaw Changed

libav-v9.6.tar.bz2/tests/ref/seek/lavf-asf -> libav-v10.1.tar.bz2/tests/ref/seek/lavf-asf Changed

@@ -1,53 +1,53 @@
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    575 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size:   208
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 1 flags:1 dts: 0.459000 pts: 0.459000 pos: 147775 size:   209
+ret: 0         st: 1 flags:1 dts: 0.470000 pts: 0.470000 pos: 147775 size:   209
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301375 size:   209
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301375 size:   209
 ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301375 size:   209
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301375 size:   209
 ret: 0         st: 0 flags:1  ts:-0.317000
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    575 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size:   208
 ret: 0         st: 1 flags:0  ts: 2.577000
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330175 size:   209
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330175 size:   209
 ret: 0         st: 1 flags:1  ts: 1.471000
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330175 size:   209
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330175 size:   209
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 1 flags:1 dts: 0.459000 pts: 0.459000 pos: 147775 size:   209
+ret: 0         st: 1 flags:1 dts: 0.470000 pts: 0.470000 pos: 147775 size:   209
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    575 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size:   208
 ret: 0         st: 0 flags:0  ts: 2.153000
-ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301375 size:   209
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301375 size:   209
 ret: 0         st: 0 flags:1  ts: 1.048000
-ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301375 size:   209
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301375 size:   209
 ret: 0         st: 1 flags:0  ts:-0.058000
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    575 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size:   208
 ret: 0         st: 1 flags:1  ts: 2.836000
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330175 size:   209
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330175 size:   209
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301375 size:   209
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301375 size:   209
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 1 flags:1 dts: 0.459000 pts: 0.459000 pos: 147775 size:   209
+ret: 0         st: 1 flags:1 dts: 0.470000 pts: 0.470000 pos: 147775 size:   209
 ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    575 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size:   208
 ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301375 size:   209
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301375 size:   209
 ret: 0         st: 1 flags:0  ts: 1.307000
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330175 size:   209
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330175 size:   209
 ret: 0         st: 1 flags:1  ts: 0.201000
-ret: 0         st: 1 flags:1 dts: 0.198000 pts: 0.198000 pos:  74175 size:   209
+ret: 0         st: 1 flags:1 dts: 0.183000 pts: 0.183000 pos:  70975 size:   209
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    575 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size:   208
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301375 size:   209
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301375 size:   209
 ret: 0         st: 0 flags:0  ts: 0.883000
-ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301375 size:   209
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301375 size:   209
 ret: 0         st: 0 flags:1  ts:-0.222000
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    575 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size:   208
 ret: 0         st: 1 flags:0  ts: 2.672000
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330175 size:   209
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330175 size:   209
 ret: 0         st: 1 flags:1  ts: 1.566000
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330175 size:   209
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330175 size:   209
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 1 flags:1 dts: 0.459000 pts: 0.459000 pos: 147775 size:   209
+ret: 0         st: 1 flags:1 dts: 0.470000 pts: 0.470000 pos: 147775 size:   209
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    575 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    575 size:   208

libav-v9.6.tar.bz2/tests/ref/seek/lavf-mkv -> libav-v10.1.tar.bz2/tests/ref/seek/lavf-mkv Changed

@@ -1,53 +1,53 @@
-ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    512 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    518 size:   208
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    512 size:   208
+ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:    734 size: 27837
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292150 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292156 size: 27834
 ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292150 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292156 size: 27834
 ret: 0         st: 0 flags:1  ts:-0.317000
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    512 size:   208
+ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:    734 size: 27837
 ret: 0         st: 1 flags:0  ts: 2.577000
 ret:-EOF
 ret: 0         st: 1 flags:1  ts: 1.471000
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 319991 size:   209
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 319997 size:   209
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146703 size: 27925
+ret: 0         st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146709 size: 27925
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    512 size:   208
+ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:    734 size: 27837
 ret: 0         st: 0 flags:0  ts: 2.153000
 ret:-EOF
 ret: 0         st: 0 flags:1  ts: 1.048000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292150 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292156 size: 27834
 ret: 0         st: 1 flags:0  ts:-0.058000
-ret: 0         st: 1 flags:1 dts: 0.015000 pts: 0.015000 pos:    512 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    518 size:   208
 ret: 0         st: 1 flags:1  ts: 2.836000
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 319991 size:   209
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 319997 size:   209
 ret: 0         st:-1 flags:0  ts: 1.730004
 ret:-EOF
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146703 size: 27925
+ret: 0         st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146709 size: 27925
 ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    512 size:   208
+ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:    734 size: 27837
 ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292150 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292156 size: 27834
 ret: 0         st: 1 flags:0  ts: 1.307000
 ret:-EOF
 ret: 0         st: 1 flags:1  ts: 0.201000
-ret: 0         st: 1 flags:1 dts: 0.015000 pts: 0.015000 pos:    512 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    518 size:   208
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    512 size:   208
+ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:    734 size: 27837
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292150 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292156 size: 27834
 ret: 0         st: 0 flags:0  ts: 0.883000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292150 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292156 size: 27834
 ret: 0         st: 0 flags:1  ts:-0.222000
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    512 size:   208
+ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:    734 size: 27837
 ret: 0         st: 1 flags:0  ts: 2.672000
 ret:-EOF
 ret: 0         st: 1 flags:1  ts: 1.566000
-ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 319991 size:   209
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 319997 size:   209
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146703 size: 27925
+ret: 0         st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146709 size: 27925
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    512 size:   208
+ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:    734 size: 27837

libav-v9.6.tar.bz2/tests/ref/seek/lavf-mpg -> libav-v10.1.tar.bz2/tests/ref/seek/lavf-mpg Changed

@@ -1,53 +1,53 @@
-ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:0 dts: 1.880000 pts: 1.920000 pos: 327680 size: 12894
+ret: 0         st: 0 flags:0 dts: 1.880000 pts: 1.920000 pos: 315392 size: 12800
 ret: 0         st: 0 flags:0  ts: 0.788333
-ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
 ret: 0         st: 0 flags:1  ts:-0.317500
-ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
 ret: 0         st: 1 flags:0  ts: 2.576667
-ret: 0         st: 1 flags:1 dts: 1.772767 pts: 1.772767 pos: 368652 size:   379
+ret: 0         st: 1 flags:1 dts: 1.812767 pts: 1.812767 pos: 368652 size:   379
 ret: 0         st: 1 flags:1  ts: 1.470833
-ret: 0         st: 1 flags:1 dts: 1.250322 pts: 1.250322 pos: 145408 size:   261
+ret: 0         st: 1 flags:1 dts: 1.290322 pts: 1.290322 pos: 145408 size:   261
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
 ret: 0         st: 0 flags:0  ts: 2.153333
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.960000 pos: 339968 size:   681
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 2.000000 pos: 339968 size:   681
 ret: 0         st: 0 flags:1  ts: 1.047500
-ret: 0         st: 0 flags:0 dts: 1.040000 pts: 1.080000 pos:  40960 size: 16073
+ret: 0         st: 0 flags:0 dts: 1.040000 pts: 1.080000 pos:  26624 size: 16303
 ret: 0         st: 1 flags:0  ts:-0.058333
-ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
 ret: 0         st: 1 flags:1  ts: 2.835833
-ret: 0         st: 1 flags:1 dts: 1.772767 pts: 1.772767 pos: 368652 size:   379
+ret: 0         st: 1 flags:1 dts: 1.812767 pts: 1.812767 pos: 368652 size:   379
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:0 dts: 1.760000 pts: 1.800000 pos: 292864 size: 13170
+ret: 0         st: 0 flags:0 dts: 1.760000 pts: 1.800000 pos: 280588 size: 13050
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
 ret: 0         st: 0 flags:0  ts:-0.481667
-ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
 ret: 0         st: 0 flags:1  ts: 2.412500
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.960000 pos: 339968 size:   681
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 2.000000 pos: 339968 size:   681
 ret: 0         st: 1 flags:0  ts: 1.306667
-ret: 0         st: 1 flags:1 dts: 1.511544 pts: 1.511544 pos: 342028 size:   314
+ret: 0         st: 1 flags:1 dts: 1.551544 pts: 1.551544 pos: 342028 size:   314
 ret: 0         st: 1 flags:1  ts: 0.200844
-ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.960000 pos: 339968 size:   681
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 2.000000 pos: 339968 size:   681
 ret: 0         st: 0 flags:0  ts: 0.883344
-ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
 ret: 0         st: 0 flags:1  ts:-0.222489
-ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
 ret: 0         st: 1 flags:0  ts: 2.671678
-ret: 0         st: 1 flags:1 dts: 1.772767 pts: 1.772767 pos: 368652 size:   379
+ret: 0         st: 1 flags:1 dts: 1.812767 pts: 1.812767 pos: 368652 size:   379
 ret: 0         st: 1 flags:1  ts: 1.565844
-ret: 0         st: 1 flags:1 dts: 1.511544 pts: 1.511544 pos: 342028 size:   314
+ret: 0         st: 1 flags:1 dts: 1.551544 pts: 1.551544 pos: 342028 size:   314
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208

libav-v9.6.tar.bz2/tests/ref/seek/lavf-mulaw -> libav-v10.1.tar.bz2/tests/ref/seek/lavf-mulaw Changed

libav-v9.6.tar.bz2/tests/ref/seek/lavf-mxf -> libav-v10.1.tar.bz2/tests/ref/seek/lavf-mxf Changed

@@ -7,8 +7,8 @@
 ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
 ret: 0         st: 0 flags:1  ts:-0.320000
 ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24801
-ret:-1         st: 1 flags:0  ts: 2.560000
-ret: 0         st: 1 flags:1  ts: 1.480000
+ret:-1         st: 1 flags:0  ts: 2.576667
+ret: 0         st: 1 flags:1  ts: 1.470833
 ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
 ret: 0         st:-1 flags:0  ts: 0.365002
 ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.480000 pos: 211968 size: 24787
@@ -17,9 +17,9 @@
 ret:-1         st: 0 flags:0  ts: 2.160000
 ret: 0         st: 0 flags:1  ts: 1.040000
 ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
-ret: 0         st: 1 flags:0  ts:-0.040000
+ret: 0         st: 1 flags:0  ts:-0.058333
 ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24801
-ret: 0         st: 1 flags:1  ts: 2.840000
+ret: 0         st: 1 flags:1  ts: 2.835833
 ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
 ret:-1         st:-1 flags:0  ts: 1.730004
 ret: 0         st:-1 flags:1  ts: 0.624171
@@ -28,9 +28,9 @@
 ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24801
 ret: 0         st: 0 flags:1  ts: 2.400000
 ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
-ret:-1         st: 1 flags:0  ts: 1.320000
-ret: 0         st: 1 flags:1  ts: 0.200000
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24801
+ret:-1         st: 1 flags:0  ts: 1.306667
+ret: 0         st: 1 flags:1  ts: 0.200833
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
 ret: 0         st:-1 flags:0  ts:-0.904994
 ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24801
 ret: 0         st:-1 flags:1  ts: 1.989173
@@ -39,8 +39,8 @@
 ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
 ret: 0         st: 0 flags:1  ts:-0.240000
 ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24801
-ret:-1         st: 1 flags:0  ts: 2.680000
-ret: 0         st: 1 flags:1  ts: 1.560000
+ret:-1         st: 1 flags:0  ts: 2.671667
+ret: 0         st: 1 flags:1  ts: 1.565833
 ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712
 ret: 0         st:-1 flags:0  ts: 0.460008
 ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24712

libav-v9.6.tar.bz2/tests/ref/seek/lavf-mxf_d10 -> libav-v10.1.tar.bz2/tests/ref/seek/lavf-mxf_d10 Changed

@@ -7,10 +7,10 @@
 ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:4265984 size:150000
 ret: 0         st: 0 flags:1  ts:-0.320000
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:150000
-ret: 0         st: 1 flags:0  ts: 2.560000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000
-ret: 0         st: 1 flags:1  ts: 1.480000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000
+ret: 0         st: 1 flags:0  ts: 2.576667
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:5117952 size:150000
+ret: 0         st: 1 flags:1  ts: 1.470833
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:5117952 size:150000
 ret: 0         st:-1 flags:0  ts: 0.365002
 ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1923072 size:150000
 ret: 0         st:-1 flags:1  ts:-0.740831
@@ -19,10 +19,10 @@
 ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000
 ret: 0         st: 0 flags:1  ts: 1.040000
 ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000
-ret: 0         st: 1 flags:0  ts:-0.040000
+ret: 0         st: 1 flags:0  ts:-0.058333
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:150000
-ret: 0         st: 1 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000
+ret: 0         st: 1 flags:1  ts: 2.835833
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:5117952 size:150000
 ret: 0         st:-1 flags:0  ts: 1.730004
 ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000
 ret: 0         st:-1 flags:1  ts: 0.624171
@@ -31,10 +31,10 @@
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:150000
 ret: 0         st: 0 flags:1  ts: 2.400000
 ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000
-ret: 0         st: 1 flags:0  ts: 1.320000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000
-ret: 0         st: 1 flags:1  ts: 0.200000
-ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:1071104 size:150000
+ret: 0         st: 1 flags:0  ts: 1.306667
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:5117952 size:150000
+ret: 0         st: 1 flags:1  ts: 0.200833
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:5117952 size:150000
 ret: 0         st:-1 flags:0  ts:-0.904994
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:150000
 ret: 0         st:-1 flags:1  ts: 1.989173
@@ -43,10 +43,10 @@
 ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:4691968 size:150000
 ret: 0         st: 0 flags:1  ts:-0.240000
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:150000
-ret: 0         st: 1 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000
-ret: 0         st: 1 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5117952 size:150000
+ret: 0         st: 1 flags:0  ts: 2.671667
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:5117952 size:150000
+ret: 0         st: 1 flags:1  ts: 1.565833
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:5117952 size:150000
 ret: 0         st:-1 flags:0  ts: 0.460008
 ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:2562048 size:150000
 ret: 0         st:-1 flags:1  ts:-0.645825

libav-v9.6.tar.bz2/tests/ref/seek/lavf-ogg -> libav-v10.1.tar.bz2/tests/ref/seek/lavf-ogg Changed

@@ -1,27 +1,44 @@
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    124 size:  1364
-ret:-1         st:-1 flags:0  ts:-1.000000
-ret:-1         st:-1 flags:1  ts: 1.894167
-ret:-1         st: 0 flags:0  ts: 0.788345
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    124 size:  1364
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret:-EOF
+ret: 0         st: 0 flags:0  ts: 0.788345
+ret:-EOF
 ret:-1         st: 0 flags:1  ts:-0.317506
 ret:-1         st:-1 flags:0  ts: 2.576668
-ret:-1         st:-1 flags:1  ts: 1.470835
-ret:-1         st: 0 flags:0  ts: 0.365011
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret:-EOF
+ret: 0         st: 0 flags:0  ts: 0.365011
+ret:-EOF
 ret:-1         st: 0 flags:1  ts:-0.740839
 ret:-1         st:-1 flags:0  ts: 2.153336
-ret:-1         st:-1 flags:1  ts: 1.047503
-ret:-1         st: 0 flags:0  ts:-0.058322
-ret:-1         st: 0 flags:1  ts: 2.835828
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret:-EOF
+ret: 0         st: 0 flags:0  ts:-0.058322
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    124 size:  1364
+ret: 0         st: 0 flags:1  ts: 2.835828
+ret:-EOF
 ret:-1         st:-1 flags:0  ts: 1.730004
-ret:-1         st:-1 flags:1  ts: 0.624171
-ret:-1         st: 0 flags:0  ts:-0.481655
-ret:-1         st: 0 flags:1  ts: 2.412494
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret:-EOF
+ret: 0         st: 0 flags:0  ts:-0.481655
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    124 size:  1364
+ret: 0         st: 0 flags:1  ts: 2.412494
+ret:-EOF
 ret:-1         st:-1 flags:0  ts: 1.306672
-ret:-1         st:-1 flags:1  ts: 0.200839
-ret:-1         st: 0 flags:0  ts:-0.904989
-ret:-1         st: 0 flags:1  ts: 1.989184
-ret:-1         st:-1 flags:0  ts: 0.883340
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret:-EOF
+ret: 0         st: 0 flags:0  ts:-0.904989
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    124 size:  1364
+ret: 0         st: 0 flags:1  ts: 1.989184
+ret:-EOF
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret:-EOF
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.671678
-ret:-1         st: 0 flags:1  ts: 1.565850
-ret:-1         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1  ts: 1.565850
+ret:-EOF
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret:-EOF
 ret:-1         st:-1 flags:1  ts:-0.645825

libav-v9.6.tar.bz2/tests/ref/seek/lavf-ts -> libav-v10.1.tar.bz2/tests/ref/seek/lavf-ts Changed

@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:0 dts: 1.440000 pts: 1.480000 pos:  44932 size: 14502
+ret: 0         st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos:  44932 size: 14502
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 403636 size:   209
+ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:   209
 ret: 0         st: 0 flags:0  ts: 0.788333
-ret: 0         st: 0 flags:0 dts: 1.520000 pts: 1.560000 pos:  74260 size: 13388
+ret: 0         st: 0 flags:0 dts: 1.560000 pts: 1.600000 pos:  74260 size: 13388
 ret: 0         st: 0 flags:1  ts:-0.317500
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st: 1 flags:0  ts: 2.576667
-ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 403636 size:   209
+ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:   209
 ret: 0         st: 1 flags:1  ts: 1.470833
-ret: 0         st: 0 flags:0 dts: 2.160000 pts: 2.200000 pos: 325240 size: 12679
+ret: 0         st: 0 flags:0 dts: 2.120000 pts: 2.160000 pos: 294032 size: 13839
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:0 dts: 1.440000 pts: 1.480000 pos:  44932 size: 14502
+ret: 0         st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos:  44932 size: 14502
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st: 0 flags:0  ts: 2.153333
-ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 403636 size:   209
+ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:   209
 ret: 0         st: 0 flags:1  ts: 1.047500
-ret: 0         st: 0 flags:0 dts: 1.680000 pts: 1.720000 pos: 130096 size: 14133
+ret: 0         st: 0 flags:0 dts: 1.720000 pts: 1.760000 pos: 130096 size: 14133
 ret: 0         st: 1 flags:0  ts:-0.058333
-ret: 0         st: 0 flags:0 dts: 1.440000 pts: 1.480000 pos:  44932 size: 14502
+ret: 0         st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos:  44932 size: 14502
 ret: 0         st: 1 flags:1  ts: 2.835833
-ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 403636 size:   209
+ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:   209
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 403636 size:   209
+ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:   209
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st: 0 flags:0  ts:-0.481667
-ret: 0         st: 0 flags:0 dts: 1.440000 pts: 1.480000 pos:  44932 size: 14502
+ret: 0         st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos:  44932 size: 14502
 ret: 0         st: 0 flags:1  ts: 2.412500
-ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 403636 size:   209
+ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:   209
 ret: 0         st: 1 flags:0  ts: 1.306667
-ret: 0         st: 0 flags:0 dts: 2.080000 pts: 2.120000 pos: 294032 size: 13839
+ret: 0         st: 0 flags:0 dts: 2.040000 pts: 2.080000 pos: 265644 size: 12390
 ret: 0         st: 1 flags:1  ts: 0.200844
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:0 dts: 1.440000 pts: 1.480000 pos:  44932 size: 14502
+ret: 0         st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos:  44932 size: 14502
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 403636 size:   209
+ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:   209
 ret: 0         st: 0 flags:0  ts: 0.883344
-ret: 0         st: 0 flags:0 dts: 1.600000 pts: 1.640000 pos: 102836 size: 12781
+ret: 0         st: 0 flags:0 dts: 1.640000 pts: 1.680000 pos: 102836 size: 12781
 ret: 0         st: 0 flags:1  ts:-0.222489
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st: 1 flags:0  ts: 2.671678
-ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 403636 size:   209
+ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:   209
 ret: 0         st: 1 flags:1  ts: 1.565844
-ret: 0         st: 0 flags:0 dts: 2.240000 pts: 2.280000 pos: 350996 size: 11307
+ret: 0         st: 0 flags:0 dts: 2.200000 pts: 2.240000 pos: 325240 size: 12679
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:0 dts: 1.440000 pts: 1.480000 pos:  44932 size: 14502
+ret: 0         st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos:  44932 size: 14502
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801

libav-v9.6.tar.bz2/tests/ref/seek/vsynth2-ffv1 -> libav-v10.1.tar.bz2/tests/ref/seek/vsynth2-ffv1 Changed

@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 70200
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5688 size: 71679
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 70200
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5688 size: 71679
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2485798 size: 74128
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2498334 size: 75937
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1622704 size: 71128
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1630830 size: 72682
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2485798 size: 74128
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2498334 size: 75937
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 796828 size: 67971
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801262 size: 69457
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1622704 size: 71128
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1630830 size: 72682
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 70200
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5688 size: 71679
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3374428 size: 75606
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3392418 size: 77461
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3374428 size: 75606
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3392418 size: 77461
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 796828 size: 67971
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801262 size: 69457
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 70200
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5688 size: 71679
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3374428 size: 75606
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3392418 size: 77461
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2485798 size: 74128
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2498334 size: 75937
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 70200
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5688 size: 71679
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 70200
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5688 size: 71679
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3374428 size: 75606
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3392418 size: 77461
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1622704 size: 71128
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1630830 size: 72682
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2485798 size: 74128
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2498334 size: 75937
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 796828 size: 67971
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801262 size: 69457
 ret:-1         st:-1 flags:1  ts:-0.645825

libav-v9.6.tar.bz2/tests/ref/seek/vsynth2-wmv2 -> libav-v10.1.tar.bz2/tests/ref/seek/vsynth2-wmv2 Changed

@@ -2,45 +2,45 @@
 ret: 0         st:-1 flags:0  ts:-1.000000
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8917
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83790 size: 11170
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83764 size: 11170
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54572 size:  9989
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54534 size:  9989
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83790 size: 11170
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83764 size: 11170
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29632 size:  8839
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29588 size:  8839
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54572 size:  9989
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54534 size:  9989
 ret: 0         st: 0 flags:0  ts:-0.040000
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8917
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116058 size: 11554
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116062 size: 11554
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116058 size: 11554
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116062 size: 11554
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29632 size:  8839
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29588 size:  8839
 ret: 0         st: 0 flags:0  ts:-0.480000
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8917
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116058 size: 11554
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116062 size: 11554
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83790 size: 11170
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83764 size: 11170
 ret: 0         st:-1 flags:1  ts: 0.200839
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8917
 ret: 0         st: 0 flags:0  ts:-0.920000
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8917
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116058 size: 11554
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116062 size: 11554
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54572 size:  9989
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54534 size:  9989
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83790 size: 11170
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83764 size: 11170
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29632 size:  8839
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29588 size:  8839
 ret:-1         st:-1 flags:1  ts:-0.645825

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth1-dnxhd-1080i -> libav-v10.1.tar.bz2/tests/ref/vsynth/vsynth1-dnxhd-1080i Changed

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth1-ffv1 -> libav-v10.1.tar.bz2/tests/ref/vsynth/vsynth1-ffv1 Changed

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth1-ljpeg -> libav-v10.1.tar.bz2/tests/ref/vsynth/vsynth1-ljpeg Changed

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth1-mpeg4 -> libav-v10.1.tar.bz2/tests/ref/vsynth/vsynth1-mpeg4 Changed

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth1-prores -> libav-v10.1.tar.bz2/tests/ref/vsynth/vsynth1-prores Changed

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth1-qtrle -> libav-v10.1.tar.bz2/tests/ref/vsynth/vsynth1-qtrle Changed

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth1-svq1 -> libav-v10.1.tar.bz2/tests/ref/vsynth/vsynth1-svq1 Changed

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth1-wmv2 -> libav-v10.1.tar.bz2/tests/ref/vsynth/vsynth1-wmv2 Changed

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth2-dnxhd-1080i -> libav-v10.1.tar.bz2/tests/ref/vsynth/vsynth2-dnxhd-1080i Changed

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth2-ffv1 -> libav-v10.1.tar.bz2/tests/ref/vsynth/vsynth2-ffv1 Changed

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth2-ljpeg -> libav-v10.1.tar.bz2/tests/ref/vsynth/vsynth2-ljpeg Changed

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth2-mpeg4 -> libav-v10.1.tar.bz2/tests/ref/vsynth/vsynth2-mpeg4 Changed

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth2-prores -> libav-v10.1.tar.bz2/tests/ref/vsynth/vsynth2-prores Changed

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth2-qtrle -> libav-v10.1.tar.bz2/tests/ref/vsynth/vsynth2-qtrle Changed

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth2-svq1 -> libav-v10.1.tar.bz2/tests/ref/vsynth/vsynth2-svq1 Changed

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth2-wmv2 -> libav-v10.1.tar.bz2/tests/ref/vsynth/vsynth2-wmv2 Changed

libav-v9.6.tar.bz2/tests/tiny_psnr.c -> libav-v10.1.tar.bz2/tests/tiny_psnr.c Changed

@@ -23,8 +23,11 @@
 #include <string.h>
 #include <inttypes.h>
 #include <assert.h>
+#include <math.h>
+#include <float.h>
 
 #include "libavutil/intfloat.h"
+#include "libavutil/intreadwrite.h"
 
 #define FFMIN(a, b) ((a) > (b) ? (b) : (a))
 #define F 100
@@ -107,21 +110,26 @@
 return v.f;
 }
 
+static double get_f64l(uint8_t *p)
+{
+ return av_int2double(AV_RL64(p));
+}
+
 int main(int argc, char *argv[])
 {
 int i, j;
 uint64_t sse = 0;
- uint64_t dev;
+ double sse_d = 0.0;
 FILE *f[2];
 uint8_t buf[2][SIZE];
- uint64_t psnr;
 int len = 1;
 int64_t max;
 int shift = argc < 5 ? 0 : atoi(argv[4]);
 int skip_bytes = argc < 6 ? 0 : atoi(argv[5]);
 int size0 = 0;
 int size1 = 0;
- int maxdist = 0;
+ uint64_t maxdist = 0;
+ double maxdist_d = 0.0;
 
 if (argc < 3) {
 printf("tiny_psnr <file1> <file2> [<elem size> [<shift> [<skip bytes>]]]\n");
@@ -136,6 +144,8 @@
 len = 2;
 } else if (!strcmp(argv[3], "f32")) {
 len = 4;
+ } else if (!strcmp(argv[3], "f64")) {
+ len = 8;
 } else {
 char *end;
 len = strtol(argv[3], &end, 0);
@@ -184,23 +194,42 @@
 int s1 = fread(buf[1], 1, SIZE, f[1]);
 
 for (j = 0; j < FFMIN(s0, s1); j += len) {
- int64_t a = buf[0][j];
- int64_t b = buf[1][j];
- int dist;
- if (len == 2) {
- a = get_s16l(buf[0] + j);
- b = get_s16l(buf[1] + j);
- } else if (len == 4) {
- a = get_f32l(buf[0] + j) * (1 << 24);
- b = get_f32l(buf[1] + j) * (1 << 24);
- } else {
- a = buf[0][j];
- b = buf[1][j];
+ switch (len) {
+ case 1:
+ case 2: {
+ int64_t a = buf[0][j];
+ int64_t b = buf[1][j];
+ int dist;
+ if (len == 2) {
+ a = get_s16l(buf[0] + j);
+ b = get_s16l(buf[1] + j);
+ } else {
+ a = buf[0][j];
+ b = buf[1][j];
+ }
+ sse += (a - b) * (a - b);
+ dist = abs(a - b);
+ if (dist > maxdist)
+ maxdist = dist;
+ break;
+ }
+ case 4:
+ case 8: {
+ double dist, a, b;
+ if (len == 8) {
+ a = get_f64l(buf[0] + j);
+ b = get_f64l(buf[1] + j);
+ } else {
+ a = get_f32l(buf[0] + j);
+ b = get_f32l(buf[1] + j);
+ }
+ dist = fabs(a - b);
+ sse_d += (a - b) * (a - b);
+ if (dist > maxdist_d)
+ maxdist_d = dist;
+ break;
+ }
 }
- sse += (a - b) * (a - b);
- dist = abs(a - b);
- if (dist > maxdist)
- maxdist = dist;
 }
 size0 += s0;
 size1 += s1;
@@ -211,16 +240,41 @@
 i = FFMIN(size0, size1) / len;
 if (!i)
 i = 1;
- dev = int_sqrt(((sse / i) * F * F) + (((sse % i) * F * F) + i / 2) / i);
- if (sse)
- psnr = ((2 * log16(max << 16) + log16(i) - log16(sse)) *
- 284619LL * F + (1LL << 31)) / (1LL << 32);
- else
- psnr = 1000 * F - 1; // floating point free infinity :)
-
- printf("stddev:%5d.%02d PSNR:%3d.%02d MAXDIFF:%5d bytes:%9d/%9d\n",
- (int)(dev / F), (int)(dev % F),
- (int)(psnr / F), (int)(psnr % F),
- maxdist, size0, size1);
+ switch (len) {
+ case 1:
+ case 2: {
+ uint64_t psnr;
+ uint64_t dev = int_sqrt(((sse / i) * F * F) + (((sse % i) * F * F) + i / 2) / i);
+ if (sse)
+ psnr = ((2 * log16(max << 16) + log16(i) - log16(sse)) *
+ 284619LL * F + (1LL << 31)) / (1LL << 32);
+ else
+ psnr = 1000 * F - 1; // floating point free infinity :)
+
+ printf("stddev:%5d.%02d PSNR:%3d.%02d MAXDIFF:%5"PRIu64" bytes:%9d/%9d\n",
+ (int)(dev / F), (int)(dev % F),
+ (int)(psnr / F), (int)(psnr % F),
+ maxdist, size0, size1);
+ break;
+ }
+ case 4:
+ case 8: {
+ char psnr_str[64];
+ double dev = sqrt(sse_d / i);
+ uint64_t scale = (len == 4) ? (1ULL << 24) : (1ULL << 32);
+
+ if (sse_d) {
+ double psnr = 2 * log(DBL_MAX) - log(i / sse_d);
+ snprintf(psnr_str, sizeof(psnr_str), "%5.02f", psnr);
+ } else
+ snprintf(psnr_str, sizeof(psnr_str), "inf");
+
+ maxdist = maxdist_d * scale;
+
+ printf("stddev:%10.2f PSNR:%s MAXDIFF:%10"PRIu64" bytes:%9d/%9d\n",
+ dev * scale, psnr_str, maxdist, size0, size1);
+ break;
+ }
+ }
 return 0;
 }

libav-v9.6.tar.bz2/tools/aviocat.c -> libav-v10.1.tar.bz2/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));

libav-v9.6.tar.bz2/tools/graph2dot.c -> libav-v10.1.tar.bz2/tools/graph2dot.c Changed

@@ -25,10 +25,11 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/mem.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/audioconvert.h"
-#include "libavfilter/avfiltergraph.h"
+#include "libavfilter/avfilter.h"
 
 #if !HAVE_GETOPT
 #include "compat/getopt.c"
@@ -36,7 +37,7 @@
 
 static void usage(void)
 {
- printf("Convert a libavfilter graph to a dot file\n");
+ printf("Convert a libavfilter graph to a dot file.\n");
 printf("Usage: graph2dot [OPTIONS]\n");
 printf("\n"
 "Options:\n"
@@ -58,7 +59,7 @@
 fprintf(outfile, "node [shape=box]\n");
 fprintf(outfile, "rankdir=LR\n");
 
- for (i = 0; i < graph->filter_count; i++) {
+ for (i = 0; i < graph->nb_filters; i++) {
 char filter_ctx_label[128];
 const AVFilterContext *filter_ctx = graph->filters[i];
 
@@ -66,7 +67,7 @@
 filter_ctx->name,
 filter_ctx->filter->name);
 
- for (j = 0; j < filter_ctx->output_count; j++) {
+ for (j = 0; j < filter_ctx->nb_outputs; j++) {
 AVFilterLink *link = filter_ctx->outputs[j];
 if (link) {
 char dst_filter_ctx_label[128];
@@ -133,7 +134,7 @@
 infilename = "/dev/stdin";
 infile = fopen(infilename, "r");
 if (!infile) {
- fprintf(stderr, "Impossible to open input file '%s': %s\n",
+ fprintf(stderr, "Failed to open input file '%s': %s\n",
 infilename, strerror(errno));
 return 1;
 }
@@ -142,7 +143,7 @@
 outfilename = "/dev/stdout";
 outfile = fopen(outfilename, "w");
 if (!outfile) {
- fprintf(stderr, "Impossible to open output file '%s': %s\n",
+ fprintf(stderr, "Failed to open output file '%s': %s\n",
 outfilename, strerror(errno));
 return 1;
 }
@@ -175,7 +176,7 @@
 avfilter_register_all();
 
 if (avfilter_graph_parse(graph, graph_string, NULL, NULL, NULL) < 0) {
- fprintf(stderr, "Impossible to parse the graph description\n");
+ fprintf(stderr, "Failed to parse the graph description\n");
 return 1;
 }

libav-v9.6.tar.bz2/tools/ismindex.c -> libav-v10.1.tar.bz2/tools/ismindex.c Changed

@@ -34,13 +34,9 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <sys/stat.h>
-#ifdef _WIN32
-#include <direct.h>
-#define mkdir(a, b) _mkdir(a)
-#endif
 
 #include "libavformat/avformat.h"
+#include "libavformat/os_support.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
 
@@ -53,10 +49,10 @@
 struct MoofOffset {
 int64_t time;
 int64_t offset;
- int duration;
+ int64_t duration;
 };
 
-struct VideoFile {
+struct Track {
 const char *name;
 int64_t duration;
 int bitrate;
@@ -74,12 +70,12 @@
 int tag;
 };
 
-struct VideoFiles {
- int nb_files;
+struct Tracks {
+ int nb_tracks;
 int64_t duration;
- struct VideoFile **files;
- int video_file, audio_file;
- int nb_video_files, nb_audio_files;
+ struct Track **tracks;
+ int video_track, audio_track;
+ int nb_video_tracks, nb_audio_tracks;
 };
 
 static int copy_tag(AVIOContext *in, AVIOContext *out, int32_t tag_name)
@@ -120,62 +116,62 @@
 return ret;
 }
 
-static int write_fragments(struct VideoFiles *files, int start_index,
+static int write_fragments(struct Tracks *tracks, int start_index,
 AVIOContext *in)
 {
 char dirname[100], filename[500];
 int i, j;
 
- for (i = start_index; i < files->nb_files; i++) {
- struct VideoFile *vf = files->files[i];
- const char *type = vf->is_video ? "video" : "audio";
- snprintf(dirname, sizeof(dirname), "QualityLevels(%d)", vf->bitrate);
+ for (i = start_index; i < tracks->nb_tracks; i++) {
+ struct Track *track = tracks->tracks[i];
+ const char *type = track->is_video ? "video" : "audio";
+ snprintf(dirname, sizeof(dirname), "QualityLevels(%d)", track->bitrate);
 mkdir(dirname, 0777);
- for (j = 0; j < vf->chunks; j++) {
+ for (j = 0; j < track->chunks; j++) {
 snprintf(filename, sizeof(filename), "%s/Fragments(%s=%"PRId64")",
- dirname, type, vf->offsets[j].time);
- avio_seek(in, vf->offsets[j].offset, SEEK_SET);
+ dirname, type, track->offsets[j].time);
+ avio_seek(in, track->offsets[j].offset, SEEK_SET);
 write_fragment(filename, in);
 }
 }
 return 0;
 }
 
-static int read_tfra(struct VideoFiles *files, int start_index, AVIOContext *f)
+static int read_tfra(struct Tracks *tracks, int start_index, AVIOContext *f)
 {
 int ret = AVERROR_EOF, track_id;
 int version, fieldlength, i, j;
 int64_t pos = avio_tell(f);
 uint32_t size = avio_rb32(f);
- struct VideoFile *vf = NULL;
+ struct Track *track = NULL;
 
 if (avio_rb32(f) != MKBETAG('t', 'f', 'r', 'a'))
 goto fail;
 version = avio_r8(f);
 avio_rb24(f);
 track_id = avio_rb32(f); /* track id */
- for (i = start_index; i < files->nb_files && !vf; i++)
- if (files->files[i]->track_id == track_id)
- vf = files->files[i];
- if (!vf) {
+ for (i = start_index; i < tracks->nb_tracks && !track; i++)
+ if (tracks->tracks[i]->track_id == track_id)
+ track = tracks->tracks[i];
+ if (!track) {
 /* Ok, continue parsing the next atom */
 ret = 0;
 goto fail;
 }
 fieldlength = avio_rb32(f);
- vf->chunks = avio_rb32(f);
- vf->offsets = av_mallocz(sizeof(*vf->offsets) * vf->chunks);
- if (!vf->offsets) {
+ track->chunks = avio_rb32(f);
+ track->offsets = av_mallocz(sizeof(*track->offsets) * track->chunks);
+ if (!track->offsets) {
 ret = AVERROR(ENOMEM);
 goto fail;
 }
- for (i = 0; i < vf->chunks; i++) {
+ for (i = 0; i < track->chunks; i++) {
 if (version == 1) {
- vf->offsets[i].time = avio_rb64(f);
- vf->offsets[i].offset = avio_rb64(f);
+ track->offsets[i].time = avio_rb64(f);
+ track->offsets[i].offset = avio_rb64(f);
 } else {
- vf->offsets[i].time = avio_rb32(f);
- vf->offsets[i].offset = avio_rb32(f);
+ track->offsets[i].time = avio_rb32(f);
+ track->offsets[i].offset = avio_rb32(f);
 }
 for (j = 0; j < ((fieldlength >> 4) & 3) + 1; j++)
 avio_r8(f);
@@ -184,12 +180,12 @@
 for (j = 0; j < ((fieldlength >> 0) & 3) + 1; j++)
 avio_r8(f);
 if (i > 0)
- vf->offsets[i - 1].duration = vf->offsets[i].time -
- vf->offsets[i - 1].time;
+ track->offsets[i - 1].duration = track->offsets[i].time -
+ track->offsets[i - 1].time;
 }
- if (vf->chunks > 0)
- vf->offsets[vf->chunks - 1].duration = vf->duration -
- vf->offsets[vf->chunks - 1].time;
+ if (track->chunks > 0)
+ track->offsets[track->chunks - 1].duration = track->duration -
+ track->offsets[track->chunks - 1].time;
 ret = 0;
 
 fail:
@@ -197,7 +193,7 @@
 return ret;
 }
 
-static int read_mfra(struct VideoFiles *files, int start_index,
+static int read_mfra(struct Tracks *tracks, int start_index,
 const char *file, int split)
 {
 int err = 0;
@@ -217,12 +213,12 @@
 err = AVERROR_INVALIDDATA;
 goto fail;
 }
- while (!read_tfra(files, start_index, f)) {
+ while (!read_tfra(tracks, start_index, f)) {
 /* Empty */
 }
 
 if (split)
- write_fragments(files, start_index, f);
+ write_fragments(tracks, start_index, f);
 
 fail:
 if (f)
@@ -232,24 +228,24 @@
 return err;
 }
 
-static int get_private_data(struct VideoFile *vf, AVCodecContext *codec)
+static int get_private_data(struct Track *track, AVCodecContext *codec)
 {
- vf->codec_private_size = codec->extradata_size;
- vf->codec_private = av_mallocz(codec->extradata_size);
- if (!vf->codec_private)
+ track->codec_private_size = codec->extradata_size;
+ track->codec_private = av_mallocz(codec->extradata_size);
+ if (!track->codec_private)
 return AVERROR(ENOMEM);
- memcpy(vf->codec_private, codec->extradata, codec->extradata_size);
+ memcpy(track->codec_private, codec->extradata, codec->extradata_size);
 return 0;
 }
 
-static int get_video_private_data(struct VideoFile *vf, AVCodecContext *codec)
+static int get_video_private_data(struct Track *track, AVCodecContext *codec)
 {
 AVIOContext *io = NULL;
 uint16_t sps_size, pps_size;
 int err = AVERROR(EINVAL);
 
 if (codec->codec_id == AV_CODEC_ID_VC1)
- return get_private_data(vf, codec);
+ return get_private_data(track, codec);
 
 avio_open_dyn_buf(&io);
 if (codec->extradata_size < 11 || codec->extradata[0] != 1)
@@ -267,16 +263,16 @@
 err = 0;
 
 fail:
- vf->codec_private_size = avio_close_dyn_buf(io, &vf->codec_private);
+ track->codec_private_size = avio_close_dyn_buf(io, &track->codec_private);
 return err;
 }
 
-static int handle_file(struct VideoFiles *files, const char *file, int split)
+static int handle_file(struct Tracks *tracks, const char *file, int split)
 {
 AVFormatContext *ctx = NULL;
- int err = 0, i, orig_files = files->nb_files;
+ int err = 0, i, orig_tracks = tracks->nb_tracks;
 char errbuf[50], *ptr;
- struct VideoFile *vf;
+ struct Track *track;
 
 err = avformat_open_input(&ctx, file, NULL, NULL);
 if (err < 0) {
@@ -296,72 +292,84 @@
 fprintf(stderr, "No streams found in %s\n", file);
 goto fail;
 }
- if (!files->duration)
- files->duration = ctx->duration;
 
 for (i = 0; i < ctx->nb_streams; i++) {
+ struct Track **temp;
 AVStream *st = ctx->streams[i];
- vf = av_mallocz(sizeof(*vf));
- files->files = av_realloc(files->files,
- sizeof(*files->files) * (files->nb_files + 1));
- files->files[files->nb_files] = vf;
+ track = av_mallocz(sizeof(*track));
+ if (!track) {
+ err = AVERROR(ENOMEM);
+ goto fail;
+ }
+ temp = av_realloc(tracks->tracks,
+ sizeof(*tracks->tracks) * (tracks->nb_tracks + 1));
+ if (!temp) {
+ av_free(track);
+ err = AVERROR(ENOMEM);
+ goto fail;
+ }
+ tracks->tracks = temp;
+ tracks->tracks[tracks->nb_tracks] = track;
 
- vf->name = file;
+ track->name = file;
 if ((ptr = strrchr(file, '/')) != NULL)
- vf->name = ptr + 1;
+ track->name = ptr + 1;
 
- vf->bitrate = st->codec->bit_rate;
- vf->track_id = st->id;
- vf->timescale = st->time_base.den;
- vf->duration = av_rescale_rnd(ctx->duration, vf->timescale,
- AV_TIME_BASE, AV_ROUND_UP);
- vf->is_audio = st->codec->codec_type == AVMEDIA_TYPE_AUDIO;
- vf->is_video = st->codec->codec_type == AVMEDIA_TYPE_VIDEO;
+ track->bitrate = st->codec->bit_rate;
+ track->track_id = st->id;
+ track->timescale = st->time_base.den;
+ track->duration = st->duration;
+ track->is_audio = st->codec->codec_type == AVMEDIA_TYPE_AUDIO;
+ track->is_video = st->codec->codec_type == AVMEDIA_TYPE_VIDEO;
 
- if (!vf->is_audio && !vf->is_video) {
+ if (!track->is_audio && !track->is_video) {
 fprintf(stderr,
 "Track %d in %s is neither video nor audio, skipping\n",
- vf->track_id, file);
- av_freep(&files->files[files->nb_files]);
+ track->track_id, file);
+ av_freep(&tracks->tracks[tracks->nb_tracks]);
 continue;
 }
 
- if (vf->is_audio) {
- if (files->audio_file < 0)
- files->audio_file = files->nb_files;
- files->nb_audio_files++;
- vf->channels = st->codec->channels;
- vf->sample_rate = st->codec->sample_rate;
+ tracks->duration = FFMAX(tracks->duration,
+ av_rescale_rnd(track->duration, AV_TIME_BASE,
+ track->timescale, AV_ROUND_UP));
+
+ if (track->is_audio) {
+ if (tracks->audio_track < 0)
+ tracks->audio_track = tracks->nb_tracks;
+ tracks->nb_audio_tracks++;
+ track->channels = st->codec->channels;
+ track->sample_rate = st->codec->sample_rate;
 if (st->codec->codec_id == AV_CODEC_ID_AAC) {
- vf->fourcc = "AACL";
- vf->tag = 255;
- vf->blocksize = 4;
+ track->fourcc = "AACL";
+ track->tag = 255;
+ track->blocksize = 4;
 } else if (st->codec->codec_id == AV_CODEC_ID_WMAPRO) {
- vf->fourcc = "WMAP";
- vf->tag = st->codec->codec_tag;
- vf->blocksize = st->codec->block_align;
+ track->fourcc = "WMAP";
+ track->tag = st->codec->codec_tag;
+ track->blocksize = st->codec->block_align;
 }
- get_private_data(vf, st->codec);
+ get_private_data(track, st->codec);
 }
- if (vf->is_video) {
- if (files->video_file < 0)
- files->video_file = files->nb_files;
- files->nb_video_files++;
- vf->width = st->codec->width;
- vf->height = st->codec->height;
+ if (track->is_video) {
+ if (tracks->video_track < 0)
+ tracks->video_track = tracks->nb_tracks;
+ tracks->nb_video_tracks++;
+ track->width = st->codec->width;
+ track->height = st->codec->height;
 if (st->codec->codec_id == AV_CODEC_ID_H264)
- vf->fourcc = "H264";
+ track->fourcc = "H264";
 else if (st->codec->codec_id == AV_CODEC_ID_VC1)
- vf->fourcc = "WVC1";
- get_video_private_data(vf, st->codec);
+ track->fourcc = "WVC1";
+ get_video_private_data(track, st->codec);
 }
 
- files->nb_files++;
+ tracks->nb_tracks++;
 }
 
 avformat_close_input(&ctx);
 
- err = read_mfra(files, orig_files, file, split);
+ err = read_mfra(tracks, orig_tracks, file, split);
 
 fail:
 if (ctx)
@@ -369,7 +377,7 @@
 return err;
 }
 
-static void output_server_manifest(struct VideoFiles *files,
+static void output_server_manifest(struct Tracks *tracks,
 const char *basename)
 {
 char filename[1000];
@@ -390,13 +398,13 @@
 fprintf(out, "\t</head>\n");
 fprintf(out, "\t<body>\n");
 fprintf(out, "\t\t<switch>\n");
- for (i = 0; i < files->nb_files; i++) {
- struct VideoFile *vf = files->files[i];
- const char *type = vf->is_video ? "video" : "audio";
+ for (i = 0; i < tracks->nb_tracks; i++) {
+ struct Track *track = tracks->tracks[i];
+ const char *type = track->is_video ? "video" : "audio";
 fprintf(out, "\t\t\t<%s src=\"%s\" systemBitrate=\"%d\">\n",
- type, vf->name, vf->bitrate);
+ type, track->name, track->bitrate);
 fprintf(out, "\t\t\t\t<param name=\"trackID\" value=\"%d\" "
- "valueType=\"data\" />\n", vf->track_id);
+ "valueType=\"data\" />\n", track->track_id);
 fprintf(out, "\t\t\t</%s>\n", type);
 }
 fprintf(out, "\t\t</switch>\n");
@@ -405,7 +413,24 @@
 fclose(out);
 }
 
-static void output_client_manifest(struct VideoFiles *files,
+static void print_track_chunks(FILE *out, struct Tracks *tracks, int main,
+ const char *type)
+{
+ int i, j;
+ struct Track *track = tracks->tracks[main];
+ for (i = 0; i < track->chunks; i++) {
+ for (j = main + 1; j < tracks->nb_tracks; j++) {
+ if (tracks->tracks[j]->is_audio == track->is_audio &&
+ track->offsets[i].duration != tracks->tracks[j]->offsets[i].duration)
+ fprintf(stderr, "Mismatched duration of %s chunk %d in %s and %s\n",
+ type, i, track->name, tracks->tracks[j]->name);
+ }
+ fprintf(out, "\t\t<c n=\"%d\" d=\"%"PRId64"\" />\n",
+ i, track->offsets[i].duration);
+ }
+}
+
+static void output_client_manifest(struct Tracks *tracks,
 const char *basename, int split)
 {
 char filename[1000];
@@ -423,108 +448,88 @@
 }
 fprintf(out, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
 fprintf(out, "<SmoothStreamingMedia MajorVersion=\"2\" MinorVersion=\"0\" "
- "Duration=\"%"PRId64 "\">\n", files->duration * 10);
- if (files->video_file >= 0) {
- struct VideoFile *vf = files->files[files->video_file];
- struct VideoFile *first_vf = vf;
+ "Duration=\"%"PRId64 "\">\n", tracks->duration * 10);
+ if (tracks->video_track >= 0) {
+ struct Track *track = tracks->tracks[tracks->video_track];
+ struct Track *first_track = track;
 int index = 0;
 fprintf(out,
 "\t<StreamIndex Type=\"video\" QualityLevels=\"%d\" "
 "Chunks=\"%d\" "
 "Url=\"QualityLevels({bitrate})/Fragments(video={start time})\">\n",
- files->nb_video_files, vf->chunks);
- for (i = 0; i < files->nb_files; i++) {
- vf = files->files[i];
- if (!vf->is_video)
+ tracks->nb_video_tracks, track->chunks);
+ for (i = 0; i < tracks->nb_tracks; i++) {
+ track = tracks->tracks[i];
+ if (!track->is_video)
 continue;
 fprintf(out,
 "\t\t<QualityLevel Index=\"%d\" Bitrate=\"%d\" "
 "FourCC=\"%s\" MaxWidth=\"%d\" MaxHeight=\"%d\" "
 "CodecPrivateData=\"",
- index, vf->bitrate, vf->fourcc, vf->width, vf->height);
- for (j = 0; j < vf->codec_private_size; j++)
- fprintf(out, "%02X", vf->codec_private[j]);
+ index, track->bitrate, track->fourcc, track->width, track->height);
+ for (j = 0; j < track->codec_private_size; j++)
+ fprintf(out, "%02X", track->codec_private[j]);
 fprintf(out, "\" />\n");
 index++;
- if (vf->chunks != first_vf->chunks)
+ if (track->chunks != first_track->chunks)
 fprintf(stderr, "Mismatched number of video chunks in %s and %s\n",
- vf->name, first_vf->name);
- }
- vf = first_vf;
- for (i = 0; i < vf->chunks; i++) {
- for (j = files->video_file + 1; j < files->nb_files; j++) {
- if (files->files[j]->is_video &&
- vf->offsets[i].duration != files->files[j]->offsets[i].duration)
- fprintf(stderr, "Mismatched duration of video chunk %d in %s and %s\n",
- i, vf->name, files->files[j]->name);
- }
- fprintf(out, "\t\t<c n=\"%d\" d=\"%d\" />\n", i,
- vf->offsets[i].duration);
+ track->name, first_track->name);
 }
+ print_track_chunks(out, tracks, tracks->video_track, "video");
 fprintf(out, "\t</StreamIndex>\n");
 }
- if (files->audio_file >= 0) {
- struct VideoFile *vf = files->files[files->audio_file];
- struct VideoFile *first_vf = vf;
+ if (tracks->audio_track >= 0) {
+ struct Track *track = tracks->tracks[tracks->audio_track];
+ struct Track *first_track = track;
 int index = 0;
 fprintf(out,
 "\t<StreamIndex Type=\"audio\" QualityLevels=\"%d\" "
 "Chunks=\"%d\" "
 "Url=\"QualityLevels({bitrate})/Fragments(audio={start time})\">\n",
- files->nb_audio_files, vf->chunks);
- for (i = 0; i < files->nb_files; i++) {
- vf = files->files[i];
- if (!vf->is_audio)
+ tracks->nb_audio_tracks, track->chunks);
+ for (i = 0; i < tracks->nb_tracks; i++) {
+ track = tracks->tracks[i];
+ if (!track->is_audio)
 continue;
 fprintf(out,
 "\t\t<QualityLevel Index=\"%d\" Bitrate=\"%d\" "
 "FourCC=\"%s\" SamplingRate=\"%d\" Channels=\"%d\" "
 "BitsPerSample=\"16\" PacketSize=\"%d\" "
 "AudioTag=\"%d\" CodecPrivateData=\"",
- index, vf->bitrate, vf->fourcc, vf->sample_rate,
- vf->channels, vf->blocksize, vf->tag);
- for (j = 0; j < vf->codec_private_size; j++)
- fprintf(out, "%02X", vf->codec_private[j]);
+ index, track->bitrate, track->fourcc, track->sample_rate,
+ track->channels, track->blocksize, track->tag);
+ for (j = 0; j < track->codec_private_size; j++)
+ fprintf(out, "%02X", track->codec_private[j]);
 fprintf(out, "\" />\n");
 index++;
- if (vf->chunks != first_vf->chunks)
+ if (track->chunks != first_track->chunks)
 fprintf(stderr, "Mismatched number of audio chunks in %s and %s\n",
- vf->name, first_vf->name);
- }
- vf = first_vf;
- for (i = 0; i < vf->chunks; i++) {
- for (j = files->audio_file + 1; j < files->nb_files; j++) {
- if (files->files[j]->is_audio &&
- vf->offsets[i].duration != files->files[j]->offsets[i].duration)
- fprintf(stderr, "Mismatched duration of audio chunk %d in %s and %s\n",
- i, vf->name, files->files[j]->name);
- }
- fprintf(out, "\t\t<c n=\"%d\" d=\"%d\" />\n",
- i, vf->offsets[i].duration);
+ track->name, first_track->name);
 }
+ print_track_chunks(out, tracks, tracks->audio_track, "audio");
 fprintf(out, "\t</StreamIndex>\n");
 }
 fprintf(out, "</SmoothStreamingMedia>\n");
 fclose(out);
 }
 
-static void clean_files(struct VideoFiles *files)
+static void clean_tracks(struct Tracks *tracks)
 {
 int i;
- for (i = 0; i < files->nb_files; i++) {
- av_freep(&files->files[i]->codec_private);
- av_freep(&files->files[i]->offsets);
- av_freep(&files->files[i]);
+ for (i = 0; i < tracks->nb_tracks; i++) {
+ av_freep(&tracks->tracks[i]->codec_private);
+ av_freep(&tracks->tracks[i]->offsets);
+ av_freep(&tracks->tracks[i]);
 }
- av_freep(&files->files);
- files->nb_files = 0;
+ av_freep(&tracks->tracks);
+ tracks->nb_tracks = 0;
 }
 
 int main(int argc, char **argv)
 {
 const char *basename = NULL;
 int split = 0, i;
- struct VideoFiles vf = { 0, .video_file = -1, .audio_file = -1 };
+ struct Tracks tracks = { 0, .video_track = -1, .audio_track = -1 };
 
 av_register_all();
 
@@ -537,18 +542,18 @@
 } else if (argv[i][0] == '-') {
 return usage(argv[0], 1);
 } else {
- if (handle_file(&vf, argv[i], split))
+ if (handle_file(&tracks, argv[i], split))
 return 1;
 }
 }
- if (!vf.nb_files || (!basename && !split))
+ if (!tracks.nb_tracks || (!basename && !split))
 return usage(argv[0], 1);
 
 if (!split)
- output_server_manifest(&vf, basename);
- output_client_manifest(&vf, basename, split);
+ output_server_manifest(&tracks, basename);
+ output_client_manifest(&tracks, basename, split);
 
- clean_files(&vf);
+ clean_tracks(&tracks);
 
 return 0;
 }

libav-v9.6.tar.bz2/tools/patcheck -> libav-v10.1.tar.bz2/tools/patcheck Changed

@@ -67,7 +67,7 @@
 cat $TMP
 hiegrep '# *ifdef * (HAVE|CONFIG)_' 'ifdefs that should be #if' $*
 
-hiegrep '\b(awnser|cant|dont|wont|usefull|successfull|occured|teh|alot|wether|skiped|heigth|informations|colums|loosy|loosing|seperate|preceed|upto|paket|posible|unkown|inpossible|dimention|acheive)\b' 'common typos' $*
+hiegrep '\b(awnser|cant|dont|wont|doesnt|usefull|successfull|occured|teh|alot|wether|skiped|heigth|informations|colums|loosy|loosing|seperate|preceed|upto|paket|posible|unkown|inpossible|dimention|acheive)\b' 'common typos' $*
 
 hiegrep 'av_log\( *NULL' 'Missing context in av_log' $*
 hiegrep '[^sn]printf' 'Please use av_log' $*
@@ -173,7 +173,7 @@
 /* and * align
 arrays fitting in smaller types
 variables written to twice with no interspaced read
-memset(block, 0, 6*64*sizeof(DCTELEM)); -> clear_blocks
+memset(block, 0, 6*64*sizeof(int16_t)); -> clear_blocks
 check existence of long_name in AVCodec
 check that the patch does not touch codec & (de)muxer layer at the same time ->split

libav-v9.6.tar.bz2/tools/pktdumper.c -> libav-v10.1.tar.bz2/tools/pktdumper.c Changed

@@ -31,18 +31,18 @@
 #include <io.h>
 #endif
 
-#define FILENAME_BUF_SIZE 4096
-
 #include "libavutil/avstring.h"
 #include "libavutil/time.h"
 #include "libavformat/avformat.h"
 
+#define FILENAME_BUF_SIZE 4096
 #define PKTFILESUFF "_%08" PRId64 "_%02d_%010" PRId64 "_%06d_%c.bin"
 
 static int usage(int ret)
 {
- fprintf(stderr, "dump (up to maxpkts) AVPackets as they are demuxed by libavformat.\n");
- fprintf(stderr, "each packet is dumped in its own file named like `basename file.ext`_$PKTNUM_$STREAMINDEX_$STAMP_$SIZE_$FLAGS.bin\n");
+ fprintf(stderr, "Dump (up to maxpkts) AVPackets as they are demuxed by libavformat.\n");
+ fprintf(stderr, "Each packet is dumped in its own file named like\n");
+ fprintf(stderr, "$(basename file.ext)_$PKTNUM_$STREAMINDEX_$STAMP_$SIZE_$FLAGS.bin\n");
 fprintf(stderr, "pktdumper [-nw] file [maxpkts]\n");
 fprintf(stderr, "-n\twrite No file at all, only demux.\n");
 fprintf(stderr, "-w\tWait at end of processing instead of quitting.\n");
@@ -79,7 +79,7 @@
 if (strrchr(fntemplate, '.'))
 *strrchr(fntemplate, '.') = '\0';
 if (strchr(fntemplate, '%')) {
- fprintf(stderr, "can't use filenames containing '%%'\n");
+ fprintf(stderr, "cannot use filenames containing '%%'\n");
 return usage(1);
 }
 if (strlen(fntemplate) + sizeof(PKTFILESUFF) >= sizeof(fntemplate) - 1) {

libav-v9.6.tar.bz2/tools/qt-faststart.c -> libav-v10.1.tar.bz2/tools/qt-faststart.c Changed

@@ -37,12 +37,14 @@
 #define ftello(x) _ftelli64(x)
 #endif
 
+#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) | \
@@ -77,7 +79,7 @@
 #define CO64_ATOM QT_ATOM('c', 'o', '6', '4')
 
 #define ATOM_PREAMBLE_SIZE 8
-#define COPY_BUFFER_SIZE 1024
+#define COPY_BUFFER_SIZE 65536
 
 int main(int argc, char *argv[])
 {
@@ -87,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;
@@ -95,12 +97,13 @@
 uint64_t i, j;
 uint32_t offset_count;
 uint64_t current_offset;
- uint64_t start_offset = 0;
+ int64_t start_offset = 0;
 unsigned char copy_buffer[COPY_BUFFER_SIZE];
 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 avconv\n");
 return 0;
 }
 
@@ -121,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 */
@@ -134,22 +137,27 @@
 atom_size);
 goto error_out;
 }
- fseeko(infile, -ATOM_PREAMBLE_SIZE, SEEK_CUR);
- if (fread(ftyp_atom, atom_size, 1, infile) != 1) {
+ 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;
 }
- start_offset = ftello(infile);
 } else {
+ int ret;
 /* 64-bit special case */
 if (atom_size == 1) {
 if (fread(atom_bytes, ATOM_PREAMBLE_SIZE, 1, infile) != 1) {
 break;
 }
 atom_size = BE_64(&atom_bytes[0]);
- fseeko(infile, atom_size - ATOM_PREAMBLE_SIZE * 2, SEEK_CUR);
+ ret = fseeko(infile, atom_size - ATOM_PREAMBLE_SIZE * 2, SEEK_CUR);
 } else {
- fseeko(infile, atom_size - ATOM_PREAMBLE_SIZE, SEEK_CUR);
+ ret = fseeko(infile, atom_size - ATOM_PREAMBLE_SIZE, SEEK_CUR);
+ }
+ if (ret) {
+ perror(argv[1]);
+ goto error_out;
 }
 }
 printf("%c%c%c%c %10"PRIu64" %"PRIu64"\n",
@@ -190,8 +198,15 @@
 
 /* moov atom was, in fact, the last atom in the chunk; load the whole
 * moov atom */
- fseeko(infile, -atom_size, SEEK_END);
+ if (fseeko(infile, -atom_size, SEEK_END)) {
+ perror(argv[1]);
+ 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) {
@@ -225,6 +240,10 @@
 goto error_out;
 }
 offset_count = BE_32(&moov_atom[i + 8]);
+ 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 = BE_32(&moov_atom[i + 12 + j * 4]);
 current_offset += moov_atom_size;
@@ -242,6 +261,10 @@
 goto error_out;
 }
 offset_count = BE_32(&moov_atom[i + 8]);
+ 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++) {
 current_offset = BE_64(&moov_atom[i + 12 + j * 8]);
 current_offset += moov_atom_size;
@@ -266,7 +289,11 @@
 }
 
 if (start_offset > 0) { /* seek after ftyp atom */
- fseeko(infile, start_offset, SEEK_SET);
+ if (fseeko(infile, start_offset, SEEK_SET)) {
+ perror(argv[1]);
+ goto error_out;
+ }
+
 last_offset -= start_offset;
 }
 
@@ -295,10 +322,7 @@
 /* copy the remainder of the infile, from offset 0 -> last_offset - 1 */
 printf(" copying rest of file...\n");
 while (last_offset) {
- if (last_offset > COPY_BUFFER_SIZE)
- bytes_to_copy = COPY_BUFFER_SIZE;
- else
- bytes_to_copy = last_offset;
+ bytes_to_copy = MIN(COPY_BUFFER_SIZE, last_offset);
 
 if (fread(copy_buffer, bytes_to_copy, 1, infile) != 1) {
 perror(argv[1]);

libav-v9.6.tar.bz2/doc/snow.txt Deleted

@@ -1,630 +0,0 @@
-=============================================
-Snow Video Codec Specification Draft 20080110
-=============================================
-
-Introduction:
-=============
-This specification describes the Snow bitstream syntax and semantics as
-well as the formal Snow decoding process.
-
-The decoding process is described precisely and any compliant decoder
-MUST produce the exact same output for a spec-conformant Snow stream.
-For encoding, though, any process which generates a stream compliant to
-the syntactical and semantic requirements and which is decodable by
-the process described in this spec shall be considered a conformant
-Snow encoder.
-
-Definitions:
-============
-
-MUST the specific part must be done to conform to this standard
-SHOULD it is recommended to be done that way, but not strictly required
-
-ilog2(x) is the rounded down logarithm of x with basis 2
-ilog2(0) = 0
-
-Type definitions:
-=================
-
-b 1-bit range coded
-u unsigned scalar value range coded
-s signed scalar value range coded
-
-
-Bitstream syntax:
-=================
-
-frame:
- header
- prediction
- residual
-
-header:
- keyframe b MID_STATE
- if(keyframe || always_reset)
- reset_contexts
- if(keyframe){
- version u header_state
- always_reset b header_state
- temporal_decomposition_type u header_state
- temporal_decomposition_count u header_state
- spatial_decomposition_count u header_state
- colorspace_type u header_state
- chroma_h_shift u header_state
- chroma_v_shift u header_state
- spatial_scalability b header_state
- max_ref_frames-1 u header_state
- qlogs
- }
- if(!keyframe){
- update_mc b header_state
- if(update_mc){
- for(plane=0; plane<2; plane++){
- diag_mc b header_state
- htaps/2-1 u header_state
- for(i= p->htaps/2; i; i--)
- |hcoeff[i]| u header_state
- }
- }
- update_qlogs b header_state
- if(update_qlogs){
- spatial_decomposition_count u header_state
- qlogs
- }
- }
-
- spatial_decomposition_type s header_state
- qlog s header_state
- mv_scale s header_state
- qbias s header_state
- block_max_depth s header_state
-
-qlogs:
- for(plane=0; plane<2; plane++){
- quant_table[plane][0][0] s header_state
- for(level=0; level < spatial_decomposition_count; level++){
- quant_table[plane][level][1]s header_state
- quant_table[plane][level][3]s header_state
- }
- }
-
-reset_contexts
- *_state[*]= MID_STATE
-
-prediction:
- for(y=0; y<block_count_vertical; y++)
- for(x=0; x<block_count_horizontal; x++)
- block(0)
-
-block(level):
- mvx_diff=mvy_diff=y_diff=cb_diff=cr_diff=0
- if(keyframe){
- intra=1
- }else{
- if(level!=max_block_depth){
- s_context= 2*left->level + 2*top->level + topleft->level + topright->level
- leaf b block_state[4 + s_context]
- }
- if(level==max_block_depth || leaf){
- intra b block_state[1 + left->intra + top->intra]
- if(intra){
- y_diff s block_state[32]
- cb_diff s block_state[64]
- cr_diff s block_state[96]
- }else{
- ref_context= ilog2(2*left->ref) + ilog2(2*top->ref)
- if(ref_frames > 1)
- ref u block_state[128 + 1024 + 32*ref_context]
- mx_context= ilog2(2*abs(left->mx - top->mx))
- my_context= ilog2(2*abs(left->my - top->my))
- mvx_diff s block_state[128 + 32*(mx_context + 16*!!ref)]
- mvy_diff s block_state[128 + 32*(my_context + 16*!!ref)]
- }
- }else{
- block(level+1)
- block(level+1)
- block(level+1)
- block(level+1)
- }
- }
-
-
-residual:
- residual2(luma)
- residual2(chroma_cr)
- residual2(chroma_cb)
-
-residual2:
- for(level=0; level<spatial_decomposition_count; level++){
- if(level==0)
- subband(LL, 0)
- subband(HL, level)
- subband(LH, level)
- subband(HH, level)
- }
-
-subband:
- FIXME
-
-
-
-Tag description:
-----------------
-
-version
- 0
- this MUST NOT change within a bitstream
-
-always_reset
- if 1 then the range coder contexts will be reset after each frame
-
-temporal_decomposition_type
- 0
-
-temporal_decomposition_count
- 0
-
-spatial_decomposition_count
- FIXME
-
-colorspace_type
- 0
- this MUST NOT change within a bitstream
-
-chroma_h_shift
- log2(luma.width / chroma.width)
- this MUST NOT change within a bitstream
-
-chroma_v_shift
- log2(luma.height / chroma.height)
- this MUST NOT change within a bitstream
-
-spatial_scalability
- 0
-
-max_ref_frames
- maximum number of reference frames
- this MUST NOT change within a bitstream
-
-update_mc
- indicates that motion compensation filter parameters are stored in the
- header
-
-diag_mc
- flag to enable faster diagonal interpolation
- this SHOULD be 1 unless it turns out to be covered by a valid patent
-
-htaps
- number of half pel interpolation filter taps, MUST be even, >0 and <10
-
-hcoeff
- half pel interpolation filter coefficients, hcoeff[0] are the 2 middle
- coefficients [1] are the next outer ones and so on, resulting in a filter
- like: ...eff[2], hcoeff[1], hcoeff[0], hcoeff[0], hcoeff[1], hcoeff[2] ...
- the sign of the coefficients is not explicitly stored but alternates
- after each coeff and coeff[0] is positive, so ...,+,-,+,-,+,+,-,+,-,+,...
- hcoeff[0] is not explicitly stored but found by subtracting the sum
- of all stored coefficients with signs from 32
- hcoeff[0]= 32 - hcoeff[1] - hcoeff[2] - ...
- a good choice for hcoeff and htaps is
- htaps= 6
- hcoeff={40,-10,2}
- an alternative which requires more computations at both encoder and
- decoder side and may or may not be better is
- htaps= 8
- hcoeff={42,-14,6,-2}
-
-
-ref_frames
- minimum of the number of available reference frames and max_ref_frames
- for example the first frame after a key frame always has ref_frames=1
-
-spatial_decomposition_type
- wavelet type
- 0 is a 9/7 symmetric compact integer wavelet
- 1 is a 5/3 symmetric compact integer wavelet
- others are reserved
- stored as delta from last, last is reset to 0 if always_reset || keyframe
-
-qlog
- quality (logarthmic quantizer scale)
- stored as delta from last, last is reset to 0 if always_reset || keyframe
-
-mv_scale
- stored as delta from last, last is reset to 0 if always_reset || keyframe
- FIXME check that everything works fine if this changes between frames
-
-qbias
- dequantization bias
- stored as delta from last, last is reset to 0 if always_reset || keyframe
-
-block_max_depth
- maximum depth of the block tree
- stored as delta from last, last is reset to 0 if always_reset || keyframe
-
-quant_table
- quantiztation table
-
-
-Highlevel bitstream structure:
-=============================
- --------------------------------------------
-| Header |
- --------------------------------------------
-| ------------------------------------ |
-| | Block0 | |
-| | split? | |
-| | yes no | |
-| | ......... intra? | |
-| | : Block01 : yes no | |
-| | : Block02 : ....... .......... | |
-| | : Block03 : : y DC : : ref index: | |
-| | : Block04 : : cb DC : : motion x : | |
-| | ......... : cr DC : : motion y : | |
-| | ....... .......... | |
-| ------------------------------------ |
-| ------------------------------------ |
-| | Block1 | |
-| ... |
- --------------------------------------------
-| ------------ ------------ ------------ |
-|| Y subbands | | Cb subbands| | Cr subbands||
-|| --- --- | | --- --- | | --- --- ||
-|| |LL0||HL0| | | |LL0||HL0| | | |LL0||HL0| ||
-|| --- --- | | --- --- | | --- --- ||
-|| --- --- | | --- --- | | --- --- ||
-|| |LH0||HH0| | | |LH0||HH0| | | |LH0||HH0| ||
-|| --- --- | | --- --- | | --- --- ||
-|| --- --- | | --- --- | | --- --- ||
-|| |HL1||LH1| | | |HL1||LH1| | | |HL1||LH1| ||
-|| --- --- | | --- --- | | --- --- ||
-|| --- --- | | --- --- | | --- --- ||
-|| |HH1||HL2| | | |HH1||HL2| | | |HH1||HL2| ||
-|| ... | | ... | | ... ||
-| ------------ ------------ ------------ |
- --------------------------------------------
-
-Decoding process:
-=================
-
- ------------
- | |
- | Subbands |
- ------------ | |
- | | ------------
- | Intra DC | |
- | | LL0 subband prediction
- ------------ |
- \ Dequantizaton
- ------------------- \ |
-| Reference frames | \ IDWT
-| ------- ------- | Motion \ |
-||Frame 0| |Frame 1|| Compensation . OBMC v -------
-| ------- ------- | --------------. \------> + --->|Frame n|-->output
-| ------- ------- | -------
-||Frame 2| |Frame 3||<----------------------------------/
-| ... |
- -------------------
-
-
-Range Coder:
-============
-
-Binary Range Coder:
--------------------
-The implemented range coder is an adapted version based upon "Range encoding:
-an algorithm for removing redundancy from a digitised message." by G. N. N.
-Martin.
-The symbols encoded by the Snow range coder are bits (0|1). The
-associated probabilities are not fix but change depending on the symbol mix
-seen so far.
-
-
-bit seen | new state
----------+-----------------------------------------------
- 0 | 256 - state_transition_table[256 - old_state];
- 1 | state_transition_table[ old_state];
-
-state_transition_table = {
- 0, 0, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 75, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
- 89, 90, 91, 92, 93, 94, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
-104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 114, 115, 116, 117, 118,
-119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 133,
-134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
-150, 151, 152, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
-165, 166, 167, 168, 169, 170, 171, 171, 172, 173, 174, 175, 176, 177, 178, 179,
-180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 190, 191, 192, 194, 194,
-195, 196, 197, 198, 199, 200, 201, 202, 202, 204, 205, 206, 207, 208, 209, 209,
-210, 211, 212, 213, 215, 215, 216, 217, 218, 219, 220, 220, 222, 223, 224, 225,
-226, 227, 227, 229, 229, 230, 231, 232, 234, 234, 235, 236, 237, 238, 239, 240,
-241, 242, 243, 244, 245, 246, 247, 248, 248, 0, 0, 0, 0, 0, 0, 0};
-
-FIXME
-
-
-Range Coding of integers:
--------------------------
-FIXME
-
-
-Neighboring Blocks:
-===================
-left and top are set to the respective blocks unless they are outside of
-the image in which case they are set to the Null block
-
-top-left is set to the top left block unless it is outside of the image in
-which case it is set to the left block
-
-if this block has no larger parent block or it is at the left side of its
-parent block and the top right block is not outside of the image then the
-top right block is used for top-right else the top-left block is used
-
-Null block
-y,cb,cr are 128
-level, ref, mx and my are 0
-
-
-Motion Vector Prediction:
-=========================
-1. the motion vectors of all the neighboring blocks are scaled to
-compensate for the difference of reference frames
-
-scaled_mv= (mv * (256 * (current_reference+1) / (mv.reference+1)) + 128)>>8
-
-2. the median of the scaled left, top and top-right vectors is used as
-motion vector prediction
-
-3. the used motion vector is the sum of the predictor and
- (mvx_diff, mvy_diff)*mv_scale
-
-
-Intra DC Predicton:
-======================
-the luma and chroma values of the left block are used as predictors
-
-the used luma and chroma is the sum of the predictor and y_diff, cb_diff, cr_diff
-to reverse this in the decoder apply the following:
-block[y][x].dc[0] = block[y][x-1].dc[0] + y_diff;
-block[y][x].dc[1] = block[y][x-1].dc[1] + cb_diff;
-block[y][x].dc[2] = block[y][x-1].dc[2] + cr_diff;
-block[*][-1].dc[*]= 128;
-
-
-Motion Compensation:
-====================
-
-Halfpel interpolation:
-----------------------
-halfpel interpolation is done by convolution with the halfpel filter stored
-in the header:
-
-horizontal halfpel samples are found by
-H1[y][x] = hcoeff[0]*(F[y][x ] + F[y][x+1])
- + hcoeff[1]*(F[y][x-1] + F[y][x+2])
- + hcoeff[2]*(F[y][x-2] + F[y][x+3])
- + ...
-h1[y][x] = (H1[y][x] + 32)>>6;
-
-vertical halfpel samples are found by
-H2[y][x] = hcoeff[0]*(F[y ][x] + F[y+1][x])
- + hcoeff[1]*(F[y-1][x] + F[y+2][x])
- + ...
-h2[y][x] = (H2[y][x] + 32)>>6;
-
-vertical+horizontal halfpel samples are found by
-H3[y][x] = hcoeff[0]*(H2[y][x ] + H2[y][x+1])
- + hcoeff[1]*(H2[y][x-1] + H2[y][x+2])
- + ...
-H3[y][x] = hcoeff[0]*(H1[y ][x] + H1[y+1][x])
- + hcoeff[1]*(H1[y+1][x] + H1[y+2][x])
- + ...
-h3[y][x] = (H3[y][x] + 2048)>>12;
-
-
- F H1 F
- | | |
- | | |
- | | |
- F H1 F
- | | |
- | | |
- | | |
- F-------F-------F-> H1<-F-------F-------F
- v v v
- H2 H3 H2
- ^ ^ ^
- F-------F-------F-> H1<-F-------F-------F
- | | |
- | | |
- | | |
- F H1 F
- | | |
- | | |
- | | |
- F H1 F
-
-
-unavailable fullpel samples (outside the picture for example) shall be equal
-to the closest available fullpel sample
-
-
-Smaller pel interpolation:
---------------------------
-if diag_mc is set then points which lie on a line between 2 vertically,
-horiziontally or diagonally adjacent halfpel points shall be interpolated
-linearls with rounding to nearest and halfway values rounded up.
-points which lie on 2 diagonals at the same time should only use the one
-diagonal not containing the fullpel point
-
-
-
- F-->O---q---O<--h1->O---q---O<--F
- v \ / v \ / v
- O O O O O O O
- | / | \ |
- q q q q q
- | / | \ |
- O O O O O O O
- ^ / \ ^ / \ ^
- h2-->O---q---O<--h3->O---q---O<--h2
- v \ / v \ / v
- O O O O O O O
- | \ | / |
- q q q q q
- | \ | / |
- O O O O O O O
- ^ / \ ^ / \ ^
- F-->O---q---O<--h1->O---q---O<--F
-
-
-
-the remaining points shall be bilinearly interpolated from the
-up to 4 surrounding halfpel and fullpel points, again rounding should be to
-nearest and halfway values rounded up
-
-compliant Snow decoders MUST support 1-1/8 pel luma and 1/2-1/16 pel chroma
-interpolation at least
-
-
-Overlapped block motion compensation:
--------------------------------------
-FIXME
-
-LL band prediction:
-===================
-Each sample in the LL0 subband is predicted by the median of the left, top and
-left+top-topleft samples, samples outside the subband shall be considered to
-be 0. To reverse this prediction in the decoder apply the following.
-for(y=0; y<height; y++){
- for(x=0; x<width; x++){
- sample[y][x] += median(sample[y-1][x],
- sample[y][x-1],
- sample[y-1][x]+sample[y][x-1]-sample[y-1][x-1]);
- }
-}
-sample[-1][*]=sample[*][-1]= 0;
-width,height here are the width and height of the LL0 subband not of the final
-video
-
-
-Dequantizaton:
-==============
-FIXME
-
-Wavelet Transform:
-==================
-
-Snow supports 2 wavelet transforms, the symmetric biorthogonal 5/3 integer
-transform and a integer approximation of the symmetric biorthogonal 9/7
-daubechies wavelet.
-
-2D IDWT (inverse discrete wavelet transform)
---------------------------------------------
-The 2D IDWT applies a 2D filter recursively, each time combining the
-4 lowest frequency subbands into a single subband until only 1 subband
-remains.
-The 2D filter is done by first applying a 1D filter in the vertical direction
-and then applying it in the horizontal one.
- --------------- --------------- --------------- ---------------
-|LL0|HL0| | | | | | | | | | | |
-|---+---| HL1 | | L0|H0 | HL1 | | LL1 | HL1 | | | |
-|LH0|HH0| | | | | | | | | | | |
-|-------+-------|->|-------+-------|->|-------+-------|->| L1 | H1 |->...
-| | | | | | | | | | | |
-| LH1 | HH1 | | LH1 | HH1 | | LH1 | HH1 | | | |
-| | | | | | | | | | | |
- --------------- --------------- --------------- ---------------
-
-
-1D Filter:
-----------
-1. interleave the samples of the low and high frequency subbands like
-s={L0, H0, L1, H1, L2, H2, L3, H3, ... }
-note, this can end with a L or a H, the number of elements shall be w
-s[-1] shall be considered equivalent to s[1 ]
-s[w ] shall be considered equivalent to s[w-2]
-
-2. perform the lifting steps in order as described below
-
-5/3 Integer filter:
-1. s[i] -= (s[i-1] + s[i+1] + 2)>>2; for all even i < w
-2. s[i] += (s[i-1] + s[i+1] )>>1; for all odd i < w
-
-\ | /|\ | /|\ | /|\ | /|\
- \|/ | \|/ | \|/ | \|/ |
- + | + | + | + | -1/4
- /|\ | /|\ | /|\ | /|\ |
-/ | \|/ | \|/ | \|/ | \|/
- | + | + | + | + +1/2
-
-
-Snow's 9/7 Integer filter:
-1. s[i] -= (3*(s[i-1] + s[i+1]) + 4)>>3; for all even i < w
-2. s[i] -= s[i-1] + s[i+1] ; for all odd i < w
-3. s[i] += ( s[i-1] + s[i+1] + 4*s[i] + 8)>>4; for all even i < w
-4. s[i] += (3*(s[i-1] + s[i+1]) )>>1; for all odd i < w
-
-\ | /|\ | /|\ | /|\ | /|\
- \|/ | \|/ | \|/ | \|/ |
- + | + | + | + | -3/8
- /|\ | /|\ | /|\ | /|\ |
-/ | \|/ | \|/ | \|/ | \|/
- (| + (| + (| + (| + -1
-\ + /|\ + /|\ + /|\ + /|\ +1/4
- \|/ | \|/ | \|/ | \|/ |
- + | + | + | + | +1/16
- /|\ | /|\ | /|\ | /|\ |
-/ | \|/ | \|/ | \|/ | \|/
- | + | + | + | + +3/2
-
-optimization tips:
-following are exactly identical
-(3a)>>1 == a + (a>>1)
-(a + 4b + 8)>>4 == ((a>>2) + b + 2)>>2
-
-16bit implementation note:
-The IDWT can be implemented with 16bits, but this requires some care to
-prevent overflows, the following list, lists the minimum number of bits needed
-for some terms
-1. lifting step
-A= s[i-1] + s[i+1] 16bit
-3*A + 4 18bit
-A + (A>>1) + 2 17bit
-
-3. lifting step
-s[i-1] + s[i+1] 17bit
-
-4. lifiting step
-3*(s[i-1] + s[i+1]) 17bit
-
-
-TODO:
-=====
-Important:
-finetune initial contexts
-flip wavelet?
-try to use the wavelet transformed predicted image (motion compensated image) as context for coding the residual coefficients
-try the MV length as context for coding the residual coefficients
-use extradata for stuff which is in the keyframes now?
-the MV median predictor is patented IIRC
-implement per picture halfpel interpolation
-try different range coder state transition tables for different contexts
-
-Not Important:
-compare the 6 tap and 8 tap hpel filters (psnr/bitrate and subjective quality)
-spatial_scalability b vs u (!= 0 breaks syntax anyway so we can add a u later)
-
-
-Credits:
-========
-Michael Niedermayer
-Loren Merritt
-
-
-Copyright:
-==========
-GPL + GFDL + whatever is needed to make this a RFC

libav-v9.6.tar.bz2/libavcodec/aacpsy.h Deleted

@@ -1,50 +0,0 @@
-/*
- * AAC encoder psychoacoustic model
- * Copyright (C) 2008 Konstantin Shishkov
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_AACPSY_H
-#define AVCODEC_AACPSY_H
-
-#include "avcodec.h"
-#include "aac.h"
-//#include "lowpass.h"
-
-enum AACPsyModelType{
- AAC_PSY_TEST, ///< a sample model to exercise encoder
- AAC_PSY_3GPP, ///< model following recommendations from 3GPP TS 26.403
-
- AAC_NB_PSY_MODELS ///< total number of psychoacoustic models, since it's not a part of the ABI new models can be added freely
-};
-
-/**
- * context used by psychoacoustic model
- */
-typedef struct AACPsyContext {
- AVCodecContext *avctx; ///< encoder context
-}AACPsyContext;
-
-/**
- * Cleanup model context at the end.
- *
- * @param ctx model context
- */
-void ff_aac_psy_end(AACPsyContext *ctx);
-
-#endif /* AVCODEC_AACPSY_H */

libav-v9.6.tar.bz2/libavcodec/alpha Deleted

libav-v9.6.tar.bz2/libavcodec/alpha/Makefile Deleted

libav-v9.6.tar.bz2/libavcodec/alpha/asm.h Deleted

@@ -1,186 +0,0 @@
-/*
- * Alpha optimized DSP utils
- * Copyright (c) 2002 Falk Hueffner <falk@debian.org>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_ALPHA_ASM_H
-#define AVCODEC_ALPHA_ASM_H
-
-#include <inttypes.h>
-
-#include "libavutil/common.h"
-
-#if AV_GCC_VERSION_AT_LEAST(2,96)
-# define likely(x) __builtin_expect((x) != 0, 1)
-# define unlikely(x) __builtin_expect((x) != 0, 0)
-#else
-# define likely(x) (x)
-# define unlikely(x) (x)
-#endif
-
-#define AMASK_BWX (1 << 0)
-#define AMASK_FIX (1 << 1)
-#define AMASK_CIX (1 << 2)
-#define AMASK_MVI (1 << 8)
-
-static inline uint64_t BYTE_VEC(uint64_t x)
-{
- x |= x << 8;
- x |= x << 16;
- x |= x << 32;
- return x;
-}
-static inline uint64_t WORD_VEC(uint64_t x)
-{
- x |= x << 16;
- x |= x << 32;
- return x;
-}
-
-#define sextw(x) ((int16_t) (x))
-
-#ifdef __GNUC__
-#define ldq(p) \
- (((const union { \
- uint64_t __l; \
- __typeof__(*(p)) __s[sizeof (uint64_t) / sizeof *(p)]; \
- } *) (p))->__l)
-#define ldl(p) \
- (((const union { \
- int32_t __l; \
- __typeof__(*(p)) __s[sizeof (int32_t) / sizeof *(p)]; \
- } *) (p))->__l)
-#define stq(l, p) \
- do { \
- (((union { \
- uint64_t __l; \
- __typeof__(*(p)) __s[sizeof (uint64_t) / sizeof *(p)]; \
- } *) (p))->__l) = l; \
- } while (0)
-#define stl(l, p) \
- do { \
- (((union { \
- int32_t __l; \
- __typeof__(*(p)) __s[sizeof (int32_t) / sizeof *(p)]; \
- } *) (p))->__l) = l; \
- } while (0)
-struct unaligned_long { uint64_t l; } __attribute__((packed));
-#define ldq_u(p) (*(const uint64_t *) (((uint64_t) (p)) & ~7ul))
-#define uldq(a) (((const struct unaligned_long *) (a))->l)
-
-#if AV_GCC_VERSION_AT_LEAST(3,3)
-#define prefetch(p) __builtin_prefetch((p), 0, 1)
-#define prefetch_en(p) __builtin_prefetch((p), 0, 0)
-#define prefetch_m(p) __builtin_prefetch((p), 1, 1)
-#define prefetch_men(p) __builtin_prefetch((p), 1, 0)
-#define cmpbge __builtin_alpha_cmpbge
-/* Avoid warnings. */
-#define extql(a, b) __builtin_alpha_extql(a, (uint64_t) (b))
-#define extwl(a, b) __builtin_alpha_extwl(a, (uint64_t) (b))
-#define extqh(a, b) __builtin_alpha_extqh(a, (uint64_t) (b))
-#define zap __builtin_alpha_zap
-#define zapnot __builtin_alpha_zapnot
-#define amask __builtin_alpha_amask
-#define implver __builtin_alpha_implver
-#define rpcc __builtin_alpha_rpcc
-#else
-#define prefetch(p) __asm__ volatile("ldl $31,%0" : : "m"(*(const char *) (p)) : "memory")
-#define prefetch_en(p) __asm__ volatile("ldq $31,%0" : : "m"(*(const char *) (p)) : "memory")
-#define prefetch_m(p) __asm__ volatile("lds $f31,%0" : : "m"(*(const char *) (p)) : "memory")
-#define prefetch_men(p) __asm__ volatile("ldt $f31,%0" : : "m"(*(const char *) (p)) : "memory")
-#define cmpbge(a, b) ({ uint64_t __r; __asm__ ("cmpbge %r1,%2,%0" : "=r" (__r) : "rJ" (a), "rI" (b)); __r; })
-#define extql(a, b) ({ uint64_t __r; __asm__ ("extql %r1,%2,%0" : "=r" (__r) : "rJ" (a), "rI" (b)); __r; })
-#define extwl(a, b) ({ uint64_t __r; __asm__ ("extwl %r1,%2,%0" : "=r" (__r) : "rJ" (a), "rI" (b)); __r; })
-#define extqh(a, b) ({ uint64_t __r; __asm__ ("extqh %r1,%2,%0" : "=r" (__r) : "rJ" (a), "rI" (b)); __r; })
-#define zap(a, b) ({ uint64_t __r; __asm__ ("zap %r1,%2,%0" : "=r" (__r) : "rJ" (a), "rI" (b)); __r; })
-#define zapnot(a, b) ({ uint64_t __r; __asm__ ("zapnot %r1,%2,%0" : "=r" (__r) : "rJ" (a), "rI" (b)); __r; })
-#define amask(a) ({ uint64_t __r; __asm__ ("amask %1,%0" : "=r" (__r) : "rI" (a)); __r; })
-#define implver() ({ uint64_t __r; __asm__ ("implver %0" : "=r" (__r)); __r; })
-#define rpcc() ({ uint64_t __r; __asm__ volatile ("rpcc %0" : "=r" (__r)); __r; })
-#endif
-#define wh64(p) __asm__ volatile("wh64 (%0)" : : "r"(p) : "memory")
-
-#if AV_GCC_VERSION_AT_LEAST(3,3) && defined(__alpha_max__)
-#define minub8 __builtin_alpha_minub8
-#define minsb8 __builtin_alpha_minsb8
-#define minuw4 __builtin_alpha_minuw4
-#define minsw4 __builtin_alpha_minsw4
-#define maxub8 __builtin_alpha_maxub8
-#define maxsb8 __builtin_alpha_maxsb8
-#define maxuw4 __builtin_alpha_maxuw4
-#define maxsw4 __builtin_alpha_maxsw4
-#define perr __builtin_alpha_perr
-#define pklb __builtin_alpha_pklb
-#define pkwb __builtin_alpha_pkwb
-#define unpkbl __builtin_alpha_unpkbl
-#define unpkbw __builtin_alpha_unpkbw
-#else
-#define minub8(a, b) ({ uint64_t __r; __asm__ (".arch ev6; minub8 %r1,%2,%0" : "=r" (__r) : "%rJ" (a), "rI" (b)); __r; })
-#define minsb8(a, b) ({ uint64_t __r; __asm__ (".arch ev6; minsb8 %r1,%2,%0" : "=r" (__r) : "%rJ" (a), "rI" (b)); __r; })
-#define minuw4(a, b) ({ uint64_t __r; __asm__ (".arch ev6; minuw4 %r1,%2,%0" : "=r" (__r) : "%rJ" (a), "rI" (b)); __r; })
-#define minsw4(a, b) ({ uint64_t __r; __asm__ (".arch ev6; minsw4 %r1,%2,%0" : "=r" (__r) : "%rJ" (a), "rI" (b)); __r; })
-#define maxub8(a, b) ({ uint64_t __r; __asm__ (".arch ev6; maxub8 %r1,%2,%0" : "=r" (__r) : "%rJ" (a), "rI" (b)); __r; })
-#define maxsb8(a, b) ({ uint64_t __r; __asm__ (".arch ev6; maxsb8 %r1,%2,%0" : "=r" (__r) : "%rJ" (a), "rI" (b)); __r; })
-#define maxuw4(a, b) ({ uint64_t __r; __asm__ (".arch ev6; maxuw4 %r1,%2,%0" : "=r" (__r) : "%rJ" (a), "rI" (b)); __r; })
-#define maxsw4(a, b) ({ uint64_t __r; __asm__ (".arch ev6; maxsw4 %r1,%2,%0" : "=r" (__r) : "%rJ" (a), "rI" (b)); __r; })
-#define perr(a, b) ({ uint64_t __r; __asm__ (".arch ev6; perr %r1,%r2,%0" : "=r" (__r) : "%rJ" (a), "rJ" (b)); __r; })
-#define pklb(a) ({ uint64_t __r; __asm__ (".arch ev6; pklb %r1,%0" : "=r" (__r) : "rJ" (a)); __r; })
-#define pkwb(a) ({ uint64_t __r; __asm__ (".arch ev6; pkwb %r1,%0" : "=r" (__r) : "rJ" (a)); __r; })
-#define unpkbl(a) ({ uint64_t __r; __asm__ (".arch ev6; unpkbl %r1,%0" : "=r" (__r) : "rJ" (a)); __r; })
-#define unpkbw(a) ({ uint64_t __r; __asm__ (".arch ev6; unpkbw %r1,%0" : "=r" (__r) : "rJ" (a)); __r; })
-#endif
-
-#elif defined(__DECC) /* Digital/Compaq/hp "ccc" compiler */
-
-#include <c_asm.h>
-#define ldq(p) (*(const uint64_t *) (p))
-#define ldl(p) (*(const int32_t *) (p))
-#define stq(l, p) do { *(uint64_t *) (p) = (l); } while (0)
-#define stl(l, p) do { *(int32_t *) (p) = (l); } while (0)
-#define ldq_u(a) asm ("ldq_u %v0,0(%a0)", a)
-#define uldq(a) (*(const __unaligned uint64_t *) (a))
-#define cmpbge(a, b) asm ("cmpbge %a0,%a1,%v0", a, b)
-#define extql(a, b) asm ("extql %a0,%a1,%v0", a, b)
-#define extwl(a, b) asm ("extwl %a0,%a1,%v0", a, b)
-#define extqh(a, b) asm ("extqh %a0,%a1,%v0", a, b)
-#define zap(a, b) asm ("zap %a0,%a1,%v0", a, b)
-#define zapnot(a, b) asm ("zapnot %a0,%a1,%v0", a, b)
-#define amask(a) asm ("amask %a0,%v0", a)
-#define implver() asm ("implver %v0")
-#define rpcc() asm ("rpcc %v0")
-#define minub8(a, b) asm ("minub8 %a0,%a1,%v0", a, b)
-#define minsb8(a, b) asm ("minsb8 %a0,%a1,%v0", a, b)
-#define minuw4(a, b) asm ("minuw4 %a0,%a1,%v0", a, b)
-#define minsw4(a, b) asm ("minsw4 %a0,%a1,%v0", a, b)
-#define maxub8(a, b) asm ("maxub8 %a0,%a1,%v0", a, b)
-#define maxsb8(a, b) asm ("maxsb8 %a0,%a1,%v0", a, b)
-#define maxuw4(a, b) asm ("maxuw4 %a0,%a1,%v0", a, b)
-#define maxsw4(a, b) asm ("maxsw4 %a0,%a1,%v0", a, b)
-#define perr(a, b) asm ("perr %a0,%a1,%v0", a, b)
-#define pklb(a) asm ("pklb %a0,%v0", a)
-#define pkwb(a) asm ("pkwb %a0,%v0", a)
-#define unpkbl(a) asm ("unpkbl %a0,%v0", a)
-#define unpkbw(a) asm ("unpkbw %a0,%v0", a)
-#define wh64(a) asm ("wh64 %a0", a)
-
-#else
-#error "Unknown compiler!"
-#endif
-
-#endif /* AVCODEC_ALPHA_ASM_H */

libav-v9.6.tar.bz2/libavcodec/alpha/dsputil_alpha.c Deleted

@@ -1,346 +0,0 @@
-/*
- * Alpha optimized DSP utils
- * Copyright (c) 2002 Falk Hueffner <falk@debian.org>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavcodec/dsputil.h"
-#include "dsputil_alpha.h"
-#include "asm.h"
-
-void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
- int line_size);
-void (*add_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
- int line_size);
-
-#if 0
-/* These functions were the base for the optimized assembler routines,
- and remain here for documentation purposes. */
-static void put_pixels_clamped_mvi(const DCTELEM *block, uint8_t *pixels,
- int line_size)
-{
- int i = 8;
- uint64_t clampmask = zap(-1, 0xaa); /* 0x00ff00ff00ff00ff */
-
- do {
- uint64_t shorts0, shorts1;
-
- shorts0 = ldq(block);
- shorts0 = maxsw4(shorts0, 0);
- shorts0 = minsw4(shorts0, clampmask);
- stl(pkwb(shorts0), pixels);
-
- shorts1 = ldq(block + 4);
- shorts1 = maxsw4(shorts1, 0);
- shorts1 = minsw4(shorts1, clampmask);
- stl(pkwb(shorts1), pixels + 4);
-
- pixels += line_size;
- block += 8;
- } while (--i);
-}
-
-void add_pixels_clamped_mvi(const DCTELEM *block, uint8_t *pixels,
- int line_size)
-{
- int h = 8;
- /* Keep this function a leaf function by generating the constants
- manually (mainly for the hack value ;-). */
- uint64_t clampmask = zap(-1, 0xaa); /* 0x00ff00ff00ff00ff */
- uint64_t signmask = zap(-1, 0x33);
- signmask ^= signmask >> 1; /* 0x8000800080008000 */
-
- do {
- uint64_t shorts0, pix0, signs0;
- uint64_t shorts1, pix1, signs1;
-
- shorts0 = ldq(block);
- shorts1 = ldq(block + 4);
-
- pix0 = unpkbw(ldl(pixels));
- /* Signed subword add (MMX paddw). */
- signs0 = shorts0 & signmask;
- shorts0 &= ~signmask;
- shorts0 += pix0;
- shorts0 ^= signs0;
- /* Clamp. */
- shorts0 = maxsw4(shorts0, 0);
- shorts0 = minsw4(shorts0, clampmask);
-
- /* Next 4. */
- pix1 = unpkbw(ldl(pixels + 4));
- signs1 = shorts1 & signmask;
- shorts1 &= ~signmask;
- shorts1 += pix1;
- shorts1 ^= signs1;
- shorts1 = maxsw4(shorts1, 0);
- shorts1 = minsw4(shorts1, clampmask);
-
- stl(pkwb(shorts0), pixels);
- stl(pkwb(shorts1), pixels + 4);
-
- pixels += line_size;
- block += 8;
- } while (--h);
-}
-#endif
-
-static void clear_blocks_axp(DCTELEM *blocks) {
- uint64_t *p = (uint64_t *) blocks;
- int n = sizeof(DCTELEM) * 6 * 64;
-
- do {
- p[0] = 0;
- p[1] = 0;
- p[2] = 0;
- p[3] = 0;
- p[4] = 0;
- p[5] = 0;
- p[6] = 0;
- p[7] = 0;
- p += 8;
- n -= 8 * 8;
- } while (n);
-}
-
-static inline uint64_t avg2_no_rnd(uint64_t a, uint64_t b)
-{
- return (a & b) + (((a ^ b) & BYTE_VEC(0xfe)) >> 1);
-}
-
-static inline uint64_t avg2(uint64_t a, uint64_t b)
-{
- return (a | b) - (((a ^ b) & BYTE_VEC(0xfe)) >> 1);
-}
-
-#if 0
-/* The XY2 routines basically utilize this scheme, but reuse parts in
- each iteration. */
-static inline uint64_t avg4(uint64_t l1, uint64_t l2, uint64_t l3, uint64_t l4)
-{
- uint64_t r1 = ((l1 & ~BYTE_VEC(0x03)) >> 2)
- + ((l2 & ~BYTE_VEC(0x03)) >> 2)
- + ((l3 & ~BYTE_VEC(0x03)) >> 2)
- + ((l4 & ~BYTE_VEC(0x03)) >> 2);
- uint64_t r2 = (( (l1 & BYTE_VEC(0x03))
- + (l2 & BYTE_VEC(0x03))
- + (l3 & BYTE_VEC(0x03))
- + (l4 & BYTE_VEC(0x03))
- + BYTE_VEC(0x02)) >> 2) & BYTE_VEC(0x03);
- return r1 + r2;
-}
-#endif
-
-#define OP(LOAD, STORE) \
- do { \
- STORE(LOAD(pixels), block); \
- pixels += line_size; \
- block += line_size; \
- } while (--h)
-
-#define OP_X2(LOAD, STORE) \
- do { \
- uint64_t pix1, pix2; \
- \
- pix1 = LOAD(pixels); \
- pix2 = pix1 >> 8 | ((uint64_t) pixels[8] << 56); \
- STORE(AVG2(pix1, pix2), block); \
- pixels += line_size; \
- block += line_size; \
- } while (--h)
-
-#define OP_Y2(LOAD, STORE) \
- do { \
- uint64_t pix = LOAD(pixels); \
- do { \
- uint64_t next_pix; \
- \
- pixels += line_size; \
- next_pix = LOAD(pixels); \
- STORE(AVG2(pix, next_pix), block); \
- block += line_size; \
- pix = next_pix; \
- } while (--h); \
- } while (0)
-
-#define OP_XY2(LOAD, STORE) \
- do { \
- uint64_t pix1 = LOAD(pixels); \
- uint64_t pix2 = pix1 >> 8 | ((uint64_t) pixels[8] << 56); \
- uint64_t pix_l = (pix1 & BYTE_VEC(0x03)) \
- + (pix2 & BYTE_VEC(0x03)); \
- uint64_t pix_h = ((pix1 & ~BYTE_VEC(0x03)) >> 2) \
- + ((pix2 & ~BYTE_VEC(0x03)) >> 2); \
- \
- do { \
- uint64_t npix1, npix2; \
- uint64_t npix_l, npix_h; \
- uint64_t avg; \
- \
- pixels += line_size; \
- npix1 = LOAD(pixels); \
- npix2 = npix1 >> 8 | ((uint64_t) pixels[8] << 56); \
- npix_l = (npix1 & BYTE_VEC(0x03)) \
- + (npix2 & BYTE_VEC(0x03)); \
- npix_h = ((npix1 & ~BYTE_VEC(0x03)) >> 2) \
- + ((npix2 & ~BYTE_VEC(0x03)) >> 2); \
- avg = (((pix_l + npix_l + AVG4_ROUNDER) >> 2) & BYTE_VEC(0x03)) \
- + pix_h + npix_h; \
- STORE(avg, block); \
- \
- block += line_size; \
- pix_l = npix_l; \
- pix_h = npix_h; \
- } while (--h); \
- } while (0)
-
-#define MAKE_OP(OPNAME, SUFF, OPKIND, STORE) \
-static void OPNAME ## _pixels ## SUFF ## _axp \
- (uint8_t *restrict block, const uint8_t *restrict pixels, \
- int line_size, int h) \
-{ \
- if ((size_t) pixels & 0x7) { \
- OPKIND(uldq, STORE); \
- } else { \
- OPKIND(ldq, STORE); \
- } \
-} \
- \
-static void OPNAME ## _pixels16 ## SUFF ## _axp \
- (uint8_t *restrict block, const uint8_t *restrict pixels, \
- int line_size, int h) \
-{ \
- OPNAME ## _pixels ## SUFF ## _axp(block, pixels, line_size, h); \
- OPNAME ## _pixels ## SUFF ## _axp(block + 8, pixels + 8, line_size, h); \
-}
-
-#define PIXOP(OPNAME, STORE) \
- MAKE_OP(OPNAME, , OP, STORE) \
- MAKE_OP(OPNAME, _x2, OP_X2, STORE) \
- MAKE_OP(OPNAME, _y2, OP_Y2, STORE) \
- MAKE_OP(OPNAME, _xy2, OP_XY2, STORE)
-
-/* Rounding primitives. */
-#define AVG2 avg2
-#define AVG4 avg4
-#define AVG4_ROUNDER BYTE_VEC(0x02)
-#define STORE(l, b) stq(l, b)
-PIXOP(put, STORE);
-
-#undef STORE
-#define STORE(l, b) stq(AVG2(l, ldq(b)), b);
-PIXOP(avg, STORE);
-
-/* Not rounding primitives. */
-#undef AVG2
-#undef AVG4
-#undef AVG4_ROUNDER
-#undef STORE
-#define AVG2 avg2_no_rnd
-#define AVG4 avg4_no_rnd
-#define AVG4_ROUNDER BYTE_VEC(0x01)
-#define STORE(l, b) stq(l, b)
-PIXOP(put_no_rnd, STORE);
-
-#undef STORE
-#define STORE(l, b) stq(AVG2(l, ldq(b)), b);
-PIXOP(avg_no_rnd, STORE);
-
-static void put_pixels16_axp_asm(uint8_t *block, const uint8_t *pixels,
- int line_size, int h)
-{
- put_pixels_axp_asm(block, pixels, line_size, h);
- put_pixels_axp_asm(block + 8, pixels + 8, line_size, h);
-}
-
-void ff_dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx)
-{
- const int high_bit_depth = avctx->bits_per_raw_sample > 8;
-
- if (!high_bit_depth) {
- c->put_pixels_tab[0][0] = put_pixels16_axp_asm;
- c->put_pixels_tab[0][1] = put_pixels16_x2_axp;
- c->put_pixels_tab[0][2] = put_pixels16_y2_axp;
- c->put_pixels_tab[0][3] = put_pixels16_xy2_axp;
-
- c->put_no_rnd_pixels_tab[0][0] = put_pixels16_axp_asm;
- c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_axp;
- c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_axp;
- c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_axp;
-
- c->avg_pixels_tab[0][0] = avg_pixels16_axp;
- c->avg_pixels_tab[0][1] = avg_pixels16_x2_axp;
- c->avg_pixels_tab[0][2] = avg_pixels16_y2_axp;
- c->avg_pixels_tab[0][3] = avg_pixels16_xy2_axp;
-
- c->avg_no_rnd_pixels_tab[0][0] = avg_no_rnd_pixels16_axp;
- c->avg_no_rnd_pixels_tab[0][1] = avg_no_rnd_pixels16_x2_axp;
- c->avg_no_rnd_pixels_tab[0][2] = avg_no_rnd_pixels16_y2_axp;
- c->avg_no_rnd_pixels_tab[0][3] = avg_no_rnd_pixels16_xy2_axp;
-
- c->put_pixels_tab[1][0] = put_pixels_axp_asm;
- c->put_pixels_tab[1][1] = put_pixels_x2_axp;
- c->put_pixels_tab[1][2] = put_pixels_y2_axp;
- c->put_pixels_tab[1][3] = put_pixels_xy2_axp;
-
- c->put_no_rnd_pixels_tab[1][0] = put_pixels_axp_asm;
- c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels_x2_axp;
- c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels_y2_axp;
- c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels_xy2_axp;
-
- c->avg_pixels_tab[1][0] = avg_pixels_axp;
- c->avg_pixels_tab[1][1] = avg_pixels_x2_axp;
- c->avg_pixels_tab[1][2] = avg_pixels_y2_axp;
- c->avg_pixels_tab[1][3] = avg_pixels_xy2_axp;
-
- c->avg_no_rnd_pixels_tab[1][0] = avg_no_rnd_pixels_axp;
- c->avg_no_rnd_pixels_tab[1][1] = avg_no_rnd_pixels_x2_axp;
- c->avg_no_rnd_pixels_tab[1][2] = avg_no_rnd_pixels_y2_axp;
- c->avg_no_rnd_pixels_tab[1][3] = avg_no_rnd_pixels_xy2_axp;
-
- c->clear_blocks = clear_blocks_axp;
- }
-
- /* amask clears all bits that correspond to present features. */
- if (amask(AMASK_MVI) == 0) {
- c->put_pixels_clamped = put_pixels_clamped_mvi_asm;
- c->add_pixels_clamped = add_pixels_clamped_mvi_asm;
-
- if (!high_bit_depth)
- c->get_pixels = get_pixels_mvi;
- c->diff_pixels = diff_pixels_mvi;
- c->sad[0] = pix_abs16x16_mvi_asm;
- c->sad[1] = pix_abs8x8_mvi;
- c->pix_abs[0][0] = pix_abs16x16_mvi_asm;
- c->pix_abs[1][0] = pix_abs8x8_mvi;
- c->pix_abs[0][1] = pix_abs16x16_x2_mvi;
- c->pix_abs[0][2] = pix_abs16x16_y2_mvi;
- c->pix_abs[0][3] = pix_abs16x16_xy2_mvi;
- }
-
- put_pixels_clamped_axp_p = c->put_pixels_clamped;
- add_pixels_clamped_axp_p = c->add_pixels_clamped;
-
- if (avctx->bits_per_raw_sample <= 8 &&
- (avctx->idct_algo == FF_IDCT_AUTO ||
- avctx->idct_algo == FF_IDCT_SIMPLEALPHA)) {
- c->idct_put = ff_simple_idct_put_axp;
- c->idct_add = ff_simple_idct_add_axp;
- c->idct = ff_simple_idct_axp;
- }
-}

libav-v9.6.tar.bz2/libavcodec/alpha/dsputil_alpha.h Deleted

@@ -1,50 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_ALPHA_DSPUTIL_ALPHA_H
-#define AVCODEC_ALPHA_DSPUTIL_ALPHA_H
-
-#include "libavcodec/dsputil.h"
-
-void ff_simple_idct_axp(DCTELEM *block);
-void ff_simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block);
-void ff_simple_idct_add_axp(uint8_t *dest, int line_size, DCTELEM *block);
-
-void put_pixels_axp_asm(uint8_t *block, const uint8_t *pixels,
-                        int line_size, int h);
-void put_pixels_clamped_mvi_asm(const DCTELEM *block, uint8_t *pixels,
-                                int line_size);
-void add_pixels_clamped_mvi_asm(const DCTELEM *block, uint8_t *pixels,
-                                int line_size);
-extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
-                                        int line_size);
-extern void (*add_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
-                                        int line_size);
-
-void get_pixels_mvi(DCTELEM *restrict block,
-                    const uint8_t *restrict pixels, int line_size);
-void diff_pixels_mvi(DCTELEM *block, const uint8_t *s1, const uint8_t *s2,
-                     int stride);
-int pix_abs8x8_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
-int pix_abs16x16_mvi_asm(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
-int pix_abs16x16_x2_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
-int pix_abs16x16_y2_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
-int pix_abs16x16_xy2_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
-
-
-#endif /* AVCODEC_ALPHA_DSPUTIL_ALPHA_H */

libav-v9.6.tar.bz2/libavcodec/alpha/dsputil_alpha_asm.S Deleted

@@ -1,270 +0,0 @@
-/*
- * Alpha optimized DSP utils
- * Copyright (c) 2002 Falk Hueffner <falk@debian.org>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/*
- * These functions are scheduled for pca56. They should work
- * reasonably on ev6, though.
- */
-
-#include "regdef.h"
-
-/* Some nicer register names. */
-#define ta t10
-#define tb t11
-#define tc t12
-#define td AT
-/* Danger: these overlap with the argument list and the return value */
-#define te a5
-#define tf a4
-#define tg a3
-#define th v0
-
- .set noat
- .set noreorder
- .arch pca56
- .text
-
-/************************************************************************
- * void put_pixels_axp_asm(uint8_t *block, const uint8_t *pixels,
- * int line_size, int h)
- */
- .align 6
- .globl put_pixels_axp_asm
- .ent put_pixels_axp_asm
-put_pixels_axp_asm:
- .frame sp, 0, ra
- .prologue 0
-
- and a1, 7, t0
- beq t0, $aligned
-
- .align 4
-$unaligned:
- ldq_u t0, 0(a1)
- ldq_u t1, 8(a1)
- addq a1, a2, a1
- nop
-
- ldq_u t2, 0(a1)
- ldq_u t3, 8(a1)
- addq a1, a2, a1
- nop
-
- ldq_u t4, 0(a1)
- ldq_u t5, 8(a1)
- addq a1, a2, a1
- nop
-
- ldq_u t6, 0(a1)
- ldq_u t7, 8(a1)
- extql t0, a1, t0
- addq a1, a2, a1
-
- extqh t1, a1, t1
- addq a0, a2, t8
- extql t2, a1, t2
- addq t8, a2, t9
-
- extqh t3, a1, t3
- addq t9, a2, ta
- extql t4, a1, t4
- or t0, t1, t0
-
- extqh t5, a1, t5
- or t2, t3, t2
- extql t6, a1, t6
- or t4, t5, t4
-
- extqh t7, a1, t7
- or t6, t7, t6
- stq t0, 0(a0)
- stq t2, 0(t8)
-
- stq t4, 0(t9)
- subq a3, 4, a3
- stq t6, 0(ta)
- addq ta, a2, a0
-
- bne a3, $unaligned
- ret
-
- .align 4
-$aligned:
- ldq t0, 0(a1)
- addq a1, a2, a1
- ldq t1, 0(a1)
- addq a1, a2, a1
-
- ldq t2, 0(a1)
- addq a1, a2, a1
- ldq t3, 0(a1)
-
- addq a0, a2, t4
- addq a1, a2, a1
- addq t4, a2, t5
- subq a3, 4, a3
-
- stq t0, 0(a0)
- addq t5, a2, t6
- stq t1, 0(t4)
- addq t6, a2, a0
-
- stq t2, 0(t5)
- stq t3, 0(t6)
-
- bne a3, $aligned
- ret
- .end put_pixels_axp_asm
-
-/************************************************************************
- * void put_pixels_clamped_mvi_asm(const DCTELEM *block, uint8_t *pixels,
- * int line_size)
- */
- .align 6
- .globl put_pixels_clamped_mvi_asm
- .ent put_pixels_clamped_mvi_asm
-put_pixels_clamped_mvi_asm:
- .frame sp, 0, ra
- .prologue 0
-
- lda t8, -1
- lda t9, 8 # loop counter
- zap t8, 0xaa, t8 # 00ff00ff00ff00ff
-
- .align 4
-1: ldq t0, 0(a0)
- ldq t1, 8(a0)
- ldq t2, 16(a0)
- ldq t3, 24(a0)
-
- maxsw4 t0, zero, t0
- subq t9, 2, t9
- maxsw4 t1, zero, t1
- lda a0, 32(a0)
-
- maxsw4 t2, zero, t2
- addq a1, a2, ta
- maxsw4 t3, zero, t3
- minsw4 t0, t8, t0
-
- minsw4 t1, t8, t1
- minsw4 t2, t8, t2
- minsw4 t3, t8, t3
- pkwb t0, t0
-
- pkwb t1, t1
- pkwb t2, t2
- pkwb t3, t3
- stl t0, 0(a1)
-
- stl t1, 4(a1)
- addq ta, a2, a1
- stl t2, 0(ta)
- stl t3, 4(ta)
-
- bne t9, 1b
- ret
- .end put_pixels_clamped_mvi_asm
-
-/************************************************************************
- * void add_pixels_clamped_mvi_asm(const DCTELEM *block, uint8_t *pixels,
- * int line_size)
- */
- .align 6
- .globl add_pixels_clamped_mvi_asm
- .ent add_pixels_clamped_mvi_asm
-add_pixels_clamped_mvi_asm:
- .frame sp, 0, ra
- .prologue 0
-
- lda t1, -1
- lda th, 8
- zap t1, 0x33, tg
- nop
-
- srl tg, 1, t0
- xor tg, t0, tg # 0x8000800080008000
- zap t1, 0xaa, tf # 0x00ff00ff00ff00ff
-
- .align 4
-1: ldl t1, 0(a1) # pix0 (try to hit cache line soon)
- ldl t4, 4(a1) # pix1
- addq a1, a2, te # pixels += line_size
- ldq t0, 0(a0) # shorts0
-
- ldl t7, 0(te) # pix2 (try to hit cache line soon)
- ldl ta, 4(te) # pix3
- ldq t3, 8(a0) # shorts1
- ldq t6, 16(a0) # shorts2
-
- ldq t9, 24(a0) # shorts3
- unpkbw t1, t1 # 0 0 (quarter/op no.)
- and t0, tg, t2 # 0 1
- unpkbw t4, t4 # 1 0
-
- bic t0, tg, t0 # 0 2
- unpkbw t7, t7 # 2 0
- and t3, tg, t5 # 1 1
- addq t0, t1, t0 # 0 3
-
- xor t0, t2, t0 # 0 4
- unpkbw ta, ta # 3 0
- and t6, tg, t8 # 2 1
- maxsw4 t0, zero, t0 # 0 5
-
- bic t3, tg, t3 # 1 2
- bic t6, tg, t6 # 2 2
- minsw4 t0, tf, t0 # 0 6
- addq t3, t4, t3 # 1 3
-
- pkwb t0, t0 # 0 7
- xor t3, t5, t3 # 1 4
- maxsw4 t3, zero, t3 # 1 5
- addq t6, t7, t6 # 2 3
-
- xor t6, t8, t6 # 2 4
- and t9, tg, tb # 3 1
- minsw4 t3, tf, t3 # 1 6
- bic t9, tg, t9 # 3 2
-
- maxsw4 t6, zero, t6 # 2 5
- addq t9, ta, t9 # 3 3
- stl t0, 0(a1) # 0 8
- minsw4 t6, tf, t6 # 2 6
-
- xor t9, tb, t9 # 3 4
- maxsw4 t9, zero, t9 # 3 5
- lda a0, 32(a0) # block += 16;
- pkwb t3, t3 # 1 7
-
- minsw4 t9, tf, t9 # 3 6
- subq th, 2, th
- pkwb t6, t6 # 2 7
- pkwb t9, t9 # 3 7
-
- stl t3, 4(a1) # 1 8
- addq te, a2, a1 # pixels += line_size
- stl t6, 0(te) # 2 8
- stl t9, 4(te) # 3 8
-
- bne th, 1b
- ret
- .end add_pixels_clamped_mvi_asm

libav-v9.6.tar.bz2/libavcodec/alpha/motion_est_alpha.c Deleted

@@ -1,346 +0,0 @@
-/*
- * Alpha optimized DSP utils
- * Copyright (c) 2002 Falk Hueffner <falk@debian.org>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavcodec/dsputil.h"
-#include "dsputil_alpha.h"
-#include "asm.h"
-
-void get_pixels_mvi(DCTELEM *restrict block,
- const uint8_t *restrict pixels, int line_size)
-{
- int h = 8;
-
- do {
- uint64_t p;
-
- p = ldq(pixels);
- stq(unpkbw(p), block);
- stq(unpkbw(p >> 32), block + 4);
-
- pixels += line_size;
- block += 8;
- } while (--h);
-}
-
-void diff_pixels_mvi(DCTELEM *block, const uint8_t *s1, const uint8_t *s2,
- int stride) {
- int h = 8;
- uint64_t mask = 0x4040;
-
- mask |= mask << 16;
- mask |= mask << 32;
- do {
- uint64_t x, y, c, d, a;
- uint64_t signs;
-
- x = ldq(s1);
- y = ldq(s2);
- c = cmpbge(x, y);
- d = x - y;
- a = zap(mask, c); /* We use 0x4040404040404040 here... */
- d += 4 * a; /* ...so we can use s4addq here. */
- signs = zap(-1, c);
-
- stq(unpkbw(d) | (unpkbw(signs) << 8), block);
- stq(unpkbw(d >> 32) | (unpkbw(signs >> 32) << 8), block + 4);
-
- s1 += stride;
- s2 += stride;
- block += 8;
- } while (--h);
-}
-
-static inline uint64_t avg2(uint64_t a, uint64_t b)
-{
- return (a | b) - (((a ^ b) & BYTE_VEC(0xfe)) >> 1);
-}
-
-static inline uint64_t avg4(uint64_t l1, uint64_t l2, uint64_t l3, uint64_t l4)
-{
- uint64_t r1 = ((l1 & ~BYTE_VEC(0x03)) >> 2)
- + ((l2 & ~BYTE_VEC(0x03)) >> 2)
- + ((l3 & ~BYTE_VEC(0x03)) >> 2)
- + ((l4 & ~BYTE_VEC(0x03)) >> 2);
- uint64_t r2 = (( (l1 & BYTE_VEC(0x03))
- + (l2 & BYTE_VEC(0x03))
- + (l3 & BYTE_VEC(0x03))
- + (l4 & BYTE_VEC(0x03))
- + BYTE_VEC(0x02)) >> 2) & BYTE_VEC(0x03);
- return r1 + r2;
-}
-
-int pix_abs8x8_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
-{
- int result = 0;
-
- if ((size_t) pix2 & 0x7) {
- /* works only when pix2 is actually unaligned */
- do { /* do 8 pixel a time */
- uint64_t p1, p2;
-
- p1 = ldq(pix1);
- p2 = uldq(pix2);
- result += perr(p1, p2);
-
- pix1 += line_size;
- pix2 += line_size;
- } while (--h);
- } else {
- do {
- uint64_t p1, p2;
-
- p1 = ldq(pix1);
- p2 = ldq(pix2);
- result += perr(p1, p2);
-
- pix1 += line_size;
- pix2 += line_size;
- } while (--h);
- }
-
- return result;
-}
-
-#if 0 /* now done in assembly */
-int pix_abs16x16_mvi(uint8_t *pix1, uint8_t *pix2, int line_size)
-{
- int result = 0;
- int h = 16;
-
- if ((size_t) pix2 & 0x7) {
- /* works only when pix2 is actually unaligned */
- do { /* do 16 pixel a time */
- uint64_t p1_l, p1_r, p2_l, p2_r;
- uint64_t t;
-
- p1_l = ldq(pix1);
- p1_r = ldq(pix1 + 8);
- t = ldq_u(pix2 + 8);
- p2_l = extql(ldq_u(pix2), pix2) | extqh(t, pix2);
- p2_r = extql(t, pix2) | extqh(ldq_u(pix2 + 16), pix2);
- pix1 += line_size;
- pix2 += line_size;
-
- result += perr(p1_l, p2_l)
- + perr(p1_r, p2_r);
- } while (--h);
- } else {
- do {
- uint64_t p1_l, p1_r, p2_l, p2_r;
-
- p1_l = ldq(pix1);
- p1_r = ldq(pix1 + 8);
- p2_l = ldq(pix2);
- p2_r = ldq(pix2 + 8);
- pix1 += line_size;
- pix2 += line_size;
-
- result += perr(p1_l, p2_l)
- + perr(p1_r, p2_r);
- } while (--h);
- }
-
- return result;
-}
-#endif
-
-int pix_abs16x16_x2_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
-{
- int result = 0;
- uint64_t disalign = (size_t) pix2 & 0x7;
-
- switch (disalign) {
- case 0:
- do {
- uint64_t p1_l, p1_r, p2_l, p2_r;
- uint64_t l, r;
-
- p1_l = ldq(pix1);
- p1_r = ldq(pix1 + 8);
- l = ldq(pix2);
- r = ldq(pix2 + 8);
- p2_l = avg2(l, (l >> 8) | ((uint64_t) r << 56));
- p2_r = avg2(r, (r >> 8) | ((uint64_t) pix2[16] << 56));
- pix1 += line_size;
- pix2 += line_size;
-
- result += perr(p1_l, p2_l)
- + perr(p1_r, p2_r);
- } while (--h);
- break;
- case 7:
- /* |.......l|lllllllr|rrrrrrr*|
- This case is special because disalign1 would be 8, which
- gets treated as 0 by extqh. At least it is a bit faster
- that way :) */
- do {
- uint64_t p1_l, p1_r, p2_l, p2_r;
- uint64_t l, m, r;
-
- p1_l = ldq(pix1);
- p1_r = ldq(pix1 + 8);
- l = ldq_u(pix2);
- m = ldq_u(pix2 + 8);
- r = ldq_u(pix2 + 16);
- p2_l = avg2(extql(l, disalign) | extqh(m, disalign), m);
- p2_r = avg2(extql(m, disalign) | extqh(r, disalign), r);
- pix1 += line_size;
- pix2 += line_size;
-
- result += perr(p1_l, p2_l)
- + perr(p1_r, p2_r);
- } while (--h);
- break;
- default:
- do {
- uint64_t disalign1 = disalign + 1;
- uint64_t p1_l, p1_r, p2_l, p2_r;
- uint64_t l, m, r;
-
- p1_l = ldq(pix1);
- p1_r = ldq(pix1 + 8);
- l = ldq_u(pix2);
- m = ldq_u(pix2 + 8);
- r = ldq_u(pix2 + 16);
- p2_l = avg2(extql(l, disalign) | extqh(m, disalign),
- extql(l, disalign1) | extqh(m, disalign1));
- p2_r = avg2(extql(m, disalign) | extqh(r, disalign),
- extql(m, disalign1) | extqh(r, disalign1));
- pix1 += line_size;
- pix2 += line_size;
-
- result += perr(p1_l, p2_l)
- + perr(p1_r, p2_r);
- } while (--h);
- break;
- }
- return result;
-}
-
-int pix_abs16x16_y2_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
-{
- int result = 0;
-
- if ((size_t) pix2 & 0x7) {
- uint64_t t, p2_l, p2_r;
- t = ldq_u(pix2 + 8);
- p2_l = extql(ldq_u(pix2), pix2) | extqh(t, pix2);
- p2_r = extql(t, pix2) | extqh(ldq_u(pix2 + 16), pix2);
-
- do {
- uint64_t p1_l, p1_r, np2_l, np2_r;
- uint64_t t;
-
- p1_l = ldq(pix1);
- p1_r = ldq(pix1 + 8);
- pix2 += line_size;
- t = ldq_u(pix2 + 8);
- np2_l = extql(ldq_u(pix2), pix2) | extqh(t, pix2);
- np2_r = extql(t, pix2) | extqh(ldq_u(pix2 + 16), pix2);
-
- result += perr(p1_l, avg2(p2_l, np2_l))
- + perr(p1_r, avg2(p2_r, np2_r));
-
- pix1 += line_size;
- p2_l = np2_l;
- p2_r = np2_r;
-
- } while (--h);
- } else {
- uint64_t p2_l, p2_r;
- p2_l = ldq(pix2);
- p2_r = ldq(pix2 + 8);
- do {
- uint64_t p1_l, p1_r, np2_l, np2_r;
-
- p1_l = ldq(pix1);
- p1_r = ldq(pix1 + 8);
- pix2 += line_size;
- np2_l = ldq(pix2);
- np2_r = ldq(pix2 + 8);
-
- result += perr(p1_l, avg2(p2_l, np2_l))
- + perr(p1_r, avg2(p2_r, np2_r));
-
- pix1 += line_size;
- p2_l = np2_l;
- p2_r = np2_r;
- } while (--h);
- }
- return result;
-}
-
-int pix_abs16x16_xy2_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
-{
- int result = 0;
-
- uint64_t p1_l, p1_r;
- uint64_t p2_l, p2_r, p2_x;
-
- p1_l = ldq(pix1);
- p1_r = ldq(pix1 + 8);
-
- if ((size_t) pix2 & 0x7) { /* could be optimized a lot */
- p2_l = uldq(pix2);
- p2_r = uldq(pix2 + 8);
- p2_x = (uint64_t) pix2[16] << 56;
- } else {
- p2_l = ldq(pix2);
- p2_r = ldq(pix2 + 8);
- p2_x = ldq(pix2 + 16) << 56;
- }
-
- do {
- uint64_t np1_l, np1_r;
- uint64_t np2_l, np2_r, np2_x;
-
- pix1 += line_size;
- pix2 += line_size;
-
- np1_l = ldq(pix1);
- np1_r = ldq(pix1 + 8);
-
- if ((size_t) pix2 & 0x7) { /* could be optimized a lot */
- np2_l = uldq(pix2);
- np2_r = uldq(pix2 + 8);
- np2_x = (uint64_t) pix2[16] << 56;
- } else {
- np2_l = ldq(pix2);
- np2_r = ldq(pix2 + 8);
- np2_x = ldq(pix2 + 16) << 56;
- }
-
- result += perr(p1_l,
- avg4( p2_l, ( p2_l >> 8) | ((uint64_t) p2_r << 56),
- np2_l, (np2_l >> 8) | ((uint64_t) np2_r << 56)))
- + perr(p1_r,
- avg4( p2_r, ( p2_r >> 8) | ((uint64_t) p2_x),
- np2_r, (np2_r >> 8) | ((uint64_t) np2_x)));
-
- p1_l = np1_l;
- p1_r = np1_r;
- p2_l = np2_l;
- p2_r = np2_r;
- p2_x = np2_x;
- } while (--h);
-
- return result;
-}

libav-v9.6.tar.bz2/libavcodec/alpha/motion_est_mvi_asm.S Deleted

@@ -1,179 +0,0 @@
-/*
- * Alpha optimized DSP utils
- * Copyright (c) 2002 Falk Hueffner <falk@debian.org>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "regdef.h"
-
-/* Some nicer register names. */
-#define ta t10
-#define tb t11
-#define tc t12
-#define td AT
-/* Danger: these overlap with the argument list and the return value */
-#define te a5
-#define tf a4
-#define tg a3
-#define th v0
-
- .set noat
- .set noreorder
- .arch pca56
- .text
-
-/*****************************************************************************
- * int pix_abs16x16_mvi_asm(uint8_t *pix1, uint8_t *pix2, int line_size)
- *
- * This code is written with a pca56 in mind. For ev6, one should
- * really take the increased latency of 3 cycles for MVI instructions
- * into account.
- *
- * It is important to keep the loading and first use of a register as
- * far apart as possible, because if a register is accessed before it
- * has been fetched from memory, the CPU will stall.
- */
- .align 4
- .globl pix_abs16x16_mvi_asm
- .ent pix_abs16x16_mvi_asm
-pix_abs16x16_mvi_asm:
- .frame sp, 0, ra, 0
- .prologue 0
-
- and a2, 7, t0
- clr v0
- beq t0, $aligned
- .align 4
-$unaligned:
- /* Registers:
- line 0:
- t0: left_u -> left lo -> left
- t1: mid
- t2: right_u -> right hi -> right
- t3: ref left
- t4: ref right
- line 1:
- t5: left_u -> left lo -> left
- t6: mid
- t7: right_u -> right hi -> right
- t8: ref left
- t9: ref right
- temp:
- ta: left hi
- tb: right lo
- tc: error left
- td: error right */
-
- /* load line 0 */
- ldq_u t0, 0(a2) # left_u
- ldq_u t1, 8(a2) # mid
- ldq_u t2, 16(a2) # right_u
- ldq t3, 0(a1) # ref left
- ldq t4, 8(a1) # ref right
- addq a1, a3, a1 # pix1
- addq a2, a3, a2 # pix2
- /* load line 1 */
- ldq_u t5, 0(a2) # left_u
- ldq_u t6, 8(a2) # mid
- ldq_u t7, 16(a2) # right_u
- ldq t8, 0(a1) # ref left
- ldq t9, 8(a1) # ref right
- addq a1, a3, a1 # pix1
- addq a2, a3, a2 # pix2
- /* calc line 0 */
- extql t0, a2, t0 # left lo
- extqh t1, a2, ta # left hi
- extql t1, a2, tb # right lo
- or t0, ta, t0 # left
- extqh t2, a2, t2 # right hi
- perr t3, t0, tc # error left
- or t2, tb, t2 # right
- perr t4, t2, td # error right
- addq v0, tc, v0 # add error left
- addq v0, td, v0 # add error left
- /* calc line 1 */
- extql t5, a2, t5 # left lo
- extqh t6, a2, ta # left hi
- extql t6, a2, tb # right lo
- or t5, ta, t5 # left
- extqh t7, a2, t7 # right hi
- perr t8, t5, tc # error left
- or t7, tb, t7 # right
- perr t9, t7, td # error right
- addq v0, tc, v0 # add error left
- addq v0, td, v0 # add error left
- /* loop */
- subq a4, 2, a4 # h -= 2
- bne a4, $unaligned
- ret
-
- .align 4
-$aligned:
- /* load line 0 */
- ldq t0, 0(a2) # left
- ldq t1, 8(a2) # right
- addq a2, a3, a2 # pix2
- ldq t2, 0(a1) # ref left
- ldq t3, 8(a1) # ref right
- addq a1, a3, a1 # pix1
- /* load line 1 */
- ldq t4, 0(a2) # left
- ldq t5, 8(a2) # right
- addq a2, a3, a2 # pix2
- ldq t6, 0(a1) # ref left
- ldq t7, 8(a1) # ref right
- addq a1, a3, a1 # pix1
- /* load line 2 */
- ldq t8, 0(a2) # left
- ldq t9, 8(a2) # right
- addq a2, a3, a2 # pix2
- ldq ta, 0(a1) # ref left
- ldq tb, 8(a1) # ref right
- addq a1, a3, a1 # pix1
- /* load line 3 */
- ldq tc, 0(a2) # left
- ldq td, 8(a2) # right
- addq a2, a3, a2 # pix2
- ldq te, 0(a1) # ref left
- ldq a0, 8(a1) # ref right
- /* calc line 0 */
- perr t0, t2, t0 # error left
- addq a1, a3, a1 # pix1
- perr t1, t3, t1 # error right
- addq v0, t0, v0 # add error left
- /* calc line 1 */
- perr t4, t6, t0 # error left
- addq v0, t1, v0 # add error right
- perr t5, t7, t1 # error right
- addq v0, t0, v0 # add error left
- /* calc line 2 */
- perr t8, ta, t0 # error left
- addq v0, t1, v0 # add error right
- perr t9, tb, t1 # error right
- addq v0, t0, v0 # add error left
- /* calc line 3 */
- perr tc, te, t0 # error left
- addq v0, t1, v0 # add error right
- perr td, a0, t1 # error right
- addq v0, t0, v0 # add error left
- addq v0, t1, v0 # add error right
- /* loop */
- subq a4, 4, a4 # h -= 4
- bne a4, $aligned
- ret
- .end pix_abs16x16_mvi_asm

libav-v9.6.tar.bz2/libavcodec/alpha/mpegvideo_alpha.c Deleted

@@ -1,110 +0,0 @@
-/*
- * Alpha optimized DSP utils
- * Copyright (c) 2002 Falk Hueffner <falk@debian.org>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavcodec/dsputil.h"
-#include "libavcodec/mpegvideo.h"
-#include "asm.h"
-
-static void dct_unquantize_h263_axp(DCTELEM *block, int n_coeffs,
- uint64_t qscale, uint64_t qadd)
-{
- uint64_t qmul = qscale << 1;
- uint64_t correction = WORD_VEC(qmul * 255 >> 8);
- int i;
-
- qadd = WORD_VEC(qadd);
-
- for(i = 0; i <= n_coeffs; block += 4, i += 4) {
- uint64_t levels, negmask, zeros, add, sub;
-
- levels = ldq(block);
- if (levels == 0)
- continue;
-
-#ifdef __alpha_max__
- /* I don't think the speed difference justifies runtime
- detection. */
- negmask = maxsw4(levels, -1); /* negative -> ffff (-1) */
- negmask = minsw4(negmask, 0); /* positive -> 0000 (0) */
-#else
- negmask = cmpbge(WORD_VEC(0x7fff), levels);
- negmask &= (negmask >> 1) | (1 << 7);
- negmask = zap(-1, negmask);
-#endif
-
- zeros = cmpbge(0, levels);
- zeros &= zeros >> 1;
- /* zeros |= zeros << 1 is not needed since qadd <= 255, so
- zapping the lower byte suffices. */
-
- levels *= qmul;
- levels -= correction & (negmask << 16);
-
- add = qadd & ~negmask;
- sub = qadd & negmask;
- /* Set qadd to 0 for levels == 0. */
- add = zap(add, zeros);
- levels += add;
- levels -= sub;
-
- stq(levels, block);
- }
-}
-
-static void dct_unquantize_h263_intra_axp(MpegEncContext *s, DCTELEM *block,
- int n, int qscale)
-{
- int n_coeffs;
- uint64_t qadd;
- DCTELEM block0 = block[0];
-
- if (!s->h263_aic) {
- if (n < 4)
- block0 *= s->y_dc_scale;
- else
- block0 *= s->c_dc_scale;
- qadd = (qscale - 1) | 1;
- } else {
- qadd = 0;
- }
-
- if(s->ac_pred)
- n_coeffs = 63;
- else
- n_coeffs = s->inter_scantable.raster_end[s->block_last_index[n]];
-
- dct_unquantize_h263_axp(block, n_coeffs, qscale, qadd);
-
- block[0] = block0;
-}
-
-static void dct_unquantize_h263_inter_axp(MpegEncContext *s, DCTELEM *block,
- int n, int qscale)
-{
- int n_coeffs = s->inter_scantable.raster_end[s->block_last_index[n]];
- dct_unquantize_h263_axp(block, n_coeffs, qscale, (qscale - 1) | 1);
-}
-
-void ff_MPV_common_init_axp(MpegEncContext *s)
-{
- s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_axp;
- s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_axp;
-}

libav-v9.6.tar.bz2/libavcodec/alpha/regdef.h Deleted

@@ -1,66 +0,0 @@
-/*
- * Alpha optimized DSP utils
- * copyright (c) 2002 Falk Hueffner <falk@debian.org>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/* Some BSDs don't seem to have regdef.h... sigh */
-#ifndef AVCODEC_ALPHA_REGDEF_H
-#define AVCODEC_ALPHA_REGDEF_H
-
-#define v0 $0 /* function return value */
-
-#define t0 $1 /* temporary registers (caller-saved) */
-#define t1 $2
-#define t2 $3
-#define t3 $4
-#define t4 $5
-#define t5 $6
-#define t6 $7
-#define t7 $8
-
-#define s0 $9 /* saved-registers (callee-saved registers) */
-#define s1 $10
-#define s2 $11
-#define s3 $12
-#define s4 $13
-#define s5 $14
-#define s6 $15
-#define fp s6 /* frame-pointer (s6 in frame-less procedures) */
-
-#define a0 $16 /* argument registers (caller-saved) */
-#define a1 $17
-#define a2 $18
-#define a3 $19
-#define a4 $20
-#define a5 $21
-
-#define t8 $22 /* more temps (caller-saved) */
-#define t9 $23
-#define t10 $24
-#define t11 $25
-#define ra $26 /* return address register */
-#define t12 $27
-
-#define pv t12 /* procedure-variable register */
-#define AT $at /* assembler temporary */
-#define gp $29 /* global pointer */
-#define sp $30 /* stack pointer */
-#define zero $31 /* reads as zero, writes are noops */
-
-#endif /* AVCODEC_ALPHA_REGDEF_H */

libav-v9.6.tar.bz2/libavcodec/alpha/simple_idct_alpha.c Deleted

@@ -1,304 +0,0 @@
-/*
- * Simple IDCT (Alpha optimized)
- *
- * Copyright (c) 2001 Michael Niedermayer <michaelni@gmx.at>
- *
- * based upon some outcommented C code from mpeg2dec (idct_mmx.c
- * written by Aaron Holtzman <aholtzma@ess.engr.uvic.ca>)
- *
- * Alpha optimizations by Måns Rullgård <mans@mansr.com>
- * and Falk Hueffner <falk@debian.org>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavcodec/dsputil.h"
-#include "dsputil_alpha.h"
-#include "asm.h"
-
-// cos(i * M_PI / 16) * sqrt(2) * (1 << 14)
-// W4 is actually exactly 16384, but using 16383 works around
-// accumulating rounding errors for some encoders
-#define W1 22725
-#define W2 21407
-#define W3 19266
-#define W4 16383
-#define W5 12873
-#define W6 8867
-#define W7 4520
-#define ROW_SHIFT 11
-#define COL_SHIFT 20
-
-/* 0: all entries 0, 1: only first entry nonzero, 2: otherwise */
-static inline int idct_row(DCTELEM *row)
-{
- int a0, a1, a2, a3, b0, b1, b2, b3, t;
- uint64_t l, r, t2;
- l = ldq(row);
- r = ldq(row + 4);
-
- if (l == 0 && r == 0)
- return 0;
-
- a0 = W4 * sextw(l) + (1 << (ROW_SHIFT - 1));
-
- if (((l & ~0xffffUL) | r) == 0) {
- a0 >>= ROW_SHIFT;
- t2 = (uint16_t) a0;
- t2 |= t2 << 16;
- t2 |= t2 << 32;
-
- stq(t2, row);
- stq(t2, row + 4);
- return 1;
- }
-
- a1 = a0;
- a2 = a0;
- a3 = a0;
-
- t = extwl(l, 4); /* row[2] */
- if (t != 0) {
- t = sextw(t);
- a0 += W2 * t;
- a1 += W6 * t;
- a2 -= W6 * t;
- a3 -= W2 * t;
- }
-
- t = extwl(r, 0); /* row[4] */
- if (t != 0) {
- t = sextw(t);
- a0 += W4 * t;
- a1 -= W4 * t;
- a2 -= W4 * t;
- a3 += W4 * t;
- }
-
- t = extwl(r, 4); /* row[6] */
- if (t != 0) {
- t = sextw(t);
- a0 += W6 * t;
- a1 -= W2 * t;
- a2 += W2 * t;
- a3 -= W6 * t;
- }
-
- t = extwl(l, 2); /* row[1] */
- if (t != 0) {
- t = sextw(t);
- b0 = W1 * t;
- b1 = W3 * t;
- b2 = W5 * t;
- b3 = W7 * t;
- } else {
- b0 = 0;
- b1 = 0;
- b2 = 0;
- b3 = 0;
- }
-
- t = extwl(l, 6); /* row[3] */
- if (t) {
- t = sextw(t);
- b0 += W3 * t;
- b1 -= W7 * t;
- b2 -= W1 * t;
- b3 -= W5 * t;
- }
-
-
- t = extwl(r, 2); /* row[5] */
- if (t) {
- t = sextw(t);
- b0 += W5 * t;
- b1 -= W1 * t;
- b2 += W7 * t;
- b3 += W3 * t;
- }
-
- t = extwl(r, 6); /* row[7] */
- if (t) {
- t = sextw(t);
- b0 += W7 * t;
- b1 -= W5 * t;
- b2 += W3 * t;
- b3 -= W1 * t;
- }
-
- row[0] = (a0 + b0) >> ROW_SHIFT;
- row[1] = (a1 + b1) >> ROW_SHIFT;
- row[2] = (a2 + b2) >> ROW_SHIFT;
- row[3] = (a3 + b3) >> ROW_SHIFT;
- row[4] = (a3 - b3) >> ROW_SHIFT;
- row[5] = (a2 - b2) >> ROW_SHIFT;
- row[6] = (a1 - b1) >> ROW_SHIFT;
- row[7] = (a0 - b0) >> ROW_SHIFT;
-
- return 2;
-}
-
-static inline void idct_col(DCTELEM *col)
-{
- int a0, a1, a2, a3, b0, b1, b2, b3;
-
- col[0] += (1 << (COL_SHIFT - 1)) / W4;
-
- a0 = W4 * col[8 * 0];
- a1 = W4 * col[8 * 0];
- a2 = W4 * col[8 * 0];
- a3 = W4 * col[8 * 0];
-
- if (col[8 * 2]) {
- a0 += W2 * col[8 * 2];
- a1 += W6 * col[8 * 2];
- a2 -= W6 * col[8 * 2];
- a3 -= W2 * col[8 * 2];
- }
-
- if (col[8 * 4]) {
- a0 += W4 * col[8 * 4];
- a1 -= W4 * col[8 * 4];
- a2 -= W4 * col[8 * 4];
- a3 += W4 * col[8 * 4];
- }
-
- if (col[8 * 6]) {
- a0 += W6 * col[8 * 6];
- a1 -= W2 * col[8 * 6];
- a2 += W2 * col[8 * 6];
- a3 -= W6 * col[8 * 6];
- }
-
- if (col[8 * 1]) {
- b0 = W1 * col[8 * 1];
- b1 = W3 * col[8 * 1];
- b2 = W5 * col[8 * 1];
- b3 = W7 * col[8 * 1];
- } else {
- b0 = 0;
- b1 = 0;
- b2 = 0;
- b3 = 0;
- }
-
- if (col[8 * 3]) {
- b0 += W3 * col[8 * 3];
- b1 -= W7 * col[8 * 3];
- b2 -= W1 * col[8 * 3];
- b3 -= W5 * col[8 * 3];
- }
-
- if (col[8 * 5]) {
- b0 += W5 * col[8 * 5];
- b1 -= W1 * col[8 * 5];
- b2 += W7 * col[8 * 5];
- b3 += W3 * col[8 * 5];
- }
-
- if (col[8 * 7]) {
- b0 += W7 * col[8 * 7];
- b1 -= W5 * col[8 * 7];
- b2 += W3 * col[8 * 7];
- b3 -= W1 * col[8 * 7];
- }
-
- col[8 * 0] = (a0 + b0) >> COL_SHIFT;
- col[8 * 7] = (a0 - b0) >> COL_SHIFT;
- col[8 * 1] = (a1 + b1) >> COL_SHIFT;
- col[8 * 6] = (a1 - b1) >> COL_SHIFT;
- col[8 * 2] = (a2 + b2) >> COL_SHIFT;
- col[8 * 5] = (a2 - b2) >> COL_SHIFT;
- col[8 * 3] = (a3 + b3) >> COL_SHIFT;
- col[8 * 4] = (a3 - b3) >> COL_SHIFT;
-}
-
-/* If all rows but the first one are zero after row transformation,
- all rows will be identical after column transformation. */
-static inline void idct_col2(DCTELEM *col)
-{
- int i;
- uint64_t l, r;
-
- for (i = 0; i < 8; ++i) {
- int a0 = col[i] + (1 << (COL_SHIFT - 1)) / W4;
-
- a0 *= W4;
- col[i] = a0 >> COL_SHIFT;
- }
-
- l = ldq(col + 0 * 4); r = ldq(col + 1 * 4);
- stq(l, col + 2 * 4); stq(r, col + 3 * 4);
- stq(l, col + 4 * 4); stq(r, col + 5 * 4);
- stq(l, col + 6 * 4); stq(r, col + 7 * 4);
- stq(l, col + 8 * 4); stq(r, col + 9 * 4);
- stq(l, col + 10 * 4); stq(r, col + 11 * 4);
- stq(l, col + 12 * 4); stq(r, col + 13 * 4);
- stq(l, col + 14 * 4); stq(r, col + 15 * 4);
-}
-
-void ff_simple_idct_axp(DCTELEM *block)
-{
-
- int i;
- int rowsZero = 1; /* all rows except row 0 zero */
- int rowsConstant = 1; /* all rows consist of a constant value */
-
- for (i = 0; i < 8; i++) {
- int sparseness = idct_row(block + 8 * i);
-
- if (i > 0 && sparseness > 0)
- rowsZero = 0;
- if (sparseness == 2)
- rowsConstant = 0;
- }
-
- if (rowsZero) {
- idct_col2(block);
- } else if (rowsConstant) {
- idct_col(block);
- for (i = 0; i < 8; i += 2) {
- uint64_t v = (uint16_t) block[0];
- uint64_t w = (uint16_t) block[8];
-
- v |= v << 16;
- w |= w << 16;
- v |= v << 32;
- w |= w << 32;
- stq(v, block + 0 * 4);
- stq(v, block + 1 * 4);
- stq(w, block + 2 * 4);
- stq(w, block + 3 * 4);
- block += 4 * 4;
- }
- } else {
- for (i = 0; i < 8; i++)
- idct_col(block + i);
- }
-}
-
-void ff_simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block)
-{
- ff_simple_idct_axp(block);
- put_pixels_clamped_axp_p(block, dest, line_size);
-}
-
-void ff_simple_idct_add_axp(uint8_t *dest, int line_size, DCTELEM *block)
-{
- ff_simple_idct_axp(block);
- add_pixels_clamped_axp_p(block, dest, line_size);
-}

libav-v9.6.tar.bz2/libavcodec/api-example.c Deleted

@@ -1,596 +0,0 @@
-/*
- * copyright (c) 2001 Fabrice Bellard
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * libavcodec API use example.
- *
- * @example libavcodec/api-example.c
- * Note that this library only handles codecs (mpeg, mpeg4, etc...),
- * not file formats (avi, vob, etc...). See library 'libavformat' for the
- * format handling
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifdef HAVE_AV_CONFIG_H
-#undef HAVE_AV_CONFIG_H
-#endif
-
-#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_channells = 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_channells) {
- best_ch_layout = *p;
- best_nb_channells = 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("Audio encoding\n");
-
- /* 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);
-
- /* 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 %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);
- }
- }
- 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("Audio decoding\n");
-
- /* 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);
-
- /* 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, "out of memory\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;
- 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)
-{
- AVCodec *codec;
- AVCodecContext *c= NULL;
- int i, ret, x, y, got_output;
- FILE *f;
- AVFrame *picture;
- AVPacket pkt;
- uint8_t endcode[] = { 0, 0, 1, 0xb7 };
-
- printf("Video encoding\n");
-
- /* find the mpeg1 video encoder */
- codec = avcodec_find_encoder(AV_CODEC_ID_MPEG1VIDEO);
- if (!codec) {
- fprintf(stderr, "codec not found\n");
- exit(1);
- }
-
- c = avcodec_alloc_context3(codec);
- picture= avcodec_alloc_frame();
-
- /* 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;
-
- /* 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);
- }
-
- ret = av_image_alloc(picture->data, picture->linesize, c->width, c->height,
- c->pix_fmt, 32);
- if (ret < 0) {
- fprintf(stderr, "could not alloc raw picture buffer\n");
- exit(1);
- }
- picture->format = c->pix_fmt;
- picture->width = c->width;
- picture->height = c->height;
-
- /* 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++) {
- picture->data[0][y * picture->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++) {
- picture->data[1][y * picture->linesize[1] + x] = 128 + y + i * 2;
- picture->data[2][y * picture->linesize[2] + x] = 64 + x + i * 5;
- }
- }
-
- picture->pts = i;
-
- /* encode the image */
- ret = avcodec_encode_video2(c, &pkt, picture, &got_output);
- if (ret < 0) {
- fprintf(stderr, "error encoding frame\n");
- exit(1);
- }
-
- if (got_output) {
- printf("encoding 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("encoding 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(&picture->data[0]);
- avcodec_free_frame(&picture);
- 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 void video_decode_example(const char *outfilename, const char *filename)
-{
- AVCodec *codec;
- AVCodecContext *c= NULL;
- int frame, got_picture, len;
- FILE *f;
- AVFrame *picture;
- uint8_t inbuf[INBUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE];
- char buf[1024];
- 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("Video decoding\n");
-
- /* 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);
- picture= avcodec_alloc_frame();
-
- 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);
- }
-
- /* the codec gives us the frame size, in samples */
-
- f = fopen(filename, "rb");
- if (!f) {
- fprintf(stderr, "could not open %s\n", filename);
- exit(1);
- }
-
- frame = 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) {
- len = avcodec_decode_video2(c, picture, &got_picture, &avpkt);
- if (len < 0) {
- fprintf(stderr, "Error while decoding frame %d\n", frame);
- exit(1);
- }
- if (got_picture) {
- printf("saving frame %3d\n", frame);
- fflush(stdout);
-
- /* the picture is allocated by the decoder. no need to
- free it */
- snprintf(buf, sizeof(buf), outfilename, frame);
- pgm_save(picture->data[0], picture->linesize[0],
- c->width, c->height, buf);
- frame++;
- }
- avpkt.size -= len;
- avpkt.data += len;
- }
- }
-
- /* 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;
- len = avcodec_decode_video2(c, picture, &got_picture, &avpkt);
- if (got_picture) {
- printf("saving last frame %3d\n", frame);
- fflush(stdout);
-
- /* the picture is allocated by the decoder. no need to
- free it */
- snprintf(buf, sizeof(buf), outfilename, frame);
- pgm_save(picture->data[0], picture->linesize[0],
- c->width, c->height, buf);
- frame++;
- }
-
- fclose(f);
-
- avcodec_close(c);
- av_free(c);
- avcodec_free_frame(&picture);
- printf("\n");
-}
-
-int main(int argc, char **argv)
-{
- const char *filename;
-
- /* register all the codecs */
- avcodec_register_all();
-
- if (argc <= 1) {
- audio_encode_example("/tmp/test.mp2");
- audio_decode_example("/tmp/test.sw", "/tmp/test.mp2");
-
- video_encode_example("/tmp/test.mpg");
- filename = "/tmp/test.mpg";
- } else {
- filename = argv[1];
- }
-
- // audio_decode_example("/tmp/test.sw", filename);
- video_decode_example("/tmp/test%d.pgm", filename);
-
- return 0;
-}

libav-v9.6.tar.bz2/libavcodec/arm/dsputil_init_vfp.c Deleted

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2008 Siarhei Siamashka <ssvb@users.sourceforge.net>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavcodec/dsputil.h"
-#include "dsputil_arm.h"
-
-void ff_vector_fmul_reverse_vfp(float *dst, const float *src0,
- const float *src1, int len);
-
-void ff_dsputil_init_vfp(DSPContext* c, AVCodecContext *avctx)
-{
- c->vector_fmul_reverse = ff_vector_fmul_reverse_vfp;
-}

libav-v9.6.tar.bz2/libavcodec/arm/dsputil_vfp.S Deleted

@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2008 Siarhei Siamashka <ssvb@users.sourceforge.net>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "libavutil/arm/asm.S"
-
-/*
- * VFP is a floating point coprocessor used in some ARM cores. VFP11 has 1 cycle
- * throughput for almost all the instructions (except for double precision
- * arithmetics), but rather high latency. Latency is 4 cycles for loads and 8 cycles
- * for arithmetic operations. Scheduling code to avoid pipeline stalls is very
- * important for performance. One more interesting feature is that VFP has
- * independent load/store and arithmetics pipelines, so it is possible to make
- * them work simultaneously and get more than 1 operation per cycle. Load/store
- * pipeline can process 2 single precision floating point values per cycle and
- * supports bulk loads and stores for large sets of registers. Arithmetic operations
- * can be done on vectors, which allows to keep the arithmetics pipeline busy,
- * while the processor may issue and execute other instructions. Detailed
- * optimization manuals can be found at http://www.arm.com
- */
-
-/**
- * ARM VFP optimized implementation of 'vector_fmul_reverse_c' function.
- * Assume that len is a positive number and is multiple of 8
- */
-@ void ff_vector_fmul_reverse_vfp(float *dst, const float *src0,
-@ const float *src1, int len)
-function ff_vector_fmul_reverse_vfp, export=1
- vpush {d8-d15}
- add r2, r2, r3, lsl #2
- vldmdb r2!, {s0-s3}
- vldmia r1!, {s8-s11}
- vldmdb r2!, {s4-s7}
- vldmia r1!, {s12-s15}
- vmul.f32 s8, s3, s8
- vmul.f32 s9, s2, s9
- vmul.f32 s10, s1, s10
- vmul.f32 s11, s0, s11
-1:
- subs r3, r3, #16
- it ge
- vldmdbge r2!, {s16-s19}
- vmul.f32 s12, s7, s12
- it ge
- vldmiage r1!, {s24-s27}
- vmul.f32 s13, s6, s13
- it ge
- vldmdbge r2!, {s20-s23}
- vmul.f32 s14, s5, s14
- it ge
- vldmiage r1!, {s28-s31}
- vmul.f32 s15, s4, s15
- it ge
- vmulge.f32 s24, s19, s24
- it gt
- vldmdbgt r2!, {s0-s3}
- it ge
- vmulge.f32 s25, s18, s25
- vstmia r0!, {s8-s13}
- it ge
- vmulge.f32 s26, s17, s26
- it gt
- vldmiagt r1!, {s8-s11}
- itt ge
- vmulge.f32 s27, s16, s27
- vmulge.f32 s28, s23, s28
- it gt
- vldmdbgt r2!, {s4-s7}
- it ge
- vmulge.f32 s29, s22, s29
- vstmia r0!, {s14-s15}
- ittt ge
- vmulge.f32 s30, s21, s30
- vmulge.f32 s31, s20, s31
- vmulge.f32 s8, s3, s8
- it gt
- vldmiagt r1!, {s12-s15}
- itttt ge
- vmulge.f32 s9, s2, s9
- vmulge.f32 s10, s1, s10
- vstmiage r0!, {s24-s27}
- vmulge.f32 s11, s0, s11
- it ge
- vstmiage r0!, {s28-s31}
- bgt 1b
-
- vpop {d8-d15}
- bx lr
-endfunc

libav-v9.6.tar.bz2/libavcodec/arm/vp56dsp_init_arm.c Deleted

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2010 Mans Rullgard <mans@mansr.com>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <stdint.h>
-
-#include "libavutil/arm/cpu.h"
-#include "libavcodec/avcodec.h"
-#include "libavcodec/vp56dsp.h"
-
-void ff_vp6_edge_filter_hor_neon(uint8_t *yuv, int stride, int t);
-void ff_vp6_edge_filter_ver_neon(uint8_t *yuv, int stride, int t);
-
-void ff_vp56dsp_init_arm(VP56DSPContext *s, enum AVCodecID codec)
-{
- int cpu_flags = av_get_cpu_flags();
-
- if (codec != AV_CODEC_ID_VP5 && have_neon(cpu_flags)) {
- s->edge_filter_hor = ff_vp6_edge_filter_hor_neon;
- s->edge_filter_ver = ff_vp6_edge_filter_ver_neon;
- }
-}

libav-v9.6.tar.bz2/libavcodec/audioconvert.c Deleted

@@ -1,116 +0,0 @@
-/*
- * audio conversion
- * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * audio conversion
- * @author Michael Niedermayer <michaelni@gmx.at>
- */
-
-#include "libavutil/avstring.h"
-#include "libavutil/common.h"
-#include "libavutil/libm.h"
-#include "libavutil/samplefmt.h"
-#include "avcodec.h"
-#include "audioconvert.h"
-
-struct AVAudioConvert {
- int in_channels, out_channels;
- int fmt_pair;
-};
-
-AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels,
- enum AVSampleFormat in_fmt, int in_channels,
- const float *matrix, int flags)
-{
- AVAudioConvert *ctx;
- if (in_channels!=out_channels)
- return NULL; /* FIXME: not supported */
- ctx = av_malloc(sizeof(AVAudioConvert));
- if (!ctx)
- return NULL;
- ctx->in_channels = in_channels;
- ctx->out_channels = out_channels;
- ctx->fmt_pair = out_fmt + AV_SAMPLE_FMT_NB*in_fmt;
- return ctx;
-}
-
-void av_audio_convert_free(AVAudioConvert *ctx)
-{
- av_free(ctx);
-}
-
-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)
-{
- int ch;
-
- //FIXME optimize common cases
-
- for(ch=0; ch<ctx->out_channels; ch++){
- const int is= in_stride[ch];
- const int os= out_stride[ch];
- const uint8_t *pi= in[ch];
- uint8_t *po= out[ch];
- uint8_t *end= po + os*len;
- if(!out[ch])
- continue;
-
-#define CONV(ofmt, otype, ifmt, expr)\
-if(ctx->fmt_pair == ofmt + AV_SAMPLE_FMT_NB*ifmt){\
- do{\
- *(otype*)po = expr; pi += is; po += os;\
- }while(po < end);\
-}
-
-//FIXME put things below under ifdefs so we do not waste space for cases no codec will need
-//FIXME rounding ?
-
- CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_U8 , *(const uint8_t*)pi)
- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)<<8)
- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)<<24)
- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)*(1.0 / (1<<7)))
- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)*(1.0 / (1<<7)))
- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_S16, (*(const int16_t*)pi>>8) + 0x80)
- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_S16, *(const int16_t*)pi)
- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_S16, *(const int16_t*)pi<<16)
- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_S16, *(const int16_t*)pi*(1.0 / (1<<15)))
- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_S16, *(const int16_t*)pi*(1.0 / (1<<15)))
- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_S32, (*(const int32_t*)pi>>24) + 0x80)
- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_S32, *(const int32_t*)pi>>16)
- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_S32, *(const int32_t*)pi)
- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_S32, *(const int32_t*)pi*(1.0 / (1U<<31)))
- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_S32, *(const int32_t*)pi*(1.0 / (1U<<31)))
- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_FLT, av_clip_uint8( lrintf(*(const float*)pi * (1<<7)) + 0x80))
- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_FLT, av_clip_int16( lrintf(*(const float*)pi * (1<<15))))
- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_FLT, av_clipl_int32(llrintf(*(const float*)pi * (1U<<31))))
- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_FLT, *(const float*)pi)
- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_FLT, *(const float*)pi)
- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_DBL, av_clip_uint8( lrint(*(const double*)pi * (1<<7)) + 0x80))
- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_DBL, av_clip_int16( lrint(*(const double*)pi * (1<<15))))
- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_DBL, av_clipl_int32(llrint(*(const double*)pi * (1U<<31))))
- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_DBL, *(const double*)pi)
- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_DBL, *(const double*)pi)
- else return -1;
- }
- return 0;
-}

libav-v9.6.tar.bz2/libavcodec/audioconvert.h Deleted

@@ -1,70 +0,0 @@
-/*
- * audio conversion
- * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- * Copyright (c) 2008 Peter Ross
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_AUDIOCONVERT_H
-#define AVCODEC_AUDIOCONVERT_H
-
-/**
- * @file
- * Audio format conversion routines
- */
-
-
-#include "libavutil/cpu.h"
-#include "avcodec.h"
-#include "libavutil/channel_layout.h"
-
-struct AVAudioConvert;
-typedef struct AVAudioConvert AVAudioConvert;
-
-/**
- * Create an audio sample format converter context
- * @param out_fmt Output sample format
- * @param out_channels Number of output channels
- * @param in_fmt Input sample format
- * @param in_channels Number of input channels
- * @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
- */
-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
- */
-void av_audio_convert_free(AVAudioConvert *ctx);
-
-/**
- * Convert between audio sample formats
- * @param[in] out array of output buffers for each channel. set to NULL to ignore processing of the given channel.
- * @param[in] out_stride distance between consecutive output samples (measured in bytes)
- * @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)
- */
-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 /* AVCODEC_AUDIOCONVERT_H */

libav-v9.6.tar.bz2/libavcodec/bfin/mpegvideo_bfin.c Deleted

@@ -1,147 +0,0 @@
-/*
- * BlackFin MPEGVIDEO OPTIMIZATIONS
- *
- * Copyright (C) 2007 Marc Hoffman <mmh@pleasantst.com>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
-#include "libavcodec/mpegvideo.h"
-#include "dsputil_bfin.h"
-
-static int dct_quantize_bfin (MpegEncContext *s,
- DCTELEM *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;
- bias = s->q_intra_matrix16[qscale][1];
- qmat = s->q_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;
-}
-
-void ff_MPV_common_init_bfin (MpegEncContext *s)
-{
-/* s->dct_quantize= dct_quantize_bfin; */
-}

libav-v9.6.tar.bz2/libavcodec/cavsdata.h Deleted

@@ -1,67 +0,0 @@
-/*
- * Chinese AVS video (AVS1-P2, JiZhun profile) decoder.
- * Copyright (c) 2006 Stefan Gehrer <stefan.gehrer@gmx.de>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_CAVSDATA_H
-#define AVCODEC_CAVSDATA_H
-
-#include "cavs.h"
-
-const uint8_t ff_cavs_partition_flags[30] = {
- 0, //I_8X8
- 0, //P_SKIP
- 0, //P_16X16
- SPLITH, //P_16X8
- SPLITV, //P_8X16
- SPLITH|SPLITV, //P_8X8
- SPLITH|SPLITV, //B_SKIP
- SPLITH|SPLITV, //B_DIRECT
- 0, //B_FWD_16X16
- 0, //B_BWD_16X16
- 0, //B_SYM_16X16
- FWD0|FWD1 |SPLITH,
- FWD0|FWD1 |SPLITV,
- BWD0|BWD1 |SPLITH,
- BWD0|BWD1 |SPLITV,
- FWD0|BWD1 |SPLITH,
- FWD0|BWD1 |SPLITV,
- BWD0|FWD1 |SPLITH,
- BWD0|FWD1 |SPLITV,
- FWD0|FWD1 |SYM1|SPLITH,
- FWD0|FWD1 |SYM1 |SPLITV,
- BWD0|FWD1 |SYM1|SPLITH,
- BWD0|FWD1 |SYM1 |SPLITV,
- FWD0|FWD1|SYM0 |SPLITH,
- FWD0|FWD1|SYM0 |SPLITV,
- FWD0|BWD1|SYM0 |SPLITH,
- FWD0|BWD1|SYM0 |SPLITV,
- FWD0|FWD1|SYM0|SYM1|SPLITH,
- FWD0|FWD1|SYM0|SYM1 |SPLITV,
- SPLITH|SPLITV, //B_8X8 = 29
-};
-
-/** mark block as "no prediction from this direction"
- e.g. forward motion vector in BWD partition */
-const cavs_vector ff_cavs_dir_mv = {0,0,1,REF_DIR};
-
-/** mark block as using intra prediction */
-const cavs_vector ff_cavs_intra_mv = {0,0,1,REF_INTRA};
-
-#endif /* AVCODEC_CAVSDATA_H */

libav-v9.6.tar.bz2/libavcodec/dca_parser.h Deleted

@@ -1,36 +0,0 @@
-/*
- * DCA parser
- * Copyright (C) 2004 Gildas Bazin
- * Copyright (C) 2004 Benjamin Zores
- * Copyright (C) 2006 Benjamin Larsson
- * Copyright (C) 2007 Konstantin Shishkov
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_DCA_PARSER_H
-#define AVCODEC_DCA_PARSER_H
-
-#include <stdint.h>
-
-/**
- * Convert bitstream to one representation based on sync marker
- */
-int ff_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
- int max_size);
-
-#endif /* AVCODEC_DCA_PARSER_H */

libav-v9.6.tar.bz2/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 Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; 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 */

libav-v9.6.tar.bz2/libavcodec/dwt.c Deleted

@@ -1,861 +0,0 @@
-/*
- * Copyright (C) 2004-2010 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; 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/common.h"
-#include "dsputil.h"
-#include "dwt.h"
-
-int ff_slice_buffer_init(slice_buffer *buf, int line_count,
- int max_allocated_lines, int line_width,
- IDWTELEM *base_buffer)
-{
- int i;
-
- buf->base_buffer = base_buffer;
- buf->line_count = line_count;
- buf->line_width = line_width;
- buf->data_count = max_allocated_lines;
- buf->line = av_mallocz(sizeof(IDWTELEM *) * line_count);
- if (!buf->line)
- return AVERROR(ENOMEM);
- buf->data_stack = av_malloc(sizeof(IDWTELEM *) * max_allocated_lines);
- if (!buf->data_stack) {
- av_free(buf->line);
- return AVERROR(ENOMEM);
- }
-
- for (i = 0; i < max_allocated_lines; i++) {
- buf->data_stack[i] = av_malloc(sizeof(IDWTELEM) * line_width);
- if (!buf->data_stack[i]) {
- for (i--; i >=0; i--)
- av_free(buf->data_stack[i]);
- av_free(buf->data_stack);
- av_free(buf->line);
- return AVERROR(ENOMEM);
- }
- }
-
- buf->data_stack_top = max_allocated_lines - 1;
- return 0;
-}
-
-IDWTELEM *ff_slice_buffer_load_line(slice_buffer *buf, int line)
-{
- IDWTELEM *buffer;
-
- assert(buf->data_stack_top >= 0);
-// assert(!buf->line[line]);
- if (buf->line[line])
- return buf->line[line];
-
- buffer = buf->data_stack[buf->data_stack_top];
- buf->data_stack_top--;
- buf->line[line] = buffer;
-
- return buffer;
-}
-
-void ff_slice_buffer_release(slice_buffer *buf, int line)
-{
- IDWTELEM *buffer;
-
- assert(line >= 0 && line < buf->line_count);
- assert(buf->line[line]);
-
- buffer = buf->line[line];
- buf->data_stack_top++;
- buf->data_stack[buf->data_stack_top] = buffer;
- buf->line[line] = NULL;
-}
-
-void ff_slice_buffer_flush(slice_buffer *buf)
-{
- int i;
- for (i = 0; i < buf->line_count; i++)
- if (buf->line[i])
- ff_slice_buffer_release(buf, i);
-}
-
-void ff_slice_buffer_destroy(slice_buffer *buf)
-{
- int i;
- ff_slice_buffer_flush(buf);
-
- for (i = buf->data_count - 1; i >= 0; i--)
- av_freep(&buf->data_stack[i]);
- av_freep(&buf->data_stack);
- av_freep(&buf->line);
-}
-
-static inline int mirror(int v, int m)
-{
- while ((unsigned)v > (unsigned)m) {
- v = -v;
- if (v < 0)
- v += 2 * m;
- }
- return v;
-}
-
-static av_always_inline void lift(DWTELEM *dst, DWTELEM *src, DWTELEM *ref,
- int dst_step, int src_step, int ref_step,
- int width, int mul, int add, int shift,
- int highpass, int inverse)
-{
- const int mirror_left = !highpass;
- const int mirror_right = (width & 1) ^ highpass;
- const int w = (width >> 1) - 1 + (highpass & width);
- int i;
-
-#define LIFT(src, ref, inv) ((src) + ((inv) ? -(ref) : +(ref)))
- if (mirror_left) {
- dst[0] = LIFT(src[0], ((mul * 2 * ref[0] + add) >> shift), inverse);
- dst += dst_step;
- src += src_step;
- }
-
- for (i = 0; i < w; i++)
- dst[i * dst_step] = LIFT(src[i * src_step],
- ((mul * (ref[i * ref_step] +
- ref[(i + 1) * ref_step]) +
- add) >> shift),
- inverse);
-
- if (mirror_right)
- dst[w * dst_step] = LIFT(src[w * src_step],
- ((mul * 2 * ref[w * ref_step] + add) >> shift),
- inverse);
-}
-
-static av_always_inline void liftS(DWTELEM *dst, DWTELEM *src, DWTELEM *ref,
- int dst_step, int src_step, int ref_step,
- int width, int mul, int add, int shift,
- int highpass, int inverse)
-{
- const int mirror_left = !highpass;
- const int mirror_right = (width & 1) ^ highpass;
- const int w = (width >> 1) - 1 + (highpass & width);
- int i;
-
- assert(shift == 4);
-#define LIFTS(src, ref, inv) \
- ((inv) ? (src) + (((ref) + 4 * (src)) >> shift) \
- : -((-16 * (src) + (ref) + add / \
- 4 + 1 + (5 << 25)) / (5 * 4) - (1 << 23)))
- if (mirror_left) {
- dst[0] = LIFTS(src[0], mul * 2 * ref[0] + add, inverse);
- dst += dst_step;
- src += src_step;
- }
-
- for (i = 0; i < w; i++)
- dst[i * dst_step] = LIFTS(src[i * src_step],
- mul * (ref[i * ref_step] +
- ref[(i + 1) * ref_step]) + add,
- inverse);
-
- if (mirror_right)
- dst[w * dst_step] = LIFTS(src[w * src_step],
- mul * 2 * ref[w * ref_step] + add,
- inverse);
-}
-
-static void horizontal_decompose53i(DWTELEM *b, DWTELEM *temp, int width)
-{
- const int width2 = width >> 1;
- int x;
- const int w2 = (width + 1) >> 1;
-
- for (x = 0; x < width2; x++) {
- temp[x] = b[2 * x];
- temp[x + w2] = b[2 * x + 1];
- }
- if (width & 1)
- temp[x] = b[2 * x];
- lift(b + w2, temp + w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 0);
- lift(b, temp, b + w2, 1, 1, 1, width, 1, 2, 2, 0, 0);
-}
-
-static void vertical_decompose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2,
- int width)
-{
- int i;
-
- for (i = 0; i < width; i++)
- b1[i] -= (b0[i] + b2[i]) >> 1;
-}
-
-static void vertical_decompose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2,
- int width)
-{
- int i;
-
- for (i = 0; i < width; i++)
- b1[i] += (b0[i] + b2[i] + 2) >> 2;
-}
-
-static void spatial_decompose53i(DWTELEM *buffer, DWTELEM *temp,
- int width, int height, int stride)
-{
- int y;
- DWTELEM *b0 = buffer + mirror(-2 - 1, height - 1) * stride;
- DWTELEM *b1 = buffer + mirror(-2, height - 1) * stride;
-
- for (y = -2; y < height; y += 2) {
- DWTELEM *b2 = buffer + mirror(y + 1, height - 1) * stride;
- DWTELEM *b3 = buffer + mirror(y + 2, height - 1) * stride;
-
- if (y + 1 < (unsigned)height)
- horizontal_decompose53i(b2, temp, width);
- if (y + 2 < (unsigned)height)
- horizontal_decompose53i(b3, temp, width);
-
- if (y + 1 < (unsigned)height)
- vertical_decompose53iH0(b1, b2, b3, width);
- if (y + 0 < (unsigned)height)
- vertical_decompose53iL0(b0, b1, b2, width);
-
- b0 = b2;
- b1 = b3;
- }
-}
-
-static void horizontal_decompose97i(DWTELEM *b, DWTELEM *temp, int width)
-{
- const int w2 = (width + 1) >> 1;
-
- lift(temp + w2, b + 1, b, 1, 2, 2, width, W_AM, W_AO, W_AS, 1, 1);
- liftS(temp, b, temp + w2, 1, 2, 1, width, W_BM, W_BO, W_BS, 0, 0);
- lift(b + w2, temp + w2, temp, 1, 1, 1, width, W_CM, W_CO, W_CS, 1, 0);
- lift(b, temp, b + w2, 1, 1, 1, width, W_DM, W_DO, W_DS, 0, 0);
-}
-
-static void vertical_decompose97iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2,
- int width)
-{
- int i;
-
- for (i = 0; i < width; i++)
- b1[i] -= (W_AM * (b0[i] + b2[i]) + W_AO) >> W_AS;
-}
-
-static void vertical_decompose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2,
- int width)
-{
- int i;
-
- for (i = 0; i < width; i++)
- b1[i] += (W_CM * (b0[i] + b2[i]) + W_CO) >> W_CS;
-}
-
-static void vertical_decompose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2,
- int width)
-{
- int i;
-
- for (i = 0; i < width; i++)
- b1[i] = (16 * 4 * b1[i] - 4 * (b0[i] + b2[i]) + W_BO * 5 + (5 << 27)) /
- (5 * 16) - (1 << 23);
-}
-
-static void vertical_decompose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2,
- int width)
-{
- int i;
-
- for (i = 0; i < width; i++)
- b1[i] += (W_DM * (b0[i] + b2[i]) + W_DO) >> W_DS;
-}
-
-static void spatial_decompose97i(DWTELEM *buffer, DWTELEM *temp,
- int width, int height, int stride)
-{
- int y;
- DWTELEM *b0 = buffer + mirror(-4 - 1, height - 1) * stride;
- DWTELEM *b1 = buffer + mirror(-4, height - 1) * stride;
- DWTELEM *b2 = buffer + mirror(-4 + 1, height - 1) * stride;
- DWTELEM *b3 = buffer + mirror(-4 + 2, height - 1) * stride;
-
- for (y = -4; y < height; y += 2) {
- DWTELEM *b4 = buffer + mirror(y + 3, height - 1) * stride;
- DWTELEM *b5 = buffer + mirror(y + 4, height - 1) * stride;
-
- if (y + 3 < (unsigned)height)
- horizontal_decompose97i(b4, temp, width);
- if (y + 4 < (unsigned)height)
- horizontal_decompose97i(b5, temp, width);
-
- if (y + 3 < (unsigned)height)
- vertical_decompose97iH0(b3, b4, b5, width);
- if (y + 2 < (unsigned)height)
- vertical_decompose97iL0(b2, b3, b4, width);
- if (y + 1 < (unsigned)height)
- vertical_decompose97iH1(b1, b2, b3, width);
- if (y + 0 < (unsigned)height)
- vertical_decompose97iL1(b0, b1, b2, width);
-
- b0 = b2;
- b1 = b3;
- b2 = b4;
- b3 = b5;
- }
-}
-
-void ff_spatial_dwt(DWTELEM *buffer, DWTELEM *temp, int width, int height,
- int stride, int type, int decomposition_count)
-{
- int level;
-
- for (level = 0; level < decomposition_count; level++) {
- switch (type) {
- case DWT_97:
- spatial_decompose97i(buffer, temp,
- width >> level, height >> level,
- stride << level);
- break;
- case DWT_53:
- spatial_decompose53i(buffer, temp,
- width >> level, height >> level,
- stride << level);
- break;
- }
- }
-}
-
-static void horizontal_compose53i(IDWTELEM *b, IDWTELEM *temp, int width)
-{
- const int width2 = width >> 1;
- const int w2 = (width + 1) >> 1;
- int x;
-
- for (x = 0; x < width2; x++) {
- temp[2 * x] = b[x];
- temp[2 * x + 1] = b[x + w2];
- }
- if (width & 1)
- temp[2 * x] = b[x];
-
- b[0] = temp[0] - ((temp[1] + 1) >> 1);
- for (x = 2; x < width - 1; x += 2) {
- b[x] = temp[x] - ((temp[x - 1] + temp[x + 1] + 2) >> 2);
- b[x - 1] = temp[x - 1] + ((b[x - 2] + b[x] + 1) >> 1);
- }
- if (width & 1) {
- b[x] = temp[x] - ((temp[x - 1] + 1) >> 1);
- b[x - 1] = temp[x - 1] + ((b[x - 2] + b[x] + 1) >> 1);
- } else
- b[x - 1] = temp[x - 1] + b[x - 2];
-}
-
-static void vertical_compose53iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
- int width)
-{
- int i;
-
- for (i = 0; i < width; i++)
- b1[i] += (b0[i] + b2[i]) >> 1;
-}
-
-static void vertical_compose53iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
- int width)
-{
- int i;
-
- for (i = 0; i < width; i++)
- b1[i] -= (b0[i] + b2[i] + 2) >> 2;
-}
-
-static void spatial_compose53i_buffered_init(DWTCompose *cs, slice_buffer *sb,
- int height, int stride_line)
-{
- cs->b0 = slice_buffer_get_line(sb,
- mirror(-1 - 1, height - 1) * stride_line);
- cs->b1 = slice_buffer_get_line(sb, mirror(-1, height - 1) * stride_line);
- cs->y = -1;
-}
-
-static void spatial_compose53i_init(DWTCompose *cs, IDWTELEM *buffer,
- int height, int stride)
-{
- cs->b0 = buffer + mirror(-1 - 1, height - 1) * stride;
- cs->b1 = buffer + mirror(-1, height - 1) * stride;
- cs->y = -1;
-}
-
-static void spatial_compose53i_dy_buffered(DWTCompose *cs, slice_buffer *sb,
- IDWTELEM *temp,
- int width, int height,
- int stride_line)
-{
- int y = cs->y;
-
- IDWTELEM *b0 = cs->b0;
- IDWTELEM *b1 = cs->b1;
- IDWTELEM *b2 = slice_buffer_get_line(sb,
- mirror(y + 1, height - 1) *
- stride_line);
- IDWTELEM *b3 = slice_buffer_get_line(sb,
- mirror(y + 2, height - 1) *
- stride_line);
-
- if (y + 1 < (unsigned)height && y < (unsigned)height) {
- int x;
-
- for (x = 0; x < width; x++) {
- b2[x] -= (b1[x] + b3[x] + 2) >> 2;
- b1[x] += (b0[x] + b2[x]) >> 1;
- }
- } else {
- if (y + 1 < (unsigned)height)
- vertical_compose53iL0(b1, b2, b3, width);
- if (y + 0 < (unsigned)height)
- vertical_compose53iH0(b0, b1, b2, width);
- }
-
- if (y - 1 < (unsigned)height)
- horizontal_compose53i(b0, temp, width);
- if (y + 0 < (unsigned)height)
- horizontal_compose53i(b1, temp, width);
-
- cs->b0 = b2;
- cs->b1 = b3;
- cs->y += 2;
-}
-
-static void spatial_compose53i_dy(DWTCompose *cs, IDWTELEM *buffer,
- IDWTELEM *temp, int width, int height,
- int stride)
-{
- int y = cs->y;
- IDWTELEM *b0 = cs->b0;
- IDWTELEM *b1 = cs->b1;
- IDWTELEM *b2 = buffer + mirror(y + 1, height - 1) * stride;
- IDWTELEM *b3 = buffer + mirror(y + 2, height - 1) * stride;
-
- if (y + 1 < (unsigned)height)
- vertical_compose53iL0(b1, b2, b3, width);
- if (y + 0 < (unsigned)height)
- vertical_compose53iH0(b0, b1, b2, width);
-
- if (y - 1 < (unsigned)height)
- horizontal_compose53i(b0, temp, width);
- if (y + 0 < (unsigned)height)
- horizontal_compose53i(b1, temp, width);
-
- cs->b0 = b2;
- cs->b1 = b3;
- cs->y += 2;
-}
-
-void ff_snow_horizontal_compose97i(IDWTELEM *b, IDWTELEM *temp, int width)
-{
- const int w2 = (width + 1) >> 1;
- int x;
-
- temp[0] = b[0] - ((3 * b[w2] + 2) >> 2);
- for (x = 1; x < (width >> 1); x++) {
- temp[2 * x] = b[x] - ((3 * (b[x + w2 - 1] + b[x + w2]) + 4) >> 3);
- temp[2 * x - 1] = b[x + w2 - 1] - temp[2 * x - 2] - temp[2 * x];
- }
- if (width & 1) {
- temp[2 * x] = b[x] - ((3 * b[x + w2 - 1] + 2) >> 2);
- temp[2 * x - 1] = b[x + w2 - 1] - temp[2 * x - 2] - temp[2 * x];
- } else
- temp[2 * x - 1] = b[x + w2 - 1] - 2 * temp[2 * x - 2];
-
- b[0] = temp[0] + ((2 * temp[0] + temp[1] + 4) >> 3);
- for (x = 2; x < width - 1; x += 2) {
- b[x] = temp[x] + ((4 * temp[x] + temp[x - 1] + temp[x + 1] + 8) >> 4);
- b[x - 1] = temp[x - 1] + ((3 * (b[x - 2] + b[x])) >> 1);
- }
- if (width & 1) {
- b[x] = temp[x] + ((2 * temp[x] + temp[x - 1] + 4) >> 3);
- b[x - 1] = temp[x - 1] + ((3 * (b[x - 2] + b[x])) >> 1);
- } else
- b[x - 1] = temp[x - 1] + 3 * b[x - 2];
-}
-
-static void vertical_compose97iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
- int width)
-{
- int i;
-
- for (i = 0; i < width; i++)
- b1[i] += (W_AM * (b0[i] + b2[i]) + W_AO) >> W_AS;
-}
-
-static void vertical_compose97iH1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
- int width)
-{
- int i;
-
- for (i = 0; i < width; i++)
- b1[i] -= (W_CM * (b0[i] + b2[i]) + W_CO) >> W_CS;
-}
-
-static void vertical_compose97iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
- int width)
-{
- int i;
-
- for (i = 0; i < width; i++)
- b1[i] += (W_BM * (b0[i] + b2[i]) + 4 * b1[i] + W_BO) >> W_BS;
-}
-
-static void vertical_compose97iL1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
- int width)
-{
- int i;
-
- for (i = 0; i < width; i++)
- b1[i] -= (W_DM * (b0[i] + b2[i]) + W_DO) >> W_DS;
-}
-
-void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
- IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5,
- int width)
-{
- int i;
-
- for (i = 0; i < width; i++) {
- b4[i] -= (W_DM * (b3[i] + b5[i]) + W_DO) >> W_DS;
- b3[i] -= (W_CM * (b2[i] + b4[i]) + W_CO) >> W_CS;
- b2[i] += (W_BM * (b1[i] + b3[i]) + 4 * b2[i] + W_BO) >> W_BS;
- b1[i] += (W_AM * (b0[i] + b2[i]) + W_AO) >> W_AS;
- }
-}
-
-static void spatial_compose97i_buffered_init(DWTCompose *cs, slice_buffer *sb,
- int height, int stride_line)
-{
- cs->b0 = slice_buffer_get_line(sb, mirror(-3 - 1, height - 1) * stride_line);
- cs->b1 = slice_buffer_get_line(sb, mirror(-3, height - 1) * stride_line);
- cs->b2 = slice_buffer_get_line(sb, mirror(-3 + 1, height - 1) * stride_line);
- cs->b3 = slice_buffer_get_line(sb, mirror(-3 + 2, height - 1) * stride_line);
- cs->y = -3;
-}
-
-static void spatial_compose97i_init(DWTCompose *cs, IDWTELEM *buffer, int height,
- int stride)
-{
- cs->b0 = buffer + mirror(-3 - 1, height - 1) * stride;
- cs->b1 = buffer + mirror(-3, height - 1) * stride;
- cs->b2 = buffer + mirror(-3 + 1, height - 1) * stride;
- cs->b3 = buffer + mirror(-3 + 2, height - 1) * stride;
- cs->y = -3;
-}
-
-static void spatial_compose97i_dy_buffered(DWTContext *dsp, DWTCompose *cs,
- slice_buffer * sb, IDWTELEM *temp,
- int width, int height,
- int stride_line)
-{
- int y = cs->y;
-
- IDWTELEM *b0 = cs->b0;
- IDWTELEM *b1 = cs->b1;
- IDWTELEM *b2 = cs->b2;
- IDWTELEM *b3 = cs->b3;
- IDWTELEM *b4 = slice_buffer_get_line(sb,
- mirror(y + 3, height - 1) *
- stride_line);
- IDWTELEM *b5 = slice_buffer_get_line(sb,
- mirror(y + 4, height - 1) *
- stride_line);
-
- if (y > 0 && y + 4 < height) {
- dsp->vertical_compose97i(b0, b1, b2, b3, b4, b5, width);
- } else {
- if (y + 3 < (unsigned)height)
- vertical_compose97iL1(b3, b4, b5, width);
- if (y + 2 < (unsigned)height)
- vertical_compose97iH1(b2, b3, b4, width);
- if (y + 1 < (unsigned)height)
- vertical_compose97iL0(b1, b2, b3, width);
- if (y + 0 < (unsigned)height)
- vertical_compose97iH0(b0, b1, b2, width);
- }
-
- if (y - 1 < (unsigned)height)
- dsp->horizontal_compose97i(b0, temp, width);
- if (y + 0 < (unsigned)height)
- dsp->horizontal_compose97i(b1, temp, width);
-
- cs->b0 = b2;
- cs->b1 = b3;
- cs->b2 = b4;
- cs->b3 = b5;
- cs->y += 2;
-}
-
-static void spatial_compose97i_dy(DWTCompose *cs, IDWTELEM *buffer,
- IDWTELEM *temp, int width, int height,
- int stride)
-{
- int y = cs->y;
- IDWTELEM *b0 = cs->b0;
- IDWTELEM *b1 = cs->b1;
- IDWTELEM *b2 = cs->b2;
- IDWTELEM *b3 = cs->b3;
- IDWTELEM *b4 = buffer + mirror(y + 3, height - 1) * stride;
- IDWTELEM *b5 = buffer + mirror(y + 4, height - 1) * stride;
-
- if (y + 3 < (unsigned)height)
- vertical_compose97iL1(b3, b4, b5, width);
- if (y + 2 < (unsigned)height)
- vertical_compose97iH1(b2, b3, b4, width);
- if (y + 1 < (unsigned)height)
- vertical_compose97iL0(b1, b2, b3, width);
- if (y + 0 < (unsigned)height)
- vertical_compose97iH0(b0, b1, b2, width);
-
- if (y - 1 < (unsigned)height)
- ff_snow_horizontal_compose97i(b0, temp, width);
- if (y + 0 < (unsigned)height)
- ff_snow_horizontal_compose97i(b1, temp, width);
-
- cs->b0 = b2;
- cs->b1 = b3;
- cs->b2 = b4;
- cs->b3 = b5;
- cs->y += 2;
-}
-
-void ff_spatial_idwt_buffered_init(DWTCompose *cs, slice_buffer *sb, int width,
- int height, int stride_line, int type,
- int decomposition_count)
-{
- int level;
- for (level = decomposition_count - 1; level >= 0; level--) {
- switch (type) {
- case DWT_97:
- spatial_compose97i_buffered_init(cs + level, sb, height >> level,
- stride_line << level);
- break;
- case DWT_53:
- spatial_compose53i_buffered_init(cs + level, sb, height >> level,
- stride_line << level);
- break;
- }
- }
-}
-
-void ff_spatial_idwt_buffered_slice(DWTContext *dsp, DWTCompose *cs,
- slice_buffer *slice_buf, IDWTELEM *temp,
- int width, int height, int stride_line,
- int type, int decomposition_count, int y)
-{
- const int support = type == 1 ? 3 : 5;
- int level;
- if (type == 2)
- return;
-
- for (level = decomposition_count - 1; level >= 0; level--)
- while (cs[level].y <= FFMIN((y >> level) + support, height >> level)) {
- switch (type) {
- case DWT_97:
- spatial_compose97i_dy_buffered(dsp, cs + level, slice_buf, temp,
- width >> level,
- height >> level,
- stride_line << level);
- break;
- case DWT_53:
- spatial_compose53i_dy_buffered(cs + level, slice_buf, temp,
- width >> level,
- height >> level,
- stride_line << level);
- break;
- }
- }
-}
-
-static void ff_spatial_idwt_init(DWTCompose *cs, IDWTELEM *buffer, int width,
- int height, int stride, int type,
- int decomposition_count)
-{
- int level;
- for (level = decomposition_count - 1; level >= 0; level--) {
- switch (type) {
- case DWT_97:
- spatial_compose97i_init(cs + level, buffer, height >> level,
- stride << level);
- break;
- case DWT_53:
- spatial_compose53i_init(cs + level, buffer, height >> level,
- stride << level);
- break;
- }
- }
-}
-
-static void ff_spatial_idwt_slice(DWTCompose *cs, IDWTELEM *buffer,
- IDWTELEM *temp, int width, int height,
- int stride, int type,
- int decomposition_count, int y)
-{
- const int support = type == 1 ? 3 : 5;
- int level;
- if (type == 2)
- return;
-
- for (level = decomposition_count - 1; level >= 0; level--)
- while (cs[level].y <= FFMIN((y >> level) + support, height >> level)) {
- switch (type) {
- case DWT_97:
- spatial_compose97i_dy(cs + level, buffer, temp, width >> level,
- height >> level, stride << level);
- break;
- case DWT_53:
- spatial_compose53i_dy(cs + level, buffer, temp, width >> level,
- height >> level, stride << level);
- break;
- }
- }
-}
-
-void ff_spatial_idwt(IDWTELEM *buffer, IDWTELEM *temp, int width, int height,
- int stride, int type, int decomposition_count)
-{
- DWTCompose cs[MAX_DECOMPOSITIONS];
- int y;
- ff_spatial_idwt_init(cs, buffer, width, height, stride, type,
- decomposition_count);
- for (y = 0; y < height; y += 4)
- ff_spatial_idwt_slice(cs, buffer, temp, width, height, stride, type,
- decomposition_count, y);
-}
-
-static inline int w_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size,
- int w, int h, int type)
-{
- int s, i, j;
- const int dec_count = w == 8 ? 3 : 4;
- int tmp[32 * 32], tmp2[32];
- int level, ori;
- static const int scale[2][2][4][4] = {
- {
- { // 9/7 8x8 dec=3
- { 268, 239, 239, 213 },
- { 0, 224, 224, 152 },
- { 0, 135, 135, 110 },
- },
- { // 9/7 16x16 or 32x32 dec=4
- { 344, 310, 310, 280 },
- { 0, 320, 320, 228 },
- { 0, 175, 175, 136 },
- { 0, 129, 129, 102 },
- }
- },
- {
- { // 5/3 8x8 dec=3
- { 275, 245, 245, 218 },
- { 0, 230, 230, 156 },
- { 0, 138, 138, 113 },
- },
- { // 5/3 16x16 or 32x32 dec=4
- { 352, 317, 317, 286 },
- { 0, 328, 328, 233 },
- { 0, 180, 180, 140 },
- { 0, 132, 132, 105 },
- }
- }
- };
-
- for (i = 0; i < h; i++) {
- for (j = 0; j < w; j += 4) {
- tmp[32 * i + j + 0] = (pix1[j + 0] - pix2[j + 0]) << 4;
- tmp[32 * i + j + 1] = (pix1[j + 1] - pix2[j + 1]) << 4;
- tmp[32 * i + j + 2] = (pix1[j + 2] - pix2[j + 2]) << 4;
- tmp[32 * i + j + 3] = (pix1[j + 3] - pix2[j + 3]) << 4;
- }
- pix1 += line_size;
- pix2 += line_size;
- }
-
- ff_spatial_dwt(tmp, tmp2, w, h, 32, type, dec_count);
-
- s = 0;
- assert(w == h);
- for (level = 0; level < dec_count; level++)
- for (ori = level ? 1 : 0; ori < 4; ori++) {
- int size = w >> (dec_count - level);
- int sx = (ori & 1) ? size : 0;
- int stride = 32 << (dec_count - level);
- int sy = (ori & 2) ? stride >> 1 : 0;
-
- for (i = 0; i < size; i++)
- for (j = 0; j < size; j++) {
- int v = tmp[sx + sy + i * stride + j] *
- scale[type][dec_count - 3][level][ori];
- s += FFABS(v);
- }
- }
- assert(s >= 0);
- return s >> 9;
-}
-
-static int w53_8_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
-{
- return w_c(v, pix1, pix2, line_size, 8, h, 1);
-}
-
-static int w97_8_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
-{
- return w_c(v, pix1, pix2, line_size, 8, h, 0);
-}
-
-static int w53_16_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
-{
- return w_c(v, pix1, pix2, line_size, 16, h, 1);
-}
-
-static int w97_16_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
-{
- return w_c(v, pix1, pix2, line_size, 16, h, 0);
-}
-
-int ff_w53_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
-{
- return w_c(v, pix1, pix2, line_size, 32, h, 1);
-}
-
-int ff_w97_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
-{
- return w_c(v, pix1, pix2, line_size, 32, h, 0);
-}
-
-void ff_dsputil_init_dwt(DSPContext *c)
-{
- c->w53[0] = w53_16_c;
- c->w53[1] = w53_8_c;
- c->w97[0] = w97_16_c;
- c->w97[1] = w97_8_c;
-}
-
-void ff_dwt_init(DWTContext *c)
-{
- c->vertical_compose97i = ff_snow_vertical_compose97i;
- c->horizontal_compose97i = ff_snow_horizontal_compose97i;
- c->inner_add_yblock = ff_snow_inner_add_yblock;
-
- if (HAVE_MMX)
- ff_dwt_init_x86(c);
-}

libav-v9.6.tar.bz2/libavcodec/dwt.h Deleted

@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2004-2010 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_DWT_H
-#define AVCODEC_DWT_H
-
-#include <stdint.h>
-
-typedef int DWTELEM;
-typedef short IDWTELEM;
-
-typedef struct DWTCompose {
- IDWTELEM *b0;
- IDWTELEM *b1;
- IDWTELEM *b2;
- IDWTELEM *b3;
- int y;
-} DWTCompose;
-
-/** Used to minimize the amount of memory used in order to
- * optimize cache performance. **/
-typedef struct slice_buffer_s {
- IDWTELEM **line; ///< For use by idwt and predict_slices.
- IDWTELEM **data_stack; ///< Used for internal purposes.
- int data_stack_top;
- int line_count;
- int line_width;
- int data_count;
- IDWTELEM *base_buffer; ///< Buffer that this structure is caching.
-} slice_buffer;
-
-typedef struct DWTContext {
- void (*vertical_compose97i)(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
- IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5,
- int width);
- void (*horizontal_compose97i)(IDWTELEM *b, IDWTELEM *temp, int width);
- void (*inner_add_yblock)(const uint8_t *obmc, const int obmc_stride,
- uint8_t **block, int b_w, int b_h, int src_x,
- int src_y, int src_stride, slice_buffer *sb,
- int add, uint8_t *dst8);
-} DWTContext;
-
-#define MAX_DECOMPOSITIONS 8
-
-#define DWT_97 0
-#define DWT_53 1
-
-#define liftS lift
-#define W_AM 3
-#define W_AO 0
-#define W_AS 1
-
-#undef liftS
-#define W_BM 1
-#define W_BO 8
-#define W_BS 4
-
-#define W_CM 1
-#define W_CO 0
-#define W_CS 0
-
-#define W_DM 3
-#define W_DO 4
-#define W_DS 3
-
-#define slice_buffer_get_line(slice_buf, line_num) \
- ((slice_buf)->line[line_num] ? (slice_buf)->line[line_num] \
- : ff_slice_buffer_load_line((slice_buf), \
- (line_num)))
-
-int ff_slice_buffer_init(slice_buffer *buf, int line_count,
- int max_allocated_lines, int line_width,
- IDWTELEM *base_buffer);
-void ff_slice_buffer_release(slice_buffer *buf, int line);
-void ff_slice_buffer_flush(slice_buffer *buf);
-void ff_slice_buffer_destroy(slice_buffer *buf);
-IDWTELEM *ff_slice_buffer_load_line(slice_buffer *buf, int line);
-
-void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
- IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5,
- int width);
-void ff_snow_horizontal_compose97i(IDWTELEM *b, IDWTELEM *temp, int width);
-void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride,
- uint8_t **block, int b_w, int b_h, int src_x,
- int src_y, int src_stride, slice_buffer *sb,
- int add, uint8_t *dst8);
-
-int ff_w53_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
-int ff_w97_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
-
-void ff_spatial_dwt(int *buffer, int *temp, int width, int height, int stride,
- int type, int decomposition_count);
-
-void ff_spatial_idwt_buffered_init(DWTCompose *cs, slice_buffer *sb, int width,
- int height, int stride_line, int type,
- int decomposition_count);
-void ff_spatial_idwt_buffered_slice(DWTContext *dsp, DWTCompose *cs,
- slice_buffer *slice_buf, IDWTELEM *temp,
- int width, int height, int stride_line,
- int type, int decomposition_count, int y);
-void ff_spatial_idwt(IDWTELEM *buffer, IDWTELEM *temp, int width, int height,
- int stride, int type, int decomposition_count);
-
-void ff_dwt_init(DWTContext *c);
-void ff_dwt_init_x86(DWTContext *c);
-
-#endif /* AVCODEC_DWT_H */

libav-v9.6.tar.bz2/libavcodec/fft.c Deleted

@@ -1,352 +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 Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; 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"
-
-/* 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),
-};
-
-static void ff_fft_permute_c(FFTContext *s, FFTComplex *z);
-static void ff_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
- 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 = ff_fft_permute_c;
- s->fft_calc = ff_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_FLOAT
- if (ARCH_ARM) ff_fft_init_arm(s);
- if (HAVE_ALTIVEC) ff_fft_init_altivec(s);
- if (ARCH_X86) ff_fft_init_x86(s);
- if (CONFIG_MDCT) s->mdct_calcw = s->mdct_calc;
-#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);
- }
-
- if (s->fft_permutation == FF_FFT_PERM_AVX) {
- fft_perm_avx(s);
- } else {
- for(i=0; i<n; i++) {
- int 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 ff_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);
-}
-
-#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 ff_fft_calc_c(FFTContext *s, FFTComplex *z)
-{
- fft_dispatch[s->nbits-2](z);
-}

libav-v9.6.tar.bz2/libavcodec/h261data.h Deleted

@@ -1,164 +0,0 @@
-/*
- * copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
- * copyright (c) 2004 Maarten Daniels
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * H.261 tables.
- */
-
-#ifndef AVCODEC_H261DATA_H
-#define AVCODEC_H261DATA_H
-
-#include <stdint.h>
-#include "h261.h"
-
-// H.261 VLC table for macroblock addressing
-static const uint8_t h261_mba_code[35] = {
- 1, 3, 2, 3,
- 2, 3, 2, 7,
- 6, 11, 10, 9,
- 8, 7, 6, 23,
- 22, 21, 20, 19,
- 18, 35, 34, 33,
- 32, 31, 30, 29,
- 28, 27, 26, 25,
- 24,
- 15, //(MBA stuffing)
- 1 //(start code)
-};
-
-static const uint8_t h261_mba_bits[35] = {
- 1, 3, 3, 4,
- 4, 5, 5, 7,
- 7, 8, 8, 8,
- 8, 8, 8, 10,
- 10, 10, 10, 10,
- 10, 11, 11, 11,
- 11, 11, 11, 11,
- 11, 11, 11, 11,
- 11,
- 11, //(MBA stuffing)
- 16 //(start code)
-};
-
-//H.261 VLC table for macroblock type
-static const uint8_t h261_mtype_code[10] = {
- 1, 1, 1, 1,
- 1, 1, 1, 1,
- 1, 1
-};
-
-static const uint8_t h261_mtype_bits[10] = {
- 4, 7, 1, 5,
- 9, 8, 10, 3,
- 2, 6
-};
-
-static const int h261_mtype_map[10]= {
- MB_TYPE_INTRA4x4,
- MB_TYPE_INTRA4x4 | MB_TYPE_QUANT,
- MB_TYPE_CBP,
- MB_TYPE_QUANT | MB_TYPE_CBP,
- MB_TYPE_16x16,
- MB_TYPE_CBP | MB_TYPE_16x16,
- MB_TYPE_QUANT | MB_TYPE_CBP | MB_TYPE_16x16,
- MB_TYPE_16x16 | MB_TYPE_H261_FIL,
- MB_TYPE_CBP | MB_TYPE_16x16 | MB_TYPE_H261_FIL,
- MB_TYPE_QUANT | MB_TYPE_CBP | MB_TYPE_16x16 | MB_TYPE_H261_FIL
-};
-
-//H.261 VLC table for motion vectors
-static const uint8_t h261_mv_tab[17][2] = {
- {1,1}, {1,2}, {1,3}, {1,4}, {3,6}, {5,7}, {4,7}, {3,7},
- {11,9}, {10,9}, {9,9}, {17,10}, {16,10}, {15,10}, {14,10}, {13,10}, {12,10}
-};
-
-static const int mvmap[17] =
-{
- 0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14, -15, -16
-};
-
-//H.261 VLC table for coded block pattern
-static const uint8_t h261_cbp_tab[63][2] =
-{
- {11,5}, {9,5}, {13,6}, {13,4}, {23,7}, {19,7}, {31,8}, {12,4},
- {22,7}, {18,7}, {30,8}, {19,5}, {27,8}, {23,8}, {19,8}, {11,4},
- {21,7}, {17,7}, {29,8}, {17,5}, {25,8}, {21,8}, {17,8}, {15,6},
- {15,8}, {13,8}, {3,9}, {15,5}, {11,8}, {7,8}, {7,9}, {10,4},
- {20,7}, {16,7}, {28,8}, {14,6}, {14,8}, {12,8}, {2,9}, {16,5},
- {24,8}, {20,8}, {16,8}, {14,5}, {10,8}, {6,8}, {6,9}, {18,5},
- {26,8}, {22,8}, {18,8}, {13,5}, {9,8}, {5,8}, {5,9}, {12,5},
- {8,8}, {4,8}, {4,9}, {7,3}, {10,5}, {8,5}, {12,6}
-};
-
-//H.261 VLC table for transform coefficients
-static const uint16_t h261_tcoeff_vlc[65][2] = {
-{ 0x2, 2 }, { 0x3, 2 },{ 0x4, 4 },{ 0x5, 5 },
-{ 0x6, 7 },{ 0x26, 8 },{ 0x21, 8 },{ 0xa, 10 },
-{ 0x1d, 12 },{ 0x18, 12 },{ 0x13, 12 },{ 0x10 , 12 },
-{ 0x1a, 13},{ 0x19, 13 }, { 0x18, 13 }, { 0x17, 13 },
-{ 0x3, 3 }, { 0x6, 6 }, { 0x25 , 8 }, { 0xc, 10 },
-{ 0x1b, 12 }, { 0x16, 13 }, { 0x15, 13 }, { 0x5, 4},
-{ 0x4, 7}, { 0xb, 10 }, { 0x14, 12 }, { 0x14, 13 },
-{ 0x7, 5 }, { 0x24, 8 }, { 0x1c, 12 }, { 0x13, 13 },
-{ 0x6, 5 }, { 0xf, 10 }, { 0x12, 12}, { 0x7, 6},
-{ 0x9 , 10 }, { 0x12, 13 }, { 0x5, 6 }, { 0x1e, 12 },
-{ 0x4, 6 }, { 0x15, 12 }, { 0x7, 7 }, { 0x11, 12},
-{ 0x5, 7 }, { 0x11, 13 }, { 0x27, 8 }, { 0x10, 13 },
-{ 0x23, 8 }, { 0x22, 8 }, { 0x20, 8 }, { 0xe , 10 },
-{ 0xd, 10 }, { 0x8, 10 },{ 0x1f, 12 }, { 0x1a, 12 },
-{ 0x19, 12 }, { 0x17, 12 }, { 0x16, 12}, { 0x1f, 13},
-{ 0x1e, 13 }, { 0x1d, 13 }, { 0x1c, 13}, { 0x1b, 13},
-{ 0x1, 6 } //escape
-};
-
-static const int8_t h261_tcoeff_level[64] = {
- 0, 1, 2, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 14, 15,
- 1, 2, 3, 4, 5, 6, 7, 1,
- 2, 3, 4, 5, 1, 2, 3, 4,
- 1, 2, 3, 1, 2, 3, 1, 2,
- 1, 2, 1, 2, 1, 2, 1, 2,
- 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1
-};
-
-static const int8_t h261_tcoeff_run[64] = {
- 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1,
- 1, 1, 1, 1, 1, 1, 2, 2,
- 2, 2, 2, 3, 3, 3, 3, 4,
- 4, 4, 5, 5, 5, 6, 6, 7,
- 7, 8, 8, 9, 9, 10, 10, 11,
- 12, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26
-};
-
-static RLTable h261_rl_tcoeff = {
- 64,
- 64,
- h261_tcoeff_vlc,
- h261_tcoeff_run,
- h261_tcoeff_level,
-};
-
-#endif /* AVCODEC_H261DATA_H */

libav-v9.6.tar.bz2/libavcodec/mdct.c Deleted

@@ -1,203 +0,0 @@
-/*
- * MDCT/IMDCT transforms
- * Copyright (c) 2002 Fabrice Bellard
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; 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
-# define RSCALE(x) ((x) >> 1)
-#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);
-}

libav-v9.6.tar.bz2/libavcodec/mp3_header_compress_bsf.c Deleted

@@ -1,88 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; 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={
- "mp3comp",
- 0,
- mp3_header_compress,
-};

libav-v9.6.tar.bz2/libavcodec/mp3_header_decompress_bsf.c Deleted

@@ -1,98 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; 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"
-#include "mpegaudiodata.h"
-
-
-static int mp3_header_decompress(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;
- int sample_rate= avctx->sample_rate;
- int sample_rate_index=0;
- int lsf, mpeg25, bitrate_index, frame_size;
-
- header = AV_RB32(buf);
- if(ff_mpa_check_header(header) >= 0){
- *poutbuf= (uint8_t *) buf;
- *poutbuf_size= buf_size;
-
- return 0;
- }
-
- if(avctx->extradata_size != 15 || strcmp(avctx->extradata, "FFCMP3 0.0")){
- av_log(avctx, AV_LOG_ERROR, "Extradata invalid %d\n", avctx->extradata_size);
- return -1;
- }
-
- header= AV_RB32(avctx->extradata+11) & MP3_MASK;
-
- lsf = sample_rate < (24000+32000)/2;
- mpeg25 = sample_rate < (12000+16000)/2;
- sample_rate_index= (header>>10)&3;
- sample_rate= avpriv_mpa_freq_tab[sample_rate_index] >> (lsf + mpeg25); //in case sample rate is a little off
-
- for(bitrate_index=2; bitrate_index<30; bitrate_index++){
- frame_size = avpriv_mpa_bitrate_tab[lsf][2][bitrate_index>>1];
- frame_size = (frame_size * 144000) / (sample_rate << lsf) + (bitrate_index&1);
- if(frame_size == buf_size + 4)
- break;
- if(frame_size == buf_size + 6)
- break;
- }
- if(bitrate_index == 30){
- av_log(avctx, AV_LOG_ERROR, "Could not find bitrate_index.\n");
- return -1;
- }
-
- header |= (bitrate_index&1)<<9;
- header |= (bitrate_index>>1)<<12;
- header |= (frame_size == buf_size + 4)<<16; //FIXME actually set a correct crc instead of 0
-
- *poutbuf_size= frame_size;
- *poutbuf= av_malloc(frame_size + FF_INPUT_BUFFER_PADDING_SIZE);
- memcpy(*poutbuf + frame_size - buf_size, buf, buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
-
- if(avctx->channels==2){
- uint8_t *p= *poutbuf + frame_size - buf_size;
- if(lsf){
- FFSWAP(int, p[1], p[2]);
- header |= (p[1] & 0xC0)>>2;
- p[1] &= 0x3F;
- }else{
- header |= p[1] & 0x30;
- p[1] &= 0xCF;
- }
- }
-
- AV_WB32(*poutbuf, header);
-
- return 1;
-}
-
-AVBitStreamFilter ff_mp3_header_decompress_bsf={
- "mp3decomp",
- 0,
- mp3_header_decompress,
-};

libav-v9.6.tar.bz2/libavcodec/mpeg12decdata.h Deleted

@@ -1,93 +0,0 @@
-/*
- * MPEG1/2 decoder tables
- * copyright (c) 2000,2001 Fabrice Bellard
- * copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * MPEG1/2 decoder tables.
- */
-
-#ifndef AVCODEC_MPEG12DECDATA_H
-#define AVCODEC_MPEG12DECDATA_H
-
-#include <stdint.h>
-#include "mpegvideo.h"
-
-
-#define MB_TYPE_ZERO_MV 0x20000000
-#define IS_ZERO_MV(a) ((a)&MB_TYPE_ZERO_MV)
-
-static const uint8_t table_mb_ptype[7][2] = {
- { 3, 5 }, // 0x01 MB_INTRA
- { 1, 2 }, // 0x02 MB_PAT
- { 1, 3 }, // 0x08 MB_FOR
- { 1, 1 }, // 0x0A MB_FOR|MB_PAT
- { 1, 6 }, // 0x11 MB_QUANT|MB_INTRA
- { 1, 5 }, // 0x12 MB_QUANT|MB_PAT
- { 2, 5 }, // 0x1A MB_QUANT|MB_FOR|MB_PAT
-};
-
-static const uint32_t ptype2mb_type[7] = {
- MB_TYPE_INTRA,
- MB_TYPE_L0 | MB_TYPE_CBP | MB_TYPE_ZERO_MV | MB_TYPE_16x16,
- MB_TYPE_L0,
- MB_TYPE_L0 | MB_TYPE_CBP,
- MB_TYPE_QUANT | MB_TYPE_INTRA,
- MB_TYPE_QUANT | MB_TYPE_L0 | MB_TYPE_CBP | MB_TYPE_ZERO_MV | MB_TYPE_16x16,
- MB_TYPE_QUANT | MB_TYPE_L0 | MB_TYPE_CBP,
-};
-
-static const uint8_t table_mb_btype[11][2] = {
- { 3, 5 }, // 0x01 MB_INTRA
- { 2, 3 }, // 0x04 MB_BACK
- { 3, 3 }, // 0x06 MB_BACK|MB_PAT
- { 2, 4 }, // 0x08 MB_FOR
- { 3, 4 }, // 0x0A MB_FOR|MB_PAT
- { 2, 2 }, // 0x0C MB_FOR|MB_BACK
- { 3, 2 }, // 0x0E MB_FOR|MB_BACK|MB_PAT
- { 1, 6 }, // 0x11 MB_QUANT|MB_INTRA
- { 2, 6 }, // 0x16 MB_QUANT|MB_BACK|MB_PAT
- { 3, 6 }, // 0x1A MB_QUANT|MB_FOR|MB_PAT
- { 2, 5 }, // 0x1E MB_QUANT|MB_FOR|MB_BACK|MB_PAT
-};
-
-static const uint32_t btype2mb_type[11] = {
- MB_TYPE_INTRA,
- MB_TYPE_L1,
- MB_TYPE_L1 | MB_TYPE_CBP,
- MB_TYPE_L0,
- MB_TYPE_L0 | MB_TYPE_CBP,
- MB_TYPE_L0L1,
- MB_TYPE_L0L1 | MB_TYPE_CBP,
- MB_TYPE_QUANT | MB_TYPE_INTRA,
- MB_TYPE_QUANT | MB_TYPE_L1 | MB_TYPE_CBP,
- MB_TYPE_QUANT | MB_TYPE_L0 | MB_TYPE_CBP,
- MB_TYPE_QUANT | MB_TYPE_L0L1 | MB_TYPE_CBP,
-};
-
-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,
-};
-
-#endif /* AVCODEC_MPEG12DECDATA_H */

libav-v9.6.tar.bz2/libavcodec/mpegaudiodec.c Deleted

@@ -1,2052 +0,0 @@
-/*
- * MPEG Audio decoder
- * Copyright (c) 2001, 2002 Fabrice Bellard
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; 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/channel_layout.h"
-#include "avcodec.h"
-#include "get_bits.h"
-#include "internal.h"
-#include "mathops.h"
-#include "mpegaudiodsp.h"
-#include "dsputil.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;
- DSPContext dsp;
- 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 ff_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 ff_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 ff_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 ff_compute_band_indexes(MPADecodeContext *s, GranuleDef *g)
-{
- if (g->block_type == 2) {
- if (g->switch_point) {
- /* 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;
- assert(e >= 1);
- 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];
- }
- assert(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];
- }
- assert(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 = pow(2.0, 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;
-
- ff_mpadsp_init(&s->mpadsp);
- ff_dsputil_init(&s->dsp, avctx);
-
- 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;
-
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
- 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;
- assert((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)
- 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_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_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-> dsp.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
-#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;
- }
-}
-
-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);
- ff_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);
- ff_init_long_region(s, g, region_address1, region_address2);
- }
- ff_region_offset2size(g);
- ff_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,
- FFMAX(0, LAST_BUF_SIZE - s->last_buf_size));
- assert((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 += extrasize * 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);
-
- if (nb_frames < 0)
- return nb_frames;
-
- 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);
- assert((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);
- }
- assert(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;
- }
-
- /* get output buffer */
- if (!samples) {
- s->frame.nb_samples = s->avctx->frame_size;
- if ((ret = ff_get_buffer(s->avctx, &s->frame)) < 0) {
- av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- 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;
-
- if (buf_size < HEADER_SIZE)
- return AVERROR_INVALIDDATA;
-
- header = AV_RB32(buf);
- 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) {
- buf_size= s->frame_size;
- }
-
- ret = mp_decode_frame(s, NULL, buf, buf_size);
- if (ret >= 0) {
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
- 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;
-
- 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;
-
- 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;
- *(AVFrame *)data = s->frame;
-
- return buf_size;
-}
-#endif /* CONFIG_MP3ADU_DECODER || CONFIG_MP3ADUFLOAT_DECODER */
-
-#if CONFIG_MP3ON4_DECODER || CONFIG_MP3ON4FLOAT_DECODER
-
-/**
- * Context for MP3On4 decoder
- */
-typedef struct MP3On4DecodeContext {
- AVFrame *frame;
- 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 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);
- s->frame = avctx->coded_frame;
- // 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)
-{
- 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 */
- s->frame->nb_samples = MPA_FRAME_SIZE;
- if ((ret = ff_get_buffer(avctx, s->frame)) < 0) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return ret;
- }
- out_samples = (OUT_INT **)s->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];
- assert(m != NULL);
-
- 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) {
- 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;
-
- s->frame->nb_samples = out_size / (avctx->channels * sizeof(OUT_INT));
- *got_frame_ptr = 1;
- *(AVFrame *)data = *s->frame;
-
- return buf_size;
-}
-#endif /* CONFIG_MP3ON4_DECODER || CONFIG_MP3ON4FLOAT_DECODER */
-
-#if !CONFIG_FLOAT
-#if CONFIG_MP1_DECODER
-AVCodec ff_mp1_decoder = {
- .name = "mp1",
- .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,
- .long_name = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"),
- .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",
- .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,
- .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
- .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",
- .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,
- .long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"),
- .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",
- .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,
- .long_name = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"),
- .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",
- .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,
- .long_name = NULL_IF_CONFIG_SMALL("MP3onMP4"),
- .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
- AV_SAMPLE_FMT_NONE },
-};
-#endif
-#endif

libav-v9.6.tar.bz2/libavcodec/old_codec_ids.h Deleted

@@ -1,366 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_OLD_CODEC_IDS_H
-#define AVCODEC_OLD_CODEC_IDS_H
-
-/*
- * This header exists to prevent new codec IDs from being accidentally added to
- * the deprecated list.
- * Do not include it directly. It will be removed on next major bump
- *
- * Do not add new items to this list. Use the AVCodecID enum instead.
- */
-
- CODEC_ID_NONE = AV_CODEC_ID_NONE,
-
- /* video codecs */
- CODEC_ID_MPEG1VIDEO,
- CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
- CODEC_ID_MPEG2VIDEO_XVMC,
- CODEC_ID_H261,
- CODEC_ID_H263,
- CODEC_ID_RV10,
- CODEC_ID_RV20,
- CODEC_ID_MJPEG,
- CODEC_ID_MJPEGB,
- CODEC_ID_LJPEG,
- CODEC_ID_SP5X,
- CODEC_ID_JPEGLS,
- CODEC_ID_MPEG4,
- CODEC_ID_RAWVIDEO,
- CODEC_ID_MSMPEG4V1,
- CODEC_ID_MSMPEG4V2,
- CODEC_ID_MSMPEG4V3,
- CODEC_ID_WMV1,
- CODEC_ID_WMV2,
- CODEC_ID_H263P,
- CODEC_ID_H263I,
- CODEC_ID_FLV1,
- CODEC_ID_SVQ1,
- CODEC_ID_SVQ3,
- CODEC_ID_DVVIDEO,
- CODEC_ID_HUFFYUV,
- CODEC_ID_CYUV,
- CODEC_ID_H264,
- CODEC_ID_INDEO3,
- CODEC_ID_VP3,
- CODEC_ID_THEORA,
- CODEC_ID_ASV1,
- CODEC_ID_ASV2,
- CODEC_ID_FFV1,
- CODEC_ID_4XM,
- CODEC_ID_VCR1,
- CODEC_ID_CLJR,
- CODEC_ID_MDEC,
- CODEC_ID_ROQ,
- CODEC_ID_INTERPLAY_VIDEO,
- CODEC_ID_XAN_WC3,
- CODEC_ID_XAN_WC4,
- CODEC_ID_RPZA,
- CODEC_ID_CINEPAK,
- CODEC_ID_WS_VQA,
- CODEC_ID_MSRLE,
- CODEC_ID_MSVIDEO1,
- CODEC_ID_IDCIN,
- CODEC_ID_8BPS,
- CODEC_ID_SMC,
- CODEC_ID_FLIC,
- CODEC_ID_TRUEMOTION1,
- CODEC_ID_VMDVIDEO,
- CODEC_ID_MSZH,
- CODEC_ID_ZLIB,
- CODEC_ID_QTRLE,
- CODEC_ID_SNOW,
- CODEC_ID_TSCC,
- CODEC_ID_ULTI,
- CODEC_ID_QDRAW,
- CODEC_ID_VIXL,
- CODEC_ID_QPEG,
- CODEC_ID_PNG,
- CODEC_ID_PPM,
- CODEC_ID_PBM,
- CODEC_ID_PGM,
- CODEC_ID_PGMYUV,
- CODEC_ID_PAM,
- CODEC_ID_FFVHUFF,
- CODEC_ID_RV30,
- CODEC_ID_RV40,
- CODEC_ID_VC1,
- CODEC_ID_WMV3,
- CODEC_ID_LOCO,
- CODEC_ID_WNV1,
- CODEC_ID_AASC,
- CODEC_ID_INDEO2,
- CODEC_ID_FRAPS,
- CODEC_ID_TRUEMOTION2,
- CODEC_ID_BMP,
- CODEC_ID_CSCD,
- CODEC_ID_MMVIDEO,
- CODEC_ID_ZMBV,
- CODEC_ID_AVS,
- CODEC_ID_SMACKVIDEO,
- CODEC_ID_NUV,
- CODEC_ID_KMVC,
- CODEC_ID_FLASHSV,
- CODEC_ID_CAVS,
- CODEC_ID_JPEG2000,
- CODEC_ID_VMNC,
- CODEC_ID_VP5,
- CODEC_ID_VP6,
- CODEC_ID_VP6F,
- CODEC_ID_TARGA,
- CODEC_ID_DSICINVIDEO,
- CODEC_ID_TIERTEXSEQVIDEO,
- CODEC_ID_TIFF,
- CODEC_ID_GIF,
- CODEC_ID_DXA,
- CODEC_ID_DNXHD,
- CODEC_ID_THP,
- CODEC_ID_SGI,
- CODEC_ID_C93,
- CODEC_ID_BETHSOFTVID,
- CODEC_ID_PTX,
- CODEC_ID_TXD,
- CODEC_ID_VP6A,
- CODEC_ID_AMV,
- CODEC_ID_VB,
- CODEC_ID_PCX,
- CODEC_ID_SUNRAST,
- CODEC_ID_INDEO4,
- CODEC_ID_INDEO5,
- CODEC_ID_MIMIC,
- CODEC_ID_RL2,
- CODEC_ID_ESCAPE124,
- CODEC_ID_DIRAC,
- CODEC_ID_BFI,
- CODEC_ID_CMV,
- CODEC_ID_MOTIONPIXELS,
- CODEC_ID_TGV,
- CODEC_ID_TGQ,
- CODEC_ID_TQI,
- CODEC_ID_AURA,
- CODEC_ID_AURA2,
- CODEC_ID_V210X,
- CODEC_ID_TMV,
- CODEC_ID_V210,
- CODEC_ID_DPX,
- CODEC_ID_MAD,
- CODEC_ID_FRWU,
- CODEC_ID_FLASHSV2,
- CODEC_ID_CDGRAPHICS,
- CODEC_ID_R210,
- CODEC_ID_ANM,
- CODEC_ID_BINKVIDEO,
- CODEC_ID_IFF_ILBM,
- CODEC_ID_IFF_BYTERUN1,
- CODEC_ID_KGV1,
- CODEC_ID_YOP,
- CODEC_ID_VP8,
- CODEC_ID_PICTOR,
- CODEC_ID_ANSI,
- CODEC_ID_A64_MULTI,
- CODEC_ID_A64_MULTI5,
- CODEC_ID_R10K,
- CODEC_ID_MXPEG,
- CODEC_ID_LAGARITH,
- CODEC_ID_PRORES,
- CODEC_ID_JV,
- CODEC_ID_DFA,
- CODEC_ID_WMV3IMAGE,
- CODEC_ID_VC1IMAGE,
- CODEC_ID_UTVIDEO,
- CODEC_ID_BMV_VIDEO,
- CODEC_ID_VBLE,
- CODEC_ID_DXTORY,
- CODEC_ID_V410,
- CODEC_ID_XWD,
- CODEC_ID_CDXL,
- CODEC_ID_XBM,
- CODEC_ID_ZEROCODEC,
- CODEC_ID_MSS1,
- CODEC_ID_MSA1,
- CODEC_ID_TSCC2,
- CODEC_ID_MTS2,
- CODEC_ID_CLLC,
-
- /* various PCM "codecs" */
- CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
- CODEC_ID_PCM_S16LE = 0x10000,
- CODEC_ID_PCM_S16BE,
- CODEC_ID_PCM_U16LE,
- CODEC_ID_PCM_U16BE,
- CODEC_ID_PCM_S8,
- CODEC_ID_PCM_U8,
- CODEC_ID_PCM_MULAW,
- CODEC_ID_PCM_ALAW,
- CODEC_ID_PCM_S32LE,
- CODEC_ID_PCM_S32BE,
- CODEC_ID_PCM_U32LE,
- CODEC_ID_PCM_U32BE,
- CODEC_ID_PCM_S24LE,
- CODEC_ID_PCM_S24BE,
- CODEC_ID_PCM_U24LE,
- CODEC_ID_PCM_U24BE,
- CODEC_ID_PCM_S24DAUD,
- CODEC_ID_PCM_ZORK,
- CODEC_ID_PCM_S16LE_PLANAR,
- CODEC_ID_PCM_DVD,
- CODEC_ID_PCM_F32BE,
- CODEC_ID_PCM_F32LE,
- CODEC_ID_PCM_F64BE,
- CODEC_ID_PCM_F64LE,
- CODEC_ID_PCM_BLURAY,
- CODEC_ID_PCM_LXF,
- CODEC_ID_S302M,
- CODEC_ID_PCM_S8_PLANAR,
-
- /* various ADPCM codecs */
- CODEC_ID_ADPCM_IMA_QT = 0x11000,
- CODEC_ID_ADPCM_IMA_WAV,
- CODEC_ID_ADPCM_IMA_DK3,
- CODEC_ID_ADPCM_IMA_DK4,
- CODEC_ID_ADPCM_IMA_WS,
- CODEC_ID_ADPCM_IMA_SMJPEG,
- CODEC_ID_ADPCM_MS,
- CODEC_ID_ADPCM_4XM,
- CODEC_ID_ADPCM_XA,
- CODEC_ID_ADPCM_ADX,
- CODEC_ID_ADPCM_EA,
- CODEC_ID_ADPCM_G726,
- CODEC_ID_ADPCM_CT,
- CODEC_ID_ADPCM_SWF,
- CODEC_ID_ADPCM_YAMAHA,
- CODEC_ID_ADPCM_SBPRO_4,
- CODEC_ID_ADPCM_SBPRO_3,
- CODEC_ID_ADPCM_SBPRO_2,
- CODEC_ID_ADPCM_THP,
- CODEC_ID_ADPCM_IMA_AMV,
- CODEC_ID_ADPCM_EA_R1,
- CODEC_ID_ADPCM_EA_R3,
- CODEC_ID_ADPCM_EA_R2,
- CODEC_ID_ADPCM_IMA_EA_SEAD,
- CODEC_ID_ADPCM_IMA_EA_EACS,
- CODEC_ID_ADPCM_EA_XAS,
- CODEC_ID_ADPCM_EA_MAXIS_XA,
- CODEC_ID_ADPCM_IMA_ISS,
- CODEC_ID_ADPCM_G722,
- CODEC_ID_ADPCM_IMA_APC,
-
- /* AMR */
- CODEC_ID_AMR_NB = 0x12000,
- CODEC_ID_AMR_WB,
-
- /* RealAudio codecs*/
- CODEC_ID_RA_144 = 0x13000,
- CODEC_ID_RA_288,
-
- /* various DPCM codecs */
- CODEC_ID_ROQ_DPCM = 0x14000,
- CODEC_ID_INTERPLAY_DPCM,
- CODEC_ID_XAN_DPCM,
- CODEC_ID_SOL_DPCM,
-
- /* audio codecs */
- CODEC_ID_MP2 = 0x15000,
- CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
- CODEC_ID_AAC,
- CODEC_ID_AC3,
- CODEC_ID_DTS,
- CODEC_ID_VORBIS,
- CODEC_ID_DVAUDIO,
- CODEC_ID_WMAV1,
- CODEC_ID_WMAV2,
- CODEC_ID_MACE3,
- CODEC_ID_MACE6,
- CODEC_ID_VMDAUDIO,
- CODEC_ID_FLAC,
- CODEC_ID_MP3ADU,
- CODEC_ID_MP3ON4,
- CODEC_ID_SHORTEN,
- CODEC_ID_ALAC,
- CODEC_ID_WESTWOOD_SND1,
- CODEC_ID_GSM, ///< as in Berlin toast format
- CODEC_ID_QDM2,
- CODEC_ID_COOK,
- CODEC_ID_TRUESPEECH,
- CODEC_ID_TTA,
- CODEC_ID_SMACKAUDIO,
- CODEC_ID_QCELP,
- CODEC_ID_WAVPACK,
- CODEC_ID_DSICINAUDIO,
- CODEC_ID_IMC,
- CODEC_ID_MUSEPACK7,
- CODEC_ID_MLP,
- CODEC_ID_GSM_MS, /* as found in WAV */
- CODEC_ID_ATRAC3,
- CODEC_ID_VOXWARE,
- CODEC_ID_APE,
- CODEC_ID_NELLYMOSER,
- CODEC_ID_MUSEPACK8,
- CODEC_ID_SPEEX,
- CODEC_ID_WMAVOICE,
- CODEC_ID_WMAPRO,
- CODEC_ID_WMALOSSLESS,
- CODEC_ID_ATRAC3P,
- CODEC_ID_EAC3,
- CODEC_ID_SIPR,
- CODEC_ID_MP1,
- CODEC_ID_TWINVQ,
- CODEC_ID_TRUEHD,
- CODEC_ID_MP4ALS,
- CODEC_ID_ATRAC1,
- CODEC_ID_BINKAUDIO_RDFT,
- CODEC_ID_BINKAUDIO_DCT,
- CODEC_ID_AAC_LATM,
- CODEC_ID_QDMC,
- CODEC_ID_CELT,
- CODEC_ID_G723_1,
- CODEC_ID_G729,
- CODEC_ID_8SVX_EXP,
- CODEC_ID_8SVX_FIB,
- CODEC_ID_BMV_AUDIO,
- CODEC_ID_RALF,
- CODEC_ID_IAC,
- CODEC_ID_ILBC,
-
- /* subtitle codecs */
- CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
- CODEC_ID_DVD_SUBTITLE = 0x17000,
- CODEC_ID_DVB_SUBTITLE,
- CODEC_ID_TEXT, ///< raw UTF-8 text
- CODEC_ID_XSUB,
- CODEC_ID_SSA,
- CODEC_ID_MOV_TEXT,
- CODEC_ID_HDMV_PGS_SUBTITLE,
- CODEC_ID_DVB_TELETEXT,
- CODEC_ID_SRT,
-
- /* other specific kind of codecs (generally used for attachments) */
- CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs.
- CODEC_ID_TTF = 0x18000,
-
- CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
-
- CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
- * stream (only used by libavformat) */
- CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
- * stream (only used by libavformat) */
- CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information.
-
-#endif /* AVCODEC_OLD_CODEC_IDS_H */

libav-v9.6.tar.bz2/libavcodec/pcm-mpeg.c Deleted

@@ -1,330 +0,0 @@
-/*
- * LPCM codecs for PCM formats found in MPEG streams
- * Copyright (c) 2009 Christian Schmidt
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * PCM codecs for encodings found in MPEG streams (DVD/Blu-ray)
- */
-
-#include "libavutil/channel_layout.h"
-#include "avcodec.h"
-#include "bytestream.h"
-#include "internal.h"
-
-/*
- * Channel Mapping according to
- * Blu-ray Disc Read-Only Format Version 1
- * Part 3: Audio Visual Basic Specifications
- * mono M1 X
- * stereo L R
- * 3/0 L R C X
- * 2/1 L R S X
- * 3/1 L R C S
- * 2/2 L R LS RS
- * 3/2 L R C LS RS X
- * 3/2+lfe L R C LS RS lfe
- * 3/4 L R C LS Rls Rrs RS X
- * 3/4+lfe L R C LS Rls Rrs RS lfe
- */
-
-/**
- * Parse the header of a LPCM frame read from a MPEG-TS stream
- * @param avctx the codec context
- * @param header pointer to the first four bytes of the data packet
- */
-static int pcm_bluray_parse_header(AVCodecContext *avctx,
- const uint8_t *header)
-{
- static const uint8_t bits_per_samples[4] = { 0, 16, 20, 24 };
- static const uint32_t channel_layouts[16] = {
- 0, AV_CH_LAYOUT_MONO, 0, AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_SURROUND,
- AV_CH_LAYOUT_2_1, AV_CH_LAYOUT_4POINT0, AV_CH_LAYOUT_2_2, AV_CH_LAYOUT_5POINT0,
- AV_CH_LAYOUT_5POINT1, AV_CH_LAYOUT_7POINT0, AV_CH_LAYOUT_7POINT1, 0, 0, 0, 0
- };
- static const uint8_t channels[16] = {
- 0, 1, 0, 2, 3, 3, 4, 4, 5, 6, 7, 8, 0, 0, 0, 0
- };
- uint8_t channel_layout = header[2] >> 4;
-
- if (avctx->debug & FF_DEBUG_PICT_INFO)
- av_dlog(avctx, "pcm_bluray_parse_header: header = %02x%02x%02x%02x\n",
- header[0], header[1], header[2], header[3]);
-
- /* get the sample depth and derive the sample format from it */
- avctx->bits_per_coded_sample = bits_per_samples[header[3] >> 6];
- if (!avctx->bits_per_coded_sample) {
- av_log(avctx, AV_LOG_ERROR, "reserved sample depth (0)\n");
- return -1;
- }
- avctx->sample_fmt = avctx->bits_per_coded_sample == 16 ? AV_SAMPLE_FMT_S16 :
- AV_SAMPLE_FMT_S32;
- avctx->bits_per_raw_sample = avctx->bits_per_coded_sample;
-
- /* get the sample rate. Not all values are used. */
- switch (header[2] & 0x0f) {
- case 1:
- avctx->sample_rate = 48000;
- break;
- case 4:
- avctx->sample_rate = 96000;
- break;
- case 5:
- avctx->sample_rate = 192000;
- break;
- default:
- avctx->sample_rate = 0;
- av_log(avctx, AV_LOG_ERROR, "reserved sample rate (%d)\n",
- header[2] & 0x0f);
- return -1;
- }
-
- /*
- * get the channel number (and mapping). Not all values are used.
- * It must be noted that the number of channels in the MPEG stream can
- * differ from the actual meaningful number, e.g. mono audio still has two
- * channels, one being empty.
- */
- avctx->channel_layout = channel_layouts[channel_layout];
- avctx->channels = channels[channel_layout];
- if (!avctx->channels) {
- av_log(avctx, AV_LOG_ERROR, "reserved channel configuration (%d)\n",
- channel_layout);
- return -1;
- }
-
- avctx->bit_rate = FFALIGN(avctx->channels, 2) * avctx->sample_rate *
- avctx->bits_per_coded_sample;
-
- if (avctx->debug & FF_DEBUG_PICT_INFO)
- av_dlog(avctx,
- "pcm_bluray_parse_header: %d channels, %d bits per sample, %d Hz, %d bit/s\n",
- avctx->channels, avctx->bits_per_coded_sample,
- avctx->sample_rate, avctx->bit_rate);
- return 0;
-}
-
-typedef struct PCMBRDecode {
- AVFrame frame;
-} PCMBRDecode;
-
-static av_cold int pcm_bluray_decode_init(AVCodecContext * avctx)
-{
- PCMBRDecode *s = avctx->priv_data;
-
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
- return 0;
-}
-
-static int pcm_bluray_decode_frame(AVCodecContext *avctx, void *data,
- int *got_frame_ptr, AVPacket *avpkt)
-{
- const uint8_t *src = avpkt->data;
- int buf_size = avpkt->size;
- PCMBRDecode *s = avctx->priv_data;
- GetByteContext gb;
- int num_source_channels, channel, retval;
- int sample_size, samples;
- int16_t *dst16;
- int32_t *dst32;
-
- if (buf_size < 4) {
- av_log(avctx, AV_LOG_ERROR, "PCM packet too small\n");
- return -1;
- }
-
- if (pcm_bluray_parse_header(avctx, src))
- return -1;
- src += 4;
- buf_size -= 4;
-
- bytestream2_init(&gb, src, buf_size);
-
- /* There's always an even number of channels in the source */
- num_source_channels = FFALIGN(avctx->channels, 2);
- sample_size = (num_source_channels * (avctx->sample_fmt == AV_SAMPLE_FMT_S16 ? 16 : 24)) >> 3;
- samples = buf_size / sample_size;
-
- /* get output buffer */
- s->frame.nb_samples = samples;
- if ((retval = ff_get_buffer(avctx, &s->frame)) < 0) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return retval;
- }
- dst16 = (int16_t *)s->frame.data[0];
- dst32 = (int32_t *)s->frame.data[0];
-
- if (samples) {
- switch (avctx->channel_layout) {
- /* cases with same number of source and coded channels */
- case AV_CH_LAYOUT_STEREO:
- case AV_CH_LAYOUT_4POINT0:
- case AV_CH_LAYOUT_2_2:
- samples *= num_source_channels;
- if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
-#if HAVE_BIGENDIAN
- bytestream2_get_buffer(&gb, dst16, buf_size);
-#else
- do {
- *dst16++ = bytestream2_get_be16u(&gb);
- } while (--samples);
-#endif
- } else {
- do {
- *dst32++ = bytestream2_get_be24u(&gb) << 8;
- } while (--samples);
- }
- break;
- /* cases where number of source channels = coded channels + 1 */
- case AV_CH_LAYOUT_MONO:
- case AV_CH_LAYOUT_SURROUND:
- case AV_CH_LAYOUT_2_1:
- case AV_CH_LAYOUT_5POINT0:
- if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
- do {
-#if HAVE_BIGENDIAN
- bytestream2_get_buffer(&gb, dst16, avctx->channels * 2);
- dst16 += avctx->channels;
-#else
- channel = avctx->channels;
- do {
- *dst16++ = bytestream2_get_be16u(&gb);
- } while (--channel);
-#endif
- bytestream2_skip(&gb, 2);
- } while (--samples);
- } else {
- do {
- channel = avctx->channels;
- do {
- *dst32++ = bytestream2_get_be24u(&gb) << 8;
- } while (--channel);
- bytestream2_skip(&gb, 3);
- } while (--samples);
- }
- break;
- /* remapping: L, R, C, LBack, RBack, LF */
- case AV_CH_LAYOUT_5POINT1:
- if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
- do {
- dst16[0] = bytestream2_get_be16u(&gb);
- dst16[1] = bytestream2_get_be16u(&gb);
- dst16[2] = bytestream2_get_be16u(&gb);
- dst16[4] = bytestream2_get_be16u(&gb);
- dst16[5] = bytestream2_get_be16u(&gb);
- dst16[3] = bytestream2_get_be16u(&gb);
- dst16 += 6;
- } while (--samples);
- } else {
- do {
- dst32[0] = bytestream2_get_be24u(&gb) << 8;
- dst32[1] = bytestream2_get_be24u(&gb) << 8;
- dst32[2] = bytestream2_get_be24u(&gb) << 8;
- dst32[4] = bytestream2_get_be24u(&gb) << 8;
- dst32[5] = bytestream2_get_be24u(&gb) << 8;
- dst32[3] = bytestream2_get_be24u(&gb) << 8;
- dst32 += 6;
- } while (--samples);
- }
- break;
- /* remapping: L, R, C, LSide, LBack, RBack, RSide, <unused> */
- case AV_CH_LAYOUT_7POINT0:
- if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
- do {
- dst16[0] = bytestream2_get_be16u(&gb);
- dst16[1] = bytestream2_get_be16u(&gb);
- dst16[2] = bytestream2_get_be16u(&gb);
- dst16[5] = bytestream2_get_be16u(&gb);
- dst16[3] = bytestream2_get_be16u(&gb);
- dst16[4] = bytestream2_get_be16u(&gb);
- dst16[6] = bytestream2_get_be16u(&gb);
- dst16 += 7;
- bytestream2_skip(&gb, 2);
- } while (--samples);
- } else {
- do {
- dst32[0] = bytestream2_get_be24u(&gb) << 8;
- dst32[1] = bytestream2_get_be24u(&gb) << 8;
- dst32[2] = bytestream2_get_be24u(&gb) << 8;
- dst32[5] = bytestream2_get_be24u(&gb) << 8;
- dst32[3] = bytestream2_get_be24u(&gb) << 8;
- dst32[4] = bytestream2_get_be24u(&gb) << 8;
- dst32[6] = bytestream2_get_be24u(&gb) << 8;
- dst32 += 7;
- bytestream2_skip(&gb, 3);
- } while (--samples);
- }
- break;
- /* remapping: L, R, C, LSide, LBack, RBack, RSide, LF */
- case AV_CH_LAYOUT_7POINT1:
- if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
- do {
- dst16[0] = bytestream2_get_be16u(&gb);
- dst16[1] = bytestream2_get_be16u(&gb);
- dst16[2] = bytestream2_get_be16u(&gb);
- dst16[6] = bytestream2_get_be16u(&gb);
- dst16[4] = bytestream2_get_be16u(&gb);
- dst16[5] = bytestream2_get_be16u(&gb);
- dst16[7] = bytestream2_get_be16u(&gb);
- dst16[3] = bytestream2_get_be16u(&gb);
- dst16 += 8;
- } while (--samples);
- } else {
- do {
- dst32[0] = bytestream2_get_be24u(&gb) << 8;
- dst32[1] = bytestream2_get_be24u(&gb) << 8;
- dst32[2] = bytestream2_get_be24u(&gb) << 8;
- dst32[6] = bytestream2_get_be24u(&gb) << 8;
- dst32[4] = bytestream2_get_be24u(&gb) << 8;
- dst32[5] = bytestream2_get_be24u(&gb) << 8;
- dst32[7] = bytestream2_get_be24u(&gb) << 8;
- dst32[3] = bytestream2_get_be24u(&gb) << 8;
- dst32 += 8;
- } while (--samples);
- }
- break;
- }
- }
-
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
-
- retval = bytestream2_tell(&gb);
- if (avctx->debug & FF_DEBUG_BITSTREAM)
- av_dlog(avctx, "pcm_bluray_decode_frame: decoded %d -> %d bytes\n",
- retval, buf_size);
- return retval + 4;
-}
-
-AVCodec ff_pcm_bluray_decoder = {
- .name = "pcm_bluray",
- .type = AVMEDIA_TYPE_AUDIO,
- .id = AV_CODEC_ID_PCM_BLURAY,
- .priv_data_size = sizeof(PCMBRDecode),
- .init = pcm_bluray_decode_init,
- .decode = pcm_bluray_decode_frame,
- .capabilities = CODEC_CAP_DR1,
- .sample_fmts = (const enum AVSampleFormat[]){
- AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE
- },
- .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for Blu-ray media"),
-};

libav-v9.6.tar.bz2/libavcodec/ppc/float_altivec.c Deleted

@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2006 Luca Barbato <lu_zero@gentoo.org>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavutil/ppc/util_altivec.h"
-#include "libavcodec/dsputil.h"
-
-#include "dsputil_altivec.h"
-
-static void vector_fmul_reverse_altivec(float *dst, const float *src0,
- const float *src1, int len)
-{
- int i;
- vector float d, s0, s1, h0, l0,
- s2, s3, zero = (vector float)vec_splat_u32(0);
- src1 += len-4;
- for(i=0; i<len-7; i+=8) {
- s1 = vec_ld(0, src1-i); // [a,b,c,d]
- s0 = vec_ld(0, src0+i);
- l0 = vec_mergel(s1, s1); // [c,c,d,d]
- s3 = vec_ld(-16, src1-i);
- h0 = vec_mergeh(s1, s1); // [a,a,b,b]
- s2 = vec_ld(16, src0+i);
- s1 = vec_mergeh(vec_mergel(l0,h0), // [d,b,d,b]
- vec_mergeh(l0,h0)); // [c,a,c,a]
- // [d,c,b,a]
- l0 = vec_mergel(s3, s3);
- d = vec_madd(s0, s1, zero);
- h0 = vec_mergeh(s3, s3);
- vec_st(d, 0, dst+i);
- s3 = vec_mergeh(vec_mergel(l0,h0),
- vec_mergeh(l0,h0));
- d = vec_madd(s2, s3, zero);
- vec_st(d, 16, dst+i);
- }
-}
-
-static void vector_fmul_add_altivec(float *dst, const float *src0,
- const float *src1, const float *src2,
- int len)
-{
- int i;
- vector float d, s0, s1, s2, t0, t1, edges;
- vector unsigned char align = vec_lvsr(0,dst),
- mask = vec_lvsl(0, dst);
-
- for (i=0; i<len-3; i+=4) {
- t0 = vec_ld(0, dst+i);
- t1 = vec_ld(15, dst+i);
- s0 = vec_ld(0, src0+i);
- s1 = vec_ld(0, src1+i);
- s2 = vec_ld(0, src2+i);
- edges = vec_perm(t1 ,t0, mask);
- d = vec_madd(s0,s1,s2);
- t1 = vec_perm(d, edges, align);
- t0 = vec_perm(edges, d, align);
- vec_st(t1, 15, dst+i);
- vec_st(t0, 0, dst+i);
- }
-}
-
-static void vector_fmul_window_altivec(float *dst, const float *src0, const float *src1, const float *win, int len)
-{
- vector float zero, t0, t1, s0, s1, wi, wj;
- const vector unsigned char reverse = vcprm(3,2,1,0);
- int i,j;
-
- dst += len;
- win += len;
- src0+= len;
-
- zero = (vector float)vec_splat_u32(0);
-
- for(i=-len*4, j=len*4-16; i<0; i+=16, j-=16) {
- s0 = vec_ld(i, src0);
- s1 = vec_ld(j, src1);
- wi = vec_ld(i, win);
- wj = vec_ld(j, win);
-
- s1 = vec_perm(s1, s1, reverse);
- wj = vec_perm(wj, wj, reverse);
-
- t0 = vec_madd(s0, wj, zero);
- t0 = vec_nmsub(s1, wi, t0);
- t1 = vec_madd(s0, wi, zero);
- t1 = vec_madd(s1, wj, t1);
- t1 = vec_perm(t1, t1, reverse);
-
- vec_st(t0, i, dst);
- vec_st(t1, j, dst);
- }
-}
-
-void ff_float_init_altivec(DSPContext* c, AVCodecContext *avctx)
-{
- c->vector_fmul_reverse = vector_fmul_reverse_altivec;
- c->vector_fmul_add = vector_fmul_add_altivec;
- if(!(avctx->flags & CODEC_FLAG_BITEXACT)) {
- c->vector_fmul_window = vector_fmul_window_altivec;
- }
-}

libav-v9.6.tar.bz2/libavcodec/ppc/h264_altivec.c Deleted

@@ -1,1025 +0,0 @@
-/*
- * Copyright (c) 2004 Romain Dolbeau <romain@dolbeau.org>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; 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/intreadwrite.h"
-#include "libavutil/ppc/types_altivec.h"
-#include "libavutil/ppc/util_altivec.h"
-#include "libavcodec/dsputil.h"
-#include "libavcodec/h264data.h"
-#include "libavcodec/h264dsp.h"
-
-#include "dsputil_altivec.h"
-
-#define PUT_OP_U8_ALTIVEC(d, s, dst) d = s
-#define AVG_OP_U8_ALTIVEC(d, s, dst) d = vec_avg(dst, s)
-
-#define OP_U8_ALTIVEC PUT_OP_U8_ALTIVEC
-#define PREFIX_h264_chroma_mc8_altivec put_h264_chroma_mc8_altivec
-#define PREFIX_h264_chroma_mc8_num altivec_put_h264_chroma_mc8_num
-#define PREFIX_h264_qpel16_h_lowpass_altivec put_h264_qpel16_h_lowpass_altivec
-#define PREFIX_h264_qpel16_h_lowpass_num altivec_put_h264_qpel16_h_lowpass_num
-#define PREFIX_h264_qpel16_v_lowpass_altivec put_h264_qpel16_v_lowpass_altivec
-#define PREFIX_h264_qpel16_v_lowpass_num altivec_put_h264_qpel16_v_lowpass_num
-#define PREFIX_h264_qpel16_hv_lowpass_altivec put_h264_qpel16_hv_lowpass_altivec
-#define PREFIX_h264_qpel16_hv_lowpass_num altivec_put_h264_qpel16_hv_lowpass_num
-#include "h264_altivec_template.c"
-#undef OP_U8_ALTIVEC
-#undef PREFIX_h264_chroma_mc8_altivec
-#undef PREFIX_h264_chroma_mc8_num
-#undef PREFIX_h264_qpel16_h_lowpass_altivec
-#undef PREFIX_h264_qpel16_h_lowpass_num
-#undef PREFIX_h264_qpel16_v_lowpass_altivec
-#undef PREFIX_h264_qpel16_v_lowpass_num
-#undef PREFIX_h264_qpel16_hv_lowpass_altivec
-#undef PREFIX_h264_qpel16_hv_lowpass_num
-
-#define OP_U8_ALTIVEC AVG_OP_U8_ALTIVEC
-#define PREFIX_h264_chroma_mc8_altivec avg_h264_chroma_mc8_altivec
-#define PREFIX_h264_chroma_mc8_num altivec_avg_h264_chroma_mc8_num
-#define PREFIX_h264_qpel16_h_lowpass_altivec avg_h264_qpel16_h_lowpass_altivec
-#define PREFIX_h264_qpel16_h_lowpass_num altivec_avg_h264_qpel16_h_lowpass_num
-#define PREFIX_h264_qpel16_v_lowpass_altivec avg_h264_qpel16_v_lowpass_altivec
-#define PREFIX_h264_qpel16_v_lowpass_num altivec_avg_h264_qpel16_v_lowpass_num
-#define PREFIX_h264_qpel16_hv_lowpass_altivec avg_h264_qpel16_hv_lowpass_altivec
-#define PREFIX_h264_qpel16_hv_lowpass_num altivec_avg_h264_qpel16_hv_lowpass_num
-#include "h264_altivec_template.c"
-#undef OP_U8_ALTIVEC
-#undef PREFIX_h264_chroma_mc8_altivec
-#undef PREFIX_h264_chroma_mc8_num
-#undef PREFIX_h264_qpel16_h_lowpass_altivec
-#undef PREFIX_h264_qpel16_h_lowpass_num
-#undef PREFIX_h264_qpel16_v_lowpass_altivec
-#undef PREFIX_h264_qpel16_v_lowpass_num
-#undef PREFIX_h264_qpel16_hv_lowpass_altivec
-#undef PREFIX_h264_qpel16_hv_lowpass_num
-
-#define H264_MC(OPNAME, SIZE, CODETYPE) \
-static void OPNAME ## h264_qpel ## SIZE ## _mc00_ ## CODETYPE (uint8_t *dst, uint8_t *src, int stride){\
- ff_ ## OPNAME ## pixels ## SIZE ## _ ## CODETYPE(dst, src, stride, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc10_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){ \
- DECLARE_ALIGNED(16, uint8_t, half)[SIZE*SIZE];\
- put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(half, src, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, src, half, stride, stride, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc20_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\
- OPNAME ## h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(dst, src, stride, stride);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc30_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\
- DECLARE_ALIGNED(16, uint8_t, half)[SIZE*SIZE];\
- put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(half, src, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, src+1, half, stride, stride, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc01_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\
- DECLARE_ALIGNED(16, uint8_t, half)[SIZE*SIZE];\
- put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(half, src, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, src, half, stride, stride, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc02_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\
- OPNAME ## h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(dst, src, stride, stride);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc03_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\
- DECLARE_ALIGNED(16, uint8_t, half)[SIZE*SIZE];\
- put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(half, src, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, src+stride, half, stride, stride, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc11_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\
- DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\
- DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\
- put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src, SIZE, stride);\
- put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfV, stride, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc31_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\
- DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\
- DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\
- put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src, SIZE, stride);\
- put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src+1, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfV, stride, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc13_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\
- DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\
- DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\
- put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src + stride, SIZE, stride);\
- put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfV, stride, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc33_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\
- DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\
- DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\
- put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src + stride, SIZE, stride);\
- put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src+1, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfV, stride, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc22_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\
- DECLARE_ALIGNED(16, int16_t, tmp)[SIZE*(SIZE+8)];\
- OPNAME ## h264_qpel ## SIZE ## _hv_lowpass_ ## CODETYPE(dst, tmp, src, stride, SIZE, stride);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc21_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\
- DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\
- DECLARE_ALIGNED(16, uint8_t, halfHV)[SIZE*SIZE];\
- DECLARE_ALIGNED(16, int16_t, tmp)[SIZE*(SIZE+8)];\
- put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src, SIZE, stride);\
- put_h264_qpel ## SIZE ## _hv_lowpass_ ## CODETYPE(halfHV, tmp, src, SIZE, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfHV, stride, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc23_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\
- DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\
- DECLARE_ALIGNED(16, uint8_t, halfHV)[SIZE*SIZE];\
- DECLARE_ALIGNED(16, int16_t, tmp)[SIZE*(SIZE+8)];\
- put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src + stride, SIZE, stride);\
- put_h264_qpel ## SIZE ## _hv_lowpass_ ## CODETYPE(halfHV, tmp, src, SIZE, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfHV, stride, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc12_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\
- DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\
- DECLARE_ALIGNED(16, uint8_t, halfHV)[SIZE*SIZE];\
- DECLARE_ALIGNED(16, int16_t, tmp)[SIZE*(SIZE+8)];\
- put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src, SIZE, stride);\
- put_h264_qpel ## SIZE ## _hv_lowpass_ ## CODETYPE(halfHV, tmp, src, SIZE, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfV, halfHV, stride, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc32_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\
- DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\
- DECLARE_ALIGNED(16, uint8_t, halfHV)[SIZE*SIZE];\
- DECLARE_ALIGNED(16, int16_t, tmp)[SIZE*(SIZE+8)];\
- put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src+1, SIZE, stride);\
- put_h264_qpel ## SIZE ## _hv_lowpass_ ## CODETYPE(halfHV, tmp, src, SIZE, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfV, halfHV, stride, SIZE, SIZE);\
-}\
-
-static inline void put_pixels16_l2_altivec( uint8_t * dst, const uint8_t * src1,
- const uint8_t * src2, int dst_stride,
- int src_stride1, int h)
-{
- int i;
- vec_u8 a, b, d, tmp1, tmp2, mask, mask_, edges, align;
-
- mask_ = vec_lvsl(0, src2);
-
- for (i = 0; i < h; i++) {
-
- tmp1 = vec_ld(i * src_stride1, src1);
- mask = vec_lvsl(i * src_stride1, src1);
- tmp2 = vec_ld(i * src_stride1 + 15, src1);
-
- a = vec_perm(tmp1, tmp2, mask);
-
- tmp1 = vec_ld(i * 16, src2);
- tmp2 = vec_ld(i * 16 + 15, src2);
-
- b = vec_perm(tmp1, tmp2, mask_);
-
- tmp1 = vec_ld(0, dst);
- mask = vec_lvsl(0, dst);
- tmp2 = vec_ld(15, dst);
-
- d = vec_avg(a, b);
-
- edges = vec_perm(tmp2, tmp1, mask);
-
- align = vec_lvsr(0, dst);
-
- tmp2 = vec_perm(d, edges, align);
- tmp1 = vec_perm(edges, d, align);
-
- vec_st(tmp2, 15, dst);
- vec_st(tmp1, 0 , dst);
-
- dst += dst_stride;
- }
-}
-
-static inline void avg_pixels16_l2_altivec( uint8_t * dst, const uint8_t * src1,
- const uint8_t * src2, int dst_stride,
- int src_stride1, int h)
-{
- int i;
- vec_u8 a, b, d, tmp1, tmp2, mask, mask_, edges, align;
-
- mask_ = vec_lvsl(0, src2);
-
- for (i = 0; i < h; i++) {
-
- tmp1 = vec_ld(i * src_stride1, src1);
- mask = vec_lvsl(i * src_stride1, src1);
- tmp2 = vec_ld(i * src_stride1 + 15, src1);
-
- a = vec_perm(tmp1, tmp2, mask);
-
- tmp1 = vec_ld(i * 16, src2);
- tmp2 = vec_ld(i * 16 + 15, src2);
-
- b = vec_perm(tmp1, tmp2, mask_);
-
- tmp1 = vec_ld(0, dst);
- mask = vec_lvsl(0, dst);
- tmp2 = vec_ld(15, dst);
-
- d = vec_avg(vec_perm(tmp1, tmp2, mask), vec_avg(a, b));
-
- edges = vec_perm(tmp2, tmp1, mask);
-
- align = vec_lvsr(0, dst);
-
- tmp2 = vec_perm(d, edges, align);
- tmp1 = vec_perm(edges, d, align);
-
- vec_st(tmp2, 15, dst);
- vec_st(tmp1, 0 , dst);
-
- dst += dst_stride;
- }
-}
-
-/* Implemented but could be faster
-#define put_pixels16_l2_altivec(d,s1,s2,ds,s1s,h) put_pixels16_l2(d,s1,s2,ds,s1s,16,h)
-#define avg_pixels16_l2_altivec(d,s1,s2,ds,s1s,h) avg_pixels16_l2(d,s1,s2,ds,s1s,16,h)
- */
-
-H264_MC(put_, 16, altivec)
-H264_MC(avg_, 16, altivec)
-
-
-/****************************************************************************
- * IDCT transform:
- ****************************************************************************/
-
-#define VEC_1D_DCT(vb0,vb1,vb2,vb3,va0,va1,va2,va3) \
- /* 1st stage */ \
- vz0 = vec_add(vb0,vb2); /* temp[0] = Y[0] + Y[2] */ \
- vz1 = vec_sub(vb0,vb2); /* temp[1] = Y[0] - Y[2] */ \
- vz2 = vec_sra(vb1,vec_splat_u16(1)); \
- vz2 = vec_sub(vz2,vb3); /* temp[2] = Y[1].1/2 - Y[3] */ \
- vz3 = vec_sra(vb3,vec_splat_u16(1)); \
- vz3 = vec_add(vb1,vz3); /* temp[3] = Y[1] + Y[3].1/2 */ \
- /* 2nd stage: output */ \
- va0 = vec_add(vz0,vz3); /* x[0] = temp[0] + temp[3] */ \
- va1 = vec_add(vz1,vz2); /* x[1] = temp[1] + temp[2] */ \
- va2 = vec_sub(vz1,vz2); /* x[2] = temp[1] - temp[2] */ \
- va3 = vec_sub(vz0,vz3) /* x[3] = temp[0] - temp[3] */
-
-#define VEC_TRANSPOSE_4(a0,a1,a2,a3,b0,b1,b2,b3) \
- b0 = vec_mergeh( a0, a0 ); \
- b1 = vec_mergeh( a1, a0 ); \
- b2 = vec_mergeh( a2, a0 ); \
- b3 = vec_mergeh( a3, a0 ); \
- a0 = vec_mergeh( b0, b2 ); \
- a1 = vec_mergel( b0, b2 ); \
- a2 = vec_mergeh( b1, b3 ); \
- a3 = vec_mergel( b1, b3 ); \
- b0 = vec_mergeh( a0, a2 ); \
- b1 = vec_mergel( a0, a2 ); \
- b2 = vec_mergeh( a1, a3 ); \
- b3 = vec_mergel( a1, a3 )
-
-#define VEC_LOAD_U8_ADD_S16_STORE_U8(va) \
- vdst_orig = vec_ld(0, dst); \
- vdst = vec_perm(vdst_orig, zero_u8v, vdst_mask); \
- vdst_ss = (vec_s16) vec_mergeh(zero_u8v, vdst); \
- va = vec_add(va, vdst_ss); \
- va_u8 = vec_packsu(va, zero_s16v); \
- va_u32 = vec_splat((vec_u32)va_u8, 0); \
- vec_ste(va_u32, element, (uint32_t*)dst);
-
-static void ff_h264_idct_add_altivec(uint8_t *dst, DCTELEM *block, int stride)
-{
- vec_s16 va0, va1, va2, va3;
- vec_s16 vz0, vz1, vz2, vz3;
- vec_s16 vtmp0, vtmp1, vtmp2, vtmp3;
- vec_u8 va_u8;
- vec_u32 va_u32;
- vec_s16 vdst_ss;
- const vec_u16 v6us = vec_splat_u16(6);
- vec_u8 vdst, vdst_orig;
- vec_u8 vdst_mask = vec_lvsl(0, dst);
- int element = ((unsigned long)dst & 0xf) >> 2;
- LOAD_ZERO;
-
- block[0] += 32; /* add 32 as a DC-level for rounding */
-
- vtmp0 = vec_ld(0,block);
- vtmp1 = vec_sld(vtmp0, vtmp0, 8);
- vtmp2 = vec_ld(16,block);
- vtmp3 = vec_sld(vtmp2, vtmp2, 8);
-
- VEC_1D_DCT(vtmp0,vtmp1,vtmp2,vtmp3,va0,va1,va2,va3);
- VEC_TRANSPOSE_4(va0,va1,va2,va3,vtmp0,vtmp1,vtmp2,vtmp3);
- VEC_1D_DCT(vtmp0,vtmp1,vtmp2,vtmp3,va0,va1,va2,va3);
-
- va0 = vec_sra(va0,v6us);
- va1 = vec_sra(va1,v6us);
- va2 = vec_sra(va2,v6us);
- va3 = vec_sra(va3,v6us);
-
- VEC_LOAD_U8_ADD_S16_STORE_U8(va0);
- dst += stride;
- VEC_LOAD_U8_ADD_S16_STORE_U8(va1);
- dst += stride;
- VEC_LOAD_U8_ADD_S16_STORE_U8(va2);
- dst += stride;
- VEC_LOAD_U8_ADD_S16_STORE_U8(va3);
-}
-
-#define IDCT8_1D_ALTIVEC(s0, s1, s2, s3, s4, s5, s6, s7, d0, d1, d2, d3, d4, d5, d6, d7) {\
- /* a0 = SRC(0) + SRC(4); */ \
- vec_s16 a0v = vec_add(s0, s4); \
- /* a2 = SRC(0) - SRC(4); */ \
- vec_s16 a2v = vec_sub(s0, s4); \
- /* a4 = (SRC(2)>>1) - SRC(6); */ \
- vec_s16 a4v = vec_sub(vec_sra(s2, onev), s6); \
- /* a6 = (SRC(6)>>1) + SRC(2); */ \
- vec_s16 a6v = vec_add(vec_sra(s6, onev), s2); \
- /* b0 = a0 + a6; */ \
- vec_s16 b0v = vec_add(a0v, a6v); \
- /* b2 = a2 + a4; */ \
- vec_s16 b2v = vec_add(a2v, a4v); \
- /* b4 = a2 - a4; */ \
- vec_s16 b4v = vec_sub(a2v, a4v); \
- /* b6 = a0 - a6; */ \
- vec_s16 b6v = vec_sub(a0v, a6v); \
- /* a1 = SRC(5) - SRC(3) - SRC(7) - (SRC(7)>>1); */ \
- /* a1 = (SRC(5)-SRC(3)) - (SRC(7) + (SRC(7)>>1)); */ \
- vec_s16 a1v = vec_sub( vec_sub(s5, s3), vec_add(s7, vec_sra(s7, onev)) ); \
- /* a3 = SRC(7) + SRC(1) - SRC(3) - (SRC(3)>>1); */ \
- /* a3 = (SRC(7)+SRC(1)) - (SRC(3) + (SRC(3)>>1)); */ \
- vec_s16 a3v = vec_sub( vec_add(s7, s1), vec_add(s3, vec_sra(s3, onev)) );\
- /* a5 = SRC(7) - SRC(1) + SRC(5) + (SRC(5)>>1); */ \
- /* a5 = (SRC(7)-SRC(1)) + SRC(5) + (SRC(5)>>1); */ \
- vec_s16 a5v = vec_add( vec_sub(s7, s1), vec_add(s5, vec_sra(s5, onev)) );\
- /* a7 = SRC(5)+SRC(3) + SRC(1) + (SRC(1)>>1); */ \
- vec_s16 a7v = vec_add( vec_add(s5, s3), vec_add(s1, vec_sra(s1, onev)) );\
- /* b1 = (a7>>2) + a1; */ \
- vec_s16 b1v = vec_add( vec_sra(a7v, twov), a1v); \
- /* b3 = a3 + (a5>>2); */ \
- vec_s16 b3v = vec_add(a3v, vec_sra(a5v, twov)); \
- /* b5 = (a3>>2) - a5; */ \
- vec_s16 b5v = vec_sub( vec_sra(a3v, twov), a5v); \
- /* b7 = a7 - (a1>>2); */ \
- vec_s16 b7v = vec_sub( a7v, vec_sra(a1v, twov)); \
- /* DST(0, b0 + b7); */ \
- d0 = vec_add(b0v, b7v); \
- /* DST(1, b2 + b5); */ \
- d1 = vec_add(b2v, b5v); \
- /* DST(2, b4 + b3); */ \
- d2 = vec_add(b4v, b3v); \
- /* DST(3, b6 + b1); */ \
- d3 = vec_add(b6v, b1v); \
- /* DST(4, b6 - b1); */ \
- d4 = vec_sub(b6v, b1v); \
- /* DST(5, b4 - b3); */ \
- d5 = vec_sub(b4v, b3v); \
- /* DST(6, b2 - b5); */ \
- d6 = vec_sub(b2v, b5v); \
- /* DST(7, b0 - b7); */ \
- d7 = vec_sub(b0v, b7v); \
-}
-
-#define ALTIVEC_STORE_SUM_CLIP(dest, idctv, perm_ldv, perm_stv, sel) { \
- /* unaligned load */ \
- vec_u8 hv = vec_ld( 0, dest ); \
- vec_u8 lv = vec_ld( 7, dest ); \
- vec_u8 dstv = vec_perm( hv, lv, (vec_u8)perm_ldv ); \
- vec_s16 idct_sh6 = vec_sra(idctv, sixv); \
- vec_u16 dst16 = (vec_u16)vec_mergeh(zero_u8v, dstv); \
- vec_s16 idstsum = vec_adds(idct_sh6, (vec_s16)dst16); \
- vec_u8 idstsum8 = vec_packsu(zero_s16v, idstsum); \
- vec_u8 edgehv; \
- /* unaligned store */ \
- vec_u8 bodyv = vec_perm( idstsum8, idstsum8, perm_stv );\
- vec_u8 edgelv = vec_perm( sel, zero_u8v, perm_stv ); \
- lv = vec_sel( lv, bodyv, edgelv ); \
- vec_st( lv, 7, dest ); \
- hv = vec_ld( 0, dest ); \
- edgehv = vec_perm( zero_u8v, sel, perm_stv ); \
- hv = vec_sel( hv, bodyv, edgehv ); \
- vec_st( hv, 0, dest ); \
- }
-
-static void ff_h264_idct8_add_altivec( uint8_t *dst, DCTELEM *dct, int stride ) {
- vec_s16 s0, s1, s2, s3, s4, s5, s6, s7;
- vec_s16 d0, d1, d2, d3, d4, d5, d6, d7;
- vec_s16 idct0, idct1, idct2, idct3, idct4, idct5, idct6, idct7;
-
- vec_u8 perm_ldv = vec_lvsl(0, dst);
- vec_u8 perm_stv = vec_lvsr(8, dst);
-
- const vec_u16 onev = vec_splat_u16(1);
- const vec_u16 twov = vec_splat_u16(2);
- const vec_u16 sixv = vec_splat_u16(6);
-
- const vec_u8 sel = (vec_u8) {0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1};
- LOAD_ZERO;
-
- dct[0] += 32; // rounding for the >>6 at the end
-
- s0 = vec_ld(0x00, (int16_t*)dct);
- s1 = vec_ld(0x10, (int16_t*)dct);
- s2 = vec_ld(0x20, (int16_t*)dct);
- s3 = vec_ld(0x30, (int16_t*)dct);
- s4 = vec_ld(0x40, (int16_t*)dct);
- s5 = vec_ld(0x50, (int16_t*)dct);
- s6 = vec_ld(0x60, (int16_t*)dct);
- s7 = vec_ld(0x70, (int16_t*)dct);
-
- IDCT8_1D_ALTIVEC(s0, s1, s2, s3, s4, s5, s6, s7,
- d0, d1, d2, d3, d4, d5, d6, d7);
-
- TRANSPOSE8( d0, d1, d2, d3, d4, d5, d6, d7 );
-
- IDCT8_1D_ALTIVEC(d0, d1, d2, d3, d4, d5, d6, d7,
- idct0, idct1, idct2, idct3, idct4, idct5, idct6, idct7);
-
- ALTIVEC_STORE_SUM_CLIP(&dst[0*stride], idct0, perm_ldv, perm_stv, sel);
- ALTIVEC_STORE_SUM_CLIP(&dst[1*stride], idct1, perm_ldv, perm_stv, sel);
- ALTIVEC_STORE_SUM_CLIP(&dst[2*stride], idct2, perm_ldv, perm_stv, sel);
- ALTIVEC_STORE_SUM_CLIP(&dst[3*stride], idct3, perm_ldv, perm_stv, sel);
- ALTIVEC_STORE_SUM_CLIP(&dst[4*stride], idct4, perm_ldv, perm_stv, sel);
- ALTIVEC_STORE_SUM_CLIP(&dst[5*stride], idct5, perm_ldv, perm_stv, sel);
- ALTIVEC_STORE_SUM_CLIP(&dst[6*stride], idct6, perm_ldv, perm_stv, sel);
- ALTIVEC_STORE_SUM_CLIP(&dst[7*stride], idct7, perm_ldv, perm_stv, sel);
-}
-
-static av_always_inline void h264_idct_dc_add_internal(uint8_t *dst, DCTELEM *block, int stride, int size)
-{
- vec_s16 dc16;
- vec_u8 dcplus, dcminus, v0, v1, v2, v3, aligner;
- LOAD_ZERO;
- DECLARE_ALIGNED(16, int, dc);
- int i;
-
- dc = (block[0] + 32) >> 6;
- dc16 = vec_splat((vec_s16) vec_lde(0, &dc), 1);
-
- if (size == 4)
- dc16 = vec_sld(dc16, zero_s16v, 8);
- dcplus = vec_packsu(dc16, zero_s16v);
- dcminus = vec_packsu(vec_sub(zero_s16v, dc16), zero_s16v);
-
- aligner = vec_lvsr(0, dst);
- dcplus = vec_perm(dcplus, dcplus, aligner);
- dcminus = vec_perm(dcminus, dcminus, aligner);
-
- for (i = 0; i < size; i += 4) {
- v0 = vec_ld(0, dst+0*stride);
- v1 = vec_ld(0, dst+1*stride);
- v2 = vec_ld(0, dst+2*stride);
- v3 = vec_ld(0, dst+3*stride);
-
- v0 = vec_adds(v0, dcplus);
- v1 = vec_adds(v1, dcplus);
- v2 = vec_adds(v2, dcplus);
- v3 = vec_adds(v3, dcplus);
-
- v0 = vec_subs(v0, dcminus);
- v1 = vec_subs(v1, dcminus);
- v2 = vec_subs(v2, dcminus);
- v3 = vec_subs(v3, dcminus);
-
- vec_st(v0, 0, dst+0*stride);
- vec_st(v1, 0, dst+1*stride);
- vec_st(v2, 0, dst+2*stride);
- vec_st(v3, 0, dst+3*stride);
-
- dst += 4*stride;
- }
-}
-
-static void h264_idct_dc_add_altivec(uint8_t *dst, DCTELEM *block, int stride)
-{
- h264_idct_dc_add_internal(dst, block, stride, 4);
-}
-
-static void ff_h264_idct8_dc_add_altivec(uint8_t *dst, DCTELEM *block, int stride)
-{
- h264_idct_dc_add_internal(dst, block, stride, 8);
-}
-
-static void ff_h264_idct_add16_altivec(uint8_t *dst, const int *block_offset, DCTELEM *block, int stride, const uint8_t nnzc[15*8]){
- int i;
- for(i=0; i<16; i++){
- int nnz = nnzc[ scan8[i] ];
- if(nnz){
- if(nnz==1 && block[i*16]) h264_idct_dc_add_altivec(dst + block_offset[i], block + i*16, stride);
- else ff_h264_idct_add_altivec(dst + block_offset[i], block + i*16, stride);
- }
- }
-}
-
-static void ff_h264_idct_add16intra_altivec(uint8_t *dst, const int *block_offset, DCTELEM *block, int stride, const uint8_t nnzc[15*8]){
- int i;
- for(i=0; i<16; i++){
- if(nnzc[ scan8[i] ]) ff_h264_idct_add_altivec(dst + block_offset[i], block + i*16, stride);
- else if(block[i*16]) h264_idct_dc_add_altivec(dst + block_offset[i], block + i*16, stride);
- }
-}
-
-static void ff_h264_idct8_add4_altivec(uint8_t *dst, const int *block_offset, DCTELEM *block, int stride, const uint8_t nnzc[15*8]){
- int i;
- for(i=0; i<16; i+=4){
- int nnz = nnzc[ scan8[i] ];
- if(nnz){
- if(nnz==1 && block[i*16]) ff_h264_idct8_dc_add_altivec(dst + block_offset[i], block + i*16, stride);
- else ff_h264_idct8_add_altivec (dst + block_offset[i], block + i*16, stride);
- }
- }
-}
-
-static void ff_h264_idct_add8_altivec(uint8_t **dest, const int *block_offset, DCTELEM *block, int stride, const uint8_t nnzc[15*8]){
- int i, j;
- for (j = 1; j < 3; j++) {
- for(i = j * 16; i < j * 16 + 4; i++){
- if(nnzc[ scan8[i] ])
- ff_h264_idct_add_altivec(dest[j-1] + block_offset[i], block + i*16, stride);
- else if(block[i*16])
- h264_idct_dc_add_altivec(dest[j-1] + block_offset[i], block + i*16, stride);
- }
- }
-}
-
-#define transpose4x16(r0, r1, r2, r3) { \
- register vec_u8 r4; \
- register vec_u8 r5; \
- register vec_u8 r6; \
- register vec_u8 r7; \
- \
- r4 = vec_mergeh(r0, r2); /*0, 2 set 0*/ \
- r5 = vec_mergel(r0, r2); /*0, 2 set 1*/ \
- r6 = vec_mergeh(r1, r3); /*1, 3 set 0*/ \
- r7 = vec_mergel(r1, r3); /*1, 3 set 1*/ \
- \
- r0 = vec_mergeh(r4, r6); /*all set 0*/ \
- r1 = vec_mergel(r4, r6); /*all set 1*/ \
- r2 = vec_mergeh(r5, r7); /*all set 2*/ \
- r3 = vec_mergel(r5, r7); /*all set 3*/ \
-}
-
-static inline void write16x4(uint8_t *dst, int dst_stride,
- register vec_u8 r0, register vec_u8 r1,
- register vec_u8 r2, register vec_u8 r3) {
- DECLARE_ALIGNED(16, unsigned char, result)[64];
- uint32_t *src_int = (uint32_t *)result, *dst_int = (uint32_t *)dst;
- int int_dst_stride = dst_stride/4;
-
- vec_st(r0, 0, result);
- vec_st(r1, 16, result);
- vec_st(r2, 32, result);
- vec_st(r3, 48, result);
- /* FIXME: there has to be a better way!!!! */
- *dst_int = *src_int;
- *(dst_int+ int_dst_stride) = *(src_int + 1);
- *(dst_int+ 2*int_dst_stride) = *(src_int + 2);
- *(dst_int+ 3*int_dst_stride) = *(src_int + 3);
- *(dst_int+ 4*int_dst_stride) = *(src_int + 4);
- *(dst_int+ 5*int_dst_stride) = *(src_int + 5);
- *(dst_int+ 6*int_dst_stride) = *(src_int + 6);
- *(dst_int+ 7*int_dst_stride) = *(src_int + 7);
- *(dst_int+ 8*int_dst_stride) = *(src_int + 8);
- *(dst_int+ 9*int_dst_stride) = *(src_int + 9);
- *(dst_int+10*int_dst_stride) = *(src_int + 10);
- *(dst_int+11*int_dst_stride) = *(src_int + 11);
- *(dst_int+12*int_dst_stride) = *(src_int + 12);
- *(dst_int+13*int_dst_stride) = *(src_int + 13);
- *(dst_int+14*int_dst_stride) = *(src_int + 14);
- *(dst_int+15*int_dst_stride) = *(src_int + 15);
-}
-
-/** @brief performs a 6x16 transpose of data in src, and stores it to dst
- @todo FIXME: see if we can't spare some vec_lvsl() by them factorizing
- out of unaligned_load() */
-#define readAndTranspose16x6(src, src_stride, r8, r9, r10, r11, r12, r13) {\
- register vec_u8 r0 = unaligned_load(0, src); \
- register vec_u8 r1 = unaligned_load( src_stride, src); \
- register vec_u8 r2 = unaligned_load(2* src_stride, src); \
- register vec_u8 r3 = unaligned_load(3* src_stride, src); \
- register vec_u8 r4 = unaligned_load(4* src_stride, src); \
- register vec_u8 r5 = unaligned_load(5* src_stride, src); \
- register vec_u8 r6 = unaligned_load(6* src_stride, src); \
- register vec_u8 r7 = unaligned_load(7* src_stride, src); \
- register vec_u8 r14 = unaligned_load(14*src_stride, src); \
- register vec_u8 r15 = unaligned_load(15*src_stride, src); \
- \
- r8 = unaligned_load( 8*src_stride, src); \
- r9 = unaligned_load( 9*src_stride, src); \
- r10 = unaligned_load(10*src_stride, src); \
- r11 = unaligned_load(11*src_stride, src); \
- r12 = unaligned_load(12*src_stride, src); \
- r13 = unaligned_load(13*src_stride, src); \
- \
- /*Merge first pairs*/ \
- r0 = vec_mergeh(r0, r8); /*0, 8*/ \
- r1 = vec_mergeh(r1, r9); /*1, 9*/ \
- r2 = vec_mergeh(r2, r10); /*2,10*/ \
- r3 = vec_mergeh(r3, r11); /*3,11*/ \
- r4 = vec_mergeh(r4, r12); /*4,12*/ \
- r5 = vec_mergeh(r5, r13); /*5,13*/ \
- r6 = vec_mergeh(r6, r14); /*6,14*/ \
- r7 = vec_mergeh(r7, r15); /*7,15*/ \
- \
- /*Merge second pairs*/ \
- r8 = vec_mergeh(r0, r4); /*0,4, 8,12 set 0*/ \
- r9 = vec_mergel(r0, r4); /*0,4, 8,12 set 1*/ \
- r10 = vec_mergeh(r1, r5); /*1,5, 9,13 set 0*/ \
- r11 = vec_mergel(r1, r5); /*1,5, 9,13 set 1*/ \
- r12 = vec_mergeh(r2, r6); /*2,6,10,14 set 0*/ \
- r13 = vec_mergel(r2, r6); /*2,6,10,14 set 1*/ \
- r14 = vec_mergeh(r3, r7); /*3,7,11,15 set 0*/ \
- r15 = vec_mergel(r3, r7); /*3,7,11,15 set 1*/ \
- \
- /*Third merge*/ \
- r0 = vec_mergeh(r8, r12); /*0,2,4,6,8,10,12,14 set 0*/ \
- r1 = vec_mergel(r8, r12); /*0,2,4,6,8,10,12,14 set 1*/ \
- r2 = vec_mergeh(r9, r13); /*0,2,4,6,8,10,12,14 set 2*/ \
- r4 = vec_mergeh(r10, r14); /*1,3,5,7,9,11,13,15 set 0*/ \
- r5 = vec_mergel(r10, r14); /*1,3,5,7,9,11,13,15 set 1*/ \
- r6 = vec_mergeh(r11, r15); /*1,3,5,7,9,11,13,15 set 2*/ \
- /* Don't need to compute 3 and 7*/ \
- \
- /*Final merge*/ \
- r8 = vec_mergeh(r0, r4); /*all set 0*/ \
- r9 = vec_mergel(r0, r4); /*all set 1*/ \
- r10 = vec_mergeh(r1, r5); /*all set 2*/ \
- r11 = vec_mergel(r1, r5); /*all set 3*/ \
- r12 = vec_mergeh(r2, r6); /*all set 4*/ \
- r13 = vec_mergel(r2, r6); /*all set 5*/ \
- /* Don't need to compute 14 and 15*/ \
- \
-}
-
-// out: o = |x-y| < a
-static inline vec_u8 diff_lt_altivec ( register vec_u8 x,
- register vec_u8 y,
- register vec_u8 a) {
-
- register vec_u8 diff = vec_subs(x, y);
- register vec_u8 diffneg = vec_subs(y, x);
- register vec_u8 o = vec_or(diff, diffneg); /* |x-y| */
- o = (vec_u8)vec_cmplt(o, a);
- return o;
-}
-
-static inline vec_u8 h264_deblock_mask ( register vec_u8 p0,
- register vec_u8 p1,
- register vec_u8 q0,
- register vec_u8 q1,
- register vec_u8 alpha,
- register vec_u8 beta) {
-
- register vec_u8 mask;
- register vec_u8 tempmask;
-
- mask = diff_lt_altivec(p0, q0, alpha);
- tempmask = diff_lt_altivec(p1, p0, beta);
- mask = vec_and(mask, tempmask);
- tempmask = diff_lt_altivec(q1, q0, beta);
- mask = vec_and(mask, tempmask);
-
- return mask;
-}
-
-// out: newp1 = clip((p2 + ((p0 + q0 + 1) >> 1)) >> 1, p1-tc0, p1+tc0)
-static inline vec_u8 h264_deblock_q1(register vec_u8 p0,
- register vec_u8 p1,
- register vec_u8 p2,
- register vec_u8 q0,
- register vec_u8 tc0) {
-
- register vec_u8 average = vec_avg(p0, q0);
- register vec_u8 temp;
- register vec_u8 uncliped;
- register vec_u8 ones;
- register vec_u8 max;
- register vec_u8 min;
- register vec_u8 newp1;
-
- temp = vec_xor(average, p2);
- average = vec_avg(average, p2); /*avg(p2, avg(p0, q0)) */
- ones = vec_splat_u8(1);
- temp = vec_and(temp, ones); /*(p2^avg(p0, q0)) & 1 */
- uncliped = vec_subs(average, temp); /*(p2+((p0+q0+1)>>1))>>1 */
- max = vec_adds(p1, tc0);
- min = vec_subs(p1, tc0);
- newp1 = vec_max(min, uncliped);
- newp1 = vec_min(max, newp1);
- return newp1;
-}
-
-#define h264_deblock_p0_q0(p0, p1, q0, q1, tc0masked) { \
- \
- const vec_u8 A0v = vec_sl(vec_splat_u8(10), vec_splat_u8(4)); \
- \
- register vec_u8 pq0bit = vec_xor(p0,q0); \
- register vec_u8 q1minus; \
- register vec_u8 p0minus; \
- register vec_u8 stage1; \
- register vec_u8 stage2; \
- register vec_u8 vec160; \
- register vec_u8 delta; \
- register vec_u8 deltaneg; \
- \
- q1minus = vec_nor(q1, q1); /* 255 - q1 */ \
- stage1 = vec_avg(p1, q1minus); /* (p1 - q1 + 256)>>1 */ \
- stage2 = vec_sr(stage1, vec_splat_u8(1)); /* (p1 - q1 + 256)>>2 = 64 + (p1 - q1) >> 2 */ \
- p0minus = vec_nor(p0, p0); /* 255 - p0 */ \
- stage1 = vec_avg(q0, p0minus); /* (q0 - p0 + 256)>>1 */ \
- pq0bit = vec_and(pq0bit, vec_splat_u8(1)); \
- stage2 = vec_avg(stage2, pq0bit); /* 32 + ((q0 - p0)&1 + (p1 - q1) >> 2 + 1) >> 1 */ \
- stage2 = vec_adds(stage2, stage1); /* 160 + ((p0 - q0) + (p1 - q1) >> 2 + 1) >> 1 */ \
- vec160 = vec_ld(0, &A0v); \
- deltaneg = vec_subs(vec160, stage2); /* -d */ \
- delta = vec_subs(stage2, vec160); /* d */ \
- deltaneg = vec_min(tc0masked, deltaneg); \
- delta = vec_min(tc0masked, delta); \
- p0 = vec_subs(p0, deltaneg); \
- q0 = vec_subs(q0, delta); \
- p0 = vec_adds(p0, delta); \
- q0 = vec_adds(q0, deltaneg); \
-}
-
-#define h264_loop_filter_luma_altivec(p2, p1, p0, q0, q1, q2, alpha, beta, tc0) { \
- DECLARE_ALIGNED(16, unsigned char, temp)[16]; \
- register vec_u8 alphavec; \
- register vec_u8 betavec; \
- register vec_u8 mask; \
- register vec_u8 p1mask; \
- register vec_u8 q1mask; \
- register vector signed char tc0vec; \
- register vec_u8 finaltc0; \
- register vec_u8 tc0masked; \
- register vec_u8 newp1; \
- register vec_u8 newq1; \
- \
- temp[0] = alpha; \
- temp[1] = beta; \
- alphavec = vec_ld(0, temp); \
- betavec = vec_splat(alphavec, 0x1); \
- alphavec = vec_splat(alphavec, 0x0); \
- mask = h264_deblock_mask(p0, p1, q0, q1, alphavec, betavec); /*if in block */ \
- \
- AV_COPY32(temp, tc0); \
- tc0vec = vec_ld(0, (signed char*)temp); \
- tc0vec = vec_mergeh(tc0vec, tc0vec); \
- tc0vec = vec_mergeh(tc0vec, tc0vec); \
- mask = vec_and(mask, vec_cmpgt(tc0vec, vec_splat_s8(-1))); /* if tc0[i] >= 0 */ \
- finaltc0 = vec_and((vec_u8)tc0vec, mask); /* tc = tc0 */ \
- \
- p1mask = diff_lt_altivec(p2, p0, betavec); \
- p1mask = vec_and(p1mask, mask); /* if ( |p2 - p0| < beta) */ \
- tc0masked = vec_and(p1mask, (vec_u8)tc0vec); \
- finaltc0 = vec_sub(finaltc0, p1mask); /* tc++ */ \
- newp1 = h264_deblock_q1(p0, p1, p2, q0, tc0masked); \
- /*end if*/ \
- \
- q1mask = diff_lt_altivec(q2, q0, betavec); \
- q1mask = vec_and(q1mask, mask); /* if ( |q2 - q0| < beta ) */\
- tc0masked = vec_and(q1mask, (vec_u8)tc0vec); \
- finaltc0 = vec_sub(finaltc0, q1mask); /* tc++ */ \
- newq1 = h264_deblock_q1(p0, q1, q2, q0, tc0masked); \
- /*end if*/ \
- \
- h264_deblock_p0_q0(p0, p1, q0, q1, finaltc0); \
- p1 = newp1; \
- q1 = newq1; \
-}
-
-static void h264_v_loop_filter_luma_altivec(uint8_t *pix, int stride, int alpha, int beta, int8_t *tc0) {
-
- if ((tc0[0] & tc0[1] & tc0[2] & tc0[3]) >= 0) {
- register vec_u8 p2 = vec_ld(-3*stride, pix);
- register vec_u8 p1 = vec_ld(-2*stride, pix);
- register vec_u8 p0 = vec_ld(-1*stride, pix);
- register vec_u8 q0 = vec_ld(0, pix);
- register vec_u8 q1 = vec_ld(stride, pix);
- register vec_u8 q2 = vec_ld(2*stride, pix);
- h264_loop_filter_luma_altivec(p2, p1, p0, q0, q1, q2, alpha, beta, tc0);
- vec_st(p1, -2*stride, pix);
- vec_st(p0, -1*stride, pix);
- vec_st(q0, 0, pix);
- vec_st(q1, stride, pix);
- }
-}
-
-static void h264_h_loop_filter_luma_altivec(uint8_t *pix, int stride, int alpha, int beta, int8_t *tc0) {
-
- register vec_u8 line0, line1, line2, line3, line4, line5;
- if ((tc0[0] & tc0[1] & tc0[2] & tc0[3]) < 0)
- return;
- readAndTranspose16x6(pix-3, stride, line0, line1, line2, line3, line4, line5);
- h264_loop_filter_luma_altivec(line0, line1, line2, line3, line4, line5, alpha, beta, tc0);
- transpose4x16(line1, line2, line3, line4);
- write16x4(pix-2, stride, line1, line2, line3, line4);
-}
-
-static av_always_inline
-void weight_h264_W_altivec(uint8_t *block, int stride, int height,
- int log2_denom, int weight, int offset, int w)
-{
- int y, aligned;
- vec_u8 vblock;
- vec_s16 vtemp, vweight, voffset, v0, v1;
- vec_u16 vlog2_denom;
- DECLARE_ALIGNED(16, int32_t, temp)[4];
- LOAD_ZERO;
-
- offset <<= log2_denom;
- if(log2_denom) offset += 1<<(log2_denom-1);
- temp[0] = log2_denom;
- temp[1] = weight;
- temp[2] = offset;
-
- vtemp = (vec_s16)vec_ld(0, temp);
- vlog2_denom = (vec_u16)vec_splat(vtemp, 1);
- vweight = vec_splat(vtemp, 3);
- voffset = vec_splat(vtemp, 5);
- aligned = !((unsigned long)block & 0xf);
-
- for (y = 0; y < height; y++) {
- vblock = vec_ld(0, block);
-
- v0 = (vec_s16)vec_mergeh(zero_u8v, vblock);
- v1 = (vec_s16)vec_mergel(zero_u8v, vblock);
-
- if (w == 16 || aligned) {
- v0 = vec_mladd(v0, vweight, zero_s16v);
- v0 = vec_adds(v0, voffset);
- v0 = vec_sra(v0, vlog2_denom);
- }
- if (w == 16 || !aligned) {
- v1 = vec_mladd(v1, vweight, zero_s16v);
- v1 = vec_adds(v1, voffset);
- v1 = vec_sra(v1, vlog2_denom);
- }
- vblock = vec_packsu(v0, v1);
- vec_st(vblock, 0, block);
-
- block += stride;
- }
-}
-
-static av_always_inline
-void biweight_h264_W_altivec(uint8_t *dst, uint8_t *src, int stride, int height,
- int log2_denom, int weightd, int weights, int offset, int w)
-{
- int y, dst_aligned, src_aligned;
- vec_u8 vsrc, vdst;
- vec_s16 vtemp, vweights, vweightd, voffset, v0, v1, v2, v3;
- vec_u16 vlog2_denom;
- DECLARE_ALIGNED(16, int32_t, temp)[4];
- LOAD_ZERO;
-
- offset = ((offset + 1) | 1) << log2_denom;
- temp[0] = log2_denom+1;
- temp[1] = weights;
- temp[2] = weightd;
- temp[3] = offset;
-
- vtemp = (vec_s16)vec_ld(0, temp);
- vlog2_denom = (vec_u16)vec_splat(vtemp, 1);
- vweights = vec_splat(vtemp, 3);
- vweightd = vec_splat(vtemp, 5);
- voffset = vec_splat(vtemp, 7);
- dst_aligned = !((unsigned long)dst & 0xf);
- src_aligned = !((unsigned long)src & 0xf);
-
- for (y = 0; y < height; y++) {
- vdst = vec_ld(0, dst);
- vsrc = vec_ld(0, src);
-
- v0 = (vec_s16)vec_mergeh(zero_u8v, vdst);
- v1 = (vec_s16)vec_mergel(zero_u8v, vdst);
- v2 = (vec_s16)vec_mergeh(zero_u8v, vsrc);
- v3 = (vec_s16)vec_mergel(zero_u8v, vsrc);
-
- if (w == 8) {
- if (src_aligned)
- v3 = v2;
- else
- v2 = v3;
- }
-
- if (w == 16 || dst_aligned) {
- v0 = vec_mladd(v0, vweightd, zero_s16v);
- v2 = vec_mladd(v2, vweights, zero_s16v);
-
- v0 = vec_adds(v0, voffset);
- v0 = vec_adds(v0, v2);
- v0 = vec_sra(v0, vlog2_denom);
- }
- if (w == 16 || !dst_aligned) {
- v1 = vec_mladd(v1, vweightd, zero_s16v);
- v3 = vec_mladd(v3, vweights, zero_s16v);
-
- v1 = vec_adds(v1, voffset);
- v1 = vec_adds(v1, v3);
- v1 = vec_sra(v1, vlog2_denom);
- }
- vdst = vec_packsu(v0, v1);
- vec_st(vdst, 0, dst);
-
- dst += stride;
- src += stride;
- }
-}
-
-#define H264_WEIGHT(W) \
-static void ff_weight_h264_pixels ## W ## _altivec(uint8_t *block, int stride, int height, \
- int log2_denom, int weight, int offset){ \
- weight_h264_W_altivec(block, stride, height, log2_denom, weight, offset, W); \
-}\
-static void ff_biweight_h264_pixels ## W ## _altivec(uint8_t *dst, uint8_t *src, int stride, int height, \
- int log2_denom, int weightd, int weights, int offset){ \
- biweight_h264_W_altivec(dst, src, stride, height, log2_denom, weightd, weights, offset, W); \
-}
-
-H264_WEIGHT(16)
-H264_WEIGHT( 8)
-
-void ff_dsputil_h264_init_ppc(DSPContext* c, AVCodecContext *avctx) {
- const int high_bit_depth = avctx->bits_per_raw_sample > 8;
-
- if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) {
- if (!high_bit_depth) {
- c->put_h264_chroma_pixels_tab[0] = put_h264_chroma_mc8_altivec;
- c->avg_h264_chroma_pixels_tab[0] = avg_h264_chroma_mc8_altivec;
-
-#define dspfunc(PFX, IDX, NUM) \
- c->PFX ## _pixels_tab[IDX][ 0] = PFX ## NUM ## _mc00_altivec; \
- c->PFX ## _pixels_tab[IDX][ 1] = PFX ## NUM ## _mc10_altivec; \
- c->PFX ## _pixels_tab[IDX][ 2] = PFX ## NUM ## _mc20_altivec; \
- c->PFX ## _pixels_tab[IDX][ 3] = PFX ## NUM ## _mc30_altivec; \
- c->PFX ## _pixels_tab[IDX][ 4] = PFX ## NUM ## _mc01_altivec; \
- c->PFX ## _pixels_tab[IDX][ 5] = PFX ## NUM ## _mc11_altivec; \
- c->PFX ## _pixels_tab[IDX][ 6] = PFX ## NUM ## _mc21_altivec; \
- c->PFX ## _pixels_tab[IDX][ 7] = PFX ## NUM ## _mc31_altivec; \
- c->PFX ## _pixels_tab[IDX][ 8] = PFX ## NUM ## _mc02_altivec; \
- c->PFX ## _pixels_tab[IDX][ 9] = PFX ## NUM ## _mc12_altivec; \
- c->PFX ## _pixels_tab[IDX][10] = PFX ## NUM ## _mc22_altivec; \
- c->PFX ## _pixels_tab[IDX][11] = PFX ## NUM ## _mc32_altivec; \
- c->PFX ## _pixels_tab[IDX][12] = PFX ## NUM ## _mc03_altivec; \
- c->PFX ## _pixels_tab[IDX][13] = PFX ## NUM ## _mc13_altivec; \
- c->PFX ## _pixels_tab[IDX][14] = PFX ## NUM ## _mc23_altivec; \
- c->PFX ## _pixels_tab[IDX][15] = PFX ## NUM ## _mc33_altivec
-
- dspfunc(put_h264_qpel, 0, 16);
- dspfunc(avg_h264_qpel, 0, 16);
-#undef dspfunc
- }
- }
-}
-
-void ff_h264dsp_init_ppc(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
-{
- if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) {
- if (bit_depth == 8) {
- c->h264_idct_add = ff_h264_idct_add_altivec;
- if (chroma_format_idc == 1)
- c->h264_idct_add8 = ff_h264_idct_add8_altivec;
- c->h264_idct_add16 = ff_h264_idct_add16_altivec;
- c->h264_idct_add16intra = ff_h264_idct_add16intra_altivec;
- c->h264_idct_dc_add= h264_idct_dc_add_altivec;
- c->h264_idct8_dc_add = ff_h264_idct8_dc_add_altivec;
- c->h264_idct8_add = ff_h264_idct8_add_altivec;
- c->h264_idct8_add4 = ff_h264_idct8_add4_altivec;
- c->h264_v_loop_filter_luma= h264_v_loop_filter_luma_altivec;
- c->h264_h_loop_filter_luma= h264_h_loop_filter_luma_altivec;
-
- c->weight_h264_pixels_tab[0] = ff_weight_h264_pixels16_altivec;
- c->weight_h264_pixels_tab[1] = ff_weight_h264_pixels8_altivec;
- c->biweight_h264_pixels_tab[0] = ff_biweight_h264_pixels16_altivec;
- c->biweight_h264_pixels_tab[1] = ff_biweight_h264_pixels8_altivec;
- }
- }
-}

libav-v9.6.tar.bz2/libavcodec/ppc/h264_altivec_template.c Deleted

@@ -1,775 +0,0 @@
-/*
- * Copyright (c) 2004 Romain Dolbeau <romain@dolbeau.org>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavutil/mem.h"
-
-#ifdef DEBUG
-#define ASSERT_ALIGNED(ptr) assert(((unsigned long)ptr&0x0000000F));
-#else
-#define ASSERT_ALIGNED(ptr) ;
-#endif
-
-/* this code assume that stride % 16 == 0 */
-
-#define CHROMA_MC8_ALTIVEC_CORE(BIAS1, BIAS2) \
- vsrc2ssH = (vec_s16)vec_mergeh(zero_u8v,(vec_u8)vsrc2uc);\
- vsrc3ssH = (vec_s16)vec_mergeh(zero_u8v,(vec_u8)vsrc3uc);\
-\
- psum = vec_mladd(vA, vsrc0ssH, BIAS1);\
- psum = vec_mladd(vB, vsrc1ssH, psum);\
- psum = vec_mladd(vC, vsrc2ssH, psum);\
- psum = vec_mladd(vD, vsrc3ssH, psum);\
- psum = BIAS2(psum);\
- psum = vec_sr(psum, v6us);\
-\
- vdst = vec_ld(0, dst);\
- ppsum = (vec_u8)vec_pack(psum, psum);\
- vfdst = vec_perm(vdst, ppsum, fperm);\
-\
- OP_U8_ALTIVEC(fsum, vfdst, vdst);\
-\
- vec_st(fsum, 0, dst);\
-\
- vsrc0ssH = vsrc2ssH;\
- vsrc1ssH = vsrc3ssH;\
-\
- dst += stride;\
- src += stride;
-
-#define CHROMA_MC8_ALTIVEC_CORE_SIMPLE \
-\
- vsrc0ssH = (vec_s16)vec_mergeh(zero_u8v,(vec_u8)vsrc0uc);\
- vsrc1ssH = (vec_s16)vec_mergeh(zero_u8v,(vec_u8)vsrc1uc);\
-\
- psum = vec_mladd(vA, vsrc0ssH, v32ss);\
- psum = vec_mladd(vE, vsrc1ssH, psum);\
- psum = vec_sr(psum, v6us);\
-\
- vdst = vec_ld(0, dst);\
- ppsum = (vec_u8)vec_pack(psum, psum);\
- vfdst = vec_perm(vdst, ppsum, fperm);\
-\
- OP_U8_ALTIVEC(fsum, vfdst, vdst);\
-\
- vec_st(fsum, 0, dst);\
-\
- dst += stride;\
- src += stride;
-
-#define noop(a) a
-#define add28(a) vec_add(v28ss, a)
-
-#ifdef PREFIX_h264_chroma_mc8_altivec
-static void PREFIX_h264_chroma_mc8_altivec(uint8_t * dst, uint8_t * src,
- int stride, int h, int x, int y) {
- DECLARE_ALIGNED(16, signed int, ABCD)[4] =
- {((8 - x) * (8 - y)),
- (( x) * (8 - y)),
- ((8 - x) * ( y)),
- (( x) * ( y))};
- register int i;
- vec_u8 fperm;
- const vec_s32 vABCD = vec_ld(0, ABCD);
- const vec_s16 vA = vec_splat((vec_s16)vABCD, 1);
- const vec_s16 vB = vec_splat((vec_s16)vABCD, 3);
- const vec_s16 vC = vec_splat((vec_s16)vABCD, 5);
- const vec_s16 vD = vec_splat((vec_s16)vABCD, 7);
- LOAD_ZERO;
- const vec_s16 v32ss = vec_sl(vec_splat_s16(1),vec_splat_u16(5));
- const vec_u16 v6us = vec_splat_u16(6);
- register int loadSecond = (((unsigned long)src) % 16) <= 7 ? 0 : 1;
- register int reallyBadAlign = (((unsigned long)src) % 16) == 15 ? 1 : 0;
-
- vec_u8 vsrcAuc, av_uninit(vsrcBuc), vsrcperm0, vsrcperm1;
- vec_u8 vsrc0uc, vsrc1uc;
- vec_s16 vsrc0ssH, vsrc1ssH;
- vec_u8 vsrcCuc, vsrc2uc, vsrc3uc;
- vec_s16 vsrc2ssH, vsrc3ssH, psum;
- vec_u8 vdst, ppsum, vfdst, fsum;
-
- if (((unsigned long)dst) % 16 == 0) {
- fperm = (vec_u8){0x10, 0x11, 0x12, 0x13,
- 0x14, 0x15, 0x16, 0x17,
- 0x08, 0x09, 0x0A, 0x0B,
- 0x0C, 0x0D, 0x0E, 0x0F};
- } else {
- fperm = (vec_u8){0x00, 0x01, 0x02, 0x03,
- 0x04, 0x05, 0x06, 0x07,
- 0x18, 0x19, 0x1A, 0x1B,
- 0x1C, 0x1D, 0x1E, 0x1F};
- }
-
- vsrcAuc = vec_ld(0, src);
-
- if (loadSecond)
- vsrcBuc = vec_ld(16, src);
- vsrcperm0 = vec_lvsl(0, src);
- vsrcperm1 = vec_lvsl(1, src);
-
- vsrc0uc = vec_perm(vsrcAuc, vsrcBuc, vsrcperm0);
- if (reallyBadAlign)
- vsrc1uc = vsrcBuc;
- else
- vsrc1uc = vec_perm(vsrcAuc, vsrcBuc, vsrcperm1);
-
- vsrc0ssH = (vec_s16)vec_mergeh(zero_u8v,(vec_u8)vsrc0uc);
- vsrc1ssH = (vec_s16)vec_mergeh(zero_u8v,(vec_u8)vsrc1uc);
-
- if (ABCD[3]) {
- if (!loadSecond) {// -> !reallyBadAlign
- for (i = 0 ; i < h ; i++) {
- vsrcCuc = vec_ld(stride + 0, src);
- vsrc2uc = vec_perm(vsrcCuc, vsrcCuc, vsrcperm0);
- vsrc3uc = vec_perm(vsrcCuc, vsrcCuc, vsrcperm1);
-
- CHROMA_MC8_ALTIVEC_CORE(v32ss, noop)
- }
- } else {
- vec_u8 vsrcDuc;
- for (i = 0 ; i < h ; i++) {
- vsrcCuc = vec_ld(stride + 0, src);
- vsrcDuc = vec_ld(stride + 16, src);
- vsrc2uc = vec_perm(vsrcCuc, vsrcDuc, vsrcperm0);
- if (reallyBadAlign)
- vsrc3uc = vsrcDuc;
- else
- vsrc3uc = vec_perm(vsrcCuc, vsrcDuc, vsrcperm1);
-
- CHROMA_MC8_ALTIVEC_CORE(v32ss, noop)
- }
- }
- } else {
- const vec_s16 vE = vec_add(vB, vC);
- if (ABCD[2]) { // x == 0 B == 0
- if (!loadSecond) {// -> !reallyBadAlign
- for (i = 0 ; i < h ; i++) {
- vsrcCuc = vec_ld(stride + 0, src);
- vsrc1uc = vec_perm(vsrcCuc, vsrcCuc, vsrcperm0);
- CHROMA_MC8_ALTIVEC_CORE_SIMPLE
-
- vsrc0uc = vsrc1uc;
- }
- } else {
- vec_u8 vsrcDuc;
- for (i = 0 ; i < h ; i++) {
- vsrcCuc = vec_ld(stride + 0, src);
- vsrcDuc = vec_ld(stride + 15, src);
- vsrc1uc = vec_perm(vsrcCuc, vsrcDuc, vsrcperm0);
- CHROMA_MC8_ALTIVEC_CORE_SIMPLE
-
- vsrc0uc = vsrc1uc;
- }
- }
- } else { // y == 0 C == 0
- if (!loadSecond) {// -> !reallyBadAlign
- for (i = 0 ; i < h ; i++) {
- vsrcCuc = vec_ld(0, src);
- vsrc0uc = vec_perm(vsrcCuc, vsrcCuc, vsrcperm0);
- vsrc1uc = vec_perm(vsrcCuc, vsrcCuc, vsrcperm1);
-
- CHROMA_MC8_ALTIVEC_CORE_SIMPLE
- }
- } else {
- vec_u8 vsrcDuc;
- for (i = 0 ; i < h ; i++) {
- vsrcCuc = vec_ld(0, src);
- vsrcDuc = vec_ld(15, src);
- vsrc0uc = vec_perm(vsrcCuc, vsrcDuc, vsrcperm0);
- if (reallyBadAlign)
- vsrc1uc = vsrcDuc;
- else
- vsrc1uc = vec_perm(vsrcCuc, vsrcDuc, vsrcperm1);
-
- CHROMA_MC8_ALTIVEC_CORE_SIMPLE
- }
- }
- }
- }
-}
-#endif
-
-/* this code assume that stride % 16 == 0 */
-#ifdef PREFIX_no_rnd_vc1_chroma_mc8_altivec
-static void PREFIX_no_rnd_vc1_chroma_mc8_altivec(uint8_t * dst, uint8_t * src, int stride, int h, int x, int y) {
- DECLARE_ALIGNED(16, signed int, ABCD)[4] =
- {((8 - x) * (8 - y)),
- (( x) * (8 - y)),
- ((8 - x) * ( y)),
- (( x) * ( y))};
- register int i;
- vec_u8 fperm;
- const vec_s32 vABCD = vec_ld(0, ABCD);
- const vec_s16 vA = vec_splat((vec_s16)vABCD, 1);
- const vec_s16 vB = vec_splat((vec_s16)vABCD, 3);
- const vec_s16 vC = vec_splat((vec_s16)vABCD, 5);
- const vec_s16 vD = vec_splat((vec_s16)vABCD, 7);
- LOAD_ZERO;
- const vec_s16 v28ss = vec_sub(vec_sl(vec_splat_s16(1),vec_splat_u16(5)),vec_splat_s16(4));
- const vec_u16 v6us = vec_splat_u16(6);
- register int loadSecond = (((unsigned long)src) % 16) <= 7 ? 0 : 1;
- register int reallyBadAlign = (((unsigned long)src) % 16) == 15 ? 1 : 0;
-
- vec_u8 vsrcAuc, av_uninit(vsrcBuc), vsrcperm0, vsrcperm1;
- vec_u8 vsrc0uc, vsrc1uc;
- vec_s16 vsrc0ssH, vsrc1ssH;
- vec_u8 vsrcCuc, vsrc2uc, vsrc3uc;
- vec_s16 vsrc2ssH, vsrc3ssH, psum;
- vec_u8 vdst, ppsum, vfdst, fsum;
-
- if (((unsigned long)dst) % 16 == 0) {
- fperm = (vec_u8){0x10, 0x11, 0x12, 0x13,
- 0x14, 0x15, 0x16, 0x17,
- 0x08, 0x09, 0x0A, 0x0B,
- 0x0C, 0x0D, 0x0E, 0x0F};
- } else {
- fperm = (vec_u8){0x00, 0x01, 0x02, 0x03,
- 0x04, 0x05, 0x06, 0x07,
- 0x18, 0x19, 0x1A, 0x1B,
- 0x1C, 0x1D, 0x1E, 0x1F};
- }
-
- vsrcAuc = vec_ld(0, src);
-
- if (loadSecond)
- vsrcBuc = vec_ld(16, src);
- vsrcperm0 = vec_lvsl(0, src);
- vsrcperm1 = vec_lvsl(1, src);
-
- vsrc0uc = vec_perm(vsrcAuc, vsrcBuc, vsrcperm0);
- if (reallyBadAlign)
- vsrc1uc = vsrcBuc;
- else
- vsrc1uc = vec_perm(vsrcAuc, vsrcBuc, vsrcperm1);
-
- vsrc0ssH = (vec_s16)vec_mergeh(zero_u8v, (vec_u8)vsrc0uc);
- vsrc1ssH = (vec_s16)vec_mergeh(zero_u8v, (vec_u8)vsrc1uc);
-
- if (!loadSecond) {// -> !reallyBadAlign
- for (i = 0 ; i < h ; i++) {
-
-
- vsrcCuc = vec_ld(stride + 0, src);
-
- vsrc2uc = vec_perm(vsrcCuc, vsrcCuc, vsrcperm0);
- vsrc3uc = vec_perm(vsrcCuc, vsrcCuc, vsrcperm1);
-
- CHROMA_MC8_ALTIVEC_CORE(vec_splat_s16(0), add28)
- }
- } else {
- vec_u8 vsrcDuc;
- for (i = 0 ; i < h ; i++) {
- vsrcCuc = vec_ld(stride + 0, src);
- vsrcDuc = vec_ld(stride + 16, src);
-
- vsrc2uc = vec_perm(vsrcCuc, vsrcDuc, vsrcperm0);
- if (reallyBadAlign)
- vsrc3uc = vsrcDuc;
- else
- vsrc3uc = vec_perm(vsrcCuc, vsrcDuc, vsrcperm1);
-
- CHROMA_MC8_ALTIVEC_CORE(vec_splat_s16(0), add28)
- }
- }
-}
-#endif
-
-#undef noop
-#undef add28
-#undef CHROMA_MC8_ALTIVEC_CORE
-
-/* this code assume stride % 16 == 0 */
-#ifdef PREFIX_h264_qpel16_h_lowpass_altivec
-static void PREFIX_h264_qpel16_h_lowpass_altivec(uint8_t * dst, uint8_t * src, int dstStride, int srcStride) {
- register int i;
-
- LOAD_ZERO;
- const vec_u8 permM2 = vec_lvsl(-2, src);
- const vec_u8 permM1 = vec_lvsl(-1, src);
- const vec_u8 permP0 = vec_lvsl(+0, src);
- const vec_u8 permP1 = vec_lvsl(+1, src);
- const vec_u8 permP2 = vec_lvsl(+2, src);
- const vec_u8 permP3 = vec_lvsl(+3, src);
- const vec_s16 v5ss = vec_splat_s16(5);
- const vec_u16 v5us = vec_splat_u16(5);
- const vec_s16 v20ss = vec_sl(vec_splat_s16(5),vec_splat_u16(2));
- const vec_s16 v16ss = vec_sl(vec_splat_s16(1),vec_splat_u16(4));
-
- vec_u8 srcM2, srcM1, srcP0, srcP1, srcP2, srcP3;
-
- register int align = ((((unsigned long)src) - 2) % 16);
-
- vec_s16 srcP0A, srcP0B, srcP1A, srcP1B,
- srcP2A, srcP2B, srcP3A, srcP3B,
- srcM1A, srcM1B, srcM2A, srcM2B,
- sum1A, sum1B, sum2A, sum2B, sum3A, sum3B,
- pp1A, pp1B, pp2A, pp2B, pp3A, pp3B,
- psumA, psumB, sumA, sumB;
-
- vec_u8 sum, fsum;
-
- for (i = 0 ; i < 16 ; i ++) {
- vec_u8 srcR1 = vec_ld(-2, src);
- vec_u8 srcR2 = vec_ld(14, src);
-
- switch (align) {
- default: {
- srcM2 = vec_perm(srcR1, srcR2, permM2);
- srcM1 = vec_perm(srcR1, srcR2, permM1);
- srcP0 = vec_perm(srcR1, srcR2, permP0);
- srcP1 = vec_perm(srcR1, srcR2, permP1);
- srcP2 = vec_perm(srcR1, srcR2, permP2);
- srcP3 = vec_perm(srcR1, srcR2, permP3);
- } break;
- case 11: {
- srcM2 = vec_perm(srcR1, srcR2, permM2);
- srcM1 = vec_perm(srcR1, srcR2, permM1);
- srcP0 = vec_perm(srcR1, srcR2, permP0);
- srcP1 = vec_perm(srcR1, srcR2, permP1);
- srcP2 = vec_perm(srcR1, srcR2, permP2);
- srcP3 = srcR2;
- } break;
- case 12: {
- vec_u8 srcR3 = vec_ld(30, src);
- srcM2 = vec_perm(srcR1, srcR2, permM2);
- srcM1 = vec_perm(srcR1, srcR2, permM1);
- srcP0 = vec_perm(srcR1, srcR2, permP0);
- srcP1 = vec_perm(srcR1, srcR2, permP1);
- srcP2 = srcR2;
- srcP3 = vec_perm(srcR2, srcR3, permP3);
- } break;
- case 13: {
- vec_u8 srcR3 = vec_ld(30, src);
- srcM2 = vec_perm(srcR1, srcR2, permM2);
- srcM1 = vec_perm(srcR1, srcR2, permM1);
- srcP0 = vec_perm(srcR1, srcR2, permP0);
- srcP1 = srcR2;
- srcP2 = vec_perm(srcR2, srcR3, permP2);
- srcP3 = vec_perm(srcR2, srcR3, permP3);
- } break;
- case 14: {
- vec_u8 srcR3 = vec_ld(30, src);
- srcM2 = vec_perm(srcR1, srcR2, permM2);
- srcM1 = vec_perm(srcR1, srcR2, permM1);
- srcP0 = srcR2;
- srcP1 = vec_perm(srcR2, srcR3, permP1);
- srcP2 = vec_perm(srcR2, srcR3, permP2);
- srcP3 = vec_perm(srcR2, srcR3, permP3);
- } break;
- case 15: {
- vec_u8 srcR3 = vec_ld(30, src);
- srcM2 = vec_perm(srcR1, srcR2, permM2);
- srcM1 = srcR2;
- srcP0 = vec_perm(srcR2, srcR3, permP0);
- srcP1 = vec_perm(srcR2, srcR3, permP1);
- srcP2 = vec_perm(srcR2, srcR3, permP2);
- srcP3 = vec_perm(srcR2, srcR3, permP3);
- } break;
- }
-
- srcP0A = (vec_s16) vec_mergeh(zero_u8v, srcP0);
- srcP0B = (vec_s16) vec_mergel(zero_u8v, srcP0);
- srcP1A = (vec_s16) vec_mergeh(zero_u8v, srcP1);
- srcP1B = (vec_s16) vec_mergel(zero_u8v, srcP1);
-
- srcP2A = (vec_s16) vec_mergeh(zero_u8v, srcP2);
- srcP2B = (vec_s16) vec_mergel(zero_u8v, srcP2);
- srcP3A = (vec_s16) vec_mergeh(zero_u8v, srcP3);
- srcP3B = (vec_s16) vec_mergel(zero_u8v, srcP3);
-
- srcM1A = (vec_s16) vec_mergeh(zero_u8v, srcM1);
- srcM1B = (vec_s16) vec_mergel(zero_u8v, srcM1);
- srcM2A = (vec_s16) vec_mergeh(zero_u8v, srcM2);
- srcM2B = (vec_s16) vec_mergel(zero_u8v, srcM2);
-
- sum1A = vec_adds(srcP0A, srcP1A);
- sum1B = vec_adds(srcP0B, srcP1B);
- sum2A = vec_adds(srcM1A, srcP2A);
- sum2B = vec_adds(srcM1B, srcP2B);
- sum3A = vec_adds(srcM2A, srcP3A);
- sum3B = vec_adds(srcM2B, srcP3B);
-
- pp1A = vec_mladd(sum1A, v20ss, v16ss);
- pp1B = vec_mladd(sum1B, v20ss, v16ss);
-
- pp2A = vec_mladd(sum2A, v5ss, zero_s16v);
- pp2B = vec_mladd(sum2B, v5ss, zero_s16v);
-
- pp3A = vec_add(sum3A, pp1A);
- pp3B = vec_add(sum3B, pp1B);
-
- psumA = vec_sub(pp3A, pp2A);
- psumB = vec_sub(pp3B, pp2B);
-
- sumA = vec_sra(psumA, v5us);
- sumB = vec_sra(psumB, v5us);
-
- sum = vec_packsu(sumA, sumB);
-
- ASSERT_ALIGNED(dst);
-
- OP_U8_ALTIVEC(fsum, sum, vec_ld(0, dst));
-
- vec_st(fsum, 0, dst);
-
- src += srcStride;
- dst += dstStride;
- }
-}
-#endif
-
-/* this code assume stride % 16 == 0 */
-#ifdef PREFIX_h264_qpel16_v_lowpass_altivec
-static void PREFIX_h264_qpel16_v_lowpass_altivec(uint8_t * dst, uint8_t * src, int dstStride, int srcStride) {
- register int i;
-
- LOAD_ZERO;
- const vec_u8 perm = vec_lvsl(0, src);
- const vec_s16 v20ss = vec_sl(vec_splat_s16(5),vec_splat_u16(2));
- const vec_u16 v5us = vec_splat_u16(5);
- const vec_s16 v5ss = vec_splat_s16(5);
- const vec_s16 v16ss = vec_sl(vec_splat_s16(1),vec_splat_u16(4));
-
- uint8_t *srcbis = src - (srcStride * 2);
-
- const vec_u8 srcM2a = vec_ld(0, srcbis);
- const vec_u8 srcM2b = vec_ld(16, srcbis);
- const vec_u8 srcM2 = vec_perm(srcM2a, srcM2b, perm);
- //srcbis += srcStride;
- const vec_u8 srcM1a = vec_ld(0, srcbis += srcStride);
- const vec_u8 srcM1b = vec_ld(16, srcbis);
- const vec_u8 srcM1 = vec_perm(srcM1a, srcM1b, perm);
- //srcbis += srcStride;
- const vec_u8 srcP0a = vec_ld(0, srcbis += srcStride);
- const vec_u8 srcP0b = vec_ld(16, srcbis);
- const vec_u8 srcP0 = vec_perm(srcP0a, srcP0b, perm);
- //srcbis += srcStride;
- const vec_u8 srcP1a = vec_ld(0, srcbis += srcStride);
- const vec_u8 srcP1b = vec_ld(16, srcbis);
- const vec_u8 srcP1 = vec_perm(srcP1a, srcP1b, perm);
- //srcbis += srcStride;
- const vec_u8 srcP2a = vec_ld(0, srcbis += srcStride);
- const vec_u8 srcP2b = vec_ld(16, srcbis);
- const vec_u8 srcP2 = vec_perm(srcP2a, srcP2b, perm);
- //srcbis += srcStride;
-
- vec_s16 srcM2ssA = (vec_s16) vec_mergeh(zero_u8v, srcM2);
- vec_s16 srcM2ssB = (vec_s16) vec_mergel(zero_u8v, srcM2);
- vec_s16 srcM1ssA = (vec_s16) vec_mergeh(zero_u8v, srcM1);
- vec_s16 srcM1ssB = (vec_s16) vec_mergel(zero_u8v, srcM1);
- vec_s16 srcP0ssA = (vec_s16) vec_mergeh(zero_u8v, srcP0);
- vec_s16 srcP0ssB = (vec_s16) vec_mergel(zero_u8v, srcP0);
- vec_s16 srcP1ssA = (vec_s16) vec_mergeh(zero_u8v, srcP1);
- vec_s16 srcP1ssB = (vec_s16) vec_mergel(zero_u8v, srcP1);
- vec_s16 srcP2ssA = (vec_s16) vec_mergeh(zero_u8v, srcP2);
- vec_s16 srcP2ssB = (vec_s16) vec_mergel(zero_u8v, srcP2);
-
- vec_s16 pp1A, pp1B, pp2A, pp2B, pp3A, pp3B,
- psumA, psumB, sumA, sumB,
- srcP3ssA, srcP3ssB,
- sum1A, sum1B, sum2A, sum2B, sum3A, sum3B;
-
- vec_u8 sum, fsum, srcP3a, srcP3b, srcP3;
-
- for (i = 0 ; i < 16 ; i++) {
- srcP3a = vec_ld(0, srcbis += srcStride);
- srcP3b = vec_ld(16, srcbis);
- srcP3 = vec_perm(srcP3a, srcP3b, perm);
- srcP3ssA = (vec_s16) vec_mergeh(zero_u8v, srcP3);
- srcP3ssB = (vec_s16) vec_mergel(zero_u8v, srcP3);
- //srcbis += srcStride;
-
- sum1A = vec_adds(srcP0ssA, srcP1ssA);
- sum1B = vec_adds(srcP0ssB, srcP1ssB);
- sum2A = vec_adds(srcM1ssA, srcP2ssA);
- sum2B = vec_adds(srcM1ssB, srcP2ssB);
- sum3A = vec_adds(srcM2ssA, srcP3ssA);
- sum3B = vec_adds(srcM2ssB, srcP3ssB);
-
- srcM2ssA = srcM1ssA;
- srcM2ssB = srcM1ssB;
- srcM1ssA = srcP0ssA;
- srcM1ssB = srcP0ssB;
- srcP0ssA = srcP1ssA;
- srcP0ssB = srcP1ssB;
- srcP1ssA = srcP2ssA;
- srcP1ssB = srcP2ssB;
- srcP2ssA = srcP3ssA;
- srcP2ssB = srcP3ssB;
-
- pp1A = vec_mladd(sum1A, v20ss, v16ss);
- pp1B = vec_mladd(sum1B, v20ss, v16ss);
-
- pp2A = vec_mladd(sum2A, v5ss, zero_s16v);
- pp2B = vec_mladd(sum2B, v5ss, zero_s16v);
-
- pp3A = vec_add(sum3A, pp1A);
- pp3B = vec_add(sum3B, pp1B);
-
- psumA = vec_sub(pp3A, pp2A);
- psumB = vec_sub(pp3B, pp2B);
-
- sumA = vec_sra(psumA, v5us);
- sumB = vec_sra(psumB, v5us);
-
- sum = vec_packsu(sumA, sumB);
-
- ASSERT_ALIGNED(dst);
-
- OP_U8_ALTIVEC(fsum, sum, vec_ld(0, dst));
-
- vec_st(fsum, 0, dst);
-
- dst += dstStride;
- }
-}
-#endif
-
-/* this code assume stride % 16 == 0 *and* tmp is properly aligned */
-#ifdef PREFIX_h264_qpel16_hv_lowpass_altivec
-static void PREFIX_h264_qpel16_hv_lowpass_altivec(uint8_t * dst, int16_t * tmp, uint8_t * src, int dstStride, int tmpStride, int srcStride) {
- register int i;
- LOAD_ZERO;
- const vec_u8 permM2 = vec_lvsl(-2, src);
- const vec_u8 permM1 = vec_lvsl(-1, src);
- const vec_u8 permP0 = vec_lvsl(+0, src);
- const vec_u8 permP1 = vec_lvsl(+1, src);
- const vec_u8 permP2 = vec_lvsl(+2, src);
- const vec_u8 permP3 = vec_lvsl(+3, src);
- const vec_s16 v20ss = vec_sl(vec_splat_s16(5),vec_splat_u16(2));
- const vec_u32 v10ui = vec_splat_u32(10);
- const vec_s16 v5ss = vec_splat_s16(5);
- const vec_s16 v1ss = vec_splat_s16(1);
- const vec_s32 v512si = vec_sl(vec_splat_s32(1),vec_splat_u32(9));
- const vec_u32 v16ui = vec_sl(vec_splat_u32(1),vec_splat_u32(4));
-
- register int align = ((((unsigned long)src) - 2) % 16);
-
- vec_s16 srcP0A, srcP0B, srcP1A, srcP1B,
- srcP2A, srcP2B, srcP3A, srcP3B,
- srcM1A, srcM1B, srcM2A, srcM2B,
- sum1A, sum1B, sum2A, sum2B, sum3A, sum3B,
- pp1A, pp1B, pp2A, pp2B, psumA, psumB;
-
- const vec_u8 mperm = (const vec_u8)
- {0x00, 0x08, 0x01, 0x09, 0x02, 0x0A, 0x03, 0x0B,
- 0x04, 0x0C, 0x05, 0x0D, 0x06, 0x0E, 0x07, 0x0F};
- int16_t *tmpbis = tmp;
-
- vec_s16 tmpM1ssA, tmpM1ssB, tmpM2ssA, tmpM2ssB,
- tmpP0ssA, tmpP0ssB, tmpP1ssA, tmpP1ssB,
- tmpP2ssA, tmpP2ssB;
-
- vec_s32 pp1Ae, pp1Ao, pp1Be, pp1Bo, pp2Ae, pp2Ao, pp2Be, pp2Bo,
- pp3Ae, pp3Ao, pp3Be, pp3Bo, pp1cAe, pp1cAo, pp1cBe, pp1cBo,
- pp32Ae, pp32Ao, pp32Be, pp32Bo, sumAe, sumAo, sumBe, sumBo,
- ssumAe, ssumAo, ssumBe, ssumBo;
- vec_u8 fsum, sumv, sum;
- vec_s16 ssume, ssumo;
-
- src -= (2 * srcStride);
- for (i = 0 ; i < 21 ; i ++) {
- vec_u8 srcM2, srcM1, srcP0, srcP1, srcP2, srcP3;
- vec_u8 srcR1 = vec_ld(-2, src);
- vec_u8 srcR2 = vec_ld(14, src);
-
- switch (align) {
- default: {
- srcM2 = vec_perm(srcR1, srcR2, permM2);
- srcM1 = vec_perm(srcR1, srcR2, permM1);
- srcP0 = vec_perm(srcR1, srcR2, permP0);
- srcP1 = vec_perm(srcR1, srcR2, permP1);
- srcP2 = vec_perm(srcR1, srcR2, permP2);
- srcP3 = vec_perm(srcR1, srcR2, permP3);
- } break;
- case 11: {
- srcM2 = vec_perm(srcR1, srcR2, permM2);
- srcM1 = vec_perm(srcR1, srcR2, permM1);
- srcP0 = vec_perm(srcR1, srcR2, permP0);
- srcP1 = vec_perm(srcR1, srcR2, permP1);
- srcP2 = vec_perm(srcR1, srcR2, permP2);
- srcP3 = srcR2;
- } break;
- case 12: {
- vec_u8 srcR3 = vec_ld(30, src);
- srcM2 = vec_perm(srcR1, srcR2, permM2);
- srcM1 = vec_perm(srcR1, srcR2, permM1);
- srcP0 = vec_perm(srcR1, srcR2, permP0);
- srcP1 = vec_perm(srcR1, srcR2, permP1);
- srcP2 = srcR2;
- srcP3 = vec_perm(srcR2, srcR3, permP3);
- } break;
- case 13: {
- vec_u8 srcR3 = vec_ld(30, src);
- srcM2 = vec_perm(srcR1, srcR2, permM2);
- srcM1 = vec_perm(srcR1, srcR2, permM1);
- srcP0 = vec_perm(srcR1, srcR2, permP0);
- srcP1 = srcR2;
- srcP2 = vec_perm(srcR2, srcR3, permP2);
- srcP3 = vec_perm(srcR2, srcR3, permP3);
- } break;
- case 14: {
- vec_u8 srcR3 = vec_ld(30, src);
- srcM2 = vec_perm(srcR1, srcR2, permM2);
- srcM1 = vec_perm(srcR1, srcR2, permM1);
- srcP0 = srcR2;
- srcP1 = vec_perm(srcR2, srcR3, permP1);
- srcP2 = vec_perm(srcR2, srcR3, permP2);
- srcP3 = vec_perm(srcR2, srcR3, permP3);
- } break;
- case 15: {
- vec_u8 srcR3 = vec_ld(30, src);
- srcM2 = vec_perm(srcR1, srcR2, permM2);
- srcM1 = srcR2;
- srcP0 = vec_perm(srcR2, srcR3, permP0);
- srcP1 = vec_perm(srcR2, srcR3, permP1);
- srcP2 = vec_perm(srcR2, srcR3, permP2);
- srcP3 = vec_perm(srcR2, srcR3, permP3);
- } break;
- }
-
- srcP0A = (vec_s16) vec_mergeh(zero_u8v, srcP0);
- srcP0B = (vec_s16) vec_mergel(zero_u8v, srcP0);
- srcP1A = (vec_s16) vec_mergeh(zero_u8v, srcP1);
- srcP1B = (vec_s16) vec_mergel(zero_u8v, srcP1);
-
- srcP2A = (vec_s16) vec_mergeh(zero_u8v, srcP2);
- srcP2B = (vec_s16) vec_mergel(zero_u8v, srcP2);
- srcP3A = (vec_s16) vec_mergeh(zero_u8v, srcP3);
- srcP3B = (vec_s16) vec_mergel(zero_u8v, srcP3);
-
- srcM1A = (vec_s16) vec_mergeh(zero_u8v, srcM1);
- srcM1B = (vec_s16) vec_mergel(zero_u8v, srcM1);
- srcM2A = (vec_s16) vec_mergeh(zero_u8v, srcM2);
- srcM2B = (vec_s16) vec_mergel(zero_u8v, srcM2);
-
- sum1A = vec_adds(srcP0A, srcP1A);
- sum1B = vec_adds(srcP0B, srcP1B);
- sum2A = vec_adds(srcM1A, srcP2A);
- sum2B = vec_adds(srcM1B, srcP2B);
- sum3A = vec_adds(srcM2A, srcP3A);
- sum3B = vec_adds(srcM2B, srcP3B);
-
- pp1A = vec_mladd(sum1A, v20ss, sum3A);
- pp1B = vec_mladd(sum1B, v20ss, sum3B);
-
- pp2A = vec_mladd(sum2A, v5ss, zero_s16v);
- pp2B = vec_mladd(sum2B, v5ss, zero_s16v);
-
- psumA = vec_sub(pp1A, pp2A);
- psumB = vec_sub(pp1B, pp2B);
-
- vec_st(psumA, 0, tmp);
- vec_st(psumB, 16, tmp);
-
- src += srcStride;
- tmp += tmpStride; /* int16_t*, and stride is 16, so it's OK here */
- }
-
- tmpM2ssA = vec_ld(0, tmpbis);
- tmpM2ssB = vec_ld(16, tmpbis);
- tmpbis += tmpStride;
- tmpM1ssA = vec_ld(0, tmpbis);
- tmpM1ssB = vec_ld(16, tmpbis);
- tmpbis += tmpStride;
- tmpP0ssA = vec_ld(0, tmpbis);
- tmpP0ssB = vec_ld(16, tmpbis);
- tmpbis += tmpStride;
- tmpP1ssA = vec_ld(0, tmpbis);
- tmpP1ssB = vec_ld(16, tmpbis);
- tmpbis += tmpStride;
- tmpP2ssA = vec_ld(0, tmpbis);
- tmpP2ssB = vec_ld(16, tmpbis);
- tmpbis += tmpStride;
-
- for (i = 0 ; i < 16 ; i++) {
- const vec_s16 tmpP3ssA = vec_ld(0, tmpbis);
- const vec_s16 tmpP3ssB = vec_ld(16, tmpbis);
-
- const vec_s16 sum1A = vec_adds(tmpP0ssA, tmpP1ssA);
- const vec_s16 sum1B = vec_adds(tmpP0ssB, tmpP1ssB);
- const vec_s16 sum2A = vec_adds(tmpM1ssA, tmpP2ssA);
- const vec_s16 sum2B = vec_adds(tmpM1ssB, tmpP2ssB);
- const vec_s16 sum3A = vec_adds(tmpM2ssA, tmpP3ssA);
- const vec_s16 sum3B = vec_adds(tmpM2ssB, tmpP3ssB);
-
- tmpbis += tmpStride;
-
- tmpM2ssA = tmpM1ssA;
- tmpM2ssB = tmpM1ssB;
- tmpM1ssA = tmpP0ssA;
- tmpM1ssB = tmpP0ssB;
- tmpP0ssA = tmpP1ssA;
- tmpP0ssB = tmpP1ssB;
- tmpP1ssA = tmpP2ssA;
- tmpP1ssB = tmpP2ssB;
- tmpP2ssA = tmpP3ssA;
- tmpP2ssB = tmpP3ssB;
-
- pp1Ae = vec_mule(sum1A, v20ss);
- pp1Ao = vec_mulo(sum1A, v20ss);
- pp1Be = vec_mule(sum1B, v20ss);
- pp1Bo = vec_mulo(sum1B, v20ss);
-
- pp2Ae = vec_mule(sum2A, v5ss);
- pp2Ao = vec_mulo(sum2A, v5ss);
- pp2Be = vec_mule(sum2B, v5ss);
- pp2Bo = vec_mulo(sum2B, v5ss);
-
- pp3Ae = vec_sra((vec_s32)sum3A, v16ui);
- pp3Ao = vec_mulo(sum3A, v1ss);
- pp3Be = vec_sra((vec_s32)sum3B, v16ui);
- pp3Bo = vec_mulo(sum3B, v1ss);
-
- pp1cAe = vec_add(pp1Ae, v512si);
- pp1cAo = vec_add(pp1Ao, v512si);
- pp1cBe = vec_add(pp1Be, v512si);
- pp1cBo = vec_add(pp1Bo, v512si);
-
- pp32Ae = vec_sub(pp3Ae, pp2Ae);
- pp32Ao = vec_sub(pp3Ao, pp2Ao);
- pp32Be = vec_sub(pp3Be, pp2Be);
- pp32Bo = vec_sub(pp3Bo, pp2Bo);
-
- sumAe = vec_add(pp1cAe, pp32Ae);
- sumAo = vec_add(pp1cAo, pp32Ao);
- sumBe = vec_add(pp1cBe, pp32Be);
- sumBo = vec_add(pp1cBo, pp32Bo);
-
- ssumAe = vec_sra(sumAe, v10ui);
- ssumAo = vec_sra(sumAo, v10ui);
- ssumBe = vec_sra(sumBe, v10ui);
- ssumBo = vec_sra(sumBo, v10ui);
-
- ssume = vec_packs(ssumAe, ssumBe);
- ssumo = vec_packs(ssumAo, ssumBo);
-
- sumv = vec_packsu(ssume, ssumo);
- sum = vec_perm(sumv, sumv, mperm);
-
- ASSERT_ALIGNED(dst);
-
- OP_U8_ALTIVEC(fsum, sum, vec_ld(0, dst));
-
- vec_st(fsum, 0, dst);
-
- dst += dstStride;
- }
-}
-#endif

libav-v9.6.tar.bz2/libavcodec/ppc/mpegaudiodec_altivec.c Deleted

@@ -1,129 +0,0 @@
-/*
- * Altivec optimized MP3 decoding functions
- * Copyright (c) 2010 Vitor Sessak
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "dsputil_altivec.h"
-#include "libavutil/ppc/util_altivec.h"
-#include "libavcodec/dsputil.h"
-#include "libavcodec/mpegaudiodsp.h"
-
-#define MACS(rt, ra, rb) rt+=(ra)*(rb)
-#define MLSS(rt, ra, rb) rt-=(ra)*(rb)
-
-#define SUM8(op, sum, w, p) \
-{ \
- op(sum, (w)[0 * 64], (p)[0 * 64]); \
- op(sum, (w)[1 * 64], (p)[1 * 64]); \
- op(sum, (w)[2 * 64], (p)[2 * 64]); \
- op(sum, (w)[3 * 64], (p)[3 * 64]); \
- op(sum, (w)[4 * 64], (p)[4 * 64]); \
- op(sum, (w)[5 * 64], (p)[5 * 64]); \
- op(sum, (w)[6 * 64], (p)[6 * 64]); \
- op(sum, (w)[7 * 64], (p)[7 * 64]); \
-}
-
-static void apply_window(const float *buf, const float *win1,
- const float *win2, float *sum1, float *sum2, int len)
-{
- const vector float *win1a = (const vector float *) win1;
- const vector float *win2a = (const vector float *) win2;
- const vector float *bufa = (const vector float *) buf;
- vector float *sum1a = (vector float *) sum1;
- vector float *sum2a = (vector float *) sum2;
- vector float av_uninit(v0), av_uninit(v4);
- vector float v1, v2, v3;
-
- len = len >> 2;
-
-#define MULT(a, b) \
- { \
- v1 = vec_ld(a, win1a); \
- v2 = vec_ld(b, win2a); \
- v3 = vec_ld(a, bufa); \
- v0 = vec_madd(v3, v1, v0); \
- v4 = vec_madd(v2, v3, v4); \
- }
-
- while (len--) {
- v0 = vec_xor(v0, v0);
- v4 = vec_xor(v4, v4);
-
- MULT( 0, 0);
- MULT( 256, 64);
- MULT( 512, 128);
- MULT( 768, 192);
- MULT(1024, 256);
- MULT(1280, 320);
- MULT(1536, 384);
- MULT(1792, 448);
-
- vec_st(v0, 0, sum1a);
- vec_st(v4, 0, sum2a);
- sum1a++;
- sum2a++;
- win1a++;
- win2a++;
- bufa++;
- }
-}
-
-static void apply_window_mp3(float *in, float *win, int *unused, float *out,
- int incr)
-{
- LOCAL_ALIGNED_16(float, suma, [17]);
- LOCAL_ALIGNED_16(float, sumb, [17]);
- LOCAL_ALIGNED_16(float, sumc, [17]);
- LOCAL_ALIGNED_16(float, sumd, [17]);
-
- float sum;
- int j;
- float *out2 = out + 32 * incr;
-
- /* copy to avoid wrap */
- memcpy(in + 512, in, 32 * sizeof(*in));
-
- apply_window(in + 16, win , win + 512, suma, sumc, 16);
- apply_window(in + 32, win + 48, win + 640, sumb, sumd, 16);
-
- SUM8(MLSS, suma[0], win + 32, in + 48);
-
- sumc[ 0] = 0;
- sumb[16] = 0;
- sumd[16] = 0;
-
- out[0 ] = suma[ 0];
- out += incr;
- out2 -= incr;
- for(j=1;j<16;j++) {
- *out = suma[ j] - sumd[16-j];
- *out2 = -sumb[16-j] - sumc[ j];
- out += incr;
- out2 -= incr;
- }
-
- sum = 0;
- SUM8(MLSS, sum, win + 16 + 32, in + 32);
- *out = sum;
-}
-
-void ff_mpadsp_init_altivec(MPADSPContext *s)
-{
- s->apply_window_float = apply_window_mp3;
-}

libav-v9.6.tar.bz2/libavcodec/resample.c Deleted

@@ -1,379 +0,0 @@
-/*
- * samplerate conversion for both audio and video
- * Copyright (c) 2000 Fabrice Bellard
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * samplerate conversion for both audio and video
- */
-
-#include <string.h>
-
-#include "avcodec.h"
-#include "audioconvert.h"
-#include "libavutil/opt.h"
-#include "libavutil/mem.h"
-#include "libavutil/samplefmt.h"
-
-#if FF_API_AVCODEC_RESAMPLE
-
-#define MAX_CHANNELS 8
-
-struct AVResampleContext;
-
-static const char *context_to_name(void *ptr)
-{
- return "audioresample";
-}
-
-static const AVOption options[] = {{NULL}};
-static const AVClass audioresample_context_class = {
- "ReSampleContext", context_to_name, options, LIBAVUTIL_VERSION_INT
-};
-
-struct ReSampleContext {
- struct AVResampleContext *resample_context;
- short *temp[MAX_CHANNELS];
- int temp_len;
- float ratio;
- /* channel convert */
- int input_channels, output_channels, filter_channels;
- AVAudioConvert *convert_ctx[2];
- enum AVSampleFormat sample_fmt[2]; ///< input and output sample format
- unsigned sample_size[2]; ///< size of one sample in sample_fmt
- short *buffer[2]; ///< buffers used for conversion to S16
- unsigned buffer_size[2]; ///< sizes of allocated buffers
-};
-
-/* n1: number of samples */
-static void stereo_to_mono(short *output, short *input, int n1)
-{
- short *p, *q;
- int n = n1;
-
- p = input;
- q = output;
- while (n >= 4) {
- q[0] = (p[0] + p[1]) >> 1;
- q[1] = (p[2] + p[3]) >> 1;
- q[2] = (p[4] + p[5]) >> 1;
- q[3] = (p[6] + p[7]) >> 1;
- q += 4;
- p += 8;
- n -= 4;
- }
- while (n > 0) {
- q[0] = (p[0] + p[1]) >> 1;
- q++;
- p += 2;
- n--;
- }
-}
-
-/* n1: number of samples */
-static void mono_to_stereo(short *output, short *input, int n1)
-{
- short *p, *q;
- int n = n1;
- int v;
-
- p = input;
- q = output;
- while (n >= 4) {
- v = p[0]; q[0] = v; q[1] = v;
- v = p[1]; q[2] = v; q[3] = v;
- v = p[2]; q[4] = v; q[5] = v;
- v = p[3]; q[6] = v; q[7] = v;
- q += 8;
- p += 4;
- n -= 4;
- }
- while (n > 0) {
- v = p[0]; q[0] = v; q[1] = v;
- q += 2;
- p += 1;
- n--;
- }
-}
-
-static void deinterleave(short **output, short *input, int channels, int samples)
-{
- int i, j;
-
- for (i = 0; i < samples; i++) {
- for (j = 0; j < channels; j++) {
- *output[j]++ = *input++;
- }
- }
-}
-
-static void interleave(short *output, short **input, int channels, int samples)
-{
- int i, j;
-
- for (i = 0; i < samples; i++) {
- for (j = 0; j < channels; j++) {
- *output++ = *input[j]++;
- }
- }
-}
-
-static void ac3_5p1_mux(short *output, short *input1, short *input2, int n)
-{
- int i;
- short l, r;
-
- for (i = 0; i < n; i++) {
- l = *input1++;
- r = *input2++;
- *output++ = l; /* left */
- *output++ = (l / 2) + (r / 2); /* center */
- *output++ = r; /* right */
- *output++ = 0; /* left surround */
- *output++ = 0; /* right surroud */
- *output++ = 0; /* low freq */
- }
-}
-
-ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
- int output_rate, int input_rate,
- enum AVSampleFormat sample_fmt_out,
- enum AVSampleFormat sample_fmt_in,
- int filter_length, int log2_phase_count,
- int linear, double cutoff)
-{
- ReSampleContext *s;
-
- if (input_channels > MAX_CHANNELS) {
- av_log(NULL, AV_LOG_ERROR,
- "Resampling with input channels greater than %d is unsupported.\n",
- MAX_CHANNELS);
- return NULL;
- }
- if (output_channels != input_channels &&
- (input_channels > 2 ||
- output_channels > 2 &&
- !(output_channels == 6 && input_channels == 2))) {
- av_log(NULL, AV_LOG_ERROR,
- "Resampling output channel count must be 1 or 2 for mono input; 1, 2 or 6 for stereo input; or N for N channel input.\n");
- return NULL;
- }
-
- s = av_mallocz(sizeof(ReSampleContext));
- if (!s) {
- av_log(NULL, AV_LOG_ERROR, "Can't allocate memory for resample context.\n");
- return NULL;
- }
-
- s->ratio = (float)output_rate / (float)input_rate;
-
- s->input_channels = input_channels;
- s->output_channels = output_channels;
-
- s->filter_channels = s->input_channels;
- if (s->output_channels < s->filter_channels)
- s->filter_channels = s->output_channels;
-
- s->sample_fmt[0] = sample_fmt_in;
- s->sample_fmt[1] = sample_fmt_out;
- s->sample_size[0] = av_get_bytes_per_sample(s->sample_fmt[0]);
- s->sample_size[1] = av_get_bytes_per_sample(s->sample_fmt[1]);
-
- if (s->sample_fmt[0] != AV_SAMPLE_FMT_S16) {
- if (!(s->convert_ctx[0] = av_audio_convert_alloc(AV_SAMPLE_FMT_S16, 1,
- s->sample_fmt[0], 1, NULL, 0))) {
- av_log(s, AV_LOG_ERROR,
- "Cannot convert %s sample format to s16 sample format\n",
- av_get_sample_fmt_name(s->sample_fmt[0]));
- av_free(s);
- return NULL;
- }
- }
-
- if (s->sample_fmt[1] != AV_SAMPLE_FMT_S16) {
- if (!(s->convert_ctx[1] = av_audio_convert_alloc(s->sample_fmt[1], 1,
- AV_SAMPLE_FMT_S16, 1, NULL, 0))) {
- av_log(s, AV_LOG_ERROR,
- "Cannot convert s16 sample format to %s sample format\n",
- av_get_sample_fmt_name(s->sample_fmt[1]));
- av_audio_convert_free(s->convert_ctx[0]);
- av_free(s);
- return NULL;
- }
- }
-
- s->resample_context = av_resample_init(output_rate, input_rate,
- filter_length, log2_phase_count,
- linear, cutoff);
-
- *(const AVClass**)s->resample_context = &audioresample_context_class;
-
- return s;
-}
-
-/* resample audio. 'nb_samples' is the number of input samples */
-/* XXX: optimize it ! */
-int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples)
-{
- int i, nb_samples1;
- short *bufin[MAX_CHANNELS];
- short *bufout[MAX_CHANNELS];
- short *buftmp2[MAX_CHANNELS], *buftmp3[MAX_CHANNELS];
- short *output_bak = NULL;
- int lenout;
-
- if (s->input_channels == s->output_channels && s->ratio == 1.0 && 0) {
- /* nothing to do */
- memcpy(output, input, nb_samples * s->input_channels * sizeof(short));
- return nb_samples;
- }
-
- if (s->sample_fmt[0] != AV_SAMPLE_FMT_S16) {
- int istride[1] = { s->sample_size[0] };
- int ostride[1] = { 2 };
- const void *ibuf[1] = { input };
- void *obuf[1];
- unsigned input_size = nb_samples * s->input_channels * 2;
-
- if (!s->buffer_size[0] || s->buffer_size[0] < input_size) {
- av_free(s->buffer[0]);
- s->buffer_size[0] = input_size;
- s->buffer[0] = av_malloc(s->buffer_size[0]);
- if (!s->buffer[0]) {
- av_log(s->resample_context, AV_LOG_ERROR, "Could not allocate buffer\n");
- return 0;
- }
- }
-
- obuf[0] = s->buffer[0];
-
- if (av_audio_convert(s->convert_ctx[0], obuf, ostride,
- ibuf, istride, nb_samples * s->input_channels) < 0) {
- av_log(s->resample_context, AV_LOG_ERROR,
- "Audio sample format conversion failed\n");
- return 0;
- }
-
- input = s->buffer[0];
- }
-
- lenout = 4 * nb_samples * s->ratio + 16;
-
- if (s->sample_fmt[1] != AV_SAMPLE_FMT_S16) {
- int out_size = lenout * av_get_bytes_per_sample(s->sample_fmt[1]) *
- s->output_channels;
- output_bak = output;
-
- if (!s->buffer_size[1] || s->buffer_size[1] < out_size) {
- av_free(s->buffer[1]);
- s->buffer_size[1] = out_size;
- s->buffer[1] = av_malloc(s->buffer_size[1]);
- if (!s->buffer[1]) {
- av_log(s->resample_context, AV_LOG_ERROR, "Could not allocate buffer\n");
- return 0;
- }
- }
-
- output = s->buffer[1];
- }
-
- /* XXX: move those malloc to resample init code */
- for (i = 0; i < s->filter_channels; i++) {
- bufin[i] = av_malloc((nb_samples + s->temp_len) * sizeof(short));
- memcpy(bufin[i], s->temp[i], s->temp_len * sizeof(short));
- buftmp2[i] = bufin[i] + s->temp_len;
- bufout[i] = av_malloc(lenout * sizeof(short));
- }
-
- if (s->input_channels == 2 && s->output_channels == 1) {
- buftmp3[0] = output;
- stereo_to_mono(buftmp2[0], input, nb_samples);
- } else if (s->output_channels >= 2 && s->input_channels == 1) {
- buftmp3[0] = bufout[0];
- memcpy(buftmp2[0], input, nb_samples * sizeof(short));
- } else if (s->output_channels >= s->input_channels && s->input_channels >= 2) {
- for (i = 0; i < s->input_channels; i++) {
- buftmp3[i] = bufout[i];
- }
- deinterleave(buftmp2, input, s->input_channels, nb_samples);
- } else {
- buftmp3[0] = output;
- memcpy(buftmp2[0], input, nb_samples * sizeof(short));
- }
-
- nb_samples += s->temp_len;
-
- /* resample each channel */
- nb_samples1 = 0; /* avoid warning */
- for (i = 0; i < s->filter_channels; i++) {
- int consumed;
- int is_last = i + 1 == s->filter_channels;
-
- nb_samples1 = av_resample(s->resample_context, buftmp3[i], bufin[i],
- &consumed, nb_samples, lenout, is_last);
- s->temp_len = nb_samples - consumed;
- s->temp[i] = av_realloc(s->temp[i], s->temp_len * sizeof(short));
- memcpy(s->temp[i], bufin[i] + consumed, s->temp_len * sizeof(short));
- }
-
- if (s->output_channels == 2 && s->input_channels == 1) {
- mono_to_stereo(output, buftmp3[0], nb_samples1);
- } else if (s->output_channels == 6 && s->input_channels == 2) {
- ac3_5p1_mux(output, buftmp3[0], buftmp3[1], nb_samples1);
- } else if (s->output_channels == s->input_channels && s->input_channels >= 2) {
- interleave(output, buftmp3, s->output_channels, nb_samples1);
- }
-
- if (s->sample_fmt[1] != AV_SAMPLE_FMT_S16) {
- int istride[1] = { 2 };
- int ostride[1] = { s->sample_size[1] };
- const void *ibuf[1] = { output };
- void *obuf[1] = { output_bak };
-
- if (av_audio_convert(s->convert_ctx[1], obuf, ostride,
- ibuf, istride, nb_samples1 * s->output_channels) < 0) {
- av_log(s->resample_context, AV_LOG_ERROR,
- "Audio sample format conversion failed\n");
- return 0;
- }
- }
-
- for (i = 0; i < s->filter_channels; i++) {
- av_free(bufin[i]);
- av_free(bufout[i]);
- }
-
- return nb_samples1;
-}
-
-void audio_resample_close(ReSampleContext *s)
-{
- int i;
- av_resample_close(s->resample_context);
- for (i = 0; i < s->filter_channels; i++)
- av_freep(&s->temp[i]);
- av_freep(&s->buffer[0]);
- av_freep(&s->buffer[1]);
- av_audio_convert_free(s->convert_ctx[0]);
- av_audio_convert_free(s->convert_ctx[1]);
- av_free(s);
-}
-
-#endif

libav-v9.6.tar.bz2/libavcodec/resample2.c Deleted

@@ -1,325 +0,0 @@
-/*
- * audio resampling
- * Copyright (c) 2004 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * audio resampling
- * @author Michael Niedermayer <michaelni@gmx.at>
- */
-
-#include "avcodec.h"
-#include "dsputil.h"
-#include "libavutil/common.h"
-
-#if FF_API_AVCODEC_RESAMPLE
-
-#ifndef CONFIG_RESAMPLE_HP
-#define FILTER_SHIFT 15
-
-#define FELEM int16_t
-#define FELEM2 int32_t
-#define FELEML int64_t
-#define FELEM_MAX INT16_MAX
-#define FELEM_MIN INT16_MIN
-#define WINDOW_TYPE 9
-#elif !defined(CONFIG_RESAMPLE_AUDIOPHILE_KIDDY_MODE)
-#define FILTER_SHIFT 30
-
-#define FELEM int32_t
-#define FELEM2 int64_t
-#define FELEML int64_t
-#define FELEM_MAX INT32_MAX
-#define FELEM_MIN INT32_MIN
-#define WINDOW_TYPE 12
-#else
-#define FILTER_SHIFT 0
-
-#define FELEM double
-#define FELEM2 double
-#define FELEML double
-#define WINDOW_TYPE 24
-#endif
-
-
-typedef struct AVResampleContext{
- const AVClass *av_class;
- FELEM *filter_bank;
- int filter_length;
- int ideal_dst_incr;
- int dst_incr;
- int index;
- int frac;
- int src_incr;
- int compensation_distance;
- int phase_shift;
- int phase_mask;
- int linear;
-}AVResampleContext;
-
-/**
- * 0th order modified bessel function of the first kind.
- */
-static double bessel(double x){
- double v=1;
- double lastv=0;
- double t=1;
- int i;
-
- x= x*x/4;
- for(i=1; v != lastv; i++){
- lastv=v;
- t *= x/(i*i);
- v += t;
- }
- return v;
-}
-
-/**
- * Build a polyphase filterbank.
- * @param factor resampling factor
- * @param scale wanted sum of coefficients for each filter
- * @param type 0->cubic, 1->blackman nuttall windowed sinc, 2..16->kaiser windowed sinc beta=2..16
- * @return 0 on success, negative on error
- */
-static int build_filter(FELEM *filter, double factor, int tap_count, int phase_count, int scale, int type){
- int ph, i;
- double x, y, w;
- double *tab = av_malloc(tap_count * sizeof(*tab));
- const int center= (tap_count-1)/2;
-
- if (!tab)
- return AVERROR(ENOMEM);
-
- /* if upsampling, only need to interpolate, no filter */
- if (factor > 1.0)
- factor = 1.0;
-
- for(ph=0;ph<phase_count;ph++) {
- double norm = 0;
- for(i=0;i<tap_count;i++) {
- x = M_PI * ((double)(i - center) - (double)ph / phase_count) * factor;
- if (x == 0) y = 1.0;
- else y = sin(x) / x;
- switch(type){
- case 0:{
- const float d= -0.5; //first order derivative = -0.5
- x = fabs(((double)(i - center) - (double)ph / phase_count) * factor);
- if(x<1.0) y= 1 - 3*x*x + 2*x*x*x + d*( -x*x + x*x*x);
- else y= d*(-4 + 8*x - 5*x*x + x*x*x);
- break;}
- case 1:
- w = 2.0*x / (factor*tap_count) + M_PI;
- y *= 0.3635819 - 0.4891775 * cos(w) + 0.1365995 * cos(2*w) - 0.0106411 * cos(3*w);
- break;
- default:
- w = 2.0*x / (factor*tap_count*M_PI);
- y *= bessel(type*sqrt(FFMAX(1-w*w, 0)));
- break;
- }
-
- tab[i] = y;
- norm += y;
- }
-
- /* normalize so that an uniform color remains the same */
- for(i=0;i<tap_count;i++) {
-#ifdef CONFIG_RESAMPLE_AUDIOPHILE_KIDDY_MODE
- filter[ph * tap_count + i] = tab[i] / norm;
-#else
- filter[ph * tap_count + i] = av_clip(lrintf(tab[i] * scale / norm), FELEM_MIN, FELEM_MAX);
-#endif
- }
- }
-#if 0
- {
-#define LEN 1024
- int j,k;
- double sine[LEN + tap_count];
- double filtered[LEN];
- double maxff=-2, minff=2, maxsf=-2, minsf=2;
- for(i=0; i<LEN; i++){
- double ss=0, sf=0, ff=0;
- for(j=0; j<LEN+tap_count; j++)
- sine[j]= cos(i*j*M_PI/LEN);
- for(j=0; j<LEN; j++){
- double sum=0;
- ph=0;
- for(k=0; k<tap_count; k++)
- sum += filter[ph * tap_count + k] * sine[k+j];
- filtered[j]= sum / (1<<FILTER_SHIFT);
- ss+= sine[j + center] * sine[j + center];
- ff+= filtered[j] * filtered[j];
- sf+= sine[j + center] * filtered[j];
- }
- ss= sqrt(2*ss/LEN);
- ff= sqrt(2*ff/LEN);
- sf= 2*sf/LEN;
- maxff= FFMAX(maxff, ff);
- minff= FFMIN(minff, ff);
- maxsf= FFMAX(maxsf, sf);
- minsf= FFMIN(minsf, sf);
- if(i%11==0){
- av_log(NULL, AV_LOG_ERROR, "i:%4d ss:%f ff:%13.6e-%13.6e sf:%13.6e-%13.6e\n", i, ss, maxff, minff, maxsf, minsf);
- minff=minsf= 2;
- maxff=maxsf= -2;
- }
- }
- }
-#endif
-
- av_free(tab);
- return 0;
-}
-
-AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_size, int phase_shift, int linear, double cutoff){
- AVResampleContext *c= av_mallocz(sizeof(AVResampleContext));
- double factor= FFMIN(out_rate * cutoff / in_rate, 1.0);
- int phase_count= 1<<phase_shift;
-
- if (!c)
- return NULL;
-
- c->phase_shift= phase_shift;
- c->phase_mask= phase_count-1;
- c->linear= linear;
-
- c->filter_length= FFMAX((int)ceil(filter_size/factor), 1);
- c->filter_bank= av_mallocz(c->filter_length*(phase_count+1)*sizeof(FELEM));
- if (!c->filter_bank)
- goto error;
- if (build_filter(c->filter_bank, factor, c->filter_length, phase_count, 1<<FILTER_SHIFT, WINDOW_TYPE))
- goto error;
- memcpy(&c->filter_bank[c->filter_length*phase_count+1], c->filter_bank, (c->filter_length-1)*sizeof(FELEM));
- c->filter_bank[c->filter_length*phase_count]= c->filter_bank[c->filter_length - 1];
-
- c->src_incr= out_rate;
- c->ideal_dst_incr= c->dst_incr= in_rate * phase_count;
- c->index= -phase_count*((c->filter_length-1)/2);
-
- return c;
-error:
- av_free(c->filter_bank);
- av_free(c);
- return NULL;
-}
-
-void av_resample_close(AVResampleContext *c){
- av_freep(&c->filter_bank);
- av_freep(&c);
-}
-
-void av_resample_compensate(AVResampleContext *c, int sample_delta, int compensation_distance){
-// sample_delta += (c->ideal_dst_incr - c->dst_incr)*(int64_t)c->compensation_distance / c->ideal_dst_incr;
- c->compensation_distance= compensation_distance;
- c->dst_incr = c->ideal_dst_incr - c->ideal_dst_incr * (int64_t)sample_delta / compensation_distance;
-}
-
-int av_resample(AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx){
- int dst_index, i;
- int index= c->index;
- int frac= c->frac;
- int dst_incr_frac= c->dst_incr % c->src_incr;
- int dst_incr= c->dst_incr / c->src_incr;
- int compensation_distance= c->compensation_distance;
-
- if(compensation_distance == 0 && c->filter_length == 1 && c->phase_shift==0){
- int64_t index2= ((int64_t)index)<<32;
- int64_t incr= (1LL<<32) * c->dst_incr / c->src_incr;
- dst_size= FFMIN(dst_size, (src_size-1-index) * (int64_t)c->src_incr / c->dst_incr);
-
- for(dst_index=0; dst_index < dst_size; dst_index++){
- dst[dst_index] = src[index2>>32];
- index2 += incr;
- }
- frac += dst_index * dst_incr_frac;
- index += dst_index * dst_incr;
- index += frac / c->src_incr;
- frac %= c->src_incr;
- }else{
- for(dst_index=0; dst_index < dst_size; dst_index++){
- FELEM *filter= c->filter_bank + c->filter_length*(index & c->phase_mask);
- int sample_index= index >> c->phase_shift;
- FELEM2 val=0;
-
- if(sample_index < 0){
- for(i=0; i<c->filter_length; i++)
- val += src[FFABS(sample_index + i) % src_size] * filter[i];
- }else if(sample_index + c->filter_length > src_size){
- break;
- }else if(c->linear){
- FELEM2 v2=0;
- for(i=0; i<c->filter_length; i++){
- val += src[sample_index + i] * (FELEM2)filter[i];
- v2 += src[sample_index + i] * (FELEM2)filter[i + c->filter_length];
- }
- val+=(v2-val)*(FELEML)frac / c->src_incr;
- }else{
- for(i=0; i<c->filter_length; i++){
- val += src[sample_index + i] * (FELEM2)filter[i];
- }
- }
-
-#ifdef CONFIG_RESAMPLE_AUDIOPHILE_KIDDY_MODE
- dst[dst_index] = av_clip_int16(lrintf(val));
-#else
- val = (val + (1<<(FILTER_SHIFT-1)))>>FILTER_SHIFT;
- dst[dst_index] = (unsigned)(val + 32768) > 65535 ? (val>>31) ^ 32767 : val;
-#endif
-
- frac += dst_incr_frac;
- index += dst_incr;
- if(frac >= c->src_incr){
- frac -= c->src_incr;
- index++;
- }
-
- if(dst_index + 1 == compensation_distance){
- compensation_distance= 0;
- dst_incr_frac= c->ideal_dst_incr % c->src_incr;
- dst_incr= c->ideal_dst_incr / c->src_incr;
- }
- }
- }
- *consumed= FFMAX(index, 0) >> c->phase_shift;
- if(index>=0) index &= c->phase_mask;
-
- if(compensation_distance){
- compensation_distance -= dst_index;
- assert(compensation_distance > 0);
- }
- if(update_ctx){
- c->frac= frac;
- c->index= index;
- c->dst_incr= dst_incr_frac + c->src_incr*dst_incr;
- c->compensation_distance= compensation_distance;
- }
-#if 0
- if(update_ctx && !c->compensation_distance){
-#undef rand
- av_resample_compensate(c, rand() % (8000*2) - 8000, 8000*2);
-av_log(NULL, AV_LOG_DEBUG, "%d %d %d\n", c->dst_incr, c->ideal_dst_incr, c->compensation_distance);
- }
-#endif
-
- return dst_index;
-}
-
-#endif

libav-v9.6.tar.bz2/libavcodec/sh4/dsputil_align.c Deleted

@@ -1,439 +0,0 @@
-/*
- * aligned/packed access motion
- *
- * Copyright (c) 2001-2003 BERO <bero@geocities.co.jp>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
-#include "dsputil_sh4.h"
-
-
-#define LP(p) *(uint32_t*)(p)
-#define LPC(p) *(const uint32_t*)(p)
-
-
-#define UNPACK(ph,pl,tt0,tt1) do { \
- uint32_t t0,t1; t0=tt0;t1=tt1; \
- ph = ( (t0 & ~BYTE_VEC32(0x03))>>2) + ( (t1 & ~BYTE_VEC32(0x03))>>2); \
- pl = (t0 & BYTE_VEC32(0x03)) + (t1 & BYTE_VEC32(0x03)); } while(0)
-
-#define rnd_PACK(ph,pl,nph,npl) ph + nph + (((pl + npl + BYTE_VEC32(0x02))>>2) & BYTE_VEC32(0x03))
-#define no_rnd_PACK(ph,pl,nph,npl) ph + nph + (((pl + npl + BYTE_VEC32(0x01))>>2) & BYTE_VEC32(0x03))
-
-/* little-endian */
-#define MERGE1(a,b,ofs) (ofs==0)?a:( ((a)>>(8*ofs))|((b)<<(32-8*ofs)) )
-#define MERGE2(a,b,ofs) (ofs==3)?b:( ((a)>>(8*(ofs+1)))|((b)<<(32-8*(ofs+1))) )
-/* big
-#define MERGE1(a,b,ofs) (ofs==0)?a:( ((a)<<(8*ofs))|((b)>>(32-8*ofs)) )
-#define MERGE2(a,b,ofs) (ofs==3)?b:( ((a)<<(8+8*ofs))|((b)>>(32-8-8*ofs)) )
-*/
-
-
-#define put(d,s) d = s
-#define avg(d,s) d = rnd_avg32(s,d)
-
-#define OP_C4(ofs) \
- ref-=ofs; \
- do { \
- OP(LP(dest),MERGE1(LPC(ref),LPC(ref+4),ofs)); \
- ref+=stride; \
- dest+=stride; \
- } while(--height)
-
-#define OP_C40() \
- do { \
- OP(LP(dest),LPC(ref)); \
- ref+=stride; \
- dest+=stride; \
- } while(--height)
-
-
-#define OP put
-
-static void put_pixels4_c(uint8_t *dest,const uint8_t *ref, const int stride,int height)
-{
- switch((int)ref&3){
- case 0: OP_C40(); return;
- case 1: OP_C4(1); return;
- case 2: OP_C4(2); return;
- case 3: OP_C4(3); return;
- }
-}
-
-#undef OP
-#define OP avg
-
-static void avg_pixels4_c(uint8_t *dest,const uint8_t *ref, const int stride,int height)
-{
- switch((int)ref&3){
- case 0: OP_C40(); return;
- case 1: OP_C4(1); return;
- case 2: OP_C4(2); return;
- case 3: OP_C4(3); return;
- }
-}
-
-#undef OP
-
-#define OP_C(ofs,sz,avg2) \
-{ \
- ref-=ofs; \
- do { \
- uint32_t t0,t1; \
- t0 = LPC(ref+0); \
- t1 = LPC(ref+4); \
- OP(LP(dest+0), MERGE1(t0,t1,ofs)); \
- t0 = LPC(ref+8); \
- OP(LP(dest+4), MERGE1(t1,t0,ofs)); \
-if (sz==16) { \
- t1 = LPC(ref+12); \
- OP(LP(dest+8), MERGE1(t0,t1,ofs)); \
- t0 = LPC(ref+16); \
- OP(LP(dest+12), MERGE1(t1,t0,ofs)); \
-} \
- ref+=stride; \
- dest+= stride; \
- } while(--height); \
-}
-
-/* aligned */
-#define OP_C0(sz,avg2) \
-{ \
- do { \
- OP(LP(dest+0), LPC(ref+0)); \
- OP(LP(dest+4), LPC(ref+4)); \
-if (sz==16) { \
- OP(LP(dest+8), LPC(ref+8)); \
- OP(LP(dest+12), LPC(ref+12)); \
-} \
- ref+=stride; \
- dest+= stride; \
- } while(--height); \
-}
-
-#define OP_X(ofs,sz,avg2) \
-{ \
- ref-=ofs; \
- do { \
- uint32_t t0,t1; \
- t0 = LPC(ref+0); \
- t1 = LPC(ref+4); \
- OP(LP(dest+0), avg2(MERGE1(t0,t1,ofs),MERGE2(t0,t1,ofs))); \
- t0 = LPC(ref+8); \
- OP(LP(dest+4), avg2(MERGE1(t1,t0,ofs),MERGE2(t1,t0,ofs))); \
-if (sz==16) { \
- t1 = LPC(ref+12); \
- OP(LP(dest+8), avg2(MERGE1(t0,t1,ofs),MERGE2(t0,t1,ofs))); \
- t0 = LPC(ref+16); \
- OP(LP(dest+12), avg2(MERGE1(t1,t0,ofs),MERGE2(t1,t0,ofs))); \
-} \
- ref+=stride; \
- dest+= stride; \
- } while(--height); \
-}
-
-/* aligned */
-#define OP_Y0(sz,avg2) \
-{ \
- uint32_t t0,t1,t2,t3,t; \
-\
- t0 = LPC(ref+0); \
- t1 = LPC(ref+4); \
-if (sz==16) { \
- t2 = LPC(ref+8); \
- t3 = LPC(ref+12); \
-} \
- do { \
- ref += stride; \
-\
- t = LPC(ref+0); \
- OP(LP(dest+0), avg2(t0,t)); t0 = t; \
- t = LPC(ref+4); \
- OP(LP(dest+4), avg2(t1,t)); t1 = t; \
-if (sz==16) { \
- t = LPC(ref+8); \
- OP(LP(dest+8), avg2(t2,t)); t2 = t; \
- t = LPC(ref+12); \
- OP(LP(dest+12), avg2(t3,t)); t3 = t; \
-} \
- dest+= stride; \
- } while(--height); \
-}
-
-#define OP_Y(ofs,sz,avg2) \
-{ \
- uint32_t t0,t1,t2,t3,t,w0,w1; \
-\
- ref-=ofs; \
- w0 = LPC(ref+0); \
- w1 = LPC(ref+4); \
- t0 = MERGE1(w0,w1,ofs); \
- w0 = LPC(ref+8); \
- t1 = MERGE1(w1,w0,ofs); \
-if (sz==16) { \
- w1 = LPC(ref+12); \
- t2 = MERGE1(w0,w1,ofs); \
- w0 = LPC(ref+16); \
- t3 = MERGE1(w1,w0,ofs); \
-} \
- do { \
- ref += stride; \
-\
- w0 = LPC(ref+0); \
- w1 = LPC(ref+4); \
- t = MERGE1(w0,w1,ofs); \
- OP(LP(dest+0), avg2(t0,t)); t0 = t; \
- w0 = LPC(ref+8); \
- t = MERGE1(w1,w0,ofs); \
- OP(LP(dest+4), avg2(t1,t)); t1 = t; \
-if (sz==16) { \
- w1 = LPC(ref+12); \
- t = MERGE1(w0,w1,ofs); \
- OP(LP(dest+8), avg2(t2,t)); t2 = t; \
- w0 = LPC(ref+16); \
- t = MERGE1(w1,w0,ofs); \
- OP(LP(dest+12), avg2(t3,t)); t3 = t; \
-} \
- dest+=stride; \
- } while(--height); \
-}
-
-#define OP_X0(sz,avg2) OP_X(0,sz,avg2)
-#define OP_XY0(sz,PACK) OP_XY(0,sz,PACK)
-#define OP_XY(ofs,sz,PACK) \
-{ \
- uint32_t t2,t3,w0,w1; \
- uint32_t a0,a1,a2,a3,a4,a5,a6,a7; \
-\
- ref -= ofs; \
- w0 = LPC(ref+0); \
- w1 = LPC(ref+4); \
- UNPACK(a0,a1,MERGE1(w0,w1,ofs),MERGE2(w0,w1,ofs)); \
- w0 = LPC(ref+8); \
- UNPACK(a2,a3,MERGE1(w1,w0,ofs),MERGE2(w1,w0,ofs)); \
-if (sz==16) { \
- w1 = LPC(ref+12); \
- UNPACK(a4,a5,MERGE1(w0,w1,ofs),MERGE2(w0,w1,ofs)); \
- w0 = LPC(ref+16); \
- UNPACK(a6,a7,MERGE1(w1,w0,ofs),MERGE2(w1,w0,ofs)); \
-} \
- do { \
- ref+=stride; \
- w0 = LPC(ref+0); \
- w1 = LPC(ref+4); \
- UNPACK(t2,t3,MERGE1(w0,w1,ofs),MERGE2(w0,w1,ofs)); \
- OP(LP(dest+0),PACK(a0,a1,t2,t3)); \
- a0 = t2; a1 = t3; \
- w0 = LPC(ref+8); \
- UNPACK(t2,t3,MERGE1(w1,w0,ofs),MERGE2(w1,w0,ofs)); \
- OP(LP(dest+4),PACK(a2,a3,t2,t3)); \
- a2 = t2; a3 = t3; \
-if (sz==16) { \
- w1 = LPC(ref+12); \
- UNPACK(t2,t3,MERGE1(w0,w1,ofs),MERGE2(w0,w1,ofs)); \
- OP(LP(dest+8),PACK(a4,a5,t2,t3)); \
- a4 = t2; a5 = t3; \
- w0 = LPC(ref+16); \
- UNPACK(t2,t3,MERGE1(w1,w0,ofs),MERGE2(w1,w0,ofs)); \
- OP(LP(dest+12),PACK(a6,a7,t2,t3)); \
- a6 = t2; a7 = t3; \
-} \
- dest+=stride; \
- } while(--height); \
-}
-
-#define DEFFUNC(op,rnd,xy,sz,OP_N,avgfunc) \
-static void op##_##rnd##_pixels##sz##_##xy (uint8_t * dest, const uint8_t * ref, \
- const int stride, int height) \
-{ \
- switch((int)ref&3) { \
- case 0:OP_N##0(sz,rnd##_##avgfunc); return; \
- case 1:OP_N(1,sz,rnd##_##avgfunc); return; \
- case 2:OP_N(2,sz,rnd##_##avgfunc); return; \
- case 3:OP_N(3,sz,rnd##_##avgfunc); return; \
- } \
-}
-
-#define OP put
-
-DEFFUNC(put, rnd,o,8,OP_C,avg32)
-DEFFUNC(put, rnd,x,8,OP_X,avg32)
-DEFFUNC(put,no_rnd,x,8,OP_X,avg32)
-DEFFUNC(put, rnd,y,8,OP_Y,avg32)
-DEFFUNC(put,no_rnd,y,8,OP_Y,avg32)
-DEFFUNC(put, rnd,xy,8,OP_XY,PACK)
-DEFFUNC(put,no_rnd,xy,8,OP_XY,PACK)
-DEFFUNC(put, rnd,o,16,OP_C,avg32)
-DEFFUNC(put, rnd,x,16,OP_X,avg32)
-DEFFUNC(put,no_rnd,x,16,OP_X,avg32)
-DEFFUNC(put, rnd,y,16,OP_Y,avg32)
-DEFFUNC(put,no_rnd,y,16,OP_Y,avg32)
-DEFFUNC(put, rnd,xy,16,OP_XY,PACK)
-DEFFUNC(put,no_rnd,xy,16,OP_XY,PACK)
-
-#undef OP
-#define OP avg
-
-DEFFUNC(avg, rnd,o,8,OP_C,avg32)
-DEFFUNC(avg, rnd,x,8,OP_X,avg32)
-DEFFUNC(avg,no_rnd,x,8,OP_X,avg32)
-DEFFUNC(avg, rnd,y,8,OP_Y,avg32)
-DEFFUNC(avg,no_rnd,y,8,OP_Y,avg32)
-DEFFUNC(avg, rnd,xy,8,OP_XY,PACK)
-DEFFUNC(avg,no_rnd,xy,8,OP_XY,PACK)
-DEFFUNC(avg, rnd,o,16,OP_C,avg32)
-DEFFUNC(avg, rnd,x,16,OP_X,avg32)
-DEFFUNC(avg,no_rnd,x,16,OP_X,avg32)
-DEFFUNC(avg, rnd,y,16,OP_Y,avg32)
-DEFFUNC(avg,no_rnd,y,16,OP_Y,avg32)
-DEFFUNC(avg, rnd,xy,16,OP_XY,PACK)
-DEFFUNC(avg,no_rnd,xy,16,OP_XY,PACK)
-
-#undef OP
-
-#define put_no_rnd_pixels8_o put_rnd_pixels8_o
-#define put_no_rnd_pixels16_o put_rnd_pixels16_o
-#define avg_no_rnd_pixels8_o avg_rnd_pixels8_o
-#define avg_no_rnd_pixels16_o avg_rnd_pixels16_o
-
-#define put_pixels8_c put_rnd_pixels8_o
-#define put_pixels16_c put_rnd_pixels16_o
-#define avg_pixels8_c avg_rnd_pixels8_o
-#define avg_pixels16_c avg_rnd_pixels16_o
-#define put_no_rnd_pixels8_c put_rnd_pixels8_o
-#define put_no_rnd_pixels16_c put_rnd_pixels16_o
-#define avg_no_rnd_pixels8_c avg_rnd_pixels8_o
-#define avg_no_rnd_pixels16_c avg_rnd_pixels16_o
-
-#define QPEL
-
-#ifdef QPEL
-
-#include "qpel.c"
-
-#endif
-
-void ff_dsputil_init_align(DSPContext* c, AVCodecContext *avctx)
-{
- const int high_bit_depth = avctx->bits_per_raw_sample > 8;
-
- if (!high_bit_depth) {
- c->put_pixels_tab[0][0] = put_rnd_pixels16_o;
- c->put_pixels_tab[0][1] = put_rnd_pixels16_x;
- c->put_pixels_tab[0][2] = put_rnd_pixels16_y;
- c->put_pixels_tab[0][3] = put_rnd_pixels16_xy;
- c->put_pixels_tab[1][0] = put_rnd_pixels8_o;
- c->put_pixels_tab[1][1] = put_rnd_pixels8_x;
- c->put_pixels_tab[1][2] = put_rnd_pixels8_y;
- c->put_pixels_tab[1][3] = put_rnd_pixels8_xy;
-
- c->put_no_rnd_pixels_tab[0][0] = put_no_rnd_pixels16_o;
- c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x;
- c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y;
- c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy;
- c->put_no_rnd_pixels_tab[1][0] = put_no_rnd_pixels8_o;
- c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x;
- c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y;
- c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy;
-
- c->avg_pixels_tab[0][0] = avg_rnd_pixels16_o;
- c->avg_pixels_tab[0][1] = avg_rnd_pixels16_x;
- c->avg_pixels_tab[0][2] = avg_rnd_pixels16_y;
- c->avg_pixels_tab[0][3] = avg_rnd_pixels16_xy;
- c->avg_pixels_tab[1][0] = avg_rnd_pixels8_o;
- c->avg_pixels_tab[1][1] = avg_rnd_pixels8_x;
- c->avg_pixels_tab[1][2] = avg_rnd_pixels8_y;
- c->avg_pixels_tab[1][3] = avg_rnd_pixels8_xy;
-
- c->avg_no_rnd_pixels_tab[0][0] = avg_no_rnd_pixels16_o;
- c->avg_no_rnd_pixels_tab[0][1] = avg_no_rnd_pixels16_x;
- c->avg_no_rnd_pixels_tab[0][2] = avg_no_rnd_pixels16_y;
- c->avg_no_rnd_pixels_tab[0][3] = avg_no_rnd_pixels16_xy;
- c->avg_no_rnd_pixels_tab[1][0] = avg_no_rnd_pixels8_o;
- c->avg_no_rnd_pixels_tab[1][1] = avg_no_rnd_pixels8_x;
- c->avg_no_rnd_pixels_tab[1][2] = avg_no_rnd_pixels8_y;
- c->avg_no_rnd_pixels_tab[1][3] = avg_no_rnd_pixels8_xy;
- }
-
-#ifdef QPEL
-
-#define dspfunc(PFX, IDX, NUM) \
- c->PFX ## _pixels_tab[IDX][ 0] = PFX ## NUM ## _mc00_sh4; \
- c->PFX ## _pixels_tab[IDX][ 1] = PFX ## NUM ## _mc10_sh4; \
- c->PFX ## _pixels_tab[IDX][ 2] = PFX ## NUM ## _mc20_sh4; \
- c->PFX ## _pixels_tab[IDX][ 3] = PFX ## NUM ## _mc30_sh4; \
- c->PFX ## _pixels_tab[IDX][ 4] = PFX ## NUM ## _mc01_sh4; \
- c->PFX ## _pixels_tab[IDX][ 5] = PFX ## NUM ## _mc11_sh4; \
- c->PFX ## _pixels_tab[IDX][ 6] = PFX ## NUM ## _mc21_sh4; \
- c->PFX ## _pixels_tab[IDX][ 7] = PFX ## NUM ## _mc31_sh4; \
- c->PFX ## _pixels_tab[IDX][ 8] = PFX ## NUM ## _mc02_sh4; \
- c->PFX ## _pixels_tab[IDX][ 9] = PFX ## NUM ## _mc12_sh4; \
- c->PFX ## _pixels_tab[IDX][10] = PFX ## NUM ## _mc22_sh4; \
- c->PFX ## _pixels_tab[IDX][11] = PFX ## NUM ## _mc32_sh4; \
- c->PFX ## _pixels_tab[IDX][12] = PFX ## NUM ## _mc03_sh4; \
- c->PFX ## _pixels_tab[IDX][13] = PFX ## NUM ## _mc13_sh4; \
- c->PFX ## _pixels_tab[IDX][14] = PFX ## NUM ## _mc23_sh4; \
- c->PFX ## _pixels_tab[IDX][15] = PFX ## NUM ## _mc33_sh4
-
- dspfunc(put_qpel, 0, 16);
- dspfunc(put_no_rnd_qpel, 0, 16);
-
- dspfunc(avg_qpel, 0, 16);
- /* dspfunc(avg_no_rnd_qpel, 0, 16); */
-
- dspfunc(put_qpel, 1, 8);
- dspfunc(put_no_rnd_qpel, 1, 8);
-
- dspfunc(avg_qpel, 1, 8);
- /* dspfunc(avg_no_rnd_qpel, 1, 8); */
-
- if (!high_bit_depth) {
- dspfunc(put_h264_qpel, 0, 16);
- dspfunc(put_h264_qpel, 1, 8);
- dspfunc(put_h264_qpel, 2, 4);
- dspfunc(avg_h264_qpel, 0, 16);
- dspfunc(avg_h264_qpel, 1, 8);
- dspfunc(avg_h264_qpel, 2, 4);
- }
-
-#undef dspfunc
- if (!high_bit_depth) {
- c->put_h264_chroma_pixels_tab[0]= put_h264_chroma_mc8_sh4;
- c->put_h264_chroma_pixels_tab[1]= put_h264_chroma_mc4_sh4;
- c->put_h264_chroma_pixels_tab[2]= put_h264_chroma_mc2_sh4;
- c->avg_h264_chroma_pixels_tab[0]= avg_h264_chroma_mc8_sh4;
- c->avg_h264_chroma_pixels_tab[1]= avg_h264_chroma_mc4_sh4;
- c->avg_h264_chroma_pixels_tab[2]= avg_h264_chroma_mc2_sh4;
- }
-
- c->put_mspel_pixels_tab[0]= put_mspel8_mc00_sh4;
- c->put_mspel_pixels_tab[1]= put_mspel8_mc10_sh4;
- c->put_mspel_pixels_tab[2]= put_mspel8_mc20_sh4;
- c->put_mspel_pixels_tab[3]= put_mspel8_mc30_sh4;
- c->put_mspel_pixels_tab[4]= put_mspel8_mc02_sh4;
- c->put_mspel_pixels_tab[5]= put_mspel8_mc12_sh4;
- c->put_mspel_pixels_tab[6]= put_mspel8_mc22_sh4;
- c->put_mspel_pixels_tab[7]= put_mspel8_mc32_sh4;
-
- c->gmc1 = gmc1_c;
-
-#endif
-}

libav-v9.6.tar.bz2/libavcodec/sh4/qpel.c Deleted

@@ -1,1352 +0,0 @@
-/*
- * This is optimized for sh, which have post increment addressing (*p++).
- * Some CPU may be index (p[n]) faster than post increment (*p++).
- *
- * copyright (c) 2001-2003 BERO <bero@geocities.co.jp>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavutil/common.h"
-
-#define PIXOP2(OPNAME, OP) \
-\
-static inline void OPNAME ## _pixels4_l2_aligned(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{\
- do {\
- OP(LP(dst ),rnd_avg32(LPC(src1 ),LPC(src2 )) ); \
- src1+=src_stride1; \
- src2+=src_stride2; \
- dst+=dst_stride; \
- } while(--h); \
-}\
-\
-static inline void OPNAME ## _pixels4_l2_aligned2(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{\
- do {\
- OP(LP(dst ),rnd_avg32(AV_RN32(src1 ),LPC(src2 )) ); \
- src1+=src_stride1; \
- src2+=src_stride2; \
- dst+=dst_stride; \
- } while(--h); \
-}\
-\
-static inline void OPNAME ## _no_rnd_pixels16_l2_aligned2(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{\
- do {\
- OP(LP(dst ),no_rnd_avg32(AV_RN32(src1 ),LPC(src2 )) ); \
- OP(LP(dst+4),no_rnd_avg32(AV_RN32(src1+4),LPC(src2+4)) ); \
- OP(LP(dst+8),no_rnd_avg32(AV_RN32(src1+8),LPC(src2+8)) ); \
- OP(LP(dst+12),no_rnd_avg32(AV_RN32(src1+12),LPC(src2+12)) ); \
- src1+=src_stride1; \
- src2+=src_stride2; \
- dst+=dst_stride; \
- } while(--h); \
-}\
-\
-static inline void OPNAME ## _pixels16_l2_aligned2(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{\
- do {\
- OP(LP(dst ),rnd_avg32(AV_RN32(src1 ),LPC(src2 )) ); \
- OP(LP(dst+4),rnd_avg32(AV_RN32(src1+4),LPC(src2+4)) ); \
- OP(LP(dst+8),rnd_avg32(AV_RN32(src1+8),LPC(src2+8)) ); \
- OP(LP(dst+12),rnd_avg32(AV_RN32(src1+12),LPC(src2+12)) ); \
- src1+=src_stride1; \
- src2+=src_stride2; \
- dst+=dst_stride; \
- } while(--h); \
-}\
-\
-static inline void OPNAME ## _no_rnd_pixels8_l2_aligned2(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{\
- do { /* onlye src2 aligned */\
- OP(LP(dst ),no_rnd_avg32(AV_RN32(src1 ),LPC(src2 )) ); \
- OP(LP(dst+4),no_rnd_avg32(AV_RN32(src1+4),LPC(src2+4)) ); \
- src1+=src_stride1; \
- src2+=src_stride2; \
- dst+=dst_stride; \
- } while(--h); \
-}\
-\
-static inline void OPNAME ## _pixels8_l2_aligned2(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{\
- do {\
- OP(LP(dst ),rnd_avg32(AV_RN32(src1 ),LPC(src2 )) ); \
- OP(LP(dst+4),rnd_avg32(AV_RN32(src1+4),LPC(src2+4)) ); \
- src1+=src_stride1; \
- src2+=src_stride2; \
- dst+=dst_stride; \
- } while(--h); \
-}\
-\
-static inline void OPNAME ## _no_rnd_pixels8_l2_aligned(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{\
- do {\
- OP(LP(dst ),no_rnd_avg32(LPC(src1 ),LPC(src2 )) ); \
- OP(LP(dst+4),no_rnd_avg32(LPC(src1+4),LPC(src2+4)) ); \
- src1+=src_stride1; \
- src2+=src_stride2; \
- dst+=dst_stride; \
- } while(--h); \
-}\
-\
-static inline void OPNAME ## _pixels8_l2_aligned(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{\
- do {\
- OP(LP(dst ),rnd_avg32(LPC(src1 ),LPC(src2 )) ); \
- OP(LP(dst+4),rnd_avg32(LPC(src1+4),LPC(src2+4)) ); \
- src1+=src_stride1; \
- src2+=src_stride2; \
- dst+=dst_stride; \
- } while(--h); \
-}\
-\
-static inline void OPNAME ## _no_rnd_pixels16_l2_aligned(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{\
- do {\
- OP(LP(dst ),no_rnd_avg32(LPC(src1 ),LPC(src2 )) ); \
- OP(LP(dst+4),no_rnd_avg32(LPC(src1+4),LPC(src2+4)) ); \
- OP(LP(dst+8),no_rnd_avg32(LPC(src1+8),LPC(src2+8)) ); \
- OP(LP(dst+12),no_rnd_avg32(LPC(src1+12),LPC(src2+12)) ); \
- src1+=src_stride1; \
- src2+=src_stride2; \
- dst+=dst_stride; \
- } while(--h); \
-}\
-\
-static inline void OPNAME ## _pixels16_l2_aligned(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{\
- do {\
- OP(LP(dst ),rnd_avg32(LPC(src1 ),LPC(src2 )) ); \
- OP(LP(dst+4),rnd_avg32(LPC(src1+4),LPC(src2+4)) ); \
- OP(LP(dst+8),rnd_avg32(LPC(src1+8),LPC(src2+8)) ); \
- OP(LP(dst+12),rnd_avg32(LPC(src1+12),LPC(src2+12)) ); \
- src1+=src_stride1; \
- src2+=src_stride2; \
- dst+=dst_stride; \
- } while(--h); \
-}\
-\
-static inline void OPNAME ## _no_rnd_pixels16_l2_aligned1(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{ OPNAME ## _no_rnd_pixels16_l2_aligned2(dst,src2,src1,dst_stride,src_stride2,src_stride1,h); } \
-\
-static inline void OPNAME ## _pixels16_l2_aligned1(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{ OPNAME ## _pixels16_l2_aligned2(dst,src2,src1,dst_stride,src_stride2,src_stride1,h); } \
-\
-static inline void OPNAME ## _no_rnd_pixels8_l2_aligned1(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{ OPNAME ## _no_rnd_pixels8_l2_aligned2(dst,src2,src1,dst_stride,src_stride2,src_stride1,h); } \
-\
-static inline void OPNAME ## _pixels8_l2_aligned1(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h) \
-{ OPNAME ## _pixels8_l2_aligned2(dst,src2,src1,dst_stride,src_stride2,src_stride1,h); } \
-\
-static inline void OPNAME ## _pixels8_l4_aligned(uint8_t *dst, const uint8_t *src1, uint8_t *src2, uint8_t *src3, uint8_t *src4,int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
- do { \
- uint32_t a0,a1,a2,a3; \
- UNPACK(a0,a1,LPC(src1),LPC(src2)); \
- UNPACK(a2,a3,LPC(src3),LPC(src4)); \
- OP(LP(dst),rnd_PACK(a0,a1,a2,a3)); \
- UNPACK(a0,a1,LPC(src1+4),LPC(src2+4)); \
- UNPACK(a2,a3,LPC(src3+4),LPC(src4+4)); \
- OP(LP(dst+4),rnd_PACK(a0,a1,a2,a3)); \
- src1+=src_stride1;\
- src2+=src_stride2;\
- src3+=src_stride3;\
- src4+=src_stride4;\
- dst+=dst_stride;\
- } while(--h); \
-} \
-\
-static inline void OPNAME ## _no_rnd_pixels8_l4_aligned(uint8_t *dst, const uint8_t *src1, uint8_t *src2, uint8_t *src3, uint8_t *src4,int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
- do { \
- uint32_t a0,a1,a2,a3; \
- UNPACK(a0,a1,LPC(src1),LPC(src2)); \
- UNPACK(a2,a3,LPC(src3),LPC(src4)); \
- OP(LP(dst),no_rnd_PACK(a0,a1,a2,a3)); \
- UNPACK(a0,a1,LPC(src1+4),LPC(src2+4)); \
- UNPACK(a2,a3,LPC(src3+4),LPC(src4+4)); \
- OP(LP(dst+4),no_rnd_PACK(a0,a1,a2,a3)); \
- src1+=src_stride1;\
- src2+=src_stride2;\
- src3+=src_stride3;\
- src4+=src_stride4;\
- dst+=dst_stride;\
- } while(--h); \
-} \
-\
-static inline void OPNAME ## _pixels8_l4_aligned0(uint8_t *dst, const uint8_t *src1, uint8_t *src2, uint8_t *src3, uint8_t *src4,int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
- do { \
- uint32_t a0,a1,a2,a3; /* src1 only not aligned */\
- UNPACK(a0,a1,AV_RN32(src1),LPC(src2)); \
- UNPACK(a2,a3,LPC(src3),LPC(src4)); \
- OP(LP(dst),rnd_PACK(a0,a1,a2,a3)); \
- UNPACK(a0,a1,AV_RN32(src1+4),LPC(src2+4)); \
- UNPACK(a2,a3,LPC(src3+4),LPC(src4+4)); \
- OP(LP(dst+4),rnd_PACK(a0,a1,a2,a3)); \
- src1+=src_stride1;\
- src2+=src_stride2;\
- src3+=src_stride3;\
- src4+=src_stride4;\
- dst+=dst_stride;\
- } while(--h); \
-} \
-\
-static inline void OPNAME ## _no_rnd_pixels8_l4_aligned0(uint8_t *dst, const uint8_t *src1, uint8_t *src2, uint8_t *src3, uint8_t *src4,int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
- do { \
- uint32_t a0,a1,a2,a3; \
- UNPACK(a0,a1,AV_RN32(src1),LPC(src2)); \
- UNPACK(a2,a3,LPC(src3),LPC(src4)); \
- OP(LP(dst),no_rnd_PACK(a0,a1,a2,a3)); \
- UNPACK(a0,a1,AV_RN32(src1+4),LPC(src2+4)); \
- UNPACK(a2,a3,LPC(src3+4),LPC(src4+4)); \
- OP(LP(dst+4),no_rnd_PACK(a0,a1,a2,a3)); \
- src1+=src_stride1;\
- src2+=src_stride2;\
- src3+=src_stride3;\
- src4+=src_stride4;\
- dst+=dst_stride;\
- } while(--h); \
-} \
-\
-static inline void OPNAME ## _pixels16_l4_aligned(uint8_t *dst, const uint8_t *src1, uint8_t *src2, uint8_t *src3, uint8_t *src4,int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
- do { \
- uint32_t a0,a1,a2,a3; \
- UNPACK(a0,a1,LPC(src1),LPC(src2)); \
- UNPACK(a2,a3,LPC(src3),LPC(src4)); \
- OP(LP(dst),rnd_PACK(a0,a1,a2,a3)); \
- UNPACK(a0,a1,LPC(src1+4),LPC(src2+4)); \
- UNPACK(a2,a3,LPC(src3+4),LPC(src4+4)); \
- OP(LP(dst+8),rnd_PACK(a0,a1,a2,a3)); \
- UNPACK(a0,a1,LPC(src1+8),LPC(src2+8)); \
- UNPACK(a2,a3,LPC(src3+8),LPC(src4+8)); \
- OP(LP(dst+8),rnd_PACK(a0,a1,a2,a3)); \
- UNPACK(a0,a1,LPC(src1+12),LPC(src2+12)); \
- UNPACK(a2,a3,LPC(src3+12),LPC(src4+12)); \
- OP(LP(dst+12),rnd_PACK(a0,a1,a2,a3)); \
- src1+=src_stride1;\
- src2+=src_stride2;\
- src3+=src_stride3;\
- src4+=src_stride4;\
- dst+=dst_stride;\
- } while(--h); \
-} \
-\
-static inline void OPNAME ## _no_rnd_pixels16_l4_aligned(uint8_t *dst, const uint8_t *src1, uint8_t *src2, uint8_t *src3, uint8_t *src4,int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
- do { \
- uint32_t a0,a1,a2,a3; \
- UNPACK(a0,a1,LPC(src1),LPC(src2)); \
- UNPACK(a2,a3,LPC(src3),LPC(src4)); \
- OP(LP(dst),no_rnd_PACK(a0,a1,a2,a3)); \
- UNPACK(a0,a1,LPC(src1+4),LPC(src2+4)); \
- UNPACK(a2,a3,LPC(src3+4),LPC(src4+4)); \
- OP(LP(dst+4),no_rnd_PACK(a0,a1,a2,a3)); \
- UNPACK(a0,a1,LPC(src1+8),LPC(src2+8)); \
- UNPACK(a2,a3,LPC(src3+8),LPC(src4+8)); \
- OP(LP(dst+8),no_rnd_PACK(a0,a1,a2,a3)); \
- UNPACK(a0,a1,LPC(src1+12),LPC(src2+12)); \
- UNPACK(a2,a3,LPC(src3+12),LPC(src4+12)); \
- OP(LP(dst+12),no_rnd_PACK(a0,a1,a2,a3)); \
- src1+=src_stride1;\
- src2+=src_stride2;\
- src3+=src_stride3;\
- src4+=src_stride4;\
- dst+=dst_stride;\
- } while(--h); \
-} \
-\
-static inline void OPNAME ## _pixels16_l4_aligned0(uint8_t *dst, const uint8_t *src1, uint8_t *src2, uint8_t *src3, uint8_t *src4,int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
- do { /* src1 is unaligned */\
- uint32_t a0,a1,a2,a3; \
- UNPACK(a0,a1,AV_RN32(src1),LPC(src2)); \
- UNPACK(a2,a3,LPC(src3),LPC(src4)); \
- OP(LP(dst),rnd_PACK(a0,a1,a2,a3)); \
- UNPACK(a0,a1,AV_RN32(src1+4),LPC(src2+4)); \
- UNPACK(a2,a3,LPC(src3+4),LPC(src4+4)); \
- OP(LP(dst+8),rnd_PACK(a0,a1,a2,a3)); \
- UNPACK(a0,a1,AV_RN32(src1+8),LPC(src2+8)); \
- UNPACK(a2,a3,LPC(src3+8),LPC(src4+8)); \
- OP(LP(dst+8),rnd_PACK(a0,a1,a2,a3)); \
- UNPACK(a0,a1,AV_RN32(src1+12),LPC(src2+12)); \
- UNPACK(a2,a3,LPC(src3+12),LPC(src4+12)); \
- OP(LP(dst+12),rnd_PACK(a0,a1,a2,a3)); \
- src1+=src_stride1;\
- src2+=src_stride2;\
- src3+=src_stride3;\
- src4+=src_stride4;\
- dst+=dst_stride;\
- } while(--h); \
-} \
-\
-static inline void OPNAME ## _no_rnd_pixels16_l4_aligned0(uint8_t *dst, const uint8_t *src1, uint8_t *src2, uint8_t *src3, uint8_t *src4,int dst_stride, int src_stride1, int src_stride2,int src_stride3,int src_stride4, int h){\
- do { \
- uint32_t a0,a1,a2,a3; \
- UNPACK(a0,a1,AV_RN32(src1),LPC(src2)); \
- UNPACK(a2,a3,LPC(src3),LPC(src4)); \
- OP(LP(dst),no_rnd_PACK(a0,a1,a2,a3)); \
- UNPACK(a0,a1,AV_RN32(src1+4),LPC(src2+4)); \
- UNPACK(a2,a3,LPC(src3+4),LPC(src4+4)); \
- OP(LP(dst+4),no_rnd_PACK(a0,a1,a2,a3)); \
- UNPACK(a0,a1,AV_RN32(src1+8),LPC(src2+8)); \
- UNPACK(a2,a3,LPC(src3+8),LPC(src4+8)); \
- OP(LP(dst+8),no_rnd_PACK(a0,a1,a2,a3)); \
- UNPACK(a0,a1,AV_RN32(src1+12),LPC(src2+12)); \
- UNPACK(a2,a3,LPC(src3+12),LPC(src4+12)); \
- OP(LP(dst+12),no_rnd_PACK(a0,a1,a2,a3)); \
- src1+=src_stride1;\
- src2+=src_stride2;\
- src3+=src_stride3;\
- src4+=src_stride4;\
- dst+=dst_stride;\
- } while(--h); \
-} \
-\
-
-#define op_avg(a, b) a = rnd_avg32(a,b)
-#define op_put(a, b) a = b
-
-PIXOP2(avg, op_avg)
-PIXOP2(put, op_put)
-#undef op_avg
-#undef op_put
-
-#define avg2(a,b) ((a+b+1)>>1)
-#define avg4(a,b,c,d) ((a+b+c+d+2)>>2)
-
-
-static void gmc1_c(uint8_t *dst, uint8_t *src, int stride, int h, int x16, int y16, int rounder)
-{
- const int A=(16-x16)*(16-y16);
- const int B=( x16)*(16-y16);
- const int C=(16-x16)*( y16);
- const int D=( x16)*( y16);
-
- do {
- int t0,t1,t2,t3;
- uint8_t *s0 = src;
- uint8_t *s1 = src+stride;
- t0 = *s0++; t2 = *s1++;
- t1 = *s0++; t3 = *s1++;
- dst[0]= (A*t0 + B*t1 + C*t2 + D*t3 + rounder)>>8;
- t0 = *s0++; t2 = *s1++;
- dst[1]= (A*t1 + B*t0 + C*t3 + D*t2 + rounder)>>8;
- t1 = *s0++; t3 = *s1++;
- dst[2]= (A*t0 + B*t1 + C*t2 + D*t3 + rounder)>>8;
- t0 = *s0++; t2 = *s1++;
- dst[3]= (A*t1 + B*t0 + C*t3 + D*t2 + rounder)>>8;
- t1 = *s0++; t3 = *s1++;
- dst[4]= (A*t0 + B*t1 + C*t2 + D*t3 + rounder)>>8;
- t0 = *s0++; t2 = *s1++;
- dst[5]= (A*t1 + B*t0 + C*t3 + D*t2 + rounder)>>8;
- t1 = *s0++; t3 = *s1++;
- dst[6]= (A*t0 + B*t1 + C*t2 + D*t3 + rounder)>>8;
- t0 = *s0++; t2 = *s1++;
- dst[7]= (A*t1 + B*t0 + C*t3 + D*t2 + rounder)>>8;
- dst+= stride;
- src+= stride;
- }while(--h);
-}
-
-#define H264_CHROMA_MC(OPNAME, OP)\
-static void OPNAME ## h264_chroma_mc2_sh4(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);\
- \
- assert(x<8 && y<8 && x>=0 && y>=0);\
-\
- do {\
- int t0,t1,t2,t3; \
- uint8_t *s0 = src; \
- uint8_t *s1 = src+stride; \
- t0 = *s0++; t2 = *s1++; \
- t1 = *s0++; t3 = *s1++; \
- OP(dst[0], (A*t0 + B*t1 + C*t2 + D*t3));\
- t0 = *s0++; t2 = *s1++; \
- OP(dst[1], (A*t1 + B*t0 + C*t3 + D*t2));\
- dst+= stride;\
- src+= stride;\
- }while(--h);\
-}\
-\
-static void OPNAME ## h264_chroma_mc4_sh4(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);\
- \
- assert(x<8 && y<8 && x>=0 && y>=0);\
-\
- do {\
- int t0,t1,t2,t3; \
- uint8_t *s0 = src; \
- uint8_t *s1 = src+stride; \
- t0 = *s0++; t2 = *s1++; \
- t1 = *s0++; t3 = *s1++; \
- OP(dst[0], (A*t0 + B*t1 + C*t2 + D*t3));\
- t0 = *s0++; t2 = *s1++; \
- OP(dst[1], (A*t1 + B*t0 + C*t3 + D*t2));\
- t1 = *s0++; t3 = *s1++; \
- OP(dst[2], (A*t0 + B*t1 + C*t2 + D*t3));\
- t0 = *s0++; t2 = *s1++; \
- OP(dst[3], (A*t1 + B*t0 + C*t3 + D*t2));\
- dst+= stride;\
- src+= stride;\
- }while(--h);\
-}\
-\
-static void OPNAME ## h264_chroma_mc8_sh4(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);\
- \
- assert(x<8 && y<8 && x>=0 && y>=0);\
-\
- do {\
- int t0,t1,t2,t3; \
- uint8_t *s0 = src; \
- uint8_t *s1 = src+stride; \
- t0 = *s0++; t2 = *s1++; \
- t1 = *s0++; t3 = *s1++; \
- OP(dst[0], (A*t0 + B*t1 + C*t2 + D*t3));\
- t0 = *s0++; t2 = *s1++; \
- OP(dst[1], (A*t1 + B*t0 + C*t3 + D*t2));\
- t1 = *s0++; t3 = *s1++; \
- OP(dst[2], (A*t0 + B*t1 + C*t2 + D*t3));\
- t0 = *s0++; t2 = *s1++; \
- OP(dst[3], (A*t1 + B*t0 + C*t3 + D*t2));\
- t1 = *s0++; t3 = *s1++; \
- OP(dst[4], (A*t0 + B*t1 + C*t2 + D*t3));\
- t0 = *s0++; t2 = *s1++; \
- OP(dst[5], (A*t1 + B*t0 + C*t3 + D*t2));\
- t1 = *s0++; t3 = *s1++; \
- OP(dst[6], (A*t0 + B*t1 + C*t2 + D*t3));\
- t0 = *s0++; t2 = *s1++; \
- OP(dst[7], (A*t1 + B*t0 + C*t3 + D*t2));\
- dst+= stride;\
- src+= stride;\
- }while(--h);\
-}
-
-#define op_avg(a, b) a = (((a)+(((b) + 32)>>6)+1)>>1)
-#define op_put(a, b) a = (((b) + 32)>>6)
-
-H264_CHROMA_MC(put_ , op_put)
-H264_CHROMA_MC(avg_ , op_avg)
-#undef op_avg
-#undef op_put
-
-#define QPEL_MC(r, OPNAME, RND, OP) \
-static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
- do {\
- uint8_t *s = src; \
- int src0,src1,src2,src3,src4,src5,src6,src7,src8;\
- src0= *s++;\
- src1= *s++;\
- src2= *s++;\
- src3= *s++;\
- src4= *s++;\
- OP(dst[0], (src0+src1)*20 - (src0+src2)*6 + (src1+src3)*3 - (src2+src4));\
- src5= *s++;\
- OP(dst[1], (src1+src2)*20 - (src0+src3)*6 + (src0+src4)*3 - (src1+src5));\
- src6= *s++;\
- OP(dst[2], (src2+src3)*20 - (src1+src4)*6 + (src0+src5)*3 - (src0+src6));\
- src7= *s++;\
- OP(dst[3], (src3+src4)*20 - (src2+src5)*6 + (src1+src6)*3 - (src0+src7));\
- src8= *s++;\
- OP(dst[4], (src4+src5)*20 - (src3+src6)*6 + (src2+src7)*3 - (src1+src8));\
- OP(dst[5], (src5+src6)*20 - (src4+src7)*6 + (src3+src8)*3 - (src2+src8));\
- OP(dst[6], (src6+src7)*20 - (src5+src8)*6 + (src4+src8)*3 - (src3+src7));\
- OP(dst[7], (src7+src8)*20 - (src6+src8)*6 + (src5+src7)*3 - (src4+src6));\
- dst+=dstStride;\
- src+=srcStride;\
- }while(--h);\
-}\
-\
-static void OPNAME ## mpeg4_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
- int w=8;\
- do{\
- uint8_t *s = src, *d=dst;\
- int src0,src1,src2,src3,src4,src5,src6,src7,src8;\
- src0 = *s; s+=srcStride; \
- src1 = *s; s+=srcStride; \
- src2 = *s; s+=srcStride; \
- src3 = *s; s+=srcStride; \
- src4 = *s; s+=srcStride; \
- OP(*d, (src0+src1)*20 - (src0+src2)*6 + (src1+src3)*3 - (src2+src4));d+=dstStride;\
- src5 = *s; s+=srcStride; \
- OP(*d, (src1+src2)*20 - (src0+src3)*6 + (src0+src4)*3 - (src1+src5));d+=dstStride;\
- src6 = *s; s+=srcStride; \
- OP(*d, (src2+src3)*20 - (src1+src4)*6 + (src0+src5)*3 - (src0+src6));d+=dstStride;\
- src7 = *s; s+=srcStride; \
- OP(*d, (src3+src4)*20 - (src2+src5)*6 + (src1+src6)*3 - (src0+src7));d+=dstStride;\
- src8 = *s; \
- OP(*d, (src4+src5)*20 - (src3+src6)*6 + (src2+src7)*3 - (src1+src8));d+=dstStride;\
- OP(*d, (src5+src6)*20 - (src4+src7)*6 + (src3+src8)*3 - (src2+src8));d+=dstStride;\
- OP(*d, (src6+src7)*20 - (src5+src8)*6 + (src4+src8)*3 - (src3+src7));d+=dstStride;\
- OP(*d, (src7+src8)*20 - (src6+src8)*6 + (src5+src7)*3 - (src4+src6));\
- dst++;\
- src++;\
- }while(--w);\
-}\
-\
-static void OPNAME ## mpeg4_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
- do {\
- uint8_t *s = src;\
- int src0,src1,src2,src3,src4,src5,src6,src7,src8;\
- int src9,src10,src11,src12,src13,src14,src15,src16;\
- src0= *s++;\
- src1= *s++;\
- src2= *s++;\
- src3= *s++;\
- src4= *s++;\
- OP(dst[ 0], (src0 +src1 )*20 - (src0 +src2 )*6 + (src1 +src3 )*3 - (src2 +src4 ));\
- src5= *s++;\
- OP(dst[ 1], (src1 +src2 )*20 - (src0 +src3 )*6 + (src0 +src4 )*3 - (src1 +src5 ));\
- src6= *s++;\
- OP(dst[ 2], (src2 +src3 )*20 - (src1 +src4 )*6 + (src0 +src5 )*3 - (src0 +src6 ));\
- src7= *s++;\
- OP(dst[ 3], (src3 +src4 )*20 - (src2 +src5 )*6 + (src1 +src6 )*3 - (src0 +src7 ));\
- src8= *s++;\
- OP(dst[ 4], (src4 +src5 )*20 - (src3 +src6 )*6 + (src2 +src7 )*3 - (src1 +src8 ));\
- src9= *s++;\
- OP(dst[ 5], (src5 +src6 )*20 - (src4 +src7 )*6 + (src3 +src8 )*3 - (src2 +src9 ));\
- src10= *s++;\
- OP(dst[ 6], (src6 +src7 )*20 - (src5 +src8 )*6 + (src4 +src9 )*3 - (src3 +src10));\
- src11= *s++;\
- OP(dst[ 7], (src7 +src8 )*20 - (src6 +src9 )*6 + (src5 +src10)*3 - (src4 +src11));\
- src12= *s++;\
- OP(dst[ 8], (src8 +src9 )*20 - (src7 +src10)*6 + (src6 +src11)*3 - (src5 +src12));\
- src13= *s++;\
- OP(dst[ 9], (src9 +src10)*20 - (src8 +src11)*6 + (src7 +src12)*3 - (src6 +src13));\
- src14= *s++;\
- OP(dst[10], (src10+src11)*20 - (src9 +src12)*6 + (src8 +src13)*3 - (src7 +src14));\
- src15= *s++;\
- OP(dst[11], (src11+src12)*20 - (src10+src13)*6 + (src9 +src14)*3 - (src8 +src15));\
- src16= *s++;\
- OP(dst[12], (src12+src13)*20 - (src11+src14)*6 + (src10+src15)*3 - (src9 +src16));\
- OP(dst[13], (src13+src14)*20 - (src12+src15)*6 + (src11+src16)*3 - (src10+src16));\
- OP(dst[14], (src14+src15)*20 - (src13+src16)*6 + (src12+src16)*3 - (src11+src15));\
- OP(dst[15], (src15+src16)*20 - (src14+src16)*6 + (src13+src15)*3 - (src12+src14));\
- dst+=dstStride;\
- src+=srcStride;\
- }while(--h);\
-}\
-\
-static void OPNAME ## mpeg4_qpel16_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
- int w=16;\
- do {\
- uint8_t *s = src, *d=dst;\
- int src0,src1,src2,src3,src4,src5,src6,src7,src8;\
- int src9,src10,src11,src12,src13,src14,src15,src16;\
- src0 = *s; s+=srcStride; \
- src1 = *s; s+=srcStride; \
- src2 = *s; s+=srcStride; \
- src3 = *s; s+=srcStride; \
- src4 = *s; s+=srcStride; \
- OP(*d, (src0 +src1 )*20 - (src0 +src2 )*6 + (src1 +src3 )*3 - (src2 +src4 ));d+=dstStride;\
- src5 = *s; s+=srcStride; \
- OP(*d, (src1 +src2 )*20 - (src0 +src3 )*6 + (src0 +src4 )*3 - (src1 +src5 ));d+=dstStride;\
- src6 = *s; s+=srcStride; \
- OP(*d, (src2 +src3 )*20 - (src1 +src4 )*6 + (src0 +src5 )*3 - (src0 +src6 ));d+=dstStride;\
- src7 = *s; s+=srcStride; \
- OP(*d, (src3 +src4 )*20 - (src2 +src5 )*6 + (src1 +src6 )*3 - (src0 +src7 ));d+=dstStride;\
- src8 = *s; s+=srcStride; \
- OP(*d, (src4 +src5 )*20 - (src3 +src6 )*6 + (src2 +src7 )*3 - (src1 +src8 ));d+=dstStride;\
- src9 = *s; s+=srcStride; \
- OP(*d, (src5 +src6 )*20 - (src4 +src7 )*6 + (src3 +src8 )*3 - (src2 +src9 ));d+=dstStride;\
- src10 = *s; s+=srcStride; \
- OP(*d, (src6 +src7 )*20 - (src5 +src8 )*6 + (src4 +src9 )*3 - (src3 +src10));d+=dstStride;\
- src11 = *s; s+=srcStride; \
- OP(*d, (src7 +src8 )*20 - (src6 +src9 )*6 + (src5 +src10)*3 - (src4 +src11));d+=dstStride;\
- src12 = *s; s+=srcStride; \
- OP(*d, (src8 +src9 )*20 - (src7 +src10)*6 + (src6 +src11)*3 - (src5 +src12));d+=dstStride;\
- src13 = *s; s+=srcStride; \
- OP(*d, (src9 +src10)*20 - (src8 +src11)*6 + (src7 +src12)*3 - (src6 +src13));d+=dstStride;\
- src14 = *s; s+=srcStride; \
- OP(*d, (src10+src11)*20 - (src9 +src12)*6 + (src8 +src13)*3 - (src7 +src14));d+=dstStride;\
- src15 = *s; s+=srcStride; \
- OP(*d, (src11+src12)*20 - (src10+src13)*6 + (src9 +src14)*3 - (src8 +src15));d+=dstStride;\
- src16 = *s; \
- OP(*d, (src12+src13)*20 - (src11+src14)*6 + (src10+src15)*3 - (src9 +src16));d+=dstStride;\
- OP(*d, (src13+src14)*20 - (src12+src15)*6 + (src11+src16)*3 - (src10+src16));d+=dstStride;\
- OP(*d, (src14+src15)*20 - (src13+src16)*6 + (src12+src16)*3 - (src11+src15));d+=dstStride;\
- OP(*d, (src15+src16)*20 - (src14+src16)*6 + (src13+src15)*3 - (src12+src14));\
- dst++;\
- src++;\
- }while(--w);\
-}\
-\
-static void OPNAME ## qpel8_mc00_sh4 (uint8_t *dst, uint8_t *src, int stride){\
- OPNAME ## pixels8_c(dst, src, stride, 8);\
-}\
-\
-static void OPNAME ## qpel8_mc10_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t half[64];\
- put ## RND ## mpeg4_qpel8_h_lowpass(half, src, 8, stride, 8);\
- OPNAME ## pixels8_l2_aligned2(dst, src, half, stride, stride, 8, 8);\
-}\
-\
-static void OPNAME ## qpel8_mc20_sh4(uint8_t *dst, uint8_t *src, int stride){\
- OPNAME ## mpeg4_qpel8_h_lowpass(dst, src, stride, stride, 8);\
-}\
-\
-static void OPNAME ## qpel8_mc30_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t half[64];\
- put ## RND ## mpeg4_qpel8_h_lowpass(half, src, 8, stride, 8);\
- OPNAME ## pixels8_l2_aligned2(dst, src+1, half, stride, stride, 8, 8);\
-}\
-\
-static void OPNAME ## qpel8_mc01_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[16*9];\
- uint8_t half[64];\
- copy_block9(full, src, 16, stride, 9);\
- put ## RND ## mpeg4_qpel8_v_lowpass(half, full, 8, 16);\
- OPNAME ## pixels8_l2_aligned(dst, full, half, stride, 16, 8, 8);\
-}\
-\
-static void OPNAME ## qpel8_mc02_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[16*9];\
- copy_block9(full, src, 16, stride, 9);\
- OPNAME ## mpeg4_qpel8_v_lowpass(dst, full, stride, 16);\
-}\
-\
-static void OPNAME ## qpel8_mc03_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[16*9];\
- uint8_t half[64];\
- copy_block9(full, src, 16, stride, 9);\
- put ## RND ## mpeg4_qpel8_v_lowpass(half, full, 8, 16);\
- OPNAME ## pixels8_l2_aligned(dst, full+16, half, stride, 16, 8, 8);\
-}\
-static void OPNAME ## qpel8_mc11_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[16*9];\
- uint8_t halfH[72];\
- uint8_t halfHV[64];\
- copy_block9(full, src, 16, stride, 9);\
- put ## RND ## mpeg4_qpel8_h_lowpass(halfH, full, 8, 16, 9);\
- put ## RND ## pixels8_l2_aligned(halfH, halfH, full, 8, 8, 16, 9);\
- put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
- OPNAME ## pixels8_l2_aligned(dst, halfH, halfHV, stride, 8, 8, 8);\
-}\
-static void OPNAME ## qpel8_mc31_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[16*9];\
- uint8_t halfH[72];\
- uint8_t halfHV[64];\
- copy_block9(full, src, 16, stride, 9);\
- put ## RND ## mpeg4_qpel8_h_lowpass(halfH, full, 8, 16, 9);\
- put ## RND ## pixels8_l2_aligned1(halfH, halfH, full+1, 8, 8, 16, 9);\
- put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
- OPNAME ## pixels8_l2_aligned(dst, halfH, halfHV, stride, 8, 8, 8);\
-}\
-static void OPNAME ## qpel8_mc13_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[16*9];\
- uint8_t halfH[72];\
- uint8_t halfHV[64];\
- copy_block9(full, src, 16, stride, 9);\
- put ## RND ## mpeg4_qpel8_h_lowpass(halfH, full, 8, 16, 9);\
- put ## RND ## pixels8_l2_aligned(halfH, halfH, full, 8, 8, 16, 9);\
- put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
- OPNAME ## pixels8_l2_aligned(dst, halfH+8, halfHV, stride, 8, 8, 8);\
-}\
-static void OPNAME ## qpel8_mc33_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[16*9];\
- uint8_t halfH[72];\
- uint8_t halfHV[64];\
- copy_block9(full, src, 16, stride, 9);\
- put ## RND ## mpeg4_qpel8_h_lowpass(halfH, full, 8, 16, 9);\
- put ## RND ## pixels8_l2_aligned1(halfH, halfH, full+1, 8, 8, 16, 9);\
- put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
- OPNAME ## pixels8_l2_aligned(dst, halfH+8, halfHV, stride, 8, 8, 8);\
-}\
-static void OPNAME ## qpel8_mc21_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t halfH[72];\
- uint8_t halfHV[64];\
- put ## RND ## mpeg4_qpel8_h_lowpass(halfH, src, 8, stride, 9);\
- put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
- OPNAME ## pixels8_l2_aligned(dst, halfH, halfHV, stride, 8, 8, 8);\
-}\
-static void OPNAME ## qpel8_mc23_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t halfH[72];\
- uint8_t halfHV[64];\
- put ## RND ## mpeg4_qpel8_h_lowpass(halfH, src, 8, stride, 9);\
- put ## RND ## mpeg4_qpel8_v_lowpass(halfHV, halfH, 8, 8);\
- OPNAME ## pixels8_l2_aligned(dst, halfH+8, halfHV, stride, 8, 8, 8);\
-}\
-static void OPNAME ## qpel8_mc12_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[16*9];\
- uint8_t halfH[72];\
- copy_block9(full, src, 16, stride, 9);\
- put ## RND ## mpeg4_qpel8_h_lowpass(halfH, full, 8, 16, 9);\
- put ## RND ## pixels8_l2_aligned(halfH, halfH, full, 8, 8, 16, 9);\
- OPNAME ## mpeg4_qpel8_v_lowpass(dst, halfH, stride, 8);\
-}\
-static void OPNAME ## qpel8_mc32_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[16*9];\
- uint8_t halfH[72];\
- copy_block9(full, src, 16, stride, 9);\
- put ## RND ## mpeg4_qpel8_h_lowpass(halfH, full, 8, 16, 9);\
- put ## RND ## pixels8_l2_aligned1(halfH, halfH, full+1, 8, 8, 16, 9);\
- OPNAME ## mpeg4_qpel8_v_lowpass(dst, halfH, stride, 8);\
-}\
-static void OPNAME ## qpel8_mc22_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t halfH[72];\
- put ## RND ## mpeg4_qpel8_h_lowpass(halfH, src, 8, stride, 9);\
- OPNAME ## mpeg4_qpel8_v_lowpass(dst, halfH, stride, 8);\
-}\
-static void OPNAME ## qpel16_mc00_sh4 (uint8_t *dst, uint8_t *src, int stride){\
- OPNAME ## pixels16_c(dst, src, stride, 16);\
-}\
-\
-static void OPNAME ## qpel16_mc10_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t half[256];\
- put ## RND ## mpeg4_qpel16_h_lowpass(half, src, 16, stride, 16);\
- OPNAME ## pixels16_l2_aligned2(dst, src, half, stride, stride, 16, 16);\
-}\
-\
-static void OPNAME ## qpel16_mc20_sh4(uint8_t *dst, uint8_t *src, int stride){\
- OPNAME ## mpeg4_qpel16_h_lowpass(dst, src, stride, stride, 16);\
-}\
-\
-static void OPNAME ## qpel16_mc30_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t half[256];\
- put ## RND ## mpeg4_qpel16_h_lowpass(half, src, 16, stride, 16);\
- OPNAME ## pixels16_l2_aligned2(dst, src+1, half, stride, stride, 16, 16);\
-}\
-\
-static void OPNAME ## qpel16_mc01_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[24*17];\
- uint8_t half[256];\
- copy_block17(full, src, 24, stride, 17);\
- put ## RND ## mpeg4_qpel16_v_lowpass(half, full, 16, 24);\
- OPNAME ## pixels16_l2_aligned(dst, full, half, stride, 24, 16, 16);\
-}\
-\
-static void OPNAME ## qpel16_mc02_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[24*17];\
- copy_block17(full, src, 24, stride, 17);\
- OPNAME ## mpeg4_qpel16_v_lowpass(dst, full, stride, 24);\
-}\
-\
-static void OPNAME ## qpel16_mc03_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[24*17];\
- uint8_t half[256];\
- copy_block17(full, src, 24, stride, 17);\
- put ## RND ## mpeg4_qpel16_v_lowpass(half, full, 16, 24);\
- OPNAME ## pixels16_l2_aligned(dst, full+24, half, stride, 24, 16, 16);\
-}\
-static void OPNAME ## qpel16_mc11_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[24*17];\
- uint8_t halfH[272];\
- uint8_t halfHV[256];\
- copy_block17(full, src, 24, stride, 17);\
- put ## RND ## mpeg4_qpel16_h_lowpass(halfH, full, 16, 24, 17);\
- put ## RND ## pixels16_l2_aligned(halfH, halfH, full, 16, 16, 24, 17);\
- put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
- OPNAME ## pixels16_l2_aligned(dst, halfH, halfHV, stride, 16, 16, 16);\
-}\
-static void OPNAME ## qpel16_mc31_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[24*17];\
- uint8_t halfH[272];\
- uint8_t halfHV[256];\
- copy_block17(full, src, 24, stride, 17);\
- put ## RND ## mpeg4_qpel16_h_lowpass(halfH, full, 16, 24, 17);\
- put ## RND ## pixels16_l2_aligned1(halfH, halfH, full+1, 16, 16, 24, 17);\
- put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
- OPNAME ## pixels16_l2_aligned(dst, halfH, halfHV, stride, 16, 16, 16);\
-}\
-static void OPNAME ## qpel16_mc13_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[24*17];\
- uint8_t halfH[272];\
- uint8_t halfHV[256];\
- copy_block17(full, src, 24, stride, 17);\
- put ## RND ## mpeg4_qpel16_h_lowpass(halfH, full, 16, 24, 17);\
- put ## RND ## pixels16_l2_aligned(halfH, halfH, full, 16, 16, 24, 17);\
- put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
- OPNAME ## pixels16_l2_aligned(dst, halfH+16, halfHV, stride, 16, 16, 16);\
-}\
-static void OPNAME ## qpel16_mc33_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[24*17];\
- uint8_t halfH[272];\
- uint8_t halfHV[256];\
- copy_block17(full, src, 24, stride, 17);\
- put ## RND ## mpeg4_qpel16_h_lowpass(halfH, full, 16, 24, 17);\
- put ## RND ## pixels16_l2_aligned1(halfH, halfH, full+1, 16, 16, 24, 17);\
- put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
- OPNAME ## pixels16_l2_aligned(dst, halfH+16, halfHV, stride, 16, 16, 16);\
-}\
-static void OPNAME ## qpel16_mc21_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t halfH[272];\
- uint8_t halfHV[256];\
- put ## RND ## mpeg4_qpel16_h_lowpass(halfH, src, 16, stride, 17);\
- put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
- OPNAME ## pixels16_l2_aligned(dst, halfH, halfHV, stride, 16, 16, 16);\
-}\
-static void OPNAME ## qpel16_mc23_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t halfH[272];\
- uint8_t halfHV[256];\
- put ## RND ## mpeg4_qpel16_h_lowpass(halfH, src, 16, stride, 17);\
- put ## RND ## mpeg4_qpel16_v_lowpass(halfHV, halfH, 16, 16);\
- OPNAME ## pixels16_l2_aligned(dst, halfH+16, halfHV, stride, 16, 16, 16);\
-}\
-static void OPNAME ## qpel16_mc12_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[24*17];\
- uint8_t halfH[272];\
- copy_block17(full, src, 24, stride, 17);\
- put ## RND ## mpeg4_qpel16_h_lowpass(halfH, full, 16, 24, 17);\
- put ## RND ## pixels16_l2_aligned(halfH, halfH, full, 16, 16, 24, 17);\
- OPNAME ## mpeg4_qpel16_v_lowpass(dst, halfH, stride, 16);\
-}\
-static void OPNAME ## qpel16_mc32_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[24*17];\
- uint8_t halfH[272];\
- copy_block17(full, src, 24, stride, 17);\
- put ## RND ## mpeg4_qpel16_h_lowpass(halfH, full, 16, 24, 17);\
- put ## RND ## pixels16_l2_aligned1(halfH, halfH, full+1, 16, 16, 24, 17);\
- OPNAME ## mpeg4_qpel16_v_lowpass(dst, halfH, stride, 16);\
-}\
-static void OPNAME ## qpel16_mc22_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t halfH[272];\
- put ## RND ## mpeg4_qpel16_h_lowpass(halfH, src, 16, stride, 17);\
- OPNAME ## mpeg4_qpel16_v_lowpass(dst, halfH, stride, 16);\
-}
-
-#define op_avg(a, b) a = (((a)+cm[((b) + 16)>>5]+1)>>1)
-#define op_avg_no_rnd(a, b) a = (((a)+cm[((b) + 15)>>5])>>1)
-#define op_put(a, b) a = cm[((b) + 16)>>5]
-#define op_put_no_rnd(a, b) a = cm[((b) + 15)>>5]
-
-QPEL_MC(0, put_ , _ , op_put)
-QPEL_MC(1, put_no_rnd_, _no_rnd_, op_put_no_rnd)
-QPEL_MC(0, avg_ , _ , op_avg)
-//QPEL_MC(1, avg_no_rnd , _ , op_avg)
-#undef op_avg
-#undef op_avg_no_rnd
-#undef op_put
-#undef op_put_no_rnd
-
-#define H264_LOWPASS(OPNAME, OP, OP2) \
-static inline void OPNAME ## h264_qpel_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,int w,int h){\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
- do {\
- int srcB,srcA,src0,src1,src2,src3,src4,src5,src6;\
- uint8_t *s = src-2;\
- srcB = *s++;\
- srcA = *s++;\
- src0 = *s++;\
- src1 = *s++;\
- src2 = *s++;\
- src3 = *s++;\
- OP(dst[0], (src0+src1)*20 - (srcA+src2)*5 + (srcB+src3));\
- src4 = *s++;\
- OP(dst[1], (src1+src2)*20 - (src0+src3)*5 + (srcA+src4));\
- src5 = *s++;\
- OP(dst[2], (src2+src3)*20 - (src1+src4)*5 + (src0+src5));\
- src6 = *s++;\
- OP(dst[3], (src3+src4)*20 - (src2+src5)*5 + (src1+src6));\
- if (w>4) { /* it optimized */ \
- int src7,src8,src9,src10; \
- src7 = *s++;\
- OP(dst[4], (src4+src5)*20 - (src3+src6)*5 + (src2+src7));\
- src8 = *s++;\
- OP(dst[5], (src5+src6)*20 - (src4+src7)*5 + (src3+src8));\
- src9 = *s++;\
- OP(dst[6], (src6+src7)*20 - (src5+src8)*5 + (src4+src9));\
- src10 = *s++;\
- OP(dst[7], (src7+src8)*20 - (src6+src9)*5 + (src5+src10));\
- if (w>8) { \
- int src11,src12,src13,src14,src15,src16,src17,src18; \
- src11 = *s++;\
- OP(dst[8] , (src8 +src9 )*20 - (src7 +src10)*5 + (src6 +src11));\
- src12 = *s++;\
- OP(dst[9] , (src9 +src10)*20 - (src8 +src11)*5 + (src7 +src12));\
- src13 = *s++;\
- OP(dst[10], (src10+src11)*20 - (src9 +src12)*5 + (src8 +src13));\
- src14 = *s++;\
- OP(dst[11], (src11+src12)*20 - (src10+src13)*5 + (src9 +src14));\
- src15 = *s++;\
- OP(dst[12], (src12+src13)*20 - (src11+src14)*5 + (src10+src15));\
- src16 = *s++;\
- OP(dst[13], (src13+src14)*20 - (src12+src15)*5 + (src11+src16));\
- src17 = *s++;\
- OP(dst[14], (src14+src15)*20 - (src13+src16)*5 + (src12+src17));\
- src18 = *s++;\
- OP(dst[15], (src15+src16)*20 - (src14+src17)*5 + (src13+src18));\
- } \
- } \
- dst+=dstStride;\
- src+=srcStride;\
- }while(--h);\
-}\
-\
-static inline void OPNAME ## h264_qpel_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,int w,int h){\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
- do{\
- int srcB,srcA,src0,src1,src2,src3,src4,src5,src6;\
- uint8_t *s = src-2*srcStride,*d=dst;\
- srcB = *s; s+=srcStride;\
- srcA = *s; s+=srcStride;\
- src0 = *s; s+=srcStride;\
- src1 = *s; s+=srcStride;\
- src2 = *s; s+=srcStride;\
- src3 = *s; s+=srcStride;\
- OP(*d, (src0+src1)*20 - (srcA+src2)*5 + (srcB+src3));d+=dstStride;\
- src4 = *s; s+=srcStride;\
- OP(*d, (src1+src2)*20 - (src0+src3)*5 + (srcA+src4));d+=dstStride;\
- src5 = *s; s+=srcStride;\
- OP(*d, (src2+src3)*20 - (src1+src4)*5 + (src0+src5));d+=dstStride;\
- src6 = *s; s+=srcStride;\
- OP(*d, (src3+src4)*20 - (src2+src5)*5 + (src1+src6));d+=dstStride;\
- if (h>4) { \
- int src7,src8,src9,src10; \
- src7 = *s; s+=srcStride;\
- OP(*d, (src4+src5)*20 - (src3+src6)*5 + (src2+src7));d+=dstStride;\
- src8 = *s; s+=srcStride;\
- OP(*d, (src5+src6)*20 - (src4+src7)*5 + (src3+src8));d+=dstStride;\
- src9 = *s; s+=srcStride;\
- OP(*d, (src6+src7)*20 - (src5+src8)*5 + (src4+src9));d+=dstStride;\
- src10 = *s; s+=srcStride;\
- OP(*d, (src7+src8)*20 - (src6+src9)*5 + (src5+src10));d+=dstStride;\
- if (h>8) { \
- int src11,src12,src13,src14,src15,src16,src17,src18; \
- src11 = *s; s+=srcStride;\
- OP(*d , (src8 +src9 )*20 - (src7 +src10)*5 + (src6 +src11));d+=dstStride;\
- src12 = *s; s+=srcStride;\
- OP(*d , (src9 +src10)*20 - (src8 +src11)*5 + (src7 +src12));d+=dstStride;\
- src13 = *s; s+=srcStride;\
- OP(*d, (src10+src11)*20 - (src9 +src12)*5 + (src8 +src13));d+=dstStride;\
- src14 = *s; s+=srcStride;\
- OP(*d, (src11+src12)*20 - (src10+src13)*5 + (src9 +src14));d+=dstStride;\
- src15 = *s; s+=srcStride;\
- OP(*d, (src12+src13)*20 - (src11+src14)*5 + (src10+src15));d+=dstStride;\
- src16 = *s; s+=srcStride;\
- OP(*d, (src13+src14)*20 - (src12+src15)*5 + (src11+src16));d+=dstStride;\
- src17 = *s; s+=srcStride;\
- OP(*d, (src14+src15)*20 - (src13+src16)*5 + (src12+src17));d+=dstStride;\
- src18 = *s; s+=srcStride;\
- OP(*d, (src15+src16)*20 - (src14+src17)*5 + (src13+src18));d+=dstStride;\
- } \
- } \
- dst++;\
- src++;\
- }while(--w);\
-}\
-\
-static inline void OPNAME ## h264_qpel_hv_lowpass(uint8_t *dst, int16_t *tmp, uint8_t *src, int dstStride, int tmpStride, int srcStride,int w,int h){\
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
- int i;\
- src -= 2*srcStride;\
- i= h+5; \
- do {\
- int srcB,srcA,src0,src1,src2,src3,src4,src5,src6;\
- uint8_t *s = src-2;\
- srcB = *s++;\
- srcA = *s++;\
- src0 = *s++;\
- src1 = *s++;\
- src2 = *s++;\
- src3 = *s++;\
- tmp[0] = ((src0+src1)*20 - (srcA+src2)*5 + (srcB+src3));\
- src4 = *s++;\
- tmp[1] = ((src1+src2)*20 - (src0+src3)*5 + (srcA+src4));\
- src5 = *s++;\
- tmp[2] = ((src2+src3)*20 - (src1+src4)*5 + (src0+src5));\
- src6 = *s++;\
- tmp[3] = ((src3+src4)*20 - (src2+src5)*5 + (src1+src6));\
- if (w>4) { /* it optimized */ \
- int src7,src8,src9,src10; \
- src7 = *s++;\
- tmp[4] = ((src4+src5)*20 - (src3+src6)*5 + (src2+src7));\
- src8 = *s++;\
- tmp[5] = ((src5+src6)*20 - (src4+src7)*5 + (src3+src8));\
- src9 = *s++;\
- tmp[6] = ((src6+src7)*20 - (src5+src8)*5 + (src4+src9));\
- src10 = *s++;\
- tmp[7] = ((src7+src8)*20 - (src6+src9)*5 + (src5+src10));\
- if (w>8) { \
- int src11,src12,src13,src14,src15,src16,src17,src18; \
- src11 = *s++;\
- tmp[8] = ((src8 +src9 )*20 - (src7 +src10)*5 + (src6 +src11));\
- src12 = *s++;\
- tmp[9] = ((src9 +src10)*20 - (src8 +src11)*5 + (src7 +src12));\
- src13 = *s++;\
- tmp[10] = ((src10+src11)*20 - (src9 +src12)*5 + (src8 +src13));\
- src14 = *s++;\
- tmp[11] = ((src11+src12)*20 - (src10+src13)*5 + (src9 +src14));\
- src15 = *s++;\
- tmp[12] = ((src12+src13)*20 - (src11+src14)*5 + (src10+src15));\
- src16 = *s++;\
- tmp[13] = ((src13+src14)*20 - (src12+src15)*5 + (src11+src16));\
- src17 = *s++;\
- tmp[14] = ((src14+src15)*20 - (src13+src16)*5 + (src12+src17));\
- src18 = *s++;\
- tmp[15] = ((src15+src16)*20 - (src14+src17)*5 + (src13+src18));\
- } \
- } \
- tmp+=tmpStride;\
- src+=srcStride;\
- }while(--i);\
- tmp -= tmpStride*(h+5-2);\
- i = w; \
- do {\
- int tmpB,tmpA,tmp0,tmp1,tmp2,tmp3,tmp4,tmp5,tmp6;\
- int16_t *s = tmp-2*tmpStride; \
- uint8_t *d=dst;\
- tmpB = *s; s+=tmpStride;\
- tmpA = *s; s+=tmpStride;\
- tmp0 = *s; s+=tmpStride;\
- tmp1 = *s; s+=tmpStride;\
- tmp2 = *s; s+=tmpStride;\
- tmp3 = *s; s+=tmpStride;\
- OP2(*d, (tmp0+tmp1)*20 - (tmpA+tmp2)*5 + (tmpB+tmp3));d+=dstStride;\
- tmp4 = *s; s+=tmpStride;\
- OP2(*d, (tmp1+tmp2)*20 - (tmp0+tmp3)*5 + (tmpA+tmp4));d+=dstStride;\
- tmp5 = *s; s+=tmpStride;\
- OP2(*d, (tmp2+tmp3)*20 - (tmp1+tmp4)*5 + (tmp0+tmp5));d+=dstStride;\
- tmp6 = *s; s+=tmpStride;\
- OP2(*d, (tmp3+tmp4)*20 - (tmp2+tmp5)*5 + (tmp1+tmp6));d+=dstStride;\
- if (h>4) { \
- int tmp7,tmp8,tmp9,tmp10; \
- tmp7 = *s; s+=tmpStride;\
- OP2(*d, (tmp4+tmp5)*20 - (tmp3+tmp6)*5 + (tmp2+tmp7));d+=dstStride;\
- tmp8 = *s; s+=tmpStride;\
- OP2(*d, (tmp5+tmp6)*20 - (tmp4+tmp7)*5 + (tmp3+tmp8));d+=dstStride;\
- tmp9 = *s; s+=tmpStride;\
- OP2(*d, (tmp6+tmp7)*20 - (tmp5+tmp8)*5 + (tmp4+tmp9));d+=dstStride;\
- tmp10 = *s; s+=tmpStride;\
- OP2(*d, (tmp7+tmp8)*20 - (tmp6+tmp9)*5 + (tmp5+tmp10));d+=dstStride;\
- if (h>8) { \
- int tmp11,tmp12,tmp13,tmp14,tmp15,tmp16,tmp17,tmp18; \
- tmp11 = *s; s+=tmpStride;\
- OP2(*d , (tmp8 +tmp9 )*20 - (tmp7 +tmp10)*5 + (tmp6 +tmp11));d+=dstStride;\
- tmp12 = *s; s+=tmpStride;\
- OP2(*d , (tmp9 +tmp10)*20 - (tmp8 +tmp11)*5 + (tmp7 +tmp12));d+=dstStride;\
- tmp13 = *s; s+=tmpStride;\
- OP2(*d, (tmp10+tmp11)*20 - (tmp9 +tmp12)*5 + (tmp8 +tmp13));d+=dstStride;\
- tmp14 = *s; s+=tmpStride;\
- OP2(*d, (tmp11+tmp12)*20 - (tmp10+tmp13)*5 + (tmp9 +tmp14));d+=dstStride;\
- tmp15 = *s; s+=tmpStride;\
- OP2(*d, (tmp12+tmp13)*20 - (tmp11+tmp14)*5 + (tmp10+tmp15));d+=dstStride;\
- tmp16 = *s; s+=tmpStride;\
- OP2(*d, (tmp13+tmp14)*20 - (tmp12+tmp15)*5 + (tmp11+tmp16));d+=dstStride;\
- tmp17 = *s; s+=tmpStride;\
- OP2(*d, (tmp14+tmp15)*20 - (tmp13+tmp16)*5 + (tmp12+tmp17));d+=dstStride;\
- tmp18 = *s; s+=tmpStride;\
- OP2(*d, (tmp15+tmp16)*20 - (tmp14+tmp17)*5 + (tmp13+tmp18));d+=dstStride;\
- } \
- } \
- dst++;\
- tmp++;\
- }while(--i);\
-}\
-\
-static void OPNAME ## h264_qpel4_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
- OPNAME ## h264_qpel_h_lowpass(dst,src,dstStride,srcStride,4,4); \
-}\
-static void OPNAME ## h264_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
- OPNAME ## h264_qpel_h_lowpass(dst,src,dstStride,srcStride,8,8); \
-}\
-static void OPNAME ## h264_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
- OPNAME ## h264_qpel_h_lowpass(dst,src,dstStride,srcStride,16,16); \
-}\
-\
-static void OPNAME ## h264_qpel4_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
- OPNAME ## h264_qpel_v_lowpass(dst,src,dstStride,srcStride,4,4); \
-}\
-static void OPNAME ## h264_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
- OPNAME ## h264_qpel_v_lowpass(dst,src,dstStride,srcStride,8,8); \
-}\
-static void OPNAME ## h264_qpel16_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
- OPNAME ## h264_qpel_v_lowpass(dst,src,dstStride,srcStride,16,16); \
-}\
-static void OPNAME ## h264_qpel4_hv_lowpass(uint8_t *dst, int16_t *tmp, uint8_t *src, int dstStride, int tmpStride, int srcStride){\
- OPNAME ## h264_qpel_hv_lowpass(dst,tmp,src,dstStride,tmpStride,srcStride,4,4); \
-}\
-static void OPNAME ## h264_qpel8_hv_lowpass(uint8_t *dst, int16_t *tmp, uint8_t *src, int dstStride, int tmpStride, int srcStride){\
- OPNAME ## h264_qpel_hv_lowpass(dst,tmp,src,dstStride,tmpStride,srcStride,8,8); \
-}\
-static void OPNAME ## h264_qpel16_hv_lowpass(uint8_t *dst, int16_t *tmp, uint8_t *src, int dstStride, int tmpStride, int srcStride){\
- OPNAME ## h264_qpel_hv_lowpass(dst,tmp,src,dstStride,tmpStride,srcStride,16,16); \
-}\
-
-#define H264_MC(OPNAME, SIZE) \
-static void OPNAME ## h264_qpel ## SIZE ## _mc00_sh4 (uint8_t *dst, uint8_t *src, int stride){\
- OPNAME ## pixels ## SIZE ## _c(dst, src, stride, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc10_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t half[SIZE*SIZE];\
- put_h264_qpel ## SIZE ## _h_lowpass(half, src, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_aligned2(dst, src, half, stride, stride, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc20_sh4(uint8_t *dst, uint8_t *src, int stride){\
- OPNAME ## h264_qpel ## SIZE ## _h_lowpass(dst, src, stride, stride);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc30_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t half[SIZE*SIZE];\
- put_h264_qpel ## SIZE ## _h_lowpass(half, src, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_aligned2(dst, src+1, half, stride, stride, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc01_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)];\
- uint8_t * const full_mid= full + SIZE*2;\
- uint8_t half[SIZE*SIZE];\
- copy_block ## SIZE (full, src - stride*2, SIZE, stride, SIZE + 5);\
- put_h264_qpel ## SIZE ## _v_lowpass(half, full_mid, SIZE, SIZE);\
- OPNAME ## pixels ## SIZE ## _l2_aligned(dst, full_mid, half, stride, SIZE, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc02_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)];\
- uint8_t * const full_mid= full + SIZE*2;\
- copy_block ## SIZE (full, src - stride*2, SIZE, stride, SIZE + 5);\
- OPNAME ## h264_qpel ## SIZE ## _v_lowpass(dst, full_mid, stride, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc03_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)];\
- uint8_t * const full_mid= full + SIZE*2;\
- uint8_t half[SIZE*SIZE];\
- copy_block ## SIZE (full, src - stride*2, SIZE, stride, SIZE + 5);\
- put_h264_qpel ## SIZE ## _v_lowpass(half, full_mid, SIZE, SIZE);\
- OPNAME ## pixels ## SIZE ## _l2_aligned(dst, full_mid+SIZE, half, stride, SIZE, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc11_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)];\
- uint8_t * const full_mid= full + SIZE*2;\
- uint8_t halfH[SIZE*SIZE];\
- uint8_t halfV[SIZE*SIZE];\
- put_h264_qpel ## SIZE ## _h_lowpass(halfH, src, SIZE, stride);\
- copy_block ## SIZE (full, src - stride*2, SIZE, stride, SIZE + 5);\
- put_h264_qpel ## SIZE ## _v_lowpass(halfV, full_mid, SIZE, SIZE);\
- OPNAME ## pixels ## SIZE ## _l2_aligned(dst, halfH, halfV, stride, SIZE, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc31_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)];\
- uint8_t * const full_mid= full + SIZE*2;\
- uint8_t halfH[SIZE*SIZE];\
- uint8_t halfV[SIZE*SIZE];\
- put_h264_qpel ## SIZE ## _h_lowpass(halfH, src, SIZE, stride);\
- copy_block ## SIZE (full, src - stride*2 + 1, SIZE, stride, SIZE + 5);\
- put_h264_qpel ## SIZE ## _v_lowpass(halfV, full_mid, SIZE, SIZE);\
- OPNAME ## pixels ## SIZE ## _l2_aligned(dst, halfH, halfV, stride, SIZE, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc13_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)];\
- uint8_t * const full_mid= full + SIZE*2;\
- uint8_t halfH[SIZE*SIZE];\
- uint8_t halfV[SIZE*SIZE];\
- put_h264_qpel ## SIZE ## _h_lowpass(halfH, src + stride, SIZE, stride);\
- copy_block ## SIZE (full, src - stride*2, SIZE, stride, SIZE + 5);\
- put_h264_qpel ## SIZE ## _v_lowpass(halfV, full_mid, SIZE, SIZE);\
- OPNAME ## pixels ## SIZE ## _l2_aligned(dst, halfH, halfV, stride, SIZE, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc33_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)];\
- uint8_t * const full_mid= full + SIZE*2;\
- uint8_t halfH[SIZE*SIZE];\
- uint8_t halfV[SIZE*SIZE];\
- put_h264_qpel ## SIZE ## _h_lowpass(halfH, src + stride, SIZE, stride);\
- copy_block ## SIZE (full, src - stride*2 + 1, SIZE, stride, SIZE + 5);\
- put_h264_qpel ## SIZE ## _v_lowpass(halfV, full_mid, SIZE, SIZE);\
- OPNAME ## pixels ## SIZE ## _l2_aligned(dst, halfH, halfV, stride, SIZE, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc22_sh4(uint8_t *dst, uint8_t *src, int stride){\
- int16_t tmp[SIZE*(SIZE+5)];\
- OPNAME ## h264_qpel ## SIZE ## _hv_lowpass(dst, tmp, src, stride, SIZE, stride);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc21_sh4(uint8_t *dst, uint8_t *src, int stride){\
- int16_t tmp[SIZE*(SIZE+5)];\
- uint8_t halfH[SIZE*SIZE];\
- uint8_t halfHV[SIZE*SIZE];\
- put_h264_qpel ## SIZE ## _h_lowpass(halfH, src, SIZE, stride);\
- put_h264_qpel ## SIZE ## _hv_lowpass(halfHV, tmp, src, SIZE, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_aligned(dst, halfH, halfHV, stride, SIZE, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc23_sh4(uint8_t *dst, uint8_t *src, int stride){\
- int16_t tmp[SIZE*(SIZE+5)];\
- uint8_t halfH[SIZE*SIZE];\
- uint8_t halfHV[SIZE*SIZE];\
- put_h264_qpel ## SIZE ## _h_lowpass(halfH, src + stride, SIZE, stride);\
- put_h264_qpel ## SIZE ## _hv_lowpass(halfHV, tmp, src, SIZE, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_aligned(dst, halfH, halfHV, stride, SIZE, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc12_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)];\
- uint8_t * const full_mid= full + SIZE*2;\
- int16_t tmp[SIZE*(SIZE+5)];\
- uint8_t halfV[SIZE*SIZE];\
- uint8_t halfHV[SIZE*SIZE];\
- copy_block ## SIZE (full, src - stride*2, SIZE, stride, SIZE + 5);\
- put_h264_qpel ## SIZE ## _v_lowpass(halfV, full_mid, SIZE, SIZE);\
- put_h264_qpel ## SIZE ## _hv_lowpass(halfHV, tmp, src, SIZE, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_aligned(dst, halfV, halfHV, stride, SIZE, SIZE, SIZE);\
-}\
-\
-static void OPNAME ## h264_qpel ## SIZE ## _mc32_sh4(uint8_t *dst, uint8_t *src, int stride){\
- uint8_t full[SIZE*(SIZE+5)];\
- uint8_t * const full_mid= full + SIZE*2;\
- int16_t tmp[SIZE*(SIZE+5)];\
- uint8_t halfV[SIZE*SIZE];\
- uint8_t halfHV[SIZE*SIZE];\
- copy_block ## SIZE (full, src - stride*2 + 1, SIZE, stride, SIZE + 5);\
- put_h264_qpel ## SIZE ## _v_lowpass(halfV, full_mid, SIZE, SIZE);\
- put_h264_qpel ## SIZE ## _hv_lowpass(halfHV, tmp, src, SIZE, SIZE, stride);\
- OPNAME ## pixels ## SIZE ## _l2_aligned(dst, halfV, halfHV, stride, SIZE, SIZE, SIZE);\
-}\
-
-#define op_avg(a, b) a = (((a)+cm[((b) + 16)>>5]+1)>>1)
-//#define op_avg2(a, b) a = (((a)*w1+cm[((b) + 16)>>5]*w2 + o + 64)>>7)
-#define op_put(a, b) a = cm[((b) + 16)>>5]
-#define op2_avg(a, b) a = (((a)+cm[((b) + 512)>>10]+1)>>1)
-#define op2_put(a, b) a = cm[((b) + 512)>>10]
-
-H264_LOWPASS(put_ , op_put, op2_put)
-H264_LOWPASS(avg_ , op_avg, op2_avg)
-H264_MC(put_, 4)
-H264_MC(put_, 8)
-H264_MC(put_, 16)
-H264_MC(avg_, 4)
-H264_MC(avg_, 8)
-H264_MC(avg_, 16)
-
-#undef op_avg
-#undef op_put
-#undef op2_avg
-#undef op2_put
-
-static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
-
- do{
- int src_1,src0,src1,src2,src3,src4,src5,src6,src7,src8,src9;
- uint8_t *s = src;
- src_1 = s[-1];
- src0 = *s++;
- src1 = *s++;
- src2 = *s++;
- dst[0]= cm[(9*(src0 + src1) - (src_1 + src2) + 8)>>4];
- src3 = *s++;
- dst[1]= cm[(9*(src1 + src2) - (src0 + src3) + 8)>>4];
- src4 = *s++;
- dst[2]= cm[(9*(src2 + src3) - (src1 + src4) + 8)>>4];
- src5 = *s++;
- dst[3]= cm[(9*(src3 + src4) - (src2 + src5) + 8)>>4];
- src6 = *s++;
- dst[4]= cm[(9*(src4 + src5) - (src3 + src6) + 8)>>4];
- src7 = *s++;
- dst[5]= cm[(9*(src5 + src6) - (src4 + src7) + 8)>>4];
- src8 = *s++;
- dst[6]= cm[(9*(src6 + src7) - (src5 + src8) + 8)>>4];
- src9 = *s++;
- dst[7]= cm[(9*(src7 + src8) - (src6 + src9) + 8)>>4];
- dst+=dstStride;
- src+=srcStride;
- }while(--h);
-}
-
-static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int w){
- uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
-
- do{
- int src_1,src0,src1,src2,src3,src4,src5,src6,src7,src8,src9;
- uint8_t *s = src,*d = dst;
- src_1 = *(s-srcStride);
- src0 = *s; s+=srcStride;
- src1 = *s; s+=srcStride;
- src2 = *s; s+=srcStride;
- *d= cm[(9*(src0 + src1) - (src_1 + src2) + 8)>>4]; d+=dstStride;
- src3 = *s; s+=srcStride;
- *d= cm[(9*(src1 + src2) - (src0 + src3) + 8)>>4]; d+=dstStride;
- src4 = *s; s+=srcStride;
- *d= cm[(9*(src2 + src3) - (src1 + src4) + 8)>>4]; d+=dstStride;
- src5 = *s; s+=srcStride;
- *d= cm[(9*(src3 + src4) - (src2 + src5) + 8)>>4]; d+=dstStride;
- src6 = *s; s+=srcStride;
- *d= cm[(9*(src4 + src5) - (src3 + src6) + 8)>>4]; d+=dstStride;
- src7 = *s; s+=srcStride;
- *d= cm[(9*(src5 + src6) - (src4 + src7) + 8)>>4]; d+=dstStride;
- src8 = *s; s+=srcStride;
- *d= cm[(9*(src6 + src7) - (src5 + src8) + 8)>>4]; d+=dstStride;
- src9 = *s;
- *d= cm[(9*(src7 + src8) - (src6 + src9) + 8)>>4]; d+=dstStride;
- src++;
- dst++;
- }while(--w);
-}
-
-static void put_mspel8_mc00_sh4 (uint8_t *dst, uint8_t *src, int stride){
- put_pixels8_c(dst, src, stride, 8);
-}
-
-static void put_mspel8_mc10_sh4(uint8_t *dst, uint8_t *src, int stride){
- uint8_t half[64];
- wmv2_mspel8_h_lowpass(half, src, 8, stride, 8);
- put_pixels8_l2_aligned2(dst, src, half, stride, stride, 8, 8);
-}
-
-static void put_mspel8_mc20_sh4(uint8_t *dst, uint8_t *src, int stride){
- wmv2_mspel8_h_lowpass(dst, src, stride, stride, 8);
-}
-
-static void put_mspel8_mc30_sh4(uint8_t *dst, uint8_t *src, int stride){
- uint8_t half[64];
- wmv2_mspel8_h_lowpass(half, src, 8, stride, 8);
- put_pixels8_l2_aligned2(dst, src+1, half, stride, stride, 8, 8);
-}
-
-static void put_mspel8_mc02_sh4(uint8_t *dst, uint8_t *src, int stride){
- wmv2_mspel8_v_lowpass(dst, src, stride, stride, 8);
-}
-
-static void put_mspel8_mc12_sh4(uint8_t *dst, uint8_t *src, int stride){
- uint8_t halfH[88];
- uint8_t halfV[64];
- uint8_t halfHV[64];
- wmv2_mspel8_h_lowpass(halfH, src-stride, 8, stride, 11);
- wmv2_mspel8_v_lowpass(halfV, src, 8, stride, 8);
- wmv2_mspel8_v_lowpass(halfHV, halfH+8, 8, 8, 8);
- put_pixels8_l2_aligned(dst, halfV, halfHV, stride, 8, 8, 8);
-}
-static void put_mspel8_mc32_sh4(uint8_t *dst, uint8_t *src, int stride){
- uint8_t halfH[88];
- uint8_t halfV[64];
- uint8_t halfHV[64];
- wmv2_mspel8_h_lowpass(halfH, src-stride, 8, stride, 11);
- wmv2_mspel8_v_lowpass(halfV, src+1, 8, stride, 8);
- wmv2_mspel8_v_lowpass(halfHV, halfH+8, 8, 8, 8);
- put_pixels8_l2_aligned(dst, halfV, halfHV, stride, 8, 8, 8);
-}
-static void put_mspel8_mc22_sh4(uint8_t *dst, uint8_t *src, int stride){
- uint8_t halfH[88];
- wmv2_mspel8_h_lowpass(halfH, src-stride, 8, stride, 11);
- wmv2_mspel8_v_lowpass(dst, halfH+8, stride, 8, 8);
-}

libav-v9.6.tar.bz2/libavcodec/snow.c Deleted

@@ -1,678 +0,0 @@
-/*
- * Copyright (C) 2004 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavutil/intmath.h"
-#include "libavutil/log.h"
-#include "libavutil/opt.h"
-#include "avcodec.h"
-#include "dsputil.h"
-#include "dwt.h"
-#include "internal.h"
-#include "snow.h"
-#include "snowdata.h"
-
-#include "rangecoder.h"
-#include "mathops.h"
-#include "h263.h"
-
-#undef NDEBUG
-#include <assert.h>
-
-
-void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h,
- int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8){
- int y, x;
- IDWTELEM * dst;
- for(y=0; y<b_h; y++){
- //FIXME ugly misuse of obmc_stride
- const uint8_t *obmc1= obmc + y*obmc_stride;
- const uint8_t *obmc2= obmc1+ (obmc_stride>>1);
- const uint8_t *obmc3= obmc1+ obmc_stride*(obmc_stride>>1);
- const uint8_t *obmc4= obmc3+ (obmc_stride>>1);
- dst = slice_buffer_get_line(sb, src_y + y);
- for(x=0; x<b_w; x++){
- int v= obmc1[x] * block[3][x + y*src_stride]
- +obmc2[x] * block[2][x + y*src_stride]
- +obmc3[x] * block[1][x + y*src_stride]
- +obmc4[x] * block[0][x + y*src_stride];
-
- v <<= 8 - LOG2_OBMC_MAX;
- if(FRAC_BITS != 8){
- v >>= 8 - FRAC_BITS;
- }
- if(add){
- v += dst[x + src_x];
- v = (v + (1<<(FRAC_BITS-1))) >> FRAC_BITS;
- if(v&(~255)) v= ~(v>>31);
- dst8[x + y*src_stride] = v;
- }else{
- dst[x + src_x] -= v;
- }
- }
- }
-}
-
-void ff_snow_reset_contexts(SnowContext *s){ //FIXME better initial contexts
- int plane_index, level, orientation;
-
- for(plane_index=0; plane_index<3; plane_index++){
- for(level=0; level<MAX_DECOMPOSITIONS; level++){
- for(orientation=level ? 1:0; orientation<4; orientation++){
- memset(s->plane[plane_index].band[level][orientation].state, MID_STATE, sizeof(s->plane[plane_index].band[level][orientation].state));
- }
- }
- }
- memset(s->header_state, MID_STATE, sizeof(s->header_state));
- memset(s->block_state, MID_STATE, sizeof(s->block_state));
-}
-
-int ff_snow_alloc_blocks(SnowContext *s){
- int w= -((-s->avctx->width )>>LOG2_MB_SIZE);
- int h= -((-s->avctx->height)>>LOG2_MB_SIZE);
-
- s->b_width = w;
- s->b_height= h;
-
- av_free(s->block);
- s->block= av_mallocz(w * h * sizeof(BlockNode) << (s->block_max_depth*2));
- return 0;
-}
-
-static void init_qexp(void){
- int i;
- double v=128;
-
- for(i=0; i<QROOT; i++){
- ff_qexp[i]= lrintf(v);
- v *= pow(2, 1.0 / QROOT);
- }
-}
-static void mc_block(Plane *p, uint8_t *dst, const uint8_t *src, int stride, int b_w, int b_h, int dx, int dy){
- static const uint8_t weight[64]={
- 8,7,6,5,4,3,2,1,
- 7,7,0,0,0,0,0,1,
- 6,0,6,0,0,0,2,0,
- 5,0,0,5,0,3,0,0,
- 4,0,0,0,4,0,0,0,
- 3,0,0,5,0,3,0,0,
- 2,0,6,0,0,0,2,0,
- 1,7,0,0,0,0,0,1,
- };
-
- static const uint8_t brane[256]={
- 0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x11,0x12,0x12,0x12,0x12,0x12,0x12,0x12,
- 0x04,0x05,0xcc,0xcc,0xcc,0xcc,0xcc,0x41,0x15,0x16,0xcc,0xcc,0xcc,0xcc,0xcc,0x52,
- 0x04,0xcc,0x05,0xcc,0xcc,0xcc,0x41,0xcc,0x15,0xcc,0x16,0xcc,0xcc,0xcc,0x52,0xcc,
- 0x04,0xcc,0xcc,0x05,0xcc,0x41,0xcc,0xcc,0x15,0xcc,0xcc,0x16,0xcc,0x52,0xcc,0xcc,
- 0x04,0xcc,0xcc,0xcc,0x41,0xcc,0xcc,0xcc,0x15,0xcc,0xcc,0xcc,0x16,0xcc,0xcc,0xcc,
- 0x04,0xcc,0xcc,0x41,0xcc,0x05,0xcc,0xcc,0x15,0xcc,0xcc,0x52,0xcc,0x16,0xcc,0xcc,
- 0x04,0xcc,0x41,0xcc,0xcc,0xcc,0x05,0xcc,0x15,0xcc,0x52,0xcc,0xcc,0xcc,0x16,0xcc,
- 0x04,0x41,0xcc,0xcc,0xcc,0xcc,0xcc,0x05,0x15,0x52,0xcc,0xcc,0xcc,0xcc,0xcc,0x16,
- 0x44,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x55,0x56,0x56,0x56,0x56,0x56,0x56,0x56,
- 0x48,0x49,0xcc,0xcc,0xcc,0xcc,0xcc,0x85,0x59,0x5A,0xcc,0xcc,0xcc,0xcc,0xcc,0x96,
- 0x48,0xcc,0x49,0xcc,0xcc,0xcc,0x85,0xcc,0x59,0xcc,0x5A,0xcc,0xcc,0xcc,0x96,0xcc,
- 0x48,0xcc,0xcc,0x49,0xcc,0x85,0xcc,0xcc,0x59,0xcc,0xcc,0x5A,0xcc,0x96,0xcc,0xcc,
- 0x48,0xcc,0xcc,0xcc,0x49,0xcc,0xcc,0xcc,0x59,0xcc,0xcc,0xcc,0x96,0xcc,0xcc,0xcc,
- 0x48,0xcc,0xcc,0x85,0xcc,0x49,0xcc,0xcc,0x59,0xcc,0xcc,0x96,0xcc,0x5A,0xcc,0xcc,
- 0x48,0xcc,0x85,0xcc,0xcc,0xcc,0x49,0xcc,0x59,0xcc,0x96,0xcc,0xcc,0xcc,0x5A,0xcc,
- 0x48,0x85,0xcc,0xcc,0xcc,0xcc,0xcc,0x49,0x59,0x96,0xcc,0xcc,0xcc,0xcc,0xcc,0x5A,
- };
-
- static const uint8_t needs[16]={
- 0,1,0,0,
- 2,4,2,0,
- 0,1,0,0,
- 15
- };
-
- int x, y, b, r, l;
- int16_t tmpIt [64*(32+HTAPS_MAX)];
- uint8_t tmp2t[3][64*(32+HTAPS_MAX)];
- int16_t *tmpI= tmpIt;
- uint8_t *tmp2= tmp2t[0];
- const uint8_t *hpel[11];
- assert(dx<16 && dy<16);
- r= brane[dx + 16*dy]&15;
- l= brane[dx + 16*dy]>>4;
-
- b= needs[l] | needs[r];
- if(p && !p->diag_mc)
- b= 15;
-
- if(b&5){
- for(y=0; y < b_h+HTAPS_MAX-1; y++){
- for(x=0; x < b_w; x++){
- int a_1=src[x + HTAPS_MAX/2-4];
- int a0= src[x + HTAPS_MAX/2-3];
- int a1= src[x + HTAPS_MAX/2-2];
- int a2= src[x + HTAPS_MAX/2-1];
- int a3= src[x + HTAPS_MAX/2+0];
- int a4= src[x + HTAPS_MAX/2+1];
- int a5= src[x + HTAPS_MAX/2+2];
- int a6= src[x + HTAPS_MAX/2+3];
- int am=0;
- if(!p || p->fast_mc){
- am= 20*(a2+a3) - 5*(a1+a4) + (a0+a5);
- tmpI[x]= am;
- am= (am+16)>>5;
- }else{
- am= p->hcoeff[0]*(a2+a3) + p->hcoeff[1]*(a1+a4) + p->hcoeff[2]*(a0+a5) + p->hcoeff[3]*(a_1+a6);
- tmpI[x]= am;
- am= (am+32)>>6;
- }
-
- if(am&(~255)) am= ~(am>>31);
- tmp2[x]= am;
- }
- tmpI+= 64;
- tmp2+= 64;
- src += stride;
- }
- src -= stride*y;
- }
- src += HTAPS_MAX/2 - 1;
- tmp2= tmp2t[1];
-
- if(b&2){
- for(y=0; y < b_h; y++){
- for(x=0; x < b_w+1; x++){
- int a_1=src[x + (HTAPS_MAX/2-4)*stride];
- int a0= src[x + (HTAPS_MAX/2-3)*stride];
- int a1= src[x + (HTAPS_MAX/2-2)*stride];
- int a2= src[x + (HTAPS_MAX/2-1)*stride];
- int a3= src[x + (HTAPS_MAX/2+0)*stride];
- int a4= src[x + (HTAPS_MAX/2+1)*stride];
- int a5= src[x + (HTAPS_MAX/2+2)*stride];
- int a6= src[x + (HTAPS_MAX/2+3)*stride];
- int am=0;
- if(!p || p->fast_mc)
- am= (20*(a2+a3) - 5*(a1+a4) + (a0+a5) + 16)>>5;
- else
- am= (p->hcoeff[0]*(a2+a3) + p->hcoeff[1]*(a1+a4) + p->hcoeff[2]*(a0+a5) + p->hcoeff[3]*(a_1+a6) + 32)>>6;
-
- if(am&(~255)) am= ~(am>>31);
- tmp2[x]= am;
- }
- src += stride;
- tmp2+= 64;
- }
- src -= stride*y;
- }
- src += stride*(HTAPS_MAX/2 - 1);
- tmp2= tmp2t[2];
- tmpI= tmpIt;
- if(b&4){
- for(y=0; y < b_h; y++){
- for(x=0; x < b_w; x++){
- int a_1=tmpI[x + (HTAPS_MAX/2-4)*64];
- int a0= tmpI[x + (HTAPS_MAX/2-3)*64];
- int a1= tmpI[x + (HTAPS_MAX/2-2)*64];
- int a2= tmpI[x + (HTAPS_MAX/2-1)*64];
- int a3= tmpI[x + (HTAPS_MAX/2+0)*64];
- int a4= tmpI[x + (HTAPS_MAX/2+1)*64];
- int a5= tmpI[x + (HTAPS_MAX/2+2)*64];
- int a6= tmpI[x + (HTAPS_MAX/2+3)*64];
- int am=0;
- if(!p || p->fast_mc)
- am= (20*(a2+a3) - 5*(a1+a4) + (a0+a5) + 512)>>10;
- else
- am= (p->hcoeff[0]*(a2+a3) + p->hcoeff[1]*(a1+a4) + p->hcoeff[2]*(a0+a5) + p->hcoeff[3]*(a_1+a6) + 2048)>>12;
- if(am&(~255)) am= ~(am>>31);
- tmp2[x]= am;
- }
- tmpI+= 64;
- tmp2+= 64;
- }
- }
-
- hpel[ 0]= src;
- hpel[ 1]= tmp2t[0] + 64*(HTAPS_MAX/2-1);
- hpel[ 2]= src + 1;
-
- hpel[ 4]= tmp2t[1];
- hpel[ 5]= tmp2t[2];
- hpel[ 6]= tmp2t[1] + 1;
-
- hpel[ 8]= src + stride;
- hpel[ 9]= hpel[1] + 64;
- hpel[10]= hpel[8] + 1;
-
-#define MC_STRIDE(x) (needs[x] ? 64 : stride)
-
- if(b==15){
- int dxy = dx / 8 + dy / 8 * 4;
- const uint8_t *src1 = hpel[dxy ];
- const uint8_t *src2 = hpel[dxy + 1];
- const uint8_t *src3 = hpel[dxy + 4];
- const uint8_t *src4 = hpel[dxy + 5];
- int stride1 = MC_STRIDE(dxy);
- int stride2 = MC_STRIDE(dxy + 1);
- int stride3 = MC_STRIDE(dxy + 4);
- int stride4 = MC_STRIDE(dxy + 5);
- dx&=7;
- dy&=7;
- for(y=0; y < b_h; y++){
- for(x=0; x < b_w; x++){
- dst[x]= ((8-dx)*(8-dy)*src1[x] + dx*(8-dy)*src2[x]+
- (8-dx)* dy *src3[x] + dx* dy *src4[x]+32)>>6;
- }
- src1+=stride1;
- src2+=stride2;
- src3+=stride3;
- src4+=stride4;
- dst +=stride;
- }
- }else{
- const uint8_t *src1= hpel[l];
- const uint8_t *src2= hpel[r];
- int stride1 = MC_STRIDE(l);
- int stride2 = MC_STRIDE(r);
- int a= weight[((dx&7) + (8*(dy&7)))];
- int b= 8-a;
- for(y=0; y < b_h; y++){
- for(x=0; x < b_w; x++){
- dst[x]= (a*src1[x] + b*src2[x] + 4)>>3;
- }
- src1+=stride1;
- src2+=stride2;
- dst +=stride;
- }
- }
-}
-
-void ff_snow_pred_block(SnowContext *s, uint8_t *dst, uint8_t *tmp, int stride, int sx, int sy, int b_w, int b_h, BlockNode *block, int plane_index, int w, int h){
- if(block->type & BLOCK_INTRA){
- int x, y;
- const unsigned color = block->color[plane_index];
- const unsigned color4 = color*0x01010101;
- if(b_w==32){
- for(y=0; y < b_h; y++){
- *(uint32_t*)&dst[0 + y*stride]= color4;
- *(uint32_t*)&dst[4 + y*stride]= color4;
- *(uint32_t*)&dst[8 + y*stride]= color4;
- *(uint32_t*)&dst[12+ y*stride]= color4;
- *(uint32_t*)&dst[16+ y*stride]= color4;
- *(uint32_t*)&dst[20+ y*stride]= color4;
- *(uint32_t*)&dst[24+ y*stride]= color4;
- *(uint32_t*)&dst[28+ y*stride]= color4;
- }
- }else if(b_w==16){
- for(y=0; y < b_h; y++){
- *(uint32_t*)&dst[0 + y*stride]= color4;
- *(uint32_t*)&dst[4 + y*stride]= color4;
- *(uint32_t*)&dst[8 + y*stride]= color4;
- *(uint32_t*)&dst[12+ y*stride]= color4;
- }
- }else if(b_w==8){
- for(y=0; y < b_h; y++){
- *(uint32_t*)&dst[0 + y*stride]= color4;
- *(uint32_t*)&dst[4 + y*stride]= color4;
- }
- }else if(b_w==4){
- for(y=0; y < b_h; y++){
- *(uint32_t*)&dst[0 + y*stride]= color4;
- }
- }else{
- for(y=0; y < b_h; y++){
- for(x=0; x < b_w; x++){
- dst[x + y*stride]= color;
- }
- }
- }
- }else{
- uint8_t *src= s->last_picture[block->ref].data[plane_index];
- const int scale= plane_index ? s->mv_scale : 2*s->mv_scale;
- int mx= block->mx*scale;
- int my= block->my*scale;
- const int dx= mx&15;
- const int dy= my&15;
- const int tab_index= 3 - (b_w>>2) + (b_w>>4);
- sx += (mx>>4) - (HTAPS_MAX/2-1);
- sy += (my>>4) - (HTAPS_MAX/2-1);
- src += sx + sy*stride;
- if( (unsigned)sx >= w - b_w - (HTAPS_MAX-2)
- || (unsigned)sy >= h - b_h - (HTAPS_MAX-2)){
- s->vdsp.emulated_edge_mc(tmp + MB_SIZE, src, stride, b_w+HTAPS_MAX-1, b_h+HTAPS_MAX-1, sx, sy, w, h);
- src= tmp + MB_SIZE;
- }
-// assert(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h);
-// assert(!(b_w&(b_w-1)));
- assert(b_w>1 && b_h>1);
- assert((tab_index>=0 && tab_index<4) || b_w==32);
- if((dx&3) || (dy&3) || !(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h) || (b_w&(b_w-1)) || !s->plane[plane_index].fast_mc )
- mc_block(&s->plane[plane_index], dst, src, stride, b_w, b_h, dx, dy);
- else if(b_w==32){
- int y;
- for(y=0; y<b_h; y+=16){
- s->dsp.put_h264_qpel_pixels_tab[0][dy+(dx>>2)](dst + y*stride, src + 3 + (y+3)*stride,stride);
- s->dsp.put_h264_qpel_pixels_tab[0][dy+(dx>>2)](dst + 16 + y*stride, src + 19 + (y+3)*stride,stride);
- }
- }else if(b_w==b_h)
- s->dsp.put_h264_qpel_pixels_tab[tab_index ][dy+(dx>>2)](dst,src + 3 + 3*stride,stride);
- else if(b_w==2*b_h){
- s->dsp.put_h264_qpel_pixels_tab[tab_index+1][dy+(dx>>2)](dst ,src + 3 + 3*stride,stride);
- s->dsp.put_h264_qpel_pixels_tab[tab_index+1][dy+(dx>>2)](dst+b_h,src + 3 + b_h + 3*stride,stride);
- }else{
- assert(2*b_w==b_h);
- s->dsp.put_h264_qpel_pixels_tab[tab_index ][dy+(dx>>2)](dst ,src + 3 + 3*stride ,stride);
- s->dsp.put_h264_qpel_pixels_tab[tab_index ][dy+(dx>>2)](dst+b_w*stride,src + 3 + 3*stride+b_w*stride,stride);
- }
- }
-}
-
-#define mca(dx,dy,b_w)\
-static void mc_block_hpel ## dx ## dy ## b_w(uint8_t *dst, const uint8_t *src, int stride, int h){\
- assert(h==b_w);\
- mc_block(NULL, dst, src-(HTAPS_MAX/2-1)-(HTAPS_MAX/2-1)*stride, stride, b_w, b_w, dx, dy);\
-}
-
-mca( 0, 0,16)
-mca( 8, 0,16)
-mca( 0, 8,16)
-mca( 8, 8,16)
-mca( 0, 0,8)
-mca( 8, 0,8)
-mca( 0, 8,8)
-mca( 8, 8,8)
-
-av_cold int ff_snow_common_init(AVCodecContext *avctx){
- SnowContext *s = avctx->priv_data;
- int width, height;
- int i, j, ret;
- int emu_buf_size;
-
- s->avctx= avctx;
- s->max_ref_frames=1; //just make sure its not an invalid value in case of no initial keyframe
-
- ff_dsputil_init(&s->dsp, avctx);
- ff_videodsp_init(&s->vdsp, 8);
- ff_dwt_init(&s->dwt);
-
-#define mcf(dx,dy)\
- s->dsp.put_qpel_pixels_tab [0][dy+dx/4]=\
- s->dsp.put_no_rnd_qpel_pixels_tab[0][dy+dx/4]=\
- s->dsp.put_h264_qpel_pixels_tab[0][dy+dx/4];\
- s->dsp.put_qpel_pixels_tab [1][dy+dx/4]=\
- s->dsp.put_no_rnd_qpel_pixels_tab[1][dy+dx/4]=\
- s->dsp.put_h264_qpel_pixels_tab[1][dy+dx/4];
-
- mcf( 0, 0)
- mcf( 4, 0)
- mcf( 8, 0)
- mcf(12, 0)
- mcf( 0, 4)
- mcf( 4, 4)
- mcf( 8, 4)
- mcf(12, 4)
- mcf( 0, 8)
- mcf( 4, 8)
- mcf( 8, 8)
- mcf(12, 8)
- mcf( 0,12)
- mcf( 4,12)
- mcf( 8,12)
- mcf(12,12)
-
-#define mcfh(dx,dy)\
- s->dsp.put_pixels_tab [0][dy/4+dx/8]=\
- s->dsp.put_no_rnd_pixels_tab[0][dy/4+dx/8]=\
- mc_block_hpel ## dx ## dy ## 16;\
- s->dsp.put_pixels_tab [1][dy/4+dx/8]=\
- s->dsp.put_no_rnd_pixels_tab[1][dy/4+dx/8]=\
- mc_block_hpel ## dx ## dy ## 8;
-
- mcfh(0, 0)
- mcfh(8, 0)
- mcfh(0, 8)
- mcfh(8, 8)
-
- init_qexp();
-
-// dec += FFMAX(s->chroma_h_shift, s->chroma_v_shift);
-
- width= s->avctx->width;
- height= s->avctx->height;
-
- FF_ALLOCZ_OR_GOTO(avctx, s->spatial_idwt_buffer, width * height * sizeof(IDWTELEM), fail);
- FF_ALLOCZ_OR_GOTO(avctx, s->spatial_dwt_buffer, width * height * sizeof(DWTELEM), fail); //FIXME this does not belong here
- FF_ALLOCZ_OR_GOTO(avctx, s->temp_dwt_buffer, width * sizeof(DWTELEM), fail);
- FF_ALLOCZ_OR_GOTO(avctx, s->temp_idwt_buffer, width * sizeof(IDWTELEM), fail);
- FF_ALLOC_OR_GOTO(avctx, s->run_buffer, ((width + 1) >> 1) * ((height + 1) >> 1) * sizeof(*s->run_buffer), fail);
-
- for(i=0; i<MAX_REF_FRAMES; i++)
- for(j=0; j<MAX_REF_FRAMES; j++)
- ff_scale_mv_ref[i][j] = 256*(i+1)/(j+1);
-
- if ((ret = ff_get_buffer(s->avctx, &s->mconly_picture)) < 0) {
- av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return ret;
- }
- FF_ALLOC_OR_GOTO(avctx, s->scratchbuf, s->mconly_picture.linesize[0]*7*MB_SIZE, fail);
- emu_buf_size = s->mconly_picture.linesize[0] * (2 * MB_SIZE + HTAPS_MAX - 1);
- FF_ALLOC_OR_GOTO(avctx, s->emu_edge_buffer, emu_buf_size, fail);
-
- return 0;
-fail:
- return AVERROR(ENOMEM);
-}
-
-int ff_snow_common_init_after_header(AVCodecContext *avctx) {
- SnowContext *s = avctx->priv_data;
- int plane_index, level, orientation;
-
- for(plane_index=0; plane_index<3; plane_index++){
- int w= s->avctx->width;
- int h= s->avctx->height;
-
- if(plane_index){
- w>>= s->chroma_h_shift;
- h>>= s->chroma_v_shift;
- }
- s->plane[plane_index].width = w;
- s->plane[plane_index].height= h;
-
- for(level=s->spatial_decomposition_count-1; level>=0; level--){
- for(orientation=level ? 1 : 0; orientation<4; orientation++){
- SubBand *b= &s->plane[plane_index].band[level][orientation];
-
- b->buf= s->spatial_dwt_buffer;
- b->level= level;
- b->stride= s->plane[plane_index].width << (s->spatial_decomposition_count - level);
- b->width = (w + !(orientation&1))>>1;
- b->height= (h + !(orientation>1))>>1;
-
- b->stride_line = 1 << (s->spatial_decomposition_count - level);
- b->buf_x_offset = 0;
- b->buf_y_offset = 0;
-
- if(orientation&1){
- b->buf += (w+1)>>1;
- b->buf_x_offset = (w+1)>>1;
- }
- if(orientation>1){
- b->buf += b->stride>>1;
- b->buf_y_offset = b->stride_line >> 1;
- }
- b->ibuf= s->spatial_idwt_buffer + (b->buf - s->spatial_dwt_buffer);
-
- if(level)
- b->parent= &s->plane[plane_index].band[level-1][orientation];
- //FIXME avoid this realloc
- av_freep(&b->x_coeff);
- b->x_coeff=av_mallocz(((b->width+1) * b->height+1)*sizeof(x_and_coeff));
- }
- w= (w+1)>>1;
- h= (h+1)>>1;
- }
- }
-
- return 0;
-}
-
-#define USE_HALFPEL_PLANE 0
-
-static void halfpel_interpol(SnowContext *s, uint8_t *halfpel[4][4], AVFrame *frame){
- int p,x,y;
-
- for(p=0; p<3; p++){
- int is_chroma= !!p;
- int w= s->avctx->width >>is_chroma;
- int h= s->avctx->height >>is_chroma;
- int ls= frame->linesize[p];
- uint8_t *src= frame->data[p];
-
- halfpel[1][p] = (uint8_t*) av_malloc(ls * (h + 2 * EDGE_WIDTH)) + EDGE_WIDTH * (1 + ls);
- halfpel[2][p] = (uint8_t*) av_malloc(ls * (h + 2 * EDGE_WIDTH)) + EDGE_WIDTH * (1 + ls);
- halfpel[3][p] = (uint8_t*) av_malloc(ls * (h + 2 * EDGE_WIDTH)) + EDGE_WIDTH * (1 + ls);
-
- halfpel[0][p]= src;
- for(y=0; y<h; y++){
- for(x=0; x<w; x++){
- int i= y*ls + x;
-
- halfpel[1][p][i]= (20*(src[i] + src[i+1]) - 5*(src[i-1] + src[i+2]) + (src[i-2] + src[i+3]) + 16 )>>5;
- }
- }
- for(y=0; y<h; y++){
- for(x=0; x<w; x++){
- int i= y*ls + x;
-
- halfpel[2][p][i]= (20*(src[i] + src[i+ls]) - 5*(src[i-ls] + src[i+2*ls]) + (src[i-2*ls] + src[i+3*ls]) + 16 )>>5;
- }
- }
- src= halfpel[1][p];
- for(y=0; y<h; y++){
- for(x=0; x<w; x++){
- int i= y*ls + x;
-
- halfpel[3][p][i]= (20*(src[i] + src[i+ls]) - 5*(src[i-ls] + src[i+2*ls]) + (src[i-2*ls] + src[i+3*ls]) + 16 )>>5;
- }
- }
-
-//FIXME border!
- }
-}
-
-void ff_snow_release_buffer(AVCodecContext *avctx)
-{
- SnowContext *s = avctx->priv_data;
- int i;
-
- if(s->last_picture[s->max_ref_frames-1].data[0]){
- avctx->release_buffer(avctx, &s->last_picture[s->max_ref_frames-1]);
- for(i=0; i<9; i++)
- if(s->halfpel_plane[s->max_ref_frames-1][1+i/3][i%3])
- av_free(s->halfpel_plane[s->max_ref_frames-1][1+i/3][i%3] - EDGE_WIDTH*(1+s->current_picture.linesize[i%3]));
- }
-}
-
-int ff_snow_frame_start(SnowContext *s){
- AVFrame tmp;
- int w= s->avctx->width; //FIXME round up to x16 ?
- int h= s->avctx->height;
-
- if (s->current_picture.data[0] && !(s->avctx->flags&CODEC_FLAG_EMU_EDGE)) {
- s->dsp.draw_edges(s->current_picture.data[0],
- s->current_picture.linesize[0], w , h ,
- EDGE_WIDTH , EDGE_WIDTH , EDGE_TOP | EDGE_BOTTOM);
- s->dsp.draw_edges(s->current_picture.data[1],
- s->current_picture.linesize[1], w>>1, h>>1,
- EDGE_WIDTH/2, EDGE_WIDTH/2, EDGE_TOP | EDGE_BOTTOM);
- s->dsp.draw_edges(s->current_picture.data[2],
- s->current_picture.linesize[2], w>>1, h>>1,
- EDGE_WIDTH/2, EDGE_WIDTH/2, EDGE_TOP | EDGE_BOTTOM);
- }
-
- ff_snow_release_buffer(s->avctx);
-
- tmp= s->last_picture[s->max_ref_frames-1];
- memmove(s->last_picture+1, s->last_picture, (s->max_ref_frames-1)*sizeof(AVFrame));
- memmove(s->halfpel_plane+1, s->halfpel_plane, (s->max_ref_frames-1)*sizeof(void*)*4*4);
- if(USE_HALFPEL_PLANE && s->current_picture.data[0])
- halfpel_interpol(s, s->halfpel_plane[0], &s->current_picture);
- s->last_picture[0]= s->current_picture;
- s->current_picture= tmp;
-
- if(s->keyframe){
- s->ref_frames= 0;
- }else{
- int i;
- for(i=0; i<s->max_ref_frames && s->last_picture[i].data[0]; i++)
- if(i && s->last_picture[i-1].key_frame)
- break;
- s->ref_frames= i;
- if(s->ref_frames==0){
- av_log(s->avctx,AV_LOG_ERROR, "No reference frames\n");
- return -1;
- }
- }
-
- s->current_picture.reference= 1;
- if(ff_get_buffer(s->avctx, &s->current_picture) < 0){
- av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
- }
-
- s->current_picture.key_frame= s->keyframe;
-
- return 0;
-}
-
-av_cold void ff_snow_common_end(SnowContext *s)
-{
- int plane_index, level, orientation, i;
-
- av_freep(&s->spatial_dwt_buffer);
- av_freep(&s->temp_dwt_buffer);
- av_freep(&s->spatial_idwt_buffer);
- av_freep(&s->temp_idwt_buffer);
- av_freep(&s->run_buffer);
-
- s->m.me.temp= NULL;
- av_freep(&s->m.me.scratchpad);
- av_freep(&s->m.me.map);
- av_freep(&s->m.me.score_map);
- av_freep(&s->m.obmc_scratchpad);
-
- av_freep(&s->block);
- av_freep(&s->scratchbuf);
- av_freep(&s->emu_edge_buffer);
-
- for(i=0; i<MAX_REF_FRAMES; i++){
- av_freep(&s->ref_mvs[i]);
- av_freep(&s->ref_scores[i]);
- if(s->last_picture[i].data[0])
- s->avctx->release_buffer(s->avctx, &s->last_picture[i]);
- }
-
- for(plane_index=0; plane_index<3; plane_index++){
- for(level=s->spatial_decomposition_count-1; level>=0; level--){
- for(orientation=level ? 1 : 0; orientation<4; orientation++){
- SubBand *b= &s->plane[plane_index].band[level][orientation];
-
- av_freep(&b->x_coeff);
- }
- }
- }
- if (s->mconly_picture.data[0])
- s->avctx->release_buffer(s->avctx, &s->mconly_picture);
- if (s->current_picture.data[0])
- s->avctx->release_buffer(s->avctx, &s->current_picture);
-}

libav-v9.6.tar.bz2/libavcodec/snow.h Deleted

@@ -1,693 +0,0 @@
-/*
- * Copyright (C) 2004 Michael Niedermayer <michaelni@gmx.at>
- * Copyright (C) 2006 Robert Edele <yartrebo@earthlink.net>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_SNOW_H
-#define AVCODEC_SNOW_H
-
-#include "dsputil.h"
-#include "dwt.h"
-
-#include "rangecoder.h"
-#include "mathops.h"
-#include "mpegvideo.h"
-
-#define MID_STATE 128
-
-#define MAX_PLANES 4
-#define QSHIFT 5
-#define QROOT (1<<QSHIFT)
-#define LOSSLESS_QLOG -128
-#define FRAC_BITS 4
-#define MAX_REF_FRAMES 8
-
-#define LOG2_OBMC_MAX 8
-#define OBMC_MAX (1<<(LOG2_OBMC_MAX))
-typedef struct BlockNode{
- int16_t mx;
- int16_t my;
- uint8_t ref;
- uint8_t color[3];
- uint8_t type;
-//#define TYPE_SPLIT 1
-#define BLOCK_INTRA 1
-#define BLOCK_OPT 2
-//#define TYPE_NOCOLOR 4
- uint8_t level; //FIXME merge into type?
-}BlockNode;
-
-static const BlockNode null_block= { //FIXME add border maybe
- .color= {128,128,128},
- .mx= 0,
- .my= 0,
- .ref= 0,
- .type= 0,
- .level= 0,
-};
-
-#define LOG2_MB_SIZE 4
-#define MB_SIZE (1<<LOG2_MB_SIZE)
-#define ENCODER_EXTRA_BITS 4
-#define HTAPS_MAX 8
-
-typedef struct x_and_coeff{
- int16_t x;
- uint16_t coeff;
-} x_and_coeff;
-
-typedef struct SubBand{
- int level;
- int stride;
- int width;
- int height;
- int qlog; ///< log(qscale)/log[2^(1/6)]
- DWTELEM *buf;
- IDWTELEM *ibuf;
- int buf_x_offset;
- int buf_y_offset;
- int stride_line; ///< Stride measured in lines, not pixels.
- x_and_coeff * x_coeff;
- struct SubBand *parent;
- uint8_t state[/*7*2*/ 7 + 512][32];
-}SubBand;
-
-typedef struct Plane{
- int width;
- int height;
- SubBand band[MAX_DECOMPOSITIONS][4];
-
- int htaps;
- int8_t hcoeff[HTAPS_MAX/2];
- int diag_mc;
- int fast_mc;
-
- int last_htaps;
- int8_t last_hcoeff[HTAPS_MAX/2];
- int last_diag_mc;
-}Plane;
-
-typedef struct SnowContext{
- AVClass *class;
- AVCodecContext *avctx;
- RangeCoder c;
- DSPContext dsp;
- VideoDSPContext vdsp;
- DWTContext dwt;
- AVFrame new_picture;
- AVFrame input_picture; ///< new_picture with the internal linesizes
- AVFrame current_picture;
- AVFrame last_picture[MAX_REF_FRAMES];
- uint8_t *halfpel_plane[MAX_REF_FRAMES][4][4];
- AVFrame mconly_picture;
-// uint8_t q_context[16];
- uint8_t header_state[32];
- uint8_t block_state[128 + 32*128];
- int keyframe;
- int always_reset;
- int version;
- int spatial_decomposition_type;
- int last_spatial_decomposition_type;
- int temporal_decomposition_type;
- int spatial_decomposition_count;
- int last_spatial_decomposition_count;
- int temporal_decomposition_count;
- int max_ref_frames;
- int ref_frames;
- int16_t (*ref_mvs[MAX_REF_FRAMES])[2];
- uint32_t *ref_scores[MAX_REF_FRAMES];
- DWTELEM *spatial_dwt_buffer;
- DWTELEM *temp_dwt_buffer;
- IDWTELEM *spatial_idwt_buffer;
- IDWTELEM *temp_idwt_buffer;
- int *run_buffer;
- int colorspace_type;
- int chroma_h_shift;
- int chroma_v_shift;
- int spatial_scalability;
- int qlog;
- int last_qlog;
- int lambda;
- int lambda2;
- int pass1_rc;
- int mv_scale;
- int last_mv_scale;
- int qbias;
- int last_qbias;
-#define QBIAS_SHIFT 3
- int b_width;
- int b_height;
- int block_max_depth;
- int last_block_max_depth;
- Plane plane[MAX_PLANES];
- BlockNode *block;
-#define ME_CACHE_SIZE 1024
- unsigned me_cache[ME_CACHE_SIZE];
- unsigned me_cache_generation;
- slice_buffer sb;
- int memc_only;
-
- MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to eventually make the motion estimation independent of MpegEncContext, so this will be removed then (FIXME/XXX)
-
- uint8_t *scratchbuf;
- uint8_t *emu_edge_buffer;
-}SnowContext;
-
-/* Tables */
-extern const uint8_t * const ff_obmc_tab[4];
-extern uint8_t ff_qexp[QROOT];
-extern int ff_scale_mv_ref[MAX_REF_FRAMES][MAX_REF_FRAMES];
-
-/* C bits used by mmx/sse2/altivec */
-
-static av_always_inline void snow_interleave_line_header(int * i, int width, IDWTELEM * low, IDWTELEM * high){
- (*i) = (width) - 2;
-
- if (width & 1){
- low[(*i)+1] = low[((*i)+1)>>1];
- (*i)--;
- }
-}
-
-static av_always_inline void snow_interleave_line_footer(int * i, IDWTELEM * low, IDWTELEM * high){
- for (; (*i)>=0; (*i)-=2){
- low[(*i)+1] = high[(*i)>>1];
- low[*i] = low[(*i)>>1];
- }
-}
-
-static av_always_inline void snow_horizontal_compose_lift_lead_out(int i, IDWTELEM * dst, IDWTELEM * src, IDWTELEM * ref, int width, int w, int lift_high, int mul, int add, int shift){
- for(; i<w; i++){
- dst[i] = src[i] - ((mul * (ref[i] + ref[i + 1]) + add) >> shift);
- }
-
- if((width^lift_high)&1){
- dst[w] = src[w] - ((mul * 2 * ref[w] + add) >> shift);
- }
-}
-
-static av_always_inline void snow_horizontal_compose_liftS_lead_out(int i, IDWTELEM * dst, IDWTELEM * src, IDWTELEM * ref, int width, int w){
- for(; i<w; i++){
- dst[i] = src[i] + ((ref[i] + ref[(i+1)]+W_BO + 4 * src[i]) >> W_BS);
- }
-
- if(width&1){
- dst[w] = src[w] + ((2 * ref[w] + W_BO + 4 * src[w]) >> W_BS);
- }
-}
-
-/* common code */
-
-int ff_snow_common_init(AVCodecContext *avctx);
-int ff_snow_common_init_after_header(AVCodecContext *avctx);
-void ff_snow_common_end(SnowContext *s);
-void ff_snow_release_buffer(AVCodecContext *avctx);
-void ff_snow_reset_contexts(SnowContext *s);
-int ff_snow_alloc_blocks(SnowContext *s);
-int ff_snow_frame_start(SnowContext *s);
-void ff_snow_pred_block(SnowContext *s, uint8_t *dst, uint8_t *tmp, int stride,
- int sx, int sy, int b_w, int b_h, BlockNode *block,
- int plane_index, int w, int h);
-/* common inline functions */
-//XXX doublecheck all of them should stay inlined
-
-static inline void snow_set_blocks(SnowContext *s, int level, int x, int y, int l, int cb, int cr, int mx, int my, int ref, int type){
- const int w= s->b_width << s->block_max_depth;
- const int rem_depth= s->block_max_depth - level;
- const int index= (x + y*w) << rem_depth;
- const int block_w= 1<<rem_depth;
- BlockNode block;
- int i,j;
-
- block.color[0]= l;
- block.color[1]= cb;
- block.color[2]= cr;
- block.mx= mx;
- block.my= my;
- block.ref= ref;
- block.type= type;
- block.level= level;
-
- for(j=0; j<block_w; j++){
- for(i=0; i<block_w; i++){
- s->block[index + i + j*w]= block;
- }
- }
-}
-
-static inline void pred_mv(SnowContext *s, int *mx, int *my, int ref,
- const BlockNode *left, const BlockNode *top, const BlockNode *tr){
- if(s->ref_frames == 1){
- *mx = mid_pred(left->mx, top->mx, tr->mx);
- *my = mid_pred(left->my, top->my, tr->my);
- }else{
- const int *scale = ff_scale_mv_ref[ref];
- *mx = mid_pred((left->mx * scale[left->ref] + 128) >>8,
- (top ->mx * scale[top ->ref] + 128) >>8,
- (tr ->mx * scale[tr ->ref] + 128) >>8);
- *my = mid_pred((left->my * scale[left->ref] + 128) >>8,
- (top ->my * scale[top ->ref] + 128) >>8,
- (tr ->my * scale[tr ->ref] + 128) >>8);
- }
-}
-
-static av_always_inline int same_block(BlockNode *a, BlockNode *b){
- if((a->type&BLOCK_INTRA) && (b->type&BLOCK_INTRA)){
- return !((a->color[0] - b->color[0]) | (a->color[1] - b->color[1]) | (a->color[2] - b->color[2]));
- }else{
- return !((a->mx - b->mx) | (a->my - b->my) | (a->ref - b->ref) | ((a->type ^ b->type)&BLOCK_INTRA));
- }
-}
-
-//FIXME name cleanup (b_w, block_w, b_width stuff)
-//XXX should we really inline it?
-static av_always_inline void add_yblock(SnowContext *s, int sliced, slice_buffer *sb, IDWTELEM *dst, uint8_t *dst8, const uint8_t *obmc, int src_x, int src_y, int b_w, int b_h, int w, int h, int dst_stride, int src_stride, int obmc_stride, int b_x, int b_y, int add, int offset_dst, int plane_index){
- const int b_width = s->b_width << s->block_max_depth;
- const int b_height= s->b_height << s->block_max_depth;
- const int b_stride= b_width;
- BlockNode *lt= &s->block[b_x + b_y*b_stride];
- BlockNode *rt= lt+1;
- BlockNode *lb= lt+b_stride;
- BlockNode *rb= lb+1;
- uint8_t *block[4];
- int tmp_step= src_stride >= 7*MB_SIZE ? MB_SIZE : MB_SIZE*src_stride;
- uint8_t *tmp = s->scratchbuf;
- uint8_t *ptmp;
- int x,y;
-
- if(b_x<0){
- lt= rt;
- lb= rb;
- }else if(b_x + 1 >= b_width){
- rt= lt;
- rb= lb;
- }
- if(b_y<0){
- lt= lb;
- rt= rb;
- }else if(b_y + 1 >= b_height){
- lb= lt;
- rb= rt;
- }
-
- if(src_x<0){ //FIXME merge with prev & always round internal width up to *16
- obmc -= src_x;
- b_w += src_x;
- if(!sliced && !offset_dst)
- dst -= src_x;
- src_x=0;
- }else if(src_x + b_w > w){
- b_w = w - src_x;
- }
- if(src_y<0){
- obmc -= src_y*obmc_stride;
- b_h += src_y;
- if(!sliced && !offset_dst)
- dst -= src_y*dst_stride;
- src_y=0;
- }else if(src_y + b_h> h){
- b_h = h - src_y;
- }
-
- if(b_w<=0 || b_h<=0) return;
-
- assert(src_stride > 2*MB_SIZE + 5);
-
- if(!sliced && offset_dst)
- dst += src_x + src_y*dst_stride;
- dst8+= src_x + src_y*src_stride;
-// src += src_x + src_y*src_stride;
-
- ptmp= tmp + 3*tmp_step;
- block[0]= ptmp;
- ptmp+=tmp_step;
- ff_snow_pred_block(s, block[0], tmp, src_stride, src_x, src_y, b_w, b_h, lt, plane_index, w, h);
-
- if(same_block(lt, rt)){
- block[1]= block[0];
- }else{
- block[1]= ptmp;
- ptmp+=tmp_step;
- ff_snow_pred_block(s, block[1], tmp, src_stride, src_x, src_y, b_w, b_h, rt, plane_index, w, h);
- }
-
- if(same_block(lt, lb)){
- block[2]= block[0];
- }else if(same_block(rt, lb)){
- block[2]= block[1];
- }else{
- block[2]= ptmp;
- ptmp+=tmp_step;
- ff_snow_pred_block(s, block[2], tmp, src_stride, src_x, src_y, b_w, b_h, lb, plane_index, w, h);
- }
-
- if(same_block(lt, rb) ){
- block[3]= block[0];
- }else if(same_block(rt, rb)){
- block[3]= block[1];
- }else if(same_block(lb, rb)){
- block[3]= block[2];
- }else{
- block[3]= ptmp;
- ff_snow_pred_block(s, block[3], tmp, src_stride, src_x, src_y, b_w, b_h, rb, plane_index, w, h);
- }
- if(sliced){
- s->dwt.inner_add_yblock(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8);
- }else{
- for(y=0; y<b_h; y++){
- //FIXME ugly misuse of obmc_stride
- const uint8_t *obmc1= obmc + y*obmc_stride;
- const uint8_t *obmc2= obmc1+ (obmc_stride>>1);
- const uint8_t *obmc3= obmc1+ obmc_stride*(obmc_stride>>1);
- const uint8_t *obmc4= obmc3+ (obmc_stride>>1);
- for(x=0; x<b_w; x++){
- int v= obmc1[x] * block[3][x + y*src_stride]
- +obmc2[x] * block[2][x + y*src_stride]
- +obmc3[x] * block[1][x + y*src_stride]
- +obmc4[x] * block[0][x + y*src_stride];
-
- v <<= 8 - LOG2_OBMC_MAX;
- if(FRAC_BITS != 8){
- v >>= 8 - FRAC_BITS;
- }
- if(add){
- v += dst[x + y*dst_stride];
- v = (v + (1<<(FRAC_BITS-1))) >> FRAC_BITS;
- if(v&(~255)) v= ~(v>>31);
- dst8[x + y*src_stride] = v;
- }else{
- dst[x + y*dst_stride] -= v;
- }
- }
- }
- }
-}
-
-static av_always_inline void predict_slice(SnowContext *s, IDWTELEM *buf, int plane_index, int add, int mb_y){
- Plane *p= &s->plane[plane_index];
- const int mb_w= s->b_width << s->block_max_depth;
- const int mb_h= s->b_height << s->block_max_depth;
- int x, y, mb_x;
- int block_size = MB_SIZE >> s->block_max_depth;
- int block_w = plane_index ? block_size/2 : block_size;
- const uint8_t *obmc = plane_index ? ff_obmc_tab[s->block_max_depth+1] : ff_obmc_tab[s->block_max_depth];
- const int obmc_stride= plane_index ? block_size : 2*block_size;
- int ref_stride= s->current_picture.linesize[plane_index];
- uint8_t *dst8= s->current_picture.data[plane_index];
- int w= p->width;
- int h= p->height;
-
- if(s->keyframe || (s->avctx->debug&512)){
- if(mb_y==mb_h)
- return;
-
- if(add){
- for(y=block_w*mb_y; y<FFMIN(h,block_w*(mb_y+1)); y++){
- for(x=0; x<w; x++){
- int v= buf[x + y*w] + (128<<FRAC_BITS) + (1<<(FRAC_BITS-1));
- v >>= FRAC_BITS;
- if(v&(~255)) v= ~(v>>31);
- dst8[x + y*ref_stride]= v;
- }
- }
- }else{
- for(y=block_w*mb_y; y<FFMIN(h,block_w*(mb_y+1)); y++){
- for(x=0; x<w; x++){
- buf[x + y*w]-= 128<<FRAC_BITS;
- }
- }
- }
-
- return;
- }
-
- for(mb_x=0; mb_x<=mb_w; mb_x++){
- add_yblock(s, 0, NULL, buf, dst8, obmc,
- block_w*mb_x - block_w/2,
- block_w*mb_y - block_w/2,
- block_w, block_w,
- w, h,
- w, ref_stride, obmc_stride,
- mb_x - 1, mb_y - 1,
- add, 1, plane_index);
- }
-}
-
-static av_always_inline void predict_plane(SnowContext *s, IDWTELEM *buf, int plane_index, int add){
- const int mb_h= s->b_height << s->block_max_depth;
- int mb_y;
- for(mb_y=0; mb_y<=mb_h; mb_y++)
- predict_slice(s, buf, plane_index, add, mb_y);
-}
-
-static inline void set_blocks(SnowContext *s, int level, int x, int y, int l, int cb, int cr, int mx, int my, int ref, int type){
- const int w= s->b_width << s->block_max_depth;
- const int rem_depth= s->block_max_depth - level;
- const int index= (x + y*w) << rem_depth;
- const int block_w= 1<<rem_depth;
- BlockNode block;
- int i,j;
-
- block.color[0]= l;
- block.color[1]= cb;
- block.color[2]= cr;
- block.mx= mx;
- block.my= my;
- block.ref= ref;
- block.type= type;
- block.level= level;
-
- for(j=0; j<block_w; j++){
- for(i=0; i<block_w; i++){
- s->block[index + i + j*w]= block;
- }
- }
-}
-
-static inline void init_ref(MotionEstContext *c, uint8_t *src[3], uint8_t *ref[3], uint8_t *ref2[3], int x, int y, int ref_index){
- const int offset[3]= {
- y*c-> stride + x,
- ((y*c->uvstride + x)>>1),
- ((y*c->uvstride + x)>>1),
- };
- int i;
- for(i=0; i<3; i++){
- c->src[0][i]= src [i];
- c->ref[0][i]= ref [i] + offset[i];
- }
- assert(!ref_index);
-}
-
-
-/* bitstream functions */
-
-extern const int8_t ff_quant3bA[256];
-
-#define QEXPSHIFT (7-FRAC_BITS+8) //FIXME try to change this to 0
-
-static inline void put_symbol(RangeCoder *c, uint8_t *state, int v, int is_signed){
- int i;
-
- if(v){
- const int a= FFABS(v);
- const int e= av_log2(a);
- const int el= FFMIN(e, 10);
- put_rac(c, state+0, 0);
-
- for(i=0; i<el; i++){
- put_rac(c, state+1+i, 1); //1..10
- }
- for(; i<e; i++){
- put_rac(c, state+1+9, 1); //1..10
- }
- put_rac(c, state+1+FFMIN(i,9), 0);
-
- for(i=e-1; i>=el; i--){
- put_rac(c, state+22+9, (a>>i)&1); //22..31
- }
- for(; i>=0; i--){
- put_rac(c, state+22+i, (a>>i)&1); //22..31
- }
-
- if(is_signed)
- put_rac(c, state+11 + el, v < 0); //11..21
- }else{
- put_rac(c, state+0, 1);
- }
-}
-
-static inline 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;
- }
-}
-
-static inline void put_symbol2(RangeCoder *c, uint8_t *state, int v, int log2){
- int i;
- int r= log2>=0 ? 1<<log2 : 1;
-
- assert(v>=0);
- assert(log2>=-4);
-
- while(v >= r){
- put_rac(c, state+4+log2, 1);
- v -= r;
- log2++;
- if(log2>0) r+=r;
- }
- put_rac(c, state+4+log2, 0);
-
- for(i=log2-1; i>=0; i--){
- put_rac(c, state+31-i, (v>>i)&1);
- }
-}
-
-static inline int get_symbol2(RangeCoder *c, uint8_t *state, int log2){
- int i;
- int r= log2>=0 ? 1<<log2 : 1;
- int v=0;
-
- assert(log2>=-4);
-
- while(get_rac(c, state+4+log2)){
- v+= r;
- log2++;
- if(log2>0) r+=r;
- }
-
- for(i=log2-1; i>=0; i--){
- v+= get_rac(c, state+31-i)<<i;
- }
-
- return v;
-}
-
-static inline void unpack_coeffs(SnowContext *s, SubBand *b, SubBand * parent, int orientation){
- const int w= b->width;
- const int h= b->height;
- int x,y;
-
- int run, runs;
- x_and_coeff *xc= b->x_coeff;
- x_and_coeff *prev_xc= NULL;
- x_and_coeff *prev2_xc= xc;
- x_and_coeff *parent_xc= parent ? parent->x_coeff : NULL;
- x_and_coeff *prev_parent_xc= parent_xc;
-
- runs= get_symbol2(&s->c, b->state[30], 0);
- if(runs-- > 0) run= get_symbol2(&s->c, b->state[1], 3);
- else run= INT_MAX;
-
- for(y=0; y<h; y++){
- int v=0;
- int lt=0, t=0, rt=0;
-
- if(y && prev_xc->x == 0){
- rt= prev_xc->coeff;
- }
- for(x=0; x<w; x++){
- int p=0;
- const int l= v;
-
- lt= t; t= rt;
-
- if(y){
- if(prev_xc->x <= x)
- prev_xc++;
- if(prev_xc->x == x + 1)
- rt= prev_xc->coeff;
- else
- rt=0;
- }
- if(parent_xc){
- if(x>>1 > parent_xc->x){
- parent_xc++;
- }
- if(x>>1 == parent_xc->x){
- p= parent_xc->coeff;
- }
- }
- if(/*ll|*/l|lt|t|rt|p){
- int context= av_log2(/*FFABS(ll) + */3*(l>>1) + (lt>>1) + (t&~1) + (rt>>1) + (p>>1));
-
- v=get_rac(&s->c, &b->state[0][context]);
- if(v){
- v= 2*(get_symbol2(&s->c, b->state[context + 2], context-4) + 1);
- v+=get_rac(&s->c, &b->state[0][16 + 1 + 3 + ff_quant3bA[l&0xFF] + 3*ff_quant3bA[t&0xFF]]);
-
- xc->x=x;
- (xc++)->coeff= v;
- }
- }else{
- if(!run){
- if(runs-- > 0) run= get_symbol2(&s->c, b->state[1], 3);
- else run= INT_MAX;
- v= 2*(get_symbol2(&s->c, b->state[0 + 2], 0-4) + 1);
- v+=get_rac(&s->c, &b->state[0][16 + 1 + 3]);
-
- xc->x=x;
- (xc++)->coeff= v;
- }else{
- int max_run;
- run--;
- v=0;
-
- if(y) max_run= FFMIN(run, prev_xc->x - x - 2);
- else max_run= FFMIN(run, w-x-1);
- if(parent_xc)
- max_run= FFMIN(max_run, 2*parent_xc->x - x - 1);
- x+= max_run;
- run-= max_run;
- }
- }
- }
- (xc++)->x= w+1; //end marker
- prev_xc= prev2_xc;
- prev2_xc= xc;
-
- if(parent_xc){
- if(y&1){
- while(parent_xc->x != parent->width+1)
- parent_xc++;
- parent_xc++;
- prev_parent_xc= parent_xc;
- }else{
- parent_xc= prev_parent_xc;
- }
- }
- }
-
- (xc++)->x= w+1; //end marker
-}
-
-#endif /* AVCODEC_SNOW_H */

libav-v9.6.tar.bz2/libavcodec/snowdata.h Deleted

@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2004 Michael Niedermayer <michaelni@gmx.at>
- * Copyright (C) 2006 Robert Edele <yartrebo@earthlink.net>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_SNOWDATA_H
-#define AVCODEC_SNOWDATA_H
-
-#include "snow.h"
-
-static const uint8_t obmc32[1024]={
- 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0,
- 0, 4, 4, 4, 8, 8, 8, 12, 12, 16, 16, 16, 20, 20, 20, 24, 24, 20, 20, 20, 16, 16, 16, 12, 12, 8, 8, 8, 4, 4, 4, 0,
- 0, 4, 8, 8, 12, 12, 16, 20, 20, 24, 28, 28, 32, 32, 36, 40, 40, 36, 32, 32, 28, 28, 24, 20, 20, 16, 12, 12, 8, 8, 4, 0,
- 0, 4, 8, 12, 16, 20, 24, 28, 28, 32, 36, 40, 44, 48, 52, 56, 56, 52, 48, 44, 40, 36, 32, 28, 28, 24, 20, 16, 12, 8, 4, 0,
- 4, 8, 12, 16, 20, 24, 28, 32, 40, 44, 48, 52, 56, 60, 64, 68, 68, 64, 60, 56, 52, 48, 44, 40, 32, 28, 24, 20, 16, 12, 8, 4,
- 4, 8, 12, 20, 24, 32, 36, 40, 48, 52, 56, 64, 68, 76, 80, 84, 84, 80, 76, 68, 64, 56, 52, 48, 40, 36, 32, 24, 20, 12, 8, 4,
- 4, 8, 16, 24, 28, 36, 44, 48, 56, 60, 68, 76, 80, 88, 96,100,100, 96, 88, 80, 76, 68, 60, 56, 48, 44, 36, 28, 24, 16, 8, 4,
- 4, 12, 20, 28, 32, 40, 48, 56, 64, 72, 80, 88, 92,100,108,116,116,108,100, 92, 88, 80, 72, 64, 56, 48, 40, 32, 28, 20, 12, 4,
- 4, 12, 20, 28, 40, 48, 56, 64, 72, 80, 88, 96,108,116,124,132,132,124,116,108, 96, 88, 80, 72, 64, 56, 48, 40, 28, 20, 12, 4,
- 4, 16, 24, 32, 44, 52, 60, 72, 80, 92,100,108,120,128,136,148,148,136,128,120,108,100, 92, 80, 72, 60, 52, 44, 32, 24, 16, 4,
- 4, 16, 28, 36, 48, 56, 68, 80, 88,100,112,120,132,140,152,164,164,152,140,132,120,112,100, 88, 80, 68, 56, 48, 36, 28, 16, 4,
- 4, 16, 28, 40, 52, 64, 76, 88, 96,108,120,132,144,156,168,180,180,168,156,144,132,120,108, 96, 88, 76, 64, 52, 40, 28, 16, 4,
- 8, 20, 32, 44, 56, 68, 80, 92,108,120,132,144,156,168,180,192,192,180,168,156,144,132,120,108, 92, 80, 68, 56, 44, 32, 20, 8,
- 8, 20, 32, 48, 60, 76, 88,100,116,128,140,156,168,184,196,208,208,196,184,168,156,140,128,116,100, 88, 76, 60, 48, 32, 20, 8,
- 8, 20, 36, 52, 64, 80, 96,108,124,136,152,168,180,196,212,224,224,212,196,180,168,152,136,124,108, 96, 80, 64, 52, 36, 20, 8,
- 8, 24, 40, 56, 68, 84,100,116,132,148,164,180,192,208,224,240,240,224,208,192,180,164,148,132,116,100, 84, 68, 56, 40, 24, 8,
- 8, 24, 40, 56, 68, 84,100,116,132,148,164,180,192,208,224,240,240,224,208,192,180,164,148,132,116,100, 84, 68, 56, 40, 24, 8,
- 8, 20, 36, 52, 64, 80, 96,108,124,136,152,168,180,196,212,224,224,212,196,180,168,152,136,124,108, 96, 80, 64, 52, 36, 20, 8,
- 8, 20, 32, 48, 60, 76, 88,100,116,128,140,156,168,184,196,208,208,196,184,168,156,140,128,116,100, 88, 76, 60, 48, 32, 20, 8,
- 8, 20, 32, 44, 56, 68, 80, 92,108,120,132,144,156,168,180,192,192,180,168,156,144,132,120,108, 92, 80, 68, 56, 44, 32, 20, 8,
- 4, 16, 28, 40, 52, 64, 76, 88, 96,108,120,132,144,156,168,180,180,168,156,144,132,120,108, 96, 88, 76, 64, 52, 40, 28, 16, 4,
- 4, 16, 28, 36, 48, 56, 68, 80, 88,100,112,120,132,140,152,164,164,152,140,132,120,112,100, 88, 80, 68, 56, 48, 36, 28, 16, 4,
- 4, 16, 24, 32, 44, 52, 60, 72, 80, 92,100,108,120,128,136,148,148,136,128,120,108,100, 92, 80, 72, 60, 52, 44, 32, 24, 16, 4,
- 4, 12, 20, 28, 40, 48, 56, 64, 72, 80, 88, 96,108,116,124,132,132,124,116,108, 96, 88, 80, 72, 64, 56, 48, 40, 28, 20, 12, 4,
- 4, 12, 20, 28, 32, 40, 48, 56, 64, 72, 80, 88, 92,100,108,116,116,108,100, 92, 88, 80, 72, 64, 56, 48, 40, 32, 28, 20, 12, 4,
- 4, 8, 16, 24, 28, 36, 44, 48, 56, 60, 68, 76, 80, 88, 96,100,100, 96, 88, 80, 76, 68, 60, 56, 48, 44, 36, 28, 24, 16, 8, 4,
- 4, 8, 12, 20, 24, 32, 36, 40, 48, 52, 56, 64, 68, 76, 80, 84, 84, 80, 76, 68, 64, 56, 52, 48, 40, 36, 32, 24, 20, 12, 8, 4,
- 4, 8, 12, 16, 20, 24, 28, 32, 40, 44, 48, 52, 56, 60, 64, 68, 68, 64, 60, 56, 52, 48, 44, 40, 32, 28, 24, 20, 16, 12, 8, 4,
- 0, 4, 8, 12, 16, 20, 24, 28, 28, 32, 36, 40, 44, 48, 52, 56, 56, 52, 48, 44, 40, 36, 32, 28, 28, 24, 20, 16, 12, 8, 4, 0,
- 0, 4, 8, 8, 12, 12, 16, 20, 20, 24, 28, 28, 32, 32, 36, 40, 40, 36, 32, 32, 28, 28, 24, 20, 20, 16, 12, 12, 8, 8, 4, 0,
- 0, 4, 4, 4, 8, 8, 8, 12, 12, 16, 16, 16, 20, 20, 20, 24, 24, 20, 20, 20, 16, 16, 16, 12, 12, 8, 8, 8, 4, 4, 4, 0,
- 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0,
- //error:0.000020
-};
-static const uint8_t obmc16[256]={
- 0, 4, 4, 8, 8, 12, 12, 16, 16, 12, 12, 8, 8, 4, 4, 0,
- 4, 8, 16, 20, 28, 32, 40, 44, 44, 40, 32, 28, 20, 16, 8, 4,
- 4, 16, 24, 36, 44, 56, 64, 76, 76, 64, 56, 44, 36, 24, 16, 4,
- 8, 20, 36, 48, 64, 76, 92,104,104, 92, 76, 64, 48, 36, 20, 8,
- 8, 28, 44, 64, 80,100,116,136,136,116,100, 80, 64, 44, 28, 8,
- 12, 32, 56, 76,100,120,144,164,164,144,120,100, 76, 56, 32, 12,
- 12, 40, 64, 92,116,144,168,196,196,168,144,116, 92, 64, 40, 12,
- 16, 44, 76,104,136,164,196,224,224,196,164,136,104, 76, 44, 16,
- 16, 44, 76,104,136,164,196,224,224,196,164,136,104, 76, 44, 16,
- 12, 40, 64, 92,116,144,168,196,196,168,144,116, 92, 64, 40, 12,
- 12, 32, 56, 76,100,120,144,164,164,144,120,100, 76, 56, 32, 12,
- 8, 28, 44, 64, 80,100,116,136,136,116,100, 80, 64, 44, 28, 8,
- 8, 20, 36, 48, 64, 76, 92,104,104, 92, 76, 64, 48, 36, 20, 8,
- 4, 16, 24, 36, 44, 56, 64, 76, 76, 64, 56, 44, 36, 24, 16, 4,
- 4, 8, 16, 20, 28, 32, 40, 44, 44, 40, 32, 28, 20, 16, 8, 4,
- 0, 4, 4, 8, 8, 12, 12, 16, 16, 12, 12, 8, 8, 4, 4, 0,
-//error:0.000015
-};
-
-//linear *64
-static const uint8_t obmc8[64]={
- 4, 12, 20, 28, 28, 20, 12, 4,
- 12, 36, 60, 84, 84, 60, 36, 12,
- 20, 60,100,140,140,100, 60, 20,
- 28, 84,140,196,196,140, 84, 28,
- 28, 84,140,196,196,140, 84, 28,
- 20, 60,100,140,140,100, 60, 20,
- 12, 36, 60, 84, 84, 60, 36, 12,
- 4, 12, 20, 28, 28, 20, 12, 4,
-//error:0.000000
-};
-
-//linear *64
-static const uint8_t obmc4[16]={
- 16, 48, 48, 16,
- 48,144,144, 48,
- 48,144,144, 48,
- 16, 48, 48, 16,
-//error:0.000000
-};
-
-const int8_t ff_quant3bA[256]={
- 0, 0, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
- 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
- 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
- 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
- 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
- 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
- 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
- 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
- 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
- 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
- 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
- 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
- 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
- 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
- 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
- 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1, 1,-1,
-};
-
-const uint8_t * const ff_obmc_tab[4]= {
- obmc32, obmc16, obmc8, obmc4
-};
-
-/* runtime generated tables */
-uint8_t ff_qexp[QROOT];
-int ff_scale_mv_ref[MAX_REF_FRAMES][MAX_REF_FRAMES];
-
-
-#endif /* AVCODEC_SNOW_H */

libav-v9.6.tar.bz2/libavcodec/snowdec.c Deleted

@@ -1,576 +0,0 @@
-/*
- * Copyright (C) 2004 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavutil/intmath.h"
-#include "libavutil/log.h"
-#include "libavutil/opt.h"
-#include "avcodec.h"
-#include "dsputil.h"
-#include "dwt.h"
-#include "internal.h"
-#include "snow.h"
-
-#include "rangecoder.h"
-#include "mathops.h"
-
-#include "mpegvideo.h"
-#include "h263.h"
-
-#undef NDEBUG
-#include <assert.h>
-
-static av_always_inline void predict_slice_buffered(SnowContext *s, slice_buffer * sb, IDWTELEM * old_buffer, int plane_index, int add, int mb_y){
- Plane *p= &s->plane[plane_index];
- const int mb_w= s->b_width << s->block_max_depth;
- const int mb_h= s->b_height << s->block_max_depth;
- int x, y, mb_x;
- int block_size = MB_SIZE >> s->block_max_depth;
- int block_w = plane_index ? block_size/2 : block_size;
- const uint8_t *obmc = plane_index ? ff_obmc_tab[s->block_max_depth+1] : ff_obmc_tab[s->block_max_depth];
- int obmc_stride= plane_index ? block_size : 2*block_size;
- int ref_stride= s->current_picture.linesize[plane_index];
- uint8_t *dst8= s->current_picture.data[plane_index];
- int w= p->width;
- int h= p->height;
-
- if(s->keyframe || (s->avctx->debug&512)){
- if(mb_y==mb_h)
- return;
-
- if(add){
- for(y=block_w*mb_y; y<FFMIN(h,block_w*(mb_y+1)); y++){
-// DWTELEM * line = slice_buffer_get_line(sb, y);
- IDWTELEM * line = sb->line[y];
- for(x=0; x<w; x++){
-// int v= buf[x + y*w] + (128<<FRAC_BITS) + (1<<(FRAC_BITS-1));
- int v= line[x] + (128<<FRAC_BITS) + (1<<(FRAC_BITS-1));
- v >>= FRAC_BITS;
- if(v&(~255)) v= ~(v>>31);
- dst8[x + y*ref_stride]= v;
- }
- }
- }else{
- for(y=block_w*mb_y; y<FFMIN(h,block_w*(mb_y+1)); y++){
-// DWTELEM * line = slice_buffer_get_line(sb, y);
- IDWTELEM * line = sb->line[y];
- for(x=0; x<w; x++){
- line[x] -= 128 << FRAC_BITS;
-// buf[x + y*w]-= 128<<FRAC_BITS;
- }
- }
- }
-
- return;
- }
-
- for(mb_x=0; mb_x<=mb_w; mb_x++){
- add_yblock(s, 1, sb, old_buffer, dst8, obmc,
- block_w*mb_x - block_w/2,
- block_w*mb_y - block_w/2,
- block_w, block_w,
- w, h,
- w, ref_stride, obmc_stride,
- mb_x - 1, mb_y - 1,
- add, 0, plane_index);
- }
-}
-
-static inline void decode_subband_slice_buffered(SnowContext *s, SubBand *b, slice_buffer * sb, int start_y, int h, int save_state[1]){
- const int w= b->width;
- int y;
- const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
- int qmul= ff_qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
- int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
- int new_index = 0;
-
- if(b->ibuf == s->spatial_idwt_buffer || s->qlog == LOSSLESS_QLOG){
- qadd= 0;
- qmul= 1<<QEXPSHIFT;
- }
-
- /* If we are on the second or later slice, restore our index. */
- if (start_y != 0)
- new_index = save_state[0];
-
-
- for(y=start_y; y<h; y++){
- int x = 0;
- int v;
- IDWTELEM * line = slice_buffer_get_line(sb, y * b->stride_line + b->buf_y_offset) + b->buf_x_offset;
- memset(line, 0, b->width*sizeof(IDWTELEM));
- v = b->x_coeff[new_index].coeff;
- x = b->x_coeff[new_index++].x;
- while(x < w){
- register int t= ( (v>>1)*qmul + qadd)>>QEXPSHIFT;
- register int u= -(v&1);
- line[x] = (t^u) - u;
-
- v = b->x_coeff[new_index].coeff;
- x = b->x_coeff[new_index++].x;
- }
- }
-
- /* Save our variables for the next slice. */
- save_state[0] = new_index;
-
- return;
-}
-
-static int decode_q_branch(SnowContext *s, int level, int x, int y){
- const int w= s->b_width << s->block_max_depth;
- const int rem_depth= s->block_max_depth - level;
- const int index= (x + y*w) << rem_depth;
- int trx= (x+1)<<rem_depth;
- const BlockNode *left = x ? &s->block[index-1] : &null_block;
- const BlockNode *top = y ? &s->block[index-w] : &null_block;
- const BlockNode *tl = y && x ? &s->block[index-w-1] : left;
- const BlockNode *tr = y && trx<w && ((x&1)==0 || level==0) ? &s->block[index-w+(1<<rem_depth)] : tl; //FIXME use lt
- int s_context= 2*left->level + 2*top->level + tl->level + tr->level;
- int res;
-
- if(s->keyframe){
- set_blocks(s, level, x, y, null_block.color[0], null_block.color[1], null_block.color[2], null_block.mx, null_block.my, null_block.ref, BLOCK_INTRA);
- return 0;
- }
-
- if(level==s->block_max_depth || get_rac(&s->c, &s->block_state[4 + s_context])){
- int type, mx, my;
- int l = left->color[0];
- int cb= left->color[1];
- int cr= left->color[2];
- int ref = 0;
- int ref_context= av_log2(2*left->ref) + av_log2(2*top->ref);
- int mx_context= av_log2(2*FFABS(left->mx - top->mx)) + 0*av_log2(2*FFABS(tr->mx - top->mx));
- int my_context= av_log2(2*FFABS(left->my - top->my)) + 0*av_log2(2*FFABS(tr->my - top->my));
-
- type= get_rac(&s->c, &s->block_state[1 + left->type + top->type]) ? BLOCK_INTRA : 0;
-
- if(type){
- pred_mv(s, &mx, &my, 0, left, top, tr);
- l += get_symbol(&s->c, &s->block_state[32], 1);
- cb+= get_symbol(&s->c, &s->block_state[64], 1);
- cr+= get_symbol(&s->c, &s->block_state[96], 1);
- }else{
- if(s->ref_frames > 1)
- ref= get_symbol(&s->c, &s->block_state[128 + 1024 + 32*ref_context], 0);
- if (ref >= s->ref_frames) {
- av_log(s->avctx, AV_LOG_ERROR, "Invalid ref\n");
- return AVERROR_INVALIDDATA;
- }
- pred_mv(s, &mx, &my, ref, left, top, tr);
- mx+= get_symbol(&s->c, &s->block_state[128 + 32*(mx_context + 16*!!ref)], 1);
- my+= get_symbol(&s->c, &s->block_state[128 + 32*(my_context + 16*!!ref)], 1);
- }
- set_blocks(s, level, x, y, l, cb, cr, mx, my, ref, type);
- }else{
- if ((res = decode_q_branch(s, level+1, 2*x+0, 2*y+0)) < 0 ||
- (res = decode_q_branch(s, level+1, 2*x+1, 2*y+0)) < 0 ||
- (res = decode_q_branch(s, level+1, 2*x+0, 2*y+1)) < 0 ||
- (res = decode_q_branch(s, level+1, 2*x+1, 2*y+1)) < 0)
- return res;
- }
- return 0;
-}
-
-static void dequantize_slice_buffered(SnowContext *s, slice_buffer * sb, SubBand *b, IDWTELEM *src, int stride, int start_y, int end_y){
- const int w= b->width;
- const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
- const int qmul= ff_qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
- const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
- int x,y;
-
- if(s->qlog == LOSSLESS_QLOG) return;
-
- for(y=start_y; y<end_y; y++){
-// DWTELEM * line = slice_buffer_get_line_from_address(sb, src + (y * stride));
- IDWTELEM * line = slice_buffer_get_line(sb, (y * b->stride_line) + b->buf_y_offset) + b->buf_x_offset;
- for(x=0; x<w; x++){
- int i= line[x];
- if(i<0){
- line[x]= -((-i*qmul + qadd)>>(QEXPSHIFT)); //FIXME try different bias
- }else if(i>0){
- line[x]= (( i*qmul + qadd)>>(QEXPSHIFT));
- }
- }
- }
-}
-
-static void correlate_slice_buffered(SnowContext *s, slice_buffer * sb, SubBand *b, IDWTELEM *src, int stride, int inverse, int use_median, int start_y, int end_y){
- const int w= b->width;
- int x,y;
-
- IDWTELEM * line=0; // silence silly "could be used without having been initialized" warning
- IDWTELEM * prev;
-
- if (start_y != 0)
- line = slice_buffer_get_line(sb, ((start_y - 1) * b->stride_line) + b->buf_y_offset) + b->buf_x_offset;
-
- for(y=start_y; y<end_y; y++){
- prev = line;
-// line = slice_buffer_get_line_from_address(sb, src + (y * stride));
- line = slice_buffer_get_line(sb, (y * b->stride_line) + b->buf_y_offset) + b->buf_x_offset;
- for(x=0; x<w; x++){
- if(x){
- if(use_median){
- if(y && x+1<w) line[x] += mid_pred(line[x - 1], prev[x], prev[x + 1]);
- else line[x] += line[x - 1];
- }else{
- if(y) line[x] += mid_pred(line[x - 1], prev[x], line[x - 1] + prev[x] - prev[x - 1]);
- else line[x] += line[x - 1];
- }
- }else{
- if(y) line[x] += prev[x];
- }
- }
- }
-}
-
-static void decode_qlogs(SnowContext *s){
- int plane_index, level, orientation;
-
- for(plane_index=0; plane_index<3; plane_index++){
- for(level=0; level<s->spatial_decomposition_count; level++){
- for(orientation=level ? 1:0; orientation<4; orientation++){
- int q;
- if (plane_index==2) q= s->plane[1].band[level][orientation].qlog;
- else if(orientation==2) q= s->plane[plane_index].band[level][1].qlog;
- else q= get_symbol(&s->c, s->header_state, 1);
- s->plane[plane_index].band[level][orientation].qlog= q;
- }
- }
- }
-}
-
-#define GET_S(dst, check) \
- tmp= get_symbol(&s->c, s->header_state, 0);\
- if(!(check)){\
- av_log(s->avctx, AV_LOG_ERROR, "Error " #dst " is %d\n", tmp);\
- return -1;\
- }\
- dst= tmp;
-
-static int decode_header(SnowContext *s){
- int plane_index, tmp;
- uint8_t kstate[32];
-
- memset(kstate, MID_STATE, sizeof(kstate));
-
- s->keyframe= get_rac(&s->c, kstate);
- if(s->keyframe || s->always_reset){
- ff_snow_reset_contexts(s);
- s->spatial_decomposition_type=
- s->qlog=
- s->qbias=
- s->mv_scale=
- s->block_max_depth= 0;
- }
- if(s->keyframe){
- GET_S(s->version, tmp <= 0U)
- s->always_reset= get_rac(&s->c, s->header_state);
- s->temporal_decomposition_type= get_symbol(&s->c, s->header_state, 0);
- s->temporal_decomposition_count= get_symbol(&s->c, s->header_state, 0);
- GET_S(s->spatial_decomposition_count, 0 < tmp && tmp <= MAX_DECOMPOSITIONS)
- s->colorspace_type= get_symbol(&s->c, s->header_state, 0);
- s->chroma_h_shift= get_symbol(&s->c, s->header_state, 0);
- s->chroma_v_shift= get_symbol(&s->c, s->header_state, 0);
- s->spatial_scalability= get_rac(&s->c, s->header_state);
-// s->rate_scalability= get_rac(&s->c, s->header_state);
- GET_S(s->max_ref_frames, tmp < (unsigned)MAX_REF_FRAMES)
- s->max_ref_frames++;
-
- decode_qlogs(s);
- }
-
- if(!s->keyframe){
- if(get_rac(&s->c, s->header_state)){
- for(plane_index=0; plane_index<2; plane_index++){
- int htaps, i, sum=0;
- Plane *p= &s->plane[plane_index];
- p->diag_mc= get_rac(&s->c, s->header_state);
- htaps= get_symbol(&s->c, s->header_state, 0)*2 + 2;
- if((unsigned)htaps > HTAPS_MAX || htaps==0)
- return -1;
- p->htaps= htaps;
- for(i= htaps/2; i; i--){
- p->hcoeff[i]= get_symbol(&s->c, s->header_state, 0) * (1-2*(i&1));
- sum += p->hcoeff[i];
- }
- p->hcoeff[0]= 32-sum;
- }
- s->plane[2].diag_mc= s->plane[1].diag_mc;
- s->plane[2].htaps = s->plane[1].htaps;
- memcpy(s->plane[2].hcoeff, s->plane[1].hcoeff, sizeof(s->plane[1].hcoeff));
- }
- if(get_rac(&s->c, s->header_state)){
- GET_S(s->spatial_decomposition_count, 0 < tmp && tmp <= MAX_DECOMPOSITIONS)
- decode_qlogs(s);
- }
- }
-
- s->spatial_decomposition_type+= get_symbol(&s->c, s->header_state, 1);
- if(s->spatial_decomposition_type > 1U){
- av_log(s->avctx, AV_LOG_ERROR, "spatial_decomposition_type %d not supported", s->spatial_decomposition_type);
- return -1;
- }
- if(FFMIN(s->avctx-> width>>s->chroma_h_shift,
- s->avctx->height>>s->chroma_v_shift) >> (s->spatial_decomposition_count-1) <= 0){
- av_log(s->avctx, AV_LOG_ERROR, "spatial_decomposition_count %d too large for size", s->spatial_decomposition_count);
- return -1;
- }
-
- if (s->chroma_h_shift != 1 || s->chroma_v_shift != 1) {
- av_log(s->avctx, AV_LOG_ERROR, "Invalid chroma shift\n");
- return AVERROR_PATCHWELCOME;
- }
-
- s->qlog += get_symbol(&s->c, s->header_state, 1);
- s->mv_scale += get_symbol(&s->c, s->header_state, 1);
- s->qbias += get_symbol(&s->c, s->header_state, 1);
- s->block_max_depth+= get_symbol(&s->c, s->header_state, 1);
- if(s->block_max_depth > 1 || s->block_max_depth < 0){
- av_log(s->avctx, AV_LOG_ERROR, "block_max_depth= %d is too large", s->block_max_depth);
- s->block_max_depth= 0;
- return -1;
- }
-
- return 0;
-}
-
-static av_cold int decode_init(AVCodecContext *avctx)
-{
- int ret;
-
- avctx->pix_fmt= AV_PIX_FMT_YUV420P;
-
- if ((ret = ff_snow_common_init(avctx)) < 0) {
- ff_snow_common_end(avctx->priv_data);
- return ret;
- }
-
- return 0;
-}
-
-static int decode_blocks(SnowContext *s){
- int x, y;
- int w= s->b_width;
- int h= s->b_height;
- int res;
-
- for(y=0; y<h; y++){
- for(x=0; x<w; x++){
- if ((res = decode_q_branch(s, 0, x, y)) < 0)
- return res;
- }
- }
- return 0;
-}
-
-static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
- AVPacket *avpkt)
-{
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- SnowContext *s = avctx->priv_data;
- RangeCoder * const c= &s->c;
- int bytes_read;
- AVFrame *picture = data;
- int level, orientation, plane_index;
- int res;
-
- ff_init_range_decoder(c, buf, buf_size);
- ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
-
- s->current_picture.pict_type= AV_PICTURE_TYPE_I; //FIXME I vs. P
- if(decode_header(s)<0)
- return -1;
- ff_snow_common_init_after_header(avctx);
-
- // realloc slice buffer for the case that spatial_decomposition_count changed
- ff_slice_buffer_destroy(&s->sb);
- if ((res = ff_slice_buffer_init(&s->sb, s->plane[0].height,
- (MB_SIZE >> s->block_max_depth) +
- s->spatial_decomposition_count * 8 + 1,
- s->plane[0].width,
- s->spatial_idwt_buffer)) < 0)
- return res;
-
- for(plane_index=0; plane_index<3; plane_index++){
- Plane *p= &s->plane[plane_index];
- p->fast_mc= p->diag_mc && p->htaps==6 && p->hcoeff[0]==40
- && p->hcoeff[1]==-10
- && p->hcoeff[2]==2;
- }
-
- ff_snow_alloc_blocks(s);
-
- if(ff_snow_frame_start(s) < 0)
- return -1;
- //keyframe flag duplication mess FIXME
- if(avctx->debug&FF_DEBUG_PICT_INFO)
- av_log(avctx, AV_LOG_ERROR, "keyframe:%d qlog:%d\n", s->keyframe, s->qlog);
-
- if ((res = decode_blocks(s)) < 0)
- return res;
-
- for(plane_index=0; plane_index<3; plane_index++){
- Plane *p= &s->plane[plane_index];
- int w= p->width;
- int h= p->height;
- int x, y;
- int decode_state[MAX_DECOMPOSITIONS][4][1]; /* Stored state info for unpack_coeffs. 1 variable per instance. */
-
- if(s->avctx->debug&2048){
- memset(s->spatial_dwt_buffer, 0, sizeof(DWTELEM)*w*h);
- predict_plane(s, s->spatial_idwt_buffer, plane_index, 1);
-
- for(y=0; y<h; y++){
- for(x=0; x<w; x++){
- int v= s->current_picture.data[plane_index][y*s->current_picture.linesize[plane_index] + x];
- s->mconly_picture.data[plane_index][y*s->mconly_picture.linesize[plane_index] + x]= v;
- }
- }
- }
-
- {
- for(level=0; level<s->spatial_decomposition_count; level++){
- for(orientation=level ? 1 : 0; orientation<4; orientation++){
- SubBand *b= &p->band[level][orientation];
- unpack_coeffs(s, b, b->parent, orientation);
- }
- }
- }
-
- {
- const int mb_h= s->b_height << s->block_max_depth;
- const int block_size = MB_SIZE >> s->block_max_depth;
- const int block_w = plane_index ? block_size/2 : block_size;
- int mb_y;
- DWTCompose cs[MAX_DECOMPOSITIONS];
- int yd=0, yq=0;
- int y;
- int end_y;
-
- ff_spatial_idwt_buffered_init(cs, &s->sb, w, h, 1, s->spatial_decomposition_type, s->spatial_decomposition_count);
- for(mb_y=0; mb_y<=mb_h; mb_y++){
-
- int slice_starty = block_w*mb_y;
- int slice_h = block_w*(mb_y+1);
- if (!(s->keyframe || s->avctx->debug&512)){
- slice_starty = FFMAX(0, slice_starty - (block_w >> 1));
- slice_h -= (block_w >> 1);
- }
-
- for(level=0; level<s->spatial_decomposition_count; level++){
- for(orientation=level ? 1 : 0; orientation<4; orientation++){
- SubBand *b= &p->band[level][orientation];
- int start_y;
- int end_y;
- int our_mb_start = mb_y;
- int our_mb_end = (mb_y + 1);
- const int extra= 3;
- start_y = (mb_y ? ((block_w * our_mb_start) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + extra: 0);
- end_y = (((block_w * our_mb_end) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + extra);
- if (!(s->keyframe || s->avctx->debug&512)){
- start_y = FFMAX(0, start_y - (block_w >> (1+s->spatial_decomposition_count - level)));
- end_y = FFMAX(0, end_y - (block_w >> (1+s->spatial_decomposition_count - level)));
- }
- start_y = FFMIN(b->height, start_y);
- end_y = FFMIN(b->height, end_y);
-
- if (start_y != end_y){
- if (orientation == 0){
- SubBand * correlate_band = &p->band[0][0];
- int correlate_end_y = FFMIN(b->height, end_y + 1);
- int correlate_start_y = FFMIN(b->height, (start_y ? start_y + 1 : 0));
- decode_subband_slice_buffered(s, correlate_band, &s->sb, correlate_start_y, correlate_end_y, decode_state[0][0]);
- correlate_slice_buffered(s, &s->sb, correlate_band, correlate_band->ibuf, correlate_band->stride, 1, 0, correlate_start_y, correlate_end_y);
- dequantize_slice_buffered(s, &s->sb, correlate_band, correlate_band->ibuf, correlate_band->stride, start_y, end_y);
- }
- else
- decode_subband_slice_buffered(s, b, &s->sb, start_y, end_y, decode_state[level][orientation]);
- }
- }
- }
-
- for(; yd<slice_h; yd+=4){
- ff_spatial_idwt_buffered_slice(&s->dwt, cs, &s->sb, s->temp_idwt_buffer, w, h, 1, s->spatial_decomposition_type, s->spatial_decomposition_count, yd);
- }
-
- if(s->qlog == LOSSLESS_QLOG){
- for(; yq<slice_h && yq<h; yq++){
- IDWTELEM * line = slice_buffer_get_line(&s->sb, yq);
- for(x=0; x<w; x++){
- line[x] <<= FRAC_BITS;
- }
- }
- }
-
- predict_slice_buffered(s, &s->sb, s->spatial_idwt_buffer, plane_index, 1, mb_y);
-
- y = FFMIN(p->height, slice_starty);
- end_y = FFMIN(p->height, slice_h);
- while(y < end_y)
- ff_slice_buffer_release(&s->sb, y++);
- }
-
- ff_slice_buffer_flush(&s->sb);
- }
-
- }
-
- emms_c();
-
- ff_snow_release_buffer(avctx);
-
- if(!(s->avctx->debug&2048))
- *picture= s->current_picture;
- else
- *picture= s->mconly_picture;
-
- *got_frame = 1;
-
- bytes_read= c->bytestream - c->bytestream_start;
- if(bytes_read ==0) av_log(s->avctx, AV_LOG_ERROR, "error at end of frame\n"); //FIXME
-
- return bytes_read;
-}
-
-static av_cold int decode_end(AVCodecContext *avctx)
-{
- SnowContext *s = avctx->priv_data;
-
- ff_slice_buffer_destroy(&s->sb);
-
- ff_snow_common_end(s);
-
- return 0;
-}
-
-AVCodec ff_snow_decoder = {
- .name = "snow",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_SNOW,
- .priv_data_size = sizeof(SnowContext),
- .init = decode_init,
- .close = decode_end,
- .decode = decode_frame,
- .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
- .long_name = NULL_IF_CONFIG_SMALL("Snow"),
-};

libav-v9.6.tar.bz2/libavcodec/snowenc.c Deleted

@@ -1,1939 +0,0 @@
-/*
- * Copyright (C) 2004 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavutil/intmath.h"
-#include "libavutil/log.h"
-#include "libavutil/opt.h"
-#include "avcodec.h"
-#include "dsputil.h"
-#include "internal.h"
-#include "dwt.h"
-#include "snow.h"
-
-#include "rangecoder.h"
-#include "mathops.h"
-
-#include "mpegvideo.h"
-#include "h263.h"
-
-#undef NDEBUG
-#include <assert.h>
-
-#define QUANTIZE2 0
-
-#if QUANTIZE2==1
-#define Q2_STEP 8
-
-static void find_sse(SnowContext *s, Plane *p, int *score, int score_stride, IDWTELEM *r0, IDWTELEM *r1, int level, int orientation){
- SubBand *b= &p->band[level][orientation];
- int x, y;
- int xo=0;
- int yo=0;
- int step= 1 << (s->spatial_decomposition_count - level);
-
- if(orientation&1)
- xo= step>>1;
- if(orientation&2)
- yo= step>>1;
-
- //FIXME bias for nonzero ?
- //FIXME optimize
- memset(score, 0, sizeof(*score)*score_stride*((p->height + Q2_STEP-1)/Q2_STEP));
- for(y=0; y<p->height; y++){
- for(x=0; x<p->width; x++){
- int sx= (x-xo + step/2) / step / Q2_STEP;
- int sy= (y-yo + step/2) / step / Q2_STEP;
- int v= r0[x + y*p->width] - r1[x + y*p->width];
- assert(sx>=0 && sy>=0 && sx < score_stride);
- v= ((v+8)>>4)<<4;
- score[sx + sy*score_stride] += v*v;
- assert(score[sx + sy*score_stride] >= 0);
- }
- }
-}
-
-static void dequantize_all(SnowContext *s, Plane *p, IDWTELEM *buffer, int width, int height){
- int level, orientation;
-
- for(level=0; level<s->spatial_decomposition_count; level++){
- for(orientation=level ? 1 : 0; orientation<4; orientation++){
- SubBand *b= &p->band[level][orientation];
- IDWTELEM *dst= buffer + (b->ibuf - s->spatial_idwt_buffer);
-
- dequantize(s, b, dst, b->stride);
- }
- }
-}
-
-static void dwt_quantize(SnowContext *s, Plane *p, DWTELEM *buffer, int width, int height, int stride, int type){
- int level, orientation, ys, xs, x, y, pass;
- IDWTELEM best_dequant[height * stride];
- IDWTELEM idwt2_buffer[height * stride];
- const int score_stride= (width + 10)/Q2_STEP;
- int best_score[(width + 10)/Q2_STEP * (height + 10)/Q2_STEP]; //FIXME size
- int score[(width + 10)/Q2_STEP * (height + 10)/Q2_STEP]; //FIXME size
- int threshold= (s->m.lambda * s->m.lambda) >> 6;
-
- //FIXME pass the copy cleanly ?
-
-// memcpy(dwt_buffer, buffer, height * stride * sizeof(DWTELEM));
- ff_spatial_dwt(buffer, s->temp_dwt_buffer, width, height, stride, type, s->spatial_decomposition_count);
-
- for(level=0; level<s->spatial_decomposition_count; level++){
- for(orientation=level ? 1 : 0; orientation<4; orientation++){
- SubBand *b= &p->band[level][orientation];
- IDWTELEM *dst= best_dequant + (b->ibuf - s->spatial_idwt_buffer);
- DWTELEM *src= buffer + (b-> buf - s->spatial_dwt_buffer);
- assert(src == b->buf); // code does not depend on this but it is true currently
-
- quantize(s, b, dst, src, b->stride, s->qbias);
- }
- }
- for(pass=0; pass<1; pass++){
- if(s->qbias == 0) //keyframe
- continue;
- for(level=0; level<s->spatial_decomposition_count; level++){
- for(orientation=level ? 1 : 0; orientation<4; orientation++){
- SubBand *b= &p->band[level][orientation];
- IDWTELEM *dst= idwt2_buffer + (b->ibuf - s->spatial_idwt_buffer);
- IDWTELEM *best_dst= best_dequant + (b->ibuf - s->spatial_idwt_buffer);
-
- for(ys= 0; ys<Q2_STEP; ys++){
- for(xs= 0; xs<Q2_STEP; xs++){
- memcpy(idwt2_buffer, best_dequant, height * stride * sizeof(IDWTELEM));
- dequantize_all(s, p, idwt2_buffer, width, height);
- ff_spatial_idwt(idwt2_buffer, s->temp_idwt_buffer, width, height, stride, type, s->spatial_decomposition_count);
- find_sse(s, p, best_score, score_stride, idwt2_buffer, s->spatial_idwt_buffer, level, orientation);
- memcpy(idwt2_buffer, best_dequant, height * stride * sizeof(IDWTELEM));
- for(y=ys; y<b->height; y+= Q2_STEP){
- for(x=xs; x<b->width; x+= Q2_STEP){
- if(dst[x + y*b->stride]<0) dst[x + y*b->stride]++;
- if(dst[x + y*b->stride]>0) dst[x + y*b->stride]--;
- //FIXME try more than just --
- }
- }
- dequantize_all(s, p, idwt2_buffer, width, height);
- ff_spatial_idwt(idwt2_buffer, s->temp_idwt_buffer, width, height, stride, type, s->spatial_decomposition_count);
- find_sse(s, p, score, score_stride, idwt2_buffer, s->spatial_idwt_buffer, level, orientation);
- for(y=ys; y<b->height; y+= Q2_STEP){
- for(x=xs; x<b->width; x+= Q2_STEP){
- int score_idx= x/Q2_STEP + (y/Q2_STEP)*score_stride;
- if(score[score_idx] <= best_score[score_idx] + threshold){
- best_score[score_idx]= score[score_idx];
- if(best_dst[x + y*b->stride]<0) best_dst[x + y*b->stride]++;
- if(best_dst[x + y*b->stride]>0) best_dst[x + y*b->stride]--;
- //FIXME copy instead
- }
- }
- }
- }
- }
- }
- }
- }
- memcpy(s->spatial_idwt_buffer, best_dequant, height * stride * sizeof(IDWTELEM)); //FIXME work with that directly instead of copy at the end
-}
-
-#endif /* QUANTIZE2==1 */
-
-static av_cold int encode_init(AVCodecContext *avctx)
-{
- SnowContext *s = avctx->priv_data;
- int plane_index, ret;
-
- if(avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL){
- av_log(avctx, AV_LOG_ERROR, "This codec 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 -1;
- }
-
- if(avctx->prediction_method == DWT_97
- && (avctx->flags & CODEC_FLAG_QSCALE)
- && avctx->global_quality == 0){
- av_log(avctx, AV_LOG_ERROR, "The 9/7 wavelet is incompatible with lossless mode.\n");
- return -1;
- }
-
- s->spatial_decomposition_type= avctx->prediction_method; //FIXME add decorrelator type r transform_type
-
- s->mv_scale = (avctx->flags & CODEC_FLAG_QPEL) ? 2 : 4;
- s->block_max_depth= (avctx->flags & CODEC_FLAG_4MV ) ? 1 : 0;
-
- for(plane_index=0; plane_index<3; plane_index++){
- s->plane[plane_index].diag_mc= 1;
- s->plane[plane_index].htaps= 6;
- s->plane[plane_index].hcoeff[0]= 40;
- s->plane[plane_index].hcoeff[1]= -10;
- s->plane[plane_index].hcoeff[2]= 2;
- s->plane[plane_index].fast_mc= 1;
- }
-
- if ((ret = ff_snow_common_init(avctx)) < 0) {
- ff_snow_common_end(avctx->priv_data);
- return ret;
- }
- ff_snow_alloc_blocks(s);
-
- s->version=0;
-
- s->m.avctx = avctx;
- s->m.flags = avctx->flags;
- s->m.bit_rate= avctx->bit_rate;
-
- s->m.me.temp =
- s->m.me.scratchpad= av_mallocz((avctx->width+64)*2*16*2*sizeof(uint8_t));
- s->m.me.map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
- s->m.me.score_map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));
- s->m.obmc_scratchpad= av_mallocz(MB_SIZE*MB_SIZE*12*sizeof(uint32_t));
- ff_h263_encode_init(&s->m); //mv_penalty
-
- s->max_ref_frames = FFMAX(FFMIN(avctx->refs, MAX_REF_FRAMES), 1);
-
- if(avctx->flags&CODEC_FLAG_PASS1){
- if(!avctx->stats_out)
- avctx->stats_out = av_mallocz(256);
- }
- if((avctx->flags&CODEC_FLAG_PASS2) || !(avctx->flags&CODEC_FLAG_QSCALE)){
- if(ff_rate_control_init(&s->m) < 0)
- return -1;
- }
- s->pass1_rc= !(avctx->flags & (CODEC_FLAG_QSCALE|CODEC_FLAG_PASS2));
-
- avctx->coded_frame= &s->current_picture;
- switch(avctx->pix_fmt){
-// case AV_PIX_FMT_YUV444P:
-// case AV_PIX_FMT_YUV422P:
- case AV_PIX_FMT_YUV420P:
- case AV_PIX_FMT_GRAY8:
-// case AV_PIX_FMT_YUV411P:
-// case AV_PIX_FMT_YUV410P:
- s->colorspace_type= 0;
- break;
-/* case AV_PIX_FMT_RGB32:
- s->colorspace= 1;
- break;*/
- default:
- av_log(avctx, AV_LOG_ERROR, "pixel format not supported\n");
- return -1;
- }
-// avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_h_shift, &s->chroma_v_shift);
- s->chroma_h_shift= 1;
- s->chroma_v_shift= 1;
-
- ff_set_cmp(&s->dsp, s->dsp.me_cmp, s->avctx->me_cmp);
- ff_set_cmp(&s->dsp, s->dsp.me_sub_cmp, s->avctx->me_sub_cmp);
-
- ff_get_buffer(s->avctx, &s->input_picture);
-
- if(s->avctx->me_method == ME_ITER){
- int i;
- int size= s->b_width * s->b_height << 2*s->block_max_depth;
- for(i=0; i<s->max_ref_frames; i++){
- s->ref_mvs[i]= av_mallocz(size*sizeof(int16_t[2]));
- s->ref_scores[i]= av_mallocz(size*sizeof(uint32_t));
- }
- }
-
- return 0;
-}
-
-//near copy & paste from dsputil, FIXME
-static int pix_sum(uint8_t * pix, int line_size, int w)
-{
- int s, i, j;
-
- s = 0;
- for (i = 0; i < w; i++) {
- for (j = 0; j < w; j++) {
- s += pix[0];
- pix ++;
- }
- pix += line_size - w;
- }
- return s;
-}
-
-//near copy & paste from dsputil, FIXME
-static int pix_norm1(uint8_t * pix, int line_size, int w)
-{
- int s, i, j;
- uint32_t *sq = ff_squareTbl + 256;
-
- s = 0;
- for (i = 0; i < w; i++) {
- for (j = 0; j < w; j ++) {
- s += sq[pix[0]];
- pix ++;
- }
- pix += line_size - w;
- }
- return s;
-}
-
-//FIXME copy&paste
-#define P_LEFT P[1]
-#define P_TOP P[2]
-#define P_TOPRIGHT P[3]
-#define P_MEDIAN P[4]
-#define P_MV1 P[9]
-#define FLAG_QPEL 1 //must be 1
-
-static int encode_q_branch(SnowContext *s, int level, int x, int y){
- uint8_t p_buffer[1024];
- uint8_t i_buffer[1024];
- uint8_t p_state[sizeof(s->block_state)];
- uint8_t i_state[sizeof(s->block_state)];
- RangeCoder pc, ic;
- uint8_t *pbbak= s->c.bytestream;
- uint8_t *pbbak_start= s->c.bytestream_start;
- int score, score2, iscore, i_len, p_len, block_s, sum, base_bits;
- const int w= s->b_width << s->block_max_depth;
- const int h= s->b_height << s->block_max_depth;
- const int rem_depth= s->block_max_depth - level;
- const int index= (x + y*w) << rem_depth;
- const int block_w= 1<<(LOG2_MB_SIZE - level);
- int trx= (x+1)<<rem_depth;
- int try= (y+1)<<rem_depth;
- const BlockNode *left = x ? &s->block[index-1] : &null_block;
- const BlockNode *top = y ? &s->block[index-w] : &null_block;
- const BlockNode *right = trx<w ? &s->block[index+1] : &null_block;
- const BlockNode *bottom= try<h ? &s->block[index+w] : &null_block;
- const BlockNode *tl = y && x ? &s->block[index-w-1] : left;
- const BlockNode *tr = y && trx<w && ((x&1)==0 || level==0) ? &s->block[index-w+(1<<rem_depth)] : tl; //FIXME use lt
- int pl = left->color[0];
- int pcb= left->color[1];
- int pcr= left->color[2];
- int pmx, pmy;
- int mx=0, my=0;
- int l,cr,cb;
- const int stride= s->current_picture.linesize[0];
- const int uvstride= s->current_picture.linesize[1];
- uint8_t *current_data[3]= { s->input_picture.data[0] + (x + y* stride)*block_w,
- s->input_picture.data[1] + (x + y*uvstride)*block_w/2,
- s->input_picture.data[2] + (x + y*uvstride)*block_w/2};
- int P[10][2];
- int16_t last_mv[3][2];
- int qpel= !!(s->avctx->flags & CODEC_FLAG_QPEL); //unused
- const int shift= 1+qpel;
- MotionEstContext *c= &s->m.me;
- int ref_context= av_log2(2*left->ref) + av_log2(2*top->ref);
- int mx_context= av_log2(2*FFABS(left->mx - top->mx));
- int my_context= av_log2(2*FFABS(left->my - top->my));
- int s_context= 2*left->level + 2*top->level + tl->level + tr->level;
- int ref, best_ref, ref_score, ref_mx, ref_my;
-
- assert(sizeof(s->block_state) >= 256);
- if(s->keyframe){
- set_blocks(s, level, x, y, pl, pcb, pcr, 0, 0, 0, BLOCK_INTRA);
- return 0;
- }
-
-// clip predictors / edge ?
-
- P_LEFT[0]= left->mx;
- P_LEFT[1]= left->my;
- P_TOP [0]= top->mx;
- P_TOP [1]= top->my;
- P_TOPRIGHT[0]= tr->mx;
- P_TOPRIGHT[1]= tr->my;
-
- last_mv[0][0]= s->block[index].mx;
- last_mv[0][1]= s->block[index].my;
- last_mv[1][0]= right->mx;
- last_mv[1][1]= right->my;
- last_mv[2][0]= bottom->mx;
- last_mv[2][1]= bottom->my;
-
- s->m.mb_stride=2;
- s->m.mb_x=
- s->m.mb_y= 0;
- c->skip= 0;
-
- assert(c-> stride == stride);
- assert(c->uvstride == uvstride);
-
- c->penalty_factor = get_penalty_factor(s->lambda, s->lambda2, c->avctx->me_cmp);
- c->sub_penalty_factor= get_penalty_factor(s->lambda, s->lambda2, c->avctx->me_sub_cmp);
- c->mb_penalty_factor = get_penalty_factor(s->lambda, s->lambda2, c->avctx->mb_cmp);
- c->current_mv_penalty= c->mv_penalty[s->m.f_code=1] + MAX_MV;
-
- c->xmin = - x*block_w - 16+3;
- c->ymin = - y*block_w - 16+3;
- c->xmax = - (x+1)*block_w + (w<<(LOG2_MB_SIZE - s->block_max_depth)) + 16-3;
- c->ymax = - (y+1)*block_w + (h<<(LOG2_MB_SIZE - s->block_max_depth)) + 16-3;
-
- if(P_LEFT[0] > (c->xmax<<shift)) P_LEFT[0] = (c->xmax<<shift);
- if(P_LEFT[1] > (c->ymax<<shift)) P_LEFT[1] = (c->ymax<<shift);
- if(P_TOP[0] > (c->xmax<<shift)) P_TOP[0] = (c->xmax<<shift);
- if(P_TOP[1] > (c->ymax<<shift)) P_TOP[1] = (c->ymax<<shift);
- if(P_TOPRIGHT[0] < (c->xmin<<shift)) P_TOPRIGHT[0]= (c->xmin<<shift);
- if(P_TOPRIGHT[0] > (c->xmax<<shift)) P_TOPRIGHT[0]= (c->xmax<<shift); //due to pmx no clip
- if(P_TOPRIGHT[1] > (c->ymax<<shift)) P_TOPRIGHT[1]= (c->ymax<<shift);
-
- P_MEDIAN[0]= mid_pred(P_LEFT[0], P_TOP[0], P_TOPRIGHT[0]);
- P_MEDIAN[1]= mid_pred(P_LEFT[1], P_TOP[1], P_TOPRIGHT[1]);
-
- if (!y) {
- c->pred_x= P_LEFT[0];
- c->pred_y= P_LEFT[1];
- } else {
- c->pred_x = P_MEDIAN[0];
- c->pred_y = P_MEDIAN[1];
- }
-
- score= INT_MAX;
- best_ref= 0;
- for(ref=0; ref<s->ref_frames; ref++){
- init_ref(c, current_data, s->last_picture[ref].data, NULL, block_w*x, block_w*y, 0);
-
- ref_score= ff_epzs_motion_search(&s->m, &ref_mx, &ref_my, P, 0, /*ref_index*/ 0, last_mv,
- (1<<16)>>shift, level-LOG2_MB_SIZE+4, block_w);
-
- assert(ref_mx >= c->xmin);
- assert(ref_mx <= c->xmax);
- assert(ref_my >= c->ymin);
- assert(ref_my <= c->ymax);
-
- ref_score= c->sub_motion_search(&s->m, &ref_mx, &ref_my, ref_score, 0, 0, level-LOG2_MB_SIZE+4, block_w);
- ref_score= ff_get_mb_score(&s->m, ref_mx, ref_my, 0, 0, level-LOG2_MB_SIZE+4, block_w, 0);
- ref_score+= 2*av_log2(2*ref)*c->penalty_factor;
- if(s->ref_mvs[ref]){
- s->ref_mvs[ref][index][0]= ref_mx;
- s->ref_mvs[ref][index][1]= ref_my;
- s->ref_scores[ref][index]= ref_score;
- }
- if(score > ref_score){
- score= ref_score;
- best_ref= ref;
- mx= ref_mx;
- my= ref_my;
- }
- }
- //FIXME if mb_cmp != SSE then intra cannot be compared currently and mb_penalty vs. lambda2
-
- // subpel search
- base_bits= get_rac_count(&s->c) - 8*(s->c.bytestream - s->c.bytestream_start);
- pc= s->c;
- pc.bytestream_start=
- pc.bytestream= p_buffer; //FIXME end/start? and at the other stoo
- memcpy(p_state, s->block_state, sizeof(s->block_state));
-
- if(level!=s->block_max_depth)
- put_rac(&pc, &p_state[4 + s_context], 1);
- put_rac(&pc, &p_state[1 + left->type + top->type], 0);
- if(s->ref_frames > 1)
- put_symbol(&pc, &p_state[128 + 1024 + 32*ref_context], best_ref, 0);
- pred_mv(s, &pmx, &pmy, best_ref, left, top, tr);
- put_symbol(&pc, &p_state[128 + 32*(mx_context + 16*!!best_ref)], mx - pmx, 1);
- put_symbol(&pc, &p_state[128 + 32*(my_context + 16*!!best_ref)], my - pmy, 1);
- p_len= pc.bytestream - pc.bytestream_start;
- score += (s->lambda2*(get_rac_count(&pc)-base_bits))>>FF_LAMBDA_SHIFT;
-
- block_s= block_w*block_w;
- sum = pix_sum(current_data[0], stride, block_w);
- l= (sum + block_s/2)/block_s;
- iscore = pix_norm1(current_data[0], stride, block_w) - 2*l*sum + l*l*block_s;
-
- block_s= block_w*block_w>>2;
- sum = pix_sum(current_data[1], uvstride, block_w>>1);
- cb= (sum + block_s/2)/block_s;
-// iscore += pix_norm1(&current_mb[1][0], uvstride, block_w>>1) - 2*cb*sum + cb*cb*block_s;
- sum = pix_sum(current_data[2], uvstride, block_w>>1);
- cr= (sum + block_s/2)/block_s;
-// iscore += pix_norm1(&current_mb[2][0], uvstride, block_w>>1) - 2*cr*sum + cr*cr*block_s;
-
- ic= s->c;
- ic.bytestream_start=
- ic.bytestream= i_buffer; //FIXME end/start? and at the other stoo
- memcpy(i_state, s->block_state, sizeof(s->block_state));
- if(level!=s->block_max_depth)
- put_rac(&ic, &i_state[4 + s_context], 1);
- put_rac(&ic, &i_state[1 + left->type + top->type], 1);
- put_symbol(&ic, &i_state[32], l-pl , 1);
- put_symbol(&ic, &i_state[64], cb-pcb, 1);
- put_symbol(&ic, &i_state[96], cr-pcr, 1);
- i_len= ic.bytestream - ic.bytestream_start;
- iscore += (s->lambda2*(get_rac_count(&ic)-base_bits))>>FF_LAMBDA_SHIFT;
-
-// assert(score==256*256*256*64-1);
- assert(iscore < 255*255*256 + s->lambda2*10);
- assert(iscore >= 0);
- assert(l>=0 && l<=255);
- assert(pl>=0 && pl<=255);
-
- if(level==0){
- int varc= iscore >> 8;
- int vard= score >> 8;
- if (vard <= 64 || vard < varc)
- c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc);
- else
- c->scene_change_score+= s->m.qscale;
- }
-
- if(level!=s->block_max_depth){
- put_rac(&s->c, &s->block_state[4 + s_context], 0);
- score2 = encode_q_branch(s, level+1, 2*x+0, 2*y+0);
- score2+= encode_q_branch(s, level+1, 2*x+1, 2*y+0);
- score2+= encode_q_branch(s, level+1, 2*x+0, 2*y+1);
- score2+= encode_q_branch(s, level+1, 2*x+1, 2*y+1);
- score2+= s->lambda2>>FF_LAMBDA_SHIFT; //FIXME exact split overhead
-
- if(score2 < score && score2 < iscore)
- return score2;
- }
-
- if(iscore < score){
- pred_mv(s, &pmx, &pmy, 0, left, top, tr);
- memcpy(pbbak, i_buffer, i_len);
- s->c= ic;
- s->c.bytestream_start= pbbak_start;
- s->c.bytestream= pbbak + i_len;
- set_blocks(s, level, x, y, l, cb, cr, pmx, pmy, 0, BLOCK_INTRA);
- memcpy(s->block_state, i_state, sizeof(s->block_state));
- return iscore;
- }else{
- memcpy(pbbak, p_buffer, p_len);
- s->c= pc;
- s->c.bytestream_start= pbbak_start;
- s->c.bytestream= pbbak + p_len;
- set_blocks(s, level, x, y, pl, pcb, pcr, mx, my, best_ref, 0);
- memcpy(s->block_state, p_state, sizeof(s->block_state));
- return score;
- }
-}
-
-static void encode_q_branch2(SnowContext *s, int level, int x, int y){
- const int w= s->b_width << s->block_max_depth;
- const int rem_depth= s->block_max_depth - level;
- const int index= (x + y*w) << rem_depth;
- int trx= (x+1)<<rem_depth;
- BlockNode *b= &s->block[index];
- const BlockNode *left = x ? &s->block[index-1] : &null_block;
- const BlockNode *top = y ? &s->block[index-w] : &null_block;
- const BlockNode *tl = y && x ? &s->block[index-w-1] : left;
- const BlockNode *tr = y && trx<w && ((x&1)==0 || level==0) ? &s->block[index-w+(1<<rem_depth)] : tl; //FIXME use lt
- int pl = left->color[0];
- int pcb= left->color[1];
- int pcr= left->color[2];
- int pmx, pmy;
- int ref_context= av_log2(2*left->ref) + av_log2(2*top->ref);
- int mx_context= av_log2(2*FFABS(left->mx - top->mx)) + 16*!!b->ref;
- int my_context= av_log2(2*FFABS(left->my - top->my)) + 16*!!b->ref;
- int s_context= 2*left->level + 2*top->level + tl->level + tr->level;
-
- if(s->keyframe){
- set_blocks(s, level, x, y, pl, pcb, pcr, 0, 0, 0, BLOCK_INTRA);
- return;
- }
-
- if(level!=s->block_max_depth){
- if(same_block(b,b+1) && same_block(b,b+w) && same_block(b,b+w+1)){
- put_rac(&s->c, &s->block_state[4 + s_context], 1);
- }else{
- put_rac(&s->c, &s->block_state[4 + s_context], 0);
- encode_q_branch2(s, level+1, 2*x+0, 2*y+0);
- encode_q_branch2(s, level+1, 2*x+1, 2*y+0);
- encode_q_branch2(s, level+1, 2*x+0, 2*y+1);
- encode_q_branch2(s, level+1, 2*x+1, 2*y+1);
- return;
- }
- }
- if(b->type & BLOCK_INTRA){
- pred_mv(s, &pmx, &pmy, 0, left, top, tr);
- put_rac(&s->c, &s->block_state[1 + (left->type&1) + (top->type&1)], 1);
- put_symbol(&s->c, &s->block_state[32], b->color[0]-pl , 1);
- put_symbol(&s->c, &s->block_state[64], b->color[1]-pcb, 1);
- put_symbol(&s->c, &s->block_state[96], b->color[2]-pcr, 1);
- set_blocks(s, level, x, y, b->color[0], b->color[1], b->color[2], pmx, pmy, 0, BLOCK_INTRA);
- }else{
- pred_mv(s, &pmx, &pmy, b->ref, left, top, tr);
- put_rac(&s->c, &s->block_state[1 + (left->type&1) + (top->type&1)], 0);
- if(s->ref_frames > 1)
- put_symbol(&s->c, &s->block_state[128 + 1024 + 32*ref_context], b->ref, 0);
- put_symbol(&s->c, &s->block_state[128 + 32*mx_context], b->mx - pmx, 1);
- put_symbol(&s->c, &s->block_state[128 + 32*my_context], b->my - pmy, 1);
- set_blocks(s, level, x, y, pl, pcb, pcr, b->mx, b->my, b->ref, 0);
- }
-}
-
-static int get_dc(SnowContext *s, int mb_x, int mb_y, int plane_index){
- int i, x2, y2;
- Plane *p= &s->plane[plane_index];
- const int block_size = MB_SIZE >> s->block_max_depth;
- const int block_w = plane_index ? block_size/2 : block_size;
- const uint8_t *obmc = plane_index ? ff_obmc_tab[s->block_max_depth+1] : ff_obmc_tab[s->block_max_depth];
- const int obmc_stride= plane_index ? block_size : 2*block_size;
- const int ref_stride= s->current_picture.linesize[plane_index];
- uint8_t *src= s-> input_picture.data[plane_index];
- IDWTELEM *dst= (IDWTELEM*)s->m.obmc_scratchpad + plane_index*block_size*block_size*4; //FIXME change to unsigned
- const int b_stride = s->b_width << s->block_max_depth;
- const int w= p->width;
- const int h= p->height;
- int index= mb_x + mb_y*b_stride;
- BlockNode *b= &s->block[index];
- BlockNode backup= *b;
- int ab=0;
- int aa=0;
-
- b->type|= BLOCK_INTRA;
- b->color[plane_index]= 0;
- memset(dst, 0, obmc_stride*obmc_stride*sizeof(IDWTELEM));
-
- for(i=0; i<4; i++){
- int mb_x2= mb_x + (i &1) - 1;
- int mb_y2= mb_y + (i>>1) - 1;
- int x= block_w*mb_x2 + block_w/2;
- int y= block_w*mb_y2 + block_w/2;
-
- add_yblock(s, 0, NULL, dst + ((i&1)+(i>>1)*obmc_stride)*block_w, NULL, obmc,
- x, y, block_w, block_w, w, h, obmc_stride, ref_stride, obmc_stride, mb_x2, mb_y2, 0, 0, plane_index);
-
- for(y2= FFMAX(y, 0); y2<FFMIN(h, y+block_w); y2++){
- for(x2= FFMAX(x, 0); x2<FFMIN(w, x+block_w); x2++){
- int index= x2-(block_w*mb_x - block_w/2) + (y2-(block_w*mb_y - block_w/2))*obmc_stride;
- int obmc_v= obmc[index];
- int d;
- if(y<0) obmc_v += obmc[index + block_w*obmc_stride];
- if(x<0) obmc_v += obmc[index + block_w];
- if(y+block_w>h) obmc_v += obmc[index - block_w*obmc_stride];
- if(x+block_w>w) obmc_v += obmc[index - block_w];
- //FIXME precalculate this or simplify it somehow else
-
- d = -dst[index] + (1<<(FRAC_BITS-1));
- dst[index] = d;
- ab += (src[x2 + y2*ref_stride] - (d>>FRAC_BITS)) * obmc_v;
- aa += obmc_v * obmc_v; //FIXME precalculate this
- }
- }
- }
- *b= backup;
-
- return av_clip(((ab<<LOG2_OBMC_MAX) + aa/2)/aa, 0, 255); //FIXME we should not need clipping
-}
-
-static inline int get_block_bits(SnowContext *s, int x, int y, int w){
- const int b_stride = s->b_width << s->block_max_depth;
- const int b_height = s->b_height<< s->block_max_depth;
- int index= x + y*b_stride;
- const BlockNode *b = &s->block[index];
- const BlockNode *left = x ? &s->block[index-1] : &null_block;
- const BlockNode *top = y ? &s->block[index-b_stride] : &null_block;
- const BlockNode *tl = y && x ? &s->block[index-b_stride-1] : left;
- const BlockNode *tr = y && x+w<b_stride ? &s->block[index-b_stride+w] : tl;
- int dmx, dmy;
-// int mx_context= av_log2(2*FFABS(left->mx - top->mx));
-// int my_context= av_log2(2*FFABS(left->my - top->my));
-
- if(x<0 || x>=b_stride || y>=b_height)
- return 0;
-/*
-1 0 0
-01X 1-2 1
-001XX 3-6 2-3
-0001XXX 7-14 4-7
-00001XXXX 15-30 8-15
-*/
-//FIXME try accurate rate
-//FIXME intra and inter predictors if surrounding blocks are not the same type
- if(b->type & BLOCK_INTRA){
- return 3+2*( av_log2(2*FFABS(left->color[0] - b->color[0]))
- + av_log2(2*FFABS(left->color[1] - b->color[1]))
- + av_log2(2*FFABS(left->color[2] - b->color[2])));
- }else{
- pred_mv(s, &dmx, &dmy, b->ref, left, top, tr);
- dmx-= b->mx;
- dmy-= b->my;
- return 2*(1 + av_log2(2*FFABS(dmx)) //FIXME kill the 2* can be merged in lambda
- + av_log2(2*FFABS(dmy))
- + av_log2(2*b->ref));
- }
-}
-
-static int get_block_rd(SnowContext *s, int mb_x, int mb_y, int plane_index, uint8_t (*obmc_edged)[MB_SIZE * 2]){
- Plane *p= &s->plane[plane_index];
- const int block_size = MB_SIZE >> s->block_max_depth;
- const int block_w = plane_index ? block_size/2 : block_size;
- const int obmc_stride= plane_index ? block_size : 2*block_size;
- const int ref_stride= s->current_picture.linesize[plane_index];
- uint8_t *dst= s->current_picture.data[plane_index];
- uint8_t *src= s-> input_picture.data[plane_index];
- IDWTELEM *pred= (IDWTELEM*)s->m.obmc_scratchpad + plane_index*block_size*block_size*4;
- uint8_t *cur = s->scratchbuf;
- uint8_t *tmp = s->emu_edge_buffer;
- const int b_stride = s->b_width << s->block_max_depth;
- const int b_height = s->b_height<< s->block_max_depth;
- const int w= p->width;
- const int h= p->height;
- int distortion;
- int rate= 0;
- const int penalty_factor= get_penalty_factor(s->lambda, s->lambda2, s->avctx->me_cmp);
- int sx= block_w*mb_x - block_w/2;
- int sy= block_w*mb_y - block_w/2;
- int x0= FFMAX(0,-sx);
- int y0= FFMAX(0,-sy);
- int x1= FFMIN(block_w*2, w-sx);
- int y1= FFMIN(block_w*2, h-sy);
- int i,x,y;
-
- ff_snow_pred_block(s, cur, tmp, ref_stride, sx, sy, block_w*2, block_w*2, &s->block[mb_x + mb_y*b_stride], plane_index, w, h);
-
- for(y=y0; y<y1; y++){
- const uint8_t *obmc1= obmc_edged[y];
- const IDWTELEM *pred1 = pred + y*obmc_stride;
- uint8_t *cur1 = cur + y*ref_stride;
- uint8_t *dst1 = dst + sx + (sy+y)*ref_stride;
- for(x=x0; x<x1; x++){
-#if FRAC_BITS >= LOG2_OBMC_MAX
- int v = (cur1[x] * obmc1[x]) << (FRAC_BITS - LOG2_OBMC_MAX);
-#else
- int v = (cur1[x] * obmc1[x] + (1<<(LOG2_OBMC_MAX - FRAC_BITS-1))) >> (LOG2_OBMC_MAX - FRAC_BITS);
-#endif
- v = (v + pred1[x]) >> FRAC_BITS;
- if(v&(~255)) v= ~(v>>31);
- dst1[x] = v;
- }
- }
-
- /* copy the regions where obmc[] = (uint8_t)256 */
- if(LOG2_OBMC_MAX == 8
- && (mb_x == 0 || mb_x == b_stride-1)
- && (mb_y == 0 || mb_y == b_height-1)){
- if(mb_x == 0)
- x1 = block_w;
- else
- x0 = block_w;
- if(mb_y == 0)
- y1 = block_w;
- else
- y0 = block_w;
- for(y=y0; y<y1; y++)
- memcpy(dst + sx+x0 + (sy+y)*ref_stride, cur + x0 + y*ref_stride, x1-x0);
- }
-
- if(block_w==16){
- /* FIXME rearrange dsputil to fit 32x32 cmp functions */
- /* FIXME check alignment of the cmp wavelet vs the encoding wavelet */
- /* FIXME cmps overlap but do not cover the wavelet's whole support.
- * So improving the score of one block is not strictly guaranteed
- * to improve the score of the whole frame, thus iterative motion
- * estimation does not always converge. */
- if(s->avctx->me_cmp == FF_CMP_W97)
- distortion = ff_w97_32_c(&s->m, src + sx + sy*ref_stride, dst + sx + sy*ref_stride, ref_stride, 32);
- else if(s->avctx->me_cmp == FF_CMP_W53)
- distortion = ff_w53_32_c(&s->m, src + sx + sy*ref_stride, dst + sx + sy*ref_stride, ref_stride, 32);
- else{
- distortion = 0;
- for(i=0; i<4; i++){
- int off = sx+16*(i&1) + (sy+16*(i>>1))*ref_stride;
- distortion += s->dsp.me_cmp[0](&s->m, src + off, dst + off, ref_stride, 16);
- }
- }
- }else{
- assert(block_w==8);
- distortion = s->dsp.me_cmp[0](&s->m, src + sx + sy*ref_stride, dst + sx + sy*ref_stride, ref_stride, block_w*2);
- }
-
- if(plane_index==0){
- for(i=0; i<4; i++){
-/* ..RRr
- * .RXx.
- * rxx..
- */
- rate += get_block_bits(s, mb_x + (i&1) - (i>>1), mb_y + (i>>1), 1);
- }
- if(mb_x == b_stride-2)
- rate += get_block_bits(s, mb_x + 1, mb_y + 1, 1);
- }
- return distortion + rate*penalty_factor;
-}
-
-static int get_4block_rd(SnowContext *s, int mb_x, int mb_y, int plane_index){
- int i, y2;
- Plane *p= &s->plane[plane_index];
- const int block_size = MB_SIZE >> s->block_max_depth;
- const int block_w = plane_index ? block_size/2 : block_size;
- const uint8_t *obmc = plane_index ? ff_obmc_tab[s->block_max_depth+1] : ff_obmc_tab[s->block_max_depth];
- const int obmc_stride= plane_index ? block_size : 2*block_size;
- const int ref_stride= s->current_picture.linesize[plane_index];
- uint8_t *dst= s->current_picture.data[plane_index];
- uint8_t *src= s-> input_picture.data[plane_index];
- //FIXME zero_dst is const but add_yblock changes dst if add is 0 (this is never the case for dst=zero_dst
- // const has only been removed from zero_dst to suppress a warning
- static IDWTELEM zero_dst[4096]; //FIXME
- const int b_stride = s->b_width << s->block_max_depth;
- const int w= p->width;
- const int h= p->height;
- int distortion= 0;
- int rate= 0;
- const int penalty_factor= get_penalty_factor(s->lambda, s->lambda2, s->avctx->me_cmp);
-
- for(i=0; i<9; i++){
- int mb_x2= mb_x + (i%3) - 1;
- int mb_y2= mb_y + (i/3) - 1;
- int x= block_w*mb_x2 + block_w/2;
- int y= block_w*mb_y2 + block_w/2;
-
- add_yblock(s, 0, NULL, zero_dst, dst, obmc,
- x, y, block_w, block_w, w, h, /*dst_stride*/0, ref_stride, obmc_stride, mb_x2, mb_y2, 1, 1, plane_index);
-
- //FIXME find a cleaner/simpler way to skip the outside stuff
- for(y2= y; y2<0; y2++)
- memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, block_w);
- for(y2= h; y2<y+block_w; y2++)
- memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, block_w);
- if(x<0){
- for(y2= y; y2<y+block_w; y2++)
- memcpy(dst + x + y2*ref_stride, src + x + y2*ref_stride, -x);
- }
- if(x+block_w > w){
- for(y2= y; y2<y+block_w; y2++)
- memcpy(dst + w + y2*ref_stride, src + w + y2*ref_stride, x+block_w - w);
- }
-
- assert(block_w== 8 || block_w==16);
- distortion += s->dsp.me_cmp[block_w==8](&s->m, src + x + y*ref_stride, dst + x + y*ref_stride, ref_stride, block_w);
- }
-
- if(plane_index==0){
- BlockNode *b= &s->block[mb_x+mb_y*b_stride];
- int merged= same_block(b,b+1) && same_block(b,b+b_stride) && same_block(b,b+b_stride+1);
-
-/* ..RRRr
- * .RXXx.
- * .RXXx.
- * rxxx.
- */
- if(merged)
- rate = get_block_bits(s, mb_x, mb_y, 2);
- for(i=merged?4:0; i<9; i++){
- static const int dxy[9][2] = {{0,0},{1,0},{0,1},{1,1},{2,0},{2,1},{-1,2},{0,2},{1,2}};
- rate += get_block_bits(s, mb_x + dxy[i][0], mb_y + dxy[i][1], 1);
- }
- }
- return distortion + rate*penalty_factor;
-}
-
-static int encode_subband_c0run(SnowContext *s, SubBand *b, IDWTELEM *src, IDWTELEM *parent, int stride, int orientation){
- const int w= b->width;
- const int h= b->height;
- int x, y;
-
- if(1){
- int run=0;
- int *runs = s->run_buffer;
- int run_index=0;
- int max_index;
-
- for(y=0; y<h; y++){
- for(x=0; x<w; x++){
- int v, p=0;
- int /*ll=0, */l=0, lt=0, t=0, rt=0;
- v= src[x + y*stride];
-
- if(y){
- t= src[x + (y-1)*stride];
- if(x){
- lt= src[x - 1 + (y-1)*stride];
- }
- if(x + 1 < w){
- rt= src[x + 1 + (y-1)*stride];
- }
- }
- if(x){
- l= src[x - 1 + y*stride];
- /*if(x > 1){
- if(orientation==1) ll= src[y + (x-2)*stride];
- else ll= src[x - 2 + y*stride];
- }*/
- }
- if(parent){
- int px= x>>1;
- int py= y>>1;
- if(px<b->parent->width && py<b->parent->height)
- p= parent[px + py*2*stride];
- }
- if(!(/*ll|*/l|lt|t|rt|p)){
- if(v){
- runs[run_index++]= run;
- run=0;
- }else{
- run++;
- }
- }
- }
- }
- max_index= run_index;
- runs[run_index++]= run;
- run_index=0;
- run= runs[run_index++];
-
- put_symbol2(&s->c, b->state[30], max_index, 0);
- if(run_index <= max_index)
- put_symbol2(&s->c, b->state[1], run, 3);
-
- for(y=0; y<h; y++){
- if(s->c.bytestream_end - s->c.bytestream < w*40){
- av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
- return -1;
- }
- for(x=0; x<w; x++){
- int v, p=0;
- int /*ll=0, */l=0, lt=0, t=0, rt=0;
- v= src[x + y*stride];
-
- if(y){
- t= src[x + (y-1)*stride];
- if(x){
- lt= src[x - 1 + (y-1)*stride];
- }
- if(x + 1 < w){
- rt= src[x + 1 + (y-1)*stride];
- }
- }
- if(x){
- l= src[x - 1 + y*stride];
- /*if(x > 1){
- if(orientation==1) ll= src[y + (x-2)*stride];
- else ll= src[x - 2 + y*stride];
- }*/
- }
- if(parent){
- int px= x>>1;
- int py= y>>1;
- if(px<b->parent->width && py<b->parent->height)
- p= parent[px + py*2*stride];
- }
- if(/*ll|*/l|lt|t|rt|p){
- int context= av_log2(/*FFABS(ll) + */3*FFABS(l) + FFABS(lt) + 2*FFABS(t) + FFABS(rt) + FFABS(p));
-
- put_rac(&s->c, &b->state[0][context], !!v);
- }else{
- if(!run){
- run= runs[run_index++];
-
- if(run_index <= max_index)
- put_symbol2(&s->c, b->state[1], run, 3);
- assert(v);
- }else{
- run--;
- assert(!v);
- }
- }
- if(v){
- int context= av_log2(/*FFABS(ll) + */3*FFABS(l) + FFABS(lt) + 2*FFABS(t) + FFABS(rt) + FFABS(p));
- int l2= 2*FFABS(l) + (l<0);
- int t2= 2*FFABS(t) + (t<0);
-
- put_symbol2(&s->c, b->state[context + 2], FFABS(v)-1, context-4);
- put_rac(&s->c, &b->state[0][16 + 1 + 3 + ff_quant3bA[l2&0xFF] + 3*ff_quant3bA[t2&0xFF]], v<0);
- }
- }
- }
- }
- return 0;
-}
-
-static int encode_subband(SnowContext *s, SubBand *b, IDWTELEM *src, IDWTELEM *parent, int stride, int orientation){
-// encode_subband_qtree(s, b, src, parent, stride, orientation);
-// encode_subband_z0run(s, b, src, parent, stride, orientation);
- return encode_subband_c0run(s, b, src, parent, stride, orientation);
-// encode_subband_dzr(s, b, src, parent, stride, orientation);
-}
-
-static av_always_inline int check_block(SnowContext *s, int mb_x, int mb_y, int p[3], int intra, uint8_t (*obmc_edged)[MB_SIZE * 2], int *best_rd){
- const int b_stride= s->b_width << s->block_max_depth;
- BlockNode *block= &s->block[mb_x + mb_y * b_stride];
- BlockNode backup= *block;
- unsigned value;
- int rd, index;
-
- assert(mb_x>=0 && mb_y>=0);
- assert(mb_x<b_stride);
-
- if(intra){
- block->color[0] = p[0];
- block->color[1] = p[1];
- block->color[2] = p[2];
- block->type |= BLOCK_INTRA;
- }else{
- index= (p[0] + 31*p[1]) & (ME_CACHE_SIZE-1);
- value= s->me_cache_generation + (p[0]>>10) + (p[1]<<6) + (block->ref<<12);
- if(s->me_cache[index] == value)
- return 0;
- s->me_cache[index]= value;
-
- block->mx= p[0];
- block->my= p[1];
- block->type &= ~BLOCK_INTRA;
- }
-
- rd= get_block_rd(s, mb_x, mb_y, 0, obmc_edged);
-
-//FIXME chroma
- if(rd < *best_rd){
- *best_rd= rd;
- return 1;
- }else{
- *block= backup;
- return 0;
- }
-}
-
-/* special case for int[2] args we discard afterwards,
- * fixes compilation problem with gcc 2.95 */
-static av_always_inline int check_block_inter(SnowContext *s, int mb_x, int mb_y, int p0, int p1, uint8_t (*obmc_edged)[MB_SIZE * 2], int *best_rd){
- int p[2] = {p0, p1};
- return check_block(s, mb_x, mb_y, p, 0, obmc_edged, best_rd);
-}
-
-static av_always_inline int check_4block_inter(SnowContext *s, int mb_x, int mb_y, int p0, int p1, int ref, int *best_rd){
- const int b_stride= s->b_width << s->block_max_depth;
- BlockNode *block= &s->block[mb_x + mb_y * b_stride];
- BlockNode backup[4];
- unsigned value;
- int rd, index;
-
- /* We don't initialize backup[] during variable declaration, because
- * that fails to compile on MSVC: "cannot convert from 'BlockNode' to
- * 'int16_t'". */
- backup[0] = block[0];
- backup[1] = block[1];
- backup[2] = block[b_stride];
- backup[3] = block[b_stride + 1];
-
- assert(mb_x>=0 && mb_y>=0);
- assert(mb_x<b_stride);
- assert(((mb_x|mb_y)&1) == 0);
-
- index= (p0 + 31*p1) & (ME_CACHE_SIZE-1);
- value= s->me_cache_generation + (p0>>10) + (p1<<6) + (block->ref<<12);
- if(s->me_cache[index] == value)
- return 0;
- s->me_cache[index]= value;
-
- block->mx= p0;
- block->my= p1;
- block->ref= ref;
- block->type &= ~BLOCK_INTRA;
- block[1]= block[b_stride]= block[b_stride+1]= *block;
-
- rd= get_4block_rd(s, mb_x, mb_y, 0);
-
-//FIXME chroma
- if(rd < *best_rd){
- *best_rd= rd;
- return 1;
- }else{
- block[0]= backup[0];
- block[1]= backup[1];
- block[b_stride]= backup[2];
- block[b_stride+1]= backup[3];
- return 0;
- }
-}
-
-static void iterative_me(SnowContext *s){
- int pass, mb_x, mb_y;
- const int b_width = s->b_width << s->block_max_depth;
- const int b_height= s->b_height << s->block_max_depth;
- const int b_stride= b_width;
- int color[3];
-
- {
- RangeCoder r = s->c;
- uint8_t state[sizeof(s->block_state)];
- memcpy(state, s->block_state, sizeof(s->block_state));
- for(mb_y= 0; mb_y<s->b_height; mb_y++)
- for(mb_x= 0; mb_x<s->b_width; mb_x++)
- encode_q_branch(s, 0, mb_x, mb_y);
- s->c = r;
- memcpy(s->block_state, state, sizeof(s->block_state));
- }
-
- for(pass=0; pass<25; pass++){
- int change= 0;
-
- for(mb_y= 0; mb_y<b_height; mb_y++){
- for(mb_x= 0; mb_x<b_width; mb_x++){
- int dia_change, i, j, ref;
- int best_rd= INT_MAX, ref_rd;
- BlockNode backup, ref_b;
- const int index= mb_x + mb_y * b_stride;
- BlockNode *block= &s->block[index];
- BlockNode *tb = mb_y ? &s->block[index-b_stride ] : NULL;
- BlockNode *lb = mb_x ? &s->block[index -1] : NULL;
- BlockNode *rb = mb_x+1<b_width ? &s->block[index +1] : NULL;
- BlockNode *bb = mb_y+1<b_height ? &s->block[index+b_stride ] : NULL;
- BlockNode *tlb= mb_x && mb_y ? &s->block[index-b_stride-1] : NULL;
- BlockNode *trb= mb_x+1<b_width && mb_y ? &s->block[index-b_stride+1] : NULL;
- BlockNode *blb= mb_x && mb_y+1<b_height ? &s->block[index+b_stride-1] : NULL;
- BlockNode *brb= mb_x+1<b_width && mb_y+1<b_height ? &s->block[index+b_stride+1] : NULL;
- const int b_w= (MB_SIZE >> s->block_max_depth);
- uint8_t obmc_edged[MB_SIZE * 2][MB_SIZE * 2];
-
- if(pass && (block->type & BLOCK_OPT))
- continue;
- block->type |= BLOCK_OPT;
-
- backup= *block;
-
- if(!s->me_cache_generation)
- memset(s->me_cache, 0, sizeof(s->me_cache));
- s->me_cache_generation += 1<<22;
-
- //FIXME precalculate
- {
- int x, y;
- for (y = 0; y < b_w * 2; y++)
- memcpy(obmc_edged[y], ff_obmc_tab[s->block_max_depth] + y * b_w * 2, b_w * 2);
- if(mb_x==0)
- for(y=0; y<b_w*2; y++)
- memset(obmc_edged[y], obmc_edged[y][0] + obmc_edged[y][b_w-1], b_w);
- if(mb_x==b_stride-1)
- for(y=0; y<b_w*2; y++)
- memset(obmc_edged[y]+b_w, obmc_edged[y][b_w] + obmc_edged[y][b_w*2-1], b_w);
- if(mb_y==0){
- for(x=0; x<b_w*2; x++)
- obmc_edged[0][x] += obmc_edged[b_w-1][x];
- for(y=1; y<b_w; y++)
- memcpy(obmc_edged[y], obmc_edged[0], b_w*2);
- }
- if(mb_y==b_height-1){
- for(x=0; x<b_w*2; x++)
- obmc_edged[b_w*2-1][x] += obmc_edged[b_w][x];
- for(y=b_w; y<b_w*2-1; y++)
- memcpy(obmc_edged[y], obmc_edged[b_w*2-1], b_w*2);
- }
- }
-
- //skip stuff outside the picture
- if(mb_x==0 || mb_y==0 || mb_x==b_width-1 || mb_y==b_height-1){
- uint8_t *src= s-> input_picture.data[0];
- uint8_t *dst= s->current_picture.data[0];
- const int stride= s->current_picture.linesize[0];
- const int block_w= MB_SIZE >> s->block_max_depth;
- const int sx= block_w*mb_x - block_w/2;
- const int sy= block_w*mb_y - block_w/2;
- const int w= s->plane[0].width;
- const int h= s->plane[0].height;
- int y;
-
- for(y=sy; y<0; y++)
- memcpy(dst + sx + y*stride, src + sx + y*stride, block_w*2);
- for(y=h; y<sy+block_w*2; y++)
- memcpy(dst + sx + y*stride, src + sx + y*stride, block_w*2);
- if(sx<0){
- for(y=sy; y<sy+block_w*2; y++)
- memcpy(dst + sx + y*stride, src + sx + y*stride, -sx);
- }
- if(sx+block_w*2 > w){
- for(y=sy; y<sy+block_w*2; y++)
- memcpy(dst + w + y*stride, src + w + y*stride, sx+block_w*2 - w);
- }
- }
-
- // intra(black) = neighbors' contribution to the current block
- for(i=0; i<3; i++)
- color[i]= get_dc(s, mb_x, mb_y, i);
-
- // get previous score (cannot be cached due to OBMC)
- if(pass > 0 && (block->type&BLOCK_INTRA)){
- int color0[3]= {block->color[0], block->color[1], block->color[2]};
- check_block(s, mb_x, mb_y, color0, 1, obmc_edged, &best_rd);
- }else
- check_block_inter(s, mb_x, mb_y, block->mx, block->my, obmc_edged, &best_rd);
-
- ref_b= *block;
- ref_rd= best_rd;
- for(ref=0; ref < s->ref_frames; ref++){
- int16_t (*mvr)[2]= &s->ref_mvs[ref][index];
- if(s->ref_scores[ref][index] > s->ref_scores[ref_b.ref][index]*3/2) //FIXME tune threshold
- continue;
- block->ref= ref;
- best_rd= INT_MAX;
-
- check_block_inter(s, mb_x, mb_y, mvr[0][0], mvr[0][1], obmc_edged, &best_rd);
- check_block_inter(s, mb_x, mb_y, 0, 0, obmc_edged, &best_rd);
- if(tb)
- check_block_inter(s, mb_x, mb_y, mvr[-b_stride][0], mvr[-b_stride][1], obmc_edged, &best_rd);
- if(lb)
- check_block_inter(s, mb_x, mb_y, mvr[-1][0], mvr[-1][1], obmc_edged, &best_rd);
- if(rb)
- check_block_inter(s, mb_x, mb_y, mvr[1][0], mvr[1][1], obmc_edged, &best_rd);
- if(bb)
- check_block_inter(s, mb_x, mb_y, mvr[b_stride][0], mvr[b_stride][1], obmc_edged, &best_rd);
-
- /* fullpel ME */
- //FIXME avoid subpel interpolation / round to nearest integer
- do{
- dia_change=0;
- for(i=0; i<FFMAX(s->avctx->dia_size, 1); i++){
- for(j=0; j<i; j++){
- dia_change |= check_block_inter(s, mb_x, mb_y, block->mx+4*(i-j), block->my+(4*j), obmc_edged, &best_rd);
- dia_change |= check_block_inter(s, mb_x, mb_y, block->mx-4*(i-j), block->my-(4*j), obmc_edged, &best_rd);
- dia_change |= check_block_inter(s, mb_x, mb_y, block->mx+4*(i-j), block->my-(4*j), obmc_edged, &best_rd);
- dia_change |= check_block_inter(s, mb_x, mb_y, block->mx-4*(i-j), block->my+(4*j), obmc_edged, &best_rd);
- }
- }
- }while(dia_change);
- /* subpel ME */
- do{
- static const int square[8][2]= {{+1, 0},{-1, 0},{ 0,+1},{ 0,-1},{+1,+1},{-1,-1},{+1,-1},{-1,+1},};
- dia_change=0;
- for(i=0; i<8; i++)
- dia_change |= check_block_inter(s, mb_x, mb_y, block->mx+square[i][0], block->my+square[i][1], obmc_edged, &best_rd);
- }while(dia_change);
- //FIXME or try the standard 2 pass qpel or similar
-
- mvr[0][0]= block->mx;
- mvr[0][1]= block->my;
- if(ref_rd > best_rd){
- ref_rd= best_rd;
- ref_b= *block;
- }
- }
- best_rd= ref_rd;
- *block= ref_b;
- check_block(s, mb_x, mb_y, color, 1, obmc_edged, &best_rd);
- //FIXME RD style color selection
- if(!same_block(block, &backup)){
- if(tb ) tb ->type &= ~BLOCK_OPT;
- if(lb ) lb ->type &= ~BLOCK_OPT;
- if(rb ) rb ->type &= ~BLOCK_OPT;
- if(bb ) bb ->type &= ~BLOCK_OPT;
- if(tlb) tlb->type &= ~BLOCK_OPT;
- if(trb) trb->type &= ~BLOCK_OPT;
- if(blb) blb->type &= ~BLOCK_OPT;
- if(brb) brb->type &= ~BLOCK_OPT;
- change ++;
- }
- }
- }
- av_log(s->avctx, AV_LOG_ERROR, "pass:%d changed:%d\n", pass, change);
- if(!change)
- break;
- }
-
- if(s->block_max_depth == 1){
- int change= 0;
- for(mb_y= 0; mb_y<b_height; mb_y+=2){
- for(mb_x= 0; mb_x<b_width; mb_x+=2){
- int i;
- int best_rd, init_rd;
- const int index= mb_x + mb_y * b_stride;
- BlockNode *b[4];
-
- b[0]= &s->block[index];
- b[1]= b[0]+1;
- b[2]= b[0]+b_stride;
- b[3]= b[2]+1;
- if(same_block(b[0], b[1]) &&
- same_block(b[0], b[2]) &&
- same_block(b[0], b[3]))
- continue;
-
- if(!s->me_cache_generation)
- memset(s->me_cache, 0, sizeof(s->me_cache));
- s->me_cache_generation += 1<<22;
-
- init_rd= best_rd= get_4block_rd(s, mb_x, mb_y, 0);
-
- //FIXME more multiref search?
- check_4block_inter(s, mb_x, mb_y,
- (b[0]->mx + b[1]->mx + b[2]->mx + b[3]->mx + 2) >> 2,
- (b[0]->my + b[1]->my + b[2]->my + b[3]->my + 2) >> 2, 0, &best_rd);
-
- for(i=0; i<4; i++)
- if(!(b[i]->type&BLOCK_INTRA))
- check_4block_inter(s, mb_x, mb_y, b[i]->mx, b[i]->my, b[i]->ref, &best_rd);
-
- if(init_rd != best_rd)
- change++;
- }
- }
- av_log(s->avctx, AV_LOG_ERROR, "pass:4mv changed:%d\n", change*4);
- }
-}
-
-static void encode_blocks(SnowContext *s, int search){
- int x, y;
- int w= s->b_width;
- int h= s->b_height;
-
- if(s->avctx->me_method == ME_ITER && !s->keyframe && search)
- iterative_me(s);
-
- for(y=0; y<h; y++){
- if(s->c.bytestream_end - s->c.bytestream < w*MB_SIZE*MB_SIZE*3){ //FIXME nicer limit
- av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
- return;
- }
- for(x=0; x<w; x++){
- if(s->avctx->me_method == ME_ITER || !search)
- encode_q_branch2(s, 0, x, y);
- else
- encode_q_branch (s, 0, x, y);
- }
- }
-}
-
-static void quantize(SnowContext *s, SubBand *b, IDWTELEM *dst, DWTELEM *src, int stride, int bias){
- const int w= b->width;
- const int h= b->height;
- const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
- const int qmul= ff_qexp[qlog&(QROOT-1)]<<((qlog>>QSHIFT) + ENCODER_EXTRA_BITS);
- int x,y, thres1, thres2;
-
- if(s->qlog == LOSSLESS_QLOG){
- for(y=0; y<h; y++)
- for(x=0; x<w; x++)
- dst[x + y*stride]= src[x + y*stride];
- return;
- }
-
- bias= bias ? 0 : (3*qmul)>>3;
- thres1= ((qmul - bias)>>QEXPSHIFT) - 1;
- thres2= 2*thres1;
-
- if(!bias){
- for(y=0; y<h; y++){
- for(x=0; x<w; x++){
- int i= src[x + y*stride];
-
- if((unsigned)(i+thres1) > thres2){
- if(i>=0){
- i<<= QEXPSHIFT;
- i/= qmul; //FIXME optimize
- dst[x + y*stride]= i;
- }else{
- i= -i;
- i<<= QEXPSHIFT;
- i/= qmul; //FIXME optimize
- dst[x + y*stride]= -i;
- }
- }else
- dst[x + y*stride]= 0;
- }
- }
- }else{
- for(y=0; y<h; y++){
- for(x=0; x<w; x++){
- int i= src[x + y*stride];
-
- if((unsigned)(i+thres1) > thres2){
- if(i>=0){
- i<<= QEXPSHIFT;
- i= (i + bias) / qmul; //FIXME optimize
- dst[x + y*stride]= i;
- }else{
- i= -i;
- i<<= QEXPSHIFT;
- i= (i + bias) / qmul; //FIXME optimize
- dst[x + y*stride]= -i;
- }
- }else
- dst[x + y*stride]= 0;
- }
- }
- }
-}
-
-static void dequantize(SnowContext *s, SubBand *b, IDWTELEM *src, int stride){
- const int w= b->width;
- const int h= b->height;
- const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16);
- const int qmul= ff_qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
- const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
- int x,y;
-
- if(s->qlog == LOSSLESS_QLOG) return;
-
- for(y=0; y<h; y++){
- for(x=0; x<w; x++){
- int i= src[x + y*stride];
- if(i<0){
- src[x + y*stride]= -((-i*qmul + qadd)>>(QEXPSHIFT)); //FIXME try different bias
- }else if(i>0){
- src[x + y*stride]= (( i*qmul + qadd)>>(QEXPSHIFT));
- }
- }
- }
-}
-
-static void decorrelate(SnowContext *s, SubBand *b, IDWTELEM *src, int stride, int inverse, int use_median){
- const int w= b->width;
- const int h= b->height;
- int x,y;
-
- for(y=h-1; y>=0; y--){
- for(x=w-1; x>=0; x--){
- int i= x + y*stride;
-
- if(x){
- if(use_median){
- if(y && x+1<w) src[i] -= mid_pred(src[i - 1], src[i - stride], src[i - stride + 1]);
- else src[i] -= src[i - 1];
- }else{
- if(y) src[i] -= mid_pred(src[i - 1], src[i - stride], src[i - 1] + src[i - stride] - src[i - 1 - stride]);
- else src[i] -= src[i - 1];
- }
- }else{
- if(y) src[i] -= src[i - stride];
- }
- }
- }
-}
-
-static void correlate(SnowContext *s, SubBand *b, IDWTELEM *src, int stride, int inverse, int use_median){
- const int w= b->width;
- const int h= b->height;
- int x,y;
-
- for(y=0; y<h; y++){
- for(x=0; x<w; x++){
- int i= x + y*stride;
-
- if(x){
- if(use_median){
- if(y && x+1<w) src[i] += mid_pred(src[i - 1], src[i - stride], src[i - stride + 1]);
- else src[i] += src[i - 1];
- }else{
- if(y) src[i] += mid_pred(src[i - 1], src[i - stride], src[i - 1] + src[i - stride] - src[i - 1 - stride]);
- else src[i] += src[i - 1];
- }
- }else{
- if(y) src[i] += src[i - stride];
- }
- }
- }
-}
-
-static void encode_qlogs(SnowContext *s){
- int plane_index, level, orientation;
-
- for(plane_index=0; plane_index<2; plane_index++){
- for(level=0; level<s->spatial_decomposition_count; level++){
- for(orientation=level ? 1:0; orientation<4; orientation++){
- if(orientation==2) continue;
- put_symbol(&s->c, s->header_state, s->plane[plane_index].band[level][orientation].qlog, 1);
- }
- }
- }
-}
-
-static void encode_header(SnowContext *s){
- int plane_index, i;
- uint8_t kstate[32];
-
- memset(kstate, MID_STATE, sizeof(kstate));
-
- put_rac(&s->c, kstate, s->keyframe);
- if(s->keyframe || s->always_reset){
- ff_snow_reset_contexts(s);
- s->last_spatial_decomposition_type=
- s->last_qlog=
- s->last_qbias=
- s->last_mv_scale=
- s->last_block_max_depth= 0;
- for(plane_index=0; plane_index<2; plane_index++){
- Plane *p= &s->plane[plane_index];
- p->last_htaps=0;
- p->last_diag_mc=0;
- memset(p->last_hcoeff, 0, sizeof(p->last_hcoeff));
- }
- }
- if(s->keyframe){
- put_symbol(&s->c, s->header_state, s->version, 0);
- put_rac(&s->c, s->header_state, s->always_reset);
- put_symbol(&s->c, s->header_state, s->temporal_decomposition_type, 0);
- put_symbol(&s->c, s->header_state, s->temporal_decomposition_count, 0);
- put_symbol(&s->c, s->header_state, s->spatial_decomposition_count, 0);
- put_symbol(&s->c, s->header_state, s->colorspace_type, 0);
- put_symbol(&s->c, s->header_state, s->chroma_h_shift, 0);
- put_symbol(&s->c, s->header_state, s->chroma_v_shift, 0);
- put_rac(&s->c, s->header_state, s->spatial_scalability);
-// put_rac(&s->c, s->header_state, s->rate_scalability);
- put_symbol(&s->c, s->header_state, s->max_ref_frames-1, 0);
-
- encode_qlogs(s);
- }
-
- if(!s->keyframe){
- int update_mc=0;
- for(plane_index=0; plane_index<2; plane_index++){
- Plane *p= &s->plane[plane_index];
- update_mc |= p->last_htaps != p->htaps;
- update_mc |= p->last_diag_mc != p->diag_mc;
- update_mc |= !!memcmp(p->last_hcoeff, p->hcoeff, sizeof(p->hcoeff));
- }
- put_rac(&s->c, s->header_state, update_mc);
- if(update_mc){
- for(plane_index=0; plane_index<2; plane_index++){
- Plane *p= &s->plane[plane_index];
- put_rac(&s->c, s->header_state, p->diag_mc);
- put_symbol(&s->c, s->header_state, p->htaps/2-1, 0);
- for(i= p->htaps/2; i; i--)
- put_symbol(&s->c, s->header_state, FFABS(p->hcoeff[i]), 0);
- }
- }
- if(s->last_spatial_decomposition_count != s->spatial_decomposition_count){
- put_rac(&s->c, s->header_state, 1);
- put_symbol(&s->c, s->header_state, s->spatial_decomposition_count, 0);
- encode_qlogs(s);
- }else
- put_rac(&s->c, s->header_state, 0);
- }
-
- put_symbol(&s->c, s->header_state, s->spatial_decomposition_type - s->last_spatial_decomposition_type, 1);
- put_symbol(&s->c, s->header_state, s->qlog - s->last_qlog , 1);
- put_symbol(&s->c, s->header_state, s->mv_scale - s->last_mv_scale, 1);
- put_symbol(&s->c, s->header_state, s->qbias - s->last_qbias , 1);
- put_symbol(&s->c, s->header_state, s->block_max_depth - s->last_block_max_depth, 1);
-
-}
-
-static void update_last_header_values(SnowContext *s){
- int plane_index;
-
- if(!s->keyframe){
- for(plane_index=0; plane_index<2; plane_index++){
- Plane *p= &s->plane[plane_index];
- p->last_diag_mc= p->diag_mc;
- p->last_htaps = p->htaps;
- memcpy(p->last_hcoeff, p->hcoeff, sizeof(p->hcoeff));
- }
- }
-
- s->last_spatial_decomposition_type = s->spatial_decomposition_type;
- s->last_qlog = s->qlog;
- s->last_qbias = s->qbias;
- s->last_mv_scale = s->mv_scale;
- s->last_block_max_depth = s->block_max_depth;
- s->last_spatial_decomposition_count = s->spatial_decomposition_count;
-}
-
-static int qscale2qlog(int qscale){
- return rint(QROOT*log2(qscale / (float)FF_QP2LAMBDA))
- + 61*QROOT/8; ///< 64 > 60
-}
-
-static int ratecontrol_1pass(SnowContext *s, AVFrame *pict)
-{
- /* Estimate the frame's complexity as a sum of weighted dwt coefficients.
- * FIXME we know exact mv bits at this point,
- * but ratecontrol isn't set up to include them. */
- uint32_t coef_sum= 0;
- int level, orientation, delta_qlog;
-
- for(level=0; level<s->spatial_decomposition_count; level++){
- for(orientation=level ? 1 : 0; orientation<4; orientation++){
- SubBand *b= &s->plane[0].band[level][orientation];
- IDWTELEM *buf= b->ibuf;
- const int w= b->width;
- const int h= b->height;
- const int stride= b->stride;
- const int qlog= av_clip(2*QROOT + b->qlog, 0, QROOT*16);
- const int qmul= ff_qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
- const int qdiv= (1<<16)/qmul;
- int x, y;
- //FIXME this is ugly
- for(y=0; y<h; y++)
- for(x=0; x<w; x++)
- buf[x+y*stride]= b->buf[x+y*stride];
- if(orientation==0)
- decorrelate(s, b, buf, stride, 1, 0);
- for(y=0; y<h; y++)
- for(x=0; x<w; x++)
- coef_sum+= abs(buf[x+y*stride]) * qdiv >> 16;
- }
- }
-
- /* ugly, ratecontrol just takes a sqrt again */
- coef_sum = (uint64_t)coef_sum * coef_sum >> 16;
- assert(coef_sum < INT_MAX);
-
- if(pict->pict_type == AV_PICTURE_TYPE_I){
- s->m.current_picture.mb_var_sum= coef_sum;
- s->m.current_picture.mc_mb_var_sum= 0;
- }else{
- s->m.current_picture.mc_mb_var_sum= coef_sum;
- s->m.current_picture.mb_var_sum= 0;
- }
-
- pict->quality= ff_rate_estimate_qscale(&s->m, 1);
- if (pict->quality < 0)
- return INT_MIN;
- s->lambda= pict->quality * 3/2;
- delta_qlog= qscale2qlog(pict->quality) - s->qlog;
- s->qlog+= delta_qlog;
- return delta_qlog;
-}
-
-static void calculate_visual_weight(SnowContext *s, Plane *p){
- int width = p->width;
- int height= p->height;
- int level, orientation, x, y;
-
- for(level=0; level<s->spatial_decomposition_count; level++){
- for(orientation=level ? 1 : 0; orientation<4; orientation++){
- SubBand *b= &p->band[level][orientation];
- IDWTELEM *ibuf= b->ibuf;
- int64_t error=0;
-
- memset(s->spatial_idwt_buffer, 0, sizeof(*s->spatial_idwt_buffer)*width*height);
- ibuf[b->width/2 + b->height/2*b->stride]= 256*16;
- ff_spatial_idwt(s->spatial_idwt_buffer, s->temp_idwt_buffer, width, height, width, s->spatial_decomposition_type, s->spatial_decomposition_count);
- for(y=0; y<height; y++){
- for(x=0; x<width; x++){
- int64_t d= s->spatial_idwt_buffer[x + y*width]*16;
- error += d*d;
- }
- }
-
- b->qlog= (int)(log(352256.0/sqrt(error)) / log(pow(2.0, 1.0/QROOT))+0.5);
- }
- }
-}
-
-static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
- const AVFrame *pict, int *got_packet)
-{
- SnowContext *s = avctx->priv_data;
- RangeCoder * const c= &s->c;
- AVFrame *pic = &s->new_picture;
- const int width= s->avctx->width;
- const int height= s->avctx->height;
- int level, orientation, plane_index, i, y, ret;
- uint8_t rc_header_bak[sizeof(s->header_state)];
- uint8_t rc_block_bak[sizeof(s->block_state)];
-
- if (!pkt->data &&
- (ret = av_new_packet(pkt, s->b_width*s->b_height*MB_SIZE*MB_SIZE*3 + FF_MIN_BUFFER_SIZE)) < 0) {
- av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n");
- return ret;
- }
-
- ff_init_range_encoder(c, pkt->data, pkt->size);
- ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
-
- for(i=0; i<3; i++){
- int shift= !!i;
- for(y=0; y<(height>>shift); y++)
- memcpy(&s->input_picture.data[i][y * s->input_picture.linesize[i]],
- &pict->data[i][y * pict->linesize[i]],
- width>>shift);
- }
- s->new_picture = *pict;
-
- s->m.picture_number= avctx->frame_number;
- if(avctx->flags&CODEC_FLAG_PASS2){
- s->m.pict_type = pic->pict_type = s->m.rc_context.entry[avctx->frame_number].new_pict_type;
- s->keyframe = pic->pict_type == AV_PICTURE_TYPE_I;
- if(!(avctx->flags&CODEC_FLAG_QSCALE)) {
- pic->quality = ff_rate_estimate_qscale(&s->m, 0);
- if (pic->quality < 0)
- return -1;
- }
- }else{
- s->keyframe= avctx->gop_size==0 || avctx->frame_number % avctx->gop_size == 0;
- s->m.pict_type = pic->pict_type = s->keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
- }
-
- if(s->pass1_rc && avctx->frame_number == 0)
- pic->quality = 2*FF_QP2LAMBDA;
- if (pic->quality) {
- s->qlog = qscale2qlog(pic->quality);
- s->lambda = pic->quality * 3/2;
- }
- if (s->qlog < 0 || (!pic->quality && (avctx->flags & CODEC_FLAG_QSCALE))) {
- s->qlog= LOSSLESS_QLOG;
- s->lambda = 0;
- }//else keep previous frame's qlog until after motion estimation
-
- ff_snow_frame_start(s);
-
- s->m.current_picture_ptr= &s->m.current_picture;
- s->m.last_picture.f.pts = s->m.current_picture.f.pts;
- s->m.current_picture.f.pts = pict->pts;
- if(pic->pict_type == AV_PICTURE_TYPE_P){
- int block_width = (width +15)>>4;
- int block_height= (height+15)>>4;
- int stride= s->current_picture.linesize[0];
-
- assert(s->current_picture.data[0]);
- assert(s->last_picture[0].data[0]);
-
- s->m.avctx= s->avctx;
- s->m.current_picture.f.data[0] = s->current_picture.data[0];
- s->m. last_picture.f.data[0] = s->last_picture[0].data[0];
- s->m. new_picture.f.data[0] = s-> input_picture.data[0];
- s->m. last_picture_ptr= &s->m. last_picture;
- s->m.linesize=
- s->m. last_picture.f.linesize[0] =
- s->m. new_picture.f.linesize[0] =
- s->m.current_picture.f.linesize[0] = stride;
- s->m.uvlinesize= s->current_picture.linesize[1];
- s->m.width = width;
- s->m.height= height;
- s->m.mb_width = block_width;
- s->m.mb_height= block_height;
- 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 = pic->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.quarter_sample= (s->avctx->flags & CODEC_FLAG_QPEL)!=0;
- s->m.out_format= FMT_H263;
- s->m.unrestricted_mv= 1;
-
- s->m.lambda = s->lambda;
- s->m.qscale= (s->m.lambda*139 + FF_LAMBDA_SCALE*64) >> (FF_LAMBDA_SHIFT + 7);
- s->lambda2= s->m.lambda2= (s->m.lambda*s->m.lambda + FF_LAMBDA_SCALE/2) >> FF_LAMBDA_SHIFT;
-
- s->m.dsp= s->dsp; //move
- ff_init_me(&s->m);
- s->dsp= s->m.dsp;
- }
-
- if(s->pass1_rc){
- memcpy(rc_header_bak, s->header_state, sizeof(s->header_state));
- memcpy(rc_block_bak, s->block_state, sizeof(s->block_state));
- }
-
-redo_frame:
-
- if (pic->pict_type == AV_PICTURE_TYPE_I)
- s->spatial_decomposition_count= 5;
- else
- s->spatial_decomposition_count= 5;
-
- s->m.pict_type = pic->pict_type;
- s->qbias = pic->pict_type == AV_PICTURE_TYPE_P ? 2 : 0;
-
- ff_snow_common_init_after_header(avctx);
-
- if(s->last_spatial_decomposition_count != s->spatial_decomposition_count){
- for(plane_index=0; plane_index<3; plane_index++){
- calculate_visual_weight(s, &s->plane[plane_index]);
- }
- }
-
- encode_header(s);
- s->m.misc_bits = 8*(s->c.bytestream - s->c.bytestream_start);
- encode_blocks(s, 1);
- s->m.mv_bits = 8*(s->c.bytestream - s->c.bytestream_start) - s->m.misc_bits;
-
- for(plane_index=0; plane_index<3; plane_index++){
- Plane *p= &s->plane[plane_index];
- int w= p->width;
- int h= p->height;
- int x, y;
-// int bits= put_bits_count(&s->c.pb);
-
- if (!s->memc_only) {
- //FIXME optimize
- if(pict->data[plane_index]) //FIXME gray hack
- for(y=0; y<h; y++){
- for(x=0; x<w; x++){
- s->spatial_idwt_buffer[y*w + x]= pict->data[plane_index][y*pict->linesize[plane_index] + x]<<FRAC_BITS;
- }
- }
- predict_plane(s, s->spatial_idwt_buffer, plane_index, 0);
-
- if( plane_index==0
- && pic->pict_type == AV_PICTURE_TYPE_P
- && !(avctx->flags&CODEC_FLAG_PASS2)
- && s->m.me.scene_change_score > s->avctx->scenechange_threshold){
- ff_init_range_encoder(c, pkt->data, pkt->size);
- ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
- pic->pict_type= AV_PICTURE_TYPE_I;
- s->keyframe=1;
- s->current_picture.key_frame=1;
- goto redo_frame;
- }
-
- if(s->qlog == LOSSLESS_QLOG){
- for(y=0; y<h; y++){
- for(x=0; x<w; x++){
- s->spatial_dwt_buffer[y*w + x]= (s->spatial_idwt_buffer[y*w + x] + (1<<(FRAC_BITS-1))-1)>>FRAC_BITS;
- }
- }
- }else{
- for(y=0; y<h; y++){
- for(x=0; x<w; x++){
- s->spatial_dwt_buffer[y*w + x]=s->spatial_idwt_buffer[y*w + x]<<ENCODER_EXTRA_BITS;
- }
- }
- }
-
- /* if(QUANTIZE2)
- dwt_quantize(s, p, s->spatial_dwt_buffer, w, h, w, s->spatial_decomposition_type);
- else*/
- ff_spatial_dwt(s->spatial_dwt_buffer, s->temp_dwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count);
-
- if(s->pass1_rc && plane_index==0){
- int delta_qlog = ratecontrol_1pass(s, pic);
- if (delta_qlog <= INT_MIN)
- return -1;
- if(delta_qlog){
- //reordering qlog in the bitstream would eliminate this reset
- ff_init_range_encoder(c, pkt->data, pkt->size);
- memcpy(s->header_state, rc_header_bak, sizeof(s->header_state));
- memcpy(s->block_state, rc_block_bak, sizeof(s->block_state));
- encode_header(s);
- encode_blocks(s, 0);
- }
- }
-
- for(level=0; level<s->spatial_decomposition_count; level++){
- for(orientation=level ? 1 : 0; orientation<4; orientation++){
- SubBand *b= &p->band[level][orientation];
-
- if(!QUANTIZE2)
- quantize(s, b, b->ibuf, b->buf, b->stride, s->qbias);
- if(orientation==0)
- decorrelate(s, b, b->ibuf, b->stride, pic->pict_type == AV_PICTURE_TYPE_P, 0);
- encode_subband(s, b, b->ibuf, b->parent ? b->parent->ibuf : NULL, b->stride, orientation);
- assert(b->parent==NULL || b->parent->stride == b->stride*2);
- if(orientation==0)
- correlate(s, b, b->ibuf, b->stride, 1, 0);
- }
- }
-
- for(level=0; level<s->spatial_decomposition_count; level++){
- for(orientation=level ? 1 : 0; orientation<4; orientation++){
- SubBand *b= &p->band[level][orientation];
-
- dequantize(s, b, b->ibuf, b->stride);
- }
- }
-
- ff_spatial_idwt(s->spatial_idwt_buffer, s->temp_idwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count);
- if(s->qlog == LOSSLESS_QLOG){
- for(y=0; y<h; y++){
- for(x=0; x<w; x++){
- s->spatial_idwt_buffer[y*w + x]<<=FRAC_BITS;
- }
- }
- }
- predict_plane(s, s->spatial_idwt_buffer, plane_index, 1);
- }else{
- //ME/MC only
- if(pic->pict_type == AV_PICTURE_TYPE_I){
- for(y=0; y<h; y++){
- for(x=0; x<w; x++){
- s->current_picture.data[plane_index][y*s->current_picture.linesize[plane_index] + x]=
- pict->data[plane_index][y*pict->linesize[plane_index] + x];
- }
- }
- }else{
- memset(s->spatial_idwt_buffer, 0, sizeof(IDWTELEM)*w*h);
- predict_plane(s, s->spatial_idwt_buffer, plane_index, 1);
- }
- }
- if(s->avctx->flags&CODEC_FLAG_PSNR){
- int64_t error= 0;
-
- if(pict->data[plane_index]) //FIXME gray hack
- for(y=0; y<h; y++){
- for(x=0; x<w; x++){
- int d= s->current_picture.data[plane_index][y*s->current_picture.linesize[plane_index] + x] - pict->data[plane_index][y*pict->linesize[plane_index] + x];
- error += d*d;
- }
- }
- s->avctx->error[plane_index] += error;
- s->current_picture.error[plane_index] = error;
- }
-
- }
-
- update_last_header_values(s);
-
- ff_snow_release_buffer(avctx);
-
- s->current_picture.coded_picture_number = avctx->frame_number;
- s->current_picture.pict_type = pict->pict_type;
- s->current_picture.quality = pict->quality;
- s->m.frame_bits = 8*(s->c.bytestream - s->c.bytestream_start);
- s->m.p_tex_bits = s->m.frame_bits - s->m.misc_bits - s->m.mv_bits;
- s->m.current_picture.f.display_picture_number =
- s->m.current_picture.f.coded_picture_number = avctx->frame_number;
- s->m.current_picture.f.quality = pic->quality;
- s->m.total_bits += 8*(s->c.bytestream - s->c.bytestream_start);
- if(s->pass1_rc)
- if (ff_rate_estimate_qscale(&s->m, 0) < 0)
- return -1;
- if(avctx->flags&CODEC_FLAG_PASS1)
- ff_write_pass1_stats(&s->m);
- s->m.last_pict_type = s->m.pict_type;
- avctx->frame_bits = s->m.frame_bits;
- avctx->mv_bits = s->m.mv_bits;
- avctx->misc_bits = s->m.misc_bits;
- avctx->p_tex_bits = s->m.p_tex_bits;
-
- emms_c();
-
- pkt->size = ff_rac_terminate(c);
- if (avctx->coded_frame->key_frame)
- pkt->flags |= AV_PKT_FLAG_KEY;
- *got_packet = 1;
-
- return 0;
-}
-
-static av_cold int encode_end(AVCodecContext *avctx)
-{
- SnowContext *s = avctx->priv_data;
-
- ff_snow_common_end(s);
- if (s->input_picture.data[0])
- avctx->release_buffer(avctx, &s->input_picture);
- av_free(avctx->stats_out);
-
- return 0;
-}
-
-#define OFFSET(x) offsetof(SnowContext, x)
-#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
-static const AVOption options[] = {
- { "memc_only", "Only do ME/MC (I frames -> ref, P frame -> ME+MC).", OFFSET(memc_only), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE },
- { NULL },
-};
-
-static const AVClass snowenc_class = {
- .class_name = "snow encoder",
- .item_name = av_default_item_name,
- .option = options,
- .version = LIBAVUTIL_VERSION_INT,
-};
-
-AVCodec ff_snow_encoder = {
- .name = "snow",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_SNOW,
- .priv_data_size = sizeof(SnowContext),
- .init = encode_init,
- .encode2 = encode_frame,
- .close = encode_end,
- .long_name = NULL_IF_CONFIG_SMALL("Snow"),
- .priv_class = &snowenc_class,
-};

libav-v9.6.tar.bz2/libavcodec/w32pthreads.h Deleted

@@ -1,271 +0,0 @@
-/*
- * Copyright (C) 2010-2011 x264 project
- *
- * Authors: Steven Walters <kemuri9@gmail.com>
- * Pegasys Inc. <http://www.pegasys-inc.com>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * w32threads to pthreads wrapper
- */
-
-#ifndef AVCODEC_W32PTHREADS_H
-#define AVCODEC_W32PTHREADS_H
-
-/* Build up a pthread-like API using underlying Windows API. Have only static
- * methods so as to not conflict with a potentially linked in pthread-win32
- * library.
- * As most functions here are used without checking return values,
- * only implement return values as necessary. */
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <process.h>
-
-#include "libavutil/internal.h"
-#include "libavutil/mem.h"
-
-typedef struct pthread_t {
- void *handle;
- void *(*func)(void* arg);
- void *arg;
- void *ret;
-} pthread_t;
-
-/* the conditional variable api for windows 6.0+ uses critical sections and
- * not mutexes */
-typedef CRITICAL_SECTION pthread_mutex_t;
-
-/* This is the CONDITIONAL_VARIABLE typedef for using Window's native
- * conditional variables on kernels 6.0+.
- * MinGW does not currently have this typedef. */
-typedef struct pthread_cond_t {
- void *ptr;
-} pthread_cond_t;
-
-/* function pointers to conditional variable API on windows 6.0+ kernels */
-static void (WINAPI *cond_broadcast)(pthread_cond_t *cond);
-static void (WINAPI *cond_init)(pthread_cond_t *cond);
-static void (WINAPI *cond_signal)(pthread_cond_t *cond);
-static BOOL (WINAPI *cond_wait)(pthread_cond_t *cond, pthread_mutex_t *mutex,
- DWORD milliseconds);
-
-static unsigned __stdcall attribute_align_arg win32thread_worker(void *arg)
-{
- pthread_t *h = arg;
- h->ret = h->func(h->arg);
- return 0;
-}
-
-static int pthread_create(pthread_t *thread, const void *unused_attr,
- void *(*start_routine)(void*), void *arg)
-{
- thread->func = start_routine;
- thread->arg = arg;
- thread->handle = (void*)_beginthreadex(NULL, 0, win32thread_worker, thread,
- 0, NULL);
- return !thread->handle;
-}
-
-static void pthread_join(pthread_t thread, void **value_ptr)
-{
- DWORD ret = WaitForSingleObject(thread.handle, INFINITE);
- if (ret != WAIT_OBJECT_0)
- return;
- if (value_ptr)
- *value_ptr = thread.ret;
- CloseHandle(thread.handle);
-}
-
-static inline int pthread_mutex_init(pthread_mutex_t *m, void* attr)
-{
- InitializeCriticalSection(m);
- return 0;
-}
-static inline int pthread_mutex_destroy(pthread_mutex_t *m)
-{
- DeleteCriticalSection(m);
- return 0;
-}
-static inline int pthread_mutex_lock(pthread_mutex_t *m)
-{
- EnterCriticalSection(m);
- return 0;
-}
-static inline int pthread_mutex_unlock(pthread_mutex_t *m)
-{
- LeaveCriticalSection(m);
- return 0;
-}
-
-/* for pre-Windows 6.0 platforms we need to define and use our own condition
- * variable and api */
-typedef struct win32_cond_t {
- pthread_mutex_t mtx_broadcast;
- pthread_mutex_t mtx_waiter_count;
- volatile int waiter_count;
- HANDLE semaphore;
- HANDLE waiters_done;
- volatile int is_broadcast;
-} win32_cond_t;
-
-static void pthread_cond_init(pthread_cond_t *cond, const void *unused_attr)
-{
- win32_cond_t *win32_cond = NULL;
- if (cond_init) {
- cond_init(cond);
- return;
- }
-
- /* non native condition variables */
- win32_cond = av_mallocz(sizeof(win32_cond_t));
- if (!win32_cond)
- return;
- cond->ptr = win32_cond;
- win32_cond->semaphore = CreateSemaphore(NULL, 0, 0x7fffffff, NULL);
- if (!win32_cond->semaphore)
- return;
- win32_cond->waiters_done = CreateEvent(NULL, TRUE, FALSE, NULL);
- if (!win32_cond->waiters_done)
- return;
-
- pthread_mutex_init(&win32_cond->mtx_waiter_count, NULL);
- pthread_mutex_init(&win32_cond->mtx_broadcast, NULL);
-}
-
-static void pthread_cond_destroy(pthread_cond_t *cond)
-{
- win32_cond_t *win32_cond = cond->ptr;
- /* native condition variables do not destroy */
- if (cond_init)
- return;
-
- /* non native condition variables */
- CloseHandle(win32_cond->semaphore);
- CloseHandle(win32_cond->waiters_done);
- pthread_mutex_destroy(&win32_cond->mtx_waiter_count);
- pthread_mutex_destroy(&win32_cond->mtx_broadcast);
- av_freep(&win32_cond);
- cond->ptr = NULL;
-}
-
-static void pthread_cond_broadcast(pthread_cond_t *cond)
-{
- win32_cond_t *win32_cond = cond->ptr;
- int have_waiter;
-
- if (cond_broadcast) {
- cond_broadcast(cond);
- return;
- }
-
- /* non native condition variables */
- pthread_mutex_lock(&win32_cond->mtx_broadcast);
- pthread_mutex_lock(&win32_cond->mtx_waiter_count);
- have_waiter = 0;
-
- if (win32_cond->waiter_count) {
- win32_cond->is_broadcast = 1;
- have_waiter = 1;
- }
-
- if (have_waiter) {
- ReleaseSemaphore(win32_cond->semaphore, win32_cond->waiter_count, NULL);
- pthread_mutex_unlock(&win32_cond->mtx_waiter_count);
- WaitForSingleObject(win32_cond->waiters_done, INFINITE);
- ResetEvent(win32_cond->waiters_done);
- win32_cond->is_broadcast = 0;
- } else
- pthread_mutex_unlock(&win32_cond->mtx_waiter_count);
- pthread_mutex_unlock(&win32_cond->mtx_broadcast);
-}
-
-static int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
-{
- win32_cond_t *win32_cond = cond->ptr;
- int last_waiter;
- if (cond_wait) {
- cond_wait(cond, mutex, INFINITE);
- return 0;
- }
-
- /* non native condition variables */
- pthread_mutex_lock(&win32_cond->mtx_broadcast);
- pthread_mutex_lock(&win32_cond->mtx_waiter_count);
- win32_cond->waiter_count++;
- pthread_mutex_unlock(&win32_cond->mtx_waiter_count);
- pthread_mutex_unlock(&win32_cond->mtx_broadcast);
-
- // unlock the external mutex
- pthread_mutex_unlock(mutex);
- WaitForSingleObject(win32_cond->semaphore, INFINITE);
-
- pthread_mutex_lock(&win32_cond->mtx_waiter_count);
- win32_cond->waiter_count--;
- last_waiter = !win32_cond->waiter_count || !win32_cond->is_broadcast;
- pthread_mutex_unlock(&win32_cond->mtx_waiter_count);
-
- if (last_waiter)
- SetEvent(win32_cond->waiters_done);
-
- // lock the external mutex
- return pthread_mutex_lock(mutex);
-}
-
-static void pthread_cond_signal(pthread_cond_t *cond)
-{
- win32_cond_t *win32_cond = cond->ptr;
- int have_waiter;
- if (cond_signal) {
- cond_signal(cond);
- return;
- }
-
- pthread_mutex_lock(&win32_cond->mtx_broadcast);
-
- /* non-native condition variables */
- pthread_mutex_lock(&win32_cond->mtx_waiter_count);
- have_waiter = win32_cond->waiter_count;
- pthread_mutex_unlock(&win32_cond->mtx_waiter_count);
-
- if (have_waiter) {
- ReleaseSemaphore(win32_cond->semaphore, 1, NULL);
- WaitForSingleObject(win32_cond->waiters_done, INFINITE);
- ResetEvent(win32_cond->waiters_done);
- }
-
- pthread_mutex_unlock(&win32_cond->mtx_broadcast);
-}
-
-static void w32thread_init(void)
-{
- HANDLE kernel_dll = GetModuleHandle(TEXT("kernel32.dll"));
- /* if one is available, then they should all be available */
- cond_init =
- (void*)GetProcAddress(kernel_dll, "InitializeConditionVariable");
- cond_broadcast =
- (void*)GetProcAddress(kernel_dll, "WakeAllConditionVariable");
- cond_signal =
- (void*)GetProcAddress(kernel_dll, "WakeConditionVariable");
- cond_wait =
- (void*)GetProcAddress(kernel_dll, "SleepConditionVariableCS");
-}
-
-#endif /* AVCODEC_W32PTHREADS_H */

libav-v9.6.tar.bz2/libavcodec/x86/dsputil_avg_template.c Deleted

@@ -1,855 +0,0 @@
-/*
- * DSP utils : average functions are compiled twice for 3dnow/mmxext
- * Copyright (c) 2000, 2001 Fabrice Bellard
- * Copyright (c) 2002-2004 Michael Niedermayer
- *
- * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
- * mostly rewritten by Michael Niedermayer <michaelni@gmx.at>
- * and improved by Zdenek Kabelac <kabi@users.sf.net>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/* XXX: we use explicit registers to avoid a gcc 2.95.2 register asm
- clobber bug - now it will work with 2.95.2 and also with -fPIC
- */
-static void DEF(put_pixels8_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- __asm__ volatile(
- "lea (%3, %3), %%"REG_a" \n\t"
- "1: \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- PAVGB" 1(%1), %%mm0 \n\t"
- PAVGB" 1(%1, %3), %%mm1 \n\t"
- "movq %%mm0, (%2) \n\t"
- "movq %%mm1, (%2, %3) \n\t"
- "add %%"REG_a", %1 \n\t"
- "add %%"REG_a", %2 \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- PAVGB" 1(%1), %%mm0 \n\t"
- PAVGB" 1(%1, %3), %%mm1 \n\t"
- "add %%"REG_a", %1 \n\t"
- "movq %%mm0, (%2) \n\t"
- "movq %%mm1, (%2, %3) \n\t"
- "add %%"REG_a", %2 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
- :"+g"(h), "+S"(pixels), "+D"(block)
- :"r" ((x86_reg)line_size)
- :"%"REG_a, "memory");
-}
-
-#ifndef SKIP_FOR_3DNOW
-static void DEF(put_pixels8_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
-{
- __asm__ volatile(
- "testl $1, %0 \n\t"
- " jz 1f \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq (%2), %%mm1 \n\t"
- "add %4, %1 \n\t"
- "add $8, %2 \n\t"
- PAVGB" %%mm1, %%mm0 \n\t"
- "movq %%mm0, (%3) \n\t"
- "add %5, %3 \n\t"
- "decl %0 \n\t"
- "1: \n\t"
- "movq (%1), %%mm0 \n\t"
- "add %4, %1 \n\t"
- "movq (%1), %%mm1 \n\t"
- "add %4, %1 \n\t"
- PAVGB" (%2), %%mm0 \n\t"
- PAVGB" 8(%2), %%mm1 \n\t"
- "movq %%mm0, (%3) \n\t"
- "add %5, %3 \n\t"
- "movq %%mm1, (%3) \n\t"
- "add %5, %3 \n\t"
- "movq (%1), %%mm0 \n\t"
- "add %4, %1 \n\t"
- "movq (%1), %%mm1 \n\t"
- "add %4, %1 \n\t"
- PAVGB" 16(%2), %%mm0 \n\t"
- PAVGB" 24(%2), %%mm1 \n\t"
- "movq %%mm0, (%3) \n\t"
- "add %5, %3 \n\t"
- "movq %%mm1, (%3) \n\t"
- "add %5, %3 \n\t"
- "add $32, %2 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
-#if !HAVE_EBX_AVAILABLE //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cannot be used
- :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
-#else
- :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
-#endif
- :"S"((x86_reg)src1Stride), "D"((x86_reg)dstStride)
- :"memory");
-//the following should be used, though better not with gcc ...
-/* :"+g"(h), "+r"(src1), "+r"(src2), "+r"(dst)
- :"r"(src1Stride), "r"(dstStride)
- :"memory");*/
-}
-
-static void DEF(put_no_rnd_pixels8_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
-{
- __asm__ volatile(
- "pcmpeqb %%mm6, %%mm6 \n\t"
- "testl $1, %0 \n\t"
- " jz 1f \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq (%2), %%mm1 \n\t"
- "add %4, %1 \n\t"
- "add $8, %2 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "pxor %%mm6, %%mm1 \n\t"
- PAVGB" %%mm1, %%mm0 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "movq %%mm0, (%3) \n\t"
- "add %5, %3 \n\t"
- "decl %0 \n\t"
- "1: \n\t"
- "movq (%1), %%mm0 \n\t"
- "add %4, %1 \n\t"
- "movq (%1), %%mm1 \n\t"
- "add %4, %1 \n\t"
- "movq (%2), %%mm2 \n\t"
- "movq 8(%2), %%mm3 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "pxor %%mm6, %%mm1 \n\t"
- "pxor %%mm6, %%mm2 \n\t"
- "pxor %%mm6, %%mm3 \n\t"
- PAVGB" %%mm2, %%mm0 \n\t"
- PAVGB" %%mm3, %%mm1 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "pxor %%mm6, %%mm1 \n\t"
- "movq %%mm0, (%3) \n\t"
- "add %5, %3 \n\t"
- "movq %%mm1, (%3) \n\t"
- "add %5, %3 \n\t"
- "movq (%1), %%mm0 \n\t"
- "add %4, %1 \n\t"
- "movq (%1), %%mm1 \n\t"
- "add %4, %1 \n\t"
- "movq 16(%2), %%mm2 \n\t"
- "movq 24(%2), %%mm3 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "pxor %%mm6, %%mm1 \n\t"
- "pxor %%mm6, %%mm2 \n\t"
- "pxor %%mm6, %%mm3 \n\t"
- PAVGB" %%mm2, %%mm0 \n\t"
- PAVGB" %%mm3, %%mm1 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "pxor %%mm6, %%mm1 \n\t"
- "movq %%mm0, (%3) \n\t"
- "add %5, %3 \n\t"
- "movq %%mm1, (%3) \n\t"
- "add %5, %3 \n\t"
- "add $32, %2 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
-#if !HAVE_EBX_AVAILABLE //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cannot be used
- :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
-#else
- :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
-#endif
- :"S"((x86_reg)src1Stride), "D"((x86_reg)dstStride)
- :"memory");
-//the following should be used, though better not with gcc ...
-/* :"+g"(h), "+r"(src1), "+r"(src2), "+r"(dst)
- :"r"(src1Stride), "r"(dstStride)
- :"memory");*/
-}
-
-static void DEF(avg_pixels8_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
-{
- __asm__ volatile(
- "testl $1, %0 \n\t"
- " jz 1f \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq (%2), %%mm1 \n\t"
- "add %4, %1 \n\t"
- "add $8, %2 \n\t"
- PAVGB" %%mm1, %%mm0 \n\t"
- PAVGB" (%3), %%mm0 \n\t"
- "movq %%mm0, (%3) \n\t"
- "add %5, %3 \n\t"
- "decl %0 \n\t"
- "1: \n\t"
- "movq (%1), %%mm0 \n\t"
- "add %4, %1 \n\t"
- "movq (%1), %%mm1 \n\t"
- "add %4, %1 \n\t"
- PAVGB" (%2), %%mm0 \n\t"
- PAVGB" 8(%2), %%mm1 \n\t"
- PAVGB" (%3), %%mm0 \n\t"
- "movq %%mm0, (%3) \n\t"
- "add %5, %3 \n\t"
- PAVGB" (%3), %%mm1 \n\t"
- "movq %%mm1, (%3) \n\t"
- "add %5, %3 \n\t"
- "movq (%1), %%mm0 \n\t"
- "add %4, %1 \n\t"
- "movq (%1), %%mm1 \n\t"
- "add %4, %1 \n\t"
- PAVGB" 16(%2), %%mm0 \n\t"
- PAVGB" 24(%2), %%mm1 \n\t"
- PAVGB" (%3), %%mm0 \n\t"
- "movq %%mm0, (%3) \n\t"
- "add %5, %3 \n\t"
- PAVGB" (%3), %%mm1 \n\t"
- "movq %%mm1, (%3) \n\t"
- "add %5, %3 \n\t"
- "add $32, %2 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
-#if !HAVE_EBX_AVAILABLE //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cannot be used
- :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
-#else
- :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
-#endif
- :"S"((x86_reg)src1Stride), "D"((x86_reg)dstStride)
- :"memory");
-//the following should be used, though better not with gcc ...
-/* :"+g"(h), "+r"(src1), "+r"(src2), "+r"(dst)
- :"r"(src1Stride), "r"(dstStride)
- :"memory");*/
-}
-#endif /* SKIP_FOR_3DNOW */
-
-static void DEF(put_pixels16_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- __asm__ volatile(
- "lea (%3, %3), %%"REG_a" \n\t"
- "1: \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- "movq 8(%1), %%mm2 \n\t"
- "movq 8(%1, %3), %%mm3 \n\t"
- PAVGB" 1(%1), %%mm0 \n\t"
- PAVGB" 1(%1, %3), %%mm1 \n\t"
- PAVGB" 9(%1), %%mm2 \n\t"
- PAVGB" 9(%1, %3), %%mm3 \n\t"
- "movq %%mm0, (%2) \n\t"
- "movq %%mm1, (%2, %3) \n\t"
- "movq %%mm2, 8(%2) \n\t"
- "movq %%mm3, 8(%2, %3) \n\t"
- "add %%"REG_a", %1 \n\t"
- "add %%"REG_a", %2 \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- "movq 8(%1), %%mm2 \n\t"
- "movq 8(%1, %3), %%mm3 \n\t"
- PAVGB" 1(%1), %%mm0 \n\t"
- PAVGB" 1(%1, %3), %%mm1 \n\t"
- PAVGB" 9(%1), %%mm2 \n\t"
- PAVGB" 9(%1, %3), %%mm3 \n\t"
- "add %%"REG_a", %1 \n\t"
- "movq %%mm0, (%2) \n\t"
- "movq %%mm1, (%2, %3) \n\t"
- "movq %%mm2, 8(%2) \n\t"
- "movq %%mm3, 8(%2, %3) \n\t"
- "add %%"REG_a", %2 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
- :"+g"(h), "+S"(pixels), "+D"(block)
- :"r" ((x86_reg)line_size)
- :"%"REG_a, "memory");
-}
-
-#ifndef SKIP_FOR_3DNOW
-static void DEF(put_pixels16_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
-{
- __asm__ volatile(
- "testl $1, %0 \n\t"
- " jz 1f \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq 8(%1), %%mm1 \n\t"
- PAVGB" (%2), %%mm0 \n\t"
- PAVGB" 8(%2), %%mm1 \n\t"
- "add %4, %1 \n\t"
- "add $16, %2 \n\t"
- "movq %%mm0, (%3) \n\t"
- "movq %%mm1, 8(%3) \n\t"
- "add %5, %3 \n\t"
- "decl %0 \n\t"
- "1: \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq 8(%1), %%mm1 \n\t"
- "add %4, %1 \n\t"
- PAVGB" (%2), %%mm0 \n\t"
- PAVGB" 8(%2), %%mm1 \n\t"
- "movq %%mm0, (%3) \n\t"
- "movq %%mm1, 8(%3) \n\t"
- "add %5, %3 \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq 8(%1), %%mm1 \n\t"
- "add %4, %1 \n\t"
- PAVGB" 16(%2), %%mm0 \n\t"
- PAVGB" 24(%2), %%mm1 \n\t"
- "movq %%mm0, (%3) \n\t"
- "movq %%mm1, 8(%3) \n\t"
- "add %5, %3 \n\t"
- "add $32, %2 \n\t"
- "subl $2, %0 \n\t"
- "jnz 1b \n\t"
-#if !HAVE_EBX_AVAILABLE //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cannot be used
- :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
-#else
- :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
-#endif
- :"S"((x86_reg)src1Stride), "D"((x86_reg)dstStride)
- :"memory");
-//the following should be used, though better not with gcc ...
-/* :"+g"(h), "+r"(src1), "+r"(src2), "+r"(dst)
- :"r"(src1Stride), "r"(dstStride)
- :"memory");*/
-}
-
-static void DEF(avg_pixels16_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
-{
- __asm__ volatile(
- "testl $1, %0 \n\t"
- " jz 1f \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq 8(%1), %%mm1 \n\t"
- PAVGB" (%2), %%mm0 \n\t"
- PAVGB" 8(%2), %%mm1 \n\t"
- "add %4, %1 \n\t"
- "add $16, %2 \n\t"
- PAVGB" (%3), %%mm0 \n\t"
- PAVGB" 8(%3), %%mm1 \n\t"
- "movq %%mm0, (%3) \n\t"
- "movq %%mm1, 8(%3) \n\t"
- "add %5, %3 \n\t"
- "decl %0 \n\t"
- "1: \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq 8(%1), %%mm1 \n\t"
- "add %4, %1 \n\t"
- PAVGB" (%2), %%mm0 \n\t"
- PAVGB" 8(%2), %%mm1 \n\t"
- PAVGB" (%3), %%mm0 \n\t"
- PAVGB" 8(%3), %%mm1 \n\t"
- "movq %%mm0, (%3) \n\t"
- "movq %%mm1, 8(%3) \n\t"
- "add %5, %3 \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq 8(%1), %%mm1 \n\t"
- "add %4, %1 \n\t"
- PAVGB" 16(%2), %%mm0 \n\t"
- PAVGB" 24(%2), %%mm1 \n\t"
- PAVGB" (%3), %%mm0 \n\t"
- PAVGB" 8(%3), %%mm1 \n\t"
- "movq %%mm0, (%3) \n\t"
- "movq %%mm1, 8(%3) \n\t"
- "add %5, %3 \n\t"
- "add $32, %2 \n\t"
- "subl $2, %0 \n\t"
- "jnz 1b \n\t"
-#if !HAVE_EBX_AVAILABLE //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cannot be used
- :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
-#else
- :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
-#endif
- :"S"((x86_reg)src1Stride), "D"((x86_reg)dstStride)
- :"memory");
-//the following should be used, though better not with gcc ...
-/* :"+g"(h), "+r"(src1), "+r"(src2), "+r"(dst)
- :"r"(src1Stride), "r"(dstStride)
- :"memory");*/
-}
-
-static void DEF(put_no_rnd_pixels16_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
-{
- __asm__ volatile(
- "pcmpeqb %%mm6, %%mm6 \n\t"
- "testl $1, %0 \n\t"
- " jz 1f \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq 8(%1), %%mm1 \n\t"
- "movq (%2), %%mm2 \n\t"
- "movq 8(%2), %%mm3 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "pxor %%mm6, %%mm1 \n\t"
- "pxor %%mm6, %%mm2 \n\t"
- "pxor %%mm6, %%mm3 \n\t"
- PAVGB" %%mm2, %%mm0 \n\t"
- PAVGB" %%mm3, %%mm1 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "pxor %%mm6, %%mm1 \n\t"
- "add %4, %1 \n\t"
- "add $16, %2 \n\t"
- "movq %%mm0, (%3) \n\t"
- "movq %%mm1, 8(%3) \n\t"
- "add %5, %3 \n\t"
- "decl %0 \n\t"
- "1: \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq 8(%1), %%mm1 \n\t"
- "add %4, %1 \n\t"
- "movq (%2), %%mm2 \n\t"
- "movq 8(%2), %%mm3 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "pxor %%mm6, %%mm1 \n\t"
- "pxor %%mm6, %%mm2 \n\t"
- "pxor %%mm6, %%mm3 \n\t"
- PAVGB" %%mm2, %%mm0 \n\t"
- PAVGB" %%mm3, %%mm1 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "pxor %%mm6, %%mm1 \n\t"
- "movq %%mm0, (%3) \n\t"
- "movq %%mm1, 8(%3) \n\t"
- "add %5, %3 \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq 8(%1), %%mm1 \n\t"
- "add %4, %1 \n\t"
- "movq 16(%2), %%mm2 \n\t"
- "movq 24(%2), %%mm3 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "pxor %%mm6, %%mm1 \n\t"
- "pxor %%mm6, %%mm2 \n\t"
- "pxor %%mm6, %%mm3 \n\t"
- PAVGB" %%mm2, %%mm0 \n\t"
- PAVGB" %%mm3, %%mm1 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "pxor %%mm6, %%mm1 \n\t"
- "movq %%mm0, (%3) \n\t"
- "movq %%mm1, 8(%3) \n\t"
- "add %5, %3 \n\t"
- "add $32, %2 \n\t"
- "subl $2, %0 \n\t"
- "jnz 1b \n\t"
-#if !HAVE_EBX_AVAILABLE //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cannot be used
- :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
-#else
- :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
-#endif
- :"S"((x86_reg)src1Stride), "D"((x86_reg)dstStride)
- :"memory");
-//the following should be used, though better not with gcc ...
-/* :"+g"(h), "+r"(src1), "+r"(src2), "+r"(dst)
- :"r"(src1Stride), "r"(dstStride)
- :"memory");*/
-}
-#endif /* SKIP_FOR_3DNOW */
-
-/* GL: this function does incorrect rounding if overflow */
-static void DEF(put_no_rnd_pixels8_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- MOVQ_BONE(mm6);
- __asm__ volatile(
- "lea (%3, %3), %%"REG_a" \n\t"
- "1: \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq (%1, %3), %%mm2 \n\t"
- "movq 1(%1), %%mm1 \n\t"
- "movq 1(%1, %3), %%mm3 \n\t"
- "add %%"REG_a", %1 \n\t"
- "psubusb %%mm6, %%mm0 \n\t"
- "psubusb %%mm6, %%mm2 \n\t"
- PAVGB" %%mm1, %%mm0 \n\t"
- PAVGB" %%mm3, %%mm2 \n\t"
- "movq %%mm0, (%2) \n\t"
- "movq %%mm2, (%2, %3) \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq 1(%1), %%mm1 \n\t"
- "movq (%1, %3), %%mm2 \n\t"
- "movq 1(%1, %3), %%mm3 \n\t"
- "add %%"REG_a", %2 \n\t"
- "add %%"REG_a", %1 \n\t"
- "psubusb %%mm6, %%mm0 \n\t"
- "psubusb %%mm6, %%mm2 \n\t"
- PAVGB" %%mm1, %%mm0 \n\t"
- PAVGB" %%mm3, %%mm2 \n\t"
- "movq %%mm0, (%2) \n\t"
- "movq %%mm2, (%2, %3) \n\t"
- "add %%"REG_a", %2 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
- :"+g"(h), "+S"(pixels), "+D"(block)
- :"r" ((x86_reg)line_size)
- :"%"REG_a, "memory");
-}
-
-static void DEF(put_no_rnd_pixels8_x2_exact)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- __asm__ volatile (
- "pcmpeqb %%mm6, %%mm6 \n\t"
- "1: \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq (%1, %3), %%mm2 \n\t"
- "movq 1(%1), %%mm1 \n\t"
- "movq 1(%1, %3), %%mm3 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "pxor %%mm6, %%mm2 \n\t"
- "pxor %%mm6, %%mm1 \n\t"
- "pxor %%mm6, %%mm3 \n\t"
- PAVGB" %%mm1, %%mm0 \n\t"
- PAVGB" %%mm3, %%mm2 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "pxor %%mm6, %%mm2 \n\t"
- "movq %%mm0, (%2) \n\t"
- "movq %%mm2, (%2, %3) \n\t"
- "movq (%1, %3,2), %%mm0 \n\t"
- "movq 1(%1, %3,2), %%mm1 \n\t"
- "movq (%1, %4), %%mm2 \n\t"
- "movq 1(%1, %4), %%mm3 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "pxor %%mm6, %%mm1 \n\t"
- "pxor %%mm6, %%mm2 \n\t"
- "pxor %%mm6, %%mm3 \n\t"
- PAVGB" %%mm1, %%mm0 \n\t"
- PAVGB" %%mm3, %%mm2 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "pxor %%mm6, %%mm2 \n\t"
- "movq %%mm0, (%2, %3,2) \n\t"
- "movq %%mm2, (%2, %4) \n\t"
- "lea (%1, %3,4), %1 \n\t"
- "lea (%2, %3,4), %2 \n\t"
- "subl $4, %0 \n\t"
- "jg 1b \n\t"
- : "+g"(h), "+r"(pixels), "+r"(block)
- : "r" ((x86_reg)line_size), "r"((x86_reg)3*line_size)
- : "memory"
- );
-}
-
-static void DEF(put_pixels8_y2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- __asm__ volatile(
- "lea (%3, %3), %%"REG_a" \n\t"
- "movq (%1), %%mm0 \n\t"
- "sub %3, %2 \n\t"
- "1: \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- "movq (%1, %%"REG_a"), %%mm2 \n\t"
- "add %%"REG_a", %1 \n\t"
- PAVGB" %%mm1, %%mm0 \n\t"
- PAVGB" %%mm2, %%mm1 \n\t"
- "movq %%mm0, (%2, %3) \n\t"
- "movq %%mm1, (%2, %%"REG_a") \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- "movq (%1, %%"REG_a"), %%mm0 \n\t"
- "add %%"REG_a", %2 \n\t"
- "add %%"REG_a", %1 \n\t"
- PAVGB" %%mm1, %%mm2 \n\t"
- PAVGB" %%mm0, %%mm1 \n\t"
- "movq %%mm2, (%2, %3) \n\t"
- "movq %%mm1, (%2, %%"REG_a") \n\t"
- "add %%"REG_a", %2 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
- :"+g"(h), "+S"(pixels), "+D" (block)
- :"r" ((x86_reg)line_size)
- :"%"REG_a, "memory");
-}
-
-/* GL: this function does incorrect rounding if overflow */
-static void DEF(put_no_rnd_pixels8_y2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- MOVQ_BONE(mm6);
- __asm__ volatile(
- "lea (%3, %3), %%"REG_a" \n\t"
- "movq (%1), %%mm0 \n\t"
- "sub %3, %2 \n\t"
- "1: \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- "movq (%1, %%"REG_a"), %%mm2 \n\t"
- "add %%"REG_a", %1 \n\t"
- "psubusb %%mm6, %%mm1 \n\t"
- PAVGB" %%mm1, %%mm0 \n\t"
- PAVGB" %%mm2, %%mm1 \n\t"
- "movq %%mm0, (%2, %3) \n\t"
- "movq %%mm1, (%2, %%"REG_a") \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- "movq (%1, %%"REG_a"), %%mm0 \n\t"
- "add %%"REG_a", %2 \n\t"
- "add %%"REG_a", %1 \n\t"
- "psubusb %%mm6, %%mm1 \n\t"
- PAVGB" %%mm1, %%mm2 \n\t"
- PAVGB" %%mm0, %%mm1 \n\t"
- "movq %%mm2, (%2, %3) \n\t"
- "movq %%mm1, (%2, %%"REG_a") \n\t"
- "add %%"REG_a", %2 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
- :"+g"(h), "+S"(pixels), "+D" (block)
- :"r" ((x86_reg)line_size)
- :"%"REG_a, "memory");
-}
-
-static void DEF(put_no_rnd_pixels8_y2_exact)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- __asm__ volatile (
- "movq (%1), %%mm0 \n\t"
- "pcmpeqb %%mm6, %%mm6 \n\t"
- "add %3, %1 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "1: \n\t"
- "movq (%1), %%mm1 \n\t"
- "movq (%1, %3), %%mm2 \n\t"
- "pxor %%mm6, %%mm1 \n\t"
- "pxor %%mm6, %%mm2 \n\t"
- PAVGB" %%mm1, %%mm0 \n\t"
- PAVGB" %%mm2, %%mm1 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- "pxor %%mm6, %%mm1 \n\t"
- "movq %%mm0, (%2) \n\t"
- "movq %%mm1, (%2, %3) \n\t"
- "movq (%1, %3,2), %%mm1 \n\t"
- "movq (%1, %4), %%mm0 \n\t"
- "pxor %%mm6, %%mm1 \n\t"
- "pxor %%mm6, %%mm0 \n\t"
- PAVGB" %%mm1, %%mm2 \n\t"
- PAVGB" %%mm0, %%mm1 \n\t"
- "pxor %%mm6, %%mm2 \n\t"
- "pxor %%mm6, %%mm1 \n\t"
- "movq %%mm2, (%2, %3,2) \n\t"
- "movq %%mm1, (%2, %4) \n\t"
- "lea (%1, %3,4), %1 \n\t"
- "lea (%2, %3,4), %2 \n\t"
- "subl $4, %0 \n\t"
- "jg 1b \n\t"
- :"+g"(h), "+r"(pixels), "+r" (block)
- :"r" ((x86_reg)line_size), "r"((x86_reg)3*line_size)
- :"memory"
- );
-}
-
-static void DEF(avg_pixels8)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- __asm__ volatile(
- "lea (%3, %3), %%"REG_a" \n\t"
- "1: \n\t"
- "movq (%2), %%mm0 \n\t"
- "movq (%2, %3), %%mm1 \n\t"
- PAVGB" (%1), %%mm0 \n\t"
- PAVGB" (%1, %3), %%mm1 \n\t"
- "movq %%mm0, (%2) \n\t"
- "movq %%mm1, (%2, %3) \n\t"
- "add %%"REG_a", %1 \n\t"
- "add %%"REG_a", %2 \n\t"
- "movq (%2), %%mm0 \n\t"
- "movq (%2, %3), %%mm1 \n\t"
- PAVGB" (%1), %%mm0 \n\t"
- PAVGB" (%1, %3), %%mm1 \n\t"
- "add %%"REG_a", %1 \n\t"
- "movq %%mm0, (%2) \n\t"
- "movq %%mm1, (%2, %3) \n\t"
- "add %%"REG_a", %2 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
- :"+g"(h), "+S"(pixels), "+D"(block)
- :"r" ((x86_reg)line_size)
- :"%"REG_a, "memory");
-}
-
-static void DEF(avg_pixels8_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- __asm__ volatile(
- "lea (%3, %3), %%"REG_a" \n\t"
- "1: \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq (%1, %3), %%mm2 \n\t"
- PAVGB" 1(%1), %%mm0 \n\t"
- PAVGB" 1(%1, %3), %%mm2 \n\t"
- PAVGB" (%2), %%mm0 \n\t"
- PAVGB" (%2, %3), %%mm2 \n\t"
- "add %%"REG_a", %1 \n\t"
- "movq %%mm0, (%2) \n\t"
- "movq %%mm2, (%2, %3) \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq (%1, %3), %%mm2 \n\t"
- PAVGB" 1(%1), %%mm0 \n\t"
- PAVGB" 1(%1, %3), %%mm2 \n\t"
- "add %%"REG_a", %2 \n\t"
- "add %%"REG_a", %1 \n\t"
- PAVGB" (%2), %%mm0 \n\t"
- PAVGB" (%2, %3), %%mm2 \n\t"
- "movq %%mm0, (%2) \n\t"
- "movq %%mm2, (%2, %3) \n\t"
- "add %%"REG_a", %2 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
- :"+g"(h), "+S"(pixels), "+D"(block)
- :"r" ((x86_reg)line_size)
- :"%"REG_a, "memory");
-}
-
-static void DEF(avg_pixels8_y2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- __asm__ volatile(
- "lea (%3, %3), %%"REG_a" \n\t"
- "movq (%1), %%mm0 \n\t"
- "sub %3, %2 \n\t"
- "1: \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- "movq (%1, %%"REG_a"), %%mm2 \n\t"
- "add %%"REG_a", %1 \n\t"
- PAVGB" %%mm1, %%mm0 \n\t"
- PAVGB" %%mm2, %%mm1 \n\t"
- "movq (%2, %3), %%mm3 \n\t"
- "movq (%2, %%"REG_a"), %%mm4 \n\t"
- PAVGB" %%mm3, %%mm0 \n\t"
- PAVGB" %%mm4, %%mm1 \n\t"
- "movq %%mm0, (%2, %3) \n\t"
- "movq %%mm1, (%2, %%"REG_a") \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- "movq (%1, %%"REG_a"), %%mm0 \n\t"
- PAVGB" %%mm1, %%mm2 \n\t"
- PAVGB" %%mm0, %%mm1 \n\t"
- "add %%"REG_a", %2 \n\t"
- "add %%"REG_a", %1 \n\t"
- "movq (%2, %3), %%mm3 \n\t"
- "movq (%2, %%"REG_a"), %%mm4 \n\t"
- PAVGB" %%mm3, %%mm2 \n\t"
- PAVGB" %%mm4, %%mm1 \n\t"
- "movq %%mm2, (%2, %3) \n\t"
- "movq %%mm1, (%2, %%"REG_a") \n\t"
- "add %%"REG_a", %2 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
- :"+g"(h), "+S"(pixels), "+D"(block)
- :"r" ((x86_reg)line_size)
- :"%"REG_a, "memory");
-}
-
-/* Note this is not correctly rounded, but this function is only
- * used for B-frames so it does not matter. */
-static void DEF(avg_pixels8_xy2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- MOVQ_BONE(mm6);
- __asm__ volatile(
- "lea (%3, %3), %%"REG_a" \n\t"
- "movq (%1), %%mm0 \n\t"
- PAVGB" 1(%1), %%mm0 \n\t"
- ".p2align 3 \n\t"
- "1: \n\t"
- "movq (%1, %%"REG_a"), %%mm2 \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- "psubusb %%mm6, %%mm2 \n\t"
- PAVGB" 1(%1, %3), %%mm1 \n\t"
- PAVGB" 1(%1, %%"REG_a"), %%mm2 \n\t"
- "add %%"REG_a", %1 \n\t"
- PAVGB" %%mm1, %%mm0 \n\t"
- PAVGB" %%mm2, %%mm1 \n\t"
- PAVGB" (%2), %%mm0 \n\t"
- PAVGB" (%2, %3), %%mm1 \n\t"
- "movq %%mm0, (%2) \n\t"
- "movq %%mm1, (%2, %3) \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- "movq (%1, %%"REG_a"), %%mm0 \n\t"
- PAVGB" 1(%1, %3), %%mm1 \n\t"
- PAVGB" 1(%1, %%"REG_a"), %%mm0 \n\t"
- "add %%"REG_a", %2 \n\t"
- "add %%"REG_a", %1 \n\t"
- PAVGB" %%mm1, %%mm2 \n\t"
- PAVGB" %%mm0, %%mm1 \n\t"
- PAVGB" (%2), %%mm2 \n\t"
- PAVGB" (%2, %3), %%mm1 \n\t"
- "movq %%mm2, (%2) \n\t"
- "movq %%mm1, (%2, %3) \n\t"
- "add %%"REG_a", %2 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
- :"+g"(h), "+S"(pixels), "+D"(block)
- :"r" ((x86_reg)line_size)
- :"%"REG_a, "memory");
-}
-
-//FIXME the following could be optimized too ...
-static void DEF(put_no_rnd_pixels16_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){
- DEF(put_no_rnd_pixels8_x2)(block , pixels , line_size, h);
- DEF(put_no_rnd_pixels8_x2)(block+8, pixels+8, line_size, h);
-}
-static void DEF(put_pixels16_y2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){
- DEF(put_pixels8_y2)(block , pixels , line_size, h);
- DEF(put_pixels8_y2)(block+8, pixels+8, line_size, h);
-}
-static void DEF(put_no_rnd_pixels16_y2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){
- DEF(put_no_rnd_pixels8_y2)(block , pixels , line_size, h);
- DEF(put_no_rnd_pixels8_y2)(block+8, pixels+8, line_size, h);
-}
-static void DEF(avg_pixels16)(uint8_t *block, const uint8_t *pixels, int line_size, int h){
- DEF(avg_pixels8)(block , pixels , line_size, h);
- DEF(avg_pixels8)(block+8, pixels+8, line_size, h);
-}
-static void DEF(avg_pixels16_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){
- DEF(avg_pixels8_x2)(block , pixels , line_size, h);
- DEF(avg_pixels8_x2)(block+8, pixels+8, line_size, h);
-}
-static void DEF(avg_pixels16_y2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){
- DEF(avg_pixels8_y2)(block , pixels , line_size, h);
- DEF(avg_pixels8_y2)(block+8, pixels+8, line_size, h);
-}
-static void DEF(avg_pixels16_xy2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){
- DEF(avg_pixels8_xy2)(block , pixels , line_size, h);
- DEF(avg_pixels8_xy2)(block+8, pixels+8, line_size, h);
-}
-
-#define QPEL_2TAP_L3(OPNAME) \
-static void DEF(OPNAME ## 2tap_qpel16_l3)(uint8_t *dst, uint8_t *src, int stride, int h, int off1, int off2){\
- __asm__ volatile(\
- "1: \n\t"\
- "movq (%1,%2), %%mm0 \n\t"\
- "movq 8(%1,%2), %%mm1 \n\t"\
- PAVGB" (%1,%3), %%mm0 \n\t"\
- PAVGB" 8(%1,%3), %%mm1 \n\t"\
- PAVGB" (%1), %%mm0 \n\t"\
- PAVGB" 8(%1), %%mm1 \n\t"\
- STORE_OP( (%1,%4),%%mm0)\
- STORE_OP(8(%1,%4),%%mm1)\
- "movq %%mm0, (%1,%4) \n\t"\
- "movq %%mm1, 8(%1,%4) \n\t"\
- "add %5, %1 \n\t"\
- "decl %0 \n\t"\
- "jnz 1b \n\t"\
- :"+g"(h), "+r"(src)\
- :"r"((x86_reg)off1), "r"((x86_reg)off2),\
- "r"((x86_reg)(dst-src)), "r"((x86_reg)stride)\
- :"memory"\
- );\
-}\
-static void DEF(OPNAME ## 2tap_qpel8_l3)(uint8_t *dst, uint8_t *src, int stride, int h, int off1, int off2){\
- __asm__ volatile(\
- "1: \n\t"\
- "movq (%1,%2), %%mm0 \n\t"\
- PAVGB" (%1,%3), %%mm0 \n\t"\
- PAVGB" (%1), %%mm0 \n\t"\
- STORE_OP((%1,%4),%%mm0)\
- "movq %%mm0, (%1,%4) \n\t"\
- "add %5, %1 \n\t"\
- "decl %0 \n\t"\
- "jnz 1b \n\t"\
- :"+g"(h), "+r"(src)\
- :"r"((x86_reg)off1), "r"((x86_reg)off2),\
- "r"((x86_reg)(dst-src)), "r"((x86_reg)stride)\
- :"memory"\
- );\
-}
-
-#ifndef SKIP_FOR_3DNOW
-#define STORE_OP(a,b) PAVGB" "#a","#b" \n\t"
-QPEL_2TAP_L3(avg_)
-#undef STORE_OP
-#define STORE_OP(a,b)
-QPEL_2TAP_L3(put_)
-#undef STORE_OP
-#undef QPEL_2TAP_L3
-#endif /* SKIP_FOR_3DNOW */

libav-v9.6.tar.bz2/libavcodec/x86/dsputil_mmx.h Deleted

@@ -1,117 +0,0 @@
-/*
- * MMX optimized DSP utils
- * Copyright (c) 2007 Aurelien Jacobs <aurel@gnuage.org>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_X86_DSPUTIL_MMX_H
-#define AVCODEC_X86_DSPUTIL_MMX_H
-
-#include <stdint.h>
-#include "libavcodec/dsputil.h"
-#include "libavutil/x86/asm.h"
-
-typedef struct xmm_reg { uint64_t a, b; } xmm_reg;
-
-extern const uint64_t ff_bone;
-extern const uint64_t ff_wtwo;
-
-extern const uint64_t ff_pdw_80000000[2];
-
-extern const xmm_reg ff_pw_3;
-extern const xmm_reg ff_pw_4;
-extern const xmm_reg ff_pw_5;
-extern const xmm_reg ff_pw_8;
-extern const uint64_t ff_pw_15;
-extern const xmm_reg ff_pw_16;
-extern const xmm_reg ff_pw_18;
-extern const uint64_t ff_pw_20;
-extern const xmm_reg ff_pw_27;
-extern const xmm_reg ff_pw_28;
-extern const xmm_reg ff_pw_32;
-extern const uint64_t ff_pw_42;
-extern const uint64_t ff_pw_53;
-extern const xmm_reg ff_pw_63;
-extern const xmm_reg ff_pw_64;
-extern const uint64_t ff_pw_96;
-extern const uint64_t ff_pw_128;
-extern const uint64_t ff_pw_255;
-
-extern const xmm_reg ff_pb_1;
-extern const xmm_reg ff_pb_3;
-extern const uint64_t ff_pb_7;
-extern const uint64_t ff_pb_1F;
-extern const uint64_t ff_pb_3F;
-extern const uint64_t ff_pb_81;
-extern const xmm_reg ff_pb_A1;
-extern const xmm_reg ff_pb_F8;
-extern const uint64_t ff_pb_FC;
-extern const xmm_reg ff_pb_FE;
-
-extern const double ff_pd_1[2];
-extern const double ff_pd_2[2];
-
-#define SBUTTERFLY(a,b,t,n,m)\
- "mov" #m " " #a ", " #t " \n\t" /* abcd */\
- "punpckl" #n " " #b ", " #a " \n\t" /* aebf */\
- "punpckh" #n " " #b ", " #t " \n\t" /* cgdh */\
-
-#define TRANSPOSE4(a,b,c,d,t)\
- SBUTTERFLY(a,b,t,wd,q) /* a=aebf t=cgdh */\
- SBUTTERFLY(c,d,b,wd,q) /* c=imjn b=kolp */\
- SBUTTERFLY(a,c,d,dq,q) /* a=aeim d=bfjn */\
- SBUTTERFLY(t,b,c,dq,q) /* t=cgko c=dhlp */
-
-#define MOVQ_WONE(regd) \
- __asm__ volatile ( \
- "pcmpeqd %%" #regd ", %%" #regd " \n\t" \
- "psrlw $15, %%" #regd ::)
-
-void ff_dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx);
-void ff_dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx);
-
-void ff_add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
-void ff_put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
-void ff_put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
-
-void ff_put_cavs_qpel8_mc00_mmxext(uint8_t *dst, uint8_t *src, int stride);
-void ff_avg_cavs_qpel8_mc00_mmxext(uint8_t *dst, uint8_t *src, int stride);
-void ff_put_cavs_qpel16_mc00_mmxext(uint8_t *dst, uint8_t *src, int stride);
-void ff_avg_cavs_qpel16_mc00_mmxext(uint8_t *dst, uint8_t *src, int stride);
-
-void ff_put_vc1_mspel_mc00_mmx(uint8_t *dst, const uint8_t *src, int stride, int rnd);
-void ff_avg_vc1_mspel_mc00_mmxext(uint8_t *dst, const uint8_t *src, int stride, int rnd);
-
-void ff_put_rv40_qpel8_mc33_mmx(uint8_t *block, uint8_t *pixels, int line_size);
-void ff_put_rv40_qpel16_mc33_mmx(uint8_t *block, uint8_t *pixels, int line_size);
-void ff_avg_rv40_qpel8_mc33_mmx(uint8_t *block, uint8_t *pixels, int line_size);
-void ff_avg_rv40_qpel16_mc33_mmx(uint8_t *block, uint8_t *pixels, int line_size);
-
-void ff_deinterlace_line_mmx(uint8_t *dst,
- const uint8_t *lum_m4, const uint8_t *lum_m3,
- const uint8_t *lum_m2, const uint8_t *lum_m1,
- const uint8_t *lum,
- int size);
-
-void ff_deinterlace_line_inplace_mmx(const uint8_t *lum_m4,
- const uint8_t *lum_m3,
- const uint8_t *lum_m2,
- const uint8_t *lum_m1,
- const uint8_t *lum, int size);
-
-#endif /* AVCODEC_X86_DSPUTIL_MMX_H */

libav-v9.6.tar.bz2/libavcodec/x86/dsputil_rnd_template.c Deleted

@@ -1,590 +0,0 @@
-/*
- * DSP utils mmx functions are compiled twice for rnd/no_rnd
- * Copyright (c) 2000, 2001 Fabrice Bellard
- * Copyright (c) 2003-2004 Michael Niedermayer <michaelni@gmx.at>
- *
- * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
- * mostly rewritten by Michael Niedermayer <michaelni@gmx.at>
- * and improved by Zdenek Kabelac <kabi@users.sf.net>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-// put_pixels
-static void DEF(put, pixels8_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- MOVQ_BFE(mm6);
- __asm__ volatile(
- "lea (%3, %3), %%"REG_a" \n\t"
- ".p2align 3 \n\t"
- "1: \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq 1(%1), %%mm1 \n\t"
- "movq (%1, %3), %%mm2 \n\t"
- "movq 1(%1, %3), %%mm3 \n\t"
- PAVGBP(%%mm0, %%mm1, %%mm4, %%mm2, %%mm3, %%mm5)
- "movq %%mm4, (%2) \n\t"
- "movq %%mm5, (%2, %3) \n\t"
- "add %%"REG_a", %1 \n\t"
- "add %%"REG_a", %2 \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq 1(%1), %%mm1 \n\t"
- "movq (%1, %3), %%mm2 \n\t"
- "movq 1(%1, %3), %%mm3 \n\t"
- PAVGBP(%%mm0, %%mm1, %%mm4, %%mm2, %%mm3, %%mm5)
- "movq %%mm4, (%2) \n\t"
- "movq %%mm5, (%2, %3) \n\t"
- "add %%"REG_a", %1 \n\t"
- "add %%"REG_a", %2 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
- :"+g"(h), "+S"(pixels), "+D"(block)
- :"r"((x86_reg)line_size)
- :REG_a, "memory");
-}
-
-static void av_unused DEF(put, pixels8_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
-{
- MOVQ_BFE(mm6);
- __asm__ volatile(
- "testl $1, %0 \n\t"
- " jz 1f \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq (%2), %%mm1 \n\t"
- "add %4, %1 \n\t"
- "add $8, %2 \n\t"
- PAVGB(%%mm0, %%mm1, %%mm4, %%mm6)
- "movq %%mm4, (%3) \n\t"
- "add %5, %3 \n\t"
- "decl %0 \n\t"
- ".p2align 3 \n\t"
- "1: \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq (%2), %%mm1 \n\t"
- "add %4, %1 \n\t"
- "movq (%1), %%mm2 \n\t"
- "movq 8(%2), %%mm3 \n\t"
- "add %4, %1 \n\t"
- PAVGBP(%%mm0, %%mm1, %%mm4, %%mm2, %%mm3, %%mm5)
- "movq %%mm4, (%3) \n\t"
- "add %5, %3 \n\t"
- "movq %%mm5, (%3) \n\t"
- "add %5, %3 \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq 16(%2), %%mm1 \n\t"
- "add %4, %1 \n\t"
- "movq (%1), %%mm2 \n\t"
- "movq 24(%2), %%mm3 \n\t"
- "add %4, %1 \n\t"
- "add $32, %2 \n\t"
- PAVGBP(%%mm0, %%mm1, %%mm4, %%mm2, %%mm3, %%mm5)
- "movq %%mm4, (%3) \n\t"
- "add %5, %3 \n\t"
- "movq %%mm5, (%3) \n\t"
- "add %5, %3 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
-#if !HAVE_EBX_AVAILABLE //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cannot be used
- :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
-#else
- :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
-#endif
- :"S"((x86_reg)src1Stride), "D"((x86_reg)dstStride)
- :"memory");
-}
-
-static void DEF(put, pixels16_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- MOVQ_BFE(mm6);
- __asm__ volatile(
- "lea (%3, %3), %%"REG_a" \n\t"
- ".p2align 3 \n\t"
- "1: \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq 1(%1), %%mm1 \n\t"
- "movq (%1, %3), %%mm2 \n\t"
- "movq 1(%1, %3), %%mm3 \n\t"
- PAVGBP(%%mm0, %%mm1, %%mm4, %%mm2, %%mm3, %%mm5)
- "movq %%mm4, (%2) \n\t"
- "movq %%mm5, (%2, %3) \n\t"
- "movq 8(%1), %%mm0 \n\t"
- "movq 9(%1), %%mm1 \n\t"
- "movq 8(%1, %3), %%mm2 \n\t"
- "movq 9(%1, %3), %%mm3 \n\t"
- PAVGBP(%%mm0, %%mm1, %%mm4, %%mm2, %%mm3, %%mm5)
- "movq %%mm4, 8(%2) \n\t"
- "movq %%mm5, 8(%2, %3) \n\t"
- "add %%"REG_a", %1 \n\t"
- "add %%"REG_a", %2 \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq 1(%1), %%mm1 \n\t"
- "movq (%1, %3), %%mm2 \n\t"
- "movq 1(%1, %3), %%mm3 \n\t"
- PAVGBP(%%mm0, %%mm1, %%mm4, %%mm2, %%mm3, %%mm5)
- "movq %%mm4, (%2) \n\t"
- "movq %%mm5, (%2, %3) \n\t"
- "movq 8(%1), %%mm0 \n\t"
- "movq 9(%1), %%mm1 \n\t"
- "movq 8(%1, %3), %%mm2 \n\t"
- "movq 9(%1, %3), %%mm3 \n\t"
- PAVGBP(%%mm0, %%mm1, %%mm4, %%mm2, %%mm3, %%mm5)
- "movq %%mm4, 8(%2) \n\t"
- "movq %%mm5, 8(%2, %3) \n\t"
- "add %%"REG_a", %1 \n\t"
- "add %%"REG_a", %2 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
- :"+g"(h), "+S"(pixels), "+D"(block)
- :"r"((x86_reg)line_size)
- :REG_a, "memory");
-}
-
-static void av_unused DEF(put, pixels16_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
-{
- MOVQ_BFE(mm6);
- __asm__ volatile(
- "testl $1, %0 \n\t"
- " jz 1f \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq (%2), %%mm1 \n\t"
- "movq 8(%1), %%mm2 \n\t"
- "movq 8(%2), %%mm3 \n\t"
- "add %4, %1 \n\t"
- "add $16, %2 \n\t"
- PAVGBP(%%mm0, %%mm1, %%mm4, %%mm2, %%mm3, %%mm5)
- "movq %%mm4, (%3) \n\t"
- "movq %%mm5, 8(%3) \n\t"
- "add %5, %3 \n\t"
- "decl %0 \n\t"
- ".p2align 3 \n\t"
- "1: \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq (%2), %%mm1 \n\t"
- "movq 8(%1), %%mm2 \n\t"
- "movq 8(%2), %%mm3 \n\t"
- "add %4, %1 \n\t"
- PAVGBP(%%mm0, %%mm1, %%mm4, %%mm2, %%mm3, %%mm5)
- "movq %%mm4, (%3) \n\t"
- "movq %%mm5, 8(%3) \n\t"
- "add %5, %3 \n\t"
- "movq (%1), %%mm0 \n\t"
- "movq 16(%2), %%mm1 \n\t"
- "movq 8(%1), %%mm2 \n\t"
- "movq 24(%2), %%mm3 \n\t"
- "add %4, %1 \n\t"
- PAVGBP(%%mm0, %%mm1, %%mm4, %%mm2, %%mm3, %%mm5)
- "movq %%mm4, (%3) \n\t"
- "movq %%mm5, 8(%3) \n\t"
- "add %5, %3 \n\t"
- "add $32, %2 \n\t"
- "subl $2, %0 \n\t"
- "jnz 1b \n\t"
-#if !HAVE_EBX_AVAILABLE //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cannot be used
- :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
-#else
- :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
-#endif
- :"S"((x86_reg)src1Stride), "D"((x86_reg)dstStride)
- :"memory");
-}
-
-static void DEF(put, pixels8_y2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- MOVQ_BFE(mm6);
- __asm__ volatile(
- "lea (%3, %3), %%"REG_a" \n\t"
- "movq (%1), %%mm0 \n\t"
- ".p2align 3 \n\t"
- "1: \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- "movq (%1, %%"REG_a"),%%mm2 \n\t"
- PAVGBP(%%mm1, %%mm0, %%mm4, %%mm2, %%mm1, %%mm5)
- "movq %%mm4, (%2) \n\t"
- "movq %%mm5, (%2, %3) \n\t"
- "add %%"REG_a", %1 \n\t"
- "add %%"REG_a", %2 \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- "movq (%1, %%"REG_a"),%%mm0 \n\t"
- PAVGBP(%%mm1, %%mm2, %%mm4, %%mm0, %%mm1, %%mm5)
- "movq %%mm4, (%2) \n\t"
- "movq %%mm5, (%2, %3) \n\t"
- "add %%"REG_a", %1 \n\t"
- "add %%"REG_a", %2 \n\t"
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
- :"+g"(h), "+S"(pixels), "+D"(block)
- :"r"((x86_reg)line_size)
- :REG_a, "memory");
-}
-
-static void DEF(put, pixels8_xy2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- MOVQ_ZERO(mm7);
- SET_RND(mm6); // =2 for rnd and =1 for no_rnd version
- __asm__ volatile(
- "movq (%1), %%mm0 \n\t"
- "movq 1(%1), %%mm4 \n\t"
- "movq %%mm0, %%mm1 \n\t"
- "movq %%mm4, %%mm5 \n\t"
- "punpcklbw %%mm7, %%mm0 \n\t"
- "punpcklbw %%mm7, %%mm4 \n\t"
- "punpckhbw %%mm7, %%mm1 \n\t"
- "punpckhbw %%mm7, %%mm5 \n\t"
- "paddusw %%mm0, %%mm4 \n\t"
- "paddusw %%mm1, %%mm5 \n\t"
- "xor %%"REG_a", %%"REG_a" \n\t"
- "add %3, %1 \n\t"
- ".p2align 3 \n\t"
- "1: \n\t"
- "movq (%1, %%"REG_a"), %%mm0 \n\t"
- "movq 1(%1, %%"REG_a"), %%mm2 \n\t"
- "movq %%mm0, %%mm1 \n\t"
- "movq %%mm2, %%mm3 \n\t"
- "punpcklbw %%mm7, %%mm0 \n\t"
- "punpcklbw %%mm7, %%mm2 \n\t"
- "punpckhbw %%mm7, %%mm1 \n\t"
- "punpckhbw %%mm7, %%mm3 \n\t"
- "paddusw %%mm2, %%mm0 \n\t"
- "paddusw %%mm3, %%mm1 \n\t"
- "paddusw %%mm6, %%mm4 \n\t"
- "paddusw %%mm6, %%mm5 \n\t"
- "paddusw %%mm0, %%mm4 \n\t"
- "paddusw %%mm1, %%mm5 \n\t"
- "psrlw $2, %%mm4 \n\t"
- "psrlw $2, %%mm5 \n\t"
- "packuswb %%mm5, %%mm4 \n\t"
- "movq %%mm4, (%2, %%"REG_a") \n\t"
- "add %3, %%"REG_a" \n\t"
-
- "movq (%1, %%"REG_a"), %%mm2 \n\t" // 0 <-> 2 1 <-> 3
- "movq 1(%1, %%"REG_a"), %%mm4 \n\t"
- "movq %%mm2, %%mm3 \n\t"
- "movq %%mm4, %%mm5 \n\t"
- "punpcklbw %%mm7, %%mm2 \n\t"
- "punpcklbw %%mm7, %%mm4 \n\t"
- "punpckhbw %%mm7, %%mm3 \n\t"
- "punpckhbw %%mm7, %%mm5 \n\t"
- "paddusw %%mm2, %%mm4 \n\t"
- "paddusw %%mm3, %%mm5 \n\t"
- "paddusw %%mm6, %%mm0 \n\t"
- "paddusw %%mm6, %%mm1 \n\t"
- "paddusw %%mm4, %%mm0 \n\t"
- "paddusw %%mm5, %%mm1 \n\t"
- "psrlw $2, %%mm0 \n\t"
- "psrlw $2, %%mm1 \n\t"
- "packuswb %%mm1, %%mm0 \n\t"
- "movq %%mm0, (%2, %%"REG_a") \n\t"
- "add %3, %%"REG_a" \n\t"
-
- "subl $2, %0 \n\t"
- "jnz 1b \n\t"
- :"+g"(h), "+S"(pixels)
- :"D"(block), "r"((x86_reg)line_size)
- :REG_a, "memory");
-}
-
-// avg_pixels
-static void av_unused DEF(avg, pixels4)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- MOVQ_BFE(mm6);
- JUMPALIGN();
- do {
- __asm__ volatile(
- "movd %0, %%mm0 \n\t"
- "movd %1, %%mm1 \n\t"
- OP_AVG(%%mm0, %%mm1, %%mm2, %%mm6)
- "movd %%mm2, %0 \n\t"
- :"+m"(*block)
- :"m"(*pixels)
- :"memory");
- pixels += line_size;
- block += line_size;
- }
- while (--h);
-}
-
-// in case more speed is needed - unroling would certainly help
-static void DEF(avg, pixels8)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- MOVQ_BFE(mm6);
- JUMPALIGN();
- do {
- __asm__ volatile(
- "movq %0, %%mm0 \n\t"
- "movq %1, %%mm1 \n\t"
- OP_AVG(%%mm0, %%mm1, %%mm2, %%mm6)
- "movq %%mm2, %0 \n\t"
- :"+m"(*block)
- :"m"(*pixels)
- :"memory");
- pixels += line_size;
- block += line_size;
- }
- while (--h);
-}
-
-static void DEF(avg, pixels16)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- MOVQ_BFE(mm6);
- JUMPALIGN();
- do {
- __asm__ volatile(
- "movq %0, %%mm0 \n\t"
- "movq %1, %%mm1 \n\t"
- OP_AVG(%%mm0, %%mm1, %%mm2, %%mm6)
- "movq %%mm2, %0 \n\t"
- "movq 8%0, %%mm0 \n\t"
- "movq 8%1, %%mm1 \n\t"
- OP_AVG(%%mm0, %%mm1, %%mm2, %%mm6)
- "movq %%mm2, 8%0 \n\t"
- :"+m"(*block)
- :"m"(*pixels)
- :"memory");
- pixels += line_size;
- block += line_size;
- }
- while (--h);
-}
-
-static void DEF(avg, pixels8_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- MOVQ_BFE(mm6);
- JUMPALIGN();
- do {
- __asm__ volatile(
- "movq %1, %%mm0 \n\t"
- "movq 1%1, %%mm1 \n\t"
- "movq %0, %%mm3 \n\t"
- PAVGB(%%mm0, %%mm1, %%mm2, %%mm6)
- OP_AVG(%%mm3, %%mm2, %%mm0, %%mm6)
- "movq %%mm0, %0 \n\t"
- :"+m"(*block)
- :"m"(*pixels)
- :"memory");
- pixels += line_size;
- block += line_size;
- } while (--h);
-}
-
-static av_unused void DEF(avg, pixels8_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
-{
- MOVQ_BFE(mm6);
- JUMPALIGN();
- do {
- __asm__ volatile(
- "movq %1, %%mm0 \n\t"
- "movq %2, %%mm1 \n\t"
- "movq %0, %%mm3 \n\t"
- PAVGB(%%mm0, %%mm1, %%mm2, %%mm6)
- OP_AVG(%%mm3, %%mm2, %%mm0, %%mm6)
- "movq %%mm0, %0 \n\t"
- :"+m"(*dst)
- :"m"(*src1), "m"(*src2)
- :"memory");
- dst += dstStride;
- src1 += src1Stride;
- src2 += 8;
- } while (--h);
-}
-
-static void DEF(avg, pixels16_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- MOVQ_BFE(mm6);
- JUMPALIGN();
- do {
- __asm__ volatile(
- "movq %1, %%mm0 \n\t"
- "movq 1%1, %%mm1 \n\t"
- "movq %0, %%mm3 \n\t"
- PAVGB(%%mm0, %%mm1, %%mm2, %%mm6)
- OP_AVG(%%mm3, %%mm2, %%mm0, %%mm6)
- "movq %%mm0, %0 \n\t"
- "movq 8%1, %%mm0 \n\t"
- "movq 9%1, %%mm1 \n\t"
- "movq 8%0, %%mm3 \n\t"
- PAVGB(%%mm0, %%mm1, %%mm2, %%mm6)
- OP_AVG(%%mm3, %%mm2, %%mm0, %%mm6)
- "movq %%mm0, 8%0 \n\t"
- :"+m"(*block)
- :"m"(*pixels)
- :"memory");
- pixels += line_size;
- block += line_size;
- } while (--h);
-}
-
-static av_unused void DEF(avg, pixels16_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
-{
- MOVQ_BFE(mm6);
- JUMPALIGN();
- do {
- __asm__ volatile(
- "movq %1, %%mm0 \n\t"
- "movq %2, %%mm1 \n\t"
- "movq %0, %%mm3 \n\t"
- PAVGB(%%mm0, %%mm1, %%mm2, %%mm6)
- OP_AVG(%%mm3, %%mm2, %%mm0, %%mm6)
- "movq %%mm0, %0 \n\t"
- "movq 8%1, %%mm0 \n\t"
- "movq 8%2, %%mm1 \n\t"
- "movq 8%0, %%mm3 \n\t"
- PAVGB(%%mm0, %%mm1, %%mm2, %%mm6)
- OP_AVG(%%mm3, %%mm2, %%mm0, %%mm6)
- "movq %%mm0, 8%0 \n\t"
- :"+m"(*dst)
- :"m"(*src1), "m"(*src2)
- :"memory");
- dst += dstStride;
- src1 += src1Stride;
- src2 += 16;
- } while (--h);
-}
-
-static void DEF(avg, pixels8_y2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- MOVQ_BFE(mm6);
- __asm__ volatile(
- "lea (%3, %3), %%"REG_a" \n\t"
- "movq (%1), %%mm0 \n\t"
- ".p2align 3 \n\t"
- "1: \n\t"
- "movq (%1, %3), %%mm1 \n\t"
- "movq (%1, %%"REG_a"), %%mm2 \n\t"
- PAVGBP(%%mm1, %%mm0, %%mm4, %%mm2, %%mm1, %%mm5)
- "movq (%2), %%mm3 \n\t"
- OP_AVG(%%mm3, %%mm4, %%mm0, %%mm6)
- "movq (%2, %3), %%mm3 \n\t"
- OP_AVG(%%mm3, %%mm5, %%mm1, %%mm6)
- "movq %%mm0, (%2) \n\t"
- "movq %%mm1, (%2, %3) \n\t"
- "add %%"REG_a", %1 \n\t"
- "add %%"REG_a", %2 \n\t"
-
- "movq (%1, %3), %%mm1 \n\t"
- "movq (%1, %%"REG_a"), %%mm0 \n\t"
- PAVGBP(%%mm1, %%mm2, %%mm4, %%mm0, %%mm1, %%mm5)
- "movq (%2), %%mm3 \n\t"
- OP_AVG(%%mm3, %%mm4, %%mm2, %%mm6)
- "movq (%2, %3), %%mm3 \n\t"
- OP_AVG(%%mm3, %%mm5, %%mm1, %%mm6)
- "movq %%mm2, (%2) \n\t"
- "movq %%mm1, (%2, %3) \n\t"
- "add %%"REG_a", %1 \n\t"
- "add %%"REG_a", %2 \n\t"
-
- "subl $4, %0 \n\t"
- "jnz 1b \n\t"
- :"+g"(h), "+S"(pixels), "+D"(block)
- :"r"((x86_reg)line_size)
- :REG_a, "memory");
-}
-
-// this routine is 'slightly' suboptimal but mostly unused
-static void DEF(avg, pixels8_xy2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
-{
- MOVQ_ZERO(mm7);
- SET_RND(mm6); // =2 for rnd and =1 for no_rnd version
- __asm__ volatile(
- "movq (%1), %%mm0 \n\t"
- "movq 1(%1), %%mm4 \n\t"
- "movq %%mm0, %%mm1 \n\t"
- "movq %%mm4, %%mm5 \n\t"
- "punpcklbw %%mm7, %%mm0 \n\t"
- "punpcklbw %%mm7, %%mm4 \n\t"
- "punpckhbw %%mm7, %%mm1 \n\t"
- "punpckhbw %%mm7, %%mm5 \n\t"
- "paddusw %%mm0, %%mm4 \n\t"
- "paddusw %%mm1, %%mm5 \n\t"
- "xor %%"REG_a", %%"REG_a" \n\t"
- "add %3, %1 \n\t"
- ".p2align 3 \n\t"
- "1: \n\t"
- "movq (%1, %%"REG_a"), %%mm0 \n\t"
- "movq 1(%1, %%"REG_a"), %%mm2 \n\t"
- "movq %%mm0, %%mm1 \n\t"
- "movq %%mm2, %%mm3 \n\t"
- "punpcklbw %%mm7, %%mm0 \n\t"
- "punpcklbw %%mm7, %%mm2 \n\t"
- "punpckhbw %%mm7, %%mm1 \n\t"
- "punpckhbw %%mm7, %%mm3 \n\t"
- "paddusw %%mm2, %%mm0 \n\t"
- "paddusw %%mm3, %%mm1 \n\t"
- "paddusw %%mm6, %%mm4 \n\t"
- "paddusw %%mm6, %%mm5 \n\t"
- "paddusw %%mm0, %%mm4 \n\t"
- "paddusw %%mm1, %%mm5 \n\t"
- "psrlw $2, %%mm4 \n\t"
- "psrlw $2, %%mm5 \n\t"
- "movq (%2, %%"REG_a"), %%mm3 \n\t"
- "packuswb %%mm5, %%mm4 \n\t"
- "pcmpeqd %%mm2, %%mm2 \n\t"
- "paddb %%mm2, %%mm2 \n\t"
- OP_AVG(%%mm3, %%mm4, %%mm5, %%mm2)
- "movq %%mm5, (%2, %%"REG_a") \n\t"
- "add %3, %%"REG_a" \n\t"
-
- "movq (%1, %%"REG_a"), %%mm2 \n\t" // 0 <-> 2 1 <-> 3
- "movq 1(%1, %%"REG_a"), %%mm4 \n\t"
- "movq %%mm2, %%mm3 \n\t"
- "movq %%mm4, %%mm5 \n\t"
- "punpcklbw %%mm7, %%mm2 \n\t"
- "punpcklbw %%mm7, %%mm4 \n\t"
- "punpckhbw %%mm7, %%mm3 \n\t"
- "punpckhbw %%mm7, %%mm5 \n\t"
- "paddusw %%mm2, %%mm4 \n\t"
- "paddusw %%mm3, %%mm5 \n\t"
- "paddusw %%mm6, %%mm0 \n\t"
- "paddusw %%mm6, %%mm1 \n\t"
- "paddusw %%mm4, %%mm0 \n\t"
- "paddusw %%mm5, %%mm1 \n\t"
- "psrlw $2, %%mm0 \n\t"
- "psrlw $2, %%mm1 \n\t"
- "movq (%2, %%"REG_a"), %%mm3 \n\t"
- "packuswb %%mm1, %%mm0 \n\t"
- "pcmpeqd %%mm2, %%mm2 \n\t"
- "paddb %%mm2, %%mm2 \n\t"
- OP_AVG(%%mm3, %%mm0, %%mm1, %%mm2)
- "movq %%mm1, (%2, %%"REG_a") \n\t"
- "add %3, %%"REG_a" \n\t"
-
- "subl $2, %0 \n\t"
- "jnz 1b \n\t"
- :"+g"(h), "+S"(pixels)
- :"D"(block), "r"((x86_reg)line_size)
- :REG_a, "memory");
-}
-
-//FIXME optimize
-static void DEF(put, pixels16_y2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){
- DEF(put, pixels8_y2)(block , pixels , line_size, h);
- DEF(put, pixels8_y2)(block+8, pixels+8, line_size, h);
-}
-
-static void DEF(put, pixels16_xy2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){
- DEF(put, pixels8_xy2)(block , pixels , line_size, h);
- DEF(put, pixels8_xy2)(block+8, pixels+8, line_size, h);
-}
-
-static void DEF(avg, pixels16_y2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){
- DEF(avg, pixels8_y2)(block , pixels , line_size, h);
- DEF(avg, pixels8_y2)(block+8, pixels+8, line_size, h);
-}
-
-static void DEF(avg, pixels16_xy2)(uint8_t *block, const uint8_t *pixels, int line_size, int h){
- DEF(avg, pixels8_xy2)(block , pixels , line_size, h);
- DEF(avg, pixels8_xy2)(block+8, pixels+8, line_size, h);
-}

libav-v9.6.tar.bz2/libavcodec/x86/mpegaudiodec.c Deleted

@@ -1,263 +0,0 @@
-/*
- * MMX optimized MP3 decoding functions
- * Copyright (c) 2010 Vitor Sessak
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; 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/x86/asm.h"
-#include "libavutil/x86/cpu.h"
-#include "libavcodec/dsputil.h"
-#include "libavcodec/mpegaudiodsp.h"
-
-void ff_imdct36_float_sse(float *out, float *buf, float *in, float *win);
-void ff_imdct36_float_sse2(float *out, float *buf, float *in, float *win);
-void ff_imdct36_float_sse3(float *out, float *buf, float *in, float *win);
-void ff_imdct36_float_ssse3(float *out, float *buf, float *in, float *win);
-void ff_imdct36_float_avx(float *out, float *buf, float *in, float *win);
-void ff_four_imdct36_float_sse(float *out, float *buf, float *in, float *win,
- float *tmpbuf);
-void ff_four_imdct36_float_avx(float *out, float *buf, float *in, float *win,
- float *tmpbuf);
-
-DECLARE_ALIGNED(16, static float, mdct_win_sse)[2][4][4*40];
-
-#if HAVE_SSE2_INLINE
-
-#define MACS(rt, ra, rb) rt+=(ra)*(rb)
-#define MLSS(rt, ra, rb) rt-=(ra)*(rb)
-
-#define SUM8(op, sum, w, p) \
-{ \
- op(sum, (w)[0 * 64], (p)[0 * 64]); \
- op(sum, (w)[1 * 64], (p)[1 * 64]); \
- op(sum, (w)[2 * 64], (p)[2 * 64]); \
- op(sum, (w)[3 * 64], (p)[3 * 64]); \
- op(sum, (w)[4 * 64], (p)[4 * 64]); \
- op(sum, (w)[5 * 64], (p)[5 * 64]); \
- op(sum, (w)[6 * 64], (p)[6 * 64]); \
- op(sum, (w)[7 * 64], (p)[7 * 64]); \
-}
-
-static void apply_window(const float *buf, const float *win1,
- const float *win2, float *sum1, float *sum2, int len)
-{
- x86_reg count = - 4*len;
- const float *win1a = win1+len;
- const float *win2a = win2+len;
- const float *bufa = buf+len;
- float *sum1a = sum1+len;
- float *sum2a = sum2+len;
-
-
-#define MULT(a, b) \
- "movaps " #a "(%1,%0), %%xmm1 \n\t" \
- "movaps " #a "(%3,%0), %%xmm2 \n\t" \
- "mulps %%xmm2, %%xmm1 \n\t" \
- "subps %%xmm1, %%xmm0 \n\t" \
- "mulps " #b "(%2,%0), %%xmm2 \n\t" \
- "subps %%xmm2, %%xmm4 \n\t" \
-
- __asm__ volatile(
- "1: \n\t"
- "xorps %%xmm0, %%xmm0 \n\t"
- "xorps %%xmm4, %%xmm4 \n\t"
-
- MULT( 0, 0)
- MULT( 256, 64)
- MULT( 512, 128)
- MULT( 768, 192)
- MULT(1024, 256)
- MULT(1280, 320)
- MULT(1536, 384)
- MULT(1792, 448)
-
- "movaps %%xmm0, (%4,%0) \n\t"
- "movaps %%xmm4, (%5,%0) \n\t"
- "add $16, %0 \n\t"
- "jl 1b \n\t"
- :"+&r"(count)
- :"r"(win1a), "r"(win2a), "r"(bufa), "r"(sum1a), "r"(sum2a)
- );
-
-#undef MULT
-}
-
-static void apply_window_mp3(float *in, float *win, int *unused, float *out,
- int incr)
-{
- LOCAL_ALIGNED_16(float, suma, [17]);
- LOCAL_ALIGNED_16(float, sumb, [17]);
- LOCAL_ALIGNED_16(float, sumc, [17]);
- LOCAL_ALIGNED_16(float, sumd, [17]);
-
- float sum;
-
- /* copy to avoid wrap */
- __asm__ volatile(
- "movaps 0(%0), %%xmm0 \n\t" \
- "movaps 16(%0), %%xmm1 \n\t" \
- "movaps 32(%0), %%xmm2 \n\t" \
- "movaps 48(%0), %%xmm3 \n\t" \
- "movaps %%xmm0, 0(%1) \n\t" \
- "movaps %%xmm1, 16(%1) \n\t" \
- "movaps %%xmm2, 32(%1) \n\t" \
- "movaps %%xmm3, 48(%1) \n\t" \
- "movaps 64(%0), %%xmm0 \n\t" \
- "movaps 80(%0), %%xmm1 \n\t" \
- "movaps 96(%0), %%xmm2 \n\t" \
- "movaps 112(%0), %%xmm3 \n\t" \
- "movaps %%xmm0, 64(%1) \n\t" \
- "movaps %%xmm1, 80(%1) \n\t" \
- "movaps %%xmm2, 96(%1) \n\t" \
- "movaps %%xmm3, 112(%1) \n\t"
- ::"r"(in), "r"(in+512)
- :"memory"
- );
-
- apply_window(in + 16, win , win + 512, suma, sumc, 16);
- apply_window(in + 32, win + 48, win + 640, sumb, sumd, 16);
-
- SUM8(MACS, suma[0], win + 32, in + 48);
-
- sumc[ 0] = 0;
- sumb[16] = 0;
- sumd[16] = 0;
-
-#define SUMS(suma, sumb, sumc, sumd, out1, out2) \
- "movups " #sumd "(%4), %%xmm0 \n\t" \
- "shufps $0x1b, %%xmm0, %%xmm0 \n\t" \
- "subps " #suma "(%1), %%xmm0 \n\t" \
- "movaps %%xmm0," #out1 "(%0) \n\t" \
-\
- "movups " #sumc "(%3), %%xmm0 \n\t" \
- "shufps $0x1b, %%xmm0, %%xmm0 \n\t" \
- "addps " #sumb "(%2), %%xmm0 \n\t" \
- "movaps %%xmm0," #out2 "(%0) \n\t"
-
- if (incr == 1) {
- __asm__ volatile(
- SUMS( 0, 48, 4, 52, 0, 112)
- SUMS(16, 32, 20, 36, 16, 96)
- SUMS(32, 16, 36, 20, 32, 80)
- SUMS(48, 0, 52, 4, 48, 64)
-
- :"+&r"(out)
- :"r"(&suma[0]), "r"(&sumb[0]), "r"(&sumc[0]), "r"(&sumd[0])
- :"memory"
- );
- out += 16*incr;
- } else {
- int j;
- float *out2 = out + 32 * incr;
- out[0 ] = -suma[ 0];
- out += incr;
- out2 -= incr;
- for(j=1;j<16;j++) {
- *out = -suma[ j] + sumd[16-j];
- *out2 = sumb[16-j] + sumc[ j];
- out += incr;
- out2 -= incr;
- }
- }
-
- sum = 0;
- SUM8(MLSS, sum, win + 16 + 32, in + 32);
- *out = sum;
-}
-
-#endif /* HAVE_SSE2_INLINE */
-
-#if HAVE_YASM
-#define DECL_IMDCT_BLOCKS(CPU1, CPU2) \
-static void imdct36_blocks_ ## CPU1(float *out, float *buf, float *in, \
- int count, int switch_point, int block_type) \
-{ \
- int align_end = count - (count & 3); \
- int j; \
- for (j = 0; j < align_end; j+= 4) { \
- LOCAL_ALIGNED_16(float, tmpbuf, [1024]); \
- float *win = mdct_win_sse[switch_point && j < 4][block_type]; \
- /* apply window & overlap with previous buffer */ \
- \
- /* select window */ \
- ff_four_imdct36_float_ ## CPU2(out, buf, in, win, tmpbuf); \
- in += 4*18; \
- buf += 4*18; \
- out += 4; \
- } \
- for (; j < count; j++) { \
- /* apply window & overlap with previous buffer */ \
- \
- /* select window */ \
- int win_idx = (switch_point && j < 2) ? 0 : block_type; \
- float *win = ff_mdct_win_float[win_idx + (4 & -(j & 1))]; \
- \
- ff_imdct36_float_ ## CPU1(out, buf, in, win); \
- \
- in += 18; \
- buf++; \
- out++; \
- } \
-}
-
-DECL_IMDCT_BLOCKS(sse,sse)
-DECL_IMDCT_BLOCKS(sse2,sse)
-DECL_IMDCT_BLOCKS(sse3,sse)
-DECL_IMDCT_BLOCKS(ssse3,sse)
-DECL_IMDCT_BLOCKS(avx,avx)
-#endif /* HAVE_YASM */
-
-void ff_mpadsp_init_x86(MPADSPContext *s)
-{
- int mm_flags = av_get_cpu_flags();
-
- int i, j;
- for (j = 0; j < 4; j++) {
- for (i = 0; i < 40; i ++) {
- mdct_win_sse[0][j][4*i ] = ff_mdct_win_float[j ][i];
- mdct_win_sse[0][j][4*i + 1] = ff_mdct_win_float[j + 4][i];
- mdct_win_sse[0][j][4*i + 2] = ff_mdct_win_float[j ][i];
- mdct_win_sse[0][j][4*i + 3] = ff_mdct_win_float[j + 4][i];
- mdct_win_sse[1][j][4*i ] = ff_mdct_win_float[0 ][i];
- mdct_win_sse[1][j][4*i + 1] = ff_mdct_win_float[4 ][i];
- mdct_win_sse[1][j][4*i + 2] = ff_mdct_win_float[j ][i];
- mdct_win_sse[1][j][4*i + 3] = ff_mdct_win_float[j + 4][i];
- }
- }
-
-#if HAVE_SSE2_INLINE
- if (mm_flags & AV_CPU_FLAG_SSE2) {
- s->apply_window_float = apply_window_mp3;
- }
-#endif /* HAVE_SSE2_INLINE */
-
-#if HAVE_YASM
- if (EXTERNAL_AVX(mm_flags)) {
- s->imdct36_blocks_float = imdct36_blocks_avx;
- } else if (EXTERNAL_SSSE3(mm_flags)) {
- s->imdct36_blocks_float = imdct36_blocks_ssse3;
- } else if (EXTERNAL_SSE3(mm_flags)) {
- s->imdct36_blocks_float = imdct36_blocks_sse3;
- } else if (EXTERNAL_SSE2(mm_flags)) {
- s->imdct36_blocks_float = imdct36_blocks_sse2;
- } else if (EXTERNAL_SSE(mm_flags)) {
- s->imdct36_blocks_float = imdct36_blocks_sse;
- }
-#endif /* HAVE_YASM */
-}

libav-v9.6.tar.bz2/libavcodec/x86/snowdsp.c Deleted

@@ -1,902 +0,0 @@
-/*
- * MMX and SSE2 optimized snow DSP utils
- * Copyright (c) 2005-2006 Robert Edele <yartrebo@earthlink.net>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; 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/x86/asm.h"
-#include "libavcodec/avcodec.h"
-#include "libavcodec/snow.h"
-#include "libavcodec/dwt.h"
-#include "dsputil_mmx.h"
-
-#if HAVE_INLINE_ASM
-
-static void ff_snow_horizontal_compose97i_sse2(IDWTELEM *b, IDWTELEM *temp, int width){
- const int w2= (width+1)>>1;
- const int w_l= (width>>1);
- const int w_r= w2 - 1;
- int i;
-
- { // Lift 0
- IDWTELEM * const ref = b + w2 - 1;
- IDWTELEM b_0 = b[0]; //By allowing the first entry in b[0] to be calculated twice
- // (the first time erroneously), we allow the SSE2 code to run an extra pass.
- // The savings in code and time are well worth having to store this value and
- // calculate b[0] correctly afterwards.
-
- i = 0;
- __asm__ volatile(
- "pcmpeqd %%xmm7, %%xmm7 \n\t"
- "pcmpeqd %%xmm3, %%xmm3 \n\t"
- "psllw $1, %%xmm3 \n\t"
- "paddw %%xmm7, %%xmm3 \n\t"
- "psllw $13, %%xmm3 \n\t"
- ::);
- for(; i<w_l-15; i+=16){
- __asm__ volatile(
- "movdqu (%1), %%xmm1 \n\t"
- "movdqu 16(%1), %%xmm5 \n\t"
- "movdqu 2(%1), %%xmm2 \n\t"
- "movdqu 18(%1), %%xmm6 \n\t"
- "paddw %%xmm1, %%xmm2 \n\t"
- "paddw %%xmm5, %%xmm6 \n\t"
- "paddw %%xmm7, %%xmm2 \n\t"
- "paddw %%xmm7, %%xmm6 \n\t"
- "pmulhw %%xmm3, %%xmm2 \n\t"
- "pmulhw %%xmm3, %%xmm6 \n\t"
- "paddw (%0), %%xmm2 \n\t"
- "paddw 16(%0), %%xmm6 \n\t"
- "movdqa %%xmm2, (%0) \n\t"
- "movdqa %%xmm6, 16(%0) \n\t"
- :: "r"(&b[i]), "r"(&ref[i])
- : "memory"
- );
- }
- snow_horizontal_compose_lift_lead_out(i, b, b, ref, width, w_l, 0, W_DM, W_DO, W_DS);
- b[0] = b_0 - ((W_DM * 2 * ref[1]+W_DO)>>W_DS);
- }
-
- { // Lift 1
- IDWTELEM * const dst = b+w2;
-
- i = 0;
- for(; (((x86_reg)&dst[i]) & 0x1F) && i<w_r; i++){
- dst[i] = dst[i] - (b[i] + b[i + 1]);
- }
- for(; i<w_r-15; i+=16){
- __asm__ volatile(
- "movdqu (%1), %%xmm1 \n\t"
- "movdqu 16(%1), %%xmm5 \n\t"
- "movdqu 2(%1), %%xmm2 \n\t"
- "movdqu 18(%1), %%xmm6 \n\t"
- "paddw %%xmm1, %%xmm2 \n\t"
- "paddw %%xmm5, %%xmm6 \n\t"
- "movdqa (%0), %%xmm0 \n\t"
- "movdqa 16(%0), %%xmm4 \n\t"
- "psubw %%xmm2, %%xmm0 \n\t"
- "psubw %%xmm6, %%xmm4 \n\t"
- "movdqa %%xmm0, (%0) \n\t"
- "movdqa %%xmm4, 16(%0) \n\t"
- :: "r"(&dst[i]), "r"(&b[i])
- : "memory"
- );
- }
- snow_horizontal_compose_lift_lead_out(i, dst, dst, b, width, w_r, 1, W_CM, W_CO, W_CS);
- }
-
- { // Lift 2
- IDWTELEM * const ref = b+w2 - 1;
- IDWTELEM b_0 = b[0];
-
- i = 0;
- __asm__ volatile(
- "psllw $15, %%xmm7 \n\t"
- "pcmpeqw %%xmm6, %%xmm6 \n\t"
- "psrlw $13, %%xmm6 \n\t"
- "paddw %%xmm7, %%xmm6 \n\t"
- ::);
- for(; i<w_l-15; i+=16){
- __asm__ volatile(
- "movdqu (%1), %%xmm0 \n\t"
- "movdqu 16(%1), %%xmm4 \n\t"
- "movdqu 2(%1), %%xmm1 \n\t"
- "movdqu 18(%1), %%xmm5 \n\t" //FIXME try aligned reads and shifts
- "paddw %%xmm6, %%xmm0 \n\t"
- "paddw %%xmm6, %%xmm4 \n\t"
- "paddw %%xmm7, %%xmm1 \n\t"
- "paddw %%xmm7, %%xmm5 \n\t"
- "pavgw %%xmm1, %%xmm0 \n\t"
- "pavgw %%xmm5, %%xmm4 \n\t"
- "psubw %%xmm7, %%xmm0 \n\t"
- "psubw %%xmm7, %%xmm4 \n\t"
- "psraw $1, %%xmm0 \n\t"
- "psraw $1, %%xmm4 \n\t"
- "movdqa (%0), %%xmm1 \n\t"
- "movdqa 16(%0), %%xmm5 \n\t"
- "paddw %%xmm1, %%xmm0 \n\t"
- "paddw %%xmm5, %%xmm4 \n\t"
- "psraw $2, %%xmm0 \n\t"
- "psraw $2, %%xmm4 \n\t"
- "paddw %%xmm1, %%xmm0 \n\t"
- "paddw %%xmm5, %%xmm4 \n\t"
- "movdqa %%xmm0, (%0) \n\t"
- "movdqa %%xmm4, 16(%0) \n\t"
- :: "r"(&b[i]), "r"(&ref[i])
- : "memory"
- );
- }
- snow_horizontal_compose_liftS_lead_out(i, b, b, ref, width, w_l);
- b[0] = b_0 + ((2 * ref[1] + W_BO-1 + 4 * b_0) >> W_BS);
- }
-
- { // Lift 3
- IDWTELEM * const src = b+w2;
-
- i = 0;
- for(; (((x86_reg)&temp[i]) & 0x1F) && i<w_r; i++){
- temp[i] = src[i] - ((-W_AM*(b[i] + b[i+1]))>>W_AS);
- }
- for(; i<w_r-7; i+=8){
- __asm__ volatile(
- "movdqu 2(%1), %%xmm2 \n\t"
- "movdqu 18(%1), %%xmm6 \n\t"
- "paddw (%1), %%xmm2 \n\t"
- "paddw 16(%1), %%xmm6 \n\t"
- "movdqu (%0), %%xmm0 \n\t"
- "movdqu 16(%0), %%xmm4 \n\t"
- "paddw %%xmm2, %%xmm0 \n\t"
- "paddw %%xmm6, %%xmm4 \n\t"
- "psraw $1, %%xmm2 \n\t"
- "psraw $1, %%xmm6 \n\t"
- "paddw %%xmm0, %%xmm2 \n\t"
- "paddw %%xmm4, %%xmm6 \n\t"
- "movdqa %%xmm2, (%2) \n\t"
- "movdqa %%xmm6, 16(%2) \n\t"
- :: "r"(&src[i]), "r"(&b[i]), "r"(&temp[i])
- : "memory"
- );
- }
- snow_horizontal_compose_lift_lead_out(i, temp, src, b, width, w_r, 1, -W_AM, W_AO+1, W_AS);
- }
-
- {
- snow_interleave_line_header(&i, width, b, temp);
-
- for (; (i & 0x3E) != 0x3E; i-=2){
- b[i+1] = temp[i>>1];
- b[i] = b[i>>1];
- }
- for (i-=62; i>=0; i-=64){
- __asm__ volatile(
- "movdqa (%1), %%xmm0 \n\t"
- "movdqa 16(%1), %%xmm2 \n\t"
- "movdqa 32(%1), %%xmm4 \n\t"
- "movdqa 48(%1), %%xmm6 \n\t"
- "movdqa (%1), %%xmm1 \n\t"
- "movdqa 16(%1), %%xmm3 \n\t"
- "movdqa 32(%1), %%xmm5 \n\t"
- "movdqa 48(%1), %%xmm7 \n\t"
- "punpcklwd (%2), %%xmm0 \n\t"
- "punpcklwd 16(%2), %%xmm2 \n\t"
- "punpcklwd 32(%2), %%xmm4 \n\t"
- "punpcklwd 48(%2), %%xmm6 \n\t"
- "movdqa %%xmm0, (%0) \n\t"
- "movdqa %%xmm2, 32(%0) \n\t"
- "movdqa %%xmm4, 64(%0) \n\t"
- "movdqa %%xmm6, 96(%0) \n\t"
- "punpckhwd (%2), %%xmm1 \n\t"
- "punpckhwd 16(%2), %%xmm3 \n\t"
- "punpckhwd 32(%2), %%xmm5 \n\t"
- "punpckhwd 48(%2), %%xmm7 \n\t"
- "movdqa %%xmm1, 16(%0) \n\t"
- "movdqa %%xmm3, 48(%0) \n\t"
- "movdqa %%xmm5, 80(%0) \n\t"
- "movdqa %%xmm7, 112(%0) \n\t"
- :: "r"(&(b)[i]), "r"(&(b)[i>>1]), "r"(&(temp)[i>>1])
- : "memory"
- );
- }
- }
-}
-
-static void ff_snow_horizontal_compose97i_mmx(IDWTELEM *b, IDWTELEM *temp, int width){
- const int w2= (width+1)>>1;
- const int w_l= (width>>1);
- const int w_r= w2 - 1;
- int i;
-
- { // Lift 0
- IDWTELEM * const ref = b + w2 - 1;
-
- i = 1;
- b[0] = b[0] - ((W_DM * 2 * ref[1]+W_DO)>>W_DS);
- __asm__ volatile(
- "pcmpeqw %%mm7, %%mm7 \n\t"
- "pcmpeqw %%mm3, %%mm3 \n\t"
- "psllw $1, %%mm3 \n\t"
- "paddw %%mm7, %%mm3 \n\t"
- "psllw $13, %%mm3 \n\t"
- ::);
- for(; i<w_l-7; i+=8){
- __asm__ volatile(
- "movq (%1), %%mm2 \n\t"
- "movq 8(%1), %%mm6 \n\t"
- "paddw 2(%1), %%mm2 \n\t"
- "paddw 10(%1), %%mm6 \n\t"
- "paddw %%mm7, %%mm2 \n\t"
- "paddw %%mm7, %%mm6 \n\t"
- "pmulhw %%mm3, %%mm2 \n\t"
- "pmulhw %%mm3, %%mm6 \n\t"
- "paddw (%0), %%mm2 \n\t"
- "paddw 8(%0), %%mm6 \n\t"
- "movq %%mm2, (%0) \n\t"
- "movq %%mm6, 8(%0) \n\t"
- :: "r"(&b[i]), "r"(&ref[i])
- : "memory"
- );
- }
- snow_horizontal_compose_lift_lead_out(i, b, b, ref, width, w_l, 0, W_DM, W_DO, W_DS);
- }
-
- { // Lift 1
- IDWTELEM * const dst = b+w2;
-
- i = 0;
- for(; i<w_r-7; i+=8){
- __asm__ volatile(
- "movq (%1), %%mm2 \n\t"
- "movq 8(%1), %%mm6 \n\t"
- "paddw 2(%1), %%mm2 \n\t"
- "paddw 10(%1), %%mm6 \n\t"
- "movq (%0), %%mm0 \n\t"
- "movq 8(%0), %%mm4 \n\t"
- "psubw %%mm2, %%mm0 \n\t"
- "psubw %%mm6, %%mm4 \n\t"
- "movq %%mm0, (%0) \n\t"
- "movq %%mm4, 8(%0) \n\t"
- :: "r"(&dst[i]), "r"(&b[i])
- : "memory"
- );
- }
- snow_horizontal_compose_lift_lead_out(i, dst, dst, b, width, w_r, 1, W_CM, W_CO, W_CS);
- }
-
- { // Lift 2
- IDWTELEM * const ref = b+w2 - 1;
-
- i = 1;
- b[0] = b[0] + (((2 * ref[1] + W_BO) + 4 * b[0]) >> W_BS);
- __asm__ volatile(
- "psllw $15, %%mm7 \n\t"
- "pcmpeqw %%mm6, %%mm6 \n\t"
- "psrlw $13, %%mm6 \n\t"
- "paddw %%mm7, %%mm6 \n\t"
- ::);
- for(; i<w_l-7; i+=8){
- __asm__ volatile(
- "movq (%1), %%mm0 \n\t"
- "movq 8(%1), %%mm4 \n\t"
- "movq 2(%1), %%mm1 \n\t"
- "movq 10(%1), %%mm5 \n\t"
- "paddw %%mm6, %%mm0 \n\t"
- "paddw %%mm6, %%mm4 \n\t"
- "paddw %%mm7, %%mm1 \n\t"
- "paddw %%mm7, %%mm5 \n\t"
- "pavgw %%mm1, %%mm0 \n\t"
- "pavgw %%mm5, %%mm4 \n\t"
- "psubw %%mm7, %%mm0 \n\t"
- "psubw %%mm7, %%mm4 \n\t"
- "psraw $1, %%mm0 \n\t"
- "psraw $1, %%mm4 \n\t"
- "movq (%0), %%mm1 \n\t"
- "movq 8(%0), %%mm5 \n\t"
- "paddw %%mm1, %%mm0 \n\t"
- "paddw %%mm5, %%mm4 \n\t"
- "psraw $2, %%mm0 \n\t"
- "psraw $2, %%mm4 \n\t"
- "paddw %%mm1, %%mm0 \n\t"
- "paddw %%mm5, %%mm4 \n\t"
- "movq %%mm0, (%0) \n\t"
- "movq %%mm4, 8(%0) \n\t"
- :: "r"(&b[i]), "r"(&ref[i])
- : "memory"
- );
- }
- snow_horizontal_compose_liftS_lead_out(i, b, b, ref, width, w_l);
- }
-
- { // Lift 3
- IDWTELEM * const src = b+w2;
- i = 0;
-
- for(; i<w_r-7; i+=8){
- __asm__ volatile(
- "movq 2(%1), %%mm2 \n\t"
- "movq 10(%1), %%mm6 \n\t"
- "paddw (%1), %%mm2 \n\t"
- "paddw 8(%1), %%mm6 \n\t"
- "movq (%0), %%mm0 \n\t"
- "movq 8(%0), %%mm4 \n\t"
- "paddw %%mm2, %%mm0 \n\t"
- "paddw %%mm6, %%mm4 \n\t"
- "psraw $1, %%mm2 \n\t"
- "psraw $1, %%mm6 \n\t"
- "paddw %%mm0, %%mm2 \n\t"
- "paddw %%mm4, %%mm6 \n\t"
- "movq %%mm2, (%2) \n\t"
- "movq %%mm6, 8(%2) \n\t"
- :: "r"(&src[i]), "r"(&b[i]), "r"(&temp[i])
- : "memory"
- );
- }
- snow_horizontal_compose_lift_lead_out(i, temp, src, b, width, w_r, 1, -W_AM, W_AO+1, W_AS);
- }
-
- {
- snow_interleave_line_header(&i, width, b, temp);
-
- for (; (i & 0x1E) != 0x1E; i-=2){
- b[i+1] = temp[i>>1];
- b[i] = b[i>>1];
- }
- for (i-=30; i>=0; i-=32){
- __asm__ volatile(
- "movq (%1), %%mm0 \n\t"
- "movq 8(%1), %%mm2 \n\t"
- "movq 16(%1), %%mm4 \n\t"
- "movq 24(%1), %%mm6 \n\t"
- "movq (%1), %%mm1 \n\t"
- "movq 8(%1), %%mm3 \n\t"
- "movq 16(%1), %%mm5 \n\t"
- "movq 24(%1), %%mm7 \n\t"
- "punpcklwd (%2), %%mm0 \n\t"
- "punpcklwd 8(%2), %%mm2 \n\t"
- "punpcklwd 16(%2), %%mm4 \n\t"
- "punpcklwd 24(%2), %%mm6 \n\t"
- "movq %%mm0, (%0) \n\t"
- "movq %%mm2, 16(%0) \n\t"
- "movq %%mm4, 32(%0) \n\t"
- "movq %%mm6, 48(%0) \n\t"
- "punpckhwd (%2), %%mm1 \n\t"
- "punpckhwd 8(%2), %%mm3 \n\t"
- "punpckhwd 16(%2), %%mm5 \n\t"
- "punpckhwd 24(%2), %%mm7 \n\t"
- "movq %%mm1, 8(%0) \n\t"
- "movq %%mm3, 24(%0) \n\t"
- "movq %%mm5, 40(%0) \n\t"
- "movq %%mm7, 56(%0) \n\t"
- :: "r"(&b[i]), "r"(&b[i>>1]), "r"(&temp[i>>1])
- : "memory"
- );
- }
- }
-}
-
-#if HAVE_7REGS
-#define snow_vertical_compose_sse2_load_add(op,r,t0,t1,t2,t3)\
- ""op" ("r",%%"REG_d"), %%"t0" \n\t"\
- ""op" 16("r",%%"REG_d"), %%"t1" \n\t"\
- ""op" 32("r",%%"REG_d"), %%"t2" \n\t"\
- ""op" 48("r",%%"REG_d"), %%"t3" \n\t"
-
-#define snow_vertical_compose_sse2_load(r,t0,t1,t2,t3)\
- snow_vertical_compose_sse2_load_add("movdqa",r,t0,t1,t2,t3)
-
-#define snow_vertical_compose_sse2_add(r,t0,t1,t2,t3)\
- snow_vertical_compose_sse2_load_add("paddw",r,t0,t1,t2,t3)
-
-#define snow_vertical_compose_r2r_sub(s0,s1,s2,s3,t0,t1,t2,t3)\
- "psubw %%"s0", %%"t0" \n\t"\
- "psubw %%"s1", %%"t1" \n\t"\
- "psubw %%"s2", %%"t2" \n\t"\
- "psubw %%"s3", %%"t3" \n\t"
-
-#define snow_vertical_compose_sse2_store(w,s0,s1,s2,s3)\
- "movdqa %%"s0", ("w",%%"REG_d") \n\t"\
- "movdqa %%"s1", 16("w",%%"REG_d") \n\t"\
- "movdqa %%"s2", 32("w",%%"REG_d") \n\t"\
- "movdqa %%"s3", 48("w",%%"REG_d") \n\t"
-
-#define snow_vertical_compose_sra(n,t0,t1,t2,t3)\
- "psraw $"n", %%"t0" \n\t"\
- "psraw $"n", %%"t1" \n\t"\
- "psraw $"n", %%"t2" \n\t"\
- "psraw $"n", %%"t3" \n\t"
-
-#define snow_vertical_compose_r2r_add(s0,s1,s2,s3,t0,t1,t2,t3)\
- "paddw %%"s0", %%"t0" \n\t"\
- "paddw %%"s1", %%"t1" \n\t"\
- "paddw %%"s2", %%"t2" \n\t"\
- "paddw %%"s3", %%"t3" \n\t"
-
-#define snow_vertical_compose_r2r_pmulhw(s0,s1,s2,s3,t0,t1,t2,t3)\
- "pmulhw %%"s0", %%"t0" \n\t"\
- "pmulhw %%"s1", %%"t1" \n\t"\
- "pmulhw %%"s2", %%"t2" \n\t"\
- "pmulhw %%"s3", %%"t3" \n\t"
-
-#define snow_vertical_compose_sse2_move(s0,s1,s2,s3,t0,t1,t2,t3)\
- "movdqa %%"s0", %%"t0" \n\t"\
- "movdqa %%"s1", %%"t1" \n\t"\
- "movdqa %%"s2", %%"t2" \n\t"\
- "movdqa %%"s3", %%"t3" \n\t"
-
-static void ff_snow_vertical_compose97i_sse2(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, int width){
- x86_reg i = width;
-
- while(i & 0x1F)
- {
- i--;
- b4[i] -= (W_DM*(b3[i] + b5[i])+W_DO)>>W_DS;
- b3[i] -= (W_CM*(b2[i] + b4[i])+W_CO)>>W_CS;
- b2[i] += (W_BM*(b1[i] + b3[i])+4*b2[i]+W_BO)>>W_BS;
- b1[i] += (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS;
- }
- i+=i;
-
- __asm__ volatile (
- "jmp 2f \n\t"
- "1: \n\t"
- snow_vertical_compose_sse2_load("%4","xmm0","xmm2","xmm4","xmm6")
- snow_vertical_compose_sse2_add("%6","xmm0","xmm2","xmm4","xmm6")
-
-
- "pcmpeqw %%xmm0, %%xmm0 \n\t"
- "pcmpeqw %%xmm2, %%xmm2 \n\t"
- "paddw %%xmm2, %%xmm2 \n\t"
- "paddw %%xmm0, %%xmm2 \n\t"
- "psllw $13, %%xmm2 \n\t"
- snow_vertical_compose_r2r_add("xmm0","xmm0","xmm0","xmm0","xmm1","xmm3","xmm5","xmm7")
- snow_vertical_compose_r2r_pmulhw("xmm2","xmm2","xmm2","xmm2","xmm1","xmm3","xmm5","xmm7")
- snow_vertical_compose_sse2_add("%5","xmm1","xmm3","xmm5","xmm7")
- snow_vertical_compose_sse2_store("%5","xmm1","xmm3","xmm5","xmm7")
- snow_vertical_compose_sse2_load("%4","xmm0","xmm2","xmm4","xmm6")
- snow_vertical_compose_sse2_add("%3","xmm1","xmm3","xmm5","xmm7")
- snow_vertical_compose_r2r_sub("xmm1","xmm3","xmm5","xmm7","xmm0","xmm2","xmm4","xmm6")
- snow_vertical_compose_sse2_store("%4","xmm0","xmm2","xmm4","xmm6")
-
- "pcmpeqw %%xmm7, %%xmm7 \n\t"
- "pcmpeqw %%xmm5, %%xmm5 \n\t"
- "psllw $15, %%xmm7 \n\t"
- "psrlw $13, %%xmm5 \n\t"
- "paddw %%xmm7, %%xmm5 \n\t"
- snow_vertical_compose_r2r_add("xmm5","xmm5","xmm5","xmm5","xmm0","xmm2","xmm4","xmm6")
- "movq (%2,%%"REG_d"), %%xmm1 \n\t"
- "movq 8(%2,%%"REG_d"), %%xmm3 \n\t"
- "paddw %%xmm7, %%xmm1 \n\t"
- "paddw %%xmm7, %%xmm3 \n\t"
- "pavgw %%xmm1, %%xmm0 \n\t"
- "pavgw %%xmm3, %%xmm2 \n\t"
- "movq 16(%2,%%"REG_d"), %%xmm1 \n\t"
- "movq 24(%2,%%"REG_d"), %%xmm3 \n\t"
- "paddw %%xmm7, %%xmm1 \n\t"
- "paddw %%xmm7, %%xmm3 \n\t"
- "pavgw %%xmm1, %%xmm4 \n\t"
- "pavgw %%xmm3, %%xmm6 \n\t"
- snow_vertical_compose_r2r_sub("xmm7","xmm7","xmm7","xmm7","xmm0","xmm2","xmm4","xmm6")
- snow_vertical_compose_sra("1","xmm0","xmm2","xmm4","xmm6")
- snow_vertical_compose_sse2_add("%3","xmm0","xmm2","xmm4","xmm6")
-
- snow_vertical_compose_sra("2","xmm0","xmm2","xmm4","xmm6")
- snow_vertical_compose_sse2_add("%3","xmm0","xmm2","xmm4","xmm6")
- snow_vertical_compose_sse2_store("%3","xmm0","xmm2","xmm4","xmm6")
- snow_vertical_compose_sse2_add("%1","xmm0","xmm2","xmm4","xmm6")
- snow_vertical_compose_sse2_move("xmm0","xmm2","xmm4","xmm6","xmm1","xmm3","xmm5","xmm7")
- snow_vertical_compose_sra("1","xmm0","xmm2","xmm4","xmm6")
- snow_vertical_compose_r2r_add("xmm1","xmm3","xmm5","xmm7","xmm0","xmm2","xmm4","xmm6")
- snow_vertical_compose_sse2_add("%2","xmm0","xmm2","xmm4","xmm6")
- snow_vertical_compose_sse2_store("%2","xmm0","xmm2","xmm4","xmm6")
-
- "2: \n\t"
- "sub $64, %%"REG_d" \n\t"
- "jge 1b \n\t"
- :"+d"(i)
- :"r"(b0),"r"(b1),"r"(b2),"r"(b3),"r"(b4),"r"(b5));
-}
-
-#define snow_vertical_compose_mmx_load_add(op,r,t0,t1,t2,t3)\
- ""op" ("r",%%"REG_d"), %%"t0" \n\t"\
- ""op" 8("r",%%"REG_d"), %%"t1" \n\t"\
- ""op" 16("r",%%"REG_d"), %%"t2" \n\t"\
- ""op" 24("r",%%"REG_d"), %%"t3" \n\t"
-
-#define snow_vertical_compose_mmx_load(r,t0,t1,t2,t3)\
- snow_vertical_compose_mmx_load_add("movq",r,t0,t1,t2,t3)
-
-#define snow_vertical_compose_mmx_add(r,t0,t1,t2,t3)\
- snow_vertical_compose_mmx_load_add("paddw",r,t0,t1,t2,t3)
-
-#define snow_vertical_compose_mmx_store(w,s0,s1,s2,s3)\
- "movq %%"s0", ("w",%%"REG_d") \n\t"\
- "movq %%"s1", 8("w",%%"REG_d") \n\t"\
- "movq %%"s2", 16("w",%%"REG_d") \n\t"\
- "movq %%"s3", 24("w",%%"REG_d") \n\t"
-
-#define snow_vertical_compose_mmx_move(s0,s1,s2,s3,t0,t1,t2,t3)\
- "movq %%"s0", %%"t0" \n\t"\
- "movq %%"s1", %%"t1" \n\t"\
- "movq %%"s2", %%"t2" \n\t"\
- "movq %%"s3", %%"t3" \n\t"
-
-
-static void ff_snow_vertical_compose97i_mmx(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, int width){
- x86_reg i = width;
- while(i & 15)
- {
- i--;
- b4[i] -= (W_DM*(b3[i] + b5[i])+W_DO)>>W_DS;
- b3[i] -= (W_CM*(b2[i] + b4[i])+W_CO)>>W_CS;
- b2[i] += (W_BM*(b1[i] + b3[i])+4*b2[i]+W_BO)>>W_BS;
- b1[i] += (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS;
- }
- i+=i;
- __asm__ volatile(
- "jmp 2f \n\t"
- "1: \n\t"
-
- snow_vertical_compose_mmx_load("%4","mm1","mm3","mm5","mm7")
- snow_vertical_compose_mmx_add("%6","mm1","mm3","mm5","mm7")
- "pcmpeqw %%mm0, %%mm0 \n\t"
- "pcmpeqw %%mm2, %%mm2 \n\t"
- "paddw %%mm2, %%mm2 \n\t"
- "paddw %%mm0, %%mm2 \n\t"
- "psllw $13, %%mm2 \n\t"
- snow_vertical_compose_r2r_add("mm0","mm0","mm0","mm0","mm1","mm3","mm5","mm7")
- snow_vertical_compose_r2r_pmulhw("mm2","mm2","mm2","mm2","mm1","mm3","mm5","mm7")
- snow_vertical_compose_mmx_add("%5","mm1","mm3","mm5","mm7")
- snow_vertical_compose_mmx_store("%5","mm1","mm3","mm5","mm7")
- snow_vertical_compose_mmx_load("%4","mm0","mm2","mm4","mm6")
- snow_vertical_compose_mmx_add("%3","mm1","mm3","mm5","mm7")
- snow_vertical_compose_r2r_sub("mm1","mm3","mm5","mm7","mm0","mm2","mm4","mm6")
- snow_vertical_compose_mmx_store("%4","mm0","mm2","mm4","mm6")
- "pcmpeqw %%mm7, %%mm7 \n\t"
- "pcmpeqw %%mm5, %%mm5 \n\t"
- "psllw $15, %%mm7 \n\t"
- "psrlw $13, %%mm5 \n\t"
- "paddw %%mm7, %%mm5 \n\t"
- snow_vertical_compose_r2r_add("mm5","mm5","mm5","mm5","mm0","mm2","mm4","mm6")
- "movq (%2,%%"REG_d"), %%mm1 \n\t"
- "movq 8(%2,%%"REG_d"), %%mm3 \n\t"
- "paddw %%mm7, %%mm1 \n\t"
- "paddw %%mm7, %%mm3 \n\t"
- "pavgw %%mm1, %%mm0 \n\t"
- "pavgw %%mm3, %%mm2 \n\t"
- "movq 16(%2,%%"REG_d"), %%mm1 \n\t"
- "movq 24(%2,%%"REG_d"), %%mm3 \n\t"
- "paddw %%mm7, %%mm1 \n\t"
- "paddw %%mm7, %%mm3 \n\t"
- "pavgw %%mm1, %%mm4 \n\t"
- "pavgw %%mm3, %%mm6 \n\t"
- snow_vertical_compose_r2r_sub("mm7","mm7","mm7","mm7","mm0","mm2","mm4","mm6")
- snow_vertical_compose_sra("1","mm0","mm2","mm4","mm6")
- snow_vertical_compose_mmx_add("%3","mm0","mm2","mm4","mm6")
-
- snow_vertical_compose_sra("2","mm0","mm2","mm4","mm6")
- snow_vertical_compose_mmx_add("%3","mm0","mm2","mm4","mm6")
- snow_vertical_compose_mmx_store("%3","mm0","mm2","mm4","mm6")
- snow_vertical_compose_mmx_add("%1","mm0","mm2","mm4","mm6")
- snow_vertical_compose_mmx_move("mm0","mm2","mm4","mm6","mm1","mm3","mm5","mm7")
- snow_vertical_compose_sra("1","mm0","mm2","mm4","mm6")
- snow_vertical_compose_r2r_add("mm1","mm3","mm5","mm7","mm0","mm2","mm4","mm6")
- snow_vertical_compose_mmx_add("%2","mm0","mm2","mm4","mm6")
- snow_vertical_compose_mmx_store("%2","mm0","mm2","mm4","mm6")
-
- "2: \n\t"
- "sub $32, %%"REG_d" \n\t"
- "jge 1b \n\t"
- :"+d"(i)
- :"r"(b0),"r"(b1),"r"(b2),"r"(b3),"r"(b4),"r"(b5));
-}
-#endif //HAVE_7REGS
-
-#define snow_inner_add_yblock_sse2_header \
- IDWTELEM * * dst_array = sb->line + src_y;\
- x86_reg tmp;\
- __asm__ volatile(\
- "mov %7, %%"REG_c" \n\t"\
- "mov %6, %2 \n\t"\
- "mov %4, %%"REG_S" \n\t"\
- "pxor %%xmm7, %%xmm7 \n\t" /* 0 */\
- "pcmpeqd %%xmm3, %%xmm3 \n\t"\
- "psllw $15, %%xmm3 \n\t"\
- "psrlw $12, %%xmm3 \n\t" /* FRAC_BITS >> 1 */\
- "1: \n\t"\
- "mov %1, %%"REG_D" \n\t"\
- "mov (%%"REG_D"), %%"REG_D" \n\t"\
- "add %3, %%"REG_D" \n\t"
-
-#define snow_inner_add_yblock_sse2_start_8(out_reg1, out_reg2, ptr_offset, s_offset)\
- "mov "PTR_SIZE"*"ptr_offset"(%%"REG_a"), %%"REG_d"; \n\t"\
- "movq (%%"REG_d"), %%"out_reg1" \n\t"\
- "movq (%%"REG_d", %%"REG_c"), %%"out_reg2" \n\t"\
- "punpcklbw %%xmm7, %%"out_reg1" \n\t"\
- "punpcklbw %%xmm7, %%"out_reg2" \n\t"\
- "movq "s_offset"(%%"REG_S"), %%xmm0 \n\t"\
- "movq "s_offset"+16(%%"REG_S"), %%xmm4 \n\t"\
- "punpcklbw %%xmm7, %%xmm0 \n\t"\
- "punpcklbw %%xmm7, %%xmm4 \n\t"\
- "pmullw %%xmm0, %%"out_reg1" \n\t"\
- "pmullw %%xmm4, %%"out_reg2" \n\t"
-
-#define snow_inner_add_yblock_sse2_start_16(out_reg1, out_reg2, ptr_offset, s_offset)\
- "mov "PTR_SIZE"*"ptr_offset"(%%"REG_a"), %%"REG_d"; \n\t"\
- "movq (%%"REG_d"), %%"out_reg1" \n\t"\
- "movq 8(%%"REG_d"), %%"out_reg2" \n\t"\
- "punpcklbw %%xmm7, %%"out_reg1" \n\t"\
- "punpcklbw %%xmm7, %%"out_reg2" \n\t"\
- "movq "s_offset"(%%"REG_S"), %%xmm0 \n\t"\
- "movq "s_offset"+8(%%"REG_S"), %%xmm4 \n\t"\
- "punpcklbw %%xmm7, %%xmm0 \n\t"\
- "punpcklbw %%xmm7, %%xmm4 \n\t"\
- "pmullw %%xmm0, %%"out_reg1" \n\t"\
- "pmullw %%xmm4, %%"out_reg2" \n\t"
-
-#define snow_inner_add_yblock_sse2_accum_8(ptr_offset, s_offset) \
- snow_inner_add_yblock_sse2_start_8("xmm2", "xmm6", ptr_offset, s_offset)\
- "paddusw %%xmm2, %%xmm1 \n\t"\
- "paddusw %%xmm6, %%xmm5 \n\t"
-
-#define snow_inner_add_yblock_sse2_accum_16(ptr_offset, s_offset) \
- snow_inner_add_yblock_sse2_start_16("xmm2", "xmm6", ptr_offset, s_offset)\
- "paddusw %%xmm2, %%xmm1 \n\t"\
- "paddusw %%xmm6, %%xmm5 \n\t"
-
-#define snow_inner_add_yblock_sse2_end_common1\
- "add $32, %%"REG_S" \n\t"\
- "add %%"REG_c", %0 \n\t"\
- "add %%"REG_c", "PTR_SIZE"*3(%%"REG_a");\n\t"\
- "add %%"REG_c", "PTR_SIZE"*2(%%"REG_a");\n\t"\
- "add %%"REG_c", "PTR_SIZE"*1(%%"REG_a");\n\t"\
- "add %%"REG_c", (%%"REG_a") \n\t"
-
-#define snow_inner_add_yblock_sse2_end_common2\
- "jnz 1b \n\t"\
- :"+m"(dst8),"+m"(dst_array),"=&r"(tmp)\
- :\
- "rm"((x86_reg)(src_x<<1)),"m"(obmc),"a"(block),"m"(b_h),"m"(src_stride):\
- "%"REG_c"","%"REG_S"","%"REG_D"","%"REG_d"");
-
-#define snow_inner_add_yblock_sse2_end_8\
- "sal $1, %%"REG_c" \n\t"\
- "addl $"PTR_SIZE"*2, %1 \n\t"\
- snow_inner_add_yblock_sse2_end_common1\
- "sar $1, %%"REG_c" \n\t"\
- "sub $2, %2 \n\t"\
- snow_inner_add_yblock_sse2_end_common2
-
-#define snow_inner_add_yblock_sse2_end_16\
- "addl $"PTR_SIZE"*1, %1 \n\t"\
- snow_inner_add_yblock_sse2_end_common1\
- "dec %2 \n\t"\
- snow_inner_add_yblock_sse2_end_common2
-
-static void inner_add_yblock_bw_8_obmc_16_bh_even_sse2(const uint8_t *obmc, const x86_reg obmc_stride, uint8_t * * block, int b_w, x86_reg b_h,
- int src_x, int src_y, x86_reg src_stride, slice_buffer * sb, int add, uint8_t * dst8){
-snow_inner_add_yblock_sse2_header
-snow_inner_add_yblock_sse2_start_8("xmm1", "xmm5", "3", "0")
-snow_inner_add_yblock_sse2_accum_8("2", "8")
-snow_inner_add_yblock_sse2_accum_8("1", "128")
-snow_inner_add_yblock_sse2_accum_8("0", "136")
-
- "mov %0, %%"REG_d" \n\t"
- "movdqa (%%"REG_D"), %%xmm0 \n\t"
- "movdqa %%xmm1, %%xmm2 \n\t"
-
- "punpckhwd %%xmm7, %%xmm1 \n\t"
- "punpcklwd %%xmm7, %%xmm2 \n\t"
- "paddd %%xmm2, %%xmm0 \n\t"
- "movdqa 16(%%"REG_D"), %%xmm2 \n\t"
- "paddd %%xmm1, %%xmm2 \n\t"
- "paddd %%xmm3, %%xmm0 \n\t"
- "paddd %%xmm3, %%xmm2 \n\t"
-
- "mov %1, %%"REG_D" \n\t"
- "mov "PTR_SIZE"(%%"REG_D"), %%"REG_D";\n\t"
- "add %3, %%"REG_D" \n\t"
-
- "movdqa (%%"REG_D"), %%xmm4 \n\t"
- "movdqa %%xmm5, %%xmm6 \n\t"
- "punpckhwd %%xmm7, %%xmm5 \n\t"
- "punpcklwd %%xmm7, %%xmm6 \n\t"
- "paddd %%xmm6, %%xmm4 \n\t"
- "movdqa 16(%%"REG_D"), %%xmm6 \n\t"
- "paddd %%xmm5, %%xmm6 \n\t"
- "paddd %%xmm3, %%xmm4 \n\t"
- "paddd %%xmm3, %%xmm6 \n\t"
-
- "psrad $8, %%xmm0 \n\t" /* FRAC_BITS. */
- "psrad $8, %%xmm2 \n\t" /* FRAC_BITS. */
- "packssdw %%xmm2, %%xmm0 \n\t"
- "packuswb %%xmm7, %%xmm0 \n\t"
- "movq %%xmm0, (%%"REG_d") \n\t"
-
- "psrad $8, %%xmm4 \n\t" /* FRAC_BITS. */
- "psrad $8, %%xmm6 \n\t" /* FRAC_BITS. */
- "packssdw %%xmm6, %%xmm4 \n\t"
- "packuswb %%xmm7, %%xmm4 \n\t"
- "movq %%xmm4, (%%"REG_d",%%"REG_c");\n\t"
-snow_inner_add_yblock_sse2_end_8
-}
-
-static void inner_add_yblock_bw_16_obmc_32_sse2(const uint8_t *obmc, const x86_reg obmc_stride, uint8_t * * block, int b_w, x86_reg b_h,
- int src_x, int src_y, x86_reg src_stride, slice_buffer * sb, int add, uint8_t * dst8){
-snow_inner_add_yblock_sse2_header
-snow_inner_add_yblock_sse2_start_16("xmm1", "xmm5", "3", "0")
-snow_inner_add_yblock_sse2_accum_16("2", "16")
-snow_inner_add_yblock_sse2_accum_16("1", "512")
-snow_inner_add_yblock_sse2_accum_16("0", "528")
-
- "mov %0, %%"REG_d" \n\t"
- "psrlw $4, %%xmm1 \n\t"
- "psrlw $4, %%xmm5 \n\t"
- "paddw (%%"REG_D"), %%xmm1 \n\t"
- "paddw 16(%%"REG_D"), %%xmm5 \n\t"
- "paddw %%xmm3, %%xmm1 \n\t"
- "paddw %%xmm3, %%xmm5 \n\t"
- "psraw $4, %%xmm1 \n\t" /* FRAC_BITS. */
- "psraw $4, %%xmm5 \n\t" /* FRAC_BITS. */
- "packuswb %%xmm5, %%xmm1 \n\t"
-
- "movdqu %%xmm1, (%%"REG_d") \n\t"
-
-snow_inner_add_yblock_sse2_end_16
-}
-
-#define snow_inner_add_yblock_mmx_header \
- IDWTELEM * * dst_array = sb->line + src_y;\
- x86_reg tmp;\
- __asm__ volatile(\
- "mov %7, %%"REG_c" \n\t"\
- "mov %6, %2 \n\t"\
- "mov %4, %%"REG_S" \n\t"\
- "pxor %%mm7, %%mm7 \n\t" /* 0 */\
- "pcmpeqd %%mm3, %%mm3 \n\t"\
- "psllw $15, %%mm3 \n\t"\
- "psrlw $12, %%mm3 \n\t" /* FRAC_BITS >> 1 */\
- "1: \n\t"\
- "mov %1, %%"REG_D" \n\t"\
- "mov (%%"REG_D"), %%"REG_D" \n\t"\
- "add %3, %%"REG_D" \n\t"
-
-#define snow_inner_add_yblock_mmx_start(out_reg1, out_reg2, ptr_offset, s_offset, d_offset)\
- "mov "PTR_SIZE"*"ptr_offset"(%%"REG_a"), %%"REG_d"; \n\t"\
- "movd "d_offset"(%%"REG_d"), %%"out_reg1" \n\t"\
- "movd "d_offset"+4(%%"REG_d"), %%"out_reg2" \n\t"\
- "punpcklbw %%mm7, %%"out_reg1" \n\t"\
- "punpcklbw %%mm7, %%"out_reg2" \n\t"\
- "movd "s_offset"(%%"REG_S"), %%mm0 \n\t"\
- "movd "s_offset"+4(%%"REG_S"), %%mm4 \n\t"\
- "punpcklbw %%mm7, %%mm0 \n\t"\
- "punpcklbw %%mm7, %%mm4 \n\t"\
- "pmullw %%mm0, %%"out_reg1" \n\t"\
- "pmullw %%mm4, %%"out_reg2" \n\t"
-
-#define snow_inner_add_yblock_mmx_accum(ptr_offset, s_offset, d_offset) \
- snow_inner_add_yblock_mmx_start("mm2", "mm6", ptr_offset, s_offset, d_offset)\
- "paddusw %%mm2, %%mm1 \n\t"\
- "paddusw %%mm6, %%mm5 \n\t"
-
-#define snow_inner_add_yblock_mmx_mix(read_offset, write_offset)\
- "mov %0, %%"REG_d" \n\t"\
- "psrlw $4, %%mm1 \n\t"\
- "psrlw $4, %%mm5 \n\t"\
- "paddw "read_offset"(%%"REG_D"), %%mm1 \n\t"\
- "paddw "read_offset"+8(%%"REG_D"), %%mm5 \n\t"\
- "paddw %%mm3, %%mm1 \n\t"\
- "paddw %%mm3, %%mm5 \n\t"\
- "psraw $4, %%mm1 \n\t"\
- "psraw $4, %%mm5 \n\t"\
- "packuswb %%mm5, %%mm1 \n\t"\
- "movq %%mm1, "write_offset"(%%"REG_d") \n\t"
-
-#define snow_inner_add_yblock_mmx_end(s_step)\
- "add $"s_step", %%"REG_S" \n\t"\
- "add %%"REG_c", "PTR_SIZE"*3(%%"REG_a");\n\t"\
- "add %%"REG_c", "PTR_SIZE"*2(%%"REG_a");\n\t"\
- "add %%"REG_c", "PTR_SIZE"*1(%%"REG_a");\n\t"\
- "add %%"REG_c", (%%"REG_a") \n\t"\
- "add"OPSIZE " $"PTR_SIZE"*1, %1 \n\t"\
- "add %%"REG_c", %0 \n\t"\
- "dec %2 \n\t"\
- "jnz 1b \n\t"\
- :"+m"(dst8),"+m"(dst_array),"=&r"(tmp)\
- :\
- "rm"((x86_reg)(src_x<<1)),"m"(obmc),"a"(block),"m"(b_h),"m"(src_stride):\
- "%"REG_c"","%"REG_S"","%"REG_D"","%"REG_d"");
-
-static void inner_add_yblock_bw_8_obmc_16_mmx(const uint8_t *obmc, const x86_reg obmc_stride, uint8_t * * block, int b_w, x86_reg b_h,
- int src_x, int src_y, x86_reg src_stride, slice_buffer * sb, int add, uint8_t * dst8){
-snow_inner_add_yblock_mmx_header
-snow_inner_add_yblock_mmx_start("mm1", "mm5", "3", "0", "0")
-snow_inner_add_yblock_mmx_accum("2", "8", "0")
-snow_inner_add_yblock_mmx_accum("1", "128", "0")
-snow_inner_add_yblock_mmx_accum("0", "136", "0")
-snow_inner_add_yblock_mmx_mix("0", "0")
-snow_inner_add_yblock_mmx_end("16")
-}
-
-static void inner_add_yblock_bw_16_obmc_32_mmx(const uint8_t *obmc, const x86_reg obmc_stride, uint8_t * * block, int b_w, x86_reg b_h,
- int src_x, int src_y, x86_reg src_stride, slice_buffer * sb, int add, uint8_t * dst8){
-snow_inner_add_yblock_mmx_header
-snow_inner_add_yblock_mmx_start("mm1", "mm5", "3", "0", "0")
-snow_inner_add_yblock_mmx_accum("2", "16", "0")
-snow_inner_add_yblock_mmx_accum("1", "512", "0")
-snow_inner_add_yblock_mmx_accum("0", "528", "0")
-snow_inner_add_yblock_mmx_mix("0", "0")
-
-snow_inner_add_yblock_mmx_start("mm1", "mm5", "3", "8", "8")
-snow_inner_add_yblock_mmx_accum("2", "24", "8")
-snow_inner_add_yblock_mmx_accum("1", "520", "8")
-snow_inner_add_yblock_mmx_accum("0", "536", "8")
-snow_inner_add_yblock_mmx_mix("16", "8")
-snow_inner_add_yblock_mmx_end("32")
-}
-
-static void ff_snow_inner_add_yblock_sse2(const uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h,
- int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8){
-
- if (b_w == 16)
- inner_add_yblock_bw_16_obmc_32_sse2(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8);
- else if (b_w == 8 && obmc_stride == 16) {
- if (!(b_h & 1))
- inner_add_yblock_bw_8_obmc_16_bh_even_sse2(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8);
- else
- inner_add_yblock_bw_8_obmc_16_mmx(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8);
- } else
- ff_snow_inner_add_yblock(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8);
-}
-
-static void ff_snow_inner_add_yblock_mmx(const uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h,
- int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8){
- if (b_w == 16)
- inner_add_yblock_bw_16_obmc_32_mmx(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8);
- else if (b_w == 8 && obmc_stride == 16)
- inner_add_yblock_bw_8_obmc_16_mmx(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8);
- else
- ff_snow_inner_add_yblock(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8);
-}
-
-#endif /* HAVE_INLINE_ASM */
-
-void ff_dwt_init_x86(DWTContext *c)
-{
-#if HAVE_INLINE_ASM
- int mm_flags = av_get_cpu_flags();
-
- if (mm_flags & AV_CPU_FLAG_MMX) {
- if(mm_flags & AV_CPU_FLAG_SSE2 & 0){
- c->horizontal_compose97i = ff_snow_horizontal_compose97i_sse2;
-#if HAVE_7REGS
- c->vertical_compose97i = ff_snow_vertical_compose97i_sse2;
-#endif
- c->inner_add_yblock = ff_snow_inner_add_yblock_sse2;
- }
- else{
- if (mm_flags & AV_CPU_FLAG_MMXEXT) {
- c->horizontal_compose97i = ff_snow_horizontal_compose97i_mmx;
-#if HAVE_7REGS
- c->vertical_compose97i = ff_snow_vertical_compose97i_mmx;
-#endif
- }
- c->inner_add_yblock = ff_snow_inner_add_yblock_mmx;
- }
- }
-#endif /* HAVE_INLINE_ASM */
-}

libav-v9.6.tar.bz2/libavcodec/x86/vp56dsp_init.c Deleted

@@ -1,49 +0,0 @@
-/*
- * VP6 MMX/SSE2 optimizations
- * Copyright (C) 2009 Sebastien Lucas <sebastien.lucas@gmail.com>
- * Copyright (C) 2009 Zuxy Meng <zuxy.meng@gmail.com>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; 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/x86/asm.h"
-#include "libavutil/x86/cpu.h"
-#include "libavcodec/dsputil.h"
-#include "libavcodec/vp56dsp.h"
-
-void ff_vp6_filter_diag4_mmx(uint8_t *dst, uint8_t *src, int stride,
- const int16_t *h_weights,const int16_t *v_weights);
-void ff_vp6_filter_diag4_sse2(uint8_t *dst, uint8_t *src, int stride,
- const int16_t *h_weights,const int16_t *v_weights);
-
-av_cold void ff_vp56dsp_init_x86(VP56DSPContext* c, enum AVCodecID codec)
-{
- int mm_flags = av_get_cpu_flags();
-
- if (CONFIG_VP6_DECODER && codec == AV_CODEC_ID_VP6) {
-#if ARCH_X86_32
- if (EXTERNAL_MMX(mm_flags)) {
- c->vp6_filter_diag4 = ff_vp6_filter_diag4_mmx;
- }
-#endif
-
- if (EXTERNAL_SSE2(mm_flags)) {
- c->vp6_filter_diag4 = ff_vp6_filter_diag4_sse2;
- }
- }
-}

libav-v9.6.tar.bz2/libavfilter/vf_setpts.c Deleted

@@ -1,173 +0,0 @@
-/*
- * Copyright (c) 2010 Stefano Sabatini
- * Copyright (c) 2008 Victor Paesa
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * video presentation timestamp (PTS) modification filter
- */
-
-/* #define DEBUG */
-
-#include "libavutil/eval.h"
-#include "libavutil/internal.h"
-#include "libavutil/mathematics.h"
-#include "avfilter.h"
-#include "internal.h"
-#include "video.h"
-
-static const char *const var_names[] = {
- "E", ///< Euler number
- "INTERLACED", ///< tell if the current frame is interlaced
- "N", ///< frame number (starting at zero)
- "PHI", ///< golden ratio
- "PI", ///< greek pi
- "POS", ///< original position in the file of the frame
- "PREV_INPTS", ///< previous input PTS
- "PREV_OUTPTS", ///< previous output PTS
- "PTS", ///< original pts in the file of the frame
- "STARTPTS", ///< PTS at start of movie
- "TB", ///< timebase
- NULL
-};
-
-enum var_name {
- VAR_E,
- VAR_INTERLACED,
- VAR_N,
- VAR_PHI,
- VAR_PI,
- VAR_POS,
- VAR_PREV_INPTS,
- VAR_PREV_OUTPTS,
- VAR_PTS,
- VAR_STARTPTS,
- VAR_TB,
- VAR_VARS_NB
-};
-
-typedef struct {
- AVExpr *expr;
- double var_values[VAR_VARS_NB];
-} SetPTSContext;
-
-static av_cold int init(AVFilterContext *ctx, const char *args)
-{
- SetPTSContext *setpts = ctx->priv;
- int ret;
-
- if ((ret = av_expr_parse(&setpts->expr, args ? args : "PTS",
- var_names, NULL, NULL, NULL, NULL, 0, ctx)) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error while parsing expression '%s'\n", args);
- return ret;
- }
-
- setpts->var_values[VAR_E ] = M_E;
- setpts->var_values[VAR_N ] = 0.0;
- setpts->var_values[VAR_PHI ] = M_PHI;
- setpts->var_values[VAR_PI ] = M_PI;
- setpts->var_values[VAR_PREV_INPTS ] = NAN;
- setpts->var_values[VAR_PREV_OUTPTS] = NAN;
- setpts->var_values[VAR_STARTPTS ] = NAN;
- return 0;
-}
-
-static int config_input(AVFilterLink *inlink)
-{
- SetPTSContext *setpts = inlink->dst->priv;
-
- setpts->var_values[VAR_TB] = av_q2d(inlink->time_base);
-
- av_log(inlink->src, AV_LOG_VERBOSE, "TB:%f\n", setpts->var_values[VAR_TB]);
- return 0;
-}
-
-#define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d))
-#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
-
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
-{
- SetPTSContext *setpts = inlink->dst->priv;
- int64_t in_pts = frame->pts;
- double d;
-
- if (isnan(setpts->var_values[VAR_STARTPTS]))
- setpts->var_values[VAR_STARTPTS] = TS2D(frame->pts);
-
- setpts->var_values[VAR_INTERLACED] = frame->video->interlaced;
- setpts->var_values[VAR_PTS ] = TS2D(frame->pts);
- setpts->var_values[VAR_POS ] = frame->pos == -1 ? NAN : frame->pos;
-
- d = av_expr_eval(setpts->expr, setpts->var_values, NULL);
- frame->pts = D2TS(d);
-
-#ifdef DEBUG
- av_log(inlink->dst, AV_LOG_DEBUG,
- "n:%"PRId64" interlaced:%d pos:%"PRId64" pts:%"PRId64" t:%f -> pts:%"PRId64" t:%f\n",
- (int64_t)setpts->var_values[VAR_N],
- (int)setpts->var_values[VAR_INTERLACED],
- frame->pos, in_pts, in_pts * av_q2d(inlink->time_base),
- frame->pts, frame->pts * av_q2d(inlink->time_base));
-#endif
-
-
- setpts->var_values[VAR_N] += 1.0;
- setpts->var_values[VAR_PREV_INPTS ] = TS2D(in_pts);
- setpts->var_values[VAR_PREV_OUTPTS] = TS2D(frame->pts);
- return ff_filter_frame(inlink->dst->outputs[0], frame);
-}
-
-static av_cold void uninit(AVFilterContext *ctx)
-{
- SetPTSContext *setpts = ctx->priv;
- av_expr_free(setpts->expr);
- setpts->expr = NULL;
-}
-
-static const AVFilterPad avfilter_vf_setpts_inputs[] = {
- {
- .name = "default",
- .type = AVMEDIA_TYPE_VIDEO,
- .get_video_buffer = ff_null_get_video_buffer,
- .config_props = config_input,
- .filter_frame = filter_frame,
- },
- { NULL }
-};
-
-static const AVFilterPad avfilter_vf_setpts_outputs[] = {
- {
- .name = "default",
- .type = AVMEDIA_TYPE_VIDEO,
- },
- { NULL }
-};
-
-AVFilter avfilter_vf_setpts = {
- .name = "setpts",
- .description = NULL_IF_CONFIG_SMALL("Set PTS for the output video frame."),
- .init = init,
- .uninit = uninit,
-
- .priv_size = sizeof(SetPTSContext),
-
- .inputs = avfilter_vf_setpts_inputs,
- .outputs = avfilter_vf_setpts_outputs,
-};

libav-v9.6.tar.bz2/libavfilter/x86/gradfun.c Deleted

@@ -1,190 +0,0 @@
-/*
- * Copyright (C) 2009 Loren Merritt <lorenm@u.washignton.edu>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; 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/mem.h"
-#include "libavutil/x86/asm.h"
-#include "libavfilter/gradfun.h"
-
-#if HAVE_INLINE_ASM
-
-DECLARE_ALIGNED(16, static const uint16_t, pw_7f)[8] = {0x7F,0x7F,0x7F,0x7F,0x7F,0x7F,0x7F,0x7F};
-DECLARE_ALIGNED(16, static const uint16_t, pw_ff)[8] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
-
-#if HAVE_MMXEXT_INLINE
-static void gradfun_filter_line_mmxext(uint8_t *dst, uint8_t *src, uint16_t *dc,
- int width, int thresh,
- const uint16_t *dithers)
-{
- 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);
- width = x;
- }
- x = -width;
- __asm__ volatile(
- "movd %4, %%mm5 \n"
- "pxor %%mm7, %%mm7 \n"
- "pshufw $0, %%mm5, %%mm5 \n"
- "movq %6, %%mm6 \n"
- "movq %5, %%mm4 \n"
- "1: \n"
- "movd (%2,%0), %%mm0 \n"
- "movd (%3,%0), %%mm1 \n"
- "punpcklbw %%mm7, %%mm0 \n"
- "punpcklwd %%mm1, %%mm1 \n"
- "psllw $7, %%mm0 \n"
- "pxor %%mm2, %%mm2 \n"
- "psubw %%mm0, %%mm1 \n" // delta = dc - pix
- "psubw %%mm1, %%mm2 \n"
- "pmaxsw %%mm1, %%mm2 \n"
- "pmulhuw %%mm5, %%mm2 \n" // m = abs(delta) * thresh >> 16
- "psubw %%mm6, %%mm2 \n"
- "pminsw %%mm7, %%mm2 \n" // m = -max(0, 127-m)
- "pmullw %%mm2, %%mm2 \n"
- "paddw %%mm4, %%mm0 \n" // pix += dither
- "pmulhw %%mm2, %%mm1 \n"
- "psllw $2, %%mm1 \n" // m = m*m*delta >> 14
- "paddw %%mm1, %%mm0 \n" // pix += m
- "psraw $7, %%mm0 \n"
- "packuswb %%mm0, %%mm0 \n"
- "movd %%mm0, (%1,%0) \n" // dst = clip(pix>>7)
- "add $4, %0 \n"
- "jl 1b \n"
- "emms \n"
- :"+r"(x)
- :"r"(dst+width), "r"(src+width), "r"(dc+width/2),
- "rm"(thresh), "m"(*dithers), "m"(*pw_7f)
- :"memory"
- );
-}
-#endif
-
-#if HAVE_SSSE3_INLINE
-static void gradfun_filter_line_ssse3(uint8_t *dst, uint8_t *src, 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);
- width = x;
- }
- x = -width;
- __asm__ volatile(
- "movd %4, %%xmm5 \n"
- "pxor %%xmm7, %%xmm7 \n"
- "pshuflw $0,%%xmm5, %%xmm5 \n"
- "movdqa %6, %%xmm6 \n"
- "punpcklqdq %%xmm5, %%xmm5 \n"
- "movdqa %5, %%xmm4 \n"
- "1: \n"
- "movq (%2,%0), %%xmm0 \n"
- "movq (%3,%0), %%xmm1 \n"
- "punpcklbw %%xmm7, %%xmm0 \n"
- "punpcklwd %%xmm1, %%xmm1 \n"
- "psllw $7, %%xmm0 \n"
- "psubw %%xmm0, %%xmm1 \n" // delta = dc - pix
- "pabsw %%xmm1, %%xmm2 \n"
- "pmulhuw %%xmm5, %%xmm2 \n" // m = abs(delta) * thresh >> 16
- "psubw %%xmm6, %%xmm2 \n"
- "pminsw %%xmm7, %%xmm2 \n" // m = -max(0, 127-m)
- "pmullw %%xmm2, %%xmm2 \n"
- "psllw $1, %%xmm2 \n"
- "paddw %%xmm4, %%xmm0 \n" // pix += dither
- "pmulhrsw %%xmm2, %%xmm1 \n" // m = m*m*delta >> 14
- "paddw %%xmm1, %%xmm0 \n" // pix += m
- "psraw $7, %%xmm0 \n"
- "packuswb %%xmm0, %%xmm0 \n"
- "movq %%xmm0, (%1,%0) \n" // dst = clip(pix>>7)
- "add $8, %0 \n"
- "jl 1b \n"
- :"+&r"(x)
- :"r"(dst+width), "r"(src+width), "r"(dc+width/2),
- "rm"(thresh), "m"(*dithers), "m"(*pw_7f)
- :"memory"
- );
-}
-#endif /* HAVE_SSSE3_INLINE */
-
-#if HAVE_SSE2_INLINE
-static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, uint16_t *buf1, uint8_t *src, int src_linesize, int width)
-{
-#define BLURV(load)\
- intptr_t x = -2*width;\
- __asm__ volatile(\
- "movdqa %6, %%xmm7 \n"\
- "1: \n"\
- load" (%4,%0), %%xmm0 \n"\
- load" (%5,%0), %%xmm1 \n"\
- "movdqa %%xmm0, %%xmm2 \n"\
- "movdqa %%xmm1, %%xmm3 \n"\
- "psrlw $8, %%xmm0 \n"\
- "psrlw $8, %%xmm1 \n"\
- "pand %%xmm7, %%xmm2 \n"\
- "pand %%xmm7, %%xmm3 \n"\
- "paddw %%xmm1, %%xmm0 \n"\
- "paddw %%xmm3, %%xmm2 \n"\
- "paddw %%xmm2, %%xmm0 \n"\
- "paddw (%2,%0), %%xmm0 \n"\
- "movdqa (%1,%0), %%xmm1 \n"\
- "movdqa %%xmm0, (%1,%0) \n"\
- "psubw %%xmm1, %%xmm0 \n"\
- "movdqa %%xmm0, (%3,%0) \n"\
- "add $16, %0 \n"\
- "jl 1b \n"\
- :"+&r"(x)\
- :"r"(buf+width),\
- "r"(buf1+width),\
- "r"(dc+width),\
- "r"(src+width*2),\
- "r"(src+width*2+src_linesize),\
- "m"(*pw_ff)\
- :"memory"\
- );
- if (((intptr_t) src | src_linesize) & 15) {
- BLURV("movdqu");
- } else {
- BLURV("movdqa");
- }
-}
-#endif /* HAVE_SSE2_INLINE */
-
-#endif /* HAVE_INLINE_ASM */
-
-av_cold void ff_gradfun_init_x86(GradFunContext *gf)
-{
- int cpu_flags = av_get_cpu_flags();
-
-#if HAVE_MMXEXT_INLINE
- if (cpu_flags & AV_CPU_FLAG_MMXEXT)
- gf->filter_line = gradfun_filter_line_mmxext;
-#endif
-#if HAVE_SSSE3_INLINE
- if (cpu_flags & AV_CPU_FLAG_SSSE3)
- gf->filter_line = gradfun_filter_line_ssse3;
-#endif
-#if HAVE_SSE2_INLINE
- if (cpu_flags & AV_CPU_FLAG_SSE2)
- gf->blur_line = gradfun_blur_line_sse2;
-#endif
-}

libav-v9.6.tar.bz2/libavfilter/x86/yadif.c Deleted

@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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.
- *
- * You should have received a copy of the GNU General Public License along
- * with Libav; 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/internal.h"
-#include "libavutil/mem.h"
-#include "libavutil/x86/asm.h"
-#include "libavcodec/x86/dsputil_mmx.h"
-#include "libavfilter/yadif.h"
-
-#if HAVE_INLINE_ASM
-
-DECLARE_ASM_CONST(16, const xmm_reg, pb_1) = {0x0101010101010101ULL, 0x0101010101010101ULL};
-DECLARE_ASM_CONST(16, const xmm_reg, pw_1) = {0x0001000100010001ULL, 0x0001000100010001ULL};
-
-#if HAVE_SSSE3_INLINE
-#define COMPILE_TEMPLATE_SSE2 1
-#define COMPILE_TEMPLATE_SSSE3 1
-#undef RENAME
-#define RENAME(a) a ## _ssse3
-#include "yadif_template.c"
-#undef COMPILE_TEMPLATE_SSSE3
-#endif
-
-#if HAVE_SSE2_INLINE
-#undef RENAME
-#define RENAME(a) a ## _sse2
-#include "yadif_template.c"
-#undef COMPILE_TEMPLATE_SSE2
-#endif
-
-#if HAVE_MMXEXT_INLINE
-#undef RENAME
-#define RENAME(a) a ## _mmxext
-#include "yadif_template.c"
-#endif
-
-#endif /* HAVE_INLINE_ASM */
-
-av_cold void ff_yadif_init_x86(YADIFContext *yadif)
-{
- int cpu_flags = av_get_cpu_flags();
-
-#if HAVE_MMXEXT_INLINE
- if (cpu_flags & AV_CPU_FLAG_MMXEXT)
- yadif->filter_line = yadif_filter_line_mmxext;
-#endif
-#if HAVE_SSE2_INLINE
- if (cpu_flags & AV_CPU_FLAG_SSE2)
- yadif->filter_line = yadif_filter_line_sse2;
-#endif
-#if HAVE_SSSE3_INLINE
- if (cpu_flags & AV_CPU_FLAG_SSSE3)
- yadif->filter_line = yadif_filter_line_ssse3;
-#endif
-}

libav-v9.6.tar.bz2/libavfilter/x86/yadif_template.c Deleted

@@ -1,261 +0,0 @@
-/*
- * Copyright (C) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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.
- *
- * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef COMPILE_TEMPLATE_SSE2
-#define MM "%%xmm"
-#define MOV "movq"
-#define MOVQ "movdqa"
-#define MOVQU "movdqu"
-#define STEP 8
-#define LOAD(mem,dst) \
- MOV" "mem", "dst" \n\t"\
- "punpcklbw "MM"7, "dst" \n\t"
-#define PSRL1(reg) "psrldq $1, "reg" \n\t"
-#define PSRL2(reg) "psrldq $2, "reg" \n\t"
-#define PSHUF(src,dst) "movdqa "dst", "src" \n\t"\
- "psrldq $2, "src" \n\t"
-#else
-#define MM "%%mm"
-#define MOV "movd"
-#define MOVQ "movq"
-#define MOVQU "movq"
-#define STEP 4
-#define LOAD(mem,dst) \
- MOV" "mem", "dst" \n\t"\
- "punpcklbw "MM"7, "dst" \n\t"
-#define PSRL1(reg) "psrlq $8, "reg" \n\t"
-#define PSRL2(reg) "psrlq $16, "reg" \n\t"
-#define PSHUF(src,dst) "pshufw $9, "dst", "src" \n\t"
-#endif
-
-#ifdef COMPILE_TEMPLATE_SSSE3
-#define PABS(tmp,dst) \
- "pabsw "dst", "dst" \n\t"
-#else
-#define PABS(tmp,dst) \
- "pxor "tmp", "tmp" \n\t"\
- "psubw "dst", "tmp" \n\t"\
- "pmaxsw "tmp", "dst" \n\t"
-#endif
-
-#define CHECK(pj,mj) \
- MOVQU" "#pj"(%[cur],%[mrefs]), "MM"2 \n\t" /* cur[x-refs-1+j] */\
- MOVQU" "#mj"(%[cur],%[prefs]), "MM"3 \n\t" /* cur[x+refs-1-j] */\
- MOVQ" "MM"2, "MM"4 \n\t"\
- MOVQ" "MM"2, "MM"5 \n\t"\
- "pxor "MM"3, "MM"4 \n\t"\
- "pavgb "MM"3, "MM"5 \n\t"\
- "pand "MANGLE(pb_1)", "MM"4 \n\t"\
- "psubusb "MM"4, "MM"5 \n\t"\
- PSRL1(MM"5") \
- "punpcklbw "MM"7, "MM"5 \n\t" /* (cur[x-refs+j] + cur[x+refs-j])>>1 */\
- MOVQ" "MM"2, "MM"4 \n\t"\
- "psubusb "MM"3, "MM"2 \n\t"\
- "psubusb "MM"4, "MM"3 \n\t"\
- "pmaxub "MM"3, "MM"2 \n\t"\
- MOVQ" "MM"2, "MM"3 \n\t"\
- MOVQ" "MM"2, "MM"4 \n\t" /* ABS(cur[x-refs-1+j] - cur[x+refs-1-j]) */\
- PSRL1(MM"3") /* ABS(cur[x-refs +j] - cur[x+refs -j]) */\
- PSRL2(MM"4") /* ABS(cur[x-refs+1+j] - cur[x+refs+1-j]) */\
- "punpcklbw "MM"7, "MM"2 \n\t"\
- "punpcklbw "MM"7, "MM"3 \n\t"\
- "punpcklbw "MM"7, "MM"4 \n\t"\
- "paddw "MM"3, "MM"2 \n\t"\
- "paddw "MM"4, "MM"2 \n\t" /* score */
-
-#define CHECK1 \
- MOVQ" "MM"0, "MM"3 \n\t"\
- "pcmpgtw "MM"2, "MM"3 \n\t" /* if(score < spatial_score) */\
- "pminsw "MM"2, "MM"0 \n\t" /* spatial_score= score; */\
- MOVQ" "MM"3, "MM"6 \n\t"\
- "pand "MM"3, "MM"5 \n\t"\
- "pandn "MM"1, "MM"3 \n\t"\
- "por "MM"5, "MM"3 \n\t"\
- MOVQ" "MM"3, "MM"1 \n\t" /* spatial_pred= (cur[x-refs+j] + cur[x+refs-j])>>1; */
-
-#define CHECK2 /* pretend not to have checked dir=2 if dir=1 was bad.\
- hurts both quality and speed, but matches the C version. */\
- "paddw "MANGLE(pw_1)", "MM"6 \n\t"\
- "psllw $14, "MM"6 \n\t"\
- "paddsw "MM"6, "MM"2 \n\t"\
- MOVQ" "MM"0, "MM"3 \n\t"\
- "pcmpgtw "MM"2, "MM"3 \n\t"\
- "pminsw "MM"2, "MM"0 \n\t"\
- "pand "MM"3, "MM"5 \n\t"\
- "pandn "MM"1, "MM"3 \n\t"\
- "por "MM"5, "MM"3 \n\t"\
- MOVQ" "MM"3, "MM"1 \n\t"
-
-static void RENAME(yadif_filter_line)(uint8_t *dst, uint8_t *prev, uint8_t *cur,
- uint8_t *next, int w, int prefs,
- int mrefs, int parity, int mode)
-{
- DECLARE_ALIGNED(16, uint8_t, tmp)[16*4];
- int x;
-
-#define FILTER\
- for(x=0; x<w; x+=STEP){\
- __asm__ volatile(\
- "pxor "MM"7, "MM"7 \n\t"\
- LOAD("(%[cur],%[mrefs])", MM"0") /* c = cur[x-refs] */\
- LOAD("(%[cur],%[prefs])", MM"1") /* e = cur[x+refs] */\
- LOAD("(%["prev2"])", MM"2") /* prev2[x] */\
- LOAD("(%["next2"])", MM"3") /* next2[x] */\
- MOVQ" "MM"3, "MM"4 \n\t"\
- "paddw "MM"2, "MM"3 \n\t"\
- "psraw $1, "MM"3 \n\t" /* d = (prev2[x] + next2[x])>>1 */\
- MOVQ" "MM"0, (%[tmp]) \n\t" /* c */\
- MOVQ" "MM"3, 16(%[tmp]) \n\t" /* d */\
- MOVQ" "MM"1, 32(%[tmp]) \n\t" /* e */\
- "psubw "MM"4, "MM"2 \n\t"\
- PABS( MM"4", MM"2") /* temporal_diff0 */\
- LOAD("(%[prev],%[mrefs])", MM"3") /* prev[x-refs] */\
- LOAD("(%[prev],%[prefs])", MM"4") /* prev[x+refs] */\
- "psubw "MM"0, "MM"3 \n\t"\
- "psubw "MM"1, "MM"4 \n\t"\
- PABS( MM"5", MM"3")\
- PABS( MM"5", MM"4")\
- "paddw "MM"4, "MM"3 \n\t" /* temporal_diff1 */\
- "psrlw $1, "MM"2 \n\t"\
- "psrlw $1, "MM"3 \n\t"\
- "pmaxsw "MM"3, "MM"2 \n\t"\
- LOAD("(%[next],%[mrefs])", MM"3") /* next[x-refs] */\
- LOAD("(%[next],%[prefs])", MM"4") /* next[x+refs] */\
- "psubw "MM"0, "MM"3 \n\t"\
- "psubw "MM"1, "MM"4 \n\t"\
- PABS( MM"5", MM"3")\
- PABS( MM"5", MM"4")\
- "paddw "MM"4, "MM"3 \n\t" /* temporal_diff2 */\
- "psrlw $1, "MM"3 \n\t"\
- "pmaxsw "MM"3, "MM"2 \n\t"\
- MOVQ" "MM"2, 48(%[tmp]) \n\t" /* diff */\
-\
- "paddw "MM"0, "MM"1 \n\t"\
- "paddw "MM"0, "MM"0 \n\t"\
- "psubw "MM"1, "MM"0 \n\t"\
- "psrlw $1, "MM"1 \n\t" /* spatial_pred */\
- PABS( MM"2", MM"0") /* ABS(c-e) */\
-\
- MOVQU" -1(%[cur],%[mrefs]), "MM"2 \n\t" /* cur[x-refs-1] */\
- MOVQU" -1(%[cur],%[prefs]), "MM"3 \n\t" /* cur[x+refs-1] */\
- MOVQ" "MM"2, "MM"4 \n\t"\
- "psubusb "MM"3, "MM"2 \n\t"\
- "psubusb "MM"4, "MM"3 \n\t"\
- "pmaxub "MM"3, "MM"2 \n\t"\
- PSHUF(MM"3", MM"2") \
- "punpcklbw "MM"7, "MM"2 \n\t" /* ABS(cur[x-refs-1] - cur[x+refs-1]) */\
- "punpcklbw "MM"7, "MM"3 \n\t" /* ABS(cur[x-refs+1] - cur[x+refs+1]) */\
- "paddw "MM"2, "MM"0 \n\t"\
- "paddw "MM"3, "MM"0 \n\t"\
- "psubw "MANGLE(pw_1)", "MM"0 \n\t" /* spatial_score */\
-\
- CHECK(-2,0)\
- CHECK1\
- CHECK(-3,1)\
- CHECK2\
- CHECK(0,-2)\
- CHECK1\
- CHECK(1,-3)\
- CHECK2\
-\
- /* if(p->mode<2) ... */\
- MOVQ" 48(%[tmp]), "MM"6 \n\t" /* diff */\
- "cmpl $2, %[mode] \n\t"\
- "jge 1f \n\t"\
- LOAD("(%["prev2"],%[mrefs],2)", MM"2") /* prev2[x-2*refs] */\
- LOAD("(%["next2"],%[mrefs],2)", MM"4") /* next2[x-2*refs] */\
- LOAD("(%["prev2"],%[prefs],2)", MM"3") /* prev2[x+2*refs] */\
- LOAD("(%["next2"],%[prefs],2)", MM"5") /* next2[x+2*refs] */\
- "paddw "MM"4, "MM"2 \n\t"\
- "paddw "MM"5, "MM"3 \n\t"\
- "psrlw $1, "MM"2 \n\t" /* b */\
- "psrlw $1, "MM"3 \n\t" /* f */\
- MOVQ" (%[tmp]), "MM"4 \n\t" /* c */\
- MOVQ" 16(%[tmp]), "MM"5 \n\t" /* d */\
- MOVQ" 32(%[tmp]), "MM"7 \n\t" /* e */\
- "psubw "MM"4, "MM"2 \n\t" /* b-c */\
- "psubw "MM"7, "MM"3 \n\t" /* f-e */\
- MOVQ" "MM"5, "MM"0 \n\t"\
- "psubw "MM"4, "MM"5 \n\t" /* d-c */\
- "psubw "MM"7, "MM"0 \n\t" /* d-e */\
- MOVQ" "MM"2, "MM"4 \n\t"\
- "pminsw "MM"3, "MM"2 \n\t"\
- "pmaxsw "MM"4, "MM"3 \n\t"\
- "pmaxsw "MM"5, "MM"2 \n\t"\
- "pminsw "MM"5, "MM"3 \n\t"\
- "pmaxsw "MM"0, "MM"2 \n\t" /* max */\
- "pminsw "MM"0, "MM"3 \n\t" /* min */\
- "pxor "MM"4, "MM"4 \n\t"\
- "pmaxsw "MM"3, "MM"6 \n\t"\
- "psubw "MM"2, "MM"4 \n\t" /* -max */\
- "pmaxsw "MM"4, "MM"6 \n\t" /* diff= MAX3(diff, min, -max); */\
- "1: \n\t"\
-\
- MOVQ" 16(%[tmp]), "MM"2 \n\t" /* d */\
- MOVQ" "MM"2, "MM"3 \n\t"\
- "psubw "MM"6, "MM"2 \n\t" /* d-diff */\
- "paddw "MM"6, "MM"3 \n\t" /* d+diff */\
- "pmaxsw "MM"2, "MM"1 \n\t"\
- "pminsw "MM"3, "MM"1 \n\t" /* d = clip(spatial_pred, d-diff, d+diff); */\
- "packuswb "MM"1, "MM"1 \n\t"\
-\
- ::[prev] "r"(prev),\
- [cur] "r"(cur),\
- [next] "r"(next),\
- [prefs]"r"((x86_reg)prefs),\
- [mrefs]"r"((x86_reg)mrefs),\
- [mode] "g"(mode),\
- [tmp] "r"(tmp)\
- );\
- __asm__ volatile(MOV" "MM"1, %0" :"=m"(*dst));\
- dst += STEP;\
- prev+= STEP;\
- cur += STEP;\
- next+= STEP;\
- }
-
- if (parity) {
-#define prev2 "prev"
-#define next2 "cur"
- FILTER
-#undef prev2
-#undef next2
- } else {
-#define prev2 "cur"
-#define next2 "next"
- FILTER
-#undef prev2
-#undef next2
- }
-}
-#undef STEP
-#undef MM
-#undef MOV
-#undef MOVQ
-#undef MOVQU
-#undef PSHUF
-#undef PSRL1
-#undef PSRL2
-#undef LOAD
-#undef PABS
-#undef CHECK
-#undef CHECK1
-#undef CHECK2
-#undef FILTER

libav-v9.6.tar.bz2/libavformat/metadata-example.c Deleted

@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2011 Reinhard Tartler
- *
- * 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
- * @example libavformat/metadata-example.c
- * Shows how the metadata API can be used in application programs.
- */
-
-#include <stdio.h>
-
-#include <libavformat/avformat.h>
-#include <libavutil/dict.h>
-
-int main (int argc, char **argv)
-{
- AVFormatContext *fmt_ctx = NULL;
- AVDictionaryEntry *tag = NULL;
- int ret;
-
- if (argc != 2) {
- printf("usage: %s <input_file>\n"
- "example program to demonstrate the use of the libavformat metadata API.\n"
- "\n", argv[0]);
- return 1;
- }
-
- av_register_all();
- if ((ret = avformat_open_input(&fmt_ctx, argv[1], NULL, NULL)))
- return ret;
-
- while ((tag = av_dict_get(fmt_ctx->metadata, "", tag, AV_DICT_IGNORE_SUFFIX)))
- printf("%s=%s\n", tag->key, tag->value);
-
- avformat_free_context(fmt_ctx);
- return 0;
-}

libav-v9.6.tar.bz2/libavformat/output-example.c Deleted

@@ -1,540 +0,0 @@
-/*
- * Copyright (c) 2003 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
- * libavformat API example.
- *
- * @example libavformat/output-example.c
- * Output a media file in any supported libavformat format.
- * The default codecs are used.
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-
-#include "libavutil/mathematics.h"
-#include "libavformat/avformat.h"
-#include "libswscale/swscale.h"
-
-/* 5 seconds stream duration */
-#define STREAM_DURATION 5.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;
-
-/**************************************************************/
-/* audio output */
-
-static float t, tincr, tincr2;
-static int16_t *samples;
-static int audio_input_frame_size;
-
-/*
- * add an audio output stream
- */
-static AVStream *add_audio_stream(AVFormatContext *oc, enum AVCodecID codec_id)
-{
- AVCodecContext *c;
- AVStream *st;
- AVCodec *codec;
-
- /* find the audio encoder */
- codec = avcodec_find_encoder(codec_id);
- if (!codec) {
- fprintf(stderr, "codec not found\n");
- exit(1);
- }
-
- st = avformat_new_stream(oc, codec);
- if (!st) {
- fprintf(stderr, "Could not alloc stream\n");
- exit(1);
- }
-
- c = st->codec;
-
- /* put sample parameters */
- c->sample_fmt = AV_SAMPLE_FMT_S16;
- c->bit_rate = 64000;
- c->sample_rate = 44100;
- c->channels = 2;
-
- // some formats want stream headers to be separate
- if (oc->oformat->flags & AVFMT_GLOBALHEADER)
- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-
- return st;
-}
-
-static void open_audio(AVFormatContext *oc, AVStream *st)
-{
- AVCodecContext *c;
-
- c = st->codec;
-
- /* open it */
- if (avcodec_open2(c, NULL, NULL) < 0) {
- fprintf(stderr, "could not open codec\n");
- exit(1);
- }
-
- /* init signal generator */
- t = 0;
- tincr = 2 * M_PI * 110.0 / c->sample_rate;
- /* increment frequency by 110 Hz per second */
- tincr2 = 2 * M_PI * 110.0 / c->sample_rate / c->sample_rate;
-
- if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)
- audio_input_frame_size = 10000;
- else
- audio_input_frame_size = c->frame_size;
- samples = av_malloc(audio_input_frame_size *
- av_get_bytes_per_sample(c->sample_fmt) *
- c->channels);
-}
-
-/* Prepare a 16 bit dummy audio frame of 'frame_size' samples and
- * 'nb_channels' channels. */
-static void get_audio_frame(int16_t *samples, int frame_size, int nb_channels)
-{
- int j, i, v;
- int16_t *q;
-
- q = samples;
- for (j = 0; j < frame_size; j++) {
- v = (int)(sin(t) * 10000);
- for (i = 0; i < nb_channels; i++)
- *q++ = v;
- t += tincr;
- tincr += tincr2;
- }
-}
-
-static void write_audio_frame(AVFormatContext *oc, AVStream *st)
-{
- AVCodecContext *c;
- AVPacket pkt = { 0 }; // data and size must be 0;
- AVFrame *frame = avcodec_alloc_frame();
- int got_packet;
-
- av_init_packet(&pkt);
- c = st->codec;
-
- get_audio_frame(samples, audio_input_frame_size, c->channels);
- frame->nb_samples = audio_input_frame_size;
- avcodec_fill_audio_frame(frame, c->channels, c->sample_fmt,
- (uint8_t *)samples,
- audio_input_frame_size *
- av_get_bytes_per_sample(c->sample_fmt) *
- c->channels, 1);
-
- avcodec_encode_audio2(c, &pkt, frame, &got_packet);
- if (!got_packet)
- return;
-
- pkt.stream_index = st->index;
-
- /* Write the compressed frame to the media file. */
- if (av_interleaved_write_frame(oc, &pkt) != 0) {
- fprintf(stderr, "Error while writing audio frame\n");
- exit(1);
- }
- avcodec_free_frame(&frame);
-}
-
-static void close_audio(AVFormatContext *oc, AVStream *st)
-{
- avcodec_close(st->codec);
-
- av_free(samples);
-}
-
-/**************************************************************/
-/* video output */
-
-static AVFrame *picture, *tmp_picture;
-static uint8_t *video_outbuf;
-static int frame_count, video_outbuf_size;
-
-/* Add a video output stream. */
-static AVStream *add_video_stream(AVFormatContext *oc, enum AVCodecID codec_id)
-{
- AVCodecContext *c;
- AVStream *st;
- AVCodec *codec;
-
- /* find the video encoder */
- codec = avcodec_find_encoder(codec_id);
- if (!codec) {
- fprintf(stderr, "codec not found\n");
- exit(1);
- }
-
- st = avformat_new_stream(oc, codec);
- if (!st) {
- fprintf(stderr, "Could not alloc stream\n");
- exit(1);
- }
-
- c = st->codec;
-
- /* Put sample parameters. */
- c->bit_rate = 400000;
- /* Resolution must be a multiple of two. */
- c->width = 352;
- c->height = 288;
- /* timebase: This is the fundamental unit of time (in seconds) in terms
- * of which frame timestamps are represented. For fixed-fps content,
- * timebase should be 1/framerate and timestamp increments should be
- * identical to 1. */
- c->time_base.den = STREAM_FRAME_RATE;
- c->time_base.num = 1;
- c->gop_size = 12; /* emit one intra frame every twelve frames at most */
- c->pix_fmt = STREAM_PIX_FMT;
- if (c->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
- /* just for testing, we also add B frames */
- c->max_b_frames = 2;
- }
- if (c->codec_id == AV_CODEC_ID_MPEG1VIDEO) {
- /* Needed to avoid using macroblocks in which some coeffs overflow.
- * This does not happen with normal video, it just happens here as
- * the motion of the chroma plane does not match the luma plane. */
- c->mb_decision = 2;
- }
- /* Some formats want stream headers to be separate. */
- if (oc->oformat->flags & AVFMT_GLOBALHEADER)
- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-
- return st;
-}
-
-static AVFrame *alloc_picture(enum AVPixelFormat pix_fmt, int width, int height)
-{
- AVFrame *picture;
- uint8_t *picture_buf;
- int size;
-
- picture = avcodec_alloc_frame();
- if (!picture)
- return NULL;
- size = avpicture_get_size(pix_fmt, width, height);
- picture_buf = av_malloc(size);
- if (!picture_buf) {
- av_free(picture);
- return NULL;
- }
- avpicture_fill((AVPicture *)picture, picture_buf,
- pix_fmt, width, height);
- return picture;
-}
-
-static void open_video(AVFormatContext *oc, AVStream *st)
-{
- AVCodecContext *c;
-
- c = st->codec;
-
- /* open the codec */
- if (avcodec_open2(c, NULL, NULL) < 0) {
- fprintf(stderr, "could not open codec\n");
- exit(1);
- }
-
- video_outbuf = NULL;
- if (!(oc->oformat->flags & AVFMT_RAWPICTURE)) {
- /* Allocate output buffer. */
- /* XXX: API change will be done. */
- /* Buffers passed into lav* can be allocated any way you prefer,
- * as long as they're aligned enough for the architecture, and
- * they're freed appropriately (such as using av_free for buffers
- * allocated with av_malloc). */
- video_outbuf_size = 200000;
- video_outbuf = av_malloc(video_outbuf_size);
- }
-
- /* Allocate the encoded raw picture. */
- picture = alloc_picture(c->pix_fmt, c->width, c->height);
- if (!picture) {
- fprintf(stderr, "Could not allocate picture\n");
- exit(1);
- }
-
- /* If the output format is not YUV420P, then a temporary YUV420P
- * picture is needed too. It is then converted to the required
- * output format. */
- tmp_picture = NULL;
- if (c->pix_fmt != AV_PIX_FMT_YUV420P) {
- tmp_picture = alloc_picture(AV_PIX_FMT_YUV420P, c->width, c->height);
- if (!tmp_picture) {
- fprintf(stderr, "Could not allocate temporary picture\n");
- exit(1);
- }
- }
-}
-
-/* Prepare a dummy image. */
-static void fill_yuv_image(AVFrame *pict, int frame_index,
- int width, int height)
-{
- int x, y, i;
-
- i = frame_index;
-
- /* Y */
- for (y = 0; y < height; y++)
- for (x = 0; x < width; x++)
- pict->data[0][y * pict->linesize[0] + x] = x + y + i * 3;
-
- /* Cb and Cr */
- for (y = 0; y < height / 2; y++) {
- for (x = 0; x < width / 2; x++) {
- pict->data[1][y * pict->linesize[1] + x] = 128 + y + i * 2;
- pict->data[2][y * pict->linesize[2] + x] = 64 + x + i * 5;
- }
- }
-}
-
-static void write_video_frame(AVFormatContext *oc, AVStream *st)
-{
- int out_size, ret;
- AVCodecContext *c;
- static struct SwsContext *img_convert_ctx;
-
- 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 (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 */
- if (img_convert_ctx == NULL) {
- img_convert_ctx = sws_getContext(c->width, c->height,
- AV_PIX_FMT_YUV420P,
- c->width, c->height,
- c->pix_fmt,
- sws_flags, NULL, NULL, NULL);
- if (img_convert_ctx == NULL) {
- fprintf(stderr,
- "Cannot initialize the conversion context\n");
- exit(1);
- }
- }
- fill_yuv_image(tmp_picture, frame_count, c->width, c->height);
- sws_scale(img_convert_ctx, tmp_picture->data, tmp_picture->linesize,
- 0, c->height, picture->data, picture->linesize);
- } else {
- fill_yuv_image(picture, frame_count, c->width, c->height);
- }
- }
-
- if (oc->oformat->flags & AVFMT_RAWPICTURE) {
- /* Raw video case - the API will change slightly in the near
- * future for that. */
- AVPacket pkt;
- av_init_packet(&pkt);
-
- pkt.flags |= AV_PKT_FLAG_KEY;
- pkt.stream_index = st->index;
- pkt.data = (uint8_t *)picture;
- pkt.size = sizeof(AVPicture);
-
- ret = av_interleaved_write_frame(oc, &pkt);
- } else {
- /* encode the image */
- out_size = avcodec_encode_video(c, video_outbuf,
- video_outbuf_size, picture);
- /* If size is zero, it means the image was buffered. */
- if (out_size > 0) {
- AVPacket pkt;
- av_init_packet(&pkt);
-
- if (c->coded_frame->pts != AV_NOPTS_VALUE)
- pkt.pts = av_rescale_q(c->coded_frame->pts,
- c->time_base, st->time_base);
- if (c->coded_frame->key_frame)
- pkt.flags |= AV_PKT_FLAG_KEY;
- pkt.stream_index = st->index;
- pkt.data = video_outbuf;
- pkt.size = out_size;
-
- /* Write the compressed frame to the media file. */
- ret = av_interleaved_write_frame(oc, &pkt);
- } else {
- ret = 0;
- }
- }
- if (ret != 0) {
- fprintf(stderr, "Error while writing video frame\n");
- exit(1);
- }
- frame_count++;
-}
-
-static void close_video(AVFormatContext *oc, AVStream *st)
-{
- avcodec_close(st->codec);
- av_free(picture->data[0]);
- av_free(picture);
- if (tmp_picture) {
- av_free(tmp_picture->data[0]);
- av_free(tmp_picture);
- }
- av_free(video_outbuf);
-}
-
-/**************************************************************/
-/* media file output */
-
-int main(int argc, char **argv)
-{
- const char *filename;
- AVOutputFormat *fmt;
- AVFormatContext *oc;
- AVStream *audio_st, *video_st;
- double audio_pts, video_pts;
- int i;
-
- /* Initialize libavcodec, and register all codecs and formats. */
- av_register_all();
-
- if (argc != 2) {
- printf("usage: %s output_file\n"
- "API example program to output a media file with libavformat.\n"
- "The output format is automatically guessed according to the file extension.\n"
- "Raw images can also be output by using '%%d' in the filename\n"
- "\n", argv[0]);
- return 1;
- }
-
- filename = argv[1];
-
- /* Autodetect the output format from the name. default is MPEG. */
- fmt = av_guess_format(NULL, filename, NULL);
- if (!fmt) {
- printf("Could not deduce output format from file extension: using MPEG.\n");
- fmt = av_guess_format("mpeg", NULL, NULL);
- }
- if (!fmt) {
- fprintf(stderr, "Could not find suitable output format\n");
- return 1;
- }
-
- /* Allocate the output media context. */
- oc = avformat_alloc_context();
- if (!oc) {
- fprintf(stderr, "Memory error\n");
- return 1;
- }
- oc->oformat = fmt;
- snprintf(oc->filename, sizeof(oc->filename), "%s", filename);
-
- /* Add the audio and video streams using the default format codecs
- * and initialize the codecs. */
- video_st = NULL;
- audio_st = NULL;
- if (fmt->video_codec != AV_CODEC_ID_NONE) {
- video_st = add_video_stream(oc, fmt->video_codec);
- }
- if (fmt->audio_codec != AV_CODEC_ID_NONE) {
- audio_st = add_audio_stream(oc, fmt->audio_codec);
- }
-
- /* Now that all the parameters are set, we can open the audio and
- * video codecs and allocate the necessary encode buffers. */
- if (video_st)
- open_video(oc, video_st);
- if (audio_st)
- open_audio(oc, audio_st);
-
- av_dump_format(oc, 0, filename, 1);
-
- /* open the output file, if needed */
- if (!(fmt->flags & AVFMT_NOFILE)) {
- if (avio_open(&oc->pb, filename, AVIO_FLAG_WRITE) < 0) {
- fprintf(stderr, "Could not open '%s'\n", filename);
- return 1;
- }
- }
-
- /* Write the stream header, if any. */
- avformat_write_header(oc, NULL);
-
- for (;;) {
- /* Compute current audio and video time. */
- if (audio_st)
- audio_pts = (double)audio_st->pts.val * audio_st->time_base.num / audio_st->time_base.den;
- else
- audio_pts = 0.0;
-
- if (video_st)
- video_pts = (double)video_st->pts.val * video_st->time_base.num /
- video_st->time_base.den;
- else
- video_pts = 0.0;
-
- if ((!audio_st || audio_pts >= STREAM_DURATION) &&
- (!video_st || video_pts >= STREAM_DURATION))
- break;
-
- /* write interleaved audio and video frames */
- if (!video_st || (video_st && audio_st && audio_pts < video_pts)) {
- write_audio_frame(oc, audio_st);
- } else {
- write_video_frame(oc, video_st);
- }
- }
-
- /* Write the trailer, if any. The trailer must be written before you
- * close the CodecContexts open when you wrote the header; otherwise
- * av_write_trailer() may try to use memory that was freed on
- * av_codec_close(). */
- av_write_trailer(oc);
-
- /* Close each codec. */
- if (video_st)
- close_video(oc, video_st);
- if (audio_st)
- close_audio(oc, audio_st);
-
- /* Free the streams. */
- for (i = 0; i < oc->nb_streams; i++) {
- av_freep(&oc->streams[i]->codec);
- av_freep(&oc->streams[i]);
- }
-
- if (!(fmt->flags & AVFMT_NOFILE))
- /* Close the output file. */
- avio_close(oc->pb);
-
- /* free the stream */
- av_free(oc);
-
- return 0;
-}

libav-v9.6.tar.bz2/libavutil/crc_data.h Deleted

@@ -1,213 +0,0 @@
-/*
- * copyright (c) 2008 Aurelien Jacobs <aurel@gnuage.org>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_CRC_DATA_H
-#define AVUTIL_CRC_DATA_H
-
-#include "crc.h"
-
-static const AVCRC av_crc_table[AV_CRC_MAX][257] = {
- [AV_CRC_8_ATM] = {
- 0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15, 0x38, 0x3F, 0x36, 0x31,
- 0x24, 0x23, 0x2A, 0x2D, 0x70, 0x77, 0x7E, 0x79, 0x6C, 0x6B, 0x62, 0x65,
- 0x48, 0x4F, 0x46, 0x41, 0x54, 0x53, 0x5A, 0x5D, 0xE0, 0xE7, 0xEE, 0xE9,
- 0xFC, 0xFB, 0xF2, 0xF5, 0xD8, 0xDF, 0xD6, 0xD1, 0xC4, 0xC3, 0xCA, 0xCD,
- 0x90, 0x97, 0x9E, 0x99, 0x8C, 0x8B, 0x82, 0x85, 0xA8, 0xAF, 0xA6, 0xA1,
- 0xB4, 0xB3, 0xBA, 0xBD, 0xC7, 0xC0, 0xC9, 0xCE, 0xDB, 0xDC, 0xD5, 0xD2,
- 0xFF, 0xF8, 0xF1, 0xF6, 0xE3, 0xE4, 0xED, 0xEA, 0xB7, 0xB0, 0xB9, 0xBE,
- 0xAB, 0xAC, 0xA5, 0xA2, 0x8F, 0x88, 0x81, 0x86, 0x93, 0x94, 0x9D, 0x9A,
- 0x27, 0x20, 0x29, 0x2E, 0x3B, 0x3C, 0x35, 0x32, 0x1F, 0x18, 0x11, 0x16,
- 0x03, 0x04, 0x0D, 0x0A, 0x57, 0x50, 0x59, 0x5E, 0x4B, 0x4C, 0x45, 0x42,
- 0x6F, 0x68, 0x61, 0x66, 0x73, 0x74, 0x7D, 0x7A, 0x89, 0x8E, 0x87, 0x80,
- 0x95, 0x92, 0x9B, 0x9C, 0xB1, 0xB6, 0xBF, 0xB8, 0xAD, 0xAA, 0xA3, 0xA4,
- 0xF9, 0xFE, 0xF7, 0xF0, 0xE5, 0xE2, 0xEB, 0xEC, 0xC1, 0xC6, 0xCF, 0xC8,
- 0xDD, 0xDA, 0xD3, 0xD4, 0x69, 0x6E, 0x67, 0x60, 0x75, 0x72, 0x7B, 0x7C,
- 0x51, 0x56, 0x5F, 0x58, 0x4D, 0x4A, 0x43, 0x44, 0x19, 0x1E, 0x17, 0x10,
- 0x05, 0x02, 0x0B, 0x0C, 0x21, 0x26, 0x2F, 0x28, 0x3D, 0x3A, 0x33, 0x34,
- 0x4E, 0x49, 0x40, 0x47, 0x52, 0x55, 0x5C, 0x5B, 0x76, 0x71, 0x78, 0x7F,
- 0x6A, 0x6D, 0x64, 0x63, 0x3E, 0x39, 0x30, 0x37, 0x22, 0x25, 0x2C, 0x2B,
- 0x06, 0x01, 0x08, 0x0F, 0x1A, 0x1D, 0x14, 0x13, 0xAE, 0xA9, 0xA0, 0xA7,
- 0xB2, 0xB5, 0xBC, 0xBB, 0x96, 0x91, 0x98, 0x9F, 0x8A, 0x8D, 0x84, 0x83,
- 0xDE, 0xD9, 0xD0, 0xD7, 0xC2, 0xC5, 0xCC, 0xCB, 0xE6, 0xE1, 0xE8, 0xEF,
- 0xFA, 0xFD, 0xF4, 0xF3, 0x01
- },
- [AV_CRC_16_ANSI] = {
- 0x0000, 0x0580, 0x0F80, 0x0A00, 0x1B80, 0x1E00, 0x1400, 0x1180,
- 0x3380, 0x3600, 0x3C00, 0x3980, 0x2800, 0x2D80, 0x2780, 0x2200,
- 0x6380, 0x6600, 0x6C00, 0x6980, 0x7800, 0x7D80, 0x7780, 0x7200,
- 0x5000, 0x5580, 0x5F80, 0x5A00, 0x4B80, 0x4E00, 0x4400, 0x4180,
- 0xC380, 0xC600, 0xCC00, 0xC980, 0xD800, 0xDD80, 0xD780, 0xD200,
- 0xF000, 0xF580, 0xFF80, 0xFA00, 0xEB80, 0xEE00, 0xE400, 0xE180,
- 0xA000, 0xA580, 0xAF80, 0xAA00, 0xBB80, 0xBE00, 0xB400, 0xB180,
- 0x9380, 0x9600, 0x9C00, 0x9980, 0x8800, 0x8D80, 0x8780, 0x8200,
- 0x8381, 0x8601, 0x8C01, 0x8981, 0x9801, 0x9D81, 0x9781, 0x9201,
- 0xB001, 0xB581, 0xBF81, 0xBA01, 0xAB81, 0xAE01, 0xA401, 0xA181,
- 0xE001, 0xE581, 0xEF81, 0xEA01, 0xFB81, 0xFE01, 0xF401, 0xF181,
- 0xD381, 0xD601, 0xDC01, 0xD981, 0xC801, 0xCD81, 0xC781, 0xC201,
- 0x4001, 0x4581, 0x4F81, 0x4A01, 0x5B81, 0x5E01, 0x5401, 0x5181,
- 0x7381, 0x7601, 0x7C01, 0x7981, 0x6801, 0x6D81, 0x6781, 0x6201,
- 0x2381, 0x2601, 0x2C01, 0x2981, 0x3801, 0x3D81, 0x3781, 0x3201,
- 0x1001, 0x1581, 0x1F81, 0x1A01, 0x0B81, 0x0E01, 0x0401, 0x0181,
- 0x0383, 0x0603, 0x0C03, 0x0983, 0x1803, 0x1D83, 0x1783, 0x1203,
- 0x3003, 0x3583, 0x3F83, 0x3A03, 0x2B83, 0x2E03, 0x2403, 0x2183,
- 0x6003, 0x6583, 0x6F83, 0x6A03, 0x7B83, 0x7E03, 0x7403, 0x7183,
- 0x5383, 0x5603, 0x5C03, 0x5983, 0x4803, 0x4D83, 0x4783, 0x4203,
- 0xC003, 0xC583, 0xCF83, 0xCA03, 0xDB83, 0xDE03, 0xD403, 0xD183,
- 0xF383, 0xF603, 0xFC03, 0xF983, 0xE803, 0xED83, 0xE783, 0xE203,
- 0xA383, 0xA603, 0xAC03, 0xA983, 0xB803, 0xBD83, 0xB783, 0xB203,
- 0x9003, 0x9583, 0x9F83, 0x9A03, 0x8B83, 0x8E03, 0x8403, 0x8183,
- 0x8002, 0x8582, 0x8F82, 0x8A02, 0x9B82, 0x9E02, 0x9402, 0x9182,
- 0xB382, 0xB602, 0xBC02, 0xB982, 0xA802, 0xAD82, 0xA782, 0xA202,
- 0xE382, 0xE602, 0xEC02, 0xE982, 0xF802, 0xFD82, 0xF782, 0xF202,
- 0xD002, 0xD582, 0xDF82, 0xDA02, 0xCB82, 0xCE02, 0xC402, 0xC182,
- 0x4382, 0x4602, 0x4C02, 0x4982, 0x5802, 0x5D82, 0x5782, 0x5202,
- 0x7002, 0x7582, 0x7F82, 0x7A02, 0x6B82, 0x6E02, 0x6402, 0x6182,
- 0x2002, 0x2582, 0x2F82, 0x2A02, 0x3B82, 0x3E02, 0x3402, 0x3182,
- 0x1382, 0x1602, 0x1C02, 0x1982, 0x0802, 0x0D82, 0x0782, 0x0202,
- 0x0001
- },
- [AV_CRC_16_CCITT] = {
- 0x0000, 0x2110, 0x4220, 0x6330, 0x8440, 0xA550, 0xC660, 0xE770,
- 0x0881, 0x2991, 0x4AA1, 0x6BB1, 0x8CC1, 0xADD1, 0xCEE1, 0xEFF1,
- 0x3112, 0x1002, 0x7332, 0x5222, 0xB552, 0x9442, 0xF772, 0xD662,
- 0x3993, 0x1883, 0x7BB3, 0x5AA3, 0xBDD3, 0x9CC3, 0xFFF3, 0xDEE3,
- 0x6224, 0x4334, 0x2004, 0x0114, 0xE664, 0xC774, 0xA444, 0x8554,
- 0x6AA5, 0x4BB5, 0x2885, 0x0995, 0xEEE5, 0xCFF5, 0xACC5, 0x8DD5,
- 0x5336, 0x7226, 0x1116, 0x3006, 0xD776, 0xF666, 0x9556, 0xB446,
- 0x5BB7, 0x7AA7, 0x1997, 0x3887, 0xDFF7, 0xFEE7, 0x9DD7, 0xBCC7,
- 0xC448, 0xE558, 0x8668, 0xA778, 0x4008, 0x6118, 0x0228, 0x2338,
- 0xCCC9, 0xEDD9, 0x8EE9, 0xAFF9, 0x4889, 0x6999, 0x0AA9, 0x2BB9,
- 0xF55A, 0xD44A, 0xB77A, 0x966A, 0x711A, 0x500A, 0x333A, 0x122A,
- 0xFDDB, 0xDCCB, 0xBFFB, 0x9EEB, 0x799B, 0x588B, 0x3BBB, 0x1AAB,
- 0xA66C, 0x877C, 0xE44C, 0xC55C, 0x222C, 0x033C, 0x600C, 0x411C,
- 0xAEED, 0x8FFD, 0xECCD, 0xCDDD, 0x2AAD, 0x0BBD, 0x688D, 0x499D,
- 0x977E, 0xB66E, 0xD55E, 0xF44E, 0x133E, 0x322E, 0x511E, 0x700E,
- 0x9FFF, 0xBEEF, 0xDDDF, 0xFCCF, 0x1BBF, 0x3AAF, 0x599F, 0x788F,
- 0x8891, 0xA981, 0xCAB1, 0xEBA1, 0x0CD1, 0x2DC1, 0x4EF1, 0x6FE1,
- 0x8010, 0xA100, 0xC230, 0xE320, 0x0450, 0x2540, 0x4670, 0x6760,
- 0xB983, 0x9893, 0xFBA3, 0xDAB3, 0x3DC3, 0x1CD3, 0x7FE3, 0x5EF3,
- 0xB102, 0x9012, 0xF322, 0xD232, 0x3542, 0x1452, 0x7762, 0x5672,
- 0xEAB5, 0xCBA5, 0xA895, 0x8985, 0x6EF5, 0x4FE5, 0x2CD5, 0x0DC5,
- 0xE234, 0xC324, 0xA014, 0x8104, 0x6674, 0x4764, 0x2454, 0x0544,
- 0xDBA7, 0xFAB7, 0x9987, 0xB897, 0x5FE7, 0x7EF7, 0x1DC7, 0x3CD7,
- 0xD326, 0xF236, 0x9106, 0xB016, 0x5766, 0x7676, 0x1546, 0x3456,
- 0x4CD9, 0x6DC9, 0x0EF9, 0x2FE9, 0xC899, 0xE989, 0x8AB9, 0xABA9,
- 0x4458, 0x6548, 0x0678, 0x2768, 0xC018, 0xE108, 0x8238, 0xA328,
- 0x7DCB, 0x5CDB, 0x3FEB, 0x1EFB, 0xF98B, 0xD89B, 0xBBAB, 0x9ABB,
- 0x754A, 0x545A, 0x376A, 0x167A, 0xF10A, 0xD01A, 0xB32A, 0x923A,
- 0x2EFD, 0x0FED, 0x6CDD, 0x4DCD, 0xAABD, 0x8BAD, 0xE89D, 0xC98D,
- 0x267C, 0x076C, 0x645C, 0x454C, 0xA23C, 0x832C, 0xE01C, 0xC10C,
- 0x1FEF, 0x3EFF, 0x5DCF, 0x7CDF, 0x9BAF, 0xBABF, 0xD98F, 0xF89F,
- 0x176E, 0x367E, 0x554E, 0x745E, 0x932E, 0xB23E, 0xD10E, 0xF01E,
- 0x0001
- },
- [AV_CRC_32_IEEE] = {
- 0x00000000, 0xB71DC104, 0x6E3B8209, 0xD926430D, 0xDC760413, 0x6B6BC517,
- 0xB24D861A, 0x0550471E, 0xB8ED0826, 0x0FF0C922, 0xD6D68A2F, 0x61CB4B2B,
- 0x649B0C35, 0xD386CD31, 0x0AA08E3C, 0xBDBD4F38, 0x70DB114C, 0xC7C6D048,
- 0x1EE09345, 0xA9FD5241, 0xACAD155F, 0x1BB0D45B, 0xC2969756, 0x758B5652,
- 0xC836196A, 0x7F2BD86E, 0xA60D9B63, 0x11105A67, 0x14401D79, 0xA35DDC7D,
- 0x7A7B9F70, 0xCD665E74, 0xE0B62398, 0x57ABE29C, 0x8E8DA191, 0x39906095,
- 0x3CC0278B, 0x8BDDE68F, 0x52FBA582, 0xE5E66486, 0x585B2BBE, 0xEF46EABA,
- 0x3660A9B7, 0x817D68B3, 0x842D2FAD, 0x3330EEA9, 0xEA16ADA4, 0x5D0B6CA0,
- 0x906D32D4, 0x2770F3D0, 0xFE56B0DD, 0x494B71D9, 0x4C1B36C7, 0xFB06F7C3,
- 0x2220B4CE, 0x953D75CA, 0x28803AF2, 0x9F9DFBF6, 0x46BBB8FB, 0xF1A679FF,
- 0xF4F63EE1, 0x43EBFFE5, 0x9ACDBCE8, 0x2DD07DEC, 0x77708634, 0xC06D4730,
- 0x194B043D, 0xAE56C539, 0xAB068227, 0x1C1B4323, 0xC53D002E, 0x7220C12A,
- 0xCF9D8E12, 0x78804F16, 0xA1A60C1B, 0x16BBCD1F, 0x13EB8A01, 0xA4F64B05,
- 0x7DD00808, 0xCACDC90C, 0x07AB9778, 0xB0B6567C, 0x69901571, 0xDE8DD475,
- 0xDBDD936B, 0x6CC0526F, 0xB5E61162, 0x02FBD066, 0xBF469F5E, 0x085B5E5A,
- 0xD17D1D57, 0x6660DC53, 0x63309B4D, 0xD42D5A49, 0x0D0B1944, 0xBA16D840,
- 0x97C6A5AC, 0x20DB64A8, 0xF9FD27A5, 0x4EE0E6A1, 0x4BB0A1BF, 0xFCAD60BB,
- 0x258B23B6, 0x9296E2B2, 0x2F2BAD8A, 0x98366C8E, 0x41102F83, 0xF60DEE87,
- 0xF35DA999, 0x4440689D, 0x9D662B90, 0x2A7BEA94, 0xE71DB4E0, 0x500075E4,
- 0x892636E9, 0x3E3BF7ED, 0x3B6BB0F3, 0x8C7671F7, 0x555032FA, 0xE24DF3FE,
- 0x5FF0BCC6, 0xE8ED7DC2, 0x31CB3ECF, 0x86D6FFCB, 0x8386B8D5, 0x349B79D1,
- 0xEDBD3ADC, 0x5AA0FBD8, 0xEEE00C69, 0x59FDCD6D, 0x80DB8E60, 0x37C64F64,
- 0x3296087A, 0x858BC97E, 0x5CAD8A73, 0xEBB04B77, 0x560D044F, 0xE110C54B,
- 0x38368646, 0x8F2B4742, 0x8A7B005C, 0x3D66C158, 0xE4408255, 0x535D4351,
- 0x9E3B1D25, 0x2926DC21, 0xF0009F2C, 0x471D5E28, 0x424D1936, 0xF550D832,
- 0x2C769B3F, 0x9B6B5A3B, 0x26D61503, 0x91CBD407, 0x48ED970A, 0xFFF0560E,
- 0xFAA01110, 0x4DBDD014, 0x949B9319, 0x2386521D, 0x0E562FF1, 0xB94BEEF5,
- 0x606DADF8, 0xD7706CFC, 0xD2202BE2, 0x653DEAE6, 0xBC1BA9EB, 0x0B0668EF,
- 0xB6BB27D7, 0x01A6E6D3, 0xD880A5DE, 0x6F9D64DA, 0x6ACD23C4, 0xDDD0E2C0,
- 0x04F6A1CD, 0xB3EB60C9, 0x7E8D3EBD, 0xC990FFB9, 0x10B6BCB4, 0xA7AB7DB0,
- 0xA2FB3AAE, 0x15E6FBAA, 0xCCC0B8A7, 0x7BDD79A3, 0xC660369B, 0x717DF79F,
- 0xA85BB492, 0x1F467596, 0x1A163288, 0xAD0BF38C, 0x742DB081, 0xC3307185,
- 0x99908A5D, 0x2E8D4B59, 0xF7AB0854, 0x40B6C950, 0x45E68E4E, 0xF2FB4F4A,
- 0x2BDD0C47, 0x9CC0CD43, 0x217D827B, 0x9660437F, 0x4F460072, 0xF85BC176,
- 0xFD0B8668, 0x4A16476C, 0x93300461, 0x242DC565, 0xE94B9B11, 0x5E565A15,
- 0x87701918, 0x306DD81C, 0x353D9F02, 0x82205E06, 0x5B061D0B, 0xEC1BDC0F,
- 0x51A69337, 0xE6BB5233, 0x3F9D113E, 0x8880D03A, 0x8DD09724, 0x3ACD5620,
- 0xE3EB152D, 0x54F6D429, 0x7926A9C5, 0xCE3B68C1, 0x171D2BCC, 0xA000EAC8,
- 0xA550ADD6, 0x124D6CD2, 0xCB6B2FDF, 0x7C76EEDB, 0xC1CBA1E3, 0x76D660E7,
- 0xAFF023EA, 0x18EDE2EE, 0x1DBDA5F0, 0xAAA064F4, 0x738627F9, 0xC49BE6FD,
- 0x09FDB889, 0xBEE0798D, 0x67C63A80, 0xD0DBFB84, 0xD58BBC9A, 0x62967D9E,
- 0xBBB03E93, 0x0CADFF97, 0xB110B0AF, 0x060D71AB, 0xDF2B32A6, 0x6836F3A2,
- 0x6D66B4BC, 0xDA7B75B8, 0x035D36B5, 0xB440F7B1, 0x00000001
- },
- [AV_CRC_32_IEEE_LE] = {
- 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F,
- 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
- 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2,
- 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
- 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9,
- 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
- 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C,
- 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
- 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423,
- 0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
- 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, 0x01DB7106,
- 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
- 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D,
- 0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
- 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950,
- 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
- 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7,
- 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
- 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA,
- 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
- 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
- 0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
- 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84,
- 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
- 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB,
- 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
- 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E,
- 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
- 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55,
- 0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
- 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28,
- 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
- 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F,
- 0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
- 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242,
- 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
- 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69,
- 0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
- 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC,
- 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
- 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693,
- 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
- 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D, 0x00000001
- },
-};
-
-#endif /* AVUTIL_CRC_DATA_H */

libav-v9.6.tar.bz2/libavutil/intfloat_readwrite.c Deleted

@@ -1,97 +0,0 @@
-/*
- * portable IEEE float/double read/write functions
- *
- * Copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * portable IEEE float/double read/write functions
- */
-
-#include <stdint.h>
-#include "mathematics.h"
-#include "intfloat_readwrite.h"
-
-double av_int2dbl(int64_t v){
- if((uint64_t)v+v > 0xFFEULL<<52)
- return NAN;
- return ldexp(((v&((1LL<<52)-1)) + (1LL<<52)) * (v>>63|1), (v>>52&0x7FF)-1075);
-}
-
-float av_int2flt(int32_t v){
- if((uint32_t)v+v > 0xFF000000U)
- return NAN;
- return ldexp(((v&0x7FFFFF) + (1<<23)) * (v>>31|1), (v>>23&0xFF)-150);
-}
-
-double av_ext2dbl(const AVExtFloat ext){
- uint64_t m = 0;
- int e, i;
-
- for (i = 0; i < 8; i++)
- m = (m<<8) + ext.mantissa[i];
- e = (((int)ext.exponent[0]&0x7f)<<8) | ext.exponent[1];
- if (e == 0x7fff && m)
- return NAN;
- e -= 16383 + 63; /* In IEEE 80 bits, the whole (i.e. 1.xxxx)
- * mantissa bit is written as opposed to the
- * single and double precision formats. */
- if (ext.exponent[0]&0x80)
- m= -m;
- return ldexp(m, e);
-}
-
-int64_t av_dbl2int(double d){
- int e;
- if ( !d) return 0;
- else if(d-d) return 0x7FF0000000000000LL + ((int64_t)(d<0)<<63) + (d!=d);
- d= frexp(d, &e);
- return (int64_t)(d<0)<<63 | (e+1022LL)<<52 | (int64_t)((fabs(d)-0.5)*(1LL<<53));
-}
-
-int32_t av_flt2int(float d){
- int e;
- if ( !d) return 0;
- else if(d-d) return 0x7F800000 + ((d<0)<<31) + (d!=d);
- d= frexp(d, &e);
- return (d<0)<<31 | (e+126)<<23 | (int64_t)((fabs(d)-0.5)*(1<<24));
-}
-
-AVExtFloat av_dbl2ext(double d){
- struct AVExtFloat ext= {{0}};
- int e, i; double f; uint64_t m;
-
- f = fabs(frexp(d, &e));
- if (f >= 0.5 && f < 1) {
- e += 16382;
- ext.exponent[0] = e>>8;
- ext.exponent[1] = e;
- m = (uint64_t)ldexp(f, 64);
- for (i=0; i < 8; i++)
- ext.mantissa[i] = m>>(56-(i<<3));
- } else if (f != 0.0) {
- ext.exponent[0] = 0x7f; ext.exponent[1] = 0xff;
- if (f != INFINITY)
- ext.mantissa[0] = ~0;
- }
- if (d < 0)
- ext.exponent[0] |= 0x80;
- return ext;
-}

libav-v9.6.tar.bz2/libavutil/intfloat_readwrite.h Deleted

@@ -1,40 +0,0 @@
-/*
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_INTFLOAT_READWRITE_H
-#define AVUTIL_INTFLOAT_READWRITE_H
-
-#include <stdint.h>
-#include "attributes.h"
-
-/* IEEE 80 bits extended float */
-typedef struct AVExtFloat {
- uint8_t exponent[2];
- uint8_t mantissa[8];
-} AVExtFloat;
-
-attribute_deprecated double av_int2dbl(int64_t v) av_const;
-attribute_deprecated float av_int2flt(int32_t v) av_const;
-attribute_deprecated double av_ext2dbl(const AVExtFloat ext) av_const;
-attribute_deprecated int64_t av_dbl2int(double d) av_const;
-attribute_deprecated int32_t av_flt2int(float d) av_const;
-attribute_deprecated AVExtFloat av_dbl2ext(double d) av_const;
-
-#endif /* AVUTIL_INTFLOAT_READWRITE_H */

libav-v9.6.tar.bz2/tests/fate/avfilter.mak Deleted

@@ -1,24 +0,0 @@
-FATE_LAVFI = fate-lavfi-crop                                            \
-             fate-lavfi-crop_scale                                      \
-             fate-lavfi-crop_scale_vflip                                \
-             fate-lavfi-crop_vflip                                      \
-             fate-lavfi-null                                            \
-             fate-lavfi-pixdesc                                         \
-             fate-lavfi-pixfmts_copy                                    \
-             fate-lavfi-pixfmts_crop                                    \
-             fate-lavfi-pixfmts_hflip                                   \
-             fate-lavfi-pixfmts_null                                    \
-             fate-lavfi-pixfmts_pad                                     \
-             fate-lavfi-pixfmts_scale                                   \
-             fate-lavfi-pixfmts_vflip                                   \
-             fate-lavfi-scale200                                        \
-             fate-lavfi-scale500                                        \
-             fate-lavfi-vflip                                           \
-             fate-lavfi-vflip_crop                                      \
-             fate-lavfi-vflip_vflip                                     \
-
-$(FATE_LAVFI): $(VREF) libavfilter/filtfmts-test$(EXESUF)
-$(FATE_LAVFI): CMD = lavfitest
-
-FATE_AVCONV += $(FATE_LAVFI)
-fate-lavfi:    $(FATE_LAVFI)

libav-v9.6.tar.bz2/tests/fate/filter.mak Deleted

@@ -1,42 +0,0 @@
-FATE_AMIX += fate-filter-amix-simple
-fate-filter-amix-simple: CMD = avconv -filter_complex amix -i $(SRC) -ss 3 -i $(SRC1) -f f32le -
-fate-filter-amix-simple: REF = $(SAMPLES)/filter/amix_simple.pcm
-
-FATE_AMIX += fate-filter-amix-first
-fate-filter-amix-first: CMD = avconv -filter_complex amix=duration=first -ss 4 -i $(SRC) -i $(SRC1) -f f32le -
-fate-filter-amix-first: REF = $(SAMPLES)/filter/amix_first.pcm
-
-FATE_AMIX += fate-filter-amix-transition
-fate-filter-amix-transition: tests/data/asynth-44100-2-3.wav
-fate-filter-amix-transition: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-2-3.wav
-fate-filter-amix-transition: CMD = avconv -filter_complex amix=inputs=3:dropout_transition=0.5 -i $(SRC) -ss 2 -i $(SRC1) -ss 4 -i $(SRC2) -f f32le -
-fate-filter-amix-transition: REF = $(SAMPLES)/filter/amix_transition.pcm
-
-$(FATE_AMIX): tests/data/asynth-44100-2.wav tests/data/asynth-44100-2-2.wav
-$(FATE_AMIX): SRC  = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
-$(FATE_AMIX): SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2-2.wav
-$(FATE_AMIX): CMP  = oneoff
-$(FATE_AMIX): CMP_UNIT = f32
-
-FATE_FILTER-$(CONFIG_AMIX_FILTER) += $(FATE_AMIX)
-
-FATE_FILTER-$(CONFIG_ASYNCTS_FILTER) += fate-filter-asyncts
-fate-filter-asyncts: SRC = $(SAMPLES)/nellymoser/nellymoser-discont.flv
-fate-filter-asyncts: CMD = pcm -analyzeduration 10000000 -i $(SRC) -af asyncts
-fate-filter-asyncts: CMP = oneoff
-fate-filter-asyncts: REF = $(SAMPLES)/nellymoser/nellymoser-discont.pcm
-
-fate-filter-delogo: CMD = framecrc -i $(SAMPLES)/real/rv30.rm -vf delogo=show=0:x=290:y=25:w=26:h=16 -an
-
-FATE_FILTER-$(CONFIG_DELOGO_FILTER) += fate-filter-delogo
-
-FATE_YADIF += fate-filter-yadif-mode0
-fate-filter-yadif-mode0: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=0
-
-FATE_YADIF += fate-filter-yadif-mode1
-fate-filter-yadif-mode1: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=1
-
-FATE_FILTER-$(CONFIG_YADIF_FILTER) += $(FATE_YADIF)
-
-FATE_SAMPLES_AVCONV += $(FATE_FILTER-yes)
-fate-filter: $(FATE_FILTER-yes)

libav-v9.6.tar.bz2/tests/lavfi-regression.sh Deleted

@@ -1,79 +0,0 @@
-#!/bin/sh
-#
-# automatic regression test for libavfilter
-#
-#
-#set -x
-
-set -e
-
-. $(dirname $0)/regression-funcs.sh
-
-eval do_$test=y
-
-do_video_filter() {
-    label=$1
-    filters=$2
-    shift 2
-    printf '%-20s' $label
-    run_avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src    \
-        $ENC_OPTS -vf "$filters" -vcodec rawvideo $* -f nut md5:
-}
-
-do_lavfi() {
-    if [ $test = $1 ] ; then
-        do_video_filter $test "$2"
-    fi
-}
-
-do_lavfi "crop"               "crop=iw-100:ih-100:100:100"
-do_lavfi "crop_scale"         "crop=iw-100:ih-100:100:100,scale=400:-1"
-do_lavfi "crop_scale_vflip"   "null,null,crop=iw-200:ih-200:200:200,crop=iw-20:ih-20:20:20,scale=200:200,scale=250:250,vflip,vflip,null,scale=200:200,crop=iw-100:ih-100:100:100,vflip,scale=200:200,null,vflip,crop=iw-100:ih-100:100:100,null"
-do_lavfi "crop_vflip"         "crop=iw-100:ih-100:100:100,vflip"
-do_lavfi "null"               "null"
-do_lavfi "scale200"           "scale=200:200"
-do_lavfi "scale500"           "scale=500:500"
-do_lavfi "vflip"              "vflip"
-do_lavfi "vflip_crop"         "vflip,crop=iw-100:ih-100:100:100"
-do_lavfi "vflip_vflip"        "vflip,vflip"
-
-do_lavfi_pixfmts(){
-    test ${test%_[bl]e} = pixfmts_$1 || return 0
-    filter=$1
-    filter_args=$2
-
-    showfiltfmts="$target_exec $target_path/libavfilter/filtfmts-test"
-    exclude_fmts=${outfile}${1}_exclude_fmts
-    out_fmts=${outfile}${1}_out_fmts
-
-    # exclude pixel formats which are not supported as input
-    $avconv -pix_fmts list 2>/dev/null | awk 'NR > 8 && /^\..\./ { print $2 }' | sort >$exclude_fmts
-    $showfiltfmts scale | awk -F '[ \r]' '/^OUTPUT/{ print $3 }' | sort | comm -23 - $exclude_fmts >$out_fmts
-
-    pix_fmts=$($showfiltfmts $filter | awk -F '[ \r]' '/^INPUT/{ print $3 }' | sort | comm -12 - $out_fmts)
-    for pix_fmt in $pix_fmts; do
-        do_video_filter $pix_fmt "format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt
-    done
-
-    rm $exclude_fmts $out_fmts
-}
-
-# all these filters have exactly one input and exactly one output
-do_lavfi_pixfmts "copy"    ""
-do_lavfi_pixfmts "crop"    "100:100:100:100"
-do_lavfi_pixfmts "hflip"   ""
-do_lavfi_pixfmts "null"    ""
-do_lavfi_pixfmts "pad"     "500:400:20:20"
-do_lavfi_pixfmts "scale"   "200:100"
-do_lavfi_pixfmts "vflip"   ""
-
-if [ -n "$do_pixdesc" ]; then
-    pix_fmts="$($avconv -pix_fmts list 2>/dev/null | awk 'NR > 8 && /^IO/ { print $2 }' | sort)"
-    for pix_fmt in $pix_fmts; do
-        do_video_filter $pix_fmt "format=$pix_fmt,pixdesctest" -pix_fmt $pix_fmt
-    done
-fi
-
-# TODO: add tests for
-# direct rendering,
-# chains with feedback loops

libav-v9.6.tar.bz2/tests/ref/fate/siff Deleted

@@ -1,41 +0,0 @@
-#tb 0: 1/12
-#tb 1: 1/22050
-0,          0,          0,        1,   230400, 0x3bd1d731
-1,          0,          0,    22050,    44100, 0xd0a49e09
-0,          1,          1,        1,   230400, 0x9d0774c3
-0,          2,          2,        1,   230400, 0xa0faafe2
-0,          3,          3,        1,   230400, 0x38325309
-0,          4,          4,        1,   230400, 0xe90a1b1e
-0,          5,          5,        1,   230400, 0x8efbc904
-0,          6,          6,        1,   230400, 0x0a8476f3
-0,          7,          7,        1,   230400, 0x5d94587d
-0,          8,          8,        1,   230400, 0x280b905d
-0,          9,          9,        1,   230400, 0x07178dd9
-0,         10,         10,        1,   230400, 0xf52b8db4
-0,         11,         11,        1,   230400, 0x2b70c1dc
-0,         12,         12,        1,   230400, 0x8157a6e9
-1,      22050,      22050,    22050,    44100, 0xf151af4d
-0,         13,         13,        1,   230400, 0xd4a3c357
-0,         14,         14,        1,   230400, 0x703861bb
-0,         15,         15,        1,   230400, 0xa13cf75e
-0,         16,         16,        1,   230400, 0x140e487f
-0,         17,         17,        1,   230400, 0x05cca333
-0,         18,         18,        1,   230400, 0x0506ee2b
-0,         19,         19,        1,   230400, 0xe3e13466
-0,         20,         20,        1,   230400, 0x8a24118c
-0,         21,         21,        1,   230400, 0x22050962
-0,         22,         22,        1,   230400, 0x0f5c8a0d
-0,         23,         23,        1,   230400, 0x3475df44
-0,         24,         24,        1,   230400, 0x65354e06
-1,      44100,      44100,    22050,    44100, 0xecd3cd08
-0,         25,         25,        1,   230400, 0xb9a01978
-0,         26,         26,        1,   230400, 0x15207ee1
-0,         27,         27,        1,   230400, 0x3b214f0b
-0,         28,         28,        1,   230400, 0xf9461bbb
-0,         29,         29,        1,   230400, 0x1469290f
-0,         30,         30,        1,   230400, 0x8ddfd514
-0,         31,         31,        1,   230400, 0x1bffa6a1
-0,         32,         32,        1,   230400, 0x5a04d712
-0,         33,         33,        1,   230400, 0xaa8de439
-0,         34,         34,        1,   230400, 0x610c5439
-0,         35,         35,        1,   230400, 0xd02d3e7c

libav-v9.6.tar.bz2/tests/ref/lavfi Deleted

libav-v9.6.tar.bz2/tests/ref/lavfi/pixdesc Deleted

@@ -1,84 +0,0 @@
-abgr                037bf9df6a765520ad6d490066bf4b89
-argb                c442a8261c2265a07212ef0f72e35f5a
-bgr24               0d0cb38ab3fa0b2ec0865c14f78b217b
-bgr444be            d9ea9307d21b162225b8b2c524cf9477
-bgr444le            88035350e9da3a8f67387890b956f0bc
-bgr48be             00624e6c7ec7ab19897ba2f0a3257fe8
-bgr48le             d02c235ebba7167881ca2d576497ff84
-bgr4_byte           50d23cc82d9dcef2fd12adb81fb9b806
-bgr555be            49f01b1f1f0c84fd9e776dd34cc3c280
-bgr555le            378d6ac4223651a1adcbf94a3d0d807b
-bgr565be            257cf78afa35dc31e9696f139c916715
-bgr565le            1dfdd03995c287e3c754b164bf26a355
-bgr8                24bd566170343d06fec6fccfff5abc54
-bgra                76a18a5151242fa137133f604cd624d2
-gray                db08f7f0751900347e6b8649e4164d21
-gray16be            7becf34ae825a3df3969bf4c6bfeb5e2
-gray16le            10bd87059b5c189f3caef2837f4f2b5c
-monob               668ebe8b8103b9046b251b2fa8a1d88f
-monow               9251497f3b0634f1165d12d5a289d943
-nv12                e0af357888584d36eec5aa0f673793ef
-nv21                9a3297f3b34baa038b1f37cb202b512f
-rgb24               b41eba9651e1b5fe386289b506188105
-rgb444be            9e89db334568c6b2e3d5d0540f4ba960
-rgb444le            0a68cb6de8bf530aa30c5c1205c25155
-rgb48be             cc139ec1dd9451f0e049c0cb3a0c8aa2
-rgb48le             86c5608904f75360d492dbc5c9589969
-rgb4_byte           c93ba89b74c504e7f5ae9d9ab1546c73
-rgb555be            912a62c5e53bfcbac2a0340e10973cf2
-rgb555le            a937a0fc764fb57dc1b3af87cba0273c
-rgb565be            9cadf742e05ddc23a3b5b270f89aad3c
-rgb565le            d39aa298bb525e9be8860351c6f62dab
-rgb8                4a9d8e4f2f154e83a7e1735be6300700
-rgba                93a5b3712e6eb8c5b9a09ffc7b9fbc12
-uyvy422             adcf64516a19fce44df77082bdb16291
-yuv410p             2d9225153c83ee1132397d619d94d1b3
-yuv411p             8b298af3e43348ca1b11eb8a3252ac6c
-yuv420p             eba2f135a08829387e2f698ff72a2939
-yuv420p10be         299fe1d785a3d3dd5e70778700d7fb06
-yuv420p10le         8aee004e765a5383be0954f5e916b72f
-yuv420p16be         16c009a235cd52b74791a895423152a3
-yuv420p16le         2d59c4f1d0314a5a957a7cfc4b6fabcc
-yuv420p9be          ce880fa07830e5297c22acf6e20555ce
-yuv420p9le          16543fda8f87d94a6cf857d2e8d4461a
-yuv422p             c9bba4529821d796a6ab09f6a5fd355a
-yuv422p10be         11af7dfafe8bc025c7e3bd82b830fe8a
-yuv422p10le         ec04efb76efa79bf0d02b21572371a56
-yuv422p16be         5499502e1c29534a158a1fe60e889f60
-yuv422p16le         e3d61fde6978591596bc36b914386623
-yuv422p9be          29b71579946940a8c00fa844c9dff507
-yuv422p9le          062b7f9cbb972bf36b5bdb1a7623701a
-yuv440p             5a064afe2b453bb52cdb3f176b1aa1cf
-yuv444p             0a98447b78fd476aa39686da6a74fa2e
-yuv444p10be         71be185a2fb7a353eb024df9bc63212d
-yuv444p10le         c1c6b30a12065c7901c0a267e4861a0f
-yuv444p16be         1c6ea2c2f5e539006112ceec3d4e7d90
-yuv444p16le         20f86bc2f68d2b3f1f2b48b97b2189f4
-yuv444p9be          6ab31f4c12b533ce318ecdff83cdd054
-yuv444p9le          f0606604a5c08becab6ba500124c4b7c
-yuva420p            a29884f3f3dfe1e00b961bc17bef3d47
-yuva420p10be        145366ff1632de3e300d947f49844284
-yuva420p10le        d797038552d7f698e4d1db4dfa18ceb0
-yuva420p16be        25a335f66a0670911ced818aa42fb670
-yuva420p16le        97bf252e6c030f0f0412d3826c2ea259
-yuva420p9be         06b764d85bd3c22e9b7ca4babed84d4f
-yuva420p9le         1f01cdd4fc46f98d4c11b2947307a0e3
-yuva422p            92b6815f465297284cdb843711682cee
-yuva422p10be        fb240ff9ac49b45b1b3d40df2c89e39d
-yuva422p10le        f767ede9ba1d427faadc963cf41d2412
-yuva422p16be        ef442b11b26e5e61f3c958fa309576dd
-yuva422p16le        5789009759d7a44dacc6da2194e402b1
-yuva422p9be         e0d2f45f7f5541eee988137c7ebb3495
-yuva422p9le         a4ec81f328efd3856dec430fb27f2f56
-yuva444p            c523716e4900cfe515eaab1d7124fdd9
-yuva444p10be        f5791a75fdb86da0c243511ef9ab8fbd
-yuva444p10le        578e88dfbe4ab07f280fcc7554f3a5c4
-yuva444p16be        ee7b9dd854e36b165d5b7cffb646ba6c
-yuva444p16le        ec93b2907923d5655e9fb085479260ef
-yuva444p9be         03414257d78e72c28d03e3c247319b7c
-yuva444p9le         e421d753257e36a79c2c0ec1607ac9e6
-yuvj420p            32eec78ba51857b16ce9b813a49b7189
-yuvj422p            0dfa0ed434f73be51428758c69e082cb
-yuvj440p            657501a28004e27a592757a7509f5189
-yuvj444p            98d3d054f2ec09a75eeed5d328dc75b7
-yuyv422             f2569f2b5069a0ee0cecae33de0455e3

libav-v9.6.tar.bz2/tests/ref/lavfi/pixfmts_copy Deleted

libav-v9.6.tar.bz2/tests/ref/lavfi/pixfmts_null Deleted

libav-v9.6.tar.bz2/tests/ref/lavfi/pixfmts_scale Deleted

@@ -1,84 +0,0 @@
-abgr                d894cb97f6c80eb21bdbe8a4eea62d86
-argb                54346f2b2eef10919e0f247241df3b24
-bgr24               570f8d6b51a838aed022ef67535f6bdc
-bgr444be            25fe04f73a3bad4140d1c4f96ca5b670
-bgr444le            2fde227e6cea6dca5decdd0b7c0866f7
-bgr48be             390d3058a12a99c2b153ed7922508bea
-bgr48le             39fe06feb4ec1d9730dccc04a0cfac4c
-bgr4_byte           ee1d35a7baf8e9016891929a2f565c0b
-bgr555be            de8901c1358834fddea060fcb3a67beb
-bgr555le            36b745067197f9ca8c1731cac51329c9
-bgr565be            922a2503767036ae9536f4f7823c04ee
-bgr565le            3a514a298c6161a071ddf9963c06509d
-bgr8                7f007fa6c153a16e808a9c51605a4016
-bgra                a5e7040f9a80cccd65e5acf2ca09ace5
-gray                d7786a7d9d99ac74230cc045cab5632c
-gray16be            b554d6c1cc8da23967445be4dd3e4a86
-gray16le            715a33aa1c19cb26b14f5cc000e7a3d1
-monob               88c4c050758e64d120f50c7eff694381
-monow               d31772ebaa877fc2a78565937f7f9673
-nv12                4676d59db43d657dc12841f6bc3ab452
-nv21                69c699510ff1fb777b118ebee1002f14
-rgb24               514692e28e8ff6860e415ce4fcf6eb8c
-rgb444be            12254053ae93373869fca18b2afcba31
-rgb444le            badbd68b59c87df6ae73248309637634
-rgb48be             8fac63787a711886030f8e056872b488
-rgb48le             ab92f2763a2eb264c3870cc758f97149
-rgb4_byte           d81ffd3add95842a618eec81024f0b5c
-rgb555be            4607309f9f217d51cbb53d13b84b4537
-rgb555le            a350ef1dc2c9688ed49e7ba018843795
-rgb565be            678ce231c4ea13629c1353b1df4ffbef
-rgb565le            6f4bb711238baa762d73305213f8d035
-rgb8                091d0170b354ef0e97312b95feb5483f
-rgba                a3d362f222098a00e63867f612018659
-uyvy422             314bd486277111a95d9369b944fa0400
-yuv410p             7df8f6d69b56a8dcb6c7ee908e5018b5
-yuv411p             1143e7c5cc28fe0922b051b17733bc4c
-yuv420p             fdad2d8df8985e3d17e73c71f713cb14
-yuv420p10be         27f28a6e09b1c04d0f755035a5db1f43
-yuv420p10le         a5a1692e026590ba2eddb46b9b827529
-yuv420p16be         d7270efce54eb59c7b01c14157a1b890
-yuv420p16le         e85abf00bad940a922b623c91c9026d7
-yuv420p9be          bb87fddca65d1742412c8d2b1caf96c6
-yuv420p9le          828eec50014a41258a5423c1fe56ac97
-yuv422p             918e37701ee7377d16a8a6c119c56a40
-yuv422p10be         315654908d50718e175aae018c484732
-yuv422p10le         91bbc78a9a56f659b55abc17722dcc09
-yuv422p16be         e7e34fe9264784763ab6cb406524c0f3
-yuv422p16le         c435b76b08204dda6908640fb5fd4621
-yuv422p9be          82494823944912f73cebc58ad2979bbd
-yuv422p9le          fc69c8a21f473916a4b4225636b97e06
-yuv440p             461503fdb9b90451020aa3b25ddf041c
-yuv444p             81b2eba962d12e8d64f003ac56f6faf2
-yuv444p10be         fb304d77c6d2e18df5938662a22176f0
-yuv444p10le         b17136913eb066dca6be6af645b9f7e8
-yuv444p16be         0da9bed80f5542682ab286f3261cf24c
-yuv444p16le         a0c5d3c7bf3f181db503cf8e450d1335
-yuv444p9be          9ac2643ce7f7e5c4e17c8c9fd8494d4a
-yuv444p9le          896a1cc9cccca1ba410dd53942d33cc4
-yuva420p            8673a9131fb47de69788863f93a50eb7
-yuva420p10be        d92a95061809f251175f5d5e3074930e
-yuva420p10le        bad90ba2d4c260e379a7aa6dc7760853
-yuva420p16be        a61d8ddb646e2d26020fc7ed2a48c1a9
-yuva420p16le        90ef774f86ad3177ec57eca8744b4e09
-yuva420p9be         f7655546446bfdc875243d7cdeb13b30
-yuva420p9le         ada2b719827059d70ebc57e2a3f9da92
-yuva422p            3c76ebeca0a7d3aa5f8e31ef80a86ffe
-yuva422p10be        01dd539e4a62762a3c97e965c76bb6f7
-yuva422p10le        76355d9d8fdcd085a24d48832b72e40b
-yuva422p16be        c21afa31ac18bd92e8e596b81552b52b
-yuva422p16le        0bc3720dba6076dcce3b74b1d3c6c4b7
-yuva422p9be         a60ac5b8026e9621724c033fbf79dbda
-yuva422p9le         c3eda8831e9b9c94a3eb487d33114103
-yuva444p            3268c6abe5e3cdbd16552a1eddced816
-yuva444p10be        856b37c1ee53459f46b9359d329ac9b5
-yuva444p10le        22790592361c007406d4ca9a9e0954a5
-yuva444p16be        ed5b07fe4d5b1137604568786777af1d
-yuva444p16le        3a3df23feb60d8832b566fd9765983d0
-yuva444p9be         4fc479c5b1044ad37b4e6fc6488b4f7f
-yuva444p9le         c41849b0134670d6f6253c337defbb04
-yuvj420p            30427bd6caf5bda93a173dbebe759e09
-yuvj422p            fc8288f64fd149573f73cf8da05d8e6d
-yuvj440p            508ac7a9ddeb6d1794a1100ba7a1664c
-yuvj444p            73aebe144085b22d1189caf6ca07e18c
-yuyv422             169e19ac91b257bd84ace0fdf56559ad

libav-v9.6.tar.bz2/tests/ref/lavfi/pixfmts_vflip Deleted

@@ -1,84 +0,0 @@
-abgr                25e72e9dbd01ab00727c976d577f7be5
-argb                19869bf1a5ac0b6af4d8bbe2c104533c
-bgr24               89108a4ba00201f79b75b9305c42352d
-bgr444be            9ef12c42fb791948ca4423c452dc6b9a
-bgr444le            3650ecfc163abd1596c0cd29d130c4b0
-bgr48be             2f23931844f57641f3737348182d118c
-bgr48le             4242a026012b6c135a6aa138a6d67031
-bgr4_byte           407fcf564ed764c38e1d748f700ab921
-bgr555be            f739d2519f7e9d494359bf67a3821537
-bgr555le            bd7b3ec4d684dfad075d89a606cb8b74
-bgr565be            f19e9a4786395e1ddcd51399c98c9f6c
-bgr565le            fdb617533e1e7ff512ea5b6b6233e738
-bgr8                c60f93fd152c6903391d1fe9decd3547
-bgra                7f9b799fb48544e49ce93e91d7f9fca8
-gray                30d9014a9d43b5f37e7aa64be3a3ecfc
-gray16be            6b84b85d3326182fa1217e138249edc5
-gray16le            66bb8faa09dc149734aca3c768a6d4e1
-monob               d0cf8732677a5360b6160133043590d8
-monow               ff9869d067ecb94eb9d90c9750c31fea
-nv12                046f00f598ce14d9854a3534a5c99114
-nv21                01ea369dd2d0d3ed7451dc5c8d61497f
-rgb24               eaefabc168d0b14576bab45bc1e56e1e
-rgb444be            06722e03f8404e7d2226665ed2444a32
-rgb444le            185c9a5d9c2877484310d4196ef4cd6f
-rgb48be             62dd185862ed142283bd300eb6dbd216
-rgb48le             dcb76353268bc5862194d131762220da
-rgb4_byte           8c6ff02df0b06dd2d574836c3741b2a2
-rgb555be            40dc33cfb5cf56aac1c5a290ac486c36
-rgb555le            4f8eaad29a17e0f8e9d8ab743e76b999
-rgb565be            b57623ad9df74648339311a0edcebc7b
-rgb565le            73f247a3315dceaea3022ac7c197c5ef
-rgb8                13a8d89ef78d8127297d899005456ff0
-rgba                1fc6e920a42ec812aaa3b2aa02f37987
-uyvy422             ffbd36720c77398d9a0d03ce2625928f
-yuv410p             7bfb39d7afb49d6a6173e6b23ae321eb
-yuv411p             4a90048cc3a65fac150e53289700efe1
-yuv420p             2e6d6062e8cad37fb3ab2c433b55f382
-yuv420p10be         fb0772f5e2b9da20ff826e64c3893137
-yuv420p10le         e95879e14c4a6805f39643964baf41f7
-yuv420p16be         539076782902664a8acf381bf4f713e8
-yuv420p16le         0f609e588e5a258644ef85170d70e030
-yuv420p9be          be40ec975fb2873891643cbbbddbc3b0
-yuv420p9le          7e606310d3f5ff12badf911e8f333471
-yuv422p             d7f5cb44d9b0210d66d6a8762640ab34
-yuv422p10be         0be8378c3773e1c0b394315ef4994351
-yuv422p10le         6518094fe8de6bee95af21af1e5dc1e1
-yuv422p16be         9bd8f8c961822b586fa4cf992be54acc
-yuv422p16le         9c4a1239605c7952b736ac3130163f14
-yuv422p9be          7c6f1e140b3999ee7d923854e507752a
-yuv422p9le          51f10d79c07989060dd06e767e6d7d60
-yuv440p             876385e96165acf51271b20e5d85a416
-yuv444p             9c3c667d1613b72d15bc6d851c5eb8f7
-yuv444p10be         ee069cc6db48975eb029d72f889a7fe6
-yuv444p10le         645b3335248113cafe3c29edb1d7f3be
-yuv444p16be         de2dedfc6f12073ffead113f86e07ecf
-yuv444p16le         8e83323cf102d6c823a03ae8a7b7e033
-yuv444p9be          6ac92b7dc9ab2fc59bee99204886899a
-yuv444p9le          85aef13a654953d3455d89770b0d74bd
-yuva420p            c705d1cf061d8c6580ac690b55f92276
-yuva420p10be        baa5e3b0ff6d0ebbb0958560cd763c6e
-yuva420p10le        a36dc59ad55b406e5fee475236e9753c
-yuva420p16be        bf3b134eb70878df9afba61d03e930b8
-yuva420p16le        105d375154329a381aa58379a0a6ec46
-yuva420p9be         8273d591e055f48990c29dd905a6cdfd
-yuva420p9le         95ced0bb07e422d98db61a35cdb3fb8f
-yuva422p            6aed0ea657ed51cc047a4fbdd981aec8
-yuva422p10be        d69a3404984c5fd30c0fc548532bcb6b
-yuva422p10le        a40c8e6f50e12d94bf7484107ec98559
-yuva422p16be        39552c259ca242f2417e913ffc602fde
-yuva422p16le        16faa558a34291ca32f6d94dce211ee2
-yuva422p9be         a951eafb62c092c63f7566b6803f60df
-yuva422p9le         00b39cfca78666e057ee527f5e174a04
-yuva444p            da5d64f2b2bd2013c186456f595fad65
-yuva444p10be        00e74a9c0c7818a9bbd9fee95b961ee8
-yuva444p10le        cbe30f44b63cf7ed27fc2dde40315b5e
-yuva444p16be        7e9b799b057e1446dabbf0f738480cfb
-yuva444p16le        556d58b91a617fe4a83af99a4aea1c2e
-yuva444p9be         b5a31de4fac408eeecaf3aff11f40e55
-yuva444p9le         67467f1e1d9edbd59d3984ebbfe24be6
-yuvj420p            41fd02b204da0ab62452cd14b595e2e4
-yuvj422p            7f6ca9bc1812cde02036d7d29a7cce43
-yuvj440p            25711c3c0fd15ec19c59a10784fcfb96
-yuvj444p            e45dee2ac02276dfab92e8ebfbe52e00
-yuyv422             e944ff7316cd03c42c091717ce74f602

libav-v9.6.tar.bz2/tests/ref/seek/vsynth2-snow Deleted

@@ -1,46 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  3035
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  3035
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  39714 size:  3640
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  27434 size:  3494
-ret:-1         st: 0 flags:1  ts:-0.320000
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  39714 size:  3640
-ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  16124 size:  3244
-ret:-1         st: 0 flags:1  ts:-0.760000
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  27434 size:  3494
-ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  3035
-ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:  52604 size:  3582
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:  52604 size:  3582
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  16124 size:  3244
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  3035
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:  52604 size:  3582
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  39714 size:  3640
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  3035
-ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:  3035
-ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:  52604 size:  3582
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  27434 size:  3494
-ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  39714 size:  3640
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  16124 size:  3244
-ret:-1         st:-1 flags:1  ts:-0.645825

libav-v9.6.tar.bz2/tests/ref/seek/vsynth2-snow-ll Deleted

@@ -1,46 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 72476
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 72476
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:1902788 size: 78837
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1239090 size: 74994
-ret:-1         st: 0 flags:1  ts:-0.320000
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:1902788 size: 78837
-ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 605628 size: 71059
-ret:-1         st: 0 flags:1  ts:-0.760000
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1239090 size: 74994
-ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 72476
-ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:2585614 size: 79731
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:2585614 size: 79731
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 605628 size: 71059
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 72476
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:2585614 size: 79731
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:1902788 size: 78837
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 72476
-ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 72476
-ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:2585614 size: 79731
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1239090 size: 74994
-ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:1902788 size: 78837
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 605628 size: 71059
-ret:-1         st:-1 flags:1  ts:-0.645825

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth1-snow Deleted

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth1-snow-hpel Deleted

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth1-snow-ll Deleted

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth2-snow Deleted

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth2-snow-hpel Deleted

libav-v9.6.tar.bz2/tests/ref/vsynth/vsynth2-snow-ll Deleted

libbluray-0.2.3.tar.bz2/src/examples/Makefile.am Deleted

@@ -1,89 +0,0 @@
-SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200809L -D_REENTRANT
-SET_WARNINGS = @SET_WARNINGS@
-SET_OPTIMIZATIONS = @SET_OPTIMIZATIONS@
-SET_DEBUG_OPTS = @SET_DEBUG_OPTS@
-SET_INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/file -I$(top_srcdir)/src/libbluray/bdnav
-
-AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_WARNINGS) $(SET_OPTIMIZATIONS) \
-	$(SET_DEBUG_OPTS) $(SET_INCLUDES)
-CFLAGS=$(shell test -z "$$CFLAGS" || echo "$$CFLAGS")
-
-if USING_EXAMPLES
-
-noinst_PROGRAMS=bdsplice mpls_dump clpi_dump index_dump mobj_dump sound_dump \
-    libbluray_test list_titles hdmv_test
-bin_PROGRAMS=bd_info
-
-BLURAY_LIB = $(top_builddir)/src/libbluray.la
-
-if USING_BDJAVA
-  AM_CFLAGS += @BDJAVA_CFLAGS@
-endif
-
-bdsplice_SOURCES = \
-	bdsplice.c
-
-bdsplice_LDADD = $(BLURAY_LIB)
-
-mpls_dump_SOURCES = \
-	mpls_dump.c util.c util.h \
-	../util/strutl.c \
-	../util/logging.c \
-	../file/file_posix.c \
-	../file/dir_posix.c \
-	../libbluray/bdnav/mpls_parse.c \
-	../libbluray/bdnav/clpi_parse.c \
-	../libbluray/bdnav/navigation.c
-
-clpi_dump_SOURCES = \
-	clpi_dump.c util.c util.h \
-	../util/logging.c \
-	../file/file_posix.c \
-	../libbluray/bdnav/clpi_parse.c
-
-sound_dump_SOURCES = \
-	sound_dump.c \
-	../util/logging.c \
-	../file/file_posix.c \
-	../libbluray/bdnav/sound_parse.c
-
-index_dump_SOURCES = \
-	index_dump.c \
-	../util/logging.c \
-	../file/file_posix.c \
-	../libbluray/bdnav/index_parse.c
-
-mobj_dump_SOURCES = \
-	mobj_dump.c \
-	../util/logging.c \
-	../file/file_posix.c \
-	../libbluray/hdmv/mobj_parse.c \
-	../libbluray/hdmv/mobj_print.c
-
-libbluray_test_SOURCES = \
-	libbluray_test.c ../util/logging.c
-
-libbluray_test_LDADD = $(BLURAY_LIB)
-
-hdmv_test_SOURCES = \
-	hdmv_test.c
-
-hdmv_test_LDADD = $(BLURAY_LIB)
-
-list_titles_SOURCES = \
-	list_titles.c ../util/logging.c
-
-list_titles_LDADD = $(BLURAY_LIB)
-
-bd_info_SOURCES = \
-	bd_info.c
-
-bd_info_LDADD = $(BLURAY_LIB)
-
-if USING_BDJAVA
-noinst_PROGRAMS+= bdj_test
-bdj_test_SOURCES = bdj_test.c
-bdj_test_LDADD = $(BLURAY_LIB)
-endif
-
-endif

libbluray-0.2.3.tar.bz2/src/examples/Makefile.in Deleted

@@ -1,924 +0,0 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-@USING_EXAMPLES_TRUE@noinst_PROGRAMS = bdsplice$(EXEEXT) \
-@USING_EXAMPLES_TRUE@	mpls_dump$(EXEEXT) clpi_dump$(EXEEXT) \
-@USING_EXAMPLES_TRUE@	index_dump$(EXEEXT) mobj_dump$(EXEEXT) \
-@USING_EXAMPLES_TRUE@	sound_dump$(EXEEXT) \
-@USING_EXAMPLES_TRUE@	libbluray_test$(EXEEXT) \
-@USING_EXAMPLES_TRUE@	list_titles$(EXEEXT) hdmv_test$(EXEEXT) \
-@USING_EXAMPLES_TRUE@	$(am__EXEEXT_1)
-@USING_EXAMPLES_TRUE@bin_PROGRAMS = bd_info$(EXEEXT)
-@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@am__append_1 = @BDJAVA_CFLAGS@
-@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@am__append_2 = bdj_test
-subdir = src/examples
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_doxygen.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@am__EXEEXT_1 = \
-@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@	bdj_test$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-am__bd_info_SOURCES_DIST = bd_info.c
-@USING_EXAMPLES_TRUE@am_bd_info_OBJECTS = bd_info.$(OBJEXT)
-bd_info_OBJECTS = $(am_bd_info_OBJECTS)
-@USING_EXAMPLES_TRUE@bd_info_DEPENDENCIES = $(BLURAY_LIB)
-am__bdj_test_SOURCES_DIST = bdj_test.c
-@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@am_bdj_test_OBJECTS = \
-@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@	bdj_test.$(OBJEXT)
-bdj_test_OBJECTS = $(am_bdj_test_OBJECTS)
-@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@bdj_test_DEPENDENCIES = \
-@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@	$(BLURAY_LIB)
-am__bdsplice_SOURCES_DIST = bdsplice.c
-@USING_EXAMPLES_TRUE@am_bdsplice_OBJECTS = bdsplice.$(OBJEXT)
-bdsplice_OBJECTS = $(am_bdsplice_OBJECTS)
-@USING_EXAMPLES_TRUE@bdsplice_DEPENDENCIES = $(BLURAY_LIB)
-am__clpi_dump_SOURCES_DIST = clpi_dump.c util.c util.h \
-	../util/logging.c ../file/file_posix.c \
-	../libbluray/bdnav/clpi_parse.c
-@USING_EXAMPLES_TRUE@am_clpi_dump_OBJECTS = clpi_dump.$(OBJEXT) \
-@USING_EXAMPLES_TRUE@	util.$(OBJEXT) logging.$(OBJEXT) \
-@USING_EXAMPLES_TRUE@	file_posix.$(OBJEXT) clpi_parse.$(OBJEXT)
-clpi_dump_OBJECTS = $(am_clpi_dump_OBJECTS)
-clpi_dump_LDADD = $(LDADD)
-am__hdmv_test_SOURCES_DIST = hdmv_test.c
-@USING_EXAMPLES_TRUE@am_hdmv_test_OBJECTS = hdmv_test.$(OBJEXT)
-hdmv_test_OBJECTS = $(am_hdmv_test_OBJECTS)
-@USING_EXAMPLES_TRUE@hdmv_test_DEPENDENCIES = $(BLURAY_LIB)
-am__index_dump_SOURCES_DIST = index_dump.c ../util/logging.c \
-	../file/file_posix.c ../libbluray/bdnav/index_parse.c
-@USING_EXAMPLES_TRUE@am_index_dump_OBJECTS = index_dump.$(OBJEXT) \
-@USING_EXAMPLES_TRUE@	logging.$(OBJEXT) file_posix.$(OBJEXT) \
-@USING_EXAMPLES_TRUE@	index_parse.$(OBJEXT)
-index_dump_OBJECTS = $(am_index_dump_OBJECTS)
-index_dump_LDADD = $(LDADD)
-am__libbluray_test_SOURCES_DIST = libbluray_test.c ../util/logging.c
-@USING_EXAMPLES_TRUE@am_libbluray_test_OBJECTS = \
-@USING_EXAMPLES_TRUE@	libbluray_test.$(OBJEXT) \
-@USING_EXAMPLES_TRUE@	logging.$(OBJEXT)
-libbluray_test_OBJECTS = $(am_libbluray_test_OBJECTS)
-@USING_EXAMPLES_TRUE@libbluray_test_DEPENDENCIES = $(BLURAY_LIB)
-am__list_titles_SOURCES_DIST = list_titles.c ../util/logging.c
-@USING_EXAMPLES_TRUE@am_list_titles_OBJECTS = list_titles.$(OBJEXT) \
-@USING_EXAMPLES_TRUE@	logging.$(OBJEXT)
-list_titles_OBJECTS = $(am_list_titles_OBJECTS)
-@USING_EXAMPLES_TRUE@list_titles_DEPENDENCIES = $(BLURAY_LIB)
-am__mobj_dump_SOURCES_DIST = mobj_dump.c ../util/logging.c \
-	../file/file_posix.c ../libbluray/hdmv/mobj_parse.c \
-	../libbluray/hdmv/mobj_print.c
-@USING_EXAMPLES_TRUE@am_mobj_dump_OBJECTS = mobj_dump.$(OBJEXT) \
-@USING_EXAMPLES_TRUE@	logging.$(OBJEXT) file_posix.$(OBJEXT) \
-@USING_EXAMPLES_TRUE@	mobj_parse.$(OBJEXT) mobj_print.$(OBJEXT)
-mobj_dump_OBJECTS = $(am_mobj_dump_OBJECTS)
-mobj_dump_LDADD = $(LDADD)
-am__mpls_dump_SOURCES_DIST = mpls_dump.c util.c util.h \
-	../util/strutl.c ../util/logging.c ../file/file_posix.c \
-	../file/dir_posix.c ../libbluray/bdnav/mpls_parse.c \
-	../libbluray/bdnav/clpi_parse.c \
-	../libbluray/bdnav/navigation.c
-@USING_EXAMPLES_TRUE@am_mpls_dump_OBJECTS = mpls_dump.$(OBJEXT) \
-@USING_EXAMPLES_TRUE@	util.$(OBJEXT) strutl.$(OBJEXT) \
-@USING_EXAMPLES_TRUE@	logging.$(OBJEXT) file_posix.$(OBJEXT) \
-@USING_EXAMPLES_TRUE@	dir_posix.$(OBJEXT) mpls_parse.$(OBJEXT) \
-@USING_EXAMPLES_TRUE@	clpi_parse.$(OBJEXT) navigation.$(OBJEXT)
-mpls_dump_OBJECTS = $(am_mpls_dump_OBJECTS)
-mpls_dump_LDADD = $(LDADD)
-am__sound_dump_SOURCES_DIST = sound_dump.c ../util/logging.c \
-	../file/file_posix.c ../libbluray/bdnav/sound_parse.c
-@USING_EXAMPLES_TRUE@am_sound_dump_OBJECTS = sound_dump.$(OBJEXT) \
-@USING_EXAMPLES_TRUE@	logging.$(OBJEXT) file_posix.$(OBJEXT) \
-@USING_EXAMPLES_TRUE@	sound_parse.$(OBJEXT)
-sound_dump_OBJECTS = $(am_sound_dump_OBJECTS)
-sound_dump_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(bd_info_SOURCES) $(bdj_test_SOURCES) $(bdsplice_SOURCES) \
-	$(clpi_dump_SOURCES) $(hdmv_test_SOURCES) \
-	$(index_dump_SOURCES) $(libbluray_test_SOURCES) \
-	$(list_titles_SOURCES) $(mobj_dump_SOURCES) \
-	$(mpls_dump_SOURCES) $(sound_dump_SOURCES)
-DIST_SOURCES = $(am__bd_info_SOURCES_DIST) \
-	$(am__bdj_test_SOURCES_DIST) $(am__bdsplice_SOURCES_DIST) \
-	$(am__clpi_dump_SOURCES_DIST) $(am__hdmv_test_SOURCES_DIST) \
-	$(am__index_dump_SOURCES_DIST) \
-	$(am__libbluray_test_SOURCES_DIST) \
-	$(am__list_titles_SOURCES_DIST) $(am__mobj_dump_SOURCES_DIST) \
-	$(am__mpls_dump_SOURCES_DIST) $(am__sound_dump_SOURCES_DIST)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BDJAVA_CFLAGS = @BDJAVA_CFLAGS@
-BLURAY_VERSION_MAJOR = @BLURAY_VERSION_MAJOR@
-BLURAY_VERSION_MICRO = @BLURAY_VERSION_MICRO@
-BLURAY_VERSION_MINOR = @BLURAY_VERSION_MINOR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = $(shell test -z "$$CFLAGS" || echo "$$CFLAGS")
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOPEN_LIBS = @DLOPEN_LIBS@
-DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-DX_CONFIG = @DX_CONFIG@
-DX_DOCDIR = @DX_DOCDIR@
-DX_DOT = @DX_DOT@
-DX_DOXYGEN = @DX_DOXYGEN@
-DX_DVIPS = @DX_DVIPS@
-DX_EGREP = @DX_EGREP@
-DX_ENV = @DX_ENV@
-DX_FLAG_chi = @DX_FLAG_chi@
-DX_FLAG_chm = @DX_FLAG_chm@
-DX_FLAG_doc = @DX_FLAG_doc@
-DX_FLAG_dot = @DX_FLAG_dot@
-DX_FLAG_html = @DX_FLAG_html@
-DX_FLAG_man = @DX_FLAG_man@
-DX_FLAG_pdf = @DX_FLAG_pdf@
-DX_FLAG_ps = @DX_FLAG_ps@
-DX_FLAG_rtf = @DX_FLAG_rtf@
-DX_FLAG_xml = @DX_FLAG_xml@
-DX_HHC = @DX_HHC@
-DX_LATEX = @DX_LATEX@
-DX_MAKEINDEX = @DX_MAKEINDEX@
-DX_PDFLATEX = @DX_PDFLATEX@
-DX_PERL = @DX_PERL@
-DX_PROJECT = @DX_PROJECT@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
-LIBXML2_LIBS = @LIBXML2_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_VERSION_INFO = @LT_VERSION_INFO@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_DEBUG_OPTS = @SET_DEBUG_OPTS@
-SET_MAKE = @SET_MAKE@
-SET_OPTIMIZATIONS = @SET_OPTIMIZATIONS@
-SET_WARNINGS = @SET_WARNINGS@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200809L -D_REENTRANT
-SET_INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/file -I$(top_srcdir)/src/libbluray/bdnav
-AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_WARNINGS) \
-	$(SET_OPTIMIZATIONS) $(SET_DEBUG_OPTS) $(SET_INCLUDES) \
-	$(am__append_1)
-@USING_EXAMPLES_TRUE@BLURAY_LIB = $(top_builddir)/src/libbluray.la
-@USING_EXAMPLES_TRUE@bdsplice_SOURCES = \
-@USING_EXAMPLES_TRUE@	bdsplice.c
-
-@USING_EXAMPLES_TRUE@bdsplice_LDADD = $(BLURAY_LIB)
-@USING_EXAMPLES_TRUE@mpls_dump_SOURCES = \
-@USING_EXAMPLES_TRUE@	mpls_dump.c util.c util.h \
-@USING_EXAMPLES_TRUE@	../util/strutl.c \
-@USING_EXAMPLES_TRUE@	../util/logging.c \
-@USING_EXAMPLES_TRUE@	../file/file_posix.c \
-@USING_EXAMPLES_TRUE@	../file/dir_posix.c \
-@USING_EXAMPLES_TRUE@	../libbluray/bdnav/mpls_parse.c \
-@USING_EXAMPLES_TRUE@	../libbluray/bdnav/clpi_parse.c \
-@USING_EXAMPLES_TRUE@	../libbluray/bdnav/navigation.c
-
-@USING_EXAMPLES_TRUE@clpi_dump_SOURCES = \
-@USING_EXAMPLES_TRUE@	clpi_dump.c util.c util.h \
-@USING_EXAMPLES_TRUE@	../util/logging.c \
-@USING_EXAMPLES_TRUE@	../file/file_posix.c \
-@USING_EXAMPLES_TRUE@	../libbluray/bdnav/clpi_parse.c
-
-@USING_EXAMPLES_TRUE@sound_dump_SOURCES = \
-@USING_EXAMPLES_TRUE@	sound_dump.c \
-@USING_EXAMPLES_TRUE@	../util/logging.c \
-@USING_EXAMPLES_TRUE@	../file/file_posix.c \
-@USING_EXAMPLES_TRUE@	../libbluray/bdnav/sound_parse.c
-
-@USING_EXAMPLES_TRUE@index_dump_SOURCES = \
-@USING_EXAMPLES_TRUE@	index_dump.c \
-@USING_EXAMPLES_TRUE@	../util/logging.c \
-@USING_EXAMPLES_TRUE@	../file/file_posix.c \
-@USING_EXAMPLES_TRUE@	../libbluray/bdnav/index_parse.c
-
-@USING_EXAMPLES_TRUE@mobj_dump_SOURCES = \
-@USING_EXAMPLES_TRUE@	mobj_dump.c \
-@USING_EXAMPLES_TRUE@	../util/logging.c \
-@USING_EXAMPLES_TRUE@	../file/file_posix.c \
-@USING_EXAMPLES_TRUE@	../libbluray/hdmv/mobj_parse.c \
-@USING_EXAMPLES_TRUE@	../libbluray/hdmv/mobj_print.c
-
-@USING_EXAMPLES_TRUE@libbluray_test_SOURCES = \
-@USING_EXAMPLES_TRUE@	libbluray_test.c ../util/logging.c
-
-@USING_EXAMPLES_TRUE@libbluray_test_LDADD = $(BLURAY_LIB)
-@USING_EXAMPLES_TRUE@hdmv_test_SOURCES = \
-@USING_EXAMPLES_TRUE@	hdmv_test.c
-
-@USING_EXAMPLES_TRUE@hdmv_test_LDADD = $(BLURAY_LIB)
-@USING_EXAMPLES_TRUE@list_titles_SOURCES = \
-@USING_EXAMPLES_TRUE@	list_titles.c ../util/logging.c
-
-@USING_EXAMPLES_TRUE@list_titles_LDADD = $(BLURAY_LIB)
-@USING_EXAMPLES_TRUE@bd_info_SOURCES = \
-@USING_EXAMPLES_TRUE@	bd_info.c
-
-@USING_EXAMPLES_TRUE@bd_info_LDADD = $(BLURAY_LIB)
-@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@bdj_test_SOURCES = bdj_test.c
-@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@bdj_test_LDADD = $(BLURAY_LIB)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-	@for dep in $?; do \
-	 case '$(am__configure_deps)' in \
-	 *$$dep*) \
-	 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	 && { if test -f $@; then exit 0; else break; fi; }; \
-	 exit 1;; \
-	 esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/examples/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	 $(AUTOMAKE) --foreign src/examples/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	 *config.status*) \
-	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	 then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	 { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	 if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	 else { print "f", $$3 "/" $$4, $$1; } } \
-	 END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	 test -z "$$files" || { \
-	 echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	 $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	 } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	 -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-bd_info$(EXEEXT): $(bd_info_OBJECTS) $(bd_info_DEPENDENCIES) $(EXTRA_bd_info_DEPENDENCIES) 
-	@rm -f bd_info$(EXEEXT)
-	$(LINK) $(bd_info_OBJECTS) $(bd_info_LDADD) $(LIBS)
-bdj_test$(EXEEXT): $(bdj_test_OBJECTS) $(bdj_test_DEPENDENCIES) $(EXTRA_bdj_test_DEPENDENCIES) 
-	@rm -f bdj_test$(EXEEXT)
-	$(LINK) $(bdj_test_OBJECTS) $(bdj_test_LDADD) $(LIBS)
-bdsplice$(EXEEXT): $(bdsplice_OBJECTS) $(bdsplice_DEPENDENCIES) $(EXTRA_bdsplice_DEPENDENCIES) 
-	@rm -f bdsplice$(EXEEXT)
-	$(LINK) $(bdsplice_OBJECTS) $(bdsplice_LDADD) $(LIBS)
-clpi_dump$(EXEEXT): $(clpi_dump_OBJECTS) $(clpi_dump_DEPENDENCIES) $(EXTRA_clpi_dump_DEPENDENCIES) 
-	@rm -f clpi_dump$(EXEEXT)
-	$(LINK) $(clpi_dump_OBJECTS) $(clpi_dump_LDADD) $(LIBS)
-hdmv_test$(EXEEXT): $(hdmv_test_OBJECTS) $(hdmv_test_DEPENDENCIES) $(EXTRA_hdmv_test_DEPENDENCIES) 
-	@rm -f hdmv_test$(EXEEXT)
-	$(LINK) $(hdmv_test_OBJECTS) $(hdmv_test_LDADD) $(LIBS)
-index_dump$(EXEEXT): $(index_dump_OBJECTS) $(index_dump_DEPENDENCIES) $(EXTRA_index_dump_DEPENDENCIES) 
-	@rm -f index_dump$(EXEEXT)
-	$(LINK) $(index_dump_OBJECTS) $(index_dump_LDADD) $(LIBS)
-libbluray_test$(EXEEXT): $(libbluray_test_OBJECTS) $(libbluray_test_DEPENDENCIES) $(EXTRA_libbluray_test_DEPENDENCIES) 
-	@rm -f libbluray_test$(EXEEXT)
-	$(LINK) $(libbluray_test_OBJECTS) $(libbluray_test_LDADD) $(LIBS)
-list_titles$(EXEEXT): $(list_titles_OBJECTS) $(list_titles_DEPENDENCIES) $(EXTRA_list_titles_DEPENDENCIES) 
-	@rm -f list_titles$(EXEEXT)
-	$(LINK) $(list_titles_OBJECTS) $(list_titles_LDADD) $(LIBS)
-mobj_dump$(EXEEXT): $(mobj_dump_OBJECTS) $(mobj_dump_DEPENDENCIES) $(EXTRA_mobj_dump_DEPENDENCIES) 
-	@rm -f mobj_dump$(EXEEXT)
-	$(LINK) $(mobj_dump_OBJECTS) $(mobj_dump_LDADD) $(LIBS)
-mpls_dump$(EXEEXT): $(mpls_dump_OBJECTS) $(mpls_dump_DEPENDENCIES) $(EXTRA_mpls_dump_DEPENDENCIES) 
-	@rm -f mpls_dump$(EXEEXT)
-	$(LINK) $(mpls_dump_OBJECTS) $(mpls_dump_LDADD) $(LIBS)
-sound_dump$(EXEEXT): $(sound_dump_OBJECTS) $(sound_dump_DEPENDENCIES) $(EXTRA_sound_dump_DEPENDENCIES) 
-	@rm -f sound_dump$(EXEEXT)
-	$(LINK) $(sound_dump_OBJECTS) $(sound_dump_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bd_info.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bdj_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bdsplice.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clpi_dump.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clpi_parse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir_posix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_posix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdmv_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/index_dump.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/index_parse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbluray_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list_titles.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logging.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mobj_dump.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mobj_parse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mobj_print.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpls_dump.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpls_parse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/navigation.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_dump.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_parse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strutl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-logging.o: ../util/logging.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT logging.o -MD -MP -MF $(DEPDIR)/logging.Tpo -c -o logging.o `test -f '../util/logging.c' || echo '$(srcdir)/'`../util/logging.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/logging.Tpo $(DEPDIR)/logging.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../util/logging.c' object='logging.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o logging.o `test -f '../util/logging.c' || echo '$(srcdir)/'`../util/logging.c
-
-logging.obj: ../util/logging.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT logging.obj -MD -MP -MF $(DEPDIR)/logging.Tpo -c -o logging.obj `if test -f '../util/logging.c'; then $(CYGPATH_W) '../util/logging.c'; else $(CYGPATH_W) '$(srcdir)/../util/logging.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/logging.Tpo $(DEPDIR)/logging.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../util/logging.c' object='logging.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o logging.obj `if test -f '../util/logging.c'; then $(CYGPATH_W) '../util/logging.c'; else $(CYGPATH_W) '$(srcdir)/../util/logging.c'; fi`
-
-file_posix.o: ../file/file_posix.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT file_posix.o -MD -MP -MF $(DEPDIR)/file_posix.Tpo -c -o file_posix.o `test -f '../file/file_posix.c' || echo '$(srcdir)/'`../file/file_posix.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_posix.Tpo $(DEPDIR)/file_posix.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../file/file_posix.c' object='file_posix.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o file_posix.o `test -f '../file/file_posix.c' || echo '$(srcdir)/'`../file/file_posix.c
-
-file_posix.obj: ../file/file_posix.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT file_posix.obj -MD -MP -MF $(DEPDIR)/file_posix.Tpo -c -o file_posix.obj `if test -f '../file/file_posix.c'; then $(CYGPATH_W) '../file/file_posix.c'; else $(CYGPATH_W) '$(srcdir)/../file/file_posix.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_posix.Tpo $(DEPDIR)/file_posix.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../file/file_posix.c' object='file_posix.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o file_posix.obj `if test -f '../file/file_posix.c'; then $(CYGPATH_W) '../file/file_posix.c'; else $(CYGPATH_W) '$(srcdir)/../file/file_posix.c'; fi`
-
-clpi_parse.o: ../libbluray/bdnav/clpi_parse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clpi_parse.o -MD -MP -MF $(DEPDIR)/clpi_parse.Tpo -c -o clpi_parse.o `test -f '../libbluray/bdnav/clpi_parse.c' || echo '$(srcdir)/'`../libbluray/bdnav/clpi_parse.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/clpi_parse.Tpo $(DEPDIR)/clpi_parse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/clpi_parse.c' object='clpi_parse.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clpi_parse.o `test -f '../libbluray/bdnav/clpi_parse.c' || echo '$(srcdir)/'`../libbluray/bdnav/clpi_parse.c
-
-clpi_parse.obj: ../libbluray/bdnav/clpi_parse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clpi_parse.obj -MD -MP -MF $(DEPDIR)/clpi_parse.Tpo -c -o clpi_parse.obj `if test -f '../libbluray/bdnav/clpi_parse.c'; then $(CYGPATH_W) '../libbluray/bdnav/clpi_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/clpi_parse.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/clpi_parse.Tpo $(DEPDIR)/clpi_parse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/clpi_parse.c' object='clpi_parse.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clpi_parse.obj `if test -f '../libbluray/bdnav/clpi_parse.c'; then $(CYGPATH_W) '../libbluray/bdnav/clpi_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/clpi_parse.c'; fi`
-
-index_parse.o: ../libbluray/bdnav/index_parse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT index_parse.o -MD -MP -MF $(DEPDIR)/index_parse.Tpo -c -o index_parse.o `test -f '../libbluray/bdnav/index_parse.c' || echo '$(srcdir)/'`../libbluray/bdnav/index_parse.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/index_parse.Tpo $(DEPDIR)/index_parse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/index_parse.c' object='index_parse.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o index_parse.o `test -f '../libbluray/bdnav/index_parse.c' || echo '$(srcdir)/'`../libbluray/bdnav/index_parse.c
-
-index_parse.obj: ../libbluray/bdnav/index_parse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT index_parse.obj -MD -MP -MF $(DEPDIR)/index_parse.Tpo -c -o index_parse.obj `if test -f '../libbluray/bdnav/index_parse.c'; then $(CYGPATH_W) '../libbluray/bdnav/index_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/index_parse.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/index_parse.Tpo $(DEPDIR)/index_parse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/index_parse.c' object='index_parse.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o index_parse.obj `if test -f '../libbluray/bdnav/index_parse.c'; then $(CYGPATH_W) '../libbluray/bdnav/index_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/index_parse.c'; fi`
-
-mobj_parse.o: ../libbluray/hdmv/mobj_parse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mobj_parse.o -MD -MP -MF $(DEPDIR)/mobj_parse.Tpo -c -o mobj_parse.o `test -f '../libbluray/hdmv/mobj_parse.c' || echo '$(srcdir)/'`../libbluray/hdmv/mobj_parse.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mobj_parse.Tpo $(DEPDIR)/mobj_parse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/hdmv/mobj_parse.c' object='mobj_parse.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mobj_parse.o `test -f '../libbluray/hdmv/mobj_parse.c' || echo '$(srcdir)/'`../libbluray/hdmv/mobj_parse.c
-
-mobj_parse.obj: ../libbluray/hdmv/mobj_parse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mobj_parse.obj -MD -MP -MF $(DEPDIR)/mobj_parse.Tpo -c -o mobj_parse.obj `if test -f '../libbluray/hdmv/mobj_parse.c'; then $(CYGPATH_W) '../libbluray/hdmv/mobj_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/hdmv/mobj_parse.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mobj_parse.Tpo $(DEPDIR)/mobj_parse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/hdmv/mobj_parse.c' object='mobj_parse.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mobj_parse.obj `if test -f '../libbluray/hdmv/mobj_parse.c'; then $(CYGPATH_W) '../libbluray/hdmv/mobj_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/hdmv/mobj_parse.c'; fi`
-
-mobj_print.o: ../libbluray/hdmv/mobj_print.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mobj_print.o -MD -MP -MF $(DEPDIR)/mobj_print.Tpo -c -o mobj_print.o `test -f '../libbluray/hdmv/mobj_print.c' || echo '$(srcdir)/'`../libbluray/hdmv/mobj_print.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mobj_print.Tpo $(DEPDIR)/mobj_print.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/hdmv/mobj_print.c' object='mobj_print.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mobj_print.o `test -f '../libbluray/hdmv/mobj_print.c' || echo '$(srcdir)/'`../libbluray/hdmv/mobj_print.c
-
-mobj_print.obj: ../libbluray/hdmv/mobj_print.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mobj_print.obj -MD -MP -MF $(DEPDIR)/mobj_print.Tpo -c -o mobj_print.obj `if test -f '../libbluray/hdmv/mobj_print.c'; then $(CYGPATH_W) '../libbluray/hdmv/mobj_print.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/hdmv/mobj_print.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mobj_print.Tpo $(DEPDIR)/mobj_print.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/hdmv/mobj_print.c' object='mobj_print.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mobj_print.obj `if test -f '../libbluray/hdmv/mobj_print.c'; then $(CYGPATH_W) '../libbluray/hdmv/mobj_print.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/hdmv/mobj_print.c'; fi`
-
-strutl.o: ../util/strutl.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strutl.o -MD -MP -MF $(DEPDIR)/strutl.Tpo -c -o strutl.o `test -f '../util/strutl.c' || echo '$(srcdir)/'`../util/strutl.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/strutl.Tpo $(DEPDIR)/strutl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../util/strutl.c' object='strutl.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strutl.o `test -f '../util/strutl.c' || echo '$(srcdir)/'`../util/strutl.c
-
-strutl.obj: ../util/strutl.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strutl.obj -MD -MP -MF $(DEPDIR)/strutl.Tpo -c -o strutl.obj `if test -f '../util/strutl.c'; then $(CYGPATH_W) '../util/strutl.c'; else $(CYGPATH_W) '$(srcdir)/../util/strutl.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/strutl.Tpo $(DEPDIR)/strutl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../util/strutl.c' object='strutl.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strutl.obj `if test -f '../util/strutl.c'; then $(CYGPATH_W) '../util/strutl.c'; else $(CYGPATH_W) '$(srcdir)/../util/strutl.c'; fi`
-
-dir_posix.o: ../file/dir_posix.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dir_posix.o -MD -MP -MF $(DEPDIR)/dir_posix.Tpo -c -o dir_posix.o `test -f '../file/dir_posix.c' || echo '$(srcdir)/'`../file/dir_posix.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dir_posix.Tpo $(DEPDIR)/dir_posix.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../file/dir_posix.c' object='dir_posix.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dir_posix.o `test -f '../file/dir_posix.c' || echo '$(srcdir)/'`../file/dir_posix.c
-
-dir_posix.obj: ../file/dir_posix.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dir_posix.obj -MD -MP -MF $(DEPDIR)/dir_posix.Tpo -c -o dir_posix.obj `if test -f '../file/dir_posix.c'; then $(CYGPATH_W) '../file/dir_posix.c'; else $(CYGPATH_W) '$(srcdir)/../file/dir_posix.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dir_posix.Tpo $(DEPDIR)/dir_posix.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../file/dir_posix.c' object='dir_posix.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dir_posix.obj `if test -f '../file/dir_posix.c'; then $(CYGPATH_W) '../file/dir_posix.c'; else $(CYGPATH_W) '$(srcdir)/../file/dir_posix.c'; fi`
-
-mpls_parse.o: ../libbluray/bdnav/mpls_parse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpls_parse.o -MD -MP -MF $(DEPDIR)/mpls_parse.Tpo -c -o mpls_parse.o `test -f '../libbluray/bdnav/mpls_parse.c' || echo '$(srcdir)/'`../libbluray/bdnav/mpls_parse.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mpls_parse.Tpo $(DEPDIR)/mpls_parse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/mpls_parse.c' object='mpls_parse.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpls_parse.o `test -f '../libbluray/bdnav/mpls_parse.c' || echo '$(srcdir)/'`../libbluray/bdnav/mpls_parse.c
-
-mpls_parse.obj: ../libbluray/bdnav/mpls_parse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpls_parse.obj -MD -MP -MF $(DEPDIR)/mpls_parse.Tpo -c -o mpls_parse.obj `if test -f '../libbluray/bdnav/mpls_parse.c'; then $(CYGPATH_W) '../libbluray/bdnav/mpls_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/mpls_parse.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mpls_parse.Tpo $(DEPDIR)/mpls_parse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/mpls_parse.c' object='mpls_parse.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpls_parse.obj `if test -f '../libbluray/bdnav/mpls_parse.c'; then $(CYGPATH_W) '../libbluray/bdnav/mpls_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/mpls_parse.c'; fi`
-
-navigation.o: ../libbluray/bdnav/navigation.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT navigation.o -MD -MP -MF $(DEPDIR)/navigation.Tpo -c -o navigation.o `test -f '../libbluray/bdnav/navigation.c' || echo '$(srcdir)/'`../libbluray/bdnav/navigation.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/navigation.Tpo $(DEPDIR)/navigation.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/navigation.c' object='navigation.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o navigation.o `test -f '../libbluray/bdnav/navigation.c' || echo '$(srcdir)/'`../libbluray/bdnav/navigation.c
-
-navigation.obj: ../libbluray/bdnav/navigation.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT navigation.obj -MD -MP -MF $(DEPDIR)/navigation.Tpo -c -o navigation.obj `if test -f '../libbluray/bdnav/navigation.c'; then $(CYGPATH_W) '../libbluray/bdnav/navigation.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/navigation.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/navigation.Tpo $(DEPDIR)/navigation.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/navigation.c' object='navigation.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o navigation.obj `if test -f '../libbluray/bdnav/navigation.c'; then $(CYGPATH_W) '../libbluray/bdnav/navigation.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/navigation.c'; fi`
-
-sound_parse.o: ../libbluray/bdnav/sound_parse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sound_parse.o -MD -MP -MF $(DEPDIR)/sound_parse.Tpo -c -o sound_parse.o `test -f '../libbluray/bdnav/sound_parse.c' || echo '$(srcdir)/'`../libbluray/bdnav/sound_parse.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/sound_parse.Tpo $(DEPDIR)/sound_parse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/sound_parse.c' object='sound_parse.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sound_parse.o `test -f '../libbluray/bdnav/sound_parse.c' || echo '$(srcdir)/'`../libbluray/bdnav/sound_parse.c
-
-sound_parse.obj: ../libbluray/bdnav/sound_parse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sound_parse.obj -MD -MP -MF $(DEPDIR)/sound_parse.Tpo -c -o sound_parse.obj `if test -f '../libbluray/bdnav/sound_parse.c'; then $(CYGPATH_W) '../libbluray/bdnav/sound_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/sound_parse.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/sound_parse.Tpo $(DEPDIR)/sound_parse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../libbluray/bdnav/sound_parse.c' object='sound_parse.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sound_parse.obj `if test -f '../libbluray/bdnav/sound_parse.c'; then $(CYGPATH_W) '../libbluray/bdnav/sound_parse.c'; else $(CYGPATH_W) '$(srcdir)/../libbluray/bdnav/sound_parse.c'; fi`
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	 test -n "$$unique" || unique=$$empty_fix; \
-	 if test $$# -gt 0; then \
-	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	 "$$@" $$unique; \
-	 else \
-	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	 $$unique; \
-	 fi; \
-	fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	 $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	 && $(am__cd) $(top_srcdir) \
-	 && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	 dist_files=`for file in $$list; do echo $$file; done | \
-	 sed -e "s|^$$srcdirstrip/||;t" \
-	 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	 */*) $(MKDIR_P) `echo "$$dist_files" | \
-			 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			 sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	 if test -d $$d/$$file; then \
-	 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	 if test -d "$(distdir)/$$file"; then \
-	 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	 fi; \
-	 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	 cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	 fi; \
-	 cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	 else \
-	 test -f "$(distdir)/$$file" \
-	 || cp -p $$d/$$file "$(distdir)/$$file" \
-	 || exit 1; \
-	 fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 install; \
-	else \
-	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool \
-	clean-noinstPROGRAMS mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool clean-noinstPROGRAMS ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/ui/DVBGraphicsImpl.java Deleted

@@ -1,494 +0,0 @@
-package org.dvb.ui;
-
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
-import java.awt.Image;
-import java.awt.Paint;
-import java.awt.Polygon;
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
-import java.awt.Shape;
-import java.awt.Stroke;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-import java.awt.image.ImageObserver;
-import java.awt.image.RenderedImage;
-import java.awt.image.renderable.RenderableImage;
-import java.text.AttributedCharacterIterator;
-import java.util.Map;
-
-public class DVBGraphicsImpl extends DVBGraphics {
- protected DVBGraphicsImpl(Graphics2D gfx)
- {
- super(gfx);
- }
-
- /*
- * Graphics methods
- */
- public void clearRect(int x, int y, int width, int height)
- {
- gfx.clearRect(x, y, width, height);
- }
-
- public void clipRect(int x, int y, int width, int height)
- {
- gfx.clipRect(x, y, width, height);
- }
-
- public void copyArea(int x, int y, int width, int height, int dx, int dy)
- {
- gfx.copyArea(x, y, width, height, dx, dy);
- }
-
- public Graphics create()
- {
- return gfx.create();
- }
-
- public Graphics create(int x, int y, int width, int height)
- {
- return gfx.create(x, y, width, height);
- }
-
- public void dispose()
- {
- gfx.dispose();
- }
-
- public void draw3DRect(int x, int y, int width, int height, boolean raised)
- {
- gfx.draw3DRect(x, y, width, height, raised);
- }
-
- public void drawArc(int x, int y, int width, int height, int startAngle,
- int arcAngle)
- {
- gfx.drawArc(x, y, width, height, startAngle, arcAngle);
- }
-
- public void drawBytes(byte[] data, int offset, int length, int x, int y)
- {
- gfx.drawBytes(data, offset, length, x, y);
- }
-
- public void drawChars(char[] data, int offset, int length, int x, int y)
- {
- gfx.drawChars(data, offset, length, x, y);
- }
-
- public boolean drawImage(Image img, int x, int y, Color bgcolor,
- ImageObserver observer)
- {
- return gfx.drawImage(img, x, y, bgcolor, observer);
- }
-
- public boolean drawImage(Image img, int x, int y, ImageObserver observer)
- {
- return gfx.drawImage(img, x, y, observer);
- }
-
- public boolean drawImage(Image img, int x, int y, int width, int height,
- Color bgcolor, ImageObserver observer)
- {
- return gfx.drawImage(img, x, y, width, height, bgcolor, observer);
- }
-
- public boolean drawImage(Image img, int x, int y, int width, int height,
- ImageObserver observer)
- {
- return gfx.drawImage(img, x, y, width, height, observer);
- }
-
- public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2,
- int sx1, int sy1, int sx2, int sy2, Color bgcolor,
- ImageObserver observer)
- {
- return gfx.drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2,
- bgcolor, observer);
- }
-
- public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2,
- int sx1, int sy1, int sx2, int sy2, ImageObserver observer)
- {
- return gfx.drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2,
- observer);
- }
-
- public void drawLine(int x1, int y1, int x2, int y2)
- {
- gfx.drawLine(x1, y1, x2, y2);
- }
-
- public void drawOval(int x, int y, int width, int height)
- {
- gfx.drawOval(x, y, width, height);
- }
-
- public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints)
- {
- gfx.drawPolygon(xPoints, yPoints, nPoints);
- }
-
- public void drawPolygon(Polygon p)
- {
- gfx.drawPolygon(p);
- }
-
- public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints)
- {
- gfx.drawPolyline(xPoints, yPoints, nPoints);
- }
-
- public void drawRect(int x, int y, int width, int height)
- {
- gfx.drawRect(x, y, width, height);
- }
-
- public void drawRoundRect(int x, int y, int width, int height,
- int arcWidth, int arcHeight)
- {
- gfx.drawRoundRect(x, y, width, height, arcWidth, arcHeight);
- }
-
- public void drawString(AttributedCharacterIterator iterator, int x, int y)
- {
- gfx.drawString(iterator, x, y);
- }
-
- public void drawString(String str, int x, int y)
- {
- gfx.drawString(str, x, y);
- }
-
- public void fill3DRect(int x, int y, int width, int height, boolean raised)
- {
- gfx.fill3DRect(x, y, width, height, raised);
- }
-
- public void fillArc(int x, int y, int width, int height, int startAngle,
- int arcAngle)
- {
- gfx.fillArc(x, y, width, height, startAngle, arcAngle);
- }
-
- public void fillOval(int x, int y, int width, int height)
- {
- gfx.fillOval(x, y, width, height);
- }
-
- public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints)
- {
- gfx.fillPolygon(xPoints, yPoints, nPoints);
- }
-
- public void fillPolygon(Polygon p)
- {
- gfx.fillPolygon(p);
- }
-
- public void fillRect(int x, int y, int width, int height)
- {
- gfx.fillRect(x, y, width, height);
- }
-
- public void fillRoundRect(int x, int y, int width, int height,
- int arcWidth, int arcHeight)
- {
- gfx.fillRoundRect(x, y, width, height, arcWidth, arcHeight);
- }
-
- public void finalize()
- {
- gfx.finalize();
- }
-
- public Shape getClip()
- {
- return gfx.getClip();
- }
-
- public Rectangle getClipBounds()
- {
- return gfx.getClipBounds();
- }
-
- public Rectangle getClipBounds(Rectangle r)
- {
- return gfx.getClipBounds(r);
- }
-
- @Deprecated
- public Rectangle getClipRect()
- {
- return gfx.getClipRect();
- }
-
- public Color getColor()
- {
- return gfx.getColor();
- }
-
- public Font getFont()
- {
- return gfx.getFont();
- }
-
- public FontMetrics getFontMetrics()
- {
- return gfx.getFontMetrics();
- }
-
- public FontMetrics getFontMetrics(Font f)
- {
- return gfx.getFontMetrics(f);
- }
-
- public boolean hitClip(int x, int y, int width, int height)
- {
- return gfx.hitClip(x, y, width, height);
- }
-
- public void setClip(int x, int y, int width, int height)
- {
- gfx.setClip(x, y, width, height);
- }
-
- public void setClip(Shape clip)
- {
- gfx.setClip(clip);
- }
-
- public void setColor(Color c)
- {
- gfx.setColor(c);
- }
-
- public void setFont(Font font)
- {
- gfx.setFont(font);
- }
-
- public void setPaintMode()
- {
- gfx.setPaintMode();
- }
-
- public void setXORMode(Color c1)
- {
- gfx.setXORMode(c1);
- }
-
- public void translate(int x, int y)
- {
- gfx.translate(x, y);
- }
-
- /*
- * DVBGraphics methods
- */
- public int[] getAvailableCompositeRules()
- {
- int[] rules = { DVBAlphaComposite.CLEAR, DVBAlphaComposite.SRC,
- DVBAlphaComposite.SRC_OVER, DVBAlphaComposite.DST_OVER,
- DVBAlphaComposite.SRC_IN, DVBAlphaComposite.DST_IN,
- DVBAlphaComposite.SRC_OUT, DVBAlphaComposite.DST_OUT };
-
- return rules;
- }
-
- public DVBAlphaComposite getDVBComposite()
- {
- return alphaComposite;
- }
-
- public void setDVBComposite(DVBAlphaComposite comp)
- throws UnsupportedDrawingOperationException
- {
- this.alphaComposite = comp;
- }
-
- /*
- * Graphics2D methods
- */
- public void addRenderingHints(Map<?, ?> hints)
- {
- gfx.addRenderingHints(hints);
- }
-
- public void clip(Shape s)
- {
- gfx.clip(s);
- }
-
- public void draw(Shape s)
- {
- gfx.draw(s);
- }
-
- public void drawGlyphVector(GlyphVector g, float x, float y)
- {
- gfx.drawGlyphVector(g, x, y);
- }
-
- public void drawImage(BufferedImage img, BufferedImageOp op, int x, int y)
- {
- gfx.drawImage(img, op, x, y);
- }
-
- public boolean drawImage(Image img, AffineTransform xform, ImageObserver obs)
- {
- return gfx.drawImage(img, xform, obs);
- }
-
- public void drawRenderableImage(RenderableImage img, AffineTransform xform)
- {
- gfx.drawRenderableImage(img, xform);
- }
-
- public void drawRenderedImage(RenderedImage img, AffineTransform xform)
- {
- gfx.drawRenderedImage(img, xform);
- }
-
- public void drawString(AttributedCharacterIterator iterator, float x,
- float y)
- {
- gfx.drawString(iterator, x, y);
- }
-
- public void drawString(String str, float x, float y)
- {
- gfx.drawString(str, x, y);
- }
-
- public void fill(Shape s)
- {
- gfx.fill(s);
- }
-
- public Color getBackground()
- {
- return gfx.getBackground();
- }
-
- public Composite getComposite()
- {
- return gfx.getComposite();
- }
-
- public GraphicsConfiguration getDeviceConfiguration()
- {
- return gfx.getDeviceConfiguration();
- }
-
- public FontRenderContext getFontRenderContext()
- {
- return gfx.getFontRenderContext();
- }
-
- public Paint getPaint()
- {
- return gfx.getPaint();
- }
-
- public Object getRenderingHint(RenderingHints.Key hintKey)
- {
- return gfx.getRenderingHint(hintKey);
- }
-
- public RenderingHints getRenderingHints()
- {
- return gfx.getRenderingHints();
- }
-
- public Stroke getStroke()
- {
- return gfx.getStroke();
- }
-
- public AffineTransform getTransform()
- {
- return gfx.getTransform();
- }
-
- public boolean hit(Rectangle rect, Shape s, boolean onStroke)
- {
- return gfx.hit(rect, s, onStroke);
- }
-
- public void rotate(double theta)
- {
- gfx.rotate(theta);
- }
-
- public void rotate(double theta, double x, double y)
- {
- gfx.rotate(theta, x, y);
- }
-
- public void scale(double sx, double sy)
- {
- gfx.scale(sx, sy);
- }
-
- public void setBackground(Color color)
- {
- gfx.setBackground(color);
- }
-
- public void setComposite(Composite comp)
- {
- gfx.setComposite(comp);
- }
-
- public void setPaint(Paint paint)
- {
- gfx.setPaint(paint);
- }
-
- public void setRenderingHint(RenderingHints.Key hintKey, Object hintValue)
- {
- gfx.setRenderingHint(hintKey, hintValue);
- }
-
- public void setRenderingHints(Map<?, ?> hints)
- {
- gfx.setRenderingHints(hints);
- }
-
- public void setStroke(Stroke s)
- {
- gfx.setStroke(s);
- }
-
- public void setTransform(AffineTransform Tx)
- {
- gfx.setTransform(Tx);
- }
-
- public void shear(double shx, double shy)
- {
- gfx.shear(shx, shy);
- }
-
- public void transform(AffineTransform Tx)
- {
- gfx.transform(Tx);
- }
-
- public void translate(double tx, double ty)
- {
- gfx.translate(tx, ty);
- }
-
- private DVBAlphaComposite alphaComposite = DVBAlphaComposite.Clear;
-}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/ui/FontFactory.java Deleted

@@ -1,91 +0,0 @@
-/*
- * This file is part of libbluray
- * Copyright (C) 2010 William Hahne
- *
- * This library 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.
- *
- * This library 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 this library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-package org.dvb.ui;
-
-import java.awt.Font;
-import java.awt.FontFormatException;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import org.videolan.BDJException;
-import org.videolan.BDJUtil;
-import org.videolan.FontIndex;
-import org.videolan.FontIndexData;
-
-public class FontFactory {
- public FontFactory() throws FontFormatException, IOException
- {
- String path = BDJUtil.discRootToFilesystem("/BDMV/AUXDATA/dvb.fontindex");
- 
- try {
- fontIndex.parse(path);
- } catch (BDJException e) {
- throw new IOException();
- }
- 
- LinkedList<FontIndexData> fontIndexData = fontIndex.getFontIndexData();
- 
- fonts = new HashMap<String, Font>(fontIndexData.size());
- for (FontIndexData data : fontIndexData) {
- FileInputStream inStream = new FileInputStream(BDJUtil.discRootToFilesystem("/BDMV/AUXDATA/" + data.getFileName()));
- 
- Font font = Font.createFont(Font.TRUETYPE_FONT, inStream);
- font = font.deriveFont(data.getStyle(), data.getMaxSize());
- 
- fonts.put(data.getName(), font);
- }
- }
-
- public FontFactory(URL u) throws IOException, FontFormatException
- {
- FileInputStream inStream = new FileInputStream(u.getPath()); 
- 
- urlFont = Font.createFont(Font.TRUETYPE_FONT, inStream);
- }
-
- public Font createFont(String name, int style, int size)
- throws FontNotAvailableException, FontFormatException, IOException
- {
- logger.info("Creating font: " + name + " " + style + " " + size);
- 
- if (urlFont != null && name.equals(urlFont.getName()))
- {
- return urlFont.deriveFont(style, size);
- }
- 
- Font font = fonts.get(name);
- 
- if (font == null)
- throw new FontNotAvailableException();
- 
- return font.deriveFont(style, size);
- }
- 
- private FontIndex fontIndex = new FontIndex();
- private Font urlFont = null;
- private Map<String, Font> fonts = null;
- 
- private static final Logger logger = Logger.getLogger(FontFactory.class.getName());
-}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/BDJInputListener.java Deleted

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/BasicXletContext.java Deleted

@@ -1,73 +0,0 @@
-/*
- * This file is part of libbluray
- * Copyright (C) 2010 William Hahne
- *
- * This library 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.
- *
- * This library 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 this library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-package org.videolan;
-
-import java.util.logging.Logger;
-
-import javax.tv.xlet.XletContext;
-
-import org.videolan.bdjo.AppEntry;
-
-public class BasicXletContext implements XletContext {
- 
- protected BasicXletContext(AppEntry info)
- {
- this.info = info;
- }
- 
- public void notifyDestroyed()
- {
- logger.info("Xlet " + info.getOrgId() + "/" + info.getAppId() + " has entered destroyed state.");
- state = XletState.DESTROYED;
- }
-
- public void notifyPaused()
- {
- logger.info("Xlet " + info.getOrgId() + "/" + info.getAppId() + " has entered paused state.");
- state = XletState.PAUSED;
- }
-
- public Object getXletProperty(String key)
- {
- if (key.equals(ARGS))
- return info.getParams();
- else if (key.equals("dvb.org.id"))
- return info.getOrgId();
- else if (key.equals("dvb.app.id"))
- return info.getAppId();
- else {
- logger.warning("Unknown property requested: " + key);
- return null;
- }
- }
-
- public void resumeRequest()
- {
- logger.info("Xlet " + info.getOrgId() + "/" + info.getAppId() + " has requested to be resumed.");
- }
- 
- public XletState getState()
- {
- return state;
- }
- 
- private AppEntry info;
- private XletState state = XletState.ACTIVE;
- private static Logger logger = Logger.getLogger(BasicXletContext.class.getName());
-}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/TIChapter.java Deleted

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/XletState.java Deleted

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/AppBinding.java Deleted

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/AppCacheType.java Deleted

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/AppName.java Deleted

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/AppType.java Deleted

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/AppVisibility.java Deleted

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/ControlCode.java Deleted

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/AWTVideoSizeControlImpl.java Deleted

@@ -1,73 +0,0 @@
-/*
- * This file is part of libbluray
- * Copyright (C) 2010 William Hahne
- *
- * This library 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.
- *
- * This library 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 this library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-package org.videolan.media.content.playlist;
-
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Rectangle;
-
-import javax.tv.media.AWTVideoSize;
-import javax.tv.media.AWTVideoSizeControl;
-
-import org.videolan.BDJLoader;
-import org.videolan.bdjo.GraphicsResolution;
-
-public class AWTVideoSizeControlImpl implements AWTVideoSizeControl {
- protected AWTVideoSizeControlImpl(Handler player)
- {
- this.player = player;
- }
- 
- public Component getControlComponent()
- {
- return null;
- }
-
- public AWTVideoSize getSize()
- {
- return getDefaultSize(); // FIXME: return actual video size instead of just default
- }
-
- public AWTVideoSize getDefaultSize()
- {
- GraphicsResolution res = BDJLoader.getBdjo().getTerminalInfo().getResolution();
- Rectangle rect = new Rectangle(res.getWidth(), res.getHeight());
- return new AWTVideoSize(rect, rect);
- }
-
- public Dimension getSourceVideoSize()
- {
- GraphicsResolution res = BDJLoader.getBdjo().getTerminalInfo().getResolution();
- return new Dimension(res.getWidth(), res.getHeight());
- }
-
- public boolean setSize(AWTVideoSize size)
- {
- return false; // FIXME: possibly allow changing of video size in the future?
- }
-
- @Override
- public AWTVideoSize checkSize(AWTVideoSize size)
- {
- return getDefaultSize(); // FIXME: allow sizes other than default
- }
-
- Handler player;
-}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/AsynchronousPiPControlImpl.java Deleted

@@ -1,180 +0,0 @@
-/*
- * This file is part of libbluray
- * Copyright (C) 2010 William Hahne
- *
- * This library 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.
- *
- * This library 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 this library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-package org.videolan.media.content.playlist;
-
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Rectangle;
-
-import javax.media.Time;
-
-import org.bluray.media.AsynchronousPiPControl;
-import org.bluray.media.PiPStatusListener;
-import org.bluray.media.StreamNotAvailableException;
-import org.havi.ui.HScreenRectangle;
-
-public class AsynchronousPiPControlImpl implements AsynchronousPiPControl {
-
- public void addPiPStatusListener(PiPStatusListener paramPiPStatusListener)
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public void removePiPStatusListener(PiPStatusListener paramPiPStatusListener)
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public int getCurrentStreamNumber()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public void selectStreamNumber(int num) throws StreamNotAvailableException
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public void setDisplay(boolean value)
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public boolean getDisplay()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public void setFullScreen(boolean value)
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public boolean getFullScreen()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public boolean getIsSyncedDuringTrickPlay()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public Dimension getInputVideoSize()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public Dimension getVideoSize()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public HScreenRectangle getActiveVideoArea()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public HScreenRectangle getActiveVideoAreaOnScreen()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public HScreenRectangle getTotalVideoArea()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public HScreenRectangle getTotalVideoAreaOnScreen()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public boolean supportsClipping()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public Rectangle setClipRegion(Rectangle clipRect)
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public Rectangle getClipRegion()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public float[] supportsArbitraryHorizontalScaling()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public float[] supportsArbitraryVerticalScaling()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public float[] getHorizontalScalingFactors()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public float[] getVerticalScalingFactors()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public byte getPositioningCapability()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public Component getControlComponent()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public void start()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public void stop()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public void pause()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public boolean resume()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public Time getElapsedTime()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
-}

libbluray-0.2.3.tar.bz2/ChangeLog -> libbluray-0.5.0.tar.bz2/ChangeLog Changed

@@ -1,3 +1,58 @@
+2013-12-21: Version 0.5.0
+- Portability fixes.
+- Build system updates.
+- Improved BD-J support (still alpha).
+- Improved updating of application-allocated ARGB frame buffer.
+- Get JRE library location from registry (Windows).
+- Added bd_get_main_title().
+- Added BD_EVENT_ERROR when title playback fails.
+- Added BD-J flags to disc info.
+- Added support for user timeout in HDMV menus.
+- Added cropping of RLE images. Cropping values in overlay are now always 0.
+- Added support for LIBAACS_PATH and LIBBDPLUS_PATH environment variables.
+- Added timestamp based m2ts stream filtering.
+
+2013-09-11: Version 0.4.0
+- Fixed slide shows: always cut reads at clip end boundary
+- Fixed logging with non-default mask
+- Fixed buffer overflow in bd_psr_unregister_cb()
+- Fixed IG background when button image position changes
+- Fixed BD-J tearing issues
+- Changed default PhoneME library name in Windows (cvm -> cvmi)
+- Initialize default player region code to B
+- Improved BD-J support (still alpha)
+- Improved language-based stream autoselection
+- Added missing Java files to distribution package
+- Added support for multi-clip sub paths
+- Added bd_select_stream()
+- Added menu page effects
+- Added button animations
+- Added initial support for BluRay Text Subtitles
+- Added bd_read_clpi(): use only public API in clpi_dump
+- Added reference-counted RLE images
+
+2013-04-30: Version 0.3.0
+- Build fixes
+- Fixed stopping playback from pop-up menu
+- Fixed multithreading issues in API
+- Fixed initial setting for player profile
+- Fixed stack corruption with long log strings
+- Improved configure script
+- Improved Visual Studio support
+- Improved BD-J support (still alpha)
+- Allow changing player version
+- Added PG (subtitle) decoding and rendering support
+- Added ARGB overlay interface for BD-J graphics
+- Added events for discontinuity, idle state and 3D mode
+- Added playmarks to BLURAY_TITLE_INFO
+- added start time, in time and out time to BLURAY_CLIP_INFO
+- added sub-path id to BLURAY_STREAM_INFO
+- Added bd_seek_playitem()
+- Added bd_set_scr()
+- Added 3D extension data to raw clip info
+- added 3D player settings
+- Added cropping and palette update flag to BD_OVERLAY
+
 2012-08-17: Version 0.2.3
  - Fixed memory leaks
  - Automatic language selection: disable subtitles when audio is in the same language

libbluray-0.2.3.tar.bz2/Makefile.am -> libbluray-0.5.0.tar.bz2/Makefile.am Changed

libbluray-0.2.3.tar.bz2/Makefile.in -> libbluray-0.5.0.tar.bz2/Makefile.in Changed

libbluray-0.2.3.tar.bz2/aclocal.m4 -> libbluray-0.5.0.tar.bz2/aclocal.m4 Changed

@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -12,33 +11,31 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf. It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.3], [],
+m4_if([$1], [1.14.1], [],
 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -54,24 +51,22 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.3])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory. The problem is that $srcdir (and
@@ -90,7 +85,7 @@
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -116,22 +111,19 @@
 
 # AM_CONDITIONAL -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -150,16 +142,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery. Also note that it means that autoscan, seeing
@@ -169,7 +159,7 @@
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -182,12 +172,13 @@
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
+m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
 [am_cv_$1_dependencies_compiler_type],
@@ -195,8 +186,8 @@
 # We make a subdir and do the tests there. Otherwise we can end up
 # making bogus files that we don't know about and never remove. For
 # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
 rm -rf conftest.dir
 mkdir conftest.dir
 # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -236,16 +227,16 @@
 : > sub/conftest.c
 for i in 1 2 3 4 5 6; do
 echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
 done
 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
 # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
 am__obj=sub/conftest.${OBJEXT-o}
 am__minus_obj="-o $am__obj"
 case $depmode in
@@ -254,8 +245,8 @@
 test "$am__universal" = false || continue
 ;;
 nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
 if test "x$enable_dependency_tracking" = xyes; then
 	continue
 else
@@ -263,7 +254,7 @@
 fi
 ;;
 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # This compiler won't grok '-c -o', but also, the minuso test has
 # not run yet. These depmodes are late enough in the game, and
 # so weak that their functioning should not be impacted.
 am__obj=conftest.${OBJEXT-o}
@@ -311,7 +302,7 @@
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -321,9 +312,13 @@
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+ [--enable-dependency-tracking],
+ [do not reject slow dependency extractors])
+AS_HELP_STRING(
+ [--disable-dependency-tracking],
+ [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
 am_depcomp="$ac_aux_dir/depcomp"
 AMDEPBACKSLASH='\'
@@ -338,20 +333,18 @@
 
 # Generate code to set up dependency tracking. -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
 # are listed without --file. Let's play safe and only enable the eval
 # if we detect the quoting.
 case $CONFIG_FILES in
@@ -364,7 +357,7 @@
 # Strip MF so we end up with the name of the file.
 mf=`echo "$mf" | sed -e 's/:.*$//'`
 # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
 # some people rename them; so instead we look at the file content.
 # Grep'ing the first line is not enough: some people post-process
 # each Makefile.in and add a new line on top of each file to say so.
@@ -376,21 +369,19 @@
 continue
 fi
 # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
 test -z "$DEPDIR" && continue
 am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
 # Find all dependency output files, they are included files with
 # $(DEPDIR) in their names. We invoke sed twice because it is the
 # simplest approach to changing $(DEPDIR) to its actual value in the
 # expansion.
 for file in `sed -n "
 s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
 # Make sure the directory exists.
 test -f "$dirpart/$file" && continue
 fdir=`AS_DIRNAME(["$file"])`
@@ -408,7 +399,7 @@
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
+# is enabled. FIXME. This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -416,32 +407,23 @@
 [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
 # Do all the work for Automake. -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 16
-
 # This macro actually does too much. Some checks are only needed if
 # your package does certain things. But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -454,7 +436,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names. We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -483,31 +465,40 @@
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+ [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
 AC_SUBST([PACKAGE], [$1])dnl
 AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+ [ok:ok],,
 [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target. The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -518,34 +509,78 @@
 			 [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		 [_AM_DEPENDENCIES(CC)],
-		 [define([AC_PROG_CC],
-			 defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		 [_AM_DEPENDENCIES([CC])],
+		 [m4_define([AC_PROG_CC],
+			 m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		 [_AM_DEPENDENCIES(CXX)],
-		 [define([AC_PROG_CXX],
-			 defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		 [_AM_DEPENDENCIES([CXX])],
+		 [m4_define([AC_PROG_CXX],
+			 m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		 [_AM_DEPENDENCIES(OBJC)],
-		 [define([AC_PROG_OBJC],
-			 defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+		 [_AM_DEPENDENCIES([OBJC])],
+		 [m4_define([AC_PROG_OBJC],
+			 m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		 [_AM_DEPENDENCIES([OBJCXX])],
+		 [m4_define([AC_PROG_OBJCXX],
+			 m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes. So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+ cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present. This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message. This
+can help us improve future automake versions.
+
+END
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+ echo 'Configuration will proceed anyway, since you have set the' >&2
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+ echo >&2
+ else
+ cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+ fi
+fi])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated. The stamp files are numbered to have different names.
@@ -567,15 +602,12 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -589,16 +621,14 @@
 install_sh="\${SHELL} $am_aux_dir/install-sh"
 esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
 
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot. For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -614,14 +644,12 @@
 
 # Check to see how 'make' treats includes.	 -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -639,7 +667,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
 am__include=include
@@ -666,15 +694,12 @@
 
 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -682,11 +707,10 @@
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -699,54 +723,22 @@
 esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
 else
 am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
+ AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
- [[\\/$]]* | ?:[[\\/]]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
 # Helper functions for option handling. -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
@@ -756,7 +748,7 @@
 # --------------------
 # Set option NAME. Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
 # ------------------------
@@ -770,13 +762,58 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+ [whether $CC understands -c and -o together],
+ [am_cv_prog_cc_c_o],
+ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # AM_RUN_LOG(COMMAND)
 # -------------------
@@ -791,22 +828,16 @@
 
 # Check to make sure that the build environment is sane. -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name. Accept space and tab only in the latter.
 am_lf='
@@ -817,32 +848,40 @@
 esac
 case $srcdir in
 *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments. Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls. This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment. This has actually
+	# happened. Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+ alias in your environment])
+ fi
+ if test "$[2]" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
 test "$[2]" = conftest.file
 )
 then
@@ -852,46 +891,118 @@
 AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+ [AC_MSG_CHECKING([that generated files are newer than configure])
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+ [--enable-silent-rules],
+ [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+ [--disable-silent-rules],
+ [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+ [am_cv_make_support_nested_variables],
+ [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries. This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
 AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -905,18 +1016,16 @@
 
 # Check how to create a tarball. -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -926,80 +1035,119 @@
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 # $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
 [# Always define AMTAR for backward compatibility. Yes, it's still used
 # in the wild :-( We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
- [m4_case([$1], [ustar],, [pax],,
- [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
 
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+ [m4_case([$1],
+ [ustar],
+ [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+ # There is notably a 21 bits limit for the UID and the GID. In fact,
+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+ # and bug#13588).
+ am_max_uid=2097151 # 2^21 - 1
+ am_max_gid=$am_max_uid
+ # The $UID and $GID variables are not portable, so we need to resort
+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
+ # below are definitely unexpected, so allow the users to see them
+ # (that is, avoid stderr redirection).
+ am_uid=`id -u || echo unknown`
+ am_gid=`id -g || echo unknown`
+ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+ if test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi
+ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+ if test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi],
+
+ [pax],
+ [],
+
+ [m4_fatal([Unknown tar format])])
+
+ AC_MSG_CHECKING([how to create a $1 tar archive])
+
+ # Go ahead even if we have the value already cached. We do so because we
+ # need to set the values for the 'am__tar' and 'am__untar' variables.
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+ for _am_tool in $_am_tools; do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar; do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
 
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works.
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ AM_RUN_LOG([cat conftest.dir/file])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+ done
 rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([m4/attributes.m4])
 m4_include([m4/ax_prog_doxygen.m4])
 m4_include([m4/libtool.m4])
 m4_include([m4/ltoptions.m4])

libbluray-0.5.0.tar.bz2/build-aux/compile Added

@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program 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, or (at your option)
+# any later version.
+#
+# This program 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	 MINGW*)
+	 file_conv=mingw
+	 ;;
+	 CYGWIN*)
+	 file_conv=cygwin
+	 ;;
+	 *)
+	 file_conv=wine
+	 ;;
+	esac
+ fi
+ case $file_conv/,$2, in
+	*,$file_conv,*)
+	 ;;
+	mingw/*)
+	 file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'`
+	 ;;
+	cygwin/*)
+	 file=`cygpath -m "$file" || echo "$file"`
+	 ;;
+	wine/*)
+	 file=`winepath -w "$file" || echo "$file"`
+	 ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+	-o)
+	 # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	 eat=1
+	 case $2 in
+	 *.o | *.[oO][bB][jJ])
+	 func_file_conv "$2"
+	 set x "$@" -Fo"$file"
+	 shift
+	 ;;
+	 *)
+	 func_file_conv "$2"
+	 set x "$@" -Fe"$file"
+	 shift
+	 ;;
+	 esac
+	 ;;
+	-I)
+	 eat=1
+	 func_file_conv "$2" mingw
+	 set x "$@" -I"$file"
+	 shift
+	 ;;
+	-I*)
+	 func_file_conv "${1#-I}" mingw
+	 set x "$@" -I"$file"
+	 shift
+	 ;;
+	-l)
+	 eat=1
+	 func_cl_dashl "$2"
+	 set x "$@" "$lib"
+	 shift
+	 ;;
+	-l*)
+	 func_cl_dashl "${1#-l}"
+	 set x "$@" "$lib"
+	 shift
+	 ;;
+	-L)
+	 eat=1
+	 func_cl_dashL "$2"
+	 ;;
+	-L*)
+	 func_cl_dashL "${1#-L}"
+	 ;;
+	-static)
+	 shared=false
+	 ;;
+	-Wl,*)
+	 arg=${1#-Wl,}
+	 save_ifs="$IFS"; IFS=','
+	 for flag in $arg; do
+	 IFS="$save_ifs"
+	 linker_opts="$linker_opts $flag"
+	 done
+	 IFS="$save_ifs"
+	 ;;
+	-Xlinker)
+	 eat=1
+	 linker_opts="$linker_opts $2"
+	 ;;
+	-*)
+	 set x "$@" "$1"
+	 shift
+	 ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	 func_file_conv "$1"
+	 set x "$@" -Tp"$file"
+	 shift
+	 ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	 func_file_conv "$1" mingw
+	 set x "$@" "$file"
+	 shift
+	 ;;
+	*)
+	 set x "$@" "$1"
+	 shift
+	 ;;
+ esac
+ fi
+ shift
+ done
+ if test -n "$linker_opts"; then
+ linker_opts="-link$linker_opts"
+ fi
+ exec "$@" $linker_opts
+ exit 1
+}
+
+eat=
+
+case $1 in
+ '')
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	 *.o | *.obj)
+	 ofile=$2
+	 ;;
+	 *)
+	 set x "$@" -o "$2"
+	 shift
+	 ;;
+	esac
+	;;
+ *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+ *)
+	set x "$@" "$1"
+	shift
+	;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no '-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # '.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:

libbluray-0.2.3.tar.bz2/build-aux/config.guess -> libbluray-0.5.0.tar.bz2/build-aux/config.guess Changed

@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2013-11-29'
 
 # This file 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -54,9 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -138,6 +132,27 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -200,6 +215,10 @@
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+ *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
 *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -302,7 +321,7 @@
 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -801,6 +820,9 @@
 i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+ *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
 *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
@@ -852,21 +874,21 @@
 	exit ;;
 *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
 *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
 i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
 aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
@@ -879,59 +901,54 @@
 	 EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+ arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	 | grep -q __ARM_EABI__
 	then
-	 echo ${UNAME_MACHINE}-unknown-linux-gnu
+	 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	 then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	 else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	 fi
 	fi
 	exit ;;
 avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
 crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
 frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
 ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -950,54 +967,63 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+ or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
 or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
 parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
 parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	 PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	 PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	 *) echo hppa-unknown-linux-gnu ;;
+	 PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	 PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	 *) echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
 ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
 ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+ ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+ ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
 s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
 sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
 x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1201,6 +1227,9 @@
 BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+ x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
 SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1227,19 +1256,31 @@
 	exit ;;
 *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	 i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		 grep IS_64BIT_ARCH >/dev/null
-		 then
-		 UNAME_PROCESSOR="x86_64"
-		 fi
-		fi ;;
-	 unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	 UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		 grep IS_64BIT_ARCH >/dev/null
+		then
+		 case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		 esac
+		fi
+	 fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	 # Avoid executing cc on OS X 10.9, as it ships with a stub
+	 # that puts up a graphical alert prompting to install
+	 # developer tools. Any system running Mac OS X 10.7 or
+	 # later (Darwin 11 and later) is required to have a 64-bit
+	 # processor. This is not true of the ARM version of Darwin
+	 # that Apple uses in portable devices.
+	 UNAME_PROCESSOR=x86_64
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
 *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1256,7 +1297,7 @@
 NEO-?:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)
+ NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
 NSR-?:NONSTOP_KERNEL:*:*)
@@ -1330,9 +1371,6 @@
 	exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_

libbluray-0.2.3.tar.bz2/build-aux/config.sub -> libbluray-0.5.0.tar.bz2/build-aux/config.sub Changed

libbluray-0.2.3.tar.bz2/build-aux/depcomp -> libbluray-0.5.0.tar.bz2/build-aux/depcomp Changed

@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2011-12-04.11; # UTC
+scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,9 +27,9 @@
 
 case $1 in
 '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
 -h | --h*)
 cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -40,8 +39,8 @@
 
 Environment variables:
 depmode Dependency tracking mode.
- source Source file read by `PROGRAMS ARGS'.
- object Object file output by `PROGRAMS ARGS'.
+ source Source file read by 'PROGRAMS ARGS'.
+ object Object file output by 'PROGRAMS ARGS'.
 DEPDIR directory where to store dependencies.
 depfile Dependency file to output.
 tmpdepfile Temporary file to use when outputting dependencies.
@@ -57,6 +56,66 @@
 ;;
 esac
 
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'. Note that this directory component will
+# be either empty or ending with a '/' character. This is deliberate.
+set_dir_from ()
+{
+ case $1 in
+ */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+ *) dir=;;
+ esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+ base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+ echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+ # If the compiler actually managed to produce a dependency file,
+ # post-process it.
+ if test -f "$tmpdepfile"; then
+ # Each line is of the form 'foo.o: dependency.h'.
+ # Do two passes, one to just change these to
+ # $object: dependency.h
+ # and one to simply output
+ # dependency.h:
+ # which is needed to avoid the deleted-header problem.
+ { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+ sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+ } > "$depfile"
+ rm -f "$tmpdepfile"
+ else
+ make_dummy_depfile
+ fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
 echo "depcomp: Variables source, object and depmode must be set" 1>&2
 exit 1
@@ -69,6 +128,9 @@
 
 rm -f "$tmpdepfile"
 
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
 # Some modes work just like other modes, but use different flags. We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write. Note that we *cannot* use a case
@@ -80,26 +142,32 @@
 fi
 
 if test "$depmode" = dashXmstdout; then
- # This is just like dashmstdout with a different argument.
- dashmflag=-xM
- depmode=dashmstdout
+ # This is just like dashmstdout with a different argument.
+ dashmflag=-xM
+ depmode=dashmstdout
 fi
 
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
- # This is just like msvisualcpp but w/o cygpath translation.
- # Just convert the backslash-escaped backslashes to single forward
- # slashes to satisfy depend.m4
- cygpath_u='sed s,\\\\,/,g'
- depmode=msvisualcpp
+ # This is just like msvisualcpp but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvisualcpp
 fi
 
 if test "$depmode" = msvc7msys; then
- # This is just like msvc7 but w/o cygpath translation.
- # Just convert the backslash-escaped backslashes to single forward
- # slashes to satisfy depend.m4
- cygpath_u='sed s,\\\\,/,g'
- depmode=msvc7
+ # This is just like msvc7 but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+ gccflag=-qmakedep=gcc,-MF
+ depmode=gcc
 fi
 
 case "$depmode" in
@@ -122,8 +190,7 @@
 done
 "$@"
 stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
 rm -f "$tmpdepfile"
 exit $stat
 fi
@@ -131,13 +198,17 @@
 ;;
 
 gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc. Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ## up in a subdir. Having to rename by hand is ugly.
 ## (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
+## -MM, not -M (despite what the docs say). Also, it might not be
+## supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ## than renaming).
 if test -z "$gccflag"; then
@@ -145,33 +216,31 @@
 fi
 "$@" -Wp,"$gccflag$tmpdepfile"
 stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
 rm -f "$tmpdepfile"
 exit $stat
 fi
 rm -f "$depfile"
 echo "$object : \\" > "$depfile"
- alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+ # The second -e expression handles DOS-style file names with drive
+ # letters.
 sed -e 's/^[^:]*: / /' \
 -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header). We avoid this by adding
 ## dummy dependencies for each header file. Too bad gcc doesn't do
 ## this for us directly.
- tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'. On the theory
+## Some versions of gcc put a space before the ':'. On the theory
 ## that the space means something, we add a space to the output as
 ## well. hp depmode also adds that space, but also prefixes the VPATH
 ## to the object. Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
- | sed -e 's/$/ :/' >> "$depfile"
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
 rm -f "$tmpdepfile"
 ;;
 
@@ -189,8 +258,7 @@
 "$@" -MDupdate "$tmpdepfile"
 fi
 stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
 rm -f "$tmpdepfile"
 exit $stat
 fi
@@ -198,43 +266,41 @@
 
 if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
 echo "$object : \\" > "$depfile"
-
 # Clip off the initial element (the dependent). Don't try to be
 # clever and replace this with sed code, as IRIX sed won't handle
 # lines with more than a fixed number of characters (4096 in
 # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like `#:fec' to the end of the
+ # the IRIX cc adds comments like '#:fec' to the end of the
 # dependency line.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr '
-' ' ' >> "$depfile"
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+ | tr "$nl" ' ' >> "$depfile"
 echo >> "$depfile"
-
 # The second pass generates a dummy entry for each header file.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> "$depfile"
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+ >> "$depfile"
 else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
+ make_dummy_depfile
 fi
 rm -f "$tmpdepfile"
 ;;
 
+xlc)
+ # This case exists only to let depend.m4 do its work. It works by
+ # looking at the text of this script. This case will never be run,
+ # since it is checked for above.
+ exit 1
+ ;;
+
 aix)
 # The C for AIX Compiler uses -M and outputs the dependencies
 # in a .u file. In older versions, this file always lives in the
- # current directory. Also, the AIX compiler puts `$object:' at the
+ # current directory. Also, the AIX compiler puts '$object:' at the
 # start of each line; $object doesn't have directory information.
 # Version 6 uses the directory in both cases.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ set_dir_from "$object"
+ set_base_from "$object"
 if test "$libtool" = yes; then
 tmpdepfile1=$dir$base.u
 tmpdepfile2=$base.u
@@ -247,9 +313,7 @@
 "$@" -M
 fi
 stat=$?
-
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
 rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
 exit $stat
 fi
@@ -258,44 +322,100 @@
 do
 test -f "$tmpdepfile" && break
 done
- if test -f "$tmpdepfile"; then
- # Each line is of the form `foo.o: dependent.h'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
+ aix_post_process_depfile
+ ;;
+
+tcc)
+ # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+ # FIXME: That version still under development at the moment of writing.
+ # Make that this statement remains true also for stable, released
+ # versions.
+ # It will wrap lines (doesn't matter whether long or short) with a
+ # trailing '\', as in:
+ #
+ # foo.o : \
+ # foo.c \
+ # foo.h \
+ #
+ # It will put a trailing '\' even on the last line, and will use leading
+ # spaces rather than leading tabs (at least since its commit 0394caf7
+ # "Emit spaces for -MD").
+ "$@" -MD -MF "$tmpdepfile"
+ stat=$?
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile"
+ exit $stat
 fi
+ rm -f "$depfile"
+ # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+ # We have to change lines of the first kind to '$object: \'.
+ sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+ # And for each line of the second kind, we have to emit a 'dep.h:'
+ # dummy dependency, to avoid the deleted-header problem.
+ sed -n -e 's|^ *$.*$ *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
 rm -f "$tmpdepfile"
 ;;
 
-icc)
- # Intel's C compiler understands `-MD -MF file'. However on
- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
- # ICC 7.0 will fill foo.d with something like
- # foo.o: sub/foo.c
- # foo.o: sub/foo.h
- # which is wrong. We want:
- # sub/foo.o: sub/foo.c
- # sub/foo.o: sub/foo.h
- # sub/foo.c:
- # sub/foo.h:
- # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file. A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+ # Portland's C compiler understands '-MD'.
+ # Will always output deps to 'file.d' where file is the root name of the
+ # source file under compilation, even if file resides in a subdirectory.
+ # The object file name does not affect the name of the '.d' file.
+ # pgcc 10.2 will output
 # foo.o: sub/foo.c sub/foo.h
- # and will wrap long lines using \ :
+ # and will wrap long lines using '\' :
 # foo.o: sub/foo.c ... \
 # sub/foo.h ... \
 # ...
+ set_dir_from "$object"
+ # Use the source, not the object, to determine the base name, since
+ # that's sadly what pgcc will do too.
+ set_base_from "$source"
+ tmpdepfile=$base.d
+
+ # For projects that build the same source file twice into different object
+ # files, the pgcc approach of using the *source* file root name can cause
+ # problems in parallel builds. Use a locking strategy to avoid stomping on
+ # the same $tmpdepfile.
+ lockdir=$base.d-lock
+ trap "
+ echo '$0: caught signal, cleaning up...' >&2
+ rmdir '$lockdir'
+ exit 1
+ " 1 2 13 15
+ numtries=100
+ i=$numtries
+ while test $i -gt 0; do
+ # mkdir is a portable test-and-set.
+ if mkdir "$lockdir" 2>/dev/null; then
+ # This process acquired the lock.
+ "$@" -MD
+ stat=$?
+ # Release the lock.
+ rmdir "$lockdir"
+ break
+ else
+ # If the lock is being held by a different process, wait
+ # until the winning process is done or we timeout.
+ while test -d "$lockdir" && test $i -gt 0; do
+ sleep 1
+ i=`expr $i - 1`
+ done
+ fi
+ i=`expr $i - 1`
+ done
+ trap - 1 2 13 15
+ if test $i -le 0; then
+ echo "$0: failed to acquire lock after $numtries attempts" >&2
+ echo "$0: check lockdir '$lockdir'" >&2
+ exit 1
+ fi
 
- "$@" -MD -MF "$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
 rm -f "$tmpdepfile"
 exit $stat
 fi
@@ -307,8 +427,8 @@
 sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
 # Some versions of the HPUX 10.20 sed can't process this invocation
 # correctly. Breaking it into two sed invocations is a workaround.
- sed 's,^[^:]*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
- sed -e 's/$/ :/' >> "$depfile"
+ sed 's,^[^:]*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+ | sed -e 's/$/ :/' >> "$depfile"
 rm -f "$tmpdepfile"
 ;;
 
@@ -319,9 +439,8 @@
 # 'foo.d', which lands next to the object file, wherever that
 # happens to be.
 # Much of this is similar to the tru64 case; see comments there.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ set_dir_from "$object"
+ set_base_from "$object"
 if test "$libtool" = yes; then
 tmpdepfile1=$dir$base.d
 tmpdepfile2=$dir.libs/$base.d
@@ -332,8 +451,7 @@
 "$@" +Maked
 fi
 stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
 rm -f "$tmpdepfile1" "$tmpdepfile2"
 exit $stat
 fi
@@ -343,77 +461,61 @@
 test -f "$tmpdepfile" && break
 done
 if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add `dependent.h:' lines.
+ sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add 'dependent.h:' lines.
 sed -ne '2,${
-	 s/^ *//
-	 s/ \\*$//
-	 s/$/:/
-	 p
-	 }' "$tmpdepfile" >> "$depfile"
+ s/^ *//
+ s/ \\*$//
+ s/$/:/
+ p
+ }' "$tmpdepfile" >> "$depfile"
 else
- echo "#dummy" > "$depfile"
+ make_dummy_depfile
 fi
 rm -f "$tmpdepfile" "$tmpdepfile2"
 ;;
 
 tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in `foo.d' instead, so we check for that too.
- # Subdirectories are respected.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
- if test "$libtool" = yes; then
- # With Tru64 cc, shared objects can also be used to make a
- # static library. This mechanism is used in libtool 1.4 series to
- # handle both shared and static libraries in a single compilation.
- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
- #
- # With libtool 1.5 this exception was removed, and libtool now
- # generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in $dir.libs/$base.o.d and
- # in $dir$base.o.d. We have to check for both files, because
- # one of the two compilations can be disabled. We should prefer
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
- # automatically cleaned when .libs/ is deleted, while ignoring
- # the former would cause a distcleancheck panic.
- tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
- tmpdepfile2=$dir$base.o.d # libtool 1.5
- tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
- tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
- "$@" -Wc,-MD
- else
- tmpdepfile1=$dir$base.o.d
- tmpdepfile2=$dir$base.d
- tmpdepfile3=$dir$base.d
- tmpdepfile4=$dir$base.d
- "$@" -MD
- fi
-
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
+ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+ # dependencies in 'foo.d' instead, so we check for that too.
+ # Subdirectories are respected.
+ set_dir_from "$object"
+ set_base_from "$object"
+
+ if test "$libtool" = yes; then
+ # Libtool generates 2 separate objects for the 2 libraries. These
+ # two compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+ # automatically cleaned when .libs/ is deleted, while ignoring
+ # the former would cause a distcleancheck panic.
+ tmpdepfile1=$dir$base.o.d # libtool 1.5
+ tmpdepfile2=$dir.libs/$base.o.d # Likewise.
+ tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504
+ "$@" -Wc,-MD
+ else
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir$base.d
+ tmpdepfile3=$dir$base.d
+ "$@" -MD
+ fi
+
+ stat=$?
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ # Same post-processing that is required for AIX mode.
+ aix_post_process_depfile
+ ;;
 
 msvc7)
 if test "$libtool" = yes; then
@@ -424,8 +526,7 @@
 "$@" $showIncludes > "$tmpdepfile"
 stat=$?
 grep -v '^Note: including file: ' "$tmpdepfile"
- if test "$stat" = 0; then :
- else
+ if test $stat -ne 0; then
 rm -f "$tmpdepfile"
 exit $stat
 fi
@@ -443,14 +544,15 @@
 p
 }' | $cygpath_u | sort -u | sed -n '
 s/ /\\ /g
-s/$.*$/	\1 \\/p
+s/$.*$/'"$tab"'\1 \\/p
 s/.$.*$ \\/\1:/
 H
 $ {
- s/.*/	/
+ s/.*/'"$tab"'/
 G
 p
 }' >> "$depfile"
+ echo >> "$depfile" # make sure the fragment doesn't end with a backslash
 rm -f "$tmpdepfile"
 ;;
 
@@ -478,7 +580,7 @@
 shift
 fi
 
- # Remove `-o $object'.
+ # Remove '-o $object'.
 IFS=" "
 for arg
 do
@@ -498,18 +600,18 @@
 done
 
 test -z "$dashmflag" && dashmflag=-M
- # Require at least two characters before searching for `:'
+ # Require at least two characters before searching for ':'
 # in the target name. This is to cope with DOS-style filenames:
- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+ # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
 "$@" $dashmflag |
- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
+ sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
 rm -f "$depfile"
 cat < "$tmpdepfile" > "$depfile"
- tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process this sed invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
 rm -f "$tmpdepfile"
 ;;
 
@@ -562,11 +664,12 @@
 # makedepend may prepend the VPATH from the source file name to the object.
 # No need to regex-escape $object, excess matching of '.' is harmless.
 sed "s|^.*$$object *:$|\1|" "$tmpdepfile" > "$depfile"
- sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process the last invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ sed '1,2d' "$tmpdepfile" \
+ | tr ' ' "$nl" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
 rm -f "$tmpdepfile" "$tmpdepfile".bak
 ;;
 
@@ -583,7 +686,7 @@
 shift
 fi
 
- # Remove `-o $object'.
+ # Remove '-o $object'.
 IFS=" "
 for arg
 do
@@ -602,10 +705,10 @@
 esac
 done
 
- "$@" -E |
- sed -n -e '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' \
- -e '/^#line [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' |
- sed '$ s: \\$::' > "$tmpdepfile"
+ "$@" -E \
+ | sed -n -e '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' \
+ -e '/^#line [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' \
+ | sed '$ s: \\$::' > "$tmpdepfile"
 rm -f "$depfile"
 echo "$object : \\" > "$depfile"
 cat < "$tmpdepfile" >> "$depfile"
@@ -637,23 +740,23 @@
 shift
 ;;
 "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
+ set fnord "$@"
+ shift
+ shift
+ ;;
 *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
+ set fnord "$@" "$arg"
+ shift
+ shift
+ ;;
 esac
 done
 "$@" -E 2>/dev/null |
 sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
 rm -f "$depfile"
 echo "$object : \\" > "$depfile"
- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::	\1 \\:p' >> "$depfile"
- echo "	" >> "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+ echo "$tab" >> "$depfile"
 sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::\1\::p' >> "$depfile"
 rm -f "$tmpdepfile"
 ;;

libbluray-0.2.3.tar.bz2/build-aux/install-sh -> libbluray-0.5.0.tar.bz2/build-aux/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-01-19.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,7 +156,7 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
-	# Protect names problematic for `test' and other utilities.
+	# Protect names problematic for 'test' and other utilities.
 	case $dst_arg in
 	  -* | [=!]) dst_arg=./$dst_arg;;
 	esac
@@ -190,7 +190,7 @@
     fi
     shift # arg
     dst_arg=$arg
-    # Protect names problematic for `test' and other utilities.
+    # Protect names problematic for 'test' and other utilities.
     case $dst_arg in
       -* | [=!]) dst_arg=./$dst_arg;;
     esac
@@ -202,7 +202,7 @@
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
@@ -240,7 +240,7 @@
 
 for src
 do
-  # Protect names problematic for `test' and other utilities.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
     -* | [=!]) src=./$src;;
   esac
@@ -354,7 +354,7 @@
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in

libbluray-0.2.3.tar.bz2/build-aux/ltmain.sh -> libbluray-0.5.0.tar.bz2/build-aux/ltmain.sh Changed

@@ -70,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
+#         $progname:	(GNU libtool) 2.4.2
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -80,7 +80,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
+VERSION=2.4.2
 TIMESTAMP=""
 package_revision=1.3337
 
@@ -6124,10 +6124,7 @@
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
 	esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6447,19 +6444,19 @@
 	    # It is a libtool convenience library, so add in its objects.
 	    func_append convenience " $ladir/$objdir/$old_library"
 	    func_append old_convenience " $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      if $opt_preserve_dup_deps ; then
-		case "$tmp_libs " in
-		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
-		esac
-	      fi
-	      func_append tmp_libs " $deplib"
-	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done
 	  continue
 	fi # $pass = conv
 
@@ -7352,9 +7349,6 @@
 	    revision="$number_minor"
 	    lt_irix_increment=no
 	    ;;
-	  *)
-	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-	    ;;
 	  esac
 	  ;;
 	no)

libbluray-0.2.3.tar.bz2/build-aux/missing -> libbluray-0.5.0.tar.bz2/build-aux/missing Changed

@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,68 +25,40 @@
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
 exit 1
 fi
 
-run=:
-sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p'
-sed_minuso='s/.* -o $[^ ]*$.*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
 
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
 
 -h|--h|--he|--hel|--help)
 echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
 -h, --help display this help and exit
 -v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
 exit $?
@@ -99,228 +70,141 @@
 ;;
 
 -*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
 exit 1
 ;;
 
 esac
 
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
-				 sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
-	 sed 's/\.am$/.in/' |
-	 while read f; do touch "$f"; done
- ;;
-
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
-	touch $file
- else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "# $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG=\${$#}
-	case $LASTARG in
-	*.y)
-	 SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	 if test -f "$SRCFILE"; then
-	 cp "$SRCFILE" y.tab.c
-	 fi
-	 SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	 if test -f "$SRCFILE"; then
-	 cp "$SRCFILE" y.tab.h
-	 fi
-	 ;;
-	esac
- fi
- if test ! -f y.tab.h; then
-	echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG=\${$#}
-	case $LASTARG in
-	*.l)
-	 SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	 if test -f "$SRCFILE"; then
-	 cp "$SRCFILE" lex.yy.c
-	 fi
-	 ;;
-	esac
- fi
- if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
-	 you modified a dependency of a manual page. You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
-	touch $file
- else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'`
- file=`sed -n '
-	/^@setfilename/{
-	 s/.* $[^ ]*$ *$/\1/
-	 p
-	 q
-	}' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
 
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'autom4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
 ;;
-esac
-
-exit 0
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)

libbluray-0.2.3.tar.bz2/config.h.in -> libbluray-0.5.0.tar.bz2/config.h.in Changed

@@ -1,5 +1,8 @@
 /* config.h.in. Generated from configure.ac by autoheader. */
 
+/* Define to 1 if using libbluray J2ME stack */
+#undef HAVE_BDJ_J2ME
+
 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
 */
 #undef HAVE_DIRENT_H
@@ -7,12 +10,12 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* Define to 1 if you have the `dlopen' function. */
-#undef HAVE_DLOPEN
-
 /* Define to 1 if you have the <errno.h> header file. */
 #undef HAVE_ERRNO_H
 
+/* Define this if you have FreeType2 library */
+#undef HAVE_FT2
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -87,6 +90,9 @@
 /* "Defines the architecture of the java vm." */
 #undef JAVA_ARCH
 
+/* "" */
+#undef JDK_HOME
+
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
 */
 #undef LT_OBJDIR
@@ -124,11 +130,19 @@
 /* Version number of package */
 #undef VERSION
 
+/* Enable large inode numbers on Mac OS X 10.5. */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
+/* Define to '0x0501' for IE 5.01. */
+#undef _WIN32_IE
+
 /* Define to '0x0500' for Windows XP APIs. */
 #undef _WIN32_WINNT

libbluray-0.2.3.tar.bz2/configure -> libbluray-0.5.0.tar.bz2/configure Changed

@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libbluray 0.2.3.
+# Generated by GNU Autoconf 2.69 for libbluray 0.5.0.
 #
 # Report bugs to <http://www.videolan.org/developers/libbluray.html>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
 emulate sh
@@ -169,7 +192,8 @@
 else
 exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -222,21 +246,25 @@
 
 
 if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	 *v*x* | *x*v* ) as_opts=-vx ;;
-	 *v* ) as_opts=-v ;;
-	 *x* ) as_opts=-x ;;
-	 * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
 if test x$as_have_required = xno; then :
@@ -339,6 +367,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -460,6 +496,10 @@
 chmod +x "$as_me.lineno" ||
 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
 # Don't try to exec as it changes $[0], causing all sort of problems
 # (the dirname of $[0] is not the place where we might find the
 # original and so on. Autoconf is especially sensitive to this).
@@ -494,16 +534,16 @@
 # ... but there are two gotchas:
 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 elif ln conf$$.file conf$$ 2>/dev/null; then
 as_ln_s=ln
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -515,28 +555,8 @@
 as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -570,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='libbluray'
 PACKAGE_TARNAME='libbluray'
-PACKAGE_VERSION='0.2.3'
-PACKAGE_STRING='libbluray 0.2.3'
+PACKAGE_VERSION='0.5.0'
+PACKAGE_STRING='libbluray 0.5.0'
 PACKAGE_BUGREPORT='http://www.videolan.org/developers/libbluray.html'
 PACKAGE_URL=''
 
@@ -615,10 +635,6 @@
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-SET_DEBUG_OPTS
-SET_OPTIMIZATIONS
-SET_WARNINGS
-DLOPEN_LIBS
 BDJAVA_CFLAGS
 LT_VERSION_INFO
 BLURAY_VERSION_MICRO
@@ -670,16 +686,20 @@
 DX_DOCDIR
 DX_CONFIG
 DX_PROJECT
+BDJ_BOOTCLASSPATH
+BDJ_TYPE
 USING_BDJAVA_FALSE
 USING_BDJAVA_TRUE
 USING_EXAMPLES_FALSE
 USING_EXAMPLES_TRUE
+FT2_LIBS
+FT2_CFLAGS
 LIBXML2_LIBS
 LIBXML2_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
-HAVE_PKG_CONFIG
+DLOPEN_LIBS
 CPP
 OTOOL64
 OTOOL
@@ -719,6 +739,15 @@
 LDFLAGS
 CFLAGS
 CC
+JDK_HOME
+HAVE_DARWIN_FALSE
+HAVE_DARWIN_TRUE
+HAVE_WIN32_FALSE
+HAVE_WIN32_TRUE
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -742,10 +771,6 @@
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
-target_os
-target_vendor
-target_cpu
-target
 host_os
 host_vendor
 host_cpu
@@ -795,14 +820,16 @@
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-with_jdk
+enable_silent_rules
 enable_werror
 enable_extra_warnings
 enable_optimizations
 enable_examples
-enable_debug
 enable_bdjava
-enable_libxml2
+with_libxml2
+with_freetype
+with_bdj_type
+with_bdj_bootclasspath
 enable_dependency_tracking
 enable_shared
 enable_static
@@ -826,6 +853,7 @@
 ac_precious_vars='build_alias
 host_alias
 target_alias
+JDK_HOME
 CC
 CFLAGS
 LDFLAGS
@@ -837,6 +865,8 @@
 PKG_CONFIG_LIBDIR
 LIBXML2_CFLAGS
 LIBXML2_LIBS
+FT2_CFLAGS
+FT2_LIBS
 DOXYGEN_PAPER_SIZE'
 
 
@@ -1293,8 +1323,6 @@
 if test "x$host_alias" != x; then
 if test "x$build_alias" = x; then
 cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
 elif test "x$build_alias" != "x$host_alias"; then
 cross_compiling=yes
 fi
@@ -1380,7 +1408,7 @@
 # Omit some internal or obsolete options to make the list less imposing.
 # This message is too long to be a string in the A/UX 3.1 sh.
 cat <<_ACEOF
-\`configure' configures libbluray 0.2.3 to adapt to many kinds of systems.
+\`configure' configures libbluray 0.5.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1445,13 +1473,12 @@
 System types:
 --build=BUILD configure for building on BUILD [guessed]
 --host=HOST cross-compile to build programs to run on HOST [BUILD]
- --target=TARGET configure for building compilers for TARGET [HOST]
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of libbluray 0.2.3:";;
+ short | recursive ) echo "Configuration of libbluray 0.5.0:";;
 esac
 cat <<\_ACEOF
 
@@ -1459,15 +1486,19 @@
 --disable-option-checking ignore unrecognized --enable/--with options
 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-werror set warnings as errors via -Werror (default is no)
- --enable-extra-warnings set extra warnings (default is yes)
- --enable-optimizations enable optimizations (default is yes)
+ --enable-silent-rules less verbose build output (undo: "make V=1")
+ --disable-silent-rules verbose build output (undo: "make V=0")
+ --enable-werror set warnings as errors via -Werror
+ [default=disabled]
+ --disable-extra-warnings
+ set extra warnings [default=enabled]
+ --disable-optimizations disable optimizations [default=enabled]
 --enable-examples build examples (default is yes)
- --enable-debug enable debugging information (default is yes)
 --enable-bdjava enable BD-Java support (default is no)
- --enable-libxml2 enable libxml2 support (default is yes)
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
+ --enable-dependency-tracking
+ do not reject slow dependency extractors
+ --disable-dependency-tracking
+ speeds up one-time build
 --enable-shared[=PKGS] build shared libraries [default=yes]
 --enable-static[=PKGS] build static libraries [default=yes]
 --enable-fast-install[=PKGS]
@@ -1489,8 +1520,14 @@
 Optional Packages:
 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-jdk=DIR Specify the path to the JDK (default is
- "/usr/lib/jvm/java-6-openjdk")
+ --without-libxml2 build without libxml2 support [default=with]
+ --without-freetype build without freetype support [default=with]
+ --with-bdj-type=TYPE Specify the type of BD-J implementation (j2se,
+ j2me). Default is j2se.
+ --with-bdj-bootclasspath=PATH
+ Specify BD-J build-time bootclass path (example
+ /opt/PhoneME/lib/btclasses.zip;/opt/PhoneME/lib/xmlparer.jar).
+ Default is empty.
 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
 both]
 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -1498,6 +1535,7 @@
 (or the compiler's sysroot if not specified).
 
 Some influential environment variables:
+ JDK_HOME Path to the JDK [default=/usr/lib/jvm/java-6-openjdk]
 CC C compiler command
 CFLAGS C compiler flags
 LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -1515,6 +1553,8 @@
 C compiler flags for LIBXML2, overriding pkg-config
 LIBXML2_LIBS
 linker flags for LIBXML2, overriding pkg-config
+ FT2_CFLAGS C compiler flags for FT2, overriding pkg-config
+ FT2_LIBS linker flags for FT2, overriding pkg-config
 DOXYGEN_PAPER_SIZE
 a4wide (default), a4, letter, legal or executive
 
@@ -1584,10 +1624,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-libbluray configure 0.2.3
-generated by GNU Autoconf 2.68
+libbluray configure 0.5.0
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1663,7 +1703,7 @@
 	 test ! -s conftest.err
 } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
 }; then :
 ac_retval=0
 else
@@ -2010,8 +2050,8 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libbluray $as_me 0.2.3, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+It was created by libbluray $as_me 0.5.0, which was
+generated by GNU Autoconf 2.69. Invocation command line was
 
 $ $0 $@
 
@@ -2459,47 +2499,7 @@
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if ${ac_cv_target+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$target_alias" = x; then
- ac_cv_target=$ac_cv_host
-else
- ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
- test "$program_prefix$program_suffix$program_transform_name" = \
- NONENONEs,x,x, &&
- program_prefix=${target_alias}-
-
-am__api_version='1.11'
+am__api_version='1.14'
 
 # Find a good install program. We prefer a C program (faster),
 # so one script is as good as another. But avoid the broken or
@@ -2538,7 +2538,7 @@
 # by default.
 for ac_prog in ginstall scoinst install; do
 for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	 if test $ac_prog = install &&
 	 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	 # AIX install. It has an incompatible calling convention.
@@ -2596,9 +2596,6 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name. Accept space and tab only in the latter.
 am_lf='
@@ -2609,32 +2606,40 @@
 esac
 case $srcdir in
 *[\\\"\#\$\&\'\`$am_lf\ \	]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments. Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
-alias in your environment" "$LINENO" 5
- fi
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
 
+	# If neither matched, then we have a broken ls. This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment. This has actually
+	# happened. Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+ if test "$2" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
 test "$2" = conftest.file
 )
 then
@@ -2646,6 +2651,16 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
 program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2668,12 +2683,12 @@
 esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
 else
 am_missing_run=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@ -2685,10 +2700,10 @@
 esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -2707,7 +2722,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -2747,7 +2762,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_STRIP="strip"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -2798,7 +2813,7 @@
 test -z "$as_dir" && as_dir=.
 for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	 as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	 'mkdir (GNU coreutils) '* | \
 	 'mkdir (coreutils) '* | \
@@ -2827,12 +2842,6 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2851,7 +2860,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_AWK="$ac_prog"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -2915,6 +2924,45 @@
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+ enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
 # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
 # is not polluted with repeated "-I."
@@ -2937,7 +2985,7 @@
 
 # Define the identity of the package.
 PACKAGE='libbluray'
- VERSION='0.2.3'
+ VERSION='0.5.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2965,6 +3013,12 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
 # We need awk for the "check" target. The system "awk" is bad on
 # some platforms.
 # Always define AMTAR for backward compatibility. Yes, it's still used
@@ -2972,92 +3026,173 @@
 AMTAR='$${TAR-tar}'
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
-$as_echo_n "checking how to create a ustar tar archive... " >&6; }
-# Loop over all known methods to create a tar archive until one works.
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar plaintar pax cpio none'
-_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- { echo "$as_me:$LINENO: $_am_tar --version" >&5
+
+# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+ # There is notably a 21 bits limit for the UID and the GID. In fact,
+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+ # and bug#13588).
+ am_max_uid=2097151 # 2^21 - 1
+ am_max_gid=$am_max_uid
+ # The $UID and $GID variables are not portable, so we need to resort
+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
+ # below are definitely unexpected, so allow the users to see them
+ # (that is, avoid stderr redirection).
+ am_uid=`id -u || echo unknown`
+ am_gid=`id -g || echo unknown`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
+$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; }
+ if test $am_uid -le $am_max_uid; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ _am_tools=none
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
+$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; }
+ if test $am_gid -le $am_max_gid; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ _am_tools=none
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
+$as_echo_n "checking how to create a ustar tar archive... " >&6; }
+
+ # Go ahead even if we have the value already cached. We do so because we
+ # need to set the values for the 'am__tar' and 'am__untar' variables.
+ _am_tools=${am_cv_prog_tar_ustar-$_am_tools}
+
+ for _am_tool in $_am_tools; do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar; do
+ { echo "$as_me:$LINENO: $_am_tar --version" >&5
 ($_am_tar --version) >&5 2>&5
 ac_status=$?
 echo "$as_me:$LINENO: \$? = $ac_status" >&5
 (exit $ac_status); } && break
- done
- am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x ustar -w "$$tardir"'
- am__tar_='pax -L -x ustar -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
- am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
- am__untar='cpio -i -H ustar -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
-
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_ustar}" && break
+ done
+ am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x ustar -w "$$tardir"'
+ am__tar_='pax -L -x ustar -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
+ am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
+ am__untar='cpio -i -H ustar -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
 
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_ustar}" && break
+
+ # tar/untar a dummy directory, and stop if the command works.
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
 (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
 ac_status=$?
 echo "$as_me:$LINENO: \$? = $ac_status" >&5
 (exit $ac_status); }
- rm -rf conftest.dir
- if test -s conftest.tar; then
- { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
 ($am__untar <conftest.tar) >&5 2>&5
 ac_status=$?
 echo "$as_me:$LINENO: \$? = $ac_status" >&5
 (exit $ac_status); }
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
+ { echo "$as_me:$LINENO: cat conftest.dir/file" >&5
+ (cat conftest.dir/file) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+ done
+ rm -rf conftest.dir
 
-if ${am_cv_prog_tar_ustar+:} false; then :
+ if ${am_cv_prog_tar_ustar+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 am_cv_prog_tar_ustar=$_am_tool
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
 $as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
 
 
 
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes. So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+ cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present. This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message. This
+can help us improve future automake versions.
+
+END
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+ echo 'Configuration will proceed anyway, since you have set the' >&2
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+ echo >&2
+ else
+ cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+ fi
+fi
 ac_config_headers="$ac_config_headers config.h"
 
 
@@ -3075,57 +3210,60 @@
 
 $as_echo "#define _WIN32_WINNT 0x0501" >>confdefs.h
 
+
+$as_echo "#define _WIN32_IE 0x0501" >>confdefs.h
+
 ;;
 esac
 ;;
+ *darwin*)
+ SYS=darwin
+ ;;
 *)
 SYS="${host_os}"
 ;;
 esac
 
-# messages
-library_not_found="Could not find required library!"
-function_not_found="Could not find required function!"
-libxml2_missing="Could not find libxml2 - disclib meta parser disabled."
-pkg_config_missing="Could not find pkg-config. Assuming..."
+ if test "${SYS}" = "mingw32"; then
+ HAVE_WIN32_TRUE=
+ HAVE_WIN32_FALSE='#'
+else
+ HAVE_WIN32_TRUE='#'
+ HAVE_WIN32_FALSE=
+fi
 
-# configure options
+ if test "${SYS}" = "darwin"; then
+ HAVE_DARWIN_TRUE=
+ HAVE_DARWIN_FALSE='#'
+else
+ HAVE_DARWIN_TRUE='#'
+ HAVE_DARWIN_FALSE=
+fi
 
 
-# Check whether --with-jdk was given.
-if test "${with_jdk+set}" = set; then :
- withval=$with_jdk; JDK_HOME=$withval
-else
+library_not_found="Could not find required library!"
+function_not_found="Could not find required function!"
 
- # Set JDK_HOME unless already set in environment
- if [ -z "$JDK_HOME" ]; then
- JDK_HOME="/usr/lib/jvm/java-6-openjdk"
- fi
 
+if test -z "$JDK_HOME"; then :
+ JDK_HOME="/usr/lib/jvm/java-6-openjdk"
 fi
 
-
 # Check whether --enable-werror was given.
 if test "${enable_werror+set}" = set; then :
- enableval=$enable_werror; use_werror=$enableval
-else
- use_werror=no
+ enableval=$enable_werror;
 fi
 
 
 # Check whether --enable-extra-warnings was given.
 if test "${enable_extra_warnings+set}" = set; then :
- enableval=$enable_extra_warnings; use_extra_warnings=$enableval
-else
- use_extra_warnings=yes
+ enableval=$enable_extra_warnings;
 fi
 
 
 # Check whether --enable-optimizations was given.
 if test "${enable_optimizations+set}" = set; then :
- enableval=$enable_optimizations; use_optimizations=$enableval
-else
- use_optimizations=yes
+ enableval=$enable_optimizations;
 fi
 
 
@@ -3137,14 +3275,6 @@
 fi
 
 
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
- enableval=$enable_debug; use_debug=$enableval
-else
- use_debug=yes
-fi
-
-
 # Check whether --enable-bdjava was given.
 if test "${enable_bdjava+set}" = set; then :
 enableval=$enable_bdjava; use_bdjava=$enableval
@@ -3153,15 +3283,38 @@
 fi
 
 
-# Check whether --enable-libxml2 was given.
-if test "${enable_libxml2+set}" = set; then :
- enableval=$enable_libxml2; use_libxml2=$enableval
+
+# Check whether --with-libxml2 was given.
+if test "${with_libxml2+set}" = set; then :
+ withval=$with_libxml2;
+fi
+
+
+
+# Check whether --with-freetype was given.
+if test "${with_freetype+set}" = set; then :
+ withval=$with_freetype;
+fi
+
+
+
+# Check whether --with-bdj-type was given.
+if test "${with_bdj_type+set}" = set; then :
+ withval=$with_bdj_type; BDJ_TYPE=$withval
+else
+ BDJ_TYPE=j2se
+fi
+
+
+
+# Check whether --with-bdj-bootclasspath was given.
+if test "${with_bdj_bootclasspath+set}" = set; then :
+ withval=$with_bdj_bootclasspath; BDJ_BOOTCLASSPATH=$withval
 else
- use_libxml2=yes
+ BDJ_BOOTCLASSPATH=
 fi
 
 
-# required programs
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3184,7 +3337,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -3224,7 +3377,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_CC="gcc"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -3277,7 +3430,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_CC="${ac_tool_prefix}cc"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -3318,7 +3471,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
 ac_prog_rejected=yes
 continue
@@ -3376,7 +3529,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -3420,7 +3573,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_CC="$ac_prog"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -3866,8 +4019,7 @@
 /* end confdefs.h. */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3951,6 +4103,65 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -3970,7 +4181,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
 am__include=include
@@ -4026,8 +4237,8 @@
 # We make a subdir and do the tests there. Otherwise we can end up
 # making bogus files that we don't know about and never remove. For
 # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
 rm -rf conftest.dir
 mkdir conftest.dir
 # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -4062,16 +4273,16 @@
 : > sub/conftest.c
 for i in 1 2 3 4 5 6; do
 echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
 done
 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
 # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
 am__obj=sub/conftest.${OBJEXT-o}
 am__minus_obj="-o $am__obj"
 case $depmode in
@@ -4080,8 +4291,8 @@
 test "$am__universal" = false || continue
 ;;
 nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
 if test "x$enable_dependency_tracking" = xyes; then
 	continue
 else
@@ -4089,7 +4300,7 @@
 fi
 ;;
 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # This compiler won't grok '-c -o', but also, the minuso test has
 # not run yet. These depmodes are late enough in the game, and
 # so weak that their functioning should not be impacted.
 am__obj=conftest.${OBJEXT-o}
@@ -4143,6 +4354,7 @@
 fi
 
 
+
 case `pwd` in
 *\ * | *\	*)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -4259,7 +4471,7 @@
 for ac_prog in sed gsed; do
 for ac_exec_ext in '' $ac_executable_extensions; do
 ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
 # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -4335,7 +4547,7 @@
 for ac_prog in grep ggrep; do
 for ac_exec_ext in '' $ac_executable_extensions; do
 ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
 # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4401,7 +4613,7 @@
 for ac_prog in egrep; do
 for ac_exec_ext in '' $ac_executable_extensions; do
 ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
 # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -4468,7 +4680,7 @@
 for ac_prog in fgrep; do
 for ac_exec_ext in '' $ac_executable_extensions; do
 ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+ as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
 # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
@@ -4724,7 +4936,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -4768,7 +4980,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5192,7 +5404,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5232,7 +5444,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_OBJDUMP="objdump"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5404,7 +5616,7 @@
 lt_cv_deplibs_check_method=pass_all
 ;;
 
-netbsd* | netbsdelf*-gnu)
+netbsd*)
 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
 else
@@ -5538,7 +5750,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5578,7 +5790,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_DLLTOOL="dlltool"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5682,7 +5894,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5726,7 +5938,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_AR="$ac_prog"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5851,7 +6063,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5891,7 +6103,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_STRIP="strip"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5950,7 +6162,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5990,7 +6202,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_RANLIB="ranlib"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -6639,7 +6851,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -6679,7 +6891,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -6759,7 +6971,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -6799,7 +7011,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -6851,7 +7063,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -6891,7 +7103,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_NMEDIT="nmedit"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -6943,7 +7155,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -6983,7 +7195,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_LIPO="lipo"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -7035,7 +7247,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -7075,7 +7287,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_OTOOL="otool"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -7127,7 +7339,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -7167,7 +7379,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_OTOOL64="otool64"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -8805,9 +9017,6 @@
 openbsd*)
 with_gnu_ld=no
 ;;
- linux* | k*bsd*-gnu | gnu*)
- link_all_deplibs=no
- ;;
 esac
 
 ld_shlibs=yes
@@ -9029,7 +9238,7 @@
 fi
 ;;
 
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -9206,7 +9415,6 @@
 	if test "$aix_use_runtimelinking" = yes; then
 	 shared_flag="$shared_flag "'${wl}-G'
 	fi
-	link_all_deplibs=no
 else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -9660,7 +9868,7 @@
 link_all_deplibs=yes
 ;;
 
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
 else
@@ -10688,18 +10896,6 @@
 dynamic_linker='GNU/Linux ld.so'
 ;;
 
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
 netbsd*)
 version_type=sunos
 need_lib_prefix=no
@@ -11671,7 +11867,6 @@
 
 
 
-# required types
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
 $as_echo_n "checking return type of signal handlers... " >&6; }
 if ${ac_cv_type_signal+:} false; then :
@@ -11706,7 +11901,6 @@
 
 
 
-# required headers
 for ac_header in stdarg.h sys/types.h dirent.h errno.h libgen.h malloc.h
 do :
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -11746,24 +11940,7 @@
 
 done
 
-if test "${SYS}" != "mingw32" ; then
- for ac_header in pthread.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_H 1
-_ACEOF
 
-else
- as_fn_error $? "pthread.h required" "$LINENO" 5
-fi
-
-done
-
-fi
-
-# required structures
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
 as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -11953,7 +12130,6 @@
 
 
 
-# required system services
 # Check whether --enable-largefile was given.
 if test "${enable_largefile+set}" = set; then :
 enableval=$enable_largefile;
@@ -12150,10 +12326,11 @@
 esac
 rm -rf conftest*
 fi
+
+
 fi
 
 
-# required functions
 ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
 if test "x$ac_cv_func_snprintf" = xyes; then :
 
@@ -12162,16 +12339,28 @@
 fi
 
 
-# required libraries
-# pthreads (not on win32)
-if test "${SYS}" != "mingw32" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_create+:} false; then :
+if test "${SYS}" != "mingw32"; then :
+
+ for ac_header in pthread.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+if test "x$ac_cv_header_pthread_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_PTHREAD_H 1
+_ACEOF
+
+else
+ as_fn_error $? "pthread required" "$LINENO" 5
+fi
+
+done
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5
+$as_echo_n "checking for library containing pthread_create... " >&6; }
+if ${ac_cv_search_pthread_create+:} false; then :
 $as_echo_n "(cached) " >&6
 else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+ ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
@@ -12190,41 +12379,46 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_pthread_pthread_create=yes
-else
- ac_cv_lib_pthread_pthread_create=no
+for ac_lib in '' pthread; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_pthread_create=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
- LIBS="$LIBS -lpthread"
+ conftest$ac_exeext
+ if ${ac_cv_search_pthread_create+:} false; then :
+ break
 fi
+done
+if ${ac_cv_search_pthread_create+:} false; then :
 
+else
+ ac_cv_search_pthread_create=no
 fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_create" >&5
+$as_echo "$ac_cv_search_pthread_create" >&6; }
+ac_res=$ac_cv_search_pthread_create
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-# dlopen check
-if test "${SYS}" != "mingw32" ; then
- for ac_func in dlopen
-do :
- ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_DLOPEN 1
-_ACEOF
- DLOPEN_LIBS=""
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
+ as_fn_error $? "pthread required" "$LINENO" 5
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
 $as_echo_n "(cached) " >&6
 else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
+ ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
@@ -12243,70 +12437,49 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dl_dlopen=yes
-else
- ac_cv_lib_dl_dlopen=no
+for ac_lib in '' dl; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_dlopen=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- DLOPEN_LIBS="-ldl"
-else
- as_fn_error $? "$library_not_found" "$LINENO" 5
-fi
-
+ conftest$ac_exeext
+ if ${ac_cv_search_dlopen+:} false; then :
+ break
 fi
 done
+if ${ac_cv_search_dlopen+:} false; then :
 
-fi
-
-# check for pkg-config itself so we don't try the m4 macro without pkg-config
-# Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_HAVE_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
 else
- if test -n "$HAVE_PKG_CONFIG"; then
- ac_cv_prog_HAVE_PKG_CONFIG="$HAVE_PKG_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_HAVE_PKG_CONFIG="yes"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
+ ac_cv_search_dlopen=no
 fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
 fi
-HAVE_PKG_CONFIG=$ac_cv_prog_HAVE_PKG_CONFIG
-if test -n "$HAVE_PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_PKG_CONFIG" >&5
-$as_echo "$HAVE_PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
 fi
 
+ DLOPEN_LIBS="$ac_cv_search_dlopen"
+ case $DLOPEN_LIBS in #(
+ no|none\ required) :
+ DLOPEN_LIBS="" ;; #(
+ *) :
+ ;;
+esac
 
 
-# libxml2 for metadata parser
-if test "x$use_libxml2" = "xyes"; then
- if test "x$HAVE_PKG_CONFIG" = "xyes"; then
+fi
+
 
 
 
@@ -12333,7 +12506,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -12376,7 +12549,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -12426,6 +12599,8 @@
 		PKG_CONFIG=""
 	fi
 fi
+if test "x$with_libxml2" != "xno"; then :
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML2" >&5
@@ -12483,99 +12658,405 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBXML2_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: $libxml2_missing" >&5
-$as_echo "$as_me: $libxml2_missing" >&6;}
+	as_fn_error $? "Package requirements (libxml-2.0 >= 2.6) were not met:
+
+$LIBXML2_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables LIBXML2_CFLAGS
+and LIBXML2_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: $libxml2_missing" >&5
-$as_echo "$as_me: $libxml2_missing" >&6;}
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables LIBXML2_CFLAGS
+and LIBXML2_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+
 else
 	LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
 	LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-
+	with_libxml2=yes;
 $as_echo "#define HAVE_LIBXML2 1" >>confdefs.h
 
 fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: $pkg_config_missing $libxml2_missing" >&5
-$as_echo "$as_me: $pkg_config_missing $libxml2_missing" >&6;}
- fi
+
 fi
 
-# function testing for supported compiler options
-check_cc_options()
-{
- local tmpfile=$(mktemp XXXXXXXXXX)
- local tmpcfile="$tmpfile.c"
- mv $tmpfile $tmpcfile
- local retval=1
- printf "Checking if compiler supports $@... "
- if $CC -c $@ $tmpcfile -o /dev/null >/dev/null 2>&1; then
- local retval=0
- fi
- rm $tmpcfile
- if [ $retval = "0" ]; then
- echo "yes"
- else
- echo "no"
- fi
- return $retval
-}
+if test "x$with_freetype" != "xno"; then :
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT2" >&5
+$as_echo_n "checking for FT2... " >&6; }
+
+if test -n "$FT2_CFLAGS"; then
+ pkg_cv_FT2_CFLAGS="$FT2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_FT2_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$FT2_LIBS"; then
+ pkg_cv_FT2_LIBS="$FT2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_FT2_LIBS=`$PKG_CONFIG --libs "freetype2" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+	 FT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "freetype2" 2>&1`
+ else
+	 FT2_PKG_ERRORS=`$PKG_CONFIG --print-errors "freetype2" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$FT2_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (freetype2) were not met:
+
+$FT2_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables FT2_CFLAGS
+and FT2_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables FT2_CFLAGS
+and FT2_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+
+else
+	FT2_CFLAGS=$pkg_cv_FT2_CFLAGS
+	FT2_LIBS=$pkg_cv_FT2_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	with_freetype=yes;
+$as_echo "#define HAVE_FT2 1" >>confdefs.h
+
+fi
+
+fi
+
+
+ for flag in -Wall -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wcast-qual -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wshadow; do
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag flag" >&5
+$as_echo_n "checking if $CC supports $flag flag... " >&6; }
+if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $flag"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int main() { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='yes'"
+else
+ eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='no'"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$ac_save_CFLAGS"
+
+fi
+
+
+ if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then :
+
+fi
+
+fi
+eval ac_res=\$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+ if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then :
+ CFLAGS="$CFLAGS $flag";
+fi
+
+ done
+
+
+
+ for flag in -Werror=implicit-function-declaration -Werror-implicit-function-declaration; do
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag flag" >&5
+$as_echo_n "checking if $CC supports $flag flag... " >&6; }
+if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $flag"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int main() { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='yes'"
+else
+ eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='no'"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$ac_save_CFLAGS"
+
+fi
+
+
+ if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then :
+
+fi
+
+fi
+eval ac_res=\$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+ if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then :
+ CFLAGS="$CFLAGS $flag"; break;
+fi
+
+ done
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC way to treat warnings as errors" >&5
+$as_echo_n "checking for $CC way to treat warnings as errors... " >&6; }
+if ${cc_cv_werror+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ if ${cc_cv_cflags__Werror+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Werror"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int main() { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "cc_cv_cflags__Werror='yes'"
+else
+ eval "cc_cv_cflags__Werror='no'"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$ac_save_CFLAGS"
+
+fi
+
+
+ if eval test x$cc_cv_cflags__Werror = xyes; then :
+ cc_cv_werror=-Werror
+else
+
+ if ${cc_cv_cflags__errwarn__all+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -errwarn=%all"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int main() { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "cc_cv_cflags__errwarn__all='yes'"
+else
+ eval "cc_cv_cflags__errwarn__all='no'"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$ac_save_CFLAGS"
+
+fi
+
+
+ if eval test x$cc_cv_cflags__errwarn__all = xyes; then :
+ cc_cv_werror=-errwarn=%all
+fi
+
+fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_cv_werror" >&5
+$as_echo "$cc_cv_werror" >&6; }
+
+if test "x$enable_werror" = "xyes"; then :
+
+ CFLAGS="${CFLAGS} $cc_cv_werror"
+
+fi
+
+if test "x$enable_extra_warnings" != "xno"; then :
+
+
+ for flag in -Wextra -Winline; do
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag flag" >&5
+$as_echo_n "checking if $CC supports $flag flag... " >&6; }
+if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $flag"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int main() { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='yes'"
+else
+ eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='no'"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$ac_save_CFLAGS"
+
+fi
+
+
+ if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then :
+
+fi
+
+fi
+eval ac_res=\$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+ if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then :
+ CFLAGS="$CFLAGS $flag";
+fi
+
+ done
+
+
+fi
+
+if test "x$enable_optimizations" != "xno"; then :
+
+
+ for flag in -O3 -fomit-frame-pointer; do
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag flag" >&5
+$as_echo_n "checking if $CC supports $flag flag... " >&6; }
+if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $flag"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int main() { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='yes'"
+else
+ eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='no'"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$ac_save_CFLAGS"
+
+fi
+
+
+ if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then :
+
+fi
+
+fi
+eval ac_res=\$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+ if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then :
+ CFLAGS="$CFLAGS $flag";
+fi
+
+ done
+
 
-# set default warnings if supported
-check_cc_options -Wall && \
- SET_WARNINGS="$SET_WARNINGS -Wall"
-check_cc_options -Wdisabled-optimization && \
- SET_WARNINGS="$SET_WARNINGS -Wdisabled-optimization"
-check_cc_options -Wpointer-arith && \
- SET_WARNINGS="$SET_WARNINGS -Wpointer-arith"
-check_cc_options -Wredundant-decls && \
- SET_WARNINGS="$SET_WARNINGS -Wredundant-decls"
-check_cc_options -Wcast-qual && \
- SET_WARNINGS="$SET_WARNINGS -Wcast-qual"
-check_cc_options -Wwrite-strings && \
- SET_WARNINGS="$SET_WARNINGS -Wwrite-strings"
-check_cc_options -Wtype-limits && \
- SET_WARNINGS="$SET_WARNINGS -Wtype-limits"
-check_cc_options -Wundef && \
- SET_WARNINGS="$SET_WARNINGS -Wundef"
-
-# no implicit function declarations
-check_cc_options -Werror-implicit-function-declaration && \
- SET_WARNINGS="$SET_WARNINGS -Werror-implicit-function-declaration"
-
-# use -Werror
-if [ $use_werror = "yes" ]; then
- check_cc_options -Werror && \
- SET_WARNINGS="$SET_WARNINGS -Werror"
-fi
-
-# use extra warnings
-if [ $use_extra_warnings = "yes" ]; then
- check_cc_options -Wextra && \
- SET_WARNINGS="$SET_WARNINGS -Wextra"
- check_cc_options -Winline && \
- SET_WARNINGS="$SET_WARNINGS -Winline"
-fi
-
-# use optimizations
-if [ $use_optimizations = "yes" ]; then
- check_cc_options -O3 && \
- SET_OPTIMIZATIONS="$SET_OPTIMIZATIONS -O3"
- check_cc_options -fomit-frame-pointer && \
- SET_OPTIMIZATIONS="$SET_OPTIMIZATIONS -fomit-frame-pointer"
-fi
-
-# use debug
-if [ $use_debug = "yes" ]; then
- check_cc_options -g && \
- SET_DEBUG_OPTS="$SET_DEBUG_OPTS -g"
 fi
 
-# use examples
 if test $use_examples = "yes" ; then
 USING_EXAMPLES_TRUE=
 USING_EXAMPLES_FALSE='#'
@@ -12585,18 +13066,19 @@
 fi
 
 
-# use bdjava
 if [ $use_bdjava = "yes" ]; then
- case $target_cpu in
+ case $host_cpu in
 x86_64) java_arch=amd64 ;;
 i?86) java_arch=i386 ;;
- *) java_arch=$target_cpu ;;
+ *) java_arch=$host_cpu ;;
 esac
- case $target_os in
+ case $host_os in
 linux*) java_os=linux ;;
 win*) java_os=win32 ;;
+ mingw*) java_os=win32 ;;
 freebsd*) java_os=freebsd ;;
- *) java_os=$target_os ;;
+ solaris*) java_os=solaris ;;
+ *) java_os=$host_os ;;
 esac
 
 BDJAVA_CFLAGS="-I${JDK_HOME}/include -I${JDK_HOME}/include/$java_os"
@@ -12627,6 +13109,11 @@
 #define JAVA_ARCH "$java_arch"
 _ACEOF
 
+
+cat >>confdefs.h <<_ACEOF
+#define JDK_HOME "$JDK_HOME"
+_ACEOF
+
 fi
 if test $use_bdjava = "yes" ; then
 USING_BDJAVA_TRUE=
@@ -12637,7 +13124,16 @@
 fi
 
 
-# generate documentation
+if test "$BDJ_TYPE" = "j2me"; then
+
+$as_echo "#define HAVE_BDJ_J2ME 1" >>confdefs.h
+
+else
+ BDJ_TYPE=j2se
+fi
+
+
+
 
 
 # Files:
@@ -12710,7 +13206,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_DX_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -12753,7 +13249,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_ac_pt_DX_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -12816,7 +13312,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_DX_PERL="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -12859,7 +13355,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_ac_pt_DX_PERL="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -12988,7 +13484,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_DX_DOT="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -13031,7 +13527,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_ac_pt_DX_DOT="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -13367,7 +13863,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_DX_HHC="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -13410,7 +13906,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_ac_pt_DX_HHC="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -13686,7 +14182,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_DX_LATEX="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -13729,7 +14225,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_ac_pt_DX_LATEX="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -13792,7 +14288,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_DX_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -13835,7 +14331,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_ac_pt_DX_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -13898,7 +14394,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_DX_DVIPS="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -13941,7 +14437,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_ac_pt_DX_DVIPS="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -14004,7 +14500,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_DX_EGREP="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -14047,7 +14543,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_ac_pt_DX_EGREP="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -14175,7 +14671,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_DX_PDFLATEX="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -14218,7 +14714,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_ac_pt_DX_PDFLATEX="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -14281,7 +14777,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_DX_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -14324,7 +14820,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_ac_pt_DX_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -14387,7 +14883,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_DX_EGREP="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -14430,7 +14926,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_ac_pt_DX_EGREP="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -14556,25 +15052,18 @@
 #echo DX_ENV=$DX_ENV
 
 
-# export library version number
 BLURAY_VERSION_MAJOR=0
 
-BLURAY_VERSION_MINOR=2
-
-BLURAY_VERSION_MICRO=3
-
+BLURAY_VERSION_MINOR=5
 
-# export library (.so) version
-LT_VERSION_INFO="3:0:2"
+BLURAY_VERSION_MICRO=0
 
 
-# generate output files
+LT_VERSION_INFO="6:0:5"
 
 
 
-
-
-ac_config_files="$ac_config_files Makefile src/Makefile src/examples/Makefile src/libbluray.pc src/libbluray/bluray-version.h"
+ac_config_files="$ac_config_files Makefile src/Makefile src/libbluray.pc src/libbluray/bluray-version.h"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -14685,6 +15174,14 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
 if test -n "$EXEEXT"; then
 am__EXEEXT_TRUE=
 am__EXEEXT_FALSE='#'
@@ -14693,6 +15190,14 @@
 am__EXEEXT_FALSE=
 fi
 
+if test -z "${HAVE_WIN32_TRUE}" && test -z "${HAVE_WIN32_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_WIN32\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_DARWIN_TRUE}" && test -z "${HAVE_DARWIN_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_DARWIN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
 as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -15095,16 +15600,16 @@
 # ... but there are two gotchas:
 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 elif ln conf$$.file conf$$ 2>/dev/null; then
 as_ln_s=ln
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -15164,28 +15669,16 @@
 as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -15206,8 +15699,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libbluray $as_me 0.2.3, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+This file was extended by libbluray $as_me 0.5.0, which was
+generated by GNU Autoconf 2.69. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -15272,11 +15765,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libbluray config.status 0.2.3
-configured by $0, generated by GNU Autoconf 2.68,
+libbluray config.status 0.5.0
+configured by $0, generated by GNU Autoconf 2.69,
 with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -15367,7 +15860,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 shift
 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
 CONFIG_SHELL='$SHELL'
@@ -15683,7 +16176,6 @@
 "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
- "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
 "src/libbluray.pc") CONFIG_FILES="$CONFIG_FILES src/libbluray.pc" ;;
 "src/libbluray/bluray-version.h") CONFIG_FILES="$CONFIG_FILES src/libbluray/bluray-version.h" ;;
 
@@ -16282,7 +16774,7 @@
 
 case $ac_file$ac_mode in
 "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
 # are listed without --file. Let's play safe and only enable the eval
 # if we detect the quoting.
 case $CONFIG_FILES in
@@ -16295,7 +16787,7 @@
 # Strip MF so we end up with the name of the file.
 mf=`echo "$mf" | sed -e 's/:.*$//'`
 # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
 # some people rename them; so instead we look at the file content.
 # Grep'ing the first line is not enough: some people post-process
 # each Makefile.in and add a new line on top of each file to say so.
@@ -16329,21 +16821,19 @@
 continue
 fi
 # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
 test -z "$DEPDIR" && continue
 am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
 # Find all dependency output files, they are included files with
 # $(DEPDIR) in their names. We invoke sed twice because it is the
 # simplest approach to changing $(DEPDIR) to its actual value in the
 # expansion.
 for file in `sed -n "
 s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
 # Make sure the directory exists.
 test -f "$dirpart/$file" && continue
 fdir=`$as_dirname -- "$file" ||
@@ -17049,7 +17539,14 @@
 
 echo " Summary:"
 echo " --------"
-echo " BD-J support: $use_bdjava"
-echo " Metadata support: $use_libxml2"
-echo " Build examples: $use_examples"
+echo " BD-J support: $use_bdjava"
+if [ $use_bdjava = "yes" ]; then
+echo " BD-J type: $BDJ_TYPE"
+if test x"$BDJ_BOOTCLASSPATH" != x""; then
+echo " BD-J bootclasspath: $BDJ_BOOTCLASSPATH"
+fi
+fi
+echo " Font support (freetype2): $with_freetype"
+echo " Metadata support (libxml2): $with_libxml2"
+echo " Build examples: $use_examples"

libbluray-0.2.3.tar.bz2/configure.ac -> libbluray-0.5.0.tar.bz2/configure.ac Changed

@@ -1,28 +1,28 @@
-# library version number
+dnl library version number
 m4_define([bluray_major], 0)
-m4_define([bluray_minor], 2)
-m4_define([bluray_micro], 3)
+m4_define([bluray_minor], 5)
+m4_define([bluray_micro], 0)
 m4_define([bluray_version],[bluray_major.bluray_minor.bluray_micro])
 
-# shared library version (.so version)
-#
-# - If there are no interface changes, increase revision.
-# - If interfaces have been added, increase current and age. Set revision to 0.
-# - If interfaces have been changed or removed, increase current and set age and revision to 0.
-#
-# Library file name will be libbluray.so.(current-age).age.revision
-#
-m4_define([lt_current], 3)
+dnl shared library version (.so version)
+dnl
+dnl - If there are no interface changes, increase revision.
+dnl - If interfaces have been added, increase current and age. Set revision to 0.
+dnl - If interfaces have been changed or removed, increase current and set age and revision to 0.
+dnl
+dnl Library file name will be libbluray.so.(current-age).age.revision
+dnl
+m4_define([lt_current], 6)
 m4_define([lt_revision], 0)
-m4_define([lt_age], 2)
+m4_define([lt_age], 5)
 
-# initilization
+dnl initilization
 AC_INIT([libbluray], bluray_version, [http://www.videolan.org/developers/libbluray.html])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([foreign tar-ustar])
-AM_CONFIG_HEADER(config.h)
+AC_CANONICAL_HOST
+AM_INIT_AUTOMAKE([foreign tar-ustar dist-bzip2 no-dist-gzip subdir-objects])
+AC_CONFIG_HEADERS(config.h)
 
 case "${host_os}" in
 "")
@@ -36,50 +36,37 @@
 *mingw32*)
 SYS=mingw32
 AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0500' for Windows XP APIs.])
+ AC_DEFINE([_WIN32_IE], 0x0501, [Define to '0x0501' for IE 5.01.])
 ;;
 esac
 ;;
+ *darwin*)
+ SYS=darwin
+ ;;
 *)
 SYS="${host_os}"
 ;;
 esac
 
-# messages
+AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
+AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin")
+
+dnl messages
 library_not_found="Could not find required library!"
 function_not_found="Could not find required function!"
-libxml2_missing="Could not find libxml2 - disclib meta parser disabled."
-pkg_config_missing="Could not find pkg-config. Assuming..."
-
-# configure options
-
-AC_ARG_WITH([jdk],
- AS_HELP_STRING([--with-jdk=DIR],
- [Specify the path to the JDK (default is "/usr/lib/jvm/java-6-openjdk")]),
- [JDK_HOME=$withval],
- [
- # Set JDK_HOME unless already set in environment
- if [[ -z "$JDK_HOME" ]]; then
- JDK_HOME="/usr/lib/jvm/java-6-openjdk"
- fi
- ])
+
+dnl configure options
+AC_ARG_VAR([JDK_HOME], [Path to the JDK @<:@default=/usr/lib/jvm/java-6-openjdk@:>@])
+AS_IF([test -z "$JDK_HOME"], [JDK_HOME="/usr/lib/jvm/java-6-openjdk"])
 
 AC_ARG_ENABLE([werror],
- [AS_HELP_STRING([--enable-werror],
- [set warnings as errors via -Werror (default is no)])],
- [use_werror=$enableval],
- [use_werror=no])
+ [AS_HELP_STRING([--enable-werror], [set warnings as errors via -Werror @<:@default=disabled@:>@])])
 
 AC_ARG_ENABLE([extra-warnings],
- [AS_HELP_STRING([--enable-extra-warnings],
- [set extra warnings (default is yes)])],
- [use_extra_warnings=$enableval],
- [use_extra_warnings=yes])
+ [AS_HELP_STRING([--disable-extra-warnings], [set extra warnings @<:@default=enabled@:>@])])
 
 AC_ARG_ENABLE([optimizations],
- [AS_HELP_STRING([--enable-optimizations],
- [enable optimizations (default is yes)])],
- [use_optimizations=$enableval],
- [use_optimizations=yes])
+ [AS_HELP_STRING([--disable-optimizations], [disable optimizations @<:@default=enabled@:>@])])
 
 AC_ARG_ENABLE([examples],
 [AS_HELP_STRING([--enable-examples],
@@ -87,164 +74,117 @@
 [use_examples=$enableval],
 [use_examples=yes])
 
-AC_ARG_ENABLE([debug],
- [AS_HELP_STRING([--enable-debug],
- [enable debugging information (default is yes)])],
- [use_debug=$enableval],
- [use_debug=yes])
-
 AC_ARG_ENABLE([bdjava],
 [AS_HELP_STRING([--enable-bdjava],
 [enable BD-Java support (default is no)])],
 [use_bdjava=$enableval],
 [use_bdjava=no])
 
-AC_ARG_ENABLE([libxml2],
- [AS_HELP_STRING([--enable-libxml2],
- [enable libxml2 support (default is yes)])],
- [use_libxml2=$enableval],
- [use_libxml2=yes])
+AC_ARG_WITH([libxml2],
+ [AS_HELP_STRING([--without-libxml2], [build without libxml2 support @<:@default=with@:>@])])
+
+AC_ARG_WITH([freetype],
+ [AS_HELP_STRING([--without-freetype], [build without freetype support @<:@default=with@:>@])])
+
+AC_ARG_WITH([bdj-type],
+ [AS_HELP_STRING([--with-bdj-type=TYPE],
+ [Specify the type of BD-J implementation (j2se, j2me). Default is j2se.])],
+ [BDJ_TYPE=$withval],
+ [BDJ_TYPE=j2se])
+
+AC_ARG_WITH([bdj-bootclasspath],
+ [AS_HELP_STRING([--with-bdj-bootclasspath=PATH],
+ [Specify BD-J build-time bootclass path (example /opt/PhoneME/lib/btclasses.zip;/opt/PhoneME/lib/xmlparer.jar). Default is empty.])],
+ [BDJ_BOOTCLASSPATH=$withval],
+ [BDJ_BOOTCLASSPATH=])
 
-# required programs
+dnl required programs
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_LIBTOOL
 
-# required types
+dnl required types
 AC_TYPE_SIGNAL
 
-# required headers
+dnl required headers
 AC_CHECK_HEADERS([stdarg.h sys/types.h dirent.h errno.h libgen.h malloc.h])
 AC_CHECK_HEADERS([stdlib.h mntent.h linux/cdrom.h inttypes.h strings.h])
 AC_CHECK_HEADERS([sys/time.h time.h mntent.h])
-if test "${SYS}" != "mingw32" ; then
- AC_CHECK_HEADERS(pthread.h,, [AC_MSG_ERROR([pthread.h required])])
-fi
 
-# required structures
+dnl required structures
 AC_STRUCT_DIRENT_D_TYPE
 
-# required system services
+dnl required system services
 AC_SYS_LARGEFILE
 
-# required functions
+dnl required functions
 AC_CHECK_FUNC([snprintf],, [AC_MSG_ERROR($function_not_found)])
 
-# required libraries
-# pthreads (not on win32)
-if test "${SYS}" != "mingw32" ; then
- AC_CHECK_LIB(pthread, pthread_create, [LIBS="$LIBS -lpthread"])
-fi
-
-# dlopen check
-if test "${SYS}" != "mingw32" ; then
- AC_CHECK_FUNCS(
- [dlopen],
- [DLOPEN_LIBS=""],
- [AC_CHECK_LIB([dl], [dlopen],
- [DLOPEN_LIBS="-ldl"],
- [AC_MSG_ERROR($library_not_found)])])
-fi
-
-# check for pkg-config itself so we don't try the m4 macro without pkg-config
-AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes)
-
-# libxml2 for metadata parser
-if test "x$use_libxml2" = "xyes"; then
- if test "x$HAVE_PKG_CONFIG" = "xyes"; then
- PKG_CHECK_MODULES([LIBXML2], libxml-2.0 >= 2.6, 
- [AC_DEFINE([HAVE_LIBXML2], [1], 
- [Define to 1 if libxml2 is to be used for metadata parsing])],
- [AC_MSG_NOTICE($libxml2_missing)])
- else
- AC_MSG_NOTICE($pkg_config_missing $libxml2_missing)
- fi
-fi
-
-# function testing for supported compiler options
-check_cc_options()
-{
- local tmpfile=$(mktemp XXXXXXXXXX)
- local tmpcfile="$tmpfile.c"
- mv $tmpfile $tmpcfile
- local retval=1
- printf "Checking if compiler supports $@... "
- if $CC -c $@ $tmpcfile -o /dev/null >/dev/null 2>&1; then
- local retval=0
- fi
- rm $tmpcfile
- if [[ $retval = "0" ]]; then
- echo "yes"
- else
- echo "no"
- fi
- return $retval
-}
-
-# set default warnings if supported
-check_cc_options -Wall && \
- SET_WARNINGS="$SET_WARNINGS -Wall"
-check_cc_options -Wdisabled-optimization && \
- SET_WARNINGS="$SET_WARNINGS -Wdisabled-optimization"
-check_cc_options -Wpointer-arith && \
- SET_WARNINGS="$SET_WARNINGS -Wpointer-arith"
-check_cc_options -Wredundant-decls && \
- SET_WARNINGS="$SET_WARNINGS -Wredundant-decls"
-check_cc_options -Wcast-qual && \
- SET_WARNINGS="$SET_WARNINGS -Wcast-qual"
-check_cc_options -Wwrite-strings && \
- SET_WARNINGS="$SET_WARNINGS -Wwrite-strings"
-check_cc_options -Wtype-limits && \
- SET_WARNINGS="$SET_WARNINGS -Wtype-limits"
-check_cc_options -Wundef && \
- SET_WARNINGS="$SET_WARNINGS -Wundef"
-
-# no implicit function declarations
-check_cc_options -Werror-implicit-function-declaration && \
- SET_WARNINGS="$SET_WARNINGS -Werror-implicit-function-declaration"
-
-# use -Werror
-if [[ $use_werror = "yes" ]]; then
- check_cc_options -Werror && \
- SET_WARNINGS="$SET_WARNINGS -Werror"
-fi
-
-# use extra warnings
-if [[ $use_extra_warnings = "yes" ]]; then
- check_cc_options -Wextra && \
- SET_WARNINGS="$SET_WARNINGS -Wextra"
- check_cc_options -Winline && \
- SET_WARNINGS="$SET_WARNINGS -Winline"
-fi
-
-# use optimizations
-if [[ $use_optimizations = "yes" ]]; then
- check_cc_options -O3 && \
- SET_OPTIMIZATIONS="$SET_OPTIMIZATIONS -O3"
- check_cc_options -fomit-frame-pointer && \
- SET_OPTIMIZATIONS="$SET_OPTIMIZATIONS -fomit-frame-pointer"
-fi
-
-# use debug
-if [[ $use_debug = "yes" ]]; then
- check_cc_options -g && \
- SET_DEBUG_OPTS="$SET_DEBUG_OPTS -g"
-fi
-
-# use examples
+dnl required libraries
+dnl pthreads (not on win32)
+AS_IF([test "${SYS}" != "mingw32"], [
+ AC_CHECK_HEADERS([pthread.h], ,
+ [AC_MSG_ERROR([pthread required])])
+ AC_SEARCH_LIBS([pthread_create], [pthread], ,
+ [AC_MSG_ERROR([pthread required])])
+ AC_SEARCH_LIBS([dlopen], [dl])
+ DLOPEN_LIBS="$ac_cv_search_dlopen"
+ AS_CASE([$DLOPEN_LIBS],
+ [no|none\ required], [DLOPEN_LIBS=""])
+ AC_SUBST([DLOPEN_LIBS])
+])
+
+dnl libxml2 for metadata parser
+AS_IF([test "x$with_libxml2" != "xno"], [
+ PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6],
+ [with_libxml2=yes; AC_DEFINE([HAVE_LIBXML2], [1],
+ [Define to 1 if libxml2 is to be used for metadata parsing])])
+])
+
+dnl FreeType2
+AS_IF([test "x$with_freetype" != "xno"], [
+ PKG_CHECK_MODULES([FT2], [freetype2],
+ [with_freetype=yes; AC_DEFINE([HAVE_FT2], 1, [Define this if you have FreeType2 library])])
+])
+
+CC_CHECK_CFLAGS_APPEND([-Wall -Wdisabled-optimization -Wpointer-arith ]dnl
+[-Wredundant-decls -Wcast-qual -Wwrite-strings -Wtype-limits -Wundef ]dnl
+[-Wmissing-prototypes -Wshadow])
+
+CC_CHECK_CFLAGS_APPEND([-Werror=implicit-function-declaration ]dnl
+ [-Werror-implicit-function-declaration],
+ [break;])
+
+CC_CHECK_WERROR
+AS_IF([test "x$enable_werror" = "xyes"], [
+ CFLAGS="${CFLAGS} $cc_cv_werror"
+])
+
+AS_IF([test "x$enable_extra_warnings" != "xno"], [
+ CC_CHECK_CFLAGS_APPEND([-Wextra -Winline])
+])
+
+AS_IF([test "x$enable_optimizations" != "xno"], [
+ CC_CHECK_CFLAGS_APPEND([-O3 -fomit-frame-pointer])
+])
+
+dnl use examples
 AM_CONDITIONAL([USING_EXAMPLES], [ test $use_examples = "yes" ])
 
-# use bdjava
+dnl use bdjava
 if [[ $use_bdjava = "yes" ]]; then
- case $target_cpu in
+ case $host_cpu in
 x86_64) java_arch=amd64 ;;
 i?86) java_arch=i386 ;;
- *) java_arch=$target_cpu ;;
+ *) java_arch=$host_cpu ;;
 esac
- case $target_os in
+ case $host_os in
 linux*) java_os=linux ;;
 win*) java_os=win32 ;;
+ mingw*) java_os=win32 ;;
 freebsd*) java_os=freebsd ;;
- *) java_os=$target_os ;;
+ solaris*) java_os=solaris ;;
+ *) java_os=$host_os ;;
 esac
 
 BDJAVA_CFLAGS="-I${JDK_HOME}/include -I${JDK_HOME}/include/$java_os"
@@ -256,13 +196,24 @@
 
 AC_DEFINE([USING_BDJAVA], [1], ["Define to 1 if using BD-Java"])
 AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
+ AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
 fi
 AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ])
 
-# generate documentation
+dnl BD-J type
+if test "$BDJ_TYPE" = "j2me"; then
+ AC_DEFINE([HAVE_BDJ_J2ME], [1], [Define to 1 if using libbluray J2ME stack])
+else
+ BDJ_TYPE=j2se
+fi
+AC_SUBST(BDJ_TYPE)
+dnl bootclasspath
+AC_SUBST(BDJ_BOOTCLASSPATH)
+
+dnl generate documentation
 DX_INIT_DOXYGEN(libbluray, doc/doxygen-config, [doc/doxygen])
 
-# export library version number
+dnl export library version number
 BLURAY_VERSION_MAJOR=bluray_major()
 AC_SUBST(BLURAY_VERSION_MAJOR)
 BLURAY_VERSION_MINOR=bluray_minor()
@@ -270,17 +221,13 @@
 BLURAY_VERSION_MICRO=bluray_micro()
 AC_SUBST(BLURAY_VERSION_MICRO)
 
-# export library (.so) version
+dnl export library (.so) version
 LT_VERSION_INFO="lt_current():lt_revision():lt_age()"
 AC_SUBST(LT_VERSION_INFO)
 
-# generate output files
+dnl generate output files
 AC_SUBST(BDJAVA_CFLAGS)
-AC_SUBST(DLOPEN_LIBS)
-AC_SUBST(SET_WARNINGS)
-AC_SUBST(SET_OPTIMIZATIONS)
-AC_SUBST(SET_DEBUG_OPTS)
-AC_CONFIG_FILES([Makefile src/Makefile src/examples/Makefile src/libbluray.pc src/libbluray/bluray-version.h])
+AC_CONFIG_FILES([Makefile src/Makefile src/libbluray.pc src/libbluray/bluray-version.h])
 AC_OUTPUT
 
 
@@ -290,7 +237,14 @@
 
 echo " Summary:"
 echo " --------"
-echo " BD-J support: $use_bdjava"
-echo " Metadata support: $use_libxml2"
-echo " Build examples: $use_examples"
+echo " BD-J support: $use_bdjava"
+if [[ $use_bdjava = "yes" ]]; then
+echo " BD-J type: $BDJ_TYPE"
+if test x"$BDJ_BOOTCLASSPATH" != x""; then
+echo " BD-J bootclasspath: $BDJ_BOOTCLASSPATH"
+fi
+fi
+echo " Font support (freetype2): $with_freetype"
+echo " Metadata support (libxml2): $with_libxml2"
+echo " Build examples: $use_examples"

libbluray-0.5.0.tar.bz2/m4/attributes.m4 Added

@@ -0,0 +1,296 @@
+dnl Macros to check the presence of generic (non-typed) symbols.
+dnl Copyright (c) 2006-2007 Diego Pettenò <flameeyes@gmail.com>
+dnl Copyright (c) 2006-2007 xine project
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+dnl 02110-1301, USA.
+dnl
+dnl As a special exception, the copyright owners of the
+dnl macro gives unlimited permission to copy, distribute and modify the
+dnl configure scripts that are the output of Autoconf when processing the
+dnl Macro. You need not follow the terms of the GNU General Public
+dnl License when using or distributing such scripts, even though portions
+dnl of the text of the Macro appear in them. The GNU General Public
+dnl License (GPL) does govern all other use of the material that
+dnl constitutes the Autoconf Macro.
+dnl
+dnl This special exception to the GPL applies to versions of the
+dnl Autoconf Macro released by this project. When you make and
+dnl distribute a modified version of the Autoconf Macro, you may extend
+dnl this special exception to the GPL to apply to your modified version as
+dnl well.
+
+dnl Check if the flag is supported by compiler
+dnl CC_CHECK_CFLAGS_SILENT([FLAG], [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
+
+AC_DEFUN([CC_CHECK_CFLAGS_SILENT], [
+ AC_CACHE_VAL(AS_TR_SH([cc_cv_cflags_$1]),
+ [ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $1"
+ AC_LINK_IFELSE([AC_LANG_SOURCE([int main() { return 0; }])],
+ [eval "AS_TR_SH([cc_cv_cflags_$1])='yes'"],
+ [eval "AS_TR_SH([cc_cv_cflags_$1])='no'"])
+ CFLAGS="$ac_save_CFLAGS"
+ ])
+
+ AS_IF([eval test x$]AS_TR_SH([cc_cv_cflags_$1])[ = xyes],
+ [$2], [$3])
+])
+
+dnl Check if the flag is supported by compiler (cacheable)
+dnl CC_CHECK_CFLAGS([FLAG], [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
+
+AC_DEFUN([CC_CHECK_CFLAGS], [
+ AC_CACHE_CHECK([if $CC supports $1 flag],
+ AS_TR_SH([cc_cv_cflags_$1]),
+ CC_CHECK_CFLAGS_SILENT([$1]) dnl Don't execute actions here!
+ )
+
+ AS_IF([eval test x$]AS_TR_SH([cc_cv_cflags_$1])[ = xyes],
+ [$2], [$3])
+])
+
+dnl CC_CHECK_CFLAG_APPEND(FLAG, [action-if-found], [action-if-not-found])
+dnl Check for CFLAG and appends them to CFLAGS if supported
+AC_DEFUN([CC_CHECK_CFLAG_APPEND], [
+ AC_CACHE_CHECK([if $CC supports $1 flag],
+ AS_TR_SH([cc_cv_cflags_$1]),
+ CC_CHECK_CFLAGS_SILENT([$1]) dnl Don't execute actions here!
+ )
+
+ AS_IF([eval test x$]AS_TR_SH([cc_cv_cflags_$1])[ = xyes],
+ [CFLAGS="$CFLAGS $1"; $2], [$3])
+])
+
+dnl CC_CHECK_CFLAGS_APPEND([FLAG1 FLAG2], [action-if-found], [action-if-not])
+AC_DEFUN([CC_CHECK_CFLAGS_APPEND], [
+ for flag in $1; do
+ CC_CHECK_CFLAG_APPEND($flag, [$2], [$3])
+ done
+])
+
+dnl Check if the flag is supported by linker (cacheable)
+dnl CC_CHECK_LDFLAGS([FLAG], [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
+
+AC_DEFUN([CC_CHECK_LDFLAGS], [
+ AC_CACHE_CHECK([if $CC supports $1 flag],
+ AS_TR_SH([cc_cv_ldflags_$1]),
+ [ac_save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $1"
+ AC_LINK_IFELSE([AC_LANG_SOURCE([int main() { return 1; }])],
+ [eval "AS_TR_SH([cc_cv_ldflags_$1])='yes'"],
+ [eval "AS_TR_SH([cc_cv_ldflags_$1])="])
+ LDFLAGS="$ac_save_LDFLAGS"
+ ])
+
+ AS_IF([eval test x$]AS_TR_SH([cc_cv_ldflags_$1])[ = xyes],
+ [$2], [$3])
+])
+
+dnl Check for a -Werror flag or equivalent. -Werror is the GCC
+dnl and ICC flag that tells the compiler to treat all the warnings
+dnl as fatal. We usually need this option to make sure that some
+dnl constructs (like attributes) are not simply ignored.
+dnl
+dnl Other compilers don't support -Werror per se, but they support
+dnl an equivalent flag:
+dnl - Sun Studio compiler supports -errwarn=%all
+AC_DEFUN([CC_CHECK_WERROR], [
+ AC_CACHE_CHECK(
+ [for $CC way to treat warnings as errors],
+ [cc_cv_werror],
+ [CC_CHECK_CFLAGS_SILENT([-Werror], [cc_cv_werror=-Werror],
+ [CC_CHECK_CFLAGS_SILENT([-errwarn=%all], [cc_cv_werror=-errwarn=%all])])
+ ])
+])
+
+AC_DEFUN([CC_CHECK_ATTRIBUTE], [
+ AC_REQUIRE([CC_CHECK_WERROR])
+ AC_CACHE_CHECK([if $CC supports __attribute__(( ifelse([$2], , [$1], [$2]) ))],
+ AS_TR_SH([cc_cv_attribute_$1]),
+ [ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $cc_cv_werror"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([$3])],
+ [eval "AS_TR_SH([cc_cv_attribute_$1])='yes'"],
+ [eval "AS_TR_SH([cc_cv_attribute_$1])='no'"])
+ CFLAGS="$ac_save_CFLAGS"
+ ])
+
+ AS_IF([eval test x$]AS_TR_SH([cc_cv_attribute_$1])[ = xyes],
+ [AC_DEFINE(
+ AS_TR_CPP([SUPPORT_ATTRIBUTE_$1]), 1,
+ [Define this if the compiler supports __attribute__(( ifelse([$2], , [$1], [$2]) ))]
+ )
+ $4],
+ [$5])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_CONSTRUCTOR], [
+ CC_CHECK_ATTRIBUTE(
+ [constructor],,
+ [extern void foo();
+ void __attribute__((constructor)) ctor() { foo(); }],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_DESTRUCTOR], [
+ CC_CHECK_ATTRIBUTE(
+ [destructor],,
+ [extern void foo();
+ void __attribute__((destructor)) dtor() { foo(); }],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_FORMAT], [
+ CC_CHECK_ATTRIBUTE(
+ [format], [format(printf, n, n)],
+ [void __attribute__((format(printf, 1, 2))) printflike(const char *fmt, ...) { fmt = (void *)0; }],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_FORMAT_ARG], [
+ CC_CHECK_ATTRIBUTE(
+ [format_arg], [format_arg(printf)],
+ [char *__attribute__((format_arg(1))) gettextlike(const char *fmt) { fmt = (void *)0; }],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_VISIBILITY], [
+ CC_CHECK_ATTRIBUTE(
+ [visibility_$1], [visibility("$1")],
+ [void __attribute__((visibility("$1"))) $1_function() { }],
+ [$2], [$3])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_NONNULL], [
+ CC_CHECK_ATTRIBUTE(
+ [nonnull], [nonnull()],
+ [void __attribute__((nonnull())) some_function(void *foo, void *bar) { foo = (void*)0; bar = (void*)0; }],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_UNUSED], [
+ CC_CHECK_ATTRIBUTE(
+ [unused], ,
+ [void some_function(void *foo, __attribute__((unused)) void *bar);],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_SENTINEL], [
+ CC_CHECK_ATTRIBUTE(
+ [sentinel], ,
+ [void some_function(void *foo, ...) __attribute__((sentinel));],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_DEPRECATED], [
+ CC_CHECK_ATTRIBUTE(
+ [deprecated], ,
+ [void some_function(void *foo, ...) __attribute__((deprecated));],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_ALIAS], [
+ CC_CHECK_ATTRIBUTE(
+ [alias], [weak, alias],
+ [void other_function(void *foo) { }
+ void some_function(void *foo) __attribute__((weak, alias("other_function")));],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_MALLOC], [
+ CC_CHECK_ATTRIBUTE(
+ [malloc], ,
+ [void * __attribute__((malloc)) my_alloc(int n);],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_PACKED], [
+ CC_CHECK_ATTRIBUTE(
+ [packed], ,
+ [struct astructure { char a; int b; long c; void *d; } __attribute__((packed));
+ char assert@<:@(sizeof(struct astructure) == (sizeof(char)+sizeof(int)+sizeof(long)+sizeof(void*)))-1@:>@;],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_CONST], [
+ CC_CHECK_ATTRIBUTE(
+ [const], ,
+ [int __attribute__((const)) twopow(int n) { return 1 << n; } ],
+ [$1], [$2])
+])
+
+AC_DEFUN([CC_FLAG_VISIBILITY], [
+ AC_REQUIRE([CC_CHECK_WERROR])
+ AC_CACHE_CHECK([if $CC supports -fvisibility=hidden],
+ [cc_cv_flag_visibility],
+ [cc_flag_visibility_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $cc_cv_werror"
+ CC_CHECK_CFLAGS_SILENT([-fvisibility=hidden],
+	cc_cv_flag_visibility='yes',
+	cc_cv_flag_visibility='no')
+ CFLAGS="$cc_flag_visibility_save_CFLAGS"])
+
+ AS_IF([test "x$cc_cv_flag_visibility" = "xyes"],
+ [AC_DEFINE([SUPPORT_FLAG_VISIBILITY], 1,
+ [Define this if the compiler supports the -fvisibility flag])
+ $1],
+ [$2])
+])
+
+AC_DEFUN([CC_FUNC_EXPECT], [
+ AC_REQUIRE([CC_CHECK_WERROR])
+ AC_CACHE_CHECK([if compiler has __builtin_expect function],
+ [cc_cv_func_expect],
+ [ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $cc_cv_werror"
+ AC_COMPILE_IFELSE(
+ [int some_function() {
+ int a = 3;
+ return (int)__builtin_expect(a, 3);
+	}],
+ [cc_cv_func_expect=yes],
+ [cc_cv_func_expect=no])
+ CFLAGS="$ac_save_CFLAGS"
+ ])
+
+ AS_IF([test "x$cc_cv_func_expect" = "xyes"],
+ [AC_DEFINE([SUPPORT__BUILTIN_EXPECT], 1,
+ [Define this if the compiler supports __builtin_expect() function])
+ $1],
+ [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_ALIGNED], [
+ AC_REQUIRE([CC_CHECK_WERROR])
+ AC_CACHE_CHECK([highest __attribute__ ((aligned ())) supported],
+ [cc_cv_attribute_aligned],
+ [ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $cc_cv_werror"
+ for cc_attribute_align_try in 64 32 16 8 4 2; do
+ AC_COMPILE_IFELSE([
+ int main() {
+ static char c __attribute__ ((aligned($cc_attribute_align_try))) = 0;
+ return c;
+ }], [cc_cv_attribute_aligned=$cc_attribute_align_try; break])
+ done
+ CFLAGS="$ac_save_CFLAGS"
+ ])
+
+ if test "x$cc_cv_attribute_aligned" != "x"; then
+ AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], [$cc_cv_attribute_aligned],
+ [Define the highest alignment supported])
+ fi
+])

libbluray-0.2.3.tar.bz2/m4/libtool.m4 -> libbluray-0.5.0.tar.bz2/m4/libtool.m4 Changed

@@ -2684,18 +2684,6 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -3301,7 +3289,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu)
+netbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -4113,7 +4101,7 @@
 	    ;;
 	esac
 	;;
-      netbsd* | netbsdelf*-gnu)
+      netbsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4590,9 +4578,6 @@
       ;;
     esac
     ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
     ;;
@@ -4655,9 +4640,6 @@
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4879,7 +4861,7 @@
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -5056,7 +5038,6 @@
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -5361,7 +5342,7 @@
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else

libbluray-0.2.3.tar.bz2/player_wrappers/xine/HOWTO -> libbluray-0.5.0.tar.bz2/player_wrappers/xine/HOWTO Changed

libbluray-0.2.3.tar.bz2/player_wrappers/xine/Makefile -> libbluray-0.5.0.tar.bz2/player_wrappers/xine/Makefile Changed

libbluray-0.2.3.tar.bz2/player_wrappers/xine/input_bluray.c -> libbluray-0.5.0.tar.bz2/player_wrappers/xine/input_bluray.c Changed

@@ -1,7 +1,7 @@
 /*
 * Copyright (C) 2000-2005 the xine project
 *
- * Copyright (C) 2009-2011 Petri Hintukainen <phintuka@users.sourceforge.net>
+ * Copyright (C) 2009-2013 Petri Hintukainen <phintuka@users.sourceforge.net>
 *
 * This file is part of xine, a free video player.
 *
@@ -27,24 +27,21 @@
 #include "config.h"
 #endif
 
-/* asprintf: */
-#define _GNU_SOURCE
-
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <dlfcn.h>
 #include <pthread.h>
 
+/* libbluray */
 #include <libbluray/bluray.h>
+#include <libbluray/bluray-version.h>
 #include <libbluray/keys.h>
 #include <libbluray/overlay.h>
 #include <libbluray/meta_data.h>
 
+/* xine */
+
 #define LOG_MODULE "input_bluray"
 #define LOG_VERBOSE
 
@@ -98,11 +95,45 @@
 } bluray_input_class_t;
 
 typedef struct {
+ BD_ARGB_BUFFER buf;
+ pthread_mutex_t buf_lock;
+} XINE_BD_ARGB_BUFFER;
+
+static void osd_buf_lock(BD_ARGB_BUFFER *buf_gen)
+{
+ XINE_BD_ARGB_BUFFER *buf = (XINE_BD_ARGB_BUFFER*)buf_gen;
+ pthread_mutex_lock(&buf->buf_lock);
+}
+
+static void osd_buf_unlock(BD_ARGB_BUFFER *buf_gen)
+{
+ XINE_BD_ARGB_BUFFER *buf = (XINE_BD_ARGB_BUFFER*)buf_gen;
+ pthread_mutex_unlock(&buf->buf_lock);
+}
+
+static void osd_buf_init(XINE_BD_ARGB_BUFFER *buf)
+{
+ buf->buf.lock = osd_buf_lock;
+ buf->buf.unlock = osd_buf_unlock;
+ pthread_mutex_init(&buf->buf_lock, NULL);
+}
+
+static void osd_buf_destroy(XINE_BD_ARGB_BUFFER *buf)
+{
+ if (buf->buf.lock) {
+ buf->buf.lock = NULL;
+ buf->buf.unlock = NULL;
+ pthread_mutex_destroy(&buf->buf_lock);
+ }
+}
+
+typedef struct {
 input_plugin_t input_plugin;
 
 xine_stream_t *stream;
 xine_event_queue_t *event_queue;
 xine_osd_t *osd[2];
+ XINE_BD_ARGB_BUFFER osd_buf;
 
 bluray_input_class_t *class;
 
@@ -123,17 +154,24 @@
 pthread_mutex_t title_info_mutex; /* lock this when accessing title_info outside of input/demux thread */
 unsigned int current_clip;
 time_t still_end_time;
- int error;
- int menu_open;
- int stream_flushed;
- int pg_enable;
 int pg_stream;
+
+ uint8_t nav_mode : 1;
+ uint8_t error : 1;
+ uint8_t menu_open : 1;
+ uint8_t stream_flushed : 1;
+ uint8_t demux_action_req : 1;
+ uint8_t end_of_title : 1;
+ uint8_t pg_enable : 1;
+ uint8_t has_video : 1;
 int mouse_inside_button;
+} bluray_input_plugin_t;
 
- uint32_t cap_seekable;
- uint8_t nav_mode;
+/*
+ * overlay
+ */
 
-} bluray_input_plugin_t;
+#define PALETTE_INDEX_BACKGROUND 0xff
 
 static void send_num_buttons(bluray_input_plugin_t *this, int n)
 {
@@ -148,15 +186,15 @@
 xine_event_send(this->stream, &event);
 }
 
-static xine_osd_t *get_overlay(bluray_input_plugin_t *this, int plane)
+static void clear_overlay(xine_osd_t *osd)
 {
- if (!this->osd[plane]) {
- this->osd[plane] = xine_osd_new(this->stream, 0, 0, 1920, 1080);
- }
- if (!this->pg_enable) {
- _x_select_spu_channel(this->stream, -1);
- }
- return this->osd[plane];
+ /* palette entry 0xff is background --> can't use xine_osd_clear(). */
+ memset(osd->osd.area, PALETTE_INDEX_BACKGROUND, osd->osd.width * osd->osd.height);
+ osd->osd.x1 = osd->osd.width;
+ osd->osd.y1 = osd->osd.height;
+ osd->osd.x2 = 0;
+ osd->osd.y2 = 0;
+ osd->osd.area_touched = 0;
 }
 
 static void close_overlay(bluray_input_plugin_t *this, int plane)
@@ -170,18 +208,38 @@
 if (plane < 2 && this->osd[plane]) {
 xine_osd_free(this->osd[plane]);
 this->osd[plane] = NULL;
- if (plane == 1) {
- send_num_buttons(this, 0);
- this->menu_open = 0;
- }
+ free(this->osd_buf.buf.buf[plane]);
+ this->osd_buf.buf.buf[plane] = NULL;
 }
 }
 
-static void open_overlay(bluray_input_plugin_t *this, const BD_OVERLAY * const ov)
+static void open_overlay(bluray_input_plugin_t *this, int plane, uint16_t x, uint16_t y, uint16_t w, uint16_t h)
 {
- if (!this->osd[ov->plane]) {
- this->osd[ov->plane] = xine_osd_new(this->stream, ov->x, ov->y, ov->w, ov->h);
+ if (this->osd[plane]) {
+ close_overlay(this, plane);
+ }
+
+ this->osd[plane] = xine_osd_new(this->stream, x, y, w, h);
+
+ if (xine_osd_get_capabilities(this->osd[plane]) & XINE_OSD_CAP_ARGB_LAYER) {
+ this->osd_buf.buf.width = w;
+ this->osd_buf.buf.height = h;
+ this->osd_buf.buf.buf[plane] = calloc(sizeof(uint32_t), w * h);
 }
+
+ clear_overlay(this->osd[plane]);
+}
+
+static xine_osd_t *get_overlay(bluray_input_plugin_t *this, int plane)
+{
+ if (!this->osd[plane]) {
+ open_overlay(this, plane, 0, 0, 1920, 1080);
+ }
+ if (!this->pg_enable) {
+ _x_select_spu_channel(this->stream, -1);
+ }
+ this->stream->video_out->enable_ovl(this->stream->video_out, 1);
+ return this->osd[plane];
 }
 
 static void draw_bitmap(xine_osd_t *osd, const BD_OVERLAY * const ov)
@@ -219,6 +277,8 @@
 static void overlay_proc(void *this_gen, const BD_OVERLAY * const ov)
 {
 bluray_input_plugin_t *this = (bluray_input_plugin_t *) this_gen;
+ xine_osd_t *osd;
+ int64_t vpts;
 
 if (!this) {
 return;
@@ -234,18 +294,20 @@
 return;
 }
 
-#if defined(BD_OVERLAY_INTERFACE_VERSION) && BD_OVERLAY_INTERFACE_VERSION >= 2
-
 switch (ov->cmd) {
 case BD_OVERLAY_INIT: /* init overlay plane. Size of full plane in x,y,w,h */
- open_overlay(this, ov);
+ open_overlay(this, ov->plane, ov->x, ov->y, ov->w, ov->h);
 return;
 case BD_OVERLAY_CLOSE: /* close overlay */
 close_overlay(this, ov->plane);
 return;
 }
 
- xine_osd_t *osd = get_overlay(this, ov->plane);
+ osd = get_overlay(this, ov->plane);
+ vpts = 0;
+ if (ov->pts > 0) {
+ vpts = this->stream->metronom->got_spu_packet (this->stream->metronom, ov->pts);
+ }
 
 switch (ov->cmd) {
 case BD_OVERLAY_DRAW: /* draw bitmap (x,y,w,h,img,palette) */
@@ -253,21 +315,22 @@
 return;
 
 case BD_OVERLAY_WIPE: /* clear area (x,y,w,h) */
- xine_osd_draw_rect(osd, ov->x, ov->y, ov->x + ov->w - 1, ov->y + ov->h - 1, 0xff, 1);
+ xine_osd_draw_rect(osd, ov->x, ov->y, ov->x + ov->w - 1, ov->y + ov->h - 1, PALETTE_INDEX_BACKGROUND, 1);
 return;
 
 case BD_OVERLAY_CLEAR: /* clear plane */
- xine_osd_draw_rect(osd, 0, 0, osd->osd.width - 1, osd->osd.height - 1, 0xff, 1);
- xine_osd_clear(osd);
- xine_osd_hide(osd, 0);
+ clear_overlay(osd);
 return;
 
- case BD_OVERLAY_FLUSH: /* all changes have been done, flush overlay to display at given pts */
- xine_osd_show(osd, 0);
+ case BD_OVERLAY_HIDE:
+ osd->osd.area_touched = 0; /* will be hiden at next commit time */
+ break;
 
- if (ov->plane == 1) {
- this->menu_open = 1;
- send_num_buttons(this, 1);
+ case BD_OVERLAY_FLUSH: /* all changes have been done, flush overlay to display at given pts */
+ if (!osd->osd.area_touched) {
+ xine_osd_hide(osd, vpts);
+ } else {
+ xine_osd_show(osd, vpts);
 }
 return;
 
@@ -275,35 +338,55 @@
 LOGMSG("unknown overlay command %d", ov->cmd);
 return;
 }
+}
 
-#else
+static void argb_overlay_proc(void *this_gen, const BD_ARGB_OVERLAY * const ov)
+{
+ bluray_input_plugin_t *this = (bluray_input_plugin_t *) this_gen;
+ xine_osd_t *osd;
+ int64_t vpts;
 
- xine_osd_t *osd = get_overlay(this, ov->plane);
+ if (!this) {
+ return;
+ }
 
- if (ov->img) {
- draw_bitmap(osd, ov);
+ if (!ov) {
+ /* hide OSD */
+ close_overlay(this, -1);
+ return;
+ }
 
- } else {
+ vpts = 0;
+ if (ov->pts > 0) {
+ vpts = this->stream->metronom->got_spu_packet (this->stream->metronom, ov->pts);
+ }
 
- if (ov->x == 0 && ov->y == 0 && ov->w == 1920 && ov->h == 1080) {
- /* Nothing to display, close OSD */
+ switch (ov->cmd) {
+ case BD_ARGB_OVERLAY_INIT:
+ open_overlay(this, ov->plane, 0, 0, ov->w, ov->h);
+ return;
+ case BD_ARGB_OVERLAY_CLOSE:
 close_overlay(this, ov->plane);
 return;
- }
-
- /* wipe rect */
- xine_osd_draw_rect(osd, ov->x, ov->y, ov->x + ov->w - 1, ov->y + ov->h - 1, 0xff, 1);
- }
+ case BD_ARGB_OVERLAY_DRAW:
+ /* nothing to do */
+ return;
 
- /* display */
+ case BD_ARGB_OVERLAY_FLUSH:
+ osd = get_overlay(this, ov->plane);
+ xine_osd_set_argb_buffer(osd, this->osd_buf.buf.buf[ov->plane],
+ this->osd_buf.buf.dirty[ov->plane].x0,
+ this->osd_buf.buf.dirty[ov->plane].y0,
+ this->osd_buf.buf.dirty[ov->plane].x1 - this->osd_buf.buf.dirty[ov->plane].x0 + 1,
+ this->osd_buf.buf.dirty[ov->plane].y1 - this->osd_buf.buf.dirty[ov->plane].y0 + 1);
 
- xine_osd_show(osd, 0);
+ xine_osd_show(osd, vpts);
+ return;
 
- if (ov->plane == 1) {
- this->menu_open = 1;
- send_num_buttons(this, 1);
+ default:
+ lprintf("unknown ARGB overlay command %d\n", ov->cmd);
+ return;
 }
-#endif
 }
 
 /*
@@ -412,59 +495,55 @@
 
 update_stream_info(this);
 
- /* set title */
+ /* set title name */
 update_title_name(this);
 }
 
-static int open_title (bluray_input_plugin_t *this, int title_idx)
-{
- if (bd_select_title(this->bdh, title_idx) <= 0) {
- LOGMSG("bd_select_title(%d) failed\n", title_idx);
- return 0;
- }
-
- this->current_title_idx = title_idx;
-
- update_title_info(this, -1);
-
- return 1;
-}
-
-#ifndef DEMUX_OPTIONAL_DATA_FLUSH
-# define DEMUX_OPTIONAL_DATA_FLUSH 0x10000
-#endif
+/*
+ * libbluray event handling
+ */
 
 static void stream_flush(bluray_input_plugin_t *this)
 {
- if (this->stream_flushed)
+ if (this->stream_flushed || !this->stream)
 return;
 
 lprintf("Stream flush\n");
 
 this->stream_flushed = 1;
 
- int tmp = 0;
- if (DEMUX_OPTIONAL_SUCCESS !=
- this->stream->demux_plugin->get_optional_data(this->stream->demux_plugin, &tmp, DEMUX_OPTIONAL_DATA_FLUSH)) {
- LOGMSG("stream flush not supported by the demuxer !\n");
- return;
- }
+ xine_event_t event = {
+ .type = XINE_EVENT_END_OF_CLIP,
+ .stream = this->stream,
+ .data = NULL,
+ .data_length = 0,
+ };
+ xine_event_send (this->stream, &event);
+
+ this->demux_action_req = 1;
 }
 
 static void stream_reset(bluray_input_plugin_t *this)
 {
- if (!this || !this->stream || !this->stream->demux_plugin)
+ if (!this || !this->stream)
 return;
 
 lprintf("Stream reset\n");
 
- this->cap_seekable = 0;
+ xine_event_t event = {
+ .type = XINE_EVENT_PIDS_CHANGE,
+ .stream = this->stream,
+ .data = NULL,
+ .data_length = 0,
+ };
+
+ if (!this->end_of_title) {
+ _x_demux_flush_engine(this->stream);
+ }
 
- _x_set_fine_speed(this->stream, XINE_FINE_SPEED_NORMAL);
- this->stream->demux_plugin->seek(this->stream->demux_plugin, 0, 0, 1);
- _x_demux_control_start(this->stream);
+ xine_event_send (this->stream, &event);
 
- this->cap_seekable = INPUT_CAP_SEEKABLE;
+ this->demux_action_req = 1;
 }
 
 static void wait_secs(bluray_input_plugin_t *this, unsigned seconds)
@@ -519,9 +598,12 @@
 
 static void handle_libbluray_event(bluray_input_plugin_t *this, BD_EVENT ev)
 {
- switch (ev.event) {
+ switch ((bd_event_e)ev.event) {
 
 case BD_EVENT_ERROR:
+ lprintf("BD_EVENT_ERROR\n");
+ _x_message (this->stream, XINE_MSG_GENERAL_WARNING,
+ "Error playing BluRay disc", NULL);
 this->error = 1;
 return;
 
@@ -553,14 +635,15 @@
 case BD_EVENT_STILL:
 lprintf("BD_EVENT_STILL %d\n", ev.param);
 int paused = _x_get_fine_speed(this->stream) == XINE_SPEED_PAUSE;
- if (paused && !ev.param) {
- _x_set_fine_speed(this->stream, XINE_FINE_SPEED_NORMAL);
- }
- if (!paused && ev.param) {
- _x_set_fine_speed(this->stream, XINE_SPEED_PAUSE);
+ if (paused != ev.param) {
+ _x_set_fine_speed(this->stream, ev.param ? XINE_SPEED_PAUSE : XINE_SPEED_NORMAL);
 }
 break;
 
+ case BD_EVENT_IDLE:
+ xine_usec_sleep(10000);
+ break;
+
 /* playback position */
 
 case BD_EVENT_ANGLE:
@@ -571,6 +654,7 @@
 case BD_EVENT_END_OF_TITLE:
 lprintf("BD_EVENT_END_OF_TITLE\n");
 stream_flush(this);
+ this->end_of_title = 1;
 break;
 
 case BD_EVENT_TITLE:
@@ -583,6 +667,7 @@
 this->current_clip = 0;
 update_title_info(this, ev.param);
 stream_reset(this);
+ this->end_of_title = 0;
 break;
 
 case BD_EVENT_PLAYITEM:
@@ -600,23 +685,36 @@
 
 case BD_EVENT_AUDIO_STREAM:
 lprintf("BD_EVENT_AUDIO_STREAM %d\n", ev.param);
- update_audio_channel(this, ev.param - 1);
+ if (ev.param < 32) {
+ update_audio_channel(this, ev.param - 1);
+ } else {
+ update_audio_channel(this, 0);
+ }
 break;
 
 case BD_EVENT_PG_TEXTST:
 lprintf("BD_EVENT_PG_TEXTST %s\n", ev.param ? "ON" : "OFF");
- this->pg_enable = ev.param;
+ this->pg_enable = !!ev.param;
 update_spu_channel(this, this->pg_enable ? this->pg_stream : -1);
 break;
 
 case BD_EVENT_PG_TEXTST_STREAM:
 lprintf("BD_EVENT_PG_TEXTST_STREAM %d\n", ev.param);
- this->pg_stream = ev.param - 1;
+ if (ev.param < 64) {
+ this->pg_stream = ev.param - 1;
+ } else {
+ this->pg_stream = -1;
+ }
 if (this->pg_enable) {
 update_spu_channel(this, this->pg_stream);
 }
 break;
 
+ case BD_EVENT_MENU:
+ this->menu_open = !!ev.param;
+ send_num_buttons(this, ev.param);
+ break;
+
 case BD_EVENT_IG_STREAM:
 case BD_EVENT_SECONDARY_AUDIO:
 case BD_EVENT_SECONDARY_AUDIO_STREAM:
@@ -643,6 +741,24 @@
 }
 }
 
+/*
+ * xine event handling
+ */
+
+static int open_title (bluray_input_plugin_t *this, int title_idx)
+{
+ if (bd_select_title(this->bdh, title_idx) <= 0) {
+ LOGMSG("bd_select_title(%d) failed\n", title_idx);
+ return 0;
+ }
+
+ this->current_title_idx = title_idx;
+
+ update_title_info(this, -1);
+
+ return 1;
+}
+
 static void send_mouse_enter_leave_event(bluray_input_plugin_t *this, int direction)
 {
 if (direction != this->mouse_inside_button) {
@@ -664,10 +780,11 @@
 
 static void handle_events(bluray_input_plugin_t *this)
 {
+ xine_event_t *event;
+
 if (!this->event_queue)
 return;
 
- xine_event_t *event;
 while (NULL != (event = xine_event_get(this->event_queue))) {
 
 if (!this->bdh || !this->title_info) {
@@ -680,8 +797,8 @@
 
 if (this->menu_open) {
 switch (event->type) {
- case XINE_EVENT_INPUT_LEFT: bd_user_input(this->bdh, pts, BD_VK_LEFT); break;
- case XINE_EVENT_INPUT_RIGHT: bd_user_input(this->bdh, pts, BD_VK_RIGHT); break;
+ case XINE_EVENT_INPUT_LEFT: bd_user_input(this->bdh, pts, BD_VK_LEFT); break;
+ case XINE_EVENT_INPUT_RIGHT: bd_user_input(this->bdh, pts, BD_VK_RIGHT); break;
 }
 } else {
 switch (event->type) {
@@ -824,19 +941,27 @@
 
 static uint32_t bluray_plugin_get_capabilities (input_plugin_t *this_gen)
 {
- bluray_input_plugin_t *this = (bluray_input_plugin_t *) this_gen;
- return this->cap_seekable |
+ return INPUT_CAP_SEEKABLE |
 INPUT_CAP_BLOCK |
 INPUT_CAP_AUDIOLANG |
 INPUT_CAP_SPULANG |
 INPUT_CAP_CHAPTERS;
 }
 
-#if XINE_VERSION_CODE >= 10190
+#define CHECK_READ_INTERRUPT \
+ do { \
+ if (this->demux_action_req) { \
+ this->demux_action_req = 0; \
+ errno = EAGAIN; \
+ return -1; \
+ } \
+ if (_x_action_pending(this->stream)) { \
+ errno = EINTR; \
+ return -1; \
+ } \
+ } while (0)
+
 static off_t bluray_plugin_read (input_plugin_t *this_gen, void *buf, off_t len)
-#else
-static off_t bluray_plugin_read (input_plugin_t *this_gen, char *buf, off_t len)
-#endif
 {
 bluray_input_plugin_t *this = (bluray_input_plugin_t *) this_gen;
 off_t result;
@@ -844,31 +969,58 @@
 if (!this || !this->bdh || len < 0 || this->error)
 return -1;
 
+ if (!this->has_video) {
+ vo_frame_t *img = NULL;
+ this->class->xine->port_ticket->acquire (this->class->xine->port_ticket, 1);
+ img = this->stream->video_out->get_frame (this->stream->video_out,
+ 1920, 1080, 16.0/9.0,
+ XINE_IMGFMT_YV12, VO_BOTH_FIELDS);
+ this->class->xine->port_ticket->release (this->class->xine->port_ticket, 1);
+
+ if (img) {
+ if (img->format == XINE_IMGFMT_YV12 && img->base[0] && img->base[1] && img->base[2]) {
+ memset(img->base[0], 0x00, img->pitches[0] * img->height);
+ memset(img->base[1], 0x80, img->pitches[1] * img->height / 2);
+ memset(img->base[2], 0x80, img->pitches[2] * img->height / 2);
+ img->duration = 0;
+ img->pts = 0;
+ img->bad_frame = 0;
+ img->draw(img, this->stream);
+ }
+ img->free(img);
+ }
+
+ this->has_video = 1;
+ }
+
 handle_events(this);
+ CHECK_READ_INTERRUPT;
 
 if (this->nav_mode) {
 do {
 BD_EVENT ev;
 result = bd_read_ext (this->bdh, (unsigned char *)buf, len, &ev);
 handle_libbluray_event(this, ev);
+ CHECK_READ_INTERRUPT;
+
 if (result == 0) {
 handle_events(this);
- if (ev.event == BD_EVENT_NONE) {
- if (_x_action_pending(this->stream)) {
- break;
- }
- }
+ CHECK_READ_INTERRUPT;
 }
 } while (!this->error && result == 0);
+
 } else {
 result = bd_read (this->bdh, (unsigned char *)buf, len);
 handle_libbluray_events(this);
 }
 
- if (result < 0)
+ if (result < 0) {
 LOGMSG("bd_read() failed: %s (%d of %d)\n", strerror(errno), (int)result, (int)len);
+ }
 
- this->stream_flushed = 0;
+ if (result > 0) {
+ this->stream_flushed = 0;
+ }
 
 return result;
 }
@@ -1069,7 +1221,7 @@
 return INPUT_OPTIONAL_UNSUPPORTED;
 
 default:
- return DEMUX_OPTIONAL_UNSUPPORTED;
+ return INPUT_OPTIONAL_UNSUPPORTED;
 }
 
 return INPUT_OPTIONAL_UNSUPPORTED;
@@ -1093,8 +1245,10 @@
 {
 bluray_input_plugin_t *this = (bluray_input_plugin_t *) this_gen;
 
- if (this->bdh)
+ if (this->bdh) {
+ bd_register_argb_overlay_proc(this->bdh, NULL, NULL, NULL);
 bd_register_overlay_proc(this->bdh, NULL, NULL);
+ }
 
 close_overlay(this, -1);
 
@@ -1112,6 +1266,8 @@
 if (this->bdh)
 bd_close(this->bdh);
 
+ osd_buf_destroy(&this->osd_buf);
+
 free (this->mrl);
 free (this->disc_root);
 free (this->disc_name);
@@ -1215,9 +1371,10 @@
 return -1;
 }
 
+#if 0
 if (this->nav_mode && !disc_info->first_play_supported) {
 _x_message (this->stream, XINE_MSG_GENERAL_WARNING,
- "Can't play disc in HDMV navigation mode",
+ "Can't play disc using menus",
 "First Play title not supported", NULL);
 this->nav_mode = 0;
 }
@@ -1227,7 +1384,7 @@
 "Unsupported titles found",
 "Some titles can't be played in navigation mode", NULL);
 }
-
+#endif
 this->num_titles = disc_info->num_hdmv_titles + disc_info->num_bdj_titles;
 this->disc_info = disc_info;
 
@@ -1274,7 +1431,7 @@
 
 /* select title */
 
- /* if title was not in mrl, find the main title */
+ /* if title was not in mrl, guess the main title */
 if (title < 0) {
 uint64_t duration = 0;
 int i, playlist = 99999;
@@ -1323,6 +1480,13 @@
 
 /* register overlay (graphics) handler */
 
+ if (this->stream->video_out->get_capabilities(this->stream->video_out) & VO_CAP_ARGB_LAYER_OVERLAY) {
+fprintf(stderr, "argb overlays\n");
+ osd_buf_init(&this->osd_buf);
+ bd_register_argb_overlay_proc(this->bdh, this, argb_overlay_proc, &this->osd_buf.buf);
+ } else {
+ fprintf(stderr, "no argb overlay support. NO BD-J.\n");
+ }
 bd_register_overlay_proc(this->bdh, this, overlay_proc);
 
 /* open */
@@ -1368,8 +1532,6 @@
 this->class = (bluray_input_class_t*)cls_gen;
 this->mrl = strdup(mrl);
 
- this->cap_seekable = INPUT_CAP_SEEKABLE;
-
 this->input_plugin.open = bluray_plugin_open;
 this->input_plugin.get_capabilities = bluray_plugin_get_capabilities;
 this->input_plugin.read = bluray_plugin_read;
@@ -1433,25 +1595,7 @@
 this->parental = cfg->num_value;
 }
 
-#if INPUT_PLUGIN_IFACE_VERSION < 18
-static const char *bluray_class_get_description (input_class_t *this_gen)
-{
- (void)this_gen;
-
- return _("BluRay input plugin");
-}
-#endif
-
-#if INPUT_PLUGIN_IFACE_VERSION < 18
-static const char *bluray_class_get_identifier (input_class_t *this_gen)
-{
- (void)this_gen;
-
- return "bluray";
-}
-#endif
-
-static char **bluray_class_get_autoplay_list (input_class_t *this_gen, int *num_files)
+static const char * const *bluray_class_get_autoplay_list (input_class_t *this_gen, int *num_files)
 {
 (void)this_gen;
 
@@ -1459,7 +1603,7 @@
 
 *num_files = 1;
 
- return autoplay_list;
+ return (const char * const *)autoplay_list;
 }
 
 static int bluray_class_eject_media (input_class_t *this_gen)
@@ -1493,13 +1637,8 @@
 this->xine = xine;
 
 this->input_class.get_instance = bluray_class_get_instance;
-#if INPUT_PLUGIN_IFACE_VERSION < 18
- this->input_class.get_identifier = bluray_class_get_identifier;
- this->input_class.get_description = bluray_class_get_description;
-#else
 this->input_class.identifier = "bluray";
 this->input_class.description = _("BluRay input plugin");
-#endif
 this->input_class.get_dir = NULL;
 this->input_class.get_autoplay_list = bluray_class_get_autoplay_list;
 this->input_class.dispose = bluray_class_dispose;
@@ -1554,18 +1693,37 @@
 return this;
 }
 
+static const char * const *bd_class_get_autoplay_list (input_class_t *this_gen, int *num_files)
+{
+ static const char * const autoplay_list[] = { "bd:/", NULL };
+
+ *num_files = 1;
+
+ return autoplay_list;
+}
+
+static void *bd_init_plugin (xine_t *xine, void *data)
+{
+ bluray_input_class_t *this = bluray_init_plugin(xine, data);
+
+ if (this) {
+ this->input_class.identifier = "bluray";
+ this->input_class.description = _("BluRay input plugin (using menus)");
+
+ this->input_class.get_dir = NULL;
+ this->input_class.get_autoplay_list = bd_class_get_autoplay_list;
+ }
+
+ return this;
+}
+
 /*
 * exported plugin catalog entry
 */
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
 /* type, API, "name", version, special_info, init_function */
-#if INPUT_PLUGIN_IFACE_VERSION <= 17
- { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "BLURAY", XINE_VERSION_CODE, NULL, bluray_init_plugin },
- { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "BD", XINE_VERSION_CODE, NULL, bluray_init_plugin },
-#elif INPUT_PLUGIN_IFACE_VERSION >= 18
- { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "BLURAY", XINE_VERSION_CODE, NULL, bluray_init_plugin },
- { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "BD", XINE_VERSION_CODE, NULL, bluray_init_plugin },
-#endif
+ { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, INPUT_PLUGIN_IFACE_VERSION, "BLURAY", XINE_VERSION_CODE, NULL, bluray_init_plugin },
+ { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, INPUT_PLUGIN_IFACE_VERSION, "BD", XINE_VERSION_CODE, NULL, bd_init_plugin },
 { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };

libbluray-0.2.3.tar.bz2/src/Makefile.am -> libbluray-0.5.0.tar.bz2/src/Makefile.am Changed

@@ -1,34 +1,19 @@
-LIB_VERSION_INFO="@LT_VERSION_INFO@"
+SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_REENTRANT
+SET_INCLUDES = -I$(top_srcdir) -Ifile -Ilibbluray -Ilibbluray/bdnav
 
-SUBDIRS= . examples
+AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS) $(FT2_CFLAGS)
 
-SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200809L -D_REENTRANT
-SET_WARNINGS = @SET_WARNINGS@
-SET_OPTIMIZATIONS = @SET_OPTIMIZATIONS@
-SET_DEBUG_OPTS = @SET_DEBUG_OPTS@
-SET_INCLUDES = -I$(top_srcdir) -Ifile -Ilibbluray/bdnav
-
-AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_WARNINGS) $(SET_OPTIMIZATIONS) \
-        $(SET_DEBUG_OPTS) $(SET_INCLUDES) $(LIBXML2_CFLAGS)
-CFLAGS=$(shell test -z "$$CFLAGS" || echo "$$CFLAGS")
-
-SOURCES_bdj = libbluray/bdj/bdj.h \
-	libbluray/bdj/bdj_private.h \
-	libbluray/bdj/bdj_util.h \
-	libbluray/bdj/bdj_util.c \
-	libbluray/bdj/bdj.c \
-	libbluray/bdj/bdjo_parser.h \
-	libbluray/bdj/bdjo_parser.c \
-	libbluray/bdj/common.h \
-	libbluray/bdj/native/org_videolan_Libbluray.h \
-	libbluray/bdj/native/org_videolan_Libbluray.c
-
-EXTRA_DIST = libbluray/bdj/build.xml libbluray/bdj/java
+EXTRA_DIST = \
+       libbluray/bdj/build.xml \
+       libbluray/bdj/java \
+       libbluray/bdj/java-j2me \
+       libbluray/bdj/java-j2se
 
 lib_LTLIBRARIES=libbluray.la
-libbluray_ladir= $(includedir)/libbluray
-libbluray_la_SOURCES=libbluray/bluray.h \
+libbluray_la_SOURCES = \
+	libbluray/bluray.h \
 	libbluray/bluray.c \
+	libbluray/bluray_internal.h \
 	libbluray/register.h \
 	libbluray/register.c \
 	libbluray/keys.h \
@@ -48,11 +33,17 @@
 	libbluray/bdnav/meta_data.h \
 	libbluray/bdnav/meta_parse.c \
 	libbluray/bdnav/meta_parse.h \
+	libbluray/bdnav/extdata_parse.h \
+	libbluray/bdnav/extdata_parse.c \
+	libbluray/bdnav/bdid_parse.h \
+	libbluray/bdnav/bdid_parse.c \
 	libbluray/decoders \
 	libbluray/decoders/pes_buffer.h \
 	libbluray/decoders/pes_buffer.c \
 	libbluray/decoders/m2ts_demux.h \
 	libbluray/decoders/m2ts_demux.c \
+	libbluray/decoders/m2ts_filter.h \
+	libbluray/decoders/m2ts_filter.c \
 	libbluray/decoders/overlay.h \
 	libbluray/decoders/pg.h \
 	libbluray/decoders/pg_decode.h \
@@ -60,6 +51,13 @@
 	libbluray/decoders/ig.h \
 	libbluray/decoders/ig_decode.h \
 	libbluray/decoders/ig_decode.c \
+	libbluray/decoders/rle.h \
+	libbluray/decoders/rle.c \
+	libbluray/decoders/textst.h \
+	libbluray/decoders/textst_decode.h \
+	libbluray/decoders/textst_decode.c \
+	libbluray/decoders/textst_render.h \
+	libbluray/decoders/textst_render.c \
 	libbluray/decoders/graphics_processor.h \
 	libbluray/decoders/graphics_processor.c \
 	libbluray/decoders/graphics_controller.h \
@@ -71,33 +69,202 @@
 	libbluray/hdmv/mobj_parse.h \
 	libbluray/hdmv/mobj_parse.c \
 	libbluray/hdmv/mobj_print.c \
-	file/dir_posix.c \
 	file/file.h \
 	file/file_posix.c \
+	file/dirs.h \
 	file/dl.h \
-	file/dl_posix.c \
 	file/filesystem.h \
 	file/filesystem.c \
+	file/libaacs.h \
+	file/libaacs.c \
+	file/libbdplus.h \
+	file/libbdplus.c \
 	util/attributes.h \
+	util/refcnt.h \
+	util/refcnt.c \
 	util/strutl.c \
 	util/strutl.h \
 	util/macro.h \
 	util/mutex.h \
+	util/time.h \
 	util/logging.c \
 	util/log_control.h \
 	util/bits.h \
+	util/bits.c \
 	util/logging.h
-libbluray_la_HEADERS= libbluray/bluray.h file/filesystem.h util/log_control.h libbluray/keys.h libbluray/decoders/overlay.h libbluray/bdnav/meta_data.h libbluray/bdnav/clpi_data.h libbluray/bluray-version.h
-libbluray_la_LDFLAGS= -version-info $(LIB_VERSION_INFO)
-libbluray_la_LIBADD= $(LIBXML2_LIBS) $(DLOPEN_LIBS)
+
+if HAVE_DARWIN
+libbluray_la_SOURCES+= \
+	file/dir_posix.c \
+	file/dl_posix.c \
+	file/dirs_darwin.c
+else
+if HAVE_WIN32
+libbluray_la_SOURCES+= \
+	file/dir_win32.c \
+	file/dl_win32.c \
+	file/dirs_win32.c
+else
+libbluray_la_SOURCES+= \
+	file/dir_posix.c \
+	file/dl_posix.c \
+	file/dirs_xdg.c
+endif
+endif
+
+
+libbluray_la_LDFLAGS= -version-info $(LT_VERSION_INFO)
+libbluray_la_LIBADD= $(LIBXML2_LIBS) $(FT2_LIBS)
+
+pkginclude_HEADERS = \
+	file/filesystem.h \
+	libbluray/bdnav/clpi_data.h \
+	libbluray/bdnav/meta_data.h \
+	libbluray/bluray-version.h \
+	libbluray/bluray.h \
+	libbluray/decoders/overlay.h \
+	libbluray/keys.h \
+	util/log_control.h
 
 if USING_BDJAVA
-libbluray_la_SOURCES+=$(SOURCES_bdj)
-AM_CFLAGS+=@BDJAVA_CFLAGS@
+jardir=$(libdir)/libbluray/
+jar_DATA=$(top_builddir)/src/.libs/libbluray.jar
+
+$(top_builddir)/src/.libs/libbluray.jar: all-local
+
+libbluray_la_SOURCES += \
+	libbluray/bdj/bdj.h \
+	libbluray/bdj/bdj_private.h \
+	libbluray/bdj/bdj_util.h \
+	libbluray/bdj/bdj_util.c \
+	libbluray/bdj/bdj.c \
+	libbluray/bdj/bdjo_parser.h \
+	libbluray/bdj/bdjo_parser.c \
+	libbluray/bdj/common.h \
+	libbluray/bdj/native/java_awt_BDGraphics.h \
+	libbluray/bdj/native/java_awt_BDGraphics.c \
+	libbluray/bdj/native/java_awt_BDFontMetrics.h \
+	libbluray/bdj/native/java_awt_BDFontMetrics.c \
+	libbluray/bdj/native/org_videolan_Libbluray.h \
+	libbluray/bdj/native/org_videolan_Libbluray.c \
+	libbluray/bdj/native/org_videolan_Logger.h \
+	libbluray/bdj/native/org_videolan_Logger.c \
+	libbluray/bdj/native/register_native.h \
+	libbluray/bdj/native/register_native.c
+
+AM_CFLAGS += $(BDJAVA_CFLAGS)
 
 all-local:
-	ant -f $(top_srcdir)/src/libbluray/bdj/build.xml
+	ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \
+	    -Dbuild='$(abs_builddir)/libbluray/bdj/build' \
+	    -Ddist='$(abs_builddir)/.libs' \
+	    -Dsrc_awt=:java-$(BDJ_TYPE) \
+	    -Dbootclasspath="$(BDJ_BOOTCLASSPATH)"
+
+clean-local:
+	ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \
+	    -Dbuild='$(abs_builddir)/libbluray/bdj/build' \
+	    -Ddist='$(abs_builddir)/.libs' \
+	    clean
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libbluray.pc
+
+
+#
+# examples
+#
+
+#SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_REENTRANT
+#SET_INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/file -I$(top_srcdir)/src/libbluray/bdnav
+
+if USING_EXAMPLES
+
+#AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES)
+
+noinst_PROGRAMS = \
+	bdsplice \
+	clpi_dump \
+	hdmv_test \
+	index_dump \
+	libbluray_test \
+	list_titles \
+	mobj_dump \
+	mpls_dump \
+	sound_dump
+
+if USING_BDJAVA
+noinst_PROGRAMS += \
+	bdj_test
+endif
+
+bin_PROGRAMS = \
+	bd_info
+
+bdsplice_SOURCES = examples/bdsplice.c
+bdsplice_LDADD = libbluray.la
+
+mpls_dump_CFLAGS = $(AM_CFLAGS)
+mpls_dump_SOURCES = \
+	examples/mpls_dump.c \
+	examples/util.c \
+	examples/util.h \
+	file/file_posix.c \
+	libbluray/bdnav/clpi_parse.c \
+	libbluray/bdnav/extdata_parse.c \
+	libbluray/bdnav/mpls_parse.c \
+	util/bits.c \
+	util/logging.c \
+	util/strutl.c
+if HAVE_WIN32
+mpls_dump_SOURCES += \
+	file/dir_win32.c
+else
+mpls_dump_SOURCES += \
+	file/dir_posix.c
+endif
+
+clpi_dump_CFLAGS = $(AM_CFLAGS)
+clpi_dump_SOURCES = \
+	examples/clpi_dump.c \
+	examples/util.c \
+	examples/util.h
+clpi_dump_LDADD = libbluray.la
+
+index_dump_CFLAGS = $(AM_CFLAGS)
+index_dump_SOURCES = \
+	examples/index_dump.c \
+	file/file_posix.c \
+	libbluray/bdnav/index_parse.c \
+	util/bits.c \
+	util/logging.c
+
+mobj_dump_CFLAGS = $(AM_CFLAGS)
+mobj_dump_SOURCES = \
+	examples/mobj_dump.c \
+	file/file_posix.c \
+	libbluray/hdmv/mobj_parse.c \
+	libbluray/hdmv/mobj_print.c \
+	util/bits.c \
+	util/logging.c
+
+sound_dump_SOURCES = examples/sound_dump.c
+sound_dump_LDADD = libbluray.la
+
+libbluray_test_SOURCES = examples/libbluray_test.c
+libbluray_test_LDADD = libbluray.la
+
+hdmv_test_SOURCES = examples/hdmv_test.c
+hdmv_test_LDADD = libbluray.la
+
+list_titles_SOURCES = examples/list_titles.c
+list_titles_LDADD = libbluray.la
+
+bd_info_SOURCES = examples/bd_info.c
+bd_info_LDADD = libbluray.la
+
+bdj_test_SOURCES = examples/bdj_test.c
+bdj_test_LDADD = libbluray.la
+
+endif

libbluray-0.2.3.tar.bz2/src/Makefile.in -> libbluray-0.5.0.tar.bz2/src/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +16,53 @@
 
 
 
+
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \	]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,14 +81,66 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-target_triplet = @target@
-@USING_BDJAVA_TRUE@am__append_1 = $(SOURCES_bdj)
-@USING_BDJAVA_TRUE@am__append_2 = @BDJAVA_CFLAGS@
+@HAVE_DARWIN_TRUE@am__append_1 = \
+@HAVE_DARWIN_TRUE@	file/dir_posix.c \
+@HAVE_DARWIN_TRUE@	file/dl_posix.c \
+@HAVE_DARWIN_TRUE@	file/dirs_darwin.c
+
+@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@am__append_2 = \
+@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@	file/dir_win32.c \
+@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@	file/dl_win32.c \
+@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@	file/dirs_win32.c
+
+@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@am__append_3 = \
+@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@	file/dir_posix.c \
+@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@	file/dl_posix.c \
+@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@	file/dirs_xdg.c
+
+@USING_BDJAVA_TRUE@am__append_4 = \
+@USING_BDJAVA_TRUE@	libbluray/bdj/bdj.h \
+@USING_BDJAVA_TRUE@	libbluray/bdj/bdj_private.h \
+@USING_BDJAVA_TRUE@	libbluray/bdj/bdj_util.h \
+@USING_BDJAVA_TRUE@	libbluray/bdj/bdj_util.c \
+@USING_BDJAVA_TRUE@	libbluray/bdj/bdj.c \
+@USING_BDJAVA_TRUE@	libbluray/bdj/bdjo_parser.h \
+@USING_BDJAVA_TRUE@	libbluray/bdj/bdjo_parser.c \
+@USING_BDJAVA_TRUE@	libbluray/bdj/common.h \
+@USING_BDJAVA_TRUE@	libbluray/bdj/native/java_awt_BDGraphics.h \
+@USING_BDJAVA_TRUE@	libbluray/bdj/native/java_awt_BDGraphics.c \
+@USING_BDJAVA_TRUE@	libbluray/bdj/native/java_awt_BDFontMetrics.h \
+@USING_BDJAVA_TRUE@	libbluray/bdj/native/java_awt_BDFontMetrics.c \
+@USING_BDJAVA_TRUE@	libbluray/bdj/native/org_videolan_Libbluray.h \
+@USING_BDJAVA_TRUE@	libbluray/bdj/native/org_videolan_Libbluray.c \
+@USING_BDJAVA_TRUE@	libbluray/bdj/native/org_videolan_Logger.h \
+@USING_BDJAVA_TRUE@	libbluray/bdj/native/org_videolan_Logger.c \
+@USING_BDJAVA_TRUE@	libbluray/bdj/native/register_native.h \
+@USING_BDJAVA_TRUE@	libbluray/bdj/native/register_native.c
+
+@USING_BDJAVA_TRUE@am__append_5 = $(BDJAVA_CFLAGS)
+@USING_EXAMPLES_TRUE@noinst_PROGRAMS = bdsplice$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	clpi_dump$(EXEEXT) hdmv_test$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	index_dump$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	libbluray_test$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	list_titles$(EXEEXT) mobj_dump$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	mpls_dump$(EXEEXT) sound_dump$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	$(am__EXEEXT_1)
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@am__append_6 = \
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@	bdj_test
+
+@USING_EXAMPLES_TRUE@bin_PROGRAMS = bd_info$(EXEEXT)
+@HAVE_WIN32_TRUE@@USING_EXAMPLES_TRUE@am__append_7 = \
+@HAVE_WIN32_TRUE@@USING_EXAMPLES_TRUE@	file/dir_win32.c
+
+@HAVE_WIN32_FALSE@@USING_EXAMPLES_TRUE@am__append_8 = \
+@HAVE_WIN32_FALSE@@USING_EXAMPLES_TRUE@	file/dir_posix.c
+
 subdir = src
-DIST_COMMON = $(libbluray_la_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/libbluray.pc.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/libbluray.pc.in $(top_srcdir)/build-aux/depcomp \
+	$(pkginclude_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_doxygen.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
+	$(top_srcdir)/m4/ax_prog_doxygen.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
@@ -81,29 +178,40 @@
 || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
 $(am__cd) "$$dir" && rm -f $$files; }; \
 }
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
-	"$(DESTDIR)$(libbluray_ladir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+	"$(DESTDIR)$(jardir)" "$(DESTDIR)$(pkgconfigdir)" \
+	"$(DESTDIR)$(pkgincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libbluray_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am__libbluray_la_SOURCES_DIST = libbluray/bluray.h libbluray/bluray.c \
-	libbluray/register.h libbluray/register.c libbluray/keys.h \
-	libbluray/bdnav libbluray/bdnav/bdparse.h \
-	libbluray/bdnav/uo_mask_table.h libbluray/bdnav/navigation.h \
-	libbluray/bdnav/index_parse.c libbluray/bdnav/navigation.c \
-	libbluray/bdnav/sound_parse.c libbluray/bdnav/sound_parse.h \
-	libbluray/bdnav/mpls_parse.h libbluray/bdnav/clpi_parse.c \
-	libbluray/bdnav/mpls_parse.c libbluray/bdnav/index_parse.h \
-	libbluray/bdnav/clpi_parse.h libbluray/bdnav/meta_data.h \
-	libbluray/bdnav/meta_parse.c libbluray/bdnav/meta_parse.h \
-	libbluray/decoders libbluray/decoders/pes_buffer.h \
+	libbluray/bluray_internal.h libbluray/register.h \
+	libbluray/register.c libbluray/keys.h libbluray/bdnav \
+	libbluray/bdnav/bdparse.h libbluray/bdnav/uo_mask_table.h \
+	libbluray/bdnav/navigation.h libbluray/bdnav/index_parse.c \
+	libbluray/bdnav/navigation.c libbluray/bdnav/sound_parse.c \
+	libbluray/bdnav/sound_parse.h libbluray/bdnav/mpls_parse.h \
+	libbluray/bdnav/clpi_parse.c libbluray/bdnav/mpls_parse.c \
+	libbluray/bdnav/index_parse.h libbluray/bdnav/clpi_parse.h \
+	libbluray/bdnav/meta_data.h libbluray/bdnav/meta_parse.c \
+	libbluray/bdnav/meta_parse.h libbluray/bdnav/extdata_parse.h \
+	libbluray/bdnav/extdata_parse.c libbluray/bdnav/bdid_parse.h \
+	libbluray/bdnav/bdid_parse.c libbluray/decoders \
+	libbluray/decoders/pes_buffer.h \
 	libbluray/decoders/pes_buffer.c \
 	libbluray/decoders/m2ts_demux.h \
-	libbluray/decoders/m2ts_demux.c libbluray/decoders/overlay.h \
+	libbluray/decoders/m2ts_demux.c \
+	libbluray/decoders/m2ts_filter.h \
+	libbluray/decoders/m2ts_filter.c libbluray/decoders/overlay.h \
 	libbluray/decoders/pg.h libbluray/decoders/pg_decode.h \
 	libbluray/decoders/pg_decode.c libbluray/decoders/ig.h \
 	libbluray/decoders/ig_decode.h libbluray/decoders/ig_decode.c \
+	libbluray/decoders/rle.h libbluray/decoders/rle.c \
+	libbluray/decoders/textst.h libbluray/decoders/textst_decode.h \
+	libbluray/decoders/textst_decode.c \
+	libbluray/decoders/textst_render.h \
+	libbluray/decoders/textst_render.c \
 	libbluray/decoders/graphics_processor.h \
 	libbluray/decoders/graphics_processor.c \
 	libbluray/decoders/graphics_controller.h \
@@ -111,102 +219,264 @@
 	libbluray/hdmv/hdmv_insn.h libbluray/hdmv/hdmv_vm.h \
 	libbluray/hdmv/hdmv_vm.c libbluray/hdmv/mobj_parse.h \
 	libbluray/hdmv/mobj_parse.c libbluray/hdmv/mobj_print.c \
-	file/dir_posix.c file/file.h file/file_posix.c file/dl.h \
-	file/dl_posix.c file/filesystem.h file/filesystem.c \
-	util/attributes.h util/strutl.c util/strutl.h util/macro.h \
-	util/mutex.h util/logging.c util/log_control.h util/bits.h \
-	util/logging.h libbluray/bdj/bdj.h libbluray/bdj/bdj_private.h \
-	libbluray/bdj/bdj_util.h libbluray/bdj/bdj_util.c \
-	libbluray/bdj/bdj.c libbluray/bdj/bdjo_parser.h \
-	libbluray/bdj/bdjo_parser.c libbluray/bdj/common.h \
+	file/file.h file/file_posix.c file/dirs.h file/dl.h \
+	file/filesystem.h file/filesystem.c file/libaacs.h \
+	file/libaacs.c file/libbdplus.h file/libbdplus.c \
+	util/attributes.h util/refcnt.h util/refcnt.c util/strutl.c \
+	util/strutl.h util/macro.h util/mutex.h util/time.h \
+	util/logging.c util/log_control.h util/bits.h util/bits.c \
+	util/logging.h file/dir_posix.c file/dl_posix.c \
+	file/dirs_darwin.c file/dir_win32.c file/dl_win32.c \
+	file/dirs_win32.c file/dirs_xdg.c libbluray/bdj/bdj.h \
+	libbluray/bdj/bdj_private.h libbluray/bdj/bdj_util.h \
+	libbluray/bdj/bdj_util.c libbluray/bdj/bdj.c \
+	libbluray/bdj/bdjo_parser.h libbluray/bdj/bdjo_parser.c \
+	libbluray/bdj/common.h \
+	libbluray/bdj/native/java_awt_BDGraphics.h \
+	libbluray/bdj/native/java_awt_BDGraphics.c \
+	libbluray/bdj/native/java_awt_BDFontMetrics.h \
+	libbluray/bdj/native/java_awt_BDFontMetrics.c \
 	libbluray/bdj/native/org_videolan_Libbluray.h \
-	libbluray/bdj/native/org_videolan_Libbluray.c
-am__objects_1 = bdj_util.lo bdj.lo bdjo_parser.lo \
-	org_videolan_Libbluray.lo
-@USING_BDJAVA_TRUE@am__objects_2 = $(am__objects_1)
-am_libbluray_la_OBJECTS = bluray.lo register.lo index_parse.lo \
-	navigation.lo sound_parse.lo clpi_parse.lo mpls_parse.lo \
-	meta_parse.lo pes_buffer.lo m2ts_demux.lo pg_decode.lo \
-	ig_decode.lo graphics_processor.lo graphics_controller.lo \
-	hdmv_vm.lo mobj_parse.lo mobj_print.lo dir_posix.lo \
-	file_posix.lo dl_posix.lo filesystem.lo strutl.lo logging.lo \
-	$(am__objects_2)
+	libbluray/bdj/native/org_videolan_Libbluray.c \
+	libbluray/bdj/native/org_videolan_Logger.h \
+	libbluray/bdj/native/org_videolan_Logger.c \
+	libbluray/bdj/native/register_native.h \
+	libbluray/bdj/native/register_native.c
+am__dirstamp = $(am__leading_dot)dirstamp
+@HAVE_DARWIN_TRUE@am__objects_1 = file/dir_posix.lo file/dl_posix.lo \
+@HAVE_DARWIN_TRUE@	file/dirs_darwin.lo
+@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@am__objects_2 = file/dir_win32.lo \
+@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@	file/dl_win32.lo \
+@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@	file/dirs_win32.lo
+@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@am__objects_3 = \
+@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@	file/dir_posix.lo \
+@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@	file/dl_posix.lo \
+@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@	file/dirs_xdg.lo
+@USING_BDJAVA_TRUE@am__objects_4 = libbluray/bdj/bdj_util.lo \
+@USING_BDJAVA_TRUE@	libbluray/bdj/bdj.lo \
+@USING_BDJAVA_TRUE@	libbluray/bdj/bdjo_parser.lo \
+@USING_BDJAVA_TRUE@	libbluray/bdj/native/java_awt_BDGraphics.lo \
+@USING_BDJAVA_TRUE@	libbluray/bdj/native/java_awt_BDFontMetrics.lo \
+@USING_BDJAVA_TRUE@	libbluray/bdj/native/org_videolan_Libbluray.lo \
+@USING_BDJAVA_TRUE@	libbluray/bdj/native/org_videolan_Logger.lo \
+@USING_BDJAVA_TRUE@	libbluray/bdj/native/register_native.lo
+am_libbluray_la_OBJECTS = libbluray/bluray.lo libbluray/register.lo \
+	libbluray/bdnav/index_parse.lo libbluray/bdnav/navigation.lo \
+	libbluray/bdnav/sound_parse.lo libbluray/bdnav/clpi_parse.lo \
+	libbluray/bdnav/mpls_parse.lo libbluray/bdnav/meta_parse.lo \
+	libbluray/bdnav/extdata_parse.lo libbluray/bdnav/bdid_parse.lo \
+	libbluray/decoders/pes_buffer.lo \
+	libbluray/decoders/m2ts_demux.lo \
+	libbluray/decoders/m2ts_filter.lo \
+	libbluray/decoders/pg_decode.lo \
+	libbluray/decoders/ig_decode.lo libbluray/decoders/rle.lo \
+	libbluray/decoders/textst_decode.lo \
+	libbluray/decoders/textst_render.lo \
+	libbluray/decoders/graphics_processor.lo \
+	libbluray/decoders/graphics_controller.lo \
+	libbluray/hdmv/hdmv_vm.lo libbluray/hdmv/mobj_parse.lo \
+	libbluray/hdmv/mobj_print.lo file/file_posix.lo \
+	file/filesystem.lo file/libaacs.lo file/libbdplus.lo \
+	util/refcnt.lo util/strutl.lo util/logging.lo util/bits.lo \
+	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
+	$(am__objects_4)
 libbluray_la_OBJECTS = $(am_libbluray_la_OBJECTS)
-libbluray_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libbluray_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libbluray_la_LDFLAGS) $(LDFLAGS) -o $@
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@am__EXEEXT_1 = \
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@	bdj_test$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+am__bd_info_SOURCES_DIST = examples/bd_info.c
+@USING_EXAMPLES_TRUE@am_bd_info_OBJECTS = examples/bd_info.$(OBJEXT)
+bd_info_OBJECTS = $(am_bd_info_OBJECTS)
+@USING_EXAMPLES_TRUE@bd_info_DEPENDENCIES = libbluray.la
+am__bdj_test_SOURCES_DIST = examples/bdj_test.c
+@USING_EXAMPLES_TRUE@am_bdj_test_OBJECTS = \
+@USING_EXAMPLES_TRUE@	examples/bdj_test.$(OBJEXT)
+bdj_test_OBJECTS = $(am_bdj_test_OBJECTS)
+@USING_EXAMPLES_TRUE@bdj_test_DEPENDENCIES = libbluray.la
+am__bdsplice_SOURCES_DIST = examples/bdsplice.c
+@USING_EXAMPLES_TRUE@am_bdsplice_OBJECTS = \
+@USING_EXAMPLES_TRUE@	examples/bdsplice.$(OBJEXT)
+bdsplice_OBJECTS = $(am_bdsplice_OBJECTS)
+@USING_EXAMPLES_TRUE@bdsplice_DEPENDENCIES = libbluray.la
+am__clpi_dump_SOURCES_DIST = examples/clpi_dump.c examples/util.c \
+	examples/util.h
+@USING_EXAMPLES_TRUE@am_clpi_dump_OBJECTS = \
+@USING_EXAMPLES_TRUE@	examples/clpi_dump-clpi_dump.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	examples/clpi_dump-util.$(OBJEXT)
+clpi_dump_OBJECTS = $(am_clpi_dump_OBJECTS)
+@USING_EXAMPLES_TRUE@clpi_dump_DEPENDENCIES = libbluray.la
+clpi_dump_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(clpi_dump_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am__hdmv_test_SOURCES_DIST = examples/hdmv_test.c
+@USING_EXAMPLES_TRUE@am_hdmv_test_OBJECTS = \
+@USING_EXAMPLES_TRUE@	examples/hdmv_test.$(OBJEXT)
+hdmv_test_OBJECTS = $(am_hdmv_test_OBJECTS)
+@USING_EXAMPLES_TRUE@hdmv_test_DEPENDENCIES = libbluray.la
+am__index_dump_SOURCES_DIST = examples/index_dump.c file/file_posix.c \
+	libbluray/bdnav/index_parse.c util/bits.c util/logging.c
+@USING_EXAMPLES_TRUE@am_index_dump_OBJECTS = \
+@USING_EXAMPLES_TRUE@	examples/index_dump-index_dump.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	file/index_dump-file_posix.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	libbluray/bdnav/index_dump-index_parse.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	util/index_dump-bits.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	util/index_dump-logging.$(OBJEXT)
+index_dump_OBJECTS = $(am_index_dump_OBJECTS)
+index_dump_LDADD = $(LDADD)
+index_dump_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(index_dump_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am__libbluray_test_SOURCES_DIST = examples/libbluray_test.c
+@USING_EXAMPLES_TRUE@am_libbluray_test_OBJECTS = \
+@USING_EXAMPLES_TRUE@	examples/libbluray_test.$(OBJEXT)
+libbluray_test_OBJECTS = $(am_libbluray_test_OBJECTS)
+@USING_EXAMPLES_TRUE@libbluray_test_DEPENDENCIES = libbluray.la
+am__list_titles_SOURCES_DIST = examples/list_titles.c
+@USING_EXAMPLES_TRUE@am_list_titles_OBJECTS = \
+@USING_EXAMPLES_TRUE@	examples/list_titles.$(OBJEXT)
+list_titles_OBJECTS = $(am_list_titles_OBJECTS)
+@USING_EXAMPLES_TRUE@list_titles_DEPENDENCIES = libbluray.la
+am__mobj_dump_SOURCES_DIST = examples/mobj_dump.c file/file_posix.c \
+	libbluray/hdmv/mobj_parse.c libbluray/hdmv/mobj_print.c \
+	util/bits.c util/logging.c
+@USING_EXAMPLES_TRUE@am_mobj_dump_OBJECTS = \
+@USING_EXAMPLES_TRUE@	examples/mobj_dump-mobj_dump.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	file/mobj_dump-file_posix.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	libbluray/hdmv/mobj_dump-mobj_parse.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	libbluray/hdmv/mobj_dump-mobj_print.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	util/mobj_dump-bits.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	util/mobj_dump-logging.$(OBJEXT)
+mobj_dump_OBJECTS = $(am_mobj_dump_OBJECTS)
+mobj_dump_LDADD = $(LDADD)
+mobj_dump_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(mobj_dump_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am__mpls_dump_SOURCES_DIST = examples/mpls_dump.c examples/util.c \
+	examples/util.h file/file_posix.c libbluray/bdnav/clpi_parse.c \
+	libbluray/bdnav/extdata_parse.c libbluray/bdnav/mpls_parse.c \
+	util/bits.c util/logging.c util/strutl.c file/dir_win32.c \
+	file/dir_posix.c
+@HAVE_WIN32_TRUE@@USING_EXAMPLES_TRUE@am__objects_5 = file/mpls_dump-dir_win32.$(OBJEXT)
+@HAVE_WIN32_FALSE@@USING_EXAMPLES_TRUE@am__objects_6 = file/mpls_dump-dir_posix.$(OBJEXT)
+@USING_EXAMPLES_TRUE@am_mpls_dump_OBJECTS = \
+@USING_EXAMPLES_TRUE@	examples/mpls_dump-mpls_dump.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	examples/mpls_dump-util.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	file/mpls_dump-file_posix.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	libbluray/bdnav/mpls_dump-clpi_parse.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	libbluray/bdnav/mpls_dump-extdata_parse.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	libbluray/bdnav/mpls_dump-mpls_parse.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	util/mpls_dump-bits.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	util/mpls_dump-logging.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	util/mpls_dump-strutl.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	$(am__objects_5) $(am__objects_6)
+mpls_dump_OBJECTS = $(am_mpls_dump_OBJECTS)
+mpls_dump_LDADD = $(LDADD)
+mpls_dump_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(mpls_dump_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am__sound_dump_SOURCES_DIST = examples/sound_dump.c
+@USING_EXAMPLES_TRUE@am_sound_dump_OBJECTS = \
+@USING_EXAMPLES_TRUE@	examples/sound_dump.$(OBJEXT)
+sound_dump_OBJECTS = $(am_sound_dump_OBJECTS)
+@USING_EXAMPLES_TRUE@sound_dump_DEPENDENCIES = libbluray.la
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libbluray_la_SOURCES)
-DIST_SOURCES = $(am__libbluray_la_SOURCES_DIST)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-DATA = $(pkgconfig_DATA)
-HEADERS = $(libbluray_la_HEADERS)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
- distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libbluray_la_SOURCES) $(bd_info_SOURCES) \
+	$(bdj_test_SOURCES) $(bdsplice_SOURCES) $(clpi_dump_SOURCES) \
+	$(hdmv_test_SOURCES) $(index_dump_SOURCES) \
+	$(libbluray_test_SOURCES) $(list_titles_SOURCES) \
+	$(mobj_dump_SOURCES) $(mpls_dump_SOURCES) \
+	$(sound_dump_SOURCES)
+DIST_SOURCES = $(am__libbluray_la_SOURCES_DIST) \
+	$(am__bd_info_SOURCES_DIST) $(am__bdj_test_SOURCES_DIST) \
+	$(am__bdsplice_SOURCES_DIST) $(am__clpi_dump_SOURCES_DIST) \
+	$(am__hdmv_test_SOURCES_DIST) $(am__index_dump_SOURCES_DIST) \
+	$(am__libbluray_test_SOURCES_DIST) \
+	$(am__list_titles_SOURCES_DIST) $(am__mobj_dump_SOURCES_DIST) \
+	$(am__mpls_dump_SOURCES_DIST) $(am__sound_dump_SOURCES_DIST)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+DATA = $(jar_DATA) $(pkgconfig_DATA)
+HEADERS = $(pkginclude_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^$[^/]*$/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/$[^/]*$$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BDJAVA_CFLAGS = @BDJAVA_CFLAGS@
+BDJ_BOOTCLASSPATH = @BDJ_BOOTCLASSPATH@
+BDJ_TYPE = @BDJ_TYPE@
 BLURAY_VERSION_MAJOR = @BLURAY_VERSION_MAJOR@
 BLURAY_VERSION_MICRO = @BLURAY_VERSION_MICRO@
 BLURAY_VERSION_MINOR = @BLURAY_VERSION_MINOR@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-CFLAGS = $(shell test -z "$$CFLAGS" || echo "$$CFLAGS")
+CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -246,13 +516,15 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FT2_CFLAGS = @FT2_CFLAGS@
+FT2_LIBS = @FT2_LIBS@
 GREP = @GREP@
-HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JDK_HOME = @JDK_HOME@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -286,10 +558,7 @@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
-SET_DEBUG_OPTS = @SET_DEBUG_OPTS@
 SET_MAKE = @SET_MAKE@
-SET_OPTIMIZATIONS = @SET_OPTIMIZATIONS@
-SET_WARNINGS = @SET_WARNINGS@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
@@ -341,52 +610,48 @@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-target = @target@
 target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-LIB_VERSION_INFO = "@LT_VERSION_INFO@"
-SUBDIRS = . examples
-SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200809L -D_REENTRANT
-SET_INCLUDES = -I$(top_srcdir) -Ifile -Ilibbluray/bdnav
-AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_WARNINGS) \
-	$(SET_OPTIMIZATIONS) $(SET_DEBUG_OPTS) $(SET_INCLUDES) \
-	$(LIBXML2_CFLAGS) $(am__append_2)
-SOURCES_bdj = libbluray/bdj/bdj.h \
-	libbluray/bdj/bdj_private.h \
-	libbluray/bdj/bdj_util.h \
-	libbluray/bdj/bdj_util.c \
-	libbluray/bdj/bdj.c \
-	libbluray/bdj/bdjo_parser.h \
-	libbluray/bdj/bdjo_parser.c \
-	libbluray/bdj/common.h \
-	libbluray/bdj/native/org_videolan_Libbluray.h \
-	libbluray/bdj/native/org_videolan_Libbluray.c
+SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_REENTRANT
+SET_INCLUDES = -I$(top_srcdir) -Ifile -Ilibbluray -Ilibbluray/bdnav
+AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS) \
+	$(FT2_CFLAGS) $(am__append_5)
+EXTRA_DIST = \
+ libbluray/bdj/build.xml \
+ libbluray/bdj/java \
+ libbluray/bdj/java-j2me \
+ libbluray/bdj/java-j2se
 
-EXTRA_DIST = libbluray/bdj/build.xml libbluray/bdj/java
 lib_LTLIBRARIES = libbluray.la
-libbluray_ladir = $(includedir)/libbluray
 libbluray_la_SOURCES = libbluray/bluray.h libbluray/bluray.c \
-	libbluray/register.h libbluray/register.c libbluray/keys.h \
-	libbluray/bdnav libbluray/bdnav/bdparse.h \
-	libbluray/bdnav/uo_mask_table.h libbluray/bdnav/navigation.h \
-	libbluray/bdnav/index_parse.c libbluray/bdnav/navigation.c \
-	libbluray/bdnav/sound_parse.c libbluray/bdnav/sound_parse.h \
-	libbluray/bdnav/mpls_parse.h libbluray/bdnav/clpi_parse.c \
-	libbluray/bdnav/mpls_parse.c libbluray/bdnav/index_parse.h \
-	libbluray/bdnav/clpi_parse.h libbluray/bdnav/meta_data.h \
-	libbluray/bdnav/meta_parse.c libbluray/bdnav/meta_parse.h \
-	libbluray/decoders libbluray/decoders/pes_buffer.h \
+	libbluray/bluray_internal.h libbluray/register.h \
+	libbluray/register.c libbluray/keys.h libbluray/bdnav \
+	libbluray/bdnav/bdparse.h libbluray/bdnav/uo_mask_table.h \
+	libbluray/bdnav/navigation.h libbluray/bdnav/index_parse.c \
+	libbluray/bdnav/navigation.c libbluray/bdnav/sound_parse.c \
+	libbluray/bdnav/sound_parse.h libbluray/bdnav/mpls_parse.h \
+	libbluray/bdnav/clpi_parse.c libbluray/bdnav/mpls_parse.c \
+	libbluray/bdnav/index_parse.h libbluray/bdnav/clpi_parse.h \
+	libbluray/bdnav/meta_data.h libbluray/bdnav/meta_parse.c \
+	libbluray/bdnav/meta_parse.h libbluray/bdnav/extdata_parse.h \
+	libbluray/bdnav/extdata_parse.c libbluray/bdnav/bdid_parse.h \
+	libbluray/bdnav/bdid_parse.c libbluray/decoders \
+	libbluray/decoders/pes_buffer.h \
 	libbluray/decoders/pes_buffer.c \
 	libbluray/decoders/m2ts_demux.h \
-	libbluray/decoders/m2ts_demux.c libbluray/decoders/overlay.h \
+	libbluray/decoders/m2ts_demux.c \
+	libbluray/decoders/m2ts_filter.h \
+	libbluray/decoders/m2ts_filter.c libbluray/decoders/overlay.h \
 	libbluray/decoders/pg.h libbluray/decoders/pg_decode.h \
 	libbluray/decoders/pg_decode.c libbluray/decoders/ig.h \
 	libbluray/decoders/ig_decode.h libbluray/decoders/ig_decode.c \
+	libbluray/decoders/rle.h libbluray/decoders/rle.c \
+	libbluray/decoders/textst.h libbluray/decoders/textst_decode.h \
+	libbluray/decoders/textst_decode.c \
+	libbluray/decoders/textst_render.h \
+	libbluray/decoders/textst_render.c \
 	libbluray/decoders/graphics_processor.h \
 	libbluray/decoders/graphics_processor.c \
 	libbluray/decoders/graphics_controller.h \
@@ -394,17 +659,78 @@
 	libbluray/hdmv/hdmv_insn.h libbluray/hdmv/hdmv_vm.h \
 	libbluray/hdmv/hdmv_vm.c libbluray/hdmv/mobj_parse.h \
 	libbluray/hdmv/mobj_parse.c libbluray/hdmv/mobj_print.c \
-	file/dir_posix.c file/file.h file/file_posix.c file/dl.h \
-	file/dl_posix.c file/filesystem.h file/filesystem.c \
-	util/attributes.h util/strutl.c util/strutl.h util/macro.h \
-	util/mutex.h util/logging.c util/log_control.h util/bits.h \
-	util/logging.h $(am__append_1)
-libbluray_la_HEADERS = libbluray/bluray.h file/filesystem.h util/log_control.h libbluray/keys.h libbluray/decoders/overlay.h libbluray/bdnav/meta_data.h libbluray/bdnav/clpi_data.h libbluray/bluray-version.h
-libbluray_la_LDFLAGS = -version-info $(LIB_VERSION_INFO)
-libbluray_la_LIBADD = $(LIBXML2_LIBS) $(DLOPEN_LIBS)
+	file/file.h file/file_posix.c file/dirs.h file/dl.h \
+	file/filesystem.h file/filesystem.c file/libaacs.h \
+	file/libaacs.c file/libbdplus.h file/libbdplus.c \
+	util/attributes.h util/refcnt.h util/refcnt.c util/strutl.c \
+	util/strutl.h util/macro.h util/mutex.h util/time.h \
+	util/logging.c util/log_control.h util/bits.h util/bits.c \
+	util/logging.h $(am__append_1) $(am__append_2) $(am__append_3) \
+	$(am__append_4)
+libbluray_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
+libbluray_la_LIBADD = $(LIBXML2_LIBS) $(FT2_LIBS)
+pkginclude_HEADERS = \
+	file/filesystem.h \
+	libbluray/bdnav/clpi_data.h \
+	libbluray/bdnav/meta_data.h \
+	libbluray/bluray-version.h \
+	libbluray/bluray.h \
+	libbluray/decoders/overlay.h \
+	libbluray/keys.h \
+	util/log_control.h
+
+@USING_BDJAVA_TRUE@jardir = $(libdir)/libbluray/
+@USING_BDJAVA_TRUE@jar_DATA = $(top_builddir)/src/.libs/libbluray.jar
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libbluray.pc
-all: all-recursive
+@USING_EXAMPLES_TRUE@bdsplice_SOURCES = examples/bdsplice.c
+@USING_EXAMPLES_TRUE@bdsplice_LDADD = libbluray.la
+@USING_EXAMPLES_TRUE@mpls_dump_CFLAGS = $(AM_CFLAGS)
+@USING_EXAMPLES_TRUE@mpls_dump_SOURCES = examples/mpls_dump.c \
+@USING_EXAMPLES_TRUE@	examples/util.c examples/util.h \
+@USING_EXAMPLES_TRUE@	file/file_posix.c \
+@USING_EXAMPLES_TRUE@	libbluray/bdnav/clpi_parse.c \
+@USING_EXAMPLES_TRUE@	libbluray/bdnav/extdata_parse.c \
+@USING_EXAMPLES_TRUE@	libbluray/bdnav/mpls_parse.c util/bits.c \
+@USING_EXAMPLES_TRUE@	util/logging.c util/strutl.c \
+@USING_EXAMPLES_TRUE@	$(am__append_7) $(am__append_8)
+@USING_EXAMPLES_TRUE@clpi_dump_CFLAGS = $(AM_CFLAGS)
+@USING_EXAMPLES_TRUE@clpi_dump_SOURCES = \
+@USING_EXAMPLES_TRUE@	examples/clpi_dump.c \
+@USING_EXAMPLES_TRUE@	examples/util.c \
+@USING_EXAMPLES_TRUE@	examples/util.h
+
+@USING_EXAMPLES_TRUE@clpi_dump_LDADD = libbluray.la
+@USING_EXAMPLES_TRUE@index_dump_CFLAGS = $(AM_CFLAGS)
+@USING_EXAMPLES_TRUE@index_dump_SOURCES = \
+@USING_EXAMPLES_TRUE@	examples/index_dump.c \
+@USING_EXAMPLES_TRUE@	file/file_posix.c \
+@USING_EXAMPLES_TRUE@	libbluray/bdnav/index_parse.c \
+@USING_EXAMPLES_TRUE@	util/bits.c \
+@USING_EXAMPLES_TRUE@	util/logging.c
+
+@USING_EXAMPLES_TRUE@mobj_dump_CFLAGS = $(AM_CFLAGS)
+@USING_EXAMPLES_TRUE@mobj_dump_SOURCES = \
+@USING_EXAMPLES_TRUE@	examples/mobj_dump.c \
+@USING_EXAMPLES_TRUE@	file/file_posix.c \
+@USING_EXAMPLES_TRUE@	libbluray/hdmv/mobj_parse.c \
+@USING_EXAMPLES_TRUE@	libbluray/hdmv/mobj_print.c \
+@USING_EXAMPLES_TRUE@	util/bits.c \
+@USING_EXAMPLES_TRUE@	util/logging.c
+
+@USING_EXAMPLES_TRUE@sound_dump_SOURCES = examples/sound_dump.c
+@USING_EXAMPLES_TRUE@sound_dump_LDADD = libbluray.la
+@USING_EXAMPLES_TRUE@libbluray_test_SOURCES = examples/libbluray_test.c
+@USING_EXAMPLES_TRUE@libbluray_test_LDADD = libbluray.la
+@USING_EXAMPLES_TRUE@hdmv_test_SOURCES = examples/hdmv_test.c
+@USING_EXAMPLES_TRUE@hdmv_test_LDADD = libbluray.la
+@USING_EXAMPLES_TRUE@list_titles_SOURCES = examples/list_titles.c
+@USING_EXAMPLES_TRUE@list_titles_LDADD = libbluray.la
+@USING_EXAMPLES_TRUE@bd_info_SOURCES = examples/bd_info.c
+@USING_EXAMPLES_TRUE@bd_info_LDADD = libbluray.la
+@USING_EXAMPLES_TRUE@bdj_test_SOURCES = examples/bdj_test.c
+@USING_EXAMPLES_TRUE@bdj_test_LDADD = libbluray.la
+all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
@@ -440,9 +766,9 @@
 $(am__aclocal_m4_deps):
 libbluray.pc: $(top_builddir)/config.status $(srcdir)/libbluray.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	 if test -f $$p; then \
@@ -450,6 +776,8 @@
 	 else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	 echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -465,268 +793,834 @@
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	 test "$$dir" != "$$p" || dir=.; \
-	 echo "rm -f \"$${dir}/so_locations\""; \
-	 rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	 sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	 sort -u`; \
+	test -z "$$locs" || { \
+	 echo rm -f $${locs}; \
+	 rm -f $${locs}; \
+	}
+libbluray/$(am__dirstamp):
+	@$(MKDIR_P) libbluray
+	@: > libbluray/$(am__dirstamp)
+libbluray/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) libbluray/$(DEPDIR)
+	@: > libbluray/$(DEPDIR)/$(am__dirstamp)
+libbluray/bluray.lo: libbluray/$(am__dirstamp) \
+	libbluray/$(DEPDIR)/$(am__dirstamp)
+libbluray/register.lo: libbluray/$(am__dirstamp) \
+	libbluray/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdnav/$(am__dirstamp):
+	@$(MKDIR_P) libbluray/bdnav
+	@: > libbluray/bdnav/$(am__dirstamp)
+libbluray/bdnav/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) libbluray/bdnav/$(DEPDIR)
+	@: > libbluray/bdnav/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdnav/index_parse.lo: libbluray/bdnav/$(am__dirstamp) \
+	libbluray/bdnav/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdnav/navigation.lo: libbluray/bdnav/$(am__dirstamp) \
+	libbluray/bdnav/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdnav/sound_parse.lo: libbluray/bdnav/$(am__dirstamp) \
+	libbluray/bdnav/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdnav/clpi_parse.lo: libbluray/bdnav/$(am__dirstamp) \
+	libbluray/bdnav/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdnav/mpls_parse.lo: libbluray/bdnav/$(am__dirstamp) \
+	libbluray/bdnav/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdnav/meta_parse.lo: libbluray/bdnav/$(am__dirstamp) \
+	libbluray/bdnav/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdnav/extdata_parse.lo: libbluray/bdnav/$(am__dirstamp) \
+	libbluray/bdnav/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdnav/bdid_parse.lo: libbluray/bdnav/$(am__dirstamp) \
+	libbluray/bdnav/$(DEPDIR)/$(am__dirstamp)
+libbluray/decoders/$(am__dirstamp):
+	@$(MKDIR_P) libbluray/decoders
+	@: > libbluray/decoders/$(am__dirstamp)
+libbluray/decoders/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) libbluray/decoders/$(DEPDIR)
+	@: > libbluray/decoders/$(DEPDIR)/$(am__dirstamp)
+libbluray/decoders/pes_buffer.lo: libbluray/decoders/$(am__dirstamp) \
+	libbluray/decoders/$(DEPDIR)/$(am__dirstamp)
+libbluray/decoders/m2ts_demux.lo: libbluray/decoders/$(am__dirstamp) \
+	libbluray/decoders/$(DEPDIR)/$(am__dirstamp)
+libbluray/decoders/m2ts_filter.lo: libbluray/decoders/$(am__dirstamp) \
+	libbluray/decoders/$(DEPDIR)/$(am__dirstamp)
+libbluray/decoders/pg_decode.lo: libbluray/decoders/$(am__dirstamp) \
+	libbluray/decoders/$(DEPDIR)/$(am__dirstamp)
+libbluray/decoders/ig_decode.lo: libbluray/decoders/$(am__dirstamp) \
+	libbluray/decoders/$(DEPDIR)/$(am__dirstamp)
+libbluray/decoders/rle.lo: libbluray/decoders/$(am__dirstamp) \
+	libbluray/decoders/$(DEPDIR)/$(am__dirstamp)
+libbluray/decoders/textst_decode.lo: \
+	libbluray/decoders/$(am__dirstamp) \
+	libbluray/decoders/$(DEPDIR)/$(am__dirstamp)
+libbluray/decoders/textst_render.lo: \
+	libbluray/decoders/$(am__dirstamp) \
+	libbluray/decoders/$(DEPDIR)/$(am__dirstamp)
+libbluray/decoders/graphics_processor.lo: \
+	libbluray/decoders/$(am__dirstamp) \
+	libbluray/decoders/$(DEPDIR)/$(am__dirstamp)
+libbluray/decoders/graphics_controller.lo: \
+	libbluray/decoders/$(am__dirstamp) \
+	libbluray/decoders/$(DEPDIR)/$(am__dirstamp)
+libbluray/hdmv/$(am__dirstamp):
+	@$(MKDIR_P) libbluray/hdmv
+	@: > libbluray/hdmv/$(am__dirstamp)
+libbluray/hdmv/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) libbluray/hdmv/$(DEPDIR)
+	@: > libbluray/hdmv/$(DEPDIR)/$(am__dirstamp)
+libbluray/hdmv/hdmv_vm.lo: libbluray/hdmv/$(am__dirstamp) \
+	libbluray/hdmv/$(DEPDIR)/$(am__dirstamp)
+libbluray/hdmv/mobj_parse.lo: libbluray/hdmv/$(am__dirstamp) \
+	libbluray/hdmv/$(DEPDIR)/$(am__dirstamp)
+libbluray/hdmv/mobj_print.lo: libbluray/hdmv/$(am__dirstamp) \
+	libbluray/hdmv/$(DEPDIR)/$(am__dirstamp)
+file/$(am__dirstamp):
+	@$(MKDIR_P) file
+	@: > file/$(am__dirstamp)
+file/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) file/$(DEPDIR)
+	@: > file/$(DEPDIR)/$(am__dirstamp)
+file/file_posix.lo: file/$(am__dirstamp) \
+	file/$(DEPDIR)/$(am__dirstamp)
+file/filesystem.lo: file/$(am__dirstamp) \
+	file/$(DEPDIR)/$(am__dirstamp)
+file/libaacs.lo: file/$(am__dirstamp) file/$(DEPDIR)/$(am__dirstamp)
+file/libbdplus.lo: file/$(am__dirstamp) file/$(DEPDIR)/$(am__dirstamp)
+util/$(am__dirstamp):
+	@$(MKDIR_P) util
+	@: > util/$(am__dirstamp)
+util/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) util/$(DEPDIR)
+	@: > util/$(DEPDIR)/$(am__dirstamp)
+util/refcnt.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/strutl.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/logging.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+util/bits.lo: util/$(am__dirstamp) util/$(DEPDIR)/$(am__dirstamp)
+file/dir_posix.lo: file/$(am__dirstamp) file/$(DEPDIR)/$(am__dirstamp)
+file/dl_posix.lo: file/$(am__dirstamp) file/$(DEPDIR)/$(am__dirstamp)
+file/dirs_darwin.lo: file/$(am__dirstamp) \
+	file/$(DEPDIR)/$(am__dirstamp)
+file/dir_win32.lo: file/$(am__dirstamp) file/$(DEPDIR)/$(am__dirstamp)
+file/dl_win32.lo: file/$(am__dirstamp) file/$(DEPDIR)/$(am__dirstamp)
+file/dirs_win32.lo: file/$(am__dirstamp) \
+	file/$(DEPDIR)/$(am__dirstamp)
+file/dirs_xdg.lo: file/$(am__dirstamp) file/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdj/$(am__dirstamp):
+	@$(MKDIR_P) libbluray/bdj
+	@: > libbluray/bdj/$(am__dirstamp)
+libbluray/bdj/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) libbluray/bdj/$(DEPDIR)
+	@: > libbluray/bdj/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdj/bdj_util.lo: libbluray/bdj/$(am__dirstamp) \
+	libbluray/bdj/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdj/bdj.lo: libbluray/bdj/$(am__dirstamp) \
+	libbluray/bdj/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdj/bdjo_parser.lo: libbluray/bdj/$(am__dirstamp) \
+	libbluray/bdj/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdj/native/$(am__dirstamp):
+	@$(MKDIR_P) libbluray/bdj/native
+	@: > libbluray/bdj/native/$(am__dirstamp)
+libbluray/bdj/native/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) libbluray/bdj/native/$(DEPDIR)
+	@: > libbluray/bdj/native/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdj/native/java_awt_BDGraphics.lo: \
+	libbluray/bdj/native/$(am__dirstamp) \
+	libbluray/bdj/native/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdj/native/java_awt_BDFontMetrics.lo: \
+	libbluray/bdj/native/$(am__dirstamp) \
+	libbluray/bdj/native/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdj/native/org_videolan_Libbluray.lo: \
+	libbluray/bdj/native/$(am__dirstamp) \
+	libbluray/bdj/native/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdj/native/org_videolan_Logger.lo: \
+	libbluray/bdj/native/$(am__dirstamp) \
+	libbluray/bdj/native/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdj/native/register_native.lo: \
+	libbluray/bdj/native/$(am__dirstamp) \
+	libbluray/bdj/native/$(DEPDIR)/$(am__dirstamp)
+
 libbluray.la: $(libbluray_la_OBJECTS) $(libbluray_la_DEPENDENCIES) $(EXTRA_libbluray_la_DEPENDENCIES) 
-	$(libbluray_la_LINK) -rpath $(libdir) $(libbluray_la_OBJECTS) $(libbluray_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libbluray_la_LINK) -rpath $(libdir) $(libbluray_la_OBJECTS) $(libbluray_la_LIBADD) $(LIBS)
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	 echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	 ; then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' \
+	 -e 's|.*|.|' \
+	 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	 { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	 if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	 else { print "f", $$3 "/" $$4, $$1; } } \
+	 END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	 test -z "$$files" || { \
+	 echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	 $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	 } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	 -e 's/$$/$(EXEEXT)/' \
+	`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+examples/$(am__dirstamp):
+	@$(MKDIR_P) examples
+	@: > examples/$(am__dirstamp)
+examples/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) examples/$(DEPDIR)
+	@: > examples/$(DEPDIR)/$(am__dirstamp)
+examples/bd_info.$(OBJEXT): examples/$(am__dirstamp) \
+	examples/$(DEPDIR)/$(am__dirstamp)
+
+bd_info$(EXEEXT): $(bd_info_OBJECTS) $(bd_info_DEPENDENCIES) $(EXTRA_bd_info_DEPENDENCIES) 
+	@rm -f bd_info$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(bd_info_OBJECTS) $(bd_info_LDADD) $(LIBS)
+examples/bdj_test.$(OBJEXT): examples/$(am__dirstamp) \
+	examples/$(DEPDIR)/$(am__dirstamp)
+
+bdj_test$(EXEEXT): $(bdj_test_OBJECTS) $(bdj_test_DEPENDENCIES) $(EXTRA_bdj_test_DEPENDENCIES) 
+	@rm -f bdj_test$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(bdj_test_OBJECTS) $(bdj_test_LDADD) $(LIBS)
+examples/bdsplice.$(OBJEXT): examples/$(am__dirstamp) \
+	examples/$(DEPDIR)/$(am__dirstamp)
+
+bdsplice$(EXEEXT): $(bdsplice_OBJECTS) $(bdsplice_DEPENDENCIES) $(EXTRA_bdsplice_DEPENDENCIES) 
+	@rm -f bdsplice$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(bdsplice_OBJECTS) $(bdsplice_LDADD) $(LIBS)
+examples/clpi_dump-clpi_dump.$(OBJEXT): examples/$(am__dirstamp) \
+	examples/$(DEPDIR)/$(am__dirstamp)
+examples/clpi_dump-util.$(OBJEXT): examples/$(am__dirstamp) \
+	examples/$(DEPDIR)/$(am__dirstamp)
+
+clpi_dump$(EXEEXT): $(clpi_dump_OBJECTS) $(clpi_dump_DEPENDENCIES) $(EXTRA_clpi_dump_DEPENDENCIES) 
+	@rm -f clpi_dump$(EXEEXT)
+	$(AM_V_CCLD)$(clpi_dump_LINK) $(clpi_dump_OBJECTS) $(clpi_dump_LDADD) $(LIBS)
+examples/hdmv_test.$(OBJEXT): examples/$(am__dirstamp) \
+	examples/$(DEPDIR)/$(am__dirstamp)
+
+hdmv_test$(EXEEXT): $(hdmv_test_OBJECTS) $(hdmv_test_DEPENDENCIES) $(EXTRA_hdmv_test_DEPENDENCIES) 
+	@rm -f hdmv_test$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(hdmv_test_OBJECTS) $(hdmv_test_LDADD) $(LIBS)
+examples/index_dump-index_dump.$(OBJEXT): examples/$(am__dirstamp) \
+	examples/$(DEPDIR)/$(am__dirstamp)
+file/index_dump-file_posix.$(OBJEXT): file/$(am__dirstamp) \
+	file/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdnav/index_dump-index_parse.$(OBJEXT): \
+	libbluray/bdnav/$(am__dirstamp) \
+	libbluray/bdnav/$(DEPDIR)/$(am__dirstamp)
+util/index_dump-bits.$(OBJEXT): util/$(am__dirstamp) \
+	util/$(DEPDIR)/$(am__dirstamp)
+util/index_dump-logging.$(OBJEXT): util/$(am__dirstamp) \
+	util/$(DEPDIR)/$(am__dirstamp)
+
+index_dump$(EXEEXT): $(index_dump_OBJECTS) $(index_dump_DEPENDENCIES) $(EXTRA_index_dump_DEPENDENCIES) 
+	@rm -f index_dump$(EXEEXT)
+	$(AM_V_CCLD)$(index_dump_LINK) $(index_dump_OBJECTS) $(index_dump_LDADD) $(LIBS)
+examples/libbluray_test.$(OBJEXT): examples/$(am__dirstamp) \
+	examples/$(DEPDIR)/$(am__dirstamp)
+
+libbluray_test$(EXEEXT): $(libbluray_test_OBJECTS) $(libbluray_test_DEPENDENCIES) $(EXTRA_libbluray_test_DEPENDENCIES) 
+	@rm -f libbluray_test$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(libbluray_test_OBJECTS) $(libbluray_test_LDADD) $(LIBS)
+examples/list_titles.$(OBJEXT): examples/$(am__dirstamp) \
+	examples/$(DEPDIR)/$(am__dirstamp)
+
+list_titles$(EXEEXT): $(list_titles_OBJECTS) $(list_titles_DEPENDENCIES) $(EXTRA_list_titles_DEPENDENCIES) 
+	@rm -f list_titles$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(list_titles_OBJECTS) $(list_titles_LDADD) $(LIBS)
+examples/mobj_dump-mobj_dump.$(OBJEXT): examples/$(am__dirstamp) \
+	examples/$(DEPDIR)/$(am__dirstamp)
+file/mobj_dump-file_posix.$(OBJEXT): file/$(am__dirstamp) \
+	file/$(DEPDIR)/$(am__dirstamp)
+libbluray/hdmv/mobj_dump-mobj_parse.$(OBJEXT): \
+	libbluray/hdmv/$(am__dirstamp) \
+	libbluray/hdmv/$(DEPDIR)/$(am__dirstamp)
+libbluray/hdmv/mobj_dump-mobj_print.$(OBJEXT): \
+	libbluray/hdmv/$(am__dirstamp) \
+	libbluray/hdmv/$(DEPDIR)/$(am__dirstamp)
+util/mobj_dump-bits.$(OBJEXT): util/$(am__dirstamp) \
+	util/$(DEPDIR)/$(am__dirstamp)
+util/mobj_dump-logging.$(OBJEXT): util/$(am__dirstamp) \
+	util/$(DEPDIR)/$(am__dirstamp)
+
+mobj_dump$(EXEEXT): $(mobj_dump_OBJECTS) $(mobj_dump_DEPENDENCIES) $(EXTRA_mobj_dump_DEPENDENCIES) 
+	@rm -f mobj_dump$(EXEEXT)
+	$(AM_V_CCLD)$(mobj_dump_LINK) $(mobj_dump_OBJECTS) $(mobj_dump_LDADD) $(LIBS)
+examples/mpls_dump-mpls_dump.$(OBJEXT): examples/$(am__dirstamp) \
+	examples/$(DEPDIR)/$(am__dirstamp)
+examples/mpls_dump-util.$(OBJEXT): examples/$(am__dirstamp) \
+	examples/$(DEPDIR)/$(am__dirstamp)
+file/mpls_dump-file_posix.$(OBJEXT): file/$(am__dirstamp) \
+	file/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdnav/mpls_dump-clpi_parse.$(OBJEXT): \
+	libbluray/bdnav/$(am__dirstamp) \
+	libbluray/bdnav/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdnav/mpls_dump-extdata_parse.$(OBJEXT): \
+	libbluray/bdnav/$(am__dirstamp) \
+	libbluray/bdnav/$(DEPDIR)/$(am__dirstamp)
+libbluray/bdnav/mpls_dump-mpls_parse.$(OBJEXT): \
+	libbluray/bdnav/$(am__dirstamp) \
+	libbluray/bdnav/$(DEPDIR)/$(am__dirstamp)
+util/mpls_dump-bits.$(OBJEXT): util/$(am__dirstamp) \
+	util/$(DEPDIR)/$(am__dirstamp)
+util/mpls_dump-logging.$(OBJEXT): util/$(am__dirstamp) \
+	util/$(DEPDIR)/$(am__dirstamp)
+util/mpls_dump-strutl.$(OBJEXT): util/$(am__dirstamp) \
+	util/$(DEPDIR)/$(am__dirstamp)
+file/mpls_dump-dir_win32.$(OBJEXT): file/$(am__dirstamp) \
+	file/$(DEPDIR)/$(am__dirstamp)
+file/mpls_dump-dir_posix.$(OBJEXT): file/$(am__dirstamp) \
+	file/$(DEPDIR)/$(am__dirstamp)
+
+mpls_dump$(EXEEXT): $(mpls_dump_OBJECTS) $(mpls_dump_DEPENDENCIES) $(EXTRA_mpls_dump_DEPENDENCIES) 
+	@rm -f mpls_dump$(EXEEXT)
+	$(AM_V_CCLD)$(mpls_dump_LINK) $(mpls_dump_OBJECTS) $(mpls_dump_LDADD) $(LIBS)
+examples/sound_dump.$(OBJEXT): examples/$(am__dirstamp) \
+	examples/$(DEPDIR)/$(am__dirstamp)
+
+sound_dump$(EXEEXT): $(sound_dump_OBJECTS) $(sound_dump_DEPENDENCIES) $(EXTRA_sound_dump_DEPENDENCIES) 
+	@rm -f sound_dump$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(sound_dump_OBJECTS) $(sound_dump_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
+	-rm -f examples/*.$(OBJEXT)
+	-rm -f file/*.$(OBJEXT)
+	-rm -f file/*.lo
+	-rm -f libbluray/*.$(OBJEXT)
+	-rm -f libbluray/*.lo
+	-rm -f libbluray/bdj/*.$(OBJEXT)
+	-rm -f libbluray/bdj/*.lo
+	-rm -f libbluray/bdj/native/*.$(OBJEXT)
+	-rm -f libbluray/bdj/native/*.lo
+	-rm -f libbluray/bdnav/*.$(OBJEXT)
+	-rm -f libbluray/bdnav/*.lo
+	-rm -f libbluray/decoders/*.$(OBJEXT)
+	-rm -f libbluray/decoders/*.lo
+	-rm -f libbluray/hdmv/*.$(OBJEXT)
+	-rm -f libbluray/hdmv/*.lo
+	-rm -f util/*.$(OBJEXT)
+	-rm -f util/*.lo
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bdj.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bdj_util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bdjo_parser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bluray.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clpi_parse.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dir_posix.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dl_posix.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_posix.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filesystem.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_controller.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_processor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdmv_vm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ig_decode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/index_parse.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logging.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m2ts_demux.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta_parse.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mobj_parse.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mobj_print.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpls_parse.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/navigation.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/org_videolan_Libbluray.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pes_buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pg_decode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/register.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_parse.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strutl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/bd_info.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/bdj_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/bdsplice.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/clpi_dump-clpi_dump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/clpi_dump-util.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/hdmv_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/index_dump-index_dump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/libbluray_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/list_titles.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/mobj_dump-mobj_dump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/mpls_dump-mpls_dump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/mpls_dump-util.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/sound_dump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@file/$(DEPDIR)/dir_posix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@file/$(DEPDIR)/dir_win32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@file/$(DEPDIR)/dirs_darwin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@file/$(DEPDIR)/dirs_win32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@file/$(DEPDIR)/dirs_xdg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@file/$(DEPDIR)/dl_posix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@file/$(DEPDIR)/dl_win32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@file/$(DEPDIR)/file_posix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@file/$(DEPDIR)/filesystem.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@file/$(DEPDIR)/index_dump-file_posix.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@file/$(DEPDIR)/libaacs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@file/$(DEPDIR)/libbdplus.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@file/$(DEPDIR)/mobj_dump-file_posix.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@file/$(DEPDIR)/mpls_dump-dir_posix.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@file/$(DEPDIR)/mpls_dump-dir_win32.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@file/$(DEPDIR)/mpls_dump-file_posix.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/$(DEPDIR)/bluray.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/$(DEPDIR)/register.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdj/$(DEPDIR)/bdj.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdj/$(DEPDIR)/bdj_util.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdj/$(DEPDIR)/bdjo_parser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdj/native/$(DEPDIR)/java_awt_BDFontMetrics.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdj/native/$(DEPDIR)/java_awt_BDGraphics.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdj/native/$(DEPDIR)/org_videolan_Libbluray.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdj/native/$(DEPDIR)/org_videolan_Logger.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdj/native/$(DEPDIR)/register_native.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdnav/$(DEPDIR)/bdid_parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdnav/$(DEPDIR)/clpi_parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdnav/$(DEPDIR)/extdata_parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdnav/$(DEPDIR)/index_dump-index_parse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdnav/$(DEPDIR)/index_parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdnav/$(DEPDIR)/meta_parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdnav/$(DEPDIR)/mpls_dump-clpi_parse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdnav/$(DEPDIR)/mpls_dump-extdata_parse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdnav/$(DEPDIR)/mpls_dump-mpls_parse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdnav/$(DEPDIR)/mpls_parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdnav/$(DEPDIR)/navigation.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/bdnav/$(DEPDIR)/sound_parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/decoders/$(DEPDIR)/graphics_controller.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/decoders/$(DEPDIR)/graphics_processor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/decoders/$(DEPDIR)/ig_decode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/decoders/$(DEPDIR)/m2ts_demux.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/decoders/$(DEPDIR)/m2ts_filter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/decoders/$(DEPDIR)/pes_buffer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/decoders/$(DEPDIR)/pg_decode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/decoders/$(DEPDIR)/rle.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/decoders/$(DEPDIR)/textst_decode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/decoders/$(DEPDIR)/textst_render.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/hdmv/$(DEPDIR)/hdmv_vm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/hdmv/$(DEPDIR)/mobj_dump-mobj_parse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/hdmv/$(DEPDIR)/mobj_dump-mobj_print.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/hdmv/$(DEPDIR)/mobj_parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libbluray/hdmv/$(DEPDIR)/mobj_print.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/bits.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/index_dump-bits.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/index_dump-logging.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/logging.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/mobj_dump-bits.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/mobj_dump-logging.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/mpls_dump-bits.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/mpls_dump-logging.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/mpls_dump-strutl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/refcnt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/strutl.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+examples/clpi_dump-clpi_dump.o: examples/clpi_dump.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -MT examples/clpi_dump-clpi_dump.o -MD -MP -MF examples/$(DEPDIR)/clpi_dump-clpi_dump.Tpo -c -o examples/clpi_dump-clpi_dump.o `test -f 'examples/clpi_dump.c' || echo '$(srcdir)/'`examples/clpi_dump.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) examples/$(DEPDIR)/clpi_dump-clpi_dump.Tpo examples/$(DEPDIR)/clpi_dump-clpi_dump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='examples/clpi_dump.c' object='examples/clpi_dump-clpi_dump.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -c -o examples/clpi_dump-clpi_dump.o `test -f 'examples/clpi_dump.c' || echo '$(srcdir)/'`examples/clpi_dump.c
+
+examples/clpi_dump-clpi_dump.obj: examples/clpi_dump.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -MT examples/clpi_dump-clpi_dump.obj -MD -MP -MF examples/$(DEPDIR)/clpi_dump-clpi_dump.Tpo -c -o examples/clpi_dump-clpi_dump.obj `if test -f 'examples/clpi_dump.c'; then $(CYGPATH_W) 'examples/clpi_dump.c'; else $(CYGPATH_W) '$(srcdir)/examples/clpi_dump.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) examples/$(DEPDIR)/clpi_dump-clpi_dump.Tpo examples/$(DEPDIR)/clpi_dump-clpi_dump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='examples/clpi_dump.c' object='examples/clpi_dump-clpi_dump.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -c -o examples/clpi_dump-clpi_dump.obj `if test -f 'examples/clpi_dump.c'; then $(CYGPATH_W) 'examples/clpi_dump.c'; else $(CYGPATH_W) '$(srcdir)/examples/clpi_dump.c'; fi`
+
+examples/clpi_dump-util.o: examples/util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -MT examples/clpi_dump-util.o -MD -MP -MF examples/$(DEPDIR)/clpi_dump-util.Tpo -c -o examples/clpi_dump-util.o `test -f 'examples/util.c' || echo '$(srcdir)/'`examples/util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) examples/$(DEPDIR)/clpi_dump-util.Tpo examples/$(DEPDIR)/clpi_dump-util.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='examples/util.c' object='examples/clpi_dump-util.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -c -o examples/clpi_dump-util.o `test -f 'examples/util.c' || echo '$(srcdir)/'`examples/util.c
+
+examples/clpi_dump-util.obj: examples/util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -MT examples/clpi_dump-util.obj -MD -MP -MF examples/$(DEPDIR)/clpi_dump-util.Tpo -c -o examples/clpi_dump-util.obj `if test -f 'examples/util.c'; then $(CYGPATH_W) 'examples/util.c'; else $(CYGPATH_W) '$(srcdir)/examples/util.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) examples/$(DEPDIR)/clpi_dump-util.Tpo examples/$(DEPDIR)/clpi_dump-util.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='examples/util.c' object='examples/clpi_dump-util.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -c -o examples/clpi_dump-util.obj `if test -f 'examples/util.c'; then $(CYGPATH_W) 'examples/util.c'; else $(CYGPATH_W) '$(srcdir)/examples/util.c'; fi`
+
+examples/index_dump-index_dump.o: examples/index_dump.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -MT examples/index_dump-index_dump.o -MD -MP -MF examples/$(DEPDIR)/index_dump-index_dump.Tpo -c -o examples/index_dump-index_dump.o `test -f 'examples/index_dump.c' || echo '$(srcdir)/'`examples/index_dump.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) examples/$(DEPDIR)/index_dump-index_dump.Tpo examples/$(DEPDIR)/index_dump-index_dump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='examples/index_dump.c' object='examples/index_dump-index_dump.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -c -o examples/index_dump-index_dump.o `test -f 'examples/index_dump.c' || echo '$(srcdir)/'`examples/index_dump.c
+
+examples/index_dump-index_dump.obj: examples/index_dump.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -MT examples/index_dump-index_dump.obj -MD -MP -MF examples/$(DEPDIR)/index_dump-index_dump.Tpo -c -o examples/index_dump-index_dump.obj `if test -f 'examples/index_dump.c'; then $(CYGPATH_W) 'examples/index_dump.c'; else $(CYGPATH_W) '$(srcdir)/examples/index_dump.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) examples/$(DEPDIR)/index_dump-index_dump.Tpo examples/$(DEPDIR)/index_dump-index_dump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='examples/index_dump.c' object='examples/index_dump-index_dump.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -c -o examples/index_dump-index_dump.obj `if test -f 'examples/index_dump.c'; then $(CYGPATH_W) 'examples/index_dump.c'; else $(CYGPATH_W) '$(srcdir)/examples/index_dump.c'; fi`
+
+file/index_dump-file_posix.o: file/file_posix.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -MT file/index_dump-file_posix.o -MD -MP -MF file/$(DEPDIR)/index_dump-file_posix.Tpo -c -o file/index_dump-file_posix.o `test -f 'file/file_posix.c' || echo '$(srcdir)/'`file/file_posix.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) file/$(DEPDIR)/index_dump-file_posix.Tpo file/$(DEPDIR)/index_dump-file_posix.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file/file_posix.c' object='file/index_dump-file_posix.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -c -o file/index_dump-file_posix.o `test -f 'file/file_posix.c' || echo '$(srcdir)/'`file/file_posix.c
+
+file/index_dump-file_posix.obj: file/file_posix.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -MT file/index_dump-file_posix.obj -MD -MP -MF file/$(DEPDIR)/index_dump-file_posix.Tpo -c -o file/index_dump-file_posix.obj `if test -f 'file/file_posix.c'; then $(CYGPATH_W) 'file/file_posix.c'; else $(CYGPATH_W) '$(srcdir)/file/file_posix.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) file/$(DEPDIR)/index_dump-file_posix.Tpo file/$(DEPDIR)/index_dump-file_posix.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file/file_posix.c' object='file/index_dump-file_posix.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -c -o file/index_dump-file_posix.obj `if test -f 'file/file_posix.c'; then $(CYGPATH_W) 'file/file_posix.c'; else $(CYGPATH_W) '$(srcdir)/file/file_posix.c'; fi`
+
+libbluray/bdnav/index_dump-index_parse.o: libbluray/bdnav/index_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -MT libbluray/bdnav/index_dump-index_parse.o -MD -MP -MF libbluray/bdnav/$(DEPDIR)/index_dump-index_parse.Tpo -c -o libbluray/bdnav/index_dump-index_parse.o `test -f 'libbluray/bdnav/index_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/index_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libbluray/bdnav/$(DEPDIR)/index_dump-index_parse.Tpo libbluray/bdnav/$(DEPDIR)/index_dump-index_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libbluray/bdnav/index_parse.c' object='libbluray/bdnav/index_dump-index_parse.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -c -o libbluray/bdnav/index_dump-index_parse.o `test -f 'libbluray/bdnav/index_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/index_parse.c
+
+libbluray/bdnav/index_dump-index_parse.obj: libbluray/bdnav/index_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -MT libbluray/bdnav/index_dump-index_parse.obj -MD -MP -MF libbluray/bdnav/$(DEPDIR)/index_dump-index_parse.Tpo -c -o libbluray/bdnav/index_dump-index_parse.obj `if test -f 'libbluray/bdnav/index_parse.c'; then $(CYGPATH_W) 'libbluray/bdnav/index_parse.c'; else $(CYGPATH_W) '$(srcdir)/libbluray/bdnav/index_parse.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libbluray/bdnav/$(DEPDIR)/index_dump-index_parse.Tpo libbluray/bdnav/$(DEPDIR)/index_dump-index_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libbluray/bdnav/index_parse.c' object='libbluray/bdnav/index_dump-index_parse.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -c -o libbluray/bdnav/index_dump-index_parse.obj `if test -f 'libbluray/bdnav/index_parse.c'; then $(CYGPATH_W) 'libbluray/bdnav/index_parse.c'; else $(CYGPATH_W) '$(srcdir)/libbluray/bdnav/index_parse.c'; fi`
+
+util/index_dump-bits.o: util/bits.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -MT util/index_dump-bits.o -MD -MP -MF util/$(DEPDIR)/index_dump-bits.Tpo -c -o util/index_dump-bits.o `test -f 'util/bits.c' || echo '$(srcdir)/'`util/bits.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) util/$(DEPDIR)/index_dump-bits.Tpo util/$(DEPDIR)/index_dump-bits.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util/bits.c' object='util/index_dump-bits.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -c -o util/index_dump-bits.o `test -f 'util/bits.c' || echo '$(srcdir)/'`util/bits.c
+
+util/index_dump-bits.obj: util/bits.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -MT util/index_dump-bits.obj -MD -MP -MF util/$(DEPDIR)/index_dump-bits.Tpo -c -o util/index_dump-bits.obj `if test -f 'util/bits.c'; then $(CYGPATH_W) 'util/bits.c'; else $(CYGPATH_W) '$(srcdir)/util/bits.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) util/$(DEPDIR)/index_dump-bits.Tpo util/$(DEPDIR)/index_dump-bits.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util/bits.c' object='util/index_dump-bits.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -c -o util/index_dump-bits.obj `if test -f 'util/bits.c'; then $(CYGPATH_W) 'util/bits.c'; else $(CYGPATH_W) '$(srcdir)/util/bits.c'; fi`
+
+util/index_dump-logging.o: util/logging.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -MT util/index_dump-logging.o -MD -MP -MF util/$(DEPDIR)/index_dump-logging.Tpo -c -o util/index_dump-logging.o `test -f 'util/logging.c' || echo '$(srcdir)/'`util/logging.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) util/$(DEPDIR)/index_dump-logging.Tpo util/$(DEPDIR)/index_dump-logging.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util/logging.c' object='util/index_dump-logging.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -c -o util/index_dump-logging.o `test -f 'util/logging.c' || echo '$(srcdir)/'`util/logging.c
+
+util/index_dump-logging.obj: util/logging.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -MT util/index_dump-logging.obj -MD -MP -MF util/$(DEPDIR)/index_dump-logging.Tpo -c -o util/index_dump-logging.obj `if test -f 'util/logging.c'; then $(CYGPATH_W) 'util/logging.c'; else $(CYGPATH_W) '$(srcdir)/util/logging.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) util/$(DEPDIR)/index_dump-logging.Tpo util/$(DEPDIR)/index_dump-logging.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util/logging.c' object='util/index_dump-logging.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(index_dump_CFLAGS) $(CFLAGS) -c -o util/index_dump-logging.obj `if test -f 'util/logging.c'; then $(CYGPATH_W) 'util/logging.c'; else $(CYGPATH_W) '$(srcdir)/util/logging.c'; fi`
+
+examples/mobj_dump-mobj_dump.o: examples/mobj_dump.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -MT examples/mobj_dump-mobj_dump.o -MD -MP -MF examples/$(DEPDIR)/mobj_dump-mobj_dump.Tpo -c -o examples/mobj_dump-mobj_dump.o `test -f 'examples/mobj_dump.c' || echo '$(srcdir)/'`examples/mobj_dump.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) examples/$(DEPDIR)/mobj_dump-mobj_dump.Tpo examples/$(DEPDIR)/mobj_dump-mobj_dump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='examples/mobj_dump.c' object='examples/mobj_dump-mobj_dump.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -c -o examples/mobj_dump-mobj_dump.o `test -f 'examples/mobj_dump.c' || echo '$(srcdir)/'`examples/mobj_dump.c
+
+examples/mobj_dump-mobj_dump.obj: examples/mobj_dump.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -MT examples/mobj_dump-mobj_dump.obj -MD -MP -MF examples/$(DEPDIR)/mobj_dump-mobj_dump.Tpo -c -o examples/mobj_dump-mobj_dump.obj `if test -f 'examples/mobj_dump.c'; then $(CYGPATH_W) 'examples/mobj_dump.c'; else $(CYGPATH_W) '$(srcdir)/examples/mobj_dump.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) examples/$(DEPDIR)/mobj_dump-mobj_dump.Tpo examples/$(DEPDIR)/mobj_dump-mobj_dump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='examples/mobj_dump.c' object='examples/mobj_dump-mobj_dump.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -c -o examples/mobj_dump-mobj_dump.obj `if test -f 'examples/mobj_dump.c'; then $(CYGPATH_W) 'examples/mobj_dump.c'; else $(CYGPATH_W) '$(srcdir)/examples/mobj_dump.c'; fi`
+
+file/mobj_dump-file_posix.o: file/file_posix.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -MT file/mobj_dump-file_posix.o -MD -MP -MF file/$(DEPDIR)/mobj_dump-file_posix.Tpo -c -o file/mobj_dump-file_posix.o `test -f 'file/file_posix.c' || echo '$(srcdir)/'`file/file_posix.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) file/$(DEPDIR)/mobj_dump-file_posix.Tpo file/$(DEPDIR)/mobj_dump-file_posix.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file/file_posix.c' object='file/mobj_dump-file_posix.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -c -o file/mobj_dump-file_posix.o `test -f 'file/file_posix.c' || echo '$(srcdir)/'`file/file_posix.c
 
-bluray.lo: libbluray/bluray.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bluray.lo -MD -MP -MF $(DEPDIR)/bluray.Tpo -c -o bluray.lo `test -f 'libbluray/bluray.c' || echo '$(srcdir)/'`libbluray/bluray.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/bluray.Tpo $(DEPDIR)/bluray.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bluray.c' object='bluray.lo' libtool=yes @AMDEPBACKSLASH@
+file/mobj_dump-file_posix.obj: file/file_posix.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -MT file/mobj_dump-file_posix.obj -MD -MP -MF file/$(DEPDIR)/mobj_dump-file_posix.Tpo -c -o file/mobj_dump-file_posix.obj `if test -f 'file/file_posix.c'; then $(CYGPATH_W) 'file/file_posix.c'; else $(CYGPATH_W) '$(srcdir)/file/file_posix.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) file/$(DEPDIR)/mobj_dump-file_posix.Tpo file/$(DEPDIR)/mobj_dump-file_posix.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file/file_posix.c' object='file/mobj_dump-file_posix.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bluray.lo `test -f 'libbluray/bluray.c' || echo '$(srcdir)/'`libbluray/bluray.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -c -o file/mobj_dump-file_posix.obj `if test -f 'file/file_posix.c'; then $(CYGPATH_W) 'file/file_posix.c'; else $(CYGPATH_W) '$(srcdir)/file/file_posix.c'; fi`
 
-register.lo: libbluray/register.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT register.lo -MD -MP -MF $(DEPDIR)/register.Tpo -c -o register.lo `test -f 'libbluray/register.c' || echo '$(srcdir)/'`libbluray/register.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/register.Tpo $(DEPDIR)/register.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/register.c' object='register.lo' libtool=yes @AMDEPBACKSLASH@
+libbluray/hdmv/mobj_dump-mobj_parse.o: libbluray/hdmv/mobj_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -MT libbluray/hdmv/mobj_dump-mobj_parse.o -MD -MP -MF libbluray/hdmv/$(DEPDIR)/mobj_dump-mobj_parse.Tpo -c -o libbluray/hdmv/mobj_dump-mobj_parse.o `test -f 'libbluray/hdmv/mobj_parse.c' || echo '$(srcdir)/'`libbluray/hdmv/mobj_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libbluray/hdmv/$(DEPDIR)/mobj_dump-mobj_parse.Tpo libbluray/hdmv/$(DEPDIR)/mobj_dump-mobj_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libbluray/hdmv/mobj_parse.c' object='libbluray/hdmv/mobj_dump-mobj_parse.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o register.lo `test -f 'libbluray/register.c' || echo '$(srcdir)/'`libbluray/register.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -c -o libbluray/hdmv/mobj_dump-mobj_parse.o `test -f 'libbluray/hdmv/mobj_parse.c' || echo '$(srcdir)/'`libbluray/hdmv/mobj_parse.c
 
-index_parse.lo: libbluray/bdnav/index_parse.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT index_parse.lo -MD -MP -MF $(DEPDIR)/index_parse.Tpo -c -o index_parse.lo `test -f 'libbluray/bdnav/index_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/index_parse.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/index_parse.Tpo $(DEPDIR)/index_parse.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdnav/index_parse.c' object='index_parse.lo' libtool=yes @AMDEPBACKSLASH@
+libbluray/hdmv/mobj_dump-mobj_parse.obj: libbluray/hdmv/mobj_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -MT libbluray/hdmv/mobj_dump-mobj_parse.obj -MD -MP -MF libbluray/hdmv/$(DEPDIR)/mobj_dump-mobj_parse.Tpo -c -o libbluray/hdmv/mobj_dump-mobj_parse.obj `if test -f 'libbluray/hdmv/mobj_parse.c'; then $(CYGPATH_W) 'libbluray/hdmv/mobj_parse.c'; else $(CYGPATH_W) '$(srcdir)/libbluray/hdmv/mobj_parse.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libbluray/hdmv/$(DEPDIR)/mobj_dump-mobj_parse.Tpo libbluray/hdmv/$(DEPDIR)/mobj_dump-mobj_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libbluray/hdmv/mobj_parse.c' object='libbluray/hdmv/mobj_dump-mobj_parse.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o index_parse.lo `test -f 'libbluray/bdnav/index_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/index_parse.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -c -o libbluray/hdmv/mobj_dump-mobj_parse.obj `if test -f 'libbluray/hdmv/mobj_parse.c'; then $(CYGPATH_W) 'libbluray/hdmv/mobj_parse.c'; else $(CYGPATH_W) '$(srcdir)/libbluray/hdmv/mobj_parse.c'; fi`
 
-navigation.lo: libbluray/bdnav/navigation.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT navigation.lo -MD -MP -MF $(DEPDIR)/navigation.Tpo -c -o navigation.lo `test -f 'libbluray/bdnav/navigation.c' || echo '$(srcdir)/'`libbluray/bdnav/navigation.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/navigation.Tpo $(DEPDIR)/navigation.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdnav/navigation.c' object='navigation.lo' libtool=yes @AMDEPBACKSLASH@
+libbluray/hdmv/mobj_dump-mobj_print.o: libbluray/hdmv/mobj_print.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -MT libbluray/hdmv/mobj_dump-mobj_print.o -MD -MP -MF libbluray/hdmv/$(DEPDIR)/mobj_dump-mobj_print.Tpo -c -o libbluray/hdmv/mobj_dump-mobj_print.o `test -f 'libbluray/hdmv/mobj_print.c' || echo '$(srcdir)/'`libbluray/hdmv/mobj_print.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libbluray/hdmv/$(DEPDIR)/mobj_dump-mobj_print.Tpo libbluray/hdmv/$(DEPDIR)/mobj_dump-mobj_print.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libbluray/hdmv/mobj_print.c' object='libbluray/hdmv/mobj_dump-mobj_print.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o navigation.lo `test -f 'libbluray/bdnav/navigation.c' || echo '$(srcdir)/'`libbluray/bdnav/navigation.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -c -o libbluray/hdmv/mobj_dump-mobj_print.o `test -f 'libbluray/hdmv/mobj_print.c' || echo '$(srcdir)/'`libbluray/hdmv/mobj_print.c
 
-sound_parse.lo: libbluray/bdnav/sound_parse.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sound_parse.lo -MD -MP -MF $(DEPDIR)/sound_parse.Tpo -c -o sound_parse.lo `test -f 'libbluray/bdnav/sound_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/sound_parse.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/sound_parse.Tpo $(DEPDIR)/sound_parse.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdnav/sound_parse.c' object='sound_parse.lo' libtool=yes @AMDEPBACKSLASH@
+libbluray/hdmv/mobj_dump-mobj_print.obj: libbluray/hdmv/mobj_print.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -MT libbluray/hdmv/mobj_dump-mobj_print.obj -MD -MP -MF libbluray/hdmv/$(DEPDIR)/mobj_dump-mobj_print.Tpo -c -o libbluray/hdmv/mobj_dump-mobj_print.obj `if test -f 'libbluray/hdmv/mobj_print.c'; then $(CYGPATH_W) 'libbluray/hdmv/mobj_print.c'; else $(CYGPATH_W) '$(srcdir)/libbluray/hdmv/mobj_print.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libbluray/hdmv/$(DEPDIR)/mobj_dump-mobj_print.Tpo libbluray/hdmv/$(DEPDIR)/mobj_dump-mobj_print.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libbluray/hdmv/mobj_print.c' object='libbluray/hdmv/mobj_dump-mobj_print.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sound_parse.lo `test -f 'libbluray/bdnav/sound_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/sound_parse.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -c -o libbluray/hdmv/mobj_dump-mobj_print.obj `if test -f 'libbluray/hdmv/mobj_print.c'; then $(CYGPATH_W) 'libbluray/hdmv/mobj_print.c'; else $(CYGPATH_W) '$(srcdir)/libbluray/hdmv/mobj_print.c'; fi`
 
-clpi_parse.lo: libbluray/bdnav/clpi_parse.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clpi_parse.lo -MD -MP -MF $(DEPDIR)/clpi_parse.Tpo -c -o clpi_parse.lo `test -f 'libbluray/bdnav/clpi_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/clpi_parse.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/clpi_parse.Tpo $(DEPDIR)/clpi_parse.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdnav/clpi_parse.c' object='clpi_parse.lo' libtool=yes @AMDEPBACKSLASH@
+util/mobj_dump-bits.o: util/bits.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -MT util/mobj_dump-bits.o -MD -MP -MF util/$(DEPDIR)/mobj_dump-bits.Tpo -c -o util/mobj_dump-bits.o `test -f 'util/bits.c' || echo '$(srcdir)/'`util/bits.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) util/$(DEPDIR)/mobj_dump-bits.Tpo util/$(DEPDIR)/mobj_dump-bits.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util/bits.c' object='util/mobj_dump-bits.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clpi_parse.lo `test -f 'libbluray/bdnav/clpi_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/clpi_parse.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -c -o util/mobj_dump-bits.o `test -f 'util/bits.c' || echo '$(srcdir)/'`util/bits.c
 
-mpls_parse.lo: libbluray/bdnav/mpls_parse.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpls_parse.lo -MD -MP -MF $(DEPDIR)/mpls_parse.Tpo -c -o mpls_parse.lo `test -f 'libbluray/bdnav/mpls_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/mpls_parse.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mpls_parse.Tpo $(DEPDIR)/mpls_parse.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdnav/mpls_parse.c' object='mpls_parse.lo' libtool=yes @AMDEPBACKSLASH@
+util/mobj_dump-bits.obj: util/bits.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -MT util/mobj_dump-bits.obj -MD -MP -MF util/$(DEPDIR)/mobj_dump-bits.Tpo -c -o util/mobj_dump-bits.obj `if test -f 'util/bits.c'; then $(CYGPATH_W) 'util/bits.c'; else $(CYGPATH_W) '$(srcdir)/util/bits.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) util/$(DEPDIR)/mobj_dump-bits.Tpo util/$(DEPDIR)/mobj_dump-bits.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util/bits.c' object='util/mobj_dump-bits.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpls_parse.lo `test -f 'libbluray/bdnav/mpls_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/mpls_parse.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -c -o util/mobj_dump-bits.obj `if test -f 'util/bits.c'; then $(CYGPATH_W) 'util/bits.c'; else $(CYGPATH_W) '$(srcdir)/util/bits.c'; fi`
 
-meta_parse.lo: libbluray/bdnav/meta_parse.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT meta_parse.lo -MD -MP -MF $(DEPDIR)/meta_parse.Tpo -c -o meta_parse.lo `test -f 'libbluray/bdnav/meta_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/meta_parse.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/meta_parse.Tpo $(DEPDIR)/meta_parse.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdnav/meta_parse.c' object='meta_parse.lo' libtool=yes @AMDEPBACKSLASH@
+util/mobj_dump-logging.o: util/logging.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -MT util/mobj_dump-logging.o -MD -MP -MF util/$(DEPDIR)/mobj_dump-logging.Tpo -c -o util/mobj_dump-logging.o `test -f 'util/logging.c' || echo '$(srcdir)/'`util/logging.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) util/$(DEPDIR)/mobj_dump-logging.Tpo util/$(DEPDIR)/mobj_dump-logging.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util/logging.c' object='util/mobj_dump-logging.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o meta_parse.lo `test -f 'libbluray/bdnav/meta_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/meta_parse.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -c -o util/mobj_dump-logging.o `test -f 'util/logging.c' || echo '$(srcdir)/'`util/logging.c
 
-pes_buffer.lo: libbluray/decoders/pes_buffer.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pes_buffer.lo -MD -MP -MF $(DEPDIR)/pes_buffer.Tpo -c -o pes_buffer.lo `test -f 'libbluray/decoders/pes_buffer.c' || echo '$(srcdir)/'`libbluray/decoders/pes_buffer.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/pes_buffer.Tpo $(DEPDIR)/pes_buffer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/decoders/pes_buffer.c' object='pes_buffer.lo' libtool=yes @AMDEPBACKSLASH@
+util/mobj_dump-logging.obj: util/logging.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -MT util/mobj_dump-logging.obj -MD -MP -MF util/$(DEPDIR)/mobj_dump-logging.Tpo -c -o util/mobj_dump-logging.obj `if test -f 'util/logging.c'; then $(CYGPATH_W) 'util/logging.c'; else $(CYGPATH_W) '$(srcdir)/util/logging.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) util/$(DEPDIR)/mobj_dump-logging.Tpo util/$(DEPDIR)/mobj_dump-logging.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util/logging.c' object='util/mobj_dump-logging.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pes_buffer.lo `test -f 'libbluray/decoders/pes_buffer.c' || echo '$(srcdir)/'`libbluray/decoders/pes_buffer.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -c -o util/mobj_dump-logging.obj `if test -f 'util/logging.c'; then $(CYGPATH_W) 'util/logging.c'; else $(CYGPATH_W) '$(srcdir)/util/logging.c'; fi`
 
-m2ts_demux.lo: libbluray/decoders/m2ts_demux.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m2ts_demux.lo -MD -MP -MF $(DEPDIR)/m2ts_demux.Tpo -c -o m2ts_demux.lo `test -f 'libbluray/decoders/m2ts_demux.c' || echo '$(srcdir)/'`libbluray/decoders/m2ts_demux.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/m2ts_demux.Tpo $(DEPDIR)/m2ts_demux.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/decoders/m2ts_demux.c' object='m2ts_demux.lo' libtool=yes @AMDEPBACKSLASH@
+examples/mpls_dump-mpls_dump.o: examples/mpls_dump.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT examples/mpls_dump-mpls_dump.o -MD -MP -MF examples/$(DEPDIR)/mpls_dump-mpls_dump.Tpo -c -o examples/mpls_dump-mpls_dump.o `test -f 'examples/mpls_dump.c' || echo '$(srcdir)/'`examples/mpls_dump.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) examples/$(DEPDIR)/mpls_dump-mpls_dump.Tpo examples/$(DEPDIR)/mpls_dump-mpls_dump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='examples/mpls_dump.c' object='examples/mpls_dump-mpls_dump.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m2ts_demux.lo `test -f 'libbluray/decoders/m2ts_demux.c' || echo '$(srcdir)/'`libbluray/decoders/m2ts_demux.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o examples/mpls_dump-mpls_dump.o `test -f 'examples/mpls_dump.c' || echo '$(srcdir)/'`examples/mpls_dump.c
 
-pg_decode.lo: libbluray/decoders/pg_decode.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pg_decode.lo -MD -MP -MF $(DEPDIR)/pg_decode.Tpo -c -o pg_decode.lo `test -f 'libbluray/decoders/pg_decode.c' || echo '$(srcdir)/'`libbluray/decoders/pg_decode.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/pg_decode.Tpo $(DEPDIR)/pg_decode.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/decoders/pg_decode.c' object='pg_decode.lo' libtool=yes @AMDEPBACKSLASH@
+examples/mpls_dump-mpls_dump.obj: examples/mpls_dump.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT examples/mpls_dump-mpls_dump.obj -MD -MP -MF examples/$(DEPDIR)/mpls_dump-mpls_dump.Tpo -c -o examples/mpls_dump-mpls_dump.obj `if test -f 'examples/mpls_dump.c'; then $(CYGPATH_W) 'examples/mpls_dump.c'; else $(CYGPATH_W) '$(srcdir)/examples/mpls_dump.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) examples/$(DEPDIR)/mpls_dump-mpls_dump.Tpo examples/$(DEPDIR)/mpls_dump-mpls_dump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='examples/mpls_dump.c' object='examples/mpls_dump-mpls_dump.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pg_decode.lo `test -f 'libbluray/decoders/pg_decode.c' || echo '$(srcdir)/'`libbluray/decoders/pg_decode.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o examples/mpls_dump-mpls_dump.obj `if test -f 'examples/mpls_dump.c'; then $(CYGPATH_W) 'examples/mpls_dump.c'; else $(CYGPATH_W) '$(srcdir)/examples/mpls_dump.c'; fi`
 
-ig_decode.lo: libbluray/decoders/ig_decode.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ig_decode.lo -MD -MP -MF $(DEPDIR)/ig_decode.Tpo -c -o ig_decode.lo `test -f 'libbluray/decoders/ig_decode.c' || echo '$(srcdir)/'`libbluray/decoders/ig_decode.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ig_decode.Tpo $(DEPDIR)/ig_decode.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/decoders/ig_decode.c' object='ig_decode.lo' libtool=yes @AMDEPBACKSLASH@
+examples/mpls_dump-util.o: examples/util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT examples/mpls_dump-util.o -MD -MP -MF examples/$(DEPDIR)/mpls_dump-util.Tpo -c -o examples/mpls_dump-util.o `test -f 'examples/util.c' || echo '$(srcdir)/'`examples/util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) examples/$(DEPDIR)/mpls_dump-util.Tpo examples/$(DEPDIR)/mpls_dump-util.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='examples/util.c' object='examples/mpls_dump-util.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ig_decode.lo `test -f 'libbluray/decoders/ig_decode.c' || echo '$(srcdir)/'`libbluray/decoders/ig_decode.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o examples/mpls_dump-util.o `test -f 'examples/util.c' || echo '$(srcdir)/'`examples/util.c
 
-graphics_processor.lo: libbluray/decoders/graphics_processor.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT graphics_processor.lo -MD -MP -MF $(DEPDIR)/graphics_processor.Tpo -c -o graphics_processor.lo `test -f 'libbluray/decoders/graphics_processor.c' || echo '$(srcdir)/'`libbluray/decoders/graphics_processor.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/graphics_processor.Tpo $(DEPDIR)/graphics_processor.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/decoders/graphics_processor.c' object='graphics_processor.lo' libtool=yes @AMDEPBACKSLASH@
+examples/mpls_dump-util.obj: examples/util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT examples/mpls_dump-util.obj -MD -MP -MF examples/$(DEPDIR)/mpls_dump-util.Tpo -c -o examples/mpls_dump-util.obj `if test -f 'examples/util.c'; then $(CYGPATH_W) 'examples/util.c'; else $(CYGPATH_W) '$(srcdir)/examples/util.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) examples/$(DEPDIR)/mpls_dump-util.Tpo examples/$(DEPDIR)/mpls_dump-util.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='examples/util.c' object='examples/mpls_dump-util.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o graphics_processor.lo `test -f 'libbluray/decoders/graphics_processor.c' || echo '$(srcdir)/'`libbluray/decoders/graphics_processor.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o examples/mpls_dump-util.obj `if test -f 'examples/util.c'; then $(CYGPATH_W) 'examples/util.c'; else $(CYGPATH_W) '$(srcdir)/examples/util.c'; fi`
 
-graphics_controller.lo: libbluray/decoders/graphics_controller.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT graphics_controller.lo -MD -MP -MF $(DEPDIR)/graphics_controller.Tpo -c -o graphics_controller.lo `test -f 'libbluray/decoders/graphics_controller.c' || echo '$(srcdir)/'`libbluray/decoders/graphics_controller.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/graphics_controller.Tpo $(DEPDIR)/graphics_controller.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/decoders/graphics_controller.c' object='graphics_controller.lo' libtool=yes @AMDEPBACKSLASH@
+file/mpls_dump-file_posix.o: file/file_posix.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT file/mpls_dump-file_posix.o -MD -MP -MF file/$(DEPDIR)/mpls_dump-file_posix.Tpo -c -o file/mpls_dump-file_posix.o `test -f 'file/file_posix.c' || echo '$(srcdir)/'`file/file_posix.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) file/$(DEPDIR)/mpls_dump-file_posix.Tpo file/$(DEPDIR)/mpls_dump-file_posix.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file/file_posix.c' object='file/mpls_dump-file_posix.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o graphics_controller.lo `test -f 'libbluray/decoders/graphics_controller.c' || echo '$(srcdir)/'`libbluray/decoders/graphics_controller.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o file/mpls_dump-file_posix.o `test -f 'file/file_posix.c' || echo '$(srcdir)/'`file/file_posix.c
 
-hdmv_vm.lo: libbluray/hdmv/hdmv_vm.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hdmv_vm.lo -MD -MP -MF $(DEPDIR)/hdmv_vm.Tpo -c -o hdmv_vm.lo `test -f 'libbluray/hdmv/hdmv_vm.c' || echo '$(srcdir)/'`libbluray/hdmv/hdmv_vm.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/hdmv_vm.Tpo $(DEPDIR)/hdmv_vm.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/hdmv/hdmv_vm.c' object='hdmv_vm.lo' libtool=yes @AMDEPBACKSLASH@
+file/mpls_dump-file_posix.obj: file/file_posix.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT file/mpls_dump-file_posix.obj -MD -MP -MF file/$(DEPDIR)/mpls_dump-file_posix.Tpo -c -o file/mpls_dump-file_posix.obj `if test -f 'file/file_posix.c'; then $(CYGPATH_W) 'file/file_posix.c'; else $(CYGPATH_W) '$(srcdir)/file/file_posix.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) file/$(DEPDIR)/mpls_dump-file_posix.Tpo file/$(DEPDIR)/mpls_dump-file_posix.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file/file_posix.c' object='file/mpls_dump-file_posix.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hdmv_vm.lo `test -f 'libbluray/hdmv/hdmv_vm.c' || echo '$(srcdir)/'`libbluray/hdmv/hdmv_vm.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o file/mpls_dump-file_posix.obj `if test -f 'file/file_posix.c'; then $(CYGPATH_W) 'file/file_posix.c'; else $(CYGPATH_W) '$(srcdir)/file/file_posix.c'; fi`
 
-mobj_parse.lo: libbluray/hdmv/mobj_parse.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mobj_parse.lo -MD -MP -MF $(DEPDIR)/mobj_parse.Tpo -c -o mobj_parse.lo `test -f 'libbluray/hdmv/mobj_parse.c' || echo '$(srcdir)/'`libbluray/hdmv/mobj_parse.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mobj_parse.Tpo $(DEPDIR)/mobj_parse.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/hdmv/mobj_parse.c' object='mobj_parse.lo' libtool=yes @AMDEPBACKSLASH@
+libbluray/bdnav/mpls_dump-clpi_parse.o: libbluray/bdnav/clpi_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT libbluray/bdnav/mpls_dump-clpi_parse.o -MD -MP -MF libbluray/bdnav/$(DEPDIR)/mpls_dump-clpi_parse.Tpo -c -o libbluray/bdnav/mpls_dump-clpi_parse.o `test -f 'libbluray/bdnav/clpi_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/clpi_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libbluray/bdnav/$(DEPDIR)/mpls_dump-clpi_parse.Tpo libbluray/bdnav/$(DEPDIR)/mpls_dump-clpi_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libbluray/bdnav/clpi_parse.c' object='libbluray/bdnav/mpls_dump-clpi_parse.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mobj_parse.lo `test -f 'libbluray/hdmv/mobj_parse.c' || echo '$(srcdir)/'`libbluray/hdmv/mobj_parse.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o libbluray/bdnav/mpls_dump-clpi_parse.o `test -f 'libbluray/bdnav/clpi_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/clpi_parse.c
 
-mobj_print.lo: libbluray/hdmv/mobj_print.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mobj_print.lo -MD -MP -MF $(DEPDIR)/mobj_print.Tpo -c -o mobj_print.lo `test -f 'libbluray/hdmv/mobj_print.c' || echo '$(srcdir)/'`libbluray/hdmv/mobj_print.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mobj_print.Tpo $(DEPDIR)/mobj_print.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/hdmv/mobj_print.c' object='mobj_print.lo' libtool=yes @AMDEPBACKSLASH@
+libbluray/bdnav/mpls_dump-clpi_parse.obj: libbluray/bdnav/clpi_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT libbluray/bdnav/mpls_dump-clpi_parse.obj -MD -MP -MF libbluray/bdnav/$(DEPDIR)/mpls_dump-clpi_parse.Tpo -c -o libbluray/bdnav/mpls_dump-clpi_parse.obj `if test -f 'libbluray/bdnav/clpi_parse.c'; then $(CYGPATH_W) 'libbluray/bdnav/clpi_parse.c'; else $(CYGPATH_W) '$(srcdir)/libbluray/bdnav/clpi_parse.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libbluray/bdnav/$(DEPDIR)/mpls_dump-clpi_parse.Tpo libbluray/bdnav/$(DEPDIR)/mpls_dump-clpi_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libbluray/bdnav/clpi_parse.c' object='libbluray/bdnav/mpls_dump-clpi_parse.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mobj_print.lo `test -f 'libbluray/hdmv/mobj_print.c' || echo '$(srcdir)/'`libbluray/hdmv/mobj_print.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o libbluray/bdnav/mpls_dump-clpi_parse.obj `if test -f 'libbluray/bdnav/clpi_parse.c'; then $(CYGPATH_W) 'libbluray/bdnav/clpi_parse.c'; else $(CYGPATH_W) '$(srcdir)/libbluray/bdnav/clpi_parse.c'; fi`
 
-dir_posix.lo: file/dir_posix.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dir_posix.lo -MD -MP -MF $(DEPDIR)/dir_posix.Tpo -c -o dir_posix.lo `test -f 'file/dir_posix.c' || echo '$(srcdir)/'`file/dir_posix.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dir_posix.Tpo $(DEPDIR)/dir_posix.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file/dir_posix.c' object='dir_posix.lo' libtool=yes @AMDEPBACKSLASH@
+libbluray/bdnav/mpls_dump-extdata_parse.o: libbluray/bdnav/extdata_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT libbluray/bdnav/mpls_dump-extdata_parse.o -MD -MP -MF libbluray/bdnav/$(DEPDIR)/mpls_dump-extdata_parse.Tpo -c -o libbluray/bdnav/mpls_dump-extdata_parse.o `test -f 'libbluray/bdnav/extdata_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/extdata_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libbluray/bdnav/$(DEPDIR)/mpls_dump-extdata_parse.Tpo libbluray/bdnav/$(DEPDIR)/mpls_dump-extdata_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libbluray/bdnav/extdata_parse.c' object='libbluray/bdnav/mpls_dump-extdata_parse.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dir_posix.lo `test -f 'file/dir_posix.c' || echo '$(srcdir)/'`file/dir_posix.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o libbluray/bdnav/mpls_dump-extdata_parse.o `test -f 'libbluray/bdnav/extdata_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/extdata_parse.c
 
-file_posix.lo: file/file_posix.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT file_posix.lo -MD -MP -MF $(DEPDIR)/file_posix.Tpo -c -o file_posix.lo `test -f 'file/file_posix.c' || echo '$(srcdir)/'`file/file_posix.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_posix.Tpo $(DEPDIR)/file_posix.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file/file_posix.c' object='file_posix.lo' libtool=yes @AMDEPBACKSLASH@
+libbluray/bdnav/mpls_dump-extdata_parse.obj: libbluray/bdnav/extdata_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT libbluray/bdnav/mpls_dump-extdata_parse.obj -MD -MP -MF libbluray/bdnav/$(DEPDIR)/mpls_dump-extdata_parse.Tpo -c -o libbluray/bdnav/mpls_dump-extdata_parse.obj `if test -f 'libbluray/bdnav/extdata_parse.c'; then $(CYGPATH_W) 'libbluray/bdnav/extdata_parse.c'; else $(CYGPATH_W) '$(srcdir)/libbluray/bdnav/extdata_parse.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libbluray/bdnav/$(DEPDIR)/mpls_dump-extdata_parse.Tpo libbluray/bdnav/$(DEPDIR)/mpls_dump-extdata_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libbluray/bdnav/extdata_parse.c' object='libbluray/bdnav/mpls_dump-extdata_parse.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o file_posix.lo `test -f 'file/file_posix.c' || echo '$(srcdir)/'`file/file_posix.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o libbluray/bdnav/mpls_dump-extdata_parse.obj `if test -f 'libbluray/bdnav/extdata_parse.c'; then $(CYGPATH_W) 'libbluray/bdnav/extdata_parse.c'; else $(CYGPATH_W) '$(srcdir)/libbluray/bdnav/extdata_parse.c'; fi`
 
-dl_posix.lo: file/dl_posix.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dl_posix.lo -MD -MP -MF $(DEPDIR)/dl_posix.Tpo -c -o dl_posix.lo `test -f 'file/dl_posix.c' || echo '$(srcdir)/'`file/dl_posix.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dl_posix.Tpo $(DEPDIR)/dl_posix.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file/dl_posix.c' object='dl_posix.lo' libtool=yes @AMDEPBACKSLASH@
+libbluray/bdnav/mpls_dump-mpls_parse.o: libbluray/bdnav/mpls_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT libbluray/bdnav/mpls_dump-mpls_parse.o -MD -MP -MF libbluray/bdnav/$(DEPDIR)/mpls_dump-mpls_parse.Tpo -c -o libbluray/bdnav/mpls_dump-mpls_parse.o `test -f 'libbluray/bdnav/mpls_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/mpls_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libbluray/bdnav/$(DEPDIR)/mpls_dump-mpls_parse.Tpo libbluray/bdnav/$(DEPDIR)/mpls_dump-mpls_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libbluray/bdnav/mpls_parse.c' object='libbluray/bdnav/mpls_dump-mpls_parse.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dl_posix.lo `test -f 'file/dl_posix.c' || echo '$(srcdir)/'`file/dl_posix.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o libbluray/bdnav/mpls_dump-mpls_parse.o `test -f 'libbluray/bdnav/mpls_parse.c' || echo '$(srcdir)/'`libbluray/bdnav/mpls_parse.c
 
-filesystem.lo: file/filesystem.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT filesystem.lo -MD -MP -MF $(DEPDIR)/filesystem.Tpo -c -o filesystem.lo `test -f 'file/filesystem.c' || echo '$(srcdir)/'`file/filesystem.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/filesystem.Tpo $(DEPDIR)/filesystem.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file/filesystem.c' object='filesystem.lo' libtool=yes @AMDEPBACKSLASH@
+libbluray/bdnav/mpls_dump-mpls_parse.obj: libbluray/bdnav/mpls_parse.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT libbluray/bdnav/mpls_dump-mpls_parse.obj -MD -MP -MF libbluray/bdnav/$(DEPDIR)/mpls_dump-mpls_parse.Tpo -c -o libbluray/bdnav/mpls_dump-mpls_parse.obj `if test -f 'libbluray/bdnav/mpls_parse.c'; then $(CYGPATH_W) 'libbluray/bdnav/mpls_parse.c'; else $(CYGPATH_W) '$(srcdir)/libbluray/bdnav/mpls_parse.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libbluray/bdnav/$(DEPDIR)/mpls_dump-mpls_parse.Tpo libbluray/bdnav/$(DEPDIR)/mpls_dump-mpls_parse.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libbluray/bdnav/mpls_parse.c' object='libbluray/bdnav/mpls_dump-mpls_parse.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o filesystem.lo `test -f 'file/filesystem.c' || echo '$(srcdir)/'`file/filesystem.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o libbluray/bdnav/mpls_dump-mpls_parse.obj `if test -f 'libbluray/bdnav/mpls_parse.c'; then $(CYGPATH_W) 'libbluray/bdnav/mpls_parse.c'; else $(CYGPATH_W) '$(srcdir)/libbluray/bdnav/mpls_parse.c'; fi`
 
-strutl.lo: util/strutl.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strutl.lo -MD -MP -MF $(DEPDIR)/strutl.Tpo -c -o strutl.lo `test -f 'util/strutl.c' || echo '$(srcdir)/'`util/strutl.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/strutl.Tpo $(DEPDIR)/strutl.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util/strutl.c' object='strutl.lo' libtool=yes @AMDEPBACKSLASH@
+util/mpls_dump-bits.o: util/bits.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT util/mpls_dump-bits.o -MD -MP -MF util/$(DEPDIR)/mpls_dump-bits.Tpo -c -o util/mpls_dump-bits.o `test -f 'util/bits.c' || echo '$(srcdir)/'`util/bits.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) util/$(DEPDIR)/mpls_dump-bits.Tpo util/$(DEPDIR)/mpls_dump-bits.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util/bits.c' object='util/mpls_dump-bits.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strutl.lo `test -f 'util/strutl.c' || echo '$(srcdir)/'`util/strutl.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o util/mpls_dump-bits.o `test -f 'util/bits.c' || echo '$(srcdir)/'`util/bits.c
 
-logging.lo: util/logging.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT logging.lo -MD -MP -MF $(DEPDIR)/logging.Tpo -c -o logging.lo `test -f 'util/logging.c' || echo '$(srcdir)/'`util/logging.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/logging.Tpo $(DEPDIR)/logging.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util/logging.c' object='logging.lo' libtool=yes @AMDEPBACKSLASH@
+util/mpls_dump-bits.obj: util/bits.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT util/mpls_dump-bits.obj -MD -MP -MF util/$(DEPDIR)/mpls_dump-bits.Tpo -c -o util/mpls_dump-bits.obj `if test -f 'util/bits.c'; then $(CYGPATH_W) 'util/bits.c'; else $(CYGPATH_W) '$(srcdir)/util/bits.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) util/$(DEPDIR)/mpls_dump-bits.Tpo util/$(DEPDIR)/mpls_dump-bits.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util/bits.c' object='util/mpls_dump-bits.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o logging.lo `test -f 'util/logging.c' || echo '$(srcdir)/'`util/logging.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o util/mpls_dump-bits.obj `if test -f 'util/bits.c'; then $(CYGPATH_W) 'util/bits.c'; else $(CYGPATH_W) '$(srcdir)/util/bits.c'; fi`
 
-bdj_util.lo: libbluray/bdj/bdj_util.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bdj_util.lo -MD -MP -MF $(DEPDIR)/bdj_util.Tpo -c -o bdj_util.lo `test -f 'libbluray/bdj/bdj_util.c' || echo '$(srcdir)/'`libbluray/bdj/bdj_util.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/bdj_util.Tpo $(DEPDIR)/bdj_util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdj/bdj_util.c' object='bdj_util.lo' libtool=yes @AMDEPBACKSLASH@
+util/mpls_dump-logging.o: util/logging.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT util/mpls_dump-logging.o -MD -MP -MF util/$(DEPDIR)/mpls_dump-logging.Tpo -c -o util/mpls_dump-logging.o `test -f 'util/logging.c' || echo '$(srcdir)/'`util/logging.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) util/$(DEPDIR)/mpls_dump-logging.Tpo util/$(DEPDIR)/mpls_dump-logging.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util/logging.c' object='util/mpls_dump-logging.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bdj_util.lo `test -f 'libbluray/bdj/bdj_util.c' || echo '$(srcdir)/'`libbluray/bdj/bdj_util.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o util/mpls_dump-logging.o `test -f 'util/logging.c' || echo '$(srcdir)/'`util/logging.c
 
-bdj.lo: libbluray/bdj/bdj.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bdj.lo -MD -MP -MF $(DEPDIR)/bdj.Tpo -c -o bdj.lo `test -f 'libbluray/bdj/bdj.c' || echo '$(srcdir)/'`libbluray/bdj/bdj.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/bdj.Tpo $(DEPDIR)/bdj.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdj/bdj.c' object='bdj.lo' libtool=yes @AMDEPBACKSLASH@
+util/mpls_dump-logging.obj: util/logging.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT util/mpls_dump-logging.obj -MD -MP -MF util/$(DEPDIR)/mpls_dump-logging.Tpo -c -o util/mpls_dump-logging.obj `if test -f 'util/logging.c'; then $(CYGPATH_W) 'util/logging.c'; else $(CYGPATH_W) '$(srcdir)/util/logging.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) util/$(DEPDIR)/mpls_dump-logging.Tpo util/$(DEPDIR)/mpls_dump-logging.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util/logging.c' object='util/mpls_dump-logging.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bdj.lo `test -f 'libbluray/bdj/bdj.c' || echo '$(srcdir)/'`libbluray/bdj/bdj.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o util/mpls_dump-logging.obj `if test -f 'util/logging.c'; then $(CYGPATH_W) 'util/logging.c'; else $(CYGPATH_W) '$(srcdir)/util/logging.c'; fi`
 
-bdjo_parser.lo: libbluray/bdj/bdjo_parser.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bdjo_parser.lo -MD -MP -MF $(DEPDIR)/bdjo_parser.Tpo -c -o bdjo_parser.lo `test -f 'libbluray/bdj/bdjo_parser.c' || echo '$(srcdir)/'`libbluray/bdj/bdjo_parser.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/bdjo_parser.Tpo $(DEPDIR)/bdjo_parser.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdj/bdjo_parser.c' object='bdjo_parser.lo' libtool=yes @AMDEPBACKSLASH@
+util/mpls_dump-strutl.o: util/strutl.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT util/mpls_dump-strutl.o -MD -MP -MF util/$(DEPDIR)/mpls_dump-strutl.Tpo -c -o util/mpls_dump-strutl.o `test -f 'util/strutl.c' || echo '$(srcdir)/'`util/strutl.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) util/$(DEPDIR)/mpls_dump-strutl.Tpo util/$(DEPDIR)/mpls_dump-strutl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util/strutl.c' object='util/mpls_dump-strutl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bdjo_parser.lo `test -f 'libbluray/bdj/bdjo_parser.c' || echo '$(srcdir)/'`libbluray/bdj/bdjo_parser.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o util/mpls_dump-strutl.o `test -f 'util/strutl.c' || echo '$(srcdir)/'`util/strutl.c
 
-org_videolan_Libbluray.lo: libbluray/bdj/native/org_videolan_Libbluray.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT org_videolan_Libbluray.lo -MD -MP -MF $(DEPDIR)/org_videolan_Libbluray.Tpo -c -o org_videolan_Libbluray.lo `test -f 'libbluray/bdj/native/org_videolan_Libbluray.c' || echo '$(srcdir)/'`libbluray/bdj/native/org_videolan_Libbluray.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/org_videolan_Libbluray.Tpo $(DEPDIR)/org_videolan_Libbluray.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libbluray/bdj/native/org_videolan_Libbluray.c' object='org_videolan_Libbluray.lo' libtool=yes @AMDEPBACKSLASH@
+util/mpls_dump-strutl.obj: util/strutl.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT util/mpls_dump-strutl.obj -MD -MP -MF util/$(DEPDIR)/mpls_dump-strutl.Tpo -c -o util/mpls_dump-strutl.obj `if test -f 'util/strutl.c'; then $(CYGPATH_W) 'util/strutl.c'; else $(CYGPATH_W) '$(srcdir)/util/strutl.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) util/$(DEPDIR)/mpls_dump-strutl.Tpo util/$(DEPDIR)/mpls_dump-strutl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util/strutl.c' object='util/mpls_dump-strutl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o org_videolan_Libbluray.lo `test -f 'libbluray/bdj/native/org_videolan_Libbluray.c' || echo '$(srcdir)/'`libbluray/bdj/native/org_videolan_Libbluray.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o util/mpls_dump-strutl.obj `if test -f 'util/strutl.c'; then $(CYGPATH_W) 'util/strutl.c'; else $(CYGPATH_W) '$(srcdir)/util/strutl.c'; fi`
+
+file/mpls_dump-dir_win32.o: file/dir_win32.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT file/mpls_dump-dir_win32.o -MD -MP -MF file/$(DEPDIR)/mpls_dump-dir_win32.Tpo -c -o file/mpls_dump-dir_win32.o `test -f 'file/dir_win32.c' || echo '$(srcdir)/'`file/dir_win32.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) file/$(DEPDIR)/mpls_dump-dir_win32.Tpo file/$(DEPDIR)/mpls_dump-dir_win32.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file/dir_win32.c' object='file/mpls_dump-dir_win32.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o file/mpls_dump-dir_win32.o `test -f 'file/dir_win32.c' || echo '$(srcdir)/'`file/dir_win32.c
+
+file/mpls_dump-dir_win32.obj: file/dir_win32.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT file/mpls_dump-dir_win32.obj -MD -MP -MF file/$(DEPDIR)/mpls_dump-dir_win32.Tpo -c -o file/mpls_dump-dir_win32.obj `if test -f 'file/dir_win32.c'; then $(CYGPATH_W) 'file/dir_win32.c'; else $(CYGPATH_W) '$(srcdir)/file/dir_win32.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) file/$(DEPDIR)/mpls_dump-dir_win32.Tpo file/$(DEPDIR)/mpls_dump-dir_win32.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file/dir_win32.c' object='file/mpls_dump-dir_win32.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o file/mpls_dump-dir_win32.obj `if test -f 'file/dir_win32.c'; then $(CYGPATH_W) 'file/dir_win32.c'; else $(CYGPATH_W) '$(srcdir)/file/dir_win32.c'; fi`
+
+file/mpls_dump-dir_posix.o: file/dir_posix.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT file/mpls_dump-dir_posix.o -MD -MP -MF file/$(DEPDIR)/mpls_dump-dir_posix.Tpo -c -o file/mpls_dump-dir_posix.o `test -f 'file/dir_posix.c' || echo '$(srcdir)/'`file/dir_posix.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) file/$(DEPDIR)/mpls_dump-dir_posix.Tpo file/$(DEPDIR)/mpls_dump-dir_posix.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file/dir_posix.c' object='file/mpls_dump-dir_posix.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o file/mpls_dump-dir_posix.o `test -f 'file/dir_posix.c' || echo '$(srcdir)/'`file/dir_posix.c
+
+file/mpls_dump-dir_posix.obj: file/dir_posix.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT file/mpls_dump-dir_posix.obj -MD -MP -MF file/$(DEPDIR)/mpls_dump-dir_posix.Tpo -c -o file/mpls_dump-dir_posix.obj `if test -f 'file/dir_posix.c'; then $(CYGPATH_W) 'file/dir_posix.c'; else $(CYGPATH_W) '$(srcdir)/file/dir_posix.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) file/$(DEPDIR)/mpls_dump-dir_posix.Tpo file/$(DEPDIR)/mpls_dump-dir_posix.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='file/dir_posix.c' object='file/mpls_dump-dir_posix.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o file/mpls_dump-dir_posix.obj `if test -f 'file/dir_posix.c'; then $(CYGPATH_W) 'file/dir_posix.c'; else $(CYGPATH_W) '$(srcdir)/file/dir_posix.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
+	-rm -rf file/.libs file/_libs
+	-rm -rf libbluray/.libs libbluray/_libs
+	-rm -rf libbluray/bdj/.libs libbluray/bdj/_libs
+	-rm -rf libbluray/bdj/native/.libs libbluray/bdj/native/_libs
+	-rm -rf libbluray/bdnav/.libs libbluray/bdnav/_libs
+	-rm -rf libbluray/decoders/.libs libbluray/decoders/_libs
+	-rm -rf libbluray/hdmv/.libs libbluray/hdmv/_libs
+	-rm -rf util/.libs util/_libs
+install-jarDATA: $(jar_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(jar_DATA)'; test -n "$(jardir)" || list=; \
+	if test -n "$$list"; then \
+	 echo " $(MKDIR_P) '$(DESTDIR)$(jardir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(jardir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	 echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(jardir)'"; \
+	 $(INSTALL_DATA) $$files "$(DESTDIR)$(jardir)" || exit $$?; \
+	done
+
+uninstall-jarDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(jar_DATA)'; test -n "$(jardir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(jardir)'; $(am__uninstall_files_from_dir)
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	 echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	 echo "$$d$$p"; \
@@ -741,128 +1635,37 @@
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
-install-libbluray_laHEADERS: $(libbluray_la_HEADERS)
+install-pkgincludeHEADERS: $(pkginclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libbluray_ladir)" || $(MKDIR_P) "$(DESTDIR)$(libbluray_ladir)"
-	@list='$(libbluray_la_HEADERS)'; test -n "$(libbluray_ladir)" || list=; \
+	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+	if test -n "$$list"; then \
+	 echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	 echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	 echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libbluray_ladir)'"; \
-	 $(INSTALL_HEADER) $$files "$(DESTDIR)$(libbluray_ladir)" || exit $$?; \
+	 echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
+	 $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
 	done
 
-uninstall-libbluray_laHEADERS:
+uninstall-pkgincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libbluray_la_HEADERS)'; test -n "$(libbluray_ladir)" || list=; \
+	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(libbluray_ladir)'; $(am__uninstall_files_from_dir)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	 case $$f in \
-	 *=* | --[!k]*);; \
-	 *k*) failcom='fail=yes';; \
-	 esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	 echo "Making $$target in $$subdir"; \
-	 if test "$$subdir" = "."; then \
-	 dot_seen=yes; \
-	 local_target="$$target-am"; \
-	 else \
-	 local_target="$$target"; \
-	 fi; \
-	 ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	 || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	 case $$f in \
-	 *=* | --[!k]*);; \
-	 *k*) failcom='fail=yes';; \
-	 esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	 *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	 if test "$$subdir" = "."; then :; else \
-	 rev="$$subdir $$rev"; \
-	 fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	 echo "Making $$target in $$subdir"; \
-	 if test "$$subdir" = "."; then \
-	 local_target="$$target-am"; \
-	 else \
-	 local_target="$$target"; \
-	 fi; \
-	 ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	 || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	 test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	 test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+	dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	 include_option=--etags-include; \
-	 empty_fix=.; \
-	else \
-	 include_option=--include; \
-	 empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	 if test "$$subdir" = .; then :; else \
-	 test ! -f $$subdir/TAGS || \
-	 set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	 fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	 test -n "$$unique" || unique=$$empty_fix; \
@@ -874,15 +1677,11 @@
 	 $$unique; \
 	 fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	 $$unique
@@ -891,6 +1690,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	 && $(am__cd) $(top_srcdir) \
 	 && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	 [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	 *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	 if test -f "$$i"; then \
+	 echo "$(subdir)/$$i"; \
+	 else \
+	 echo "$$sdir/$$i"; \
+	 fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -925,52 +1739,26 @@
 	 || exit 1; \
 	 fi; \
 	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	 if test "$$subdir" = .; then :; else \
-	 test -d "$(distdir)/$$subdir" \
-	 || $(MKDIR_P) "$(distdir)/$$subdir" \
-	 || exit 1; \
-	 fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	 if test "$$subdir" = .; then :; else \
-	 dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	 $(am__relativize); \
-	 new_distdir=$$reldir; \
-	 dir1=$$subdir; dir2="$(top_distdir)"; \
-	 $(am__relativize); \
-	 new_top_distdir=$$reldir; \
-	 echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	 echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	 ($(am__cd) $$subdir && \
-	 $(MAKE) $(AM_MAKEFLAGS) \
-	 top_distdir="$$new_top_distdir" \
-	 distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	 distdir) \
-	 || exit 1; \
-	 fi; \
-	done
 check-am: all-am
-check: check-recursive
+check: check-am
 @USING_BDJAVA_FALSE@all-local:
-all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libbluray_ladir)"; do \
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \
+		all-local
+install-binPROGRAMS: install-libLTLIBRARIES
+
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(jardir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
 	 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
-installcheck: installcheck-recursive
+installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
@@ -988,106 +1776,139 @@
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f examples/$(DEPDIR)/$(am__dirstamp)
+	-rm -f examples/$(am__dirstamp)
+	-rm -f file/$(DEPDIR)/$(am__dirstamp)
+	-rm -f file/$(am__dirstamp)
+	-rm -f libbluray/$(DEPDIR)/$(am__dirstamp)
+	-rm -f libbluray/$(am__dirstamp)
+	-rm -f libbluray/bdj/$(DEPDIR)/$(am__dirstamp)
+	-rm -f libbluray/bdj/$(am__dirstamp)
+	-rm -f libbluray/bdj/native/$(DEPDIR)/$(am__dirstamp)
+	-rm -f libbluray/bdj/native/$(am__dirstamp)
+	-rm -f libbluray/bdnav/$(DEPDIR)/$(am__dirstamp)
+	-rm -f libbluray/bdnav/$(am__dirstamp)
+	-rm -f libbluray/decoders/$(DEPDIR)/$(am__dirstamp)
+	-rm -f libbluray/decoders/$(am__dirstamp)
+	-rm -f libbluray/hdmv/$(DEPDIR)/$(am__dirstamp)
+	-rm -f libbluray/hdmv/$(am__dirstamp)
+	-rm -f util/$(DEPDIR)/$(am__dirstamp)
+	-rm -f util/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
+@USING_BDJAVA_FALSE@clean-local:
+clean: clean-am
 
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+	clean-libtool clean-local clean-noinstPROGRAMS mostlyclean-am
 
-distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR)
+distclean: distclean-am
+	-rm -rf examples/$(DEPDIR) file/$(DEPDIR) libbluray/$(DEPDIR) libbluray/bdj/$(DEPDIR) libbluray/bdj/native/$(DEPDIR) libbluray/bdnav/$(DEPDIR) libbluray/decoders/$(DEPDIR) libbluray/hdmv/$(DEPDIR) util/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
-dvi: dvi-recursive
+dvi: dvi-am
 
 dvi-am:
 
-html: html-recursive
+html: html-am
 
 html-am:
 
-info: info-recursive
+info: info-am
 
 info-am:
 
-install-data-am: install-libbluray_laHEADERS install-pkgconfigDATA
+install-data-am: install-jarDATA install-pkgconfigDATA \
+	install-pkgincludeHEADERS
 
-install-dvi: install-dvi-recursive
+install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-libLTLIBRARIES
+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
 
-install-html: install-html-recursive
+install-html: install-html-am
 
 install-html-am:
 
-install-info: install-info-recursive
+install-info: install-info-am
 
 install-info-am:
 
 install-man:
 
-install-pdf: install-pdf-recursive
+install-pdf: install-pdf-am
 
 install-pdf-am:
 
-install-ps: install-ps-recursive
+install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
-maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR)
+maintainer-clean: maintainer-clean-am
+	-rm -rf examples/$(DEPDIR) file/$(DEPDIR) libbluray/$(DEPDIR) libbluray/bdj/$(DEPDIR) libbluray/bdj/native/$(DEPDIR) libbluray/bdnav/$(DEPDIR) libbluray/decoders/$(DEPDIR) libbluray/hdmv/$(DEPDIR) util/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-recursive
+mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
-pdf: pdf-recursive
+pdf: pdf-am
 
 pdf-am:
 
-ps: ps-recursive
+ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-libLTLIBRARIES uninstall-libbluray_laHEADERS \
-	uninstall-pkgconfigDATA
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am all-local check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
-	distclean distclean-compile distclean-generic \
+uninstall-am: uninstall-binPROGRAMS uninstall-jarDATA \
+	uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \
+	uninstall-pkgincludeHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+	clean-libtool clean-local clean-noinstPROGRAMS cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-libLTLIBRARIES \
-	install-libbluray_laHEADERS install-man install-pdf \
-	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-jarDATA \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-pkgconfigDATA install-pkgincludeHEADERS install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-libLTLIBRARIES \
-	uninstall-libbluray_laHEADERS uninstall-pkgconfigDATA
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-jarDATA \
+	uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \
+	uninstall-pkgincludeHEADERS
+
 
+@USING_BDJAVA_TRUE@$(top_builddir)/src/.libs/libbluray.jar: all-local
 
 @USING_BDJAVA_TRUE@all-local:
-@USING_BDJAVA_TRUE@	ant -f $(top_srcdir)/src/libbluray/bdj/build.xml
+@USING_BDJAVA_TRUE@	ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \
+@USING_BDJAVA_TRUE@	 -Dbuild='$(abs_builddir)/libbluray/bdj/build' \
+@USING_BDJAVA_TRUE@	 -Ddist='$(abs_builddir)/.libs' \
+@USING_BDJAVA_TRUE@	 -Dsrc_awt=:java-$(BDJ_TYPE) \
+@USING_BDJAVA_TRUE@	 -Dbootclasspath="$(BDJ_BOOTCLASSPATH)"
+
+@USING_BDJAVA_TRUE@clean-local:
+@USING_BDJAVA_TRUE@	ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \
+@USING_BDJAVA_TRUE@	 -Dbuild='$(abs_builddir)/libbluray/bdj/build' \
+@USING_BDJAVA_TRUE@	 -Ddist='$(abs_builddir)/.libs' \
+@USING_BDJAVA_TRUE@	 clean
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

libbluray-0.2.3.tar.bz2/src/examples/bd_info.c -> libbluray-0.5.0.tar.bz2/src/examples/bd_info.c Changed

@@ -153,6 +153,15 @@
         printf("HDMV titles         : %d\n", info->num_hdmv_titles);
         printf("BD-J titles         : %d\n", info->num_bdj_titles);
         printf("UNSUPPORTED titles  : %d\n", info->num_unsupported_titles);
+
+        printf("\nBD-J detected       : %s\n", _yes_no(info->bdj_supported));
+        if (info->bdj_detected) {
+            printf("BD-J supported      : %s\n", _yes_no(info->bdj_supported));
+            if (info->bdj_supported) {
+                printf("Java VM found       : %s\n", _yes_no(info->libjvm_detected));
+                printf("BD-J handled        : %s\n", _yes_no(info->bdj_handled));
+            }
+        }
     }
 
     printf("\nAACS detected       : %s\n", _yes_no(info->aacs_detected));
@@ -171,7 +180,16 @@
     printf("\nBD+ detected        : %s\n", _yes_no(info->bdplus_detected));
     if (info->bdplus_detected) {
         printf("libbdplus detected  : %s\n", _yes_no(info->libbdplus_detected));
-        printf("BD+ handled         : %s\n", _yes_no(info->bdplus_handled));
+        if (info->libbdplus_detected) {
+            if (info->bdplus_gen) {
+                printf("BD+ generation      : %d\n", info->bdplus_gen);
+            }
+            if (info->bdplus_date) {
+                printf("BD+ release date    : %d-%02d-%02d\n",
+                       info->bdplus_date >> 16, (info->bdplus_date >> 8) & 0xff, info->bdplus_date & 0xff );
+            }
+            printf("BD+ handled         : %s\n", _yes_no(info->bdplus_handled));
+        }
     }
 
     _print_meta(bd_get_meta(bd));

libbluray-0.2.3.tar.bz2/src/examples/bdj_test.c -> libbluray-0.5.0.tar.bz2/src/examples/bdj_test.c Changed

libbluray-0.2.3.tar.bz2/src/examples/bdsplice.c -> libbluray-0.5.0.tar.bz2/src/examples/bdsplice.c Changed

@@ -38,29 +38,32 @@
 _usage(char *cmd)
 {
 fprintf(stderr,
-"Usage: %s -t playlist [-c first[-last]] [-k keyfile] [-a angle] <bd path> [dest]\n"
+"Usage: %s -t title [-c first[-last]] [-k keyfile] [-a angle] <bd path> [dest]\n"
+" %s -p playlist [-c first[-last]] [-k keyfile] [-a angle] <bd path> [dest]\n"
 "Summary:\n"
-" Given a playlist number and Blu-Ray directory tree,\n"
+" Given a title or playlist number and Blu-Ray directory tree,\n"
 " find the clips that compose the movie and splice\n"
 " them together in the destination file\n"
 "Options:\n"
 " t N - Index of title to splice. First title is 1.\n"
+" p N - Playlist to splice.\n"
 " a N - Angle. First angle is 1.\n"
 " c N or N-M - Chapter or chapter range. First chapter is 1.\n"
 " k keyfile - AACS keyfile path.\n"
 " <bd path> - Path to root of Blu-Ray directory tree.\n"
 " [dest] - Destination of spliced clips. stdout if not specified.\n"
-, cmd);
+, cmd, cmd);
 
 exit(EXIT_FAILURE);
 }
 
-#define OPTS "c:vt:k:a:"
+#define OPTS "c:vt:p:k:a:"
 
 int
 main(int argc, char *argv[])
 {
 int title_no = -1;
+ int playlist = -1;
 int angle = 0;
 char *bdpath = NULL, *dest = NULL;
 FILE *out;
@@ -114,10 +117,20 @@
 break;
 
 case 't':
+ if (playlist >= 0) {
+ _usage(argv[0]);
+ }
 title_no = atoi(optarg);
 title_no--;
 break;
 
+ case 'p':
+ if (title_no >= 0) {
+ _usage(argv[0]);
+ }
+ playlist = atoi(optarg);
+ break;
+
 case 'v':
 verbose = 1;
 break;
@@ -128,7 +141,7 @@
 }
 } while (opt != -1);
 
- if (title_no < 0) {
+ if (title_no < 0 && playlist < 0) {
 _usage(argv[0]);
 }
 if (optind < argc) {
@@ -147,9 +160,19 @@
 return 1;
 }
 
- if (!bd_select_title(bd, title_no)) {
- fprintf(stderr, "Failed to open title: %d\n", title_no);
- return 1;
+ if (title_no >= 0) {
+ if (!bd_select_title(bd, title_no)) {
+ fprintf(stderr, "Failed to open title: %d\n", title_no);
+ return 1;
+ }
+ ti = bd_get_title_info(bd, title_no, angle);
+
+ } else {
+ if (!bd_select_playlist(bd, playlist)) {
+ fprintf(stderr, "Failed to open playlist: %d\n", playlist);
+ return 1;
+ }
+ ti = bd_get_playlist_info(bd, playlist, angle);
 }
 
 if (dest) {
@@ -162,8 +185,6 @@
 out = stdout;
 }
 
- ti = bd_get_title_info(bd, title_no, angle);
-
 if (angle >= (int)ti->angle_count) {
 fprintf(stderr, "Invalid angle %d > angle count %d. Using angle 1.\n", 
 angle+1, ti->angle_count);

libbluray-0.2.3.tar.bz2/src/examples/clpi_dump.c -> libbluray-0.5.0.tar.bz2/src/examples/clpi_dump.c Changed

@@ -1,6 +1,7 @@
 /*
 * This file is part of libbluray
 * Copyright (C) 2009-2010 John Stebbins
+ * Copyright (C) 2012-2013 Petri Hintukainen <phintuka@users.sourceforge.net>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -22,8 +23,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <inttypes.h>
 
-#include "libbluray/bdnav/clpi_parse.h"
+#include "libbluray/bdnav/clpi_data.h"
+#include "libbluray/bluray.h"
 
 #include "util.h"
 
@@ -35,7 +38,7 @@
 } VALUE_MAP;
 
 static inline const char*
-_lookup_str(VALUE_MAP *map, int val)
+_lookup_str(const VALUE_MAP *map, int val)
 {
 int ii;
 
@@ -47,7 +50,7 @@
 return "?";
 }
 
-VALUE_MAP codec_map[] = {
+const VALUE_MAP codec_map[] = {
 {0x01, "MPEG-1 Video"},
 {0x02, "MPEG-2 Video"},
 {0x03, "MPEG-1 Audio"},
@@ -63,13 +66,14 @@
 {0xa2, "DTS-HD for secondary audio"},
 {0xea, "VC-1"},
 {0x1b, "H.264"},
+ {0x20, "H.264 MVC dep."},
 {0x90, "Presentation Graphics"},
 {0x91, "Presentation Graphics"},
 {0x92, "Interactive Graphics"},
 {0, NULL}
 };
 
-VALUE_MAP video_format_map[] = {
+const VALUE_MAP video_format_map[] = {
 {0, "Reserved"},
 {1, "480i"},
 {2, "576i"},
@@ -81,7 +85,7 @@
 {0, NULL}
 };
 
-VALUE_MAP video_rate_map[] = {
+const VALUE_MAP video_rate_map[] = {
 {0, "Reserved1"},
 {1, "23.976"},
 {2, "24"},
@@ -93,7 +97,7 @@
 {0, NULL}
 };
 
-VALUE_MAP video_aspect_map[] = {
+const VALUE_MAP video_aspect_map[] = {
 {0, "Reserved1"},
 {1, "Reserved2"},
 {2, "4:3"},
@@ -101,7 +105,7 @@
 {0, NULL}
 };
 
-VALUE_MAP audio_format_map[] = {
+const VALUE_MAP audio_format_map[] = {
 {0, "Reserved1"},
 {1, "Mono"},
 {2, "Reserved2"},
@@ -113,7 +117,7 @@
 {0, NULL}
 };
 
-VALUE_MAP audio_rate_map[] = {
+const VALUE_MAP audio_rate_map[] = {
 {0, "Reserved1"},
 {1, "48 Khz"},
 {2, "Reserved2"},
@@ -125,6 +129,17 @@
 {0, NULL}
 };
 
+const VALUE_MAP application_type_map[] = {
+ {1, "Main TS for a main-path of Movie"},
+ {2, "Main TS for a main-path of Time based slide show"},
+ {3, "Main TS for a main-path of Browsable slide show"},
+ {4, "Sub TS for a sub-path of Browsable slide show"},
+ {5, "Sub TS for a sub-path of Interactive Graphics menu"},
+ {6, "Sub TS for a sub-path of Text subtitle"},
+ {7, "Sub TS for a sub-path of one or more elementary streams path"},
+ {0, NULL},
+};
+
 static void
 _show_stream(CLPI_PROG_STREAM *ss, int level)
 {
@@ -136,6 +151,7 @@
 case 0x02:
 case 0xea:
 case 0x1b:
+ case 0x20:
 indent_printf(level, "Format %02x: %s", ss->format,
 _lookup_str(video_format_map, ss->format));
 indent_printf(level, "Rate %02x: %s", ss->rate,
@@ -158,7 +174,7 @@
 case 0xa2:
 indent_printf(level, "Format %02x: %s", ss->format,
 _lookup_str(audio_format_map, ss->format));
- indent_printf(level, "Rate %02x:", ss->rate,
+ indent_printf(level, "Rate %02x: %s", ss->rate,
 _lookup_str(audio_rate_map, ss->rate));
 indent_printf(level, "Language: %s", ss->lang);
 break;
@@ -181,14 +197,15 @@
 }
 
 static void
-_show_clip_info(CLPI_CLIP_INFO *ci, int level)
+_show_clip_info(CLPI_CL *cl, int level)
 {
+ CLPI_CLIP_INFO *ci = &cl->clip;
 int ii;
 
 indent_printf(level, "Clip Info");
 indent_printf(level+1, "Clip Stream Type: %02x", ci->clip_stream_type);
- indent_printf(level+1, "Clip Application Type: %02x", 
- ci->application_type);
+ indent_printf(level+1, "Clip Application Type (%02x): %s",
+ ci->application_type, _lookup_str(application_type_map, ci->application_type));
 indent_printf(level+1, "is_ATC_delta: %s", ci->is_atc_delta ? "True" : "False");
 indent_printf(level+1, "ATC delta count: %d", ci->atc_delta_count);
 indent_printf(level+1, "TS Recording Rate: %u", ci->ts_recording_rate);
@@ -204,6 +221,14 @@
 indent_printf(level+2, "File Id %s", ci->atc_delta[ii].file_id);
 indent_printf(level+2, "File Code %s", ci->atc_delta[ii].file_code);
 }
+ // show fonts
+ if (cl->font_info.font_count) {
+ indent_printf(level+1, "Font files");
+ for (ii = 0; ii < cl->font_info.font_count; ii++) {
+ indent_printf(level+2, "Font file %d: %s.otf", ii+1, cl->font_info.font[ii].file_id);
+ }
+ }
+
 printf("\n");
 }
 
@@ -259,6 +284,27 @@
 }
 
 static void
+_show_extent_start(CLPI_EXTENT_START *es, int level)
+{
+ unsigned int ii;
+
+ indent_printf(level, "Extension data: Extent Start Point");
+
+ if (!es->num_point) {
+ indent_printf(level+1, "(no data)");
+
+ } else {
+ indent_printf(level+1, "Number of Start Points: %d", es->num_point);
+
+ if (verbose) {
+ for (ii = 0; ii < es->num_point; ii++) {
+ indent_printf(level+1, "Extent %5d: SPN 0x%08X", ii, es->point[ii]);
+ }
+ }
+ }
+}
+
+static void
 _show_cpi_info(CLPI_CPI *cpi, int level)
 {
 CLPI_EP_MAP_ENTRY *entry;
@@ -315,7 +361,7 @@
 pts = ((uint64_t) (coarse->pts_ep & ~0x01) << 19) +
 ((uint64_t)fine->pts_ep << 9);
 spn = (coarse->spn_ep & ~0x1FFFF) + fine->spn_ep;
- indent_printf(level+4, "PTS %8lu/%8lu -- SPN %u",
+ indent_printf(level+4, "PTS %8"PRIu64"/%8"PRIu64" -- SPN %u",
 pts, pts >> 1, spn);
 }
 }
@@ -336,12 +382,13 @@
 " s - Shows the Sequence Info structure\n"
 " p - Shows the Program Info structure\n"
 " i - Shows the CPI. PTS to SPN map\n"
+" e - Shows Extent Start Table\n"
 , cmd);
 
 exit(EXIT_FAILURE);
 }
 
-#define OPTS "vcspi"
+#define OPTS "vcspie"
 
 int
 main(int argc, char *argv[])
@@ -349,7 +396,7 @@
 CLPI_CL *cl;
 int opt;
 int opt_clip_info = 0, opt_seq_info = 0, opt_prog_info = 0;
- int opt_cpi_info = 0;
+ int opt_cpi_info = 0, opt_extent_start = 0;
 int ii;
 
 do {
@@ -377,6 +424,10 @@
 opt_prog_info = 1;
 break;
 
+ case 'e':
+ opt_extent_start = 1;
+ break;
+
 default:
 _usage(argv[0]);
 break;
@@ -388,14 +439,14 @@
 }
 
 for (ii = optind; ii < argc; ii++) {
- cl = clpi_parse(argv[ii], verbose);
+ cl = bd_read_clpi(argv[ii]);
 if (cl == NULL) {
- fprintf(stderr, "Parse failed\n");
+ fprintf(stderr, "Parsing %s failed\n", argv[ii]);
 continue;
 }
 if (opt_clip_info) {
 // Show clip info
- _show_clip_info(&cl->clip, 1);
+ _show_clip_info(cl, 1);
 }
 if (opt_seq_info) {
 // Show sequence info
@@ -409,7 +460,29 @@
 // Show cpi
 _show_cpi_info(&cl->cpi, 1);
 }
- clpi_free(cl);
+
+ if (opt_prog_info) {
+ if (cl->program_ss.num_prog) {
+ printf("\n");
+ indent_printf(1, "Extension: Program Info SS");
+ _show_prog_info(&cl->program_ss, 1);
+ }
+ }
+ if (opt_cpi_info) {
+ if (cl->program_ss.num_prog) {
+ printf("\n");
+ indent_printf(1, "Extension: CPI SS");
+ _show_cpi_info(&cl->cpi_ss, 1);
+ }
+ }
+ if (opt_extent_start) {
+ // Show extent start point
+ if (cl->extent_start.num_point > 0) {
+ _show_extent_start(&cl->extent_start, 1);
+ }
+ }
+
+ bd_free_clpi(cl);
 }
 return 0;
 }

libbluray-0.2.3.tar.bz2/src/examples/libbluray_test.c -> libbluray-0.5.0.tar.bz2/src/examples/libbluray_test.c Changed

@@ -1,6 +1,7 @@
 /*
 * This file is part of libbluray
 * Copyright (C) 2009-2010 Obliter0n
+ * Copyright (C) 2013 VideoLAN
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -22,73 +23,84 @@
 #endif
 
 #include "libbluray/bluray.h"
-#include "util/logging.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
 
-#define HEX_PRINT(X,Y) { int zz; for(zz = 0; zz < Y; zz++) fprintf(stderr, "%02X", X[zz]); fprintf(stderr, "\n"); }
-
 int main(int argc, char *argv[])
 {
- if (argc == 4) {
- BLURAY *bd = bd_open(argv[1], argv[2]);
- int count, ii;
-
- //bd_get_titles(bd, 0);
+ BLURAY *bd;
+ int ii, num_titles;
 
- BD_DEBUG(DBG_BLURAY,"\nListing titles:\n");
+ if (argc < 3) {
+ fprintf(stderr, "Usage:\n %s <media_path> [<title_number>]\n\n", argv[0]);
+ }
+ if (argc < 2) {
+ return -1;
+ }
 
- count = bd_get_titles(bd, TITLES_RELEVANT, 0);
- for (ii = 0; ii < count; ii++)
- {
- BLURAY_TITLE_INFO* ti;
- ti = bd_get_title_info(bd, ii, 0);
- BD_DEBUG(DBG_BLURAY,
- "index: %d duration: %02"PRIu64":%02"PRIu64":%02"PRIu64" chapters: %d\n",
- ii,
- (ti->duration / 90000) / (3600),
- ((ti->duration / 90000) % 3600) / 60,
- ((ti->duration / 90000) % 60),
- ti->chapter_count);
+ /* open disc */
+ bd = bd_open(argv[1], NULL);
+ if (!bd) {
+ fprintf(stderr, "Error opening %s\n", argv[1]);
+ return -1;
 }
 
- bd_select_title(bd, atoi(argv[3]));
+ /* get titles */
+ num_titles = bd_get_titles(bd, TITLES_RELEVANT, 0);
+
+ /* list titles */
+ if (argc < 3) {
+ printf("Listing titles:\n");
+
+ for (ii = 0; ii < num_titles; ii++) {
+ BLURAY_TITLE_INFO* ti;
+ ti = bd_get_title_info(bd, ii, 0);
+ printf("index: %d duration: %02"PRIu64":%02"PRIu64":%02"PRIu64" chapters: %d\n",
+ ii,
+ (ti->duration / 90000) / (3600),
+ ((ti->duration / 90000) % 3600) / 60,
+ ((ti->duration / 90000) % 60),
+ ti->chapter_count);
+ }
 
- unsigned char *buf = malloc(6144);
- memset(buf,0,6144);
+ bd_close(bd);
+ return 0;
+ }
 
-#if 0
- bd_read(bd, buf, 2048);
- bd_read(bd, buf, 2048);
- bd_read(bd, buf, 2048);
- bd_read(bd, buf, 6144);
-#else
+ /* select title */
+ if (bd_select_title(bd, atoi(argv[2])) <= 0) {
+ fprintf(stderr, "Error opening title #%s\n", argv[2]);
+ bd_close(bd);
+ return -1;
+ }
 
+ /* dump */
 FILE *fd = fopen("streamdump.m2ts", "wb");
 if (fd) {
+ printf("Writing to streamdump.m2ts\n");
+ ii = 0;
 while (1) {
+ unsigned char buf[6144];
 int len = bd_read(bd, buf, 6144);
 if (len <= 0) break;
- if (fwrite(buf, len, 1, fd) < 1)
- break;
- if (!(ii % 1000)) {
- BD_DEBUG(DBG_BLURAY,
- "%d\r", ii);
+ if (fwrite(buf, len, 1, fd) < 1) {
+ fprintf(stderr, "Write error\n");
+ break;
 }
-
+ if (!(ii % 100)) {
+ printf("Block %d\r", ii);
+ }
+ ii++;
 }
 fclose(fd);
+ } else {
+ printf("Error opening streamdump.m2ts\n");
 }
 
-#endif
-
 bd_close(bd);
- } else {
- printf("\nUsage:\n %s <media_path> <keyfile_path> <title_number>\n\n", argv[0]);
- }
 
 return 0;
 }

libbluray-0.2.3.tar.bz2/src/examples/list_titles.c -> libbluray-0.5.0.tar.bz2/src/examples/list_titles.c Changed

@@ -22,21 +22,21 @@
 #endif
 
 #include "libbluray/bluray.h"
-#include "util/logging.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
 #include <unistd.h>
 
-#define OPTS "hs:"
+#define OPTS "ahs:"
 
 static void _usage(char *cmd)
 {
 fprintf(stderr, 
 "%s <BD base dir> [-s <seconds>]\n"
 " List the titles and title info of a BD\n"
-" -s # - Filter out titles shorter then # seconds\n"
+" -s # - Filter out titles shorter than # seconds\n"
+" -a - List all titles\n"
 " -h - This message\n",
 cmd
 );
@@ -46,12 +46,11 @@
 int main(int argc, char *argv[])
 {
 BLURAY *bd;
- int count, ii, opt;
+ int count, ii, opt, main_title;
 unsigned int seconds = 0;
+ unsigned int flags = TITLES_RELEVANT;
 char *bd_dir = NULL;
 
- BD_DEBUG(DBG_BLURAY,"\nListing titles:\n");
-
 do
 {
 opt = getopt(argc, argv, OPTS);
@@ -65,6 +64,9 @@
 opt = 1;
 }
 break;
+ case 'a':
+ flags = TITLES_ALL;
+ break;
 case 's':
 seconds = strtol(optarg, NULL, 0);
 break;
@@ -81,18 +83,29 @@
 }
 bd = bd_open(bd_dir, NULL);
 
- count = bd_get_titles(bd, TITLES_RELEVANT, seconds);
+ count = bd_get_titles(bd, flags, seconds);
+ main_title = bd_get_main_title(bd);
+ if (main_title >= 0) {
+ printf("Main title: %d\n", main_title + 1);
+ }
 for (ii = 0; ii < count; ii++)
 {
 BLURAY_TITLE_INFO* ti;
 ti = bd_get_title_info(bd, ii, 0);
 printf(
- "index: %d duration: %02"PRIu64":%02"PRIu64":%02"PRIu64" chapters: %d angles: %u clips %u\n",
+ "index: %d duration: %02"PRIu64":%02"PRIu64":%02"PRIu64" chapters: %3d angles: %2u clips: %3u (playlist: %05d.mpls) "
+ "V:%d A:%-2d PG:%-2d IG:%-2d SV:%d SA:%d\n",
 ii + 1,
 (ti->duration / 90000) / (3600),
 ((ti->duration / 90000) % 3600) / 60,
 ((ti->duration / 90000) % 60),
- ti->chapter_count, ti->angle_count, ti->clip_count
+ ti->chapter_count, ti->angle_count, ti->clip_count, ti->playlist,
+ ti->clips[0].video_stream_count,
+ ti->clips[0].audio_stream_count,
+ ti->clips[0].pg_stream_count,
+ ti->clips[0].ig_stream_count,
+ ti->clips[0].sec_video_stream_count,
+ ti->clips[0].sec_audio_stream_count
 );
 bd_free_title_info(ti);
 }

libbluray-0.2.3.tar.bz2/src/examples/mpls_dump.c -> libbluray-0.5.0.tar.bz2/src/examples/mpls_dump.c Changed

@@ -28,7 +28,6 @@
 #include "util/strutl.h"
 
 #include "libbluray/bdnav/mpls_parse.h"
-#include "libbluray/bdnav/navigation.h"
 
 #include "util.h"
 
@@ -39,7 +38,7 @@
 const char *str;
 } VALUE_MAP;
 
-VALUE_MAP codec_map[] = {
+const VALUE_MAP codec_map[] = {
 {0x01, "MPEG-1 Video"},
 {0x02, "MPEG-2 Video"},
 {0x03, "MPEG-1 Audio"},
@@ -61,7 +60,7 @@
 {0, NULL}
 };
 
-VALUE_MAP video_format_map[] = {
+const VALUE_MAP video_format_map[] = {
 {0, "Reserved"},
 {1, "480i"},
 {2, "576i"},
@@ -73,7 +72,7 @@
 {0, NULL}
 };
 
-VALUE_MAP video_rate_map[] = {
+const VALUE_MAP video_rate_map[] = {
 {0, "Reserved1"},
 {1, "23.976"},
 {2, "24"},
@@ -85,7 +84,7 @@
 {0, NULL}
 };
 
-VALUE_MAP audio_format_map[] = {
+const VALUE_MAP audio_format_map[] = {
 {0, "Reserved1"},
 {1, "Mono"},
 {2, "Reserved2"},
@@ -97,7 +96,7 @@
 {0, NULL}
 };
 
-VALUE_MAP audio_rate_map[] = {
+const VALUE_MAP audio_rate_map[] = {
 {0, "Reserved1"},
 {1, "48 Khz"},
 {2, "Reserved2"},
@@ -109,14 +108,26 @@
 {0, NULL}
 };
 
-VALUE_MAP subpath_type_map[] = {
+const VALUE_MAP subpath_type_map[] = {
+ {2, "Primary audio of the Browsable slideshow"},
 {3, "Interactive Graphics presentation menu"},
 {4, "Text Subtitle"},
+ {5, "Out-of-mux Synchronous elementary streams"},
+ {6, "Out-of-mux Asynchronous Picture-in-Picture presentation"},
+ {7, "In-mux Synchronous Picture-in-Picture presentation"},
+ {8, "SS Video"},
 {0,NULL}
 };
 
-const char*
-_lookup_str(VALUE_MAP *map, int val)
+const VALUE_MAP playback_type_map[] = {
+ {1, "Sequential"},
+ {2, "Random"},
+ {3, "Shuffle"},
+ {0, NULL}
+};
+
+static const char*
+_lookup_str(const VALUE_MAP *map, int val)
 {
 int ii;
 
@@ -179,7 +190,7 @@
 case 0xa2:
 indent_printf(level, "Format %02x: %s", ss->format,
 _lookup_str(audio_format_map, ss->format));
- indent_printf(level, "Rate %02x:", ss->rate,
+ indent_printf(level, "Rate %02x: %s", ss->rate,
 _lookup_str(audio_rate_map, ss->rate));
 indent_printf(level, "Language: %s", ss->lang);
 break;
@@ -270,6 +281,17 @@
 }
 
 static void
+_show_ai(MPLS_PL *pl, int level)
+{
+ indent_printf(level, "Playback type: %s (%d)",
+ _lookup_str(playback_type_map, pl->app_info.playback_type),
+ pl->app_info.playback_type);
+ if (pl->app_info.playback_type == 2 || pl->app_info.playback_type == 3) {
+ indent_printf(level+1, "Playback count: %d", pl->app_info.playback_count);
+ }
+}
+
+static void
 _show_marks(MPLS_PL *pl, int level)
 {
 int ii;
@@ -290,10 +312,10 @@
 } else {
 indent_printf(level+1, "PlayItem: Invalid reference");
 }
- indent_printf(level+1, "Time (ticks): %lu", plm->time);
+ indent_printf(level+1, "Time (ticks): %u", plm->time);
 min = plm->duration / (45000*60);
 sec = (double)(plm->duration - min * 45000 * 60) / 45000;
- indent_printf(level+1, "Duration (mm:ss.ms, ticks): %d:%.2f, %lu", 
+ indent_printf(level+1, "Duration (mm:ss.ms, ticks): %d:%.2f, %u",
 min, sec, plm->duration);
 printf("\n");
 }
@@ -328,39 +350,100 @@
 }
 
 static void
+_show_sub_path(MPLS_SUB *sub, int level)
+{
+ int ii;
+
+ indent_printf(level+1, "Type: %d (%s)", sub->type, _lookup_str(subpath_type_map, sub->type));
+ indent_printf(level+1, "Repeat: %d", sub->is_repeat);
+ indent_printf(level+1, "Sub playitem count: %d", sub->sub_playitem_count);
+
+ for (ii = 0; ii < sub->sub_playitem_count; ii++) {
+ MPLS_SUB_PI *pi;
+
+ pi = &sub->sub_play_item[ii];
+
+ if (verbose) {
+ indent_printf(level+1, "Sub playitem %d", ii);
+ indent_printf(level+2, "Clip Id %s", pi->clip[0].clip_id);
+ indent_printf(level+2, "Multi clip: %d", pi->is_multi_clip);
+ indent_printf(level+2, "Clip count: %d", pi->clip_count);
+ indent_printf(level+2, "Connection Condition: %02x", pi->connection_condition);
+ indent_printf(level+2, "In-Time: %d", pi->in_time);
+ indent_printf(level+2, "Out-Time: %d", pi->out_time);
+ indent_printf(level+2, "Sync playitem Id: %d", pi->sync_play_item_id);
+ indent_printf(level+2, "Sync PTS: %d", pi->sync_pts);
+ } else {
+ indent_printf(level+1, "%s.m2ts", pi->clip[0].clip_id);
+ }
+ }
+}
+
+static void
+_show_pip_metadata_block(MPLS_PIP_METADATA *block, int level)
+{
+ int ii;
+
+ indent_printf(level, "Clip ref: %d", block->clip_ref);
+ indent_printf(level, "Secondary video ref: %d", block->secondary_video_ref);
+ indent_printf(level, "Timeline type: %d", block->timeline_type);
+ indent_printf(level, "Luma key flag: %d", block->luma_key_flag);
+ if (block->luma_key_flag) {
+ indent_printf(level, "Upper limit luma key: %d", block->upper_limit_luma_key);
+ }
+ indent_printf(level, "Trick play flag: %d", block->trick_play_flag);
+
+ for (ii = 0; ii < block->data_count; ii++) {
+ indent_printf(level, "data block %d:", ii);
+ indent_printf(level+1, "Timestamp: %d", block->data[ii].time);
+ indent_printf(level+1, "Horizontal position %d", block->data[ii].xpos);
+ indent_printf(level+1, "Vertical position: %d", block->data[ii].ypos);
+ indent_printf(level+1, "Scaling factor: %d", block->data[ii].scale_factor);
+ }
+}
+
+static void
+_show_pip_metadata(MPLS_PL *pl, int level)
+{
+ int ii;
+
+ for (ii = 0; ii < pl->ext_pip_data_count; ii++) {
+ MPLS_PIP_METADATA *data;
+
+ data = &pl->ext_pip_data[ii];
+
+ indent_printf(level, "PiP metadata block %d:", ii);
+ _show_pip_metadata_block(data, level+1);
+ }
+}
+
+static void
 _show_sub_paths(MPLS_PL *pl, int level)
 {
- int ss, ii;
+ int ss;
 
 for (ss = 0; ss < pl->sub_count; ss++) {
 MPLS_SUB *sub;
 
 sub = &pl->sub_path[ss];
 
- indent_printf(level, "Sub Path %d:", ss);
- indent_printf(level+1, "Type: %d (%s)", sub->type, _lookup_str(subpath_type_map, sub->type));
- indent_printf(level+1, "Repeat: %d", sub->is_repeat);
- indent_printf(level+1, "Sub playitem count: %d", sub->sub_playitem_count);
-
- for (ii = 0; ii < sub->sub_playitem_count; ii++) {
- MPLS_SUB_PI *pi;
-
- pi = &sub->sub_play_item[ii];
-
- if (verbose) {
- indent_printf(level+1, "Sub playitem %d", ii);
- indent_printf(level+2, "Clip Id %s", pi->clip[0].clip_id);
- indent_printf(level+2, "Multi clip: %d", pi->is_multi_clip);
- indent_printf(level+2, "Clip count: %d", pi->clip_count);
- indent_printf(level+2, "Connection Condition: %02x", pi->connection_condition);
- indent_printf(level+2, "In-Time: %d", pi->in_time);
- indent_printf(level+2, "Out-Time: %d", pi->out_time);
- indent_printf(level+2, "Sync playitem Id: %d", pi->sync_play_item_id);
- indent_printf(level+2, "Sync PTS: %d", pi->sync_pts);
- } else {
- indent_printf(level+1, "%s.m2ts", pi->clip[0].clip_id);
- }
- }
+ indent_printf(level, "Sub Path %d:", ss);
+ _show_sub_path(sub, level+1);
+ }
+}
+
+static void
+_show_sub_paths_ss(MPLS_PL *pl, int level)
+{
+ int ss;
+
+ for (ss = 0; ss < pl->ext_sub_count; ss++) {
+ MPLS_SUB *sub;
+
+ sub = &pl->ext_sub_path[ss];
+
+ indent_printf(level, "Extension Sub Path %d:", ss);
+ _show_sub_path(sub, level+1);
 }
 }
 
@@ -452,7 +535,7 @@
 return 1;
 }
 
-static int clip_list = 0, playlist_info = 0, chapter_marks = 0, sub_paths = 0;
+static int clip_list = 0, playlist_info = 0, chapter_marks = 0, sub_paths = 0, pip_metadata = 0;
 static int repeats = 0, seconds = 0, dups = 0;
 
 static MPLS_PL*
@@ -460,7 +543,7 @@
 {
 MPLS_PL *pl;
 
- pl = mpls_parse(name, verbose);
+ pl = mpls_parse(name);
 if (pl == NULL) {
 fprintf(stderr, "Parse failed: %s\n", name);
 return NULL;
@@ -485,13 +568,14 @@
 }
 if (verbose) {
 indent_printf(0, 
- "%s -- Num Clips: %3d , Duration: minutes %4lu:%02lu", 
+ "%s -- Num Clips: %3d , Duration: minutes %4u:%02u",
 basename(name),
 pl->list_count,
 _pl_duration(pl) / (45000 * 60),
 (_pl_duration(pl) / 45000) % 60);
+ _show_ai(pl, 1);
 } else {
- indent_printf(0, "%s -- Duration: minutes %4lu:%02lu", 
+ indent_printf(0, "%s -- Duration: minutes %4u:%02u",
 basename(name),
 _pl_duration(pl) / (45000 * 60),
 (_pl_duration(pl) / 45000) % 60);
@@ -502,11 +586,15 @@
 if (chapter_marks) {
 _show_marks(pl, 1);
 }
+ if (pip_metadata) {
+ _show_pip_metadata(pl, 1);
+ }
 if (clip_list) {
 _show_clip_list(pl, 1);
 }
 if (sub_paths) {
 _show_sub_paths(pl, 1);
+ _show_sub_paths_ss(pl, 1);
 }
 return pl;
 }
@@ -523,6 +611,7 @@
 " i - Dumps detailed information about each clip\n"
 " c - Show chapter marks\n"
 " p - Show sub paths\n"
+" P - Show picture-in-picture metadata\n"
 " r <N> - Filter out titles that have >N repeating clips\n"
 " d - Filter out duplicate titles\n"
 " s <seconds> - Filter out short titles\n"
@@ -532,7 +621,7 @@
 exit(EXIT_FAILURE);
 }
 
-#define OPTS "vlicpfr:ds:"
+#define OPTS "vlicpPfr:ds:"
 
 static int
 _qsort_str_cmp(const void *a, const void *b)
@@ -580,6 +669,10 @@
 sub_paths = 1;
 break;
 
+ case 'P':
+ pip_metadata = 1;
+ break;
+
 case 'd':
 dups = 1;
 break;
@@ -616,8 +709,6 @@
 dir = NULL;
 if (S_ISDIR(st.st_mode)) {
 
- char *main_title = NULL;
-
 printf("Directory: %s:\n", argv[ii]);
 path = str_printf("%s/BDMV/PLAYLIST", argv[ii]);
 if (path == NULL) {
@@ -630,13 +721,6 @@
 free(path);
 continue;
 }
- main_title = nav_find_main_title(argv[ii]);
- if (main_title != NULL) {
- printf("Main Title: %s\n", main_title);
- free(main_title);
- } else {
- fprintf(stderr, "Main title search failed\n");
- }
 }
 if (dir != NULL) {
 char **dirlist = calloc(10001, sizeof(char*));
@@ -644,7 +728,7 @@
 int jj = 0;
 for (ent = readdir(dir); ent != NULL; ent = readdir(dir)) {
 if (ent->d_name != NULL) {
- dirlist[jj++] = strdup(ent->d_name);
+ dirlist[jj++] = str_dup(ent->d_name);
 }
 }
 qsort(dirlist, jj, sizeof(char*), _qsort_str_cmp);

libbluray-0.2.3.tar.bz2/src/examples/sound_dump.c -> libbluray-0.5.0.tar.bz2/src/examples/sound_dump.c Changed

@@ -17,58 +17,45 @@
 * <http://www.gnu.org/licenses/>.
 */
 
-#include "libbluray/bdnav/sound_parse.h"
+#include "libbluray/bluray.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
 
-static void _sound_print(SOUND_DATA *data)
+static void _sound_print(int sound_index, BLURAY_SOUND_EFFECT *data)
 {
- uint32_t i;
-
- printf("Number of sounds: %d\n", data->num_sounds);
-
- for (i = 0; i < data->num_sounds; i++) {
- printf(" Sound %d:\n", i);
- printf(" bits per sample: %d\n", data->sounds[i].bits_per_sample);
- printf(" sample rate: %d\n", data->sounds[i].sample_rate);
- printf(" channels: %d\n", data->sounds[i].num_channels);
- printf(" audio frames: %d", data->sounds[i].num_frames);
- printf(" (%d ms)\n", data->sounds[i].num_frames * 1000 / data->sounds[i].sample_rate);
- }
+ printf(" Sound %d:\n", sound_index);
+ printf(" bits per sample: %d\n", 16);
+ printf(" sample rate: %d\n", 48000);
+ printf(" channels: %d\n", data->num_channels);
+ printf(" audio frames: %d", data->num_frames);
+ printf(" (%d ms)\n", data->num_frames * 1000 / 48000);
 }
 
-static void _sound_dump(SOUND_DATA *data, int sound)
+static void _sound_dump(int sound_index, BLURAY_SOUND_EFFECT *data)
 {
 size_t bytes;
 
- if (sound < 0 || sound >= data->num_sounds) {
- fprintf(stderr, "Invalid sound index %d\n", sound);
- return;
- }
-
 fprintf(stderr, "Sound %d: %d frames LPCM_LE, %dHz, %d bits, %s\n",
- sound,
- data->sounds[sound].num_frames,
- data->sounds[sound].sample_rate,
- data->sounds[sound].bits_per_sample,
- data->sounds[sound].num_channels == 1 ? "mono" : "stereo");
+ sound_index,
+ data->num_frames,
+ 48000,
+ 16,
+ data->num_channels == 1 ? "mono" : "stereo");
 
- bytes = data->sounds[sound].bits_per_sample/8 * data->sounds[sound].num_channels;
- bytes *= data->sounds[sound].num_frames;
+ bytes = 2 * data->num_channels * data->num_frames;
 
- if (fwrite(data->sounds[sound].samples, bytes, 1, stdout) != bytes) {
+ if (fwrite(data->samples, bytes, 1, stdout) != 1) {
 fprintf(stderr, "I/O error\n");
 }
-
 }
 
 int main(int argc, const char *argv[])
 {
- char file[1024];
- SOUND_DATA *data;
- int sound_index = -1;
+ BLURAY_SOUND_EFFECT effect;
+ BLURAY *bd;
+ int sound_index = -1;
 
 if (argc < 2 || argc > 3) {
 fprintf(stderr, "usage: sound_dump [sound_index] <disc_root>\n");
@@ -80,21 +67,31 @@
 sound_index = atoi(argv[1]);
 }
 
- sprintf(file, "%s/BDMV/AUXDATA/sound.bdmv", argv[argc-1]);
-
- data = sound_parse(file);
-
- if (data) {
-
- if (sound_index >= 0) {
- _sound_dump(data, sound_index);
+ /* open disc */
+ bd = bd_open(argv[argc-1], NULL);
+ if (!bd) {
+ fprintf(stderr, "error opening disc %s\n", argv[argc-1]);
+ return -1;
+ }
 
+ if (sound_index >= 0) {
+ if (bd_get_sound_effect(bd, sound_index, &effect) <= 0) {
+ fprintf(stderr, "Invalid sound index %d\n", sound_index);
 } else {
- _sound_print(data);
+ _sound_dump(sound_index, &effect);
 }
 
- sound_free(&data);
+ } else {
+
+ while (bd_get_sound_effect(bd, ++sound_index, &effect) > 0) {
+ _sound_print(sound_index, &effect);
+ }
+ if (sound_index == 0) {
+ fprintf(stderr, "No sound effects\n");
+ }
 }
 
+ bd_close(bd);
+
 return 0;
 }

libbluray-0.2.3.tar.bz2/src/examples/util.h -> libbluray-0.5.0.tar.bz2/src/examples/util.h Changed

libbluray-0.2.3.tar.bz2/src/file/dir_posix.c -> libbluray-0.5.0.tar.bz2/src/file/dir_posix.c Changed

@@ -31,48 +31,20 @@
 #if defined(HAVE_DIRENT_H)
 # include <dirent.h>
 #endif
-#if defined(_WIN32)
-# include <io.h>
-#endif
-
-#if defined(_WIN32)
-typedef struct {
- long handle;
- struct _finddata_t info;
-} dir_data_t;
-#endif
 
-static void dir_close_posix(BD_DIR_H *dir)
+static void _dir_close_posix(BD_DIR_H *dir)
 {
 if (dir) {
-#if defined(_WIN32)
- dir_data_t *priv = dir->internal;
- _findclose(priv->handle);
- X_FREE(dir->internal);
-#else
 closedir((DIR *)dir->internal);
-#endif
 
- BD_DEBUG(DBG_DIR, "Closed POSIX dir (%p)\n", dir);
+ BD_DEBUG(DBG_DIR, "Closed POSIX dir (%p)\n", (void*)dir);
 
 X_FREE(dir);
 }
 }
 
-static int dir_read_posix(BD_DIR_H *dir, BD_DIRENT *entry)
+static int _dir_read_posix(BD_DIR_H *dir, BD_DIRENT *entry)
 {
-#if defined(_WIN32)
- dir_data_t *priv = dir->internal;
-
- if (!priv->info.name[0]) {
- return 1;
- }
- strncpy(entry->d_name, priv->info.name, sizeof(entry->d_name));
-
- priv->info.name[0] = 0;
- _findnext(priv->handle, &priv->info);
-
-#else
 struct dirent e, *p_e;
 int result;
 
@@ -83,50 +55,27 @@
 return 1;
 }
 strncpy(entry->d_name, e.d_name, 256);
-#endif
 
 return 0;
 }
 
-static BD_DIR_H *dir_open_posix(const char* dirname)
+static BD_DIR_H *_dir_open_posix(const char* dirname)
 {
 BD_DIR_H *dir = malloc(sizeof(BD_DIR_H));
 
- BD_DEBUG(DBG_DIR, "Opening POSIX dir %s... (%p)\n", dirname, dir);
- dir->close = dir_close_posix;
- dir->read = dir_read_posix;
-
-#if defined(_WIN32)
- char *filespec = str_printf("%s/*", dirname);
- dir_data_t *priv = calloc(1, sizeof(dir_data_t));
-
- dir->internal = priv;
-
- priv->handle = _findfirst(filespec, &priv->info);
-
- X_FREE(filespec);
-
- if (priv->handle != -1) {
- return dir;
- }
-
- X_FREE(dir->internal);
-
-#else
- DIR *dp = NULL;
-
- if ((dp = opendir(dirname))) {
- dir->internal = dp;
+ BD_DEBUG(DBG_DIR, "Opening POSIX dir %s... (%p)\n", dirname, (void*)dir);
+ dir->close = _dir_close_posix;
+ dir->read = _dir_read_posix;
 
+ if ((dir->internal = opendir(dirname))) {
 return dir;
 }
-#endif
 
- BD_DEBUG(DBG_DIR, "Error opening dir! (%p)\n", dir);
+ BD_DEBUG(DBG_DIR, "Error opening dir! (%p)\n", (void*)dir);
 
 X_FREE(dir);
 
 return NULL;
 }
 
-BD_DIR_H* (*dir_open)(const char* dirname) = dir_open_posix;
+BD_DIR_H* (*dir_open)(const char* dirname) = _dir_open_posix;

libbluray-0.5.0.tar.bz2/src/file/dir_win32.c Added

@@ -0,0 +1,106 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2009-2010 John Stebbins
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "file.h"
+#include "util/macro.h"
+#include "util/logging.h"
+#include "util/strutl.h"
+
+#include <stdlib.h>
+#include <string.h>
+#if defined(HAVE_DIRENT_H)
+# include <dirent.h>
+#endif
+
+#include <io.h>
+#include <windows.h>
+
+
+typedef struct {
+ intptr_t handle;
+ struct _wfinddata_t info;
+} dir_data_t;
+
+static void _dir_close_win32(BD_DIR_H *dir)
+{
+ if (dir) {
+ dir_data_t *priv = (dir_data_t*)dir->internal;
+
+ _findclose(priv->handle);
+
+ BD_DEBUG(DBG_DIR, "Closed WIN32 dir (%p)\n", (void*)dir);
+
+ X_FREE(dir->internal);
+ X_FREE(dir);
+ }
+}
+
+static int _dir_read_win32(BD_DIR_H *dir, BD_DIRENT *entry)
+{
+ dir_data_t *priv = (dir_data_t*)dir->internal;
+
+ if (!priv->info.name[0]) {
+ return 1;
+ }
+ WideCharToMultiByte(CP_UTF8, 0, priv->info.name, -1, entry->d_name, sizeof(entry->d_name), NULL, NULL);
+
+ priv->info.name[0] = 0;
+ _wfindnext(priv->handle, &priv->info);
+
+ return 0;
+}
+
+static BD_DIR_H *_dir_open_win32(const char* dirname)
+{
+ BD_DIR_H *dir = malloc(sizeof(BD_DIR_H));
+
+ BD_DEBUG(DBG_DIR, "Opening WIN32 dir %s... (%p)\n", dirname, (void*)dir);
+ dir->close = _dir_close_win32;
+ dir->read = _dir_read_win32;
+
+ char *filespec = str_printf("%s/*", dirname);
+ dir_data_t *priv = calloc(1, sizeof(dir_data_t));
+
+ dir->internal = priv;
+
+ wchar_t wfilespec[MAX_PATH];
+ if (MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filespec, -1, wfilespec, MAX_PATH))
+ priv->handle = _wfindfirst(wfilespec, &priv->info);
+ else
+ priv->handle = -1;
+
+ X_FREE(filespec);
+
+ if (priv->handle != -1) {
+ return dir;
+ }
+
+ BD_DEBUG(DBG_DIR, "Error opening dir! (%p)\n", (void*)dir);
+
+ X_FREE(dir->internal);
+ X_FREE(dir);
+
+ return NULL;
+}
+
+BD_DIR_H* (*dir_open)(const char* dirname) = _dir_open_win32;

libbluray-0.5.0.tar.bz2/src/file/dirs.h Added

@@ -0,0 +1,38 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2011-2013 VideoLAN
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef BLURAY_DIRS_H
+#define BLURAY_DIRS_H
+
+#include <util/attributes.h>
+
+#ifdef _WIN32
+BD_PRIVATE int win32_mkdir(const char *dir);
+#endif
+
+/*
+ * Config, cache and data dirs
+ */
+
+BD_PRIVATE const char *file_get_config_home(void);
+BD_PRIVATE const char *file_get_config_system(const char *dir);
+BD_PRIVATE const char *file_get_cache_home(void);
+BD_PRIVATE const char *file_get_data_home(void);
+
+#endif

libbluray-0.5.0.tar.bz2/src/file/dirs_darwin.c Added

@@ -0,0 +1,119 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 Konstantin Pavlov
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "dirs.h"
+
+#include <CoreFoundation/CoreFoundation.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "util/strutl.h"
+#include "util/logging.h"
+
+#define USER_CFG_DIR "Library/Preferences"
+#define USER_CACHE_DIR "Library/Caches"
+#define USER_DATA_DIR "Library"
+#define SYSTEM_CFG_DIR "/Library/Preferences"
+
+
+const char *file_get_config_home(void)
+{
+ static char *dir = NULL;
+ static int init_done = 0;
+
+ if (!init_done) {
+ init_done = 1;
+
+ const char *user_home = getenv("HOME");
+ if (user_home && *user_home) {
+ return dir = str_printf("%s/%s", user_home, USER_CFG_DIR);
+ }
+
+ BD_DEBUG(DBG_FILE, "Can't find user home directory ($HOME) !\n");
+ }
+
+ return dir;
+}
+
+const char *file_get_data_home(void)
+{
+ static char *dir = NULL;
+ static int init_done = 0;
+
+ if (!init_done) {
+ init_done = 1;
+
+ const char *user_home = getenv("HOME");
+ if (user_home && *user_home) {
+ return dir = str_printf("%s/%s", user_home, USER_DATA_DIR);
+ }
+
+ BD_DEBUG(DBG_FILE, "Can't find user home directory ($HOME) !\n");
+ }
+
+ return dir;
+}
+
+const char *file_get_cache_home(void)
+{
+ static char *dir = NULL;
+ static int init_done = 0;
+
+ if (!init_done) {
+ init_done = 1;
+
+ const char *user_home = getenv("HOME");
+ if (user_home && *user_home) {
+ return dir = str_printf("%s/%s", user_home, USER_CACHE_DIR);
+ }
+
+ BD_DEBUG(DBG_FILE, "Can't find user home directory ($HOME) !\n");
+ }
+
+ return dir;
+}
+
+const char *file_get_config_system(const char *dir)
+{
+ static char *dirs = NULL; // "dir1\0dir2\0...\0dirN\0\0"
+
+ if (!dirs) {
+ dirs = str_printf("%s%c%c", SYSTEM_CFG_DIR, 0, 0);
+ }
+
+ if (!dir) {
+ // first call
+ dir = dirs;
+ } else {
+ // next call
+ dir += strlen(dir) + 1;
+ if (!*dir) {
+ // end of list
+ dir = NULL;
+ }
+ }
+
+ return dir;
+}

libbluray-0.5.0.tar.bz2/src/file/dirs_win32.c Added

@@ -0,0 +1,105 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2011 VideoLAN
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "dirs.h"
+
+#include "util/logging.h"
+#include "util/macro.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include <shlobj.h>
+#include <windows.h>
+#include <limits.h>
+#include <direct.h>
+
+
+int win32_mkdir(const char *dir)
+{
+ wchar_t wdir[MAX_PATH];
+
+ MultiByteToWideChar(CP_UTF8, 0, dir, -1, wdir, MAX_PATH);
+ return _wmkdir(wdir);
+}
+
+const char *file_get_config_home(void)
+{
+ return file_get_data_home();
+}
+
+const char *file_get_data_home(void)
+{
+ static char *appdir = NULL;
+ wchar_t wdir[MAX_PATH];
+
+ if (appdir)
+ return appdir;
+
+ /* Get the "Application Data" folder for the user */
+ if (S_OK == SHGetFolderPathW(NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE,
+ NULL, SHGFP_TYPE_CURRENT, wdir)) {
+ int len = WideCharToMultiByte (CP_UTF8, 0, wdir, -1, NULL, 0, NULL, NULL);
+ appdir = malloc(len);
+ WideCharToMultiByte (CP_UTF8, 0, wdir, -1, appdir, len, NULL, NULL);
+ return appdir;
+ }
+
+ BD_DEBUG(DBG_FILE, "Can't find user configuration directory !\n");
+ return NULL;
+}
+
+const char *file_get_cache_home(void)
+{
+ return file_get_data_home();
+}
+
+const char *file_get_config_system(const char *dir)
+{
+ static char *appdir = NULL;
+ wchar_t wdir[MAX_PATH];
+
+ if (!dir) {
+ // first call
+
+ if (appdir)
+ return appdir;
+
+ /* Get the "Application Data" folder for all users */
+ if (S_OK == SHGetFolderPathW(NULL, CSIDL_COMMON_APPDATA | CSIDL_FLAG_CREATE,
+ NULL, SHGFP_TYPE_CURRENT, wdir)) {
+ int len = WideCharToMultiByte (CP_UTF8, 0, wdir, -1, NULL, 0, NULL, NULL);
+ appdir = malloc(len);
+ WideCharToMultiByte (CP_UTF8, 0, wdir, -1, appdir, len, NULL, NULL);
+ return appdir;
+ } else {
+ BD_DEBUG(DBG_FILE, "Can't find common configuration directory !\n");
+ return NULL;
+ }
+ } else {
+ // next call
+ return NULL;
+ }
+
+ return dir;
+}

libbluray-0.5.0.tar.bz2/src/file/dirs_xdg.c Added

@@ -0,0 +1,151 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "dirs.h"
+
+#include "util/strutl.h"
+#include "util/logging.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/*
+ * Based on XDG Base Directory Specification
+ * http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+ */
+
+#define USER_CFG_DIR ".config"
+#define USER_CACHE_DIR ".cache"
+#define USER_DATA_DIR ".local/share"
+#define SYSTEM_CFG_DIR "/etc/xdg"
+
+
+const char *file_get_config_home(void)
+{
+ static char *dir = NULL;
+ static int init_done = 0;
+
+ if (!init_done) {
+ init_done = 1;
+
+ const char *xdg_home = getenv("XDG_CONFIG_HOME");
+ if (xdg_home && *xdg_home) {
+ return dir = str_printf("%s", xdg_home);
+ }
+
+ const char *user_home = getenv("HOME");
+ if (user_home && *user_home) {
+ return dir = str_printf("%s/%s", user_home, USER_CFG_DIR);
+ }
+
+ BD_DEBUG(DBG_FILE, "Can't find user home directory ($HOME) !\n");
+ }
+
+ return dir;
+}
+
+const char *file_get_data_home(void)
+{
+ static char *dir = NULL;
+ static int init_done = 0;
+
+ if (!init_done) {
+ init_done = 1;
+
+ const char *xdg_home = getenv("XDG_DATA_HOME");
+ if (xdg_home && *xdg_home) {
+ return dir = str_printf("%s", xdg_home);
+ }
+
+ const char *user_home = getenv("HOME");
+ if (user_home && *user_home) {
+ return dir = str_printf("%s/%s", user_home, USER_DATA_DIR);
+ }
+
+ BD_DEBUG(DBG_FILE, "Can't find user home directory ($HOME) !\n");
+ }
+
+ return dir;
+}
+
+const char *file_get_cache_home(void)
+{
+ static char *dir = NULL;
+ static int init_done = 0;
+
+ if (!init_done) {
+ init_done = 1;
+
+ const char *xdg_cache = getenv("XDG_CACHE_HOME");
+ if (xdg_cache && *xdg_cache) {
+ return dir = str_printf("%s", xdg_cache);
+ }
+
+ const char *user_home = getenv("HOME");
+ if (user_home && *user_home) {
+ return dir = str_printf("%s/%s", user_home, USER_CACHE_DIR);
+ }
+
+ BD_DEBUG(DBG_FILE, "Can't find user home directory ($HOME) !\n");
+ }
+
+ return dir;
+}
+
+const char *file_get_config_system(const char *dir)
+{
+ static char *dirs = NULL; // "dir1\0dir2\0...\0dirN\0\0"
+
+ if (!dirs) {
+ const char *xdg_sys = getenv("XDG_CONFIG_DIRS");
+
+ if (xdg_sys && *xdg_sys) {
+
+ dirs = calloc(1, strlen(xdg_sys) + 2);
+ strcpy(dirs, xdg_sys);
+
+ char *pt = dirs;
+ while (NULL != (pt = strchr(pt, ':'))) {
+ *pt++ = 0;
+ }
+
+ } else {
+ dirs = str_printf("%s%c%c", SYSTEM_CFG_DIR, 0, 0);
+ }
+ }
+
+ if (!dir) {
+ // first call
+ dir = dirs;
+ } else {
+ // next call
+ dir += strlen(dir) + 1;
+ if (!*dir) {
+ // end of list
+ dir = NULL;
+ }
+ }
+
+ return dir;
+}

libbluray-0.2.3.tar.bz2/src/file/dl.h -> libbluray-0.5.0.tar.bz2/src/file/dl.h Changed

@@ -23,6 +23,36 @@
 
 #include <util/attributes.h>
 
+#include <stdint.h>
+
+/*
+ * function pointer types
+ */
+
+#ifdef __cplusplus
+typedef int (*fptr_int)(...);
+typedef int32_t (*fptr_int32)(...);
+typedef void* (*fptr_p_void)(...);
+#else
+typedef int (*fptr_int)();
+typedef int32_t (*fptr_int32)();
+typedef void* (*fptr_p_void)();
+#endif
+
+/*
+ * Macro to call function without return value
+ */
+
+#define DL_CALL(lib,func,...) \
+ do { \
+ fptr_p_void fptr; \
+ *(void **)(&fptr) = dl_dlsym(lib, #func); \
+ if (fptr) { \
+ fptr(__VA_ARGS__); \
+ } \
+ } while (0)
+
+
 // We don't bother aliasing dlopen to dlopen_posix, since only one
 // of the .C files will be compiled and linked, the right one for the
 // platform.
@@ -33,4 +63,13 @@
 BD_PRIVATE void *dl_dlsym ( void* handle, const char* symbol );
 BD_PRIVATE int dl_dlclose ( void* handle );
 
+/*
+ * Installation path of currently running libbluray.so
+ * returns NULL if unknown.
+ *
+ * This function is used to help finding libbluray.jar if location
+ * is not given in LIBBLURAY_CP environment variable.
+ */
+BD_PRIVATE const char *dl_get_path(void);
+
 #endif /* DL_H_ */

libbluray-0.2.3.tar.bz2/src/file/dl_posix.c -> libbluray-0.5.0.tar.bz2/src/file/dl_posix.c Changed

@@ -27,104 +27,98 @@
 #include "util/logging.h"
 #include "util/strutl.h"
 
-#if defined(_WIN32)
-# include <windows.h>
-#elif defined(HAVE_DLFCN_H)
+#if defined(HAVE_DLFCN_H)
 # include <dlfcn.h>
 #elif defined(HAVE_SYS_DL_H)
 # include <sys/dl.h>
 #endif
 
-#if defined(_WIN32)
-static const char *dlerror(char *buf, int buf_size)
+#include <string.h>
+
+static void *_dl_dlopen(const char *path)
 {
- DWORD error_code = GetLastError();
- wchar_t wbuf[256];
- 
- if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS |
- FORMAT_MESSAGE_MAX_WIDTH_MASK,
- NULL, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- wbuf, sizeof(wbuf)/sizeof(wbuf[0]), NULL)) {
- WideCharToMultiByte(CP_UTF8, 0, wbuf, -1, buf, buf_size, NULL, NULL);
- } else {
- snprintf(buf, buf_size, "error %d", (int)error_code);
+ void *result;
+
+ BD_DEBUG(DBG_FILE, "searching for library '%s' ...\n", path);
+
+ result = dlopen(path, RTLD_LAZY);
+
+ if (!result) {
+ BD_DEBUG(DBG_FILE, "can't open library '%s': %s\n", path, dlerror());
 }
- 
- return buf;
+
+ return result;
 }
-#endif
 
-void *dl_dlopen ( const char* path, const char *version )
+void *dl_dlopen(const char *path, const char *version)
 {
 char *name;
- void *result;
+ void *dll;
+ int i;
 
 #if defined(__APPLE__)
 static const char ext[] = ".dylib";
- version = NULL;
-#elif defined(_WIN32)
- static const char ext[] = ".dll";
+ /*
+ Search for the library in several locations:
+ "" - default search path (including DYLD_LIBRARY_PATH)
+ @loader_path - location of current library/binary (ex. libbluray.dylib)
+ @executable_path - location of running binary (ex. /Applications/Some.app/Contents/MacOS)
+ @rpath - search rpaths of running binary (man install_name_path)
+ */
+ static const char *search_paths[] = {"", "@loader_path/lib/", "@loader_path/", "@executable_path/",
+ "@executable_path/lib/", "@executable_path/../lib/",
+ "@executable_path/../Resources/", "@rpath/", NULL};
 version = NULL;
 #else
 static const char ext[] = ".so";
+ static const char *search_paths[] = {"", NULL};
 #endif
 
- if (version) {
- name = str_printf("%s%s.%s", path, ext, version);
- } else {
- name = str_printf("%s%s", path, ext);
- }
+ for (i = 0 ; search_paths[i] ; ++i) {
+ if (version) {
+ name = str_printf("%s%s%s.%s", search_paths[i], path, ext, version);
+ } else {
+ name = str_printf("%s%s%s", search_paths[i], path, ext);
+ }
 
- BD_DEBUG(DBG_FILE, "searching for library '%s' ...\n", name);
+ BD_DEBUG(DBG_FILE, "Attempting to open %s\n", name);
 
-#if defined(_WIN32)
- wchar_t wname[MAX_PATH];
- MultiByteToWideChar(CP_UTF8, 0, name, -1, wname, MAX_PATH);
- result = LoadLibraryW(wname);
-
- if (!result) {
- char buf[128];
- BD_DEBUG(DBG_FILE, "can't open library '%s': %s\n", name, dlerror(buf, sizeof(buf)));
+ dll = _dl_dlopen (name);
+ X_FREE(name);
+ if (dll) {
+ return dll;
+ }
 }
-#else
- result = dlopen(name, RTLD_LAZY);
 
- if (!result) {
- BD_DEBUG(DBG_FILE, "can't open library '%s': %s\n", name, dlerror());
- }
-#endif
-
- X_FREE(name);
-
- return result;
+ return NULL;
 }
 
-void *dl_dlsym ( void* handle, const char* symbol )
+void *dl_dlsym(void *handle, const char *symbol)
 {
-#if defined(_WIN32)
- void *result = (void *)GetProcAddress(handle, symbol);
-
- if (!result) {
- char buf[128];
- BD_DEBUG(DBG_FILE | DBG_CRIT, "GetProcAddress(%p, '%s') failed: %s\n", handle, symbol, dlerror(buf, sizeof(buf)));
- }
-#else
 void *result = dlsym(handle, symbol);
 
 if (!result) {
 BD_DEBUG(DBG_FILE | DBG_CRIT, "dlsym(%p, '%s') failed: %s\n", handle, symbol, dlerror());
 }
-#endif
 
 return result;
 }
 
-int dl_dlclose ( void* handle )
+int dl_dlclose(void *handle)
 {
-#if defined(_WIN32)
- FreeLibrary(handle);
- return 0;
-#else
 return dlclose(handle);
-#endif
+}
+
+const char *dl_get_path(void)
+{
+ static char *lib_path = NULL;
+ static int initialized = 0;
+
+ if (!initialized) {
+ initialized = 1;
+
+ BD_DEBUG(DBG_FILE, "Can't determine libbluray.so install path\n");
+ }
+
+ return lib_path;
 }

libbluray-0.5.0.tar.bz2/src/file/dl_win32.c Added

@@ -0,0 +1,127 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2009-2010 Obliter0n
+ * Copyright (C) 2009-2010 John Stebbins
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "dl.h"
+#include "file.h"
+#include "util/macro.h"
+#include "util/logging.h"
+#include "util/strutl.h"
+
+#include <windows.h>
+
+#include <string.h>
+
+static const char *dlerror(char *buf, int buf_size)
+{
+ DWORD error_code = GetLastError();
+ wchar_t wbuf[256];
+
+ if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS |
+ FORMAT_MESSAGE_MAX_WIDTH_MASK,
+ NULL, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ wbuf, sizeof(wbuf)/sizeof(wbuf[0]), NULL)) {
+ WideCharToMultiByte(CP_UTF8, 0, wbuf, -1, buf, buf_size, NULL, NULL);
+ } else {
+#ifdef _MSC_VER
+ _snprintf(buf, buf_size, "error %d", (int)error_code);
+#else
+ snprintf(buf, buf_size, "error %d", (int)error_code);
+#endif
+ }
+
+ return buf;
+}
+
+void *dl_dlopen(const char *path, const char *version)
+{
+ wchar_t wname[MAX_PATH];
+ char *name;
+ void *result;
+
+ name = str_printf("%s.dll", path);
+ MultiByteToWideChar(CP_UTF8, 0, name, -1, wname, MAX_PATH);
+ X_FREE(name);
+
+ result = LoadLibraryW(wname);
+
+ if (!result) {
+ char buf[128];
+ BD_DEBUG(DBG_FILE, "can't open library '%s': %s\n", path, dlerror(buf, sizeof(buf)));
+ }
+
+ return result;
+}
+
+void *dl_dlsym(void *handle, const char *symbol)
+{
+ void *result = (void *)GetProcAddress((HMODULE)handle, symbol);
+
+ if (!result) {
+ char buf[128];
+ BD_DEBUG(DBG_FILE | DBG_CRIT, "GetProcAddress(%p, '%s') failed: %s\n", handle, symbol, dlerror(buf, sizeof(buf)));
+ }
+
+ return result;
+}
+
+int dl_dlclose(void *handle)
+{
+ FreeLibrary((HMODULE)handle);
+ return 0;
+}
+
+// path-separator
+#define PATH_SEPARATOR '\\'
+
+const char *dl_get_path(void)
+{
+ static char *lib_path = NULL;
+ static int initialized = 0;
+
+ if (!initialized) {
+ initialized = 1;
+
+ static char path[MAX_PATH];
+ HMODULE hModule;
+ wchar_t wpath[MAX_PATH];
+
+ GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCTSTR)&dl_get_path, &hModule);
+ GetModuleFileNameW(hModule, wpath, MAX_PATH);
+ WideCharToMultiByte(CP_UTF8, 0, wpath, -1, path, MAX_PATH, NULL, NULL);
+ lib_path = path;
+
+ if (lib_path) {
+ /* cut library name from path */
+ char *p = strrchr(lib_path, PATH_SEPARATOR);
+ if (p) {
+ *(p+1) = 0;
+ }
+ BD_DEBUG(DBG_FILE, "library file is %s\n", lib_path);
+ } else {
+ BD_DEBUG(DBG_FILE, "Can't determine libbluray.dll install path\n");
+ }
+ }
+
+ return lib_path;
+}

libbluray-0.2.3.tar.bz2/src/file/file.h -> libbluray-0.5.0.tar.bz2/src/file/file.h Changed

libbluray-0.2.3.tar.bz2/src/file/file_posix.c -> libbluray-0.5.0.tar.bz2/src/file/file_posix.c Changed

@@ -33,18 +33,18 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <inttypes.h>
 
-#ifdef WIN32
-#define	ftello	_ftelli64
-#define	fseeko	_fseeki64
-#endif	//	#ifdef WIN32
+#ifdef _WIN32
+#include <windows.h>
+#endif	//	#ifdef _WIN32
 
 static void file_close_linux(BD_FILE_H *file)
 {
 if (file) {
 fclose((FILE *)file->internal);
 
- BD_DEBUG(DBG_FILE, "Closed LINUX file (%p)\n", file);
+ BD_DEBUG(DBG_FILE, "Closed LINUX file (%p)\n", (void*)file);
 
 X_FREE(file);
 }
@@ -54,6 +54,8 @@
 {
 #if defined(__MINGW32__)
 return fseeko64((FILE *)file->internal, offset, origin);
+#elif defined(_WIN32)
+ return _fseeki64((FILE *)file->internal, offset, origin);
 #else
 return fseeko((FILE *)file->internal, offset, origin);
 #endif
@@ -63,6 +65,8 @@
 {
 #if defined(__MINGW32__)
 return ftello64((FILE *)file->internal);
+#elif defined(_WIN32)
+ return _ftelli64((FILE *)file->internal);
 #else
 return ftello((FILE *)file->internal);
 #endif
@@ -73,14 +77,26 @@
 return feof((FILE *)file->internal);
 }
 
+#define BD_MAX_SSIZE ((int64_t)(((size_t)-1)>>1))
+
 static int64_t file_read_linux(BD_FILE_H *file, uint8_t *buf, int64_t size)
 {
- return fread(buf, 1, size, (FILE *)file->internal);
+ if (size > 0 && size < BD_MAX_SSIZE) {
+ return (int64_t)fread(buf, 1, (size_t)size, (FILE *)file->internal);
+ }
+
+ BD_DEBUG(DBG_FILE | DBG_CRIT, "Ignoring invalid read of size %"PRId64" (%p)\n", size, (void*)file);
+ return 0;
 }
 
 static int64_t file_write_linux(BD_FILE_H *file, const uint8_t *buf, int64_t size)
 {
- return fwrite(buf, 1, size, (FILE *)file->internal);
+ if (size > 0 && size < BD_MAX_SSIZE) {
+ return (int64_t)fwrite(buf, 1, (size_t)size, (FILE *)file->internal);
+ }
+
+ BD_DEBUG(DBG_FILE | DBG_CRIT, "Ignoring invalid write of size %"PRId64" (%p)\n", size, (void*)file);
+ return 0;
 }
 
 static BD_FILE_H *file_open_linux(const char* filename, const char *mode)
@@ -88,7 +104,7 @@
 FILE *fp = NULL;
 BD_FILE_H *file = malloc(sizeof(BD_FILE_H));
 
- BD_DEBUG(DBG_FILE, "Opening LINUX file %s... (%p)\n", filename, file);
+ BD_DEBUG(DBG_FILE, "Opening LINUX file %s... (%p)\n", filename, (void*)file);
 file->close = file_close_linux;
 file->seek = file_seek_linux;
 file->read = file_read_linux;
@@ -96,13 +112,20 @@
 file->tell = file_tell_linux;
 file->eof = file_eof_linux;
 
+#ifdef _WIN32
+ wchar_t wfilename[MAX_PATH], wmode[8];
+ if (MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filename, -1, wfilename, MAX_PATH) &&
+ MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, mode, -1, wmode, 8) &&
+ (fp = _wfopen(wfilename, wmode))) {
+#else
 if ((fp = fopen(filename, mode))) {
+#endif
 file->internal = fp;
 
 return file;
 }
 
- BD_DEBUG(DBG_FILE, "Error opening file! (%p)\n", file);
+ BD_DEBUG(DBG_FILE, "Error opening file! (%p)\n", (void*)file);
 
 X_FREE(file);
 
@@ -115,3 +138,21 @@
 {
 return file_open_linux;
 }
+
+/*
+ *
+ */
+
+int64_t file_size(BD_FILE_H *fp)
+{
+ int64_t pos = file_tell(fp);
+ int64_t res1 = file_seek(fp, 0, SEEK_END);
+ int64_t length = file_tell(fp);
+ int64_t res2 = file_seek(fp, pos, SEEK_SET);
+
+ if (res1 < 0 || res2 < 0 || pos < 0 || length < 0) {
+ return -1;
+ }
+
+ return length;
+}

libbluray-0.5.0.tar.bz2/src/file/libaacs.c Added

@@ -0,0 +1,298 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 VideoLAN
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include "libaacs.h"
+
+#include "dl.h"
+#include "file.h"
+#include "util/logging.h"
+#include "util/macro.h"
+#include "util/strutl.h"
+
+#include <stdlib.h>
+
+
+struct bd_aacs {
+ void *h_libaacs; /* library handle from dlopen */
+ void *aacs; /* aacs handle from aacs_open() */
+
+ const uint8_t *disc_id;
+ uint32_t mkbv;
+
+ /* function pointers */
+ fptr_int decrypt_unit;
+
+ fptr_p_void get_vid;
+ fptr_p_void get_pmsn;
+ fptr_p_void get_device_binding_id;
+ fptr_p_void get_device_nonce;
+ fptr_p_void get_media_key;
+};
+
+
+static void _libaacs_close(BD_AACS *p)
+{
+ if (p->aacs) {
+ DL_CALL(p->h_libaacs, aacs_close, p->aacs);
+ p->aacs = NULL;
+ }
+}
+
+void libaacs_unload(BD_AACS **p)
+{
+ if (p && *p) {
+ _libaacs_close(*p);
+
+ if ((*p)->h_libaacs) {
+ dl_dlclose((*p)->h_libaacs);
+ }
+
+ X_FREE(*p);
+ }
+}
+
+int libaacs_required(const char *device_path)
+{
+ BD_FILE_H *fd;
+ char *tmp;
+
+ tmp = str_printf("%s/AACS/Unit_Key_RO.inf", device_path);
+ fd = file_open(tmp, "rb");
+ X_FREE(tmp);
+
+ if (fd) {
+ file_close(fd);
+
+ BD_DEBUG(DBG_BLURAY, "AACS/Unit_Key_RO.inf found. Disc seems to be AACS protected.\n");
+ return 1;
+ }
+
+ BD_DEBUG(DBG_BLURAY, "AACS/Unit_Key_RO.inf not found. No AACS protection.\n");
+ return 0;
+}
+
+static void *_open_libaacs(void)
+{
+ const char * const libaacs[] = {
+ getenv("LIBAACS_PATH"),
+ "libaacs",
+ "libmmbd",
+ };
+ unsigned ii;
+
+ for (ii = 0; ii < sizeof(libaacs) / sizeof(libaacs[0]); ii++) {
+ if (libaacs[ii]) {
+ void *handle = dl_dlopen(libaacs[ii], "0");
+ if (handle) {
+ BD_DEBUG(DBG_BLURAY, "Using %s for AACS\n", libaacs[ii]);
+ return handle;
+ }
+ }
+ }
+
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "No usable AACS libraries found!\n");
+ return NULL;
+}
+
+BD_AACS *libaacs_load(void)
+{
+ BD_AACS *p = calloc(1, sizeof(BD_AACS));
+
+ p->h_libaacs = _open_libaacs();
+ if (!p->h_libaacs) {
+ X_FREE(p);
+ return NULL;
+ }
+
+ BD_DEBUG(DBG_BLURAY, "Loading aacs library (%p)\n", p->h_libaacs);
+
+ *(void **)(&p->decrypt_unit) = dl_dlsym(p->h_libaacs, "aacs_decrypt_unit");
+ *(void **)(&p->get_vid) = dl_dlsym(p->h_libaacs, "aacs_get_vid");
+ *(void **)(&p->get_pmsn) = dl_dlsym(p->h_libaacs, "aacs_get_pmsn");
+ *(void **)(&p->get_device_binding_id) = dl_dlsym(p->h_libaacs, "aacs_get_device_binding_id");
+ *(void **)(&p->get_device_nonce) = dl_dlsym(p->h_libaacs, "aacs_get_device_nonce");
+ *(void **)(&p->get_media_key) = dl_dlsym(p->h_libaacs, "aacs_get_mk");
+
+ if (!p->decrypt_unit) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "libaacs dlsym failed! (%p)\n", p->h_libaacs);
+ libaacs_unload(&p);
+ return NULL;
+ }
+
+ BD_DEBUG(DBG_BLURAY, "Loaded libaacs (%p)\n", p->h_libaacs);
+
+ if (file_open != file_open_default()) {
+ BD_DEBUG(DBG_BLURAY, "Registering libaacs filesystem handler %p (%p)\n", (void *)(intptr_t)file_open, p->h_libaacs);
+ DL_CALL(p->h_libaacs, aacs_register_file, file_open);
+ }
+
+ return p;
+}
+
+int libaacs_open(BD_AACS *p, const char *device_path, const char *keyfile_path)
+{
+ int error_code = 0;
+
+ fptr_p_void open;
+ fptr_p_void open2;
+ fptr_int aacs_get_mkb_version;
+ fptr_p_void aacs_get_disc_id;
+
+ _libaacs_close(p);
+
+ *(void **)(&open) = dl_dlsym(p->h_libaacs, "aacs_open");
+ *(void **)(&open2) = dl_dlsym(p->h_libaacs, "aacs_open2");
+ *(void **)(&aacs_get_mkb_version) = dl_dlsym(p->h_libaacs, "aacs_get_mkb_version");
+ *(void **)(&aacs_get_disc_id) = dl_dlsym(p->h_libaacs, "aacs_get_disc_id");
+
+ if (open2) {
+ p->aacs = open2(device_path, keyfile_path, &error_code);
+ } else if (open) {
+ BD_DEBUG(DBG_BLURAY, "Using old aacs_open(), no verbose error reporting available\n");
+ p->aacs = open(device_path, keyfile_path);
+ } else {
+ BD_DEBUG(DBG_BLURAY, "aacs_open() not found\n");
+ }
+
+ if (p->aacs) {
+ if (aacs_get_mkb_version) {
+ p->mkbv = aacs_get_mkb_version(p->aacs);
+ }
+ if (aacs_get_disc_id) {
+ p->disc_id = (const uint8_t *)aacs_get_disc_id(p->aacs);
+ }
+ return error_code;
+ }
+
+ return error_code ? error_code : 1;
+}
+
+/*
+ *
+ */
+
+void libaacs_select_title(BD_AACS *p, uint32_t title)
+{
+ if (p && p->aacs) {
+ DL_CALL(p->h_libaacs, aacs_select_title, p->aacs, title);
+ }
+}
+
+int libaacs_decrypt_unit(BD_AACS *p, uint8_t *buf)
+{
+ if (p && p->aacs) {
+ if (!p->decrypt_unit(p->aacs, buf)) {
+ BD_DEBUG(DBG_AACS | DBG_CRIT, "Unable decrypt unit (AACS)!\n");
+
+ return -1;
+ } // decrypt
+ } // aacs
+
+ return 0;
+}
+
+/*
+ *
+ */
+
+static const uint8_t *_get_vid(BD_AACS *p)
+{
+ if (!p->get_vid) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "aacs_get_vid() dlsym failed!\n");
+ return NULL;
+ }
+
+ return (const uint8_t*)p->get_vid(p->aacs);
+}
+
+static const uint8_t *_get_pmsn(BD_AACS *p)
+{
+ if (!p->get_pmsn) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "aacs_get_pmsn() dlsym failed!\n");
+ return NULL;
+ }
+
+ return (const uint8_t*)p->get_pmsn(p->aacs);
+}
+
+static const uint8_t *_get_device_binding_id(BD_AACS *p)
+{
+ if (!p->get_device_binding_id) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "aacs_get_device_binding_id() dlsym failed!\n");
+ return NULL;
+ }
+
+ return (const uint8_t*)p->get_device_binding_id(p->aacs);
+}
+
+static const uint8_t *_get_device_nonce(BD_AACS *p)
+{
+ if (!p->get_device_nonce) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "aacs_get_device_nonce() dlsym failed!\n");
+ return NULL;
+ }
+
+ return (const uint8_t*)p->get_device_nonce(p->aacs);
+}
+
+static const uint8_t *_get_media_key(BD_AACS *p)
+{
+ if (!p->get_media_key) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "aacs_get_mk() dlsym failed!\n");
+ return NULL;
+ }
+
+ return (const uint8_t*)p->get_media_key(p->aacs);
+}
+
+uint32_t libaacs_get_mkbv(BD_AACS *p)
+{
+ return p ? p->mkbv : 0;
+}
+
+BD_PRIVATE const uint8_t *libaacs_get_aacs_data(BD_AACS *p, int type)
+{
+ if (!p || !p->aacs) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "get_aacs_data(): libaacs not initialized!\n");
+ return NULL;
+ }
+
+ switch (type) {
+ case BD_AACS_DISC_ID:
+ return p ? p->disc_id : NULL;
+
+ case BD_AACS_MEDIA_VID:
+ return _get_vid(p);
+
+ case BD_AACS_MEDIA_PMSN:
+ return _get_pmsn(p);
+
+ case BD_AACS_DEVICE_BINDING_ID:
+ return _get_device_binding_id(p);
+
+ case BD_AACS_DEVICE_NONCE:
+ return _get_device_nonce(p);
+
+ case BD_AACS_MEDIA_KEY:
+ return _get_media_key(p);
+ }
+
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "get_aacs_data(): unknown query %d\n", type);
+ return NULL;
+}

libbluray-0.5.0.tar.bz2/src/file/libaacs.h Added

@@ -0,0 +1,50 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 VideoLAN
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _BD_LIBAACS_H_
+#define _BD_LIBAACS_H_
+
+#include <util/attributes.h>
+
+#include <stdint.h>
+
+
+typedef struct bd_aacs BD_AACS;
+
+BD_PRIVATE int libaacs_required(const char *device_path);
+BD_PRIVATE BD_AACS *libaacs_load(void);
+BD_PRIVATE int libaacs_open(BD_AACS *p, const char *device_path, const char *keyfile_path);
+BD_PRIVATE void libaacs_unload(BD_AACS **p);
+
+BD_PRIVATE void libaacs_select_title(BD_AACS *p, uint32_t title);
+BD_PRIVATE int libaacs_decrypt_unit(BD_AACS *p, uint8_t *buf);
+
+BD_PRIVATE uint32_t libaacs_get_mkbv(BD_AACS *p);
+
+#define BD_AACS_DISC_ID 1
+#define BD_AACS_MEDIA_VID 2
+#define BD_AACS_MEDIA_PMSN 3
+#define BD_AACS_DEVICE_BINDING_ID 4
+#define BD_AACS_DEVICE_NONCE 5
+#define BD_AACS_MEDIA_KEY 6
+
+BD_PRIVATE const uint8_t *libaacs_get_aacs_data(BD_AACS *p, int type);
+
+
+#endif /* _BD_LIBAACS_H_ */

libbluray-0.5.0.tar.bz2/src/file/libbdplus.c Added

@@ -0,0 +1,318 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 VideoLAN
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include "libbdplus.h"
+
+#include "dl.h"
+#include "file.h"
+#include "util/logging.h"
+#include "util/macro.h"
+#include "util/strutl.h"
+
+#include <stdlib.h>
+
+
+struct bd_bdplus {
+ void *h_libbdplus; /* library handle from dlopen */
+
+ void *bdplus; /* bdplus handle from bdplus_open() */
+
+ /* functions */
+ fptr_int32 event;
+ fptr_p_void m2ts;
+ fptr_int32 m2ts_close;
+ fptr_int32 seek;
+ fptr_int32 fixup;
+
+ /* old API */
+ fptr_p_void title;
+};
+
+
+static void _libbdplus_close(BD_BDPLUS *p)
+{
+ if (p->bdplus) {
+ DL_CALL(p->h_libbdplus, bdplus_free, p->bdplus);
+ p->bdplus = NULL;
+ }
+}
+
+void libbdplus_unload(BD_BDPLUS **p)
+{
+ if (p && *p) {
+ _libbdplus_close(*p);
+
+ if ((*p)->h_libbdplus) {
+ dl_dlclose((*p)->h_libbdplus);
+ }
+
+ X_FREE(*p);
+ }
+}
+
+int libbdplus_required(const char *device_path)
+{
+ BD_FILE_H *fd;
+ char *tmp;
+
+ tmp = str_printf("%s/BDSVM/00000.svm", device_path);
+ fd = file_open(tmp, "rb");
+ X_FREE(tmp);
+
+ if (fd) {
+ file_close(fd);
+
+ BD_DEBUG(DBG_BLURAY, "BDSVM/00000.svm found. Disc seems to be BD+ protected.\n");
+ return 1;
+ }
+
+ BD_DEBUG(DBG_BLURAY, "BDSVM/00000.svm not found. No BD+ protection.\n");
+ return 0;
+}
+
+static void *_libbdplus_open(void)
+{
+ const char * const libbdplus[] = {
+ getenv("LIBBDPLUS_PATH"),
+ "libbdplus",
+ "libmmbd",
+ };
+ unsigned ii;
+
+ for (ii = 0; ii < sizeof(libbdplus) / sizeof(libbdplus[0]); ii++) {
+ if (libbdplus[ii]) {
+ void *handle = dl_dlopen(libbdplus[ii], "0");
+ if (handle) {
+ BD_DEBUG(DBG_BLURAY, "Using %s for BD+\n", libbdplus[ii]);
+ return handle;
+ }
+ }
+ }
+
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "No usable BD+ libraries found!\n");
+ return NULL;
+}
+
+BD_BDPLUS *libbdplus_load(void)
+{
+ BD_BDPLUS *p = calloc(1, sizeof(BD_BDPLUS));
+
+ BD_DEBUG(DBG_BDPLUS, "attempting to load libbdplus\n");
+
+ p->h_libbdplus = _libbdplus_open();
+ if (!p->h_libbdplus) {
+ X_FREE(p);
+ return NULL;
+ }
+
+ BD_DEBUG(DBG_BLURAY, "Loading libbdplus (%p)\n", p->h_libbdplus);
+
+ *(void **)(&p->event) = dl_dlsym(p->h_libbdplus, "bdplus_event");
+ *(void **)(&p->m2ts) = dl_dlsym(p->h_libbdplus, "bdplus_m2ts");
+ *(void **)(&p->seek) = dl_dlsym(p->h_libbdplus, "bdplus_seek");
+ *(void **)(&p->fixup) = dl_dlsym(p->h_libbdplus, "bdplus_fixup");
+ *(void **)(&p->m2ts_close) = dl_dlsym(p->h_libbdplus, "bdplus_m2ts_close");
+ if (!p->m2ts) {
+ /* Old API */
+ *(void **)(&p->title) = dl_dlsym(p->h_libbdplus, "bdplus_set_title");
+ if (!p->title) {
+ *(void **)(&p->title) = dl_dlsym(p->h_libbdplus, "bdplus_set_m2ts");
+ }
+ }
+
+ if (!p->seek || !p->fixup || !((p->m2ts && p->m2ts_close) || p->title)) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "libbdplus dlsym failed! (%p)\n", p->h_libbdplus);
+ libbdplus_unload(&p);
+ return NULL;
+ }
+
+ BD_DEBUG(DBG_BLURAY, "Loaded libbdplus (%p)\n", p->h_libbdplus);
+
+ if (file_open != file_open_default()) {
+ BD_DEBUG(DBG_BLURAY, "Registering libbdplus filesystem handler %p (%p)\n", (void *)(intptr_t)file_open, p->h_libbdplus);
+ DL_CALL(p->h_libbdplus, bdplus_register_file, file_open);
+ }
+
+ return p;
+}
+
+int libbdplus_init(BD_BDPLUS *p, const char *device_path, const uint8_t *vid, const uint8_t *mk)
+{
+ fptr_p_void bdplus_init;
+
+ _libbdplus_close(p);
+
+ *(void **)(&bdplus_init) = dl_dlsym(p->h_libbdplus, "bdplus_init");
+
+ if (!bdplus_init) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "libbdplus dlsym(bdplus_init) failed! (%p)\n", p->h_libbdplus);
+ return -1;
+ }
+
+ p->bdplus = bdplus_init(device_path, NULL, vid);
+ if (!p->bdplus) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "bdplus_init() failed! (%p)\n", p->h_libbdplus);
+ return -1;
+ }
+
+ DL_CALL(p->h_libbdplus, bdplus_set_mk, p->bdplus, mk);
+
+ return 0;
+}
+
+static uint32_t _bdplus_get(BD_BDPLUS *p, const char *func)
+{
+ if (p && p->bdplus) {
+ fptr_int32 fp;
+ *(void **)(&fp) = dl_dlsym(p->h_libbdplus, func);
+ if (fp) {
+ return fp(p->bdplus);
+ }
+ }
+ return 0;
+}
+
+int libbdplus_get_gen(BD_BDPLUS *p)
+{
+ return _bdplus_get(p, "bdplus_get_code_gen");
+}
+
+int libbdplus_get_date(BD_BDPLUS *p)
+{
+ return _bdplus_get(p, "bdplus_get_code_date");
+}
+
+void libbdplus_event(BD_BDPLUS *p, uint32_t event, uint32_t param1, uint32_t param2)
+{
+ if (p && p->bdplus && p->event) {
+ p->event(p->bdplus, event, param1, param2);
+ }
+}
+
+void libbdplus_mmap(BD_BDPLUS *p, uint32_t region_id, void *mem)
+{
+ if (p && p->bdplus) {
+ DL_CALL(p->h_libbdplus, bdplus_mmap, p->bdplus, region_id, mem);
+ }
+}
+
+void libbdplus_psr(BD_BDPLUS *p, void *regs, void *read, void *write)
+{
+ if (p && p->bdplus) {
+ DL_CALL(p->h_libbdplus, bdplus_psr, p->bdplus, regs, read, write);
+ }
+}
+
+void libbdplus_start(BD_BDPLUS *p)
+{
+ if (p && p->bdplus) {
+ DL_CALL(p->h_libbdplus, bdplus_start, p->bdplus);
+ }
+}
+
+/*
+ * stream layer
+ */
+
+struct bd_bdplus_st {
+ BD_BDPLUS *lib;
+ void *st;
+};
+
+BD_BDPLUS_ST *libbdplus_m2ts(BD_BDPLUS *p, uint32_t clip_id, uint64_t pos)
+{
+ if (p && p->bdplus) {
+
+ if (!p->m2ts) {
+ /* use old API */
+ BD_BDPLUS_ST *ret = calloc(1, sizeof(BD_BDPLUS_ST));
+ ret->lib = p;
+ ret->st = NULL;
+ p->title(p->bdplus, clip_id);
+ p->seek(p->bdplus, pos);
+ return ret;
+ }
+
+ void *st = p->m2ts(p->bdplus, clip_id);
+
+ if (!st) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "BD+ failed for clip %05d.m2ts\n", clip_id);
+
+ } else if (p->seek(st, pos) < 0) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "BD+ seek failed for clip %05d.m2ts\n", clip_id);
+ p->m2ts_close(st);
+ } else {
+ BD_BDPLUS_ST *ret = calloc(1, sizeof(BD_BDPLUS_ST));
+ ret->lib = p;
+ ret->st = st;
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "BD+ active for clip %05d.m2ts\n", clip_id);
+ return ret;
+ }
+ }
+
+ return NULL;
+}
+
+int libbdplus_m2ts_close(BD_BDPLUS_ST **p)
+{
+ int result = -1;
+ if (p && *p) {
+ if ((*p)->lib && (*p)->st) {
+ result = (*p)->lib->m2ts_close((*p)->st);
+ }
+ X_FREE(*p);
+ }
+
+ return result;
+}
+
+int libbdplus_seek(BD_BDPLUS_ST *p, uint64_t pos)
+{
+ if (p) {
+ if (p->st) {
+ return p->lib->seek(p->st, pos);
+ } else {
+ /* use old API */
+ return p->lib->seek(p->lib->bdplus, pos);
+ }
+ }
+
+ return -1;
+}
+
+int libbdplus_fixup(BD_BDPLUS_ST *p, uint8_t *buf, int len)
+{
+ if (p && !p->lib->m2ts) {
+ /* use old API */
+ return p->lib->fixup(p->lib->bdplus, len, buf);
+ }
+
+ if (p && p->st) {
+ int32_t numFixes;
+ numFixes = p->lib->fixup(p->st, len, buf);
+#if 1
+ if (numFixes) {
+ BD_DEBUG(DBG_BDPLUS, "BD+ did %d fixups\n", numFixes);
+ }
+#endif
+ return numFixes;
+ }
+
+ return -1;
+}

libbluray-0.5.0.tar.bz2/src/file/libbdplus.h Added

@@ -0,0 +1,55 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 VideoLAN
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _BD_LIBBDPLUS_H_
+#define _BD_LIBBDPLUS_H_
+
+#include <util/attributes.h>
+
+#include <stdint.h>
+
+
+typedef struct bd_bdplus BD_BDPLUS;
+
+BD_PRIVATE int libbdplus_required(const char *device_path);
+BD_PRIVATE BD_BDPLUS *libbdplus_load(void);
+BD_PRIVATE int libbdplus_init(BD_BDPLUS *p, const char *device_path, const uint8_t *vid, const uint8_t *mk);
+BD_PRIVATE void libbdplus_unload(BD_BDPLUS **p);
+
+BD_PRIVATE int libbdplus_get_gen(BD_BDPLUS *p);
+BD_PRIVATE int libbdplus_get_date(BD_BDPLUS *p);
+
+BD_PRIVATE void libbdplus_mmap(BD_BDPLUS *p, uint32_t region_id, void *mem);
+BD_PRIVATE void libbdplus_psr(BD_BDPLUS *p, void *regs, void *read, void *write);
+BD_PRIVATE void libbdplus_start(BD_BDPLUS *p);
+BD_PRIVATE void libbdplus_event(BD_BDPLUS *p, uint32_t event, uint32_t param1, uint32_t param2);
+
+/*
+ * stream layer
+ */
+
+typedef struct bd_bdplus_st BD_BDPLUS_ST;
+
+BD_PRIVATE BD_BDPLUS_ST *libbdplus_m2ts(BD_BDPLUS *p, uint32_t clip_id, uint64_t pos);
+BD_PRIVATE int libbdplus_seek(BD_BDPLUS_ST *p, uint64_t pos);
+BD_PRIVATE int libbdplus_fixup(BD_BDPLUS_ST *p, uint8_t *buf, int len);
+BD_PRIVATE int libbdplus_m2ts_close(BD_BDPLUS_ST **p);
+
+
+#endif /* _BD_BDPLUS_H_ */

libbluray-0.2.3.tar.bz2/src/libbluray.pc.in -> libbluray-0.5.0.tar.bz2/src/libbluray.pc.in Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/bdj.c -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/bdj.c Changed

@@ -1,6 +1,7 @@
 /*
 * This file is part of libbluray
 * Copyright (C) 2010 William Hahne
+ * Copyright (C) 2012 Petri Hintukainen <phintuka@users.sourceforge.net>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -17,164 +18,625 @@
 * <http://www.gnu.org/licenses/>.
 */
 
-#include "bdj.h"
-
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+
+#include "bdj.h"
+
 #include "bdj_private.h"
 #include "bdjo_parser.h"
+#include "bdj_util.h"
 #include "common.h"
 #include "libbluray/register.h"
+#include "file/dirs.h"
 #include "file/dl.h"
 #include "util/strutl.h"
+#include "util/macro.h"
+#include "util/logging.h"
+#include "libbluray/bdnav/bdid_parse.h"
+#include "libbluray/bdj/native/register_native.h"
 
 #include <jni.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-typedef jint (JNICALL * fptr_JNI_CreateJavaVM) (JavaVM **pvm, void **penv,void *args);
+#ifdef _WIN32
+#include <windows.h>
+#include <winreg.h>
+#endif
 
-int start_xlet(JNIEnv* env, const char* path, jobject bdjo, BDJAVA* bdjava);
-void* load_jvm();
+typedef jint (JNICALL * fptr_JNI_CreateJavaVM) (JavaVM **pvm, void **penv,void *args);
 
-BDJAVA* bdj_open(const char *path, const char* start, void* bd, void* registers)
+#if defined(_WIN32) && !defined(HAVE_BDJ_J2ME)
+static void *_load_jvm_win32(const char **p_java_home)
 {
- // first load the jvm using dlopen
- void* jvm_lib = load_jvm();
+ static const char *java_home = NULL;
 
- if (!jvm_lib) {
- BD_DEBUG(DBG_BDJ | DBG_CRIT, "Wasn't able to load libjvm.so\n");
+ wchar_t buf_loc[4096] = L"SOFTWARE\\JavaSoft\\Java Runtime Environment\\";
+ wchar_t buf_vers[128];
+
+ char strbuf[256];
+
+ LONG r;
+ DWORD lType;
+ DWORD dSize = sizeof(buf_vers);
+ HKEY hkey;
+
+ r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, buf_loc, 0, KEY_READ, &hkey);
+ if (r != ERROR_SUCCESS) {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "Error opening registry key SOFTWARE\\JavaSoft\\Java Runtime Environment\\");
 return NULL;
 }
 
- BDJAVA* bdjava = malloc(sizeof(BDJAVA));
- bdjava->bd = bd;
- bdjava->reg = registers;
+ r = RegQueryValueExW(hkey, L"CurrentVersion", NULL, &lType, (LPBYTE)buf_vers, &dSize);
+ RegCloseKey(hkey);
+ if (r != ERROR_SUCCESS) {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "CurrentVersion registry value not found");
+ return NULL;
+ }
 
- JavaVMInitArgs args;
+ if (debug_mask & DBG_BDJ) {
+ WideCharToMultiByte(CP_UTF8, 0, buf_vers, -1, strbuf, sizeof(strbuf), NULL, NULL);
+ BD_DEBUG(DBG_BDJ, "JRE version: %s\n", strbuf);
+ }
+ wcscat(buf_loc, buf_vers);
+
+ dSize = sizeof(buf_loc);
+ r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, buf_loc, 0, KEY_READ, &hkey);
+ if (r != ERROR_SUCCESS) {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "Error opening JRE version-specific registry key");
+ return NULL;
+ }
+
+ r = RegQueryValueExW(hkey, L"JavaHome", NULL, &lType, (LPBYTE)buf_loc, &dSize);
+
+ if (r == ERROR_SUCCESS) {
+ /* do not fail even if not found */
+ WideCharToMultiByte(CP_UTF8, 0, buf_loc, -1, strbuf, sizeof(strbuf), NULL, NULL);
+ *p_java_home = java_home = str_dup(strbuf);
+ BD_DEBUG(DBG_BDJ, "JavaHome: %s\n", strbuf);
+ }
+
+ dSize = sizeof(buf_loc);
+ r = RegQueryValueExW(hkey, L"RuntimeLib", NULL, &lType, (LPBYTE)buf_loc, &dSize);
+ RegCloseKey(hkey);
+
+ if (r != ERROR_SUCCESS) {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "RuntimeLib registry value not found");
+ return NULL;
+ }
+
+ void *result = LoadLibraryW(buf_loc);
+
+ WideCharToMultiByte(CP_UTF8, 0, buf_loc, -1, strbuf, sizeof(strbuf), NULL, NULL);
+ if (!result) {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "can't open library '%s'\n", strbuf);
+ } else {
+ BD_DEBUG(DBG_BDJ, "Using JRE library %s\n", strbuf);
+ }
+
+ return result;
+}
+#endif
+
+static void *_jvm_dlopen(const char *java_home, const char *jvm_dir, const char *jvm_lib)
+{
+ if (java_home) {
+ char *path = str_printf("%s/%s/%s", java_home, jvm_dir, jvm_lib);
+ BD_DEBUG(DBG_BDJ|DBG_CRIT, "Opening %s ...\n", path);
+ void *h = dl_dlopen(path, NULL);
+ X_FREE(path);
+ return h;
+ } else {
+ BD_DEBUG(DBG_BDJ|DBG_CRIT, "Opening %s ...\n", jvm_lib);
+ return dl_dlopen(jvm_lib, NULL);
+ }
+}
+
+static void *_load_jvm(const char **p_java_home)
+{
+#ifdef HAVE_BDJ_J2ME
+# ifdef _WIN32
+ static const char *jvm_path[] = {NULL, JDK_HOME};
+ static const char jvm_dir[] = "bin";
+ static const char jvm_lib[] = "cvmi";
+# else
+ static const char *jvm_path[] = {NULL, JDK_HOME, "/opt/PhoneME"};
+ static const char jvm_dir[] = "bin";
+ static const char jvm_lib[] = "libcvm";
+# endif
+#else
+# ifdef _WIN32
+ static const char *jvm_path[] = {NULL, JDK_HOME};
+ static const char jvm_dir[] = "jre/bin/server";
+ static const char jvm_lib[] = "jvm";
+# else
+ static const char *jvm_path[] = {NULL, JDK_HOME, "/usr/lib/jvm/default-java/"};
+ static const char jvm_dir[] = "jre/lib/" JAVA_ARCH "/server";
+ static const char jvm_lib[] = "libjvm";
+# endif
+#endif
+ const char *java_home = NULL;
+ unsigned path_ind;
+ void *handle = NULL;
+
+ /* JAVA_HOME set, use it */
+ java_home = getenv("JAVA_HOME");
+ if (java_home) {
+ *p_java_home = java_home;
+ return _jvm_dlopen(java_home, jvm_dir, jvm_lib);
+ }
+
+#if defined(_WIN32) && !defined(HAVE_BDJ_J2ME)
+ handle = _load_jvm_win32(p_java_home);
+ if (handle) {
+ return handle;
+ }
+#endif
+
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "JAVA_HOME not set, trying default locations\n");
+
+ /* try our pre-defined locations */
+ for (path_ind = 0; !handle && path_ind < sizeof(jvm_path) / sizeof(jvm_path[0]); path_ind++) {
+ *p_java_home = jvm_path[path_ind];
+ handle = _jvm_dlopen(jvm_path[path_ind], jvm_dir, jvm_lib);
+ }
+
+ if (!*p_java_home) {
+ *p_java_home = dl_get_path();
+ }
+
+ return handle;
+}
+
+static const char *_find_libbluray_jar(void)
+{
+ // pre-defined search paths for libbluray.jar
+ static const char * const jar_paths[] = {
+#ifdef _WIN32
+ "" BDJ_JARFILE,
+#else
+ "/usr/lib/libbluray/" BDJ_JARFILE,
+ "/usr/share/libbluray/" BDJ_JARFILE,
+#endif
+ };
+
+ static const char *classpath = NULL;
+
+ FILE *fp;
+ unsigned i;
 
 // check if overriding the classpath
- const char* classpath = getenv("LIBBLURAY_CP");
- if (classpath == NULL)
- classpath = BDJ_CLASSPATH;
+ if (!classpath) {
+ classpath = getenv("LIBBLURAY_CP");
+ }
+ if (classpath) {
+ return classpath;
+ }
 
- // determine classpath
- char* classpath_opt = str_printf("-Djava.class.path=%s", classpath);
+ BD_DEBUG(DBG_BDJ, "LIBBLURAY_CP not set, searching for "BDJ_JARFILE" ...\n");
+
+ // check directory where libbluray.so was loaded from
+ const char *lib_path = dl_get_path();
+ if (lib_path) {
+ char *cp = str_printf("%s" BDJ_JARFILE, lib_path);
+ BD_DEBUG(DBG_BDJ, "Checking %s ...\n", cp);
+ fp = fopen(cp, "rb");
+ if (fp) {
+ fclose(fp);
+ classpath = cp;
+ BD_DEBUG(DBG_BDJ, "using %s\n", cp);
+ return cp;
+ }
+ X_FREE(cp);
+ }
 
- JavaVMOption* option = malloc(sizeof(JavaVMOption) * 1);
- option[0].optionString = classpath_opt;
+ // check pre-defined directories
+ for (i = 0; i < sizeof(jar_paths) / sizeof(jar_paths[0]); i++) {
+ BD_DEBUG(DBG_BDJ, "Checking %s ...\n", jar_paths[i]);
+ fp = fopen(jar_paths[i], "rb");
+ if (fp) {
+ fclose(fp);
+ classpath = jar_paths[i];
+ BD_DEBUG(DBG_BDJ, "using %s\n", classpath);
+ return classpath;
+ }
+ }
 
- args.version = JNI_VERSION_1_6;
- args.nOptions = 1;
- args.options = option;
- args.ignoreUnrecognized = JNI_FALSE; // don't ignore unrecognized options
+ classpath = BDJ_CLASSPATH;
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, BDJ_JARFILE" not found.\n");
+ return classpath;
+}
+
+static const char *_bdj_persistent_root(void)
+{
+ static const char *root = NULL;
+
+ if (root) {
+ return root;
+ }
+
+ root = getenv("LIBBLURAY_PERSISTENT_ROOT");
+ if (root) {
+ return root;
+ }
+
+ root = file_get_data_home();
+ if (!root) {
+ root = "";
+ }
+ root = str_printf("%s/bluray/dvb.persistent.root/", root);
+
+ BD_DEBUG(DBG_BDJ, "LIBBLURAY_PERSISTENT_ROOT not set, using %s\n", root);
+
+ return root;
+}
+
+static const char *_bdj_buda_root(void)
+{
+ static const char *root = NULL;
+
+ if (root) {
+ return root;
+ }
+
+ root = getenv("LIBBLURAY_CACHE_ROOT");
+ if (root) {
+ return root;
+ }
+
+ root = file_get_cache_home();
+ if (!root) {
+ root = "";
+ }
+ root = str_printf("%s/bluray/bluray.bindingunit.root/", root);
+
+ BD_DEBUG(DBG_BDJ, "LIBBLURAY_CACHE_ROOT not set, using %s\n", root);
+
+ return root;
+}
+
+static int _bdj_init(BDJAVA *bdjava, JNIEnv *env)
+{
+ if (!bdj_register_native_methods(env)) {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "Couldn't register native methods.\n");
+ }
+
+ // initialize class org.videolan.Libbluray
+ jclass init_class;
+ jmethodID init_id;
+ if (!bdj_get_method(env, &init_class, &init_id,
+ "org/videolan/Libbluray", "init", "(JLjava/lang/String;)V")) {
+ return 0;
+ }
+
+ char* id_path = str_printf("%s/CERTIFICATE/id.bdmv", bdjava->path);
+ BDID_DATA *id = bdid_parse(id_path);
+ jlong param_bdjava_ptr = (jlong)(intptr_t) bdjava;
+ jstring param_disc_id = (*env)->NewStringUTF(env,
+ id ? id->disc_id : "00000000000000000000000000000000");
+ (*env)->CallStaticVoidMethod(env, init_class, init_id,
+ param_bdjava_ptr, param_disc_id);
+
+ if ((*env)->ExceptionOccurred(env)) {
+ (*env)->ExceptionDescribe(env);
+ (*env)->ExceptionClear(env);
+ }
+
+ (*env)->DeleteLocalRef(env, init_class);
+ (*env)->DeleteLocalRef(env, param_disc_id);
 
- fptr_JNI_CreateJavaVM JNI_CreateJavaVM_fp = (fptr_JNI_CreateJavaVM)dl_dlsym(jvm_lib,
- "JNI_CreateJavaVM");
+ free(id_path);
+ bdid_free(&id);
+
+ return 1;
+}
+
+int bdj_jvm_available(void)
+{
+ const char *java_home;
+ void* jvm_lib = _load_jvm(&java_home);
+ if (!jvm_lib) {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "BD-J check: Failed to load JVM library\n");
+ return 0;
+ }
+ dl_dlclose(jvm_lib);
+
+ FILE *fp = fopen(_find_libbluray_jar(), "rb");
+ if (!fp) {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "BD-J check: Failed to load libbluray.jar\n");
+ return 1;
+ }
+ fclose(fp);
+
+ BD_DEBUG(DBG_BDJ, "BD-J check: OK\n");
+
+ return 2;
+}
+
+BDJAVA* bdj_open(const char *path, struct bluray *bd,
+ struct indx_root_s *index,
+ bdj_overlay_cb osd_cb, struct bd_argb_buffer_s *buf)
+{
+ BD_DEBUG(DBG_BDJ, "bdj_open()\n");
+
+ // first load the jvm using dlopen
+ const char *java_home = NULL;
+ void* jvm_lib = _load_jvm(&java_home);
+
+ if (!jvm_lib) {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "Wasn't able to load JVM\n");
+ return NULL;
+ }
+
+ fptr_JNI_CreateJavaVM JNI_CreateJavaVM_fp = (fptr_JNI_CreateJavaVM)(intptr_t)dl_dlsym(jvm_lib, "JNI_CreateJavaVM");
 
 if (JNI_CreateJavaVM_fp == NULL) {
- free(bdjava);
- free(option);
- free(classpath_opt);
+ dl_dlclose(jvm_lib);
 BD_DEBUG(DBG_BDJ | DBG_CRIT, "Couldn't find symbol JNI_CreateJavaVM.\n");
 return NULL;
 }
 
- int result = JNI_CreateJavaVM_fp(&bdjava->jvm, (void**) &bdjava->env, &args);
- free(option);
- free(classpath_opt);
+ BDJAVA* bdjava = calloc(1, sizeof(BDJAVA));
+ bdjava->bd = bd;
+ bdjava->index = index;
+ bdjava->path = path;
+ bdjava->h_libjvm = jvm_lib;
+ bdjava->osd_cb = osd_cb;
+ bdjava->buf = buf;
+
+ JavaVMOption* option = calloc(1, sizeof(JavaVMOption) * 20);
+ int n = 0;
+ JavaVMInitArgs args;
+ option[n++].optionString = str_printf("-Dbluray.vfs.root=%s", path);
+ option[n++].optionString = str_printf("-Ddvb.persistent.root=%s", _bdj_persistent_root());
+ option[n++].optionString = str_printf("-Dbluray.bindingunit.root=%s", _bdj_buda_root());
+
+ option[n++].optionString = str_dup ("-Dawt.toolkit=java.awt.BDToolkit");
+ option[n++].optionString = str_dup ("-Djava.awt.graphicsenv=java.awt.BDGraphicsEnvironment");
+ option[n++].optionString = str_printf("-Xbootclasspath/p:%s", _find_libbluray_jar());
+ option[n++].optionString = str_dup ("-Xms256M");
+ option[n++].optionString = str_dup ("-Xmx256M");
+ option[n++].optionString = str_dup ("-Xss2048k");
+#ifdef HAVE_BDJ_J2ME
+ option[n++].optionString = str_printf("-Djava.home=%s", java_home);
+ option[n++].optionString = str_printf("-Xbootclasspath/a:%s/lib/xmlparser.jar", java_home);
+ option[n++].optionString = str_dup ("-XfullShutdown");
+#endif
 
- if (result != JNI_OK || !bdjava->env) {
- free(bdjava);
- BD_DEBUG(DBG_BDJ | DBG_CRIT, "Failed to create new Java VM.\n");
- return NULL;
+ /* JVM debug options */
+ if (getenv("BDJ_JVM_DEBUG")) {
+ option[n++].optionString = str_dup("-ea");
+ //option[n++].optionString = str_dup("-verbose");
+ //option[n++].optionString = str_dup("-verbose:class,gc,jni");
+ option[n++].optionString = str_dup("-Xdebug");
+ option[n++].optionString = str_dup("-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n");
 }
 
- // determine path of bdjo file to load
- char* bdjo_path = str_printf("%s%s/%s.bdjo", path, BDJ_BDJO_PATH, start);
- jobject bdjo = bdjo_read(bdjava->env, bdjo_path);
- free(bdjo_path);
+#ifdef HAVE_BDJ_J2ME
+ /*
+ see: http://docs.oracle.com/javame/config/cdc/cdc-opt-impl/ojmeec/1.0/runtime/html/cvm.htm#CACBHBJB
+ trace method execution: BDJ_JVM_TRACE=0x0002
+ trace exceptions: BDJ_JVM_TRACE=0x4000
+ */
+ if (getenv("BDJ_JVM_TRACE")) {
+ option[n++].optionString = str_printf("-Xtrace:%s", getenv("BDJ_JVM_TRACE"));
+ }
+#endif
+
+ args.version = JNI_VERSION_1_4;
+ args.nOptions = n;
+ args.options = option;
+ args.ignoreUnrecognized = JNI_FALSE; // don't ignore unrecognized options
+
+ JNIEnv* env = NULL;
+ int result = JNI_CreateJavaVM_fp(&bdjava->jvm, (void**) &env, &args);
 
- if (!bdjo) {
- free(bdjava);
- BD_DEBUG(DBG_BDJ | DBG_CRIT, "Failed to load BDJO file.\n");
+// while (n) {
+// X_FREE(option[--n].optionString);
+// }
+
+ X_FREE(option);
+
+ if (result != JNI_OK || !env) {
+ bdj_close(bdjava);
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "Failed to create new Java VM.\n");
 return NULL;
 }
 
- if (start_xlet(bdjava->env, path, bdjo, bdjava) == BDJ_ERROR) {
- free(bdjava);
- BD_DEBUG(DBG_BDJ | DBG_CRIT, "Failed to start BDJ program.\n");
+ if (!_bdj_init(bdjava, env)) {
+ bdj_close(bdjava);
 return NULL;
 }
 
+ /* detach java main thread (CreateJavaVM attachs calling thread to JVM) */
+ (*bdjava->jvm)->DetachCurrentThread(bdjava->jvm);
+
 return bdjava;
 }
 
-void bdj_close(BDJAVA *bdjava)
+int bdj_start(BDJAVA *bdjava, unsigned title)
 {
- JNIEnv* env = bdjava->env;
- JavaVM* jvm = bdjava->jvm;
+ JNIEnv* env;
+ int attach = 0;
+ jboolean status = JNI_FALSE;
+ jclass loader_class;
+ jmethodID load_id;
 
- jclass init_class = (*env)->FindClass(env, "org/videolan/BDJLoader");
- jmethodID shutdown_id = (*env)->GetStaticMethodID(env, init_class,
- "Shutdown", "()V");
- (*env)->CallStaticVoidMethod(env, init_class, shutdown_id);
+ if (!bdjava) {
+ return BDJ_ERROR;
+ }
 
- (*jvm)->DestroyJavaVM(jvm);
+ BD_DEBUG(DBG_BDJ, "bdj_start(%d)\n", title);
 
- free(bdjava);
-}
+ if ((*bdjava->jvm)->GetEnv(bdjava->jvm, (void**)&env, JNI_VERSION_1_4) != JNI_OK) {
+ (*bdjava->jvm)->AttachCurrentThread(bdjava->jvm, (void**)&env, NULL);
+ attach = 1;
+ }
 
-void bdj_send_event(BDJAVA *bdjava, int type, int keyCode)
-{
-	JNIEnv* env = bdjava->env;
+ if (bdj_get_method(env, &loader_class, &load_id,
+ "org/videolan/BDJLoader", "load", "(I)Z")) {
+ status = (*env)->CallStaticBooleanMethod(env, loader_class, load_id, (jint)title);
+
+ if ((*env)->ExceptionOccurred(env)) {
+ (*env)->ExceptionDescribe(env);
+ (*env)->ExceptionClear(env);
+ }
+
+ (*env)->DeleteLocalRef(env, loader_class);
+ }
+
+ if (attach) {
+ (*bdjava->jvm)->DetachCurrentThread(bdjava->jvm);
+ }
 
-	jclass init_class = (*env)->FindClass(env, "org/videolan/BDJLoader");
-	jmethodID send_key_event_id = (*env)->GetStaticMethodID(env, init_class,
-	 "SendKeyEvent", "(II)V");
-	(*env)->CallStaticVoidMethod(env, init_class, send_key_event_id, type, keyCode);
+ return (status == JNI_TRUE) ? BDJ_SUCCESS : BDJ_ERROR;
 }
 
-int start_xlet(JNIEnv* env, const char* path, jobject bdjo, BDJAVA* bdjava)
+int bdj_stop(BDJAVA *bdjava)
 {
- jclass init_class = (*env)->FindClass(env, "org/videolan/BDJLoader");
+ JNIEnv *env;
+ int attach = 0;
+ jboolean status = JNI_FALSE;
+ jclass loader_class;
+ jmethodID unload_id;
 
- if (init_class == NULL) {
- (*env)->ExceptionDescribe(env);
+ if (!bdjava) {
 return BDJ_ERROR;
 }
 
- jmethodID load_id = (*env)->GetStaticMethodID(env, init_class, "Load",
- "(Ljava/lang/String;Lorg/videolan/bdjo/Bdjo;J)V");
+ BD_DEBUG(DBG_BDJ, "bdj_stop()\n");
 
- if (load_id == NULL) {
- (*env)->ExceptionDescribe(env);
- return BDJ_ERROR;
+ if ((*bdjava->jvm)->GetEnv(bdjava->jvm, (void**)&env, JNI_VERSION_1_4) != JNI_OK) {
+ (*bdjava->jvm)->AttachCurrentThread(bdjava->jvm, (void**)&env, NULL);
+ attach = 1;
 }
 
- jstring param_base_dir = (*env)->NewStringUTF(env, path);
- jlong param_bdjava_ptr = (jlong) bdjava;
+ if (bdj_get_method(env, &loader_class, &unload_id,
+ "org/videolan/BDJLoader", "unload", "()Z")) {
+ status = (*env)->CallStaticBooleanMethod(env, loader_class, unload_id);
+
+ if ((*env)->ExceptionOccurred(env)) {
+ (*env)->ExceptionDescribe(env);
+ (*env)->ExceptionClear(env);
+ }
 
- (*env)->CallStaticVoidMethod(env, init_class, load_id, param_base_dir, bdjo,
- param_bdjava_ptr);
+ (*env)->DeleteLocalRef(env, loader_class);
+ }
 
- return BDJ_SUCCESS;
+ if (attach) {
+ (*bdjava->jvm)->DetachCurrentThread(bdjava->jvm);
+ }
+
+ return (status == JNI_TRUE) ? BDJ_SUCCESS : BDJ_ERROR;
 }
 
-void* load_jvm()
+void bdj_close(BDJAVA *bdjava)
 {
- const char* java_home = getenv("JAVA_HOME"); // FIXME: should probably search multiple directories
- if (java_home == NULL) {
- BD_DEBUG(DBG_BDJ | DBG_CRIT, "JAVA_HOME not set, can't find Java VM.\n");
- return NULL;
+ JNIEnv *env;
+ int attach = 0;
+ jclass shutdown_class;
+ jmethodID shutdown_id;
+
+ if (!bdjava) {
+ return;
 }
 
-#ifdef WIN32
- char* path = str_printf("%s/jre/bin/server/jvm", java_home);
-#else	//	#ifdef WIN32
- char* path = str_printf("%s/jre/lib/%s/server/libjvm", java_home, JAVA_ARCH);
-#endif	//	#ifdef WIN32
+ BD_DEBUG(DBG_BDJ, "bdj_close()\n");
+
+ if (bdjava->jvm) {
+ if ((*bdjava->jvm)->GetEnv(bdjava->jvm, (void**)&env, JNI_VERSION_1_4) != JNI_OK) {
+ (*bdjava->jvm)->AttachCurrentThread(bdjava->jvm, (void**)&env, NULL);
+ attach = 1;
+ }
+
+ if (bdj_get_method(env, &shutdown_class, &shutdown_id,
+ "org/videolan/Libbluray", "shutdown", "()V")) {
+ (*env)->CallStaticVoidMethod(env, shutdown_class, shutdown_id);
+
+ if ((*env)->ExceptionOccurred(env)) {
+ (*env)->ExceptionDescribe(env);
+ (*env)->ExceptionClear(env);
+ }
+
+ (*env)->DeleteLocalRef(env, shutdown_class);
+ }
+
+ if (attach) {
+ (*bdjava->jvm)->DetachCurrentThread(bdjava->jvm);
+ }
+
+ (*bdjava->jvm)->DestroyJavaVM(bdjava->jvm);
+ }
+
+ if (bdjava->h_libjvm) {
+ dl_dlclose(bdjava->h_libjvm);
+ }
+
+ X_FREE(bdjava);
+}
+
+int bdj_process_event(BDJAVA *bdjava, unsigned ev, unsigned param)
+{
+ static const char * const ev_name[] = {
+ "NONE",
+ "CHAPTER",
+ "PLAYITEM",
+ "ANGLE",
+ "SUBTITLE",
+ "PIP",
+ "END_OF_PLAYLIST",
+ "PTS",
+ "VK_KEY",
+ "MARK",
+ "PSR102",
+ };
+
+ JNIEnv* env;
+ int attach = 0;
+ jclass event_class;
+ jmethodID event_id;
+ int result = -1;
+
+ if (!bdjava) {
+ return -1;
+ }
+
+ BD_DEBUG(DBG_BDJ, "bdj_process_event(%s,%d)\n", ev_name[ev], param);
+
+ if ((*bdjava->jvm)->GetEnv(bdjava->jvm, (void**)&env, JNI_VERSION_1_4) != JNI_OK) {
+ (*bdjava->jvm)->AttachCurrentThread(bdjava->jvm, (void**)&env, NULL);
+ attach = 1;
+ }
+
+ if (bdj_get_method(env, &event_class, &event_id,
+ "org/videolan/Libbluray", "processEvent", "(II)Z")) {
+ if ((*env)->CallStaticBooleanMethod(env, event_class, event_id, ev, param)) {
+ result = 0;
+ }
+
+ if ((*env)->ExceptionOccurred(env)) {
+ (*env)->ExceptionDescribe(env);
+ (*env)->ExceptionClear(env);
+ }
+
+ (*env)->DeleteLocalRef(env, event_class);
+ }
+
+ if (attach) {
+ (*bdjava->jvm)->DetachCurrentThread(bdjava->jvm);
+ }
+
+ return result;
+}
+
+int bdj_get_uo_mask(BDJAVA *bdjava)
+{
+ if (!bdjava) {
+ return 0;
+ }
 
- return dl_dlopen(path, NULL);
+ return bdjava->uo_mask;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/bdj.h -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/bdj.h Changed

@@ -22,11 +22,44 @@
 
 #include "common.h"
 
+#include <util/attributes.h>
+
+typedef enum {
+ BDJ_EVENT_NONE = 0,
+ BDJ_EVENT_CHAPTER,
+ BDJ_EVENT_PLAYITEM,
+ BDJ_EVENT_ANGLE,
+ BDJ_EVENT_SUBTITLE,
+ BDJ_EVENT_PIP,
+ BDJ_EVENT_END_OF_PLAYLIST,
+ BDJ_EVENT_PTS,
+ BDJ_EVENT_VK_KEY,
+ BDJ_EVENT_MARK,
+ BDJ_EVENT_PSR102,
+} BDJ_EVENT;
+
+/* bdj_get_uo_mask() */
+#define BDJ_MENU_CALL_MASK 0x01
+#define BDJ_TITLE_SEARCH_MASK 0x02
+
 typedef struct bdjava_s BDJAVA;
 
-BDJAVA* bdj_open(const char *path, const char *start, void* bd, void* registers);
-void bdj_close(BDJAVA *bdjava);
+struct bluray;
+struct indx_root_s;
+struct bd_argb_buffer_s;
+
+typedef void (*bdj_overlay_cb)(struct bluray *, const unsigned *, int, int,
+ int, int, int, int);
+
+BD_PRIVATE BDJAVA* bdj_open(const char *path, struct bluray *bd,
+ struct indx_root_s *index,
+ bdj_overlay_cb osd_cb, struct bd_argb_buffer_s *buf);
+BD_PRIVATE int bdj_start(BDJAVA *bdjava, unsigned title);
+BD_PRIVATE int bdj_stop(BDJAVA *bdjava);
+BD_PRIVATE void bdj_close(BDJAVA *bdjava);
+BD_PRIVATE int bdj_process_event(BDJAVA *bdjava, unsigned ev, unsigned param);
+BD_PRIVATE int bdj_get_uo_mask(BDJAVA *bdjava);
 
-void bdj_send_event(BDJAVA *bdjava, int type, int keyCode);
+BD_PRIVATE int bdj_jvm_available(void); /* 0: no. 1: only jvm. 2: jvm + libbluray.jar. */
 
 #endif

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/bdj_private.h -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/bdj_private.h Changed

@@ -1,17 +1,46 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2010 William Hahne
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef BDJ_PRIVATE_H_
 #define BDJ_PRIVATE_H_
 
-#include "libbluray/register.h"
 #include "libbluray/bluray.h"
+#include "libbluray/bdnav/index_parse.h"
+#include "libbluray/decoders/overlay.h"
 #include <jni.h>
 
 struct bdjava_s {
- BD_REGISTERS* reg;
- BLURAY* bd;
+ BLURAY *bd;
+ INDX_ROOT *index;
+
+ bdj_overlay_cb osd_cb;
+ BD_ARGB_BUFFER *buf;
+
+ // JVM library
+ void *h_libjvm;
 
 // JNI
 JavaVM* jvm;
- JNIEnv* env;
+
+ const char *path;
+
+ unsigned uo_mask; /* UO masks from bdjo */
 };
 
 #endif

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/bdj_util.c -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/bdj_util.c Changed

@@ -1,3 +1,22 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2010 William Hahne
+ * Copyright (C) 2012 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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.s
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
 
 #include "util/logging.h"
 
@@ -27,3 +46,61 @@
 return (*env)->NewObjectArray(env, count, arr_class, NULL);
 }
 
+int bdj_get_method(JNIEnv *env, jclass *cls, jmethodID *method_id,
+ const char *class_name, const char *method_name, const char *method_sig)
+{
+ *method_id = NULL;
+ *cls = (*env)->FindClass(env, class_name);
+ if (!*cls) {
+ (*env)->ExceptionDescribe(env);
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "Failed to locate class %s\n", class_name);
+ (*env)->ExceptionClear(env);
+ return 0;
+ }
+
+ *method_id = (*env)->GetStaticMethodID(env, *cls, method_name, method_sig);
+ if (!*method_id) {
+ (*env)->ExceptionDescribe(env);
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "Failed to locate class %s method %s %s\n",
+ class_name, method_name, method_sig);
+ (*env)->DeleteLocalRef(env, *cls);
+ *cls = NULL;
+ (*env)->ExceptionClear(env);
+ return 0;
+ }
+
+ return 1;
+}
+
+int bdj_register_methods(JNIEnv *env, const char *class_name,
+ const JNINativeMethod *methods, int methods_count)
+{
+ jclass cls;
+ int error;
+
+ (*env)->ExceptionClear(env);
+
+ cls = (*env)->FindClass(env, class_name);
+
+ if (!cls) {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "Failed to locate class %s\n", class_name);
+ (*env)->ExceptionDescribe(env);
+ (*env)->ExceptionClear(env);
+ return 0;
+ }
+
+ error = (*env)->RegisterNatives(env, cls, methods, methods_count);
+
+ if ((*env)->ExceptionOccurred(env)) {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "Failed to register native methods for class %s\n", class_name);
+ (*env)->ExceptionDescribe(env);
+ (*env)->ExceptionClear(env);
+ return 0;
+ }
+
+ if (error) {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "Failed to register native methods for class %s\n", class_name);
+ }
+
+ return !error;
+}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/bdj_util.h -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/bdj_util.h Changed

@@ -20,13 +20,23 @@
 #ifndef JNIUTIL_H_
 #define JNIUTIL_H_
 
+#include <util/attributes.h>
+
 #include <jni.h>
 #include <stdarg.h>
 
 // makes an object from the specified class name and constructor signature
-jobject bdj_make_object(JNIEnv* env, const char* name, const char* sig, ...);
+BD_PRIVATE jobject bdj_make_object(JNIEnv* env, const char* name, const char* sig, ...);
 
 // makes an array for the specified class name, all elements are initialized to null
-jobjectArray bdj_make_array(JNIEnv* env, const char* name, int count);
+BD_PRIVATE jobjectArray bdj_make_array(JNIEnv* env, const char* name, int count);
+
+// get java method
+BD_PRIVATE int bdj_get_method(JNIEnv *env, jclass *cls, jmethodID *method_id,
+ const char *class_name, const char *method_name, const char *method_sig);
+
+// register native methods for class
+BD_PRIVATE int bdj_register_methods(JNIEnv *env, const char *class_name,
+ const JNINativeMethod *methods, int methods_count);
 
 #endif

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/bdjo_parser.c -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/bdjo_parser.c Changed

@@ -26,8 +26,11 @@
 
 #include "file/file.h"
 #include "util/bits.h"
+#include "util/macro.h"
 #include "bdj_util.h"
 
+#define MAX_BDJO_FILE_SIZE 0xffff
+
 /* Documentation: HD Cookbook
 * https://hdcookbook.dev.java.net/
 */
@@ -235,7 +238,7 @@
 // seek back to beginning of names
 bb_seek(buf, -name_data_length*8, SEEK_CUR);
 
- app_names = bdj_make_array(env, "org/videolan/bdjo/AppName", app_name_count);
+ app_names = bdj_make_array(env, "[Ljava/lang/String;", app_name_count);
 JNICHK(app_names);
 
 for (int j = 0; j < app_name_count; j++) {
@@ -248,11 +251,15 @@
 jstring jname = _read_jstring(env, buf, name_length);
 JNICHK(jname);
 
- jobject app_name = bdj_make_object(env, "org/videolan/bdjo/AppName",
- "(Ljava/lang/String;Ljava/lang/String;)V", jlanguage, jname);
+ jobjectArray app_name = bdj_make_array(env, "java/lang/String", 2);
 JNICHK(app_name);
 
- (*env)->SetObjectArrayElement(env, app_names, i, app_name);
+ (*env)->SetObjectArrayElement(env, app_name, 0, jlanguage);
+ JNICHK(1);
+ (*env)->SetObjectArrayElement(env, app_name, 1, jname);
+ JNICHK(1);
+
+ (*env)->SetObjectArrayElement(env, app_names, j, app_name);
 JNICHK(1);
 }
 }
@@ -324,7 +331,7 @@
 jstring param = _read_jstring(env, buf, param_length);
 JNICHK(param);
 
- (*env)->SetObjectArrayElement(env, params, i, param);
+ (*env)->SetObjectArrayElement(env, params, j, param);
 JNICHK(1);
 }
 }
@@ -335,7 +342,7 @@
 }
 
 jobject entry = bdj_make_object(env, "org/videolan/bdjo/AppEntry",
- "(IIIS[Lorg/videolan/bdjo/AppProfile;SII[Lorg/videolan/bdjo/AppName;Ljava/lang/String;SLjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V",
+ "(IIIS[Lorg/videolan/bdjo/AppProfile;SII[[Ljava/lang/String;Ljava/lang/String;SLjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V",
 control_code, type, organization_id, application_id, profiles,
 priority, binding, visibility, app_names, icon_locator,
 icon_flags, base_dir, classpath_extension, initial_class, params);
@@ -403,24 +410,22 @@
 return NULL;
 }
 
- file_seek(handle, 0, SEEK_END);
- int64_t length = file_tell(handle);
+ int64_t length = file_size(handle);
 
- if (length <= 0) {
+ if (length <= 0 || length > MAX_BDJO_FILE_SIZE) {
 BD_DEBUG(DBG_BDJ | DBG_CRIT, "Error reading %s\n", file);
 
 } else {
- file_seek(handle, 0, SEEK_SET);
-
- uint8_t *data = malloc(length);
- int64_t size_read = file_read(handle, data, length);
+ size_t size = (size_t)length;
+ uint8_t *data = malloc(size);
+ size_t size_read = file_read(handle, data, size);
 
- if (size_read < length) {
+ if (size_read != size) {
 BD_DEBUG(DBG_BDJ | DBG_CRIT, "Error reading %s\n", file);
 
 } else {
 BITBUFFER *buf = malloc(sizeof(BITBUFFER));
- bb_init(buf, data, length);
+ bb_init(buf, data, size);
 
 result = _parse_bdjo(env, buf);

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/build.xml -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/build.xml Changed

@@ -1,11 +1,13 @@
 <project name="BDJ" default="dist" basedir=".">
 <description>
- Build file for the java portion of libBDJ
+ Build file for the java portion of libbluray
 </description>
 
 <property name="src" location="java"/>
 <property name="build" location="build"/>
 <property name="dist" location="../../.libs"/>
+ <property name="src_awt" value=""/>
+ <property name="bootclasspath" value=""/>
 
 <target name="init">
 <tstamp/>
@@ -15,9 +17,10 @@
 
 <target name="compile" depends="init"
 description="compile the source " >
- <javac srcdir="${src}" destdir="${build}" debug="yes" />
+ <javac srcdir="${src}${src_awt}" destdir="${build}" debug="yes"
+ bootclasspath="${bootclasspath}"
+ source="1.4" target="1.4" />
 </target>
-
 <target name="dist" depends="compile"
 description="generate the distribution" >
 <jar jarfile="${dist}/libbluray.jar" basedir="${build}" />

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/common.h -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/common.h Changed

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2me Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2me/java Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2me/java/awt Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2me/java/awt/BDGraphics.java Added

@@ -0,0 +1,689 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+import java.lang.reflect.Field;
+import java.text.AttributedCharacterIterator;
+import java.util.Arrays;
+import java.awt.image.AreaAveragingScaleFilter;
+import java.awt.image.BufferedImage;
+import java.awt.image.ImageConsumer;
+import java.awt.image.ImageObserver;
+
+import org.dvb.ui.DVBBufferedImage;
+
+import sun.awt.ConstrainableGraphics;
+
+import org.videolan.Logger;
+
+class BDGraphics extends Graphics2D implements ConstrainableGraphics {
+ private static final Color DEFAULT_COLOR = Color.BLACK;
+ private static final Font DEFAULT_FONT = new Font("Dialog", Font.PLAIN, 12);
+
+ private int width;
+ private int height;
+ private int[] backBuffer;
+ private Area dirty;
+ private GraphicsConfiguration gc;
+ private Color foreground;
+ private Color background;
+ private Font font;
+ private BDFontMetrics fontMetrics;
+ private AlphaComposite composite;
+
+ /** The current xor color. If null then we are in paint mode. */
+ private Color xorColor;
+
+ /** Translated X, Y offset from native offset. */
+ private int originX;
+ private int originY;
+
+ /** The actual clip rectangle that is intersection of user clip and constrained rectangle. */
+ private Rectangle actualClip;
+
+ /** The current user clip rectangle or null if no clip has been set. This is stored in the
+ native coordinate system and not the (possibly) translated Java coordinate system. */
+ private Rectangle clip;
+
+ /** The rectangle this graphics object has been constrained too. This is stored in the
+ native coordinate system and not the (possibly) translated Java coordinate system.
+ If it is null then this graphics has not been constrained. The constrained rectangle
+ is another layer of clipping independant of the user clip. */
+ private Rectangle constrainedRect;
+
+ BDGraphics(BDGraphics g) {
+ backBuffer = g.backBuffer;
+ dirty = g.dirty;
+ width = g.width;
+ height = g.height;
+ gc = g.gc;
+ foreground = g.foreground;
+ background = g.background;
+ composite = g.composite;
+ font = g.font;
+ fontMetrics = g.fontMetrics;
+ originX = g.originX;
+ originY = g.originY;
+ actualClip = g.clip;
+ clip = g.clip;
+ constrainedRect = g.constrainedRect;
+ }
+
+ BDGraphics(BDRootWindow window) {
+ width = window.getWidth();
+ height = window.getHeight();
+ backBuffer = window.getBdBackBuffer();
+ dirty = window.getDirtyArea();
+ gc = window.getGraphicsConfiguration();
+ foreground = window.getForeground();
+ background = window.getBackground();
+ font = window.getFont();
+ if (foreground == null)
+ foreground = DEFAULT_COLOR;
+ if (background == null)
+ background = DEFAULT_COLOR;
+ if (font == null)
+ font = DEFAULT_FONT;
+ fontMetrics = BDFontMetrics.getFontMetrics(font);
+ composite = AlphaComposite.SrcOver;
+ setupClip();
+ }
+
+ BDGraphics(BDImage image) {
+ width = image.getWidth();
+ height = image.getHeight();
+ backBuffer = image.getBdBackBuffer();
+ dirty = image.getDirtyArea();
+ gc = image.getGraphicsConfiguration();
+ Component component = image.getComponent();
+ if (component != null) {
+ foreground = component.getForeground();
+ background = component.getBackground();
+ font = component.getFont();
+ }
+ if (foreground == null)
+ foreground = DEFAULT_COLOR;
+ if (background == null)
+ background = new Color(0, 0, 0, 0);
+ if (font == null)
+ font = DEFAULT_FONT;
+ fontMetrics = BDFontMetrics.getFontMetrics(font);
+ composite = AlphaComposite.SrcOver;
+ setupClip();
+ }
+
+ public Graphics create() {
+ return new BDGraphics(this);
+ }
+
+ public void translate(int x, int y) {
+ originX += x;
+ originY += y;
+ }
+
+ public void setFont(Font font) {
+ if (font != null && !font.equals(this.font)) {
+ this.font = font;
+ fontMetrics = BDFontMetrics.getFontMetrics(font);
+ }
+ }
+
+ public Font getFont() {
+ return font;
+ }
+
+ public FontMetrics getFontMetrics() {
+ return fontMetrics;
+ }
+
+ public FontMetrics getFontMetrics(Font font) {
+ return BDFontMetrics.getFontMetrics(font);
+ }
+
+ public void setColor(Color c) {
+ if ((c != null) && (c != foreground))
+ foreground = c;
+ }
+
+ public Color getColor() {
+ return foreground;
+ }
+
+ public Composite getComposite() {
+ return composite;
+ }
+
+ public GraphicsConfiguration getDeviceConfiguration() {
+ return gc;
+ }
+
+ public void setComposite(Composite comp) {
+ if ((comp != null) && (comp != composite)) {
+ if (!(comp instanceof AlphaComposite))
+ throw new IllegalArgumentException("Only AlphaComposite is supported");
+ composite = (AlphaComposite) comp;
+ }
+ }
+
+ public void setPaintMode() {
+ xorColor = null;
+ }
+
+ public void setXORMode(Color color) {
+ xorColor = color;
+ }
+
+ /** Gets the current clipping area. */
+ public Rectangle getClipBounds() {
+ if (clip != null)
+ return new Rectangle (clip.x - originX, clip.y - originY, clip.width, clip.height);
+ return null;
+ }
+
+ public void constrain(int x, int y, int w, int h) {
+ Rectangle rect;
+ if (constrainedRect != null)
+ rect = constrainedRect;
+ else
+ rect = new Rectangle(0, 0, width, height);
+ constrainedRect = rect.intersection(new Rectangle(rect.x + x, rect.y + y, w, h));
+ originX = constrainedRect.x;
+ originY = constrainedRect.y;
+ setupClip();
+ }
+
+ /** Returns a Shape object representing the clip. */
+ public Shape getClip() {
+ return getClipBounds();
+ }
+
+ /** Crops the clipping rectangle. */
+ public void clipRect(int x, int y, int w, int h) {
+ Rectangle rect = new Rectangle(x + originX, y + originY, w, h);
+ if (clip != null)
+ clip = clip.intersection(rect);
+ else
+ clip = rect;
+ setupClip();
+ }
+
+ /** Sets the clipping rectangle. */
+ public void setClip(int x, int y, int w, int h) {
+ clip = new Rectangle (x + originX, y + originY, w, h);
+ setupClip();
+ }
+
+ /** Sets the clip to a Shape (only Rectangle allowed). */
+ public void setClip(Shape clip) {
+ if (clip == null) {
+ this.clip = null;
+ setupClip();
+ } else if (clip instanceof Rectangle) {
+ Rectangle rect = (Rectangle) clip;
+ setClip(rect.x, rect.y, rect.width, rect.height);
+ } else
+ throw new IllegalArgumentException("setClip(Shape) only supports Rectangle objects");
+ }
+
+ private void setupClip() {
+ Rectangle rect;
+ if (constrainedRect != null)
+ rect = constrainedRect;
+ else
+ rect = new Rectangle(0, 0, width, height);
+ if (clip != null)
+ actualClip = clip.intersection(rect);
+ else
+ actualClip = rect;
+ }
+
+ private int alphaBlend(int dest, int src) {
+ int As = src >>> 24;
+ if (As == 0)
+ return dest;
+ if (As == 255)
+ return src;
+ int Ad = (dest >>> 24);
+ if (Ad == 0)
+ return src;
+ int R, G, B;
+ R = ((src >>> 16) & 255) * As * 255;
+ G = ((src >>> 8) & 255) * As * 255;
+ B = (src & 255) * As * 255;
+ Ad = Ad * (255 - As);
+ As = As * 255 + Ad;
+ R = (R + ((dest >>> 16) & 255) * Ad) / As;
+ G = (G + ((dest >>> 8) & 255) * Ad) / As;
+ B = (B + (dest & 255) * Ad) / As;
+ R = Math.min(255, R);
+ G = Math.min(255, G);
+ B = Math.min(255, B);
+ Ad = As / 255;
+ Ad = Math.min(255, Ad);
+ return (Ad << 24) | (R << 16) | (G << 8) | B;
+ }
+
+ private void drawPointN(int x, int y, int rgb) {
+
+ dirty.add(x, y);
+
+ if (xorColor != null) {
+ backBuffer[y * width + x] ^= xorColor.getRGB() ^ rgb;
+ return;
+ }
+ int rule;
+ if (composite != null) {
+ rule = composite.getRule();
+ rgb = ((int)((rgb >>> 24) * composite.getAlpha()) << 24) | (rgb & 0x00FFFFFF);
+ } else {
+ rule = AlphaComposite.SRC_OVER;
+ }
+ switch (rule) {
+ case AlphaComposite.CLEAR:
+ backBuffer[y * width + x] = 0;
+ break;
+ case AlphaComposite.SRC:
+ backBuffer[y * width + x] = rgb;
+ break;
+ case AlphaComposite.SRC_OVER:
+ backBuffer[y * width + x] = alphaBlend(backBuffer[y * width + x], rgb);
+ break;
+ }
+ }
+
+ private void drawGlyph(int[] rgbArray, int x0, int y0, int w, int h) {
+ for (int y = 0; y < h; y++)
+ for (int x = 0; x < w; x++)
+ drawPoint(x + x0, y + y0, rgbArray[y * w + x]);
+ }
+
+ private void drawPoint(int x, int y, int rgb) {
+ x += originX;
+ y += originY;
+ if (actualClip.contains(x, y))
+ drawPointN(x, y, rgb);
+ }
+
+ public void clearRect(int x, int y, int w, int h) {
+ x += originX;
+ y += originY;
+ Rectangle rect = new Rectangle(x, y, w, h);
+ rect = actualClip.intersection(rect);
+ x = rect.x;
+ y = rect.y;
+ w = rect.width;
+ h = rect.height;
+ int rgb = background.getRGB();
+ for (int i = 0; i < h; i++)
+ Arrays.fill(backBuffer, (y + i) * width + x, (y + i) * width + x + w, rgb);
+
+ dirty.add(rect);
+ }
+
+ public void fillRect(int x, int y, int w, int h) {
+ x += originX;
+ y += originY;
+ Rectangle rect = new Rectangle(x, y, w, h);
+ rect = actualClip.intersection(rect);
+ x = rect.x;
+ y = rect.y;
+ w = rect.width;
+ h = rect.height;
+ int rgb = foreground.getRGB();
+ for (int Y = y; Y < (y + h); Y++)
+ for (int X = x; X < (x + w); X++)
+ drawPointN(X, Y, rgb);
+ }
+
+ public void drawRect(int x, int y, int w, int h) {
+ drawLineN(x, y, x + w, y);
+ drawLineN(x, y + h, x + w, y + h);
+ drawLineN(x, y, x, y + h);
+ drawLineN(x + w, y, x + w, y + h);
+ }
+
+ public void drawLineN(int x1, int y1, int x2, int y2) {
+ int rgb = foreground.getRGB();
+ int dy = y2 - y1;
+ int dx = x2 - x1;
+ int stepx, stepy;
+ int fraction;
+ if (dy < 0) {
+ dy = -dy;
+ stepy = -1;
+ } else {
+ stepy = 1;
+ }
+ if (dx < 0) {
+ dx = -dx;
+ stepx = -1;
+ } else {
+ stepx = 1;
+ }
+ dy <<= 1;
+ dx <<= 1;
+
+ drawPointN(x1, y1, rgb);
+
+ if (dx > dy) {
+ fraction = dy - (dx >> 1);
+ while (x1 != x2) {
+ if (fraction >= 0) {
+ y1 += stepy;
+ fraction -= dx;
+ }
+ x1 += stepx;
+ fraction += dy;
+ drawPointN(x1, y1, rgb);
+ }
+ } else {
+ fraction = dx - (dy >> 1);
+ while (y1 != y2) {
+ if (fraction >= 0) {
+ x1 += stepx;
+ fraction -= dy;
+ }
+ y1 += stepy;
+ fraction += dx;
+ drawPointN(x1, y1, rgb);
+ }
+ }
+ }
+
+ public void drawLine(int x1, int y1, int x2, int y2) {
+ drawLineN(x1, y1, x2, y2);
+ }
+
+ /**
+ * Copies an area of the canvas that this graphics context paints to.
+ * @param X the x-coordinate of the source.
+ * @param Y the y-coordinate of the source.
+ * @param W the width.
+ * @param H the height.
+ * @param dx the horizontal distance to copy the pixels.
+ * @param dy the vertical distance to copy the pixels.
+ */
+ public void copyArea(int X, int Y, int W, int H, int dx, int dy) {
+ X += originX;
+ Y += originY;
+ logger.unimplemented("copyArea");
+ }
+
+ /** Draws lines defined by an array of x points and y points */
+ public void drawPolyline(int xPoints[], int yPoints[], int nPoints) {
+ if (nPoints == 1) {
+ drawPointN(xPoints[0], yPoints[0], foreground.getRGB());
+ } else {
+ for (int i = 0; i < (nPoints - 1); i++)
+ drawLineN(xPoints[i], xPoints[i], xPoints[i + 1], xPoints[i + 1]);
+ }
+ }
+
+ /** Draws a polygon defined by an array of x points and y points */
+ public void drawPolygon(int xPoints[], int yPoints[], int nPoints) {
+ if (nPoints == 1) {
+ drawPointN(xPoints[0], yPoints[0], foreground.getRGB());
+ } else {
+ for (int i = 0; i < (nPoints - 1); i++)
+ drawLineN(xPoints[i], xPoints[i], xPoints[i + 1], xPoints[i + 1]);
+ if (nPoints > 2)
+ drawLineN(xPoints[0], xPoints[0], xPoints[nPoints - 1], xPoints[nPoints - 1]);
+ }
+ }
+
+ /** Fills a polygon with the current fill mask */
+ public void fillPolygon(int xPoints[], int yPoints[], int nPoints) {
+ logger.unimplemented("fillPolygon");
+ }
+
+ /** Draws an oval to fit in the given rectangle */
+ public void drawOval(int x, int y, int w, int h) {
+ logger.unimplemented("drawOval");
+ }
+
+ /** Fills an oval to fit in the given rectangle */
+ public void fillOval(int x, int y, int w, int h) {
+ logger.unimplemented("fillOval");
+ }
+
+ /**
+ * Draws an arc bounded by the given rectangle from startAngle to
+ * endAngle. 0 degrees is a vertical line straight up from the
+ * center of the rectangle. Positive start angle indicate clockwise
+ * rotations, negative angle are counter-clockwise.
+ */
+ public void drawArc(int x, int y, int w, int h, int startAngle, int endAngle) {
+ logger.unimplemented("drawArc");
+ }
+
+ /** fills an arc. arguments are the same as drawArc. */
+ public void fillArc(int x, int y, int w, int h, int startAngle, int endAngle) {
+ logger.unimplemented("fillArc");
+ }
+
+ /** Draws a rounded rectangle. */
+ public void drawRoundRect(int x, int y, int w, int h, int arcWidth, int arcHeight) {
+ logger.unimplemented("drawRoundRect");
+ }
+
+ /** Draws a filled rounded rectangle. */
+ public void fillRoundRect(int x, int y, int w, int h, int arcWidth, int arcHeight) {
+ logger.unimplemented("fillRoundRect");
+ }
+
+ protected native void drawStringN(long ftFace, String string, int x, int y, int rgb);
+
+ /** Draws the given string. */
+ public void drawString(String string, int x, int y) {
+ drawStringN(fontMetrics.ftFace, string, x, y, foreground.getRGB());
+ }
+
+ /** Draws the given character array. */
+ public void drawChars(char chars[], int offset, int length, int x, int y) {
+ drawStringN(fontMetrics.ftFace, new String(chars, offset, length), x, y, foreground.getRGB());
+ }
+
+ public void drawString(AttributedCharacterIterator arg0, int arg1, int arg2) {
+ logger.unimplemented("drawString");
+ }
+
+ /**
+ * Draws an image at x,y in nonblocking mode with a callback object.
+ */
+ public boolean drawImage(Image img, int x, int y, ImageObserver observer) {
+ return drawImage(img, x, y, null, observer);
+ }
+
+ /**
+ * Draws an image at x,y in nonblocking mode with a solid background
+ * color and a callback object.
+ */
+ public boolean drawImage(Image img, int x, int y, Color bg,
+ ImageObserver observer) {
+ return drawImageN(img, x, y, -1, -1, 0, 0, -1, -1, bg, observer);
+ }
+
+ /**
+ * Draws an image scaled to x,y,w,h in nonblocking mode with a
+ * callback object.
+ */
+ public boolean drawImage(Image img, int x, int y, int w, int h,
+ ImageObserver observer) {
+ return drawImage(img, x, y, w, h, null, observer);
+ }
+
+ /**
+ * Draws an image scaled to x,y,w,h in nonblocking mode with a
+ * solid background color and a callback object.
+ */
+ public boolean drawImage(Image img, int x, int y, int w, int h,
+ Color bg, ImageObserver observer) {
+ return drawImageN(img, x, y, w, h, 0, 0, -1, -1, bg, observer);
+ }
+
+ /**
+ * Draws a subrectangle of an image scaled to a destination rectangle
+ * in nonblocking mode with a callback object.
+ */
+ public boolean drawImage(Image img,
+ int dx1, int dy1, int dx2, int dy2,
+ int sx1, int sy1, int sx2, int sy2,
+ ImageObserver observer) {
+ return drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, null, observer);
+ }
+
+ /**
+ * Draws a subrectangle of an image scaled to a destination rectangle in
+ * nonblocking mode with a solid background color and a callback object.
+ */
+ public boolean drawImage(Image img,
+ int dx1, int dy1, int dx2, int dy2,
+ int sx1, int sy1, int sx2, int sy2,
+ Color bg, ImageObserver observer) {
+ if ((dx1 >= dx2) || (dy1 >= dy2))
+ return false;
+ return drawImageN(img, dx1, dy1, dx2 - dx1, dy2 - dy1,
+ sx1, sy1, sx2 - sx1, sy2 - sy1, bg, observer);
+ }
+
+ /**
+ * Draws a subrectangle of an image scaled to a destination rectangle in
+ * nonblocking mode with a solid background color and a callback object.
+ */
+ protected boolean drawImageN(Image img,
+ int dx, int dy, int dw, int dh,
+ int sx, int sy, int sw, int sh,
+ Color bg, ImageObserver observer) {
+ if ((sx < 0) || (sy < 0) ||
+ (sw == 0) || (sh == 0) || (dw == 0) || (dh == 0))
+ return false;
+
+ BDImage bdImage;
+ if (img instanceof BDImage) {
+ bdImage = (BDImage)img;
+ } else if (img instanceof DVBBufferedImage) {
+ bdImage = (BDImage)getBufferedImagePeer(
+ (BufferedImage)(((DVBBufferedImage)img).getImage()));
+ } else if (img instanceof BufferedImage) {
+ bdImage = (BDImage)getBufferedImagePeer((BufferedImage)img);
+ } else {
+ logger.unimplemented("drawImageN: unsupported image type " + img.getClass().getName());
+ return false;
+ }
+
+ if (bdImage instanceof BDImageConsumer) {
+ BDImageConsumer consumer = (BDImageConsumer)bdImage;
+ if (!consumer.isComplete(observer)) {
+ return false;
+ }
+ }
+
+ if(sx + sw > bdImage.width) {
+ int n = sx + sw - bdImage.width;
+ dw -= dw * n / sw;
+ sw -= n;
+ }
+
+ if(sy + sh > bdImage.height) {
+ int n = sy + sh - bdImage.height;
+ dh -= dh * n / sh;
+ sh -= n;
+ }
+
+ if ((sw > 0) && (sh > 0) &&
+ ((sx != 0) || (sy != 0) || (sw != bdImage.width) || (sh != bdImage.height))) {
+ BDImage subImage = new BDImage(null, sw, sh, null);
+ bdImage.getRGB(sx, sy, sw, sh, subImage.getBdBackBuffer(), 0, sw);
+ bdImage = subImage;
+ }
+ if ((dw > 0) && (dh > 0) &&
+ ((dw != bdImage.width) || (dh != bdImage.height))) {
+ BDImageConsumer scaledImage = new BDImageConsumer(null);
+ AreaAveragingScaleFilter scaleFilter =
+ new AreaAveragingScaleFilter(dw, dh);
+ scaleFilter = (AreaAveragingScaleFilter)scaleFilter.getFilterInstance(scaledImage);
+ scaleFilter.setDimensions(bdImage.width, bdImage.height);
+ scaleFilter.setPixels(0, 0, bdImage.width, bdImage.height,
+ bdImage.getColorModel(), bdImage.getBdBackBuffer(),
+ 0, bdImage.width);
+ scaleFilter.imageComplete(ImageConsumer.STATICIMAGEDONE);
+ bdImage = scaledImage;
+ }
+ int[] rgbArray = bdImage.getBdBackBuffer();
+ int bgColor;
+ if (bg != null)
+ bgColor = bg.getRGB();
+ else
+ bgColor = 0;
+ // TODO: optimize this
+ for (int y = dy; y < (dy + bdImage.height); y++)
+ for (int x = dx; x < (dx + bdImage.width); x++) {
+ if (bg != null)
+ drawPoint(x, y, bgColor);
+ drawPoint(x, y, rgbArray[(y - dy) * bdImage.width + (x - dx)]);
+ }
+ return true;
+ }
+
+ public Stroke getStroke() {
+ logger.unimplemented("getStroke");
+ throw new Error();
+ }
+
+ public void setStroke(Stroke stroke) {
+ logger.unimplemented("setStroke");
+ }
+
+ public void dispose() {
+ }
+
+ public String toString() {
+ return getClass().getName() + "[" + originX + "," + originY + "]";
+ }
+
+ private static Image getBufferedImagePeer(BufferedImage image) {
+ try {
+ return (Image)bufferedImagePeer.get(image);
+ } catch (IllegalArgumentException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ private static Field bufferedImagePeer;
+
+ static {
+ try {
+ Class c = Class.forName("java.awt.image.BufferedImage");
+ bufferedImagePeer = c.getDeclaredField("peer");
+ bufferedImagePeer.setAccessible(true);
+ } catch (ClassNotFoundException e) {
+ throw new AWTError("java.awt.image.BufferedImage not found");
+ } catch (SecurityException e) {
+ throw new AWTError("java.awt.image.BufferedImage.peer not accessible");
+ } catch (NoSuchFieldException e) {
+ throw new AWTError("java.awt.image.BufferedImage.peer not found");
+ }
+ }
+
+ private static final Logger logger = Logger.getLogger(BDGraphics.class.getName());
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2me/java/awt/BDGraphicsConfiguration.java Added

@@ -0,0 +1,64 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 Libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+import java.awt.color.ColorSpace;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.DirectColorModel;
+import java.awt.image.VolatileImage;
+
+class BDGraphicsConfiguration extends GraphicsConfiguration {
+ private BDGraphicsDevice device;
+
+ BDGraphicsConfiguration(BDGraphicsDevice device) {
+ this.device = device;
+ }
+
+ public GraphicsDevice getDevice() {
+ return device;
+ }
+
+ public Rectangle getBounds() {
+ return device.getBounds();
+ }
+
+ int getCompatibleImageType() {
+ return BufferedImage.TYPE_INT_ARGB;
+ }
+
+ public synchronized ColorModel getColorModel() {
+ return new DirectColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+ 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, true,
+ DataBuffer.TYPE_INT);
+ }
+
+ public BufferedImage createCompatibleImage(int width, int height) {
+ if (width <= 0 || height <= 0)
+ return null;
+ return BDImage.getBuffededImage(width, height, this);
+ }
+
+ public VolatileImage createCompatibleVolatileImage(int width, int height) {
+ org.videolan.Logger.unimplemented("BDGraphicsConfiguration", "createCompatibleVolatileImage");
+ return null;
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2me/java/awt/BDGraphicsDevice.java Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2me/java/awt/BDImage.java Added

@@ -0,0 +1,28 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+import sun.awt.image.BufferedImagePeer;
+
+public class BDImage extends BDImageBase implements BufferedImagePeer {
+ BDImage(Component component, int width, int height, GraphicsConfiguration gc) {
+ super(component, width, height, gc);
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2me/java/awt/BDToolkit.java Added

@@ -0,0 +1,244 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+import java.awt.image.ColorModel;
+import java.awt.image.ImageObserver;
+import java.awt.image.ImageProducer;
+import java.io.File;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Hashtable;
+import java.util.WeakHashMap;
+import java.util.Map;
+import java.util.Iterator;
+
+import sun.awt.NullGraphics;
+import sun.awt.image.ByteArrayImageSource;
+import sun.awt.image.FileImageSource;
+import sun.awt.image.URLImageSource;
+
+import org.videolan.BDJXletContext;
+import org.videolan.Logger;
+
+public class BDToolkit extends Toolkit {
+ private EventQueue eventQueue = new EventQueue();
+ private BDGraphicsEnvironment localEnv = new BDGraphicsEnvironment();
+ private BDGraphicsConfiguration defaultGC = (BDGraphicsConfiguration)localEnv.getDefaultScreenDevice().getDefaultConfiguration();
+ private static Hashtable cachedImages = new Hashtable();
+ private static final Logger logger = Logger.getLogger(BDToolkit.class.getName());
+
+ public BDToolkit () {}
+
+ public static void setFocusedWindow(Window window) {
+ /* nothing to do */
+ }
+
+ public static void shutdown() {
+ Toolkit toolkit = getDefaultToolkit();
+ if (toolkit instanceof BDToolkit) {
+ ((BDToolkit)toolkit).dispose();
+ }
+ }
+
+ public void dispose() {
+ if (eventQueue != null) {
+ BDJHelper.stopEventQueue(eventQueue);
+ eventQueue = null;
+ }
+ cachedImages = null;
+ }
+
+ public Dimension getScreenSize() {
+ Rectangle dims = defaultGC.getBounds();
+ return new Dimension(dims.width, dims.height);
+ }
+
+ Graphics getGraphics(Window window) {
+ if (!(window instanceof BDRootWindow))
+ return new NullGraphics(window);
+ return new BDWindowGraphics((BDRootWindow)window);
+ }
+
+ GraphicsEnvironment getLocalGraphicsEnvironment() {
+ return localEnv;
+ }
+
+ public int getScreenResolution() {
+ return 72;
+ }
+
+ public ColorModel getColorModel() {
+ return defaultGC.getColorModel();
+ }
+
+ public String[] getFontList() {
+ return BDFontMetrics.getFontList();
+ }
+
+ public FontMetrics getFontMetrics(Font font) {
+ return BDFontMetrics.getFontMetrics(font);
+ }
+
+ public void sync() {
+ Window window = ((BDGraphicsDevice)localEnv.getDefaultScreenDevice()).getWindow();
+ if (window instanceof BDRootWindow)
+ ((BDRootWindow)window).sync();
+ }
+
+ static void clearCache(BDImage image) {
+ synchronized (cachedImages) {
+ Iterator i = cachedImages.entrySet().iterator();
+ while (i.hasNext()) {
+ Map.Entry entry = (Map.Entry) i.next();
+ if (entry.getValue() == image) {
+ i.remove();
+ return;
+ }
+ }
+ }
+ }
+
+ public Image getImage(String filename) {
+ if (cachedImages.containsKey(filename))
+ return (Image)cachedImages.get(filename);
+ Image newImage = createImage(filename);
+ if (newImage != null)
+ cachedImages.put(filename, newImage);
+ return newImage;
+ }
+
+ public Image getImage(URL url) {
+ if (cachedImages.containsKey(url))
+ return (Image)cachedImages.get(url);
+ Image newImage = createImage(url);
+ if (newImage != null)
+ cachedImages.put(url, newImage);
+ return newImage;
+ }
+
+ public Image createImage(String filename) {
+ if (!new File(filename).exists()) {
+ BDJXletContext ctx = BDJXletContext.getCurrentContext();
+ if (ctx != null) {
+ ClassLoader cldr = (ClassLoader)ctx.getClassLoader();
+ URL url = cldr.getResource(filename);
+ if (url != null) {
+ logger.warning("" + filename + " translated to " + url);
+ return createImage(url);
+ } else {
+ logger.error("ClassLoader failed to translate " + filename);
+ }
+ } else {
+ logger.error("createImage(" + filename + "): no XletContext available!\n" + logger.dumpStack());
+ }
+ }
+
+ ImageProducer ip = new FileImageSource(filename);
+ Image newImage = createImage(ip);
+ return newImage;
+ }
+
+ public Image createImage(URL url) {
+ ImageProducer ip = new URLImageSource(url);
+ Image newImage = createImage(ip);
+ return newImage;
+ }
+
+ public Image createImage(byte[] imagedata,
+ int imageoffset,
+ int imagelength) {
+ ImageProducer ip = new ByteArrayImageSource(imagedata, imageoffset, imagelength);
+ Image newImage = createImage(ip);
+ return newImage;
+ }
+
+ public Image createImage(ImageProducer producer) {
+ return new BDImageConsumer(producer);
+ }
+
+ public Image createImage(Component component, int width, int height) {
+ return new BDImage(component, width, height, defaultGC);
+ }
+
+ public boolean prepareImage(Image image, int width, int height, ImageObserver observer) {
+ if (!(image instanceof BDImageConsumer))
+ return true;
+ BDImageConsumer img = (BDImageConsumer)image;
+ return img.prepareImage(observer);
+ }
+
+ public int checkImage(Image image, int width, int height,
+ ImageObserver observer) {
+ if (!(image instanceof BDImageConsumer)) {
+ return ImageObserver.ALLBITS;
+ }
+ BDImageConsumer img = (BDImageConsumer)image;
+ return img.checkImage(observer);
+ }
+
+ public void beep() {
+ }
+
+ // mapping of Components to AppContexts, WeakHashMap<Component,AppContext>
+ private static final Map contextMap =
+ Collections.synchronizedMap(new WeakHashMap());
+
+ public static void addComponent(Component component) {
+
+ BDJXletContext context = BDJXletContext.getCurrentContext();
+ if (context == null) {
+ logger.warning("addComponent() outside of app context");
+ return;
+ }
+ contextMap.put(component, context);
+ }
+
+ public static EventQueue getEventQueue(Component component) {
+ if (component != null) {
+ do {
+ BDJXletContext ctx = (BDJXletContext)contextMap.get(component);
+ if (ctx != null) {
+ EventQueue eq = ctx.getEventQueue();
+ if (eq == null) {
+ logger.warning("getEventQueue() failed: no context event queue");
+ }
+ return eq;
+ }
+
+ component = component.getParent();
+ } while (component != null);
+
+ logger.warning("getEventQueue() failed: no context");
+ }
+ return null;
+ }
+
+ protected EventQueue getSystemEventQueueImpl() {
+ BDJXletContext ctx = BDJXletContext.getCurrentContext();
+ if (ctx != null) {
+ EventQueue eq = ctx.getEventQueue();
+ if (eq != null) {
+ return eq;
+ }
+ }
+ return eventQueue;
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2me/org Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2me/org/dvb Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2me/org/dvb/ui Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2me/org/dvb/ui/DVBGraphicsImpl.java Added

@@ -0,0 +1,359 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.dvb.ui;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
+import java.awt.Image;
+import java.awt.Polygon;
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.Stroke;
+import java.awt.image.ImageObserver;
+import java.text.AttributedCharacterIterator;
+
+public class DVBGraphicsImpl extends DVBGraphics {
+ protected DVBGraphicsImpl(Graphics2D gfx)
+ {
+ super(gfx);
+ }
+
+ /*
+ * Graphics methods
+ */
+ public void clearRect(int x, int y, int width, int height)
+ {
+ gfx.clearRect(x, y, width, height);
+ }
+
+ public void clipRect(int x, int y, int width, int height)
+ {
+ gfx.clipRect(x, y, width, height);
+ }
+
+ public void copyArea(int x, int y, int width, int height, int dx, int dy)
+ {
+ gfx.copyArea(x, y, width, height, dx, dy);
+ }
+
+ public Graphics create()
+ {
+ return gfx.create();
+ }
+
+ public Graphics create(int x, int y, int width, int height)
+ {
+ return gfx.create(x, y, width, height);
+ }
+
+ public void dispose()
+ {
+ gfx.dispose();
+ }
+
+ public void draw3DRect(int x, int y, int width, int height, boolean raised)
+ {
+ gfx.draw3DRect(x, y, width, height, raised);
+ }
+
+ public void drawArc(int x, int y, int width, int height, int startAngle,
+ int arcAngle)
+ {
+ gfx.drawArc(x, y, width, height, startAngle, arcAngle);
+ }
+
+ public void drawBytes(byte[] data, int offset, int length, int x, int y)
+ {
+ gfx.drawBytes(data, offset, length, x, y);
+ }
+
+ public void drawChars(char[] data, int offset, int length, int x, int y)
+ {
+ gfx.drawChars(data, offset, length, x, y);
+ }
+
+ public boolean drawImage(Image img, int x, int y, Color bgcolor,
+ ImageObserver observer)
+ {
+ return gfx.drawImage(img, x, y, bgcolor, observer);
+ }
+
+ public boolean drawImage(Image img, int x, int y, ImageObserver observer)
+ {
+ return gfx.drawImage(img, x, y, observer);
+ }
+
+ public boolean drawImage(Image img, int x, int y, int width, int height,
+ Color bgcolor, ImageObserver observer)
+ {
+ return gfx.drawImage(img, x, y, width, height, bgcolor, observer);
+ }
+
+ public boolean drawImage(Image img, int x, int y, int width, int height,
+ ImageObserver observer)
+ {
+ return gfx.drawImage(img, x, y, width, height, observer);
+ }
+
+ public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2,
+ int sx1, int sy1, int sx2, int sy2, Color bgcolor,
+ ImageObserver observer)
+ {
+ return gfx.drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2,
+ bgcolor, observer);
+ }
+
+ public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2,
+ int sx1, int sy1, int sx2, int sy2, ImageObserver observer)
+ {
+ return gfx.drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2,
+ observer);
+ }
+
+ public void drawLine(int x1, int y1, int x2, int y2)
+ {
+ gfx.drawLine(x1, y1, x2, y2);
+ }
+
+ public void drawOval(int x, int y, int width, int height)
+ {
+ gfx.drawOval(x, y, width, height);
+ }
+
+ public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints)
+ {
+ gfx.drawPolygon(xPoints, yPoints, nPoints);
+ }
+
+ public void drawPolygon(Polygon p)
+ {
+ gfx.drawPolygon(p);
+ }
+
+ public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints)
+ {
+ gfx.drawPolyline(xPoints, yPoints, nPoints);
+ }
+
+ public void drawRect(int x, int y, int width, int height)
+ {
+ gfx.drawRect(x, y, width, height);
+ }
+
+ public void drawRoundRect(int x, int y, int width, int height,
+ int arcWidth, int arcHeight)
+ {
+ gfx.drawRoundRect(x, y, width, height, arcWidth, arcHeight);
+ }
+
+ public void drawString(AttributedCharacterIterator iterator, int x, int y)
+ {
+ gfx.drawString(iterator, x, y);
+ }
+
+ public void drawString(String str, int x, int y)
+ {
+ gfx.drawString(str, x, y);
+ }
+
+ public void fill3DRect(int x, int y, int width, int height, boolean raised)
+ {
+ gfx.fill3DRect(x, y, width, height, raised);
+ }
+
+ public void fillArc(int x, int y, int width, int height, int startAngle,
+ int arcAngle)
+ {
+ gfx.fillArc(x, y, width, height, startAngle, arcAngle);
+ }
+
+ public void fillOval(int x, int y, int width, int height)
+ {
+ gfx.fillOval(x, y, width, height);
+ }
+
+ public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints)
+ {
+ gfx.fillPolygon(xPoints, yPoints, nPoints);
+ }
+
+ public void fillPolygon(Polygon p)
+ {
+ gfx.fillPolygon(p);
+ }
+
+ public void fillRect(int x, int y, int width, int height)
+ {
+ gfx.fillRect(x, y, width, height);
+ }
+
+ public void fillRoundRect(int x, int y, int width, int height,
+ int arcWidth, int arcHeight)
+ {
+ gfx.fillRoundRect(x, y, width, height, arcWidth, arcHeight);
+ }
+
+ public void finalize()
+ {
+ gfx.finalize();
+ }
+
+ public Shape getClip()
+ {
+ return gfx.getClip();
+ }
+
+ public Rectangle getClipBounds()
+ {
+ return gfx.getClipBounds();
+ }
+
+ public Rectangle getClipBounds(Rectangle r)
+ {
+ return gfx.getClipBounds(r);
+ }
+
+ public Color getColor()
+ {
+ return gfx.getColor();
+ }
+
+ public Font getFont()
+ {
+ return gfx.getFont();
+ }
+
+ public FontMetrics getFontMetrics()
+ {
+ return gfx.getFontMetrics();
+ }
+
+ public FontMetrics getFontMetrics(Font f)
+ {
+ return gfx.getFontMetrics(f);
+ }
+
+ public boolean hitClip(int x, int y, int width, int height)
+ {
+ return gfx.hitClip(x, y, width, height);
+ }
+
+ public void setClip(int x, int y, int width, int height)
+ {
+ gfx.setClip(x, y, width, height);
+ }
+
+ public void setClip(Shape clip)
+ {
+ gfx.setClip(clip);
+ }
+
+ public void setColor(Color c)
+ {
+ gfx.setColor(c);
+ }
+
+ public void setFont(Font font)
+ {
+ gfx.setFont(font);
+ }
+
+ public void setPaintMode()
+ {
+ gfx.setPaintMode();
+ }
+
+ public void setXORMode(Color c1)
+ {
+ gfx.setXORMode(c1);
+ }
+
+ public void translate(int x, int y)
+ {
+ gfx.translate(x, y);
+ }
+
+ /*
+ * DVBGraphics methods
+ */
+ public int[] getAvailableCompositeRules()
+ {
+ int[] rules = {
+ DVBAlphaComposite.CLEAR,
+ DVBAlphaComposite.SRC,
+ DVBAlphaComposite.SRC_OVER };
+
+ return rules;
+ }
+
+ public DVBAlphaComposite getDVBComposite()
+ {
+ Composite comp = gfx.getComposite();
+ if (!(comp instanceof AlphaComposite))
+ return null;
+ return DVBAlphaComposite.getInstance(
+ ((AlphaComposite)comp).getRule(),
+ ((AlphaComposite)comp).getAlpha());
+ }
+
+ public void setDVBComposite(DVBAlphaComposite comp)
+ throws UnsupportedDrawingOperationException
+ {
+ if ((comp.getRule() < DVBAlphaComposite.CLEAR) ||
+ (comp.getRule() > DVBAlphaComposite.SRC_OVER))
+ throw new UnsupportedDrawingOperationException("Unsupported composition rule");
+
+ gfx.setComposite(AlphaComposite.getInstance(comp.getRule(), comp.getAlpha()));
+ }
+
+ /*
+ * Graphics2D methods
+ */
+ public Composite getComposite()
+ {
+ return gfx.getComposite();
+ }
+
+ public Stroke getStroke()
+ {
+ return gfx.getStroke();
+ }
+
+ public GraphicsConfiguration getDeviceConfiguration()
+ {
+ return gfx.getDeviceConfiguration();
+ }
+
+ public void setComposite(Composite comp)
+ {
+ gfx.setComposite(comp);
+ }
+
+ public void setStroke(Stroke s)
+ {
+ gfx.setStroke(s);
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2me/org/dvb/ui/FontFactory.java Added

@@ -0,0 +1,111 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2010 William Hahne
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.dvb.ui;
+
+import java.awt.Font;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import java.net.URL;
+import java.net.URLConnection;
+
+import org.videolan.BDJUtil;
+import org.videolan.FontIndex;
+import org.videolan.FontIndexData;
+import org.videolan.Logger;
+
+import sun.net.www.ParseUtil;
+
+public class FontFactory {
+ public static void loadDiscFonts() {
+ unloadDiscFonts();
+
+ fonts = FontIndex.parseIndex(BDJUtil.discRootToFilesystem("/BDMV/AUXDATA/dvb.fontindex"));
+
+ if (fonts != null) {
+ logger.trace("Disc fonts:");
+ for (int i = 0; i < fonts.length; i++)
+ System.err.println(" "+(i+1)+": " + fonts[i].toString());
+ } else {
+ logger.trace("No fonts loaded from disc");
+ }
+ }
+
+ public static void unloadDiscFonts() {
+ if (fonts != null) {
+ fonts = null;
+ }
+ }
+
+ public FontFactory() throws FontFormatException, IOException {
+ if (fonts == null)
+ throw new IOException("There is no font data");
+ }
+
+ public FontFactory(URL u) throws IOException, FontFormatException {
+ String path = u.getPath().replace('/', File.separatorChar);
+ path = ParseUtil.decode(path);
+ if (u.getProtocol().equals("file")) {
+ path = path.replace('/', File.separatorChar);
+ file = new File(path);
+ } else {
+ int index = path.lastIndexOf('/');
+ if (index >= 0)
+ path = path.substring(index + 1);
+ path = System.getProperty("bluray.vfs.root") + File.separator + path;
+
+ URLConnection uc = u.openConnection();
+ InputStream is = uc.getInputStream();
+ FileOutputStream os = null;
+ try {
+ os = new FileOutputStream(path);
+ byte[] buf = new byte[1024];
+ int len;
+ while ((len = is.read(buf)) > 0)
+ os.write(buf, 0, len);
+ file = new File(path);
+ } finally {
+ try {
+ is.close();
+ os.close();
+ } catch (Throwable e) {
+ file = null;
+ }
+ }
+ }
+ if (file == null)
+ throw new IOException();
+ }
+
+ public Font createFont(String name, int style, int size)
+ throws FontNotAvailableException, FontFormatException, IOException {
+ logger.info("Creating font: " + name + " " + style + " " + size);
+
+ return new Font(name, style, size);
+ }
+
+ private File file = null;
+ private static FontIndexData[] fonts = null;
+
+ private static final Logger logger = Logger.getLogger(FontFactory.class.getName());
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2me/org/videolan Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2me/org/videolan/PortingHelper.java Added

@@ -0,0 +1,29 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan;
+
+public class PortingHelper {
+
+ public static void stopThread(Thread t) {
+ }
+
+ public static void stopThreadGroup(ThreadGroup t) {
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/java Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/java/awt Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/java/awt/BDGraphics.java Added

@@ -0,0 +1,794 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+import java.lang.reflect.Field;
+import java.text.AttributedCharacterIterator;
+import java.util.Arrays;
+import java.awt.image.AreaAveragingScaleFilter;
+import java.awt.image.BufferedImage;
+import java.awt.image.ImageConsumer;
+import java.awt.image.ImageObserver;
+import java.awt.font.*;
+import java.awt.image.renderable.RenderableImage;
+import java.awt.image.RenderedImage;
+import java.awt.geom.AffineTransform;
+
+import org.dvb.ui.DVBBufferedImage;
+
+import sun.awt.ConstrainableGraphics;
+
+import org.videolan.Logger;
+
+class BDGraphics extends Graphics2D implements ConstrainableGraphics {
+ private static final Color DEFAULT_COLOR = Color.BLACK;
+ private static final Font DEFAULT_FONT = new Font("Dialog", Font.PLAIN, 12);
+
+ private int width;
+ private int height;
+ private int[] backBuffer;
+ private Area dirty;
+ private GraphicsConfiguration gc;
+ private Color foreground;
+ private Color background;
+ private Paint paint;
+ private Font font;
+ private BDFontMetrics fontMetrics;
+ private AlphaComposite composite;
+
+ /** The current xor color. If null then we are in paint mode. */
+ private Color xorColor;
+
+ /** Translated X, Y offset from native offset. */
+ private int originX;
+ private int originY;
+
+ /** The actual clip rectangle that is intersection of user clip and constrained rectangle. */
+ private Rectangle actualClip;
+
+ /** The current user clip rectangle or null if no clip has been set. This is stored in the
+ native coordinate system and not the (possibly) translated Java coordinate system. */
+ private Rectangle clip;
+
+ /** The rectangle this graphics object has been constrained too. This is stored in the
+ native coordinate system and not the (possibly) translated Java coordinate system.
+ If it is null then this graphics has not been constrained. The constrained rectangle
+ is another layer of clipping independant of the user clip. */
+ private Rectangle constrainedRect;
+
+ BDGraphics(BDGraphics g) {
+ backBuffer = g.backBuffer;
+ dirty = g.dirty;
+ width = g.width;
+ height = g.height;
+ gc = g.gc;
+ foreground = g.foreground;
+ background = g.background;
+ composite = g.composite;
+ font = g.font;
+ fontMetrics = g.fontMetrics;
+ originX = g.originX;
+ originY = g.originY;
+ actualClip = g.actualClip;
+ clip = g.clip;
+ constrainedRect = g.constrainedRect;
+ if (clip == null)
+ setupClip();
+ }
+
+ BDGraphics(BDRootWindow window) {
+ width = window.getWidth();
+ height = window.getHeight();
+ backBuffer = window.getBdBackBuffer();
+ dirty = window.getDirtyArea();
+ gc = window.getGraphicsConfiguration();
+ foreground = window.getForeground();
+ background = window.getBackground();
+ font = window.getFont();
+ if (foreground == null)
+ foreground = DEFAULT_COLOR;
+ if (background == null)
+ background = DEFAULT_COLOR;
+ if (font == null)
+ font = DEFAULT_FONT;
+ fontMetrics = BDFontMetrics.getFontMetrics(font);
+ composite = AlphaComposite.SrcOver;
+ setupClip();
+ }
+
+ public Color getBackground() {
+ return background;
+ }
+ public void setBackground(Color c) {
+ if (c != null) {
+ background = c;
+ }
+ }
+
+ BDGraphics(BDImage image) {
+ width = image.getWidth();
+ height = image.getHeight();
+ backBuffer = image.getBdBackBuffer();
+ dirty = image.getDirtyArea();
+
+ gc = image.getGraphicsConfiguration();
+ Component component = image.getComponent();
+ if (component != null) {
+ foreground = component.getForeground();
+ background = component.getBackground();
+ font = component.getFont();
+ }
+ if (foreground == null)
+ foreground = DEFAULT_COLOR;
+ if (background == null)
+ background = new Color(0, 0, 0, 0);
+ if (font == null)
+ font = DEFAULT_FONT;
+ fontMetrics = BDFontMetrics.getFontMetrics(font);
+ composite = AlphaComposite.SrcOver;
+ setupClip();
+ }
+
+ public Graphics create() {
+ return new BDGraphics(this);
+ }
+
+ public java.awt.font.FontRenderContext getFontRenderContext()
+ {
+ return null;
+ }
+
+ public void translate(int x, int y) {
+ originX += x;
+ originY += y;
+ }
+
+ public void setFont(Font font) {
+ if (font != null && !font.equals(this.font)) {
+ this.font = font;
+ fontMetrics = BDFontMetrics.getFontMetrics(font);
+ }
+ }
+
+ public Font getFont() {
+ return font;
+ }
+
+ public FontMetrics getFontMetrics() {
+ return fontMetrics;
+ }
+
+ public FontMetrics getFontMetrics(Font font) {
+ return BDFontMetrics.getFontMetrics(font);
+ }
+
+ public void setColor(Color c) {
+ if ((c != null) && (c != foreground))
+ foreground = c;
+ }
+
+ public Color getColor() {
+ return foreground;
+ }
+
+ public void setPaint(Paint p) {
+ paint = p;
+ }
+ public Paint getPaint() {
+ return paint;
+ }
+ public void transform(java.awt.geom.AffineTransform t) {
+ logger.unimplemented("transform");
+ }
+ public void setTransform(java.awt.geom.AffineTransform t) {
+ logger.unimplemented("setTransform");
+ }
+ public java.awt.geom.AffineTransform getTransform() {
+ logger.unimplemented("getTransform");
+ throw new Error("Not implemented");
+ }
+ public void shear(double a, double b) {
+ logger.unimplemented("shear");
+ }
+ public void scale(double a, double b) {
+ logger.unimplemented("scale");
+ }
+ public void rotate(double a) {
+ logger.unimplemented("rotate");
+ }
+ public void rotate(double a, double b, double c) {
+ logger.unimplemented("rotate");
+ }
+ public void translate(double a, double b) {
+ logger.unimplemented("translate");
+ }
+ public boolean hit(Rectangle rect, Shape s, boolean onStroke) {
+ logger.unimplemented("hit");
+ return true;
+ }
+ public void fill(Shape s) {
+ logger.unimplemented("fill");
+ }
+ public void draw(java.awt.Shape s) {
+ logger.unimplemented("draw");
+ }
+ public void drawGlyphVector(GlyphVector g, float x, float y) {
+ logger.unimplemented("drawGlyphVector");
+ }
+ public void setRenderingHints(java.util.Map hints) {
+ logger.unimplemented("setRenderingHints");
+ }
+ public void setRenderingHint(RenderingHints.Key hintKey, Object hintValue) {
+ logger.unimplemented("setRenderingHint");
+ }
+ public void addRenderingHints(java.util.Map hints) {
+ logger.unimplemented("addRenderingHints");
+ }
+ public Object getRenderingHint(RenderingHints.Key hintKey) {
+ logger.unimplemented("getRenderingHint");
+ return null;
+ }
+ public RenderingHints getRenderingHints() {
+ logger.unimplemented("getRenderingHints");
+ return null;
+ }
+ public Composite getComposite() {
+ return composite;
+ }
+
+ public GraphicsConfiguration getDeviceConfiguration() {
+ return gc;
+ }
+
+ public void setComposite(Composite comp) {
+ if ((comp != null) && (comp != composite)) {
+ if (!(comp instanceof AlphaComposite))
+ throw new IllegalArgumentException("Only AlphaComposite is supported");
+ composite = (AlphaComposite) comp;
+ }
+ }
+
+ public void setPaintMode() {
+ xorColor = null;
+ composite = AlphaComposite.SrcOver;
+ }
+
+ public void setXORMode(Color color) {
+ xorColor = color;
+ }
+
+ /** Gets the current clipping area. */
+ public Rectangle getClipBounds() {
+ if (clip != null)
+ return new Rectangle (clip.x - originX, clip.y - originY, clip.width, clip.height);
+ return null;
+ }
+
+ public void constrain(int x, int y, int w, int h) {
+ Rectangle rect;
+ if (constrainedRect != null)
+ rect = constrainedRect;
+ else
+ rect = new Rectangle(0, 0, width, height);
+ constrainedRect = rect.intersection(new Rectangle(rect.x + x, rect.y + y, w, h));
+ originX = constrainedRect.x;
+ originY = constrainedRect.y;
+ setupClip();
+ }
+
+ /** Returns a Shape object representing the clip. */
+ public Shape getClip() {
+ return getClipBounds();
+ }
+
+ /** Crops the clipping rectangle. */
+ public void clipRect(int x, int y, int w, int h) {
+ Rectangle rect = new Rectangle(x + originX, y + originY, w, h);
+ if (clip != null)
+ clip = clip.intersection(rect);
+ else
+ clip = rect;
+ setupClip();
+ }
+
+ /** Sets the clipping rectangle. */
+ public void setClip(int x, int y, int w, int h) {
+ clip = new Rectangle (x + originX, y + originY, w, h);
+ setupClip();
+ }
+
+ public void clip(Shape s) {
+ setClip(s);
+ }
+
+ /** Sets the clip to a Shape (only Rectangle allowed). */
+ public void setClip(Shape clip) {
+ if (clip == null) {
+ this.clip = null;
+ setupClip();
+ } else if (clip instanceof Rectangle) {
+ Rectangle rect = (Rectangle) clip;
+ setClip(rect.x, rect.y, rect.width, rect.height);
+ } else
+ throw new IllegalArgumentException("setClip(Shape) only supports Rectangle objects");
+ }
+
+ private void setupClip() {
+ Rectangle rect;
+ if (constrainedRect != null)
+ rect = constrainedRect;
+ else
+ rect = new Rectangle(0, 0, width, height);
+ if (clip != null)
+ actualClip = clip.intersection(rect);
+ else
+ actualClip = rect;
+ }
+
+ private int alphaBlend(int dest, int src) {
+ int As = src >>> 24;
+ if (As == 0)
+ return dest;
+ if (As == 255)
+ return src;
+ int Ad = (dest >>> 24);
+ if (Ad == 0)
+ return src;
+ int R, G, B;
+ R = ((src >>> 16) & 255) * As * 255;
+ G = ((src >>> 8) & 255) * As * 255;
+ B = (src & 255) * As * 255;
+ Ad = Ad * (255 - As);
+ As = As * 255 + Ad;
+ R = (R + ((dest >>> 16) & 255) * Ad) / As;
+ G = (G + ((dest >>> 8) & 255) * Ad) / As;
+ B = (B + (dest & 255) * Ad) / As;
+ R = Math.min(255, R);
+ G = Math.min(255, G);
+ B = Math.min(255, B);
+ Ad = As / 255;
+ Ad = Math.min(255, Ad);
+ return (Ad << 24) | (R << 16) | (G << 8) | B;
+ }
+
+ private void drawPointN(int x, int y, int rgb) {
+
+ dirty.add(x, y);
+
+ if (xorColor != null) {
+ backBuffer[y * width + x] ^= xorColor.getRGB() ^ rgb;
+ return;
+ }
+ int rule;
+ if (composite != null) {
+ rule = composite.getRule();
+ rgb = ((int)((rgb >>> 24) * composite.getAlpha()) << 24) | (rgb & 0x00FFFFFF);
+ } else {
+ rule = AlphaComposite.SRC_OVER;
+ }
+ switch (rule) {
+ case AlphaComposite.CLEAR:
+ backBuffer[y * width + x] = 0;
+ break;
+ case AlphaComposite.SRC:
+ backBuffer[y * width + x] = rgb;
+ break;
+ case AlphaComposite.SRC_OVER:
+ backBuffer[y * width + x] = alphaBlend(backBuffer[y * width + x], rgb);
+ break;
+ }
+ }
+
+ private void drawPoint(int x, int y, int rgb) {
+ x += originX;
+ y += originY;
+ if (actualClip.contains(x, y))
+ drawPointN(x, y, rgb);
+ }
+
+ public void clearRect(int x, int y, int w, int h) {
+ x += originX;
+ y += originY;
+ Rectangle rect = new Rectangle(x, y, w, h);
+ rect = actualClip.intersection(rect);
+ x = rect.x;
+ y = rect.y;
+ w = rect.width;
+ h = rect.height;
+ int rgb = background.getRGB();
+ for (int i = 0; i < h; i++)
+ Arrays.fill(backBuffer, (y + i) * width + x, (y + i) * width + x + w, rgb);
+
+ dirty.add(rect);
+ }
+
+ public void fillRect(int x, int y, int w, int h) {
+ x += originX;
+ y += originY;
+ Rectangle rect = new Rectangle(x, y, w, h);
+ rect = actualClip.intersection(rect);
+ x = rect.x;
+ y = rect.y;
+ w = rect.width;
+ h = rect.height;
+ int rgb = foreground.getRGB();
+ for (int Y = y; Y < (y + h); Y++)
+ for (int X = x; X < (x + w); X++)
+ drawPointN(X, Y, rgb);
+ }
+
+ public void drawRect(int x, int y, int w, int h) {
+ drawLineN(x, y, x + w, y);
+ drawLineN(x, y + h, x + w, y + h);
+ drawLineN(x, y, x, y + h);
+ drawLineN(x + w, y, x + w, y + h);
+ }
+
+ public void drawLineN(int x1, int y1, int x2, int y2) {
+ int rgb = foreground.getRGB();
+ int dy = y2 - y1;
+ int dx = x2 - x1;
+ int stepx, stepy;
+ int fraction;
+ if (dy < 0) {
+ dy = -dy;
+ stepy = -1;
+ } else {
+ stepy = 1;
+ }
+ if (dx < 0) {
+ dx = -dx;
+ stepx = -1;
+ } else {
+ stepx = 1;
+ }
+ dy <<= 1;
+ dx <<= 1;
+
+ drawPointN(x1, y1, rgb);
+
+ if (dx > dy) {
+ fraction = dy - (dx >> 1);
+ while (x1 != x2) {
+ if (fraction >= 0) {
+ y1 += stepy;
+ fraction -= dx;
+ }
+ x1 += stepx;
+ fraction += dy;
+ drawPointN(x1, y1, rgb);
+ }
+ } else {
+ fraction = dx - (dy >> 1);
+ while (y1 != y2) {
+ if (fraction >= 0) {
+ x1 += stepx;
+ fraction -= dy;
+ }
+ y1 += stepy;
+ fraction += dx;
+ drawPointN(x1, y1, rgb);
+ }
+ }
+ }
+
+ public void drawLine(int x1, int y1, int x2, int y2) {
+ drawLineN(x1, y1, x2, y2);
+ }
+
+ /**
+ * Copies an area of the canvas that this graphics context paints to.
+ * @param X the x-coordinate of the source.
+ * @param Y the y-coordinate of the source.
+ * @param W the width.
+ * @param H the height.
+ * @param dx the horizontal distance to copy the pixels.
+ * @param dy the vertical distance to copy the pixels.
+ */
+ public void copyArea(int X, int Y, int W, int H, int dx, int dy) {
+ X += originX;
+ Y += originY;
+ logger.unimplemented("copyArea");
+ }
+
+ /** Draws lines defined by an array of x points and y points */
+ public void drawPolyline(int xPoints[], int yPoints[], int nPoints) {
+ if (nPoints == 1) {
+ drawPointN(xPoints[0], yPoints[0], foreground.getRGB());
+ } else {
+ for (int i = 0; i < (nPoints - 1); i++)
+ drawLineN(xPoints[i], xPoints[i], xPoints[i + 1], xPoints[i + 1]);
+ }
+ }
+
+ /** Draws a polygon defined by an array of x points and y points */
+ public void drawPolygon(int xPoints[], int yPoints[], int nPoints) {
+ if (nPoints == 1) {
+ drawPointN(xPoints[0], yPoints[0], foreground.getRGB());
+ } else {
+ for (int i = 0; i < (nPoints - 1); i++)
+ drawLineN(xPoints[i], xPoints[i], xPoints[i + 1], xPoints[i + 1]);
+ if (nPoints > 2)
+ drawLineN(xPoints[0], xPoints[0], xPoints[nPoints - 1], xPoints[nPoints - 1]);
+ }
+ }
+
+ /** Fills a polygon with the current fill mask */
+ public void fillPolygon(int xPoints[], int yPoints[], int nPoints) {
+ logger.unimplemented("fillPolygon");
+ }
+
+ /** Draws an oval to fit in the given rectangle */
+ public void drawOval(int x, int y, int w, int h) {
+ logger.unimplemented("drawOval");
+ }
+
+ /** Fills an oval to fit in the given rectangle */
+ public void fillOval(int x, int y, int w, int h) {
+ logger.unimplemented("fillOval");
+ }
+
+ /**
+ * Draws an arc bounded by the given rectangle from startAngle to
+ * endAngle. 0 degrees is a vertical line straight up from the
+ * center of the rectangle. Positive start angle indicate clockwise
+ * rotations, negative angle are counter-clockwise.
+ */
+ public void drawArc(int x, int y, int w, int h, int startAngle, int endAngle) {
+ logger.unimplemented("drawArc");
+ }
+
+ /** fills an arc. arguments are the same as drawArc. */
+ public void fillArc(int x, int y, int w, int h, int startAngle, int endAngle) {
+ logger.unimplemented("fillArc");
+ }
+
+ /** Draws a rounded rectangle. */
+ public void drawRoundRect(int x, int y, int w, int h, int arcWidth, int arcHeight) {
+ logger.unimplemented("drawRoundRect");
+ }
+
+ /** Draws a filled rounded rectangle. */
+ public void fillRoundRect(int x, int y, int w, int h, int arcWidth, int arcHeight) {
+ logger.unimplemented("fillRoundRect");
+ }
+
+ protected native void drawStringN(long ftFace, String string, int x, int y, int rgb);
+
+ /** Draws the given string. */
+ public void drawString(String string, int x, int y) {
+ drawStringN(fontMetrics.ftFace, string, x, y, foreground.getRGB());
+ }
+
+ public void drawString(String string, float x, float y) {
+ drawStringN(fontMetrics.ftFace, string, (int)x, (int)y, foreground.getRGB());
+ }
+
+ public void drawRenderableImage(RenderableImage img, AffineTransform xform) {
+ logger.unimplemented("drawRenaerableImage");
+ }
+
+ public void drawRenderedImage(RenderedImage img, AffineTransform xform) {
+ logger.unimplemented("drawRenaeredImage");
+ }
+
+ /** Draws the given character array. */
+ public void drawChars(char chars[], int offset, int length, int x, int y) {
+ drawStringN(fontMetrics.ftFace, new String(chars, offset, length), x, y, foreground.getRGB());
+ }
+
+ public void drawString(AttributedCharacterIterator arg0, int arg1, int arg2) {
+ logger.unimplemented("drawString");
+ }
+
+ public void drawString(AttributedCharacterIterator iterator, float x, float y) {
+ logger.unimplemented("drawString");
+ }
+
+ public void drawImage(java.awt.image.BufferedImage i,java.awt.image.BufferedImageOp o, int x, int y) {
+ logger.unimplemented("drawImage");
+ }
+
+ public boolean drawImage(java.awt.Image i, java.awt.geom.AffineTransform t, java.awt.image.ImageObserver o) {
+ logger.unimplemented("drawImage");
+ return true;
+ }
+
+ /**
+ * Draws an image at x,y in nonblocking mode with a callback object.
+ */
+ public boolean drawImage(Image img, int x, int y, ImageObserver observer) {
+ return drawImage(img, x, y, null, observer);
+ }
+
+ /**
+ * Draws an image at x,y in nonblocking mode with a solid background
+ * color and a callback object.
+ */
+ public boolean drawImage(Image img, int x, int y, Color bg,
+ ImageObserver observer) {
+ return drawImageN(img, x, y, -1, -1, 0, 0, -1, -1, bg, observer);
+ }
+
+ /**
+ * Draws an image scaled to x,y,w,h in nonblocking mode with a
+ * callback object.
+ */
+ public boolean drawImage(Image img, int x, int y, int w, int h,
+ ImageObserver observer) {
+ return drawImage(img, x, y, w, h, null, observer);
+ }
+
+ /**
+ * Draws an image scaled to x,y,w,h in nonblocking mode with a
+ * solid background color and a callback object.
+ */
+ public boolean drawImage(Image img, int x, int y, int w, int h,
+ Color bg, ImageObserver observer) {
+ return drawImageN(img, x, y, w, h, 0, 0, -1, -1, bg, observer);
+ }
+
+ /**
+ * Draws a subrectangle of an image scaled to a destination rectangle
+ * in nonblocking mode with a callback object.
+ */
+ public boolean drawImage(Image img,
+ int dx1, int dy1, int dx2, int dy2,
+ int sx1, int sy1, int sx2, int sy2,
+ ImageObserver observer) {
+ return drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, null, observer);
+ }
+
+ /**
+ * Draws a subrectangle of an image scaled to a destination rectangle in
+ * nonblocking mode with a solid background color and a callback object.
+ */
+ public boolean drawImage(Image img,
+ int dx1, int dy1, int dx2, int dy2,
+ int sx1, int sy1, int sx2, int sy2,
+ Color bg, ImageObserver observer) {
+ if ((dx1 >= dx2) || (dy1 >= dy2))
+ return false;
+ return drawImageN(img, dx1, dy1, dx2 - dx1, dy2 - dy1,
+ sx1, sy1, sx2 - sx1, sy2 - sy1, bg, observer);
+ }
+
+ /**
+ * Draws a subrectangle of an image scaled to a destination rectangle in
+ * nonblocking mode with a solid background color and a callback object.
+ */
+ protected boolean drawImageN(Image img,
+ int dx, int dy, int dw, int dh,
+ int sx, int sy, int sw, int sh,
+ Color bg, ImageObserver observer) {
+ if ((sx < 0) || (sy < 0) ||
+ (sw == 0) || (sh == 0) || (dw == 0) || (dh == 0))
+ return false;
+
+ BDImage bdImage;
+ if (img instanceof BDImage) {
+ bdImage = (BDImage)img;
+ } else if (img instanceof DVBBufferedImage) {
+ bdImage = (BDImage)getBufferedImagePeer(
+ (BufferedImage)(((DVBBufferedImage)img).getImage()));
+ } else if (img instanceof BufferedImage) {
+ bdImage = (BDImage)getBufferedImagePeer((BufferedImage)img);
+ } else {
+ logger.unimplemented("drawImageN: unsupported image type " + img.getClass().getName());
+ return false;
+ }
+ if (bdImage instanceof BDImageConsumer) {
+ BDImageConsumer consumer = (BDImageConsumer)bdImage;
+ if (!consumer.isComplete(observer)) {
+ return false;
+ }
+ }
+
+ if(sx + sw > bdImage.width) {
+ int n = sx + sw - bdImage.width;
+ dw -= dw * n / sw;
+ sw -= n;
+ }
+
+ if(sy + sh > bdImage.height) {
+ int n = sy + sh - bdImage.height;
+ dh -= dh * n / sh;
+ sh -= n;
+ }
+
+ if ((sw > 0) && (sh > 0) &&
+ ((sx != 0) || (sy != 0) || (sw != bdImage.width) || (sh != bdImage.height))) {
+ BDImage subImage = new BDImage(null, sw, sh, null);
+ bdImage.getRGB(sx, sy, sw, sh, subImage.getBdBackBuffer(), 0, sw);
+ bdImage = subImage;
+ }
+ if ((dw > 0) && (dh > 0) &&
+ ((dw != bdImage.width) || (dh != bdImage.height))) {
+ BDImageConsumer scaledImage = new BDImageConsumer(null);
+ AreaAveragingScaleFilter scaleFilter =
+ new AreaAveragingScaleFilter(dw, dh);
+ scaleFilter = (AreaAveragingScaleFilter)scaleFilter.getFilterInstance(scaledImage);
+ scaleFilter.setDimensions(bdImage.width, bdImage.height);
+ scaleFilter.setPixels(0, 0, bdImage.width, bdImage.height,
+ bdImage.getColorModel(), bdImage.getBdBackBuffer(),
+ 0, bdImage.width);
+ scaleFilter.imageComplete(ImageConsumer.STATICIMAGEDONE);
+ bdImage = scaledImage;
+ }
+ int[] rgbArray = bdImage.getBdBackBuffer();
+ int bgColor;
+ if (bg != null)
+ bgColor = bg.getRGB();
+ else
+ bgColor = 0;
+ for (int y = dy; y < (dy + bdImage.height); y++)
+ for (int x = dx; x < (dx + bdImage.width); x++) {
+ if (bg != null)
+ drawPoint(x, y, bgColor);
+ drawPoint(x, y, rgbArray[(y - dy) * bdImage.width + (x - dx)]);
+ }
+ return true;
+ }
+
+ public Stroke getStroke() {
+ logger.unimplemented("getStroke");
+ throw new Error();
+ }
+
+ public void setStroke(Stroke stroke) {
+ logger.unimplemented("setStroke");
+ }
+
+ public void dispose() {
+ }
+
+ public String toString() {
+ return getClass().getName() + "[" + originX + "," + originY + "]";
+ }
+
+ private static Image getBufferedImagePeer(BufferedImage image) {
+ try {
+ return (Image)bufferedImagePeer.get(image);
+ } catch (IllegalArgumentException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ private static Field bufferedImagePeer;
+
+ static {
+ try {
+ Class c = Class.forName("java.awt.image.BufferedImage");
+ bufferedImagePeer = c.getDeclaredField("peer");
+ bufferedImagePeer.setAccessible(true);
+ } catch (ClassNotFoundException e) {
+ throw new AWTError("java.awt.image.BufferedImage not found");
+ } catch (SecurityException e) {
+ throw new AWTError("java.awt.image.BufferedImage.peer not accessible");
+ } catch (NoSuchFieldException e) {
+ throw new AWTError("java.awt.image.BufferedImage.peer not found");
+ }
+ }
+
+ private static final Logger logger = Logger.getLogger(BDGraphics.class.getName());
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/java/awt/BDGraphicsConfiguration.java Added

@@ -0,0 +1,111 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 Libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+import java.awt.color.ColorSpace;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.DirectColorModel;
+import java.awt.image.VolatileImage;
+
+class BDGraphicsConfiguration extends GraphicsConfiguration {
+ private BDGraphicsDevice device;
+
+ BDGraphicsConfiguration(BDGraphicsDevice device) {
+ this.device = device;
+ }
+
+ public GraphicsDevice getDevice() {
+ return device;
+ }
+
+ public Rectangle getBounds() {
+ return device.getBounds();
+ }
+
+ int getCompatibleImageType() {
+ return BufferedImage.TYPE_INT_ARGB;
+ }
+
+ public java.awt.geom.AffineTransform getNormalizingTransform() {
+ org.videolan.Logger.unimplemented("BDGraphicsConfiguration", "getNormalizingTransform");
+ return null;
+ }
+ public java.awt.geom.AffineTransform getDefaultTransform() {
+ org.videolan.Logger.unimplemented("BDGraphicsConfiguration", "getDefaultTransform");
+ return null;
+ }
+ public java.awt.image.ColorModel getColorModel(int transparency) {
+ org.videolan.Logger.unimplemented("BDGraphicsConfiguration", "getColorModel");
+ return null;
+ }
+
+ public synchronized ColorModel getColorModel() {
+ return new DirectColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+ 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, true,
+ DataBuffer.TYPE_INT);
+ }
+
+ public BufferedImage createCompatibleImage(int width, int height, int trans) {
+ org.videolan.Logger.unimplemented("BDGraphicsConfiguration", "createCompatibleImage");
+ return null;
+ }
+
+ public BufferedImage createCompatibleImage(int width, int height) {
+ if (width <= 0 || height <= 0)
+ return null;
+ return BDImage.getBuffededImage(width, height, this);
+ }
+
+ public VolatileImage createCompatibleVolatileImage(int width, int height) {
+ org.videolan.Logger.unimplemented("BDGraphicsConfiguration", "createCompatibleVolatileImage");
+ return null;
+ }
+
+ public VolatileImage createCompatibleVolatileImage(int width, int height, int trans) {
+ org.videolan.Logger.unimplemented("BDGraphicsConfiguration", "createCompatibleVolatileImage");
+ return null;
+ }
+
+ public VolatileImage createCompatibleVolatileImage(int width, int height, ImageCapabilities caps) {
+ org.videolan.Logger.unimplemented("BDGraphicsConfiguration", "createCompatibleVolatileImage");
+ return null;
+ }
+
+ public VolatileImage createCompatibleVolatileImage(int width, int height, ImageCapabilities caps, int trans) {
+ org.videolan.Logger.unimplemented("BDGraphicsConfiguration", "createCompatibleVolatileImage");
+ return null;
+ }
+
+ public BufferCapabilities getBufferCapabilities(){
+ org.videolan.Logger.unimplemented("BDGraphicsConfiguration", "getBufferCapabilities");
+ return super.getBufferCapabilities();
+ }
+ public ImageCapabilities getImageCapabilities(){
+ org.videolan.Logger.unimplemented("BDGraphicsConfiguration", "getImageCapabilities");
+ return super.getImageCapabilities();
+ }
+
+ /* J2SE java 6 */
+ public boolean isTranslucencyCapable() {
+ return true;
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/java/awt/BDGraphicsDevice.java Added

@@ -0,0 +1,33 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+class BDGraphicsDevice extends BDGraphicsDeviceImpl {
+
+ BDGraphicsDevice(BDGraphicsEnvironment environment) {
+ super(environment);
+ }
+
+ /* J2SE java 7 */
+ /*
+ public boolean isWindowTranslucencySupported(GraphicsDevice.WindowTranslucency translucencyKind) {
+ return true;
+ }
+ */
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/java/awt/BDImage.java Added

@@ -0,0 +1,28 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+import sun.awt.image.BufferedImagePeer;
+
+class BDImage extends BDImageBase implements BufferedImagePeer {
+ BDImage(Component component, int width, int height, GraphicsConfiguration gc) {
+ super(component, width, height, gc);
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/java/awt/BDToolkit.java Added

@@ -0,0 +1,355 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ * Copyright (C) 2012 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+import java.awt.image.ColorModel;
+import java.awt.image.ImageObserver;
+import java.awt.image.ImageProducer;
+import java.awt.peer.KeyboardFocusManagerPeer;
+import java.io.File;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Hashtable;
+import java.util.WeakHashMap;
+import java.util.Map;
+import java.util.Iterator;
+
+import sun.awt.image.ByteArrayImageSource;
+import sun.awt.image.FileImageSource;
+import sun.awt.image.URLImageSource;
+import sun.awt.KeyboardFocusManagerPeerProvider;
+
+import java.awt.peer.BDFramePeer;
+import java.awt.peer.BDKeyboardFocusManagerPeer;
+
+import org.videolan.BDJXletContext;
+import org.videolan.Logger;
+
+public class BDToolkit extends Toolkit implements KeyboardFocusManagerPeerProvider {
+ private EventQueue eventQueue = new EventQueue();
+ private BDGraphicsEnvironment localEnv = new BDGraphicsEnvironment();
+ private BDGraphicsConfiguration defaultGC = (BDGraphicsConfiguration)localEnv.getDefaultScreenDevice().getDefaultConfiguration();
+ private static Hashtable cachedImages = new Hashtable();
+ private static final Logger logger = Logger.getLogger(BDToolkit.class.getName());
+
+ public BDToolkit () {
+ }
+
+ public static void shutdown() {
+ Toolkit toolkit = getDefaultToolkit();
+ if (toolkit instanceof BDToolkit) {
+ ((BDToolkit)toolkit).dispose();
+ }
+ }
+
+ public void dispose() {
+ if (eventQueue != null) {
+ BDJHelper.stopEventQueue(eventQueue);
+ eventQueue = null;
+ }
+
+ KeyboardFocusManager.getCurrentKeyboardFocusManager().clearGlobalFocusOwner();
+ KeyboardFocusManager.getCurrentKeyboardFocusManager().setGlobalCurrentFocusCycleRoot(null);
+ KeyboardFocusManager.getCurrentKeyboardFocusManager().setGlobalFocusedWindow(null);
+ KeyboardFocusManager.getCurrentKeyboardFocusManager().setGlobalActiveWindow(null);
+ KeyboardFocusManager.getCurrentKeyboardFocusManager().setGlobalPermanentFocusOwner(null);
+
+ BDKeyboardFocusManagerPeer.shutdown();
+
+ KeyboardFocusManager.setCurrentKeyboardFocusManager(null);
+ }
+
+ public static void setFocusedWindow(Window window) {
+ /* hook KeyboardFocusManagerPeer (not doing this leads to crash) */
+ BDKeyboardFocusManagerPeer.init(window);
+ }
+
+ public KeyboardFocusManagerPeer createKeyboardFocusManagerPeer(KeyboardFocusManager kfm)
+ {
+ return BDKeyboardFocusManagerPeer.getInstance();
+ }
+
+ public Dimension getScreenSize() {
+ Rectangle dims = defaultGC.getBounds();
+ return new Dimension(dims.width, dims.height);
+ }
+
+ Graphics getGraphics(Window window) {
+ if (!(window instanceof BDRootWindow)) {
+ System.err.println("getGraphics(): not BDRootWindow");
+ throw new Error("Not implemented");
+ }
+ return new BDWindowGraphics((BDRootWindow)window);
+ }
+
+ GraphicsEnvironment getLocalGraphicsEnvironment() {
+ return localEnv;
+ }
+
+ public int getScreenResolution() {
+ return 72;
+ }
+
+ public ColorModel getColorModel() {
+ return defaultGC.getColorModel();
+ }
+
+ public String[] getFontList() {
+ return BDFontMetrics.getFontList();
+ }
+
+ public FontMetrics getFontMetrics(Font font) {
+ return BDFontMetrics.getFontMetrics(font);
+ }
+
+ public void sync() {
+ org.videolan.GUIManager.getInstance().sync();
+ }
+
+ static void clearCache(BDImage image) {
+ synchronized (cachedImages) {
+ Iterator i = cachedImages.entrySet().iterator();
+ while (i.hasNext()) {
+ Map.Entry entry = (Map.Entry) i.next();
+ if (entry.getValue() == image) {
+ i.remove();
+ return;
+ }
+ }
+ }
+ }
+
+ public Image getImage(String filename) {
+ if (cachedImages.containsKey(filename))
+ return (Image)cachedImages.get(filename);
+ Image newImage = createImage(filename);
+ if (newImage != null)
+ cachedImages.put(filename, newImage);
+ return newImage;
+ }
+
+ public Image getImage(URL url) {
+ if (cachedImages.containsKey(url))
+ return (Image)cachedImages.get(url);
+ Image newImage = createImage(url);
+ if (newImage != null)
+ cachedImages.put(url, newImage);
+ return newImage;
+ }
+
+ public Image createImage(String filename) {
+ if (!new File(filename).exists()) {
+ BDJXletContext ctx = BDJXletContext.getCurrentContext();
+ if (ctx != null) {
+ ClassLoader cldr = (ClassLoader)ctx.getClassLoader();
+ URL url = cldr.getResource(filename);
+ if (url != null) {
+ logger.warning("" + filename + " translated to " + url);
+ return createImage(url);
+ } else {
+ logger.error("ClassLoader failed to translate " + filename);
+ }
+ } else {
+ logger.error("createImage(" + filename + "): no XletContext available!\n" + logger.dumpStack());
+ }
+ }
+
+ ImageProducer ip = new FileImageSource(filename);
+ Image newImage = createImage(ip);
+ return newImage;
+ }
+
+ public Image createImage(URL url) {
+ ImageProducer ip = new URLImageSource(url);
+ Image newImage = createImage(ip);
+ return newImage;
+ }
+
+ public Image createImage(byte[] imagedata,
+ int imageoffset,
+ int imagelength) {
+ ImageProducer ip = new ByteArrayImageSource(imagedata, imageoffset, imagelength);
+ Image newImage = createImage(ip);
+ return newImage;
+ }
+
+ public Image createImage(ImageProducer producer) {
+ return new BDImageConsumer(producer);
+ }
+
+ public Image createImage(Component component, int width, int height) {
+ return new BDImage(component, width, height, defaultGC);
+ }
+
+ public boolean prepareImage(Image image, int width, int height, ImageObserver observer) {
+ if (!(image instanceof BDImageConsumer))
+ return true;
+ BDImageConsumer img = (BDImageConsumer)image;
+ return img.prepareImage(observer);
+ }
+
+ public int checkImage(Image image, int width, int height,
+ ImageObserver observer) {
+ if (!(image instanceof BDImageConsumer)) {
+ return ImageObserver.ALLBITS;
+ }
+ BDImageConsumer img = (BDImageConsumer)image;
+ return img.checkImage(observer);
+ }
+
+ public void beep() {
+ }
+
+ // mapping of Components to AppContexts, WeakHashMap<Component,AppContext>
+ private static final Map contextMap =
+ Collections.synchronizedMap(new WeakHashMap());
+
+ public static void addComponent(Component component) {
+
+ BDJXletContext context = BDJXletContext.getCurrentContext();
+ if (context == null) {
+ logger.warning("addComponent() outside of app context");
+ return;
+ }
+ contextMap.put(component, context);
+ }
+
+ public static EventQueue getEventQueue(Component component) {
+ if (component != null) {
+ do {
+ BDJXletContext ctx = (BDJXletContext)contextMap.get(component);
+ if (ctx != null) {
+ EventQueue eq = ctx.getEventQueue();
+ if (eq == null) {
+ logger.warning("getEventQueue() failed: no context event queue");
+ }
+ return eq;
+ }
+
+ component = component.getParent();
+ } while (component != null);
+
+ logger.warning("getEventQueue() failed: no context");
+ }
+
+ logger.warning("getEventQueue() failed: no component");
+ return null;
+ }
+
+ protected EventQueue getSystemEventQueueImpl() {
+ BDJXletContext ctx = BDJXletContext.getCurrentContext();
+ if (ctx != null) {
+ EventQueue eq = ctx.getEventQueue();
+ if (eq != null) {
+ return eq;
+ }
+ }
+
+ logger.warning("getSystemEventQueue(): no context");
+ return eventQueue;
+ }
+
+ public Map mapInputMethodHighlight(java.awt.im.InputMethodHighlight h) {
+ throw new Error("Not implemented");
+ }
+ public boolean isModalExclusionTypeSupported(Dialog.ModalExclusionType modalExclusionType) {
+ throw new Error("Not implemented");
+ }
+ public boolean isModalityTypeSupported(Dialog.ModalityType modalityType) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.FramePeer createFrame(Frame target) {
+ return new BDFramePeer(target, (BDRootWindow)target);
+ }
+
+ protected java.awt.peer.ButtonPeer createButton(Button target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.CanvasPeer createCanvas(Canvas target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.CheckboxPeer createCheckbox(Checkbox target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.CheckboxMenuItemPeer createCheckboxMenuItem(CheckboxMenuItem target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.ChoicePeer createChoice(Choice target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.DesktopPeer createDesktopPeer(Desktop target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.DialogPeer createDialog(Dialog target) {
+ throw new Error("Not implemented");
+ }
+ public java.awt.dnd.peer.DragSourceContextPeer createDragSourceContextPeer(java.awt.dnd.DragGestureEvent dge) {
+ throw new Error("Not implemented");
+ }
+ public java.awt.peer.FileDialogPeer createFileDialog(FileDialog target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.LabelPeer createLabel(Label target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.ListPeer createList(List target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.MenuPeer createMenu(Menu target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.MenuBarPeer createMenuBar(MenuBar target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.MenuItemPeer createMenuItem(MenuItem target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.PanelPeer createPanel(Panel target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.PopupMenuPeer createPopupMenu(PopupMenu target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.ScrollbarPeer createScrollbar(Scrollbar target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.ScrollPanePeer createScrollPane(ScrollPane target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.TextAreaPeer createTextArea(TextArea target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.TextFieldPeer createTextField(TextField target) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.WindowPeer createWindow(Window target) {
+ throw new Error("Not implemented");
+ }
+ public java.awt.datatransfer.Clipboard getSystemClipboard() {
+ throw new Error("Not implemented");
+ }
+ public PrintJob getPrintJob(Frame frame, String jobtitle, java.util.Properties props) {
+ throw new Error("Not implemented");
+ }
+ protected java.awt.peer.FontPeer getFontPeer(String name, int style) {
+ throw new Error("Not implemented");
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/java/awt/image Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/java/awt/image/BufferedImage.java Added

@@ -0,0 +1,110 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt.image;
+
+import sun.awt.image.BufferedImagePeer;
+import java.awt.Graphics2D;
+
+public class BufferedImage extends java.awt.Image
+{
+ private transient BufferedImagePeer peer;
+
+ public static final int TYPE_INT_ARGB = 2;
+
+ private BufferedImage (BufferedImagePeer peer) {
+ this.peer = peer;
+ }
+
+ public Graphics2D createGraphics() {
+ return (Graphics2D) peer.getGraphics();
+ }
+
+ public void flush() {
+ peer.flush();
+ }
+
+ public ColorModel getColorModel() {
+ return peer.getColorModel();
+ }
+
+ public java.awt.Graphics getGraphics() {
+ return peer.getGraphics();
+ }
+
+ public int getHeight() {
+ return peer.getHeight();
+ }
+
+ public int getHeight(ImageObserver observer) {
+ return peer.getHeight(observer);
+ }
+
+ public Object getProperty(String name) {
+ return peer.getProperty(name);
+ }
+
+ public Object getProperty(String name, ImageObserver observer) {
+ return peer.getProperty(name, observer);
+ }
+
+ public String[] getPropertyNames() {
+ return peer.getPropertyNames();
+ }
+
+ public int getRGB(int x, int y) {
+ return peer.getRGB(x, y);
+ }
+
+ public int[] getRGB(int startX, int startY, int w, int h, int[] rgbArray, int offset, int scansize) {
+ return peer.getRGB(startX, startY, w, h, rgbArray, offset, scansize);
+ }
+
+ public ImageProducer getSource() {
+ return peer.getSource();
+ }
+
+ public BufferedImage getSubimage(int x, int y, int w, int h) {
+ return peer.getSubimage(x, y, w, h);
+ }
+
+ public int getType() {
+ return peer.getType();
+ }
+
+ public int getWidth() {
+ return peer.getWidth();
+ }
+
+ public int getWidth(ImageObserver observer) {
+ return peer.getWidth(observer);
+ }
+
+ public synchronized void setRGB(int x, int y, int rgb) {
+ peer.setRGB(x, y, rgb);
+ }
+
+ public void setRGB(int startX, int startY, int w, int h, int[] rgbArray, int offset, int scansize) {
+ peer.setRGB(startX, startY, w, h, rgbArray, offset, scansize);
+ }
+
+ public String toString() {
+ return peer.toString();
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/java/awt/peer Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/java/awt/peer/BDComponentPeer.java Added

@@ -0,0 +1,283 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt.peer;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.*;
+
+import org.videolan.Logger;
+
+public abstract class BDComponentPeer implements ComponentPeer
+{
+ public BDComponentPeer(Toolkit toolkit, Component component) {
+ this.toolkit = toolkit;
+ this.component = component;
+ setBounds (component.getX(), component.getY(), component.getWidth(), component.getHeight(), SET_BOUNDS);
+ }
+
+ public void applyShape(sun.java2d.pipe.Region r) {
+ }
+
+ public boolean canDetermineObscurity() {
+ return false;
+ }
+
+ public int checkImage(Image img, int w, int h, ImageObserver o) {
+ return ((BDToolkit)toolkit).checkImage(img, w, h, o);
+ }
+
+ public void coalescePaintEvent(PaintEvent e) {
+ }
+
+ public void createBuffers(int x, BufferCapabilities bufferCapabilities) {
+ logger.unimplemented("createBuffers");
+ }
+
+ public Image createImage(ImageProducer producer) {
+ logger.unimplemented("createImage");
+ return null;
+ }
+
+ public Image createImage(int width, int height) {
+ Component parent = component.getParent();
+ if (parent != null) {
+ return parent.createImage(width, height);
+ }
+ logger.error("createImage(): no parent !");
+ throw new Error();
+ }
+
+ public VolatileImage createVolatileImage(int width, int height) {
+ logger.unimplemented("createVolatileImage");
+ return null;
+ }
+
+ public void destroyBuffers() {
+ }
+
+ /* java 6 only */
+ public void disable() {
+ setEnabled(false);
+ }
+
+ public void dispose() {
+ component = null;
+ toolkit = null;
+ }
+
+ /* java 6 only */
+ public void enable() {
+ setEnabled(true);
+ }
+
+ public void flip(int a, int b, int c, int d, java.awt.BufferCapabilities.FlipContents e) {
+ }
+
+ /* java 6 only */
+ public Rectangle getBounds() {
+ return new Rectangle(location.x, location.y, size.width, size.height);
+ //rootWindow.getBounds();
+ }
+
+ public Image getBackBuffer() {
+ logger.unimplemented("getBackBuffer");
+ throw new Error();
+ }
+
+ public ColorModel getColorModel() {
+ return toolkit.getColorModel();
+ }
+
+ public FontMetrics getFontMetrics(Font font) {
+ logger.unimplemented("getFontMetrics");
+ return null;
+ }
+
+ public Graphics getGraphics() {
+ Component parent = component.getParent();
+ if (parent != null) {
+ return parent.getGraphics().create(location.x, location.y, size.width, size.height);
+ }
+ logger.error("getGraphics(): no parent !");
+ throw new Error();
+ }
+
+ public GraphicsConfiguration getGraphicsConfiguration() {
+ logger.unimplemented("getGraphicsConfiguration");
+ return null;
+ }
+
+ public Point getLocationOnScreen() {
+ Point screen = new Point(location);
+ Component parent = component.getParent();
+ if (parent != null) {
+ Point parentScreen = parent.getLocationOnScreen();
+ screen.translate(parentScreen.x, parentScreen.y);
+ }
+ return screen;
+ }
+
+ public Dimension getMinimumSize() {
+ return size;
+ }
+
+ public Dimension getPreferredSize() {
+ return size;
+ }
+
+ public Toolkit getToolkit() {
+ return toolkit;
+ }
+
+ public void handleEvent(AWTEvent e) {
+ int id = e.getID();
+
+ if (e instanceof PaintEvent) {
+ Graphics g = null;
+ Rectangle r = ((PaintEvent)e).getUpdateRect();
+ try {
+ g = component.getGraphics();
+ if (g == null)
+ return;
+ g.clipRect(r.x, r.y, r.width, r.height);
+ if (id == PaintEvent.PAINT)
+ component.paint(g);
+ else
+ component.update(g);
+ toolkit.sync();
+ } finally {
+ if (g != null)
+ g.dispose();
+ }
+ }
+ }
+
+ public boolean handlesWheelScrolling() {
+ return false;
+ }
+
+ /* java 6 only */
+ public void hide() {
+ setVisible(false);
+ }
+
+ public boolean isFocusable() {
+ return true;
+ }
+
+ public boolean isObscured() {
+ return false;
+ }
+
+ public boolean isReparentSupported() {
+ return false;
+ }
+
+ public void layout() {
+ }
+
+ /* java 1.6 only */
+ public Dimension minimumSize() {
+ return getMinimumSize();
+ }
+
+ public void paint(Graphics g) {
+ component.paint(g);
+ }
+
+ /* java 1.6 only */
+ public Dimension preferredSize() {
+ return getPreferredSize();
+ }
+
+ public boolean prepareImage(Image img, int w, int h, ImageObserver o) {
+ return ((BDToolkit)toolkit).prepareImage(img, w, h, o);
+ }
+
+ public void print(Graphics g) {
+ }
+
+ /* java 1.6 only */
+ public void repaint(long tm, int x, int y, int width, int height) {
+ logger.unimplemented("repaint");
+ }
+
+ public void reparent(ContainerPeer p) {
+ }
+
+ /* java 1.6 only */
+ public void reshape(int x, int y, int width, int height) {
+ setBounds(x, y, width, height, SET_BOUNDS);
+ }
+
+ public boolean requestFocus(Component lightweightChild, boolean temporary, boolean focusedWindowChangeAllowed, long time) {
+ return true;
+ }
+
+
+ public void setBackground(Color c) {
+ }
+
+ public void setBounds(int x, int y, int width, int height, int op) {
+ location.x = x;
+ location.y = y;
+ size.width = width;
+ size.height = height;
+ }
+
+ public void setEnabled(boolean b) {
+ logger.unimplemented("setEnabled");
+ }
+
+ public void setFont(Font f) {
+ }
+
+ public void setForeground(Color c) {
+ }
+
+ public void setVisible(boolean b) {
+ }
+
+ /* java 7 */
+ public void setZOrder(ComponentPeer peer) {
+ }
+
+ /* java 6 only */
+ public void show() {
+ setVisible(true);
+ }
+
+ public void updateCursorImmediately() {
+ }
+
+ /* java 7 */
+ public boolean updateGraphicsData(GraphicsConfiguration gc) {
+ return false;
+ }
+
+
+ protected Component component;
+ protected Toolkit toolkit;
+ protected Point location = new Point();
+ protected Dimension size = new Dimension();
+
+ private static final Logger logger = Logger.getLogger(BDComponentPeer.class.getName());
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/java/awt/peer/BDFramePeer.java Added

@@ -0,0 +1,193 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt.peer;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.BufferedImage;
+
+import org.videolan.Logger;
+
+public class BDFramePeer extends BDComponentPeer implements FramePeer
+{
+ public BDFramePeer(Frame frame, BDRootWindow rootWindow) {
+ super(frame.getToolkit(), frame);
+ this.rootWindow = rootWindow;
+ }
+
+ public Rectangle getBoundsPrivate() {
+ return null;
+ }
+
+ public int getState() {
+ return Frame.NORMAL;
+ }
+
+ public void setBoundsPrivate(int a, int b, int c, int d) {
+ }
+
+ public void setMaximizedBounds(Rectangle bounds) {
+ }
+
+ public void setMenuBar(MenuBar mb) {
+ }
+
+ public void setResizable(boolean resizeable) {
+ }
+
+ public void setState(int state) {
+ }
+
+ public void setTitle(String title) {
+ }
+
+ //
+ // ContainerPeer
+ //
+
+ public void beginLayout() {
+ }
+
+ public void beginValidate() {
+ }
+
+ public void endLayout() {
+ }
+
+ public void endValidate() {
+ }
+
+ public Insets getInsets() {
+ return insets;
+ }
+
+ /* java 1.6 only */
+ public Insets insets() {
+ return getInsets();
+ }
+
+ /* java 1.6 only */
+ public boolean isPaintPending() {
+ return false;
+ }
+
+ /* java 1.6 only */
+ public boolean isRestackSupported() {
+ return false;
+ }
+
+ /* java 1.6 only */
+ public void restack() {
+ }
+
+ //
+ // WindowPeer
+ //
+
+ public void repositionSecurityWarning() {
+ }
+
+ /* Removed in java 1.6 update 45 */
+ public void setAlwaysOnTop(boolean b) {
+ }
+
+ /* java 1.6 update 45. Also in java 7 / 8. */
+ public void updateAlwaysOnTopState() {
+ }
+
+ public void setModalBlocked(Dialog d,boolean b) {
+ }
+
+ public void setOpacity(float f) {
+ }
+
+ public void setOpaque(boolean b) {
+ }
+
+ public void toBack() {
+ }
+
+ public void toFront() {
+ }
+
+ public void updateFocusableWindowState() {
+ }
+
+ public void updateIconImages() {
+ }
+
+ public void updateMinimumSize() {
+ }
+
+ public void updateWindow(BufferedImage b) {
+ logger.unimplemented("updateWindow");
+ }
+
+ /* java 1.7 ? */
+ public void updateWindow() {
+ logger.unimplemented("updateWindow");
+ }
+
+ /* java 1.6 only */
+ public boolean requestWindowFocus() {
+ return true;
+ }
+
+ //
+ // ComponentPeer
+ //
+
+ //public Rectangle getBounds() {
+ // return rootWindow.getBounds();
+ //}
+
+ public Graphics getGraphics() {
+ return new BDWindowGraphics(rootWindow);
+ }
+
+ public Image createImage(int width, int height) {
+ return ((BDToolkit)BDToolkit.getDefaultToolkit()).createImage((Component)null, width, height);
+ }
+
+ public boolean requestFocus(Component c, boolean a, boolean b, long l, sun.awt.CausedFocusEvent.Cause d) {
+ if (c == null) {
+ return true;
+ }
+ Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(new FocusEvent(c, FocusEvent.FOCUS_GAINED));
+ return true;
+ }
+
+ public void setVisible(boolean b) {
+ //Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(new WindowEvent((Frame)component, WindowEvent.WINDOW_ACTIVATED));
+ if (b == true) {
+ component.paint(getGraphics());
+ }
+ }
+
+ public void dispose() {
+ super.dispose();
+ rootWindow = null;
+ }
+
+ private BDRootWindow rootWindow;
+ private Insets insets = new Insets(0, 0, 0, 0);
+
+ private static final Logger logger = Logger.getLogger(BDFramePeer.class.getName());
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/java/awt/peer/BDKeyboardFocusManagerPeer.java Added

@@ -0,0 +1,121 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt.peer;
+
+import java.awt.Component;
+import java.awt.KeyboardFocusManager;
+import java.awt.Window;
+import java.lang.reflect.Field;
+
+public class BDKeyboardFocusManagerPeer implements KeyboardFocusManagerPeer {
+ private static boolean java7 = false;
+ static BDKeyboardFocusManagerPeer instance = null;
+
+ /* used in java 7 only */
+ public static KeyboardFocusManagerPeer getInstance() {
+ java7 = true;
+
+ if (instance == null) {
+ instance = new BDKeyboardFocusManagerPeer();
+ }
+ return instance;
+ }
+
+ public static void shutdown()
+ {
+ if (instance != null) {
+ instance.dispose();
+ instance = null;
+ }
+ }
+
+ public static void init(Window window)
+ {
+ /* running in java 7 ? */
+ if (java7 == true)
+ return;
+
+ if (instance == null)
+ instance = new BDKeyboardFocusManagerPeer();
+ instance.focusOwner = null;
+ instance.window = window;
+
+ /* replace default keyboard focus manager peer */
+ Field kbPeer;
+ try {
+ Class c = Class.forName("java.awt.KeyboardFocusManager");
+ kbPeer = c.getDeclaredField("peer");
+ kbPeer.setAccessible(true);
+ } catch (ClassNotFoundException e) {
+ throw new Error("java.awt.KeyboardFocusManager not found");
+ } catch (SecurityException e) {
+ throw new Error("java.awt.KeyboardFocusManager not accessible");
+ } catch (NoSuchFieldException e) {
+ throw new Error("java.awt.KeyboardFocusManager.peer not found");
+ }
+ try {
+ kbPeer.set(KeyboardFocusManager.getCurrentKeyboardFocusManager(),
+ instance);
+ } catch (java.lang.IllegalAccessException e) {
+ throw new Error("java.awt.KeyboardFocusManager.peer not accessible:" + e);
+ }
+ }
+
+ private Component focusOwner = null;
+ private Window window = null; /* used in java 6 only */
+ private boolean disposed = false;
+
+ public void dispose()
+ {
+ focusOwner = null;
+ window = null;
+ disposed = true;
+ }
+
+ private BDKeyboardFocusManagerPeer() {
+ }
+
+ public void clearGlobalFocusOwner(Window w) {
+ }
+
+ public Component getCurrentFocusOwner() {
+ return focusOwner;
+ }
+
+ public void setCurrentFocusOwner(Component c) {
+ if (!disposed) {
+ focusOwner = c;
+ }
+ }
+
+ /* java 6 only */
+ public void setCurrentFocusedWindow(Window w) {
+ if (!disposed) {
+ window = w;
+ }
+ }
+
+ /* java 6 only */
+ public Window getCurrentFocusedWindow() {
+ return window;
+ }
+};
+
+

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/java/awt/peer/BDLightweightComponentPeer.java Added

@@ -0,0 +1,30 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt.peer;
+
+import java.awt.Toolkit;
+import java.awt.Component;
+
+public abstract class BDLightweightComponentPeer extends BDComponentPeer implements LightweightPeer
+{
+ public BDLightweightComponentPeer(Toolkit toolkit, Component component) {
+ super(toolkit, component);
+ }
+}
\ No newline at end of file

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/org Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/org/dvb Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/org/dvb/ui Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/org/dvb/ui/DVBGraphicsImpl.java Added

@@ -0,0 +1,512 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.dvb.ui;
+
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
+import java.awt.Image;
+import java.awt.Paint;
+import java.awt.Polygon;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+import java.awt.Shape;
+import java.awt.Stroke;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphVector;
+import java.awt.geom.AffineTransform;
+import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImageOp;
+import java.awt.image.ImageObserver;
+import java.awt.image.RenderedImage;
+import java.awt.image.renderable.RenderableImage;
+import java.text.AttributedCharacterIterator;
+import java.util.Map;
+
+public class DVBGraphicsImpl extends DVBGraphics {
+ protected DVBGraphicsImpl(Graphics2D gfx)
+ {
+ super(gfx);
+ }
+
+ /*
+ * Graphics methods
+ */
+ public void clearRect(int x, int y, int width, int height)
+ {
+ gfx.clearRect(x, y, width, height);
+ }
+
+ public void clipRect(int x, int y, int width, int height)
+ {
+ gfx.clipRect(x, y, width, height);
+ }
+
+ public void copyArea(int x, int y, int width, int height, int dx, int dy)
+ {
+ gfx.copyArea(x, y, width, height, dx, dy);
+ }
+
+ public Graphics create()
+ {
+ return gfx.create();
+ }
+
+ public Graphics create(int x, int y, int width, int height)
+ {
+ return gfx.create(x, y, width, height);
+ }
+
+ public void dispose()
+ {
+ gfx.dispose();
+ }
+
+ public void draw3DRect(int x, int y, int width, int height, boolean raised)
+ {
+ gfx.draw3DRect(x, y, width, height, raised);
+ }
+
+ public void drawArc(int x, int y, int width, int height, int startAngle,
+ int arcAngle)
+ {
+ gfx.drawArc(x, y, width, height, startAngle, arcAngle);
+ }
+
+ public void drawBytes(byte[] data, int offset, int length, int x, int y)
+ {
+ gfx.drawBytes(data, offset, length, x, y);
+ }
+
+ public void drawChars(char[] data, int offset, int length, int x, int y)
+ {
+ gfx.drawChars(data, offset, length, x, y);
+ }
+
+ public boolean drawImage(Image img, int x, int y, Color bgcolor,
+ ImageObserver observer)
+ {
+ return gfx.drawImage(img, x, y, bgcolor, observer);
+ }
+
+ public boolean drawImage(Image img, int x, int y, ImageObserver observer)
+ {
+ return gfx.drawImage(img, x, y, observer);
+ }
+
+ public boolean drawImage(Image img, int x, int y, int width, int height,
+ Color bgcolor, ImageObserver observer)
+ {
+ return gfx.drawImage(img, x, y, width, height, bgcolor, observer);
+ }
+
+ public boolean drawImage(Image img, int x, int y, int width, int height,
+ ImageObserver observer)
+ {
+ return gfx.drawImage(img, x, y, width, height, observer);
+ }
+
+ public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2,
+ int sx1, int sy1, int sx2, int sy2, Color bgcolor,
+ ImageObserver observer)
+ {
+ return gfx.drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2,
+ bgcolor, observer);
+ }
+
+ public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2,
+ int sx1, int sy1, int sx2, int sy2, ImageObserver observer)
+ {
+ return gfx.drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2,
+ observer);
+ }
+
+ public void drawLine(int x1, int y1, int x2, int y2)
+ {
+ gfx.drawLine(x1, y1, x2, y2);
+ }
+
+ public void drawOval(int x, int y, int width, int height)
+ {
+ gfx.drawOval(x, y, width, height);
+ }
+
+ public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints)
+ {
+ gfx.drawPolygon(xPoints, yPoints, nPoints);
+ }
+
+ public void drawPolygon(Polygon p)
+ {
+ gfx.drawPolygon(p);
+ }
+
+ public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints)
+ {
+ gfx.drawPolyline(xPoints, yPoints, nPoints);
+ }
+
+ public void drawRect(int x, int y, int width, int height)
+ {
+ gfx.drawRect(x, y, width, height);
+ }
+
+ public void drawRoundRect(int x, int y, int width, int height,
+ int arcWidth, int arcHeight)
+ {
+ gfx.drawRoundRect(x, y, width, height, arcWidth, arcHeight);
+ }
+
+ public void drawString(AttributedCharacterIterator iterator, int x, int y)
+ {
+ gfx.drawString(iterator, x, y);
+ }
+
+ public void drawString(String str, int x, int y)
+ {
+ gfx.drawString(str, x, y);
+ }
+
+ public void fill3DRect(int x, int y, int width, int height, boolean raised)
+ {
+ gfx.fill3DRect(x, y, width, height, raised);
+ }
+
+ public void fillArc(int x, int y, int width, int height, int startAngle,
+ int arcAngle)
+ {
+ gfx.fillArc(x, y, width, height, startAngle, arcAngle);
+ }
+
+ public void fillOval(int x, int y, int width, int height)
+ {
+ gfx.fillOval(x, y, width, height);
+ }
+
+ public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints)
+ {
+ gfx.fillPolygon(xPoints, yPoints, nPoints);
+ }
+
+ public void fillPolygon(Polygon p)
+ {
+ gfx.fillPolygon(p);
+ }
+
+ public void fillRect(int x, int y, int width, int height)
+ {
+ gfx.fillRect(x, y, width, height);
+ }
+
+ public void fillRoundRect(int x, int y, int width, int height,
+ int arcWidth, int arcHeight)
+ {
+ gfx.fillRoundRect(x, y, width, height, arcWidth, arcHeight);
+ }
+
+ public void finalize()
+ {
+ gfx.finalize();
+ }
+
+ public Shape getClip()
+ {
+ return gfx.getClip();
+ }
+
+ public Rectangle getClipBounds()
+ {
+ return gfx.getClipBounds();
+ }
+
+ public Rectangle getClipBounds(Rectangle r)
+ {
+ return gfx.getClipBounds(r);
+ }
+
+ public Rectangle getClipRect()
+ {
+ return gfx.getClipRect();
+ }
+
+ public Color getColor()
+ {
+ return gfx.getColor();
+ }
+
+ public Font getFont()
+ {
+ return gfx.getFont();
+ }
+
+ public FontMetrics getFontMetrics()
+ {
+ return gfx.getFontMetrics();
+ }
+
+ public FontMetrics getFontMetrics(Font f)
+ {
+ return gfx.getFontMetrics(f);
+ }
+
+ public boolean hitClip(int x, int y, int width, int height)
+ {
+ return gfx.hitClip(x, y, width, height);
+ }
+
+ public void setClip(int x, int y, int width, int height)
+ {
+ gfx.setClip(x, y, width, height);
+ }
+
+ public void setClip(Shape clip)
+ {
+ gfx.setClip(clip);
+ }
+
+ public void setColor(Color c)
+ {
+ gfx.setColor(c);
+ }
+
+ public void setFont(Font font)
+ {
+ gfx.setFont(font);
+ }
+
+ public void setPaintMode()
+ {
+ gfx.setPaintMode();
+ }
+
+ public void setXORMode(Color c1)
+ {
+ gfx.setXORMode(c1);
+ }
+
+ public void translate(int x, int y)
+ {
+ gfx.translate(x, y);
+ }
+
+ /*
+ * DVBGraphics methods
+ */
+ public int[] getAvailableCompositeRules()
+ {
+ int[] rules = { DVBAlphaComposite.CLEAR, DVBAlphaComposite.SRC,
+ DVBAlphaComposite.SRC_OVER, DVBAlphaComposite.DST_OVER,
+ DVBAlphaComposite.SRC_IN, DVBAlphaComposite.DST_IN,
+ DVBAlphaComposite.SRC_OUT, DVBAlphaComposite.DST_OUT };
+
+ return rules;
+ }
+
+ public DVBAlphaComposite getDVBComposite()
+ {
+ return alphaComposite;
+ }
+
+ public void setDVBComposite(DVBAlphaComposite comp)
+ throws UnsupportedDrawingOperationException
+ {
+ this.alphaComposite = comp;
+ }
+
+ /*
+ * Graphics2D methods
+ */
+ public void addRenderingHints(Map hints)
+ {
+ gfx.addRenderingHints(hints);
+ }
+
+ public void clip(Shape s)
+ {
+ gfx.clip(s);
+ }
+
+ public void draw(Shape s)
+ {
+ gfx.draw(s);
+ }
+
+ public void drawGlyphVector(GlyphVector g, float x, float y)
+ {
+ gfx.drawGlyphVector(g, x, y);
+ }
+
+ public void drawImage(BufferedImage img, BufferedImageOp op, int x, int y)
+ {
+ gfx.drawImage(img, op, x, y);
+ }
+
+ public boolean drawImage(Image img, AffineTransform xform, ImageObserver obs)
+ {
+ return gfx.drawImage(img, xform, obs);
+ }
+
+ public void drawRenderableImage(RenderableImage img, AffineTransform xform)
+ {
+ gfx.drawRenderableImage(img, xform);
+ }
+
+ public void drawRenderedImage(RenderedImage img, AffineTransform xform)
+ {
+ gfx.drawRenderedImage(img, xform);
+ }
+
+ public void drawString(AttributedCharacterIterator iterator, float x,
+ float y)
+ {
+ gfx.drawString(iterator, x, y);
+ }
+
+ public void drawString(String str, float x, float y)
+ {
+ gfx.drawString(str, x, y);
+ }
+
+ public void fill(Shape s)
+ {
+ gfx.fill(s);
+ }
+
+ public Color getBackground()
+ {
+ return gfx.getBackground();
+ }
+
+ public Composite getComposite()
+ {
+ return gfx.getComposite();
+ }
+
+ public GraphicsConfiguration getDeviceConfiguration()
+ {
+ return gfx.getDeviceConfiguration();
+ }
+
+ public FontRenderContext getFontRenderContext()
+ {
+ return gfx.getFontRenderContext();
+ }
+
+ public Paint getPaint()
+ {
+ return gfx.getPaint();
+ }
+
+ public Object getRenderingHint(RenderingHints.Key hintKey)
+ {
+ return gfx.getRenderingHint(hintKey);
+ }
+
+ public RenderingHints getRenderingHints()
+ {
+ return gfx.getRenderingHints();
+ }
+
+ public Stroke getStroke()
+ {
+ return gfx.getStroke();
+ }
+
+ public AffineTransform getTransform()
+ {
+ return gfx.getTransform();
+ }
+
+ public boolean hit(Rectangle rect, Shape s, boolean onStroke)
+ {
+ return gfx.hit(rect, s, onStroke);
+ }
+
+ public void rotate(double theta)
+ {
+ gfx.rotate(theta);
+ }
+
+ public void rotate(double theta, double x, double y)
+ {
+ gfx.rotate(theta, x, y);
+ }
+
+ public void scale(double sx, double sy)
+ {
+ gfx.scale(sx, sy);
+ }
+
+ public void setBackground(Color color)
+ {
+ gfx.setBackground(color);
+ }
+
+ public void setComposite(Composite comp)
+ {
+ gfx.setComposite(comp);
+ }
+
+ public void setPaint(Paint paint)
+ {
+ gfx.setPaint(paint);
+ }
+
+ public void setRenderingHint(RenderingHints.Key hintKey, Object hintValue)
+ {
+ gfx.setRenderingHint(hintKey, hintValue);
+ }
+
+ public void setRenderingHints(Map hints)
+ {
+ gfx.setRenderingHints(hints);
+ }
+
+ public void setStroke(Stroke s)
+ {
+ gfx.setStroke(s);
+ }
+
+ public void setTransform(AffineTransform Tx)
+ {
+ gfx.setTransform(Tx);
+ }
+
+ public void shear(double shx, double shy)
+ {
+ gfx.shear(shx, shy);
+ }
+
+ public void transform(AffineTransform Tx)
+ {
+ gfx.transform(Tx);
+ }
+
+ public void translate(double tx, double ty)
+ {
+ gfx.translate(tx, ty);
+ }
+
+ private DVBAlphaComposite alphaComposite = DVBAlphaComposite.Clear;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/org/dvb/ui/FontFactory.java Added

@@ -0,0 +1,89 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2010 William Hahne
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.dvb.ui;
+
+import java.awt.Font;
+import java.awt.FontFormatException;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+
+import org.videolan.BDJException;
+import org.videolan.BDJUtil;
+import org.videolan.FontIndex;
+import org.videolan.FontIndexData;
+import org.videolan.Logger;
+
+public class FontFactory {
+ public static void loadDiscFonts() {
+ unloadDiscFonts();
+ }
+
+ public static void unloadDiscFonts() {
+ }
+
+ public FontFactory() throws FontFormatException, IOException {
+ String path = BDJUtil.discRootToFilesystem("/BDMV/AUXDATA/dvb.fontindex");
+
+ FontIndexData fontIndexData[] = FontIndex.parseIndex(path);
+
+ fonts = new HashMap(fontIndexData.length);
+ for (int i = 0; i < fontIndexData.length; i++) {
+ FontIndexData data = fontIndexData[i];
+ FileInputStream inStream = new FileInputStream(BDJUtil.discRootToFilesystem("/BDMV/AUXDATA/" + data.getFileName()));
+
+ Font font = Font.createFont(Font.TRUETYPE_FONT, inStream);
+ font = font.deriveFont(data.getStyle(), data.getMaxSize());
+
+ fonts.put(data.getName(), font);
+ }
+ }
+
+ public FontFactory(URL u) throws IOException, FontFormatException {
+ FileInputStream inStream = new FileInputStream(u.getPath());
+
+ urlFont = Font.createFont(Font.TRUETYPE_FONT, inStream);
+ }
+
+ public Font createFont(String name, int style, int size)
+ throws FontNotAvailableException, FontFormatException, IOException {
+ logger.info("Creating font: " + name + " " + style + " " + size);
+
+ if (urlFont != null && name.equals(urlFont.getName()))
+ {
+ return urlFont.deriveFont(style, size);
+ }
+
+ Font font = (Font)fonts.get(name);
+
+ if (font == null)
+ throw new FontNotAvailableException();
+
+ return font.deriveFont(style, size);
+ }
+
+ private Font urlFont = null;
+ private Map fonts = null;
+
+ private static final Logger logger = Logger.getLogger(FontFactory.class.getName());
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/org/videolan Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/org/videolan/PortingHelper.java Added

@@ -0,0 +1,31 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan;
+
+public class PortingHelper {
+
+ public static void stopThread(Thread t) {
+ t.stop();
+ }
+
+ public static void stopThreadGroup(ThreadGroup t) {
+ t.stop();
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/sun Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/sun/awt Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/sun/awt/KeyboardFocusManagerPeerProvider.java Added

@@ -0,0 +1,27 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package sun.awt;
+
+import java.awt.KeyboardFocusManager;
+import java.awt.peer.KeyboardFocusManagerPeer;
+
+public abstract interface KeyboardFocusManagerPeerProvider {
+ public abstract KeyboardFocusManagerPeer createKeyboardFocusManagerPeer(KeyboardFocusManager kfm);
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/sun/awt/image Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java-j2se/sun/awt/image/BufferedImagePeer.java Added

@@ -0,0 +1,46 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package sun.awt.image;
+
+import java.awt.image.ColorModel;
+import java.awt.image.ImageObserver;
+import java.awt.image.ImageProducer;
+import java.awt.image.BufferedImage;
+import java.awt.Graphics;
+
+public interface BufferedImagePeer {
+ void flush();
+ ColorModel getColorModel();
+ Graphics getGraphics();
+ int getHeight();
+ int getHeight(ImageObserver observer);
+ Object getProperty(String name);
+ Object getProperty(String name, ImageObserver observer);
+ String[] getPropertyNames();
+ int getRGB(int x, int y);
+ int[] getRGB(int startX, int startY, int w, int h, int[] rgbArray, int offset, int scansize);
+ ImageProducer getSource();
+ BufferedImage getSubimage(int x, int y, int w, int h);
+ int getType();
+ int getWidth();
+ int getWidth(ImageObserver observer);
+ void setRGB(int x, int y, int rgb);
+ void setRGB(int startX, int startY, int w, int h, int[] rgbArray, int offset, int scansize);
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/mc Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/mc/CompleteTransactionEvent.java Added

@@ -0,0 +1,28 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package com.aacsla.bluray.mc;
+
+public class CompleteTransactionEvent extends MCEvent {
+ public CompleteTransactionEvent(Object source) {
+ super(source);
+ }
+
+ private static final long serialVersionUID = -2466454514047350625L;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/mc/MCCancelEvent.java Added

@@ -0,0 +1,28 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package com.aacsla.bluray.mc;
+
+public class MCCancelEvent extends MCStopEvent {
+ public MCCancelEvent(Object source) {
+ super(source);
+ }
+
+ private static final long serialVersionUID = 8287215868583428545L;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/mc/MCCompleteEvent.java Added

@@ -0,0 +1,28 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package com.aacsla.bluray.mc;
+
+public class MCCompleteEvent extends MCStopEvent {
+ public MCCompleteEvent(Object source) {
+ super(source);
+ }
+
+ private static final long serialVersionUID = 6363970273357477415L;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/mc/MCErrorEvent.java Added

@@ -0,0 +1,28 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package com.aacsla.bluray.mc;
+
+public class MCErrorEvent extends MCStopEvent {
+ public MCErrorEvent(Object source) {
+ super(source);
+ }
+
+ private static final long serialVersionUID = 9178932899202961791L;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/mc/MCEvent.java Added

@@ -0,0 +1,30 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package com.aacsla.bluray.mc;
+
+import java.util.EventObject;
+
+public class MCEvent extends EventObject {
+ public MCEvent(Object source) {
+ super(source);
+ }
+
+ private static final long serialVersionUID = 5519846404607420914L;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/mc/MCEventListener.java Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/mc/MCException.java Added

@@ -0,0 +1,31 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package com.aacsla.bluray.mc;
+
+public class MCException extends Exception {
+ public MCException() {
+ }
+
+ public MCException(String message) {
+ super(message);
+ }
+
+ private static final long serialVersionUID = 8449657578923671247L;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/mc/MCMAvailableEvent.java Added

@@ -0,0 +1,28 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package com.aacsla.bluray.mc;
+
+public class MCMAvailableEvent extends MCEvent {
+ public MCMAvailableEvent(Object source) {
+ super(source);
+ }
+
+ private static final long serialVersionUID = 301198503585761705L;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/mc/MCOT.java Added

@@ -0,0 +1,30 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package com.aacsla.bluray.mc;
+
+public abstract interface MCOT {
+ public abstract long getFreeSpace();
+
+ public abstract String getMajorMcotId();
+
+ public abstract String getMCMMCOTInfo();
+
+ public abstract String getMinorMcotId();
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/mc/MCProgress.java Added

@@ -0,0 +1,31 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package com.aacsla.bluray.mc;
+
+public abstract interface MCProgress {
+ public abstract long copied();
+
+ public abstract int getState();
+
+ public abstract long remaining();
+
+ public static final int COPYING = 1;
+ public static final int STOPPED = 2;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/mc/MCStartEvent.java Added

@@ -0,0 +1,28 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package com.aacsla.bluray.mc;
+
+public class MCStartEvent extends MCEvent {
+ public MCStartEvent(Object source) {
+ super(source);
+ }
+
+ private static final long serialVersionUID = 1243565268325264511L;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/mc/MCStopEvent.java Added

@@ -0,0 +1,28 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package com.aacsla.bluray.mc;
+
+public class MCStopEvent extends MCEvent {
+ public MCStopEvent(Object source) {
+ super(source);
+ }
+
+ private static final long serialVersionUID = 6322318729182860375L;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/mc/ManagedCopy.java Added

@@ -0,0 +1,147 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package com.aacsla.bluray.mc;
+
+import java.net.URL;
+
+import org.videolan.Logger;
+
+public final class ManagedCopy {
+ public static ManagedCopy getInstance() throws MCException {
+ logger.unimplemented("*");
+ throw new MCException();
+ }
+
+ /** @deprecated */
+ public ManagedCopy() {
+ logger.unimplemented("*");
+ }
+
+ public void addMCEventListener(MCEventListener listener) {
+
+ }
+
+ public boolean cancelCopy() throws MCException {
+ return false;
+ }
+
+ public void completeTransaction(
+ String coupon, String majorMcotID, String minorMcotID,
+ String mcotOfferInfo, String MCUi, String status,
+ String MCOTParams) throws MCException {
+
+ }
+
+ public int getBDJKeepMode() throws MCException {
+ return BDJKEEP_TERMINATE;
+ }
+
+ public byte[] getContentCertID() throws MCException {
+ return null;
+ }
+
+ public String getContentID() throws MCException {
+ return null;
+ }
+
+ public String getCoupon() throws MCException {
+ return null;
+ }
+
+ public String getDealManifest() throws MCException {
+ return null;
+ }
+
+ public URL getDefaultURL() throws MCException {
+ throw new MCException();
+ }
+
+ public String getMajorMcotId() throws MCException {
+ return null;
+ }
+
+ public String getMCMNonce() throws MCException {
+ throw new MCException();
+ }
+
+ public MCOT[] getMCOTList() throws MCException {
+ return new MCOT[0];
+ }
+
+ public String getMcotOfferInfo() throws MCException {
+ return null;
+ }
+
+ public String getMCOTParams() throws MCException {
+ return null;
+ }
+
+ public String getMCUi() throws MCException {
+ return null;
+ }
+
+ public String getMinorMcotId() throws MCException {
+ return null;
+ }
+
+ public String getOffer() throws MCException {
+ return null;
+ }
+
+ public String getSessionId() throws MCException {
+ return null;
+ }
+
+ public String getStatus() throws MCException {
+ return null;
+ }
+
+ public void InvokeMCM() {
+
+ }
+
+ /** @deprecated */
+ public boolean IsMCMSupported() {
+ return false;
+ }
+
+ public MCProgress makeCopy() throws MCException {
+ throw new MCException();
+ }
+
+ public void removeMCEventListener(MCEventListener listener) {
+
+ }
+
+ public String[] verifyOffers(String offers) throws MCException {
+ return new String[0];
+ }
+
+ public boolean verifyPermission(String signature, String signedcontent)
+ throws MCException {
+ return false;
+ }
+
+ public static final int BDJKEEP_FULL = 1;
+ public static final int BDJKEEP_LIMITED = 2;
+ public static final int BDJKEEP_TERMINATE = 3;
+
+ private static final Logger logger = Logger.getLogger(ManagedCopy.class.getName());
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/mt Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/mt/MCMTransaction.java Added

@@ -0,0 +1,26 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package com.aacsla.bluray.mt;
+
+public abstract interface MCMTransaction{
+ public static final String offers = null;
+
+ public abstract void completeTransaction(String paramString1, String paramString2, String paramString3, String paramString4, String paramString5);
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/online Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/online/ContentAttribute.java Added

@@ -0,0 +1,43 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package com.aacsla.bluray.online;
+
+import java.io.File;
+import java.io.FileInputStream;
+
+public class ContentAttribute {
+ public ContentAttribute() {
+ }
+
+ public byte[] getContentCertID() {
+ try {
+ FileInputStream is = new FileInputStream(
+ System.getProperty("bluray.vfs.root") + File.separator + "AACS/Content000.cer");
+ is.skip(14);
+ byte[] bytes = new byte[6];
+ is.read(bytes, 0, 6);
+ is.close();
+ return bytes;
+ } catch (Throwable e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/online/DeviceAttribute.java Added

@@ -0,0 +1,36 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package com.aacsla.bluray.online;
+
+import org.videolan.Libbluray;
+import org.videolan.Logger;
+
+public class DeviceAttribute {
+ public DeviceAttribute() {
+ }
+
+ public byte[] getDeviceBindingID() {
+ byte bid[] = Libbluray.getAacsData(Libbluray.AACS_DEVICE_BINDING_ID);
+ if (bid == null) {
+ Logger.getLogger(DeviceAttribute.class.getName()).warning("getDeviceBindingID() failed");
+ }
+ return bid;
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/online/EnablePermission.java Added

@@ -0,0 +1,58 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package com.aacsla.bluray.online;
+
+import org.videolan.Libbluray;
+import org.videolan.Logger;
+
+public class EnablePermission {
+ public EnablePermission(int title_id) {
+ }
+
+ public boolean checkPermission() {
+ // TODO
+ logger.unimplemented("checkPermission");
+ return false;
+ }
+
+ public byte[] getNonce() {
+ byte nonce[] = Libbluray.getAacsData(Libbluray.AACS_DEVICE_NONCE);
+ if (nonce == null) {
+ Logger.getLogger(DeviceAttribute.class.getName()).warning("getNonce() failed");
+ }
+ return nonce;
+ }
+
+ public boolean isCacheable() {
+ // TODO
+ logger.unimplemented("isCacheable");
+ return false;
+ }
+
+ public boolean setPermission(byte[] message) throws NullPointerException {
+ if (message == null)
+ throw new NullPointerException();
+ // TODO
+ logger.unimplemented("setPermission");
+ return false;
+ }
+
+ private static final Logger logger = Logger.getLogger(EnablePermission.class.getName());
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/com/aacsla/bluray/online/MediaAttribute.java Added

@@ -0,0 +1,46 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package com.aacsla.bluray.online;
+
+import org.videolan.Libbluray;
+import org.videolan.Logger;
+
+public class MediaAttribute {
+ public MediaAttribute() {
+ }
+
+ public byte[] getPMSN() {
+ byte pmsn[] = Libbluray.getAacsData(Libbluray.AACS_MEDIA_PMSN);
+ if (pmsn == null) {
+ logger.warning("getPMSN() failed");
+ }
+ return pmsn;
+ }
+
+ public byte[] getVolumeID() {
+ byte vid[] = Libbluray.getAacsData(Libbluray.AACS_MEDIA_VID);
+ if (vid == null) {
+ logger.warning("getVolumeID() failed");
+ }
+ return vid;
+ }
+
+ private static final Logger logger = Logger.getLogger(MediaAttribute.class.getName());
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/java Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/java/awt Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/java/awt/Area.java Added

@@ -0,0 +1,73 @@
+ /*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+class Area {
+ public int x0;
+ public int y0;
+ public int x1;
+ public int y1;
+
+ public Area() {
+ clear();
+ }
+
+ public Area(int width, int height) {
+ this(0, 0, width - 1, height - 1);
+ }
+
+ public Area(int x0, int y0, int x1, int y1) {
+ this.x0 = x0;
+ this.y0 = y0;
+ this.x1 = x1;
+ this.y1 = y1;
+ }
+
+ public void clear() {
+ x0 = Integer.MAX_VALUE;
+ y0 = Integer.MAX_VALUE;
+ x1 = -1;
+ y1 = -1;
+ }
+
+ public void add(int newx, int newy) {
+ x0 = Math.min(x0, newx);
+ x1 = Math.max(x1, newx);
+ y0 = Math.min(y0, newy);
+ y1 = Math.max(y1, newy);
+ }
+
+ public void add(Rectangle r) {
+ if ((r.x | r.width | r.y | r.height) >= 0) {
+ x0 = Math.min(x0, r.x);
+ x1 = Math.max(x1, r.x + r.width - 1);
+ y0 = Math.min(y0, r.y);
+ y1 = Math.max(y1, r.y + r.height - 1);
+ }
+ }
+
+ public boolean isEmpty() {
+ return (x1 < x0) || (y1 < y0);
+ }
+
+ public Area getBounds() {
+ return new Area(x0, y0, x1, y1);
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/java/awt/BDFontMetrics.java Added

@@ -0,0 +1,257 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+import java.io.*;
+import java.security.*;
+import java.util.*;
+
+public class BDFontMetrics extends FontMetrics {
+ static final long serialVersionUID = -4956160226949100590L;
+
+ private static long ftLib = 0;
+ private static Map fontNameMap;
+
+ private static native long initN();
+ private static native void destroyN(long ftLib);
+
+ public static void init() {
+ //System.loadLibrary("bluray");
+
+ if (ftLib != 0)
+ return;
+
+ ftLib = initN();
+
+ if (ftLib == 0) {
+ System.err.println("freetype library not loaded");
+ throw new AWTError("freetype lib not loaded");
+ }
+
+ Runtime.getRuntime().addShutdownHook(
+ new Thread() {
+ public void run() {
+ Iterator it = fontMetricsMap.values().iterator();
+ while (it.hasNext()) {
+ try {
+ BDFontMetrics fm = (BDFontMetrics)it.next();
+ it.remove();
+ fm.destroy();
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+ }
+ BDFontMetrics.destroyN(BDFontMetrics.ftLib);
+ }
+ }
+ );
+
+ String javaHome = (String) AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ return System.getProperty("java.home");
+ }
+ }
+ );
+ File f = new File(javaHome, "lib" + File.separator + "fonts");
+ String dir = f.getAbsolutePath() + File.separator;
+
+ fontNameMap = new HashMap(24);
+ fontNameMap.put("serif.0", dir + "LucidaBrightRegular.ttf");
+ fontNameMap.put("serif.1", dir + "LucidaBrightDemiBold.ttf");
+ fontNameMap.put("serif.2", dir + "LucidaBrightItalic.ttf");
+ fontNameMap.put("serif.3", dir + "LucidaBrightDemiItalic.ttf");
+ fontNameMap.put("sansserif.0", dir + "LucidaSansRegular.ttf");
+ fontNameMap.put("sansserif.1", dir + "LucidaSansDemiBold.ttf");
+ fontNameMap.put("sansserif.2", dir + "LucidaSansOblique.ttf");
+ fontNameMap.put("sansserif.3", dir + "LucidaSansDemiOblique.ttf");
+ fontNameMap.put("monospaced.0", dir + "LucidaTypewriterRegular.ttf");
+ fontNameMap.put("monospaced.1", dir + "LucidaTypewriterBold.ttf");
+ fontNameMap.put("monospaced.2", dir + "LucidaTypewriterOblique.ttf");
+ fontNameMap.put("monospaced.3", dir + "LucidaTypewriterBoldOblique.ttf");
+ fontNameMap.put("dialog.0", dir + "LucidaSansRegular.ttf");
+ fontNameMap.put("dialog.1", dir + "LucidaSansDemiBold.ttf");
+ fontNameMap.put("dialog.2", dir + "LucidaSansOblique.ttf");
+ fontNameMap.put("dialog.3", dir + "LucidaSansDemiOblique.ttf");
+ fontNameMap.put("dialoginput.0", dir + "LucidaTypewriterRegular.ttf");
+ fontNameMap.put("dialoginput.1", dir + "LucidaTypewriterBold.ttf");
+ fontNameMap.put("dialoginput.2", dir + "LucidaTypewriterOblique.ttf");
+ fontNameMap.put("dialoginput.3", dir + "LucidaTypewriterBoldOblique.ttf");
+ fontNameMap.put("default.0", dir + "LucidaSansRegular.ttf");
+ fontNameMap.put("default.1", dir + "LucidaSansDemiBold.ttf");
+ fontNameMap.put("default.2", dir + "LucidaSansOblique.ttf");
+ fontNameMap.put("default.3", dir + "LucidaSansDemiOblique.ttf");
+ }
+
+ /** A map which maps a native font name and size to a font metrics object. This is used
+ as a cache to prevent loading the same fonts multiple times. */
+ private static Map fontMetricsMap = new HashMap();
+
+ /** Gets the BDFontMetrics object for the supplied font. This method caches font metrics
+ to ensure native fonts are not loaded twice for the same font. */
+ static synchronized BDFontMetrics getFontMetrics(Font font) {
+ /* See if metrics has been stored in font already. */
+ BDFontMetrics fm = null;
+ //BDFontMetrics fm = (BDFontMetrics)font.metrics;
+ //if (fm == null) {
+ /* See if a font metrics of the same native name and size has already been loaded.
+ If it has then we use that one. */
+ String nativeName = (String)fontNameMap.get(font.getName().toLowerCase() + "." + font.getStyle());
+ if (nativeName == null)
+ nativeName = (String)fontNameMap.get("default." + font.getStyle());
+ String key = nativeName + "." + font.getSize();
+ fm = (BDFontMetrics)fontMetricsMap.get(key);
+ if (fm == null)
+ fontMetricsMap.put(key, fm = new BDFontMetrics(font, nativeName));
+ //font.metrics = fm;
+ //}
+ return fm;
+ }
+
+ static String[] getFontList() {
+ init();
+
+ ArrayList fontNames = new ArrayList();
+ Iterator fonts = fontNameMap.keySet().iterator();
+ int dotidx;
+
+ while (fonts.hasNext()) {
+ String fontname = (String) fonts.next();
+ if ((dotidx = fontname.indexOf('.')) == -1)
+ dotidx = fontname.length();
+ fontname = fontname.substring(0, dotidx);
+ if (!fontNames.contains(fontname))
+ fontNames.add(fontname);
+ }
+ return (String[])fontNames.toArray(new String[fontNames.size()]);
+ }
+
+ public static void registerFont(String name, int style, String path) {
+ File f = new File(path);
+ path = f.getAbsolutePath();
+ if (path != null) {
+ name = name.toLowerCase() + "." + style;
+ fontNameMap.put(name, path);
+ }
+ }
+
+ public static boolean registerFont(File f) {
+ //TODO
+ org.videolan.Logger.unimplemented("BDFontMetrics", "registerFont");
+ return false;
+ }
+
+ public static void unregisterFont(String name, int style) {
+ name = name.toLowerCase() + "." + style;
+ fontNameMap.remove(name);
+ }
+
+ long ftFace;
+ private int ascent;
+ private int descent;
+ private int leading;
+ private int maxAdvance;
+
+ /** Cache of first 256 Unicode characters as these map to ASCII characters and are often used. */
+ private int[] widths;
+
+ /**
+ * Creates a font metrics for the supplied font. To get a font metrics for a font
+ * use the static method getFontMetrics instead which does caching.
+ */
+ private BDFontMetrics(Font font, String nativeName) {
+ super(font);
+
+ ftFace = loadFontN(ftLib, nativeName, font.getSize());
+ if (ftFace == 0)
+ throw new AWTError("font face:" + nativeName + " not loaded");
+
+ /* Cache first 256 char widths for use by the getWidths method and for faster metric
+ calculation as they are commonly used (ASCII) characters. */
+ widths = new int[256];
+ for (int i = 0; i < 256; i++)
+ widths[i] = charWidthN(ftFace, (char)i);
+ }
+
+ private native long loadFontN(long ftLib, String fontName, int size);
+ private native void destroyFontN(long ftFace);
+ private native int charWidthN(long ftFace, char c);
+ private native int stringWidthN(long ftFace, String string);
+ private native int charsWidthN(long ftFace, char chars[], int offset, int len);
+
+ public int getAscent() {
+ return ascent;
+ }
+
+ public int getDescent() {
+ return descent;
+ }
+
+ public int getLeading() {
+ return leading;
+ }
+
+ public int getMaxAdvance() {
+ return maxAdvance;
+ }
+
+ /**
+ * Fast lookup of first 256 chars as these are always the same eg. ASCII charset.
+ */
+ public int charWidth(char c) {
+ if (c < 256)
+ return widths[c];
+ return charWidthN(ftFace, c);
+ }
+
+ /**
+ * Return the width of the specified string in this Font.
+ */
+ public int stringWidth(String string) {
+ return stringWidthN(ftFace, string);
+ }
+
+ /**
+ * Return the width of the specified char[] in this Font.
+ */
+ public int charsWidth(char chars[], int offset, int length) {
+ return charsWidthN(ftFace, chars, offset, length);
+ }
+
+ /**
+ * Get the widths of the first 256 characters in the font.
+ */
+ public int[] getWidths() {
+ int[] newWidths = new int[256];
+ System.arraycopy(widths, 0, newWidths, 0, 256);
+ return newWidths;
+ }
+
+ public void destroy() {
+ if (ftFace != 0) {
+ destroyFontN(ftFace);
+ ftFace = 0;
+ }
+ }
+
+ protected void finalize() throws Throwable {
+ destroy();
+ super.finalize();
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/java/awt/BDGraphicsDeviceImpl.java Added

@@ -0,0 +1,66 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+class BDGraphicsDeviceImpl extends GraphicsDevice {
+ private BDGraphicsConfiguration configuration;
+
+ BDGraphicsDeviceImpl(BDGraphicsEnvironment environment) {
+ configuration = new BDGraphicsConfiguration((BDGraphicsDevice)this);
+ }
+
+ public int getType() {
+ return TYPE_RASTER_SCREEN;
+ }
+
+ public String getIDstring() {
+ return "BDJ Graphics Device";
+ }
+
+ public GraphicsConfiguration getDefaultConfiguration() {
+ return configuration;
+ }
+
+ public GraphicsConfiguration[] getConfigurations() {
+ return new GraphicsConfiguration[] { configuration };
+ }
+
+ Rectangle getBounds() {
+ return new Rectangle(1920, 1080);
+ }
+
+ public int getAvailableAcceleratedMemory() {
+ return 0;
+ }
+
+ public boolean isFullScreenSupported() {
+ return false;
+ }
+
+ public Window getFullScreenWindow() {
+ return null;
+ }
+
+ public void setFullScreenWindow(Window window) {
+ }
+
+ boolean isWindowPerpixelTranslucencySupported() {
+ return true;
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/java/awt/BDGraphicsEnvironment.java Added

@@ -0,0 +1,59 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+import java.awt.image.BufferedImage;
+import java.util.Locale;
+
+import org.videolan.Logger;
+
+class BDGraphicsEnvironment extends GraphicsEnvironment {
+ private BDGraphicsDevice graphicsDevice;
+
+ BDGraphicsEnvironment() {
+ graphicsDevice = new BDGraphicsDevice(this);
+ }
+
+ public synchronized GraphicsDevice[] getScreenDevices() {
+ return new GraphicsDevice[] { graphicsDevice };
+ }
+
+ public GraphicsDevice getDefaultScreenDevice() {
+ return graphicsDevice;
+ }
+
+ public String[] getAvailableFontFamilyNames() {
+ return BDFontMetrics.getFontList();
+ }
+
+ public String[] getAvailableFontFamilyNames(Locale l) {
+ return BDFontMetrics.getFontList();
+ }
+
+ public Graphics2D createGraphics(BufferedImage img) {
+ return img.createGraphics();
+ }
+
+ /* not in J2ME */
+ public Font[] getAllFonts() {
+ Logger.unimplemented("BDGraphicsEnvironment", "getAllFonts");
+ return null;
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/java/awt/BDImageBase.java Added

@@ -0,0 +1,246 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Vector;
+import java.util.Enumeration;
+import java.awt.color.ColorSpace;
+import java.awt.image.AreaAveragingScaleFilter;
+import java.awt.image.DataBuffer;
+import java.awt.image.DirectColorModel;
+import java.awt.image.ImageConsumer;
+import java.awt.image.ImageProducer;
+import java.awt.image.ImageObserver;
+import java.awt.image.ColorModel;
+import java.awt.image.BufferedImage;
+
+class BDImageBase extends Image {
+ private static Constructor bufferedImageConstructor;
+
+ private Component component;
+ protected int width, height;
+ protected int[] backBuffer;
+ protected Area dirty;
+ private GraphicsConfiguration gc;
+ private Vector observers = new Vector();
+ private ImageProducer offscreenSource = null;
+
+ static {
+ try {
+ Class c = Class.forName("java.awt.image.BufferedImage");
+ bufferedImageConstructor = c.getDeclaredConstructors()[0];
+ bufferedImageConstructor.setAccessible(true);
+ } catch (ClassNotFoundException e) {
+ throw new AWTError("java.awt.image.BufferedImage not found");
+ }
+ }
+
+ private static BufferedImage createBuffededImage(Image image) {
+ try {
+ return (BufferedImage)bufferedImageConstructor.newInstance(new Object[] { image });
+ } catch (IllegalArgumentException e) {
+ e.printStackTrace();
+ } catch (InstantiationException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ BDImageBase(Component component, int width, int height, GraphicsConfiguration gc) {
+
+ this.component = component;
+ this.width = width;
+ this.height = height;
+ this.gc = gc;
+ if (width > 0 && height > 0)
+ backBuffer = new int[width * height];
+
+ dirty = new Area(width, height);
+
+ offscreenSource = new BDOffScreenImageSource(backBuffer, width, height);
+ }
+
+ public void flush() {
+ }
+
+ public Graphics getGraphics() {
+ return new BDGraphics((BDImage)this);
+ }
+
+ public int getWidth() {
+ return width;
+ }
+
+ public int getWidth(ImageObserver observer) {
+ if (width < 0)
+ addObserver(observer);
+ return width;
+ }
+
+ public int getHeight() {
+ return height;
+ }
+
+ public int getHeight(ImageObserver observer) {
+ if (height < 0)
+ addObserver(observer);
+ return height;
+ }
+
+ public Object getProperty(String name) {
+ return null;
+ }
+
+ public Object getProperty(String name, ImageObserver observer) {
+ return null;
+ }
+
+ public String[] getPropertyNames() {
+ return null;
+ }
+
+ public Image getScaledInstance(int width, int height, int hints) {
+ BDImageConsumer scaledImage = new BDImageConsumer(null);
+ AreaAveragingScaleFilter scaleFilter =
+ new AreaAveragingScaleFilter(width, height);
+ scaleFilter = (AreaAveragingScaleFilter)scaleFilter.getFilterInstance(scaledImage);
+ scaleFilter.setDimensions(this.width, this.height);
+ scaleFilter.setPixels(0, 0, this.width, this.height,
+ ColorModel.getRGBdefault(), backBuffer, 0, this.width);
+ scaleFilter.imageComplete(ImageConsumer.STATICIMAGEDONE);
+ return scaledImage;
+ }
+
+ public ImageProducer getSource() {
+ return offscreenSource;
+ }
+
+ public Component getComponent() {
+ return component;
+ }
+
+ public int[] getBdBackBuffer() {
+ return backBuffer;
+ }
+
+ public int[] getBackBuffer() {
+ System.err.println("**** BDIMAGE GETBACKBUFFER ****");
+ return backBuffer;
+ }
+
+ public Area getDirtyArea() {
+ return dirty;
+ }
+
+ public GraphicsConfiguration getGraphicsConfiguration() {
+ return gc;
+ }
+
+ protected void addObserver(ImageObserver observer) {
+ if (observer != null && !isObserver(observer))
+ observers.addElement(observer);
+ }
+
+ protected boolean isObserver(ImageObserver observer) {
+ return observers.contains(observer);
+ }
+
+ protected void removeObserver(ImageObserver observer) {
+ observers.removeElement(observer);
+ }
+
+ protected void notifyObservers(Image img, int info, int x, int y, int w, int h) {
+ Enumeration enumeration = observers.elements();
+ Vector acquired = null;
+ while (enumeration.hasMoreElements()) {
+ ImageObserver observer = (ImageObserver)enumeration.nextElement();
+ if (!observer.imageUpdate(img, info, x, y, w, h)) {
+ if (acquired == null) {
+ acquired = new Vector();
+ }
+ acquired.addElement(observer);
+ }
+ }
+ if (acquired != null) {
+ enumeration = acquired.elements();
+ while (enumeration.hasMoreElements()) {
+ ImageObserver observer = (ImageObserver)enumeration.nextElement();
+ removeObserver(observer);
+ }
+ }
+ }
+
+ public int getType() {
+ return BufferedImage.TYPE_INT_ARGB;
+ }
+
+ public ColorModel getColorModel() {
+ return new DirectColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+ 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, true,
+ DataBuffer.TYPE_INT);
+ }
+
+ public int getRGB(int x, int y) {
+ return backBuffer[y * width + x];
+ }
+
+ public int[] getRGB(int x, int y, int w, int h, int[] rgbArray, int offset, int scansize) {
+ if (rgbArray == null)
+ rgbArray = new int[offset + h * scansize];
+
+ for (int i = 0; i < h; i++)
+ System.arraycopy(backBuffer, (y + i) * width + x,
+ rgbArray, i * scansize + offset,
+ w);
+ return rgbArray;
+ }
+
+ public synchronized void setRGB(int x, int y, int rgb) {
+ backBuffer[y * width + x] = rgb;
+
+ dirty.add(x, y);
+ }
+
+ public void setRGB(int x, int y, int w, int h, int[] rgbArray, int offset, int scansize) {
+ for (int i = 0; i < h; i++)
+ System.arraycopy(rgbArray, i * scansize + offset,
+ backBuffer, (y + i) * width + x,
+ w);
+ dirty.add(new Rectangle(x, y, w, h));
+ }
+
+ public BufferedImage getSubimage(int x, int y, int w, int h) {
+ BDImage image = new BDImage(component, w, h, gc);
+ int[] rgbArray = image.getBdBackBuffer();
+ getRGB(x, y, w, h, rgbArray, 0, w);
+ return createBuffededImage(image);
+ }
+
+ public static BufferedImage getBuffededImage(int w, int h, GraphicsConfiguration gc) {
+ BDImage image = new BDImage(null, w, h, gc);
+ return createBuffededImage(image);
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/java/awt/BDImageConsumer.java Added

@@ -0,0 +1,184 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+import java.awt.*;
+import java.util.Hashtable;
+import java.awt.image.ImageProducer;
+import java.awt.image.ImageObserver;
+import java.awt.image.ImageConsumer;
+import java.awt.image.ColorModel;
+
+public class BDImageConsumer extends BDImage implements ImageConsumer {
+ private Hashtable properties;
+ private ImageProducer producer;
+ private int status;
+ private boolean started;
+
+ public BDImageConsumer(ImageProducer producer) {
+ super(null, -1, -1, null);
+ this.producer = producer;
+ }
+
+ public int getWidth(ImageObserver observer) {
+ if (width < 0) {
+ addObserver(observer);
+ startProduction();
+ }
+ return width;
+ }
+
+ public int getHeight(ImageObserver observer) {
+ if (height < 0) {
+ addObserver(observer);
+ startProduction();
+ }
+ return height;
+ }
+
+ public boolean isComplete(ImageObserver observer) {
+ if ((status & ImageObserver.ALLBITS) != 0)
+ return true;
+ if (observer != null)
+ if (observer.imageUpdate(this, status, 0, 0, width, height))
+ addObserver(observer);
+ return false;
+ }
+
+ public int checkImage(ImageObserver observer) {
+ if (observer != null)
+ if (observer.imageUpdate(this, status, 0, 0, width, height))
+ addObserver(observer);
+ return status;
+ }
+
+ public boolean prepareImage(ImageObserver observer) {
+ if (started) {
+ if (observer != null)
+ if (observer.imageUpdate(this, status, 0, 0, width, height))
+ addObserver(observer);
+ } else {
+ addObserver(observer);
+ startProduction();
+ }
+ return ((status & ImageObserver.ALLBITS) != 0);
+ }
+
+ public ImageProducer getSource() {
+ return producer;
+ }
+
+ public void flush() {
+ width = -1;
+ height = -1;
+ backBuffer = null;
+ status = 0;
+ started = false;
+ producer.removeConsumer(this);
+ BDToolkit.clearCache(this);
+ }
+
+ public void imageComplete(int stat) {
+ switch (stat) {
+ case IMAGEERROR:
+ status |= ImageObserver.ERROR;
+ notifyObservers(this, ImageObserver.ERROR, 0, 0, width, height);
+ break;
+ case SINGLEFRAMEDONE:
+ status |= ImageObserver.FRAMEBITS;
+ notifyObservers(this, ImageObserver.FRAMEBITS, 0, 0, width, height);
+ break;
+ case STATICIMAGEDONE:
+ status |= ImageObserver.ALLBITS;
+ notifyObservers(this, ImageObserver.ALLBITS, 0, 0, width, height);
+ break;
+ case IMAGEABORTED:
+ status |= ImageObserver.ABORT;
+ notifyObservers(this, ImageObserver.ABORT, 0, 0, width, height);
+ break;
+ }
+ }
+
+ public void setColorModel(ColorModel cm) {
+
+ }
+
+ public void setDimensions(int width, int height) {
+ if ((width >= 0) && (height >= 0)) {
+ this.width = width;
+ this.height = height;
+ backBuffer = new int[width * height];
+ status |= ImageObserver.WIDTH | ImageObserver.HEIGHT;
+ notifyObservers(this, ImageObserver.WIDTH | ImageObserver.HEIGHT, 0, 0, width, height);
+ }
+ }
+
+ public Object getProperty(String name) {
+ if (properties == null)
+ return null;
+ return properties.get(name);
+ }
+
+ public Object getProperty(String name, ImageObserver observer) {
+ if (properties == null) {
+ addObserver(observer);
+ return null;
+ }
+ return properties.get(name);
+ }
+
+ public void setProperties(Hashtable props) {
+ properties = props;
+ status |= ImageObserver.PROPERTIES;
+ notifyObservers(this, ImageObserver.PROPERTIES, 0, 0, width, height);
+ }
+
+ public void setHints(int hints) {
+
+ }
+
+ public void setPixels(int x, int y, int w, int h, ColorModel cm, byte[] pixels, int offset, int scansize) {
+ int X, Y;
+ for (Y = y; Y < (y + h); Y++)
+ for (X = x; X < (x + w); X++)
+ backBuffer[Y * width + X] = cm.getRGB(pixels[offset + (Y - y) * scansize + (X - x)] & 0xFF);
+ status |= ImageObserver.SOMEBITS;
+ notifyObservers(this, ImageObserver.SOMEBITS, x, y, w, h);
+ }
+
+ public void setPixels(int x, int y, int w, int h, ColorModel cm, int[] pixels, int offset, int scansize) {
+ int X, Y;
+ for (Y = y; Y < (y + h); Y++)
+ for (X = x; X < (x + w); X++)
+ backBuffer[Y * width + X] = cm.getRGB(pixels[offset + (Y - y) * scansize + (X - x)]);
+ status |= ImageObserver.SOMEBITS;
+ notifyObservers(this, ImageObserver.SOMEBITS, x, y, w, h);
+ }
+
+ protected synchronized void startProduction() {
+ if (producer != null && !started) {
+ if (!producer.isConsumer(this))
+ producer.addConsumer(this);
+ started = true;
+ producer.startProduction(this);
+ }
+ }
+
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/java/awt/BDJHelper.java Added

@@ -0,0 +1,92 @@
+ /*
+ * This file is part of libbluray
+ * Copyright (C) 2012 Libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+import java.awt.event.InvocationEvent;
+import java.awt.event.KeyEvent;
+
+public class BDJHelper {
+
+ public static EventDispatchThread getEventDispatchThread(EventQueue eq) {
+ if (eq != null) {
+ return eq.getDispatchThread();
+ }
+ return null;
+ }
+
+ public static void stopEventQueue(EventQueue eq) {
+ EventDispatchThread t = eq.getDispatchThread();
+ if (t != null && t.isAlive()) {
+
+ final long DISPOSAL_TIMEOUT = 5000;
+ final Object notificationLock = new Object();
+ Runnable runnable = new Runnable() { public void run() {
+ synchronized(notificationLock) {
+ notificationLock.notifyAll();
+ }
+ } };
+
+ synchronized (notificationLock) {
+ eq.postEvent(new InvocationEvent(Toolkit.getDefaultToolkit(), runnable));
+ try {
+ notificationLock.wait(DISPOSAL_TIMEOUT);
+ } catch (InterruptedException e) {
+ }
+ }
+
+ t.stopDispatching();
+ if (t.isAlive()) {
+ t.interrupt();
+ }
+
+ try {
+ t.join(1000);
+ } catch (InterruptedException e) {
+ }
+ if (t.isAlive()) {
+ org.videolan.Logger.getLogger("BDRootWindow").error("stopEventQueue() failed for " + t);
+ org.videolan.PortingHelper.stopThread(t);
+ }
+ }
+ }
+
+ public static boolean postKeyEvent(int id, int modifiers, int keyCode) {
+ Component focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getGlobalFocusOwner();
+ if (focusOwner != null) {
+ long when = System.currentTimeMillis();
+ KeyEvent event;
+ try {
+ if (id == KeyEvent.KEY_TYPED)
+ event = new KeyEvent(focusOwner, id, when, modifiers, KeyEvent.VK_UNDEFINED, (char)keyCode);
+ else
+ event = new KeyEvent(focusOwner, id, when, modifiers, keyCode, KeyEvent.CHAR_UNDEFINED);
+ BDToolkit.getEventQueue(focusOwner).postEvent(event);
+ return true;
+ } catch (Throwable e) {
+ org.videolan.Logger.getLogger("BDJHelper").error("postKeyEvent failed: " + e);
+ }
+ } else {
+ org.videolan.Logger.getLogger("BDJHelper").error("*** KEY event dropped ***");
+ }
+
+ return false;
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/java/awt/BDOffScreenImageSource.java Added

@@ -0,0 +1,89 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+import java.util.Hashtable;
+import java.awt.Component;
+import java.awt.color.ColorSpace;
+import java.awt.image.ColorModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.DirectColorModel;
+import java.awt.image.ImageConsumer;
+import java.awt.image.ImageProducer;
+
+class BDOffScreenImageSource implements ImageProducer {
+ private ImageConsumer consumer;
+ private int width;
+ private int height;
+ private int[] buffer;
+
+ public BDOffScreenImageSource(int[] buffer, int w, int h) {
+ width = w;
+ height = h;
+ this.buffer = buffer;
+ }
+
+ public synchronized void addConsumer(ImageConsumer ic) {
+ consumer = ic;
+ produce();
+ }
+
+ public synchronized boolean isConsumer(ImageConsumer ic) {
+ return (ic == consumer);
+ }
+
+ public synchronized void removeConsumer(ImageConsumer ic) {
+ if (consumer == ic) {
+ consumer = null;
+ }
+ }
+
+ public void startProduction(ImageConsumer ic) {
+ addConsumer(ic);
+ }
+
+ private ColorModel getColorModel() {
+ return new DirectColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+ 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, true,
+ DataBuffer.TYPE_INT);
+ }
+
+ private void sendPixels()
+ {
+ if (consumer != null) {
+ consumer.setPixels(0, 0, width, height, getColorModel(), buffer, 0, width);
+ }
+ }
+
+ private void produce() {
+ if (consumer != null) {
+ consumer.setDimensions(width, height);
+ }
+ if (consumer != null) {
+ consumer.setProperties(new Hashtable());
+ }
+ sendPixels();
+ if (consumer != null) {
+ consumer.imageComplete(ImageConsumer.SINGLEFRAMEDONE);
+ }
+ }
+
+ public void requestTopDownLeftRightResend(ImageConsumer ic) {}
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/java/awt/BDRootWindow.java Added

@@ -0,0 +1,183 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 Libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+import java.util.Arrays;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.videolan.Logger;
+import org.videolan.Libbluray;
+
+public class BDRootWindow extends Frame {
+
+ public BDRootWindow () {
+ super();
+ setUndecorated(true);
+ setBackground(new Color(0, 0, 0, 0));
+ BDToolkit.setFocusedWindow(this);
+ }
+
+ public Area getDirtyArea() {
+ return dirty;
+ }
+
+ public void setBounds(int x, int y, int width, int height) {
+ if (!isVisible()) {
+ if ((width > 0) && (height > 0)) {
+ if ((backBuffer == null) || (getWidth() * getHeight() < width * height)) {
+ backBuffer = new int[width * height];
+ Arrays.fill(backBuffer, 0);
+ }
+ }
+ super.setBounds(x, y, width, height);
+ }
+ }
+
+ public int[] getBdBackBuffer() {
+ return backBuffer;
+ }
+
+ public Image getBackBuffer() {
+ /* exists only in J2SE */
+ logger.unimplemented("getBackBuffer");
+ return null;
+ }
+
+ public void notifyChanged() {
+ if (!isVisible()) {
+ logger.error("sync(): not visible");
+ return;
+ }
+ synchronized (this) {
+ if (timer == null) {
+ logger.error("notifyChanged(): window already disposed");
+ return;
+ }
+ changeCount++;
+ if (timerTask == null) {
+ timerTask = new RefreshTimerTask(this);
+ timer.schedule(timerTask, 40, 40);
+ }
+ }
+ }
+
+ public void sync() {
+ synchronized (this) {
+ if (timerTask != null) {
+ timerTask.cancel();
+ timerTask = null;
+ }
+ changeCount = 0;
+
+ Area a = dirty.getBounds();
+ dirty.clear();
+
+ if (!a.isEmpty()) {
+ if (!overlay_open) {
+ Libbluray.updateGraphic(getWidth(), getHeight(), null);
+ overlay_open = true;
+ a = new Area(getWidth(), getHeight()); /* force full plane update */
+ }
+ Libbluray.updateGraphic(getWidth(), getHeight(), backBuffer, a.x0, a.y0, a.x1, a.y1);
+ }
+ }
+ }
+
+ private class RefreshTimerTask extends TimerTask {
+ public RefreshTimerTask(BDRootWindow window) {
+ this.window = window;
+ this.changeCount = window.changeCount;
+ }
+
+ public void run() {
+ synchronized (window) {
+ if (this.changeCount == window.changeCount)
+ window.sync();
+ else
+ this.changeCount = window.changeCount;
+ }
+ }
+
+ private BDRootWindow window;
+ private int changeCount;
+ }
+
+ private void close() {
+ synchronized (this) {
+ if (overlay_open) {
+ Libbluray.updateGraphic(0, 0, null);
+ overlay_open = false;
+ }
+ }
+ }
+
+ public void setVisible(boolean visible) {
+
+ super.setVisible(visible);
+
+ if (!visible) {
+ close();
+ }
+ }
+
+ /* called when new title starts (window is "created" again) */
+ public void clearOverlay() {
+ if (overlay_open) {
+ logger.error("clearOverlay() ignored (overlay is visible)");
+ } else {
+ Arrays.fill(backBuffer, 0);
+ dirty.clear();
+ }
+ }
+
+ public void dispose()
+ {
+ synchronized (this) {
+ if (timerTask != null) {
+ timerTask.cancel();
+ timerTask = null;
+ }
+ if (timer != null) {
+ timer.cancel();
+ timer = null;
+ }
+ }
+
+ if (isVisible()) {
+ hide();
+ }
+
+ BDToolkit.setFocusedWindow(null);
+
+ super.dispose();
+ }
+
+ private int[] backBuffer = null;
+ private Area dirty = new Area();
+ private int changeCount = 0;
+ private Timer timer = new Timer();
+ private TimerTask timerTask = null;
+ private boolean overlay_open = false;
+
+ private static final Logger logger = Logger.getLogger(BDRootWindow.class.getName());
+
+ private static final long serialVersionUID = -8325961861529007953L;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/java/awt/BDWindowGraphics.java Added

@@ -0,0 +1,166 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package java.awt;
+
+import java.awt.image.ImageObserver;
+
+public class BDWindowGraphics extends BDGraphics {
+ private BDRootWindow window;
+
+ BDWindowGraphics(BDWindowGraphics g) {
+ super(g);
+ window = g.window;
+ }
+
+ public BDWindowGraphics(BDRootWindow window) {
+ super(window);
+ this.window = window;
+ }
+
+ public Graphics create() {
+ return new BDWindowGraphics(this);
+ }
+
+ public void clearRect(int x, int y, int w, int h) {
+ synchronized (window) {
+ super.clearRect(x, y, w, h);
+ window.notifyChanged();
+ }
+ }
+
+ public void fillRect(int x, int y, int w, int h) {
+ synchronized (window) {
+ super.fillRect(x, y, w, h);
+ window.notifyChanged();
+ }
+ }
+
+ public void drawRect(int x, int y, int w, int h) {
+ synchronized (window) {
+ super.drawRect(x, y, w, h);
+ window.notifyChanged();
+ }
+ }
+
+ public void drawLine(int x1, int y1, int x2, int y2) {
+ synchronized (window) {
+ super.drawLine(x1, y1, x2, y2);
+ window.notifyChanged();
+ }
+ }
+
+ public void copyArea(int x, int y, int w, int h, int dx, int dy) {
+ synchronized (window) {
+ super.copyArea(x, y, w, h, dx, dy);
+ window.notifyChanged();
+ }
+ }
+
+ public void drawPolyline(int xPoints[], int yPoints[], int nPoints) {
+ synchronized (window) {
+ super.drawPolyline(xPoints, yPoints, nPoints);
+ window.notifyChanged();
+ }
+ }
+
+ public void drawPolygon(int xPoints[], int yPoints[], int nPoints) {
+ synchronized (window) {
+ super.drawPolygon(xPoints, yPoints, nPoints);
+ window.notifyChanged();
+ }
+ }
+
+ public void fillPolygon(int xPoints[], int yPoints[], int nPoints) {
+ synchronized (window) {
+ super.fillPolygon(xPoints, yPoints, nPoints);
+ window.notifyChanged();
+ }
+ }
+
+ public void drawOval(int x, int y, int w, int h) {
+ synchronized (window) {
+ super.drawOval(x, y, w, h);
+ window.notifyChanged();
+ }
+ }
+
+ public void fillOval(int x, int y, int w, int h) {
+ synchronized (window) {
+ super.fillOval(x, y, w, h);
+ window.notifyChanged();
+ }
+ }
+
+ public void drawArc(int x, int y, int w, int h, int startAngle, int endAngle) {
+ synchronized (window) {
+ super.drawArc(x, y, w, h, startAngle, endAngle);
+ window.notifyChanged();
+ }
+ }
+
+ public void fillArc(int x, int y, int w, int h, int startAngle, int endAngle) {
+ synchronized (window) {
+ super.fillArc(x, y, w, h, startAngle, endAngle);
+ window.notifyChanged();
+ }
+ }
+
+ public void drawRoundRect(int x, int y, int w, int h, int arcWidth, int arcHeight) {
+ synchronized (window) {
+ super.drawRoundRect(x, y, w, h, arcWidth, arcHeight);
+ window.notifyChanged();
+ }
+ }
+
+ public void fillRoundRect(int x, int y, int w, int h, int arcWidth, int arcHeight) {
+ synchronized (window) {
+ super.fillRoundRect(x, y, w, h, arcWidth, arcHeight);
+ window.notifyChanged();
+ }
+ }
+
+ public void drawStringN(long ftFace, String string, int x, int y, int rgb) {
+ synchronized (window) {
+ super.drawStringN(ftFace, string, x, y, rgb);
+ window.notifyChanged();
+ }
+ }
+
+ public void dispose() {
+ super.dispose();
+ window = null;
+ }
+
+ public boolean drawImageN(Image img,
+ int dx, int dy, int dw, int dh,
+ int sx, int sy, int sw, int sh,
+ Color bg, ImageObserver observer) {
+
+ synchronized (window) {
+ boolean complete = super.drawImageN(
+ img, dx, dy, dw, dh, sx, sy, sw, sh,
+ bg, observer);
+ if (complete) {
+ window.notifyChanged();
+ }
+ return complete;
+ }
+ }
+}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/javax/media/Manager.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/media/Manager.java Changed

@@ -3,12 +3,12 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.Vector;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javax.media.protocol.DataSource;
 import javax.media.protocol.URLDataSource;
 
+import org.videolan.Logger;
+
 /**
 * This file is a stripped down version of the Manager class from FMJ (fmj-sf.net)
 * @author Ken Larson
@@ -25,13 +25,11 @@
 throws IOException, NoPlayerException
 {
 final String protocol = sourceLocator.getProtocol();
- final Vector<?> dataSourceList = getDataSourceList(protocol);
- for (int i = 0; i < dataSourceList.size(); ++i)
- {
+ final Vector dataSourceList = getDataSourceList(protocol);
+ for (int i = 0; i < dataSourceList.size(); ++i) {
 String dataSourceClassName = (String) dataSourceList.get(i);
- try
- {
- final Class<?> dataSourceClass = Class.forName(dataSourceClassName);
+ try {
+ final Class dataSourceClass = Class.forName(dataSourceClassName);
 final DataSource dataSource = (DataSource) dataSourceClass.newInstance();
 dataSource.setLocator(sourceLocator);
 dataSource.connect();
@@ -49,22 +47,22 @@
 }
 catch (ClassNotFoundException e)
 {
- logger.warning("createPlayer: " + e); // no need for call stack
+ logger.warning("createPlayer: " + e); // no need for call stack
 continue;
 } 
 catch (IOException e)
 {
- logger.log(Level.WARNING, "" + e, e);
+ logger.warning("" + e);
 continue;
 }
 catch (NoClassDefFoundError e)
 {
- logger.log(Level.WARNING, "" + e, e);
+ logger.warning("" + e);
 continue;
 }
 catch (Exception e)
 {
- logger.log(Level.WARNING, "" + e, e);
+ logger.warning("" + e);
 continue;
 }
 
@@ -78,7 +76,8 @@
 url = sourceLocator.getURL();
 }
 catch (Exception e)
- { logger.log(Level.WARNING, "" + e, e);
+ {
+ logger.warning("" + e);
 throw new NoPlayerException();
 }
 final URLDataSource dataSource = new URLDataSource(url);
@@ -107,13 +106,13 @@
 throws IOException, NoDataSourceException
 {
 final String protocol = sourceLocator.getProtocol();
- final Vector<?> dataSourceList = getDataSourceList(protocol);
+ final Vector dataSourceList = getDataSourceList(protocol);
 for (int i = 0; i < dataSourceList.size(); ++i)
 {
 String dataSourceClassName = (String) dataSourceList.get(i);
 try
 {
- final Class<?> dataSourceClass = Class.forName(dataSourceClassName);
+ final Class dataSourceClass = Class.forName(dataSourceClassName);
 final DataSource dataSource = (DataSource) dataSourceClass.newInstance();
 dataSource.setLocator(sourceLocator);
 dataSource.connect();
@@ -128,17 +127,17 @@
 }
 catch (IOException e)
 {
- logger.log(Level.WARNING, "" + e, e);
+ logger.warning("" + e);
 continue;
 }
 catch (NoClassDefFoundError e)
 {
- logger.log(Level.WARNING, "" + e, e);
+ logger.warning("" + e);
 continue;
 }
 catch (Exception e)
 {
- logger.log(Level.WARNING, "" + e, e);
+ logger.warning("" + e);
 continue;
 }
 
@@ -152,7 +151,8 @@
 url = sourceLocator.getURL();
 }
 catch (Exception e)
- { logger.log(Level.WARNING, "" + e, e);
+ {
+ logger.warning("" + e);
 throw new NoDataSourceException();
 }
 final URLDataSource dataSource = new URLDataSource(url);
@@ -165,12 +165,12 @@
 return systemTimeBase;
 }
 
- public static Vector<?> getDataSourceList(String protocolName)
+ public static Vector getDataSourceList(String protocolName)
 {
 return getClassList(protocolName, PackageManager.getProtocolPrefixList(), "protocol", "DataSource");
 }
 
- public static Vector<?> getHandlerClassList(String contentName)
+ public static Vector getHandlerClassList(String contentName)
 {
 return getClassList(toPackageFriendly(contentName), PackageManager.getContentPrefixList(), "content", "Handler");
 }
@@ -178,7 +178,7 @@
 private static Player createPlayer(DataSource source, String contentType)
 throws IOException, NoPlayerException
 {
- final Vector<?> handlerClassList = getHandlerClassList(contentType);
+ final Vector handlerClassList = getHandlerClassList(contentType);
 for (int i = 0; i < handlerClassList.size(); ++i)
 {
 final String handlerClassName = (String) handlerClassList.get(i);
@@ -186,7 +186,7 @@
 try
 {
 System.out.println(handlerClassName);
- final Class<?> handlerClass = Class.forName(handlerClassName);
+ final Class handlerClass = Class.forName(handlerClassName);
 if (!Player.class.isAssignableFrom(handlerClass) && 
 !MediaProxy.class.isAssignableFrom(handlerClass))
 continue; // skip any classes that will not be matched below.
@@ -213,7 +213,7 @@
 }
 catch (IOException e)
 {
- logger.log(Level.WARNING, "" + e, e);
+ logger.warning("" + e);
 continue;
 }
 catch (NoPlayerException e)
@@ -222,12 +222,12 @@
 }
 catch (NoClassDefFoundError e)
 {
- logger.log(Level.WARNING, "" + e, e);
+ logger.warning("" + e);
 continue;
 }
 catch (Exception e)
 {
- logger.log(Level.WARNING, "" + e, e);
+ logger.warning("" + e);
 continue;
 }
 }
@@ -260,10 +260,9 @@
 return b.toString();
 }
 
- public static Vector<String> getClassList(String contentName, Vector<?> packages, String component2, String className)
+ public static Vector getClassList(String contentName, Vector packages, String component2, String className)
 {
- 
- final Vector<String> result = new Vector<String>();
+ final Vector result = new Vector();
 //result.add("media." + component2 + "." + contentName + "." + className);
 
 for (int i = 0; i < packages.size(); ++i)

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/javax/media/MediaLocator.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/media/MediaLocator.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/javax/media/PackageManager.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/media/PackageManager.java Changed

@@ -26,12 +26,12 @@
 {
 }
 
- public static Vector<?> getProtocolPrefixList()
+ public static Vector getProtocolPrefixList()
 {
 return protocolPrefix;
 }
 
- public static void setProtocolPrefixList(Vector<?> list)
+ public static void setProtocolPrefixList(Vector list)
 {
 protocolPrefixTemp = list;
 }
@@ -41,15 +41,15 @@
 SecurityManager sec = System.getSecurityManager();
 if (sec != null)
 sec.checkPropertiesAccess();
- protocolPrefix = (Vector<?>) protocolPrefixTemp.clone();
+ protocolPrefix = (Vector) protocolPrefixTemp.clone();
 }
 
-	public static Vector<?> getContentPrefixList()
+	public static Vector getContentPrefixList()
 {
 return contentPrefix;
 }
 
- public static void setContentPrefixList(Vector<?> list)
+ public static void setContentPrefixList(Vector list)
 {
 contentPrefixTemp = list;
 }
@@ -59,11 +59,11 @@
 SecurityManager sec = System.getSecurityManager();
 if (sec != null)
 sec.checkPropertiesAccess();
- contentPrefix = (Vector<?>) contentPrefixTemp.clone();
+ contentPrefix = (Vector) contentPrefixTemp.clone();
 }
 
- private static Vector<?> protocolPrefixTemp = null;
- private static Vector<?> contentPrefixTemp = null;
- private static Vector<?> protocolPrefix = null;
- private static Vector<?> contentPrefix = null;
+ private static Vector protocolPrefixTemp = null;
+ private static Vector contentPrefixTemp = null;
+ private static Vector protocolPrefix = null;
+ private static Vector contentPrefix = null;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/javax/media/protocol/ContentDescriptor.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/media/protocol/ContentDescriptor.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/javax/media/protocol/URLDataSource.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/media/protocol/URLDataSource.java Changed

@@ -23,6 +23,8 @@
 import java.net.URL;
 import java.net.URLConnection;
 import javax.media.Time;
+import javax.media.Duration;
+import javax.media.MediaLocator;
 
 public class URLDataSource extends PullDataSource {
     protected URLDataSource()
@@ -31,55 +33,77 @@
 
     public URLDataSource(URL url) throws IOException
     {
-        throw new Error("Not implemented");
+        setLocator(new MediaLocator(url));
+        this.connected = false;
     }
 
     public PullSourceStream[] getStreams()
     {
-        throw new Error("Not implemented");
+        if (!this.connected)
+            throw new Error("Unconnected source.");
+        return this.sources;
     }
 
     public void connect() throws IOException
     {
-        throw new Error("Not implemented");
+        this.conn = getLocator().getURL().openConnection();
+        this.conn.connect();
+        this.connected = true;
+        String str = this.conn.getContentType();
+        if (str == null)
+            str = "UnknownContent";
+        this.contentType = new ContentDescriptor(ContentDescriptor.mimeTypeToPackageName(str));
+        this.sources = new URLSourceStream[1];
+        this.sources[0] = new URLSourceStream(this.conn, this.contentType);
     }
 
     public String getContentType()
     {
-        throw new Error("Not implemented");
+        if (!this.connected)
+            throw new Error("Source is unconnected.");
+        return this.contentType.getContentType();
     }
 
     public void disconnect()
     {
-        throw new Error("Not implemented");
+        if (this.connected)
+        {
+            try
+            {
+                this.sources[0].close();
+            }
+            catch (IOException localIOException)
+            {
+            }
+            this.connected = false;
+        }
     }
 
     public void start() throws IOException
     {
-        throw new Error("Not implemented");
     }
 
     public void stop() throws IOException
     {
-        throw new Error("Not implemented");
     }
 
     public Time getDuration()
     {
-        throw new Error("Not implemented");
+        return Duration.DURATION_UNKNOWN;
     }
 
     public Object[] getControls()
     {
-        throw new Error("Not implemented");
+        return new Object[0];
     }
 
     public Object getControl(String controlName)
     {
-        throw new Error("Not implemented");
+        return null;
     }
 
     protected URLConnection conn;
     protected ContentDescriptor contentType;
     protected boolean connected;
+    private URLSourceStream[] sources;
 }

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/media/protocol/URLSourceStream.java Added

@@ -0,0 +1,98 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package javax.media.protocol;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLConnection;
+
+class URLSourceStream
+ implements PullSourceStream
+{
+ protected URLConnection conn;
+ protected InputStream stream;
+ protected boolean eosReached;
+ ContentDescriptor contentType;
+
+ public URLSourceStream(URLConnection conn, ContentDescriptor type)
+ throws IOException
+ {
+ this.conn = conn;
+ this.stream = conn.getInputStream();
+ this.eosReached = false;
+ this.contentType = type;
+ }
+
+ public ContentDescriptor getContentDescriptor()
+ {
+ return this.contentType;
+ }
+
+ public boolean willReadBlock()
+ {
+ if (this.eosReached == true)
+ return true;
+ try
+ {
+ return this.stream.available() == 0;
+ }
+ catch (IOException e)
+ {
+ }
+ return true;
+ }
+
+ public int read(byte[] buffer, int offset, int length)
+ throws IOException
+ {
+ int bytesRead = this.stream.read(buffer, offset, length);
+ if (bytesRead == -1)
+ this.eosReached = true;
+ return bytesRead;
+ }
+
+ public void close()
+ throws IOException
+ {
+ this.stream.close();
+ }
+
+ public boolean endOfStream()
+ {
+ return this.eosReached;
+ }
+
+ public Object[] getControls()
+ {
+ return new Object[0];
+ }
+
+ public Object getControl(String controlName)
+ {
+ return null;
+ }
+
+ public long getContentLength()
+ {
+ long len = this.conn.getContentLength();
+ len = len == -1L ? -1L : len;
+
+ return len;
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/microedition Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/microedition/xlet Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/microedition/xlet/UnavailableContainerException.java Added

@@ -0,0 +1,29 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package javax.microedition.xlet;
+
+public class UnavailableContainerException extends Exception {
+ public UnavailableContainerException() {
+ super();
+ }
+
+ public UnavailableContainerException(String s) {
+ super(s);
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/microedition/xlet/XletContext.java Added

@@ -0,0 +1,37 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package javax.microedition.xlet;
+
+import java.awt.Container;
+
+public interface XletContext {
+ public static final String ARGS = "javax.microedition.xlet.args";
+
+ public void notifyDestroyed();
+
+ public void notifyPaused();
+
+ public Object getXletProperty(String key);
+
+ public void resumeRequest();
+
+ public Container getContainer() throws UnavailableContainerException;
+
+ public java.lang.ClassLoader getClassLoader();
+}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/javax/tv/graphics/TVContainer.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/tv/graphics/TVContainer.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/javax/tv/locator/LocatorFactory.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/tv/locator/LocatorFactory.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/javax/tv/locator/LocatorFactoryImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/tv/locator/LocatorFactoryImpl.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/javax/tv/locator/LocatorImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/tv/locator/LocatorImpl.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/javax/tv/media/MediaSelectPermission.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/tv/media/MediaSelectPermission.java Changed

@@ -26,28 +26,26 @@
 public final class MediaSelectPermission extends Permission
     implements Serializable
 {
-    public MediaSelectPermission(Locator locator) { 
-        super(locator.toExternalForm());
-        
+    public MediaSelectPermission(Locator locator) {
+        super("javax.tv.media.MediaSelectPermission");
+
+        if (locator == null)
+            this.locator = "*";
+        else
         this.locator = locator.toExternalForm();
     }
 
-    public MediaSelectPermission(String locator, String actions) { 
-        super(locator);
-        
+    public MediaSelectPermission(String locator, String actions) {
+        super("javax.tv.media.MediaSelectPermission");
+
         this.locator = locator;
-        
-        if (actions != null)
-            assert false; // should never happen
     }
 
     public boolean implies(Permission perm) {
-        return (perm instanceof MediaSelectPermission) && (this.equals(perm) || this.equals("*"));
+        return (perm instanceof MediaSelectPermission) && (this.equals(perm) || this.locator.equals("*"));
     }
 
-    @Override
-    public boolean equals(Object obj)
-    {
+    public boolean equals(Object obj) {
         if (this == obj)
             return true;
         if (getClass() != obj.getClass())
@@ -61,9 +59,7 @@
         return true;
     }
 
-    @Override
-    public int hashCode()
-    {
+    public int hashCode() {
         final int prime = 31;
         int result = prime + ((locator == null) ? 0 : locator.hashCode());
         return result;
@@ -72,7 +68,7 @@
     public String getActions() {
         return "";
     }
-    
+
     private String locator;
     private static final long serialVersionUID = 128534275081685853L;
 }

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/tv/service/RatingDimensionImpl.java Added

@@ -0,0 +1,41 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package javax.tv.service;
+
+import javax.tv.service.SIException;
+
+public class RatingDimensionImpl implements RatingDimension {
+ public String getDimensionName() {
+ return dimensionName;
+ }
+
+ public short getNumberOfLevels() {
+ return 255;
+ }
+
+ public String[] getRatingLevelDescription(short level) throws SIException {
+ if ((level < 0) || (level >= 255))
+ throw new SIException();
+ String[] description = new String[2];
+ description[0] = description[1] = Short.toString(level);
+ return description;
+ }
+
+ public static final String dimensionName = "BD_ROM_PARENTAL_LOCK";
+}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/javax/tv/service/SIManager.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/tv/service/SIManager.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/javax/tv/service/SIManagerImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/tv/service/SIManagerImpl.java Changed

@@ -19,85 +19,96 @@
 
 package javax.tv.service;
 
+import java.util.LinkedList;
+
 import javax.tv.locator.InvalidLocatorException;
 import javax.tv.locator.Locator;
 import javax.tv.service.navigation.ServiceFilter;
 import javax.tv.service.navigation.ServiceList;
+import javax.tv.service.navigation.ServiceListImpl;
 import javax.tv.service.transport.Transport;
+import javax.tv.service.transport.TransportImpl;
+
+import org.bluray.ti.TitleImpl;
+import org.videolan.Libbluray;
 
 public class SIManagerImpl extends SIManager {
+ public static SIManager createInstance() {
+ synchronized (SIManagerImpl.class) {
+ if (instance == null)
+ instance = new SIManagerImpl();
+ return instance;
+ }
+ }
 
- @Override
- public ServiceList filterServices(ServiceFilter filter)
- {
- throw new Error("Not implemented");
+ protected SIManagerImpl() {
+ int ntitles = Libbluray.getTitles();
+ LinkedList list = new LinkedList();
+ for (int i = 0; i <= ntitles; i++)
+ list.add(new TitleImpl(i));
+ list.add(new TitleImpl(65535));
+ titles = new ServiceListImpl(list);
 }
 
- @Override
- public String getPreferredLanguage()
- {
- throw new Error("Not implemented");
+ public ServiceList filterServices(ServiceFilter filter) {
+ return titles.filterServices(filter);
 }
 
- @Override
- public RatingDimension getRatingDimension(String name) throws SIException
- {
- throw new Error("Not implemented");
+ public String getPreferredLanguage() {
+ return language;
 }
 
- @Override
- public Service getService(Locator locator) throws InvalidLocatorException,
- SecurityException
- {
- throw new Error("Not implemented");
+ public RatingDimension getRatingDimension(String name) throws SIException {
+ if (!name.equals(RatingDimensionImpl.dimensionName))
+ throw new SIException();
+ return new RatingDimensionImpl();
 }
 
- @Override
- public String[] getSupportedDimensions()
- {
- throw new Error("Not implemented");
+ public Service getService(Locator locator) throws InvalidLocatorException, SecurityException {
+ return titles.findService(locator);
 }
 
- @Override
- public Transport[] getTransports()
- {
- throw new Error("Not implemented");
+ public String[] getSupportedDimensions() {
+ String[] dimensions = new String[1];
+ dimensions[0] = RatingDimensionImpl.dimensionName;
+ return dimensions;
+ }
+
+ public Transport[] getTransports() {
+ Transport[] transports = new Transport[1];
+ transports[0] = new TransportImpl();
+ return transports;
 }
 
- @Override
 public void registerInterest(Locator locator, boolean active)
- throws InvalidLocatorException, SecurityException
- {
- throw new Error("Not implemented");
- 
+ throws InvalidLocatorException, SecurityException {
+ org.videolan.Logger.unimplemented(SIManagerImpl.class.getName(), "registerInterest");
 }
 
- @Override
 public SIRequest retrieveProgramEvent(Locator locator, SIRequestor requestor)
- throws InvalidLocatorException, SecurityException
- {
+ throws InvalidLocatorException, SecurityException {
+ org.videolan.Logger.unimplemented(SIManagerImpl.class.getName(), "retrieveProgramEvent");
 throw new Error("Not implemented");
 }
 
- @Override
 public SIRequest retrieveSIElement(Locator locator, SIRequestor requestor)
- throws InvalidLocatorException, SecurityException
- {
+ throws InvalidLocatorException, SecurityException {
+ org.videolan.Logger.unimplemented(SIManagerImpl.class.getName(), "retrieveSIElement");
 throw new Error("Not implemented");
 }
 
- @Override
- public SIRequest retrieveServiceDetails(Locator locator,
- SIRequestor requestor) throws InvalidLocatorException,
- SecurityException
- {
+ public SIRequest retrieveServiceDetails(Locator locator, SIRequestor requestor)
+ throws InvalidLocatorException, SecurityException {
+ org.videolan.Logger.unimplemented(SIManagerImpl.class.getName(), "retrieveServiceDetails");
 throw new Error("Not implemented");
 }
 
- @Override
- public void setPreferredLanguage(String language)
- {
- throw new Error("Not implemented");
+ public void setPreferredLanguage(String language) {
+ this.language = language;
 }
 
+ private ServiceListImpl titles;
+ private String language = null;
+
+ private static SIManagerImpl instance = null;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/javax/tv/service/navigation/LocatorFilter.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/tv/service/navigation/LocatorFilter.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/javax/tv/service/navigation/SIElementFilter.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/tv/service/navigation/SIElementFilter.java Changed

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceIteratorImpl.java Added

@@ -0,0 +1,60 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package javax.tv.service.navigation;
+
+import java.util.LinkedList;
+
+import javax.tv.service.Service;
+
+public class ServiceIteratorImpl implements ServiceIterator {
+ public ServiceIteratorImpl(LinkedList services) {
+ this.services = services;
+ }
+
+ public void toBeginning() {
+ index = 0;
+ }
+
+ public void toEnd() {
+ index = services.size();
+ }
+
+ public Service nextService() {
+ if (index < services.size())
+ return (Service)services.get(index++);
+ return null;
+ }
+
+ public Service previousService() {
+ if (index > 0)
+ return (Service)services.get(--index);
+ return null;
+ }
+
+ public boolean hasNext() {
+ return index < services.size();
+ }
+
+ public boolean hasPrevious() {
+ return index > 0;
+ }
+
+ private LinkedList services;
+ private int index = 0;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceListImpl.java Added

@@ -0,0 +1,123 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package javax.tv.service.navigation;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.LinkedList;
+
+import javax.tv.locator.Locator;
+import javax.tv.locator.InvalidLocatorException;
+import javax.tv.service.Service;
+
+import org.bluray.net.BDLocator;
+import org.bluray.ti.TitleImpl;
+
+public class ServiceListImpl implements ServiceList {
+ public ServiceListImpl(LinkedList services) {
+ this.services = services;
+ }
+
+ public ServiceList sortByName() {
+ Object[] array = services.toArray();
+ Arrays.sort(array, new TitleComparator());
+ LinkedList list = new LinkedList();
+ for (int i = 0; i < array.length; i++)
+ list.add(array[i]);
+ return new ServiceListImpl(list);
+ }
+
+ public ServiceList sortByNumber() throws SortNotAvailableException {
+ return sortByName();
+ }
+
+ public Service findService(Locator locator) throws InvalidLocatorException {
+ BDLocator bdLocator;
+ if (!(locator instanceof BDLocator)) {
+ try {
+ bdLocator = new BDLocator(locator.toExternalForm());
+ } catch (org.davic.net.InvalidLocatorException e) {
+ throw new InvalidLocatorException(locator);
+ }
+ } else {
+ bdLocator = (BDLocator)locator;
+ }
+ int title = bdLocator.getTitleNumber();
+ if (title < 0)
+ throw new InvalidLocatorException(locator);
+ for (int i = 0; i < size(); i++) {
+ TitleImpl ti = (TitleImpl)services.get(i);
+ if (((TitleImpl)services.get(i)).getTitleNum() == title)
+ return ti;
+ }
+ return null;
+ }
+
+ public ServiceList filterServices(ServiceFilter filter) {
+ LinkedList list = new LinkedList();
+ for (int i = 0; i < size(); i++) {
+ Service service = getService(i);
+ if (filter.accept(service))
+ list.add(service);
+ }
+ return new ServiceListImpl(list);
+ }
+
+ public ServiceIterator createServiceIterator() {
+ return new ServiceIteratorImpl(services);
+ }
+
+ public boolean contains(Service service) {
+ return services.contains(service);
+ }
+
+ public int indexOf(Service service) {
+ return services.indexOf(service);
+ }
+
+ public int size() {
+ return services.size();
+ }
+
+ public Service getService(int num) {
+ return (Service)services.get(num);
+ }
+
+ public boolean equals(Object obj) {
+ if (!(obj instanceof ServiceListImpl))
+ return false;
+ return services.equals(((ServiceListImpl)obj).services);
+ }
+
+ public int hashCode() {
+ return services.hashCode();
+ }
+
+ public void addService(Service service) {
+ services.add(service);
+ }
+
+ private class TitleComparator implements Comparator {
+ public int compare(Object obj1, Object obj2) {
+ return ((TitleImpl)obj1).getTitleNum() - ((TitleImpl)obj2).getTitleNum();
+ }
+ }
+
+ private LinkedList services;
+}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextEvent.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextEvent.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextFactory.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextFactory.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextFactoryImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextFactoryImpl.java Changed

@@ -21,36 +21,48 @@
 
 import javax.tv.xlet.XletContext;
 
-import org.bluray.ti.selection.TitleContext;
 import org.bluray.ti.selection.TitleContextImpl;
 
 public class ServiceContextFactoryImpl extends ServiceContextFactory {
+    protected ServiceContextFactoryImpl() {
+        serviceContexts = new ServiceContext[1];
+        serviceContexts[0] = new TitleContextImpl();
+    }
+
+    public static ServiceContextFactory getInstance() {
+        synchronized (ServiceContextFactoryImpl.class) {
+            if (instance == null)
+                instance = new ServiceContextFactoryImpl();
+        }
+        return instance;
+    }
+
     public ServiceContext createServiceContext()
             throws InsufficientResourcesException, SecurityException
     {
-        throw new Error("Not implemented");
+        SecurityManager sec = System.getSecurityManager();
+        if (sec != null)
+            sec.checkPermission(new ServiceContextPermission("create", "own"));
+        throw new InsufficientResourcesException("Only one ServiceContext allowed");
     }
-    
+
     public ServiceContext getServiceContext(XletContext context)
             throws SecurityException, ServiceContextException
     {
         SecurityManager sec = System.getSecurityManager();
         if (sec != null)
             sec.checkPermission(new ServiceContextPermission("access", "own"));
-        
-        return serviceContext;
+        return serviceContexts[0];
     }
 
-    public ServiceContext[] getServiceContexts()
-    {
+    public ServiceContext[] getServiceContexts() {
         SecurityManager sec = System.getSecurityManager();
         if (sec != null)
             sec.checkPermission(new ServiceContextPermission("access", "own"));
-        
-        ServiceContext[] contexts = new ServiceContext[1];
-        contexts[0] = serviceContext;
-        return contexts;
+        return serviceContexts;
     }
 
-    private TitleContext serviceContext = new TitleContextImpl();
+    private ServiceContext[] serviceContexts;
+
+    private static ServiceContextFactoryImpl instance = null;
 }

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/javax/tv/service/transport/TransportImpl.java Added

@@ -0,0 +1,47 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package javax.tv.service.transport;
+
+import java.util.LinkedList;
+
+import javax.tv.service.navigation.DeliverySystemType;
+
+public class TransportImpl implements Transport {
+ public void addServiceDetailsChangeListener(ServiceDetailsChangeListener listener) {
+ synchronized (listeners) {
+ if (!listeners.contains(listener))
+ listeners.add(listener);
+ }
+ }
+
+ public void removeServiceDetailsChangeListener(ServiceDetailsChangeListener listener) {
+ synchronized (listeners) {
+ listeners.remove(listener);
+ }
+ }
+
+ public DeliverySystemType getDeliverySystemType() {
+ return org.bluray.ti.DeliverySystemType.BD_ROM;
+ }
+
+ public void notifyListeners() {
+ }
+
+ private LinkedList listeners = new LinkedList();
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/bdplus Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/bdplus/Status.java Added

@@ -0,0 +1,67 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.bluray.bdplus;
+
+import org.videolan.BDJListeners;
+import org.videolan.Libbluray;
+import org.videolan.Logger;
+
+public class Status {
+ public static Status getInstance() {
+ synchronized (Status.class) {
+ if (instance == null)
+ instance = new Status();
+ }
+ return instance;
+ }
+
+ public void addListener(StatusListener listener) {
+ listeners.add(listener);
+ }
+
+ public int get() {
+ logger.trace("get()");
+ return Libbluray.readPSR(104);
+ }
+
+ public void removeListener(StatusListener listener) {
+ listeners.remove(listener);
+ }
+
+ public void send(int data) {
+ logger.trace("send(" + data + ")");
+ Libbluray.writePSR(103, data);
+ }
+
+ public void set(int data) {
+ logger.trace("set(" + data + ")");
+ Libbluray.writePSR(104, data);
+ }
+
+ public void receive(int data) {
+ logger.trace("receive(" + data + ")");
+ listeners.putPSR102Callback(data);
+ }
+
+ private static Status instance = null;
+ private BDJListeners listeners = new BDJListeners();
+
+ private static final Logger logger = Logger.getLogger(Status.class.getName());
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/bdplus/StatusListener.java Added

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/media/AsynchronousPiPControl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/media/AsynchronousPiPControl.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/media/SubtitlingControl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/media/SubtitlingControl.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/media/UOMaskTableControl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/media/UOMaskTableControl.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/net/BDLocator.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/net/BDLocator.java Changed

@@ -21,392 +21,394 @@
 
 import org.davic.net.Locator;
 import org.davic.net.InvalidLocatorException;
+
 import org.videolan.BDJUtil;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.InputMismatchException;
-import java.util.Scanner;
-import java.util.logging.Logger;
 
 public class BDLocator extends Locator {
-
- public BDLocator(String url) throws InvalidLocatorException
- {
+ public BDLocator(String url) throws InvalidLocatorException {
 super(url);
- 
- logger.info("Parsing locator " + url);
-
 if (!url.startsWith("bd://"))
- throw new InvalidLocatorException("Locator must start with bd:// (" + url + ")");
-
- Scanner scan = new Scanner(url.substring(5));
-
- scan.useDelimiter("[\\.:&]");
-
- try {
- while (scan.hasNext()) {
- String name = scan.next();
- 
- if (scan.hasNext()) {
- if (name.equals("JAR")) {
- scan.useDelimiter("[:]");
- String temp = scan.next();
- jar = Integer.parseInt(temp.substring(0, 5));
- isJarItem = true;
- 
- if (temp.length() > 5)
- pathSegments = temp.substring(5);
- } else if (name.equals("SOUND")) {
- sound = scan.nextInt(16);
- isSoundItem = true;
- } else if (name.equals("PLAYLIST")) {
- playList = scan.nextInt();
- isPlayItem = true;
- 
- parsePlaylist(scan);
- } else if (name.length() == 32)
- disc = name;
- else if (name.length() <= 4)
- titleNum = Integer.parseInt(name, 16);
- else
- throw new InvalidLocatorException("Invalid identifier (" + url + ")");
-
- } else {
- throw new InvalidLocatorException("Missing value (" + url + ")");
- }
- }
- } catch (InputMismatchException ex) {
- throw new InvalidLocatorException("Failed to parse value (" + url + ")");
- } catch (NumberFormatException ex) {
- throw new InvalidLocatorException("Failed to parse value (" + url + ")");
- }
-
- 
+ throw new InvalidLocatorException();
+ String str = url.substring(5);
+ if (!parseJar(str) && !parseSound(str) && !parsePlaylist(str))
+ throw new InvalidLocatorException();
 }
 
- public BDLocator(String disc, int titleNum, int playList) throws InvalidLocatorException
- {
- super("");
- 
+ public BDLocator(String disc, int titleNum, int playList) throws InvalidLocatorException {
+ super(null);
 this.disc = disc;
 this.titleNum = titleNum;
 this.playList = playList;
+ url = getUrl();
 }
 
- public BDLocator(String disc, int titleNum, int jar, int sound) throws InvalidLocatorException
- {
- super("");
- 
+ public BDLocator(String disc, int titleNum, int jar, int sound) throws InvalidLocatorException {
+ super(null);
+ if ((jar >= 0) && (sound >= 0))
+ throw new InvalidLocatorException();
 this.disc = disc;
 this.titleNum = titleNum;
 this.jar = jar;
 this.sound = sound;
+ url = getUrl();
 }
 
 public BDLocator(String disc, int titleNum, int playList, int playItem, int mark, String[] componentTags)
- throws InvalidLocatorException
- {
- super("");
- 
+ throws InvalidLocatorException {
+ super(null);
 this.disc = disc;
 this.titleNum = titleNum;
 this.playList = playList;
 this.playItem = playItem;
 this.mark = mark;
- this.componentTags = componentTags.clone();
- 
- for (String comp : componentTags) {
- if (comp.startsWith("A1:"))
- primaryAudioNum = Integer.parseInt(comp.substring(3));
- else if (comp.startsWith("A2:"))
- secondaryAudioNum = Integer.parseInt(comp.substring(3));
- else if (comp.startsWith("V1:"))
- primaryVideoNum = Integer.parseInt(comp.substring(3));
- else if (comp.startsWith("V2:"))
- secondaryVideoNum = Integer.parseInt(comp.substring(3));
- else if (comp.startsWith("P:"))
- textStreamNum = Integer.parseInt(comp.substring(2));
- else
- throw new InvalidLocatorException("Invalid component");
+ if (componentTags != null) {
+ try {
+ for (int i = 0; i < componentTags.length; i++) {
+ String comp = componentTags[i];
+ if (comp.startsWith("A1:"))
+ primaryAudioNum = Integer.parseInt(comp.substring(3));
+ else if (comp.startsWith("A2:"))
+ secondaryAudioNum = Integer.parseInt(comp.substring(3));
+ else if (comp.startsWith("V1:"))
+ primaryVideoNum = Integer.parseInt(comp.substring(3));
+ else if (comp.startsWith("V2:"))
+ secondaryVideoNum = Integer.parseInt(comp.substring(3));
+ else if (comp.startsWith("P:"))
+ textStreamNum = Integer.parseInt(comp.substring(2));
+ else
+ throw new InvalidLocatorException();
+ }
+ } catch (NumberFormatException e) {
+ throw new InvalidLocatorException();
+ }
 }
+ url = getUrl();
 }
 
- public String[] getComponentTags()
- {
- return componentTags;
+ public boolean equals(Object obj) {
+ if (obj == null)
+ return false;
+ if (this == obj)
+ return true;
+ if (getClass() != obj.getClass())
+ return false;
+ return url.equals(((BDLocator)obj).url);
 }
 
- public String getPathSegments()
- {
- return pathSegments;
+ public boolean isJarFileItem() {
+ return jar >= 0;
 }
 
- public String getDiscId()
- {
- return disc;
+ public boolean isPlayListItem() {
+ return playList >= 0;
 }
 
- public int getPrimaryAudioStreamNumber()
- {
- return primaryAudioNum;
+ public boolean isSoundItem() {
+ return sound >= 0;
 }
 
- public int getSecondaryAudioStreamNumber()
- {
- return secondaryAudioNum;
+ public int getComponentTagsCount() {
+ if (!isPlayListItem())
+ return 0;
+ int nTags = 0;;
+ if (primaryVideoNum > 0)
+ nTags++;
+ if (primaryAudioNum > 0)
+ nTags++;
+ if (secondaryVideoNum > 0)
+ nTags++;
+ if (secondaryAudioNum > 0)
+ nTags++;
+ if (textStreamNum > 0)
+ nTags++;
+ return nTags;
 }
 
- public int getPrimaryVideoStreamNumber()
- {
- return primaryVideoNum;
+ public String[] getComponentTags() {
+ int nTags = getComponentTagsCount();
+ if (nTags <= 0)
+ return new String[0];
+ String[] tags = new String[nTags];
+ if (textStreamNum > 0)
+ tags[--nTags] = "P:" + textStreamNum;
+ if (secondaryAudioNum > 0)
+ tags[--nTags] = "A2:" + secondaryAudioNum;
+ if (secondaryVideoNum > 0)
+ tags[--nTags] = "V2:" + secondaryVideoNum;
+ if (primaryAudioNum > 0)
+ tags[--nTags] = "A1:" + primaryAudioNum;
+ if (primaryVideoNum > 0)
+ tags[--nTags] = "V1:" + primaryVideoNum;
+ return tags;
 }
 
- public int getSecondaryVideoStreamNumber()
- {
- return secondaryVideoNum;
+ public String getDiscId() {
+ return disc;
 }
 
- public int getJarFileId()
- {
+ public int getTitleNumber() {
+ return titleNum;
+ }
+
+ public int getJarFileId() {
 return jar;
 }
 
- public int getMarkId()
- {
+ public String getPathSegments() {
+ return pathSegments;
+ }
+
+ public int getSoundId() {
+ return sound;
+ }
+
+ public int getPlayListId() {
+ return playList;
+ }
+
+ public int getMarkId() {
 return mark;
 }
 
- public int getPGTextStreamNumber()
- {
+ public int getPlayItemId() {
+ return playItem;
+ }
+
+ public int getPrimaryAudioStreamNumber() {
+ return primaryAudioNum;
+ }
+
+ public int getSecondaryAudioStreamNumber() {
+ return secondaryAudioNum;
+ }
+
+ public int getPrimaryVideoStreamNumber() {
+ return primaryVideoNum;
+ }
+
+ public int getSecondaryVideoStreamNumber() {
+ return secondaryVideoNum;
+ }
+
+ public int getPGTextStreamNumber() {
 return textStreamNum;
 }
 
- public int getPlayItemId()
- {
- return playItem;
+ public void setPlayListId(int id) {
+ if ((id >= 0) && (id != playList)) {
+ playList = id;
+ url = getUrl();
+ }
 }
 
- public int getPlayListId()
- {
- return playList;
+ public void setMarkId(int id) {
+ if ((id >= 0) && (id != mark)) {
+ mark = id;
+ url = getUrl();
+ }
 }
 
- public int getSoundId()
- {
- return sound;
+ public void setPlayItemId(int id) {
+ if ((id >= 0) && (id != playItem)) {
+ playItem = id;
+ url = getUrl();
+ }
 }
 
- public int getTitleNumber()
- {
- return titleNum;
+ public void setPrimaryAudioStreamNumber(int num) {
+ if ((num >= 0) && (num != primaryAudioNum)) {
+ primaryAudioNum = num;
+ url = getUrl();
+ }
 }
 
- public boolean isJarFileItem()
- {
- return isJarItem;
+ public void setSecondaryAudioStreamNumber(int num) {
+ if ((num >= 0) && (num != secondaryAudioNum)) {
+ secondaryAudioNum = num;
+ url = getUrl();
+ }
 }
 
- public boolean isPlayListItem()
- {
- return isPlayItem;
+ public void setPrimaryVideoStreamNumber(int num) {
+ if ((num >= 0) && (num != primaryVideoNum)) {
+ primaryVideoNum = num;
+ url = getUrl();
+ }
+ }
+
+ public void setSecondaryVideoStreamNumber(int num) {
+ if ((num >= 0) && (num != secondaryVideoNum)) {
+ secondaryVideoNum = num;
+ url = getUrl();
+ }
 }
 
- public boolean isSoundItem()
- {
- return isSoundItem;
+ public void setPGTextStreamNumber(int num) {
+ if ((num >= 0) && (num != textStreamNum)) {
+ textStreamNum = num;
+ url = getUrl();
+ }
 }
 
- public String toExternalForm()
- {
- StringBuilder str = new StringBuilder();
+ protected String getUrl() {
+ String str = "bd://";
 
- str.append("bd://");
- 
 if (disc != null && disc != "")
- str.append(disc + ".");
-
- 
- if (titleNum != -1)
- str.append(Integer.toString(titleNum, 16) + ".");
- 
- if (isJarItem) {
- str.append("JAR:");
- str.append(BDJUtil.makeFiveDigitStr(jar));
- 
+ str += disc + ".";
+
+ if (titleNum >= 0)
+ str += Integer.toString(titleNum, 16) + ".";
+
+ if (jar >= 0) {
+ str += "JAR:" + BDJUtil.makeFiveDigitStr(jar);
+
 if (pathSegments != null)
- str.append(pathSegments);
- else if (sound != -1) {
- str.append(".SOUND:");
- str.append(Integer.toString(sound, 16));
+ str += pathSegments;
+ } else if (playList >= 0) {
+ str += "PLAYLIST:" + BDJUtil.makeFiveDigitStr(playList);
+
+ if (playItem >= 0)
+ str += ".ITEM:" + BDJUtil.makeFiveDigitStr(playItem);
+ if (mark >= 0)
+ str += ".MARK:" + BDJUtil.makeFiveDigitStr(mark);
+
+ String prefix = ".";
+ if (primaryAudioNum > 0) {
+ str += prefix + "A1:" + primaryAudioNum;
+ if (prefix.equals("."))
+ prefix = "&";
 }
- } else if (isPlayItem) {
- str.append("PLAYLIST:");
- str.append(BDJUtil.makeFiveDigitStr(playList));
- 
- if (playItem != -1) {
- str.append(".ITEM:");
- str.append(BDJUtil.makeFiveDigitStr(playItem));
+ if (secondaryAudioNum > 0) {
+ str += prefix + "A2:" + secondaryAudioNum;
+ if (prefix.equals("."))
+ prefix = "&";
 }
- if (mark != -1) {
- str.append(".MARK:");
- str.append(BDJUtil.makeFiveDigitStr(mark));
+ if (primaryVideoNum > 0) {
+ str += prefix + "V1:" + primaryVideoNum;
+ if (prefix.equals("."))
+ prefix = "&";
 }
- 
- if (componentTags != null) {
- for (int i = 0; i < componentTags.length; i++) {
- if (i != 0)
- str.append("&");
- 
- str.append(componentTags[i]);
- }
+ if (secondaryVideoNum > 0) {
+ str += prefix + "V2:" + secondaryVideoNum;
+ if (prefix.equals("."))
+ prefix = "&";
+ }
+ if (textStreamNum > 0) {
+ str += prefix + "P:" + textStreamNum;
+ if (prefix.equals("."))
+ prefix = "&";
 }
- } else if (isSoundItem) {
- str.append("SOUND:");
- str.append(Integer.toString(sound, 16));
+ } else if (sound >= 0) {
+ str += "SOUND:" + Integer.toString(sound, 16);
 }
- 
- return str.toString();
- }
 
- public String toString()
- {
- return toExternalForm();
+ return str;
 }
 
- public boolean equals(Object obj)
- {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- BDLocator other = (BDLocator) obj;
- if (!Arrays.equals(componentTags, other.componentTags))
- return false;
- if (disc == null) {
- if (other.disc != null)
- return false;
- } else if (!disc.equals(other.disc))
- return false;
- if (isJarItem != other.isJarItem)
- return false;
- if (isPlayItem != other.isPlayItem)
- return false;
- if (isSoundItem != other.isSoundItem)
- return false;
- if (jar != other.jar)
- return false;
- if (mark != other.mark)
- return false;
- if (pathSegments == null) {
- if (other.pathSegments != null)
- return false;
- } else if (!pathSegments.equals(other.pathSegments))
- return false;
- if (playItem != other.playItem)
- return false;
- if (playList != other.playList)
- return false;
- if (primaryAudioNum != other.primaryAudioNum)
- return false;
- if (primaryVideoNum != other.primaryVideoNum)
- return false;
- if (secondaryAudioNum != other.secondaryAudioNum)
- return false;
- if (secondaryVideoNum != other.secondaryVideoNum)
- return false;
- if (sound != other.sound)
- return false;
- if (textStreamNum != other.textStreamNum)
- return false;
- if (titleNum != other.titleNum)
+ private boolean parseJar(String str) throws InvalidLocatorException {
+ if (!str.startsWith("JAR:"))
 return false;
+ if (str.length() < 9)
+ throw new InvalidLocatorException();
+ try {
+ jar = Integer.parseInt(str.substring(4, 9));
+ } catch(NumberFormatException e) {
+ throw new InvalidLocatorException();
+ }
+ if (str.length() > 9)
+ pathSegments = str.substring(9);
 return true;
 }
 
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + Arrays.hashCode(componentTags);
- result = prime * result + ((disc == null) ? 0 : disc.hashCode());
- result = prime * result + (isJarItem ? 1231 : 1237);
- result = prime * result + (isPlayItem ? 1231 : 1237);
- result = prime * result + (isSoundItem ? 1231 : 1237);
- result = prime * result + jar;
- result = prime * result + mark;
- result = prime * result
- + ((pathSegments == null) ? 0 : pathSegments.hashCode());
- result = prime * result + playItem;
- result = prime * result + playList;
- result = prime * result + primaryAudioNum;
- result = prime * result + primaryVideoNum;
- result = prime * result + secondaryAudioNum;
- result = prime * result + secondaryVideoNum;
- result = prime * result + sound;
- result = prime * result + textStreamNum;
- result = prime * result + titleNum;
- return result;
- }
- 
- private void parsePlaylist(Scanner scan) throws InvalidLocatorException
- {
- ArrayList<String> components = new ArrayList<String>(4);
- 
+ private boolean parseSound(String str) throws InvalidLocatorException {
+ if (!str.startsWith("SOUND:"))
+ return false;
 try {
- while (scan.hasNext()) {
- String name = scan.next();
-
- if (scan.hasNext()) {
- if (name.equals("A1")) {
- String a1 = scan.next();
- primaryAudioNum = Integer.parseInt(a1);
- components.add(name + ":" + a1);
- } else if (name.equals("A2")) {
- String a2 = scan.next();
- secondaryAudioNum = Integer.parseInt(a2);
- components.add(name + ":" + a2);
- }
- else if (name.equals("V1")) {
- String v1 = scan.next();
- primaryVideoNum = Integer.parseInt(v1);
- components.add(name + ":" + v1);
- }
- else if (name.equals("V2")) {
- String v2 = scan.next();
- secondaryVideoNum = Integer.parseInt(v2);
- components.add(name + ":" + v2);
- }
- else if (name.equals("P")) {
- String p = scan.next();
- textStreamNum = Integer.parseInt(p);
- components.add(name + ":" + p);
- }
- else if (name.equals("MARK"))
- mark = scan.nextInt();
- else if (name.equals("ITEM"))
- playItem = scan.nextInt();
- else if (name.length() == 32)
- disc = name;
- else if (name.length() <= 4)
- titleNum = Integer.parseInt(name, 16);
- else
- throw new InvalidLocatorException("Invalid identifier");
+ sound = Integer.parseInt(str.substring(6), 16);
+ } catch (NumberFormatException e) {
+ throw new InvalidLocatorException();
+ }
+ return true;
+ }
 
+ private boolean parsePlaylist(String str) throws InvalidLocatorException {
+ boolean isTag = false;
+ int length, begin, end;
+ length = str.length();
+ begin = 0;
+ end = str.indexOf('.');
+ if (end < 0)
+ end = length;
+ while (end <= length) {
+ String element = str.substring(begin, end);
+ try {
+ if (playList < 0) {
+ if ((end - begin) == 32)
+ disc = element;
+ else if ((end - begin) <= 4)
+ titleNum = Integer.parseInt(element, 16);
+ else if (element.startsWith("PLAYLIST:"))
+ playList = Integer.parseInt(element.substring(9));
+ else
+ throw new InvalidLocatorException();
+ } else if (element.startsWith("MARK:")) {
+ mark = Integer.parseInt(element.substring(5));
+ } else if (element.startsWith("ITEM:")) {
+ playItem = Integer.parseInt(element.substring(5));
+ } else if (element.startsWith("A1:")) {
+ primaryAudioNum = Integer.parseInt(element.substring(3));
+ if (primaryAudioNum < 0)
+ throw new InvalidLocatorException();
+ isTag = true;
+ } else if (element.startsWith("A2:")) {
+ secondaryAudioNum = Integer.parseInt(element.substring(3));
+ if (secondaryAudioNum < 0)
+ throw new InvalidLocatorException();
+ isTag = true;
+ } else if (element.startsWith("V1:")) {
+ primaryVideoNum = Integer.parseInt(element.substring(3));
+ if (primaryVideoNum < 0)
+ throw new InvalidLocatorException();
+ isTag = true;
+ } else if (element.startsWith("V2:")) {
+ secondaryVideoNum = Integer.parseInt(element.substring(3));
+ if (secondaryVideoNum < 0)
+ throw new InvalidLocatorException();
+ isTag = true;
+ } else if (element.startsWith("P:")) {
+ textStreamNum = Integer.parseInt(element.substring(2));
+ if (textStreamNum < 0)
+ throw new InvalidLocatorException();
+ isTag = true;
 } else {
- throw new InvalidLocatorException("Missing value");
+ throw new InvalidLocatorException();
 }
+ } catch (NumberFormatException e) {
+ throw new InvalidLocatorException();
 }
- } catch (InputMismatchException ex) {
- throw new InvalidLocatorException("Failed to parse value");
+ if (end >= length)
+ break;
+ begin = end + 1;
+ if (isTag) {
+ end = str.indexOf('&', begin);
+ if (end < 0) {
+ isTag = false;
+ end = str.indexOf('.', begin);
+ }
+ } else {
+ end = str.indexOf('.', begin);
+ if (end < 0)
+ end = str.indexOf('&', begin);
+ }
+ if (end < 0)
+ end = length;
 }
+ return true;
 }
 
 public static final int NOTLOCATED = -1;
 
 protected String pathSegments = null;
- protected String[] componentTags = null;
 protected String disc = null;
 
 protected int primaryAudioNum = -1;
@@ -420,10 +422,4 @@
 protected int playList = -1;
 protected int sound = -1;
 protected int titleNum = -1;
-
- protected boolean isJarItem = false;
- protected boolean isPlayItem = false;
- protected boolean isSoundItem = false;
- 
- private static final Logger logger = Logger.getLogger(BDLocator.class.getName());
 }

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/storage/BindingunitDataAreaInfo.java Added

@@ -0,0 +1,30 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 Petri Hintukainen
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.bluray.storage;
+
+public class BindingunitDataAreaInfo implements DataAreaInfo {
+ public long getFreeSpace() {
+ return 1024000;
+ }
+
+ public long getTotalSpace() {
+ return 1024000;
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/storage/PersistentDataAreaInfo.java Added

@@ -0,0 +1,30 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 Petri Hintukainen
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.bluray.storage;
+
+public class PersistentDataAreaInfo implements DataAreaInfo {
+ public long getFreeSpace() {
+ return 1024000;
+ }
+
+ public long getTotalSpace() {
+ return 1024000;
+ }
+}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/storage/StorageManager.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/storage/StorageManager.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/ti/DeliverySystemType.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/ti/DeliverySystemType.java Changed

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/ti/DiscImpl.java Added

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/ti/DiscManager.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/ti/DiscManager.java Changed

@@ -19,34 +19,40 @@
 
 package org.bluray.ti;
 
+import java.util.LinkedList;
+
 public class DiscManager {
-    public static synchronized DiscManager getDiscManager()
-    {
-        throw new Error("Not implemented");
+    public static synchronized DiscManager getDiscManager() {
+        if (instance == null)
+            instance = new DiscManager();
+        return instance;
     }
 
-    public static void notifyDiscChange(int num)
-    {
-        throw new Error("Not implemented");
+    public void expectNextDisc(String[] discIds) {
+        org.videolan.Logger.unimplemented(DiscManager.class.getName(), "expectNextDisc");
     }
 
-    public void addDiscStatusEventListener(DiscStatusListener listener)
-    {
-        throw new Error("Not implemented");
+    public Disc getCurrentDisc() {
+        return disc;
     }
 
-    public void expectNextDisc(String[] discIds)
-    {
-        throw new Error("Not implemented");
+    public void addDiscStatusEventListener(DiscStatusListener listener) {
+        synchronized(listeners) {
+            listeners.add(listener);
+        }
     }
 
-    public Disc getCurrentDisc()
-    {
-        throw new Error("Not implemented");
+    public void removeDiscStatusEventListener(DiscStatusListener listener) {
+        synchronized(listeners) {
+            listeners.remove(listener);
+        }
     }
 
-    public void removeDiscStatusEventListener(DiscStatusListener listener)
-    {
-        throw new Error("Not implemented");
+    public void setCurrentDisc(String id) {
+        disc = new DiscImpl(id);
     }
+
+    private LinkedList listeners = new LinkedList();
+    private static DiscManager instance;
+    private DiscImpl disc = null;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/ti/PlayItemImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/ti/PlayItemImpl.java Changed

@@ -57,17 +57,17 @@
 
 int i = 0;
 for (int j = 0; j < video.length; i++, j++)
- components[i] = new TitleComponentImpl(video[j], StreamType.VIDEO, true, playlistId, playitemId, service);
+ components[i] = new TitleComponentImpl(j + 1, video[j], StreamType.VIDEO, true, playlistId, playitemId, service);
 for (int j = 0; j < audio.length; i++, j++)
- components[i] = new TitleComponentImpl(audio[j], StreamType.AUDIO, true, playlistId, playitemId, service);
+ components[i] = new TitleComponentImpl(j + 1, audio[j], StreamType.AUDIO, true, playlistId, playitemId, service);
 for (int j = 0; j < pg.length; i++, j++)
- components[i] = new TitleComponentImpl(pg[j], StreamType.SUBTITLES, true, playlistId, playitemId, service);
+ components[i] = new TitleComponentImpl(j + 1, pg[j], StreamType.SUBTITLES, true, playlistId, playitemId, service);
 for (int j = 0; j < ig.length; i++, j++)
- components[i] = new TitleComponentImpl(ig[j], StreamType.DATA, true, playlistId, playitemId, service);
+ components[i] = new TitleComponentImpl(j + 1, ig[j], StreamType.DATA, true, playlistId, playitemId, service);
 for (int j = 0; j < secVideo.length; i++, j++)
- components[i] = new TitleComponentImpl(secVideo[j], StreamType.VIDEO, false, playlistId, playitemId, service);
+ components[i] = new TitleComponentImpl(j + 1, secVideo[j], StreamType.VIDEO, false, playlistId, playitemId, service);
 for (int j = 0; j < secAudio.length; i++, j++)
- components[i] = new TitleComponentImpl(secAudio[j], StreamType.AUDIO, false, playlistId, playitemId, service);
+ components[i] = new TitleComponentImpl(j + 1, secAudio[j], StreamType.AUDIO, false, playlistId, playitemId, service);
 
 return components;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/ti/PlayListImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/ti/PlayListImpl.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/ti/TitleComponentImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/ti/TitleComponentImpl.java Changed

@@ -12,8 +12,9 @@
 import org.videolan.StreamInfo;
 
 public class TitleComponentImpl implements TitleComponent {
-    protected TitleComponentImpl(StreamInfo stream, StreamType type, boolean primary, int playlistId, int playitemId, Title service)
+    protected TitleComponentImpl(int stn, StreamInfo stream, StreamType type, boolean primary, int playlistId, int playitemId, Title service)
     {
+        this.stn = stn;
         this.stream = stream;
         this.type = type;
         this.primary = primary;
@@ -21,117 +22,75 @@
         this.playitemId = playitemId;
         this.service = service;
     }
-    
-    public String getName()
-    {
+
+    public String getName() {
         BDLocator l = (BDLocator) getLocator();
         if (l == null)
             return null;
         return l.toString();
     }
 
-    public String getAssociatedLanguage()
-    {
+    public String getAssociatedLanguage() {
         return stream.getLang();
     }
 
-    public StreamType getStreamType()
-    {
+    public StreamType getStreamType() {
         return type;
     }
 
-    public Service getService()
-    {
+    public Service getService() {
         return service;
     }
 
-    public Locator getLocator()
-    {
-        StringBuilder str = new StringBuilder();
-        str.append("bd://");
-        str.append(((TitleImpl)service).getTitleNum());
-        str.append(".PLAYLIST:");
-        str.append(playlistId);
-        str.append(".ITEM:");
-        str.append(playitemId);
-        
+    public Locator getLocator() {
+        String str;
+
+        str = "bd://" + ((TitleImpl)service).getTitleNum() +
+                  ".PLAYLIST:" + playlistId +
+                  ".ITEM:" + playitemId;
+
         if (type.equals(StreamType.AUDIO) && primary)
-            str.append(".A1:" + stream.getPid());
+            str += ".A1:" + stn;
         else if (type.equals(StreamType.VIDEO) && primary)
-            str.append(".V1:" + stream.getPid());
+            str += ".V1:" + stn;
         else if (type.equals(StreamType.AUDIO) && !primary)
-            str.append(".A2:" + stream.getPid());
+            str += ".A2:" + stn;
         else if (type.equals(StreamType.VIDEO) && !primary)
-            str.append(".V2:" + stream.getPid());
+            str += ".V2:" + stn;
         else if (type.equals(StreamType.SUBTITLES) && primary)
-            str.append(".P:" + stream.getPid());
+            str += ".P:" + stn;
         else
             return null;
-        
+
         try {
-            return new BDLocator(str.toString());
+            return new BDLocator(str);
         } catch (InvalidLocatorException e) {
             return null;
         }
     }
 
-    public ServiceInformationType getServiceInformationType()
-    {
+    public ServiceInformationType getServiceInformationType() {
         return TitleInformationType.BD_ROM;
     }
 
-    public Date getUpdateTime()
-    {
-        throw new Error("Not implemented"); // TODO implement
+    public Date getUpdateTime() {
+        org.videolan.Logger.unimplemented(TitleComponentImpl.class.getName(), "getUpdateTime");
+        return null;
     }
 
-    public CodingType getCodingType()
-    {
-        switch (stream.getCoding_type()) {
-        case (byte)0x02:
-            return CodingType.MPEG2_VIDEO;
-        case (byte)0x1b:
-            return CodingType.MPEG4_AVC_VIDEO;
-        case (byte)0xea:
-            return CodingType.SMPTE_VC1_VIDEO;
-        case (byte)0x80:
-            return CodingType.LPCM_AUDIO;
-        case (byte)0x81:
-            return CodingType.DOLBY_AC3_AUDIO;
-        case (byte)0x82:
-            return CodingType.DTS_AUDIO;
-        case (byte)0x83:
-            return CodingType.DOLBY_LOSSLESS_AUDIO;
-        case (byte)0x84:
-        case (byte)0xA1:
-            return CodingType.DOLBY_DIGITAL_PLUS_AUDIO;
-        case (byte)0x85:
-            return CodingType.DTS_HD_AUDIO_EXCEPT_XLL;
-        case (byte)0x86:
-            return CodingType.DTS_HD_AUDIO_XLL;
-        case (byte)0xA2:
-            return CodingType.DTS_HD_AUDIO;
-        case (byte)0x90:
-            return CodingType.PRESENTATION_GRAPHICS;
-        case (byte)0x91:
-            return CodingType.INTERACTIVE_GRAPHICS;
-        case (byte)0x92:
-            return CodingType.TEXT_SUBTITLE;
-        default:
-            return null;
-        }
+    public CodingType getCodingType() {
+        return stream.getCodingType();
     }
 
-    public int getStreamNumber()
-    {
-        return stream.getPid();
+    public int getStreamNumber() {
+        return stn;
     }
 
-    public int getSubPathId()
-    {
-        throw new Error("Not implemented"); // TODO implement
+    public int getSubPathId() {
+        return stream.getSubPathId();
     }
 
+    int stn;
     StreamInfo stream;
     StreamType type;
     boolean primary;

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/ti/TitleImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/ti/TitleImpl.java Changed

@@ -1,8 +1,5 @@
 package org.bluray.ti;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import javax.tv.locator.Locator;
 import javax.tv.service.SIRequest;
 import javax.tv.service.SIRequestor;
@@ -10,75 +7,86 @@
 
 import org.bluray.net.BDLocator;
 import org.davic.net.InvalidLocatorException;
-import org.videolan.BDJLoader;
 import org.videolan.Libbluray;
 import org.videolan.TitleInfo;
+import org.videolan.bdjo.Bdjo;
 
 public class TitleImpl implements Title {
 public TitleImpl(int titleNum) {
 this.titleNum = titleNum;
- this.titleInfo = Libbluray.getTitleInfo(titleNum);
- if (titleInfo == null)
+ this.ti = Libbluray.getTitleInfo(titleNum);
+ if (ti == null)
 throw new Error("Invalid title " + titleNum);
+ if (ti.isBdj()) {
+ bdjo = Libbluray.getBdjo(ti.getBdjoName());
+ if (bdjo == null)
+ throw new Error("Invalid title " + titleNum);
+ }
 }
 
- public PlayList[] getPlayLists()
- {
- String[] playlistNames = BDJLoader.getBdjo().getAccessiblePlaylists().getPlayLists();
+ public PlayList[] getPlayLists() {
+ if (bdjo == null)
+ return new PlayList[0];
+ String[] playlistNames = bdjo.getAccessiblePlaylists().getPlayLists();
 PlayList[] playlists = new PlayList[playlistNames.length];
- 
- for (int i = 0; i < playlistNames.length; i++) {
+ for (int i = 0; i < playlistNames.length; i++)
 playlists[i] = new PlayListImpl(playlistNames[i], this);
- }
- 
+
 return playlists;
 }
 
- public boolean hasAutoPlayList()
- {
- return BDJLoader.getBdjo().getAccessiblePlaylists().isAutostartFirst();
+ public boolean hasAutoPlayList() {
+ if (bdjo == null)
+ return false;
+ return bdjo.getAccessiblePlaylists().isAutostartFirst();
 }
 
- public Locator getLocator()
- {
- String url = "bd://" + titleNum;
+ public Locator getLocator() {
+ String url = "bd://" + Integer.toString(titleNum, 16);
 try {
 return new BDLocator(url);
 } catch (InvalidLocatorException ex) {
- logger.log(Level.WARNING, "Invalid locator: " + url);
 return null;
 }
 }
 
- public String getName()
- {
+ public String getName() {
 return "Title " + titleNum;
 }
 
- @Override
- public ServiceType getServiceType()
- {
- throw new Error("Not implemented");
+ public ServiceType getServiceType() {
+ switch (ti.getPlaybackType()) {
+ case TitleInfo.HDMV_PLAYBACK_TYPE_MOVIE:
+ return TitleType.HDMV_MOVIE;
+ case TitleInfo.HDMV_PLAYBACK_TYPE_INTERACTIVE:
+ return TitleType.HDMV_INTERACTIVE;
+ case TitleInfo.BDJ_PLAYBACK_TYPE_MOVIE:
+ return TitleType.BDJ_MOVIE;
+ case TitleInfo.BDJ_PLAYBACK_TYPE_INTERACTIVE:
+ return TitleType.BDJ_INTERACTIVE;
+ }
+ return null;
 }
 
- @Override
- public boolean hasMultipleInstances()
- {
+ public boolean hasMultipleInstances() {
 return false;
 }
 
- @Override
- public SIRequest retrieveDetails(SIRequestor requestor)
- {
- throw new Error("Not implemented");
+ public SIRequest retrieveDetails(SIRequestor requestor) {
+ //TODO
+ org.videolan.Logger.unimplemented(TitleImpl.class.getName(), "retrieveDetails");
+ return null;
 }
- 
- protected int getTitleNum()
- {
+
+ public int getTitleNum() {
 return titleNum;
 }
- 
+
+ public TitleInfo getTitleInfo() {
+ return ti;
+ }
+
 private int titleNum;
- private TitleInfo titleInfo;
- private static final Logger logger = Logger.getLogger(TitleImpl.class.getName());
+ private TitleInfo ti;
+ private Bdjo bdjo = null;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/ti/TitleInformationType.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/ti/TitleInformationType.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/ti/selection/TitleContextImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/ti/selection/TitleContextImpl.java Changed

@@ -18,68 +18,140 @@
 */
 package org.bluray.ti.selection;
 
-import java.util.ArrayList;
+import java.util.LinkedList;
 
 import javax.tv.locator.InvalidLocatorException;
 import javax.tv.locator.Locator;
+import javax.tv.service.SIManager;
 import javax.tv.service.Service;
 import javax.tv.service.selection.InvalidServiceComponentException;
+import javax.tv.service.selection.NormalContentEvent;
+import javax.tv.service.selection.PresentationTerminatedEvent;
 import javax.tv.service.selection.ServiceContentHandler;
+import javax.tv.service.selection.ServiceContextDestroyedEvent;
+import javax.tv.service.selection.ServiceContextEvent;
 import javax.tv.service.selection.ServiceContextListener;
 
 import org.bluray.ti.Title;
 import org.bluray.ti.TitleImpl;
-import org.videolan.Libbluray;
+import org.videolan.BDJLoader;
+import org.videolan.BDJAction;
+import org.videolan.BDJActionManager;
+import org.videolan.BDJLoaderCallback;
+import org.videolan.BDJListeners;
+import org.videolan.media.content.playlist.Handler;
 
 public class TitleContextImpl implements TitleContext {
+ public Service getService() {
+ return title;
+ }
 
- public void start(Title title, boolean doSomething)
- throws SecurityException
- {
- throw new Error("Not implemented"); // TODO implement
+ public ServiceContentHandler[] getServiceContentHandlers() throws SecurityException {
+ if (state == STATE_DESTROYED)
+ throw new IllegalStateException();
+ if (state == STATE_STOPPED)
+ return new ServiceContentHandler[0];
+ ServiceContentHandler[] handler = new ServiceContentHandler[1];
+ handler[0] = new Handler();
+ return handler;
 }
 
- public void addListener(ServiceContextListener listener)
- {
- serviceContextListeners.add(listener);
+ public void start(Title title, boolean restart) throws SecurityException {
+ if (state == STATE_DESTROYED)
+ throw new IllegalStateException();
+ TitleStartAction action = new TitleStartAction(this, (TitleImpl)title);
+ if (!BDJLoader.load((TitleImpl)title, restart, action))
+ action.loaderDone(false);
 }
 
- public void destroy() throws SecurityException
- {
- 
+ public void select(Service service) throws SecurityException {
+ start((Title)service, true);
 }
 
- public Service getService()
- {
- return new TitleImpl(Libbluray.getCurrentTitle());
+ public void select(Locator[] locators)
+ throws InvalidLocatorException, InvalidServiceComponentException, SecurityException {
+ select(SIManager.createInstance().getService(locators[0]));
 }
 
- public ServiceContentHandler[] getServiceContentHandlers()
- throws SecurityException
- {
- throw new Error("Not implemented"); // TODO implement
+ public void stop() throws SecurityException {
+ if (state == STATE_DESTROYED)
+ throw new IllegalStateException();
+ TitleStopAction action = new TitleStopAction(this);
+ if (!BDJLoader.unload(action))
+ action.loaderDone(false);
 }
 
- public void removeListener(ServiceContextListener listener)
- {
- serviceContextListeners.remove(listener);
+ public void destroy() throws SecurityException {
+ if (state != STATE_DESTROYED) {
+ state = STATE_DESTROYED;
+ TitleStopAction action = new TitleStopAction(this);
+ if (!BDJLoader.unload(action))
+ action.loaderDone(false);
+ }
 }
 
- public void select(Service service) throws SecurityException
- {
- throw new Error("Not implemented"); // TODO implement
+ public void addListener(ServiceContextListener listener) {
+ listeners.add(listener);
 }
 
- public void select(Locator[] locators) throws InvalidLocatorException,
- InvalidServiceComponentException, SecurityException
- {
- throw new Error("Not implemented"); // TODO implement
+ public void removeListener(ServiceContextListener listener) {
+ listeners.remove(listener);
 }
 
- public void stop() throws SecurityException
+ public void removeServiceContentHandler(ServiceContentHandler handler) {
+ if (handler != null) {
+ synchronized (handlers) {
+ handlers.remove(handler);
+ }
+ }
+ }
+
+ private void postEvent(ServiceContextEvent event)
 {
- throw new Error("Not implemented"); // TODO implement
+ listeners.putCallback(event);
+ }
+
+ private class TitleStartAction implements BDJLoaderCallback {
+ private TitleStartAction(TitleContextImpl context, TitleImpl title) {
+ this.context = context;
+ this.title = title;
+ }
+
+ public void loaderDone(boolean succeed) {
+ if (succeed) {
+ context.title = title;
+ context.state = STATE_STARTED;
+ context.postEvent(new NormalContentEvent(context));
+ }
+ }
+
+ private TitleContextImpl context;
+ private TitleImpl title;
+ }
+
+ private class TitleStopAction implements BDJLoaderCallback {
+ private TitleStopAction(TitleContextImpl context) {
+ this.context = context;
+ }
+
+ public void loaderDone(boolean succeed) {
+ if (succeed) {
+ context.postEvent(new PresentationTerminatedEvent(context, PresentationTerminatedEvent.USER_STOP));
+ if (context.state == STATE_DESTROYED)
+ context.postEvent(new ServiceContextDestroyedEvent(context));
+ else
+ context.state = STATE_STOPPED;
+ }
+ }
+
+ private TitleContextImpl context;
 }
 
- private ArrayList<ServiceContextListener> serviceContextListeners = new ArrayList<ServiceContextListener>();
+ private static final int STATE_STOPPED = 0;
+ private static final int STATE_STARTED = 1;
+ private static final int STATE_DESTROYED = 2;
+ private BDJListeners listeners = new BDJListeners();
+ private LinkedList handlers = new LinkedList();
+ private TitleImpl title = null;
+ private int state = STATE_STOPPED;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/ui/AnimationParameters.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/ui/AnimationParameters.java Changed

@@ -19,20 +19,35 @@
 
 package org.bluray.ui;
 
-import java.util.Arrays;
+import org.videolan.Arrays;
 
 public class AnimationParameters {
-    public String toString()
-    {
-        return "AnimationParameters [faaTimer=" + faaTimer + ", lockedToVideo="
-                + lockedToVideo + ", repeatCount="
-                + Arrays.toString(repeatCount) + ", scaleFactor=" + scaleFactor
-                + ", threadPriority=" + threadPriority + "]";
+    public String toString() {
+        return "AnimationParameters [faaTimer=" + faaTimer +
+               ", lockedToVideo=" + lockedToVideo +
+               ", repeatCount=" + Arrays.toString(repeatCount) +
+               ", scaleFactor=" + scaleFactor +
+               ", threadPriority=" + threadPriority + "]";
+    }
+
+    public AnimationParameters() {
+    }
+
+    AnimationParameters(AnimationParameters p) {
+        if (p.faaTimer != null) {
+            faaTimer = new FrameAccurateAnimationTimer(p.faaTimer);
+        }
+        lockedToVideo = p.lockedToVideo;
+        if (p.repeatCount != null) {
+            repeatCount = (int[])p.repeatCount.clone();
+        }
+        scaleFactor = p.scaleFactor;
+        threadPriority = p.threadPriority;
     }
 
     public FrameAccurateAnimationTimer faaTimer = null;
-    public boolean lockedToVideo = false;
-    public int[] repeatCount = null;
-    public int scaleFactor = 1;
+    public boolean lockedToVideo = false;  /* frame rate locked to video frame rate */
+    public int[] repeatCount = null;       /* repeat each frame repeatCount times */
+    public int scaleFactor = 1;            /* scale factor when painting */
     public int threadPriority = 5;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/ui/BDVideoConfigTemplate.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/ui/BDVideoConfigTemplate.java Changed

@@ -20,32 +20,26 @@
 package org.bluray.ui;
 
 import org.havi.ui.HVideoConfigTemplate;
-import org.havi.ui.HVideoConfiguration;
 
 public class BDVideoConfigTemplate extends HVideoConfigTemplate {
-    public BDVideoConfigTemplate()
-    {
-        throw new Error("Not implemented");
+    protected int getPreferenceCount() {
+        return super.getPreferenceCount() + 1;
     }
 
-    public Object getPreferenceObject(int preference)
-    {
-        throw new Error("Not implemented");
+    protected int getPreferenceObjectCount() {
+        return super.getPreferenceObjectCount() + 1;
     }
 
-    public int getPreferencePriority(int preference)
-    {
-        throw new Error("Not implemented");
+    protected int getPreferenceIndex(int preference) {
+        if (preference == KEEP_RESOLUTION)
+            return super.getPreferenceCount();
+        return super.getPreferenceIndex(preference);
     }
 
-    public boolean isConfigSupported(HVideoConfiguration hvc)
-    {
-        throw new Error("Not implemented");
-    }
-
-    public void setPreference(int preference, Object object, int priority)
-    {
-        throw new Error("Not implemented");
+    protected int getPreferenceObjectIndex(int preference) {
+        if (preference == KEEP_RESOLUTION)
+            return super.getPreferenceObjectCount();
+        return super.getPreferenceObjectIndex(preference);
     }
 
     public static final int KEEP_RESOLUTION = 16;

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/ui/FrameAccurateAnimation.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/ui/FrameAccurateAnimation.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/ui/FrameAccurateAnimationTimer.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/ui/FrameAccurateAnimationTimer.java Changed

@@ -23,29 +23,39 @@
 
 public class FrameAccurateAnimationTimer {
     public static FrameAccurateAnimationTimer getInstance(Time start, Time stop)
-            throws IllegalArgumentException
-    {
-        throw new Error("Not implemented");
+            throws IllegalArgumentException {
+        if (start == null || stop == null ||
+            start.getNanoseconds() >= stop.getNanoseconds()) {
+            throw new IllegalArgumentException("FrameAccurateAnimationTimer.getInstance()");
+        }
+
+        return new FrameAccurateAnimationTimer(start, stop);
     }
 
     private FrameAccurateAnimationTimer(Time start, Time stop)
-            throws IllegalArgumentException
-    {
+            throws IllegalArgumentException {
+        this.start = start;
+        this.stop  = stop;
+    }
 
+    FrameAccurateAnimationTimer(FrameAccurateAnimationTimer t) {
+        start = new Time(t.start.getNanoseconds());
+        stop = new Time(t.stop.getNanoseconds());
     }
 
-    public Time getStartTime()
-    {
-        throw new Error("Not implemented");
+    public Time getStartTime() {
+        return start;
     }
 
-    public Time getStopTime()
-    {
-        throw new Error("Not implemented");
+    public Time getStopTime() {
+        return stop;
     }
 
-    public String toString()
-    {
-        return "FrameAccurateAnimationTimer";
+    public String toString() {
+        return "FrameAccurateAnimationTimer [StartTime=" + start.getNanoseconds() +
+                ", StopTime=" + stop.getNanoseconds() + "]";
     }
+
+    private Time start;
+    private Time stop;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/ui/ImageFrameAccurateAnimation.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/ui/ImageFrameAccurateAnimation.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/ui/SyncFrameAccurateAnimation.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/ui/SyncFrameAccurateAnimation.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/vfs/PreparingFailedException.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/vfs/PreparingFailedException.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/vfs/VFSManager.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/vfs/VFSManager.java Changed

@@ -19,51 +19,65 @@
 
 package org.bluray.vfs;
 
+import org.videolan.Logger;
+
 public class VFSManager {
     public static VFSManager getInstance() throws SecurityException,
             UnsupportedOperationException
     {
-        throw new Error("Not implemented");
+        logger.unimplemented("getInstance");
+        return new VFSManager();
+        //throw new UnsupportedOperationException();
     }
 
     protected VFSManager()
     {
-
+        state = PREPARING;
+        logger.unimplemented("VFSManager");
     }
 
     public boolean disableClip(String streamfile)
     {
-        throw new Error("Not implemented");
+        logger.unimplemented("disableClip");
+        return true;
     }
 
     public boolean enableClip(String streamfile)
     {
-        throw new Error("Not implemented");
+        logger.unimplemented("enableClip");
+        return true;
     }
 
     public String[] getDisabledClipIDs()
     {
-        throw new Error("Not implemented");
+        logger.unimplemented("getDisabledClipIDs");
+        return new String[]{};
     }
 
     public int getState()
     {
-        throw new Error("Not implemented");
+        logger.unimplemented("getState");
+        return STABLE;
     }
 
     public boolean isEnabledClip(String clipID)
     {
-        throw new Error("Not implemented");
+        logger.unimplemented("isEnabledClip");
+        return true;
     }
 
     public void requestUpdating(String manifestfile, String signaturefile,
             boolean initBackupRegs) throws PreparingFailedException
     {
-        throw new Error("Not implemented");
+        logger.unimplemented("requestUpdating(" + manifestfile + ")");
     }
 
+    private int state;
+
     public static final int STABLE = 1;
     public static final int PREPARING = 2;
     public static final int PREPARED = 3;
     public static final int UPDATING = 4;
+
+    private static final Logger logger = Logger.getLogger(VFSManager.class.getName());
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/bluray/vfs/VFSPermission.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/bluray/vfs/VFSPermission.java Changed

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/blurayx Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/blurayx/s3d Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/blurayx/s3d/media Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/blurayx/s3d/media/AlignedSubtitleChangeEvent.java Added

@@ -0,0 +1,37 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.blurayx.s3d.media;
+
+import java.io.Serializable;
+import java.util.EventObject;
+
+public class AlignedSubtitleChangeEvent extends EventObject implements Serializable
+{
+ private int subtitleAlignment;
+
+ public AlignedSubtitleChangeEvent(AlignedSubtitleControl source, int subtitleAlignment) {
+ super(source);
+ this.subtitleAlignment = subtitleAlignment;
+ }
+
+ public int getAlignedSubtitle() {
+ return subtitleAlignment;
+ }
+}
\ No newline at end of file

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/blurayx/s3d/media/AlignedSubtitleChangeListener.java Added

@@ -0,0 +1,27 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.blurayx.s3d.media;
+
+import java.util.EventListener;
+
+public abstract interface AlignedSubtitleChangeListener extends EventListener
+{
+ public abstract void alignedSubtitleChange(AlignedSubtitleChangeEvent paramAlignedSubtitleChangeEvent);
+}
\ No newline at end of file

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/blurayx/s3d/media/AlignedSubtitleControl.java Added

@@ -0,0 +1,38 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.blurayx.s3d.media;
+
+import javax.media.Control;
+
+public abstract interface AlignedSubtitleControl extends Control
+{
+ public abstract int getAlignedSubtitle();
+
+ public abstract void setAlignedSubtitle(int paramInt)
+ throws IllegalArgumentException;
+
+ public abstract void addAlignedSubtitleChangeListener(AlignedSubtitleChangeListener paramAlignedSubtitleChangeListener);
+
+ public abstract void removeAlignedSubtitleChangeListener(AlignedSubtitleChangeListener paramAlignedSubtitleChangeListener);
+
+ public static final int NOT_ALIGNED = 0;
+ public static final int TOP_ALIGNED = 2;
+ public static final int BOTTOM_ALIGNED = 3;
+}
\ No newline at end of file

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/blurayx/s3d/media/GraphicsOffsetSequenceChangeEvent.java Added

@@ -0,0 +1,37 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.blurayx.s3d.media;
+
+import java.io.Serializable;
+import java.util.EventObject;
+
+public class GraphicsOffsetSequenceChangeEvent extends EventObject implements Serializable
+{
+ private int sequenceId;
+
+ public GraphicsOffsetSequenceChangeEvent(GraphicsOffsetSequenceControl source, int sequenceId) {
+ super(source);
+ this.sequenceId = sequenceId;
+ }
+
+ public int getOffsetSequenceId() {
+ return sequenceId;
+ }
+}
\ No newline at end of file

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/blurayx/s3d/media/GraphicsOffsetSequenceChangeListener.java Added

@@ -0,0 +1,27 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.blurayx.s3d.media;
+
+import java.util.EventListener;
+
+public abstract interface GraphicsOffsetSequenceChangeListener extends EventListener
+{
+ public abstract void offsetSequenceChange(GraphicsOffsetSequenceChangeEvent paramGraphicsOffsetSequenceChangeEvent);
+}
\ No newline at end of file

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/blurayx/s3d/media/GraphicsOffsetSequenceControl.java Added

@@ -0,0 +1,34 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.blurayx.s3d.media;
+
+import javax.media.Control;
+
+public abstract interface GraphicsOffsetSequenceControl extends Control
+{
+ public abstract int getSequenceId();
+
+ public abstract void setSequenceId(int paramInt)
+ throws IllegalArgumentException;
+
+ public abstract void addOffsetSequenceChangeListener(GraphicsOffsetSequenceChangeListener paramGraphicsOffsetSequenceChangeListener);
+
+ public abstract void removeOffsetSequenceChangeListener(GraphicsOffsetSequenceChangeListener paramGraphicsOffsetSequenceChangeListener);
+}
\ No newline at end of file

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/blurayx/s3d/system Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/blurayx/s3d/system/StereoscopicRegisters.java Added

@@ -0,0 +1,28 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.blurayx.s3d.system;
+
+public abstract interface StereoscopicRegisters
+{
+ public static final int PSR_OUTPUT_MODE_PREFERENCE = 21;
+ public static final int PSR_STEREOSCOPIC_STATUS = 22;
+ public static final int PSR_DISPLAY_CAPABILITY = 23;
+ public static final int PSR_3D_CAPABILITY = 24;
+}
\ No newline at end of file

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/blurayx/s3d/ti Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/blurayx/s3d/ti/StereoscopicCodingType.java Added

@@ -0,0 +1,46 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.blurayx.s3d.ti;
+
+import java.lang.reflect.Constructor;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import org.bluray.ti.CodingType;
+
+public class StereoscopicCodingType
+{
+ public static final CodingType MPEG4_MVC_VIDEO =
+ (CodingType)AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ CodingType type = null;
+ try {
+ Class classCodingType = Class.forName("org.bluray.ti.CodingType");
+ Constructor constructor = classCodingType.getDeclaredConstructor(new Class[] { String.class });
+ constructor.setAccessible(true);
+ type = (CodingType)constructor.newInstance(new String[] { "MPEG4_MVC_VIDEO" });
+ }
+ catch (Exception e) {
+ System.err.println("StereoscopicCodingType.MPEG4_MVC_VIDEO initialization failed");
+ e.printStackTrace();
+ }
+ return type;
+ }
+ });
+}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/davic/media/MediaLocator.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/davic/media/MediaLocator.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/davic/net/Locator.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/davic/net/Locator.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/application/AppID.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/application/AppID.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/application/AppIcon.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/application/AppIcon.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/application/AppsDatabase.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/application/AppsDatabase.java Changed

@@ -19,46 +19,77 @@
 
 package org.dvb.application;
 
+import java.util.LinkedList;
 import java.util.Enumeration;
+import org.videolan.BDJAppsDatabase;
+import org.videolan.Logger;
 
 public class AppsDatabase {
- static public AppsDatabase getAppsDatabase()
- {
- throw new Error("Not implemented");
+ static public AppsDatabase getAppsDatabase() {
+ return BDJAppsDatabase.getAppsDatabase();
 }
 
- public int size()
- {
- throw new Error("Not implemented");
+ public int size() {
+ logger.unimplemented("size");
+ return 0;
 }
 
- public Enumeration<?> getAppIDs(AppsDatabaseFilter filter)
- {
- throw new Error("Not implemented");
+ public Enumeration getAppIDs(AppsDatabaseFilter filter) {
+ logger.unimplemented("getAppIDs");
+ return null;
 }
 
- public Enumeration<?> getAppAttributes(AppsDatabaseFilter filter)
- {
- throw new Error("Not implemented");
+ public Enumeration getAppAttributes(AppsDatabaseFilter filter) {
+ logger.unimplemented("getAppAttributes");
+ return null;
 }
 
- public AppAttributes getAppAttributes(AppID key)
- {
- throw new Error("Not implemented");
+ public AppAttributes getAppAttributes(AppID key) {
+ logger.unimplemented("getAppAttributes");
+ return null;
 }
 
- public AppProxy getAppProxy(AppID key)
- {
- throw new Error("Not implemented");
+ public AppProxy getAppProxy(AppID key) {
+ logger.unimplemented("getAppProxy");
+ return null;
 }
 
- public void addListener(AppsDatabaseEventListener listener)
- {
- throw new Error("Not implemented");
+ public void addListener(AppsDatabaseEventListener listener) {
+ synchronized(listeners) {
+ listeners.add(listener);
+ }
 }
 
- public void removeListener(AppsDatabaseEventListener listener)
- {
- throw new Error("Not implemented");
+ public void removeListener(AppsDatabaseEventListener listener) {
+ synchronized(listeners) {
+ listeners.remove(listener);
+ }
 }
+
+ protected void notifyListeners(int id, AppID appid) {
+ LinkedList list;
+ synchronized(listeners) {
+ list = (LinkedList)listeners.clone();
+ }
+ AppsDatabaseEvent event = new AppsDatabaseEvent(id, appid, this);
+ for (int i = 0; i < list.size(); i++) {
+ switch (id) {
+ case AppsDatabaseEvent.APP_ADDED:
+ ((AppsDatabaseEventListener)list.get(i)).entryAdded(event);
+ break;
+ case AppsDatabaseEvent.APP_CHANGED:
+ ((AppsDatabaseEventListener)list.get(i)).entryChanged(event);
+ break;
+ case AppsDatabaseEvent.APP_DELETED:
+ ((AppsDatabaseEventListener)list.get(i)).entryRemoved(event);
+ break;
+ case AppsDatabaseEvent.NEW_DATABASE:
+ ((AppsDatabaseEventListener)list.get(i)).newDatabase(event);
+ break;
+ }
+ }
+ }
+
+ private LinkedList listeners = new LinkedList();
+ private static final Logger logger = Logger.getLogger(AppsDatabase.class.getName());
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/application/AppsDatabaseFilter.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/application/AppsDatabaseFilter.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/application/CurrentServiceFilter.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/application/CurrentServiceFilter.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/application/RunningApplicationsFilter.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/application/RunningApplicationsFilter.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCObject.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCObject.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/event/EventManager.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/event/EventManager.java Changed

@@ -19,6 +19,7 @@
 
 package org.dvb.event;
 
+import java.awt.BDJHelper;
 import java.util.Iterator;
 import java.util.LinkedList;
 
@@ -28,205 +29,250 @@
 import org.davic.resources.ResourceServer;
 import org.davic.resources.ResourceStatusEvent;
 import org.davic.resources.ResourceStatusListener;
-import org.videolan.BDJInputListener;
-import org.videolan.BDJLoader;
+import org.havi.ui.HScene;
+import org.videolan.BDJAction;
+import org.videolan.BDJActionManager;
+import org.videolan.BDJXletContext;
+import org.videolan.GUIManager;
+import org.videolan.Logger;
 
-public class EventManager implements ResourceServer, BDJInputListener {
- protected EventManager()
- {
- BDJLoader.inputListener = this;
- }
-
- public static EventManager getInstance()
- {
+public class EventManager implements ResourceServer {
+ public static EventManager getInstance() {
 synchronized (EventManager.class) {
- if (instance == null) {
+ if (instance == null)
 instance = new EventManager();
- }
 }
- 
 return instance;
 }
 
- public boolean addUserEventListener(UserEventListener listener,
- ResourceClient client, UserEventRepository userEvents)
- {
- if (listener == null || client == null || userEvents == null)
- throw new NullPointerException();
- 
- // first remove exclusive events
- UserEventItem newItem = new UserEventItem(BDJLoader.getContext(), listener, client, userEvents);
- cleanupReservedEvents(newItem);
- 
- exclusiveEvents.add(newItem);
- 
- sendEvent(new UserEventUnavailableEvent(userEvents));
- 
- return true;
+ public boolean addUserEventListener(UserEventListener listener, ResourceClient client, UserEventRepository userEvents)
+ throws IllegalArgumentException {
+ if (client == null)
+ throw new IllegalArgumentException();
+ synchronized (this) {
+ if (!cleanupReservedEvents(userEvents))
+ return false;
+ exclusiveUserEventListener.add(new UserEventItem(BDJXletContext.getCurrentContext(), listener, client, userEvents));
+ sendResourceStatusEvent(new UserEventUnavailableEvent(userEvents));
+ return true;
+ }
 }
 
- public void addUserEventListener(UserEventListener listener,
- UserEventRepository userEvents)
- {
+ public void addUserEventListener(UserEventListener listener, UserEventRepository userEvents) {
 if (listener == null || userEvents == null)
 throw new NullPointerException();
- 
- UserEventItem newItem = new UserEventItem(BDJLoader.getContext(), listener, null, userEvents);
- if (checkAlreadyReserved(newItem) != null)
- return;
- 
- events.add(newItem);
+ synchronized (this) {
+ sharedUserEventListener.add(new UserEventItem(BDJXletContext.getCurrentContext(), listener, null, userEvents));
+ }
 }
 
- public boolean addExclusiveAccessToAWTEvent(ResourceClient client,
- UserEventRepository userEvents)
- {
- if (client == null || userEvents == null)
- throw new NullPointerException();
-
- // first remove exclusive events
- UserEventItem newItem = new UserEventItem(BDJLoader.getContext(), null, client, userEvents);
- cleanupReservedEvents(newItem);
- 
- exclusiveEvents.add(newItem);
- 
- sendEvent(new UserEventUnavailableEvent(userEvents));
- 
- return true;
+ public void removeUserEventListener(UserEventListener listener) {
+ BDJXletContext context = BDJXletContext.getCurrentContext();
+ synchronized (this) {
+ for (Iterator it = sharedUserEventListener.iterator(); it.hasNext(); ) {
+ UserEventItem item = (UserEventItem)it.next();
+ if ((item.context == context) && (item.listener == listener))
+ it.remove();
+ }
+ for (Iterator it = exclusiveUserEventListener.iterator(); it.hasNext(); ) {
+ UserEventItem item = (UserEventItem)it.next();
+ if ((item.context == context) && (item.listener == listener)) {
+ sendResourceStatusEvent(new UserEventAvailableEvent(item.userEvents));
+ it.remove();
+ }
+ }
+ }
 }
 
- public void removeUserEventListener(UserEventListener listener)
- {
- 
- for (Iterator<UserEventItem> it = events.iterator(); it.hasNext(); ) {
- UserEventItem item = it.next();
- 
- if (item.listener == listener)
- it.remove();
- 
+ public boolean addExclusiveAccessToAWTEvent(ResourceClient client, UserEventRepository userEvents)
+ throws IllegalArgumentException {
+ if (client == null)
+ throw new IllegalArgumentException();
+ synchronized (this) {
+ if (!cleanupReservedEvents(userEvents))
+ return false;
+ exclusiveAWTEventListener.add(new UserEventItem(BDJXletContext.getCurrentContext(), null, client, userEvents));
+ sendResourceStatusEvent(new UserEventUnavailableEvent(userEvents));
+ return true;
 }
- for (Iterator<UserEventItem> it = exclusiveEvents.iterator(); it.hasNext(); ) {
- UserEventItem item = it.next();
- 
- if (item.listener == listener) {
- sendEvent(new UserEventAvailableEvent(item.userEvents));
- it.remove();
+ }
+
+ public void removeExclusiveAccessToAWTEvent(ResourceClient client) {
+ BDJXletContext context = BDJXletContext.getCurrentContext();
+ synchronized (this) {
+ for (Iterator it = exclusiveAWTEventListener.iterator(); it.hasNext(); ) {
+ UserEventItem item = (UserEventItem)it.next();
+ if ((item.context == context) && (item.client == client)) {
+ sendResourceStatusEvent(new UserEventAvailableEvent(item.userEvents));
+ it.remove();
+ }
 }
 }
 }
 
- public void removeExclusiveAccessToAWTEvent(ResourceClient client)
- {
- for (Iterator<UserEventItem> it = exclusiveEvents.iterator(); it.hasNext(); ) {
- UserEventItem item = it.next();
- 
- if (item.client == client) {
- sendEvent(new UserEventAvailableEvent(item.userEvents));
- it.remove();
- }
+ public void addResourceStatusEventListener(ResourceStatusListener listener) {
+ synchronized (this) {
+ resourceStatusEventListeners.add(listener);
 }
 }
 
- public void addResourceStatusEventListener(ResourceStatusListener listener)
- {
- listeners.add(listener);
+ public void removeResourceStatusEventListener(ResourceStatusListener listener) {
+ synchronized (this) {
+ resourceStatusEventListeners.remove(listener);
+ }
+ }
+
+ private void sendResourceStatusEvent(ResourceStatusEvent event) {
+ for (Iterator it = resourceStatusEventListeners.iterator(); it.hasNext(); )
+ ((ResourceStatusListener)it.next()).statusChanged(event);
 }
 
- public void removeResourceStatusEventListener(
- ResourceStatusListener listener)
- {
- listeners.remove(listener);
+ public void receiveKeyEvent(int type, int modifiers, int keyCode) {
+ receiveKeyEventN(type, modifiers, keyCode);
 }
- 
- public void receiveKeyEvent(int type, int keyCode)
- {
- // first go through exclusive events and return if one is found
- for (UserEventItem item : exclusiveEvents) {
- for (UserEvent evt : item.userEvents.getUserEvent()) {
- if (evt.getCode() == keyCode && evt.getType() == type) {
- item.listener.userEventReceived(evt);
- return;
+
+ public boolean receiveKeyEventN(int type, int modifiers, int keyCode) {
+ UserEvent ue = new UserEvent(this, 1, type, keyCode, modifiers, System.currentTimeMillis());
+ HScene focusHScene = GUIManager.getInstance().getFocusHScene();
+ boolean result = false;
+
+ if (focusHScene != null) {
+ BDJXletContext context = focusHScene.getXletContext();
+ for (Iterator it = exclusiveAWTEventListener.iterator(); it.hasNext(); ) {
+ UserEventItem item = (UserEventItem)it.next();
+ if (item.context == null) {
+ it.remove();
+ continue;
 }
- }
- }
- 
- // if there are no exclusive events go through shared events
- for (UserEventItem item : events) {
- for (UserEvent evt : item.userEvents.getUserEvent()) {
- if (evt.getCode() == keyCode && evt.getType() == type) {
- item.listener.userEventReceived(evt);
+ if (item.context == context) {
+ if (item.userEvents.contains(ue)) {
+ result = BDJHelper.postKeyEvent(type, modifiers, keyCode);
+ return true;
+ }
 }
 }
 }
- }
- 
- private UserEventItem checkAlreadyReserved(UserEventItem newItem) {
- for (UserEventItem item : exclusiveEvents) {
- if (newItem.context == item.context)
+
+ for (Iterator it = exclusiveUserEventListener.iterator(); it.hasNext(); ) {
+ UserEventItem item = (UserEventItem)it.next();
+ if (item.context == null) {
+ it.remove();
 continue;
- 
- if (newItem.client == item.client)
+ }
+ if (item.userEvents.contains(ue)) {
+ item.context.putCallback(new UserEventAction(item, ue));
+ return true;
+ }
+ }
+
+ result = BDJHelper.postKeyEvent(type, modifiers, keyCode);
+
+ for (Iterator it = sharedUserEventListener.iterator(); it.hasNext(); ) {
+ UserEventItem item = (UserEventItem)it.next();
+ if (item.context == null) {
+ it.remove();
 continue;
- 
- if (hasOverlap(item, newItem))
- return item;
+ }
+ if (item.userEvents.contains(ue)) {
+ item.context.putCallback(new UserEventAction(item, ue));
+ result = true;
+ }
 }
- 
- return null;
+
+ return result;
 }
- 
- private void cleanupReservedEvents(UserEventItem newItem) 
- {
- UserEventItem oldItem = checkAlreadyReserved(newItem);
- if (oldItem != null){
- oldItem.client.release(oldItem.userEvents);
- exclusiveEvents.remove(oldItem);
+
+ private boolean cleanupReservedEvents(UserEventRepository userEvents) {
+ BDJXletContext context = BDJXletContext.getCurrentContext();
+ for (Iterator it = exclusiveUserEventListener.iterator(); it.hasNext(); ) {
+ UserEventItem item = (UserEventItem)it.next();
+ if (item.context == context)
+ continue;
+ if (hasOverlap(userEvents, item.userEvents)) {
+ try {
+ if (!item.client.requestRelease(item.userEvents, null))
+ return false;
+ } catch (Exception e) {
+ logger.error("requestRelease() failed: " + e.getClass());
+ logger.info("" + e.getStackTrace());
+ return false;
+ }
+ sendResourceStatusEvent(new UserEventAvailableEvent(item.userEvents));
+ it.remove();
+ }
+ }
+ for (Iterator it = exclusiveAWTEventListener.iterator(); it.hasNext(); ) {
+ UserEventItem item = (UserEventItem)it.next();
+ if (item.context == context)
+ continue;
+ if (hasOverlap(userEvents, item.userEvents)) {
+ try {
+ if (!item.client.requestRelease(item.userEvents, null))
+ return false;
+ } catch (Exception e) {
+ logger.error("requestRelease() failed: " + e.getClass());
+ logger.info("" + e.getStackTrace());
+ return false;
+ }
+ sendResourceStatusEvent(new UserEventAvailableEvent(item.userEvents));
+ it.remove();
+ }
 }
+ return true;
 }
- 
- private boolean hasOverlap(UserEventItem item1, UserEventItem item2)
- {
- for (UserEvent ue1 : item1.userEvents.getUserEvent()) {
- for (UserEvent ue2 : item2.userEvents.getUserEvent()) {
- if (ue1.getFamily() != ue2.getFamily() || ue1.getCode() != ue2.getCode())
- continue;
- else
+
+ private boolean hasOverlap(UserEventRepository userEvents1, UserEventRepository userEvents2) {
+ UserEvent[] evts1 = userEvents1.getUserEvent();
+ UserEvent[] evts2 = userEvents2.getUserEvent();
+ for (int i = 0; i < evts1.length; i++) {
+ UserEvent evt1 = evts1[i];
+ for (int j = 0; j < evts2.length; j++) {
+ UserEvent evt2 = evts2[j];
+ if ((evt1.getFamily() == evt2.getFamily()) && (evt1.getCode() != evt2.getCode()))
 return true;
 }
 }
- 
 return false;
 }
- 
- private void sendEvent(ResourceStatusEvent event)
- {
- for (ResourceStatusListener listener : listeners) {
- listener.statusChanged(event);
- }
- }
- 
- private class UserEventItem
- {
- public UserEventItem(XletContext context, UserEventListener listener,
- ResourceClient client, UserEventRepository userEvents)
- {
+
+ private class UserEventItem {
+ public UserEventItem(BDJXletContext context, UserEventListener listener,
+ ResourceClient client, UserEventRepository userEvents) {
 this.context = context;
 this.listener = listener;
 this.client = client;
- this.userEvents = userEvents;
+ this.userEvents = userEvents.getNewInstance();
+ if (context == null) {
+ logger.error("Missing xlet context: " + Logger.dumpStack());
+ }
 }
- 
- public XletContext context;
+
+ public BDJXletContext context;
 public UserEventListener listener;
 public ResourceClient client;
 public UserEventRepository userEvents;
 }
- 
 
- private LinkedList<UserEventItem> exclusiveEvents = new LinkedList<UserEventItem>();
- private LinkedList<UserEventItem> events = new LinkedList<UserEventItem>();
- private LinkedList<ResourceStatusListener> listeners = new LinkedList<ResourceStatusListener>();
- 
+ private class UserEventAction extends BDJAction {
+ public UserEventAction(UserEventItem item, UserEvent event) {
+ this.listener = item.listener;
+ this.event = event;
+ }
+
+ protected void doAction() {
+ listener.userEventReceived(event);
+ }
+
+ private UserEventListener listener;
+ private UserEvent event;
+ }
+
+ private LinkedList exclusiveUserEventListener = new LinkedList();
+ private LinkedList sharedUserEventListener = new LinkedList();
+ private LinkedList exclusiveAWTEventListener = new LinkedList();
+ private LinkedList resourceStatusEventListeners = new LinkedList();
+
 private static EventManager instance = null;
- 
+
+ private static final Logger logger = Logger.getLogger(EventManager.class.getName());
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/event/UserEventRepository.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/event/UserEventRepository.java Changed

@@ -34,19 +34,19 @@
 
 public void addUserEvent(UserEvent event)
 {
+ if (contains(event)) {
+ return;
+ }
+
 events.add(event);
 }
 
 public UserEvent[] getUserEvent()
 {
- UserEvent[] userEvents = new UserEvent[events.size()];
- 
- int i = 0;
- for (UserEvent e : userEvents) {
- userEvents[i] = e;
- i++;
- }
- 
+ int size = events.size();
+ UserEvent[] userEvents = new UserEvent[size];
+ for (int i = 0; i < size; i++)
+ userEvents[i] = (UserEvent)events.get(i);
 return userEvents;
 }
 
@@ -57,17 +57,17 @@
 
 public void addKey(int keycode)
 {
- events.add(new UserEvent(this, UserEvent.UEF_KEY_EVENT,
- KeyEvent.KEY_PRESSED, keycode, 0, 0));
- events.add(new UserEvent(this, UserEvent.UEF_KEY_EVENT,
- KeyEvent.KEY_RELEASED, keycode, 0, 0));
+ addUserEvent(new UserEvent(this, UserEvent.UEF_KEY_EVENT,
+ KeyEvent.KEY_PRESSED, keycode, 0, 0));
+ addUserEvent(new UserEvent(this, UserEvent.UEF_KEY_EVENT,
+ KeyEvent.KEY_RELEASED, keycode, 0, 0));
 }
 
 public void removeKey(int keycode)
 {
- for(Iterator<UserEvent> it = events.iterator(); it.hasNext() == true; ) {
- UserEvent event = it.next();
- 
+ for(Iterator it = events.iterator(); it.hasNext() == true; ) {
+ UserEvent event = (UserEvent)it.next();
+
 if (event.getCode() == keycode)
 it.remove();
 }
@@ -133,5 +133,29 @@
 removeKey(HRcEvent.VK_DOWN);
 }
 
- private LinkedList<UserEvent> events = new LinkedList<UserEvent>();
+ boolean contains(UserEvent event)
+ {
+ for(Iterator it = events.iterator(); it.hasNext() == true; ) {
+ UserEvent e = (UserEvent)it.next();
+ if (e.getFamily() == event.getFamily() && e.getType() == event.getType() && e.getCode() == event.getCode()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /* deep copy */
+
+ private UserEventRepository(UserEventRepository r)
+ {
+ super(r.getClient(), r.getName());
+ events = ((LinkedList)r.events.clone());
+ }
+
+ protected UserEventRepository getNewInstance()
+ {
+ return new UserEventRepository(this);
+ }
+
+ private LinkedList events = new LinkedList();
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/io/ixc/IxcRegistry.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/io/ixc/IxcRegistry.java Changed

@@ -1,6 +1,5 @@
 /*
 * This file is part of libbluray
- * Copyright (C) 2010 William Hahne
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -23,147 +22,94 @@
 import java.rmi.NotBoundException;
 import java.rmi.AlreadyBoundException;
 import java.rmi.Remote;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.logging.Logger;
 
 import javax.tv.xlet.XletContext;
 
-import org.videolan.BasicXletContext;
-import org.videolan.XletState;
+import org.videolan.IxcRegistryImpl;
+
 
 public class IxcRegistry {
- public static Remote lookup(XletContext xc, String path)
- throws NotBoundException, RemoteException
- {
- String[] parts = path.split("/", 3);
- 
- if (parts.length != 3)
- throw new IllegalArgumentException("Malformed path");
- 
- int orgId = Integer.parseInt(parts[0], 16);
- short appId = Short.parseShort(parts[1], 16);
- String name = parts[2];
- 
- for (IxcObject obj : ixcList) {
- if (obj.orgId == orgId && obj.appId == appId && obj.name.equals(name)) {
- logger.info("Looked up " + path);
- return obj.obj;
- }
+
+ private static IxcRegistryImpl registry = null;
+
+ private static IxcRegistryImpl getIxcRegistry() {
+ if (registry == null) {
+ registry = new IxcRegistryImpl();
+ }
+ return registry;
+ }
+
+ public static Remote lookup(XletContext xc, String path) throws NotBoundException, RemoteException {
+ int orgid, appid;
+ int s1, s2;
+ if (path.charAt(0) != '/')
+ throw new IllegalArgumentException();
+ s1 = path.indexOf('/', 1);
+ if (s1 <= 1)
+ throw new IllegalArgumentException();
+ try {
+ orgid = Integer.parseInt(path.substring(1, s1), 16);
+ } catch (Exception e) {
+ throw new IllegalArgumentException();
+ }
+ s1++;
+ s2 = path.indexOf('/', s1);
+ if (s2 <= s1)
+ throw new IllegalArgumentException();
+ try {
+ appid = Integer.parseInt(path.substring(s1, s2), 16);
+ } catch (Exception e) {
+ throw new IllegalArgumentException();
 }
- 
- logger.warning("Failed to look up " + path);
- throw new NotBoundException();
+ String key = "/" + Integer.toHexString(orgid) +
+ "/" + Integer.toHexString(appid) +
+ "/" + path.substring(s2 + 1, path.length());
+
+ return getIxcRegistry().lookup(xc, key);
 }
 
- public static void bind(XletContext xc, String name, Remote obj)
- throws AlreadyBoundException
- { 
- if (xc == null || name == null || obj == null)
+ public static void bind(XletContext xc, String name, Remote obj) throws AlreadyBoundException {
+ if ((xc == null) || (name == null) || (obj == null))
 throw new NullPointerException();
- 
- // make sure the xlet is not currently in the destroyed state
- if (((BasicXletContext)xc).getState().equals(XletState.DESTROYED))
- return;
- 
- int orgId = (Integer)xc.getXletProperty("dvb.org.id");
- short appId = (Short)xc.getXletProperty("dvb.app.id");
- 
- IxcObject ixcObj = new IxcObject(orgId, appId, name, obj);
- 
- if (ixcList.contains(ixcObj))
- throw new AlreadyBoundException();
- 
- ixcList.add(ixcObj);
- 
- logger.info("Bound /" + Integer.toString(orgId, 16) + "/" + Integer.toString(appId, 16) + "/" + name);
+ String key = "/" + (String)xc.getXletProperty("dvb.org.id") +
+ "/" + (String)xc.getXletProperty("dvb.app.id") +
+ "/" + name;
+
+ getIxcRegistry().bind(xc, key, obj);
 }
 
- public static void unbind(XletContext xc, String name)
- throws NotBoundException
- {
- if (xc == null || name == null)
+ public static void unbind(XletContext xc, String name) throws NotBoundException {
+ if ((xc == null) || (name == null))
 throw new NullPointerException();
- 
- int orgId = (Integer)xc.getXletProperty("dvb.org.id");
- short appId = (Short)xc.getXletProperty("dvb.app.id");
- 
- IxcObject ixcObj = new IxcObject(orgId, appId, name, null);
- 
- if (!ixcList.contains(ixcObj))
- throw new NotBoundException();
- 
- ixcList.remove(ixcObj);
- 
- logger.info("Unbound /" + Integer.toString(orgId, 16) + "/" + Integer.toString(appId, 16) + "/" + name);
+ String key = "/" + (String)xc.getXletProperty("dvb.org.id") +
+ "/" + (String)xc.getXletProperty("dvb.app.id") +
+ "/" + name;
+
+ getIxcRegistry().unbind(key);
 }
 
- public static void rebind(XletContext xc, String name, Remote obj)
- {
- 
+ public static void rebind(XletContext xc, String name, Remote obj) {
+ if ((xc == null) || (name == null) || (obj == null))
+ throw new NullPointerException();
+ String key = "/" + (String)xc.getXletProperty("dvb.org.id") +
+ "/" + (String)xc.getXletProperty("dvb.app.id") +
+ "/" + name;
 try {
- unbind(xc, name);
- } catch (NotBoundException e) {
- // ignore
+ getIxcRegistry().unbind(key);
+ }
+ catch (NotBoundException e) {
 }
- 
 try {
- bind(xc, name, obj);
+ getIxcRegistry().bind(xc, key, obj);
 } catch (AlreadyBoundException e) {
- logger.warning("rebind should never encounter an AlreadyBoundException, something is wrong here.");
- e.printStackTrace();
 }
 }
 
- public static String[] list(XletContext xc)
- {
- String[] out = new String[ixcList.size()];
- 
- for (int i = 0; i < ixcList.size(); i++) {
- IxcObject obj = ixcList.get(i);
- 
- out[i] = "/" + Integer.toString(obj.orgId, 16) + "/" + Integer.toString(obj.appId, 16) + "/" + obj.name;
- }
- 
- return out;
+ public static String[] list(XletContext xc) {
+ return getIxcRegistry().list();
 }
- 
- private static class IxcObject {
- public IxcObject(int orgId, short appId, String name, Remote obj) {
- this.orgId = orgId;
- this.appId = appId;
- this.name = name;
- this.obj = obj;
- }
-
- public boolean equals(Object obj)
- {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- IxcObject other = (IxcObject) obj;
- if (appId != other.appId)
- return false;
- if (name == null) {
- if (other.name != null)
- return false;
- } else if (!name.equals(other.name))
- return false;
- if (orgId != other.orgId)
- return false;
- return true;
- }
 
- public int orgId;
- public short appId;
- public String name;
- public Remote obj;
+ public static void unbindAll(XletContext xc) {
+ getIxcRegistry().unbindAll(xc);
 }
- 
- private static List<IxcObject> ixcList = Collections.synchronizedList(new ArrayList<IxcObject>());
- private static Logger logger = Logger.getLogger(IxcRegistry.class.getName());
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/lang/DVBClassLoader.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/lang/DVBClassLoader.java Changed

@@ -17,64 +17,90 @@
 * <http://www.gnu.org/licenses/>.
 */
 package org.dvb.lang;
-/*
- * This file is part of libbluray
- * Copyright (C) 2010 William Hahne
- *
- * This program 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.
- *
- * This program 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders of libbluray
- * gives permission to link the code of its release of libbluray with the
- * OpenSSL project's "OpenSSL" library (or with modified versions of it
- * that use the same license as the "OpenSSL" library), and distribute
- * the linked executables. You must obey the GNU General Public License
- * in all respects for all of the code used other than "OpenSSL". If you
- * modify this file, you may extend this exception to your version of the
- * file, but you are not obligated to do so. If you do not wish to do
- * so, delete this exception statement from your version.
- */
 
+import java.io.IOException;
 import java.net.URL;
+import java.net.URLClassLoader;
+import java.security.CodeSource;
+import java.security.PermissionCollection;
+import java.util.Enumeration;
+import java.util.jar.Manifest;
 
 public abstract class DVBClassLoader extends java.security.SecureClassLoader {
- public DVBClassLoader(URL[] urls)
- {
- this.urls = urls;
- this.parent = null;
+ public static DVBClassLoader newInstance(URL[] urls) {
+ return new DVBClassLoaderImpl(urls);
 }
 
- public DVBClassLoader(URL[] urls, ClassLoader parent)
- {
- this.urls = urls;
- this.parent = parent;
+ public static DVBClassLoader newInstance(URL[] urls, ClassLoader parent) {
+ return new DVBClassLoaderImpl(urls, parent);
 }
 
- protected Class<?> findClass(String name) throws ClassNotFoundException
- {
- throw new Error("Not implemented");
+ public DVBClassLoader(URL[] urls) {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null)
+ sm.checkCreateClassLoader();
+ loader = new DVBURLClassLoader(urls);
 }
 
- public static DVBClassLoader newInstance(URL[] urls)
- {
- return new DVBClassLoaderImpl(urls);
+ public DVBClassLoader(URL[] urls, ClassLoader parent) {
+ super(parent);
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null)
+ sm.checkCreateClassLoader();
+ loader = new DVBURLClassLoader(urls, parent);
 }
 
- public static DVBClassLoader newInstance(URL[] urls, ClassLoader parent)
- {
- return new DVBClassLoaderImpl(urls, parent);
+ public Class findClass(String name) throws ClassNotFoundException {
+ return loader.findClass(name);
+ }
+
+ protected Package definePackage(String name, Manifest man, URL url)
+ throws IllegalArgumentException {
+ return loader.definePackage(name, man, url);
+ }
+
+ protected URL findResource(String name) {
+ return loader.findResource(name);
+ }
+
+ protected Enumeration findResources(String name) throws IOException {
+ return loader.findResources(name);
+ }
+
+ protected PermissionCollection getPermissions(CodeSource codesource) {
+ return loader.getPermissions(codesource);
+ }
+
+ protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException {
+ return loader.loadClass(name, resolve);
+ }
+
+ protected class DVBURLClassLoader extends URLClassLoader {
+ public DVBURLClassLoader(URL[] urls) {
+ super(urls);
+ }
+
+ public DVBURLClassLoader(URL[] urls, ClassLoader parent) {
+ super(urls, parent);
+ }
+
+ protected Class findClass(String name) throws ClassNotFoundException {
+ return super.findClass(name);
+ }
+
+ protected Package definePackage(String name, Manifest man, URL url)
+ throws IllegalArgumentException {
+ return super.definePackage(name, man, url);
+ }
+
+ protected PermissionCollection getPermissions(CodeSource codesource) {
+ return super.getPermissions(codesource);
+ }
+
+ protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException {
+ return super.loadClass(name, resolve);
+ }
 }
 
- private URL[] urls;
- private ClassLoader parent;
+ protected DVBURLClassLoader loader;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/lang/DVBClassLoaderImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/lang/DVBClassLoaderImpl.java Changed

@@ -22,15 +22,28 @@
 import java.net.URL;
 
 public class DVBClassLoaderImpl extends DVBClassLoader {
- public DVBClassLoaderImpl(URL[] urls)
- {
+ public DVBClassLoaderImpl(URL[] urls) {
 super(urls);
- throw new Error("Not implemented");
 }
 
- public DVBClassLoaderImpl(URL[] urls, ClassLoader parent)
- {
+ public DVBClassLoaderImpl(URL[] urls, ClassLoader parent) {
 super(urls, parent);
- throw new Error("Not implemented");
+ }
+
+ protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ String cname = name.replace('/', '.');
+ if (cname.startsWith("[")) {
+ int b = cname.lastIndexOf('[') + 2;
+ if ((b > 1) && (b < cname.length())) {
+ cname = cname.substring(b);
+ }
+ }
+ int i = cname.lastIndexOf('.');
+ if (i != -1)
+ sm.checkPackageAccess(name.substring(0, i));
+ }
+ return super.loadClass(name, resolve);
 }
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/media/DripFeedDataSource.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/media/DripFeedDataSource.java Changed

@@ -19,59 +19,63 @@
 
 package org.dvb.media;
 
+import javax.media.MediaLocator;
 import javax.media.Time;
 import java.io.IOException;
 import javax.media.protocol.DataSource;
 
 public class DripFeedDataSource extends DataSource {
-    public DripFeedDataSource()
-    {
-        throw new Error("Not implemented");
+    public DripFeedDataSource() {
+        SecurityManager security = System.getSecurityManager();
+        if (security != null)
+            security.checkPermission(new DripFeedPermission("*"));
     }
 
-    public void feed(byte[] clip_part)
-    {
-        throw new Error("Not implemented");
+    public DripFeedDataSource(MediaLocator source) {
+        SecurityManager security = System.getSecurityManager();
+        if (security != null)
+            security.checkPermission(new DripFeedPermission("*"));
+        setLocator(source);
     }
 
-    public String getContentType()
-    {
+    public void feed(byte[] clip_part) {
         throw new Error("Not implemented");
     }
 
-    public void connect() throws IOException
-    {
+    public String getContentType() {
+        return "video/dvb.mpeg.drip";
+    }
+
+    public void connect() throws IOException {
         throw new Error("Not implemented");
     }
 
-    public void disconnect()
-    {
+    public void disconnect() {
         throw new Error("Not implemented");
     }
 
-    public void start() throws IOException
-    {
+    public void start() throws IOException {
         throw new Error("Not implemented");
     }
 
-    public void stop() throws IOException
-    {
+    public void stop() throws IOException {
         throw new Error("Not implemented");
     }
 
-    public Time getDuration()
-    {
+    public Time getDuration() {
         throw new Error("Not implemented");
     }
 
-    public Object[] getControls()
-    {
+    public Object[] getControls() {
         throw new Error("Not implemented");
     }
 
-    public Object getControl(String controlType)
-    {
+    public Object getControl(String controlType) {
         throw new Error("Not implemented");
     }
 
+    public void setLocator(MediaLocator source) {
+        if ((source != null) && ("dripfeed://".equalsIgnoreCase(source.toExternalForm())))
+            super.setLocator(source);
+    }
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/media/DripFeedPermission.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/media/DripFeedPermission.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/media/VideoTransformation.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/media/VideoTransformation.java Changed

@@ -21,73 +21,54 @@
 
 import java.awt.Rectangle;
 import org.havi.ui.HScreenPoint;
-import org.videolan.BDJLoader;
-import org.videolan.bdjo.GraphicsResolution;
 
 public class VideoTransformation {
-    protected VideoTransformation(boolean panAndScan) {
-        this.panAndScan = panAndScan;
-    }
-    
-    public VideoTransformation()
-    {
-        GraphicsResolution res = BDJLoader.getBdjo().getTerminalInfo().getResolution();
-        
-        this.clip = new Rectangle(res.getWidth(), res.getHeight());
-        this.scaling[0] = 1.0f;
-        this.scaling[1] = 1.0f;
-        this.position = new HScreenPoint(0.0f, 0.0f);
+    public VideoTransformation() {
+        hscaling = 1.0f;
+        vscaling = 1.0f;
+        position = new HScreenPoint(0.0f, 0.0f);
     }
 
     public VideoTransformation(Rectangle clipRect,
             float horizontalScalingFactor, float verticalScalingFactor,
-            HScreenPoint location)
-    {
-        this.clip = clipRect;
-        this.scaling[0] = horizontalScalingFactor;
-        this.scaling[1] = verticalScalingFactor;
-        this.position = location;
+            HScreenPoint location) {
+        if (clipRect != null)
+                clip = new Rectangle(clipRect);
+        hscaling = horizontalScalingFactor;
+        vscaling = verticalScalingFactor;
+        position = new HScreenPoint(location.x, location.y);
     }
 
-    public void setClipRegion(Rectangle clipRect)
-    {
-        this.clip = clipRect;
+    public void setClipRegion(Rectangle clipRect) {
+        clip = (clipRect != null) ? new Rectangle(clipRect) : null;
     }
 
-    public Rectangle getClipRegion()
-    {
-        return clip;
+    public Rectangle getClipRegion() {
+        return (!isPanAndScan() && (clip != null)) ? new Rectangle(clip) : null;
     }
 
-    public void setScalingFactors(float horizontalScalingFactor,
-            float verticalScalingFactor)
-    {
-        this.scaling[0] = horizontalScalingFactor;
-        this.scaling[1] = verticalScalingFactor;
+    public void setScalingFactors(float horizontalScalingFactor, float verticalScalingFactor) {
+        hscaling = horizontalScalingFactor;
+        vscaling = verticalScalingFactor;
     }
 
-    public float[] getScalingFactors()
-    {
-        return scaling;
+    public float[] getScalingFactors() {
+        return new float[] { hscaling, vscaling };
     }
 
-    public void setVideoPosition(HScreenPoint location)
-    {
-        this.position = location;
+    public void setVideoPosition(HScreenPoint location) {
+        position = new HScreenPoint(location.x, location.y);
     }
 
-    public HScreenPoint getVideoPosition()
-    {
-        return position;
+    public HScreenPoint getVideoPosition() {
+        return new HScreenPoint(position.x, position.y);
     }
 
-    public boolean isPanAndScan()
-    {
-        return panAndScan;
+    public boolean isPanAndScan() {
+        return false;
     }
-    
-    private float[] scaling = new float[2];
-    private HScreenPoint position = null;
+
     private Rectangle clip = null;
-    private boolean panAndScan = false;
+    private float hscaling, vscaling;
+    private HScreenPoint position;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/test/DVBTest.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/test/DVBTest.java Changed

@@ -22,24 +22,19 @@
 import java.io.IOException;
 
 public class DVBTest {
-    private DVBTest()
-    {
+    private DVBTest() {
     }
 
-    public static void log(String id, String message) throws IOException
-    {
-        throw new Error("Not implemented");
+    public static void log(String id, String message) throws IOException {
+        System.out.println("log: " + id + ": " + message);
     }
 
-    public static void log(String id, int no) throws IOException
-    {
-        throw new Error("Not implemented");
+    public static void log(String id, int no) throws IOException {
+        System.out.println("log: " + id + ": " + no);
     }
 
-    public static void terminate(String id, int terminationCondition)
-            throws IOException
-    {
-        System.out.print(id + ": ");
+    public static void terminate(String id, int terminationCondition) throws IOException {
+        System.out.print("terminate: " + id + ": ");
         switch (terminationCondition) {
         case PASS:
             System.out.println("PASS");
@@ -53,10 +48,8 @@
         }
     }
 
-    public static void prompt(String id, int controlCode, String message)
-            throws IOException
-    {
-        throw new Error("Not implemented");
+    public static void prompt(String id, int controlCode, String message) throws IOException {
+        System.out.println("prompt: " + id + ": " + controlCode + ": " + message);
     }
 
     public final static int PASS = 0x00;

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/ui/DVBBufferedImage.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/ui/DVBBufferedImage.java Changed

@@ -19,9 +19,16 @@
 
 package org.dvb.ui;
 
+import java.awt.Graphics;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.Image;
 import java.awt.image.BufferedImage;
+import java.awt.image.ImageObserver;
+import java.awt.image.ImageProducer;
 
-public class DVBBufferedImage extends BufferedImage {
+public class DVBBufferedImage extends Image {
     public DVBBufferedImage(int width, int height)
     {
         this(width, height, TYPE_BASE);
@@ -29,19 +36,87 @@
 
     public DVBBufferedImage(int width, int height, int type)
     {
-        super(width, height, type == TYPE_BASE ? TYPE_INT_RGB : TYPE_INT_ARGB);
+        this.type = type;
+        GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+        GraphicsDevice gd = ge.getDefaultScreenDevice();
+        GraphicsConfiguration gc = gd.getDefaultConfiguration();
+        bufferedImage = gc.createCompatibleImage(width, height);
     }
 
-    public DVBGraphics createGraphics()
-    {
-        DVBGraphics gfx = new DVBGraphicsImpl(super.createGraphics());
+    private DVBBufferedImage(BufferedImage image, int type) {
+        this.type = type;
+        this.bufferedImage = image;
+    }
+
+    public DVBGraphics createGraphics() {
+        DVBGraphics gfx = new DVBGraphicsImpl(bufferedImage.createGraphics());
         gfx.type = type;
         return gfx;
     }
-    
-    public void dispose()
-    {
-    
+
+    public void dispose() {
+        bufferedImage = null;
+    }
+
+    public void flush() {
+        bufferedImage.flush();
+    }
+
+    public Graphics getGraphics() {
+        return bufferedImage.getGraphics();
+    }
+
+    public int getHeight() {
+        return bufferedImage.getHeight();
+    }
+
+    public int getHeight(ImageObserver observer) {
+        return bufferedImage.getHeight(observer);
+    }
+
+    public Image getImage() {
+        return bufferedImage;
+    }
+
+    public Object getProperty(String name, ImageObserver observer) {
+        return bufferedImage.getProperty(name, observer);
+    }
+
+    public int getRGB(int x, int y) {
+        return bufferedImage.getRGB(x, y);
+    }
+
+    public int[] getRGB(int startX, int startY, int w, int h, int[] rgbArray, int offset, int scansize) {
+        return bufferedImage.getRGB(startX, startY, w, h, rgbArray, offset, scansize);
+    }
+
+    public Image getScaledInstance(int width, int height, int hints) {
+        return bufferedImage.getScaledInstance(width, height, hints);
+    }
+
+    public ImageProducer getSource() {
+        return bufferedImage.getSource();
+    }
+
+    public DVBBufferedImage getSubimage(int x, int y, int w, int h) throws DVBRasterFormatException {
+        BufferedImage subImage = bufferedImage.getSubimage(x, y, w, h);
+        return new DVBBufferedImage(subImage, this.type);
+    }
+
+    public int getWidth() {
+        return bufferedImage.getWidth();
+    }
+
+    public int getWidth(ImageObserver observer) {
+        return bufferedImage.getWidth(observer);
+    }
+
+    public void setRGB(int x, int y, int rgb) {
+        this.bufferedImage.setRGB(x, y, rgb);
+    }
+
+    public void setRGB(int startX, int startY, int w, int h, int[] rgbArray, int offset, int scansize) {
+        bufferedImage.setRGB(startX, startY, w, h, rgbArray, offset, scansize);
     }
 
     public String toString()
@@ -53,4 +128,5 @@
     public static final int TYPE_BASE = 21;
 
     private int type = TYPE_BASE;
+    private BufferedImage bufferedImage;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/user/Facility.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/user/Facility.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/user/GeneralPreference.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/user/GeneralPreference.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/user/Preference.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/user/Preference.java Changed

@@ -19,79 +19,94 @@
 
 package org.dvb.user;
 
-public abstract class Preference {
- protected Preference()
- {
- throw new Error("Not implemented");
+import java.util.Iterator;
+import java.util.LinkedList;
+
+public class Preference {
+ protected Preference() {
+
 }
 
- public Preference(String name, String value)
- {
- throw new Error("Not implemented");
+ public Preference(String name, String value) {
+ this.name = name;
+ if (value != null)
+ values.add(value);
 }
 
- public Preference(String name, String value[])
- {
- throw new Error("Not implemented");
+ public Preference(String name, String value[]) {
+ this.name = name;
+ for (int i = 0; i < value.length; i++)
+ values.add(value[i]);
 }
 
- public void add(String value)
- {
- throw new Error("Not implemented");
+ public void add(String value) {
+ values.remove(value);
+ values.add(value);
 }
 
- public void add(String values[])
- {
- throw new Error("Not implemented");
+ public void add(String value[]) {
+ for (int i = 0; i < value.length; i++)
+ add(value[i]);
 }
 
- public void add(int position, String value)
- {
- throw new Error("Not implemented");
+ public void add(int position, String value) {
+ values.remove(value);
+ if (position < 0)
+ position = 0;
+ else if (position > values.size())
+ position = values.size();
+ values.add(position, value);
 }
 
- public String[] getFavourites()
- {
- throw new Error("Not implemented");
+ public String[] getFavourites() {
+ if (values.isEmpty())
+ return new String[0];
+ return (String[])values.toArray();
 }
 
- public String getMostFavourite()
- {
- throw new Error("Not implemented");
+ public String getMostFavourite() {
+ if (values.isEmpty())
+ return null;
+ return (String)values.get(0);
 }
 
- public String getName()
- {
- throw new Error("Not implemented");
+ public String getName() {
+ return name;
 }
 
- public int getPosition(String value)
- {
- throw new Error("Not implemented");
+ public int getPosition(String value) {
+ return values.indexOf(value);
 }
 
- public boolean hasValue()
- {
- throw new Error("Not implemented");
+ public boolean hasValue() {
+ return !values.isEmpty();
 }
 
- public void remove(String value)
- {
- throw new Error("Not implemented");
+ public void remove(String value) {
+ values.remove(value);
 }
 
- public void removeAll()
- {
- throw new Error("Not implemented");
+ public void removeAll() {
+ values.clear();
 }
 
- public void setMostFavourite(String value)
- {
- throw new Error("Not implemented");
+ public void setMostFavourite(String value) {
+ values.remove(value);
+ values.addFirst(value);
 }
 
- public String toString()
- {
- throw new Error("Not implemented");
+ public String toString() {
+ String result = "Preference:" + name + "[";
+ String comma = "";
+ Iterator it = values.iterator();
+ while (it.hasNext()) {
+ result += comma + (String)it.next();
+ comma = ",";
+ }
+ result += ']';
+ return result;
 }
+
+ private String name;
+ private LinkedList values = new LinkedList();
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/user/UnsupportedPreferenceException.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/user/UnsupportedPreferenceException.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/user/UserPreferenceChangeEvent.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/user/UserPreferenceChangeEvent.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/user/UserPreferenceManager.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/user/UserPreferenceManager.java Changed

@@ -20,42 +20,104 @@
 package org.dvb.user;
 
 import java.io.IOException;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 public class UserPreferenceManager {
- private UserPreferenceManager()
- {
- throw new Error("Not implemented");
+ private UserPreferenceManager() {
 }
 
- public static UserPreferenceManager getInstance()
- {
- throw new Error("Not implemented");
+ public static UserPreferenceManager getInstance() {
+ synchronized (UserPreferenceManager.class) {
+ if (instance == null)
+ instance = new UserPreferenceManager();
+ }
+ return instance;
 }
 
- public void read(Preference p)
- {
- throw new Error("Not implemented");
+ public void read(Preference p) {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(new UserPreferencePermission("read"));
+ }
+ p.removeAll();
+ String name = p.getName();
+ Iterator it = preferences.iterator();
+ while (it.hasNext()) {
+ Preference preference = (Preference)it.next();
+ if (name.equals(preference.getName())) {
+ p.add(preference.getFavourites());
+ break;
+ }
+ }
 }
 
- public void read(Preference p, Facility facility)
- {
- throw new Error("Not implemented");
+ public void read(Preference p, Facility facility) {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(new UserPreferencePermission("read"));
+ }
+ p.removeAll();
+ String name = p.getName();
+ if (name.equals(facility.getPreference())) {
+ Iterator it = preferences.iterator();
+ while (it.hasNext()) {
+ Preference preference = (Preference)it.next();
+ if (name.equals(preference.getName())) {
+ String[] values = preference.getFavourites();
+ String[] valuesFacility = facility.getValues();
+ for (int i = 0; i < values.length; i++)
+ for (int j = 0; j < valuesFacility.length; j++)
+ if (values[i].equals(valuesFacility[j])) {
+ p.add(values[i]);
+ break;
+ }
+ break;
+ }
+ }
+ }
 }
 
- public void write(Preference p) throws UnsupportedPreferenceException,
- IOException
- {
- throw new Error("Not implemented");
+ public void write(Preference p) throws UnsupportedPreferenceException, IOException {
+ String name = p.getName();
+ if (!GeneralPreference.isGeneralPreference(name))
+ throw new UnsupportedPreferenceException();
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(new UserPreferencePermission("write"));
+ }
+ Iterator it = preferences.iterator();
+ while (it.hasNext()) {
+ Preference preference = (Preference)it.next();
+ if (name.equals(preference.getName())) {
+ it.remove();
+ break;
+ }
+ }
+ preferences.add(p);
+ synchronized (listeners) {
+ int size = listeners.size();
+ if (size > 0) {
+ UserPreferenceChangeEvent event = new UserPreferenceChangeEvent(name);
+ for (int i = 0; i < size; i++)
+ ((UserPreferenceChangeListener)listeners.get(i)).receiveUserPreferenceChangeEvent(event);
+ }
+ }
 }
 
- public void addUserPreferenceChangeListener(UserPreferenceChangeListener l)
- {
- throw new Error("Not implemented");
+ public void addUserPreferenceChangeListener(UserPreferenceChangeListener l) {
+ synchronized (listeners) {
+ listeners.add(l);
+ }
 }
 
- public void removeUserPreferenceChangeListener(
- UserPreferenceChangeListener l)
- {
- throw new Error("Not implemented");
+ public void removeUserPreferenceChangeListener(UserPreferenceChangeListener l) {
+ synchronized (listeners) {
+ listeners.remove(l);
+ }
 }
+
+ private static UserPreferenceManager instance;
+ private LinkedList preferences = new LinkedList();
+ private LinkedList listeners = new LinkedList();
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/dvb/user/UserPreferencePermission.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/dvb/user/UserPreferencePermission.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HAnimateLook.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HAnimateLook.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HAnimation.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HAnimation.java Changed

@@ -26,40 +26,42 @@
 public class HAnimation extends HStaticAnimation implements HNavigable {
     public HAnimation()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HAnimation.class.getName(), "");
     }
 
     public HAnimation(Image[] images, int delay, int playMode, int repeatCount,
             int x, int y, int width, int height)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HAnimation.class.getName(), "");
     }
 
     public HAnimation(Image[] imagesNormal, Image[] imagesFocused, int delay,
             int playMode, int repeatCount, int x, int y, int width, int height)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HAnimation.class.getName(), "");
     }
 
     public HAnimation(Image[] images, int delay, int playMode, int repeatCount)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HAnimation.class.getName(), "");
     }
 
     public HAnimation(Image[] imagesNormal, Image[] imagesFocused, int delay,
             int playMode, int repeatCount)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HAnimation.class.getName(), "");
     }
 
     public static void setDefaultLook(HAnimateLook hlook)
     {
-        throw new Error("Not implemented");
+        DefaultLook = hlook;
     }
 
     public static HAnimateLook getDefaultLook()
     {
-        throw new Error("Not implemented");
+        if (DefaultLook == null)
+            org.videolan.Logger.unimplemented("", "getDefaultLook");
+        return DefaultLook;
     }
 
     public void setMove(int keyCode, HNavigable target)
@@ -123,5 +125,7 @@
         throw new Error("Not implemented");
     }
 
+    private static HAnimateLook DefaultLook = null;
+
     private static final long serialVersionUID = 4460392782940525395L;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HBackgroundConfigTemplate.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HBackgroundConfigTemplate.java Changed

@@ -20,24 +20,30 @@
 package org.havi.ui;
 
 public class HBackgroundConfigTemplate extends HScreenConfigTemplate {
-    public HBackgroundConfigTemplate()
-    {
-        throw new Error("Not implemented");
+    public boolean isConfigSupported(HBackgroundConfiguration hbc) {
+        return match(hbc) >= 0;
     }
 
-    public boolean isConfigSupported(HBackgroundConfiguration hbc)
-    {
-        throw new Error("Not implemented");
+    protected int getPreferenceCount() {
+        return super.getPreferenceCount() + 2;
     }
 
-    public void setPreference(int preference, int priority)
-    {
-        throw new Error("Not implemented");
+    protected int getPreferenceIndex(int preference) {
+        if (preference == CHANGEABLE_SINGLE_COLOR)
+            return super.getPreferenceCount();
+        else if (preference == STILL_IMAGE)
+            return super.getPreferenceCount() + 1;
+        return super.getPreferenceIndex(preference);
     }
 
-    public int getPreferencePriority(int preference)
-    {
-        throw new Error("Not implemented");
+    protected int matchPreference(int preference, HScreenConfiguration hsc) {
+        if (preference == CHANGEABLE_SINGLE_COLOR)
+            return matchPreference(CHANGEABLE_SINGLE_COLOR,
+                                   ((HBackgroundConfiguration)hsc).getColor() != null);
+        else if (preference == STILL_IMAGE)
+            return matchPreference(STILL_IMAGE,
+                                   (hsc != null) && (hsc instanceof HStillImageBackgroundConfiguration));
+        return super.matchPreference(preference, hsc);
     }
 
     public static final int CHANGEABLE_SINGLE_COLOR = 0x0A;

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HBackgroundConfiguration.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HBackgroundConfiguration.java Changed

@@ -22,30 +22,35 @@
 import java.awt.Color;
 
 public class HBackgroundConfiguration extends HScreenConfiguration {
- protected HBackgroundConfiguration()
- {
- throw new Error("Not implemented");
+ protected HBackgroundConfiguration() {
+
+ }
+
+ protected HBackgroundConfiguration(HBackgroundConfigTemplate hbct, Color color) {
+ super(hbct);
+ this.hbct = hbct;
+ this.color = color;
 }
 
- public HBackgroundDevice getDevice()
- {
- throw new Error("Not implemented");
+ public HBackgroundDevice getDevice() {
+ return HScreen.getDefaultHScreen().getDefaultHBackgroundDevice();
 }
 
- public HBackgroundConfigTemplate getConfigTemplate()
- {
- throw new Error("Not implemented");
+ public HBackgroundConfigTemplate getConfigTemplate() {
+ return hbct;
 }
 
- public Color getColor()
- {
- throw new Error("Not implemented");
+ public Color getColor() {
+ return color;
 }
 
 public void setColor(Color color)
- throws HPermissionDeniedException, HConfigurationException
- {
- throw new Error("Not implemented");
+ throws HPermissionDeniedException, HConfigurationException {
+ if (color.getAlpha() < 255)
+ throw new HConfigurationException();
+ this.color = color;
 }
 
+ private HBackgroundConfigTemplate hbct;
+ private Color color;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HBackgroundDevice.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HBackgroundDevice.java Changed

@@ -19,43 +19,58 @@
 
 package org.havi.ui;
 
+import java.awt.Color;
+
 public class HBackgroundDevice extends HScreenDevice {
- protected HBackgroundDevice()
- {
- throw new Error("Not implemented");
+ protected HBackgroundDevice() {
+ int length = HScreenConfigTemplate.defaultConfig.length;
+ hbcArray = new HBackgroundConfiguration[length];
+ for (int i = 0; i < length; i++) {
+ HBackgroundConfigTemplate hbct = new HBackgroundConfigTemplate();
+ HScreenConfigTemplate.initDefaultConfigTemplate(hbct, i);
+ hbcArray[i] = new HStillImageBackgroundConfiguration(hbct, new Color(0, 0, 0, 0));
+ }
+ hbc = hbcArray[0];
 }
 
- public HBackgroundConfiguration[] getConfigurations()
- {
- throw new Error("Not implemented");
+ public HBackgroundConfiguration[] getConfigurations() {
+ return hbcArray;
 }
 
- public HBackgroundConfiguration getDefaultConfiguration()
- {
- throw new Error("Not implemented");
+ public HBackgroundConfiguration getDefaultConfiguration() {
+ return hbcArray[0];
 }
 
- public HBackgroundConfiguration getBestConfiguration(
- HBackgroundConfigTemplate hbc)
- {
- throw new Error("Not implemented");
+ public HBackgroundConfiguration getBestConfiguration(HBackgroundConfigTemplate hbct) {
+ int score = -1;
+ HBackgroundConfiguration hbc = null;
+ for (int i = 0; i < hbcArray.length; i++)
+ if (hbct.match(hbcArray[i]) > score)
+ hbc = hbcArray[i];
+ return hbc;
 }
 
- public HBackgroundConfiguration getBestConfiguration(
- HBackgroundConfigTemplate hbcta[])
- {
- throw new Error("Not implemented");
+ public HBackgroundConfiguration getBestConfiguration(HBackgroundConfigTemplate hbcta[]) {
+ int score = -1;
+ HBackgroundConfiguration hbc = null;
+ for (int i = 0; i < hbcArray.length; i++) 
+ for (int j = 0; j < hbcta.length; j++)
+ if (hbcta[j].match(hbcArray[i]) > score)
+ hbc = hbcArray[i];
+ return hbc;
 }
 
- public HBackgroundConfiguration getCurrentConfiguration()
- {
- throw new Error("Not implemented");
+ public HBackgroundConfiguration getCurrentConfiguration() {
+ return hbc;
 }
 
 public boolean setBackgroundConfiguration(HBackgroundConfiguration hbc)
 throws SecurityException, HPermissionDeniedException,
- HConfigurationException
- {
- throw new Error("Not implemented");
+ HConfigurationException {
+ this.hbc = hbc;
+ return true;
 }
+
+ private HBackgroundConfiguration[] hbcArray;
+ private HBackgroundConfiguration hbc;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HBackgroundImage.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HBackgroundImage.java Changed

@@ -19,41 +19,95 @@
 
 package org.havi.ui;
 
+import java.awt.Image;
+import java.awt.Toolkit;
+import java.awt.image.ImageObserver;
+import java.awt.image.ImageProducer;
+import java.net.URL;
+import java.util.ArrayList;
+
+import org.havi.ui.event.HBackgroundImageEvent;
 import org.havi.ui.event.HBackgroundImageListener;
 
-public class HBackgroundImage {
- public HBackgroundImage(String filename)
- {
- throw new Error("Not implemented");
+import sun.awt.image.ByteArrayImageSource;
+import sun.awt.image.FileImageSource;
+import sun.awt.image.URLImageSource;
+
+public class HBackgroundImage implements ImageObserver {
+ public HBackgroundImage(String filename) {
+ producer = new FileImageSource(filename);
+ img = Toolkit.getDefaultToolkit().createImage(producer);
 }
 
- public HBackgroundImage(byte pixels[])
- {
- throw new Error("Not implemented");
+ public HBackgroundImage(byte pixels[]) {
+ producer = new ByteArrayImageSource(pixels);
+ img = Toolkit.getDefaultToolkit().createImage(producer);
 }
 
- public HBackgroundImage(java.net.URL contents)
- {
- throw new Error("Not implemented");
+ public HBackgroundImage(URL contents) {
+ producer = new URLImageSource(contents);
+ img = Toolkit.getDefaultToolkit().createImage(producer);
 }
 
- public void load(HBackgroundImageListener listener)
- {
- throw new Error("Not implemented");
+ public void load(HBackgroundImageListener listener) {
+ synchronized(listeners) {
+ listeners.add(listener);
+ }
+ Toolkit.getDefaultToolkit().prepareImage(img, -1, -1, this);
 }
 
- public int getHeight()
- {
- throw new Error("Not implemented");
+ public int getHeight() {
+ return img.getHeight(null);
 }
 
- public int getWidth()
- {
- throw new Error("Not implemented");
+ public int getWidth() {
+ return img.getWidth(null);
 }
 
- public void flush()
- {
- throw new Error("Not implemented");
+ public void flush() {
+ img.flush();
 }
+
+ public boolean imageUpdate(Image img, int infoflags, int x, int y,
+ int width, int height) {
+ switch(infoflags) {
+ case ImageObserver.ALLBITS:
+ case ImageObserver.FRAMEBITS:
+ notifyListeners(new HBackgroundImageEvent(this,
+ HBackgroundImageEvent.BACKGROUNDIMAGE_LOADED));
+ return false;
+ case ImageObserver.ERROR:
+ notifyListeners(new HBackgroundImageEvent(this,
+ HBackgroundImageEvent.BACKGROUNDIMAGE_INVALID));
+ return false;
+ case ImageObserver.ABORT:
+ notifyListeners(new HBackgroundImageEvent(this,
+ HBackgroundImageEvent.BACKGROUNDIMAGE_IOERROR));
+ return false;
+ }
+ return true;
+ }
+
+ protected Image getImage() {
+ return img;
+ }
+
+ protected void notifyListeners(HBackgroundImageEvent event) {
+ ArrayList list;
+ synchronized(listeners) {
+ list = (ArrayList)listeners.clone();
+ listeners.clear();
+ }
+ for (int i = 0; i < list.size(); i++) {
+ HBackgroundImageListener listener = (HBackgroundImageListener)list.get(i);
+ if (event.getID()== HBackgroundImageEvent.BACKGROUNDIMAGE_LOADED)
+ listener.imageLoaded(event);
+ else
+ listener.imageLoadFailed(event);
+ }
+ }
+
+ private ImageProducer producer;
+ private Image img;
+ private ArrayList listeners = new ArrayList();
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HComponent.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HComponent.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HContainer.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HContainer.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HDefaultTextLayoutManager.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HDefaultTextLayoutManager.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HEmulatedGraphicsConfiguration.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HEmulatedGraphicsConfiguration.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HEmulatedGraphicsDevice.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HEmulatedGraphicsDevice.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HFlatEffectMatte.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HFlatEffectMatte.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HFlatMatte.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HFlatMatte.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HFontCapabilities.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HFontCapabilities.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HGraphicButton.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HGraphicButton.java Changed

@@ -29,39 +29,41 @@
 public class HGraphicButton extends HIcon implements HActionable {
     public HGraphicButton()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), "");
     }
 
     public HGraphicButton(Image image, int x, int y, int width, int height)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), "");
     }
 
     public HGraphicButton(Image imageNormal, Image imageFocused,
             Image imageActioned, int x, int y, int width, int height)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), "");
     }
 
     public HGraphicButton(Image image)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), "");
     }
 
     public HGraphicButton(Image imageNormal, Image imageFocused,
             Image imageActioned)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), "");
     }
 
     public static void setDefaultLook(HGraphicLook hlook)
     {
-        throw new Error("Not implemented");
+        DefaultLook = hlook;
     }
 
     public static HGraphicLook getDefaultLook()
     {
-        throw new Error("Not implemented");
+        if (DefaultLook == null)
+            org.videolan.Logger.unimplemented("", "getDefaultLook");
+        return DefaultLook;
     }
 
     public void setMove(int keyCode, HNavigable target)
@@ -160,5 +162,7 @@
         throw new Error("Not implemented");
     }
 
+    private static HGraphicLook DefaultLook = null;
+
     private static final long serialVersionUID = 5167775411684840800L;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HGraphicsConfigTemplate.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HGraphicsConfigTemplate.java Changed

@@ -20,34 +20,32 @@
 package org.havi.ui;
 
 public class HGraphicsConfigTemplate extends HScreenConfigTemplate {
-    public HGraphicsConfigTemplate()
-    {
-        throw new Error("Not implemented");
+    public boolean isConfigSupported(HGraphicsConfiguration hgc) {
+        return match(hgc) >= 0;
     }
 
-    public boolean isConfigSupported(HGraphicsConfiguration hgc)
-    {
-        throw new Error("Not implemented");
+    protected int getPreferenceCount() {
+        return super.getPreferenceCount() + 3;
     }
 
-    public void setPreference(int preference, int priority)
-    {
-        throw new Error("Not implemented");
+    protected int getPreferenceObjectCount() {
+        return super.getPreferenceObjectCount() + 1;
     }
 
-    public int getPreferencePriority(int preference)
-    {
-        throw new Error("Not implemented");
+    protected int getPreferenceIndex(int preference) {
+        if (preference == VIDEO_MIXING)
+            return super.getPreferenceCount();
+        else if (preference == MATTE_SUPPORT)
+            return super.getPreferenceCount() + 1;
+        else if (preference == IMAGE_SCALING_SUPPORT)
+            return super.getPreferenceCount() + 2;
+        return super.getPreferenceIndex(preference);
     }
 
-    public void setPreference(int preference, Object object, int priority)
-    {
-        throw new Error("Not implemented");
-    }
-
-    public Object getPreferenceObject(int preference)
-    {
-        throw new Error("Not implemented");
+    protected int getPreferenceObjectIndex(int preference) {
+        if (preference == VIDEO_MIXING)
+            return super.getPreferenceObjectCount();
+        return super.getPreferenceObjectIndex(preference);
     }
 
     public static final int VIDEO_MIXING = 0x0C;

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HGraphicsConfiguration.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HGraphicsConfiguration.java Changed

@@ -19,6 +19,9 @@
 
 package org.havi.ui;
 
+import java.awt.Dimension;
+import java.awt.GraphicsEnvironment;
+import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.Component;
 import java.awt.Container;
@@ -27,66 +30,71 @@
 import java.awt.Color;
 
 public class HGraphicsConfiguration extends HScreenConfiguration {
- protected HGraphicsConfiguration()
- {
+ protected HGraphicsConfiguration() {
 
 }
 
- public HGraphicsDevice getDevice()
- {
- throw new Error("Not implemented");
+ HGraphicsConfiguration(HGraphicsConfigTemplate hgct) {
+ super(hgct);
+ this.hgct = hgct;
 }
 
- public HGraphicsConfigTemplate getConfigTemplate()
- {
- throw new Error("Not implemented");
+ public HGraphicsDevice getDevice() {
+ return HScreen.getDefaultHScreen().getDefaultHGraphicsDevice();
 }
 
- public HScreenRectangle getComponentHScreenRectangle(Component component)
- {
- throw new Error("Not implemented");
+ public HGraphicsConfigTemplate getConfigTemplate() {
+ return hgct;
 }
 
- public Rectangle getPixelCoordinatesHScreenRectangle(HScreenRectangle sr,
- Container cont)
- {
- throw new Error("Not implemented");
+ public HScreenRectangle getComponentHScreenRectangle(Component component) {
+ Point p = component.getLocationOnScreen();
+ Dimension r = getPixelResolution();
+ HScreenRectangle sa = getScreenArea();
+ return new HScreenRectangle((float)p.x / r.width + sa.x,
+ (float)p.y / r.height + sa.y,
+ (float)component.getWidth() / r.width,
+ (float)component.getHeight() / r.height);
 }
 
- public Image getCompatibleImage(Image input, HImageHints ih)
- {
- throw new Error("Not implemented");
+ public Rectangle getPixelCoordinatesHScreenRectangle(HScreenRectangle sr, Container cont) {
+ return new Rectangle((int)(sr.x * cont.getWidth()),
+ (int)(sr.y * cont.getHeight()),
+ (int)(sr.width * cont.getWidth()),
+ (int)(sr.height * cont.getHeight()));
 }
 
- public Font[] getAllFonts()
- {
- throw new Error("Not implemented");
+ public Image getCompatibleImage(Image input, HImageHints ih) {
+ return input;
 }
 
- public Color getPunchThroughToBackgroundColor(int percentage)
- {
- throw new Error("Not implemented");
+ public Font[] getAllFonts() {
+ String[] names = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
+ Font[] fontArray = new Font[names.length];
+ for (int i = 0; i < names.length; i++)
+ fontArray[i] = new Font(names[i], Font.PLAIN, 12);
+ return fontArray;
 }
 
- public Color getPunchThroughToBackgroundColor(int percentage,
- HVideoDevice hvd)
- {
+ public Color getPunchThroughToBackgroundColor(int percentage) {
 throw new Error("Not implemented");
 }
 
- public Color getPunchThroughToBackgroundColor(Color color, int percentage)
- {
+ public Color getPunchThroughToBackgroundColor(int percentage, HVideoDevice hvd) {
 throw new Error("Not implemented");
 }
 
- public Color getPunchThroughToBackgroundColor(Color color, int percentage,
- HVideoDevice v)
- {
+ public Color getPunchThroughToBackgroundColor(Color color, int percentage) {
 throw new Error("Not implemented");
 }
 
- public void dispose(Color c)
- {
+ public Color getPunchThroughToBackgroundColor(Color color, int percentage, HVideoDevice v) {
 throw new Error("Not implemented");
 }
+
+ public void dispose(Color c) {
+
+ }
+
+ private HGraphicsConfigTemplate hgct;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HGraphicsDevice.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HGraphicsDevice.java Changed

@@ -20,42 +20,55 @@
 package org.havi.ui;
 
 public class HGraphicsDevice extends HScreenDevice {
- protected HGraphicsDevice()
- {
-
+ protected HGraphicsDevice() {
+ int length = HScreenConfigTemplate.defaultConfig.length;
+ hgcArray = new HGraphicsConfiguration[length];
+ for (int i = 0; i < length; i++) {
+ HGraphicsConfigTemplate hgct = new HGraphicsConfigTemplate();
+ HScreenConfigTemplate.initDefaultConfigTemplate(hgct, i);
+ hgcArray[i] = new HGraphicsConfiguration(hgct);
+ }
+ hgc = hgcArray[0];
 }
 
- public HGraphicsConfiguration[] getConfigurations()
- {
- throw new Error("Not implemented");
+ public HGraphicsConfiguration[] getConfigurations() {
+ return hgcArray;
 }
 
- public HGraphicsConfiguration getDefaultConfiguration()
- {
- throw new Error("Not implemented");
+ public HGraphicsConfiguration getDefaultConfiguration() {
+ return hgcArray[0];
 }
 
- public HGraphicsConfiguration getBestConfiguration(
- HGraphicsConfigTemplate hgct)
- {
- throw new Error("Not implemented");
+ public HGraphicsConfiguration getBestConfiguration(HGraphicsConfigTemplate hgct) {
+ int score = -1;
+ HGraphicsConfiguration hgc = null;
+ for (int i = 0; i < hgcArray.length; i++)
+ if (hgct.match(hgcArray[i]) > score)
+ hgc = hgcArray[i];
+ return hgc;
 }
 
- public HGraphicsConfiguration getBestConfiguration(
- HGraphicsConfigTemplate hgcta[])
- {
- throw new Error("Not implemented");
+ public HGraphicsConfiguration getBestConfiguration(HGraphicsConfigTemplate hgcta[]) {
+ int score = -1;
+ HGraphicsConfiguration hgc = null;
+ for (int i = 0; i < hgcArray.length; i++)
+ for (int j = 0; j < hgcta.length; j++)
+ if (hgcta[j].match(hgcArray[i]) > score)
+ hgc = hgcArray[i];
+ return hgc;
 }
 
- public HGraphicsConfiguration getCurrentConfiguration()
- {
- throw new Error("Not implemented");
+ public HGraphicsConfiguration getCurrentConfiguration() {
+ return hgc;
 }
 
 public boolean setGraphicsConfiguration(HGraphicsConfiguration hgc)
 throws SecurityException, HPermissionDeniedException,
- HConfigurationException
- {
- throw new Error("Not implemented");
+ HConfigurationException {
+ this.hgc = hgc;
+ return true;
 }
+
+ private HGraphicsConfiguration[] hgcArray;
+ private HGraphicsConfiguration hgc;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HIcon.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HIcon.java Changed

@@ -27,33 +27,35 @@
 public class HIcon extends HStaticIcon implements HNavigable {
     public HIcon()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HIcon.class.getName(), "");
     }
 
     public HIcon(Image image)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HIcon.class.getName(), "");
     }
 
     public HIcon(Image image, int x, int y, int width, int height)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HIcon.class.getName(), "");
     }
 
     public HIcon(Image imageNormal, Image imageFocus, int x, int y, int width,
             int height)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HIcon.class.getName(), "");
     }
 
     public static void setDefaultLook(HGraphicLook hlook)
     {
-        throw new Error("Not implemented");
+        DefaultLook = hlook;
     }
 
     public static HGraphicLook getDefaultLook()
     {
-        throw new Error("Not implemented");
+        if (DefaultLook == null)
+            org.videolan.Logger.unimplemented("", "getDefaultLook");
+        return DefaultLook;
     }
 
     public void setMove(int keyCode, HNavigable target)
@@ -117,5 +119,7 @@
         throw new Error("Not implemented");
     }
 
+    private static HGraphicLook DefaultLook = null;
+
     private static final long serialVersionUID = 2006124827619610922L;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HImageEffectMatte.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HImageEffectMatte.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HImageMatte.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HImageMatte.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HListElement.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HListElement.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HListGroup.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HListGroup.java Changed

@@ -27,17 +27,17 @@
 public class HListGroup extends HVisible implements HItemValue {
     public HListGroup()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HListGroup.class.getName(), "");
     }
 
     public HListGroup(HListElement[] items)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HListGroup.class.getName(), "");
     }
 
     public HListGroup(HListElement[] items, int x, int y, int width, int height)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HListGroup.class.getName(), "");
     }
 
     public void setLook(HLook hlook) throws HInvalidLookException
@@ -47,12 +47,14 @@
 
     public static void setDefaultLook(HListGroupLook look)
     {
-        throw new Error("Not implemented");
+        DefaultLook = look;
     }
 
     public static HListGroupLook getDefaultLook()
     {
-        throw new Error("Not implemented");
+        if (DefaultLook == null)
+            org.videolan.Logger.unimplemented("", "getDefaultLook");
+        return DefaultLook;
     }
 
     public HListElement[] getListContent()
@@ -298,5 +300,7 @@
     public static final int DEFAULT_ICON_WIDTH = -3;
     public static final int DEFAULT_ICON_HEIGHT = -4;
 
+    private static HListGroupLook DefaultLook = null;
+
     private static final long serialVersionUID = 6012900970046475431L;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HListGroupLook.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HListGroupLook.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HMultilineEntry.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HMultilineEntry.java Changed

@@ -25,38 +25,41 @@
 public class HMultilineEntry extends HSinglelineEntry {
     public HMultilineEntry()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HMultilineEntry.class.getName(), "");
     }
 
     public HMultilineEntry(String text, int x, int y, int width, int height,
             int maxChars, Font font, Color color)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HMultilineEntry.class.getName(), "");
     }
 
     public HMultilineEntry(int x, int y, int width, int height, int maxChars)
     {
+        org.videolan.Logger.unimplemented(HMultilineEntry.class.getName(), "");
         throw new Error("Not implemented");
     }
 
     public HMultilineEntry(String text, int maxChars, Font font, Color color)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HMultilineEntry.class.getName(), "");
     }
 
     public HMultilineEntry(int maxChars)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HMultilineEntry.class.getName(), "");
     }
 
     public static void setDefaultLook(HMultilineEntryLook look)
     {
-        throw new Error("Not implemented");
+        DefaultLook = look;
     }
 
     public static HSinglelineEntryLook getDefaultLook()
     {
-        throw new Error("Not implemented");
+        if (DefaultLook == null)
+            org.videolan.Logger.unimplemented("", "getDefaultLook");
+        return DefaultLook;
     }
 
     public void setLook(HLook hlook) throws HInvalidLookException
@@ -74,5 +77,7 @@
         throw new Error("Not implemented");
     }
 
+    private static HSinglelineEntryLook DefaultLook = null;
+
     private static final long serialVersionUID = 2690386579157062435L;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HMultilineEntryLook.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HMultilineEntryLook.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HRange.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HRange.java Changed

@@ -25,28 +25,30 @@
 public class HRange extends HStaticRange implements HNavigable {
     public HRange()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HRange.class.getName(), "");
     }
 
     public HRange(int orientation, int minimum, int maximum, int value, int x,
             int y, int width, int height)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HRange.class.getName(), "");
     }
 
     public HRange(int orientation, int minimum, int maximum, int value)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HRange.class.getName(), "");
     }
 
     public static void setDefaultLook(HRangeLook look)
     {
-        throw new Error("Not implemented");
+        DefaultLook = look;
     }
 
     public static HRangeLook getDefaultLook()
     {
-        throw new Error("Not implemented");
+        if (DefaultLook == null)
+            org.videolan.Logger.unimplemented("", "getDefaultLook");
+        return DefaultLook;
     }
 
     public void setMove(int keyCode, HNavigable target)
@@ -110,5 +112,7 @@
         throw new Error("Not implemented");
     }
 
+    private static HRangeLook DefaultLook = null;
+
     private static final long serialVersionUID = 2739614186691834675L;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HRangeLook.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HRangeLook.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HRangeValue.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HRangeValue.java Changed

@@ -27,28 +27,30 @@
 public class HRangeValue extends HRange implements HAdjustmentValue {
     public HRangeValue()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HRangeValue.class.getName(), "");
     }
 
     public HRangeValue(int orientation, int minimum, int maximum, int value,
             int x, int y, int width, int height)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HRangeValue.class.getName(), "");
     }
 
     public HRangeValue(int orientation, int minimum, int maximum, int value)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HRangeValue.class.getName(), "");
     }
 
     public static void setDefaultLook(HRangeLook look)
     {
-        throw new Error("Not implemented");
+        DefaultLook = look;
     }
 
     public static HRangeLook getDefaultLook()
     {
-        throw new Error("Not implemented");
+        if (DefaultLook == null)
+            org.videolan.Logger.unimplemented("", "getDefaultLook");
+        return DefaultLook;
     }
 
     public void setMove(int keyCode, HNavigable target)
@@ -167,5 +169,7 @@
         throw new Error("Not implemented");
     }
 
+    private static HRangeLook DefaultLook = null;
+
     private static final long serialVersionUID = -7809155734787063596L;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HScene.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HScene.java Changed

@@ -30,19 +30,26 @@
 import java.awt.event.WindowListener;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 import org.havi.ui.event.HEventGroup;
+import org.videolan.BDJXletContext;
 import org.videolan.GUIManager;
+import java.awt.BDToolkit;
+
 
 public class HScene extends Container implements HComponentOrdering {
- protected HScene()
- {
+ protected HScene() {
+ context = BDJXletContext.getCurrentContext();
+ BDToolkit.addComponent(this);
+ }
 
+ public BDJXletContext getXletContext() {
+ return context;
 }
 
- public void paint(Graphics g)
- {
+ public void paint(Graphics g) {
 if (backgroundMode == BACKGROUND_FILL) {
 g.setColor(getBackground());
 g.fillRect(super.getX(), super.getY(), super.getWidth(), super
@@ -65,126 +72,127 @@
 break;
 }
 }
- 
+
 super.paint(g);
 }
 
- public boolean isDoubleBuffered()
- {
- return true;// not implemented
+ public boolean isDoubleBuffered() {
+ return false;
 }
 
- public boolean isOpaque()
- {
- return false;// not implemented
+ public boolean isOpaque() {
+ return false;
 }
 
- public Component addBefore(Component component, Component behind)
- {
- int index = super.getComponentZOrder(behind);
+ public int getComponentZOrder(Component component) {
+ for (int i = 0; i < getComponentCount(); i++)
+ if (getComponent(i) == component)
+ return i;
+ return -1;
+ }
 
- // the behind component must already be in the Container
- if (index == -1)
+ public /*boolean*/void setComponentZOrder(Component component, int index) {
+ if (index < 0)
+ return;//return false;
+ int i = getComponentZOrder(component);
+ if (i < 0)
+ return;//return false;
+ if (i == index)
+ return;//return true;
+ remove(component);
+ if (i > index)
+ add(component, index);
+ else
+ add(component, index - 1);
+ //return true;
+ }
+
+ public Component addBefore(Component component, Component behind) {
+ int index = getComponentZOrder(behind);
+ if (index < 0)
 return null;
 
 return super.add(component, index);
 }
 
- public Component addAfter(Component component, Component front)
- {
- int index = super.getComponentZOrder(front);
-
- // the front component must already be in the Container
- if (index == -1)
+ public Component addAfter(Component component, Component front) {
+ int index = getComponentZOrder(front);
+ if (index < 0)
 return null;
 
 return super.add(component, index + 1);
 }
 
- public boolean popToFront(Component component)
- {
- if (super.getComponentZOrder(component) == -1)
+ public boolean popToFront(Component component) {
+ if (getComponentZOrder(component) < 0)
 return false;
-
- super.setComponentZOrder(component, 0);
-
+ /*return */setComponentZOrder(component, 0);
 return true;
 }
 
- public boolean pushToBack(Component component)
- {
- if (super.getComponentZOrder(component) == -1)
+ public boolean pushToBack(Component component) {
+ if (getComponentZOrder(component) < 0)
 return false;
-
- super.setComponentZOrder(component, super.getComponentCount());
-
+ /*return */setComponentZOrder(component, getComponentCount());
 return true;
 }
 
- public boolean pop(Component component)
- {
- int index = super.getComponentZOrder(component);
- if (index == -1)
+ public boolean pop(Component component) {
+ int index = getComponentZOrder(component);
+ if (index < 0)
 return false;
 if (index == 0)
 return true; // already at the front
 
- super.setComponentZOrder(component, index - 1);
+ /*return */setComponentZOrder(component, index - 1);
 return true;
 }
 
- public boolean push(Component component)
- {
- int index = super.getComponentZOrder(component);
- if (index == -1)
+ public boolean push(Component component) {
+ int index = getComponentZOrder(component);
+ if (index < 0)
 return false;
- if (index == super.getComponentCount())
+
+ if (index == getComponentCount())
 return true; // already at the back
 
- super.setComponentZOrder(component, index + 1);
+ /*return */setComponentZOrder(component, index + 1);
 return true;
 }
 
- public boolean popInFrontOf(Component move, Component behind)
- {
- int index = super.getComponentZOrder(behind);
+ public boolean popInFrontOf(Component move, Component behind) {
+ int index = getComponentZOrder(behind);
 
 // the behind component must already be in the Container
- if (index == -1 || super.getComponentZOrder(move) == -1)
+ if (index < 0 || getComponentZOrder(move) < 0)
 return false;
 
- super.setComponentZOrder(move, index);
+ /*return */setComponentZOrder(move, getComponentZOrder(behind));
 return true;
 }
 
- public boolean pushBehind(Component move, Component front)
- {
- int index = super.getComponentZOrder(front);
-
- // the behind component must already be in the Container
- if (index == -1 || super.getComponentZOrder(move) == -1)
+ public boolean pushBehind(Component move, Component front) {
+ int index = getComponentZOrder(front);
+ if (index < 0 || getComponentZOrder(move) < 0)
 return false;
 
- super.setComponentZOrder(move, index + 1);
+ /*return */setComponentZOrder(move, index + 1);
 return true;
 }
 
- public void addWindowListener(WindowListener listener)
- {
+ public void addWindowListener(WindowListener listener) {
 synchronized (windowListener) {
 windowListener = HEventMulticaster.add(windowListener, listener);
 }
 }
 
- public void removeWindowListener(WindowListener listener)
- {
+ public void removeWindowListener(WindowListener listener) {
 synchronized (windowListener) {
 windowListener = HEventMulticaster.remove(windowListener, listener);
 }
 }
 
- protected void processWindowEvent(WindowEvent event)
- {
+ protected void processWindowEvent(WindowEvent event) {
 if (windowListener != null) {
 switch (event.getID()) {
 case WindowEvent.WINDOW_OPENED:
@@ -221,100 +229,115 @@
 }
 }
 
- public Component getFocusOwner()
- {
+ public Component getFocusOwner() {
 if (!active)
 return null;
 
- for (Component comp : super.getComponents()) {
- if (comp.hasFocus())
- return comp;
+ Component[] comps = getComponents();
+ for (int i = 0; i < comps.length; i++) {
+ if (comps[i].hasFocus())
+ return comps[i];
 }
 
 return null;
 }
 
- public void show()
- {
- setVisible(true);
- GUIManager.getInstance().popToFront(this);
+ public synchronized void dispose() {
+ if (null != BDJXletContext.getCurrentContext())
+ HSceneFactory.getInstance().dispose(this);
 }
 
- public void dispose()
+ protected void disposeImpl()
 {
- // not implemented
+ // called by HSceneFactory
+ try {
+ removeAll();
+
+ Graphics g = GUIManager.getInstance().getGraphics();
+ Rectangle r = getBounds();
+ g.clearRect(r.x, r.y, r.width, r.height);
+
+ if (image != null) {
+ image.flush();
+ }
+ if (shortcuts != null) {
+ shortcuts.clear();
+ }
+ } finally {
+ image = null;
+ eventGroup = null;
+ shortcuts = null;
+ windowListener = null;
+ context = null;
+ }
 }
 
- public boolean addShortcut(int keyCode, HActionable act)
- {
+ public boolean addShortcut(int keyCode, HActionable act) {
 // make sure component is in HScene
 boolean hasComp = false;
- for (Component comp : getComponents()) {
- if (comp == act)
+
+ Component[] comps = getComponents();
+ for (int i = 0; i < comps.length; i++) {
+ if (comps[i] == act) {
 hasComp = true;
+ break;
+ }
 }
 
 if (!hasComp)
 return false;
 
- shortcuts.put(keyCode, act);
+ shortcuts.put(new Integer(keyCode), act);
 
 return true;
 }
 
- public void removeShortcut(int keyCode)
- {
- shortcuts.remove(keyCode);
+ public void removeShortcut(int keyCode) {
+ shortcuts.remove(new Integer(keyCode));
 }
 
- public HActionable getShortcutComponent(int keyCode)
- {
- return shortcuts.get(keyCode);
+ public HActionable getShortcutComponent(int keyCode) {
+ return (HActionable)shortcuts.get(new Integer(keyCode));
 }
 
- public void enableShortcuts(boolean enable)
- {
+ public void enableShortcuts(boolean enable) {
 this.shortcutsEnabled = enable;
 }
 
- public boolean isEnableShortcuts()
- {
+ public boolean isEnableShortcuts() {
 return shortcutsEnabled;
 }
 
- public int getShortcutKeycode(HActionable comp)
- {
- for (Integer key : shortcuts.keySet()) {
- HActionable action = shortcuts.get(key);
-
+ public int getShortcutKeycode(HActionable comp) {
+ Iterator iterator = shortcuts.keySet().iterator();
+ Integer key;
+ while ((key = (Integer)iterator.next()) != null) {
+ HActionable action = (HActionable)shortcuts.get(key);
 if (action == comp)
- return key;
+ return key.intValue();
 }
 
 return KeyEvent.VK_UNDEFINED;
 }
 
- public int[] getAllShortcutKeycodes()
- {
+ public int[] getAllShortcutKeycodes() {
 Integer[] src = (Integer[]) shortcuts.keySet().toArray();
 int[] dest = new int[src.length];
 
 for (int i = 0; i < src.length; i++)
- dest[i] = src[i];
+ dest[i] = src[i].intValue();
 
 return dest;
 }
 
- public HScreenRectangle getPixelCoordinatesHScreenRectangle(Rectangle rect)
- {
+ public HScreenRectangle getPixelCoordinatesHScreenRectangle(Rectangle rect) {
 Dimension size = GUIManager.getInstance().getSize();
 return new HScreenRectangle(rect.x / (float) size.width, rect.y
 / (float) size.height, rect.width / (float) size.width,
 rect.height / (float) size.height);
 }
 
- public HSceneTemplate getSceneTemplate()
- {
+ public HSceneTemplate getSceneTemplate() {
 HSceneTemplate template = new HSceneTemplate();
 
 HGraphicsConfiguration config = HScreen.getDefaultHScreen()
@@ -338,8 +361,7 @@
 return template;
 }
 
- public void setActive(boolean focus)
- {
+ public void setActive(boolean focus) {
 if (active == true && focus == false)
 dispatchEvent(new WindowEvent(GUIManager.getInstance(),
 WindowEvent.WINDOW_DEACTIVATED));
@@ -347,54 +369,48 @@
 active = focus;
 }
 
- public void setKeyEvents(HEventGroup eventGroup)
- {
+ public void setKeyEvents(HEventGroup eventGroup) {
 this.eventGroup = eventGroup;
 }
 
- public HEventGroup getKeyEvents()
- {
+ public HEventGroup getKeyEvents() {
 return eventGroup;
 }
 
- public void setVisible(boolean visible)
- {
- this.visible = visible;
+ public void setVisible(boolean visible) {
+ super.setVisible(visible);
+ if (visible) {
+ for (int i = 0; i < GUIManager.getInstance().getComponentCount(); i++) {
+ Component c = GUIManager.getInstance().getComponent(i);
+ if (c != this)
+ c.setVisible(false);
 }
-
- public boolean isVisible()
- {
- return visible;
+ }
+ GUIManager.getInstance().setVisible(visible);
 }
 
- public int getBackgroundMode()
- {
+ public int getBackgroundMode() {
 return backgroundMode;
 }
 
- public void setBackgroundMode(int mode)
- {
+ public void setBackgroundMode(int mode) {
 this.backgroundMode = mode;
 }
 
- public void setBackgroundImage(Image image)
- {
+ public void setBackgroundImage(Image image) {
 this.image = image;
 }
 
- public Image getBackgroundImage()
- {
+ public Image getBackgroundImage() {
 return image;
 }
 
- public boolean setRenderMode(int mode)
- {
+ public boolean setRenderMode(int mode) {
 this.imageMode = mode;
 return true;
 }
 
- public int getRenderMode()
- {
+ public int getRenderMode() {
 return imageMode;
 }
 
@@ -406,16 +422,15 @@
 public static final int NO_BACKGROUND_FILL = 0;
 public static final int BACKGROUND_FILL = 1;
 
- private boolean visible = true;
 private boolean active = false;
 private int backgroundMode = NO_BACKGROUND_FILL;
 private Image image = null;
 private int imageMode = IMAGE_NONE;
 private WindowListener windowListener = null;
 private HEventGroup eventGroup = null;
- private Map<Integer, HActionable> shortcuts = Collections
- .synchronizedMap(new HashMap<Integer, HActionable>());
+ private Map shortcuts = Collections.synchronizedMap(new HashMap());
 private boolean shortcutsEnabled = true;
+ private BDJXletContext context;
 
 private static final long serialVersionUID = 422730746877212409L;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HSceneFactory.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HSceneFactory.java Changed

@@ -20,69 +20,109 @@
 package org.havi.ui;
 
 import org.videolan.GUIManager;
+import org.videolan.BDJXletContext;
+import org.videolan.Logger;
 
 public class HSceneFactory extends Object {
-    private HSceneFactory()
-    {
-
+    private HSceneFactory() {
     }
 
-    public static HSceneFactory getInstance()
-    {
-        return instance;
+    public static HSceneFactory getInstance() {
+        BDJXletContext context = BDJXletContext.getCurrentContext();
+        if (context != null) {
+            if (context.getSceneFactory() == null) {
+                context.setSceneFactory(new HSceneFactory());
+            }
+            return context.getSceneFactory();
+        }
+
+        logger.error("getInstance(): no context at " + Logger.dumpStack());
+
+        return null;
     }
 
-    public HSceneTemplate getBestSceneTemplate(HSceneTemplate template)
-    {
-        throw new Error("Not implemented");
+    public HSceneTemplate getBestSceneTemplate(HSceneTemplate template) {
+        logger.unimplemented("getBestSceneTemplate");
+        return null;
     }
 
-    public HScene getBestScene(HSceneTemplate template)
-    {
-        throw new Error("Not implemented");
+    public HScene getBestScene(HSceneTemplate template) {
+        /*
+        if (defaultHScene != null) {
+            logger.error("HScene already exists");
+            return null;
+        }
+        */
+        return getDefaultHScene();
+        // TODO
     }
 
     public HSceneTemplate resizeScene(HScene scene, HSceneTemplate template)
             throws IllegalStateException
     {
-        throw new Error("Not implemented");
+        logger.unimplemented("resizeScene");
+        return template;
     }
 
     public HScene getDefaultHScene(HScreen screen)
     {
-        synchronized(defaultHSceneLock) {
+        synchronized(HSceneFactory.class) {
             if (defaultHScene == null) {
                 defaultHScene = new HScene();
+                defaultHScene.setLocation(0, 0);
+                defaultHScene.setSize(GUIManager.getInstance().getWidth(), GUIManager.getInstance().getHeight());
                 GUIManager.getInstance().add(defaultHScene);
             }
         }
-        
+
         return defaultHScene;
     }
 
     public HScene getDefaultHScene()
     {
-        synchronized(defaultHSceneLock) {
-            if (defaultHScene == null) {
-                defaultHScene = new HScene();
-                GUIManager.getInstance().add(defaultHScene);
-            }
-        }
-        
-        return defaultHScene;
+        return getDefaultHScene(HScreen.getDefaultHScreen());
     }
 
-    public HScene getFullScreenScene(HGraphicsDevice device)
-    {
-        throw new Error("Not implemented");
+    public HScene getFullScreenScene(HGraphicsDevice device) {
+        return getDefaultHScene();
+/*
+        HScene FullScreenScene = new HScene();
+        FullScreenScene.setLocation(0, 0);
+        FullScreenScene.setSize(GUIManager.getInstance().getWidth(), GUIManager.getInstance().getHeight());
+        GUIManager.getInstance().add(FullScreenScene);
+        return FullScreenScene;
+*/
     }
 
-    public void dispose(HScene scene)
-    {
-        throw new Error("Not implemented");
+    public void dispose(HScene scene) {
+
+        if (scene == null) {
+            logger.error("null HScene");
+            return;
+        }
+        if (defaultHScene == null) {
+            logger.error("no HScene created");
+            return;
+        }
+
+        if (!scene.equals(defaultHScene)) {
+            logger.error("wrong HScene");
+        }
+
+        scene.disposeImpl();
+        GUIManager.getInstance().remove(scene);
+        defaultHScene = null;
+    }
+
+    public void dispose() {
+        synchronized(HSceneFactory.class) {
+            if (defaultHScene != null) {
+                dispose(defaultHScene);
+            }
+        }
     }
 
     private HScene defaultHScene = null;
-    private Object defaultHSceneLock = new Object();
-    private static final HSceneFactory instance = new HSceneFactory();
+
+    private static final Logger logger = Logger.getLogger(HSceneFactory.class.getName());
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HSceneTemplate.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HSceneTemplate.java Changed

@@ -25,26 +25,25 @@
 import java.util.Map;
 
 public class HSceneTemplate extends Object {
- public HSceneTemplate()
- {
-
+ public HSceneTemplate() {
 }
 
- public void setPreference(int preference, Object object, int priority)
- {
- preferenceMap.put(preference, object);
- priorityMap.put(preference, priority);
+ public void setPreference(int preference, Object object, int priority) {
+ preferenceMap.put(new Integer(preference), object);
+ priorityMap.put(new Integer(preference), new Integer(priority));
 }
 
- public Object getPreferenceObject(int preference)
- {
- return preferenceMap.get(preference);
+ public Object getPreferenceObject(int preference) {
+ return preferenceMap.get(new Integer(preference));
 }
 
- public int getPreferencePriority(int preference)
- {
- Integer priority = priorityMap.get(preference);
- if (priority == null || priority < 0 || priority > 3)
+ public int getPreferencePriority(int preference) {
+ Object prio = priorityMap.get(new Integer(preference));
+ if (prio == null)
+ return UNNECESSARY;
+
+ int priority = ((Integer)prio).intValue();
+ if (priority < 0 || priority > 3)
 return UNNECESSARY;
 else
 return priority;
@@ -63,8 +62,6 @@
 public static final int SCENE_SCREEN_DIMENSION = 0x04;
 public static final int SCENE_SCREEN_LOCATION = 0x08;
 
- private Map<Integer, Object> preferenceMap = Collections
- .synchronizedMap(new HashMap<Integer, Object>());
- private Map<Integer, Integer> priorityMap = Collections
- .synchronizedMap(new HashMap<Integer, Integer>());
+ private Map preferenceMap = Collections.synchronizedMap(new HashMap());
+ private Map priorityMap = Collections.synchronizedMap(new HashMap());
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HScreen.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HScreen.java Changed

@@ -22,75 +22,126 @@
 public class HScreen {
 private HScreen()
 {
+ hVideoDevice = new HVideoDevice();
+ hGraphicsDevice = new HGraphicsDevice();
+ hBackgroundDevice = new HBackgroundDevice();
 }
 
 public static HScreen[] getHScreens()
 {
- throw new Error("Not implemented");
+ HScreen[] screens = new HScreen[1];
+ screens[0] = DEFAULT_HSCREEN;
+ return screens;
 }
 
 public static HScreen getDefaultHScreen()
 {
- throw new Error("Not implemented");
+ return DEFAULT_HSCREEN;
 }
 
 public HVideoDevice[] getHVideoDevices()
 {
- throw new Error("Not implemented");
+ HVideoDevice[] devices = new HVideoDevice[1];
+ devices[0] = hVideoDevice;
+ return devices;
 }
 
 public HVideoDevice getDefaultHVideoDevice()
 {
- throw new Error("Not implemented");
+ return hVideoDevice;
 }
 
 public HVideoConfiguration getBestConfiguration(HVideoConfigTemplate[] hvcta)
 {
- throw new Error("Not implemented");
+ return hVideoDevice.getBestConfiguration(hvcta);
 }
 
 public HGraphicsDevice[] getHGraphicsDevices()
 {
- throw new Error("Not implemented");
+ HGraphicsDevice[] devices = new HGraphicsDevice[1];
+ devices[0] = hGraphicsDevice;
+ return devices;
 }
 
 public HGraphicsDevice getDefaultHGraphicsDevice()
 {
- throw new Error("Not implemented");
+ return hGraphicsDevice;
 }
 
 public HGraphicsConfiguration getBestConfiguration(
 HGraphicsConfigTemplate[] hgcta)
 {
- throw new Error("Not implemented");
+ return hGraphicsDevice.getBestConfiguration(hgcta);
 }
 
 public HBackgroundDevice[] getHBackgroundDevices()
 {
- throw new Error("Not implemented");
+ HBackgroundDevice[] devices = new HBackgroundDevice[1];
+ devices[0] = hBackgroundDevice;
+ return devices;
 }
 
 public HBackgroundDevice getDefaultHBackgroundDevice()
 {
- throw new Error("Not implemented");
+ return hBackgroundDevice;
 }
 
 public HBackgroundConfiguration getBestConfiguration(
 HBackgroundConfigTemplate[] hbcta)
 {
- throw new Error("Not implemented");
+ return hBackgroundDevice.getBestConfiguration(hbcta);
 }
 
 public HScreenConfiguration[] getCoherentScreenConfigurations(
 HScreenConfigTemplate[] hscta)
 {
- throw new Error("Not implemented");
+ if ((hscta == null) || (hscta.length == 0))
+ throw new IllegalArgumentException("HScreenConfigTemplate[] hscta cannot be null");
+
+ HScreenConfiguration[] hsc = new HScreenConfiguration[hscta.length];
+
+ for (int i = 0; i < hscta.length; i++)
+ {
+ if ((hscta[i] instanceof HVideoConfigTemplate))
+ hsc[i] = hVideoDevice.getBestConfiguration((HVideoConfigTemplate)hscta[i]);
+ else if ((hscta[i] instanceof HGraphicsConfigTemplate))
+ hsc[i] = hGraphicsDevice.getBestConfiguration((HGraphicsConfigTemplate)hscta[i]);
+ else if ((hscta[i] instanceof HBackgroundConfigTemplate))
+ hsc[i] = hBackgroundDevice.getBestConfiguration((HBackgroundConfigTemplate)hscta[i]);
+ else
+ return null;
+ }
+
+ return hsc;
 }
 
 public boolean setCoherentScreenConfigurations(HScreenConfiguration[] hsca)
 throws java.lang.SecurityException, HPermissionDeniedException,
 HConfigurationException
 {
- throw new Error("Not implemented");
+ if ((hsca == null) || (hsca.length == 0))
+ throw new IllegalArgumentException("HScreenConfiguration[] hsca cannot be null");
+
+ for (int i = 0; i < hsca.length; i++) {
+ if (hsca[i] instanceof HVideoConfiguration) {
+ if (!((HVideoConfiguration)hsca[i]).getDevice().setVideoConfiguration((HVideoConfiguration)hsca[i]))
+ return false;
+ }
+ else if (hsca[i] instanceof HGraphicsConfiguration) {
+ if (!((HGraphicsConfiguration)hsca[i]).getDevice().setGraphicsConfiguration((HGraphicsConfiguration)hsca[i]))
+ return false;
+ }
+ else if (hsca[i] instanceof HBackgroundConfiguration) {
+ if (!((HBackgroundConfiguration)hsca[i]).getDevice().setBackgroundConfiguration((HBackgroundConfiguration)hsca[i]))
+ return false;
+ }
+ }
+
+ return true;
 }
+
+ private static final HScreen DEFAULT_HSCREEN = new HScreen();
+ private HVideoDevice hVideoDevice;
+ private HGraphicsDevice hGraphicsDevice;
+ private HBackgroundDevice hBackgroundDevice;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HScreenConfigTemplate.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HScreenConfigTemplate.java Changed

@@ -19,30 +19,125 @@
 
 package org.havi.ui;
 
+import java.awt.Dimension;
+import java.util.Arrays;
+
 public abstract class HScreenConfigTemplate {
- public HScreenConfigTemplate()
- {
- throw new Error("Not implemented");
+ HScreenConfigTemplate() {
+ objectArray = new Object[getPreferenceObjectCount()];
+ priorityArray = new int[getPreferenceCount()];
+ Arrays.fill(priorityArray, DONT_CARE);
+ }
+
+ public void setPreference(int preference, int priority) {
+ if ((priority < REQUIRED) || (priority > REQUIRED_NOT))
+ throw new IllegalArgumentException("invalid priority");
+ int index = getPreferenceIndex(preference);
+ if (index < 0)
+ throw new IllegalArgumentException("invalid preference");
+ priorityArray[index] = priority;
+ }
+
+ public void setPreference(int preference, Object object, int priority) {
+ if ((priority < REQUIRED) || (priority > REQUIRED_NOT))
+ throw new IllegalArgumentException("invalid priority");
+ int index = getPreferenceObjectIndex(preference);
+ if (index < 0)
+ throw new IllegalArgumentException("invalid preference");
+ objectArray[index] = object;
+ priorityArray[getPreferenceIndex(preference)] = priority;
+ }
+
+ public int getPreferencePriority(int preference) {
+ int index = getPreferenceIndex(preference);
+ if (index < 0)
+ throw new IllegalArgumentException("invalid preference");
+ return priorityArray[getPreferenceIndex(preference)];
+ }
+
+ public Object getPreferenceObject(int preference) {
+ int index = getPreferenceObjectIndex(preference);
+ if (index < 0)
+ throw new IllegalArgumentException("invalid preference");
+ return objectArray[getPreferenceObjectIndex(preference)];
+ }
+
+ protected int getPreferenceCount() {
+ return SCREEN_RECTANGLE - ZERO_BACKGROUND_IMPACT + 1;
 }
 
- public void setPreference(int preference, int priority)
- {
- throw new Error("Not implemented");
+ protected int getPreferenceObjectCount() {
+ return SCREEN_RECTANGLE - VIDEO_GRAPHICS_PIXEL_ALIGNED + 1;
 }
 
- public void setPreference(int preference, Object object, int priority)
- {
- throw new Error("Not implemented");
+ protected int getPreferenceIndex(int preference) {
+ if ((preference < ZERO_BACKGROUND_IMPACT) || (preference > SCREEN_RECTANGLE))
+ return -1;
+ return preference - ZERO_BACKGROUND_IMPACT;
 }
 
- public int getPreferencePriority(int preference)
- {
- throw new Error("Not implemented");
+ protected int getPreferenceObjectIndex(int preference) {
+ if ((preference < VIDEO_GRAPHICS_PIXEL_ALIGNED) || (preference > SCREEN_RECTANGLE))
+ return -1;
+ return preference - VIDEO_GRAPHICS_PIXEL_ALIGNED;
 }
 
- public Object getPreferenceObject(int preference)
- {
- throw new Error("Not implemented");
+ protected boolean equals(Object obj1, Object obj2) {
+ return (obj1 == null) ? (obj2 == null) : obj1.equals(obj2);
+ }
+
+ protected int matchPreference(int preference, boolean supported) {
+ int Priority = getPreferencePriority(preference);
+ if (Priority == REQUIRED) {
+ if (!supported)
+ return -1;
+ return 1;
+ } else if (Priority == REQUIRED_NOT) {
+ if (supported)
+ return -1;
+ return 1;
+ }
+ return 0;
+ }
+
+ protected int matchPreference(int preference, HScreenConfiguration hsc) {
+ switch (preference) {
+ case INTERLACED_DISPLAY:
+ return matchPreference(INTERLACED_DISPLAY, hsc.getInterlaced());
+ case FLICKER_FILTERING:
+ return matchPreference(FLICKER_FILTERING, hsc.getFlickerFilter());
+ case PIXEL_ASPECT_RATIO:
+ return matchPreference(PIXEL_ASPECT_RATIO, equals(hsc.getPixelAspectRatio(), getPreferenceObject(PIXEL_ASPECT_RATIO)));
+ case PIXEL_RESOLUTION:
+ return matchPreference(PIXEL_RESOLUTION, equals(hsc.getPixelResolution(), getPreferenceObject(PIXEL_RESOLUTION)));
+ case SCREEN_RECTANGLE:
+ return matchPreference(SCREEN_RECTANGLE, equals(hsc.getScreenArea(), getPreferenceObject(SCREEN_RECTANGLE)));
+ }
+ return 0;
+ }
+
+ protected int match(HScreenConfiguration hsc) {
+ int score = 0;
+ int length = getPreferenceCount();
+ for (int i = 0; i < length; i++) {
+ int s = matchPreference(i, hsc);
+ if (s < 0)
+ return s;
+ score += s;
+ }
+ return score;
+ }
+
+ static void initDefaultConfigTemplate(HScreenConfigTemplate hsct, int index) {
+ hsct.setPreference(HScreenConfigTemplate.PIXEL_ASPECT_RATIO,
+ new Dimension(defaultConfig[index][2], defaultConfig[index][3]),
+ HScreenConfigTemplate.REQUIRED);
+ hsct.setPreference(HScreenConfigTemplate.PIXEL_RESOLUTION,
+ new Dimension(defaultConfig[index][0], defaultConfig[index][1]),
+ HScreenConfigTemplate.REQUIRED);
+ hsct.setPreference(HScreenConfigTemplate.SCREEN_RECTANGLE,
+ new HScreenRectangle(0.0f, 0.0f, 1.0f, 1.0f),
+ HScreenConfigTemplate.REQUIRED);
 }
 
 public static final int REQUIRED = 0x01;
@@ -60,4 +155,16 @@
 public static final int PIXEL_ASPECT_RATIO = 0x07;
 public static final int PIXEL_RESOLUTION = 0x08;
 public static final int SCREEN_RECTANGLE = 0x09;
+
+ private Object[] objectArray;
+ private int[] priorityArray;
+
+ static int[][] defaultConfig = {
+ { 1920, 1080, 16, 9 },
+ { 1280, 720, 16, 9 },
+ { 720, 480, 4, 3 },
+ { 720, 480, 16, 9 },
+ { 720, 576, 4, 3 },
+ { 720, 576, 16, 9 },
+ };
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HScreenConfiguration.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HScreenConfiguration.java Changed

@@ -23,43 +23,57 @@
 import java.awt.Dimension;
 
 public abstract class HScreenConfiguration extends Object {
-    HScreenConfiguration()
-    {
+    HScreenConfiguration() {
 
     }
 
-    public Point convertTo(HScreenConfiguration destination, Point source)
-    {
-        throw new Error("Not implemented");
+    HScreenConfiguration(HScreenConfigTemplate hsct) {
+        FlickerFilter = hsct.getPreferencePriority(HScreenConfigTemplate.INTERLACED_DISPLAY) == HScreenConfigTemplate.REQUIRED;
+        Interlaced = hsct.getPreferencePriority(HScreenConfigTemplate.FLICKER_FILTERING) == HScreenConfigTemplate.REQUIRED;
+        AspectRatio = (Dimension)hsct.getPreferenceObject(HScreenConfigTemplate.PIXEL_ASPECT_RATIO);
+        Resolution = (Dimension)hsct.getPreferenceObject(HScreenConfigTemplate.PIXEL_RESOLUTION);
+        ScreenArea = (HScreenRectangle)hsct.getPreferenceObject(HScreenConfigTemplate.SCREEN_RECTANGLE);
     }
 
-    public boolean getFlickerFilter()
-    {
-        throw new Error("Not implemented");
+    public Point convertTo(HScreenConfiguration destination, Point source) {
+        try {
+            Dimension dstResolution = destination.getPixelResolution();
+            HScreenRectangle dstScreenArea = destination.getScreenArea();
+            return new Point(Math.round((float)source.x + ScreenArea.x * Resolution.width - dstScreenArea.x * dstResolution.width),
+                             Math.round((float)source.y + ScreenArea.y * Resolution.height - dstScreenArea.y * dstResolution.height));
+        } catch (Exception e) {
+            return null;
+        }
     }
 
-    public boolean getInterlaced()
-    {
-        throw new Error("Not implemented");
+    public boolean getFlickerFilter() {
+        return FlickerFilter;
     }
 
-    public Dimension getPixelAspectRatio()
-    {
-        throw new Error("Not implemented");
+    public boolean getInterlaced() {
+        return Interlaced;
     }
 
-    public Dimension getPixelResolution()
-    {
-        throw new Error("Not implemented");
+    public Dimension getPixelAspectRatio() {
+        return AspectRatio;
     }
 
-    public HScreenRectangle getScreenArea()
-    {
-        throw new Error("Not implemented");
+    public Dimension getPixelResolution() {
+        return Resolution;
     }
 
-    public Dimension getOffset(HScreenConfiguration hsc)
-    {
-        throw new Error("Not implemented");
+    public HScreenRectangle getScreenArea() {
+        return ScreenArea;
     }
+
+    public Dimension getOffset(HScreenConfiguration hsc) {
+        Point origin = hsc.convertTo(this, new Point(0, 0));
+        return (origin == null) ? null : (new Dimension(origin.x, origin.y));
+    }
+
+    private boolean FlickerFilter;
+    private boolean Interlaced;
+    private Dimension AspectRatio;
+    private Dimension Resolution;
+    private HScreenRectangle ScreenArea;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HScreenDevice.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HScreenDevice.java Changed

@@ -21,68 +21,90 @@
 
 import java.awt.Dimension;
 
+import javax.tv.xlet.XletContext;
+
 import org.davic.resources.ResourceClient;
 import org.davic.resources.ResourceProxy;
 import org.davic.resources.ResourceServer;
 import org.davic.resources.ResourceStatusListener;
+import org.havi.ui.event.HScreenConfigurationEvent;
 import org.havi.ui.event.HScreenConfigurationListener;
+import org.havi.ui.event.HScreenDeviceReleasedEvent;
+import org.havi.ui.event.HScreenDeviceReservedEvent;
+
+import org.videolan.BDJXletContext;
 
 public class HScreenDevice implements ResourceProxy, ResourceServer {
-    HScreenDevice()
-    {
+    HScreenDevice() {
+    }
 
+    public String getIDstring() {
+        return "HAVi Screen Device";
     }
 
-    public String getIDstring()
-    {
-        throw new Error("Not implemented");
+    public void addScreenConfigurationListener(HScreenConfigurationListener hscl) {
+        this.hscl = HEventMulticaster.add(this.hscl, hscl);
     }
 
-    public void addScreenConfigurationListener(HScreenConfigurationListener hscl)
-    {
-        throw new Error("Not implemented");
+    public void addScreenConfigurationListener(HScreenConfigurationListener hscl, HScreenConfigTemplate hsct) {
+        this.hscl = HEventMulticaster.add(this.hscl, hscl, hsct);
     }
 
-    public void addScreenConfigurationListener(
-            HScreenConfigurationListener hscl, HScreenConfigTemplate hsct)
-    {
-        throw new Error("Not implemented");
+    public void removeScreenConfigurationListener(HScreenConfigurationListener hscl) {
+        this.hscl = HEventMulticaster.remove(this.hscl, hscl);
     }
 
-    public void removeScreenConfigurationListener(
-            HScreenConfigurationListener hscl)
-    {
+    public Dimension getScreenAspectRatio() {
         throw new Error("Not implemented");
     }
 
-    public Dimension getScreenAspectRatio()
-    {
-        throw new Error("Not implemented");
+    public boolean reserveDevice(ResourceClient client) {
+        if (this.client == client)
+            return true;
+        if (this.client != null) {
+            if (!this.client.requestRelease(this, null))
+                return false;
+        }
+        context = BDJXletContext.getCurrentContext();
+        this.client = client;
+        if (listener != null)
+            listener.statusChanged(new HScreenDeviceReservedEvent(client));
+        return true;
     }
 
-    public boolean reserveDevice(ResourceClient client)
-    {
-        throw new Error("Not implemented");
+    public void releaseDevice() {
+        if (context != BDJXletContext.getCurrentContext())
+            return;
+        if (listener != null)
+            listener.statusChanged(new HScreenDeviceReleasedEvent(client));
+        context = null;
+        client = null;
     }
 
-    public void releaseDevice()
-    {
-        throw new Error("Not implemented");
+    public ResourceClient getClient() {
+        return client;
     }
 
-    public ResourceClient getClient()
-    {
-        throw new Error("Not implemented");
+    public void addResourceStatusEventListener(ResourceStatusListener listener) {
+        this.listener = HEventMulticaster.add(this.listener, listener);
     }
 
-    public void addResourceStatusEventListener(ResourceStatusListener listener)
-    {
-        throw new Error("Not implemented");
+    public void removeResourceStatusEventListener(ResourceStatusListener listener) {
+        this.listener = HEventMulticaster.remove(this.listener, listener);
     }
 
-    public void removeResourceStatusEventListener(
-            ResourceStatusListener listener)
-    {
-        throw new Error("Not implemented");
+    protected void reportScreenConfigurationEvent(HScreenConfigurationEvent evt) {
+        if (hscl != null)
+            hscl.report(evt);
     }
+
+    protected void testRight() throws HPermissionDeniedException {
+        if (context != BDJXletContext.getCurrentContext())
+            throw new HPermissionDeniedException();
+    }
+
+    private HScreenConfigurationListener hscl = null;
+    private ResourceStatusListener listener = null;
+    private XletContext context = null;
+    private ResourceClient client = null;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HSinglelineEntry.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HSinglelineEntry.java Changed

@@ -31,28 +31,28 @@
 public class HSinglelineEntry extends HVisible implements HTextValue {
     public HSinglelineEntry()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), "");
     }
 
     public HSinglelineEntry(String text, int x, int y, int width, int height,
             int maxChars, Font font, Color color)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), "");
     }
 
     public HSinglelineEntry(int x, int y, int width, int height, int maxChars)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), "");
     }
 
     public HSinglelineEntry(String text, int maxChars, Font font, Color color)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), "");
     }
 
     public HSinglelineEntry(int maxChars)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), "");
     }
 
     public void setTextContent(String string, int state)
@@ -102,12 +102,14 @@
 
     public static void setDefaultLook(HSinglelineEntryLook look)
     {
-        throw new Error("Not implemented");
+        DefaultLook = look;
     }
 
     public static HSinglelineEntryLook getDefaultLook()
     {
-        throw new Error("Not implemented");
+        if (DefaultLook == null)
+            org.videolan.Logger.unimplemented("", "getDefaultLook");
+        return DefaultLook;
     }
 
     public void setLook(HLook hlook) throws HInvalidLookException
@@ -261,5 +263,7 @@
         throw new Error("Not implemented");
     }
 
+    private static HSinglelineEntryLook DefaultLook = null;
+
     private static final long serialVersionUID = 7577783421311076636L;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HSinglelineEntryLook.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HSinglelineEntryLook.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HSound.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HSound.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HStaticAnimation.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HStaticAnimation.java Changed

@@ -25,19 +25,19 @@
         HAnimateEffect {
     public HStaticAnimation()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), "");
     }
 
     public HStaticAnimation(Image[] imagesNormal, int delay, int playMode,
             int repeatCount, int x, int y, int width, int height)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), "");
     }
 
     public HStaticAnimation(Image[] imagesNormal, int delay, int playMode,
             int repeatCount)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), "");
     }
 
     public void setLook(HLook hlook) throws HInvalidLookException
@@ -47,12 +47,14 @@
 
     public static void setDefaultLook(HAnimateLook hlook)
     {
-        throw new Error("Not implemented");
+        DefaultLook = hlook;
     }
 
     public static HAnimateLook getDefaultLook()
     {
-        throw new Error("Not implemented");
+        if (DefaultLook == null)
+            org.videolan.Logger.unimplemented("", "getDefaultLook");
+        return DefaultLook;
     }
 
     public void start()
@@ -110,5 +112,7 @@
         throw new Error("Not implemented");
     }
 
+    private static HAnimateLook DefaultLook = null;
+
     private static final long serialVersionUID = -7320112528206101937L;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HStaticIcon.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HStaticIcon.java Changed

@@ -24,17 +24,17 @@
 public class HStaticIcon extends HVisible implements HNoInputPreferred {
     public HStaticIcon()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HStaticIcon.class.getName(), "");
     }
 
     public HStaticIcon(Image imageNormal, int x, int y, int width, int height)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HStaticIcon.class.getName(), "");
     }
 
     public HStaticIcon(Image imageNormal)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HStaticIcon.class.getName(), "");
     }
 
     public void setLook(HLook hlook) throws HInvalidLookException
@@ -44,13 +44,17 @@
 
     public static void setDefaultLook(HGraphicLook hlook)
     {
-        throw new Error("Not implemented");
+        DefaultLook = hlook;
     }
 
     public static HGraphicLook getDefaultLook()
     {
-        throw new Error("Not implemented");
+        if (DefaultLook == null)
+            org.videolan.Logger.unimplemented("", "getDefaultLook");
+        return DefaultLook;
     }
 
+    private static HGraphicLook DefaultLook = null;
+
     private static final long serialVersionUID = 2015589998794748072L;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HStaticRange.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HStaticRange.java Changed

@@ -23,18 +23,18 @@
         HOrientable {
     public HStaticRange()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HStaticRange.class.getName(), "");
     }
 
     public HStaticRange(int orientation, int minimum, int maximum, int value,
             int x, int y, int width, int height)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HStaticRange.class.getName(), "");
     }
 
     public HStaticRange(int orientation, int minimum, int maximum, int value)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HStaticRange.class.getName(), "");
     }
 
     public void setLook(HLook hlook) throws HInvalidLookException
@@ -44,12 +44,14 @@
 
     public static void setDefaultLook(HRangeLook look)
     {
-        throw new Error("Not implemented");
+        DefaultLook = look;
     }
 
     public static HRangeLook getDefaultLook()
     {
-        throw new Error("Not implemented");
+        if (DefaultLook == null)
+            org.videolan.Logger.unimplemented("", "getDefaultLook");
+        return DefaultLook;
     }
 
     public int getOrientation()
@@ -115,5 +117,7 @@
     public final static int SLIDER_BEHAVIOR = 0;
     public final static int SCROLLBAR_BEHAVIOR = 1;
 
+    private static HRangeLook DefaultLook = null;
+
     private static final long serialVersionUID = 3871722305722412744L;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HStaticText.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HStaticText.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HStillImageBackgroundConfiguration.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HStillImageBackgroundConfiguration.java Changed

@@ -19,32 +19,40 @@
 
 package org.havi.ui;
 
+import java.awt.Color;
 import java.io.IOException;
 
 public class HStillImageBackgroundConfiguration extends
         HBackgroundConfiguration {
-    protected HStillImageBackgroundConfiguration()
-    {
-        throw new Error("Not implemented");
+    protected HStillImageBackgroundConfiguration() {
+
+    }
+
+    protected HStillImageBackgroundConfiguration(HBackgroundConfigTemplate hbct, Color color) {
+        super(hbct, color);
     }
 
     public void displayImage(HBackgroundImage image) throws IOException,
-            HPermissionDeniedException, HConfigurationException
-    {
-        throw new Error("Not implemented");
+            HPermissionDeniedException, HConfigurationException {
+        displayImage(image, new HScreenRectangle(0.0f, 0.0f, 1.0f, 1.0f));
     }
 
     public void displayImage(HBackgroundImage image, HScreenRectangle r)
             throws IOException, HPermissionDeniedException,
             HConfigurationException
     {
-        throw new Error("Not implemented");
+        this.image = image;
+        this.rect = r;
     }
 
-    public void setColor(java.awt.Color color)
-            throws HPermissionDeniedException, HConfigurationException
-    {
-        throw new Error("Not implemented");
+    protected HBackgroundImage getImage() {
+        return image;
+    }
+
+    protected HScreenRectangle getRectangle() {
+        return rect;
     }
 
+    private HBackgroundImage image = null;
+    private HScreenRectangle rect = new HScreenRectangle(0.0f, 0.0f, 1.0f, 1.0f);
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HText.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HText.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HTextButton.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HTextButton.java Changed

@@ -29,40 +29,42 @@
 public class HTextButton extends HText implements HActionable {
     public HTextButton()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HTextButton.class.getName(), "");
     }
 
     public HTextButton(String text, int x, int y, int width, int height)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HTextButton.class.getName(), "");
     }
 
     public HTextButton(String text, int x, int y, int width, int height,
             Font font, Color foreground, Color background,
             HTextLayoutManager tlm)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HTextButton.class.getName(), "");
     }
 
     public HTextButton(String text)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HTextButton.class.getName(), "");
     }
 
     public HTextButton(String text, Font font, Color foreground,
             Color background, HTextLayoutManager tlm)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HTextButton.class.getName(), "");
     }
 
     public static void setDefaultLook(HTextLook hlook)
     {
-        throw new Error("Not implemented");
+        DefaultLook = hlook;
     }
 
     public static HTextLook getDefaultLook()
     {
-        throw new Error("Not implemented");
+        if (DefaultLook == null)
+            org.videolan.Logger.unimplemented("", "getDefaultLook");
+        return DefaultLook;
     }
 
     public void setMove(int keyCode, HNavigable target)
@@ -161,5 +163,7 @@
         throw new Error("Not implemented");
     }
 
+    private static HTextLook DefaultLook = null;
+
     private static final long serialVersionUID = 7563558661769889160L;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HTextLook.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HTextLook.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HToggleButton.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HToggleButton.java Changed

@@ -24,107 +24,120 @@
 public class HToggleButton extends HGraphicButton implements HSwitchable {
     public HToggleButton()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleButton.class.getName(), "");
     }
 
     public HToggleButton(Image image, int x, int y, int width, int height)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleButton.class.getName(), "");
     }
 
     public HToggleButton(Image image)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleButton.class.getName(), "");
     }
 
     public HToggleButton(Image image, int x, int y, int width, int height,
             boolean state)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleButton.class.getName(), "");
     }
 
     public HToggleButton(Image imageNormal, Image imageFocused,
             Image imageActioned, Image imageNormalActioned, int x, int y,
             int width, int height, boolean state)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleButton.class.getName(), "");
     }
 
     public HToggleButton(Image imageNormal, Image imageFocused,
             Image imageActioned, Image imageNormalActioned, boolean state)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleButton.class.getName(), "");
     }
 
     public HToggleButton(Image image, int x, int y, int width, int height,
             boolean state, HToggleGroup group)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleButton.class.getName(), "");
+        toggleGroup = group;
     }
 
     public HToggleButton(Image image, boolean state, HToggleGroup group)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleButton.class.getName(), "");
+        toggleGroup = group;
     }
 
     public HToggleButton(Image imageNormal, Image imageFocused,
             Image imageActioned, Image imageNormalActioned, int x, int y,
             int width, int height, boolean state, HToggleGroup group)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleButton.class.getName(), "");
+        toggleGroup = group;
     }
 
     public HToggleButton(Image imageNormal, Image imageFocused,
             Image imageActioned, Image imageNormalActioned, boolean state,
             HToggleGroup group)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleButton.class.getName(), "");
+        toggleGroup = group;
     }
 
     public void setToggleGroup(HToggleGroup group)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleButton.class.getName(), "setToggleGroup");
+        toggleGroup = group;
     }
 
     public HToggleGroup getToggleGroup()
     {
-        throw new Error("Not implemented");
+        return toggleGroup;
     }
 
     public void removeToggleGroup()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleButton.class.getName(), "removeToggleGroup");
     }
 
     public static void setDefaultLook(HGraphicLook hlook)
     {
-        throw new Error("Not implemented");
+        DefaultLook = hlook;
     }
 
     public static HGraphicLook getDefaultLook()
     {
-        throw new Error("Not implemented");
+        if (DefaultLook == null)
+            org.videolan.Logger.unimplemented("", "getDefaultLook");
+        return DefaultLook;
     }
 
     public boolean getSwitchableState()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleButton.class.getName(), "getSwitchableState");
+        return true;
     }
 
     public void setSwitchableState(boolean state)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleButton.class.getName(), "setSwitchableState");
     }
 
     public void setUnsetActionSound(HSound sound)
     {
-        throw new Error("Not implemented");
+        unsetActionSound = sound;
     }
 
     public HSound getUnsetActionSound()
     {
-        throw new Error("Not implemented");
+        return unsetActionSound;
     }
 
+    private static HGraphicLook DefaultLook = null;
+
+    private HToggleGroup toggleGroup = null;
+    private HSound unsetActionSound = null;
+
     private static final long serialVersionUID = 2602166176018744707L;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HToggleGroup.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HToggleGroup.java Changed

@@ -20,48 +20,54 @@
 package org.havi.ui;
 
 public class HToggleGroup {
+    private HToggleButton current = null;
+
     public HToggleGroup()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleGroup.class.getName(), "");
     }
 
     public HToggleButton getCurrent()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleGroup.class.getName(), "getCurrent");
+        return current;
     }
 
     public void setCurrent(HToggleButton selection)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleGroup.class.getName(), "setCurrent");
+        current = selection;
     }
 
     public void setForcedSelection(boolean forceSelection)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleGroup.class.getName(), "setForcedSelection");
     }
 
     public boolean getForcedSelection()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleGroup.class.getName(), "getForcedSelection");
+        return false;
     }
 
     public void setEnabled(boolean enable)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleGroup.class.getName(), "setEnabled");
     }
 
     public boolean isEnabled()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleGroup.class.getName(), "isEnabled");
+        return false;
     }
 
     protected void add(HToggleButton button)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleGroup.class.getName(), "add");
     }
 
     protected void remove(HToggleButton button)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HToggleGroup.class.getName(), "remove");
     }
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HVideoComponent.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HVideoComponent.java Changed

@@ -24,24 +24,27 @@
 public class HVideoComponent extends HComponent {
     protected HVideoComponent()
     {
-
+        org.videolan.Logger.unimplemented(HVideoComponent.class.getName(), "");
     }
 
     public HVideoDevice getVideoDevice()
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HVideoComponent.class.getName(), "getVideoDevice");
+        return new HVideoDevice();
     }
 
     public void addOnScreenLocationModifiedListener(
             HScreenLocationModifiedListener slml)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HVideoComponent.class.getName(),
+                                          "addOnScreenLocationModifiedListener");
     }
 
     public void removeOnScreenLocationModifiedListener(
             HScreenLocationModifiedListener slml)
     {
-        throw new Error("Not implemented");
+        org.videolan.Logger.unimplemented(HVideoComponent.class.getName(),
+                                          "removeOnScreenLocationModifiedListener");
     }
 
     private static final long serialVersionUID = -2729982569604493491L;

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HVideoConfigTemplate.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HVideoConfigTemplate.java Changed

@@ -20,30 +20,34 @@
 package org.havi.ui;
 
 public class HVideoConfigTemplate extends HScreenConfigTemplate {
-    public HVideoConfigTemplate()
-    {
-        throw new Error("Not implemented");
+    public boolean isConfigSupported(HVideoConfiguration hvc) {
+        return match(hvc) >= 0;
     }
 
-    public boolean isConfigSupported(HVideoConfiguration hvc)
-    {
-        throw new Error("Not implemented");
+    protected int getPreferenceCount() {
+        return super.getPreferenceCount() + 2;
     }
 
-    public int getPreferencePriority(int preference)
-    {
-        throw new Error("Not implemented");
+    protected int getPreferenceObjectCount() {
+        return super.getPreferenceObjectCount() + 2;
     }
 
-    public void setPreference(int preference, Object object, int priority)
-    {
-        throw new Error("Not implemented");
+    protected int getPreferenceIndex(int preference) {
+        if (preference == GRAPHICS_MIXING)
+            return super.getPreferenceCount();
+        if (preference == KEEP_RESOLUTION)
+            return super.getPreferenceCount() + 1;
+        return super.getPreferenceIndex(preference);
     }
 
-    public Object getPreferenceObject(int preference)
-    {
-        throw new Error("Not implemented");
+    protected int getPreferenceObjectIndex(int preference) {
+        if (preference == GRAPHICS_MIXING)
+            return super.getPreferenceObjectCount();
+        if (preference == KEEP_RESOLUTION)
+            return super.getPreferenceObjectCount() + 1;
+        return super.getPreferenceObjectIndex(preference);
     }
 
     public static final int GRAPHICS_MIXING = 0x0F;
+    public static final int KEEP_RESOLUTION = 0x10;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HVideoConfiguration.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HVideoConfiguration.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HVideoDevice.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HVideoDevice.java Changed

@@ -20,55 +20,65 @@
 package org.havi.ui;
 
 public class HVideoDevice extends HScreenDevice {
- protected HVideoDevice()
- {
-
+ protected HVideoDevice() {
+ int length = HScreenConfigTemplate.defaultConfig.length;
+ hvcArray = new HVideoConfiguration[length];
+ for (int i = 0; i < length; i++) {
+ HVideoConfigTemplate hvct = new HVideoConfigTemplate();
+ HScreenConfigTemplate.initDefaultConfigTemplate(hvct, i);
+ hvcArray[i] = new HVideoConfiguration(hvct);
+ }
+ hvc = hvcArray[0];
 }
 
- public HVideoConfiguration[] getConfigurations()
- {
- throw new Error("Not implemented");
+ public HVideoConfiguration[] getConfigurations() {
+ return hvcArray;
 }
 
- public HVideoConfiguration getDefaultConfiguration()
- {
- throw new Error("Not implemented");
+ public HVideoConfiguration getDefaultConfiguration() {
+ return hvcArray[0];
 }
 
- public HVideoConfiguration getBestConfiguration(HVideoConfigTemplate hvct)
- {
- throw new Error("Not implemented");
+ public HVideoConfiguration getBestConfiguration(HVideoConfigTemplate hvct) {
+ int score = -1;
+ HVideoConfiguration hvc = null;
+ for (int i = 0; i < hvcArray.length; i++)
+ if (hvct.match(hvcArray[i]) > score)
+ hvc = hvcArray[i];
+ return hvc;
 }
 
- public HVideoConfiguration getBestConfiguration(
- HVideoConfigTemplate hvcta[])
- {
- throw new Error("Not implemented");
+ public HVideoConfiguration getBestConfiguration(HVideoConfigTemplate hvcta[]) {
+ int score = -1;
+ HVideoConfiguration hvc = null;
+ for (int i = 0; i < hvcArray.length; i++) 
+ for (int j = 0; j < hvcta.length; j++)
+ if (hvcta[j].match(hvcArray[i]) > score)
+ hvc = hvcArray[i];
+ return hvc;
 }
 
- public HVideoConfiguration getCurrentConfiguration()
- {
- throw new Error("Not implemented");
+ public HVideoConfiguration getCurrentConfiguration() {
+ return hvc;
 }
 
 public boolean setVideoConfiguration(HVideoConfiguration hvc)
- throws SecurityException, HPermissionDeniedException,
- HConfigurationException
- {
- throw new Error("Not implemented");
+ throws SecurityException, HPermissionDeniedException, HConfigurationException {
+ this.hvc = hvc;
+ return true;
 }
 
- public Object getVideoSource() throws SecurityException,
- HPermissionDeniedException
- {
- throw new Error("Not implemented");
+ public Object getVideoSource() throws SecurityException, HPermissionDeniedException {
+ org.videolan.Logger.unimplemented(HVideoDevice.class.getName(), "getVideoSource");
+ throw new HPermissionDeniedException();
 }
 
- public Object getVideoController() throws SecurityException,
- HPermissionDeniedException
- {
- throw new Error("Not implemented");
+ public Object getVideoController() throws SecurityException, HPermissionDeniedException {
+ org.videolan.Logger.unimplemented(HVideoDevice.class.getName(), "getVideoController");
+ throw new HPermissionDeniedException();
 }
 
- public static final HVideoConfiguration NOT_CONTRIBUTING = new HVideoConfiguration();
+ public static final HVideoConfiguration NOT_CONTRIBUTING = null;
+ private HVideoConfiguration[] hvcArray;
+ private HVideoConfiguration hvc;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HVisible.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/HVisible.java Changed

@@ -1,6 +1,7 @@
 /*
 * This file is part of libbluray
 * Copyright (C) 2010 William Hahne
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -22,203 +23,338 @@
 import java.awt.Graphics;
 import java.awt.Image;
 import java.awt.Dimension;
+import java.util.Hashtable;
+import java.util.Map;
+
+import org.videolan.Logger;
 
 public class HVisible extends HComponent implements HState {
 public HVisible()
 {
- throw new Error("Not implemented");
+ this(null);
 }
 
 public HVisible(HLook hlook)
 {
- super();
- throw new Error("Not implemented");
+ this(hlook, 0, 0, 0, 0);
 }
 
 public HVisible(HLook hlook, int x, int y, int width, int height)
 {
 super(x, y, width, height);
- throw new Error("Not implemented");
+ hLook = hlook;
+ TextLayoutManager = new HDefaultTextLayoutManager();
+
+ content = new Object[LAST_STATE - FIRST_STATE + 1];
 }
 
 public boolean isFocusTraversable()
 {
- throw new Error("Not implemented");
+ if (this instanceof HNavigable || this instanceof HSelectionInputPreferred) {
+ return true;
+ }
+ return false;
 }
 
 public void paint(Graphics g)
 {
- throw new Error("Not implemented");
+ if (hLook != null)
+ hLook.showLook(g, this, InteractionState);
 }
 
 public void update(Graphics g)
 {
- throw new Error("Not implemented");
+ g.setColor(getBackground());
+ paint(g);
 }
 
 public void setTextContent(String string, int state)
 {
- throw new Error("Not implemented");
+ setContentImpl(string, state, TEXT_CONTENT_CHANGE);
 }
 
 public void setGraphicContent(Image image, int state)
 {
- throw new Error("Not implemented");
+ setContentImpl(image, state, GRAPHIC_CONTENT_CHANGE);
 }
 
 public void setAnimateContent(Image[] imageArray, int state)
 {
- throw new Error("Not implemented");
+ setContentImpl(imageArray, state, ANIMATE_CONTENT_CHANGE);
 }
 
 public void setContent(Object object, int state)
 {
- throw new Error("Not implemented");
+ setContentImpl(object, state, CONTENT_CHANGE);
+ }
+
+ private void setContentImpl(Object object, int state, int hint)
+ {
+ int states = LAST_STATE - FIRST_STATE + 1;
+
+ Object[] oldData = new Object[states + 1];
+ oldData[0] = new Integer(state);
+ for (int i = 0; i < states; i++) {
+ oldData[(i + 1)] = content[i];
+ }
+
+ if (state == ALL_STATES) {
+ for (int i = 0; i < states; i++)
+ content[i] = object;
+ } else {
+ if (state < FIRST_STATE || state > LAST_STATE) {
+ logger.info("state out of range in getContext()");
+ throw new IllegalArgumentException("state out of range");
+ }
+ content[state - FIRST_STATE] = object;
+ }
+
+ visibleChanged(hint, oldData);
+ }
+
+ private void visibleChanged(int hint, Object data) {
+ if (hLook == null) {
+ return;
+ }
+ HChangeData[] changeData = null;
+ if (data != null) {
+ changeData = new HChangeData[1];
+ changeData[0] = new HChangeData(hint, data);
+ }
+ hLook.widgetChanged(this, changeData);
 }
 
 public String getTextContent(int state)
 {
- throw new Error("Not implemented");
+ return (String)getContent(state);
 }
 
 public Image getGraphicContent(int state)
 {
- throw new Error("Not implemented");
+ return (Image)getContent(state);
 }
 
 public Image[] getAnimateContent(int state)
 {
- throw new Error("Not implemented");
+ return (Image[])getContent(state);
 }
 
 public Object getContent(int state)
 {
- throw new Error("Not implemented");
+ if (state == ALL_STATES) {
+ logger.info("ALL_STATES not supported in getContent()");
+ throw new IllegalArgumentException("ALL_STATES not supported in getContent()");
+ }
+
+ if (state < FIRST_STATE || state > LAST_STATE) {
+ logger.info("state out of range in getContent()");
+ throw new IllegalArgumentException("state out of range");
+ }
+
+ return content[state - FIRST_STATE];
 }
 
 public void setLook(HLook hlook) throws HInvalidLookException
 {
- throw new Error("Not implemented");
+ hLook = hlook;
 }
 
 public HLook getLook()
 {
- throw new Error("Not implemented");
+ return hLook;
 }
 
 public Dimension getPreferredSize()
 {
- throw new Error("Not implemented");
+ if (hLook != null) {
+ return hLook.getPreferredSize(this);
+ }
+ return getSize();
 }
 
 public Dimension getMaximumSize()
 {
- throw new Error("Not implemented");
+ if (hLook != null) {
+ return hLook.getMaximumSize(this);
+ }
+ return getSize();
 }
 
 public Dimension getMinimumSize()
 {
- throw new Error("Not implemented");
+ if (hLook != null) {
+ return hLook.getMinimumSize(this);
+ }
+ return getSize();
+ }
+
+ public void requestFocus() {
+ super.requestFocus();
+
+ if (isFocusTraversable())
+ setInteractionState(InteractionState | FOCUSED_STATE_BIT);
 }
 
 protected void setInteractionState(int state)
 {
- throw new Error("Not implemented");
+ if (InteractionState == state)
+ return;
+
+ Integer oldState = new Integer(InteractionState);
+ InteractionState = state;
+ visibleChanged(STATE_CHANGE, oldState);
 }
 
 public int getInteractionState()
 {
- throw new Error("Not implemented");
+ return InteractionState;
 }
 
 public void setTextLayoutManager(HTextLayoutManager manager)
 {
- throw new Error("Not implemented");
+ TextLayoutManager = manager;
 }
 
 public HTextLayoutManager getTextLayoutManager()
 {
- throw new Error("Not implemented");
+ return TextLayoutManager;
 }
 
 public int getBackgroundMode()
 {
- throw new Error("Not implemented");
+ return BackgroundMode;
 }
 
 public void setBackgroundMode(int mode)
 {
- throw new Error("Not implemented");
+ if (mode != BACKGROUND_FILL && mode != NO_BACKGROUND_FILL) {
+ logger.info("mode out of range in setBackgroundMode()");
+ throw new IllegalArgumentException("Unknown background fill mode");
+ }
+ BackgroundMode = mode;
 }
 
 public boolean isOpaque()
 {
- throw new Error("Not implemented");
+ if (hLook == null) {
+ return false;
+ }
+ return hLook.isOpaque(this);
 }
 
 public void setDefaultSize(Dimension defaultSize)
 {
- throw new Error("Not implemented");
+ this.defaultSize = defaultSize;
 }
 
 public Dimension getDefaultSize()
 {
- throw new Error("Not implemented");
+ return defaultSize;
 }
 
 public Object getLookData(Object key)
 {
- throw new Error("Not implemented");
+ if (lookData == null || !lookData.containsKey(key)) {
+ return null;
+ }
+ return lookData.get(key);
 }
 
 public void setLookData(Object key, Object data)
 {
- throw new Error("Not implemented");
+ if (lookData == null) {
+ lookData = new Hashtable();
+ }
+
+ if (lookData.containsKey(key)) {
+ lookData.remove(key);
+ }
+
+ if (data == null) {
+ return;
+ }
+
+ lookData.put(key, data);
 }
 
 public void setHorizontalAlignment(int halign)
 {
- throw new Error("Not implemented");
+ if (halign != HALIGN_LEFT && halign != HALIGN_CENTER &&
+ halign != HALIGN_RIGHT && halign != HALIGN_JUSTIFY) {
+ logger.info("align out of range in setHorizontalAlignment()");
+ throw new IllegalArgumentException("Unknown halign");
+ }
+
+ this.halign = halign;
+ visibleChanged(UNKNOWN_CHANGE, new Integer(UNKNOWN_CHANGE));
 }
 
 public void setVerticalAlignment(int valign)
 {
- throw new Error("Not implemented");
+ if (valign != VALIGN_TOP && valign != VALIGN_CENTER &&
+ valign != VALIGN_BOTTOM && valign != VALIGN_JUSTIFY) {
+ logger.info("align out of range in setVerticalAlignment()");
+ throw new IllegalArgumentException("Unknown valign");
+ }
+
+ this.valign = valign;
+ visibleChanged(UNKNOWN_CHANGE, new Integer(UNKNOWN_CHANGE));
 }
 
 public int getHorizontalAlignment()
 {
- throw new Error("Not implemented");
+ return halign;
 }
 
 public int getVerticalAlignment()
 {
- throw new Error("Not implemented");
+ return valign;
 }
 
 public void setResizeMode(int resize)
 {
- throw new Error("Not implemented");
+ if (resize != RESIZE_NONE && resize != RESIZE_PRESERVE_ASPECT &&
+ resize != RESIZE_ARBITRARY) {
+ logger.info("resize out of range in setResizeMode()");
+ throw new IllegalArgumentException("Unknown resize mode");
+ }
+
+ resizeMode = resize;
+ visibleChanged(UNKNOWN_CHANGE, new Integer(UNKNOWN_CHANGE));
 }
 
 public int getResizeMode()
 {
- throw new Error("Not implemented");
+ return resizeMode;
 }
 
 public void setEnabled(boolean b)
 {
- throw new Error("Not implemented");
+ super.setEnabled(b);
+ if (b) {
+ setInteractionState(InteractionState & (~DISABLED_STATE_BIT));
+ } else {
+ setInteractionState(InteractionState | DISABLED_STATE_BIT);
+ }
 }
 
 public void setBordersEnabled(boolean enable)
 {
- throw new Error("Not implemented");
+ if (enable == BordersEnabled)
+ return;
+
+ if ((hLook instanceof HAnimateLook) ||
+ (hLook instanceof HGraphicLook) ||
+ (hLook instanceof HTextLook)) {
+ Boolean oldMode = new Boolean(BordersEnabled);
+ BordersEnabled = enable;
+ visibleChanged(BORDER_CHANGE, oldMode);
+ }
 }
 
 public boolean getBordersEnabled()
 {
- throw new Error("Not implemented");
+ return BordersEnabled;
 }
 
 public static final int HALIGN_LEFT = 0;
@@ -251,7 +387,6 @@
 public static final int MIN_MAX_CHANGE = 8;
 public static final int THUMB_OFFSETS_CHANGE = 9;
 public static final int ORIENTATION_CHANGE = 10;
- @Deprecated
 public static final int TEXT_VALUE_CHANGE = 11;
 public static final int ITEM_VALUE_CHANGE = 12;
 public static final int ADJUSTMENT_VALUE_CHANGE = 13;
@@ -270,8 +405,21 @@
 
 public static final int NO_DEFAULT_WIDTH = -1;
 public static final int NO_DEFAULT_HEIGHT = -1;
- public static final Dimension NO_DEFAULT_SIZE = new Dimension(
- NO_DEFAULT_WIDTH, NO_DEFAULT_HEIGHT);
+ public static final Dimension NO_DEFAULT_SIZE = new Dimension(NO_DEFAULT_WIDTH, NO_DEFAULT_HEIGHT);
 
 private static final long serialVersionUID = -2076075723286676347L;
+
+ private HLook hLook;
+ private Map lookData;
+ private int BackgroundMode = NO_BACKGROUND_FILL;
+ private boolean BordersEnabled = true;
+ private int InteractionState = 0;
+ private int halign = HALIGN_LEFT;
+ private int valign = VALIGN_TOP;
+ private int resizeMode = RESIZE_NONE;
+ private HTextLayoutManager TextLayoutManager = null;
+ private Object content[];
+ private Dimension defaultSize = NO_DEFAULT_SIZE;
+
+ private static final Logger logger = Logger.getLogger(HVisible.class.getName());
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/event/HEventGroup.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/event/HEventGroup.java Changed

@@ -22,22 +22,18 @@
 import java.util.LinkedList;
 
 public class HEventGroup {
- public HEventGroup()
- {
+ public HEventGroup() {
 }
 
- public void addKey(int keycode)
- {
+ public void addKey(int keycode) {
 keys.add(new Integer(keycode));
 }
 
- public void removeKey(int keycode)
- {
+ public void removeKey(int keycode) {
 keys.remove(new Integer(keycode));
 }
 
- public void addAllNumericKeys()
- {
+ public void addAllNumericKeys() {
 addKey(HRcEvent.VK_0);
 addKey(HRcEvent.VK_1);
 addKey(HRcEvent.VK_2);
@@ -50,24 +46,21 @@
 addKey(HRcEvent.VK_9);
 }
 
- public void addAllColourKeys()
- {
+ public void addAllColourKeys() {
 addKey(HRcEvent.VK_COLORED_KEY_0);
 addKey(HRcEvent.VK_COLORED_KEY_1);
 addKey(HRcEvent.VK_COLORED_KEY_2);
 addKey(HRcEvent.VK_COLORED_KEY_3);
 }
 
- public void addAllArrowKeys()
- {
+ public void addAllArrowKeys() {
 addKey(HRcEvent.VK_LEFT);
 addKey(HRcEvent.VK_RIGHT);
 addKey(HRcEvent.VK_UP);
 addKey(HRcEvent.VK_DOWN);
 }
 
- public void removeAllNumericKeys()
- {
+ public void removeAllNumericKeys() {
 removeKey(HRcEvent.VK_0);
 removeKey(HRcEvent.VK_1);
 removeKey(HRcEvent.VK_2);
@@ -80,31 +73,28 @@
 removeKey(HRcEvent.VK_9);
 }
 
- public void removeAllColourKeys()
- {
+ public void removeAllColourKeys() {
 removeKey(HRcEvent.VK_COLORED_KEY_0);
 removeKey(HRcEvent.VK_COLORED_KEY_1);
 removeKey(HRcEvent.VK_COLORED_KEY_2);
 removeKey(HRcEvent.VK_COLORED_KEY_3);
 }
 
- public void removeAllArrowKeys()
- {
+ public void removeAllArrowKeys() {
 removeKey(HRcEvent.VK_LEFT);
 removeKey(HRcEvent.VK_RIGHT);
 removeKey(HRcEvent.VK_UP);
 removeKey(HRcEvent.VK_DOWN);
 }
 
- public int[] getKeyEvents()
- {
+ public int[] getKeyEvents() {
 int[] arr = new int[keys.size()];
 
 for (int i = 0; i < keys.size(); i++)
- arr[i] = keys.get(i).intValue();
+ arr[i] = ((Integer)keys.get(i)).intValue();
 
 return arr;
 }
 
- private LinkedList<Integer> keys;
+ private LinkedList keys;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/event/HEventRepresentation.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/event/HEventRepresentation.java Changed

@@ -23,59 +23,77 @@
 import java.awt.Image;
 
 public class HEventRepresentation extends Object {
-    public static final int ER_TYPE_NOT_SUPPORTED = 0;
-    public static final int ER_TYPE_STRING = 1;
-    public static final int ER_TYPE_COLOR = 2;
-    public static final int ER_TYPE_SYMBOL = 4;
+    protected HEventRepresentation(boolean supported, String text, Color color, Image symbol) {
+        this.supported = supported;
+        this.text = text;
+        this.color = color;
+        this.symbol = symbol;
 
-    protected HEventRepresentation(int support, String text, Color color, Image symbol)
-    {
-        throw new Error("Not implemented");
+        type = ER_TYPE_NOT_SUPPORTED;
+        if (text != null)
+            type |= ER_TYPE_STRING;
+        if (color != null)
+            type |= ER_TYPE_COLOR;
+        if (symbol != null)
+            type |= ER_TYPE_SYMBOL;
     }
 
-    public boolean isSupported()
-    {
-        throw new Error("Not implemented");
+    public boolean isSupported() {
+        return supported;
     }
 
-    protected void setType(int aType)
-    {
-        throw new Error("Not implemented");
+    protected void setType(int aType) {
+        type = aType;
     }
 
-    public int getType()
-    {
-        throw new Error("Not implemented");
+    public int getType() {
+        return type;
     }
 
-    protected void setColor(Color aColor)
-    {
-        throw new Error("Not implemented");
+    protected void setColor(Color aColor) {
+        color = aColor;
+        if (color != null)
+            type |= ER_TYPE_COLOR;
+        else
+            type &= ~ER_TYPE_COLOR;
     }
 
-    public Color getColor()
-    {
-        throw new Error("Not implemented");
+    public Color getColor() {
+        return color;
     }
 
-    protected void setString(String aText)
-    {
-        throw new Error("Not implemented");
+    protected void setString(String aText) {
+        text = aText;
+        if (text != null)
+            type |= ER_TYPE_STRING;
+        else
+            type &= ~ER_TYPE_STRING;
     }
 
-    public String getString()
-    {
-        throw new Error("Not implemented");
+    public String getString() {
+        return text;
     }
 
-    protected void setSymbol(Image aSymbol)
-    {
-        throw new Error("Not implemented");
+    protected void setSymbol(Image aSymbol) {
+        symbol = aSymbol;
+        if (symbol != null)
+            type |= ER_TYPE_SYMBOL;
+        else
+            type &= ~ER_TYPE_SYMBOL;
     }
 
-    public Image getSymbol()
-    {
-        throw new Error("Not implemented");
+    public Image getSymbol() {
+        return symbol;
     }
 
+    public static final int ER_TYPE_NOT_SUPPORTED = 0;
+    public static final int ER_TYPE_STRING = 1;
+    public static final int ER_TYPE_COLOR = 2;
+    public static final int ER_TYPE_SYMBOL = 4;
+
+    private boolean supported;
+    private String text;
+    private Color color;
+    private Image symbol;
+    private int type;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/event/HKeyCapabilities.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/event/HKeyCapabilities.java Changed

@@ -19,19 +19,41 @@
 
 package org.havi.ui.event;
 
-public class HKeyCapabilities {
- protected HKeyCapabilities()
- {
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
 
+public class HKeyCapabilities {
+ protected HKeyCapabilities() {
 }
 
- public static boolean getInputDeviceSupported()
- {
+ public static boolean getInputDeviceSupported() {
 return true;
 }
 
- public static boolean isSupported(int keycode)
- {
- return true; // of course we support everything
+ public static boolean isSupported(int keycode) {
+ return Arrays.binarySearch(supportedKeyCode, keycode) >= 0;
+ }
+
+ private static final int[] supportedKeyCode;
+
+ static {
+ ArrayList list = new ArrayList();
+ Field[] fields = org.bluray.ui.event.HRcEvent.class.getFields();
+ for (int i = 0; i < fields.length; i++) {
+ String name = fields[i].getName();
+ if ((name.startsWith("VK_")) && !(name.equals("VK_UNDEFINED"))) {
+ try {
+ Integer keyCode = new Integer(fields[i].getInt(null));
+ list.add(keyCode);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ supportedKeyCode = new int[list.size()];
+ for (int i = 0; i < list.size(); i++)
+ supportedKeyCode[i] = ((Integer)list.get(i)).intValue();
+ Arrays.sort(supportedKeyCode);
 }
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/event/HKeyEvent.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/event/HKeyEvent.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/event/HRcCapabilities.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/event/HRcCapabilities.java Changed

@@ -19,19 +19,199 @@
 
 package org.havi.ui.event;
 
+import java.awt.Color;
+import java.awt.event.KeyEvent;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.bluray.ui.event.HRcEvent;
+
 public class HRcCapabilities extends HKeyCapabilities {
- public static HEventRepresentation getRepresentation(int aCode)
- {
- throw new Error("Not implemented");
+ protected HRcCapabilities() {
 }
 
- public static boolean getInputDeviceSupported()
- {
- return true;
+ public static HEventRepresentation getRepresentation(int keyCode) {
+ if (!isSupported(keyCode))
+ return null;
+ return new HEventRepresentation(true, getKeyText(keyCode), getKeyColor(keyCode), null);
 }
 
- public static boolean isSupported(int keycode)
- {
+ public static boolean getInputDeviceSupported() {
 return true;
 }
+
+ public static boolean isSupported(int keycode) {
+ return Arrays.binarySearch(supportedRcCode, keycode) >= 0;
+ }
+
+ private static Color getKeyColor(int keyCode) {
+ switch (keyCode) {
+ case HRcEvent.VK_COLORED_KEY_0:
+ return Color.red;
+ case HRcEvent.VK_COLORED_KEY_1:
+ return Color.green;
+ case HRcEvent.VK_COLORED_KEY_2:
+ return Color.yellow;
+ case HRcEvent.VK_COLORED_KEY_3:
+ return Color.blue;
+ }
+ return null;
+ }
+
+ private static String getKeyText(int keyCode) {
+ if ((keyCode >= HRcEvent.RC_FIRST) && (keyCode <= HRcEvent.VK_PG_TEXTST_ENABLE_DISABLE)) {
+ switch (keyCode) {
+ case HRcEvent.VK_BALANCE_LEFT:
+ return "Balance Left";
+ case HRcEvent.VK_BALANCE_RIGHT:
+ return "Balance Right";
+ case HRcEvent.VK_BASS_BOOST_DOWN:
+ return "Bass Boost Down";
+ case HRcEvent.VK_BASS_BOOST_UP:
+ return "Bass Boost Up";
+ case HRcEvent.VK_CHANNEL_DOWN:
+ return "Channel DOwn";
+ case HRcEvent.VK_CHANNEL_UP:
+ return "Channel Up";
+ case HRcEvent.VK_CLEAR_FAVORITE_0:
+ return "Clear Favorite 1";
+ case HRcEvent.VK_CLEAR_FAVORITE_1:
+ return "Clear Favorite 1";
+ case HRcEvent.VK_CLEAR_FAVORITE_2:
+ return "Clear Favorite 1";
+ case HRcEvent.VK_CLEAR_FAVORITE_3:
+ return "Clear Favorite 1";
+ case HRcEvent.VK_COLORED_KEY_0:
+ return "Colored Key 0";
+ case HRcEvent.VK_COLORED_KEY_1:
+ return "Colored Key 1";
+ case HRcEvent.VK_COLORED_KEY_2:
+ return "Colored Key 2";
+ case HRcEvent.VK_COLORED_KEY_3:
+ return "Colored Key 3";
+ case HRcEvent.VK_COLORED_KEY_4:
+ return "Colored Key 4";
+ case HRcEvent.VK_COLORED_KEY_5:
+ return "Colored Key 5";
+ case HRcEvent.VK_DIMMER:
+ return "Dimmer";
+ case HRcEvent.VK_DISPLAY_SWAP:
+ return "Swap Display";
+ case HRcEvent.VK_EJECT_TOGGLE:
+ return "Toggle Eject";
+ case HRcEvent.VK_FADER_FRONT:
+ return "Fader Front";
+ case HRcEvent.VK_FADER_REAR:
+ return "Fader Rear";
+ case HRcEvent.VK_FAST_FWD:
+ return "Fast Farward";
+ case HRcEvent.VK_GO_TO_END:
+ return "GGo to End";
+ case HRcEvent.VK_GO_TO_START:
+ return "Go to Start";
+ case HRcEvent.VK_GUIDE:
+ return "Guide";
+ case HRcEvent.VK_INFO:
+ return "Infomation";
+ case HRcEvent.VK_MUTE:
+ return "Mute";
+ case HRcEvent.VK_PINP_TOGGLE:
+ return "Toggle Picture-in-picture";
+ case HRcEvent.VK_PLAY:
+ return "Play";
+ case HRcEvent.VK_PLAY_SPEED_DOWN:
+ return "Play Speed Down";
+ case HRcEvent.VK_PLAY_SPEED_RESET:
+ return "Play Speed Reset";
+ case HRcEvent.VK_PLAY_SPEED_UP:
+ return "Play Speed Up";
+ case HRcEvent.VK_POWER:
+ return "Power";
+ case HRcEvent.VK_RANDOM_TOGGLE:
+ return "Toggle Random";
+ case HRcEvent.VK_RECALL_FAVORITE_0:
+ return "Recall Favorite 0";
+ case HRcEvent.VK_RECALL_FAVORITE_1:
+ return "Recall Favorite 1";
+ case HRcEvent.VK_RECALL_FAVORITE_2:
+ return "Recall Favorite 2";
+ case HRcEvent.VK_RECALL_FAVORITE_3:
+ return "Recall Favorite 3";
+ case HRcEvent.VK_RECORD:
+ return "Record";
+ case HRcEvent.VK_RECORD_SPEED_NEXT:
+ return "Next Record Speed";
+ case HRcEvent.VK_REWIND:
+ return "Rewind";
+ case HRcEvent.VK_SCAN_CHANNELS_TOGGLE:
+ return "Toggle Scan Channels";
+ case HRcEvent.VK_SCREEN_MODE_NEXT:
+ return "Next Screen Mode";
+ case HRcEvent.VK_SPLIT_SCREEN_TOGGLE:
+ return "Toggle Split Screen";
+ case HRcEvent.VK_STOP:
+ return "Stop";
+ case HRcEvent.VK_STORE_FAVORITE_0:
+ return "Store Favorite 0";
+ case HRcEvent.VK_STORE_FAVORITE_1:
+ return "Store Favorite 1";
+ case HRcEvent.VK_STORE_FAVORITE_2:
+ return "Store Favorite 2";
+ case HRcEvent.VK_STORE_FAVORITE_3:
+ return "Store Favorite 3";
+ case HRcEvent.VK_SUBTITLE:
+ return "Subtitle";
+ case HRcEvent.VK_SURROUND_MODE_NEXT:
+ return "Next Surround Mode";
+ case HRcEvent.VK_TELETEXT:
+ return "Teletext";
+ case HRcEvent.VK_TRACK_NEXT:
+ return "Next Track";
+ case HRcEvent.VK_TRACK_PREV:
+ return "Preview Track";
+ case HRcEvent.VK_VIDEO_MODE_NEXT:
+ return "Next Video Mode";
+ case HRcEvent.VK_VOLUME_DOWN:
+ return "Volume Down";
+ case HRcEvent.VK_VOLUME_UP:
+ return "Volume Up";
+ case HRcEvent.VK_WINK:
+ return "Win Key";
+ }
+ }
+ return KeyEvent.getKeyText(keyCode);
+ }
+
+ private static final int[] supportedRcCode;
+
+ static {
+ ArrayList list = new ArrayList();
+
+ list.add(new Integer(HRcEvent.VK_ENTER));
+ list.add(new Integer(HRcEvent.VK_LEFT));
+ list.add(new Integer(HRcEvent.VK_UP));
+ list.add(new Integer(HRcEvent.VK_RIGHT));
+ list.add(new Integer(HRcEvent.VK_DOWN));
+ for (int i = 0; i < 9; i++)
+ list.add(new Integer(HRcEvent.VK_0 + i));
+
+ Field[] fields = org.bluray.ui.event.HRcEvent.class.getFields();
+ for (int i = 0; i < fields.length; i++) {
+ String name = fields[i].getName();
+ if ((name.startsWith("VK_")) && !(name.equals("VK_UNDEFINED"))) {
+ try {
+ int keyCode = fields[i].getInt(null);
+ if ((keyCode > HRcEvent.RC_FIRST) && (keyCode <= HRcEvent.VK_PG_TEXTST_ENABLE_DISABLE))
+ list.add(new Integer(keyCode));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ supportedRcCode = new int[list.size()];
+ for (int i = 0; i < list.size(); i++)
+ supportedRcCode[i] = ((Integer)list.get(i)).intValue();
+ Arrays.sort(supportedRcCode);
+ }
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/havi/ui/event/HRcEvent.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/havi/ui/event/HRcEvent.java Changed

@@ -23,11 +23,10 @@
 import java.awt.event.KeyEvent;
 
 public class HRcEvent extends KeyEvent {
-    @Deprecated
     public HRcEvent(Component source, int id, long when, int modifiers,
             int keyCode)
     {
-        super(source, id, when, modifiers, keyCode);
+        super(source, id, when, modifiers, keyCode, (char)keyCode);
     }
 
     public HRcEvent(Component source, int id, long when, int modifiers,
@@ -36,7 +35,6 @@
         super(source, id, when, modifiers, keyCode, keyChar);
     }
 
-    @Deprecated
     public static final int RC_FIRST = 400;
     public static final int VK_COLORED_KEY_0 = 403;
     public static final int VK_COLORED_KEY_1 = VK_COLORED_KEY_0 + 1;
@@ -96,7 +94,6 @@
     public static final int VK_GUIDE = VK_INFO + 1;
     public static final int VK_TELETEXT = VK_GUIDE + 1;
     public static final int VK_SUBTITLE = VK_TELETEXT + 1;
-    @Deprecated
     public static final int RC_LAST = VK_SUBTITLE;
 
     private static final long serialVersionUID = 2427692646491162046L;

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/Arrays.java Added

@@ -0,0 +1,61 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan;
+
+public class Arrays {
+ public static int hashCode(Object[] array) {
+ if (array == null)
+ return 0;
+ int hash = 1;
+ for (int i = 0; i < array.length; i++)
+ hash = 31 * hash + (array[i] == null ? 0 : array[i].hashCode());
+ return hash;
+ }
+
+ public static String toString(int[] array) {
+ if (array == null)
+ return "null";
+ StringBuffer buffer = new StringBuffer();
+ buffer.append('[');
+ int length = array.length;
+ for (int j = 0; j < length; j++) {
+ buffer.append(array[j]);
+ if (j < (length - 1))
+ buffer.append(", ");
+ }
+ buffer.append(']');
+ return buffer.toString();
+ }
+
+ public static String toString(Object[] array) {
+ if (array == null)
+ return "null";
+ StringBuffer buffer = new StringBuffer();
+ buffer.append('[');
+ int length = array.length;
+ for (int j = 0; j < length; j++) {
+ buffer.append(String.valueOf(array[j]));
+ if (j < (length - 1))
+ buffer.append(", ");
+ }
+ buffer.append(']');
+ return buffer.toString();
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/BDJAction.java Added

@@ -0,0 +1,76 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan;
+
+public abstract class BDJAction {
+ public BDJAction() {
+ }
+
+ public int getState() {
+ synchronized (this) {
+ return state;
+ }
+ }
+
+ public void waitBegin() {
+ synchronized (this) {
+ while (state == NOT_PROCESSED) {
+ try {
+ this.wait();
+ } catch (InterruptedException e) {
+ }
+ }
+ }
+ }
+
+ public void waitEnd() {
+ synchronized (this) {
+ while (state != PROCESSED) {
+ try {
+ this.wait();
+ } catch (InterruptedException e) {
+ }
+ }
+ }
+ }
+
+ public void process() {
+ synchronized (this) {
+ state = PROCESSING;
+ this.notifyAll();
+ }
+ try {
+ doAction();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ synchronized (this) {
+ state = PROCESSED;
+ this.notifyAll();
+ }
+ }
+
+ protected abstract void doAction();
+
+ private int state = NOT_PROCESSED;
+
+ public static final int NOT_PROCESSED = 0;
+ public static final int PROCESSING = 1;
+ public static final int PROCESSED = 2;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/BDJActionManager.java Added

@@ -0,0 +1,49 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan;
+
+public class BDJActionManager {
+ public static BDJActionManager getInstance() {
+ synchronized (BDJActionManager.class) {
+ if (instance == null)
+ instance = new BDJActionManager();
+ }
+ return instance;
+ }
+
+ public BDJActionManager() {
+ commandQueue = new BDJActionQueue();
+ }
+
+ protected void finalize() throws Throwable {
+ commandQueue.finalize();
+ synchronized (BDJActionManager.class) {
+ instance = null;
+ }
+ super.finalize();
+ }
+
+ public void putCommand(BDJAction action) {
+ commandQueue.put(action);
+ }
+
+ private BDJActionQueue commandQueue;
+
+ private static BDJActionManager instance = null;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/BDJActionQueue.java Added

@@ -0,0 +1,77 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan;
+
+import java.util.LinkedList;
+
+class BDJActionQueue implements Runnable {
+ public BDJActionQueue() {
+ this(null);
+ }
+
+ public BDJActionQueue(BDJThreadGroup threadGroup) {
+ /* run all actions in given thread group / xlet context */
+ thread = new Thread(threadGroup, this);
+ thread.setDaemon(true);
+ thread.start();
+ }
+
+ protected void finalize() throws Throwable {
+ synchronized (actions) {
+ actions.addLast(null);
+ actions.notifyAll();
+ }
+ thread.join();
+ super.finalize();
+ }
+
+ public void run() {
+ while (true) {
+ Object action;
+ synchronized (actions) {
+ while (actions.isEmpty()) {
+ try {
+ actions.wait();
+ } catch (InterruptedException e) {
+ }
+ }
+ action = actions.removeFirst();
+ }
+ if (action == null)
+ return;
+ try {
+ ((BDJAction)action).process();
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ public void put(BDJAction action) {
+ if (action != null) {
+ synchronized (actions) {
+ actions.addLast(action);
+ actions.notifyAll();
+ }
+ }
+ }
+
+ private Thread thread;
+ private LinkedList actions = new LinkedList();
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/BDJAppProxy.java Added

@@ -0,0 +1,413 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan;
+
+import org.dvb.application.AppID;
+import org.dvb.application.AppStateChangeEvent;
+import org.dvb.application.AppStateChangeEventListener;
+import org.dvb.application.DVBJProxy;
+
+import java.awt.EventQueue;
+
+import java.io.File;
+import java.util.LinkedList;
+import javax.tv.xlet.Xlet;
+
+public class BDJAppProxy implements DVBJProxy, Runnable {
+ public BDJAppProxy(BDJXletContext context) {
+ this.context = context;
+ state = NOT_LOADED;
+ thread = new Thread(context.getThreadGroup(), this);
+ thread.setDaemon(true);
+ thread.start();
+
+ /* wait until thread has been started and event queue is initialized.
+ * We want event dispatcher thread to be inside xlet thread group
+ * -> event queue must be created from thread running inside applet thread group.
+ */
+ while (context.getEventQueue() == null) {
+ Thread.yield();
+ }
+ }
+
+ public int getState() {
+ return state;
+ }
+
+ public void load() {
+ AppCommand cmd = new AppCommand(AppCommand.CMD_LOAD, null);
+ synchronized(cmds) {
+ cmds.addLast(cmd);
+ cmds.notifyAll();
+ }
+ }
+
+ public void init() {
+ AppCommand cmd = new AppCommand(AppCommand.CMD_INIT, null);
+ synchronized(cmds) {
+ cmds.addLast(cmd);
+ cmds.notifyAll();
+ }
+ }
+
+ public void start() {
+ AppCommand cmd = new AppCommand(AppCommand.CMD_START, null);
+ synchronized(cmds) {
+ cmds.addLast(cmd);
+ cmds.notifyAll();
+ }
+ }
+
+ public void start(String[] args) {
+ AppCommand cmd = new AppCommand(AppCommand.CMD_START, args);
+ synchronized(cmds) {
+ cmds.addLast(cmd);
+ cmds.notifyAll();
+ }
+ }
+
+ public void stop(boolean force) {
+ AppCommand cmd = new AppCommand(AppCommand.CMD_STOP, new Boolean(force));
+ synchronized(cmds) {
+ cmds.addLast(cmd);
+ cmds.notifyAll();
+ }
+ }
+
+ public void pause() {
+ AppCommand cmd = new AppCommand(AppCommand.CMD_PAUSE, null);
+ synchronized(cmds) {
+ cmds.addLast(cmd);
+ cmds.notifyAll();
+ }
+ }
+
+ public void resume() {
+ AppCommand cmd = new AppCommand(AppCommand.CMD_RESUME, null);
+ synchronized(cmds) {
+ cmds.addLast(cmd);
+ cmds.notifyAll();
+ }
+ }
+
+ protected void notifyDestroyed() {
+ AppCommand cmd = new AppCommand(AppCommand.CMD_NOTIFY_DESTROYED, null);
+ synchronized(cmds) {
+ cmds.addLast(cmd);
+ cmds.notifyAll();
+ }
+ }
+
+ protected void notifyPaused() {
+ AppCommand cmd = new AppCommand(AppCommand.CMD_NOTIFY_PAUSED, null);
+ synchronized(cmds) {
+ cmds.addLast(cmd);
+ cmds.notifyAll();
+ }
+ }
+
+ protected void syncStop() {
+ AppCommand cmd = new AppCommand(AppCommand.CMD_STOP, new Boolean(true));
+ synchronized(cmds) {
+ cmds.addLast(cmd);
+ cmds.notifyAll();
+ }
+ cmd.waitDone();
+ }
+
+ protected void release() {
+ AppCommand cmd = new AppCommand(AppCommand.CMD_STOP, new Boolean(true));
+ synchronized(cmds) {
+ cmds.addLast(cmd);
+ cmds.addLast(null);
+ cmds.notifyAll();
+ }
+ try {
+ thread.join();
+ } catch (InterruptedException e) {
+
+ }
+
+ context.release();
+ }
+
+ public void addAppStateChangeEventListener(AppStateChangeEventListener listener) {
+ synchronized(listeners) {
+ listeners.add(listener);
+ }
+ }
+
+ public void removeAppStateChangeEventListener(AppStateChangeEventListener listener) {
+ synchronized(listeners) {
+ listeners.remove(listener);
+ }
+ }
+
+ private void notifyListeners(int fromState, int toState, boolean hasFailed) {
+ LinkedList list;
+ synchronized(listeners) {
+ list = (LinkedList)listeners.clone();
+ }
+
+ AppStateChangeEvent event = new AppStateChangeEvent(
+ (AppID)context.getXletProperty("org.dvb.application.appid"),
+ fromState, toState, this, hasFailed);
+ for (int i = 0; i < list.size(); i++)
+ ((AppStateChangeEventListener)listeners.get(i)).stateChange(event);
+ }
+
+ protected BDJXletContext getXletContext() {
+ return context;
+ }
+
+ private boolean doLoad() {
+ if (state == NOT_LOADED) {
+ try {
+ xlet = ((BDJClassLoader)context.getClassLoader()).loadXlet();
+ state = LOADED;
+ return true;
+ } catch (Throwable e) {
+ logger.error("doLoad() failed: " + e);
+ e.printStackTrace();
+ state = INVALID;
+ }
+ }
+ return false;
+ }
+
+ private boolean doInit() {
+ if ((state == NOT_LOADED) && !doLoad())
+ return false;
+ if (state == LOADED) {
+ try {
+ String persistent = System.getProperty("dvb.persistent.root") + File.separator +
+ (String)context.getXletProperty("dvb.org.id") + File.separator +
+ (String)context.getXletProperty("dvb.app.id");
+ new File(persistent).mkdirs();
+ xlet.initXlet(context);
+ state = PAUSED;
+ return true;
+ } catch (Throwable e) {
+ logger.error("doInit() failed: " + e);
+ e.printStackTrace();
+ state = INVALID;
+ }
+ }
+ return false;
+ }
+
+ private boolean doStart(String[] args) {
+ if (((state == NOT_LOADED) || (state == LOADED)) && !doInit())
+ return false;
+ if (state == PAUSED) {
+ try {
+ if (args != null)
+ context.setArgs(args);
+ xlet.startXlet();
+ state = STARTED;
+ return true;
+ } catch (Throwable e) {
+ logger.error("doStart() failed: " + e);
+ e.printStackTrace();
+ state = INVALID;
+ }
+ }
+ return false;
+ }
+
+ private boolean doStop(boolean force) {
+ if (state == INVALID)
+ return false;
+ if ((state != NOT_LOADED) && (state != LOADED)) {
+ try {
+ xlet.destroyXlet(force);
+
+ context.getThreadGroup().waitForShutdown(1000, 1 + context.numEventQueueThreads());
+
+ String persistent = System.getProperty("dvb.persistent.root") + File.separator +
+ (String)context.getXletProperty("dvb.org.id") + File.separator +
+ (String)context.getXletProperty("dvb.app.id");
+ if (new File(persistent).delete()) {
+ persistent = System.getProperty("dvb.persistent.root") + File.separator +
+ (String)context.getXletProperty("dvb.org.id");
+ new File(persistent).delete();
+ }
+ } catch (Throwable e) {
+ logger.error("doStop() failed: " + e);
+ e.printStackTrace();
+ state = INVALID;
+ return false;
+ }
+ }
+ xlet = null;
+ state = DESTROYED;
+ return true;
+ }
+
+ private boolean doPause() {
+ if (state == STARTED) {
+ try {
+ xlet.pauseXlet();
+ state = PAUSED;
+ return true;
+ } catch (Throwable e) {
+ logger.error("doPause() failed: " + e);
+ e.printStackTrace();
+ state = INVALID;
+ }
+ }
+ return false;
+ }
+
+ private boolean doResume() {
+ if (state == PAUSED) {
+ try {
+ xlet.startXlet();
+ state = STARTED;
+ return true;
+ } catch (Throwable e) {
+ logger.error("doResume() failed: " + e);
+ e.printStackTrace();
+ state = INVALID;
+ }
+ }
+ return false;
+ }
+
+ public void run() {
+ context.setEventQueue(new EventQueue());
+
+ for (;;) {
+ AppCommand cmd;
+ synchronized(cmds) {
+ while (cmds.isEmpty()) {
+ try {
+ cmds.wait();
+ } catch (InterruptedException e) {
+
+ }
+ }
+ cmd = (AppCommand)cmds.removeFirst();
+ }
+ if (cmd == null)
+ return;
+ int fromState = state;
+ int toState;
+ boolean ret;
+ switch (cmd.getCommand()) {
+ case AppCommand.CMD_LOAD:
+ toState = LOADED;
+ ret = doLoad();
+ break;
+ case AppCommand.CMD_INIT:
+ toState = PAUSED;
+ ret = doInit();
+ break;
+ case AppCommand.CMD_START:
+ toState = STARTED;
+ Object args = cmd.getArgument();
+ ret = doStart(args == null ? null : (String[])args);
+ break;
+ case AppCommand.CMD_STOP:
+ toState = DESTROYED;
+ ret = doStop(((Boolean)cmd.getArgument()).booleanValue());
+ break;
+ case AppCommand.CMD_PAUSE:
+ toState = PAUSED;
+ ret = doPause();
+ break;
+ case AppCommand.CMD_RESUME:
+ toState = STARTED;
+ ret = doResume();
+ break;
+ case AppCommand.CMD_NOTIFY_DESTROYED:
+ toState = DESTROYED;
+ state = DESTROYED;
+ ret = true;
+ break;
+ case AppCommand.CMD_NOTIFY_PAUSED:
+ toState = PAUSED;
+ state = PAUSED;
+ ret = true;
+ break;
+ default:
+ return;
+ }
+ notifyListeners(fromState, toState, !ret);
+ cmd.release();
+ if (state == DESTROYED)
+ state = NOT_LOADED;
+ }
+ }
+
+ private BDJXletContext context;
+ private Xlet xlet;
+ private int state;
+ private LinkedList listeners = new LinkedList();
+ private LinkedList cmds = new LinkedList();
+ private Thread thread;
+ private static final Logger logger = Logger.getLogger(BDJAppProxy.class.getName());
+
+ private class AppCommand {
+ public AppCommand(int cmd, Object arg) {
+ this.cmd = cmd;
+ this.arg = arg;
+ }
+
+ public int getCommand() {
+ return cmd;
+ }
+
+ public Object getArgument() {
+ return arg;
+ }
+
+ public void waitDone() {
+ synchronized(this) {
+ while (!done) {
+ try {
+ this.wait();
+ } catch (InterruptedException e) {
+
+ }
+ }
+ }
+ }
+
+ public void release() {
+ synchronized(this) {
+ done = true;
+ this.notifyAll();
+ }
+ }
+
+ public static final int CMD_LOAD = 0;
+ public static final int CMD_INIT = 1;
+ public static final int CMD_START = 2;
+ public static final int CMD_STOP = 3;
+ public static final int CMD_PAUSE = 4;
+ public static final int CMD_RESUME = 5;
+ public static final int CMD_NOTIFY_DESTROYED = 6;
+ public static final int CMD_NOTIFY_PAUSED = 7;
+
+ private int cmd;
+ private Object arg;
+ private boolean done = false;
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/BDJAppsDatabase.java Added

@@ -0,0 +1,110 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan;
+
+import java.util.Enumeration;
+import java.util.Vector;
+
+import org.dvb.application.AppAttributes;
+import org.dvb.application.AppID;
+import org.dvb.application.AppProxy;
+import org.dvb.application.AppsDatabase;
+import org.dvb.application.AppsDatabaseEvent;
+import org.dvb.application.AppsDatabaseFilter;
+import org.videolan.bdjo.AppEntry;
+import org.videolan.bdjo.Bdjo;
+
+public class BDJAppsDatabase extends AppsDatabase {
+ static public AppsDatabase getAppsDatabase() {
+ synchronized (BDJAppsDatabase.class) {
+ if (instance == null)
+ instance = new BDJAppsDatabase();
+ }
+ return instance;
+ }
+
+ public int size() {
+ synchronized (this) {
+ if (appTable == null)
+ return 0;
+ return appTable.length;
+ }
+ }
+
+ public Enumeration getAppIDs(AppsDatabaseFilter filter) {
+ Vector ids = new Vector();
+ synchronized (this) {
+ if (appTable != null)
+ for (int i = 0; i < appTable.length; i++)
+ if (filter.accept(appTable[i].getIdentifier()))
+ ids.add(appTable[i].getIdentifier());
+ }
+ return ids.elements();
+ }
+
+ public Enumeration getAppAttributes(AppsDatabaseFilter filter) {
+ Vector attributes = new Vector();
+ synchronized (this) {
+ if (appTable != null)
+ for (int i = 0; i < size(); i++)
+ if (filter.accept(appTable[i].getIdentifier()))
+ attributes.add(appTable[i]);
+ }
+ return attributes.elements();
+ }
+
+ public AppAttributes getAppAttributes(AppID key) {
+ synchronized (this) {
+ if (appTable != null)
+ for (int i = 0; i < size(); i++)
+ if (key.equals(appTable[i].getIdentifier()))
+ return appTable[i];
+ }
+ return null;
+ }
+
+ public AppProxy getAppProxy(AppID key) {
+ synchronized (this) {
+ if ((appTable != null) && (appProxys != null))
+ for (int i = 0; i < size(); i++)
+ if (key.equals(appTable[i].getIdentifier()))
+ return appProxys[i];
+ }
+ return null;
+ }
+
+ public Bdjo getBdjo() {
+ return bdjo;
+ }
+
+ protected void newDatabase(Bdjo bdjo, BDJAppProxy[] appProxys) {
+ synchronized (this) {
+ this.bdjo = bdjo;
+ this.appProxys = appProxys;
+ this.appTable = (bdjo != null) ? bdjo.getAppTable() : null;
+ }
+ notifyListeners(AppsDatabaseEvent.NEW_DATABASE, null);
+ }
+
+ private Bdjo bdjo = null;
+ private BDJAppProxy[] appProxys = null;
+ private AppEntry[] appTable = null;
+
+ protected static BDJAppsDatabase instance = null;
+}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/BDJClassLoader.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/BDJClassLoader.java Changed

@@ -22,46 +22,93 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.ArrayList;
+
+import javax.tv.xlet.Xlet;
 
 import org.videolan.bdjo.AppCache;
-import org.videolan.bdjo.AppCacheType;
 
 public class BDJClassLoader extends URLClassLoader {
- public BDJClassLoader(String baseDir)
- {
- super(new URL[0]);
- 
- this.baseDir = baseDir;
- }
- 
- public void setBaseDir(String baseDir)
- {
- this.baseDir = baseDir;
- }
- 
- public String getBaseDir()
- {
- return baseDir;
+ public static BDJClassLoader newInstance(AppCache[] appCaches, String basePath, String classPathExt, String xletClass) {
+ ArrayList classPath = new ArrayList();
+ URL url = translateClassPath(appCaches, basePath, null);
+ if (url != null)
+ classPath.add(url);
+ String[] classPaths = StrUtil.split(classPathExt, ';');
+ for (int i = 0; i < classPaths.length; i++) {
+ url = translateClassPath(appCaches, basePath, classPaths[i]);
+ if ((url != null) && (classPath.indexOf(url) < 0))
+ classPath.add(url);
+ }
+ return new BDJClassLoader((URL[])classPath.toArray(new URL[classPath.size()]) , xletClass);
 }
 
- public void addAppCache(AppCache cache)
- {
- String url = "file:";
- url += baseDir + "/BDMV/JAR/";
- url += cache.getRefToName();
- if (cache.getType().equals(AppCacheType.JAR_FILE))
- url += ".jar";
- else if (cache.getType().equals(AppCacheType.DIRECTORY))
- url += "/";
- 
- System.out.println(url);
-
+ private static URL translateClassPath(AppCache[] appCaches, String basePath, String classPath) {
+ String path;
+ if ((classPath == null) || (classPath.length() <= 0))
+ path = basePath;
+ else if (classPath.charAt(0) == '/')
+ path = classPath.substring(1);
+ else
+ path = basePath + "/" + classPath;
+ if (path.length() < 5)
+ return null;
+ String protocol = null;
+ String url = path.substring(0, 5);
+ for (int i = 0; i < appCaches.length; i++) {
+ if (appCaches[i].getRefToName().equals(url)) {
+ if (appCaches[i].getType() == AppCache.JAR_FILE) {
+ protocol = "file:";
+ url = url + ".jar";
+ } else if (appCaches[i].getType() == AppCache.DIRECTORY) {
+ protocol = "file:/";
+ }
+ break;
+ }
+ }
+ if (protocol == null)
+ return null;
+ url = protocol +
+ System.getProperty("bluray.vfs.root") +
+ "/BDMV/JAR/" + url + path.substring(5);
+ //if (!url.endsWith("/"))
+ // url += "/";
 try {
- addURL(new URL(url));
+ return new URL(url);
 } catch (MalformedURLException e) {
 e.printStackTrace();
+ return null;
+ }
+ }
+
+ private BDJClassLoader(URL[] urls, String xletClass) {
+ super(urls);
+ this.xletClass = xletClass;
+ }
+
+ protected Xlet loadXlet() throws ClassNotFoundException,
+ IllegalAccessException, InstantiationException {
+ return (Xlet)loadClass(xletClass).newInstance();
+ }
+
+ protected void update(AppCache[] appCaches, String basePath, String classPathExt, String xletClass) {
+ ArrayList classPath = new ArrayList();
+ URL[] urls = getURLs();
+ for (int i = 0; i < urls.length; i++)
+ classPath.add(urls[i]);
+ URL url = translateClassPath(appCaches, basePath, null);
+ if (url != null)
+ classPath.add(url);
+ String[] classPaths = StrUtil.split(classPathExt, ';');
+ for (int i = 0; i < classPaths.length; i++) {
+ url = translateClassPath(appCaches, basePath, classPaths[i]);
+ if ((url != null) && (classPath.indexOf(url) < 0))
+ classPath.add(url);
 }
+ for (int i = 0; i < classPath.size(); i++)
+ addURL((URL)classPath.get(i));
+ this.xletClass = xletClass;
 }
 
- private String baseDir = "";
+ private String xletClass;
 }

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/BDJListeners.java Added

@@ -0,0 +1,155 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 VideoLAN
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+package org.videolan;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+
+import javax.media.ControllerEvent;
+import javax.media.ControllerListener;
+
+import javax.tv.service.selection.ServiceContextEvent;
+import javax.tv.service.selection.ServiceContextListener;
+
+import org.bluray.bdplus.StatusListener;
+
+import org.bluray.media.AngleChangeEvent;
+import org.bluray.media.AngleChangeListener;
+import org.bluray.media.PiPStatusEvent;
+import org.bluray.media.PiPStatusListener;
+import org.bluray.media.PlaybackListener;
+import org.bluray.media.PlaybackMarkEvent;
+import org.bluray.media.PlaybackPlayItemEvent;
+import org.bluray.media.UOMaskTableListener;
+import org.bluray.media.UOMaskTableChangedEvent;
+import org.bluray.media.UOMaskedEvent;
+
+import org.dvb.media.SubtitleListener;
+import java.util.EventObject;
+
+
+public class BDJListeners {
+ private LinkedList listeners = new LinkedList();
+
+ public void add(Object listener) {
+ if (listener != null) {
+ BDJXletContext ctx = BDJXletContext.getCurrentContext();
+ if (ctx == null) {
+ logger.error("Listener added from wrong thread: " + Logger.dumpStack());
+ return;
+ }
+ synchronized (listeners) {
+ remove(listener);
+ listeners.add(new BDJListener(ctx, listener));
+ }
+ }
+ }
+
+ public void remove(Object listener) {
+ synchronized (listeners) {
+ for (Iterator it = listeners.iterator(); it.hasNext(); ) {
+ BDJListener item = (BDJListener)it.next();
+ if (item.listener == listener)
+ it.remove();
+ }
+ }
+ }
+
+ public void putCallback(Object event) {
+ synchronized (listeners) {
+ for (Iterator it = listeners.iterator(); it.hasNext(); ) {
+ BDJListener item = (BDJListener)it.next();
+ if (item.ctx == null) {
+ logger.error("Listener callback: no context: " + item.listener);
+ it.remove();
+ } else if (item.ctx.isDestroyed()) {
+ logger.error("Listener terminated: " + item.ctx);
+ it.remove();
+ } else {
+ item.ctx.putCallback(new Callback(event, item.listener));
+ }
+ }
+ }
+ }
+
+ private class PSR102Status {
+ private PSR102Status(int value) {
+ this.value = value;
+ }
+ public int value;
+ }
+
+ public void putPSR102Callback(int value) {
+ putCallback(new PSR102Status(value));
+ }
+
+ private class BDJListener {
+ public BDJXletContext ctx;
+ public Object listener;
+
+ BDJListener(BDJXletContext ctx, Object listener) {
+ this.ctx = ctx;
+ this.listener = listener;
+ }
+ }
+
+ private class Callback extends BDJAction {
+ private Callback(Object event, Object listener) {
+ this.event = event;
+ this.listener = listener;
+ }
+
+ protected void doAction() {
+ if (event instanceof PlaybackMarkEvent) {
+ ((PlaybackListener)listener).markReached((PlaybackMarkEvent)event);
+ } else if (event instanceof PlaybackPlayItemEvent) {
+ ((PlaybackListener)listener).playItemReached((PlaybackPlayItemEvent)event);
+ } else if (event instanceof ServiceContextEvent) {
+ ((ServiceContextListener)listener).receiveServiceContextEvent((ServiceContextEvent)event);
+ } else if (event instanceof UOMaskTableChangedEvent) {
+ ((UOMaskTableListener)listener).receiveUOMaskTableChangedEvent((UOMaskTableChangedEvent)event);
+ } else if (event instanceof UOMaskedEvent) {
+ ((UOMaskTableListener)listener).receiveUOMaskedEvent((UOMaskedEvent)event);
+ } else if (event instanceof PiPStatusEvent) {
+ ((PiPStatusListener)listener).piPStatusChange((PiPStatusEvent)event);
+ } else if (event instanceof AngleChangeEvent) {
+ ((AngleChangeListener)listener).angleChange((AngleChangeEvent)event);
+
+ } else if (event instanceof ControllerEvent) {
+ ((ControllerListener)listener).controllerUpdate((ControllerEvent)event);
+
+ /* need to use wrapper if some other callback uses EventObject */
+ } else if (event instanceof EventObject &&
+ listener instanceof SubtitleListener) {
+ ((SubtitleListener)listener).subtitleStatusChanged((EventObject)event);
+
+ } else if (event instanceof PSR102Status) {
+ ((StatusListener)listener).receive(((PSR102Status)event).value);
+
+ } else {
+ System.err.println("Unknown event type: " + event.getClass().getName());
+ }
+ }
+
+ private Object listener;
+ private Object event;
+ }
+
+ private static final Logger logger = Logger.getLogger(BDJListeners.class.getName());
+}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/BDJLoader.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/BDJLoader.java Changed

@@ -19,154 +19,240 @@
 
 package org.videolan;
 
-import java.util.Vector;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.io.InvalidObjectException;
+import java.util.Enumeration;
+import org.videolan.Logger;
 
-import javax.media.PackageManager;
-import javax.tv.xlet.Xlet;
-import javax.tv.xlet.XletContext;
-import javax.tv.xlet.XletStateChangeException;
+import org.bluray.net.BDLocator;
+import org.bluray.ti.TitleImpl;
+import org.davic.media.MediaLocator;
+import org.dvb.application.AppID;
+import org.dvb.application.AppsDatabase;
+import org.dvb.application.CurrentServiceFilter;
+
+import javax.media.Manager;
+import javax.tv.locator.Locator;
+import javax.tv.service.SIManager;
 
-import org.videolan.bdjo.AppCache;
 import org.videolan.bdjo.AppEntry;
 import org.videolan.bdjo.Bdjo;
-import org.videolan.bdjo.ControlCode;
 import org.videolan.bdjo.GraphicsResolution;
+import org.videolan.bdjo.PlayListTable;
+import org.videolan.bdjo.TerminalInfo;
 
 public class BDJLoader {
- public static void Load(String baseDir, Bdjo bdjo, long nativePointer)
- {
- try { 
- System.loadLibrary("bluray"); // load libbluray.so
- 
- Libbluray.nativePointer = nativePointer;
- BDJLoader.baseDir = baseDir;
- BDJLoader.bdjo = bdjo;
- 
- System.setProperty("bluray.vfs.root", baseDir);
- 
- BDJClassLoader classLoader = new BDJClassLoader(baseDir);
- 
- // setup JMF prefixes
- Vector<String> prefix = new Vector<String>();
- prefix.add("org.videolan");
- PackageManager.setContentPrefixList(prefix);
- PackageManager.setProtocolPrefixList(prefix);
- PackageManager.commitContentPrefixList();
- PackageManager.commitProtocolPrefixList();
- 
- // add app caches (the locations where classes are stored)
- for (AppCache cache : bdjo.getAppCaches())
- classLoader.addAppCache(cache);
- 
- // start test window
- GUIManager gui = GUIManager.getInstance();
- GraphicsResolution res = bdjo.getTerminalInfo().getResolution();
- gui.setSize(res.getWidth(), res.getHeight());
- gui.setVisible(true);
- 
- // now load and initialize all the xlets
- AppEntry[] appTable = bdjo.getAppTable();
- xlet = new Xlet[appTable.length];
- for (int i = 0; i < appTable.length; i++) {
- AppEntry entry = appTable[i];
- Class<?> xlet_class = classLoader.loadClass(entry.getInitialClass());
- logger.log(Level.INFO, "Loaded class: " + entry.getInitialClass());
- 
- xlet[i] = (Xlet)xlet_class.newInstance();
- 
- // make context for xlet
- BasicXletContext context = new BasicXletContext(entry);
- 
- Thread thread = new Thread(new BDJThreadGroup("", context), 
- new XletStarter(xlet[i], entry.getControlCode().equals(ControlCode.AUTOSTART)));
- thread.start();
- thread.join();
- }
- 
- logger.log(Level.INFO, "Finished initializing and starting xlets.");
+ public static boolean load(int title) {
+ return load(title, true, null);
+ }
 
+ public static boolean load(int title, boolean restart, BDJLoaderCallback callback) {
+ try {
+ BDLocator locator = new BDLocator(null, title, -1);
+ return load((TitleImpl)(SIManager.createInstance().getService(locator)), restart, callback);
 } catch (Throwable e) {
- logger.log(Level.SEVERE, "Failed to start xlet");
+ logger.error("load() failed: " + e);
 e.printStackTrace();
+ return false;
 }
 }
 
- public static void Shutdown()
- {
+ public static boolean load(Locator locator, boolean restart, BDJLoaderCallback callback) {
 try {
- if (xlet != null) {
- for (int i = 0; i < xlet.length; i++){
- xlet[i].destroyXlet(true);
- xlet[i] = null;
- }
- }
- 
- MountManager.unmountAll();
- } catch (Exception e) {
+ return load((TitleImpl)(SIManager.createInstance().getService(locator)), restart, callback);
+ } catch (Throwable e) {
+ logger.error("load() failed: " + e);
 e.printStackTrace();
+ return false;
 }
 }
- 
- protected static String getBaseDir()
- {
- return baseDir;
- }
- 
- public static void SendKeyEvent(int type, int keyCode)
- {
- if (inputListener != null) {
- inputListener.receiveKeyEvent(type, keyCode);
- } else {
- logger.warning("Tried to send key event before listener set.");
+
+ public static boolean load(TitleImpl title, boolean restart, BDJLoaderCallback callback) {
+ if (title == null)
+ return false;
+ synchronized (BDJLoader.class) {
+ if (queue == null)
+ queue = new BDJActionQueue();
 }
+ queue.put(new BDJLoaderAction(title, restart, callback));
+ return true;
 }
- 
- public static XletContext getContext()
- {
- BDJThreadGroup grp = (BDJThreadGroup)Thread.currentThread().getThreadGroup();
- return grp.getContext();
+
+ public static boolean unload() {
+ return unload(null);
 }
- 
- public static Bdjo getBdjo()
- {
- return bdjo;
+
+ public static boolean unload(BDJLoaderCallback callback) {
+ synchronized (BDJLoader.class) {
+ if (queue == null)
+ queue = new BDJActionQueue();
+ }
+ queue.put(new BDJLoaderAction(null, false, callback));
+ return true;
 }
- 
- public static BDJInputListener inputListener = null;
- 
- private static Xlet[] xlet = null;
- private static Bdjo bdjo = null;
- private static String baseDir = "";
- private static final Logger logger = Logger.getLogger(BDJLoader.class.getName());
 
- private static class XletStarter implements Runnable {
- public XletStarter(Xlet xlet, boolean autostart)
- {
- this.xlet = xlet;
- this.autostart = autostart;
+ public static void shutdown() {
+ unload();
+ try {
+ queue.finalize();
+ } catch (Throwable e) {
+ logger.error("shutdown() failed: " + e);
+ e.printStackTrace();
 }
- 
- public void run()
- {
- try {
- XletContext context = getContext();
- logger.log(Level.INFO, "Attempting to init a xlet");
- 
- xlet.initXlet(context);
- 
- if (autostart) {
- logger.log(Level.INFO, "Autostart requested, now starting xlet.");
- xlet.startXlet();
+ }
+
+ private static boolean loadN(TitleImpl title, boolean restart) {
+ TitleInfo ti = title.getTitleInfo();
+ if (!ti.isBdj()) {
+ logger.info("Not BD-J title - requesting HDMV title start");
+ unloadN();
+ return Libbluray.selectTitle(title);
+ }
+
+ try {
+ // load bdjo
+ Bdjo bdjo = Libbluray.getBdjo(ti.getBdjoName());
+ if (bdjo == null)
+ throw new InvalidObjectException("bdjo not loaded");
+ AppEntry[] appTable = bdjo.getAppTable();
+
+ // reuse appProxys
+ BDJAppProxy[] proxys = new BDJAppProxy[appTable.length];
+ AppsDatabase db = AppsDatabase.getAppsDatabase();
+ Enumeration ids = db.getAppIDs(new CurrentServiceFilter());
+ while (ids.hasMoreElements()) {
+ AppID id = (AppID)ids.nextElement();
+ BDJAppProxy proxy = (BDJAppProxy)db.getAppProxy(id);
+ AppEntry entry = (AppEntry)db.getAppAttributes(id);
+ for (int i = 0; i < appTable.length; i++) {
+ if (id.equals(appTable[i].getIdentifier()) &&
+ entry.getInitialClass().equals(appTable[i].getInitialClass())) {
+ if (restart && appTable[i].getIsServiceBound())
+ proxy.stop(true);
+ proxy.getXletContext().update(appTable[i], bdjo.getAppCaches());
+ proxys[i] = proxy;
+ proxy = null;
+ break;
+ }
+ }
+ if (proxy != null)
+ proxy.release();
+ }
+
+ // start bdj window
+ GUIManager gui = GUIManager.createInstance();
+ TerminalInfo terminfo = bdjo.getTerminalInfo();
+ GraphicsResolution res = terminfo.getResolution();
+ gui.setResizable(true);
+ gui.setSize(res.getWidth(), res.getHeight());
+ gui.setVisible(true);
+
+ Libbluray.setUOMask(terminfo.getMenuCallMask(), terminfo.getTitleSearchMask());
+
+ // initialize appProxys
+ for (int i = 0; i < appTable.length; i++) {
+ if (proxys[i] == null) {
+ proxys[i] = new BDJAppProxy(
+ new BDJXletContext(
+ appTable[i],
+ bdjo.getAppCaches(),
+ gui));
+ }
+
+ /* log startup calss, startup parameters and jar file */
+ String[] params = appTable[i].getParams();
+ String p = "";
+ if (params != null && params.length > 0) {
+ p = "(" + StrUtil.Join(params, ",") + ")";
+ }
+ logger.info("Loaded class: " + appTable[i].getInitialClass() + p + " from " + appTable[i].getBasePath() + ".jar");
+ }
+
+ // change psr
+ Libbluray.writePSR(Libbluray.PSR_TITLE_NUMBER, title.getTitleNum());
+
+ // notify AppsDatabase
+ ((BDJAppsDatabase)BDJAppsDatabase.getAppsDatabase()).newDatabase(bdjo, proxys);
+
+ // now run all the xlets
+ for (int i = 0; i < appTable.length; i++) {
+ int code = appTable[i].getControlCode();
+ if (code == AppEntry.AUTOSTART) {
+ logger.info("Autostart xlet " + i + ": " + appTable[i].getInitialClass());
+ proxys[i].start();
+ } else if (code == AppEntry.PRESENT) {
+ logger.info("Init xlet " + i + ": " + appTable[i].getInitialClass());
+ proxys[i].init();
+ } else {
+ logger.info("Unsupported xlet code (" +code+") xlet " + i + ": " + appTable[i].getInitialClass());
 }
- } catch (XletStateChangeException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
 }
+
+ logger.info("Finished initializing and starting xlets.");
+
+ // auto start playlist
+ PlayListTable plt = bdjo.getAccessiblePlaylists();
+ if ((plt != null) && (plt.isAutostartFirst())) {
+ logger.info("Auto-starting playlist");
+ String[] pl = plt.getPlayLists();
+ if (pl.length > 0)
+ Manager.createPlayer(new MediaLocator(new BDLocator("bd://PLAYLIST:" + pl[0]))).start();
+ }
+
+ return true;
+
+ } catch (Throwable e) {
+ logger.error("loadN() failed: " + e);
+ e.printStackTrace();
+ unloadN();
+ return false;
+ }
+ }
+
+ private static boolean unloadN() {
+ try {
+ AppsDatabase db = AppsDatabase.getAppsDatabase();
+ Enumeration ids = db.getAppIDs(new CurrentServiceFilter());
+ while (ids.hasMoreElements()) {
+ AppID id = (AppID)ids.nextElement();
+ BDJAppProxy proxy = (BDJAppProxy)db.getAppProxy(id);
+ proxy.release();
+ }
+ ((BDJAppsDatabase)db).newDatabase(null, null);
+
+ //GUIManager.shutdown() does not work with J2ME (window can't be opened again)
+ GUIManager.getInstance().setVisible(false);
+
+ return true;
+ } catch (Throwable e) {
+ logger.error("unloadN() failed: " + e);
+ e.printStackTrace();
+ return false;
 }
- 
- private Xlet xlet;
- private boolean autostart;
 }
+
+ private static class BDJLoaderAction extends BDJAction {
+ public BDJLoaderAction(TitleImpl title, boolean restart, BDJLoaderCallback callback) {
+ this.title = title;
+ this.restart = restart;
+ this.callback = callback;
+ }
+
+ protected void doAction() {
+ boolean succeed;
+ if (title != null)
+ succeed = loadN(title, restart);
+ else
+ succeed = unloadN();
+ if (callback != null)
+ callback.loaderDone(succeed);
+ }
+
+ private TitleImpl title;
+ private boolean restart;
+ private BDJLoaderCallback callback;
+ }
+
+ private static final Logger logger = Logger.getLogger(BDJLoader.class.getName());
+
+ private static BDJActionQueue queue = null;
 }

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/BDJLoaderCallback.java Added

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/BDJThreadGroup.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/BDJThreadGroup.java Changed

@@ -1,19 +1,92 @@
-package org.videolan;
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2010 William Hahne
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
 
-import javax.tv.xlet.XletContext;
+package org.videolan;
 
 public class BDJThreadGroup extends ThreadGroup {
 
- public BDJThreadGroup(String name, XletContext context)
- {
+ public BDJThreadGroup(String name, BDJXletContext context) {
 super(name);
 this.context = context;
 }
 
- public XletContext getContext()
- {
+ public BDJXletContext getContext() {
 return context;
 }
- 
- private XletContext context;
+
+ public void setContext(BDJXletContext context) {
+ this.context = context;
+ }
+
+ public boolean waitForShutdown(int maxThreads, int timeout) {
+ long startTime = System.currentTimeMillis();
+ long endTime = startTime + 1000;
+ while ((activeCount() > maxThreads) &&
+ (System.currentTimeMillis() < endTime)) {
+ try {
+ Thread.sleep(10);
+ } catch (InterruptedException e) { }
+ }
+
+ boolean result = (activeCount() <= maxThreads);
+ if (!result) {
+ logger.error("waitForShutdown timeout");
+ }
+ return result;
+ }
+
+ protected void stopAll(int timeout) {
+
+ interrupt();
+ waitForShutdown(0, timeout);
+
+ if (activeCount() > 0) {
+ logger.error("stopAll(): killing threads");
+ dumpThreads();
+
+ PortingHelper.stopThreadGroup(this);
+ waitForShutdown(0, 500);
+ }
+
+ try {
+ destroy();
+ } catch (IllegalThreadStateException e) {
+ logger.error("ThreadGroup destroy failed: " + e);
+ }
+
+ context = null;
+ }
+
+ public void dumpThreads() {
+ logger.info("Active threads in " + this + ":");
+ Thread[] threads = new Thread[activeCount() + 1];
+ while (enumerate( threads, true ) == threads.length) {
+ threads = new Thread[threads.length * 2];
+ }
+ for (int i = 0; i < threads.length; i++) {
+ if (threads[i] == null)
+ continue;
+ logger.info(" " + threads[i]);
+ }
+ }
+
+ private BDJXletContext context;
+ private static final Logger logger = Logger.getLogger(BDJThreadGroup.class.getName());
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/BDJUtil.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/BDJUtil.java Changed

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/BDJXletContext.java Added

@@ -0,0 +1,273 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2010 William Hahne
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+package org.videolan;
+
+import java.awt.Container;
+import java.awt.EventQueue;
+import java.util.LinkedList;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+import javax.microedition.xlet.UnavailableContainerException;
+
+import org.bluray.ui.FrameAccurateAnimation;
+import org.dvb.application.AppID;
+import org.dvb.application.AppProxy;
+import org.dvb.application.AppsDatabase;
+import org.havi.ui.HSceneFactory;
+import org.videolan.bdjo.AppCache;
+import org.videolan.bdjo.AppEntry;
+
+public class BDJXletContext implements javax.tv.xlet.XletContext, javax.microedition.xlet.XletContext {
+ public BDJXletContext(AppEntry entry, AppCache[] caches, Container container) {
+ this.appid = entry.getIdentifier();
+ this.args = entry.getParams();
+ this.loader = BDJClassLoader.newInstance(
+ caches,
+ entry.getBasePath(),
+ entry.getClassPathExt(),
+ entry.getInitialClass());
+ this.container = container;
+
+ this.threadGroup = new BDJThreadGroup(Integer.toHexString(appid.getOID()) + "." +
+ Integer.toHexString(appid.getAID()) + "." +
+ entry.getInitialClass(),
+ this);
+
+ callbackQueue = new BDJActionQueue(this.threadGroup);
+ }
+
+ public Object getXletProperty(String key) {
+ if (key.equals(javax.tv.xlet.XletContext.ARGS) ||
+ key.equals(javax.microedition.xlet.XletContext.ARGS))
+ return args;
+ else if (key.equals("dvb.org.id"))
+ return Integer.toHexString(appid.getOID());
+ else if (key.equals("dvb.app.id"))
+ return Integer.toHexString(appid.getAID());
+ else if (key.equals("org.dvb.application.appid"))
+ return appid;
+ return null;
+ }
+
+ public void notifyDestroyed() {
+ AppProxy proxy = AppsDatabase.getAppsDatabase().getAppProxy(appid);
+ if (proxy instanceof BDJAppProxy)
+ ((BDJAppProxy)proxy).notifyDestroyed();
+ }
+
+ public void notifyPaused() {
+ AppProxy proxy = AppsDatabase.getAppsDatabase().getAppProxy(appid);
+ if (proxy instanceof BDJAppProxy)
+ ((BDJAppProxy)proxy).notifyPaused();
+ }
+
+ public void resumeRequest() {
+ AppProxy proxy = AppsDatabase.getAppsDatabase().getAppProxy(appid);
+ if (proxy instanceof BDJAppProxy)
+ ((BDJAppProxy)proxy).resume();
+ }
+
+ public Container getContainer() throws UnavailableContainerException {
+ if (container == null) {
+ logger.error("getContainer(): container is null");
+ throw new UnavailableContainerException();
+ }
+ return container;
+ }
+
+ public ClassLoader getClassLoader() {
+ return loader;
+ }
+
+ protected AppProxy getAppProxy() {
+ return AppsDatabase.getAppsDatabase().getAppProxy(appid);
+ }
+
+ public boolean isDestroyed() {
+ return AppsDatabase.getAppsDatabase().getAppProxy(appid).getState() == AppProxy.DESTROYED;
+ }
+
+ public BDJThreadGroup getThreadGroup() {
+ return threadGroup;
+ }
+
+ protected void setEventQueue(EventQueue eq) {
+ eventQueue = eq;
+ }
+
+ public EventQueue getEventQueue() {
+ return eventQueue;
+ }
+
+ public boolean putCallback(BDJAction cb)
+ {
+ if (!isDestroyed()) {
+ callbackQueue.put(cb);
+ return true;
+ }
+ return false;
+ }
+
+ protected int numEventQueueThreads() {
+ int cnt = 0;
+ if (eventQueue != null) {
+ Thread t = java.awt.BDJHelper.getEventDispatchThread(eventQueue);
+ if (t != null && t.isAlive()) {
+ cnt++;
+ }
+ }
+ return cnt;
+ }
+
+ public void setSceneFactory(HSceneFactory f) {
+ sceneFactory = f;
+ }
+
+ public HSceneFactory getSceneFactory() {
+ return sceneFactory;
+ }
+
+ protected void addIxcThread(Thread thread) {
+ synchronized (ixcThreads) {
+ ixcThreads.addLast(thread);
+ }
+ }
+ protected void removeIxcThread(Thread thread) {
+ synchronized (ixcThreads) {
+ ixcThreads.remove(thread);
+ }
+ }
+ protected void stopIxcThreads() {
+ synchronized (ixcThreads) {
+ while (!ixcThreads.isEmpty()) {
+ Thread thread = (Thread)ixcThreads.removeFirst();
+ logger.info("Stopping remote thread " + thread);
+ thread.interrupt();
+ try {
+ thread.join(500);
+ } catch (Throwable t) {
+ }
+ if (thread.isAlive()) {
+ PortingHelper.stopThread(thread);
+ }
+ if (thread.isAlive()) {
+ logger.error("Error stopping remote thread " + thread);
+ }
+ }
+ }
+ }
+
+ public void addFAA(FrameAccurateAnimation faa) {
+ synchronized (faaList) {
+ faaList.add(faa);
+ }
+ }
+
+ public void removeFAA(FrameAccurateAnimation faa) {
+ synchronized (faaList) {
+ faaList.remove(faa);
+ }
+ }
+
+ public void removeAllFAA() {
+ Object[] faaArray;
+ synchronized (faaList) {
+ faaArray = faaList.toArray();
+ }
+ for (int i = 0; i < faaArray.length; i++) {
+ FrameAccurateAnimation faa = (FrameAccurateAnimation)faaArray[i];
+ faa.destroy();
+ }
+ }
+
+ public static BDJXletContext getCurrentContext() {
+ Object obj = AccessController.doPrivileged(
+ new PrivilegedAction() {
+ public Object run() {
+ ThreadGroup group = Thread.currentThread().getThreadGroup();
+ while ((group != null) && !(group instanceof BDJThreadGroup))
+ group = group.getParent();
+ return group;
+ }
+ }
+ );
+ if (obj == null)
+ return null;
+ return ((BDJThreadGroup)obj).getContext();
+ }
+
+ protected void setArgs(String[] args) {
+ this.args = args;
+ }
+
+ protected void update(AppEntry entry, AppCache[] caches) {
+ args = entry.getParams();
+ loader.update(
+ caches,
+ entry.getBasePath(),
+ entry.getClassPathExt(),
+ entry.getInitialClass());
+ }
+
+ protected void release() {
+
+ removeAllFAA();
+ stopIxcThreads();
+
+ org.dvb.io.ixc.IxcRegistry.unbindAll(this);
+
+ if (sceneFactory != null) {
+ sceneFactory.dispose();
+ sceneFactory = null;
+ }
+
+ try {
+ callbackQueue.finalize();
+ } catch (Throwable t) {
+ } finally {
+ //callbackQueue = null;
+ }
+
+ EventQueue eq = eventQueue;
+ eventQueue = null;
+ if (eq != null) {
+ java.awt.BDJHelper.stopEventQueue(eq);
+ }
+
+ threadGroup.stopAll(1000);
+
+ threadGroup = null;
+ loader = null;
+ container = null;
+ }
+
+ private String[] args;
+ private AppID appid;
+ private BDJClassLoader loader;
+ private Container container;
+ private EventQueue eventQueue = null;
+ private HSceneFactory sceneFactory = null;
+ private BDJThreadGroup threadGroup = null;
+ private LinkedList ixcThreads = new LinkedList();
+ private LinkedList faaList = new LinkedList();
+ private BDJActionQueue callbackQueue;
+ private static final Logger logger = Logger.getLogger(BDJXletContext.class.getName());
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/Copy.java Added

@@ -0,0 +1,72 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamClass;
+import java.io.Serializable;
+
+public class Copy {
+
+ public static Serializable deepCopy(ClassLoader cl, Serializable obj) throws IOException, ClassNotFoundException {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(bos);
+ try {
+ oos.writeObject(obj);
+ } catch (Exception e) {
+ System.err.println("deepCopy write failed: " + e);
+ } finally {
+ oos.close();
+ }
+
+ ClObjectInputStream ios = new ClObjectInputStream(cl, new ByteArrayInputStream(bos.toByteArray()));
+ return (Serializable)ios.readObject();
+ }
+
+ /* ObjectInputStream with xlet class loader */
+ private static class ClObjectInputStream extends ObjectInputStream {
+ private ClassLoader classLoader = null;
+
+ public ClObjectInputStream(ClassLoader cl, InputStream in) throws IOException {
+ super(in);
+ classLoader = cl;
+ }
+
+ protected Class resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
+ try {
+ return Class.forName(desc.getName(), false, classLoader);
+ } catch (ClassNotFoundException e) {
+ Class cl = super.resolveClass(desc);
+ if (cl != null) {
+ return cl;
+ }
+ System.err.println("deepCopy: failed to resolve class " + desc.getName());
+ throw e;
+ } catch (Throwable t) {
+ System.err.println("deepCopy: failed to resolve class " + desc.getName() + ": " + t);
+ return null;
+ }
+ }
+ }
+}
\ No newline at end of file

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/FontIndex.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/FontIndex.java Changed

@@ -22,161 +22,126 @@
 import java.awt.Font;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.util.LinkedList;
+import java.util.ArrayList;
 
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
 
-public class FontIndex {
- public FontIndex()
- {
- 
+public class FontIndex extends DefaultHandler {
+ public static FontIndexData[] parseIndex(String path) {
+ return new FontIndex(path).getFontIndexData();
 }
- 
- public void parse(String file) throws BDJException
- {
- FileInputStream inStream;
+
+ private FontIndex(String path) {
 try {
- inStream = new FileInputStream(file);
+ FileInputStream stream = new FileInputStream(path);
+ SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
+ parser.parse(stream, this);
 } catch (FileNotFoundException e) {
- throw new BDJException("Not found");
- }
- 
- try {
- XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(inStream);
- 
- parse(reader);
- 
- } catch (XMLStreamException e) {
+
+ } catch (Exception e) {
 e.printStackTrace();
- throw new BDJException("Parse error");
- } catch (FactoryConfigurationError e) {
- throw new BDJException("Couldn't create xml reader");
+ } finally {
+ fontData = null;
 }
 }
- 
- public LinkedList<FontIndexData> getFontIndexData()
- {
- return fontData;
+
+ public FontIndexData[] getFontIndexData() {
+ return (FontIndexData[])fontDatas.toArray(new FontIndexData[fontDatas.size()]);
 }
- 
- private void parse(XMLStreamReader reader) throws XMLStreamException
- {
- while (reader.hasNext()) {
- int type = reader.next();
- 
- switch (type) {
- case XMLStreamReader.START_ELEMENT:
- parseStartElement(reader.getLocalName().toLowerCase());
- 
- if (inDocument) {
- for (int i = 0; i < reader.getAttributeCount(); i++)
- parseAttribute(reader.getAttributeLocalName(i).toLowerCase(), reader.getAttributeLocalName(i));
- 
- parseValue(reader);
+
+ public void startElement (String uri, String localName, String qName, Attributes attributes)
+ throws SAXException {
+ if (qName.equalsIgnoreCase("fontdirectory")) {
+ inDocument = true;
+ return;
+ }
+ if (inDocument) {
+ if (qName.equalsIgnoreCase("font"))
+ fontData = new FontIndexData();
+ else if (qName.equalsIgnoreCase("name"))
+ element = ELEMENT_NAME;
+ else if (qName.equalsIgnoreCase("fontformat"))
+ element = ELEMENT_FORMAT;
+ else if (qName.equalsIgnoreCase("filename"))
+ element = ELEMENT_FILENAME;
+ else if (qName.equalsIgnoreCase("style"))
+ element = ELEMENT_STYLE;
+ else if (qName.equalsIgnoreCase("size"))
+ element = ELEMENT_SIZE;
+ else
+ throw new SAXException("element not supported");
+ if (element == ELEMENT_SIZE) {
+ for (int i = 0; i < attributes.getLength(); i++) {
+ String attrName = attributes.getQName(i);
+ if (attrName.equals("min"))
+ fontData.minSize = Integer.parseInt(attributes.getValue(i));
+ else if (attrName.equals("max"))
+ fontData.maxSize = Integer.parseInt(attributes.getValue(i));
+ else
+ throw new SAXException("invalid attribute name: " + attrName);
 }
- break;
- case XMLStreamReader.END_ELEMENT:
- parseEndElement(reader.getLocalName().toLowerCase());
- break;
+ } else {
+ if (attributes.getLength() != 0)
+ throw new SAXException("invalid attribute for state");
 }
 }
 }
- 
- private void parseStartElement(String elemName) throws XMLStreamException
- {
- if (elemName.equals("fontdirectory"))
- inDocument = true;
- else if (elemName.equals("font"))
- current = new FontIndexData();
- else
- state = State.parseElement(elemName);
- }
- 
- private void parseEndElement(String elemName) 
- {
- if (elemName.equals("fontdirectory"))
+
+ public void endElement (String uri, String localName, String qName)
+ throws SAXException {
+ if (qName.equalsIgnoreCase("fontdirectory")) {
 inDocument = false;
- 
+ return;
+ }
 if (inDocument) {
- if (elemName.equals("font")) {
- fontData.add(current);
+ if (qName.equalsIgnoreCase("font")) {
+ fontDatas.add(fontData);
+ fontData = null;
 }
- 
- state = State.None;
- }
- }
- 
- private void parseAttribute(String attrName, String attrValue) throws XMLStreamException
- {
- if (state == State.size) {
- if (attrName.equals("min"))
- current.minSize = Integer.parseInt(attrValue);
- else if (attrName.equals("max"))
- current.maxSize = Integer.parseInt(attrValue);
- else
- throw new XMLStreamException("invalid attribute name: " + attrName);
- } else {
- throw new XMLStreamException("invalid attribute for state");
 }
+ element = ELEMENT_NONE;
 }
- 
- private void parseValue(XMLStreamReader reader) throws XMLStreamException 
- {
- switch (state) {
- case name:
- current.name = reader.getElementText();
+
+ public void characters (char ch[], int start, int length) throws SAXException {
+ switch (element) {
+ case ELEMENT_NAME:
+ fontData.name = new String(ch, start, length);
 break;
- case fontformat:
- current.format = reader.getElementText();
+ case ELEMENT_FORMAT:
+ fontData.format = new String(ch, start, length);
 break;
- case filename:
- current.filename = reader.getElementText();
+ case ELEMENT_FILENAME:
+ fontData.filename = new String(ch, start, length);
 break;
- case style:
- parseStyle(reader.getElementText());
+ case ELEMENT_STYLE:
+ String style = new String(ch, start, length);
+ if (style.equals("PLAIN"))
+ fontData.style = Font.PLAIN;
+ else if (style.equals("BOLD"))
+ fontData.style = Font.BOLD;
+ else if (style.equals("ITALIC"))
+ fontData.style = Font.ITALIC;
+ else if (style.equals("BOLD_ITALIC"))
+ fontData.style = Font.BOLD | Font.ITALIC;
+ else
+ throw new SAXException("invalid font style");
 break;
 }
 }
- 
- private void parseStyle(String style) throws XMLStreamException
- {
- if (style.equals("PLAIN"))
- current.style = Font.PLAIN;
- else if (style.equals("BOLD"))
- current.style = Font.BOLD;
- else if (style.equals("ITALIC"))
- current.style = Font.ITALIC;
 
- throw new XMLStreamException();
- }
- 
- private enum State
- {
- None,
- name,
- fontformat,
- filename,
- size,
- style;
- 
- public static State parseElement(String name) throws XMLStreamException {
- String str = name.toLowerCase();
- 
- for (State state : values()) {
- if (str.equals(state.name()))
- return state;
- }
- 
- throw new XMLStreamException();
- }
- }
- 
+ private static final int ELEMENT_NONE = 0;
+ private static final int ELEMENT_NAME = 1;
+ private static final int ELEMENT_FORMAT = 2;
+ private static final int ELEMENT_FILENAME = 3;
+ private static final int ELEMENT_SIZE = 4;
+ private static final int ELEMENT_STYLE = 5;
+
 private boolean inDocument = false;
- private State state = State.None;
- private FontIndexData current = null;
- private LinkedList<FontIndexData> fontData = new LinkedList<FontIndexData>();
- 
+ private int element = ELEMENT_NONE;
+ private FontIndexData fontData = null;
+ private ArrayList fontDatas = new ArrayList();
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/FontIndexData.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/FontIndexData.java Changed

@@ -20,43 +20,35 @@
 package org.videolan;
 
 public class FontIndexData {
-    public FontIndexData()
-    {
+    public FontIndexData() {
 
     }
     
-    public String getName()
-    {
+    public String getName() {
         return name;
     }
     
-    public String getFormat()
-    {
+    public String getFormat() {
         return format;
     }
     
-    public String getFileName()
-    {
+    public String getFileName() {
         return filename;
     }
     
-    public int getMinSize()
-    {
+    public int getMinSize() {
         return minSize;
     }
     
-    public int getMaxSize()
-    {
+    public int getMaxSize() {
         return maxSize;
     }
     
-    public int getStyle()
-    {
+    public int getStyle() {
         return style;
     }
 
-    public String toString()
-    {
+    public String toString() {
         return "FontIndexData [filename=" + filename + ", format=" + format
                 + ", maxSize=" + maxSize + ", minSize=" + minSize + ", name="
                 + name + ", style=" + style + "]";

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/GUIManager.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/GUIManager.java Changed

@@ -19,36 +19,36 @@
 
 package org.videolan;
 
+import java.awt.BDRootWindow;
 import java.awt.AWTException;
 import java.awt.Component;
-import java.awt.Frame;
 import java.awt.image.BufferedImage;
 
-public class GUIManager extends Frame {
-    private GUIManager()
-    {
+import org.havi.ui.HScene;
 
+public class GUIManager extends BDRootWindow {
+    private GUIManager() {
     }
 
-    public static GUIManager getInstance()
-    {
+    public static synchronized GUIManager createInstance() {
+        if (instance == null) {
+            instance = new GUIManager();
+        } else {
+            instance.clearOverlay();
+        }
         return instance;
     }
 
-    public boolean popToFront(Component component)
-    {
-        if (super.getComponentZOrder(component) == -1)
-            return false;
-
-        super.setComponentZOrder(component, 0);
-
-        return true;
-
+    public static synchronized GUIManager getInstance() {
+        if (instance == null) {
+            Logger.getLogger("GUIManager").error("getInstance(): no instance !");
+            throw new Error("no GUIManager instance");
+        }
+        return instance;
     }
 
     public BufferedImage createBufferedImage(int width, int height)
-            throws AWTException
-    {
+            throws AWTException {
         BufferedImage img = getGraphicsConfiguration().createCompatibleImage(width, height);
 
         if (img == null)
@@ -57,6 +57,33 @@
         return img;
     }
 
-    private static final GUIManager instance = new GUIManager();
+    public HScene getFocusHScene() {
+        Component component = getFocusOwner();
+        while (component != null) {
+            if (component instanceof HScene)
+                return (HScene)component;
+            component = component.getParent();
+        }
+        return null;
+    }
+
+    protected static void shutdown() throws Throwable {
+        synchronized (GUIManager.class) {
+            if (instance != null) {
+                instance.setVisible(false);
+                instance.removeAll();
+                instance.dispose();
+                //instance.finalize();
+                instance = null;
+            }
+        }
+    }
+
+    public void dispose() {
+        super.dispose();
+        instance = null;
+    }
+
+    private static GUIManager instance = null;
     private static final long serialVersionUID = 8670041014494973439L;
 }

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/IxcRegistryImpl.java Added

@@ -0,0 +1,491 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan;
+
+import java.io.Serializable;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+import java.rmi.RemoteException;
+import java.rmi.NotBoundException;
+import java.rmi.AlreadyBoundException;
+import java.rmi.Remote;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import javax.tv.xlet.XletContext;
+
+import org.videolan.BDJXletContext;
+
+
+public class IxcRegistryImpl {
+
+ private boolean isProxiedRemoteObj(Object obj) {
+ return Proxy.isProxyClass(obj.getClass()) &&
+ (Proxy.getInvocationHandler(obj) instanceof RemoteObjectInvocationHandler);
+ }
+
+ private Object wrapImportedObject(WrappedRemoteObj remoteObj, XletContext toContext)
+ throws RemoteException {
+
+ if (toContext == remoteObj.context) {
+ return remoteObj.object;
+ }
+ if (toContext == null) {
+ logger.error("toContext is null");
+ return remoteObj.object;
+ }
+ if (remoteObj.context == null) {
+ logger.error("remote context is null");
+ }
+
+ InvocationHandler handler = new RemoteObjectInvocationHandler(remoteObj);
+ ClassLoader cl = ((BDJXletContext)toContext).getClassLoader();
+
+ ArrayList list = new ArrayList();
+ getAllInterfaces(remoteObj.object.getClass(), list);
+
+ ArrayList FilteredList = new ArrayList();
+ for (int i = 0; i < list.size(); i++) {
+ try {
+ Class cls = cl.loadClass(((Class)list.get(i)).getName());
+ if (cls.isInterface() && Remote.class.isAssignableFrom(cls)) {
+ FilteredList.add(cls);
+ }
+ }
+ catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ }
+ }
+
+ Class[] ifs = (Class[])FilteredList.toArray(new Class[0]);
+
+ if (ifs != null && ifs.length != 0) {
+ return (Remote)Proxy.newProxyInstance(cl, ifs, handler);
+ }
+ return null;
+ }
+
+ private Object exportRemoteObj(Object proxiedRemoteObj, XletContext toContext) throws RemoteException
+ {
+ RemoteObjectInvocationHandler handler = (RemoteObjectInvocationHandler)Proxy.getInvocationHandler(proxiedRemoteObj);
+
+ if (handler.remoteObj.context == toContext) {
+ return handler.remoteObj.object;
+ }
+
+ return wrapImportedObject(handler.remoteObj, toContext);
+ }
+
+ private Object wrapOrCopy(Object obj, BDJXletContext fromContext, BDJXletContext toContext)
+ throws RemoteException {
+
+ Object result = null;
+ if (null == obj) {
+ return null;
+ }
+ if (isProxiedRemoteObj(obj)) {
+ return exportRemoteObj(obj, toContext);
+ }
+ if (obj instanceof Remote) {
+ return wrapImportedObject(new WrappedRemoteObj((Remote)obj, fromContext), toContext);
+ }
+ if (obj instanceof WrappedRemoteObj) {
+ WrappedRemoteObj wrappedObj = (WrappedRemoteObj)obj;
+ if (isProxiedRemoteObj(wrappedObj.object)) {
+ return exportRemoteObj(wrappedObj.object, toContext);
+ }
+ return wrapImportedObject(wrappedObj, toContext);
+ }
+ if (obj.getClass().isPrimitive() || obj.getClass().equals(Void.TYPE)) {
+ return obj;
+ }
+ if (obj instanceof Serializable) {
+ try {
+ return Copy.deepCopy(toContext.getClassLoader(), (Serializable)obj);
+ } catch (Exception e) {
+ Debug("wrapOrCopy: failed in deepCopy: " + e.getStackTrace());
+ throw new RemoteException("serialization/deserialization failed", e);
+ }
+ }
+
+ Debug("wrapOrCopy: Object is neither Serializable nor Remote");
+
+ throw new RemoteException("Object is neither Serializable nor Remote");
+ }
+
+ private void getAllInterfaces(Class objClass, ArrayList resultList)
+ {
+ if (objClass == null) {
+ return;
+ }
+ Class[] ifs = objClass.getInterfaces();
+
+ for (int i = 0; i < ifs.length; i++) {
+ int j;
+ for (j = 0; (j < resultList.size()) && (resultList.get(j) != ifs[i]); j++);
+ if (j == resultList.size()) {
+ resultList.add(ifs[i]);
+ }
+ }
+ getAllInterfaces(objClass.getSuperclass(), resultList);
+ }
+
+ private static final void verifyRemoteInterfaces(Class remoteClass) throws RemoteException {
+ Class[] remoteInterfaces = remoteClass.getInterfaces();
+ for (int i = 0; i < remoteInterfaces.length; i++) {
+ if (Remote.class.isAssignableFrom(remoteInterfaces[i])) {
+ Method[] remoteMethods = remoteInterfaces[i].getMethods();
+ for (int j = 0; j < remoteMethods.length; j++) {
+ verifyRemoteMethod(remoteMethods[j]);
+ }
+ }
+ }
+ }
+
+ private static final void verifyRemoteMethod(Method remoteMethod) throws RemoteException {
+ Class[] expTypes = remoteMethod.getExceptionTypes();
+ boolean hasRemoteException = false;
+ for (int i = 0; i < expTypes.length; i++) {
+ if (expTypes[i].isAssignableFrom(RemoteException.class)) {
+ hasRemoteException = true;
+ break;
+ }
+ }
+ if (!hasRemoteException) {
+ throw new RemoteException("no RemoteException found from remote method");
+ }
+
+ Class[] paramTypes = remoteMethod.getParameterTypes();
+ for (int i = 0; i < paramTypes.length; i++) {
+ verifyRemoteParameters(paramTypes[i]);
+ }
+ verifyRemoteParameters(remoteMethod.getReturnType());
+ }
+
+ private static final void verifyRemoteParameters(Class parameter) throws RemoteException {
+ if (Remote.class.isAssignableFrom(parameter)) {
+ if (!parameter.isInterface())
+ throw new RemoteException("remote parameter is not an interface");
+ Class[] superInterfaces = parameter.getInterfaces();
+ for (int j = 0; j < superInterfaces.length; j++) {
+ if (!Remote.class.isAssignableFrom(superInterfaces[j]))
+ throw new RemoteException("remote parameter not assignable");
+ }
+ }
+ else if ((!parameter.isPrimitive()) && (!parameter.equals(Void.TYPE)) && (!Serializable.class.isAssignableFrom(parameter))) {
+ throw new RemoteException("invalid parameter");
+ }
+ }
+
+ private class RemoteObjectInvocationHandler implements InvocationHandler {
+ public IxcRegistryImpl.WrappedRemoteObj remoteObj = null;
+
+ public RemoteObjectInvocationHandler(IxcRegistryImpl.WrappedRemoteObj remoteObj) {
+ TRACE("RemoteInvocationHandler created for " + remoteObj);
+ this.remoteObj = remoteObj;
+ }
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ if (null == remoteObj.context || remoteObj.context.isDestroyed()) {
+ Debug("invoke(): callee has been destroyed");
+ throw new RemoteException("callee has been destroyed");
+ }
+
+ TRACE("RemoteInvocationHandler called for " + remoteObj);
+
+ if (null != args) {
+ /* verify interfaces */
+ for (int i = 0; i < args.length; i++) {
+ if ((null != args[i]) && (Remote.class.isAssignableFrom(args[i].getClass()))) {
+ IxcRegistryImpl.verifyRemoteInterfaces(args[i].getClass());
+ }
+ }
+ }
+
+ RemoteMethod remoteMethod = new RemoteMethod(method, remoteObj.context, args);
+
+ if (remoteMethod.callerContext.isDestroyed()) {
+ Debug("invoke(): caller has been destroyed");
+ throw new RemoteException("caller has been destroyed");
+ }
+
+ Thread remoteThread = new Thread(remoteObj.context.getThreadGroup(), remoteMethod, "Ixc Remote thread " + method);
+
+ remoteMethod.callerContext.addIxcThread(remoteThread);
+ remoteThread.setDaemon(false);
+ remoteThread.start();
+ remoteThread.join();
+ remoteMethod.callerContext.removeIxcThread(remoteThread);
+
+ if (!remoteMethod.finished) {
+ Debug("invoke(): calling xlet destroyed during remote execution");
+ throw new RemoteException("calling xlet destroyed during remote execution");
+ }
+ if (remoteMethod.exception != null) {
+ Debug("Exception in remote thread");
+ if (remoteMethod.exception instanceof InvocationTargetException) {
+ throw ((InvocationTargetException)remoteMethod.exception).getTargetException();
+ }
+ Debug("Exception in remote thread is not InvocationTargetException");
+ throw remoteMethod.exception;
+ }
+
+ Object result = remoteMethod.retInCaller;
+ TRACE("RPC return " + result);
+ return result;
+ }
+
+ public class RemoteMethod implements Runnable
+ {
+ final BDJXletContext calleeContext;
+ final BDJXletContext callerContext;
+ final Method methodInCallee;
+ Object[] argsInCallee = new Object[0];
+ Exception exception = null;
+ boolean finished = false;
+ Object retInCaller = null;
+
+ public RemoteMethod(Method method, BDJXletContext context, Object[] args)
+ throws RemoteException {
+
+ callerContext = BDJXletContext.getCurrentContext();
+ if (callerContext == null) {
+ logger.error("caller context is null");
+ }
+ if (context == null) {
+ logger.error("callee context is null");
+ }
+ calleeContext = context;
+ methodInCallee = findMethodInCallee(method);
+ if (null != args) {
+ argsInCallee = new Object[args.length];
+ for (int i = 0; i < args.length; i++) {
+ argsInCallee[i] = IxcRegistryImpl.this.wrapOrCopy(args[i], callerContext, calleeContext);
+ }
+ }
+ }
+
+ public void run() {
+ TRACE("start execution in remote thread");
+
+ Object ret = null;
+ try {
+ ret = methodInCallee.invoke(IxcRegistryImpl.RemoteObjectInvocationHandler.this.remoteObj.object, argsInCallee);
+ TRACE("result: " + ret);
+ if (ret != null) {
+ TRACE(" type: " + ret.getClass().getName());
+ }
+ retInCaller = IxcRegistryImpl.this.wrapOrCopy(ret, calleeContext, callerContext);
+ }
+ catch (IllegalArgumentException e) {
+ exception = e;
+ } catch (IllegalAccessException e) {
+ exception = e;
+ } catch (InvocationTargetException e) {
+ try {
+ exception = ((Exception)IxcRegistryImpl.this.wrapOrCopy(e, calleeContext, callerContext));
+ }
+ catch (RemoteException e1) {
+ exception = e1;
+ }
+ } catch (RemoteException e) {
+ exception = e;
+ } finally {
+ finished = true;
+ }
+ }
+
+ private Method findMethodInCallee(Method method) {
+ try {
+ Class c = method.getDeclaringClass();
+ Method[] methodsInCaller = callerContext.getClassLoader().loadClass(c.getName()).getDeclaredMethods();
+ Method[] methodsInCallee = calleeContext.getClassLoader().loadClass(c.getName()).getDeclaredMethods();
+
+ for (int i = 0; i < methodsInCaller.length; i++) {
+ if (methodsInCaller[i].equals(method)) {
+ Method result = methodsInCallee[i];
+ TRACE("method in callee: " + result);
+ return result;
+ }
+ }
+ TRACE("can't find method in callee");
+ } catch (SecurityException e) {
+ TRACE("can't find method in callee: SecurityException: " + e.getStackTrace());
+ } catch (ClassNotFoundException e) {
+ TRACE("can't find method in callee: ClassNotFound:" + e.getStackTrace());
+ }
+
+ return null;
+ }
+ }
+ }
+
+ /*
+ * store
+ */
+
+ private class WrappedRemoteObj
+ {
+ final Remote object;
+ final BDJXletContext context;
+
+ public WrappedRemoteObj(Remote object, BDJXletContext context)
+ {
+ this.object = object;
+ this.context = context;
+ }
+ }
+
+ private final HashMap remoteObjects = new HashMap();
+
+ /*
+ * debug
+ */
+
+ private static final boolean DEBUG = true;
+ private static final boolean TRACE = true;
+ private static final Logger logger = Logger.getLogger(IxcRegistryImpl.class.getName());
+
+ private static void Debug(String s) {
+ if (DEBUG) {
+ logger.info(s);
+ }
+ }
+
+ private static void TRACE(String s) {
+ if (TRACE) {
+ logger.info("Ixc TRACE: " + s);
+ }
+ }
+
+ /*
+ * interface
+ */
+
+ public void bind(XletContext xc, String path, Remote obj)
+ throws AlreadyBoundException {
+
+ Debug("IxcRegistry.bind(" + xc + ", " + path + ", " + obj + ")");
+
+ if (!(xc instanceof BDJXletContext) || (BDJXletContext)xc != BDJXletContext.getCurrentContext()) {
+ Debug("bind(): xc not current BDJXletContext");
+ throw new IllegalArgumentException("xc not current BDJXletContext");
+ }
+ if (((BDJXletContext)xc).isDestroyed()) {
+ Debug("bind(): xc is destroyed");
+ return;
+ }
+
+ synchronized (remoteObjects) {
+ if (remoteObjects.containsKey(path))
+ throw new AlreadyBoundException();
+ remoteObjects.put(path, new WrappedRemoteObj(obj, (BDJXletContext)xc));
+ }
+ }
+
+ public Remote lookup(XletContext xc, String path)
+ throws NotBoundException, RemoteException {
+
+ Debug("IxcRegistry.lookup(" + xc + ", " + path + ")");
+
+ if (!(xc instanceof BDJXletContext) || (BDJXletContext)xc != BDJXletContext.getCurrentContext()) {
+ Debug("lookup(): xc not current BDJXletContext");
+ throw new IllegalArgumentException("xc not current BDJXletContext");
+ }
+
+ WrappedRemoteObj wrappedObj = null;
+ synchronized (remoteObjects) {
+ if (!remoteObjects.containsKey(path)) {
+ throw new NotBoundException();
+ }
+ wrappedObj = (WrappedRemoteObj)remoteObjects.get(path);
+ }
+ if (null == wrappedObj) {
+ return null;
+ }
+ Object remoteObj = wrapOrCopy(wrappedObj, wrappedObj.context, (BDJXletContext)xc);
+
+ Debug("IxcRegistry.lookup(" + path + ") => " + remoteObj);
+
+ return (Remote)remoteObj;
+ }
+
+
+ public void unbind(String path) throws NotBoundException
+ {
+ Debug("IxcRegistry.unbind(" + path + ")");
+
+ synchronized (remoteObjects) {
+ if (!remoteObjects.containsKey(path))
+ throw new NotBoundException();
+
+ WrappedRemoteObj wrappedObj = (WrappedRemoteObj)remoteObjects.get(path);
+ if (wrappedObj != null && wrappedObj.context != BDJXletContext.getCurrentContext()) {
+ throw new IllegalArgumentException("invalid context");
+ }
+
+ remoteObjects.remove(path);
+ }
+
+ Debug("IxcRegistry.unbind(" + path + ") OK");
+ }
+
+ public String[] list()
+ {
+ String[] result = null;
+ int i = 0;
+ synchronized (remoteObjects) {
+ result = new String[remoteObjects.size()];
+ Iterator it = remoteObjects.keySet().iterator();
+ while (it.hasNext()) {
+ result[(i++)] = ((String)it.next());
+ }
+ }
+
+ if (DEBUG) {
+ Debug("IxcRegistry.list():");
+ for (i = 0; i < result.length; i++)
+ Debug("\t" + i + " => " + result[i]);
+ }
+
+ return result;
+ }
+
+ public void unbindAll(XletContext xc) {
+
+ Debug("IxcRegistry.removeBinding(" + xc + ")");
+ String prefix = "/" + (String)xc.getXletProperty("dvb.org.id") + "/" + (String)xc.getXletProperty("dvb.app.id") + "/";
+
+ synchronized (remoteObjects) {
+ Iterator it = remoteObjects.keySet().iterator();
+ while (it.hasNext()) {
+ Object o = it.next();
+ String path = (String)o;
+ if (path.startsWith(prefix))
+ it.remove();
+ }
+ }
+ }
+}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/Libbluray.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/Libbluray.java Changed

@@ -19,51 +19,159 @@
 
 package org.videolan;
 
+import java.awt.BDToolkit;
+import java.awt.event.KeyEvent;
+import java.util.Vector;
+
+import javax.media.PackageManager;
+import javax.tv.service.selection.ServiceContextFactory;
+
+import org.bluray.ti.DiscManager;
+import org.bluray.ti.TitleImpl;
+import org.bluray.ti.selection.TitleContext;
+import org.bluray.ui.event.HRcEvent;
+import org.dvb.event.EventManager;
+import org.dvb.ui.FontFactory;
+import org.videolan.bdjo.Bdjo;
+import org.videolan.media.content.BDHandler;
+
 /**
 * This class allows BDJ to call various libbluray functions.
 */
 public class Libbluray {
- public static int getTitles(char flags)
- {
- return getTitlesN(nativePointer, flags);
+ protected static void init(long nativePointer, String discID) {
+
+ Libbluray.nativePointer = nativePointer;
+ DiscManager.getDiscManager().setCurrentDisc(discID);
+
+ Vector prefix = new Vector();
+ prefix.add("org.videolan");
+ PackageManager.setContentPrefixList(prefix);
+ PackageManager.setProtocolPrefixList(prefix);
+ PackageManager.commitContentPrefixList();
+ PackageManager.commitProtocolPrefixList();
+
+ java.awt.BDFontMetrics.init();
+ FontFactory.loadDiscFonts();
+
+ System.setProperty("mhp.profile.enhanced_broadcast", "YES");
+ System.setProperty("mhp.profile.interactive_broadcast", "YES");
+ System.setProperty("mhp.profile.internet_access", "YES");
+
+ System.setProperty("mhp.eb.version.major", "1");
+ System.setProperty("mhp.eb.version.minor", "0");
+ System.setProperty("mhp.eb.version.micro", "3");
+ System.setProperty("mhp.ia.version.major", "1");
+ System.setProperty("mhp.ia.version.minor", "0");
+ System.setProperty("mhp.ia.version.micro", "3");
+ System.setProperty("mhp.ib.version.major", "1");
+ System.setProperty("mhp.ib.version.minor", "0");
+ System.setProperty("mhp.ib.version.micro", "3");
+
+ System.setProperty("mhp.option.ip.multicast", "UNSUPPORTED");
+ System.setProperty("mhp.option.dsmcc.uu", "UNSUPPORTED");
+ System.setProperty("mhp.option.dvb.html", "UNSUPPORTED");
+
+ System.setProperty("dvb.returnchannel.timeout", "30");
+
+ System.setProperty("bluray.profile.1", "YES");
+ System.setProperty("bluray.p1.version.major", "1");
+ System.setProperty("bluray.p1.version.minor", "1");
+ System.setProperty("bluray.p1.version.micro", "0");
+
+ System.setProperty("bluray.profile.2", "YES");
+ System.setProperty("bluray.p2.version.major", "1");
+ System.setProperty("bluray.p2.version.minor", "0");
+ System.setProperty("bluray.p2.version.micro", "0");
+
+ System.setProperty("bluray.disc.avplayback.readcapability", "NO");
+
+ System.setProperty("bluray.video.fullscreenSD", "YES");
+ System.setProperty("bluray.video.fullscreenSDPG", "YES");
+
+ System.setProperty("aacs.bluray.online.capability", "YES");
+ System.setProperty("aacs.bluray.mc.capability", "NO");
+
+ System.setProperty("bluray.prefetchedplaylistloading", "NO");
+ System.setProperty("bluray.video.autoresume", "NO");
+
+ System.setProperty("bluray.mediaselect", "NO");
+
+ System.setProperty("bluray.event.extension", "YES");
+
+ System.setProperty("bluray.jmf.subtitlestyle", "YES");
+
+ System.setProperty("bluray.rccapability.release", "No");
+ System.setProperty("bluray.rccapability.holdandrelease", "NO");
+ System.setProperty("bluray.rccapability.repeatonhold", "NO");
+
+ System.setProperty("bluray.localstorage.level", "5");
+ System.setProperty("bluray.localstorage.maxlevel", "5");
+
+ System.setProperty("bluray.localstorage.removable", "NO");
+ System.setProperty("bluray.localstorage.upgradable", "NO");
+ System.setProperty("bluray.localstorage.name", "HDD");
+
+ System.setProperty("bluray.memory.images", "65536");
+ System.setProperty("bluray.memory.audio", "8192");
+ System.setProperty("bluray.memory.audio_plus_img", "73728");
+ System.setProperty("bluray.memory.java_heap", "32768");
+ System.setProperty("bluray.memory.font_cache", "4096");
+
+ System.setProperty("bluray.network.connected", "YES");
+ }
+
+ public static void shutdown() {
+ try {
+ BDJLoader.shutdown();
+ BDJActionManager.getInstance().finalize();
+ MountManager.unmountAll();
+ GUIManager.shutdown();
+ BDToolkit.shutdown();
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+ nativePointer = 0;
+ }
+
+ public static byte[] getAacsData(int type) {
+ return getAacsDataN(nativePointer, type);
+ }
+
+ public static int getTitles() {
+ return getTitlesN(nativePointer);
 }
- 
- public static TitleInfo getTitleInfo(int titleNum)
- {
+
+ public static TitleInfo getTitleInfo(int titleNum) {
 if (titleNum < 0)
 throw new IllegalArgumentException();
- 
+
 return getTitleInfoN(nativePointer, titleNum);
 }
- 
- public static TitleInfo getPlaylistInfo(int playlist)
- {
+
+ public static PlaylistInfo getPlaylistInfo(int playlist) {
 return getPlaylistInfoN(nativePointer, playlist);
 }
 
- public static long seek(long pos)
- {
+ public static long seek(long pos) {
 return seekN(nativePointer, pos);
 }
 
- public static long seekTime(long tick)
- {
+ public static long seekTime(long tick) {
 return seekTimeN(nativePointer, tick);
 }
 
- public static long seekChapter(int chapter)
- {
+ public static long seekChapter(int chapter) {
 if (chapter < 0)
 throw new IllegalArgumentException("Chapter cannot be negative");
- 
+
 return seekChapterN(nativePointer, chapter);
 }
 
- public static long chapterPos(int chapter)
- {
+ public static long chapterPos(int chapter) {
 if (chapter < 0)
 throw new IllegalArgumentException("Chapter cannot be negative");
- 
+
 return chapterPosN(nativePointer, chapter);
 }
 
@@ -71,110 +179,221 @@
 return getCurrentChapterN(nativePointer);
 }
 
- public static long seekMark(int mark)
- {
+ public static long seekMark(int mark) {
 if (mark < 0)
 throw new IllegalArgumentException("Mark cannot be negative");
- 
+
 long result = seekMarkN(nativePointer, mark);
 if (result == -1)
 throw new IllegalArgumentException("Seek error");
 return result;
 }
 
- public static boolean selectPlaylist(int playlist)
- {
+ public static long seekPlayItem(int clip) {
+ if (clip < 0)
+ throw new IllegalArgumentException("Mark cannot be negative");
+
+ long result = seekPlayItemN(nativePointer, clip);
+ if (result == -1)
+ throw new IllegalArgumentException("Seek error");
+ return result;
+ }
+
+ public static boolean selectPlaylist(int playlist) {
 if (playlist < 0)
 throw new IllegalArgumentException("Playlist cannot be negative");
- 
+
 return selectPlaylistN(nativePointer, playlist) == 1 ? true : false;
 }
 
- public static boolean selectTitle(int title)
- {
- if (title < 0)
- throw new IllegalArgumentException("Title cannot be negative");
- 
- return selectTitleN(nativePointer, title) == 1 ? true : false;
+ public static boolean selectTitle(TitleImpl title) {
+ TitleInfo ti = title.getTitleInfo();
+ if (ti.isBdj()) {
+ try {
+ ((TitleContext)ServiceContextFactory.getInstance().getServiceContext(null)).select(title);
+ return true;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+ }
+
+ return selectTitleN(nativePointer, title.getTitleNum()) == 1 ? true : false;
 }
 
- public static boolean selectAngle(int angle)
- {
+ public static boolean selectAngle(int angle) {
 if (angle < 0)
 throw new IllegalArgumentException("Angle cannot be negative");
- 
+
 return selectAngleN(nativePointer, angle) == 1 ? true : false;
 }
 
- public static void seamlessAngleChange(int angle)
- {
+ public static void seamlessAngleChange(int angle) {
 if (angle < 0)
 throw new IllegalArgumentException("Angle cannot be negative");
- 
+
 seamlessAngleChangeN(nativePointer, angle);
 }
 
- public static long getTitleSize()
- {
+ public static long getTitleSize() {
 return getTitleSizeN(nativePointer);
 }
 
- public static int getCurrentTitle()
- {
- return getCurrentTitleN(nativePointer);
+ public static int getCurrentTitle() {
+ return readPSR(PSR_TITLE_NUMBER);
 }
 
- public static int getCurrentAngle()
- {
+ public static int getCurrentAngle() {
 return getCurrentAngleN(nativePointer);
 }
 
- public static long tell()
- {
+ public static long getUOMask() {
+ return getUOMaskN(nativePointer);
+ }
+
+ public static long tell() {
 return tellN(nativePointer);
 }
- 
- public static long tellTime()
- {
+
+ public static long tellTime() {
 return tellTimeN(nativePointer);
 }
- 
- public static void writeGPR(int num, int value)
- {
+
+ public static boolean selectRate(float rate) {
+ return selectRateN(nativePointer, rate) == 1 ? true : false;
+ }
+
+ public static void writeGPR(int num, int value) {
 int ret = writeGPRN(nativePointer, num, value);
- 
+
 if (ret == -1)
 throw new IllegalArgumentException("Invalid GPR");
 }
- 
- public static void writePSR(int num, int value)
- {
+
+ public static void writePSR(int num, int value) {
 int ret = writePSRN(nativePointer, num, value);
- 
+
 if (ret == -1)
- throw new IllegalArgumentException("Invalid GPR");
+ throw new IllegalArgumentException("Invalid PSR");
 }
- 
- public static int readGPR(int num)
- {
- int value = readGPRN(nativePointer, num);
- 
- if (value == -1)
+
+ public static int readGPR(int num) {
+ if (num < 0 || (num >= 4096))
 throw new IllegalArgumentException("Invalid GPR");
- 
- return value;
+
+ return readGPRN(nativePointer, num);
 }
- 
- public static int readPSR(int num)
- {
- int value = readPSRN(nativePointer, num);
 
- if (value == -1)
+ public static int readPSR(int num) {
+ if (num < 0 || (num >= 128))
 throw new IllegalArgumentException("Invalid PSR");
- 
- return value;
+
+ return readPSRN(nativePointer, num);
+ }
+
+ public static Bdjo getBdjo(String name) {
+ return getBdjoN(nativePointer, name);
+ }
+
+ public static void updateGraphic(int width, int height, int[] rgbArray) {
+ updateGraphicN(nativePointer, width, height, rgbArray,
+ 0, 0, width - 1, height - 1);
 }
- 
+
+ public static void updateGraphic(int width, int height, int[] rgbArray,
+ int x0, int y0, int x1, int y1) {
+ updateGraphicN(nativePointer, width, height, rgbArray,
+ x0, y0, x1, y1);
+ }
+
+ public static boolean processEvent(int event, int param) {
+ boolean result = true;
+ int key = 0;
+
+ switch (event) {
+ case BDJ_EVENT_CHAPTER:
+ BDHandler.onChapterReach(param);
+ break;
+ case BDJ_EVENT_MARK:
+ BDHandler.onMarkReach(param);
+ break;
+ case BDJ_EVENT_PLAYITEM:
+ BDHandler.onPlayItemReach(param);
+ break;
+ case BDJ_EVENT_ANGLE:
+ BDHandler.onAngleChange(param);
+ break;
+ case BDJ_EVENT_SUBTITLE:
+ BDHandler.onSubtitleChange(param);
+ break;
+ case BDJ_EVENT_PIP:
+ BDHandler.onPiPChange(param);
+ break;
+ case BDJ_EVENT_END_OF_PLAYLIST:
+ BDHandler.activePlayerEndOfMedia();
+ break;
+ case BDJ_EVENT_PSR102:
+ org.bluray.bdplus.Status.getInstance().receive(param);
+ break;
+ case BDJ_EVENT_PTS:
+ BDHandler.activePlayerUpdateTime(param);
+ break;
+ case BDJ_EVENT_VK_KEY:
+ //case KeyEvent.KEY_TYPED:
+ //case KeyEvent.KEY_PRESSED:
+ //case KeyEvent.KEY_RELEASED:
+ switch (param) {
+ case 0: key = KeyEvent.VK_0; break;
+ case 1: key = KeyEvent.VK_1; break;
+ case 2: key = KeyEvent.VK_2; break;
+ case 3: key = KeyEvent.VK_3; break;
+ case 4: key = KeyEvent.VK_4; break;
+ case 5: key = KeyEvent.VK_5; break;
+ case 6: key = KeyEvent.VK_6; break;
+ case 7: key = KeyEvent.VK_7; break;
+ case 8: key = KeyEvent.VK_8; break;
+ case 9: key = KeyEvent.VK_9; break;
+ case 11: key = HRcEvent.VK_POPUP_MENU; break;
+ case 12: key = KeyEvent.VK_UP; break;
+ case 13: key = KeyEvent.VK_DOWN; break;
+ case 14: key = KeyEvent.VK_LEFT; break;
+ case 15: key = KeyEvent.VK_RIGHT; break;
+ case 16: key = KeyEvent.VK_ENTER; break;
+ default:
+ key = -1;
+ result = false;
+ break;
+ }
+ if (key > 0) {
+ result =
+ EventManager.getInstance().receiveKeyEventN(KeyEvent.KEY_PRESSED, 0, key) ||
+ EventManager.getInstance().receiveKeyEventN(KeyEvent.KEY_RELEASED, 0, key) ||
+ EventManager.getInstance().receiveKeyEventN(KeyEvent.KEY_TYPED, 0, key);
+ }
+ break;
+ default:
+ result = false;
+ }
+
+ return result;
+ }
+
+ public static void setUOMask(boolean menuCallMask, boolean titleSearchMask) {
+ setUOMaskN(nativePointer, menuCallMask, titleSearchMask);
+ }
+
+ private static final int BDJ_EVENT_CHAPTER = 1;
+ private static final int BDJ_EVENT_PLAYITEM = 2;
+ private static final int BDJ_EVENT_ANGLE = 3;
+ private static final int BDJ_EVENT_SUBTITLE = 4;
+ private static final int BDJ_EVENT_PIP = 5;
+ private static final int BDJ_EVENT_END_OF_PLAYLIST = 6;
+ private static final int BDJ_EVENT_PTS = 7;
+ private static final int BDJ_EVENT_VK_KEY = 8;
+ private static final int BDJ_EVENT_MARK = 9;
+ private static final int BDJ_EVENT_PSR102 = 10;
+
+ /* TODO: use org/bluray/system/RegisterAccess instead */
 public static final int PSR_IG_STREAM_ID = 0;
 public static final int PSR_PRIMARY_AUDIO_ID = 1;
 public static final int PSR_PG_STREAM = 2;
@@ -207,29 +426,42 @@
 public static final int PSR_BACKUP_PSR10 = 42;
 public static final int PSR_BACKUP_PSR11 = 43;
 public static final int PSR_BACKUP_PSR12 = 44;
- 
- protected static long nativePointer = 0; 
- 
+
+ public static final int AACS_DISC_ID = 1;
+ public static final int AACS_MEDIA_VID = 2;
+ public static final int AACS_MEDIA_PMSN = 3;
+ public static final int AACS_DEVICE_BINDING_ID = 4;
+ public static final int AACS_DEVICE_NONCE = 5;
+
+ private static native byte[] getAacsDataN(long np, int type);
 private static native TitleInfo getTitleInfoN(long np, int title);
- private static native TitleInfo getPlaylistInfoN(long np, int playlist);
- private static native int getTitlesN(long np, char flags);
+ private static native PlaylistInfo getPlaylistInfoN(long np, int playlist);
+ private static native int getTitlesN(long np);
 private static native long seekN(long np, long pos);
 private static native long seekTimeN(long np, long tick);
 private static native long seekChapterN(long np, int chapter);
 private static native long chapterPosN(long np, int chapter);
 private static native int getCurrentChapterN(long np);
 private static native long seekMarkN(long np, int mark);
+ private static native long seekPlayItemN(long np, int clip);
 private static native int selectPlaylistN(long np, int playlist);
 private static native int selectTitleN(long np, int title);
 private static native int selectAngleN(long np, int angle);
 private static native void seamlessAngleChangeN(long np, int angle);
 private static native long getTitleSizeN(long np);
- private static native int getCurrentTitleN(long np);
+ private static native long getUOMaskN(long np);
+ private static native void setUOMaskN(long np, boolean menuCallMask, boolean titleSearchMask);
 private static native int getCurrentAngleN(long np);
 private static native long tellN(long np);
 private static native long tellTimeN(long np);
+ private static native int selectRateN(long np, float rate);
 private static native int writeGPRN(long np, int num, int value);
 private static native int writePSRN(long np, int num, int value);
 private static native int readGPRN(long np, int num);
 private static native int readPSRN(long np, int num);
+ private static native Bdjo getBdjoN(long np, String name);
+ private static native void updateGraphicN(long np, int width, int height, int[] rgbArray,
+ int x0, int y0, int x1, int y1);
+
+ protected static long nativePointer = 0;
 }

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/Logger.java Added

@@ -0,0 +1,169 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan;
+
+import java.io.PrintStream;
+
+public class Logger {
+ static {
+ String prop;
+
+ use_throw = false;
+ use_trace = false;
+
+ // capture stdout and stderr from on-disc applets
+ // (those produce useful debug information sometimes)
+ System.setOut(createCapture(System.out, false));
+ System.setErr(createCapture(System.err, true));
+
+ prop = System.getProperty("debug.unimplemented.throw");
+ if (prop != null && prop.equalsIgnoreCase("YES")) {
+ use_throw = true;
+ }
+ prop = System.getProperty("debug.trace");
+ if (prop == null || !prop.equalsIgnoreCase("NO")) {
+ use_trace = true;
+ }
+ }
+
+ private static class Location {
+ public int line = 0;
+ public String file = "?";
+ public String cls = "?";
+ public String func = "?";
+ Location() {
+ }
+ Location(StackTraceElement e) {
+ line = e.getLineNumber();
+ file = e.getFileName();
+ cls = e.getClassName();
+ func = e.getMethodName();
+ if (file == null) {
+ file = "<unknown.java>";
+ }
+ }
+ }
+ private static Location getLocation(int depth) {
+ StackTraceElement e[] = new Exception("Stack trace").getStackTrace();
+ if (e != null && e.length > 1) {
+ for (int i = depth; i < e.length; i++)
+ if (!e[i].getClassName().startsWith("org.videolan.Logger"))
+ return new Location(e[i]);
+ }
+ return new Location();
+ }
+
+ private static PrintStream createCapture(final PrintStream printStream, final boolean error) {
+ return new PrintStream(printStream) {
+ public void print(final String string) {
+ Logger.log(error, string);
+ }
+ public void println(final String string) {
+ Logger.log(error, string);
+ }
+ };
+ }
+
+ public static Logger getLogger(String name) {
+ return new Logger(name);
+ }
+
+ private Logger(String name) {
+ this.name = name;
+ }
+
+ private static native void logN(boolean error, String file, int line, String msg);
+
+ private static void log(boolean error, String cls, String msg) {
+ logN(error, cls, 0, msg);
+ }
+ private static void log(boolean error, String msg) {
+ Location l = getLocation(3);
+ logN(error, l.file + ":" + l.cls + "." + l.func, l.line, msg);
+ }
+
+ public void trace(String msg) {
+ if (use_trace) {
+ log(false, name, msg);
+ }
+ }
+
+ public void info(String msg) {
+ log(false, name, "INFO: " + msg);
+ }
+
+ public void warning(String msg) {
+ log(false, name, "WARNING: " + msg);
+ }
+
+ public void error(String msg) {
+ log(true, name, "ERROR: " + msg);
+ }
+
+ public void unimplemented() {
+ unimplemented(null);
+ }
+
+ public static String dumpStack() {
+ String dump = "";
+ StackTraceElement e[] = new Exception("Stack trace").getStackTrace();
+ if (e != null && e.length > 1) {
+ dump = "\t" + e[2].toString();
+ for (int i = 3; i < e.length; i++)
+ dump += "\n\t" + e[i].toString();
+ }
+ return dump;
+ }
+
+ public void unimplemented(String func) {
+ String location = name;
+ if (func != null) {
+ location = location + "." + func + "()";
+ }
+
+ log(true, "UNIMPLEMENTED: " + location + "\n" + dumpStack());
+
+ if (use_throw) {
+ throw new Error("Not implemented: " + location);
+ }
+ }
+
+ public static void unimplemented(String cls, String func) {
+ if (cls == null)
+ cls = "<?>";
+
+ if (func == null)
+ func = "";
+ else
+ func = "." + func + "()";
+
+ String location = cls + func;
+
+ log(true, "UNIMPLEMENTED: " + location + "\n" + dumpStack());
+
+ if (use_throw) {
+ throw new Error("Not implemented: " + location);
+ }
+ }
+
+ private String name;
+ private static boolean use_trace;
+ private static boolean use_throw;
+}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/MountManager.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/MountManager.java Changed

@@ -27,29 +27,35 @@
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import java.util.logging.Logger;
+import org.videolan.Logger;
 
 /**
 * This class handle mounting jar files so that their contents can be accessed.
- * 
+ *
 * @author William Hahne
 *
 */
 public class MountManager {
- public static String mount(int jarId) throws MountException
- {
+ public static String mount(int jarId) throws MountException {
 String jarStr = jarIdToString(jarId);
- 
+
 logger.info("Mounting JAR: " + jarStr);
- 
+
 if (jarStr == null)
 throw new IllegalArgumentException();
- 
- String path = BDJLoader.getBaseDir() + "/BDMV/JAR/" + jarStr + ".jar";
- 
+
+ String oldPath = getMount(jarId);
+ if (oldPath != null) {
+ logger.error("JAR " + jarId + " already mounted");
+ return oldPath;
+ }
+
+ String path = System.getProperty("bluray.vfs.root") + "/BDMV/JAR/" + jarStr + ".jar";
+
 JarFile jar = null;
 File tmpDir = null;
 try {
@@ -59,27 +65,34 @@
 e.printStackTrace();
 throw new MountException();
 }
- 
+
 // create temporary directory
 tmpDir.delete();
 tmpDir.mkdir();
- 
+
 try {
- Enumeration<JarEntry> entries = jar.entries();
+ byte[] buffer = new byte[32*1024];
+ Enumeration entries = jar.entries();
 while (entries.hasMoreElements()) {
- JarEntry entry = entries.nextElement();
+ JarEntry entry = (JarEntry)entries.nextElement();
 File out = new File(tmpDir + File.separator + entry.getName());
- 
+
+ logger.info(" mount: " + entry.getName());
+
 if (entry.isDirectory()) {
- out.mkdir();
+ out.mkdirs();
 } else {
+ /* make sure path exists */
+ out.getParentFile().mkdirs();
+
 InputStream inStream = jar.getInputStream(entry);
 OutputStream outStream = new FileOutputStream(out);
- 
- while (inStream.available() > 0) {
- outStream.write(inStream.read());
+
+ int length;
+ while ((length = inStream.read(buffer)) > 0) {
+ outStream.write(buffer, 0, length);
 }
- 
+
 inStream.close();
 outStream.close();
 }
@@ -89,57 +102,58 @@
 recursiveDelete(tmpDir);
 throw new MountException();
 }
- 
- mountPoints.put(jarId, tmpDir);
+
+ logger.info("Mounting JAR " + jarId + " complete.");
+
+ mountPoints.put(new Integer(jarId), tmpDir);
 return tmpDir.getAbsolutePath();
 }
- 
- public static void unmount(int jarId)
- {
+
+ public static void unmount(int jarId) {
 logger.info("Unmounting JAR: " + jarId);
- 
- File mountPoint = mountPoints.get(jarId);
+ Integer id = new Integer(jarId);
+ File mountPoint = (File)mountPoints.get(id);
 if (mountPoint != null) {
 recursiveDelete(mountPoint);
- mountPoints.remove(jarId);
+ mountPoints.remove(id);
 }
 }
- 
- public static void unmountAll()
- {
- for (int key : mountPoints.keySet()) {
- unmount(key);
- }
+
+ public static void unmountAll() {
+ Iterator iterator = mountPoints.keySet().iterator();
+ while (iterator.hasNext())
+ unmount(((Integer)iterator.next()).intValue());
 }
- 
- public static String getMount(int jarId)
- {
- if (mountPoints.containsKey(jarId)) {
- return mountPoints.get(jarId).getAbsolutePath();
+
+ public static String getMount(int jarId) {
+ Integer id = new Integer(jarId);
+ if (mountPoints.containsKey(id)) {
+ return ((File)mountPoints.get(id)).getAbsolutePath();
 } else {
 return null;
 }
 }
- 
- private static String jarIdToString(int jarId)
- {
+
+ private static String jarIdToString(int jarId) {
 if (jarId < 0 || jarId > 99999)
 return null;
 return BDJUtil.makeFiveDigitStr(jarId);
 }
- 
- private static void recursiveDelete(File dir) { 
- for (File file : dir.listFiles()) {
+
+ private static void recursiveDelete(File dir) {
+ File[] files = dir.listFiles();
+ for (int i = 0; i < files.length; i++) {
+ File file = files[i];
 if (file.isDirectory()) {
 recursiveDelete(file);
 } else {
 file.delete();
 }
 }
- 
+
 dir.delete();
 }
- 
- private static Map<Integer, File> mountPoints = Collections.synchronizedMap(new HashMap<Integer, File>());
+
+ private static Map mountPoints = Collections.synchronizedMap(new HashMap());
 private static final Logger logger = Logger.getLogger(MountManager.class.getName());
 }

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/PlaylistInfo.java Added

@@ -0,0 +1,64 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2010 William Hahne
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan;
+
+public class PlaylistInfo {
+ public PlaylistInfo(int playlist, long duration, int angles, TIMark[] marks, TIClip[] clips) {
+ this.playlist = playlist;
+ this.duration = duration;
+ this.angles = angles;
+ this.marks = marks;
+ this.clips = clips;
+ }
+
+ public int getPlaylist() {
+ return playlist;
+ }
+
+ public long getDuration() {
+ return duration;
+ }
+
+ public int getMarkCount() {
+ return marks.length;
+ }
+
+ public TIMark[] getMarks() {
+ return marks;
+ }
+
+ public int getClipCount() {
+ return clips.length;
+ }
+
+ public TIClip[] getClips() {
+ return clips;
+ }
+
+ public int getAngleCount() {
+ return angles;
+ }
+
+ private int playlist;
+ private long duration;
+ private int angles;
+ private TIMark[] marks;
+ private TIClip[] clips;
+}
\ No newline at end of file

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/StrUtil.java Added

@@ -0,0 +1,64 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2010 Libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan;
+
+import java.util.ArrayList;
+
+public class StrUtil {
+ public static String Join(String[] strings, String separator) {
+ String result = "";
+ if (strings != null) {
+ result = strings[0];
+ for (int i = 1; i < strings.length; i++) {
+ result = result + separator + strings[i];
+ }
+ }
+ return result;
+ }
+
+ public static String[] split(String str, char delimiter) {
+ ArrayList elements = new ArrayList();
+ int i, j = 0, len = str.length();
+ for (i = 0; i < len; i++)
+ if (str.charAt(i) == delimiter) {
+ elements.add(str.substring(j, i));
+ j = i + 1;
+ }
+ if (j < i)
+ elements.add(str.substring(j, i));
+ return (String[])elements.toArray(new String[elements.size()]);
+ }
+
+ public static String[] split(String str, char delimiter, int num) {
+ ArrayList elements = new ArrayList();
+ int i, j = 0, n = 0, len = str.length();
+ for (i = 0; (i < len) && (n < num); i++)
+ if (str.charAt(i) == delimiter) {
+ elements.add(str.substring(j, i));
+ j = i + 1;
+ n++;
+ }
+ if ((n < num) && (j < i)) {
+ elements.add(str.substring(j, i));
+ n++;
+ }
+ return (String[])elements.toArray(new String[elements.size()]);
+ }
+}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/StreamInfo.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/StreamInfo.java Changed

@@ -1,50 +1,150 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2010 William Hahne
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
 package org.videolan;
 
+import java.awt.Dimension;
+
+import org.bluray.ti.CodingType;
+
 public class StreamInfo {
- public StreamInfo(byte coding_type, byte format, byte rate, char char_code, String lang, short pid)
- {
+ public StreamInfo(byte coding_type, byte format, byte rate,
+ char char_code, String lang, byte aspect, byte subpath_id) {
 this.coding_type = coding_type;
 this.format = format;
 this.rate = rate;
 this.char_code = char_code;
 this.lang = lang;
- this.pid = pid;
+ this.aspect = aspect;
+ this.subpath_id = subpath_id;
 }
- 
- public byte getCoding_type()
- {
- return coding_type;
+
+ public CodingType getCodingType() {
+ switch (coding_type) {
+ case (byte)0x02:
+ return CodingType.MPEG2_VIDEO;
+ case (byte)0x1b:
+ return CodingType.MPEG4_AVC_VIDEO;
+ case (byte)0xea:
+ return CodingType.SMPTE_VC1_VIDEO;
+ case (byte)0x80:
+ return CodingType.LPCM_AUDIO;
+ case (byte)0x81:
+ return CodingType.DOLBY_AC3_AUDIO;
+ case (byte)0x82:
+ return CodingType.DTS_AUDIO;
+ case (byte)0x83:
+ return CodingType.DOLBY_LOSSLESS_AUDIO;
+ case (byte)0x84:
+ case (byte)0xA1:
+ return CodingType.DOLBY_DIGITAL_PLUS_AUDIO;
+ case (byte)0x85:
+ return CodingType.DTS_HD_AUDIO_EXCEPT_XLL;
+ case (byte)0x86:
+ return CodingType.DTS_HD_AUDIO_XLL;
+ case (byte)0xA2:
+ return CodingType.DTS_HD_AUDIO_LBR;
+ //FIXME:case (byte)0x??:
+ // return CodingType.DRA_AUDIO;
+ //FIXME:case (byte)0x??:
+ // return CodingType.DRA_EXTENSION_AUDIO;
+ case (byte)0x90:
+ return CodingType.PRESENTATION_GRAPHICS;
+ case (byte)0x91:
+ return CodingType.INTERACTIVE_GRAPHICS;
+ case (byte)0x92:
+ return CodingType.TEXT_SUBTITLE;
+ default:
+ return null;
+ }
 }
- 
- public byte getFormat()
- {
+
+ public byte getFormat() {
 return format;
 }
- 
- public byte getRate()
- {
+
+ public Dimension getVideoSize() {
+ int width, height;
+ switch (format) {
+ case (byte)0x01:
+ case (byte)0x03:
+ width = 720;
+ height = 480;
+ break;
+ case (byte)0x02:
+ case (byte)0x07:
+ width = 720;
+ height = 576;
+ break;
+ case (byte)0x05:
+ width = 1280;
+ height = 720;
+ break;
+ case (byte)0x04:
+ case (byte)0x06:
+ width = 1920;
+ height = 1080;
+ break;
+ default:
+ return null;
+ }
+ return new Dimension(width, height);
+ }
+
+ public Dimension getVideoAspectRatio() {
+ int x, y;
+ switch (aspect) {
+ case (byte)0x02:
+ x = 4;
+ y = 3;
+ break;
+ case (byte)0x03:
+ x = 16;
+ y = 9;
+ break;
+ default:
+ return null;
+ }
+ return new Dimension(x, y);
+ }
+
+ public byte getRate() {
 return rate;
 }
- 
- public char getChar_code()
- {
+
+ public char getChar_code() {
 return char_code;
 }
- 
- public String getLang()
- {
+
+ public String getLang() {
 return lang;
 }
- 
- public short getPid()
- {
- return pid;
+
+ public int getSubPathId() {
+ return subpath_id;
 }
 
- byte coding_type;
- byte format;
- byte rate;
- char char_code;
- String lang;
- short pid;
+ private byte coding_type;
+ private byte format;
+ private byte rate;
+ private char char_code;
+ private String lang;
+ private byte aspect;
+ private byte subpath_id;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/TIClip.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/TIClip.java Changed

@@ -1,9 +1,28 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2010 William Hahne
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
 package org.videolan;
 
 public class TIClip {
- public TIClip(StreamInfo[] videoStreams, StreamInfo[] audioStreams, StreamInfo[] pgStreams,
- StreamInfo[] igStreams, StreamInfo[] secVideoStreams, StreamInfo[] secAudioStreams)
- {
+ public TIClip(int index, StreamInfo[] videoStreams, StreamInfo[] audioStreams, StreamInfo[] pgStreams,
+ StreamInfo[] igStreams, StreamInfo[] secVideoStreams, StreamInfo[] secAudioStreams) {
+ this.index = index;
 this.videoStreams = videoStreams;
 this.audioStreams = audioStreams;
 this.pgStreams = pgStreams;
@@ -11,37 +30,60 @@
 this.secVideoStreams = secVideoStreams;
 this.secAudioStreams = secAudioStreams;
 }
- 
- public StreamInfo[] getVideoStreams()
- {
+
+ public int getIndex() {
+ return index;
+ }
+
+ public int getVideoStreamCount() {
+ return videoStreams.length;
+ }
+
+ public StreamInfo[] getVideoStreams() {
 return videoStreams;
 }
- 
- public StreamInfo[] getAudioStreams()
- {
+
+ public int getAudioStreamCount() {
+ return audioStreams.length;
+ }
+
+ public StreamInfo[] getAudioStreams() {
 return audioStreams;
 }
- 
- public StreamInfo[] getPgStreams()
- {
+
+ public int getPgStreamCount() {
+ return pgStreams.length;
+ }
+
+ public StreamInfo[] getPgStreams() {
 return pgStreams;
 }
- 
- public StreamInfo[] getIgStreams()
- {
+
+ public int getIgStreamCount() {
+ return igStreams.length;
+ }
+
+ public StreamInfo[] getIgStreams() {
 return igStreams;
 }
- 
- public StreamInfo[] getSecVideoStreams()
- {
+
+ public int getSecVideoStreamCount() {
+ return secVideoStreams.length;
+ }
+
+ public StreamInfo[] getSecVideoStreams() {
 return secVideoStreams;
 }
- 
- public StreamInfo[] getSecAudioStreams()
- {
+
+ public int getSecAudioStreamCount() {
+ return secAudioStreams.length;
+ }
+
+ public StreamInfo[] getSecAudioStreams() {
 return secAudioStreams;
 }
 
+ private int index;
 private StreamInfo[] videoStreams = null;
 private StreamInfo[] audioStreams = null;
 private StreamInfo[] pgStreams = null;

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/TIMark.java Added

@@ -0,0 +1,73 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2010 William Hahne
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan;
+
+public class TIMark {
+ public TIMark(int index, int type, long start, long duration, long offset, int clip) {
+ this.index = index;
+ this.type = type;
+ this.start = start;
+ this.duration = duration;
+ this.offset = offset;
+ this.clip = clip;
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public long getStart() {
+ return start;
+ }
+
+ public long getStartNanoseconds() {
+ return start * 100000 / 9;
+ }
+
+ public long getDuration() {
+ return duration;
+ }
+
+ public long getDurationNanoseconds() {
+ return duration * 100000 / 9;
+ }
+
+ public long getOffset() {
+ return offset;
+ }
+
+ public int getClipIndex() {
+ return clip;
+ }
+
+ public int getType() {
+ return type;
+ }
+
+ private int index;
+ private int type;
+ private long start;
+ private long duration;
+ private long offset;
+ private int clip;
+ 
+ public static final int MARK_TYPE_ENTRY = 1;
+ public static final int MARK_TYPE_LINK = 2;
+}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/TitleInfo.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/TitleInfo.java Changed

@@ -1,6 +1,5 @@
 /*
  * This file is part of libbluray
- * Copyright (C) 2010  William Hahne
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,51 +19,52 @@
 package org.videolan;
 
 public class TitleInfo {
-    public TitleInfo(int index, int playlist, long duration, int angles, TIChapter[] chapters, TIClip[] clips)
-    {
-        this.index = index;
-        this.playlist = playlist;
-        this.duration = duration;
-        this.angles = angles;
-        this.chapters = chapters;
-        this.clips = clips;
+    public TitleInfo(int title, int objType, int playbackType, String bdjoName, int hdmvOID) {
+        this.title = title;
+        this.objType = objType;
+        this.playbackType = playbackType;
+        this.bdjoName = bdjoName;
+        this.hdmvOID = hdmvOID;
     }
-    
-    public int getIndex()
-    {
-        return index;
+
+    public int getTitleNum() {
+        return title;
+    }
+
+    public int getObjType() {
+        return objType;
     }
 
-    public int getPlaylist()
-    {
-        return playlist;
+    public int getPlaybackType() {
+        return playbackType;
     }
 
-    public long getDuration()
-    {
-        return duration;
+    public String getBdjoName() {
+        return bdjoName;
     }
 
-    public TIChapter[] getChapters()
-    {
-        return chapters;
+    public int getHdmvOID() {
+        return hdmvOID;
     }
-    
-    public TIClip[] getClips()
-    {
-        return clips;
+
+    public boolean isBdj() {
+        return (objType == OBJ_TYPE_BDJ);
     }
-    
-    public int getAngleCount()
-    {
-        return angles;
+
+    public boolean isHdmv() {
+        return (objType == OBJ_TYPE_HDMV);
     }
 
-    private int index;
-    private int playlist;
-    private long duration;
-    private int angles;
-    private TIChapter[] chapters;
-    private TIClip[] clips;
-    
+    private int title;
+    private int objType;
+    private int playbackType;
+    private String bdjoName;
+    private int hdmvOID;
+
+    public static final int OBJ_TYPE_HDMV = 1;
+    public static final int OBJ_TYPE_BDJ = 2;
+    public static final int HDMV_PLAYBACK_TYPE_MOVIE = 0;
+    public static final int HDMV_PLAYBACK_TYPE_INTERACTIVE = 1;
+    public static final int BDJ_PLAYBACK_TYPE_MOVIE = 2;
+    public static final int BDJ_PLAYBACK_TYPE_INTERACTIVE = 3;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/AppCache.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/AppCache.java Changed

@@ -4,33 +4,35 @@
 public class AppCache {
     public AppCache(int type, String refToName, String language)
     {
-        this.type = AppCacheType.fromId(type);
+        this.type = type;
         this.refToName = refToName;
         this.language = language;
     }
 
-    public AppCacheType getType()
+    public int getType()
     {
         return type;
     }
-    
+
     public String getRefToName()
     {
         return refToName;
     }
-    
+
     public String getLanguage()
     {
         return language;
     }
-    
+
     public String toString()
     {
-        return "AppCache [language=" + language + ", refToName=" + refToName
-                + ", type=" + type + "]";
+        return "AppCache [language=" + language + ", refToName=" + refToName + ", type=" + type + "]";
     }
-    
-    private AppCacheType type;
+
+    public static final int JAR_FILE = 1;
+    public static final int DIRECTORY = 2;
+
+    private int type;
     private String refToName;
     private String language;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/AppEntry.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/AppEntry.java Changed

@@ -1,134 +1,200 @@
 package org.videolan.bdjo;
 
-import java.util.Arrays;
+import java.util.BitSet;
 
 import org.davic.net.Locator;
+import org.bluray.application.AppAttributes;
+import org.bluray.net.BDLocator;
+import org.dvb.application.AppID;
+import org.dvb.application.AppIcon;
+import org.dvb.application.IllegalProfileParameterException;
+import org.dvb.application.LanguageNotAvailableException;
+import org.dvb.user.GeneralPreference;
+import org.dvb.user.UserPreferenceManager;
+import org.videolan.StrUtil;
 
-public class AppEntry {
- public AppEntry(int controlCode, int type, int orgId,
- short appId, AppProfile[] profiles, short priority,
- int binding, int visibility, AppName[] names,
- String iconLocator, short iconFlags, String basePath,
- String classpathExt, String initialClass, String[] params)
- {
- this.controlCode = ControlCode.fromId(controlCode);
- this.type = AppType.fromId(type);
- this.orgId = orgId;
- this.appId = appId;
-
- this.profiles = profiles;
- this.priority = priority;
- this.binding = AppBinding.fromId(binding);
- this.visibility = AppVisibility.fromId(visibility);
- this.names = names;
- this.iconLocator = new Locator(iconLocator);
- this.iconFlags = iconFlags;
- this.basePath = basePath;
- this.classpathExt = classpathExt;
- this.initialClass = initialClass;
- this.params = params;
+public class AppEntry implements AppAttributes {
+ public AppIcon getAppIcon() {
+ return icon;
 }
 
- public ControlCode getControlCode()
- {
- return controlCode;
+ public AppID getIdentifier() {
+ return appid;
 }
- 
- public AppType getType()
- {
- return type;
+
+ public boolean getIsServiceBound() {
+ return ((binding & TITLE_BOUND) != 0);
 }
- 
- public int getOrgId()
- {
- return orgId;
+
+ public String getName() {
+ UserPreferenceManager pm = UserPreferenceManager.getInstance();
+ GeneralPreference p = new GeneralPreference("User Language");
+ pm.read(p);
+ String lang = p.getMostFavourite();
+ if (lang != null)
+ try {
+ return getName(lang);
+ } catch (LanguageNotAvailableException e) {
+
+ }
+ if (names == null || names.length < 1) {
+ return null;
+ }
+
+ return names[0][1];
 }
- 
- public short getAppId()
- {
- return appId;
+
+ public String getName(String language) throws LanguageNotAvailableException {
+ for (int i = 0; i < names.length; i++)
+ if (language.equals(names[i][0]))
+ return names[i][1];
+ throw new LanguageNotAvailableException();
 }
- 
- public AppProfile[] getProfiles()
- {
- return profiles;
+
+ public String[][] getNames() {
+ return names;
 }
- 
- public short getPriority()
- {
+
+ public int getPriority() {
 return priority;
 }
- 
- public AppBinding getBinding()
- {
- return binding;
+
+ public String[] getProfiles() {
+ String[] ret = new String[0];
+ for (int i = 0; i < profiles.length; i++) {
+ if (profiles[i].getProfile() == 1)
+ ret = new String[] { "mhp.profile.enhanced_broadcast" };
+ if (profiles[i].getProfile() == 2)
+ ret = new String[] { "mhp.profile.enhanced_broadcast", "mhp.profile.interactive_broadcast" };
+ }
+ return ret;
 }
- 
- public AppVisibility getVisibility()
- {
- return visibility;
+
+ public Object getProperty(String name) {
+ if (name.equals("dvb.j.location.base"))
+ return basePath;
+ if (name.equals("dvb.j.location.cpath.extension"))
+ return StrUtil.split(classpathExt, ';');
+ if (name.equals("dvb.transport.oc.component.tag"))
+ return null;
+ return null;
 }
- 
- public AppName[] getNames()
- {
- return names;
+
+ public Locator getServiceLocator() {
+ /*
+ try {
+ String discID = BDJTitleInfoHelper.getCurrent32LengthDiscIDFromC();
+ int titleNumber = BDJTitleInfoHelper.getCurrentTitleNumberFromC();
+ return new BDLocator(discID, titleNumber, 0);
+ }
+ catch (InvalidLocatorException e) {
+ BDJTrace.printStack(e.getStackTrace());
+ BDJAssert.doAssert(false, "can not get the service locator");
+ }
+ */
+ return null;
+ }
+
+ public int getType() {
+ return type;
 }
- 
- public Locator getIconLocator()
- {
- return iconLocator;
+
+ public int[] getVersions(String profile) throws IllegalProfileParameterException {
+ if (profile.equals("mhp.profile.enhanced_broadcast")) {
+ for (int i = 0; i < profiles.length; i++)
+ if (profiles[i].getProfile() == 2)
+ return new int[] { profiles[i].getMajor(), profiles[i].getMinor(), profiles[i].getMicro() };
+ return null;
+ }
+ if (profile.equals("mhp.profile.interactive_broadcast")) {
+ for (int i = 0; i < profiles.length; i++)
+ if (profiles[i].getProfile() == 1)
+ return new int[] { profiles[i].getMajor(), profiles[i].getMinor(), profiles[i].getMicro() };
+ return null;
+ }
+ throw new IllegalProfileParameterException();
+ }
+
+ public boolean isStartable() {
+ return ((controlCode == AUTOSTART) || (controlCode == PRESENT));
+ }
+
+ public boolean isVisible() {
+ return ((visibility & VISIBLE_TO_USERS) != 0);
+ }
+
+ public boolean isDiscBound() {
+ return ((binding & DISC_BOUND) != 0);
+ }
+
+ public AppEntry(int controlCode, int type, int orgId,
+ short appId, AppProfile[] profiles, short priority,
+ int binding, int visibility, String[][] names,
+ String iconLocator, short iconFlags, String basePath,
+ String classpathExt, String initialClass, String[] params) {
+ this.controlCode = controlCode;
+ this.type = type;
+ this.appid = new AppID(orgId, appId);
+
+ this.profiles = profiles;
+ this.priority = priority;
+ this.binding = binding;
+ this.visibility = visibility;
+ this.names = names;
+ if ((iconLocator != null) && (iconLocator.length() > 0)) {
+ try {
+ BDLocator locator = new BDLocator("bd://JAR:" + basePath + "/" + iconLocator);
+ BitSet flags = new BitSet(16);
+ for (int i = 0; i < 9; i++)
+ if ((iconFlags & (1 << i)) != 0)
+ flags.set(i, true);
+ this.icon = new AppIcon(locator, flags);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ this.basePath = basePath;
+ this.classpathExt = classpathExt;
+ this.initialClass = initialClass;
+ this.params = params;
 }
- 
- public short getIconFlags()
- {
- return iconFlags;
+
+ public int getControlCode() {
+ return controlCode;
 }
- 
- public String getBasePath()
- {
+
+ public String getBasePath() {
 return basePath;
 }
- 
- public String getClasspathExt()
- {
+
+ public String getClassPathExt() {
 return classpathExt;
 }
- 
- public String getInitialClass()
- {
+
+ public String getInitialClass() {
 return initialClass;
 }
- 
- public String[] getParams()
- {
- return params;
- }
 
- public String toString()
- {
- return "AppEntry [appId=" + appId + ", basePath=" + basePath
- + ", binding=" + binding + ", classpathExt=" + classpathExt
- + ", controlCode=" + controlCode + ", iconFlags=" + iconFlags
- + ", iconLocator=" + iconLocator + ", initialClass="
- + initialClass + ", names=" + Arrays.toString(names)
- + ", orgId=" + orgId + ", params=" + Arrays.toString(params)
- + ", priority=" + priority + ", profiles="
- + Arrays.toString(profiles) + ", type=" + type
- + ", visibility=" + visibility + "]";
+ public String[] getParams() {
+ return params;
 }
 
- private ControlCode controlCode;
- private AppType type;
- private int orgId;
- private short appId;
+ public static final int AUTOSTART = 1;
+ public static final int PRESENT = 2;
+ protected static final int DISC_BOUND = 1;
+ protected static final int TITLE_BOUND = 2;
+ protected static final int VISIBLE_TO_APPS = 1;
+ protected static final int VISIBLE_TO_USERS = 2;
 
+ private int controlCode;
+ private int type;
+ private AppID appid;
 private AppProfile[] profiles;
 private short priority;
- private AppBinding binding;
- private AppVisibility visibility;
- private AppName[] names;
- private Locator iconLocator;
- private short iconFlags;
+ private int binding;
+ private int visibility;
+ private String[][] names;
+ private AppIcon icon;
 private String basePath;
 private String classpathExt;
 private String initialClass;

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/Bdjo.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/Bdjo.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/GraphicsResolution.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/GraphicsResolution.java Changed

@@ -1,54 +1,51 @@
 package org.videolan.bdjo;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
+public class GraphicsResolution {
+    public static final GraphicsResolution HD_1920_1080 = new GraphicsResolution(1, 1920, 1080);
+    public static final GraphicsResolution HD_1280_720 = new GraphicsResolution(2, 1280, 720);
+    public static final GraphicsResolution SD = new GraphicsResolution(3, 720, 480); // FIXME: probably should take into consideration PAL
+    public static final GraphicsResolution SD_50HZ_720_576 = new GraphicsResolution(4, 720, 576);
+    public static final GraphicsResolution SD_60HZ_720_480 = new GraphicsResolution(5, 720, 480);
+    public static final GraphicsResolution QHD_960_540 = new GraphicsResolution(6, 960, 540);
 
-public enum GraphicsResolution
-{
-    HD_1920_1080(1, 1920, 1080),
-    HD_1280_720(2, 1280, 720),
-    SD(3, 720, 480), // FIXME: probably should take into consideration PAL
-    SD_50HZ_720_576(4, 720, 576),
-    SD_60HZ_720_480(5, 720, 480),
-    QHD_960_540(6, 960, 540);
-    
     GraphicsResolution(int id, int width, int height)
-    {
+{
         this.id = id;
         this.width = width;
         this.height = height;
     }
-    
-    public int getId()
-    {
+
+    public int getId() {
         return id;
     }
-    
-    public int getWidth()
-    {
+
+    public int getWidth() {
         return width;
     }
-    
-    public int getHeight()
-    {
+
+    public int getHeight() {
         return height;
     }
-    
-    public static GraphicsResolution fromId(int id)
-    {
-        for (GraphicsResolution res : values())
-        {
-            if (res.getId() == id)
-                return res;
+
+    public static GraphicsResolution fromId(int id) {
+        switch (id) {
+        case 1:
+            return HD_1920_1080;
+        case 2:
+            return HD_1280_720;
+        case 3:
+            return SD;
+        case 4:
+            return SD_50HZ_720_576;
+        case 5:
+            return SD_60HZ_720_480;
+        case 6:
+            return QHD_960_540;
         }
-        
-        logger.log(Level.WARNING, "Invalid graphics resolution id: " + id);
         return null;
     }
-    
+
     private int id;
     private int width;
     private int height;
-    
-    private static final Logger logger = Logger.getLogger(GraphicsResolution.class.getName());
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/PlayListTable.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/PlayListTable.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/TerminalInfo.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/bdjo/TerminalInfo.java Changed

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/BDHandler.java Added

@@ -0,0 +1,604 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan.media.content;
+
+import java.awt.Component;
+import java.io.IOException;
+import java.util.LinkedList;
+
+import javax.media.Clock;
+import javax.media.ClockStoppedException;
+import javax.media.Control;
+import javax.media.Controller;
+import javax.media.ControllerClosedEvent;
+import javax.media.ControllerErrorEvent;
+import javax.media.ControllerEvent;
+import javax.media.ControllerListener;
+import javax.media.DeallocateEvent;
+import javax.media.EndOfMediaEvent;
+import javax.media.GainControl;
+import javax.media.IncompatibleSourceException;
+import javax.media.IncompatibleTimeBaseException;
+import javax.media.Manager;
+import javax.media.NotPrefetchedError;
+import javax.media.NotRealizedError;
+import javax.media.Player;
+import javax.media.PrefetchCompleteEvent;
+import javax.media.RealizeCompleteEvent;
+import javax.media.StartEvent;
+import javax.media.StopByRequestEvent;
+import javax.media.Time;
+import javax.media.TimeBase;
+import javax.media.TransitionEvent;
+import javax.media.protocol.DataSource;
+
+import javax.tv.locator.Locator;
+import javax.tv.service.selection.ServiceContentHandler;
+
+import org.bluray.media.OverallGainControl;
+import org.bluray.net.BDLocator;
+
+import org.videolan.BDJAction;
+import org.videolan.BDJActionManager;
+import org.videolan.BDJListeners;
+import org.videolan.BDJXletContext;
+import org.videolan.Logger;
+
+public abstract class BDHandler implements Player, ServiceContentHandler {
+ public BDHandler() {
+ }
+
+ private void checkUnrealized() {
+ synchronized (this) {
+ if (state == Unrealized)
+ throw new NotRealizedError("Player Unrealized");
+ }
+ }
+
+ public abstract void setSource(DataSource source)
+ throws IOException, IncompatibleSourceException;
+
+ public int getState() {
+ synchronized (this) {
+ return state;
+ }
+ }
+
+ public int getTargetState() {
+ synchronized (this) {
+ return targetState;
+ }
+ }
+
+ public Control[] getControls() {
+ return controls;
+ }
+
+ public Control getControl(String forName) {
+ try {
+ Class cls = Class.forName(forName);
+ for (int i = 0; i < controls.length; i++) {
+ if (cls.isInstance(controls[i]))
+ return controls[i];
+ }
+ return null;
+ } catch (ClassNotFoundException e) {
+ return null;
+ }
+ }
+
+ public GainControl getGainControl() {
+ checkUnrealized();
+ for (int i = 0; i < controls.length; i++) {
+ if (controls[i] instanceof OverallGainControl)
+ return (GainControl)controls[i];
+ }
+ return null;
+ }
+
+ public void addController(Controller newController) throws IncompatibleTimeBaseException {
+ checkUnrealized();
+ }
+
+ public void removeController(Controller oldController) {
+ checkUnrealized();
+ }
+
+ public Component getControlPanelComponent() {
+ checkUnrealized();
+ return null;
+ }
+
+ public Component getVisualComponent() {
+ checkUnrealized();
+ return null;
+ }
+
+ public void addControllerListener(ControllerListener listener) {
+ listeners.add(listener);
+ }
+
+ public void removeControllerListener(ControllerListener listener) {
+ listeners.remove(listener);
+ }
+
+ public Time getStartLatency() {
+ checkUnrealized();
+ return new Time(0.1d);
+ }
+
+ public TimeBase getTimeBase() {
+ checkUnrealized();
+ return Manager.getSystemTimeBase();
+ }
+
+ public void setTimeBase(TimeBase master) throws IncompatibleTimeBaseException {
+ checkUnrealized();
+ throw new IncompatibleTimeBaseException();
+ }
+
+ public Time getStopTime() {
+ return stopTime;
+ }
+
+ public void setStopTime(Time stopTime) {
+ checkUnrealized();
+ // TODO: actually stopping when stop time is hit needs to be implemented
+ this.stopTime = stopTime;
+ }
+
+ public Time getMediaTime() {
+ synchronized (this) {
+ if (state == Started)
+ return new Time((baseMediaTime + (getTimeBase().getNanoseconds() - baseTime)) / 1000000000.0d);
+ else
+ return new Time(baseMediaTime / 1000000000.0d);
+ }
+ }
+
+ public long getMediaNanoseconds() {
+ synchronized (this) {
+ if ((state == Started) && (rate != 0.0f))
+ return baseMediaTime + (getTimeBase().getNanoseconds() - baseTime);
+ else
+ return baseMediaTime;
+ }
+ }
+
+ public Time getSyncTime() {
+ return getMediaTime();
+ }
+
+ public void setMediaTime(Time now) {
+ checkUnrealized();
+ PlayerAction action = new PlayerAction(this, PlayerAction.ACTION_SEEK_TIME, now);
+ BDJActionManager.getInstance().putCommand(action);
+ action.waitEnd();
+ }
+
+ public Time mapToTimeBase(Time t) throws ClockStoppedException {
+ if (state != Started)
+ throw new ClockStoppedException();
+ return getMediaTime();
+ }
+
+ public abstract Time getDuration();
+
+ protected void updateTime(Time now) {
+ baseMediaTime = now.getNanoseconds();
+ baseTime = getTimeBase().getNanoseconds();
+ }
+
+ public float getRate() {
+ return rate;
+ }
+
+ public float setRate(float factor) {
+ checkUnrealized();
+ PlayerAction action = new PlayerAction(this, PlayerAction.ACTION_SET_RATE, new Float(factor));
+ BDJActionManager.getInstance().putCommand(action);
+ action.waitEnd();
+ return rate;
+ }
+
+ public Locator[] getServiceContentLocators() {
+ if (locator == null)
+ return new Locator[0];
+ Locator[] locators = new Locator[1];
+ locators[0] = locator;
+ return locators;
+ }
+
+ public void realize() {
+ PlayerAction action = new PlayerAction(this, PlayerAction.ACTION_REALIZE, null);
+ BDJActionManager.getInstance().putCommand(action);
+ }
+
+ public void prefetch() {
+ PlayerAction action = new PlayerAction(this, PlayerAction.ACTION_PREFETCH, null);
+ BDJActionManager.getInstance().putCommand(action);
+ }
+
+ public void syncStart(Time at) {
+ synchronized (this) {
+ if (state != Prefetched)
+ throw new NotPrefetchedError("syncStart");
+ }
+ PlayerAction action = new PlayerAction(this, PlayerAction.ACTION_START, at);
+ BDJActionManager.getInstance().putCommand(action);
+ }
+
+ public void start() {
+ PlayerAction action = new PlayerAction(this, PlayerAction.ACTION_START, null);
+ BDJActionManager.getInstance().putCommand(action);
+ }
+
+ public void stop() {
+ PlayerAction action = new PlayerAction(this, PlayerAction.ACTION_STOP, null);
+ BDJActionManager.getInstance().putCommand(action);
+ action.waitEnd();
+ }
+
+ public void deallocate() {
+ PlayerAction action = new PlayerAction(this, PlayerAction.ACTION_DEALLOCATE, null);
+ BDJActionManager.getInstance().putCommand(action);
+ action.waitEnd();
+ }
+
+ public void close() {
+ PlayerAction action = new PlayerAction(this, PlayerAction.ACTION_CLOSE, null);
+ BDJActionManager.getInstance().putCommand(action);
+ action.waitEnd();
+ }
+
+ protected void endOfMedia() {
+ PlayerAction action = new PlayerAction(this, PlayerAction.ACTION_END_OF_MEDIA, null);
+ BDJActionManager.getInstance().putCommand(action);
+ }
+
+ protected void updateTime(int time) {
+ //System.out.println("current time = " + time * TO_SECONDS);
+ //currentTime = new Time(time * TO_SECONDS);
+ }
+
+ public static void activePlayerEndOfMedia() {
+ synchronized (BDHandler.class) {
+ if (activePlayer != null)
+ activePlayer.endOfMedia();
+ }
+ }
+
+ public static void activePlayerUpdateTime(int pts) {
+ synchronized (BDHandler.class) {
+ if (activePlayer != null)
+ activePlayer.updateTime(pts);
+ }
+ }
+
+ public static void onChapterReach(int param) {
+ synchronized (BDHandler.class) {
+ if (activePlayer != null)
+ activePlayer.doChapterReach(param);
+ }
+ }
+
+ public static void onMarkReach(int param) {
+ synchronized (BDHandler.class) {
+ if (activePlayer != null)
+ activePlayer.doMarkReach(param);
+ }
+ }
+
+ public static void onPlayItemReach(int param) {
+ synchronized (BDHandler.class) {
+ if (activePlayer != null)
+ activePlayer.doPlayItemReach(param);
+ }
+ }
+
+ public static void onAngleChange(int param) {
+ synchronized (BDHandler.class) {
+ if (activePlayer != null)
+ activePlayer.doAngleChange(param);
+ }
+ }
+
+ public static void onSubtitleChange(int param) {
+ synchronized (BDHandler.class) {
+ if (activePlayer != null)
+ activePlayer.doSubtitleChange(param);
+ }
+ }
+
+ public static void onPiPChange(int param) {
+ synchronized (BDHandler.class) {
+ if (activePlayer != null)
+ activePlayer.doPiPChange(param);
+ }
+ }
+
+ protected abstract void doChapterReach(int param);
+ protected abstract void doMarkReach(int param);
+ protected abstract void doPlayItemReach(int param);
+ protected abstract void doAngleChange(int param);
+ protected abstract void doSubtitleChange(int param);
+ protected abstract void doPiPChange(int param);
+
+ protected ControllerErrorEvent doRealize() {
+ return null;
+ }
+
+ protected ControllerErrorEvent doPrefetch() {
+ return null;
+ }
+
+ protected ControllerErrorEvent doStart(Time at) {
+ if (at != null)
+ baseMediaTime = at.getNanoseconds();
+ baseTime = getTimeBase().getNanoseconds();
+ return null;
+ }
+
+ protected ControllerErrorEvent doStop() {
+ baseMediaTime = getMediaNanoseconds();
+ return null;
+ }
+
+ protected ControllerErrorEvent doDeallocate() {
+ return null;
+ }
+
+ protected ControllerErrorEvent doClose() {
+ return null;
+ }
+
+ protected void doSeekTime(Time at) {
+ updateTime(at);
+ }
+
+ protected void doSetRate(Float factor) {
+ rate = factor.floatValue();
+ }
+
+ private void notifyListeners(ControllerEvent event) {
+ listeners.putCallback(event);
+ }
+
+ private boolean doRealizeAction() {
+ switch (state) {
+ case Unrealized:
+ state = Realizing;
+ notifyListeners(new TransitionEvent(this, Unrealized, Realizing, Realized));
+ case Realizing:
+ ControllerErrorEvent error = doRealize();
+ if (error == null) {
+ state = Realized;
+ notifyListeners(new RealizeCompleteEvent(this, Realizing, Realized, Realized));
+ } else {
+ notifyListeners(error);
+ return false;
+ }
+ break;
+ default:
+ notifyListeners(new RealizeCompleteEvent(this, state, state, state));
+ break;
+ }
+ return true;
+ }
+
+ private boolean doPrefetchAction() {
+ switch (state) {
+ case Unrealized:
+ case Realizing:
+ if (!doRealizeAction())
+ return false;
+ case Realized:
+ state = Prefetching;
+ notifyListeners(new TransitionEvent(this, Realized, Prefetching, Prefetched));
+ case Prefetching:
+ synchronized (BDHandler.class) {
+ if (activePlayer != null)
+ activePlayer.doDeallocateAction();
+ activePlayer = this;
+ }
+ ControllerErrorEvent error = doPrefetch();
+ if (error == null) {
+ state = Prefetched;
+ notifyListeners(new PrefetchCompleteEvent(this, Prefetching, Prefetched, Prefetched));
+ } else {
+ notifyListeners(error);
+ return false;
+ }
+ break;
+ default:
+ notifyListeners(new PrefetchCompleteEvent(this, state, state, state));
+ break;
+ }
+ return true;
+ }
+
+ private boolean doStartAction(Time at) {
+ switch (state) {
+ case Unrealized:
+ case Realizing:
+ if (!doRealizeAction())
+ return false;
+ case Realized:
+ case Prefetching:
+ if (!doPrefetchAction())
+ return false;
+ case Prefetched:
+ ControllerErrorEvent error = doStart(at);
+ if (error == null) {
+ state = Started;
+ notifyListeners(new StartEvent(this, Prefetched, Started, Started, at, getMediaTime()));
+ } else {
+ notifyListeners(error);
+ return false;
+ }
+ break;
+ default:
+ notifyListeners(new StartEvent(this, state, state, state, at, getMediaTime()));
+ break;
+ }
+ return true;
+ }
+
+ private boolean doStopAction() {
+ switch (state) {
+ case Started:
+ ControllerErrorEvent error = doStop();
+ if (error == null) {
+ state = Prefetched;
+ notifyListeners(new StopByRequestEvent(this, Started, Prefetched, Prefetched, getMediaTime()));
+ } else {
+ notifyListeners(error);
+ return false;
+ }
+ break;
+ default:
+ notifyListeners(new StopByRequestEvent(this, state, state, state, getMediaTime()));
+ break;
+ }
+ return true;
+ }
+
+ private boolean doDeallocateAction() {
+ ControllerErrorEvent error;
+ switch (state) {
+ case Realizing:
+ error = doDeallocate();
+ if (error == null) {
+ state = Unrealized;
+ notifyListeners(new DeallocateEvent(this, Realizing, Unrealized, Unrealized, getMediaTime()));
+ } else {
+ notifyListeners(error);
+ return false;
+ }
+ break;
+ case Unrealized:
+ case Realized:
+ notifyListeners(new DeallocateEvent(this, state, state, state, getMediaTime()));
+ break;
+ default:
+ error = doDeallocate();
+ if (error == null) {
+ synchronized (BDHandler.class) {
+ if (activePlayer == this)
+ activePlayer = null;
+ }
+ int previous = state;
+ state = Realized;
+ notifyListeners(new DeallocateEvent(this, previous, Realized, Realized, getMediaTime()));
+ } else {
+ notifyListeners(error);
+ return false;
+ }
+ break;
+ }
+ return true;
+ }
+
+ private void doCloseAction() {
+ doClose();
+ notifyListeners(new ControllerClosedEvent(this));
+ }
+
+ private void doEndOfMediaAction() {
+ if (state == Started) {
+ ControllerErrorEvent error = doStop();
+ if (error == null) {
+ state = Prefetched;
+ notifyListeners(new EndOfMediaEvent(this, Started, Prefetched, Prefetched, getMediaTime()));
+ } else {
+ notifyListeners(error);
+ }
+ }
+ }
+
+ private class PlayerAction extends BDJAction {
+ private PlayerAction(BDHandler player, int action, Object param) {
+ this.player = player;
+ this.action = action;
+ this.param = param;
+ }
+
+ protected void doAction() {
+ switch (action) {
+ case ACTION_REALIZE:
+ player.doRealizeAction();
+ break;
+ case ACTION_PREFETCH:
+ player.doPrefetchAction();
+ break;
+ case ACTION_START:
+ player.doStartAction((param == null) ? null : (Time)param);
+ break;
+ case ACTION_STOP:
+ player.doStopAction();
+ break;
+ case ACTION_DEALLOCATE:
+ player.doDeallocateAction();
+ break;
+ case ACTION_CLOSE:
+ player.doCloseAction();
+ break;
+ case ACTION_END_OF_MEDIA:
+ player.doEndOfMediaAction();
+ break;
+ case ACTION_SEEK_TIME:
+ player.doSeekTime((Time)param);
+ break;
+ case ACTION_SET_RATE:
+ player.doSetRate((Float)param);
+ break;
+ }
+ }
+
+ private BDHandler player;
+ private int action;
+ private Object param;
+
+ public static final int ACTION_REALIZE = 1;
+ public static final int ACTION_PREFETCH = 2;
+ public static final int ACTION_START = 3;
+ public static final int ACTION_STOP = 4;
+ public static final int ACTION_DEALLOCATE = 5;
+ public static final int ACTION_CLOSE = 6;
+ public static final int ACTION_END_OF_MEDIA = 7;
+ public static final int ACTION_SEEK_TIME = 8;
+ public static final int ACTION_SET_RATE = 9;
+ }
+
+ protected int state = Unrealized;
+ protected int targetState = Unrealized;
+ protected Time stopTime = Clock.RESET;
+ protected long baseMediaTime = 0;
+ protected long baseTime;
+ protected float rate = 1.0f;
+ protected Control[] controls = null;
+ protected BDLocator locator = null;
+ private BDJListeners listeners = new BDJListeners();
+
+ public static final double TO_SECONDS = 1 / 90000.0d;
+ public static final double FROM_SECONDS = 90000.0d;
+ public static final double TO_NAROSECONDS = 1000000 / 90.0d;
+ public static final double FROM_NAROSECONDS = 0.00009d;
+ public static BDHandler activePlayer = null;
+}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/AngleControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/AngleControlImpl.java Changed

@@ -20,64 +20,56 @@
 package org.videolan.media.content.playlist;
 
 import java.awt.Component;
-import java.util.LinkedList;
 
 import org.bluray.media.AngleChangeEvent;
 import org.bluray.media.AngleChangeListener;
 import org.bluray.media.AngleControl;
 import org.bluray.media.InvalidAngleException;
+import org.videolan.BDJListeners;
 import org.videolan.Libbluray;
+import org.videolan.PlaylistInfo;
 
 public class AngleControlImpl implements AngleControl {
- protected AngleControlImpl(Handler player)
- {
+ protected AngleControlImpl(Handler player) {
 this.player = player;
 }
- 
- public Component getControlComponent()
- {
+
+ public Component getControlComponent() {
 return null;
 }
 
- public int getCurrentAngle()
- {
+ public int getCurrentAngle() {
 return Libbluray.getCurrentAngle();
 }
 
- public int getAvailableAngles()
- {
- return player.ti.getAngleCount();
+ public int getAvailableAngles() {
+ PlaylistInfo pi = player.getPlaylistInfo();
+ if (pi == null)
+ return -1;
+ return pi.getAngleCount();
 }
 
- public void selectDefaultAngle()
- {
+ public void selectDefaultAngle() {
 Libbluray.selectAngle(0);
- sendEvent(new AngleChangeEvent(this, 0));
 }
 
- public void selectAngle(int angle) throws InvalidAngleException
- {
- if(!Libbluray.selectAngle(angle))
+ public void selectAngle(int angle) throws InvalidAngleException {
+ if (!Libbluray.selectAngle(angle))
 throw new InvalidAngleException();
- sendEvent(new AngleChangeEvent(this, angle));
 }
 
- public void addAngleChangeListener(AngleChangeListener listener)
- {
+ public void addAngleChangeListener(AngleChangeListener listener) {
 listeners.add(listener);
 }
 
- public void removeAngleChangeListener(AngleChangeListener listener)
- {
+ public void removeAngleChangeListener(AngleChangeListener listener) {
 listeners.remove(listener);
 }
- 
- private void sendEvent(AngleChangeEvent event)
- {
- for (AngleChangeListener listener : listeners)
- listener.angleChange(event);
+
+ protected void onAngleChange(int angle) {
+ listeners.putCallback(new AngleChangeEvent(this, angle));
 }
- 
- private LinkedList<AngleChangeListener> listeners = new LinkedList<AngleChangeListener>();
+
+ private BDJListeners listeners = new BDJListeners();
 private Handler player;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/AudioMetadataControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/AudioMetadataControlImpl.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/BackgroundVideoPresentationControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/BackgroundVideoPresentationControlImpl.java Changed

@@ -19,108 +19,120 @@
 
 package org.videolan.media.content.playlist;
 
-import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Rectangle;
 
+import javax.tv.media.AWTVideoSize;
+import javax.tv.media.AWTVideoSizeControl;
+
 import org.dvb.media.BackgroundVideoPresentationControl;
 import org.dvb.media.VideoTransformation;
+import org.havi.ui.HScreenPoint;
 import org.havi.ui.HScreenRectangle;
-import org.videolan.BDJLoader;
-import org.videolan.bdjo.GraphicsResolution;
-
-public class BackgroundVideoPresentationControlImpl implements BackgroundVideoPresentationControl {
-
- public Dimension getInputVideoSize()
- {
- GraphicsResolution res = BDJLoader.getBdjo().getTerminalInfo().getResolution();
- return new Dimension(res.getWidth(), res.getHeight()); // FIXME: return actual input video size
- }
-
- public Dimension getVideoSize()
- {
- return getInputVideoSize();
- }
-
- public HScreenRectangle getActiveVideoArea()
- {
- return new HScreenRectangle(0.0f, 0.0f, 1.0f, 1.0f); // FIXME: return actual active video area
- }
-
- public HScreenRectangle getActiveVideoAreaOnScreen()
- {
- return getActiveVideoArea(); // FIXME: return actual active video area on screen
- }
-
- public HScreenRectangle getTotalVideoArea()
- {
- return getActiveVideoArea(); // FIXME: return actual total video area
- }
-
- public HScreenRectangle getTotalVideoAreaOnScreen()
- {
- return getActiveVideoArea(); // FIXME: return actual total video area on screen
- }
-
- public boolean supportsClipping()
- {
- return false; // FIXME: change when clipping support added
- }
-
- public Rectangle setClipRegion(Rectangle clipRect)
- {
- return getClipRegion(); // FIXME: implement clipping support
- }
-
- public Rectangle getClipRegion()
- {
- GraphicsResolution res = BDJLoader.getBdjo().getTerminalInfo().getResolution();
- return new Rectangle(res.getWidth(), res.getHeight()); // FIXME: implement clipping support
- }
-
- public float[] supportsArbitraryHorizontalScaling()
- {
- return null; // FIXME: implement scaling support
- }
-
- public float[] supportsArbitraryVerticalScaling()
- {
- return null; // FIXME: implement scaling support
- }
-
- public float[] getHorizontalScalingFactors()
- {
- return null; // FIXME: implement scaling support
- }
-
- public float[] getVerticalScalingFactors()
- {
- return null; // FIXME: implement scaling support
- }
-
- public byte getPositioningCapability()
- {
- return 0; // FIXME: set to real positioning capability
- }
-
- public Component getControlComponent()
- {
- return null;
- }
-
- public boolean setVideoTransformation(VideoTransformation transform)
- {
- return false; // FIXME: implement actually setting transform
- }
-
- public VideoTransformation getVideoTransformation()
- {
- return new VideoTransformation();
- }
-
- public VideoTransformation getClosestMatch(VideoTransformation transform)
- {
- return new VideoTransformation(); // FIXME: actually try to find closest match
- }
-
+import org.videolan.StreamInfo;
+import org.videolan.TIClip;
+
+public class BackgroundVideoPresentationControlImpl extends VideoControl
+ implements BackgroundVideoPresentationControl, AWTVideoSizeControl {
+ protected BackgroundVideoPresentationControlImpl(Handler player) {
+ super(player, 0);
+ }
+
+ protected StreamInfo[] getStreams() {
+ TIClip ci = player.getCurrentClipInfo();
+ if (ci == null)
+ return null;
+ return ci.getVideoStreams();
+ }
+
+ protected void setStreamNumber(int num) {
+ }
+
+ public int getCurrentStreamNumber() {
+ return 1;
+ }
+
+ public boolean setVideoTransformation(VideoTransformation transform) {
+ setClipRegion(transform.getClipRegion());
+ HScreenPoint pos = transform.getVideoPosition();
+ float[] scales = transform.getScalingFactors();
+ Dimension vd = getInputVideoSize();
+ Dimension sd = getScreenSize();
+ setVideoArea(new HScreenRectangle(
+ pos.x, pos.y,
+ vd.width * scales[0] / sd.width,
+ vd.height * scales[0] / sd.height));
+ return true;
+ }
+
+ public VideoTransformation getVideoTransformation() {
+ Dimension vd = getInputVideoSize();
+ HScreenRectangle rect = getActiveVideoArea();
+ float xscale, yscale;
+ if ((vd.width == 0) || (vd.height == 0)) {
+ xscale = 0.0f;
+ yscale = 0.0f;
+ } else {
+ Dimension sd = getScreenSize();
+ xscale = rect.width * sd.width / vd.width;
+ yscale = rect.height * sd.height / vd.height;
+ }
+ return new VideoTransformation(
+ getClipRegion(),
+ xscale, yscale,
+ new HScreenPoint(rect.x, rect.y));
+ }
+
+ public VideoTransformation getClosestMatch(VideoTransformation transform) {
+ return transform;
+ }
+
+ public AWTVideoSize getSize() {
+ return new AWTVideoSize(
+ getClipRegion(),
+ getRectangle(getScreenSize(), getActiveVideoArea()));
+ }
+
+ public AWTVideoSize getDefaultSize() {
+ Dimension vd = getInputVideoSize();
+ Dimension sd = getScreenSize();
+ return new AWTVideoSize(
+ new Rectangle(vd.width, vd.height),
+ new Rectangle(sd.width, sd.height));
+ }
+
+ public Dimension getSourceVideoSize() {
+ return getVideoSize();
+ }
+
+ public boolean setSize(AWTVideoSize size) {
+ setClipRegion(size.getSource());
+ setVideoArea(getNormalizedRectangle(getScreenSize(), size.getDestination()));
+ return true;
+ }
+
+ public AWTVideoSize checkSize(AWTVideoSize size) {
+ Dimension vd = getInputVideoSize();
+ Rectangle sr = size.getSource();
+ if (sr.x < 0)
+ sr.x = 0;
+ if ((sr.x + sr.width) > vd.width) {
+ sr.width = vd.width - sr.x;
+ if (sr.width <= 0) {
+ sr.x = 0;
+ sr.width = 0;
+ }
+ }
+ if (sr.y < 0)
+ sr.y = 0;
+ if ((sr.y + sr.height) > vd.height) {
+ sr.height = vd.height - sr.y;
+ if (sr.height <= 0) {
+ sr.y = 0;
+ sr.height = 0;
+ }
+ }
+ Rectangle dr = size.getDestination();
+ return new AWTVideoSize(sr, dr);
+ }
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/DVBMediaSelectControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/DVBMediaSelectControlImpl.java Changed

@@ -20,76 +20,240 @@
 package org.videolan.media.content.playlist;
 
 import java.awt.Component;
+import java.util.LinkedList;
 
+import javax.media.Control;
 import javax.tv.locator.InvalidLocatorException;
 import javax.tv.locator.Locator;
 import javax.tv.media.MediaSelectListener;
 import javax.tv.service.selection.InsufficientResourcesException;
 import javax.tv.service.selection.InvalidServiceComponentException;
 
+import org.bluray.media.AsynchronousPiPControl;
+import org.bluray.net.BDLocator;
 import org.dvb.media.DVBMediaSelectControl;
+import org.videolan.PlaylistInfo;
+import org.videolan.TIClip;
 
 public class DVBMediaSelectControlImpl implements DVBMediaSelectControl{
-
- public void select(Locator component) throws InvalidLocatorException,
- InvalidServiceComponentException, InsufficientResourcesException,
- SecurityException
- {
- throw new Error("Not implemented"); // TODO: Not implemented
+ protected DVBMediaSelectControlImpl(Handler player) {
+ this.player = player;
 }
 
- public void select(Locator[] components) throws InvalidLocatorException,
- InvalidServiceComponentException, InsufficientResourcesException,
- SecurityException
- {
- throw new Error("Not implemented"); // TODO: Not implemented
+ public void add(Locator component)
+ throws InvalidLocatorException, InvalidServiceComponentException,
+ InsufficientResourcesException, SecurityException {
+ if (!checkLocator(component))
+ throw new InvalidLocatorException(component);
+ BDLocator locator = (BDLocator)component;
+ if (locator.getSecondaryVideoStreamNumber() <= 0)
+ throw new InvalidServiceComponentException(component);
+ AsynchronousPiPControl control = (AsynchronousPiPControl)
+ player.getControl("org.bluray.media.AsynchronousPiPControl");
+ if (control.getCurrentStreamNumber() > 0)
+ throw new InsufficientResourcesException();
+ try {
+ control.selectStreamNumber(locator.getSecondaryVideoStreamNumber());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
 }
 
- public void add(Locator component) throws InvalidLocatorException,
- InvalidServiceComponentException, InsufficientResourcesException,
- SecurityException
- {
- throw new Error("Not implemented"); // TODO: Not implemented
+ public void remove(Locator component)
+ throws InvalidLocatorException, InvalidServiceComponentException,
+ SecurityException {
+ if (!checkLocator(component))
+ throw new InvalidLocatorException(component);
+ BDLocator locator = (BDLocator)component;
+ if (locator.getSecondaryVideoStreamNumber() <= 0)
+ throw new InvalidServiceComponentException(component);
+ AsynchronousPiPControl control = (AsynchronousPiPControl)
+ player.getControl("org.bluray.media.AsynchronousPiPControl");
+ if (control.getCurrentStreamNumber() != locator.getSecondaryVideoStreamNumber())
+ throw new InvalidLocatorException(component);
+ control.stop();
 }
 
- public void remove(Locator component) throws InvalidLocatorException,
- InvalidServiceComponentException, SecurityException
- {
- throw new Error("Not implemented"); // TODO: Not implemented
+ public void select(Locator component)
+ throws InvalidLocatorException, InvalidServiceComponentException,
+ InsufficientResourcesException, SecurityException {
+ if (!checkLocator(component))
+ throw new InvalidLocatorException(component);
+ Control control = getControl((BDLocator)component);
+ if (control == null)
+ throw new InvalidLocatorException(component);
+ if (!(control instanceof StreamControl))
+ return;
+ int stream = getStream((BDLocator)component);
+ if (stream <= 0)
+ throw new InvalidLocatorException(component);
+ try {
+ ((StreamControl)control).selectStreamNumber(stream);
+ } catch (Exception e) {
+ throw new InvalidLocatorException(component);
+ }
 }
 
- public void replace(Locator fromComponent, Locator toComponent)
- throws InvalidLocatorException, InvalidServiceComponentException,
- InsufficientResourcesException, SecurityException
- {
- throw new Error("Not implemented"); // TODO: Not implemented
+ public void select(Locator[] components)
+ throws InvalidLocatorException, InvalidServiceComponentException,
+ InsufficientResourcesException, SecurityException {
+ for (int i = 0; i < components.length; i++)
+ select(components[i]);
 }
 
- public void addMediaSelectListener(MediaSelectListener listener)
- {
- throw new Error("Not implemented"); // TODO: Not implemented
+ public void replace(Locator fromComponent, Locator toComponent)
+ throws InvalidLocatorException, InvalidServiceComponentException,
+ InsufficientResourcesException, SecurityException {
+ if (!checkLocator(fromComponent))
+ throw new InvalidLocatorException(fromComponent);
+ if (!checkLocator(toComponent))
+ throw new InvalidLocatorException(toComponent);
+ Control fromControl = getControl((BDLocator)fromComponent);
+ if (fromControl == null)
+ throw new InvalidLocatorException(fromComponent);
+ Control toControl = getControl((BDLocator)toComponent);
+ if (toControl == null)
+ throw new InvalidLocatorException(toComponent);
+ if (fromControl != toControl)
+ throw new InvalidLocatorException(fromComponent);
+ int fromStream = getStream((BDLocator)fromComponent);
+ if ((fromStream <= 0) || (fromStream != ((StreamControl)fromControl).getCurrentStreamNumber()))
+ throw new InvalidLocatorException(fromComponent);
+ int toStream = getStream((BDLocator)toComponent);
+ if (toStream <= 0)
+ throw new InvalidLocatorException(toComponent);
+ try {
+ ((StreamControl)fromControl).selectStreamNumber(toStream);
+ } catch (Exception e) {
+ throw new InvalidLocatorException(toComponent);
+ }
 }
 
- public void removeMediaSelectListener(MediaSelectListener listener)
- {
- throw new Error("Not implemented"); // TODO: Not implemented
+ public void addMediaSelectListener(MediaSelectListener listener) {
+ org.videolan.Logger.unimplemented("DVBMediaSelectControlImpl", "addMediaSelectListener");
+ // callback is never triggered ?
+ synchronized(listeners) {
+ listeners.add(listener);
+ }
 }
 
- public Locator[] getCurrentSelection()
- {
- throw new Error("Not implemented"); // TODO: Not implemented
+ public void removeMediaSelectListener(MediaSelectListener listener) {
+ synchronized(listeners) {
+ listeners.remove(listener);
+ }
 }
 
- public Component getControlComponent()
- {
- throw new Error("Not implemented"); // TODO: Not implemented
+ public Locator[] getCurrentSelection() {
+ BDLocator locator = player.getLocator();
+ if (locator == null)
+ return new Locator[0];
+ String[] tags = locator.getComponentTags();
+ if (tags.length <= 0)
+ return new Locator[0];
+ Locator[] selections = new Locator[tags.length];
+ String[] tag = new String[1];
+ for (int i = 0; i < tags.length; i++) {
+ tag[0] = tags[i];
+ try {
+ selections[i] = new BDLocator(
+ locator.getDiscId(),
+ locator.getTitleNumber(),
+ locator.getPlayListId(),
+ locator.getPlayItemId(),
+ locator.getMarkId(),
+ tag);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return new Locator[0];
+ }
+ }
+ return selections;
 }
 
 public void selectServiceMediaComponents(Locator locator)
 throws InvalidLocatorException, InvalidServiceComponentException,
- InsufficientResourcesException
- {
- throw new Error("Not implemented"); // TODO: Not implemented
+ InsufficientResourcesException {
+ if (!(locator instanceof BDLocator))
+ throw new InvalidLocatorException(locator);
+ PlaylistInfo pi = player.getPlaylistInfo();
+ if (pi == null)
+ throw new InsufficientResourcesException();
+ if (((BDLocator)locator).getPlayListId() != pi.getPlaylist())
+ throw new InvalidLocatorException(locator);
+ TIClip ci = player. getCurrentClipInfo();
+ if (ci == null)
+ throw new InsufficientResourcesException();
+ String[] tags = ((BDLocator)locator).getComponentTags();
+ String[] tag = new String[1];
+ for (int i = 0; i < tags.length; i++) {
+ tag[0] = tags[i];
+ try {
+ select(new BDLocator(
+ null,
+ -1,
+ pi.getPlaylist(),
+ ci.getIndex(),
+ -1,
+ tag));
+ } catch (org.davic.net.InvalidLocatorException e) {
+ e.printStackTrace();
+ throw new InvalidLocatorException(locator);
+ } catch (SecurityException e) {
+ e.printStackTrace();
+ throw new InsufficientResourcesException();
+ }
+ }
+ }
+
+ public Component getControlComponent() {
+ return null;
+ }
+
+ private boolean checkLocator(Locator locator) {
+ if ((locator == null) || !(locator instanceof BDLocator))
+ return false;
+ PlaylistInfo pi = player.getPlaylistInfo();
+ if (pi == null)
+ return false;
+ BDLocator bdLocator = (BDLocator)locator;
+ if (bdLocator.getComponentTagsCount() != 1)
+ return false;
+ if (bdLocator.getPlayListId() != pi.getPlaylist())
+ return false;
+ TIClip ci = player. getCurrentClipInfo();
+ if (ci == null)
+ return false;
+ return (bdLocator.getPlayItemId() == -1) || (bdLocator.getPlayItemId() == ci.getIndex());
+ }
+
+ private int getStream(BDLocator locator) {
+ if (locator.getPrimaryVideoStreamNumber() > 0)
+ return locator.getPrimaryVideoStreamNumber();
+ else if (locator.getPrimaryAudioStreamNumber() > 0)
+ return locator.getPrimaryAudioStreamNumber();
+ else if (locator.getSecondaryVideoStreamNumber() > 0)
+ return locator.getSecondaryVideoStreamNumber();
+ else if (locator.getSecondaryAudioStreamNumber() > 0)
+ return locator.getSecondaryAudioStreamNumber();
+ else if (locator.getPGTextStreamNumber() > 0)
+ return locator.getPGTextStreamNumber();
+ return -1;
+ }
+
+ private Control getControl(BDLocator locator) {
+ if (locator.getPrimaryVideoStreamNumber() > 0)
+ return player.getControl("org.bluray.media.BackgroundVideoPresentationControl");
+ else if (locator.getPrimaryAudioStreamNumber() > 0)
+ return player.getControl("org.bluray.media.PrimaryAudioControl");
+ else if (locator.getSecondaryVideoStreamNumber() > 0)
+ return player.getControl("org.bluray.media.AsynchronousPiPControl");
+ else if (locator.getSecondaryAudioStreamNumber() > 0)
+ return player.getControl("org.bluray.media.SecondaryAudioControl");
+ else if (locator.getPGTextStreamNumber() > 0)
+ return player.getControl("org.bluray.media.SubtitlingControl");
+ return null;
 }
 
+ private LinkedList listeners = new LinkedList();
+ private Handler player;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/Handler.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/Handler.java Changed

@@ -19,310 +19,286 @@
 
 package org.videolan.media.content.playlist;
 
-import java.awt.Component;
 import java.io.IOException;
-import java.util.LinkedList;
 
-import javax.media.Clock;
 import javax.media.ClockStartedError;
-import javax.media.ClockStoppedException;
+import javax.media.ConnectionErrorEvent;
 import javax.media.Control;
-import javax.media.Controller;
-import javax.media.ControllerClosedEvent;
-import javax.media.ControllerEvent;
-import javax.media.ControllerListener;
-import javax.media.DeallocateEvent;
-import javax.media.GainControl;
+import javax.media.ControllerErrorEvent;
 import javax.media.IncompatibleSourceException;
-import javax.media.IncompatibleTimeBaseException;
-import javax.media.Manager;
-import javax.media.NotPrefetchedError;
-import javax.media.Player;
-import javax.media.PrefetchCompleteEvent;
-import javax.media.RealizeCompleteEvent;
-import javax.media.StartEvent;
-import javax.media.StopByRequestEvent;
 import javax.media.Time;
-import javax.media.TimeBase;
-import javax.media.TransitionEvent;
 import javax.media.protocol.DataSource;
+import javax.tv.locator.InvalidLocatorException;
 
-import org.bluray.media.OverallGainControl;
+import org.bluray.media.InvalidPlayListException;
+import org.bluray.net.BDLocator;
+import org.bluray.system.RegisterAccess;
+import org.videolan.BDJAction;
+import org.videolan.BDJActionManager;
 import org.videolan.Libbluray;
-import org.videolan.TitleInfo;
+import org.videolan.PlaylistInfo;
+import org.videolan.TIClip;
+import org.videolan.media.content.BDHandler;
 
-public class Handler implements Player {
- public Handler()
- {
- controls = new Control[20];
- 
+public class Handler extends BDHandler {
+ public Handler() {
+ controls = new Control[18];
 controls[0] = new AngleControlImpl(this);
- controls[1] = new AsynchronousPiPControlImpl();
- controls[2] = new AudioMetadataControlImpl();
- controls[3] = new AWTVideoSizeControlImpl(this);
- controls[4] = new BackgroundVideoPresentationControlImpl();
- controls[5] = new DVBMediaSelectControlImpl();
- controls[6] = new MediaTimeEventControlImpl();
- controls[7] = new MediaTimePositionControlImpl();
- controls[8] = new OverallGainControlImpl();
- controls[9] = new PanningControlImpl();
- controls[10] = new PiPControlImpl();
- controls[11] = new PlaybackControlImpl(this);
- controls[12] = new PlayListChangeControlImpl(this);
- controls[13] = new PrimaryAudioControlImpl(this);
- controls[14] = new PrimaryGainControlImpl();
- controls[15] = new SecondaryAudioControlImpl(this);
- controls[16] = new SecondaryGainControlImpl();
- controls[17] = new SubtitlingControlImpl(this);
- controls[18] = new UOMaskTableControlImpl();
- controls[19] = new VideoFormatControlImpl();
- }
- 
- public void setSource(DataSource source) throws IOException,
- IncompatibleSourceException
- {
- if (source instanceof org.videolan.media.protocol.bd.DataSource &&
- source.getContentType().equals("playlist")) 
- {
- org.videolan.media.protocol.bd.DataSource playlistSrc = 
- (org.videolan.media.protocol.bd.DataSource)source;
- 
- ti = Libbluray.getPlaylistInfo(playlistSrc.getPlaylist());
- } else {
- throw new IncompatibleSourceException();
+ controls[1] = new AudioMetadataControlImpl();
+ controls[2] = new BackgroundVideoPresentationControlImpl(this);
+ controls[3] = new DVBMediaSelectControlImpl(this);
+ controls[4] = new MediaTimeEventControlImpl();
+ controls[5] = new MediaTimePositionControlImpl(this);
+ controls[6] = new OverallGainControlImpl();
+ controls[7] = new PanningControlImpl();
+ controls[8] = new PiPControlImpl(this);
+ controls[9] = new PlaybackControlImpl(this);
+ controls[10] = new PlayListChangeControlImpl(this);
+ controls[11] = new PrimaryAudioControlImpl(this);
+ controls[12] = new PrimaryGainControlImpl();
+ controls[13] = new SecondaryAudioControlImpl(this);
+ controls[14] = new SecondaryGainControlImpl();
+ controls[15] = new SubtitlingControlImpl(this);
+ controls[16] = new UOMaskTableControlImpl(this);
+ controls[17] = new VideoFormatControlImpl(this);
+ }
+
+ public void setSource(DataSource source) throws IOException, IncompatibleSourceException {
+ synchronized (this) {
+ try {
+ locator = new BDLocator(source.getLocator().toExternalForm());
+ } catch (org.davic.net.InvalidLocatorException e) {
+ throw new IncompatibleSourceException();
+ }
+ if (!locator.isPlayListItem())
+ throw new IncompatibleSourceException();
+ pi = Libbluray.getPlaylistInfo(locator.getPlayListId());
+ if (pi == null)
+ throw new IOException();
+ baseMediaTime = 0;
+ if (state == Prefetched)
+ doPrefetch();
 }
 }
 
- public int getState()
- {
- return state;
+ public Time getDuration() {
+ long duration = pi.getDuration() ;
+ return new Time(duration * TO_SECONDS);
 }
 
- public int getTargetState()
- {
- return state;
+ protected ControllerErrorEvent doPrefetch() {
+ synchronized (this) {
+ try {
+ if (!Libbluray.selectPlaylist(locator.getPlayListId()))
+ return new ConnectionErrorEvent(this);
+
+ if (baseMediaTime != 0) {
+ Libbluray.seekTime((long)(baseMediaTime * FROM_NAROSECONDS));
+ } else if (locator.getMarkId() >= 0) {
+ ((PlaybackControlImpl)controls[9]).skipToMark(locator.getMarkId());
+ } else if (locator.getPlayItemId() >= 0) {
+ ((PlaybackControlImpl)controls[9]).skipToPlayItem(locator.getPlayItemId());
+ }
+
+ int stream;
+ stream = locator.getPrimaryAudioStreamNumber();
+ if (stream > 0)
+ Libbluray.writePSR(Libbluray.PSR_PRIMARY_AUDIO_ID, stream);
+ stream = locator.getPGTextStreamNumber();
+ if (stream > 0) {
+ int psr = Libbluray.readPSR(Libbluray.PSR_PG_STREAM) & 0xFFFFF000;
+ Libbluray.writePSR(Libbluray.PSR_PG_STREAM, psr | stream);
+ }
+ stream = locator.getSecondaryVideoStreamNumber();
+ if (stream > 0) {
+ int psr = Libbluray.readPSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO) & 0xFFFF00FF;
+ Libbluray.writePSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO, psr | (stream << 8));
+ }
+ stream = locator.getSecondaryAudioStreamNumber();
+ if (stream > 0) {
+ int psr = Libbluray.readPSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO) & 0xFFFFFF00;
+ Libbluray.writePSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO, psr | stream);
+ }
+ } catch (Throwable e) {
+ return new ConnectionErrorEvent(this);
+ }
+ return super.doPrefetch();
+ }
 }
 
- public void realize()
- {
- sendControllerEvent(new TransitionEvent(this, Unrealized, Realizing, Realized));
- sendControllerEvent(new RealizeCompleteEvent(this, Realizing, Realized, Realized));
- }
+ protected ControllerErrorEvent doStart(Time at) {
+ synchronized (this) {
+ if (at != null) {
+ try {
+ Libbluray.seekTime((long)(at.getSeconds() * FROM_SECONDS));
+ } catch (Throwable e) {
+ return new ConnectionErrorEvent(this);
+ }
+ }
 
- public void prefetch()
- {
- if (state == Unrealized)
- realize();
- 
- sendControllerEvent(new TransitionEvent(this, Realized, Prefetching, Prefetched));
- sendControllerEvent(new PrefetchCompleteEvent(this, Prefetching, Prefetched, Prefetched));
- }
+ try {
+ Libbluray.selectRate(rate);
+ } catch (Throwable e) {
+ return new ConnectionErrorEvent(this);
+ }
 
- public void deallocate()
- {
- if (state == Started)
- throw new ClockStartedError();
- 
- if (state != Unrealized || state != Realized) {
- sendControllerEvent(new DeallocateEvent(this, state, Realized, Realized, currentTime));
+ at = new Time(Libbluray.tellTime() * TO_SECONDS);
+ return super.doStart(at);
 }
 }
 
- public void close()
- {
- sendControllerEvent(new ControllerClosedEvent(this, "closed"));
+ protected ControllerErrorEvent doStop() {
+ Libbluray.selectRate(0.0f);
+ return super.doStop();
 }
 
- public Time getStartLatency()
- {
- return new Time(Time.ONE_SECOND); // this is arbitrary since the start latency can't be determined
- }
-
- public Control[] getControls()
- {
- return controls;
- }
-
- public Control getControl(String forName)
- {
- try {
- Class<?> cls = Class.forName(forName);
- 
- for (Control c : controls) {
- if (cls.isInstance(c))
- return c;
+ protected void doSeekTime(Time at) {
+ synchronized (this) {
+ if ((state == Prefetched) || (state == Started)) {
+ try {
+ Libbluray.seekTime((long)(at.getSeconds() * FROM_SECONDS));
+ } catch (Throwable e) {
+ return;
+ }
+ at = new Time(Libbluray.tellTime() * TO_SECONDS);
 }
- 
- return null;
- } catch (ClassNotFoundException e) {
- return null;
+ super.doSeekTime(at);
 }
- 
- }
-
- public void addControllerListener(ControllerListener listener)
- {
- listeners.add(listener);
- }
- 
- public void removeControllerListener(ControllerListener listener)
- {
- listeners.remove(listener);
- }
-
- public void setTimeBase(TimeBase master)
- throws IncompatibleTimeBaseException
- {
- // this probably isn't useful due to the actual clock being outside of bdj
- // so just ignore this
- }
-
- public void syncStart(Time at)
- {
- // TODO signal player to actually start playing
- if (state == Started)
- throw new ClockStartedError();
- 
- if (state != Prefetched)
- throw new NotPrefetchedError("syncStart");
- 
- currentTime = at;
- sendControllerEvent(new StartEvent(this, Prefetched, Started, Started, at, at));
 }
 
- public void stop()
- {
- // TODO signal player to actually stop playing
- if (state == Started) {
- sendControllerEvent(new StopByRequestEvent(this, Started, Prefetched, Prefetched, currentTime));
+ protected void doSetRate(Float factor) {
+ synchronized (this) {
+ if (state == Started) {
+ try {
+ Libbluray.selectRate(factor.floatValue());
+ } catch (Throwable e) {
+ return;
+ }
+ if (state == Started) {
+ baseMediaTime = getMediaNanoseconds();
+ baseTime = getTimeBase().getNanoseconds();
+ }
+ }
+ super.doSetRate(factor);
 }
 }
 
- public void setStopTime(Time stopTime)
- {
- // TODO: actually stopping when stop time is hit needs to be implemented
- this.stopTime = stopTime; 
+ protected void doChapterReach(int param) {
+ ((PlaybackControlImpl)controls[9]).onChapterReach(param);
 }
-
- public Time getStopTime()
- {
- return stopTime;
+ protected void doMarkReach(int param) {
+ ((PlaybackControlImpl)controls[9]).onMarkReach(param);
 }
 
- public void setMediaTime(Time now)
- {
- // TODO: again this doesn't really do much right now
- if (state != Started)
- currentTime = now;
- else
- throw new ClockStartedError();
+ protected void doPlayItemReach(int param) {
+ ((PlaybackControlImpl)controls[9]).onPlayItemReach(param);
+ ((UOMaskTableControlImpl)controls[16]).onPlayItemReach(param);
 }
 
- public Time getMediaTime()
- {
- return currentTime;
+ protected void doAngleChange(int param) {
+ ((AngleControlImpl)controls[0]).onAngleChange(param);
 }
 
- public long getMediaNanoseconds()
- {
- return currentTime.getNanoseconds();
+ protected void doSubtitleChange(int param) {
+ ((SubtitlingControlImpl)controls[15]).onSubtitleChange(param);
 }
 
- public Time getSyncTime()
- {
- return getMediaTime();
+ protected void doPiPChange(int param) {
+ ((PiPControlImpl)controls[8]).onPiPChange(param);
 }
 
- public TimeBase getTimeBase()
- {
- return Manager.getSystemTimeBase();
+ protected BDLocator getLocator() {
+ return locator;
 }
 
- public Time mapToTimeBase(Time t) throws ClockStoppedException
- {
- if (state != Started)
- throw new ClockStoppedException();
- return getMediaTime();
+ protected PlaylistInfo getPlaylistInfo() {
+ return pi;
 }
 
- public float getRate()
- {
- return rate;
+ protected TIClip getCurrentClipInfo() {
+ synchronized (this) {
+ int state = getState();
+ if ((state != Prefetched) && (state != Started))
+ return null;
+
+ int playitem = RegisterAccess.getInstance().getPSR(RegisterAccess.PSR_PLAYITEM_ID);
+ TIClip[] clips = pi.getClips();
+ if (playitem >= clips.length)
+ return null;
+ return clips[playitem];
+ }
 }
 
- public float setRate(float factor)
- {
- if (state == Started)
- throw new ClockStartedError();
- 
- return 1.0f; // TODO: maybe allow changing rate?
+ protected void selectPlayList(BDLocator locator)
+ throws InvalidPlayListException, InvalidLocatorException, ClockStartedError {
+ synchronized (this) {
+ if (getState() == Started)
+ throw new ClockStartedError();
+ if (!locator.isPlayListItem())
+ throw new InvalidLocatorException(locator);
+ pi = Libbluray.getPlaylistInfo(locator.getPlayListId());
+ if (pi == null)
+ throw new InvalidPlayListException();
+ this.locator = locator;
+ baseMediaTime = 0;
+ if (state == Prefetched)
+ doPrefetch();
+ }
 }
 
- public Time getDuration()
- {
- long duration = ti.getDuration() ;
- return new Time(duration * TO_SECONDS);
+ protected void seekMark(int mark) throws IllegalArgumentException {
+ if ((pi == null) || (mark < 0) || (mark >= pi.getMarkCount()))
+ throw new IllegalArgumentException();
+ PlaylistPlayerAction action = new PlaylistPlayerAction(
+ this, PlaylistPlayerAction.ACTION_SEEK_MARK, mark);
+ BDJActionManager.getInstance().putCommand(action);
 }
 
- public Component getVisualComponent()
- {
- return null;
+ protected void seekPlayItem(int item) throws IllegalArgumentException {
+ if ((pi == null) || (item < 0) || (item >= pi.getClipCount()))
+ throw new IllegalArgumentException();
+ PlaylistPlayerAction action = new PlaylistPlayerAction(
+ this, PlaylistPlayerAction.ACTION_SEEK_PLAYITEM, item);
+ BDJActionManager.getInstance().putCommand(action);
 }
 
- public GainControl getGainControl()
- {
- for (Control c : controls) {
- if (c instanceof OverallGainControl)
- return (GainControl)c;
+ private class PlaylistPlayerAction extends BDJAction {
+ private PlaylistPlayerAction(Handler player, int action, int param) {
+ this.player = player;
+ this.action = action;
+ this.param = param;
 }
- 
- return null;
- }
 
- public Component getControlPanelComponent()
- {
- return null;
- }
+ protected void doAction() {
+ switch (action) {
+ case ACTION_SEEK_MARK:
+ if ((player.getState() == Prefetched) || (player.getState() == Started)) {
+ Libbluray.seekMark(param);
+ player.updateTime(new Time(Libbluray.tellTime() * TO_SECONDS));
+ } else if (player.locator != null) {
+ player.locator.setMarkId(param);
+ player.locator.setPlayItemId(-1);
+ }
+ break;
+ case ACTION_SEEK_PLAYITEM:
+ if ((player.getState() == Prefetched) || (player.getState() == Started)) {
+ Libbluray.seekPlayItem(param);
+ player.updateTime(new Time(Libbluray.tellTime() * TO_SECONDS));
+ } else if (player.locator != null) {
+ player.locator.setMarkId(-1);
+ player.locator.setPlayItemId(param);
+ }
+ break;
+ }
+ }
 
- public void start()
- {
- if (state != Prefetched)
- throw new NotPrefetchedError("start");
- 
- sendControllerEvent(new StartEvent(this, Prefetched, Started, Started, currentTime, currentTime));
- }
+ private Handler player;
+ private int action;
+ private int param;
 
- public void addController(Controller newController)
- throws IncompatibleTimeBaseException
- {
- throw new Error("Not implemented"); // TODO implement
+ public static final int ACTION_SEEK_MARK = 1;
+ public static final int ACTION_SEEK_PLAYITEM = 2;
 }
 
- public void removeController(Controller oldController)
- {
- throw new Error("Not implemented"); // TODO implement
- }
- 
- private void sendControllerEvent(ControllerEvent event) 
- {
- if (event instanceof TransitionEvent)
- state = ((TransitionEvent)event).getCurrentState();
- 
- for (ControllerListener listener : listeners) {
- listener.controllerUpdate(event);
- }
- }
- 
- protected static final double TO_SECONDS = 1 / 90000.0;
- protected static final double FROM_SECONDS = 90000.0;
- protected TitleInfo ti;
-
- private Control[] controls;
- private Time stopTime = Clock.RESET;
- private Time currentTime = new Time(0);
- private float rate = 1.0f;
- 
- private LinkedList<ControllerListener> listeners = new LinkedList<ControllerListener>();
- 
- private int state = Unrealized;
+ private PlaylistInfo pi = null;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/MediaTimeEventControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/MediaTimeEventControlImpl.java Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/MediaTimePositionControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/MediaTimePositionControlImpl.java Changed

@@ -24,23 +24,24 @@
 import javax.media.Time;
 
 import org.davic.media.MediaTimePositionControl;
-import org.videolan.Libbluray;
 
 public class MediaTimePositionControlImpl implements MediaTimePositionControl {
+    protected MediaTimePositionControlImpl(Handler player) {
+        this.player = player;
+    }
 
-    public Component getControlComponent()
-    {
+    public Component getControlComponent() {
         return null;
     }
 
-    public Time setMediaTimePosition(Time mediaTime)
-    {
-         long tick = Libbluray.seekTime((long)(mediaTime.getSeconds() * Handler.FROM_SECONDS));
-         return new Time(tick * Handler.TO_SECONDS);
+    public Time setMediaTimePosition(Time mediaTime) {
+        player.setMediaTime(mediaTime);
+        return player.getMediaTime();
     }
 
-    public Time getMediaTimePosition()
-    {
-        return new Time(Libbluray.tellTime() * Handler.TO_SECONDS);
+    public Time getMediaTimePosition() {
+        return player.getMediaTime();
     }
+
+    private Handler player;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/OverallGainControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/OverallGainControlImpl.java Changed

@@ -24,48 +24,40 @@
 import org.bluray.media.OverallGainControl;
 
 public class OverallGainControlImpl implements OverallGainControl {
-    public void setMute(boolean mute)
-    {
+    public void setMute(boolean mute) {
         // TODO Not implemented
     }
 
-    public boolean getMute()
-    {
+    public boolean getMute() {
         return false; // TODO Not implemented
     }
 
-    public float setDB(float gain)
-    {
+    public float setDB(float gain) {
         return 0;  // TODO Not implemented
     }
 
-    public float getDB()
-    {
+    public float getDB() {
         return 0;  // TODO Not implemented
     }
 
-    public float setLevel(float level)
-    {
+    public float setLevel(float level) {
         return 0;
     }
 
-    public float getLevel()
-    {
+    public float getLevel() {
         return 0;  // TODO Not implemented
     }
 
-    public void addGainChangeListener(GainChangeListener listener)
-    {
+    public void addGainChangeListener(GainChangeListener listener) {
         // TODO Not implemented
+        org.videolan.Logger.unimplemented("OverallGainControlImpl", "addGainChangeListener");
     }
 
-    public void removeGainChangeListener(GainChangeListener listener)
-    {
+    public void removeGainChangeListener(GainChangeListener listener) {
         // TODO Not implemented
     }
 
-    public Component getControlComponent()
-    {
+    public Component getControlComponent() {
         return null;
     }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/PanningControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/PanningControlImpl.java Changed

@@ -26,43 +26,36 @@
 
 // TODO Figure out why the hell this is needed
 public class PanningControlImpl implements PanningControl {
-    public Component getControlComponent()
-    {
+    public Component getControlComponent() {
         return null;
     }
 
-    public void addPanningChangeListener(PanningChangeListener listener)
-    {
+    public void addPanningChangeListener(PanningChangeListener listener) {
+        org.videolan.Logger.unimplemented("PanningControlImpl", "addPanningVChangeListener");
         // TODO Not implemented
     }
 
-    public void removePanningChangeListener(PanningChangeListener listener)
-    {
+    public void removePanningChangeListener(PanningChangeListener listener) {
         // TODO Not implemented
     }
 
-    public float getLeftRight()
-    {
+    public float getLeftRight() {
         return 0;  // TODO Not implemented
     }
 
-    public float getFrontRear()
-    {
+    public float getFrontRear() {
         return 0;  // TODO Not implemented
     }
 
-    public void setLeftRight(float balance)
-    {
+    public void setLeftRight(float balance) {
         // TODO Not implemented
     }
 
-    public void setFrontRear(float fade)
-    {
+    public void setFrontRear(float fade) {
         // TODO Not implemented
     }
 
-    public void setPosition(float x, float y)
-    {
+    public void setPosition(float x, float y) {
         // TODO Not implemented
     }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/PiPControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/PiPControlImpl.java Changed

@@ -19,134 +19,107 @@
 
 package org.videolan.media.content.playlist;
 
-import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.Rectangle;
 
+import javax.media.Time;
+
+import org.bluray.media.AsynchronousPiPControl;
 import org.bluray.media.PiPControl;
+import org.bluray.media.PiPStatusEvent;
 import org.bluray.media.PiPStatusListener;
 import org.bluray.media.StreamNotAvailableException;
 import org.havi.ui.HScreenRectangle;
 
-public class PiPControlImpl implements PiPControl {
- public Dimension getInputVideoSize()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public Dimension getVideoSize()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public HScreenRectangle getActiveVideoArea()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public HScreenRectangle getActiveVideoAreaOnScreen()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public HScreenRectangle getTotalVideoArea()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public HScreenRectangle getTotalVideoAreaOnScreen()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public boolean supportsClipping()
- {
- throw new Error("Not implemented"); // TODO implement
- }
+import org.videolan.BDJListeners;
+import org.videolan.Libbluray;
+import org.videolan.StreamInfo;
+import org.videolan.TIClip;
 
- public Rectangle setClipRegion(Rectangle clipRect)
- {
- throw new Error("Not implemented"); // TODO implement
+public class PiPControlImpl extends VideoControl implements PiPControl, AsynchronousPiPControl {
+ protected PiPControlImpl(Handler player) {
+ super(player, 1);
 }
 
- public Rectangle getClipRegion()
- {
- throw new Error("Not implemented"); // TODO implement
+ protected StreamInfo[] getStreams() {
+ TIClip ci = player.getCurrentClipInfo();
+ if (ci == null)
+ return null;
+ return ci.getSecVideoStreams();
 }
 
- public float[] supportsArbitraryHorizontalScaling()
- {
- throw new Error("Not implemented"); // TODO implement
+ protected void setStreamNumber(int num) {
+ int psr = Libbluray.readPSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO)& 0xFFFF00FF;
+ Libbluray.writePSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO, psr | (num << 8));
 }
 
- public float[] supportsArbitraryVerticalScaling()
- {
- throw new Error("Not implemented"); // TODO implement
+ public int getCurrentStreamNumber() {
+ return (Libbluray.readPSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO) & 0x0000FF00) >> 8;
 }
 
- public float[] getHorizontalScalingFactors()
- {
- throw new Error("Not implemented"); // TODO implement
+ public void setDisplay(boolean value) {
+ int psr = Libbluray.readPSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO) & 0x7FFFFFFF;
+ if (value)
+ psr |= 0x80000000;
+ Libbluray.writePSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO, psr);
 }
 
- public float[] getVerticalScalingFactors()
- {
- throw new Error("Not implemented"); // TODO implement
+ public boolean getDisplay() {
+ return (Libbluray.readPSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO) & 0x80000000) != 0;
 }
 
- public byte getPositioningCapability()
- {
- throw new Error("Not implemented"); // TODO implement
+ public void setFullScreen(boolean value) {
+ if (value) {
+ setVideoArea(new HScreenRectangle(0.0f, 0.0f, 1.0f, 1.0f));
+ } else {
+ Dimension vd = getInputVideoSize();
+ Dimension sd = getScreenSize();
+ setVideoArea(new HScreenRectangle(0.5f, 0.5f, vd.width / sd.width, vd.height / sd.height));
+ }
 }
 
- public Component getControlComponent()
- {
- throw new Error("Not implemented"); // TODO implement
+ public boolean getFullScreen() {
+ HScreenRectangle dr = getActiveVideoArea();
+ return ((dr.x == 0.0f) && (dr.y == 0.0f) && (dr.width == 1.0f) && (dr.height == 1.0f));
 }
 
- public void addPiPStatusListener(PiPStatusListener paramPiPStatusListener)
- {
- throw new Error("Not implemented"); // TODO implement
+ public boolean getIsSyncedDuringTrickPlay() {
+ org.videolan.Logger.unimplemented("PiPControlImpl", "getIsSyncedDuringTrickPlay");
+ return false;
 }
 
- public void removePiPStatusListener(PiPStatusListener paramPiPStatusListener)
- {
- throw new Error("Not implemented"); // TODO implement
+ protected void onPiPChange(int param) {
+ listeners.putCallback(new PiPStatusEvent(param > 0, this));
 }
 
- public int getCurrentStreamNumber()
- {
- throw new Error("Not implemented"); // TODO implement
+ public void addPiPStatusListener(PiPStatusListener listener) {
+ listeners.add(listener);
 }
 
- public void selectStreamNumber(int num) throws StreamNotAvailableException
- {
- throw new Error("Not implemented"); // TODO implement
+ public void removePiPStatusListener(PiPStatusListener listener) {
+ listeners.remove(listener);
 }
 
- public void setDisplay(boolean value)
- {
- throw new Error("Not implemented"); // TODO implement
+ public void start() {
+ org.videolan.Logger.unimplemented("PiPControlImpl", "start");
 }
 
- public boolean getDisplay()
- {
- throw new Error("Not implemented"); // TODO implement
+ public void stop() {
+ org.videolan.Logger.unimplemented("PiPControlImpl", "stop");
 }
 
- public void setFullScreen(boolean value)
- {
- throw new Error("Not implemented"); // TODO implement
+ public void pause() {
+ org.videolan.Logger.unimplemented("PiPControlImpl", "pause");
 }
 
- public boolean getFullScreen()
- {
- throw new Error("Not implemented"); // TODO implement
+ public boolean resume() {
+ org.videolan.Logger.unimplemented("PiPControlImpl", "resume");
+ return true;
 }
 
- public boolean getIsSyncedDuringTrickPlay()
- {
- throw new Error("Not implemented"); // TODO implement
+ public Time getElapsedTime() {
+ org.videolan.Logger.unimplemented("PiPControlImpl", "getElapsedTime");
+ return null;
 }
 
+ private BDJListeners listeners = new BDJListeners();
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/PlayListChangeControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/PlayListChangeControlImpl.java Changed

@@ -23,60 +23,40 @@
 
 import javax.media.ClockStartedError;
 import javax.tv.locator.InvalidLocatorException;
+import javax.tv.locator.Locator;
 
 import org.bluray.media.InvalidPlayListException;
 import org.bluray.media.PlayListChangeControl;
 import org.bluray.net.BDLocator;
 import org.bluray.ti.PlayList;
-import org.videolan.Libbluray;
 
 public class PlayListChangeControlImpl implements PlayListChangeControl {
- protected PlayListChangeControlImpl(Handler player)
- {
+ protected PlayListChangeControlImpl(Handler player) {
 this.player = player;
 }
- 
- public Component getControlComponent()
- {
+
+ public Component getControlComponent() {
 return null;
 }
 
- public void selectPlayList(PlayList pl) throws InvalidPlayListException,
- ClockStartedError
- {
- if (pl == null)
- throw new NullPointerException();
- 
+ public void selectPlayList(PlayList pl) throws InvalidPlayListException, ClockStartedError {
 try {
- selectPlayList((BDLocator)pl.getLocator());
+ player.selectPlayList((BDLocator)pl.getLocator());
 } catch (InvalidLocatorException e) {
 throw new InvalidPlayListException();
 }
 }
 
 public void selectPlayList(BDLocator locator)
- throws InvalidPlayListException, InvalidLocatorException,
- ClockStartedError
- {
- if (locator == null)
- throw new NullPointerException();
- 
- if (player.getState() == Handler.Started)
- throw new ClockStartedError();
- 
- if (!Libbluray.selectPlaylist(locator.getPlayListId()))
- throw new InvalidPlayListException();
- 
- player.ti = Libbluray.getPlaylistInfo(locator.getPlayListId());
+ throws InvalidPlayListException, InvalidLocatorException, ClockStartedError {
+ player.selectPlayList(locator);
 }
 
- public BDLocator getCurrentPlayList()
- {
- try {
- return new BDLocator(null, player.ti.getIndex(), player.ti.getPlaylist());
- } catch (org.davic.net.InvalidLocatorException e) {
+ public BDLocator getCurrentPlayList() {
+ Locator[] locators = player.getServiceContentLocators();
+ if ((locators == null) || (locators.length <= 0))
 return null;
- }
+ return (BDLocator)locators[0];
 }
 
 private Handler player;

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/PlaybackControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/PlaybackControlImpl.java Changed

@@ -20,72 +20,130 @@
 package org.videolan.media.content.playlist;
 
 import java.awt.Component;
-import java.util.LinkedList;
 
-import org.bluray.media.AngleChangeEvent;
-import org.bluray.media.AngleChangeListener;
 import org.bluray.media.PlaybackControl;
 import org.bluray.media.PlaybackListener;
 import org.bluray.media.PlaybackMarkEvent;
 import org.bluray.media.PlaybackPlayItemEvent;
-import org.videolan.Libbluray;
-import org.videolan.TIClip;
+import org.videolan.BDJListeners;
+import org.videolan.BDJAction;
+import org.videolan.PlaylistInfo;
+import org.videolan.TIMark;
 
 public class PlaybackControlImpl implements PlaybackControl {
- protected PlaybackControlImpl(Handler player)
- {
+ protected PlaybackControlImpl(Handler player) {
 this.player = player;
 }
- 
- public Component getControlComponent()
- {
+
+ public Component getControlComponent() {
 return null;
 }
 
- public void addPlaybackControlListener(PlaybackListener listener)
- {
+ public void addPlaybackControlListener(PlaybackListener listener) {
 listeners.add(listener);
 }
 
- public void removePlaybackControlListener(PlaybackListener listener)
- {
+ public void removePlaybackControlListener(PlaybackListener listener) {
 listeners.remove(listener);
 }
 
- public void skipToMark(int mark) throws IllegalArgumentException
- {
- Libbluray.seekMark(mark);
- sendEvent(new PlaybackMarkEvent(this, mark));
+ public void skipToMark(int mark) throws IllegalArgumentException {
+ player.seekMark(mark);
+ }
+
+ public boolean skipToNextMark(int type) throws IllegalArgumentException {
+ if ((type != TIMark.MARK_TYPE_ENTRY) && (type != TIMark.MARK_TYPE_LINK))
+ throw new IllegalArgumentException();
+ PlaylistInfo pi = player.getPlaylistInfo();
+ if (pi == null)
+ return false;
+ TIMark[] marks = pi.getMarks();
+ if (marks == null)
+ return false;
+ long time = player.getMediaNanoseconds();
+ for (int i = 0; i < marks.length; i++) {
+ if ((marks[i].getType() == type) &&
+ (marks[i].getStartNanoseconds() > time)) {
+ player.seekMark(i);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public boolean skipToPreviousMark(int type) throws IllegalArgumentException {
+ if ((type != TIMark.MARK_TYPE_ENTRY) && (type != TIMark.MARK_TYPE_LINK))
+ throw new IllegalArgumentException();
+ PlaylistInfo pi = player.getPlaylistInfo();
+ if (pi == null)
+ return false;
+ TIMark[] marks = pi.getMarks();
+ if (marks == null)
+ return false;
+ long time = player.getMediaNanoseconds();
+ for (int i = marks.length - 1; i >= 0; i--) {
+ if ((marks[i].getType() == type) &&
+ (marks[i].getStartNanoseconds() < time)) {
+ player.seekMark(i);
+ return true;
+ }
+ }
+ return false;
 }
 
- public boolean skipToNextMark(int type) throws IllegalArgumentException
- {
- throw new Error("Not implemented");
+ public void skipToPlayItem(int item) throws IllegalArgumentException {
+ player.seekPlayItem(item);
 }
 
- public boolean skipToPreviousMark(int type) throws IllegalArgumentException
- {
- throw new Error("Not implemented");
+ protected void onChapterReach(int chapter) {
+ if (chapter <= 0)
+ return;
+ chapter--;
+ PlaylistInfo pi = player.getPlaylistInfo();
+ if (pi == null)
+ return;
+ TIMark[] marks = pi.getMarks();
+ if (marks == null)
+ return;
+ for (int i = 0, j = 0; i < marks.length; i++) {
+ if (marks[i].getType() == TIMark.MARK_TYPE_ENTRY) {
+ if (j == chapter) {
+ notifyListeners(new PlaybackMarkEvent(this, i));
+ return;
+ }
+ j++;
+ }
+ }
 }
 
- public void skipToPlayItem(int item) throws IllegalArgumentException
- {
- throw new Error("Not implemented");
+ protected void onMarkReach(int mark) {
+ if (mark < 0) {
+ return;
+ }
+ PlaylistInfo pi = player.getPlaylistInfo();
+ if (pi == null) {
+ return;
+ }
+ TIMark[] marks = pi.getMarks();
+ if (marks == null) {
+ return;
+ }
+ if (mark >= marks.length) {
+ return;
+ }
+
+ notifyListeners(new PlaybackMarkEvent(this, mark));
 }
- 
- private void sendEvent(PlaybackMarkEvent event)
- {
- for (PlaybackListener listener : listeners)
- listener.markReached(event);
+
+ protected void onPlayItemReach(int param) {
+ notifyListeners(new PlaybackPlayItemEvent(this, param));
 }
- 
- // DON'T REMOVE: this will be used when skipToPlayItem is implemented
- private void sendEvent(PlaybackPlayItemEvent event)
- {
- for (PlaybackListener listener : listeners)
- listener.playItemReached(event);
+
+ private void notifyListeners(Object event) {
+ listeners.putCallback(event);
 }
- 
- private LinkedList<PlaybackListener> listeners = new LinkedList<PlaybackListener>();
+
+
+ private BDJListeners listeners = new BDJListeners();
 private Handler player;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryAudioControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryAudioControlImpl.java Changed

@@ -19,76 +19,32 @@
 
 package org.videolan.media.content.playlist;
 
-import java.awt.Component;
 import org.bluray.media.PrimaryAudioControl;
-import org.bluray.media.StreamNotAvailableException;
-import org.davic.media.LanguageNotAvailableException;
-import org.davic.media.NotAuthorizedException;
 import org.videolan.Libbluray;
 import org.videolan.StreamInfo;
 import org.videolan.TIClip;
 
 public class PrimaryAudioControlImpl extends StreamControl implements PrimaryAudioControl {
-    protected PrimaryAudioControlImpl(Handler player)
-    {
+    protected PrimaryAudioControlImpl(Handler player) {
         super(player);
     }
-    
-    public int[] listAvailableStreamNumbers()
-    {
-        TIClip clip = getCurrentClip();
-        return listAvailableStreamNumbers(clip.getAudioStreams());
-    }
-
-    public int getCurrentStreamNumber()
-    {
-        return Libbluray.readPSR(Libbluray.PSR_PRIMARY_AUDIO_ID);
-    }
 
-    public void selectStreamNumber(int num) throws StreamNotAvailableException
-    {
-        Libbluray.writePSR(num, Libbluray.PSR_PRIMARY_AUDIO_ID);
+    protected StreamInfo[] getStreams() {
+        TIClip ci = player.getCurrentClipInfo();
+        if (ci == null)
+            return null;
+        return ci.getAudioStreams();
     }
 
-    public String[] listAvailableLanguages()
-    {
-        TIClip clip = getCurrentClip();       
-        return listAvailableLanguages(clip.getAudioStreams());
+    protected String getDefaultLanguage() {
+        return languageFromInteger(Libbluray.readPSR(Libbluray.PSR_AUDIO_LANG));
     }
 
-    public String getCurrentLanguage()
-    {
-        TIClip clip = getCurrentClip();
-        StreamInfo[] streams = clip.getAudioStreams();
-        return streams[getCurrentStreamNumber() - 1].getLang();
-    }
-    
-    public String selectDefaultLanguage() throws NotAuthorizedException
-    {
-        // FIXME: should add ability to select the default language
-        try {
-            selectLanguage("eng");
-        } catch (LanguageNotAvailableException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-        return "eng";
-    }
-
-    public void selectLanguage(String language)
-            throws LanguageNotAvailableException, NotAuthorizedException
-    {
-        TIClip clip = getCurrentClip();
-        StreamInfo[] streams = clip.getAudioStreams();
-        try {
-            selectStreamNumber(selectLanguage(language, streams));
-        } catch (StreamNotAvailableException e) {
-            throw new LanguageNotAvailableException();
-        }
+    public int getCurrentStreamNumber() {
+        return Libbluray.readPSR(Libbluray.PSR_PRIMARY_AUDIO_ID);
     }
 
-    public Component getControlComponent()
-    {
-        return null;
+    protected void setStreamNumber(int num) {
+        Libbluray.writePSR(Libbluray.PSR_PRIMARY_AUDIO_ID, num);
     }
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryGainControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryGainControlImpl.java Changed

@@ -26,48 +26,40 @@
 import org.bluray.media.PrimaryGainControl;
 
 public class PrimaryGainControlImpl implements PrimaryGainControl {
-    public void setMute(boolean mute)
-    {
+    public void setMute(boolean mute) {
         // TODO Not implemented
     }
 
-    public boolean getMute()
-    {
+    public boolean getMute() {
         return false; // TODO Not implemented
     }
 
-    public float setDB(float gain)
-    {
+    public float setDB(float gain) {
         return 0;  // TODO Not implemented
     }
 
-    public float getDB()
-    {
+    public float getDB() {
         return 0;  // TODO Not implemented
     }
 
-    public float setLevel(float level)
-    {
+    public float setLevel(float level) {
         return 0;
     }
 
-    public float getLevel()
-    {
+    public float getLevel() {
         return 0;  // TODO Not implemented
     }
 
-    public void addGainChangeListener(GainChangeListener listener)
-    {
+    public void addGainChangeListener(GainChangeListener listener) {
         // TODO Not implemented
+        org.videolan.Logger.unimplemented("PrimaryGainControlImpl", "addGainChangeListener");
     }
 
-    public void removeGainChangeListener(GainChangeListener listener)
-    {
+    public void removeGainChangeListener(GainChangeListener listener) {
         // TODO Not implemented
     }
 
-    public Component getControlComponent()
-    {
+    public Component getControlComponent() {
         return null;
     }
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryAudioControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryAudioControlImpl.java Changed

@@ -19,81 +19,33 @@
 
 package org.videolan.media.content.playlist;
 
-import java.awt.Component;
-
 import org.bluray.media.SecondaryAudioControl;
-import org.bluray.media.StreamNotAvailableException;
-import org.davic.media.LanguageNotAvailableException;
-import org.davic.media.NotAuthorizedException;
 import org.videolan.Libbluray;
 import org.videolan.StreamInfo;
 import org.videolan.TIClip;
 
 public class SecondaryAudioControlImpl extends StreamControl implements SecondaryAudioControl {
- protected SecondaryAudioControlImpl(Handler player)
- {
+ protected SecondaryAudioControlImpl(Handler player) {
 super(player);
 }
- 
- public int[] listAvailableStreamNumbers()
- {
- TIClip clip = getCurrentClip();
- return listAvailableStreamNumbers(clip.getSecAudioStreams());
- }
-
- public int getCurrentStreamNumber()
- {
- return Libbluray.readPSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO) & 0xff;
- }
 
- public void selectStreamNumber(int num) throws StreamNotAvailableException
- {
- if (num < 0 || num > 0xff)
- throw new IllegalArgumentException();
- 
- int old = Libbluray.readPSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO) & 0xffffff00;
- Libbluray.writePSR(old | num, Libbluray.PSR_SECONDARY_AUDIO_VIDEO);
+ protected StreamInfo[] getStreams() {
+ TIClip ci = player.getCurrentClipInfo();
+ if (ci == null)
+ return null;
+ return ci.getSecAudioStreams();
 }
 
- public String[] listAvailableLanguages()
- {
- TIClip clip = getCurrentClip(); 
- return listAvailableLanguages(clip.getSecAudioStreams());
- }
-
- public String getCurrentLanguage()
- {
- TIClip clip = getCurrentClip();
- StreamInfo[] streams = clip.getSecAudioStreams();
- return streams[getCurrentStreamNumber() - 1].getLang();
- }
- 
- public String selectDefaultLanguage() throws NotAuthorizedException
- {
- // FIXME: should add ability to select the default language
- try {
- selectLanguage("eng");
- } catch (LanguageNotAvailableException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return "eng";
+ protected String getDefaultLanguage() {
+ return languageFromInteger(Libbluray.readPSR(Libbluray.PSR_AUDIO_LANG));
 }
 
- public void selectLanguage(String language)
- throws LanguageNotAvailableException, NotAuthorizedException
- {
- TIClip clip = getCurrentClip();
- StreamInfo[] streams = clip.getSecAudioStreams();
- try {
- selectStreamNumber(selectLanguage(language, streams));
- } catch (StreamNotAvailableException e) {
- throw new LanguageNotAvailableException();
- }
+ public int getCurrentStreamNumber() {
+ return Libbluray.readPSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO) & 0x000000FF;
 }
 
- public Component getControlComponent()
- {
- return null;
+ protected void setStreamNumber(int num) {
+ int psr = Libbluray.readPSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO);
+ Libbluray.writePSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO, (psr & 0xFFFFFF00) | num);
 }
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryGainControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryGainControlImpl.java Changed

@@ -26,48 +26,40 @@
 import org.bluray.media.SecondaryGainControl;
 
 public class SecondaryGainControlImpl implements SecondaryGainControl {
-    public void setMute(boolean mute)
-    {
+    public void setMute(boolean mute) {
         // TODO Not implemented
     }
 
-    public boolean getMute()
-    {
+    public boolean getMute() {
         return false; // TODO Not implemented
     }
 
-    public float setDB(float gain)
-    {
+    public float setDB(float gain) {
         return 0;  // TODO Not implemented
     }
 
-    public float getDB()
-    {
+    public float getDB() {
         return 0;  // TODO Not implemented
     }
 
-    public float setLevel(float level)
-    {
+    public float setLevel(float level) {
         return 0;
     }
 
-    public float getLevel()
-    {
+    public float getLevel() {
         return 0;  // TODO Not implemented
     }
 
-    public void addGainChangeListener(GainChangeListener listener)
-    {
+    public void addGainChangeListener(GainChangeListener listener) {
         // TODO Not implemented
+        org.videolan.Logger.unimplemented("SecondaryGainControlImpl", "addGainChangeListener");
     }
 
-    public void removeGainChangeListener(GainChangeListener listener)
-    {
+    public void removeGainChangeListener(GainChangeListener listener) {
         // TODO Not implemented
     }
 
-    public Component getControlComponent()
-    {
+    public Component getControlComponent() {
         return null;
     }
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/StreamControl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/StreamControl.java Changed

@@ -19,56 +19,112 @@
 
 package org.videolan.media.content.playlist;
 
-import org.bluray.system.RegisterAccess;
+import java.awt.Component;
+
+import javax.media.Control;
+
+import org.bluray.media.StreamNotAvailableException;
 import org.davic.media.LanguageNotAvailableException;
 import org.davic.media.NotAuthorizedException;
 import org.videolan.StreamInfo;
-import org.videolan.TIClip;
 
-public abstract class StreamControl {
- protected StreamControl(Handler player)
- {
+public abstract class StreamControl implements Control {
+ protected StreamControl(Handler player) {
 this.player = player;
 }
- 
- protected int[] listAvailableStreamNumbers(StreamInfo[] streams)
- {
+
+ protected abstract StreamInfo[] getStreams();
+
+ protected abstract void setStreamNumber(int num);
+
+ protected String getDefaultLanguage() {
+ return "";
+ }
+
+ protected StreamInfo getCurrentStream() {
+ StreamInfo[] streams = getStreams();
+ int stream = getCurrentStreamNumber();
+ if ((streams == null) || (stream <= 0) || (stream > streams.length))
+ return null;
+ return streams[stream - 1];
+ }
+
+ protected String languageFromInteger(int value) {
+ char[] language = new char[3];
+ language[0] = (char)(value >> 16);
+ language[1] = (char)(value >> 8);
+ language[2] = (char)value;
+ return String.valueOf(language);
+ }
+
+ public Component getControlComponent() {
+ return null;
+ }
+
+ public abstract int getCurrentStreamNumber();
+
+ public int[] listAvailableStreamNumbers() {
+ StreamInfo[] streams = getStreams();
+ if (streams == null)
+ return new int[0];
 int[] ret = new int[streams.length];
 for (int i = 0; i < streams.length; i++)
 ret[i] = i + 1;
- 
 return ret;
 }
- 
- protected String[] listAvailableLanguages(StreamInfo[] streams)
- {
+
+ public void selectStreamNumber(int num) throws StreamNotAvailableException {
+ if (num < 1)
+ throw new StreamNotAvailableException();
+ StreamInfo[] streams = getStreams();
+ if ((streams == null) || (num > streams.length))
+ throw new StreamNotAvailableException();
+ setStreamNumber(num);
+ }
+
+ public String[] listAvailableLanguages() {
+ StreamInfo[] streams = getStreams();
+ if (streams == null)
+ return new String[0];
 String[] ret = new String[streams.length];
 for (int i = 0; i < streams.length; i++)
 ret[i] = streams[i].getLang();
- 
 return ret;
 }
- 
- protected TIClip getCurrentClip()
- {
- TIClip[] clips = player.ti.getClips();
- int playitem = RegisterAccess.getInstance().getPSR(RegisterAccess.PSR_PLAYITEM_ID) - 1;
- 
- if (clips.length >= playitem)
- return null;
- 
- return clips[playitem];
+
+ public String getCurrentLanguage() {
+ StreamInfo stream = getCurrentStream();
+ if (stream == null)
+ return "";
+ return stream.getLang();
+ }
+
+ public String selectDefaultLanguage() throws NotAuthorizedException {
+ String language = getDefaultLanguage();
+ try {
+ selectLanguage(language);
+ } catch (LanguageNotAvailableException e) {
+ throw new NotAuthorizedException();
+ }
+ return language;
 }
- 
- public int selectLanguage(String language, StreamInfo[] streams) throws LanguageNotAvailableException, NotAuthorizedException
- {
+
+ public void selectLanguage(String language)
+ throws LanguageNotAvailableException, NotAuthorizedException {
+ StreamInfo[] streams = getStreams();
+ if (streams == null)
+ throw new NotAuthorizedException();
 for (int i = 0; i < streams.length; i++) {
- if (streams[i].getLang().equals(language))
- return i + 1;
+ if (streams[i].getLang().equals(language)) {
+ try {
+ selectStreamNumber(i + 1);
+ } catch (StreamNotAvailableException e) {
+ throw new NotAuthorizedException();
+ }
+ }
 }
- 
 throw new LanguageNotAvailableException();
 }
- 
+
 protected Handler player;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/SubtitlingControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/SubtitlingControlImpl.java Changed

@@ -19,132 +19,120 @@
 
 package org.videolan.media.content.playlist;
 
-import java.awt.Component;
+import java.util.EventObject;
 
 import org.bluray.media.StreamNotAvailableException;
 import org.bluray.media.SubtitleStyleNotAvailableException;
 import org.bluray.media.SubtitlingControl;
 import org.bluray.media.TextSubtitleNotAvailableException;
 import org.bluray.ti.CodingType;
-import org.davic.media.LanguageNotAvailableException;
-import org.davic.media.NotAuthorizedException;
 import org.dvb.media.SubtitleListener;
+import org.videolan.BDJListeners;
 import org.videolan.Libbluray;
 import org.videolan.StreamInfo;
 import org.videolan.TIClip;
 
 public class SubtitlingControlImpl extends StreamControl implements SubtitlingControl {
-
- protected SubtitlingControlImpl(Handler player)
- {
+ protected SubtitlingControlImpl(Handler player) {
 super(player);
 }
 
- public void addSubtitleListener(SubtitleListener listener)
- {
- throw new Error("Not implemented"); // TODO implement
+ protected StreamInfo[] getStreams() {
+ TIClip ci = player.getCurrentClipInfo();
+ if (ci == null)
+ return null;
+ return ci.getPgStreams();
 }
 
- public void removeSubtitleListener(SubtitleListener listener)
- {
- throw new Error("Not implemented"); // TODO implement
+ protected String getDefaultLanguage() {
+ return languageFromInteger(Libbluray.readPSR(Libbluray.PSR_PG_AND_SUB_LANG));
 }
 
- public boolean isSubtitlingOn()
- {
- throw new Error("Not implemented"); // TODO implement
+ public int getCurrentStreamNumber() {
+ return Libbluray.readPSR(Libbluray.PSR_PG_STREAM) & 0x00000FFF;
 }
 
- public boolean setSubtitling(boolean value)
- {
- throw new Error("Not implemented"); // TODO implement
+ protected void setStreamNumber(int num) {
+ int psr = Libbluray.readPSR(Libbluray.PSR_PG_STREAM);
+ Libbluray.writePSR(Libbluray.PSR_PG_STREAM, (psr & 0xFFFFF000) | num);
 }
 
- public Component getControlComponent()
- {
- throw new Error("Not implemented"); // TODO implement
+ public boolean isSubtitlingOn() {
+ return (Libbluray.readPSR(Libbluray.PSR_PG_STREAM) & 0x80000000) != 0;
 }
 
- public String selectDefaultLanguage() throws NotAuthorizedException
- {
- // FIXME: should add ability to select the default language
- try {
- selectLanguage("eng");
- } catch (LanguageNotAvailableException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return "eng";
- }
-
- public void selectLanguage(String language)
- throws LanguageNotAvailableException, NotAuthorizedException
- {
- TIClip clip = getCurrentClip();
- StreamInfo[] streams = clip.getAudioStreams();
- try {
- selectStreamNumber(selectLanguage(language, streams));
- } catch (StreamNotAvailableException e) {
- throw new LanguageNotAvailableException();
+ public boolean setSubtitling(boolean mode) {
+ int psr = Libbluray.readPSR(Libbluray.PSR_PG_STREAM);
+ boolean oldMode = (psr & 0x80000000) != 0;
+ if (mode != oldMode) {
+ if (mode)
+ Libbluray.writePSR(Libbluray.PSR_PG_STREAM, psr | 0x80000000);
+ else
+ Libbluray.writePSR(Libbluray.PSR_PG_STREAM, psr & ~0x80000000);
 }
+ return oldMode;
 }
 
- public void selectStreamNumber(int num) throws StreamNotAvailableException
- {
- Libbluray.writePSR(num, Libbluray.PSR_PG_STREAM);
+ public void selectSubtitle(int subtitle) throws StreamNotAvailableException {
+ selectStreamNumber(subtitle);
 }
 
- public void selectSubtitle(int subtitle) throws StreamNotAvailableException
- {
- throw new Error("Not implemented"); // TODO implement
+ public boolean isPipSubtitleMode() {
+ return (Libbluray.readPSR(Libbluray.PSR_PG_STREAM) & 0x40000000) != 0;
 }
 
- public boolean setPipSubtitleMode(boolean mode)
- {
- throw new Error("Not implemented"); // TODO implement
+ public boolean setPipSubtitleMode(boolean mode) {
+ int psr = Libbluray.readPSR(Libbluray.PSR_PG_STREAM);
+ boolean oldMode = (psr & 0x40000000) != 0;
+ if (mode != oldMode) {
+ if (mode)
+ Libbluray.writePSR(Libbluray.PSR_PG_STREAM, psr | 0x40000000);
+ else
+ Libbluray.writePSR(Libbluray.PSR_PG_STREAM, psr & ~0x40000000);
+ }
+ return oldMode;
 }
 
 public void setSubtitleStyle(int style)
- throws TextSubtitleNotAvailableException,
- SubtitleStyleNotAvailableException
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public String getCurrentLanguage()
- {
- throw new Error("Not implemented"); // TODO implement
- }
-
- public String[] listAvailableLanguages()
- {
- throw new Error("Not implemented"); // TODO implement
+ throws TextSubtitleNotAvailableException, SubtitleStyleNotAvailableException {
+ if ((style <= 0) || ((style > 25) && (style != 255)))
+ throw new SubtitleStyleNotAvailableException();
+ if (getCurrentSubtitleType() != CodingType.TEXT_SUBTITLE)
+ throw new TextSubtitleNotAvailableException();
+ Libbluray.writePSR(Libbluray.PSR_STYLE, style);
 }
 
- public int getCurrentStreamNumber()
- {
- throw new Error("Not implemented"); // TODO implement
+ public CodingType getCurrentSubtitleType() {
+ StreamInfo[] streamInfo = getStreams();
+ if (streamInfo == null)
+ return null;
+ int stream = getCurrentStreamNumber();
+ if ((stream <= 0) || (stream > streamInfo.length))
+ return null;
+ return streamInfo[stream - 1].getCodingType();
 }
 
- public int[] listAvailableStreamNumbers()
- {
- throw new Error("Not implemented"); // TODO implement
+ public int getSubtitleStyle()
+ throws TextSubtitleNotAvailableException, SubtitleStyleNotAvailableException {
+ if (getCurrentSubtitleType() != CodingType.TEXT_SUBTITLE)
+ throw new TextSubtitleNotAvailableException();
+ int style = Libbluray.readPSR(Libbluray.PSR_STYLE);
+ if ((style <= 0) || ((style > 25) && (style != 255)))
+ throw new SubtitleStyleNotAvailableException();
+ return style;
 }
 
- public CodingType getCurrentSubtitleType()
- {
- throw new Error("Not implemented"); // TODO implement
+ public void addSubtitleListener(SubtitleListener listener) {
+ listeners.add(listener);
 }
 
- public int getSubtitleStyle() throws TextSubtitleNotAvailableException,
- SubtitleStyleNotAvailableException
- {
- throw new Error("Not implemented"); // TODO implement
+ public void removeSubtitleListener(SubtitleListener listener) {
+ listeners.remove(listener);
 }
 
- public boolean isPipSubtitleMode()
- {
- throw new Error("Not implemented"); // TODO implement
+ protected void onSubtitleChange(int param) {
+ listeners.putCallback(new EventObject(this));
 }
 
+ private BDJListeners listeners = new BDJListeners();
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/UOMaskTableControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/UOMaskTableControlImpl.java Changed

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/VideoControl.java Added

@@ -0,0 +1,159 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan.media.content.playlist;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Rectangle;
+
+import org.dvb.media.VideoPresentationControl;
+import org.havi.ui.HScreen;
+import org.havi.ui.HScreenRectangle;
+import org.havi.ui.HVideoConfiguration;
+import org.videolan.StreamInfo;
+
+public abstract class VideoControl extends StreamControl implements VideoPresentationControl {
+ protected VideoControl(Handler player, int plane) {
+ super(player);
+ this.plane = plane;
+ }
+
+ protected HScreenRectangle getNormalizedRectangle(Dimension dimension, Rectangle rectangle) {
+ if ((dimension.width == 0) || (dimension.height == 0))
+ return new HScreenRectangle(0, 0, 0, 0);
+ float x = rectangle.x / dimension.width;
+ float y = rectangle.y / dimension.height;
+ float w = rectangle.width / dimension.width;
+ float h = rectangle.height / dimension.height;
+ return new HScreenRectangle(x, y, w, h);
+ }
+
+ protected Rectangle getRectangle(Dimension dimension, HScreenRectangle rectangle) {
+ int x = (int)(rectangle.x * dimension.width);
+ int y = (int)(rectangle.y * dimension.height);
+ int w = (int)(rectangle.width * dimension.width);
+ int h = (int)(rectangle.height * dimension.height);
+ return new Rectangle(x, y, w, h);
+ }
+
+ protected float getPositionOnScreen(float pos) {
+ if (pos < 0.0f)
+ return 0.0f;
+ if (pos > 1.0f)
+ return 1.0f;
+ return pos;
+ }
+
+ protected HScreenRectangle getRectangleOnScreen(HScreenRectangle rectangle) {
+ float x1 = getPositionOnScreen(rectangle.x);
+ float y1 = getPositionOnScreen(rectangle.y);
+ float x2 = getPositionOnScreen(rectangle.x + rectangle.width);
+ float y2 = getPositionOnScreen(rectangle.y + rectangle.height);
+ return new HScreenRectangle(x1, y1, x2 - x1, y2 - y1);
+ }
+
+ protected Dimension getScreenSize() {
+ HVideoConfiguration hvc = HScreen.getDefaultHScreen().getDefaultHVideoDevice().getCurrentConfiguration();
+ return hvc.getPixelResolution();
+ }
+
+ protected void setVideoArea(HScreenRectangle rectangle) {
+ dstArea = rectangle;
+ // TODO
+ }
+
+ public Dimension getInputVideoSize() {
+ StreamInfo stream = getCurrentStream();
+ if (stream == null)
+ return new Dimension(0, 0);
+ return stream.getVideoSize();
+ }
+
+ public Dimension getVideoSize() {
+ Rectangle dr = getRectangle(getScreenSize(), dstArea);
+ return new Dimension(dr.width, dr.height);
+ }
+
+ public HScreenRectangle getActiveVideoArea() {
+ return new HScreenRectangle(dstArea.x, dstArea.y, dstArea.width, dstArea.height);
+ }
+
+ public HScreenRectangle getActiveVideoAreaOnScreen() {
+ return getRectangleOnScreen(dstArea);
+ }
+
+ public HScreenRectangle getTotalVideoArea() {
+ return getActiveVideoArea();
+ }
+
+ public HScreenRectangle getTotalVideoAreaOnScreen() {
+ return getActiveVideoAreaOnScreen();
+ }
+
+ public boolean supportsClipping() {
+ return true;
+ }
+
+ public Rectangle getClipRegion() {
+ return getRectangle(getVideoSize(), srcArea);
+ }
+
+ public Rectangle setClipRegion(Rectangle clipRect) {
+ Dimension vd = getInputVideoSize();
+ if ((vd.width == 0) || (vd.height == 0))
+ return new Rectangle(0, 0);
+ srcArea = getRectangleOnScreen(getNormalizedRectangle(vd, clipRect));
+
+ //TODO
+ org.videolan.Logger.unimplemented("VideoControl", "setClipRegion");
+
+ return getRectangle(vd, srcArea);
+ }
+
+ public float[] supportsArbitraryHorizontalScaling() {
+ return new float[] { 0.001f, 4.0f };
+ }
+
+ public float[] supportsArbitraryVerticalScaling() {
+ return new float[] { 0.001f, 4.0f };
+ }
+
+ public float[] getHorizontalScalingFactors() {
+ org.videolan.Logger.unimplemented("VideoControl", "getHorizontalScalingFactors");
+ return null;
+ }
+
+ public float[] getVerticalScalingFactors() {
+ org.videolan.Logger.unimplemented("VideoControl", "getVerticalScalingFactors");
+ return null;
+ }
+
+ public byte getPositioningCapability() {
+ return POS_CAP_FULL;
+ }
+
+ public Component getControlComponent() {
+ org.videolan.Logger.unimplemented("VideoControl", "getControlComponent");
+ return null;
+ }
+
+ private int plane = 0;
+ private HScreenRectangle srcArea = new HScreenRectangle(0.0f, 0.0f, 1.0f, 1.0f);
+ private HScreenRectangle dstArea = new HScreenRectangle(0.0f, 0.0f, 1.0f, 1.0f);
+}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/VideoFormatControlImpl.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/playlist/VideoFormatControlImpl.java Changed

@@ -20,70 +20,69 @@
 package org.videolan.media.content.playlist;
 
 import java.awt.Component;
+import java.awt.Dimension;
 
 import org.dvb.media.VideoFormatControl;
 import org.dvb.media.VideoFormatListener;
 import org.dvb.media.VideoTransformation;
-import org.videolan.BDJLoader;
-import org.videolan.bdjo.GraphicsResolution;
+import org.havi.ui.HScreen;
+import org.havi.ui.HVideoConfiguration;
+import org.videolan.TIClip;
 
 public class VideoFormatControlImpl implements VideoFormatControl {
+ protected VideoFormatControlImpl(Handler player) {
+ this.player = player;
+ }
 
- public Component getControlComponent()
- {
+ public Component getControlComponent() {
 return null;
 }
 
- public int getAspectRatio()
- {
- return ASPECT_RATIO_UNKNOWN; // FIXME: get actual aspect ratio from video
+ public int getAspectRatio() {
+ TIClip ci = player.getCurrentClipInfo();
+ if ((ci == null) ||(ci.getVideoStreamCount() <= 0))
+ return ASPECT_RATIO_UNKNOWN;
+ Dimension aspect = ci.getVideoStreams()[0].getVideoAspectRatio();
+ if ((aspect.width == 4) && (aspect.height == 3))
+ return ASPECT_RATIO_4_3;
+ if ((aspect.width == 16) && (aspect.height == 9))
+ return ASPECT_RATIO_16_9;
+ return ASPECT_RATIO_UNKNOWN;
 }
 
- public int getActiveFormatDefinition()
- {
- return AFD_NOT_PRESENT; // FIXME: get actual AFD
+ public int getActiveFormatDefinition() {
+ return AFD_NOT_PRESENT;
 }
 
- public int getDecoderFormatConversion()
- {
+ public int getDecoderFormatConversion() {
 return DFC_PROCESSING_NONE; // FIXME: get actual DFC
 }
 
- public VideoTransformation getVideoTransformation(int dfc)
- {
- return null; // FIXME: implement
+ public VideoTransformation getVideoTransformation(int dfc) {
+ return null; // TODO: implement
 }
 
- public int getDisplayAspectRatio()
- {
- GraphicsResolution res = BDJLoader.getBdjo().getTerminalInfo().getResolution();
- 
- switch (res) {
- case HD_1920_1080:
- case HD_1280_720:
- return ASPECT_RATIO_16_9;
- case SD:
- case SD_50HZ_720_576:
- case SD_60HZ_720_480:
- case QHD_960_540:
- default:
- return ASPECT_RATIO_UNKNOWN;
- }
+ public int getDisplayAspectRatio() {
+ HVideoConfiguration hvc = HScreen.getDefaultHScreen().getDefaultHVideoDevice().getCurrentConfiguration();
+ Dimension resolution = hvc.getPixelResolution();
+ if (resolution.width == 720)
+ return DAR_4_3;
+ return DAR_16_9;
 }
 
- public boolean isPlatform()
- {
- return false; // FIXME: ???
+ public boolean isPlatform() {
+ return dfc == DFC_PLATFORM;
 }
 
- public void addVideoFormatListener(VideoFormatListener listener)
- {
- // FIXME: implement
+ public void addVideoFormatListener(VideoFormatListener listener) {
+ // TODO: implement
+ org.videolan.Logger.unimplemented("VideoFormatControlImpl", "addVideoFormatListener");
 }
 
- public void removeVideoFormatListener(VideoFormatListener listener)
- {
- // FIXME: implement
+ public void removeVideoFormatListener(VideoFormatListener listener) {
+ // TODO: implement
 }
 
+ private Handler player;
+ private int dfc = DFC_PROCESSING_NONE;
 }

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/sound Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/sound/Handler.java Added

@@ -0,0 +1,202 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan.media.content.sound;
+
+import java.awt.Component;
+import java.io.IOException;
+import java.util.ArrayList;
+
+import javax.media.ClockStartedError;
+import javax.media.ClockStoppedException;
+import javax.media.ConnectionErrorEvent;
+import javax.media.Control;
+import javax.media.Controller;
+import javax.media.ControllerErrorEvent;
+import javax.media.ControllerListener;
+import javax.media.GainControl;
+import javax.media.IncompatibleSourceException;
+import javax.media.IncompatibleTimeBaseException;
+import javax.media.Player;
+import javax.media.Time;
+import javax.media.TimeBase;
+import javax.media.protocol.DataSource;
+
+//import org.videolan.media.content.playlist.MediaTimePositionControlImpl;
+import org.videolan.media.content.playlist.OverallGainControlImpl;
+import org.videolan.media.content.playlist.PanningControlImpl;
+
+public class Handler implements Player {
+ public Handler() {
+ controls = new Control[3];
+ controls[0] = new MediaTimePositionControlImpl(this);
+ controls[1] = new OverallGainControlImpl();
+ controls[2] = new PanningControlImpl();
+ }
+
+ public void setSource(DataSource source) throws IOException, IncompatibleSourceException {
+ this.source = new org.videolan.media.protocol.dripfeed.DataSource(source.getLocator());
+ if (source.getLocator() == null)
+ throw new IncompatibleSourceException();
+ }
+
+ public int getState() {
+ synchronized (this) {
+ return state;
+ }
+ }
+
+ public int getTargetState() {
+ synchronized (this) {
+ return targetState;
+ }
+ }
+
+ public Time getStartLatency() {
+ return null;
+ }
+
+ public Control[] getControls() {
+ return controls;
+ }
+
+ public Control getControl(String forName) {
+ try {
+ Class cls = Class.forName(forName);
+ for (int i = 0; i < controls.length; i++) {
+ if (cls.isInstance(controls[i]))
+ return controls[i];
+ }
+ return null;
+ } catch (ClassNotFoundException e) {
+ return null;
+ }
+ }
+
+ public void addControllerListener(ControllerListener listener) {
+ synchronized (listeners) {
+ listeners.add(listener);
+ }
+ }
+
+ public void removeControllerListener(ControllerListener listener) {
+ synchronized (listeners) {
+ listeners.remove(listener);
+ }
+ }
+
+ public void setTimeBase(TimeBase master)
+ throws IncompatibleTimeBaseException {
+ throw new IncompatibleTimeBaseException();
+ }
+
+ public void realize() {
+ // TODO Auto-generated method stub
+ }
+
+ public void prefetch() {
+ // TODO Auto-generated method stub
+ }
+
+ public void start() {
+ // TODO Auto-generated method stub
+ }
+
+ public void syncStart(Time at) {
+ // TODO Auto-generated method stub
+ }
+
+ public void deallocate() {
+ // TODO Auto-generated method stub
+ }
+
+ public void close() {
+ // TODO Auto-generated method stub
+ }
+
+ public void stop() {
+ // TODO Auto-generated method stub
+ }
+
+ public void setStopTime(Time stopTime) {
+ }
+
+ public Time getStopTime() {
+ return null;
+ }
+
+ public void setMediaTime(Time now) {
+ }
+
+ public Time getMediaTime() {
+ return new Time(0);
+ }
+
+ public long getMediaNanoseconds() {
+ return 0;
+ }
+
+ public Time getSyncTime() {
+ return null;
+ }
+
+ public TimeBase getTimeBase() {
+ return null;
+ }
+
+ public Time mapToTimeBase(Time t) throws ClockStoppedException {
+ return null;
+ }
+
+ public float getRate() {
+ return 1.0f;
+ }
+
+ public float setRate(float factor) {
+ return 1.0f;
+ }
+
+ public Component getVisualComponent() {
+ return null;
+ }
+
+ public GainControl getGainControl() {
+ return null;
+ }
+
+ public Component getControlPanelComponent() {
+ return null;
+ }
+
+ public void addController(Controller newController)
+ throws IncompatibleTimeBaseException {
+ }
+
+ public void removeController(Controller oldController) {
+ }
+
+ public Time getDuration() {
+ return null;
+ }
+
+ protected int state = Unrealized;
+ protected int targetState = Unrealized;
+ protected Control[] controls = null;
+ private org.videolan.media.protocol.dripfeed.DataSource source = null;
+ private ArrayList listeners = new ArrayList();
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/sound/MediaTimePositionControlImpl.java Added

@@ -0,0 +1,47 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2010 William Hahne
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan.media.content.sound;
+
+import java.awt.Component;
+
+import javax.media.Time;
+
+import org.davic.media.MediaTimePositionControl;
+
+public class MediaTimePositionControlImpl implements MediaTimePositionControl {
+ protected MediaTimePositionControlImpl(Handler player) {
+ this.player = player;
+ }
+
+ public Component getControlComponent() {
+ return null;
+ }
+
+ public Time setMediaTimePosition(Time mediaTime) {
+ player.setMediaTime(mediaTime);
+ return player.getMediaTime();
+ }
+
+ public Time getMediaTimePosition() {
+ return player.getMediaTime();
+ }
+
+ private Handler player;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/video Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/video/dvb Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/BackgroundVideoPresentationControlImpl.java Added

@@ -0,0 +1,122 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2010 William Hahne
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan.media.content.video.dvb.mpeg.drip;
+
+import java.awt.Dimension;
+import java.awt.Rectangle;
+
+import javax.tv.media.AWTVideoSize;
+import javax.tv.media.AWTVideoSizeControl;
+
+import org.dvb.media.BackgroundVideoPresentationControl;
+import org.dvb.media.VideoTransformation;
+import org.havi.ui.HScreenPoint;
+import org.havi.ui.HScreenRectangle;
+
+public class BackgroundVideoPresentationControlImpl extends VideoControl
+ implements BackgroundVideoPresentationControl, AWTVideoSizeControl {
+ protected BackgroundVideoPresentationControlImpl(Handler player) {
+ super(player);
+ }
+
+ public boolean setVideoTransformation(VideoTransformation transform) {
+ setClipRegion(transform.getClipRegion());
+ HScreenPoint pos = transform.getVideoPosition();
+ float[] scales = transform.getScalingFactors();
+ Dimension vd = getInputVideoSize();
+ Dimension sd = getScreenSize();
+ setVideoArea(new HScreenRectangle(
+ pos.x, pos.y,
+ vd.width * scales[0] / sd.width,
+ vd.height * scales[0] / sd.height));
+ return true;
+ }
+
+ public VideoTransformation getVideoTransformation() {
+ Dimension vd = getInputVideoSize();
+ HScreenRectangle rect = getActiveVideoArea();
+ float xscale, yscale;
+ if ((vd.width == 0) || (vd.height == 0)) {
+ xscale = 0.0f;
+ yscale = 0.0f;
+ } else {
+ Dimension sd = getScreenSize();
+ xscale = rect.width * sd.width / vd.width;
+ yscale = rect.height * sd.height / vd.height;
+ }
+ return new VideoTransformation(
+ getClipRegion(),
+ xscale, yscale,
+ new HScreenPoint(rect.x, rect.y));
+ }
+
+ public VideoTransformation getClosestMatch(VideoTransformation transform) {
+ return transform;
+ }
+
+ public AWTVideoSize getSize() {
+ return new AWTVideoSize(
+ getClipRegion(),
+ getRectangle(getScreenSize(), getActiveVideoArea()));
+ }
+
+ public AWTVideoSize getDefaultSize() {
+ Dimension vd = getInputVideoSize();
+ Dimension sd = getScreenSize();
+ return new AWTVideoSize(
+ new Rectangle(vd.width, vd.height),
+ new Rectangle(sd.width, sd.height));
+ }
+
+ public Dimension getSourceVideoSize() {
+ return getVideoSize();
+ }
+
+ public boolean setSize(AWTVideoSize size) {
+ setClipRegion(size.getSource());
+ setVideoArea(getNormalizedRectangle(getScreenSize(), size.getDestination()));
+ return true;
+ }
+
+ public AWTVideoSize checkSize(AWTVideoSize size) {
+ Dimension vd = getInputVideoSize();
+ Rectangle sr = size.getSource();
+ if (sr.x < 0)
+ sr.x = 0;
+ if ((sr.x + sr.width) > vd.width) {
+ sr.width = vd.width - sr.x;
+ if (sr.width <= 0) {
+ sr.x = 0;
+ sr.width = 0;
+ }
+ }
+ if (sr.y < 0)
+ sr.y = 0;
+ if ((sr.y + sr.height) > vd.height) {
+ sr.height = vd.height - sr.y;
+ if (sr.height <= 0) {
+ sr.y = 0;
+ sr.height = 0;
+ }
+ }
+ Rectangle dr = size.getDestination();
+ return new AWTVideoSize(sr, dr);
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/Handler.java Added

@@ -0,0 +1,198 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan.media.content.video.dvb.mpeg.drip;
+
+import java.awt.Component;
+import java.io.IOException;
+import java.util.ArrayList;
+
+import javax.media.ClockStartedError;
+import javax.media.ClockStoppedException;
+import javax.media.ConnectionErrorEvent;
+import javax.media.Control;
+import javax.media.Controller;
+import javax.media.ControllerErrorEvent;
+import javax.media.ControllerListener;
+import javax.media.GainControl;
+import javax.media.IncompatibleSourceException;
+import javax.media.IncompatibleTimeBaseException;
+import javax.media.Player;
+import javax.media.Time;
+import javax.media.TimeBase;
+import javax.media.protocol.DataSource;
+
+//import org.videolan.media.content.playlist.BackgroundVideoPresentationControlImpl;
+
+public class Handler implements Player {
+ public Handler() {
+ controls = new Control[1];
+ controls[0] = new BackgroundVideoPresentationControlImpl(this);
+ }
+
+ public void setSource(DataSource source) throws IOException, IncompatibleSourceException {
+ this.source = new org.videolan.media.protocol.dripfeed.DataSource(source.getLocator());
+ if (source.getLocator() == null)
+ throw new IncompatibleSourceException();
+ }
+
+ public int getState() {
+ synchronized (this) {
+ return state;
+ }
+ }
+
+ public int getTargetState() {
+ synchronized (this) {
+ return targetState;
+ }
+ }
+
+ public Time getStartLatency() {
+ return null;
+ }
+
+ public Control[] getControls() {
+ return controls;
+ }
+
+ public Control getControl(String forName) {
+ try {
+ Class cls = Class.forName(forName);
+ for (int i = 0; i < controls.length; i++) {
+ if (cls.isInstance(controls[i]))
+ return controls[i];
+ }
+ return null;
+ } catch (ClassNotFoundException e) {
+ return null;
+ }
+ }
+
+ public void addControllerListener(ControllerListener listener) {
+ synchronized (listeners) {
+ listeners.add(listener);
+ }
+ }
+
+ public void removeControllerListener(ControllerListener listener) {
+ synchronized (listeners) {
+ listeners.remove(listener);
+ }
+ }
+
+ public void setTimeBase(TimeBase master)
+ throws IncompatibleTimeBaseException {
+ throw new IncompatibleTimeBaseException();
+ }
+
+ public void realize() {
+ // TODO Auto-generated method stub
+ }
+
+ public void prefetch() {
+ // TODO Auto-generated method stub
+ }
+
+ public void start() {
+ // TODO Auto-generated method stub
+ }
+
+ public void syncStart(Time at) {
+ // TODO Auto-generated method stub
+ }
+
+ public void deallocate() {
+ // TODO Auto-generated method stub
+ }
+
+ public void close() {
+ // TODO Auto-generated method stub
+ }
+
+ public void stop() {
+ // TODO Auto-generated method stub
+ }
+
+ public void setStopTime(Time stopTime) {
+ }
+
+ public Time getStopTime() {
+ return null;
+ }
+
+ public void setMediaTime(Time now) {
+ }
+
+ public Time getMediaTime() {
+ return new Time(0);
+ }
+
+ public long getMediaNanoseconds() {
+ return 0;
+ }
+
+ public Time getSyncTime() {
+ return null;
+ }
+
+ public TimeBase getTimeBase() {
+ return null;
+ }
+
+ public Time mapToTimeBase(Time t) throws ClockStoppedException {
+ return null;
+ }
+
+ public float getRate() {
+ return 1.0f;
+ }
+
+ public float setRate(float factor) {
+ return 1.0f;
+ }
+
+ public Component getVisualComponent() {
+ return null;
+ }
+
+ public GainControl getGainControl() {
+ return null;
+ }
+
+ public Component getControlPanelComponent() {
+ return null;
+ }
+
+ public void addController(Controller newController)
+ throws IncompatibleTimeBaseException {
+ }
+
+ public void removeController(Controller oldController) {
+ }
+
+ public Time getDuration() {
+ return null;
+ }
+
+ protected int state = Unrealized;
+ protected int targetState = Unrealized;
+ protected Control[] controls = null;
+ private org.videolan.media.protocol.dripfeed.DataSource source = null;
+ private ArrayList listeners = new ArrayList();
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/VideoControl.java Added

@@ -0,0 +1,152 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan.media.content.video.dvb.mpeg.drip;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Rectangle;
+
+import org.dvb.media.VideoPresentationControl;
+import org.havi.ui.HScreen;
+import org.havi.ui.HScreenRectangle;
+import org.havi.ui.HVideoConfiguration;
+import org.videolan.StreamInfo;
+
+public class VideoControl implements VideoPresentationControl {
+ protected VideoControl(Handler player) {
+ this.player = player;
+ }
+
+ protected HScreenRectangle getNormalizedRectangle(Dimension dimension, Rectangle rectangle) {
+ if ((dimension.width == 0) || (dimension.height == 0))
+ return new HScreenRectangle(0, 0, 0, 0);
+ float x = rectangle.x / dimension.width;
+ float y = rectangle.y / dimension.height;
+ float w = rectangle.width / dimension.width;
+ float h = rectangle.height / dimension.height;
+ return new HScreenRectangle(x, y, w, h);
+ }
+
+ protected Rectangle getRectangle(Dimension dimension, HScreenRectangle rectangle) {
+ int x = (int)(rectangle.x * dimension.width);
+ int y = (int)(rectangle.y * dimension.height);
+ int w = (int)(rectangle.width * dimension.width);
+ int h = (int)(rectangle.height * dimension.height);
+ return new Rectangle(x, y, w, h);
+ }
+
+ protected float getPositionOnScreen(float pos) {
+ if (pos < 0.0f)
+ return 0.0f;
+ if (pos > 1.0f)
+ return 1.0f;
+ return pos;
+ }
+
+ protected HScreenRectangle getRectangleOnScreen(HScreenRectangle rectangle) {
+ float x1 = getPositionOnScreen(rectangle.x);
+ float y1 = getPositionOnScreen(rectangle.y);
+ float x2 = getPositionOnScreen(rectangle.x + rectangle.width);
+ float y2 = getPositionOnScreen(rectangle.y + rectangle.height);
+ return new HScreenRectangle(x1, y1, x2 - x1, y2 - y1);
+ }
+
+ protected Dimension getScreenSize() {
+ HVideoConfiguration hvc = HScreen.getDefaultHScreen().getDefaultHVideoDevice().getCurrentConfiguration();
+ return hvc.getPixelResolution();
+ }
+
+ protected void setVideoArea(HScreenRectangle rectangle) {
+ dstArea = rectangle;
+ // TODO
+ }
+
+ public Dimension getInputVideoSize() {
+ return new Dimension(0, 0);
+ }
+
+ public Dimension getVideoSize() {
+ Rectangle dr = getRectangle(getScreenSize(), dstArea);
+ return new Dimension(dr.width, dr.height);
+ }
+
+ public HScreenRectangle getActiveVideoArea() {
+ return new HScreenRectangle(dstArea.x, dstArea.y, dstArea.width, dstArea.height);
+ }
+
+ public HScreenRectangle getActiveVideoAreaOnScreen() {
+ return getRectangleOnScreen(dstArea);
+ }
+
+ public HScreenRectangle getTotalVideoArea() {
+ return getActiveVideoArea();
+ }
+
+ public HScreenRectangle getTotalVideoAreaOnScreen() {
+ return getActiveVideoAreaOnScreen();
+ }
+
+ public boolean supportsClipping() {
+ return true;
+ }
+
+ public Rectangle getClipRegion() {
+ return getRectangle(getVideoSize(), srcArea);
+ }
+
+ public Rectangle setClipRegion(Rectangle clipRect) {
+ Dimension vd = getInputVideoSize();
+ if ((vd.width == 0) || (vd.height == 0))
+ return new Rectangle(0, 0);
+ srcArea = getRectangleOnScreen(getNormalizedRectangle(vd, clipRect));
+ //TODO
+ return getRectangle(vd, srcArea);
+ }
+
+ public float[] supportsArbitraryHorizontalScaling() {
+ return new float[] { 0.001f, 4.0f };
+ }
+
+ public float[] supportsArbitraryVerticalScaling() {
+ return new float[] { 0.001f, 4.0f };
+ }
+
+ public float[] getHorizontalScalingFactors() {
+ org.videolan.Logger.unimplemented("VideoControl", "getHorizontalScalingFactors");
+ throw new Error("Not implemented"); // TODO implement
+ }
+
+ public float[] getVerticalScalingFactors() {
+ org.videolan.Logger.unimplemented("VideoControl", "getVerticalScalingFactors");
+ throw new Error("Not implemented"); // TODO implement
+ }
+
+ public byte getPositioningCapability() {
+ return POS_CAP_FULL;
+ }
+
+ public Component getControlComponent() {
+ org.videolan.Logger.unimplemented("VideoControl", "getControlComponent");
+ throw new Error("Not implemented"); // TODO implement
+ }
+
+ private Handler player;
+ private HScreenRectangle srcArea = new HScreenRectangle(0.0f, 0.0f, 1.0f, 1.0f);
+ private HScreenRectangle dstArea = new HScreenRectangle(0.0f, 0.0f, 1.0f, 1.0f);
+}

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/java/org/videolan/media/protocol/bd/DataSource.java -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/protocol/bd/DataSource.java Changed

@@ -1,3 +1,21 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
 package org.videolan.media.protocol.bd;
 
 import java.io.IOException;
@@ -6,62 +24,50 @@
 import org.davic.net.InvalidLocatorException;
 
 public class DataSource extends javax.media.protocol.DataSource {
- public Object[] getControls()
- {
+ public Object[] getControls() {
 return new Object[0];
 }
 
- public Object getControl(String controlType)
- {
+ public Object getControl(String controlType) {
 return null;
 }
 
- public Time getDuration()
- {
- throw new Error("Not implemented");
+ public Time getDuration() {
+ org.videolan.Logger.unimplemented(DataSource.class.getName(), "getDuration");
+ return null;
 }
 
- public String getContentType()
- {
+ public String getContentType() {
 return contentType;
 }
 
 // TODO: support all content types
- public void connect() throws IOException
- {
+ public void connect() throws IOException {
 try {
 BDLocator locator = new BDLocator(getLocator().toExternalForm());
- 
+
 if (locator.isPlayListItem()) {
 contentType = "playlist";
- playlist = locator.getPlayListId();
+ } else if (locator.isSoundItem()) {
+ contentType = "sound";
 }
+
 } catch (InvalidLocatorException e) {
 // ignore
 }
 }
 
- public void disconnect()
- {
+ public void disconnect() {
 contentType = "unknown";
 }
 
- public void start() throws IOException
- {
+ public void start() throws IOException {
 if (contentType.equals("unknown"))
 throw new IOException("Unknown content type.");
 }
 
- public void stop() throws IOException
- {
- 
- }
- 
- public int getPlaylist()
- {
- return playlist;
+ public void stop() throws IOException {
 }
 
 private String contentType = "unknown";
- private int playlist = -1;
 }

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/protocol/dripfeed Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/protocol/dripfeed/DataSource.java Added

@@ -0,0 +1,38 @@
+/*
+ * This file is part of libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan.media.protocol.dripfeed;
+
+import javax.media.MediaLocator;
+
+import org.dvb.media.DripFeedDataSource;
+
+public class DataSource extends DripFeedDataSource {
+ public DataSource() {
+ 	super();
+ }
+
+ public DataSource(MediaLocator source) {
+ 	super(source);
+ }
+
+ public void feed(byte[] clip_part) {
+ org.videolan.Logger.unimplemented(DataSource.class.getName(), "feed");
+ throw new Error("Not implemented");
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/protocol/file Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/java/org/videolan/media/protocol/file/DataSource.java Added

@@ -0,0 +1,60 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package org.videolan.media.protocol.file;
+
+import java.io.IOException;
+import javax.media.Time;
+
+public class DataSource extends javax.media.protocol.DataSource {
+ public Object[] getControls() {
+ return new Object[0];
+ }
+
+ public Object getControl(String controlType) {
+ return null;
+ }
+
+ public Time getDuration() {
+ org.videolan.Logger.unimplemented(DataSource.class.getName(), "getDuration");
+ return null;
+ }
+
+ public String getContentType() {
+ return contentType;
+ }
+
+ public void connect() throws IOException {
+ contentType = "audio";
+ }
+
+ public void disconnect() {
+ contentType = "unknown";
+ }
+
+ public void start() throws IOException {
+ if (contentType.equals("unknown"))
+ throw new IOException("Unknown content type.");
+ }
+
+ public void stop() throws IOException {
+ }
+
+ private String contentType = "unknown";
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/native/java_awt_BDFontMetrics.c Added

@@ -0,0 +1,262 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <jni.h>
+
+#include "util/logging.h"
+
+#ifdef HAVE_FT2
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#endif
+
+#include "java_awt_BDFontMetrics.h"
+
+/* Disable some warnings */
+#if defined __GNUC__
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
+#ifdef __cplusplus
+#define CPP_EXTERN extern
+#else
+#define CPP_EXTERN
+#endif
+
+JNIEXPORT jlong JNICALL
+Java_java_awt_BDFontMetrics_initN(JNIEnv * env, jclass cls)
+{
+#ifdef HAVE_FT2
+ FT_Library ftLib;
+ if (!FT_Init_FreeType(&ftLib)) {
+ return (jlong)(intptr_t)ftLib;
+ }
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "Loading FreeType2 failed\n");
+#else
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "BD-J font support not compiled in\n");
+#endif
+ return 0;
+}
+
+JNIEXPORT void JNICALL
+Java_java_awt_BDFontMetrics_destroyN(JNIEnv * env, jclass cls, jlong ftLib)
+{
+#ifdef HAVE_FT2
+ FT_Library lib = (FT_Library)(intptr_t)ftLib;
+
+ if (!lib) {
+ return;
+ }
+
+ FT_Done_FreeType(lib);
+#endif
+}
+
+JNIEXPORT jlong JNICALL
+Java_java_awt_BDFontMetrics_loadFontN(JNIEnv * env, jobject obj, jlong ftLib, jstring fontName, jint size)
+{
+#ifdef HAVE_FT2
+ const char *name;
+ FT_Face ftFace;
+ FT_Error result;
+ jclass cls;
+ jfieldID fid;
+ FT_Library lib = (FT_Library)(intptr_t)ftLib;
+
+ if (!lib) {
+ return 0;
+ }
+
+ name = (*env)->GetStringUTFChars(env, fontName, NULL);
+ result = FT_New_Face(lib, name, 0, &ftFace);
+ (*env)->ReleaseStringUTFChars(env, fontName, name);
+ if (result)
+ return 0;
+ FT_Set_Char_Size(ftFace, 0, size << 6, 0, 0);
+
+ cls = (*env)->GetObjectClass(env, obj);
+ fid = (*env)->GetFieldID(env, cls, "ascent", "I");
+ (*env)->SetIntField (env, obj, fid, ftFace->size->metrics.ascender >> 6);
+ fid = (*env)->GetFieldID(env, cls, "descent", "I");
+ (*env)->SetIntField (env, obj, fid, -ftFace->size->metrics.descender >> 6);
+ fid = (*env)->GetFieldID(env, cls, "leading", "I");
+ (*env)->SetIntField (env, obj, fid, (ftFace->size->metrics.height - ftFace->size->metrics.ascender + ftFace->size->metrics.descender) >> 6);
+ fid = (*env)->GetFieldID(env, cls, "maxAdvance", "I");
+ (*env)->SetIntField (env, obj, fid, ftFace->size->metrics.max_advance >> 6);
+
+ return (jlong)(intptr_t)ftFace;
+#else /* HAVE_FT2 */
+ return 0;
+#endif /* HAVE_FT2 */
+}
+
+JNIEXPORT void JNICALL
+Java_java_awt_BDFontMetrics_destroyFontN(JNIEnv *env, jobject obj, jlong ftFace)
+{
+#ifdef HAVE_FT2
+ FT_Face face = (FT_Face)(intptr_t)ftFace;
+
+ if (!face) {
+ return;
+ }
+
+ FT_Done_Face(face);
+#endif
+}
+
+JNIEXPORT jint JNICALL
+Java_java_awt_BDFontMetrics_charWidthN(JNIEnv * env, jobject obj, jlong ftFace, jchar c)
+{
+#ifdef HAVE_FT2
+ FT_Face face = (FT_Face)(intptr_t)ftFace;
+
+ if (!face) {
+ return 0;
+ }
+
+ if (FT_Load_Char(face, c, FT_LOAD_DEFAULT))
+ return 0;
+ return face->glyph->metrics.horiAdvance >> 6;
+#else
+ return 0;
+#endif
+}
+
+JNIEXPORT jint JNICALL
+Java_java_awt_BDFontMetrics_stringWidthN(JNIEnv * env, jobject obj, jlong ftFace, jstring string)
+{
+#ifdef HAVE_FT2
+ jsize length;
+ const jchar *chars;
+ jint i, width;
+ FT_Face face = (FT_Face)(intptr_t)ftFace;
+
+ if (!face) {
+ return 0;
+ }
+
+ length = (*env)->GetStringLength(env, string);
+ if (length <= 0)
+ return 0;
+ chars = (*env)->GetStringCritical(env, string, NULL);
+ if (chars == NULL)
+ return 0;
+
+ for (i = 0, width = 0; i < length; i++) {
+ if (FT_Load_Char(face, chars[i], FT_LOAD_DEFAULT) == 0) {
+ width += face->glyph->metrics.horiAdvance >> 6;
+ }
+ }
+
+ (*env)->ReleaseStringCritical(env, string, chars);
+
+ return width;
+
+#else /* HAVE_FT2 */
+ return 0;
+#endif /* HAVE_FT2 */
+}
+
+JNIEXPORT jint JNICALL
+Java_java_awt_BDFontMetrics_charsWidthN(JNIEnv * env, jobject obj, jlong ftFace, jcharArray charArray,
+ jint offset, jint length)
+{
+#ifdef HAVE_FT2
+ jchar *chars;
+ jint i, width;
+ FT_Face face = (FT_Face)(intptr_t)ftFace;
+
+ if (!face) {
+ return 0;
+ }
+
+ chars = (jchar *)malloc(sizeof(jchar) * length);
+ if (chars == NULL)
+ return 0;
+ (*env)->GetCharArrayRegion(env, charArray, offset, length, chars);
+ if ((*env)->ExceptionCheck(env)) {
+ free(chars);
+ return 0;
+ }
+
+ for (i = 0, width = 0; i < length; i++) {
+ if (FT_Load_Char(face, chars[i], FT_LOAD_DEFAULT) == 0) {
+ width += face->glyph->metrics.horiAdvance >> 6;
+ }
+ }
+
+ free(chars);
+
+ return width;
+
+#else /* HAVE_FT2 */
+ return 0;
+#endif /* HAVE_FT2 */
+}
+
+#define CC (char*)(uintptr_t) /* cast a literal from (const char*) */
+#define VC (void*)(uintptr_t) /* cast function pointer to void* */
+
+BD_PRIVATE CPP_EXTERN const JNINativeMethod
+Java_java_awt_BDFontMetrics_methods[] =
+{ /* AUTOMATICALLY GENERATED */
+ {
+ CC("initN"),
+ CC("()J"),
+ VC(Java_java_awt_BDFontMetrics_initN),
+ },
+ {
+ CC("destroyN"),
+ CC("(J)V"),
+ VC(Java_java_awt_BDFontMetrics_destroyN),
+ },
+ {
+ CC("loadFontN"),
+ CC("(JLjava/lang/String;I)J"),
+ VC(Java_java_awt_BDFontMetrics_loadFontN),
+ },
+ {
+ CC("destroyFontN"),
+ CC("(J)V"),
+ VC(Java_java_awt_BDFontMetrics_destroyFontN),
+ },
+ {
+ CC("charWidthN"),
+ CC("(JC)I"),
+ VC(Java_java_awt_BDFontMetrics_charWidthN),
+ },
+ {
+ CC("stringWidthN"),
+ CC("(JLjava/lang/String;)I"),
+ VC(Java_java_awt_BDFontMetrics_stringWidthN),
+ },
+ {
+ CC("charsWidthN"),
+ CC("(J[CII)I"),
+ VC(Java_java_awt_BDFontMetrics_charsWidthN),
+ },
+};
+
+BD_PRIVATE CPP_EXTERN const int
+Java_java_awt_BDFontMetrics_methods_count =
+ sizeof(Java_java_awt_BDFontMetrics_methods)/sizeof(Java_java_awt_BDFontMetrics_methods[0]);

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/native/java_awt_BDFontMetrics.h Added

@@ -0,0 +1,76 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class java_awt_BDFontMetrics */
+
+#ifndef _WIN32
+#undef JNIEXPORT
+#define JNIEXPORT static
+#endif
+
+#ifndef _Included_java_awt_BDFontMetrics
+#define _Included_java_awt_BDFontMetrics
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef java_awt_BDFontMetrics_serialVersionUID
+#define java_awt_BDFontMetrics_serialVersionUID -4956160226949100590LL
+/*
+ * Class: java_awt_BDFontMetrics
+ * Method: initN
+ * Signature: ()J
+ */
+JNIEXPORT jlong JNICALL Java_java_awt_BDFontMetrics_initN
+ (JNIEnv *, jclass);
+
+/*
+ * Class: java_awt_BDFontMetrics
+ * Method: destroyN
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_java_awt_BDFontMetrics_destroyN
+ (JNIEnv *, jclass, jlong);
+
+/*
+ * Class: java_awt_BDFontMetrics
+ * Method: loadFontN
+ * Signature: (JLjava/lang/String;I)J
+ */
+JNIEXPORT jlong JNICALL Java_java_awt_BDFontMetrics_loadFontN
+ (JNIEnv *, jobject, jlong, jstring, jint);
+
+/*
+ * Class: java_awt_BDFontMetrics
+ * Method: destroyFontN
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_java_awt_BDFontMetrics_destroyFontN
+ (JNIEnv *, jobject, jlong);
+
+/*
+ * Class: java_awt_BDFontMetrics
+ * Method: charWidthN
+ * Signature: (JC)I
+ */
+JNIEXPORT jint JNICALL Java_java_awt_BDFontMetrics_charWidthN
+ (JNIEnv *, jobject, jlong, jchar);
+
+/*
+ * Class: java_awt_BDFontMetrics
+ * Method: stringWidthN
+ * Signature: (JLjava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_java_awt_BDFontMetrics_stringWidthN
+ (JNIEnv *, jobject, jlong, jstring);
+
+/*
+ * Class: java_awt_BDFontMetrics
+ * Method: charsWidthN
+ * Signature: (J[CII)I
+ */
+JNIEXPORT jint JNICALL Java_java_awt_BDFontMetrics_charsWidthN
+ (JNIEnv *, jobject, jlong, jcharArray, jint, jint);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/native/java_awt_BDGraphics.c Added

@@ -0,0 +1,109 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include <jni.h>
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "util/logging.h"
+
+#include <stdint.h>
+
+#ifdef HAVE_FT2
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#endif
+
+#include "java_awt_BDGraphics.h"
+
+/* Disable some warnings */
+#if defined __GNUC__
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
+#ifdef __cplusplus
+#define CPP_EXTERN extern
+#else
+#define CPP_EXTERN
+#endif
+
+JNIEXPORT void JNICALL
+Java_java_awt_BDGraphics_drawStringN(JNIEnv * env, jobject obj, jlong ftFace, jstring string, jint x, jint y, jint rgb)
+{
+#ifdef HAVE_FT2
+ jsize length;
+ const jchar *chars;
+ jclass cls;
+ jmethodID mid;
+ jint a, c;
+ jint i, j, k;
+ FT_Face face = (FT_Face)(intptr_t)ftFace;
+
+ length = (*env)->GetStringLength(env, string);
+ if (length <= 0)
+ return;
+ chars = (*env)->GetStringCritical(env, string, NULL);
+ if (chars == NULL)
+ return;
+
+ cls = (*env)->GetObjectClass(env, obj);
+ mid = (*env)->GetMethodID(env, cls, "drawPoint", "(III)V");
+
+ a = (rgb >> 24) & 0xff;
+ c = rgb & 0xffffff;
+
+ for (i = 0; i < length; i++) {
+ if (FT_Load_Char(face, chars[i], FT_LOAD_RENDER) == 0) {
+ for (j = 0; j < face->glyph->bitmap.rows; j++) {
+ for (k = 0; k < face->glyph->bitmap.width; k++) {
+ jint pixel;
+ pixel = face->glyph->bitmap.buffer[j*face->glyph->bitmap.pitch + k];
+ pixel = ((a * pixel / 255) << 24) | c;
+ (*env)->CallVoidMethod(env, obj, mid,
+ x + face->glyph->bitmap_left + k,
+ y - face->glyph->bitmap_top + j,
+ pixel);
+ }
+ }
+ x += face->glyph->metrics.horiAdvance >> 6;
+ }
+ }
+
+ (*env)->ReleaseStringCritical(env, string, chars);
+#endif /* HAVE_FT2 */
+}
+
+#define CC (char*)(uintptr_t) /* cast a literal from (const char*) */
+#define VC (void*)(uintptr_t) /* cast function pointer to void* */
+
+BD_PRIVATE CPP_EXTERN const JNINativeMethod
+Java_java_awt_BDGraphics_methods[] =
+{ /* AUTOMATICALLY GENERATED */
+ {
+ CC("drawStringN"),
+ CC("(JLjava/lang/String;III)V"),
+ VC(Java_java_awt_BDGraphics_drawStringN),
+ },
+};
+
+BD_PRIVATE CPP_EXTERN const int
+Java_java_awt_BDGraphics_methods_count =
+ sizeof(Java_java_awt_BDGraphics_methods)/sizeof(Java_java_awt_BDGraphics_methods[0]);

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/native/java_awt_BDGraphics.h Added

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/native/org_videolan_Libbluray.c -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/native/org_videolan_Libbluray.c Changed

@@ -1,17 +1,63 @@
-#include "org_videolan_Libbluray.h"
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2010 William Hahne
+ * Copyright (C) 2012 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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.s
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
 
 #include "libbluray/bdj/bdj.h"
 #include "libbluray/bdj/bdj_private.h"
 #include "libbluray/bdj/bdj_util.h"
-#include "libbluray/register.h"
+#include "libbluray/bdj/bdjo_parser.h"
 #include "libbluray/bluray.h"
+#include "libbluray/bluray_internal.h"
+
+#include "util/strutl.h"
+#include "util/macro.h"
+#include "util/logging.h"
+
+#include <string.h>
+#include <inttypes.h>
+
+/* this automatically generated header is included to cross-check native function signatures */
+#include "org_videolan_Libbluray.h"
 
 /* Disable some warnings */
 #if defined __GNUC__
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #endif
 
-jobjectArray _make_stream_array(JNIEnv* env, int count, BLURAY_STREAM_INFO* streams)
+#ifdef __cplusplus
+#define CPP_EXTERN extern
+#else
+#define CPP_EXTERN
+#endif
+
+static jobject _make_title_info(JNIEnv* env, int title, int objType, int playbackType, const char* bdjoName, int hdmvOID)
+{
+ jstring name = bdjoName ? (*env)->NewStringUTF(env, bdjoName) : NULL;
+ jobject ti = bdj_make_object(env, "org/videolan/TitleInfo",
+ "(IIILjava/lang/String;I)V",
+ title, objType, playbackType, name, hdmvOID);
+ if (name)
+ (*env)->DeleteLocalRef(env, name);
+ return ti;
+}
+
+static jobjectArray _make_stream_array(JNIEnv* env, int count, BLURAY_STREAM_INFO* streams)
 {
 jobjectArray streamArr = bdj_make_array(env,
 "org/videolan/StreamInfo", count);
@@ -19,24 +65,24 @@
 BLURAY_STREAM_INFO s = streams[i];
 jstring lang = (*env)->NewStringUTF(env, (char*)s.lang);
 jobject streamObj = bdj_make_object(env, "org/videolan/StreamInfo",
- "(BBBCLjava/lang/String;S)V", s.coding_type, s.format,
- s.rate, s.char_code, lang, s.pid);
+ "(BBBCLjava/lang/String;BB)V", s.coding_type, s.format,
+ s.rate, s.char_code, lang, s.aspect, s.subpath_id);
 (*env)->SetObjectArrayElement(env, streamArr, i, streamObj);
 }
 
 return streamArr;
 }
 
-jobject _make_title_info(JNIEnv* env, BLURAY_TITLE_INFO* ti)
+static jobject _make_playlist_info(JNIEnv* env, BLURAY_TITLE_INFO* ti)
 {
- jobjectArray chapters = bdj_make_array(env, "org/videolan/TIChapter",
- ti->chapter_count);
-
- for (uint32_t i = 0; i < ti->chapter_count; i++) {
- BLURAY_TITLE_CHAPTER c = ti->chapters[i];
- jobject chapter = bdj_make_object(env, "org/videolan/TIChapter",
- "(IJJJ)V", c.idx, c.start, c.duration, c.offset);
- (*env)->SetObjectArrayElement(env, chapters, i, chapter);
+ jobjectArray marks = bdj_make_array(env, "org/videolan/TIMark",
+ ti->mark_count);
+
+ for (uint32_t i = 0; i < ti->mark_count; i++) {
+ BLURAY_TITLE_MARK m = ti->marks[i];
+ jobject mark = bdj_make_object(env, "org/videolan/TIMark",
+ "(IIJJJI)V", m.idx, m.type, m.start, m.duration, m.offset, m.clip_ref);
+ (*env)->SetObjectArrayElement(env, marks, i, mark);
 }
 
 jobjectArray clips = bdj_make_array(env, "org/videolan/TIClip",
@@ -64,159 +110,549 @@
 info.sec_audio_streams);
 
 jobject clip = bdj_make_object(env, "org/videolan/TIClip",
- "([Lorg/videolan/StreamInfo;[Lorg/videolan/StreamInfo;[Lorg/videolan/StreamInfo;[Lorg/videolan/StreamInfo;[Lorg/videolan/StreamInfo;[Lorg/videolan/StreamInfo;)V",
- videoStreams, audioStreams, pgStreams, igStreams, secVideoStreams, secAudioStreams);
+ "(I[Lorg/videolan/StreamInfo;[Lorg/videolan/StreamInfo;[Lorg/videolan/StreamInfo;[Lorg/videolan/StreamInfo;[Lorg/videolan/StreamInfo;[Lorg/videolan/StreamInfo;)V",
+ i, videoStreams, audioStreams, pgStreams, igStreams, secVideoStreams, secAudioStreams);
 
 (*env)->SetObjectArrayElement(env, clips, i, clip);
 }
 
- return bdj_make_object(env, "org/videolan/TitleInfo",
- "(IIJI[Lorg/videolan/TIChapter;[Lorg/videolan/TIClip;)V", ti->idx,
- ti->playlist, ti->duration, ti->angle_count, chapters, clips);
+ return bdj_make_object(env, "org/videolan/PlaylistInfo",
+ "(IJI[Lorg/videolan/TIMark;[Lorg/videolan/TIClip;)V",
+ ti->playlist, ti->duration, ti->angle_count, marks, clips);
 }
 
 
 JNIEXPORT jobject JNICALL Java_org_videolan_Libbluray_getTitleInfoN
 (JNIEnv * env, jclass cls, jlong np, jint title)
 {
- BDJAVA* bdj = (BDJAVA*)np;
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+
+ BD_DEBUG(DBG_JNI, "getTitleInfoN(%d)\n", (int)title);
+
+ if (title == 65535) {
+ if (bdj->index->first_play.object_type == indx_object_type_hdmv)
+ return _make_title_info(env, 65535, indx_object_type_hdmv,
+ bdj->index->first_play.hdmv.playback_type,
+ NULL,
+ bdj->index->first_play.hdmv.id_ref);
+ else
+ return _make_title_info(env, 65535, indx_object_type_bdj,
+ bdj->index->first_play.bdj.playback_type,
+ bdj->index->first_play.bdj.name,
+ -1);
+ } else if (title == 0) {
+ if (bdj->index->top_menu.object_type == indx_object_type_hdmv)
+ return _make_title_info(env, 0, indx_object_type_hdmv,
+ bdj->index->top_menu.hdmv.playback_type,
+ NULL,
+ bdj->index->top_menu.hdmv.id_ref);
+ else
+ return _make_title_info(env, 0, indx_object_type_bdj,
+ bdj->index->top_menu.bdj.playback_type,
+ bdj->index->top_menu.bdj.name,
+ -1);
+ } else if ((title > 0) && (title <= bdj->index->num_titles)) {
+ if (bdj->index->titles[title - 1].object_type == indx_object_type_hdmv)
+ return _make_title_info(env, title, indx_object_type_hdmv,
+ bdj->index->titles[title - 1].hdmv.playback_type,
+ NULL,
+ bdj->index->titles[title - 1].hdmv.id_ref);
+ else
+ return _make_title_info(env, title, indx_object_type_bdj,
+ bdj->index->titles[title - 1].bdj.playback_type,
+ bdj->index->titles[title - 1].bdj.name,
+ -1);
+ }
+ return NULL;
+}
+
+JNIEXPORT jobject JNICALL Java_org_videolan_Libbluray_getPlaylistInfoN
+ (JNIEnv * env, jclass cls, jlong np, jint playlist)
+{
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+ BLURAY_TITLE_INFO* ti;
+
+ BD_DEBUG(DBG_JNI, "getPlaylistInfoN(%d)\n", (int)playlist);
 
- BLURAY_TITLE_INFO* ti = bd_get_title_info(bdj->bd, title, 0);
+ ti = bd_get_playlist_info(bdj->bd, playlist, 0);
 if (!ti)
 return NULL;
 
- jobject titleInfo = _make_title_info(env, ti);
+ jobject titleInfo = _make_playlist_info(env, ti);
 
 bd_free_title_info(ti);
 
 return titleInfo;
 }
 
-JNIEXPORT jobject JNICALL Java_org_videolan_Libbluray_getPlaylistInfoN
- (JNIEnv * env, jclass cls, jlong np, jint playlist)
+JNIEXPORT jbyteArray JNICALL Java_org_videolan_Libbluray_getAacsDataN
+ (JNIEnv * env, jclass cls, jlong np, jint type)
 {
- BDJAVA* bdj = (BDJAVA*)np;
- BLURAY_TITLE_INFO* ti = bd_get_playlist_info(bdj->bd, playlist, 0);
- if (!ti)
- return NULL;
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+ const uint8_t *data = bd_get_aacs_data(bdj->bd, type);
 
- jobject titleInfo = _make_title_info(env, ti);
+ if (!data) {
+ return NULL;
+ }
+ jbyteArray array = (*env)->NewByteArray(env, 16);
+ (*env)->SetByteArrayRegion(env, array, 0, 16, (const jbyte *)data);
+ return array;
+}
 
- bd_free_title_info(ti);
+JNIEXPORT jlong JNICALL Java_org_videolan_Libbluray_getUOMaskN(JNIEnv * env,
+ jclass cls, jlong np) {
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+ return bd_get_uo_mask(bdj->bd);
+}
 
- return titleInfo;
+JNIEXPORT void JNICALL Java_org_videolan_Libbluray_setUOMaskN(JNIEnv * env,
+ jclass cls, jlong np, jboolean menuCallMask, jboolean titleSearchMask) {
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+ bdj->uo_mask = ((!!menuCallMask) * BDJ_MENU_CALL_MASK) | ((!!titleSearchMask) * BDJ_TITLE_SEARCH_MASK);
 }
 
 JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_getTitlesN(JNIEnv * env,
- jclass cls, jlong np, jchar flags) {
- BDJAVA* bdj = (BDJAVA*) np;
- return bd_get_titles(bdj->bd, flags, 0);
+ jclass cls, jlong np) {
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+ return bdj->index->num_titles;
 }
 
 JNIEXPORT jlong JNICALL Java_org_videolan_Libbluray_seekN(JNIEnv * env,
 jclass cls, jlong np, jlong pos) {
- BDJAVA* bdj = (BDJAVA*) np;
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+
+ BD_DEBUG(DBG_JNI, "seekN(%"PRId64")\n", (int64_t)pos);
+
 return bd_seek(bdj->bd, pos);
 }
 
 JNIEXPORT jlong JNICALL Java_org_videolan_Libbluray_seekTimeN(JNIEnv * env,
 jclass cls, jlong np, jlong tick) {
- BDJAVA* bdj = (BDJAVA*) np;
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+
+ BD_DEBUG(DBG_JNI, "seekTimeN(%"PRId64")\n", (int64_t)tick);
+
 return bd_seek_time(bdj->bd, tick);
 }
 
 JNIEXPORT jlong JNICALL Java_org_videolan_Libbluray_seekChapterN(JNIEnv * env,
 jclass cls, jlong np, jint chapter) {
- BDJAVA* bdj = (BDJAVA*) np;
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+
+ BD_DEBUG(DBG_JNI, "seekChapterN(%d)\n", (int)chapter);
+
 return bd_seek_chapter(bdj->bd, chapter);
 }
 
 JNIEXPORT jlong JNICALL Java_org_videolan_Libbluray_chapterPosN(JNIEnv * env,
 jclass cls, jlong np, jint chapter) {
- BDJAVA* bdj = (BDJAVA*) np;
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
 return bd_chapter_pos(bdj->bd, chapter);
 }
 
 JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_getCurrentChapterN(
 JNIEnv * env, jclass cls, jlong np) {
- BDJAVA* bdj = (BDJAVA*) np;
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
 return bd_get_current_chapter(bdj->bd);
 }
 
 JNIEXPORT jlong JNICALL Java_org_videolan_Libbluray_seekMarkN(JNIEnv * env,
 jclass cls, jlong np, jint mark) {
- BDJAVA* bdj = (BDJAVA*) np;
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+
+ BD_DEBUG(DBG_JNI, "seekMarkN(%d)\n", (int)mark);
+
 return bd_seek_mark(bdj->bd, mark);
 }
 
+JNIEXPORT jlong JNICALL Java_org_videolan_Libbluray_seekPlayItemN(JNIEnv * env,
+ jclass cls, jlong np, jint clip) {
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+
+ BD_DEBUG(DBG_JNI, "seekPlayItemN(%d)\n", (int)clip);
+
+ return bd_seek_playitem(bdj->bd, clip);
+}
+
 JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_selectPlaylistN(
 JNIEnv * env, jclass cls, jlong np, jint playlist) {
- BDJAVA* bdj = (BDJAVA*) np;
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+
+ BD_DEBUG(DBG_JNI, "selectPlaylistN(%05d.mpls)\n", (int)playlist);
+
 return bd_select_playlist(bdj->bd, playlist);
 }
 
 JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_selectTitleN(JNIEnv * env,
 jclass cls, jlong np, jint title) {
- BDJAVA* bdj = (BDJAVA*) np;
- return bd_select_title(bdj->bd, title);
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+
+ BD_DEBUG(DBG_JNI, "selectTitleN(%d)\n", (int)title);
+
+ return bd_play_title_internal(bdj->bd, title);
 }
 
 JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_selectAngleN(JNIEnv * env,
 jclass cls, jlong np, jint angle) {
- BDJAVA* bdj = (BDJAVA*) np;
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
 return bd_select_angle(bdj->bd, angle);
 }
 
 JNIEXPORT void JNICALL Java_org_videolan_Libbluray_seamlessAngleChangeN(
 JNIEnv * env, jclass cls, jlong np, jint angle) {
- BDJAVA* bdj = (BDJAVA*) np;
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
 bd_seamless_angle_change(bdj->bd, angle);
 }
 
 JNIEXPORT jlong JNICALL Java_org_videolan_Libbluray_getTitleSizeN(JNIEnv * env,
 jclass cls, jlong np) {
- BDJAVA* bdj = (BDJAVA*) np;
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
 return bd_get_title_size(bdj->bd);
 }
 
-JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_getCurrentTitleN(
- JNIEnv * env, jclass cls, jlong np) {
- BDJAVA* bdj = (BDJAVA*) np;
- return bd_get_current_title(bdj->bd);
-}
-
 JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_getCurrentAngleN(
 JNIEnv * env, jclass cls, jlong np) {
- BDJAVA* bdj = (BDJAVA*) np;
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
 return bd_get_current_angle(bdj->bd);
 }
 
 JNIEXPORT jlong JNICALL Java_org_videolan_Libbluray_tellN(JNIEnv * env,
 jclass cls, jlong np) {
- BDJAVA* bdj = (BDJAVA*) np;
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
 return bd_tell(bdj->bd);
 }
 
 JNIEXPORT jlong JNICALL Java_org_videolan_Libbluray_tellTimeN(JNIEnv * env,
 jclass cls, jlong np) {
- BDJAVA* bdj = (BDJAVA*) np;
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
 return bd_tell_time(bdj->bd);
 }
 
+JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_selectRateN(JNIEnv * env,
+ jclass cls, jlong np, jfloat rate) {
+ return 1;
+}
+
 JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_writeGPRN(JNIEnv * env,
 jclass cls, jlong np, jint num, jint value) {
- BDJAVA* bdj = (BDJAVA*) np;
- return bd_gpr_write(bdj->reg, num, value);
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+
+ BD_DEBUG(DBG_JNI, "writeGPRN(%d,%d)\n", (int)num, (int)value);
+
+ return bd_reg_write(bdj->bd, 0, num, value);
 }
 
 JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_readGPRN(JNIEnv * env,
 jclass cls, jlong np, jint num) {
- BDJAVA* bdj = (BDJAVA*) np;
- return bd_gpr_read(bdj->reg, num);
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+ int value = bd_reg_read(bdj->bd, 0, num);
+
+ BD_DEBUG(DBG_JNI, "readGPRN(%d) -> %d\n", (int)num, (int)value);
+
+ return value;
+}
+
+JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_writePSRN(JNIEnv * env,
+ jclass cls, jlong np, jint num, jint value) {
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+
+ BD_DEBUG(DBG_JNI, "writePSRN(%d,%d)\n", (int)num, (int)value);
+
+ return bd_reg_write(bdj->bd, 1, num, value);
 }
 
 JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_readPSRN(JNIEnv * env,
 jclass cls, jlong np, jint num) {
- BDJAVA* bdj = (BDJAVA*) np;
- return bd_psr_read(bdj->reg, num);
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+ int value = bd_reg_read(bdj->bd, 1, num);
+
+ BD_DEBUG(DBG_JNI, "readPSRN(%d) -> %d\n", (int)num, (int)value);
+
+ return value;
+}
+
+JNIEXPORT jobject JNICALL Java_org_videolan_Libbluray_getBdjoN(JNIEnv * env,
+ jclass cls, jlong np, jstring name) {
+
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+ const char *bdjo_name = (*env)->GetStringUTFChars(env, name, NULL);;
+ char* bdjo_path = str_printf("%s%s/%s.bdjo", bdj->path, BDJ_BDJO_PATH, bdjo_name);
+ (*env)->ReleaseStringUTFChars(env, name, bdjo_name);
+ jobject bdjo = bdjo_read(env, bdjo_path);
+ X_FREE(bdjo_path);
+
+ return bdjo;
 }
+
+JNIEXPORT void JNICALL Java_org_videolan_Libbluray_updateGraphicN(JNIEnv * env,
+ jclass cls, jlong np, jint width, jint height, jintArray rgbArray,
+ jint x0, jint y0, jint x1, jint y1) {
+
+ BDJAVA* bdj = (BDJAVA*)(intptr_t)np;
+
+ BD_DEBUG(DBG_JNI, "updateGraphicN(%d,%d-%d,%d)\n", x0, y0, x1, y1);
+
+ /* app callback not initialized ? */
+ if (!bdj || !bdj->osd_cb) {
+ return;
+ }
+
+ /* close ? */
+ if (!rgbArray) {
+ bdj->osd_cb(bdj->bd, NULL, (int)width, (int)height, 0, 0, 0, 0);
+ return;
+ }
+
+ /* nothing to draw ? */
+ if (x1 < x0 || y1 < y0 || (x1 | y1) < 0) {
+ return;
+ }
+
+ if (bdj->buf) {
+
+ /* copy to application-allocated buffer */
+
+ jint y, *dst;
+ jsize offset;
+
+ /* set dirty area before lock() */
+ bdj->buf->dirty[BD_OVERLAY_IG].x0 = x0;
+ bdj->buf->dirty[BD_OVERLAY_IG].x1 = x1;
+ bdj->buf->dirty[BD_OVERLAY_IG].y0 = y0;
+ bdj->buf->dirty[BD_OVERLAY_IG].y1 = y1;
+
+ /* get buffer */
+ if (bdj->buf->lock) {
+ bdj->buf->lock(bdj->buf);
+ }
+ if (!bdj->buf->buf[BD_OVERLAY_IG]) {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "ARGB frame buffer missing\n");
+ if (bdj->buf->unlock) {
+ bdj->buf->unlock(bdj->buf);
+ }
+ return;
+ }
+
+ /* check buffer size */
+
+ if (bdj->buf->width < width || bdj->buf->height < height) {
+ /* assume buffer is only for the dirty arrea */
+ BD_DEBUG(DBG_BDJ, "ARGB frame buffer size is smaller than BD-J frame buffer size (app: %dx%d BD-J: %dx%d)\n",
+ bdj->buf->width, bdj->buf->height, width, height);
+
+ if (bdj->buf->width < (x1 - x0 + 1) || bdj->buf->height < (y1 - y0 + 1)) {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "ARGB frame buffer size is smaller than dirty area\n");
+ if (bdj->buf->unlock) {
+ bdj->buf->unlock(bdj->buf);
+ }
+ return;
+ }
+
+ dst = (jint*)bdj->buf->buf[BD_OVERLAY_IG];
+
+ } else {
+
+ dst = (jint*)bdj->buf->buf[BD_OVERLAY_IG] + y0 * bdj->buf->width + x0;
+
+ /* clip */
+ if (y1 >= bdj->buf->height) {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "Cropping %d rows from bottom\n", y1 - bdj->buf->height);
+ y1 = bdj->buf->height - 1;
+ }
+ if (x1 >= bdj->buf->width) {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "Cropping %d pixels from right\n", x1 - bdj->buf->width);
+ x1 = bdj->buf->width - 1;
+ }
+ }
+
+ /* copy */
+
+ offset = y0 * width + x0;
+
+ for (y = y0; y <= y1; y++) {
+ (*env)->GetIntArrayRegion(env, rgbArray, offset, x1 - x0 + 1, dst);
+ offset += width;
+ dst += bdj->buf->width;
+ }
+
+ /* check for errors */
+ if ((*env)->ExceptionOccurred(env)) {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "Array access error at %d (+%d)\n", offset, x1 - x0 + 1);
+ (*env)->ExceptionDescribe(env);
+ (*env)->ExceptionClear(env);
+ }
+
+ if (bdj->buf->unlock) {
+ bdj->buf->unlock(bdj->buf);
+ }
+
+ bdj->osd_cb(bdj->bd, bdj->buf->buf[BD_OVERLAY_IG], (int)width, (int)height,
+ x0, y0, x1, y1);
+
+ } else {
+
+ /* return java array */
+
+ jint *image = (jint *)(*env)->GetPrimitiveArrayCritical(env, rgbArray, NULL);
+ if (image) {
+ bdj->osd_cb(bdj->bd, (const unsigned *)image, (int)width, (int)height,
+ x0, y0, x1, y1);
+ (*env)->ReleasePrimitiveArrayCritical(env, rgbArray, image, JNI_ABORT);
+ } else {
+ BD_DEBUG(DBG_BDJ | DBG_CRIT, "GetPrimitiveArrayCritical() failed\n");
+ }
+ }
+}
+
+#define CC (char*)(uintptr_t) /* cast a literal from (const char*) */
+#define VC (void*)(uintptr_t) /* cast function pointer to void* */
+
+BD_PRIVATE CPP_EXTERN const JNINativeMethod
+Java_org_videolan_Libbluray_methods[] =
+{ /* AUTOMATICALLY GENERATED */
+ {
+ CC("getAacsDataN"),
+ CC("(JI)[B"),
+ VC(Java_org_videolan_Libbluray_getAacsDataN),
+ },
+ {
+ CC("getUOMaskN"),
+ CC("(J)J"),
+ VC(Java_org_videolan_Libbluray_getUOMaskN),
+ },
+ {
+ CC("setUOMaskN"),
+ CC("(JZZ)V"),
+ VC(Java_org_videolan_Libbluray_setUOMaskN),
+ },
+ {
+ CC("getTitleInfoN"),
+ CC("(JI)Lorg/videolan/TitleInfo;"),
+ VC(Java_org_videolan_Libbluray_getTitleInfoN),
+ },
+ {
+ CC("getPlaylistInfoN"),
+ CC("(JI)Lorg/videolan/PlaylistInfo;"),
+ VC(Java_org_videolan_Libbluray_getPlaylistInfoN),
+ },
+ {
+ CC("getTitlesN"),
+ CC("(J)I"),
+ VC(Java_org_videolan_Libbluray_getTitlesN),
+ },
+ {
+ CC("seekN"),
+ CC("(JJ)J"),
+ VC(Java_org_videolan_Libbluray_seekN),
+ },
+ {
+ CC("seekTimeN"),
+ CC("(JJ)J"),
+ VC(Java_org_videolan_Libbluray_seekTimeN),
+ },
+ {
+ CC("seekChapterN"),
+ CC("(JI)J"),
+ VC(Java_org_videolan_Libbluray_seekChapterN),
+ },
+ {
+ CC("chapterPosN"),
+ CC("(JI)J"),
+ VC(Java_org_videolan_Libbluray_chapterPosN),
+ },
+ {
+ CC("getCurrentChapterN"),
+ CC("(J)I"),
+ VC(Java_org_videolan_Libbluray_getCurrentChapterN),
+ },
+ {
+ CC("seekMarkN"),
+ CC("(JI)J"),
+ VC(Java_org_videolan_Libbluray_seekMarkN),
+ },
+ {
+ CC("seekPlayItemN"),
+ CC("(JI)J"),
+ VC(Java_org_videolan_Libbluray_seekPlayItemN),
+ },
+ {
+ CC("selectPlaylistN"),
+ CC("(JI)I"),
+ VC(Java_org_videolan_Libbluray_selectPlaylistN),
+ },
+ {
+ CC("selectTitleN"),
+ CC("(JI)I"),
+ VC(Java_org_videolan_Libbluray_selectTitleN),
+ },
+ {
+ CC("selectAngleN"),
+ CC("(JI)I"),
+ VC(Java_org_videolan_Libbluray_selectAngleN),
+ },
+ {
+ CC("seamlessAngleChangeN"),
+ CC("(JI)V"),
+ VC(Java_org_videolan_Libbluray_seamlessAngleChangeN),
+ },
+ {
+ CC("getTitleSizeN"),
+ CC("(J)J"),
+ VC(Java_org_videolan_Libbluray_getTitleSizeN),
+ },
+ {
+ CC("getCurrentAngleN"),
+ CC("(J)I"),
+ VC(Java_org_videolan_Libbluray_getCurrentAngleN),
+ },
+ {
+ CC("tellN"),
+ CC("(J)J"),
+ VC(Java_org_videolan_Libbluray_tellN),
+ },
+ {
+ CC("tellTimeN"),
+ CC("(J)J"),
+ VC(Java_org_videolan_Libbluray_tellTimeN),
+ },
+ {
+ CC("selectRateN"),
+ CC("(JF)I"),
+ VC(Java_org_videolan_Libbluray_selectRateN),
+ },
+ {
+ CC("writeGPRN"),
+ CC("(JII)I"),
+ VC(Java_org_videolan_Libbluray_writeGPRN),
+ },
+ {
+ CC("writePSRN"),
+ CC("(JII)I"),
+ VC(Java_org_videolan_Libbluray_writePSRN),
+ },
+ {
+ CC("readGPRN"),
+ CC("(JI)I"),
+ VC(Java_org_videolan_Libbluray_readGPRN),
+ },
+ {
+ CC("readPSRN"),
+ CC("(JI)I"),
+ VC(Java_org_videolan_Libbluray_readPSRN),
+ },
+ {
+ CC("getBdjoN"),
+ CC("(JLjava/lang/String;)Lorg/videolan/bdjo/Bdjo;"),
+ VC(Java_org_videolan_Libbluray_getBdjoN),
+ },
+ {
+ CC("updateGraphicN"),
+ CC("(JII[IIIII)V"),
+ VC(Java_org_videolan_Libbluray_updateGraphicN),
+ },
+};
+
+BD_PRIVATE CPP_EXTERN const int
+Java_org_videolan_Libbluray_methods_count =
+ sizeof(Java_org_videolan_Libbluray_methods)/sizeof(Java_org_videolan_Libbluray_methods[0]);
+

libbluray-0.2.3.tar.bz2/src/libbluray/bdj/native/org_videolan_Libbluray.h -> libbluray-0.5.0.tar.bz2/src/libbluray/bdj/native/org_videolan_Libbluray.h Changed

@@ -2,11 +2,120 @@
 #include <jni.h>
 /* Header for class org_videolan_Libbluray */
 
+#ifndef _WIN32
+#undef JNIEXPORT
+#define JNIEXPORT static
+#endif
+
 #ifndef _Included_org_videolan_Libbluray
 #define _Included_org_videolan_Libbluray
 #ifdef __cplusplus
 extern "C" {
 #endif
+#undef org_videolan_Libbluray_BDJ_EVENT_CHAPTER
+#define org_videolan_Libbluray_BDJ_EVENT_CHAPTER 1L
+#undef org_videolan_Libbluray_BDJ_EVENT_PLAYITEM
+#define org_videolan_Libbluray_BDJ_EVENT_PLAYITEM 2L
+#undef org_videolan_Libbluray_BDJ_EVENT_ANGLE
+#define org_videolan_Libbluray_BDJ_EVENT_ANGLE 3L
+#undef org_videolan_Libbluray_BDJ_EVENT_SUBTITLE
+#define org_videolan_Libbluray_BDJ_EVENT_SUBTITLE 4L
+#undef org_videolan_Libbluray_BDJ_EVENT_PIP
+#define org_videolan_Libbluray_BDJ_EVENT_PIP 5L
+#undef org_videolan_Libbluray_BDJ_EVENT_END_OF_PLAYLIST
+#define org_videolan_Libbluray_BDJ_EVENT_END_OF_PLAYLIST 6L
+#undef org_videolan_Libbluray_BDJ_EVENT_PTS
+#define org_videolan_Libbluray_BDJ_EVENT_PTS 7L
+#undef org_videolan_Libbluray_BDJ_EVENT_VK_KEY
+#define org_videolan_Libbluray_BDJ_EVENT_VK_KEY 8L
+#undef org_videolan_Libbluray_PSR_IG_STREAM_ID
+#define org_videolan_Libbluray_PSR_IG_STREAM_ID 0L
+#undef org_videolan_Libbluray_PSR_PRIMARY_AUDIO_ID
+#define org_videolan_Libbluray_PSR_PRIMARY_AUDIO_ID 1L
+#undef org_videolan_Libbluray_PSR_PG_STREAM
+#define org_videolan_Libbluray_PSR_PG_STREAM 2L
+#undef org_videolan_Libbluray_PSR_ANGLE_NUMBER
+#define org_videolan_Libbluray_PSR_ANGLE_NUMBER 3L
+#undef org_videolan_Libbluray_PSR_TITLE_NUMBER
+#define org_videolan_Libbluray_PSR_TITLE_NUMBER 4L
+#undef org_videolan_Libbluray_PSR_CHAPTER
+#define org_videolan_Libbluray_PSR_CHAPTER 5L
+#undef org_videolan_Libbluray_PSR_PLAYLIST
+#define org_videolan_Libbluray_PSR_PLAYLIST 6L
+#undef org_videolan_Libbluray_PSR_PLAYITEM
+#define org_videolan_Libbluray_PSR_PLAYITEM 7L
+#undef org_videolan_Libbluray_PSR_TIME
+#define org_videolan_Libbluray_PSR_TIME 8L
+#undef org_videolan_Libbluray_PSR_NAV_TIMER
+#define org_videolan_Libbluray_PSR_NAV_TIMER 9L
+#undef org_videolan_Libbluray_PSR_SELECTED_BUTTON_ID
+#define org_videolan_Libbluray_PSR_SELECTED_BUTTON_ID 10L
+#undef org_videolan_Libbluray_PSR_MENU_PAGE_ID
+#define org_videolan_Libbluray_PSR_MENU_PAGE_ID 11L
+#undef org_videolan_Libbluray_PSR_STYLE
+#define org_videolan_Libbluray_PSR_STYLE 12L
+#undef org_videolan_Libbluray_PSR_PARENTAL
+#define org_videolan_Libbluray_PSR_PARENTAL 13L
+#undef org_videolan_Libbluray_PSR_SECONDARY_AUDIO_VIDEO
+#define org_videolan_Libbluray_PSR_SECONDARY_AUDIO_VIDEO 14L
+#undef org_videolan_Libbluray_PSR_AUDIO_CAP
+#define org_videolan_Libbluray_PSR_AUDIO_CAP 15L
+#undef org_videolan_Libbluray_PSR_AUDIO_LANG
+#define org_videolan_Libbluray_PSR_AUDIO_LANG 16L
+#undef org_videolan_Libbluray_PSR_PG_AND_SUB_LANG
+#define org_videolan_Libbluray_PSR_PG_AND_SUB_LANG 17L
+#undef org_videolan_Libbluray_PSR_MENU_LANG
+#define org_videolan_Libbluray_PSR_MENU_LANG 18L
+#undef org_videolan_Libbluray_PSR_COUNTRY
+#define org_videolan_Libbluray_PSR_COUNTRY 19L
+#undef org_videolan_Libbluray_PSR_REGION
+#define org_videolan_Libbluray_PSR_REGION 20L
+#undef org_videolan_Libbluray_PSR_VIDEO_CAP
+#define org_videolan_Libbluray_PSR_VIDEO_CAP 29L
+#undef org_videolan_Libbluray_PSR_TEXT_CAP
+#define org_videolan_Libbluray_PSR_TEXT_CAP 30L
+#undef org_videolan_Libbluray_PSR_PROFILE_VERSION
+#define org_videolan_Libbluray_PSR_PROFILE_VERSION 31L
+#undef org_videolan_Libbluray_PSR_BACKUP_PSR4
+#define org_videolan_Libbluray_PSR_BACKUP_PSR4 36L
+#undef org_videolan_Libbluray_PSR_BACKUP_PSR5
+#define org_videolan_Libbluray_PSR_BACKUP_PSR5 37L
+#undef org_videolan_Libbluray_PSR_BACKUP_PSR6
+#define org_videolan_Libbluray_PSR_BACKUP_PSR6 38L
+#undef org_videolan_Libbluray_PSR_BACKUP_PSR7
+#define org_videolan_Libbluray_PSR_BACKUP_PSR7 39L
+#undef org_videolan_Libbluray_PSR_BACKUP_PSR8
+#define org_videolan_Libbluray_PSR_BACKUP_PSR8 40L
+#undef org_videolan_Libbluray_PSR_BACKUP_PSR10
+#define org_videolan_Libbluray_PSR_BACKUP_PSR10 42L
+#undef org_videolan_Libbluray_PSR_BACKUP_PSR11
+#define org_videolan_Libbluray_PSR_BACKUP_PSR11 43L
+#undef org_videolan_Libbluray_PSR_BACKUP_PSR12
+#define org_videolan_Libbluray_PSR_BACKUP_PSR12 44L
+/*
+ * Class: org_videolan_Libbluray
+ * Method: getAacsData
+ * Signature: (JI)[B
+ */
+JNIEXPORT jbyteArray JNICALL Java_org_videolan_Libbluray_getAacsDataN
+ (JNIEnv *, jclass, jlong, jint);
+
+/*
+ * Class: org_videolan_Libbluray
+ * Method: getUOMask
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_org_videolan_Libbluray_getUOMaskN
+ (JNIEnv *, jclass, jlong);
+
+/*
+ * Class: org_videolan_Libbluray
+ * Method: getUOMask
+ * Signature: (JZZ)V
+ */
+JNIEXPORT void JNICALL Java_org_videolan_Libbluray_setUOMaskN
+(JNIEnv *, jclass, jlong, jboolean, jboolean);
+
 /*
 * Class: org_videolan_Libbluray
 * Method: getTitleInfoN
@@ -18,7 +127,7 @@
 /*
 * Class: org_videolan_Libbluray
 * Method: getPlaylistInfoN
- * Signature: (JI)Lorg/videolan/TitleInfo;
+ * Signature: (JI)Lorg/videolan/PlaylistInfo;
 */
 JNIEXPORT jobject JNICALL Java_org_videolan_Libbluray_getPlaylistInfoN
 (JNIEnv *, jclass, jlong, jint);
@@ -26,10 +135,10 @@
 /*
 * Class: org_videolan_Libbluray
 * Method: getTitlesN
- * Signature: (JC)I
+ * Signature: (J)I
 */
 JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_getTitlesN
- (JNIEnv *, jclass, jlong, jchar);
+ (JNIEnv *, jclass, jlong);
 
 /*
 * Class: org_videolan_Libbluray
@@ -81,6 +190,14 @@
 
 /*
 * Class: org_videolan_Libbluray
+ * Method: seekPlayItemN
+ * Signature: (JI)J
+ */
+JNIEXPORT jlong JNICALL Java_org_videolan_Libbluray_seekPlayItemN
+ (JNIEnv *, jclass, jlong, jint);
+
+/*
+ * Class: org_videolan_Libbluray
 * Method: selectPlaylistN
 * Signature: (JI)I
 */
@@ -121,14 +238,6 @@
 
 /*
 * Class: org_videolan_Libbluray
- * Method: getCurrentTitleN
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_getCurrentTitleN
- (JNIEnv *, jclass, jlong);
-
-/*
- * Class: org_videolan_Libbluray
 * Method: getCurrentAngleN
 * Signature: (J)I
 */
@@ -153,6 +262,14 @@
 
 /*
 * Class: org_videolan_Libbluray
+ * Method: selectRateN
+ * Signature: (JF)I
+ */
+JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_selectRateN
+ (JNIEnv *, jclass, jlong, jfloat);
+
+/*
+ * Class: org_videolan_Libbluray
 * Method: writeGPRN
 * Signature: (JII)I
 */
@@ -161,6 +278,14 @@
 
 /*
 * Class: org_videolan_Libbluray
+ * Method: writePSRN
+ * Signature: (JII)I
+ */
+JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_writePSRN
+ (JNIEnv *, jclass, jlong, jint, jint);
+
+/*
+ * Class: org_videolan_Libbluray
 * Method: readGPRN
 * Signature: (JI)I
 */
@@ -175,6 +300,22 @@
 JNIEXPORT jint JNICALL Java_org_videolan_Libbluray_readPSRN
 (JNIEnv *, jclass, jlong, jint);
 
+/*
+ * Class: org_videolan_Libbluray
+ * Method: getBdjoN
+ * Signature: (JLjava/lang/String;)Lorg/videolan/bdjo/Bdjo;
+ */
+JNIEXPORT jobject JNICALL Java_org_videolan_Libbluray_getBdjoN
+ (JNIEnv *, jclass, jlong, jstring);
+
+/*
+ * Class: org_videolan_Libbluray
+ * Method: updateGraphicN
+ * Signature: (JII[IIIII)V
+ */
+JNIEXPORT void JNICALL Java_org_videolan_Libbluray_updateGraphicN
+(JNIEnv *, jclass, jlong, jint, jint, jintArray, jint, jint, jint, jint);
+
 #ifdef __cplusplus
 }
 #endif

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/native/org_videolan_Logger.c Added

@@ -0,0 +1,89 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include <jni.h>
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "util/logging.h"
+
+#include <stdint.h>
+
+#include "org_videolan_Logger.h"
+
+/* Disable some warnings */
+#if defined __GNUC__
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
+#ifdef __cplusplus
+#define CPP_EXTERN extern
+#else
+#define CPP_EXTERN
+#endif
+
+JNIEXPORT void JNICALL
+Java_org_videolan_Logger_logN(JNIEnv *env, jclass cls, jboolean error, jstring jfile, jint line, jstring string)
+{
+ const char *msg, *file;
+ jsize length;
+ uint32_t mask = DBG_BDJ;
+
+ length = (*env)->GetStringLength(env, string);
+ if (length <= 0) {
+ return;
+ }
+
+ msg = (*env)->GetStringUTFChars(env, string, NULL);
+ if (!msg) {
+ return;
+ }
+
+ file = (*env)->GetStringUTFChars(env, jfile, NULL);
+
+ if (error) {
+ mask |= DBG_CRIT;
+ }
+
+ bd_debug(file ? file : "JVM", line, mask, "%s\n", msg);
+
+ if (file) {
+ (*env)->ReleaseStringUTFChars(env, jfile, file);
+ }
+ (*env)->ReleaseStringUTFChars(env, string, msg);
+}
+
+#define CC (char*)(uintptr_t) /* cast a literal from (const char*) */
+#define VC (void*)(uintptr_t) /* cast function pointer to void* */
+
+BD_PRIVATE CPP_EXTERN const JNINativeMethod
+Java_org_videolan_Logger_methods[] =
+{ /* AUTOMATICALLY GENERATED */
+ {
+ CC("logN"),
+ CC("(ZLjava/lang/String;ILjava/lang/String;)V"),
+ VC(Java_org_videolan_Logger_logN),
+ },
+};
+
+BD_PRIVATE CPP_EXTERN const int
+Java_org_videolan_Logger_methods_count =
+ sizeof(Java_org_videolan_Logger_methods)/sizeof(Java_org_videolan_Logger_methods[0]);

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/native/org_videolan_Logger.h Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/native/register_native.c Added

@@ -0,0 +1,53 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include "libbluray/bdj/native/register_native.h"
+
+#include "libbluray/bdj/bdj_util.h"
+
+int bdj_register_native_methods(JNIEnv *env)
+{
+ extern const JNINativeMethod Java_org_videolan_Logger_methods[];
+ extern const JNINativeMethod Java_org_videolan_Libbluray_methods[];
+ extern const JNINativeMethod Java_java_awt_BDGraphics_methods[];
+ extern const JNINativeMethod Java_java_awt_BDFontMetrics_methods[];
+ extern const int Java_org_videolan_Logger_methods_count;
+ extern const int Java_org_videolan_Libbluray_methods_count;
+ extern const int Java_java_awt_BDGraphics_methods_count;
+ extern const int Java_java_awt_BDFontMetrics_methods_count;
+
+ return
+ bdj_register_methods(env, "org/videolan/Logger",
+ Java_org_videolan_Logger_methods,
+ Java_org_videolan_Logger_methods_count)
+ *
+ bdj_register_methods(env, "org/videolan/Libbluray",
+ Java_org_videolan_Libbluray_methods,
+ Java_org_videolan_Libbluray_methods_count)
+ *
+ /* BDFontMetrics must be registered before BDGraphics */
+ bdj_register_methods(env, "java/awt/BDFontMetrics",
+ Java_java_awt_BDFontMetrics_methods,
+ Java_java_awt_BDFontMetrics_methods_count)
+ *
+ bdj_register_methods(env, "java/awt/BDGraphics",
+ Java_java_awt_BDGraphics_methods,
+ Java_java_awt_BDGraphics_methods_count)
+ ;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdj/native/register_native.h Added

@@ -0,0 +1,29 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _REGISTER_NATIVE_H_
+#define _REGISTER_NATIVE_H_
+
+#include "util/attributes.h"
+
+#include <jni.h>
+
+BD_PRIVATE int bdj_register_native_methods(JNIEnv *env);
+
+#endif /* _REGISTER_NATIVE_H_ */

libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/.deps Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/.deps/bdid_parse.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/.deps/clpi_parse.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/.deps/extdata_parse.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/.deps/index_dump-index_parse.Po Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/.deps/index_parse.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/.deps/meta_parse.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/.deps/mpls_dump-clpi_parse.Po Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/.deps/mpls_dump-extdata_parse.Po Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/.deps/mpls_dump-mpls_parse.Po Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/.deps/mpls_parse.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/.deps/navigation.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/.deps/sound_parse.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/bdid_parse.c Added

@@ -0,0 +1,121 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include "file/file.h"
+#include "util/bits.h"
+#include "util/logging.h"
+#include "util/macro.h"
+#include "bdid_parse.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#define BDID_SIG1 ('B' << 24 | 'D' << 16 | 'I' << 8 | 'D')
+#define BDID_SIG2A ('0' << 24 | '2' << 16 | '0' << 8 | '0')
+#define BDID_SIG2B ('0' << 24 | '1' << 16 | '0' << 8 | '0')
+
+static int _parse_header(BITSTREAM *bs, uint32_t *data_start, uint32_t *extension_data_start)
+{
+ uint32_t sig1, sig2;
+
+ bs_seek_byte(bs, 0);
+
+ sig1 = bs_read(bs, 32);
+ sig2 = bs_read(bs, 32);
+
+ if (sig1 != BDID_SIG1 ||
+ (sig2 != BDID_SIG2A &&
+ sig2 != BDID_SIG2B)) {
+ BD_DEBUG(DBG_NAV | DBG_CRIT, "id.bdmv failed signature match: expected BDID0100 got %8.8s\n", bs->buf);
+ return 0;
+ }
+
+ *data_start = bs_read(bs, 32);
+ *extension_data_start = bs_read(bs, 32);
+
+ return 1;
+}
+
+static BDID_DATA *_bdid_parse(const char *file_name)
+{
+ BITSTREAM bs;
+ BD_FILE_H *fp;
+ BDID_DATA *bdid = NULL;
+
+ uint32_t data_start, extension_data_start;
+ uint8_t tmp[16];
+
+ fp = file_open(file_name, "rb");
+ if (!fp) {
+ BD_DEBUG(DBG_NAV | DBG_CRIT, "bdid_parse(): error opening %s\n", file_name);
+ return NULL;
+ }
+
+ bs_init(&bs, fp);
+
+ if (!_parse_header(&bs, &data_start, &extension_data_start)) {
+ BD_DEBUG(DBG_NAV | DBG_CRIT, "id.bdmv: invalid header\n");
+ goto error;
+ }
+
+ bdid = calloc(1, sizeof(BDID_DATA));
+
+ bs_seek_byte(&bs, 40);
+
+ bs_read_bytes(&bs, tmp, 4);
+ print_hex(bdid->org_id, tmp, 4);
+
+ bs_read_bytes(&bs, tmp, 16);
+ print_hex(bdid->disc_id, tmp, 16);
+
+ file_close(fp);
+ return bdid;
+
+ error:
+ X_FREE(bdid);
+ file_close(fp);
+ return NULL;
+}
+
+BDID_DATA *bdid_parse(const char *file_name)
+{
+ BDID_DATA *bdid = _bdid_parse(file_name);
+
+ /* if failed, try backup file */
+ if (!bdid) {
+ size_t len = strlen(file_name);
+ char *backup = malloc(len + 8);
+
+ strcpy(backup, file_name);
+ strcpy(backup + len - 7, "BACKUP/id.bdmv");
+
+ bdid = _bdid_parse(backup);
+
+ X_FREE(backup);
+ }
+
+ return bdid;
+}
+
+void bdid_free(BDID_DATA **p)
+{
+ if (p && *p) {
+ X_FREE(*p);
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/bdid_parse.h Added

@@ -0,0 +1,36 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(_BDID_PARSE_H_)
+#define _BDID_PARSE_H_
+
+#include <util/attributes.h>
+
+#include <stdint.h>
+
+typedef struct bdid_s {
+ char org_id[9];
+ char disc_id[33];
+} BDID_DATA;
+
+
+BD_PRIVATE BDID_DATA* bdid_parse(const char *path); /* parse id.bdmv */
+BD_PRIVATE void bdid_free(BDID_DATA **p);
+
+#endif // _BDID_PARSE_H_

libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/clpi_data.h -> libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/clpi_data.h Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/clpi_parse.c -> libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/clpi_parse.c Changed

@@ -1,6 +1,7 @@
 /*
 * This file is part of libbluray
 * Copyright (C) 2009-2010 John Stebbins
+ * Copyright (C) 2012-2013 Petri Hintukainen <phintuka@users.sourceforge.net>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -20,6 +21,7 @@
 #include "util/macro.h"
 #include "file/file.h"
 #include "util/bits.h"
+#include "extdata_parse.h"
 #include "clpi_parse.h"
 
 #include <stdlib.h>
@@ -29,8 +31,6 @@
 #define CLPI_SIG2A ('0' << 24 | '2' << 16 | '0' << 8 | '0')
 #define CLPI_SIG2B ('0' << 24 | '1' << 16 | '0' << 8 | '0')
 
-static int clpi_verbose = 0;
-
 static void
 _human_readable_sig(char *sig, uint32_t s1, uint32_t s2)
 {
@@ -64,6 +64,7 @@
 case 0x02:
 case 0xea:
 case 0x1b:
+ case 0x20:
 ss->format = bs_read(bits, 4);
 ss->rate = bs_read(bits, 4);
 ss->aspect = bs_read(bits, 4);
@@ -184,6 +185,21 @@
 bs_skip(bits, 8);
 }
 }
+
+ // font info
+ if (cl->clip.application_type == 6 /* Sub TS for a sub-path of Text subtitle */) {
+ bs_skip(bits, 8);
+ cl->font_info.font_count = bs_read(bits, 8);
+ if (cl->font_info.font_count) {
+ cl->font_info.font = malloc(cl->font_info.font_count * sizeof(CLPI_FONT));
+ for (ii = 0; ii < cl->font_info.font_count; ii++) {
+ bs_read_bytes(bits, cl->font_info.font[ii].file_id, 5);
+ cl->font_info.font[ii].file_id[5] = '\0';
+ bs_skip(bits, 8);
+ }
+ }
+ }
+
 return 1;
 }
 
@@ -221,20 +237,19 @@
 }
 
 static int
-_parse_program(BITSTREAM *bits, CLPI_CL *cl)
+_parse_program(BITSTREAM *bits, CLPI_PROG_INFO *program)
 {
 int ii, jj;
 
- bs_seek_byte(bits, cl->program_info_start_addr);
 // Skip the length field, and a reserved byte
 bs_skip(bits, 5 * 8);
 // Then get the number of sequences
- cl->program.num_prog = bs_read(bits, 8);
+ program->num_prog = bs_read(bits, 8);
 
 CLPI_PROG *progs;
- progs = malloc(cl->program.num_prog * sizeof(CLPI_PROG));
- cl->program.progs = progs;
- for (ii = 0; ii < cl->program.num_prog; ii++) {
+ progs = malloc(program->num_prog * sizeof(CLPI_PROG));
+ program->progs = progs;
+ for (ii = 0; ii < program->num_prog; ii++) {
 progs[ii].spn_program_sequence_start = bs_read(bits, 32);
 progs[ii].program_map_pid = bs_read(bits, 16);
 progs[ii].num_streams = bs_read(bits, 8);
@@ -254,6 +269,14 @@
 }
 
 static int
+_parse_program_info(BITSTREAM *bits, CLPI_CL *cl)
+{
+ bs_seek_byte(bits, cl->program_info_start_addr);
+
+ return _parse_program(bits, &cl->program);
+}
+
+static int
 _parse_ep_map_stream(BITSTREAM *bits, CLPI_EP_MAP_ENTRY *ee)
 {
 uint32_t fine_start;
@@ -286,29 +309,28 @@
 }
 
 static int
-_parse_cpi(BITSTREAM *bits, CLPI_CL *cl)
+_parse_cpi(BITSTREAM *bits, CLPI_CPI *cpi)
 {
 int ii;
 uint32_t ep_map_pos, len;
 
- bs_seek_byte(bits, cl->cpi_start_addr);
 len = bs_read(bits, 32);
 if (len == 0) {
 return 1;
 }
 
 bs_skip(bits, 12);
- cl->cpi.type = bs_read(bits, 4);
+ cpi->type = bs_read(bits, 4);
 ep_map_pos = bs_pos(bits) >> 3;
 
 // EP Map starts here
 bs_skip(bits, 8);
- cl->cpi.num_stream_pid = bs_read(bits, 8);
+ cpi->num_stream_pid = bs_read(bits, 8);
 
 CLPI_EP_MAP_ENTRY *entry;
- entry = malloc(cl->cpi.num_stream_pid * sizeof(CLPI_EP_MAP_ENTRY));
- cl->cpi.entry = entry;
- for (ii = 0; ii < cl->cpi.num_stream_pid; ii++) {
+ entry = malloc(cpi->num_stream_pid * sizeof(CLPI_EP_MAP_ENTRY));
+ cpi->entry = entry;
+ for (ii = 0; ii < cpi->num_stream_pid; ii++) {
 entry[ii].pid = bs_read(bits, 16);
 bs_skip(bits, 10);
 entry[ii].ep_stream_type = bs_read(bits, 4);
@@ -316,12 +338,20 @@
 entry[ii].num_ep_fine = bs_read(bits, 18);
 entry[ii].ep_map_stream_start_addr = bs_read(bits, 32) + ep_map_pos;
 }
- for (ii = 0; ii < cl->cpi.num_stream_pid; ii++) {
- _parse_ep_map_stream(bits, &cl->cpi.entry[ii]);
+ for (ii = 0; ii < cpi->num_stream_pid; ii++) {
+ _parse_ep_map_stream(bits, &cpi->entry[ii]);
 }
 return 1;
 }
 
+static int
+_parse_cpi_info(BITSTREAM *bits, CLPI_CL *cl)
+{
+ bs_seek_byte(bits, cl->cpi_start_addr);
+
+ return _parse_cpi(bits, &cl->cpi);
+}
+
 static uint32_t
 _find_stc_spn(const CLPI_CL *cl, uint8_t stc_id)
 {
@@ -532,6 +562,74 @@
 return coarse_spn + entry->fine[jj].spn_ep;
 }
 
+static int
+_parse_extent_start_points(BITSTREAM *bits, CLPI_EXTENT_START *es)
+{
+ unsigned int ii;
+
+ bs_skip(bits, 32); // length
+ es->num_point = bs_read(bits, 32);
+
+ es->point = malloc(es->num_point * sizeof(uint32_t));
+
+ for (ii = 0; ii < es->num_point; ii++) {
+ es->point[ii] = bs_read(bits, 32);
+ }
+
+ return 1;
+}
+
+static int _parse_clpi_extension(BITSTREAM *bits, int id1, int id2, void *handle)
+{
+ CLPI_CL *cl = (CLPI_CL*)handle;
+
+ if (id1 == 2) {
+ if (id2 == 4) {
+ // Extent start point
+ return _parse_extent_start_points(bits, &cl->extent_start);
+ }
+ if (id2 == 5) {
+ // ProgramInfo SS
+ return _parse_program(bits, &cl->program_ss);
+ }
+ if (id2 == 6) {
+ // CPI SS
+ return _parse_cpi(bits, &cl->cpi_ss);
+ }
+ }
+
+ return 0;
+}
+
+static void
+_clean_program(CLPI_PROG_INFO *p)
+{
+ int ii;
+
+ for (ii = 0; ii < p->num_prog; ii++) {
+ if (p->progs[ii].streams != NULL) {
+ X_FREE(p->progs[ii].streams);
+ }
+ }
+ X_FREE(p->progs);
+}
+
+static void
+_clean_cpi(CLPI_CPI *cpi)
+{
+ int ii;
+
+ for (ii = 0; ii < cpi->num_stream_pid; ii++) {
+ if (cpi->entry[ii].coarse != NULL) {
+ X_FREE(cpi->entry[ii].coarse);
+ }
+ if (cpi->entry[ii].fine != NULL) {
+ X_FREE(cpi->entry[ii].fine);
+ }
+ }
+ X_FREE(cpi->entry);
+}
+
 void
 clpi_free(CLPI_CL *cl)
 {
@@ -552,38 +650,26 @@
 X_FREE(cl->sequence.atc_seq);
 }
 
- for (ii = 0; ii < cl->program.num_prog; ii++) {
- if (cl->program.progs[ii].streams != NULL) {
- X_FREE(cl->program.progs[ii].streams);
- }
- }
- if (cl->program.progs != NULL) {
- X_FREE(cl->program.progs);
- }
+ _clean_program(&cl->program);
+ _clean_cpi(&cl->cpi);
+
+ X_FREE(cl->extent_start.point);
+
+ _clean_program(&cl->program_ss);
+ _clean_cpi(&cl->cpi_ss);
+
+ X_FREE(cl->font_info.font);
 
- for (ii = 0; ii < cl->cpi.num_stream_pid; ii++) {
- if (cl->cpi.entry[ii].coarse != NULL) {
- X_FREE(cl->cpi.entry[ii].coarse);
- }
- if (cl->cpi.entry[ii].fine != NULL) {
- X_FREE(cl->cpi.entry[ii].fine);
- }
- }
- if (cl->cpi.entry != NULL) {
- X_FREE(cl->cpi.entry);
- }
 X_FREE(cl);
 }
 
 static CLPI_CL*
-_clpi_parse(const char *path, int verbose)
+_clpi_parse(const char *path)
 {
 BITSTREAM bits;
 BD_FILE_H *fp;
 CLPI_CL *cl;
 
- clpi_verbose = verbose;
-
 cl = calloc(1, sizeof(CLPI_CL));
 if (cl == NULL) {
 return NULL;
@@ -602,6 +688,14 @@
 clpi_free(cl);
 return NULL;
 }
+
+ if (cl->ext_data_start_addr > 0) {
+ bdmv_parse_extension_data(&bits,
+ cl->ext_data_start_addr,
+ _parse_clpi_extension,
+ cl);
+ }
+
 if (!_parse_clipinfo(&bits, cl)) {
 file_close(fp);
 clpi_free(cl);
@@ -612,12 +706,12 @@
 clpi_free(cl);
 return NULL;
 }
- if (!_parse_program(&bits, cl)) {
+ if (!_parse_program_info(&bits, cl)) {
 file_close(fp);
 clpi_free(cl);
 return NULL;
 }
- if (!_parse_cpi(&bits, cl)) {
+ if (!_parse_cpi_info(&bits, cl)) {
 file_close(fp);
 clpi_free(cl);
 return NULL;
@@ -627,20 +721,20 @@
 }
 
 CLPI_CL*
-clpi_parse(const char *path, int verbose)
+clpi_parse(const char *path)
 {
- CLPI_CL *cl = _clpi_parse(path, verbose);
+ CLPI_CL *cl = _clpi_parse(path);
 
 /* if failed, try backup file */
 if (!cl) {
- int len = strlen(path);
+ size_t len = strlen(path);
 char *backup = malloc(len + 8);
 
 strncpy(backup, path, len - 18);
 strcpy(backup + len - 18, "BACKUP/");
 strcpy(backup + len - 18 + 7, path + len - 18);
 
- cl = _clpi_parse(backup, verbose);
+ cl = _clpi_parse(backup);
 
 X_FREE(backup);
 }
@@ -656,7 +750,6 @@
 
 if (src_cl) {
 dest_cl = (CLPI_CL*) calloc(1, sizeof(CLPI_CL));
-
 dest_cl->clip.clip_stream_type = src_cl->clip.clip_stream_type;
 dest_cl->clip.application_type = src_cl->clip.application_type;
 dest_cl->clip.is_atc_delta = src_cl->clip.is_atc_delta;
@@ -729,6 +822,12 @@
 dest_cl->cpi.entry[ii].fine[jj].spn_ep = src_cl->cpi.entry[ii].fine[jj].spn_ep;
 }
 }
+
+ dest_cl->font_info.font_count = src_cl->font_info.font_count;
+ if (dest_cl->font_info.font_count) {
+ dest_cl->font_info.font = malloc(dest_cl->font_info.font_count * sizeof(CLPI_FONT));
+ memcpy(dest_cl->font_info.font, src_cl->font_info.font, dest_cl->font_info.font_count * sizeof(CLPI_FONT));
+ }
 }
 
 return dest_cl;

libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/clpi_parse.h -> libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/clpi_parse.h Changed

libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/extdata_parse.c Added

@@ -0,0 +1,65 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "util/bits.h"
+#include "extdata_parse.h"
+
+#include <stdint.h>
+
+int bdmv_parse_extension_data(BITSTREAM *bits,
+ int start_address,
+ int (*handler)(BITSTREAM*, int, int, void*),
+ void *handle)
+{
+ off_t length;
+ int num_entries, n;
+
+ if (start_address < 1) return 0;
+ if (start_address > bits->end - 12) return 0;
+
+ bs_seek_byte(bits, start_address);
+
+ length = bs_read(bits, 32); /* length of extension data block */
+ if (length < 1) return 0;
+ bs_skip(bits, 32); /* relative start address of extension data */
+ bs_skip(bits, 24); /* padding */
+ num_entries = bs_read(bits, 8);
+
+ if (start_address > bits->end - 12 - num_entries * 12) return 0;
+
+ for (n = 0; n < num_entries; n++) {
+ uint16_t id1 = bs_read(bits, 16);
+ uint16_t id2 = bs_read(bits, 16);
+ off_t ext_start = bs_read(bits, 32);
+ off_t ext_len = bs_read(bits, 32);
+
+ off_t saved_pos = bs_pos(bits) >> 3;
+
+ if (ext_start + start_address + ext_len > bits->end) return 0;
+
+ bs_seek_byte(bits, start_address + ext_start);
+
+ (handler)(bits, id1, id2, handle);
+
+ bs_seek_byte(bits, saved_pos);
+ }
+
+ return 1;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/extdata_parse.h Added

@@ -0,0 +1,33 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(_EXTDATA_PARSE_H_)
+#define _EXTDATA_PARSE_H_
+
+#include "util/attributes.h"
+#include "util/bits.h"
+
+#include <stdint.h>
+
+BD_PRIVATE int bdmv_parse_extension_data(BITSTREAM *bits,
+ int start_address,
+ int (*handler)(BITSTREAM*, int, int, void*),
+ void *handle);
+
+#endif // _EXTDATA_PARSE_H_

libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/index_parse.c -> libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/index_parse.c Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/index_parse.h -> libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/index_parse.h Changed

@@ -62,25 +62,25 @@
 } indx_bdj_playback_type;
 
 typedef struct {
-    uint8_t           initial_output_mode_preference : 1; /* 0 - 2D, 1 - 3D */
-    uint8_t           content_exist_flag : 1;
-    indx_video_format video_format;
-    indx_frame_rate   frame_rate;
-    uint8_t           user_data[32];
+    unsigned int       initial_output_mode_preference : 1; /* 0 - 2D, 1 - 3D */
+    unsigned int       content_exist_flag : 1;
+    unsigned int       video_format : 4;
+    unsigned int       frame_rate : 4;
+    uint8_t            user_data[32];
 } INDX_APP_INFO;
 
 typedef struct {
-    indx_bdj_playback_type playback_type;
-    char                   name[6];
+    uint8_t            playback_type/* : 2*/;
+    char               name[6];
 } INDX_BDJ_OBJ;
 
 typedef struct {
-    indx_hdmv_playback_type playback_type;
-    uint16_t                id_ref;
+    uint8_t            playback_type/* : 2*/;
+    uint16_t           id_ref;
 } INDX_HDMV_OBJ;
 
 typedef struct {
-    indx_object_type   object_type;
+    uint8_t            object_type/* : 2*/;
     /*union {*/
         INDX_BDJ_OBJ   bdj;
         INDX_HDMV_OBJ  hdmv;
@@ -88,8 +88,8 @@
 } INDX_PLAY_ITEM;
 
 typedef struct {
-    indx_object_type   object_type;
-    uint8_t            access_type : 2;
+    uint8_t            object_type/* : 2*/;
+    uint8_t            access_type/* : 2*/;
     /*union {*/
         INDX_BDJ_OBJ   bdj;
         INDX_HDMV_OBJ  hdmv;

libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/meta_parse.c -> libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/meta_parse.c Changed

@@ -45,6 +45,7 @@
 
 #define BAD_CAST_CONST (const xmlChar *)
 
+#define MAX_META_FILE_SIZE 0xfffff
 
 #ifdef HAVE_LIBXML2
 static void _parseManifestNode(xmlNode * a_node, META_DL *disclib)
@@ -87,7 +88,10 @@
 disclib->thumbnails = realloc(disclib->thumbnails, (disclib->thumb_count*sizeof(META_THUMBNAIL)));
 disclib->thumbnails[i].path = (char *)tmp;
 if ((tmp = xmlGetProp(cur_node, BAD_CAST_CONST "size"))) {
- sscanf((const char*)tmp, "%ix%i", &disclib->thumbnails[i].xres, &disclib->thumbnails[i].yres);
+ int x = 0, y = 0;
+ sscanf((const char*)tmp, "%ix%i", &x, &y);
+ disclib->thumbnails[i].xres = x;
+ disclib->thumbnails[i].yres = y;
 X_FREE(tmp);
 }
 else {
@@ -120,7 +124,7 @@
 uint8_t i = meta->dl_count;
 meta->dl_count++;
 meta->dl_entries = realloc(meta->dl_entries, (meta->dl_count*sizeof(META_DL)));
- meta->dl_entries[i].filename = str_printf("%s", ent.d_name);
+ meta->dl_entries[i].filename = str_dup(ent.d_name);
 strncpy(meta->dl_entries[i].language_code, ent.d_name+5,3);
 meta->dl_entries[i].language_code[3] = '\0';
 str_tolower(meta->dl_entries[i].language_code);
@@ -155,29 +159,30 @@
 continue;
 }
 
- file_seek(handle, 0, SEEK_END);
- int64_t length = file_tell(handle);
-
- if (length > 0) {
- file_seek(handle, 0, SEEK_SET);
- uint8_t *data = malloc(length);
- int64_t size_read = file_read(handle, data, length);
- doc = xmlReadMemory((char*)data, size_read, base, NULL, 0);
- if (doc == NULL) {
- BD_DEBUG(DBG_DIR, "Failed to parse %s\n", path);
- X_FREE(path);
- X_FREE(base);
- continue;
+ int64_t length = file_size(handle);
+
+ if (length > 0 && length < MAX_META_FILE_SIZE) {
+ size_t size = (size_t)length;
+ uint8_t *data = malloc(size);
+ size_t size_read = file_read(handle, data, size);
+ if (size != size_read) {
+ BD_DEBUG(DBG_DIR, "Failed to read %s\n", path);
+ } else {
+ doc = xmlReadMemory((char*)data, (int)size, base, NULL, 0);
+ if (doc == NULL) {
+ BD_DEBUG(DBG_DIR, "Failed to parse %s\n", path);
+ } else {
+ xmlNode *root_element = NULL;
+ root_element = xmlDocGetRootElement(doc);
+ root->dl_entries[i].di_name = root->dl_entries[i].di_alternative = NULL;
+ root->dl_entries[i].di_num_sets = root->dl_entries[i].di_set_number = -1;
+ root->dl_entries[i].toc_count = root->dl_entries[i].thumb_count = 0;
+ root->dl_entries[i].toc_entries = NULL;
+ root->dl_entries[i].thumbnails = NULL;
+ _parseManifestNode(root_element, &root->dl_entries[i]);
+ xmlFreeDoc(doc);
+ }
 }
- xmlNode *root_element = NULL;
- root_element = xmlDocGetRootElement(doc);
- root->dl_entries[i].di_name = root->dl_entries[i].di_alternative = NULL;
- root->dl_entries[i].di_num_sets = root->dl_entries[i].di_set_number = -1;
- root->dl_entries[i].toc_count = root->dl_entries[i].thumb_count = 0;
- root->dl_entries[i].toc_entries = NULL;
- root->dl_entries[i].thumbnails = NULL;
- _parseManifestNode(root_element, &root->dl_entries[i]);
- xmlFreeDoc(doc);
 X_FREE(data);
 }
 file_close(handle);

libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/mpls_parse.c -> libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/mpls_parse.c Changed

@@ -1,6 +1,7 @@
 /*
 * This file is part of libbluray
 * Copyright (C) 2009-2010 John Stebbins
+ * Copyright (C) 2012 Petri Hintukainen <phintuka@users.sourceforge.net>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -20,6 +21,7 @@
 #include "util/macro.h"
 #include "file/file.h"
 #include "util/bits.h"
+#include "extdata_parse.h"
 #include "mpls_parse.h"
 
 #include <stdlib.h>
@@ -29,8 +31,6 @@
 #define MPLS_SIG2A ('0' << 24 | '2' << 16 | '0' << 8 | '0')
 #define MPLS_SIG2B ('0' << 24 | '1' << 16 | '0' << 8 | '0')
 
-static int mpls_verbose = 0;
-
 static void
 _human_readable_sig(char *sig, uint32_t s1, uint32_t s2)
 {
@@ -101,7 +101,7 @@
 _parse_appinfo(BITSTREAM *bits, MPLS_AI *ai)
 {
 int len;
- int pos;
+ off_t pos;
 
 if (!bs_is_align(bits, 0x07)) {
 fprintf(stderr, "_parse_appinfo: alignment error\n");
@@ -161,7 +161,7 @@
 _parse_stream(BITSTREAM *bits, MPLS_STREAM *s)
 {
 int len;
- int pos;
+ off_t pos;
 
 if (!bs_is_align(bits, 0x07)) {
 fprintf(stderr, "_parse_stream: Stream alignment error\n");
@@ -248,7 +248,7 @@
 _parse_stn(BITSTREAM *bits, MPLS_STN *stn)
 {
 int len;
- int pos;
+ off_t pos;
 MPLS_STREAM *ss;
 int ii,jj;
 
@@ -421,7 +421,7 @@
 _parse_playitem(BITSTREAM *bits, MPLS_PI *pi)
 {
 int len, ii;
- int pos;
+ off_t pos;
 char clip_id[6], codec_id[5];
 uint8_t stc_id;
 
@@ -515,7 +515,7 @@
 _parse_subplayitem(BITSTREAM *bits, MPLS_SUB_PI *spi)
 {
 int len, ii;
- int pos;
+ off_t pos;
 char clip_id[6], codec_id[5];
 uint8_t stc_id;
 
@@ -594,7 +594,7 @@
 _parse_subpath(BITSTREAM *bits, MPLS_SUB *sp)
 {
 int len, ii;
- int pos;
+ off_t pos;
 MPLS_SUB_PI *spi = NULL;
 
 if (!bs_is_align(bits, 0x07)) {
@@ -724,6 +724,12 @@
 }
 X_FREE(pl->sub_path);
 }
+ if (pl->ext_sub_path != NULL) {
+ for (ii = 0; ii < pl->ext_sub_count; ii++) {
+ _clean_subpath(&pl->ext_sub_path[ii]);
+ }
+ X_FREE(pl->ext_sub_path);
+ }
 X_FREE(pl->play_mark);
 X_FREE(pl);
 }
@@ -734,15 +740,150 @@
 _clean_playlist(pl);
 }
 
+static int
+_parse_pip_data(BITSTREAM *bits, MPLS_PIP_METADATA *block)
+{
+ MPLS_PIP_DATA *data;
+ unsigned ii;
+
+ uint16_t entries = bs_read(bits, 16);
+ if (entries < 1) {
+ return 1;
+ }
+
+ data = calloc(entries, sizeof(MPLS_PIP_DATA));
+ for (ii = 0; ii < entries; ii++) {
+
+ data[ii].time = bs_read(bits, 32);
+ data[ii].xpos = bs_read(bits, 12);
+ data[ii].ypos = bs_read(bits, 12);
+ data[ii].scale_factor = bs_read(bits, 4);
+ bs_skip(bits, 4);
+ }
+
+ block->data_count = entries;
+ block->data = data;
+
+ return 1;
+}
+
+static int
+_parse_pip_metadata_block(BITSTREAM *bits, uint32_t start_address, MPLS_PIP_METADATA *data)
+{
+ uint32_t data_address;
+ int result;
+ off_t pos;
+
+ data->clip_ref = bs_read(bits, 16);
+ data->secondary_video_ref = bs_read(bits, 8);
+ bs_skip(bits, 8);
+ data->timeline_type = bs_read(bits, 4);
+ data->luma_key_flag = bs_read(bits, 1);
+ data->trick_play_flag = bs_read(bits, 1);
+ bs_skip(bits, 10);
+ if (data->luma_key_flag) {
+ bs_skip(bits, 8);
+ data->upper_limit_luma_key = bs_read(bits, 8);
+ } else {
+ bs_skip(bits, 16);
+ }
+ bs_skip(bits, 16);
+
+ data_address = bs_read(bits, 32);
+
+ pos = bs_pos(bits) / 8;
+ bs_seek_byte(bits, start_address + data_address);
+ result = _parse_pip_data(bits, data);
+ bs_seek_byte(bits, pos);
+
+ return result;
+}
+
+static int
+_parse_pip_metadata_extension(BITSTREAM *bits, MPLS_PL *pl)
+{
+ MPLS_PIP_METADATA *data;
+ int ii;
+
+ uint32_t start_address = (uint32_t)bs_pos(bits) / 8;
+ uint32_t len = bs_read(bits, 32);
+ int entries = bs_read(bits, 16);
+
+ if (len < 1 || entries < 1) {
+ return 0;
+ }
+
+ data = calloc(entries, sizeof(MPLS_PIP_METADATA));
+ for (ii = 0; ii < entries; ii++) {
+ if (!_parse_pip_metadata_block(bits, start_address, data)) {
+ X_FREE(data);
+ fprintf(stderr, "error parsing pip metadata extension\n");
+ return 0;
+ }
+ }
+
+ pl->ext_pip_data_count = entries;
+ pl->ext_pip_data = data;
+
+ return 1;
+}
+
+static int
+_parse_subpath_extension(BITSTREAM *bits, MPLS_PL *pl)
+{
+ MPLS_SUB *sub_path;
+ int ii;
+
+ uint32_t len = bs_read(bits, 32);
+ int sub_count = bs_read(bits, 16);
+
+ if (len < 1 || sub_count < 1) {
+ return 0;
+ }
+
+ sub_path = calloc(sub_count, sizeof(MPLS_SUB));
+ for (ii = 0; ii < sub_count; ii++) {
+ if (!_parse_subpath(bits, &sub_path[ii])) {
+ X_FREE(sub_path);
+ fprintf(stderr, "error parsing extension subpath\n");
+ return 0;
+ }
+ }
+ pl->ext_sub_path = sub_path;
+ pl->ext_sub_count = sub_count;
+
+ return 1;
+}
+
+static int
+_parse_mpls_extension(BITSTREAM *bits, int id1, int id2, void *handle)
+{
+ MPLS_PL *pl = (MPLS_PL*)handle;
+
+ if (id1 == 1) {
+ if (id2 == 1) {
+ // PiP metadata extension
+ return _parse_pip_metadata_extension(bits, pl);
+ }
+ }
+
+ if (id1 == 2) {
+ if (id2 == 2) {
+ // SubPath entries extension
+ return _parse_subpath_extension(bits, pl);
+ }
+ }
+
+ return 0;
+}
+
 static MPLS_PL*
-_mpls_parse(const char *path, int verbose)
+_mpls_parse(const char *path)
 {
 BITSTREAM bits;
 BD_FILE_H *fp;
 MPLS_PL *pl = NULL;
 
- mpls_verbose = verbose;
-
 pl = calloc(1, sizeof(MPLS_PL));
 if (pl == NULL) {
 return NULL;
@@ -771,25 +912,32 @@
 _clean_playlist(pl);
 return NULL;
 }
+ if (pl->ext_pos > 0) {
+ bdmv_parse_extension_data(&bits,
+ pl->ext_pos,
+ _parse_mpls_extension,
+ pl);
+ }
+
 file_close(fp);
 return pl;
 }
 
 MPLS_PL*
-mpls_parse(const char *path, int verbose)
+mpls_parse(const char *path)
 {
- MPLS_PL *pl = _mpls_parse(path, verbose);
+ MPLS_PL *pl = _mpls_parse(path);
 
 /* if failed, try backup file */
 if (!pl) {
- int len = strlen(path);
+ size_t len = strlen(path);
 char *backup = malloc(len + 8);
 
 strncpy(backup, path, len - 19);
 strcpy(backup + len - 19, "BACKUP/");
 strcpy(backup + len - 19 + 7, path + len - 19);
 
- pl = _mpls_parse(backup, verbose);
+ pl = _mpls_parse(backup);
 
 X_FREE(backup);
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/mpls_parse.h -> libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/mpls_parse.h Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/navigation.c -> libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/navigation.c Changed

@@ -64,7 +64,7 @@
 }
 
 static unsigned int
-_find_repeats(MPLS_PL *pl, const char *m2ts)
+_find_repeats(MPLS_PL *pl, const char *m2ts, uint32_t in_time, uint32_t out_time)
 {
 unsigned ii, count = 0;
 
@@ -73,7 +73,9 @@
 
 pi = &pl->play_item[ii];
 // Ignore titles with repeated segments
- if (strcmp(pi->clip[0].clip_id, m2ts) == 0) {
+ if (strcmp(pi->clip[0].clip_id, m2ts) == 0 &&
+ pi->in_time == in_time &&
+ pi->out_time == out_time) {
 count++;
 }
 }
@@ -90,7 +92,7 @@
 
 pi = &pl->play_item[ii];
 // Ignore titles with repeated segments
- if (_find_repeats(pl, pi->clip[0].clip_id) > repeats) {
+ if (_find_repeats(pl, pi->clip[0].clip_id, pi->in_time, pi->out_time) > repeats) {
 return 0;
 }
 }
@@ -159,7 +161,7 @@
 }
 pl_list = tmp;
 }
- pl = mpls_parse(path, 0);
+ pl = mpls_parse(path);
 X_FREE(path);
 if (pl != NULL) {
 if ((flags & TITLES_FILTER_DUP_TITLE) &&
@@ -188,6 +190,15 @@
 title_list->title_info = tmp;
 }
 pl_list[ii] = pl;
+
+ /* main title guessing */
+ if (_filter_dup(pl_list, ii, pl) &&
+ _filter_repeats(pl, 2)) {
+ if (_pl_duration(pl_list[ii]) >= _pl_duration(pl_list[title_list->main_title_idx])) {
+ title_list->main_title_idx = ii;
+ }
+ }
+
 strncpy(title_list->title_info[ii].name, ent.d_name, 11);
 title_list->title_info[ii].name[10] = '\0';
 title_list->title_info[ii].ref = ii;
@@ -212,77 +223,6 @@
 X_FREE(title_list);
 }
 
-char* nav_find_main_title(const char *root)
-{
- BD_DIR_H *dir;
- BD_DIRENT ent;
- char *path = NULL;
- MPLS_PL **pl_list = NULL;
- MPLS_PL **tmp = NULL;
- MPLS_PL *pl = NULL;
- unsigned count, ii, jj, pl_list_size = 0;
- int res;
- char longest[11];
-
- BD_DEBUG(DBG_NAV, "Root: %s:\n", root);
- path = str_printf("%s" DIR_SEP "BDMV" DIR_SEP "PLAYLIST", root);
-
- dir = dir_open(path);
- if (dir == NULL) {
- fprintf(stderr, "Failed to open dir: %s\n", path);
- X_FREE(path);
- return NULL;
- }
- X_FREE(path);
-
- ii = jj = 0;
- for (res = dir_read(dir, &ent); !res; res = dir_read(dir, &ent)) {
-
- if (ent.d_name[0] == '.') {
- continue;
- }
- path = str_printf("%s" DIR_SEP "BDMV" DIR_SEP "PLAYLIST" DIR_SEP "%s",
- root, ent.d_name);
-
- if (ii >= pl_list_size) {
- pl_list_size += 100;
- tmp = realloc(pl_list, pl_list_size * sizeof(MPLS_PL*));
- if (tmp == NULL) {
- X_FREE(path);
- break;
- }
- pl_list = tmp;
- }
- pl = mpls_parse(path, 0);
- X_FREE(path);
- if (pl != NULL) {
- if (_filter_dup(pl_list, ii, pl) &&
- _filter_repeats(pl, 2)) {
- pl_list[ii] = pl;
- if (_pl_duration(pl_list[ii]) >= _pl_duration(pl_list[jj])) {
- strncpy(longest, ent.d_name, 11);
- longest[10] = '\0';
- jj = ii;
- }
- ii++;
- } else {
- mpls_free(pl);
- }
- }
- }
- dir_close(dir);
-
- count = ii;
- for (ii = 0; ii < count; ii++) {
- mpls_free(pl_list[ii]);
- }
- if (count > 0) {
- return strdup(longest);
- } else {
- return NULL;
- }
-}
-
 uint8_t nav_lookup_aspect(NAV_CLIP *clip, int pid)
 {
 CLPI_PROG *progs;
@@ -319,7 +259,7 @@
 mark->mark_type = plm->mark_type;
 mark->clip_ref = plm->play_item_ref;
 clip = &title->clip_list.clip[mark->clip_ref];
- if (clip->cl != NULL) {
+ if (clip->cl != NULL && mark->clip_ref < title->pl->list_count) {
 mark->clip_pkt = clpi_lookup_spn(clip->cl, plm->time, 1,
 title->pl->play_item[mark->clip_ref].clip[title->angle].stc_id);
 } else {
@@ -339,8 +279,8 @@
 static void
 _extrapolate_title(NAV_TITLE *title)
 {
- uint64_t duration = 0;
- uint64_t pkt = 0;
+ uint32_t duration = 0;
+ uint32_t pkt = 0;
 unsigned ii, jj;
 MPLS_PL *pl = title->pl;
 MPLS_PI *pi;
@@ -419,7 +359,7 @@
 path = str_printf("%s"DIR_SEP"BDMV"DIR_SEP"CLIPINF"DIR_SEP"%s.clpi",
 title->root, mpls_clip[clip->angle].clip_id);
 clpi_free(clip->cl);
- clip->cl = clpi_parse(path, 0);
+ clip->cl = clpi_parse(path);
 X_FREE(path);
 if (clip->cl == NULL) {
 clip->start_pkt = 0;
@@ -464,14 +404,14 @@
 if (title == NULL) {
 return NULL;
 }
- title->root = strdup(root);
+ title->root = str_dup(root);
 strncpy(title->name, playlist, 11);
 title->name[10] = '\0';
 path = str_printf("%s" DIR_SEP "BDMV" DIR_SEP "PLAYLIST" DIR_SEP "%s",
 root, playlist);
 title->angle_count = 0;
 title->angle = angle;
- title->pl = mpls_parse(path, 0);
+ title->pl = mpls_parse(path);
 if (title->pl == NULL) {
 BD_DEBUG(DBG_NAV, "Fail: Playlist parse %s\n", path);
 X_FREE(title);
@@ -704,10 +644,19 @@
 NAV_CLIP* nav_time_search(NAV_TITLE *title, uint32_t tick, uint32_t *clip_pkt, uint32_t *out_pkt)
 {
 uint32_t pos, len;
- MPLS_PI *pi;
+ MPLS_PI *pi = NULL;
 NAV_CLIP *clip;
 unsigned ii;
 
+ if (!title->pl) {
+ BD_DEBUG(DBG_NAV | DBG_CRIT, "Time search failed (title not opened)\n");
+ return NULL;
+ }
+ if (title->pl->list_count < 1) {
+ BD_DEBUG(DBG_NAV | DBG_CRIT, "Time search failed (empty playlist)\n");
+ return NULL;
+ }
+
 pos = 0;
 for (ii = 0; ii < title->pl->list_count; ii++) {
 pi = &title->pl->play_item[ii];
@@ -791,13 +740,13 @@
 title->packets = 0;
 for (ii = 0; ii < title->pl->list_count; ii++) {
 MPLS_PI *pi;
- NAV_CLIP *clip;
+ NAV_CLIP *cl;
 
 pi = &title->pl->play_item[ii];
- clip = &title->clip_list.clip[ii];
+ cl = &title->clip_list.clip[ii];
 
 _fill_clip(title, pi->clip, pi->connection_condition, pi->in_time, pi->out_time, pi->angle_count,
- clip, ii, &pos, &time);
+ cl, ii, &pos, &time);
 }
 _extrapolate_title(title);
 return clip;

libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/navigation.h -> libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/navigation.h Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/sound_parse.c -> libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/sound_parse.c Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/sound_parse.h -> libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/sound_parse.h Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/uo_mask_table.h -> libbluray-0.5.0.tar.bz2/src/libbluray/bdnav/uo_mask_table.h Changed

@@ -24,49 +24,51 @@
 
 typedef struct bd_uo_mask_table_s
 {
- uint8_t menu_call : 1;
- uint8_t title_search : 1;
- uint8_t chapter_search : 1;
- uint8_t time_search : 1;
- uint8_t skip_to_next_point : 1;
- uint8_t skip_to_prev_point : 1;
- uint8_t play_firstplay : 1;
- uint8_t stop : 1;
- uint8_t pause_on : 1;
- uint8_t pause_off : 1;
- uint8_t still : 1;
- uint8_t forward : 1;
- uint8_t backward : 1;
- uint8_t resume : 1;
- uint8_t move_up : 1;
- uint8_t move_down : 1;
- uint8_t move_left : 1;
- uint8_t move_right : 1;
- uint8_t select : 1;
- uint8_t activate : 1;
- uint8_t select_and_activate : 1;
- uint8_t primary_audio_change : 1;
- uint8_t angle_change : 1;
- uint8_t popup_on : 1;
- uint8_t popup_off : 1;
- uint8_t pg_enable_disable : 1;
- uint8_t pg_change : 1;
- uint8_t secondary_video_enable_disable : 1;
- uint8_t secondary_video_change : 1;
- uint8_t secondary_audio_enable_disable : 1;
- uint8_t secondary_audio_change : 1;
- uint8_t pip_pg_change : 1;
+ unsigned int menu_call : 1;
+ unsigned int title_search : 1;
+ unsigned int chapter_search : 1;
+ unsigned int time_search : 1;
+ unsigned int skip_to_next_point : 1;
+ unsigned int skip_to_prev_point : 1;
+ unsigned int play_firstplay : 1;
+ unsigned int stop : 1;
+ unsigned int pause_on : 1;
+ unsigned int pause_off : 1;
+ unsigned int still : 1;
+ unsigned int forward : 1;
+ unsigned int backward : 1;
+ unsigned int resume : 1;
+ unsigned int move_up : 1;
+ unsigned int move_down : 1;
+ unsigned int move_left : 1;
+ unsigned int move_right : 1;
+ unsigned int select : 1;
+ unsigned int activate : 1;
+ unsigned int select_and_activate : 1;
+ unsigned int primary_audio_change : 1;
+ unsigned int reserved0 : 1;
+ unsigned int angle_change : 1;
+ unsigned int popup_on : 1;
+ unsigned int popup_off : 1;
+ unsigned int pg_enable_disable : 1;
+ unsigned int pg_change : 1;
+ unsigned int secondary_video_enable_disable : 1;
+ unsigned int secondary_video_change : 1;
+ unsigned int secondary_audio_enable_disable : 1;
+ unsigned int secondary_audio_change : 1;
+ unsigned int reserved1 : 1;
+ unsigned int pip_pg_change : 1;
 } BD_UO_MASK;
 
 static inline BD_UO_MASK bd_uo_mask_combine(BD_UO_MASK a, BD_UO_MASK b)
 {
 BD_UO_MASK o;
- uint8_t *pa = (uint8_t*)&a;
- uint8_t *pb = (uint8_t*)&b;
- uint8_t *po = (uint8_t*)&o;
+ unsigned int *pa = (unsigned int*)&a;
+ unsigned int *pb = (unsigned int*)&b;
+ unsigned int *po = (unsigned int*)&o;
 unsigned i;
 
- for (i = 0; i < sizeof(BD_UO_MASK); i++) {
+ for (i = 0; i < sizeof(BD_UO_MASK) / sizeof(unsigned int); i++) {
 po[i] = pa[i] | pb[i];
 }

libbluray-0.2.3.tar.bz2/src/libbluray/bluray-version.h -> libbluray-0.5.0.tar.bz2/src/libbluray/bluray-version.h Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bluray.c -> libbluray-0.5.0.tar.bz2/src/libbluray/bluray.c Changed

@@ -25,6 +25,7 @@
 
 #include "bluray-version.h"
 #include "bluray.h"
+#include "bluray_internal.h"
 #include "register.h"
 #include "util/macro.h"
 #include "util/logging.h"
@@ -37,12 +38,16 @@
 #include "bdnav/sound_parse.h"
 #include "hdmv/hdmv_vm.h"
 #include "decoders/graphics_controller.h"
+#include "decoders/m2ts_filter.h"
+#include "decoders/overlay.h"
 #include "file/file.h"
-#include "file/dl.h"
 #ifdef USING_BDJAVA
 #include "bdj/bdj.h"
 #endif
 
+#include "file/libbdplus.h"
+#include "file/libaacs.h"
+
 #include <stdlib.h>
 #include <inttypes.h>
 #include <string.h>
@@ -60,9 +65,6 @@
 #include <sys/mount.h>
 #endif
 
-typedef int (*fptr_int)();
-typedef int32_t (*fptr_int32)();
-typedef void* (*fptr_p_void)();
 
 #define MAX_EVENTS 31 /* 2^n - 1 */
 typedef struct bd_event_queue_s {
@@ -91,16 +93,26 @@
 
 BD_UO_MASK uo_mask;
 
+ /* internally handled pids */
+ uint16_t ig_pid; /* pid of currently selected IG stream */
+ uint16_t pg_pid; /* pid of currently selected PG stream */
+
+ M2TS_FILTER *m2ts_filter;
+
+ /* BD+ */
+ BD_BDPLUS_ST *bdplus;
 } BD_STREAM;
 
 typedef struct {
 NAV_CLIP *clip;
- uint64_t clip_size;
+ size_t clip_size;
 uint8_t *buf;
 } BD_PRELOAD;
 
 struct bluray {
 
+ BD_MUTEX mutex; /* protect API function access to internal data (must be first element in struct) */
+
 /* current disc */
 char *device_path;
 BLURAY_DISC_INFO disc_info;
@@ -116,7 +128,7 @@
 /* streams */
 BD_STREAM st0; /* main path */
 BD_PRELOAD st_ig; /* preloaded IG stream sub path */
- int ig_pid; /* pid of currently selected IG stream in main path */
+ BD_PRELOAD st_textst; /* preloaded TextST sub path */
 
 /* buffer for bd_read(): current aligned unit of main stream (st0) */
 uint8_t int_buf[6144];
@@ -127,21 +139,15 @@
 uint32_t angle_change_time;
 unsigned request_angle;
 
- /* chapter tracking */
- uint64_t next_chapter_start;
+ /* mark tracking */
+ uint64_t next_mark_pos;
+ int next_mark;
 
- /* aacs */
- void *h_libaacs; // library handle
- void *aacs;
- fptr_p_void libaacs_open;
- fptr_int libaacs_decrypt_unit;
+ /* AACS */
+ BD_AACS *libaacs;
 
 /* BD+ */
- void *h_libbdplus; // library handle
- void *bdplus;
- fptr_p_void bdplus_init;
- fptr_int32 bdplus_seek;
- fptr_int32 bdplus_fixup;
+ BD_BDPLUS *libbdplus;
 
 /* player state */
 BD_REGISTERS *regs; // player registers
@@ -150,22 +156,32 @@
 
 HDMV_VM *hdmv_vm;
 uint8_t hdmv_suspended;
+#ifdef USING_BDJAVA
+ BDJAVA *bdjava;
+#endif
+ /* delayed sending of BDJ_EVENT_END_OF_PLAYLIST:
+ * 1 - message pending. 3 - message sent. */
+ uint8_t bdj_end_of_playlist;
 
- void *bdjava;
-
- /* graphics */
+ /* HDMV graphics */
 GRAPHICS_CONTROLLER *graphics_controller;
 SOUND_DATA *sound_effects;
 uint32_t gc_status;
+ uint8_t decode_pg;
+
+ /* TextST */
+ uint32_t gc_wakeup_time; /* stream timestamp of next subtitle */
+ uint64_t gc_wakeup_pos; /* stream position of gc_wakeup_time */
+
+ /* ARGB overlay output */
+ void *argb_overlay_proc_handle;
+ bd_argb_overlay_proc_f argb_overlay_proc;
+ BD_ARGB_BUFFER *argb_buffer;
 };
 
-#define DL_CALL(lib,func,param,...) \
- do { \
- fptr_p_void fptr = (fptr_p_void)dl_dlsym(lib, #func); \
- if (fptr) { \
- fptr(param, ##__VA_ARGS__); \
- } \
- } while (0)
+/* Stream Packet Number = byte offset / 192. Avoid 64-bit division. */
+#define SPN(pos) (((uint32_t)((pos) >> 6)) / 3)
+
 
 /*
 * Library version
@@ -227,7 +243,7 @@
 return 0;
 }
 
-static int _queue_event(BLURAY *bd, BD_EVENT ev)
+static int _queue_event(BLURAY *bd, uint32_t event, uint32_t param)
 {
 struct bd_event_queue_s *eq = bd->event_queue;
 
@@ -237,7 +253,8 @@
 unsigned new_in = (eq->in + 1) & MAX_EVENTS;
 
 if (new_in != eq->out) {
- eq->ev[eq->in] = ev;
+ eq->ev[eq->in].event = event;
+ eq->ev[eq->in].param = param;
 eq->in = new_in;
 
 bd_mutex_unlock(&eq->mutex);
@@ -246,7 +263,7 @@
 
 bd_mutex_unlock(&eq->mutex);
 
- BD_DEBUG(DBG_BLURAY|DBG_CRIT, "_queue_event(%d, %d): queue overflow !\n", ev.event, ev.param);
+ BD_DEBUG(DBG_BLURAY|DBG_CRIT, "_queue_event(%d, %d): queue overflow !\n", event, param);
 }
 
 return 0;
@@ -263,37 +280,41 @@
 uint32_t *lang, uint32_t blacklist)
 {
 uint32_t psr_val;
+ uint32_t preferred_lang;
 int stream_idx = -1;
 unsigned ii;
+ uint32_t stream_lang = 0;
 
 /* get preferred language */
- psr_val = bd_psr_read(regs, psr_lang);
- if (psr_val == 0xffffff) {
- /* language setting not initialized */
- return;
- }
+ preferred_lang = bd_psr_read(regs, psr_lang);
 
 /* find stream */
-
 for (ii = 0; ii < num_streams; ii++) {
- if (psr_val == str_to_uint32((const char *)streams[ii].lang, 3)) {
+ if (preferred_lang == str_to_uint32((const char *)streams[ii].lang, 3)) {
 stream_idx = ii;
 break;
 }
 }
 
+ /* requested language not found ? */
 if (stream_idx < 0) {
- /* requested language not found */
+ BD_DEBUG(DBG_BLURAY, "Stream with preferred language not found\n");
+ /* select first stream */
 stream_idx = 0;
+ /* no subtitles if preferred language not found */
 enable_flag = 0;
+ }
 
- } else {
- if (lang) {
- *lang = psr_val;
- }
- if (blacklist == psr_val) {
- enable_flag = 0;
- }
+ stream_lang = str_to_uint32((const char *)streams[stream_idx].lang, 3);
+
+ /* avoid enabling subtitles if audio is in the same language */
+ if (blacklist && blacklist == stream_lang) {
+ enable_flag = 0;
+ BD_DEBUG(DBG_BLURAY, "Subtitles disabled (audio is in the same language)\n");
+ }
+
+ if (lang) {
+ *lang = stream_lang;
 }
 
 /* update PSR */
@@ -302,7 +323,7 @@
 
 bd_psr_lock(regs);
 
- psr_val = bd_psr_read(regs, psr_stream) & 0xffff0000;
+ psr_val = bd_psr_read(regs, psr_stream) & 0x7fff0000;
 psr_val |= (stream_idx + 1) | enable_flag;
 bd_psr_write(regs, psr_stream, psr_val);
 
@@ -311,6 +332,9 @@
 
 static void _update_clip_psrs(BLURAY *bd, NAV_CLIP *clip)
 {
+ MPLS_STN *stn = &clip->title->pl->play_item[clip->ref].stn;
+ uint32_t audio_lang = 0;
+
 bd_psr_write(bd->regs, PSR_PLAYITEM, clip->ref);
 bd_psr_write(bd->regs, PSR_TIME, clip->in_time);
 
@@ -318,26 +342,158 @@
 * Selection is based on language setting PSRs and clip STN.
 */
 if (bd->title_type == title_undef) {
- MPLS_STN *stn = &clip->title->pl->play_item[clip->ref].stn;
- uint32_t audio_lang = 0;
 
- _update_stream_psr_by_lang(bd->regs,
- PSR_AUDIO_LANG, PSR_PRIMARY_AUDIO_ID, 0,
- stn->audio, stn->num_audio,
- &audio_lang, 0);
- _update_stream_psr_by_lang(bd->regs,
- PSR_PG_AND_SUB_LANG, PSR_PG_STREAM, 0x80000000,
- stn->pg, stn->num_pg,
- NULL, audio_lang);
+ if (stn->num_audio) {
+ _update_stream_psr_by_lang(bd->regs,
+ PSR_AUDIO_LANG, PSR_PRIMARY_AUDIO_ID, 0,
+ stn->audio, stn->num_audio,
+ &audio_lang, 0);
+ }
+
+ if (stn->num_pg) {
+ _update_stream_psr_by_lang(bd->regs,
+ PSR_PG_AND_SUB_LANG, PSR_PG_STREAM, 0x80000000,
+ stn->pg, stn->num_pg,
+ NULL, audio_lang);
+ }
+
+ /* Validate selected audio and subtitle stream PSRs when using menus */
+ } else {
+ uint32_t psr_val;
+
+ if (stn->num_audio) {
+ psr_val = bd_psr_read(bd->regs, PSR_PRIMARY_AUDIO_ID);
+ if (psr_val == 0 || psr_val > stn->num_audio) {
+ _update_stream_psr_by_lang(bd->regs,
+ PSR_AUDIO_LANG, PSR_PRIMARY_AUDIO_ID, 0,
+ stn->audio, stn->num_audio,
+ &audio_lang, 0);
+ } else {
+ audio_lang = str_to_uint32((const char *)stn->audio[psr_val - 1].lang, 3);
+ }
+ }
+ if (stn->num_pg) {
+ psr_val = bd_psr_read(bd->regs, PSR_PG_STREAM) & 0xfff;
+ if ((psr_val == 0) || (psr_val > stn->num_pg)) {
+ _update_stream_psr_by_lang(bd->regs,
+ PSR_PG_AND_SUB_LANG, PSR_PG_STREAM, 0x80000000,
+ stn->pg, stn->num_pg,
+ NULL, audio_lang);
+ }
+ }
 }
 }
 
-
 static void _update_chapter_psr(BLURAY *bd)
 {
- uint32_t current_chapter = bd_get_current_chapter(bd);
- bd->next_chapter_start = bd_chapter_pos(bd, current_chapter + 1);
- bd_psr_write(bd->regs, PSR_CHAPTER, current_chapter + 1);
+ uint32_t current_chapter = bd_get_current_chapter(bd);
+ bd_psr_write(bd->regs, PSR_CHAPTER, current_chapter + 1);
+}
+
+/*
+ * PG
+ */
+
+static int _find_pg_stream(BLURAY *bd, uint16_t *pid, int *sub_path_idx, unsigned *sub_clip_idx, uint8_t *char_code)
+{
+ MPLS_PI *pi = &bd->title->pl->play_item[0];
+ unsigned pg_stream = bd_psr_read(bd->regs, PSR_PG_STREAM);
+
+#if 0
+ /* Enable decoder unconditionally (required for forced subtitles).
+ Display flag is checked in graphics controller. */
+ /* check PG display flag from PSR */
+ if (!(pg_stream & 0x80000000)) {
+ return 0;
+ }
+#endif
+
+ pg_stream &= 0xfff;
+
+ if (pg_stream > 0 && pg_stream <= pi->stn.num_pg) {
+ pg_stream--; /* stream number to table index */
+ if (pi->stn.pg[pg_stream].stream_type == 2) {
+ *sub_path_idx = pi->stn.pg[pg_stream].subpath_id;
+ *sub_clip_idx = pi->stn.pg[pg_stream].subclip_id;
+ }
+ *pid = pi->stn.pg[pg_stream].pid;
+
+ if (char_code && pi->stn.pg[pg_stream].coding_type == BLURAY_STREAM_TYPE_SUB_TEXT) {
+ *char_code = pi->stn.pg[pg_stream].char_code;
+ }
+
+ BD_DEBUG(DBG_BLURAY, "_find_pg_stream(): current PG stream pid 0x%04x sub-path %d\n",
+ *pid, *sub_path_idx);
+ return 1;
+ }
+
+ return 0;
+}
+
+static int _init_pg_stream(BLURAY *bd)
+{
+ int pg_subpath = -1;
+ unsigned pg_subclip = 0;
+ uint16_t pg_pid = 0;
+
+ bd->st0.pg_pid = 0;
+
+ if (!bd->graphics_controller) {
+ return 0;
+ }
+
+ /* reset PG decoder and controller */
+ gc_run(bd->graphics_controller, GC_CTRL_PG_RESET, 0, NULL);
+
+ if (!bd->decode_pg || !bd->title) {
+ return 0;
+ }
+
+ _find_pg_stream(bd, &pg_pid, &pg_subpath, &pg_subclip, NULL);
+
+ /* store PID of main path embedded PG stream */
+ if (pg_subpath < 0) {
+ bd->st0.pg_pid = pg_pid;
+ return !!pg_pid;
+ }
+
+ return 0;
+}
+
+static void _update_textst_timer(BLURAY *bd)
+{
+ if (bd->st_textst.clip) {
+ if (bd->st0.clip_block_pos >= bd->gc_wakeup_pos) {
+ GC_NAV_CMDS cmds = {-1, NULL, -1, 0, 0};
+
+ gc_run(bd->graphics_controller, GC_CTRL_PG_UPDATE, bd->gc_wakeup_time, &cmds);
+
+ bd->gc_wakeup_time = cmds.wakeup_time;
+ bd->gc_wakeup_pos = (uint64_t)(int64_t)-1; /* no wakeup */
+
+ /* next event in this clip ? */
+ if (cmds.wakeup_time >= bd->st0.clip->in_time && cmds.wakeup_time < bd->st0.clip->out_time) {
+ /* find event position in main path clip */
+ NAV_CLIP *clip = bd->st0.clip;
+ uint32_t spn = clpi_lookup_spn(clip->cl, cmds.wakeup_time, /*before=*/1,
+ bd->title->pl->play_item[clip->ref].clip[clip->angle].stc_id);
+ if (spn) {
+ bd->gc_wakeup_pos = spn * 192;
+ }
+ }
+ }
+ }
+}
+
+static void _init_textst_timer(BLURAY *bd)
+{
+ if (bd->st_textst.clip) {
+ uint32_t clip_time;
+ clpi_access_point(bd->st0.clip->cl, bd->st0.clip_block_pos/192, /*next=*/0, /*angle_change=*/0, &clip_time);
+ bd->gc_wakeup_time = clip_time;
+ bd->gc_wakeup_pos = 0;
+ _update_textst_timer(bd);
+ }
 }
 
 /*
@@ -351,6 +507,10 @@
 st->fp = NULL;
 }
 
+ m2ts_filter_close(&st->m2ts_filter);
+
+ libbdplus_m2ts_close(&st->bdplus);
+
 /* reset UO mask */
 memset(&st->uo_mask, 0, sizeof(st->uo_mask));
 }
@@ -363,96 +523,104 @@
 
 f_name = str_printf("%s" DIR_SEP "BDMV" DIR_SEP "STREAM" DIR_SEP "%s",
 bd->device_path, st->clip->name);
+ st->fp = file_open(f_name, "rb");
+ X_FREE(f_name);
 
+ st->clip_size = 0;
 st->clip_pos = (uint64_t)st->clip->start_pkt * 192;
 st->clip_block_pos = (st->clip_pos / 6144) * 6144;
 
- if ((st->fp = file_open(f_name, "rb"))) {
- file_seek(st->fp, 0, SEEK_END);
- if ((st->clip_size = file_tell(st->fp))) {
- file_seek(st->fp, st->clip_block_pos, SEEK_SET);
- st->int_buf_off = 6144;
- X_FREE(f_name);
+ if (st->fp) {
+ int64_t clip_size = file_size(st->fp);
+ if (clip_size > 0) {
 
- if (bd->bdplus) {
- DL_CALL(bd->h_libbdplus, bdplus_set_title,
- bd->bdplus, st->clip->clip_id);
+ if (file_seek(st->fp, st->clip_block_pos, SEEK_SET) < 0) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Unable to seek clip %s!\n", st->clip->name);
+ _close_m2ts(st);
+ return 0;
 }
 
- if (bd->aacs) {
- uint32_t title = bd_psr_read(bd->regs, PSR_TITLE_NUMBER);
- DL_CALL(bd->h_libaacs, aacs_select_title,
- bd->aacs, title);
- }
+ st->clip_size = clip_size;
+ st->int_buf_off = 6144;
+
+ libaacs_select_title(bd->libaacs, bd_psr_read(bd->regs, PSR_TITLE_NUMBER));
 
 if (st == &bd->st0) {
 MPLS_PL *pl = st->clip->title->pl;
+ MPLS_STN *stn = &pl->play_item[st->clip->ref].stn;
+
 st->uo_mask = bd_uo_mask_combine(pl->app_info.uo_mask,
 pl->play_item[st->clip->ref].uo_mask);
 
+ st->m2ts_filter = m2ts_filter_init((int64_t)st->clip->in_time << 1,
+ (int64_t)st->clip->out_time << 1,
+ stn->num_video, stn->num_audio);
+
 _update_clip_psrs(bd, st->clip);
+
+ _init_pg_stream(bd);
+
+ _init_textst_timer(bd);
 }
 
+ st->bdplus = libbdplus_m2ts(bd->libbdplus, st->clip->clip_id, st->clip_block_pos);
+
 return 1;
 }
 
- BD_DEBUG(DBG_BLURAY, "Clip %s empty! (%p)\n", f_name, bd);
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Clip %s empty!\n", st->clip->name);
+ _close_m2ts(st);
 }
 
- BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Unable to open clip %s! (%p)\n",
- f_name, bd);
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Unable to open clip %s!\n", st->clip->name);
 
- X_FREE(f_name);
 return 0;
 }
 
 static int _read_block(BLURAY *bd, BD_STREAM *st, uint8_t *buf)
 {
- const int len = 6144;
+ const size_t len = 6144;
 
 if (st->fp) {
- BD_DEBUG(DBG_STREAM, "Reading unit [%d bytes] at %"PRIu64"... (%p)\n",
- len, st->clip_block_pos, bd);
+ BD_DEBUG(DBG_STREAM, "Reading unit at %"PRIu64"...\n", st->clip_block_pos);
 
 if (len + st->clip_block_pos <= st->clip_size) {
- int read_len;
+ size_t read_len;
 
 if ((read_len = file_read(st->fp, buf, len))) {
- if (read_len != len)
- BD_DEBUG(DBG_STREAM | DBG_CRIT, "Read %d bytes at %"PRIu64" ; requested %d ! (%p)\n", read_len, st->clip_block_pos, len, bd);
-
- if (bd->aacs && bd->libaacs_decrypt_unit) {
- if (!bd->libaacs_decrypt_unit(bd->aacs, buf)) {
- BD_DEBUG(DBG_AACS | DBG_CRIT, "Unable decrypt unit (AACS)! (%p)\n", bd);
-
- return -1;
- } // decrypt
- } // aacs
+ if (read_len != len) {
+ BD_DEBUG(DBG_STREAM | DBG_CRIT, "Read %d bytes at %"PRIu64" ; requested %d !\n", (int)read_len, st->clip_block_pos, (int)len);
+ }
+ if (bd->libaacs && libaacs_decrypt_unit(bd->libaacs, buf)) {
+ _queue_event(bd, BD_EVENT_ENCRYPTED, BD_ERROR_AACS);
+ return -1;
+ }
+ if (st->bdplus && (libbdplus_fixup(st->bdplus, buf, len) < 0)) {
+ _queue_event(bd, BD_EVENT_ENCRYPTED, BD_ERROR_BDPLUS);
+ }
 
 st->clip_block_pos += len;
 
- // bdplus fixup, if required.
- if (bd->bdplus_fixup && bd->bdplus) {
- int32_t numFixes;
- numFixes = bd->bdplus_fixup(bd->bdplus, len, buf);
-#if 1
- if (numFixes) {
- BD_DEBUG(DBG_BDPLUS,
- "BDPLUS did %u fixups\n", numFixes);
+ /* Check TP_extra_header Copy_permission_indicator. If != 0, unit is still encrypted. */
+ if (buf[0] & 0xc0) {
+ /* check first TS sync bytes */
+ if (buf[4] != 0x47 || buf[4+192] != 0x47 || buf[4+2*192] != 0x47) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT,
+ "TP header copy permission indicator != 0, unit is still encrypted?\n");
+ _queue_event(bd, BD_EVENT_ENCRYPTED, BD_ERROR_AACS);
+ return -1;
 }
-#endif
-
 }
 
- /* Check TP_extra_header Copy_permission_indicator. If != 0, unit is still encrypted. */
- if (buf[0] & 0xc0) {
- BD_DEBUG(DBG_BLURAY | DBG_CRIT,
- "TP header copy permission indicator != 0, unit is still encrypted? (%p)\n", bd);
- _queue_event(bd, (BD_EVENT){BD_EVENT_ENCRYPTED, 0});
- return -1;
+ if (st->m2ts_filter) {
+ int result = m2ts_filter(st->m2ts_filter, buf);
+ if (result < 0) {
+ m2ts_filter_close(&st->m2ts_filter);
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "m2ts filter error\n");
+ }
 }
 
- BD_DEBUG(DBG_STREAM, "Read unit OK! (%p)\n", bd);
+ BD_DEBUG(DBG_STREAM, "Read unit OK!\n");
 
 #ifdef BLURAY_READ_ERROR_TEST
 /* simulate broken blocks */
@@ -462,19 +630,22 @@
 #endif
 }
 
- BD_DEBUG(DBG_STREAM | DBG_CRIT, "Read %d bytes at %"PRIu64" failed ! (%p)\n", len, st->clip_block_pos, bd);
+ BD_DEBUG(DBG_STREAM | DBG_CRIT, "Read unit at %"PRIu64" failed !\n", st->clip_block_pos);
 
- _queue_event(bd, (BD_EVENT){BD_EVENT_READ_ERROR, 0});
+ _queue_event(bd, BD_EVENT_READ_ERROR, 0);
 
 /* skip broken unit */
 st->clip_block_pos += len;
 st->clip_pos += len;
- file_seek(st->fp, st->clip_block_pos, SEEK_SET);
+
+ if (file_seek(st->fp, st->clip_block_pos, SEEK_SET) < 0) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Unable to seek clip %s!\n", st->clip->name);
+ }
 
 return 0;
 }
 
- BD_DEBUG(DBG_STREAM | DBG_CRIT, "Read past EOF ! (%p)\n", bd);
+ BD_DEBUG(DBG_STREAM | DBG_CRIT, "Read past EOF !\n");
 
 /* This is caused by truncated .m2ts file or invalid clip length.
 *
@@ -487,7 +658,7 @@
 return 0;
 }
 
- BD_DEBUG(DBG_BLURAY, "No valid title selected! (%p)\n", bd);
+ BD_DEBUG(DBG_BLURAY, "No valid title selected!\n");
 
 return -1;
 }
@@ -502,6 +673,8 @@
 memset(p, 0, sizeof(*p));
 }
 
+#define PRELOAD_SIZE_LIMIT (512*1024*1024) /* do not preload clips larger than 512M */
+
 static int _preload_m2ts(BLURAY *bd, BD_PRELOAD *p)
 {
 /* setup and open BD_STREAM */
@@ -511,12 +684,17 @@
 memset(&st, 0, sizeof(st));
 st.clip = p->clip;
 
+ if (st.clip_size > PRELOAD_SIZE_LIMIT) {
+ BD_DEBUG(DBG_BLURAY|DBG_CRIT, "_preload_m2ts(): too large clip (%"PRId64")\n", st.clip_size);
+ return 0;
+ }
+
 if (!_open_m2ts(bd, &st)) {
 return 0;
 }
 
 /* allocate buffer */
- p->clip_size = st.clip_size;
+ p->clip_size = (size_t)st.clip_size;
 p->buf = realloc(p->buf, p->clip_size);
 
 /* read clip to buffer */
@@ -558,10 +736,16 @@
 }
 }
 
+ if (st->m2ts_filter) {
+ m2ts_filter_seek(st->m2ts_filter, 0, (int64_t)st->clip->in_time << 1);
+ }
+
 st->clip_pos = (uint64_t)clip_pkt * 192;
 st->clip_block_pos = (st->clip_pos / 6144) * 6144;
 
- file_seek(st->fp, st->clip_block_pos, SEEK_SET);
+ if (file_seek(st->fp, st->clip_block_pos, SEEK_SET) < 0) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Unable to seek clip %s!\n", st->clip->name);
+ }
 
 st->int_buf_off = 6144;
 
@@ -577,7 +761,7 @@
 int result = -1;
 
 if (bd && bd->graphics_controller && bd->hdmv_vm) {
- GC_NAV_CMDS cmds = {-1, NULL, -1, 0};
+ GC_NAV_CMDS cmds = {-1, NULL, -1, 0, 0};
 
 result = gc_run(bd->graphics_controller, msg, param, &cmds);
 
@@ -590,23 +774,23 @@
 uint32_t changed_flags = cmds.status ^ bd->gc_status;
 bd->gc_status = cmds.status;
 if (changed_flags & GC_STATUS_MENU_OPEN) {
- _queue_event(bd, (BD_EVENT){BD_EVENT_MENU, !!(bd->gc_status & GC_STATUS_MENU_OPEN)});
+ _queue_event(bd, BD_EVENT_MENU, !!(bd->gc_status & GC_STATUS_MENU_OPEN));
 }
 if (changed_flags & GC_STATUS_POPUP) {
- _queue_event(bd, (BD_EVENT){BD_EVENT_POPUP, !!(bd->gc_status & GC_STATUS_POPUP)});
+ _queue_event(bd, BD_EVENT_POPUP, !!(bd->gc_status & GC_STATUS_POPUP));
 }
 }
 
 if (cmds.sound_id_ref >= 0 && cmds.sound_id_ref < 0xff) {
- _queue_event(bd, (BD_EVENT){BD_EVENT_SOUND_EFFECT, cmds.sound_id_ref});
+ _queue_event(bd, BD_EVENT_SOUND_EFFECT, cmds.sound_id_ref);
 }
 
 } else {
 if (bd->gc_status & GC_STATUS_MENU_OPEN) {
- _queue_event(bd, (BD_EVENT){BD_EVENT_MENU, 0});
+ _queue_event(bd, BD_EVENT_MENU, 0);
 }
 if (bd->gc_status & GC_STATUS_POPUP) {
- _queue_event(bd, (BD_EVENT){BD_EVENT_POPUP, 0});
+ _queue_event(bd, BD_EVENT_POPUP, 0);
 }
 bd->gc_status = GC_STATUS_NONE;
 }
@@ -618,285 +802,96 @@
 * libaacs and libbdplus open / close
 */
 
-static void _libaacs_close(BLURAY *bd)
+static int _libaacs_init(BLURAY *bd, const char *keyfile_path)
 {
- if (bd->aacs) {
- DL_CALL(bd->h_libaacs, aacs_close, bd->aacs);
- bd->aacs = NULL;
- }
-}
-
-static void _libaacs_unload(BLURAY *bd)
-{
- _libaacs_close(bd);
-
- if (bd->h_libaacs) {
- dl_dlclose(bd->h_libaacs);
- bd->h_libaacs = NULL;
- }
-
- bd->libaacs_open = NULL;
- bd->libaacs_decrypt_unit = NULL;
-}
-
-static int _libaacs_required(BLURAY *bd)
-{
- BD_FILE_H *fd;
- char *tmp;
-
- tmp = str_printf("%s/AACS/Unit_Key_RO.inf", bd->device_path);
- fd = file_open(tmp, "rb");
- X_FREE(tmp);
-
- if (fd) {
- file_close(fd);
-
- BD_DEBUG(DBG_BLURAY, "AACS/Unit_Key_RO.inf found. Disc seems to be AACS protected (%p)\n", bd);
- bd->disc_info.aacs_detected = 1;
- return 1;
- }
-
- BD_DEBUG(DBG_BLURAY, "AACS/Unit_Key_RO.inf not found. No AACS protection (%p)\n", bd);
- bd->disc_info.aacs_detected = 0;
- return 0;
-}
-
-static int _libaacs_load(BLURAY *bd)
-{
- if (bd->h_libaacs) {
- return 1;
- }
-
- bd->disc_info.libaacs_detected = 0;
- if ((bd->h_libaacs = dl_dlopen("libaacs", "0"))) {
-
- BD_DEBUG(DBG_BLURAY, "Loading libaacs (%p)\n", bd->h_libaacs);
-
- bd->libaacs_open = (fptr_p_void)dl_dlsym(bd->h_libaacs, "aacs_open");
- bd->libaacs_decrypt_unit = (fptr_int)dl_dlsym(bd->h_libaacs, "aacs_decrypt_unit");
-
- if (bd->libaacs_open && bd->libaacs_decrypt_unit) {
- BD_DEBUG(DBG_BLURAY, "Loaded libaacs (%p)\n", bd->h_libaacs);
- bd->disc_info.libaacs_detected = 1;
-
- if (file_open != file_open_default()) {
- BD_DEBUG(DBG_BLURAY, "Registering libaacs filesystem handler %p (%p)\n", file_open, bd->h_libaacs);
- DL_CALL(bd->h_libaacs, aacs_register_file, file_open);
- }
-
- return 1;
-
- } else {
- BD_DEBUG(DBG_BLURAY, "libaacs dlsym failed! (%p)\n", bd->h_libaacs);
- }
-
- } else {
- BD_DEBUG(DBG_BLURAY, "libaacs not found! (%p)\n", bd);
- }
-
- _libaacs_unload(bd);
-
- return 0;
-}
+ int result;
+ const uint8_t *disc_id;
 
-static int _libaacs_open(BLURAY *bd, const char *keyfile_path)
-{
- _libaacs_close(bd);
+ libaacs_unload(&bd->libaacs);
 
- if (!_libaacs_required(bd)) {
+ bd->disc_info.aacs_detected = libaacs_required(bd->device_path);
+ if (!bd->disc_info.aacs_detected) {
 /* no AACS */
 return 1; /* no error if libaacs is not needed */
 }
 
- if (!_libaacs_load(bd)) {
+ bd->libaacs = libaacs_load();
+ bd->disc_info.libaacs_detected = !!bd->libaacs;
+ if (!bd->libaacs) {
 /* no libaacs */
 return 0;
 }
 
- int error_code = 0;
- fptr_p_void aacs_open2 = (fptr_p_void)dl_dlsym(bd->h_libaacs, "aacs_open2");
- if (!aacs_open2) {
- BD_DEBUG(DBG_BLURAY, "Using old aacs_open(), no verbose error reporting available (%p)\n", bd->aacs);
- bd->aacs = bd->libaacs_open(bd->device_path, keyfile_path);
- } else {
- bd->aacs = aacs_open2(bd->device_path, keyfile_path, &error_code);
- }
+ result = libaacs_open(bd->libaacs, bd->device_path, keyfile_path);
 
- if (bd->aacs) {
- fptr_int aacs_get_mkb_version = (fptr_int) dl_dlsym(bd->h_libaacs, "aacs_get_mkb_version");
- fptr_p_void aacs_get_disc_id = (fptr_p_void) dl_dlsym(bd->h_libaacs, "aacs_get_disc_id");
- if (aacs_get_mkb_version) {
- bd->disc_info.aacs_mkbv = aacs_get_mkb_version(bd->aacs);
- }
- if (aacs_get_disc_id) {
- memcpy(bd->disc_info.disc_id, aacs_get_disc_id(bd->aacs), 20);
- }
-
- if (!error_code) {
- BD_DEBUG(DBG_BLURAY, "Opened libaacs (%p)\n", bd->aacs);
- bd->disc_info.aacs_handled = 1;
- return 1;
- }
+ bd->disc_info.aacs_error_code = result;
+ bd->disc_info.aacs_handled = !result;
+ bd->disc_info.aacs_mkbv = libaacs_get_mkbv(bd->libaacs);
+ disc_id = libaacs_get_aacs_data(bd->libaacs, BD_AACS_DISC_ID);
+ if (disc_id) {
+ memcpy(bd->disc_info.disc_id, disc_id, 20);
 }
 
- BD_DEBUG(DBG_BLURAY, "aacs_open() failed!\n");
- bd->disc_info.aacs_handled = 0;
-
- switch (error_code) {
- case 0: /* AACS_SUCCESS */
- break;
- case -1: /* AACS_ERROR_CORRUPTED_DISC */
- bd->disc_info.aacs_error_code = BD_AACS_CORRUPTED_DISC;
- break;
- case -2: /* AACS_ERROR_NO_CONFIG */
- bd->disc_info.aacs_error_code = BD_AACS_NO_CONFIG;
- break;
- case -3: /* AACS_ERROR_NO_PK */
- bd->disc_info.aacs_error_code = BD_AACS_NO_PK;
- break;
- case -4: /* AACS_ERROR_NO_CERT */
- bd->disc_info.aacs_error_code = BD_AACS_NO_CERT;
- break;
- case -5: /* AACS_ERROR_CERT_REVOKED */
- bd->disc_info.aacs_error_code = BD_AACS_CERT_REVOKED;
- break;
- case -6: /* AACS_ERROR_MMC_OPEN */
- case -7: /* AACS_ERROR_MMC_FAILURE */
- bd->disc_info.aacs_error_code = BD_AACS_MMC_FAILED;
- break;
- }
-
- _libaacs_unload(bd);
- return 0;
-}
-
-static uint8_t *_libaacs_get_vid(BLURAY *bd)
-{
- if (bd->aacs) {
- fptr_p_void fptr = (fptr_p_void)dl_dlsym(bd->h_libaacs, "aacs_get_vid");
- if (fptr) {
- return (uint8_t*)fptr(bd->aacs);
- }
- BD_DEBUG(DBG_BLURAY, "aacs_get_vid() dlsym failed! (%p)", bd);
- return NULL;
+ if (result) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "aacs_open() failed!\n");
+ libaacs_unload(&bd->libaacs);
+ return 0;
 }
 
- BD_DEBUG(DBG_BLURAY, "_libaacs_get_vid(): libaacs not initialized! (%p)", bd);
- return NULL;
-}
-
-static void _libbdplus_close(BLURAY *bd)
-{
- if (bd->bdplus) {
- DL_CALL(bd->h_libbdplus, bdplus_free, bd->bdplus);
- bd->bdplus = NULL;
- }
+ BD_DEBUG(DBG_BLURAY, "Opened libaacs\n");
+ return 1;
 }
 
-static void _libbdplus_unload(BLURAY *bd)
+const uint8_t *bd_get_aacs_data(BLURAY *bd, int type)
 {
- _libbdplus_close(bd);
-
- if (bd->h_libbdplus) {
- dl_dlclose(bd->h_libbdplus);
- bd->h_libbdplus = NULL;
- }
-
- bd->bdplus_init = NULL;
- bd->bdplus_seek = NULL;
- bd->bdplus_fixup = NULL;
+ /* internal function. Used by BD-J and libbdplus loader. */
+ return libaacs_get_aacs_data(bd->libaacs, type);
 }
 
-static int _libbdplus_required(BLURAY *bd)
+static int _libbdplus_init(BLURAY *bd)
 {
- BD_FILE_H *fd;
- char *tmp;
-
- tmp = str_printf("%s/BDSVM/00000.svm", bd->device_path);
- fd = file_open(tmp, "rb");
- X_FREE(tmp);
+ libbdplus_unload(&bd->libbdplus);
 
- if (fd) {
- file_close(fd);
-
- BD_DEBUG(DBG_BLURAY, "BDSVM/00000.svm found. Disc seems to be BD+ protected (%p)\n", bd);
- bd->disc_info.bdplus_detected = 1;
- return 1;
+ bd->disc_info.bdplus_detected = libbdplus_required(bd->device_path);
+ if (!bd->disc_info.bdplus_detected) {
+ return 0;
 }
 
- BD_DEBUG(DBG_BLURAY, "BDSVM/00000.svm not found. No BD+ protection (%p)\n", bd);
- bd->disc_info.bdplus_detected = 0;
- return 0;
-}
-
-static int _libbdplus_load(BLURAY *bd)
-{
- BD_DEBUG(DBG_BDPLUS, "attempting to load libbdplus\n");
-
- if (bd->h_libbdplus) {
- return 1;
+ bd->libbdplus = libbdplus_load();
+ bd->disc_info.libbdplus_detected = !!bd->libbdplus;
+ if (!bd->libbdplus) {
+ return 0;
 }
 
- bd->disc_info.libbdplus_detected = 0;
- if ((bd->h_libbdplus = dl_dlopen("libbdplus", "0"))) {
-
- BD_DEBUG(DBG_BLURAY, "Loading libbdplus (%p)\n", bd->h_libbdplus);
-
- bd->bdplus_init = (fptr_p_void)dl_dlsym(bd->h_libbdplus, "bdplus_init");
- bd->bdplus_seek = (fptr_int32)dl_dlsym(bd->h_libbdplus, "bdplus_seek");
- bd->bdplus_fixup = (fptr_int32)dl_dlsym(bd->h_libbdplus, "bdplus_fixup");
-
- if (bd->bdplus_init && bd->bdplus_seek && bd->bdplus_fixup) {
- BD_DEBUG(DBG_BLURAY, "Loaded libbdplus (%p)\n", bd->h_libbdplus);
- bd->disc_info.libbdplus_detected = 1;
- return 1;
- }
-
- BD_DEBUG(DBG_BLURAY, "libbdplus dlsym failed! (%p)\n", bd->h_libbdplus);
-
- } else {
- BD_DEBUG(DBG_BLURAY, "libbdplus not found! (%p)\n", bd);
+ const uint8_t *vid = libaacs_get_aacs_data(bd->libaacs, BD_AACS_MEDIA_VID);
+ const uint8_t *mk = libaacs_get_aacs_data(bd->libaacs, BD_AACS_MEDIA_KEY);
+ if (!vid) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "BD+ initialization failed (no AACS ?)\n");
+ libaacs_unload(&bd->libaacs);
+ return 0;
 }
 
- _libbdplus_unload(bd);
-
- return 0;
-}
-
-static int _libbdplus_open(BLURAY *bd, const char *keyfile_path)
-{
- // Take a quick stab to see if we want/need bdplus
- // we should fix this, and add various string functions.
- uint8_t vid[16] = {
- 0xC5,0x43,0xEF,0x2A,0x15,0x0E,0x50,0xC4,0xE2,0xCA,
- 0x71,0x65,0xB1,0x7C,0xA7,0xCB}; // FIXME
-
- _libbdplus_close(bd);
+ if (libbdplus_init(bd->libbdplus, bd->device_path, vid, mk)) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "bdplus_init() failed\n");
 
- if (!_libbdplus_required(bd)) {
- /* no BD+ */
- return 1; /* no error if libbdplus is not needed */
- }
-
- if (!_libbdplus_load(bd)) {
- /* no libbdplus */
+ bd->disc_info.bdplus_handled = 0;
+ libbdplus_unload(&bd->libbdplus);
 return 0;
 }
 
- const uint8_t *aacs_vid = (const uint8_t *)_libaacs_get_vid(bd);
- bd->bdplus = bd->bdplus_init(bd->device_path, keyfile_path, aacs_vid ? aacs_vid : vid);
+ BD_DEBUG(DBG_BLURAY, "libbdplus initialized\n");
 
- if (bd->bdplus) {
- BD_DEBUG(DBG_BLURAY,"libbdplus initialized\n");
- bd->disc_info.bdplus_handled = 1;
- return 1;
- }
+ /* map player memory regions */
+ libbdplus_mmap(bd->libbdplus, 0, (void*)bd->regs);
+ libbdplus_mmap(bd->libbdplus, 1, (void*)((uint8_t *)bd->regs + sizeof(uint32_t) * 128));
 
- BD_DEBUG(DBG_BLURAY,"bdplus_init() failed\n");
- bd->disc_info.bdplus_handled = 0;
+ /* connect registers */
+ libbdplus_psr(bd->libbdplus, (void*)bd->regs, (void*)bd_psr_read, (void*)bd_psr_write);
 
- _libbdplus_unload(bd);
- return 0;
+ bd->disc_info.bdplus_gen = libbdplus_get_gen(bd->libbdplus);
+ bd->disc_info.bdplus_date = libbdplus_get_date(bd->libbdplus);
+ bd->disc_info.bdplus_handled = 1;
+ return 1;
 }
 
 /*
@@ -928,6 +923,7 @@
 
 return !!bd->meta;
 }
+
 /*
 * disc info
 */
@@ -946,12 +942,51 @@
 bd->disc_info.num_bdj_titles = 0;
 bd->disc_info.num_unsupported_titles = 0;
 
+ bd->disc_info.bdj_detected = 0;
+ bd->disc_info.bdj_supported = 0;
+ bd->disc_info.libjvm_detected = 0;
+ bd->disc_info.bdj_handled = 0;
+
 if (bd->index) {
 INDX_PLAY_ITEM *pi;
 unsigned ii;
 
 bd->disc_info.bluray_detected = 1;
 
+ /* count titles */
+
+ for (ii = 0; ii < bd->index->num_titles; ii++) {
+ if (bd->index->titles[ii].object_type == indx_object_type_hdmv) {
+ bd->disc_info.num_hdmv_titles++;
+ }
+ if (bd->index->titles[ii].object_type == indx_object_type_bdj) {
+ bd->disc_info.num_bdj_titles++;
+ bd->disc_info.num_unsupported_titles++;
+ bd->disc_info.bdj_detected = 1;
+ }
+ }
+
+ if (bd->index->first_play.object_type == indx_object_type_bdj) {
+ bd->disc_info.bdj_detected = 1;
+ }
+ if (bd->index->top_menu.object_type == indx_object_type_bdj) {
+ bd->disc_info.bdj_detected = 1;
+ }
+
+ /* BD-J capability */
+
+#ifdef USING_BDJAVA
+ if (bd->disc_info.bdj_detected) {
+ bd->disc_info.bdj_supported = 1;
+ /* BD-J titles found. Check if jvm + jar can be loaded ? */
+ switch (bdj_jvm_available()) {
+ case 2: bd->disc_info.bdj_handled = 1;
+ case 1: bd->disc_info.libjvm_detected = 1;
+ default:;
+ }
+ }
+#endif /* USING_BDJAVA */
+
 pi = &bd->index->first_play;
 if (pi->object_type == indx_object_type_hdmv && pi->hdmv.id_ref != 0xffff) {
 bd->disc_info.first_play_supported = 1;
@@ -961,18 +996,187 @@
 if (pi->object_type == indx_object_type_hdmv && pi->hdmv.id_ref != 0xffff) {
 bd->disc_info.top_menu_supported = 1;
 }
+ }
+}
 
- for (ii = 0; ii < bd->index->num_titles; ii++) {
- if (bd->index->titles[ii].object_type == indx_object_type_hdmv) {
- bd->disc_info.num_hdmv_titles++;
- }
- if (bd->index->titles[ii].object_type == indx_object_type_bdj) {
- bd->disc_info.num_bdj_titles++;
- bd->disc_info.num_unsupported_titles++;
- }
+/*
+ * bdj
+ */
+
+#ifdef USING_BDJAVA
+uint64_t bd_get_uo_mask(BLURAY *bd)
+{
+ /* internal function. Used by BD-J. */
+ union {
+ uint64_t u64;
+ BD_UO_MASK mask;
+ } mask = {0};
+
+ //bd_mutex_lock(&bd->mutex);
+ memcpy(&mask.mask, &bd->st0.uo_mask, sizeof(BD_UO_MASK));
+ //bd_mutex_unlock(&bd->mutex);
+
+ return mask.u64;
+}
+#endif
+
+#ifdef USING_BDJAVA
+uint32_t bd_reg_read(BLURAY *bd, int psr, int reg)
+{
+ if (psr) {
+ return bd_psr_read(bd->regs, reg);
+ } else {
+ return bd_gpr_read(bd->regs, reg);
+ }
+}
+#endif
+
+#ifdef USING_BDJAVA
+int bd_reg_write(BLURAY *bd, int psr, int reg, uint32_t value)
+{
+ if (psr) {
+ if (psr < 102) {
+ /* avoid deadlocks (psr_write triggers callbacks that may lock this mutex) */
+ bd_mutex_lock(&bd->mutex);
+ }
+ int res = bd_psr_write(bd->regs, reg, value);
+ if (psr < 102) {
+ bd_mutex_unlock(&bd->mutex);
 }
+ return res;
+ } else {
+ return bd_gpr_write(bd->regs, reg, value);
 }
 }
+#endif
+
+#ifdef USING_BDJAVA
+/*
+ * handle graphics updates from BD-J layer
+ */
+static void _bdj_osd_cb(BLURAY *bd, const unsigned *img, int w, int h,
+ int x0, int y0, int x1, int y1)
+{
+ BD_ARGB_OVERLAY aov;
+
+ if (!bd || !bd->argb_overlay_proc) {
+ _queue_event(bd, BD_EVENT_MENU, 0);
+ return;
+ }
+
+ memset(&aov, 0, sizeof(aov));
+ aov.pts = -1;
+ aov.plane = BD_OVERLAY_IG;
+
+ /* no image data -> init or close */
+ if (!img) {
+ if (w > 0 && h > 0) {
+ aov.cmd = BD_ARGB_OVERLAY_INIT;
+ aov.w = w;
+ aov.h = h;
+ _queue_event(bd, BD_EVENT_MENU, 1);
+ } else {
+ aov.cmd = BD_ARGB_OVERLAY_CLOSE;
+ _queue_event(bd, BD_EVENT_MENU, 0);
+ }
+
+ bd->argb_overlay_proc(bd->argb_overlay_proc_handle, &aov);
+ return;
+ }
+
+ /* no changed pixels ? */
+ if (x1 < x0 || y1 < y0) {
+ return;
+ }
+
+ /* pass only changed region */
+ if (bd->argb_buffer && (bd->argb_buffer->width < w || bd->argb_buffer->height < h)) {
+ aov.argb = img;
+ } else {
+ aov.argb = img + x0 + y0 * w;
+ }
+ aov.stride = w;
+ aov.x = x0;
+ aov.y = y0;
+ aov.w = x1 - x0 + 1;
+ aov.h = y1 - y0 + 1;
+
+ if (bd->argb_buffer) {
+ /* set dirty region */
+ bd->argb_buffer->dirty[BD_OVERLAY_IG].x0 = x0;
+ bd->argb_buffer->dirty[BD_OVERLAY_IG].x1 = x1;
+ bd->argb_buffer->dirty[BD_OVERLAY_IG].y0 = y0;
+ bd->argb_buffer->dirty[BD_OVERLAY_IG].y1 = y1;
+ }
+
+ /* draw */
+ aov.cmd = BD_ARGB_OVERLAY_DRAW;
+ bd->argb_overlay_proc(bd->argb_overlay_proc_handle, &aov);
+
+ /* commit changes */
+ aov.cmd = BD_ARGB_OVERLAY_FLUSH;
+ bd->argb_overlay_proc(bd->argb_overlay_proc_handle, &aov);
+
+ if (bd->argb_buffer) {
+ /* reset dirty region */
+ bd->argb_buffer->dirty[BD_OVERLAY_IG].x0 = bd->argb_buffer->width;
+ bd->argb_buffer->dirty[BD_OVERLAY_IG].x1 = bd->argb_buffer->height;
+ bd->argb_buffer->dirty[BD_OVERLAY_IG].y0 = 0;
+ bd->argb_buffer->dirty[BD_OVERLAY_IG].y1 = 0;
+ }
+}
+#endif
+
+static int _start_bdj(BLURAY *bd, unsigned title)
+{
+#ifdef USING_BDJAVA
+ if (bd->bdjava == NULL) {
+ bd->bdjava = bdj_open(bd->device_path, bd, bd->index, _bdj_osd_cb, bd->argb_buffer);
+ if (!bd->bdjava) {
+ return 0;
+ }
+ }
+ return bdj_start(bd->bdjava, title);
+#else
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Title %d: BD-J not compiled in\n", title);
+ return 0;
+#endif
+}
+
+#ifdef USING_BDJAVA
+static int _bdj_event(BLURAY *bd, unsigned ev, unsigned param)
+{
+ if (bd->bdjava != NULL) {
+ return bdj_process_event(bd->bdjava, ev, param);
+ }
+ return -1;
+}
+#else
+#define _bdj_event(bd, ev, param) (bd=bd, -1)
+#endif
+
+#ifdef USING_BDJAVA
+static void _stop_bdj(BLURAY *bd)
+{
+ if (bd->bdjava != NULL) {
+ bdj_stop(bd->bdjava);
+ }
+}
+#else
+#define _stop_bdj(bd) do{}while(0)
+#endif
+
+#ifdef USING_BDJAVA
+static void _close_bdj(BLURAY *bd)
+{
+ if (bd->bdjava != NULL) {
+ bdj_close(bd->bdjava);
+ bd->bdjava = NULL;
+ }
+}
+#else
+#define _close_bdj(bd) do{}while(0)
+#endif
 
 #ifdef HAVE_MNTENT_H
 /*
@@ -1003,7 +1207,7 @@
 #endif
 if (!strcmp (m->mnt_fsname, bd->device_path)) {
 free(bd->device_path);
- bd->device_path = strdup (m->mnt_dir);
+ bd->device_path = str_dup (m->mnt_dir);
 break;
 }
 }
@@ -1033,7 +1237,7 @@
 for ( int i = 0; i < fs_count; ++i) {
 if (!strcmp (mbuf[i].f_mntfromname, bd->device_path)) {
 free(bd->device_path);
- bd->device_path = strdup (mbuf[i].f_mntonname);
+ bd->device_path = str_dup (mbuf[i].f_mntonname);
 }
 }
 }
@@ -1059,37 +1263,40 @@
 return NULL;
 }
 
- bd->device_path = strdup(device_path);
+ bd->device_path = str_dup(device_path);
 
 #if (defined HAVE_MNTENT_H || defined __APPLE__)
 get_mount_point(bd);
 #endif
 
- _libaacs_open(bd, keyfile_path);
+ _libaacs_init(bd, keyfile_path);
 
- _libbdplus_open(bd, keyfile_path);
+ bd->regs = bd_registers_init();
 
- _index_open(bd);
+ _libbdplus_init(bd);
 
- bd->regs = bd_registers_init();
+ _index_open(bd);
 
 _fill_disc_info(bd);
 
- BD_DEBUG(DBG_BLURAY, "BLURAY initialized! (%p)\n", bd);
+ bd_mutex_init(&bd->mutex);
+
+ BD_DEBUG(DBG_BLURAY, "BLURAY initialized!\n");
 
 return bd;
 }
 
 void bd_close(BLURAY *bd)
 {
- bd_stop_bdj(bd);
-
- _libaacs_unload(bd);
+ _close_bdj(bd);
 
- _libbdplus_unload(bd);
+ libaacs_unload(&bd->libaacs);
 
 _close_m2ts(&bd->st0);
 _close_preload(&bd->st_ig);
+ _close_preload(&bd->st_textst);
+
+ libbdplus_unload(&bd->libbdplus);
 
 if (bd->title_list != NULL) {
 nav_free_title_list(bd->title_list);
@@ -1109,35 +1316,83 @@
 _free_event_queue(bd);
 X_FREE(bd->device_path);
 
- BD_DEBUG(DBG_BLURAY, "BLURAY destroyed! (%p)\n", bd);
+ bd_mutex_destroy(&bd->mutex);
+
+ BD_DEBUG(DBG_BLURAY, "BLURAY destroyed!\n");
 
 X_FREE(bd);
 }
 
 /*
+ * PlayMark tracking
+ */
+
+static void _find_next_playmark(BLURAY *bd)
+{
+ unsigned ii;
+
+ bd->next_mark = -1;
+ bd->next_mark_pos = (uint64_t)-1;
+ for (ii = 0; ii < bd->title->mark_list.count; ii++) {
+ uint64_t pos = (uint64_t)bd->title->mark_list.mark[ii].title_pkt * 192L;
+ if (pos > bd->s_pos) {
+ bd->next_mark = ii;
+ bd->next_mark_pos = pos;
+ return;
+ }
+ }
+
+ _update_chapter_psr(bd);
+}
+
+static void _playmark_reached(BLURAY *bd)
+{
+ BD_DEBUG(DBG_BLURAY, "PlayMark %d reached (%"PRIu64")\n", bd->next_mark, bd->next_mark_pos);
+
+ _queue_event(bd, BD_EVENT_PLAYMARK, bd->next_mark);
+ _bdj_event(bd, BDJ_EVENT_MARK, bd->next_mark);
+
+ /* update next mark */
+ bd->next_mark++;
+ if ((unsigned)bd->next_mark < bd->title->mark_list.count) {
+ bd->next_mark_pos = (uint64_t)bd->title->mark_list.mark[bd->next_mark].title_pkt * 192L;
+ } else {
+ bd->next_mark = -1;
+ bd->next_mark_pos = (uint64_t)-1;
+ }
+
+ /* chapter tracking */
+ _update_chapter_psr(bd);
+}
+
+/*
 * seeking and current position
 */
 
-static int64_t _seek_internal(BLURAY *bd,
- NAV_CLIP *clip, uint32_t title_pkt, uint32_t clip_pkt)
+static void _seek_internal(BLURAY *bd,
+ NAV_CLIP *clip, uint32_t title_pkt, uint32_t clip_pkt)
 {
 if (_seek_stream(bd, &bd->st0, clip, clip_pkt) >= 0) {
 
+ _queue_event(bd, BD_EVENT_SEEK, 0);
+
 /* update title position */
 bd->s_pos = (uint64_t)title_pkt * 192;
 
- /* chapter tracking */
- _update_chapter_psr(bd);
+ /* playmark tracking */
+ _find_next_playmark(bd);
 
- BD_DEBUG(DBG_BLURAY, "Seek to %"PRIu64" (%p)\n",
- bd->s_pos, bd);
+ /* reset PG decoder and controller */
+ if (bd->graphics_controller) {
+ gc_run(bd->graphics_controller, GC_CTRL_PG_RESET, 0, NULL);
 
- if (bd->bdplus_seek && bd->bdplus) {
- bd->bdplus_seek(bd->bdplus, bd->st0.clip_block_pos);
+ _init_textst_timer(bd);
 }
- }
 
- return bd->s_pos;
+ BD_DEBUG(DBG_BLURAY, "Seek to %"PRIu64"\n", bd->s_pos);
+
+ libbdplus_seek(bd->st0.bdplus, bd->st0.clip_block_pos);
+ }
 }
 
 /* _change_angle() should be used only before call to _seek_internal() ! */
@@ -1160,6 +1415,8 @@
 
 tick /= 2;
 
+ bd_mutex_lock(&bd->mutex);
+
 if (bd->title &&
 tick < bd->title->duration) {
 
@@ -1168,9 +1425,11 @@
 // Find the closest access unit to the requested position
 clip = nav_time_search(bd->title, tick, &clip_pkt, &out_pkt);
 
- return _seek_internal(bd, clip, out_pkt, clip_pkt);
+ _seek_internal(bd, clip, out_pkt, clip_pkt);
 }
 
+ bd_mutex_unlock(&bd->mutex);
+
 return bd->s_pos;
 }
 
@@ -1179,13 +1438,17 @@
 uint32_t clip_pkt = 0, out_pkt = 0, out_time = 0;
 NAV_CLIP *clip;
 
+ bd_mutex_lock(&bd->mutex);
+
 if (bd && bd->title) {
- clip = nav_packet_search(bd->title, bd->s_pos / 192, &clip_pkt, &out_pkt, &out_time);
+ clip = nav_packet_search(bd->title, SPN(bd->s_pos), &clip_pkt, &out_pkt, &out_time);
 if (clip) {
 out_time += clip->start_time;
 }
 }
 
+ bd_mutex_unlock(&bd->mutex);
+
 return ((uint64_t)out_time) * 2;
 }
 
@@ -1194,6 +1457,8 @@
 uint32_t clip_pkt, out_pkt;
 NAV_CLIP *clip;
 
+ bd_mutex_lock(&bd->mutex);
+
 if (bd->title &&
 chapter < bd->title->chap_list.count) {
 
@@ -1202,34 +1467,47 @@
 // Find the closest access unit to the requested position
 clip = nav_chapter_search(bd->title, chapter, &clip_pkt, &out_pkt);
 
- return _seek_internal(bd, clip, out_pkt, clip_pkt);
+ _seek_internal(bd, clip, out_pkt, clip_pkt);
 }
 
+ bd_mutex_unlock(&bd->mutex);
+
 return bd->s_pos;
 }
 
 int64_t bd_chapter_pos(BLURAY *bd, unsigned chapter)
 {
 uint32_t clip_pkt, out_pkt;
+ int64_t ret = -1;
+
+ bd_mutex_lock(&bd->mutex);
 
 if (bd->title &&
 chapter < bd->title->chap_list.count) {
 
 // Find the closest access unit to the requested position
 nav_chapter_search(bd->title, chapter, &clip_pkt, &out_pkt);
- return (int64_t)out_pkt * 192;
+ ret = (int64_t)out_pkt * 192;
 }
 
- return -1;
+ bd_mutex_unlock(&bd->mutex);
+
+ return ret;
 }
 
 uint32_t bd_get_current_chapter(BLURAY *bd)
 {
+ uint32_t ret = 0;
+
+ bd_mutex_lock(&bd->mutex);
+
 if (bd->title) {
- return nav_chapter_get_current(bd->st0.clip, bd->st0.clip_pos / 192);
+ ret = nav_chapter_get_current(bd->st0.clip, SPN(bd->st0.clip_pos));
 }
 
- return 0;
+ bd_mutex_unlock(&bd->mutex);
+
+ return ret;
 }
 
 int64_t bd_seek_playitem(BLURAY *bd, unsigned clip_ref)
@@ -1237,6 +1515,8 @@
 uint32_t clip_pkt, out_pkt;
 NAV_CLIP *clip;
 
+ bd_mutex_lock(&bd->mutex);
+
 if (bd->title &&
 clip_ref < bd->title->clip_list.count) {
 
@@ -1246,9 +1526,11 @@
 clip_pkt = clip->start_pkt;
 out_pkt = clip->pos;
 
- return _seek_internal(bd, clip, out_pkt, clip_pkt);
+ _seek_internal(bd, clip, out_pkt, clip_pkt);
 }
 
+ bd_mutex_unlock(&bd->mutex);
+
 return bd->s_pos;
 }
 
@@ -1257,6 +1539,8 @@
 uint32_t clip_pkt, out_pkt;
 NAV_CLIP *clip;
 
+ bd_mutex_lock(&bd->mutex);
+
 if (bd->title &&
 mark < bd->title->mark_list.count) {
 
@@ -1265,9 +1549,11 @@
 // Find the closest access unit to the requested position
 clip = nav_mark_search(bd->title, mark, &clip_pkt, &out_pkt);
 
- return _seek_internal(bd, clip, out_pkt, clip_pkt);
+ _seek_internal(bd, clip, out_pkt, clip_pkt);
 }
 
+ bd_mutex_unlock(&bd->mutex);
+
 return bd->s_pos;
 }
 
@@ -1276,40 +1562,61 @@
 uint32_t pkt, clip_pkt, out_pkt, out_time;
 NAV_CLIP *clip;
 
+ bd_mutex_lock(&bd->mutex);
+
 if (bd->title &&
 pos < (uint64_t)bd->title->packets * 192) {
 
- pkt = pos / 192;
+ pkt = SPN(pos);
 
 _change_angle(bd);
 
 // Find the closest access unit to the requested position
 clip = nav_packet_search(bd->title, pkt, &clip_pkt, &out_pkt, &out_time);
 
- return _seek_internal(bd, clip, out_pkt, clip_pkt);
+ _seek_internal(bd, clip, out_pkt, clip_pkt);
 }
 
+ bd_mutex_unlock(&bd->mutex);
+
 return bd->s_pos;
 }
 
 uint64_t bd_get_title_size(BLURAY *bd)
 {
+ uint64_t ret = 0;
+
+ bd_mutex_lock(&bd->mutex);
+
 if (bd && bd->title) {
- return (uint64_t)bd->title->packets * 192;
+ ret = (uint64_t)bd->title->packets * 192;
 }
- return UINT64_C(0);
+
+ bd_mutex_unlock(&bd->mutex);
+
+ return ret;
 }
 
 uint64_t bd_tell(BLURAY *bd)
 {
- return bd ? bd->s_pos : INT64_C(0);
+ uint64_t ret = 0;
+
+ bd_mutex_lock(&bd->mutex);
+
+ if (bd) {
+ ret = bd->s_pos;
+ }
+
+ bd_mutex_unlock(&bd->mutex);
+
+ return ret;
 }
 
 /*
 * read
 */
 
-static int64_t _clip_seek_time(BLURAY *bd, uint64_t tick)
+static int64_t _clip_seek_time(BLURAY *bd, uint32_t tick)
 {
 uint32_t clip_pkt, out_pkt;
 
@@ -1318,27 +1625,27 @@
 // Find the closest access unit to the requested position
 nav_clip_time_search(bd->st0.clip, tick, &clip_pkt, &out_pkt);
 
- return _seek_internal(bd, bd->st0.clip, out_pkt, clip_pkt);
+ _seek_internal(bd, bd->st0.clip, out_pkt, clip_pkt);
 }
 
 return bd->s_pos;
 }
 
-int bd_read(BLURAY *bd, unsigned char *buf, int len)
+static int _bd_read(BLURAY *bd, unsigned char *buf, int len)
 {
 BD_STREAM *st = &bd->st0;
 int out_len;
 
 if (st->fp) {
 out_len = 0;
- BD_DEBUG(DBG_STREAM, "Reading [%d bytes] at %"PRIu64"... (%p)\n", len, bd->s_pos, bd);
+ BD_DEBUG(DBG_STREAM, "Reading [%d bytes] at %"PRIu64"...\n", len, bd->s_pos);
 
 while (len > 0) {
 uint32_t clip_pkt;
 
 unsigned int size = len;
 // Do we need to read more data?
- clip_pkt = st->clip_pos / 192;
+ clip_pkt = SPN(st->clip_pos);
 if (bd->seamless_angle_change) {
 if (clip_pkt >= bd->angle_change_pkt) {
 if (clip_pkt >= st->clip->end_pkt) {
@@ -1365,7 +1672,8 @@
 if (st->clip == NULL) {
 // We previously reached the last clip. Nothing
 // else to read.
- _queue_event(bd, (BD_EVENT){BD_EVENT_END_OF_TITLE, 0});
+ _queue_event(bd, BD_EVENT_END_OF_TITLE, 0);
+ bd->bdj_end_of_playlist |= 1;
 return 0;
 }
 if (st->int_buf_off == 6144 || clip_pkt >= st->clip->end_pkt) {
@@ -1382,12 +1690,12 @@
 
 // handle still mode clips
 if (pi->still_mode == BLURAY_STILL_INFINITE) {
- _queue_event(bd, (BD_EVENT){BD_EVENT_STILL_TIME, 0});
+ _queue_event(bd, BD_EVENT_STILL_TIME, 0);
 return 0;
 }
 if (pi->still_mode == BLURAY_STILL_TIME) {
 if (bd->event_queue) {
- _queue_event(bd, (BD_EVENT){BD_EVENT_STILL_TIME, pi->still_time});
+ _queue_event(bd, BD_EVENT_STILL_TIME, pi->still_time);
 return 0;
 }
 }
@@ -1395,24 +1703,40 @@
 // find next clip
 st->clip = nav_next_clip(bd->title, st->clip);
 if (st->clip == NULL) {
- BD_DEBUG(DBG_BLURAY|DBG_STREAM, "End of title (%p)\n", bd);
- _queue_event(bd, (BD_EVENT){BD_EVENT_END_OF_TITLE, 0});
+ BD_DEBUG(DBG_BLURAY | DBG_STREAM, "End of title\n");
+ _queue_event(bd, BD_EVENT_END_OF_TITLE, 0);
+ bd->bdj_end_of_playlist |= 1;
 return 0;
 }
 if (!_open_m2ts(bd, st)) {
 return -1;
 }
+
+ if (st->clip->connection == CONNECT_NON_SEAMLESS) {
+ /* application layer demuxer buffers must be reset here */
+ _queue_event(bd, BD_EVENT_DISCONTINUITY, st->clip->in_time);
+ }
+
 }
 
 int r = _read_block(bd, st, bd->int_buf);
 if (r > 0) {
 
- if (bd->ig_pid > 0) {
- if (gc_decode_ts(bd->graphics_controller, bd->ig_pid, bd->int_buf, 1, -1) > 0) {
+ if (st->ig_pid > 0) {
+ if (gc_decode_ts(bd->graphics_controller, st->ig_pid, bd->int_buf, 1, -1) > 0) {
 /* initialize menus */
 _run_gc(bd, GC_CTRL_INIT_MENU, 0);
 }
 }
+ if (st->pg_pid > 0) {
+ if (gc_decode_ts(bd->graphics_controller, st->pg_pid, bd->int_buf, 1, -1) > 0) {
+ /* render subtitles */
+ gc_run(bd->graphics_controller, GC_CTRL_PG_UPDATE, 0, NULL);
+ }
+ }
+ if (bd->st_textst.clip) {
+ _update_textst_timer(bd);
+ }
 
 st->int_buf_off = st->clip_pos % 6144;
 
@@ -1427,6 +1751,15 @@
 if (size > (unsigned int)6144 - st->int_buf_off) {
 size = 6144 - st->int_buf_off;
 }
+
+ /* cut read at clip end packet */
+ uint32_t new_clip_pkt = SPN(st->clip_pos + size);
+ if (new_clip_pkt > st->clip->end_pkt) {
+ BD_DEBUG(DBG_STREAM, "cut %d bytes at end of block\n", (new_clip_pkt - st->clip->end_pkt) * 192);
+ size -= (new_clip_pkt - st->clip->end_pkt) * 192;
+ }
+
+ /* copy chunk */
 memcpy(buf, bd->int_buf + st->int_buf_off, size);
 buf += size;
 len -= size;
@@ -1436,24 +1769,37 @@
 bd->s_pos += size;
 }
 
- /* chapter tracking */
- if (bd->s_pos > bd->next_chapter_start) {
- _update_chapter_psr(bd);
+ /* mark tracking */
+ if (bd->next_mark >= 0 && bd->s_pos > bd->next_mark_pos) {
+ _playmark_reached(bd);
 }
 
- BD_DEBUG(DBG_STREAM, "%d bytes read OK! (%p)\n", out_len, bd);
-
+ BD_DEBUG(DBG_STREAM, "%d bytes read OK!\n", out_len);
 return out_len;
 }
 
- BD_DEBUG(DBG_STREAM | DBG_CRIT, "bd_read(): no valid title selected! (%p)\n", bd);
+ BD_DEBUG(DBG_STREAM | DBG_CRIT, "bd_read(): no valid title selected!\n");
 
 return -1;
 }
 
+int bd_read(BLURAY *bd, unsigned char *buf, int len)
+{
+ int result;
+
+ bd_mutex_lock(&bd->mutex);
+ result = _bd_read(bd, buf, len);
+ bd_mutex_unlock(&bd->mutex);
+
+ return result;
+}
+
 int bd_read_skip_still(BLURAY *bd)
 {
 BD_STREAM *st = &bd->st0;
+ int ret = 0;
+
+ bd_mutex_lock(&bd->mutex);
 
 if (st->clip) {
 MPLS_PI *pi = &st->clip->title->pl->play_item[st->clip->ref];
@@ -1461,19 +1807,82 @@
 if (pi->still_mode == BLURAY_STILL_TIME) {
 st->clip = nav_next_clip(bd->title, st->clip);
 if (st->clip) {
- return _open_m2ts(bd, st);
+ ret = _open_m2ts(bd, st);
 }
 }
 }
 
- return 0;
+ bd_mutex_unlock(&bd->mutex);
+
+ return ret;
+}
+
+/*
+ * synchronous sub paths
+ */
+
+static int _preload_textst_subpath(BLURAY *bd)
+{
+ uint8_t char_code = BLURAY_TEXT_CHAR_CODE_UTF8;
+ int textst_subpath = -1;
+ unsigned textst_subclip = 0;
+ uint16_t textst_pid = 0;
+ unsigned ii;
+
+ if (!bd->graphics_controller) {
+ return 0;
+ }
+
+ if (!bd->decode_pg || !bd->title) {
+ return 0;
+ }
+
+ _find_pg_stream(bd, &textst_pid, &textst_subpath, &textst_subclip, &char_code);
+ if (textst_subpath < 0) {
+ return 0;
+ }
+
+ if (textst_subclip >= bd->title->sub_path[textst_subpath].clip_list.count) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "_preload_textst_subpath(): invalid subclip id\n");
+ return -1;
+ }
+
+ if (bd->st_textst.clip == &bd->title->sub_path[textst_subpath].clip_list.clip[textst_subclip]) {
+ BD_DEBUG(DBG_BLURAY, "_preload_textst_subpath(): subpath already loaded");
+ return 1;
+ }
+
+ gc_run(bd->graphics_controller, GC_CTRL_PG_RESET, 0, NULL);
+
+ bd->st_textst.clip = &bd->title->sub_path[textst_subpath].clip_list.clip[textst_subclip];
+
+ if (!_preload_m2ts(bd, &bd->st_textst)) {
+ _close_preload(&bd->st_textst);
+ return 0;
+ }
+
+ gc_decode_ts(bd->graphics_controller, 0x1800, bd->st_textst.buf, SPN(bd->st_textst.clip_size) / 32, -1);
+
+ /* set fonts and encoding from clip info */
+ gc_add_font(bd->graphics_controller, NULL);
+ for (ii = 0; ii < bd->st_textst.clip->cl->font_info.font_count; ii++) {
+ char *file = str_printf("%s/BDMV/AUXDATA/%s.otf", bd->device_path, bd->st_textst.clip->cl->font_info.font[ii].file_id);
+ gc_add_font(bd->graphics_controller, file);
+ X_FREE(file);
+ }
+ gc_run(bd->graphics_controller, GC_CTRL_PG_CHARCODE, char_code, NULL);
+
+ /* start presentation timer */
+ _init_textst_timer(bd);
+
+ return 1;
 }
 
 /*
 * preloader for asynchronous sub paths
 */
 
-static int _find_ig_stream(BLURAY *bd, uint16_t *pid, int *sub_path_idx)
+static int _find_ig_stream(BLURAY *bd, uint16_t *pid, int *sub_path_idx, unsigned *sub_clip_idx)
 {
 MPLS_PI *pi = &bd->title->pl->play_item[0];
 unsigned ig_stream = bd_psr_read(bd->regs, PSR_IG_STREAM_ID);
@@ -1482,6 +1891,7 @@
 ig_stream--; /* stream number to table index */
 if (pi->stn.ig[ig_stream].stream_type == 2) {
 *sub_path_idx = pi->stn.ig[ig_stream].subpath_id;
+ *sub_clip_idx = pi->stn.ig[ig_stream].subclip_id;
 }
 *pid = pi->stn.ig[ig_stream].pid;
 
@@ -1496,19 +1906,34 @@
 static int _preload_ig_subpath(BLURAY *bd)
 {
 int ig_subpath = -1;
+ unsigned ig_subclip = 0;
 uint16_t ig_pid = 0;
 
- _find_ig_stream(bd, &ig_pid, &ig_subpath);
-
 if (!bd->graphics_controller) {
 return 0;
 }
 
+ _find_ig_stream(bd, &ig_pid, &ig_subpath, &ig_subclip);
+
 if (ig_subpath < 0) {
 return 0;
 }
 
- bd->st_ig.clip = &bd->title->sub_path[ig_subpath].clip_list.clip[0];
+ if (ig_subclip >= bd->title->sub_path[ig_subpath].clip_list.count) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "_preload_ig_subpath(): invalid subclip id\n");
+ return -1;
+ }
+
+ if (bd->st_ig.clip == &bd->title->sub_path[ig_subpath].clip_list.clip[ig_subclip]) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "_preload_ig_subpath(): subpath already loaded");
+ //return 1;
+ }
+
+ bd->st_ig.clip = &bd->title->sub_path[ig_subpath].clip_list.clip[ig_subclip];
+
+ if (bd->title->sub_path[ig_subpath].clip_list.count > 1) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "_preload_ig_subpath(): multi-clip sub paths not supported\n");
+ }
 
 if (!_preload_m2ts(bd, &bd->st_ig)) {
 _close_preload(&bd->st_ig);
@@ -1521,36 +1946,38 @@
 static int _preload_subpaths(BLURAY *bd)
 {
 _close_preload(&bd->st_ig);
+ _close_preload(&bd->st_textst);
 
 if (bd->title->pl->sub_count <= 0) {
 return 0;
 }
 
- return _preload_ig_subpath(bd);
+ return _preload_ig_subpath(bd) | _preload_textst_subpath(bd);
 }
 
 static int _init_ig_stream(BLURAY *bd)
 {
 int ig_subpath = -1;
+ unsigned ig_subclip = 0;
 uint16_t ig_pid = 0;
 
- bd->ig_pid = 0;
+ bd->st0.ig_pid = 0;
 
 if (!bd->graphics_controller) {
 return 0;
 }
 
- _find_ig_stream(bd, &ig_pid, &ig_subpath);
+ _find_ig_stream(bd, &ig_pid, &ig_subpath, &ig_subclip);
 
 /* decode already preloaded IG sub-path */
 if (bd->st_ig.clip) {
- gc_decode_ts(bd->graphics_controller, ig_pid, bd->st_ig.buf, bd->st_ig.clip_size / 6144, -1);
+ gc_decode_ts(bd->graphics_controller, ig_pid, bd->st_ig.buf, SPN(bd->st_ig.clip_size) / 32, -1);
 return 1;
 }
 
 /* store PID of main path embedded IG stream */
 if (ig_subpath < 0) {
- bd->ig_pid = ig_pid;
+ bd->st0.ig_pid = ig_pid;
 return 1;
 }
 
@@ -1569,6 +1996,7 @@
 
 _close_m2ts(&bd->st0);
 _close_preload(&bd->st_ig);
+ _close_preload(&bd->st_textst);
 
 if (bd->title) {
 nav_title_close(bd->title);
@@ -1582,15 +2010,13 @@
 
 bd->title = nav_title_open(bd->device_path, f_name, angle);
 if (bd->title == NULL) {
- BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Unable to open title %s! (%p)\n",
- f_name, bd);
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Unable to open title %s!\n", f_name);
 return 0;
 }
 
 bd->seamless_angle_change = 0;
 bd->s_pos = 0;
-
- bd->next_chapter_start = bd_chapter_pos(bd, 1);
+ bd->bdj_end_of_playlist = 0;
 
 bd_psr_write(bd->regs, PSR_PLAYLIST, atoi(bd->title->name));
 bd_psr_write(bd->regs, PSR_ANGLE_NUMBER, bd->title->angle + 1);
@@ -1599,7 +2025,9 @@
 // Get the initial clip of the playlist
 bd->st0.clip = nav_next_clip(bd->title, NULL);
 if (_open_m2ts(bd, &bd->st0)) {
- BD_DEBUG(DBG_BLURAY, "Title %s selected! (%p)\n", f_name, bd);
+ BD_DEBUG(DBG_BLURAY, "Title %s selected\n", f_name);
+
+ _find_next_playmark(bd);
 
 _preload_subpaths(bd);
 
@@ -1613,6 +2041,8 @@
 char *f_name = str_printf("%05d.mpls", playlist);
 int result;
 
+ bd_mutex_lock(&bd->mutex);
+
 if (bd->title_list) {
 /* update current title */
 unsigned i;
@@ -1626,6 +2056,8 @@
 
 result = _open_playlist(bd, f_name, 0);
 
+ bd_mutex_unlock(&bd->mutex);
+
 X_FREE(f_name);
 return result;
 }
@@ -1636,21 +2068,28 @@
 int bd_select_title(BLURAY *bd, uint32_t title_idx)
 {
 const char *f_name;
+ int result;
 
 // Open the playlist
 if (bd->title_list == NULL) {
- BD_DEBUG(DBG_BLURAY, "Title list not yet read! (%p)\n", bd);
+ BD_DEBUG(DBG_CRIT | DBG_BLURAY, "Title list not yet read!\n");
 return 0;
 }
 if (bd->title_list->count <= title_idx) {
- BD_DEBUG(DBG_BLURAY, "Invalid title index %d! (%p)\n", title_idx, bd);
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Invalid title index %d!\n", title_idx);
 return 0;
 }
 
+ bd_mutex_lock(&bd->mutex);
+
 bd->title_idx = title_idx;
 f_name = bd->title_list->title_info[title_idx].name;
 
- return _open_playlist(bd, f_name, 0);
+ result = _open_playlist(bd, f_name, 0);
+
+ bd_mutex_unlock(&bd->mutex);
+
+ return result;
 }
 
 uint32_t bd_get_current_title(BLURAY *bd)
@@ -1658,12 +2097,12 @@
 return bd->title_idx;
 }
 
-int bd_select_angle(BLURAY *bd, unsigned angle)
+static int _bd_select_angle(BLURAY *bd, unsigned angle)
 {
 unsigned orig_angle;
 
 if (bd->title == NULL) {
- BD_DEBUG(DBG_BLURAY, "Title not yet selected! (%p)\n", bd);
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Can't select angle: title not yet selected!\n");
 return 0;
 }
 
@@ -1678,19 +2117,33 @@
 bd_psr_write(bd->regs, PSR_ANGLE_NUMBER, bd->title->angle + 1);
 
 if (!_open_m2ts(bd, &bd->st0)) {
- BD_DEBUG(DBG_BLURAY|DBG_CRIT, "Error selecting angle %d ! (%p)\n", angle, bd);
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Error selecting angle %d !\n", angle);
 return 0;
 }
 
 return 1;
 }
 
+int bd_select_angle(BLURAY *bd, unsigned angle)
+{
+ int result;
+ bd_mutex_lock(&bd->mutex);
+ result = _bd_select_angle(bd, angle);
+ bd_mutex_unlock(&bd->mutex);
+ return result;
+}
+
 unsigned bd_get_current_angle(BLURAY *bd)
 {
+ int angle = 0;
+
+ bd_mutex_lock(&bd->mutex);
 if (bd->title) {
- return bd->title->angle;
+ angle = bd->title->angle;
 }
- return 0;
+ bd_mutex_unlock(&bd->mutex);
+
+ return angle;
 }
 
 
@@ -1698,11 +2151,15 @@
 {
 uint32_t clip_pkt;
 
- clip_pkt = (bd->st0.clip_pos + 191) / 192;
+ bd_mutex_lock(&bd->mutex);
+
+ clip_pkt = SPN(bd->st0.clip_pos + 191);
 bd->angle_change_pkt = nav_angle_change_search(bd->st0.clip, clip_pkt,
 &bd->angle_change_time);
 bd->request_angle = angle;
 bd->seamless_angle_change = 1;
+
+ bd_mutex_unlock(&bd->mutex);
 }
 
 /*
@@ -1712,7 +2169,7 @@
 uint32_t bd_get_titles(BLURAY *bd, uint8_t flags, uint32_t min_title_length)
 {
 if (!bd) {
- BD_DEBUG(DBG_BLURAY | DBG_CRIT, "bd_get_titles(NULL) failed (%p)\n", bd);
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "bd_get_titles(NULL) failed\n");
 return 0;
 }
 
@@ -1722,13 +2179,32 @@
 bd->title_list = nav_get_title_list(bd->device_path, flags, min_title_length);
 
 if (!bd->title_list) {
- BD_DEBUG(DBG_BLURAY | DBG_CRIT, "nav_get_title_list(%s) failed (%p)\n", bd->device_path, bd);
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "nav_get_title_list(%s) failed\n", bd->device_path);
 return 0;
 }
 
+ /* start BD+. No real title info will be passed to BD+ VM ... */
+ if (bd->libbdplus) {
+ libbdplus_event(bd->libbdplus, 0xffffffff, bd->index->num_titles, 0);
+ }
+
 return bd->title_list->count;
 }
 
+int bd_get_main_title(BLURAY *bd)
+{
+ if (bd->title_type != title_undef) {
+ BD_DEBUG(DBG_CRIT | DBG_BLURAY, "bd_get_main_title() can't be used with BluRay menus\n");
+ }
+
+ if (bd->title_list == NULL) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Title list not yet read!\n");
+ return -1;
+ }
+
+ return bd->title_list->main_title_idx;
+}
+
 static void _copy_streams(NAV_CLIP *clip, BLURAY_STREAM_INFO *streams, MPLS_STREAM *si, int count)
 {
 int ii;
@@ -1741,6 +2217,10 @@
 memcpy(streams[ii].lang, si[ii].lang, 4);
 streams[ii].pid = si[ii].pid;
 streams[ii].aspect = nav_lookup_aspect(clip, si[ii].pid);
+ if ((si->stream_type == 2) || (si->stream_type == 3))
+ streams[ii].subpath_id = si->subpath_id;
+ else
+ streams[ii].subpath_id = -1;
 }
 }
 
@@ -1761,6 +2241,17 @@
 title_info->chapters[ii].start = (uint64_t)title->chap_list.mark[ii].title_time * 2;
 title_info->chapters[ii].duration = (uint64_t)title->chap_list.mark[ii].duration * 2;
 title_info->chapters[ii].offset = (uint64_t)title->chap_list.mark[ii].title_pkt * 192L;
+ title_info->chapters[ii].clip_ref = title->chap_list.mark[ii].clip_ref;
+ }
+ title_info->mark_count = title->mark_list.count;
+ title_info->marks = calloc(title_info->mark_count, sizeof(BLURAY_TITLE_MARK));
+ for (ii = 0; ii < title_info->mark_count; ii++) {
+ title_info->marks[ii].idx = ii;
+		title_info->marks[ii].type = title->mark_list.mark[ii].mark_type;
+ title_info->marks[ii].start = (uint64_t)title->mark_list.mark[ii].title_time * 2;
+ title_info->marks[ii].duration = (uint64_t)title->mark_list.mark[ii].duration * 2;
+ title_info->marks[ii].offset = (uint64_t)title->mark_list.mark[ii].title_pkt * 192L;
+		title_info->marks[ii].clip_ref = title->mark_list.mark[ii].clip_ref;
 }
 title_info->clip_count = title->clip_list.count;
 title_info->clips = calloc(title_info->clip_count, sizeof(BLURAY_CLIP_INFO));
@@ -1770,6 +2261,9 @@
 NAV_CLIP *nc = &title->clip_list.clip[ii];
 
 ci->pkt_count = nc->end_pkt - nc->start_pkt;
+ ci->start_time = (uint64_t)nc->start_time * 2;
+ ci->in_time = (uint64_t)pi->in_time * 2;
+ ci->out_time = (uint64_t)pi->out_time * 2;
 ci->still_mode = pi->still_mode;
 ci->still_time = pi->still_time;
 ci->video_stream_count = pi->stn.num_video;
@@ -1803,8 +2297,7 @@
 
 title = nav_title_open(bd->device_path, mpls_name, angle);
 if (title == NULL) {
- BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Unable to open title %s! (%p)\n",
- mpls_name, bd);
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Unable to open title %s!\n", mpls_name);
 return NULL;
 }
 
@@ -1817,11 +2310,11 @@
 BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx, unsigned angle)
 {
 if (bd->title_list == NULL) {
- BD_DEBUG(DBG_BLURAY, "Title list not yet read! (%p)\n", bd);
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Title list not yet read!\n");
 return NULL;
 }
 if (bd->title_list->count <= title_idx) {
- BD_DEBUG(DBG_BLURAY, "Invalid title index %d! (%p)\n", title_idx, bd);
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Invalid title index %d!\n", title_idx);
 return NULL;
 }
 
@@ -1848,6 +2341,7 @@
 unsigned int ii;
 
 X_FREE(title_info->chapters);
+ X_FREE(title_info->marks);
 for (ii = 0; ii < title_info->clip_count; ii++) {
 X_FREE(title_info->clips[ii].video_streams);
 X_FREE(title_info->clips[ii].audio_streams);
@@ -1874,20 +2368,36 @@
 { BLURAY_PLAYER_SETTING_MENU_LANG, PSR_MENU_LANG },
 { BLURAY_PLAYER_SETTING_COUNTRY_CODE, PSR_COUNTRY },
 { BLURAY_PLAYER_SETTING_REGION_CODE, PSR_REGION },
+ { BLURAY_PLAYER_SETTING_OUTPUT_PREFER, PSR_OUTPUT_PREFER },
+ { BLURAY_PLAYER_SETTING_DISPLAY_CAP, PSR_DISPLAY_CAP },
+ { BLURAY_PLAYER_SETTING_3D_CAP, PSR_3D_CAP },
 { BLURAY_PLAYER_SETTING_VIDEO_CAP, PSR_VIDEO_CAP },
 { BLURAY_PLAYER_SETTING_TEXT_CAP, PSR_TEXT_CAP },
 { BLURAY_PLAYER_SETTING_PLAYER_PROFILE, PSR_PROFILE_VERSION },
 };
 
 unsigned i;
+ int result;
 
- if (idx == BLURAY_PLAYER_SETTING_PLAYER_PROFILE) {
- value = ((value & 0xf) << 16) | 0x0200; /* version fixed to BD-RO Part 3, version 2.0 */
+ if (idx == BLURAY_PLAYER_SETTING_DECODE_PG) {
+ bd_mutex_lock(&bd->mutex);
+ bd->decode_pg = !!value;
+
+ bd_psr_lock(bd->regs);
+ value = (bd_psr_read(bd->regs, PSR_PG_STREAM) & (0x7fffffff)) | ((!!value)<<31);
+ result = !bd_psr_setting_write(bd->regs, PSR_PG_STREAM, value);
+ bd_psr_unlock(bd->regs);
+
+ bd_mutex_unlock(&bd->mutex);
+ return result;
 }
 
 for (i = 0; i < sizeof(map) / sizeof(map[0]); i++) {
 if (idx == map[i].idx) {
- return !bd_psr_setting_write(bd->regs, idx, value);
+ bd_mutex_lock(&bd->mutex);
+ result = !bd_psr_setting_write(bd->regs, idx, value);
+ bd_mutex_unlock(&bd->mutex);
+ return result;
 }
 }
 
@@ -1910,36 +2420,71 @@
 }
 }
 
+void bd_select_stream(BLURAY *bd, uint32_t stream_type, uint32_t stream_id, uint32_t enable_flag)
+{
+ uint32_t val;
+
+ bd_mutex_lock(&bd->mutex);
+ bd_psr_lock(bd->regs);
+
+ switch (stream_type) {
+ case BLURAY_PG_TEXTST_STREAM:
+ val = bd_psr_read(bd->regs, PSR_PG_STREAM);
+ bd_psr_write(bd->regs, PSR_PG_STREAM, ((!!enable_flag)<<31) | (stream_id & 0xfff) | (val & 0x7ffff000));
+ break;
+ /*
+ case BLURAY_SECONDARY_VIDEO_STREAM:
+ case BLURAY_SECONDARY_AUDIO_STREAM:
+ */
+ }
+
+ bd_psr_unlock(bd->regs);
+ bd_mutex_unlock(&bd->mutex);
+}
+
 /*
- * bdj
+ * BD-J testing
 */
 
 int bd_start_bdj(BLURAY *bd, const char *start_object)
 {
-#ifdef USING_BDJAVA
- if (bd->bdjava == NULL) {
- bd->bdjava = bdj_open(bd->device_path, start_object, bd, bd->regs);
- return !!bd->bdjava;
- } else {
- BD_DEBUG(DBG_BLURAY | DBG_CRIT, "BD-J is already running (%p)\n", bd);
- return 1;
+ unsigned ii;
+
+ if (!bd || !bd->index) {
+ return 0;
 }
-#else
- BD_DEBUG(DBG_BLURAY | DBG_CRIT, "%s.bdjo: BD-J not compiled in (%p)\n", start_object, bd);
-#endif
+
+ /* first play object ? */
+ if (bd->index->first_play.object_type == indx_object_type_bdj &&
+ !strcmp(start_object, bd->index->first_play.bdj.name)) {
+ return _start_bdj(bd, BLURAY_TITLE_FIRST_PLAY);
+ }
+
+ /* top menu ? */
+ if (bd->index->first_play.object_type == indx_object_type_bdj &&
+ !strcmp(start_object, bd->index->top_menu.bdj.name)) {
+ return _start_bdj(bd, BLURAY_TITLE_TOP_MENU);
+ }
+
+ /* valid BD-J title from disc index ? */
+ for (ii = 0; ii < bd->index->num_titles; ii++) {
+ INDX_TITLE *t = &bd->index->titles[ii];
+
+ if (t->object_type == indx_object_type_bdj &&
+ !strcmp(start_object, t->bdj.name)) {
+ return _start_bdj(bd, ii + 1);
+ }
+ }
+
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "No %s.bdjo in disc index\n", start_object);
 return 0;
-}
+ }
 
 void bd_stop_bdj(BLURAY *bd)
 {
- if (bd->bdjava != NULL) {
-#ifdef USING_BDJAVA
- bdj_close((BDJAVA*)bd->bdjava);
-#else
- BD_DEBUG(DBG_BLURAY, "BD-J not compiled in (%p)\n", bd);
-#endif
- bd->bdjava = NULL;
- }
+ bd_mutex_lock(&bd->mutex);
+ _close_bdj(bd);
+ bd_mutex_unlock(&bd->mutex);
 }
 
 /*
@@ -1952,7 +2497,7 @@
 * Restore stored playback position.
 */
 
- BD_DEBUG(DBG_BLURAY, "PSR restore: psr%u = %u (%p)\n", ev->psr_idx, ev->new_val, bd);
+ BD_DEBUG(DBG_BLURAY, "PSR restore: psr%u = %u\n", ev->psr_idx, ev->new_val);
 
 switch (ev->psr_idx) {
 case PSR_ANGLE_NUMBER:
@@ -1960,7 +2505,7 @@
 return;
 case PSR_TITLE_NUMBER:
 /* pass to the application */
- _queue_event(bd, (BD_EVENT){BD_EVENT_TITLE, ev->new_val});
+ _queue_event(bd, BD_EVENT_TITLE, ev->new_val);
 return;
 case PSR_CHAPTER:
 /* will be selected automatically */
@@ -1996,18 +2541,42 @@
 static void _process_psr_write_event(BLURAY *bd, BD_PSR_EVENT *ev)
 {
 if (ev->ev_type == BD_PSR_WRITE) {
- BD_DEBUG(DBG_BLURAY, "PSR write: psr%u = %u (%p)\n", ev->psr_idx, ev->new_val, bd);
+ BD_DEBUG(DBG_BLURAY, "PSR write: psr%u = %u\n", ev->psr_idx, ev->new_val);
 }
 
 switch (ev->psr_idx) {
 
 /* current playback position */
 
- case PSR_ANGLE_NUMBER: _queue_event(bd, (BD_EVENT){BD_EVENT_ANGLE, ev->new_val}); break;
- case PSR_TITLE_NUMBER: _queue_event(bd, (BD_EVENT){BD_EVENT_TITLE, ev->new_val}); break;
- case PSR_PLAYLIST: _queue_event(bd, (BD_EVENT){BD_EVENT_PLAYLIST, ev->new_val}); break;
- case PSR_PLAYITEM: _queue_event(bd, (BD_EVENT){BD_EVENT_PLAYITEM, ev->new_val}); break;
- case PSR_CHAPTER: _queue_event(bd, (BD_EVENT){BD_EVENT_CHAPTER, ev->new_val}); break;
+ case PSR_ANGLE_NUMBER:
+ _bdj_event (bd, BDJ_EVENT_ANGLE, ev->new_val);
+ _queue_event(bd, BD_EVENT_ANGLE, ev->new_val);
+ break;
+ case PSR_TITLE_NUMBER:
+ _queue_event(bd, BD_EVENT_TITLE, ev->new_val);
+ libbdplus_event(bd->libbdplus, 0x110, ev->new_val, 0);
+ break;
+ case PSR_PLAYLIST:
+ _queue_event(bd, BD_EVENT_PLAYLIST, ev->new_val);
+ break;
+ case PSR_PLAYITEM:
+ _bdj_event (bd, BDJ_EVENT_PLAYITEM,ev->new_val);
+ _queue_event(bd, BD_EVENT_PLAYITEM, ev->new_val);
+ break;
+ case PSR_CHAPTER:
+ _bdj_event (bd, BDJ_EVENT_CHAPTER, ev->new_val);
+ _queue_event(bd, BD_EVENT_CHAPTER, ev->new_val);
+ break;
+ case PSR_TIME:
+ _bdj_event (bd, BDJ_EVENT_PTS, ev->new_val);
+ break;
+
+ case 102:
+ _bdj_event (bd, BDJ_EVENT_PSR102, ev->new_val);
+ break;
+ case 103:
+ libbdplus_event(bd->libbdplus, 0x210, ev->new_val, 0);
+ break;
 
 default:;
 }
@@ -2015,7 +2584,7 @@
 
 static void _process_psr_change_event(BLURAY *bd, BD_PSR_EVENT *ev)
 {
- BD_DEBUG(DBG_BLURAY, "PSR change: psr%u = %u (%p)\n", ev->psr_idx, ev->new_val, bd);
+ BD_DEBUG(DBG_BLURAY, "PSR change: psr%u = %u\n", ev->psr_idx, ev->new_val);
 
 _process_psr_write_event(bd, ev);
 
@@ -2024,34 +2593,49 @@
 /* stream selection */
 
 case PSR_IG_STREAM_ID:
- _queue_event(bd, (BD_EVENT){BD_EVENT_IG_STREAM, ev->new_val});
+ _queue_event(bd, BD_EVENT_IG_STREAM, ev->new_val);
 break;
 
 case PSR_PRIMARY_AUDIO_ID:
- _queue_event(bd, (BD_EVENT){BD_EVENT_AUDIO_STREAM, ev->new_val});
+ _queue_event(bd, BD_EVENT_AUDIO_STREAM, ev->new_val);
 break;
 
 case PSR_PG_STREAM:
+ _bdj_event(bd, BDJ_EVENT_SUBTITLE, ev->new_val);
 if ((ev->new_val & 0x80000fff) != (ev->old_val & 0x80000fff)) {
- _queue_event(bd, (BD_EVENT){BD_EVENT_PG_TEXTST, !!(ev->new_val & 0x80000000)});
- _queue_event(bd, (BD_EVENT){BD_EVENT_PG_TEXTST_STREAM, ev->new_val & 0xfff});
+ _queue_event(bd, BD_EVENT_PG_TEXTST, !!(ev->new_val & 0x80000000));
+ _queue_event(bd, BD_EVENT_PG_TEXTST_STREAM, ev->new_val & 0xfff);
+ }
+
+ bd_mutex_lock(&bd->mutex);
+ _init_pg_stream(bd);
+ if (bd->st_textst.clip) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Changing TextST stream\n");
+ _preload_textst_subpath(bd);
 }
+ bd_mutex_unlock(&bd->mutex);
+
 break;
 
 case PSR_SECONDARY_AUDIO_VIDEO:
 /* secondary video */
 if ((ev->new_val & 0x8f00ff00) != (ev->old_val & 0x8f00ff00)) {
- _queue_event(bd, (BD_EVENT){BD_EVENT_SECONDARY_VIDEO, !!(ev->new_val & 0x80000000)});
- _queue_event(bd, (BD_EVENT){BD_EVENT_SECONDARY_VIDEO_SIZE, (ev->new_val >> 24) & 0xf});
- _queue_event(bd, (BD_EVENT){BD_EVENT_SECONDARY_VIDEO_STREAM, (ev->new_val & 0xff00) >> 8});
+ _queue_event(bd, BD_EVENT_SECONDARY_VIDEO, !!(ev->new_val & 0x80000000));
+ _queue_event(bd, BD_EVENT_SECONDARY_VIDEO_SIZE, (ev->new_val >> 24) & 0xf);
+ _queue_event(bd, BD_EVENT_SECONDARY_VIDEO_STREAM, (ev->new_val & 0xff00) >> 8);
 }
 /* secondary audio */
 if ((ev->new_val & 0x400000ff) != (ev->old_val & 0x400000ff)) {
- _queue_event(bd, (BD_EVENT){BD_EVENT_SECONDARY_AUDIO, !!(ev->new_val & 0x40000000)});
- _queue_event(bd, (BD_EVENT){BD_EVENT_SECONDARY_AUDIO_STREAM, ev->new_val & 0xff});
+ _queue_event(bd, BD_EVENT_SECONDARY_AUDIO, !!(ev->new_val & 0x40000000));
+ _queue_event(bd, BD_EVENT_SECONDARY_AUDIO_STREAM, ev->new_val & 0xff);
 }
 break;
 
+ /* 3D status */
+ case PSR_3D_STATUS:
+ _queue_event(bd, BD_EVENT_STEREOSCOPIC_STATUS, ev->new_val & 1);
+ break;
+
 default:;
 }
 }
@@ -2072,10 +2656,10 @@
 break;
 
 case BD_PSR_SAVE:
- BD_DEBUG(DBG_BLURAY, "PSR save event (%p)\n", bd);
+ BD_DEBUG(DBG_BLURAY, "PSR save event\n");
 break;
 default:
- BD_DEBUG(DBG_BLURAY, "PSR event %d: psr%u = %u (%p)\n", ev->ev_type, ev->psr_idx, ev->new_val, bd);
+ BD_DEBUG(DBG_BLURAY, "PSR event %d: psr%u = %u\n", ev->ev_type, ev->psr_idx, ev->new_val);
 break;
 }
 }
@@ -2091,41 +2675,46 @@
 PSR_SECONDARY_AUDIO_VIDEO,
 };
 unsigned ii;
+ BD_PSR_EVENT ev;
+
+ ev.ev_type = BD_PSR_CHANGE;
+ ev.old_val = 0;
 
 for (ii = 0; ii < sizeof(psrs) / sizeof(psrs[0]); ii++) {
- BD_PSR_EVENT ev = {
- .ev_type = BD_PSR_CHANGE,
- .psr_idx = psrs[ii],
- .old_val = 0,
- .new_val = bd_psr_read(bd->regs, psrs[ii]),
- };
+ ev.psr_idx = psrs[ii];
+ ev.new_val = bd_psr_read(bd->regs, psrs[ii]);
 
 _process_psr_change_event(bd, &ev);
 }
 }
 
-static int _play_bdj(BLURAY *bd, const char *name)
+static int _play_bdj(BLURAY *bd, unsigned title)
 {
+ if (!bd->disc_info.bdj_handled) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Can't play BD-J title %d\n", title);
+ return 0;
+ }
+
+ int result;
+
 bd->title_type = title_bdj;
 
-#ifdef USING_BDJAVA
- bd_stop_bdj(bd);
- return bd_start_bdj(bd, name);
-#else
- BD_DEBUG(DBG_BLURAY|DBG_CRIT, "_bdj_play(BDMV/BDJ/%s.jar) not implemented (%p)\n", name, bd);
- return 0;
-#endif
+ result = _start_bdj(bd, title);
+ if (result <= 0) {
+ bd->title_type = title_undef;
+ _queue_event(bd, BD_EVENT_ERROR, BD_ERROR_BDJ);
+ }
+
+ return result;
 }
 
 static int _play_hdmv(BLURAY *bd, unsigned id_ref)
 {
 int result = 1;
 
- bd->title_type = title_hdmv;
+ _stop_bdj(bd);
 
-#ifdef USING_BDJAVA
- bd_stop_bdj(bd);
-#endif
+ bd->title_type = title_hdmv;
 
 if (!bd->hdmv_vm) {
 bd->hdmv_vm = hdmv_vm_init(bd->device_path, bd->regs, bd->index);
@@ -2137,6 +2726,11 @@
 
 bd->hdmv_suspended = !hdmv_vm_running(bd->hdmv_vm);
 
+ if (result <= 0) {
+ bd->title_type = title_undef;
+ _queue_event(bd, BD_EVENT_ERROR, BD_ERROR_HDMV);
+ }
+
 return result;
 }
 
@@ -2158,7 +2752,7 @@
 }
 
 if (p->object_type == indx_object_type_bdj) {
- return _play_bdj(bd, p->bdj.name);
+ return _play_bdj(bd, title);
 }
 
 return 0;
@@ -2186,7 +2780,7 @@
 }
 
 if (p->object_type == indx_object_type_bdj) {
- return _play_bdj(bd, p->bdj.name);
+ return _play_bdj(bd, title);
 }
 
 return 0;
@@ -2201,15 +2795,31 @@
 if (t->object_type == indx_object_type_hdmv) {
 return _play_hdmv(bd, t->hdmv.id_ref);
 } else {
- return _play_bdj(bd, t->bdj.name);
+ return _play_bdj(bd, title);
 }
 }
 
 return 0;
 }
 
+#ifdef USING_BDJAVA
+int bd_play_title_internal(BLURAY *bd, unsigned title)
+{
+ /* used by BD-J. Like bd_play_title() but bypasses UO mask checks. */
+ int ret;
+ bd_mutex_lock(&bd->mutex);
+ ret = _play_title(bd, title);
+ bd_mutex_unlock(&bd->mutex);
+ return ret;
+}
+#endif
+
 int bd_play(BLURAY *bd)
 {
+ int result;
+
+ bd_mutex_lock(&bd->mutex);
+
 /* reset player state */
 
 bd->title_type = title_undef;
@@ -2225,61 +2835,106 @@
 _queue_initial_psr_events(bd);
 bd_psr_unlock(bd->regs);
 
- return _play_title(bd, BLURAY_TITLE_FIRST_PLAY);
+ /* start BD+ VM */
+ libbdplus_start(bd->libbdplus);
+
+ /* start playback from FIRST PLAY title */
+
+ result = _play_title(bd, BLURAY_TITLE_FIRST_PLAY);
+
+ bd_mutex_unlock(&bd->mutex);
+
+ return result;
 }
 
-int bd_play_title(BLURAY *bd, unsigned title)
+static int _try_play_title(BLURAY *bd, unsigned title)
 {
 if (bd->title_type == title_undef && title != BLURAY_TITLE_FIRST_PLAY) {
- BD_DEBUG(DBG_BLURAY|DBG_CRIT, "bd_play_title(): bd_play() not called\n");
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "bd_play_title(): bd_play() not called\n");
 return 0;
 }
 
 if (bd->st0.uo_mask.title_search) {
- BD_DEBUG(DBG_BLURAY|DBG_CRIT, "title search masked by stream\n");
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "title search masked by stream\n");
 return 0;
 }
 
 if (bd->title_type == title_hdmv) {
 if (hdmv_vm_get_uo_mask(bd->hdmv_vm) & HDMV_TITLE_SEARCH_MASK) {
- BD_DEBUG(DBG_BLURAY|DBG_CRIT, "title search masked by movie object\n");
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "title search masked by movie object\n");
+ return 0;
+ }
+ }
+
+#ifdef USING_BDJAVA
+ if (bd->title_type == title_bdj) {
+ if (bdj_get_uo_mask(bd->bdjava) & BDJ_TITLE_SEARCH_MASK) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "title search masked by BD-J\n");
 return 0;
 }
 }
+#endif
 
 return _play_title(bd, title);
 }
 
-int bd_menu_call(BLURAY *bd, int64_t pts)
+int bd_play_title(BLURAY *bd, unsigned title)
+{
+ int ret;
+ bd_mutex_lock(&bd->mutex);
+ ret = _try_play_title(bd, title);
+ bd_mutex_unlock(&bd->mutex);
+ return ret;
+}
+
+static int _try_menu_call(BLURAY *bd, int64_t pts)
 {
 if (pts >= 0) {
 bd_psr_write(bd->regs, PSR_TIME, (uint32_t)(((uint64_t)pts) >> 1));
 }
 
 if (bd->title_type == title_undef) {
- BD_DEBUG(DBG_BLURAY|DBG_CRIT, "bd_menu_call(): bd_play() not called\n");
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "bd_menu_call(): bd_play() not called\n");
 return 0;
 }
 
 if (bd->st0.uo_mask.menu_call) {
- BD_DEBUG(DBG_BLURAY|DBG_CRIT, "menu call masked by stream\n");
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "menu call masked by stream\n");
 return 0;
 }
 
 if (bd->title_type == title_hdmv) {
 if (hdmv_vm_get_uo_mask(bd->hdmv_vm) & HDMV_MENU_CALL_MASK) {
- BD_DEBUG(DBG_BLURAY|DBG_CRIT, "menu call masked by movie object\n");
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "menu call masked by movie object\n");
 return 0;
 }
 
 if (hdmv_vm_suspend_pl(bd->hdmv_vm) < 0) {
- BD_DEBUG(DBG_BLURAY|DBG_CRIT, "bd_menu_call(): error storing playback location\n");
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "bd_menu_call(): error storing playback location\n");
 }
 }
 
+#ifdef USING_BDJAVA
+ if (bd->title_type == title_bdj) {
+ if (bdj_get_uo_mask(bd->bdjava) & BDJ_MENU_CALL_MASK) {
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "menu call masked by BD-J\n");
+ return 0;
+ }
+ }
+#endif
+
 return _play_title(bd, BLURAY_TITLE_TOP_MENU);
 }
 
+int bd_menu_call(BLURAY *bd, int64_t pts)
+{
+ int ret;
+ bd_mutex_lock(&bd->mutex);
+ ret = _try_menu_call(bd, pts);
+ bd_mutex_unlock(&bd->mutex);
+ return ret;
+}
+
 static void _process_hdmv_vm_event(BLURAY *bd, HDMV_EVENT *hev)
 {
 BD_DEBUG(DBG_BLURAY, "HDMV event: %d %d\n", hev->event, hev->param);
@@ -2298,22 +2953,22 @@
 break;
 
 case HDMV_EVENT_PLAY_PI:
- _queue_event(bd, (BD_EVENT){BD_EVENT_SEEK, 0});
 bd_seek_playitem(bd, hev->param);
 break;
 
 case HDMV_EVENT_PLAY_PM:
- _queue_event(bd, (BD_EVENT){BD_EVENT_SEEK, 0});
 bd_seek_mark(bd, hev->param);
 break;
 
 case HDMV_EVENT_PLAY_STOP:
 // stop current playlist
 _close_playlist(bd);
+
+ bd->hdmv_suspended = !hdmv_vm_running(bd->hdmv_vm);
 break;
 
 case HDMV_EVENT_STILL:
- _queue_event(bd, (BD_EVENT){BD_EVENT_STILL, hev->param});
+ _queue_event(bd, BD_EVENT_STILL, hev->param);
 break;
 
 case HDMV_EVENT_ENABLE_BUTTON:
@@ -2349,7 +3004,7 @@
 
 /* run VM */
 if (hdmv_vm_run(bd->hdmv_vm, &hdmv_ev) < 0) {
- _queue_event(bd, (BD_EVENT){BD_EVENT_ERROR, 0});
+ _queue_event(bd, BD_EVENT_ERROR, BD_ERROR_HDMV);
 bd->hdmv_suspended = !hdmv_vm_running(bd->hdmv_vm);
 return -1;
 }
@@ -2366,14 +3021,14 @@
 return 0;
 }
 
-int bd_read_ext(BLURAY *bd, unsigned char *buf, int len, BD_EVENT *event)
+static int _read_ext(BLURAY *bd, unsigned char *buf, int len, BD_EVENT *event)
 {
 if (_get_event(bd, event)) {
 return 0;
 }
 
 /* run HDMV VM ? */
- if (!bd->hdmv_suspended && bd->title_type == title_hdmv) {
+ if (bd->title_type == title_hdmv) {
 
 while (!bd->hdmv_suspended) {
 
@@ -2386,6 +3041,10 @@
 return 0;
 }
 }
+
+ if (bd->gc_status & GC_STATUS_ANIMATE) {
+ _run_gc(bd, GC_CTRL_NOP, 0);
+ }
 }
 
 if (len < 1) {
@@ -2393,7 +3052,18 @@
 return 0;
 }
 
- int bytes = bd_read(bd, buf, len);
+ if (bd->bdj_end_of_playlist == 1) {
+ _bdj_event(bd, BDJ_EVENT_END_OF_PLAYLIST, 0);
+ bd->bdj_end_of_playlist |= 2;
+ }
+
+ if (!bd->title && bd->title_type == title_bdj) {
+ /* BD-J title running but no playlist playing */
+ _queue_event(bd, BD_EVENT_IDLE, 0);
+ return 0;
+ }
+
+ int bytes = _bd_read(bd, buf, len);
 
 if (bytes == 0) {
 
@@ -2410,6 +3080,15 @@
 return bytes;
 }
 
+int bd_read_ext(BLURAY *bd, unsigned char *buf, int len, BD_EVENT *event)
+{
+ int ret;
+ bd_mutex_lock(&bd->mutex);
+ ret = _read_ext(bd, buf, len, event);
+ bd_mutex_unlock(&bd->mutex);
+ return ret;
+}
+
 int bd_get_event(BLURAY *bd, BD_EVENT *event)
 {
 if (!bd->event_queue) {
@@ -2430,25 +3109,54 @@
 * user interaction
 */
 
-void bd_set_scr(BLURAY *bd, int64_t pts)
+static void _set_scr(BLURAY *bd, int64_t pts)
 {
 if (pts >= 0) {
 bd_psr_write(bd->regs, PSR_TIME, (uint32_t)(((uint64_t)pts) >> 1));
 }
 }
 
+void bd_set_scr(BLURAY *bd, int64_t pts)
+{
+ bd_mutex_lock(&bd->mutex);
+ _set_scr(bd, pts);
+ bd_mutex_unlock(&bd->mutex);
+}
+
 int bd_mouse_select(BLURAY *bd, int64_t pts, uint16_t x, uint16_t y)
 {
- bd_set_scr(bd, pts);
+ int result = -1;
+
+ bd_mutex_lock(&bd->mutex);
 
- return _run_gc(bd, GC_CTRL_MOUSE_MOVE, (x << 16) | y);
+ _set_scr(bd, pts);
+
+ if (bd->title_type == title_hdmv) {
+ result = _run_gc(bd, GC_CTRL_MOUSE_MOVE, (x << 16) | y);
+ }
+
+ bd_mutex_unlock(&bd->mutex);
+
+ return result;
 }
 
 int bd_user_input(BLURAY *bd, int64_t pts, uint32_t key)
 {
- bd_set_scr(bd, pts);
+ int result = -1;
+
+ bd_mutex_lock(&bd->mutex);
 
- return _run_gc(bd, GC_CTRL_VK_KEY, key);
+ _set_scr(bd, pts);
+
+ if (bd->title_type == title_hdmv) {
+ result = _run_gc(bd, GC_CTRL_VK_KEY, key);
+ } else if (bd->title_type == title_bdj) {
+ result = _bdj_event(bd, BDJ_EVENT_VK_KEY, key);
+ }
+
+ bd_mutex_unlock(&bd->mutex);
+
+ return result;
 }
 
 void bd_register_overlay_proc(BLURAY *bd, void *handle, bd_overlay_proc_f func)
@@ -2457,11 +3165,39 @@
 return;
 }
 
+ bd_mutex_lock(&bd->mutex);
+
 gc_free(&bd->graphics_controller);
 
 if (func) {
 bd->graphics_controller = gc_init(bd->regs, handle, func);
 }
+
+ bd_mutex_unlock(&bd->mutex);
+}
+
+void bd_register_argb_overlay_proc(BLURAY *bd, void *handle, bd_argb_overlay_proc_f func, BD_ARGB_BUFFER *buf)
+{
+ if (!bd) {
+ return;
+ }
+
+ bd_mutex_lock(&bd->mutex);
+
+ if (bd->argb_overlay_proc && bd->title_type == title_bdj) {
+ /* function can't be changed when BD-J is running */
+ bd_mutex_unlock(&bd->mutex);
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "bd_register_argb_overlay_proc(): ARGB handler already registered and BD-J running !\n");
+ return;
+ }
+
+ _close_bdj(bd);
+
+ bd->argb_overlay_proc = func;
+ bd->argb_overlay_proc_handle = handle;
+ bd->argb_buffer = buf;
+
+ bd_mutex_unlock(&bd->mutex);
 }
 
 int bd_get_sound_effect(BLURAY *bd, unsigned sound_id, BLURAY_SOUND_EFFECT *effect)
@@ -2522,12 +3258,17 @@
 struct clpi_cl *bd_get_clpi(BLURAY *bd, unsigned clip_ref)
 {
 if (bd->title && clip_ref < bd->title->clip_list.count) {
- NAV_CLIP *clip = &bd->title->clip_list.clip[clip_ref];
- return clpi_copy(clip->cl);
+ NAV_CLIP *clip = &bd->title->clip_list.clip[clip_ref];
+ return clpi_copy(clip->cl);
 }
 return NULL;
 }
 
+struct clpi_cl *bd_read_clpi(const char *path)
+{
+ return clpi_parse(path);
+}
+
 void bd_free_clpi(struct clpi_cl *cl)
 {
 clpi_free(cl);

libbluray-0.2.3.tar.bz2/src/libbluray/bluray.h -> libbluray-0.5.0.tar.bz2/src/libbluray/bluray.h Changed

@@ -130,6 +130,7 @@
 uint8_t lang[4];
 uint16_t pid;
 uint8_t aspect;
+ uint8_t subpath_id;
 } BLURAY_STREAM_INFO;
 
 typedef struct bd_clip {
@@ -148,6 +149,10 @@
 BLURAY_STREAM_INFO *ig_streams;
 BLURAY_STREAM_INFO *sec_audio_streams;
 BLURAY_STREAM_INFO *sec_video_streams;
+
+ uint64_t start_time;
+ uint64_t in_time;
+ uint64_t out_time;
 } BLURAY_CLIP_INFO;
 
 typedef struct bd_chapter {
@@ -155,8 +160,18 @@
 uint64_t start;
 uint64_t duration;
 uint64_t offset;
+ unsigned clip_ref;
 } BLURAY_TITLE_CHAPTER;
 
+typedef struct bd_mark {
+ uint32_t idx;
+ int type;
+ uint64_t start;
+ uint64_t duration;
+ uint64_t offset;
+ unsigned clip_ref;
+} BLURAY_TITLE_MARK;
+
 typedef struct bd_title_info {
 uint32_t idx;
 uint32_t playlist;
@@ -166,6 +181,9 @@
 uint32_t chapter_count;
 BLURAY_CLIP_INFO *clips;
 BLURAY_TITLE_CHAPTER *chapters;
+
+ uint32_t mark_count;
+ BLURAY_TITLE_MARK *marks;
 } BLURAY_TITLE_INFO;
 
 typedef struct bd_sound_effect {
@@ -195,6 +213,16 @@
 
 /**
 *
+ * Get main title
+ * Returned number is an index to the list created by bd_get_titles()
+ *
+ * @param bd BLURAY object
+ * @return title index of main title, -1 on error
+ */
+int bd_get_main_title(BLURAY *bd);
+
+/**
+ *
 * Get information about a title
 *
 * @param bd BLURAY object
@@ -240,7 +268,7 @@
 void bd_close(BLURAY *bd);
 
 /**
- * Seek to pos in corrently selected title
+ * Seek to pos in currently selected title
 *
 * @param bd BLURAY object
 * @param pos position to seek to
@@ -319,6 +347,16 @@
 
 /**
 *
+ * Seek to a playitem.
+ *
+ * @param bd BLURAY object
+ * @param playitem to seek to
+ * @return current seek position
+ */
+int64_t bd_seek_playitem(BLURAY *bd, unsigned clip_ref);
+
+/**
+ *
 * Select a playlist
 *
 * @param bd BLURAY object
@@ -403,6 +441,23 @@
 */
 uint64_t bd_tell_time(BLURAY *bd);
 
+/**
+ *
+ * Select stream (PG / TextST track)
+ *
+ * This function can be used to override automatic stream selection.
+ * Selecting the stream is useful only when using libbluray internal decoders
+ * or stream is stored in a sub-path.
+ *
+ * @param bd BLURAY object
+ * @param stream_type BLURAY_*_STREAM
+ * @param stream_id stream number (1..N)
+ * @param enable_flag set to 0 to disable streams of this type
+ */
+#define BLURAY_PG_TEXTST_STREAM 1
+
+void bd_select_stream(BLURAY *bd, uint32_t stream_type, uint32_t stream_id, uint32_t enable_flag);
+
 /*
 * Disc info
 */
@@ -441,6 +496,15 @@
 /* Disc ID */
 uint8_t disc_id[20];
 
+ uint8_t bdj_detected; /* 1 if disc uses BD-J */
+ uint8_t bdj_supported; /* 1 if BD-J support was compiled in */
+ uint8_t libjvm_detected; /* 1 if usable Java VM was found */
+ uint8_t bdj_handled; /* 1 if usable Java VM + libbluray.jar was found */
+
+ /* BD+ content code generation */
+ uint8_t bdplus_gen;
+ /* BD+ content code relese date */
+ uint32_t bdplus_date; /* (year << 16) | (month << 8) | day */
 } BLURAY_DISC_INFO;
 
 /**
@@ -464,9 +528,14 @@
 BLURAY_PLAYER_SETTING_MENU_LANG = 18, /* Initial menu language: ISO 639-2 string, ex. "eng" */
 BLURAY_PLAYER_SETTING_COUNTRY_CODE = 19, /* Player country code: ISO 3166-1 string, ex. "de" */
 BLURAY_PLAYER_SETTING_REGION_CODE = 20, /* Player region code: 1 - region A, 2 - B, 4 - C */
+ BLURAY_PLAYER_SETTING_OUTPUT_PREFER = 21, /* output mode preference: 0 - 2D, 1 - 3D */
+ BLURAY_PLAYER_SETTING_DISPLAY_CAP = 23, /* Display capability (bit mask) */
+ BLURAY_PLAYER_SETTING_3D_CAP = 24, /* 3D capability (bit mask) */
 BLURAY_PLAYER_SETTING_VIDEO_CAP = 29, /* Player capability for video (bit mask) */
 BLURAY_PLAYER_SETTING_TEXT_CAP = 30, /* Player capability for text subtitle (bit mask) */
 BLURAY_PLAYER_SETTING_PLAYER_PROFILE = 31, /* Profile1: 0, Profile1+: 1, Profile2: 3, Profile3: 8 */
+
+ BLURAY_PLAYER_SETTING_DECODE_PG = 0x100, /* enable/disable PG (subtitle) decoder */
 } bd_player_setting;
 
 /**
@@ -493,50 +562,84 @@
 */
 
 typedef enum {
- BD_EVENT_NONE = 0,
- BD_EVENT_ERROR, /* Fatal error. Playback can't be continued. */
- BD_EVENT_READ_ERROR, /* Reading of .m2ts aligned unit failed. Next call to read will try next block. */
- BD_EVENT_ENCRYPTED, /* .m2ts file is encrypted and can't be played */
-
- /* current playback position */
- BD_EVENT_ANGLE, /* current angle, 1...N */
- BD_EVENT_TITLE, /* current title, 1...N (0 = top menu) */
- BD_EVENT_PLAYLIST, /* current playlist (xxxxx.mpls) */
- BD_EVENT_PLAYITEM, /* current play item, 0...N-1 */
- BD_EVENT_CHAPTER, /* current chapter, 1...N */
- BD_EVENT_END_OF_TITLE,
-
- /* stream selection */
- BD_EVENT_AUDIO_STREAM, /* 1..32, 0xff = none */
- BD_EVENT_IG_STREAM, /* 1..32 */
- BD_EVENT_PG_TEXTST_STREAM, /* 1..255, 0xfff = none */
- BD_EVENT_PIP_PG_TEXTST_STREAM, /* 1..255, 0xfff = none */
- BD_EVENT_SECONDARY_AUDIO_STREAM, /* 1..32, 0xff = none */
- BD_EVENT_SECONDARY_VIDEO_STREAM, /* 1..32, 0xff = none */
-
- BD_EVENT_PG_TEXTST, /* 0 - disable, 1 - enable */
- BD_EVENT_PIP_PG_TEXTST, /* 0 - disable, 1 - enable */
- BD_EVENT_SECONDARY_AUDIO, /* 0 - disable, 1 - enable */
- BD_EVENT_SECONDARY_VIDEO, /* 0 - disable, 1 - enable */
- BD_EVENT_SECONDARY_VIDEO_SIZE, /* 0 - PIP, 0xf - fullscreen */
-
- /* HDMV VM or JVM seeked the stream. Next read() will return data from new position. */
- BD_EVENT_SEEK,
+
+ BD_EVENT_NONE = 0, /* no pending events */
+
+ /*
+ * errors
+ */
+
+ BD_EVENT_ERROR = 1, /* Fatal error. Playback can't be continued. */
+ BD_EVENT_READ_ERROR = 2, /* Reading of .m2ts aligned unit failed. Next call to read will try next block. */
+ BD_EVENT_ENCRYPTED = 3, /* .m2ts file is encrypted and can't be played */
+
+ /*
+ * current playback position
+ */
+
+ BD_EVENT_ANGLE = 4, /* current angle, 1...N */
+ BD_EVENT_TITLE = 5, /* current title, 1...N (0 = top menu) */
+ BD_EVENT_PLAYLIST = 6, /* current playlist (xxxxx.mpls) */
+ BD_EVENT_PLAYITEM = 7, /* current play item, 0...N-1 */
+ BD_EVENT_CHAPTER = 8, /* current chapter, 1...N */
+ BD_EVENT_PLAYMARK = 30, /* playmark reached */
+ BD_EVENT_END_OF_TITLE = 9,
+
+ /*
+ * stream selection
+ */
+
+ BD_EVENT_AUDIO_STREAM = 10, /* 1..32, 0xff = none */
+ BD_EVENT_IG_STREAM = 11, /* 1..32 */
+ BD_EVENT_PG_TEXTST_STREAM = 12, /* 1..255, 0xfff = none */
+ BD_EVENT_PIP_PG_TEXTST_STREAM = 13, /* 1..255, 0xfff = none */
+ BD_EVENT_SECONDARY_AUDIO_STREAM = 14, /* 1..32, 0xff = none */
+ BD_EVENT_SECONDARY_VIDEO_STREAM = 15, /* 1..32, 0xff = none */
+
+ BD_EVENT_PG_TEXTST = 16, /* 0 - disable, 1 - enable */
+ BD_EVENT_PIP_PG_TEXTST = 17, /* 0 - disable, 1 - enable */
+ BD_EVENT_SECONDARY_AUDIO = 18, /* 0 - disable, 1 - enable */
+ BD_EVENT_SECONDARY_VIDEO = 19, /* 0 - disable, 1 - enable */
+ BD_EVENT_SECONDARY_VIDEO_SIZE = 20, /* 0 - PIP, 0xf - fullscreen */
+
+ /*
+ * playback control
+ */
+
+ /* discontinuity in the stream (non-seamless connection). Reset demuxer PES buffers. */
+ BD_EVENT_DISCONTINUITY = 28, /* new timestamp (45 kHz) */
+
+ /* HDMV VM or JVM seeked the stream. Next read() will return data from new position. Flush all buffers. */
+ BD_EVENT_SEEK = 21,
 
 /* still playback (pause) */
- BD_EVENT_STILL, /* 0 - off, 1 - on */
+ BD_EVENT_STILL = 22, /* 0 - off, 1 - on */
 
- /* Still playback for n seconds (reached end of still mode play item) */
- BD_EVENT_STILL_TIME, /* 0 = infinite ; 1...300 = seconds */
+ /* Still playback for n seconds (reached end of still mode play item).
+ * Playback continues by calling bd_read_skip_still(). */
+ BD_EVENT_STILL_TIME = 23, /* 0 = infinite ; 1...300 = seconds */
 
 /* Play sound effect */
- BD_EVENT_SOUND_EFFECT, /* effect ID */
+ BD_EVENT_SOUND_EFFECT = 24, /* effect ID */
+
+ /*
+ * status
+ */
+
+ /* Nothing to do. Playlist is not playing, but title applet is running. */
+ BD_EVENT_IDLE = 29,
 
 /* Pop-Up menu available */
- BD_EVENT_POPUP, /* 0 - no, 1 - yes */
+ BD_EVENT_POPUP = 25, /* 0 - no, 1 - yes */
 
 /* Interactive menu visible */
- BD_EVENT_MENU, /* 0 - no, 1 - yes */
+ BD_EVENT_MENU = 26, /* 0 - no, 1 - yes */
+
+ /* 3D */
+ BD_EVENT_STEREOSCOPIC_STATUS = 27, /* 0 - 2D, 1 - 3D */
+
+ /*BD_EVENT_LAST = 30, */
+
 } bd_event_e;
 
 typedef struct {
@@ -544,6 +647,15 @@
 uint32_t param;
 } BD_EVENT;
 
+/* BD_EVENT_ERROR param values */
+#define BD_ERROR_HDMV 1
+#define BD_ERROR_BDJ 2
+
+/* BD_EVENT_ENCRYPTED param vlues */
+#define BD_ERROR_AACS 3
+#define BD_ERROR_BDPLUS 4
+
+
 #define BLURAY_TITLE_FIRST_PLAY 0xffff
 #define BLURAY_TITLE_TOP_MENU 0
 /**
@@ -615,12 +727,25 @@
 * User interaction and On-screen display controller
 */
 
-struct bd_overlay_s; /* defined in overlay.h */
+struct bd_overlay_s; /* defined in overlay.h */
+struct bd_argb_overlay_s; /* defined in overlay.h */
+struct bd_argb_buffer_s; /* defined in overlay.h */
 typedef void (*bd_overlay_proc_f)(void *, const struct bd_overlay_s * const);
+typedef void (*bd_argb_overlay_proc_f)(void *, const struct bd_argb_overlay_s * const);
+
 
 /**
 *
- * Register overlay graphics handler function.
+ * Register YUV overlay graphics handler function.
+ *
+ * Only compressed YUV HDMV overlays will be passed to this function.
+ * This function can be used when player does not support full-screen ARGB overlays
+ * or player can optimize drawing of compressed overlays, color space conversion etc.
+ *
+ * Callback function is called from application thread context while bd_*() functions
+ * are called.
+ *
+ * Note that BD-J mode outputs only ARGB graphics.
 *
 * @param bd BLURAY object
 * @param handle application-specific handle that will be passed to handler function
@@ -631,6 +756,32 @@
 
 /**
 *
+ * Register ARGB overlay graphics handler function.
+ *
+ * BD-J graphics can be acquired only with this function.
+ *
+ * Callback function can be called at any time by a thread created by JAVA VM.
+ * No more than single call for each overlay plane are executed in paraller.
+ *
+ * @param bd BLURAY object
+ * @param handle application-specific handle that will be passed to handler function
+ * @param func handler function pointer
+ * @param buf optional application-allocated frame buffer
+ * @return 1 on success, 0 if error
+ */
+void bd_register_argb_overlay_proc(BLURAY *bd, void *handle, bd_argb_overlay_proc_f func, struct bd_argb_buffer_s *buf);
+
+/**
+ *
+ * Update current pts.
+ *
+ * @param bd BLURAY object
+ * @param pts current playback position (1/90000s) or -1
+ */
+void bd_set_scr(BLURAY *bd, int64_t pts);
+
+/**
+ *
 * Pass user input to graphics controller.
 * Keys are defined in libbluray/keys.h.
 * Current pts can be updated by using BD_VK_NONE key. This is required for animated menus.
@@ -690,6 +841,7 @@
 * @return pointer to allocated CLPI_CL object on success, NULL on error
 */
 struct clpi_cl *bd_get_clpi(BLURAY *bd, unsigned clip_ref);
+struct clpi_cl *bd_read_clpi(const char *clpi_file);
 
 /**
 *

libbluray-0.5.0.tar.bz2/src/libbluray/bluray_internal.h Added

@@ -0,0 +1,37 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2012 libbluray
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(_BLURAY_INTERNAL_H_)
+#define _BLURAY_INTERNAL_H_
+
+#include <util/attributes.h>
+
+#include "bluray.h"
+
+#include <stdint.h>
+
+BD_PRIVATE const uint8_t *bd_get_aacs_data(BLURAY *bd, int type);
+
+BD_PRIVATE uint64_t bd_get_uo_mask(BLURAY *bd);
+BD_PRIVATE int bd_play_title_internal(BLURAY *bd, unsigned title);
+
+BD_PRIVATE uint32_t bd_reg_read(BLURAY *bd, int psr, int reg);
+BD_PRIVATE int bd_reg_write(BLURAY *bd, int psr, int reg, uint32_t value);
+
+#endif /* _BLURAY_INTERNAL_H_ */

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/.deps Added

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/.deps/graphics_controller.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/.deps/graphics_processor.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/.deps/ig_decode.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/.deps/m2ts_demux.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/.deps/m2ts_filter.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/.deps/pes_buffer.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/.deps/pg_decode.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/.deps/rle.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/.deps/textst_decode.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/.deps/textst_render.Plo Added

libbluray-0.2.3.tar.bz2/src/libbluray/decoders/graphics_controller.c -> libbluray-0.5.0.tar.bz2/src/libbluray/decoders/graphics_controller.c Changed

@@ -1,6 +1,6 @@
 /*
 * This file is part of libbluray
- * Copyright (C) 2010 hpi1
+ * Copyright (C) 2010-2013 Petri Hintukainen <phintuka@users.sourceforge.net>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -22,10 +22,13 @@
 #include "graphics_processor.h"
 #include "ig.h"
 #include "overlay.h"
+#include "textst_render.h"
+#include "rle.h"
 
 #include "util/macro.h"
 #include "util/logging.h"
 #include "util/mutex.h"
+#include "util/time.h"
 
 #include "../register.h"
 #include "../keys.h"
@@ -45,6 +48,7 @@
 uint16_t x, y, w, h; /* button rect on overlay plane (if drawn) */
 int visible_object_id; /* id of currently visible object */
 int animate_indx; /* currently showing object index of animated button, < 0 for static buttons */
+ int effect_running; /* single-loop animation not yet complete */
 } BOG_DATA;
 
 struct graphics_controller_s {
@@ -70,13 +74,34 @@
 BOG_DATA *bog_data;
 BOG_DATA *saved_bog_data;
 
+ /* page effects */
+ int effect_idx;
+ BD_IG_EFFECT_SEQUENCE *in_effects;
+ BD_IG_EFFECT_SEQUENCE *out_effects;
+ int64_t next_effect_time; /* 90 kHz */
+
+ /* timers */
+ int64_t user_timeout;
+
+ /* animated buttons */
+ unsigned frame_interval;
+ unsigned button_effect_running;
+ unsigned button_animation_running;
+
 /* data */
 PG_DISPLAY_SET *pgs;
 PG_DISPLAY_SET *igs;
+ PG_DISPLAY_SET *tgs; /* TextST */
 
 /* */
 GRAPHICS_PROCESSOR *pgp;
 GRAPHICS_PROCESSOR *igp;
+ GRAPHICS_PROCESSOR *tgp; /* TextST */
+
+ /* */
+ TEXTST_RENDER *textst_render;
+ int next_dialog_idx;
+ int textst_user_style;
 };
 
 /*
@@ -181,6 +206,7 @@
 }
 
 if (bog_data) {
+ bog_data->effect_running = 0;
 if (bog_data->animate_indx >= 0) {
 int range = object_id_end - object_id;
 
@@ -190,27 +216,43 @@
 
 object_id += bog_data->animate_indx % (range + 1);
 bog_data->animate_indx++;
- if (!repeat && bog_data->animate_indx > range) {
- /* terminate animation to the last object */
- bog_data->animate_indx = -1;
+ if (!repeat) {
+ if (bog_data->animate_indx > range) {
+ /* terminate animation to the last object */
+ bog_data->animate_indx = -1;
+ } else {
+ bog_data->effect_running = 1;
+ }
 }
-
 } else {
 /* no animation for this button */
 bog_data->animate_indx = -1;
 }
+ } else {
+ if (object_id_end < 0xfffe) {
+ object_id = object_id_end;
+ }
 }
 }
 
- if (!repeat && object_id_end < 0xfffe) {
- object_id = object_id_end;
- }
-
 object = _find_object(s, object_id);
 
 return object;
 }
 
+static BD_TEXTST_REGION_STYLE *_find_region_style(BD_TEXTST_DIALOG_STYLE *p, unsigned region_style_id)
+{
+ unsigned ii;
+
+ for (ii = 0; ii < p->region_style_count; ii++) {
+ if (p->region_style[ii].region_style_id == region_style_id) {
+ return &p->region_style[ii];
+ }
+ }
+
+ return NULL;
+}
+
 /*
 * util
 */
@@ -288,10 +330,24 @@
 return 0xffff;
 }
 
+static void _reset_user_timeout(GRAPHICS_CONTROLLER *gc)
+{
+ gc->user_timeout = 0;
+
+ if (gc->igs->ics->interactive_composition.ui_model == IG_UI_MODEL_POPUP ||
+ bd_psr_read(gc->regs, PSR_MENU_PAGE_ID) != 0) {
+
+ gc->user_timeout = gc->igs->ics->interactive_composition.user_timeout_duration;
+ if (gc->user_timeout) {
+ gc->user_timeout += bd_get_scr();
+ }
+ }
+}
+
 static int _save_page_state(GRAPHICS_CONTROLLER *gc)
 {
 if (!gc->bog_data) {
- GC_ERROR("_save_page_state(): no bog data !\n");
+ GC_TRACE("_save_page_state(): no bog data !\n");
 return -1;
 }
 
@@ -322,6 +378,9 @@
 
 static int _restore_page_state(GRAPHICS_CONTROLLER *gc)
 {
+ gc->in_effects = NULL;
+ gc->out_effects = NULL;
+
 if (gc->saved_bog_data) {
 if (gc->bog_data) {
 GC_ERROR("_restore_page_state(): bog data already exists !\n");
@@ -359,23 +418,49 @@
 gc->bog_data[ii].animate_indx = 0;
 gc->bog_data[ii].visible_object_id = -1;
 }
+
+ /* animation frame rate */
+ static const unsigned frame_interval[8] = {
+ 0,
+ 90000 / 1001 * 24,
+ 90000 / 1000 * 24,
+ 90000 / 1000 * 25,
+ 90000 / 1001 * 30,
+ 90000 / 1000 * 50,
+ 90000 / 1001 * 60,
+ };
+ gc->frame_interval = frame_interval[s->ics->video_descriptor.frame_rate] * (page->animation_frame_rate_code + 1);
+
+ /* effects */
+ gc->effect_idx = 0;
+ gc->in_effects = NULL;
+ gc->out_effects = NULL;
+
+ /* timers */
+ _reset_user_timeout(gc);
 }
 
 /*
 * overlay operations
 */
 
+#if defined __GNUC__
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
+
 static void _open_osd(GRAPHICS_CONTROLLER *gc, int plane,
+ unsigned x0, unsigned y0,
 unsigned width, unsigned height)
 {
 if (gc->overlay_proc) {
- const BD_OVERLAY ov = {
- .cmd = BD_OVERLAY_INIT,
- .pts = -1,
- .plane = plane,
- .w = width,
- .h = height,
- };
+ BD_OVERLAY ov = {0};
+ ov.cmd = BD_OVERLAY_INIT;
+ ov.pts = -1;
+ ov.plane = plane;
+ ov.x = x0;
+ ov.y = y0;
+ ov.w = width;
+ ov.h = height;
 
 gc->overlay_proc(gc->overlay_proc_handle, &ov);
 
@@ -390,11 +475,10 @@
 static void _close_osd(GRAPHICS_CONTROLLER *gc, int plane)
 {
 if (gc->overlay_proc) {
- const BD_OVERLAY ov = {
- .cmd = BD_OVERLAY_CLOSE,
- .pts = -1,
- .plane = plane,
- };
+ BD_OVERLAY ov = {0};
+ ov.cmd = BD_OVERLAY_CLOSE;
+ ov.pts = -1;
+ ov.plane = plane;
 
 gc->overlay_proc(gc->overlay_proc_handle, &ov);
 }
@@ -411,30 +495,39 @@
 static void _flush_osd(GRAPHICS_CONTROLLER *gc, int plane, int64_t pts)
 {
 if (gc->overlay_proc) {
- const BD_OVERLAY ov = {
- .cmd = BD_OVERLAY_FLUSH,
- .pts = pts,
- .plane = plane,
- };
+ BD_OVERLAY ov = {0};
+ ov.cmd = BD_OVERLAY_FLUSH;
+ ov.pts = pts;
+ ov.plane = plane;
 
 gc->overlay_proc(gc->overlay_proc_handle, &ov);
 }
 }
 
-static void _clear_osd_area(GRAPHICS_CONTROLLER *gc, int plane,
+static void _hide_osd(GRAPHICS_CONTROLLER *gc, int plane)
+{
+ if (gc->overlay_proc) {
+ BD_OVERLAY ov = {0};
+ ov.cmd = BD_OVERLAY_HIDE;
+ ov.plane = plane;
+
+ gc->overlay_proc(gc->overlay_proc_handle, &ov);
+ }
+}
+
+static void _clear_osd_area(GRAPHICS_CONTROLLER *gc, int plane, int64_t pts,
 uint16_t x, uint16_t y, uint16_t w, uint16_t h)
 {
 if (gc->overlay_proc) {
 /* wipe area */
- const BD_OVERLAY ov = {
- .cmd = BD_OVERLAY_WIPE,
- .pts = -1,
- .plane = plane,
- .x = x,
- .y = y,
- .w = w,
- .h = h,
- };
+ BD_OVERLAY ov = {0};
+ ov.cmd = BD_OVERLAY_WIPE;
+ ov.pts = pts;
+ ov.plane = plane;
+ ov.x = x;
+ ov.y = y;
+ ov.w = w;
+ ov.h = h;
 
 gc->overlay_proc(gc->overlay_proc_handle, &ov);
 }
@@ -444,11 +537,10 @@
 {
 if (gc->overlay_proc) {
 /* clear plane */
- const BD_OVERLAY ov = {
- .cmd = BD_OVERLAY_CLEAR,
- .pts = -1,
- .plane = plane,
- };
+ BD_OVERLAY ov = {0};
+ ov.cmd = BD_OVERLAY_CLEAR;
+ ov.pts = -1;
+ ov.plane = plane;
 
 gc->overlay_proc(gc->overlay_proc_handle, &ov);
 }
@@ -464,7 +556,7 @@
 {
 if (gc->ig_drawn && bog_data->w && bog_data->h) {
 
- _clear_osd_area(gc, BD_OVERLAY_IG, bog_data->x, bog_data->y, bog_data->w, bog_data->h);
+ _clear_osd_area(gc, BD_OVERLAY_IG, -1, bog_data->x, bog_data->y, bog_data->w, bog_data->h);
 
 bog_data->x = bog_data->y = bog_data->w = bog_data->h = 0;
 bog_data->visible_object_id = -1;
@@ -480,17 +572,76 @@
 BD_PG_PALETTE *palette)
 {
 if (gc->overlay_proc) {
- BD_OVERLAY ov = {
- .cmd = BD_OVERLAY_DRAW,
- .pts = pts,
- .plane = plane,
- .x = x,
- .y = y,
- .w = object->width,
- .h = object->height,
- .palette = palette->entry,
- .img = object->img,
- };
+ BD_OVERLAY ov = {0};
+ ov.cmd = BD_OVERLAY_DRAW;
+ ov.pts = pts;
+ ov.plane = plane;
+ ov.x = x;
+ ov.y = y;
+ ov.w = object->width;
+ ov.h = object->height;
+ ov.palette = palette->entry;
+ ov.img = object->img;
+
+ gc->overlay_proc(gc->overlay_proc_handle, &ov);
+ }
+}
+
+static void _render_composition_object(GRAPHICS_CONTROLLER *gc,
+ int64_t pts, unsigned plane,
+ BD_PG_COMPOSITION_OBJECT *cobj,
+ BD_PG_OBJECT *object,
+ BD_PG_PALETTE *palette,
+ int palette_update_flag)
+{
+ if (gc->overlay_proc) {
+ BD_PG_RLE_ELEM *cropped_img = NULL;
+ BD_OVERLAY ov = {0};
+ ov.cmd = BD_OVERLAY_DRAW;
+ ov.pts = pts;
+ ov.plane = plane;
+ ov.x = cobj->x;
+ ov.y = cobj->y;
+ ov.w = object->width;
+ ov.h = object->height;
+ ov.palette = palette->entry;
+ ov.img = object->img;
+
+ if (cobj->crop_flag) {
+ if (cobj->crop_x || cobj->crop_y || cobj->crop_w != object->width) {
+ ov.img = cropped_img = rle_crop_object(object->img, object->width,
+ cobj->crop_x, cobj->crop_y, cobj->crop_w, cobj->crop_h);
+ }
+ ov.w = cobj->crop_w;
+ ov.h = cobj->crop_h;
+ }
+
+ ov.palette_update_flag = palette_update_flag;
+
+ gc->overlay_proc(gc->overlay_proc_handle, &ov);
+
+ bd_refcnt_dec(cropped_img);
+ }
+}
+
+static void _render_rle(GRAPHICS_CONTROLLER *gc,
+ int64_t pts,
+ BD_PG_RLE_ELEM *img,
+ uint16_t x, uint16_t y,
+ uint16_t width, uint16_t height,
+ BD_PG_PALETTE_ENTRY *palette)
+{
+ if (gc->overlay_proc) {
+ BD_OVERLAY ov = {0};
+ ov.cmd = BD_OVERLAY_DRAW;
+ ov.pts = pts;
+ ov.plane = BD_OVERLAY_PG;
+ ov.x = x;
+ ov.y = y;
+ ov.w = width;
+ ov.h = height;
+ ov.palette = palette;
+ ov.img = img;
 
 gc->overlay_proc(gc->overlay_proc_handle, &ov);
 }
@@ -502,22 +653,53 @@
 
 static void _select_button(GRAPHICS_CONTROLLER *gc, uint32_t button_id)
 {
+ BD_IG_PAGE *page = NULL;
+ unsigned page_id = bd_psr_read(gc->regs, PSR_MENU_PAGE_ID);
+ unsigned bog_idx = 0;
+
+ /* reset animation */
+ page = _find_page(&gc->igs->ics->interactive_composition, page_id);
+ if (page && _find_button_page(page, button_id, &bog_idx)) {
+ gc->bog_data[bog_idx].animate_indx = 0;
+ gc->next_effect_time = bd_get_scr();
+ }
+
+ /* select page */
 bd_psr_write(gc->regs, PSR_SELECTED_BUTTON_ID, button_id);
 gc->auto_action_triggered = 0;
 }
 
-static void _select_page(GRAPHICS_CONTROLLER *gc, uint16_t page_id)
+static void _select_page(GRAPHICS_CONTROLLER *gc, uint16_t page_id, int out_effects)
 {
+ unsigned cur_page_id = bd_psr_read(gc->regs, PSR_MENU_PAGE_ID);
+ BD_IG_PAGE *page = NULL;
+
 bd_psr_write(gc->regs, PSR_MENU_PAGE_ID, page_id);
- if (gc->ig_open) {
- _clear_osd(gc, BD_OVERLAY_IG);
- }
+
 _reset_page_state(gc);
 
 uint16_t button_id = _find_selected_button_id(gc);
 _select_button(gc, button_id);
 
 gc->valid_mouse_position = 0;
+
+ if (out_effects) {
+ page = _find_page(&gc->igs->ics->interactive_composition, cur_page_id);
+ if (page && page->out_effects.num_effects) {
+ gc->next_effect_time = bd_get_scr();
+ gc->out_effects = &page->out_effects;
+ }
+ }
+
+ page = _find_page(&gc->igs->ics->interactive_composition, page_id);
+ if (page && page->in_effects.num_effects) {
+ gc->next_effect_time = bd_get_scr();
+ gc->in_effects = &page->in_effects;
+ }
+
+ if (gc->ig_open && !gc->out_effects) {
+ _clear_osd(gc, BD_OVERLAY_IG);
+ }
 }
 
 static void _gc_reset(GRAPHICS_CONTROLLER *gc)
@@ -534,9 +716,15 @@
 
 graphics_processor_free(&gc->igp);
 graphics_processor_free(&gc->pgp);
+ graphics_processor_free(&gc->tgp);
 
 pg_display_set_free(&gc->pgs);
 pg_display_set_free(&gc->igs);
+ pg_display_set_free(&gc->tgs);
+
+ textst_render_free(&gc->textst_render);
+ gc->next_dialog_idx = 0;
+ gc->textst_user_style = -1;
 
 X_FREE(gc->bog_data);
 }
@@ -596,6 +784,8 @@
 
 bd_psr_register_cb(regs, _process_psr_event, p);
 
+ p->textst_user_style = -1;
+
 return p;
 }
 
@@ -652,6 +842,20 @@
 return 0;
 }
 
+ /* TODO: */
+ if (gc->igs->ics) {
+ if (gc->igs->ics->interactive_composition.composition_timeout_pts > 0) {
+ GC_TRACE("gc_decode_ts(): IG composition_timeout_pts not implemented\n");
+ }
+ if (gc->igs->ics->interactive_composition.selection_timeout_pts) {
+ GC_TRACE("gc_decode_ts(): IG selection_timeout_pts not implemented\n");
+ }
+ if (gc->igs->ics->interactive_composition.user_timeout_duration) {
+ GC_TRACE("gc_decode_ts(): IG user_timeout_duration %d\n",
+ gc->igs->ics->interactive_composition.user_timeout_duration);
+ }
+ }
+
 bd_mutex_unlock(&gc->mutex);
 
 return 1;
@@ -673,9 +877,321 @@
 return 1;
 }
 
+ else if (pid == 0x1800) {
+ /* TextST stream */
+ if (!gc->tgp) {
+ gc->tgp = graphics_processor_init();
+ }
+ graphics_processor_decode_ts(gc->tgp, &gc->tgs,
+ pid, block, num_blocks,
+ stc);
+
+ if (!gc->tgs || !gc->tgs->complete) {
+ return 0;
+ }
+
+ return 1;
+ }
+
+ return -1;
+}
+
+/*
+ * TextST rendering
+ */
+
+static int _textst_style_select(GRAPHICS_CONTROLLER *p, int user_style_idx)
+{
+ p->textst_user_style = user_style_idx;
+
+ GC_ERROR("User style selection not implemented\n");
 return -1;
 }
 
+int gc_add_font(GRAPHICS_CONTROLLER *p, const char *font_file)
+{
+ if (!p) {
+ return -1;
+ }
+
+ if (!font_file) {
+ textst_render_free(&p->textst_render);
+ return 0;
+ }
+
+ if (!p->textst_render) {
+ p->textst_render = textst_render_init();
+ }
+
+ return textst_render_add_font(p->textst_render, font_file);
+}
+
+static int _render_textst_region(GRAPHICS_CONTROLLER *p, int64_t pts, BD_TEXTST_REGION_STYLE *style, TEXTST_BITMAP *bmp,
+ BD_PG_PALETTE_ENTRY *palette)
+{
+ unsigned y, bmp_y;
+ RLE_ENC rle;
+
+ rle_begin(&rle);
+
+ for (y = 0, bmp_y = 0; y < style->region_info.region.height; y++) {
+ if (y < style->text_box.ypos || y >= style->text_box.ypos + style->text_box.height) {
+ rle_add_bite(&rle, style->region_info.background_color, style->region_info.region.width);
+ } else {
+ rle_add_bite(&rle, style->region_info.background_color, style->text_box.xpos);
+ rle_compress_chunk(&rle, bmp->mem + bmp->stride * bmp_y, bmp->width);
+ bmp_y++;
+ rle_add_bite(&rle, style->region_info.background_color,
+ style->region_info.region.width - style->text_box.width - style->text_box.xpos);
+ }
+
+ rle_add_eol(&rle);
+ }
+
+ _render_rle(p, pts, rle_get(&rle),
+ style->region_info.region.xpos, style->region_info.region.ypos,
+ style->region_info.region.width, style->region_info.region.height,
+ palette);
+
+ rle_end(&rle);
+
+ return 0;
+}
+
+static int _render_textst(GRAPHICS_CONTROLLER *p, uint32_t stc, GC_NAV_CMDS *cmds)
+{
+ BD_TEXTST_DIALOG_PRESENTATION *dialog = NULL;
+ PG_DISPLAY_SET *s = p->tgs;
+ int64_t now = ((int64_t)stc) << 1;
+ unsigned ii, jj;
+
+ if (!s || !s->dialog || !s->style) {
+ GC_ERROR("_render_textst(): no TextST decoded\n");
+ return -1;
+ }
+ if (!p->textst_render) {
+ GC_ERROR("_render_textst(): no TextST renderer (missing fonts ?)\n");
+ return -1;
+ }
+
+ dialog = s->dialog;
+
+ /* loop over all matching dialogs */
+ for (ii = p->next_dialog_idx; ii < s->num_dialog; ii++) {
+
+ /* next dialog too far in future ? */
+ if (now < 1 || dialog[ii].start_pts >= now + 90000) {
+ cmds->wakeup_time = dialog[ii].start_pts / 2;
+ GC_TRACE("_render_textst(): next event #%d in %"PRId64" seconds (pts %"PRId64")\n",
+ ii, (dialog[ii].start_pts - now)/90000, dialog[ii].start_pts);
+ return 1;
+ }
+
+ p->next_dialog_idx = ii + 1;
+
+ /* too late ? */
+ if (dialog[ii].start_pts < now - 45000) {
+ GC_TRACE("_render_textst(): not showing #%d (start time passed)\n",ii);
+ continue;
+ }
+ if (dialog[ii].end_pts < now) {
+ GC_TRACE("_render_textst(): not showing #%d (hide time passed)\n",ii);
+ continue;
+ }
+
+ if (dialog[ii].palette_update) {
+ GC_ERROR("_render_textst(): Palette update not implemented\n");
+ continue;
+ }
+
+ GC_TRACE("_render_textst(): rendering dialog #%d (pts %"PRId64", diff %"PRId64"\n",
+ ii, dialog[ii].start_pts, dialog[ii].start_pts - now);
+
+
+ if (!dialog[ii].region_count) {
+ continue;
+ }
+
+ /* TODO: */
+ if (dialog[ii].region_count > 1) {
+ GC_ERROR("_render_textst(): Multiple regions not supported\n");
+ }
+
+ /* open PG overlay */
+ if (!p->pg_open) {
+ _open_osd(p, BD_OVERLAY_PG, 0, 0, 1920, 1080);
+ }
+
+ /* render all regions */
+ for (jj = 0; jj < dialog[ii].region_count; jj++) {
+
+ BD_TEXTST_DIALOG_REGION *region = &dialog[ii].region[jj];
+ BD_TEXTST_REGION_STYLE *style = NULL;
+
+ // TODO:
+ if (region->continous_present_flag) {
+ GC_ERROR("_render_textst(): continous_present_flag: not implemented\n");
+ }
+ if (region->forced_on_flag) {
+ GC_ERROR("_render_textst(): forced_on_flag: not implemented\n");
+ }
+
+ style = _find_region_style(s->style, region->region_style_id_ref);
+ if (!style) {
+ GC_ERROR("_render_textst: region style #%d not found\n", region->region_style_id_ref);
+ continue;
+ }
+
+ TEXTST_BITMAP bmp = {NULL, style->text_box.width, style->text_box.height, style->text_box.width};
+ bmp.mem = malloc(bmp.width * bmp.height);
+ memset(bmp.mem, style->region_info.background_color, bmp.width * bmp.height);
+
+ textst_render(p->textst_render, &bmp, style, region);
+
+ _render_textst_region(p, dialog[ii].start_pts, style, &bmp, s->style->palette);
+
+ X_FREE(bmp.mem);
+ }
+
+ /* commit changes */
+ _flush_osd(p, BD_OVERLAY_PG, dialog[ii].start_pts);
+
+ /* detect overlapping dialogs (not allowed) */
+ if (ii < s->num_dialog - 1) {
+ if (dialog[ii + 1].start_pts < dialog[ii].end_pts) {
+ GC_ERROR("_render_textst: overlapping dialogs detected\n");
+ }
+ }
+
+ /* push hide events */
+ for (jj = 0; jj < dialog[ii].region_count; jj++) {
+ BD_TEXTST_DIALOG_REGION *region = &dialog[ii].region[jj];
+ BD_TEXTST_REGION_STYLE *style = NULL;
+
+ style = _find_region_style(s->style, region->region_style_id_ref);
+ if (!style) {
+ continue;
+ }
+ _clear_osd_area(p, BD_OVERLAY_PG, dialog[ii].end_pts,
+ style->region_info.region.xpos, style->region_info.region.ypos,
+ style->region_info.region.width, style->region_info.region.height);
+ }
+
+ _hide_osd(p, BD_OVERLAY_PG);
+
+ /* commit changes */
+ _flush_osd(p, BD_OVERLAY_PG, dialog[ii].end_pts);
+ }
+
+ return 0;
+}
+
+
+/*
+ * PG rendering
+ */
+
+static int _render_pg_composition_object(GRAPHICS_CONTROLLER *gc,
+ int64_t pts,
+ BD_PG_COMPOSITION_OBJECT *cobj,
+ BD_PG_PALETTE *palette)
+{
+ BD_PG_COMPOSITION *pcs = gc->pgs->pcs;
+ BD_PG_OBJECT *object = NULL;
+
+ /* lookup object */
+ object = _find_object(gc->pgs, cobj->object_id_ref);
+ if (!object) {
+ GC_ERROR("_render_pg_composition_object: object #%d not found\n", cobj->object_id_ref);
+ return -1;
+ }
+
+ /* open PG overlay */
+ if (!gc->pg_open) {
+ _open_osd(gc, BD_OVERLAY_PG, 0, 0, pcs->video_descriptor.video_width, pcs->video_descriptor.video_height);
+ }
+
+ /* render object using composition parameters */
+ _render_composition_object(gc, pts, BD_OVERLAY_PG, cobj, object, palette, pcs->palette_update_flag);
+
+ return 0;
+}
+
+static int _render_pg(GRAPHICS_CONTROLLER *gc)
+{
+ PG_DISPLAY_SET *s = gc->pgs;
+ BD_PG_COMPOSITION *pcs = NULL;
+ BD_PG_PALETTE *palette = NULL;
+ unsigned display_flag;
+ unsigned ii;
+
+ if (!s || !s->pcs || !s->complete) {
+ GC_ERROR("_render_pg(): no composition\n");
+ return -1;
+ }
+ pcs = s->pcs;
+
+ /* mark PG display set handled */
+ gc->pgs->complete = 0;
+
+ /* lookup palette */
+ palette = _find_palette(gc->pgs, pcs->palette_id_ref);
+ if (!palette) {
+ GC_ERROR("_render_pg(): unknown palette id %d (have %d palettes)\n",
+ pcs->palette_id_ref, s->num_palette);
+ return -1;
+ }
+
+ display_flag = bd_psr_read(gc->regs, PSR_PG_STREAM) >> 31;
+
+ /* render objects */
+ for (ii = 0; ii < pcs->num_composition_objects; ii++) {
+ BD_PG_COMPOSITION_OBJECT *cobj = &pcs->composition_object[ii];
+ if (cobj->forced_on_flag) {
+ GC_ERROR("_render_pg(): forced_on_flag not implemented\n");
+ }
+ if (cobj->forced_on_flag || display_flag) {
+ _render_pg_composition_object(gc, pcs->pts, cobj, palette);
+ }
+ }
+
+ if (!gc->pg_open) {
+ return 0;
+ }
+
+ /* commit changes at given pts */
+ _flush_osd(gc, BD_OVERLAY_PG, pcs->pts);
+
+ /* clear plane but do not commit changes yet */
+ /* -> plane will be cleared and hidden when empty composition arrives */
+ /* (-> no need to store object regions for next update / clear event - or use expensive full plane clear) */
+ for (ii = 0; ii < pcs->num_composition_objects; ii++) {
+ BD_PG_COMPOSITION_OBJECT *cobj = &pcs->composition_object[ii];
+ BD_PG_OBJECT *object = _find_object(gc->pgs, cobj->object_id_ref);
+
+ if (object) {
+ _clear_osd_area(gc, BD_OVERLAY_PG, -1,
+ cobj->x, cobj->y, object->width, object->height);
+ }
+ }
+ _hide_osd(gc, BD_OVERLAY_PG);
+
+ return 0;
+}
+
+static void _reset_pg(GRAPHICS_CONTROLLER *gc)
+{
+ graphics_processor_free(&gc->pgp);
+
+ pg_display_set_free(&gc->pgs);
+
+ if (gc->pg_open) {
+ _close_osd(gc, BD_OVERLAY_PG);
+ }
+
+ gc->next_dialog_idx = 0;
+}
+
 /*
 * IG rendering
 */
@@ -704,9 +1220,11 @@
 return;
 }
 
- /* new object is smaller than already drawn one ? -> need to render background */
+ /* new object is smaller than already drawn one, or in different position ? -> need to render background */
 if (bog_data->w > object->width ||
- bog_data->h > object->height) {
+ bog_data->h > object->height ||
+ bog_data->x != button->x_pos ||
+ bog_data->y != button->y_pos) {
 
 /* make sure we won't wipe other buttons */
 unsigned ii, skip = 0;
@@ -743,6 +1261,57 @@
 gc->ig_dirty = 1;
 }
 
+static int _render_ig_composition_object(GRAPHICS_CONTROLLER *gc,
+ int64_t pts,
+ BD_PG_COMPOSITION_OBJECT *cobj,
+ BD_PG_PALETTE *palette)
+{
+ BD_PG_OBJECT *object = NULL;
+
+ /* lookup object */
+ object = _find_object(gc->igs, cobj->object_id_ref);
+ if (!object) {
+ GC_ERROR("_render_ig_composition_object: object #%d not found\n", cobj->object_id_ref);
+ return -1;
+ }
+
+ /* render object using composition parameters */
+ _render_composition_object(gc, pts, BD_OVERLAY_IG, cobj, object, palette, 0);
+
+ return 0;
+}
+
+static int _render_effect(GRAPHICS_CONTROLLER *gc, BD_IG_EFFECT *effect)
+{
+ BD_PG_PALETTE *palette = NULL;
+ unsigned ii;
+ int64_t pts = -1;
+
+ if (!gc->ig_open) {
+ _open_osd(gc, BD_OVERLAY_IG, 0, 0,
+ gc->igs->ics->video_descriptor.video_width,
+ gc->igs->ics->video_descriptor.video_height);
+ }
+
+ _clear_osd(gc, BD_OVERLAY_IG);
+
+ palette = _find_palette(gc->igs, effect->palette_id_ref);
+ if (!palette) {
+ GC_ERROR("_render_effect: palette #%d not found\n", effect->palette_id_ref);
+ return -1;
+ }
+
+ for (ii = 0; ii < effect->num_composition_objects; ii++) {
+ _render_ig_composition_object(gc, pts, &effect->composition_object[ii], palette);
+ }
+
+ _flush_osd(gc, BD_OVERLAY_IG, pts);
+
+ _reset_user_timeout(gc);
+
+ return 0;
+}
+
 static int _render_page(GRAPHICS_CONTROLLER *gc,
 unsigned activated_button_id,
 GC_NAV_CMDS *cmds)
@@ -753,6 +1322,10 @@
 unsigned page_id = bd_psr_read(gc->regs, PSR_MENU_PAGE_ID);
 unsigned ii;
 unsigned selected_button_id = bd_psr_read(gc->regs, PSR_SELECTED_BUTTON_ID);
+ BD_IG_BUTTON *auto_activate_button = NULL;
+
+ gc->button_effect_running = 0;
+ gc->button_animation_running = 0;
 
 if (s->ics->interactive_composition.ui_model == IG_UI_MODEL_POPUP && !gc->popup_visible) {
 
@@ -765,6 +1338,22 @@
 return 0;
 }
 
+ /* running page effects ? */
+ if (gc->out_effects) {
+ if (gc->effect_idx < gc->out_effects->num_effects) {
+ _render_effect(gc, &gc->out_effects->effect[gc->effect_idx]);
+ return 1;
+ }
+ gc->out_effects = NULL;
+ }
+ if (gc->in_effects) {
+ if (gc->effect_idx < gc->in_effects->num_effects) {
+ _render_effect(gc, &gc->in_effects->effect[gc->effect_idx]);
+ return 1;
+ }
+ gc->in_effects = NULL;
+ }
+
 page = _find_page(&s->ics->interactive_composition, page_id);
 if (!page) {
 GC_ERROR("_render_page: unknown page id %d (have %d pages)\n",
@@ -783,7 +1372,7 @@
 page->id, page->palette_id_ref, page->num_bogs);
 
 if (!gc->ig_open) {
- _open_osd(gc, BD_OVERLAY_IG,
+ _open_osd(gc, BD_OVERLAY_IG, 0, 0,
 s->ics->video_descriptor.video_width,
 s->ics->video_descriptor.video_height);
 }
@@ -811,12 +1400,9 @@
 
 if (button->auto_action_flag && !gc->auto_action_triggered) {
 if (cmds) {
- GC_TRACE(" auto-activate #%d\n", button->id);
-
- cmds->num_nav_cmds = button->num_nav_cmds;
- cmds->nav_cmds = button->nav_cmds;
-
- gc->auto_action_triggered = 1;
+ if (!auto_activate_button) {
+ auto_activate_button = button;
+ }
 } else {
 GC_ERROR(" auto-activate #%d not triggered (!cmds)\n", button->id);
 }
@@ -831,6 +1417,24 @@
 _render_button(gc, button, palette, BTN_NORMAL, &gc->bog_data[ii]);
 
 }
+
+ gc->button_effect_running += gc->bog_data[ii].effect_running;
+ gc->button_animation_running += (gc->bog_data[ii].animate_indx >= 0);
+ }
+
+ /* process auto-activate */
+ if (auto_activate_button) {
+ GC_TRACE(" auto-activate #%d\n", auto_activate_button->id);
+
+ /* do not trigger auto action before single-loop animations have been terminated */
+ if (gc->button_effect_running) {
+ GC_TRACE(" auto-activate #%d not triggered (ANIMATING)\n", auto_activate_button->id);
+ } else {
+ cmds->num_nav_cmds = auto_activate_button->num_nav_cmds;
+ cmds->nav_cmds = auto_activate_button->nav_cmds;
+
+ gc->auto_action_triggered = 1;
+ }
 }
 
 if (gc->ig_dirty) {
@@ -850,7 +1454,7 @@
 #define VK_IS_CURSOR(vk) (vk >= BD_VK_UP && vk <= BD_VK_RIGHT)
 #define VK_TO_NUMBER(vk) ((vk) - BD_VK_0)
 
-static int _user_input(GRAPHICS_CONTROLLER *gc, bd_vk_key_e key, GC_NAV_CMDS *cmds)
+static int _user_input(GRAPHICS_CONTROLLER *gc, uint32_t key, GC_NAV_CMDS *cmds)
 {
 PG_DISPLAY_SET *s = gc->igs;
 BD_IG_PAGE *page = NULL;
@@ -864,9 +1468,21 @@
 GC_TRACE("_user_input(): popup menu not visible\n");
 return -1;
 }
+ if (!gc->ig_open) {
+ GC_ERROR("_user_input(): menu not open\n");
+ return -1;
+ }
+
 if (!gc->ig_drawn) {
 GC_ERROR("_user_input(): menu not visible\n");
- return -1;
+ return 0;
+ }
+
+ _reset_user_timeout(gc);
+
+ if (gc->button_effect_running) {
+ GC_ERROR("_user_input(): button_effect_running\n");
+ return 0;
 }
 
 GC_TRACE("_user_input(%d)\n", key);
@@ -929,9 +1545,9 @@
 }
 
 if (new_btn_id != cur_btn_id) {
- BD_IG_BUTTON *button = _find_button_page(page, new_btn_id, NULL);
- if (button) {
- cmds->sound_id_ref = button->selected_sound_id_ref;
+ BD_IG_BUTTON *new_button = _find_button_page(page, new_btn_id, NULL);
+ if (new_button) {
+ cmds->sound_id_ref = new_button->selected_sound_id_ref;
 }
 }
 }
@@ -991,7 +1607,7 @@
 
 /* page changes */
 
- _select_page(gc, page_id);
+ _select_page(gc, page_id, !effect_flag);
 
 } else {
 /* page does not change */
@@ -1061,6 +1677,7 @@
 bd_psr_write(gc->regs, PSR_SELECTED_BUTTON_ID, 0x10000|button_id);
 }
 gc->bog_data[bog_idx].enabled_button = button_id;
+ gc->bog_data[bog_idx].animate_indx = 0;
 
 } else {
 if (gc->bog_data[bog_idx].enabled_button == button_id) {
@@ -1094,7 +1711,7 @@
 }
 }
 
-static int _mouse_move(GRAPHICS_CONTROLLER *gc, unsigned x, unsigned y, GC_NAV_CMDS *cmds)
+static int _mouse_move(GRAPHICS_CONTROLLER *gc, uint16_t x, uint16_t y, GC_NAV_CMDS *cmds)
 {
 PG_DISPLAY_SET *s = gc->igs;
 BD_IG_PAGE *page = NULL;
@@ -1110,6 +1727,11 @@
 return -1;
 }
 
+ if (gc->button_effect_running) {
+ GC_ERROR("_mouse_move(): button_effect_running\n");
+ return -1;
+ }
+
 page = _find_page(&s->ics->interactive_composition, page_id);
 if (!page) {
 GC_ERROR("_mouse_move(): unknown page #%d (have %d pages)\n",
@@ -1157,11 +1779,92 @@
 _select_button(gc, new_btn_id);
 
 _render_page(gc, -1, cmds);
+
+ _reset_user_timeout(gc);
 }
 
 return gc->valid_mouse_position;
 }
 
+static int _animate(GRAPHICS_CONTROLLER *gc, GC_NAV_CMDS *cmds)
+{
+ int result = -1;
+
+ if (gc->ig_open) {
+
+ result = 0;
+
+ if (gc->out_effects) {
+ int64_t pts = bd_get_scr();
+ int64_t duration = (int64_t)gc->out_effects->effect[gc->effect_idx].duration;
+ if (pts >= (gc->next_effect_time + duration)) {
+ gc->next_effect_time += duration;
+ gc->effect_idx++;
+ if (gc->effect_idx >= gc->out_effects->num_effects) {
+ gc->out_effects = NULL;
+ gc->effect_idx = 0;
+ _clear_osd(gc, BD_OVERLAY_IG);
+ }
+ result = _render_page(gc, 0xffff, cmds);
+ }
+ } else if (gc->in_effects) {
+ int64_t pts = bd_get_scr();
+ int64_t duration = (int64_t)gc->in_effects->effect[gc->effect_idx].duration;
+ if (pts >= (gc->next_effect_time + duration)) {
+ gc->next_effect_time += duration;
+ gc->effect_idx++;
+ if (gc->effect_idx >= gc->in_effects->num_effects) {
+ gc->in_effects = NULL;
+ gc->effect_idx = 0;
+ _clear_osd(gc, BD_OVERLAY_IG);
+ }
+ result = _render_page(gc, 0xffff, cmds);
+ }
+
+ } else if (gc->button_animation_running) {
+ int64_t pts = bd_get_scr();
+ if (pts >= (gc->next_effect_time + gc->frame_interval)) {
+ gc->next_effect_time += gc->frame_interval;
+ result = _render_page(gc, 0xffff, cmds);
+ }
+ }
+ }
+
+ return result;
+}
+
+static int _run_timers(GRAPHICS_CONTROLLER *gc, GC_NAV_CMDS *cmds)
+{
+ int result = -1;
+
+ if (gc->ig_open) {
+
+ result = 0;
+
+ if (gc->user_timeout) {
+ int64_t pts = bd_get_scr();
+ if (pts > gc->user_timeout) {
+
+ GC_TRACE("user timeout expired\n");
+
+ if (gc->igs->ics->interactive_composition.ui_model != IG_UI_MODEL_POPUP) {
+
+ if (bd_psr_read(gc->regs, PSR_MENU_PAGE_ID) != 0) {
+ _select_page(gc, 0, 0);
+ result = _render_page(gc, 0xffff, cmds);
+ }
+
+ } else {
+ gc->popup_visible = 0;
+ result = _render_page(gc, 0xffff, cmds);
+ }
+ }
+ }
+ }
+
+ return result;
+}
+
 int gc_run(GRAPHICS_CONTROLLER *gc, gc_ctrl_e ctrl, uint32_t param, GC_NAV_CMDS *cmds)
 {
 int result = -1;
@@ -1187,6 +1890,34 @@
 
 bd_mutex_unlock(&gc->mutex);
 return 0;
+ case GC_CTRL_PG_UPDATE:
+ if (gc->pgs && gc->pgs->pcs) {
+ result = _render_pg(gc);
+ }
+ if (gc->tgs && gc->tgs->dialog) {
+ result = _render_textst(gc, param, cmds);
+ }
+ bd_mutex_unlock(&gc->mutex);
+ return result;
+
+ case GC_CTRL_STYLE_SELECT:
+ result = _textst_style_select(gc, param);
+ bd_mutex_unlock(&gc->mutex);
+ return result;
+
+ case GC_CTRL_PG_CHARCODE:
+ if (gc->textst_render) {
+ textst_render_set_char_code(gc->textst_render, param);
+ result = 0;
+ }
+ bd_mutex_unlock(&gc->mutex);
+ return result;
+
+ case GC_CTRL_PG_RESET:
+ _reset_pg(gc);
+
+ bd_mutex_unlock(&gc->mutex);
+ return 0;
 
 default:;
 }
@@ -1221,17 +1952,19 @@
 gc->popup_visible = !!param;
 
 if (gc->popup_visible) {
- _select_page(gc, 0);
+ _select_page(gc, 0, 0);
 }
 
- /* fall thru */
+ result = _render_page(gc, 0xffff, cmds);
+ break;
 
 case GC_CTRL_NOP:
- result = _render_page(gc, 0xffff, cmds);
+ result = _animate(gc, cmds);
+ _run_timers(gc, cmds);
 break;
 
 case GC_CTRL_INIT_MENU:
- _select_page(gc, 0);
+ _select_page(gc, 0, 0);
 _render_page(gc, 0xffff, cmds);
 break;
 
@@ -1253,6 +1986,10 @@
 break;
 
 case GC_CTRL_RESET:
+ case GC_CTRL_PG_RESET:
+ case GC_CTRL_PG_UPDATE:
+ case GC_CTRL_PG_CHARCODE:
+ case GC_CTRL_STYLE_SELECT:
 /* already handled */
 break;
 }
@@ -1264,6 +2001,14 @@
 if (gc->ig_drawn) {
 cmds->status |= GC_STATUS_MENU_OPEN;
 }
+ if (gc->in_effects || gc->out_effects || gc->button_animation_running || gc->user_timeout) {
+ /* do not trigger if unopened pop-up menu has animations */
+ if (gc->ig_open) {
+ cmds->status |= GC_STATUS_ANIMATE;
+ /* user input is still not handled, but user "sees" the menu. */
+ cmds->status |= GC_STATUS_MENU_OPEN;
+ }
+ }
 }
 
 bd_mutex_unlock(&gc->mutex);

libbluray-0.2.3.tar.bz2/src/libbluray/decoders/graphics_controller.h -> libbluray-0.5.0.tar.bz2/src/libbluray/decoders/graphics_controller.h Changed

libbluray-0.2.3.tar.bz2/src/libbluray/decoders/graphics_processor.c -> libbluray-0.5.0.tar.bz2/src/libbluray/decoders/graphics_processor.c Changed

libbluray-0.2.3.tar.bz2/src/libbluray/decoders/graphics_processor.h -> libbluray-0.5.0.tar.bz2/src/libbluray/decoders/graphics_processor.h Changed

libbluray-0.2.3.tar.bz2/src/libbluray/decoders/ig.h -> libbluray-0.5.0.tar.bz2/src/libbluray/decoders/ig.h Changed

libbluray-0.2.3.tar.bz2/src/libbluray/decoders/ig_decode.c -> libbluray-0.5.0.tar.bz2/src/libbluray/decoders/ig_decode.c Changed

libbluray-0.2.3.tar.bz2/src/libbluray/decoders/ig_decode.h -> libbluray-0.5.0.tar.bz2/src/libbluray/decoders/ig_decode.h Changed

libbluray-0.2.3.tar.bz2/src/libbluray/decoders/m2ts_demux.c -> libbluray-0.5.0.tar.bz2/src/libbluray/decoders/m2ts_demux.c Changed

@@ -84,27 +84,43 @@
 int result = 0;
 
 if (pusi) {
- // Parse PES header
- unsigned pes_length = buf[4] << 8 | buf[5];
- unsigned pts_exists = buf[7] & 0x80;
- unsigned dts_exists = buf[7] & 0x40;
- unsigned hdr_len = buf[8] + 9;
 
+ if (len < 6) {
+ BD_DEBUG(DBG_DECODE, "invalid BDAV TS (PES header not in single TS packet)\n");
+ return -1;
+ }
 if (buf[0] || buf[1] || buf[2] != 1) {
 BD_DEBUG(DBG_DECODE, "invalid PES header (00 00 01)");
 return -1;
 }
 
- if (len < hdr_len) {
- BD_DEBUG(DBG_DECODE, "invalid BDAV TS (PES header not in single TS packet)\n");
- return -1;
- }
+ // Parse PES header
+ unsigned pes_pid = buf[3];
+ unsigned pes_length = buf[4] << 8 | buf[5];
+ unsigned hdr_len = 6;
 
- if (pts_exists) {
- p->pts = _parse_timestamp(buf + 9);
- }
- if (dts_exists) {
- p->dts = _parse_timestamp(buf + 14);
+ if (pes_pid != 0xbf) {
+
+ if (len < 9) {
+ BD_DEBUG(DBG_DECODE, "invalid BDAV TS (PES header not in single TS packet)\n");
+ return -1;
+ }
+
+ unsigned pts_exists = buf[7] & 0x80;
+ unsigned dts_exists = buf[7] & 0x40;
+ hdr_len += buf[8] + 3;
+
+ if (len < hdr_len) {
+ BD_DEBUG(DBG_DECODE, "invalid BDAV TS (PES header not in single TS packet)\n");
+ return -1;
+ }
+
+ if (pts_exists) {
+ p->pts = _parse_timestamp(buf + 9);
+ }
+ if (dts_exists) {
+ p->dts = _parse_timestamp(buf + 14);
+ }
 }
 
 buf += hdr_len;
@@ -116,7 +132,8 @@
 // realloc
 if (p->size < p->len + len) {
 p->size *= 2;
- p->buf = realloc(p->buf, p->size);
+ p->size = BD_MAX(p->size, BD_MAX(result, 0x100));
+ p->buf = realloc(p->buf, p->size);
 }
 
 // append
@@ -173,7 +190,7 @@
 p->buf->len, p->pes_length);
 pes_buffer_free(&p->buf);
 }
- p->buf = pes_buffer_alloc(0xffff);
+ p->buf = pes_buffer_alloc();
 }
 
 if (!p->buf) {

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/m2ts_filter.c Added

@@ -0,0 +1,291 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "m2ts_filter.h"
+
+#include "util/logging.h"
+#include "util/macro.h"
+
+#include <inttypes.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define M2TS_TRACE(...) BD_DEBUG(DBG_CRIT,__VA_ARGS__)
+//#define M2TS_TRACE(...) do {} while(0)
+
+/*
+ *
+ */
+
+struct m2ts_filter_s
+{
+ uint16_t *wipe_pid;
+ uint16_t *pass_pid;
+
+ int64_t in_pts;
+ int64_t out_pts;
+ uint32_t pat_packets; /* how many packets to search for PAT (seeked pat_packets packets before the actual seek point) */
+ uint8_t pat_seen;
+};
+
+M2TS_FILTER *m2ts_filter_init(int64_t in_pts, int64_t out_pts,
+ unsigned num_video, unsigned num_audio)
+{
+ M2TS_FILTER *p = calloc(1, sizeof(*p));
+
+ if (p) {
+ unsigned ii, npid;
+ uint16_t *pid;
+
+ p->in_pts = in_pts;
+ p->out_pts = out_pts;
+ p->wipe_pid = calloc(num_audio + num_video + 1, sizeof(uint16_t));
+ p->pass_pid = calloc(num_audio + num_video + 1, sizeof(uint16_t));
+
+ pid = (in_pts >= 0) ? p->wipe_pid : p->pass_pid;
+
+ for (ii = 0, npid = 0; ii < num_video; ii++) {
+ pid[npid++] = 0x1011 + ii;
+ }
+ for (ii = 0; ii < num_audio; ii++) {
+ pid[npid++] = 0x1100 + ii;
+ }
+ }
+
+ return p;
+}
+
+void m2ts_filter_close(M2TS_FILTER **p)
+{
+ if (p && *p) {
+ X_FREE((*p)->wipe_pid);
+ X_FREE((*p)->pass_pid);
+ X_FREE(*p);
+ }
+}
+
+/*
+ *
+ */
+
+#define DUMPLIST(msg,list) \
+ { \
+ unsigned ii = 0; \
+ fprintf(stderr, "list " msg " : "); \
+ for (ii = 0; list[ii]; ii++) { \
+ fprintf(stderr, " 0x%04x", list[ii]); \
+ } \
+ fprintf(stderr, "\n"); \
+ }
+
+static int _pid_in_list(uint16_t *list, uint16_t pid)
+{
+ for (; *list && *list <= pid; list++) {
+ if (*list == pid) {
+ return 1;
+ }
+ }
+ return 0;
+}
+
+static void _remove_pid(uint16_t *list, uint16_t pid)
+{
+ for (; *list && *list != pid; list++) ;
+
+ for (; *list; list++) {
+ list[0] = list[1];
+ }
+}
+
+static void _add_pid(uint16_t *list, uint16_t pid)
+{
+ for (; *list && *list < pid; list++) ;
+
+ for (; *list; list++) {
+ uint16_t tmp = *list;
+ *list = pid;
+ pid = tmp;
+ }
+ *list = pid;
+}
+
+static int64_t _parse_timestamp(const uint8_t *p)
+{
+ int64_t ts;
+ ts = ((int64_t)(p[0] & 0x0E)) << 29;
+ ts |= p[1] << 22;
+ ts |= (p[2] & 0xFE) << 14;
+ ts |= p[3] << 7;
+ ts |= (p[4] & 0xFE) >> 1;
+ return ts;
+}
+
+static int64_t _es_timestamp(const uint8_t *buf, unsigned len)
+{
+ if (buf[0] || buf[1] || buf[2] != 1) {
+ BD_DEBUG(DBG_DECODE, "invalid BDAV TS\n");
+ return -1;
+ }
+
+ if (len < 9) {
+ BD_DEBUG(DBG_DECODE, "invalid BDAV TS (no payload ?)\n");
+ return -1;
+ }
+
+ /* Parse PES header */
+ unsigned pes_pid = buf[3];
+ if (pes_pid != 0xbf) {
+
+ unsigned pts_exists = buf[7] & 0x80;
+ if (pts_exists) {
+ int64_t pts = _parse_timestamp(buf + 9);
+
+ return pts;
+ }
+ }
+
+ return -1;
+}
+
+void m2ts_filter_seek(M2TS_FILTER *p, uint32_t pat_packets, int64_t in_pts)
+{
+ M2TS_TRACE("seek notify\n");
+
+ /* move all pids to wipe list */
+ uint16_t *pid = p->pass_pid;
+ while (*pid) {
+ _add_pid(p->wipe_pid, *pid);
+ *pid = 0;
+ pid++;
+ }
+
+ p->in_pts = in_pts;
+ p->pat_seen = 0;
+ p->pat_packets = pat_packets;
+}
+
+static int _filter_es_pts(M2TS_FILTER *p, const uint8_t *buf, uint16_t pid)
+{
+ unsigned tp_error = buf[4+1] & 0x80;
+ unsigned payload_exists = buf[4+3] & 0x10;
+ int payload_offset = (buf[4+3] & 0x20) ? buf[4+4] + 5 : 4;
+
+ if (buf[4] != 0x47) {
+ BD_DEBUG(DBG_DECODE | DBG_CRIT, "missing sync byte. scrambled data ? Filtering aborted.\n");
+ return -1;
+ }
+ if (tp_error || !payload_exists || payload_offset >= 188) {
+ M2TS_TRACE("skipping packet (no payload)\n");
+ return 0;
+ }
+
+ if (_pid_in_list(p->wipe_pid, pid)) {
+
+ int64_t pts = _es_timestamp(buf + 4 + payload_offset, 188 - payload_offset);
+ if (pts >= p->in_pts && (p->out_pts < 0 || pts <= p->out_pts)) {
+ M2TS_TRACE("Pid 0x%04x pts %"PRId64" passed IN timestamp %"PRId64" (pts %"PRId64")\n",
+ pid, pts, p->in_pts, pts);
+ _remove_pid(p->wipe_pid, pid);
+ _add_pid(p->pass_pid, pid);
+
+ } else {
+ M2TS_TRACE("Pid 0x%04x pts %"PRId64" outside of clip (%"PRId64"-%"PRId64" -> keep wiping out\n",
+ pid, pts, p->in_pts, p->out_pts);
+ }
+ }
+ if (p->out_pts >= 0) {
+
+ if (_pid_in_list(p->pass_pid, pid)) {
+
+ int64_t pts = _es_timestamp(buf + 4 + payload_offset, 188 - payload_offset);
+ if (pts > p->out_pts) {
+ M2TS_TRACE("Pid 0x%04x passed OUT timestamp %"PRId64" (pts %"PRId64") -> start wiping\n", pid, p->out_pts, pts);
+ _remove_pid(p->pass_pid, pid);
+ _add_pid(p->wipe_pid, pid);
+ }
+ }
+ }
+
+ return 0;
+}
+
+static void _wipe_packet(uint8_t *p)
+{
+ /* set pid to 0x1fff (padding) */
+ p[4 + 2] = 0xff;
+ p[4 + 1] |= 0x1f;
+}
+
+int m2ts_filter(M2TS_FILTER *p, uint8_t *buf)
+{
+ uint8_t *end = buf + 6144;
+ int result = 0;
+
+ for (; buf < end; buf += 192) {
+
+ uint16_t pid = ((buf[4+1] & 0x1f) << 8) | buf[4+2];
+ if (!pid) {
+ p->pat_seen = 1;
+ p->pat_packets = 0;
+ continue;
+ }
+ if (p->pat_packets) {
+ p->pat_packets--;
+ if (!p->pat_seen) {
+ M2TS_TRACE("Wiping pid 0x%04x (inside seek buffer, no PAT)\n", pid);
+ _wipe_packet(buf);
+ continue;
+ }
+ M2TS_TRACE("NOT Wiping pid 0x%04x (inside seek buffer, PAT seen)\n", pid);
+ }
+ if (pid < 0x1011) {
+ /*M2TS_TRACE("NOT Wiping pid 0x%04x (< 0x1011)\n", pid);*/
+ continue;
+ }
+#if 0
+ /* no PAT yet ? */
+ if (!p->pat_seen) {
+ /* Wipe packet (pid -> padding stream) */
+ M2TS_TRACE("Wiping pid 0x%04x before PAT\n", pid);
+ _wipe_packet(buf);
+ continue;
+ }
+#endif
+ /* payload start indicator ? check ES timestamp */
+ unsigned pusi = buf[4+1] & 0x40;
+ if (pusi) {
+ if (_filter_es_pts(p, buf, pid) < 0)
+ return -1;
+ }
+
+ if (_pid_in_list(p->wipe_pid, pid)) {
+ /* Wipe packet (pid -> padding stream) */
+ M2TS_TRACE("Wiping pid 0x%04x\n", pid);
+ _wipe_packet(buf);
+ }
+ }
+
+ /*result = !!(p->after ? p->wipe_pid[0] : p->pass_pid[0]);*/
+
+ return result;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/m2ts_filter.h Added

@@ -0,0 +1,55 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(_M2TS_FILTER_H_)
+#define _M2TS_FILTER_H_
+
+#include <util/attributes.h>
+
+#include <stdint.h>
+
+/*
+ * simple timestamp filter for BDAV m2ts.
+ * Used to cut stream at specific timestamps.
+ */
+
+typedef struct m2ts_filter_s M2TS_FILTER;
+
+BD_PRIVATE M2TS_FILTER *m2ts_filter_init(int64_t in_pts, int64_t out_pts,
+ unsigned num_video, unsigned num_audio);
+BD_PRIVATE void m2ts_filter_close(M2TS_FILTER **);
+
+/*
+ * Filter aligned unit (mpeg-ts + pes).
+ * - drop incomplete PES packets at start of clip
+ * - drop PES packets where timestamp is outside of clip range
+ *
+ * - drop packets before PAT in seek buffer
+ *
+ */
+BD_PRIVATE int m2ts_filter(M2TS_FILTER *, uint8_t *block);
+
+/*
+ * Notify seek. All streams are discarded until next PUSI.
+ * Wait at most pat_packets for first PAT.
+ */
+BD_PRIVATE void m2ts_filter_seek(M2TS_FILTER *, uint32_t pat_packets, int64_t in_pts);
+
+
+#endif // _M2TS_FILTER_H_

libbluray-0.2.3.tar.bz2/src/libbluray/decoders/overlay.h -> libbluray-0.5.0.tar.bz2/src/libbluray/decoders/overlay.h Changed

libbluray-0.2.3.tar.bz2/src/libbluray/decoders/pes_buffer.c -> libbluray-0.5.0.tar.bz2/src/libbluray/decoders/pes_buffer.c Changed

libbluray-0.2.3.tar.bz2/src/libbluray/decoders/pes_buffer.h -> libbluray-0.5.0.tar.bz2/src/libbluray/decoders/pes_buffer.h Changed

libbluray-0.2.3.tar.bz2/src/libbluray/decoders/pg.h -> libbluray-0.5.0.tar.bz2/src/libbluray/decoders/pg.h Changed

libbluray-0.2.3.tar.bz2/src/libbluray/decoders/pg_decode.c -> libbluray-0.5.0.tar.bz2/src/libbluray/decoders/pg_decode.c Changed

@@ -1,6 +1,6 @@
 /*
 * This file is part of libbluray
- * Copyright (C) 2010 hpi1
+ * Copyright (C) 2010 Petri Hintukainen <phintuka@users.sourceforge.net>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -19,6 +19,7 @@
 
 #include "pg_decode.h"
 
+#include "util/refcnt.h"
 #include "util/macro.h"
 #include "util/logging.h"
 #include "util/bits.h"
@@ -26,6 +27,9 @@
 #include <string.h>
 #include <stdlib.h>
 
+/*
+ *
+ */
 
 void pg_decode_video_descriptor(BITBUFFER *bb, BD_PG_VIDEO_DESCRIPTOR *p)
 {
@@ -78,6 +82,16 @@
 }
 }
 
+void pg_decode_palette_entry(BITBUFFER *bb, BD_PG_PALETTE_ENTRY *entry)
+{
+ uint8_t entry_id = bb_read(bb, 8);
+
+ entry[entry_id].Y = bb_read(bb, 8);
+ entry[entry_id].Cr = bb_read(bb, 8);
+ entry[entry_id].Cb = bb_read(bb, 8);
+ entry[entry_id].T = bb_read(bb, 8);
+}
+
 /*
 * segments
 */
@@ -88,12 +102,7 @@
 p->version = bb_read(bb, 8);
 
 while (!bb_eof(bb)) {
- uint8_t entry_id = bb_read(bb, 8);
-
- p->entry[entry_id].Y = bb_read(bb, 8);
- p->entry[entry_id].Cr = bb_read(bb, 8);
- p->entry[entry_id].Cb = bb_read(bb, 8);
- p->entry[entry_id].T = bb_read(bb, 8);
+ pg_decode_palette_entry(bb, p->entry);
 }
 
 return 1;
@@ -115,10 +124,9 @@
 if (rle_size < 1)
 rle_size = 1;
 
- p->img = realloc(p->img, rle_size * sizeof(BD_PG_RLE_ELEM));
+ p->img = refcnt_realloc(p->img, rle_size * sizeof(BD_PG_RLE_ELEM));
 if (!p->img) {
- BD_DEBUG(DBG_DECODE | DBG_CRIT, "pg_decode_object(): relloc(%zu) failed\n",
- rle_size * sizeof(BD_PG_RLE_ELEM));
+ BD_DEBUG(DBG_DECODE | DBG_CRIT, "pg_decode_object(): realloc failed\n");
 return 0;
 }
 
@@ -157,10 +165,9 @@
 if (num_rle >= rle_size) {
 void *tmp = p->img;
 rle_size *= 2;
- p->img = realloc(p->img, rle_size * sizeof(BD_PG_RLE_ELEM));
+ p->img = refcnt_realloc(p->img, rle_size * sizeof(BD_PG_RLE_ELEM));
 if (!p->img) {
- BD_DEBUG(DBG_DECODE | DBG_CRIT, "pg_decode_object(): relloc(%zu) failed\n",
- rle_size * sizeof(BD_PG_RLE_ELEM));
+ BD_DEBUG(DBG_DECODE | DBG_CRIT, "pg_decode_object(): realloc failed\n");
 X_FREE(tmp);
 return 0;
 }
@@ -255,39 +262,18 @@
 void pg_clean_object(BD_PG_OBJECT *p)
 {
 if (p) {
- X_FREE(p->img);
+ bd_refcnt_dec(p->img);
+ p->img = NULL;
 }
 }
 
-void pg_clean_composition(BD_PG_COMPOSITION *p)
+static void pg_clean_composition(BD_PG_COMPOSITION *p)
 {
 if (p) {
 X_FREE(p->composition_object);
 }
 }
 
-void pg_clean_windows(BD_PG_WINDOWS *p)
-{
- if (p) {
- X_FREE(p->window);
- }
-}
-
-void pg_free_palette(BD_PG_PALETTE **p)
-{
- if (p && *p) {
- X_FREE(*p);
- }
-}
-
-void pg_free_object(BD_PG_OBJECT **p)
-{
- if (p && *p) {
- pg_clean_object(*p);
- X_FREE(*p);
- }
-}
-
 void pg_free_composition(BD_PG_COMPOSITION **p)
 {
 if (p && *p) {
@@ -295,11 +281,3 @@
 X_FREE(*p);
 }
 }
-
-void pg_free_windows(BD_PG_WINDOWS **p)
-{
- if (p && *p) {
- pg_clean_windows(*p);
- X_FREE(*p);
- }
-}

libbluray-0.2.3.tar.bz2/src/libbluray/decoders/pg_decode.h -> libbluray-0.5.0.tar.bz2/src/libbluray/decoders/pg_decode.h Changed

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/rle.c Added

@@ -0,0 +1,165 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include "rle.h"
+
+#include "util/logging.h"
+
+/*
+ * util
+ */
+
+static void _rle_ensure_size(RLE_ENC *p)
+{
+ if (BD_UNLIKELY(!p->free_elem)) {
+ BD_PG_RLE_ELEM *start = rle_get(p);
+ /* realloc to 2x */
+ p->free_elem = p->num_elem;
+ start = refcnt_realloc(start, p->num_elem * 2 * sizeof(BD_PG_RLE_ELEM));
+ p->elem = start + p->num_elem;
+ p->num_elem *= 2;
+ }
+}
+
+/*
+ * encoding
+ */
+
+static void _enc_elem(RLE_ENC *p, uint16_t color, uint16_t len)
+{
+ _rle_ensure_size(p);
+
+ p->elem->color = color;
+ p->elem->len = len;
+
+ p->free_elem--;
+ p->elem++;
+}
+
+static void _enc_eol(RLE_ENC *p)
+{
+ _enc_elem(p, 0, 0);
+}
+
+BD_PG_RLE_ELEM *rle_crop_object(const BD_PG_RLE_ELEM *orig, int width,
+ int crop_x, int crop_y, int crop_w, int crop_h)
+{
+ RLE_ENC rle;
+ int x0 = crop_x;
+ int x1 = crop_x + crop_w; /* first pixel outside of cropped region */
+ int x, y;
+
+ rle_begin(&rle);
+
+ /* skip crop_y */
+ for (y = 0; y < crop_y; y++) {
+ for (x = 0; x < width; x += orig->len, orig++) ;
+ }
+
+ /* crop lines */
+
+ for (y = 0; y < crop_h; y++) {
+ for (x = 0; x < width; ) {
+ BD_PG_RLE_ELEM bite = *(orig++);
+
+ if (BD_UNLIKELY(bite.len < 1)) {
+ BD_DEBUG(DBG_GC | DBG_CRIT, "rle eol marker in middle of line (x=%d/%d)\n", x, width);
+ continue;
+ }
+
+ /* starts outside, ends outside */
+ if (x + bite.len < x0 || x >= x1) {
+ x += bite.len;
+ continue;
+ }
+
+ /* starts before ? */
+ if (BD_UNLIKELY(x < x0)) {
+ bite.len -= x0 - x;
+ x = x0;
+ }
+
+ x += bite.len;
+
+ /* ends after ? */
+ if (BD_UNLIKELY(x >= x1)) {
+ bite.len -= x - x1;
+ }
+
+ _enc_elem(&rle, bite.color, bite.len);
+ }
+
+ if (BD_LIKELY(!orig->len)) {
+ /* skip eol marker */
+ orig++;
+ } else {
+ BD_DEBUG(DBG_GC | DBG_CRIT, "rle eol marker missing\n");
+ }
+
+ _enc_eol(&rle);
+ }
+
+ return rle_get(&rle);
+}
+
+/*
+ * compression
+ */
+
+static void _rle_grow(RLE_ENC *p)
+{
+ p->free_elem--;
+ p->elem++;
+
+ _rle_ensure_size(p);
+
+ p->elem->len = 0;
+}
+
+void rle_add_eol(RLE_ENC *p)
+{
+ if (BD_LIKELY(p->elem->len)) {
+ _rle_grow(p);
+ }
+ p->elem->color = 0;
+
+ _rle_grow(p);
+ p->elem->color = 0xffff;
+}
+
+void rle_add_bite(RLE_ENC *p, uint8_t color, int len)
+{
+ if (BD_LIKELY(color == p->elem->color)) {
+ p->elem->len += len;
+ } else {
+ if (BD_LIKELY(p->elem->len)) {
+ _rle_grow(p);
+ }
+ p->elem->color = color;
+ p->elem->len = len;
+ }
+}
+
+void rle_compress_chunk(RLE_ENC *p, const uint8_t *mem, unsigned width)
+{
+ unsigned ii;
+ for (ii = 0; ii < width; ii++) {
+ rle_add_bite(p, mem[ii], 1);
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/rle.h Added

@@ -0,0 +1,80 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(_BD_RLE_H_)
+#define _BD_RLE_H_
+
+#include "overlay.h"
+
+#include <util/attributes.h>
+
+#include <stdint.h>
+
+/*
+ * encode state
+ */
+
+typedef struct {
+ BD_PG_RLE_ELEM *elem; /* current element */
+ unsigned int free_elem;/* unused element count */
+ unsigned int num_elem; /* allocated element count */
+} RLE_ENC;
+
+/*
+ *
+ */
+
+#include "util/refcnt.h"
+#include "util/macro.h"
+
+BD_PRIVATE BD_PG_RLE_ELEM *rle_crop_object(const BD_PG_RLE_ELEM *orig, int width,
+ int crop_x, int crop_y, int crop_w, int crop_h);
+
+static inline void rle_begin(RLE_ENC *p)
+{
+ p->num_elem = 1024;
+ p->free_elem = 1024;
+ p->elem = refcnt_realloc(NULL, p->num_elem * sizeof(BD_PG_RLE_ELEM));
+
+ p->elem->len = 0;
+ p->elem->color = 0xffff;
+}
+
+static inline BD_PG_RLE_ELEM *rle_get(RLE_ENC *p)
+{
+ BD_PG_RLE_ELEM *start = (p->elem ? p->elem - (p->num_elem - p->free_elem) : NULL);
+ return start;
+}
+
+static inline void rle_end(RLE_ENC *p)
+{
+ BD_PG_RLE_ELEM *start = rle_get(p);
+ bd_refcnt_dec(start);
+ p->elem = NULL;
+}
+
+/*
+ * compression
+ */
+
+BD_PRIVATE void rle_add_eol(RLE_ENC *p);
+BD_PRIVATE void rle_add_bite(RLE_ENC *p, uint8_t color, int len);
+BD_PRIVATE void rle_compress_chunk(RLE_ENC *p, const uint8_t *mem, unsigned width);
+
+#endif /* _BD_RLE_H_ */

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/textst.h Added

@@ -0,0 +1,153 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(_BD_TEXTST_H_)
+#define _BD_TEXTST_H_
+
+#include "pg.h"
+
+#include <stdint.h>
+
+
+#define BD_TEXTST_FLOW_LEFT_RIGHT 1 /* Left-to-Right character progression, Top-to-Bottom line progression */
+#define BD_TEXTST_FLOW_RIGHT_LEFT 2 /* Right-to-Left character progression, Top-to-Bottom line progression */
+#define BD_TEXTST_FLOW_TOP_BOTTOM 3 /* Top-to-Bottom character progression, Right-to-Left line progression */
+
+#define BD_TEXTST_HALIGN_LEFT 1
+#define BD_TEXTST_HALIGN_CENTER 2
+#define BD_TEXTST_HALIGN_RIGHT 3
+
+#define BD_TEXTST_VALIGN_TOP 1
+#define BD_TEXTST_VALIGN_MIDDLE 2
+#define BD_TEXTST_VALIGN_BOTTOM 3
+
+#define BD_TEXTST_FONT_OUTLINE_THIN 1
+#define BD_TEXTST_FONT_OUTLINE_MEDIUM 2
+#define BD_TEXTST_FONT_OUTLINE_THICK 3
+
+#define BD_TEXTST_DATA_STRING 1
+#define BD_TEXTST_DATA_FONT_ID 2
+#define BD_TEXTST_DATA_FONT_STYLE 3
+#define BD_TEXTST_DATA_FONT_SIZE 4
+#define BD_TEXTST_DATA_FONT_COLOR 5
+#define BD_TEXTST_DATA_NEWLINE 0x0a
+#define BD_TEXTST_DATA_RESET_STYLE 0x0b
+
+
+typedef struct {
+ uint16_t xpos;
+ uint16_t ypos;
+ uint16_t width;
+ uint16_t height;
+} BD_TEXTST_RECT;
+
+typedef struct {
+ BD_TEXTST_RECT region;
+ uint8_t background_color; /* palette entry id ref */
+} BD_TEXTST_REGION_INFO;
+
+typedef struct {
+ uint8_t bold : 1;
+ uint8_t italic : 1;
+ uint8_t outline_border : 1;
+} BD_TEXTST_FONT_STYLE;
+
+typedef struct {
+ uint8_t region_style_id;
+ BD_TEXTST_REGION_INFO region_info;
+ BD_TEXTST_RECT text_box; /* relative to region */
+ uint8_t text_flow; /* BD_TEXTST_FLOW_* */
+ uint8_t text_halign; /* BD_TEXTST_HALIGN_* */
+ uint8_t text_valign; /* BD_TEXTST_VALIGN_* */
+ uint8_t line_space;
+ uint8_t font_id_ref;
+ BD_TEXTST_FONT_STYLE font_style;
+ uint8_t font_size;
+ uint8_t font_color; /* palette entry id ref */
+ uint8_t outline_color; /* palette entry id ref */
+ uint8_t outline_thickness; /* BD_TEXTST_FONT_OUTLINE_* */
+} BD_TEXTST_REGION_STYLE;
+
+typedef struct {
+ uint8_t user_style_id;
+ int16_t region_hpos_delta;
+ int16_t region_vpos_delta;
+ int16_t text_box_hpos_delta;
+ int16_t text_box_vpos_delta;
+ int16_t text_box_width_delta;
+ int16_t text_box_height_delta;
+ int8_t font_size_delta;
+ int8_t line_space_delta;
+} BD_TEXTST_USER_STYLE;
+
+typedef struct {
+ uint8_t type; /* BD_TEXTST_DATA_* */
+
+ union {
+ uint8_t font_id_ref;
+ uint8_t font_size;
+ uint8_t font_color;
+ struct {
+ BD_TEXTST_FONT_STYLE style;
+ uint8_t outline_color;
+ uint8_t outline_thickness;
+ } style;
+ struct {
+ uint8_t length;
+ uint8_t string[0];
+ } text;
+ } data;
+} BD_TEXTST_DATA;
+
+typedef struct {
+ uint8_t continous_present_flag;
+ uint8_t forced_on_flag;
+ uint8_t region_style_id_ref;
+
+ unsigned elem_count;
+ BD_TEXTST_DATA *elem; /* note: variable-sized elements */
+
+ unsigned line_count;
+} BD_TEXTST_DIALOG_REGION;
+
+/*
+ * segments
+ */
+
+typedef struct {
+ uint8_t player_style_flag;
+ uint8_t region_style_count;
+ uint8_t user_style_count;
+ BD_TEXTST_REGION_STYLE *region_style;
+ BD_TEXTST_USER_STYLE *user_style;
+ BD_PG_PALETTE_ENTRY palette[256];
+} BD_TEXTST_DIALOG_STYLE;
+
+typedef struct {
+ int64_t start_pts;
+ int64_t end_pts;
+
+ BD_PG_PALETTE_ENTRY *palette_update;
+
+ uint8_t region_count;
+ BD_TEXTST_DIALOG_REGION region[2];
+
+} BD_TEXTST_DIALOG_PRESENTATION;
+
+#endif // _BD_TEXTST_H_

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/textst_decode.c Added

@@ -0,0 +1,289 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include "textst_decode.h"
+
+#include "pg_decode.h" // pg_decode_*()
+
+#include "util/macro.h"
+#include "util/bits.h"
+#include "util/logging.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+
+static int8_t _decode_int8(BITBUFFER *bb)
+{
+ unsigned sign = bb_read(bb, 1);
+ int8_t val = bb_read(bb, 7);
+ return sign ? -val : val;
+}
+
+static int16_t _decode_int16(BITBUFFER *bb)
+{
+ unsigned sign = bb_read(bb, 1);
+ int16_t val = bb_read(bb, 15);
+ return sign ? -val : val;
+}
+
+static int64_t _decode_pts(BITBUFFER *bb)
+{
+ return ((int64_t)bb_read(bb, 1)) << 32 | bb_read(bb, 32);
+}
+
+static void _decode_rect(BITBUFFER *bb, BD_TEXTST_RECT *p)
+{
+ p->xpos = bb_read(bb, 16);;
+ p->ypos = bb_read(bb, 16);;
+ p->width = bb_read(bb, 16);;
+ p->height = bb_read(bb, 16);;
+}
+
+static void _decode_region_info(BITBUFFER *bb, BD_TEXTST_REGION_INFO *p)
+{
+ _decode_rect(bb, &p->region);
+ p->background_color = bb_read(bb, 8);
+ bb_skip(bb, 8);
+}
+
+static void _decode_font_style(BITBUFFER *bb, BD_TEXTST_FONT_STYLE *p)
+{
+ uint8_t font_style = bb_read(bb, 8);
+ p->bold = !!(font_style & 1);
+ p->italic = !!(font_style & 2);
+ p->outline_border = !!(font_style & 4);
+}
+
+static void _decode_region_style(BITBUFFER *bb, BD_TEXTST_REGION_STYLE *p)
+{
+ p->region_style_id = bb_read(bb, 8);
+
+ _decode_region_info(bb, &p->region_info);
+ _decode_rect(bb, &p->text_box);
+
+ p->text_flow = bb_read(bb, 8);
+ p->text_halign = bb_read(bb, 8);
+ p->text_valign = bb_read(bb, 8);
+ p->line_space = bb_read(bb, 8);
+ p->font_id_ref = bb_read(bb, 8);
+
+ _decode_font_style(bb, &p->font_style);
+
+ p->font_size = bb_read(bb, 8);
+ p->font_color = bb_read(bb, 8);
+ p->outline_color = bb_read(bb, 8);
+ p->outline_thickness = bb_read(bb, 8);
+}
+
+static void _decode_user_style(BITBUFFER *bb, BD_TEXTST_USER_STYLE *p)
+{
+ p->user_style_id = bb_read(bb, 8);
+ p->region_hpos_delta = _decode_int16(bb);
+ p->region_vpos_delta = _decode_int16(bb);
+ p->text_box_hpos_delta = _decode_int16(bb);
+ p->text_box_vpos_delta = _decode_int16(bb);
+ p->text_box_width_delta = _decode_int16(bb);
+ p->text_box_height_delta = _decode_int16(bb);
+ p->font_size_delta = _decode_int8(bb);
+ p->line_space_delta = _decode_int8(bb);
+}
+
+static void _decode_dialog_region(BITBUFFER *bb, BD_TEXTST_DIALOG_REGION *p)
+{
+ p->continous_present_flag = bb_read(bb, 1);
+ p->forced_on_flag = bb_read(bb, 1);
+ bb_skip(bb, 6);
+ p->region_style_id_ref = bb_read(bb, 8);
+
+ uint16_t data_length = bb_read(bb, 16);
+ int bytes_allocated = data_length;
+ uint16_t bytes_read = 0;
+
+ p->elem = malloc(bytes_allocated);
+ p->elem_count = 0;
+ p->line_count = 1;
+
+ uint8_t *ptr = (uint8_t *)p->elem;
+
+ while (bytes_read < data_length) {
+
+ /* parse header */
+
+ uint8_t code = bb_read(bb, 8);
+ bytes_read++;
+ if (code != 0x1b) {
+ BD_DEBUG(DBG_DECODE, "_decode_dialog_region(): missing escape\n");
+ continue;
+ }
+
+ uint8_t type = bb_read(bb, 8);
+ uint8_t length = bb_read(bb, 8);
+ bytes_read += 2 + length;
+
+ /* realloc */
+
+ int bytes_used = ((intptr_t)ptr - (intptr_t)p->elem);
+ int need = bytes_used + length + sizeof(BD_TEXTST_DATA);
+ if (bytes_allocated < need) {
+ bytes_allocated = need * 2;
+ p->elem = realloc(p->elem, bytes_allocated);
+ ptr = ((uint8_t *)p->elem) + bytes_used;
+ }
+
+ /* parse content */
+
+ BD_TEXTST_DATA *data = (BD_TEXTST_DATA *)ptr;
+ memset(data, 0, sizeof(*data));
+
+ data->type = type;
+ switch (data->type) {
+ case BD_TEXTST_DATA_STRING:
+ bb_read_bytes(bb, data->data.text.string, length);
+ data->data.text.length = length;
+ ptr += length;
+ break;
+ case BD_TEXTST_DATA_FONT_ID:
+ data->data.font_id_ref = bb_read(bb, 8);
+ break;
+ case BD_TEXTST_DATA_FONT_STYLE:
+ _decode_font_style(bb, &data->data.style.style);
+ data->data.style.outline_color = bb_read(bb, 8);
+ data->data.style.outline_thickness = bb_read(bb, 8);
+ break;
+ case BD_TEXTST_DATA_FONT_SIZE:
+ data->data.font_size = bb_read(bb, 8);
+ break;
+ case BD_TEXTST_DATA_FONT_COLOR:
+ data->data.font_color = bb_read(bb, 8);
+ break;
+ case BD_TEXTST_DATA_NEWLINE:
+ p->line_count++;
+ break;
+ case BD_TEXTST_DATA_RESET_STYLE:
+ break;
+ default:
+ BD_DEBUG(DBG_DECODE, "_decode_dialog_region(): unknown marker %d (len %d)\n", type, length);
+ bb_skip(bb, 8 * length);
+ continue;
+ }
+ ptr += sizeof(BD_TEXTST_DATA);
+ p->elem_count++;
+ }
+}
+
+static void _decode_palette(BITBUFFER *bb, BD_PG_PALETTE_ENTRY *p)
+{
+ uint16_t entries = bb_read(bb, 16) / 5;
+ unsigned ii;
+
+ memset(p, 0, 256 * sizeof(*p));
+ for (ii = 0; ii < entries; ii++) {
+ pg_decode_palette_entry(bb, p);
+ }
+}
+
+/*
+ * segments
+ */
+
+
+BD_PRIVATE int textst_decode_dialog_style(BITBUFFER *bb, BD_TEXTST_DIALOG_STYLE *p)
+{
+ unsigned ii;
+
+ p->player_style_flag = bb_read(bb, 1);
+ bb_skip(bb, 15);
+ p->region_style_count = bb_read(bb, 8);
+ p->user_style_count = bb_read(bb, 8);
+
+ if (p->region_style_count) {
+ p->region_style = calloc(p->region_style_count, sizeof(BD_TEXTST_REGION_STYLE));
+ for (ii = 0; ii < p->region_style_count; ii++) {
+ _decode_region_style(bb, &p->region_style[ii]);
+ }
+ }
+
+ if (p->user_style_count) {
+ p->user_style = calloc(p->user_style_count, sizeof(BD_TEXTST_USER_STYLE));
+ for (ii = 0; ii < p->user_style_count; ii++) {
+ _decode_user_style(bb, &p->user_style[ii]);
+ }
+ }
+
+ _decode_palette(bb, p->palette);
+
+ return 1;
+}
+
+BD_PRIVATE int textst_decode_dialog_presentation(BITBUFFER *bb, BD_TEXTST_DIALOG_PRESENTATION *p)
+{
+ unsigned ii, palette_update_flag;
+
+ bb_skip(bb, 7);
+ p->start_pts = _decode_pts(bb);
+ bb_skip(bb, 7);
+ p->end_pts = _decode_pts(bb);
+
+ palette_update_flag = bb_read(bb, 1);
+ bb_skip(bb, 7);
+
+ if (palette_update_flag) {
+ p->palette_update = calloc(256, sizeof(BD_PG_PALETTE_ENTRY));
+ _decode_palette(bb, p->palette_update);
+ }
+
+ p->region_count = bb_read(bb, 8);
+ if (p->region_count) {
+ for (ii = 0; ii < p->region_count; ii++) {
+ _decode_dialog_region(bb, &p->region[ii]);
+ }
+ }
+
+ return 1;
+}
+
+/*
+ * cleanup
+ */
+
+void textst_clean_dialog_presentation(BD_TEXTST_DIALOG_PRESENTATION *p)
+{
+ if (p) {
+ X_FREE(p->palette_update);
+ X_FREE(p->region[0].elem);
+ X_FREE(p->region[1].elem);
+ }
+}
+
+static void _clean_style(BD_TEXTST_DIALOG_STYLE *p)
+{
+ if (p) {
+ X_FREE(p->region_style);
+ X_FREE(p->user_style);
+ }
+}
+
+void textst_free_dialog_style(BD_TEXTST_DIALOG_STYLE **p)
+{
+ if (p && *p) {
+ _clean_style(*p);
+ X_FREE(*p);
+ }
+}

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/textst_decode.h Added

@@ -0,0 +1,41 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(_TEXTST_DECODE_H_)
+#define _TEXTST_DECODE_H_
+
+#include "textst.h"
+
+#include <util/attributes.h>
+#include <util/bits.h>
+
+#include <stdint.h>
+
+/*
+ * segments
+ */
+
+BD_PRIVATE int textst_decode_dialog_style(BITBUFFER *bb, BD_TEXTST_DIALOG_STYLE *p);
+BD_PRIVATE int textst_decode_dialog_presentation(BITBUFFER *bb, BD_TEXTST_DIALOG_PRESENTATION *p);
+
+BD_PRIVATE void textst_free_dialog_style(BD_TEXTST_DIALOG_STYLE **p);
+BD_PRIVATE void textst_clean_dialog_presentation(BD_TEXTST_DIALOG_PRESENTATION *p);
+
+
+#endif // _TEXTST_DECODE_H_

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/textst_render.c Added

@@ -0,0 +1,422 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "util/macro.h"
+#include "util/logging.h"
+#include "libbluray/bluray.h" /* bd_char_code_e */
+
+#include <stdint.h>
+
+#ifdef HAVE_FT2
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_SYNTHESIS_H
+#endif
+
+#include "textst_render.h"
+
+/*
+ *
+ */
+
+#define TEXTST_ERROR(...) BD_DEBUG(DBG_GC | DBG_CRIT, __VA_ARGS__)
+#define TEXTST_TRACE(...) BD_DEBUG(DBG_GC, __VA_ARGS__)
+
+/*
+ * data
+ */
+
+struct textst_render {
+#ifdef HAVE_FT2
+ FT_Library ft_lib;
+
+ unsigned font_count;
+ FT_Face *face;
+
+ bd_char_code_e char_code;
+#endif
+};
+
+/*
+ * init / free
+ */
+
+TEXTST_RENDER *textst_render_init(void)
+{
+#ifdef HAVE_FT2
+ TEXTST_RENDER *p = calloc(1, sizeof(TEXTST_RENDER));
+
+ if (!FT_Init_FreeType(&p->ft_lib)) {
+ return p;
+ }
+
+ X_FREE(p);
+ TEXTST_ERROR("Loading FreeType2 failed\n");
+#else
+ TEXTST_ERROR("TextST font support not compiled in\n");
+#endif
+ return NULL;
+}
+
+void textst_render_free(TEXTST_RENDER **pp)
+{
+ if (pp && *pp) {
+#ifdef HAVE_FT2
+ TEXTST_RENDER *p = *pp;
+
+ if (p->ft_lib) {
+ /* free fonts */
+ unsigned ii;
+ for (ii = 0; ii < p->font_count; ii++) {
+ if (p->face[ii]) {
+ FT_Done_Face(p->face[ii]);
+ }
+ }
+
+ FT_Done_FreeType(p->ft_lib);
+ }
+#endif
+ X_FREE(*pp);
+ }
+}
+
+/*
+ * settings
+ */
+
+int textst_render_add_font(TEXTST_RENDER *p, const char *file)
+{
+#ifdef HAVE_FT2
+ p->face = realloc(p->face, sizeof(*(p->face)) * (p->font_count + 1));
+
+ if (FT_New_Face(p->ft_lib, file, -1, NULL)) {
+ TEXTST_ERROR("Unsupport font file format (%s)\n", file);
+ return -1;
+ }
+
+ if (!FT_New_Face(p->ft_lib, file, 0, &p->face[p->font_count])) {
+ p->font_count++;
+ return 0;
+ }
+
+ TEXTST_ERROR("Loading font %s failed\n", file);
+#endif
+ return -1;
+}
+
+int textst_render_set_char_code(TEXTST_RENDER *p, int char_code)
+{
+#ifdef HAVE_FT2
+ p->char_code = (bd_char_code_e)char_code;
+ if (p->char_code != BLURAY_TEXT_CHAR_CODE_UTF8) {
+ TEXTST_ERROR("WARNING: unsupported TextST coding type %d\n", char_code);
+ return -1;
+ }
+#endif
+
+ return 0;
+}
+
+/*
+ * UTF-8
+ */
+
+#ifdef HAVE_FT2
+
+static int _utf8_char_size(const uint8_t *s)
+{
+ if ((s[0] & 0xE0) == 0xC0 &&
+ (s[1] & 0xC0) == 0x80) {
+ return 2;
+ }
+ if ((s[0] & 0xF0) == 0xE0 &&
+ (s[1] & 0xC0) == 0x80 &&
+ (s[2] & 0xC0) == 0x80) {
+ return 3;
+ }
+ if ((s[0] & 0xF8) == 0xF0 &&
+ (s[1] & 0xC0) == 0x80 &&
+ (s[2] & 0xC0) == 0x80 &&
+ (s[3] & 0xC0) == 0x80) {
+ return 4;
+ }
+ return 1;
+}
+
+static unsigned _utf8_char_get(const uint8_t *s, int char_size)
+{
+ if (!char_size) {
+ char_size = _utf8_char_size(s);
+ }
+
+ switch (char_size) {
+ case 2: return ((s[0] & 0x1F) << 6) | ((s[1] & 0x3F));
+ case 3: return ((s[0] & 0x0F) << 12) | ((s[1] & 0x3F) << 6) | ((s[2] & 0x3F));
+ case 4: return ((s[0] & 0x07) << 18) | ((s[1] & 0x3F) << 12) | ((s[2] & 0x3F) << 6) | ((s[3] & 0x3F));
+ default: ;
+ }
+ return s[0];
+}
+
+#endif /* HAVE_FT2 */
+
+/*
+ * rendering
+ */
+
+#ifdef HAVE_FT2
+
+static int _draw_string(FT_Face face, const uint8_t *string, int length,
+ TEXTST_BITMAP *bmp, int x, int y,
+ BD_TEXTST_REGION_STYLE *style,
+ int *baseline_pos)
+{
+ uint8_t color = style->font_color;
+ unsigned char_code;
+ int ii, jj, kk;
+ unsigned flags;
+
+ if (length <= 0) {
+ return -1;
+ }
+ if (!bmp) {
+ flags = FT_LOAD_DEFAULT;
+ } else {
+ flags = FT_LOAD_RENDER;
+ }
+
+ for (ii = 0; ii < length; ii++) {
+ /*if (p->char_code == BLURAY_TEXT_CHAR_CODE_UTF8) {*/
+ int char_size = _utf8_char_size(string + ii);
+ char_code = _utf8_char_get(string + ii, char_size);
+ ii += char_size - 1;
+ /*}*/
+
+ if (FT_Load_Char(face, char_code, flags /*| FT_LOAD_MONOCHROME*/) == 0) {
+
+ if (style->font_style.bold && !(face->style_flags & FT_STYLE_FLAG_BOLD)) {
+ FT_GlyphSlot_Embolden( face->glyph );
+ }
+ if (style->font_style.italic && !(face->style_flags & FT_STYLE_FLAG_ITALIC)) {
+ FT_GlyphSlot_Oblique( face->glyph );
+ }
+
+ if (bmp) {
+ for (jj = 0; jj < face->glyph->bitmap.rows; jj++) {
+ for (kk = 0; kk < face->glyph->bitmap.width; kk++) {
+ uint8_t pixel = face->glyph->bitmap.buffer[jj * face->glyph->bitmap.pitch + kk];
+ if (pixel & 0x80) {
+ int xpos = x + face->glyph->bitmap_left + kk;
+ int ypos = y - face->glyph->bitmap_top + jj;
+ if (xpos >= 0 && xpos < bmp->width && ypos >= 0 && ypos < bmp->height) {
+ bmp->mem[xpos + ypos * bmp->stride] = color;
+ }
+ }
+ }
+ }
+ }
+
+ /* track max baseline when calculating line size */
+ if (baseline_pos) {
+ *baseline_pos = BD_MAX(*baseline_pos, (face->size->metrics.ascender >> 6) + 1);
+ }
+
+ x += face->glyph->metrics.horiAdvance >> 6;
+ }
+ }
+
+ return x;
+}
+
+static void _update_face(TEXTST_RENDER *p, FT_Face *face, const BD_TEXTST_REGION_STYLE *style)
+{
+ if (style->font_id_ref >= p->font_count || !p->face[style->font_id_ref]) {
+ TEXTST_ERROR("textst_Render: incorrect font index %d\n", style->font_id_ref);
+ if (!*face) {
+ *face = p->face[0];
+ }
+ } else {
+ *face = p->face[style->font_id_ref];
+ }
+ FT_Set_Char_Size(*face, 0, style->font_size << 6, 0, 0);
+}
+
+static int _render_line(TEXTST_RENDER *p, TEXTST_BITMAP *bmp,
+ const BD_TEXTST_REGION_STYLE *base_style,
+ BD_TEXTST_REGION_STYLE *style,
+ uint8_t **p_ptr, int *p_elem_count,
+ int xpos, int ypos, int *baseline_pos)
+{
+ FT_Face face = NULL;
+
+ /* select font */
+ _update_face(p, &face, style);
+
+ while ( (*p_elem_count) > 0) {
+ BD_TEXTST_DATA *elem = (BD_TEXTST_DATA*)*p_ptr;
+ (*p_ptr) += sizeof(BD_TEXTST_DATA);
+ (*p_elem_count)--;
+
+ switch (elem->type) {
+ case BD_TEXTST_DATA_STRING:
+ xpos = _draw_string(face, elem->data.text.string, elem->data.text.length,
+ bmp, xpos, ypos, style, baseline_pos);
+ (*p_ptr) += elem->data.text.length;
+ break;
+
+ case BD_TEXTST_DATA_NEWLINE:
+ return xpos;
+
+ case BD_TEXTST_DATA_FONT_ID:
+ style->font_id_ref = elem->data.font_id_ref;
+ _update_face(p, &face, style);
+ break;
+
+ case BD_TEXTST_DATA_FONT_STYLE:
+ style->font_style = elem->data.style.style;
+ style->outline_color = elem->data.style.outline_color;
+ style->outline_thickness = elem->data.style.outline_thickness;
+ if (style->font_style.outline_border) {
+ TEXTST_ERROR("textst_render: unsupported style: outline\n");
+ }
+ break;
+
+ case BD_TEXTST_DATA_FONT_SIZE:
+ style->font_size = elem->data.font_size;
+ _update_face(p, &face, style);
+ break;
+
+ case BD_TEXTST_DATA_FONT_COLOR:
+ style->font_color = elem->data.font_color;
+ break;
+
+ case BD_TEXTST_DATA_RESET_STYLE:
+ memcpy(style, base_style, sizeof(*style));
+ _update_face(p, &face, style);
+ break;
+
+ default:
+ TEXTST_ERROR("Unknown control code %d\n", elem->type);
+ break;
+ }
+ }
+
+ return xpos;
+}
+
+#endif /* HAVE_FT2 */
+
+int textst_render(TEXTST_RENDER *p,
+ TEXTST_BITMAP *bmp,
+ const BD_TEXTST_REGION_STYLE *base_style,
+ const BD_TEXTST_DIALOG_REGION *region)
+{
+#ifdef HAVE_FT2
+
+ /* fonts loaded ? */
+ if (p->font_count < 1) {
+ TEXTST_ERROR("textst_render: no fonts loaded\n");
+ return -1;
+ }
+
+ /* TODO: */
+ if (base_style->text_flow != BD_TEXTST_FLOW_LEFT_RIGHT) {
+ TEXTST_ERROR("textst_render: unsupported text flow type %d\n", base_style->text_flow);
+ }
+ if (bmp->argb) {
+ TEXTST_ERROR("textst_render: ARGB output not implemented\n");
+ return -1;
+ }
+ if (base_style->font_style.outline_border) {
+ /* TODO: styles: see ex. vlc/modules/text_renderer/freetype.c ; function GetGlyph() */
+ TEXTST_ERROR("textst_render: unsupported style: outline\n");
+ }
+
+ /* */
+
+ BD_TEXTST_REGION_STYLE s; /* current style settings */
+ unsigned line;
+ uint8_t *ptr = (uint8_t*)region->elem;
+ int elem_count = region->elem_count;
+ int xpos = 0;
+ int ypos = 0;
+
+ /* settings can be changed and reset with inline codes. Use local copy. */
+ memcpy(&s, base_style, sizeof(s));
+
+ /* apply vertical alignment */
+ switch (s.text_valign) {
+ case BD_TEXTST_VALIGN_TOP:
+ break;
+ case BD_TEXTST_VALIGN_BOTTOM:
+ ypos = s.text_box.height - region->line_count * s.line_space;
+ break;
+ case BD_TEXTST_VALIGN_MIDDLE:
+ ypos = (s.text_box.height - region->line_count * s.line_space) / 2;
+ break;
+ default:
+ TEXTST_ERROR("textst_render: unsupported vertical align %d\n", s.text_halign);
+ break;
+ }
+
+ for (line = 0; line < region->line_count; line++) {
+
+ /* calculate line width and max. ascender */
+ uint8_t *ptr_tmp = ptr;
+ int elem_count_tmp = elem_count;
+ BD_TEXTST_REGION_STYLE style_tmp;
+ int baseline = 0, line_width;
+
+ /* dry-run: count line width and height */
+ memcpy(&style_tmp, &s, sizeof(s)); /* use copy in first pass */
+ line_width = _render_line(p, NULL, base_style, &style_tmp, &ptr_tmp, &elem_count_tmp, 0, 0, &baseline);
+
+ /* adjust to baseline */
+ ypos += baseline;
+
+ /* apply horizontal alignment */
+ xpos = 0;
+ switch (s.text_halign) {
+ case BD_TEXTST_HALIGN_LEFT:
+ break;
+ case BD_TEXTST_HALIGN_RIGHT:
+ xpos = s.text_box.width - line_width - 1;
+ break;
+ case BD_TEXTST_HALIGN_CENTER:
+ xpos = (s.text_box.width - line_width) / 2 - 1;
+ break;
+ default:
+ TEXTST_ERROR("textst_render: unsupported horizontal align %d\n", s.text_halign);
+ break;
+ }
+
+ /* render line */
+ _render_line(p, bmp, base_style, &s, &ptr, &elem_count, xpos, ypos, NULL);
+
+ ypos += s.line_space - baseline;
+ }
+
+#endif /* HAVE_FT2 */
+
+ return 0;
+}

libbluray-0.5.0.tar.bz2/src/libbluray/decoders/textst_render.h Added

@@ -0,0 +1,62 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(_TEXTST_RENDER_H_)
+#define _TEXTST_RENDER_H_
+
+#include "textst.h"
+
+#include <util/attributes.h>
+#include <util/bits.h>
+
+#include <stdint.h>
+
+/*
+ *
+ */
+
+typedef struct textst_render TEXTST_RENDER;
+
+typedef struct {
+ uint8_t *mem;
+ uint16_t width;
+ uint16_t height;
+ uint16_t stride;
+ uint8_t argb; /* Output buffer is ARGB (support for anti-aliasing) */
+} TEXTST_BITMAP;
+
+/*
+ *
+ */
+
+BD_PRIVATE TEXTST_RENDER *textst_render_init(void);
+BD_PRIVATE void textst_render_free(TEXTST_RENDER **pp);
+
+/*
+ *
+ */
+
+BD_PRIVATE int textst_render_add_font(TEXTST_RENDER *p, const char *file);
+BD_PRIVATE int textst_render_set_char_code(TEXTST_RENDER *p, int char_code);
+BD_PRIVATE int textst_render(TEXTST_RENDER *p,
+ TEXTST_BITMAP *bmp,
+ const BD_TEXTST_REGION_STYLE *style,
+ const BD_TEXTST_DIALOG_REGION *region);
+
+#endif /* _TEXTST_RENDER_H_ */

libbluray-0.5.0.tar.bz2/src/libbluray/hdmv/.deps Added

libbluray-0.5.0.tar.bz2/src/libbluray/hdmv/.deps/hdmv_vm.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/hdmv/.deps/mobj_dump-mobj_parse.Po Added

libbluray-0.5.0.tar.bz2/src/libbluray/hdmv/.deps/mobj_dump-mobj_print.Po Added

libbluray-0.5.0.tar.bz2/src/libbluray/hdmv/.deps/mobj_parse.Plo Added

libbluray-0.5.0.tar.bz2/src/libbluray/hdmv/.deps/mobj_print.Plo Added

libbluray-0.2.3.tar.bz2/src/libbluray/hdmv/hdmv_insn.h -> libbluray-0.5.0.tar.bz2/src/libbluray/hdmv/hdmv_insn.h Changed

libbluray-0.2.3.tar.bz2/src/libbluray/hdmv/hdmv_vm.c -> libbluray-0.5.0.tar.bz2/src/libbluray/hdmv/hdmv_vm.c Changed

@@ -1,6 +1,6 @@
 /*
 * This file is part of libbluray
- * Copyright (C) 2010 hpi1
+ * Copyright (C) 2010-2012 Petri Hintukainen <phintuka@users.sourceforge.net>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -220,7 +220,7 @@
 return -1;
 }
 
-static int _queue_event(HDMV_VM *p, uint32_t event, uint32_t param)
+static int _queue_event(HDMV_VM *p, hdmv_event_e event, uint32_t param)
 {
 unsigned i;
 for (i = 0; i < sizeof(p->event) / sizeof(p->event[0]) - 1; i++) {
@@ -405,7 +405,9 @@
 
 p->suspended_object = NULL;
 
- BD_DEBUG(DBG_HDMV, "resuming object %p at %d\n", p->object, p->pc);
+ BD_DEBUG(DBG_HDMV, "resuming object %ld at %d\n",
+ (long)((p->movie_objects->objects - p->object) / sizeof(p->movie_objects->objects[0])),
+ p->pc);
 
 _queue_event(p, HDMV_EVENT_PLAY_STOP, 0);
 
@@ -548,7 +550,13 @@
 }
 
 BD_DEBUG(DBG_HDMV, "_play_stop()\n");
- _queue_event(p, HDMV_EVENT_PLAY_STOP, 0);
+ _queue_event(p, HDMV_EVENT_PLAY_STOP, 1);
+
+ /* terminate IG object. Continue executing movie object. */
+ if (_resume_from_play_pl(p) < 0) {
+ BD_DEBUG(DBG_HDMV|DBG_CRIT, "_play_stop(): resuming movie object failed !\n");
+ return -1;
+ }
 
 return 0;
 }
@@ -651,6 +659,31 @@
 bd_psr_unlock(p->regs);
 }
 
+static void _set_stream_ss(HDMV_VM *p, uint32_t dst, uint32_t src)
+{
+ BD_DEBUG(DBG_HDMV, "_set_stream_ss(0x%x, 0x%x)\n", dst, src);
+
+ if (!(bd_psr_read(p->regs, PSR_3D_STATUS) & 1)) {
+ BD_DEBUG(DBG_HDMV, "_set_stream_ss ignored (PSR22 indicates 2D mode)\n");
+ return;
+ }
+
+ BD_DEBUG(DBG_HDMV, "_set_stream_ss(0x%x, 0x%x) unimplemented\n", dst, src);
+}
+
+static void _setsystem_0x10(HDMV_VM *p, uint32_t dst, uint32_t src)
+{
+ BD_DEBUG(DBG_HDMV, "_set_psr103(0x%x, 0x%x)\n", dst, src);
+
+ bd_psr_lock(p->regs);
+
+ /* just a guess ... */
+ //bd_psr_write(p->regs, 104, 0);
+ bd_psr_write(p->regs, 103, dst);
+
+ bd_psr_unlock(p->regs);
+}
+
 /*
 * SET/SYSTEM navigation control
 */
@@ -712,6 +745,33 @@
 }
 
 /*
+ * SET/SYSTEM 3D mode
+ */
+
+static void _set_output_mode(HDMV_VM *p, uint32_t dst)
+{
+ if ((bd_psr_read(p->regs, PSR_PROFILE_VERSION) & 0x130240) != 0x130240) {
+ BD_DEBUG(DBG_HDMV, "_set_output_mode ignored (not running as profile 5 player)\n");
+ return;
+ }
+
+ bd_psr_lock(p->regs);
+
+ uint32_t psr22 = bd_psr_read(p->regs, PSR_3D_STATUS);
+
+ /* update output mode (bit 0). PSR22 bits 1 and 2 are subtitle alignment (_set_stream_ss()) */
+ if (dst & 1) {
+ psr22 |= 1;
+ } else {
+ psr22 &= ~1;
+ }
+
+ bd_psr_write(p->regs, PSR_3D_STATUS, psr22);
+
+ bd_psr_unlock(p->regs);
+}
+
+/*
 * navigation timer
 */
 
@@ -739,6 +799,8 @@
 return;
 }
 
+ BD_DEBUG(DBG_HDMV | DBG_CRIT, "_set_nv_timer(): navigation timer not implemented !\n");
+
 /* set expiration time */
 p->nv_timer.time = time(NULL);
 p->nv_timer.time += timeout;
@@ -830,14 +892,14 @@
 {
 /* overflow -> saturate */
 uint64_t result = (uint64_t)a + b;
- return result < 0xffffffff ? result : 0xffffffff;
+ return result < 0xffffffff ? (uint32_t)result : 0xffffffff;
 }
 
 static inline uint32_t MUL_u32(uint32_t a, uint32_t b)
 {
 /* overflow -> saturate */
 uint64_t result = (uint64_t)a * b;
- return result < 0xffffffff ? result : 0xffffffff;
+ return result < 0xffffffff ? (uint32_t)result : 0xffffffff;
 }
 
 /*
@@ -864,20 +926,21 @@
 switch (insn->sub_grp) {
 case BRANCH_GOTO:
 if (insn->op_cnt > 1) {
- BD_DEBUG(DBG_HDMV|DBG_CRIT, "[too many operands in BRANCH/GOTO opcode 0x%08x] ", *(uint32_t*)insn);
+ BD_DEBUG(DBG_HDMV|DBG_CRIT, "too many operands in BRANCH/GOTO opcode 0x%08x\n", *(uint32_t*)insn);
 }
 switch (insn->branch_opt) {
 case INSN_NOP: break;
 case INSN_GOTO: p->pc = dst - 1; break;
 case INSN_BREAK: p->pc = 1 << 17; break;
 default:
- BD_DEBUG(DBG_HDMV|DBG_CRIT, "[unknown BRANCH/GOTO option in opcode 0x%08x] ", *(uint32_t*)insn);
+ BD_DEBUG(DBG_HDMV|DBG_CRIT, "unknown BRANCH/GOTO option %d in opcode 0x%08x\n",
+ insn->branch_opt, *(uint32_t*)insn);
 break;
 }
 break;
 case BRANCH_JUMP:
 if (insn->op_cnt > 1) {
- BD_DEBUG(DBG_HDMV|DBG_CRIT, "[too many operands in BRANCH/JUMP opcode 0x%08x] ", *(uint32_t*)insn);
+ BD_DEBUG(DBG_HDMV|DBG_CRIT, "too many operands in BRANCH/JUMP opcode 0x%08x\n", *(uint32_t*)insn);
 }
 switch (insn->branch_opt) {
 case INSN_JUMP_TITLE: _jump_title(p, dst); break;
@@ -886,7 +949,8 @@
 case INSN_JUMP_OBJECT: if (!_jump_object(p, dst)) { inc_pc = 0; } break;
 case INSN_CALL_OBJECT: if (!_call_object(p, dst)) { inc_pc = 0; } break;
 default:
- BD_DEBUG(DBG_HDMV|DBG_CRIT, "[unknown BRANCH/JUMP option in opcode 0x%08x] ", *(uint32_t*)insn);
+ BD_DEBUG(DBG_HDMV|DBG_CRIT, "unknown BRANCH/JUMP option %d in opcode 0x%08x\n",
+ insn->branch_opt, *(uint32_t*)insn);
 break;
 }
 break;
@@ -899,20 +963,22 @@
 case INSN_LINK_PI: _play_at(p, -1, dst, -1); break;
 case INSN_LINK_MK: _play_at(p, -1, -1, dst); break;
 default:
- BD_DEBUG(DBG_HDMV|DBG_CRIT, "[unknown BRANCH/PLAY option in opcode 0x%08x] ", *(uint32_t*)insn);
+ BD_DEBUG(DBG_HDMV|DBG_CRIT, "unknown BRANCH/PLAY option %d in opcode 0x%08x\n",
+ insn->branch_opt, *(uint32_t*)insn);
 break;
 }
 break;
 
 default:
- BD_DEBUG(DBG_HDMV|DBG_CRIT, "[unknown BRANCH subgroup in opcode 0x%08x] ", *(uint32_t*)insn);
+ BD_DEBUG(DBG_HDMV|DBG_CRIT, "unknown BRANCH subgroup %d in opcode 0x%08x\n",
+ insn->sub_grp, *(uint32_t*)insn);
 break;
 }
 break; /* INSN_GROUP_BRANCH */
 
 case INSN_GROUP_CMP:
 if (insn->op_cnt < 2) {
- BD_DEBUG(DBG_HDMV|DBG_CRIT, "missing operand in BRANCH/JUMP opcode 0x%08x] ", *(uint32_t*)insn);
+ BD_DEBUG(DBG_HDMV|DBG_CRIT, "missing operand in BRANCH/JUMP opcode 0x%08x\n", *(uint32_t*)insn);
 }
 switch (insn->cmp_opt) {
 case INSN_BC: p->pc += !!(dst & ~src); break;
@@ -923,7 +989,8 @@
 case INSN_LE: p->pc += !(dst <= src); break;
 case INSN_LT: p->pc += !(dst < src); break;
 default:
- BD_DEBUG(DBG_HDMV|DBG_CRIT, "[unknown COMPARE option in opcode 0x%08x] ", *(uint32_t*)insn);
+ BD_DEBUG(DBG_HDMV|DBG_CRIT, "unknown COMPARE option %d in opcode 0x%08x\n",
+ insn->cmp_opt, *(uint32_t*)insn);
 break;
 }
 break; /* INSN_GROUP_CMP */
@@ -935,7 +1002,7 @@
 uint32_t dst0 = dst;
 
 if (insn->op_cnt < 2) {
- BD_DEBUG(DBG_HDMV|DBG_CRIT, "missing operand in SET/SET opcode 0x%08x] ", *(uint32_t*)insn);
+ BD_DEBUG(DBG_HDMV|DBG_CRIT, "missing operand in SET/SET opcode 0x%08x\n", *(uint32_t*)insn);
 }
 switch (insn->set_opt) {
 case INSN_MOVE: dst = src; break;
@@ -954,7 +1021,8 @@
 case INSN_SHL: dst <<= src; break;
 case INSN_SHR: dst >>= src; break;
 default:
- BD_DEBUG(DBG_HDMV|DBG_CRIT, "[unknown SET option in opcode 0x%08x] ", *(uint32_t*)insn);
+ BD_DEBUG(DBG_HDMV|DBG_CRIT, "unknown SET option %d in opcode 0x%08x\n",
+ insn->set_opt, *(uint32_t*)insn);
 break;
 }
 
@@ -978,19 +1046,24 @@
 case INSN_POPUP_OFF: _popup_off (p); break;
 case INSN_STILL_ON: _set_still_mode (p, 1); break;
 case INSN_STILL_OFF: _set_still_mode (p, 0); break;
+ case INSN_SET_OUTPUT_MODE: _set_output_mode(p, dst); break;
+ case INSN_SET_STREAM_SS: _set_stream_ss (p, dst, src); break;
+ case INSN_SETSYSTEM_0x10: _setsystem_0x10 (p, dst, src); break;
 default:
- BD_DEBUG(DBG_HDMV|DBG_CRIT, "[unknown SETSYSTEM option in opcode 0x%08x] ", *(uint32_t*)insn);
+ BD_DEBUG(DBG_HDMV|DBG_CRIT, "unknown SETSYSTEM option %d in opcode 0x%08x\n", insn->set_opt, *(uint32_t*)insn);
 break;
 }
 break;
 default:
- BD_DEBUG(DBG_HDMV|DBG_CRIT, "[unknown SET subgroup in opcode 0x%08x] ", *(uint32_t*)insn);
+ BD_DEBUG(DBG_HDMV|DBG_CRIT, "unknown SET subgroup %d in opcode 0x%08x\n",
+ insn->sub_grp, *(uint32_t*)insn);
 break;
 }
 break; /* INSN_GROUP_SET */
 
 default:
- BD_DEBUG(DBG_HDMV|DBG_CRIT, "[unknown group in opcode 0x%08x] ", *(uint32_t*)insn);
+ BD_DEBUG(DBG_HDMV|DBG_CRIT, "unknown operation group %d in opcode 0x%08x\n",
+ insn->grp, *(uint32_t*)insn);
 break;
 }

libbluray-0.2.3.tar.bz2/src/libbluray/hdmv/hdmv_vm.h -> libbluray-0.5.0.tar.bz2/src/libbluray/hdmv/hdmv_vm.h Changed

libbluray-0.2.3.tar.bz2/src/libbluray/hdmv/mobj_parse.c -> libbluray-0.5.0.tar.bz2/src/libbluray/hdmv/mobj_parse.c Changed

libbluray-0.2.3.tar.bz2/src/libbluray/hdmv/mobj_parse.h -> libbluray-0.5.0.tar.bz2/src/libbluray/hdmv/mobj_parse.h Changed

libbluray-0.2.3.tar.bz2/src/libbluray/hdmv/mobj_print.c -> libbluray-0.5.0.tar.bz2/src/libbluray/hdmv/mobj_print.c Changed

@@ -1,6 +1,6 @@
 /*
 * This file is part of libbluray
- * Copyright (C) 2009-2010 hpi1
+ * Copyright (C) 2009-2012 Petri Hintukainen <phintuka@users.sourceforge.net>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -46,10 +46,10 @@
 "/* RO: PSR18: Menu description language code */",
 "/* RO: PSR19: Country code */",
 "/* RO: PSR20: Region code */ /* 1 - A, 2 - B, 4 - C */",
- "/* PSR21 */",
- "/* PSR22 */",
- "/* PSR23 */",
- "/* PSR24 */",
+ "/* RO: PSR21: Output Mode Preference */ /* 0 - 2D, 1 - 3D */",
+ "/* PSR22: Stereoscopic status */ /* 2D / 3D */ ",
+ "/* RO: PSR23: display capablity */",
+ "/* RO: PSR24: 3D capability */",
 "/* PSR25 */",
 "/* PSR26 */",
 "/* PSR27 */",
@@ -87,6 +87,72 @@
 "/* RO: PSR59: Characteristic text caps */",
 "/* RO: PSR60: Characteristic text caps */",
 "/* RO: PSR61: Characteristic text caps */",
+ /* PSR62 */ NULL,
+ /* PSR63 */ NULL,
+ /* PSR64 */ NULL,
+ /* PSR65 */ NULL,
+ /* PSR66 */ NULL,
+ /* PSR67 */ NULL,
+ /* PSR68 */ NULL,
+ /* PSR69 */ NULL,
+ /* PSR70 */ NULL,
+ /* PSR71 */ NULL,
+ /* PSR72 */ NULL,
+ /* PSR73 */ NULL,
+ /* PSR74 */ NULL,
+ /* PSR75 */ NULL,
+ /* PSR76 */ NULL,
+ /* PSR77 */ NULL,
+ /* PSR78 */ NULL,
+ /* PSR79 */ NULL,
+ /* PSR80 */ NULL,
+ /* PSR81 */ NULL,
+ /* PSR82 */ NULL,
+ /* PSR83 */ NULL,
+ /* PSR84 */ NULL,
+ /* PSR85 */ NULL,
+ /* PSR86 */ NULL,
+ /* PSR87 */ NULL,
+ /* PSR88 */ NULL,
+ /* PSR89 */ NULL,
+ /* PSR90 */ NULL,
+ /* PSR91 */ NULL,
+ /* PSR92 */ NULL,
+ /* PSR93 */ NULL,
+ /* PSR94 */ NULL,
+ /* PSR95 */ NULL,
+ /* PSR96 */ NULL,
+ /* PSR97 */ NULL,
+ /* PSR98 */ NULL,
+ /* PSR99 */ NULL,
+ /* PSR100 */ NULL,
+ /* PSR101 */ NULL,
+ "/* PSR102: BD+ receive */",
+ "/* PSR103: BD+ send */",
+ "/* PSR104: BD+ shared */",
+ /* PSR105 */ NULL,
+ /* PSR106 */ NULL,
+ /* PSR107 */ NULL,
+ /* PSR108 */ NULL,
+ /* PSR109 */ NULL,
+ /* PSR110 */ NULL,
+ /* PSR111 */ NULL,
+ /* PSR112 */ NULL,
+ /* PSR113 */ NULL,
+ /* PSR114 */ NULL,
+ /* PSR115 */ NULL,
+ /* PSR116 */ NULL,
+ /* PSR117 */ NULL,
+ /* PSR118 */ NULL,
+ /* PSR119 */ NULL,
+ /* PSR120 */ NULL,
+ /* PSR121 */ NULL,
+ /* PSR122 */ NULL,
+ /* PSR123 */ NULL,
+ /* PSR124 */ NULL,
+ /* PSR125 */ NULL,
+ /* PSR126 */ NULL,
+ /* PSR127 */ NULL,
 };
 
 static const char * const insn_groups[4] = {
@@ -136,6 +202,13 @@
 "POPUP_OFF",
 "STILL_ON",
 "STILL_OFF",
+ "SET_OUTPUT_MODE",
+ "SET_STREAM_SS",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "[SETSYSTEM_0x10]",
 };
 
 static const char * const insn_opt_cmp[16] = {
@@ -212,9 +285,9 @@
 buf += sprintf(buf, " \t ");
 }
 
- if (psr1 >= 0)
+ if (psr1 >= 0 && psr1 < 128 && psr_info[psr1])
 buf += sprintf(buf, " %s", psr_info[psr1]);
- if (psr2 >= 0 && psr2 != psr1)
+ if (psr2 >= 0 && psr2 < 128 && psr2 != psr1 && psr_info[psr2])
 buf += sprintf(buf, " %s", psr_info[psr2]);
 
 return buf - start;
@@ -296,8 +369,15 @@
 break;
 case SET_SETSYSTEM:
 if (insn_opt_setsys[insn->set_opt]) {
+
 buf += sprintf(buf, "%-10s ", insn_opt_setsys[insn->set_opt]);
- buf += _sprint_operands_hex(buf, cmd);
+ if (insn->set_opt == INSN_SET_STREAM ||
+ insn->set_opt == INSN_SET_SEC_STREAM ||
+ insn->set_opt == INSN_SET_BUTTON_PAGE) {
+ buf += _sprint_operands_hex(buf, cmd);
+ } else {
+ buf += _sprint_operands(buf, cmd);
+ }
 } else {
 buf += sprintf(buf, "[unknown SETSYSTEM option in opcode 0x%08x] ", *(uint32_t*)insn);
 }

libbluray-0.2.3.tar.bz2/src/libbluray/register.c -> libbluray-0.5.0.tar.bz2/src/libbluray/register.c Changed

@@ -56,18 +56,19 @@
 0xffffff, /* PS: PSR17: Language code for PG and Text subtitles */
 0xffffff, /* PS: PSR18: Menu description language code */
 0xffff, /* PS: PSR19: Country code */
- 0x07, /* PS: PSR20: Region code */ /* 1 - A, 2 - B, 4 - C */
- 0, /* PSR21 */
- 0, /* PSR22 */
- 0, /* PSR23 */
- 0, /* PSR24 */
+ 0x02, /* PS: PSR20: Region code */ /* 1 - A, 2 - B, 4 - C */
+ 0, /* PS: PSR21: Output mode preference */
+ 0, /* PSR22: Stereoscopic status */
+ 0, /* PS: PSR23: Display capability */
+ 0, /* PS: PSR24: 3D capability */
 0, /* PSR25 */
 0, /* PSR26 */
 0, /* PSR27 */
 0, /* PSR28 */
 0x03, /* PS: PSR29: player capability for video */
 0x1ffff, /* PS: PSR30: player capability for text subtitle */
- 0x080200, /* PS: PSR31: Player profile and version */
+ 0x030200, /* PS: PSR31: Player profile and version */
+ /* BD-RO Profile 2 version 2.0 */
 0, /* PSR32 */
 0, /* PSR33 */
 0, /* PSR34 */
@@ -125,10 +126,14 @@
 "AUDIO_CAP",
 "AUDIO_LANG",
 "PG_AND_SUB_LANG",
- "PSR_MENU_LANG",
- "PSR_COUNTRY",
- "PSR_REGION",
- "PSR_VIDEO_CAP",
+ "MENU_LANG",
+ "COUNTRY",
+ "REGION",
+ "OUTPUT_PREFER",
+ "3D_STATUS",
+ "DISPLAY_CAP",
+ "3D_CAP",
+ //"PSR_VIDEO_CAP",
 };
 
 /*
@@ -228,8 +233,8 @@
 
 while (i < p->num_cb) {
 if (p->cb[i].handle == cb_handle && p->cb[i].cb == callback) {
- if (--p->num_cb) {
- memmove(p->cb + i, p->cb + i + 1, sizeof(PSR_CB_DATA) * p->num_cb);
+ if (--p->num_cb && i < p->num_cb) {
+ memmove(p->cb + i, p->cb + i + 1, sizeof(PSR_CB_DATA) * (p->num_cb - i));
 continue;
 }
 }
@@ -255,12 +260,11 @@
 /* generate save event */
 
 if (p->num_cb) {
- BD_PSR_EVENT ev = {
- .ev_type = BD_PSR_SAVE,
- .psr_idx = -1,
- .old_val = 0,
- .new_val = 0,
- };
+ BD_PSR_EVENT ev;
+ ev.ev_type = BD_PSR_SAVE;
+ ev.psr_idx = -1;
+ ev.old_val = 0;
+ ev.new_val = 0;
 
 unsigned j;
 for (j = 0; j < p->num_cb; j++) {
@@ -335,7 +339,7 @@
 
 int bd_gpr_write(BD_REGISTERS *p, int reg, uint32_t val)
 {
- if (reg < 0 || reg > BD_GPR_COUNT) {
+ if (reg < 0 || reg >= BD_GPR_COUNT) {
 BD_DEBUG(DBG_BLURAY, "bd_gpr_write(%d): invalid register\n", reg);
 return -1;
 }
@@ -346,7 +350,7 @@
 
 uint32_t bd_gpr_read(BD_REGISTERS *p, int reg)
 {
- if (reg < 0 || reg > BD_GPR_COUNT) {
+ if (reg < 0 || reg >= BD_GPR_COUNT) {
 BD_DEBUG(DBG_BLURAY, "bd_gpr_read(%d): invalid register\n", reg);
 return -1;
 }
@@ -362,7 +366,7 @@
 {
 uint32_t val;
 
- if (reg < 0 || reg > BD_PSR_COUNT) {
+ if (reg < 0 || reg >= BD_PSR_COUNT) {
 BD_DEBUG(DBG_BLURAY, "bd_psr_read(%d): invalid register\n", reg);
 return -1;
 }
@@ -378,7 +382,7 @@
 
 int bd_psr_setting_write(BD_REGISTERS *p, int reg, uint32_t val)
 {
- if (reg < 0 || reg > BD_PSR_COUNT) {
+ if (reg < 0 || reg >= BD_PSR_COUNT) {
 BD_DEBUG(DBG_BLURAY, "bd_psr_write(%d, %d): invalid register\n", reg, val);
 return -1;
 }
@@ -421,7 +425,8 @@
 int bd_psr_write(BD_REGISTERS *p, int reg, uint32_t val)
 {
 if ((reg == 13) ||
- (reg >= 15 && reg <= 20) ||
+ (reg >= 15 && reg <= 21) ||
+ (reg >= 23 && reg <= 24) ||
 (reg >= 29 && reg <= 31) ||
 (reg >= 48 && reg <= 61)) {
 BD_DEBUG(DBG_BLURAY, "bd_psr_write(%d, %d): read-only register !\n", reg, val);

libbluray-0.2.3.tar.bz2/src/libbluray/register.h -> libbluray-0.5.0.tar.bz2/src/libbluray/register.h Changed

libbluray-0.2.3.tar.bz2/src/util/attributes.h -> libbluray-0.5.0.tar.bz2/src/util/attributes.h Changed

libbluray-0.5.0.tar.bz2/src/util/bits.c Added

@@ -0,0 +1,210 @@
+/*****************************************************************************
+ * bits.c : Bit handling helpers
+ *****************************************************************************
+ * Copyright (C) 2003 the VideoLAN team
+ *
+ * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *****************************************************************************/
+
+#include "bits.h"
+
+#include "util/logging.h"
+
+#include <stdio.h>
+
+/**
+ * \file
+ * This file defines functions, structures for handling streams of bits
+ */
+
+void bb_init( BITBUFFER *bb, uint8_t *p_data, size_t i_data )
+{
+ bb->p_start = p_data;
+ bb->p = bb->p_start;
+ bb->p_end = bb->p_start + i_data;
+ bb->i_left = 8;
+}
+
+void bs_init( BITSTREAM *bs, BD_FILE_H *fp )
+{
+ int64_t size = file_size(fp);;
+ bs->fp = fp;
+ bs->pos = 0;
+ bs->end = (size < 0) ? 0 : size;
+ bs->size = file_read(bs->fp, bs->buf, BF_BUF_SIZE);
+ if (bs->size == 0 || bs->size > BF_BUF_SIZE) {
+ bs->size = 0;
+ bs->end = 0;
+ BD_DEBUG(DBG_FILE|DBG_CRIT, "bs_init(): read error!\n");
+ }
+ bb_init(&bs->bb, bs->buf, bs->size);
+}
+
+void bb_seek( BITBUFFER *bb, off_t off, int whence)
+{
+ off_t b;
+
+ switch (whence) {
+ case SEEK_CUR:
+ off = (bb->p - bb->p_start) * 8 + off;
+ break;
+ case SEEK_END:
+ off = (bb->p_end - bb->p_start) * 8 - off;
+ break;
+ case SEEK_SET:
+ default:
+ break;
+ }
+ b = off >> 3;
+ bb->p = &bb->p_start[b];
+
+ ssize_t i_tmp = bb->i_left - (off & 0x07);
+ if (i_tmp <= 0) {
+ bb->i_left = 8 + i_tmp;
+ bb->p++;
+ } else {
+ bb->i_left = i_tmp;
+ }
+}
+
+void bs_seek( BITSTREAM *bs, off_t off, int whence)
+{
+ off_t b;
+
+ switch (whence) {
+ case SEEK_CUR:
+ off = bs->pos * 8 + (bs->bb.p - bs->bb.p_start) * 8 + off;
+ break;
+ case SEEK_END:
+ off = bs->end * 8 - off;
+ break;
+ case SEEK_SET:
+ default:
+ break;
+ }
+ b = off >> 3;
+ if (b >= bs->end)
+ {
+ if (BF_BUF_SIZE < bs->end) {
+ bs->pos = bs->end - BF_BUF_SIZE;
+ file_seek(bs->fp, BF_BUF_SIZE, SEEK_END);
+ } else {
+ bs->pos = 0;
+ file_seek(bs->fp, 0, SEEK_SET);
+ }
+ bs->size = file_read(bs->fp, bs->buf, BF_BUF_SIZE);
+ bb_init(&bs->bb, bs->buf, bs->size);
+ bs->bb.p = bs->bb.p_end;
+ } else if (b < bs->pos || b >= (bs->pos + BF_BUF_SIZE)) {
+ file_seek(bs->fp, b, SEEK_SET);
+ bs->pos = b;
+ bs->size = file_read(bs->fp, bs->buf, BF_BUF_SIZE);
+ bb_init(&bs->bb, bs->buf, bs->size);
+ } else {
+ b -= bs->pos;
+ bs->bb.p = &bs->bb.p_start[b];
+ bs->bb.i_left = 8 - (off & 0x07);
+ }
+}
+
+uint32_t bb_read( BITBUFFER *bb, int i_count )
+{
+ static const uint32_t i_mask[33] = {
+ 0x00,
+ 0x01, 0x03, 0x07, 0x0f,
+ 0x1f, 0x3f, 0x7f, 0xff,
+ 0x1ff, 0x3ff, 0x7ff, 0xfff,
+ 0x1fff, 0x3fff, 0x7fff, 0xffff,
+ 0x1ffff, 0x3ffff, 0x7ffff, 0xfffff,
+ 0x1fffff, 0x3fffff, 0x7fffff, 0xffffff,
+ 0x1ffffff, 0x3ffffff, 0x7ffffff, 0xfffffff,
+ 0x1fffffff,0x3fffffff,0x7fffffff,0xffffffff
+ };
+ int i_shr;
+ uint32_t i_result = 0;
+
+ while( i_count > 0 ) {
+
+ if( bb->p >= bb->p_end ) {
+ break;
+ }
+
+ i_shr = bb->i_left - i_count;
+ if( i_shr >= 0 ) {
+ /* more in the buffer than requested */
+ i_result |= ( *bb->p >> i_shr )&i_mask[i_count];
+ bb->i_left -= i_count;
+ if( bb->i_left == 0 ) {
+ bb->p++;
+ bb->i_left = 8;
+ }
+ return( i_result );
+ } else {
+ /* less in the buffer than requested */
+ i_result |= (*bb->p&i_mask[bb->i_left]) << -i_shr;
+ i_count -= bb->i_left;
+ bb->p++;
+ bb->i_left = 8;
+ }
+ }
+
+ return( i_result );
+}
+
+uint32_t bs_read( BITSTREAM *bs, int i_count )
+{
+ ssize_t left;
+ int bytes = (i_count + 7) >> 3;
+
+ if (bs->bb.p + bytes >= bs->bb.p_end) {
+ bs->pos = bs->pos + (bs->bb.p - bs->bb.p_start);
+ left = bs->bb.i_left;
+ file_seek(bs->fp, bs->pos, SEEK_SET);
+ bs->size = file_read(bs->fp, bs->buf, BF_BUF_SIZE);
+ bb_init(&bs->bb, bs->buf, bs->size);
+ bs->bb.i_left = left;
+ }
+ return bb_read(&bs->bb, i_count);
+}
+
+void bb_skip( BITBUFFER *bb, ssize_t i_count )
+{
+ bb->i_left -= i_count;
+
+ if( bb->i_left <= 0 ) {
+ const int i_bytes = ( -bb->i_left + 8 ) / 8;
+
+ bb->p += i_bytes;
+ bb->i_left += 8 * i_bytes;
+ }
+}
+
+void bs_skip( BITSTREAM *bs, ssize_t i_count )
+{
+ int left;
+ int bytes = i_count >> 3;
+
+ if (bs->bb.p + bytes >= bs->bb.p_end) {
+ bs->pos = bs->pos + (bs->bb.p - bs->bb.p_start);
+ left = bs->bb.i_left;
+ file_seek(bs->fp, bs->pos, SEEK_SET);
+ bs->size = file_read(bs->fp, bs->buf, BF_BUF_SIZE);
+ bb_init(&bs->bb, bs->buf, bs->size);
+ bs->bb.i_left = left;
+ }
+ bb_skip(&bs->bb, i_count);
+}

libbluray-0.2.3.tar.bz2/src/util/bits.h -> libbluray-0.5.0.tar.bz2/src/util/bits.h Changed

@@ -49,27 +49,17 @@
 BITBUFFER bb;
 off_t pos;
 off_t end;
- int size;
+ size_t size;
 } BITSTREAM;
 
-static inline void bb_init( BITBUFFER *bb, void *p_data, size_t i_data )
-{
- bb->p_start = p_data;
- bb->p = bb->p_start;
- bb->p_end = bb->p_start + i_data;
- bb->i_left = 8;
-}
-
-static inline void bs_init( BITSTREAM *bs, BD_FILE_H *fp )
-{
- bs->fp = fp;
- bs->pos = 0;
- file_seek(bs->fp, 0, SEEK_END);
- bs->end = file_tell(bs->fp);
- file_seek(bs->fp, 0, SEEK_SET);
- bs->size = file_read(bs->fp, bs->buf, BF_BUF_SIZE);
- bb_init(&bs->bb, bs->buf, bs->size);
-}
+BD_PRIVATE void bb_init( BITBUFFER *bb, uint8_t *p_data, size_t i_data );
+BD_PRIVATE void bs_init( BITSTREAM *bs, BD_FILE_H *fp );
+BD_PRIVATE void bb_seek( BITBUFFER *bb, off_t off, int whence);
+BD_PRIVATE void bs_seek( BITSTREAM *bs, off_t off, int whence);
+BD_PRIVATE void bb_skip( BITBUFFER *bb, ssize_t i_count );
+BD_PRIVATE void bs_skip( BITSTREAM *bs, ssize_t i_count );
+BD_PRIVATE uint32_t bb_read( BITBUFFER *bb, int i_count );
+BD_PRIVATE uint32_t bs_read( BITSTREAM *bs, int i_count );
 
 static inline off_t bb_pos( const BITBUFFER *bb )
 {
@@ -96,73 +86,6 @@
 return file_eof(bs->fp) && bb_eof(&bs->bb);
 }
 
-static inline void bb_seek( BITBUFFER *bb, off_t off, int whence)
-{
- off_t b;
-
- switch (whence) {
- case SEEK_CUR:
- off = (bb->p - bb->p_start) * 8 + off;
- break;
- case SEEK_END:
- off = (bb->p_end - bb->p_start) * 8 - off;
- break;
- case SEEK_SET:
- default:
- break;
- }
- b = off >> 3;
- bb->p = &bb->p_start[b];
-
- ssize_t i_tmp = bb->i_left - (off & 0x07);
- if (i_tmp <= 0) {
- bb->i_left = 8 + i_tmp;
- bb->p++;
- } else {
- bb->i_left = i_tmp;
- }
-}
-
-static inline void bs_seek( BITSTREAM *bs, off_t off, int whence)
-{
- off_t b;
-
- switch (whence) {
- case SEEK_CUR:
- off = bs->pos * 8 + (bs->bb.p - bs->bb.p_start) * 8 + off;
- break;
- case SEEK_END:
- off = bs->end * 8 - off;
- break;
- case SEEK_SET:
- default:
- break;
- }
- b = off >> 3;
- if (b >= bs->end)
- {
- if (BF_BUF_SIZE < bs->end) {
- bs->pos = bs->end - BF_BUF_SIZE;
- file_seek(bs->fp, BF_BUF_SIZE, SEEK_END);
- } else {
- bs->pos = 0;
- file_seek(bs->fp, 0, SEEK_SET);
- }
- bs->size = file_read(bs->fp, bs->buf, BF_BUF_SIZE);
- bb_init(&bs->bb, bs->buf, bs->size);
- bs->bb.p = bs->bb.p_end;
- } else if (b < bs->pos || b >= (bs->pos + BF_BUF_SIZE)) {
- file_seek(bs->fp, b, SEEK_SET);
- bs->pos = b;
- bs->size = file_read(bs->fp, bs->buf, BF_BUF_SIZE);
- bb_init(&bs->bb, bs->buf, bs->size);
- } else {
- b -= bs->pos;
- bs->bb.p = &bs->bb.p_start[b];
- bs->bb.i_left = 8 - (off & 0x07);
- }
-}
-
 static inline void bb_seek_byte( BITBUFFER *bb, off_t off)
 {
 bb_seek(bb, off << 3, SEEK_SET);
@@ -173,66 +96,6 @@
 bs_seek(s, off << 3, SEEK_SET);
 }
 
-static inline uint32_t bb_read( BITBUFFER *bb, int i_count )
-{
- static const uint32_t i_mask[33] = { 
- 0x00,
- 0x01, 0x03, 0x07, 0x0f,
- 0x1f, 0x3f, 0x7f, 0xff,
- 0x1ff, 0x3ff, 0x7ff, 0xfff,
- 0x1fff, 0x3fff, 0x7fff, 0xffff,
- 0x1ffff, 0x3ffff, 0x7ffff, 0xfffff,
- 0x1fffff, 0x3fffff, 0x7fffff, 0xffffff,
- 0x1ffffff, 0x3ffffff, 0x7ffffff, 0xfffffff,
- 0x1fffffff,0x3fffffff,0x7fffffff,0xffffffff
- };
- int i_shr;
- uint32_t i_result = 0;
-
- while( i_count > 0 ) {
-
- if( bb->p >= bb->p_end ) {
- break;
- }
-
- i_shr = bb->i_left - i_count;
- if( i_shr >= 0 ) {
- /* more in the buffer than requested */
- i_result |= ( *bb->p >> i_shr )&i_mask[i_count];
- bb->i_left -= i_count;
- if( bb->i_left == 0 ) {
- bb->p++;
- bb->i_left = 8;
- }
- return( i_result );
- } else {
- /* less in the buffer than requested */
- i_result |= (*bb->p&i_mask[bb->i_left]) << -i_shr;
- i_count -= bb->i_left;
- bb->p++;
- bb->i_left = 8;
- }
- }
-
- return( i_result );
-}
-
-static uint32_t bs_read( BITSTREAM *bs, int i_count )
-{
- int left;
- int bytes = (i_count + 7) >> 3;
-
- if (bs->bb.p + bytes >= bs->bb.p_end) {
- bs->pos = bs->pos + (bs->bb.p - bs->bb.p_start);
- left = bs->bb.i_left;
- file_seek(bs->fp, bs->pos, SEEK_SET);
- bs->size = file_read(bs->fp, bs->buf, BF_BUF_SIZE);
- bb_init(&bs->bb, bs->buf, bs->size);
- bs->bb.i_left = left;
- }
- return bb_read(&bs->bb, i_count);
-}
-
 static inline void bb_read_bytes( BITBUFFER *bb, uint8_t *buf, int i_count )
 {
 int ii;
@@ -257,34 +120,6 @@
 return bb_read( &bb_tmp, i_count );
 }
 
-static inline void bb_skip( BITBUFFER *bb, ssize_t i_count )
-{
- bb->i_left -= i_count;
-
- if( bb->i_left <= 0 ) {
- const int i_bytes = ( -bb->i_left + 8 ) / 8;
-
- bb->p += i_bytes;
- bb->i_left += 8 * i_bytes;
- }
-}
-
-static inline void bs_skip( BITSTREAM *bs, ssize_t i_count )
-{
- int left;
- int bytes = i_count >> 3;
-
- if (bs->bb.p + bytes >= bs->bb.p_end) {
- bs->pos = bs->pos + (bs->bb.p - bs->bb.p_start);
- left = bs->bb.i_left;
- file_seek(bs->fp, bs->pos, SEEK_SET);
- bs->size = file_read(bs->fp, bs->buf, BF_BUF_SIZE);
- bb_init(&bs->bb, bs->buf, bs->size);
- bs->bb.i_left = left;
- }
- bb_skip(&bs->bb, i_count);
-}
-
 static inline int bb_is_align( BITBUFFER *bb, uint32_t mask )
 {
 off_t off = bb_pos(bb);

libbluray-0.2.3.tar.bz2/src/util/log_control.h -> libbluray-0.5.0.tar.bz2/src/util/log_control.h Changed

libbluray-0.2.3.tar.bz2/src/util/logging.c -> libbluray-0.5.0.tar.bz2/src/util/logging.c Changed

@@ -25,7 +25,7 @@
 #include <stdarg.h>
 #include <string.h>
 
-static debug_mask_t debug_mask = DBG_CRIT;
+uint32_t debug_mask = (uint32_t)-1; /* set all bits to make sure bd_debug() is called for initialization */
 static BD_LOG_FUNC log_func = NULL;
 
 void bd_set_debug_handler(BD_LOG_FUNC f)
@@ -47,7 +47,7 @@
 {
 int zz;
 for(zz = 0; zz < count; zz++) {
- sprintf(out + (zz * 2), "%02X", buf[zz]);
+ sprintf(out + (zz * 2), "%02x", buf[zz]);
 }
 
 return out;
@@ -64,6 +64,10 @@
 logfile = stderr;
 
 char *env = NULL;
+ if (debug_mask == (uint32_t)-1) {
+ /* might be set by application with bd_set_debug_mask() */
+ debug_mask = DBG_CRIT;
+ }
 if ((env = getenv("BD_DEBUG_MASK")))
 debug_mask = strtol(env, NULL, 0);
 
@@ -72,7 +76,7 @@
 FILE *fp = fopen(env, "wb");
 if (fp) {
 logfile = fp;
- setvbuf(logfile, NULL, _IOLBF, 0);
+ setvbuf(logfile, NULL, _IONBF, 0);
 } else {
 fprintf(logfile, "%s:%d: Error opening log file %s\n", __FILE__, __LINE__, env);
 }
@@ -80,13 +84,13 @@
 }
 
 if (mask & debug_mask) {
- char buffer[512], *pt = buffer;
+ char buffer[4096], *pt = buffer;
 va_list args;
 
 pt += sprintf(buffer, "%s:%d: ", file, line);
 
 va_start(args, format);
- vsprintf(pt, format, args);
+ vsnprintf(pt, sizeof(buffer) - (size_t)(intptr_t)(pt - buffer) - 1, format, args);
 va_end(args);
 
 if (log_func) {

libbluray-0.2.3.tar.bz2/src/util/logging.h -> libbluray-0.5.0.tar.bz2/src/util/logging.h Changed

libbluray-0.2.3.tar.bz2/src/util/macro.h -> libbluray-0.5.0.tar.bz2/src/util/macro.h Changed

@@ -30,4 +30,43 @@
 #define MKINT_BE32(X) ( (X)[0] << 24 | (X)[1] << 16 | (X)[2] << 8 | (X)[3] )
 #define X_FREE(X) ( free(X), X = NULL )
 
+#define BD_MIN(a,b) ((a)<(b)?(a):(b))
+#define BD_MAX(a,b) ((a)>(b)?(a):(b))
+
+
+/*
+ * automatic cast from void* (malloc/calloc/realloc)
+ */
+
+#ifdef __cplusplus
+
+template <typename T>
+class auto_cast_wrapper
+{
+public:
+ template <typename R> friend auto_cast_wrapper<R> auto_cast(const R& x);
+ template <typename U> operator U() { return static_cast(p); }
+
+private:
+ auto_cast_wrapper(const T& x) : p(x) {}
+ auto_cast_wrapper(const auto_cast_wrapper& o) : p(o.p) {}
+
+ auto_cast_wrapper& operator=(const auto_cast_wrapper&);
+
+ const T& p;
+};
+
+template <typename R>
+auto_cast_wrapper<R> auto_cast(const R& x)
+{
+ return auto_cast_wrapper<R>(x);
+}
+
+# define calloc(n,s) auto_cast(calloc(n,s))
+# define malloc(s) auto_cast(malloc(s))
+# define realloc(p,s) auto_cast(realloc(p,s))
+# define refcnt_realloc(p,s) auto_cast(refcnt_realloc(p,s))
+#endif /* __cplusplus */
+
+
 #endif /* MACRO_H_ */

libbluray-0.2.3.tar.bz2/src/util/mutex.h -> libbluray-0.5.0.tar.bz2/src/util/mutex.h Changed

libbluray-0.5.0.tar.bz2/src/util/refcnt.c Added

@@ -0,0 +1,111 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include "refcnt.h"
+
+#include "logging.h"
+#include "mutex.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/*
+ *
+ */
+
+typedef struct {
+ BD_MUTEX mutex; /* initialized only if counted == 1 */
+ int count; /* reference count */
+ unsigned counted; /* 1 if this object is ref-counted */
+} BD_REFCNT;
+
+/*
+ *
+ */
+
+void bd_refcnt_inc(const void *obj)
+{
+ if (!obj) {
+ return;
+ }
+
+ BD_REFCNT *ref = &(((BD_REFCNT *)(intptr_t)obj)[-1]);
+
+ if (!ref->counted) {
+ bd_mutex_init(&ref->mutex);
+ ref->counted = 1;
+ ref->count = 2;
+ return;
+ }
+
+ bd_mutex_lock(&ref->mutex);
+ ++ref->count;
+ bd_mutex_unlock(&ref->mutex);
+}
+
+void bd_refcnt_dec(const void *obj)
+{
+ if (!obj) {
+ return;
+ }
+
+ BD_REFCNT *ref = &((BD_REFCNT *)(intptr_t)obj)[-1];
+
+ if (ref->counted) {
+ int count;
+
+ bd_mutex_lock(&ref->mutex);
+ count = --ref->count;
+ bd_mutex_unlock(&ref->mutex);
+
+ if (count > 0) {
+ return;
+ }
+
+ bd_mutex_destroy(&ref->mutex);
+ }
+
+ free(ref);
+}
+
+void *refcnt_realloc(void *obj, size_t sz)
+{
+ sz += sizeof(BD_REFCNT);
+
+ if (obj) {
+ if (((BD_REFCNT *)obj)[-1].counted) {
+ bd_refcnt_dec(obj);
+ BD_DEBUG(DBG_CRIT, "refcnt_realloc(): realloc locked object !\n");
+ obj = NULL;
+ }
+ }
+
+ if (obj) {
+ obj = realloc(&((BD_REFCNT *)obj)[-1], sz);
+ } else {
+ obj = realloc(NULL, sz);
+ memset(obj, 0, sizeof(BD_REFCNT));
+ }
+
+ return &((BD_REFCNT *)obj)[1];
+}
+
+
+

libbluray-0.5.0.tar.bz2/src/util/refcnt.h Added

@@ -0,0 +1,56 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2013 Petri Hintukainen <phintuka@users.sourceforge.net>
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef BD_REFCNT_H_
+#define BD_FEFCNT_H_
+
+#include "attributes.h"
+
+#include <sys/types.h>
+
+#ifdef MACRO_H_
+# error macro.h included before refcnt.h
+#endif
+
+/*
+ * Reference-counted memory blocks.
+ *
+ * - Object must be allocated with refcnt_realloc(NULL, size).
+ * Returned object has reference count of 1.
+ * - Object can be re-allocated with refcnt_realloc(obj, size)
+ * as long as bd_refcnt_inc() has not been called.
+ * - Object must be freed with bd_refcnt_dec().
+ *
+ * by default, reference counting is not used (use count = 1).
+ * Reference counting is initialized during first call to bd_refcnt_inc().
+ * This results in reference count = 2.
+ *
+ * This is thread-safe as long as first bd_refcnt_inc() is done from the
+ * same thread that owns the object initially.
+ *
+ */
+
+BD_PRIVATE void *refcnt_realloc(void *obj, size_t sz);
+
+#ifndef BD_OVERLAY_INTERFACE_VERSION
+void bd_refcnt_inc(const void *obj);
+void bd_refcnt_dec(const void *obj);
+#endif
+
+#endif // BD_REFCNT_H_

libbluray-0.2.3.tar.bz2/src/util/strutl.c -> libbluray-0.5.0.tar.bz2/src/util/strutl.c Changed

libbluray-0.2.3.tar.bz2/src/util/strutl.h -> libbluray-0.5.0.tar.bz2/src/util/strutl.h Changed

libbluray-0.5.0.tar.bz2/src/util/time.h Added

@@ -0,0 +1,77 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2010 VideoLAN
+ *
+ * This library 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.
+ *
+ * This library 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 this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBBLURAY_TIME_H_
+#define LIBBLURAY_TIME_H_
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#if defined(_WIN32)
+# include <windows.h>
+#elif defined(HAVE_SYS_TIME_H)
+# include <sys/time.h>
+#else
+# error no time support found
+#endif
+
+
+#if defined(_WIN32)
+static uint64_t _bd_get_scr_impl(void)
+{
+ HANDLE thread;
+ DWORD_PTR mask;
+ LARGE_INTEGER frequency, counter;
+
+ thread = GetCurrentThread();
+ mask = SetThreadAffinityMask(thread, 1);
+ QueryPerformanceFrequency(&frequency);
+ QueryPerformanceCounter(&counter);
+ SetThreadAffinityMask(thread, mask);
+
+ return (uint64_t)(counter.QuadPart * 1000.0 / frequency.QuadPart) * 90;
+}
+
+#elif defined(HAVE_SYS_TIME_H)
+
+static uint64_t _bd_get_scr_impl(void)
+{
+ struct timeval tv;
+ gettimeofday(&tv, 0);
+ return ((uint64_t)tv.tv_sec * 1000 + tv.tv_usec / 1000) * 90;
+}
+
+#endif
+
+static uint64_t bd_get_scr(void)
+{
+ static uint64_t t0 = (uint64_t)-1;
+
+ uint64_t now = _bd_get_scr_impl();
+
+ if (t0 > now) {
+ t0 = now;
+ }
+
+ return now - t0;
+}
+
+
+#endif // LIBBLURAY_TIME_H_